2703 files changed, 39931 insertions, 543615 deletions

diff --git a/COPYING b/COPYING
index 623b625..60549be 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 19yy  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -313,7 +313,7 @@ Also add information on how to contact you by electronic and paper mail.
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) 19yy name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
diff --git a/COPYING.LIB b/COPYING.LIB
index 778d0bb..161a3d1 100644
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -464,8 +464,8 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-    MA 02110-1301, USA
+    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+    MA 02111-1307, USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/COPYING.LIBGLOSS b/COPYING.LIBGLOSS
deleted file mode 100644
index d6f99e5..0000000
--- a/COPYING.LIBGLOSS
+++ /dev/null
@@ -1,297 +0,0 @@
-The libgloss subdirectory is a collection of software from several sources.
-Each have their own copyrights embedded in each file that they concern.
-
-(1) University of California, Berkeley
-
-[1a]
-
-Copyright (c) 1990 The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms are permitted
-provided that the above copyright notice and this paragraph are
-duplicated in all such forms and that any documentation,
-and other materials related to such distribution and use 
-acknowledge that the software was developed
-by the University of California, Berkeley.  The name of the
-University may not be used to endorse or promote products derived
-from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-[1b]
-
-Copyright (c) 1991, 2000 The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-     This product includes software developed by the University of
-     California, Berkeley and its contributors.
-4. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-[1c]
-
-Copyright (c) 1991, 1998, 2001 The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. [rescinded 22 July 1999]
-4. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
--------------------------------------------------------------
- Please note that in some of the above alternate licenses, there is a
- statement regarding that acknowledgement must be made in any
- advertising materials for products using the code.  This restriction
- no longer applies due to the following license change:
-
-  ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
-
- In some cases the defunct clause has been removed in modified newlib code and
- in some cases, the clause has been left as-is.
--------------------------------------------------------------
-
-(2) DJ Delorie
-
-Copyright (C) 1993 DJ Delorie
-All rights reserved.
-
-Redistribution and use in source and binary forms is permitted
-provided that the above copyright notice and following paragraph are
-duplicated in all such forms.
-
-This file is distributed WITHOUT ANY WARRANTY; without even the implied
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-(3) GPL (fr30 directory only)
-
-Copyright (C) 1998 Free Software Foundation, Inc.
-Contributed by Cygnus Solutions.
-
-This file is part of GNU CC.
-
-GNU CC 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.
-
-GNU CC 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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
-
-(4) Advanced Micro Devices
-
-Copyright 1989, 1990 Advanced Micro Devices, Inc.
-
-This software is the property of Advanced Micro Devices, Inc  (AMD)  which
-specifically  grants the user the right to modify, use and distribute this
-software provided this notice is not removed or altered.  All other rights
-are reserved by AMD.
-
-AMD MAKES NO WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, WITH REGARD TO THIS
-SOFTWARE.  IN NO EVENT SHALL AMD BE LIABLE FOR INCIDENTAL OR CONSEQUENTIAL
-DAMAGES IN CONNECTION WITH OR ARISING FROM THE FURNISHING, PERFORMANCE, OR
-USE OF THIS SOFTWARE.
-
-So that all may benefit from your experience, please report  any  problems
-or  suggestions about this software to the 29K Technical Support Center at
-800-29-29-AMD (800-292-9263) in the USA, or 0800-89-1131  in  the  UK,  or
-0031-11-1129 in Japan, toll free.  The direct dial number is 512-462-4118.
-
-Advanced Micro Devices, Inc.
-29K Support Products
-Mail Stop 573
-5900 E. Ben White Blvd.
-Austin, TX 78741
-800-292-9263
-
-(5) Array Technology Corporation and MIPS (mips/lsi33k-stub.h)
- 
-COPYRIGHT (C) 1991, 1992 ARRAY TECHNOLOGY CORPORATION
-              All Rights Reserved
-
-This software is confidential information which is proprietary to and
-a trade secret of ARRAY Technology Corporation.  Use, duplication, or
-disclosure is subject to the terms of a separate license agreement.
-
-Copyright 1985 by MIPS Computer Systems, Inc.
- 
-(6) University of Utah and the Computer Systems Laboratory (CSL)
-    [applies only to hppa*-*-pro* targets] 
-
-Copyright (c) 1990,1994 The University of Utah and
-the Computer Systems Laboratory (CSL).  All rights reserved.
-
-Permission to use, copy, modify and distribute this software is hereby
-granted provided that (1) source code retains these copyright, permission,
-and disclaimer notices, and (2) redistributions including binaries
-reproduce the notices in supporting documentation, and (3) all advertising
-materials mentioning features or use of this software display the following
-acknowledgement: ``This product includes software developed by the
-Computer Systems Laboratory at the University of Utah.''
-
-THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS
-IS" CONDITION.  THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF
-ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-
-CSL requests users of this software to return to csl-dist@cs.utah.edu any
-improvements that they make and grant CSL redistribution rights.
-
-(7) Sun Microsystems
-
-Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
-
-Developed at SunPro, a Sun Microsystems, Inc. business.
-Permission to use, copy, modify, and distribute this
-software is freely granted, provided that this notice 
-is preserved.
-
-(8) Hewlett Packard
-
-(c) Copyright 1986 HEWLETT-PACKARD COMPANY
-
-To anyone who acknowledges that this file is provided "AS IS"
-without any express or implied warranty:
-    permission to use, copy, modify, and distribute this file
-for any purpose is hereby granted without fee, provided that
-the above copyright notice and this notice appears in all
-copies, and that the name of Hewlett-Packard Company not be
-used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-Hewlett-Packard Company makes no representations about the
-suitability of this software for any purpose.
-
-(9) Hans-Peter Nilsson
-
-Copyright (C) 2001 Hans-Peter Nilsson
-
-Permission to use, copy, modify, and distribute this software is
-freely granted, provided that the above copyright notice, this notice
-and the following disclaimer are preserved with no changes.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.
-
-(10) No Copyright
-
-THIS SOFTWARE IS NOT COPYRIGHTED
-
-(11) Cygnus Support / Cygnus Solutions
-
-Copyright (c) 1995, 1996, 1997, 1998, 1999 Cygnus Support
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
----------------------------------------------------------------
- Please note that the copyright above may be used with the name
- Cygnus Solutions instead of Cygnus Support.  Both names should
- be considered interchangeable.  These copyrights are now owned
- by Red Hat Incorporated.
----------------------------------------------------------------
-
-(12) Red Hat Incorporated
-
-Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-(13) Default copyright 
-
-Unless otherwise stated in each remaining libgloss file, the remaining
-files in the libgloss subdirectory are governed by the following copyright.
-
-Copyright (c) 1994, 1997, 2001, 2002 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/COPYING.NEWLIB b/COPYING.NEWLIB
index 141ca01..f4d83a3 100644
--- a/COPYING.NEWLIB
+++ b/COPYING.NEWLIB
@@ -1,41 +1,8 @@
 The newlib subdirectory is a collection of software from several sources.
-Each file may have its own copyright/license that is embedded in the source 
-file.
-
-This list documents those licenses which are more restrictive than
-a BSD-like license or require the copyright notice
-to be duplicated in documentation and/or other materials associated with
-the distribution.  Certain licenses documented here only apply to
-specific targets.  Certain clauses only apply if you are building the
-code as part of your binary.
-
-Note that this list may omit certain licenses that
-only pertain to the copying/modifying of the individual source code. 
-If you are distributing the source code, then you do not need to
-worry about these omitted licenses, so long as you do not modify the
-copyright information already in place.
+Each have their own copyrights embedded in each file that they concern.
 
 (1) University of California, Berkeley
 
-[1a]
-
-Copyright (c) 1990 The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms are permitted
-provided that the above copyright notice and this paragraph are
-duplicated in all such forms and that any documentation,
-and other materials related to such distribution and use 
-acknowledge that the software was developed
-by the University of California, Berkeley.  The name of the
-University may not be used to endorse or promote products derived
-from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-[1b]
-
 Copyright (c) 1990 The Regents of the University of California.
 All rights reserved.
 
@@ -51,145 +18,19 @@ THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-[1c]
-
-Copyright (c) 1981, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 
-The Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-     This product includes software developed by the University of
-     California, Berkeley and its contributors.
-4. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-[1d]
-
-Copyright (c) 1988, 1990, 1993 Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-[1e]
-
-Copyright (c) 1982, 1986, 1989, 1991, 1993, 1994
-The Regents of the University of California.  All rights reserved.
-(c) UNIX System Laboratories, Inc.
-All or some portions of this file are derived from material licensed
-to the University of California by American Telephone and Telegraph
-Co. or Unix System Laboratories, Inc. and are reproduced herein with
-the permission of UNIX System Laboratories, Inc.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-     This product includes software developed by the University of
-     California, Berkeley and its contributors.
-4. Neither the name of the University nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-[1f]
-
-Copyright (c) 1987, 1988, 2000 Regents of the University of California.
-All rights reserved.
-
-Redistribution and use in source and binary forms are permitted
-provided that: (1) source distributions retain this entire copyright
-notice and comment, and (2) distributions including binaries display
-the following acknowledgement:  ``This product includes software
-developed by the University of California, Berkeley and its contributors''
-in the documentation or other materials provided with the distribution
-and in all advertising materials mentioning features or use of this
-software. Neither the name of the University nor the names of its
-contributors may be used to endorse or promote products derived
-from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+(2) DJ Delorie
 
--------------------------------------------------------------
- Please note that in some of the above alternate licenses, there is a
- statement regarding that acknowledgement must be made in any
- advertising materials for products using the code.  This restriction
- no longer applies due to the following license change:
-
-  ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
-
- In some cases the defunct clause has been removed in modified newlib code and
- in some cases, the clause has been left as-is.
--------------------------------------------------------------
+Copyright (C) 1991 DJ Delorie
 
-(2) Cygwin (cygwin targets only)
+This file is distributed under the terms listed in the document
+"copying.dj".
 
-Copyright 2001 Red Hat, Inc.
+A copy of "copying.dj" should accompany this file; if not, a copy
+should be available from where this file was obtained.  This file
+may not be distributed without a verbatim copy of "copying.dj".
 
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details.
+This file is distributed WITHOUT ANY WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 (3) David M. Gay at AT&T
 
@@ -284,477 +125,20 @@ IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.
 
-(10) Stephane Carrez (m68hc11-elf/m68hc12-elf targets only)
-
-Copyright (C) 1999, 2000, 2001, 2002 Stephane Carrez (stcarrez@nerim.fr)
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-(11) Christopher G. Demetriou
-
-Copyright (c) 2001 Christopher G. Demetriou
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-(12) SuperH, Inc.
-
-Copyright 2002 SuperH, Inc. All rights reserved
-
-This software is the property of SuperH, Inc (SuperH) which specifically
-grants the user the right to modify, use and distribute this software
-provided this notice is not removed or altered.  All other rights are
-reserved by SuperH.
-
-SUPERH MAKES NO WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, WITH REGARD TO
-THIS SOFTWARE.  IN NO EVENT SHALL SUPERH BE LIABLE FOR INDIRECT, SPECIAL, 
-INCIDENTAL OR CONSEQUENTIAL DAMAGES IN CONNECTION WITH OR ARISING FROM
-THE FURNISHING, PERFORMANCE, OR USE OF THIS SOFTWARE.
-
-So that all may benefit from your experience, please report any problems
-or suggestions about this software to the SuperH Support Center via
-e-mail at softwaresupport@superh.com .
-
-SuperH, Inc.
-405 River Oaks Parkway
-San Jose
-CA 95134
-USA
-
-(13) Royal Institute of Technology
-
-Copyright (c) 1999 Kungliga Tekniska Högskolan
-(Royal Institute of Technology, Stockholm, Sweden).
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+(10) Unless otherwise stated in each remaining newlib file, the remaining
+files in the newlib subdirectory are governed by the following copyright.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of KTH nor the names of its contributors may be
-   used to endorse or promote products derived from this software without
-   specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY KTH AND ITS CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KTH OR ITS CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-(14) Alexey Zelkin
-
-Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-(15) Andrey A. Chernov
-
-Copyright (C) 1997 by Andrey A. Chernov, Moscow, Russia.
+Copyright (c) 1994, 1997, 2001 Red Hat Incorporated.
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-(16) FreeBSD
-
-Copyright (c) 1997-2002 FreeBSD Project.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-(17) S. L. Moshier
-
-Author:  S. L. Moshier.
-
-Copyright (c) 1984,2000 S.L. Moshier
-
-Permission to use, copy, modify, and distribute this software for any
-purpose without fee is hereby granted, provided that this entire notice
-is included in all copies of any software which is or includes a copy
-or modification of this software and in all copies of the supporting
-documentation for such software.
-
-THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTY.  IN PARTICULAR,  THE AUTHOR MAKES NO REPRESENTATION
-OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS
-SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
-
-(18) Citrus Project
-
-Copyright (c)1999 Citrus Project,
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-(19) Todd C. Miller
-
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-(20) DJ Delorie (i386) 
-
-Copyright (C) 1991 DJ Delorie
-All rights reserved.
-
-Redistribution and use in source and binary forms is permitted
-provided that the above copyright notice and following paragraph are
-duplicated in all such forms.
-
-This file is distributed WITHOUT ANY WARRANTY; without even the implied
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-(21) Free Software Foundation LGPL License (*-linux* targets only)
-
-   Copyright (C) 1990-1999, 2000, 2001 
-   Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 USA.
-
-(22) Xavier Leroy LGPL License (i[3456]86-*-linux* targets only)
-
-Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-                                                     
-This program 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 Library General Public License for more details.
-
-(23) Intel (i960)
-
-Copyright (c) 1993 Intel Corporation
-
-Intel hereby grants you permission to copy, modify, and distribute this
-software and its documentation.  Intel grants this permission provided
-that the above copyright notice appears in all copies and that both the
-copyright notice and this permission notice appear in supporting
-documentation.  In addition, Intel grants this permission provided that
-you prominently mark as "not part of the original" any modifications
-made to this software or documentation, and that the name of Intel
-Corporation not be used in advertising or publicity pertaining to
-distribution of the software or the documentation without specific,
-written prior permission.
-
-Intel Corporation provides this AS IS, WITHOUT ANY WARRANTY, EXPRESS OR
-IMPLIED, INCLUDING, WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE.  Intel makes no guarantee or
-representations regarding the use of, or the results of the use of,
-the software and documentation in terms of correctness, accuracy,
-reliability, currentness, or otherwise; and you rely on the software,
-documentation and results solely at your own risk.
-
-IN NO EVENT SHALL INTEL BE LIABLE FOR ANY LOSS OF USE, LOSS OF BUSINESS,
-LOSS OF PROFITS, INDIRECT, INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES
-OF ANY KIND.  IN NO EVENT SHALL INTEL'S TOTAL LIABILITY EXCEED THE SUM
-PAID TO INTEL FOR THE PRODUCT LICENSED HEREUNDER.
-
-(24) Hewlett-Packard  (hppa targets only)
-
-(c) Copyright 1986 HEWLETT-PACKARD COMPANY
-
-To anyone who acknowledges that this file is provided "AS IS"
-without any express or implied warranty:
-    permission to use, copy, modify, and distribute this file
-for any purpose is hereby granted without fee, provided that
-the above copyright notice and this notice appears in all
-copies, and that the name of Hewlett-Packard Company not be
-used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-Hewlett-Packard Company makes no representations about the
-suitability of this software for any purpose.
-
-(25) Henry Spencer (only *-linux targets)
-
-Copyright 1992, 1993, 1994 Henry Spencer.  All rights reserved.
-This software is not subject to any license of the American Telephone
-and Telegraph Company or of the Regents of the University of California.
-
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it, subject
-to the following restrictions:
-
-1. The author is not responsible for the consequences of use of this
-   software, no matter how awful, even if they arise from flaws in it.
-
-2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission.  Since few users ever read sources,
-   credits must appear in the documentation.
-
-3. Altered versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.  Since few users
-   ever read sources, credits must appear in the documentation.
-
-4. This notice may not be removed or altered.
-
-(26) Mike Barcroft
-
-Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-(27) Konstantin Chuguev (--enable-newlib-iconv)
-
-Copyright (c) 1999, 2000
-   Konstantin Chuguev.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-   iconv (Charset Conversion Library) v2.0
-
-(27) Artem Bityuckiy (--enable-newlib-iconv)
-
-Copyright (c) 2003, Artem B. Bityuckiy, SoftMine Corporation.
-Rights transferred to Franklin Electronic Publishers.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-(28) Red Hat Incorporated
-
-Unless otherwise stated in each remaining newlib file, the remaining
-files in the newlib subdirectory default to the following copyright.
-It should be noted that Red Hat Incorporated now owns copyrights
-belonging to Cygnus Solutions and Cygnus Support.
-
-Copyright (c) 1994, 1997, 2001, 2002, 2003, 2004, 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+Redistribution and use in source and binary forms are permitted
+provided that the above copyright notice and this paragraph are
+duplicated in all such forms and that any documentation,
+advertising materials, and other materials related to such
+distribution and use acknowledge that the software was developed
+at Cygnus Solutions.  Cygnus Solutions may not be used to
+endorse or promote products derived from this software without
+specific prior written permission.
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/ChangeLog b/ChangeLog
index c0126cd..12d27a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3845 +1,3 @@
-2006-03-14  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.in: Regenerate.
-
-2006-03-14  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync with gcc:
-	2006-03-10  Aldy Hernandez  <aldyh@redhat.com>
-
-        * configure.in: Handle --disable-<component> generically.
-        * configure: Regenerate.
-
-	2006-02-21 Rafael Avila de Espindola <rafael.espindola@gmail.com>
-        
-        * Makefile.tpl  (BUILD_CONFIGDIRS): Remove.
-        (TARGET_CONFIGDIRS): Remove.
-        * configure.in: Remove AC_SUBST(target_configdirs).
-        * Makefile.in, configure: Regenerated.
-
-
-2006-03-01  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR libgcj/17311
-	* ltmain.sh: Don't use "$finalize_rpath" for compile.
-
-2006-02-20  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/25670
-
-	* Makefile.tpl ([+compare-target+]): Print explanation messages.
-
-	* Makefile.def (ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES): New flags_to_pass.
-	* Makefile.tpl (BASE_FLAGS_TO_PASS): Support optional flags_to_pass.
-	(EXTRA_GCC_FLAGS): Remove ADAFLAGS, BOOT_ADAFLAGS, LANGUAGES,
-	BUILD_PREFIX, BUILD_PREFIX_1.
-	* configure.in: (BUILD_PREFIX, BUILD_PREFIX_1): Don't substitute.
-
-	* Makefile.def (bootstrap stage 1): Pass LIBCFLAGS too.
-	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Override LIBCFLAGS too.
-
-	* Makefile.tpl (configure-stage[+id+]-[+prefix+][+module+],
-	all-stage[+id+]-[+prefix+][+module+], : Use $(current_stage) instead
-	of `cat stage_current`.  Always provide the `r' and `s' variables.
-	(clean-stage[+id+]-[+prefix+][+module+]): Likewise, and make it into
-	a single shell execution.
-	(configure-[+prefix+][+module+], all-[+prefix+][+module+]): For
-	bootstrapped modules, make the stage1 module if the build was not
-	started yet, else build the current stage.
-	(all-host, all-target): Omit bootstrapped modules (if bootstrapping).
-	(all-build, all-host, all-target, [+make_target+]-host,
-	[+make_target+]-target): Do not use \-continued lines.
-	(target modules): Depend on stage_last, not all-gcc, if bootstrapping.
-	(current_stage, restrap, stage_last): New.
-
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-
-2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync from gcc:
-
-	2006-01-31  Richard Guenther  <rguenther@suse.de>
-		    Paolo Bonzini  <bonzini@gnu.org>
-
-        * Makefile.def (target_modules): Add libgcc-math target module.
-        * configure.in (target_libraries): Add libgcc-math target library.
-        (--enable-libgcc-math): New configure switch.
-        * Makefile.in: Re-generate.
-        * configure: Re-generate.
-        * libgcc-math: New toplevel directory.
-
-	2006-01-18  Richard Henderson  <rth@redhat.com>
-	            Jakub Jelinek  <jakub@redhat.com>
-	            Diego Novillo  <dnovillo@redhat.com>
-
-        * libgomp: New directory.
-        * Makefile.def: Add target_module libgomp.
-        * Makefile.in: Regenerate.
-        * configure.in (target_libraries): Add target-libgomp.
-        * configure: Regenerate.
-
-2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
-	    Andreas Schwab  <schwab@suse.de>
-	 
-	* configure: Regenerate.
-
-2006-01-16  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in: Set with_gnu_as, with_gnu_ld, with_newlib earlier.
-	Set md_exec_prefix.  Use ACX_CHECK_INSTALLED_TARGET_TOOL to find
-	the assembler, linker and binutils.
-	* configure: Regenerate.
-
-2006-01-16  Nick Clifton  <nickc@redhat.com>
-
-        * config.sub, config.guess: Sync from config repository.
-
-2006-01-05  Alexandre Oliva  <aoliva@redhat.com>
-
-	* Makefile.tpl (clean-stage[+id+]-[+prefix+][+module+]): Remove
-	@ from continuation.
-	* Makefile.in: Rebuilt.
-
-2006-01-04  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync from gcc:
-
-	2006-01-04  Paolo Bonzini  <bonzini@gnu.org>
-
-        PR bootstrap/24252
-
-        * Makefile.def (flags_to_pass): Add STAGE1_CFLAGS and STAGE1_LANGUAGES.
-        * Makefile.tpl (OBJDUMP): New.
-        (EXTRA_HOST_FLAGS): Add it.
-        (EXTRA_GCC_FLAGS): Remove flags already specified in flags_to_pass.
-
-        * Makefile.tpl (stage[+id+]-start, stage[+id+]-end): Do not try
-        to use symbolic links between directories.  Avoid race conditions
-        or make them harmless.
-        * configure.in: Do not try to use symbolic links between directories.
-
-        * Makefile.def (LEAN): Pass.
-        * Makefile.tpl (LEAN): Define.
-        (stage[+id+]-start): Accept that the previous directory does not
-        exist, if the bootstrap is lean.
-        (stage[+id+]-bubble): Invoke lean bootstrap commands after
-        stage[+id+]-start.  Use a makefile variable and an `if' instead of a
-        configure substitution.
-        ([+compare-target+]): Likewise.
-        ([+bootstrap-target+]-lean): New.
-        * configure.in: Remove lean bootstrap support from here.
-
-        * Makefile.in: Regenerate.
-        * configure: Regenerate.
-
-	2006-01-02  Andreas Schwab  <schwab@suse.de>
-
-        * configure.in: When reconfiguring remove Makefile in
-        all stage directories.
-        * configure: Regenerate.
-
-2005-12-27  Leif Ekblad  <leif@rdos.net>
-
-	* configure.in: Add support for RDOS target.
-	* configure: Regenerate.
-
-2005-12-27  Nick Clifton  <nickc@redhat.com>
-
-	PR binutils/1990
-	* libtool.m4: Synchronize with version in GCC sources.
-
-2005-12-20  Paolo Bonzini  <bonzini@gnu.org>
-
-        Revert Ada-related part of the previous change.
-
-        * Makefile.def (ADAFLAGS, BOOT_ADAFLAGS, ADAFLAGS_FOR_TARGET):
-        Do not pass.
-        * Makefile.tpl (BOOT_ADAFLAGS): Do not define.
-        * Makefile.in: Regenerate.
-        * configure.in: Do not include mt-ppc-aix target fragment.
-        * configure: Regenerate.
-
-2005-12-19  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in: Select appropriate fragments for PowerPC/AIX.
-	* configure: Regenerate.
-
-	* Makefile.def (flags_to_pass): Add ADAFLAGS, BOOT_ADAFLAGS,
-	BOOT_CFLAGS, BOOT_LDFLAGS.
-	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Handle BOOT_ADAFLAGS,
-	BOOT_CFLAGS, BOOT_LDFLAGS.
-	(TARGET_FLAGS_TO_PASS): Handle ADAFLAGS_FOR_TARGET.
-	(stage[+id+]-bubble): Pass flags recursively to the comparison target.
-	(stage): Fail if we cannot complete the work.
-	* Makefile.in: Regenerate.
-
-2005-12-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Update copyright year for default
-	copyright.
-
-2005-12-15  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (all, do-[+make_target+], do-check, install,
-	install-host-nogcc): Don't invoke $(stage) at the end.
-	* Makefile.in: Regenerate.
-
-2005-12-14  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in: Flip the top-level bootstrap switch.
-	* configure: Regenerate.
-
-	Merge from gcc:
-
-	2005-12-14  Daniel Jacobowitz  <dan@codesourcery.com>
-
-        * Makefile.tpl: Throughout the file, use : $(MAKE) along with
-        $(stage) and $(unstage).
-        (EXTRA_TARGET_FLAGS): Correct double-quoting.
-        (all): Remove stray semicolon.
-        (local-distclean): Don't handle multilib.tmp and multilib.out.
-        (install.all): Set $s for consistency.
-        (configure-[+prefix+][+module+]): Instead of [+deps+], handle
-        check_multilibs setting.  Always make the install directory.
-        (configure-stage[+id+]-[+prefix+][+module+]): Likewise.
-        Correct @if/@endif.
-        (all-stage[+id+]-[+prefix+][+module+]): Correct @if/@endif.
-        ($(TARGET_SUBDIR)/[+module+]/multilib.out): Remove.
-        (stage[+id+]-start, stage[+id+]-end): Stage $(TARGET_SUBDIR).
-        (multilib.out): Remove.
-        * Makefile.in: Regenerated.
-
-2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* config.sub: Replace ms1 arch with mt.  Allow ms1 as alias.
-	* configure.in: Replace ms1 arch with mt.
-	* configure: Rebuilt.
-
-2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync with gcc:
-
-2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* config.sub: Replace ms1 arch with mt.  Allow ms1 as alias.
-	* configure.in: Replace ms1 arch with mt.
-	* configure: Rebuilt.
-
-2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync with gcc:
-
-	2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
-
-        * configure.in (CONFIGURED_BISON, CONFIGURED_YACC, CONFIGURED_M4,
-        CONFIGURED_FLEX, CONFIGURED_LEX, CONFIGURED_MAKEINFO): Remove
-        "CONFIGURED_" from the AC_CHECK_PROGS invocation.  Move below.
-        Find in-tree tools if available.
-        (EXPECT, RUNTEST, LIPO, STRIP): Find them and substitute them.
-        (CONFIGURED_*_FOR_TARGET): Don't set nor substitute.
-        (*_FOR_TARGET): Set them with GCC_TARGET_TOOL.
-        (COMPILER_*_FOR_TARGET): New.
-        * Makefile.tpl (HOST_EXPORTS): Add *_FOR_TARGET symbols that gcc needs.
-        (BASE_TARGET_EXPORTS): Use COMPILER_*_FOR_TARGET symbols.
-        (CONFIGURED_*, USUAL_*): Remove.
-        (BISON, YACC, FLEX, LEX, M4, MAKEINFO, EXPECT, RUNTEST, LIPO,
-        STRIP): Use autoconf substitutions.
-        (COMPILER_AS_FOR_TARGET, COMPILER_LD_FOR_TARGET,
-        COMPILER_NM_FOR_TARGET): New.
-        (EXTRA_HOST_FLAGS): Pass LIPO and STRIP.
-
-        (all): Make all-host and all-target in parallel.
-        (do-[+make_target+], do-check, install, [+compare-target+]): Ensure
-        that $$r and $$s are set before invoking a recursive make.
-        (stage[+id+]-bubble): Likewise, and invoke the comparison at the end.
-        ([+bootstrap-target+]): Inline most of the `all' target.
-
-	2005-11-29  Ben Elliston  <bje@au.ibm.com>
-
-        * Makefile.tpl (clean-target-libgcc): Invoke clean-target-libgcc
-        from the gcc build directory.
-        * Makefile.in: Regenerate.
-
-	2005-11-29  Ben Elliston  <bje@au.ibm.com>
-
-        * Makefile.def: Add new libdecnumber host_module.  Make all-gcc
-        depend on all-libdecnumber.
-        * configure.in (host_libs): Include libdecnumber.
-        * Makefile.in: Regenerate.
-        * configure: Likewise.
-
-	2005-11-21  Kean Johnston  <jkj@sco.com>
-
-        * config.sub, config.guess: Sync from upstream sources.
-
-2005-11-11  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* Makefile.def: Remove gdb dependencies for gdbtk.
-	* Makefile.tpl (CONFIGURE_GDB_TK, INSTALL_GDB_TK): New variables.
-	(configure-gdb, install-gdb): New rules.
-	* configure.in: Set CONFIGURE_GDB_TK and INSTALL_GDB_TK.
-	* Makefile.in, configure: Regenerated.
-
-2005-10-22  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/24297
-	* Makefile.tpl (do-[+make-target+], do-check, install,
-	stage[+id+]-bubble, [+compare-target+]): Ensure $$r and $$s
-	are set before recursing.
-	* Makefile.in: Regenerate.
-
-2005-10-20  Eric Botcazou  <ebotcazou@adacore.com>
-
-	PR bootstrap/18939
-	* Makefile.def (gcc) <target>: Fix thinko.
-	* Makefile.in: Regenerate.
-
-2005-10-17  Bernd Schmidt  <bernd.schmidt@analog.com>
-
-	* configure.in (bfin-*-*): Use test, not brackets, in if statement.
-	* configure: Regenerate.
-
-2005-10-09  Kazu Hirata  <kazu@codesourcery.com>
-
-	* configure.in (arm-*-linux-gnueabi): Add to noconfigdirs
-	target-libffi, target-qthreads, target-libjava, and
-	targetlibobjc.
-	* configure: Regenerate.
-
-2005-10-06  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* Makefile.def (flags_to_pass): Add OBJDUMP_FOR_TARGET.
-	* Makefile.tpl (BASE_TARGET_EXPORTS): Add OBJDUMP.
-	(OBJDUMP_FOR_TARGET, CONFIGURED_OBJDUMP_FOR_TARGET)
-	(USUAL_OBJDUMP_FOR_TARGET): New.
-	(EXTRA_TARGET_FLAGS): Add OBJDUMP.
-	* configure.in: Check for $OBJDUMP_FOR_TARGET.
-	* configure, Makefile.in: Regenerated.
-
-2005-10-05  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (all) [gcc-no-bootstrap]: Make prebootstrap packages
-	before other host packages.
-
-2005-10-05  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/22340
-
-	* configure.in (default_target): Remove.
-	* Makefile.tpl (all): Do not use prerequisites as subroutines
-	(all) [gcc-bootstrap]: Bootstrap gcc first if it was not done yet.
-	(do-[+make_target+], check, install, [+bootstrap_target+]): Do not
-	use prerequisites as subroutines.
-	(check-host, check-target): New.
-	(bootstrap configure & all targets): Do not use stage*-start
-	if the directory layout is already ok.
-	(non-bootstrap configure & all targets): Prepend a $(unstage).
-	(stage[+id+]-bubble): Do that here.  Do not use NOTPARALLEL.
-	(NOTPARALLEL): Remove.
-	(unstage, stage variables): New variables.
-	(unstage, stage targets): Simply expand to those variables.
-
-	* configure: Regenerate.
-	* Makefile.in: Regenerate.
-
-2005-10-04  James E Wilson  <wilson@specifix.com>
-
-	* Makefile.def (lang_env_dependencies): Add libmudflap.
-	* Makefile.in: Regenerate.
-
-2005-10-03  Catherine Moore  <clm@cm00re.com>
-
-	* configure.in (bfin-*-*): Support bfin.
-	* configure: Regenerated.
-
-2005-09-30  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* configure.in (*-*-darwin*): Build bfd, binutils and opcodes.
-	* configure: Regenerated.
-
-2005-09-28  Geoffrey Keating  <geoffk@apple.com>
-
-	* Makefile.tpl (BASE_TARGET_EXPORTS): Add LIPO, STRIP.
-	(LIPO_FOR_TARGET): New.
-	(CONFIGURED_LIPO_FOR_TARGET): New.
-	(USUAL_LIPO_FOR_TARGET): New.
-	(STRIP_FOR_TARGET): New.
-	(CONFIGURED_STRIP_FOR_TARGET): New.
-	(USUAL_STRIP_FOR_TARGET): New.
-	* Makefile.def (flags_to_pass): Add LIPO_FOR_TARGET and
-	STRIP_FOR_TARGET.
-	* configure.in: Set LIPO_FOR_TARGET, STRIP_FOR_TARGET,
-	CONFIGURED_LIPO_FOR_TARGET, CONFIGURED_STRIP_FOR_TARGET.
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-	
-2005-09-19  David Edelsohn  <edelsohn@gnu.org>
-
-	* configure.in (powerpc-*-aix*): Add target-libssp to noconfigdirs.
-	(rs6000-*-aix*): Same.
-	* configure: Regenerate.
-
-2005-09-14  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
-
-	* configure.in: Recognize f95 in the --enable-languages option,
-	and substitute it for fortran, issuing a warning.
-	* configure: Regenerate.
-
-2005-09-07  Ben Elliston  <bje@au.ibm.com>
-
-	Import from Autoconf sources:
-
-	2005-09-06  Paul Eggert  <eggert@cs.ucla.edu>
-	* move-if-change: Don't output "$2 is unchanged"; suggested by Ben
-	Elliston.  Handle weird characters correctly.
-
-2005-08-30  Phil Edwards  <phil@codesourcery.com>
-
-	* configure.in (*-*-vxworks*):  Add target-libstdc++-v3 to noconfigdirs.
-	* configure:  Regenerated.
-
-2005-08-20  Richard Earnshaw  <richard.earnshaw@arm.com>
-
-        * Makefile.def (libssp): Add to lang_env_dependencies.
-        * Makefile.in: Regenerate.
-
-2005-08-17  Christian Groessler  <chris@groessler.org>
-
-	* Makefile.tpl: (USUAL_CC_FOR_TARGET): Add missing trailing slash.
-	* Makefile.in: Regenerate.
-
-2005-08-12  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in: Replace NCN_STRICT_CHECK_TOOL with
-	NCN_STRICT_CHECK_TOOLS, and likewise for NCN_STRICT_CHECK_TARGET_TOOLS.
-	Look for alternate names of the target cc and c++
-	* configure: Regenerate.
-
-2005-08-08  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in (CC_FOR_TARGET, CXX_FOR_TARGET, GCJ_FOR_TARGET,
-	GCC_FOR_TARGET, RAW_CXX_FOR_TARGET, GFORTRAN_FOR_TARGET): Find
-	them with NCN_STRICT_CHECK_TARGET_TOOL, like the other target
-	tools; remove code to manually set them.
-	(Target tools): Look in the environment for them.
-	* Makefile.tpl (CC_FOR_TARGET, CXX_FOR_TARGET, GCJ_FOR_TARGET,
-	GCC_FOR_TARGET, RAW_CXX_FOR_TARGET, GFORTRAN_FOR_TARGET): Redefine.
-	(AS_FOR_TARGET, LD_FOR_TARGET, NM_FOR_TARGET): Look into gcc
-	build directory.
-	(CONFIGURED_CC_FOR_TARGET, CONFIGURED_CXX_FOR_TARGET,
-	CONFIGURED_GCJ_FOR_TARGET, CONFIGURED_GCC_FOR_TARGET,
-	CONFIGURED_GFORTRAN_FOR_TARGET, USUAL_CC_FOR_TARGET,
-	USUAL_CXX_FOR_TARGET, USUAL_GCJ_FOR_TARGET, USUAL_GCC_FOR_TARGET,
-	USUAL_RAW_CXX_FOR_TARGET, USUAL_GFORTRAN_FOR_TARGET): New.
-	(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE,
-	RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE, RECURSE_FLAGS): Delete.
-	* configure: Regenerate.
-	* Makefile.in: Regenerate.
-
-2005-07-27  Mark Mitchell  <mark@codesourcery.com>
-
-	* Makefile.tpl (EXTRA_TARGET_FLAGS): Set LDFLAGS=LDFLAGS_FOR_TARGET.
-	* Makefile.def (flags_to_pass): Add LDFLAGS_FOR_TARGET. 
-	* Makefile.in: Regenerated.
-
-2005-07-26  Mark Mitchell  <mark@codesourcery.com>
-
-	* Makefile.tpl (SYSROOT_CFLAGS_FOR_TARGET): New variable.
-	(CFLAGS_FOR_TARGET): Use it.
-	(CXXFLAGS_FOR_TARGET): Likewise.
-	* Makefile.in: Regenerated.
-	* configure.in (--with-build-sysroot): New option.
-	* configure: Regenerated.
-
-2005-07-24  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl: Wrap install between unstage and stage
-	* Makefile.in: Regenerate.
-
-2005-07-16  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* all files: Update FSF address.
-
-2005-07-14  Jim Blandy  <jimb@redhat.com>
-
-	* configure.in: Add cases for Renesas m32c.
-	* configure: Regenerated.
-	
-2005-07-14  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* COPYING, compile, config-ml.in, config.guess,
-	config.sub, install-sh, missing, mkinstalldirs,
-	symlink-tree, ylwrap: Sync from upstream sources.
-
-2005-07-13  Eric Christopher  <echristo@redhat.com>
-
-	* configure.in: Add toplevel noconfigdir support for tpf.
-	* configure: Regenerate.
-
-2005-07-11  Jakub Jelinek  <jakub@redhat.com>
-
-	* Makefile.def (target_modules): Add libssp.
-	* configure.in (target_libraries): Add target-libssp.
-	* configure: Rebuilt.
-	* Makefile.in: Rebuilt.
-
-2005-07-11  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR ada/22340
-
-	* Makefile.def: Sync with gcc.
-	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Fix pasto.
-	* Makefile.in: Regenerate.
-
-2005-07-07  Andreas Schwab  <schwab@suse.de>
-
-	* Makefile.def (flags_to_pass): Add CFLAGS_FOR_BUILD.
-	* Makefile.tpl (EXTRA_GCC_FLAGS): Don't pass CFLAGS_FOR_BUILD here.
-	* Makefile.in: Regenerated.
-
-2005-07-07  Kazu Hirata  <kazu@codesourcery.com>
-
-	* configure.in: Add --enable-libssp and --disable-libssp.
-	* configure: Regenerate with autoconf-2.13.
-
-2005-07-06  Geoffrey Keating  <geoffk@apple.com>
-
-	* configure.in: Don't build sim or rda when targetting darwin.
-	* configure: Regenerate.
-
-2005-07-04  Ben Elliston  <bje@gnu.org>
-
-	* src-release (do-proto-toplev): Remove dejagnu bits.
-	(DEJAGNU_SUPPORT_DIRS): Remove.
-	(dejagnu.tar.bz2, dejagnu.tar): Likewise.
-	(GDBD_SUPPORT_DIRS): Likewise.
-	(gdb+dejagnu.tar.bz2, gdb+dejagnu.tar): Likewise.
-	(INSIGHTD_SUPPORT_DIRS): Likewise.
-	(insight+dejagnu.tar.bz2, insight+dejagnu.tar): Likewise.
-
-2005-06-30  Ben Elliston  <bje@gnu.org>
-
-	* setup.com (mpw): Remove unused directive.
-
-2005-06-22  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (stagefeedback): Come after profile.
-	Define profiledbootstrap target.
-	* Makefile.tpl (profiledbootstrap): Remove.
-	(stageprofile-end): Zap stagefeedback.
-	(stagefeedback-start): Copy all .gcda files, not only GCC's.
-	* Makefile.in: Regenerate.
-
-2005-06-13  Zack Weinberg  <zack@codesourcery.com>
-
-	* depcomp: Update from automake CVS.  Add 'ia64hp' stanza.
-	In 'cpp' stanza, support '#line' as well as '# '.
-
-2005-06-07  Hans-Peter Nilsson  <hp@axis.com>
-
-	* configure.in (unsupported_languages): New macro.
-	<mmix-knuth-mmixware>: Set unsupported_languages.  Name explicit
-	non-ported target libraries in noconfigdirs.
-	<cris-*, crisv32-*> Ditto, except for non-aout, non-elf,
-	non-linux-gnu.  Remove libgcj_ex_libffi.
- 	<lang_frag loop>: Set add_this_lang=no if the language is in
-	unsupported_languages.
-	* configure: Regenerate.
-
-2005-06-04  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
-
-	* configure.in: Fix typo in handling of --with-mpfr-dir.
-	* configure: Regenerate.
-
-2005-06-02  Jim Blandy  <jimb@redhat.com>
-
-	* config.sub: Add cases for the Renesas m32c.  (This patch has been
-	accepted into the master sources.)
-
-2005-06-02  Aldy Hernandez  <aldyh@redhat.com>
-            Michael Snyder  <msnyder@redhat.com>
-            Stan Cox  <scox@redhat.com>
-
-        * configure.in: Set noconfigdirs for ms1.
-
-        * configure: Regenerate.
-
-2005-05-25  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (stage[+id+]-start): Iterate over target module as well.
-	(Dependencies): Consider target modules for bootstrap dependencies.
-	Make target bootstrap modules depend on each stage's gcc.
-	* Makefile.in: Regenerate.
-
-2005-05-20  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (configure-gcc): Depend on binutils having been built.
-	(all-gcc): No need to do it here.
-	* Makefile.in: Regenerate.
-
-2005-05-19  Paul Brook  <paul@codesourcery.com>
-
-	* configure.in: Rewrite misleading error message when requested 
-	language cannot be built.
-	* configure: Regenerate.
-
-2005-05-15  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* ylwrap: Import from Automake 1.9.5.
-
-2005-05-04  Mike Stump  <mrs@apple.com>
-
-	* configure.in: Always pass --target to target configures as
-	otherwise rebuilds that do --recheck will fail.
-	* configure: Rebuilt.
-
-2005-05-04  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Rename from
-	STAGE_HOST_EXPORTS.
-	(configure, all): Add bootstrap support.
-	(Host modules, target modules): Pass post-stage1 flags and exports.
-	(Top-level bootstrap): Remove bootstrap rules, expanded elsewhere.
-	* Makefile.in: Regenerate.
-
-2005-04-29  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync from gcc:
-
-	2005-04-22  Bernd Schmidt  <bernd.schmidt@analog.com>
-
-        * config.sub: Update from master copy.
-
-	2005-04-19  Hans-Peter Nilsson  <hp@axis.com>
-
-        * configure.in <crisv32-*-*, cris-*-*>: New local variable
-        libgcj_ex_libffi.  Have specific match for *-*-linux*.  Separate
-        matches for "*-*-aout" and "*-*-elf".  Don't disable libffi for
-        "*-*-elf" and "*-*-linux*".
-        * configure: Regenerate.
-
-2005-04-06  Paolo Bonzini  <bonzini@gnu.org>
-
-        * Makefile.tpl (BUILD_CONFIGARGS): Include --with-build-subdir.
-	(TARGET_CONFIGARGS): Include --with-target-subdir.
-	(configure, all): New macros.  Use them throughout.
-
-2005-04-05  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl: Sync with gcc.
-	* Makefile.in: Regenerate.
-
-2005-03-30  J"orn Rennecke <joern.rennecke@st.com>
-
-	* config/mh-mingw32: Delete.
-	* configure.in: Don't use it.
-	* configure: Regenerate.
-
-2005-03-31  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (bfd, opcodes, libstdc++-v3, libmudflap): Set lib_path.
-	* Makefile.tpl (SET_LIB_PATH, REALLY_SET_LIB_PATH): Remove.
-	(HOST_EXPORTS, STAGE_HOST_EXPORTS, TARGET_EXPORTS): Set $(RPATH_ENVVAR).
-	(HOST_LIB_PATH): Generate from Makefile.def.
-	(TARGET_LIB_PATH): Likewise.
-	(Old bootstrap targets): Include TARGET_LIB_PATH into RPATH_ENVVAR.
-	* Makefile.in: Regenerate.
-	* configure.in (set_lib_path, SET_LIB_PATH, SET_GCC_LIB_PATH): Remove.
-	(RPATH_ENVVAR): Include Darwin case.
-	* configure: Regenerate.
-
-2005-03-25  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in (RPATH_ENVVAR): Set to DYLD_LIBRARY_PATH on Darwin.
-	* configure: Regenerate.
-
-2005-03-21  Zack Weinberg  <zack@codesourcery.com>
-
-	* Makefile.def: Remove libstdcxx_incdir, libsubdir, gxx_include_dir,
-	gcc_version, and gcc_version_trigger from set of flags to pass.
-	* Makefile.tpl: Remove definitions of above variables.
-	(config.status): Remove dependency on $(gcc_version_trigger).
-	* Makefile.in: Regenerate.
-	* configure.in: Do not reference config/gcc-version.m4 nor
-	config/gxx-include-dir.m4.  Do not invoke TL_AC_GCC_VERSION nor
-	TL_AC_GXX_INCLUDE_DIR.  Do not set gcc_version_trigger.
-	* configure: Regenerate.
-
-2005-03-16  Manfred Hollstein  <manfred.h@gmx.net>
-	    Andrew Pinski <pinskia@physics.uc.edu>
-
-	* Makefile.tpl (check-[+module+]): Fix shell statement inside if ... fi.
-	* Makefile.in: Regenerate.
-
-2005-03-01  Alexandre Oliva  <aoliva@redhat.com>
-
-	PR libgcj/20160
-	* ltmain.sh: Avoid creating archives with components that have
-	duplicate basenames.
-
-2005-02-28  Andrew Pinski  <pinskia@physics.uc.edu>
-
-	PR bootstrap/20250
-	* Makefile.tpl (HOST target installs): Fix copy and pasto, use install
-	instead of check.
-	* Makefile.in: Regenerate.
-
-2005-02-28  Paolo Bonzini  <bonzini@gnu.org>
-
-	Sync from gcc.
-
-	2005-02-28  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/17383
-	* Makefile.def (target_modules): Remove "stage", now unnecessary.
-	* Makefile.tpl (HOST_SUBDIR): New substitution.
-	(STAGE_HOST_EXPORTS, EXPECT, HOST_LIB_PATH, USUAL_AR_FOR_TARGET,
-	USUAL_AS_FOR_TARGET, USUAL_DLLTOOL_FOR_TARGET, USUAL_GCC_FOR_TARGET,
-	USUAL_LD_FOR_TARGET, USUAL_NM_FOR_TARGET, USUAL_OBJDUMP_FOR_TARGET,
-	USUAL_RANLIB_FOR_TARGET, USUAL_WINDRES_FOR_TARGET): Use it.
-	(Host modules, Bootstrapped modules): Use it.
-	(Build modules, Target modules): Do not create symlink trees,
-	always configure out-of-srcdir.
-	(distclean): Try removing $(host_subdir) with rm before using rm -rf.
-	* configure.in (FLAGS_FOR_TARGET, CC_FOR_TARGET, GCJ_FOR_TARGET,
-	GFORTRAN_FOR_TARGET, CXX_FOR_TARGET, RAW_CXX_FOR_TARGET): Use
-	$(HOST_SUBDIR).  Create a symlink for host_subdir.
-
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-
-	Merged from libada-gnattools-branch:
-	2004-11-28  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.def: Add gnattools as a module, depending on target-libada.
-	* Makefile.in: Regenerate.
-	* configure.in: Include gnattools in host_tools; disable it if ada
-	is disabled.
-	* configure: Regenerate.
-
-2005-02-23  Nick Clifton  <nickc@redhat.com>
-
-	* configure: Regenerate.
-
-2005-02-22  Paul Schlie  <schlie@comcast.net>
-
-	* configure.in: Allow darwin targeted ports to build tk, itcl and
-	libgui.
-
-2005-02-21  Eric Botcazou  <ebotcazou@libertysurf.fr>
-
-	PR libgcj/10353
-	* configure.in (noconfigdirs) <sparc-*-solaris2.[0-6]>: Add libgcj.
-	* configure: Regenerate.
-
-2005-02-08  Andrew Cagney  <cagney@gnu.org>
-
-	* MAINTAINERS: Delete reference to dejagnu/ and mmalloc/ from the
-	gdb/ section.  Update GDB's URL.
-
-2005-01-31  Andrew Cagney  <cagney@gnu.org>
-
-	* gettext.m4: Only set ENABLE_NLS when gettext is present.
-
-2005-01-29  Hans-Peter Nilsson  <hp@axis.com>
-
-	* configure.in (noconfigdirs) <crisv32-*-*>: Match like cris-*-*.
-	<crisv32-*-*, cris-*-*>: Only disable target-newlib and
-	target-libgloss when not *-*-elf and *-*-aout.
-	* configure: Regenerate.
-
-2005-01-27  Andrew Cagney  <cagney@gnu.org>
-
-	* gettext.m4: Don't use NONE as a default for CATOBJEXT.
-
-2005-01-24  Andrew Cagney  <cagney@gnu.org>
-
-	* gettext.m4: Only fall back to ../intl/ when it's present.
-
-2005-01-17  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* install-sh, config.sub: Import from upstream.
-
-2005-01-17  Kelley Cook  <kcook@gcc.gnu.org>
-
-	PR bootstrap/18222
-	* Makefile.def: Pass CPPFLAGS_FOR_TARGET.
-	* Makefile.tpl: Define target CPPFLAGS on CPPFLAGS_FOR_TARGET.
-	* Makefile.in: Regenerate.
-
-2005-01-03  Paolo Bonzini  <bonzini@gnu.org>
-
-	Revert 2004-12-28 Makefile changes, a better fix will be
-	applied to mainline and src after GCC 4.0 branches.
-
-2004-12-28  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/17383
-
-	* Makefile.def (target_modules): Remove stage parameter,
-	it is always true now.
-	* Makefile.tpl (configure-build-[+module+],
-	configure-target-[+module+]): Always build symlink tree
-	for the directory and for include.  BUILD_SUBDIR and
-	TARGET_SUBDIR cannot be . anymore.
-	* Makefile.in: Regenerate.
-
-2004-12-25  David Edelsohn  <edelsohn@gnu.org>
-
-	Revert 2004-12-08 Makefile changes.
-
-2004-12-16  Andrew Stubbs  <andrew.stubbs@st.com>
-
-	* configure.in (sh64-*-*): Reenable gprof.
-	* configure: Regenerate.
-
-2004-12-09  Jim Blandy  <jimb@redhat.com>
-
-	* MAINTAINERS: List 'depcomp' as part of automake.
-
-2004-12-08  David Edelsohn  <edelsohn@gnu.org>
-
-	* Makefile.def (flags_to_pass): Add PICFLAG_FOR_TARGET.
-	* Makefile.tpl (EXTRA_HOST_FLAGS): Add PICFLAG.
-	(EXTRA_TARGET_FLAGS): Add PICFLAG.
-	* Makefile.in: Regenerate.
-
-2004-12-07  Matt Kraai  <kraai@ftbfs.org>
-
-	* Makefile.tpl: Generate normal dependencies if the LHS module is
-	not bootstrapped.
-	* Makefile.in: Regenerate.
-
-2004-12-03  Richard Sandiford  <rsandifo@redhat.com>
-
-	* configure.in: Include config/gxx-include-dir.m4.  Use
-	TL_AC_GXX_INCLUDE_DIR.  Remove some now-redundant AC_SUBSTs.
-	* configure: Regenerate.
-
-2004-12-03  Richard Sandiford  <rsandifo@redhat.com>
-
-	* config.if: Delete.
-	* configure.in: Set libstdcxx_incdir directly.
-	* configure: Regenerate.
-	* MAINTAINERS: Remove mention of config.if.
-	* src-release (DEVO_SUPPORT): Remove config.if.
-
-2004-12-02  Eric Christopher  <echristo@redhat.com>
-
-	* Makefile.tpl (clean-target-libgcc): Add stmp-dirs to list
-	of things to remove.
-	* Makefile.in: Regenerate.
-
-2004-12-02  Richard Sandiford  <rsandifo@redhat.com>
-
-	* configure.in: Clear gcc_version_trigger if the file doesn't exist.
-	* configure: Regenerate.
-
-2004-12-02  Richard Sandiford  <rsandifo@redhat.com>
-
-	* configure.in: Include config/gcc-version.m4.  Use TL_AC_GCC_VERSION
-	to set gcc_version_trigger.  Remove some now-redundant AC_SUBSTs.
-	* configure: Regenerate.
-
-2004-11-26  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-
-	* configure.in (hppa*-*-linux*): Don't add libgcj to noconfigdirs.
-	(hppa*64*-*-*): Delete incorrect comment.
-	* configure: Rebuilt.
-
-2004-11-15  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* install-sh, compile: Import from automake.
-
-2004-11-15  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* config.guess, config.sub:  Import from savannnah.
-
-2004-11-12  Mike Stump  <mrs@apple.com>
-
-	* Makefile.def: Add html support.
-	* Makefile.tpl: Likewise.
-	* Makefile.in: Regenerate.
-
-2004-11-11  Geoffrey Keating  <geoffk@apple.com>
-
-	PR 18423
-	* configure.in: Remove all instances of build-fixincludes from
-	noconfigdirs.
-	(build_configargs): Supply --target to subdirectories.
-	* configure: Regenerate.
-
-	* Makefile.def: Make gcc install depend on fixincludes install.
-	* Makefile.in: Regenerate.
-
-2004-11-08  Hans-Peter Nilsson  <hp@bitrange.com>
-
-	* configure.in (noconfigdirs) [mmix-*-*]: Disable
-	target-libgfortran.
-	* configure: Regenerate.
-
-2004-11-07  David Edelsohn  <edelsohn@gnu.org>
-
-	* config-ml.in: Pass FCFLAGS for multilibs, handle GFORTRAN
-	like CC.
-
-2004-11-05  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (host fixincludes): Specify missing targets.
-	* Makefile.in: Regenerate.
-
-2004-11-04  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR other/17783
-	* configure.in: Set up LD_LIBRARY_PATH by default for gcc.
-	* configure: Regenerated.
-
-2004-11-04  Daniel Jacobowitz  <dan@debian.org>
-
-	* configure.in (arm-*-oabi*, thumb-*-oabi*): Remove.
-	* configure: Regenerated.
-
-2004-10-28  Eric B. Weddington  <ericw@evcohs.com>
-
-	PR target/18151
-	* configure.in (case ${target}): Do not build fixincludes for avr.
-	* configure: Regenerated.
-
-2004-10-26  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in (case ${target}): Do not build fixincludes
-	on platforms where it is not used.
-	* configure: Regenerated.
-
-2004-10-23  Daniel Jacobowitz  <dan@debian.org>
-
-	* configure.in: Use an absolute path to install-sh.
-	* configure: Regenerated.
-
-2004-10-19  Andrew Cagney  <cagney@gnu.org>
-
-	* src-release (do-djunpack, do-md5sum): Install the generated file
-	directly into the proto-toplev/ directory.
-
-2004-10-19  Andrew Cagney  <cagney@gnu.org>
-
-	* src-release (GDB_SUPPORT_DIRS): Remove utils and intl.
-
-2004-10-12  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* configure.in (*-*-cygwin*): Supress warning if newlib not present.
-	* configure: Regenerate.
-
-2004-10-06  Paolo Bonzini  <bonzini@gnu.org>
-
-	Fix wrong conflict resolution in:
-
-	2004-08-16  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.in: Regenerate.
-	* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
-	in the recursive `make', instead of hardwiring `all'.
-	(Autogenerated TARGET-* variables): New.
-
-2004-10-05  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	Merged from GCC / libtool upstream:
-	2004-10-02  P.J. Darcy  <darcypj@us.ibm.com>
-	* ltcf-c.sh (tpf*): Add ld_shlibs=yes.
-	* ltcf-cxx.sh (tpf*): Likewise.
-	* ltconfig (tpf*): Add TPF OS configuration support.
-
-2004-09-30  Tomer Levi  <Tomer.Levi@nsc.com>
-
-	* configure.in: Enable target-libgloss for crx-*-*.
-	* configure: Regenerate.
-
-2004-09-24  Michael Roth  <mroth@nessie.de>
-
-	* configure.in (--without-headers): Add missing double quotes.
-	* configure: Regenerate.
-
-2004-09-24  Kelley Cook <kcook@gcc.gnu.org>
-
-	* ylwrap: Revert to previous version.
-
-2004-09-23  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR bootstrap/17369
-	* Makefile.tpl (REALLY_SET_LIB_PATH): Add @SET_GCC_LIB_PATH@.
-	(HOST_EXPORTS]): Add @SET_GCC_LIB_PATH@. Set and export
-	SET_GCC_LIB_PATH_CMD.
-	(BASE_TARGET_EXPORTS): Likewise.
-	* Makefile.in: Regenerated.
-
-	* configure.in (SET_GCC_LIB_PATH): Set and substitute.
-	* configure: Regenerated.
-
-2004-09-23  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* config.guess: New upstream version
-	* compile, depcomp, install-sh, ylwrap: Likewise.
-
-2004-09-19  Roger Sayle  <roger@eyesopen.com>
-
-	* config/mh-x86omitfp: New host makefile fragment.  Add
-	-fomit-frame-pointer to the default BOOT_CFLAGS.
-	* configure.in: Use it to speed up bootstrap on some IA-32 hosts.
-	* configure: Regenerate.
-
-2004-09-15  Andrew Pinski  <pinskia@physics.uc.edu>
-
-	PR target/11572
-	* configure.in (*-*-darwin*): Renable libobjc.
-	* configure: Regenerate.
-
-2004-09-09  Daniel Berlin  <dberlin@dberlin.org>
-
-	* Makefile.def: Remove libbanshee.
-	* Makefile.tpl: Ditto.
-	* configure.in: Ditto.
-	* Makefile.in: Regen.
-	* configure: Ditto.
-
-2004-09-07  Paolo Bonzini  <bonzini@gnu.org>
-
-	* missing: Import latest version from master repository.
-
-2004-09-04  Nick Clifton  <nickc@redhat.com>
-
-	* config.sub: Import latest version from master repository.
-	* config.guess: Likewise.
-	This includes these changes:
-
-	2004-08-27  Hans-Peter Nilsson  <hp@axis.com>
-
-	* config.sub: Handle crisv32, alias etraxfs.
-	* config.guess (crisv32:Linux:*:*): Handle.
-
-	2004-08-13  Brad Smith  <brad@comstyle.com>
-
-	* config.guess (*:OpenBSD:*:*): Remove defunct MIPS machines.
-	(sgi:OpenBSD:*:*): Emit mips64, not mipseb.
-
-	2004-08-11  Paul Eggert  <eggert@cs.ucla.edu>
-
-	* config.guess (*:Darwin:*:*): If uname -p reports "unknown",
-	assume the processor is a powerpc.  This is because coreutils
-	uname (at least versions 4.5.7 through 5.2.1) outputs "unknown"
-	in this case, due to a MacOS X bug that causes
-	sysctl ((int[]) {CTL_HW, HW_MACHINE_ARCH}, 2, buffer, &bufsize, 0, 0)
-	to return a negative number.
-	Problem reported by Petter Reinholdtsen in:
-	http://lists.gnu.org/archive/html/bug-gnu-utils/2003-02/msg00201.html
-
-	2004-07-19  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (S7501:*:4.0:3.0): Handle NCR System V UNIX machine.
-
-	2004-06-24  Ben Elliston  <bje@gnu.org>
-
-	* config.guess: Update copyright years.
-	* config.sub: Likewise.
-
-	2004-06-22  Robert Millan  <robertmh@gnu.org>
-
-	* config.guess (*:FreeBSD:*:*): Remove check for glibc (unneeded
-	since GNU/kFreeBSD systems match *:GNU/*:*:* instead).
-
-	2004-06-22  Stanley F. Quayle <stan@stanq.com>
-
-	* config.guess (*:*VMS:*:*): New entry. Replaces
-	Alpha:OpenVMS:*. Recognize and advertise all VMS flavors as dec
-	manufacturer.
-
-	2004-06-22  Ben Elliston  <bje@gnu.org>
-
-	* config.guess: Cray fixes from Wendy Palm <wendyp@cray.com>.
-	* config.sub: Likewise.
-
-	2004-06-22  Ben Elliston  <bje@gnu.org>
-
-	Reported by Hans-Peter Nilsson <hp@bitrange.com>:
-	* config.sub: Correctly handle mmix-knuth and mmix-knuth-mmixware.
-
-	2004-06-11  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (pegasos:OpenBSD:*:*): Remove.
-
-	2004-06-11  Ben Elliston  <bje@gnu.org>
-
-	From Wouter Verhelst <wouter@grep.be>:
-	* config.guess (M68*:*:R3V[5678]:*): Detect R3V8.
-
-	2004-06-11  Ben Elliston  <bje@gnu.org>
-
-	* config.guess (luna88k:OpenBSD:*:*): New.
-
-	2004-03-12  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
-
-	* config.guess (m32r*:Linux:*:*): New case.
-	* config.sub: Handle m32rle.
-
-	2004-03-12  Ben Elliston  <bje@wasabisystems.com>
-
-	From Jens Petersen  <petersen@redhat.com>:
-	* config.sub: Handle sparcv8.
-
-	2004-03-03  Ben Elliston  <bje@wasabisystems.com>
-
-	From Tom Smith <smith@cag.lkg.hp.com>:
-	* config.guess: Version suffixes are equally significant on Tru64
-	V4.* and V5.*, so do not ignore them on V5.*.  Handle a version
-	prefix of "P" (patched kernel).
-
-	2004-02-23  Tal Agmon  <Tal.Agmon@nsc.com>
-
-	* config.sub: Add support for National Semiconductor CRX target.
-
-2004-09-03  Jan Beulich  <jbeulich@novell.com>
-
-	* configure.in: Remove target-libstdc++-v3 from noconfigdirs for
-	*-*-netware, but add target-libmudflap.
-	Consolidate *-*-netware targets (of which really only i?86 exists)
-	into a single entry.
-	* configure: Likewise.
-
-2004-09-01  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (sorry): Remove.
-	(clean-stage[+id+], clean-stage[+id+]-module): New targets.
-	(cleanstrap targets): Depend on distclean, not distclean-stage1.
-	(do-clean): Clean per-stage directories too.
-	(do-distclean): Run distclean-stage1 too.
-	(.NOTPARALLEL): Enable during toplevel bootstrap.
-	(stage[+id+]-bubble): Enable parallel execution during
-	the recursive invocation.
-	* Makefile.in: Regenerate.
-
-	Sync from gcc (moving the Makefile.in change to Makefile.tpl):
-
-	2004-08-31  Robert Bowdidge <bowdidge@apple.com>
-
-	* Makefile.in: Move BOOT_CFLAGS above host makefile fragment include.
-	* configure.in: add test for powerpc-*-darwin* to specify makefile frag
-	* configure: regenerate
-	* config/mh-ppc-darwin: create file, override BOOT_CFLAGS for
-	-mdynamic-no-pic
-
-2004-08-31  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl: Move BOOT_CFLAGS above host makefile fragment
-	include.
-	* configure.in: Fix indentation.
-	* configure: Regenerate.
-
-2004-08-31  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (build_modules): Add fixincludes.
-	(dependencies): Make gcc depend on fixincludes.
-	* configure.in (build_tools): Add fixincludes.
-	(build_configdirs): Always include build_libs.
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-
-2004-08-30  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (bootstrap stages): Add 'lean' parameter.
-	* Makefile.tpl (configure-stageN-*, all-stageN-*): Turned into
-	phony targets; do not generate timestamp files.
-	(distclean-stageN): Remove references to their timestamp files.
-	(restageN, touch-stageN): Remove.
-	(stageN-bubble): Rewritten.
-	(compare): Support lean bootstraps.
-	* Makefile.in: Regenerate.
-
-	* configure.in: Only warn when bootstrapping but
-	build != host or build != target.  Support lean bootstraps.
-	* configure: Regenerate.
-
-	Sync from gcc:
-	2004-08-26  Phil Edwards  <phil@codesourcery.com>
-
-	* configure.in:  Give a better error message if GMP/MPFR are missing
-	and a language needing them has been requested.
-	* configure:  Regenerated.
-
-	2004-08-25  Phil Edwards  <phil@codesourcery.com>
-
-	* configure.in:  Print a list of available language front-ends if
-	a requested one is missing.  Tidy stray tab characters.
-	* configure:  Regenerated.
-
-2004-08-17  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-
-	* Makefile.def (bootstrap-stage): Rename extra_*_flags to
-	stage_*_flags.
-	* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
-	for bootstrapped modules if toplevel bootstrap is going.
-	(GCC bootstrap): Generate per-stage targets for all bootstrapped
-	modules.  Adjust for changes in Makefile.def.  Enable several
-	rules even in non-bootstrap mode, just to avoid peppering the
-	template with unnecessary "@if/@endif gcc-bootstrap" pairs.
-	(stage-[+prev+]-bubble): Remove.
-
-	* Makefile.def (Dependencies): Depend on all-build-bison,
-	all-build-flex, all-build-byacc, all-build-texinfo, rather
-	than the host variations.
-	* Makefile.tpl (BUILD_DIR_PREFIX): Remove.  Replace throughout
-	with BUILD_SUBDIR.
-	(BISON): Update for recent Bisons.
-	(YACC): Fix typo.
-	(cross): Depend on all-build.
-	(all): Do not depend on all-build.
-	(prebootstrap): Remove.
-	(dep-kind): Accept separate prefixes for MODULE and ON variables.
-	(Prebootstrap dependencies): Add them to the per-stage targets
-	and to all-prebootstrap.
-	* configure.in (build_configdirs): Always enable build_tools.
-	(BUILD_DIR_PREFIX): Remove.
-
-	* Makefile.def (gcc): Add target variable.
-	(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
-	* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
-	in the recursive `make', instead of hardwiring `all'.
-	(Autogenerated TARGET-* variables): New.
-
-2004-08-17  Robert Millan  <robertmh@gnu.org>
-
-	* configure.in: In noconfigdirs check, match GNU/k*BSD with GNU/Linux
-	(instead of FreeBSD).
-	* configure: Regenerate.
-
-2004-08-12  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.def, configure.in, src-release: Remove useless, bogus
-	references to tix.
-	* Makefile.in, configure: Regenerate.
-
-	* src-release: Stop distributing mmalloc with gdb (which doesn't
-	use it).
-	* Makefile.def: GDB doesn't depend on mmalloc anymore.
-	* Makefile.in: Regenerate.
-
-2004-08-09  Mark Mitchell  <mark@codesourcery.com>
-
-	* configure.in (arm*-*-eabi*): New target.
-	* configure: Regenerate.
-
-2004-08-01  Robert Millan  <robertmh@gnu.org>
-
-	* configure.in: Turn mt-linux into mt-gnu. Use mt-gnu and enable
-	libmudflap for all GNU-based systems (with Glibc).
-	* configure: Regenerate.
-
-2004-08-06  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (bfd, opcodes, gcc, zlib): Mark as bootstrap module.
-	(bison, byacc, flex, texinfo): Do not mark as bootstrap module.
-	(Dependencies): New section.
-	* Makefile.tpl (Dependencies): Generate from Makefile.def.
-	(configure-target-[+module+]): Depend on maybe-all-gcc
-	(all-prebootstrap): New name of all-bootstrap.  Changed throughout.
-	(toplevel profiledbootstrap): Fix dependencies.
-	* Makefile.in: Regenerate.
-
-2004-08-03  Mark Mitchell  <mark@codesourcery.com>
-
-	* configure.in (arm*-*-symbianelf*): Add ${libgcj} and
-	target-libiberty to noconfigdirs.
-
-2004-08-03  Paul Brook  <paul@codesourcery.com>
-
-	* configure.in: Check for MPFR as well as GMP.
-	* configure: Regenerate.
-
-2004-08-03 Paolo Bonzini <bonzini@gnu.org>
-
-	* Makefile.def (host-modules): Add gcc.
-	* Makefile.in: Regenerate.
-	* Makefile.tpl (sorry): New rule.
-	(configure-host, all-host, [+make_target+]-host, do-check,
-	install-host): Do not add gcc as a special case.
-	(host modules): Add a small special-casing for gcc.  Export
-	extra_make_flags through the environment.
-	(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
-	maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
-	other recursive targets for gcc): Remove.
-
-	(all, do-[+make_target+], do-check): Wrap between unstage and stage.
-	(stage, unstage): New rules.
-	(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
-	distclean-stage[+id+]): Use stage_current.
-	([+bootstrap-target+], profiledbootstrap): Do not invoke manually
-	the stage*-start rules.
-
-2004-07-19  Robert Millan  <robertmh@gnu.org>
-
-	Synced from gcc:
-
-	2004-04-26  Robert Millan  <robertmh@gnu.org>
-
-	Add patches from libtool CVS.
-	* libtool.m4: Add kfreebsd*-gnu and knetbsd*-gnu.
-	* ltconfig: Likewise.
-	* ltcf-c.sh: Likewise.
-	* ltcf-cxx.sh: Likewise.
-	* ltcf-gcj.sh: Likewise.
-
-2004-07-12  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in: Add noconfigdirs for crx-*-*.
-	* configure: Regenerate.
-
-2004-07-12  Paolo Bonzini  <bonzini@gnu.org>
-
-	Synced from gcc:
-
-	2004-07-09  Loren J. Rittle <ljrittle@acm.org>
-
-	* configure.in: Build libmudflap by default on FreeBSD.
-	* configure: Regenerated.
-
-	2004-07-09  Mark Mitchell  <mark@codesourcery.com>
-
-	* configure.in: Do not build libmudflap by default on non-GNU/Linux
-	systems.
-	* configure: Regenerated.
-
-	2004-07-08 John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-
-	PR target/16344
-	* Makefile.tpl (profiledbootstrap): Build runtime libraries with
-	feedback based compiler.
-	* Makefile.in: Rebuilt.
-
-	2004-07-05  Phil Edwards  <phil@codesourcery.com>
-
-	* configure.in:  Do not prepend $srcdir to /dev/null in
-	makefile fragments.
-	* configure:  Regenerate.
-
-2004-07-08  Alexandre Oliva  <aoliva@redhat.com>
-
-	* Makefile.def (host_modules): Set bootstrap=true for flex.
-	* Makefile.tpl (all-gcc): Depend on texinfo and flex.
-	* Makefile.in: Rebuilt.
-
-2004-07-01  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (build_modules): Add bison, byacc, flex,
-	m4, texinfo.
-	(flags_to_pass): Add FLEX.
-	* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
-	(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
-	(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
-	DEFAULT_MAKEINFO): Remove.
-	(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
-	CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
-	(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
-	objdir or else use configured tool.
-	(all-build): New.
-	(all): Depend on it.
-	(Build module dependencies): Add.
-	* Makefile.in: Regenerate.
-	* configure.in: Better support for multiple build modules,
-	matching what is done for host/target modules.  Do not look
-	for "plausible" locations of build tools if Canadian cross.
-	Use autoconf's AC_PROG_CC to find a C compiler.  Define
-	BUILD_DIR_PREFIX.  Look for flex, makeinfo and m4.
-	* configure: Regenerate.
-
-2004-06-22  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (HOST_EXPORTS): Fix pasto.
-	* Makefile.in: Regenerate.
-
-2004-06-22  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (configure-build-[+module+],
-	configure-[+module+], configure-target-[+module+]): Pass
-	[+extra_configure_args+].
-	(all-build-[+module+], all-[+module+], check-[+module+],
-	install-[+module+], [+make_target+]-[+module+],
-	all-target-[+module+], check-target-[+module+],
-	install-target-[+module+], [+make_target+]-target-[+module+]):
-	Pass [+extra_make_args+].
-	(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
-	(GCC_HOST_EXPORTS): Remove.
-	(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
-	cross, check-gcc, check-gcc-c++, install-gcc,
-	gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
-	Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
-	* Makefile.in: Regenerate.
-
-2004-06-21  Christopher Faylor  <cgf@alum.bu.edu>
-
-	* configure.in: Check for srcdir/winsup rather than build directory
-	winsup.
-	* configure: Regenerate.
-
-2004-06-17  Corinna Vinschen  <vinschen@redhat.com>
-
-	* configure.in: Don't build Cygwin native newlib if winsup
-	directory is missing.  Emit warning instead.
-	* configure: Regenerate.
-
-2004-06-09  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (touch-stage[+id+]): New.
-	(restage[+prev+]): Depend on touch-stage[+id+].
-
-	* Makefile.tpl (RECURSE_FLAGS_TO_PASS): New.
-	Use it throughout.
-
-	* Makefile.def: Add profile and feedback bootstrap stages.
-	Remove next field from bootstrap stages.
-	* Makefile.tpl (LN, LN_S): Substitute.
-	(stageN-start, stageN-end): Use double-colon rules, to
-	provide a hook for additional setup commands.
-	(distclean-stageN-gcc, restageN): Create dependencies from
-	[+prev+], not from [+next+].
-	(stageN-bubble): Add commands for successive stages from
-	[+prev+], using double-colon rules.
-	(all-stageN-gcc): Fix typo.
-	(stagefeedback-start, profiledbootstrap): New.
-	* Makefile.in: Regenerate.
-	* configure.in: Call ACX_PROG_LN.
-	* configure: Regenerate.
-
-2004-06-03  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in: Fix --enable-bootstrap breakage introduced in trees
-	without gcc.
-	* configure: Regenerate.
-
-2004-06-01  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl: Fix typo.
-	* Makefile.in: Regenerate.
-
-2004-06-01  Paolo Bonzini <bonzini@gnu.org>
-
-	* configure.in: Remove new- prefix from toplevel
-	bootstrap targets.
-	* configure: Regenerate.
-
-2004-06-01  Paolo Bonzini <bonzini@gnu.org>
-
-	Merge this patch from the gcc tree:
-
-	2004-05-30  Andreas Jaeger  <aj@suse.de>
-		    Jim Wilson <wilson@specifixinc.com>
-
-	* config-ml.in: Pass FFLAGS and ADAFLAGS for multilibs, handle F77
-	like CC.
-
-2004-06-01  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (all.normal): Rename to all.
-	(all): Replace with a rule to pick the default
-	target from configure.
-	(all-gcc, configure-gcc): Use conditionals to
-	do nothing when toplevel bootstrap is going on.
-	(GCC directory bootstrap) [gcc-bootstrap]: Disable.
-	(Toplevel bootstrap) [gcc-no-bootstrap]: Disable.
-	* configure.in: Support --enable-bootstrap.
-
-	* Makefile.def: Remove new- prefix from toplevel
-	bootstrap targets.
-	* Makefile.tpl: Likewise.
-
-	* Makefile.def: Add bootstrap_stage 4.  Add bootstrap2
-	target.
-
-	* Makefile.tpl (Toplevel bootstrap): Pass $(BASE_FLAGS_TO_PASS)
-	$(RECURSE_FLAGS) to recursive invocation of make.
-
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-
-2004-05-27  Daniel Jacobowitz  <dan@debian.org>
-
-	* configure.in: Fix sed invocation for GFORTRAN_FOR_TARGET.
-	* configure: Regenerate.
-
-2004-05-25  Daniel Jacobowitz  <drow@false.org>
-
-	* Makefile.tpl (BUILD_EXPORTS, HOST_EXPORTS, GCC_HOST_EXPORTS)
-	(STAGE_HOST_EXPORTS, BASE_TARGET_EXPORTS, RAW_CXX_TARGET_EXPORTS)
-	(NORMAL_TARGET_EXPORTS): New macros.  Use them in all the recursive
-	targets.
-	* Makefile.in: Regenerate.
-
-2005-05-24  Paolo Bonzini <bonzini@gnu.org>
-
-	* configure.in: Test the ability to symlink directories.
-	* configure: Regenerate.
-
-	* Makefile.def (bootstrap-stage): New definitions.
-	* Makefile.tpl (configure-stage1-gcc,
-	configure-stage2-gcc, configure-stage3-gcc,
-	all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
-	new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
-	new-restage3, compare): Autogenerate, see Makefile.in
-	entry for behavioral changes.
-	(distclean-stage1, new-stage1-start, new-stage1-end,
-	new-stage1-bubble, distclean-stage2, new-stage2-start,
-	new-stage2-end, new-stage2-bubble, distclean-stage3,
-	new-stage3-start, new-stage3-end): New autogenerated targets.
-	(objext, prebootstrap, BOOT_CFLAGS,
-	POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
-	targets.
-
-	* Makefile.in: Regenerate.
-	(distclean-stage1, new-stage1-start, new-stage1-end,
-	new-stage1-bubble, distclean-stage2, new-stage2-start,
-	new-stage2-end, new-stage2-bubble, distclean-stage3,
-	new-stage3-start, new-stage3-end): New targets.
-	(all-stage1-gcc): Move prebootstrap dependency from here...
-	(configure-stage1-gcc): ...to here.
-	(new-bootstrap): Use bubble targets.
-	(new-cleanstrap, new-restage1, new-restage2, new-restage3):
-	Use per-stage distclean targets.
-	(configure-stage1-gcc, configure-stage2-gcc,
-	configure-stage3-gcc, all-stage1-gcc,
-	all-stage2-gcc, all-stage3-gcc, new-bootstrap):
-	Use new-stageN-start to prepare the tree.
-
-2004-05-23  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (host_modules): add libcpp.
-	* Makefile.tpl: Add dependencies on and for libcpp.
-	* Makefile.in: Regenerate.
-	* configure.in: Add libcpp host module.
-	* configure: Regenerate.
-
-2004-05-17  Zack Weinberg  <zack@codesourcery.com>
-
-	* Makefile.def, Makefile.tpl, configure.in: Remove all mention
-	of libf2c.
-	* configure, Makefile.in: Regenerate.
-
-2004-05-13  Diego Novillo  <dnovillo@redhat.com>
-
-	Merge from tree-ssa-20020619-branch.
-
-	* Makefile.def: Add libbanshee, libmudflap and libgfortran.
-	* Makefile.tpl (BUILD_CONFIGDIRS): Add libbanshee.
-	(HOST_GMPLIBS): Define.
-	(HOST_GMPINC): Define.
-	(TARGET_LIB_PATH): Add libmudflap.
-	(GFORTRAN_FOR_TARGET): Define.
-	(configure-build*): Export GFORTRAN.
-	(configure-gcc): Export GMPLIBS and GMPINC.
-	(all-gcc): Add maybe-all-libbanshee.
-	(configure-target-libgfortran): Define.
-	* Makefile.in: Regenerate.
-	* configure.in (host_libs): Add libbanshee.
-	(target_libraries): Add target-libmudflap and target-libgfortran.
-	Add --with-libbanshee.
-	Handle --disable-libmudflap.
-	(*-*-freebsd*): Use with_gmp.
-	Add $(libgcj) to noconfigdirs.
-	* configure: Regenerate.
-	* depcomp: New file.
-	* MAINTAINERS: Add tree-ssa maintainers.
-
-2004-04-28  Paolo Bonzini  <bonzini@gnu.org>
-
-	* config/acx.m4: Fix fastcompare support for new-bootstrap.
-	* configure: Regenerate.
-
-2004-04-27  Paolo Bonzini  <bonzini@gnu.org>
-
-	Revert:
-	2004-04-26  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (flags_to_pass): Remove *dir variables that
-	are passed to the modules via TOPLEVEL_CONFIGURE_ARGUMENTS,
-	as well as prefix and exec_prefix.
-	* Makefile.in: Regenerate.
-
-2004-04-26  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (host_modules): Mark with the bootstrap
-	flag packages on which gcc depends.
-	* Makefile.tpl (all-bootstrap): Use it.
-	* Makefile.in: Regenerate.
-
-2004-04-26  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.def (flags_to_pass): Remove *dir variables that
-	are passed to the modules via TOPLEVEL_CONFIGURE_ARGUMENTS,
-	as well as prefix and exec_prefix.
-	* Makefile.in: Regenerate.
-
-2004-04-26  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in: Invoke ACX_PROG_CMP_IGNORE_INITIAL.
-	* configure: Regenerate.
-	* config/acx.m4: Mutuate ACX_PROG_CMP_IGNORE_INITIAL from gcc.
-	* gcc/Makefile.tpl (compare): Use the result of the test.
-	* gcc/Makefile.in: Regenerate.
-
-2004-04-23  Paolo Bonzini  <bonzini@gnu.org>
-
-	* Makefile.tpl (all-stage1-gcc, all-stage2-gcc, all-stage3-gcc):
-	Always relocate gcc and prev-gcc to the original names, even
-	if the build fails.
-	(new-cleanstrap, new-restage1, new-restage2, new-restage3):
-	New targets.
-
-2004-04-19  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* configure.in (mips*-*-irix5*): Enable ld.
-	* configure: Regenerate.
-
-2004-04-15  James E Wilson  <wilson@specifixinc.com>
-
-	* Makefile.tpl (configure-[+module+], configure-gcc,
-	configure-stage1-gcc, configure-stage2-gcc, configure-stage3-gcc):
-	Set and export LDFLAGS.
-	* Makefile.in: Regenerate.
-
-2004-04-09  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	PR bootstrap/14871
-	* Makefile.tpl: If we don't have built-in-tree target tools,
-	use the ones found by configure rather than hacking around with
-	program_transform_name.
-	* configure.in: Give Makefile.tpl the information necessary
-	to do that.
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-
-2004-04-06  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	PR bootstrap/14760
-	* configure.in: When computing baseargs, strip *all* copies of
-	offending options.  Also, don't match/substitute the trailing space,
-	so that this actually works when two similar options are separated by
-	only one space.
-	* configure: Regenerate.
-
-2004-04-06  David Edelsohn  <edelsohn@gnu.org>
-
-	* configure.in (powerpc-*-aix*): Remove target-libada from noconfigdirs.
-	(rs6000-*-aix*): Same.
-	* configure: Regenerate.
-
-2004-03-25  Stan Shebs  <shebs@apple.com>
-
-	Remove MPW support, no longer used.
-	* mpw-README, mpw-build.in, mpw-config.in, mpw-configure,
-	mpw-install: Remove files.
-	* src-release (DEVO_SUPPORT): Remove names of removed files.
-	* MAINTAINERS: Likewise.
-
-2004-03-24  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl (top level bootstrap support): Remove now-unneeded
-	STRICT_WARN, WARN_CFLAGS flags passed down to make.
-	* Makefile.in: Regenerate.
-
-	* configure.in (top level bootstrap support): Rework --enable-werror
-	to set @stage2_werror_flag@.
-	* configure: Regenerate.
-	* Makefile.tpl (top level bootstrap support): Pass
-	@stage2_werror_flag@ down to configure in stages 2 and 3.
-	* Makefile.in: Regenerate.
-
-2004-03-23  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl (new-bootstrap): Set CC and CC_FOR_BUILD in configure
-	for stages 2 and 3 as well as in make.  As a consequence, remove
-	OUTPUT_OPTION (now detected by configure) from the flags passed down
-	to make.
-	* Makefile.in: Regenerate.
-
-	* Makefile.tpl (new-bootstrap): Fix typo.
-	* Makefile.in: Regenerate.
-
-2004-03-22  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Rearrange by moving recursive_targets rules
-	into their proper sections.
-	* Makefile.tpl (top level bootstrap support): Move disabling
-	of coverage flags from 'make' to 'configure'; improve comments.
-	* Makefile.in: Regenerate.
-
-	* Makefile.tpl (experimental top level bootstrap) Move stage1
-	language setting from all- target to configure- target; disable
-	intermodule optimization in stage 1; prevent gratuitous rebuilds
-	of stage 1.
-	* Makefile.in: Regenerate.
-	* configure.in: Comma-separate stage 1 language list for top
-	level bootstrap.
-	* configure: Regenerate.
-
-	* Makefile.tpl: Clean up experimental top level bootstrap support:
-	note known problems; set CONFIG_SHELL; don't set BUILD_CC; relocate
-	prev-gcc in configure- targets as well as all- targets.
-	* Makefile.in: Regenerate.
-
-2004-03-17  Paolo Bonzini  <bonzini@gnu.org>
-
-	* configure.in: Remove symbolic link section.
-	* configure: Regenerate.
-	* Makefile.tpl (links): Remove.
-	* Makefile.in: Regenerate.
-
-2004-03-15  Paolo Bonzini  <bonzini@gnu.org>
-	    Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in (DEFAULT_YACC, DEFAULT_M4, DEFAULT_LEX):
-	Set with AC_CHECK_PROGS.
-	* configure.in: Fix comment typo from last patch.
-	* configure: Regenerate.
-
-2004-03-15  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Introduce experimental top level bootstrap support.
-	* Makefile.in: Regenerate.
-	* configure.in: Introduce support for top level bootstrap.
-	* configure: Regenerate.
-
-2004-03-12  Eric Botcazou  <ebotcazou@gcc.gnu.org>
-	    Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/14522
-	* configure.in: Cope with shells that do not support unquoted ^
-	* configure: Regenerate.
-
-2004-03-11  Eric Botcazou  <ebotcazou@gcc.gnu.org>
-	    Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/14522
-	* configure.in: Cope with shell that do not support nesting
-	quotes inside quoted backquote substitutions.
-	* configure: Regenerate.
-
-2004-03-10  Andrew Pinski  <pinskia@physics.uc.edu>
-
-	PR bootstrap/14522
-	* configure.in: Fix escaping of $.
-	* configure: Regenerate.
-
-2004-03-11  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure: Regenerate.
-
-2004-03-08  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR ada/14131
-	Move language detection to the top level.
-	* configure.in: Find default values for the tools as
-	soon as possible.  Disable ada if GNAT is not found.
-	Emit error message about missing languages.  Expand
-	--enable-languages=all for the gcc subdirectory.
-
-2004-03-01  Richard Sandiford  <rsandifo@redhat.com>
-
-	* configure.in (mips64*-*-linux*): Override mips*-*-linux* case
-	and disable libgcj.
-	* configure: Regenerated.
-
-2004-02-28  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	PR bootstrap/7087
-	* Makefile.tpl: Guard XFOO sed statements better.
-	* Makefile.tpl: Add dependency for configure-target-libada.
-	* Makefile.in: Regenerate (incidentally fixes broken
-	commit when libada-branch was merged).
-
-2004-02-28  Andrew Cagney  <cagney@redhat.com>
-
-	* src-release (CVS_NAMES): Define.
-	(do-tar, do-tar): Prune $(CVS_NAMES).
-
-2004-02-23  Andrew Cagney  <cagney@redhat.com>
-
-	* texinfo/texinfo.tex: Update from version 2003-02-03.16 to
-	2004-02-19.09.
-
-2004-02-19  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	PR bootstrap/11932
-	* mkinstalldirs, install-sh: Import from automake CVS HEAD.
-
-2004-02-19  Andrew Cagney  <cagney@redhat.com>
-
-	* config.guess: Update from version 2003-06-12 to 2004-02-16.
-	* config.sub: Update from version 2003-06-13 to 2004-02-16.
-
-2004-02-11  David Edelsohn  <edelsohn@gnu.org>
-
-	* configure.in (powerpc-*-aix*): Add target-libada to noconfigdirs.
-	(rs6000-*-aix*): Same.
-	* configure: Regenerate.
-
-2004-02-11  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* configure.in (host): Add in missing $noconfigdirs to defines.
-	* configure: Regenerate.
-
-2004-02-10  Arnaud Charlet  <charlet@act-europe.fr>,
-	    Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	PR ada/6637, PR ada/5911
-	Merge with libada-branch:
-	* configure.in, Makefile.tpl, Makefile.def: Add target-libada,
-	with appropriate dependencies. Add --enable-libada configure switch.
-	* configure, Makefile.in: Regenerate.
-
-2004-02-05  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* configure.in: Don't pass --with-stabs on IRIX 5 either.
-	* configure: Regenerate.
-
-2004-02-02  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Update Red Hat license to 2004.
-
-2004-01-23  DJ Delorie  <dj@redhat.com>
-
-	* Makefile.def (target_modules) [libiberty]: Don't stage.
-	* Makefile.in: Rebuilt.
-
-2004-01-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Update to include copyrights for new
-	iconv code.
-
-2004-01-15  Andrew Cagney  <cagney@redhat.com>
-
-	* src-release: Update copyright year.
-	(do-proto-toplev): Configure using i686-pc-linux-gnu.
-	(NEWLIB_SUPPORT_DIRS): Delete macro.
-	(newlib.tar.bz2): Delete rule.
-
-2004-01-14  Loren J. Rittle <ljrittle@acm.org>
-
-	* Makefile.def (target_modules) [libtermcap, libiberty, zlib]: Stage.
-	* Makefile.tpl (configure-target-[+module+]): Support stage.
-	* Makefile.in: Rebuilt.
-
-2003-01-14  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
-
-	* gettext.m4: Quote names of macros to be defined by AC_DEFUN
-	throughout.
-
-2004-01-04  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Use ./config.cache, not config.cache.
-	* configure: Regenerate.
-	* Makefile.tpl: Special-casing not needed for GCC any more.
-	* Makefile.in: Regenerate.
-
-	* configure.in: Don't share a cache file for host dirs.
-	* configure: Regenerate.
-
-	* config-ml.in: Don't mess with the cache file.
-
-2004-01-03  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Make GCC use a separate config.cache.
-	* Makefile.in: Regenerate.
-
-	PR bootstrap/11932, PR bootstrap/11933
-	(I don't know if it will fix either of them, but it relates
-	to them.)
-	* configure.in: Don't use shared config.cache for target
-	directories.
-	* configure: Regenerate.
-
-2003-12-31  Roger Sayle  <roger@eyesopen.com>
-
-	* configure.in (ia64*-*-hpux*): Disable building java libraries.
-	* configure: Regenerated.
-
-2003-12-21  Bernardo Innocenti  <bernie@develer.com>
-
- 	* configure.in (*-*-uclinux): Exclude newlib, libgloss and rda.
- 	* configure: Regenerated.
-
-2003-12-19  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	Port change over from GCC:
-	2003-11-20  Kelley Cook  <kcook@gcc.gnu.org>
-	* Makefile.tpl (BASE_FLAGS_TO_PASS): Pass along CONFIG_SHELL.
-	(configure-build-[+module+], configure-[+module+]): Likewise.
-	(configure-target-[+module+], configure-gcc, config.status): Likewise.
-	* Makefile.in: Regenerate.
-
-2003-12-08  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* configure.in (raw_libstdcxx_flags): Remove the leading space.
-	* configure: Regenerate.
-
-2003-11-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Add license info for long long routines added to
-	stdlib.
-
-2003-11-14  Arnaud Charlet  <charlet@act-europe.fr>
-
-	* Makefile.tpl (EXTRA_GCC_FLAGS): Pass BOOT_ADAFLAGS.
-	* Makefile.in: Regenerate.
-
-2003-10-20  Phil Edwards  <phil@codesourcery.com>
-
-	* configure.in (*-*-vxworks):  Add target-libiberty to noconfdirs.
-	* configure:  Regenerate.
-
-2003-10-13  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Make GCC_FLAGS_TO_PASS a superset of
-	HOST_FLAGS_TO_PASS.
-	* Makefile.in: Regenerate.
-
-2003-10-05  Mohan Embar  <gnustuff@thisiscool.com>
-
-	* configure.in: Allow explicit specification of CFLAGS_FOR_BUILD.
-	* configure: Rebuilt
-	* Makefile.tpl: Use CFLAGS_FOR_BUILD computed by configure
-	* Makefile.in: Rebuilt
-
-2003-10-03  H.J. Lu  <hongjiu.lu@intel.com>
-
-	* ltconfig (sys_lib_search_path_spec): Fix a typo for HPUX.
-
-2003-10-01  Phil Edwards  <pme@gcc.gnu.org>
-
-	* config-ml.in:  Use ac_configure_args directly instead of
-	ml_arguments.  Only set ml_norecursion if --no[-]recursion is
-	actually seen.
-
-2003-10-01  Eric Botcazou  <ebotcazou@libertysurf.fr>
-
-	* config-ml.in: Propagate INSTALL variables.
-
-2003-09-21  Daniel Jacobowitz  <drow@mvista.com>
-
-	* configure.in: Pass a computed --program-transform-name
-	to subconfigures.
-	* configure: Regenerated.
-
-2003-09-20  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Don't pass down obsolete ENQUIRE variable.
-	* Makefile.in: Regenerate.
-
-	* Makefile.tpl: Don't pass (unused) DLLTOOL or WINDRES to gcc.
-	* Makefile.in: Regenerate.
-
-2003-09-17  Daniel Jacobowitz  <drow@mvista.com>
-
-	* configure.in (TOPLEVEL_CONFIGURE_ARGUMENTS, baseargs): Fix
-	quoting.
-	* configure: Regenerated.
-
-2003-09-12  Michael Chastain  <mec@shout.net>
-
-	Fix PR gdb/857.
-	* src-release (do-proto-topleve): Remove junk files
-	intl/config.cache, intl/config.status,
-	intl/config.h, intl/stamp-h.
-
-2003-09-14  Andrew Cagney  <cagney@redhat.com>
-
-	* src-release (dejagnu.tar): New target.
-	(dejagnu.tar.bz2): Recursively call "gdb-taz" rule.
-	(do-djunpack): Use $(PACKAGE) for the package name.
-
-2003-09-04  DJ Delorie  <dj@redhat.com>
-
-	* configure: Regenerate.
-
-2003-09-04  Robert Millan  <robertmh@gnu.org>
-
-	* configure.in: Match GNU/KFreeBSD with new kfreebsd*-gnu triplet.
-
-2003-09-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
-
-	* configure.in: Ensure arguments to sed are properly spaced.
-	* configure: Regenerate.
-
-2003-08-28  Daniel Jacobowitz  <drow@mvista.com>
-
-	Merge from gcc:
-	2003-07-20  Phil Edwards  <pme@gcc.gnu.org>
-	* install-sh:  Update to newer upstream versions (associated with
-	aclocal 1.7).
-	* missing:  Likewise, plus $1Help2man -> $1 typo fix.
-
-2003-08-27  Daniel Jacobowitz  <drow@mvista.com>
-
-	* configure.in: Set RAW_CXX_FOR_TARGET if unset.
-	* configure: Regenerated.
-
-2003-08-23  Phil Edwards  <pme@gcc.gnu.org>
-
-	* configure.in:  Use newline instead of semicolon when assuming
-	shell arguments in a for loop.
-	* configure:  Regenerated.
-
-2003-08-20  Geoffrey Keating  <geoffk@apple.com>
-
-	PR 8180
-	* configure.in: When testing with_libs and with_headers, treat
-	'no' as unset.  Based on a patch by Dan Kegel <dank@kegel.com>.
-	* configure: Regenerate.
-
-	* configure.in (TOPLEVEL_CONFIGURE_ARGUMENTS): Quote properly for
-	make, shell, etc.
-	(baseargs): Likewise.
-	* configure: Regenerate.
-
-2003-08-19  Geoffrey Keating  <geoffk@apple.com>
-
-	* configure.in: Disable libgcj for darwin not on powerpc.
-	* configure: Rebuild.
-
-2003-08-15  Michael Chastain  <mec@shout.net>
-
-	* src-release (do-proto-toplev): Remove junk files
-	dejagnu/example/calc/config.status,
-	dejagnu/example/calc/config.log.
-
-2003-08-14  Alexandre Duret-Lutz  <adl@gnu.org>
-
-	* config-ml.in, symlink-tree: Add license.
-
-2003-08-01  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	Merge from gcc:
-
-	2003-08-01  Matt Kraai  <kraai@alumni.cmu.edu>
-	* Makefile.tpl (check, check-c++): Express dependencies using
-	dependencies rather than commands.
-	* Makefile.in: Regenerate.
-
-	2003-07-31  Geoffrey Keating  <geoffk@apple.com>
-	* Makefile.tpl (libsubdir): Use gcc instead of gcc-lib.
-	* Makefile.in: Update.
-
-2003-08-01  Andrew Cagney  <cagney@redhat.com>
-
-	* configure.in (noconfigdirs): Do not add GDB when m32r-*-*.
-	* configure: Ditto.
-
-2003-07-30  Andreas Tobler  <a.tobler@schweiz.ch>
-
-	* configure.in: Enable libgcj for darwin.
-	* configure: Rebuild.
-
-2003-07-29  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* mkinstalldirs: Import autoconf 2.57 / automake 1.7 version.
-
-2003-07-27  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Use 'mkinstalldirs' rather than 'mkdir' when
-	creating target and build subdirs to build all parent dirs as needed.
-	* Makefile.in: Rebuild.
-	* configure.in: Don't build dirs explicitly here.
-	* configure: Rebuild.
-
-2003-07-22  Alexandre Oliva  <aoliva@redhat.com>
-
-	* Makefile.tpl (all-make): Depend on intl.
-	* Makefile.in: Rebuilt.
-
-2003-07-16  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* config.if: Remove unused libc_interface determination.
-
-2003-07-14  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.in: Regenerate, correctly this time.
-
-2003-07-13  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Set INSTALL and friends using autoconf.  Remove
-	unused INSTALL_PROGRAM_ARGS.
-	* configure.in: Use AC_PROG_INSTALL.
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-
-2003-07-10  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure: Rebuilt.
-	2001-09-26  Alexandre Oliva  <aoliva@redhat.com>
-	* configure.in (noconfigdirs) [am33_2.0-*-linux*]: Don't build
-	newlib nor libgloss.
-	Wed May  9 10:07:19 2001  Alexandre Oliva  <aoliva@redhat.com>
-	* configure.in (am33_2.0-*-linux*): Added.
-
-2003-07-09  Bob Wilson  <bob.wilson@acm.org>
-
-	* configure.in: Add ${libgcj} to noconfigdirs for xtensa-*-* targets.
-	* configure: Regenerate.
-
-2003-07-06  H.J. Lu <hongjiu.lu@intel.com>
-
-	* config-ml.in: Replace PWD with PWD_COMMAND.
-	* Makefile.tpl: Likewise.
-	* Makefile.in: Regenerated.
-
-2003-06-27  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Clean up config-lang.in handling.  Delete
-	useless assignment to "subdirs".
-	* configure: Regenerate.
-
-2003-06-26  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Rename 'target_libs' to 'target_libraries'.
-	Remove useless reference to 'target_libs'.
-	* configure: Regenerate.
-
-2003-06-23  Keith Seitz  <kseitz@sources.redhat.com>
-
-	* Makefile.tpl: Add maybe-configure-itcl to configure-gdb.
-	* Makefile.in: Regenerate.
-
-2003-06-23  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.def: Introduce flags_to_pass.
-	* Makefile.tpl: Generate BASE_FLAGS_TO_PASS using it.
-	* Makefile.in: Regenerate.
-
-2003-06-23  Hans-Peter Nilsson  <hp@bitrange.com>
-
-	* configure.in (noconfigdirs) <cris-*-*>: Disable target-newlib
-	and target-libgloss.
-	<d30v-*-*, fr30-*-*, i960-*-*, m32r-*-*>: Disable gdb.
-	<h8300*-*-*>: Disable libf2c and ${libgcj}.
-	* configure: Regenerate.
-
-2003-06-17  Benjamin Kosnik  <bkoz@redhat.com>
-
-	* configure.in: Update testsuite_flags to new location.
-	* configure. Regenerate.
-
-2003-06-18  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Remove BUILD_CC stuff.
-	* Makefile.in: Regenerate.
-
-2003-06-14  H.J. Lu <hongjiu.lu@intel.com>
-
-	* config.guess: Update to 2003-06-12 version.
-	* config.sub: Update to 2003-06-13 version.
-
-2003-06-12  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
-
-	* MAINTAINERS: Add myself as MIPS co-maintainer.
-
-2003-06-12  H.J. Lu <hongjiu.lu@intel.com>
-
-	* config.guess: Update to 2003-06-06 version.
-	* config.sub: Update to 2003-06-06 version.
-
-2003-06-11  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* configure.in: Don't pass --with-stabs for mips*-sgi-irix6*o32.
-	* configure. Regenerate.
-
-2003-06-10  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Disable serial configure by default.
-	* configure: Regenerate.
-	* Makefile.tpl: Abolish .NOTPARALLEL.
-	* Makefile.in: Regenerate.
-
-	* Makefile.tpl: Replace {build,host,target}_canonical by
-	{build,host,target}.
-	* Makefile.in: Regenerate.
-
-	* Makefile.tpl: Fix stupid pasto.
-	* Makefile.in: Regenerate.
-
-2003-06-09  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Remove bogus conditional.
-	* Makefile.in: Regenerate.
-
-2003-06-03  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Make 'recursive targets' using autogen rather
-	than shell loop.  Remove duplicate 'clean' targets and false
-	comments.
-	* Makefile.def: Add systematic dependencies to 'recursive' targets.
-	Add systematic method of specifying missing targets in subdirs.
-	Add copyright boilerplate.
-	* Makefile.in: Regenerate.
-	* configure.in: Add 'recursive targets' to maybe list.
-	* configure: Regenerate.
-
-	* Makefile.tpl: Rename [+target+] to [+make_target+].
-	* Makefile.def: Rename 'target' to 'make_target'.
-
-2003-05-30  Nick Clifton  <nickc@redhat.com>
-
-	* README-maintainer-mode: Update URL for locating blessed config
-	tools.
-
-2003-05-29  Robert Millan  <rmh@debian.org>
-
-	* ltconfig: Import this patch and modify for use with current
-	version of ltconfig:
-
-	2003-05-21  Bruno Haible  <bruno@clisp.org>
-
-	* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER): Add support for
-	GNU/FreeBSD.
-
-2003-05-28  DJ Delorie  <dj@redhat.com>
-
-	* Makefile.tpl: Make maybe-check-gcc .PHONY.
-	* Makefile.in: Regenerate.
-
-2003-05-28  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Add license info for newlib/libc/sys/linux/stdlib.
-
-2003-05-21  DJ Delorie  <dj@redhat.com>
-
-	* Makefile.tpl (configure-target-libiberty): Depend only on gcc, not
-	newlib or libgloss.
-	* Makefile.in: Regenerate.
-
-2003-05-21  DJ Delorie  <dj@redhat.com>
-
-	* Makefile.tpl: Add missing empty maybe-check-gcc target.
-	* Makefile.in: Regenerate.
-
-2003-05-20  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
-
-	* configure.in: Use curly braces in the definition of tooldir.
-	* configure: Regenerate.
-
-2003-05-19  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Switch more things to use maybe dependencies.
-	* Makefile.tpl: Switch more things to use maybe dependencies.
-	Factor out common code from autogen IF statements.
-	* configure: Regenerate.
-	* Makefile.in: Regenerate.
-
-2003-05-14  Kelley Cook  <kelleycook@wideopenwest.com>
-
-	* configure.in: Accept i[3456789]86 for machine type.
-	* configure: Regenerate.
-
-2003-05-18  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Switch more things to use maybe dependencies.
-	Rearrange a little.  Use GCC_TOPLEV_SUBDIRS.
-	* configure: Regenerate.
-	* Makefile.tpl: Switch more things to use maybe dependencies.
-	* Makefile.in: Regenerate.
-
-2003-05-16  Andreas Schwab  <schwab@suse.de>
-
-	* Makefile.tpl (install-opcodes): Define.
-	* Makefile.in: Rebuild.
-
-2003-05-13  Andreas Jaeger  <aj@suse.de>
-
-	* config.guess: Update to 2003-05-09 version.
-	* config.sub: Update to 2003-05-09 version.
-
-2003-05-13  Michael Eager <eager@mvista.com>
-
-	* configure.in: Correct sed script so that options in quotes are not
-	deleted.
-	* configure: Rebuild.
-
-2003-05-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* configure.in (FLAGS_FOR_TARGET): Remove $$s/newlib/libc/sys/cygwin
-	and $$s/newlib/libc/sys/cygwin32 include paths.
-	* configure: Ditto.
-
-2003-05-05  H.J. Lu <hjl@gnu.org>
-
-	* config-ml.in: Restored from gcc repository.
-
-2003-05-02  Chris Demetriou  <cgd@broadcom.com>
-
-	* Makefile.tpl: Require "makeinfo" from texinfo 4.2 or later.
-	* Makefile.in: Regenerate.
-
-2003-04-27  Daniel Jacobowitz  <drow@mvista.com>
-
-	* src-release (DEVO_SUPPORT): Add src-release, Makefile.tpl,
-	and Makefile.def.
-
-2003-04-27  Daniel Jacobowitz  <drow@mvista.com>
-
-	* Makefile.tpl: Clean $(BUILD_SUBDIR).
-	* Makefile.in: Regenerated.
-
-2003-04-18  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
-
-	* Makefile.tpl (MAKEINFOFLAGS): Default to --split-size=5000000.
-	* Makefile.in: Regenerate.
-
-2003-04-18  Jakub Jelinek  <jakub@redhat.com>
-
-	* configure.in (powerpc64*-*-linux*): Remove.
-	* configure: Rebuilt.
-
-2003-04-17  Phil Edwards  <pme@gcc.gnu.org>
-
-	* Makefile.tpl (GCC_STRAP_TARGETS):  New variable containing all the
-	previous bootstrap targets, plus bubblestrap, quickstrap, cleanstrap,
-	and restrap.
-	* Makefile.in:  Regenerate.
-
-2003-04-16  Richard Earnshaw  <rearnsha@arm.com>
-
-	* configure.in (arm-*-netbsdelf*): Enable building java libraries.
-	* configure: Regenerated.
-
-2003-04-11  Alexandre Oliva  <aoliva@redhat.com>
-
-	* libtool.m4 (lt_cv_deplibs_check_method): Use pass_all on mips*.
-	* */configure: Rebuilt.
-
-2003-03-14  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES back down.
-	* Makefile.in: Regenerate.
-
-2003-03-14  Michael Chastain  <mec@shout.net>
-
-	* Makefile.in: Regenerate with correct Makefile.def.
-
-2003-03-12  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES up.  Delete unused
-	Make macro.
-	* Makefile.in: Regenerate.
-	* configure.in: Clean up gxx_include_dir logic.
-	* configure: Regenerate.
-
-2003-03-09  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
-
-	* configure.in (gxx_include_dir): Fix typo.
-	* configure: Regenerated.
-
-2003-03-06  Andrew Cagney  <cagney@redhat.com>
-
-	* texinfo/texinfo.tex: Import version 2003-02-03.16.
-
-2003-03-04  Daniel Jacobowitz  <drow@mvista.com>
-
-	* configure.in: Include $(build_tooldir)/sys-include in
-	FLAGS_FOR_TARGET.
-	* configure: Regenerated.
-
-2003-03-04  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Reindent.
-	* Makefile.in: Regenerate.
-	* configure.in: Reindent.  Don't set unused variables.
-	* configure: Regenerate.
-
-	* Makefile.tpl: Always pass down RANLIB.
-	* Makefile.in: Regenerate.
-
-	* Makefile.tpl: Don't set unused enable_shared, enable_threads macros.
-	* Makefile.in: Regenerate.
-	* configure.in: Remove unused logic relating to --enable-shared
-	and --enable-threads.  Remove bogus comments.  Remove redundant
-	noconfigdirs.
-	* configure: Regenerate.
-
-	* configure.in: Replace ${libstdcxx_version} by its value.
-	Remove reference to mh-dgux.
-	* configure: Regenerate.
-
-2003-02-28  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Rearrange.
-	* Makefile.in: Regenerate.
-
-2003-02-25  Nick Clifton  <nickc@redhat.com>
-
-	* configure: Remove site-file supprot - it is obsolete.
-
-2003-02-24  Uwe Stieber <uwe@wwws.de>
-
-	* configure.in: Add support for kaOS as cross build target system.
-	* configure: Regenerated.
-
-2003-02-20  Sean McNeil  <sean@blue.mcneil.com>
-
-	* Makefile.tpl: Add definition of CPPFLAGS to pass into
-	configure-target-* as some target builds may require additional
-	flags for preprocessor tests.
-	* Makefile.in: Regenerated.
-
-2003-02-19  Alexandre Oliva  <aoliva@redhat.com>
-
-	* libtool.m4 (LD): Append -melf* option to LD on IRIX with GNU ld.
-	* ltconfig: Handle it.
-	* ltcf-cxx.sh: Use with_gnu_ld passed as a shell variable instead of
-	auto-detecting it.
-
-2003-02-19  Alexandre Oliva  <aoliva@redhat.com>
-
-	* ltcf-cxx.sh: Replace $linker_flags with $compiler_flags wherever
-	it is used as argument to $CC.
-	* ltcf-gcj.sh: Likewise.
-
-2003-02-19  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in: Introduce --enable-maintainer-mode.
-	* configure: Rebuilt.
-	* Makefile.tpl (Makefile.in, configure): Enable dependencies only
-	for maintainer mode.
-	* Makefile.in: Rebuilt.
-
-2003-02-19  Andrew Cagney <ac131313@redhat.com>
-
-	* configure: Regenerate using autoconf 2.13.
-
-2003-02-19  Alan Modra  <amodra@bigpond.net.au>
-
-	* config.guess: Import latest version.
-	* config.sub: Import latest version.
-
-2003-02-18  Jason Merrill  <jason@redhat.com>
-
-	* Makefile.tpl (check-c++): Allow parallelism.
-
-2003-02-17  Andrew Cagney  <ac131313@redhat.com>
-
-	* configure: Regenerate using autoconf 000227.
-
-2003-02-15  Geoffrey Keating  <geoffk@apple.com>
-
-	* configure.in (*-*-darwin*): Rename from powerpc*-*-darwin*,
-	don't configure target-libobjc.
-	* configure: Regenerate.
-
-2003-02-14  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* Makefile.tpl (RANLIB): Define.
-	* Makefile.in: Regenerate.
-
-2003-02-06  Keith R Seitz  <keiths@redhat.com>
-
-	* Makefile.def: Remove "snavigator", "grep", and "db" modules.
-	* Makefile.tpl: Remove "all-snavigator" and "all-grep".
-	* Makefile.in: Regenerated.
-	* configure.in: Remove all traces of snavigator, db, and grep.
-	* configure: Regenerated.
-
-2003-01-31  Frank Ch. Eigler  <fche@redhat.com>
-
-	* Makefile.tpl (all-sid): Add libiberty/bfd/opcodes dependencies.
-	* Makefile.in: Regenerated.
-
-2003-01-30  Alexandre Oliva  <aoliva@redhat.com>
-
-	* config.if: Copy from GCC.
-
-2003-01-27  Phil Edwards  <pme@gcc.gnu.org>
-
-	* configure.in:  Revert 24Jan change.
-	* configure:  Regenerate.
-
-2003-01-23  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Revert previous change.
-	* configure: Regenerate.
-
-2003-01-23  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Make rda native-only.
-	* configure: Regenerate.
-
-2003-01-19  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Add missing \.
-	* configure: Rebuilt.
-
-2003-01-17  Jakub Jelinek  <jakub@redhat.com>
-
-	* configure.in (baseargs): Avoid using \| in sed regular
-	expressions.
-	* configure: Rebuilt.
-
-2003-01-16  Jakub Jelinek  <jakub@redhat.com>
-
-	* configure.in (baseargs): Remove all supported forms of
-	--cache-file, --srcdir, --host, --build and --target options
-	from argument lists.
-	* configure: Rebuilt.
-
-2003-01-15  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in (noconfigdirs): Don't skip gas on IRIX 6.
-	* configure: Rebuilt.
-
-2003-01-09  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Substitute TOPLEVEL_CONFIGURE_ARGUMENTS.
-	* Makefile.tpl: Pass TOPLEVEL_CONFIGURE_ARGUMENTS to gcc.
-	* Makefile.in: Regenerate.
-	* configure: Regenerate.
-
-2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
-
-	* Makefile.tpl (BASE_FLAGS_TO_PASS): Also pass DESTDIR.
-	(install-info, dir.info): Prepend $(DESTDIR) to $(infodir).
-	* Makefile.in: Regenerate.
-
-2003-01-09  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in: Remove Makefile in build, host and target modules
-	unless configure was run with --no-recursion.
-	* configure: Rebuilt.
-
-2003-01-08  Chris Demetriou  <cgd@broadcom.com>
-
-	* config.guess: Update to 2003-01-03 version.
-	* config.sub: Update to 2003-01-03 version.
-
-2003-01-07  Christopher Faylor  <cgf@redhat.com>
-
-	* configure: Regenerate with proper autoconf 2.13.
-
-2003-01-07  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Add AC_PREREQ for consistency.
-	* configure: Regenerate.
-
-2003-01-06  Andrew Cagney  <ac131313@redhat.com>
-
-	* configure.in (GDB_TK): Add tcl directories conditional on
-	gdb/gdbtk directory being present.
-	* configure: Regenerate.
-
-2003-01-04 John David Anglin  <dave.anglin@nrc.ca>
-
-	* configure.in (LD): Improve test for gcc.  Try to set LD to the ld used
-	by gcc if LD is not defined and we are not doing a Canadian Cross.
-	* configure: Rebuilt.
-
-2003-01-01  Daniel Jacobowitz  <drow@mvista.com>
-
-	* src-release (ETC_SUPPORT): Add fdl.texi and texi2pod.pl.
-
-2002-12-31  Tom Tromey  <tromey@redhat.com>
-
-	* Makefile.in: Rebuilt.
-	* Makefile.def (target_modules) [libffi]: Allow installation.
-
-2002-12-31  Andreas Schwab  <schwab@suse.de>
-
-	* configure.in: Fix use of $program_transform_name.
-	* configure: Regenerated.
-
-2002-12-30  Daniel Jacobowitz  <drow@mvista.com>
-
-	* configure.in (baseargs): Don't remove first configure argument.
-	* configure: Regenerated.
-
-2002-12-29  Alexandre Oliva  <aoliva@redhat.com>
-
-	* Makefile.tpl (local-distclean): Don't remove...
-	(multilib.ts): ... this.  Moved into...
-	(multilib.out): ... this.  Don't use sub-make.
-	($(BUILD_SUBDIR)/[+module+]/Makefile, [+module+]/Makefile,
-	$(TARGET_SUBDIR)/[+module+]/Makefile, gcc/Makefile): Moved into...
-	(configure-build-[+module+], configure-[+module+],
-	configure-target-[+module+], configure-gcc): ... these.  Test
-	for Makefile existence.  Drop config.status from dependencies.
-	* Makefile.in: Rebuilt.
-	* configure.in: Move gcc-version-trigger to the end of
-	ac_configure_args.  Add comments to maybedep.tmp and
-	serdep.tmp.  Introduce --disable-serial-configure.  Remove
-	nonopt from baseargs, matching and removing corresponding
-	whitespace while at it.
-	* configure: Rebuilt.
-
-2002-12-28  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in (host_configargs): Replace reference to
-	no-longer-defined buildopts with --build=${build_alias}.
-	* configure: Rebuilt.
-
-2002-12-28  Alexandre Oliva  <aoliva@redhat.com>
-
-	* Makefile.tpl ($(NOTPARALLEL)): Move to the end.  Bring uses of
-	program_transform_name to standard idiom.
-	(AUTOGEN, AUTOCONF): Define.
-	(Makefile.in): Use $(AUTOGEN).
-	(Makefile): Depend on config.status, and use autoconf-style rule to
-	build it.  Move original commands to...
-	(config.status): ... this new target.
-	(configure): Add $(srcdir).  Depend on config/acx.m4.  Use
-	$(AUTOCONF).
-	* Makefile.in: Rebuilt.
-
-2002-12-28  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Fix dramatic bustage due to change in
-	program_transform_name.
-	* Makefile.in: Regenerate.
-
-	* configure.in: Remove unnecessary PATH setting.
-	* configure: Regnerate.
-
-	* configure.in: Don't default to unprefixed tools unless
-	the native tools will work.
-	* configure: Regenerate.
-
-	* configure.in: Convert to autoconf script.  Blow away lots
-	of now-redundant Makefile fragments.
-	* configure: Generate using Autoconf.
-	* Makefile.tpl: Rewrite to reflect autoconfiscation.
-	* Makefile.in: Regenerate.
-
-2002-12-27  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure: Remove unneeded 'export's.  Make CC_FOR_TARGET,
-	CXX_FOR_TARGET, GCJ_FOR_TARGET substituted in configure.in only.
-
-	* ChangeLog: Move a couple of entries from here to winsup/cygwin,
-	where they belong.
-
-2002-12-24  Andreas Schwab  <schwab@suse.de>
-
-	* Makefile.tpl (multilib.out): Fix missing space.
-	* Makefile.in: Regenerate.
-
-2002-12-23  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Use shared multilib.out.  Use move-if-change for it.
-	Convert (cd foo; make) to (cd foo && make).  Clean up multilib.out.
-	* Makefile.in: Regenerate.
-	* configure.in: Remove unnecessary leftovers.
-
-2002-12-21  Geoffrey Keating  <geoffk@apple.com>
-
-	* configure.in (extra_ranlibflags_for_target): New variable.
-	(*-*-darwin): Add -c to ranlib commands.
-	* configure (tooldir): Handle extra_ranlibflags_for_target.
-
-2002-12-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Updated.
-	* COPYING.LIBGLOSS: Ditto.
-
-2002-12-19  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Revert HJL's change.
-	* Makefile.in: Regenerated.
-	* configure.in: Put build_prefix before $(BUILD_SUBDIR) here, and
-	always.
-
-2002-12-19  Andreas Schwab  <schwab@suse.de>
-
-	* Makefile.tpl, configure.in: Substitute libstdcxx_incdir.
-	* Makefile.in: Regenerate.
-
-2002-12-18  H.J. Lu <hjl@gnu.org>
-
-	* Makefile.tpl: Add @build_prefix@ before $(BUILD_SUBDIR).
-	* Makefile.in: Regenerated.
-
-	* configure.in (build_prefix): New. Substitute.
-
-2002-12-18  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Don't let real targets depend on phony targets.
-	* Makefile.in: Regenerate.
-
-	* Makefile.tpl (do-info): Depend on maybe-all-texinfo, not all-texinfo.
-	* Makefile.in: Regenerate.
-
-2002-12-16  Jason Merrill  <jason@redhat.com>
-
-	* Makefile.tpl (all-gcc): Use 'make quickstrap' if there was a
-	previous 'make bootstrap'.
-	* Makefile.in: Regenerate.
-
-2002-12-17  Hans-Peter Nilsson  <hp@bitrange.com>
-
-	* configure.in (noconfigdirs) [mmix-*-*]: Disable libgloss and gdb.
-
-2002-12-13  Jason Merrill  <jason@redhat.com>
-
-	* Makefile.tpl (check-gcc-c++): Renamed from check-c++.  Don't run
-	library tests.
-	(check-c++): Just depend on it and check-target-libstdc++-v3.
-	* Makefile.in: Regenerate.
-
-2002-12-13  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in, Makefile.tpl, Makefile.def: Remove tclX.
-	* Makefile.in: Regenerate.
-
-2002-12-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Update list of alternate Regent of California
-	licenses and discuss official revoking of advertising clause.
-	* COPYING.LIBGLOSS: Ditto.
-
-2002-12-12  Alexandre Oliva  <aoliva@redhat.com>
-
-	* Makefile.tpl (configure-target-rda): Depend on $(ALL_GCC_C).
-	* Makefile.in: Rebuilt.
-
-2002-12-10  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure: Fix bug put in by gremlins.
-
-	* Makefile.tpl: Substitute more autoconfily.
-	* configure: Substitute more autoconfily.
-	* Makefile.in: Regenerate.
-
-2002-12-08  Andrew Cagney  <ac131313@redhat.com>
-
-	* Makefile.tpl (all-sim): Depend on maybe-configure-gdb.
-	* Makefile.in (all-sim): Ditto.
-
-2002-12-06  DJ Delorie  <dj@redhat.com>
-
-	* Makefile.tpl: Change configure dependencies to not have real
-	targets depend on phony targets.
-
-2002-12-05  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Revert unintentional change.
-
-	* src-release: Configure host subdirs.
-
-	* Makefile.tpl: Change dependency for */multilib.out so that
-	it works when gcc isn't in the tree.
-
-	* configure.in: Substitute more.
-	* configure: Run subconfigures from the Makefile.
-	* Makefile.tpl: Run subconfigures from the Makefile; add a few
-	convenience targets.  Make sure gcc isn't rebuilt after bootstrap.
-
-2002-12-03  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Add targets for configuring host subdirs in Makefile,
-	and corresponding dependencies.
-	* Makefile.in: Regenerate.
-
-	* configure.in (host_tools): Order binutils, gas and ld for
-	convenience in running the testsuites.
-
-	* Makefile.tpl: Introduce rules to serialize subconfigure runs.
-	* Makefile.in: Regenerate.
-	* configure.in: Introduce rules to serialize subconfigure runs.
-
-	* configure.in: Introduce BASE_CC_FOR_TARGET.
-	* Makefile.tpl: Reorganize and comment.  Introduce HOST_CONFIGARGS.
-	Realize configure-build-* targets.  Realize configure-target-* targets.
-	* Makefile.in: Regenerate.
-
-2002-12-02  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure: Move gcc_version_trigger stuff from here...
-	* configure.in: ...to here.
-
-	* configure.in: Separate subconfigure options added by this file from
-	options given by the user.  Add machinery to put args for host
-	subconfigures into the Makefile.
-
-	* Makefile.tpl: Remove 'vault' targets.
-	* Makefile.tpl: Reorder and comment dependencies.
-	* Makefile.in: Regenerate.
-
-2002-11-28  Geoffrey Keating  <geoffk@apple.com>
-
-	* configure.in: Move host-specific darwin noconfigdirs into
-	the host-specific section.
-
-2002-12-02  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Restore bkorb's style patch, accidentally lost
-	during replay.
-	* Makefile.in: Regenerate.
-
-	(finishing slow-motion replay)
-	* configure: Remove skip-this-dir support.
-	* Makefile.tpl: Remove skip-this-dir support.
-
-	* Makefile.tpl: Remove leftover support for non-autoconfiscated
-	subdirectories.
-	* Makefile.in: Regenerate.
-
-	* Makefile.tpl: Strip out useless setting of 'dir'.
-	* Makefile.in: Regenerate.
-
-2002-12-02  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	(finishing slow-motion replay)
-	* configure.in: Fix deeply stupid bug.
-
-	* configure.in: Introduce RAW_CXX_FOR_TARGET and simplify embedded
-	shell code in CXX_FOR_TARGET
-	* Makefile.def: Introduce raw_cxx.
-	* Makefile.tpl: Use raw_cxx to select between CXX_FOR_TARGET and
-	RAW_CXX_FOR_TARGET.
-	* Makefile.in: Regenerate.
-
-2002-12-02  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	(finishing slow-motion replay)
-	* Makefile.tpl: Remove unnecessary ifs.
-	* Makefile.in: Regenerate.
-
-	* Makefile.tpl: Implement soft dependency machinery.  Maybe-ize
-	dependencies.  Maybe-ize build-libiberty.  Create dummy install
-	targets for 'no_install' modules.
-	* configure: Move GDB_TK substitution to configure.in.  Move
-	build_modules stuff to configure.in.
-	* configure.in: Implement soft dependency machinery.  Maybe-ize
-	GDB_TK, rearrange slightly.  Move build_modules stuff from configure.
-	* Makefile.in: Regenerate.
-
-2002-12-01  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	(continuing slow-motion replay)
-	* Makefile.tpl: Make all-target, install-target behave similarly
-	to all, install (only hitting configured targets).  Eliminate
-	unused macro defintions.
-
-	* Makefile.tpl: Add all-gcc: all-build-libiberty dependency when
-	build != host.
-
-	* Makefile.tpl: Add all-gcc: all-libiberty dependency.
-
-	* ltcf-c.sh, ltcf-gcj.sh, Makefile.tpl: Correct BUILD/HOST confusion.
-
-	* configure.in: Produce lists of subdir targets we're actually
-	configuring.  Remove references to "dosrel".
-	* Makefile.tpl: Let configure set which subdir targets are hit.
-	Remove install-cross; clean up install; remove ALL.  Remove
-	references to "dosrel".  Remove "EXTRA_TARGET_HOST" hackery.
-	Autogenerate host module targets.  Remove empty dependency lines
-	and redundant dependency; rearrange slightly.
-	* Makefile.def: Add host-side libtermcap, utils.
-
-	* Makefile.in: Regenerate.
-
-2002-12-01  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	(Continuing slow-motion replay)
-	* Makefile.def: Add list of recursive targets to autogenerate.
-	Add build_modules.
-	* Makefile.tpl: Autogenerate do-* targets.  Autogenerate *-target-*
-	targets.  Autogenerate *-build-* targets.
-	* Makefile.in: Regenerate.
-
-2002-11-30  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	(Continuing slow-motion replay)
-	* configure: More autoconf-style substitutions.
-	* Makefile.tpl: More autoconf-style substitutions.
-	* Makefile.in: Regenerate.
-
-2002-11-30  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	(Continuing slow-motion replay)
-	* configure: Substitute more variables in a more autoconf-friendly
-	way.  Simplify slightly.
-	* Makefile.tpl: Make more variables substitutable in an
-	autoconf-friendly way.
-	* Makefile.in: Regenerate.
-
-2002-11-29  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	(Continuing slow-motion replay)
-	* configure.in (v810*): Remove special setting of tools.
-
-	* configure: Add support for extra required flags for ar or nm.
-	* configure.in (aix4.3+): Use above support for target-specific
-	issues, rather than using config/mt-aix43.
-
-2002-11-29  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	(Starting slow-motion replay merge from gcc 3.4 b-i-b branch)
-	* configure: Remove 'removing', which doesn't work.  Replace $subdir
-	with . everywhere.  Replace $subdirs with ''.  Replace $makesrcdir
-	with $srcdir.  Reformat indentation.  Substitute some variables
-	formerly hard-coded in the Makefile for build=host.
-	* Makefile.tpl: Autogenerate more; make more autoconf-friendly.
-	* Makefile.def: Autogenerate more.
-	* Makefile.in: Regenerate.
-
-2002-11-13  Bruce Korb  <bkorb@gnu.org>
-
-	* Makefile.tpl: syntactic cleanup
-
-2002-11-04  Kevin Buettner  <kevinb@redhat.com>
-
-	* Makefile.def (host_modules): Add rda.
-	* Makefile.in: Regenerate.
-	* configure.in (target_tool): Add target-rda to list.
-
-2002-10-25  Phil Edwards  <pme@gcc.gnu.org>
-
-	* Makefile.tpl (bootstrap):  Add bubblestrap, quickstrap, cleanstrap,
-	and restrap targets to this rule.
-	* Makefile.in:  Regenerate.
-
-2002-10-24  Hans-Peter Nilsson  <hp@bitrange.com>
-
-	* configure.in (i[3456]86-*-linux*): Add check to disable
-	${libgcj} for glibc1.
-
-2002-10-07  Svein E. Seldal  <Svein.Seldal@solidas.com>
-
-	* configure.in: Add tic4x target.
-
-2002-10-03  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Make SET_LIB_PATH substitution more autoconfy.
-	* Makefile.tpl: Make RPATH_ENVVAR substitution more autoconfy.
-	* configure.in: Make SET_LIB_PATH substitution more autoconfy.
-	* configure.in: Make RPATH_ENVVAR substitution more autoconfy.
-	* Makefile.in: Regenerate.
-
-2002-10-02  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Eliminate reference to all-gui, all-libproc.
-	* Makefile.in: Regenerate.
-
-	* Makefile.def: Remove order dependency comments.
-	* Makefile.tpl: Add explicit install-install dependencies.
-	* Makefile.in: Regenerate.
-
-	* Makefile.tpl: Remove material now in src-release.  (Finally!)
-	* Makefile.in: Regenerate.
-
-	* configure: Restore my original patch by syncing with gcc version.
-
-	* Bring following over from gcc:
-
-2002-09-30  Ulrich Weigand  <uweigand@de.ibm.com>
-
-	* configure.in (s390*-*-linux*): Enable libgcj.
-
-2002-10-02  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.in: Regenerate.  This really ought to fix things. :sigh:
-
-2002-10-02  Alan Modra  <amodra@bigpond.net.au>
-
-	* configure: Move stray lines back to where they belong.
-
-2002-10-01  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Insert configure-target target, for src-release.
-
-	* configure: Finish reverting change which Andrew Cagney started
-	reverting.  Should fix bustage.
-
-	* src-release (BINUTILS_SUPPORT_DIRS): Add cpu directory.
-	* src-release: New file.  Contains material for making net
-	releases for gdb, binutils, et al., formerly in Makefile.in.
-
-2002-09-30  Nick Clifton  <nickc@redhat.com>
-
-	* cpu: New top level directory.  Intended to hold input files for
-	CGEN which have FSF copyright assignment.
-	* Makefile.in (BINUTILS_SUPPORT_DIRS): Add cpu directory.
-
-2002-09-29  Andrew Cagney  <ac131313@redhat.com>
-
-	Revert below (note that src does not contain Makefile.tpl):
-	* Makefile.tpl: Make subsituted variables more autoconfy.
-	* Makefile.in: Regenerate.
-
-2002-09-29  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure: Revert accidentally applied changes.
-
-	* Makefile.tpl: Make more autoconf-friendly.
-	* Makefile.in: Regenerate.
-	* configure: Make substitution more autoconf-like.
-
-2002-09-28  Richard Earnshaw  <rearnsha@arm.com>
-
-	* configure.in (arm-*-coff, strongarm-*-coff, xscale-*-coff): Use a
-	single entry to handle all these.
-	(arm-*-elf, strongarm-*-elf, xscale-*-elf): Likewise.  Also enable
-	libjava on arm-*-elf.
-
-2002-09-27  Geoffrey Keating  <geoffk@apple.com>
-
-	* configure.in (powerpc-*-darwin*): Don't configure BFD, TK, or the
-	things that depend on them.
-
-2002-09-25  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Make subsituted variables more autoconfy.
-	* Makefile.in: Regenerate.
-	* configure: Make seds more autoconfy.
-
-2002-09-25  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.tpl: Rewrite substituted lines to look autoconfy.
-	* Makefile.in: Regenerate.
-	* configure.in: Rewrite sed statements to look autoconfy.
-
-	* Makefile.tpl: Autogenerate *-target-* lists, dependencies of
-	all-target-foo on configure-target-foo.
-	* Makefile.def: Ditto.
-	* Makefile.in: Rebuild.
-
-2002-09-22  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Makefile.def: New file.
-	* Makefile.tpl: New file.
-	* Makefile.in: Generate from Makefile.tpl with 'autogen Makefile.def'.
-
-	* configure.in: Minor rearrangement.  Simplify tests.
-
-2002-09-23  Jason Thorpe  <thorpej@wasabisystems.com>
-
-	* configure.in (with_headers): Skip copy if value is "yes".
-	(with_libs): Likewise.
-
-2002-09-20  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in (*-*-netbsd*): Use noconfigdirs, not skipdirs.
-	* configure.in (sh*-*-pe*): Ditto.
-	* configure.in (mips*-*-pe*): Ditto.
-	* configure.in (*arm-wince-pe): Ditto.
-
-	* configure.in: Rearrange.
-
-2002-09-12  Nick Clifton  <nickc@redhat.com>
-
-	* Import these changes from the config master repository:
-
-	2002-09-05  Svein E. Seldal  <Svein.Seldal@solidas.com>
-
-		* config.sub: Add tic4x target.
-
-	2002-09-03  Ben Elliston  <bje@redhat.com>
-
-		* config.guess: Detect NSR-D machines for nsr-tandem-nsk.
-		Reported by <Duncan_Stodart@insession.com>.
-
-2002-09-10  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: More updates.
-
-2002-09-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Update.
-
-2002-08-23  Andrew Cagney  <ac131313@redhat.com>
-
-	* texinfo/texinfo.tex: Import version 2002-06-04.06.
-
-	* config.guess: Import version 2002-08-23.
-	* config.sub: Import version 2002-08-22.
-
-2002-08-20  Alexandre Oliva  <aoliva@redhat.com>
-
-	* Makefile.in (GCC_FOR_TARGET): Prepend STAGE_CC_WRAPPER.
-	* configure.in (CC_FOR_TARGET, GCJ_FOR_TARGET, CXX_FOR_TARGET,
-	CXX_FOR_TARGET_FOR_RECURSIVE_MAKE): Likewise.
-
-2002-08-06  Federico G. Schwindt <fgsch@olimpo.com.br>
-
-	* configure.in (hppa*-*-openbsd*): Treat like hppa*-*-*elf*.
-
-2002-08-04  H.J. Lu  (hjl@gnu.org)
-
-	* configure.in (mips*-*-linux*): Don't skip target-libffi.
-
-2002-07-31  Alan Modra  <amodra@bigpond.net.au>
-
-	* configure.in: Move generic linux case to end.	 Copy generic
-	linux noconfigdirs to mips*-*-linux* entry and new
-	powerpc64*-*-linux* entry.  Add target-libffi for the latter.
-
-2002-07-19  Chris Demetriou  <cgd@broadcom.com>
-
-	* MAINTAINERS: Clarify on config.guess and config.sub, and add
-	one instance of them which was missed to the list to update.
-
-2002-07-16  Chris Demetriou  <cgd@broadcom.com>
-
-	* config.guess: Update to 2002-07-09 version.
-	* config.sub: Update to 2002-07-03 version.
-
-2002-07-11  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Remove two redundant tests.
-
-2002-07-11  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* configure.in (mips*-*-irix6*o32): Enable stabs.
-
-2002-07-08  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Don't build grez.
-	* Makefile.in: Ditto.
-
-	* Makefile.in: Remove references to bsp, cygmon, libstub.
-	* configure.in: Ditto.
-
-	* configure.in: Remove leftover reference to gdbtest.
-
-2002-07-08  Phil Edwards  <pme@gcc.gnu.org>
-
-	* configure.in (gxx_include_dir):  Change to match versioned
-	C++ headers if --enable-version-specific-runtime-libs is used.
-
-2002-07-04  Steve Ellcey  <sje@cup.hp.com>
-
-	* ltcf-cxx.sh (hpux*): Modify to support ia64-*-hpux*.
-
-2002-07-03  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Make --without-x work.
-
-2002-07-03  Nick Clifton  <nickc@cambridge.redhat.com>
-
-	* contrib: New directory.  Created to contain a copy of the
-	texi2pod.pl script so that it is in the same place as the version in
-	the FSF GCC sources.
-
-2002-07-02  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* configure.in: Rearrange target Makefile fragment collection.
-
-	* Makefile.in: Don't try to build gdbtest, tgas, ispell, inet, or
-	cvs[src].
-	* configure.in: Ditto.
-
-2002-07-01  Nathanael Nerode <neroden@gcc.gnu.org>
-
-	* Makefile.in: Eliminate 'apache' targets.
-	* configure.in: Eliminate 'apache' targets.
-
-	* configure.in: Eliminate redundant tests.  Reorganize.
-
-	* Makefile.in: Eliminate last reference to LIBGCC1_TEST.
-
-	* config-ml.in: Eliminate references to Cygnus configure.
-
-	* Makefile.in: Eliminate references to building emacs.
-
-2002-07-01  Denis Chertykov  <denisc@overta.ru>
-
-	* configure.in: Add support for ip2k.
-
-2002-06-24  Ben Elliston  <bje@redhat.com>
-
-	* configure.in (host_tools): Remove cgen.
-
-	* Makefile.in (all-cgen): Remove; runs from its source directory.
-	(check-cgen, install-cgen, clean-cgen): Likewise.
-	(all-opcodes): No not depend on all-cgen.
-	(all-sim): Likewise.
-
-2002-06-22  Nathanael Nerode  <neroden@twcny.rr.com>
-
-	* configure.in: Fix AIX configury bug.
-
-2002-06-19  Nathanael Nerode  <neroden@twcny.rr.com>
-
-	* configure.in: Replace ${topsrcdir} with ${srcdir}.
-
-	* configure.in: Move definition of libstdcxx_flags right above
-	usage, rather than way earlier.
-
-	* configure.in: Pull definition of is_cross_compiler earlier.
-
-	* configure.in: Rearrange a little.
-
-	* configure.in: Remove references to librx.
-	* Makefile.in: Remove references to librx.
-
-2002-06-19  Nathanael Nerode  <neroden@twcny.rr.com>
-
-	* configure.in: Eliminate ${gasdir} variable.
-
-2002-06-18  Dave Brolley  <brolley@redhat.com>
-
-	* configure.in: Add support for frv.
-	* config.sub: Add support for frv.
-
-2002-06-12  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
-
-	* Makefile.in (CFLAGS_FOR_TARGET): Add -O2.
-
-2002-06-08  Jason Thorpe  <thorpej@wasabisystems.com>
-
-	* configure.in (vax-*-netbsd*): Re-enable gas.
-
-2002-05-31  Nathanael Nerode  <neroden@twcny.rr.com>
-
-	* Makefile.in: Replace HOST_PREFIX, HOST_PREFIX_1 with BUILD_PREFIX,
-	BUILD_PREFIX_1, to correct nomenclature.
-	* configure: Likewise.
-
-	* Makefile.in: Eliminate version-specific references to tcl8.1, tk8.1.
-	* configure.in: Eliminate version-specific references to tcl8.1, tk8.1.
-
-2002-05-31  Olaf Hering  <olh@suse.de>
-
-	* config-ml.in: Propogate DESTDIR also.
-
-2002-05-29  Jason Thorpe  <thorpej@wasabisystems.com>
-
-	* configure.in (vax-*-netbsd*): Don't build gas for this
-	platform.
-
-2002-05-28  Marek Michalkiewicz  <marekm@amelek.gda.pl>
-
-	* configure.in (noconfigdirs): Don't compile libiberty, libstdcxx
-	and libgcj for AVR.
-
-2002-05-28  Nick Clifton  <nickc@cambridge.redhat.com>
-
-	* config.sub: Add DLX target.
-
-2002-05-22  Jason Thorpe  <thorpej@wasabisystems.com>
-
-	* config.guess: Update to 2002-05-22 version.
-	* config.sub: Likewise.
-
-2002-05-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* Makefile.in: Allow for PWDCMD to override hardcoded pwd.
-	* config-ml.in: Likewise.
-	* configure: Likewise.
-	* configure.in: Likewise.
-
-2002-05-13  Nathanael Nerode  <neroden@twcny.rr.com>
-
-	* configure.in: Simplify makefile fragment collection.
-
-	* configure.in: Remove code to build emacs.
-
-	* configure.in : Remove --srcdir argument from targargs and buildargs
-	(it's always overridden in the Makefile anyway).  Rearrange a bit.
-
-	* configure: Move some logic to configure.in.
-	* configure.in: Move some logic from configure.
-
-2002-05-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.LIBGLOSS: New file.
-
-2002-05-07  Federico G. Schwindt <fgsch@olimpo.com.br>
-
-	* Makefile.in: Honour DESTDIR.
-
-2002-05-05  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in (noconfigdirs): Don't disable libgcj on
-	sparc64-*-solaris* and sparcv9-*-solaris*.
-
-2002-05-03  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in: Revert 2002-04-18's patch; fixed in libjava.
-
-2002-05-03  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* configure.in (FLAGS_FOR_TARGET): Do not add
-	-B$$r/$(TARGET_SUBDIR)/newlib/ when compiling newlib natively
-	on i[3456]86-*-linux*.
-
-2002-05-01  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* configure.in (noconfigdirs): Replace [ ] with test.
-
-	* configure.in (noconfigdirs): Do not add target-newlib if
-	target == i[3456]86-*-linux*, and host == target.
-
-2002-04-29  Mark Mitchell  <mark@codesourcery.com>
-
-	* config.guess: Updated to 2002-04-26's version.
-	* config.sub: Updated to 2002-04-26's version.
-
-2002-04-29  Nathanael Nerode  <neroden@doctormoo.dyndns.org>
-
-	* configure.in: delete reference to absent file
-
-	* configure.in: replace '[' with 'test'
-
-	* configure.in: Eliminate references to gash.
-	* Makefile.in: Eliminate references to gash.
-
-	* configure.in: remove useless references to 'pic' makefile fragments.
-
-	* configure.in: (*-*-windows*) Finish removing.
-
-	* configure.in: Eliminate redundant test for libgui.
-
-2002-04-26  Joel Sherrill  <joel@OARcorp.com>
-
-	* configure.in (h8300*-*-rtems*): Disable libf2c and libgcj.
-	(sparc-*-elf*, sparc64-*-elf*): Disable libgcj.
-
-2002-04-19  Nathanael Nerode  <neroden@twcny.rr.com>
-
-	* configure.in: remove references to dead files
-
-2002-04-18  Tom Tromey  <tromey@redhat.com>
-
-	* configure.in: Disallow configuring libgcj when it is already
-	installed and we're using Solaris 2.8 linker.  Do enable libgcj on
-	Solaris 2.8 by default.  For PR libgcj/6158.
-
-2002-04-17  Nathanael Nerode  <neroden@twcny.rr.com>
-
-	* configure.in:  Move default CC setting out of config/mh-* fragments
-	directly into here.
-
-2002-04-17  Nathanael Nerode  <neroden@twcny.rr.com>
-
-	* configure.in: don't even try to configure or make a subdirectory
-	if there's no configure script for it.
-
-2002-04-15  Mark Mitchell  <mark@codesourcery.com>
-
-	* MAINTAINERS: Remove chill maintainers.
-	* Makefile.in (CHILLFLAGS): Remove.
-	(CHILL_LIB): Remove.
-	(TARGET_CONFIGDIRS): Remove libchill.
-	(CHILL_FOR_TARGET): Remove.
-	(BASE_FLAGS_TO_PASS): Don't pass CHILLFLAGS, CHILL_FOR_TARGET, or
-	CHILL_LIB.
-	(CONFIGURE_TARGET_MODULES): Remove configure-target-libchill.
-	(CHECK_TARGET_MODULES): Likewise.
-	(INSTALL_TARGET_MODULES): Likewise.
-	(CLEAN_TARGET_MODULES): Likewise.
-	(configure-target-libchill): Remove.
-	(all-target-libchill): Remove.
-	* configure.in (target_libs): Remove target-libchill.
-	Do not compute CHILL_FOR_TARGET.
-	* libchill: Remove directory.
-
-2002-04-15  DJ Delorie  <dj@redhat.com>
-
-	* Makefile.in, configure.in, configure: Sync with gcc, entries
-	follow...
-
-2002-04-08  Tom Tromey  <tromey@redhat.com>
-
-	* configure.in: Add FLAGS_FOR_TARGET to GCJ_FOR_TARGET.
-	Fixes PR libgcj/6068.
-
-2002-03-30  Krister Walfridsson  <cato@df.lth.se>
-
-	* configure.in (i*86-*-netbsdelf*): Don't disable libgcj.
-
-2002-03-27  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* configure.in (alpha*-dec-osf*): Enable libgcj.
-
-2002-03-24  Nick Clifton  <nickc@cambridge.redhat.com>
-
-	Fix for: PR bootstrap/3591, target/5676
-	* configure.in (mcore-pe): Disable the configuration of
-	libstdc++-v3 since exceptions are not supported.
-
-2002-03-20  Anthony Green  <green@redhat.com>
-
-	* configure.in: Enable libgcj for xscale-elf target.
-
-2002-02-28  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in (libstdcxx_flags): Don't add libstdc++-v3 flags for
-	libjava.
-	(CXX_FOR_TARGET): Explain why -shared-libgcc here.
-
-2002-02-22  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in (CXX_FOR_TARGET): Add -shared-libgcc for
-	libstdc++-v3 and libjava.
-
-2002-02-11  Adam Megacz <adam@xwt.org>
-
-	* gcc/Makefile.in: Removed libstdc++-v3 dependancy for libjava and
-	boehm-gc
-
-2002-02-09  Alexandre Oliva  <aoliva@redhat.com>
-
-	* config.guess: Updated to 2002-01-30's version.
-	* config.sub: Updated to 2002-02-01's version.
-	Contribute sh64-elf.
-	2000-12-01  Alexandre Oliva  <aoliva@redhat.com>
-	* configure.in: Added sh64-*-*.
-
-2002-01-17  H.J. Lu <hjl@gnu.org>
-
-	* Makefile.in (all-fastjar): Also depend on all-libiberty.
-	(all-target-fastjar): Also depend on all-target-libiberty.
-
-Wed Dec  5 07:33:45 2001  Douglas B. Rupp  <rupp@gnat.com>
-
-	* configure, configure.in: Use temp file for long sed commands.
-
-2001-11-14  Hans-Peter Nilsson  <hp@bitrange.com>
-
-	* configure.in (noconfigdirs) [h8300*-*-*, h8500-*-*]: Disable
-	libf2c.
-
-2001-11-03  Hans-Peter Nilsson  <hp@bitrange.com>
-
-	* configure.in (noconfigdirs) [mmix-*-*]: Disable libgcj.
-
-2001-10-11  Hans-Peter Nilsson  <hp@axis.com>
-
-	* configure.in (noconfigdirs) [cris-*-*]: Disable libgcj.
-
-2001-10-02  Joseph S. Myers  <jsm28@cam.ac.uk>
-
-	* configure: Handle temporary files securely using mkdir.
-
-2001-09-26  Will Cohen <wcohen@redhat.com>
-
-	* configure.in (*-*-linux*): Disable configuration of target-newlib
-	and target-libgloss.
-
-2001-09-26  Alexandre Oliva  <aoliva@redhat.com>
-
-	* Makefile.in (EXTRA_TARGET_FLAGS): Pass RANLIB_FOR_TARGET for
-	RANLIB.
-
-2001-08-11  Graham Stott  <grahams@redhat.com>
-
-	* Makefile.in (check-c++): Add missing semicolon.
-
-2001-07-25  Andrew Haley  <aph@cambridge.redhat.com>
-
-	* configure.in (sh-*-linux*): New.
-
-2001-07-12  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
-
-	* configure.in (noconfigdirs): Don't compile libiberty, libstdcxx
-	and libgcj on m68hc11/m68hc12.
-
-2001-06-27  H.J. Lu  (hjl@gnu.org)
-
-	* Makefile (CFLAGS_FOR_BUILD): New.
-	(EXTRA_GCC_FLAGS): Add CFLAGS_FOR_BUILD.
-
-2001-06-01  Hans-Peter Nilsson  <hp@axis.com>
-
-	* configure.in (libstdcxx_flags): Do not try to execute
-	libstdc++-v3/testsuite_flags until it exists.
-
-2001-05-18  Benjamin Kosnik  <bkoz@redhat.com>
-
-	* configure.in (libstdcxx_flags): Remove reference to libstdc++.INC.
-
-2001-05-09  Jeffrey Oldham  <oldham@codesourcery.com>
-
-	* ltcf-cxx.sh: Add -nostdlib to IRIX 6 archive_cmds.
-
-Mon Apr 23 09:15:03 2001  Anthony Green  <green@redhat.com>
-
-	* configure.in: Move *-chorusos target case to the proper switch.
-	Disable libgcj.
-
-2001-04-13  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
-
-	* Makefile.in (STAGE1_CFLAGS): Pass down.
-
-2001-04-13  Alan Modra  <amodra@one.net.au>
-
-	* config.guess: Add hppa64-linux support.  Note for next import that
-	this is already in the master file.
-	* configure.in: Likewise.  Accept `parisc' alias for `hppa'.
-
-2001-03-22  Colin Howell  <chowell@redhat.com>
-
-	* Makefile.in (DO_X): Do not backslash single-quotes in
-	backquotes (two places).
-
-2001-03-18  Laurynas Biveinis  <lauras@softhome.net>
-
-	* Makefile.in (DO_X): Quote nested quotes.
-
-2001-03-15  Laurynas Biveinis  <lauras@softhome.net>
-
-	* Makefile.in (DO_X): Use double quotes for quoting
-	"RANLIB=$${RANLIB}".
-
-2001-03-09  Nicola Pero <n.pero@mi.flashnet.it>
-
-	* configure.in: Only use `lang_requires' for languages athat are
-	actually enabled.
-
-2001-03-07  Tom Tromey  <tromey@redhat.com>
-
-	* configure.in: Allow config-lang.in to set `lang_requires' to list
-	of other required languages.
-
-2001-03-06  Laurynas Biveinis  <lauras@softhome.net>
-
-	* Makefile.in: Remove RANLIB definition. Use RANLIB
-	in RANLIB_FOR_TARGET, EXTRA_HOST_FLAGS, EXTRA_TARGET_FLAGS,
-	EXTRA_GCC_FLAGS, $(DO_X) targets only when the RANLIB is set.
-
-2001-02-28  Benjamin Kosnik  <bkoz@redhat.com>
-	    Alexandre Oliva  <aoliva@redhat.com>
-
-	* Makefile.in (check-c++): Use tabs, not spaces.
-
-2001-02-19  Benjamin Kosnik  <bkoz@redhat.com>
-
-	* Makefile.in (check-c++): New rule.
-
-	* configure.in (target_libs): Remove libg++.
-	(noconfigdirs): Remove libg++.
-	(noconfigdirs): Same.
-	(noconfigdirs): Same.
-	(noconfigdirs): Same.
-
-	* config-ml.in: Remove libg++ references.
-
-	* Makefile.in (TARGET_CONFIGDIRS): Remove libio, libstdc++, libg++.
-	(ALL_TARGET_MODULES): Same.
-	(configure-target-libg++): Remove.
-	(all-target-libg++): Remove.
-	(configure-target-libio): Remove.
-	(all-target-libio): Remove.
-	(check-target-libio): Remove.
-	(.PHONY): Remove.
-	(libg++.tar.bz2): Remove.
-	(all-target-cygmon): Remove libio.
-	(all-target-libstdc++): Remove.
-	(configure-target-libstdc++): Remove.
-	(TARGET_LIB_PATH): Remove libstdc++.
-	(ALL_GCC_CXX): Remove libstdc++.
-	(all-target-gperf): Correct.
-
-2001-02-15  Anthony Green  <green@redhat.com>
-
-	* configure: Introduce GCJ_FOR_TARGET.
-	* configure.in: Ditto.
-	* Makefile.in: Ditto.
-
-2001-02-08  Chandrakala Chavva <cchavva@redhat.com>
-
-	* configure.in: for *-chorusos, don't config target-newlib and
-	target-libgloss.
-
-2001-02-04  Mark Mitchell  <mark@codesourcery.com>
-
-	Remove V2 C++ library.
-	* configure.in: Remove --enable-libstdcxx_v3 support.
-
-2001-01-27  Richard Henderson  <rth@redhat.com>
-
-	* configure.in (target_makefile_frag) [alpha*-*]: Use mt-alphaieee.
-
-2001-01-26  Tom Tromey  <tromey@redhat.com>
-
-	* configure.in: Allow libgcj to be built on Sparc Solaris.
-
-2001-01-23  Bryce McKinlay  <bryce@albatross.co.nz>
-
-	* configure.in: Enable libgcj on several additional platforms.
-
-2001-01-22  Bryce McKinlay  <bryce@albatross.co.nz>
-
-	* configure.in: Enable libgcj for linux targets.
-
-2001-01-09  Mike Stump  <mrs@wrs.com>
-
-	* Makefile.in (CONFIGURE_TARGET_MODULES): Pass back configuration
-	failures of subdirectories.
-
-2001-01-02  Laurynas Biveinis  <lauras@softhome.net>
-
-	* configure: handle DOS-style absolute paths.
-
-2001-01-02  Laurynas Biveinis  <lauras@softhome.net>
-
-	* configure.in: remove supported directories from $noconfigdirs for DJGPP.
-
-2000-12-18  Benjamin Kosnik  <bkoz@redhat.com>
-
-	* Makefile.in (BASE_FLAGS_TO_PASS): Alphabetize.
-	(libstdcxx_incdir): Pass down.
-	* config.if: Remove expired bits for cxx_interface, add stub.
-	(libstdcxx_incdir): Add variable for g++ include directory.
-	* configure.in (gxx_include_dir): Use it.
-
-2000-12-15  Andreas Jaeger  <aj@suse.de>
-
-	* configure.in: Handle lang_dirs.
-
-2000-12-13  Anthony Green  <green@redhat.com>
-
-	* configure.in: Disable libgcj for any target not specifically
-	listed.  Disable libgcj for x86 and Alpha Linux until compatible
-	with g++ abi.
-
-2000-12-13  Mike Stump  <mrs@wrs.com>
-
-	* Makefile.in (local-distclean): Also remove fastjar.
-
-2000-12-10  Anthony Green  <green@redhat.com>
-
-	* configure.in: Define libgcj.  Disable libgcj target libraries for
-	most targets.
-
-2000-12-09  Alexandre Petit-Bianco  <apbianco@cygnus.com>
-
-	* configure.in (target_libs): Revert 2000-12-08 patch.
-	(noconfigdirs): Added target-libjava.
-
-2000-12-09  Laurynas Biveinis  <lauras@softhome.net>
-
-	* Makefile.in: handle DOS-style absolute paths.
-
-2000-12-08  Alexandre Petit-Bianco  <apbianco@cygnus.com>
-
-	* Makefile.in (TARGET_CONFIGDIRS): Wrong place. Removed note about
-	libjava.
-	* configure.in (target_libs): Removed `target-libjava'.
-
-2000-12-08  Alexandre Petit-Bianco  <apbianco@cygnus.com>
-
-	* Makefile.in (TARGET_CONFIGDIRS): Added note about libjava.
-	(ALL_MODULES): Added fastjar.
-	(NATIVE_CHECK_MODULES, INSTALL_MODULES, CLEAN_MODULES): Likewise.
-	(all-target-libjava): all-fastjar replaces all-zip.
-	(all-fastjar): Added.
-	(configure-target-fastjar, all-target-fastjar): Likewise.
-	* configure.in (host_tools): Added fastjar.
-
-2000-12-07  Mike Stump  <mrs@wrs.com>
-
-	* Makefile.in (local-distclean): Remove leftover built files.
-
-2000-11-16  Fred Fish  <fnf@be.com>
-
-	* configure.in (enable_libstdcxx_v3): Fix typo,
-	libstd++ -> libstdc++.
-
-2000-11-13  Joseph S. Myers  <jsm28@cam.ac.uk>
-
-	* configure: Provide the original toplevel configure arguments
-	(including $0) to subprocesses in the environment rather than
-	through gcc/configargs.h.
-
-2000-11-12  Mark Mitchell  <mark@codesourcery.com>
-
-	* configure: Turn on libstdc++ V3 by default.
-
-2000-10-16  Michael Meissner  <meissner@redhat.com>
-
-	* configure (gcc/configargs.h): Only create if there is a build GCC
-	directory created.
-
-2000-10-05  Phil Edwards  <pme@gcc.gnu.org>
-
-	* configure: Save configure arguments to gcc/configargs.h.
-
-2000-10-04  Andris Pavenis  <pavenis@latnet.lv>
-
-	* Makefile.in (bootstrap): avoid recursion if subdir missing
-	(cross): ditto
-	(do-proto-toplev): ditto
-
-Wed Sep 13 11:11:29 2000  Jeffrey A Law  (law@cygnus.com)
-
-	* configure.in: Do not build byacc for hppa64.  Provide paths to the
-	X11 libraries for hppa64.
-
-2000-09-02  Anthony Green  <green@cygnus.com>
-
-	* Makefile.in (all-gcc): Depend on all-zlib.
-	(CLEAN_MODULES): Add clean-zlib.
-	(ALL_MODULES): Add all-zlib.
-	* configure.in (host_libs): Add zlib.
-
-2000-08-25  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in (FLAGS_FOR_TARGET): Use $target_configdirs and
-	$targargs to tell whether newlib is going to be built.
-
-	* configure.in [disable-libstdcxx-v3] (libstdcxx_flags): Search
-	$$r/TARGET_SUBDIR/libio for _G_config.h.
-
-2000-08-14  Zack Weinberg  <zack@wolery.cumb.org>
-
-	* configure.in (libstdcxx_flags): Remove -isystem $$s/libio/stdio.
-
-	* configure: Make enable_threads and enable_shared defaults
-	explicit.  Substitute enable_threads into generated Makefiles.
-	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
-	* libtool.m4: Accept *-*-linux* not just *-*-linux-gnu*.
-
-2000-08-02  Manfred Hollstein  <manfredh@redhat.com>
-
-	* configure.in: Re-enable all references to libg++ and librx.
-
-2002-04-09  Loren James Rittle  <rittle@labs.mot.com>
-
-	* configure.in: Add *-*-freebsd* configurations.
-
-2002-04-07  Andrew Cagney  <ac131313@redhat.com>
-
-	* Makefile.in (do-tar-bz2): Delete rule.  Replace with ...
-	(do-tar, do-bz2): New rules.
-	(taz): Update.  Replace do-tar-bz2 with do-tar and do-bz2.
-	(gdb-tar): New rule.
-	(gdb-taz): Rewrite.  Use gdb-tar and do-bz2.
-	(insight_dejagnu.tar): New rule.
-	(insight.tar): New rule.
-	(gdb+dejagnu.tar): New rule.
-	(gdb.tar): New rule.
-
-2002-04-07  Andrew Cagney  <ac131313@redhat.com>
-
-	* MAINTAINERS: Update dejagnu/
-
-2002-03-16  Alexandre Oliva  <aoliva@redhat.com>
-
-	* ltmain.sh (relink_command): Fix typo in previous change.
-
-2002-03-15  Alexandre Oliva  <aoliva@redhat.com>
-
-	* ltmain.sh (taglist): Initialized.  Don't let `CC' tag out of it.
-	(relink_command): Added --tag flags.
-	(mode=install): If relinking fails; error out.
-
-2002-03-12  Richard Henderson  <rth@redhat.com>
-
-	* Makefile.in (NOTPARALLEL): New.  Use it instead of explicit
-	.NOTPARALLEL tag.
-	(do-check): Rename from check.
-	(check): Allow parallel check.
-
-2002-03-11  Richard Henderson  <rth@redhat.com>
-
-	* Makefile.in (.NOTPARALLEL): Add fake tag.
-
-2002-03-07  H.J. Lu  (hjl@gnu.org)
-
-	* configure.in: Enable gprof for mips*-*-linux*.
-
-2002-02-28  Alexandre Oliva  <aoliva@redhat.com>
-
-	* configure.in (libstdcxx_flags): Don't add libstdc++-v3 flags for
-	libjava.
-	(CXX_FOR_TARGET): Add -shared-libgcc for libstdc++-v3 and libjava.
-
-2002-02-24  Andrew Cagney  <ac131313@redhat.com>
-
-	* texinfo/texinfo.tex: Update to version 2002-02-14.08.
-
-2002-02-23  Daniel Jacobowitz  <drow@mvista.com>
-
-	* config.guess: Import from master sources, rev 1.232.
-	* config.sub: Import from master sources, rev 1.246.
-
-2002-02-23  Alexandre Oliva  <aoliva@redhat.com>
-
-	* Makefile.in (MAKEINFO): Don't assume makeinfo will be built just
-	because its Makefile is there; test for the executable instead.
-
-2002-02-09  Alexandre Oliva  <aoliva@redhat.com>
-
-	Contribute sh64-elf.
-	2000-12-01  Alexandre Oliva  <aoliva@redhat.com>
-	* configure.in: Added sh64-*-*.
-
-2002-02-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Remove advertising clause from
-	Berkeley and Red Hat licenses.
-
-2002-02-01  Mo DeJong  <supermo@bayarea.net>
-
-	* Makefile.in: Add all-tix to deps for all-snavigator
-	so that tix is built when building snavigator.
-
-2002-02-01  Ben Elliston  <bje@redhat.com>
-
-	* config.guess: Import from master sources, rev 1.229.
-	* config.sub: Import from master sources, rev 1.240.
-
-2002-01-27  Daniel Jacobowitz  <drow@mvista.com>
-
-	From Steve Ellcey <sje@cup.hp.com>:
-	* libtool.m4 (HPUX_IA64_MODE): Set to 32 or 64 based on ABI.
-	(lt_cv_deplibs_check_method, lt_cv_file_magic_cmd,
-	lt_cv_file_magic_test_file): Set to appropriate values for HP-UX
-	IA64.
-	* ltcf-c.sh (archive_cmds, hardcode_*): Ditto.
-	* ltconfig (shlibpath_*, dynamic_linker, library_names_spec,
-	soname_spec, sys_lib_search_path_spec): Ditto.
-
-2002-01-26  Jason Thorpe  <thorpej@wasabisystems.com>
-
-	* configure.in (*-*-netbsd*): New.  Skip target-newlib,
-	target-libiberty, and target-libgloss.  Skip Java-related
-	libraries if not supported for NetBSD on target CPU.
-
-2002-01-23  Nick Clifton  <nickc@cambridge.redhat.com>
-
-	* configure.in: Import StrongARM and XScale target_configdirs from
-	FSF GCC version.
-
-2002-01-16  H.J. Lu  (hjl@gnu.org)
-
-	* config.guess: Import from master sources, rev 1.225.
-	* config.sub: Import from master sources, rev 1.238.
-
-	* MAINTAINERS: Updated notes on config.guess and config.sub.
-
-2002-01-11  Steve Ellcey  <sje@cup.hp.com>
-
-	* configure.in (ia64*-*-hpux*): New target for IA64 HP-UX,
-	ld and gdb are not supported.
-
-2002-01-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* Change reference to Cygnus Solutions to be Red Hat.
-
-2002-01-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* COPYING.NEWLIB: Update generic copyright date.
-
-2002-01-07  Mark Salter  <msalter@redhat.com>
-
-	* configure.in: Remove target-bsp and target-cygmon from arm builds.
-	  Allow target-libgloss to be built for arm, strongarm, and xscale.
-
-2002-01-03  Ben Elliston  <bje@redhat.com>
-
-	* MAINTAINERS: Update URL for config.* scripts.
-
-2001-12-18  Alan Modra  <amodra@bigpond.net.au>
-
-	* config.sub: Import latest version.
-	* config.guess: Likewise.
-
 2001-12-13  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* configure.in (FLAGS_FOR_TARGET): Remove -nostdinc and -isystem
@@ -3848,10 +6,10 @@ Wed Sep 13 11:11:29 2000  Jeffrey A Law  (law@cygnus.com)
 2001-12-05  Laurent Guerby  <guerby@acm.org>
 
 	* MAINTAINERS: gcc adopts symlink-tree, refer more to
-	libiberty.
+        libiberty.
 
 	Import this patch from gcc:
-
+	
 	2000-12-09  Laurynas Biveinis  <lauras@softhome.net>
 
 	    * symlink-tree: handle DOS-style absolute paths.
@@ -3914,7 +72,7 @@ Wed Sep 13 11:11:29 2000  Jeffrey A Law  (law@cygnus.com)
 
 2001-11-12  Hans-Peter Nilsson  <hp@bitrange.com>
 
-	* COPYING.NEWLIB: Add BSD-style license/copyright blurb for my work.
+        * COPYING.NEWLIB: Add BSD-style license/copyright blurb for my work.
 
 2001-11-08  Phil Edwards  <pedwards@disaster.jaj.com>
 
@@ -4001,7 +159,7 @@ Wed Sep 13 11:11:29 2000  Jeffrey A Law  (law@cygnus.com)
 Fri Jun  8 11:14:02 2001  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* Makefile.in (VER): When present, extract the version number from
-	the file version.in.
+ 	the file version.in.
 
 2001-06-08  Alexandre Oliva  <aoliva@redhat.com>, Jeff Sturm  <jsturm@one-point.com>
 
@@ -4202,7 +360,7 @@ Fri Jun  8 11:14:02 2001  Andrew Cagney  <cagney@b1.cygnus.com>
 
 2001-01-07  Andreas Jaeger  <aj@suse.de>
 
-	* config.sub, config.guess: Update from subversions.
+        * config.sub, config.guess: Update from subversions.
 
 2000-12-12  Alexandre Oliva  <aoliva@redhat.com>
 
@@ -4246,8 +404,8 @@ Fri Jun  8 11:14:02 2001  Andrew Cagney  <cagney@b1.cygnus.com>
 
 2000-10-30  Stephane Carrez  <stcarrez@worldnet.fr>
 
-	* configure.in (noconfigdirs): Don't compile some
-	of the libraries for 68HC11 & 68hc12 targets.
+        * configure.in (noconfigdirs): Don't compile some
+        of the libraries for 68HC11 & 68hc12 targets.
 
 2000-09-30  Alexandre Oliva  <aoliva@redhat.com>
 
@@ -4410,7 +568,7 @@ Fri Jun  8 11:14:02 2001  Andrew Cagney  <cagney@b1.cygnus.com>
 
 2000-07-01  Koundinya K  <kk@ddeorg.soft.net>
 
-	* ltconfig: Add support for mips-dde-sysv4.2MP
+        * ltconfig: Add support for mips-dde-sysv4.2MP
 
 2000-06-28  Corinna Vinschen  <vinschen@cygnus.com>
 
@@ -4438,12 +596,12 @@ Fri Jun  8 11:14:02 2001  Andrew Cagney  <cagney@b1.cygnus.com>
 
 20000-05-21  H.J. Lu  (hjl@gnu.org)
 
-	* Makefile.in (CC_FOR_TARGET): Make sure as/ld in the gcc
-	directory are used if they exist. Make sure
-	$(build_tooldir)/include is searched for header files,
-	$(build_tooldir)/lib/ for library files.
+        * Makefile.in (CC_FOR_TARGET): Make sure as/ld in the gcc
+        directory are used if they exist. Make sure
+        $(build_tooldir)/include is searched for header files,
+        $(build_tooldir)/lib/ for library files.
 	(GCC_FOR_TARGET): Likewise.
-	(CXX_FOR_TARGET): Likewise.
+        (CXX_FOR_TARGET): Likewise.
 
 2000-05-18  Jeffrey A Law  (law@cygnus.com)
 
@@ -4491,7 +649,7 @@ Fri Jun  8 11:14:02 2001  Andrew Cagney  <cagney@b1.cygnus.com>
 2000-05-08  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* djunpack.bat: Change the Sed script to replace @V@ in fnchange.lst
-	with the version name.
+        with the version name.
 
 2000-05-01  Benjamin Kosnik  <bkoz@cygnus.com>
 
@@ -4510,8 +668,8 @@ Fri Jun  8 11:14:02 2001  Andrew Cagney  <cagney@b1.cygnus.com>
 
 2000-04-16  Dave Pitts  <dpitts@cozx.com>
 
-	* config.sub (case $basic_machine): Change default for "ibm-*"
-	to "openedition".
+        * config.sub (case $basic_machine): Change default for "ibm-*"
+        to "openedition".
 
 2000-04-12  Andrew Cagney  <cagney@b1.cygnus.com>
 
@@ -4532,13 +690,13 @@ Fri Jun  8 11:14:02 2001  Andrew Cagney  <cagney@b1.cygnus.com>
 	* configure (warn_cflags): Delete.
 
 2000-04-05  Benjamin Kosnik  <bkoz@cygnus.com>
-	    Martin v. Loewis  <martin@loewis.home.cs.tu-berlin.de>
+            Martin v. Loewis  <martin@loewis.home.cs.tu-berlin.de>
 
-	* configure.in (enable_libstdcxx_v3): Add.
-	(target_libs): Add bits here to switch between libstdc++-v2 and
-	libstdc++-v3.
-	* config.if: And this file too.
-	* Makefile.in: Add libstdc++-v3 targets.
+        * configure.in (enable_libstdcxx_v3): Add.
+        (target_libs): Add bits here to switch between libstdc++-v2 and
+        libstdc++-v3.
+        * config.if: And this file too.
+        * Makefile.in: Add libstdc++-v3 targets.
 
 2000-04-05  Michael Meissner  <meissner@redhat.com>
 
@@ -4719,15 +877,15 @@ Tue Jun 22 23:45:18 1999  Tom Tromey  <tromey@cygnus.com>
 	(configure-target-boehm-gc): New target.
 	(configure-target-qthreads): New target.
 
-	* configure.in (target_libs): Added target-qthreads.
-	* Makefile.in (ALL_TARGET_MODULES): Added qthreads.
-	(CONFIGURE_TARGET_MODULES): Likewise.
-	(CHECK_TARGET_MODULES): Likewise.
-	(INSTALL_TARGET_MODULES): Likewise.
-	(CLEAN_TARGET_MODULES): Likewise.
-	(all-target-qthreads): New target.
-	(configure-target-libjava): Depend on configure-target-qthreads.
-	(all-target-libjava): Depend on all-target-qthreads.
+        * configure.in (target_libs): Added target-qthreads.
+        * Makefile.in (ALL_TARGET_MODULES): Added qthreads.
+        (CONFIGURE_TARGET_MODULES): Likewise.
+        (CHECK_TARGET_MODULES): Likewise.
+        (INSTALL_TARGET_MODULES): Likewise.
+        (CLEAN_TARGET_MODULES): Likewise.
+        (all-target-qthreads): New target.
+        (configure-target-libjava): Depend on configure-target-qthreads.
+        (all-target-libjava): Depend on all-target-qthreads.
 
 	* Makefile.in (ALL_TARGET_MODULES): Added libjava, boehm-gc.
 	(CONFIGURE_TARGET_MODULES): Likewise.
@@ -4815,7 +973,7 @@ Thu Jul  8 12:32:23 1999  John David Anglin <dave@hiauly1.hia.nrc.ca>
 	Bad merge removed these two changes.
 
 Tue Apr 13 22:50:54 1999  Donn Terry (donn@interix.com)
-			  Martin Heller (Ing.-Buero_Heller@t-online.de)
+                          Martin Heller (Ing.-Buero_Heller@t-online.de)
 
 	* config.guess (interix Alpha): Add.
 
@@ -4872,10 +1030,12 @@ Fri Apr  2 15:11:32 1999  H.J. Lu  (hjl@gnu.org)
 
 1999-03-21  Ben Elliston  <bje@cygnus.com>
 
-	* config.guess: Correct typo for detecting ELF on FreeBSD.
+        * config.guess: Correct typo for detecting ELF on FreeBSD.
 
 Thu Mar 18 00:17:50 1999  Mark Elbrecht <snowball3@usa.net>
 
+	* config/mh-go32: Delete.
+	* config/mh-djgpp: New. Renamed from mh-go32.
 	* configure.in (pc-msdosdjgpp): Set host_makefile_frag to
 	config/mh-djgpp.
 
@@ -4926,6 +1086,7 @@ Wed Mar 10 17:39:09 1999  Drew Moseley  <dmoseley@cygnus.com>
 1999-02-24  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* configure.in (*-*-windows*): Remove, no longer used.
+	* config/mh-windows: Ditto.
 
 1999-02-19  Ben Elliston <bje@cygnus.com>
 
@@ -4979,8 +1140,8 @@ Wed Mar 10 17:39:09 1999  Drew Moseley  <dmoseley@cygnus.com>
 
 1999-02-02  Catherine Moore  <clm@cygnus.com>
 
-	* config.sub (oabi):  Recognize.
-	* configure.in (arm-*-oabi):  Handle.
+        * config.sub (oabi):  Recognize.
+        * configure.in (arm-*-oabi):  Handle.
 
 1999-01-30  Robert Lipe  (robertlipe@usa.net)
 
@@ -4991,6 +1152,7 @@ Wed Mar 10 17:39:09 1999  Drew Moseley  <dmoseley@cygnus.com>
 	* config.guess: Add support for i386-pc-interix.
 	* config.sub: Likewise.
 	* configure.in: Likewise.
+	* config/mh-interix: New file.
 
 1999-01-18  Christopher Faylor <cgf@cygnus.com>
 
@@ -5003,6 +1165,7 @@ Wed Mar 10 17:39:09 1999  Drew Moseley  <dmoseley@cygnus.com>
 
 	* configure.in: makefile stub for cygwin target is probably
 	unnecessary.  Remove it for now.
+	* config/mt-cygwin: Remove.
 
 1998-12-30  Christopher Faylor <cgf@cygnus.com>
 
@@ -5010,6 +1173,7 @@ Wed Mar 10 17:39:09 1999  Drew Moseley  <dmoseley@cygnus.com>
 	target as well as the host.
 	* config.guess: Allow mixed case in cygwin uname output.
 	* Makefile.in: Add libtermcap target.
+	* config/mt-cygwin: New file.  libtermcap target info.
 
 1998-12-23  Jeffrey A Law  (law@cygnus.com)
 
@@ -5065,8 +1229,8 @@ Wed Nov 18 20:13:29 1998  Christopher Faylor <cgf@cygnus.com>
 
 1998-11-17  Geoffrey Noer  <noer@cygnus.com>
 
-	* Makefile.in: modify CC_FOR_TARGET and CXX_FOR_TARGET so that
-	they include winsup/include when it's a cygwin target.
+        * Makefile.in: modify CC_FOR_TARGET and CXX_FOR_TARGET so that
+        they include winsup/include when it's a cygwin target.
 
 1998-11-12  Tom Tromey  <tromey@cygnus.com>
 
@@ -5092,7 +1256,7 @@ Wed Nov 18 20:13:29 1998  Christopher Faylor <cgf@cygnus.com>
 
 1998-11-02  Geoffrey Noer  <noer@cygnus.com>
 
-	* configure.in: drop "32" from config/mh-cygwin32.  Check
+        * configure.in: drop "32" from config/mh-cygwin32.  Check
 	cygwin* instead of cygwin32*.
 	* config.sub: Check cygwin* instead of cygwin32*.
 
@@ -5689,7 +1853,7 @@ Fri Mar  6 00:14:55 1998  Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
 
 Mon Feb 23 15:09:18 1998  Bruno Haible <bruno@linuix.mathematik.uni-karlsruhe.de
 
-	* config.sub (sco5): Fix typo.
+        * config.sub (sco5): Fix typo.
 
 Mon Feb 23 14:46:06 1998  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -5740,6 +1904,11 @@ Fri Feb  6 01:33:52 1998  Manfred Hollstein  <manfred@s-direktnet.de>
 	* configure: Emit a definition for the new macro enable_shared
 	into each Makefile.
 
+	* config/mh-sparcpic (PICFLAG): Define to properly according
+	to current multilib configuration.
+	* config/mt-sparcpic (PICFLAG_FOR_TARGET): Define to properly
+	according to current multilib configuration.
+
 Thu Feb  5 17:01:12 1998  Jason Molenda  (crash@bugshack.cygnus.com)
 
 	* configure.in (host_tools, native_only): Add libtool.
@@ -5857,6 +2026,7 @@ Sun Jan  4 01:06:55 1998  Mumit Khan  <khan@xraylith.wisc.edu>
 
 	* config.sub: Add mingw32 support.
 	* configure.in: Likewise.
+	* config/mh-mingw32: New file.
 
 Sat Jan  3 12:11:05 1998 Franz Sirl <franz.sirl-kernel@lauterbach.com>
 
@@ -5995,10 +2165,10 @@ Sat Nov  8 14:42:59 1997  Michael Meissner  <meissner@cygnus.com>
 
 Fri Nov  7 10:34:09 1997  Rob Savoye  <rob@darkstar.cygnus.com>
 
-	* include/libiberty.h: Add extern "C" { so it can be used with C++
-	progrms.
-	* include/remote-sim.h:  Add extern "C" { so it can be used with C++
-	programs.
+        * include/libiberty.h: Add extern "C" { so it can be used with C++
+        progrms.
+        * include/remote-sim.h:  Add extern "C" { so it can be used with C++
+        programs.
 
 Thu Oct 30 11:09:29 1997  Michael Meissner  <meissner@cygnus.com>
 
@@ -6074,6 +2244,8 @@ Thu Sep 18 15:37:42 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
 1997-09-15 02:37  Ulrich Drepper  <drepper@cygnus.com>
 
+	* config/mt-linux: Define CXXFLAGS to make sure -fvtable-thunks is
+	used.
 	* configure.in: Name Linux target fragment.
 
 	* configure: Rewrite so that project Makefile fragment is inserted
@@ -6083,6 +2255,10 @@ Tue Sep 16 09:55:07 1997  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* Makefile.in (install-itcl): Install tcl first.
 
+Sun Sep 14 20:53:42 1997  Geoffrey Noer  <noer@cygnus.com>
+
+	* config/mh-cygwin32: ok to build split texinfo files
+
 Fri Sep 12 16:19:20 1997  Geoffrey Noer  <noer@cygnus.com>
 
 	* configure.in: remove bison from noconfigdirs for Cygwin32 host
@@ -6116,7 +2292,7 @@ Sun Sep  7 15:55:28 1997  Gavin Koch  <gavin@cygnus.com>
 
 Fri Sep  5 16:11:28 1997  Joel Sherrill  (joel@OARcorp.com)
 
-	* configure.in (*-*-rtems*): Do not build libgloss for rtems.
+        * configure.in (*-*-rtems*): Do not build libgloss for rtems.
 
 Fri Sep  5 12:27:17 1997  Jeffrey A Law  (law@cygnus.com)
 
@@ -6184,7 +2360,7 @@ Thu Aug 14 14:42:17 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* configure: When handling a Canadian Cross, handle YACC as well as
 	BISON.  Just set BISON to bison.  When setting YACC, prefer bison.
-	* Makefile.in (all-bison): Depend upon all-texinfo.
+        * Makefile.in (all-bison): Depend upon all-texinfo.
 
 Tue Aug 12 20:09:48 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
@@ -6517,7 +2693,7 @@ Tue Apr  1 16:28:50 1997  Klaus Kaempf  <kkaempf@progis.de>
 
 Mon Mar 31 16:26:55 1997  Joel Sherrill  <joel@oarcorp.com>
 
-	* configure.in (hppa1.1-*-rtems*): New target, like hppa-*-*elf*.
+        * configure.in (hppa1.1-*-rtems*): New target, like hppa-*-*elf*.
 
 Sun Mar 30 12:38:27 1997  Fred Fish  <fnf@cygnus.com>
 
@@ -6815,6 +2991,7 @@ Tue Oct 29 16:41:31 1996  Doug Evans  <dje@canuck.cygnus.com>
 Mon Oct 28 17:32:46 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* configure.in:  Exclude mmalloc from i386-windows.
+	* config/mh-windows:  Add rules for building MSVC makefiles.
 
 Thu Oct 24 09:22:46 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
@@ -6830,6 +3007,8 @@ Thu Oct 24 09:02:07 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
 	* Makefile.in (FLAGS_TO_PASS):  Add $(HOST_FLAGS) to allow the
 	host to add it's own flags.
+	* config/mh-windows (HOST_FLAGS):  Set srcroot, which is needed
+	for MSVC build procedure.
 
 Tue Oct 22 15:20:26 1996  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -6866,11 +3045,11 @@ Wed Oct  9 17:24:59 1996  Per Bothner  <bothner@deneb.cygnus.com>
 	* config.guess:  Merge from FSF.
 
 	1996-09-12  Richard Stallman  <rms@ethanol.gnu.ai.mit.edu>
-	* config.guess: Use pc instead of unknown, for pc clone systems.
-	Change linux to linux-gnu.
+        * config.guess: Use pc instead of unknown, for pc clone systems.
+        Change linux to linux-gnu.
 
 	Mon Jul 15 23:51:11 1996  Karl Heuer  <kwzh@gnu.ai.mit.edu>
-	* config.guess: Avoid non-portable tr syntax.
+        * config.guess: Avoid non-portable tr syntax.
 
 Wed Oct  9 06:06:46 1996  Jeffrey A Law  (law@cygnus.com)
 
@@ -6880,7 +3059,7 @@ Wed Oct  9 06:06:46 1996  Jeffrey A Law  (law@cygnus.com)
 
 Tue Oct  8 08:32:48 1996  Stu Grossman  (grossman@critters.cygnus.com)
 
-	* configure.in:  Add support for windows host
+	* configure.in config/mh-windows:  Add support for windows host
 	(that is a build done under the Microsoft build environment).
 
 Tue Oct  8 10:39:08 1996  Ian Lance Taylor  <ian@cygnus.com>
@@ -6953,10 +3132,26 @@ Mon Sep 16 17:00:52 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* configure.in: Use a single line for host_tools and native_only.
 
+Tue Sep 16 09:55:07 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* Makefile.in (install-itcl): Install tcl first.
+
+Sun Sep 14 20:53:42 1997  Geoffrey Noer  <noer@cygnus.com>
+
+	* config/mh-cygwin32: ok to build split texinfo files
+
+Fri Sep 12 16:19:20 1997  Geoffrey Noer  <noer@cygnus.com>
+
+	* configure.in: remove bison from noconfigdirs for Cygwin32 host
+
 Mon Sep  9 12:21:30 1996  Doug Evans  <dje@canuck.cygnus.com>
 
 	* config.sub, configure.in: Add entries for m32r.
 
+Mon Sep  8 20:46:20 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* config.guess: Merge with FSF.
+
 Thu Sep  5 13:52:47 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 	* Makefile.in (inet-install): Don't run install-gzip.
@@ -7014,6 +3209,11 @@ Mon Aug 12 13:15:13 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 	* Makefile.in (CONFIGURE_TARGET_MODULES): If target compiler does
 	not support --print-multi-lib, don't abort.
 
+Sun Aug 11 20:51:50 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* config/mh-cygwin32 (CFLAGS):  Define _WIN32 to be compatible
+	with normal Windows compilation environment.
+
 Thu Aug  8 12:18:59 1996  Klaus Kaempf  <kkaempf@progis.de>
 
 	* make-all.com: Run config-a-gas.
@@ -7123,9 +3323,9 @@ Mon Jun 24 15:01:12 1996  Joel Sherrill  <joel@merlin.gcs.redstone.army.mil>
 
 Sun Jun 23 22:41:54 1996  Geoffrey Noer  <noer@cygnus.com>
 
-	* configure.in: enable dosrel for cygwin32-hosted builds,
-		remove diff from the list of things not buildable
-		via Canadian Cross
+        * configure.in: enable dosrel for cygwin32-hosted builds,
+                remove diff from the list of things not buildable
+                via Canadian Cross
 
 Sat Jun 22 11:39:01 1996  Jason Merrill  <jason@yorick.cygnus.com>
 
@@ -7327,8 +3527,8 @@ Thu Mar 28 14:11:11 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 Tue Mar 26 21:18:50 1996  Andrew Cagney  <cagney@kremvax.highland.com.au>
 
-	* configure (--enable-*): Handle quoted option lists such as
-	--enable-sim-cflags='-g0 -O' better.
+        * configure (--enable-*): Handle quoted option lists such as
+        --enable-sim-cflags='-g0 -O' better.
 
 Thu Mar 21 11:53:08 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
@@ -7654,6 +3854,12 @@ Mon Dec  4 12:38:15 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* configure: Ignore new autoconf configure options.
 
+Thu Nov 30 14:45:25 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* config/mt-v810 (CC_FOR_TARGET): Add -ansi flag.  NEC compiler
+	defaults to K&R mode, but doesn't have varargs.h, so we have to
+	compile in ANSI mode.
+
 Thu Nov 30 16:57:33 1995  Per Bothner  <bothner@wombat.gnu.ai.mit.edu>
 
 	* config.guess:  Recognize Pentium under SCO.
@@ -7662,6 +3868,8 @@ Thu Nov 30 16:57:33 1995  Per Bothner  <bothner@wombat.gnu.ai.mit.edu>
 Wed Nov 29 13:49:08 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 
 	* configure.in (noconfigdirs): Disable target-libio on v810-*-*.
+	* config/mt-v810 (CC_FOR_TARGET, AS_FOR_TARGET, AR_FOR_TARGET,
+	RANLIB_FOR_TARGET): Set as appropriate for NEC v810 toolchain.
 
 Wed Nov 29 12:12:01 1995  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -7730,6 +3938,10 @@ Wed Nov 15 11:45:23 1995  Ian Lance Taylor  <ian@cygnus.com>
 	* configure: Handle LD and LD_FOR_TARGET when configuring a
 	Canadian Cross.
 
+Tue Nov 14 15:03:12 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
+
+	* config/mh-i386win32: add LD_FOR_TARGET.
+
 Tue Nov 14 14:56:11 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
 	* configure.in (target_libs): add target-winsup.
@@ -8068,6 +4280,10 @@ Mon Sep 18 23:08:26 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 	* configure.in (noconfigdirs): Disable bfd, binutils, gas, gcc,
 	gdb, ld and opcodes on v810-*-*.
 
+Sat Sep 16 18:31:08 PDT 1995  Angela Marie Thomas <angela@cygnus.com>
+
+	* config/mh-ncrsvr43: Removed AR_FLAGS
+
 Tue Sep 12 18:03:31 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* Makefile.in (DO_X): Change do-realclean to do-maintainer-clean.
@@ -8247,6 +4463,8 @@ Mon Jun  5 18:26:36 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
 	(FLAGS_TO_PASS): Pass them.
 	(EXTRA_TARGET_FLAGS): Ditto.
 
+	* config/m?-*pic: Define PICFLAG* instead of LIB*FLAGS*.
+
 Wed May 31 22:27:42 1995  Jim Wilson  <wilson@chestnut.cygnus.com>
 
 	* Makefile.in (all-libg++): Depend on all-libstdc++.
@@ -8311,7 +4529,7 @@ Fri Apr 14 15:21:17 1995  Doug Evans  <dje@chestnut.cygnus.com>
 Wed Apr 12 16:06:01 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
 
 	* test-build.mk: Enable building of shared libraries on IRIX 5 and
-	OSF/1.  Fix compiler flags.
+        OSF/1.  Fix compiler flags.
 	* build-all.mk: Support Linux and OSF/1 3.0.  Fix compiler flags.
 
 Tue Apr 11 18:55:40 1995  Doug Evans  <dje@canuck.cygnus.com>
@@ -8410,12 +4628,17 @@ Thu Mar 30 13:51:43 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 Tue Mar 28 14:47:34 1995  Jason Molenda (crash@phydeaux.cygnus.com)
 
-	Revert this change:
+	build-all.mk,config/mh-solaris:  revert these two changes:
 
 	Tue Mar 30 10:03:09 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 		* build-all.mk: Use CC=cc -Xs on Solaris.
 
+	Mon Mar 29 19:59:26 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+		* config/mh-solaris: SunPRO C needs -Xs to be able to get a
+		working xmakefile for Emacs.
+
 Tue Mar 21 10:43:32 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* glob/*: Removed.  Schauer's 24 Feb 1994 readline change made us
@@ -8554,7 +4777,7 @@ Sat Nov  5 18:43:30 1994  Jason Merrill  (jason@phydeaux.cygnus.com)
 	(BASE_FLAGS_TO_PASS): Pass them.
 	(EXTRA_TARGET_FLAGS): Ditto.
 
-	* configure.in: Support --enable-shared.
+	* configure.in, config/m[th]-*pic: Support --enable-shared.
 
 Sat Nov  5 15:44:00 1994  Per Bothner  <bothner@kalessin.cygnus.com>
 
@@ -8740,21 +4963,21 @@ Fri Aug 26 13:05:27 1994  Per Bothner  (bothner@kalessin.cygnus.com)
 	Thu Aug 25 20:28:51 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
 	* config.guess (Pyramid*:OSx*:*:*): New case.
-	(PATH): Add /.attbin at end for finding uname.
-	(dummy.c): Handle i860-alliant-bsd.  Follow whitespace conventions.
+        (PATH): Add /.attbin at end for finding uname.
+        (dummy.c): Handle i860-alliant-bsd.  Follow whitespace conventions.
 
 	Wed Aug 17 18:21:02 1994  Tor Egge  (tegge@pvv.unit.no)
 
-	* config.guess (M88*:DolphinOS:*:*): New case.
+        * config.guess (M88*:DolphinOS:*:*): New case.
 
 	Thu Aug 11 17:00:13 1994  Stan Cox  (coxs@dg-rtp.dg.com)
 
-	* config.guess (AViiON:dgux:*:*): Use TARGET_BINARY_INTERFACE
-	to select whether to use ELF or COFF.
+        * config.guess (AViiON:dgux:*:*): Use TARGET_BINARY_INTERFACE
+        to select whether to use ELF or COFF.
 
 	Sun Jul 24 16:20:53 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
-	* config.guess: Recognize i860-stardent-sysv and i860-unknown-sysv.
+        * config.guess: Recognize i860-stardent-sysv and i860-unknown-sysv.
 
 	Sun May  1 10:23:10 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
 
@@ -9012,6 +5235,7 @@ Fri May  6 14:19:25 1994  Steve Chamberlain  (sac@cygnus.com)
 	(HOST_CC, HOST_PREFIX, HOST_PREFIX_1): Undefine, they should
 	be set by incoming names or templates.
 	(INSTALL_LAST): New rule.
+	* config/mh-go32: New fragment.
 
 Thu May  5 17:35:05 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
@@ -9019,6 +5243,8 @@ Thu May  5 17:35:05 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 Thu May  5 20:06:45 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
 
+	* config/mh-lynxrs6k: Renamed from mh-lynxosrs6k, to make it
+	unique in 8.3 naming schemes.
 	* configure.in (appdirs): New variable.  Currently empty, but will
 	be used in gas distribution.  If nonempty, lists a set of
 	directories at least one of which must get configured, or top
@@ -9090,7 +5316,7 @@ Thu Apr 14 23:33:17 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 Wed Apr 13 15:14:52 1994  Bill Cox  (bill@cygnus.com)
 
 	* configure: Make file links cleanly even if Lynx fails on
-	  an NFS symlink (at least fail cleanly).
+          an NFS symlink (at least fail cleanly).
 
 Mon Apr 11 10:58:56 1994  Jim Wilson  (wilson@sphagnum.cygnus.com)
 
@@ -9243,13 +5469,17 @@ Sat Feb  5 01:00:33 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 Wed Feb  2 13:57:57 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
-	* Makefile.in:  Avoid bug in losing hpux sed.
+        * Makefile.in:  Avoid bug in losing hpux sed.
 
 Wed Feb  2 14:53:05 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* Makefile.in, test-build.mk: Remove MUNCH_NM; it was only needed
 	for GDB and GDB has been fixed to not need it.
 
+Mon Jan 31 18:40:55 1994  Stu Grossman  (grossman at cygnus.com)
+
+	* config/mh-lynxosrs6k:  Account for lack of ranlib!
+
 Sun Jan 30 17:58:06 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
 
 	* config.guess: Recognize vax hosts.
@@ -9335,6 +5565,7 @@ Thu Dec  2 14:35:54 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 	libg++ or libio for any Alpha target.
 
 	* configure.in (mips*-sgi-irix5*): New target; use mh-irix5.
+	* config/mh-irix5. New file for Irix 5.
 
 Wed Dec  1 17:00:33 1993  Jason Merrill  (jason@deneb.cygnus.com)
 
@@ -9503,6 +5734,10 @@ Fri Oct  8 14:15:39 1993  Ken Raeburn  (raeburn@cygnus.com)
 	* config.sub: Accept linux*coff and linux*elf as operating
 	systems.
 
+Tue Oct  7 14:24:41 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltmain.sh: Handle symlinks in generated script.
+
 Thu Oct  7 12:57:19 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* config.sub: Recognize mips64, and mips3 as an alias for it.
@@ -9527,11 +5762,27 @@ Mon Oct  4 16:15:09 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
 	--with options (but still pass them down on the command line,
 	if they were explicitly specified).
 
+Wed Oct  1 13:11:27 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Handle autoconf style directory options: --bindir,
+	--datadir, --includedir, --infodir, --libdir, --libexecdir,
+	--mandir, --oldincludedir, --sbindir, --sharedstatedir,
+	--sysconfdir.
+	* Makefile.in (sbindir, libexecdir, sysconfdir): New variables.
+	(sharedstatedir, localstatedir, oldincludedir): New variables.
+	(BASE_FLAGS_TO_PASS): Pass down bindir, datadir, includedir,
+	infodir, libdir, libexecdir, localstatedir, mandir, oldincludedir,
+	sbindir, sharedstatedir, and sysconfdir.
+
 Fri Sep 24 19:11:13 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
 
 	* configure: substitute SHELL value in Makefile.in with
 	${CONFIG_SHELL}
 
+Wed Sep 24 15:18:32 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* ltmain.sh: Tweak shell pattern to avoid bug in NetBSD /bin/sh.
+
 Thu Sep 23 18:05:13 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* configure.in: Build gas, ld, and binutils for *-*-sysv4* and
@@ -10025,6 +6276,8 @@ Sat Apr 17 17:19:50 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* configure.in: rename m88k-motorola-m88kbcs to m88k-motorola-sysv
 
+	* config/mh-delta88: remove extraneous GCC references
+
 Tue Apr 13 16:52:16 1993  Brendan Kehoe  (brendan@lisa.cygnus.com)
 
 	* Makefile.in (PRMS): Set back to all-prms.
@@ -10100,7 +6353,8 @@ Wed Mar 31 21:20:58 1993  K. Richard Pixley  (rich@rtl.cygnus.com)
 
 Wed Mar 31 12:31:56 1993  Ian Lance Taylor  (ian@cygnus.com)
 
-	* build-all.mk: Bump -XNh value to 1500 to match gcc requirements.
+	* build-all.mk, config/mh-irix4: Bump -XNh value to 1500 to match
+	gcc requirements.
 
 	* Makefile.in: Complete overhaul to merge many almost identical
 	targets.
@@ -10118,6 +6372,13 @@ Tue Mar 30 10:03:09 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 	* build-all.mk: Use CC=cc -Xs on Solaris.
 
+Mon Mar 29 19:59:26 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config/mh-sun3: cc needs -J to compile cp-parse.c correctly
+
+	* config/mh-solaris: SunPRO C needs -Xs to be able to get a
+	working xmakefile for Emacs.
+
 Thu Mar 25 15:14:30 1993  Fred Fish  (fnf@cygnus.com)
 
 	* Makefile.in:  Incorporate changes suggested by wilson@cygnus.com
@@ -10211,6 +6472,7 @@ Tue Mar  2 21:15:58 1993  Fred Fish  (fnf@cygnus.com)
 	(Ultrix 2.2 support from Michael Rendell <michael@mercury.cs.mun.ca>)
 	* configure.in (vax-*-ultrix2*):  Add Ultrix 2.2 triplet.
 	* config.guess:  Change 'VAX*:ULTRIX:*:*' to 'VAX*:ULTRIX*:*:*'.
+	* config/mh-vaxult2:  New file.
 
 Tue Mar  2 18:11:03 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
@@ -10380,6 +6642,8 @@ Sat Jan 23 20:32:01 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* Makefile.in: define and pass down X11_LIB
 
+	* config/mh-sco: define X11_LIB to the mess that SCO ODT requires
+
 Sat Jan 23 13:49:40 1993  Per Bothner  (bothner@cygnus.com)
 
 	* guess-systype: Renamed to ...
@@ -10442,6 +6706,8 @@ Sun Jan  3 15:15:09 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
 
 Tue Dec 29 15:06:00 1992  Ian Lance Taylor  (ian@cygnus.com)
 
+	* config/mh-sco: Don't override BISON definition.
+
 	* build-all.mk: If canonhost is i386-unknown-sco3.2v4, change it
 	to i386-sco3.2v4.  Set TARGETS and CFLAGS for i386-sco3.2v4.
 	(all-cygnus, native, build-cygnus): Make
@@ -10506,6 +6772,10 @@ Fri Dec 11 20:18:02 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* Makefile.in: m4 depends on libiberty
 
+Mon Dec  7 06:43:27 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config/mh-sco: don't default $(CC) to gcc
+
 Thu Dec  3 21:52:11 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* configure.in: add m4, textutils, fileutils, sed, shellutils,
@@ -10518,6 +6788,14 @@ Mon Nov 30 14:54:34 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* configure.in: use mh-sun for all *-sun-* hosts
 
+	* config/mh-solaris: rework standard X location to use
+	$OPENWINHOME, if defined.
+
+	* config/mh-sun: handle X11 include locations
+
+	* config/mh-decstation: define NeedFunctionPrototypes to 0, to
+	work around dain-bramaged DECwindows include files
+
 Fri Nov 27 18:35:54 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* Makefile.in: define flags for X11 include files and library file
@@ -10525,6 +6803,9 @@ Fri Nov 27 18:35:54 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* build-all.mk: added a 'native' target, to 3stage the native toolchain
 
+	* config/{mh-hpux,mh-solaris}: define the "standard" locations for
+	the vendor supplied X11 headers and libraries
+
 Sun Nov 22 18:59:13 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* configure.in: start building libg++ for HP-UX targets
@@ -10623,8 +6904,8 @@ Thu Oct 29 00:12:41 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 	ranlib.
 
 	* configure: also define $(host_canonical) and
-	$(target_canonical), which are the full, canonical names for the
-	given host and target
+        $(target_canonical), which are the full, canonical names for the
+        given host and target
 
 Sun Nov  1 16:38:17 1992  Per Bothner  (bothner@cygnus.com)
 
@@ -10772,7 +7053,7 @@ Mon Aug 24 14:05:14 1992  Ian Lance Taylor  (ian@cygnus.com)
 
 Tue Aug 11 23:13:17 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
-	* COPYING: new file, GPL v2
+        * COPYING: new file, GPL v2
 
 Tue Aug  4 01:12:43 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
@@ -10781,6 +7062,11 @@ Tue Aug  4 01:12:43 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* configure.texi, standards.texi: fix INFO-DIR-ENTRY
 
+Mon Aug  3 15:41:28 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* config/mh-solaris: removed the -xs from CFLAGS (let the people
+	with Sun's C compiler deal with it themselved)
+
 Mon Aug  3 00:34:17 1992  Fred Fish  (fnf@cygnus.com)
 
 	* config.sub (ncr3000):  Change i386 to i486.
@@ -10825,6 +7111,11 @@ Thu Jul 16 16:05:28 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
 
 	* .cvsignore: ignore some stuff that comes from test-build.mk.
 
+Wed Jul  8 00:01:30 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* config/mh-solaris:  Use -xs when compiling so that Sun-C puts
+	a symbol-table into the executable.
+
 Tue Jul  7 00:24:52 1992  Fred Fish  (fnf@cygnus.com)
 
 	* config.sub:  Add es1800 (m68k-ericsson-es1800).
@@ -10848,6 +7139,11 @@ Fri Jun 19 15:19:40 1992  Stu Grossman  (grossman at cygnus.com)
 
 	* config.sub:  HPPA merge.
 
+Mon Jun 15 12:31:52 1992  Fred Fish  (fnf@cygnus.com)
+
+	* config/mh-ncr3000 (INSTALL):  Don't use /usr/ucb/install,
+	it is broken on ncr 3000's.
+
 Sun Jun 14 10:29:19 1992  John Gilmore  (gnu at cygnus.com)
 
 	* Makefile.in:  Replace all-bison with all-byacc in all
@@ -10857,6 +7153,10 @@ Fri Jun 12 22:21:57 1992  John Gilmore  (gnu at cygnus.com)
 
 	* config.sub:  Add sun4sol2 => sparc-sun-solaris2.
 
+Tue Jun  9 17:18:11 1992  Fred Fish  (fnf at cygnus.com)
+
+	* config/{mh-ncr3000, mh-sysv4}:  Add INSTALL.
+
 Thu Jun  4 12:07:32 1992  Mark Eichin  (eichin@cygnus.com)
 
 	* Makefile.in: make gprof rules similar to byacc rules (instead of
@@ -10954,6 +7254,8 @@ Wed Apr 22 18:06:55 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
 
 Wed Apr 22 14:38:34 1992  Fred Fish  (fnf@cygnus.com)
 
+	* config/mh-delta88, config/mh-ncr3000:  Replace MINUS_G with
+	CFLAGS per new configuration strategy.
 	* configure:  Test for existance of files before trying to mv
 	them, to avoid numerous non-existance messages.
 
@@ -11115,7 +7417,7 @@ Thu Mar  5 21:45:07 1992  K. Richard Pixley  (rich@sendai)
 
 Thu Mar  5 12:05:58 1992  Stu Grossman  (grossman at cygnus.com)
 
-	* config.sub configure.in gdb/configure.in
+	* config.sub configure.in config/mh-irix4 gdb/configure.in
 	gdb/mips-tdep.c gdb/mipsread.c gdb/procfs.c gdb/signame.h
 	gdb/tm-irix3.h gdb/tm-mips.h gdb/xm-irix4.h gdb/config/mt-irix3
 	gdb/config/mh-irix4 texinfo/configure.in:  Port to SGI Irix-4.x.
@@ -11176,7 +7478,7 @@ Fri Jan 31 02:27:32 1992  John Gilmore  (gnu at cygnus.com)
 
 Thu Jan 30 16:17:30 1992  Stu Grossman  (grossman at cygnus.com)
 
-	* bfd/configure.in, gdb/config/mh-i386sco,
+	* bfd/configure.in, config/mh-sco, gdb/config/mh-i386sco,
 	gdb/config/mt-i386v32, gdb/configure.in, readline/configure.in:
 	Fix SCO configuration stuff.
 
diff --git a/MAINTAINERS b/MAINTAINERS
index b2077e7..cb36bab 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4,16 +4,12 @@ Please do not make ChangeLog entries.
 COPYING, COPYING.LIB, README
 	http://gnu.org.
 
-Makefile.*; configure; configure.in; src-release
-	Any global maintainer can approve changes to these
-	files, but they should be aware	that they need to
-	be kept in sync with their counterparts in the GCC
-	repository.  Also please notify the following of
-	any committed patches:
+Makefile.in; configure; configure.in
+	Please notify the following of any committed patches.
 		binutils@sources.redhat.com
 		gdb-patches@sources.redhat.com
 
-bfd/; binutils/; gas/; gprof/; ld/; opcodes/; cpu/; BFD's part of include/
+bfd/; binutils/; gas/; gprof/; ld/; opcodes/; BFD's part of include/
 	binutils: http://sources.redhat.com/binutils/
 	Patches to binutils@sources.redhat.com.
 	Please notify the following of any interface changes:
@@ -25,24 +21,23 @@ cgen/; cgen parts of opcodes/, sim/ & include/
 	May need separate opcodes/ or sim/ approval for
 		commits of regenerated files there.
 
-config.guess; config.sub; readline/support/config.{sub,guess}
-	config: http://savannah.gnu.org/projects/config
+config.guess; config.sub; dejagnu/config.guess;
+readline/support/config.sub; readline/support/config.guess
+	config: http://gnu.org
 	Patches to config-patches@gnu.org.
 	Changes need to be done in tandem with the official CONFIG
 	sources or submitted to the master file maintainer and brought
-	in via a merge.  When updating any of these files, please be
-	sure to update all of them.
-	Please notify the following of any committed patches:
-		binutils@sources.redhat.com
-		gdb-patches@sources.redhat.com
+	in via a merge.
 
-depcomp
-        Send bug reports and patches to bug-automake@gnu.org.
+dejagnu/
+	Notify http://dejagnu.sourceforge.net/ of generic changes.
+	Generic patches to gdb-patches@sources.redhat.com;
+	Other dependents of dejagnu include sid@, binutils@, gcc@, etc.
 
-gdb/; readline/; sim/; GDB's part of include/
-	GDB: http://www.gnu.org/software/gdb/
+gdb/; mmalloc/; readline/; sim/; GDB's part of include/ & dejagnu/
+	gdb: http://sources.redhat.com/gdb/
 	Patches to gdb-patches@sources.redhat.com.
-	See also gdb/MAINTAINERS and sim/MAINTAINERS.
+	See also gdb/MAINTAINERS, sim/MAINTAINERS, mmalloc/MAINTAINERS.
 
 include/
 	See binutils/, gdb/, sid/, gcc/, libiberty/ etc.
@@ -57,8 +52,8 @@ libiberty/; libiberty's part of include/
 	Otherwise, changes are automatically merged, usually within
 	a day.
 
-ltconfig; ltmain.sh; ltcf-*.sh
-	libtool: http://www.gnu.org/software/libtool/
+ltconfig; ltmain.sh
+	libtool: http://gnu.org
 	Changes need to be done in tandem with the official LIBTOOL
 	sources or submitted to the master file maintainer and brought
 	in via a merge.
@@ -78,7 +73,7 @@ newlib/; libgloss/
 	http://sources.redhat.com/newlib/
 	Patches to newlib@sources.redhat.com.
 
-sid/; SID's part of cgen/
+sid/; SID's part of cgen/ & dejagnu/
 	sid: http://sources.redhat.com/sid/
 	Patches to sid@sources.redhat.com
 
@@ -98,17 +93,11 @@ winsup/
 	General discussion cygwin@sources.redhat.com.
 	See also winsup/MAINTAINERS.
 
-config-ml.in; makefile.vms; mkdep; setup.com;
-etc/; intl/; utils/;
-	Any global maintainer can approve changes to these
-	files and directories.
-
-compile; depcomp; install-sh; missing; ylwrap;
-config/
-	Any global maintainer can approve changes to these
-	files and directories, but they should be aware
-	that they need to be kept in sync with their
-	counterparts in the GCC repository.
+expect/; config-ml.in; mpw-README; mpw-build.in; mpw-config.in;
+mpw-configure; mpw-install; setup.com; missing; makefile.vms; utils/;
+config/; config.if; makefile.vms; missing; ylwrap; mkdep; etc/;
+install-sh; intl/
+	Ask DJ Delorie <dj@redhat.com> after reading the libiberty entry.
 
 modules file
 	Obviously changes to this file should not go through
diff --git a/Makefile.def b/Makefile.def
deleted file mode 100644
index 3227a44..0000000
--- a/Makefile.def
+++ /dev/null
@@ -1,494 +0,0 @@
-#! /usr/bin/autogen
-AutoGen definitions Makefile.tpl;
-
-// Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
-// This file was originally written by Nathanael Nerode.
-//
-//   Copyright 2002, 2003, 2004, 2005, 2006 Free Software Foundation
-//
-// This file 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 of the License, or
-// (at your option) any later version.
-// 
-// This program 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 program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-// "missing" indicates that that module doesn't supply
-// that recursive target in its Makefile.
-
-build_modules= { module= libiberty; };
-build_modules= { module= bison; };
-build_modules= { module= byacc; };
-build_modules= { module= flex; };
-build_modules= { module= m4; };
-build_modules= { module= texinfo; };
-build_modules= { module= fixincludes;
-		 extra_configure_args='--target=$(target)'; };
-
-host_modules= { module= ash; };
-host_modules= { module= autoconf; };
-host_modules= { module= automake; };
-host_modules= { module= bash; };
-host_modules= { module= bfd; lib_path=.; bootstrap=true; };
-host_modules= { module= opcodes; lib_path=.; bootstrap=true; };
-host_modules= { module= binutils; bootstrap=true; };
-host_modules= { module= bison; no_check_cross= true; };
-host_modules= { module= byacc; no_check_cross= true; };
-host_modules= { module= bzip2; };
-host_modules= { module= dejagnu; };
-host_modules= { module= diff; };
-host_modules= { module= dosutils; no_check= true; };
-host_modules= { module= etc; };
-host_modules= { module= fastjar; no_check_cross= true; };
-host_modules= { module= fileutils; };
-host_modules= { module= findutils; };
-host_modules= { module= find; };
-host_modules= { module= fixincludes;
-		missing= info;
-		missing= dvi;
-		missing= TAGS;
-		missing= install-info;
-		missing= installcheck; };
-host_modules= { module= flex; no_check_cross= true; };
-host_modules= { module= gas; bootstrap=true; };
-host_modules= { module= gcc; bootstrap=true; 
-		target="`if [ -f stage_last ]; then echo quickstrap ; else echo all; fi`";
-		extra_make_flags="$(EXTRA_GCC_FLAGS)"; };
-host_modules= { module= gawk; };
-host_modules= { module= gettext; };
-host_modules= { module= gnuserv; };
-host_modules= { module= gprof; };
-host_modules= { module= gzip; };
-host_modules= { module= hello; };
-host_modules= { module= indent; };
-host_modules= { module= intl; bootstrap=true; };
-host_modules= { module= tcl;
-                missing=mostlyclean; };
-host_modules= { module= itcl; };
-host_modules= { module= ld; bootstrap=true; };
-host_modules= { module= libcpp; bootstrap=true; };
-host_modules= { module= libdecnumber; bootstrap=true; };
-host_modules= { module= libgui; };
-host_modules= { module= libiberty; bootstrap=true; };
-host_modules= { module= libtool; };
-host_modules= { module= m4; };
-host_modules= { module= make; };
-host_modules= { module= mmalloc; no_check=true; };
-host_modules= { module= patch; };
-host_modules= { module= perl; };
-host_modules= { module= prms; };
-host_modules= { module= rcs; };
-host_modules= { module= readline; };
-host_modules= { module= release; no_install= true; no_check= true; };
-host_modules= { module= recode; };
-host_modules= { module= sed; };
-host_modules= { module= send-pr; };
-host_modules= { module= shellutils; };
-host_modules= { module= sid; };
-host_modules= { module= sim; };
-host_modules= { module= tar; };
-host_modules= { module= texinfo; no_install= true; };
-host_modules= { module= textutils; };
-host_modules= { module= time; };
-host_modules= { module= uudecode; };
-host_modules= { module= wdiff; };
-host_modules= { module= zip; no_check_cross=true; };
-host_modules= { module= zlib; no_install=true; no_check=true; bootstrap=true; };
-host_modules= { module= gdb; extra_make_flags="$(X11_FLAGS_TO_PASS)"; };
-host_modules= { module= expect; extra_make_flags="$(X11_FLAGS_TO_PASS)"; };
-host_modules= { module= guile; extra_make_flags="$(X11_FLAGS_TO_PASS)"; };
-host_modules= { module= tk; extra_make_flags="$(X11_FLAGS_TO_PASS)"; };
-host_modules= { module= libtermcap; no_check=true; 
-                missing=mostlyclean;
-                missing=clean;
-                missing=distclean;
-                missing=maintainer-clean; };
-host_modules= { module= utils; no_check=true; };
-host_modules= { module= gnattools; };
-
-target_modules = { module= libstdc++-v3; lib_path=.libs; raw_cxx=true; };
-target_modules = { module= libmudflap; lib_path=.libs; };
-target_modules = { module= libssp; lib_path=.libs; };
-target_modules = { module= libgcc-math; lib_path=.libs; };
-target_modules = { module= newlib; };
-target_modules = { module= libgfortran; };
-target_modules = { module= libobjc; };
-target_modules = { module= libtermcap; no_check=true;
-                   missing=mostlyclean;
-                   missing=clean;
-                   missing=distclean;
-                   missing=maintainer-clean; };
-target_modules = { module= winsup; };
-target_modules = { module= libgloss; no_check=true; };
-target_modules = { module= libiberty; };
-target_modules = { module= gperf; };
-target_modules = { module= examples; no_check=true; no_install=true; };
-target_modules = { module= libffi; };
-target_modules = { module= libjava; raw_cxx=true; };
-target_modules = { module= zlib; };
-target_modules = { module= boehm-gc; };
-target_modules = { module= qthreads; };
-target_modules = { module= rda; };
-target_modules = { module= libada; };
-target_modules = { module= libgomp; lib_path=.libs; };
-
-// These are (some of) the make targets to be done in each subdirectory.
-// Not all; these are the ones which don't have special options.
-// "depend" indicates that a target depends on another target uniformly
-// for each subdirectory.  There can be several such lines per target.
-recursive_targets = { make_target= info; 
-                      depend=configure; };
-recursive_targets = { make_target= dvi; 
-                      depend=configure; };
-recursive_targets = { make_target= html; 
-                      depend=configure; };
-recursive_targets = { make_target= TAGS; 
-                      depend=configure; };
-recursive_targets = { make_target= install-info; 
-                      depend=configure;
-                      depend=info; };
-recursive_targets = { make_target= installcheck; 
-                      depend=configure; };
-recursive_targets = { make_target= mostlyclean; };
-recursive_targets = { make_target= clean; };
-recursive_targets = { make_target= distclean; };
-recursive_targets = { make_target= maintainer-clean; };
-
-// Flags which need to be passed down.
-
-// Directories etc.
-flags_to_pass = { flag= DESTDIR ; };
-flags_to_pass = { flag= RPATH_ENVVAR ; };
-flags_to_pass = { flag= TARGET_SUBDIR ; };
-flags_to_pass = { flag= bindir ; };
-flags_to_pass = { flag= datadir ; };
-flags_to_pass = { flag= exec_prefix ; };
-flags_to_pass = { flag= includedir ; };
-flags_to_pass = { flag= infodir ; };
-flags_to_pass = { flag= libdir ; };
-flags_to_pass = { flag= libexecdir ; };
-flags_to_pass = { flag= lispdir ; };
-flags_to_pass = { flag= localstatedir ; };
-flags_to_pass = { flag= mandir ; };
-flags_to_pass = { flag= oldincludedir ; };
-flags_to_pass = { flag= prefix ; };
-flags_to_pass = { flag= sbindir ; };
-flags_to_pass = { flag= sharedstatedir ; };
-flags_to_pass = { flag= sysconfdir ; };
-flags_to_pass = { flag= tooldir ; };
-flags_to_pass = { flag= build_tooldir ; };
-flags_to_pass = { flag= target_alias ; };
-
-// Build tools
-flags_to_pass = { flag= BISON ; };
-flags_to_pass = { flag= CC_FOR_BUILD ; };
-flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
-flags_to_pass = { flag= CXX_FOR_BUILD ; };
-flags_to_pass = { flag= EXPECT ; };
-flags_to_pass = { flag= FLEX ; };
-flags_to_pass = { flag= INSTALL ; };
-flags_to_pass = { flag= INSTALL_DATA ; };
-flags_to_pass = { flag= INSTALL_PROGRAM ; };
-flags_to_pass = { flag= INSTALL_SCRIPT ; };
-flags_to_pass = { flag= LEX ; };
-flags_to_pass = { flag= M4 ; };
-flags_to_pass = { flag= MAKE ; };
-flags_to_pass = { flag= RUNTEST ; };
-flags_to_pass = { flag= RUNTESTFLAGS ; };
-flags_to_pass = { flag= SHELL ; };
-flags_to_pass = { flag= YACC ; };
-
-// Host tools
-flags_to_pass = { flag= ADAFLAGS ; optional=true ; };
-flags_to_pass = { flag= AR_FLAGS ; };
-flags_to_pass = { flag= BOOT_ADAFLAGS ; optional=true ; };
-flags_to_pass = { flag= BOOT_CFLAGS ; };
-flags_to_pass = { flag= BOOT_LDFLAGS ; };
-flags_to_pass = { flag= CFLAGS ; };
-flags_to_pass = { flag= CXXFLAGS ; };
-flags_to_pass = { flag= LDFLAGS ; };
-flags_to_pass = { flag= LIBCFLAGS ; };
-flags_to_pass = { flag= LIBCXXFLAGS ; };
-flags_to_pass = { flag= STAGE1_CFLAGS ; };
-flags_to_pass = { flag= STAGE1_LANGUAGES ; };
-
-// Target tools
-flags_to_pass = { flag= AR_FOR_TARGET ; };
-flags_to_pass = { flag= AS_FOR_TARGET ; };
-flags_to_pass = { flag= CC_FOR_TARGET ; };
-flags_to_pass = { flag= CFLAGS_FOR_TARGET ; };
-flags_to_pass = { flag= CPPFLAGS_FOR_TARGET ; };
-flags_to_pass = { flag= CXX_FOR_TARGET ; };
-flags_to_pass = { flag= CXXFLAGS_FOR_TARGET ; };
-flags_to_pass = { flag= DLLTOOL_FOR_TARGET ; };
-flags_to_pass = { flag= GCJ_FOR_TARGET ; };
-flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; };
-flags_to_pass = { flag= LD_FOR_TARGET ; };
-flags_to_pass = { flag= LIPO_FOR_TARGET ; };
-flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; };
-flags_to_pass = { flag= LIBCFLAGS_FOR_TARGET ; };
-flags_to_pass = { flag= LIBCXXFLAGS_FOR_TARGET ; };
-flags_to_pass = { flag= NM_FOR_TARGET ; };
-flags_to_pass = { flag= OBJDUMP_FOR_TARGET ; };
-flags_to_pass = { flag= RANLIB_FOR_TARGET ; };
-flags_to_pass = { flag= STRIP_FOR_TARGET ; };
-flags_to_pass = { flag= WINDRES_FOR_TARGET ; };
-
-// Miscellaneous
-flags_to_pass = { flag= LANGUAGES ; optional=true ; };
-flags_to_pass = { flag= LEAN ; };
-
-// Inter-module dependencies
-
-// Build modules
-dependencies = { module=all-build-bison; on=all-build-texinfo; };
-dependencies = { module=all-build-byacc; on=all-build-texinfo; };
-dependencies = { module=all-build-flex; on=all-build-texinfo; };
-dependencies = { module=all-build-flex; on=all-build-bison; };
-dependencies = { module=all-build-flex; on=all-build-byacc; };
-dependencies = { module=all-build-flex; on=all-build-m4; };
-dependencies = { module=all-build-libiberty; on=all-build-texinfo; };
-dependencies = { module=all-build-m4; on=all-build-texinfo; };
-dependencies = { module=all-build-fixincludes; on=all-build-libiberty; };
-
-// Host modules specific to gcc.
-dependencies = { module=configure-gcc; on=configure-intl; };
-dependencies = { module=configure-gcc; on=all-binutils; };
-dependencies = { module=configure-gcc; on=all-gas; };
-dependencies = { module=configure-gcc; on=all-ld; };
-dependencies = { module=all-gcc; on=all-libiberty; hard=true; };
-dependencies = { module=all-gcc; on=all-intl; };
-dependencies = { module=all-gcc; on=all-build-texinfo; };
-dependencies = { module=all-gcc; on=all-build-bison; };
-dependencies = { module=all-gcc; on=all-build-byacc; };
-dependencies = { module=all-gcc; on=all-build-flex; };
-dependencies = { module=all-gcc; on=all-build-libiberty; };
-dependencies = { module=all-gcc; on=all-build-fixincludes; };
-dependencies = { module=all-gcc; on=all-zlib; };
-dependencies = { module=all-gcc; on=all-libcpp; hard=true; };
-dependencies = { module=all-gcc; on=all-libdecnumber; hard=true; };
-dependencies = { module=all-gcc; on=all-libiberty; };
-dependencies = { module=all-gcc; on=all-fixincludes; };
-dependencies = { module=install-gcc ; on=install-fixincludes; };
-
-dependencies = { module=configure-libcpp; on=configure-libiberty; hard=true; };
-dependencies = { module=configure-libcpp; on=configure-intl; };
-dependencies = { module=all-libcpp; on=all-libiberty; hard=true; };
-dependencies = { module=all-libcpp; on=all-intl; };
-
-dependencies = { module=all-fixincludes; on=all-libiberty; };
-
-dependencies = { module=all-gnattools; on=all-target-libada; };
-
-// Host modules specific to gdb.
-dependencies = { module=configure-gdb; on=configure-sim; };
-dependencies = { module=all-gdb; on=all-libiberty; };
-dependencies = { module=all-gdb; on=all-opcodes; };
-dependencies = { module=all-gdb; on=all-bfd; };
-dependencies = { module=all-gdb; on=all-readline; };
-dependencies = { module=all-gdb; on=all-build-bison; };
-dependencies = { module=all-gdb; on=all-build-byacc; };
-dependencies = { module=all-gdb; on=all-sim; };
-
-dependencies = { module=configure-libgui; on=configure-tcl; };
-dependencies = { module=configure-libgui; on=configure-tk; };
-dependencies = { module=all-libgui; on=all-tcl; };
-dependencies = { module=all-libgui; on=all-tk; };
-dependencies = { module=all-libgui; on=all-itcl; };
-
-// Host modules specific to binutils.
-dependencies = { module=configure-bfd; on=configure-libiberty; hard=true; };
-dependencies = { module=all-bfd; on=all-libiberty; };
-dependencies = { module=all-bfd; on=all-intl; };
-
-dependencies = { module=all-binutils; on=all-libiberty; };
-dependencies = { module=all-binutils; on=all-opcodes; };
-dependencies = { module=all-binutils; on=all-bfd; };
-dependencies = { module=all-binutils; on=all-build-flex; };
-dependencies = { module=all-binutils; on=all-build-bison; };
-dependencies = { module=all-binutils; on=all-build-byacc; };
-dependencies = { module=all-binutils; on=all-intl; };
-
-// We put install-opcodes before install-binutils because the installed
-// binutils might be on PATH, and they might need the shared opcodes
-// library.
-dependencies = { module=install-binutils; on=install-opcodes; };
-
-// libopcodes depends on libbfd
-dependencies = { module=install-opcodes; on=install-bfd; };
-
-dependencies = { module=all-gas; on=all-libiberty; };
-dependencies = { module=all-gas; on=all-opcodes; };
-dependencies = { module=all-gas; on=all-bfd; };
-dependencies = { module=all-gas; on=all-intl; };
-dependencies = { module=all-gprof; on=all-libiberty; };
-dependencies = { module=all-gprof; on=all-bfd; };
-dependencies = { module=all-gprof; on=all-opcodes; };
-dependencies = { module=all-gprof; on=all-intl; };
-dependencies = { module=all-ld; on=all-libiberty; };
-dependencies = { module=all-ld; on=all-bfd; };
-dependencies = { module=all-ld; on=all-opcodes; };
-dependencies = { module=all-ld; on=all-build-bison; };
-dependencies = { module=all-ld; on=all-build-byacc; };
-dependencies = { module=all-ld; on=all-build-flex; };
-dependencies = { module=all-ld; on=all-intl; };
-
-dependencies = { module=all-opcodes; on=all-bfd; };
-dependencies = { module=all-opcodes; on=all-libiberty; };
-
-// Other host modules in the 'src' repository.
-dependencies = { module=all-dejagnu; on=all-tcl; };
-dependencies = { module=all-dejagnu; on=all-expect; };
-dependencies = { module=all-dejagnu; on=all-tk; };
-dependencies = { module=configure-expect; on=configure-tcl; };
-dependencies = { module=configure-expect; on=configure-tk; };
-dependencies = { module=all-expect; on=all-tcl; };
-dependencies = { module=all-expect; on=all-tk; };
-
-// We put install-tcl before install-itcl because itcl wants to run a
-// program on installation which uses the Tcl libraries.
-dependencies = { module=configure-itcl; on=configure-tcl; };
-dependencies = { module=configure-itcl; on=configure-tk; };
-dependencies = { module=all-itcl; on=all-tcl; };
-dependencies = { module=all-itcl; on=all-tk; };
-dependencies = { module=install-itcl; on=install-tcl; };
-
-dependencies = { module=configure-tk; on=configure-tcl; };
-dependencies = { module=all-tk; on=all-tcl; };
-
-dependencies = { module=all-sid; on=all-libiberty; };
-dependencies = { module=all-sid; on=all-bfd; };
-dependencies = { module=all-sid; on=all-opcodes; };
-dependencies = { module=all-sid; on=all-tcl; };
-dependencies = { module=all-sid; on=all-tk; };
-dependencies = { module=install-sid; on=install-tcl; };
-dependencies = { module=install-sid; on=install-tk; };
-
-dependencies = { module=all-sim; on=all-libiberty; };
-dependencies = { module=all-sim; on=all-bfd; };
-dependencies = { module=all-sim; on=all-opcodes; };
-dependencies = { module=all-sim; on=all-readline; };
-dependencies = { module=all-sim; on=configure-gdb; };
-
-// Other host modules.
-dependencies = { module=all-fastjar; on=all-zlib; };
-dependencies = { module=all-fastjar; on=all-build-texinfo; };
-dependencies = { module=all-fastjar; on=all-libiberty; };
-
-// Warning, these are not well tested.
-dependencies = { module=all-autoconf; on=all-m4; };
-dependencies = { module=all-autoconf; on=all-build-texinfo; };
-dependencies = { module=all-automake; on=all-m4; };
-dependencies = { module=all-automake; on=all-build-texinfo; };
-dependencies = { module=all-automake; on=all-autoconf; };
-dependencies = { module=all-bison; on=all-intl; };
-dependencies = { module=all-bison; on=all-build-texinfo; };
-dependencies = { module=all-diff; on=all-intl; };
-dependencies = { module=all-diff; on=all-build-texinfo; };
-dependencies = { module=all-fileutils; on=all-intl; };
-dependencies = { module=all-fileutils; on=all-build-texinfo; };
-dependencies = { module=all-flex; on=all-build-bison; };
-dependencies = { module=all-flex; on=all-build-byacc; };
-dependencies = { module=all-flex; on=all-intl; };
-dependencies = { module=all-flex; on=all-m4; };
-dependencies = { module=all-flex; on=all-build-texinfo; };
-dependencies = { module=all-gzip; on=all-intl; };
-dependencies = { module=all-gzip; on=all-zlib; };
-dependencies = { module=all-gzip; on=all-build-texinfo; };
-dependencies = { module=all-hello; on=all-intl; };
-dependencies = { module=all-hello; on=all-build-texinfo; };
-dependencies = { module=all-m4; on=all-intl; };
-dependencies = { module=all-m4; on=all-build-texinfo; };
-dependencies = { module=all-make; on=all-intl; };
-dependencies = { module=all-make; on=all-build-texinfo; };
-dependencies = { module=all-patch; on=all-build-texinfo; };
-dependencies = { module=all-make; on=all-build-texinfo; };
-dependencies = { module=all-prms; on=all-libiberty; };
-dependencies = { module=all-recode; on=all-build-texinfo; };
-dependencies = { module=all-sed; on=all-build-texinfo; };
-dependencies = { module=all-send-pr; on=all-prms; };
-dependencies = { module=all-tar; on=all-build-texinfo; };
-dependencies = { module=all-uudecode; on=all-build-texinfo; };
-
-// Target modules.  These can also have dependencies on the language
-// environment (e.g. on libstdc++).
-lang_env_dependencies = { module=boehm-gc; };
-lang_env_dependencies = { module=gperf; cxx=true; };
-lang_env_dependencies = { module=libada; };
-lang_env_dependencies = { module=libgfortran; };
-lang_env_dependencies = { module=libffi; };
-lang_env_dependencies = { module=libjava; cxx=true; };
-lang_env_dependencies = { module=libmudflap; };
-lang_env_dependencies = { module=libobjc; };
-lang_env_dependencies = { module=libssp; };
-lang_env_dependencies = { module=libstdc++-v3; };
-lang_env_dependencies = { module=zlib; };
-
-dependencies = { module=configure-target-boehm-gc; on=configure-target-qthreads; };
-dependencies = { module=configure-target-fastjar; on=configure-target-zlib; };
-dependencies = { module=all-target-fastjar; on=all-target-zlib; };
-dependencies = { module=all-target-fastjar; on=all-target-libiberty; };
-dependencies = { module=configure-target-libjava; on=configure-target-zlib; };
-dependencies = { module=configure-target-libjava; on=configure-target-boehm-gc; };
-dependencies = { module=configure-target-libjava; on=configure-target-qthreads; };
-dependencies = { module=configure-target-libjava; on=configure-target-libffi; };
-dependencies = { module=all-target-libjava; on=all-fastjar; };
-dependencies = { module=all-target-libjava; on=all-target-zlib; };
-dependencies = { module=all-target-libjava; on=all-target-boehm-gc; };
-dependencies = { module=all-target-libjava; on=all-target-qthreads; };
-dependencies = { module=all-target-libjava; on=all-target-libffi; };
-dependencies = { module=all-target-libobjc; on=all-target-libiberty; };
-dependencies = { module=all-target-libstdc++-v3; on=all-target-libiberty; };
-
-// Target modules in the 'src' repository.
-lang_env_dependencies = { module=examples; };
-lang_env_dependencies = { module=libtermcap; };
-lang_env_dependencies = { module=rda; };
-lang_env_dependencies = { module=winsup; };
-lang_env_dependencies = { module=qthreads; };
-
-dependencies = { module=all-target-libgloss; on=configure-target-newlib; };
-dependencies = { module=all-target-winsup; on=all-target-libiberty; };
-dependencies = { module=all-target-winsup; on=all-target-libtermcap; };
-
-// Toplevel bootstrap
-bootstrap_stage = {
-	id=1 ;
-	stage_configure_flags='--disable-intermodule \
-	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
-	stage_make_flags='CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"' ; };
-bootstrap_stage = {
-	id=2 ; prev=1 ;
-	bootstrap_target=bootstrap2 ;
-	stage_configure_flags="@stage2_werror_flag@" ;
-	stage_make_flags="" ; };
-bootstrap_stage = {
-	id=3 ; prev=2 ; lean=1 ;
-	compare_target=compare ;
-	bootstrap_target=bootstrap ;
-	cleanstrap_target=cleanstrap ;
-	stage_configure_flags="@stage2_werror_flag@" ;
-	stage_make_flags="" ; };
-bootstrap_stage = {
-	id=4 ; prev=3 ; lean=2 ;
-	compare_target=compare3 ;
-	bootstrap_target=bootstrap4 ;
-	stage_configure_flags="@stage2_werror_flag@" ;
-	stage_make_flags="" ; };
-bootstrap_stage = {
-	id=profile ; prev=1 ;
-	stage_configure_flags="@stage2_werror_flag@" ;
-	stage_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"' ; };
-bootstrap_stage = {
-	id=feedback ; prev=profile ;
-	bootstrap_target=profiledbootstrap ;
-	stage_configure_flags="@stage2_werror_flag@" ;
-	stage_make_flags='CFLAGS="$(BOOT_CFLAGS) -fprofile-use"' ; };
diff --git a/Makefile.in b/Makefile.in
index eae74a7..e48d98a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,7 @@
-
-# Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
 #
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
+#   1999, 2000, 2001 Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,40 +15,33 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
-# -------------------------------
-# Standard Autoconf-set variables
-# -------------------------------
-VPATH=@srcdir@
+srcdir = .
 
-build_alias=@build_alias@
-build=@build@
-host_alias=@host_alias@
-host=@host@
-target_alias=@target_alias@
-target=@target@
+prefix = /usr/local
+exec_prefix = $(prefix)
 
-program_transform_name = @program_transform_name@
+bindir=${exec_prefix}/bin
+sbindir=${exec_prefix}/sbin
+libexecdir=${exec_prefix}/libexec
+datadir=${prefix}/share
+sysconfdir=${prefix}/etc
+sharedstatedir=${prefix}/com
+localstatedir=${prefix}/var
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+oldincludedir=/usr/include
+infodir=${prefix}/info
+mandir=${prefix}/man
+gxx_include_dir=${includedir}/g++
 
-prefix = @prefix@
-exec_prefix = @exec_prefix@
+tooldir = $(exec_prefix)/$(target_alias)
+build_tooldir = $(exec_prefix)/$(target_alias)
 
-srcdir = @srcdir@
+program_transform_name =
 
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-includedir = @includedir@
-oldincludedir = @oldincludedir@
-infodir = @infodir@
-mandir = @mandir@
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
 man3dir = $(mandir)/man3
@@ -60,347 +51,340 @@ man6dir = $(mandir)/man6
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 man9dir = $(mandir)/man9
+infodir = $(prefix)/info
+includedir = $(prefix)/include
+# Directory in which the compiler finds executables, libraries, etc.
+libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version)
+GDB_NLM_DEPS = 
 
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_DATA = @INSTALL_DATA@
-LN = @LN@
-LN_S = @LN_S@
-
-# -------------------------------------------------
-# Miscellaneous non-standard autoconf-set variables
-# -------------------------------------------------
-
-# The gcc driver likes to know the arguments it was configured with.
-TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
+SHELL = /bin/sh
 
-tooldir = @tooldir@
-build_tooldir = @build_tooldir@
+# INSTALL_PROGRAM_ARGS is changed by configure.in to use -x for a
+# cygwin host.
+INSTALL_PROGRAM_ARGS =
 
-GDB_NLM_DEPS = 
+INSTALL = $(SHELL) $$s/install-sh -c
+INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_ARGS)
+INSTALL_SCRIPT = $(INSTALL)
+INSTALL_DATA = $(INSTALL) -m 644
 
-# This is the name of the environment variable used for the path to
-# the libraries.
-RPATH_ENVVAR = @RPATH_ENVVAR@
+INSTALL_DOSREL = install-dosrel-fake
 
-# Build programs are put under this directory.
-BUILD_SUBDIR = @build_subdir@
-# This is set by the configure script to the arguments to use when configuring
-# directories built for the build system.
-BUILD_CONFIGARGS = @build_configargs@ --with-build-subdir="$(BUILD_SUBDIR)"
+AS = as
+AR = ar
+AR_FLAGS = rc
+CC = cc
 
-# This is the list of variables to export in the environment when
-# configuring any subdirectory.  It must also be exported whenever
-# recursing into a build directory in case that directory's Makefile
-# re-runs configure.
-BASE_EXPORTS = \
-	FLEX="$(FLEX)"; export FLEX; \
-	LEX="$(LEX)"; export LEX; \
-	BISON="$(BISON)"; export BISON; \
-	YACC="$(YACC)"; export YACC; \
-	M4="$(M4)"; export M4; \
-	MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
+# Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
+# here so that they can be overridden by Makefile fragments.
+HOST_CC = $(CC_FOR_BUILD)
+HOST_PREFIX = 
+HOST_PREFIX_1 = loser-
 
-# This is the list of variables to export in the environment when
-# configuring subdirectories for the build system.
-BUILD_EXPORTS = \
-	$(BASE_EXPORTS) \
-	AR="$(AR_FOR_BUILD)"; export AR; \
-	AS="$(AS_FOR_BUILD)"; export AS; \
-	CC="$(CC_FOR_BUILD)"; export CC; \
-	CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
-	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-	CXX="$(CXX_FOR_BUILD)"; export CXX; \
-	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
-	GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
-	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
-	DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
-	LD="$(LD_FOR_BUILD)"; export LD; \
-	LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
-	NM="$(NM_FOR_BUILD)"; export NM; \
-	RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \
-	WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES;
+# These flag values are normally overridden by the configure script.
+CFLAGS = -g
+CXXFLAGS = -g -O2
 
-# This is the list of directories to built for the host system.
-SUBDIRS = @configdirs@
-# This is set by the configure script to the arguments to use when configuring
-# directories built for the host system.
-HOST_CONFIGARGS = @host_configargs@
-# Host programs are put under this directory, which is . except if building
-# with srcdir=..
-HOST_SUBDIR = @host_subdir@
-# This is the list of variables to export in the environment when
-# configuring subdirectories for the host system.  We need to pass
-# some to the GCC configure because of its hybrid host/target nature.
-HOST_EXPORTS = \
-	$(BASE_EXPORTS) \
-	CC="$(CC)"; export CC; \
-	CFLAGS="$(CFLAGS)"; export CFLAGS; \
-	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-	CXX="$(CXX)"; export CXX; \
-	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-	AR="$(AR)"; export AR; \
-	AS="$(AS)"; export AS; \
-	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-	DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-	LD="$(LD)"; export LD; \
-	LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-	NM="$(NM)"; export NM; \
-	RANLIB="$(RANLIB)"; export RANLIB; \
-	WINDRES="$(WINDRES)"; export WINDRES; \
-	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-	AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
-	AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
-	GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \
-	LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \
-	NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
-	OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
-	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
-	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
-	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
-@if gcc-bootstrap
-	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-@endif gcc-bootstrap
-	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
+LDFLAGS = 
+LIBCFLAGS = $(CFLAGS)
+CFLAGS_FOR_TARGET = $(CFLAGS)
+LDFLAGS_FOR_TARGET = 
+LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+PICFLAG = 
+PICFLAG_FOR_TARGET = 
 
-# Similar, for later GCC stages.
-POSTSTAGE1_HOST_EXPORTS = \
-	$(HOST_EXPORTS) \
-	CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
-	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
-	CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \
-	  $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
-	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
-	  -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
+CHILLFLAGS = $(CFLAGS)
+CHILL_LIB = -lchill
+CXX = c++
 
-# Target libraries are put under this directory:
-TARGET_SUBDIR = @target_subdir@
-# This is set by the configure script to the arguments to use when configuring
-# directories built for the target.
-TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
-# This is the list of variables to export in the environment when
-# configuring subdirectories for the host system.
-BASE_TARGET_EXPORTS = \
-	$(BASE_EXPORTS) \
-	AR="$(AR_FOR_TARGET)"; export AR; \
-	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
-	CC="$(CC_FOR_TARGET)"; export CC; \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-	GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
-	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
-	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-	LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
-	NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
-	OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
-	RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
-	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
+# Use -O2 to stress test the compiler.
+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
+LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 
-RAW_CXX_TARGET_EXPORTS = \
-	$(BASE_TARGET_EXPORTS) \
-	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
-	CXX="$(RAW_CXX_FOR_TARGET)"; export CXX;
+RANLIB = ranlib
 
-NORMAL_TARGET_EXPORTS = \
-	$(BASE_TARGET_EXPORTS) \
-	CXX="$(CXX_FOR_TARGET)"; export CXX;
+DLLTOOL = dlltool
+WINDRES = windres
 
-# Where to find GMP
-HOST_GMPLIBS = @gmplibs@
-HOST_GMPINC = @gmpinc@
+NM = nm
 
-# ----------------------------------------------
-# Programs producing files for the BUILD machine
-# ----------------------------------------------
+LD = ld
 
-SHELL = @config_shell@
+BZIPPROG = bzip2
+MD5PROG = md5sum
 
-# pwd command to use.  Allow user to override default by setting PWDCMD in
-# the environment to account for automounters.  The make variable must not
-# be called PWDCMD, otherwise the value set here is passed to make
-# subprocesses and overrides the setting from the user's environment.
-# Don't use PWD since it is a common shell environment variable and we
-# don't want to corrupt it.
-PWD_COMMAND = $${PWDCMD-pwd}
+# These values are substituted by configure.
+DEFAULT_YACC = yacc
+DEFAULT_LEX = lex
+DEFAULT_M4 = m4
 
-# compilers to use to create programs which must be run in the build
-# environment.
-CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+BISON = `if [ -f $$r/bison/bison ] ; then \
+	    echo $$r/bison/bison -L $$s/bison/ ; \
+	 else \
+	    echo bison ; \
+	 fi`
 
-CXX_FOR_BUILD = $(CXX)
+YACC = `if [ -f $$r/bison/bison ] ; then \
+	    echo $$r/bison/bison -y -L $$s/bison/ ; \
+	elif [ -f $$r/byacc/byacc ] ; then \
+	    echo $$r/byacc/byacc ; \
+	else \
+	    echo ${DEFAULT_YACC} ; \
+	fi`
 
-# Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
-# here so that they can be overridden by Makefile fragments.
-BUILD_PREFIX = @BUILD_PREFIX@
-BUILD_PREFIX_1 = @BUILD_PREFIX_1@
+LEX = `if [ -f $$r/flex/flex ] ; \
+	then echo $$r/flex/flex ; \
+	else echo ${DEFAULT_LEX} ; fi`
 
-# Flags to pass to stage2 and later makes.  They are defined
-# here so that they can be overridden by Makefile fragments.
-BOOT_CFLAGS= -g -O2
-BOOT_LDFLAGS=
+M4 = `if [ -f $$r/m4/m4 ] ; \
+	then echo $$r/m4/m4 ; \
+	else echo ${DEFAULT_M4} ; fi`
 
-BISON = @BISON@
-YACC = @YACC@
-FLEX = @FLEX@
-LEX = @LEX@
-M4 = @M4@
-MAKEINFO = @MAKEINFO@
-EXPECT = @EXPECT@
-RUNTEST = @RUNTEST@
+# For an installed makeinfo, we require it to be from texinfo 4 or
+# higher, else we use the "missing" dummy.
+MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
+	then echo $$r/texinfo/makeinfo/makeinfo ; \
+	else if (makeinfo --version \
+	  | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \
+        then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
 
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still
 # using the makeinfo from the object tree.
-# (Default to avoid splitting info files by setting the threshold high.)
-MAKEINFOFLAGS = --split-size=5000000
-
-# ---------------------------------------------
-# Programs producing files for the HOST machine
-# ---------------------------------------------
-
-AS = @AS@
-AR = @AR@
-AR_FLAGS = rc
-CC = @CC@
-CXX = @CXX@
-DLLTOOL = @DLLTOOL@
-LD = @LD@
-LIPO = @LIPO@
-NM = @NM@
-OBJDUMP = @OBJDUMP@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-WINDRES = @WINDRES@
-
-CFLAGS = @CFLAGS@
-LDFLAGS = 
-LIBCFLAGS = $(CFLAGS)
-CXXFLAGS = @CXXFLAGS@
-LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
-PICFLAG = 
-
-# -----------------------------------------------
-# Programs producing files for the TARGET machine
-# -----------------------------------------------
-
-FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
-
-AR_FOR_TARGET=@AR_FOR_TARGET@
-AS_FOR_TARGET=@AS_FOR_TARGET@
-CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-
-# If GCC_FOR_TARGET is not overriden on the command line, then this
-# variable is passed down to the gcc Makefile, where it is used to
-# build libgcc2.a.  We define it here so that it can itself be
-# overridden on the command line.
-GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
-LD_FOR_TARGET=@LD_FOR_TARGET@
+MAKEINFOFLAGS =
 
-LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
-NM_FOR_TARGET=@NM_FOR_TARGET@
-OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
-RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
-STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
-WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
+EXPECT = `if [ -f $$r/expect/expect ] ; \
+	then echo $$r/expect/expect ; \
+	else echo expect ; fi`
 
-COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_TARGET@
-COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
-COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
+RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \
+	then echo $$s/dejagnu/runtest ; \
+	else echo runtest ; fi`
 
-# During gcc bootstrap, if we use some random cc for stage1 then
-# CFLAGS will be just -g.  We want to ensure that TARGET libraries
-# (which we know are built with gcc) are built with optimizations so
-# prepend -O2 when setting CFLAGS_FOR_TARGET.
-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
-SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
-LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
-LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
-LDFLAGS_FOR_TARGET = 
-PICFLAG_FOR_TARGET = 
 
-# ------------------------------------
-# Miscellaneous targets and flag lists
-# ------------------------------------
-
-# The first rule in the file had better be this one.  Don't put any above it.
-# This lives here to allow makefile fragments to contain dependencies.
-all:
-
-#### host and target specific makefile fragments come in here.
-@target_makefile_frag@
-@alphaieee_frag@
-@ospace_frag@
-@host_makefile_frag@
-###
+# compilers to use to create programs which must be run in the build
+# environment.
+CC_FOR_BUILD = $(CC)
+CXX_FOR_BUILD = $(CXX)
 
-# This is the list of directories that may be needed in RPATH_ENVVAR
-# so that prorgams built for the target machine work.
-TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgcc-math)$(TARGET_LIB_PATH_libgomp)$(HOST_LIB_PATH_gcc)
+SUBDIRS = "this is set via configure, don't edit this"
+OTHERS = 
 
-@if target-libstdc++-v3
-TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/.libs:
-@endif target-libstdc++-v3
+# This is set by the configure script to the list of directories which
+# should be built using the target tools.
+TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib libio librx libstdc++ libg++ winsup opcodes bsp libstub cygmon libf2c libchill libobjc
 
-@if target-libmudflap
-TARGET_LIB_PATH_libmudflap = $$r/$(TARGET_SUBDIR)/libmudflap/.libs:
-@endif target-libmudflap
+# Target libraries are put under this directory:
+# Changed by configure to $(target_alias) if cross.
+TARGET_SUBDIR = .
 
-@if target-libssp
-TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
-@endif target-libssp
+BUILD_CONFIGDIRS = libiberty
+BUILD_SUBDIR = .
 
-@if target-libgcc-math
-TARGET_LIB_PATH_libgcc-math = $$r/$(TARGET_SUBDIR)/libgcc-math/.libs:
-@endif target-libgcc-math
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the target.
+TARGET_CONFIGARGS = 
 
-@if target-libgomp
-TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs:
-@endif target-libgomp
+# This is set by the configure script to the arguments to use when configuring
+# directories built for the build system.
+BUILD_CONFIGARGS =
 
+# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
+# was used.
+SET_LIB_PATH =
 
+# This is the name of the environment variable used for the path to
+# the libraries.  This may be changed by configure.in.
+RPATH_ENVVAR = LD_LIBRARY_PATH
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that programs built for the host machine work.
-HOST_LIB_PATH = $(HOST_LIB_PATH_bfd)$(HOST_LIB_PATH_opcodes)
+HOST_LIB_PATH = $$r/bfd:$$r/opcodes
 
-# Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch
-@if gcc
-HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc:$$r/$(HOST_SUBDIR)/prev-gcc:
-@endif gcc
+# This is the list of directories that may be needed in RPATH_ENVVAR
+# so that prorgams built for the target machine work.
+TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:$$r/$(TARGET_SUBDIR)/libstdc++
+
+# configure.in sets SET_LIB_PATH to this if --enable-shared was used.
+# Some platforms don't like blank entries, so we remove duplicate,
+# leading and trailing colons.
+REALLY_SET_LIB_PATH = \
+  $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
+
+ALL = all.normal
+INSTALL_TARGET = installdirs \
+	install-gcc \
+	$(INSTALL_MODULES) \
+	$(INSTALL_TARGET_MODULES) \
+	$(INSTALL_X11_MODULES) \
+	$(INSTALL_DOSREL)
+
+INSTALL_TARGET_CROSS = installdirs \
+	install-gcc-cross \
+	$(INSTALL_MODULES) \
+	$(INSTALL_TARGET_MODULES) \
+	$(INSTALL_X11_MODULES) \
+	$(INSTALL_DOSREL)
+
+# Should be substed by configure.in
+FLAGS_FOR_TARGET =
+CC_FOR_TARGET =
+CHILL_FOR_TARGET =
+CXX_FOR_TARGET =
+CXX_FOR_TARGET_FOR_RECURSIVE_MAKE =
 
+# If GCC_FOR_TARGET is not overriden on the command line, then this
+# variable is passed down to the gcc Makefile, where it is used to
+# build libgcc2.a.  We define it here so that it can itself be
+# overridden on the command line.
+GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET)
+
+AS_FOR_TARGET = ` \
+  if [ -f $$r/gas/as-new ] ; then \
+    echo $$r/gas/as-new ; \
+  elif [ -f $$r/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=as ; \
+  else \
+    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+      echo $(AS); \
+    else \
+       t='$(program_transform_name)'; echo as | sed -e 's/x/x/' $$t ; \
+    fi; \
+  fi`
+
+LD_FOR_TARGET = ` \
+  if [ -f $$r/ld/ld-new ] ; then \
+    echo $$r/ld/ld-new ; \
+  elif [ -f $$r/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=ld ; \
+  else \
+    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+      echo $(LD); \
+    else \
+       t='$(program_transform_name)'; echo ld | sed -e 's/x/x/' $$t ; \
+    fi; \
+  fi`
+
+DLLTOOL_FOR_TARGET = ` \
+  if [ -f $$r/binutils/dlltool ] ; then \
+    echo $$r/binutils/dlltool ; \
+  else \
+    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+      echo $(DLLTOOL); \
+    else \
+       t='$(program_transform_name)'; echo dlltool | sed -e 's/x/x/' $$t ; \
+    fi; \
+  fi`
+
+WINDRES_FOR_TARGET = ` \
+  if [ -f $$r/binutils/windres ] ; then \
+    echo $$r/binutils/windres ; \
+  else \
+    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+      echo $(WINDRES); \
+    else \
+       t='$(program_transform_name)'; echo windres | sed -e 's/x/x/' $$t ; \
+    fi; \
+  fi`
+
+AR_FOR_TARGET = ` \
+  if [ -f $$r/binutils/ar ] ; then \
+    echo $$r/binutils/ar ; \
+  else \
+    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+      echo $(AR); \
+    else \
+       t='$(program_transform_name)'; echo ar | sed -e 's/x/x/' $$t ; \
+    fi; \
+  fi`
+
+RANLIB_FOR_TARGET = ` \
+  if [ -f $$r/binutils/ranlib ] ; then \
+    echo $$r/binutils/ranlib ; \
+  else \
+    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+      if [ x'$(RANLIB)' != x ]; then \
+         echo $(RANLIB); \
+      else \
+         echo ranlib; \
+      fi; \
+    else \
+       t='$(program_transform_name)'; echo ranlib | sed -e 's/x/x/' $$t ; \
+    fi; \
+  fi`
+
+NM_FOR_TARGET = ` \
+  if [ -f $$r/binutils/nm-new ] ; then \
+    echo $$r/binutils/nm-new ; \
+  elif [ -f $$r/gcc/xgcc ]; then \
+    $(CC_FOR_TARGET) -print-prog-name=nm ; \
+  else \
+    if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+      echo $(NM); \
+    else \
+       t='$(program_transform_name)'; echo nm | sed -e 's/x/x/' $$t ; \
+    fi; \
+  fi`
 
-@if bfd
-HOST_LIB_PATH_bfd = \
-  $$r/$(HOST_SUBDIR)/bfd/.:$$r/$(HOST_SUBDIR)/prev-bfd/.:
-@endif bfd
+# The first rule in the file had better be this one.  Don't put any above it.
+# This lives here to allow makefile fragments to contain dependencies.
+all: all.normal
+.PHONY: all
 
-@if opcodes
-HOST_LIB_PATH_opcodes = \
-  $$r/$(HOST_SUBDIR)/opcodes/.:$$r/$(HOST_SUBDIR)/prev-opcodes/.:
-@endif opcodes
+# These can be overridden by config/mt-*.
+# The _TARGET_ is because they're specified in mt-foo.
+# The _HOST_ is because they're programs that run on the host.
+EXTRA_TARGET_HOST_ALL_MODULES =
+EXTRA_TARGET_HOST_INSTALL_MODULES =
+EXTRA_TARGET_HOST_CHECK_MODULES =
 
+#### host and target specific makefile fragments come in here.
+###
 
 # Flags to pass down to all sub-makes.
+# Please keep these in alphabetical order.
 BASE_FLAGS_TO_PASS = \
-	"DESTDIR=$(DESTDIR)" \
+	"AR_FLAGS=$(AR_FLAGS)" \
+	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
+	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
+	"BISON=$(BISON)" \
+	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
+	"CFLAGS=$(CFLAGS)" \
+	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+	"CHILLFLAGS=$(CHILLFLAGS)" \
+	"CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
+	"CHILL_LIB=$(CHILL_LIB)" \
+	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
+	"CXXFLAGS=$(CXXFLAGS)" \
+	"CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
+	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
+	"DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
+	"INSTALL=$(INSTALL)" \
+	"INSTALL_DATA=$(INSTALL_DATA)" \
+	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+	"LDFLAGS=$(LDFLAGS)" \
+	"LEX=$(LEX)" \
+	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
+	"LIBCFLAGS=$(LIBCFLAGS)" \
+	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+	"LIBCXXFLAGS=$(LIBCXXFLAGS)" \
+	"LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
+	"M4=$(M4)" \
+	"MAKE=$(MAKE)" \
+	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
+	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
 	"RPATH_ENVVAR=$(RPATH_ENVVAR)" \
+	"SHELL=$(SHELL)" \
+	"EXPECT=$(EXPECT)" \
+	"RUNTEST=$(RUNTEST)" \
+	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
 	"TARGET_SUBDIR=$(TARGET_SUBDIR)" \
+	"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
+	"YACC=$(YACC)" \
 	"bindir=$(bindir)" \
 	"datadir=$(datadir)" \
 	"exec_prefix=$(exec_prefix)" \
@@ -418,66 +402,23 @@ BASE_FLAGS_TO_PASS = \
 	"sysconfdir=$(sysconfdir)" \
 	"tooldir=$(tooldir)" \
 	"build_tooldir=$(build_tooldir)" \
+	"gxx_include_dir=$(gxx_include_dir)" \
+	"gcc_version=$(gcc_version)" \
+	"gcc_version_trigger=$(gcc_version_trigger)" \
 	"target_alias=$(target_alias)" \
-	"BISON=$(BISON)" \
-	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
-	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
-	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
-	"EXPECT=$(EXPECT)" \
-	"FLEX=$(FLEX)" \
-	"INSTALL=$(INSTALL)" \
-	"INSTALL_DATA=$(INSTALL_DATA)" \
-	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-	"LEX=$(LEX)" \
-	"M4=$(M4)" \
-	"MAKE=$(MAKE)" \
-	"RUNTEST=$(RUNTEST)" \
-	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
-	"SHELL=$(SHELL)" \
-	"YACC=$(YACC)" \
-	"`echo 'ADAFLAGS=$(ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"AR_FLAGS=$(AR_FLAGS)" \
-	"`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"BOOT_CFLAGS=$(BOOT_CFLAGS)" \
-	"BOOT_LDFLAGS=$(BOOT_LDFLAGS)" \
-	"CFLAGS=$(CFLAGS)" \
-	"CXXFLAGS=$(CXXFLAGS)" \
-	"LDFLAGS=$(LDFLAGS)" \
-	"LIBCFLAGS=$(LIBCFLAGS)" \
-	"LIBCXXFLAGS=$(LIBCXXFLAGS)" \
-	"STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \
-	"STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \
-	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
-	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
-	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
-	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-	"CPPFLAGS_FOR_TARGET=$(CPPFLAGS_FOR_TARGET)" \
-	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
-	"CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
-	"DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
-	"GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
-	"GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
-	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
-	"LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
-	"LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
-	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
-	"LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
-	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
-	"OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET)" \
-	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
-	"STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \
-	"WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \
-	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"LEAN=$(LEAN)" \
-	"CONFIG_SHELL=$(SHELL)" \
-	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
+	"libsubdir=$(libsubdir)"
 
-# We leave this in just in case, but it is not needed anymore.
-RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS)
+# For any flags above that may contain shell code that varies from one
+# target library to another.  When doing recursive invocations of the
+# top-level Makefile, we don't want the outer make to evaluate them,
+# so we pass these variables down unchanged.  They must not contain
+# single nor double quotes.
+RECURSE_FLAGS = \
+	CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)'
 
 # Flags to pass down to most sub-makes, in which we're building with
 # the host environment.
+# If any variables are added here, they must be added to do-*, below.
 EXTRA_HOST_FLAGS = \
 	'AR=$(AR)' \
 	'AS=$(AS)' \
@@ -485,11 +426,8 @@ EXTRA_HOST_FLAGS = \
 	'CXX=$(CXX)' \
 	'DLLTOOL=$(DLLTOOL)' \
 	'LD=$(LD)' \
-	'LIPO=$(LIPO)' \
 	'NM=$(NM)' \
-	'OBJDUMP=$(OBJDUMP)' \
 	'RANLIB=$(RANLIB)' \
-	'STRIP=$(STRIP)' \
 	'WINDRES=$(WINDRES)'
 
 FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
@@ -507,23 +445,21 @@ X11_FLAGS_TO_PASS = \
 	'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)'
 
 # Flags to pass down to makes which are built with the target environment.
-# The double $ decreases the length of the command line; those variables
-# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
-# COMPILER_ prefixed variables are not passed down so we expand them here.
+# The double $ decreases the length of the command line; the variables
+# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.
+# If any variables are added here, they must be added to do-*, below.
 EXTRA_TARGET_FLAGS = \
 	'AR=$$(AR_FOR_TARGET)' \
-	'AS=$(COMPILER_AS_FOR_TARGET)' \
+	'AS=$$(AS_FOR_TARGET)' \
 	'CC=$$(CC_FOR_TARGET)' \
 	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
 	'CXX=$$(CXX_FOR_TARGET)' \
 	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
-	'LD=$(COMPILER_LD_FOR_TARGET)' \
-	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
+	'LD=$$(LD_FOR_TARGET)' \
 	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
 	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
-	'NM=$(COMPILER_NM_FOR_TARGET)' \
-	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
+	'NM=$$(NM_FOR_TARGET)' \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
 	'WINDRES=$$(WINDRES_FOR_TARGET)'
 
@@ -533,1321 +469,598 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
 # unfortunately needs the native compiler and the target ar and
 # ranlib.
 # If any variables are added here, they must be added to do-*, below.
-# The BUILD_* variables are a special case, which are used for the gcc
+# The HOST_* variables are a special case, which are used for the gcc
 # cross-building scheme.
 EXTRA_GCC_FLAGS = \
+	'AR=$(AR)' \
+	'AS=$(AS)' \
+	'CC=$(CC)' \
+	'CXX=$(CXX)' \
+	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
+	'HOST_CC=$(CC_FOR_BUILD)' \
+	'HOST_PREFIX=$(HOST_PREFIX)' \
+	'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
+	'NM=$(NM)' \
+	'RANLIB=$(RANLIB)' \
+	'WINDRES=$$(WINDRES_FOR_TARGET)' \
 	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
-	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
-
-GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
-
-.PHONY: configure-host
-configure-host:  \
-    maybe-configure-ash \
-    maybe-configure-autoconf \
-    maybe-configure-automake \
-    maybe-configure-bash \
-    maybe-configure-bfd \
-    maybe-configure-opcodes \
-    maybe-configure-binutils \
-    maybe-configure-bison \
-    maybe-configure-byacc \
-    maybe-configure-bzip2 \
-    maybe-configure-dejagnu \
-    maybe-configure-diff \
-    maybe-configure-dosutils \
-    maybe-configure-etc \
-    maybe-configure-fastjar \
-    maybe-configure-fileutils \
-    maybe-configure-findutils \
-    maybe-configure-find \
-    maybe-configure-fixincludes \
-    maybe-configure-flex \
-    maybe-configure-gas \
-    maybe-configure-gcc \
-    maybe-configure-gawk \
-    maybe-configure-gettext \
-    maybe-configure-gnuserv \
-    maybe-configure-gprof \
-    maybe-configure-gzip \
-    maybe-configure-hello \
-    maybe-configure-indent \
-    maybe-configure-intl \
-    maybe-configure-tcl \
-    maybe-configure-itcl \
-    maybe-configure-ld \
-    maybe-configure-libcpp \
-    maybe-configure-libdecnumber \
-    maybe-configure-libgui \
-    maybe-configure-libiberty \
-    maybe-configure-libtool \
-    maybe-configure-m4 \
-    maybe-configure-make \
-    maybe-configure-mmalloc \
-    maybe-configure-patch \
-    maybe-configure-perl \
-    maybe-configure-prms \
-    maybe-configure-rcs \
-    maybe-configure-readline \
-    maybe-configure-release \
-    maybe-configure-recode \
-    maybe-configure-sed \
-    maybe-configure-send-pr \
-    maybe-configure-shellutils \
-    maybe-configure-sid \
-    maybe-configure-sim \
-    maybe-configure-tar \
-    maybe-configure-texinfo \
-    maybe-configure-textutils \
-    maybe-configure-time \
-    maybe-configure-uudecode \
-    maybe-configure-wdiff \
-    maybe-configure-zip \
-    maybe-configure-zlib \
-    maybe-configure-gdb \
-    maybe-configure-expect \
-    maybe-configure-guile \
-    maybe-configure-tk \
-    maybe-configure-libtermcap \
-    maybe-configure-utils \
-    maybe-configure-gnattools
-.PHONY: configure-target
-configure-target:  \
-    maybe-configure-target-libstdc++-v3 \
-    maybe-configure-target-libmudflap \
-    maybe-configure-target-libssp \
-    maybe-configure-target-libgcc-math \
-    maybe-configure-target-newlib \
-    maybe-configure-target-libgfortran \
-    maybe-configure-target-libobjc \
-    maybe-configure-target-libtermcap \
-    maybe-configure-target-winsup \
-    maybe-configure-target-libgloss \
-    maybe-configure-target-libiberty \
-    maybe-configure-target-gperf \
-    maybe-configure-target-examples \
-    maybe-configure-target-libffi \
-    maybe-configure-target-libjava \
-    maybe-configure-target-zlib \
-    maybe-configure-target-boehm-gc \
-    maybe-configure-target-qthreads \
-    maybe-configure-target-rda \
-    maybe-configure-target-libada \
-    maybe-configure-target-libgomp
-
-# The target built for a native non-bootstrap build.
-.PHONY: all
-all:
-@if gcc-bootstrap
-	[ -f stage_final ] || echo stage3 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) `cat stage_final`-bubble
-@endif gcc-bootstrap
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if [ -f stage_last ]; then \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
-	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
-	fi
-
-.PHONY: all-build
-
-all-build: maybe-all-build-libiberty
-all-build: maybe-all-build-bison
-all-build: maybe-all-build-byacc
-all-build: maybe-all-build-flex
-all-build: maybe-all-build-m4
-all-build: maybe-all-build-texinfo
-all-build: maybe-all-build-fixincludes
-
-.PHONY: all-host
-
-all-host: maybe-all-ash
-all-host: maybe-all-autoconf
-all-host: maybe-all-automake
-all-host: maybe-all-bash
-@if bfd-no-bootstrap
-all-host: maybe-all-bfd
-@endif bfd-no-bootstrap
-@if opcodes-no-bootstrap
-all-host: maybe-all-opcodes
-@endif opcodes-no-bootstrap
-@if binutils-no-bootstrap
-all-host: maybe-all-binutils
-@endif binutils-no-bootstrap
-all-host: maybe-all-bison
-all-host: maybe-all-byacc
-all-host: maybe-all-bzip2
-all-host: maybe-all-dejagnu
-all-host: maybe-all-diff
-all-host: maybe-all-dosutils
-all-host: maybe-all-etc
-all-host: maybe-all-fastjar
-all-host: maybe-all-fileutils
-all-host: maybe-all-findutils
-all-host: maybe-all-find
-all-host: maybe-all-fixincludes
-all-host: maybe-all-flex
-@if gas-no-bootstrap
-all-host: maybe-all-gas
-@endif gas-no-bootstrap
-@if gcc-no-bootstrap
-all-host: maybe-all-gcc
-@endif gcc-no-bootstrap
-all-host: maybe-all-gawk
-all-host: maybe-all-gettext
-all-host: maybe-all-gnuserv
-all-host: maybe-all-gprof
-all-host: maybe-all-gzip
-all-host: maybe-all-hello
-all-host: maybe-all-indent
-@if intl-no-bootstrap
-all-host: maybe-all-intl
-@endif intl-no-bootstrap
-all-host: maybe-all-tcl
-all-host: maybe-all-itcl
-@if ld-no-bootstrap
-all-host: maybe-all-ld
-@endif ld-no-bootstrap
-@if libcpp-no-bootstrap
-all-host: maybe-all-libcpp
-@endif libcpp-no-bootstrap
-@if libdecnumber-no-bootstrap
-all-host: maybe-all-libdecnumber
-@endif libdecnumber-no-bootstrap
-all-host: maybe-all-libgui
-@if libiberty-no-bootstrap
-all-host: maybe-all-libiberty
-@endif libiberty-no-bootstrap
-all-host: maybe-all-libtool
-all-host: maybe-all-m4
-all-host: maybe-all-make
-all-host: maybe-all-mmalloc
-all-host: maybe-all-patch
-all-host: maybe-all-perl
-all-host: maybe-all-prms
-all-host: maybe-all-rcs
-all-host: maybe-all-readline
-all-host: maybe-all-release
-all-host: maybe-all-recode
-all-host: maybe-all-sed
-all-host: maybe-all-send-pr
-all-host: maybe-all-shellutils
-all-host: maybe-all-sid
-all-host: maybe-all-sim
-all-host: maybe-all-tar
-all-host: maybe-all-texinfo
-all-host: maybe-all-textutils
-all-host: maybe-all-time
-all-host: maybe-all-uudecode
-all-host: maybe-all-wdiff
-all-host: maybe-all-zip
-@if zlib-no-bootstrap
-all-host: maybe-all-zlib
-@endif zlib-no-bootstrap
-all-host: maybe-all-gdb
-all-host: maybe-all-expect
-all-host: maybe-all-guile
-all-host: maybe-all-tk
-all-host: maybe-all-libtermcap
-all-host: maybe-all-utils
-all-host: maybe-all-gnattools
-
-.PHONY: all-target
-
-all-target: maybe-all-target-libstdc++-v3
-all-target: maybe-all-target-libmudflap
-all-target: maybe-all-target-libssp
-all-target: maybe-all-target-libgcc-math
-all-target: maybe-all-target-newlib
-all-target: maybe-all-target-libgfortran
-all-target: maybe-all-target-libobjc
-all-target: maybe-all-target-libtermcap
-all-target: maybe-all-target-winsup
-all-target: maybe-all-target-libgloss
-all-target: maybe-all-target-libiberty
-all-target: maybe-all-target-gperf
-all-target: maybe-all-target-examples
-all-target: maybe-all-target-libffi
-all-target: maybe-all-target-libjava
-all-target: maybe-all-target-zlib
-all-target: maybe-all-target-boehm-gc
-all-target: maybe-all-target-qthreads
-all-target: maybe-all-target-rda
-all-target: maybe-all-target-libada
-all-target: maybe-all-target-libgomp
+	"`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIBGCC1_TEST=$(LIBGCC1_TEST)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'ENQUIRE=$(ENQUIRE)' | sed -e s/.*=$$/XFOO=/`" \
+	"`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s/.*=$$/XFOO=/`"
+
+GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
+
+# This is a list of the targets for all of the modules which are compiled
+# using the build machine's native compiler.  Configure edits the second
+# macro for build!=host builds.
+ALL_BUILD_MODULES_LIST = \
+	all-build-libiberty
+ALL_BUILD_MODULES = 
+
+# This is a list of the configure targets for all of the modules which
+# are compiled using the native tools.
+CONFIGURE_BUILD_MODULES = \
+	configure-build-libiberty
+
+# This is a list of the targets for all of the modules which are compiled
+# using $(FLAGS_TO_PASS).
+ALL_MODULES = \
+	all-apache \
+	all-ash \
+	all-autoconf \
+	all-automake \
+	all-bash \
+	all-bfd \
+	all-binutils \
+	all-bison \
+	all-byacc \
+	all-bzip2 \
+	all-cgen \
+	all-cvssrc \
+	all-db \
+	all-dejagnu \
+	all-diff \
+	all-dosutils \
+	all-etc \
+	all-fileutils \
+	all-findutils \
+	all-find \
+	all-flex \
+	all-gas \
+	all-gawk \
+	all-gettext \
+	all-gnuserv \
+	all-gprof \
+	all-grep \
+	all-grez \
+	all-gzip \
+	all-hello \
+	all-indent \
+	all-inet \
+	all-intl \
+	all-ispell \
+	all-itcl \
+	all-ld \
+	all-libgui \
+	all-libiberty \
+	all-libtool \
+	all-m4 \
+	all-make \
+	all-mmalloc \
+	all-opcodes \
+	all-patch \
+	all-perl \
+	all-prms \
+	all-rcs \
+	all-readline \
+	all-release \
+	all-recode \
+	all-sed \
+	all-send-pr \
+	all-shellutils \
+	all-sid \
+	all-sim \
+	all-snavigator \
+	all-tar \
+	all-tcl \
+	all-tcl8.1 \
+	all-texinfo \
+	all-textutils \
+	all-tgas \
+	all-time \
+	all-uudecode \
+	all-wdiff \
+	all-zip \
+	all-zlib \
+	$(EXTRA_TARGET_HOST_ALL_MODULES)
+
+# This is a list of the check targets for all of the modules which are
+# compiled using $(FLAGS_TO_PASS).
+#
+# The list is in two parts.  The first lists those tools which
+# are tested as part of the host's native tool-chain, and not
+# tested in a cross configuration.
+NATIVE_CHECK_MODULES = \
+	check-bison \
+	check-byacc \
+	check-flex \
+	check-zip
+
+CROSS_CHECK_MODULES = \
+	check-apache \
+	check-ash \
+	check-autoconf \
+	check-automake \
+	check-bash \
+	check-bfd \
+	check-binutils \
+	check-bzip2 \
+	check-cgen \
+	check-cvssrc \
+	check-db \
+	check-dejagnu \
+	check-diff \
+	check-etc \
+	check-fileutils \
+	check-findutils \
+	check-find \
+	check-gas \
+	check-gawk \
+	check-gettext \
+	check-gnuserv \
+	check-gprof \
+	check-grep \
+	check-gzip \
+	check-hello \
+	check-indent \
+	check-inet \
+	check-intl \
+	check-ispell \
+	check-itcl \
+	check-ld \
+	check-libgui \
+	check-libiberty \
+	check-libtool \
+	check-m4 \
+	check-make \
+	check-mmcheckoc \
+	check-opcodes \
+	check-patch \
+	check-perl \
+	check-prms \
+	check-rcs \
+	check-readline \
+	check-recode \
+	check-sed \
+	check-send-pr \
+	check-shellutils \
+	check-snavigator \
+	check-sid \
+	check-sim \
+	check-tar \
+	check-tcl \
+	check-texinfo \
+	check-textutils \
+	check-tgas \
+	check-time \
+	check-uudecode \
+	check-wdiff \
+	$(EXTRA_TARGET_HOST_CHECK_MODULES)
+
+CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
+
+# This is a list of the install targets for all of the modules which are
+# compiled using $(FLAGS_TO_PASS).
+# We put install-opcodes before install-binutils because the installed
+# binutils might be on PATH, and they might need the shared opcodes
+# library.
+# We put install-tcl before install-itcl because itcl wants to run a
+# program on installation which uses the Tcl libraries.
+INSTALL_MODULES = \
+	install-apache \
+	install-ash \
+	install-autoconf \
+	install-automake \
+	install-bash \
+	install-bfd \
+	install-bzip2 \
+	install-opcodes \
+	install-binutils \
+	install-bison \
+	install-byacc \
+	install-cgen \
+	install-cvssrc \
+	install-db \
+	install-dejagnu \
+	install-diff \
+	install-dosutils \
+	install-etc \
+	install-fileutils \
+	install-findutils \
+	install-find \
+	install-flex \
+	install-gas \
+	install-gawk \
+	install-gettext \
+	install-gnuserv \
+	install-gprof \
+	install-grep \
+	install-grez \
+	install-gzip \
+	install-hello \
+	install-indent \
+	install-inet \
+	install-intl \
+	install-ispell \
+	install-tcl \
+	install-tcl8.1 \
+	install-itcl \
+	install-ld \
+	install-libgui \
+	install-libiberty \
+	install-libtool \
+	install-m4 \
+	install-make \
+	install-mmalloc \
+	install-patch \
+	install-perl \
+	install-prms \
+	install-rcs \
+	install-readline \
+	install-recode \
+	install-sed \
+	install-send-pr \
+	install-shellutils \
+	install-sid \
+	install-sim \
+	install-snavigator \
+	install-tar \
+	install-textutils \
+	install-tgas \
+	install-time \
+	install-uudecode \
+	install-wdiff \
+	install-zip \
+	$(EXTRA_TARGET_HOST_INSTALL_MODULES)
+
+# This is a list of the targets for all of the modules which are compiled
+# using $(X11_FLAGS_TO_PASS).
+ALL_X11_MODULES = \
+	all-emacs \
+	all-emacs19 \
+	all-gdb \
+	all-expect \
+	all-gash \
+	all-guile \
+	all-tclX \
+	all-tk \
+	all-tk8.1 \
+	all-tix
+
+# This is a list of the check targets for all of the modules which are
+# compiled using $(X11_FLAGS_TO_PASS).
+CHECK_X11_MODULES = \
+	check-emacs \
+	check-gdb \
+	check-guile \
+	check-expect \
+	check-gash \
+	check-tclX \
+	check-tk \
+	check-tix
+
+# This is a list of the install targets for all the modules which are
+# compiled using $(X11_FLAGS_TO_PASS).
+INSTALL_X11_MODULES = \
+	install-emacs \
+	install-emacs19 \
+	install-gdb \
+	install-guile \
+	install-expect \
+	install-gash \
+	install-tclX \
+	install-tk \
+	install-tk8.1 \
+	install-tix
+
+# This is a list of the targets for all of the modules which are compiled
+# using $(TARGET_FLAGS_TO_PASS).
+ALL_TARGET_MODULES = \
+	all-target-libio \
+	all-target-libstdc++ \
+	all-target-libstdc++-v3 \
+	all-target-librx \
+	all-target-libg++ \
+	all-target-newlib \
+	all-target-libf2c \
+	all-target-libchill \
+	all-target-libobjc \
+	all-target-libtermcap \
+	all-target-winsup \
+	all-target-libgloss \
+	all-target-libiberty \
+	all-target-gperf \
+	all-target-examples \
+	all-target-libstub \
+	all-target-libffi \
+	all-target-libjava \
+	all-target-zlib \
+	all-target-boehm-gc \
+	all-target-qthreads \
+	all-target-bsp \
+	all-target-cygmon
+
+# This is a list of the configure targets for all of the modules which
+# are compiled using the target tools.
+CONFIGURE_TARGET_MODULES = \
+	configure-target-libio \
+	configure-target-libstdc++ \
+	configure-target-libstdc++-v3 \
+	configure-target-librx \
+	configure-target-libg++ \
+	configure-target-newlib \
+	configure-target-libf2c \
+	configure-target-libchill \
+	configure-target-libobjc \
+	configure-target-libtermcap \
+	configure-target-winsup \
+	configure-target-libgloss \
+	configure-target-libiberty \
+	configure-target-gperf \
+	configure-target-examples \
+	configure-target-libstub \
+	configure-target-libffi \
+	configure-target-libjava \
+	configure-target-zlib \
+	configure-target-boehm-gc \
+	configure-target-qthreads \
+	configure-target-bsp \
+	configure-target-cygmon
+
+# This is a list of the check targets for all of the modules which are
+# compiled using $(TARGET_FLAGS_TO_PASS).
+CHECK_TARGET_MODULES = \
+	check-target-libio \
+	check-target-libstdc++ \
+	check-target-libstdc++-v3 \
+	check-target-libg++ \
+	check-target-newlib \
+	check-target-libf2c \
+	check-target-libchill \
+	check-target-libobjc \
+	check-target-winsup \
+	check-target-libiberty \
+	check-target-libffi \
+	check-target-libjava \
+	check-target-zlib \
+	check-target-boehm-gc \
+	check-target-qthreads \
+	check-target-gperf
+
+# This is a list of the install targets for all of the modules which are
+# compiled using $(TARGET_FLAGS_TO_PASS).
+INSTALL_TARGET_MODULES = \
+	install-target-libio \
+	install-target-libstdc++ \
+	install-target-libstdc++-v3 \
+	install-target-libg++ \
+	install-target-newlib \
+	install-target-libf2c \
+	install-target-libchill \
+	install-target-libobjc \
+	install-target-libtermcap \
+	install-target-winsup \
+	install-target-libgloss \
+	install-target-libiberty \
+	install-target-bsp \
+	install-target-libjava \
+	install-target-zlib \
+	install-target-boehm-gc \
+	install-target-qthreads \
+	install-target-gperf
+
+# This is a list of the targets for which we can do a clean-{target}.
+CLEAN_MODULES = \
+	clean-apache \
+	clean-ash \
+	clean-autoconf \
+	clean-automake \
+	clean-bash \
+	clean-bfd \
+	clean-binutils \
+	clean-bison \
+	clean-byacc \
+	clean-bzip2 \
+	clean-cgen \
+	clean-cvssrc \
+	clean-db \
+	clean-dejagnu \
+	clean-diff \
+	clean-dosutils \
+	clean-etc \
+	clean-fileutils \
+	clean-findutils \
+	clean-find \
+	clean-flex \
+	clean-gas \
+	clean-gawk \
+	clean-gettext \
+	clean-gnuserv \
+	clean-gprof \
+	clean-grep \
+	clean-grez \
+	clean-gzip \
+	clean-hello \
+	clean-indent \
+	clean-inet \
+	clean-intl \
+	clean-ispell \
+	clean-itcl \
+	clean-ld \
+	clean-libgui \
+	clean-libiberty \
+	clean-libtool \
+	clean-m4 \
+	clean-make \
+	clean-mmalloc \
+	clean-opcodes \
+	clean-patch \
+	clean-perl \
+	clean-prms \
+	clean-rcs \
+	clean-readline \
+	clean-release \
+	clean-recode \
+	clean-sed \
+	clean-send-pr \
+	clean-shellutils \
+	clean-sid \
+	clean-sim \
+	clean-snavigator \
+	clean-tar \
+	clean-tcl \
+	clean-texinfo \
+	clean-textutils \
+	clean-tgas \
+	clean-time \
+	clean-uudecode \
+	clean-wdiff \
+	clean-zip \
+	clean-zlib
+
+# All of the target modules that can be cleaned
+CLEAN_TARGET_MODULES = \
+	clean-target-libio \
+	clean-target-libstdc++ \
+	clean-target-libstdc++-v3 \
+	clean-target-librx \
+	clean-target-libg++ \
+	clean-target-newlib \
+	clean-target-libf2c \
+	clean-target-libchill \
+	clean-target-libobjc \
+	clean-target-winsup \
+	clean-target-libgloss \
+	clean-target-libiberty \
+	clean-target-gperf \
+	clean-target-examples \
+	clean-target-libstub \
+	clean-target-libffi \
+	clean-target-libjava \
+	clean-target-zlib \
+	clean-target-boehm-gc \
+	clean-target-qthreads \
+	clean-target-bsp \
+	clean-target-cygmon
+
+# All of the x11 modules that can be cleaned
+CLEAN_X11_MODULES = \
+	clean-emacs \
+	clean-emacs19 \
+	clean-gdb \
+	clean-expect \
+	clean-gash \
+	clean-guile \
+	clean-tclX \
+	clean-tk \
+	clean-tix
+
+# The target built for a native build.
+.PHONY: all.normal
+all.normal: \
+	$(ALL_BUILD_MODULES) \
+	$(ALL_MODULES) \
+	$(ALL_X11_MODULES) \
+	$(ALL_TARGET_MODULES) \
+	all-gcc
 
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
 # ``make X'' in all subdirectories (because, in general, there is a
 # dependency (below) of X upon do-X, a ``make X'' will also do this,
 # but it may do additional work as well).
-
-.PHONY: do-info
-do-info:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \
-	  info-target
-
-
-.PHONY: info-host
-
-info-host: maybe-info-ash
-info-host: maybe-info-autoconf
-info-host: maybe-info-automake
-info-host: maybe-info-bash
-info-host: maybe-info-bfd
-info-host: maybe-info-opcodes
-info-host: maybe-info-binutils
-info-host: maybe-info-bison
-info-host: maybe-info-byacc
-info-host: maybe-info-bzip2
-info-host: maybe-info-dejagnu
-info-host: maybe-info-diff
-info-host: maybe-info-dosutils
-info-host: maybe-info-etc
-info-host: maybe-info-fastjar
-info-host: maybe-info-fileutils
-info-host: maybe-info-findutils
-info-host: maybe-info-find
-info-host: maybe-info-fixincludes
-info-host: maybe-info-flex
-info-host: maybe-info-gas
-info-host: maybe-info-gcc
-info-host: maybe-info-gawk
-info-host: maybe-info-gettext
-info-host: maybe-info-gnuserv
-info-host: maybe-info-gprof
-info-host: maybe-info-gzip
-info-host: maybe-info-hello
-info-host: maybe-info-indent
-info-host: maybe-info-intl
-info-host: maybe-info-tcl
-info-host: maybe-info-itcl
-info-host: maybe-info-ld
-info-host: maybe-info-libcpp
-info-host: maybe-info-libdecnumber
-info-host: maybe-info-libgui
-info-host: maybe-info-libiberty
-info-host: maybe-info-libtool
-info-host: maybe-info-m4
-info-host: maybe-info-make
-info-host: maybe-info-mmalloc
-info-host: maybe-info-patch
-info-host: maybe-info-perl
-info-host: maybe-info-prms
-info-host: maybe-info-rcs
-info-host: maybe-info-readline
-info-host: maybe-info-release
-info-host: maybe-info-recode
-info-host: maybe-info-sed
-info-host: maybe-info-send-pr
-info-host: maybe-info-shellutils
-info-host: maybe-info-sid
-info-host: maybe-info-sim
-info-host: maybe-info-tar
-info-host: maybe-info-texinfo
-info-host: maybe-info-textutils
-info-host: maybe-info-time
-info-host: maybe-info-uudecode
-info-host: maybe-info-wdiff
-info-host: maybe-info-zip
-info-host: maybe-info-zlib
-info-host: maybe-info-gdb
-info-host: maybe-info-expect
-info-host: maybe-info-guile
-info-host: maybe-info-tk
-info-host: maybe-info-libtermcap
-info-host: maybe-info-utils
-info-host: maybe-info-gnattools
-
-.PHONY: info-target
-
-info-target: maybe-info-target-libstdc++-v3
-info-target: maybe-info-target-libmudflap
-info-target: maybe-info-target-libssp
-info-target: maybe-info-target-libgcc-math
-info-target: maybe-info-target-newlib
-info-target: maybe-info-target-libgfortran
-info-target: maybe-info-target-libobjc
-info-target: maybe-info-target-libtermcap
-info-target: maybe-info-target-winsup
-info-target: maybe-info-target-libgloss
-info-target: maybe-info-target-libiberty
-info-target: maybe-info-target-gperf
-info-target: maybe-info-target-examples
-info-target: maybe-info-target-libffi
-info-target: maybe-info-target-libjava
-info-target: maybe-info-target-zlib
-info-target: maybe-info-target-boehm-gc
-info-target: maybe-info-target-qthreads
-info-target: maybe-info-target-rda
-info-target: maybe-info-target-libada
-info-target: maybe-info-target-libgomp
-
-.PHONY: do-dvi
-do-dvi:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \
-	  dvi-target
-
-
-.PHONY: dvi-host
-
-dvi-host: maybe-dvi-ash
-dvi-host: maybe-dvi-autoconf
-dvi-host: maybe-dvi-automake
-dvi-host: maybe-dvi-bash
-dvi-host: maybe-dvi-bfd
-dvi-host: maybe-dvi-opcodes
-dvi-host: maybe-dvi-binutils
-dvi-host: maybe-dvi-bison
-dvi-host: maybe-dvi-byacc
-dvi-host: maybe-dvi-bzip2
-dvi-host: maybe-dvi-dejagnu
-dvi-host: maybe-dvi-diff
-dvi-host: maybe-dvi-dosutils
-dvi-host: maybe-dvi-etc
-dvi-host: maybe-dvi-fastjar
-dvi-host: maybe-dvi-fileutils
-dvi-host: maybe-dvi-findutils
-dvi-host: maybe-dvi-find
-dvi-host: maybe-dvi-fixincludes
-dvi-host: maybe-dvi-flex
-dvi-host: maybe-dvi-gas
-dvi-host: maybe-dvi-gcc
-dvi-host: maybe-dvi-gawk
-dvi-host: maybe-dvi-gettext
-dvi-host: maybe-dvi-gnuserv
-dvi-host: maybe-dvi-gprof
-dvi-host: maybe-dvi-gzip
-dvi-host: maybe-dvi-hello
-dvi-host: maybe-dvi-indent
-dvi-host: maybe-dvi-intl
-dvi-host: maybe-dvi-tcl
-dvi-host: maybe-dvi-itcl
-dvi-host: maybe-dvi-ld
-dvi-host: maybe-dvi-libcpp
-dvi-host: maybe-dvi-libdecnumber
-dvi-host: maybe-dvi-libgui
-dvi-host: maybe-dvi-libiberty
-dvi-host: maybe-dvi-libtool
-dvi-host: maybe-dvi-m4
-dvi-host: maybe-dvi-make
-dvi-host: maybe-dvi-mmalloc
-dvi-host: maybe-dvi-patch
-dvi-host: maybe-dvi-perl
-dvi-host: maybe-dvi-prms
-dvi-host: maybe-dvi-rcs
-dvi-host: maybe-dvi-readline
-dvi-host: maybe-dvi-release
-dvi-host: maybe-dvi-recode
-dvi-host: maybe-dvi-sed
-dvi-host: maybe-dvi-send-pr
-dvi-host: maybe-dvi-shellutils
-dvi-host: maybe-dvi-sid
-dvi-host: maybe-dvi-sim
-dvi-host: maybe-dvi-tar
-dvi-host: maybe-dvi-texinfo
-dvi-host: maybe-dvi-textutils
-dvi-host: maybe-dvi-time
-dvi-host: maybe-dvi-uudecode
-dvi-host: maybe-dvi-wdiff
-dvi-host: maybe-dvi-zip
-dvi-host: maybe-dvi-zlib
-dvi-host: maybe-dvi-gdb
-dvi-host: maybe-dvi-expect
-dvi-host: maybe-dvi-guile
-dvi-host: maybe-dvi-tk
-dvi-host: maybe-dvi-libtermcap
-dvi-host: maybe-dvi-utils
-dvi-host: maybe-dvi-gnattools
-
-.PHONY: dvi-target
-
-dvi-target: maybe-dvi-target-libstdc++-v3
-dvi-target: maybe-dvi-target-libmudflap
-dvi-target: maybe-dvi-target-libssp
-dvi-target: maybe-dvi-target-libgcc-math
-dvi-target: maybe-dvi-target-newlib
-dvi-target: maybe-dvi-target-libgfortran
-dvi-target: maybe-dvi-target-libobjc
-dvi-target: maybe-dvi-target-libtermcap
-dvi-target: maybe-dvi-target-winsup
-dvi-target: maybe-dvi-target-libgloss
-dvi-target: maybe-dvi-target-libiberty
-dvi-target: maybe-dvi-target-gperf
-dvi-target: maybe-dvi-target-examples
-dvi-target: maybe-dvi-target-libffi
-dvi-target: maybe-dvi-target-libjava
-dvi-target: maybe-dvi-target-zlib
-dvi-target: maybe-dvi-target-boehm-gc
-dvi-target: maybe-dvi-target-qthreads
-dvi-target: maybe-dvi-target-rda
-dvi-target: maybe-dvi-target-libada
-dvi-target: maybe-dvi-target-libgomp
-
-.PHONY: do-html
-do-html:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \
-	  html-target
-
-
-.PHONY: html-host
-
-html-host: maybe-html-ash
-html-host: maybe-html-autoconf
-html-host: maybe-html-automake
-html-host: maybe-html-bash
-html-host: maybe-html-bfd
-html-host: maybe-html-opcodes
-html-host: maybe-html-binutils
-html-host: maybe-html-bison
-html-host: maybe-html-byacc
-html-host: maybe-html-bzip2
-html-host: maybe-html-dejagnu
-html-host: maybe-html-diff
-html-host: maybe-html-dosutils
-html-host: maybe-html-etc
-html-host: maybe-html-fastjar
-html-host: maybe-html-fileutils
-html-host: maybe-html-findutils
-html-host: maybe-html-find
-html-host: maybe-html-fixincludes
-html-host: maybe-html-flex
-html-host: maybe-html-gas
-html-host: maybe-html-gcc
-html-host: maybe-html-gawk
-html-host: maybe-html-gettext
-html-host: maybe-html-gnuserv
-html-host: maybe-html-gprof
-html-host: maybe-html-gzip
-html-host: maybe-html-hello
-html-host: maybe-html-indent
-html-host: maybe-html-intl
-html-host: maybe-html-tcl
-html-host: maybe-html-itcl
-html-host: maybe-html-ld
-html-host: maybe-html-libcpp
-html-host: maybe-html-libdecnumber
-html-host: maybe-html-libgui
-html-host: maybe-html-libiberty
-html-host: maybe-html-libtool
-html-host: maybe-html-m4
-html-host: maybe-html-make
-html-host: maybe-html-mmalloc
-html-host: maybe-html-patch
-html-host: maybe-html-perl
-html-host: maybe-html-prms
-html-host: maybe-html-rcs
-html-host: maybe-html-readline
-html-host: maybe-html-release
-html-host: maybe-html-recode
-html-host: maybe-html-sed
-html-host: maybe-html-send-pr
-html-host: maybe-html-shellutils
-html-host: maybe-html-sid
-html-host: maybe-html-sim
-html-host: maybe-html-tar
-html-host: maybe-html-texinfo
-html-host: maybe-html-textutils
-html-host: maybe-html-time
-html-host: maybe-html-uudecode
-html-host: maybe-html-wdiff
-html-host: maybe-html-zip
-html-host: maybe-html-zlib
-html-host: maybe-html-gdb
-html-host: maybe-html-expect
-html-host: maybe-html-guile
-html-host: maybe-html-tk
-html-host: maybe-html-libtermcap
-html-host: maybe-html-utils
-html-host: maybe-html-gnattools
-
-.PHONY: html-target
-
-html-target: maybe-html-target-libstdc++-v3
-html-target: maybe-html-target-libmudflap
-html-target: maybe-html-target-libssp
-html-target: maybe-html-target-libgcc-math
-html-target: maybe-html-target-newlib
-html-target: maybe-html-target-libgfortran
-html-target: maybe-html-target-libobjc
-html-target: maybe-html-target-libtermcap
-html-target: maybe-html-target-winsup
-html-target: maybe-html-target-libgloss
-html-target: maybe-html-target-libiberty
-html-target: maybe-html-target-gperf
-html-target: maybe-html-target-examples
-html-target: maybe-html-target-libffi
-html-target: maybe-html-target-libjava
-html-target: maybe-html-target-zlib
-html-target: maybe-html-target-boehm-gc
-html-target: maybe-html-target-qthreads
-html-target: maybe-html-target-rda
-html-target: maybe-html-target-libada
-html-target: maybe-html-target-libgomp
-
-.PHONY: do-TAGS
-do-TAGS:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \
-	  TAGS-target
-
-
-.PHONY: TAGS-host
-
-TAGS-host: maybe-TAGS-ash
-TAGS-host: maybe-TAGS-autoconf
-TAGS-host: maybe-TAGS-automake
-TAGS-host: maybe-TAGS-bash
-TAGS-host: maybe-TAGS-bfd
-TAGS-host: maybe-TAGS-opcodes
-TAGS-host: maybe-TAGS-binutils
-TAGS-host: maybe-TAGS-bison
-TAGS-host: maybe-TAGS-byacc
-TAGS-host: maybe-TAGS-bzip2
-TAGS-host: maybe-TAGS-dejagnu
-TAGS-host: maybe-TAGS-diff
-TAGS-host: maybe-TAGS-dosutils
-TAGS-host: maybe-TAGS-etc
-TAGS-host: maybe-TAGS-fastjar
-TAGS-host: maybe-TAGS-fileutils
-TAGS-host: maybe-TAGS-findutils
-TAGS-host: maybe-TAGS-find
-TAGS-host: maybe-TAGS-fixincludes
-TAGS-host: maybe-TAGS-flex
-TAGS-host: maybe-TAGS-gas
-TAGS-host: maybe-TAGS-gcc
-TAGS-host: maybe-TAGS-gawk
-TAGS-host: maybe-TAGS-gettext
-TAGS-host: maybe-TAGS-gnuserv
-TAGS-host: maybe-TAGS-gprof
-TAGS-host: maybe-TAGS-gzip
-TAGS-host: maybe-TAGS-hello
-TAGS-host: maybe-TAGS-indent
-TAGS-host: maybe-TAGS-intl
-TAGS-host: maybe-TAGS-tcl
-TAGS-host: maybe-TAGS-itcl
-TAGS-host: maybe-TAGS-ld
-TAGS-host: maybe-TAGS-libcpp
-TAGS-host: maybe-TAGS-libdecnumber
-TAGS-host: maybe-TAGS-libgui
-TAGS-host: maybe-TAGS-libiberty
-TAGS-host: maybe-TAGS-libtool
-TAGS-host: maybe-TAGS-m4
-TAGS-host: maybe-TAGS-make
-TAGS-host: maybe-TAGS-mmalloc
-TAGS-host: maybe-TAGS-patch
-TAGS-host: maybe-TAGS-perl
-TAGS-host: maybe-TAGS-prms
-TAGS-host: maybe-TAGS-rcs
-TAGS-host: maybe-TAGS-readline
-TAGS-host: maybe-TAGS-release
-TAGS-host: maybe-TAGS-recode
-TAGS-host: maybe-TAGS-sed
-TAGS-host: maybe-TAGS-send-pr
-TAGS-host: maybe-TAGS-shellutils
-TAGS-host: maybe-TAGS-sid
-TAGS-host: maybe-TAGS-sim
-TAGS-host: maybe-TAGS-tar
-TAGS-host: maybe-TAGS-texinfo
-TAGS-host: maybe-TAGS-textutils
-TAGS-host: maybe-TAGS-time
-TAGS-host: maybe-TAGS-uudecode
-TAGS-host: maybe-TAGS-wdiff
-TAGS-host: maybe-TAGS-zip
-TAGS-host: maybe-TAGS-zlib
-TAGS-host: maybe-TAGS-gdb
-TAGS-host: maybe-TAGS-expect
-TAGS-host: maybe-TAGS-guile
-TAGS-host: maybe-TAGS-tk
-TAGS-host: maybe-TAGS-libtermcap
-TAGS-host: maybe-TAGS-utils
-TAGS-host: maybe-TAGS-gnattools
-
-.PHONY: TAGS-target
-
-TAGS-target: maybe-TAGS-target-libstdc++-v3
-TAGS-target: maybe-TAGS-target-libmudflap
-TAGS-target: maybe-TAGS-target-libssp
-TAGS-target: maybe-TAGS-target-libgcc-math
-TAGS-target: maybe-TAGS-target-newlib
-TAGS-target: maybe-TAGS-target-libgfortran
-TAGS-target: maybe-TAGS-target-libobjc
-TAGS-target: maybe-TAGS-target-libtermcap
-TAGS-target: maybe-TAGS-target-winsup
-TAGS-target: maybe-TAGS-target-libgloss
-TAGS-target: maybe-TAGS-target-libiberty
-TAGS-target: maybe-TAGS-target-gperf
-TAGS-target: maybe-TAGS-target-examples
-TAGS-target: maybe-TAGS-target-libffi
-TAGS-target: maybe-TAGS-target-libjava
-TAGS-target: maybe-TAGS-target-zlib
-TAGS-target: maybe-TAGS-target-boehm-gc
-TAGS-target: maybe-TAGS-target-qthreads
-TAGS-target: maybe-TAGS-target-rda
-TAGS-target: maybe-TAGS-target-libada
-TAGS-target: maybe-TAGS-target-libgomp
-
-.PHONY: do-install-info
-do-install-info:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) install-info-host \
-	  install-info-target
-
-
-.PHONY: install-info-host
-
-install-info-host: maybe-install-info-ash
-install-info-host: maybe-install-info-autoconf
-install-info-host: maybe-install-info-automake
-install-info-host: maybe-install-info-bash
-install-info-host: maybe-install-info-bfd
-install-info-host: maybe-install-info-opcodes
-install-info-host: maybe-install-info-binutils
-install-info-host: maybe-install-info-bison
-install-info-host: maybe-install-info-byacc
-install-info-host: maybe-install-info-bzip2
-install-info-host: maybe-install-info-dejagnu
-install-info-host: maybe-install-info-diff
-install-info-host: maybe-install-info-dosutils
-install-info-host: maybe-install-info-etc
-install-info-host: maybe-install-info-fastjar
-install-info-host: maybe-install-info-fileutils
-install-info-host: maybe-install-info-findutils
-install-info-host: maybe-install-info-find
-install-info-host: maybe-install-info-fixincludes
-install-info-host: maybe-install-info-flex
-install-info-host: maybe-install-info-gas
-install-info-host: maybe-install-info-gcc
-install-info-host: maybe-install-info-gawk
-install-info-host: maybe-install-info-gettext
-install-info-host: maybe-install-info-gnuserv
-install-info-host: maybe-install-info-gprof
-install-info-host: maybe-install-info-gzip
-install-info-host: maybe-install-info-hello
-install-info-host: maybe-install-info-indent
-install-info-host: maybe-install-info-intl
-install-info-host: maybe-install-info-tcl
-install-info-host: maybe-install-info-itcl
-install-info-host: maybe-install-info-ld
-install-info-host: maybe-install-info-libcpp
-install-info-host: maybe-install-info-libdecnumber
-install-info-host: maybe-install-info-libgui
-install-info-host: maybe-install-info-libiberty
-install-info-host: maybe-install-info-libtool
-install-info-host: maybe-install-info-m4
-install-info-host: maybe-install-info-make
-install-info-host: maybe-install-info-mmalloc
-install-info-host: maybe-install-info-patch
-install-info-host: maybe-install-info-perl
-install-info-host: maybe-install-info-prms
-install-info-host: maybe-install-info-rcs
-install-info-host: maybe-install-info-readline
-install-info-host: maybe-install-info-release
-install-info-host: maybe-install-info-recode
-install-info-host: maybe-install-info-sed
-install-info-host: maybe-install-info-send-pr
-install-info-host: maybe-install-info-shellutils
-install-info-host: maybe-install-info-sid
-install-info-host: maybe-install-info-sim
-install-info-host: maybe-install-info-tar
-install-info-host: maybe-install-info-texinfo
-install-info-host: maybe-install-info-textutils
-install-info-host: maybe-install-info-time
-install-info-host: maybe-install-info-uudecode
-install-info-host: maybe-install-info-wdiff
-install-info-host: maybe-install-info-zip
-install-info-host: maybe-install-info-zlib
-install-info-host: maybe-install-info-gdb
-install-info-host: maybe-install-info-expect
-install-info-host: maybe-install-info-guile
-install-info-host: maybe-install-info-tk
-install-info-host: maybe-install-info-libtermcap
-install-info-host: maybe-install-info-utils
-install-info-host: maybe-install-info-gnattools
-
-.PHONY: install-info-target
-
-install-info-target: maybe-install-info-target-libstdc++-v3
-install-info-target: maybe-install-info-target-libmudflap
-install-info-target: maybe-install-info-target-libssp
-install-info-target: maybe-install-info-target-libgcc-math
-install-info-target: maybe-install-info-target-newlib
-install-info-target: maybe-install-info-target-libgfortran
-install-info-target: maybe-install-info-target-libobjc
-install-info-target: maybe-install-info-target-libtermcap
-install-info-target: maybe-install-info-target-winsup
-install-info-target: maybe-install-info-target-libgloss
-install-info-target: maybe-install-info-target-libiberty
-install-info-target: maybe-install-info-target-gperf
-install-info-target: maybe-install-info-target-examples
-install-info-target: maybe-install-info-target-libffi
-install-info-target: maybe-install-info-target-libjava
-install-info-target: maybe-install-info-target-zlib
-install-info-target: maybe-install-info-target-boehm-gc
-install-info-target: maybe-install-info-target-qthreads
-install-info-target: maybe-install-info-target-rda
-install-info-target: maybe-install-info-target-libada
-install-info-target: maybe-install-info-target-libgomp
-
-.PHONY: do-installcheck
-do-installcheck:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \
-	  installcheck-target
-
-
-.PHONY: installcheck-host
-
-installcheck-host: maybe-installcheck-ash
-installcheck-host: maybe-installcheck-autoconf
-installcheck-host: maybe-installcheck-automake
-installcheck-host: maybe-installcheck-bash
-installcheck-host: maybe-installcheck-bfd
-installcheck-host: maybe-installcheck-opcodes
-installcheck-host: maybe-installcheck-binutils
-installcheck-host: maybe-installcheck-bison
-installcheck-host: maybe-installcheck-byacc
-installcheck-host: maybe-installcheck-bzip2
-installcheck-host: maybe-installcheck-dejagnu
-installcheck-host: maybe-installcheck-diff
-installcheck-host: maybe-installcheck-dosutils
-installcheck-host: maybe-installcheck-etc
-installcheck-host: maybe-installcheck-fastjar
-installcheck-host: maybe-installcheck-fileutils
-installcheck-host: maybe-installcheck-findutils
-installcheck-host: maybe-installcheck-find
-installcheck-host: maybe-installcheck-fixincludes
-installcheck-host: maybe-installcheck-flex
-installcheck-host: maybe-installcheck-gas
-installcheck-host: maybe-installcheck-gcc
-installcheck-host: maybe-installcheck-gawk
-installcheck-host: maybe-installcheck-gettext
-installcheck-host: maybe-installcheck-gnuserv
-installcheck-host: maybe-installcheck-gprof
-installcheck-host: maybe-installcheck-gzip
-installcheck-host: maybe-installcheck-hello
-installcheck-host: maybe-installcheck-indent
-installcheck-host: maybe-installcheck-intl
-installcheck-host: maybe-installcheck-tcl
-installcheck-host: maybe-installcheck-itcl
-installcheck-host: maybe-installcheck-ld
-installcheck-host: maybe-installcheck-libcpp
-installcheck-host: maybe-installcheck-libdecnumber
-installcheck-host: maybe-installcheck-libgui
-installcheck-host: maybe-installcheck-libiberty
-installcheck-host: maybe-installcheck-libtool
-installcheck-host: maybe-installcheck-m4
-installcheck-host: maybe-installcheck-make
-installcheck-host: maybe-installcheck-mmalloc
-installcheck-host: maybe-installcheck-patch
-installcheck-host: maybe-installcheck-perl
-installcheck-host: maybe-installcheck-prms
-installcheck-host: maybe-installcheck-rcs
-installcheck-host: maybe-installcheck-readline
-installcheck-host: maybe-installcheck-release
-installcheck-host: maybe-installcheck-recode
-installcheck-host: maybe-installcheck-sed
-installcheck-host: maybe-installcheck-send-pr
-installcheck-host: maybe-installcheck-shellutils
-installcheck-host: maybe-installcheck-sid
-installcheck-host: maybe-installcheck-sim
-installcheck-host: maybe-installcheck-tar
-installcheck-host: maybe-installcheck-texinfo
-installcheck-host: maybe-installcheck-textutils
-installcheck-host: maybe-installcheck-time
-installcheck-host: maybe-installcheck-uudecode
-installcheck-host: maybe-installcheck-wdiff
-installcheck-host: maybe-installcheck-zip
-installcheck-host: maybe-installcheck-zlib
-installcheck-host: maybe-installcheck-gdb
-installcheck-host: maybe-installcheck-expect
-installcheck-host: maybe-installcheck-guile
-installcheck-host: maybe-installcheck-tk
-installcheck-host: maybe-installcheck-libtermcap
-installcheck-host: maybe-installcheck-utils
-installcheck-host: maybe-installcheck-gnattools
-
-.PHONY: installcheck-target
-
-installcheck-target: maybe-installcheck-target-libstdc++-v3
-installcheck-target: maybe-installcheck-target-libmudflap
-installcheck-target: maybe-installcheck-target-libssp
-installcheck-target: maybe-installcheck-target-libgcc-math
-installcheck-target: maybe-installcheck-target-newlib
-installcheck-target: maybe-installcheck-target-libgfortran
-installcheck-target: maybe-installcheck-target-libobjc
-installcheck-target: maybe-installcheck-target-libtermcap
-installcheck-target: maybe-installcheck-target-winsup
-installcheck-target: maybe-installcheck-target-libgloss
-installcheck-target: maybe-installcheck-target-libiberty
-installcheck-target: maybe-installcheck-target-gperf
-installcheck-target: maybe-installcheck-target-examples
-installcheck-target: maybe-installcheck-target-libffi
-installcheck-target: maybe-installcheck-target-libjava
-installcheck-target: maybe-installcheck-target-zlib
-installcheck-target: maybe-installcheck-target-boehm-gc
-installcheck-target: maybe-installcheck-target-qthreads
-installcheck-target: maybe-installcheck-target-rda
-installcheck-target: maybe-installcheck-target-libada
-installcheck-target: maybe-installcheck-target-libgomp
-
-.PHONY: do-mostlyclean
-do-mostlyclean:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \
-	  mostlyclean-target
-
-
-.PHONY: mostlyclean-host
-
-mostlyclean-host: maybe-mostlyclean-ash
-mostlyclean-host: maybe-mostlyclean-autoconf
-mostlyclean-host: maybe-mostlyclean-automake
-mostlyclean-host: maybe-mostlyclean-bash
-mostlyclean-host: maybe-mostlyclean-bfd
-mostlyclean-host: maybe-mostlyclean-opcodes
-mostlyclean-host: maybe-mostlyclean-binutils
-mostlyclean-host: maybe-mostlyclean-bison
-mostlyclean-host: maybe-mostlyclean-byacc
-mostlyclean-host: maybe-mostlyclean-bzip2
-mostlyclean-host: maybe-mostlyclean-dejagnu
-mostlyclean-host: maybe-mostlyclean-diff
-mostlyclean-host: maybe-mostlyclean-dosutils
-mostlyclean-host: maybe-mostlyclean-etc
-mostlyclean-host: maybe-mostlyclean-fastjar
-mostlyclean-host: maybe-mostlyclean-fileutils
-mostlyclean-host: maybe-mostlyclean-findutils
-mostlyclean-host: maybe-mostlyclean-find
-mostlyclean-host: maybe-mostlyclean-fixincludes
-mostlyclean-host: maybe-mostlyclean-flex
-mostlyclean-host: maybe-mostlyclean-gas
-mostlyclean-host: maybe-mostlyclean-gcc
-mostlyclean-host: maybe-mostlyclean-gawk
-mostlyclean-host: maybe-mostlyclean-gettext
-mostlyclean-host: maybe-mostlyclean-gnuserv
-mostlyclean-host: maybe-mostlyclean-gprof
-mostlyclean-host: maybe-mostlyclean-gzip
-mostlyclean-host: maybe-mostlyclean-hello
-mostlyclean-host: maybe-mostlyclean-indent
-mostlyclean-host: maybe-mostlyclean-intl
-mostlyclean-host: maybe-mostlyclean-tcl
-mostlyclean-host: maybe-mostlyclean-itcl
-mostlyclean-host: maybe-mostlyclean-ld
-mostlyclean-host: maybe-mostlyclean-libcpp
-mostlyclean-host: maybe-mostlyclean-libdecnumber
-mostlyclean-host: maybe-mostlyclean-libgui
-mostlyclean-host: maybe-mostlyclean-libiberty
-mostlyclean-host: maybe-mostlyclean-libtool
-mostlyclean-host: maybe-mostlyclean-m4
-mostlyclean-host: maybe-mostlyclean-make
-mostlyclean-host: maybe-mostlyclean-mmalloc
-mostlyclean-host: maybe-mostlyclean-patch
-mostlyclean-host: maybe-mostlyclean-perl
-mostlyclean-host: maybe-mostlyclean-prms
-mostlyclean-host: maybe-mostlyclean-rcs
-mostlyclean-host: maybe-mostlyclean-readline
-mostlyclean-host: maybe-mostlyclean-release
-mostlyclean-host: maybe-mostlyclean-recode
-mostlyclean-host: maybe-mostlyclean-sed
-mostlyclean-host: maybe-mostlyclean-send-pr
-mostlyclean-host: maybe-mostlyclean-shellutils
-mostlyclean-host: maybe-mostlyclean-sid
-mostlyclean-host: maybe-mostlyclean-sim
-mostlyclean-host: maybe-mostlyclean-tar
-mostlyclean-host: maybe-mostlyclean-texinfo
-mostlyclean-host: maybe-mostlyclean-textutils
-mostlyclean-host: maybe-mostlyclean-time
-mostlyclean-host: maybe-mostlyclean-uudecode
-mostlyclean-host: maybe-mostlyclean-wdiff
-mostlyclean-host: maybe-mostlyclean-zip
-mostlyclean-host: maybe-mostlyclean-zlib
-mostlyclean-host: maybe-mostlyclean-gdb
-mostlyclean-host: maybe-mostlyclean-expect
-mostlyclean-host: maybe-mostlyclean-guile
-mostlyclean-host: maybe-mostlyclean-tk
-mostlyclean-host: maybe-mostlyclean-libtermcap
-mostlyclean-host: maybe-mostlyclean-utils
-mostlyclean-host: maybe-mostlyclean-gnattools
-
-.PHONY: mostlyclean-target
-
-mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3
-mostlyclean-target: maybe-mostlyclean-target-libmudflap
-mostlyclean-target: maybe-mostlyclean-target-libssp
-mostlyclean-target: maybe-mostlyclean-target-libgcc-math
-mostlyclean-target: maybe-mostlyclean-target-newlib
-mostlyclean-target: maybe-mostlyclean-target-libgfortran
-mostlyclean-target: maybe-mostlyclean-target-libobjc
-mostlyclean-target: maybe-mostlyclean-target-libtermcap
-mostlyclean-target: maybe-mostlyclean-target-winsup
-mostlyclean-target: maybe-mostlyclean-target-libgloss
-mostlyclean-target: maybe-mostlyclean-target-libiberty
-mostlyclean-target: maybe-mostlyclean-target-gperf
-mostlyclean-target: maybe-mostlyclean-target-examples
-mostlyclean-target: maybe-mostlyclean-target-libffi
-mostlyclean-target: maybe-mostlyclean-target-libjava
-mostlyclean-target: maybe-mostlyclean-target-zlib
-mostlyclean-target: maybe-mostlyclean-target-boehm-gc
-mostlyclean-target: maybe-mostlyclean-target-qthreads
-mostlyclean-target: maybe-mostlyclean-target-rda
-mostlyclean-target: maybe-mostlyclean-target-libada
-mostlyclean-target: maybe-mostlyclean-target-libgomp
-
-.PHONY: do-clean
-do-clean:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \
-	  clean-target
-
-
-.PHONY: clean-host
-
-clean-host: maybe-clean-ash
-clean-host: maybe-clean-autoconf
-clean-host: maybe-clean-automake
-clean-host: maybe-clean-bash
-clean-host: maybe-clean-bfd
-clean-host: maybe-clean-opcodes
-clean-host: maybe-clean-binutils
-clean-host: maybe-clean-bison
-clean-host: maybe-clean-byacc
-clean-host: maybe-clean-bzip2
-clean-host: maybe-clean-dejagnu
-clean-host: maybe-clean-diff
-clean-host: maybe-clean-dosutils
-clean-host: maybe-clean-etc
-clean-host: maybe-clean-fastjar
-clean-host: maybe-clean-fileutils
-clean-host: maybe-clean-findutils
-clean-host: maybe-clean-find
-clean-host: maybe-clean-fixincludes
-clean-host: maybe-clean-flex
-clean-host: maybe-clean-gas
-clean-host: maybe-clean-gcc
-clean-host: maybe-clean-gawk
-clean-host: maybe-clean-gettext
-clean-host: maybe-clean-gnuserv
-clean-host: maybe-clean-gprof
-clean-host: maybe-clean-gzip
-clean-host: maybe-clean-hello
-clean-host: maybe-clean-indent
-clean-host: maybe-clean-intl
-clean-host: maybe-clean-tcl
-clean-host: maybe-clean-itcl
-clean-host: maybe-clean-ld
-clean-host: maybe-clean-libcpp
-clean-host: maybe-clean-libdecnumber
-clean-host: maybe-clean-libgui
-clean-host: maybe-clean-libiberty
-clean-host: maybe-clean-libtool
-clean-host: maybe-clean-m4
-clean-host: maybe-clean-make
-clean-host: maybe-clean-mmalloc
-clean-host: maybe-clean-patch
-clean-host: maybe-clean-perl
-clean-host: maybe-clean-prms
-clean-host: maybe-clean-rcs
-clean-host: maybe-clean-readline
-clean-host: maybe-clean-release
-clean-host: maybe-clean-recode
-clean-host: maybe-clean-sed
-clean-host: maybe-clean-send-pr
-clean-host: maybe-clean-shellutils
-clean-host: maybe-clean-sid
-clean-host: maybe-clean-sim
-clean-host: maybe-clean-tar
-clean-host: maybe-clean-texinfo
-clean-host: maybe-clean-textutils
-clean-host: maybe-clean-time
-clean-host: maybe-clean-uudecode
-clean-host: maybe-clean-wdiff
-clean-host: maybe-clean-zip
-clean-host: maybe-clean-zlib
-clean-host: maybe-clean-gdb
-clean-host: maybe-clean-expect
-clean-host: maybe-clean-guile
-clean-host: maybe-clean-tk
-clean-host: maybe-clean-libtermcap
-clean-host: maybe-clean-utils
-clean-host: maybe-clean-gnattools
-
-.PHONY: clean-target
-
-clean-target: maybe-clean-target-libstdc++-v3
-clean-target: maybe-clean-target-libmudflap
-clean-target: maybe-clean-target-libssp
-clean-target: maybe-clean-target-libgcc-math
-clean-target: maybe-clean-target-newlib
-clean-target: maybe-clean-target-libgfortran
-clean-target: maybe-clean-target-libobjc
-clean-target: maybe-clean-target-libtermcap
-clean-target: maybe-clean-target-winsup
-clean-target: maybe-clean-target-libgloss
-clean-target: maybe-clean-target-libiberty
-clean-target: maybe-clean-target-gperf
-clean-target: maybe-clean-target-examples
-clean-target: maybe-clean-target-libffi
-clean-target: maybe-clean-target-libjava
-clean-target: maybe-clean-target-zlib
-clean-target: maybe-clean-target-boehm-gc
-clean-target: maybe-clean-target-qthreads
-clean-target: maybe-clean-target-rda
-clean-target: maybe-clean-target-libada
-clean-target: maybe-clean-target-libgomp
-
-.PHONY: do-distclean
-do-distclean:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \
-	  distclean-target
-
-
-.PHONY: distclean-host
-
-distclean-host: maybe-distclean-ash
-distclean-host: maybe-distclean-autoconf
-distclean-host: maybe-distclean-automake
-distclean-host: maybe-distclean-bash
-distclean-host: maybe-distclean-bfd
-distclean-host: maybe-distclean-opcodes
-distclean-host: maybe-distclean-binutils
-distclean-host: maybe-distclean-bison
-distclean-host: maybe-distclean-byacc
-distclean-host: maybe-distclean-bzip2
-distclean-host: maybe-distclean-dejagnu
-distclean-host: maybe-distclean-diff
-distclean-host: maybe-distclean-dosutils
-distclean-host: maybe-distclean-etc
-distclean-host: maybe-distclean-fastjar
-distclean-host: maybe-distclean-fileutils
-distclean-host: maybe-distclean-findutils
-distclean-host: maybe-distclean-find
-distclean-host: maybe-distclean-fixincludes
-distclean-host: maybe-distclean-flex
-distclean-host: maybe-distclean-gas
-distclean-host: maybe-distclean-gcc
-distclean-host: maybe-distclean-gawk
-distclean-host: maybe-distclean-gettext
-distclean-host: maybe-distclean-gnuserv
-distclean-host: maybe-distclean-gprof
-distclean-host: maybe-distclean-gzip
-distclean-host: maybe-distclean-hello
-distclean-host: maybe-distclean-indent
-distclean-host: maybe-distclean-intl
-distclean-host: maybe-distclean-tcl
-distclean-host: maybe-distclean-itcl
-distclean-host: maybe-distclean-ld
-distclean-host: maybe-distclean-libcpp
-distclean-host: maybe-distclean-libdecnumber
-distclean-host: maybe-distclean-libgui
-distclean-host: maybe-distclean-libiberty
-distclean-host: maybe-distclean-libtool
-distclean-host: maybe-distclean-m4
-distclean-host: maybe-distclean-make
-distclean-host: maybe-distclean-mmalloc
-distclean-host: maybe-distclean-patch
-distclean-host: maybe-distclean-perl
-distclean-host: maybe-distclean-prms
-distclean-host: maybe-distclean-rcs
-distclean-host: maybe-distclean-readline
-distclean-host: maybe-distclean-release
-distclean-host: maybe-distclean-recode
-distclean-host: maybe-distclean-sed
-distclean-host: maybe-distclean-send-pr
-distclean-host: maybe-distclean-shellutils
-distclean-host: maybe-distclean-sid
-distclean-host: maybe-distclean-sim
-distclean-host: maybe-distclean-tar
-distclean-host: maybe-distclean-texinfo
-distclean-host: maybe-distclean-textutils
-distclean-host: maybe-distclean-time
-distclean-host: maybe-distclean-uudecode
-distclean-host: maybe-distclean-wdiff
-distclean-host: maybe-distclean-zip
-distclean-host: maybe-distclean-zlib
-distclean-host: maybe-distclean-gdb
-distclean-host: maybe-distclean-expect
-distclean-host: maybe-distclean-guile
-distclean-host: maybe-distclean-tk
-distclean-host: maybe-distclean-libtermcap
-distclean-host: maybe-distclean-utils
-distclean-host: maybe-distclean-gnattools
-
-.PHONY: distclean-target
-
-distclean-target: maybe-distclean-target-libstdc++-v3
-distclean-target: maybe-distclean-target-libmudflap
-distclean-target: maybe-distclean-target-libssp
-distclean-target: maybe-distclean-target-libgcc-math
-distclean-target: maybe-distclean-target-newlib
-distclean-target: maybe-distclean-target-libgfortran
-distclean-target: maybe-distclean-target-libobjc
-distclean-target: maybe-distclean-target-libtermcap
-distclean-target: maybe-distclean-target-winsup
-distclean-target: maybe-distclean-target-libgloss
-distclean-target: maybe-distclean-target-libiberty
-distclean-target: maybe-distclean-target-gperf
-distclean-target: maybe-distclean-target-examples
-distclean-target: maybe-distclean-target-libffi
-distclean-target: maybe-distclean-target-libjava
-distclean-target: maybe-distclean-target-zlib
-distclean-target: maybe-distclean-target-boehm-gc
-distclean-target: maybe-distclean-target-qthreads
-distclean-target: maybe-distclean-target-rda
-distclean-target: maybe-distclean-target-libada
-distclean-target: maybe-distclean-target-libgomp
-
-.PHONY: do-maintainer-clean
-do-maintainer-clean:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) maintainer-clean-host \
-	  maintainer-clean-target
-
-
-.PHONY: maintainer-clean-host
-
-maintainer-clean-host: maybe-maintainer-clean-ash
-maintainer-clean-host: maybe-maintainer-clean-autoconf
-maintainer-clean-host: maybe-maintainer-clean-automake
-maintainer-clean-host: maybe-maintainer-clean-bash
-maintainer-clean-host: maybe-maintainer-clean-bfd
-maintainer-clean-host: maybe-maintainer-clean-opcodes
-maintainer-clean-host: maybe-maintainer-clean-binutils
-maintainer-clean-host: maybe-maintainer-clean-bison
-maintainer-clean-host: maybe-maintainer-clean-byacc
-maintainer-clean-host: maybe-maintainer-clean-bzip2
-maintainer-clean-host: maybe-maintainer-clean-dejagnu
-maintainer-clean-host: maybe-maintainer-clean-diff
-maintainer-clean-host: maybe-maintainer-clean-dosutils
-maintainer-clean-host: maybe-maintainer-clean-etc
-maintainer-clean-host: maybe-maintainer-clean-fastjar
-maintainer-clean-host: maybe-maintainer-clean-fileutils
-maintainer-clean-host: maybe-maintainer-clean-findutils
-maintainer-clean-host: maybe-maintainer-clean-find
-maintainer-clean-host: maybe-maintainer-clean-fixincludes
-maintainer-clean-host: maybe-maintainer-clean-flex
-maintainer-clean-host: maybe-maintainer-clean-gas
-maintainer-clean-host: maybe-maintainer-clean-gcc
-maintainer-clean-host: maybe-maintainer-clean-gawk
-maintainer-clean-host: maybe-maintainer-clean-gettext
-maintainer-clean-host: maybe-maintainer-clean-gnuserv
-maintainer-clean-host: maybe-maintainer-clean-gprof
-maintainer-clean-host: maybe-maintainer-clean-gzip
-maintainer-clean-host: maybe-maintainer-clean-hello
-maintainer-clean-host: maybe-maintainer-clean-indent
-maintainer-clean-host: maybe-maintainer-clean-intl
-maintainer-clean-host: maybe-maintainer-clean-tcl
-maintainer-clean-host: maybe-maintainer-clean-itcl
-maintainer-clean-host: maybe-maintainer-clean-ld
-maintainer-clean-host: maybe-maintainer-clean-libcpp
-maintainer-clean-host: maybe-maintainer-clean-libdecnumber
-maintainer-clean-host: maybe-maintainer-clean-libgui
-maintainer-clean-host: maybe-maintainer-clean-libiberty
-maintainer-clean-host: maybe-maintainer-clean-libtool
-maintainer-clean-host: maybe-maintainer-clean-m4
-maintainer-clean-host: maybe-maintainer-clean-make
-maintainer-clean-host: maybe-maintainer-clean-mmalloc
-maintainer-clean-host: maybe-maintainer-clean-patch
-maintainer-clean-host: maybe-maintainer-clean-perl
-maintainer-clean-host: maybe-maintainer-clean-prms
-maintainer-clean-host: maybe-maintainer-clean-rcs
-maintainer-clean-host: maybe-maintainer-clean-readline
-maintainer-clean-host: maybe-maintainer-clean-release
-maintainer-clean-host: maybe-maintainer-clean-recode
-maintainer-clean-host: maybe-maintainer-clean-sed
-maintainer-clean-host: maybe-maintainer-clean-send-pr
-maintainer-clean-host: maybe-maintainer-clean-shellutils
-maintainer-clean-host: maybe-maintainer-clean-sid
-maintainer-clean-host: maybe-maintainer-clean-sim
-maintainer-clean-host: maybe-maintainer-clean-tar
-maintainer-clean-host: maybe-maintainer-clean-texinfo
-maintainer-clean-host: maybe-maintainer-clean-textutils
-maintainer-clean-host: maybe-maintainer-clean-time
-maintainer-clean-host: maybe-maintainer-clean-uudecode
-maintainer-clean-host: maybe-maintainer-clean-wdiff
-maintainer-clean-host: maybe-maintainer-clean-zip
-maintainer-clean-host: maybe-maintainer-clean-zlib
-maintainer-clean-host: maybe-maintainer-clean-gdb
-maintainer-clean-host: maybe-maintainer-clean-expect
-maintainer-clean-host: maybe-maintainer-clean-guile
-maintainer-clean-host: maybe-maintainer-clean-tk
-maintainer-clean-host: maybe-maintainer-clean-libtermcap
-maintainer-clean-host: maybe-maintainer-clean-utils
-maintainer-clean-host: maybe-maintainer-clean-gnattools
-
-.PHONY: maintainer-clean-target
-
-maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3
-maintainer-clean-target: maybe-maintainer-clean-target-libmudflap
-maintainer-clean-target: maybe-maintainer-clean-target-libssp
-maintainer-clean-target: maybe-maintainer-clean-target-libgcc-math
-maintainer-clean-target: maybe-maintainer-clean-target-newlib
-maintainer-clean-target: maybe-maintainer-clean-target-libgfortran
-maintainer-clean-target: maybe-maintainer-clean-target-libobjc
-maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
-maintainer-clean-target: maybe-maintainer-clean-target-winsup
-maintainer-clean-target: maybe-maintainer-clean-target-libgloss
-maintainer-clean-target: maybe-maintainer-clean-target-libiberty
-maintainer-clean-target: maybe-maintainer-clean-target-gperf
-maintainer-clean-target: maybe-maintainer-clean-target-examples
-maintainer-clean-target: maybe-maintainer-clean-target-libffi
-maintainer-clean-target: maybe-maintainer-clean-target-libjava
-maintainer-clean-target: maybe-maintainer-clean-target-zlib
-maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
-maintainer-clean-target: maybe-maintainer-clean-target-qthreads
-maintainer-clean-target: maybe-maintainer-clean-target-rda
-maintainer-clean-target: maybe-maintainer-clean-target-libada
-maintainer-clean-target: maybe-maintainer-clean-target-libgomp
-
+# This target ensures that $(BASE_FLAGS_TO_PASS) appears only once,
+# because it is so large that it can easily overflow the command line
+# length limit on some systems.
+DO_X = \
+	do-clean \
+	do-distclean \
+	do-dvi \
+	do-info \
+	do-install-info \
+	do-installcheck \
+	do-mostlyclean \
+	do-maintainer-clean \
+	do-TAGS
+.PHONY: $(DO_X)
+$(DO_X):
+	@target=`echo $@ | sed -e 's/^do-//'`; \
+	r=`pwd`; export r; \
+	s=`cd $(srcdir); pwd`; export s; \
+	$(SET_LIB_PATH) \
+	for i in $(SUBDIRS) -dummy-; do \
+	  if [ -f ./$$i/Makefile ]; then \
+	    case $$i in \
+	    gcc) \
+	      for flag in $(EXTRA_GCC_FLAGS); do \
+		eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	      done; \
+	      ;; \
+	    *) \
+	      for flag in $(EXTRA_HOST_FLAGS); do \
+		eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	      done; \
+	      ;; \
+	    esac ; \
+	    if (cd ./$$i; \
+	        $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+			"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+			"RANLIB=$${RANLIB}" \
+			"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+			$${target}); \
+	    then true; else exit 1; fi; \
+	  else true; fi; \
+	done
+	@target=`echo $@ | sed -e 's/^do-//'`; \
+	r=`pwd`; export r; \
+	s=`cd $(srcdir); pwd`; export s; \
+	$(SET_LIB_PATH) \
+	for i in $(TARGET_CONFIGDIRS) -dummy-; do \
+	  if [ -f $(TARGET_SUBDIR)/$$i/Makefile ]; then \
+	    for flag in $(EXTRA_TARGET_FLAGS); do \
+		eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	    done; \
+	    if (cd $(TARGET_SUBDIR)/$$i; \
+	        $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+			"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+			"RANLIB=$${RANLIB}" \
+			"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+			$${target}); \
+	    then true; else exit 1; fi; \
+	  else true; fi; \
+	done
 
 # Here are the targets which correspond to the do-X targets.
 
-.PHONY: info installcheck dvi html install-info
+.PHONY: info installcheck dvi install-info
 .PHONY: clean distclean mostlyclean maintainer-clean realclean
 .PHONY: local-clean local-distclean local-maintainer-clean
 info: do-info
 installcheck: do-installcheck
 dvi: do-dvi
-html: do-html
 
-# Make sure makeinfo is built before we do a `make info', if we're
-# in fact building texinfo.
-do-info: maybe-all-texinfo
+# Make sure makeinfo is built before we do a `make info'.
+do-info: all-texinfo
 
 install-info: do-install-info dir.info
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	s=`cd $(srcdir); pwd`; export s; \
 	if [ -f dir.info ] ; then \
-	  $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
+	  $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \
 	else true ; fi
 
 local-clean:
@@ -1855,19 +1068,9 @@ local-clean:
 
 local-distclean:
 	-rm -f Makefile config.status config.cache mh-frag mt-frag
-	-rm -f maybedep.tmp serdep.tmp
 	-if [ "$(TARGET_SUBDIR)" != "." ]; then \
 	  rm -rf $(TARGET_SUBDIR); \
 	else true; fi
-	-rm -rf $(BUILD_SUBDIR)
-	-if [ "$(HOST_SUBDIR)" != "." ]; then \
-	  rm -rf $(HOST_SUBDIR); \
-	else true; fi
-	-rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile
-	-rm -f texinfo/doc/Makefile texinfo/po/POTFILES
-	-rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
-	-rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
-	-rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
 
 local-maintainer-clean:
 	@echo "This command is intended for maintainers to use;"
@@ -1880,117 +1083,46 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean
 maintainer-clean: local-distclean
 realclean: maintainer-clean
 
-# Extra dependency for clean-target, owing to the mixed nature of gcc.
-clean-target: clean-target-libgcc
-clean-target-libgcc:
-	test ! -d gcc || (cd gcc && $(MAKE) $@)
-
-# Check target.
+# This rule is used to clean specific modules.
+.PHONY: $(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc
+$(CLEAN_MODULES) $(CLEAN_X11_MODULES) clean-gcc:
+	@dir=`echo $@ | sed -e 's/clean-//'`; \
+	if [ -f ./$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) clean); \
+	else \
+	  true; \
+	fi
 
-.PHONY: check do-check
-check: do-check
+.PHONY: $(CLEAN_TARGET_MODULES)
+$(CLEAN_TARGET_MODULES):
+	@dir=`echo $@ | sed -e 's/clean-target-//'`; \
+	rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
+	if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) clean); \
+	else \
+	  true; \
+	fi
 
-# Only include modules actually being configured and built.
-.PHONY: check-host
-check-host:  \
-    maybe-check-ash \
-    maybe-check-autoconf \
-    maybe-check-automake \
-    maybe-check-bash \
-    maybe-check-bfd \
-    maybe-check-opcodes \
-    maybe-check-binutils \
-    maybe-check-bison \
-    maybe-check-byacc \
-    maybe-check-bzip2 \
-    maybe-check-dejagnu \
-    maybe-check-diff \
-    maybe-check-dosutils \
-    maybe-check-etc \
-    maybe-check-fastjar \
-    maybe-check-fileutils \
-    maybe-check-findutils \
-    maybe-check-find \
-    maybe-check-fixincludes \
-    maybe-check-flex \
-    maybe-check-gas \
-    maybe-check-gcc \
-    maybe-check-gawk \
-    maybe-check-gettext \
-    maybe-check-gnuserv \
-    maybe-check-gprof \
-    maybe-check-gzip \
-    maybe-check-hello \
-    maybe-check-indent \
-    maybe-check-intl \
-    maybe-check-tcl \
-    maybe-check-itcl \
-    maybe-check-ld \
-    maybe-check-libcpp \
-    maybe-check-libdecnumber \
-    maybe-check-libgui \
-    maybe-check-libiberty \
-    maybe-check-libtool \
-    maybe-check-m4 \
-    maybe-check-make \
-    maybe-check-mmalloc \
-    maybe-check-patch \
-    maybe-check-perl \
-    maybe-check-prms \
-    maybe-check-rcs \
-    maybe-check-readline \
-    maybe-check-release \
-    maybe-check-recode \
-    maybe-check-sed \
-    maybe-check-send-pr \
-    maybe-check-shellutils \
-    maybe-check-sid \
-    maybe-check-sim \
-    maybe-check-tar \
-    maybe-check-texinfo \
-    maybe-check-textutils \
-    maybe-check-time \
-    maybe-check-uudecode \
-    maybe-check-wdiff \
-    maybe-check-zip \
-    maybe-check-zlib \
-    maybe-check-gdb \
-    maybe-check-expect \
-    maybe-check-guile \
-    maybe-check-tk \
-    maybe-check-libtermcap \
-    maybe-check-utils \
-    maybe-check-gnattools
+clean-target: $(CLEAN_TARGET_MODULES) clean-target-libgcc
+clean-target-libgcc:
+	test ! -d gcc/libgcc || \
+	(cd gcc/libgcc && find . -type d -print) | \
+	while read d; do rm -f gcc/$$d/libgcc.a || : ; done
+	-rm -rf gcc/libgcc
 
-.PHONY: check-target
-check-target:  \
-    maybe-check-target-libstdc++-v3 \
-    maybe-check-target-libmudflap \
-    maybe-check-target-libssp \
-    maybe-check-target-libgcc-math \
-    maybe-check-target-newlib \
-    maybe-check-target-libgfortran \
-    maybe-check-target-libobjc \
-    maybe-check-target-libtermcap \
-    maybe-check-target-winsup \
-    maybe-check-target-libgloss \
-    maybe-check-target-libiberty \
-    maybe-check-target-gperf \
-    maybe-check-target-examples \
-    maybe-check-target-libffi \
-    maybe-check-target-libjava \
-    maybe-check-target-zlib \
-    maybe-check-target-boehm-gc \
-    maybe-check-target-qthreads \
-    maybe-check-target-rda \
-    maybe-check-target-libada \
-    maybe-check-target-libgomp
+# Check target.
 
-do-check:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
+.PHONY: check
+check: $(CHECK_MODULES) \
+	$(CHECK_TARGET_MODULES) \
+	$(CHECK_X11_MODULES) \
+	check-gcc
 
 # Automated reporting of test results.
 
@@ -2015,36592 +1147,972 @@ mail-report-with-warnings.log: warning.log
 
 # Installation targets.
 
-.PHONY: install uninstall
-install:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
+.PHONY: install install-cross uninstall source-vault binary-vault vault-install
+install: $(INSTALL_TARGET) 
+install-cross: $(INSTALL_TARGET_CROSS) 
 
-.PHONY: install-host-nogcc
-install-host-nogcc:  \
-    maybe-install-ash \
-    maybe-install-autoconf \
-    maybe-install-automake \
-    maybe-install-bash \
-    maybe-install-bfd \
-    maybe-install-opcodes \
-    maybe-install-binutils \
-    maybe-install-bison \
-    maybe-install-byacc \
-    maybe-install-bzip2 \
-    maybe-install-dejagnu \
-    maybe-install-diff \
-    maybe-install-dosutils \
-    maybe-install-etc \
-    maybe-install-fastjar \
-    maybe-install-fileutils \
-    maybe-install-findutils \
-    maybe-install-find \
-    maybe-install-fixincludes \
-    maybe-install-flex \
-    maybe-install-gas \
-    maybe-install-gawk \
-    maybe-install-gettext \
-    maybe-install-gnuserv \
-    maybe-install-gprof \
-    maybe-install-gzip \
-    maybe-install-hello \
-    maybe-install-indent \
-    maybe-install-intl \
-    maybe-install-tcl \
-    maybe-install-itcl \
-    maybe-install-ld \
-    maybe-install-libcpp \
-    maybe-install-libdecnumber \
-    maybe-install-libgui \
-    maybe-install-libiberty \
-    maybe-install-libtool \
-    maybe-install-m4 \
-    maybe-install-make \
-    maybe-install-mmalloc \
-    maybe-install-patch \
-    maybe-install-perl \
-    maybe-install-prms \
-    maybe-install-rcs \
-    maybe-install-readline \
-    maybe-install-release \
-    maybe-install-recode \
-    maybe-install-sed \
-    maybe-install-send-pr \
-    maybe-install-shellutils \
-    maybe-install-sid \
-    maybe-install-sim \
-    maybe-install-tar \
-    maybe-install-texinfo \
-    maybe-install-textutils \
-    maybe-install-time \
-    maybe-install-uudecode \
-    maybe-install-wdiff \
-    maybe-install-zip \
-    maybe-install-zlib \
-    maybe-install-gdb \
-    maybe-install-expect \
-    maybe-install-guile \
-    maybe-install-tk \
-    maybe-install-libtermcap \
-    maybe-install-utils \
-    maybe-install-gnattools
+uninstall:
+	@echo "the uninstall target is not supported in this tree"
 
-.PHONY: install-host
-install-host:  \
-    maybe-install-ash \
-    maybe-install-autoconf \
-    maybe-install-automake \
-    maybe-install-bash \
-    maybe-install-bfd \
-    maybe-install-opcodes \
-    maybe-install-binutils \
-    maybe-install-bison \
-    maybe-install-byacc \
-    maybe-install-bzip2 \
-    maybe-install-dejagnu \
-    maybe-install-diff \
-    maybe-install-dosutils \
-    maybe-install-etc \
-    maybe-install-fastjar \
-    maybe-install-fileutils \
-    maybe-install-findutils \
-    maybe-install-find \
-    maybe-install-fixincludes \
-    maybe-install-flex \
-    maybe-install-gas \
-    maybe-install-gcc \
-    maybe-install-gawk \
-    maybe-install-gettext \
-    maybe-install-gnuserv \
-    maybe-install-gprof \
-    maybe-install-gzip \
-    maybe-install-hello \
-    maybe-install-indent \
-    maybe-install-intl \
-    maybe-install-tcl \
-    maybe-install-itcl \
-    maybe-install-ld \
-    maybe-install-libcpp \
-    maybe-install-libdecnumber \
-    maybe-install-libgui \
-    maybe-install-libiberty \
-    maybe-install-libtool \
-    maybe-install-m4 \
-    maybe-install-make \
-    maybe-install-mmalloc \
-    maybe-install-patch \
-    maybe-install-perl \
-    maybe-install-prms \
-    maybe-install-rcs \
-    maybe-install-readline \
-    maybe-install-release \
-    maybe-install-recode \
-    maybe-install-sed \
-    maybe-install-send-pr \
-    maybe-install-shellutils \
-    maybe-install-sid \
-    maybe-install-sim \
-    maybe-install-tar \
-    maybe-install-texinfo \
-    maybe-install-textutils \
-    maybe-install-time \
-    maybe-install-uudecode \
-    maybe-install-wdiff \
-    maybe-install-zip \
-    maybe-install-zlib \
-    maybe-install-gdb \
-    maybe-install-expect \
-    maybe-install-guile \
-    maybe-install-tk \
-    maybe-install-libtermcap \
-    maybe-install-utils \
-    maybe-install-gnattools
+source-vault:
+	$(MAKE) -f ./release/Build-A-Release \
+		host=$(host_alias) source-vault
 
-.PHONY: install-target
-install-target:  \
-    maybe-install-target-libstdc++-v3 \
-    maybe-install-target-libmudflap \
-    maybe-install-target-libssp \
-    maybe-install-target-libgcc-math \
-    maybe-install-target-newlib \
-    maybe-install-target-libgfortran \
-    maybe-install-target-libobjc \
-    maybe-install-target-libtermcap \
-    maybe-install-target-winsup \
-    maybe-install-target-libgloss \
-    maybe-install-target-libiberty \
-    maybe-install-target-gperf \
-    maybe-install-target-examples \
-    maybe-install-target-libffi \
-    maybe-install-target-libjava \
-    maybe-install-target-zlib \
-    maybe-install-target-boehm-gc \
-    maybe-install-target-qthreads \
-    maybe-install-target-rda \
-    maybe-install-target-libada \
-    maybe-install-target-libgomp
+binary-vault:
+	$(MAKE) -f ./release/Build-A-Release \
+		host=$(host_alias) target=$(target_alias)
 
-uninstall:
-	@echo "the uninstall target is not supported in this tree"
+vault-install:
+	@if [ -f ./release/vault-install ] ; then \
+	  ./release/vault-install $(host_alias) $(target_alias) ; \
+	else \
+	  true ; \
+	fi
 
 .PHONY: install.all
 install.all: install-no-fixedincludes
 	@if [ -f ./gcc/Makefile ] ; then \
-		r=`${PWD_COMMAND}` ; export r ; \
-		s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-		$(HOST_EXPORTS) \
-		(cd ./gcc && \
+		r=`pwd` ; export r ; \
+		$(SET_LIB_PATH) \
+		(cd ./gcc; \
 		$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
 	else \
 		true ; \
 	fi
 
+# inet-install is used because the I*Net wants DejaGNU installed but
+# not built.  Similarly, gzip is built but not installed.
+inet-install:
+	$(MAKE) INSTALL_MODULES="`echo $(INSTALL_MODULES) | sed -e 's/install-dejagnu//' -e 's/install-gzip//'`" install
+
 # install-no-fixedincludes is used because Cygnus can not distribute
 # the fixed header files.
 .PHONY: install-no-fixedincludes
-install-no-fixedincludes: installdirs install-host-nogcc \
-	install-target gcc-no-fixedincludes
-
-### other supporting targets
-
-MAKEDIRS= \
-	$(DESTDIR)$(prefix) \
-	$(DESTDIR)$(exec_prefix)
-.PHONY: installdirs
-installdirs: mkinstalldirs
-	$(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
-
-dir.info: do-install-info
-	if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
-	  $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
-	  mv -f dir.info.new dir.info ; \
-	else true ; \
-	fi
-
-dist:
-	@echo "Building a full distribution of this tree isn't done"
-	@echo "via 'make dist'.  Check out the etc/ subdirectory" 
-
-etags tags: TAGS
-
-# Right now this just builds TAGS in each subdirectory.  emacs19 has the
-# ability to use several tags files at once, so there is probably no need
-# to combine them into one big TAGS file (like CVS 1.3 does).  We could
-# (if we felt like it) have this Makefile write a piece of elisp which
-# the user could load to tell emacs19 where all the TAGS files we just
-# built are.
-TAGS: do-TAGS
-
-# ------------------------------------
-# Macros for configure and all targets
-# ------------------------------------
-
-
-
-
-
-# --------------------------------------
-# Modules which run on the build machine
-# --------------------------------------
-
-
-.PHONY: configure-build-libiberty maybe-configure-build-libiberty
-maybe-configure-build-libiberty:
-@if build-libiberty
-maybe-configure-build-libiberty: configure-build-libiberty
-configure-build-libiberty: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \
-	$(BUILD_EXPORTS) \
-	echo Configuring in $(BUILD_SUBDIR)/libiberty; \
-	cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(BUILD_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif build-libiberty
-
-
-
-
-
-.PHONY: all-build-libiberty maybe-all-build-libiberty
-maybe-all-build-libiberty:
-@if build-libiberty
-TARGET-build-libiberty=all
-maybe-all-build-libiberty: all-build-libiberty
-all-build-libiberty: configure-build-libiberty
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(BUILD_EXPORTS) \
-	(cd $(BUILD_SUBDIR)/libiberty && \
-	  $(MAKE)   $(TARGET-build-libiberty))
-@endif build-libiberty
-
-
-
-
-
-.PHONY: configure-build-bison maybe-configure-build-bison
-maybe-configure-build-bison:
-@if build-bison
-maybe-configure-build-bison: configure-build-bison
-configure-build-bison: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
-	$(BUILD_EXPORTS) \
-	echo Configuring in $(BUILD_SUBDIR)/bison; \
-	cd "$(BUILD_SUBDIR)/bison" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(BUILD_SUBDIR)/bison/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bison"; \
-	libsrcdir="$$s/bison"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif build-bison
-
-
-
-
-
-.PHONY: all-build-bison maybe-all-build-bison
-maybe-all-build-bison:
-@if build-bison
-TARGET-build-bison=all
-maybe-all-build-bison: all-build-bison
-all-build-bison: configure-build-bison
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(BUILD_EXPORTS) \
-	(cd $(BUILD_SUBDIR)/bison && \
-	  $(MAKE)   $(TARGET-build-bison))
-@endif build-bison
-
-
-
-
-
-.PHONY: configure-build-byacc maybe-configure-build-byacc
-maybe-configure-build-byacc:
-@if build-byacc
-maybe-configure-build-byacc: configure-build-byacc
-configure-build-byacc: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \
-	$(BUILD_EXPORTS) \
-	echo Configuring in $(BUILD_SUBDIR)/byacc; \
-	cd "$(BUILD_SUBDIR)/byacc" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(BUILD_SUBDIR)/byacc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/byacc"; \
-	libsrcdir="$$s/byacc"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif build-byacc
-
-
-
-
-
-.PHONY: all-build-byacc maybe-all-build-byacc
-maybe-all-build-byacc:
-@if build-byacc
-TARGET-build-byacc=all
-maybe-all-build-byacc: all-build-byacc
-all-build-byacc: configure-build-byacc
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(BUILD_EXPORTS) \
-	(cd $(BUILD_SUBDIR)/byacc && \
-	  $(MAKE)   $(TARGET-build-byacc))
-@endif build-byacc
-
-
-
-
-
-.PHONY: configure-build-flex maybe-configure-build-flex
-maybe-configure-build-flex:
-@if build-flex
-maybe-configure-build-flex: configure-build-flex
-configure-build-flex: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
-	$(BUILD_EXPORTS) \
-	echo Configuring in $(BUILD_SUBDIR)/flex; \
-	cd "$(BUILD_SUBDIR)/flex" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(BUILD_SUBDIR)/flex/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/flex"; \
-	libsrcdir="$$s/flex"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif build-flex
-
-
-
-
-
-.PHONY: all-build-flex maybe-all-build-flex
-maybe-all-build-flex:
-@if build-flex
-TARGET-build-flex=all
-maybe-all-build-flex: all-build-flex
-all-build-flex: configure-build-flex
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(BUILD_EXPORTS) \
-	(cd $(BUILD_SUBDIR)/flex && \
-	  $(MAKE)   $(TARGET-build-flex))
-@endif build-flex
-
-
-
-
-
-.PHONY: configure-build-m4 maybe-configure-build-m4
-maybe-configure-build-m4:
-@if build-m4
-maybe-configure-build-m4: configure-build-m4
-configure-build-m4: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
-	$(BUILD_EXPORTS) \
-	echo Configuring in $(BUILD_SUBDIR)/m4; \
-	cd "$(BUILD_SUBDIR)/m4" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(BUILD_SUBDIR)/m4/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/m4"; \
-	libsrcdir="$$s/m4"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif build-m4
-
-
-
-
-
-.PHONY: all-build-m4 maybe-all-build-m4
-maybe-all-build-m4:
-@if build-m4
-TARGET-build-m4=all
-maybe-all-build-m4: all-build-m4
-all-build-m4: configure-build-m4
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(BUILD_EXPORTS) \
-	(cd $(BUILD_SUBDIR)/m4 && \
-	  $(MAKE)   $(TARGET-build-m4))
-@endif build-m4
-
-
-
-
-
-.PHONY: configure-build-texinfo maybe-configure-build-texinfo
-maybe-configure-build-texinfo:
-@if build-texinfo
-maybe-configure-build-texinfo: configure-build-texinfo
-configure-build-texinfo: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
-	$(BUILD_EXPORTS) \
-	echo Configuring in $(BUILD_SUBDIR)/texinfo; \
-	cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(BUILD_SUBDIR)/texinfo/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/texinfo"; \
-	libsrcdir="$$s/texinfo"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif build-texinfo
-
-
-
-
-
-.PHONY: all-build-texinfo maybe-all-build-texinfo
-maybe-all-build-texinfo:
-@if build-texinfo
-TARGET-build-texinfo=all
-maybe-all-build-texinfo: all-build-texinfo
-all-build-texinfo: configure-build-texinfo
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(BUILD_EXPORTS) \
-	(cd $(BUILD_SUBDIR)/texinfo && \
-	  $(MAKE)   $(TARGET-build-texinfo))
-@endif build-texinfo
-
-
-
-
-
-.PHONY: configure-build-fixincludes maybe-configure-build-fixincludes
-maybe-configure-build-fixincludes:
-@if build-fixincludes
-maybe-configure-build-fixincludes: configure-build-fixincludes
-configure-build-fixincludes: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
-	$(BUILD_EXPORTS) \
-	echo Configuring in $(BUILD_SUBDIR)/fixincludes; \
-	cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(BUILD_SUBDIR)/fixincludes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/fixincludes"; \
-	libsrcdir="$$s/fixincludes"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(BUILD_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif build-fixincludes
-
-
-
-
-
-.PHONY: all-build-fixincludes maybe-all-build-fixincludes
-maybe-all-build-fixincludes:
-@if build-fixincludes
-TARGET-build-fixincludes=all
-maybe-all-build-fixincludes: all-build-fixincludes
-all-build-fixincludes: configure-build-fixincludes
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(BUILD_EXPORTS) \
-	(cd $(BUILD_SUBDIR)/fixincludes && \
-	  $(MAKE)   $(TARGET-build-fixincludes))
-@endif build-fixincludes
-
-
-
-
-
-# --------------------------------------
-# Modules which run on the host machine
-# --------------------------------------
-
-
-.PHONY: configure-ash maybe-configure-ash
-maybe-configure-ash:
-@if ash
-maybe-configure-ash: configure-ash
-configure-ash: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ash ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/ash; \
-	cd "$(HOST_SUBDIR)/ash" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ash/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ash"; \
-	libsrcdir="$$s/ash"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif ash
-
-
-
-
-
-.PHONY: all-ash maybe-all-ash
-maybe-all-ash:
-@if ash
-TARGET-ash=all
-maybe-all-ash: all-ash
-all-ash: configure-ash
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ash))
-@endif ash
-
-
-
-
-.PHONY: check-ash maybe-check-ash
-maybe-check-ash:
-@if ash
-maybe-check-ash: check-ash
-
-check-ash:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif ash
-
-.PHONY: install-ash maybe-install-ash
-maybe-install-ash:
-@if ash
-maybe-install-ash: install-ash
-
-install-ash: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif ash
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-ash info-ash
-maybe-info-ash:
-@if ash
-maybe-info-ash: info-ash
-
-info-ash: \
-    configure-ash 
-	@: $(MAKE); $(unstage)
-	@[ -f ./ash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in ash" ; \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif ash
-
-.PHONY: maybe-dvi-ash dvi-ash
-maybe-dvi-ash:
-@if ash
-maybe-dvi-ash: dvi-ash
-
-dvi-ash: \
-    configure-ash 
-	@: $(MAKE); $(unstage)
-	@[ -f ./ash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in ash" ; \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif ash
-
-.PHONY: maybe-html-ash html-ash
-maybe-html-ash:
-@if ash
-maybe-html-ash: html-ash
-
-html-ash: \
-    configure-ash 
-	@: $(MAKE); $(unstage)
-	@[ -f ./ash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in ash" ; \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif ash
-
-.PHONY: maybe-TAGS-ash TAGS-ash
-maybe-TAGS-ash:
-@if ash
-maybe-TAGS-ash: TAGS-ash
-
-TAGS-ash: \
-    configure-ash 
-	@: $(MAKE); $(unstage)
-	@[ -f ./ash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in ash" ; \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif ash
-
-.PHONY: maybe-install-info-ash install-info-ash
-maybe-install-info-ash:
-@if ash
-maybe-install-info-ash: install-info-ash
-
-install-info-ash: \
-    configure-ash \
-    info-ash 
-	@: $(MAKE); $(unstage)
-	@[ -f ./ash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in ash" ; \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif ash
-
-.PHONY: maybe-installcheck-ash installcheck-ash
-maybe-installcheck-ash:
-@if ash
-maybe-installcheck-ash: installcheck-ash
-
-installcheck-ash: \
-    configure-ash 
-	@: $(MAKE); $(unstage)
-	@[ -f ./ash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in ash" ; \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif ash
-
-.PHONY: maybe-mostlyclean-ash mostlyclean-ash
-maybe-mostlyclean-ash:
-@if ash
-maybe-mostlyclean-ash: mostlyclean-ash
-
-mostlyclean-ash: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./ash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in ash" ; \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif ash
-
-.PHONY: maybe-clean-ash clean-ash
-maybe-clean-ash:
-@if ash
-maybe-clean-ash: clean-ash
-
-clean-ash: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./ash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in ash" ; \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif ash
-
-.PHONY: maybe-distclean-ash distclean-ash
-maybe-distclean-ash:
-@if ash
-maybe-distclean-ash: distclean-ash
-
-distclean-ash: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./ash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in ash" ; \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif ash
-
-.PHONY: maybe-maintainer-clean-ash maintainer-clean-ash
-maybe-maintainer-clean-ash:
-@if ash
-maybe-maintainer-clean-ash: maintainer-clean-ash
-
-maintainer-clean-ash: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./ash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in ash" ; \
-	(cd $(HOST_SUBDIR)/ash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif ash
-
-
-
-.PHONY: configure-autoconf maybe-configure-autoconf
-maybe-configure-autoconf:
-@if autoconf
-maybe-configure-autoconf: configure-autoconf
-configure-autoconf: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/autoconf ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/autoconf; \
-	cd "$(HOST_SUBDIR)/autoconf" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/autoconf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/autoconf"; \
-	libsrcdir="$$s/autoconf"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif autoconf
-
-
-
-
-
-.PHONY: all-autoconf maybe-all-autoconf
-maybe-all-autoconf:
-@if autoconf
-TARGET-autoconf=all
-maybe-all-autoconf: all-autoconf
-all-autoconf: configure-autoconf
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-autoconf))
-@endif autoconf
-
-
-
-
-.PHONY: check-autoconf maybe-check-autoconf
-maybe-check-autoconf:
-@if autoconf
-maybe-check-autoconf: check-autoconf
-
-check-autoconf:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif autoconf
-
-.PHONY: install-autoconf maybe-install-autoconf
-maybe-install-autoconf:
-@if autoconf
-maybe-install-autoconf: install-autoconf
-
-install-autoconf: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif autoconf
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-autoconf info-autoconf
-maybe-info-autoconf:
-@if autoconf
-maybe-info-autoconf: info-autoconf
-
-info-autoconf: \
-    configure-autoconf 
-	@: $(MAKE); $(unstage)
-	@[ -f ./autoconf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in autoconf" ; \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif autoconf
-
-.PHONY: maybe-dvi-autoconf dvi-autoconf
-maybe-dvi-autoconf:
-@if autoconf
-maybe-dvi-autoconf: dvi-autoconf
-
-dvi-autoconf: \
-    configure-autoconf 
-	@: $(MAKE); $(unstage)
-	@[ -f ./autoconf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in autoconf" ; \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif autoconf
-
-.PHONY: maybe-html-autoconf html-autoconf
-maybe-html-autoconf:
-@if autoconf
-maybe-html-autoconf: html-autoconf
-
-html-autoconf: \
-    configure-autoconf 
-	@: $(MAKE); $(unstage)
-	@[ -f ./autoconf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in autoconf" ; \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif autoconf
-
-.PHONY: maybe-TAGS-autoconf TAGS-autoconf
-maybe-TAGS-autoconf:
-@if autoconf
-maybe-TAGS-autoconf: TAGS-autoconf
-
-TAGS-autoconf: \
-    configure-autoconf 
-	@: $(MAKE); $(unstage)
-	@[ -f ./autoconf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in autoconf" ; \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif autoconf
-
-.PHONY: maybe-install-info-autoconf install-info-autoconf
-maybe-install-info-autoconf:
-@if autoconf
-maybe-install-info-autoconf: install-info-autoconf
-
-install-info-autoconf: \
-    configure-autoconf \
-    info-autoconf 
-	@: $(MAKE); $(unstage)
-	@[ -f ./autoconf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in autoconf" ; \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif autoconf
-
-.PHONY: maybe-installcheck-autoconf installcheck-autoconf
-maybe-installcheck-autoconf:
-@if autoconf
-maybe-installcheck-autoconf: installcheck-autoconf
-
-installcheck-autoconf: \
-    configure-autoconf 
-	@: $(MAKE); $(unstage)
-	@[ -f ./autoconf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in autoconf" ; \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif autoconf
-
-.PHONY: maybe-mostlyclean-autoconf mostlyclean-autoconf
-maybe-mostlyclean-autoconf:
-@if autoconf
-maybe-mostlyclean-autoconf: mostlyclean-autoconf
-
-mostlyclean-autoconf: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./autoconf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in autoconf" ; \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif autoconf
-
-.PHONY: maybe-clean-autoconf clean-autoconf
-maybe-clean-autoconf:
-@if autoconf
-maybe-clean-autoconf: clean-autoconf
-
-clean-autoconf: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./autoconf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in autoconf" ; \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif autoconf
-
-.PHONY: maybe-distclean-autoconf distclean-autoconf
-maybe-distclean-autoconf:
-@if autoconf
-maybe-distclean-autoconf: distclean-autoconf
-
-distclean-autoconf: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./autoconf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in autoconf" ; \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif autoconf
-
-.PHONY: maybe-maintainer-clean-autoconf maintainer-clean-autoconf
-maybe-maintainer-clean-autoconf:
-@if autoconf
-maybe-maintainer-clean-autoconf: maintainer-clean-autoconf
-
-maintainer-clean-autoconf: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./autoconf/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in autoconf" ; \
-	(cd $(HOST_SUBDIR)/autoconf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif autoconf
-
-
-
-.PHONY: configure-automake maybe-configure-automake
-maybe-configure-automake:
-@if automake
-maybe-configure-automake: configure-automake
-configure-automake: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/automake; \
-	cd "$(HOST_SUBDIR)/automake" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/automake/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/automake"; \
-	libsrcdir="$$s/automake"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif automake
-
-
-
-
-
-.PHONY: all-automake maybe-all-automake
-maybe-all-automake:
-@if automake
-TARGET-automake=all
-maybe-all-automake: all-automake
-all-automake: configure-automake
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-automake))
-@endif automake
-
-
-
-
-.PHONY: check-automake maybe-check-automake
-maybe-check-automake:
-@if automake
-maybe-check-automake: check-automake
-
-check-automake:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif automake
-
-.PHONY: install-automake maybe-install-automake
-maybe-install-automake:
-@if automake
-maybe-install-automake: install-automake
-
-install-automake: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif automake
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-automake info-automake
-maybe-info-automake:
-@if automake
-maybe-info-automake: info-automake
-
-info-automake: \
-    configure-automake 
-	@: $(MAKE); $(unstage)
-	@[ -f ./automake/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in automake" ; \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif automake
-
-.PHONY: maybe-dvi-automake dvi-automake
-maybe-dvi-automake:
-@if automake
-maybe-dvi-automake: dvi-automake
-
-dvi-automake: \
-    configure-automake 
-	@: $(MAKE); $(unstage)
-	@[ -f ./automake/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in automake" ; \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif automake
-
-.PHONY: maybe-html-automake html-automake
-maybe-html-automake:
-@if automake
-maybe-html-automake: html-automake
-
-html-automake: \
-    configure-automake 
-	@: $(MAKE); $(unstage)
-	@[ -f ./automake/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in automake" ; \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif automake
-
-.PHONY: maybe-TAGS-automake TAGS-automake
-maybe-TAGS-automake:
-@if automake
-maybe-TAGS-automake: TAGS-automake
-
-TAGS-automake: \
-    configure-automake 
-	@: $(MAKE); $(unstage)
-	@[ -f ./automake/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in automake" ; \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif automake
-
-.PHONY: maybe-install-info-automake install-info-automake
-maybe-install-info-automake:
-@if automake
-maybe-install-info-automake: install-info-automake
-
-install-info-automake: \
-    configure-automake \
-    info-automake 
-	@: $(MAKE); $(unstage)
-	@[ -f ./automake/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in automake" ; \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif automake
-
-.PHONY: maybe-installcheck-automake installcheck-automake
-maybe-installcheck-automake:
-@if automake
-maybe-installcheck-automake: installcheck-automake
-
-installcheck-automake: \
-    configure-automake 
-	@: $(MAKE); $(unstage)
-	@[ -f ./automake/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in automake" ; \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif automake
-
-.PHONY: maybe-mostlyclean-automake mostlyclean-automake
-maybe-mostlyclean-automake:
-@if automake
-maybe-mostlyclean-automake: mostlyclean-automake
-
-mostlyclean-automake: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./automake/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in automake" ; \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif automake
-
-.PHONY: maybe-clean-automake clean-automake
-maybe-clean-automake:
-@if automake
-maybe-clean-automake: clean-automake
-
-clean-automake: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./automake/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in automake" ; \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif automake
-
-.PHONY: maybe-distclean-automake distclean-automake
-maybe-distclean-automake:
-@if automake
-maybe-distclean-automake: distclean-automake
-
-distclean-automake: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./automake/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in automake" ; \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif automake
-
-.PHONY: maybe-maintainer-clean-automake maintainer-clean-automake
-maybe-maintainer-clean-automake:
-@if automake
-maybe-maintainer-clean-automake: maintainer-clean-automake
-
-maintainer-clean-automake: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./automake/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in automake" ; \
-	(cd $(HOST_SUBDIR)/automake && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif automake
-
-
-
-.PHONY: configure-bash maybe-configure-bash
-maybe-configure-bash:
-@if bash
-maybe-configure-bash: configure-bash
-configure-bash: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bash ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/bash; \
-	cd "$(HOST_SUBDIR)/bash" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bash/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bash"; \
-	libsrcdir="$$s/bash"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif bash
-
-
-
-
-
-.PHONY: all-bash maybe-all-bash
-maybe-all-bash:
-@if bash
-TARGET-bash=all
-maybe-all-bash: all-bash
-all-bash: configure-bash
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bash))
-@endif bash
-
-
-
-
-.PHONY: check-bash maybe-check-bash
-maybe-check-bash:
-@if bash
-maybe-check-bash: check-bash
-
-check-bash:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif bash
-
-.PHONY: install-bash maybe-install-bash
-maybe-install-bash:
-@if bash
-maybe-install-bash: install-bash
-
-install-bash: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif bash
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-bash info-bash
-maybe-info-bash:
-@if bash
-maybe-info-bash: info-bash
-
-info-bash: \
-    configure-bash 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in bash" ; \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif bash
-
-.PHONY: maybe-dvi-bash dvi-bash
-maybe-dvi-bash:
-@if bash
-maybe-dvi-bash: dvi-bash
-
-dvi-bash: \
-    configure-bash 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in bash" ; \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif bash
-
-.PHONY: maybe-html-bash html-bash
-maybe-html-bash:
-@if bash
-maybe-html-bash: html-bash
-
-html-bash: \
-    configure-bash 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in bash" ; \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif bash
-
-.PHONY: maybe-TAGS-bash TAGS-bash
-maybe-TAGS-bash:
-@if bash
-maybe-TAGS-bash: TAGS-bash
-
-TAGS-bash: \
-    configure-bash 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in bash" ; \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif bash
-
-.PHONY: maybe-install-info-bash install-info-bash
-maybe-install-info-bash:
-@if bash
-maybe-install-info-bash: install-info-bash
-
-install-info-bash: \
-    configure-bash \
-    info-bash 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in bash" ; \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif bash
-
-.PHONY: maybe-installcheck-bash installcheck-bash
-maybe-installcheck-bash:
-@if bash
-maybe-installcheck-bash: installcheck-bash
-
-installcheck-bash: \
-    configure-bash 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in bash" ; \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif bash
-
-.PHONY: maybe-mostlyclean-bash mostlyclean-bash
-maybe-mostlyclean-bash:
-@if bash
-maybe-mostlyclean-bash: mostlyclean-bash
-
-mostlyclean-bash: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in bash" ; \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif bash
-
-.PHONY: maybe-clean-bash clean-bash
-maybe-clean-bash:
-@if bash
-maybe-clean-bash: clean-bash
-
-clean-bash: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in bash" ; \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif bash
-
-.PHONY: maybe-distclean-bash distclean-bash
-maybe-distclean-bash:
-@if bash
-maybe-distclean-bash: distclean-bash
-
-distclean-bash: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in bash" ; \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif bash
-
-.PHONY: maybe-maintainer-clean-bash maintainer-clean-bash
-maybe-maintainer-clean-bash:
-@if bash
-maybe-maintainer-clean-bash: maintainer-clean-bash
-
-maintainer-clean-bash: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bash/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in bash" ; \
-	(cd $(HOST_SUBDIR)/bash && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif bash
-
-
-
-.PHONY: configure-bfd maybe-configure-bfd
-maybe-configure-bfd:
-@if bfd
-maybe-configure-bfd: configure-bfd
-configure-bfd: 
-@endif bfd
-@if bfd-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif bfd-bootstrap
-@if bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/bfd; \
-	cd "$(HOST_SUBDIR)/bfd" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif bfd
-
-
-
-.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
-maybe-configure-stage1-bfd:
-@if bfd-bootstrap
-maybe-configure-stage1-bfd: configure-stage1-bfd
-configure-stage1-bfd:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif bfd-bootstrap
-
-.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
-maybe-configure-stage2-bfd:
-@if bfd-bootstrap
-maybe-configure-stage2-bfd: configure-stage2-bfd
-configure-stage2-bfd:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
-maybe-configure-stage3-bfd:
-@if bfd-bootstrap
-maybe-configure-stage3-bfd: configure-stage3-bfd
-configure-stage3-bfd:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
-maybe-configure-stage4-bfd:
-@if bfd-bootstrap
-maybe-configure-stage4-bfd: configure-stage4-bfd
-configure-stage4-bfd:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
-maybe-configure-stageprofile-bfd:
-@if bfd-bootstrap
-maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
-configure-stageprofile-bfd:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
-maybe-configure-stagefeedback-bfd:
-@if bfd-bootstrap
-maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
-configure-stagefeedback-bfd:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bfd"; \
-	libsrcdir="$$s/bfd"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif bfd-bootstrap
-
-
-
-
-
-.PHONY: all-bfd maybe-all-bfd
-maybe-all-bfd:
-@if bfd
-TARGET-bfd=all
-maybe-all-bfd: all-bfd
-all-bfd: configure-bfd
-@endif bfd
-@if bfd-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif bfd-bootstrap
-@if bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bfd))
-@endif bfd
-
-
-
-.PHONY: all-stage1-bfd maybe-all-stage1-bfd
-.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd
-maybe-all-stage1-bfd:
-maybe-clean-stage1-bfd:
-@if bfd-bootstrap
-maybe-all-stage1-bfd: all-stage1-bfd
-all-stage1: all-stage1-bfd
-TARGET-stage1-bfd = $(TARGET-bfd)
-all-stage1-bfd: configure-stage1-bfd
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-bfd)
-
-maybe-clean-stage1-bfd: clean-stage1-bfd
-clean-stage1: clean-stage1-bfd
-clean-stage1-bfd:
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-bfd/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stage2-bfd maybe-all-stage2-bfd
-.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd
-maybe-all-stage2-bfd:
-maybe-clean-stage2-bfd:
-@if bfd-bootstrap
-maybe-all-stage2-bfd: all-stage2-bfd
-all-stage2: all-stage2-bfd
-TARGET-stage2-bfd = $(TARGET-bfd)
-all-stage2-bfd: configure-stage2-bfd
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-bfd)
-
-maybe-clean-stage2-bfd: clean-stage2-bfd
-clean-stage2: clean-stage2-bfd
-clean-stage2-bfd:
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-bfd/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stage3-bfd maybe-all-stage3-bfd
-.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
-maybe-all-stage3-bfd:
-maybe-clean-stage3-bfd:
-@if bfd-bootstrap
-maybe-all-stage3-bfd: all-stage3-bfd
-all-stage3: all-stage3-bfd
-TARGET-stage3-bfd = $(TARGET-bfd)
-all-stage3-bfd: configure-stage3-bfd
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-bfd)
-
-maybe-clean-stage3-bfd: clean-stage3-bfd
-clean-stage3: clean-stage3-bfd
-clean-stage3-bfd:
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-bfd/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stage4-bfd maybe-all-stage4-bfd
-.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
-maybe-all-stage4-bfd:
-maybe-clean-stage4-bfd:
-@if bfd-bootstrap
-maybe-all-stage4-bfd: all-stage4-bfd
-all-stage4: all-stage4-bfd
-TARGET-stage4-bfd = $(TARGET-bfd)
-all-stage4-bfd: configure-stage4-bfd
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-bfd)
-
-maybe-clean-stage4-bfd: clean-stage4-bfd
-clean-stage4: clean-stage4-bfd
-clean-stage4-bfd:
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-bfd/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
-.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd
-maybe-all-stageprofile-bfd:
-maybe-clean-stageprofile-bfd:
-@if bfd-bootstrap
-maybe-all-stageprofile-bfd: all-stageprofile-bfd
-all-stageprofile: all-stageprofile-bfd
-TARGET-stageprofile-bfd = $(TARGET-bfd)
-all-stageprofile-bfd: configure-stageprofile-bfd
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-bfd)
-
-maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
-clean-stageprofile: clean-stageprofile-bfd
-clean-stageprofile-bfd:
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-bfd/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
-.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
-maybe-all-stagefeedback-bfd:
-maybe-clean-stagefeedback-bfd:
-@if bfd-bootstrap
-maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
-all-stagefeedback: all-stagefeedback-bfd
-TARGET-stagefeedback-bfd = $(TARGET-bfd)
-all-stagefeedback-bfd: configure-stagefeedback-bfd
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-bfd)
-
-maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
-clean-stagefeedback: clean-stagefeedback-bfd
-clean-stagefeedback-bfd:
-	@[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-bfd/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif bfd-bootstrap
-
-
-
-
-
-.PHONY: check-bfd maybe-check-bfd
-maybe-check-bfd:
-@if bfd
-maybe-check-bfd: check-bfd
-
-check-bfd:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif bfd
-
-.PHONY: install-bfd maybe-install-bfd
-maybe-install-bfd:
-@if bfd
-maybe-install-bfd: install-bfd
-
-install-bfd: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif bfd
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-bfd info-bfd
-maybe-info-bfd:
-@if bfd
-maybe-info-bfd: info-bfd
-
-info-bfd: \
-    configure-bfd 
-	@[ -f ./bfd/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in bfd" ; \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif bfd
-
-.PHONY: maybe-dvi-bfd dvi-bfd
-maybe-dvi-bfd:
-@if bfd
-maybe-dvi-bfd: dvi-bfd
-
-dvi-bfd: \
-    configure-bfd 
-	@[ -f ./bfd/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in bfd" ; \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif bfd
-
-.PHONY: maybe-html-bfd html-bfd
-maybe-html-bfd:
-@if bfd
-maybe-html-bfd: html-bfd
-
-html-bfd: \
-    configure-bfd 
-	@[ -f ./bfd/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in bfd" ; \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif bfd
-
-.PHONY: maybe-TAGS-bfd TAGS-bfd
-maybe-TAGS-bfd:
-@if bfd
-maybe-TAGS-bfd: TAGS-bfd
-
-TAGS-bfd: \
-    configure-bfd 
-	@[ -f ./bfd/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in bfd" ; \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif bfd
-
-.PHONY: maybe-install-info-bfd install-info-bfd
-maybe-install-info-bfd:
-@if bfd
-maybe-install-info-bfd: install-info-bfd
-
-install-info-bfd: \
-    configure-bfd \
-    info-bfd 
-	@[ -f ./bfd/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in bfd" ; \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif bfd
-
-.PHONY: maybe-installcheck-bfd installcheck-bfd
-maybe-installcheck-bfd:
-@if bfd
-maybe-installcheck-bfd: installcheck-bfd
-
-installcheck-bfd: \
-    configure-bfd 
-	@[ -f ./bfd/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in bfd" ; \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif bfd
-
-.PHONY: maybe-mostlyclean-bfd mostlyclean-bfd
-maybe-mostlyclean-bfd:
-@if bfd
-maybe-mostlyclean-bfd: mostlyclean-bfd
-
-mostlyclean-bfd: 
-	@[ -f ./bfd/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in bfd" ; \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif bfd
-
-.PHONY: maybe-clean-bfd clean-bfd
-maybe-clean-bfd:
-@if bfd
-maybe-clean-bfd: clean-bfd
-
-clean-bfd: 
-	@[ -f ./bfd/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in bfd" ; \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif bfd
-
-.PHONY: maybe-distclean-bfd distclean-bfd
-maybe-distclean-bfd:
-@if bfd
-maybe-distclean-bfd: distclean-bfd
-
-distclean-bfd: 
-	@[ -f ./bfd/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in bfd" ; \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif bfd
-
-.PHONY: maybe-maintainer-clean-bfd maintainer-clean-bfd
-maybe-maintainer-clean-bfd:
-@if bfd
-maybe-maintainer-clean-bfd: maintainer-clean-bfd
-
-maintainer-clean-bfd: 
-	@[ -f ./bfd/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in bfd" ; \
-	(cd $(HOST_SUBDIR)/bfd && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif bfd
-
-
-
-.PHONY: configure-opcodes maybe-configure-opcodes
-maybe-configure-opcodes:
-@if opcodes
-maybe-configure-opcodes: configure-opcodes
-configure-opcodes: 
-@endif opcodes
-@if opcodes-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif opcodes-bootstrap
-@if opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/opcodes; \
-	cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif opcodes
-
-
-
-.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
-maybe-configure-stage1-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stage1-opcodes: configure-stage1-opcodes
-configure-stage1-opcodes:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif opcodes-bootstrap
-
-.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
-maybe-configure-stage2-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stage2-opcodes: configure-stage2-opcodes
-configure-stage2-opcodes:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
-.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
-maybe-configure-stage3-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stage3-opcodes: configure-stage3-opcodes
-configure-stage3-opcodes:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
-.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
-maybe-configure-stage4-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stage4-opcodes: configure-stage4-opcodes
-configure-stage4-opcodes:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
-.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
-maybe-configure-stageprofile-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
-configure-stageprofile-opcodes:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
-.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
-maybe-configure-stagefeedback-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
-configure-stagefeedback-opcodes:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/opcodes"; \
-	libsrcdir="$$s/opcodes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif opcodes-bootstrap
-
-
-
-
-
-.PHONY: all-opcodes maybe-all-opcodes
-maybe-all-opcodes:
-@if opcodes
-TARGET-opcodes=all
-maybe-all-opcodes: all-opcodes
-all-opcodes: configure-opcodes
-@endif opcodes
-@if opcodes-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif opcodes-bootstrap
-@if opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-opcodes))
-@endif opcodes
-
-
-
-.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
-.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes
-maybe-all-stage1-opcodes:
-maybe-clean-stage1-opcodes:
-@if opcodes-bootstrap
-maybe-all-stage1-opcodes: all-stage1-opcodes
-all-stage1: all-stage1-opcodes
-TARGET-stage1-opcodes = $(TARGET-opcodes)
-all-stage1-opcodes: configure-stage1-opcodes
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-opcodes)
-
-maybe-clean-stage1-opcodes: clean-stage1-opcodes
-clean-stage1: clean-stage1-opcodes
-clean-stage1-opcodes:
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-opcodes/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
-.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes
-maybe-all-stage2-opcodes:
-maybe-clean-stage2-opcodes:
-@if opcodes-bootstrap
-maybe-all-stage2-opcodes: all-stage2-opcodes
-all-stage2: all-stage2-opcodes
-TARGET-stage2-opcodes = $(TARGET-opcodes)
-all-stage2-opcodes: configure-stage2-opcodes
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-opcodes)
-
-maybe-clean-stage2-opcodes: clean-stage2-opcodes
-clean-stage2: clean-stage2-opcodes
-clean-stage2-opcodes:
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-opcodes/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
-.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
-maybe-all-stage3-opcodes:
-maybe-clean-stage3-opcodes:
-@if opcodes-bootstrap
-maybe-all-stage3-opcodes: all-stage3-opcodes
-all-stage3: all-stage3-opcodes
-TARGET-stage3-opcodes = $(TARGET-opcodes)
-all-stage3-opcodes: configure-stage3-opcodes
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-opcodes)
-
-maybe-clean-stage3-opcodes: clean-stage3-opcodes
-clean-stage3: clean-stage3-opcodes
-clean-stage3-opcodes:
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-opcodes/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
-.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
-maybe-all-stage4-opcodes:
-maybe-clean-stage4-opcodes:
-@if opcodes-bootstrap
-maybe-all-stage4-opcodes: all-stage4-opcodes
-all-stage4: all-stage4-opcodes
-TARGET-stage4-opcodes = $(TARGET-opcodes)
-all-stage4-opcodes: configure-stage4-opcodes
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-opcodes)
-
-maybe-clean-stage4-opcodes: clean-stage4-opcodes
-clean-stage4: clean-stage4-opcodes
-clean-stage4-opcodes:
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-opcodes/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
-.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes
-maybe-all-stageprofile-opcodes:
-maybe-clean-stageprofile-opcodes:
-@if opcodes-bootstrap
-maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
-all-stageprofile: all-stageprofile-opcodes
-TARGET-stageprofile-opcodes = $(TARGET-opcodes)
-all-stageprofile-opcodes: configure-stageprofile-opcodes
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-opcodes)
-
-maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
-clean-stageprofile: clean-stageprofile-opcodes
-clean-stageprofile-opcodes:
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-opcodes/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
-.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
-maybe-all-stagefeedback-opcodes:
-maybe-clean-stagefeedback-opcodes:
-@if opcodes-bootstrap
-maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
-all-stagefeedback: all-stagefeedback-opcodes
-TARGET-stagefeedback-opcodes = $(TARGET-opcodes)
-all-stagefeedback-opcodes: configure-stagefeedback-opcodes
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-opcodes)
-
-maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
-clean-stagefeedback: clean-stagefeedback-opcodes
-clean-stagefeedback-opcodes:
-	@[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-opcodes/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif opcodes-bootstrap
-
-
-
-
-
-.PHONY: check-opcodes maybe-check-opcodes
-maybe-check-opcodes:
-@if opcodes
-maybe-check-opcodes: check-opcodes
-
-check-opcodes:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif opcodes
-
-.PHONY: install-opcodes maybe-install-opcodes
-maybe-install-opcodes:
-@if opcodes
-maybe-install-opcodes: install-opcodes
-
-install-opcodes: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif opcodes
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-opcodes info-opcodes
-maybe-info-opcodes:
-@if opcodes
-maybe-info-opcodes: info-opcodes
-
-info-opcodes: \
-    configure-opcodes 
-	@[ -f ./opcodes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in opcodes" ; \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif opcodes
-
-.PHONY: maybe-dvi-opcodes dvi-opcodes
-maybe-dvi-opcodes:
-@if opcodes
-maybe-dvi-opcodes: dvi-opcodes
-
-dvi-opcodes: \
-    configure-opcodes 
-	@[ -f ./opcodes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in opcodes" ; \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif opcodes
-
-.PHONY: maybe-html-opcodes html-opcodes
-maybe-html-opcodes:
-@if opcodes
-maybe-html-opcodes: html-opcodes
-
-html-opcodes: \
-    configure-opcodes 
-	@[ -f ./opcodes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in opcodes" ; \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif opcodes
-
-.PHONY: maybe-TAGS-opcodes TAGS-opcodes
-maybe-TAGS-opcodes:
-@if opcodes
-maybe-TAGS-opcodes: TAGS-opcodes
-
-TAGS-opcodes: \
-    configure-opcodes 
-	@[ -f ./opcodes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in opcodes" ; \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif opcodes
-
-.PHONY: maybe-install-info-opcodes install-info-opcodes
-maybe-install-info-opcodes:
-@if opcodes
-maybe-install-info-opcodes: install-info-opcodes
-
-install-info-opcodes: \
-    configure-opcodes \
-    info-opcodes 
-	@[ -f ./opcodes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in opcodes" ; \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif opcodes
-
-.PHONY: maybe-installcheck-opcodes installcheck-opcodes
-maybe-installcheck-opcodes:
-@if opcodes
-maybe-installcheck-opcodes: installcheck-opcodes
-
-installcheck-opcodes: \
-    configure-opcodes 
-	@[ -f ./opcodes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in opcodes" ; \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif opcodes
-
-.PHONY: maybe-mostlyclean-opcodes mostlyclean-opcodes
-maybe-mostlyclean-opcodes:
-@if opcodes
-maybe-mostlyclean-opcodes: mostlyclean-opcodes
-
-mostlyclean-opcodes: 
-	@[ -f ./opcodes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in opcodes" ; \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif opcodes
-
-.PHONY: maybe-clean-opcodes clean-opcodes
-maybe-clean-opcodes:
-@if opcodes
-maybe-clean-opcodes: clean-opcodes
-
-clean-opcodes: 
-	@[ -f ./opcodes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in opcodes" ; \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif opcodes
-
-.PHONY: maybe-distclean-opcodes distclean-opcodes
-maybe-distclean-opcodes:
-@if opcodes
-maybe-distclean-opcodes: distclean-opcodes
-
-distclean-opcodes: 
-	@[ -f ./opcodes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in opcodes" ; \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif opcodes
-
-.PHONY: maybe-maintainer-clean-opcodes maintainer-clean-opcodes
-maybe-maintainer-clean-opcodes:
-@if opcodes
-maybe-maintainer-clean-opcodes: maintainer-clean-opcodes
-
-maintainer-clean-opcodes: 
-	@[ -f ./opcodes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in opcodes" ; \
-	(cd $(HOST_SUBDIR)/opcodes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif opcodes
-
-
-
-.PHONY: configure-binutils maybe-configure-binutils
-maybe-configure-binutils:
-@if binutils
-maybe-configure-binutils: configure-binutils
-configure-binutils: 
-@endif binutils
-@if binutils-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif binutils-bootstrap
-@if binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/binutils; \
-	cd "$(HOST_SUBDIR)/binutils" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif binutils
-
-
-
-.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
-maybe-configure-stage1-binutils:
-@if binutils-bootstrap
-maybe-configure-stage1-binutils: configure-stage1-binutils
-configure-stage1-binutils:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif binutils-bootstrap
-
-.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
-maybe-configure-stage2-binutils:
-@if binutils-bootstrap
-maybe-configure-stage2-binutils: configure-stage2-binutils
-configure-stage2-binutils:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
-maybe-configure-stage3-binutils:
-@if binutils-bootstrap
-maybe-configure-stage3-binutils: configure-stage3-binutils
-configure-stage3-binutils:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
-maybe-configure-stage4-binutils:
-@if binutils-bootstrap
-maybe-configure-stage4-binutils: configure-stage4-binutils
-configure-stage4-binutils:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
-maybe-configure-stageprofile-binutils:
-@if binutils-bootstrap
-maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
-configure-stageprofile-binutils:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
-maybe-configure-stagefeedback-binutils:
-@if binutils-bootstrap
-maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
-configure-stagefeedback-binutils:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/binutils"; \
-	libsrcdir="$$s/binutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif binutils-bootstrap
-
-
-
-
-
-.PHONY: all-binutils maybe-all-binutils
-maybe-all-binutils:
-@if binutils
-TARGET-binutils=all
-maybe-all-binutils: all-binutils
-all-binutils: configure-binutils
-@endif binutils
-@if binutils-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif binutils-bootstrap
-@if binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-binutils))
-@endif binutils
-
-
-
-.PHONY: all-stage1-binutils maybe-all-stage1-binutils
-.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils
-maybe-all-stage1-binutils:
-maybe-clean-stage1-binutils:
-@if binutils-bootstrap
-maybe-all-stage1-binutils: all-stage1-binutils
-all-stage1: all-stage1-binutils
-TARGET-stage1-binutils = $(TARGET-binutils)
-all-stage1-binutils: configure-stage1-binutils
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-binutils)
-
-maybe-clean-stage1-binutils: clean-stage1-binutils
-clean-stage1: clean-stage1-binutils
-clean-stage1-binutils:
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-binutils/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stage2-binutils maybe-all-stage2-binutils
-.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils
-maybe-all-stage2-binutils:
-maybe-clean-stage2-binutils:
-@if binutils-bootstrap
-maybe-all-stage2-binutils: all-stage2-binutils
-all-stage2: all-stage2-binutils
-TARGET-stage2-binutils = $(TARGET-binutils)
-all-stage2-binutils: configure-stage2-binutils
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-binutils)
-
-maybe-clean-stage2-binutils: clean-stage2-binutils
-clean-stage2: clean-stage2-binutils
-clean-stage2-binutils:
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-binutils/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stage3-binutils maybe-all-stage3-binutils
-.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
-maybe-all-stage3-binutils:
-maybe-clean-stage3-binutils:
-@if binutils-bootstrap
-maybe-all-stage3-binutils: all-stage3-binutils
-all-stage3: all-stage3-binutils
-TARGET-stage3-binutils = $(TARGET-binutils)
-all-stage3-binutils: configure-stage3-binutils
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-binutils)
-
-maybe-clean-stage3-binutils: clean-stage3-binutils
-clean-stage3: clean-stage3-binutils
-clean-stage3-binutils:
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-binutils/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stage4-binutils maybe-all-stage4-binutils
-.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
-maybe-all-stage4-binutils:
-maybe-clean-stage4-binutils:
-@if binutils-bootstrap
-maybe-all-stage4-binutils: all-stage4-binutils
-all-stage4: all-stage4-binutils
-TARGET-stage4-binutils = $(TARGET-binutils)
-all-stage4-binutils: configure-stage4-binutils
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-binutils)
-
-maybe-clean-stage4-binutils: clean-stage4-binutils
-clean-stage4: clean-stage4-binutils
-clean-stage4-binutils:
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-binutils/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
-.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils
-maybe-all-stageprofile-binutils:
-maybe-clean-stageprofile-binutils:
-@if binutils-bootstrap
-maybe-all-stageprofile-binutils: all-stageprofile-binutils
-all-stageprofile: all-stageprofile-binutils
-TARGET-stageprofile-binutils = $(TARGET-binutils)
-all-stageprofile-binutils: configure-stageprofile-binutils
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-binutils)
-
-maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
-clean-stageprofile: clean-stageprofile-binutils
-clean-stageprofile-binutils:
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-binutils/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
-.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
-maybe-all-stagefeedback-binutils:
-maybe-clean-stagefeedback-binutils:
-@if binutils-bootstrap
-maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
-all-stagefeedback: all-stagefeedback-binutils
-TARGET-stagefeedback-binutils = $(TARGET-binutils)
-all-stagefeedback-binutils: configure-stagefeedback-binutils
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-binutils)
-
-maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
-clean-stagefeedback: clean-stagefeedback-binutils
-clean-stagefeedback-binutils:
-	@[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-binutils/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif binutils-bootstrap
-
-
-
-
-
-.PHONY: check-binutils maybe-check-binutils
-maybe-check-binutils:
-@if binutils
-maybe-check-binutils: check-binutils
-
-check-binutils:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif binutils
-
-.PHONY: install-binutils maybe-install-binutils
-maybe-install-binutils:
-@if binutils
-maybe-install-binutils: install-binutils
-
-install-binutils: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif binutils
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-binutils info-binutils
-maybe-info-binutils:
-@if binutils
-maybe-info-binutils: info-binutils
-
-info-binutils: \
-    configure-binutils 
-	@[ -f ./binutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in binutils" ; \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif binutils
-
-.PHONY: maybe-dvi-binutils dvi-binutils
-maybe-dvi-binutils:
-@if binutils
-maybe-dvi-binutils: dvi-binutils
-
-dvi-binutils: \
-    configure-binutils 
-	@[ -f ./binutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in binutils" ; \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif binutils
-
-.PHONY: maybe-html-binutils html-binutils
-maybe-html-binutils:
-@if binutils
-maybe-html-binutils: html-binutils
-
-html-binutils: \
-    configure-binutils 
-	@[ -f ./binutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in binutils" ; \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif binutils
-
-.PHONY: maybe-TAGS-binutils TAGS-binutils
-maybe-TAGS-binutils:
-@if binutils
-maybe-TAGS-binutils: TAGS-binutils
-
-TAGS-binutils: \
-    configure-binutils 
-	@[ -f ./binutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in binutils" ; \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif binutils
-
-.PHONY: maybe-install-info-binutils install-info-binutils
-maybe-install-info-binutils:
-@if binutils
-maybe-install-info-binutils: install-info-binutils
-
-install-info-binutils: \
-    configure-binutils \
-    info-binutils 
-	@[ -f ./binutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in binutils" ; \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif binutils
-
-.PHONY: maybe-installcheck-binutils installcheck-binutils
-maybe-installcheck-binutils:
-@if binutils
-maybe-installcheck-binutils: installcheck-binutils
-
-installcheck-binutils: \
-    configure-binutils 
-	@[ -f ./binutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in binutils" ; \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif binutils
-
-.PHONY: maybe-mostlyclean-binutils mostlyclean-binutils
-maybe-mostlyclean-binutils:
-@if binutils
-maybe-mostlyclean-binutils: mostlyclean-binutils
-
-mostlyclean-binutils: 
-	@[ -f ./binutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in binutils" ; \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif binutils
-
-.PHONY: maybe-clean-binutils clean-binutils
-maybe-clean-binutils:
-@if binutils
-maybe-clean-binutils: clean-binutils
-
-clean-binutils: 
-	@[ -f ./binutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in binutils" ; \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif binutils
-
-.PHONY: maybe-distclean-binutils distclean-binutils
-maybe-distclean-binutils:
-@if binutils
-maybe-distclean-binutils: distclean-binutils
-
-distclean-binutils: 
-	@[ -f ./binutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in binutils" ; \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif binutils
-
-.PHONY: maybe-maintainer-clean-binutils maintainer-clean-binutils
-maybe-maintainer-clean-binutils:
-@if binutils
-maybe-maintainer-clean-binutils: maintainer-clean-binutils
-
-maintainer-clean-binutils: 
-	@[ -f ./binutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in binutils" ; \
-	(cd $(HOST_SUBDIR)/binutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif binutils
-
-
-
-.PHONY: configure-bison maybe-configure-bison
-maybe-configure-bison:
-@if bison
-maybe-configure-bison: configure-bison
-configure-bison: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/bison; \
-	cd "$(HOST_SUBDIR)/bison" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bison/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bison"; \
-	libsrcdir="$$s/bison"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif bison
-
-
-
-
-
-.PHONY: all-bison maybe-all-bison
-maybe-all-bison:
-@if bison
-TARGET-bison=all
-maybe-all-bison: all-bison
-all-bison: configure-bison
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/bison && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bison))
-@endif bison
-
-
-
-
-.PHONY: check-bison maybe-check-bison
-maybe-check-bison:
-@if bison
-maybe-check-bison: check-bison
-
-# This module is only tested in a native toolchain.
-check-bison:
-	@: $(MAKE); $(unstage)
-	@if [ '$(host)' = '$(target)' ] ; then \
-	  r=`${PWD_COMMAND}`; export r; \
-	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	  $(HOST_EXPORTS) \
-	  (cd $(HOST_SUBDIR)/bison && \
-	    $(MAKE) $(FLAGS_TO_PASS)  check); \
-	fi
-
-@endif bison
-
-.PHONY: install-bison maybe-install-bison
-maybe-install-bison:
-@if bison
-maybe-install-bison: install-bison
-
-install-bison: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/bison && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif bison
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-bison info-bison
-maybe-info-bison:
-@if bison
-maybe-info-bison: info-bison
-
-info-bison: \
-    configure-bison 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bison/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in bison" ; \
-	(cd $(HOST_SUBDIR)/bison && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif bison
-
-.PHONY: maybe-dvi-bison dvi-bison
-maybe-dvi-bison:
-@if bison
-maybe-dvi-bison: dvi-bison
-
-dvi-bison: \
-    configure-bison 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bison/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in bison" ; \
-	(cd $(HOST_SUBDIR)/bison && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif bison
-
-.PHONY: maybe-html-bison html-bison
-maybe-html-bison:
-@if bison
-maybe-html-bison: html-bison
-
-html-bison: \
-    configure-bison 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bison/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in bison" ; \
-	(cd $(HOST_SUBDIR)/bison && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif bison
-
-.PHONY: maybe-TAGS-bison TAGS-bison
-maybe-TAGS-bison:
-@if bison
-maybe-TAGS-bison: TAGS-bison
-
-TAGS-bison: \
-    configure-bison 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bison/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in bison" ; \
-	(cd $(HOST_SUBDIR)/bison && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif bison
-
-.PHONY: maybe-install-info-bison install-info-bison
-maybe-install-info-bison:
-@if bison
-maybe-install-info-bison: install-info-bison
-
-install-info-bison: \
-    configure-bison \
-    info-bison 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bison/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in bison" ; \
-	(cd $(HOST_SUBDIR)/bison && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif bison
-
-.PHONY: maybe-installcheck-bison installcheck-bison
-maybe-installcheck-bison:
-@if bison
-maybe-installcheck-bison: installcheck-bison
-
-installcheck-bison: \
-    configure-bison 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bison/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in bison" ; \
-	(cd $(HOST_SUBDIR)/bison && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif bison
-
-.PHONY: maybe-mostlyclean-bison mostlyclean-bison
-maybe-mostlyclean-bison:
-@if bison
-maybe-mostlyclean-bison: mostlyclean-bison
-
-mostlyclean-bison: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bison/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in bison" ; \
-	(cd $(HOST_SUBDIR)/bison && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif bison
-
-.PHONY: maybe-clean-bison clean-bison
-maybe-clean-bison:
-@if bison
-maybe-clean-bison: clean-bison
-
-clean-bison: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bison/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in bison" ; \
-	(cd $(HOST_SUBDIR)/bison && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif bison
-
-.PHONY: maybe-distclean-bison distclean-bison
-maybe-distclean-bison:
-@if bison
-maybe-distclean-bison: distclean-bison
-
-distclean-bison: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bison/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in bison" ; \
-	(cd $(HOST_SUBDIR)/bison && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif bison
-
-.PHONY: maybe-maintainer-clean-bison maintainer-clean-bison
-maybe-maintainer-clean-bison:
-@if bison
-maybe-maintainer-clean-bison: maintainer-clean-bison
-
-maintainer-clean-bison: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bison/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in bison" ; \
-	(cd $(HOST_SUBDIR)/bison && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif bison
-
-
-
-.PHONY: configure-byacc maybe-configure-byacc
-maybe-configure-byacc:
-@if byacc
-maybe-configure-byacc: configure-byacc
-configure-byacc: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/byacc; \
-	cd "$(HOST_SUBDIR)/byacc" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/byacc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/byacc"; \
-	libsrcdir="$$s/byacc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif byacc
-
-
-
-
-
-.PHONY: all-byacc maybe-all-byacc
-maybe-all-byacc:
-@if byacc
-TARGET-byacc=all
-maybe-all-byacc: all-byacc
-all-byacc: configure-byacc
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/byacc && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-byacc))
-@endif byacc
-
-
-
-
-.PHONY: check-byacc maybe-check-byacc
-maybe-check-byacc:
-@if byacc
-maybe-check-byacc: check-byacc
-
-# This module is only tested in a native toolchain.
-check-byacc:
-	@: $(MAKE); $(unstage)
-	@if [ '$(host)' = '$(target)' ] ; then \
-	  r=`${PWD_COMMAND}`; export r; \
-	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	  $(HOST_EXPORTS) \
-	  (cd $(HOST_SUBDIR)/byacc && \
-	    $(MAKE) $(FLAGS_TO_PASS)  check); \
-	fi
-
-@endif byacc
-
-.PHONY: install-byacc maybe-install-byacc
-maybe-install-byacc:
-@if byacc
-maybe-install-byacc: install-byacc
-
-install-byacc: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/byacc && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif byacc
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-byacc info-byacc
-maybe-info-byacc:
-@if byacc
-maybe-info-byacc: info-byacc
-
-info-byacc: \
-    configure-byacc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./byacc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in byacc" ; \
-	(cd $(HOST_SUBDIR)/byacc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif byacc
-
-.PHONY: maybe-dvi-byacc dvi-byacc
-maybe-dvi-byacc:
-@if byacc
-maybe-dvi-byacc: dvi-byacc
-
-dvi-byacc: \
-    configure-byacc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./byacc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in byacc" ; \
-	(cd $(HOST_SUBDIR)/byacc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif byacc
-
-.PHONY: maybe-html-byacc html-byacc
-maybe-html-byacc:
-@if byacc
-maybe-html-byacc: html-byacc
-
-html-byacc: \
-    configure-byacc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./byacc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in byacc" ; \
-	(cd $(HOST_SUBDIR)/byacc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif byacc
-
-.PHONY: maybe-TAGS-byacc TAGS-byacc
-maybe-TAGS-byacc:
-@if byacc
-maybe-TAGS-byacc: TAGS-byacc
-
-TAGS-byacc: \
-    configure-byacc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./byacc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in byacc" ; \
-	(cd $(HOST_SUBDIR)/byacc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif byacc
-
-.PHONY: maybe-install-info-byacc install-info-byacc
-maybe-install-info-byacc:
-@if byacc
-maybe-install-info-byacc: install-info-byacc
-
-install-info-byacc: \
-    configure-byacc \
-    info-byacc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./byacc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in byacc" ; \
-	(cd $(HOST_SUBDIR)/byacc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif byacc
-
-.PHONY: maybe-installcheck-byacc installcheck-byacc
-maybe-installcheck-byacc:
-@if byacc
-maybe-installcheck-byacc: installcheck-byacc
-
-installcheck-byacc: \
-    configure-byacc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./byacc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in byacc" ; \
-	(cd $(HOST_SUBDIR)/byacc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif byacc
-
-.PHONY: maybe-mostlyclean-byacc mostlyclean-byacc
-maybe-mostlyclean-byacc:
-@if byacc
-maybe-mostlyclean-byacc: mostlyclean-byacc
-
-mostlyclean-byacc: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./byacc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in byacc" ; \
-	(cd $(HOST_SUBDIR)/byacc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif byacc
-
-.PHONY: maybe-clean-byacc clean-byacc
-maybe-clean-byacc:
-@if byacc
-maybe-clean-byacc: clean-byacc
-
-clean-byacc: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./byacc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in byacc" ; \
-	(cd $(HOST_SUBDIR)/byacc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif byacc
-
-.PHONY: maybe-distclean-byacc distclean-byacc
-maybe-distclean-byacc:
-@if byacc
-maybe-distclean-byacc: distclean-byacc
-
-distclean-byacc: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./byacc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in byacc" ; \
-	(cd $(HOST_SUBDIR)/byacc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif byacc
-
-.PHONY: maybe-maintainer-clean-byacc maintainer-clean-byacc
-maybe-maintainer-clean-byacc:
-@if byacc
-maybe-maintainer-clean-byacc: maintainer-clean-byacc
-
-maintainer-clean-byacc: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./byacc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in byacc" ; \
-	(cd $(HOST_SUBDIR)/byacc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif byacc
-
-
-
-.PHONY: configure-bzip2 maybe-configure-bzip2
-maybe-configure-bzip2:
-@if bzip2
-maybe-configure-bzip2: configure-bzip2
-configure-bzip2: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/bzip2; \
-	cd "$(HOST_SUBDIR)/bzip2" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bzip2/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/bzip2"; \
-	libsrcdir="$$s/bzip2"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif bzip2
-
-
-
-
-
-.PHONY: all-bzip2 maybe-all-bzip2
-maybe-all-bzip2:
-@if bzip2
-TARGET-bzip2=all
-maybe-all-bzip2: all-bzip2
-all-bzip2: configure-bzip2
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bzip2))
-@endif bzip2
-
-
-
-
-.PHONY: check-bzip2 maybe-check-bzip2
-maybe-check-bzip2:
-@if bzip2
-maybe-check-bzip2: check-bzip2
-
-check-bzip2:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif bzip2
-
-.PHONY: install-bzip2 maybe-install-bzip2
-maybe-install-bzip2:
-@if bzip2
-maybe-install-bzip2: install-bzip2
-
-install-bzip2: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif bzip2
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-bzip2 info-bzip2
-maybe-info-bzip2:
-@if bzip2
-maybe-info-bzip2: info-bzip2
-
-info-bzip2: \
-    configure-bzip2 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bzip2/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in bzip2" ; \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif bzip2
-
-.PHONY: maybe-dvi-bzip2 dvi-bzip2
-maybe-dvi-bzip2:
-@if bzip2
-maybe-dvi-bzip2: dvi-bzip2
-
-dvi-bzip2: \
-    configure-bzip2 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bzip2/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in bzip2" ; \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif bzip2
-
-.PHONY: maybe-html-bzip2 html-bzip2
-maybe-html-bzip2:
-@if bzip2
-maybe-html-bzip2: html-bzip2
-
-html-bzip2: \
-    configure-bzip2 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bzip2/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in bzip2" ; \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif bzip2
-
-.PHONY: maybe-TAGS-bzip2 TAGS-bzip2
-maybe-TAGS-bzip2:
-@if bzip2
-maybe-TAGS-bzip2: TAGS-bzip2
-
-TAGS-bzip2: \
-    configure-bzip2 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bzip2/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in bzip2" ; \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif bzip2
-
-.PHONY: maybe-install-info-bzip2 install-info-bzip2
-maybe-install-info-bzip2:
-@if bzip2
-maybe-install-info-bzip2: install-info-bzip2
-
-install-info-bzip2: \
-    configure-bzip2 \
-    info-bzip2 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bzip2/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in bzip2" ; \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif bzip2
-
-.PHONY: maybe-installcheck-bzip2 installcheck-bzip2
-maybe-installcheck-bzip2:
-@if bzip2
-maybe-installcheck-bzip2: installcheck-bzip2
-
-installcheck-bzip2: \
-    configure-bzip2 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bzip2/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in bzip2" ; \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif bzip2
-
-.PHONY: maybe-mostlyclean-bzip2 mostlyclean-bzip2
-maybe-mostlyclean-bzip2:
-@if bzip2
-maybe-mostlyclean-bzip2: mostlyclean-bzip2
-
-mostlyclean-bzip2: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bzip2/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in bzip2" ; \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif bzip2
-
-.PHONY: maybe-clean-bzip2 clean-bzip2
-maybe-clean-bzip2:
-@if bzip2
-maybe-clean-bzip2: clean-bzip2
-
-clean-bzip2: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bzip2/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in bzip2" ; \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif bzip2
-
-.PHONY: maybe-distclean-bzip2 distclean-bzip2
-maybe-distclean-bzip2:
-@if bzip2
-maybe-distclean-bzip2: distclean-bzip2
-
-distclean-bzip2: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bzip2/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in bzip2" ; \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif bzip2
-
-.PHONY: maybe-maintainer-clean-bzip2 maintainer-clean-bzip2
-maybe-maintainer-clean-bzip2:
-@if bzip2
-maybe-maintainer-clean-bzip2: maintainer-clean-bzip2
-
-maintainer-clean-bzip2: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./bzip2/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in bzip2" ; \
-	(cd $(HOST_SUBDIR)/bzip2 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif bzip2
-
-
-
-.PHONY: configure-dejagnu maybe-configure-dejagnu
-maybe-configure-dejagnu:
-@if dejagnu
-maybe-configure-dejagnu: configure-dejagnu
-configure-dejagnu: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/dejagnu; \
-	cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/dejagnu"; \
-	libsrcdir="$$s/dejagnu"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif dejagnu
-
-
-
-
-
-.PHONY: all-dejagnu maybe-all-dejagnu
-maybe-all-dejagnu:
-@if dejagnu
-TARGET-dejagnu=all
-maybe-all-dejagnu: all-dejagnu
-all-dejagnu: configure-dejagnu
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dejagnu))
-@endif dejagnu
-
-
-
-
-.PHONY: check-dejagnu maybe-check-dejagnu
-maybe-check-dejagnu:
-@if dejagnu
-maybe-check-dejagnu: check-dejagnu
-
-check-dejagnu:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif dejagnu
-
-.PHONY: install-dejagnu maybe-install-dejagnu
-maybe-install-dejagnu:
-@if dejagnu
-maybe-install-dejagnu: install-dejagnu
-
-install-dejagnu: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif dejagnu
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-dejagnu info-dejagnu
-maybe-info-dejagnu:
-@if dejagnu
-maybe-info-dejagnu: info-dejagnu
-
-info-dejagnu: \
-    configure-dejagnu 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dejagnu/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in dejagnu" ; \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif dejagnu
-
-.PHONY: maybe-dvi-dejagnu dvi-dejagnu
-maybe-dvi-dejagnu:
-@if dejagnu
-maybe-dvi-dejagnu: dvi-dejagnu
-
-dvi-dejagnu: \
-    configure-dejagnu 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dejagnu/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in dejagnu" ; \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif dejagnu
-
-.PHONY: maybe-html-dejagnu html-dejagnu
-maybe-html-dejagnu:
-@if dejagnu
-maybe-html-dejagnu: html-dejagnu
-
-html-dejagnu: \
-    configure-dejagnu 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dejagnu/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in dejagnu" ; \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif dejagnu
-
-.PHONY: maybe-TAGS-dejagnu TAGS-dejagnu
-maybe-TAGS-dejagnu:
-@if dejagnu
-maybe-TAGS-dejagnu: TAGS-dejagnu
-
-TAGS-dejagnu: \
-    configure-dejagnu 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dejagnu/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in dejagnu" ; \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif dejagnu
-
-.PHONY: maybe-install-info-dejagnu install-info-dejagnu
-maybe-install-info-dejagnu:
-@if dejagnu
-maybe-install-info-dejagnu: install-info-dejagnu
-
-install-info-dejagnu: \
-    configure-dejagnu \
-    info-dejagnu 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dejagnu/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in dejagnu" ; \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif dejagnu
-
-.PHONY: maybe-installcheck-dejagnu installcheck-dejagnu
-maybe-installcheck-dejagnu:
-@if dejagnu
-maybe-installcheck-dejagnu: installcheck-dejagnu
-
-installcheck-dejagnu: \
-    configure-dejagnu 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dejagnu/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in dejagnu" ; \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif dejagnu
-
-.PHONY: maybe-mostlyclean-dejagnu mostlyclean-dejagnu
-maybe-mostlyclean-dejagnu:
-@if dejagnu
-maybe-mostlyclean-dejagnu: mostlyclean-dejagnu
-
-mostlyclean-dejagnu: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dejagnu/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in dejagnu" ; \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif dejagnu
-
-.PHONY: maybe-clean-dejagnu clean-dejagnu
-maybe-clean-dejagnu:
-@if dejagnu
-maybe-clean-dejagnu: clean-dejagnu
-
-clean-dejagnu: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dejagnu/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in dejagnu" ; \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif dejagnu
-
-.PHONY: maybe-distclean-dejagnu distclean-dejagnu
-maybe-distclean-dejagnu:
-@if dejagnu
-maybe-distclean-dejagnu: distclean-dejagnu
-
-distclean-dejagnu: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dejagnu/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in dejagnu" ; \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif dejagnu
-
-.PHONY: maybe-maintainer-clean-dejagnu maintainer-clean-dejagnu
-maybe-maintainer-clean-dejagnu:
-@if dejagnu
-maybe-maintainer-clean-dejagnu: maintainer-clean-dejagnu
-
-maintainer-clean-dejagnu: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dejagnu/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in dejagnu" ; \
-	(cd $(HOST_SUBDIR)/dejagnu && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif dejagnu
-
-
-
-.PHONY: configure-diff maybe-configure-diff
-maybe-configure-diff:
-@if diff
-maybe-configure-diff: configure-diff
-configure-diff: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/diff ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/diff; \
-	cd "$(HOST_SUBDIR)/diff" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/diff/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/diff"; \
-	libsrcdir="$$s/diff"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif diff
-
-
-
-
-
-.PHONY: all-diff maybe-all-diff
-maybe-all-diff:
-@if diff
-TARGET-diff=all
-maybe-all-diff: all-diff
-all-diff: configure-diff
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-diff))
-@endif diff
-
-
-
-
-.PHONY: check-diff maybe-check-diff
-maybe-check-diff:
-@if diff
-maybe-check-diff: check-diff
-
-check-diff:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif diff
-
-.PHONY: install-diff maybe-install-diff
-maybe-install-diff:
-@if diff
-maybe-install-diff: install-diff
-
-install-diff: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif diff
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-diff info-diff
-maybe-info-diff:
-@if diff
-maybe-info-diff: info-diff
-
-info-diff: \
-    configure-diff 
-	@: $(MAKE); $(unstage)
-	@[ -f ./diff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in diff" ; \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif diff
-
-.PHONY: maybe-dvi-diff dvi-diff
-maybe-dvi-diff:
-@if diff
-maybe-dvi-diff: dvi-diff
-
-dvi-diff: \
-    configure-diff 
-	@: $(MAKE); $(unstage)
-	@[ -f ./diff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in diff" ; \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif diff
-
-.PHONY: maybe-html-diff html-diff
-maybe-html-diff:
-@if diff
-maybe-html-diff: html-diff
-
-html-diff: \
-    configure-diff 
-	@: $(MAKE); $(unstage)
-	@[ -f ./diff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in diff" ; \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif diff
-
-.PHONY: maybe-TAGS-diff TAGS-diff
-maybe-TAGS-diff:
-@if diff
-maybe-TAGS-diff: TAGS-diff
-
-TAGS-diff: \
-    configure-diff 
-	@: $(MAKE); $(unstage)
-	@[ -f ./diff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in diff" ; \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif diff
-
-.PHONY: maybe-install-info-diff install-info-diff
-maybe-install-info-diff:
-@if diff
-maybe-install-info-diff: install-info-diff
-
-install-info-diff: \
-    configure-diff \
-    info-diff 
-	@: $(MAKE); $(unstage)
-	@[ -f ./diff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in diff" ; \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif diff
-
-.PHONY: maybe-installcheck-diff installcheck-diff
-maybe-installcheck-diff:
-@if diff
-maybe-installcheck-diff: installcheck-diff
-
-installcheck-diff: \
-    configure-diff 
-	@: $(MAKE); $(unstage)
-	@[ -f ./diff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in diff" ; \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif diff
-
-.PHONY: maybe-mostlyclean-diff mostlyclean-diff
-maybe-mostlyclean-diff:
-@if diff
-maybe-mostlyclean-diff: mostlyclean-diff
-
-mostlyclean-diff: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./diff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in diff" ; \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif diff
-
-.PHONY: maybe-clean-diff clean-diff
-maybe-clean-diff:
-@if diff
-maybe-clean-diff: clean-diff
-
-clean-diff: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./diff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in diff" ; \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif diff
-
-.PHONY: maybe-distclean-diff distclean-diff
-maybe-distclean-diff:
-@if diff
-maybe-distclean-diff: distclean-diff
-
-distclean-diff: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./diff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in diff" ; \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif diff
-
-.PHONY: maybe-maintainer-clean-diff maintainer-clean-diff
-maybe-maintainer-clean-diff:
-@if diff
-maybe-maintainer-clean-diff: maintainer-clean-diff
-
-maintainer-clean-diff: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./diff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in diff" ; \
-	(cd $(HOST_SUBDIR)/diff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif diff
-
-
-
-.PHONY: configure-dosutils maybe-configure-dosutils
-maybe-configure-dosutils:
-@if dosutils
-maybe-configure-dosutils: configure-dosutils
-configure-dosutils: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/dosutils; \
-	cd "$(HOST_SUBDIR)/dosutils" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/dosutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/dosutils"; \
-	libsrcdir="$$s/dosutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif dosutils
-
-
-
-
-
-.PHONY: all-dosutils maybe-all-dosutils
-maybe-all-dosutils:
-@if dosutils
-TARGET-dosutils=all
-maybe-all-dosutils: all-dosutils
-all-dosutils: configure-dosutils
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/dosutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dosutils))
-@endif dosutils
-
-
-
-
-.PHONY: check-dosutils maybe-check-dosutils
-maybe-check-dosutils:
-@if dosutils
-maybe-check-dosutils: check-dosutils
-
-check-dosutils:
-
-@endif dosutils
-
-.PHONY: install-dosutils maybe-install-dosutils
-maybe-install-dosutils:
-@if dosutils
-maybe-install-dosutils: install-dosutils
-
-install-dosutils: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/dosutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif dosutils
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-dosutils info-dosutils
-maybe-info-dosutils:
-@if dosutils
-maybe-info-dosutils: info-dosutils
-
-info-dosutils: \
-    configure-dosutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dosutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in dosutils" ; \
-	(cd $(HOST_SUBDIR)/dosutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif dosutils
-
-.PHONY: maybe-dvi-dosutils dvi-dosutils
-maybe-dvi-dosutils:
-@if dosutils
-maybe-dvi-dosutils: dvi-dosutils
-
-dvi-dosutils: \
-    configure-dosutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dosutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in dosutils" ; \
-	(cd $(HOST_SUBDIR)/dosutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif dosutils
-
-.PHONY: maybe-html-dosutils html-dosutils
-maybe-html-dosutils:
-@if dosutils
-maybe-html-dosutils: html-dosutils
-
-html-dosutils: \
-    configure-dosutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dosutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in dosutils" ; \
-	(cd $(HOST_SUBDIR)/dosutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif dosutils
-
-.PHONY: maybe-TAGS-dosutils TAGS-dosutils
-maybe-TAGS-dosutils:
-@if dosutils
-maybe-TAGS-dosutils: TAGS-dosutils
-
-TAGS-dosutils: \
-    configure-dosutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dosutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in dosutils" ; \
-	(cd $(HOST_SUBDIR)/dosutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif dosutils
-
-.PHONY: maybe-install-info-dosutils install-info-dosutils
-maybe-install-info-dosutils:
-@if dosutils
-maybe-install-info-dosutils: install-info-dosutils
-
-install-info-dosutils: \
-    configure-dosutils \
-    info-dosutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dosutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in dosutils" ; \
-	(cd $(HOST_SUBDIR)/dosutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif dosutils
-
-.PHONY: maybe-installcheck-dosutils installcheck-dosutils
-maybe-installcheck-dosutils:
-@if dosutils
-maybe-installcheck-dosutils: installcheck-dosutils
-
-installcheck-dosutils: \
-    configure-dosutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dosutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in dosutils" ; \
-	(cd $(HOST_SUBDIR)/dosutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif dosutils
-
-.PHONY: maybe-mostlyclean-dosutils mostlyclean-dosutils
-maybe-mostlyclean-dosutils:
-@if dosutils
-maybe-mostlyclean-dosutils: mostlyclean-dosutils
-
-mostlyclean-dosutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dosutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in dosutils" ; \
-	(cd $(HOST_SUBDIR)/dosutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif dosutils
-
-.PHONY: maybe-clean-dosutils clean-dosutils
-maybe-clean-dosutils:
-@if dosutils
-maybe-clean-dosutils: clean-dosutils
-
-clean-dosutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dosutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in dosutils" ; \
-	(cd $(HOST_SUBDIR)/dosutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif dosutils
-
-.PHONY: maybe-distclean-dosutils distclean-dosutils
-maybe-distclean-dosutils:
-@if dosutils
-maybe-distclean-dosutils: distclean-dosutils
-
-distclean-dosutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dosutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in dosutils" ; \
-	(cd $(HOST_SUBDIR)/dosutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif dosutils
-
-.PHONY: maybe-maintainer-clean-dosutils maintainer-clean-dosutils
-maybe-maintainer-clean-dosutils:
-@if dosutils
-maybe-maintainer-clean-dosutils: maintainer-clean-dosutils
-
-maintainer-clean-dosutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./dosutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in dosutils" ; \
-	(cd $(HOST_SUBDIR)/dosutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif dosutils
-
-
-
-.PHONY: configure-etc maybe-configure-etc
-maybe-configure-etc:
-@if etc
-maybe-configure-etc: configure-etc
-configure-etc: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/etc; \
-	cd "$(HOST_SUBDIR)/etc" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/etc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/etc"; \
-	libsrcdir="$$s/etc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif etc
-
-
-
-
-
-.PHONY: all-etc maybe-all-etc
-maybe-all-etc:
-@if etc
-TARGET-etc=all
-maybe-all-etc: all-etc
-all-etc: configure-etc
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-etc))
-@endif etc
-
-
-
-
-.PHONY: check-etc maybe-check-etc
-maybe-check-etc:
-@if etc
-maybe-check-etc: check-etc
-
-check-etc:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif etc
-
-.PHONY: install-etc maybe-install-etc
-maybe-install-etc:
-@if etc
-maybe-install-etc: install-etc
-
-install-etc: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif etc
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-etc info-etc
-maybe-info-etc:
-@if etc
-maybe-info-etc: info-etc
-
-info-etc: \
-    configure-etc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./etc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in etc" ; \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif etc
-
-.PHONY: maybe-dvi-etc dvi-etc
-maybe-dvi-etc:
-@if etc
-maybe-dvi-etc: dvi-etc
-
-dvi-etc: \
-    configure-etc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./etc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in etc" ; \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif etc
-
-.PHONY: maybe-html-etc html-etc
-maybe-html-etc:
-@if etc
-maybe-html-etc: html-etc
-
-html-etc: \
-    configure-etc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./etc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in etc" ; \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif etc
-
-.PHONY: maybe-TAGS-etc TAGS-etc
-maybe-TAGS-etc:
-@if etc
-maybe-TAGS-etc: TAGS-etc
-
-TAGS-etc: \
-    configure-etc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./etc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in etc" ; \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif etc
-
-.PHONY: maybe-install-info-etc install-info-etc
-maybe-install-info-etc:
-@if etc
-maybe-install-info-etc: install-info-etc
-
-install-info-etc: \
-    configure-etc \
-    info-etc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./etc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in etc" ; \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif etc
-
-.PHONY: maybe-installcheck-etc installcheck-etc
-maybe-installcheck-etc:
-@if etc
-maybe-installcheck-etc: installcheck-etc
-
-installcheck-etc: \
-    configure-etc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./etc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in etc" ; \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif etc
-
-.PHONY: maybe-mostlyclean-etc mostlyclean-etc
-maybe-mostlyclean-etc:
-@if etc
-maybe-mostlyclean-etc: mostlyclean-etc
-
-mostlyclean-etc: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./etc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in etc" ; \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif etc
-
-.PHONY: maybe-clean-etc clean-etc
-maybe-clean-etc:
-@if etc
-maybe-clean-etc: clean-etc
-
-clean-etc: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./etc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in etc" ; \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif etc
-
-.PHONY: maybe-distclean-etc distclean-etc
-maybe-distclean-etc:
-@if etc
-maybe-distclean-etc: distclean-etc
-
-distclean-etc: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./etc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in etc" ; \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif etc
-
-.PHONY: maybe-maintainer-clean-etc maintainer-clean-etc
-maybe-maintainer-clean-etc:
-@if etc
-maybe-maintainer-clean-etc: maintainer-clean-etc
-
-maintainer-clean-etc: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./etc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in etc" ; \
-	(cd $(HOST_SUBDIR)/etc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif etc
-
-
-
-.PHONY: configure-fastjar maybe-configure-fastjar
-maybe-configure-fastjar:
-@if fastjar
-maybe-configure-fastjar: configure-fastjar
-configure-fastjar: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/fastjar; \
-	cd "$(HOST_SUBDIR)/fastjar" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/fastjar"; \
-	libsrcdir="$$s/fastjar"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif fastjar
-
-
-
-
-
-.PHONY: all-fastjar maybe-all-fastjar
-maybe-all-fastjar:
-@if fastjar
-TARGET-fastjar=all
-maybe-all-fastjar: all-fastjar
-all-fastjar: configure-fastjar
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/fastjar && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fastjar))
-@endif fastjar
-
-
-
-
-.PHONY: check-fastjar maybe-check-fastjar
-maybe-check-fastjar:
-@if fastjar
-maybe-check-fastjar: check-fastjar
-
-# This module is only tested in a native toolchain.
-check-fastjar:
-	@: $(MAKE); $(unstage)
-	@if [ '$(host)' = '$(target)' ] ; then \
-	  r=`${PWD_COMMAND}`; export r; \
-	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	  $(HOST_EXPORTS) \
-	  (cd $(HOST_SUBDIR)/fastjar && \
-	    $(MAKE) $(FLAGS_TO_PASS)  check); \
-	fi
-
-@endif fastjar
-
-.PHONY: install-fastjar maybe-install-fastjar
-maybe-install-fastjar:
-@if fastjar
-maybe-install-fastjar: install-fastjar
-
-install-fastjar: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/fastjar && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif fastjar
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-fastjar info-fastjar
-maybe-info-fastjar:
-@if fastjar
-maybe-info-fastjar: info-fastjar
-
-info-fastjar: \
-    configure-fastjar 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fastjar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in fastjar" ; \
-	(cd $(HOST_SUBDIR)/fastjar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif fastjar
-
-.PHONY: maybe-dvi-fastjar dvi-fastjar
-maybe-dvi-fastjar:
-@if fastjar
-maybe-dvi-fastjar: dvi-fastjar
-
-dvi-fastjar: \
-    configure-fastjar 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fastjar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in fastjar" ; \
-	(cd $(HOST_SUBDIR)/fastjar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif fastjar
-
-.PHONY: maybe-html-fastjar html-fastjar
-maybe-html-fastjar:
-@if fastjar
-maybe-html-fastjar: html-fastjar
-
-html-fastjar: \
-    configure-fastjar 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fastjar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in fastjar" ; \
-	(cd $(HOST_SUBDIR)/fastjar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif fastjar
-
-.PHONY: maybe-TAGS-fastjar TAGS-fastjar
-maybe-TAGS-fastjar:
-@if fastjar
-maybe-TAGS-fastjar: TAGS-fastjar
-
-TAGS-fastjar: \
-    configure-fastjar 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fastjar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in fastjar" ; \
-	(cd $(HOST_SUBDIR)/fastjar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif fastjar
-
-.PHONY: maybe-install-info-fastjar install-info-fastjar
-maybe-install-info-fastjar:
-@if fastjar
-maybe-install-info-fastjar: install-info-fastjar
-
-install-info-fastjar: \
-    configure-fastjar \
-    info-fastjar 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fastjar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in fastjar" ; \
-	(cd $(HOST_SUBDIR)/fastjar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif fastjar
-
-.PHONY: maybe-installcheck-fastjar installcheck-fastjar
-maybe-installcheck-fastjar:
-@if fastjar
-maybe-installcheck-fastjar: installcheck-fastjar
-
-installcheck-fastjar: \
-    configure-fastjar 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fastjar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in fastjar" ; \
-	(cd $(HOST_SUBDIR)/fastjar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif fastjar
-
-.PHONY: maybe-mostlyclean-fastjar mostlyclean-fastjar
-maybe-mostlyclean-fastjar:
-@if fastjar
-maybe-mostlyclean-fastjar: mostlyclean-fastjar
-
-mostlyclean-fastjar: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fastjar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in fastjar" ; \
-	(cd $(HOST_SUBDIR)/fastjar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif fastjar
-
-.PHONY: maybe-clean-fastjar clean-fastjar
-maybe-clean-fastjar:
-@if fastjar
-maybe-clean-fastjar: clean-fastjar
-
-clean-fastjar: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fastjar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in fastjar" ; \
-	(cd $(HOST_SUBDIR)/fastjar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif fastjar
-
-.PHONY: maybe-distclean-fastjar distclean-fastjar
-maybe-distclean-fastjar:
-@if fastjar
-maybe-distclean-fastjar: distclean-fastjar
-
-distclean-fastjar: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fastjar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in fastjar" ; \
-	(cd $(HOST_SUBDIR)/fastjar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif fastjar
-
-.PHONY: maybe-maintainer-clean-fastjar maintainer-clean-fastjar
-maybe-maintainer-clean-fastjar:
-@if fastjar
-maybe-maintainer-clean-fastjar: maintainer-clean-fastjar
-
-maintainer-clean-fastjar: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fastjar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in fastjar" ; \
-	(cd $(HOST_SUBDIR)/fastjar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif fastjar
-
-
-
-.PHONY: configure-fileutils maybe-configure-fileutils
-maybe-configure-fileutils:
-@if fileutils
-maybe-configure-fileutils: configure-fileutils
-configure-fileutils: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fileutils ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/fileutils; \
-	cd "$(HOST_SUBDIR)/fileutils" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/fileutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/fileutils"; \
-	libsrcdir="$$s/fileutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif fileutils
-
-
-
-
-
-.PHONY: all-fileutils maybe-all-fileutils
-maybe-all-fileutils:
-@if fileutils
-TARGET-fileutils=all
-maybe-all-fileutils: all-fileutils
-all-fileutils: configure-fileutils
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fileutils))
-@endif fileutils
-
-
-
-
-.PHONY: check-fileutils maybe-check-fileutils
-maybe-check-fileutils:
-@if fileutils
-maybe-check-fileutils: check-fileutils
-
-check-fileutils:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif fileutils
-
-.PHONY: install-fileutils maybe-install-fileutils
-maybe-install-fileutils:
-@if fileutils
-maybe-install-fileutils: install-fileutils
-
-install-fileutils: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif fileutils
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-fileutils info-fileutils
-maybe-info-fileutils:
-@if fileutils
-maybe-info-fileutils: info-fileutils
-
-info-fileutils: \
-    configure-fileutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fileutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in fileutils" ; \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif fileutils
-
-.PHONY: maybe-dvi-fileutils dvi-fileutils
-maybe-dvi-fileutils:
-@if fileutils
-maybe-dvi-fileutils: dvi-fileutils
-
-dvi-fileutils: \
-    configure-fileutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fileutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in fileutils" ; \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif fileutils
-
-.PHONY: maybe-html-fileutils html-fileutils
-maybe-html-fileutils:
-@if fileutils
-maybe-html-fileutils: html-fileutils
-
-html-fileutils: \
-    configure-fileutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fileutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in fileutils" ; \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif fileutils
-
-.PHONY: maybe-TAGS-fileutils TAGS-fileutils
-maybe-TAGS-fileutils:
-@if fileutils
-maybe-TAGS-fileutils: TAGS-fileutils
-
-TAGS-fileutils: \
-    configure-fileutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fileutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in fileutils" ; \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif fileutils
-
-.PHONY: maybe-install-info-fileutils install-info-fileutils
-maybe-install-info-fileutils:
-@if fileutils
-maybe-install-info-fileutils: install-info-fileutils
-
-install-info-fileutils: \
-    configure-fileutils \
-    info-fileutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fileutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in fileutils" ; \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif fileutils
-
-.PHONY: maybe-installcheck-fileutils installcheck-fileutils
-maybe-installcheck-fileutils:
-@if fileutils
-maybe-installcheck-fileutils: installcheck-fileutils
-
-installcheck-fileutils: \
-    configure-fileutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fileutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in fileutils" ; \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif fileutils
-
-.PHONY: maybe-mostlyclean-fileutils mostlyclean-fileutils
-maybe-mostlyclean-fileutils:
-@if fileutils
-maybe-mostlyclean-fileutils: mostlyclean-fileutils
-
-mostlyclean-fileutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fileutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in fileutils" ; \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif fileutils
-
-.PHONY: maybe-clean-fileutils clean-fileutils
-maybe-clean-fileutils:
-@if fileutils
-maybe-clean-fileutils: clean-fileutils
-
-clean-fileutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fileutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in fileutils" ; \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif fileutils
-
-.PHONY: maybe-distclean-fileutils distclean-fileutils
-maybe-distclean-fileutils:
-@if fileutils
-maybe-distclean-fileutils: distclean-fileutils
-
-distclean-fileutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fileutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in fileutils" ; \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif fileutils
-
-.PHONY: maybe-maintainer-clean-fileutils maintainer-clean-fileutils
-maybe-maintainer-clean-fileutils:
-@if fileutils
-maybe-maintainer-clean-fileutils: maintainer-clean-fileutils
-
-maintainer-clean-fileutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fileutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in fileutils" ; \
-	(cd $(HOST_SUBDIR)/fileutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif fileutils
-
-
-
-.PHONY: configure-findutils maybe-configure-findutils
-maybe-configure-findutils:
-@if findutils
-maybe-configure-findutils: configure-findutils
-configure-findutils: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/findutils ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/findutils; \
-	cd "$(HOST_SUBDIR)/findutils" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/findutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/findutils"; \
-	libsrcdir="$$s/findutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif findutils
-
-
-
-
-
-.PHONY: all-findutils maybe-all-findutils
-maybe-all-findutils:
-@if findutils
-TARGET-findutils=all
-maybe-all-findutils: all-findutils
-all-findutils: configure-findutils
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-findutils))
-@endif findutils
-
-
-
-
-.PHONY: check-findutils maybe-check-findutils
-maybe-check-findutils:
-@if findutils
-maybe-check-findutils: check-findutils
-
-check-findutils:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif findutils
-
-.PHONY: install-findutils maybe-install-findutils
-maybe-install-findutils:
-@if findutils
-maybe-install-findutils: install-findutils
-
-install-findutils: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif findutils
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-findutils info-findutils
-maybe-info-findutils:
-@if findutils
-maybe-info-findutils: info-findutils
-
-info-findutils: \
-    configure-findutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./findutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in findutils" ; \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif findutils
-
-.PHONY: maybe-dvi-findutils dvi-findutils
-maybe-dvi-findutils:
-@if findutils
-maybe-dvi-findutils: dvi-findutils
-
-dvi-findutils: \
-    configure-findutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./findutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in findutils" ; \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif findutils
-
-.PHONY: maybe-html-findutils html-findutils
-maybe-html-findutils:
-@if findutils
-maybe-html-findutils: html-findutils
-
-html-findutils: \
-    configure-findutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./findutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in findutils" ; \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif findutils
-
-.PHONY: maybe-TAGS-findutils TAGS-findutils
-maybe-TAGS-findutils:
-@if findutils
-maybe-TAGS-findutils: TAGS-findutils
-
-TAGS-findutils: \
-    configure-findutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./findutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in findutils" ; \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif findutils
-
-.PHONY: maybe-install-info-findutils install-info-findutils
-maybe-install-info-findutils:
-@if findutils
-maybe-install-info-findutils: install-info-findutils
-
-install-info-findutils: \
-    configure-findutils \
-    info-findutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./findutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in findutils" ; \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif findutils
-
-.PHONY: maybe-installcheck-findutils installcheck-findutils
-maybe-installcheck-findutils:
-@if findutils
-maybe-installcheck-findutils: installcheck-findutils
-
-installcheck-findutils: \
-    configure-findutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./findutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in findutils" ; \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif findutils
-
-.PHONY: maybe-mostlyclean-findutils mostlyclean-findutils
-maybe-mostlyclean-findutils:
-@if findutils
-maybe-mostlyclean-findutils: mostlyclean-findutils
-
-mostlyclean-findutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./findutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in findutils" ; \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif findutils
-
-.PHONY: maybe-clean-findutils clean-findutils
-maybe-clean-findutils:
-@if findutils
-maybe-clean-findutils: clean-findutils
-
-clean-findutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./findutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in findutils" ; \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif findutils
-
-.PHONY: maybe-distclean-findutils distclean-findutils
-maybe-distclean-findutils:
-@if findutils
-maybe-distclean-findutils: distclean-findutils
-
-distclean-findutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./findutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in findutils" ; \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif findutils
-
-.PHONY: maybe-maintainer-clean-findutils maintainer-clean-findutils
-maybe-maintainer-clean-findutils:
-@if findutils
-maybe-maintainer-clean-findutils: maintainer-clean-findutils
-
-maintainer-clean-findutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./findutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in findutils" ; \
-	(cd $(HOST_SUBDIR)/findutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif findutils
-
-
-
-.PHONY: configure-find maybe-configure-find
-maybe-configure-find:
-@if find
-maybe-configure-find: configure-find
-configure-find: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/find ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/find; \
-	cd "$(HOST_SUBDIR)/find" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/find/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/find"; \
-	libsrcdir="$$s/find"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif find
-
-
-
-
-
-.PHONY: all-find maybe-all-find
-maybe-all-find:
-@if find
-TARGET-find=all
-maybe-all-find: all-find
-all-find: configure-find
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-find))
-@endif find
-
-
-
-
-.PHONY: check-find maybe-check-find
-maybe-check-find:
-@if find
-maybe-check-find: check-find
-
-check-find:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif find
-
-.PHONY: install-find maybe-install-find
-maybe-install-find:
-@if find
-maybe-install-find: install-find
-
-install-find: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif find
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-find info-find
-maybe-info-find:
-@if find
-maybe-info-find: info-find
-
-info-find: \
-    configure-find 
-	@: $(MAKE); $(unstage)
-	@[ -f ./find/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in find" ; \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif find
-
-.PHONY: maybe-dvi-find dvi-find
-maybe-dvi-find:
-@if find
-maybe-dvi-find: dvi-find
-
-dvi-find: \
-    configure-find 
-	@: $(MAKE); $(unstage)
-	@[ -f ./find/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in find" ; \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif find
-
-.PHONY: maybe-html-find html-find
-maybe-html-find:
-@if find
-maybe-html-find: html-find
-
-html-find: \
-    configure-find 
-	@: $(MAKE); $(unstage)
-	@[ -f ./find/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in find" ; \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif find
-
-.PHONY: maybe-TAGS-find TAGS-find
-maybe-TAGS-find:
-@if find
-maybe-TAGS-find: TAGS-find
-
-TAGS-find: \
-    configure-find 
-	@: $(MAKE); $(unstage)
-	@[ -f ./find/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in find" ; \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif find
-
-.PHONY: maybe-install-info-find install-info-find
-maybe-install-info-find:
-@if find
-maybe-install-info-find: install-info-find
-
-install-info-find: \
-    configure-find \
-    info-find 
-	@: $(MAKE); $(unstage)
-	@[ -f ./find/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in find" ; \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif find
-
-.PHONY: maybe-installcheck-find installcheck-find
-maybe-installcheck-find:
-@if find
-maybe-installcheck-find: installcheck-find
-
-installcheck-find: \
-    configure-find 
-	@: $(MAKE); $(unstage)
-	@[ -f ./find/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in find" ; \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif find
-
-.PHONY: maybe-mostlyclean-find mostlyclean-find
-maybe-mostlyclean-find:
-@if find
-maybe-mostlyclean-find: mostlyclean-find
-
-mostlyclean-find: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./find/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in find" ; \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif find
-
-.PHONY: maybe-clean-find clean-find
-maybe-clean-find:
-@if find
-maybe-clean-find: clean-find
-
-clean-find: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./find/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in find" ; \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif find
-
-.PHONY: maybe-distclean-find distclean-find
-maybe-distclean-find:
-@if find
-maybe-distclean-find: distclean-find
-
-distclean-find: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./find/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in find" ; \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif find
-
-.PHONY: maybe-maintainer-clean-find maintainer-clean-find
-maybe-maintainer-clean-find:
-@if find
-maybe-maintainer-clean-find: maintainer-clean-find
-
-maintainer-clean-find: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./find/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in find" ; \
-	(cd $(HOST_SUBDIR)/find && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif find
-
-
-
-.PHONY: configure-fixincludes maybe-configure-fixincludes
-maybe-configure-fixincludes:
-@if fixincludes
-maybe-configure-fixincludes: configure-fixincludes
-configure-fixincludes: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/fixincludes; \
-	cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/fixincludes"; \
-	libsrcdir="$$s/fixincludes"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif fixincludes
-
-
-
-
-
-.PHONY: all-fixincludes maybe-all-fixincludes
-maybe-all-fixincludes:
-@if fixincludes
-TARGET-fixincludes=all
-maybe-all-fixincludes: all-fixincludes
-all-fixincludes: configure-fixincludes
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/fixincludes && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fixincludes))
-@endif fixincludes
-
-
-
-
-.PHONY: check-fixincludes maybe-check-fixincludes
-maybe-check-fixincludes:
-@if fixincludes
-maybe-check-fixincludes: check-fixincludes
-
-check-fixincludes:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/fixincludes && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif fixincludes
-
-.PHONY: install-fixincludes maybe-install-fixincludes
-maybe-install-fixincludes:
-@if fixincludes
-maybe-install-fixincludes: install-fixincludes
-
-install-fixincludes: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/fixincludes && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif fixincludes
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-fixincludes info-fixincludes
-maybe-info-fixincludes:
-@if fixincludes
-maybe-info-fixincludes: info-fixincludes
-
-# fixincludes doesn't support info.
-info-fixincludes:
-
-@endif fixincludes
-
-.PHONY: maybe-dvi-fixincludes dvi-fixincludes
-maybe-dvi-fixincludes:
-@if fixincludes
-maybe-dvi-fixincludes: dvi-fixincludes
-
-# fixincludes doesn't support dvi.
-dvi-fixincludes:
-
-@endif fixincludes
-
-.PHONY: maybe-html-fixincludes html-fixincludes
-maybe-html-fixincludes:
-@if fixincludes
-maybe-html-fixincludes: html-fixincludes
-
-html-fixincludes: \
-    configure-fixincludes 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fixincludes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in fixincludes" ; \
-	(cd $(HOST_SUBDIR)/fixincludes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif fixincludes
-
-.PHONY: maybe-TAGS-fixincludes TAGS-fixincludes
-maybe-TAGS-fixincludes:
-@if fixincludes
-maybe-TAGS-fixincludes: TAGS-fixincludes
-
-# fixincludes doesn't support TAGS.
-TAGS-fixincludes:
-
-@endif fixincludes
-
-.PHONY: maybe-install-info-fixincludes install-info-fixincludes
-maybe-install-info-fixincludes:
-@if fixincludes
-maybe-install-info-fixincludes: install-info-fixincludes
-
-# fixincludes doesn't support install-info.
-install-info-fixincludes:
-
-@endif fixincludes
-
-.PHONY: maybe-installcheck-fixincludes installcheck-fixincludes
-maybe-installcheck-fixincludes:
-@if fixincludes
-maybe-installcheck-fixincludes: installcheck-fixincludes
-
-# fixincludes doesn't support installcheck.
-installcheck-fixincludes:
-
-@endif fixincludes
-
-.PHONY: maybe-mostlyclean-fixincludes mostlyclean-fixincludes
-maybe-mostlyclean-fixincludes:
-@if fixincludes
-maybe-mostlyclean-fixincludes: mostlyclean-fixincludes
-
-mostlyclean-fixincludes: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fixincludes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in fixincludes" ; \
-	(cd $(HOST_SUBDIR)/fixincludes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif fixincludes
-
-.PHONY: maybe-clean-fixincludes clean-fixincludes
-maybe-clean-fixincludes:
-@if fixincludes
-maybe-clean-fixincludes: clean-fixincludes
-
-clean-fixincludes: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fixincludes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in fixincludes" ; \
-	(cd $(HOST_SUBDIR)/fixincludes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif fixincludes
-
-.PHONY: maybe-distclean-fixincludes distclean-fixincludes
-maybe-distclean-fixincludes:
-@if fixincludes
-maybe-distclean-fixincludes: distclean-fixincludes
-
-distclean-fixincludes: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fixincludes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in fixincludes" ; \
-	(cd $(HOST_SUBDIR)/fixincludes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif fixincludes
-
-.PHONY: maybe-maintainer-clean-fixincludes maintainer-clean-fixincludes
-maybe-maintainer-clean-fixincludes:
-@if fixincludes
-maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes
-
-maintainer-clean-fixincludes: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./fixincludes/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in fixincludes" ; \
-	(cd $(HOST_SUBDIR)/fixincludes && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif fixincludes
-
-
-
-.PHONY: configure-flex maybe-configure-flex
-maybe-configure-flex:
-@if flex
-maybe-configure-flex: configure-flex
-configure-flex: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/flex; \
-	cd "$(HOST_SUBDIR)/flex" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/flex/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/flex"; \
-	libsrcdir="$$s/flex"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif flex
-
-
-
-
-
-.PHONY: all-flex maybe-all-flex
-maybe-all-flex:
-@if flex
-TARGET-flex=all
-maybe-all-flex: all-flex
-all-flex: configure-flex
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/flex && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-flex))
-@endif flex
-
-
-
-
-.PHONY: check-flex maybe-check-flex
-maybe-check-flex:
-@if flex
-maybe-check-flex: check-flex
-
-# This module is only tested in a native toolchain.
-check-flex:
-	@: $(MAKE); $(unstage)
-	@if [ '$(host)' = '$(target)' ] ; then \
-	  r=`${PWD_COMMAND}`; export r; \
-	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	  $(HOST_EXPORTS) \
-	  (cd $(HOST_SUBDIR)/flex && \
-	    $(MAKE) $(FLAGS_TO_PASS)  check); \
-	fi
-
-@endif flex
-
-.PHONY: install-flex maybe-install-flex
-maybe-install-flex:
-@if flex
-maybe-install-flex: install-flex
-
-install-flex: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/flex && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif flex
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-flex info-flex
-maybe-info-flex:
-@if flex
-maybe-info-flex: info-flex
-
-info-flex: \
-    configure-flex 
-	@: $(MAKE); $(unstage)
-	@[ -f ./flex/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in flex" ; \
-	(cd $(HOST_SUBDIR)/flex && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif flex
-
-.PHONY: maybe-dvi-flex dvi-flex
-maybe-dvi-flex:
-@if flex
-maybe-dvi-flex: dvi-flex
-
-dvi-flex: \
-    configure-flex 
-	@: $(MAKE); $(unstage)
-	@[ -f ./flex/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in flex" ; \
-	(cd $(HOST_SUBDIR)/flex && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif flex
-
-.PHONY: maybe-html-flex html-flex
-maybe-html-flex:
-@if flex
-maybe-html-flex: html-flex
-
-html-flex: \
-    configure-flex 
-	@: $(MAKE); $(unstage)
-	@[ -f ./flex/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in flex" ; \
-	(cd $(HOST_SUBDIR)/flex && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif flex
-
-.PHONY: maybe-TAGS-flex TAGS-flex
-maybe-TAGS-flex:
-@if flex
-maybe-TAGS-flex: TAGS-flex
-
-TAGS-flex: \
-    configure-flex 
-	@: $(MAKE); $(unstage)
-	@[ -f ./flex/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in flex" ; \
-	(cd $(HOST_SUBDIR)/flex && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif flex
-
-.PHONY: maybe-install-info-flex install-info-flex
-maybe-install-info-flex:
-@if flex
-maybe-install-info-flex: install-info-flex
-
-install-info-flex: \
-    configure-flex \
-    info-flex 
-	@: $(MAKE); $(unstage)
-	@[ -f ./flex/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in flex" ; \
-	(cd $(HOST_SUBDIR)/flex && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif flex
-
-.PHONY: maybe-installcheck-flex installcheck-flex
-maybe-installcheck-flex:
-@if flex
-maybe-installcheck-flex: installcheck-flex
-
-installcheck-flex: \
-    configure-flex 
-	@: $(MAKE); $(unstage)
-	@[ -f ./flex/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in flex" ; \
-	(cd $(HOST_SUBDIR)/flex && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif flex
-
-.PHONY: maybe-mostlyclean-flex mostlyclean-flex
-maybe-mostlyclean-flex:
-@if flex
-maybe-mostlyclean-flex: mostlyclean-flex
-
-mostlyclean-flex: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./flex/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in flex" ; \
-	(cd $(HOST_SUBDIR)/flex && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif flex
-
-.PHONY: maybe-clean-flex clean-flex
-maybe-clean-flex:
-@if flex
-maybe-clean-flex: clean-flex
-
-clean-flex: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./flex/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in flex" ; \
-	(cd $(HOST_SUBDIR)/flex && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif flex
-
-.PHONY: maybe-distclean-flex distclean-flex
-maybe-distclean-flex:
-@if flex
-maybe-distclean-flex: distclean-flex
-
-distclean-flex: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./flex/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in flex" ; \
-	(cd $(HOST_SUBDIR)/flex && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif flex
-
-.PHONY: maybe-maintainer-clean-flex maintainer-clean-flex
-maybe-maintainer-clean-flex:
-@if flex
-maybe-maintainer-clean-flex: maintainer-clean-flex
-
-maintainer-clean-flex: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./flex/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in flex" ; \
-	(cd $(HOST_SUBDIR)/flex && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif flex
-
-
-
-.PHONY: configure-gas maybe-configure-gas
-maybe-configure-gas:
-@if gas
-maybe-configure-gas: configure-gas
-configure-gas: 
-@endif gas
-@if gas-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif gas-bootstrap
-@if gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gas; \
-	cd "$(HOST_SUBDIR)/gas" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif gas
-
-
-
-.PHONY: configure-stage1-gas maybe-configure-stage1-gas
-maybe-configure-stage1-gas:
-@if gas-bootstrap
-maybe-configure-stage1-gas: configure-stage1-gas
-configure-stage1-gas:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif gas-bootstrap
-
-.PHONY: configure-stage2-gas maybe-configure-stage2-gas
-maybe-configure-stage2-gas:
-@if gas-bootstrap
-maybe-configure-stage2-gas: configure-stage2-gas
-configure-stage2-gas:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stage3-gas maybe-configure-stage3-gas
-maybe-configure-stage3-gas:
-@if gas-bootstrap
-maybe-configure-stage3-gas: configure-stage3-gas
-configure-stage3-gas:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stage4-gas maybe-configure-stage4-gas
-maybe-configure-stage4-gas:
-@if gas-bootstrap
-maybe-configure-stage4-gas: configure-stage4-gas
-configure-stage4-gas:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
-maybe-configure-stageprofile-gas:
-@if gas-bootstrap
-maybe-configure-stageprofile-gas: configure-stageprofile-gas
-configure-stageprofile-gas:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
-maybe-configure-stagefeedback-gas:
-@if gas-bootstrap
-maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
-configure-stagefeedback-gas:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gas"; \
-	libsrcdir="$$s/gas"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gas-bootstrap
-
-
-
-
-
-.PHONY: all-gas maybe-all-gas
-maybe-all-gas:
-@if gas
-TARGET-gas=all
-maybe-all-gas: all-gas
-all-gas: configure-gas
-@endif gas
-@if gas-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif gas-bootstrap
-@if gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gas))
-@endif gas
-
-
-
-.PHONY: all-stage1-gas maybe-all-stage1-gas
-.PHONY: clean-stage1-gas maybe-clean-stage1-gas
-maybe-all-stage1-gas:
-maybe-clean-stage1-gas:
-@if gas-bootstrap
-maybe-all-stage1-gas: all-stage1-gas
-all-stage1: all-stage1-gas
-TARGET-stage1-gas = $(TARGET-gas)
-all-stage1-gas: configure-stage1-gas
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-gas)
-
-maybe-clean-stage1-gas: clean-stage1-gas
-clean-stage1: clean-stage1-gas
-clean-stage1-gas:
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stage2-gas maybe-all-stage2-gas
-.PHONY: clean-stage2-gas maybe-clean-stage2-gas
-maybe-all-stage2-gas:
-maybe-clean-stage2-gas:
-@if gas-bootstrap
-maybe-all-stage2-gas: all-stage2-gas
-all-stage2: all-stage2-gas
-TARGET-stage2-gas = $(TARGET-gas)
-all-stage2-gas: configure-stage2-gas
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-gas)
-
-maybe-clean-stage2-gas: clean-stage2-gas
-clean-stage2: clean-stage2-gas
-clean-stage2-gas:
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stage3-gas maybe-all-stage3-gas
-.PHONY: clean-stage3-gas maybe-clean-stage3-gas
-maybe-all-stage3-gas:
-maybe-clean-stage3-gas:
-@if gas-bootstrap
-maybe-all-stage3-gas: all-stage3-gas
-all-stage3: all-stage3-gas
-TARGET-stage3-gas = $(TARGET-gas)
-all-stage3-gas: configure-stage3-gas
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-gas)
-
-maybe-clean-stage3-gas: clean-stage3-gas
-clean-stage3: clean-stage3-gas
-clean-stage3-gas:
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stage4-gas maybe-all-stage4-gas
-.PHONY: clean-stage4-gas maybe-clean-stage4-gas
-maybe-all-stage4-gas:
-maybe-clean-stage4-gas:
-@if gas-bootstrap
-maybe-all-stage4-gas: all-stage4-gas
-all-stage4: all-stage4-gas
-TARGET-stage4-gas = $(TARGET-gas)
-all-stage4-gas: configure-stage4-gas
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-gas)
-
-maybe-clean-stage4-gas: clean-stage4-gas
-clean-stage4: clean-stage4-gas
-clean-stage4-gas:
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
-.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
-maybe-all-stageprofile-gas:
-maybe-clean-stageprofile-gas:
-@if gas-bootstrap
-maybe-all-stageprofile-gas: all-stageprofile-gas
-all-stageprofile: all-stageprofile-gas
-TARGET-stageprofile-gas = $(TARGET-gas)
-all-stageprofile-gas: configure-stageprofile-gas
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-gas)
-
-maybe-clean-stageprofile-gas: clean-stageprofile-gas
-clean-stageprofile: clean-stageprofile-gas
-clean-stageprofile-gas:
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
-.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
-maybe-all-stagefeedback-gas:
-maybe-clean-stagefeedback-gas:
-@if gas-bootstrap
-maybe-all-stagefeedback-gas: all-stagefeedback-gas
-all-stagefeedback: all-stagefeedback-gas
-TARGET-stagefeedback-gas = $(TARGET-gas)
-all-stagefeedback-gas: configure-stagefeedback-gas
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-gas)
-
-maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
-clean-stagefeedback: clean-stagefeedback-gas
-clean-stagefeedback-gas:
-	@[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif gas-bootstrap
-
-
-
-
-
-.PHONY: check-gas maybe-check-gas
-maybe-check-gas:
-@if gas
-maybe-check-gas: check-gas
-
-check-gas:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gas
-
-.PHONY: install-gas maybe-install-gas
-maybe-install-gas:
-@if gas
-maybe-install-gas: install-gas
-
-install-gas: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gas
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-gas info-gas
-maybe-info-gas:
-@if gas
-maybe-info-gas: info-gas
-
-info-gas: \
-    configure-gas 
-	@[ -f ./gas/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in gas" ; \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif gas
-
-.PHONY: maybe-dvi-gas dvi-gas
-maybe-dvi-gas:
-@if gas
-maybe-dvi-gas: dvi-gas
-
-dvi-gas: \
-    configure-gas 
-	@[ -f ./gas/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in gas" ; \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif gas
-
-.PHONY: maybe-html-gas html-gas
-maybe-html-gas:
-@if gas
-maybe-html-gas: html-gas
-
-html-gas: \
-    configure-gas 
-	@[ -f ./gas/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in gas" ; \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif gas
-
-.PHONY: maybe-TAGS-gas TAGS-gas
-maybe-TAGS-gas:
-@if gas
-maybe-TAGS-gas: TAGS-gas
-
-TAGS-gas: \
-    configure-gas 
-	@[ -f ./gas/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in gas" ; \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif gas
-
-.PHONY: maybe-install-info-gas install-info-gas
-maybe-install-info-gas:
-@if gas
-maybe-install-info-gas: install-info-gas
-
-install-info-gas: \
-    configure-gas \
-    info-gas 
-	@[ -f ./gas/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in gas" ; \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif gas
-
-.PHONY: maybe-installcheck-gas installcheck-gas
-maybe-installcheck-gas:
-@if gas
-maybe-installcheck-gas: installcheck-gas
-
-installcheck-gas: \
-    configure-gas 
-	@[ -f ./gas/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in gas" ; \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif gas
-
-.PHONY: maybe-mostlyclean-gas mostlyclean-gas
-maybe-mostlyclean-gas:
-@if gas
-maybe-mostlyclean-gas: mostlyclean-gas
-
-mostlyclean-gas: 
-	@[ -f ./gas/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in gas" ; \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif gas
-
-.PHONY: maybe-clean-gas clean-gas
-maybe-clean-gas:
-@if gas
-maybe-clean-gas: clean-gas
-
-clean-gas: 
-	@[ -f ./gas/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in gas" ; \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif gas
-
-.PHONY: maybe-distclean-gas distclean-gas
-maybe-distclean-gas:
-@if gas
-maybe-distclean-gas: distclean-gas
-
-distclean-gas: 
-	@[ -f ./gas/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in gas" ; \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif gas
-
-.PHONY: maybe-maintainer-clean-gas maintainer-clean-gas
-maybe-maintainer-clean-gas:
-@if gas
-maybe-maintainer-clean-gas: maintainer-clean-gas
-
-maintainer-clean-gas: 
-	@[ -f ./gas/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in gas" ; \
-	(cd $(HOST_SUBDIR)/gas && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif gas
-
-
-
-.PHONY: configure-gcc maybe-configure-gcc
-maybe-configure-gcc:
-@if gcc
-maybe-configure-gcc: configure-gcc
-configure-gcc: 
-@endif gcc
-@if gcc-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif gcc-bootstrap
-@if gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gcc; \
-	cd "$(HOST_SUBDIR)/gcc" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif gcc
-
-
-
-.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
-maybe-configure-stage1-gcc:
-@if gcc-bootstrap
-maybe-configure-stage1-gcc: configure-stage1-gcc
-configure-stage1-gcc:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif gcc-bootstrap
-
-.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
-maybe-configure-stage2-gcc:
-@if gcc-bootstrap
-maybe-configure-stage2-gcc: configure-stage2-gcc
-configure-stage2-gcc:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
-maybe-configure-stage3-gcc:
-@if gcc-bootstrap
-maybe-configure-stage3-gcc: configure-stage3-gcc
-configure-stage3-gcc:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
-maybe-configure-stage4-gcc:
-@if gcc-bootstrap
-maybe-configure-stage4-gcc: configure-stage4-gcc
-configure-stage4-gcc:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
-maybe-configure-stageprofile-gcc:
-@if gcc-bootstrap
-maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
-configure-stageprofile-gcc:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
-maybe-configure-stagefeedback-gcc:
-@if gcc-bootstrap
-maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
-configure-stagefeedback-gcc:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gcc"; \
-	libsrcdir="$$s/gcc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif gcc-bootstrap
-
-
-
-
-
-.PHONY: all-gcc maybe-all-gcc
-maybe-all-gcc:
-@if gcc
-TARGET-gcc=`if [ -f stage_last ]; then echo quickstrap ; else echo all; fi`
-maybe-all-gcc: all-gcc
-all-gcc: configure-gcc
-@endif gcc
-@if gcc-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif gcc-bootstrap
-@if gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(TARGET-gcc))
-@endif gcc
-
-
-
-.PHONY: all-stage1-gcc maybe-all-stage1-gcc
-.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc
-maybe-all-stage1-gcc:
-maybe-clean-stage1-gcc:
-@if gcc-bootstrap
-maybe-all-stage1-gcc: all-stage1-gcc
-all-stage1: all-stage1-gcc
-TARGET-stage1-gcc = $(TARGET-gcc)
-all-stage1-gcc: configure-stage1-gcc
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) \
-		$(TARGET-stage1-gcc)
-
-maybe-clean-stage1-gcc: clean-stage1-gcc
-clean-stage1: clean-stage1-gcc
-clean-stage1-gcc:
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stage2-gcc maybe-all-stage2-gcc
-.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc
-maybe-all-stage2-gcc:
-maybe-clean-stage2-gcc:
-@if gcc-bootstrap
-maybe-all-stage2-gcc: all-stage2-gcc
-all-stage2: all-stage2-gcc
-TARGET-stage2-gcc = $(TARGET-gcc)
-all-stage2-gcc: configure-stage2-gcc
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS) \
-		$(TARGET-stage2-gcc)
-
-maybe-clean-stage2-gcc: clean-stage2-gcc
-clean-stage2: clean-stage2-gcc
-clean-stage2-gcc:
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stage3-gcc maybe-all-stage3-gcc
-.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
-maybe-all-stage3-gcc:
-maybe-clean-stage3-gcc:
-@if gcc-bootstrap
-maybe-all-stage3-gcc: all-stage3-gcc
-all-stage3: all-stage3-gcc
-TARGET-stage3-gcc = $(TARGET-gcc)
-all-stage3-gcc: configure-stage3-gcc
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS) \
-		$(TARGET-stage3-gcc)
-
-maybe-clean-stage3-gcc: clean-stage3-gcc
-clean-stage3: clean-stage3-gcc
-clean-stage3-gcc:
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stage4-gcc maybe-all-stage4-gcc
-.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
-maybe-all-stage4-gcc:
-maybe-clean-stage4-gcc:
-@if gcc-bootstrap
-maybe-all-stage4-gcc: all-stage4-gcc
-all-stage4: all-stage4-gcc
-TARGET-stage4-gcc = $(TARGET-gcc)
-all-stage4-gcc: configure-stage4-gcc
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)  $(EXTRA_GCC_FLAGS) \
-		$(TARGET-stage4-gcc)
-
-maybe-clean-stage4-gcc: clean-stage4-gcc
-clean-stage4: clean-stage4-gcc
-clean-stage4-gcc:
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
-.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc
-maybe-all-stageprofile-gcc:
-maybe-clean-stageprofile-gcc:
-@if gcc-bootstrap
-maybe-all-stageprofile-gcc: all-stageprofile-gcc
-all-stageprofile: all-stageprofile-gcc
-TARGET-stageprofile-gcc = $(TARGET-gcc)
-all-stageprofile-gcc: configure-stageprofile-gcc
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) \
-		$(TARGET-stageprofile-gcc)
-
-maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
-clean-stageprofile: clean-stageprofile-gcc
-clean-stageprofile-gcc:
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
-.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
-maybe-all-stagefeedback-gcc:
-maybe-clean-stagefeedback-gcc:
-@if gcc-bootstrap
-maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
-all-stagefeedback: all-stagefeedback-gcc
-TARGET-stagefeedback-gcc = $(TARGET-gcc)
-all-stagefeedback-gcc: configure-stagefeedback-gcc
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) \
-		$(TARGET-stagefeedback-gcc)
-
-maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
-clean-stagefeedback: clean-stagefeedback-gcc
-clean-stagefeedback-gcc:
-	@[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-
-
-
-.PHONY: check-gcc maybe-check-gcc
-maybe-check-gcc:
-@if gcc
-maybe-check-gcc: check-gcc
-
-check-gcc:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check)
-
-@endif gcc
-
-.PHONY: install-gcc maybe-install-gcc
-maybe-install-gcc:
-@if gcc
-maybe-install-gcc: install-gcc
-
-install-gcc: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install)
-
-@endif gcc
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-gcc info-gcc
-maybe-info-gcc:
-@if gcc
-maybe-info-gcc: info-gcc
-
-info-gcc: \
-    configure-gcc 
-	@[ -f ./gcc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in gcc" ; \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif gcc
-
-.PHONY: maybe-dvi-gcc dvi-gcc
-maybe-dvi-gcc:
-@if gcc
-maybe-dvi-gcc: dvi-gcc
-
-dvi-gcc: \
-    configure-gcc 
-	@[ -f ./gcc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in gcc" ; \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif gcc
-
-.PHONY: maybe-html-gcc html-gcc
-maybe-html-gcc:
-@if gcc
-maybe-html-gcc: html-gcc
-
-html-gcc: \
-    configure-gcc 
-	@[ -f ./gcc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in gcc" ; \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif gcc
-
-.PHONY: maybe-TAGS-gcc TAGS-gcc
-maybe-TAGS-gcc:
-@if gcc
-maybe-TAGS-gcc: TAGS-gcc
-
-TAGS-gcc: \
-    configure-gcc 
-	@[ -f ./gcc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in gcc" ; \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif gcc
-
-.PHONY: maybe-install-info-gcc install-info-gcc
-maybe-install-info-gcc:
-@if gcc
-maybe-install-info-gcc: install-info-gcc
-
-install-info-gcc: \
-    configure-gcc \
-    info-gcc 
-	@[ -f ./gcc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in gcc" ; \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif gcc
-
-.PHONY: maybe-installcheck-gcc installcheck-gcc
-maybe-installcheck-gcc:
-@if gcc
-maybe-installcheck-gcc: installcheck-gcc
-
-installcheck-gcc: \
-    configure-gcc 
-	@[ -f ./gcc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in gcc" ; \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif gcc
-
-.PHONY: maybe-mostlyclean-gcc mostlyclean-gcc
-maybe-mostlyclean-gcc:
-@if gcc
-maybe-mostlyclean-gcc: mostlyclean-gcc
-
-mostlyclean-gcc: 
-	@[ -f ./gcc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in gcc" ; \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif gcc
-
-.PHONY: maybe-clean-gcc clean-gcc
-maybe-clean-gcc:
-@if gcc
-maybe-clean-gcc: clean-gcc
-
-clean-gcc: 
-	@[ -f ./gcc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in gcc" ; \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif gcc
-
-.PHONY: maybe-distclean-gcc distclean-gcc
-maybe-distclean-gcc:
-@if gcc
-maybe-distclean-gcc: distclean-gcc
-
-distclean-gcc: 
-	@[ -f ./gcc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in gcc" ; \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif gcc
-
-.PHONY: maybe-maintainer-clean-gcc maintainer-clean-gcc
-maybe-maintainer-clean-gcc:
-@if gcc
-maybe-maintainer-clean-gcc: maintainer-clean-gcc
-
-maintainer-clean-gcc: 
-	@[ -f ./gcc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in gcc" ; \
-	(cd $(HOST_SUBDIR)/gcc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif gcc
-
-
-
-.PHONY: configure-gawk maybe-configure-gawk
-maybe-configure-gawk:
-@if gawk
-maybe-configure-gawk: configure-gawk
-configure-gawk: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gawk; \
-	cd "$(HOST_SUBDIR)/gawk" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gawk/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gawk"; \
-	libsrcdir="$$s/gawk"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif gawk
-
-
-
-
-
-.PHONY: all-gawk maybe-all-gawk
-maybe-all-gawk:
-@if gawk
-TARGET-gawk=all
-maybe-all-gawk: all-gawk
-all-gawk: configure-gawk
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gawk))
-@endif gawk
-
-
-
-
-.PHONY: check-gawk maybe-check-gawk
-maybe-check-gawk:
-@if gawk
-maybe-check-gawk: check-gawk
-
-check-gawk:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gawk
-
-.PHONY: install-gawk maybe-install-gawk
-maybe-install-gawk:
-@if gawk
-maybe-install-gawk: install-gawk
-
-install-gawk: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gawk
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-gawk info-gawk
-maybe-info-gawk:
-@if gawk
-maybe-info-gawk: info-gawk
-
-info-gawk: \
-    configure-gawk 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gawk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in gawk" ; \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif gawk
-
-.PHONY: maybe-dvi-gawk dvi-gawk
-maybe-dvi-gawk:
-@if gawk
-maybe-dvi-gawk: dvi-gawk
-
-dvi-gawk: \
-    configure-gawk 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gawk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in gawk" ; \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif gawk
-
-.PHONY: maybe-html-gawk html-gawk
-maybe-html-gawk:
-@if gawk
-maybe-html-gawk: html-gawk
-
-html-gawk: \
-    configure-gawk 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gawk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in gawk" ; \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif gawk
-
-.PHONY: maybe-TAGS-gawk TAGS-gawk
-maybe-TAGS-gawk:
-@if gawk
-maybe-TAGS-gawk: TAGS-gawk
-
-TAGS-gawk: \
-    configure-gawk 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gawk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in gawk" ; \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif gawk
-
-.PHONY: maybe-install-info-gawk install-info-gawk
-maybe-install-info-gawk:
-@if gawk
-maybe-install-info-gawk: install-info-gawk
-
-install-info-gawk: \
-    configure-gawk \
-    info-gawk 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gawk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in gawk" ; \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif gawk
-
-.PHONY: maybe-installcheck-gawk installcheck-gawk
-maybe-installcheck-gawk:
-@if gawk
-maybe-installcheck-gawk: installcheck-gawk
-
-installcheck-gawk: \
-    configure-gawk 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gawk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in gawk" ; \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif gawk
-
-.PHONY: maybe-mostlyclean-gawk mostlyclean-gawk
-maybe-mostlyclean-gawk:
-@if gawk
-maybe-mostlyclean-gawk: mostlyclean-gawk
-
-mostlyclean-gawk: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gawk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in gawk" ; \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif gawk
-
-.PHONY: maybe-clean-gawk clean-gawk
-maybe-clean-gawk:
-@if gawk
-maybe-clean-gawk: clean-gawk
-
-clean-gawk: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gawk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in gawk" ; \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif gawk
-
-.PHONY: maybe-distclean-gawk distclean-gawk
-maybe-distclean-gawk:
-@if gawk
-maybe-distclean-gawk: distclean-gawk
-
-distclean-gawk: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gawk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in gawk" ; \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif gawk
-
-.PHONY: maybe-maintainer-clean-gawk maintainer-clean-gawk
-maybe-maintainer-clean-gawk:
-@if gawk
-maybe-maintainer-clean-gawk: maintainer-clean-gawk
-
-maintainer-clean-gawk: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gawk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in gawk" ; \
-	(cd $(HOST_SUBDIR)/gawk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif gawk
-
-
-
-.PHONY: configure-gettext maybe-configure-gettext
-maybe-configure-gettext:
-@if gettext
-maybe-configure-gettext: configure-gettext
-configure-gettext: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gettext; \
-	cd "$(HOST_SUBDIR)/gettext" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gettext"; \
-	libsrcdir="$$s/gettext"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif gettext
-
-
-
-
-
-.PHONY: all-gettext maybe-all-gettext
-maybe-all-gettext:
-@if gettext
-TARGET-gettext=all
-maybe-all-gettext: all-gettext
-all-gettext: configure-gettext
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gettext))
-@endif gettext
-
-
-
-
-.PHONY: check-gettext maybe-check-gettext
-maybe-check-gettext:
-@if gettext
-maybe-check-gettext: check-gettext
-
-check-gettext:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gettext
-
-.PHONY: install-gettext maybe-install-gettext
-maybe-install-gettext:
-@if gettext
-maybe-install-gettext: install-gettext
-
-install-gettext: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gettext
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-gettext info-gettext
-maybe-info-gettext:
-@if gettext
-maybe-info-gettext: info-gettext
-
-info-gettext: \
-    configure-gettext 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gettext/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in gettext" ; \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif gettext
-
-.PHONY: maybe-dvi-gettext dvi-gettext
-maybe-dvi-gettext:
-@if gettext
-maybe-dvi-gettext: dvi-gettext
-
-dvi-gettext: \
-    configure-gettext 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gettext/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in gettext" ; \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif gettext
-
-.PHONY: maybe-html-gettext html-gettext
-maybe-html-gettext:
-@if gettext
-maybe-html-gettext: html-gettext
-
-html-gettext: \
-    configure-gettext 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gettext/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in gettext" ; \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif gettext
-
-.PHONY: maybe-TAGS-gettext TAGS-gettext
-maybe-TAGS-gettext:
-@if gettext
-maybe-TAGS-gettext: TAGS-gettext
-
-TAGS-gettext: \
-    configure-gettext 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gettext/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in gettext" ; \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif gettext
-
-.PHONY: maybe-install-info-gettext install-info-gettext
-maybe-install-info-gettext:
-@if gettext
-maybe-install-info-gettext: install-info-gettext
-
-install-info-gettext: \
-    configure-gettext \
-    info-gettext 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gettext/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in gettext" ; \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif gettext
-
-.PHONY: maybe-installcheck-gettext installcheck-gettext
-maybe-installcheck-gettext:
-@if gettext
-maybe-installcheck-gettext: installcheck-gettext
-
-installcheck-gettext: \
-    configure-gettext 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gettext/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in gettext" ; \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif gettext
-
-.PHONY: maybe-mostlyclean-gettext mostlyclean-gettext
-maybe-mostlyclean-gettext:
-@if gettext
-maybe-mostlyclean-gettext: mostlyclean-gettext
-
-mostlyclean-gettext: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gettext/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in gettext" ; \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif gettext
-
-.PHONY: maybe-clean-gettext clean-gettext
-maybe-clean-gettext:
-@if gettext
-maybe-clean-gettext: clean-gettext
-
-clean-gettext: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gettext/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in gettext" ; \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif gettext
-
-.PHONY: maybe-distclean-gettext distclean-gettext
-maybe-distclean-gettext:
-@if gettext
-maybe-distclean-gettext: distclean-gettext
-
-distclean-gettext: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gettext/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in gettext" ; \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif gettext
-
-.PHONY: maybe-maintainer-clean-gettext maintainer-clean-gettext
-maybe-maintainer-clean-gettext:
-@if gettext
-maybe-maintainer-clean-gettext: maintainer-clean-gettext
-
-maintainer-clean-gettext: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gettext/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in gettext" ; \
-	(cd $(HOST_SUBDIR)/gettext && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif gettext
-
-
-
-.PHONY: configure-gnuserv maybe-configure-gnuserv
-maybe-configure-gnuserv:
-@if gnuserv
-maybe-configure-gnuserv: configure-gnuserv
-configure-gnuserv: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gnuserv; \
-	cd "$(HOST_SUBDIR)/gnuserv" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gnuserv/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gnuserv"; \
-	libsrcdir="$$s/gnuserv"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif gnuserv
-
-
-
-
-
-.PHONY: all-gnuserv maybe-all-gnuserv
-maybe-all-gnuserv:
-@if gnuserv
-TARGET-gnuserv=all
-maybe-all-gnuserv: all-gnuserv
-all-gnuserv: configure-gnuserv
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnuserv))
-@endif gnuserv
-
-
-
-
-.PHONY: check-gnuserv maybe-check-gnuserv
-maybe-check-gnuserv:
-@if gnuserv
-maybe-check-gnuserv: check-gnuserv
-
-check-gnuserv:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gnuserv
-
-.PHONY: install-gnuserv maybe-install-gnuserv
-maybe-install-gnuserv:
-@if gnuserv
-maybe-install-gnuserv: install-gnuserv
-
-install-gnuserv: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gnuserv
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-gnuserv info-gnuserv
-maybe-info-gnuserv:
-@if gnuserv
-maybe-info-gnuserv: info-gnuserv
-
-info-gnuserv: \
-    configure-gnuserv 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnuserv/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in gnuserv" ; \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif gnuserv
-
-.PHONY: maybe-dvi-gnuserv dvi-gnuserv
-maybe-dvi-gnuserv:
-@if gnuserv
-maybe-dvi-gnuserv: dvi-gnuserv
-
-dvi-gnuserv: \
-    configure-gnuserv 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnuserv/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in gnuserv" ; \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif gnuserv
-
-.PHONY: maybe-html-gnuserv html-gnuserv
-maybe-html-gnuserv:
-@if gnuserv
-maybe-html-gnuserv: html-gnuserv
-
-html-gnuserv: \
-    configure-gnuserv 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnuserv/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in gnuserv" ; \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif gnuserv
-
-.PHONY: maybe-TAGS-gnuserv TAGS-gnuserv
-maybe-TAGS-gnuserv:
-@if gnuserv
-maybe-TAGS-gnuserv: TAGS-gnuserv
-
-TAGS-gnuserv: \
-    configure-gnuserv 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnuserv/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in gnuserv" ; \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif gnuserv
-
-.PHONY: maybe-install-info-gnuserv install-info-gnuserv
-maybe-install-info-gnuserv:
-@if gnuserv
-maybe-install-info-gnuserv: install-info-gnuserv
-
-install-info-gnuserv: \
-    configure-gnuserv \
-    info-gnuserv 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnuserv/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in gnuserv" ; \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif gnuserv
-
-.PHONY: maybe-installcheck-gnuserv installcheck-gnuserv
-maybe-installcheck-gnuserv:
-@if gnuserv
-maybe-installcheck-gnuserv: installcheck-gnuserv
-
-installcheck-gnuserv: \
-    configure-gnuserv 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnuserv/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in gnuserv" ; \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif gnuserv
-
-.PHONY: maybe-mostlyclean-gnuserv mostlyclean-gnuserv
-maybe-mostlyclean-gnuserv:
-@if gnuserv
-maybe-mostlyclean-gnuserv: mostlyclean-gnuserv
-
-mostlyclean-gnuserv: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnuserv/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in gnuserv" ; \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif gnuserv
-
-.PHONY: maybe-clean-gnuserv clean-gnuserv
-maybe-clean-gnuserv:
-@if gnuserv
-maybe-clean-gnuserv: clean-gnuserv
-
-clean-gnuserv: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnuserv/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in gnuserv" ; \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif gnuserv
-
-.PHONY: maybe-distclean-gnuserv distclean-gnuserv
-maybe-distclean-gnuserv:
-@if gnuserv
-maybe-distclean-gnuserv: distclean-gnuserv
-
-distclean-gnuserv: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnuserv/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in gnuserv" ; \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif gnuserv
-
-.PHONY: maybe-maintainer-clean-gnuserv maintainer-clean-gnuserv
-maybe-maintainer-clean-gnuserv:
-@if gnuserv
-maybe-maintainer-clean-gnuserv: maintainer-clean-gnuserv
-
-maintainer-clean-gnuserv: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnuserv/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in gnuserv" ; \
-	(cd $(HOST_SUBDIR)/gnuserv && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif gnuserv
-
-
-
-.PHONY: configure-gprof maybe-configure-gprof
-maybe-configure-gprof:
-@if gprof
-maybe-configure-gprof: configure-gprof
-configure-gprof: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gprof; \
-	cd "$(HOST_SUBDIR)/gprof" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gprof"; \
-	libsrcdir="$$s/gprof"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif gprof
-
-
-
-
-
-.PHONY: all-gprof maybe-all-gprof
-maybe-all-gprof:
-@if gprof
-TARGET-gprof=all
-maybe-all-gprof: all-gprof
-all-gprof: configure-gprof
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gprof))
-@endif gprof
-
-
-
-
-.PHONY: check-gprof maybe-check-gprof
-maybe-check-gprof:
-@if gprof
-maybe-check-gprof: check-gprof
-
-check-gprof:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gprof
-
-.PHONY: install-gprof maybe-install-gprof
-maybe-install-gprof:
-@if gprof
-maybe-install-gprof: install-gprof
-
-install-gprof: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gprof
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-gprof info-gprof
-maybe-info-gprof:
-@if gprof
-maybe-info-gprof: info-gprof
-
-info-gprof: \
-    configure-gprof 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gprof/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in gprof" ; \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif gprof
-
-.PHONY: maybe-dvi-gprof dvi-gprof
-maybe-dvi-gprof:
-@if gprof
-maybe-dvi-gprof: dvi-gprof
-
-dvi-gprof: \
-    configure-gprof 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gprof/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in gprof" ; \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif gprof
-
-.PHONY: maybe-html-gprof html-gprof
-maybe-html-gprof:
-@if gprof
-maybe-html-gprof: html-gprof
-
-html-gprof: \
-    configure-gprof 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gprof/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in gprof" ; \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif gprof
-
-.PHONY: maybe-TAGS-gprof TAGS-gprof
-maybe-TAGS-gprof:
-@if gprof
-maybe-TAGS-gprof: TAGS-gprof
-
-TAGS-gprof: \
-    configure-gprof 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gprof/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in gprof" ; \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif gprof
-
-.PHONY: maybe-install-info-gprof install-info-gprof
-maybe-install-info-gprof:
-@if gprof
-maybe-install-info-gprof: install-info-gprof
-
-install-info-gprof: \
-    configure-gprof \
-    info-gprof 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gprof/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in gprof" ; \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif gprof
-
-.PHONY: maybe-installcheck-gprof installcheck-gprof
-maybe-installcheck-gprof:
-@if gprof
-maybe-installcheck-gprof: installcheck-gprof
-
-installcheck-gprof: \
-    configure-gprof 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gprof/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in gprof" ; \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif gprof
-
-.PHONY: maybe-mostlyclean-gprof mostlyclean-gprof
-maybe-mostlyclean-gprof:
-@if gprof
-maybe-mostlyclean-gprof: mostlyclean-gprof
-
-mostlyclean-gprof: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gprof/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in gprof" ; \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif gprof
-
-.PHONY: maybe-clean-gprof clean-gprof
-maybe-clean-gprof:
-@if gprof
-maybe-clean-gprof: clean-gprof
-
-clean-gprof: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gprof/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in gprof" ; \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif gprof
-
-.PHONY: maybe-distclean-gprof distclean-gprof
-maybe-distclean-gprof:
-@if gprof
-maybe-distclean-gprof: distclean-gprof
-
-distclean-gprof: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gprof/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in gprof" ; \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif gprof
-
-.PHONY: maybe-maintainer-clean-gprof maintainer-clean-gprof
-maybe-maintainer-clean-gprof:
-@if gprof
-maybe-maintainer-clean-gprof: maintainer-clean-gprof
-
-maintainer-clean-gprof: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gprof/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in gprof" ; \
-	(cd $(HOST_SUBDIR)/gprof && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif gprof
-
-
-
-.PHONY: configure-gzip maybe-configure-gzip
-maybe-configure-gzip:
-@if gzip
-maybe-configure-gzip: configure-gzip
-configure-gzip: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gzip; \
-	cd "$(HOST_SUBDIR)/gzip" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gzip/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gzip"; \
-	libsrcdir="$$s/gzip"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif gzip
-
-
-
-
-
-.PHONY: all-gzip maybe-all-gzip
-maybe-all-gzip:
-@if gzip
-TARGET-gzip=all
-maybe-all-gzip: all-gzip
-all-gzip: configure-gzip
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gzip))
-@endif gzip
-
-
-
-
-.PHONY: check-gzip maybe-check-gzip
-maybe-check-gzip:
-@if gzip
-maybe-check-gzip: check-gzip
-
-check-gzip:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gzip
-
-.PHONY: install-gzip maybe-install-gzip
-maybe-install-gzip:
-@if gzip
-maybe-install-gzip: install-gzip
-
-install-gzip: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gzip
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-gzip info-gzip
-maybe-info-gzip:
-@if gzip
-maybe-info-gzip: info-gzip
-
-info-gzip: \
-    configure-gzip 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gzip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in gzip" ; \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif gzip
-
-.PHONY: maybe-dvi-gzip dvi-gzip
-maybe-dvi-gzip:
-@if gzip
-maybe-dvi-gzip: dvi-gzip
-
-dvi-gzip: \
-    configure-gzip 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gzip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in gzip" ; \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif gzip
-
-.PHONY: maybe-html-gzip html-gzip
-maybe-html-gzip:
-@if gzip
-maybe-html-gzip: html-gzip
-
-html-gzip: \
-    configure-gzip 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gzip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in gzip" ; \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif gzip
-
-.PHONY: maybe-TAGS-gzip TAGS-gzip
-maybe-TAGS-gzip:
-@if gzip
-maybe-TAGS-gzip: TAGS-gzip
-
-TAGS-gzip: \
-    configure-gzip 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gzip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in gzip" ; \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif gzip
-
-.PHONY: maybe-install-info-gzip install-info-gzip
-maybe-install-info-gzip:
-@if gzip
-maybe-install-info-gzip: install-info-gzip
-
-install-info-gzip: \
-    configure-gzip \
-    info-gzip 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gzip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in gzip" ; \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif gzip
-
-.PHONY: maybe-installcheck-gzip installcheck-gzip
-maybe-installcheck-gzip:
-@if gzip
-maybe-installcheck-gzip: installcheck-gzip
-
-installcheck-gzip: \
-    configure-gzip 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gzip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in gzip" ; \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif gzip
-
-.PHONY: maybe-mostlyclean-gzip mostlyclean-gzip
-maybe-mostlyclean-gzip:
-@if gzip
-maybe-mostlyclean-gzip: mostlyclean-gzip
-
-mostlyclean-gzip: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gzip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in gzip" ; \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif gzip
-
-.PHONY: maybe-clean-gzip clean-gzip
-maybe-clean-gzip:
-@if gzip
-maybe-clean-gzip: clean-gzip
-
-clean-gzip: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gzip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in gzip" ; \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif gzip
-
-.PHONY: maybe-distclean-gzip distclean-gzip
-maybe-distclean-gzip:
-@if gzip
-maybe-distclean-gzip: distclean-gzip
-
-distclean-gzip: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gzip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in gzip" ; \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif gzip
-
-.PHONY: maybe-maintainer-clean-gzip maintainer-clean-gzip
-maybe-maintainer-clean-gzip:
-@if gzip
-maybe-maintainer-clean-gzip: maintainer-clean-gzip
-
-maintainer-clean-gzip: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gzip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in gzip" ; \
-	(cd $(HOST_SUBDIR)/gzip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif gzip
-
-
-
-.PHONY: configure-hello maybe-configure-hello
-maybe-configure-hello:
-@if hello
-maybe-configure-hello: configure-hello
-configure-hello: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/hello ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/hello; \
-	cd "$(HOST_SUBDIR)/hello" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/hello/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/hello"; \
-	libsrcdir="$$s/hello"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif hello
-
-
-
-
-
-.PHONY: all-hello maybe-all-hello
-maybe-all-hello:
-@if hello
-TARGET-hello=all
-maybe-all-hello: all-hello
-all-hello: configure-hello
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-hello))
-@endif hello
-
-
-
-
-.PHONY: check-hello maybe-check-hello
-maybe-check-hello:
-@if hello
-maybe-check-hello: check-hello
-
-check-hello:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif hello
-
-.PHONY: install-hello maybe-install-hello
-maybe-install-hello:
-@if hello
-maybe-install-hello: install-hello
-
-install-hello: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif hello
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-hello info-hello
-maybe-info-hello:
-@if hello
-maybe-info-hello: info-hello
-
-info-hello: \
-    configure-hello 
-	@: $(MAKE); $(unstage)
-	@[ -f ./hello/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in hello" ; \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif hello
-
-.PHONY: maybe-dvi-hello dvi-hello
-maybe-dvi-hello:
-@if hello
-maybe-dvi-hello: dvi-hello
-
-dvi-hello: \
-    configure-hello 
-	@: $(MAKE); $(unstage)
-	@[ -f ./hello/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in hello" ; \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif hello
-
-.PHONY: maybe-html-hello html-hello
-maybe-html-hello:
-@if hello
-maybe-html-hello: html-hello
-
-html-hello: \
-    configure-hello 
-	@: $(MAKE); $(unstage)
-	@[ -f ./hello/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in hello" ; \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif hello
-
-.PHONY: maybe-TAGS-hello TAGS-hello
-maybe-TAGS-hello:
-@if hello
-maybe-TAGS-hello: TAGS-hello
-
-TAGS-hello: \
-    configure-hello 
-	@: $(MAKE); $(unstage)
-	@[ -f ./hello/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in hello" ; \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif hello
-
-.PHONY: maybe-install-info-hello install-info-hello
-maybe-install-info-hello:
-@if hello
-maybe-install-info-hello: install-info-hello
-
-install-info-hello: \
-    configure-hello \
-    info-hello 
-	@: $(MAKE); $(unstage)
-	@[ -f ./hello/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in hello" ; \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif hello
-
-.PHONY: maybe-installcheck-hello installcheck-hello
-maybe-installcheck-hello:
-@if hello
-maybe-installcheck-hello: installcheck-hello
-
-installcheck-hello: \
-    configure-hello 
-	@: $(MAKE); $(unstage)
-	@[ -f ./hello/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in hello" ; \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif hello
-
-.PHONY: maybe-mostlyclean-hello mostlyclean-hello
-maybe-mostlyclean-hello:
-@if hello
-maybe-mostlyclean-hello: mostlyclean-hello
-
-mostlyclean-hello: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./hello/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in hello" ; \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif hello
-
-.PHONY: maybe-clean-hello clean-hello
-maybe-clean-hello:
-@if hello
-maybe-clean-hello: clean-hello
-
-clean-hello: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./hello/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in hello" ; \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif hello
-
-.PHONY: maybe-distclean-hello distclean-hello
-maybe-distclean-hello:
-@if hello
-maybe-distclean-hello: distclean-hello
-
-distclean-hello: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./hello/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in hello" ; \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif hello
-
-.PHONY: maybe-maintainer-clean-hello maintainer-clean-hello
-maybe-maintainer-clean-hello:
-@if hello
-maybe-maintainer-clean-hello: maintainer-clean-hello
-
-maintainer-clean-hello: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./hello/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in hello" ; \
-	(cd $(HOST_SUBDIR)/hello && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif hello
-
-
-
-.PHONY: configure-indent maybe-configure-indent
-maybe-configure-indent:
-@if indent
-maybe-configure-indent: configure-indent
-configure-indent: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/indent; \
-	cd "$(HOST_SUBDIR)/indent" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/indent/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/indent"; \
-	libsrcdir="$$s/indent"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif indent
-
-
-
-
-
-.PHONY: all-indent maybe-all-indent
-maybe-all-indent:
-@if indent
-TARGET-indent=all
-maybe-all-indent: all-indent
-all-indent: configure-indent
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-indent))
-@endif indent
-
-
-
-
-.PHONY: check-indent maybe-check-indent
-maybe-check-indent:
-@if indent
-maybe-check-indent: check-indent
-
-check-indent:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif indent
-
-.PHONY: install-indent maybe-install-indent
-maybe-install-indent:
-@if indent
-maybe-install-indent: install-indent
-
-install-indent: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif indent
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-indent info-indent
-maybe-info-indent:
-@if indent
-maybe-info-indent: info-indent
-
-info-indent: \
-    configure-indent 
-	@: $(MAKE); $(unstage)
-	@[ -f ./indent/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in indent" ; \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif indent
-
-.PHONY: maybe-dvi-indent dvi-indent
-maybe-dvi-indent:
-@if indent
-maybe-dvi-indent: dvi-indent
-
-dvi-indent: \
-    configure-indent 
-	@: $(MAKE); $(unstage)
-	@[ -f ./indent/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in indent" ; \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif indent
-
-.PHONY: maybe-html-indent html-indent
-maybe-html-indent:
-@if indent
-maybe-html-indent: html-indent
-
-html-indent: \
-    configure-indent 
-	@: $(MAKE); $(unstage)
-	@[ -f ./indent/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in indent" ; \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif indent
-
-.PHONY: maybe-TAGS-indent TAGS-indent
-maybe-TAGS-indent:
-@if indent
-maybe-TAGS-indent: TAGS-indent
-
-TAGS-indent: \
-    configure-indent 
-	@: $(MAKE); $(unstage)
-	@[ -f ./indent/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in indent" ; \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif indent
-
-.PHONY: maybe-install-info-indent install-info-indent
-maybe-install-info-indent:
-@if indent
-maybe-install-info-indent: install-info-indent
-
-install-info-indent: \
-    configure-indent \
-    info-indent 
-	@: $(MAKE); $(unstage)
-	@[ -f ./indent/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in indent" ; \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif indent
-
-.PHONY: maybe-installcheck-indent installcheck-indent
-maybe-installcheck-indent:
-@if indent
-maybe-installcheck-indent: installcheck-indent
-
-installcheck-indent: \
-    configure-indent 
-	@: $(MAKE); $(unstage)
-	@[ -f ./indent/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in indent" ; \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif indent
-
-.PHONY: maybe-mostlyclean-indent mostlyclean-indent
-maybe-mostlyclean-indent:
-@if indent
-maybe-mostlyclean-indent: mostlyclean-indent
-
-mostlyclean-indent: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./indent/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in indent" ; \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif indent
-
-.PHONY: maybe-clean-indent clean-indent
-maybe-clean-indent:
-@if indent
-maybe-clean-indent: clean-indent
-
-clean-indent: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./indent/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in indent" ; \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif indent
-
-.PHONY: maybe-distclean-indent distclean-indent
-maybe-distclean-indent:
-@if indent
-maybe-distclean-indent: distclean-indent
-
-distclean-indent: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./indent/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in indent" ; \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif indent
-
-.PHONY: maybe-maintainer-clean-indent maintainer-clean-indent
-maybe-maintainer-clean-indent:
-@if indent
-maybe-maintainer-clean-indent: maintainer-clean-indent
-
-maintainer-clean-indent: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./indent/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in indent" ; \
-	(cd $(HOST_SUBDIR)/indent && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif indent
-
-
-
-.PHONY: configure-intl maybe-configure-intl
-maybe-configure-intl:
-@if intl
-maybe-configure-intl: configure-intl
-configure-intl: 
-@endif intl
-@if intl-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif intl-bootstrap
-@if intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/intl; \
-	cd "$(HOST_SUBDIR)/intl" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif intl
-
-
-
-.PHONY: configure-stage1-intl maybe-configure-stage1-intl
-maybe-configure-stage1-intl:
-@if intl-bootstrap
-maybe-configure-stage1-intl: configure-stage1-intl
-configure-stage1-intl:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif intl-bootstrap
-
-.PHONY: configure-stage2-intl maybe-configure-stage2-intl
-maybe-configure-stage2-intl:
-@if intl-bootstrap
-maybe-configure-stage2-intl: configure-stage2-intl
-configure-stage2-intl:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-.PHONY: configure-stage3-intl maybe-configure-stage3-intl
-maybe-configure-stage3-intl:
-@if intl-bootstrap
-maybe-configure-stage3-intl: configure-stage3-intl
-configure-stage3-intl:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-.PHONY: configure-stage4-intl maybe-configure-stage4-intl
-maybe-configure-stage4-intl:
-@if intl-bootstrap
-maybe-configure-stage4-intl: configure-stage4-intl
-configure-stage4-intl:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
-maybe-configure-stageprofile-intl:
-@if intl-bootstrap
-maybe-configure-stageprofile-intl: configure-stageprofile-intl
-configure-stageprofile-intl:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
-maybe-configure-stagefeedback-intl:
-@if intl-bootstrap
-maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
-configure-stagefeedback-intl:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/intl"; \
-	libsrcdir="$$s/intl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif intl-bootstrap
-
-
-
-
-
-.PHONY: all-intl maybe-all-intl
-maybe-all-intl:
-@if intl
-TARGET-intl=all
-maybe-all-intl: all-intl
-all-intl: configure-intl
-@endif intl
-@if intl-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif intl-bootstrap
-@if intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-intl))
-@endif intl
-
-
-
-.PHONY: all-stage1-intl maybe-all-stage1-intl
-.PHONY: clean-stage1-intl maybe-clean-stage1-intl
-maybe-all-stage1-intl:
-maybe-clean-stage1-intl:
-@if intl-bootstrap
-maybe-all-stage1-intl: all-stage1-intl
-all-stage1: all-stage1-intl
-TARGET-stage1-intl = $(TARGET-intl)
-all-stage1-intl: configure-stage1-intl
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-intl)
-
-maybe-clean-stage1-intl: clean-stage1-intl
-clean-stage1: clean-stage1-intl
-clean-stage1-intl:
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stage2-intl maybe-all-stage2-intl
-.PHONY: clean-stage2-intl maybe-clean-stage2-intl
-maybe-all-stage2-intl:
-maybe-clean-stage2-intl:
-@if intl-bootstrap
-maybe-all-stage2-intl: all-stage2-intl
-all-stage2: all-stage2-intl
-TARGET-stage2-intl = $(TARGET-intl)
-all-stage2-intl: configure-stage2-intl
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-intl)
-
-maybe-clean-stage2-intl: clean-stage2-intl
-clean-stage2: clean-stage2-intl
-clean-stage2-intl:
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stage3-intl maybe-all-stage3-intl
-.PHONY: clean-stage3-intl maybe-clean-stage3-intl
-maybe-all-stage3-intl:
-maybe-clean-stage3-intl:
-@if intl-bootstrap
-maybe-all-stage3-intl: all-stage3-intl
-all-stage3: all-stage3-intl
-TARGET-stage3-intl = $(TARGET-intl)
-all-stage3-intl: configure-stage3-intl
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-intl)
-
-maybe-clean-stage3-intl: clean-stage3-intl
-clean-stage3: clean-stage3-intl
-clean-stage3-intl:
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stage4-intl maybe-all-stage4-intl
-.PHONY: clean-stage4-intl maybe-clean-stage4-intl
-maybe-all-stage4-intl:
-maybe-clean-stage4-intl:
-@if intl-bootstrap
-maybe-all-stage4-intl: all-stage4-intl
-all-stage4: all-stage4-intl
-TARGET-stage4-intl = $(TARGET-intl)
-all-stage4-intl: configure-stage4-intl
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-intl)
-
-maybe-clean-stage4-intl: clean-stage4-intl
-clean-stage4: clean-stage4-intl
-clean-stage4-intl:
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
-.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl
-maybe-all-stageprofile-intl:
-maybe-clean-stageprofile-intl:
-@if intl-bootstrap
-maybe-all-stageprofile-intl: all-stageprofile-intl
-all-stageprofile: all-stageprofile-intl
-TARGET-stageprofile-intl = $(TARGET-intl)
-all-stageprofile-intl: configure-stageprofile-intl
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-intl)
-
-maybe-clean-stageprofile-intl: clean-stageprofile-intl
-clean-stageprofile: clean-stageprofile-intl
-clean-stageprofile-intl:
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
-.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
-maybe-all-stagefeedback-intl:
-maybe-clean-stagefeedback-intl:
-@if intl-bootstrap
-maybe-all-stagefeedback-intl: all-stagefeedback-intl
-all-stagefeedback: all-stagefeedback-intl
-TARGET-stagefeedback-intl = $(TARGET-intl)
-all-stagefeedback-intl: configure-stagefeedback-intl
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-intl)
-
-maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
-clean-stagefeedback: clean-stagefeedback-intl
-clean-stagefeedback-intl:
-	@[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif intl-bootstrap
-
-
-
-
-
-.PHONY: check-intl maybe-check-intl
-maybe-check-intl:
-@if intl
-maybe-check-intl: check-intl
-
-check-intl:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif intl
-
-.PHONY: install-intl maybe-install-intl
-maybe-install-intl:
-@if intl
-maybe-install-intl: install-intl
-
-install-intl: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif intl
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-intl info-intl
-maybe-info-intl:
-@if intl
-maybe-info-intl: info-intl
-
-info-intl: \
-    configure-intl 
-	@[ -f ./intl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in intl" ; \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif intl
-
-.PHONY: maybe-dvi-intl dvi-intl
-maybe-dvi-intl:
-@if intl
-maybe-dvi-intl: dvi-intl
-
-dvi-intl: \
-    configure-intl 
-	@[ -f ./intl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in intl" ; \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif intl
-
-.PHONY: maybe-html-intl html-intl
-maybe-html-intl:
-@if intl
-maybe-html-intl: html-intl
-
-html-intl: \
-    configure-intl 
-	@[ -f ./intl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in intl" ; \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif intl
-
-.PHONY: maybe-TAGS-intl TAGS-intl
-maybe-TAGS-intl:
-@if intl
-maybe-TAGS-intl: TAGS-intl
-
-TAGS-intl: \
-    configure-intl 
-	@[ -f ./intl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in intl" ; \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif intl
-
-.PHONY: maybe-install-info-intl install-info-intl
-maybe-install-info-intl:
-@if intl
-maybe-install-info-intl: install-info-intl
-
-install-info-intl: \
-    configure-intl \
-    info-intl 
-	@[ -f ./intl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in intl" ; \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif intl
-
-.PHONY: maybe-installcheck-intl installcheck-intl
-maybe-installcheck-intl:
-@if intl
-maybe-installcheck-intl: installcheck-intl
-
-installcheck-intl: \
-    configure-intl 
-	@[ -f ./intl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in intl" ; \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif intl
-
-.PHONY: maybe-mostlyclean-intl mostlyclean-intl
-maybe-mostlyclean-intl:
-@if intl
-maybe-mostlyclean-intl: mostlyclean-intl
-
-mostlyclean-intl: 
-	@[ -f ./intl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in intl" ; \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif intl
-
-.PHONY: maybe-clean-intl clean-intl
-maybe-clean-intl:
-@if intl
-maybe-clean-intl: clean-intl
-
-clean-intl: 
-	@[ -f ./intl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in intl" ; \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif intl
-
-.PHONY: maybe-distclean-intl distclean-intl
-maybe-distclean-intl:
-@if intl
-maybe-distclean-intl: distclean-intl
-
-distclean-intl: 
-	@[ -f ./intl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in intl" ; \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif intl
-
-.PHONY: maybe-maintainer-clean-intl maintainer-clean-intl
-maybe-maintainer-clean-intl:
-@if intl
-maybe-maintainer-clean-intl: maintainer-clean-intl
-
-maintainer-clean-intl: 
-	@[ -f ./intl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in intl" ; \
-	(cd $(HOST_SUBDIR)/intl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif intl
-
-
-
-.PHONY: configure-tcl maybe-configure-tcl
-maybe-configure-tcl:
-@if tcl
-maybe-configure-tcl: configure-tcl
-configure-tcl: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/tcl; \
-	cd "$(HOST_SUBDIR)/tcl" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/tcl"; \
-	libsrcdir="$$s/tcl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif tcl
-
-
-
-
-
-.PHONY: all-tcl maybe-all-tcl
-maybe-all-tcl:
-@if tcl
-TARGET-tcl=all
-maybe-all-tcl: all-tcl
-all-tcl: configure-tcl
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/tcl && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tcl))
-@endif tcl
-
-
-
-
-.PHONY: check-tcl maybe-check-tcl
-maybe-check-tcl:
-@if tcl
-maybe-check-tcl: check-tcl
-
-check-tcl:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/tcl && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif tcl
-
-.PHONY: install-tcl maybe-install-tcl
-maybe-install-tcl:
-@if tcl
-maybe-install-tcl: install-tcl
-
-install-tcl: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/tcl && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif tcl
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-tcl info-tcl
-maybe-info-tcl:
-@if tcl
-maybe-info-tcl: info-tcl
-
-info-tcl: \
-    configure-tcl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in tcl" ; \
-	(cd $(HOST_SUBDIR)/tcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif tcl
-
-.PHONY: maybe-dvi-tcl dvi-tcl
-maybe-dvi-tcl:
-@if tcl
-maybe-dvi-tcl: dvi-tcl
-
-dvi-tcl: \
-    configure-tcl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in tcl" ; \
-	(cd $(HOST_SUBDIR)/tcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif tcl
-
-.PHONY: maybe-html-tcl html-tcl
-maybe-html-tcl:
-@if tcl
-maybe-html-tcl: html-tcl
-
-html-tcl: \
-    configure-tcl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in tcl" ; \
-	(cd $(HOST_SUBDIR)/tcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif tcl
-
-.PHONY: maybe-TAGS-tcl TAGS-tcl
-maybe-TAGS-tcl:
-@if tcl
-maybe-TAGS-tcl: TAGS-tcl
-
-TAGS-tcl: \
-    configure-tcl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in tcl" ; \
-	(cd $(HOST_SUBDIR)/tcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif tcl
-
-.PHONY: maybe-install-info-tcl install-info-tcl
-maybe-install-info-tcl:
-@if tcl
-maybe-install-info-tcl: install-info-tcl
-
-install-info-tcl: \
-    configure-tcl \
-    info-tcl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in tcl" ; \
-	(cd $(HOST_SUBDIR)/tcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif tcl
-
-.PHONY: maybe-installcheck-tcl installcheck-tcl
-maybe-installcheck-tcl:
-@if tcl
-maybe-installcheck-tcl: installcheck-tcl
-
-installcheck-tcl: \
-    configure-tcl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in tcl" ; \
-	(cd $(HOST_SUBDIR)/tcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif tcl
-
-.PHONY: maybe-mostlyclean-tcl mostlyclean-tcl
-maybe-mostlyclean-tcl:
-@if tcl
-maybe-mostlyclean-tcl: mostlyclean-tcl
-
-# tcl doesn't support mostlyclean.
-mostlyclean-tcl:
-
-@endif tcl
-
-.PHONY: maybe-clean-tcl clean-tcl
-maybe-clean-tcl:
-@if tcl
-maybe-clean-tcl: clean-tcl
-
-clean-tcl: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in tcl" ; \
-	(cd $(HOST_SUBDIR)/tcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif tcl
-
-.PHONY: maybe-distclean-tcl distclean-tcl
-maybe-distclean-tcl:
-@if tcl
-maybe-distclean-tcl: distclean-tcl
-
-distclean-tcl: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in tcl" ; \
-	(cd $(HOST_SUBDIR)/tcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif tcl
-
-.PHONY: maybe-maintainer-clean-tcl maintainer-clean-tcl
-maybe-maintainer-clean-tcl:
-@if tcl
-maybe-maintainer-clean-tcl: maintainer-clean-tcl
-
-maintainer-clean-tcl: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in tcl" ; \
-	(cd $(HOST_SUBDIR)/tcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif tcl
-
-
-
-.PHONY: configure-itcl maybe-configure-itcl
-maybe-configure-itcl:
-@if itcl
-maybe-configure-itcl: configure-itcl
-configure-itcl: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/itcl; \
-	cd "$(HOST_SUBDIR)/itcl" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/itcl"; \
-	libsrcdir="$$s/itcl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif itcl
-
-
-
-
-
-.PHONY: all-itcl maybe-all-itcl
-maybe-all-itcl:
-@if itcl
-TARGET-itcl=all
-maybe-all-itcl: all-itcl
-all-itcl: configure-itcl
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-itcl))
-@endif itcl
-
-
-
-
-.PHONY: check-itcl maybe-check-itcl
-maybe-check-itcl:
-@if itcl
-maybe-check-itcl: check-itcl
-
-check-itcl:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif itcl
-
-.PHONY: install-itcl maybe-install-itcl
-maybe-install-itcl:
-@if itcl
-maybe-install-itcl: install-itcl
-
-install-itcl: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif itcl
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-itcl info-itcl
-maybe-info-itcl:
-@if itcl
-maybe-info-itcl: info-itcl
-
-info-itcl: \
-    configure-itcl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./itcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in itcl" ; \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif itcl
-
-.PHONY: maybe-dvi-itcl dvi-itcl
-maybe-dvi-itcl:
-@if itcl
-maybe-dvi-itcl: dvi-itcl
-
-dvi-itcl: \
-    configure-itcl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./itcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in itcl" ; \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif itcl
-
-.PHONY: maybe-html-itcl html-itcl
-maybe-html-itcl:
-@if itcl
-maybe-html-itcl: html-itcl
-
-html-itcl: \
-    configure-itcl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./itcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in itcl" ; \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif itcl
-
-.PHONY: maybe-TAGS-itcl TAGS-itcl
-maybe-TAGS-itcl:
-@if itcl
-maybe-TAGS-itcl: TAGS-itcl
-
-TAGS-itcl: \
-    configure-itcl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./itcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in itcl" ; \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif itcl
-
-.PHONY: maybe-install-info-itcl install-info-itcl
-maybe-install-info-itcl:
-@if itcl
-maybe-install-info-itcl: install-info-itcl
-
-install-info-itcl: \
-    configure-itcl \
-    info-itcl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./itcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in itcl" ; \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif itcl
-
-.PHONY: maybe-installcheck-itcl installcheck-itcl
-maybe-installcheck-itcl:
-@if itcl
-maybe-installcheck-itcl: installcheck-itcl
-
-installcheck-itcl: \
-    configure-itcl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./itcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in itcl" ; \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif itcl
-
-.PHONY: maybe-mostlyclean-itcl mostlyclean-itcl
-maybe-mostlyclean-itcl:
-@if itcl
-maybe-mostlyclean-itcl: mostlyclean-itcl
-
-mostlyclean-itcl: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./itcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in itcl" ; \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif itcl
-
-.PHONY: maybe-clean-itcl clean-itcl
-maybe-clean-itcl:
-@if itcl
-maybe-clean-itcl: clean-itcl
-
-clean-itcl: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./itcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in itcl" ; \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif itcl
-
-.PHONY: maybe-distclean-itcl distclean-itcl
-maybe-distclean-itcl:
-@if itcl
-maybe-distclean-itcl: distclean-itcl
-
-distclean-itcl: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./itcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in itcl" ; \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif itcl
-
-.PHONY: maybe-maintainer-clean-itcl maintainer-clean-itcl
-maybe-maintainer-clean-itcl:
-@if itcl
-maybe-maintainer-clean-itcl: maintainer-clean-itcl
-
-maintainer-clean-itcl: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./itcl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in itcl" ; \
-	(cd $(HOST_SUBDIR)/itcl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif itcl
-
-
-
-.PHONY: configure-ld maybe-configure-ld
-maybe-configure-ld:
-@if ld
-maybe-configure-ld: configure-ld
-configure-ld: 
-@endif ld
-@if ld-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif ld-bootstrap
-@if ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/ld; \
-	cd "$(HOST_SUBDIR)/ld" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif ld
-
-
-
-.PHONY: configure-stage1-ld maybe-configure-stage1-ld
-maybe-configure-stage1-ld:
-@if ld-bootstrap
-maybe-configure-stage1-ld: configure-stage1-ld
-configure-stage1-ld:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif ld-bootstrap
-
-.PHONY: configure-stage2-ld maybe-configure-stage2-ld
-maybe-configure-stage2-ld:
-@if ld-bootstrap
-maybe-configure-stage2-ld: configure-stage2-ld
-configure-stage2-ld:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stage3-ld maybe-configure-stage3-ld
-maybe-configure-stage3-ld:
-@if ld-bootstrap
-maybe-configure-stage3-ld: configure-stage3-ld
-configure-stage3-ld:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stage4-ld maybe-configure-stage4-ld
-maybe-configure-stage4-ld:
-@if ld-bootstrap
-maybe-configure-stage4-ld: configure-stage4-ld
-configure-stage4-ld:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
-maybe-configure-stageprofile-ld:
-@if ld-bootstrap
-maybe-configure-stageprofile-ld: configure-stageprofile-ld
-configure-stageprofile-ld:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
-maybe-configure-stagefeedback-ld:
-@if ld-bootstrap
-maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
-configure-stagefeedback-ld:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/ld"; \
-	libsrcdir="$$s/ld"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif ld-bootstrap
-
-
-
-
-
-.PHONY: all-ld maybe-all-ld
-maybe-all-ld:
-@if ld
-TARGET-ld=all
-maybe-all-ld: all-ld
-all-ld: configure-ld
-@endif ld
-@if ld-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif ld-bootstrap
-@if ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ld))
-@endif ld
-
-
-
-.PHONY: all-stage1-ld maybe-all-stage1-ld
-.PHONY: clean-stage1-ld maybe-clean-stage1-ld
-maybe-all-stage1-ld:
-maybe-clean-stage1-ld:
-@if ld-bootstrap
-maybe-all-stage1-ld: all-stage1-ld
-all-stage1: all-stage1-ld
-TARGET-stage1-ld = $(TARGET-ld)
-all-stage1-ld: configure-stage1-ld
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-ld)
-
-maybe-clean-stage1-ld: clean-stage1-ld
-clean-stage1: clean-stage1-ld
-clean-stage1-ld:
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stage2-ld maybe-all-stage2-ld
-.PHONY: clean-stage2-ld maybe-clean-stage2-ld
-maybe-all-stage2-ld:
-maybe-clean-stage2-ld:
-@if ld-bootstrap
-maybe-all-stage2-ld: all-stage2-ld
-all-stage2: all-stage2-ld
-TARGET-stage2-ld = $(TARGET-ld)
-all-stage2-ld: configure-stage2-ld
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-ld)
-
-maybe-clean-stage2-ld: clean-stage2-ld
-clean-stage2: clean-stage2-ld
-clean-stage2-ld:
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stage3-ld maybe-all-stage3-ld
-.PHONY: clean-stage3-ld maybe-clean-stage3-ld
-maybe-all-stage3-ld:
-maybe-clean-stage3-ld:
-@if ld-bootstrap
-maybe-all-stage3-ld: all-stage3-ld
-all-stage3: all-stage3-ld
-TARGET-stage3-ld = $(TARGET-ld)
-all-stage3-ld: configure-stage3-ld
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-ld)
-
-maybe-clean-stage3-ld: clean-stage3-ld
-clean-stage3: clean-stage3-ld
-clean-stage3-ld:
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stage4-ld maybe-all-stage4-ld
-.PHONY: clean-stage4-ld maybe-clean-stage4-ld
-maybe-all-stage4-ld:
-maybe-clean-stage4-ld:
-@if ld-bootstrap
-maybe-all-stage4-ld: all-stage4-ld
-all-stage4: all-stage4-ld
-TARGET-stage4-ld = $(TARGET-ld)
-all-stage4-ld: configure-stage4-ld
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-ld)
-
-maybe-clean-stage4-ld: clean-stage4-ld
-clean-stage4: clean-stage4-ld
-clean-stage4-ld:
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
-.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld
-maybe-all-stageprofile-ld:
-maybe-clean-stageprofile-ld:
-@if ld-bootstrap
-maybe-all-stageprofile-ld: all-stageprofile-ld
-all-stageprofile: all-stageprofile-ld
-TARGET-stageprofile-ld = $(TARGET-ld)
-all-stageprofile-ld: configure-stageprofile-ld
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-ld)
-
-maybe-clean-stageprofile-ld: clean-stageprofile-ld
-clean-stageprofile: clean-stageprofile-ld
-clean-stageprofile-ld:
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
-.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
-maybe-all-stagefeedback-ld:
-maybe-clean-stagefeedback-ld:
-@if ld-bootstrap
-maybe-all-stagefeedback-ld: all-stagefeedback-ld
-all-stagefeedback: all-stagefeedback-ld
-TARGET-stagefeedback-ld = $(TARGET-ld)
-all-stagefeedback-ld: configure-stagefeedback-ld
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-ld)
-
-maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
-clean-stagefeedback: clean-stagefeedback-ld
-clean-stagefeedback-ld:
-	@[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif ld-bootstrap
-
-
-
-
-
-.PHONY: check-ld maybe-check-ld
-maybe-check-ld:
-@if ld
-maybe-check-ld: check-ld
-
-check-ld:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif ld
-
-.PHONY: install-ld maybe-install-ld
-maybe-install-ld:
-@if ld
-maybe-install-ld: install-ld
-
-install-ld: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif ld
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-ld info-ld
-maybe-info-ld:
-@if ld
-maybe-info-ld: info-ld
-
-info-ld: \
-    configure-ld 
-	@[ -f ./ld/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in ld" ; \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif ld
-
-.PHONY: maybe-dvi-ld dvi-ld
-maybe-dvi-ld:
-@if ld
-maybe-dvi-ld: dvi-ld
-
-dvi-ld: \
-    configure-ld 
-	@[ -f ./ld/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in ld" ; \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif ld
-
-.PHONY: maybe-html-ld html-ld
-maybe-html-ld:
-@if ld
-maybe-html-ld: html-ld
-
-html-ld: \
-    configure-ld 
-	@[ -f ./ld/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in ld" ; \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif ld
-
-.PHONY: maybe-TAGS-ld TAGS-ld
-maybe-TAGS-ld:
-@if ld
-maybe-TAGS-ld: TAGS-ld
-
-TAGS-ld: \
-    configure-ld 
-	@[ -f ./ld/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in ld" ; \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif ld
-
-.PHONY: maybe-install-info-ld install-info-ld
-maybe-install-info-ld:
-@if ld
-maybe-install-info-ld: install-info-ld
-
-install-info-ld: \
-    configure-ld \
-    info-ld 
-	@[ -f ./ld/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in ld" ; \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif ld
-
-.PHONY: maybe-installcheck-ld installcheck-ld
-maybe-installcheck-ld:
-@if ld
-maybe-installcheck-ld: installcheck-ld
-
-installcheck-ld: \
-    configure-ld 
-	@[ -f ./ld/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in ld" ; \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif ld
-
-.PHONY: maybe-mostlyclean-ld mostlyclean-ld
-maybe-mostlyclean-ld:
-@if ld
-maybe-mostlyclean-ld: mostlyclean-ld
-
-mostlyclean-ld: 
-	@[ -f ./ld/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in ld" ; \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif ld
-
-.PHONY: maybe-clean-ld clean-ld
-maybe-clean-ld:
-@if ld
-maybe-clean-ld: clean-ld
-
-clean-ld: 
-	@[ -f ./ld/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in ld" ; \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif ld
-
-.PHONY: maybe-distclean-ld distclean-ld
-maybe-distclean-ld:
-@if ld
-maybe-distclean-ld: distclean-ld
-
-distclean-ld: 
-	@[ -f ./ld/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in ld" ; \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif ld
-
-.PHONY: maybe-maintainer-clean-ld maintainer-clean-ld
-maybe-maintainer-clean-ld:
-@if ld
-maybe-maintainer-clean-ld: maintainer-clean-ld
-
-maintainer-clean-ld: 
-	@[ -f ./ld/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in ld" ; \
-	(cd $(HOST_SUBDIR)/ld && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif ld
-
-
-
-.PHONY: configure-libcpp maybe-configure-libcpp
-maybe-configure-libcpp:
-@if libcpp
-maybe-configure-libcpp: configure-libcpp
-configure-libcpp: 
-@endif libcpp
-@if libcpp-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libcpp-bootstrap
-@if libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/libcpp; \
-	cd "$(HOST_SUBDIR)/libcpp" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif libcpp
-
-
-
-.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
-maybe-configure-stage1-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage1-libcpp: configure-stage1-libcpp
-configure-stage1-libcpp:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
-maybe-configure-stage2-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage2-libcpp: configure-stage2-libcpp
-configure-stage2-libcpp:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
-maybe-configure-stage3-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage3-libcpp: configure-stage3-libcpp
-configure-stage3-libcpp:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
-maybe-configure-stage4-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stage4-libcpp: configure-stage4-libcpp
-configure-stage4-libcpp:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
-maybe-configure-stageprofile-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
-configure-stageprofile-libcpp:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
-maybe-configure-stagefeedback-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
-configure-stagefeedback-libcpp:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libcpp"; \
-	libsrcdir="$$s/libcpp"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libcpp-bootstrap
-
-
-
-
-
-.PHONY: all-libcpp maybe-all-libcpp
-maybe-all-libcpp:
-@if libcpp
-TARGET-libcpp=all
-maybe-all-libcpp: all-libcpp
-all-libcpp: configure-libcpp
-@endif libcpp
-@if libcpp-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libcpp-bootstrap
-@if libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libcpp))
-@endif libcpp
-
-
-
-.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
-.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
-maybe-all-stage1-libcpp:
-maybe-clean-stage1-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage1-libcpp: all-stage1-libcpp
-all-stage1: all-stage1-libcpp
-TARGET-stage1-libcpp = $(TARGET-libcpp)
-all-stage1-libcpp: configure-stage1-libcpp
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-libcpp)
-
-maybe-clean-stage1-libcpp: clean-stage1-libcpp
-clean-stage1: clean-stage1-libcpp
-clean-stage1-libcpp:
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
-.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
-maybe-all-stage2-libcpp:
-maybe-clean-stage2-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage2-libcpp: all-stage2-libcpp
-all-stage2: all-stage2-libcpp
-TARGET-stage2-libcpp = $(TARGET-libcpp)
-all-stage2-libcpp: configure-stage2-libcpp
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-libcpp)
-
-maybe-clean-stage2-libcpp: clean-stage2-libcpp
-clean-stage2: clean-stage2-libcpp
-clean-stage2-libcpp:
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
-.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
-maybe-all-stage3-libcpp:
-maybe-clean-stage3-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage3-libcpp: all-stage3-libcpp
-all-stage3: all-stage3-libcpp
-TARGET-stage3-libcpp = $(TARGET-libcpp)
-all-stage3-libcpp: configure-stage3-libcpp
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-libcpp)
-
-maybe-clean-stage3-libcpp: clean-stage3-libcpp
-clean-stage3: clean-stage3-libcpp
-clean-stage3-libcpp:
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
-.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
-maybe-all-stage4-libcpp:
-maybe-clean-stage4-libcpp:
-@if libcpp-bootstrap
-maybe-all-stage4-libcpp: all-stage4-libcpp
-all-stage4: all-stage4-libcpp
-TARGET-stage4-libcpp = $(TARGET-libcpp)
-all-stage4-libcpp: configure-stage4-libcpp
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-libcpp)
-
-maybe-clean-stage4-libcpp: clean-stage4-libcpp
-clean-stage4: clean-stage4-libcpp
-clean-stage4-libcpp:
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
-.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
-maybe-all-stageprofile-libcpp:
-maybe-clean-stageprofile-libcpp:
-@if libcpp-bootstrap
-maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
-all-stageprofile: all-stageprofile-libcpp
-TARGET-stageprofile-libcpp = $(TARGET-libcpp)
-all-stageprofile-libcpp: configure-stageprofile-libcpp
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-libcpp)
-
-maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
-clean-stageprofile: clean-stageprofile-libcpp
-clean-stageprofile-libcpp:
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
-.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
-maybe-all-stagefeedback-libcpp:
-maybe-clean-stagefeedback-libcpp:
-@if libcpp-bootstrap
-maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
-all-stagefeedback: all-stagefeedback-libcpp
-TARGET-stagefeedback-libcpp = $(TARGET-libcpp)
-all-stagefeedback-libcpp: configure-stagefeedback-libcpp
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-libcpp)
-
-maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
-clean-stagefeedback: clean-stagefeedback-libcpp
-clean-stagefeedback-libcpp:
-	@[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif libcpp-bootstrap
-
-
-
-
-
-.PHONY: check-libcpp maybe-check-libcpp
-maybe-check-libcpp:
-@if libcpp
-maybe-check-libcpp: check-libcpp
-
-check-libcpp:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif libcpp
-
-.PHONY: install-libcpp maybe-install-libcpp
-maybe-install-libcpp:
-@if libcpp
-maybe-install-libcpp: install-libcpp
-
-install-libcpp: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif libcpp
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-libcpp info-libcpp
-maybe-info-libcpp:
-@if libcpp
-maybe-info-libcpp: info-libcpp
-
-info-libcpp: \
-    configure-libcpp 
-	@[ -f ./libcpp/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in libcpp" ; \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif libcpp
-
-.PHONY: maybe-dvi-libcpp dvi-libcpp
-maybe-dvi-libcpp:
-@if libcpp
-maybe-dvi-libcpp: dvi-libcpp
-
-dvi-libcpp: \
-    configure-libcpp 
-	@[ -f ./libcpp/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in libcpp" ; \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif libcpp
-
-.PHONY: maybe-html-libcpp html-libcpp
-maybe-html-libcpp:
-@if libcpp
-maybe-html-libcpp: html-libcpp
-
-html-libcpp: \
-    configure-libcpp 
-	@[ -f ./libcpp/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in libcpp" ; \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif libcpp
-
-.PHONY: maybe-TAGS-libcpp TAGS-libcpp
-maybe-TAGS-libcpp:
-@if libcpp
-maybe-TAGS-libcpp: TAGS-libcpp
-
-TAGS-libcpp: \
-    configure-libcpp 
-	@[ -f ./libcpp/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in libcpp" ; \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif libcpp
-
-.PHONY: maybe-install-info-libcpp install-info-libcpp
-maybe-install-info-libcpp:
-@if libcpp
-maybe-install-info-libcpp: install-info-libcpp
-
-install-info-libcpp: \
-    configure-libcpp \
-    info-libcpp 
-	@[ -f ./libcpp/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in libcpp" ; \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif libcpp
-
-.PHONY: maybe-installcheck-libcpp installcheck-libcpp
-maybe-installcheck-libcpp:
-@if libcpp
-maybe-installcheck-libcpp: installcheck-libcpp
-
-installcheck-libcpp: \
-    configure-libcpp 
-	@[ -f ./libcpp/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in libcpp" ; \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif libcpp
-
-.PHONY: maybe-mostlyclean-libcpp mostlyclean-libcpp
-maybe-mostlyclean-libcpp:
-@if libcpp
-maybe-mostlyclean-libcpp: mostlyclean-libcpp
-
-mostlyclean-libcpp: 
-	@[ -f ./libcpp/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in libcpp" ; \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif libcpp
-
-.PHONY: maybe-clean-libcpp clean-libcpp
-maybe-clean-libcpp:
-@if libcpp
-maybe-clean-libcpp: clean-libcpp
-
-clean-libcpp: 
-	@[ -f ./libcpp/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in libcpp" ; \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif libcpp
-
-.PHONY: maybe-distclean-libcpp distclean-libcpp
-maybe-distclean-libcpp:
-@if libcpp
-maybe-distclean-libcpp: distclean-libcpp
-
-distclean-libcpp: 
-	@[ -f ./libcpp/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in libcpp" ; \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif libcpp
-
-.PHONY: maybe-maintainer-clean-libcpp maintainer-clean-libcpp
-maybe-maintainer-clean-libcpp:
-@if libcpp
-maybe-maintainer-clean-libcpp: maintainer-clean-libcpp
-
-maintainer-clean-libcpp: 
-	@[ -f ./libcpp/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in libcpp" ; \
-	(cd $(HOST_SUBDIR)/libcpp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif libcpp
-
-
-
-.PHONY: configure-libdecnumber maybe-configure-libdecnumber
-maybe-configure-libdecnumber:
-@if libdecnumber
-maybe-configure-libdecnumber: configure-libdecnumber
-configure-libdecnumber: 
-@endif libdecnumber
-@if libdecnumber-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libdecnumber-bootstrap
-@if libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/libdecnumber; \
-	cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif libdecnumber
-
-
-
-.PHONY: configure-stage1-libdecnumber maybe-configure-stage1-libdecnumber
-maybe-configure-stage1-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage1-libdecnumber: configure-stage1-libdecnumber
-configure-stage1-libdecnumber:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber
-maybe-configure-stage2-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage2-libdecnumber: configure-stage2-libdecnumber
-configure-stage2-libdecnumber:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber
-maybe-configure-stage3-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage3-libdecnumber: configure-stage3-libdecnumber
-configure-stage3-libdecnumber:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber
-maybe-configure-stage4-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stage4-libdecnumber: configure-stage4-libdecnumber
-configure-stage4-libdecnumber:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber
-maybe-configure-stageprofile-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
-configure-stageprofile-libdecnumber:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber
-maybe-configure-stagefeedback-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
-configure-stagefeedback-libdecnumber:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libdecnumber"; \
-	libsrcdir="$$s/libdecnumber"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libdecnumber-bootstrap
-
-
-
-
-
-.PHONY: all-libdecnumber maybe-all-libdecnumber
-maybe-all-libdecnumber:
-@if libdecnumber
-TARGET-libdecnumber=all
-maybe-all-libdecnumber: all-libdecnumber
-all-libdecnumber: configure-libdecnumber
-@endif libdecnumber
-@if libdecnumber-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libdecnumber-bootstrap
-@if libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libdecnumber))
-@endif libdecnumber
-
-
-
-.PHONY: all-stage1-libdecnumber maybe-all-stage1-libdecnumber
-.PHONY: clean-stage1-libdecnumber maybe-clean-stage1-libdecnumber
-maybe-all-stage1-libdecnumber:
-maybe-clean-stage1-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage1-libdecnumber: all-stage1-libdecnumber
-all-stage1: all-stage1-libdecnumber
-TARGET-stage1-libdecnumber = $(TARGET-libdecnumber)
-all-stage1-libdecnumber: configure-stage1-libdecnumber
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-libdecnumber)
-
-maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
-clean-stage1: clean-stage1-libdecnumber
-clean-stage1-libdecnumber:
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libdecnumber/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stage2-libdecnumber maybe-all-stage2-libdecnumber
-.PHONY: clean-stage2-libdecnumber maybe-clean-stage2-libdecnumber
-maybe-all-stage2-libdecnumber:
-maybe-clean-stage2-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage2-libdecnumber: all-stage2-libdecnumber
-all-stage2: all-stage2-libdecnumber
-TARGET-stage2-libdecnumber = $(TARGET-libdecnumber)
-all-stage2-libdecnumber: configure-stage2-libdecnumber
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-libdecnumber)
-
-maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
-clean-stage2: clean-stage2-libdecnumber
-clean-stage2-libdecnumber:
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libdecnumber/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stage3-libdecnumber maybe-all-stage3-libdecnumber
-.PHONY: clean-stage3-libdecnumber maybe-clean-stage3-libdecnumber
-maybe-all-stage3-libdecnumber:
-maybe-clean-stage3-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage3-libdecnumber: all-stage3-libdecnumber
-all-stage3: all-stage3-libdecnumber
-TARGET-stage3-libdecnumber = $(TARGET-libdecnumber)
-all-stage3-libdecnumber: configure-stage3-libdecnumber
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-libdecnumber)
-
-maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
-clean-stage3: clean-stage3-libdecnumber
-clean-stage3-libdecnumber:
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libdecnumber/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stage4-libdecnumber maybe-all-stage4-libdecnumber
-.PHONY: clean-stage4-libdecnumber maybe-clean-stage4-libdecnumber
-maybe-all-stage4-libdecnumber:
-maybe-clean-stage4-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stage4-libdecnumber: all-stage4-libdecnumber
-all-stage4: all-stage4-libdecnumber
-TARGET-stage4-libdecnumber = $(TARGET-libdecnumber)
-all-stage4-libdecnumber: configure-stage4-libdecnumber
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-libdecnumber)
-
-maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
-clean-stage4: clean-stage4-libdecnumber
-clean-stage4-libdecnumber:
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libdecnumber/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stageprofile-libdecnumber maybe-all-stageprofile-libdecnumber
-.PHONY: clean-stageprofile-libdecnumber maybe-clean-stageprofile-libdecnumber
-maybe-all-stageprofile-libdecnumber:
-maybe-clean-stageprofile-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stageprofile-libdecnumber: all-stageprofile-libdecnumber
-all-stageprofile: all-stageprofile-libdecnumber
-TARGET-stageprofile-libdecnumber = $(TARGET-libdecnumber)
-all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-libdecnumber)
-
-maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
-clean-stageprofile: clean-stageprofile-libdecnumber
-clean-stageprofile-libdecnumber:
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libdecnumber/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stagefeedback-libdecnumber maybe-all-stagefeedback-libdecnumber
-.PHONY: clean-stagefeedback-libdecnumber maybe-clean-stagefeedback-libdecnumber
-maybe-all-stagefeedback-libdecnumber:
-maybe-clean-stagefeedback-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stagefeedback-libdecnumber: all-stagefeedback-libdecnumber
-all-stagefeedback: all-stagefeedback-libdecnumber
-TARGET-stagefeedback-libdecnumber = $(TARGET-libdecnumber)
-all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-libdecnumber)
-
-maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
-clean-stagefeedback: clean-stagefeedback-libdecnumber
-clean-stagefeedback-libdecnumber:
-	@[ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libdecnumber/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif libdecnumber-bootstrap
-
-
-
-
-
-.PHONY: check-libdecnumber maybe-check-libdecnumber
-maybe-check-libdecnumber:
-@if libdecnumber
-maybe-check-libdecnumber: check-libdecnumber
-
-check-libdecnumber:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif libdecnumber
-
-.PHONY: install-libdecnumber maybe-install-libdecnumber
-maybe-install-libdecnumber:
-@if libdecnumber
-maybe-install-libdecnumber: install-libdecnumber
-
-install-libdecnumber: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif libdecnumber
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-libdecnumber info-libdecnumber
-maybe-info-libdecnumber:
-@if libdecnumber
-maybe-info-libdecnumber: info-libdecnumber
-
-info-libdecnumber: \
-    configure-libdecnumber 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-dvi-libdecnumber dvi-libdecnumber
-maybe-dvi-libdecnumber:
-@if libdecnumber
-maybe-dvi-libdecnumber: dvi-libdecnumber
-
-dvi-libdecnumber: \
-    configure-libdecnumber 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-html-libdecnumber html-libdecnumber
-maybe-html-libdecnumber:
-@if libdecnumber
-maybe-html-libdecnumber: html-libdecnumber
-
-html-libdecnumber: \
-    configure-libdecnumber 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-TAGS-libdecnumber TAGS-libdecnumber
-maybe-TAGS-libdecnumber:
-@if libdecnumber
-maybe-TAGS-libdecnumber: TAGS-libdecnumber
-
-TAGS-libdecnumber: \
-    configure-libdecnumber 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-install-info-libdecnumber install-info-libdecnumber
-maybe-install-info-libdecnumber:
-@if libdecnumber
-maybe-install-info-libdecnumber: install-info-libdecnumber
-
-install-info-libdecnumber: \
-    configure-libdecnumber \
-    info-libdecnumber 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-installcheck-libdecnumber installcheck-libdecnumber
-maybe-installcheck-libdecnumber:
-@if libdecnumber
-maybe-installcheck-libdecnumber: installcheck-libdecnumber
-
-installcheck-libdecnumber: \
-    configure-libdecnumber 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-mostlyclean-libdecnumber mostlyclean-libdecnumber
-maybe-mostlyclean-libdecnumber:
-@if libdecnumber
-maybe-mostlyclean-libdecnumber: mostlyclean-libdecnumber
-
-mostlyclean-libdecnumber: 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-clean-libdecnumber clean-libdecnumber
-maybe-clean-libdecnumber:
-@if libdecnumber
-maybe-clean-libdecnumber: clean-libdecnumber
-
-clean-libdecnumber: 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-distclean-libdecnumber distclean-libdecnumber
-maybe-distclean-libdecnumber:
-@if libdecnumber
-maybe-distclean-libdecnumber: distclean-libdecnumber
-
-distclean-libdecnumber: 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif libdecnumber
-
-.PHONY: maybe-maintainer-clean-libdecnumber maintainer-clean-libdecnumber
-maybe-maintainer-clean-libdecnumber:
-@if libdecnumber
-maybe-maintainer-clean-libdecnumber: maintainer-clean-libdecnumber
-
-maintainer-clean-libdecnumber: 
-	@[ -f ./libdecnumber/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in libdecnumber" ; \
-	(cd $(HOST_SUBDIR)/libdecnumber && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif libdecnumber
-
-
-
-.PHONY: configure-libgui maybe-configure-libgui
-maybe-configure-libgui:
-@if libgui
-maybe-configure-libgui: configure-libgui
-configure-libgui: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/libgui; \
-	cd "$(HOST_SUBDIR)/libgui" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libgui"; \
-	libsrcdir="$$s/libgui"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif libgui
-
-
-
-
-
-.PHONY: all-libgui maybe-all-libgui
-maybe-all-libgui:
-@if libgui
-TARGET-libgui=all
-maybe-all-libgui: all-libgui
-all-libgui: configure-libgui
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libgui))
-@endif libgui
-
-
-
-
-.PHONY: check-libgui maybe-check-libgui
-maybe-check-libgui:
-@if libgui
-maybe-check-libgui: check-libgui
-
-check-libgui:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif libgui
-
-.PHONY: install-libgui maybe-install-libgui
-maybe-install-libgui:
-@if libgui
-maybe-install-libgui: install-libgui
-
-install-libgui: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif libgui
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-libgui info-libgui
-maybe-info-libgui:
-@if libgui
-maybe-info-libgui: info-libgui
-
-info-libgui: \
-    configure-libgui 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libgui/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in libgui" ; \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif libgui
-
-.PHONY: maybe-dvi-libgui dvi-libgui
-maybe-dvi-libgui:
-@if libgui
-maybe-dvi-libgui: dvi-libgui
-
-dvi-libgui: \
-    configure-libgui 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libgui/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in libgui" ; \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif libgui
-
-.PHONY: maybe-html-libgui html-libgui
-maybe-html-libgui:
-@if libgui
-maybe-html-libgui: html-libgui
-
-html-libgui: \
-    configure-libgui 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libgui/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in libgui" ; \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif libgui
-
-.PHONY: maybe-TAGS-libgui TAGS-libgui
-maybe-TAGS-libgui:
-@if libgui
-maybe-TAGS-libgui: TAGS-libgui
-
-TAGS-libgui: \
-    configure-libgui 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libgui/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in libgui" ; \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif libgui
-
-.PHONY: maybe-install-info-libgui install-info-libgui
-maybe-install-info-libgui:
-@if libgui
-maybe-install-info-libgui: install-info-libgui
-
-install-info-libgui: \
-    configure-libgui \
-    info-libgui 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libgui/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in libgui" ; \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif libgui
-
-.PHONY: maybe-installcheck-libgui installcheck-libgui
-maybe-installcheck-libgui:
-@if libgui
-maybe-installcheck-libgui: installcheck-libgui
-
-installcheck-libgui: \
-    configure-libgui 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libgui/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in libgui" ; \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif libgui
-
-.PHONY: maybe-mostlyclean-libgui mostlyclean-libgui
-maybe-mostlyclean-libgui:
-@if libgui
-maybe-mostlyclean-libgui: mostlyclean-libgui
-
-mostlyclean-libgui: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libgui/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in libgui" ; \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif libgui
-
-.PHONY: maybe-clean-libgui clean-libgui
-maybe-clean-libgui:
-@if libgui
-maybe-clean-libgui: clean-libgui
-
-clean-libgui: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libgui/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in libgui" ; \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif libgui
-
-.PHONY: maybe-distclean-libgui distclean-libgui
-maybe-distclean-libgui:
-@if libgui
-maybe-distclean-libgui: distclean-libgui
-
-distclean-libgui: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libgui/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in libgui" ; \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif libgui
-
-.PHONY: maybe-maintainer-clean-libgui maintainer-clean-libgui
-maybe-maintainer-clean-libgui:
-@if libgui
-maybe-maintainer-clean-libgui: maintainer-clean-libgui
-
-maintainer-clean-libgui: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libgui/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in libgui" ; \
-	(cd $(HOST_SUBDIR)/libgui && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif libgui
-
-
-
-.PHONY: configure-libiberty maybe-configure-libiberty
-maybe-configure-libiberty:
-@if libiberty
-maybe-configure-libiberty: configure-libiberty
-configure-libiberty: 
-@endif libiberty
-@if libiberty-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libiberty-bootstrap
-@if libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/libiberty; \
-	cd "$(HOST_SUBDIR)/libiberty" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif libiberty
-
-
-
-.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
-maybe-configure-stage1-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stage1-libiberty: configure-stage1-libiberty
-configure-stage1-libiberty:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
-maybe-configure-stage2-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stage2-libiberty: configure-stage2-libiberty
-configure-stage2-libiberty:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
-maybe-configure-stage3-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stage3-libiberty: configure-stage3-libiberty
-configure-stage3-libiberty:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
-maybe-configure-stage4-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stage4-libiberty: configure-stage4-libiberty
-configure-stage4-libiberty:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
-maybe-configure-stageprofile-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
-configure-stageprofile-libiberty:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
-maybe-configure-stagefeedback-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
-configure-stagefeedback-libiberty:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif libiberty-bootstrap
-
-
-
-
-
-.PHONY: all-libiberty maybe-all-libiberty
-maybe-all-libiberty:
-@if libiberty
-TARGET-libiberty=all
-maybe-all-libiberty: all-libiberty
-all-libiberty: configure-libiberty
-@endif libiberty
-@if libiberty-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libiberty-bootstrap
-@if libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libiberty))
-@endif libiberty
-
-
-
-.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
-.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty
-maybe-all-stage1-libiberty:
-maybe-clean-stage1-libiberty:
-@if libiberty-bootstrap
-maybe-all-stage1-libiberty: all-stage1-libiberty
-all-stage1: all-stage1-libiberty
-TARGET-stage1-libiberty = $(TARGET-libiberty)
-all-stage1-libiberty: configure-stage1-libiberty
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-libiberty)
-
-maybe-clean-stage1-libiberty: clean-stage1-libiberty
-clean-stage1: clean-stage1-libiberty
-clean-stage1-libiberty:
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
-.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty
-maybe-all-stage2-libiberty:
-maybe-clean-stage2-libiberty:
-@if libiberty-bootstrap
-maybe-all-stage2-libiberty: all-stage2-libiberty
-all-stage2: all-stage2-libiberty
-TARGET-stage2-libiberty = $(TARGET-libiberty)
-all-stage2-libiberty: configure-stage2-libiberty
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-libiberty)
-
-maybe-clean-stage2-libiberty: clean-stage2-libiberty
-clean-stage2: clean-stage2-libiberty
-clean-stage2-libiberty:
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
-.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
-maybe-all-stage3-libiberty:
-maybe-clean-stage3-libiberty:
-@if libiberty-bootstrap
-maybe-all-stage3-libiberty: all-stage3-libiberty
-all-stage3: all-stage3-libiberty
-TARGET-stage3-libiberty = $(TARGET-libiberty)
-all-stage3-libiberty: configure-stage3-libiberty
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-libiberty)
-
-maybe-clean-stage3-libiberty: clean-stage3-libiberty
-clean-stage3: clean-stage3-libiberty
-clean-stage3-libiberty:
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
-.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
-maybe-all-stage4-libiberty:
-maybe-clean-stage4-libiberty:
-@if libiberty-bootstrap
-maybe-all-stage4-libiberty: all-stage4-libiberty
-all-stage4: all-stage4-libiberty
-TARGET-stage4-libiberty = $(TARGET-libiberty)
-all-stage4-libiberty: configure-stage4-libiberty
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-libiberty)
-
-maybe-clean-stage4-libiberty: clean-stage4-libiberty
-clean-stage4: clean-stage4-libiberty
-clean-stage4-libiberty:
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
-.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty
-maybe-all-stageprofile-libiberty:
-maybe-clean-stageprofile-libiberty:
-@if libiberty-bootstrap
-maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
-all-stageprofile: all-stageprofile-libiberty
-TARGET-stageprofile-libiberty = $(TARGET-libiberty)
-all-stageprofile-libiberty: configure-stageprofile-libiberty
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-libiberty)
-
-maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
-clean-stageprofile: clean-stageprofile-libiberty
-clean-stageprofile-libiberty:
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
-.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
-maybe-all-stagefeedback-libiberty:
-maybe-clean-stagefeedback-libiberty:
-@if libiberty-bootstrap
-maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
-all-stagefeedback: all-stagefeedback-libiberty
-TARGET-stagefeedback-libiberty = $(TARGET-libiberty)
-all-stagefeedback-libiberty: configure-stagefeedback-libiberty
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-libiberty)
-
-maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
-clean-stagefeedback: clean-stagefeedback-libiberty
-clean-stagefeedback-libiberty:
-	@[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif libiberty-bootstrap
-
-
-
-
-
-.PHONY: check-libiberty maybe-check-libiberty
-maybe-check-libiberty:
-@if libiberty
-maybe-check-libiberty: check-libiberty
-
-check-libiberty:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif libiberty
-
-.PHONY: install-libiberty maybe-install-libiberty
-maybe-install-libiberty:
-@if libiberty
-maybe-install-libiberty: install-libiberty
-
-install-libiberty: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif libiberty
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-libiberty info-libiberty
-maybe-info-libiberty:
-@if libiberty
-maybe-info-libiberty: info-libiberty
-
-info-libiberty: \
-    configure-libiberty 
-	@[ -f ./libiberty/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in libiberty" ; \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif libiberty
-
-.PHONY: maybe-dvi-libiberty dvi-libiberty
-maybe-dvi-libiberty:
-@if libiberty
-maybe-dvi-libiberty: dvi-libiberty
-
-dvi-libiberty: \
-    configure-libiberty 
-	@[ -f ./libiberty/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in libiberty" ; \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif libiberty
-
-.PHONY: maybe-html-libiberty html-libiberty
-maybe-html-libiberty:
-@if libiberty
-maybe-html-libiberty: html-libiberty
-
-html-libiberty: \
-    configure-libiberty 
-	@[ -f ./libiberty/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in libiberty" ; \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif libiberty
-
-.PHONY: maybe-TAGS-libiberty TAGS-libiberty
-maybe-TAGS-libiberty:
-@if libiberty
-maybe-TAGS-libiberty: TAGS-libiberty
-
-TAGS-libiberty: \
-    configure-libiberty 
-	@[ -f ./libiberty/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in libiberty" ; \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif libiberty
-
-.PHONY: maybe-install-info-libiberty install-info-libiberty
-maybe-install-info-libiberty:
-@if libiberty
-maybe-install-info-libiberty: install-info-libiberty
-
-install-info-libiberty: \
-    configure-libiberty \
-    info-libiberty 
-	@[ -f ./libiberty/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in libiberty" ; \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif libiberty
-
-.PHONY: maybe-installcheck-libiberty installcheck-libiberty
-maybe-installcheck-libiberty:
-@if libiberty
-maybe-installcheck-libiberty: installcheck-libiberty
-
-installcheck-libiberty: \
-    configure-libiberty 
-	@[ -f ./libiberty/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in libiberty" ; \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif libiberty
-
-.PHONY: maybe-mostlyclean-libiberty mostlyclean-libiberty
-maybe-mostlyclean-libiberty:
-@if libiberty
-maybe-mostlyclean-libiberty: mostlyclean-libiberty
-
-mostlyclean-libiberty: 
-	@[ -f ./libiberty/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in libiberty" ; \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif libiberty
-
-.PHONY: maybe-clean-libiberty clean-libiberty
-maybe-clean-libiberty:
-@if libiberty
-maybe-clean-libiberty: clean-libiberty
-
-clean-libiberty: 
-	@[ -f ./libiberty/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in libiberty" ; \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif libiberty
-
-.PHONY: maybe-distclean-libiberty distclean-libiberty
-maybe-distclean-libiberty:
-@if libiberty
-maybe-distclean-libiberty: distclean-libiberty
-
-distclean-libiberty: 
-	@[ -f ./libiberty/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in libiberty" ; \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif libiberty
-
-.PHONY: maybe-maintainer-clean-libiberty maintainer-clean-libiberty
-maybe-maintainer-clean-libiberty:
-@if libiberty
-maybe-maintainer-clean-libiberty: maintainer-clean-libiberty
-
-maintainer-clean-libiberty: 
-	@[ -f ./libiberty/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in libiberty" ; \
-	(cd $(HOST_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif libiberty
-
-
-
-.PHONY: configure-libtool maybe-configure-libtool
-maybe-configure-libtool:
-@if libtool
-maybe-configure-libtool: configure-libtool
-configure-libtool: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtool ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/libtool; \
-	cd "$(HOST_SUBDIR)/libtool" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libtool/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libtool"; \
-	libsrcdir="$$s/libtool"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif libtool
-
-
-
-
-
-.PHONY: all-libtool maybe-all-libtool
-maybe-all-libtool:
-@if libtool
-TARGET-libtool=all
-maybe-all-libtool: all-libtool
-all-libtool: configure-libtool
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtool))
-@endif libtool
-
-
-
-
-.PHONY: check-libtool maybe-check-libtool
-maybe-check-libtool:
-@if libtool
-maybe-check-libtool: check-libtool
-
-check-libtool:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif libtool
-
-.PHONY: install-libtool maybe-install-libtool
-maybe-install-libtool:
-@if libtool
-maybe-install-libtool: install-libtool
-
-install-libtool: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif libtool
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-libtool info-libtool
-maybe-info-libtool:
-@if libtool
-maybe-info-libtool: info-libtool
-
-info-libtool: \
-    configure-libtool 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtool/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in libtool" ; \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif libtool
-
-.PHONY: maybe-dvi-libtool dvi-libtool
-maybe-dvi-libtool:
-@if libtool
-maybe-dvi-libtool: dvi-libtool
-
-dvi-libtool: \
-    configure-libtool 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtool/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in libtool" ; \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif libtool
-
-.PHONY: maybe-html-libtool html-libtool
-maybe-html-libtool:
-@if libtool
-maybe-html-libtool: html-libtool
-
-html-libtool: \
-    configure-libtool 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtool/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in libtool" ; \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif libtool
-
-.PHONY: maybe-TAGS-libtool TAGS-libtool
-maybe-TAGS-libtool:
-@if libtool
-maybe-TAGS-libtool: TAGS-libtool
-
-TAGS-libtool: \
-    configure-libtool 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtool/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in libtool" ; \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif libtool
-
-.PHONY: maybe-install-info-libtool install-info-libtool
-maybe-install-info-libtool:
-@if libtool
-maybe-install-info-libtool: install-info-libtool
-
-install-info-libtool: \
-    configure-libtool \
-    info-libtool 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtool/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in libtool" ; \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif libtool
-
-.PHONY: maybe-installcheck-libtool installcheck-libtool
-maybe-installcheck-libtool:
-@if libtool
-maybe-installcheck-libtool: installcheck-libtool
-
-installcheck-libtool: \
-    configure-libtool 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtool/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in libtool" ; \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif libtool
-
-.PHONY: maybe-mostlyclean-libtool mostlyclean-libtool
-maybe-mostlyclean-libtool:
-@if libtool
-maybe-mostlyclean-libtool: mostlyclean-libtool
-
-mostlyclean-libtool: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtool/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in libtool" ; \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif libtool
-
-.PHONY: maybe-clean-libtool clean-libtool
-maybe-clean-libtool:
-@if libtool
-maybe-clean-libtool: clean-libtool
-
-clean-libtool: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtool/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in libtool" ; \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif libtool
-
-.PHONY: maybe-distclean-libtool distclean-libtool
-maybe-distclean-libtool:
-@if libtool
-maybe-distclean-libtool: distclean-libtool
-
-distclean-libtool: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtool/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in libtool" ; \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif libtool
-
-.PHONY: maybe-maintainer-clean-libtool maintainer-clean-libtool
-maybe-maintainer-clean-libtool:
-@if libtool
-maybe-maintainer-clean-libtool: maintainer-clean-libtool
-
-maintainer-clean-libtool: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtool/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in libtool" ; \
-	(cd $(HOST_SUBDIR)/libtool && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif libtool
-
-
-
-.PHONY: configure-m4 maybe-configure-m4
-maybe-configure-m4:
-@if m4
-maybe-configure-m4: configure-m4
-configure-m4: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/m4; \
-	cd "$(HOST_SUBDIR)/m4" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/m4/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/m4"; \
-	libsrcdir="$$s/m4"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif m4
-
-
-
-
-
-.PHONY: all-m4 maybe-all-m4
-maybe-all-m4:
-@if m4
-TARGET-m4=all
-maybe-all-m4: all-m4
-all-m4: configure-m4
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-m4))
-@endif m4
-
-
-
-
-.PHONY: check-m4 maybe-check-m4
-maybe-check-m4:
-@if m4
-maybe-check-m4: check-m4
-
-check-m4:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif m4
-
-.PHONY: install-m4 maybe-install-m4
-maybe-install-m4:
-@if m4
-maybe-install-m4: install-m4
-
-install-m4: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif m4
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-m4 info-m4
-maybe-info-m4:
-@if m4
-maybe-info-m4: info-m4
-
-info-m4: \
-    configure-m4 
-	@: $(MAKE); $(unstage)
-	@[ -f ./m4/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in m4" ; \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif m4
-
-.PHONY: maybe-dvi-m4 dvi-m4
-maybe-dvi-m4:
-@if m4
-maybe-dvi-m4: dvi-m4
-
-dvi-m4: \
-    configure-m4 
-	@: $(MAKE); $(unstage)
-	@[ -f ./m4/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in m4" ; \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif m4
-
-.PHONY: maybe-html-m4 html-m4
-maybe-html-m4:
-@if m4
-maybe-html-m4: html-m4
-
-html-m4: \
-    configure-m4 
-	@: $(MAKE); $(unstage)
-	@[ -f ./m4/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in m4" ; \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif m4
-
-.PHONY: maybe-TAGS-m4 TAGS-m4
-maybe-TAGS-m4:
-@if m4
-maybe-TAGS-m4: TAGS-m4
-
-TAGS-m4: \
-    configure-m4 
-	@: $(MAKE); $(unstage)
-	@[ -f ./m4/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in m4" ; \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif m4
-
-.PHONY: maybe-install-info-m4 install-info-m4
-maybe-install-info-m4:
-@if m4
-maybe-install-info-m4: install-info-m4
-
-install-info-m4: \
-    configure-m4 \
-    info-m4 
-	@: $(MAKE); $(unstage)
-	@[ -f ./m4/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in m4" ; \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif m4
-
-.PHONY: maybe-installcheck-m4 installcheck-m4
-maybe-installcheck-m4:
-@if m4
-maybe-installcheck-m4: installcheck-m4
-
-installcheck-m4: \
-    configure-m4 
-	@: $(MAKE); $(unstage)
-	@[ -f ./m4/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in m4" ; \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif m4
-
-.PHONY: maybe-mostlyclean-m4 mostlyclean-m4
-maybe-mostlyclean-m4:
-@if m4
-maybe-mostlyclean-m4: mostlyclean-m4
-
-mostlyclean-m4: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./m4/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in m4" ; \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif m4
-
-.PHONY: maybe-clean-m4 clean-m4
-maybe-clean-m4:
-@if m4
-maybe-clean-m4: clean-m4
-
-clean-m4: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./m4/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in m4" ; \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif m4
-
-.PHONY: maybe-distclean-m4 distclean-m4
-maybe-distclean-m4:
-@if m4
-maybe-distclean-m4: distclean-m4
-
-distclean-m4: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./m4/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in m4" ; \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif m4
-
-.PHONY: maybe-maintainer-clean-m4 maintainer-clean-m4
-maybe-maintainer-clean-m4:
-@if m4
-maybe-maintainer-clean-m4: maintainer-clean-m4
-
-maintainer-clean-m4: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./m4/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in m4" ; \
-	(cd $(HOST_SUBDIR)/m4 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif m4
-
-
-
-.PHONY: configure-make maybe-configure-make
-maybe-configure-make:
-@if make
-maybe-configure-make: configure-make
-configure-make: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/make ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/make; \
-	cd "$(HOST_SUBDIR)/make" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/make/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/make"; \
-	libsrcdir="$$s/make"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif make
-
-
-
-
-
-.PHONY: all-make maybe-all-make
-maybe-all-make:
-@if make
-TARGET-make=all
-maybe-all-make: all-make
-all-make: configure-make
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-make))
-@endif make
-
-
-
-
-.PHONY: check-make maybe-check-make
-maybe-check-make:
-@if make
-maybe-check-make: check-make
-
-check-make:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif make
-
-.PHONY: install-make maybe-install-make
-maybe-install-make:
-@if make
-maybe-install-make: install-make
-
-install-make: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif make
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-make info-make
-maybe-info-make:
-@if make
-maybe-info-make: info-make
-
-info-make: \
-    configure-make 
-	@: $(MAKE); $(unstage)
-	@[ -f ./make/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in make" ; \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif make
-
-.PHONY: maybe-dvi-make dvi-make
-maybe-dvi-make:
-@if make
-maybe-dvi-make: dvi-make
-
-dvi-make: \
-    configure-make 
-	@: $(MAKE); $(unstage)
-	@[ -f ./make/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in make" ; \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif make
-
-.PHONY: maybe-html-make html-make
-maybe-html-make:
-@if make
-maybe-html-make: html-make
-
-html-make: \
-    configure-make 
-	@: $(MAKE); $(unstage)
-	@[ -f ./make/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in make" ; \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif make
-
-.PHONY: maybe-TAGS-make TAGS-make
-maybe-TAGS-make:
-@if make
-maybe-TAGS-make: TAGS-make
-
-TAGS-make: \
-    configure-make 
-	@: $(MAKE); $(unstage)
-	@[ -f ./make/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in make" ; \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif make
-
-.PHONY: maybe-install-info-make install-info-make
-maybe-install-info-make:
-@if make
-maybe-install-info-make: install-info-make
-
-install-info-make: \
-    configure-make \
-    info-make 
-	@: $(MAKE); $(unstage)
-	@[ -f ./make/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in make" ; \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif make
-
-.PHONY: maybe-installcheck-make installcheck-make
-maybe-installcheck-make:
-@if make
-maybe-installcheck-make: installcheck-make
-
-installcheck-make: \
-    configure-make 
-	@: $(MAKE); $(unstage)
-	@[ -f ./make/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in make" ; \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif make
-
-.PHONY: maybe-mostlyclean-make mostlyclean-make
-maybe-mostlyclean-make:
-@if make
-maybe-mostlyclean-make: mostlyclean-make
-
-mostlyclean-make: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./make/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in make" ; \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif make
-
-.PHONY: maybe-clean-make clean-make
-maybe-clean-make:
-@if make
-maybe-clean-make: clean-make
-
-clean-make: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./make/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in make" ; \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif make
-
-.PHONY: maybe-distclean-make distclean-make
-maybe-distclean-make:
-@if make
-maybe-distclean-make: distclean-make
-
-distclean-make: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./make/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in make" ; \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif make
-
-.PHONY: maybe-maintainer-clean-make maintainer-clean-make
-maybe-maintainer-clean-make:
-@if make
-maybe-maintainer-clean-make: maintainer-clean-make
-
-maintainer-clean-make: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./make/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in make" ; \
-	(cd $(HOST_SUBDIR)/make && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif make
-
-
-
-.PHONY: configure-mmalloc maybe-configure-mmalloc
-maybe-configure-mmalloc:
-@if mmalloc
-maybe-configure-mmalloc: configure-mmalloc
-configure-mmalloc: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mmalloc ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/mmalloc; \
-	cd "$(HOST_SUBDIR)/mmalloc" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/mmalloc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/mmalloc"; \
-	libsrcdir="$$s/mmalloc"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif mmalloc
-
-
-
-
-
-.PHONY: all-mmalloc maybe-all-mmalloc
-maybe-all-mmalloc:
-@if mmalloc
-TARGET-mmalloc=all
-maybe-all-mmalloc: all-mmalloc
-all-mmalloc: configure-mmalloc
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/mmalloc && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-mmalloc))
-@endif mmalloc
-
-
-
-
-.PHONY: check-mmalloc maybe-check-mmalloc
-maybe-check-mmalloc:
-@if mmalloc
-maybe-check-mmalloc: check-mmalloc
-
-check-mmalloc:
-
-@endif mmalloc
-
-.PHONY: install-mmalloc maybe-install-mmalloc
-maybe-install-mmalloc:
-@if mmalloc
-maybe-install-mmalloc: install-mmalloc
-
-install-mmalloc: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/mmalloc && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif mmalloc
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-mmalloc info-mmalloc
-maybe-info-mmalloc:
-@if mmalloc
-maybe-info-mmalloc: info-mmalloc
-
-info-mmalloc: \
-    configure-mmalloc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./mmalloc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in mmalloc" ; \
-	(cd $(HOST_SUBDIR)/mmalloc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif mmalloc
-
-.PHONY: maybe-dvi-mmalloc dvi-mmalloc
-maybe-dvi-mmalloc:
-@if mmalloc
-maybe-dvi-mmalloc: dvi-mmalloc
-
-dvi-mmalloc: \
-    configure-mmalloc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./mmalloc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in mmalloc" ; \
-	(cd $(HOST_SUBDIR)/mmalloc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif mmalloc
-
-.PHONY: maybe-html-mmalloc html-mmalloc
-maybe-html-mmalloc:
-@if mmalloc
-maybe-html-mmalloc: html-mmalloc
-
-html-mmalloc: \
-    configure-mmalloc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./mmalloc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in mmalloc" ; \
-	(cd $(HOST_SUBDIR)/mmalloc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif mmalloc
-
-.PHONY: maybe-TAGS-mmalloc TAGS-mmalloc
-maybe-TAGS-mmalloc:
-@if mmalloc
-maybe-TAGS-mmalloc: TAGS-mmalloc
-
-TAGS-mmalloc: \
-    configure-mmalloc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./mmalloc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in mmalloc" ; \
-	(cd $(HOST_SUBDIR)/mmalloc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif mmalloc
-
-.PHONY: maybe-install-info-mmalloc install-info-mmalloc
-maybe-install-info-mmalloc:
-@if mmalloc
-maybe-install-info-mmalloc: install-info-mmalloc
-
-install-info-mmalloc: \
-    configure-mmalloc \
-    info-mmalloc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./mmalloc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in mmalloc" ; \
-	(cd $(HOST_SUBDIR)/mmalloc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif mmalloc
-
-.PHONY: maybe-installcheck-mmalloc installcheck-mmalloc
-maybe-installcheck-mmalloc:
-@if mmalloc
-maybe-installcheck-mmalloc: installcheck-mmalloc
-
-installcheck-mmalloc: \
-    configure-mmalloc 
-	@: $(MAKE); $(unstage)
-	@[ -f ./mmalloc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in mmalloc" ; \
-	(cd $(HOST_SUBDIR)/mmalloc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif mmalloc
-
-.PHONY: maybe-mostlyclean-mmalloc mostlyclean-mmalloc
-maybe-mostlyclean-mmalloc:
-@if mmalloc
-maybe-mostlyclean-mmalloc: mostlyclean-mmalloc
-
-mostlyclean-mmalloc: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./mmalloc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in mmalloc" ; \
-	(cd $(HOST_SUBDIR)/mmalloc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif mmalloc
-
-.PHONY: maybe-clean-mmalloc clean-mmalloc
-maybe-clean-mmalloc:
-@if mmalloc
-maybe-clean-mmalloc: clean-mmalloc
-
-clean-mmalloc: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./mmalloc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in mmalloc" ; \
-	(cd $(HOST_SUBDIR)/mmalloc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif mmalloc
-
-.PHONY: maybe-distclean-mmalloc distclean-mmalloc
-maybe-distclean-mmalloc:
-@if mmalloc
-maybe-distclean-mmalloc: distclean-mmalloc
-
-distclean-mmalloc: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./mmalloc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in mmalloc" ; \
-	(cd $(HOST_SUBDIR)/mmalloc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif mmalloc
-
-.PHONY: maybe-maintainer-clean-mmalloc maintainer-clean-mmalloc
-maybe-maintainer-clean-mmalloc:
-@if mmalloc
-maybe-maintainer-clean-mmalloc: maintainer-clean-mmalloc
-
-maintainer-clean-mmalloc: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./mmalloc/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in mmalloc" ; \
-	(cd $(HOST_SUBDIR)/mmalloc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif mmalloc
-
-
-
-.PHONY: configure-patch maybe-configure-patch
-maybe-configure-patch:
-@if patch
-maybe-configure-patch: configure-patch
-configure-patch: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/patch ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/patch; \
-	cd "$(HOST_SUBDIR)/patch" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/patch/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/patch"; \
-	libsrcdir="$$s/patch"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif patch
-
-
-
-
-
-.PHONY: all-patch maybe-all-patch
-maybe-all-patch:
-@if patch
-TARGET-patch=all
-maybe-all-patch: all-patch
-all-patch: configure-patch
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-patch))
-@endif patch
-
-
-
-
-.PHONY: check-patch maybe-check-patch
-maybe-check-patch:
-@if patch
-maybe-check-patch: check-patch
-
-check-patch:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif patch
-
-.PHONY: install-patch maybe-install-patch
-maybe-install-patch:
-@if patch
-maybe-install-patch: install-patch
-
-install-patch: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif patch
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-patch info-patch
-maybe-info-patch:
-@if patch
-maybe-info-patch: info-patch
-
-info-patch: \
-    configure-patch 
-	@: $(MAKE); $(unstage)
-	@[ -f ./patch/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in patch" ; \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif patch
-
-.PHONY: maybe-dvi-patch dvi-patch
-maybe-dvi-patch:
-@if patch
-maybe-dvi-patch: dvi-patch
-
-dvi-patch: \
-    configure-patch 
-	@: $(MAKE); $(unstage)
-	@[ -f ./patch/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in patch" ; \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif patch
-
-.PHONY: maybe-html-patch html-patch
-maybe-html-patch:
-@if patch
-maybe-html-patch: html-patch
-
-html-patch: \
-    configure-patch 
-	@: $(MAKE); $(unstage)
-	@[ -f ./patch/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in patch" ; \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif patch
-
-.PHONY: maybe-TAGS-patch TAGS-patch
-maybe-TAGS-patch:
-@if patch
-maybe-TAGS-patch: TAGS-patch
-
-TAGS-patch: \
-    configure-patch 
-	@: $(MAKE); $(unstage)
-	@[ -f ./patch/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in patch" ; \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif patch
-
-.PHONY: maybe-install-info-patch install-info-patch
-maybe-install-info-patch:
-@if patch
-maybe-install-info-patch: install-info-patch
-
-install-info-patch: \
-    configure-patch \
-    info-patch 
-	@: $(MAKE); $(unstage)
-	@[ -f ./patch/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in patch" ; \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif patch
-
-.PHONY: maybe-installcheck-patch installcheck-patch
-maybe-installcheck-patch:
-@if patch
-maybe-installcheck-patch: installcheck-patch
-
-installcheck-patch: \
-    configure-patch 
-	@: $(MAKE); $(unstage)
-	@[ -f ./patch/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in patch" ; \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif patch
-
-.PHONY: maybe-mostlyclean-patch mostlyclean-patch
-maybe-mostlyclean-patch:
-@if patch
-maybe-mostlyclean-patch: mostlyclean-patch
-
-mostlyclean-patch: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./patch/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in patch" ; \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif patch
-
-.PHONY: maybe-clean-patch clean-patch
-maybe-clean-patch:
-@if patch
-maybe-clean-patch: clean-patch
-
-clean-patch: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./patch/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in patch" ; \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif patch
-
-.PHONY: maybe-distclean-patch distclean-patch
-maybe-distclean-patch:
-@if patch
-maybe-distclean-patch: distclean-patch
-
-distclean-patch: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./patch/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in patch" ; \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif patch
-
-.PHONY: maybe-maintainer-clean-patch maintainer-clean-patch
-maybe-maintainer-clean-patch:
-@if patch
-maybe-maintainer-clean-patch: maintainer-clean-patch
-
-maintainer-clean-patch: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./patch/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in patch" ; \
-	(cd $(HOST_SUBDIR)/patch && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif patch
-
-
-
-.PHONY: configure-perl maybe-configure-perl
-maybe-configure-perl:
-@if perl
-maybe-configure-perl: configure-perl
-configure-perl: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/perl ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/perl; \
-	cd "$(HOST_SUBDIR)/perl" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/perl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/perl"; \
-	libsrcdir="$$s/perl"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif perl
-
-
-
-
-
-.PHONY: all-perl maybe-all-perl
-maybe-all-perl:
-@if perl
-TARGET-perl=all
-maybe-all-perl: all-perl
-all-perl: configure-perl
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-perl))
-@endif perl
-
-
-
-
-.PHONY: check-perl maybe-check-perl
-maybe-check-perl:
-@if perl
-maybe-check-perl: check-perl
-
-check-perl:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif perl
-
-.PHONY: install-perl maybe-install-perl
-maybe-install-perl:
-@if perl
-maybe-install-perl: install-perl
-
-install-perl: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif perl
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-perl info-perl
-maybe-info-perl:
-@if perl
-maybe-info-perl: info-perl
-
-info-perl: \
-    configure-perl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./perl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in perl" ; \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif perl
-
-.PHONY: maybe-dvi-perl dvi-perl
-maybe-dvi-perl:
-@if perl
-maybe-dvi-perl: dvi-perl
-
-dvi-perl: \
-    configure-perl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./perl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in perl" ; \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif perl
-
-.PHONY: maybe-html-perl html-perl
-maybe-html-perl:
-@if perl
-maybe-html-perl: html-perl
-
-html-perl: \
-    configure-perl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./perl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in perl" ; \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif perl
-
-.PHONY: maybe-TAGS-perl TAGS-perl
-maybe-TAGS-perl:
-@if perl
-maybe-TAGS-perl: TAGS-perl
-
-TAGS-perl: \
-    configure-perl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./perl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in perl" ; \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif perl
-
-.PHONY: maybe-install-info-perl install-info-perl
-maybe-install-info-perl:
-@if perl
-maybe-install-info-perl: install-info-perl
-
-install-info-perl: \
-    configure-perl \
-    info-perl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./perl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in perl" ; \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif perl
-
-.PHONY: maybe-installcheck-perl installcheck-perl
-maybe-installcheck-perl:
-@if perl
-maybe-installcheck-perl: installcheck-perl
-
-installcheck-perl: \
-    configure-perl 
-	@: $(MAKE); $(unstage)
-	@[ -f ./perl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in perl" ; \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif perl
-
-.PHONY: maybe-mostlyclean-perl mostlyclean-perl
-maybe-mostlyclean-perl:
-@if perl
-maybe-mostlyclean-perl: mostlyclean-perl
-
-mostlyclean-perl: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./perl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in perl" ; \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif perl
-
-.PHONY: maybe-clean-perl clean-perl
-maybe-clean-perl:
-@if perl
-maybe-clean-perl: clean-perl
-
-clean-perl: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./perl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in perl" ; \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif perl
-
-.PHONY: maybe-distclean-perl distclean-perl
-maybe-distclean-perl:
-@if perl
-maybe-distclean-perl: distclean-perl
-
-distclean-perl: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./perl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in perl" ; \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif perl
-
-.PHONY: maybe-maintainer-clean-perl maintainer-clean-perl
-maybe-maintainer-clean-perl:
-@if perl
-maybe-maintainer-clean-perl: maintainer-clean-perl
-
-maintainer-clean-perl: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./perl/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in perl" ; \
-	(cd $(HOST_SUBDIR)/perl && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif perl
-
-
-
-.PHONY: configure-prms maybe-configure-prms
-maybe-configure-prms:
-@if prms
-maybe-configure-prms: configure-prms
-configure-prms: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/prms ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/prms; \
-	cd "$(HOST_SUBDIR)/prms" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/prms/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/prms"; \
-	libsrcdir="$$s/prms"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif prms
-
-
-
-
-
-.PHONY: all-prms maybe-all-prms
-maybe-all-prms:
-@if prms
-TARGET-prms=all
-maybe-all-prms: all-prms
-all-prms: configure-prms
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-prms))
-@endif prms
-
-
-
-
-.PHONY: check-prms maybe-check-prms
-maybe-check-prms:
-@if prms
-maybe-check-prms: check-prms
-
-check-prms:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif prms
-
-.PHONY: install-prms maybe-install-prms
-maybe-install-prms:
-@if prms
-maybe-install-prms: install-prms
-
-install-prms: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif prms
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-prms info-prms
-maybe-info-prms:
-@if prms
-maybe-info-prms: info-prms
-
-info-prms: \
-    configure-prms 
-	@: $(MAKE); $(unstage)
-	@[ -f ./prms/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in prms" ; \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif prms
-
-.PHONY: maybe-dvi-prms dvi-prms
-maybe-dvi-prms:
-@if prms
-maybe-dvi-prms: dvi-prms
-
-dvi-prms: \
-    configure-prms 
-	@: $(MAKE); $(unstage)
-	@[ -f ./prms/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in prms" ; \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif prms
-
-.PHONY: maybe-html-prms html-prms
-maybe-html-prms:
-@if prms
-maybe-html-prms: html-prms
-
-html-prms: \
-    configure-prms 
-	@: $(MAKE); $(unstage)
-	@[ -f ./prms/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in prms" ; \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif prms
-
-.PHONY: maybe-TAGS-prms TAGS-prms
-maybe-TAGS-prms:
-@if prms
-maybe-TAGS-prms: TAGS-prms
-
-TAGS-prms: \
-    configure-prms 
-	@: $(MAKE); $(unstage)
-	@[ -f ./prms/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in prms" ; \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif prms
-
-.PHONY: maybe-install-info-prms install-info-prms
-maybe-install-info-prms:
-@if prms
-maybe-install-info-prms: install-info-prms
-
-install-info-prms: \
-    configure-prms \
-    info-prms 
-	@: $(MAKE); $(unstage)
-	@[ -f ./prms/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in prms" ; \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif prms
-
-.PHONY: maybe-installcheck-prms installcheck-prms
-maybe-installcheck-prms:
-@if prms
-maybe-installcheck-prms: installcheck-prms
-
-installcheck-prms: \
-    configure-prms 
-	@: $(MAKE); $(unstage)
-	@[ -f ./prms/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in prms" ; \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif prms
-
-.PHONY: maybe-mostlyclean-prms mostlyclean-prms
-maybe-mostlyclean-prms:
-@if prms
-maybe-mostlyclean-prms: mostlyclean-prms
-
-mostlyclean-prms: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./prms/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in prms" ; \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif prms
-
-.PHONY: maybe-clean-prms clean-prms
-maybe-clean-prms:
-@if prms
-maybe-clean-prms: clean-prms
-
-clean-prms: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./prms/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in prms" ; \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif prms
-
-.PHONY: maybe-distclean-prms distclean-prms
-maybe-distclean-prms:
-@if prms
-maybe-distclean-prms: distclean-prms
-
-distclean-prms: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./prms/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in prms" ; \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif prms
-
-.PHONY: maybe-maintainer-clean-prms maintainer-clean-prms
-maybe-maintainer-clean-prms:
-@if prms
-maybe-maintainer-clean-prms: maintainer-clean-prms
-
-maintainer-clean-prms: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./prms/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in prms" ; \
-	(cd $(HOST_SUBDIR)/prms && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif prms
-
-
-
-.PHONY: configure-rcs maybe-configure-rcs
-maybe-configure-rcs:
-@if rcs
-maybe-configure-rcs: configure-rcs
-configure-rcs: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/rcs ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/rcs; \
-	cd "$(HOST_SUBDIR)/rcs" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/rcs/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/rcs"; \
-	libsrcdir="$$s/rcs"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif rcs
-
-
-
-
-
-.PHONY: all-rcs maybe-all-rcs
-maybe-all-rcs:
-@if rcs
-TARGET-rcs=all
-maybe-all-rcs: all-rcs
-all-rcs: configure-rcs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-rcs))
-@endif rcs
-
-
-
-
-.PHONY: check-rcs maybe-check-rcs
-maybe-check-rcs:
-@if rcs
-maybe-check-rcs: check-rcs
-
-check-rcs:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif rcs
-
-.PHONY: install-rcs maybe-install-rcs
-maybe-install-rcs:
-@if rcs
-maybe-install-rcs: install-rcs
-
-install-rcs: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif rcs
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-rcs info-rcs
-maybe-info-rcs:
-@if rcs
-maybe-info-rcs: info-rcs
-
-info-rcs: \
-    configure-rcs 
-	@: $(MAKE); $(unstage)
-	@[ -f ./rcs/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in rcs" ; \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif rcs
-
-.PHONY: maybe-dvi-rcs dvi-rcs
-maybe-dvi-rcs:
-@if rcs
-maybe-dvi-rcs: dvi-rcs
-
-dvi-rcs: \
-    configure-rcs 
-	@: $(MAKE); $(unstage)
-	@[ -f ./rcs/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in rcs" ; \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif rcs
-
-.PHONY: maybe-html-rcs html-rcs
-maybe-html-rcs:
-@if rcs
-maybe-html-rcs: html-rcs
-
-html-rcs: \
-    configure-rcs 
-	@: $(MAKE); $(unstage)
-	@[ -f ./rcs/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in rcs" ; \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif rcs
-
-.PHONY: maybe-TAGS-rcs TAGS-rcs
-maybe-TAGS-rcs:
-@if rcs
-maybe-TAGS-rcs: TAGS-rcs
-
-TAGS-rcs: \
-    configure-rcs 
-	@: $(MAKE); $(unstage)
-	@[ -f ./rcs/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in rcs" ; \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif rcs
-
-.PHONY: maybe-install-info-rcs install-info-rcs
-maybe-install-info-rcs:
-@if rcs
-maybe-install-info-rcs: install-info-rcs
-
-install-info-rcs: \
-    configure-rcs \
-    info-rcs 
-	@: $(MAKE); $(unstage)
-	@[ -f ./rcs/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in rcs" ; \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif rcs
-
-.PHONY: maybe-installcheck-rcs installcheck-rcs
-maybe-installcheck-rcs:
-@if rcs
-maybe-installcheck-rcs: installcheck-rcs
-
-installcheck-rcs: \
-    configure-rcs 
-	@: $(MAKE); $(unstage)
-	@[ -f ./rcs/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in rcs" ; \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif rcs
-
-.PHONY: maybe-mostlyclean-rcs mostlyclean-rcs
-maybe-mostlyclean-rcs:
-@if rcs
-maybe-mostlyclean-rcs: mostlyclean-rcs
-
-mostlyclean-rcs: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./rcs/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in rcs" ; \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif rcs
-
-.PHONY: maybe-clean-rcs clean-rcs
-maybe-clean-rcs:
-@if rcs
-maybe-clean-rcs: clean-rcs
-
-clean-rcs: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./rcs/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in rcs" ; \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif rcs
-
-.PHONY: maybe-distclean-rcs distclean-rcs
-maybe-distclean-rcs:
-@if rcs
-maybe-distclean-rcs: distclean-rcs
-
-distclean-rcs: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./rcs/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in rcs" ; \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif rcs
-
-.PHONY: maybe-maintainer-clean-rcs maintainer-clean-rcs
-maybe-maintainer-clean-rcs:
-@if rcs
-maybe-maintainer-clean-rcs: maintainer-clean-rcs
-
-maintainer-clean-rcs: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./rcs/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in rcs" ; \
-	(cd $(HOST_SUBDIR)/rcs && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif rcs
-
-
-
-.PHONY: configure-readline maybe-configure-readline
-maybe-configure-readline:
-@if readline
-maybe-configure-readline: configure-readline
-configure-readline: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/readline; \
-	cd "$(HOST_SUBDIR)/readline" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/readline/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/readline"; \
-	libsrcdir="$$s/readline"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif readline
-
-
-
-
-
-.PHONY: all-readline maybe-all-readline
-maybe-all-readline:
-@if readline
-TARGET-readline=all
-maybe-all-readline: all-readline
-all-readline: configure-readline
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-readline))
-@endif readline
-
-
-
-
-.PHONY: check-readline maybe-check-readline
-maybe-check-readline:
-@if readline
-maybe-check-readline: check-readline
-
-check-readline:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif readline
-
-.PHONY: install-readline maybe-install-readline
-maybe-install-readline:
-@if readline
-maybe-install-readline: install-readline
-
-install-readline: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif readline
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-readline info-readline
-maybe-info-readline:
-@if readline
-maybe-info-readline: info-readline
-
-info-readline: \
-    configure-readline 
-	@: $(MAKE); $(unstage)
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in readline" ; \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif readline
-
-.PHONY: maybe-dvi-readline dvi-readline
-maybe-dvi-readline:
-@if readline
-maybe-dvi-readline: dvi-readline
-
-dvi-readline: \
-    configure-readline 
-	@: $(MAKE); $(unstage)
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in readline" ; \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif readline
-
-.PHONY: maybe-html-readline html-readline
-maybe-html-readline:
-@if readline
-maybe-html-readline: html-readline
-
-html-readline: \
-    configure-readline 
-	@: $(MAKE); $(unstage)
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in readline" ; \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif readline
-
-.PHONY: maybe-TAGS-readline TAGS-readline
-maybe-TAGS-readline:
-@if readline
-maybe-TAGS-readline: TAGS-readline
-
-TAGS-readline: \
-    configure-readline 
-	@: $(MAKE); $(unstage)
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in readline" ; \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif readline
-
-.PHONY: maybe-install-info-readline install-info-readline
-maybe-install-info-readline:
-@if readline
-maybe-install-info-readline: install-info-readline
-
-install-info-readline: \
-    configure-readline \
-    info-readline 
-	@: $(MAKE); $(unstage)
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in readline" ; \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif readline
-
-.PHONY: maybe-installcheck-readline installcheck-readline
-maybe-installcheck-readline:
-@if readline
-maybe-installcheck-readline: installcheck-readline
-
-installcheck-readline: \
-    configure-readline 
-	@: $(MAKE); $(unstage)
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in readline" ; \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif readline
-
-.PHONY: maybe-mostlyclean-readline mostlyclean-readline
-maybe-mostlyclean-readline:
-@if readline
-maybe-mostlyclean-readline: mostlyclean-readline
-
-mostlyclean-readline: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in readline" ; \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif readline
-
-.PHONY: maybe-clean-readline clean-readline
-maybe-clean-readline:
-@if readline
-maybe-clean-readline: clean-readline
-
-clean-readline: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in readline" ; \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif readline
-
-.PHONY: maybe-distclean-readline distclean-readline
-maybe-distclean-readline:
-@if readline
-maybe-distclean-readline: distclean-readline
-
-distclean-readline: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in readline" ; \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif readline
-
-.PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
-maybe-maintainer-clean-readline:
-@if readline
-maybe-maintainer-clean-readline: maintainer-clean-readline
-
-maintainer-clean-readline: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./readline/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in readline" ; \
-	(cd $(HOST_SUBDIR)/readline && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif readline
-
-
-
-.PHONY: configure-release maybe-configure-release
-maybe-configure-release:
-@if release
-maybe-configure-release: configure-release
-configure-release: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/release ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/release; \
-	cd "$(HOST_SUBDIR)/release" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/release/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/release"; \
-	libsrcdir="$$s/release"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif release
-
-
-
-
-
-.PHONY: all-release maybe-all-release
-maybe-all-release:
-@if release
-TARGET-release=all
-maybe-all-release: all-release
-all-release: configure-release
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/release && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-release))
-@endif release
-
-
-
-
-.PHONY: check-release maybe-check-release
-maybe-check-release:
-@if release
-maybe-check-release: check-release
-
-check-release:
-
-@endif release
-
-.PHONY: install-release maybe-install-release
-maybe-install-release:
-@if release
-maybe-install-release: install-release
-
-install-release:
-
-@endif release
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-release info-release
-maybe-info-release:
-@if release
-maybe-info-release: info-release
-
-info-release: \
-    configure-release 
-	@: $(MAKE); $(unstage)
-	@[ -f ./release/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in release" ; \
-	(cd $(HOST_SUBDIR)/release && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif release
-
-.PHONY: maybe-dvi-release dvi-release
-maybe-dvi-release:
-@if release
-maybe-dvi-release: dvi-release
-
-dvi-release: \
-    configure-release 
-	@: $(MAKE); $(unstage)
-	@[ -f ./release/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in release" ; \
-	(cd $(HOST_SUBDIR)/release && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif release
-
-.PHONY: maybe-html-release html-release
-maybe-html-release:
-@if release
-maybe-html-release: html-release
-
-html-release: \
-    configure-release 
-	@: $(MAKE); $(unstage)
-	@[ -f ./release/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in release" ; \
-	(cd $(HOST_SUBDIR)/release && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif release
-
-.PHONY: maybe-TAGS-release TAGS-release
-maybe-TAGS-release:
-@if release
-maybe-TAGS-release: TAGS-release
-
-TAGS-release: \
-    configure-release 
-	@: $(MAKE); $(unstage)
-	@[ -f ./release/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in release" ; \
-	(cd $(HOST_SUBDIR)/release && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif release
-
-.PHONY: maybe-install-info-release install-info-release
-maybe-install-info-release:
-@if release
-maybe-install-info-release: install-info-release
-
-install-info-release: \
-    configure-release \
-    info-release 
-	@: $(MAKE); $(unstage)
-	@[ -f ./release/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in release" ; \
-	(cd $(HOST_SUBDIR)/release && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif release
-
-.PHONY: maybe-installcheck-release installcheck-release
-maybe-installcheck-release:
-@if release
-maybe-installcheck-release: installcheck-release
-
-installcheck-release: \
-    configure-release 
-	@: $(MAKE); $(unstage)
-	@[ -f ./release/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in release" ; \
-	(cd $(HOST_SUBDIR)/release && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif release
-
-.PHONY: maybe-mostlyclean-release mostlyclean-release
-maybe-mostlyclean-release:
-@if release
-maybe-mostlyclean-release: mostlyclean-release
-
-mostlyclean-release: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./release/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in release" ; \
-	(cd $(HOST_SUBDIR)/release && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif release
-
-.PHONY: maybe-clean-release clean-release
-maybe-clean-release:
-@if release
-maybe-clean-release: clean-release
-
-clean-release: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./release/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in release" ; \
-	(cd $(HOST_SUBDIR)/release && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif release
-
-.PHONY: maybe-distclean-release distclean-release
-maybe-distclean-release:
-@if release
-maybe-distclean-release: distclean-release
-
-distclean-release: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./release/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in release" ; \
-	(cd $(HOST_SUBDIR)/release && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif release
-
-.PHONY: maybe-maintainer-clean-release maintainer-clean-release
-maybe-maintainer-clean-release:
-@if release
-maybe-maintainer-clean-release: maintainer-clean-release
-
-maintainer-clean-release: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./release/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in release" ; \
-	(cd $(HOST_SUBDIR)/release && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif release
-
-
-
-.PHONY: configure-recode maybe-configure-recode
-maybe-configure-recode:
-@if recode
-maybe-configure-recode: configure-recode
-configure-recode: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/recode ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/recode; \
-	cd "$(HOST_SUBDIR)/recode" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/recode/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/recode"; \
-	libsrcdir="$$s/recode"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif recode
-
-
-
-
-
-.PHONY: all-recode maybe-all-recode
-maybe-all-recode:
-@if recode
-TARGET-recode=all
-maybe-all-recode: all-recode
-all-recode: configure-recode
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-recode))
-@endif recode
-
-
-
-
-.PHONY: check-recode maybe-check-recode
-maybe-check-recode:
-@if recode
-maybe-check-recode: check-recode
-
-check-recode:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif recode
-
-.PHONY: install-recode maybe-install-recode
-maybe-install-recode:
-@if recode
-maybe-install-recode: install-recode
-
-install-recode: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif recode
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-recode info-recode
-maybe-info-recode:
-@if recode
-maybe-info-recode: info-recode
-
-info-recode: \
-    configure-recode 
-	@: $(MAKE); $(unstage)
-	@[ -f ./recode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in recode" ; \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif recode
-
-.PHONY: maybe-dvi-recode dvi-recode
-maybe-dvi-recode:
-@if recode
-maybe-dvi-recode: dvi-recode
-
-dvi-recode: \
-    configure-recode 
-	@: $(MAKE); $(unstage)
-	@[ -f ./recode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in recode" ; \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif recode
-
-.PHONY: maybe-html-recode html-recode
-maybe-html-recode:
-@if recode
-maybe-html-recode: html-recode
-
-html-recode: \
-    configure-recode 
-	@: $(MAKE); $(unstage)
-	@[ -f ./recode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in recode" ; \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif recode
-
-.PHONY: maybe-TAGS-recode TAGS-recode
-maybe-TAGS-recode:
-@if recode
-maybe-TAGS-recode: TAGS-recode
-
-TAGS-recode: \
-    configure-recode 
-	@: $(MAKE); $(unstage)
-	@[ -f ./recode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in recode" ; \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif recode
-
-.PHONY: maybe-install-info-recode install-info-recode
-maybe-install-info-recode:
-@if recode
-maybe-install-info-recode: install-info-recode
-
-install-info-recode: \
-    configure-recode \
-    info-recode 
-	@: $(MAKE); $(unstage)
-	@[ -f ./recode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in recode" ; \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif recode
-
-.PHONY: maybe-installcheck-recode installcheck-recode
-maybe-installcheck-recode:
-@if recode
-maybe-installcheck-recode: installcheck-recode
-
-installcheck-recode: \
-    configure-recode 
-	@: $(MAKE); $(unstage)
-	@[ -f ./recode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in recode" ; \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif recode
-
-.PHONY: maybe-mostlyclean-recode mostlyclean-recode
-maybe-mostlyclean-recode:
-@if recode
-maybe-mostlyclean-recode: mostlyclean-recode
-
-mostlyclean-recode: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./recode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in recode" ; \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif recode
-
-.PHONY: maybe-clean-recode clean-recode
-maybe-clean-recode:
-@if recode
-maybe-clean-recode: clean-recode
-
-clean-recode: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./recode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in recode" ; \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif recode
-
-.PHONY: maybe-distclean-recode distclean-recode
-maybe-distclean-recode:
-@if recode
-maybe-distclean-recode: distclean-recode
-
-distclean-recode: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./recode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in recode" ; \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif recode
-
-.PHONY: maybe-maintainer-clean-recode maintainer-clean-recode
-maybe-maintainer-clean-recode:
-@if recode
-maybe-maintainer-clean-recode: maintainer-clean-recode
-
-maintainer-clean-recode: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./recode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in recode" ; \
-	(cd $(HOST_SUBDIR)/recode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif recode
-
-
-
-.PHONY: configure-sed maybe-configure-sed
-maybe-configure-sed:
-@if sed
-maybe-configure-sed: configure-sed
-configure-sed: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sed ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/sed; \
-	cd "$(HOST_SUBDIR)/sed" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/sed/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/sed"; \
-	libsrcdir="$$s/sed"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif sed
-
-
-
-
-
-.PHONY: all-sed maybe-all-sed
-maybe-all-sed:
-@if sed
-TARGET-sed=all
-maybe-all-sed: all-sed
-all-sed: configure-sed
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sed))
-@endif sed
-
-
-
-
-.PHONY: check-sed maybe-check-sed
-maybe-check-sed:
-@if sed
-maybe-check-sed: check-sed
-
-check-sed:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif sed
-
-.PHONY: install-sed maybe-install-sed
-maybe-install-sed:
-@if sed
-maybe-install-sed: install-sed
-
-install-sed: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif sed
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-sed info-sed
-maybe-info-sed:
-@if sed
-maybe-info-sed: info-sed
-
-info-sed: \
-    configure-sed 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sed/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in sed" ; \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif sed
-
-.PHONY: maybe-dvi-sed dvi-sed
-maybe-dvi-sed:
-@if sed
-maybe-dvi-sed: dvi-sed
-
-dvi-sed: \
-    configure-sed 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sed/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in sed" ; \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif sed
-
-.PHONY: maybe-html-sed html-sed
-maybe-html-sed:
-@if sed
-maybe-html-sed: html-sed
-
-html-sed: \
-    configure-sed 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sed/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in sed" ; \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif sed
-
-.PHONY: maybe-TAGS-sed TAGS-sed
-maybe-TAGS-sed:
-@if sed
-maybe-TAGS-sed: TAGS-sed
-
-TAGS-sed: \
-    configure-sed 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sed/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in sed" ; \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif sed
-
-.PHONY: maybe-install-info-sed install-info-sed
-maybe-install-info-sed:
-@if sed
-maybe-install-info-sed: install-info-sed
-
-install-info-sed: \
-    configure-sed \
-    info-sed 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sed/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in sed" ; \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif sed
-
-.PHONY: maybe-installcheck-sed installcheck-sed
-maybe-installcheck-sed:
-@if sed
-maybe-installcheck-sed: installcheck-sed
-
-installcheck-sed: \
-    configure-sed 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sed/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in sed" ; \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif sed
-
-.PHONY: maybe-mostlyclean-sed mostlyclean-sed
-maybe-mostlyclean-sed:
-@if sed
-maybe-mostlyclean-sed: mostlyclean-sed
-
-mostlyclean-sed: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sed/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in sed" ; \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif sed
-
-.PHONY: maybe-clean-sed clean-sed
-maybe-clean-sed:
-@if sed
-maybe-clean-sed: clean-sed
-
-clean-sed: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sed/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in sed" ; \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif sed
-
-.PHONY: maybe-distclean-sed distclean-sed
-maybe-distclean-sed:
-@if sed
-maybe-distclean-sed: distclean-sed
-
-distclean-sed: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sed/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in sed" ; \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif sed
-
-.PHONY: maybe-maintainer-clean-sed maintainer-clean-sed
-maybe-maintainer-clean-sed:
-@if sed
-maybe-maintainer-clean-sed: maintainer-clean-sed
-
-maintainer-clean-sed: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sed/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in sed" ; \
-	(cd $(HOST_SUBDIR)/sed && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif sed
-
-
-
-.PHONY: configure-send-pr maybe-configure-send-pr
-maybe-configure-send-pr:
-@if send-pr
-maybe-configure-send-pr: configure-send-pr
-configure-send-pr: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/send-pr ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/send-pr; \
-	cd "$(HOST_SUBDIR)/send-pr" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/send-pr/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/send-pr"; \
-	libsrcdir="$$s/send-pr"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif send-pr
-
-
-
-
-
-.PHONY: all-send-pr maybe-all-send-pr
-maybe-all-send-pr:
-@if send-pr
-TARGET-send-pr=all
-maybe-all-send-pr: all-send-pr
-all-send-pr: configure-send-pr
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-send-pr))
-@endif send-pr
-
-
-
-
-.PHONY: check-send-pr maybe-check-send-pr
-maybe-check-send-pr:
-@if send-pr
-maybe-check-send-pr: check-send-pr
-
-check-send-pr:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif send-pr
-
-.PHONY: install-send-pr maybe-install-send-pr
-maybe-install-send-pr:
-@if send-pr
-maybe-install-send-pr: install-send-pr
-
-install-send-pr: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif send-pr
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-send-pr info-send-pr
-maybe-info-send-pr:
-@if send-pr
-maybe-info-send-pr: info-send-pr
-
-info-send-pr: \
-    configure-send-pr 
-	@: $(MAKE); $(unstage)
-	@[ -f ./send-pr/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in send-pr" ; \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif send-pr
-
-.PHONY: maybe-dvi-send-pr dvi-send-pr
-maybe-dvi-send-pr:
-@if send-pr
-maybe-dvi-send-pr: dvi-send-pr
-
-dvi-send-pr: \
-    configure-send-pr 
-	@: $(MAKE); $(unstage)
-	@[ -f ./send-pr/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in send-pr" ; \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif send-pr
-
-.PHONY: maybe-html-send-pr html-send-pr
-maybe-html-send-pr:
-@if send-pr
-maybe-html-send-pr: html-send-pr
-
-html-send-pr: \
-    configure-send-pr 
-	@: $(MAKE); $(unstage)
-	@[ -f ./send-pr/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in send-pr" ; \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif send-pr
-
-.PHONY: maybe-TAGS-send-pr TAGS-send-pr
-maybe-TAGS-send-pr:
-@if send-pr
-maybe-TAGS-send-pr: TAGS-send-pr
-
-TAGS-send-pr: \
-    configure-send-pr 
-	@: $(MAKE); $(unstage)
-	@[ -f ./send-pr/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in send-pr" ; \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif send-pr
-
-.PHONY: maybe-install-info-send-pr install-info-send-pr
-maybe-install-info-send-pr:
-@if send-pr
-maybe-install-info-send-pr: install-info-send-pr
-
-install-info-send-pr: \
-    configure-send-pr \
-    info-send-pr 
-	@: $(MAKE); $(unstage)
-	@[ -f ./send-pr/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in send-pr" ; \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif send-pr
-
-.PHONY: maybe-installcheck-send-pr installcheck-send-pr
-maybe-installcheck-send-pr:
-@if send-pr
-maybe-installcheck-send-pr: installcheck-send-pr
-
-installcheck-send-pr: \
-    configure-send-pr 
-	@: $(MAKE); $(unstage)
-	@[ -f ./send-pr/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in send-pr" ; \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif send-pr
-
-.PHONY: maybe-mostlyclean-send-pr mostlyclean-send-pr
-maybe-mostlyclean-send-pr:
-@if send-pr
-maybe-mostlyclean-send-pr: mostlyclean-send-pr
-
-mostlyclean-send-pr: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./send-pr/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in send-pr" ; \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif send-pr
-
-.PHONY: maybe-clean-send-pr clean-send-pr
-maybe-clean-send-pr:
-@if send-pr
-maybe-clean-send-pr: clean-send-pr
-
-clean-send-pr: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./send-pr/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in send-pr" ; \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif send-pr
-
-.PHONY: maybe-distclean-send-pr distclean-send-pr
-maybe-distclean-send-pr:
-@if send-pr
-maybe-distclean-send-pr: distclean-send-pr
-
-distclean-send-pr: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./send-pr/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in send-pr" ; \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif send-pr
-
-.PHONY: maybe-maintainer-clean-send-pr maintainer-clean-send-pr
-maybe-maintainer-clean-send-pr:
-@if send-pr
-maybe-maintainer-clean-send-pr: maintainer-clean-send-pr
-
-maintainer-clean-send-pr: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./send-pr/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in send-pr" ; \
-	(cd $(HOST_SUBDIR)/send-pr && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif send-pr
-
-
-
-.PHONY: configure-shellutils maybe-configure-shellutils
-maybe-configure-shellutils:
-@if shellutils
-maybe-configure-shellutils: configure-shellutils
-configure-shellutils: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/shellutils ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/shellutils; \
-	cd "$(HOST_SUBDIR)/shellutils" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/shellutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/shellutils"; \
-	libsrcdir="$$s/shellutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif shellutils
-
-
-
-
-
-.PHONY: all-shellutils maybe-all-shellutils
-maybe-all-shellutils:
-@if shellutils
-TARGET-shellutils=all
-maybe-all-shellutils: all-shellutils
-all-shellutils: configure-shellutils
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-shellutils))
-@endif shellutils
-
-
-
-
-.PHONY: check-shellutils maybe-check-shellutils
-maybe-check-shellutils:
-@if shellutils
-maybe-check-shellutils: check-shellutils
-
-check-shellutils:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif shellutils
-
-.PHONY: install-shellutils maybe-install-shellutils
-maybe-install-shellutils:
-@if shellutils
-maybe-install-shellutils: install-shellutils
-
-install-shellutils: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif shellutils
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-shellutils info-shellutils
-maybe-info-shellutils:
-@if shellutils
-maybe-info-shellutils: info-shellutils
-
-info-shellutils: \
-    configure-shellutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./shellutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in shellutils" ; \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif shellutils
-
-.PHONY: maybe-dvi-shellutils dvi-shellutils
-maybe-dvi-shellutils:
-@if shellutils
-maybe-dvi-shellutils: dvi-shellutils
-
-dvi-shellutils: \
-    configure-shellutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./shellutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in shellutils" ; \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif shellutils
-
-.PHONY: maybe-html-shellutils html-shellutils
-maybe-html-shellutils:
-@if shellutils
-maybe-html-shellutils: html-shellutils
-
-html-shellutils: \
-    configure-shellutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./shellutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in shellutils" ; \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif shellutils
-
-.PHONY: maybe-TAGS-shellutils TAGS-shellutils
-maybe-TAGS-shellutils:
-@if shellutils
-maybe-TAGS-shellutils: TAGS-shellutils
-
-TAGS-shellutils: \
-    configure-shellutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./shellutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in shellutils" ; \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif shellutils
-
-.PHONY: maybe-install-info-shellutils install-info-shellutils
-maybe-install-info-shellutils:
-@if shellutils
-maybe-install-info-shellutils: install-info-shellutils
-
-install-info-shellutils: \
-    configure-shellutils \
-    info-shellutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./shellutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in shellutils" ; \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif shellutils
-
-.PHONY: maybe-installcheck-shellutils installcheck-shellutils
-maybe-installcheck-shellutils:
-@if shellutils
-maybe-installcheck-shellutils: installcheck-shellutils
-
-installcheck-shellutils: \
-    configure-shellutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./shellutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in shellutils" ; \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif shellutils
-
-.PHONY: maybe-mostlyclean-shellutils mostlyclean-shellutils
-maybe-mostlyclean-shellutils:
-@if shellutils
-maybe-mostlyclean-shellutils: mostlyclean-shellutils
-
-mostlyclean-shellutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./shellutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in shellutils" ; \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif shellutils
-
-.PHONY: maybe-clean-shellutils clean-shellutils
-maybe-clean-shellutils:
-@if shellutils
-maybe-clean-shellutils: clean-shellutils
-
-clean-shellutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./shellutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in shellutils" ; \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif shellutils
-
-.PHONY: maybe-distclean-shellutils distclean-shellutils
-maybe-distclean-shellutils:
-@if shellutils
-maybe-distclean-shellutils: distclean-shellutils
-
-distclean-shellutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./shellutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in shellutils" ; \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif shellutils
-
-.PHONY: maybe-maintainer-clean-shellutils maintainer-clean-shellutils
-maybe-maintainer-clean-shellutils:
-@if shellutils
-maybe-maintainer-clean-shellutils: maintainer-clean-shellutils
-
-maintainer-clean-shellutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./shellutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in shellutils" ; \
-	(cd $(HOST_SUBDIR)/shellutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif shellutils
-
-
-
-.PHONY: configure-sid maybe-configure-sid
-maybe-configure-sid:
-@if sid
-maybe-configure-sid: configure-sid
-configure-sid: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/sid; \
-	cd "$(HOST_SUBDIR)/sid" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/sid/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/sid"; \
-	libsrcdir="$$s/sid"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif sid
-
-
-
-
-
-.PHONY: all-sid maybe-all-sid
-maybe-all-sid:
-@if sid
-TARGET-sid=all
-maybe-all-sid: all-sid
-all-sid: configure-sid
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sid))
-@endif sid
-
-
-
-
-.PHONY: check-sid maybe-check-sid
-maybe-check-sid:
-@if sid
-maybe-check-sid: check-sid
-
-check-sid:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif sid
-
-.PHONY: install-sid maybe-install-sid
-maybe-install-sid:
-@if sid
-maybe-install-sid: install-sid
-
-install-sid: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif sid
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-sid info-sid
-maybe-info-sid:
-@if sid
-maybe-info-sid: info-sid
-
-info-sid: \
-    configure-sid 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sid/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in sid" ; \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif sid
-
-.PHONY: maybe-dvi-sid dvi-sid
-maybe-dvi-sid:
-@if sid
-maybe-dvi-sid: dvi-sid
-
-dvi-sid: \
-    configure-sid 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sid/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in sid" ; \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif sid
-
-.PHONY: maybe-html-sid html-sid
-maybe-html-sid:
-@if sid
-maybe-html-sid: html-sid
-
-html-sid: \
-    configure-sid 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sid/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in sid" ; \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif sid
-
-.PHONY: maybe-TAGS-sid TAGS-sid
-maybe-TAGS-sid:
-@if sid
-maybe-TAGS-sid: TAGS-sid
-
-TAGS-sid: \
-    configure-sid 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sid/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in sid" ; \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif sid
-
-.PHONY: maybe-install-info-sid install-info-sid
-maybe-install-info-sid:
-@if sid
-maybe-install-info-sid: install-info-sid
-
-install-info-sid: \
-    configure-sid \
-    info-sid 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sid/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in sid" ; \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif sid
-
-.PHONY: maybe-installcheck-sid installcheck-sid
-maybe-installcheck-sid:
-@if sid
-maybe-installcheck-sid: installcheck-sid
-
-installcheck-sid: \
-    configure-sid 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sid/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in sid" ; \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif sid
-
-.PHONY: maybe-mostlyclean-sid mostlyclean-sid
-maybe-mostlyclean-sid:
-@if sid
-maybe-mostlyclean-sid: mostlyclean-sid
-
-mostlyclean-sid: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sid/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in sid" ; \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif sid
-
-.PHONY: maybe-clean-sid clean-sid
-maybe-clean-sid:
-@if sid
-maybe-clean-sid: clean-sid
-
-clean-sid: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sid/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in sid" ; \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif sid
-
-.PHONY: maybe-distclean-sid distclean-sid
-maybe-distclean-sid:
-@if sid
-maybe-distclean-sid: distclean-sid
-
-distclean-sid: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sid/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in sid" ; \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif sid
-
-.PHONY: maybe-maintainer-clean-sid maintainer-clean-sid
-maybe-maintainer-clean-sid:
-@if sid
-maybe-maintainer-clean-sid: maintainer-clean-sid
-
-maintainer-clean-sid: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sid/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in sid" ; \
-	(cd $(HOST_SUBDIR)/sid && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif sid
-
-
-
-.PHONY: configure-sim maybe-configure-sim
-maybe-configure-sim:
-@if sim
-maybe-configure-sim: configure-sim
-configure-sim: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/sim; \
-	cd "$(HOST_SUBDIR)/sim" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/sim/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/sim"; \
-	libsrcdir="$$s/sim"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif sim
-
-
-
-
-
-.PHONY: all-sim maybe-all-sim
-maybe-all-sim:
-@if sim
-TARGET-sim=all
-maybe-all-sim: all-sim
-all-sim: configure-sim
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sim))
-@endif sim
-
-
-
-
-.PHONY: check-sim maybe-check-sim
-maybe-check-sim:
-@if sim
-maybe-check-sim: check-sim
-
-check-sim:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif sim
-
-.PHONY: install-sim maybe-install-sim
-maybe-install-sim:
-@if sim
-maybe-install-sim: install-sim
-
-install-sim: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif sim
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-sim info-sim
-maybe-info-sim:
-@if sim
-maybe-info-sim: info-sim
-
-info-sim: \
-    configure-sim 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sim/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in sim" ; \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif sim
-
-.PHONY: maybe-dvi-sim dvi-sim
-maybe-dvi-sim:
-@if sim
-maybe-dvi-sim: dvi-sim
-
-dvi-sim: \
-    configure-sim 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sim/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in sim" ; \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif sim
-
-.PHONY: maybe-html-sim html-sim
-maybe-html-sim:
-@if sim
-maybe-html-sim: html-sim
-
-html-sim: \
-    configure-sim 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sim/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in sim" ; \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif sim
-
-.PHONY: maybe-TAGS-sim TAGS-sim
-maybe-TAGS-sim:
-@if sim
-maybe-TAGS-sim: TAGS-sim
-
-TAGS-sim: \
-    configure-sim 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sim/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in sim" ; \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif sim
-
-.PHONY: maybe-install-info-sim install-info-sim
-maybe-install-info-sim:
-@if sim
-maybe-install-info-sim: install-info-sim
-
-install-info-sim: \
-    configure-sim \
-    info-sim 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sim/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in sim" ; \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif sim
-
-.PHONY: maybe-installcheck-sim installcheck-sim
-maybe-installcheck-sim:
-@if sim
-maybe-installcheck-sim: installcheck-sim
-
-installcheck-sim: \
-    configure-sim 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sim/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in sim" ; \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif sim
-
-.PHONY: maybe-mostlyclean-sim mostlyclean-sim
-maybe-mostlyclean-sim:
-@if sim
-maybe-mostlyclean-sim: mostlyclean-sim
-
-mostlyclean-sim: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sim/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in sim" ; \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif sim
-
-.PHONY: maybe-clean-sim clean-sim
-maybe-clean-sim:
-@if sim
-maybe-clean-sim: clean-sim
-
-clean-sim: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sim/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in sim" ; \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif sim
-
-.PHONY: maybe-distclean-sim distclean-sim
-maybe-distclean-sim:
-@if sim
-maybe-distclean-sim: distclean-sim
-
-distclean-sim: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sim/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in sim" ; \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif sim
-
-.PHONY: maybe-maintainer-clean-sim maintainer-clean-sim
-maybe-maintainer-clean-sim:
-@if sim
-maybe-maintainer-clean-sim: maintainer-clean-sim
-
-maintainer-clean-sim: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./sim/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in sim" ; \
-	(cd $(HOST_SUBDIR)/sim && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif sim
-
-
-
-.PHONY: configure-tar maybe-configure-tar
-maybe-configure-tar:
-@if tar
-maybe-configure-tar: configure-tar
-configure-tar: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tar ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/tar; \
-	cd "$(HOST_SUBDIR)/tar" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/tar/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/tar"; \
-	libsrcdir="$$s/tar"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif tar
-
-
-
-
-
-.PHONY: all-tar maybe-all-tar
-maybe-all-tar:
-@if tar
-TARGET-tar=all
-maybe-all-tar: all-tar
-all-tar: configure-tar
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tar))
-@endif tar
-
-
-
-
-.PHONY: check-tar maybe-check-tar
-maybe-check-tar:
-@if tar
-maybe-check-tar: check-tar
-
-check-tar:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif tar
-
-.PHONY: install-tar maybe-install-tar
-maybe-install-tar:
-@if tar
-maybe-install-tar: install-tar
-
-install-tar: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif tar
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-tar info-tar
-maybe-info-tar:
-@if tar
-maybe-info-tar: info-tar
-
-info-tar: \
-    configure-tar 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in tar" ; \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif tar
-
-.PHONY: maybe-dvi-tar dvi-tar
-maybe-dvi-tar:
-@if tar
-maybe-dvi-tar: dvi-tar
-
-dvi-tar: \
-    configure-tar 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in tar" ; \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif tar
-
-.PHONY: maybe-html-tar html-tar
-maybe-html-tar:
-@if tar
-maybe-html-tar: html-tar
-
-html-tar: \
-    configure-tar 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in tar" ; \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif tar
-
-.PHONY: maybe-TAGS-tar TAGS-tar
-maybe-TAGS-tar:
-@if tar
-maybe-TAGS-tar: TAGS-tar
-
-TAGS-tar: \
-    configure-tar 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in tar" ; \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif tar
-
-.PHONY: maybe-install-info-tar install-info-tar
-maybe-install-info-tar:
-@if tar
-maybe-install-info-tar: install-info-tar
-
-install-info-tar: \
-    configure-tar \
-    info-tar 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in tar" ; \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif tar
-
-.PHONY: maybe-installcheck-tar installcheck-tar
-maybe-installcheck-tar:
-@if tar
-maybe-installcheck-tar: installcheck-tar
-
-installcheck-tar: \
-    configure-tar 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in tar" ; \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif tar
-
-.PHONY: maybe-mostlyclean-tar mostlyclean-tar
-maybe-mostlyclean-tar:
-@if tar
-maybe-mostlyclean-tar: mostlyclean-tar
-
-mostlyclean-tar: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in tar" ; \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif tar
-
-.PHONY: maybe-clean-tar clean-tar
-maybe-clean-tar:
-@if tar
-maybe-clean-tar: clean-tar
-
-clean-tar: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in tar" ; \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif tar
-
-.PHONY: maybe-distclean-tar distclean-tar
-maybe-distclean-tar:
-@if tar
-maybe-distclean-tar: distclean-tar
-
-distclean-tar: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in tar" ; \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif tar
-
-.PHONY: maybe-maintainer-clean-tar maintainer-clean-tar
-maybe-maintainer-clean-tar:
-@if tar
-maybe-maintainer-clean-tar: maintainer-clean-tar
-
-maintainer-clean-tar: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tar/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in tar" ; \
-	(cd $(HOST_SUBDIR)/tar && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif tar
-
-
-
-.PHONY: configure-texinfo maybe-configure-texinfo
-maybe-configure-texinfo:
-@if texinfo
-maybe-configure-texinfo: configure-texinfo
-configure-texinfo: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/texinfo; \
-	cd "$(HOST_SUBDIR)/texinfo" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/texinfo"; \
-	libsrcdir="$$s/texinfo"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif texinfo
-
-
-
-
-
-.PHONY: all-texinfo maybe-all-texinfo
-maybe-all-texinfo:
-@if texinfo
-TARGET-texinfo=all
-maybe-all-texinfo: all-texinfo
-all-texinfo: configure-texinfo
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/texinfo && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-texinfo))
-@endif texinfo
-
-
-
-
-.PHONY: check-texinfo maybe-check-texinfo
-maybe-check-texinfo:
-@if texinfo
-maybe-check-texinfo: check-texinfo
-
-check-texinfo:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/texinfo && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif texinfo
-
-.PHONY: install-texinfo maybe-install-texinfo
-maybe-install-texinfo:
-@if texinfo
-maybe-install-texinfo: install-texinfo
-
-install-texinfo:
-
-@endif texinfo
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-texinfo info-texinfo
-maybe-info-texinfo:
-@if texinfo
-maybe-info-texinfo: info-texinfo
-
-info-texinfo: \
-    configure-texinfo 
-	@: $(MAKE); $(unstage)
-	@[ -f ./texinfo/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in texinfo" ; \
-	(cd $(HOST_SUBDIR)/texinfo && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif texinfo
-
-.PHONY: maybe-dvi-texinfo dvi-texinfo
-maybe-dvi-texinfo:
-@if texinfo
-maybe-dvi-texinfo: dvi-texinfo
-
-dvi-texinfo: \
-    configure-texinfo 
-	@: $(MAKE); $(unstage)
-	@[ -f ./texinfo/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in texinfo" ; \
-	(cd $(HOST_SUBDIR)/texinfo && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif texinfo
-
-.PHONY: maybe-html-texinfo html-texinfo
-maybe-html-texinfo:
-@if texinfo
-maybe-html-texinfo: html-texinfo
-
-html-texinfo: \
-    configure-texinfo 
-	@: $(MAKE); $(unstage)
-	@[ -f ./texinfo/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in texinfo" ; \
-	(cd $(HOST_SUBDIR)/texinfo && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif texinfo
-
-.PHONY: maybe-TAGS-texinfo TAGS-texinfo
-maybe-TAGS-texinfo:
-@if texinfo
-maybe-TAGS-texinfo: TAGS-texinfo
-
-TAGS-texinfo: \
-    configure-texinfo 
-	@: $(MAKE); $(unstage)
-	@[ -f ./texinfo/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in texinfo" ; \
-	(cd $(HOST_SUBDIR)/texinfo && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif texinfo
-
-.PHONY: maybe-install-info-texinfo install-info-texinfo
-maybe-install-info-texinfo:
-@if texinfo
-maybe-install-info-texinfo: install-info-texinfo
-
-install-info-texinfo: \
-    configure-texinfo \
-    info-texinfo 
-	@: $(MAKE); $(unstage)
-	@[ -f ./texinfo/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in texinfo" ; \
-	(cd $(HOST_SUBDIR)/texinfo && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif texinfo
-
-.PHONY: maybe-installcheck-texinfo installcheck-texinfo
-maybe-installcheck-texinfo:
-@if texinfo
-maybe-installcheck-texinfo: installcheck-texinfo
-
-installcheck-texinfo: \
-    configure-texinfo 
-	@: $(MAKE); $(unstage)
-	@[ -f ./texinfo/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in texinfo" ; \
-	(cd $(HOST_SUBDIR)/texinfo && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif texinfo
-
-.PHONY: maybe-mostlyclean-texinfo mostlyclean-texinfo
-maybe-mostlyclean-texinfo:
-@if texinfo
-maybe-mostlyclean-texinfo: mostlyclean-texinfo
-
-mostlyclean-texinfo: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./texinfo/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in texinfo" ; \
-	(cd $(HOST_SUBDIR)/texinfo && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif texinfo
-
-.PHONY: maybe-clean-texinfo clean-texinfo
-maybe-clean-texinfo:
-@if texinfo
-maybe-clean-texinfo: clean-texinfo
-
-clean-texinfo: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./texinfo/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in texinfo" ; \
-	(cd $(HOST_SUBDIR)/texinfo && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif texinfo
-
-.PHONY: maybe-distclean-texinfo distclean-texinfo
-maybe-distclean-texinfo:
-@if texinfo
-maybe-distclean-texinfo: distclean-texinfo
-
-distclean-texinfo: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./texinfo/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in texinfo" ; \
-	(cd $(HOST_SUBDIR)/texinfo && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif texinfo
-
-.PHONY: maybe-maintainer-clean-texinfo maintainer-clean-texinfo
-maybe-maintainer-clean-texinfo:
-@if texinfo
-maybe-maintainer-clean-texinfo: maintainer-clean-texinfo
-
-maintainer-clean-texinfo: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./texinfo/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in texinfo" ; \
-	(cd $(HOST_SUBDIR)/texinfo && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif texinfo
-
-
-
-.PHONY: configure-textutils maybe-configure-textutils
-maybe-configure-textutils:
-@if textutils
-maybe-configure-textutils: configure-textutils
-configure-textutils: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/textutils ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/textutils; \
-	cd "$(HOST_SUBDIR)/textutils" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/textutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/textutils"; \
-	libsrcdir="$$s/textutils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif textutils
-
-
-
-
-
-.PHONY: all-textutils maybe-all-textutils
-maybe-all-textutils:
-@if textutils
-TARGET-textutils=all
-maybe-all-textutils: all-textutils
-all-textutils: configure-textutils
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-textutils))
-@endif textutils
-
-
-
-
-.PHONY: check-textutils maybe-check-textutils
-maybe-check-textutils:
-@if textutils
-maybe-check-textutils: check-textutils
-
-check-textutils:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif textutils
-
-.PHONY: install-textutils maybe-install-textutils
-maybe-install-textutils:
-@if textutils
-maybe-install-textutils: install-textutils
-
-install-textutils: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif textutils
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-textutils info-textutils
-maybe-info-textutils:
-@if textutils
-maybe-info-textutils: info-textutils
-
-info-textutils: \
-    configure-textutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./textutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in textutils" ; \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif textutils
-
-.PHONY: maybe-dvi-textutils dvi-textutils
-maybe-dvi-textutils:
-@if textutils
-maybe-dvi-textutils: dvi-textutils
-
-dvi-textutils: \
-    configure-textutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./textutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in textutils" ; \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif textutils
-
-.PHONY: maybe-html-textutils html-textutils
-maybe-html-textutils:
-@if textutils
-maybe-html-textutils: html-textutils
-
-html-textutils: \
-    configure-textutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./textutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in textutils" ; \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif textutils
-
-.PHONY: maybe-TAGS-textutils TAGS-textutils
-maybe-TAGS-textutils:
-@if textutils
-maybe-TAGS-textutils: TAGS-textutils
-
-TAGS-textutils: \
-    configure-textutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./textutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in textutils" ; \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif textutils
-
-.PHONY: maybe-install-info-textutils install-info-textutils
-maybe-install-info-textutils:
-@if textutils
-maybe-install-info-textutils: install-info-textutils
-
-install-info-textutils: \
-    configure-textutils \
-    info-textutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./textutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in textutils" ; \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif textutils
-
-.PHONY: maybe-installcheck-textutils installcheck-textutils
-maybe-installcheck-textutils:
-@if textutils
-maybe-installcheck-textutils: installcheck-textutils
-
-installcheck-textutils: \
-    configure-textutils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./textutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in textutils" ; \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif textutils
-
-.PHONY: maybe-mostlyclean-textutils mostlyclean-textutils
-maybe-mostlyclean-textutils:
-@if textutils
-maybe-mostlyclean-textutils: mostlyclean-textutils
-
-mostlyclean-textutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./textutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in textutils" ; \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif textutils
-
-.PHONY: maybe-clean-textutils clean-textutils
-maybe-clean-textutils:
-@if textutils
-maybe-clean-textutils: clean-textutils
-
-clean-textutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./textutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in textutils" ; \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif textutils
-
-.PHONY: maybe-distclean-textutils distclean-textutils
-maybe-distclean-textutils:
-@if textutils
-maybe-distclean-textutils: distclean-textutils
-
-distclean-textutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./textutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in textutils" ; \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif textutils
-
-.PHONY: maybe-maintainer-clean-textutils maintainer-clean-textutils
-maybe-maintainer-clean-textutils:
-@if textutils
-maybe-maintainer-clean-textutils: maintainer-clean-textutils
-
-maintainer-clean-textutils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./textutils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in textutils" ; \
-	(cd $(HOST_SUBDIR)/textutils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif textutils
-
-
-
-.PHONY: configure-time maybe-configure-time
-maybe-configure-time:
-@if time
-maybe-configure-time: configure-time
-configure-time: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/time ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/time; \
-	cd "$(HOST_SUBDIR)/time" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/time/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/time"; \
-	libsrcdir="$$s/time"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif time
-
-
-
-
-
-.PHONY: all-time maybe-all-time
-maybe-all-time:
-@if time
-TARGET-time=all
-maybe-all-time: all-time
-all-time: configure-time
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-time))
-@endif time
-
-
-
-
-.PHONY: check-time maybe-check-time
-maybe-check-time:
-@if time
-maybe-check-time: check-time
-
-check-time:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif time
-
-.PHONY: install-time maybe-install-time
-maybe-install-time:
-@if time
-maybe-install-time: install-time
-
-install-time: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif time
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-time info-time
-maybe-info-time:
-@if time
-maybe-info-time: info-time
-
-info-time: \
-    configure-time 
-	@: $(MAKE); $(unstage)
-	@[ -f ./time/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in time" ; \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif time
-
-.PHONY: maybe-dvi-time dvi-time
-maybe-dvi-time:
-@if time
-maybe-dvi-time: dvi-time
-
-dvi-time: \
-    configure-time 
-	@: $(MAKE); $(unstage)
-	@[ -f ./time/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in time" ; \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif time
-
-.PHONY: maybe-html-time html-time
-maybe-html-time:
-@if time
-maybe-html-time: html-time
-
-html-time: \
-    configure-time 
-	@: $(MAKE); $(unstage)
-	@[ -f ./time/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in time" ; \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif time
-
-.PHONY: maybe-TAGS-time TAGS-time
-maybe-TAGS-time:
-@if time
-maybe-TAGS-time: TAGS-time
-
-TAGS-time: \
-    configure-time 
-	@: $(MAKE); $(unstage)
-	@[ -f ./time/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in time" ; \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif time
-
-.PHONY: maybe-install-info-time install-info-time
-maybe-install-info-time:
-@if time
-maybe-install-info-time: install-info-time
-
-install-info-time: \
-    configure-time \
-    info-time 
-	@: $(MAKE); $(unstage)
-	@[ -f ./time/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in time" ; \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif time
-
-.PHONY: maybe-installcheck-time installcheck-time
-maybe-installcheck-time:
-@if time
-maybe-installcheck-time: installcheck-time
-
-installcheck-time: \
-    configure-time 
-	@: $(MAKE); $(unstage)
-	@[ -f ./time/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in time" ; \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif time
-
-.PHONY: maybe-mostlyclean-time mostlyclean-time
-maybe-mostlyclean-time:
-@if time
-maybe-mostlyclean-time: mostlyclean-time
-
-mostlyclean-time: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./time/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in time" ; \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif time
-
-.PHONY: maybe-clean-time clean-time
-maybe-clean-time:
-@if time
-maybe-clean-time: clean-time
-
-clean-time: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./time/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in time" ; \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif time
-
-.PHONY: maybe-distclean-time distclean-time
-maybe-distclean-time:
-@if time
-maybe-distclean-time: distclean-time
-
-distclean-time: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./time/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in time" ; \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif time
-
-.PHONY: maybe-maintainer-clean-time maintainer-clean-time
-maybe-maintainer-clean-time:
-@if time
-maybe-maintainer-clean-time: maintainer-clean-time
-
-maintainer-clean-time: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./time/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in time" ; \
-	(cd $(HOST_SUBDIR)/time && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif time
-
-
-
-.PHONY: configure-uudecode maybe-configure-uudecode
-maybe-configure-uudecode:
-@if uudecode
-maybe-configure-uudecode: configure-uudecode
-configure-uudecode: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/uudecode ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/uudecode; \
-	cd "$(HOST_SUBDIR)/uudecode" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/uudecode/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/uudecode"; \
-	libsrcdir="$$s/uudecode"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif uudecode
-
-
-
-
-
-.PHONY: all-uudecode maybe-all-uudecode
-maybe-all-uudecode:
-@if uudecode
-TARGET-uudecode=all
-maybe-all-uudecode: all-uudecode
-all-uudecode: configure-uudecode
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-uudecode))
-@endif uudecode
-
-
-
-
-.PHONY: check-uudecode maybe-check-uudecode
-maybe-check-uudecode:
-@if uudecode
-maybe-check-uudecode: check-uudecode
-
-check-uudecode:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif uudecode
-
-.PHONY: install-uudecode maybe-install-uudecode
-maybe-install-uudecode:
-@if uudecode
-maybe-install-uudecode: install-uudecode
-
-install-uudecode: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif uudecode
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-uudecode info-uudecode
-maybe-info-uudecode:
-@if uudecode
-maybe-info-uudecode: info-uudecode
-
-info-uudecode: \
-    configure-uudecode 
-	@: $(MAKE); $(unstage)
-	@[ -f ./uudecode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in uudecode" ; \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif uudecode
-
-.PHONY: maybe-dvi-uudecode dvi-uudecode
-maybe-dvi-uudecode:
-@if uudecode
-maybe-dvi-uudecode: dvi-uudecode
-
-dvi-uudecode: \
-    configure-uudecode 
-	@: $(MAKE); $(unstage)
-	@[ -f ./uudecode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in uudecode" ; \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif uudecode
-
-.PHONY: maybe-html-uudecode html-uudecode
-maybe-html-uudecode:
-@if uudecode
-maybe-html-uudecode: html-uudecode
-
-html-uudecode: \
-    configure-uudecode 
-	@: $(MAKE); $(unstage)
-	@[ -f ./uudecode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in uudecode" ; \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif uudecode
-
-.PHONY: maybe-TAGS-uudecode TAGS-uudecode
-maybe-TAGS-uudecode:
-@if uudecode
-maybe-TAGS-uudecode: TAGS-uudecode
-
-TAGS-uudecode: \
-    configure-uudecode 
-	@: $(MAKE); $(unstage)
-	@[ -f ./uudecode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in uudecode" ; \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif uudecode
-
-.PHONY: maybe-install-info-uudecode install-info-uudecode
-maybe-install-info-uudecode:
-@if uudecode
-maybe-install-info-uudecode: install-info-uudecode
-
-install-info-uudecode: \
-    configure-uudecode \
-    info-uudecode 
-	@: $(MAKE); $(unstage)
-	@[ -f ./uudecode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in uudecode" ; \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif uudecode
-
-.PHONY: maybe-installcheck-uudecode installcheck-uudecode
-maybe-installcheck-uudecode:
-@if uudecode
-maybe-installcheck-uudecode: installcheck-uudecode
-
-installcheck-uudecode: \
-    configure-uudecode 
-	@: $(MAKE); $(unstage)
-	@[ -f ./uudecode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in uudecode" ; \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif uudecode
-
-.PHONY: maybe-mostlyclean-uudecode mostlyclean-uudecode
-maybe-mostlyclean-uudecode:
-@if uudecode
-maybe-mostlyclean-uudecode: mostlyclean-uudecode
-
-mostlyclean-uudecode: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./uudecode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in uudecode" ; \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif uudecode
-
-.PHONY: maybe-clean-uudecode clean-uudecode
-maybe-clean-uudecode:
-@if uudecode
-maybe-clean-uudecode: clean-uudecode
-
-clean-uudecode: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./uudecode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in uudecode" ; \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif uudecode
-
-.PHONY: maybe-distclean-uudecode distclean-uudecode
-maybe-distclean-uudecode:
-@if uudecode
-maybe-distclean-uudecode: distclean-uudecode
-
-distclean-uudecode: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./uudecode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in uudecode" ; \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif uudecode
-
-.PHONY: maybe-maintainer-clean-uudecode maintainer-clean-uudecode
-maybe-maintainer-clean-uudecode:
-@if uudecode
-maybe-maintainer-clean-uudecode: maintainer-clean-uudecode
-
-maintainer-clean-uudecode: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./uudecode/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in uudecode" ; \
-	(cd $(HOST_SUBDIR)/uudecode && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif uudecode
-
-
-
-.PHONY: configure-wdiff maybe-configure-wdiff
-maybe-configure-wdiff:
-@if wdiff
-maybe-configure-wdiff: configure-wdiff
-configure-wdiff: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/wdiff ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/wdiff; \
-	cd "$(HOST_SUBDIR)/wdiff" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/wdiff/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/wdiff"; \
-	libsrcdir="$$s/wdiff"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif wdiff
-
-
-
-
-
-.PHONY: all-wdiff maybe-all-wdiff
-maybe-all-wdiff:
-@if wdiff
-TARGET-wdiff=all
-maybe-all-wdiff: all-wdiff
-all-wdiff: configure-wdiff
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-wdiff))
-@endif wdiff
-
-
-
-
-.PHONY: check-wdiff maybe-check-wdiff
-maybe-check-wdiff:
-@if wdiff
-maybe-check-wdiff: check-wdiff
-
-check-wdiff:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif wdiff
-
-.PHONY: install-wdiff maybe-install-wdiff
-maybe-install-wdiff:
-@if wdiff
-maybe-install-wdiff: install-wdiff
-
-install-wdiff: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif wdiff
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-wdiff info-wdiff
-maybe-info-wdiff:
-@if wdiff
-maybe-info-wdiff: info-wdiff
-
-info-wdiff: \
-    configure-wdiff 
-	@: $(MAKE); $(unstage)
-	@[ -f ./wdiff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in wdiff" ; \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif wdiff
-
-.PHONY: maybe-dvi-wdiff dvi-wdiff
-maybe-dvi-wdiff:
-@if wdiff
-maybe-dvi-wdiff: dvi-wdiff
-
-dvi-wdiff: \
-    configure-wdiff 
-	@: $(MAKE); $(unstage)
-	@[ -f ./wdiff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in wdiff" ; \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif wdiff
-
-.PHONY: maybe-html-wdiff html-wdiff
-maybe-html-wdiff:
-@if wdiff
-maybe-html-wdiff: html-wdiff
-
-html-wdiff: \
-    configure-wdiff 
-	@: $(MAKE); $(unstage)
-	@[ -f ./wdiff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in wdiff" ; \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif wdiff
-
-.PHONY: maybe-TAGS-wdiff TAGS-wdiff
-maybe-TAGS-wdiff:
-@if wdiff
-maybe-TAGS-wdiff: TAGS-wdiff
-
-TAGS-wdiff: \
-    configure-wdiff 
-	@: $(MAKE); $(unstage)
-	@[ -f ./wdiff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in wdiff" ; \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif wdiff
-
-.PHONY: maybe-install-info-wdiff install-info-wdiff
-maybe-install-info-wdiff:
-@if wdiff
-maybe-install-info-wdiff: install-info-wdiff
-
-install-info-wdiff: \
-    configure-wdiff \
-    info-wdiff 
-	@: $(MAKE); $(unstage)
-	@[ -f ./wdiff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in wdiff" ; \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif wdiff
-
-.PHONY: maybe-installcheck-wdiff installcheck-wdiff
-maybe-installcheck-wdiff:
-@if wdiff
-maybe-installcheck-wdiff: installcheck-wdiff
-
-installcheck-wdiff: \
-    configure-wdiff 
-	@: $(MAKE); $(unstage)
-	@[ -f ./wdiff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in wdiff" ; \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif wdiff
-
-.PHONY: maybe-mostlyclean-wdiff mostlyclean-wdiff
-maybe-mostlyclean-wdiff:
-@if wdiff
-maybe-mostlyclean-wdiff: mostlyclean-wdiff
-
-mostlyclean-wdiff: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./wdiff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in wdiff" ; \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif wdiff
-
-.PHONY: maybe-clean-wdiff clean-wdiff
-maybe-clean-wdiff:
-@if wdiff
-maybe-clean-wdiff: clean-wdiff
-
-clean-wdiff: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./wdiff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in wdiff" ; \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif wdiff
-
-.PHONY: maybe-distclean-wdiff distclean-wdiff
-maybe-distclean-wdiff:
-@if wdiff
-maybe-distclean-wdiff: distclean-wdiff
-
-distclean-wdiff: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./wdiff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in wdiff" ; \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif wdiff
-
-.PHONY: maybe-maintainer-clean-wdiff maintainer-clean-wdiff
-maybe-maintainer-clean-wdiff:
-@if wdiff
-maybe-maintainer-clean-wdiff: maintainer-clean-wdiff
-
-maintainer-clean-wdiff: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./wdiff/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in wdiff" ; \
-	(cd $(HOST_SUBDIR)/wdiff && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif wdiff
-
-
-
-.PHONY: configure-zip maybe-configure-zip
-maybe-configure-zip:
-@if zip
-maybe-configure-zip: configure-zip
-configure-zip: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zip ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/zip; \
-	cd "$(HOST_SUBDIR)/zip" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zip/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zip"; \
-	libsrcdir="$$s/zip"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif zip
-
-
-
-
-
-.PHONY: all-zip maybe-all-zip
-maybe-all-zip:
-@if zip
-TARGET-zip=all
-maybe-all-zip: all-zip
-all-zip: configure-zip
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/zip && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zip))
-@endif zip
-
-
-
-
-.PHONY: check-zip maybe-check-zip
-maybe-check-zip:
-@if zip
-maybe-check-zip: check-zip
-
-# This module is only tested in a native toolchain.
-check-zip:
-	@: $(MAKE); $(unstage)
-	@if [ '$(host)' = '$(target)' ] ; then \
-	  r=`${PWD_COMMAND}`; export r; \
-	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	  $(HOST_EXPORTS) \
-	  (cd $(HOST_SUBDIR)/zip && \
-	    $(MAKE) $(FLAGS_TO_PASS)  check); \
-	fi
-
-@endif zip
-
-.PHONY: install-zip maybe-install-zip
-maybe-install-zip:
-@if zip
-maybe-install-zip: install-zip
-
-install-zip: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/zip && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif zip
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-zip info-zip
-maybe-info-zip:
-@if zip
-maybe-info-zip: info-zip
-
-info-zip: \
-    configure-zip 
-	@: $(MAKE); $(unstage)
-	@[ -f ./zip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in zip" ; \
-	(cd $(HOST_SUBDIR)/zip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif zip
-
-.PHONY: maybe-dvi-zip dvi-zip
-maybe-dvi-zip:
-@if zip
-maybe-dvi-zip: dvi-zip
-
-dvi-zip: \
-    configure-zip 
-	@: $(MAKE); $(unstage)
-	@[ -f ./zip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in zip" ; \
-	(cd $(HOST_SUBDIR)/zip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif zip
-
-.PHONY: maybe-html-zip html-zip
-maybe-html-zip:
-@if zip
-maybe-html-zip: html-zip
-
-html-zip: \
-    configure-zip 
-	@: $(MAKE); $(unstage)
-	@[ -f ./zip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in zip" ; \
-	(cd $(HOST_SUBDIR)/zip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif zip
-
-.PHONY: maybe-TAGS-zip TAGS-zip
-maybe-TAGS-zip:
-@if zip
-maybe-TAGS-zip: TAGS-zip
-
-TAGS-zip: \
-    configure-zip 
-	@: $(MAKE); $(unstage)
-	@[ -f ./zip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in zip" ; \
-	(cd $(HOST_SUBDIR)/zip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif zip
-
-.PHONY: maybe-install-info-zip install-info-zip
-maybe-install-info-zip:
-@if zip
-maybe-install-info-zip: install-info-zip
-
-install-info-zip: \
-    configure-zip \
-    info-zip 
-	@: $(MAKE); $(unstage)
-	@[ -f ./zip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in zip" ; \
-	(cd $(HOST_SUBDIR)/zip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif zip
-
-.PHONY: maybe-installcheck-zip installcheck-zip
-maybe-installcheck-zip:
-@if zip
-maybe-installcheck-zip: installcheck-zip
-
-installcheck-zip: \
-    configure-zip 
-	@: $(MAKE); $(unstage)
-	@[ -f ./zip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in zip" ; \
-	(cd $(HOST_SUBDIR)/zip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif zip
-
-.PHONY: maybe-mostlyclean-zip mostlyclean-zip
-maybe-mostlyclean-zip:
-@if zip
-maybe-mostlyclean-zip: mostlyclean-zip
-
-mostlyclean-zip: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./zip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in zip" ; \
-	(cd $(HOST_SUBDIR)/zip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif zip
-
-.PHONY: maybe-clean-zip clean-zip
-maybe-clean-zip:
-@if zip
-maybe-clean-zip: clean-zip
-
-clean-zip: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./zip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in zip" ; \
-	(cd $(HOST_SUBDIR)/zip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif zip
-
-.PHONY: maybe-distclean-zip distclean-zip
-maybe-distclean-zip:
-@if zip
-maybe-distclean-zip: distclean-zip
-
-distclean-zip: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./zip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in zip" ; \
-	(cd $(HOST_SUBDIR)/zip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif zip
-
-.PHONY: maybe-maintainer-clean-zip maintainer-clean-zip
-maybe-maintainer-clean-zip:
-@if zip
-maybe-maintainer-clean-zip: maintainer-clean-zip
-
-maintainer-clean-zip: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./zip/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in zip" ; \
-	(cd $(HOST_SUBDIR)/zip && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif zip
-
-
-
-.PHONY: configure-zlib maybe-configure-zlib
-maybe-configure-zlib:
-@if zlib
-maybe-configure-zlib: configure-zlib
-configure-zlib: 
-@endif zlib
-@if zlib-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif zlib-bootstrap
-@if zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/zlib; \
-	cd "$(HOST_SUBDIR)/zlib" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif zlib
-
-
-
-.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
-maybe-configure-stage1-zlib:
-@if zlib-bootstrap
-maybe-configure-stage1-zlib: configure-stage1-zlib
-configure-stage1-zlib:
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
-@endif zlib-bootstrap
-
-.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
-maybe-configure-stage2-zlib:
-@if zlib-bootstrap
-maybe-configure-stage2-zlib: configure-stage2-zlib
-configure-stage2-zlib:
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
-maybe-configure-stage3-zlib:
-@if zlib-bootstrap
-maybe-configure-stage3-zlib: configure-stage3-zlib
-configure-stage3-zlib:
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
-maybe-configure-stage4-zlib:
-@if zlib-bootstrap
-maybe-configure-stage4-zlib: configure-stage4-zlib
-configure-stage4-zlib:
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
-maybe-configure-stageprofile-zlib:
-@if zlib-bootstrap
-maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
-configure-stageprofile-zlib:
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
-maybe-configure-stagefeedback-zlib:
-@if zlib-bootstrap
-maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
-configure-stagefeedback-zlib:
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-@endif zlib-bootstrap
-
-
-
-
-
-.PHONY: all-zlib maybe-all-zlib
-maybe-all-zlib:
-@if zlib
-TARGET-zlib=all
-maybe-all-zlib: all-zlib
-all-zlib: configure-zlib
-@endif zlib
-@if zlib-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif zlib-bootstrap
-@if zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/zlib && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zlib))
-@endif zlib
-
-
-
-.PHONY: all-stage1-zlib maybe-all-stage1-zlib
-.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib
-maybe-all-stage1-zlib:
-maybe-clean-stage1-zlib:
-@if zlib-bootstrap
-maybe-all-stage1-zlib: all-stage1-zlib
-all-stage1: all-stage1-zlib
-TARGET-stage1-zlib = $(TARGET-zlib)
-all-stage1-zlib: configure-stage1-zlib
-	@[ $(current_stage) = stage1 ] || $(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  \
-		$(TARGET-stage1-zlib)
-
-maybe-clean-stage1-zlib: clean-stage1-zlib
-clean-stage1: clean-stage1-zlib
-clean-stage1-zlib:
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage1 ] || $(MAKE) stage1-start; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stage2-zlib maybe-all-stage2-zlib
-.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib
-maybe-all-stage2-zlib:
-maybe-clean-stage2-zlib:
-@if zlib-bootstrap
-maybe-all-stage2-zlib: all-stage2-zlib
-all-stage2: all-stage2-zlib
-TARGET-stage2-zlib = $(TARGET-zlib)
-all-stage2-zlib: configure-stage2-zlib
-	@[ $(current_stage) = stage2 ] || $(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage2-zlib)
-
-maybe-clean-stage2-zlib: clean-stage2-zlib
-clean-stage2: clean-stage2-zlib
-clean-stage2-zlib:
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage2 ] || $(MAKE) stage2-start; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stage3-zlib maybe-all-stage3-zlib
-.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
-maybe-all-stage3-zlib:
-maybe-clean-stage3-zlib:
-@if zlib-bootstrap
-maybe-all-stage3-zlib: all-stage3-zlib
-all-stage3: all-stage3-zlib
-TARGET-stage3-zlib = $(TARGET-zlib)
-all-stage3-zlib: configure-stage3-zlib
-	@[ $(current_stage) = stage3 ] || $(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage3-zlib)
-
-maybe-clean-stage3-zlib: clean-stage3-zlib
-clean-stage3: clean-stage3-zlib
-clean-stage3-zlib:
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage3 ] || $(MAKE) stage3-start; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stage4-zlib maybe-all-stage4-zlib
-.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
-maybe-all-stage4-zlib:
-maybe-clean-stage4-zlib:
-@if zlib-bootstrap
-maybe-all-stage4-zlib: all-stage4-zlib
-all-stage4: all-stage4-zlib
-TARGET-stage4-zlib = $(TARGET-zlib)
-all-stage4-zlib: configure-stage4-zlib
-	@[ $(current_stage) = stage4 ] || $(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS)   \
-		$(TARGET-stage4-zlib)
-
-maybe-clean-stage4-zlib: clean-stage4-zlib
-clean-stage4: clean-stage4-zlib
-clean-stage4-zlib:
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage4 ] || $(MAKE) stage4-start; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		  clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
-.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib
-maybe-all-stageprofile-zlib:
-maybe-clean-stageprofile-zlib:
-@if zlib-bootstrap
-maybe-all-stageprofile-zlib: all-stageprofile-zlib
-all-stageprofile: all-stageprofile-zlib
-TARGET-stageprofile-zlib = $(TARGET-zlib)
-all-stageprofile-zlib: configure-stageprofile-zlib
-	@[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  \
-		$(TARGET-stageprofile-zlib)
-
-maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
-clean-stageprofile: clean-stageprofile-zlib
-clean-stageprofile-zlib:
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
-.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
-maybe-all-stagefeedback-zlib:
-maybe-clean-stagefeedback-zlib:
-@if zlib-bootstrap
-maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
-all-stagefeedback: all-stagefeedback-zlib
-TARGET-stagefeedback-zlib = $(TARGET-zlib)
-all-stagefeedback-zlib: configure-stagefeedback-zlib
-	@[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  \
-		$(TARGET-stagefeedback-zlib)
-
-maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
-clean-stagefeedback: clean-stagefeedback-zlib
-clean-stagefeedback-zlib:
-	@[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(FLAGS_TO_PASS)  \
-		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
-@endif zlib-bootstrap
-
-
-
-
-
-.PHONY: check-zlib maybe-check-zlib
-maybe-check-zlib:
-@if zlib
-maybe-check-zlib: check-zlib
-
-check-zlib:
-
-@endif zlib
-
-.PHONY: install-zlib maybe-install-zlib
-maybe-install-zlib:
-@if zlib
-maybe-install-zlib: install-zlib
-
-install-zlib:
-
-@endif zlib
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-zlib info-zlib
-maybe-info-zlib:
-@if zlib
-maybe-info-zlib: info-zlib
-
-info-zlib: \
-    configure-zlib 
-	@[ -f ./zlib/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in zlib" ; \
-	(cd $(HOST_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif zlib
-
-.PHONY: maybe-dvi-zlib dvi-zlib
-maybe-dvi-zlib:
-@if zlib
-maybe-dvi-zlib: dvi-zlib
-
-dvi-zlib: \
-    configure-zlib 
-	@[ -f ./zlib/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in zlib" ; \
-	(cd $(HOST_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif zlib
-
-.PHONY: maybe-html-zlib html-zlib
-maybe-html-zlib:
-@if zlib
-maybe-html-zlib: html-zlib
-
-html-zlib: \
-    configure-zlib 
-	@[ -f ./zlib/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in zlib" ; \
-	(cd $(HOST_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif zlib
-
-.PHONY: maybe-TAGS-zlib TAGS-zlib
-maybe-TAGS-zlib:
-@if zlib
-maybe-TAGS-zlib: TAGS-zlib
-
-TAGS-zlib: \
-    configure-zlib 
-	@[ -f ./zlib/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in zlib" ; \
-	(cd $(HOST_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif zlib
-
-.PHONY: maybe-install-info-zlib install-info-zlib
-maybe-install-info-zlib:
-@if zlib
-maybe-install-info-zlib: install-info-zlib
-
-install-info-zlib: \
-    configure-zlib \
-    info-zlib 
-	@[ -f ./zlib/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in zlib" ; \
-	(cd $(HOST_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif zlib
-
-.PHONY: maybe-installcheck-zlib installcheck-zlib
-maybe-installcheck-zlib:
-@if zlib
-maybe-installcheck-zlib: installcheck-zlib
-
-installcheck-zlib: \
-    configure-zlib 
-	@[ -f ./zlib/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in zlib" ; \
-	(cd $(HOST_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif zlib
-
-.PHONY: maybe-mostlyclean-zlib mostlyclean-zlib
-maybe-mostlyclean-zlib:
-@if zlib
-maybe-mostlyclean-zlib: mostlyclean-zlib
-
-mostlyclean-zlib: 
-	@[ -f ./zlib/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in zlib" ; \
-	(cd $(HOST_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif zlib
-
-.PHONY: maybe-clean-zlib clean-zlib
-maybe-clean-zlib:
-@if zlib
-maybe-clean-zlib: clean-zlib
-
-clean-zlib: 
-	@[ -f ./zlib/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in zlib" ; \
-	(cd $(HOST_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif zlib
-
-.PHONY: maybe-distclean-zlib distclean-zlib
-maybe-distclean-zlib:
-@if zlib
-maybe-distclean-zlib: distclean-zlib
-
-distclean-zlib: 
-	@[ -f ./zlib/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in zlib" ; \
-	(cd $(HOST_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif zlib
-
-.PHONY: maybe-maintainer-clean-zlib maintainer-clean-zlib
-maybe-maintainer-clean-zlib:
-@if zlib
-maybe-maintainer-clean-zlib: maintainer-clean-zlib
-
-maintainer-clean-zlib: 
-	@[ -f ./zlib/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in zlib" ; \
-	(cd $(HOST_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif zlib
-
-
-
-.PHONY: configure-gdb maybe-configure-gdb
-maybe-configure-gdb:
-@if gdb
-maybe-configure-gdb: configure-gdb
-configure-gdb: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gdb; \
-	cd "$(HOST_SUBDIR)/gdb" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gdb"; \
-	libsrcdir="$$s/gdb"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif gdb
-
-
-
-
-
-.PHONY: all-gdb maybe-all-gdb
-maybe-all-gdb:
-@if gdb
-TARGET-gdb=all
-maybe-all-gdb: all-gdb
-all-gdb: configure-gdb
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-gdb))
-@endif gdb
-
-
-
-
-.PHONY: check-gdb maybe-check-gdb
-maybe-check-gdb:
-@if gdb
-maybe-check-gdb: check-gdb
-
-check-gdb:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
-
-@endif gdb
-
-.PHONY: install-gdb maybe-install-gdb
-maybe-install-gdb:
-@if gdb
-maybe-install-gdb: install-gdb
-
-install-gdb: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
-
-@endif gdb
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-gdb info-gdb
-maybe-info-gdb:
-@if gdb
-maybe-info-gdb: info-gdb
-
-info-gdb: \
-    configure-gdb 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gdb/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in gdb" ; \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif gdb
-
-.PHONY: maybe-dvi-gdb dvi-gdb
-maybe-dvi-gdb:
-@if gdb
-maybe-dvi-gdb: dvi-gdb
-
-dvi-gdb: \
-    configure-gdb 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gdb/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in gdb" ; \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif gdb
-
-.PHONY: maybe-html-gdb html-gdb
-maybe-html-gdb:
-@if gdb
-maybe-html-gdb: html-gdb
-
-html-gdb: \
-    configure-gdb 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gdb/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in gdb" ; \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif gdb
-
-.PHONY: maybe-TAGS-gdb TAGS-gdb
-maybe-TAGS-gdb:
-@if gdb
-maybe-TAGS-gdb: TAGS-gdb
-
-TAGS-gdb: \
-    configure-gdb 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gdb/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in gdb" ; \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif gdb
-
-.PHONY: maybe-install-info-gdb install-info-gdb
-maybe-install-info-gdb:
-@if gdb
-maybe-install-info-gdb: install-info-gdb
-
-install-info-gdb: \
-    configure-gdb \
-    info-gdb 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gdb/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in gdb" ; \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif gdb
-
-.PHONY: maybe-installcheck-gdb installcheck-gdb
-maybe-installcheck-gdb:
-@if gdb
-maybe-installcheck-gdb: installcheck-gdb
-
-installcheck-gdb: \
-    configure-gdb 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gdb/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in gdb" ; \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif gdb
-
-.PHONY: maybe-mostlyclean-gdb mostlyclean-gdb
-maybe-mostlyclean-gdb:
-@if gdb
-maybe-mostlyclean-gdb: mostlyclean-gdb
-
-mostlyclean-gdb: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gdb/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in gdb" ; \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif gdb
-
-.PHONY: maybe-clean-gdb clean-gdb
-maybe-clean-gdb:
-@if gdb
-maybe-clean-gdb: clean-gdb
-
-clean-gdb: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gdb/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in gdb" ; \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif gdb
-
-.PHONY: maybe-distclean-gdb distclean-gdb
-maybe-distclean-gdb:
-@if gdb
-maybe-distclean-gdb: distclean-gdb
-
-distclean-gdb: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gdb/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in gdb" ; \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif gdb
-
-.PHONY: maybe-maintainer-clean-gdb maintainer-clean-gdb
-maybe-maintainer-clean-gdb:
-@if gdb
-maybe-maintainer-clean-gdb: maintainer-clean-gdb
-
-maintainer-clean-gdb: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gdb/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in gdb" ; \
-	(cd $(HOST_SUBDIR)/gdb && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif gdb
-
-
-
-.PHONY: configure-expect maybe-configure-expect
-maybe-configure-expect:
-@if expect
-maybe-configure-expect: configure-expect
-configure-expect: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/expect; \
-	cd "$(HOST_SUBDIR)/expect" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/expect/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/expect"; \
-	libsrcdir="$$s/expect"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif expect
-
-
-
-
-
-.PHONY: all-expect maybe-all-expect
-maybe-all-expect:
-@if expect
-TARGET-expect=all
-maybe-all-expect: all-expect
-all-expect: configure-expect
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-expect))
-@endif expect
-
-
-
-
-.PHONY: check-expect maybe-check-expect
-maybe-check-expect:
-@if expect
-maybe-check-expect: check-expect
-
-check-expect:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
-
-@endif expect
-
-.PHONY: install-expect maybe-install-expect
-maybe-install-expect:
-@if expect
-maybe-install-expect: install-expect
-
-install-expect: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
-
-@endif expect
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-expect info-expect
-maybe-info-expect:
-@if expect
-maybe-info-expect: info-expect
-
-info-expect: \
-    configure-expect 
-	@: $(MAKE); $(unstage)
-	@[ -f ./expect/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in expect" ; \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif expect
-
-.PHONY: maybe-dvi-expect dvi-expect
-maybe-dvi-expect:
-@if expect
-maybe-dvi-expect: dvi-expect
-
-dvi-expect: \
-    configure-expect 
-	@: $(MAKE); $(unstage)
-	@[ -f ./expect/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in expect" ; \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif expect
-
-.PHONY: maybe-html-expect html-expect
-maybe-html-expect:
-@if expect
-maybe-html-expect: html-expect
-
-html-expect: \
-    configure-expect 
-	@: $(MAKE); $(unstage)
-	@[ -f ./expect/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in expect" ; \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif expect
-
-.PHONY: maybe-TAGS-expect TAGS-expect
-maybe-TAGS-expect:
-@if expect
-maybe-TAGS-expect: TAGS-expect
-
-TAGS-expect: \
-    configure-expect 
-	@: $(MAKE); $(unstage)
-	@[ -f ./expect/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in expect" ; \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif expect
-
-.PHONY: maybe-install-info-expect install-info-expect
-maybe-install-info-expect:
-@if expect
-maybe-install-info-expect: install-info-expect
-
-install-info-expect: \
-    configure-expect \
-    info-expect 
-	@: $(MAKE); $(unstage)
-	@[ -f ./expect/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in expect" ; \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif expect
-
-.PHONY: maybe-installcheck-expect installcheck-expect
-maybe-installcheck-expect:
-@if expect
-maybe-installcheck-expect: installcheck-expect
-
-installcheck-expect: \
-    configure-expect 
-	@: $(MAKE); $(unstage)
-	@[ -f ./expect/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in expect" ; \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif expect
-
-.PHONY: maybe-mostlyclean-expect mostlyclean-expect
-maybe-mostlyclean-expect:
-@if expect
-maybe-mostlyclean-expect: mostlyclean-expect
-
-mostlyclean-expect: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./expect/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in expect" ; \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif expect
-
-.PHONY: maybe-clean-expect clean-expect
-maybe-clean-expect:
-@if expect
-maybe-clean-expect: clean-expect
-
-clean-expect: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./expect/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in expect" ; \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif expect
-
-.PHONY: maybe-distclean-expect distclean-expect
-maybe-distclean-expect:
-@if expect
-maybe-distclean-expect: distclean-expect
-
-distclean-expect: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./expect/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in expect" ; \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif expect
-
-.PHONY: maybe-maintainer-clean-expect maintainer-clean-expect
-maybe-maintainer-clean-expect:
-@if expect
-maybe-maintainer-clean-expect: maintainer-clean-expect
-
-maintainer-clean-expect: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./expect/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in expect" ; \
-	(cd $(HOST_SUBDIR)/expect && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif expect
-
-
-
-.PHONY: configure-guile maybe-configure-guile
-maybe-configure-guile:
-@if guile
-maybe-configure-guile: configure-guile
-configure-guile: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/guile; \
-	cd "$(HOST_SUBDIR)/guile" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/guile/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/guile"; \
-	libsrcdir="$$s/guile"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif guile
-
-
-
-
-
-.PHONY: all-guile maybe-all-guile
-maybe-all-guile:
-@if guile
-TARGET-guile=all
-maybe-all-guile: all-guile
-all-guile: configure-guile
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-guile))
-@endif guile
-
-
-
-
-.PHONY: check-guile maybe-check-guile
-maybe-check-guile:
-@if guile
-maybe-check-guile: check-guile
-
-check-guile:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
-
-@endif guile
-
-.PHONY: install-guile maybe-install-guile
-maybe-install-guile:
-@if guile
-maybe-install-guile: install-guile
-
-install-guile: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
-
-@endif guile
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-guile info-guile
-maybe-info-guile:
-@if guile
-maybe-info-guile: info-guile
-
-info-guile: \
-    configure-guile 
-	@: $(MAKE); $(unstage)
-	@[ -f ./guile/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in guile" ; \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif guile
-
-.PHONY: maybe-dvi-guile dvi-guile
-maybe-dvi-guile:
-@if guile
-maybe-dvi-guile: dvi-guile
-
-dvi-guile: \
-    configure-guile 
-	@: $(MAKE); $(unstage)
-	@[ -f ./guile/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in guile" ; \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif guile
-
-.PHONY: maybe-html-guile html-guile
-maybe-html-guile:
-@if guile
-maybe-html-guile: html-guile
-
-html-guile: \
-    configure-guile 
-	@: $(MAKE); $(unstage)
-	@[ -f ./guile/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in guile" ; \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif guile
-
-.PHONY: maybe-TAGS-guile TAGS-guile
-maybe-TAGS-guile:
-@if guile
-maybe-TAGS-guile: TAGS-guile
-
-TAGS-guile: \
-    configure-guile 
-	@: $(MAKE); $(unstage)
-	@[ -f ./guile/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in guile" ; \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif guile
-
-.PHONY: maybe-install-info-guile install-info-guile
-maybe-install-info-guile:
-@if guile
-maybe-install-info-guile: install-info-guile
-
-install-info-guile: \
-    configure-guile \
-    info-guile 
-	@: $(MAKE); $(unstage)
-	@[ -f ./guile/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in guile" ; \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif guile
-
-.PHONY: maybe-installcheck-guile installcheck-guile
-maybe-installcheck-guile:
-@if guile
-maybe-installcheck-guile: installcheck-guile
-
-installcheck-guile: \
-    configure-guile 
-	@: $(MAKE); $(unstage)
-	@[ -f ./guile/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in guile" ; \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif guile
-
-.PHONY: maybe-mostlyclean-guile mostlyclean-guile
-maybe-mostlyclean-guile:
-@if guile
-maybe-mostlyclean-guile: mostlyclean-guile
-
-mostlyclean-guile: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./guile/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in guile" ; \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif guile
-
-.PHONY: maybe-clean-guile clean-guile
-maybe-clean-guile:
-@if guile
-maybe-clean-guile: clean-guile
-
-clean-guile: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./guile/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in guile" ; \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif guile
-
-.PHONY: maybe-distclean-guile distclean-guile
-maybe-distclean-guile:
-@if guile
-maybe-distclean-guile: distclean-guile
-
-distclean-guile: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./guile/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in guile" ; \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif guile
-
-.PHONY: maybe-maintainer-clean-guile maintainer-clean-guile
-maybe-maintainer-clean-guile:
-@if guile
-maybe-maintainer-clean-guile: maintainer-clean-guile
-
-maintainer-clean-guile: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./guile/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in guile" ; \
-	(cd $(HOST_SUBDIR)/guile && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif guile
-
-
-
-.PHONY: configure-tk maybe-configure-tk
-maybe-configure-tk:
-@if tk
-maybe-configure-tk: configure-tk
-configure-tk: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/tk; \
-	cd "$(HOST_SUBDIR)/tk" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/tk/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/tk"; \
-	libsrcdir="$$s/tk"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif tk
-
-
-
-
-
-.PHONY: all-tk maybe-all-tk
-maybe-all-tk:
-@if tk
-TARGET-tk=all
-maybe-all-tk: all-tk
-all-tk: configure-tk
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-tk))
-@endif tk
-
-
-
-
-.PHONY: check-tk maybe-check-tk
-maybe-check-tk:
-@if tk
-maybe-check-tk: check-tk
-
-check-tk:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
-
-@endif tk
-
-.PHONY: install-tk maybe-install-tk
-maybe-install-tk:
-@if tk
-maybe-install-tk: install-tk
-
-install-tk: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
-
-@endif tk
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-tk info-tk
-maybe-info-tk:
-@if tk
-maybe-info-tk: info-tk
-
-info-tk: \
-    configure-tk 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in tk" ; \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif tk
-
-.PHONY: maybe-dvi-tk dvi-tk
-maybe-dvi-tk:
-@if tk
-maybe-dvi-tk: dvi-tk
-
-dvi-tk: \
-    configure-tk 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in tk" ; \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif tk
-
-.PHONY: maybe-html-tk html-tk
-maybe-html-tk:
-@if tk
-maybe-html-tk: html-tk
-
-html-tk: \
-    configure-tk 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in tk" ; \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif tk
-
-.PHONY: maybe-TAGS-tk TAGS-tk
-maybe-TAGS-tk:
-@if tk
-maybe-TAGS-tk: TAGS-tk
-
-TAGS-tk: \
-    configure-tk 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in tk" ; \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif tk
-
-.PHONY: maybe-install-info-tk install-info-tk
-maybe-install-info-tk:
-@if tk
-maybe-install-info-tk: install-info-tk
-
-install-info-tk: \
-    configure-tk \
-    info-tk 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in tk" ; \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif tk
-
-.PHONY: maybe-installcheck-tk installcheck-tk
-maybe-installcheck-tk:
-@if tk
-maybe-installcheck-tk: installcheck-tk
-
-installcheck-tk: \
-    configure-tk 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in tk" ; \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif tk
-
-.PHONY: maybe-mostlyclean-tk mostlyclean-tk
-maybe-mostlyclean-tk:
-@if tk
-maybe-mostlyclean-tk: mostlyclean-tk
-
-mostlyclean-tk: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in tk" ; \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif tk
-
-.PHONY: maybe-clean-tk clean-tk
-maybe-clean-tk:
-@if tk
-maybe-clean-tk: clean-tk
-
-clean-tk: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in tk" ; \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif tk
-
-.PHONY: maybe-distclean-tk distclean-tk
-maybe-distclean-tk:
-@if tk
-maybe-distclean-tk: distclean-tk
-
-distclean-tk: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in tk" ; \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif tk
-
-.PHONY: maybe-maintainer-clean-tk maintainer-clean-tk
-maybe-maintainer-clean-tk:
-@if tk
-maybe-maintainer-clean-tk: maintainer-clean-tk
-
-maintainer-clean-tk: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./tk/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in tk" ; \
-	(cd $(HOST_SUBDIR)/tk && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif tk
-
-
-
-.PHONY: configure-libtermcap maybe-configure-libtermcap
-maybe-configure-libtermcap:
-@if libtermcap
-maybe-configure-libtermcap: configure-libtermcap
-configure-libtermcap: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/libtermcap; \
-	cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libtermcap"; \
-	libsrcdir="$$s/libtermcap"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif libtermcap
-
-
-
-
-
-.PHONY: all-libtermcap maybe-all-libtermcap
-maybe-all-libtermcap:
-@if libtermcap
-TARGET-libtermcap=all
-maybe-all-libtermcap: all-libtermcap
-all-libtermcap: configure-libtermcap
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libtermcap && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtermcap))
-@endif libtermcap
-
-
-
-
-.PHONY: check-libtermcap maybe-check-libtermcap
-maybe-check-libtermcap:
-@if libtermcap
-maybe-check-libtermcap: check-libtermcap
-
-check-libtermcap:
-
-@endif libtermcap
-
-.PHONY: install-libtermcap maybe-install-libtermcap
-maybe-install-libtermcap:
-@if libtermcap
-maybe-install-libtermcap: install-libtermcap
-
-install-libtermcap: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/libtermcap && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif libtermcap
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-libtermcap info-libtermcap
-maybe-info-libtermcap:
-@if libtermcap
-maybe-info-libtermcap: info-libtermcap
-
-info-libtermcap: \
-    configure-libtermcap 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtermcap/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in libtermcap" ; \
-	(cd $(HOST_SUBDIR)/libtermcap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif libtermcap
-
-.PHONY: maybe-dvi-libtermcap dvi-libtermcap
-maybe-dvi-libtermcap:
-@if libtermcap
-maybe-dvi-libtermcap: dvi-libtermcap
-
-dvi-libtermcap: \
-    configure-libtermcap 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtermcap/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in libtermcap" ; \
-	(cd $(HOST_SUBDIR)/libtermcap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif libtermcap
-
-.PHONY: maybe-html-libtermcap html-libtermcap
-maybe-html-libtermcap:
-@if libtermcap
-maybe-html-libtermcap: html-libtermcap
-
-html-libtermcap: \
-    configure-libtermcap 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtermcap/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in libtermcap" ; \
-	(cd $(HOST_SUBDIR)/libtermcap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif libtermcap
-
-.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap
-maybe-TAGS-libtermcap:
-@if libtermcap
-maybe-TAGS-libtermcap: TAGS-libtermcap
-
-TAGS-libtermcap: \
-    configure-libtermcap 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtermcap/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in libtermcap" ; \
-	(cd $(HOST_SUBDIR)/libtermcap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif libtermcap
-
-.PHONY: maybe-install-info-libtermcap install-info-libtermcap
-maybe-install-info-libtermcap:
-@if libtermcap
-maybe-install-info-libtermcap: install-info-libtermcap
-
-install-info-libtermcap: \
-    configure-libtermcap \
-    info-libtermcap 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtermcap/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in libtermcap" ; \
-	(cd $(HOST_SUBDIR)/libtermcap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif libtermcap
-
-.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap
-maybe-installcheck-libtermcap:
-@if libtermcap
-maybe-installcheck-libtermcap: installcheck-libtermcap
-
-installcheck-libtermcap: \
-    configure-libtermcap 
-	@: $(MAKE); $(unstage)
-	@[ -f ./libtermcap/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in libtermcap" ; \
-	(cd $(HOST_SUBDIR)/libtermcap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif libtermcap
-
-.PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap
-maybe-mostlyclean-libtermcap:
-@if libtermcap
-maybe-mostlyclean-libtermcap: mostlyclean-libtermcap
-
-# libtermcap doesn't support mostlyclean.
-mostlyclean-libtermcap:
-
-@endif libtermcap
-
-.PHONY: maybe-clean-libtermcap clean-libtermcap
-maybe-clean-libtermcap:
-@if libtermcap
-maybe-clean-libtermcap: clean-libtermcap
-
-# libtermcap doesn't support clean.
-clean-libtermcap:
-
-@endif libtermcap
-
-.PHONY: maybe-distclean-libtermcap distclean-libtermcap
-maybe-distclean-libtermcap:
-@if libtermcap
-maybe-distclean-libtermcap: distclean-libtermcap
-
-# libtermcap doesn't support distclean.
-distclean-libtermcap:
-
-@endif libtermcap
-
-.PHONY: maybe-maintainer-clean-libtermcap maintainer-clean-libtermcap
-maybe-maintainer-clean-libtermcap:
-@if libtermcap
-maybe-maintainer-clean-libtermcap: maintainer-clean-libtermcap
-
-# libtermcap doesn't support maintainer-clean.
-maintainer-clean-libtermcap:
-
-@endif libtermcap
-
-
-
-.PHONY: configure-utils maybe-configure-utils
-maybe-configure-utils:
-@if utils
-maybe-configure-utils: configure-utils
-configure-utils: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/utils; \
-	cd "$(HOST_SUBDIR)/utils" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/utils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/utils"; \
-	libsrcdir="$$s/utils"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif utils
-
-
-
-
-
-.PHONY: all-utils maybe-all-utils
-maybe-all-utils:
-@if utils
-TARGET-utils=all
-maybe-all-utils: all-utils
-all-utils: configure-utils
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/utils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-utils))
-@endif utils
-
-
-
-
-.PHONY: check-utils maybe-check-utils
-maybe-check-utils:
-@if utils
-maybe-check-utils: check-utils
-
-check-utils:
-
-@endif utils
-
-.PHONY: install-utils maybe-install-utils
-maybe-install-utils:
-@if utils
-maybe-install-utils: install-utils
-
-install-utils: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/utils && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif utils
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-utils info-utils
-maybe-info-utils:
-@if utils
-maybe-info-utils: info-utils
-
-info-utils: \
-    configure-utils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./utils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in utils" ; \
-	(cd $(HOST_SUBDIR)/utils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif utils
-
-.PHONY: maybe-dvi-utils dvi-utils
-maybe-dvi-utils:
-@if utils
-maybe-dvi-utils: dvi-utils
-
-dvi-utils: \
-    configure-utils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./utils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in utils" ; \
-	(cd $(HOST_SUBDIR)/utils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif utils
-
-.PHONY: maybe-html-utils html-utils
-maybe-html-utils:
-@if utils
-maybe-html-utils: html-utils
-
-html-utils: \
-    configure-utils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./utils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in utils" ; \
-	(cd $(HOST_SUBDIR)/utils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif utils
-
-.PHONY: maybe-TAGS-utils TAGS-utils
-maybe-TAGS-utils:
-@if utils
-maybe-TAGS-utils: TAGS-utils
-
-TAGS-utils: \
-    configure-utils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./utils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in utils" ; \
-	(cd $(HOST_SUBDIR)/utils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif utils
-
-.PHONY: maybe-install-info-utils install-info-utils
-maybe-install-info-utils:
-@if utils
-maybe-install-info-utils: install-info-utils
-
-install-info-utils: \
-    configure-utils \
-    info-utils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./utils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in utils" ; \
-	(cd $(HOST_SUBDIR)/utils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif utils
-
-.PHONY: maybe-installcheck-utils installcheck-utils
-maybe-installcheck-utils:
-@if utils
-maybe-installcheck-utils: installcheck-utils
-
-installcheck-utils: \
-    configure-utils 
-	@: $(MAKE); $(unstage)
-	@[ -f ./utils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in utils" ; \
-	(cd $(HOST_SUBDIR)/utils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif utils
-
-.PHONY: maybe-mostlyclean-utils mostlyclean-utils
-maybe-mostlyclean-utils:
-@if utils
-maybe-mostlyclean-utils: mostlyclean-utils
-
-mostlyclean-utils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./utils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in utils" ; \
-	(cd $(HOST_SUBDIR)/utils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif utils
-
-.PHONY: maybe-clean-utils clean-utils
-maybe-clean-utils:
-@if utils
-maybe-clean-utils: clean-utils
-
-clean-utils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./utils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in utils" ; \
-	(cd $(HOST_SUBDIR)/utils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif utils
-
-.PHONY: maybe-distclean-utils distclean-utils
-maybe-distclean-utils:
-@if utils
-maybe-distclean-utils: distclean-utils
-
-distclean-utils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./utils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in utils" ; \
-	(cd $(HOST_SUBDIR)/utils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif utils
-
-.PHONY: maybe-maintainer-clean-utils maintainer-clean-utils
-maybe-maintainer-clean-utils:
-@if utils
-maybe-maintainer-clean-utils: maintainer-clean-utils
-
-maintainer-clean-utils: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./utils/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in utils" ; \
-	(cd $(HOST_SUBDIR)/utils && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif utils
-
-
-
-.PHONY: configure-gnattools maybe-configure-gnattools
-maybe-configure-gnattools:
-@if gnattools
-maybe-configure-gnattools: configure-gnattools
-configure-gnattools: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \
-	$(HOST_EXPORTS) \
-	echo Configuring in $(HOST_SUBDIR)/gnattools; \
-	cd "$(HOST_SUBDIR)/gnattools" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gnattools"; \
-	libsrcdir="$$s/gnattools"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif gnattools
-
-
-
-
-
-.PHONY: all-gnattools maybe-all-gnattools
-maybe-all-gnattools:
-@if gnattools
-TARGET-gnattools=all
-maybe-all-gnattools: all-gnattools
-all-gnattools: configure-gnattools
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnattools))
-@endif gnattools
-
-
-
-
-.PHONY: check-gnattools maybe-check-gnattools
-maybe-check-gnattools:
-@if gnattools
-maybe-check-gnattools: check-gnattools
-
-check-gnattools:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(FLAGS_TO_PASS)  check)
-
-@endif gnattools
-
-.PHONY: install-gnattools maybe-install-gnattools
-maybe-install-gnattools:
-@if gnattools
-maybe-install-gnattools: install-gnattools
-
-install-gnattools: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(FLAGS_TO_PASS)  install)
-
-@endif gnattools
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-gnattools info-gnattools
-maybe-info-gnattools:
-@if gnattools
-maybe-info-gnattools: info-gnattools
-
-info-gnattools: \
-    configure-gnattools 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnattools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in gnattools" ; \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-dvi-gnattools dvi-gnattools
-maybe-dvi-gnattools:
-@if gnattools
-maybe-dvi-gnattools: dvi-gnattools
-
-dvi-gnattools: \
-    configure-gnattools 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnattools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in gnattools" ; \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-html-gnattools html-gnattools
-maybe-html-gnattools:
-@if gnattools
-maybe-html-gnattools: html-gnattools
-
-html-gnattools: \
-    configure-gnattools 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnattools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing html in gnattools" ; \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          html) \
-	  || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-TAGS-gnattools TAGS-gnattools
-maybe-TAGS-gnattools:
-@if gnattools
-maybe-TAGS-gnattools: TAGS-gnattools
-
-TAGS-gnattools: \
-    configure-gnattools 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnattools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in gnattools" ; \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-install-info-gnattools install-info-gnattools
-maybe-install-info-gnattools:
-@if gnattools
-maybe-install-info-gnattools: install-info-gnattools
-
-install-info-gnattools: \
-    configure-gnattools \
-    info-gnattools 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnattools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in gnattools" ; \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-installcheck-gnattools installcheck-gnattools
-maybe-installcheck-gnattools:
-@if gnattools
-maybe-installcheck-gnattools: installcheck-gnattools
-
-installcheck-gnattools: \
-    configure-gnattools 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnattools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in gnattools" ; \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools
-maybe-mostlyclean-gnattools:
-@if gnattools
-maybe-mostlyclean-gnattools: mostlyclean-gnattools
-
-mostlyclean-gnattools: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnattools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in gnattools" ; \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-clean-gnattools clean-gnattools
-maybe-clean-gnattools:
-@if gnattools
-maybe-clean-gnattools: clean-gnattools
-
-clean-gnattools: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnattools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in gnattools" ; \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-distclean-gnattools distclean-gnattools
-maybe-distclean-gnattools:
-@if gnattools
-maybe-distclean-gnattools: distclean-gnattools
-
-distclean-gnattools: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnattools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in gnattools" ; \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif gnattools
-
-.PHONY: maybe-maintainer-clean-gnattools maintainer-clean-gnattools
-maybe-maintainer-clean-gnattools:
-@if gnattools
-maybe-maintainer-clean-gnattools: maintainer-clean-gnattools
-
-maintainer-clean-gnattools: 
-	@: $(MAKE); $(unstage)
-	@[ -f ./gnattools/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in gnattools" ; \
-	(cd $(HOST_SUBDIR)/gnattools && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif gnattools
-
-
-
-# ---------------------------------------
-# Modules which run on the target machine
-# ---------------------------------------
-
-
-
-
-.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
-maybe-configure-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
-configure-target-libstdc++-v3: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libstdc++-v3..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-	    mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \
-	cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \
-	libsrcdir="$$s/libstdc++-v3"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libstdc++-v3
-
-
-
-
-
-.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
-maybe-all-target-libstdc++-v3:
-@if target-libstdc++-v3
-TARGET-target-libstdc++-v3=all
-maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
-all-target-libstdc++-v3: configure-target-libstdc++-v3
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  $(TARGET-target-libstdc++-v3))
-@endif target-libstdc++-v3
-
-
-
-
-
-.PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3
-maybe-check-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-check-target-libstdc++-v3: check-target-libstdc++-v3
-
-check-target-libstdc++-v3:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
-
-@endif target-libstdc++-v3
-
-.PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3
-maybe-install-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-target-libstdc++-v3: install-target-libstdc++-v3
-
-install-target-libstdc++-v3: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libstdc++-v3
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libstdc++-v3 info-target-libstdc++-v3
-maybe-info-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-info-target-libstdc++-v3: info-target-libstdc++-v3
-
-info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-dvi-target-libstdc++-v3 dvi-target-libstdc++-v3
-maybe-dvi-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3
-
-dvi-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3
-maybe-html-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-html-target-libstdc++-v3: html-target-libstdc++-v3
-
-html-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3
-
-TAGS-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3
-maybe-install-info-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3
-
-install-info-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 \
-    info-target-libstdc++-v3 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3
-maybe-installcheck-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3
-
-installcheck-target-libstdc++-v3: \
-    configure-target-libstdc++-v3 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3
-maybe-mostlyclean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3
-
-mostlyclean-target-libstdc++-v3: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-clean-target-libstdc++-v3 clean-target-libstdc++-v3
-maybe-clean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3
-
-clean-target-libstdc++-v3: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-distclean-target-libstdc++-v3 distclean-target-libstdc++-v3
-maybe-distclean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3
-
-distclean-target-libstdc++-v3: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libstdc++-v3
-
-.PHONY: maybe-maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3
-maybe-maintainer-clean-target-libstdc++-v3:
-@if target-libstdc++-v3
-maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3
-
-maintainer-clean-target-libstdc++-v3: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libstdc++-v3
-
-
-
-
-
-.PHONY: configure-target-libmudflap maybe-configure-target-libmudflap
-maybe-configure-target-libmudflap:
-@if target-libmudflap
-maybe-configure-target-libmudflap: configure-target-libmudflap
-configure-target-libmudflap: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libmudflap..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmudflap/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libmudflap/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libmudflap/Makefile; \
-	    mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libmudflap; \
-	cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libmudflap/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libmudflap"; \
-	libsrcdir="$$s/libmudflap"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libmudflap
-
-
-
-
-
-.PHONY: all-target-libmudflap maybe-all-target-libmudflap
-maybe-all-target-libmudflap:
-@if target-libmudflap
-TARGET-target-libmudflap=all
-maybe-all-target-libmudflap: all-target-libmudflap
-all-target-libmudflap: configure-target-libmudflap
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libmudflap))
-@endif target-libmudflap
-
-
-
-
-
-.PHONY: check-target-libmudflap maybe-check-target-libmudflap
-maybe-check-target-libmudflap:
-@if target-libmudflap
-maybe-check-target-libmudflap: check-target-libmudflap
-
-check-target-libmudflap:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libmudflap
-
-.PHONY: install-target-libmudflap maybe-install-target-libmudflap
-maybe-install-target-libmudflap:
-@if target-libmudflap
-maybe-install-target-libmudflap: install-target-libmudflap
-
-install-target-libmudflap: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libmudflap
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libmudflap info-target-libmudflap
-maybe-info-target-libmudflap:
-@if target-libmudflap
-maybe-info-target-libmudflap: info-target-libmudflap
-
-info-target-libmudflap: \
-    configure-target-libmudflap 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libmudflap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libmudflap
-
-.PHONY: maybe-dvi-target-libmudflap dvi-target-libmudflap
-maybe-dvi-target-libmudflap:
-@if target-libmudflap
-maybe-dvi-target-libmudflap: dvi-target-libmudflap
-
-dvi-target-libmudflap: \
-    configure-target-libmudflap 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libmudflap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libmudflap
-
-.PHONY: maybe-html-target-libmudflap html-target-libmudflap
-maybe-html-target-libmudflap:
-@if target-libmudflap
-maybe-html-target-libmudflap: html-target-libmudflap
-
-html-target-libmudflap: \
-    configure-target-libmudflap 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libmudflap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libmudflap
-
-.PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap
-maybe-TAGS-target-libmudflap:
-@if target-libmudflap
-maybe-TAGS-target-libmudflap: TAGS-target-libmudflap
-
-TAGS-target-libmudflap: \
-    configure-target-libmudflap 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libmudflap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libmudflap
-
-.PHONY: maybe-install-info-target-libmudflap install-info-target-libmudflap
-maybe-install-info-target-libmudflap:
-@if target-libmudflap
-maybe-install-info-target-libmudflap: install-info-target-libmudflap
-
-install-info-target-libmudflap: \
-    configure-target-libmudflap \
-    info-target-libmudflap 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libmudflap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libmudflap
-
-.PHONY: maybe-installcheck-target-libmudflap installcheck-target-libmudflap
-maybe-installcheck-target-libmudflap:
-@if target-libmudflap
-maybe-installcheck-target-libmudflap: installcheck-target-libmudflap
-
-installcheck-target-libmudflap: \
-    configure-target-libmudflap 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libmudflap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libmudflap
-
-.PHONY: maybe-mostlyclean-target-libmudflap mostlyclean-target-libmudflap
-maybe-mostlyclean-target-libmudflap:
-@if target-libmudflap
-maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap
-
-mostlyclean-target-libmudflap: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmudflap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libmudflap
-
-.PHONY: maybe-clean-target-libmudflap clean-target-libmudflap
-maybe-clean-target-libmudflap:
-@if target-libmudflap
-maybe-clean-target-libmudflap: clean-target-libmudflap
-
-clean-target-libmudflap: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libmudflap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libmudflap
-
-.PHONY: maybe-distclean-target-libmudflap distclean-target-libmudflap
-maybe-distclean-target-libmudflap:
-@if target-libmudflap
-maybe-distclean-target-libmudflap: distclean-target-libmudflap
-
-distclean-target-libmudflap: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libmudflap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libmudflap
-
-.PHONY: maybe-maintainer-clean-target-libmudflap maintainer-clean-target-libmudflap
-maybe-maintainer-clean-target-libmudflap:
-@if target-libmudflap
-maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap
-
-maintainer-clean-target-libmudflap: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmudflap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libmudflap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libmudflap
-
-
-
-
-
-.PHONY: configure-target-libssp maybe-configure-target-libssp
-maybe-configure-target-libssp:
-@if target-libssp
-maybe-configure-target-libssp: configure-target-libssp
-configure-target-libssp: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libssp..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libssp/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libssp/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libssp/Makefile; \
-	    mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libssp; \
-	cd "$(TARGET_SUBDIR)/libssp" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libssp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libssp"; \
-	libsrcdir="$$s/libssp"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libssp
-
-
-
-
-
-.PHONY: all-target-libssp maybe-all-target-libssp
-maybe-all-target-libssp:
-@if target-libssp
-TARGET-target-libssp=all
-maybe-all-target-libssp: all-target-libssp
-all-target-libssp: configure-target-libssp
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libssp))
-@endif target-libssp
-
-
-
-
-
-.PHONY: check-target-libssp maybe-check-target-libssp
-maybe-check-target-libssp:
-@if target-libssp
-maybe-check-target-libssp: check-target-libssp
-
-check-target-libssp:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libssp
-
-.PHONY: install-target-libssp maybe-install-target-libssp
-maybe-install-target-libssp:
-@if target-libssp
-maybe-install-target-libssp: install-target-libssp
-
-install-target-libssp: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libssp
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libssp info-target-libssp
-maybe-info-target-libssp:
-@if target-libssp
-maybe-info-target-libssp: info-target-libssp
-
-info-target-libssp: \
-    configure-target-libssp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-dvi-target-libssp dvi-target-libssp
-maybe-dvi-target-libssp:
-@if target-libssp
-maybe-dvi-target-libssp: dvi-target-libssp
-
-dvi-target-libssp: \
-    configure-target-libssp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-html-target-libssp html-target-libssp
-maybe-html-target-libssp:
-@if target-libssp
-maybe-html-target-libssp: html-target-libssp
-
-html-target-libssp: \
-    configure-target-libssp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-TAGS-target-libssp TAGS-target-libssp
-maybe-TAGS-target-libssp:
-@if target-libssp
-maybe-TAGS-target-libssp: TAGS-target-libssp
-
-TAGS-target-libssp: \
-    configure-target-libssp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-install-info-target-libssp install-info-target-libssp
-maybe-install-info-target-libssp:
-@if target-libssp
-maybe-install-info-target-libssp: install-info-target-libssp
-
-install-info-target-libssp: \
-    configure-target-libssp \
-    info-target-libssp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-installcheck-target-libssp installcheck-target-libssp
-maybe-installcheck-target-libssp:
-@if target-libssp
-maybe-installcheck-target-libssp: installcheck-target-libssp
-
-installcheck-target-libssp: \
-    configure-target-libssp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-mostlyclean-target-libssp mostlyclean-target-libssp
-maybe-mostlyclean-target-libssp:
-@if target-libssp
-maybe-mostlyclean-target-libssp: mostlyclean-target-libssp
-
-mostlyclean-target-libssp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-clean-target-libssp clean-target-libssp
-maybe-clean-target-libssp:
-@if target-libssp
-maybe-clean-target-libssp: clean-target-libssp
-
-clean-target-libssp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-distclean-target-libssp distclean-target-libssp
-maybe-distclean-target-libssp:
-@if target-libssp
-maybe-distclean-target-libssp: distclean-target-libssp
-
-distclean-target-libssp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libssp
-
-.PHONY: maybe-maintainer-clean-target-libssp maintainer-clean-target-libssp
-maybe-maintainer-clean-target-libssp:
-@if target-libssp
-maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp
-
-maintainer-clean-target-libssp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libssp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libssp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libssp
-
-
-
-
-
-.PHONY: configure-target-libgcc-math maybe-configure-target-libgcc-math
-maybe-configure-target-libgcc-math:
-@if target-libgcc-math
-maybe-configure-target-libgcc-math: configure-target-libgcc-math
-configure-target-libgcc-math: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libgcc-math..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc-math ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc-math/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libgcc-math/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgcc-math/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgcc-math/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgcc-math/multilib.tmp $(TARGET_SUBDIR)/libgcc-math/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgcc-math/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc-math ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libgcc-math; \
-	cd "$(TARGET_SUBDIR)/libgcc-math" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc-math/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libgcc-math"; \
-	libsrcdir="$$s/libgcc-math"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libgcc-math
-
-
-
-
-
-.PHONY: all-target-libgcc-math maybe-all-target-libgcc-math
-maybe-all-target-libgcc-math:
-@if target-libgcc-math
-TARGET-target-libgcc-math=all
-maybe-all-target-libgcc-math: all-target-libgcc-math
-all-target-libgcc-math: configure-target-libgcc-math
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgcc-math))
-@endif target-libgcc-math
-
-
-
-
-
-.PHONY: check-target-libgcc-math maybe-check-target-libgcc-math
-maybe-check-target-libgcc-math:
-@if target-libgcc-math
-maybe-check-target-libgcc-math: check-target-libgcc-math
-
-check-target-libgcc-math:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libgcc-math
-
-.PHONY: install-target-libgcc-math maybe-install-target-libgcc-math
-maybe-install-target-libgcc-math:
-@if target-libgcc-math
-maybe-install-target-libgcc-math: install-target-libgcc-math
-
-install-target-libgcc-math: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libgcc-math
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libgcc-math info-target-libgcc-math
-maybe-info-target-libgcc-math:
-@if target-libgcc-math
-maybe-info-target-libgcc-math: info-target-libgcc-math
-
-info-target-libgcc-math: \
-    configure-target-libgcc-math 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-dvi-target-libgcc-math dvi-target-libgcc-math
-maybe-dvi-target-libgcc-math:
-@if target-libgcc-math
-maybe-dvi-target-libgcc-math: dvi-target-libgcc-math
-
-dvi-target-libgcc-math: \
-    configure-target-libgcc-math 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-html-target-libgcc-math html-target-libgcc-math
-maybe-html-target-libgcc-math:
-@if target-libgcc-math
-maybe-html-target-libgcc-math: html-target-libgcc-math
-
-html-target-libgcc-math: \
-    configure-target-libgcc-math 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-TAGS-target-libgcc-math TAGS-target-libgcc-math
-maybe-TAGS-target-libgcc-math:
-@if target-libgcc-math
-maybe-TAGS-target-libgcc-math: TAGS-target-libgcc-math
-
-TAGS-target-libgcc-math: \
-    configure-target-libgcc-math 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-install-info-target-libgcc-math install-info-target-libgcc-math
-maybe-install-info-target-libgcc-math:
-@if target-libgcc-math
-maybe-install-info-target-libgcc-math: install-info-target-libgcc-math
-
-install-info-target-libgcc-math: \
-    configure-target-libgcc-math \
-    info-target-libgcc-math 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-installcheck-target-libgcc-math installcheck-target-libgcc-math
-maybe-installcheck-target-libgcc-math:
-@if target-libgcc-math
-maybe-installcheck-target-libgcc-math: installcheck-target-libgcc-math
-
-installcheck-target-libgcc-math: \
-    configure-target-libgcc-math 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-mostlyclean-target-libgcc-math mostlyclean-target-libgcc-math
-maybe-mostlyclean-target-libgcc-math:
-@if target-libgcc-math
-maybe-mostlyclean-target-libgcc-math: mostlyclean-target-libgcc-math
-
-mostlyclean-target-libgcc-math: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-clean-target-libgcc-math clean-target-libgcc-math
-maybe-clean-target-libgcc-math:
-@if target-libgcc-math
-maybe-clean-target-libgcc-math: clean-target-libgcc-math
-
-clean-target-libgcc-math: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-distclean-target-libgcc-math distclean-target-libgcc-math
-maybe-distclean-target-libgcc-math:
-@if target-libgcc-math
-maybe-distclean-target-libgcc-math: distclean-target-libgcc-math
-
-distclean-target-libgcc-math: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-.PHONY: maybe-maintainer-clean-target-libgcc-math maintainer-clean-target-libgcc-math
-maybe-maintainer-clean-target-libgcc-math:
-@if target-libgcc-math
-maybe-maintainer-clean-target-libgcc-math: maintainer-clean-target-libgcc-math
-
-maintainer-clean-target-libgcc-math: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgcc-math/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgcc-math" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgcc-math && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libgcc-math
-
-
-
-
-
-.PHONY: configure-target-newlib maybe-configure-target-newlib
-maybe-configure-target-newlib:
-@if target-newlib
-maybe-configure-target-newlib: configure-target-newlib
-configure-target-newlib: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for newlib..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/newlib/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/newlib/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/newlib/Makefile; \
-	    mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/newlib; \
-	cd "$(TARGET_SUBDIR)/newlib" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/newlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/newlib"; \
-	libsrcdir="$$s/newlib"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-newlib
-
-
-
-
-
-.PHONY: all-target-newlib maybe-all-target-newlib
-maybe-all-target-newlib:
-@if target-newlib
-TARGET-target-newlib=all
-maybe-all-target-newlib: all-target-newlib
-all-target-newlib: configure-target-newlib
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-newlib))
-@endif target-newlib
-
-
-
-
-
-.PHONY: check-target-newlib maybe-check-target-newlib
-maybe-check-target-newlib:
-@if target-newlib
-maybe-check-target-newlib: check-target-newlib
-
-check-target-newlib:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-newlib
-
-.PHONY: install-target-newlib maybe-install-target-newlib
-maybe-install-target-newlib:
-@if target-newlib
-maybe-install-target-newlib: install-target-newlib
-
-install-target-newlib: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-newlib
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-newlib info-target-newlib
-maybe-info-target-newlib:
-@if target-newlib
-maybe-info-target-newlib: info-target-newlib
-
-info-target-newlib: \
-    configure-target-newlib 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/newlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-newlib
-
-.PHONY: maybe-dvi-target-newlib dvi-target-newlib
-maybe-dvi-target-newlib:
-@if target-newlib
-maybe-dvi-target-newlib: dvi-target-newlib
-
-dvi-target-newlib: \
-    configure-target-newlib 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/newlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-newlib
-
-.PHONY: maybe-html-target-newlib html-target-newlib
-maybe-html-target-newlib:
-@if target-newlib
-maybe-html-target-newlib: html-target-newlib
-
-html-target-newlib: \
-    configure-target-newlib 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/newlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-newlib
-
-.PHONY: maybe-TAGS-target-newlib TAGS-target-newlib
-maybe-TAGS-target-newlib:
-@if target-newlib
-maybe-TAGS-target-newlib: TAGS-target-newlib
-
-TAGS-target-newlib: \
-    configure-target-newlib 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/newlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-newlib
-
-.PHONY: maybe-install-info-target-newlib install-info-target-newlib
-maybe-install-info-target-newlib:
-@if target-newlib
-maybe-install-info-target-newlib: install-info-target-newlib
-
-install-info-target-newlib: \
-    configure-target-newlib \
-    info-target-newlib 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/newlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-newlib
-
-.PHONY: maybe-installcheck-target-newlib installcheck-target-newlib
-maybe-installcheck-target-newlib:
-@if target-newlib
-maybe-installcheck-target-newlib: installcheck-target-newlib
-
-installcheck-target-newlib: \
-    configure-target-newlib 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/newlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-newlib
-
-.PHONY: maybe-mostlyclean-target-newlib mostlyclean-target-newlib
-maybe-mostlyclean-target-newlib:
-@if target-newlib
-maybe-mostlyclean-target-newlib: mostlyclean-target-newlib
-
-mostlyclean-target-newlib: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-newlib
-
-.PHONY: maybe-clean-target-newlib clean-target-newlib
-maybe-clean-target-newlib:
-@if target-newlib
-maybe-clean-target-newlib: clean-target-newlib
-
-clean-target-newlib: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/newlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-newlib
-
-.PHONY: maybe-distclean-target-newlib distclean-target-newlib
-maybe-distclean-target-newlib:
-@if target-newlib
-maybe-distclean-target-newlib: distclean-target-newlib
-
-distclean-target-newlib: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/newlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-newlib
-
-.PHONY: maybe-maintainer-clean-target-newlib maintainer-clean-target-newlib
-maybe-maintainer-clean-target-newlib:
-@if target-newlib
-maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib
-
-maintainer-clean-target-newlib: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/newlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-newlib
-
-
-
-
-
-.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
-maybe-configure-target-libgfortran:
-@if target-libgfortran
-maybe-configure-target-libgfortran: configure-target-libgfortran
-configure-target-libgfortran: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libgfortran..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgfortran/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libgfortran/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgfortran/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgfortran/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
-	cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libgfortran"; \
-	libsrcdir="$$s/libgfortran"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libgfortran
-
-
-
-
-
-.PHONY: all-target-libgfortran maybe-all-target-libgfortran
-maybe-all-target-libgfortran:
-@if target-libgfortran
-TARGET-target-libgfortran=all
-maybe-all-target-libgfortran: all-target-libgfortran
-all-target-libgfortran: configure-target-libgfortran
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgfortran))
-@endif target-libgfortran
-
-
-
-
-
-.PHONY: check-target-libgfortran maybe-check-target-libgfortran
-maybe-check-target-libgfortran:
-@if target-libgfortran
-maybe-check-target-libgfortran: check-target-libgfortran
-
-check-target-libgfortran:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libgfortran
-
-.PHONY: install-target-libgfortran maybe-install-target-libgfortran
-maybe-install-target-libgfortran:
-@if target-libgfortran
-maybe-install-target-libgfortran: install-target-libgfortran
-
-install-target-libgfortran: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libgfortran
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libgfortran info-target-libgfortran
-maybe-info-target-libgfortran:
-@if target-libgfortran
-maybe-info-target-libgfortran: info-target-libgfortran
-
-info-target-libgfortran: \
-    configure-target-libgfortran 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libgfortran" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libgfortran
-
-.PHONY: maybe-dvi-target-libgfortran dvi-target-libgfortran
-maybe-dvi-target-libgfortran:
-@if target-libgfortran
-maybe-dvi-target-libgfortran: dvi-target-libgfortran
-
-dvi-target-libgfortran: \
-    configure-target-libgfortran 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libgfortran
-
-.PHONY: maybe-html-target-libgfortran html-target-libgfortran
-maybe-html-target-libgfortran:
-@if target-libgfortran
-maybe-html-target-libgfortran: html-target-libgfortran
-
-html-target-libgfortran: \
-    configure-target-libgfortran 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libgfortran" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libgfortran
-
-.PHONY: maybe-TAGS-target-libgfortran TAGS-target-libgfortran
-maybe-TAGS-target-libgfortran:
-@if target-libgfortran
-maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
-
-TAGS-target-libgfortran: \
-    configure-target-libgfortran 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libgfortran
-
-.PHONY: maybe-install-info-target-libgfortran install-info-target-libgfortran
-maybe-install-info-target-libgfortran:
-@if target-libgfortran
-maybe-install-info-target-libgfortran: install-info-target-libgfortran
-
-install-info-target-libgfortran: \
-    configure-target-libgfortran \
-    info-target-libgfortran 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libgfortran" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libgfortran
-
-.PHONY: maybe-installcheck-target-libgfortran installcheck-target-libgfortran
-maybe-installcheck-target-libgfortran:
-@if target-libgfortran
-maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
-
-installcheck-target-libgfortran: \
-    configure-target-libgfortran 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libgfortran
-
-.PHONY: maybe-mostlyclean-target-libgfortran mostlyclean-target-libgfortran
-maybe-mostlyclean-target-libgfortran:
-@if target-libgfortran
-maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
-
-mostlyclean-target-libgfortran: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libgfortran
-
-.PHONY: maybe-clean-target-libgfortran clean-target-libgfortran
-maybe-clean-target-libgfortran:
-@if target-libgfortran
-maybe-clean-target-libgfortran: clean-target-libgfortran
-
-clean-target-libgfortran: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libgfortran" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libgfortran
-
-.PHONY: maybe-distclean-target-libgfortran distclean-target-libgfortran
-maybe-distclean-target-libgfortran:
-@if target-libgfortran
-maybe-distclean-target-libgfortran: distclean-target-libgfortran
-
-distclean-target-libgfortran: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libgfortran
-
-.PHONY: maybe-maintainer-clean-target-libgfortran maintainer-clean-target-libgfortran
-maybe-maintainer-clean-target-libgfortran:
-@if target-libgfortran
-maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
-
-maintainer-clean-target-libgfortran: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgfortran && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libgfortran
-
-
-
+install-no-fixedincludes: \
+	installdirs \
+	$(INSTALL_MODULES) \
+	$(INSTALL_TARGET_MODULES) \
+	$(INSTALL_X11_MODULES) \
+	gcc-no-fixedincludes 
 
+# Install the gcc headers files, but not the fixed include files,
+# which Cygnus is not allowed to distribute.  This rule is very
+# dependent on the workings of the gcc Makefile.in.
+.PHONY: gcc-no-fixedincludes
+gcc-no-fixedincludes:
+	@if [ -f ./gcc/Makefile ]; then \
+	  rm -rf gcc/tmp-include; \
+	  mv gcc/include gcc/tmp-include 2>/dev/null; \
+	  mkdir gcc/include; \
+	  cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
+	  touch gcc/stmp-fixinc gcc/include/fixed; \
+	  rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd` ; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd ./gcc; \
+	   $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
+	  rm -rf gcc/include; \
+	  mv gcc/tmp-include gcc/include 2>/dev/null; \
+	else true; fi
 
-.PHONY: configure-target-libobjc maybe-configure-target-libobjc
-maybe-configure-target-libobjc:
-@if target-libobjc
-maybe-configure-target-libobjc: configure-target-libobjc
-configure-target-libobjc: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libobjc..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libobjc/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libobjc/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libobjc/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libobjc/Makefile; \
-	    mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
-	  fi; \
+# This rule is used to build the modules which are built with the
+# build machine's native compiler.
+.PHONY: $(ALL_BUILD_MODULES)
+$(ALL_BUILD_MODULES):
+	dir=`echo $@ | sed -e 's/all-build-//'`; \
+	if [ -f ./$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  (cd $(BUILD_SUBDIR)/$${dir} && $(MAKE) all); \
 	else \
-	  mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libobjc; \
-	cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libobjc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libobjc"; \
-	libsrcdir="$$s/libobjc"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libobjc
-
-
-
-
-
-.PHONY: all-target-libobjc maybe-all-target-libobjc
-maybe-all-target-libobjc:
-@if target-libobjc
-TARGET-target-libobjc=all
-maybe-all-target-libobjc: all-target-libobjc
-all-target-libobjc: configure-target-libobjc
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libobjc))
-@endif target-libobjc
-
-
-
-
-
-.PHONY: check-target-libobjc maybe-check-target-libobjc
-maybe-check-target-libobjc:
-@if target-libobjc
-maybe-check-target-libobjc: check-target-libobjc
-
-check-target-libobjc:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libobjc
-
-.PHONY: install-target-libobjc maybe-install-target-libobjc
-maybe-install-target-libobjc:
-@if target-libobjc
-maybe-install-target-libobjc: install-target-libobjc
-
-install-target-libobjc: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libobjc
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libobjc info-target-libobjc
-maybe-info-target-libobjc:
-@if target-libobjc
-maybe-info-target-libobjc: info-target-libobjc
-
-info-target-libobjc: \
-    configure-target-libobjc 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libobjc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libobjc
-
-.PHONY: maybe-dvi-target-libobjc dvi-target-libobjc
-maybe-dvi-target-libobjc:
-@if target-libobjc
-maybe-dvi-target-libobjc: dvi-target-libobjc
-
-dvi-target-libobjc: \
-    configure-target-libobjc 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libobjc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libobjc
-
-.PHONY: maybe-html-target-libobjc html-target-libobjc
-maybe-html-target-libobjc:
-@if target-libobjc
-maybe-html-target-libobjc: html-target-libobjc
-
-html-target-libobjc: \
-    configure-target-libobjc 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libobjc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libobjc
-
-.PHONY: maybe-TAGS-target-libobjc TAGS-target-libobjc
-maybe-TAGS-target-libobjc:
-@if target-libobjc
-maybe-TAGS-target-libobjc: TAGS-target-libobjc
-
-TAGS-target-libobjc: \
-    configure-target-libobjc 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libobjc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libobjc
-
-.PHONY: maybe-install-info-target-libobjc install-info-target-libobjc
-maybe-install-info-target-libobjc:
-@if target-libobjc
-maybe-install-info-target-libobjc: install-info-target-libobjc
-
-install-info-target-libobjc: \
-    configure-target-libobjc \
-    info-target-libobjc 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libobjc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libobjc
-
-.PHONY: maybe-installcheck-target-libobjc installcheck-target-libobjc
-maybe-installcheck-target-libobjc:
-@if target-libobjc
-maybe-installcheck-target-libobjc: installcheck-target-libobjc
-
-installcheck-target-libobjc: \
-    configure-target-libobjc 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libobjc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libobjc
-
-.PHONY: maybe-mostlyclean-target-libobjc mostlyclean-target-libobjc
-maybe-mostlyclean-target-libobjc:
-@if target-libobjc
-maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc
-
-mostlyclean-target-libobjc: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libobjc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libobjc
-
-.PHONY: maybe-clean-target-libobjc clean-target-libobjc
-maybe-clean-target-libobjc:
-@if target-libobjc
-maybe-clean-target-libobjc: clean-target-libobjc
-
-clean-target-libobjc: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libobjc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libobjc
-
-.PHONY: maybe-distclean-target-libobjc distclean-target-libobjc
-maybe-distclean-target-libobjc:
-@if target-libobjc
-maybe-distclean-target-libobjc: distclean-target-libobjc
-
-distclean-target-libobjc: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libobjc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libobjc
-
-.PHONY: maybe-maintainer-clean-target-libobjc maintainer-clean-target-libobjc
-maybe-maintainer-clean-target-libobjc:
-@if target-libobjc
-maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc
-
-maintainer-clean-target-libobjc: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libobjc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libobjc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libobjc
-
-
-
-
+	  true; \
+	fi
 
-.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
-maybe-configure-target-libtermcap:
-@if target-libtermcap
-maybe-configure-target-libtermcap: configure-target-libtermcap
-configure-target-libtermcap: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libtermcap..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libtermcap/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libtermcap/multilib.tmp; \
+# This rule is used to configure the modules which are built with the
+# native tools.
+.PHONY: $(CONFIGURE_BUILD_MODULES)
+$(CONFIGURE_BUILD_MODULES):
+	@dir=`echo $@ | sed -e 's/configure-build-//'`; \
+	if [ ! -d $(BUILD_SUBDIR) ]; then \
+	  true; \
+	elif [ -f $(BUILD_SUBDIR)/$${dir}/Makefile ] ; then \
+	  true; \
+	elif echo " $(BUILD_CONFIGDIRS) " | grep " $${dir} " >/dev/null 2>&1; then \
+	  if [ -d $(srcdir)/$${dir} ]; then \
+	    [ -d $(BUILD_SUBDIR)/$${dir} ] || mkdir $(BUILD_SUBDIR)/$${dir};\
+	    r=`pwd`; export r; \
+	    s=`cd $(srcdir); pwd`; export s; \
+	    AR="$(AR_FOR_BUILD)"; export AR; \
+	    AS="$(AS_FOR_BUILD)"; export AS; \
+	    CC="$(CC_FOR_BUILD)"; export CC; \
+	    CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
+	    CXX="$(CXX_FOR_BUILD)"; export CXX; \
+	    CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
+	    GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
+	    DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
+	    LD="$(LD_FOR_BUILD)"; export LD; \
+            LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
+	    NM="$(NM_FOR_BUILD)"; export NM; \
+	    RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \
+	    WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
+	    echo Configuring in $(BUILD_SUBDIR)/$${dir}; \
+	    cd "$(BUILD_SUBDIR)/$${dir}" || exit 1; \
+	    case $(srcdir) in \
+	    /* | [A-Za-z]:[\\/]*) \
+	      topdir=$(srcdir) ;; \
+	    *) \
+	      case "$(BUILD_SUBDIR)" in \
+	      .) topdir="../$(srcdir)" ;; \
+	      *) topdir="../../$(srcdir)" ;; \
+	      esac ;; \
+	    esac; \
+	    if [ "$(srcdir)" = "." ] ; then \
+	      if [ "$(BUILD_SUBDIR)" != "." ] ; then \
+		if $(SHELL) $$s/symlink-tree $${topdir}/$${dir} "no-such-file" ; then \
+		  if [ -f Makefile ]; then \
+		    if $(MAKE) distclean; then \
+		      true; \
+		    else \
+		      exit 1; \
+		    fi; \
+		  else \
+		    true; \
+		  fi; \
+		else \
+		  exit 1; \
+		fi; \
+	      else \
+		true; \
+	      fi; \
+	      srcdiroption="--srcdir=."; \
+	      libsrcdir="."; \
+	    else \
+	      srcdiroption="--srcdir=$${topdir}/$${dir}"; \
+	      libsrcdir="$$s/$${dir}"; \
+	    fi; \
+	    if [ -f $${libsrcdir}/configure ] ; then \
+	      rm -f no-such-file skip-this-dir; \
+	      CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+		$(BUILD_CONFIGARGS) $${srcdiroption} \
+		--with-build-subdir="$(BUILD_SUBDIR)"; \
+	    else \
+	      rm -f no-such-file skip-this-dir; \
+	      CONFIG_SITE=no-such-file $(SHELL) $$s/configure \
+		$(BUILD_CONFIGARGS) $${srcdiroption} \
+		--with-build-subdir="$(BUILD_SUBDIR)"; \
+	    fi || exit 1; \
+	    if [ -f skip-this-dir ] ; then \
+	      sh skip-this-dir; \
+	      rm -f skip-this-dir; \
+	      cd ..; rmdir $${dir} || true; \
+	    else \
+	      true; \
+	    fi; \
 	  else \
-	    rm -f $(TARGET_SUBDIR)/libtermcap/Makefile; \
-	    mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
+	    true; \
 	  fi; \
 	else \
-	  mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libtermcap; \
-	cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libtermcap"; \
-	libsrcdir="$$s/libtermcap"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libtermcap
-
-
-
-
-
-.PHONY: all-target-libtermcap maybe-all-target-libtermcap
-maybe-all-target-libtermcap:
-@if target-libtermcap
-TARGET-target-libtermcap=all
-maybe-all-target-libtermcap: all-target-libtermcap
-all-target-libtermcap: configure-target-libtermcap
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libtermcap && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libtermcap))
-@endif target-libtermcap
-
-
-
-
-
-.PHONY: check-target-libtermcap maybe-check-target-libtermcap
-maybe-check-target-libtermcap:
-@if target-libtermcap
-maybe-check-target-libtermcap: check-target-libtermcap
-
-# Dummy target for uncheckable module.
-check-target-libtermcap:
-
-@endif target-libtermcap
-
-.PHONY: install-target-libtermcap maybe-install-target-libtermcap
-maybe-install-target-libtermcap:
-@if target-libtermcap
-maybe-install-target-libtermcap: install-target-libtermcap
-
-install-target-libtermcap: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libtermcap && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libtermcap
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libtermcap info-target-libtermcap
-maybe-info-target-libtermcap:
-@if target-libtermcap
-maybe-info-target-libtermcap: info-target-libtermcap
-
-info-target-libtermcap: \
-    configure-target-libtermcap 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libtermcap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libtermcap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libtermcap
-
-.PHONY: maybe-dvi-target-libtermcap dvi-target-libtermcap
-maybe-dvi-target-libtermcap:
-@if target-libtermcap
-maybe-dvi-target-libtermcap: dvi-target-libtermcap
-
-dvi-target-libtermcap: \
-    configure-target-libtermcap 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libtermcap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libtermcap
-
-.PHONY: maybe-html-target-libtermcap html-target-libtermcap
-maybe-html-target-libtermcap:
-@if target-libtermcap
-maybe-html-target-libtermcap: html-target-libtermcap
-
-html-target-libtermcap: \
-    configure-target-libtermcap 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libtermcap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libtermcap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libtermcap
-
-.PHONY: maybe-TAGS-target-libtermcap TAGS-target-libtermcap
-maybe-TAGS-target-libtermcap:
-@if target-libtermcap
-maybe-TAGS-target-libtermcap: TAGS-target-libtermcap
-
-TAGS-target-libtermcap: \
-    configure-target-libtermcap 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libtermcap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libtermcap
-
-.PHONY: maybe-install-info-target-libtermcap install-info-target-libtermcap
-maybe-install-info-target-libtermcap:
-@if target-libtermcap
-maybe-install-info-target-libtermcap: install-info-target-libtermcap
-
-install-info-target-libtermcap: \
-    configure-target-libtermcap \
-    info-target-libtermcap 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libtermcap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libtermcap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libtermcap
-
-.PHONY: maybe-installcheck-target-libtermcap installcheck-target-libtermcap
-maybe-installcheck-target-libtermcap:
-@if target-libtermcap
-maybe-installcheck-target-libtermcap: installcheck-target-libtermcap
-
-installcheck-target-libtermcap: \
-    configure-target-libtermcap 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libtermcap && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libtermcap
-
-.PHONY: maybe-mostlyclean-target-libtermcap mostlyclean-target-libtermcap
-maybe-mostlyclean-target-libtermcap:
-@if target-libtermcap
-maybe-mostlyclean-target-libtermcap: mostlyclean-target-libtermcap
-
-# libtermcap doesn't support mostlyclean.
-mostlyclean-target-libtermcap:
-
-@endif target-libtermcap
-
-.PHONY: maybe-clean-target-libtermcap clean-target-libtermcap
-maybe-clean-target-libtermcap:
-@if target-libtermcap
-maybe-clean-target-libtermcap: clean-target-libtermcap
-
-# libtermcap doesn't support clean.
-clean-target-libtermcap:
-
-@endif target-libtermcap
-
-.PHONY: maybe-distclean-target-libtermcap distclean-target-libtermcap
-maybe-distclean-target-libtermcap:
-@if target-libtermcap
-maybe-distclean-target-libtermcap: distclean-target-libtermcap
-
-# libtermcap doesn't support distclean.
-distclean-target-libtermcap:
-
-@endif target-libtermcap
-
-.PHONY: maybe-maintainer-clean-target-libtermcap maintainer-clean-target-libtermcap
-maybe-maintainer-clean-target-libtermcap:
-@if target-libtermcap
-maybe-maintainer-clean-target-libtermcap: maintainer-clean-target-libtermcap
-
-# libtermcap doesn't support maintainer-clean.
-maintainer-clean-target-libtermcap:
-
-@endif target-libtermcap
-
-
-
-
+	  true; \
+	fi
 
-.PHONY: configure-target-winsup maybe-configure-target-winsup
-maybe-configure-target-winsup:
-@if target-winsup
-maybe-configure-target-winsup: configure-target-winsup
-configure-target-winsup: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for winsup..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/winsup/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/winsup/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/winsup/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/winsup/Makefile; \
-	    mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
-	  fi; \
+# This rule is used to build the modules which use FLAGS_TO_PASS.  To
+# build a target all-X means to cd to X and make all.
+#
+# all-gui, and all-libproc are handled specially because
+# they are still experimental, and if they fail to build, that
+# shouldn't stop "make all".
+.PHONY: $(ALL_MODULES) all-gui all-libproc
+$(ALL_MODULES) all-gui all-libproc:
+	@dir=`echo $@ | sed -e 's/all-//'`; \
+	if [ -f ./$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) all); \
 	else \
-	  mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/winsup; \
-	cd "$(TARGET_SUBDIR)/winsup" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/winsup"; \
-	libsrcdir="$$s/winsup"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-winsup
-
-
-
-
-
-.PHONY: all-target-winsup maybe-all-target-winsup
-maybe-all-target-winsup:
-@if target-winsup
-TARGET-target-winsup=all
-maybe-all-target-winsup: all-target-winsup
-all-target-winsup: configure-target-winsup
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-winsup))
-@endif target-winsup
-
-
-
-
-
-.PHONY: check-target-winsup maybe-check-target-winsup
-maybe-check-target-winsup:
-@if target-winsup
-maybe-check-target-winsup: check-target-winsup
-
-check-target-winsup:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-winsup
-
-.PHONY: install-target-winsup maybe-install-target-winsup
-maybe-install-target-winsup:
-@if target-winsup
-maybe-install-target-winsup: install-target-winsup
-
-install-target-winsup: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-winsup
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-winsup info-target-winsup
-maybe-info-target-winsup:
-@if target-winsup
-maybe-info-target-winsup: info-target-winsup
-
-info-target-winsup: \
-    configure-target-winsup 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/winsup" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-winsup
-
-.PHONY: maybe-dvi-target-winsup dvi-target-winsup
-maybe-dvi-target-winsup:
-@if target-winsup
-maybe-dvi-target-winsup: dvi-target-winsup
-
-dvi-target-winsup: \
-    configure-target-winsup 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/winsup" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-winsup
-
-.PHONY: maybe-html-target-winsup html-target-winsup
-maybe-html-target-winsup:
-@if target-winsup
-maybe-html-target-winsup: html-target-winsup
-
-html-target-winsup: \
-    configure-target-winsup 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/winsup" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-winsup
-
-.PHONY: maybe-TAGS-target-winsup TAGS-target-winsup
-maybe-TAGS-target-winsup:
-@if target-winsup
-maybe-TAGS-target-winsup: TAGS-target-winsup
-
-TAGS-target-winsup: \
-    configure-target-winsup 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/winsup" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-winsup
-
-.PHONY: maybe-install-info-target-winsup install-info-target-winsup
-maybe-install-info-target-winsup:
-@if target-winsup
-maybe-install-info-target-winsup: install-info-target-winsup
-
-install-info-target-winsup: \
-    configure-target-winsup \
-    info-target-winsup 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/winsup" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-winsup
-
-.PHONY: maybe-installcheck-target-winsup installcheck-target-winsup
-maybe-installcheck-target-winsup:
-@if target-winsup
-maybe-installcheck-target-winsup: installcheck-target-winsup
-
-installcheck-target-winsup: \
-    configure-target-winsup 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/winsup" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-winsup
-
-.PHONY: maybe-mostlyclean-target-winsup mostlyclean-target-winsup
-maybe-mostlyclean-target-winsup:
-@if target-winsup
-maybe-mostlyclean-target-winsup: mostlyclean-target-winsup
-
-mostlyclean-target-winsup: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-winsup
-
-.PHONY: maybe-clean-target-winsup clean-target-winsup
-maybe-clean-target-winsup:
-@if target-winsup
-maybe-clean-target-winsup: clean-target-winsup
-
-clean-target-winsup: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/winsup" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-winsup
-
-.PHONY: maybe-distclean-target-winsup distclean-target-winsup
-maybe-distclean-target-winsup:
-@if target-winsup
-maybe-distclean-target-winsup: distclean-target-winsup
-
-distclean-target-winsup: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/winsup" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-winsup
-
-.PHONY: maybe-maintainer-clean-target-winsup maintainer-clean-target-winsup
-maybe-maintainer-clean-target-winsup:
-@if target-winsup
-maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup
-
-maintainer-clean-target-winsup: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/winsup" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/winsup && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-winsup
-
-
-
+	  true; \
+	fi
 
+# These rules are used to check the modules which use FLAGS_TO_PASS.
+# To build a target check-X means to cd to X and make check.  Some
+# modules are only tested in a native toolchain.
 
-.PHONY: configure-target-libgloss maybe-configure-target-libgloss
-maybe-configure-target-libgloss:
-@if target-libgloss
-maybe-configure-target-libgloss: configure-target-libgloss
-configure-target-libgloss: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libgloss..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgloss/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libgloss/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgloss/multilib.tmp; \
+.PHONY: $(CHECK_MODULES) $(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
+$(NATIVE_CHECK_MODULES):
+	@if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
+	  dir=`echo $@ | sed -e 's/check-//'`; \
+	  if [ -f ./$${dir}/Makefile ] ; then \
+	    r=`pwd`; export r; \
+	    s=`cd $(srcdir); pwd`; export s; \
+	    $(SET_LIB_PATH) \
+	    (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
 	  else \
-	    rm -f $(TARGET_SUBDIR)/libgloss/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
+	    true; \
 	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libgloss; \
-	cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libgloss"; \
-	libsrcdir="$$s/libgloss"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libgloss
-
-
-
-
-
-.PHONY: all-target-libgloss maybe-all-target-libgloss
-maybe-all-target-libgloss:
-@if target-libgloss
-TARGET-target-libgloss=all
-maybe-all-target-libgloss: all-target-libgloss
-all-target-libgloss: configure-target-libgloss
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgloss))
-@endif target-libgloss
-
-
-
-
-
-.PHONY: check-target-libgloss maybe-check-target-libgloss
-maybe-check-target-libgloss:
-@if target-libgloss
-maybe-check-target-libgloss: check-target-libgloss
-
-# Dummy target for uncheckable module.
-check-target-libgloss:
-
-@endif target-libgloss
-
-.PHONY: install-target-libgloss maybe-install-target-libgloss
-maybe-install-target-libgloss:
-@if target-libgloss
-maybe-install-target-libgloss: install-target-libgloss
-
-install-target-libgloss: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libgloss
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libgloss info-target-libgloss
-maybe-info-target-libgloss:
-@if target-libgloss
-maybe-info-target-libgloss: info-target-libgloss
-
-info-target-libgloss: \
-    configure-target-libgloss 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libgloss" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libgloss
-
-.PHONY: maybe-dvi-target-libgloss dvi-target-libgloss
-maybe-dvi-target-libgloss:
-@if target-libgloss
-maybe-dvi-target-libgloss: dvi-target-libgloss
-
-dvi-target-libgloss: \
-    configure-target-libgloss 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libgloss" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libgloss
-
-.PHONY: maybe-html-target-libgloss html-target-libgloss
-maybe-html-target-libgloss:
-@if target-libgloss
-maybe-html-target-libgloss: html-target-libgloss
-
-html-target-libgloss: \
-    configure-target-libgloss 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libgloss" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libgloss
-
-.PHONY: maybe-TAGS-target-libgloss TAGS-target-libgloss
-maybe-TAGS-target-libgloss:
-@if target-libgloss
-maybe-TAGS-target-libgloss: TAGS-target-libgloss
-
-TAGS-target-libgloss: \
-    configure-target-libgloss 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libgloss" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libgloss
-
-.PHONY: maybe-install-info-target-libgloss install-info-target-libgloss
-maybe-install-info-target-libgloss:
-@if target-libgloss
-maybe-install-info-target-libgloss: install-info-target-libgloss
-
-install-info-target-libgloss: \
-    configure-target-libgloss \
-    info-target-libgloss 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libgloss" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libgloss
-
-.PHONY: maybe-installcheck-target-libgloss installcheck-target-libgloss
-maybe-installcheck-target-libgloss:
-@if target-libgloss
-maybe-installcheck-target-libgloss: installcheck-target-libgloss
-
-installcheck-target-libgloss: \
-    configure-target-libgloss 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libgloss" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libgloss
-
-.PHONY: maybe-mostlyclean-target-libgloss mostlyclean-target-libgloss
-maybe-mostlyclean-target-libgloss:
-@if target-libgloss
-maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss
-
-mostlyclean-target-libgloss: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgloss" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libgloss
-
-.PHONY: maybe-clean-target-libgloss clean-target-libgloss
-maybe-clean-target-libgloss:
-@if target-libgloss
-maybe-clean-target-libgloss: clean-target-libgloss
-
-clean-target-libgloss: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libgloss" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libgloss
-
-.PHONY: maybe-distclean-target-libgloss distclean-target-libgloss
-maybe-distclean-target-libgloss:
-@if target-libgloss
-maybe-distclean-target-libgloss: distclean-target-libgloss
-
-distclean-target-libgloss: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libgloss" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libgloss
-
-.PHONY: maybe-maintainer-clean-target-libgloss maintainer-clean-target-libgloss
-maybe-maintainer-clean-target-libgloss:
-@if target-libgloss
-maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss
-
-maintainer-clean-target-libgloss: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgloss" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgloss && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libgloss
-
-
-
-
+	fi
 
-.PHONY: configure-target-libiberty maybe-configure-target-libiberty
-maybe-configure-target-libiberty:
-@if target-libiberty
-maybe-configure-target-libiberty: configure-target-libiberty
-configure-target-libiberty: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libiberty..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libiberty/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libiberty/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libiberty/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libiberty/Makefile; \
-	    mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
-	  fi; \
+$(CROSS_CHECK_MODULES):
+	@dir=`echo $@ | sed -e 's/check-//'`; \
+	if [ -f ./$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
 	else \
-	  mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libiberty; \
-	cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libiberty"; \
-	libsrcdir="$$s/libiberty"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libiberty
-
-
-
-
-
-.PHONY: all-target-libiberty maybe-all-target-libiberty
-maybe-all-target-libiberty:
-@if target-libiberty
-TARGET-target-libiberty=all
-maybe-all-target-libiberty: all-target-libiberty
-all-target-libiberty: configure-target-libiberty
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libiberty))
-@endif target-libiberty
-
-
-
-
-
-.PHONY: check-target-libiberty maybe-check-target-libiberty
-maybe-check-target-libiberty:
-@if target-libiberty
-maybe-check-target-libiberty: check-target-libiberty
-
-check-target-libiberty:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libiberty
-
-.PHONY: install-target-libiberty maybe-install-target-libiberty
-maybe-install-target-libiberty:
-@if target-libiberty
-maybe-install-target-libiberty: install-target-libiberty
-
-install-target-libiberty: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libiberty
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libiberty info-target-libiberty
-maybe-info-target-libiberty:
-@if target-libiberty
-maybe-info-target-libiberty: info-target-libiberty
-
-info-target-libiberty: \
-    configure-target-libiberty 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libiberty" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libiberty
-
-.PHONY: maybe-dvi-target-libiberty dvi-target-libiberty
-maybe-dvi-target-libiberty:
-@if target-libiberty
-maybe-dvi-target-libiberty: dvi-target-libiberty
-
-dvi-target-libiberty: \
-    configure-target-libiberty 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libiberty" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libiberty
-
-.PHONY: maybe-html-target-libiberty html-target-libiberty
-maybe-html-target-libiberty:
-@if target-libiberty
-maybe-html-target-libiberty: html-target-libiberty
-
-html-target-libiberty: \
-    configure-target-libiberty 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libiberty" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libiberty
-
-.PHONY: maybe-TAGS-target-libiberty TAGS-target-libiberty
-maybe-TAGS-target-libiberty:
-@if target-libiberty
-maybe-TAGS-target-libiberty: TAGS-target-libiberty
-
-TAGS-target-libiberty: \
-    configure-target-libiberty 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libiberty" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libiberty
-
-.PHONY: maybe-install-info-target-libiberty install-info-target-libiberty
-maybe-install-info-target-libiberty:
-@if target-libiberty
-maybe-install-info-target-libiberty: install-info-target-libiberty
-
-install-info-target-libiberty: \
-    configure-target-libiberty \
-    info-target-libiberty 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libiberty" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libiberty
-
-.PHONY: maybe-installcheck-target-libiberty installcheck-target-libiberty
-maybe-installcheck-target-libiberty:
-@if target-libiberty
-maybe-installcheck-target-libiberty: installcheck-target-libiberty
-
-installcheck-target-libiberty: \
-    configure-target-libiberty 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libiberty" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libiberty
-
-.PHONY: maybe-mostlyclean-target-libiberty mostlyclean-target-libiberty
-maybe-mostlyclean-target-libiberty:
-@if target-libiberty
-maybe-mostlyclean-target-libiberty: mostlyclean-target-libiberty
-
-mostlyclean-target-libiberty: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libiberty" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libiberty
-
-.PHONY: maybe-clean-target-libiberty clean-target-libiberty
-maybe-clean-target-libiberty:
-@if target-libiberty
-maybe-clean-target-libiberty: clean-target-libiberty
-
-clean-target-libiberty: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libiberty" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libiberty
-
-.PHONY: maybe-distclean-target-libiberty distclean-target-libiberty
-maybe-distclean-target-libiberty:
-@if target-libiberty
-maybe-distclean-target-libiberty: distclean-target-libiberty
-
-distclean-target-libiberty: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libiberty" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libiberty
-
-.PHONY: maybe-maintainer-clean-target-libiberty maintainer-clean-target-libiberty
-maybe-maintainer-clean-target-libiberty:
-@if target-libiberty
-maybe-maintainer-clean-target-libiberty: maintainer-clean-target-libiberty
-
-maintainer-clean-target-libiberty: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libiberty" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libiberty && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libiberty
-
-
-
-
+	  true; \
+	fi
 
-.PHONY: configure-target-gperf maybe-configure-target-gperf
-maybe-configure-target-gperf:
-@if target-gperf
-maybe-configure-target-gperf: configure-target-gperf
-configure-target-gperf: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for gperf..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/gperf/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/gperf/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/gperf/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/gperf/Makefile; \
-	    mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \
-	  fi; \
+# This rule is used to install the modules which use FLAGS_TO_PASS.
+# To build a target install-X means to cd to X and make install.
+.PHONY: $(INSTALL_MODULES)
+$(INSTALL_MODULES): installdirs
+	@dir=`echo $@ | sed -e 's/install-//'`; \
+	if [ -f ./$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
 	else \
-	  mv $(TARGET_SUBDIR)/gperf/multilib.tmp $(TARGET_SUBDIR)/gperf/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/gperf; \
-	cd "$(TARGET_SUBDIR)/gperf" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/gperf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/gperf"; \
-	libsrcdir="$$s/gperf"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-gperf
-
-
-
-
-
-.PHONY: all-target-gperf maybe-all-target-gperf
-maybe-all-target-gperf:
-@if target-gperf
-TARGET-target-gperf=all
-maybe-all-target-gperf: all-target-gperf
-all-target-gperf: configure-target-gperf
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-gperf))
-@endif target-gperf
-
-
-
-
-
-.PHONY: check-target-gperf maybe-check-target-gperf
-maybe-check-target-gperf:
-@if target-gperf
-maybe-check-target-gperf: check-target-gperf
-
-check-target-gperf:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-gperf
-
-.PHONY: install-target-gperf maybe-install-target-gperf
-maybe-install-target-gperf:
-@if target-gperf
-maybe-install-target-gperf: install-target-gperf
-
-install-target-gperf: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-gperf
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-gperf info-target-gperf
-maybe-info-target-gperf:
-@if target-gperf
-maybe-info-target-gperf: info-target-gperf
-
-info-target-gperf: \
-    configure-target-gperf 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/gperf" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-gperf
-
-.PHONY: maybe-dvi-target-gperf dvi-target-gperf
-maybe-dvi-target-gperf:
-@if target-gperf
-maybe-dvi-target-gperf: dvi-target-gperf
-
-dvi-target-gperf: \
-    configure-target-gperf 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/gperf" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-gperf
-
-.PHONY: maybe-html-target-gperf html-target-gperf
-maybe-html-target-gperf:
-@if target-gperf
-maybe-html-target-gperf: html-target-gperf
-
-html-target-gperf: \
-    configure-target-gperf 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/gperf" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-gperf
-
-.PHONY: maybe-TAGS-target-gperf TAGS-target-gperf
-maybe-TAGS-target-gperf:
-@if target-gperf
-maybe-TAGS-target-gperf: TAGS-target-gperf
-
-TAGS-target-gperf: \
-    configure-target-gperf 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/gperf" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-gperf
-
-.PHONY: maybe-install-info-target-gperf install-info-target-gperf
-maybe-install-info-target-gperf:
-@if target-gperf
-maybe-install-info-target-gperf: install-info-target-gperf
-
-install-info-target-gperf: \
-    configure-target-gperf \
-    info-target-gperf 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/gperf" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-gperf
-
-.PHONY: maybe-installcheck-target-gperf installcheck-target-gperf
-maybe-installcheck-target-gperf:
-@if target-gperf
-maybe-installcheck-target-gperf: installcheck-target-gperf
-
-installcheck-target-gperf: \
-    configure-target-gperf 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/gperf" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-gperf
-
-.PHONY: maybe-mostlyclean-target-gperf mostlyclean-target-gperf
-maybe-mostlyclean-target-gperf:
-@if target-gperf
-maybe-mostlyclean-target-gperf: mostlyclean-target-gperf
-
-mostlyclean-target-gperf: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/gperf" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-gperf
-
-.PHONY: maybe-clean-target-gperf clean-target-gperf
-maybe-clean-target-gperf:
-@if target-gperf
-maybe-clean-target-gperf: clean-target-gperf
-
-clean-target-gperf: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/gperf" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-gperf
-
-.PHONY: maybe-distclean-target-gperf distclean-target-gperf
-maybe-distclean-target-gperf:
-@if target-gperf
-maybe-distclean-target-gperf: distclean-target-gperf
-
-distclean-target-gperf: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/gperf" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-gperf
-
-.PHONY: maybe-maintainer-clean-target-gperf maintainer-clean-target-gperf
-maybe-maintainer-clean-target-gperf:
-@if target-gperf
-maybe-maintainer-clean-target-gperf: maintainer-clean-target-gperf
-
-maintainer-clean-target-gperf: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/gperf" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/gperf && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-gperf
-
-
-
-
+	  true; \
+	fi
 
-.PHONY: configure-target-examples maybe-configure-target-examples
-maybe-configure-target-examples:
-@if target-examples
-maybe-configure-target-examples: configure-target-examples
-configure-target-examples: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for examples..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/examples/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/examples/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/examples/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/examples/Makefile; \
-	    mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \
+# This rule is used to configure the modules which are built with the
+# target tools.
+.PHONY: $(CONFIGURE_TARGET_MODULES)
+$(CONFIGURE_TARGET_MODULES):
+	@dir=`echo $@ | sed -e 's/configure-target-//'`; \
+	if [ -d $(TARGET_SUBDIR)/$${dir} ]; then \
+	  r=`pwd`; export r; \
+	  $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/$${dir}/tmpmulti.out 2> /dev/null; \
+	  if [ -s $(TARGET_SUBDIR)/$${dir}/tmpmulti.out ]; then \
+	    if [ -f $(TARGET_SUBDIR)/$${dir}/multilib.out ]; then \
+	      if cmp $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/tmpmulti.out > /dev/null; then \
+		rm -f $(TARGET_SUBDIR)/$${dir}/tmpmulti.out; \
+	      else \
+		echo "Multilibs changed for $${dir}, reconfiguring"; \
+		rm -f $(TARGET_SUBDIR)/$${dir}/multilib.out $(TARGET_SUBDIR)/$${dir}/Makefile; \
+		mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
+	      fi; \
+	    else \
+	      mv $(TARGET_SUBDIR)/$${dir}/tmpmulti.out $(TARGET_SUBDIR)/$${dir}/multilib.out; \
+	    fi; \
 	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/examples/multilib.tmp $(TARGET_SUBDIR)/examples/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/examples; \
-	cd "$(TARGET_SUBDIR)/examples" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/examples/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/examples"; \
-	libsrcdir="$$s/examples"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-examples
-
-
-
-
-
-.PHONY: all-target-examples maybe-all-target-examples
-maybe-all-target-examples:
-@if target-examples
-TARGET-target-examples=all
-maybe-all-target-examples: all-target-examples
-all-target-examples: configure-target-examples
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/examples && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-examples))
-@endif target-examples
-
-
-
-
-
-.PHONY: check-target-examples maybe-check-target-examples
-maybe-check-target-examples:
-@if target-examples
-maybe-check-target-examples: check-target-examples
-
-# Dummy target for uncheckable module.
-check-target-examples:
-
-@endif target-examples
-
-.PHONY: install-target-examples maybe-install-target-examples
-maybe-install-target-examples:
-@if target-examples
-maybe-install-target-examples: install-target-examples
-
-# Dummy target for uninstallable.
-install-target-examples:
-
-@endif target-examples
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-examples info-target-examples
-maybe-info-target-examples:
-@if target-examples
-maybe-info-target-examples: info-target-examples
-
-info-target-examples: \
-    configure-target-examples 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/examples" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/examples && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-examples
-
-.PHONY: maybe-dvi-target-examples dvi-target-examples
-maybe-dvi-target-examples:
-@if target-examples
-maybe-dvi-target-examples: dvi-target-examples
-
-dvi-target-examples: \
-    configure-target-examples 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/examples" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/examples && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-examples
-
-.PHONY: maybe-html-target-examples html-target-examples
-maybe-html-target-examples:
-@if target-examples
-maybe-html-target-examples: html-target-examples
-
-html-target-examples: \
-    configure-target-examples 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/examples" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/examples && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-examples
-
-.PHONY: maybe-TAGS-target-examples TAGS-target-examples
-maybe-TAGS-target-examples:
-@if target-examples
-maybe-TAGS-target-examples: TAGS-target-examples
-
-TAGS-target-examples: \
-    configure-target-examples 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/examples" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/examples && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-examples
-
-.PHONY: maybe-install-info-target-examples install-info-target-examples
-maybe-install-info-target-examples:
-@if target-examples
-maybe-install-info-target-examples: install-info-target-examples
-
-install-info-target-examples: \
-    configure-target-examples \
-    info-target-examples 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/examples" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/examples && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-examples
-
-.PHONY: maybe-installcheck-target-examples installcheck-target-examples
-maybe-installcheck-target-examples:
-@if target-examples
-maybe-installcheck-target-examples: installcheck-target-examples
-
-installcheck-target-examples: \
-    configure-target-examples 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/examples" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/examples && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-examples
-
-.PHONY: maybe-mostlyclean-target-examples mostlyclean-target-examples
-maybe-mostlyclean-target-examples:
-@if target-examples
-maybe-mostlyclean-target-examples: mostlyclean-target-examples
-
-mostlyclean-target-examples: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/examples" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/examples && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-examples
-
-.PHONY: maybe-clean-target-examples clean-target-examples
-maybe-clean-target-examples:
-@if target-examples
-maybe-clean-target-examples: clean-target-examples
-
-clean-target-examples: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/examples" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/examples && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-examples
-
-.PHONY: maybe-distclean-target-examples distclean-target-examples
-maybe-distclean-target-examples:
-@if target-examples
-maybe-distclean-target-examples: distclean-target-examples
-
-distclean-target-examples: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/examples" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/examples && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-examples
-
-.PHONY: maybe-maintainer-clean-target-examples maintainer-clean-target-examples
-maybe-maintainer-clean-target-examples:
-@if target-examples
-maybe-maintainer-clean-target-examples: maintainer-clean-target-examples
-
-maintainer-clean-target-examples: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/examples" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/examples && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-examples
-
-
-
-
-
-.PHONY: configure-target-libffi maybe-configure-target-libffi
-maybe-configure-target-libffi:
-@if target-libffi
-maybe-configure-target-libffi: configure-target-libffi
-configure-target-libffi: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libffi..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \
+	fi; exit 0	# break command into two pieces
+	@dir=`echo $@ | sed -e 's/configure-target-//'`; \
+	if [ ! -d $(TARGET_SUBDIR) ]; then \
+	  true; \
+	elif [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
+	  true; \
+	elif echo " $(TARGET_CONFIGDIRS) " | grep " $${dir} " >/dev/null 2>&1; then \
+	  if [ -d $(srcdir)/$${dir} ]; then \
+	    [ -d $(TARGET_SUBDIR)/$${dir} ] || mkdir $(TARGET_SUBDIR)/$${dir};\
+	    r=`pwd`; export r; \
+	    s=`cd $(srcdir); pwd`; export s; \
+	    $(SET_LIB_PATH) \
+	    AR="$(AR_FOR_TARGET)"; export AR; \
+	    AS="$(AS_FOR_TARGET)"; export AS; \
+	    CC="$(CC_FOR_TARGET)"; export CC; \
+	    CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	    CXX="$(CXX_FOR_TARGET)"; export CXX; \
+	    CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	    DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+	    LD="$(LD_FOR_TARGET)"; export LD; \
+            LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
+	    NM="$(NM_FOR_TARGET)"; export NM; \
+	    RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+	    WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
+	    echo Configuring in $(TARGET_SUBDIR)/$${dir}; \
+	    cd $(TARGET_SUBDIR)/$${dir}; \
+	    case $(srcdir) in \
+	    /*) \
+	      topdir=$(srcdir) ;; \
+	    *) \
+	      case "$(TARGET_SUBDIR)" in \
+	      .) topdir="../$(srcdir)" ;; \
+	      *) topdir="../../$(srcdir)" ;; \
+	      esac ;; \
+	    esac; \
+	    if [ "$(srcdir)" = "." ] ; then \
+	      if [ "$(TARGET_SUBDIR)" != "." ] ; then \
+		if $(SHELL) $$s/symlink-tree $${topdir}/$${dir} "no-such-file" ; then \
+		  if [ -f Makefile ]; then \
+		    if $(MAKE) distclean; then \
+		      true; \
+		    else \
+		      exit 1; \
+		    fi; \
+		  else \
+		    true; \
+		  fi; \
+		else \
+		  exit 1; \
+		fi; \
+	      else \
+		true; \
+	      fi; \
+	      srcdiroption="--srcdir=."; \
+	      libsrcdir="."; \
+	    else \
+	      srcdiroption="--srcdir=$${topdir}/$${dir}"; \
+	      libsrcdir="$$s/$${dir}"; \
+	    fi; \
+	    if [ -f $${libsrcdir}/configure ] ; then \
+	      rm -f no-such-file skip-this-dir; \
+	      CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+		$(TARGET_CONFIGARGS) $${srcdiroption} \
+		--with-target-subdir="$(TARGET_SUBDIR)"; \
+	    else \
+	      rm -f no-such-file skip-this-dir; \
+	      CONFIG_SITE=no-such-file $(SHELL) $$s/configure \
+		$(TARGET_CONFIGARGS) $${srcdiroption} \
+		--with-target-subdir="$(TARGET_SUBDIR)"; \
+	    fi; \
+	    if [ -f skip-this-dir ] ; then \
+	      sh skip-this-dir; \
+	      rm -f skip-this-dir; \
+	      cd ..; rmdir $${dir} || true; \
+	    else \
+	      true; \
+	    fi; \
 	  else \
-	    rm -f $(TARGET_SUBDIR)/libffi/Makefile; \
-	    mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
+	    true; \
 	  fi; \
 	else \
-	  mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libffi; \
-	cd "$(TARGET_SUBDIR)/libffi" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libffi"; \
-	libsrcdir="$$s/libffi"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libffi
-
-
-
-
-
-.PHONY: all-target-libffi maybe-all-target-libffi
-maybe-all-target-libffi:
-@if target-libffi
-TARGET-target-libffi=all
-maybe-all-target-libffi: all-target-libffi
-all-target-libffi: configure-target-libffi
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libffi))
-@endif target-libffi
-
-
-
-
-
-.PHONY: check-target-libffi maybe-check-target-libffi
-maybe-check-target-libffi:
-@if target-libffi
-maybe-check-target-libffi: check-target-libffi
-
-check-target-libffi:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libffi
-
-.PHONY: install-target-libffi maybe-install-target-libffi
-maybe-install-target-libffi:
-@if target-libffi
-maybe-install-target-libffi: install-target-libffi
-
-install-target-libffi: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libffi
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libffi info-target-libffi
-maybe-info-target-libffi:
-@if target-libffi
-maybe-info-target-libffi: info-target-libffi
-
-info-target-libffi: \
-    configure-target-libffi 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libffi" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libffi
-
-.PHONY: maybe-dvi-target-libffi dvi-target-libffi
-maybe-dvi-target-libffi:
-@if target-libffi
-maybe-dvi-target-libffi: dvi-target-libffi
-
-dvi-target-libffi: \
-    configure-target-libffi 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libffi" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libffi
-
-.PHONY: maybe-html-target-libffi html-target-libffi
-maybe-html-target-libffi:
-@if target-libffi
-maybe-html-target-libffi: html-target-libffi
-
-html-target-libffi: \
-    configure-target-libffi 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libffi" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libffi
-
-.PHONY: maybe-TAGS-target-libffi TAGS-target-libffi
-maybe-TAGS-target-libffi:
-@if target-libffi
-maybe-TAGS-target-libffi: TAGS-target-libffi
-
-TAGS-target-libffi: \
-    configure-target-libffi 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libffi" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libffi
-
-.PHONY: maybe-install-info-target-libffi install-info-target-libffi
-maybe-install-info-target-libffi:
-@if target-libffi
-maybe-install-info-target-libffi: install-info-target-libffi
-
-install-info-target-libffi: \
-    configure-target-libffi \
-    info-target-libffi 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libffi" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libffi
-
-.PHONY: maybe-installcheck-target-libffi installcheck-target-libffi
-maybe-installcheck-target-libffi:
-@if target-libffi
-maybe-installcheck-target-libffi: installcheck-target-libffi
-
-installcheck-target-libffi: \
-    configure-target-libffi 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libffi" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libffi
-
-.PHONY: maybe-mostlyclean-target-libffi mostlyclean-target-libffi
-maybe-mostlyclean-target-libffi:
-@if target-libffi
-maybe-mostlyclean-target-libffi: mostlyclean-target-libffi
-
-mostlyclean-target-libffi: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libffi
-
-.PHONY: maybe-clean-target-libffi clean-target-libffi
-maybe-clean-target-libffi:
-@if target-libffi
-maybe-clean-target-libffi: clean-target-libffi
-
-clean-target-libffi: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libffi" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libffi
-
-.PHONY: maybe-distclean-target-libffi distclean-target-libffi
-maybe-distclean-target-libffi:
-@if target-libffi
-maybe-distclean-target-libffi: distclean-target-libffi
-
-distclean-target-libffi: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libffi" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libffi
-
-.PHONY: maybe-maintainer-clean-target-libffi maintainer-clean-target-libffi
-maybe-maintainer-clean-target-libffi:
-@if target-libffi
-maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi
-
-maintainer-clean-target-libffi: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libffi" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libffi && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libffi
-
-
-
-
+	  true; \
+	fi
 
-.PHONY: configure-target-libjava maybe-configure-target-libjava
-maybe-configure-target-libjava:
-@if target-libjava
-maybe-configure-target-libjava: configure-target-libjava
-configure-target-libjava: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libjava..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libjava/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libjava/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libjava/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libjava/Makefile; \
-	    mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
-	  fi; \
+# This rule is used to build the modules which use TARGET_FLAGS_TO_PASS.
+# To build a target all-X means to cd to X and make all.
+.PHONY: $(ALL_TARGET_MODULES)
+$(ALL_TARGET_MODULES):
+	@dir=`echo $@ | sed -e 's/all-target-//'`; \
+	if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd $(TARGET_SUBDIR)/$${dir}; \
+	    $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \
 	else \
-	  mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libjava; \
-	cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libjava/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libjava"; \
-	libsrcdir="$$s/libjava"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libjava
-
-
-
-
-
-.PHONY: all-target-libjava maybe-all-target-libjava
-maybe-all-target-libjava:
-@if target-libjava
-TARGET-target-libjava=all
-maybe-all-target-libjava: all-target-libjava
-all-target-libjava: configure-target-libjava
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  $(TARGET-target-libjava))
-@endif target-libjava
-
-
-
-
-
-.PHONY: check-target-libjava maybe-check-target-libjava
-maybe-check-target-libjava:
-@if target-libjava
-maybe-check-target-libjava: check-target-libjava
-
-check-target-libjava:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
-
-@endif target-libjava
-
-.PHONY: install-target-libjava maybe-install-target-libjava
-maybe-install-target-libjava:
-@if target-libjava
-maybe-install-target-libjava: install-target-libjava
-
-install-target-libjava: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libjava
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libjava info-target-libjava
-maybe-info-target-libjava:
-@if target-libjava
-maybe-info-target-libjava: info-target-libjava
-
-info-target-libjava: \
-    configure-target-libjava 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libjava" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libjava
-
-.PHONY: maybe-dvi-target-libjava dvi-target-libjava
-maybe-dvi-target-libjava:
-@if target-libjava
-maybe-dvi-target-libjava: dvi-target-libjava
-
-dvi-target-libjava: \
-    configure-target-libjava 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libjava" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libjava
-
-.PHONY: maybe-html-target-libjava html-target-libjava
-maybe-html-target-libjava:
-@if target-libjava
-maybe-html-target-libjava: html-target-libjava
-
-html-target-libjava: \
-    configure-target-libjava 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libjava" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libjava
-
-.PHONY: maybe-TAGS-target-libjava TAGS-target-libjava
-maybe-TAGS-target-libjava:
-@if target-libjava
-maybe-TAGS-target-libjava: TAGS-target-libjava
-
-TAGS-target-libjava: \
-    configure-target-libjava 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libjava" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libjava
-
-.PHONY: maybe-install-info-target-libjava install-info-target-libjava
-maybe-install-info-target-libjava:
-@if target-libjava
-maybe-install-info-target-libjava: install-info-target-libjava
-
-install-info-target-libjava: \
-    configure-target-libjava \
-    info-target-libjava 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libjava" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libjava
-
-.PHONY: maybe-installcheck-target-libjava installcheck-target-libjava
-maybe-installcheck-target-libjava:
-@if target-libjava
-maybe-installcheck-target-libjava: installcheck-target-libjava
-
-installcheck-target-libjava: \
-    configure-target-libjava 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libjava" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libjava
-
-.PHONY: maybe-mostlyclean-target-libjava mostlyclean-target-libjava
-maybe-mostlyclean-target-libjava:
-@if target-libjava
-maybe-mostlyclean-target-libjava: mostlyclean-target-libjava
-
-mostlyclean-target-libjava: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libjava" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libjava
-
-.PHONY: maybe-clean-target-libjava clean-target-libjava
-maybe-clean-target-libjava:
-@if target-libjava
-maybe-clean-target-libjava: clean-target-libjava
-
-clean-target-libjava: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libjava" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libjava
-
-.PHONY: maybe-distclean-target-libjava distclean-target-libjava
-maybe-distclean-target-libjava:
-@if target-libjava
-maybe-distclean-target-libjava: distclean-target-libjava
-
-distclean-target-libjava: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libjava" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libjava
-
-.PHONY: maybe-maintainer-clean-target-libjava maintainer-clean-target-libjava
-maybe-maintainer-clean-target-libjava:
-@if target-libjava
-maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava
-
-maintainer-clean-target-libjava: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libjava" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libjava && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libjava
-
-
-
-
+	  true; \
+	fi
 
-.PHONY: configure-target-zlib maybe-configure-target-zlib
-maybe-configure-target-zlib:
-@if target-zlib
-maybe-configure-target-zlib: configure-target-zlib
-configure-target-zlib: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for zlib..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/zlib/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/zlib/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/zlib/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/zlib/Makefile; \
-	    mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
-	  fi; \
+# This rule is used to check the modules which use TARGET_FLAGS_TO_PASS.
+# To build a target install-X means to cd to X and make install.
+.PHONY: $(CHECK_TARGET_MODULES)
+$(CHECK_TARGET_MODULES):
+	@dir=`echo $@ | sed -e 's/check-target-//'`; \
+	if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd $(TARGET_SUBDIR)/$${dir}; \
+	    $(MAKE) $(TARGET_FLAGS_TO_PASS) check);\
 	else \
-	  mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/zlib; \
-	cd "$(TARGET_SUBDIR)/zlib" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/zlib"; \
-	libsrcdir="$$s/zlib"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-zlib
-
-
-
-
-
-.PHONY: all-target-zlib maybe-all-target-zlib
-maybe-all-target-zlib:
-@if target-zlib
-TARGET-target-zlib=all
-maybe-all-target-zlib: all-target-zlib
-all-target-zlib: configure-target-zlib
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-zlib))
-@endif target-zlib
-
-
-
-
-
-.PHONY: check-target-zlib maybe-check-target-zlib
-maybe-check-target-zlib:
-@if target-zlib
-maybe-check-target-zlib: check-target-zlib
-
-check-target-zlib:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-zlib
-
-.PHONY: install-target-zlib maybe-install-target-zlib
-maybe-install-target-zlib:
-@if target-zlib
-maybe-install-target-zlib: install-target-zlib
-
-install-target-zlib: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-zlib
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-zlib info-target-zlib
-maybe-info-target-zlib:
-@if target-zlib
-maybe-info-target-zlib: info-target-zlib
-
-info-target-zlib: \
-    configure-target-zlib 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/zlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-zlib
-
-.PHONY: maybe-dvi-target-zlib dvi-target-zlib
-maybe-dvi-target-zlib:
-@if target-zlib
-maybe-dvi-target-zlib: dvi-target-zlib
-
-dvi-target-zlib: \
-    configure-target-zlib 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/zlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-zlib
-
-.PHONY: maybe-html-target-zlib html-target-zlib
-maybe-html-target-zlib:
-@if target-zlib
-maybe-html-target-zlib: html-target-zlib
-
-html-target-zlib: \
-    configure-target-zlib 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/zlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-zlib
-
-.PHONY: maybe-TAGS-target-zlib TAGS-target-zlib
-maybe-TAGS-target-zlib:
-@if target-zlib
-maybe-TAGS-target-zlib: TAGS-target-zlib
-
-TAGS-target-zlib: \
-    configure-target-zlib 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/zlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-zlib
-
-.PHONY: maybe-install-info-target-zlib install-info-target-zlib
-maybe-install-info-target-zlib:
-@if target-zlib
-maybe-install-info-target-zlib: install-info-target-zlib
-
-install-info-target-zlib: \
-    configure-target-zlib \
-    info-target-zlib 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/zlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-zlib
-
-.PHONY: maybe-installcheck-target-zlib installcheck-target-zlib
-maybe-installcheck-target-zlib:
-@if target-zlib
-maybe-installcheck-target-zlib: installcheck-target-zlib
-
-installcheck-target-zlib: \
-    configure-target-zlib 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/zlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-zlib
-
-.PHONY: maybe-mostlyclean-target-zlib mostlyclean-target-zlib
-maybe-mostlyclean-target-zlib:
-@if target-zlib
-maybe-mostlyclean-target-zlib: mostlyclean-target-zlib
-
-mostlyclean-target-zlib: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/zlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-zlib
-
-.PHONY: maybe-clean-target-zlib clean-target-zlib
-maybe-clean-target-zlib:
-@if target-zlib
-maybe-clean-target-zlib: clean-target-zlib
-
-clean-target-zlib: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/zlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-zlib
-
-.PHONY: maybe-distclean-target-zlib distclean-target-zlib
-maybe-distclean-target-zlib:
-@if target-zlib
-maybe-distclean-target-zlib: distclean-target-zlib
-
-distclean-target-zlib: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/zlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-zlib
-
-.PHONY: maybe-maintainer-clean-target-zlib maintainer-clean-target-zlib
-maybe-maintainer-clean-target-zlib:
-@if target-zlib
-maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib
-
-maintainer-clean-target-zlib: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/zlib" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/zlib && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-zlib
-
-
-
-
+	  true; \
+	fi
 
-.PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
-maybe-configure-target-boehm-gc:
-@if target-boehm-gc
-maybe-configure-target-boehm-gc: configure-target-boehm-gc
-configure-target-boehm-gc: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for boehm-gc..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/boehm-gc/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/boehm-gc/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile; \
-	    mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
-	  fi; \
+# This rule is used to install the modules which use
+# TARGET_FLAGS_TO_PASS.  To build a target install-X means to cd to X
+# and make install.
+.PHONY: $(INSTALL_TARGET_MODULES)
+$(INSTALL_TARGET_MODULES): installdirs
+	@dir=`echo $@ | sed -e 's/install-target-//'`; \
+	if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd $(TARGET_SUBDIR)/$${dir}; \
+	    $(MAKE) $(TARGET_FLAGS_TO_PASS) install); \
 	else \
-	  mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
-	cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/boehm-gc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/boehm-gc"; \
-	libsrcdir="$$s/boehm-gc"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-boehm-gc
-
-
-
-
-
-.PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
-maybe-all-target-boehm-gc:
-@if target-boehm-gc
-TARGET-target-boehm-gc=all
-maybe-all-target-boehm-gc: all-target-boehm-gc
-all-target-boehm-gc: configure-target-boehm-gc
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-boehm-gc))
-@endif target-boehm-gc
-
-
-
-
-
-.PHONY: check-target-boehm-gc maybe-check-target-boehm-gc
-maybe-check-target-boehm-gc:
-@if target-boehm-gc
-maybe-check-target-boehm-gc: check-target-boehm-gc
-
-check-target-boehm-gc:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-boehm-gc
-
-.PHONY: install-target-boehm-gc maybe-install-target-boehm-gc
-maybe-install-target-boehm-gc:
-@if target-boehm-gc
-maybe-install-target-boehm-gc: install-target-boehm-gc
-
-install-target-boehm-gc: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-boehm-gc
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-boehm-gc info-target-boehm-gc
-maybe-info-target-boehm-gc:
-@if target-boehm-gc
-maybe-info-target-boehm-gc: info-target-boehm-gc
-
-info-target-boehm-gc: \
-    configure-target-boehm-gc 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/boehm-gc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-boehm-gc
-
-.PHONY: maybe-dvi-target-boehm-gc dvi-target-boehm-gc
-maybe-dvi-target-boehm-gc:
-@if target-boehm-gc
-maybe-dvi-target-boehm-gc: dvi-target-boehm-gc
-
-dvi-target-boehm-gc: \
-    configure-target-boehm-gc 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-boehm-gc
-
-.PHONY: maybe-html-target-boehm-gc html-target-boehm-gc
-maybe-html-target-boehm-gc:
-@if target-boehm-gc
-maybe-html-target-boehm-gc: html-target-boehm-gc
-
-html-target-boehm-gc: \
-    configure-target-boehm-gc 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/boehm-gc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-boehm-gc
-
-.PHONY: maybe-TAGS-target-boehm-gc TAGS-target-boehm-gc
-maybe-TAGS-target-boehm-gc:
-@if target-boehm-gc
-maybe-TAGS-target-boehm-gc: TAGS-target-boehm-gc
-
-TAGS-target-boehm-gc: \
-    configure-target-boehm-gc 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-boehm-gc
-
-.PHONY: maybe-install-info-target-boehm-gc install-info-target-boehm-gc
-maybe-install-info-target-boehm-gc:
-@if target-boehm-gc
-maybe-install-info-target-boehm-gc: install-info-target-boehm-gc
-
-install-info-target-boehm-gc: \
-    configure-target-boehm-gc \
-    info-target-boehm-gc 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/boehm-gc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-boehm-gc
-
-.PHONY: maybe-installcheck-target-boehm-gc installcheck-target-boehm-gc
-maybe-installcheck-target-boehm-gc:
-@if target-boehm-gc
-maybe-installcheck-target-boehm-gc: installcheck-target-boehm-gc
-
-installcheck-target-boehm-gc: \
-    configure-target-boehm-gc 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-boehm-gc
-
-.PHONY: maybe-mostlyclean-target-boehm-gc mostlyclean-target-boehm-gc
-maybe-mostlyclean-target-boehm-gc:
-@if target-boehm-gc
-maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc
-
-mostlyclean-target-boehm-gc: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-boehm-gc
-
-.PHONY: maybe-clean-target-boehm-gc clean-target-boehm-gc
-maybe-clean-target-boehm-gc:
-@if target-boehm-gc
-maybe-clean-target-boehm-gc: clean-target-boehm-gc
-
-clean-target-boehm-gc: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-boehm-gc
-
-.PHONY: maybe-distclean-target-boehm-gc distclean-target-boehm-gc
-maybe-distclean-target-boehm-gc:
-@if target-boehm-gc
-maybe-distclean-target-boehm-gc: distclean-target-boehm-gc
-
-distclean-target-boehm-gc: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/boehm-gc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-boehm-gc
-
-.PHONY: maybe-maintainer-clean-target-boehm-gc maintainer-clean-target-boehm-gc
-maybe-maintainer-clean-target-boehm-gc:
-@if target-boehm-gc
-maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc
-
-maintainer-clean-target-boehm-gc: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/boehm-gc" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/boehm-gc && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-boehm-gc
-
-
-
-
+	  true; \
+	fi
 
-.PHONY: configure-target-qthreads maybe-configure-target-qthreads
-maybe-configure-target-qthreads:
-@if target-qthreads
-maybe-configure-target-qthreads: configure-target-qthreads
-configure-target-qthreads: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for qthreads..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/qthreads/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/qthreads/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/qthreads/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/qthreads/Makefile; \
-	    mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \
-	  fi; \
+# This rule is used to build the modules which use X11_FLAGS_TO_PASS.
+# To build a target all-X means to cd to X and make all.
+.PHONY: $(ALL_X11_MODULES)
+$(ALL_X11_MODULES):
+	@dir=`echo $@ | sed -e 's/all-//'`; \
+	if [ -f ./$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd $${dir}; \
+	   $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all); \
 	else \
-	  mv $(TARGET_SUBDIR)/qthreads/multilib.tmp $(TARGET_SUBDIR)/qthreads/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/qthreads; \
-	cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/qthreads/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/qthreads"; \
-	libsrcdir="$$s/qthreads"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-qthreads
-
-
-
-
-
-.PHONY: all-target-qthreads maybe-all-target-qthreads
-maybe-all-target-qthreads:
-@if target-qthreads
-TARGET-target-qthreads=all
-maybe-all-target-qthreads: all-target-qthreads
-all-target-qthreads: configure-target-qthreads
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-qthreads))
-@endif target-qthreads
-
-
-
-
-
-.PHONY: check-target-qthreads maybe-check-target-qthreads
-maybe-check-target-qthreads:
-@if target-qthreads
-maybe-check-target-qthreads: check-target-qthreads
-
-check-target-qthreads:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-qthreads
-
-.PHONY: install-target-qthreads maybe-install-target-qthreads
-maybe-install-target-qthreads:
-@if target-qthreads
-maybe-install-target-qthreads: install-target-qthreads
-
-install-target-qthreads: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-qthreads
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-qthreads info-target-qthreads
-maybe-info-target-qthreads:
-@if target-qthreads
-maybe-info-target-qthreads: info-target-qthreads
-
-info-target-qthreads: \
-    configure-target-qthreads 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/qthreads" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-qthreads
-
-.PHONY: maybe-dvi-target-qthreads dvi-target-qthreads
-maybe-dvi-target-qthreads:
-@if target-qthreads
-maybe-dvi-target-qthreads: dvi-target-qthreads
-
-dvi-target-qthreads: \
-    configure-target-qthreads 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/qthreads" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-qthreads
-
-.PHONY: maybe-html-target-qthreads html-target-qthreads
-maybe-html-target-qthreads:
-@if target-qthreads
-maybe-html-target-qthreads: html-target-qthreads
-
-html-target-qthreads: \
-    configure-target-qthreads 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/qthreads" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-qthreads
-
-.PHONY: maybe-TAGS-target-qthreads TAGS-target-qthreads
-maybe-TAGS-target-qthreads:
-@if target-qthreads
-maybe-TAGS-target-qthreads: TAGS-target-qthreads
-
-TAGS-target-qthreads: \
-    configure-target-qthreads 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/qthreads" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-qthreads
-
-.PHONY: maybe-install-info-target-qthreads install-info-target-qthreads
-maybe-install-info-target-qthreads:
-@if target-qthreads
-maybe-install-info-target-qthreads: install-info-target-qthreads
-
-install-info-target-qthreads: \
-    configure-target-qthreads \
-    info-target-qthreads 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/qthreads" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-qthreads
-
-.PHONY: maybe-installcheck-target-qthreads installcheck-target-qthreads
-maybe-installcheck-target-qthreads:
-@if target-qthreads
-maybe-installcheck-target-qthreads: installcheck-target-qthreads
-
-installcheck-target-qthreads: \
-    configure-target-qthreads 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/qthreads" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-qthreads
-
-.PHONY: maybe-mostlyclean-target-qthreads mostlyclean-target-qthreads
-maybe-mostlyclean-target-qthreads:
-@if target-qthreads
-maybe-mostlyclean-target-qthreads: mostlyclean-target-qthreads
-
-mostlyclean-target-qthreads: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/qthreads" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-qthreads
-
-.PHONY: maybe-clean-target-qthreads clean-target-qthreads
-maybe-clean-target-qthreads:
-@if target-qthreads
-maybe-clean-target-qthreads: clean-target-qthreads
-
-clean-target-qthreads: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/qthreads" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-qthreads
-
-.PHONY: maybe-distclean-target-qthreads distclean-target-qthreads
-maybe-distclean-target-qthreads:
-@if target-qthreads
-maybe-distclean-target-qthreads: distclean-target-qthreads
-
-distclean-target-qthreads: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/qthreads" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-qthreads
-
-.PHONY: maybe-maintainer-clean-target-qthreads maintainer-clean-target-qthreads
-maybe-maintainer-clean-target-qthreads:
-@if target-qthreads
-maybe-maintainer-clean-target-qthreads: maintainer-clean-target-qthreads
-
-maintainer-clean-target-qthreads: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/qthreads" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/qthreads && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-qthreads
-
-
-
-
+	  true; \
+	fi
 
-.PHONY: configure-target-rda maybe-configure-target-rda
-maybe-configure-target-rda:
-@if target-rda
-maybe-configure-target-rda: configure-target-rda
-configure-target-rda: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for rda..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/rda/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/rda/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/rda/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/rda/Makefile; \
-	    mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
-	  fi; \
+# This rule is used to check the modules which use X11_FLAGS_TO_PASS.
+# To build a target check-X means to cd to X and make all.
+.PHONY: $(CHECK_X11_MODULES)
+$(CHECK_X11_MODULES):
+	@dir=`echo $@ | sed -e 's/check-//'`; \
+	if [ -f ./$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd $${dir}; \
+	   $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check); \
 	else \
-	  mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/rda; \
-	cd "$(TARGET_SUBDIR)/rda" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/rda/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/rda"; \
-	libsrcdir="$$s/rda"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-rda
-
-
-
-
-
-.PHONY: all-target-rda maybe-all-target-rda
-maybe-all-target-rda:
-@if target-rda
-TARGET-target-rda=all
-maybe-all-target-rda: all-target-rda
-all-target-rda: configure-target-rda
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-rda))
-@endif target-rda
-
-
-
-
-
-.PHONY: check-target-rda maybe-check-target-rda
-maybe-check-target-rda:
-@if target-rda
-maybe-check-target-rda: check-target-rda
-
-check-target-rda:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-rda
-
-.PHONY: install-target-rda maybe-install-target-rda
-maybe-install-target-rda:
-@if target-rda
-maybe-install-target-rda: install-target-rda
-
-install-target-rda: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-rda
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-rda info-target-rda
-maybe-info-target-rda:
-@if target-rda
-maybe-info-target-rda: info-target-rda
-
-info-target-rda: \
-    configure-target-rda 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/rda" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-rda
-
-.PHONY: maybe-dvi-target-rda dvi-target-rda
-maybe-dvi-target-rda:
-@if target-rda
-maybe-dvi-target-rda: dvi-target-rda
-
-dvi-target-rda: \
-    configure-target-rda 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/rda" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-rda
-
-.PHONY: maybe-html-target-rda html-target-rda
-maybe-html-target-rda:
-@if target-rda
-maybe-html-target-rda: html-target-rda
-
-html-target-rda: \
-    configure-target-rda 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/rda" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-rda
-
-.PHONY: maybe-TAGS-target-rda TAGS-target-rda
-maybe-TAGS-target-rda:
-@if target-rda
-maybe-TAGS-target-rda: TAGS-target-rda
-
-TAGS-target-rda: \
-    configure-target-rda 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/rda" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-rda
-
-.PHONY: maybe-install-info-target-rda install-info-target-rda
-maybe-install-info-target-rda:
-@if target-rda
-maybe-install-info-target-rda: install-info-target-rda
-
-install-info-target-rda: \
-    configure-target-rda \
-    info-target-rda 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/rda" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-rda
-
-.PHONY: maybe-installcheck-target-rda installcheck-target-rda
-maybe-installcheck-target-rda:
-@if target-rda
-maybe-installcheck-target-rda: installcheck-target-rda
-
-installcheck-target-rda: \
-    configure-target-rda 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/rda" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-rda
-
-.PHONY: maybe-mostlyclean-target-rda mostlyclean-target-rda
-maybe-mostlyclean-target-rda:
-@if target-rda
-maybe-mostlyclean-target-rda: mostlyclean-target-rda
-
-mostlyclean-target-rda: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/rda" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-rda
-
-.PHONY: maybe-clean-target-rda clean-target-rda
-maybe-clean-target-rda:
-@if target-rda
-maybe-clean-target-rda: clean-target-rda
-
-clean-target-rda: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/rda" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-rda
-
-.PHONY: maybe-distclean-target-rda distclean-target-rda
-maybe-distclean-target-rda:
-@if target-rda
-maybe-distclean-target-rda: distclean-target-rda
-
-distclean-target-rda: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/rda" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-rda
-
-.PHONY: maybe-maintainer-clean-target-rda maintainer-clean-target-rda
-maybe-maintainer-clean-target-rda:
-@if target-rda
-maybe-maintainer-clean-target-rda: maintainer-clean-target-rda
-
-maintainer-clean-target-rda: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/rda" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/rda && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-rda
-
-
-
-
+	  true; \
+	fi
 
-.PHONY: configure-target-libada maybe-configure-target-libada
-maybe-configure-target-libada:
-@if target-libada
-maybe-configure-target-libada: configure-target-libada
-configure-target-libada: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libada..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libada/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libada/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libada/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libada/Makefile; \
-	    mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
-	  fi; \
+# This rule is used to install the modules which use X11_FLAGS_TO_PASS.
+# To build a target install-X means to cd to X and make install.
+.PHONY: $(INSTALL_X11_MODULES)
+$(INSTALL_X11_MODULES): installdirs
+	@dir=`echo $@ | sed -e 's/install-//'`; \
+	if [ -f ./$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd $${dir}; \
+	   $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install); \
 	else \
-	  mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libada; \
-	cd "$(TARGET_SUBDIR)/libada" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libada/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libada"; \
-	libsrcdir="$$s/libada"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libada
-
-
-
-
-
-.PHONY: all-target-libada maybe-all-target-libada
-maybe-all-target-libada:
-@if target-libada
-TARGET-target-libada=all
-maybe-all-target-libada: all-target-libada
-all-target-libada: configure-target-libada
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libada))
-@endif target-libada
-
-
-
-
-
-.PHONY: check-target-libada maybe-check-target-libada
-maybe-check-target-libada:
-@if target-libada
-maybe-check-target-libada: check-target-libada
-
-check-target-libada:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libada
-
-.PHONY: install-target-libada maybe-install-target-libada
-maybe-install-target-libada:
-@if target-libada
-maybe-install-target-libada: install-target-libada
-
-install-target-libada: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libada
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libada info-target-libada
-maybe-info-target-libada:
-@if target-libada
-maybe-info-target-libada: info-target-libada
-
-info-target-libada: \
-    configure-target-libada 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libada" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libada
-
-.PHONY: maybe-dvi-target-libada dvi-target-libada
-maybe-dvi-target-libada:
-@if target-libada
-maybe-dvi-target-libada: dvi-target-libada
-
-dvi-target-libada: \
-    configure-target-libada 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libada
-
-.PHONY: maybe-html-target-libada html-target-libada
-maybe-html-target-libada:
-@if target-libada
-maybe-html-target-libada: html-target-libada
-
-html-target-libada: \
-    configure-target-libada 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libada" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libada
-
-.PHONY: maybe-TAGS-target-libada TAGS-target-libada
-maybe-TAGS-target-libada:
-@if target-libada
-maybe-TAGS-target-libada: TAGS-target-libada
-
-TAGS-target-libada: \
-    configure-target-libada 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libada
-
-.PHONY: maybe-install-info-target-libada install-info-target-libada
-maybe-install-info-target-libada:
-@if target-libada
-maybe-install-info-target-libada: install-info-target-libada
-
-install-info-target-libada: \
-    configure-target-libada \
-    info-target-libada 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libada" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libada
-
-.PHONY: maybe-installcheck-target-libada installcheck-target-libada
-maybe-installcheck-target-libada:
-@if target-libada
-maybe-installcheck-target-libada: installcheck-target-libada
-
-installcheck-target-libada: \
-    configure-target-libada 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libada
-
-.PHONY: maybe-mostlyclean-target-libada mostlyclean-target-libada
-maybe-mostlyclean-target-libada:
-@if target-libada
-maybe-mostlyclean-target-libada: mostlyclean-target-libada
-
-mostlyclean-target-libada: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libada
-
-.PHONY: maybe-clean-target-libada clean-target-libada
-maybe-clean-target-libada:
-@if target-libada
-maybe-clean-target-libada: clean-target-libada
-
-clean-target-libada: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libada" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libada
-
-.PHONY: maybe-distclean-target-libada distclean-target-libada
-maybe-distclean-target-libada:
-@if target-libada
-maybe-distclean-target-libada: distclean-target-libada
-
-distclean-target-libada: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libada" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libada
-
-.PHONY: maybe-maintainer-clean-target-libada maintainer-clean-target-libada
-maybe-maintainer-clean-target-libada:
-@if target-libada
-maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
-
-maintainer-clean-target-libada: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libada && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libada
-
-
-
-
+	  true; \
+	fi
 
-.PHONY: configure-target-libgomp maybe-configure-target-libgomp
-maybe-configure-target-libgomp:
-@if target-libgomp
-maybe-configure-target-libgomp: configure-target-libgomp
-configure-target-libgomp: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libgomp..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \
-	if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
-	  fi; \
+# gcc is the only module which uses GCC_FLAGS_TO_PASS.
+.PHONY: all-gcc
+all-gcc:
+	@if [ -f ./gcc/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
 	else \
-	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo Configuring in $(TARGET_SUBDIR)/libgomp; \
-	cd "$(TARGET_SUBDIR)/libgomp" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/libgomp"; \
-	libsrcdir="$$s/libgomp"; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif target-libgomp
-
-
-
-
-
-.PHONY: all-target-libgomp maybe-all-target-libgomp
-maybe-all-target-libgomp:
-@if target-libgomp
-TARGET-target-libgomp=all
-maybe-all-target-libgomp: all-target-libgomp
-all-target-libgomp: configure-target-libgomp
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgomp))
-@endif target-libgomp
-
-
-
-
-
-.PHONY: check-target-libgomp maybe-check-target-libgomp
-maybe-check-target-libgomp:
-@if target-libgomp
-maybe-check-target-libgomp: check-target-libgomp
-
-check-target-libgomp:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libgomp
-
-.PHONY: install-target-libgomp maybe-install-target-libgomp
-maybe-install-target-libgomp:
-@if target-libgomp
-maybe-install-target-libgomp: install-target-libgomp
-
-install-target-libgomp: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libgomp
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-target-libgomp info-target-libgomp
-maybe-info-target-libgomp:
-@if target-libgomp
-maybe-info-target-libgomp: info-target-libgomp
-
-info-target-libgomp: \
-    configure-target-libgomp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           info) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-dvi-target-libgomp dvi-target-libgomp
-maybe-dvi-target-libgomp:
-@if target-libgomp
-maybe-dvi-target-libgomp: dvi-target-libgomp
-
-dvi-target-libgomp: \
-    configure-target-libgomp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-html-target-libgomp html-target-libgomp
-maybe-html-target-libgomp:
-@if target-libgomp
-maybe-html-target-libgomp: html-target-libgomp
-
-html-target-libgomp: \
-    configure-target-libgomp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           html) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-TAGS-target-libgomp TAGS-target-libgomp
-maybe-TAGS-target-libgomp:
-@if target-libgomp
-maybe-TAGS-target-libgomp: TAGS-target-libgomp
-
-TAGS-target-libgomp: \
-    configure-target-libgomp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-install-info-target-libgomp install-info-target-libgomp
-maybe-install-info-target-libgomp:
-@if target-libgomp
-maybe-install-info-target-libgomp: install-info-target-libgomp
-
-install-info-target-libgomp: \
-    configure-target-libgomp \
-    info-target-libgomp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-installcheck-target-libgomp installcheck-target-libgomp
-maybe-installcheck-target-libgomp:
-@if target-libgomp
-maybe-installcheck-target-libgomp: installcheck-target-libgomp
-
-installcheck-target-libgomp: \
-    configure-target-libgomp 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-mostlyclean-target-libgomp mostlyclean-target-libgomp
-maybe-mostlyclean-target-libgomp:
-@if target-libgomp
-maybe-mostlyclean-target-libgomp: mostlyclean-target-libgomp
-
-mostlyclean-target-libgomp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-clean-target-libgomp clean-target-libgomp
-maybe-clean-target-libgomp:
-@if target-libgomp
-maybe-clean-target-libgomp: clean-target-libgomp
-
-clean-target-libgomp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-distclean-target-libgomp distclean-target-libgomp
-maybe-distclean-target-libgomp:
-@if target-libgomp
-maybe-distclean-target-libgomp: distclean-target-libgomp
-
-distclean-target-libgomp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libgomp
-
-.PHONY: maybe-maintainer-clean-target-libgomp maintainer-clean-target-libgomp
-maybe-maintainer-clean-target-libgomp:
-@if target-libgomp
-maybe-maintainer-clean-target-libgomp: maintainer-clean-target-libgomp
-
-maintainer-clean-target-libgomp: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgomp" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libgomp && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libgomp
-
-
-
-# ----------
-# GCC module
-# ----------
-
-@if gcc-no-bootstrap
-# GCC has some more recursive targets, which trigger the old
-# (but still current, until the toplevel bootstrap project
-# is finished) compiler bootstrapping rules.
+	  true; \
+	fi
 
-GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
-.PHONY: $(GCC_STRAP_TARGETS)
-$(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
+# Building GCC uses some tools for rebuilding "source" files
+# like texinfo, bison/byacc, etc.  So we must depend on those.
+#
+# While building GCC, it may be necessary to run various target
+# programs like the assembler, linker, etc.  So we depend on
+# those too.
+#
+# In theory, on an SMP all those dependencies can be resolved
+# in parallel.
+#
+.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean
+bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean: all-bootstrap
+	@r=`pwd`; export r; \
+	s=`cd $(srcdir); pwd`; export s; \
+	$(SET_LIB_PATH) \
 	echo "Bootstrapping the compiler"; \
-	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
 	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	@r=`pwd`; export r; \
+	s=`cd $(srcdir); pwd`; export s; \
 	case "$@" in \
 	  *bootstrap4-lean ) \
-	    msg="Comparing stage3 and stage4 of the compiler"; \
-	    compare=compare3-lean ;; \
-	  *bootstrap4 ) \
-	    msg="Comparing stage3 and stage4 of the compiler"; \
-	    compare=compare3 ;; \
-	  *-lean ) \
-	    msg="Comparing stage2 and stage3 of the compiler"; \
-	    compare=compare-lean ;; \
-	  * ) \
-	    msg="Comparing stage2 and stage3 of the compiler"; \
-	    compare=compare ;; \
-	esac; \
-	$(HOST_EXPORTS) \
+			msg="Comparing stage3 and stage4 of the compiler"; \
+	  		compare=compare3-lean ;; \
+	  *bootstrap4 ) msg="Comparing stage3 and stage4 of the compiler"; \
+	  		compare=compare3 ;; \
+	  *-lean )	msg="Comparing stage2 and stage3 of the compiler"; \
+	  		compare=compare-lean ;; \
+	  * )		msg="Comparing stage2 and stage3 of the compiler"; \
+	  		compare=compare ;; \
+	esac; \
+	$(SET_LIB_PATH) \
 	echo "$$msg"; \
 	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-	echo "Building runtime libraries"; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
-
-profiledbootstrap: all-prebootstrap configure-gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-	echo "Bootstrapping training compiler"; \
-	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	echo "Building feedback based compiler"; \
-	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+	@r=`pwd`; export r; \
+	s=`cd $(srcdir); pwd` ; export s; \
+	$(SET_LIB_PATH) \
 	echo "Building runtime libraries"; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+	$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all
 
 .PHONY: cross
-cross: all-build all-gas all-ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
+cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
+	@r=`pwd`; export r; \
+	s=`cd $(srcdir); pwd`; export s; \
+	$(SET_LIB_PATH) \
 	echo "Building the C and C++ compiler"; \
 	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+	@r=`pwd`; export r; \
+	s=`cd $(srcdir); pwd` ; export s; \
+	$(SET_LIB_PATH) \
 	echo "Building runtime libraries"; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
-@endif gcc-no-bootstrap
+	$(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) \
+	  LANGUAGES="c c++" all
 
-@if gcc
-.PHONY: check-gcc-c++
-check-gcc-c++:
+.PHONY: check-gcc
+check-gcc:
 	@if [ -f ./gcc/Makefile ] ; then \
-	  r=`${PWD_COMMAND}`; export r; \
-	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	  $(HOST_EXPORTS) \
-	  (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
 	else \
 	  true; \
 	fi
 
-.PHONY: check-c++
-check-c++: check-target-libstdc++-v3 check-gcc-c++
-
-# Install the gcc headers files, but not the fixed include files,
-# which Cygnus is not allowed to distribute.  This rule is very
-# dependent on the workings of the gcc Makefile.in.
-.PHONY: gcc-no-fixedincludes
-gcc-no-fixedincludes:
-	@if [ -f ./gcc/Makefile ]; then \
-	  rm -rf gcc/tmp-include; \
-	  mv gcc/include gcc/tmp-include 2>/dev/null; \
-	  mkdir gcc/include; \
-	  cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
-	  touch gcc/stmp-fixinc gcc/include/fixed; \
-	  rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
-	  r=`${PWD_COMMAND}`; export r; \
-	  s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-	  $(HOST_EXPORTS) \
-	  (cd ./gcc && \
-	   $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
-	  rm -rf gcc/include; \
-	  mv gcc/tmp-include gcc/include 2>/dev/null; \
-	else true; fi
-@endif gcc
-
-# ---------------------
-# GCC bootstrap support
-# ---------------------
-
-# We track the current stage (the one in 'gcc') in the stage_current file.
-# stage_last instead tracks the stage that was built last.  These targets
-# are dummy when toplevel bootstrap is not active.
-
-# While making host and target tools, symlinks to the final stage must be
-# there, so $(unstage) should be run at various points.  To avoid excessive
-# recursive invocations of make, we "inline" them using a variable.  These
-# must be referenced as ": $(MAKE) ; $(unstage)" rather than "$(unstage)"
-# to avoid warnings from the GNU Make job server.
-
-unstage = :
-stage = :
-current_stage = ""
-
-@if gcc-bootstrap
-unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
-stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
-current_stage = "`cat stage_current 2> /dev/null`"
-@endif gcc-bootstrap
-
-.PHONY: unstage stage
-unstage:
-	@: $(MAKE); $(unstage)
-stage:
-	@: $(MAKE); $(stage)
-
-# Disable commands for lean bootstrap.
-LEAN = false
-
-# We name the build directories for the various stages "stage1-gcc",
-# "stage2-gcc","stage3-gcc", etc.
-
-# Since the 'compare' process will fail (on debugging information) if any
-# directory names are different, we need to link the gcc directory for
-# the previous stage to a constant name ('prev-gcc'), and to make the name of
-# the build directories constant as well. For the latter, we use naked names
-# like 'gcc', because the scripts in that directory assume it.  We use
-# mv on platforms where symlinks to directories do not work or are not
-# reliable.
-
-# 'touch' doesn't work right on some platforms.
-STAMP = echo timestamp > 
-
-# Only build the C compiler for stage1, because that is the only one that
-# we can guarantee will build with the native compiler, and also it is the
-# only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS),
-# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
-# overrideable (for a bootstrap build stage1 also builds gcc.info).
-
-STAGE1_CFLAGS=@stage1_cflags@
-STAGE1_LANGUAGES=@stage1_languages@
-
-# We only want to compare .o files, so set this!
-objext = .o
-
-# Flags to pass to stage2 and later makes.
-POSTSTAGE1_FLAGS_TO_PASS = \
-	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
-	STAGE_PREFIX=$$r/prev-gcc/ \
-	CFLAGS="$(BOOT_CFLAGS)" \
-	LIBCFLAGS="$(BOOT_CFLAGS)" \
-	LDFLAGS="$(BOOT_LDFLAGS)" \
-	ADAC="\$$(CC)"
-
-# For stage 1:
-# * We force-disable intermodule optimizations, even if
-#   --enable-intermodule was passed, since the installed compiler probably
-#   can't handle them.  Luckily, autoconf always respects
-#   the last argument when conflicting --enable arguments are passed.
-# * Likewise, we force-disable coverage flags, since the installed compiler
-#   probably has never heard of them.
-# * We build only C (and possibly Ada).
-
-
-.PHONY: stage1-start stage1-end
-
-stage1-start::
-	@: $(MAKE); $(stage); \
-	echo stage1 > stage_current ; \
-	echo stage1 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-	@cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \
-	  mkdir stage1-bfd; \
-	mv stage1-bfd bfd 
-@endif bfd
-@if opcodes
-	@cd $(HOST_SUBDIR); [ -d stage1-opcodes ] || \
-	  mkdir stage1-opcodes; \
-	mv stage1-opcodes opcodes 
-@endif opcodes
-@if binutils
-	@cd $(HOST_SUBDIR); [ -d stage1-binutils ] || \
-	  mkdir stage1-binutils; \
-	mv stage1-binutils binutils 
-@endif binutils
-@if gas
-	@cd $(HOST_SUBDIR); [ -d stage1-gas ] || \
-	  mkdir stage1-gas; \
-	mv stage1-gas gas 
-@endif gas
-@if gcc
-	@cd $(HOST_SUBDIR); [ -d stage1-gcc ] || \
-	  mkdir stage1-gcc; \
-	mv stage1-gcc gcc 
-@endif gcc
-@if intl
-	@cd $(HOST_SUBDIR); [ -d stage1-intl ] || \
-	  mkdir stage1-intl; \
-	mv stage1-intl intl 
-@endif intl
-@if ld
-	@cd $(HOST_SUBDIR); [ -d stage1-ld ] || \
-	  mkdir stage1-ld; \
-	mv stage1-ld ld 
-@endif ld
-@if libcpp
-	@cd $(HOST_SUBDIR); [ -d stage1-libcpp ] || \
-	  mkdir stage1-libcpp; \
-	mv stage1-libcpp libcpp 
-@endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stage1-libdecnumber ] || \
-	  mkdir stage1-libdecnumber; \
-	mv stage1-libdecnumber libdecnumber 
-@endif libdecnumber
-@if libiberty
-	@cd $(HOST_SUBDIR); [ -d stage1-libiberty ] || \
-	  mkdir stage1-libiberty; \
-	mv stage1-libiberty libiberty 
-@endif libiberty
-@if zlib
-	@cd $(HOST_SUBDIR); [ -d stage1-zlib ] || \
-	  mkdir stage1-zlib; \
-	mv stage1-zlib zlib 
-@endif zlib
-	@[ -d stage1-$(TARGET_SUBDIR) ] || \
-	  mkdir stage1-$(TARGET_SUBDIR); \
-	mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR) 
-
-stage1-end:: 
-@if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stage1-bfd  ; \
-	fi
-@endif bfd
-@if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stage1-opcodes  ; \
-	fi
-@endif opcodes
-@if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stage1-binutils  ; \
-	fi
-@endif binutils
-@if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stage1-gas  ; \
-	fi
-@endif gas
-@if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stage1-gcc  ; \
-	fi
-@endif gcc
-@if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stage1-intl  ; \
-	fi
-@endif intl
-@if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stage1-ld  ; \
-	fi
-@endif ld
-@if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stage1-libcpp  ; \
-	fi
-@endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber  ; \
-	fi
-@endif libdecnumber
-@if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stage1-libiberty  ; \
-	fi
-@endif libiberty
-@if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stage1-zlib  ; \
-	fi
-@endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR)  ; \
-	fi
-	rm -f stage_current
-
-# Bubble a bugfix through all the stages up to stage 1.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
-.PHONY: stage1-bubble
-stage1-bubble:: 
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage1-lean  ; then \
-	  echo Skipping rebuild of stage1 ; \
-	else \
-	  $(MAKE) stage1-start; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
-	fi
-
-.PHONY: all-stage1 clean-stage1
-do-clean: clean-stage1
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-
-.PHONY: distclean-stage1
-distclean-stage1::
-	@: $(MAKE); $(stage)
-	rm -rf stage1-* 
-
-
-@endif gcc-bootstrap
-
-
-.PHONY: stage2-start stage2-end
-
-stage2-start::
-	@: $(MAKE); $(stage); \
-	echo stage2 > stage_current ; \
-	echo stage2 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-	@cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \
-	  mkdir stage2-bfd; \
-	mv stage2-bfd bfd  ; \
-	mv stage1-bfd prev-bfd || test -f stage1-lean 
-@endif bfd
-@if opcodes
-	@cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \
-	  mkdir stage2-opcodes; \
-	mv stage2-opcodes opcodes  ; \
-	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
-@endif opcodes
-@if binutils
-	@cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \
-	  mkdir stage2-binutils; \
-	mv stage2-binutils binutils  ; \
-	mv stage1-binutils prev-binutils || test -f stage1-lean 
-@endif binutils
-@if gas
-	@cd $(HOST_SUBDIR); [ -d stage2-gas ] || \
-	  mkdir stage2-gas; \
-	mv stage2-gas gas  ; \
-	mv stage1-gas prev-gas || test -f stage1-lean 
-@endif gas
-@if gcc
-	@cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \
-	  mkdir stage2-gcc; \
-	mv stage2-gcc gcc  ; \
-	mv stage1-gcc prev-gcc || test -f stage1-lean 
-@endif gcc
-@if intl
-	@cd $(HOST_SUBDIR); [ -d stage2-intl ] || \
-	  mkdir stage2-intl; \
-	mv stage2-intl intl  ; \
-	mv stage1-intl prev-intl || test -f stage1-lean 
-@endif intl
-@if ld
-	@cd $(HOST_SUBDIR); [ -d stage2-ld ] || \
-	  mkdir stage2-ld; \
-	mv stage2-ld ld  ; \
-	mv stage1-ld prev-ld || test -f stage1-lean 
-@endif ld
-@if libcpp
-	@cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \
-	  mkdir stage2-libcpp; \
-	mv stage2-libcpp libcpp  ; \
-	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
-@endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \
-	  mkdir stage2-libdecnumber; \
-	mv stage2-libdecnumber libdecnumber  ; \
-	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
-@endif libdecnumber
-@if libiberty
-	@cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \
-	  mkdir stage2-libiberty; \
-	mv stage2-libiberty libiberty  ; \
-	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
-@endif libiberty
-@if zlib
-	@cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \
-	  mkdir stage2-zlib; \
-	mv stage2-zlib zlib  ; \
-	mv stage1-zlib prev-zlib || test -f stage1-lean 
-@endif zlib
-	@[ -d stage2-$(TARGET_SUBDIR) ] || \
-	  mkdir stage2-$(TARGET_SUBDIR); \
-	mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
-
-stage2-end:: 
-@if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stage2-bfd ; \
-	  mv prev-bfd stage1-bfd ; :  ; \
-	fi
-@endif bfd
-@if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stage2-opcodes ; \
-	  mv prev-opcodes stage1-opcodes ; :  ; \
-	fi
-@endif opcodes
-@if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stage2-binutils ; \
-	  mv prev-binutils stage1-binutils ; :  ; \
-	fi
-@endif binutils
-@if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stage2-gas ; \
-	  mv prev-gas stage1-gas ; :  ; \
-	fi
-@endif gas
-@if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stage2-gcc ; \
-	  mv prev-gcc stage1-gcc ; :  ; \
-	fi
-@endif gcc
-@if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stage2-intl ; \
-	  mv prev-intl stage1-intl ; :  ; \
-	fi
-@endif intl
-@if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stage2-ld ; \
-	  mv prev-ld stage1-ld ; :  ; \
-	fi
-@endif ld
-@if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stage2-libcpp ; \
-	  mv prev-libcpp stage1-libcpp ; :  ; \
-	fi
-@endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber ; \
-	  mv prev-libdecnumber stage1-libdecnumber ; :  ; \
-	fi
-@endif libdecnumber
-@if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stage2-libiberty ; \
-	  mv prev-libiberty stage1-libiberty ; :  ; \
-	fi
-@endif libiberty
-@if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stage2-zlib ; \
-	  mv prev-zlib stage1-zlib ; :  ; \
-	fi
-@endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR)  ; \
-	  mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
-	fi
-	rm -f stage_current
-
-# Bubble a bugfix through all the stages up to stage 2.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
-.PHONY: stage2-bubble
-stage2-bubble:: stage1-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage2-lean || test -f stage1-lean  ; then \
-	  echo Skipping rebuild of stage2 ; \
-	else \
-	  $(MAKE) stage2-start; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \
-	fi
-
-.PHONY: all-stage2 clean-stage2
-do-clean: clean-stage2
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-
-
-.PHONY: bootstrap2 bootstrap2-lean
-bootstrap2:
-	echo stage2 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-bootstrap2-lean:
-	echo stage2 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage2-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage1:: distclean-stage2 
-.PHONY: distclean-stage2
-distclean-stage2::
-	@: $(MAKE); $(stage)
-	rm -rf stage2-* 
-
-
-@endif gcc-bootstrap
-
-
-.PHONY: stage3-start stage3-end
-
-stage3-start::
-	@: $(MAKE); $(stage); \
-	echo stage3 > stage_current ; \
-	echo stage3 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-	@cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \
-	  mkdir stage3-bfd; \
-	mv stage3-bfd bfd  ; \
-	mv stage2-bfd prev-bfd || test -f stage2-lean 
-@endif bfd
-@if opcodes
-	@cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \
-	  mkdir stage3-opcodes; \
-	mv stage3-opcodes opcodes  ; \
-	mv stage2-opcodes prev-opcodes || test -f stage2-lean 
-@endif opcodes
-@if binutils
-	@cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \
-	  mkdir stage3-binutils; \
-	mv stage3-binutils binutils  ; \
-	mv stage2-binutils prev-binutils || test -f stage2-lean 
-@endif binutils
-@if gas
-	@cd $(HOST_SUBDIR); [ -d stage3-gas ] || \
-	  mkdir stage3-gas; \
-	mv stage3-gas gas  ; \
-	mv stage2-gas prev-gas || test -f stage2-lean 
-@endif gas
-@if gcc
-	@cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \
-	  mkdir stage3-gcc; \
-	mv stage3-gcc gcc  ; \
-	mv stage2-gcc prev-gcc || test -f stage2-lean 
-@endif gcc
-@if intl
-	@cd $(HOST_SUBDIR); [ -d stage3-intl ] || \
-	  mkdir stage3-intl; \
-	mv stage3-intl intl  ; \
-	mv stage2-intl prev-intl || test -f stage2-lean 
-@endif intl
-@if ld
-	@cd $(HOST_SUBDIR); [ -d stage3-ld ] || \
-	  mkdir stage3-ld; \
-	mv stage3-ld ld  ; \
-	mv stage2-ld prev-ld || test -f stage2-lean 
-@endif ld
-@if libcpp
-	@cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \
-	  mkdir stage3-libcpp; \
-	mv stage3-libcpp libcpp  ; \
-	mv stage2-libcpp prev-libcpp || test -f stage2-lean 
-@endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stage3-libdecnumber ] || \
-	  mkdir stage3-libdecnumber; \
-	mv stage3-libdecnumber libdecnumber  ; \
-	mv stage2-libdecnumber prev-libdecnumber || test -f stage2-lean 
-@endif libdecnumber
-@if libiberty
-	@cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \
-	  mkdir stage3-libiberty; \
-	mv stage3-libiberty libiberty  ; \
-	mv stage2-libiberty prev-libiberty || test -f stage2-lean 
-@endif libiberty
-@if zlib
-	@cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \
-	  mkdir stage3-zlib; \
-	mv stage3-zlib zlib  ; \
-	mv stage2-zlib prev-zlib || test -f stage2-lean 
-@endif zlib
-	@[ -d stage3-$(TARGET_SUBDIR) ] || \
-	  mkdir stage3-$(TARGET_SUBDIR); \
-	mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-	mv stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage2-lean 
-
-stage3-end:: 
-@if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stage3-bfd ; \
-	  mv prev-bfd stage2-bfd ; :  ; \
-	fi
-@endif bfd
-@if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stage3-opcodes ; \
-	  mv prev-opcodes stage2-opcodes ; :  ; \
-	fi
-@endif opcodes
-@if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stage3-binutils ; \
-	  mv prev-binutils stage2-binutils ; :  ; \
-	fi
-@endif binutils
-@if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stage3-gas ; \
-	  mv prev-gas stage2-gas ; :  ; \
-	fi
-@endif gas
-@if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stage3-gcc ; \
-	  mv prev-gcc stage2-gcc ; :  ; \
-	fi
-@endif gcc
-@if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stage3-intl ; \
-	  mv prev-intl stage2-intl ; :  ; \
-	fi
-@endif intl
-@if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stage3-ld ; \
-	  mv prev-ld stage2-ld ; :  ; \
-	fi
-@endif ld
-@if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stage3-libcpp ; \
-	  mv prev-libcpp stage2-libcpp ; :  ; \
-	fi
-@endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stage3-libdecnumber ; \
-	  mv prev-libdecnumber stage2-libdecnumber ; :  ; \
-	fi
-@endif libdecnumber
-@if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stage3-libiberty ; \
-	  mv prev-libiberty stage2-libiberty ; :  ; \
-	fi
-@endif libiberty
-@if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stage3-zlib ; \
-	  mv prev-zlib stage2-zlib ; :  ; \
-	fi
-@endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR)  ; \
-	  mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; :  ; \
-	fi
-	rm -f stage_current
-
-# Bubble a bugfix through all the stages up to stage 3.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
-.PHONY: stage3-bubble
-stage3-bubble:: stage2-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage3-lean || test -f stage2-lean  ; then \
-	  echo Skipping rebuild of stage3 ; \
-	else \
-	  $(MAKE) stage3-start; \
-	  if $(LEAN); then \
-	    rm -rf stage1-* ; \
-	    $(STAMP) stage1-lean ; \
-	  fi; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \
-	fi
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) compare
-
-.PHONY: all-stage3 clean-stage3
-do-clean: clean-stage3
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-compare:
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage2-lean; then \
-	  echo Cannot compare object files as stage 2 was deleted. ; \
-	  exit 0 ; \
-	fi; \
-	: $(MAKE); $(stage); \
-	rm -f .bad_compare ; \
-	echo Comparing stages 2 and 3 ; \
-	cd stage3-gcc; \
-	files=`find . -name "*$(objext)" -print` ; \
-	cd .. ; \
-	for file in $${files} ; do \
-	  f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \
-	  @do_compare@ > /dev/null 2>&1; \
-	  if test $$? -eq 1; then \
-	    case $$file in \
-	      ./cc*-checksum$(objext) | ./libgcc/* ) \
-	        echo warning: $$file differs ;; \
-	      *) \
-	        echo $$file differs >> .bad_compare ;; \
-	    esac ; \
-	  fi ; \
-	done ; \
-	if [ -f .bad_compare ]; then \
-	  echo "Bootstrap comparison failure!"; \
-	  cat .bad_compare; \
-	  exit 1; \
+.PHONY: install-gcc
+install-gcc:
+	@if [ -f ./gcc/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
 	else \
-	  echo Comparison successful.; \
-	fi ; \
-	$(STAMP) compare
-	if $(LEAN); then \
-	  rm -rf stage2-*; \
-	  $(STAMP) stage2-lean; \
-	fi
-
-
-
-.PHONY: bootstrap bootstrap-lean
-bootstrap:
-	echo stage3 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage3-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-bootstrap-lean:
-	echo stage3 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage3-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage2:: distclean-stage3 
-.PHONY: distclean-stage3
-distclean-stage3::
-	@: $(MAKE); $(stage)
-	rm -rf stage3-* compare 
-
-
-.PHONY: cleanstrap
-cleanstrap: distclean bootstrap
-
-@endif gcc-bootstrap
-
-
-.PHONY: stage4-start stage4-end
-
-stage4-start::
-	@: $(MAKE); $(stage); \
-	echo stage4 > stage_current ; \
-	echo stage4 > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-	@cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \
-	  mkdir stage4-bfd; \
-	mv stage4-bfd bfd  ; \
-	mv stage3-bfd prev-bfd || test -f stage3-lean 
-@endif bfd
-@if opcodes
-	@cd $(HOST_SUBDIR); [ -d stage4-opcodes ] || \
-	  mkdir stage4-opcodes; \
-	mv stage4-opcodes opcodes  ; \
-	mv stage3-opcodes prev-opcodes || test -f stage3-lean 
-@endif opcodes
-@if binutils
-	@cd $(HOST_SUBDIR); [ -d stage4-binutils ] || \
-	  mkdir stage4-binutils; \
-	mv stage4-binutils binutils  ; \
-	mv stage3-binutils prev-binutils || test -f stage3-lean 
-@endif binutils
-@if gas
-	@cd $(HOST_SUBDIR); [ -d stage4-gas ] || \
-	  mkdir stage4-gas; \
-	mv stage4-gas gas  ; \
-	mv stage3-gas prev-gas || test -f stage3-lean 
-@endif gas
-@if gcc
-	@cd $(HOST_SUBDIR); [ -d stage4-gcc ] || \
-	  mkdir stage4-gcc; \
-	mv stage4-gcc gcc  ; \
-	mv stage3-gcc prev-gcc || test -f stage3-lean 
-@endif gcc
-@if intl
-	@cd $(HOST_SUBDIR); [ -d stage4-intl ] || \
-	  mkdir stage4-intl; \
-	mv stage4-intl intl  ; \
-	mv stage3-intl prev-intl || test -f stage3-lean 
-@endif intl
-@if ld
-	@cd $(HOST_SUBDIR); [ -d stage4-ld ] || \
-	  mkdir stage4-ld; \
-	mv stage4-ld ld  ; \
-	mv stage3-ld prev-ld || test -f stage3-lean 
-@endif ld
-@if libcpp
-	@cd $(HOST_SUBDIR); [ -d stage4-libcpp ] || \
-	  mkdir stage4-libcpp; \
-	mv stage4-libcpp libcpp  ; \
-	mv stage3-libcpp prev-libcpp || test -f stage3-lean 
-@endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stage4-libdecnumber ] || \
-	  mkdir stage4-libdecnumber; \
-	mv stage4-libdecnumber libdecnumber  ; \
-	mv stage3-libdecnumber prev-libdecnumber || test -f stage3-lean 
-@endif libdecnumber
-@if libiberty
-	@cd $(HOST_SUBDIR); [ -d stage4-libiberty ] || \
-	  mkdir stage4-libiberty; \
-	mv stage4-libiberty libiberty  ; \
-	mv stage3-libiberty prev-libiberty || test -f stage3-lean 
-@endif libiberty
-@if zlib
-	@cd $(HOST_SUBDIR); [ -d stage4-zlib ] || \
-	  mkdir stage4-zlib; \
-	mv stage4-zlib zlib  ; \
-	mv stage3-zlib prev-zlib || test -f stage3-lean 
-@endif zlib
-	@[ -d stage4-$(TARGET_SUBDIR) ] || \
-	  mkdir stage4-$(TARGET_SUBDIR); \
-	mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-	mv stage3-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage3-lean 
-
-stage4-end:: 
-@if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stage4-bfd ; \
-	  mv prev-bfd stage3-bfd ; :  ; \
-	fi
-@endif bfd
-@if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stage4-opcodes ; \
-	  mv prev-opcodes stage3-opcodes ; :  ; \
-	fi
-@endif opcodes
-@if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stage4-binutils ; \
-	  mv prev-binutils stage3-binutils ; :  ; \
-	fi
-@endif binutils
-@if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stage4-gas ; \
-	  mv prev-gas stage3-gas ; :  ; \
-	fi
-@endif gas
-@if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stage4-gcc ; \
-	  mv prev-gcc stage3-gcc ; :  ; \
-	fi
-@endif gcc
-@if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stage4-intl ; \
-	  mv prev-intl stage3-intl ; :  ; \
-	fi
-@endif intl
-@if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stage4-ld ; \
-	  mv prev-ld stage3-ld ; :  ; \
-	fi
-@endif ld
-@if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stage4-libcpp ; \
-	  mv prev-libcpp stage3-libcpp ; :  ; \
-	fi
-@endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stage4-libdecnumber ; \
-	  mv prev-libdecnumber stage3-libdecnumber ; :  ; \
-	fi
-@endif libdecnumber
-@if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stage4-libiberty ; \
-	  mv prev-libiberty stage3-libiberty ; :  ; \
-	fi
-@endif libiberty
-@if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stage4-zlib ; \
-	  mv prev-zlib stage3-zlib ; :  ; \
-	fi
-@endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR)  ; \
-	  mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; :  ; \
+	  true; \
 	fi
-	rm -f stage_current
 
-# Bubble a bugfix through all the stages up to stage 4.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
-.PHONY: stage4-bubble
-stage4-bubble:: stage3-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage4-lean || test -f stage3-lean  ; then \
-	  echo Skipping rebuild of stage4 ; \
+.PHONY: install-gcc-cross
+install-gcc-cross:
+	@if [ -f ./gcc/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" install); \
 	else \
-	  $(MAKE) stage4-start; \
-	  if $(LEAN); then \
-	    rm -rf stage2-* ; \
-	    $(STAMP) stage2-lean ; \
-	  fi; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
+	  true; \
 	fi
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3
-
-.PHONY: all-stage4 clean-stage4
-do-clean: clean-stage4
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-compare3:
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage3-lean; then \
-	  echo Cannot compare object files as stage 3 was deleted. ; \
-	  exit 0 ; \
-	fi; \
-	: $(MAKE); $(stage); \
-	rm -f .bad_compare ; \
-	echo Comparing stages 3 and 4 ; \
-	cd stage4-gcc; \
-	files=`find . -name "*$(objext)" -print` ; \
-	cd .. ; \
-	for file in $${files} ; do \
-	  f1=$$r/stage3-gcc/$$file; f2=$$r/stage4-gcc/$$file; \
-	  @do_compare@ > /dev/null 2>&1; \
-	  if test $$? -eq 1; then \
-	    case $$file in \
-	      ./cc*-checksum$(objext) | ./libgcc/* ) \
-	        echo warning: $$file differs ;; \
-	      *) \
-	        echo $$file differs >> .bad_compare ;; \
-	    esac ; \
-	  fi ; \
-	done ; \
-	if [ -f .bad_compare ]; then \
-	  echo "Bootstrap comparison failure!"; \
-	  cat .bad_compare; \
-	  exit 1; \
+# EXPERIMENTAL STUFF
+# This rule is used to install the modules which use FLAGS_TO_PASS.
+# To build a target install-X means to cd to X and make install.
+.PHONY: install-dosrel
+install-dosrel: installdirs info
+	@dir=`echo $@ | sed -e 's/install-//'`; \
+	if [ -f ./$${dir}/Makefile ] ; then \
+	  r=`pwd`; export r; \
+	  s=`cd $(srcdir); pwd`; export s; \
+	  $(SET_LIB_PATH) \
+	  (cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
 	else \
-	  echo Comparison successful.; \
-	fi ; \
-	$(STAMP) compare3
-	if $(LEAN); then \
-	  rm -rf stage3-*; \
-	  $(STAMP) stage3-lean; \
+	  true; \
 	fi
 
+install-dosrel-fake:
 
+ALL_GCC = all-gcc
+ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss
+ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++ all-target-libstdc++-v3
 
-.PHONY: bootstrap4 bootstrap4-lean
-bootstrap4:
-	echo stage4 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage4-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-bootstrap4-lean:
-	echo stage4 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage4-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage3:: distclean-stage4 
-.PHONY: distclean-stage4
-distclean-stage4::
-	@: $(MAKE); $(stage)
-	rm -rf stage4-* compare3 
-
-
-@endif gcc-bootstrap
-
+# This is a list of inter-dependencies among modules.
+all-apache:
+all-ash:
+all-autoconf: all-m4 all-texinfo
+all-automake: all-m4 all-texinfo
+all-bash:
+all-bfd: all-libiberty all-intl
+all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc all-intl
+all-bison: all-texinfo
+configure-target-boehm-gc: $(ALL_GCC_CXX) configure-target-qthreads
+all-target-boehm-gc: configure-target-boehm-gc
+configure-target-bsp: $(ALL_GCC_C)
+all-target-bsp: configure-target-bsp
+all-byacc:
+all-bzip2:
+all-cgen: all-libiberty
+all-cvssrc:
+configure-target-cygmon: $(ALL_GCC_C)
+all-target-cygmon: configure-target-cygmon all-target-libiberty all-target-libio all-target-libstub all-target-bsp
+all-db:
+all-dejagnu: all-tcl all-expect all-tk
+all-diff: all-libiberty
+all-emacs:
+all-emacs19: all-bison all-byacc
+all-etc:
+configure-target-examples: $(ALL_GCC_C)
+all-target-examples: configure-target-examples
+all-expect: all-tcl all-tk
+all-fileutils: all-libiberty
+all-findutils:
+all-find:
+all-flex: all-libiberty all-bison all-byacc
+all-gas: all-libiberty all-opcodes all-bfd all-intl
+all-gash: all-tcl
+all-gawk:
+all-gcc: all-bison all-byacc all-binutils all-gas all-ld all-zlib
+all-bootstrap: all-libiberty all-texinfo all-bison all-byacc all-binutils all-gas all-ld all-zlib
+GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
+all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
+all-gettext:
+all-gnuserv:
+configure-target-gperf: $(ALL_GCC_CXX)
+all-target-gperf: configure-target-gperf all-target-libiberty all-target-libstdc++-v3
+all-gprof: all-libiberty all-bfd all-opcodes all-intl
+all-grep: all-libiberty
+all-grez: all-libiberty all-bfd all-opcodes
+all-gui: all-gdb all-libproc all-target-librx
+all-guile:
+all-gzip: all-libiberty
+all-hello: all-libiberty
+all-indent:
+all-inet: all-tcl all-send-pr all-perl
+all-intl:
+all-ispell: all-emacs19
+all-itcl: all-tcl all-tk all-tcl8.1 all-tk8.1
+all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex all-intl
+configure-target-libg++: $(ALL_GCC_CXX) configure-target-librx
+all-target-libg++: configure-target-libg++ all-target-libiberty all-target-librx
+configure-target-libgloss: $(ALL_GCC)
+all-target-libgloss: configure-target-libgloss configure-target-newlib
+configure-target-libio: $(ALL_GCC_C)
+all-target-libio: configure-target-libio all-gas all-ld all-gcc all-target-libiberty all-target-newlib
+check-target-libio: all-target-libstdc++
+all-libgui: all-tcl all-tk all-tcl8.1 all-tk8.1 all-itcl
+all-libiberty:
 
-.PHONY: stageprofile-start stageprofile-end
+all-build-libiberty: configure-build-libiberty
 
-stageprofile-start::
-	@: $(MAKE); $(stage); \
-	echo stageprofile > stage_current ; \
-	echo stageprofile > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-	@cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \
-	  mkdir stageprofile-bfd; \
-	mv stageprofile-bfd bfd  ; \
-	mv stage1-bfd prev-bfd || test -f stage1-lean 
-@endif bfd
-@if opcodes
-	@cd $(HOST_SUBDIR); [ -d stageprofile-opcodes ] || \
-	  mkdir stageprofile-opcodes; \
-	mv stageprofile-opcodes opcodes  ; \
-	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
-@endif opcodes
-@if binutils
-	@cd $(HOST_SUBDIR); [ -d stageprofile-binutils ] || \
-	  mkdir stageprofile-binutils; \
-	mv stageprofile-binutils binutils  ; \
-	mv stage1-binutils prev-binutils || test -f stage1-lean 
-@endif binutils
-@if gas
-	@cd $(HOST_SUBDIR); [ -d stageprofile-gas ] || \
-	  mkdir stageprofile-gas; \
-	mv stageprofile-gas gas  ; \
-	mv stage1-gas prev-gas || test -f stage1-lean 
-@endif gas
-@if gcc
-	@cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \
-	  mkdir stageprofile-gcc; \
-	mv stageprofile-gcc gcc  ; \
-	mv stage1-gcc prev-gcc || test -f stage1-lean 
-@endif gcc
-@if intl
-	@cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \
-	  mkdir stageprofile-intl; \
-	mv stageprofile-intl intl  ; \
-	mv stage1-intl prev-intl || test -f stage1-lean 
-@endif intl
-@if ld
-	@cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \
-	  mkdir stageprofile-ld; \
-	mv stageprofile-ld ld  ; \
-	mv stage1-ld prev-ld || test -f stage1-lean 
-@endif ld
-@if libcpp
-	@cd $(HOST_SUBDIR); [ -d stageprofile-libcpp ] || \
-	  mkdir stageprofile-libcpp; \
-	mv stageprofile-libcpp libcpp  ; \
-	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
-@endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stageprofile-libdecnumber ] || \
-	  mkdir stageprofile-libdecnumber; \
-	mv stageprofile-libdecnumber libdecnumber  ; \
-	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
-@endif libdecnumber
-@if libiberty
-	@cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \
-	  mkdir stageprofile-libiberty; \
-	mv stageprofile-libiberty libiberty  ; \
-	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
-@endif libiberty
-@if zlib
-	@cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \
-	  mkdir stageprofile-zlib; \
-	mv stageprofile-zlib zlib  ; \
-	mv stage1-zlib prev-zlib || test -f stage1-lean 
-@endif zlib
-	@[ -d stageprofile-$(TARGET_SUBDIR) ] || \
-	  mkdir stageprofile-$(TARGET_SUBDIR); \
-	mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
+configure-target-libffi: $(ALL_GCC_C) 
+all-target-libffi: configure-target-libffi
+configure-target-libjava: $(ALL_GCC_CXX) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi
+all-target-libjava: configure-target-libjava all-zip all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi
+configure-target-librx: $(ALL_GCC_C)
+all-target-librx: configure-target-librx
+configure-target-libstdc++: $(ALL_GCC_C)
+all-target-libstdc++: configure-target-libstdc++ all-target-libiberty all-target-libio
+configure-target-libstdc++-v3: $(ALL_GCC_C)
+all-target-libstdc++-v3: configure-target-libstdc++-v3 all-target-libiberty
+configure-target-libstub: $(ALL_GCC_C)
+all-target-libstub: configure-target-libstub
+all-libtool:
+configure-target-libf2c: $(ALL_GCC_C)
+all-target-libf2c: configure-target-libf2c all-target-libiberty
+configure-target-libchill: $(ALL_GCC_C)
+all-target-libchill: configure-target-libchill all-target-libiberty
+configure-target-libobjc: $(ALL_GCC_C)
+all-target-libobjc: configure-target-libobjc all-target-libiberty
+all-m4: all-libiberty all-texinfo
+all-make: all-libiberty
+all-mmalloc:
+configure-target-newlib: $(ALL_GCC)
+all-target-newlib: configure-target-newlib
+configure-target-libtermcap: $(ALL_GCC_C)
+all-target-libtermcap: configure-target-libtermcap
+all-opcodes: all-bfd all-libiberty all-cgen
+all-patch: all-libiberty
+all-perl:
+all-prms: all-libiberty
+configure-target-qthreads: $(ALL_GCC_C)
+all-target-qthreads: configure-target-qthreads
+all-rcs:
+all-readline:
+all-recode: all-libiberty
+all-sed: all-libiberty
+all-send-pr: all-prms
+all-shellutils:
+all-sid: all-tcl all-tk
+all-sim: all-libiberty all-bfd all-opcodes all-readline all-cgen
+all-snavigator: all-tcl all-tk all-itcl all-db all-grep all-libgui
+all-tar: all-libiberty
+all-tcl:
+all-tcl8.1:
+all-tclX: all-tcl all-tk
+all-tk: all-tcl
+all-tk8.1: all-tcl8.1
+all-texinfo: all-libiberty
+all-textutils:
+all-tgas: all-libiberty all-bfd all-opcodes
+all-time:
+all-tix: all-tcl all-tk all-tcl8.1 all-tk8.1
+all-wdiff:
+configure-target-winsup: $(ALL_GCC_C)
+all-target-winsup: all-target-libiberty all-target-libtermcap configure-target-winsup
+all-uudecode: all-libiberty
+all-zip:
+all-zlib:
+configure-target-zlib: $(ALL_GCC_C)
+all-target-zlib: configure-target-zlib
+configure-target-libiberty: $(ALL_GCC_C)
+all-target-libiberty: configure-target-libiberty
+all-target: $(ALL_TARGET_MODULES)
+install-target: $(INSTALL_TARGET_MODULES)
+install-gdb: install-tcl install-tk install-itcl install-tix install-libgui
+install-sid: install-tcl install-tk
+### other supporting targets
 
-stageprofile-end:: 
-@if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stageprofile-bfd ; \
-	  mv prev-bfd stage1-bfd ; :  ; \
-	fi
-@endif bfd
-@if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stageprofile-opcodes ; \
-	  mv prev-opcodes stage1-opcodes ; :  ; \
-	fi
-@endif opcodes
-@if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stageprofile-binutils ; \
-	  mv prev-binutils stage1-binutils ; :  ; \
-	fi
-@endif binutils
-@if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stageprofile-gas ; \
-	  mv prev-gas stage1-gas ; :  ; \
-	fi
-@endif gas
-@if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stageprofile-gcc ; \
-	  mv prev-gcc stage1-gcc ; :  ; \
-	fi
-@endif gcc
-@if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stageprofile-intl ; \
-	  mv prev-intl stage1-intl ; :  ; \
-	fi
-@endif intl
-@if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stageprofile-ld ; \
-	  mv prev-ld stage1-ld ; :  ; \
-	fi
-@endif ld
-@if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stageprofile-libcpp ; \
-	  mv prev-libcpp stage1-libcpp ; :  ; \
-	fi
-@endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stageprofile-libdecnumber ; \
-	  mv prev-libdecnumber stage1-libdecnumber ; :  ; \
-	fi
-@endif libdecnumber
-@if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stageprofile-libiberty ; \
-	  mv prev-libiberty stage1-libiberty ; :  ; \
-	fi
-@endif libiberty
-@if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stageprofile-zlib ; \
-	  mv prev-zlib stage1-zlib ; :  ; \
-	fi
-@endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR)  ; \
-	  mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; :  ; \
-	fi
-	rm -f stage_current
+MAKEDIRS= \
+	$(prefix) \
+	$(exec_prefix)
+.PHONY: installdirs
+installdirs: mkinstalldirs
+	$(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
 
-# Bubble a bugfix through all the stages up to stage profile.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
-.PHONY: stageprofile-bubble
-stageprofile-bubble:: stage1-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stageprofile-lean || test -f stage1-lean  ; then \
-	  echo Skipping rebuild of stageprofile ; \
-	else \
-	  $(MAKE) stageprofile-start; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile; \
+dir.info: do-install-info
+	if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
+	  $(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
+	  mv -f dir.info.new dir.info ; \
+	else true ; \
 	fi
 
-.PHONY: all-stageprofile clean-stageprofile
-do-clean: clean-stageprofile
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage1:: distclean-stageprofile 
-.PHONY: distclean-stageprofile
-distclean-stageprofile::
-	@: $(MAKE); $(stage)
-	rm -rf stageprofile-* 
-
-
-@endif gcc-bootstrap
+dist:
+	@echo "Building a full distribution of this tree isn't done"
+	@echo "via 'make dist'.  Check out the etc/ subdirectory" 
 
+etags tags: TAGS
 
-.PHONY: stagefeedback-start stagefeedback-end
+# Right now this just builds TAGS in each subdirectory.  emacs19 has the
+# ability to use several tags files at once, so there is probably no need
+# to combine them into one big TAGS file (like CVS 1.3 does).  We could
+# (if we felt like it) have this Makefile write a piece of elisp which
+# the user could load to tell emacs19 where all the TAGS files we just
+# built are.
+TAGS: do-TAGS
 
-stagefeedback-start::
-	@: $(MAKE); $(stage); \
-	echo stagefeedback > stage_current ; \
-	echo stagefeedback > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \
-	  mkdir stagefeedback-bfd; \
-	mv stagefeedback-bfd bfd  ; \
-	mv stageprofile-bfd prev-bfd || test -f stageprofile-lean 
-@endif bfd
-@if opcodes
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-opcodes ] || \
-	  mkdir stagefeedback-opcodes; \
-	mv stagefeedback-opcodes opcodes  ; \
-	mv stageprofile-opcodes prev-opcodes || test -f stageprofile-lean 
-@endif opcodes
-@if binutils
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-binutils ] || \
-	  mkdir stagefeedback-binutils; \
-	mv stagefeedback-binutils binutils  ; \
-	mv stageprofile-binutils prev-binutils || test -f stageprofile-lean 
-@endif binutils
-@if gas
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \
-	  mkdir stagefeedback-gas; \
-	mv stagefeedback-gas gas  ; \
-	mv stageprofile-gas prev-gas || test -f stageprofile-lean 
-@endif gas
-@if gcc
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \
-	  mkdir stagefeedback-gcc; \
-	mv stagefeedback-gcc gcc  ; \
-	mv stageprofile-gcc prev-gcc || test -f stageprofile-lean 
-@endif gcc
-@if intl
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \
-	  mkdir stagefeedback-intl; \
-	mv stagefeedback-intl intl  ; \
-	mv stageprofile-intl prev-intl || test -f stageprofile-lean 
-@endif intl
-@if ld
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \
-	  mkdir stagefeedback-ld; \
-	mv stagefeedback-ld ld  ; \
-	mv stageprofile-ld prev-ld || test -f stageprofile-lean 
-@endif ld
-@if libcpp
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \
-	  mkdir stagefeedback-libcpp; \
-	mv stagefeedback-libcpp libcpp  ; \
-	mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean 
-@endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-libdecnumber ] || \
-	  mkdir stagefeedback-libdecnumber; \
-	mv stagefeedback-libdecnumber libdecnumber  ; \
-	mv stageprofile-libdecnumber prev-libdecnumber || test -f stageprofile-lean 
-@endif libdecnumber
-@if libiberty
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \
-	  mkdir stagefeedback-libiberty; \
-	mv stagefeedback-libiberty libiberty  ; \
-	mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean 
-@endif libiberty
-@if zlib
-	@cd $(HOST_SUBDIR); [ -d stagefeedback-zlib ] || \
-	  mkdir stagefeedback-zlib; \
-	mv stagefeedback-zlib zlib  ; \
-	mv stageprofile-zlib prev-zlib || test -f stageprofile-lean 
-@endif zlib
-	@[ -d stagefeedback-$(TARGET_SUBDIR) ] || \
-	  mkdir stagefeedback-$(TARGET_SUBDIR); \
-	mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR)  ; \
-	mv stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageprofile-lean 
+# with the gnu make, this is done automatically.
 
-stagefeedback-end:: 
-@if bfd
-	@if test -d $(HOST_SUBDIR)/bfd ; then \
-	  cd $(HOST_SUBDIR); mv bfd stagefeedback-bfd ; \
-	  mv prev-bfd stageprofile-bfd ; :  ; \
-	fi
-@endif bfd
-@if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes ; then \
-	  cd $(HOST_SUBDIR); mv opcodes stagefeedback-opcodes ; \
-	  mv prev-opcodes stageprofile-opcodes ; :  ; \
-	fi
-@endif opcodes
-@if binutils
-	@if test -d $(HOST_SUBDIR)/binutils ; then \
-	  cd $(HOST_SUBDIR); mv binutils stagefeedback-binutils ; \
-	  mv prev-binutils stageprofile-binutils ; :  ; \
-	fi
-@endif binutils
-@if gas
-	@if test -d $(HOST_SUBDIR)/gas ; then \
-	  cd $(HOST_SUBDIR); mv gas stagefeedback-gas ; \
-	  mv prev-gas stageprofile-gas ; :  ; \
-	fi
-@endif gas
-@if gcc
-	@if test -d $(HOST_SUBDIR)/gcc ; then \
-	  cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc ; \
-	  mv prev-gcc stageprofile-gcc ; :  ; \
-	fi
-@endif gcc
-@if intl
-	@if test -d $(HOST_SUBDIR)/intl ; then \
-	  cd $(HOST_SUBDIR); mv intl stagefeedback-intl ; \
-	  mv prev-intl stageprofile-intl ; :  ; \
-	fi
-@endif intl
-@if ld
-	@if test -d $(HOST_SUBDIR)/ld ; then \
-	  cd $(HOST_SUBDIR); mv ld stagefeedback-ld ; \
-	  mv prev-ld stageprofile-ld ; :  ; \
-	fi
-@endif ld
-@if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp ; then \
-	  cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp ; \
-	  mv prev-libcpp stageprofile-libcpp ; :  ; \
-	fi
-@endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber ; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber ; \
-	  mv prev-libdecnumber stageprofile-libdecnumber ; :  ; \
-	fi
-@endif libdecnumber
-@if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty ; then \
-	  cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty ; \
-	  mv prev-libiberty stageprofile-libiberty ; :  ; \
-	fi
-@endif libiberty
-@if zlib
-	@if test -d $(HOST_SUBDIR)/zlib ; then \
-	  cd $(HOST_SUBDIR); mv zlib stagefeedback-zlib ; \
-	  mv prev-zlib stageprofile-zlib ; :  ; \
-	fi
-@endif zlib
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR)  ; \
-	  mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; :  ; \
-	fi
-	rm -f stage_current
+Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag) $(gcc_version_trigger)
+	$(SHELL) ./config.status
 
-# Bubble a bugfix through all the stages up to stage feedback.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
-.PHONY: stagefeedback-bubble
-stagefeedback-bubble:: stageprofile-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stagefeedback-lean || test -f stageprofile-lean  ; then \
-	  echo Skipping rebuild of stagefeedback ; \
+#
+# Support for building net releases
+
+# Files in devo used in any net release.
+# ChangeLog omitted because it may refer to files which are not in this
+# distribution (perhaps it would be better to include it anyway).
+DEVO_SUPPORT= README Makefile.in configure configure.in \
+	config.guess config.if config.sub config move-if-change \
+	mpw-README mpw-build.in mpw-config.in mpw-configure mpw-install \
+	COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
+	mkinstalldirs ltconfig ltmain.sh missing ylwrap \
+	libtool.m4 gettext.m4 ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh
+
+# Files in devo/etc used in any net release.
+# ChangeLog omitted because it may refer to files which are not in this
+# distribution (perhaps it would be better to include it anyway).
+ETC_SUPPORT= Makefile.in configure configure.in standards.texi \
+	make-stds.texi standards.info* configure.texi configure.info* \
+	configbuild.* configdev.*
+
+
+# When you use `make setup-dirs' or `make taz' you should always redefine
+# this macro.
+SUPPORT_FILES = list-of-support-files-for-tool-in-question
+
+# NOTE: No double quotes in the below.  It is used within shell script
+# as VER="$(VER)"
+VER = `	if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null 2>&1; then \
+	  sed < bfd/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
+	elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
+	  sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
+	elif test -f $(TOOL)/version.in; then \
+	  head -1 $(TOOL)/version.in; \
+	elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \
+	  sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \
 	else \
-	  $(MAKE) stagefeedback-start; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback; \
-	fi
-
-.PHONY: all-stagefeedback clean-stagefeedback
-do-clean: clean-stagefeedback
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-
-
-
-.PHONY: profiledbootstrap profiledbootstrap-lean
-profiledbootstrap:
-	echo stagefeedback > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stagefeedback-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-profiledbootstrap-lean:
-	echo stagefeedback > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stagefeedback-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stageprofile:: distclean-stagefeedback 
-.PHONY: distclean-stagefeedback
-distclean-stagefeedback::
-	@: $(MAKE); $(stage)
-	rm -rf stagefeedback-* 
-
-
-@endif gcc-bootstrap
-
-
-
-stageprofile-end::
-	$(MAKE) distclean-stagefeedback
-
-stagefeedback-start::
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	for i in prev-*; do \
-	  j=`echo $$i | sed s/^prev-//` ; \
-	  cd $$r/$$i && \
-	  { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL) ; } && \
-	  { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL) ; } ; \
+	  echo VERSION; \
+	fi`
+PACKAGE = $(TOOL)
+
+.PHONY: taz
+taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+	$(MAKE) -f Makefile.in do-proto-toplev \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+	$(MAKE) -f Makefile.in do-md5sum \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+	$(MAKE) -f Makefile.in do-tar-bz2 \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+
+.PHONY: gdb-taz
+gdb-taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+	$(MAKE) -f Makefile.in do-proto-toplev \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+	$(MAKE) -f Makefile.in do-md5sum \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+	$(MAKE) -f Makefile.in do-djunpack \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+	$(MAKE) -f Makefile.in do-tar-bz2 \
+		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(SUPPORT_FILES)"
+
+.PHONY: do-proto-toplev
+do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
+	echo "==> Making $(PACKAGE)-$(VER)/"
+	# Take out texinfo from a few places.
+	sed -e '/^all\.normal: /s/\all-texinfo //' \
+	    -e '/^	install-texinfo /d' \
+	<Makefile.in >tmp
+	mv -f tmp Makefile.in
+	#
+	./configure sun4
+	[ -z "$(CONFIGURE_TARGET_MODULES)" ] \
+	  || $(MAKE) $(CONFIGURE_TARGET_MODULES) \
+	    ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
+	    CC_FOR_TARGET="$(CC)" CXX_FOR_TARGET="$(CXX)"
+	# Make links, and run "make diststuff" or "make info" when needed.
+	rm -rf proto-toplev ; mkdir proto-toplev
+	set -e ; dirs="$(TOOL) $(DEVO_SUPPORT) $(SUPPORT_FILES)" ; \
+	for d in $$dirs ; do \
+	  if [ -d $$d ]; then \
+	    if [ ! -f $$d/Makefile ] ; then true ; \
+	    elif grep '^diststuff:' $$d/Makefile >/dev/null ; then \
+		(cd $$d ; $(MAKE) diststuff ) || exit 1 ; \
+	    elif grep '^info:' $$d/Makefile >/dev/null ; then \
+	        (cd $$d ; $(MAKE) info ) || exit 1 ; \
+	    fi ; \
+	    if [ -d $$d/proto-$$d.dir ]; then \
+	      ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ; \
+	    else \
+	      ln -s ../$$d proto-toplev/$$d ; \
+	    fi ; \
+	  else ln -s ../$$d proto-toplev/$$d ; fi ; \
 	done
+	cd etc && $(MAKE) info
+	$(MAKE) distclean
+	#
+	mkdir proto-toplev/etc
+	(cd proto-toplev/etc; \
+	 for i in $(ETC_SUPPORT); do \
+		ln -s ../../etc/$$i . ; \
+	 done)
+	#
+	# Take out texinfo from configurable dirs
+	rm proto-toplev/configure.in
+	sed -e '/^host_tools=/s/texinfo //' \
+	    <configure.in >proto-toplev/configure.in
+	#
+	mkdir proto-toplev/texinfo
+	ln -s ../../texinfo/texinfo.tex		proto-toplev/texinfo/
+	if test -r texinfo/util/tex3patch ; then \
+	  mkdir proto-toplev/texinfo/util && \
+	  ln -s ../../../texinfo/util/tex3patch	proto-toplev/texinfo/util ; \
+	else true; fi
+	chmod -R og=u . || chmod og=u `find . -print`
+	#
+	# Create .gmo files from .po files.
+	for f in `find . -name '*.po' -type f -print`; do \
+	     msgfmt -o `echo $$f | sed -e 's/\.po$$/.gmo/'` $$f ; \
+	done
+	#
+	-rm -f $(PACKAGE)-$(VER)
+	ln -s proto-toplev $(PACKAGE)-$(VER)
+
+.PHONY: do-tar-bz2
+do-tar-bz2:
+	echo "==> Making $(PACKAGE)-$(VER).tar.bz2"
+	-rm -f $(PACKAGE)-$(VER).tar.bz2
+	find $(PACKAGE)-$(VER) -follow -name CVS -prune -o -type f -print \
+		| tar cTfh - $(PACKAGE)-$(VER).tar
+	$(BZIPPROG) -v -9 $(PACKAGE)-$(VER).tar
+
+.PHONY: do-md5sum
+do-md5sum:
+	echo "==> Adding md5 checksum to top-level directory"
+	cd proto-toplev && find * -follow -name CVS -prune -o -type f -print \
+		| xargs $(MD5PROG) > ../md5.sum
+	mv md5.sum proto-toplev
+
+.PHONY: do-djunpack
+do-djunpack:
+	echo "==> Adding updated djunpack.bat to top-level directory"
+	echo - 's /gdb-[0-9\.]*/gdb-'"$(VER)"'/'
+	sed < djunpack.bat > djunpack.new \
+		-e 's/gdb-[0-9][0-9\.]*/gdb-'"$(VER)"'/'
+	mv djunpack.new djunpack.bat
+	-rm -f proto-toplev/djunpack.bat
+	ln -s ../djunpack.bat proto-toplev/djunpack.bat
+
+TEXINFO_SUPPORT= texinfo/texinfo.tex
+DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)
+
+.PHONY: gas.tar.bz2
+GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms mkdep
+gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
+	$(MAKE) -f Makefile.in taz TOOL=gas \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(GAS_SUPPORT_DIRS)"
+
+# The FSF "binutils" release includes gprof and ld.
+.PHONY: binutils.tar.bz2
+BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof intl setup.com makefile.vms mkdep
+binutils.tar.bz2: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
+	$(MAKE) -f Makefile.in taz TOOL=binutils \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS)"
+
+.PHONY: gas+binutils.tar.bz2
+GASB_SUPPORT_DIRS= $(GAS_SUPPORT_DIRS) binutils ld gprof
+gas+binutils.tar.bz2: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas
+	$(MAKE) -f Makefile.in taz TOOL=gas \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(GASB_SUPPORT_DIRS)"
+
+.PHONY: libg++.tar.bz2
+LIBGXX_SUPPORT_DIRS=include libstdc++ libio librx libiberty
+libg++.tar.bz2: $(DIST_SUPPORT) libg++
+	$(MAKE) -f Makefile.in taz TOOL=libg++ \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(LIBGXX_SUPPORT_DIRS)"
+
+GNATS_SUPPORT_DIRS=include libiberty send-pr
+gnats.tar.bz2: $(DIST_SUPPORT) $(GNATS_SUPPORT_DIRS) gnats
+	$(MAKE) -f  Makefile.in taz TOOL=gnats \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
+
+.PHONY: gdb.tar.bz2
+GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline sim utils intl
+gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
+	$(MAKE) -f Makefile.in gdb-taz TOOL=gdb \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
+
+.PHONY: dejagnu.tar.bz2
+DEJAGNU_SUPPORT_DIRS=  tcl expect libiberty
+dejagnu.tar.bz2: $(DIST_SUPPORT) $(DEJAGNU_SUPPORT_DIRS) dejagnu
+	$(MAKE) -f Makefile.in taz TOOL=dejagnu \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(DEJAGNU_SUPPORT_DIRS)"
+
+.PHONY: gdb+dejagnu.tar.bz2
+GDBD_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl expect dejagnu
+gdb+dejagnu.tar.bz2: $(DIST_SUPPORT) $(GDBD_SUPPORT_DIRS) gdb
+	$(MAKE) -f Makefile.in gdb-taz TOOL=gdb PACKAGE=gdb+dejagnu \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(GDBD_SUPPORT_DIRS)"
+
+.PHONY: insight.tar.bz2
+INSIGHT_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl tk itcl tix libgui
+insight.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
+	$(MAKE) -f Makefile.in gdb-taz TOOL=gdb PACKAGE=insight \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"
+
+.PHONY: insight+dejagnu.tar.bz2
+INSIGHTD_SUPPORT_DIRS= $(INSIGHT_SUPPORT_DIRS) expect dejagnu
+insight+dejagnu.tar.bz2: $(DIST_SUPPORT) $(INSIGHTD_SUPPORT_DIRS) gdb
+	$(MAKE) -f Makefile.in gdb-taz TOOL=gdb PACKAGE="insight+dejagnu" \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(INSIGHTD_SUPPORT_DIRS)"
+
+.PHONY: newlib.tar.bz2
+NEWLIB_SUPPORT_DIRS=libgloss
+# taz configures for the sun4 target which won't configure newlib.
+# We need newlib configured so that the .info files are made.
+# Unfortunately, it is not enough to just configure newlib separately:
+# taz will build the .info files but since SUBDIRS won't contain newlib,
+# distclean won't be run (leaving Makefile, config.status, and the tmp files
+# used in building the .info files, eg: *.def, *.ref).
+# The problem isn't solvable however without a lot of extra work because
+# target libraries are built in subdir $(target_alias) which gets nuked during
+# the make distclean.  For now punt on the issue of shipping newlib info files
+# with newlib net releases and wait for a day when some native target (sun4?)
+# supports newlib (if only minimally).
+newlib.tar.bz2: $(DIST_SUPPORT) $(NEWLIB_SUPPORT_DIRS) newlib
+	$(MAKE) -f Makefile.in taz TOOL=newlib \
+		MD5PROG="$(MD5PROG)" \
+		SUPPORT_FILES="$(NEWLIB_SUPPORT_DIRS)" \
+		DEVO_SUPPORT="$(DEVO_SUPPORT) COPYING.NEWLIB" newlib
 
-@if gcc-bootstrap
-do-distclean: distclean-stage1
-
-# Provide a GCC build when we're building target libraries.  This does
-# not work as a dependency, just as the minimum necessary to avoid errors.
-stage_last:
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
-@endif gcc-bootstrap
-
-.PHONY: restrap
-restrap:
-	@: $(MAKE); $(stage)
-	rm -rf stage1-$(TARGET_SUBDIR) stage2 stage3 stage4 stageprofile stagefeedback 
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
-
-# --------------------------------------
-# Dependencies between different modules
-# --------------------------------------
-
-# Generic dependencies for target modules on host stuff, especially gcc
-@if gcc-bootstrap
-configure-target-libstdc++-v3: stage_last
-configure-target-libmudflap: stage_last
-configure-target-libssp: stage_last
-configure-target-libgcc-math: stage_last
-configure-target-newlib: stage_last
-configure-target-libgfortran: stage_last
-configure-target-libobjc: stage_last
-configure-target-libtermcap: stage_last
-configure-target-winsup: stage_last
-configure-target-libgloss: stage_last
-configure-target-libiberty: stage_last
-configure-target-gperf: stage_last
-configure-target-examples: stage_last
-configure-target-libffi: stage_last
-configure-target-libjava: stage_last
-configure-target-zlib: stage_last
-configure-target-boehm-gc: stage_last
-configure-target-qthreads: stage_last
-configure-target-rda: stage_last
-configure-target-libada: stage_last
-configure-target-libgomp: stage_last
-@endif gcc-bootstrap
-
-@if gcc-no-bootstrap
-configure-target-libstdc++-v3: maybe-all-gcc
-configure-target-libmudflap: maybe-all-gcc
-configure-target-libssp: maybe-all-gcc
-configure-target-libgcc-math: maybe-all-gcc
-configure-target-newlib: maybe-all-gcc
-configure-target-libgfortran: maybe-all-gcc
-configure-target-libobjc: maybe-all-gcc
-configure-target-libtermcap: maybe-all-gcc
-configure-target-winsup: maybe-all-gcc
-configure-target-libgloss: maybe-all-gcc
-configure-target-libiberty: maybe-all-gcc
-configure-target-gperf: maybe-all-gcc
-configure-target-examples: maybe-all-gcc
-configure-target-libffi: maybe-all-gcc
-configure-target-libjava: maybe-all-gcc
-configure-target-zlib: maybe-all-gcc
-configure-target-boehm-gc: maybe-all-gcc
-configure-target-qthreads: maybe-all-gcc
-configure-target-rda: maybe-all-gcc
-configure-target-libada: maybe-all-gcc
-configure-target-libgomp: maybe-all-gcc
-@endif gcc-no-bootstrap
-
-
-
-configure-target-boehm-gc: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-gperf: maybe-all-target-newlib maybe-all-target-libgloss
-configure-target-gperf: maybe-all-target-libstdc++-v3
-
-configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-libgfortran: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
-configure-target-libjava: maybe-all-target-libstdc++-v3
-
-configure-target-libmudflap: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-libobjc: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-libssp: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-zlib: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-examples: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-libtermcap: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-rda: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-qthreads: maybe-all-target-newlib maybe-all-target-libgloss
-
-
-# There are two types of dependencies here: 'hard' dependencies, where one
-# module simply won't build without the other; and 'soft' dependencies, where
-# if the depended-on module is missing, the depending module will do without
-# or find a substitute somewhere (perhaps installed).  Soft dependencies
-# are made here to depend on a 'maybe-' target.  If you're not sure,
-# it's safer to use a soft dependency.
-
-
-
-
-
-
-# With all the machinery above in place, it is pretty easy to generate
-# dependencies.  Host dependencies are a bit more complex because we have
-# to check for bootstrap/prebootstrap dependencies.  To resolve
-# prebootstrap dependencies, prebootstrap modules are gathered in
-# a hash table.
-all-build-bison: maybe-all-build-texinfo
-all-build-byacc: maybe-all-build-texinfo
-all-build-flex: maybe-all-build-texinfo
-all-build-flex: maybe-all-build-bison
-all-build-flex: maybe-all-build-byacc
-all-build-flex: maybe-all-build-m4
-all-build-libiberty: maybe-all-build-texinfo
-all-build-m4: maybe-all-build-texinfo
-all-build-fixincludes: maybe-all-build-libiberty
-configure-gcc: maybe-configure-intl
-
-configure-stage1-gcc: maybe-configure-stage1-intl
-configure-stage2-gcc: maybe-configure-stage2-intl
-configure-stage3-gcc: maybe-configure-stage3-intl
-configure-stage4-gcc: maybe-configure-stage4-intl
-configure-stageprofile-gcc: maybe-configure-stageprofile-intl
-configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
-configure-gcc: maybe-all-binutils
-
-configure-stage1-gcc: maybe-all-stage1-binutils
-configure-stage2-gcc: maybe-all-stage2-binutils
-configure-stage3-gcc: maybe-all-stage3-binutils
-configure-stage4-gcc: maybe-all-stage4-binutils
-configure-stageprofile-gcc: maybe-all-stageprofile-binutils
-configure-stagefeedback-gcc: maybe-all-stagefeedback-binutils
-configure-gcc: maybe-all-gas
-
-configure-stage1-gcc: maybe-all-stage1-gas
-configure-stage2-gcc: maybe-all-stage2-gas
-configure-stage3-gcc: maybe-all-stage3-gas
-configure-stage4-gcc: maybe-all-stage4-gas
-configure-stageprofile-gcc: maybe-all-stageprofile-gas
-configure-stagefeedback-gcc: maybe-all-stagefeedback-gas
-configure-gcc: maybe-all-ld
-
-configure-stage1-gcc: maybe-all-stage1-ld
-configure-stage2-gcc: maybe-all-stage2-ld
-configure-stage3-gcc: maybe-all-stage3-ld
-configure-stage4-gcc: maybe-all-stage4-ld
-configure-stageprofile-gcc: maybe-all-stageprofile-ld
-configure-stagefeedback-gcc: maybe-all-stagefeedback-ld
-all-gcc: all-libiberty
-
-all-stage1-gcc: all-stage1-libiberty
-all-stage2-gcc: all-stage2-libiberty
-all-stage3-gcc: all-stage3-libiberty
-all-stage4-gcc: all-stage4-libiberty
-all-stageprofile-gcc: all-stageprofile-libiberty
-all-stagefeedback-gcc: all-stagefeedback-libiberty
-all-gcc: maybe-all-intl
-
-all-stage1-gcc: maybe-all-stage1-intl
-all-stage2-gcc: maybe-all-stage2-intl
-all-stage3-gcc: maybe-all-stage3-intl
-all-stage4-gcc: maybe-all-stage4-intl
-all-stageprofile-gcc: maybe-all-stageprofile-intl
-all-stagefeedback-gcc: maybe-all-stagefeedback-intl
-all-gcc: maybe-all-build-texinfo
-
-all-stage1-gcc: maybe-all-build-texinfo
-all-stage2-gcc: maybe-all-build-texinfo
-all-stage3-gcc: maybe-all-build-texinfo
-all-stage4-gcc: maybe-all-build-texinfo
-all-stageprofile-gcc: maybe-all-build-texinfo
-all-stagefeedback-gcc: maybe-all-build-texinfo
-all-prebootstrap: maybe-all-build-texinfo
-all-gcc: maybe-all-build-bison
-
-all-stage1-gcc: maybe-all-build-bison
-all-stage2-gcc: maybe-all-build-bison
-all-stage3-gcc: maybe-all-build-bison
-all-stage4-gcc: maybe-all-build-bison
-all-stageprofile-gcc: maybe-all-build-bison
-all-stagefeedback-gcc: maybe-all-build-bison
-all-prebootstrap: maybe-all-build-bison
-all-gcc: maybe-all-build-byacc
-
-all-stage1-gcc: maybe-all-build-byacc
-all-stage2-gcc: maybe-all-build-byacc
-all-stage3-gcc: maybe-all-build-byacc
-all-stage4-gcc: maybe-all-build-byacc
-all-stageprofile-gcc: maybe-all-build-byacc
-all-stagefeedback-gcc: maybe-all-build-byacc
-all-prebootstrap: maybe-all-build-byacc
-all-gcc: maybe-all-build-flex
-
-all-stage1-gcc: maybe-all-build-flex
-all-stage2-gcc: maybe-all-build-flex
-all-stage3-gcc: maybe-all-build-flex
-all-stage4-gcc: maybe-all-build-flex
-all-stageprofile-gcc: maybe-all-build-flex
-all-stagefeedback-gcc: maybe-all-build-flex
-all-prebootstrap: maybe-all-build-flex
-all-gcc: maybe-all-build-libiberty
-
-all-stage1-gcc: maybe-all-build-libiberty
-all-stage2-gcc: maybe-all-build-libiberty
-all-stage3-gcc: maybe-all-build-libiberty
-all-stage4-gcc: maybe-all-build-libiberty
-all-stageprofile-gcc: maybe-all-build-libiberty
-all-stagefeedback-gcc: maybe-all-build-libiberty
-all-prebootstrap: maybe-all-build-libiberty
-all-gcc: maybe-all-build-fixincludes
-
-all-stage1-gcc: maybe-all-build-fixincludes
-all-stage2-gcc: maybe-all-build-fixincludes
-all-stage3-gcc: maybe-all-build-fixincludes
-all-stage4-gcc: maybe-all-build-fixincludes
-all-stageprofile-gcc: maybe-all-build-fixincludes
-all-stagefeedback-gcc: maybe-all-build-fixincludes
-all-prebootstrap: maybe-all-build-fixincludes
-all-gcc: maybe-all-zlib
-
-all-stage1-gcc: maybe-all-stage1-zlib
-all-stage2-gcc: maybe-all-stage2-zlib
-all-stage3-gcc: maybe-all-stage3-zlib
-all-stage4-gcc: maybe-all-stage4-zlib
-all-stageprofile-gcc: maybe-all-stageprofile-zlib
-all-stagefeedback-gcc: maybe-all-stagefeedback-zlib
-all-gcc: all-libcpp
-
-all-stage1-gcc: all-stage1-libcpp
-all-stage2-gcc: all-stage2-libcpp
-all-stage3-gcc: all-stage3-libcpp
-all-stage4-gcc: all-stage4-libcpp
-all-stageprofile-gcc: all-stageprofile-libcpp
-all-stagefeedback-gcc: all-stagefeedback-libcpp
-all-gcc: all-libdecnumber
-
-all-stage1-gcc: all-stage1-libdecnumber
-all-stage2-gcc: all-stage2-libdecnumber
-all-stage3-gcc: all-stage3-libdecnumber
-all-stage4-gcc: all-stage4-libdecnumber
-all-stageprofile-gcc: all-stageprofile-libdecnumber
-all-stagefeedback-gcc: all-stagefeedback-libdecnumber
-all-gcc: maybe-all-libiberty
-
-all-stage1-gcc: maybe-all-stage1-libiberty
-all-stage2-gcc: maybe-all-stage2-libiberty
-all-stage3-gcc: maybe-all-stage3-libiberty
-all-stage4-gcc: maybe-all-stage4-libiberty
-all-stageprofile-gcc: maybe-all-stageprofile-libiberty
-all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty
-all-gcc: maybe-all-fixincludes
-install-gcc: maybe-install-fixincludes
-configure-libcpp: configure-libiberty
-
-configure-stage1-libcpp: configure-stage1-libiberty
-configure-stage2-libcpp: configure-stage2-libiberty
-configure-stage3-libcpp: configure-stage3-libiberty
-configure-stage4-libcpp: configure-stage4-libiberty
-configure-stageprofile-libcpp: configure-stageprofile-libiberty
-configure-stagefeedback-libcpp: configure-stagefeedback-libiberty
-configure-libcpp: maybe-configure-intl
-
-configure-stage1-libcpp: maybe-configure-stage1-intl
-configure-stage2-libcpp: maybe-configure-stage2-intl
-configure-stage3-libcpp: maybe-configure-stage3-intl
-configure-stage4-libcpp: maybe-configure-stage4-intl
-configure-stageprofile-libcpp: maybe-configure-stageprofile-intl
-configure-stagefeedback-libcpp: maybe-configure-stagefeedback-intl
-all-libcpp: all-libiberty
-
-all-stage1-libcpp: all-stage1-libiberty
-all-stage2-libcpp: all-stage2-libiberty
-all-stage3-libcpp: all-stage3-libiberty
-all-stage4-libcpp: all-stage4-libiberty
-all-stageprofile-libcpp: all-stageprofile-libiberty
-all-stagefeedback-libcpp: all-stagefeedback-libiberty
-all-libcpp: maybe-all-intl
-
-all-stage1-libcpp: maybe-all-stage1-intl
-all-stage2-libcpp: maybe-all-stage2-intl
-all-stage3-libcpp: maybe-all-stage3-intl
-all-stage4-libcpp: maybe-all-stage4-intl
-all-stageprofile-libcpp: maybe-all-stageprofile-intl
-all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
-all-fixincludes: maybe-all-libiberty
-all-gnattools: maybe-all-target-libada
-configure-gdb: maybe-configure-sim
-all-gdb: maybe-all-libiberty
-all-gdb: maybe-all-opcodes
-all-gdb: maybe-all-bfd
-all-gdb: maybe-all-readline
-all-gdb: maybe-all-build-bison
-all-gdb: maybe-all-build-byacc
-all-gdb: maybe-all-sim
-configure-libgui: maybe-configure-tcl
-configure-libgui: maybe-configure-tk
-all-libgui: maybe-all-tcl
-all-libgui: maybe-all-tk
-all-libgui: maybe-all-itcl
-configure-bfd: configure-libiberty
-
-configure-stage1-bfd: configure-stage1-libiberty
-configure-stage2-bfd: configure-stage2-libiberty
-configure-stage3-bfd: configure-stage3-libiberty
-configure-stage4-bfd: configure-stage4-libiberty
-configure-stageprofile-bfd: configure-stageprofile-libiberty
-configure-stagefeedback-bfd: configure-stagefeedback-libiberty
-all-bfd: maybe-all-libiberty
-
-all-stage1-bfd: maybe-all-stage1-libiberty
-all-stage2-bfd: maybe-all-stage2-libiberty
-all-stage3-bfd: maybe-all-stage3-libiberty
-all-stage4-bfd: maybe-all-stage4-libiberty
-all-stageprofile-bfd: maybe-all-stageprofile-libiberty
-all-stagefeedback-bfd: maybe-all-stagefeedback-libiberty
-all-bfd: maybe-all-intl
-
-all-stage1-bfd: maybe-all-stage1-intl
-all-stage2-bfd: maybe-all-stage2-intl
-all-stage3-bfd: maybe-all-stage3-intl
-all-stage4-bfd: maybe-all-stage4-intl
-all-stageprofile-bfd: maybe-all-stageprofile-intl
-all-stagefeedback-bfd: maybe-all-stagefeedback-intl
-all-binutils: maybe-all-libiberty
-
-all-stage1-binutils: maybe-all-stage1-libiberty
-all-stage2-binutils: maybe-all-stage2-libiberty
-all-stage3-binutils: maybe-all-stage3-libiberty
-all-stage4-binutils: maybe-all-stage4-libiberty
-all-stageprofile-binutils: maybe-all-stageprofile-libiberty
-all-stagefeedback-binutils: maybe-all-stagefeedback-libiberty
-all-binutils: maybe-all-opcodes
-
-all-stage1-binutils: maybe-all-stage1-opcodes
-all-stage2-binutils: maybe-all-stage2-opcodes
-all-stage3-binutils: maybe-all-stage3-opcodes
-all-stage4-binutils: maybe-all-stage4-opcodes
-all-stageprofile-binutils: maybe-all-stageprofile-opcodes
-all-stagefeedback-binutils: maybe-all-stagefeedback-opcodes
-all-binutils: maybe-all-bfd
-
-all-stage1-binutils: maybe-all-stage1-bfd
-all-stage2-binutils: maybe-all-stage2-bfd
-all-stage3-binutils: maybe-all-stage3-bfd
-all-stage4-binutils: maybe-all-stage4-bfd
-all-stageprofile-binutils: maybe-all-stageprofile-bfd
-all-stagefeedback-binutils: maybe-all-stagefeedback-bfd
-all-binutils: maybe-all-build-flex
-
-all-stage1-binutils: maybe-all-build-flex
-all-stage2-binutils: maybe-all-build-flex
-all-stage3-binutils: maybe-all-build-flex
-all-stage4-binutils: maybe-all-build-flex
-all-stageprofile-binutils: maybe-all-build-flex
-all-stagefeedback-binutils: maybe-all-build-flex
-all-prebootstrap: maybe-all-build-flex
-all-binutils: maybe-all-build-bison
-
-all-stage1-binutils: maybe-all-build-bison
-all-stage2-binutils: maybe-all-build-bison
-all-stage3-binutils: maybe-all-build-bison
-all-stage4-binutils: maybe-all-build-bison
-all-stageprofile-binutils: maybe-all-build-bison
-all-stagefeedback-binutils: maybe-all-build-bison
-all-prebootstrap: maybe-all-build-bison
-all-binutils: maybe-all-build-byacc
-
-all-stage1-binutils: maybe-all-build-byacc
-all-stage2-binutils: maybe-all-build-byacc
-all-stage3-binutils: maybe-all-build-byacc
-all-stage4-binutils: maybe-all-build-byacc
-all-stageprofile-binutils: maybe-all-build-byacc
-all-stagefeedback-binutils: maybe-all-build-byacc
-all-prebootstrap: maybe-all-build-byacc
-all-binutils: maybe-all-intl
-
-all-stage1-binutils: maybe-all-stage1-intl
-all-stage2-binutils: maybe-all-stage2-intl
-all-stage3-binutils: maybe-all-stage3-intl
-all-stage4-binutils: maybe-all-stage4-intl
-all-stageprofile-binutils: maybe-all-stageprofile-intl
-all-stagefeedback-binutils: maybe-all-stagefeedback-intl
-install-binutils: maybe-install-opcodes
-install-opcodes: maybe-install-bfd
-all-gas: maybe-all-libiberty
-
-all-stage1-gas: maybe-all-stage1-libiberty
-all-stage2-gas: maybe-all-stage2-libiberty
-all-stage3-gas: maybe-all-stage3-libiberty
-all-stage4-gas: maybe-all-stage4-libiberty
-all-stageprofile-gas: maybe-all-stageprofile-libiberty
-all-stagefeedback-gas: maybe-all-stagefeedback-libiberty
-all-gas: maybe-all-opcodes
-
-all-stage1-gas: maybe-all-stage1-opcodes
-all-stage2-gas: maybe-all-stage2-opcodes
-all-stage3-gas: maybe-all-stage3-opcodes
-all-stage4-gas: maybe-all-stage4-opcodes
-all-stageprofile-gas: maybe-all-stageprofile-opcodes
-all-stagefeedback-gas: maybe-all-stagefeedback-opcodes
-all-gas: maybe-all-bfd
-
-all-stage1-gas: maybe-all-stage1-bfd
-all-stage2-gas: maybe-all-stage2-bfd
-all-stage3-gas: maybe-all-stage3-bfd
-all-stage4-gas: maybe-all-stage4-bfd
-all-stageprofile-gas: maybe-all-stageprofile-bfd
-all-stagefeedback-gas: maybe-all-stagefeedback-bfd
-all-gas: maybe-all-intl
-
-all-stage1-gas: maybe-all-stage1-intl
-all-stage2-gas: maybe-all-stage2-intl
-all-stage3-gas: maybe-all-stage3-intl
-all-stage4-gas: maybe-all-stage4-intl
-all-stageprofile-gas: maybe-all-stageprofile-intl
-all-stagefeedback-gas: maybe-all-stagefeedback-intl
-all-gprof: maybe-all-libiberty
-all-gprof: maybe-all-bfd
-all-gprof: maybe-all-opcodes
-all-gprof: maybe-all-intl
-all-ld: maybe-all-libiberty
-
-all-stage1-ld: maybe-all-stage1-libiberty
-all-stage2-ld: maybe-all-stage2-libiberty
-all-stage3-ld: maybe-all-stage3-libiberty
-all-stage4-ld: maybe-all-stage4-libiberty
-all-stageprofile-ld: maybe-all-stageprofile-libiberty
-all-stagefeedback-ld: maybe-all-stagefeedback-libiberty
-all-ld: maybe-all-bfd
-
-all-stage1-ld: maybe-all-stage1-bfd
-all-stage2-ld: maybe-all-stage2-bfd
-all-stage3-ld: maybe-all-stage3-bfd
-all-stage4-ld: maybe-all-stage4-bfd
-all-stageprofile-ld: maybe-all-stageprofile-bfd
-all-stagefeedback-ld: maybe-all-stagefeedback-bfd
-all-ld: maybe-all-opcodes
-
-all-stage1-ld: maybe-all-stage1-opcodes
-all-stage2-ld: maybe-all-stage2-opcodes
-all-stage3-ld: maybe-all-stage3-opcodes
-all-stage4-ld: maybe-all-stage4-opcodes
-all-stageprofile-ld: maybe-all-stageprofile-opcodes
-all-stagefeedback-ld: maybe-all-stagefeedback-opcodes
-all-ld: maybe-all-build-bison
-
-all-stage1-ld: maybe-all-build-bison
-all-stage2-ld: maybe-all-build-bison
-all-stage3-ld: maybe-all-build-bison
-all-stage4-ld: maybe-all-build-bison
-all-stageprofile-ld: maybe-all-build-bison
-all-stagefeedback-ld: maybe-all-build-bison
-all-prebootstrap: maybe-all-build-bison
-all-ld: maybe-all-build-byacc
-
-all-stage1-ld: maybe-all-build-byacc
-all-stage2-ld: maybe-all-build-byacc
-all-stage3-ld: maybe-all-build-byacc
-all-stage4-ld: maybe-all-build-byacc
-all-stageprofile-ld: maybe-all-build-byacc
-all-stagefeedback-ld: maybe-all-build-byacc
-all-prebootstrap: maybe-all-build-byacc
-all-ld: maybe-all-build-flex
-
-all-stage1-ld: maybe-all-build-flex
-all-stage2-ld: maybe-all-build-flex
-all-stage3-ld: maybe-all-build-flex
-all-stage4-ld: maybe-all-build-flex
-all-stageprofile-ld: maybe-all-build-flex
-all-stagefeedback-ld: maybe-all-build-flex
-all-prebootstrap: maybe-all-build-flex
-all-ld: maybe-all-intl
-
-all-stage1-ld: maybe-all-stage1-intl
-all-stage2-ld: maybe-all-stage2-intl
-all-stage3-ld: maybe-all-stage3-intl
-all-stage4-ld: maybe-all-stage4-intl
-all-stageprofile-ld: maybe-all-stageprofile-intl
-all-stagefeedback-ld: maybe-all-stagefeedback-intl
-all-opcodes: maybe-all-bfd
-
-all-stage1-opcodes: maybe-all-stage1-bfd
-all-stage2-opcodes: maybe-all-stage2-bfd
-all-stage3-opcodes: maybe-all-stage3-bfd
-all-stage4-opcodes: maybe-all-stage4-bfd
-all-stageprofile-opcodes: maybe-all-stageprofile-bfd
-all-stagefeedback-opcodes: maybe-all-stagefeedback-bfd
-all-opcodes: maybe-all-libiberty
-
-all-stage1-opcodes: maybe-all-stage1-libiberty
-all-stage2-opcodes: maybe-all-stage2-libiberty
-all-stage3-opcodes: maybe-all-stage3-libiberty
-all-stage4-opcodes: maybe-all-stage4-libiberty
-all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
-all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
-all-dejagnu: maybe-all-tcl
-all-dejagnu: maybe-all-expect
-all-dejagnu: maybe-all-tk
-configure-expect: maybe-configure-tcl
-configure-expect: maybe-configure-tk
-all-expect: maybe-all-tcl
-all-expect: maybe-all-tk
-configure-itcl: maybe-configure-tcl
-configure-itcl: maybe-configure-tk
-all-itcl: maybe-all-tcl
-all-itcl: maybe-all-tk
-install-itcl: maybe-install-tcl
-configure-tk: maybe-configure-tcl
-all-tk: maybe-all-tcl
-all-sid: maybe-all-libiberty
-all-sid: maybe-all-bfd
-all-sid: maybe-all-opcodes
-all-sid: maybe-all-tcl
-all-sid: maybe-all-tk
-install-sid: maybe-install-tcl
-install-sid: maybe-install-tk
-all-sim: maybe-all-libiberty
-all-sim: maybe-all-bfd
-all-sim: maybe-all-opcodes
-all-sim: maybe-all-readline
-all-sim: maybe-configure-gdb
-all-fastjar: maybe-all-zlib
-all-fastjar: maybe-all-build-texinfo
-all-fastjar: maybe-all-libiberty
-all-autoconf: maybe-all-m4
-all-autoconf: maybe-all-build-texinfo
-all-automake: maybe-all-m4
-all-automake: maybe-all-build-texinfo
-all-automake: maybe-all-autoconf
-all-bison: maybe-all-intl
-all-bison: maybe-all-build-texinfo
-all-diff: maybe-all-intl
-all-diff: maybe-all-build-texinfo
-all-fileutils: maybe-all-intl
-all-fileutils: maybe-all-build-texinfo
-all-flex: maybe-all-build-bison
-all-flex: maybe-all-build-byacc
-all-flex: maybe-all-intl
-all-flex: maybe-all-m4
-all-flex: maybe-all-build-texinfo
-all-gzip: maybe-all-intl
-all-gzip: maybe-all-zlib
-all-gzip: maybe-all-build-texinfo
-all-hello: maybe-all-intl
-all-hello: maybe-all-build-texinfo
-all-m4: maybe-all-intl
-all-m4: maybe-all-build-texinfo
-all-make: maybe-all-intl
-all-make: maybe-all-build-texinfo
-all-patch: maybe-all-build-texinfo
-all-make: maybe-all-build-texinfo
-all-prms: maybe-all-libiberty
-all-recode: maybe-all-build-texinfo
-all-sed: maybe-all-build-texinfo
-all-send-pr: maybe-all-prms
-all-tar: maybe-all-build-texinfo
-all-uudecode: maybe-all-build-texinfo
-configure-target-boehm-gc: maybe-configure-target-qthreads
-configure-target-fastjar: maybe-configure-target-zlib
-all-target-fastjar: maybe-all-target-zlib
-all-target-fastjar: maybe-all-target-libiberty
-configure-target-libjava: maybe-configure-target-zlib
-configure-target-libjava: maybe-configure-target-boehm-gc
-configure-target-libjava: maybe-configure-target-qthreads
-configure-target-libjava: maybe-configure-target-libffi
-all-target-libjava: maybe-all-fastjar
-all-target-libjava: maybe-all-target-zlib
-all-target-libjava: maybe-all-target-boehm-gc
-all-target-libjava: maybe-all-target-qthreads
-all-target-libjava: maybe-all-target-libffi
-all-target-libobjc: maybe-all-target-libiberty
-all-target-libstdc++-v3: maybe-all-target-libiberty
-all-target-libgloss: maybe-configure-target-newlib
-all-target-winsup: maybe-all-target-libiberty
-all-target-winsup: maybe-all-target-libtermcap
-
-
-# Non-toplevel bootstrap rules must depend on several packages, to be built
-# before gcc.  Another wart that will go away, hopefully soon.
-@if gcc-no-bootstrap
-
-all-prebootstrap: maybe-all-bfd
-all-prebootstrap: maybe-all-opcodes
-all-prebootstrap: maybe-all-binutils
-all-prebootstrap: maybe-all-gas
-all-prebootstrap: maybe-all-intl
-all-prebootstrap: maybe-all-ld
-all-prebootstrap: maybe-all-libcpp
-all-prebootstrap: maybe-all-libdecnumber
-all-prebootstrap: maybe-all-libiberty
-all-prebootstrap: maybe-all-zlib
-@endif gcc-no-bootstrap
-
-CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@
-GDB_TK = @GDB_TK@
-INSTALL_GDB_TK = @INSTALL_GDB_TK@
-configure-gdb: $(CONFIGURE_GDB_TK)
-all-gdb: $(gdbnlmrequirements) $(GDB_TK)
-install-gdb: $(INSTALL_GDB_TK)
-
-# Serialization dependencies.  Host configures don't work well in parallel to
-# each other, due to contention over config.cache.  Target configures and 
-# build configures are similar.
-@serialization_dependencies@
-
-# --------------------------------
-# Regenerating top level configury
-# --------------------------------
-
-# Rebuilding Makefile.in, using autogen.
-AUTOGEN = autogen
-$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
-	cd $(srcdir) && $(AUTOGEN) Makefile.def
-
-# Rebuilding Makefile.
-Makefile: $(srcdir)/Makefile.in config.status
-	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-config.status: configure
-	CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck
-
-# Rebuilding configure.
-AUTOCONF = autoconf
-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
-	cd $(srcdir) && $(AUTOCONF)
-
-# ------------------------------
-# Special directives to GNU Make
-# ------------------------------
-
-# Don't pass command-line variables to submakes.
 .NOEXPORT:
 MAKEOVERRIDES=
 
diff --git a/Makefile.tpl b/Makefile.tpl
deleted file mode 100644
index 274474a..0000000
--- a/Makefile.tpl
+++ /dev/null
@@ -1,1608 +0,0 @@
-[+ AutoGen5 template -*- Mode: Makefile -*-
-in
-+]
-
-# Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
-#
-# Makefile for directory with subdirs to build.
-#   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
-#
-# This file 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 of the License, or
-# (at your option) any later version.
-# 
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-
-# -------------------------------
-# Standard Autoconf-set variables
-# -------------------------------
-VPATH=@srcdir@
-
-build_alias=@build_alias@
-build=@build@
-host_alias=@host_alias@
-host=@host@
-target_alias=@target_alias@
-target=@target@
-
-program_transform_name = @program_transform_name@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-srcdir = @srcdir@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-includedir = @includedir@
-oldincludedir = @oldincludedir@
-infodir = @infodir@
-mandir = @mandir@
-man1dir = $(mandir)/man1
-man2dir = $(mandir)/man2
-man3dir = $(mandir)/man3
-man4dir = $(mandir)/man4
-man5dir = $(mandir)/man5
-man6dir = $(mandir)/man6
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-man9dir = $(mandir)/man9
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_DATA = @INSTALL_DATA@
-LN = @LN@
-LN_S = @LN_S@
-
-# -------------------------------------------------
-# Miscellaneous non-standard autoconf-set variables
-# -------------------------------------------------
-
-# The gcc driver likes to know the arguments it was configured with.
-TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
-
-tooldir = @tooldir@
-build_tooldir = @build_tooldir@
-
-GDB_NLM_DEPS = 
-
-# This is the name of the environment variable used for the path to
-# the libraries.
-RPATH_ENVVAR = @RPATH_ENVVAR@
-
-# Build programs are put under this directory.
-BUILD_SUBDIR = @build_subdir@
-# This is set by the configure script to the arguments to use when configuring
-# directories built for the build system.
-BUILD_CONFIGARGS = @build_configargs@ --with-build-subdir="$(BUILD_SUBDIR)"
-
-# This is the list of variables to export in the environment when
-# configuring any subdirectory.  It must also be exported whenever
-# recursing into a build directory in case that directory's Makefile
-# re-runs configure.
-BASE_EXPORTS = \
-	FLEX="$(FLEX)"; export FLEX; \
-	LEX="$(LEX)"; export LEX; \
-	BISON="$(BISON)"; export BISON; \
-	YACC="$(YACC)"; export YACC; \
-	M4="$(M4)"; export M4; \
-	MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
-
-# This is the list of variables to export in the environment when
-# configuring subdirectories for the build system.
-BUILD_EXPORTS = \
-	$(BASE_EXPORTS) \
-	AR="$(AR_FOR_BUILD)"; export AR; \
-	AS="$(AS_FOR_BUILD)"; export AS; \
-	CC="$(CC_FOR_BUILD)"; export CC; \
-	CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
-	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-	CXX="$(CXX_FOR_BUILD)"; export CXX; \
-	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
-	GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
-	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
-	DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
-	LD="$(LD_FOR_BUILD)"; export LD; \
-	LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
-	NM="$(NM_FOR_BUILD)"; export NM; \
-	RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \
-	WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES;
-
-# This is the list of directories to built for the host system.
-SUBDIRS = @configdirs@
-# This is set by the configure script to the arguments to use when configuring
-# directories built for the host system.
-HOST_CONFIGARGS = @host_configargs@
-# Host programs are put under this directory, which is . except if building
-# with srcdir=..
-HOST_SUBDIR = @host_subdir@
-# This is the list of variables to export in the environment when
-# configuring subdirectories for the host system.  We need to pass
-# some to the GCC configure because of its hybrid host/target nature.
-HOST_EXPORTS = \
-	$(BASE_EXPORTS) \
-	CC="$(CC)"; export CC; \
-	CFLAGS="$(CFLAGS)"; export CFLAGS; \
-	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-	CXX="$(CXX)"; export CXX; \
-	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-	AR="$(AR)"; export AR; \
-	AS="$(AS)"; export AS; \
-	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-	DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
-	LD="$(LD)"; export LD; \
-	LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
-	NM="$(NM)"; export NM; \
-	RANLIB="$(RANLIB)"; export RANLIB; \
-	WINDRES="$(WINDRES)"; export WINDRES; \
-	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
-	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-	AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
-	AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
-	GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \
-	LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \
-	NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
-	OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
-	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
-	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-	GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
-	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
-@if gcc-bootstrap
-	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-@endif gcc-bootstrap
-	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
-# Similar, for later GCC stages.
-POSTSTAGE1_HOST_EXPORTS = \
-	$(HOST_EXPORTS) \
-	CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
-	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
-	CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \
-	  $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
-	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
-	  -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
-
-# Target libraries are put under this directory:
-TARGET_SUBDIR = @target_subdir@
-# This is set by the configure script to the arguments to use when configuring
-# directories built for the target.
-TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
-# This is the list of variables to export in the environment when
-# configuring subdirectories for the host system.
-BASE_TARGET_EXPORTS = \
-	$(BASE_EXPORTS) \
-	AR="$(AR_FOR_TARGET)"; export AR; \
-	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
-	CC="$(CC_FOR_TARGET)"; export CC; \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
-	GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
-	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
-	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-	LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
-	NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
-	OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
-	RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
-	WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
-	$(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
-
-RAW_CXX_TARGET_EXPORTS = \
-	$(BASE_TARGET_EXPORTS) \
-	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
-	CXX="$(RAW_CXX_FOR_TARGET)"; export CXX;
-
-NORMAL_TARGET_EXPORTS = \
-	$(BASE_TARGET_EXPORTS) \
-	CXX="$(CXX_FOR_TARGET)"; export CXX;
-
-# Where to find GMP
-HOST_GMPLIBS = @gmplibs@
-HOST_GMPINC = @gmpinc@
-
-# ----------------------------------------------
-# Programs producing files for the BUILD machine
-# ----------------------------------------------
-
-SHELL = @config_shell@
-
-# pwd command to use.  Allow user to override default by setting PWDCMD in
-# the environment to account for automounters.  The make variable must not
-# be called PWDCMD, otherwise the value set here is passed to make
-# subprocesses and overrides the setting from the user's environment.
-# Don't use PWD since it is a common shell environment variable and we
-# don't want to corrupt it.
-PWD_COMMAND = $${PWDCMD-pwd}
-
-# compilers to use to create programs which must be run in the build
-# environment.
-CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
-
-CXX_FOR_BUILD = $(CXX)
-
-# Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
-# here so that they can be overridden by Makefile fragments.
-BUILD_PREFIX = @BUILD_PREFIX@
-BUILD_PREFIX_1 = @BUILD_PREFIX_1@
-
-# Flags to pass to stage2 and later makes.  They are defined
-# here so that they can be overridden by Makefile fragments.
-BOOT_CFLAGS= -g -O2
-BOOT_LDFLAGS=
-
-BISON = @BISON@
-YACC = @YACC@
-FLEX = @FLEX@
-LEX = @LEX@
-M4 = @M4@
-MAKEINFO = @MAKEINFO@
-EXPECT = @EXPECT@
-RUNTEST = @RUNTEST@
-
-# This just becomes part of the MAKEINFO definition passed down to
-# sub-makes.  It lets flags be given on the command line while still
-# using the makeinfo from the object tree.
-# (Default to avoid splitting info files by setting the threshold high.)
-MAKEINFOFLAGS = --split-size=5000000
-
-# ---------------------------------------------
-# Programs producing files for the HOST machine
-# ---------------------------------------------
-
-AS = @AS@
-AR = @AR@
-AR_FLAGS = rc
-CC = @CC@
-CXX = @CXX@
-DLLTOOL = @DLLTOOL@
-LD = @LD@
-LIPO = @LIPO@
-NM = @NM@
-OBJDUMP = @OBJDUMP@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-WINDRES = @WINDRES@
-
-CFLAGS = @CFLAGS@
-LDFLAGS = 
-LIBCFLAGS = $(CFLAGS)
-CXXFLAGS = @CXXFLAGS@
-LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
-PICFLAG = 
-
-# -----------------------------------------------
-# Programs producing files for the TARGET machine
-# -----------------------------------------------
-
-FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
-
-AR_FOR_TARGET=@AR_FOR_TARGET@
-AS_FOR_TARGET=@AS_FOR_TARGET@
-CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-
-# If GCC_FOR_TARGET is not overriden on the command line, then this
-# variable is passed down to the gcc Makefile, where it is used to
-# build libgcc2.a.  We define it here so that it can itself be
-# overridden on the command line.
-GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET)
-DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
-LD_FOR_TARGET=@LD_FOR_TARGET@
-
-LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
-NM_FOR_TARGET=@NM_FOR_TARGET@
-OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
-RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
-STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
-WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
-
-COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_TARGET@
-COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
-COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
-
-# During gcc bootstrap, if we use some random cc for stage1 then
-# CFLAGS will be just -g.  We want to ensure that TARGET libraries
-# (which we know are built with gcc) are built with optimizations so
-# prepend -O2 when setting CFLAGS_FOR_TARGET.
-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
-SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
-LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
-LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
-LDFLAGS_FOR_TARGET = 
-PICFLAG_FOR_TARGET = 
-
-# ------------------------------------
-# Miscellaneous targets and flag lists
-# ------------------------------------
-
-# The first rule in the file had better be this one.  Don't put any above it.
-# This lives here to allow makefile fragments to contain dependencies.
-all:
-
-#### host and target specific makefile fragments come in here.
-@target_makefile_frag@
-@alphaieee_frag@
-@ospace_frag@
-@host_makefile_frag@
-###
-
-# This is the list of directories that may be needed in RPATH_ENVVAR
-# so that prorgams built for the target machine work.
-TARGET_LIB_PATH = [+ FOR target_modules +][+
-  IF lib_path +]$(TARGET_LIB_PATH_[+module+])[+ ENDIF lib_path +][+
-  ENDFOR target_modules +]$(HOST_LIB_PATH_gcc)
-[+ FOR target_modules +][+ IF lib_path +]
-@if target-[+module+]
-TARGET_LIB_PATH_[+module+] = $$r/$(TARGET_SUBDIR)/[+module+]/[+lib_path+]:
-@endif target-[+module+]
-[+ ENDIF lib_path +][+ ENDFOR target_modules +]
-
-
-# This is the list of directories that may be needed in RPATH_ENVVAR
-# so that programs built for the host machine work.
-HOST_LIB_PATH = [+ FOR host_modules +][+
-  IF lib_path +]$(HOST_LIB_PATH_[+module+])[+ ENDIF lib_path +][+
-  ENDFOR host_modules +]
-
-# Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch
-@if gcc
-HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc:$$r/$(HOST_SUBDIR)/prev-gcc:
-@endif gcc
-
-[+ FOR host_modules +][+ IF lib_path +]
-@if [+module+]
-HOST_LIB_PATH_[+module+] = \
-  $$r/$(HOST_SUBDIR)/[+module+]/[+lib_path+]:[+ IF bootstrap
-  +]$$r/$(HOST_SUBDIR)/prev-[+module+]/[+lib_path+]:[+ ENDIF bootstrap +]
-@endif [+module+]
-[+ ENDIF lib_path +][+ ENDFOR host_modules +]
-
-# Flags to pass down to all sub-makes.
-BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \
-	"`echo '[+flag+]=$([+flag+])' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"[+ ELSE optional +] \
-	"[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +] \
-	"CONFIG_SHELL=$(SHELL)" \
-	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 
-
-# We leave this in just in case, but it is not needed anymore.
-RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS)
-
-# Flags to pass down to most sub-makes, in which we're building with
-# the host environment.
-EXTRA_HOST_FLAGS = \
-	'AR=$(AR)' \
-	'AS=$(AS)' \
-	'CC=$(CC)' \
-	'CXX=$(CXX)' \
-	'DLLTOOL=$(DLLTOOL)' \
-	'LD=$(LD)' \
-	'LIPO=$(LIPO)' \
-	'NM=$(NM)' \
-	'OBJDUMP=$(OBJDUMP)' \
-	'RANLIB=$(RANLIB)' \
-	'STRIP=$(STRIP)' \
-	'WINDRES=$(WINDRES)'
-
-FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
-
-# Flags that are concerned with the location of the X11 include files
-# and library files
-#
-# NOTE: until the top-level is getting the values via autoconf, it only
-# causes problems to have this top-level Makefile overriding the autoconf-set
-# values in child directories.  Only variables that don't conflict with
-# autoconf'ed ones should be passed by X11_FLAGS_TO_PASS for now.
-#
-X11_FLAGS_TO_PASS = \
-	'X11_EXTRA_CFLAGS=$(X11_EXTRA_CFLAGS)' \
-	'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)'
-
-# Flags to pass down to makes which are built with the target environment.
-# The double $ decreases the length of the command line; those variables
-# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
-# COMPILER_ prefixed variables are not passed down so we expand them here.
-EXTRA_TARGET_FLAGS = \
-	'AR=$$(AR_FOR_TARGET)' \
-	'AS=$(COMPILER_AS_FOR_TARGET)' \
-	'CC=$$(CC_FOR_TARGET)' \
-	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-	'CXX=$$(CXX_FOR_TARGET)' \
-	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
-	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
-	'LD=$(COMPILER_LD_FOR_TARGET)' \
-	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
-	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
-	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
-	'NM=$(COMPILER_NM_FOR_TARGET)' \
-	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
-	'RANLIB=$$(RANLIB_FOR_TARGET)' \
-	'WINDRES=$$(WINDRES_FOR_TARGET)'
-
-TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
-
-# Flags to pass down to gcc.  gcc builds a library, libgcc.a, so it
-# unfortunately needs the native compiler and the target ar and
-# ranlib.
-# If any variables are added here, they must be added to do-*, below.
-# The BUILD_* variables are a special case, which are used for the gcc
-# cross-building scheme.
-EXTRA_GCC_FLAGS = \
-	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
-	"`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \
-	"`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
-
-GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
-
-.PHONY: configure-host
-configure-host: [+
-  FOR host_modules +] \
-    maybe-configure-[+module+][+
-  ENDFOR host_modules +]
-.PHONY: configure-target
-configure-target: [+
-  FOR target_modules +] \
-    maybe-configure-target-[+module+][+
-  ENDFOR target_modules +]
-
-# The target built for a native non-bootstrap build.
-.PHONY: all
-all:
-@if gcc-bootstrap
-	[ -f stage_final ] || echo stage3 > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) `cat stage_final`-bubble
-@endif gcc-bootstrap
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if [ -f stage_last ]; then \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \
-	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
-	fi
-
-.PHONY: all-build
-[+ FOR build_modules +]
-all-build: maybe-all-build-[+module+][+ ENDFOR build_modules +]
-
-.PHONY: all-host
-[+ FOR host_modules +][+ IF bootstrap +]
-@if [+module+]-no-bootstrap[+ ENDIF bootstrap +]
-all-host: maybe-all-[+module+][+ IF bootstrap +]
-@endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR host_modules +]
-
-.PHONY: all-target
-[+ FOR target_modules +][+ IF bootstrap +]
-@if [+module+]-no-bootstrap[+ ENDIF bootstrap +]
-all-target: maybe-all-target-[+module+][+ IF bootstrap +]
-@endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR target_modules +]
-
-# Do a target for all the subdirectories.  A ``make do-X'' will do a
-# ``make X'' in all subdirectories (because, in general, there is a
-# dependency (below) of X upon do-X, a ``make X'' will also do this,
-# but it may do additional work as well).
-[+ FOR recursive_targets +]
-.PHONY: do-[+make_target+]
-do-[+make_target+]:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) [+make_target+]-host \
-	  [+make_target+]-target
-
-
-.PHONY: [+make_target+]-host
-[+ FOR host_modules +]
-[+make_target+]-host: maybe-[+make_target+]-[+module+][+ ENDFOR host_modules +]
-
-.PHONY: [+make_target+]-target
-[+ FOR target_modules +]
-[+make_target+]-target: maybe-[+make_target+]-target-[+module+][+ ENDFOR target_modules +]
-[+ ENDFOR recursive_targets +]
-
-# Here are the targets which correspond to the do-X targets.
-
-.PHONY: info installcheck dvi html install-info
-.PHONY: clean distclean mostlyclean maintainer-clean realclean
-.PHONY: local-clean local-distclean local-maintainer-clean
-info: do-info
-installcheck: do-installcheck
-dvi: do-dvi
-html: do-html
-
-# Make sure makeinfo is built before we do a `make info', if we're
-# in fact building texinfo.
-do-info: maybe-all-texinfo
-
-install-info: do-install-info dir.info
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if [ -f dir.info ] ; then \
-	  $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
-	else true ; fi
-
-local-clean:
-	-rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E *.log
-
-local-distclean:
-	-rm -f Makefile config.status config.cache mh-frag mt-frag
-	-rm -f maybedep.tmp serdep.tmp
-	-if [ "$(TARGET_SUBDIR)" != "." ]; then \
-	  rm -rf $(TARGET_SUBDIR); \
-	else true; fi
-	-rm -rf $(BUILD_SUBDIR)
-	-if [ "$(HOST_SUBDIR)" != "." ]; then \
-	  rm -rf $(HOST_SUBDIR); \
-	else true; fi
-	-rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile
-	-rm -f texinfo/doc/Makefile texinfo/po/POTFILES
-	-rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
-	-rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
-	-rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
-
-local-maintainer-clean:
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-clean: do-clean local-clean
-mostlyclean: do-mostlyclean local-clean
-distclean: do-distclean local-clean local-distclean
-maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean 
-maintainer-clean: local-distclean
-realclean: maintainer-clean
-
-# Extra dependency for clean-target, owing to the mixed nature of gcc.
-clean-target: clean-target-libgcc
-clean-target-libgcc:
-	test ! -d gcc || (cd gcc && $(MAKE) $@)
-
-# Check target.
-
-.PHONY: check do-check
-check: do-check
-
-# Only include modules actually being configured and built.
-.PHONY: check-host
-check-host: [+
-  FOR host_modules +] \
-    maybe-check-[+module+][+
-  ENDFOR host_modules +]
-
-.PHONY: check-target
-check-target: [+
-  FOR target_modules +] \
-    maybe-check-target-[+module+][+
-  ENDFOR target_modules +]
-
-do-check:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
-
-# Automated reporting of test results.
-
-warning.log: build.log
-	$(srcdir)/contrib/warn_summary build.log > $@
-
-mail-report.log:
-	if test x'$(BOOT_CFLAGS)' != x''; then \
-	    BOOT_CFLAGS='$(BOOT_CFLAGS)'; export BOOT_CFLAGS; \
-	fi; \
-	$(srcdir)/contrib/test_summary -t >$@
-	chmod +x $@
-	echo If you really want to send e-mail, run ./$@ now
-
-mail-report-with-warnings.log: warning.log
-	if test x'$(BOOT_CFLAGS)' != x''; then \
-	    BOOT_CFLAGS='$(BOOT_CFLAGS)'; export BOOT_CFLAGS; \
-	fi; \
-	$(srcdir)/contrib/test_summary -t -i warning.log >$@
-	chmod +x $@
-	echo If you really want to send e-mail, run ./$@ now
-
-# Installation targets.
-
-.PHONY: install uninstall
-install:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
-
-.PHONY: install-host-nogcc
-install-host-nogcc: [+
-  FOR host_modules +][+ IF (not (= (get "module") "gcc")) +] \
-    maybe-install-[+module+][+ ENDIF +][+
-  ENDFOR host_modules +]
-
-.PHONY: install-host
-install-host: [+
-  FOR host_modules +] \
-    maybe-install-[+module+][+
-  ENDFOR host_modules +]
-
-.PHONY: install-target
-install-target: [+
-  FOR target_modules +] \
-    maybe-install-target-[+module+][+
-  ENDFOR target_modules +]
-
-uninstall:
-	@echo "the uninstall target is not supported in this tree"
-
-.PHONY: install.all
-install.all: install-no-fixedincludes
-	@if [ -f ./gcc/Makefile ] ; then \
-		r=`${PWD_COMMAND}` ; export r ; \
-		s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-		$(HOST_EXPORTS) \
-		(cd ./gcc && \
-		$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
-	else \
-		true ; \
-	fi
-
-# install-no-fixedincludes is used because Cygnus can not distribute
-# the fixed header files.
-.PHONY: install-no-fixedincludes
-install-no-fixedincludes: installdirs install-host-nogcc \
-	install-target gcc-no-fixedincludes
-
-### other supporting targets
-
-MAKEDIRS= \
-	$(DESTDIR)$(prefix) \
-	$(DESTDIR)$(exec_prefix)
-.PHONY: installdirs
-installdirs: mkinstalldirs
-	$(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
-
-dir.info: do-install-info
-	if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
-	  $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
-	  mv -f dir.info.new dir.info ; \
-	else true ; \
-	fi
-
-dist:
-	@echo "Building a full distribution of this tree isn't done"
-	@echo "via 'make dist'.  Check out the etc/ subdirectory" 
-
-etags tags: TAGS
-
-# Right now this just builds TAGS in each subdirectory.  emacs19 has the
-# ability to use several tags files at once, so there is probably no need
-# to combine them into one big TAGS file (like CVS 1.3 does).  We could
-# (if we felt like it) have this Makefile write a piece of elisp which
-# the user could load to tell emacs19 where all the TAGS files we just
-# built are.
-TAGS: do-TAGS
-
-# ------------------------------------
-# Macros for configure and all targets
-# ------------------------------------
-
-[+ DEFINE configure +]
-.PHONY: configure-[+prefix+][+module+] maybe-configure-[+prefix+][+module+]
-maybe-configure-[+prefix+][+module+]:
-@if [+prefix+][+module+]
-maybe-configure-[+prefix+][+module+]: configure-[+prefix+][+module+]
-configure-[+prefix+][+module+]: [+ IF bootstrap +]
-@endif [+prefix+][+module+]
-@if [+prefix+][+module+]-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif [+prefix+][+module+]-bootstrap
-@if [+prefix+][+module+][+ ELSE bootstrap +]
-	@: $(MAKE); $(unstage)[+ ENDIF bootstrap +]
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	[+ IF check_multilibs
-	+]echo "Checking multilib configuration for [+module+]..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
-	$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \
-	if test -r [+subdir+]/[+module+]/multilib.out; then \
-	  if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \
-	    rm -f [+subdir+]/[+module+]/multilib.tmp; \
-	  else \
-	    rm -f [+subdir+]/[+module+]/Makefile; \
-	    mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
-	  fi; \
-	else \
-	  mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
-	fi; \
-	[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
-	[+exports+] \
-	echo Configuring in [+subdir+]/[+module+]; \
-	cd "[+subdir+]/[+module+]" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo [+subdir+]/[+module+]/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/[+module+]"; \
-	libsrcdir="$$s/[+module+]"; \
-	[+ IF no-config-site +]rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file [+ ENDIF +]$(SHELL) $${libsrcdir}/configure \
-	  [+args+] $${srcdiroption} [+extra_configure_flags+] \
-	  || exit 1
-@endif [+prefix+][+module+]
-
-[+ IF bootstrap +]
-[+ FOR bootstrap_stage +]
-.PHONY: configure-stage[+id+]-[+prefix+][+module+] maybe-configure-stage[+id+]-[+prefix+][+module+]
-maybe-configure-stage[+id+]-[+prefix+][+module+]:
-@if [+prefix+][+module+]-bootstrap
-maybe-configure-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
-configure-stage[+id+]-[+prefix+][+module+]:
-	@[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start
-	@$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+]
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	[+ IF check_multilibs
-	+]echo "Checking multilib configuration for [+module+]..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \
-	if test -r [+subdir+]/[+module+]/multilib.out; then \
-	  if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \
-	    rm -f [+subdir+]/[+module+]/multilib.tmp; \
-	  else \
-	    rm -f [+subdir+]/[+module+]/Makefile; \
-	    mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
-	  fi; \
-	else \
-	  mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \
-	fi; \
-	[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
-	[+exports+][+ IF prev +] \
-	[+poststage1_exports+][+ ENDIF prev +] \
-	echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
-	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
-	cd [+subdir+]/[+module+] || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo [+subdir+]/[+module+]/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	srcdiroption="--srcdir=$${topdir}/[+module+]"; \
-	libsrcdir="$$s/[+module+]"; \
-	$(SHELL) $${libsrcdir}/configure \
-	  [+args+] $${srcdiroption} \
-	  [+stage_configure_flags+] [+extra_configure_flags+]
-@endif [+prefix+][+module+]-bootstrap
-[+ ENDFOR bootstrap_stage +]
-[+ ENDIF bootstrap +]
-[+ ENDDEF +]
-
-[+ DEFINE all +]
-.PHONY: all-[+prefix+][+module+] maybe-all-[+prefix+][+module+]
-maybe-all-[+prefix+][+module+]:
-@if [+prefix+][+module+]
-TARGET-[+prefix+][+module+]=[+
-  IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
-maybe-all-[+prefix+][+module+]: all-[+prefix+][+module+]
-all-[+prefix+][+module+]: configure-[+prefix+][+module+][+ IF bootstrap +]
-@endif [+prefix+][+module+]
-@if [+prefix+][+module+]-bootstrap
-	@if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif [+prefix+][+module+]-bootstrap
-@if [+prefix+][+module+][+ ELSE bootstrap +]
-	@: $(MAKE); $(unstage)[+ ENDIF bootstrap +]
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	[+exports+] \
-	(cd [+subdir+]/[+module+] && \
-	  $(MAKE) [+args+] [+extra_make_flags+] $(TARGET-[+prefix+][+module+]))
-@endif [+prefix+][+module+]
-
-[+ IF bootstrap +]
-[+ FOR bootstrap_stage +]
-.PHONY: all-stage[+id+]-[+prefix+][+module+] maybe-all-stage[+id+]-[+prefix+][+module+]
-.PHONY: clean-stage[+id+]-[+prefix+][+module+] maybe-clean-stage[+id+]-[+prefix+][+module+]
-maybe-all-stage[+id+]-[+prefix+][+module+]:
-maybe-clean-stage[+id+]-[+prefix+][+module+]:
-@if [+prefix+][+module+]-bootstrap
-maybe-all-stage[+id+]-[+prefix+][+module+]: all-stage[+id+]-[+prefix+][+module+]
-all-stage[+id+]: all-stage[+id+]-[+prefix+][+module+]
-TARGET-stage[+id+]-[+prefix+][+module+] = $(TARGET-[+prefix+][+module+])
-all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
-	@[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	[+exports+][+ IF prev +] \
-	[+poststage1_exports+][+ ENDIF prev +] \
-	cd [+subdir+]/[+module+] && \
-	$(MAKE) [+args+] [+ IF prev
-		+][+poststage1_args+][+ ENDIF prev
-		+] [+stage_make_flags+] [+extra_make_flags+] \
-		$(TARGET-stage[+id+]-[+prefix+][+module+])
-
-maybe-clean-stage[+id+]-[+prefix+][+module+]: clean-stage[+id+]-[+prefix+][+module+]
-clean-stage[+id+]: clean-stage[+id+]-[+prefix+][+module+]
-clean-stage[+id+]-[+prefix+][+module+]:
-	@[ -f [+subdir+]/[+module+]/Makefile ] || [ -f [+subdir+]/stage[+id+]-[+module+]/Makefile ] \
-	  || exit 0 ; \
-	[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start; \
-	cd [+subdir+]/[+module+] && \
-	$(MAKE) [+args+] [+ IF prev +] \
-		[+poststage1_args+] [+ ENDIF prev +] \
-		[+stage_make_flags+] [+extra_make_flags+] clean
-@endif [+prefix+][+module+]-bootstrap
-
-[+ ENDFOR bootstrap_stage +]
-[+ ENDIF bootstrap +]
-[+ ENDDEF +]
-
-# --------------------------------------
-# Modules which run on the build machine
-# --------------------------------------
-[+ FOR build_modules +]
-[+ configure prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)"
-	     args="$(BUILD_CONFIGARGS)" no-config-site=true +]
-
-[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +]
-[+ ENDFOR build_module +]
-
-# --------------------------------------
-# Modules which run on the host machine
-# --------------------------------------
-[+ FOR host_modules +]
-[+ configure prefix="" subdir="$(HOST_SUBDIR)"
-	     exports="$(HOST_EXPORTS)"
-	     poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)"
-	     args="$(HOST_CONFIGARGS)" +]
-
-[+ all prefix="" subdir="$(HOST_SUBDIR)"
-       exports="$(HOST_EXPORTS)"
-       poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)"
-       args="$(FLAGS_TO_PASS)"
-       poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +]
-
-.PHONY: check-[+module+] maybe-check-[+module+]
-maybe-check-[+module+]:
-@if [+module+]
-maybe-check-[+module+]: check-[+module+]
-[+ IF no_check +]
-check-[+module+]:
-[+ ELIF no_check_cross +]
-# This module is only tested in a native toolchain.
-check-[+module+]:
-	@: $(MAKE); $(unstage)
-	@if [ '$(host)' = '$(target)' ] ; then \
-	  r=`${PWD_COMMAND}`; export r; \
-	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	  $(HOST_EXPORTS) \
-	  (cd $(HOST_SUBDIR)/[+module+] && \
-	    $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check); \
-	fi
-[+ ELSE check +]
-check-[+module+]:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/[+module+] && \
-	  $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check)
-[+ ENDIF no_check +]
-@endif [+module+]
-
-.PHONY: install-[+module+] maybe-install-[+module+]
-maybe-install-[+module+]:
-@if [+module+]
-maybe-install-[+module+]: install-[+module+]
-[+ IF no_install +]
-install-[+module+]:
-[+ ELSE install +]
-install-[+module+]: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd $(HOST_SUBDIR)/[+module+] && \
-	  $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] install)
-[+ ENDIF no_install +]
-@endif [+module+]
-
-# Other targets (info, dvi, etc.)
-[+ FOR recursive_targets +]
-.PHONY: maybe-[+make_target+]-[+module+] [+make_target+]-[+module+]
-maybe-[+make_target+]-[+module+]:
-@if [+module+]
-maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+]
-[+ IF (match-value? = "missing" (get "make_target") ) +]
-# [+module+] doesn't support [+make_target+].
-[+make_target+]-[+module+]:
-[+ ELSE +]
-[+make_target+]-[+module+]: [+
-  FOR depend +]\
-    [+depend+]-[+module+] [+
-  ENDFOR depend +]
-	@[+ IF bootstrap +][+ ELSE +]: $(MAKE); $(unstage)
-	@[+ ENDIF bootstrap +][ -f ./[+module+]/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) [+extra_make_flags+]; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing [+make_target+] in [+module+]" ; \
-	(cd $(HOST_SUBDIR)/[+module+] && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          [+make_target+]) \
-	  || exit 1
-[+ ENDIF +]
-@endif [+module+]
-[+ ENDFOR recursive_targets +]
-[+ ENDFOR host_modules +]
-
-# ---------------------------------------
-# Modules which run on the target machine
-# ---------------------------------------
-[+ FOR target_modules +]
-
-[+ IF raw_cxx +]
-[+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
-	     check_multilibs=true
-	     exports="$(RAW_CXX_TARGET_EXPORTS)"
-	     args="$(TARGET_CONFIGARGS)" no-config-site=true +]
-
-[+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
-       exports="$(RAW_CXX_TARGET_EXPORTS)"
-       args="$(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
-[+ ELSE +]
-[+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
-	     check_multilibs=true
-	     exports="$(NORMAL_TARGET_EXPORTS)"
-	     args="$(TARGET_CONFIGARGS)" no-config-site=true +]
-
-[+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
-       exports="$(NORMAL_TARGET_EXPORTS)"
-       args="$(TARGET_FLAGS_TO_PASS)" +]
-[+ ENDIF +]
-
-.PHONY: check-target-[+module+] maybe-check-target-[+module+]
-maybe-check-target-[+module+]:
-@if target-[+module+]
-maybe-check-target-[+module+]: check-target-[+module+]
-[+ IF no_check +]
-# Dummy target for uncheckable module.
-check-target-[+module+]:
-[+ ELSE check +]
-check-target-[+module+]:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
-IF raw_cxx +]
-	$(RAW_CXX_TARGET_EXPORTS) \[+
-ELSE normal_cxx +]
-	$(NORMAL_TARGET_EXPORTS) \[+
-ENDIF raw_cxx +]
-	(cd $(TARGET_SUBDIR)/[+module+] && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS) [+
-	    IF raw_cxx 
-	      +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ 
-	    ENDIF raw_cxx 
-	  +] [+extra_make_flags+] check)
-[+ ENDIF no_check +]
-@endif target-[+module+]
-
-.PHONY: install-target-[+module+] maybe-install-target-[+module+]
-maybe-install-target-[+module+]:
-@if target-[+module+]
-maybe-install-target-[+module+]: install-target-[+module+]
-[+ IF no_install +]
-# Dummy target for uninstallable.
-install-target-[+module+]:
-[+ ELSE install +]
-install-target-[+module+]: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
-IF raw_cxx +]
-	$(RAW_CXX_TARGET_EXPORTS) \[+
-ELSE normal_cxx +]
-	$(NORMAL_TARGET_EXPORTS) \[+
-ENDIF raw_cxx +]
-	(cd $(TARGET_SUBDIR)/[+module+] && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS) [+extra_make_flags+] install)
-[+ ENDIF no_install +]
-@endif target-[+module+]
-
-# Other targets (info, dvi, etc.)
-[+ FOR recursive_targets +]
-.PHONY: maybe-[+make_target+]-target-[+module+] [+make_target+]-target-[+module+]
-maybe-[+make_target+]-target-[+module+]:
-@if target-[+module+]
-maybe-[+make_target+]-target-[+module+]: [+make_target+]-target-[+module+]
-[+ IF (match-value? = "missing" (get "make_target") ) +]
-# [+module+] doesn't support [+make_target+].
-[+make_target+]-target-[+module+]:
-[+ ELSE +]
-[+make_target+]-target-[+module+]: [+
-  FOR depend +]\
-    [+depend+]-target-[+module+] [+
-  ENDFOR depend +]
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
-IF raw_cxx +]
-	$(RAW_CXX_TARGET_EXPORTS) \[+
-ELSE normal_cxx +]
-	$(NORMAL_TARGET_EXPORTS) \[+
-ENDIF raw_cxx +]
-	echo "Doing [+make_target+] in $(TARGET_SUBDIR)/[+module+]" ; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/[+module+] && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          [+extra_make_flags+] [+make_target+]) \
-	  || exit 1
-[+ ENDIF +]
-@endif target-[+module+]
-[+ ENDFOR recursive_targets +]
-[+ ENDFOR target_modules +]
-
-# ----------
-# GCC module
-# ----------
-
-@if gcc-no-bootstrap
-# GCC has some more recursive targets, which trigger the old
-# (but still current, until the toplevel bootstrap project
-# is finished) compiler bootstrapping rules.
-
-GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
-.PHONY: $(GCC_STRAP_TARGETS)
-$(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	echo "Bootstrapping the compiler"; \
-	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	case "$@" in \
-	  *bootstrap4-lean ) \
-	    msg="Comparing stage3 and stage4 of the compiler"; \
-	    compare=compare3-lean ;; \
-	  *bootstrap4 ) \
-	    msg="Comparing stage3 and stage4 of the compiler"; \
-	    compare=compare3 ;; \
-	  *-lean ) \
-	    msg="Comparing stage2 and stage3 of the compiler"; \
-	    compare=compare-lean ;; \
-	  * ) \
-	    msg="Comparing stage2 and stage3 of the compiler"; \
-	    compare=compare ;; \
-	esac; \
-	$(HOST_EXPORTS) \
-	echo "$$msg"; \
-	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-	echo "Building runtime libraries"; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
-
-profiledbootstrap: all-prebootstrap configure-gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	$(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
-	echo "Bootstrapping training compiler"; \
-	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	echo "Building feedback based compiler"; \
-	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-	echo "Building runtime libraries"; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
-
-.PHONY: cross
-cross: all-build all-gas all-ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	echo "Building the C and C++ compiler"; \
-	cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-	echo "Building runtime libraries"; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
-@endif gcc-no-bootstrap
-
-@if gcc
-.PHONY: check-gcc-c++
-check-gcc-c++:
-	@if [ -f ./gcc/Makefile ] ; then \
-	  r=`${PWD_COMMAND}`; export r; \
-	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	  $(HOST_EXPORTS) \
-	  (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
-	else \
-	  true; \
-	fi
-
-.PHONY: check-c++
-check-c++: check-target-libstdc++-v3 check-gcc-c++
-
-# Install the gcc headers files, but not the fixed include files,
-# which Cygnus is not allowed to distribute.  This rule is very
-# dependent on the workings of the gcc Makefile.in.
-.PHONY: gcc-no-fixedincludes
-gcc-no-fixedincludes:
-	@if [ -f ./gcc/Makefile ]; then \
-	  rm -rf gcc/tmp-include; \
-	  mv gcc/include gcc/tmp-include 2>/dev/null; \
-	  mkdir gcc/include; \
-	  cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
-	  touch gcc/stmp-fixinc gcc/include/fixed; \
-	  rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
-	  r=`${PWD_COMMAND}`; export r; \
-	  s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
-	  $(HOST_EXPORTS) \
-	  (cd ./gcc && \
-	   $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
-	  rm -rf gcc/include; \
-	  mv gcc/tmp-include gcc/include 2>/dev/null; \
-	else true; fi
-@endif gcc
-
-# ---------------------
-# GCC bootstrap support
-# ---------------------
-
-# We track the current stage (the one in 'gcc') in the stage_current file.
-# stage_last instead tracks the stage that was built last.  These targets
-# are dummy when toplevel bootstrap is not active.
-
-# While making host and target tools, symlinks to the final stage must be
-# there, so $(unstage) should be run at various points.  To avoid excessive
-# recursive invocations of make, we "inline" them using a variable.  These
-# must be referenced as ": $(MAKE) ; $(unstage)" rather than "$(unstage)"
-# to avoid warnings from the GNU Make job server.
-
-unstage = :
-stage = :
-current_stage = ""
-
-@if gcc-bootstrap
-unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
-stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
-current_stage = "`cat stage_current 2> /dev/null`"
-@endif gcc-bootstrap
-
-.PHONY: unstage stage
-unstage:
-	@: $(MAKE); $(unstage)
-stage:
-	@: $(MAKE); $(stage)
-
-# Disable commands for lean bootstrap.
-LEAN = false
-
-# We name the build directories for the various stages "stage1-gcc",
-# "stage2-gcc","stage3-gcc", etc.
-
-# Since the 'compare' process will fail (on debugging information) if any
-# directory names are different, we need to link the gcc directory for
-# the previous stage to a constant name ('prev-gcc'), and to make the name of
-# the build directories constant as well. For the latter, we use naked names
-# like 'gcc', because the scripts in that directory assume it.  We use
-# mv on platforms where symlinks to directories do not work or are not
-# reliable.
-
-# 'touch' doesn't work right on some platforms.
-STAMP = echo timestamp > 
-
-# Only build the C compiler for stage1, because that is the only one that
-# we can guarantee will build with the native compiler, and also it is the
-# only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS),
-# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
-# overrideable (for a bootstrap build stage1 also builds gcc.info).
-
-STAGE1_CFLAGS=@stage1_cflags@
-STAGE1_LANGUAGES=@stage1_languages@
-
-# We only want to compare .o files, so set this!
-objext = .o
-
-# Flags to pass to stage2 and later makes.
-POSTSTAGE1_FLAGS_TO_PASS = \
-	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
-	STAGE_PREFIX=$$r/prev-gcc/ \
-	CFLAGS="$(BOOT_CFLAGS)" \
-	LIBCFLAGS="$(BOOT_CFLAGS)" \
-	LDFLAGS="$(BOOT_LDFLAGS)" \
-	ADAC="\$$(CC)"
-
-# For stage 1:
-# * We force-disable intermodule optimizations, even if
-#   --enable-intermodule was passed, since the installed compiler probably
-#   can't handle them.  Luckily, autoconf always respects
-#   the last argument when conflicting --enable arguments are passed.
-# * Likewise, we force-disable coverage flags, since the installed compiler
-#   probably has never heard of them.
-# * We build only C (and possibly Ada).
-
-[+ FOR bootstrap-stage +]
-.PHONY: stage[+id+]-start stage[+id+]-end
-
-stage[+id+]-start::
-	@: $(MAKE); $(stage); \
-	echo stage[+id+] > stage_current ; \
-	echo stage[+id+] > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)[+
-   FOR host_modules +][+ IF bootstrap +]
-@if [+ module +]
-	@cd $(HOST_SUBDIR); [ -d stage[+id+]-[+module+] ] || \
-	  mkdir stage[+id+]-[+module+]; \
-	mv stage[+id+]-[+module+] [+module+] [+ IF prev +] ; \
-	mv stage[+prev+]-[+module+] prev-[+module+] || test -f stage[+prev+]-lean [+ ENDIF prev +]
-@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
-	@[ -d stage[+id+]-$(TARGET_SUBDIR) ] || \
-	  mkdir stage[+id+]-$(TARGET_SUBDIR); \
-	mv stage[+id+]-$(TARGET_SUBDIR) $(TARGET_SUBDIR) [+ IF prev +] ; \
-	mv stage[+prev+]-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage[+prev+]-lean [+ ENDIF prev +]
-
-stage[+id+]-end:: [+ FOR host_modules +][+ IF bootstrap +]
-@if [+ module +]
-	@if test -d $(HOST_SUBDIR)/[+module+] ; then \
-	  cd $(HOST_SUBDIR); mv [+module+] stage[+id+]-[+module+] [+ IF prev +]; \
-	  mv prev-[+module+] stage[+prev+]-[+module+] ; : [+ ENDIF prev +] ; \
-	fi
-@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
-	@if test -d $(TARGET_SUBDIR) ; then \
-	  mv $(TARGET_SUBDIR) stage[+id+]-$(TARGET_SUBDIR) [+ IF prev +] ; \
-	  mv prev-$(TARGET_SUBDIR) stage[+prev+]-$(TARGET_SUBDIR) ; : [+ ENDIF prev +] ; \
-	fi
-	rm -f stage_current
-
-# Bubble a bugfix through all the stages up to stage [+id+].  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured as well.
-.PHONY: stage[+id+]-bubble
-stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +]
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage[+id+]-lean [+
-	  IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \
-	  echo Skipping rebuild of stage[+id+] ; \
-	else \
-	  $(MAKE) stage[+id+]-start; \[+IF lean +]
-	  if $(LEAN); then \
-	    rm -rf stage[+lean+]-* ; \
-	    $(STAMP) stage[+lean+]-lean ; \
-	  fi; \[+ ENDIF lean +]
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \
-	fi[+ IF compare-target +]
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) [+compare-target+][+ ENDIF compare-target +]
-
-.PHONY: all-stage[+id+] clean-stage[+id+]
-do-clean: clean-stage[+id+]
-
-# FIXME: Will not need to be conditional when toplevel bootstrap is the
-# only possibility, but now it conflicts with no-bootstrap rules
-@if gcc-bootstrap
-[+ IF compare-target +]
-[+compare-target+]:
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stage[+prev+]-lean; then \
-	  echo Cannot compare object files as stage [+prev+] was deleted. ; \
-	  exit 0 ; \
-	fi; \
-	: $(MAKE); $(stage); \
-	rm -f .bad_compare ; \
-	echo Comparing stages [+prev+] and [+id+] ; \
-	cd stage[+id+]-gcc; \
-	files=`find . -name "*$(objext)" -print` ; \
-	cd .. ; \
-	for file in $${files} ; do \
-	  f1=$$r/stage[+prev+]-gcc/$$file; f2=$$r/stage[+id+]-gcc/$$file; \
-	  @do_compare@ > /dev/null 2>&1; \
-	  if test $$? -eq 1; then \
-	    case $$file in \
-	      ./cc*-checksum$(objext) | ./libgcc/* ) \
-	        echo warning: $$file differs ;; \
-	      *) \
-	        echo $$file differs >> .bad_compare ;; \
-	    esac ; \
-	  fi ; \
-	done ; \
-	if [ -f .bad_compare ]; then \
-	  echo "Bootstrap comparison failure!"; \
-	  cat .bad_compare; \
-	  exit 1; \
-	else \
-	  echo Comparison successful.; \
-	fi ; \
-	$(STAMP) [+compare-target+][+ IF prev +]
-	if $(LEAN); then \
-	  rm -rf stage[+prev+]-*; \
-	  $(STAMP) stage[+prev+]-lean; \
-	fi[+ ENDIF prev +]
-[+ ENDIF compare-target +]
-
-[+ IF bootstrap-target +]
-.PHONY: [+bootstrap-target+] [+bootstrap-target+]-lean
-[+bootstrap-target+]:
-	echo stage[+id+] > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage[+id+]-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-[+bootstrap-target+]-lean:
-	echo stage[+id+] > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage[+id+]-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-[+ ENDIF bootstrap-target +]
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-[+ IF prev +]distclean-stage[+prev+]:: distclean-stage[+id+] [+ ENDIF prev +]
-.PHONY: distclean-stage[+id+]
-distclean-stage[+id+]::
-	@: $(MAKE); $(stage)
-	rm -rf stage[+id+]-* [+
-	  IF compare-target +][+compare-target+] [+ ENDIF compare-target +]
-
-[+ IF cleanstrap-target +]
-.PHONY: [+cleanstrap-target+]
-[+cleanstrap-target+]: distclean [+bootstrap-target+]
-[+ ENDIF cleanstrap-target +]
-@endif gcc-bootstrap
-
-[+ ENDFOR bootstrap-stage +]
-
-stageprofile-end::
-	$(MAKE) distclean-stagefeedback
-
-stagefeedback-start::
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	for i in prev-*; do \
-	  j=`echo $$i | sed s/^prev-//` ; \
-	  cd $$r/$$i && \
-	  { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL) ; } && \
-	  { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL) ; } ; \
-	done
-
-@if gcc-bootstrap
-do-distclean: distclean-stage1
-
-# Provide a GCC build when we're building target libraries.  This does
-# not work as a dependency, just as the minimum necessary to avoid errors.
-stage_last:
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
-@endif gcc-bootstrap
-
-.PHONY: restrap
-restrap:
-	@: $(MAKE); $(stage)
-	rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev
-	  +]stage[+id+] [+ ENDIF prev +][+ ENDFOR bootstrap-stage +]
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
-
-# --------------------------------------
-# Dependencies between different modules
-# --------------------------------------
-
-# Generic dependencies for target modules on host stuff, especially gcc
-@if gcc-bootstrap[+ FOR target_modules +][+ IF bootstrap
-  +][+ FOR bootstrap_stage +]
-configure-stage[+id+]-target-[+module+]: maybe-all-stage[+id+]-gcc[+
-  ENDFOR +][+ ELSE bootstrap +]
-configure-target-[+module+]: stage_last[+
-  ENDIF bootstrap +][+ ENDFOR target_modules +]
-@endif gcc-bootstrap
-
-@if gcc-no-bootstrap[+ FOR target_modules +][+ IF bootstrap
-  +][+ ELSE +]
-configure-target-[+module+]: maybe-all-gcc[+
-  ENDIF bootstrap +][+ ENDFOR target_modules +]
-@endif gcc-no-bootstrap
-
-
-[+ FOR lang_env_dependencies +]
-configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss
-[+ IF cxx +]configure-target-[+module+]: maybe-all-target-libstdc++-v3
-[+ ENDIF cxx +][+ ENDFOR lang_env_dependencies +]
-
-# There are two types of dependencies here: 'hard' dependencies, where one
-# module simply won't build without the other; and 'soft' dependencies, where
-# if the depended-on module is missing, the depending module will do without
-# or find a substitute somewhere (perhaps installed).  Soft dependencies
-# are made here to depend on a 'maybe-' target.  If you're not sure,
-# it's safer to use a soft dependency.
-
-[+ ;; These Scheme functions build the bulk of the dependencies.
-   ;; dep-target builds a string like "maybe-all-MODULE_KIND-gcc",
-   ;; where "maybe-" is only included if HARD is true, and all-gcc
-   ;; is taken from VAR-NAME.
-   (define dep-target (lambda (module-kind var-name hard)
-      (string-append
-         (if hard "" "maybe-")
-         (dep-subtarget var-name)
-         module-kind
-         (dep-module var-name)
-      )))
-
-   ;; make-dep builds a dependency from the MODULE and ON AutoGen vars.
-   (define make-dep (lambda (module-kind on-kind)
-      (string-append
-         (dep-target module-kind "module" #t) ": "
-         (dep-target on-kind "on" (exist? "hard")))))
-
-   ;; dep-subtarget extracts everything up to the first dash in the given
-   ;; AutoGen variable, for example it extracts "all-" out of "all-gcc".
-   (define dep-subtarget (lambda (var-name)
-      (substring (get var-name) 0 (+ 1 (string-index (get var-name) #\-)))))
-
-   ;; dep-module extracts everything up to the first dash in the given
-   ;; AutoGen variable, for example it extracts "gcc" out of "all-gcc".
-   (define dep-module (lambda (var-name)
-      (substring (get var-name) (+ 1 (string-index (get var-name) #\-)))))
-
-   ;; dep-stage builds a string for the prefix of a bootstrap stage.
-   (define dep-stage (lambda ()
-      (string-append
-	 "stage"
-	 (get "id")
-	 "-")))
-
-   ;; dep-maybe is the same as the AutoGen expression "- hard 'maybe-'"
-   ;; but is written in Scheme.
-   (define dep-maybe (lambda ()
-      (if (exist? "hard") "" "maybe-")))
-
-   ;; dep-kind returns "normal" if the dependency is on an "install" target,
-   ;; or if either module is not bootstrapped.  It returns "bootstrap" for
-   ;; configure or build dependencies between bootstrapped modules; it returns
-   ;; "prebootstrap" for configure or build dependencies of bootstrapped
-   ;; modules on a build module (e.g. all-gcc on all-build-bison).  All this
-   ;; is only necessary for host modules.
-   (define dep-kind (lambda ()
-      (if (and (hash-ref boot-modules (dep-module "module"))
-	       (=* (dep-module "on") "build-"))
-	  "prebootstrap"
-
-	  (if (or (= (dep-subtarget "on") "install-")
-		  (not (hash-ref boot-modules (dep-module "module")))
-		  (not (hash-ref boot-modules (dep-module "on"))))
-              "normal"
-	      "bootstrap"))))
-
-   ;; We now build the hash table that is used by dep-kind.
-   (define boot-modules (make-hash-table 113))
-+]
-
-[+ FOR host_modules +][+
-   (if (exist? "bootstrap")
-       (hash-create-handle! boot-modules (get "module") #t))
-   "" +][+ ENDFOR host_modules +]
-[+ FOR target_modules +][+
-   (if (exist? "bootstrap")
-       (hash-create-handle! boot-modules (string-append "target-" (get "module")) #t))
-   "" +][+ ENDFOR target_modules +]
-
-# With all the machinery above in place, it is pretty easy to generate
-# dependencies.  Host dependencies are a bit more complex because we have
-# to check for bootstrap/prebootstrap dependencies.  To resolve
-# prebootstrap dependencies, prebootstrap modules are gathered in
-# a hash table.
-[+ FOR dependencies +][+ (make-dep "" "") +]
-[+ CASE (dep-kind) +]
-[+ == "prebootstrap"
-     +][+ FOR bootstrap_stage +]
-[+ (make-dep (dep-stage) "") +][+
-       ENDFOR bootstrap_stage +]
-all-prebootstrap: [+ (dep-target "" "on" (exist? "hard")) +]
-[+ == "bootstrap"
-     +][+ FOR bootstrap_stage +]
-[+ (make-dep (dep-stage) (dep-stage)) +][+
-       ENDFOR bootstrap_stage +]
-[+ ESAC +][+
-ENDFOR dependencies +]
-
-# Non-toplevel bootstrap rules must depend on several packages, to be built
-# before gcc.  Another wart that will go away, hopefully soon.
-@if gcc-no-bootstrap
-[+ FOR host_modules +][+
-   IF (and (not (= (get "module") "gcc"))
-	   (hash-ref boot-modules (get "module"))) +]
-all-prebootstrap: maybe-all-[+module+][+
-   ENDIF +][+
-ENDFOR host_modules +]
-@endif gcc-no-bootstrap
-
-CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@
-GDB_TK = @GDB_TK@
-INSTALL_GDB_TK = @INSTALL_GDB_TK@
-configure-gdb: $(CONFIGURE_GDB_TK)
-all-gdb: $(gdbnlmrequirements) $(GDB_TK)
-install-gdb: $(INSTALL_GDB_TK)
-
-# Serialization dependencies.  Host configures don't work well in parallel to
-# each other, due to contention over config.cache.  Target configures and 
-# build configures are similar.
-@serialization_dependencies@
-
-# --------------------------------
-# Regenerating top level configury
-# --------------------------------
-
-# Rebuilding Makefile.in, using autogen.
-AUTOGEN = autogen
-$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
-	cd $(srcdir) && $(AUTOGEN) Makefile.def
-
-# Rebuilding Makefile.
-Makefile: $(srcdir)/Makefile.in config.status
-	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-config.status: configure
-	CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck
-
-# Rebuilding configure.
-AUTOCONF = autoconf
-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
-	cd $(srcdir) && $(AUTOCONF)
-
-# ------------------------------
-# Special directives to GNU Make
-# ------------------------------
-
-# Don't pass command-line variables to submakes.
-.NOEXPORT:
-MAKEOVERRIDES=
-
-# end of Makefile.in
diff --git a/README-maintainer-mode b/README-maintainer-mode
index 0115a1e..fbe508f 100644
--- a/README-maintainer-mode
+++ b/README-maintainer-mode
@@ -3,7 +3,7 @@
 
 Note that if you configure with --enable-maintainer-mode, you will need
 special versions of automake, autoconf, libtool and gettext. You will
-find the sources for these in ftp://sources.redhat.com/pub/binutils.
+find the sources for these in ftp://sourceware.cygnus.com/pub/binutils.
 
 Note - "make distclean" does not work with maintainer mode enabled.
 The Makefiles in the some of the po/ subdirectories depend upon the
diff --git a/compile b/compile
deleted file mode 100755
index 1b1d232..0000000
--- a/compile
+++ /dev/null
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/config-ml.in b/config-ml.in
index 9372731..c968bf0 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -1,32 +1,6 @@
 # Configure fragment invoked in the post-target section for subdirs
 # wanting multilib support.
 #
-# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-#   Free Software Foundation, Inc.
-#
-# This file 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-#
-# Please report bugs to <gcc-bugs@gnu.org>
-# and send patches to <gcc-patches@gnu.org>.
-
 # It is advisable to support a few --enable/--disable options to let the
 # user select which libraries s/he really wants.
 #
@@ -43,6 +17,8 @@
 #   . ${srcdir}/../config-ml.in
 # fi
 #
+# See librx/configure.in in the libg++ distribution for an example of how
+# to handle autoconf'd libraries.
 #
 # Things are complicated because 6 separate cases must be handled:
 # 2 (native, cross) x 3 (absolute-path, relative-not-dot, dot) = 6.
@@ -54,10 +30,13 @@
 # The build tree is layed out as
 #
 # ./
+#   libg++
 #   newlib
 #   m68020/
+#          libg++
 #          newlib
 #          m68881/
+#                 libg++
 #                 newlib
 #
 # The nice feature about this arrangement is that inter-library references
@@ -90,6 +69,11 @@
 # newlib.  It is up to each target to turn on multilib support for the other
 # libraries as desired.
 
+# We have to handle being invoked by both Cygnus configure and Autoconf.
+#
+# Cygnus configure incoming variables:
+# srcdir, subdir, host, arguments
+#
 # Autoconf incoming variables:
 # srcdir, host, ac_configure_args
 #
@@ -99,14 +83,26 @@
 # Note that `host' in this case is GCC's `target'.  Target libraries are
 # configured for a particular host.
 
-Makefile=${ac_file-Makefile}
-ml_config_shell=${CONFIG_SHELL-/bin/sh}
-ml_realsrcdir=${srcdir}
+if [ -n "${ac_configure_args}" ]; then
+  Makefile=${ac_file-Makefile}
+  ml_config_shell=${CONFIG_SHELL-/bin/sh}
+  ml_arguments="${ac_configure_args}"
+  ml_realsrcdir=${srcdir}
+else
+  Makefile=${Makefile-Makefile}
+  ml_config_shell=${config_shell-/bin/sh}
+  ml_arguments="${arguments}"
+  if [ -n "${subdir}" -a "${subdir}" != "." ] ; then
+    ml_realsrcdir=${srcdir}/${subdir}
+  else
+    ml_realsrcdir=${srcdir}
+  fi
+fi
 
 # Scan all the arguments and set all the ones we need.
 
 ml_verbose=--verbose
-for option in ${ac_configure_args}
+for option in ${ml_arguments}
 do
   case $option in
   --*) ;;
@@ -132,7 +128,7 @@ do
 	enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
 	eval $enableopt="$optarg"
 	;;
-  --norecursion | --no-recursion)
+  --norecursion | --no*)
 	ml_norecursion=yes
 	;;
   --silent | --sil* | --quiet | --q*)
@@ -160,7 +156,7 @@ done
 if [ "${enable_multilib}" = yes ]; then
 
 # Compute whether this is the library's top level directory
-# (ie: not a multilib subdirectory, and not a subdirectory like newlib/src).
+# (ie: not a multilib subdirectory, and not a subdirectory like libg++/src).
 # ${with_multisubdir} tells us we're in the right branch, but we could be
 # in a subdir of that.
 # ??? The previous version could void this test by separating the process into
@@ -401,28 +397,6 @@ mips*-*-*)
 	esac
 	;;
 powerpc*-*-* | rs6000*-*-*)
-	if [ x$enable_aix64 = xno ]
-	then
-	  old_multidirs="${multidirs}"
-	  multidirs=""
-	  for x in ${old_multidirs}; do
-	    case "$x" in
-	      *ppc64* ) : ;;
-	      *) multidirs="${multidirs} ${x}" ;;
-	    esac
-	  done
-	fi
-	if [ x$enable_pthread = xno ]
-	then
-	  old_multidirs="${multidirs}"
-	  multidirs=""
-	  for x in ${old_multidirs}; do
-	    case "$x" in
-	      *pthread* ) : ;;
-	      *) multidirs="${multidirs} ${x}" ;;
-	    esac
-	  done
-	fi
 	if [ x$enable_softfloat = xno ]
 	then
 	  old_multidirs="${multidirs}"
@@ -489,6 +463,17 @@ powerpc*-*-* | rs6000*-*-*)
 	    esac
 	  done
 	fi
+	if [ x$enable_aix = xno ]
+	then
+	  old_multidirs="${multidirs}"
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "$x" in
+	      *mcall-aix* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	fi
 	;;
 sparc*-*-*)
 	case " $multidirs " in
@@ -525,16 +510,14 @@ multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ]
 
 cat > Multi.tem <<\EOF
 
-PWD_COMMAND=$${PWDCMD-pwd}
-
 # FIXME: There should be an @-sign in front of the `if'.
 # Leave out until this is tested a bit more.
 multi-do:
 	if [ -z "$(MULTIDIRS)" ]; then \
 	  true; \
 	else \
-	  rootpre=`${PWD_COMMAND}`/; export rootpre; \
-	  srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \
+	  rootpre=`pwd`/; export rootpre; \
+	  srcrootpre=`cd $(srcdir); pwd`/; export srcrootpre; \
 	  lib=`echo $${rootpre} | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
 	  compiler="$(CC)"; \
 	  for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \
@@ -546,22 +529,12 @@ multi-do:
 		flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
 		if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
 				CFLAGS="$(CFLAGS) $${flags}" \
-				FCFLAGS="$(FCFLAGS) $${flags}" \
-				FFLAGS="$(FFLAGS) $${flags}" \
-				ADAFLAGS="$(ADAFLAGS) $${flags}" \
 				prefix="$(prefix)" \
 				exec_prefix="$(exec_prefix)" \
-				GCJFLAGS="$(GCJFLAGS) $${flags}" \
 				CXXFLAGS="$(CXXFLAGS) $${flags}" \
 				LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
 				LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
 				LDFLAGS="$(LDFLAGS) $${flags}" \
-				MULTIFLAGS="$${flags}" \
-				DESTDIR="$(DESTDIR)" \
-				INSTALL="$(INSTALL)" \
-				INSTALL_DATA="$(INSTALL_DATA)" \
-				INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
-				INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
 				$(DO)); then \
 		  true; \
 		else \
@@ -579,7 +552,7 @@ multi-clean:
 	if [ -z "$(MULTIDIRS)" ]; then \
 	  true; \
 	else \
-	  lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
+	  lib=`pwd | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
 	  for dir in Makefile $(MULTIDIRS); do \
 	    if [ -f ../$${dir}/$${lib}/Makefile ]; then \
 	      if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
@@ -686,10 +659,10 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 
   if [ "${ml_verbose}" = --verbose ]; then
     echo "Running configure in multilib subdirs ${multidirs}"
-    echo "pwd: `${PWDCMD-pwd}`"
+    echo "pwd: `pwd`"
   fi
 
-  ml_origdir=`${PWDCMD-pwd}`
+  ml_origdir=`pwd`
   ml_libdir=`echo $ml_origdir | sed -e 's,^.*/,,'`
   # cd to top-level-build-dir/${with_target_subdir}
   cd ..
@@ -698,7 +671,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 
     if [ "${ml_verbose}" = --verbose ]; then
       echo "Running configure in multilib subdir ${ml_dir}"
-      echo "pwd: `${PWDCMD-pwd}`"
+      echo "pwd: `pwd`"
     fi
 
     if [ -d ${ml_dir} ]; then true; else
@@ -726,7 +699,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 
     case ${srcdir} in
     ".")
-      echo Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}
+      echo Building symlink tree in `pwd`/${ml_dir}/${ml_libdir}
       if [ "${with_target_subdir}" != "." ]; then
 	ml_unsubdir="../"
       else
@@ -747,7 +720,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
       ;;
     *)
       case "${srcdir}" in
-      /* | [A-Za-z]:[\\/]* ) # absolute path
+      /*) # absolute path
         ml_newsrcdir=${srcdir}
         ;;
       *) # otherwise relative
@@ -760,34 +733,31 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
     esac
 
     case "${progname}" in
-    /* | [A-Za-z]:[\\/]* )     ml_recprog=${progname} ;;
+    /*)     ml_recprog=${progname} ;;
     *)      ml_recprog=${dotdot}${progname} ;;
     esac
 
     # FIXME: POPDIR=${PWD=`pwd`} doesn't work here.
-    ML_POPDIR=`${PWDCMD-pwd}`
+    ML_POPDIR=`pwd`
     cd ${ml_dir}/${ml_libdir}
 
     if [ -f ${ml_newsrcdir}/configure ]; then
-      ml_recprog="${ml_newsrcdir}/configure"
+      ml_recprog="${ml_newsrcdir}/configure --cache-file=../config.cache"
     fi
 
     # find compiler flag corresponding to ${ml_dir}
-    for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do
+    for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do 
       dir=`echo $i | sed -e 's/;.*$//'`
       if [ "${dir}" = "${ml_dir}" ]; then
         flags=`echo $i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`
         break
       fi
     done
-    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags"'
+    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags"'
 
     if [ "${with_target_subdir}" = "." ]; then
 	CC_=$CC' '
 	CXX_=$CXX' '
-	F77_=$F77' '
-	GCJ_=$GCJ' '
-	GFORTRAN_=$GFORTRAN' '
     else
 	# Create a regular expression that matches any string as long
 	# as ML_POPDIR.
@@ -816,42 +786,6 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 	  esac
 	done
 
-	F77_=
-	for arg in ${F77}; do
-	  case $arg in
-	  -[BIL]"${ML_POPDIR}"/*)
-	    F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-	  "${ML_POPDIR}"/*)
-	    F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-	  *)
-	    F77_="${F77_}${arg} " ;;
-	  esac
-	done
-
-	GCJ_=
-	for arg in ${GCJ}; do
-	  case $arg in
-	  -[BIL]"${ML_POPDIR}"/*)
-	    GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-	  "${ML_POPDIR}"/*)
-	    GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-	  *)
-	    GCJ_="${GCJ_}${arg} " ;;
-	  esac
-	done
-
-	GFORTRAN_=
-	for arg in ${GFORTRAN}; do
-	  case $arg in
-	  -[BIL]"${ML_POPDIR}"/*)
-	    GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-	  "${ML_POPDIR}"/*)
-	    GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-	  *)
-	    GFORTRAN_="${GFORTRAN_}${arg} " ;;
-	  esac
-	done
-
 	if test "x${LD_LIBRARY_PATH+set}" = xset; then
 	  LD_LIBRARY_PATH_=
 	  for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do
@@ -889,7 +823,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
 
     if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
 	--with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
-	${ac_configure_args} ${ml_srcdiroption} ; then
+	${ml_arguments} ${ml_srcdiroption} ; then
       true
     else
       exit 1
diff --git a/config.guess b/config.guess
index 17690ae..cec14aa 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
 
-timestamp='2006-01-02'
+timestamp='2001-09-13'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,18 +17,15 @@ timestamp='2006-01-02'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Written by Per Bothner <bothner@cygnus.com>.
+# Please send patches to <config-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -55,7 +52,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -68,11 +65,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -90,42 +87,30 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
 
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 
+# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c ;
+	for c in cc gcc c89 ; do
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+	  if test $? = 0 ; then
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
+	rm -f $dummy.c $dummy.o $dummy.rel ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+esac'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -149,23 +134,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# object file format.  This provides both forward
 	# compatibility and a consistent mechanism for selecting the
 	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	# Determine the machine/vendor (is the vendor relevant).
+	case "${UNAME_MACHINE}" in
+	    amiga) machine=m68k-unknown ;;
+	    arm32) machine=arm-unknown ;;
+	    atari*) machine=m68k-atari ;;
+	    sun3*) machine=m68k-sun ;;
+	    mac68k) machine=m68k-apple ;;
+	    macppc) machine=powerpc-apple ;;
+	    hp3[0-9][05]) machine=m68k-hp ;;
+	    ibmrt|romp-ibm) machine=romp-ibm ;;
+	    sparc*) machine=`uname -p`-unknown ;;
+	    *) machine=${UNAME_MACHINE}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	case "${UNAME_MACHINE}" in
+	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
@@ -182,128 +167,138 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		;;
 	esac
 	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit ;;
+	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
+	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
+	fi
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
+	.globl main
+	.align 4
+	.ent main
+main:
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
+	.end main
+EOF
+	eval $set_cc_for_build
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		case `./$dummy` in
+			0-0)
+				UNAME_MACHINE="alpha"
+				;;
+			1-0)
+				UNAME_MACHINE="alphaev5"
+				;;
+			1-1)
+				UNAME_MACHINE="alphaev56"
+				;;
+			1-101)
+				UNAME_MACHINE="alphapca56"
+				;;
+			2-303)
+				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
+			2-1307)
+				UNAME_MACHINE="alphaev68"
+				;;
+		esac
+	fi
+	rm -f $dummy.s $dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit ;;
+	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit ;;
+	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit ;;
+	exit 0;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
+	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
+	exit 0;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
+	exit 0;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -311,32 +306,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit ;;
+	exit 0 ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
+	exit 0 ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -345,12 +333,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
+	exit 0 ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
@@ -360,10 +348,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit ;;
+	exit 0 ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -374,40 +362,37 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+        exit 0 ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
+        exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit ;;
+	exit 0 ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -431,33 +416,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
+	$CC_FOR_BUILD $dummy.c -o $dummy \
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
+	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit ;;
+	exit 0 ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit ;;
+	exit 0 ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit ;;
+	exit 0 ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit ;;
+	exit 0 ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -473,29 +452,29 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+ 	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit ;;
+	exit 0 ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit ;;
+	exit 0 ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit ;;
+	exit 0 ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit ;;
+	exit 0 ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
+	exit 0 ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit ;;
+	exit 0 ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -503,7 +482,7 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
+	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -518,20 +497,17 @@ EOF
 			exit(0);
 			}
 EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+		rm -f $dummy.c $dummy
+		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit ;;
+	exit 0 ;;
     *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
@@ -543,36 +519,38 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
+	exit 0 ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit ;;
+	exit 0 ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit ;;
+	exit 0 ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
+	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit ;;
+	exit 0 ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit ;;
+	exit 0 ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit ;;
+	exit 0 ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit ;;
+	exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+              case "${HPUX_REV}" in
+                11.[0-9][0-9])
+                  if [ -x /usr/bin/getconf ]; then
+                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                     case "${sc_cpu_version}" in
                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -581,13 +559,13 @@ EOF
                         case "${sc_kernel_bits}" in
                           32) HP_ARCH="hppa2.0n" ;;
                           64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                         esac ;;
                     esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+                  fi ;;
+              esac
+              if [ "${HP_ARCH}" = "" ]; then
+	      eval $set_cc_for_build
+              sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
               #include <stdlib.h>
@@ -620,37 +598,17 @@ EOF
                   exit (0);
               }
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
+	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+	    rm -f $dummy.c $dummy
+	fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
+	exit 0 ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
+	exit 0 ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -678,218 +636,149 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
-	exit ;;
+	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit ;;
+	exit 0 ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit ;;
+	exit 0 ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit ;;
+	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit ;;
+	exit 0 ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit ;;
+	exit 0 ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit ;;
+	exit 0 ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit ;;
+	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+        exit 0 ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+        exit 0 ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+        exit 0 ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+        exit 0 ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+        exit 0 ;;
+    CRAY*X-MP:*:*:*)
+	echo xmp-cray-unicos
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
+    CRAY*T3D:*:*:*)
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	exit 0 ;;
+    CRAY-2:*:*:*)
+	echo cray2-cray-unicos
+        exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+        exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
+	exit 0 ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
+	exit 0 ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    x86:Interix*:[345]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
+	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
+	echo i386-pc-interix
+	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
+	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit ;;
+	exit 0 ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	exit 0 ;;
     *:GNU:*:*)
-	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
+	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	echo ${UNAME_MACHINE}-unknown-linux
+	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
+	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
+	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
+	esac
 	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -903,7 +792,7 @@ EOF
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
+	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -911,34 +800,27 @@ EOF
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit ;;
+	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
+	exit 0 ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit ;;
+	exit 0 ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+	ld_supported_targets=`cd /; ld --help 2>&1 \
 			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
 				    s/.*supported targets: *//
@@ -950,54 +832,52 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
+		exit 0 ;;		
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
+		exit 0 ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
+		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
+	cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-pc-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-pc-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit ;;
+	exit 0 ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -1005,27 +885,7 @@ EOF
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
+	exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1033,100 +893,99 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	exit 0 ;;
+    i*86:*:5:[78]*)
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
+	exit 0 ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit ;;
+	exit 0 ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit ;;
+        exit 0 ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit ;;
+	exit 0 ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit ;;
+	exit 0 ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit ;;
+	exit 0 ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	exit 0 ;;
+    M68*:*:R3V[567]*:*)
+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+          && echo i486-ncr-sysv4 && exit 0 ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit ;;
+	exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit ;;
+	exit 0 ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit ;;
+	exit 0 ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1134,98 +993,82 @@ EOF
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit ;;
+	exit 0 ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit ;;
+        exit 0 ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit ;;
+	exit 0 ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
+	exit 0 ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
-	exit ;;
+	exit 0 ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit ;;
+	exit 0 ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+        exit 0 ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit ;;
+	exit 0 ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit ;;
+	exit 0 ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit ;;
+	exit 0 ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
+	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
+	if test "${UNAME_MACHINE}" = "x86pc"; then
 		UNAME_MACHINE=pc
 	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
+	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
+	exit 0 ;;
+    NSR-[KW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit ;;
+	exit 0 ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit ;;
+	exit 0 ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
+	exit 0 ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1236,47 +1079,36 @@ EOF
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
+	exit 0 ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit 0 ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit ;;
+	exit 0 ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit ;;
+	exit 0 ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit ;;
+	exit 0 ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit ;;
+	exit 0 ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit ;;
+	exit 0 ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
+	exit 0 ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1308,7 +1140,7 @@ main ()
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
+  printf ("arm-acorn-riscix"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1397,12 +1229,12 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1411,22 +1243,22 @@ then
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit ;;
+	exit 0 ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit ;;
+	exit 0 ;;
     c34*)
 	echo c34-convex-bsd
-	exit ;;
+	exit 0 ;;
     c38*)
 	echo c38-convex-bsd
-	exit ;;
+	exit 0 ;;
     c4*)
 	echo c4-convex-bsd
-	exit ;;
+	exit 0 ;;
     esac
 fi
 
@@ -1437,9 +1269,7 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+    ftp://ftp.gnu.org/pub/gnu/config/
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/config.if b/config.if
new file mode 100644
index 0000000..3958928
--- /dev/null
+++ b/config.if
@@ -0,0 +1,93 @@
+#! /dev/null
+# Don't call it directly. This shell script fragment is called to
+# determine:
+#
+#	1. libstcxx_interface: the interface name for libstdc++.
+#	2. cxx_interface: the interface name for c++.
+#	3. libc_interface: the interface name for libc.
+#
+
+# Get the top level src dir.
+if [ -z "${topsrcdir}" -a -z "${top_srcdir}" ]
+then
+  echo "Undefined top level src dir: topsrcdir and top_srcdir are empty" >&2
+  exit 1
+fi
+
+if [ -n "${topsrcdir}" ]
+then
+  if_topsrcdir=${topsrcdir}
+else
+  if_topsrcdir=${top_srcdir}
+fi
+
+if [ "${enable_libstdcxx_v3}" = "yes" ] ; then
+  libstdcxx_srcdir=${if_topsrcdir}/libstdc++-v3
+else
+  libstdcxx_srcdir=${if_topsrcdir}/libstdc++
+fi
+
+if [ -f ${libstdcxx_srcdir}/Makefile.in ]; then
+# We check libstdc++ for libstdcxx_interface.
+libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/Makefile.in | sed 's/INTERFACE[ 	]*=[ 	]*\(.*\)/\1/'`
+else
+libstdcxx_interface=
+fi
+
+if [ -f ${if_topsrcdir}/gcc/cp/Makefile.in ]; then
+# We check gcc/cp for cxx_interface.
+cxx_interface=`grep "^INTERFACE" ${if_topsrcdir}/gcc/cp/Makefile.in | sed 's/INTERFACE[ 	]*=[ 	]*\(.*\)/\1/'`
+else
+cxx_interface=
+fi
+
+# The trickiest part is libc_interface.
+if [ -z "${libc_interface}" ]
+then
+  case ${target_os} in
+  *linux*libc1*|*linux*libc5*)
+    case ${target_alias} in
+    *alpha*|*powerpc*)
+      libc_interface=-libc5.9-
+      ;;
+    *)
+      libc_interface=-libc5-
+      ;;
+    esac
+    ;;
+  *linux*gnu*)
+    # We have to work harder to figure it out.
+    if [ ${target_alias} = ${build_alias} ]
+    then
+      dummy=if$$
+      cat >$dummy.c <<EOF
+#include <features.h>                      
+main(argc, argv)
+     int argc;          
+     char *argv[];
+{
+  printf("%d\n", __GLIBC_MINOR__);
+  return 0;
+}
+EOF
+      ${CC-cc} $dummy.c -o $dummy 2>/dev/null
+      if [ "$?" = 0 ]
+      then
+	libc_interface=-libc6.`./$dummy`-
+	rm -f $dummy.c $dummy
+      else
+	# It should never happen.
+	echo "Cannot find the GNU C library minor version number." >&2
+	rm -f $dummy.c $dummy
+	exit 1
+      fi
+    else
+      # Cross compiling. Assume glibc 2.2.
+      libc_interface=-libc6.2-
+    fi
+    ;;
+  *)
+    libc_interface=-
+    ;;
+  esac
+fi
diff --git a/config.sub b/config.sub
index a4e8a94..1888975 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
 
-timestamp='2006-01-02'
+timestamp='2001-11-21'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,15 +21,14 @@ timestamp='2006-01-02'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -71,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -84,11 +83,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
     --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
     --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -100,7 +99,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit ;;
+       exit 0;;
 
     * )
        break ;;
@@ -119,9 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -147,7 +144,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@@ -172,10 +169,6 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -192,10 +185,6 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -238,56 +227,34 @@ case $basic_machine in
 	1750a | 580 \
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| bfin \
 	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| d10v | d30v | dsp16xx \
+	| fr30 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
+	| m32r | m68000 | m68k | m88k | mcore \
+	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 \
 	| mn10200 | mn10300 \
-	| mt \
-	| msp430 \
 	| ns16k | ns32k \
-	| or32 \
+	| openrisc \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
+	| sh | sh[34] | sh[34]eb | shbe | shle \
+	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
+	| tahoe | thumb | tic80 | tron \
+	| v850 \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xscale | xstormy16 \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -295,9 +262,6 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -314,65 +278,41 @@ case $basic_machine in
 	580-* \
 	| a29k-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| alphapca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
 	| avr-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| clipper-* | cray2-* | cydra-* \
+	| d10v-* | d30v-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
+	| m32r-* \
+	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | mcore-* \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
+	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -389,9 +329,6 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -406,12 +343,6 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -443,10 +374,6 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -467,45 +394,30 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | j90)
-		basic_machine=j90-cray
+	cray | ymp)
+		basic_machine=ymp-cray
 		os=-unicos
 		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
+	[cjt]90)
+		basic_machine=${basic_machine}-cray
+		os=-unicos
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -514,10 +426,6 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -690,27 +598,32 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
 		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -786,13 +699,6 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -815,61 +721,49 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-	pc532 | pc532-*)
+        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
+	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+	pentiumii-* | pentium2-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-		;;
+	        ;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-		;;
+	        ;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
-		;;
+	        ;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
-		;;
+	        ;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
@@ -880,10 +774,6 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -904,16 +794,6 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -921,9 +801,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -991,42 +868,22 @@ case $basic_machine in
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
+		basic_machine=t3e-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1048,8 +905,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
+               basic_machine=f301-fujitsu
+               ;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -1070,17 +927,17 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
+	windows32)
+		basic_machine=i386-pc
+		os=-windows32-msvcrt
 		;;
-	ymp)
-		basic_machine=ymp-cray
+	xmp)
+		basic_machine=xmp-cray
 		os=-unicos
 		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -1101,12 +958,16 @@ case $basic_machine in
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
+	mips)
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
+		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1123,13 +984,13 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-	cydra)
+        cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -1144,6 +1005,10 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
+	c4x*)
+		basic_machine=c4x-none
+		os=-coff
+		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1199,23 +1064,17 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos*)
+	      | -os2* | -vos* | -palmos* | -uclinux*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1227,21 +1086,16 @@ case $os in
 			;;
 		esac
 		;;
-	-nto-qnx*)
-		;;
 	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		os=-nto-qnx
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1254,9 +1108,6 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
-		os=-os400
-		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1278,20 +1129,14 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
-	-syllable*)
-		os=-syllable
-		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
 	-ns2 )
-		os=-nextstep2
+	        os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1303,9 +1148,6 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
-		os=-tpf
-		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1333,17 +1175,8 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+	        os=-mint
 		;;
 	-none)
 		;;
@@ -1376,14 +1209,10 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-	pdp11-*)
+        pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1410,9 +1239,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or32-*)
-		os=-coff
-		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1422,15 +1248,9 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
-	*-haiku)
-		os=-haiku
-		;;
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
-		os=-mmixware
-		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1482,19 +1302,19 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-	*-gould)
+        *-gould)
 		os=-sysv
 		;;
-	*-highlevel)
+        *-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-	*-sgi)
+        *-sgi)
 		os=-irix
 		;;
-	*-siemens)
+        *-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1563,16 +1383,10 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			-os400*)
-				vendor=ibm
-				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
+			-vxsim* | -vxworks*)
 				vendor=wrs
 				;;
 			-aux*)
@@ -1596,7 +1410,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit
+exit 0
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/config/ChangeLog b/config/ChangeLog
index 1ddcfd4..5a398ec 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,359 +1,8 @@
-2006-02-14  Paolo Bonzini  <bonzini@gnu.org>
-            Andreas Schwab  <schwab@suse.de>
-
-        * acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Use correct program name.
-	(ACX_CHECK_INSTALLED_TARGET_TOOL): Likewise, and always set $1.
-
-2006-01-26  Paolo Bonzini  <bonzini@gnu.org>
-
-	* acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Test $with_build_time_tools.
-	(ACX_PATH_SEP): New.
-	(ACX_TOOL_DIRS): Move here from the gcc directory.
-	(ACX_CHECK_INSTALLED_TARGET_TOOL): New.
-	(GCC_TARGET_TOOL): Do not use a host tool if we found a target tool
-	with a complete path in either $with_build_time_tools or $exec_prefix.
-
-2006-01-02  Paolo Bonzini  <bonzini@gnu.org>
-
-        PR target/25259
-        * stdint.m4: New.
-
-2005-12-20  Paolo Bonzini  <bonzini@gnu.org>
-
-        Revert Ada-related part of the previous change.
-
-        * mt-ppc-aix: Delete.
-
-2005-12-19  Paolo Bonzini  <bonzini@gnu.org>
-        
-        * mt-ppc-aix, mh-ppc-aix: New.
-        
-2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
-
-	* acx.m4 (GCC_TARGET_TOOL): New.
-
-2005-09-23  Tom Tromey  <tromey@redhat.com>
-
-	* enable.m4: New file.
-	* tls.m4: New file.
-
-2005-08-12  Paolo Bonzini  <bonzini@gnu.org>
-
-	* config/acx.m4 (NCN_CHECK_TARGET_TOOL, NCN_STRICT_CHECK_TOOL,
-	NCN_STRICT_CHECK_TARGET_TOOL): Remove.
-	(NCN_STRICT_CHECK_TOOLS, NCN_STRICT_CHECK_TARGET_TOOLS): New,
-	based on the deleted macros.
-
-2005-07-27  Mark Mitchell  <mark@codesourcery.com>
-
-	* mt-gnu (CXXFLAGS): Include SYSROOT_CFLAGS_FOR_TARGET.
-
-2005-07-16  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* all files: Update FSF address.
-
-2005-06-14  Tom Tromey  <tromey@redhat.com>
-
-	PR libgcj/19877:
-	* no-executables.m4: Call real AC_FUNC_MMAP when cache variable
-	is set but not 'no'.
-
-2005-06-13  Zack Weinberg  <zack@codesourcery.com>
-
-	* depstand.m4, lead-dot.m4: New files.
-
-2005-05-19  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* accross.m4: Delete file.
-
-2005-05-12  Ryota Kunisawa  <kunisawa@access.co.jp>
-
-	PR bootstrap/21230
-	* warnings.m4 (ACX_PROG_CC_WARNING_ALMOST_PEDANTIC): Add
-	double quotes around GCC variable.
-
-2005-04-29  Paolo Bonzini  <bonzini@gnu.org>
-
-	* acx.m4 (ACX_PROG_GNAT): Remove stray break.
-
-2005-03-31  Paolo Bonzini  <bonzini@gnu.org>
-
-	* gcc-lib-path.m4: Remove.
-
-2005-03-21  Zack Weinberg  <zack@codesourcery.com>
-
-	* gxx-include-dir.m4: In all substitutions, leave $(gcc_version)
-	to be expanded by the Makefile.
-
-2005-03-15  Zack Weinberg  <zack@codesourcery.com>
-
-	* gcc-version.m4: Delete.
-
-2005-02-28  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/17383
-	* acx.m4 (GCC_TOPLEV_SUBDIRS): Set HOST_SUBDIR if an in-src
-	gcc build is going.
-
-2005-01-23  Joseph S. Myers  <joseph@codesourcery.com>
-
-	* warnings.m4 (ACX_PROG_CC_WARNING_ALMOST_PEDANTIC): Don't do
-	anything for non-GCC compilers.
-
-2004-12-03  Richard Sandiford  <rsandifo@redhat.com>
-
-	* gxx-include-dir.m4: New file.
-
-2004-12-02  Richard Sandiford  <rsandifo@redhat.com>
-
-	* gcc-version.m4: New file.
-
-2004-09-24  Zack Weinberg  <zack@codesourcery.com>
-
-	* warnings.m4: New file.
-
-2004-09-23  H.J. Lu  <hongjiu.lu@intel.com>
-
-	PR bootstrap/17369
-	* gcc-lib-path.m4: New file.
-
-2004-09-22  Kelley Cook  <kcook@gcc.gnu.org>
-
-	* gettext-sister.m4: Renamed from gettext.m4
-	* codeset.m4, gettext.m4, glibc21.m4, iconv.m4, intdiv0.m4, po.m4,
-	inttypes.m4, inttypes-pri.m4, inttypes_h.m4, lcmessage.m4, lib-ld.m4,
-	lib-link.m4, lib-prefix.m4, nls.m4, progtest.m4, stdint_h.m4,
-	uintmax_t.m4, ulonglong.m4: Import from gettext-0.12.1 sources.
-
-2004-08-31  Robert Bowdidge <bowdidge@apple.com>
-
-	* mh-ppc-darwin: Add file, and override BOOT_CFLAGS.
-
-2004-08-13  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* Add ACX_{TARGET,HOST,BUILD}_NONCANONICAL,
-	which do an automatic AC_SUBST on _GCC_TOPLEV_*_NONCANONICAL.
-	The intention is that we will migrate to these bit by bit.
-
-2004-08-01  Robert Millan  <robertmh@gnu.org>
-
-	* mt-linux: Rename to ...
-	* mt-gnu: ... this.
-
-2004-06-09  Paolo Bonzini  <bonzini@gnu.org>
-
-	* acx.m4 (ACX_PROG_LN): From gcc, modified to
-	accept a parameter.
-
-2004-05-23  Paolo Bonzini  <bonzini@gnu.org>
-
-	* acx.m4 (ACX_HEADER_STDBOOL, ACX_HEADER_STRING):
-	From gcc.
-
-2004-04-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* acx.m4 (ACX_PROG_GNAT): Check if ${CC} produces object file for
-	Ada compilation.
-	Fix acx_cv_cc_gcc_supports_ada spelling.
-
-2004-03-08  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR ada/14131
-	Move language detection to the top level.
-	* acx.m4 (ACX_PROG_GNAT): New macro, moved here
-	from the gcc subdirectory.
-
-2004-03-09  Hans-Peter Nilsson  <hp@axis.com>
-
-	* accross.m4 (AC_C_BIGENDIAN_CROSS): Compile endian probe with
-	"-c".  Properly quote parameter for AC_MSG_ERROR.
-
-2004-01-14  Maciej W. Rozycki  <macro@ds2.pg.gda.pl>
-
-	* acinclude.m4: Quote names of macros to be defined by AC_DEFUN
-	throughout.
-	* aclocal.m4: Regenerate.
-	* configure: Regenerate.
-
-2003-10-14  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* gettext.m4: Properly quote arguments to AC_DEFUN.
-
-2003-09-24  Daniel Jacobowitz  <drow@mvista.com>
-
-	* acx.m4 (AC_PROG_CPP_WERROR): New.
-
-2003-08-27  Daniel Jacobowitz  <drow@mvista.com>
-
-	* no-executables.m4: New file.
-
-2003-07-07  Zack Weinberg  <zack@codesourcery.com>
-
-	* gettext.m4: Delete all former contents.
-	(ZW_GNU_GETTEXT_SISTER_DIR): New macro.
-	* progtest.m4: New file.
-
-2003-07-04  Zack Weinberg  <zack@codesourcery.com>
-
-	* gettext.m4: New file - copy of gettext.m4 from binutils
-	CVS, with added AC_ISC_POSIX macro from gcc/aclocal.m4.
-
-2003-05-14  Kelley Cook  <kelleycook@wideopenwest.com>
-
-	* acinclude.m4: Accept i[3456789]86 for machine type.
-
-2003-05-18  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* acx.m4: Introduce _GCC_TOPLEV_NONCANONICAL_BUILD,
-	_GCC_TOPLEV_NONCANOICAL_HOST, _GCC_TOPLEV_NONCANONICAL_TARGET,
-	GCC_TOPLEV_SUBDIRS.
-
-2003-03-04  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* mh-dgux: Delete.
-
-2002-12-28  Alexandre Oliva  <aoliva@redhat.com>
-
-	* acx.m4: Name cache variables properly.
-	(NCN_STRICT_CHECK_TOOL): If program is not found and
-	value-if-not-found is empty, use ${ncn_tool_prefix}$2 or $2,
-	depending on whether build != host or not.
-	(NCN_STRICT_CHECK_TARGET_TOOL): Ditto, with the target prefix.
-
-2002-12-28  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-	* acx.m4: New.
-	* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
-	mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
-	mh-riscos, mh-sysv: Delete.
-	* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
-	mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
-
-2002-12-16  Christopher Faylor  <cgf@redhat.com>
-
-	* mh-cygwin: Don't build libtermcap if it doesn't exist.
-
-2002-12-22  Geoffrey Keating  <geoffk@apple.com>
-
-	* mt-aix43: Delete.
-
-2002-11-23  H.J. Lu <hjl@gnu.org>
-
-	* accross.m4: New.
-
-2002-11-10  Stan Shebs  <shebs@apple.com>
-
-	Retire common MPW configury bits.
-	* mpw-mh-mpw: Remove.
-	* mpw: Remove directory along with all of its files.
-
-2002-05-16  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
-
-	* acinclude.m4: Allow for PWDCMD to override hardcoded pwd.
-
-2002-05-13  Nathanael Nerode  <neroden@twcny.rr.com>
-
-	* mh-apollo68: remove unused HDEFINES setting.
-	* mh-dgux: remove unused HDEFINES setting.
-	* mh-dgux386: remove unused HDEFINES setting, duplicate RANLIB=true.
-
-2002-04-29  Nathanael Nerode  <neroden@twcny.rr.com>
-
-	* mh-cxux: remove dead code
-	* mh-dgux386: remove dead code
-	* mh-hp300: remove dead code
-	* mh-hpux: remove dead code
-	* mh-hpux8: remove dead code
-	* mh-irix5: remove dead code
-	* mh-irix6: remove dead code
-	* mh-ncr3000: remove dead code
-	* mh-ncrsvr43: remove dead code
-	* mh-necv4: remove dead code
-	* mh-sco: remove dead code
-	* mh-solaris: remove dead code
-	* mh-sysv: remove dead code
-	* mh-sysv4: remove dead code
-	* mh-sysv5: remove dead code
-	* mh-irix4: remove, contains only dead code
-
-	* mt-armpic: Delete.
-	* mt-elfalphapic: Delete.
-	* mt-i370pic: Delete.
-	* mt-ia64pic: Delete.
-	* mt-m68kpic: Delete.
-	* mt-papic: Delete.
-	* mt-ppcpic: Delete.
-	* mt-s390pic: Delete.
-	* mt-sparcpic: Delete.
-	* mt-x86pic: Delete.
-
-2002-04-19  Nathanael Nerode  <neroden@twcny.rr.com>
-
-	* mh-a68bsd: clean out dead code
-	* mh-apollo68: clean out dead code
-	* mh-cxux: clean out dead code
-	* mh-decstation: clean out dead code
-	* mh-dgux: clean out dead code
-	* mh-dgux386: clean out dead code
-	* mh-hp300: clean out dead code
-	* mh-hpux: clean out dead code
-	* mh-hpux8: clean out dead code
-	* mh-interix: clean out dead code
-	* mh-irix4: clean out dead code
-	* mh-lynxrs6k: clean out dead code
-	* mh-mingw32: clean out dead code
-	* mh-ncr3000: clean out dead code
-	* mh-ncrsvr43: clean out dead code
-	* mh-necv4: clean out dead code
-	* mh-openedition: clean out dead code
-	* mh-riscos: clean out dead code
-	* mh-sco: clean out dead code
-	* mh-sysv4: clean out dead code
-	* mh-lynxos: removed, contained only dead code
-	* mh-vaxult2: removed, contained only dead code
-	* mh-sun3: removed, contained only dead code
-
-2002-04-15  Keith Seitz  <keiths@redhat.com>
-
-	* acinclude.m4 (CYG_AC_PATH_TCLCONFIG): Search the win/ directory,
-	too.
-	(CYG_AC_PATH_TKCONFIG): Likewise.
-
-2001-10-07  Joseph S. Myers  <jsm28@cam.ac.uk>
-
-	* acinclude.m4: Fix spelling error of "separate" as "seperate".
-
-2001-05-22  Jason Merrill  <jason_merrill@redhat.com>
-
-	* mt-linux (CXXFLAGS_FOR_TARGET): Lose -fvtable-thunks.
-
-2001-01-27  Richard Henderson  <rth@redhat.com>
-
-	* mt-alphaieee: New file.
-
-2001-01-02  Laurynas Biveinis  <lauras@softhome.net>
-
-	* mh-djgpp: do not set CFLAGS.
-
-2000-08-04  Mark Elbrecht  <snowball3@bigfoot.com>
-
-	* mh-djgpp: Conditionally set 'target_alias' to djgpp. Conditionally
-	modify 'gcc_version'.
-
-2000-07-21  Andrew Haley  <aph@cygnus.com>
-
-	* mh-ia64pic: New file.
-	* mt-ia64pic: New file.
-
 2001-02-09  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* mh-s390pic: New file.
 	* mt-s390pic: New file.
 
-2000-09-26  David Edelsohn  <edelsohn@gnu.org>
-
-	* mt-aix43 (NM_FOR_TARGET): Add -B bsd-style flag.
-
 2000-07-14  Mark P Mitchell  <mark@codesourcery.com>
 
 	* mh-irix6 (CC): Don't set it.
@@ -374,7 +23,7 @@
 
 2000-02-22  Nick Clifton  <nickc@cygnus.com>
 
-	* mt-wince: new file: Makefile fragment for WinCE targets.
+	* config/mt-wince: new file: Makefile fragment for WinCE targets.
 
 2000-01-06  Geoff Keating  <geoffk@cygnus.com>
 
@@ -389,15 +38,6 @@ Tue Sep  7 23:31:01 1999  Linas Vepstas  <linas@linas.org>
 
 	* mt-d30v: New file, pass -g -Os -Wa,-C as default options.
 
-Thu Mar 18 00:17:50 1999  Mark Elbrecht <snowball3@usa.net>
-
-	* mh-go32: Delete.
-	* mh-djgpp: New. Renamed from mh-go32.
-
-Wed Feb 24 12:52:17 1999  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* mh-windows: Ditto.
-
 1999-02-08  Syd Polk  <spolk@cygnus.com>
 
 	* acinclude.m4: Added macros to find itcl files.
@@ -411,23 +51,11 @@ Tue Feb  2 22:51:21 1999 Philip Blundell  <philb@gnu.org>
 	* mh-armpic: New file.  Patch from Jim Pick <jim@jimpick.com>.
 	* mt-armpic: Likewise.
 
-Sat Jan 30 08:04:00 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* mh-interix: New file.
-
 Mon Jan 18 19:41:08 1999  Christopher Faylor <cgf@cygnus.com>
 
 	* cygwin.mh: Activate commented out dependencies for
 	gdb: libtermcap.
 
-Wed Dec 30 20:34:52 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* mt-cygwin: Remove.
-
-Wed Dec 30 01:13:03 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* mt-cygwin: New file.  libtermcap target info.
-
 Wed Nov 18 20:29:46 1998  Christopher Faylor <cgf@cygnus.com>
 
 	* cygwin.mh: Add extra libtermcap target information.
@@ -436,8 +64,8 @@ Wed Nov 18 20:29:46 1998  Christopher Faylor <cgf@cygnus.com>
 
 Mon Nov  2 15:15:33 1998  Geoffrey Noer  <noer@cygnus.com>
 
-	* mh-cygwin32: delete
-	* mh-cygwin: was mh-cygwin32
+        * mh-cygwin32: delete
+        * mh-cygwin: was mh-cygwin32
 
 1998-10-26  Syd Polk  <spolk@cygnus.com>
 
@@ -464,7 +92,7 @@ Mon Aug 10 00:15:47 1998  HJ Lu (hjl@gnu.org)
 1998-05-29  Rob Savoye  <rob@chinadoll.cygnus.com>
 
 	* acinclude.m4: New collection of generic autoconf macros.
-
+	
 Wed Apr 22 12:24:28 1998  Michael Meissner  <meissner@cygnus.com>
 
 	* mt-ospace: New file, support using -Os instead of -O2 to compile
@@ -482,29 +110,10 @@ Thu Mar 26 01:54:25 1998  Geoffrey Noer  <noer@cygnus.com>
 
 	* mh-cygwin32: stop configuring and building dosrel.
 
-Fri Feb  6 01:33:52 1998  Manfred Hollstein  <manfred@s-direktnet.de>
-
-	* mh-sparcpic (PICFLAG): Define to properly according
-	to current multilib configuration.
-	* mt-sparcpic (PICFLAG_FOR_TARGET): Define to properly
-	according to current multilib configuration.
-
-Sun Jan  4 01:06:55 1998  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* mh-mingw32: New file.
-
 Thu Sep 11 16:43:27 1997  Jim Wilson  <wilson@cygnus.com>
 
 	* mh-elfalphapic, mt-elfalphapic: New files.
 
-1997-09-15 02:37  Ulrich Drepper  <drepper@cygnus.com>
-
-	* mt-linux: Define CXXFLAGS to make sure -fvtable-thunks is used.
-
-Sun Sep 14 20:53:42 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* mh-cygwin32: ok to build split texinfo files
-
 Wed Jul 23 12:32:18 1997  Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>
 
 	* mh-go32 (CFLAGS): Don't set -fno-omit-frame-pointer.
@@ -526,8 +135,8 @@ Tue Mar 25 18:16:43 1997  Geoffrey Noer  <noer@cygnus.com>
 
 Wed Jan  8 19:56:43 1997  Geoffrey Noer  <noer@cygnus.com>
 
-	* mh-cygwin32: override CFLAGS so debug info isn't included
-	in cygwin32-hosted tools by default
+        * mh-cygwin32: override CFLAGS so debug info isn't included
+        in cygwin32-hosted tools by default
 
 Tue Dec 31 16:04:26 1996  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -537,20 +146,6 @@ Mon Nov 11 10:29:51 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* mt-ppc: Delete file, options moved to newlib configure.
 
-Mon Oct 28 17:32:46 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* mh-windows:  Add rules for building MSVC makefiles.
-
-Thu Oct 24 09:02:07 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* mh-windows (HOST_FLAGS):  Set srcroot, which is needed
-	for MSVC build procedure.
-
-Tue Oct  8 08:32:48 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* mh-windows:  Add support for windows host
-	(that is a build done under the Microsoft build environment).
-
 Fri Oct  4 12:21:03 1996  Angela Marie Thomas (angela@cygnus.com)
 
 	* mh-dgux386: New file.  x86 dgux specific flags
@@ -564,11 +159,6 @@ Sat Aug 17 04:56:25 1996  Geoffrey Noer  <noer@skaro.cygnus.com>
 
 	* mh-cygwin32: don't -D_WIN32 here anymore
 
-Sun Aug 11 20:51:50 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* mh-cygwin32 (CFLAGS):  Define _WIN32 to be compatible
-	with normal Windows compilation environment.
-
 Thu Aug 15 19:46:44 1996  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-mh-mpw (SEGFLAG_68K, SEGFLAG_PPC): Remove.
@@ -638,28 +228,13 @@ Thu Jan 25 16:05:33 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* mh-ncrsvr43 (CFLAGS): Remove -Hnocopyr.
 
-Thu Nov 30 14:45:25 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
-
-	* mt-v810 (CC_FOR_TARGET): Add -ansi flag.  NEC compiler
-	defaults to K&R mode, but doesn't have varargs.h, so we have to
-	compile in ANSI mode.
-
-Wed Nov 29 13:49:08 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
-
-	* mt-v810 (CC_FOR_TARGET, AS_FOR_TARGET, AR_FOR_TARGET,
-	RANLIB_FOR_TARGET): Set as appropriate for NEC v810 toolchain.
-
-Tue Nov 14 15:03:12 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
-
-	* mh-i386win32: add LD_FOR_TARGET.
-
 Tue Nov  7 15:41:30 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-mh-mpw (CC_MWC68K, CC_MWCPPC): Remove unused include path.
 	(CC_MWCPPC): Add -mpw_chars, disable warnings, add comments
 	explaining reasons for various flags.
 	(EXTRALIBS_PPC, EXTRALIBS_MWCPPC ): Put runtime library first.
-
+	
 Fri Oct 13 14:44:25 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
 	* mh-aix, mh-sun:  Removed.
@@ -668,7 +243,7 @@ Fri Oct 13 14:44:25 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
 	* mh-sco, mh-solaris, mh-sysv4 (X11_EXTRA_LIBS): Define.
 
-	* mh-hp300, mh-hpux, mh-hpux8, mh-solaris, mh-sun3, mh-sysv4: Don't
+        * mh-hp300, mh-hpux, mh-hpux8, mh-solaris, mh-sun3, mh-sysv4: Don't 
 	hardcode location of X stuff here.
 
 Thu Sep 28 13:14:56 1995  Stan Shebs  <shebs@andros.cygnus.com>
@@ -677,10 +252,6 @@ Thu Sep 28 13:14:56 1995  Stan Shebs  <shebs@andros.cygnus.com>
 	compilers, add definitions for library and link steps for
 	PowerMacs.
 
-Sat Sep 16 18:31:08 PDT 1995  Angela Marie Thomas <angela@cygnus.com>
-
-	* mh-ncrsvr43: Removed AR_FLAGS
-
 Thu Sep 14 08:20:04 1995  Fred Fish  <fnf@cygnus.com>
 
 	* mh-hp300 (CC): Add "CC = cc -Wp,-H256000" to avoid
@@ -695,14 +266,10 @@ Thu Jun 22 17:47:24 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-mh-mpw (CC): Define ANSI_PROTOTYPES.
 
-Mon Jun  5 18:26:36 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
-
-	* m?-*pic: Define PICFLAG* instead of LIB*FLAGS*.
-
 Mon Apr 10 12:29:48 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-mh-mpw (EXTRALIBS): Always link in Math.o, CSANELIB.o,
-	and ToolLibs.o.
+        and ToolLibs.o.
 
 	* mpw-mh-mpw (CC): Define ALMOST_STDC.
 	(CFLAGS): Remove ALMOST_STDC, -mc68881.
@@ -717,15 +284,6 @@ Fri Mar 31 11:35:17 1995  Jason Molenda (crash@phydeaux.cygnus.com)
 
 	* mt-netware: New file.
 
-Tue Mar 28 14:47:34 1995  Jason Molenda (crash@phydeaux.cygnus.com)
-
-	Revert this change:
-
-	Mon Mar 29 19:59:26 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-		* mh-solaris: SunPRO C needs -Xs to be able to get a
-		working xmakefile for Emacs.
-
 Mon Mar 13 12:31:29 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* mh-hpux8: New file.
@@ -740,10 +298,6 @@ Wed Jan 11 16:29:34 1995  Jason Merrill  <jason@phydeaux.cygnus.com>
 
 	* m?-*pic (LIBCXXFLAGS): Add -fno-implicit-templates.
 
-Sat Nov  5 18:43:30 1994  Jason Merrill  (jason@phydeaux.cygnus.com)
-
-	* m[th]-*pic: Support --enable-shared.
-
 Thu Nov  3 17:27:19 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
 
 	* mh-irix4 (CC): Increase maximum string length.
@@ -765,15 +319,6 @@ Thu May 19 00:32:11 1994  Jeff Law  (law@snake.cs.utah.edu)
 	* mh-hpux (CC): Add -Wp,-H256000 to avoid "too much defining"
 	errors from the HPUX 8 compilers.
 
-Fri May  6 14:19:25 1994  Steve Chamberlain  (sac@cygnus.com)
-
-	* mh-go32: New fragment.
-
-Thu May  5 20:06:45 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* mh-lynxrs6k: Renamed from mh-lynxosrs6k, to make it
-	unique in 8.3 naming schemes.
-
 Wed May  4 20:14:47 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
 
 	* mh-lynxrs6k: set SHELL to /bin/bash
@@ -782,18 +327,10 @@ Tue Apr 12 12:38:17 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 
 	* mh-irix4 (CC): Change -XNh1500 to -XNh2000.
 
-Mon Jan 31 18:40:55 1994  Stu Grossman  (grossman at cygnus.com)
-
-	* mh-lynxosrs6k:  Account for lack of ranlib!
-
 Sat Dec 25 20:03:45 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
 	* mt-hppa: Delete.
 
-Thu Dec  2 14:35:54 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* mh-irix5: New file for Irix 5.
-
 Tue Nov 16 22:54:39 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* mh-a68bsd: Define CC to gcc.
@@ -845,62 +382,16 @@ Fri Jun  4 16:09:34 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 	* mh-sysv4 (INSTALL): Use cp, not /usr/ucb/install.
 
-Sat Apr 17 17:19:50 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* mh-delta88: remove extraneous GCC references
-
 Thu Apr  8 11:21:52 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 	* mt-a29k, mt-ebmon29k, mt-os68k, mt-ose68000, mt-ose68k,
 	mt-vxworks68, mt-vxworks960: Removed obsolete, unused target
 	Makefile fragment files.
 
-Wed Mar 31 12:31:56 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* mh-irix4: Bump -XNh value to 1500 to match gcc requirements.
-
-Mon Mar 29 19:59:26 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* mh-sun3: cc needs -J to compile cp-parse.c correctly
-
-	* mh-solaris: SunPRO C needs -Xs to be able to get a
-	working xmakefile for Emacs.
-
 Mon Mar  8 15:05:25 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
 
 	* mh-aix386: New file; old mh-aix, plus no-op RANLIB.
 
-Tue Mar  2 21:15:58 1993  Fred Fish  (fnf@cygnus.com)
-
-	* mh-vaxult2:  New file.
-
-Sat Jan 23 20:32:01 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* mh-sco: define X11_LIB to the mess that SCO ODT requires
-
-Tue Dec 29 15:06:00 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* mh-sco: Don't override BISON definition.
-
-Mon Dec  7 06:43:27 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* mh-sco: don't default $(CC) to gcc
-
-Mon Nov 30 14:54:34 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* mh-solaris: rework standard X location to use
-	$OPENWINHOME, if defined.
-
-	* mh-sun: handle X11 include locations
-
-	* mh-decstation: define NeedFunctionPrototypes to 0, to
-	work around dain-bramaged DECwindows include files
-
-Fri Nov 27 18:35:54 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* mh-hpux, mh-solaris: define the "standard" locations for
-	the vendor supplied X11 headers and libraries
-
 Thu Oct  1 13:50:48 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* mh-solaris: INSTALL is NOT /usr/ucb/install
@@ -909,11 +400,6 @@ Mon Aug 24 14:25:35 1992  Ian Lance Taylor  (ian@cygnus.com)
 
 	* mt-ose68000, mt-ose68k: renamed from mt-OSE*.
 
-Mon Aug  3 15:41:28 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* mh-solaris: removed the -xs from CFLAGS (let the people
-	with Sun's C compiler deal with it themselved)
-
 Tue Jul 21 02:11:01 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
 
 	* mt-OSE68k, mt-680000: new configs.
@@ -922,47 +408,20 @@ Thu Jul 16 17:12:09 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
 
 	* mh-irix4: merged changes from progressive.
 
-Wed Jul  8 00:01:30 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* mh-solaris:  Use -xs when compiling so that Sun-C puts
-	a symbol-table into the executable.
-
-Mon Jun 15 12:31:52 1992  Fred Fish  (fnf@cygnus.com)
-
-	* mh-ncr3000 (INSTALL):  Don't use /usr/ucb/install,
-	it is broken on ncr 3000's.
-
 Tue Jun  9 23:29:38 1992  Per Bothner  (bothner@rtl.cygnus.com)
 
 	* Everywhere: Change RANLIB=echo>/dev/null (which confuses
 	some shells - and I don't blame them) to RANLIB=true.
 	* mh-solaris:  Use /usr/ucb/install for INSTALL.
 
-Tue Jun  9 17:18:11 1992  Fred Fish  (fnf at cygnus.com)
-
-	* mh-ncr3000, mh-sysv4:  Add INSTALL.
-
 Sun May 31 14:45:23 1992  Mark Eichin  (eichin at cygnus.com)
 
 	* mh-solaris2: Add new configuration for Solaris 2 (sysv, no ranlib)
 
-Wed Apr 22 14:38:34 1992  Fred Fish  (fnf@cygnus.com)
-
-	* mh-delta88, mh-ncr3000:  Replace MINUS_G with
-	CFLAGS per new configuration strategy.
-
 Fri Apr 10 23:10:08 1992  Fred Fish  (fnf@cygnus.com)
 
 	* mh-ncr3000:  Add new configuration for NCR 3000.
 
-Thu Mar  5 12:05:58 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* mh-irix4: Port to SGI Irix-4.x.
-
-Thu Jan 30 16:17:30 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* mh-sco: Fix SCO configuration stuff.
-
 Tue Dec 10 00:10:55 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
 
 	* ChangeLog: fresh changelog.
diff --git a/config/acinclude.m4 b/config/acinclude.m4
index c7c0ab5..6187b5a 100755
--- a/config/acinclude.m4
+++ b/config/acinclude.m4
@@ -6,7 +6,7 @@ dnl and doesn't call AC_PROG_CXX_GNU, cause we test for that in  AC_PROG_CC_WORK
 dnl We are probably using a cross compiler, which will not be able to fully
 dnl link an executable.  This should really be fixed in autoconf itself.
 dnl Find a working G++ cross compiler. This only works for the GNU C++ compiler.
-AC_DEFUN([CYG_AC_PROG_CXX_CROSS],
+AC_DEFUN(CYG_AC_PROG_CXX_CROSS,
 [AC_BEFORE([$0], [AC_PROG_CXXCPP])
 AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
 
@@ -35,7 +35,7 @@ fi
 ])
 
 dnl See if the G++ compiler we found works.
-AC_DEFUN([CYG_AC_PROG_GXX_WORKS],
+AC_DEFUN(CYG_AC_PROG_GXX_WORKS,
 [AC_MSG_CHECKING([whether the G++ compiler ($CXX $CXXFLAGS $LDFLAGS) actually works])
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -103,7 +103,7 @@ AC_SUBST(CXX)
 dnl ====================================================================
 dnl Find a working GCC cross compiler. This only works for the GNU gcc compiler.
 dnl This is based on the macros above for G++.
-AC_DEFUN([CYG_AC_PROG_CC_CROSS],
+AC_DEFUN(CYG_AC_PROG_CC_CROSS,
 [AC_BEFORE([$0], [AC_PROG_CCPP])
 AC_CHECK_PROGS(CC, cc, gcc)
 
@@ -132,7 +132,7 @@ fi
 ])
 
 dnl See if the GCC compiler we found works.
-AC_DEFUN([CYG_AC_PROG_GCC_WORKS],
+AC_DEFUN(CYG_AC_PROG_GCC_WORKS,
 [AC_MSG_CHECKING([whether the Gcc compiler ($CC $CFLAGS $LDFLAGS) actually works])
 AC_LANG_SAVE
 AC_LANG_C
@@ -199,14 +199,14 @@ AC_SUBST(CC)
 dnl ====================================================================
 dnl Find the BFD library in the build tree. This is used to access and
 dnl manipulate object or executable files.
-AC_DEFUN([CYG_AC_PATH_BFD], [
+AC_DEFUN(CYG_AC_PATH_BFD, [
 AC_MSG_CHECKING(for the bfd header in the build tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 dnl Look for the header file
 AC_CACHE_VAL(ac_cv_c_bfdh,[
 for i in $dirlist; do
     if test -f "$i/bfd/bfd.h" ; then
-	ac_cv_c_bfdh=`(cd $i/bfd; ${PWDCMD-pwd})`
+	ac_cv_c_bfdh=`(cd $i/bfd; pwd)`
 	break
     fi
 done
@@ -224,7 +224,7 @@ AC_MSG_CHECKING(for the bfd library in the build tree)
 AC_CACHE_VAL(ac_cv_c_bfdlib,[
 for i in $dirlist; do
     if test -f "$i/bfd/Makefile" ; then
-	ac_cv_c_bfdlib=`(cd $i/bfd; ${PWDCMD-pwd})`
+	ac_cv_c_bfdlib=`(cd $i/bfd; pwd)`
     fi
 done
 ])
@@ -241,13 +241,13 @@ AC_SUBST(BFDLIB)
 dnl ====================================================================
 dnl Find the libiberty library. This defines many commonly used C
 dnl functions that exists in various states based on the underlying OS.
-AC_DEFUN([CYG_AC_PATH_LIBERTY], [
+AC_DEFUN(CYG_AC_PATH_LIBERTY, [
 AC_MSG_CHECKING(for the liberty library in the build tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 AC_CACHE_VAL(ac_cv_c_liberty,[
 for i in $dirlist; do
     if test -f "$i/libiberty/Makefile" ; then
-	ac_cv_c_liberty=`(cd $i/libiberty; ${PWDCMD-pwd})`
+	ac_cv_c_liberty=`(cd $i/libiberty; pwd)`
     fi
 done
 ])
@@ -262,13 +262,13 @@ AC_SUBST(LIBERTY)
 
 dnl ====================================================================
 dnl Find the opcodes library. This is used to do dissasemblies.
-AC_DEFUN([CYG_AC_PATH_OPCODES], [
+AC_DEFUN(CYG_AC_PATH_OPCODES, [
 AC_MSG_CHECKING(for the opcodes library in the build tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 AC_CACHE_VAL(ac_cv_c_opc,[
 for i in $dirlist; do
     if test -f "$i/opcodes/Makefile" ; then
-	ac_cv_c_opc=`(cd $i/opcodes; ${PWDCMD-pwd})`
+	ac_cv_c_opc=`(cd $i/opcodes; pwd)`
     fi
 done
 ])
@@ -284,13 +284,13 @@ AC_SUBST(OPCODESLIB)
 dnl ====================================================================
 dnl Look for the DejaGnu header file in the source tree. This file
 dnl defines the functions used to testing support.
-AC_DEFUN([CYG_AC_PATH_DEJAGNU], [
+AC_DEFUN(CYG_AC_PATH_DEJAGNU, [
 AC_MSG_CHECKING(for the testing support files in the source tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 AC_CACHE_VAL(ac_cv_c_dejagnu,[
 for i in $dirlist; do
     if test -f "$srcdir/$i/ecc/ecc/infra/testlib/current/include/dejagnu.h" ; then
-	ac_cv_c_dejagnu=`(cd $srcdir/$i/ecc/ecc/infra/testlib/current/include; ${PWDCMD-pwd})`
+	ac_cv_c_dejagnu=`(cd $srcdir/$i/ecc/ecc/infra/testlib/current/include; pwd)`
     fi
 done
 ])
@@ -303,7 +303,7 @@ fi
 AC_CACHE_VAL(ac_cv_c_dejagnulib,[
 for i in $dirlist; do
     if test -f "$srcdir/$i/infra/testlib/current/lib/hostutil.exp" ; then
-	ac_cv_c_dejagnulib=`(cd $srcdir/$i/infra/testlib/current/lib; ${PWDCMD-pwd})`
+	ac_cv_c_dejagnulib=`(cd $srcdir/$i/infra/testlib/current/lib; pwd)`
     fi
 done
 ])
@@ -316,7 +316,7 @@ AC_MSG_CHECKING(for runtest in the source tree)
 AC_CACHE_VAL(ac_cv_c_runtest,[
 for i in $dirlist; do
     if test -f "$srcdir/$i/dejagnu/runtest" ; then
-	ac_cv_c_runtest=`(cd $srcdir/$i/dejagnu; ${PWDCMD-pwd})`
+	ac_cv_c_runtest=`(cd $srcdir/$i/dejagnu; pwd)`
     fi
 done
 ])
@@ -335,14 +335,14 @@ AC_SUBST(DEJAGNUHDIR)
 dnl ====================================================================
 dnl Find the libintl library in the build tree. This is for
 dnl  internationalization support.
-AC_DEFUN([CYG_AC_PATH_INTL], [
+AC_DEFUN(CYG_AC_PATH_INTL, [
 AC_MSG_CHECKING(for the intl header in the build tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 dnl Look for the header file
 AC_CACHE_VAL(ac_cv_c_intlh,[
 for i in $dirlist; do
     if test -f "$i/intl/libintl.h" ; then
-	ac_cv_c_intlh=`(cd $i/intl; ${PWDCMD-pwd})`
+	ac_cv_c_intlh=`(cd $i/intl; pwd)`
 	break
     fi
 done
@@ -360,7 +360,7 @@ AC_MSG_CHECKING(for the libintl library in the build tree)
 AC_CACHE_VAL(ac_cv_c_intllib,[
 for i in $dirlist; do
     if test -f "$i/intl/Makefile" ; then
-	ac_cv_c_intllib=`(cd $i/intl; ${PWDCMD-pwd})`
+	ac_cv_c_intllib=`(cd $i/intl; pwd)`
     fi
 done
 ])
@@ -375,7 +375,7 @@ AC_SUBST(INTLLIB)
 
 dnl ====================================================================
 dnl Find the simulator library.
-AC_DEFUN([CYG_AC_PATH_SIM], [
+AC_DEFUN(CYG_AC_PATH_SIM, [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.. ../../../../../../../../../.."
 case "$target_cpu" in
     powerpc)	target_dir=ppc ;;
@@ -388,7 +388,7 @@ AC_MSG_CHECKING(for the simulator header file)
 AC_CACHE_VAL(ac_cv_c_simh,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/include/remote-sim.h" ; then
-	ac_cv_c_simh=`(cd ${srcdir}/$i/include; ${PWDCMD-pwd})`
+	ac_cv_c_simh=`(cd ${srcdir}/$i/include; pwd)`
 	break
     fi
 done
@@ -420,7 +420,7 @@ AC_MSG_CHECKING(for the simulator library)
 AC_CACHE_VAL(ac_cv_c_simlib,[
 for i in $dirlist; do
     if test -f "$i/sim/$target_dir/Makefile" ; then
-	ac_cv_c_simlib=`(cd $i/sim/$target_dir; ${PWDCMD-pwd})`
+	ac_cv_c_simlib=`(cd $i/sim/$target_dir; pwd)`
     fi
 done
 ])
@@ -457,13 +457,13 @@ AC_SUBST(SIMLIB)
 
 dnl ====================================================================
 dnl Find the libiberty library.
-AC_DEFUN([CYG_AC_PATH_LIBIBERTY], [
+AC_DEFUN(CYG_AC_PATH_LIBIBERTY, [
 AC_MSG_CHECKING(for the libiberty library in the build tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 AC_CACHE_VAL(ac_cv_c_libib,[
 for i in $dirlist; do
     if test -f "$i/libiberty/Makefile" ; then
-	ac_cv_c_libib=`(cd $i/libiberty/; ${PWDCMD-pwd})`
+	ac_cv_c_libib=`(cd $i/libiberty/; pwd)`
     fi
 done
 ])
@@ -477,13 +477,13 @@ AC_SUBST(LIBIBERTY)
 ])
 
 dnl ====================================================================
-AC_DEFUN([CYG_AC_PATH_DEVO], [
+AC_DEFUN(CYG_AC_PATH_DEVO, [
 AC_MSG_CHECKING(for devo headers in the source tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 AC_CACHE_VAL(ac_cv_c_devoh,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/include/remote-sim.h" ; then
-	ac_cv_c_devoh=`(cd ${srcdir}/$i/include; ${PWDCMD-pwd})`
+	ac_cv_c_devoh=`(cd ${srcdir}/$i/include; pwd)`
     fi
 done
 ])
@@ -498,7 +498,7 @@ AC_SUBST(DEVOHDIR)
 
 dnl ====================================================================
 dnl find the IDE library and headers.
-AC_DEFUN([CYG_AC_PATH_IDE], [
+AC_DEFUN(CYG_AC_PATH_IDE, [
 AC_MSG_CHECKING(for IDE headers in the source tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 IDEHDIR=
@@ -506,7 +506,7 @@ IDELIB=
 AC_CACHE_VAL(ac_cv_c_ideh,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/libide/src/event.h" ; then
-	ac_cv_c_ideh=`(cd ${srcdir}/$i/libide/src; ${PWDCMD-pwd})`;
+	ac_cv_c_ideh=`(cd ${srcdir}/$i/libide/src; pwd)`;
     fi
 done
 ])
@@ -521,7 +521,7 @@ AC_MSG_CHECKING(for LIBIDE TCL headers in the source tree)
 AC_CACHE_VAL(ac_cv_c_idetclh,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/libidetcl/src/idetcl.h" ; then
-	ac_cv_c_idetclh=`(cd ${srcdir}/$i/libidetcl/src; ${PWDCMD-pwd})`;
+	ac_cv_c_idetclh=`(cd ${srcdir}/$i/libidetcl/src; pwd)`;
     fi
 done
 ])
@@ -536,7 +536,7 @@ AC_MSG_CHECKING(for IDE headers in the build tree)
 AC_CACHE_VAL(ac_cv_c_ideh2,[
 for i in $dirlist; do
     if test -f "$i/libide/src/Makefile" ; then
-	ac_cv_c_ideh2=`(cd $i/libide/src; ${PWDCMD-pwd})`;
+	ac_cv_c_ideh2=`(cd $i/libide/src; pwd)`;
     fi
 done
 ])
@@ -553,7 +553,7 @@ AC_CACHE_VAL(ac_cv_c_idelib,[
 if test x"${ac_cv_c_idelib}" = x ; then
     for i in $dirlist; do
       if test -f "$i/libide/src/Makefile" ; then
-        ac_cv_c_idelib=`(cd $i/libide/src; ${PWDCMD-pwd})`
+        ac_cv_c_idelib=`(cd $i/libide/src; pwd)`
         break
       fi
     done
@@ -571,7 +571,7 @@ AC_CACHE_VAL(ac_cv_c_idetcllib,[
 if test x"${ac_cv_c_idetcllib}" = x ; then
     for i in $dirlist; do
       if test -f "$i/libidetcl/src/Makefile" ; then
-        ac_cv_c_idetcllib=`(cd $i/libidetcl/src; ${PWDCMD-pwd})`
+        ac_cv_c_idetcllib=`(cd $i/libidetcl/src; pwd)`
         break
       fi
     done
@@ -591,13 +591,13 @@ AC_SUBST(IDETCLLIB)
 
 dnl ====================================================================
 dnl Find all the ILU headers and libraries
-AC_DEFUN([CYG_AC_PATH_ILU], [
+AC_DEFUN(CYG_AC_PATH_ILU, [
 AC_MSG_CHECKING(for ILU kernel headers in the source tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 AC_CACHE_VAL(ac_cv_c_iluh,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/ilu/runtime/kernel/method.h" ; then
-	ac_cv_c_iluh=`(cd ${srcdir}/$i/ilu/runtime/kernel; ${PWDCMD-pwd})`
+	ac_cv_c_iluh=`(cd ${srcdir}/$i/ilu/runtime/kernel; pwd)`
     fi
 done
 ])
@@ -613,7 +613,7 @@ dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../
 AC_CACHE_VAL(ac_cv_c_iluh5,[
 for i in $dirlist; do
     if test -f "$i/ilu/runtime/kernel/iluconf.h" ; then
-	ac_cv_c_iluh5=`(cd $i/ilu/runtime/kernel; ${PWDCMD-pwd})`
+	ac_cv_c_iluh5=`(cd $i/ilu/runtime/kernel; pwd)`
     fi
 done
 ])
@@ -628,7 +628,7 @@ AC_MSG_CHECKING(for ILU C++ headers in the source tree)
 AC_CACHE_VAL(ac_cv_c_iluh2,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/ilu/stubbers/cpp/resource.h" ; then
-	ac_cv_c_iluh2=`(cd ${srcdir}/$i/ilu/stubbers/cpp; ${PWDCMD-pwd})`
+	ac_cv_c_iluh2=`(cd ${srcdir}/$i/ilu/stubbers/cpp; pwd)`
     fi
 done
 ])
@@ -643,7 +643,7 @@ AC_MSG_CHECKING(for ILU C headers)
 AC_CACHE_VAL(ac_cv_c_iluh3,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/ilu/stubbers/c/resource.h" ; then
-	ac_cv_c_iluh3=`(cd ${srcdir}/$i/ilu/stubbers/c  ; ${PWDCMD-pwd})`
+	ac_cv_c_iluh3=`(cd ${srcdir}/$i/ilu/stubbers/c  ; pwd)`
     fi
 done
 ])
@@ -658,7 +658,7 @@ AC_MSG_CHECKING(for ILU C runtime headers)
 AC_CACHE_VAL(ac_cv_c_iluh4,[
 for i in $dirlist; do
     if test -f "${srcdir}/$i/ilu/runtime/c/ilucstub.h" ; then
-	ac_cv_c_iluh4=`(cd ${srcdir}/$i/ilu/runtime/c  ; ${PWDCMD-pwd})`
+	ac_cv_c_iluh4=`(cd ${srcdir}/$i/ilu/runtime/c  ; pwd)`
     fi
 done
 ])
@@ -672,7 +672,7 @@ fi
 AC_CACHE_VAL(ac_cv_c_ilupath,[
 for i in $dirlist; do
     if test -f "$i/ilu/Makefile" ; then
-	ac_cv_c_ilupath=`(cd $i/ilu; ${PWDCMD-pwd})`
+	ac_cv_c_ilupath=`(cd $i/ilu; pwd)`
 	break
     fi
 done
@@ -682,7 +682,7 @@ ILUTOP=${ac_cv_c_ilupath}
 AC_MSG_CHECKING(for the ILU library in the build tree)
 AC_CACHE_VAL(ac_cv_c_ilulib,[
 if test -f "$ac_cv_c_ilupath/runtime/kernel/Makefile" ; then
-    ac_cv_c_ilulib=`(cd $ac_cv_c_ilupath/runtime/kernel; ${PWDCMD-pwd})`
+    ac_cv_c_ilulib=`(cd $ac_cv_c_ilupath/runtime/kernel; pwd)`
     AC_MSG_RESULT(found ${ac_cv_c_ilulib}/libilu.a)
 else
     AC_MSG_RESULT(no)
@@ -691,7 +691,7 @@ fi])
 AC_MSG_CHECKING(for the ILU C++ bindings library in the build tree)
 AC_CACHE_VAL(ac_cv_c_ilulib2,[
 if test -f "$ac_cv_c_ilupath/runtime/cpp/Makefile" ; then
-    ac_cv_c_ilulib2=`(cd $ac_cv_c_ilupath/runtime/cpp; ${PWDCMD-pwd})`
+    ac_cv_c_ilulib2=`(cd $ac_cv_c_ilupath/runtime/cpp; pwd)`
     AC_MSG_RESULT(found ${ac_cv_c_ilulib2}/libilu-c++.a)
 else
     AC_MSG_RESULT(no)
@@ -700,7 +700,7 @@ fi])
 AC_MSG_CHECKING(for the ILU C bindings library in the build tree)
 AC_CACHE_VAL(ac_cv_c_ilulib3,[
 if test -f "$ac_cv_c_ilupath/runtime/c/Makefile" ; then
-    ac_cv_c_ilulib3=`(cd $ac_cv_c_ilupath/runtime/c; ${PWDCMD-pwd})`
+    ac_cv_c_ilulib3=`(cd $ac_cv_c_ilupath/runtime/c; pwd)`
     AC_MSG_RESULT(found ${ac_cv_c_ilulib3}/libilu-c.a)
 else
     AC_MSG_RESULT(no)
@@ -709,7 +709,7 @@ fi])
 AC_MSG_CHECKING(for the ILU Tk bindings library in the build tree)
 AC_CACHE_VAL(ac_cv_c_ilulib4,[
 if test -f "$ac_cv_c_ilupath/runtime/mainloop/Makefile" ; then
-    ac_cv_c_ilulib4=`(cd $ac_cv_c_ilupath/runtime/mainloop; ${PWDCMD-pwd})`
+    ac_cv_c_ilulib4=`(cd $ac_cv_c_ilupath/runtime/mainloop; pwd)`
     AC_MSG_RESULT(found ${ac_cv_c_ilulib4}/libilu-tk.a)
 else
     AC_MSG_RESULT(no)
@@ -752,7 +752,7 @@ dnl ====================================================================
 dnl This defines the byte order for the host. We can't use
 dnl AC_C_BIGENDIAN, cause we want to create a config file and
 dnl substitue the real value, so the header files work right
-AC_DEFUN([CYG_AC_C_ENDIAN], [
+AC_DEFUN(CYG_AC_C_ENDIAN, [
 AC_MSG_CHECKING(to see if this is a little endian host)
 AC_CACHE_VAL(ac_cv_c_little_endian, [
 ac_cv_c_little_endian=unknown
@@ -788,7 +788,7 @@ dnl Yes, this is ugly, and only used for a canadian cross anyway. This
 dnl is just to keep configure from stopping here.
 case "${host}" in
 changequote(,)
-   i[3456789]86-*-*) ac_cv_c_little_endian=yes ;;
+   i[3456]86-*-*) ac_cv_c_little_endian=yes ;;
    sparc*-*-*)    ac_cv_c_little_endian=no ;;
 changequote([,])
   *)    AC_MSG_WARN(Can't cross compile this test) ;;
@@ -809,7 +809,7 @@ AC_SUBST(ENDIAN)
 dnl ====================================================================
 dnl Look for the path to libgcc, so we can use it to directly link
 dnl in libgcc.a with LD.
-AC_DEFUN([CYG_AC_PATH_LIBGCC],
+AC_DEFUN(CYG_AC_PATH_LIBGCC,
 [AC_MSG_CHECKING([Looking for the path to libgcc.a])
 AC_LANG_SAVE
 AC_LANG_C
@@ -844,12 +844,12 @@ dnl Warning: transition of version 9 to 10 will break this algorithm
 dnl because 10 sorts before 9. We also look for just tcl. We have to
 dnl be careful that we don't match stuff like tclX by accident.
 dnl the alternative search directory is involked by --with-tclinclude
-AC_DEFUN([CYG_AC_PATH_TCL], [
+AC_DEFUN(CYG_AC_PATH_TCL, [
     CYG_AC_PATH_TCLH
     CYG_AC_PATH_TCLCONFIG
     CYG_AC_LOAD_TCLCONFIG
 ])
-AC_DEFUN([CYG_AC_PATH_TCLH], [
+AC_DEFUN(CYG_AC_PATH_TCLH, [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 no_tcl=true
 AC_MSG_CHECKING(for Tcl headers in the source tree)
@@ -858,9 +858,9 @@ AC_CACHE_VAL(ac_cv_c_tclh,[
 dnl first check to see if --with-tclinclude was specified
 if test x"${with_tclinclude}" != x ; then
   if test -f ${with_tclinclude}/tcl.h ; then
-    ac_cv_c_tclh=`(cd ${with_tclinclude}; ${PWDCMD-pwd})`
+    ac_cv_c_tclh=`(cd ${with_tclinclude}; pwd)`
   elif test -f ${with_tclinclude}/generic/tcl.h ; then
-    ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; ${PWDCMD-pwd})`
+    ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; pwd)`
   else
     AC_MSG_ERROR([${with_tclinclude} directory doesn't contain headers])
   fi
@@ -870,7 +870,7 @@ dnl next check if it came with Tcl configuration file
 if test x"${ac_cv_c_tclconfig}" != x ; then
   for i in $dirlist; do
     if test -f $ac_cv_c_tclconfig/$i/generic/tcl.h ; then
-      ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/$i/generic; ${PWDCMD-pwd})`
+      ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/$i/generic; pwd)`
       break
     fi
   done
@@ -891,7 +891,7 @@ if test x"${ac_cv_c_tclh}" = x ; then
     dnl might be multiple version of Tcl, and we want the most recent one.
     for i in `ls -dr $tclpath/tcl* 2>/dev/null ` ; do
         if test -f $i/generic/tcl.h ; then
-          ac_cv_c_tclh=`(cd $i/generic; ${PWDCMD-pwd})`
+          ac_cv_c_tclh=`(cd $i/generic; pwd)`
           break
         fi
     done
@@ -935,7 +935,7 @@ AC_SUBST(TCLHDIR)
 
 dnl ====================================================================
 dnl Ok, lets find the tcl configuration
-AC_DEFUN([CYG_AC_PATH_TCLCONFIG], [
+AC_DEFUN(CYG_AC_PATH_TCLCONFIG, [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 dnl First, look for one uninstalled.  
 dnl the alternative search directory is invoked by --with-tclconfig
@@ -950,7 +950,7 @@ if test x"${no_tcl}" = x ; then
     dnl First check to see if --with-tclconfig was specified.
     if test x"${with_tclconfig}" != x ; then
         if test -f "${with_tclconfig}/tclConfig.sh" ; then
-            ac_cv_c_tclconfig=`(cd ${with_tclconfig}; ${PWDCMD-pwd})`
+            ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
         else
             AC_MSG_ERROR([${with_tclconfig} directory doesn't contain tclConfig.sh])
         fi
@@ -959,15 +959,8 @@ if test x"${no_tcl}" = x ; then
     dnl next check if it came with Tcl configuration file in the source tree
     if test x"${ac_cv_c_tclconfig}" = x ; then
         for i in $dirlist; do
-            dnl need to test both unix and win directories, since 
-            dnl cygwin's tkConfig.sh could be in either directory depending
-            dnl on the cygwin port of tcl.
             if test -f $srcdir/$i/unix/tclConfig.sh ; then
-                ac_cv_c_tclconfig=`(cd $srcdir/$i/unix; ${PWDCMD-pwd})`
-	        break
-            fi
-            if test -f $srcdir/$i/win/tclConfig.sh ; then
-                ac_cv_c_tclconfig=`(cd $srcdir/$i/win; ${PWDCMD-pwd})`
+                ac_cv_c_tclconfig=`(cd $srcdir/$i/unix; pwd)`
 	        break
             fi
         done
@@ -985,15 +978,8 @@ if test x"${no_tcl}" = x ; then
         dnl find the exact Tcl dir. We do it this way, cause there
         dnl might be multiple version of Tcl, and we want the most recent one.
         for i in `ls -dr $tclconfpath/tcl* 2>/dev/null ` ; do
-            dnl need to test both unix and win directories, since 
-            dnl cygwin's tclConfig.sh could be in either directory depending
-            dnl on the cygwin port of tcl.
             if test -f $i/unix/tclConfig.sh ; then
-                ac_cv_c_tclconfig=`(cd $i/unix; ${PWDCMD-pwd})`
-                break
-            fi
-            if test -f $i/win/tclConfig.sh ; then
-                ac_cv_c_tclconfig=`(cd $i/win; ${PWDCMD-pwd})`
+                ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
                 break
             fi
         done
@@ -1024,7 +1010,7 @@ AC_SUBST(TCLCONFIG)
 
 dnl Defined as a separate macro so we don't have to cache the values
 dnl from PATH_TCLCONFIG (because this can also be cached).
-AC_DEFUN([CYG_AC_LOAD_TCLCONFIG], [
+AC_DEFUN(CYG_AC_LOAD_TCLCONFIG, [
     . $TCLCONFIG
 
 dnl AC_SUBST(TCL_VERSION)
@@ -1070,12 +1056,12 @@ dnl    AC_SUBST(TCL_UNSHARED_LIB_SUFFIX)
 ])
 
 dnl ====================================================================
-AC_DEFUN([CYG_AC_PATH_TK], [
+AC_DEFUN(CYG_AC_PATH_TK, [
     CYG_AC_PATH_TKH
     CYG_AC_PATH_TKCONFIG
     CYG_AC_LOAD_TKCONFIG
 ])
-AC_DEFUN([CYG_AC_PATH_TKH], [
+AC_DEFUN(CYG_AC_PATH_TKH, [
 #
 # Ok, lets find the tk source trees so we can use the headers
 # If the directory (presumably symlink) named "tk" exists, use that one
@@ -1085,7 +1071,7 @@ AC_DEFUN([CYG_AC_PATH_TKH], [
 # Note the gross little conversion here of srcdir by cd'ing to the found
 # directory. This converts the path from a relative to an absolute, so
 # recursive cache variables for the path will work right. We check all
-# the possible paths in one loop rather than many separate loops to speed
+# the possible paths in one loop rather than many seperate loops to speed
 # things up.
 # the alternative search directory is involked by --with-tkinclude
 #
@@ -1097,9 +1083,9 @@ AC_CACHE_VAL(ac_cv_c_tkh,[
 dnl first check to see if --with-tkinclude was specified
 if test x"${with_tkinclude}" != x ; then
   if test -f ${with_tkinclude}/tk.h ; then
-    ac_cv_c_tkh=`(cd ${with_tkinclude}; ${PWDCMD-pwd})`
+    ac_cv_c_tkh=`(cd ${with_tkinclude}; pwd)`
   elif test -f ${with_tkinclude}/generic/tk.h ; then
-    ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; ${PWDCMD-pwd})`
+    ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; pwd)`
   else
     AC_MSG_ERROR([${with_tkinclude} directory doesn't contain headers])
   fi
@@ -1109,7 +1095,7 @@ dnl next check if it came with Tk configuration file
 if test x"${ac_cv_c_tkconfig}" != x ; then
   for i in $dirlist; do
     if test -f $ac_cv_c_tkconfig/$i/generic/tk.h ; then
-      ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/$i/generic; ${PWDCMD-pwd})`
+      ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/$i/generic; pwd)`
       break
     fi
   done
@@ -1130,7 +1116,7 @@ if test x"${ac_cv_c_tkh}" = x ; then
     dnl might be multiple version of Tk, and we want the most recent one.
     for i in `ls -dr $tkpath/tk* 2>/dev/null ` ; do
         if test -f $i/generic/tk.h ; then
-          ac_cv_c_tkh=`(cd $i/generic; ${PWDCMD-pwd})`
+          ac_cv_c_tkh=`(cd $i/generic; pwd)`
           break
         fi
     done
@@ -1168,7 +1154,7 @@ fi
 AC_SUBST(TKHDIR)
 ])
 
-AC_DEFUN([CYG_AC_PATH_TKCONFIG], [
+AC_DEFUN(CYG_AC_PATH_TKCONFIG, [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 dnl First, look for one uninstalled.  
 dnl the alternative search directory is invoked by --with-tkconfig
@@ -1183,7 +1169,7 @@ if test x"${no_tk}" = x ; then
     dnl First check to see if --with-tkconfig was specified.
     if test x"${with_tkconfig}" != x ; then
         if test -f "${with_tkconfig}/tkConfig.sh" ; then
-            ac_cv_c_tkconfig=`(cd ${with_tkconfig}; ${PWDCMD-pwd})`
+            ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)`
         else
             AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh])
         fi
@@ -1192,15 +1178,8 @@ if test x"${no_tk}" = x ; then
     dnl next check if it came with Tk configuration file in the source tree
     if test x"${ac_cv_c_tkconfig}" = x ; then
         for i in $dirlist; do
-            dnl need to test both unix and win directories, since 
-            dnl cygwin's tkConfig.sh could be in either directory depending
-            dnl on the cygwin port of tk.
             if test -f $srcdir/$i/unix/tkConfig.sh ; then
-                ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; ${PWDCMD-pwd})`
-	        break
-            fi
-            if test -f $srcdir/$i/win/tkConfig.sh ; then
-                ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; ${PWDCMD-pwd})`
+                ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; pwd)`
 	        break
             fi
         done
@@ -1218,15 +1197,8 @@ if test x"${no_tk}" = x ; then
         dnl find the exact Tk dir. We do it this way, cause there
         dnl might be multiple version of Tk, and we want the most recent one.
         for i in `ls -dr $tkconfpath/tk* 2>/dev/null ` ; do
-            dnl need to test both unix and win directories, since 
-            dnl cygwin's tkConfig.sh could be in either directory depending
-            dnl on the cygwin port of tk.
             if test -f $i/unix/tkConfig.sh ; then
-                ac_cv_c_tkconfig=`(cd $i/unix; ${PWDCMD-pwd})`
-                break
-            fi
-            if test -f $i/win/tkConfig.sh ; then
-                ac_cv_c_tkconfig=`(cd $i/win; ${PWDCMD-pwd})`
+                ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
                 break
             fi
         done
@@ -1257,7 +1229,7 @@ AC_SUBST(TKCONFIG)
 
 dnl Defined as a separate macro so we don't have to cache the values
 dnl from PATH_TKCONFIG (because this can also be cached).
-AC_DEFUN([CYG_AC_LOAD_TKCONFIG], [
+AC_DEFUN(CYG_AC_LOAD_TKCONFIG, [
     if test -f "$TKCONFIG" ; then
       . $TKCONFIG
     fi
@@ -1287,13 +1259,13 @@ dnl    AC_SUBST(TK_EXEC_PREFIX)
 dnl ====================================================================
 dnl Ok, lets find the itcl source trees so we can use the headers
 dnl the alternative search directory is involked by --with-itclinclude
-AC_DEFUN([CYG_AC_PATH_ITCL], [
+AC_DEFUN(CYG_AC_PATH_ITCL, [
     CYG_AC_PATH_ITCLH
     CYG_AC_PATH_ITCLLIB
     CYG_AC_PATH_ITCLSH
     CYG_AC_PATH_ITCLMKIDX
 ])
-AC_DEFUN([CYG_AC_PATH_ITCLH], [
+AC_DEFUN(CYG_AC_PATH_ITCLH, [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 no_itcl=true
 AC_MSG_CHECKING(for Itcl headers in the source tree)
@@ -1302,9 +1274,9 @@ AC_CACHE_VAL(ac_cv_c_itclh,[
 dnl first check to see if --with-itclinclude was specified
 if test x"${with_itclinclude}" != x ; then
   if test -f ${with_itclinclude}/itcl.h ; then
-    ac_cv_c_itclh=`(cd ${with_itclinclude}; ${PWDCMD-pwd})`
+    ac_cv_c_itclh=`(cd ${with_itclinclude}; pwd)`
   elif test -f ${with_itclinclude}/src/itcl.h ; then
-    ac_cv_c_itclh=`(cd ${with_itclinclude}/src; ${PWDCMD-pwd})`
+    ac_cv_c_itclh=`(cd ${with_itclinclude}/src; pwd)`
   else
     AC_MSG_ERROR([${with_itclinclude} directory doesn't contain headers])
   fi
@@ -1314,7 +1286,7 @@ dnl next check if it came with Itcl configuration file
 if test x"${ac_cv_c_itclconfig}" != x ; then
   for i in $dirlist; do
     if test -f $ac_cv_c_itclconfig/$i/src/itcl.h ; then
-      ac_cv_c_itclh=`(cd $ac_cv_c_itclconfig/$i/src; ${PWDCMD-pwd})`
+      ac_cv_c_itclh=`(cd $ac_cv_c_itclconfig/$i/src; pwd)`
       break
     fi
   done
@@ -1335,7 +1307,7 @@ if test x"${ac_cv_c_itclh}" = x ; then
     dnl might be multiple version of Itcl, and we want the most recent one.
     for i in `ls -dr $itclpath/itcl* 2>/dev/null ` ; do
         if test -f $i/src/itcl.h ; then
-          ac_cv_c_itclh=`(cd $i/src; ${PWDCMD-pwd})`
+          ac_cv_c_itclh=`(cd $i/src; pwd)`
           break
         fi
     done
@@ -1367,7 +1339,7 @@ AC_SUBST(ITCLHDIR)
 dnl Ok, lets find the itcl library
 dnl First, look for one uninstalled.  
 dnl the alternative search directory is invoked by --with-itcllib
-AC_DEFUN([CYG_AC_PATH_ITCLLIB], [
+AC_DEFUN(CYG_AC_PATH_ITCLLIB, [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 if test x"${no_itcl}" = x ; then
     dnl we reset no_itcl incase something fails here
@@ -1380,10 +1352,10 @@ if test x"${no_itcl}" = x ; then
     dnl First check to see if --with-itcllib was specified.
     if test x"${with_itcllib}" != x ; then
         if test -f "${with_itcllib}/libitcl$TCL_SHARED_LIB_SUFFIX" ; then
-            ac_cv_c_itcllib=`(cd ${with_itcllib}; ${PWDCMD-pwd})`/libitcl$TCL_SHARED_LIB_SUFFIX
+            ac_cv_c_itcllib=`(cd ${with_itcllib}; pwd)`/libitcl$TCL_SHARED_LIB_SUFFIX
 	else
 	    if test -f "${with_itcllib}/libitcl$TCL_UNSHARED_LIB_SUFFIX"; then
-	 	ac_cv_c_itcllib=`(cd ${with_itcllib}; ${PWDCMD-pwd})`/libitcl$TCL_UNSHARED_LIB_SUFFIX
+	 	ac_cv_c_itcllib=`(cd ${with_itcllib}; pwd)`/libitcl$TCL_UNSHARED_LIB_SUFFIX
 	    fi
 	fi
     fi
@@ -1399,9 +1371,9 @@ if test x"${no_itcl}" = x ; then
         done
         dnl Itcl 7.5 and greater puts library in subdir.  Look there first.
         if test -f "$itclpath/src/libitcl.$TCL_SHLIB_SUFFIX" ; then
-	     ac_cv_c_itcllib=`(cd $itclpath/src; ${PWDCMD-pwd})`
+	     ac_cv_c_itcllib=`(cd $itclpath/src; pwd)`
         elif test -f "$itclpath/src/libitcl.a"; then
-	     ac_cv_c_itcllib=`(cd $itclpath/src; ${PWDCMD-pwd})`
+	     ac_cv_c_itcllib=`(cd $itclpath/src; pwd)`
 	fi
     fi
     dnl check in a few other private locations
@@ -1415,10 +1387,10 @@ if test x"${no_itcl}" = x ; then
         for i in `ls -dr ${itclpath}/itcl* 2>/dev/null` ; do
             dnl Itcl 7.5 and greater puts library in subdir.  Look there first.
             if test -f "$i/src/libitcl$TCL_SHLIB_SUFFIX" ; then
-	        ac_cv_c_itcllib=`(cd $i/src; ${PWDCMD-pwd})`
+	        ac_cv_c_itcllib=`(cd $i/src; pwd)`
 	        break
             elif test -f "$i/src/libitcl.a"; then
-	        ac_cv_c_itcllib=`(cd $i/src; ${PWDCMD-pwd})`
+	        ac_cv_c_itcllib=`(cd $i/src; pwd)`
 	        break
 	    fi	
         done
@@ -1430,9 +1402,9 @@ if test x"${no_itcl}" = x ; then
 	ccpath=`which ${CC}  | sed -e 's:/bin/.*::'`/lib
         dnl Itcl 7.5 and greater puts library in subdir.  Look there first.
         if test -f "${ccpath}/libitcl$TCL_SHLIB_SUFFIX" ; then
-	    ac_cv_c_itcllib=`(cd ${ccpath}; ${PWDCMD-pwd})`
+	    ac_cv_c_itcllib=`(cd ${ccpath}; pwd)`
         elif test -f "${ccpath}/libitcl.a"; then
-	    ac_cv_c_itcllib=`(cd ${ccpath}; ${PWDCMD-pwd})`
+	    ac_cv_c_itcllib=`(cd ${ccpath}; pwd)`
         fi
     fi
     ])
@@ -1454,7 +1426,7 @@ AC_SUBST(ITCLLIB)
 dnl ====================================================================
 dnl Ok, lets find the itcl source trees so we can use the itcl_sh script
 dnl the alternative search directory is involked by --with-itclinclude
-AC_DEFUN([CYG_AC_PATH_ITCLSH], [
+AC_DEFUN(CYG_AC_PATH_ITCLSH, [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 no_itcl=true
 AC_MSG_CHECKING(for the itcl_sh script)
@@ -1463,9 +1435,9 @@ AC_CACHE_VAL(ac_cv_c_itclsh,[
 dnl first check to see if --with-itclinclude was specified
 if test x"${with_itclinclude}" != x ; then
   if test -f ${with_itclinclude}/itcl_sh ; then
-    ac_cv_c_itclsh=`(cd ${with_itclinclude}; ${PWDCMD-pwd})`
+    ac_cv_c_itclsh=`(cd ${with_itclinclude}; pwd)`
   elif test -f ${with_itclinclude}/src/itcl_sh ; then
-    ac_cv_c_itclsh=`(cd ${with_itclinclude}/src; ${PWDCMD-pwd})`
+    ac_cv_c_itclsh=`(cd ${with_itclinclude}/src; pwd)`
   else
     AC_MSG_ERROR([${with_itclinclude} directory doesn't contain itcl_sh])
   fi
@@ -1486,7 +1458,7 @@ if test x"${ac_cv_c_itclsh}" = x ; then
     dnl might be multiple version of Itcl, and we want the most recent one.
     for i in `ls -dr $itclpath/itcl* 2>/dev/null ` ; do
         if test -f $i/src/itcl_sh ; then
-          ac_cv_c_itclsh=`(cd $i/src; ${PWDCMD-pwd})`/itcl_sh
+          ac_cv_c_itclsh=`(cd $i/src; pwd)`/itcl_sh
           break
         fi
     done
@@ -1516,7 +1488,7 @@ AC_SUBST(ITCLSH)
 dnl ====================================================================
 dnl Ok, lets find the itcl source trees so we can use the itcl_sh script
 dnl the alternative search directory is involked by --with-itclinclude
-AC_DEFUN([CYG_AC_PATH_ITCLMKIDX], [
+AC_DEFUN(CYG_AC_PATH_ITCLMKIDX, [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 no_itcl=true
 AC_MSG_CHECKING(for itcl_mkindex.tcl script)
@@ -1525,9 +1497,9 @@ AC_CACHE_VAL(ac_cv_c_itclmkidx,[
 dnl first check to see if --with-itclinclude was specified
 if test x"${with_itclinclude}" != x ; then
   if test -f ${with_itclinclude}/itcl_sh ; then
-    ac_cv_c_itclmkidx=`(cd ${with_itclinclude}; ${PWDCMD-pwd})`
+    ac_cv_c_itclmkidx=`(cd ${with_itclinclude}; pwd)`
   elif test -f ${with_itclinclude}/src/itcl_sh ; then
-    ac_cv_c_itclmkidx=`(cd ${with_itclinclude}/src; ${PWDCMD-pwd})`
+    ac_cv_c_itclmkidx=`(cd ${with_itclinclude}/src; pwd)`
   else
     AC_MSG_ERROR([${with_itclinclude} directory doesn't contain itcl_sh])
   fi
@@ -1548,7 +1520,7 @@ if test x"${ac_cv_c_itclmkidx}" = x ; then
     dnl might be multiple version of Itcl, and we want the most recent one.
     for i in `ls -dr $itclpath/itcl* 2>/dev/null ` ; do
         if test -f $i/library/itcl_mkindex.tcl ; then
-          ac_cv_c_itclmkidx=`(cd $i/library; ${PWDCMD-pwd})`/itcl_mkindex.tcl
+          ac_cv_c_itclmkidx=`(cd $i/library; pwd)`/itcl_mkindex.tcl
           break
         fi
     done
@@ -1559,7 +1531,7 @@ if test x"${ac_cv_c_itclmkidx}" = x ; then
     dnl Itcl 7.5 and greater puts library in subdir.  Look there first.
     for i in `ls -dr $ccpath/itcl* 2>/dev/null ` ; do
         if test -f $i/itcl_mkindex.tcl ; then
-            ac_cv_c_itclmkidx=`(cd $i; ${PWDCMD-pwd})`/itcl_mkindex.tcl
+            ac_cv_c_itclmkidx=`(cd $i; pwd)`/itcl_mkindex.tcl
             break
         fi
     done
@@ -1582,11 +1554,11 @@ AC_SUBST(ITCLMKIDX)
 dnl ====================================================================
 dnl Ok, lets find the tix source trees so we can use the headers
 dnl the alternative search directory is involked by --with-tixinclude
-AC_DEFUN([CYG_AC_PATH_TIX], [
+AC_DEFUN(CYG_AC_PATH_TIX, [
     CYG_AC_PATH_TIXH
     CYG_AC_PATH_TIXLIB
 ])
-AC_DEFUN([CYG_AC_PATH_TIXH], [
+AC_DEFUN(CYG_AC_PATH_TIXH, [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 no_tix=true
 AC_MSG_CHECKING(for Tix headers in the source tree)
@@ -1595,9 +1567,9 @@ AC_CACHE_VAL(ac_cv_c_tixh,[
 dnl first check to see if --with-tixinclude was specified
 if test x"${with_tixinclude}" != x ; then
   if test -f ${with_tixinclude}/tix.h ; then
-    ac_cv_c_tixh=`(cd ${with_tixinclude}; ${PWDCMD-pwd})`
+    ac_cv_c_tixh=`(cd ${with_tixinclude}; pwd)`
   elif test -f ${with_tixinclude}/generic/tix.h ; then
-    ac_cv_c_tixh=`(cd ${with_tixinclude}/generic; ${PWDCMD-pwd})`
+    ac_cv_c_tixh=`(cd ${with_tixinclude}/generic; pwd)`
   else
     AC_MSG_ERROR([${with_tixinclude} directory doesn't contain headers])
   fi
@@ -1607,7 +1579,7 @@ dnl next check if it came with Tix configuration file
 if test x"${ac_cv_c_tixconfig}" != x ; then
   for i in $dirlist; do
     if test -f $ac_cv_c_tixconfig/$i/generic/tix.h ; then
-      ac_cv_c_tixh=`(cd $ac_cv_c_tixconfig/$i/generic; ${PWDCMD-pwd})`
+      ac_cv_c_tixh=`(cd $ac_cv_c_tixconfig/$i/generic; pwd)`
       break
     fi
   done
@@ -1628,7 +1600,7 @@ if test x"${ac_cv_c_tixh}" = x ; then
     dnl might be multiple version of Tix, and we want the most recent one.
     for i in `ls -dr $tixpath/tix* 2>/dev/null ` ; do
         if test -f $i/generic/tix.h ; then
-          ac_cv_c_tixh=`(cd $i/generic; ${PWDCMD-pwd})`
+          ac_cv_c_tixh=`(cd $i/generic; pwd)`
           break
         fi
     done
@@ -1663,7 +1635,7 @@ fi
 AC_SUBST(TIXHDIR)
 ])
 
-AC_DEFUN([CYG_AC_PATH_TIXCONFIG], [
+AC_DEFUN(CYG_AC_PATH_TIXCONFIG, [
 #
 # Ok, lets find the tix configuration
 # First, look for one uninstalled.  
@@ -1681,7 +1653,7 @@ if test x"${no_tix}" = x ; then
   # First check to see if --with-tixconfig was specified.
   if test x"${with_tixconfig}" != x ; then
     if test -f "${with_tixconfig}/tixConfig.sh" ; then
-      ac_cv_c_tixconfig=`(cd ${with_tixconfig}; ${PWDCMD-pwd})`
+      ac_cv_c_tixconfig=`(cd ${with_tixconfig}; pwd)`
     else
       AC_MSG_ERROR([${with_tixconfig} directory doesn't contain tixConfig.sh])
     fi
@@ -1697,7 +1669,7 @@ if test x"${no_tix}" = x ; then
 		../../../tix \
 		`ls -dr ../../../tix[[4]]* 2>/dev/null` ; do
       if test -f "$i/tixConfig.sh" ; then
-        ac_cv_c_tixconfig=`(cd $i; ${PWDCMD-pwd})`
+        ac_cv_c_tixconfig=`(cd $i; pwd)`
 	break
       fi
     done
@@ -1706,7 +1678,7 @@ if test x"${no_tix}" = x ; then
   if test x"${ac_cv_c_tixconfig}" = x ; then
     for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
       if test -f "$i/tixConfig.sh" ; then
-        ac_cv_c_tkconfig=`(cd $i; ${PWDCMD-pwd})`
+        ac_cv_c_tkconfig=`(cd $i; pwd)`
 	break
       fi
     done
@@ -1717,7 +1689,7 @@ if test x"${no_tix}" = x ; then
 		${srcdir}/../tix \
 		`ls -dr ${srcdir}/../tix[[4-9]]* 2>/dev/null` ; do
       if test -f "$i/tixConfig.sh" ; then
-        ac_cv_c_tixconfig=`(cd $i; ${PWDCMD-pwd})`
+        ac_cv_c_tixconfig=`(cd $i; pwd)`
 	break
       fi
     done
@@ -1737,7 +1709,7 @@ fi
 
 # Defined as a separate macro so we don't have to cache the values
 # from PATH_TIXCONFIG (because this can also be cached).
-AC_DEFUN([CYG_AC_LOAD_TIXCONFIG], [
+AC_DEFUN(CYG_AC_LOAD_TIXCONFIG, [
     if test -f "$TIXCONFIG" ; then
       . $TIXCONFIG
     fi
@@ -1746,7 +1718,7 @@ AC_DEFUN([CYG_AC_LOAD_TIXCONFIG], [
     AC_SUBST(TIX_LIB_FULL_PATH)
 ])
 
-AC_DEFUN([CYG_AC_PATH_ITCLCONFIG], [
+AC_DEFUN(CYG_AC_PATH_ITCLCONFIG, [
 #
 # Ok, lets find the itcl configuration
 # First, look for one uninstalled.  
@@ -1764,7 +1736,7 @@ if test x"${no_itcl}" = x ; then
   # First check to see if --with-itclconfig was specified.
   if test x"${with_itclconfig}" != x ; then
     if test -f "${with_itclconfig}/itclConfig.sh" ; then
-      ac_cv_c_itclconfig=`(cd ${with_itclconfig}; ${PWDCMD-pwd})`
+      ac_cv_c_itclconfig=`(cd ${with_itclconfig}; pwd)`
     else
       AC_MSG_ERROR([${with_itclconfig} directory doesn't contain itclConfig.sh])
     fi
@@ -1780,7 +1752,7 @@ if test x"${no_itcl}" = x ; then
 		../../../itcl/itcl \
 		`ls -dr ../../../itcl/itcl[[3]]* 2>/dev/null` ; do
       if test -f "$i/itclConfig.sh" ; then
-        ac_cv_c_itclconfig=`(cd $i; ${PWDCMD-pwd})`
+        ac_cv_c_itclconfig=`(cd $i; pwd)`
 	break
       fi
     done
@@ -1789,7 +1761,7 @@ if test x"${no_itcl}" = x ; then
   if test x"${ac_cv_c_itclconfig}" = x ; then
     for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
       if test -f "$i/itclConfig.sh" ; then
-        ac_cv_c_itclconfig=`(cd $i; ${PWDCMD-pwd})`
+        ac_cv_c_itclconfig=`(cd $i; pwd)`
 	break
       fi
     done
@@ -1800,7 +1772,7 @@ if test x"${no_itcl}" = x ; then
 		${srcdir}/../itcl/itcl \
 		`ls -dr ${srcdir}/../itcl/itcl[[3]]* 2>/dev/null` ; do
       if test -f "$i/itcl/itclConfig.sh" ; then
-        ac_cv_c_itclconfig=`(cd $i; ${PWDCMD-pwd})`
+        ac_cv_c_itclconfig=`(cd $i; pwd)`
 	break
       fi
     done
@@ -1820,7 +1792,7 @@ fi
 
 # Defined as a separate macro so we don't have to cache the values
 # from PATH_ITCLCONFIG (because this can also be cached).
-AC_DEFUN([CYG_AC_LOAD_ITCLCONFIG], [
+AC_DEFUN(CYG_AC_LOAD_ITCLCONFIG, [
     if test -f "$ITCLCONFIG" ; then
       . $ITCLCONFIG
     fi
@@ -1833,7 +1805,7 @@ AC_DEFUN([CYG_AC_LOAD_ITCLCONFIG], [
 ])
 
 
-AC_DEFUN([CYG_AC_PATH_ITKCONFIG], [
+AC_DEFUN(CYG_AC_PATH_ITKCONFIG, [
 #
 # Ok, lets find the itk configuration
 # First, look for one uninstalled.  
@@ -1851,7 +1823,7 @@ if test x"${no_itk}" = x ; then
   # First check to see if --with-itkconfig was specified.
   if test x"${with_itkconfig}" != x ; then
     if test -f "${with_itkconfig}/itkConfig.sh" ; then
-      ac_cv_c_itkconfig=`(cd ${with_itkconfig}; ${PWDCMD-pwd})`
+      ac_cv_c_itkconfig=`(cd ${with_itkconfig}; pwd)`
     else
       AC_MSG_ERROR([${with_itkconfig} directory doesn't contain itkConfig.sh])
     fi
@@ -1867,7 +1839,7 @@ if test x"${no_itk}" = x ; then
 		../../../itcl/itk \
 		`ls -dr ../../../itcl/itk[[3]]* 2>/dev/null` ; do
       if test -f "$i/itkConfig.sh" ; then
-        ac_cv_c_itkconfig=`(cd $i; ${PWDCMD-pwd})`
+        ac_cv_c_itkconfig=`(cd $i; pwd)`
 	break
       fi
     done
@@ -1876,7 +1848,7 @@ if test x"${no_itk}" = x ; then
   if test x"${ac_cv_c_itkconfig}" = x ; then
     for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
       if test -f "$i/itcl/itkConfig.sh" ; then
-        ac_cv_c_itkconfig=`(cd $i; ${PWDCMD-pwd})`
+        ac_cv_c_itkconfig=`(cd $i; pwd)`
 	break
       fi
     done
@@ -1887,7 +1859,7 @@ if test x"${no_itk}" = x ; then
 		${srcdir}/../itcl/itk \
 		`ls -dr ${srcdir}/../itcl/itk[[3]]* 2>/dev/null` ; do
       if test -f "$i/itkConfig.sh" ; then
-        ac_cv_c_itkconfig=`(cd $i; ${PWDCMD-pwd})`
+        ac_cv_c_itkconfig=`(cd $i; pwd)`
 	break
       fi
     done
@@ -1907,7 +1879,7 @@ fi
 
 # Defined as a separate macro so we don't have to cache the values
 # from PATH_ITKCONFIG (because this can also be cached).
-AC_DEFUN([CYG_AC_LOAD_ITKCONFIG], [
+AC_DEFUN(CYG_AC_LOAD_ITKCONFIG, [
     if test -f "$ITKCONFIG" ; then
       . $ITKCONFIG
     fi
@@ -1921,11 +1893,11 @@ AC_DEFUN([CYG_AC_LOAD_ITKCONFIG], [
 dnl ====================================================================
 dnl Ok, lets find the libgui source trees so we can use the headers
 dnl the alternative search directory is involked by --with-libguiinclude
-AC_DEFUN([CYG_AC_PATH_LIBGUI], [
+AC_DEFUN(CYG_AC_PATH_LIBGUI, [
     CYG_AC_PATH_LIBGUIH
     CYG_AC_PATH_LIBGUILIB
 ])
-AC_DEFUN([CYG_AC_PATH_LIBGUIH], [
+AC_DEFUN(CYG_AC_PATH_LIBGUIH, [
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../..../../../../../../../../../../.."
 no_libgui=true
 AC_MSG_CHECKING(for Libgui headers in the source tree)
@@ -1934,9 +1906,9 @@ AC_CACHE_VAL(ac_cv_c_libguih,[
 dnl first check to see if --with-libguiinclude was specified
 if test x"${with_libguiinclude}" != x ; then
   if test -f ${with_libguiinclude}/guitcl.h ; then
-    ac_cv_c_libguih=`(cd ${with_libguiinclude}; ${PWDCMD-pwd})`
+    ac_cv_c_libguih=`(cd ${with_libguiinclude}; pwd)`
   elif test -f ${with_libguiinclude}/src/guitcl.h ; then
-    ac_cv_c_libguih=`(cd ${with_libguiinclude}/src; ${PWDCMD-pwd})`
+    ac_cv_c_libguih=`(cd ${with_libguiinclude}/src; pwd)`
   else
     AC_MSG_ERROR([${with_libguiinclude} directory doesn't contain headers])
   fi
@@ -1946,7 +1918,7 @@ dnl next check if it came with Libgui configuration file
 if test x"${ac_cv_c_libguiconfig}" != x ; then
   for i in $dirlist; do
     if test -f $ac_cv_c_libguiconfig/$i/src/guitcl.h ; then
-      ac_cv_c_libguih=`(cd $ac_cv_c_libguiconfig/$i/src; ${PWDCMD-pwd})`
+      ac_cv_c_libguih=`(cd $ac_cv_c_libguiconfig/$i/src; pwd)`
       break
     fi
   done
@@ -1967,7 +1939,7 @@ if test x"${ac_cv_c_libguih}" = x ; then
     dnl might be multiple version of Libgui, and we want the most recent one.
     for i in `ls -dr $libguipath/libgui* 2>/dev/null ` ; do
         if test -f $i/src/guitcl.h ; then
-          ac_cv_c_libguih=`(cd $i/src; ${PWDCMD-pwd})`
+          ac_cv_c_libguih=`(cd $i/src; pwd)`
           break
         fi
     done
@@ -1995,7 +1967,7 @@ AC_SUBST(LIBGUIHDIR)
 
 dnl ====================================================================
 dnl find the GUI library
-AC_DEFUN([CYG_AC_PATH_LIBGUILIB], [
+AC_DEFUN(CYG_AC_PATH_LIBGUILIB, [
 AC_MSG_CHECKING(for GUI library  in the build tree)
 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
 dnl look for the library
@@ -2004,7 +1976,7 @@ AC_CACHE_VAL(ac_cv_c_libguilib,[
 if test x"${ac_cv_c_libguilib}" = x ; then
     for i in $dirlist; do
       if test -f "$i/libgui/src/Makefile" ; then
-        ac_cv_c_libguilib=`(cd $i/libgui/src; ${PWDCMD-pwd})`
+        ac_cv_c_libguilib=`(cd $i/libgui/src; pwd)`
         break
       fi
     done
diff --git a/config/acx.m4 b/config/acx.m4
deleted file mode 100644
index 7c4c213..0000000
--- a/config/acx.m4
+++ /dev/null
@@ -1,476 +0,0 @@
-# Autoconf M4 include file defining utility macros for complex Canadian
-# cross builds.
-
-dnl ####
-dnl # _GCC_TOPLEV_NONCANONICAL_BUILD
-dnl # $build_alias or canonical $build if blank.
-dnl # Used when we would use $build_alias, but empty is not OK.
-AC_DEFUN([_GCC_TOPLEV_NONCANONICAL_BUILD],
-[AC_REQUIRE([AC_CANONICAL_BUILD]) []dnl
-case ${build_alias} in
-  "") build_noncanonical=${build} ;;
-  *) build_noncanonical=${build_alias} ;;
-esac
-]) []dnl # _GCC_TOPLEV_NONCANONICAL_BUILD
-
-dnl ####
-dnl # _GCC_TOPLEV_NONCANONICAL_HOST
-dnl # $host_alias, or $build_noncanonical if blank.
-dnl # Used when we would use $host_alias, but empty is not OK.
-AC_DEFUN([_GCC_TOPLEV_NONCANONICAL_HOST],
-[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl
-case ${host_alias} in
-  "") host_noncanonical=${build_noncanonical} ;;
-  *) host_noncanonical=${host_alias} ;;
-esac
-]) []dnl # _GCC_TOPLEV_NONCANONICAL_HOST
-
-dnl ####
-dnl # _GCC_TOPLEV_NONCANONICAL_TARGET
-dnl # $target_alias or $host_noncanonical if blank.
-dnl # Used when we would use $target_alias, but empty is not OK.
-AC_DEFUN([_GCC_TOPLEV_NONCANONICAL_TARGET],
-[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_HOST]) []dnl
-case ${target_alias} in
-  "") target_noncanonical=${host_noncanonical} ;;
-  *) target_noncanonical=${target_alias} ;;
-esac
-]) []dnl # _GCC_TOPLEV_NONCANONICAL_TARGET
-
-dnl ####
-dnl # ACX_NONCANONICAL_BUILD
-dnl # Like underscored version, but AC_SUBST's.
-AC_DEFUN([ACX_NONCANONICAL_BUILD],
-[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl
-AC_SUBST(build_noncanonical)
-]) []dnl # ACX_NONCANONICAL_BUILD
-
-dnl ####
-dnl # ACX_NONCANONICAL_HOST
-dnl # Like underscored version, but AC_SUBST's.
-AC_DEFUN([ACX_NONCANONICAL_HOST],
-[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_HOST]) []dnl
-AC_SUBST(host_noncanonical)
-]) []dnl # ACX_NONCANONICAL_HOST
-
-dnl ####
-dnl # ACX_NONCANONICAL_TARGET
-dnl # Like underscored version, but AC_SUBST's.
-AC_DEFUN([ACX_NONCANONICAL_TARGET],
-[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_TARGET]) []dnl
-AC_SUBST(target_noncanonical)
-]) []dnl # ACX_NONCANONICAL_TARGET
-
-dnl ####
-dnl # GCC_TOPLEV_SUBDIRS
-dnl # GCC & friends build 'build', 'host', and 'target' tools.  These must
-dnl # be separated into three well-known subdirectories of the build directory:
-dnl # build_subdir, host_subdir, and target_subdir.  The values are determined
-dnl # here so that they can (theoretically) be changed in the future.  They
-dnl # were previously reproduced across many different files.
-dnl #
-dnl # This logic really amounts to very little with autoconf 2.13; it will
-dnl # amount to a lot more with autoconf 2.5x.
-AC_DEFUN([GCC_TOPLEV_SUBDIRS],
-[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_TARGET]) []dnl
-AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl
-# Prefix 'build-' so this never conflicts with target_subdir.
-build_subdir="build-${build_noncanonical}"
-# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories
-if ( test $srcdir = . && test -d gcc ) \
-   || test -d $srcdir/../host-${host_noncanonical}; then
-  host_subdir="host-${host_noncanonical}"
-else
-  host_subdir=.
-fi
-# No prefix.
-target_subdir=${target_noncanonical}
-AC_SUBST([build_subdir]) []dnl
-AC_SUBST([host_subdir]) []dnl
-AC_SUBST([target_subdir]) []dnl
-]) []dnl # GCC_TOPLEV_SUBDIRS
-
-
-####
-# _NCN_TOOL_PREFIXES:  Some stuff that oughtta be done in AC_CANONICAL_SYSTEM 
-# or AC_INIT.
-# These demand that AC_CANONICAL_SYSTEM be called beforehand.
-AC_DEFUN([_NCN_TOOL_PREFIXES],
-[ncn_tool_prefix=
-test -n "$host_alias" && ncn_tool_prefix=$host_alias-
-ncn_target_tool_prefix=
-test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
-]) []dnl # _NCN_TOOL_PREFIXES
-
-####
-# NCN_STRICT_CHECK_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
-# Like plain AC_CHECK_TOOLS, but require prefix if build!=host.
-
-AC_DEFUN([NCN_STRICT_CHECK_TOOLS],
-[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
-for ncn_progname in $2; do
-  if test -n "$ncn_tool_prefix"; then
-    AC_CHECK_PROG([$1], [${ncn_tool_prefix}${ncn_progname}], 
-                  [${ncn_tool_prefix}${ncn_progname}], , [$4])
-  fi
-  if test -z "$ac_cv_prog_$1" && test $build = $host ; then
-    AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4]) 
-  fi
-  test -n "$ac_cv_prog_$1" && break
-done
-
-if test -z "$ac_cv_prog_$1" ; then
-  ifelse([$3],[], [set dummy $2
-  if test $build = $host ; then
-    $1="[$]2"
-  else
-    $1="${ncn_tool_prefix}[$]2"
-  fi], [$1="$3"])
-fi
-]) []dnl # NCN_STRICT_CHECK_TOOLS
-
-####
-# NCN_STRICT_CHECK_TARGET_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
-# Like CVS Autoconf AC_CHECK_TARGET_TOOLS, but require prefix if build!=target.
-
-AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOLS],
-[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
-if test -n "$with_build_time_tools"; then
-  for ncn_progname in $2; do
-    AC_MSG_CHECKING([for ${ncn_progname} in $with_build_time_tools])
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_$1=$with_build_time_tools/${ncn_progname}
-      AC_MSG_RESULT(yes)
-      break
-    else
-      AC_MSG_RESULT(no)
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_$1"; then
-  for ncn_progname in $2; do
-    if test -n "$ncn_target_tool_prefix"; then
-      AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}${ncn_progname}], 
-                    [${ncn_target_tool_prefix}${ncn_progname}], , [$4])
-    fi
-    if test -z "$ac_cv_prog_$1" && test $build = $target ; then
-      AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4]) 
-    fi
-    test -n "$ac_cv_prog_$1" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_$1" ; then
-  ifelse([$3],[], [set dummy $2
-  if test $build = $target ; then
-    $1="[$]2"
-  else
-    $1="${ncn_target_tool_prefix}[$]2"
-  fi], [$1="$3"])
-fi
-]) []dnl # NCN_STRICT_CHECK_TARGET_TOOLS
-  
-
-# Backported from Autoconf 2.5x; can go away when and if
-# we switch.  Put the OS path separator in $PATH_SEPARATOR.
-AC_DEFUN([ACX_PATH_SEP], [
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=: 
-  fi
-  rm -f conf$$.sh
-fi
-])
-
-
-AC_DEFUN([ACX_TOOL_DIRS], [
-AC_REQUIRE([ACX_PATH_SEP])
-if test "x$exec_prefix" = xNONE; then
-        if test "x$prefix" = xNONE; then
-                gcc_cv_tool_prefix=$ac_default_prefix
-        else
-                gcc_cv_tool_prefix=$prefix
-        fi
-else
-        gcc_cv_tool_prefix=$exec_prefix
-fi
-
-# If there is no compiler in the tree, use the PATH only.  In any
-# case, if there is no compiler in the tree nobody should use
-# AS_FOR_TARGET and LD_FOR_TARGET.
-if test x$host = x$build && test -f $srcdir/gcc/BASE-VER; then
-    gcc_version=`cat $srcdir/gcc/BASE-VER`
-    gcc_cv_tool_dirs="$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin$PATH_SEPARATOR"
-else
-    gcc_cv_tool_dirs=
-fi
-
-if test x$build = x$target && test -n "$md_exec_prefix"; then
-        gcc_cv_tool_dirs="$gcc_cv_tool_dirs$md_exec_prefix$PATH_SEPARATOR"
-fi
-
-]) []dnl # ACX_TOOL_DIRS
-
-# ACX_HAVE_GCC_FOR_TARGET
-# Check if the variable GCC_FOR_TARGET really points to a GCC binary.
-AC_DEFUN([ACX_HAVE_GCC_FOR_TARGET], [
-cat > conftest.c << \EOF
-#ifdef __GNUC__
-  gcc_yay;
-#endif
-EOF
-if ($GCC_FOR_TARGET -E conftest.c | grep gcc_yay) > /dev/null 2>&1; then
-  have_gcc_for_target=yes
-else
-  GCC_FOR_TARGET=${ncn_target_tool_prefix}gcc
-  have_gcc_for_target=no
-fi
-rm conftest.c
-])
-
-# ACX_CHECK_INSTALLED_TARGET_TOOL(VAR, PROG)
-# Searching for installed target binutils.  We need to take extra care,
-# else we may find the wrong assembler, linker, etc., and lose.
-#
-# First try --with-build-time-tools, if specified.
-#
-# For build != host, we ask the installed GCC for the name of the tool it
-# uses, and accept it if it is an absolute path.  This is because the
-# only good choice for a compiler is the same GCC version that is being
-# installed (or we couldn't make target libraries), and we assume that
-# on the host system we'll have not only the same GCC version, but also
-# the same binutils version.
-#
-# For build == host, search the same directories that the installed
-# compiler will search.  We used to do this for the assembler, linker,
-# and nm only; for simplicity of configuration, however, we extend this
-# criterion to tools (such as ar and ranlib) that are never invoked by
-# the compiler, to avoid mismatches.
-#
-# Also note we have to check MD_EXEC_PREFIX before checking the user's path
-# if build == target.  This makes the most sense only when bootstrapping,
-# but we also do so when build != host.  In this case, we hope that the
-# build and host systems will have similar contents of MD_EXEC_PREFIX.
-#
-# If we do not find a suitable binary, then try the user's path.
-
-AC_DEFUN([ACX_CHECK_INSTALLED_TARGET_TOOL], [
-AC_REQUIRE([ACX_TOOL_DIRS])
-AC_REQUIRE([ACX_HAVE_GCC_FOR_TARGET])
-if test -z "$ac_cv_path_$1" ; then
-  if test -n "$with_build_time_tools"; then
-    AC_MSG_CHECKING([for $2 in $with_build_time_tools])
-    if test -x $with_build_time_tools/$2; then
-      $1=`cd $with_build_time_tools && pwd`/$2
-      ac_cv_path_$1=[$]$1
-      AC_MSG_RESULT([$ac_cv_path_$1])
-    else
-      AC_MSG_RESULT(no)
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    $1=`$GCC_FOR_TARGET --print-prog-name=$2`
-    test [$]$1=$2 && $1=
-    ac_cv_path_$1=[$]$1
-  fi
-fi
-if test -z "$ac_cv_path_$1" ; then
-  AC_PATH_PROG([$1], [$2], [], [$gcc_cv_tool_dirs])
-fi
-if test -z "$ac_cv_path_$1" ; then
-  NCN_STRICT_CHECK_TARGET_TOOLS([$1], [$2])
-else
-  $1=$ac_cv_path_$1
-fi
-]) []dnl # ACX_CHECK_INSTALLED_TARGET_TOOL
-
-###
-# AC_PROG_CPP_WERROR
-# Used for autoconf 2.5x to force AC_PREPROC_IFELSE to reject code which
-# triggers warnings from the preprocessor.  Will be in autoconf 2.58.
-# For now, using this also overrides header checks to use only the
-# preprocessor (matches 2.13 behavior; matching 2.58's behavior is a
-# bit harder from here).
-# Eventually autoconf will default to checking headers with the compiler
-# instead, and we'll have to do this differently.
-
-AC_DEFUN([AC_PROG_CPP_WERROR],
-[AC_REQUIRE([AC_PROG_CPP])dnl
-m4_define([AC_CHECK_HEADER],m4_defn([_AC_CHECK_HEADER_OLD]))
-ac_c_preproc_warn_flag=yes])# AC_PROG_CPP_WERROR
-
-# Test for GNAT.
-# We require the gnatbind program, and a compiler driver that
-# understands Ada.  We use the user's CC setting, already found.
-#
-# Sets the shell variable have_gnat to yes or no as appropriate, and
-# substitutes GNATBIND.
-AC_DEFUN([ACX_PROG_GNAT],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])
-AC_REQUIRE([AC_PROG_CC])
-AC_CHECK_TOOL(GNATBIND, gnatbind, no)
-AC_CACHE_CHECK([whether compiler driver understands Ada],
-		 acx_cv_cc_gcc_supports_ada,
-[cat >conftest.adb <<EOF
-procedure conftest is begin null; end conftest;
-EOF
-acx_cv_cc_gcc_supports_ada=no
-# There is a bug in old released versions of GCC which causes the
-# driver to exit successfully when the appropriate language module
-# has not been installed.  This is fixed in 2.95.4, 3.0.2, and 3.1.
-# Therefore we must check for the error message as well as an
-# unsuccessful exit.
-# Other compilers, like HP Tru64 UNIX cc, exit successfully when
-# given a .adb file, but produce no object file.  So we must check
-# if an object file was really produced to guard against this.
-errors=`(${CC} -c conftest.adb) 2>&1 || echo failure`
-if test x"$errors" = x && test -f conftest.$ac_objext; then
-  acx_cv_cc_gcc_supports_ada=yes
-fi
-rm -f conftest.*])
-
-if test x$GNATBIND != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
-  have_gnat=yes
-else
-  have_gnat=no
-fi
-])
-
-dnl 'make compare' can be significantly faster, if cmp itself can
-dnl skip bytes instead of using tail.  The test being performed is
-dnl "if cmp --ignore-initial=2 t1 t2 && ! cmp --ignore-initial=1 t1 t2"
-dnl but we need to sink errors and handle broken shells.  We also test
-dnl for the parameter format "cmp file1 file2 skip1 skip2" which is
-dnl accepted by cmp on some systems.
-AC_DEFUN([ACX_PROG_CMP_IGNORE_INITIAL],
-[AC_CACHE_CHECK([how to compare bootstrapped objects], gcc_cv_prog_cmp_skip,
-[ echo abfoo >t1
-  echo cdfoo >t2
-  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
-  if cmp t1 t2 2 2 > /dev/null 2>&1; then
-    if cmp t1 t2 1 1 > /dev/null 2>&1; then
-      :
-    else
-      gcc_cv_prog_cmp_skip='cmp $$f1 $$f2 16 16'
-    fi
-  fi
-  if cmp --ignore-initial=2 t1 t2 > /dev/null 2>&1; then
-    if cmp --ignore-initial=1 t1 t2 > /dev/null 2>&1; then
-      :
-    else
-      gcc_cv_prog_cmp_skip='cmp --ignore-initial=16 $$f1 $$f2'
-    fi
-  fi
-  rm t1 t2
-])
-do_compare="$gcc_cv_prog_cmp_skip"
-AC_SUBST(do_compare)
-])
-
-dnl See whether we can include both string.h and strings.h.
-AC_DEFUN([ACX_HEADER_STRING],
-[AC_CACHE_CHECK([whether string.h and strings.h may both be included],
-  gcc_cv_header_string,
-[AC_TRY_COMPILE([#include <string.h>
-#include <strings.h>], , gcc_cv_header_string=yes, gcc_cv_header_string=no)])
-if test $gcc_cv_header_string = yes; then
-  AC_DEFINE(STRING_WITH_STRINGS, 1, [Define if you can safely include both <string.h> and <strings.h>.])
-fi
-])
-
-dnl See if stdbool.h properly defines bool and true/false.
-dnl Check whether _Bool is built-in.
-AC_DEFUN([ACX_HEADER_STDBOOL],
-[AC_CACHE_CHECK([for working stdbool.h],
-  ac_cv_header_stdbool_h,
-[AC_TRY_COMPILE([#include <stdbool.h>],
-[bool foo = false;],
-ac_cv_header_stdbool_h=yes, ac_cv_header_stdbool_h=no)])
-if test $ac_cv_header_stdbool_h = yes; then
-  AC_DEFINE(HAVE_STDBOOL_H, 1,
-  [Define if you have a working <stdbool.h> header file.])
-fi
-AC_CACHE_CHECK(for built-in _Bool, gcc_cv_c__bool,
-[AC_TRY_COMPILE(,
-[_Bool foo;],
-gcc_cv_c__bool=yes, gcc_cv_c__bool=no)
-])
-if test $gcc_cv_c__bool = yes; then
-  AC_DEFINE(HAVE__BOOL, 1, [Define if the \`_Bool' type is built-in.])
-fi
-])
-
-dnl See if hard links work and if not, try to substitute $1 or simple copy.
-AC_DEFUN([ACX_PROG_LN],
-[AC_MSG_CHECKING(whether ln works)
-AC_CACHE_VAL(acx_cv_prog_LN,
-[rm -f conftestdata_t
-echo >conftestdata_f
-if ln conftestdata_f conftestdata_t 2>/dev/null
-then
-  acx_cv_prog_LN=ln
-else
-  acx_cv_prog_LN=no
-fi
-rm -f conftestdata_f conftestdata_t
-])dnl
-if test $acx_cv_prog_LN = no; then
-  LN="ifelse([$1],,cp,[$1])"
-  AC_MSG_RESULT([no, using $LN])
-else
-  LN="$acx_cv_prog_LN"
-  AC_MSG_RESULT(yes)
-fi
-AC_SUBST(LN)dnl
-])
-
-dnl GCC_TARGET_TOOL(PROGRAM, TARGET-VAR, HOST-VAR, IN-TREE-TOOL, LANGUAGE)
-AC_DEFUN([GCC_TARGET_TOOL],
-[AC_MSG_CHECKING(where to find the target $1)
-if test "x${build}" != "x${host}" ; then
-  if expr "x[$]$2" : "x/" > /dev/null; then
-    # We already found the complete path
-    AC_MSG_RESULT(pre-installed in `dirname [$]$2`)
-  else
-    # Canadian cross, just use what we found
-    AC_MSG_RESULT(pre-installed)
-  fi
-else
-  ifelse([$4],,,
-  [ok=yes
-  case " ${configdirs} " in
-    *" patsubst([$4], [/.*], []) "*) ;;
-    *) ok=no ;;
-  esac
-  ifelse([$5],,, 
-  [case ,${enable_languages}, in
-    *,$5,*) ;;
-    *) ok=no ;;
-  esac])
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    $2='$$r/$(HOST_SUBDIR)/$4'
-    AC_MSG_RESULT(just compiled)
-  el])if expr "x[$]$2" : "x/" > /dev/null; then
-    # We already found the complete path
-    AC_MSG_RESULT(pre-installed in `dirname [$]$2`)
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    $2='$($3)'
-    AC_MSG_RESULT(host tool)
-  else
-    # We need a cross tool
-    AC_MSG_RESULT(pre-installed)
-  fi
-fi])
diff --git a/config/codeset.m4 b/config/codeset.m4
deleted file mode 100644
index 59535eb..0000000
--- a/config/codeset.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_LANGINFO_CODESET],
-[
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])
diff --git a/config/depstand.m4 b/config/depstand.m4
deleted file mode 100644
index 8f936e0..0000000
--- a/config/depstand.m4
+++ /dev/null
@@ -1,136 +0,0 @@
-##                                                          -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# Based on depend.m4 from automake 1.9, modified for standalone use in
-# an environment where GNU make is required. 
-
-# ZW_PROG_COMPILER_DEPENDENCIES
-# -----------------------------
-# Variant of _AM_DEPENDENCIES which just does the dependency probe and
-# sets fooDEPMODE accordingly.  Cache-variable compatible with
-# original; not side-effect compatible.  As the users of this macro
-# may require accurate dependencies for correct builds, it does *not*
-# honor --disable-dependency-checking, and failure to detect a usable
-# method is an error.  depcomp is assumed to be located in
-# $ac_aux_dir.
-#
-# FIXME: Should use the Autoconf 2.5x language-selection mechanism.
-
-AC_DEFUN([ZW_PROG_COMPILER_DEPENDENCIES],
-[ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
-
-am_depcomp=$ac_aux_dir/depcomp
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    if test $depmode = none; then break; fi
-
-    _AS_ECHO([$as_me:$LINENO: trying $depmode], AS_MESSAGE_LOG_FD)
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "include sub/conftest.Po" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    depcmd="depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c"
-    echo "| $depcmd" | sed -e 's/  */ /g' >&AS_MESSAGE_LOG_FD
-    if env $depcmd > conftest.err 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po >>conftest.err 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po >>conftest.err 2>&1 &&
-       ${MAKE-make} -s -f confmf >>conftest.err 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-	_AS_ECHO([$as_me:$LINENO: success], AS_MESSAGE_LOG_FD)
-        break
-      fi
-    fi
-    _AS_ECHO([$as_me:$LINENO: failure, diagnostics are:], AS_MESSAGE_LOG_FD)
-    sed -e 's/^/| /' < conftest.err >&AS_MESSAGE_LOG_FD
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-if test x${am_cv_$1_dependencies_compiler_type-none} = xnone
-then AC_MSG_ERROR([no usable dependency style found])
-else AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-fi
-])
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-# ZW_CREATE_DEPDIR
-# ----------------
-# As AM_SET_DEPDIR, but also create the directory at config.status time.
-AC_DEFUN([ZW_CREATE_DEPDIR],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_CONFIG_COMMANDS([depdir], [mkdir $DEPDIR], [DEPDIR=$DEPDIR])
-])
diff --git a/config/enable.m4 b/config/enable.m4
deleted file mode 100644
index 88b29b8..0000000
--- a/config/enable.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl ----------------------------------------------------------------------
-dnl This whole bit snagged from libstdc++-v3.
-
-dnl
-dnl GCC_ENABLE
-dnl    (FEATURE, DEFAULT, HELP-ARG, HELP-STRING)
-dnl    (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, permit a|b|c)
-dnl    (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, SHELL-CODE-HANDLER)
-dnl
-dnl See docs/html/17_intro/configury.html#enable for documentation.
-dnl
-AC_DEFUN([GCC_ENABLE],[dnl
-m4_define([_g_switch],[--enable-$1])dnl
-m4_define([_g_help],[AC_HELP_STRING(_g_switch$3,[$4 @<:@default=$2@:>@])])dnl
- AC_ARG_ENABLE($1,_g_help,
-  m4_bmatch([$5],
-   [^permit ],
-     [[
-      case "$enableval" in
-       m4_bpatsubst([$5],[permit ])) ;;
-       *) AC_MSG_ERROR(Unknown argument to enable/disable $1) ;;
-          dnl Idea for future:  generate a URL pointing to
-          dnl "onlinedocs/configopts.html#whatever"
-      esac
-     ]],
-   [^$],
-     [[
-      case "$enableval" in
-       yes|no) ;;
-       *) AC_MSG_ERROR(Argument to enable/disable $1 must be yes or no) ;;
-      esac
-     ]],
-   [[$5]]),
-  [enable_]m4_bpatsubst([$1],-,_)[=][$2])
-m4_undefine([_g_switch])dnl
-m4_undefine([_g_help])dnl
-])
-
diff --git a/config/gettext-sister.m4 b/config/gettext-sister.m4
deleted file mode 100644
index d10aae8..0000000
--- a/config/gettext-sister.m4
+++ /dev/null
@@ -1,66 +0,0 @@
-# intl sister-directory configuration rules.
-#
-
-# The idea behind this macro is that there's no need to repeat all the
-# autoconf probes done by the intl directory - it's already done them
-# for us.  In fact, there's no need even to look at the cache for the
-# answers.  All we need to do is nab a few pieces of information.
-# The intl directory is set up to make this easy, by generating a
-# small file which can be sourced as a shell script; then we produce
-# the necessary substitutions and definitions for this directory.
-
-AC_DEFUN([ZW_GNU_GETTEXT_SISTER_DIR],
-[# If we haven't got the data from the intl directory,
-# assume NLS is disabled.
-USE_NLS=no	AC_SUBST(USE_NLS)
-LIBINTL=	AC_SUBST(LIBINTL)
-LIBINTL_DEP=	AC_SUBST(LIBINTL_DEP)
-INCINTL=	AC_SUBST(INCINTL)
-XGETTEXT=	AC_SUBST(XGETTEXT)
-GMSGFMT=	AC_SUBST(GMSGFMT)
-POSUB=		AC_SUBST(POSUB)
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
-fi
-AC_MSG_CHECKING([whether NLS is requested])
-if test x"$USE_NLS" != xyes; then
-  AC_MSG_RESULT(no)
-else
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(ENABLE_NLS, 1, 
- [Define to 1 if translation of program messages to the 
-  user's native language is requested.])
-
-  AC_MSG_CHECKING(for catalogs to be installed)
-  # Look for .po and .gmo files in the source directory.
-  CATALOGS=  AC_SUBST(CATALOGS)
-  XLINGUAS=
-  for cat in $srcdir/po/*.gmo $srcdir/po/*.po; do
-    # If there aren't any .gmo files the shell will give us the
-    # literal string "../path/to/srcdir/po/*.gmo" which has to be
-    # weeded out.
-    case "$cat" in *\**)
-      continue;;
-    esac
-    # The quadruple backslash is collapsed to a double backslash
-    # by the backticks, then collapsed again by the double quotes,
-    # leaving us with one backslash in the sed expression (right
-    # before the dot that mustn't act as a wildcard).
-    cat=`echo $cat | sed -e "s!$srcdir/!!" -e "s!\\\\.po!.gmo!"`
-    lang=`echo $cat | sed -e 's!po/!!' -e "s!\\\\.gmo!!"`
-    # The user is allowed to set LINGUAS to a list of languages to
-    # install catalogs for.  If it's empty that means "all of them."
-    if test "x$LINGUAS" = x; then
-      CATALOGS="$CATALOGS $cat"
-      XLINGUAS="$XLINGUAS $lang"
-    else
-      case "$LINGUAS" in *$lang*)
-        CATALOGS="$CATALOGS $cat"
-        XLINGUAS="$XLINGUAS $lang"
-        ;;
-      esac
-    fi
-  done
-  LINGUAS="$XLINGUAS"
-  AC_MSG_RESULT($LINGUAS)
-fi])
diff --git a/config/gettext.m4 b/config/gettext.m4
deleted file mode 100644
index 16070b4..0000000
--- a/config/gettext.m4
+++ /dev/null
@@ -1,415 +0,0 @@
-# gettext.m4 serial 20 (gettext-0.12)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl    default (if it is not specified or empty) is 'no-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-  dnl documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  dnl Set USE_NLS.
-  AM_NLS
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
-        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-
-        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
-            [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no)])
-
-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            gt_cv_func_gnugettext_libintl,
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();],
-              [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
-            dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK([#include <libintl.h>
-]ifelse([$2], [need-formatstring-macros],
-[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-], [])[extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();],
-                [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-               [LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
-               ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE(HAVE_GETTEXT, 1,
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE(HAVE_DCGETTEXT, 1,
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATOBJEXT)
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    if test "$USE_INCLUDED_LIBINTL" = yes; then
-      INTLOBJS="\$(GETTOBJS)"
-    fi
-    AC_SUBST(INTLOBJS)
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST(LIBINTL)
-  AC_SUBST(LTLIBINTL)
-  AC_SUBST(POSUB)
-])
-
-
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
-[
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([AC_ISC_POSIX])dnl
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  AC_REQUIRE([AC_C_CONST])dnl
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_OFF_T])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([jm_GLIBC21])dnl
-  AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
-  AC_REQUIRE([gt_INTTYPES_PRI])dnl
-
-  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
-geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next \
-__fsetlocking])
-
-  AM_ICONV
-  AM_LANGINFO_CODESET
-  if test $ac_cv_header_locale_h = yes; then
-    AM_LC_MESSAGES
-  fi
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff --git a/config/glibc21.m4 b/config/glibc21.m4
deleted file mode 100644
index 9c9f3db..0000000
--- a/config/glibc21.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([jm_GLIBC21],
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-	[
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-	],
-	ac_cv_gnu_library_2_1=yes,
-	ac_cv_gnu_library_2_1=no)
-      ]
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
diff --git a/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4
deleted file mode 100644
index 0e6e4ff..0000000
--- a/config/gxx-include-dir.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-dnl Usage: TL_AC_GXX_INCLUDE_DIR
-dnl
-dnl Set $gxx_include_dir to the location of the installed C++ include
-dnl directory.  The value depends on $gcc_version and the configuration
-dnl options --with-gxx-include-dir and --enable-version-specific-runtime-libs.
-dnl
-dnl If you change the default here, you'll need to change the gcc and
-dnl libstdc++-v3 subdirectories too.
-AC_DEFUN([TL_AC_GXX_INCLUDE_DIR],
-[
-case "${with_gxx_include_dir}" in
-  yes)
-    AC_MSG_ERROR([--with-gxx-include-dir=[[dir]] requires a directory])
-    ;;
-  no | "")
-    case "${enable_version_specific_runtime_libs}" in
-      yes) gxx_include_dir='$(libsubdir)/include/c++' ;;
-      *)
-	libstdcxx_incdir='c++/$(gcc_version)'
-	gxx_include_dir='$(prefix)/include/$(libstdcxx_incdir)' ;;
-    esac ;;
-  *) gxx_include_dir=${with_gxx_include_dir} ;;
-esac
-AC_SUBST(gxx_include_dir)
-AC_SUBST(libstdcxx_incdir)
-])
diff --git a/config/iconv.m4 b/config/iconv.m4
deleted file mode 100644
index c5f3579..0000000
--- a/config/iconv.m4
+++ /dev/null
@@ -1,103 +0,0 @@
-# iconv.m4 serial AM4 (gettext-0.11.3)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      am_cv_func_iconv=yes)
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST(LIBICONV)
-  AC_SUBST(LTLIBICONV)
-])
-
-AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-])
diff --git a/config/intdiv0.m4 b/config/intdiv0.m4
deleted file mode 100644
index 55dddcf..0000000
--- a/config/intdiv0.m4
+++ /dev/null
@@ -1,72 +0,0 @@
-# intdiv0.m4 serial 1 (gettext-0.11.3)
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([gt_INTDIV0],
-[
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
-    gt_cv_int_divbyzero_sigfpe,
-    [
-      AC_TRY_RUN([
-#include <stdlib.h>
-#include <signal.h>
-
-static void
-#ifdef __cplusplus
-sigfpe_handler (int sig)
-#else
-sigfpe_handler (sig) int sig;
-#endif
-{
-  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
-  exit (sig != SIGFPE);
-}
-
-int x = 1;
-int y = 0;
-int z;
-int nan;
-
-int main ()
-{
-  signal (SIGFPE, sigfpe_handler);
-/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
-#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
-  signal (SIGTRAP, sigfpe_handler);
-#endif
-/* Linux/SPARC yields signal SIGILL.  */
-#if defined (__sparc__) && defined (__linux__)
-  signal (SIGILL, sigfpe_handler);
-#endif
-
-  z = x / y;
-  nan = y / y;
-  exit (1);
-}
-], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
-        [
-          # Guess based on the CPU.
-          case "$host_cpu" in
-            alpha* | i[34567]86 | m68k | s390*)
-              gt_cv_int_divbyzero_sigfpe="guessing yes";;
-            *)
-              gt_cv_int_divbyzero_sigfpe="guessing no";;
-          esac
-        ])
-    ])
-  case "$gt_cv_int_divbyzero_sigfpe" in
-    *yes) value=1;;
-    *) value=0;;
-  esac
-  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
-    [Define if integer division by zero raises signal SIGFPE.])
-])
diff --git a/config/inttypes-pri.m4 b/config/inttypes-pri.m4
deleted file mode 100644
index fd007c3..0000000
--- a/config/inttypes-pri.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-# inttypes-pri.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
-# macros to non-string values.  This is the case on AIX 4.3.3.
-
-AC_DEFUN([gt_INTTYPES_PRI],
-[
-  AC_REQUIRE([gt_HEADER_INTTYPES_H])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
-      gt_cv_inttypes_pri_broken,
-      [
-        AC_TRY_COMPILE([#include <inttypes.h>
-#ifdef PRId32
-char *p = PRId32;
-#endif
-], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
-      ])
-  fi
-  if test "$gt_cv_inttypes_pri_broken" = yes; then
-    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
-      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-  fi
-])
diff --git a/config/inttypes.m4 b/config/inttypes.m4
deleted file mode 100644
index ab370ff..0000000
--- a/config/inttypes.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-# inttypes.m4 serial 1 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
-# <sys/types.h>.
-
-AC_DEFUN([gt_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
-  [
-    AC_TRY_COMPILE(
-      [#include <sys/types.h>
-#include <inttypes.h>],
-      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
-  ])
-  if test $gt_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
-      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
-  fi
-])
diff --git a/config/inttypes_h.m4 b/config/inttypes_h.m4
deleted file mode 100644
index f342eba..0000000
--- a/config/inttypes_h.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-# inttypes_h.m4 serial 5 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
-[
-  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_inttypes_h=yes,
-    jm_ac_cv_header_inttypes_h=no)])
-  if test $jm_ac_cv_header_inttypes_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. ])
-  fi
-])
diff --git a/config/lcmessage.m4 b/config/lcmessage.m4
deleted file mode 100644
index ffd4008..0000000
--- a/config/lcmessage.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-# lcmessage.m4 serial 3 (gettext-0.11.3)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-
-AC_DEFUN([AM_LC_MESSAGES],
-[
-  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-  if test $am_cv_val_LC_MESSAGES = yes; then
-    AC_DEFINE(HAVE_LC_MESSAGES, 1,
-      [Define if your <locale.h> file defines LC_MESSAGES.])
-  fi
-])
diff --git a/config/lead-dot.m4 b/config/lead-dot.m4
deleted file mode 100644
index e019030..0000000
--- a/config/lead-dot.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-#                                                          -*- Autoconf -*-
-# Copyright (C) 2003  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# serial 1
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
diff --git a/config/lib-ld.m4 b/config/lib-ld.m4
deleted file mode 100644
index 11d0ce7..0000000
--- a/config/lib-ld.m4
+++ /dev/null
@@ -1,110 +0,0 @@
-# lib-ld.m4 serial 2 (gettext-0.12)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
-
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  acl_cv_prog_gnu_ld=yes
-else
-  acl_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-1.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(acl_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
diff --git a/config/lib-link.m4 b/config/lib-link.m4
deleted file mode 100644
index eeb200d..0000000
--- a/config/lib-link.m4
+++ /dev/null
@@ -1,551 +0,0 @@
-# lib-link.m4 serial 4 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    LIBS="$LIBS $LIB[]NAME"
-    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
-    [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib$1-prefix],
-[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux*) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux*) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
-    fi
-  done
-])
diff --git a/config/lib-prefix.m4 b/config/lib-prefix.m4
deleted file mode 100644
index c719bc8..0000000
--- a/config/lib-prefix.m4
+++ /dev/null
@@ -1,155 +0,0 @@
-# lib-prefix.m4 serial 2 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib-prefix],
-[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/lib"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])
diff --git a/config/mh-a68bsd b/config/mh-a68bsd
new file mode 100644
index 0000000..c991289
--- /dev/null
+++ b/config/mh-a68bsd
@@ -0,0 +1,12 @@
+RANLIB=true
+
+#None of the Apollo compilers can compile gas or binutils.  The preprocessor
+# chokes on bfd, the compiler won't let you assign integers to enums, and
+# other problems.  Defining CC to gcc is a questionable way to say "don't use
+# the apollo compiler" (the preferred version of GCC could be called cc,
+# or whatever), but I'm not sure leaving CC as cc is any better...
+
+#CC=cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DNO_STDARG
+CC=gcc
+
+BISON=yacc
diff --git a/config/mh-aix386 b/config/mh-aix386
new file mode 100644
index 0000000..4accd1c
--- /dev/null
+++ b/config/mh-aix386
@@ -0,0 +1 @@
+RANLIB = @:
diff --git a/config/mh-apollo68 b/config/mh-apollo68
new file mode 100644
index 0000000..4497ed9
--- /dev/null
+++ b/config/mh-apollo68
@@ -0,0 +1,3 @@
+HDEFINES = -DUSG
+RANLIB=true
+CC= cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DUSG
diff --git a/config/mh-cxux b/config/mh-cxux
index 8680654..54b2a16 100644
--- a/config/mh-cxux
+++ b/config/mh-cxux
@@ -1,5 +1,14 @@
 # Configuration for Harris CX/UX 7 (and maybe 6), based on sysv4 configuration.
 
+# Define SYSV as -DSYSV if you are using a System V operating system.
+SYSV = -DSYSV -DSVR4
+RANLIB = true
+
+# C++ debugging is not yet supported under SVR4 (DWARF)
+CXXFLAGS=-O
+
 # The l flag generates a warning from the SVR4 archiver, remove it.
 AR_FLAGS = cq
 
+# Under CX/UX, we want to tell the compiler to use ANSI mode.
+CC=cc -Xa
diff --git a/config/mh-cygwin b/config/mh-cygwin
index 6c3ab80..241027f 100644
--- a/config/mh-cygwin
+++ b/config/mh-cygwin
@@ -1,6 +1,6 @@
-EXTRA_TARGET_HOST_ALL_MODULES=maybe-all-libtermcap
-EXTRA_TARGET_HOST_INSTALL_MODULES=maybe-install-libtermcap
+EXTRA_TARGET_HOST_ALL_MODULES=all-libtermcap
+EXTRA_TARGET_HOST_INSTALL_MODULES=install-libtermcap
 
-all-gdb: maybe-all-libtermcap
+all-gdb: all-libtermcap
 
-install-gdb: maybe-all-libtermcap
+install-gdb: all-libtermcap
diff --git a/config/mh-decstation b/config/mh-decstation
index 320927c..3720192 100644
--- a/config/mh-decstation
+++ b/config/mh-decstation
@@ -1,3 +1,5 @@
+CC = cc -Wf,-XNg1000
+
 # for X11, since the native DECwindows include files are really broken when
 # it comes to function prototypes.  
 X11_EXTRA_CFLAGS = "-DNeedFunctionPrototypes=0"
diff --git a/config/mh-delta88 b/config/mh-delta88
new file mode 100644
index 0000000..bc9c453
--- /dev/null
+++ b/config/mh-delta88
@@ -0,0 +1,4 @@
+RANLIB = true
+
+
+
diff --git a/config/mh-dgux b/config/mh-dgux
new file mode 100644
index 0000000..e7d85d6
--- /dev/null
+++ b/config/mh-dgux
@@ -0,0 +1,4 @@
+HDEFINES=-DHOST_SYS=DGUX_SYS
+CC=gcc -Wall -ansi -D__using_DGUX
+RANLIB=true
+
diff --git a/config/mh-dgux386 b/config/mh-dgux386
index b2d2a05..15885c3 100644
--- a/config/mh-dgux386
+++ b/config/mh-dgux386
@@ -1,5 +1,22 @@
+# from mh-dgux
+HDEFINES=-DHOST_SYS=DGUX_SYS
+CC=gcc -Wall -ansi -D__using_DGUX
+RANLIB = true
+
+# from mh-sysv4
+# Define SYSV as -DSYSV if you are using a System V operating system.
+SYSV = -DSYSV -DSVR4
+RANLIB = true
+
+# C++ debugging is not yet supported under SVR4 (DWARF)
+CXXFLAGS=-O
+
 # The l flag generates a warning from the SVR4 archiver, remove it.
 AR_FLAGS = cr
 
 X11_EXTRA_LIBS = -lnsl
 
+# from angela
+# no debugging due to broken compiler, use BSD style timeofday
+CFLAGS=-O -D_BSD_TIMEOFDAY_FLAVOR
+
diff --git a/config/mh-djgpp b/config/mh-djgpp
index 88d250a..f12007b 100644
--- a/config/mh-djgpp
+++ b/config/mh-djgpp
@@ -1,14 +1,4 @@
-# Shorten the target alias so when it is used to set 'libsubdir'
-# the name will work in both short and long filename environments.
-ifeq ($(findstring -pc-msdosdjgpp,$(target_alias)),-pc-msdosdjgpp)
-target_alias=djgpp
-endif
-
-# The version string must be modified to contain just one dot
-# because DOS filenames can only have one dot when long filenames
-# are not available.
-__version:=$(gcc_version)
-__version:=$(subst ., ,$(__version))
-ifeq ($(words $(__version)),3)
-gcc_version=$(word 1,$(__version)).$(word 2,$(__version))$(word 3,$(__version))
-endif
+# We don't want to use debugging information on DOS.  Unfortunately,
+# this requires that we set CFLAGS.
+# This used to set -fno-omit-frame-pointer.
+CFLAGS=-O2
diff --git a/config/mh-hp300 b/config/mh-hp300
new file mode 100644
index 0000000..761724d
--- /dev/null
+++ b/config/mh-hp300
@@ -0,0 +1,13 @@
+# Define SYSV as -DSYSV if you are using a System V operating system.
+SYSV = -DSYSV
+# Avoid "too much defining" errors from HPUX compiler.
+CC = cc -Wp,-H256000
+# If "ar" in $PATH is GNU ar, the symbol table may need rebuilding.
+# If it's HP/UX ar, this should be harmless.
+RANLIB = ar ts
+
+# Native cc can't bootstrap gcc with -g.  Defining CFLAGS here loses (a)
+# for non-gcc directories, (b) if we are compiling with gcc, not
+# native cc.  Neither (a) nor (b) has a trivial fix though.
+
+CFLAGS =
diff --git a/config/mh-hpux b/config/mh-hpux
new file mode 100644
index 0000000..4d71c9d
--- /dev/null
+++ b/config/mh-hpux
@@ -0,0 +1,4 @@
+# Define SYSV as -DSYSV if you are using a System V operating system.
+CC = cc -Wp,-H256000
+SYSV = -DSYSV
+RANLIB = true
diff --git a/config/mh-hpux8 b/config/mh-hpux8
new file mode 100644
index 0000000..4d71c9d
--- /dev/null
+++ b/config/mh-hpux8
@@ -0,0 +1,4 @@
+# Define SYSV as -DSYSV if you are using a System V operating system.
+CC = cc -Wp,-H256000
+SYSV = -DSYSV
+RANLIB = true
diff --git a/config/mh-interix b/config/mh-interix
index 67dff5c..19b8ecf 100644
--- a/config/mh-interix
+++ b/config/mh-interix
@@ -1,5 +1,12 @@
 # The shell may not be in /bin. 
 SHELL = sh
+RANLIB = true
+
+# We don't want debugging info in Interix-hosted toolchains.
+# Accomplish this by overriding CFLAGS. This is also a workaround
+# for LD crash when building shared libstdc++.
+CFLAGS=-O2
+CXXFLAGS=-O2
 
 # We also need to override LIBGCC2_DEBUG_CFLAGS so libgcc2 will be
 # built without debugging information
diff --git a/config/mh-irix4 b/config/mh-irix4
new file mode 100644
index 0000000..6872145
--- /dev/null
+++ b/config/mh-irix4
@@ -0,0 +1,7 @@
+# Makefile changes for SGI's running IRIX-4.x.
+# Tell compiler to use K&R C.  We can't compile under the SGI Ansi
+# environment.  Also bump switch table size so that cp-parse will
+# compile.  Bump string length limit so linker builds.
+
+CC = cc -cckr -Wf,-XNg1500 -Wf,-XNk1000 -Wf,-XNh2000 -Wf,-XNl8192
+SYSV = -DSYSV
diff --git a/config/mh-irix5 b/config/mh-irix5
new file mode 100644
index 0000000..8bd7c99
--- /dev/null
+++ b/config/mh-irix5
@@ -0,0 +1,3 @@
+# Makefile changes for SGI's running IRIX-5.x.
+SYSV = -DSYSV
+RANLIB = true
diff --git a/config/mh-irix6 b/config/mh-irix6
new file mode 100644
index 0000000..e792678
--- /dev/null
+++ b/config/mh-irix6
@@ -0,0 +1,3 @@
+# Makefile changes for SGI's running IRIX-6.x.
+SYSV = -DSYSV
+RANLIB = true
diff --git a/config/mh-lynxos b/config/mh-lynxos
new file mode 100644
index 0000000..9afcb79
--- /dev/null
+++ b/config/mh-lynxos
@@ -0,0 +1,2 @@
+# /bin/cc is less than useful for our purposes.  Always use GCC
+CC = /bin/gcc
diff --git a/config/mh-lynxrs6k b/config/mh-lynxrs6k
index fac1b97..b279399 100644
--- a/config/mh-lynxrs6k
+++ b/config/mh-lynxrs6k
@@ -1,2 +1,8 @@
+# LynxOS running on the rs6000 doesn't have ranlib
+RANLIB = true
+
+# /bin/cc is less than useful for our purposes.  Always use GCC
+CC = /usr/cygnus/progressive/bin/gcc
+
 # /bin/sh is too buggy, so use /bin/bash instead.
 SHELL = /bin/bash
diff --git a/config/mh-mingw32 b/config/mh-mingw32
new file mode 100644
index 0000000..8c4839d
--- /dev/null
+++ b/config/mh-mingw32
@@ -0,0 +1,12 @@
+# We don't want debugging info in Win32-hosted toolchains.
+# Accomplish this by overriding CFLAGS.
+CFLAGS=-O2
+CXXFLAGS=-O2
+
+# We also need to override LIBGCC2_DEBUG_CFLAGS so libgcc2 will be
+# built without debugging information
+
+LIBGCC2_DEBUG_CFLAGS=
+
+# custom installation rules for mingw32 (append .exe to binaries, etc.)
+# INSTALL_DOSREL=install-dosrel
diff --git a/config/mh-ncr3000 b/config/mh-ncr3000
index 7c6ee12..5bbd803 100644
--- a/config/mh-ncr3000
+++ b/config/mh-ncr3000
@@ -1,4 +1,17 @@
 # Host configuration file for an NCR 3000 (i486/SVR4) system.
 
+# The NCR 3000 ships with a MetaWare compiler installed as /bin/cc.
+# This compiler not only emits obnoxious copyright messages every time
+# you run it, but it chokes and dies on a whole bunch of GNU source
+# files.  Default to using the AT&T compiler installed in /usr/ccs/ATT/cc.
+# Unfortunately though, the AT&T compiler sometimes generates code that
+# the assembler barfs on if -g is used, so disable it by default as well.
+CC = /usr/ccs/ATT/cc
+CFLAGS =
+
+# Define SYSV as -DSYSV if you are using a System V operating system.
+SYSV = -DSYSV -DSVR4
+RANLIB = true
+
 # The l flag generates a warning from the SVR4 archiver, remove it.
 AR_FLAGS = cq
diff --git a/config/mh-ncrsvr43 b/config/mh-ncrsvr43
new file mode 100644
index 0000000..43b0991
--- /dev/null
+++ b/config/mh-ncrsvr43
@@ -0,0 +1,9 @@
+# Host configuration file for an NCR 3000 (i486/SVR43) system.
+
+# The MetaWare compiler will generate a copyright message unless you
+# turn it off by adding the -Hnocopyr flag.
+CC = cc -Hnocopyr
+
+# Define SYSV as -DSYSV if you are using a System V operating system.
+SYSV = -DSYSV -DSVR4
+RANLIB = true
diff --git a/config/mh-necv4 b/config/mh-necv4
index d71805e..e887736 100644
--- a/config/mh-necv4
+++ b/config/mh-necv4
@@ -1,4 +1,11 @@
 # Host Makefile fragment for NEC MIPS SVR4.
 
+# The C compiler on NEC MIPS SVR4 needs bigger tables.
+CC = cc -ZXNd=5000 -ZXNg=1000
+
+# Define SYSV as -DSYSV if you are using a System V operating system.
+SYSV = -DSYSV -DSVR4
+RANLIB = true
+
 # NEC -lX11 needs some other libraries.
 X11_EXTRA_LIBS = -lsocket -lnsl
diff --git a/config/mh-openedition b/config/mh-openedition
new file mode 100644
index 0000000..e99ef15
--- /dev/null
+++ b/config/mh-openedition
@@ -0,0 +1,2 @@
+RANLIB = true
+CC = c89
diff --git a/config/mh-ppc-aix b/config/mh-ppc-aix
deleted file mode 100644
index f2bc76a..0000000
--- a/config/mh-ppc-aix
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# Compile Ada files with minimal-toc.  The primary focus is gnatlib, so
-# that the library does not use nearly the entire TOC of applications
-# until gnatlib is built as a shared library on AIX.  Compiling the
-# compiler with -mminimal-toc does not cause any harm.
-BOOT_ADAFLAGS = -mminimal-toc
-BOOT_LDFLAGS = -Wl,-bbigtoc
-LDFLAGS = `case $(CC) in *gcc*) echo -Wl,-bbigtoc ;; esac;`
diff --git a/config/mh-ppc-darwin b/config/mh-ppc-darwin
deleted file mode 100644
index 44fd620..0000000
--- a/config/mh-ppc-darwin
+++ /dev/null
@@ -1,6 +0,0 @@
-# The -mdynamic-no-pic ensures that the compiler executable is built without
-# position-independent-code -- the usual default on Darwin. This fix speeds
-# compiles by 3-5%.
-
-BOOT_CFLAGS=-g -O2 -mdynamic-no-pic
-
diff --git a/config/mh-riscos b/config/mh-riscos
new file mode 100644
index 0000000..e586b30
--- /dev/null
+++ b/config/mh-riscos
@@ -0,0 +1,15 @@
+# This is for a MIPS running RISC/os 4.52C.
+
+# This is needed for GDB, but needs to be in the top-level make because
+# if a library is compiled with the bsd headers and gets linked with the
+# sysv system libraries all hell can break loose (e.g. a jmp_buf might be
+# a different size).
+# ptrace(2) apparently has problems in the BSD environment.  No workaround is
+# known except to select the sysv environment.  Could we use /proc instead?
+# These "sysv environments" and "bsd environments" often end up being a pain.
+#
+# This is not part of CFLAGS because perhaps not all C compilers have this
+# option.
+CC= cc -systype sysv
+
+RANLIB = true
diff --git a/config/mh-sco b/config/mh-sco
index bf5a807..cc337c9 100644
--- a/config/mh-sco
+++ b/config/mh-sco
@@ -1,4 +1,10 @@
+# Define SYSV as -DSYSV if you are using a System V operating system.
+SYSV = -DSYSV
+RANLIB = true
 # You may need this if you don't have bison.
 # BISON = yacc -Sm10400
+# The native C compiler botches some simple uses of const.  Unfortunately,
+# it doesn't defined anything like "__sco__" for us to test for in ansidecl.h.
+CC = cc -Dconst=
 
 X11_EXTRA_LIBS = -lsocket -lm -lintl -lmalloc
diff --git a/config/mh-solaris b/config/mh-solaris
index 6e8f296..ddbea54 100644
--- a/config/mh-solaris
+++ b/config/mh-solaris
@@ -1,2 +1,6 @@
 # Makefile changes for Suns running Solaris 2
+
+SYSV = -DSYSV
+RANLIB = true
+
 X11_EXTRA_LIBS = -lnsl -lsocket
diff --git a/config/mh-sun3 b/config/mh-sun3
new file mode 100644
index 0000000..dcd5155
--- /dev/null
+++ b/config/mh-sun3
@@ -0,0 +1,3 @@
+# Sun's C compiler needs the -J flag to be able to compile cp-parse.c
+# without overflowing the jump tables (-J says to use a 32 bit table)
+CC = cc -J
diff --git a/config/mh-sysv b/config/mh-sysv
new file mode 100644
index 0000000..16b1187
--- /dev/null
+++ b/config/mh-sysv
@@ -0,0 +1,3 @@
+# Define SYSV as -DSYSV if you are using a System V operating system.
+SYSV = -DSYSV
+RANLIB = true
diff --git a/config/mh-sysv4 b/config/mh-sysv4
index 2e9374c..8106651 100644
--- a/config/mh-sysv4
+++ b/config/mh-sysv4
@@ -1,3 +1,10 @@
+# Define SYSV as -DSYSV if you are using a System V operating system.
+SYSV = -DSYSV -DSVR4
+RANLIB = true
+
+# C++ debugging is not yet supported under SVR4 (DWARF)
+CXXFLAGS=-O
+
 # The l flag generates a warning from the SVR4 archiver, remove it.
 AR_FLAGS = cr
 
diff --git a/config/mh-sysv5 b/config/mh-sysv5
index 2e9374c..1fa38e5 100644
--- a/config/mh-sysv5
+++ b/config/mh-sysv5
@@ -1,3 +1,7 @@
+# Define SYSV as -DSYSV if you are using a System V operating system.
+SYSV = -DSYSV -DSVR4 -DSVR5
+RANLIB = true
+
 # The l flag generates a warning from the SVR4 archiver, remove it.
 AR_FLAGS = cr
 
diff --git a/config/mh-vaxult2 b/config/mh-vaxult2
new file mode 100644
index 0000000..3de2dc8
--- /dev/null
+++ b/config/mh-vaxult2
@@ -0,0 +1,2 @@
+# The old BSD pcc isn't up to compiling parts of gdb so use gcc
+CC = gcc
diff --git a/config/mh-x86omitfp b/config/mh-x86omitfp
deleted file mode 100644
index 563f02b..0000000
--- a/config/mh-x86omitfp
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add -fomit-frame-pointer to the usual BOOT_CFLAGS to speed up the compiler.
-BOOT_CFLAGS = -O2 -g -fomit-frame-pointer
diff --git a/config/mpw-mh-mpw b/config/mpw-mh-mpw
new file mode 100644
index 0000000..543ef4f
--- /dev/null
+++ b/config/mpw-mh-mpw
@@ -0,0 +1,157 @@
+# This is an MPW makefile fragment.
+
+# Since there are a multiplicity of Mac compilers and two different
+# processors, this file is primarily a library of options for each
+# compiler.  Somebody else (such as a configure or build script) will
+# make the actual choice.
+
+# Compiler to use for compiling.
+
+CC_MPW_C = C -d MPW_C -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -mc68020 -model far -b -w
+
+CC_SC = SC -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -mc68020 -model far -b -i '' -i :
+
+CC_MWC68K = MWC68K -d MPW -enum int -mpw_chars -sym on -w off -mc68020 -model far
+
+CC_PPCC = PPCC -d powerc=1 -d pascal= -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -w
+
+CC_MRC = MrC -d powerc=1 -d pascal= -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -i '' -i : -jm
+
+CC_SMrC = SMrC -d MPW
+
+# "-mpw_chars" is necessary because GNU sources often mix signed and
+# unsigned casually.
+# "-w off" is not a great idea, but CW7 is complaining about enum
+# assignments.
+# "-opt global,peep,l4,speed" is sometimes good, and sometimes bad.
+# We must use {CIncludes} so that MPW tools will work; {MWCIncludes}
+# defines stdout, islower, etc, in ways that are incompatible with MPW's
+# runtime.  However, this cannot be done via  -i "{CIncludes}", since
+# that does not affect how <>-type includes happen; instead, the variable
+# MWCIncludes must be set to point at {CIncludes}.
+
+CC_MWCPPC = MWCPPC -d MPW -enum int -mpw_chars -sym on -w off
+
+# Note that GCC does *not* wire in a definition of "pascal", so that
+# it can be handled in another way if desired.
+
+CC_68K_GCC = gC -Dpascal= -DANSI_PROTOTYPES -DMPW
+
+CC_PPC_GCC = gC -Dpowerc=1 -Dpascal= -DANSI_PROTOTYPES -DMPW
+
+# Nothing for the default CFLAGS.
+
+CFLAGS = 
+
+# Tool to use for making libraries/archives.
+
+AR_LIB = Lib
+
+AR_MWLINK68K = MWLink68K -xm library
+
+AR_PPCLINK = PPCLink -xm library
+
+AR_MWLINKPPC = MWLinkPPC -xm library
+
+AR_AR = ar
+
+AR_FLAGS = -o
+
+RANLIB_NULL = null-command
+
+RANLIB_RANLIB = ranlib
+
+# Compiler and/or linker to use for linking.
+
+CC_LD_LINK = Link -w -d -model far {CC_LD_TOOL_FLAGS}
+
+CC_LD_MWLINK68K = MWLink68K -w {CC_LD_TOOL_FLAGS} -sym on -model far
+
+CC_LD_PPCLINK = PPCLink -main __start -outputformat xcoff
+
+CC_LD_MWLINKPPC = MWLinkPPC -w {CC_LD_TOOL_FLAGS} -sym on
+
+CC_LD_GLD = gC
+
+# Extension for linker output.
+
+PROG_EXT_68K =
+
+PROG_EXT_XCOFF = .xcoff
+
+# Nothing for the default LDFLAGS.
+
+LDFLAGS = -w
+
+CC_LD_TOOL_FLAGS = -c 'MPS ' -t MPST
+
+# Libraries to link against.
+
+# It would appear that the math libraries are not
+# needed except to provide a definition for scalb,
+# which is called from ldexp, which is referenced
+# in the m68k opcodes library.
+
+EXTRALIBS_C = \Option-d
+	"{CLibraries}"StdClib.o \Option-d
+	"{CLibraries}"Math.o \Option-d
+	"{CLibraries}"CSANELib.o \Option-d
+	"{Libraries}"Stubs.o \Option-d
+	"{Libraries}"Runtime.o \Option-d
+	"{Libraries}"Interface.o \Option-d
+	"{Libraries}"ToolLibs.o
+
+EXTRALIBS_MWC68K = \Option-d
+	"{CLibraries}"StdClib.o \Option-d
+	"{CLibraries}"Math.o \Option-d
+	"{CLibraries}"CSANELib.o \Option-d
+	"{Libraries}"Stubs.o \Option-d
+	"{Libraries}"Runtime.o \Option-d
+	"{Libraries}"Interface.o \Option-d
+	"{Libraries}"ToolLibs.o \Option-d
+	"{MW68KLibraries}MPW ANSI (4i) C.68K.Lib"
+
+EXTRALIBS_PPC_XCOFF = \Option-d
+	"{PPCLibraries}"StdCRuntime.o \Option-d
+	"{PPCLibraries}"InterfaceLib.xcoff \Option-d
+	"{PPCLibraries}"MathLib.xcoff \Option-d
+	"{PPCLibraries}"StdCLib.xcoff \Option-d
+	"{PPCLibraries}"PPCToolLibs.o \Option-d
+	"{PPCLibraries}"PPCCRuntime.o \Option-d
+	"{GCCPPCLibraries}"libgcc.xcoff
+
+EXTRALIBS_PPC = \Option-d
+	"{PPCLibraries}"StdCRuntime.o \Option-d
+	"{SharedLibraries}"InterfaceLib \Option-d
+	"{SharedLibraries}"MathLib \Option-d
+	"{SharedLibraries}"StdCLib \Option-d
+	"{PPCLibraries}"PPCToolLibs.o \Option-d
+	"{PPCLibraries}"PPCCRuntime.o \Option-d
+	"{GCCPPCLibraries}"libgcc.xcoff
+
+EXTRALIBS_MWCPPC = \Option-d
+	"{MWPPCLibraries}"MWStdCRuntime.Lib \Option-d
+	"{MWPPCLibraries}"InterfaceLib \Option-d
+	"{MWPPCLibraries}"StdCLib \Option-d
+	"{MWPPCLibraries}"MathLib \Option-d
+	"{MWPPCLibraries}"PPCToolLibs.o
+
+# Tool to make PEF with, if needed.
+
+MAKEPEF_NULL = null-command
+
+MAKEPEF_PPC = MakePEF
+
+MAKEPEF_FLAGS = \Option-d
+	-l InterfaceLib.xcoff=InterfaceLib \Option-d
+	-l MathLib.xcoff=MathLib \Option-d
+	-l StdCLib.xcoff=StdCLib
+
+MAKEPEF_TOOL_FLAGS = -ft MPST -fc 'MPS '
+
+# Resource compiler to use.
+
+REZ_68K = Rez
+
+REZ_PPC = Rez -d WANT_CFRG
+
diff --git a/config/mpw/ChangeLog b/config/mpw/ChangeLog
new file mode 100644
index 0000000..3cdefbf
--- /dev/null
+++ b/config/mpw/ChangeLog
@@ -0,0 +1,53 @@
+Tue Nov 26 12:34:12 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* g-mpw-make.sed: Fix some comments.
+
+Mon Sep 16 14:42:52 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* g-mpw-make.sed (HLDENV): Edit out all references.
+
+Thu Aug 15 19:49:23 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* true: New script, identical to mpw-true.
+	* g-mpw-make.sed: Add @DASH_C_FLAG@ and @SEGMENT_FLAG()@
+	to the editors for compile commands.
+
+Thu Aug  1 15:01:42 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-true, mpw-touch, null-command: New scripts.
+	* README: Describe usage in more detail.
+
+Tue Dec 12 14:51:51 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* g-mpw-make.sed: Don't edit out "version=" occurrences.
+
+Fri Dec  1 11:46:18 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* g-mpw-make.sed (bindir, libdir): Edit the positions of
+	pathname separators to work with other pathnames better.
+
+Tue Nov  7 15:08:07 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* g-mpw-make.sed: Add comment about Duplicate vs Catenate,
+	add additional pattern for editing link-compile commands.
+
+Tue Oct 24 14:28:51 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* g-mpw-make.sed: Add handling for *.tab.[hc] files.
+	(CHILL_FOR_TARGET, CHILL_LIB): Edit out tricky definitions
+	of these.
+
+Thu Sep 28 21:05:10 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* g-mpw-make.sed: New file, generic sed commands to translate
+	Unix makefiles into MPW makefile syntax.
+
+Fri Mar 17 11:51:20 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* README: Clarify instructions.
+	* fi: Remove.
+
+Wed Dec 21 15:45:53 1994  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* MoveIfChange, README, fi, forward-include, open-brace,
+        tr-7to8-src: New files.
diff --git a/config/mpw/MoveIfChange b/config/mpw/MoveIfChange
new file mode 100644
index 0000000..0dbc125
--- /dev/null
+++ b/config/mpw/MoveIfChange
@@ -0,0 +1,19 @@
+# Rename a file only if it is different from a previously existing
+# file of the same name.  This is useful for keeping make from doing
+# too much work if the contents of a file haven't changed.
+
+# This is an MPW translation of the standard GNU sh script move-if-change.
+
+Set exit 0
+
+If "`exists -f "{2}"`"
+  Compare "{1}" "{2}" >dev:null
+  If {status} != 0
+    Rename -y "{1}" "{2}"
+  Else
+    Echo "{2}" is unchanged
+    Delete -i -y "{1}"
+  End
+Else
+  Rename -y "{1}" "{2}"
+End
diff --git a/config/mpw/README b/config/mpw/README
new file mode 100644
index 0000000..554700a
--- /dev/null
+++ b/config/mpw/README
@@ -0,0 +1,23 @@
+This directory contains MPW scripts and related files that are needed to
+build Cygnus GNU tools for MPW.  The scripts should be somewhere on the
+command path; our usual practice has been to have a separate directory
+for the scripts, and put the tools (byacc, flex, and sed at least) there
+also; then it's easier to drag the support bits around as a group, or to
+upgrade MPW versions.  The complete package of scripts and tool binaries
+is usually available as pub/mac/buildtools.cpt.hqx on ftp.cygnus.com.
+
+"tr-7to8-src" is actually the source to an MPW script that transforms
+sequences like "\Option-d" into the actual 8-bit chars that MPW needs.
+It's only the source because it can't itself include any 8-bit chars.
+It *can* be processed into a genuine "tr-7to8" by using itself:
+
+	tr-7to8 tr-7to8-src | sed -e 's/Src//' >new-tr-7to8
+
+Use this to verify:
+
+	compare tr-7to8 new-tr-7to8
+
+If you don't have a working tr-7to8, then you will have to manually
+replace all occurrences of "\Option-d" with real Option-d (which looks
+like a delta), then do similarly with all the other "\Option-..."
+strings, and then change "\SrcOption-d" into the string "\Option-d".
diff --git a/config/mpw/forward-include b/config/mpw/forward-include
new file mode 100644
index 0000000..ddd6bd7
--- /dev/null
+++ b/config/mpw/forward-include
@@ -0,0 +1,3 @@
+Echo '#include' ¶""{1}"¶" >"{2}".tem
+MoveIfChange "{2}".tem "{2}"
+
diff --git a/config/mpw/g-mpw-make.sed b/config/mpw/g-mpw-make.sed
new file mode 100644
index 0000000..e7d3c77
--- /dev/null
+++ b/config/mpw/g-mpw-make.sed
@@ -0,0 +1,293 @@
+# Sed commands to translate Unix makefiles into MPW makefiles.
+# These are nominally generic, but work best on the makefiles used
+# for GNU programs.
+
+# Whack out any commented-out lines that are probably commands;
+# they can only cause trouble later on.
+/^#	/d
+
+# Change dependency char.
+/:$/s/:/ \\Option-f/g
+/^[^ 	:#][^:]*:/s/\([ 	]*\):\([ 	]*\)/ \\Option-f /g
+
+# Change syntax of Makefile vars.
+/\$/s/\${\([a-zA-Z0-9_-]*\)}/{\1}/g
+/\$/s/\$(\([a-zA-Z0-9_-]*\))/{\1}/g
+/ $@/s/ $@/ {Targ}/
+
+# Double-$ are literals to Unix but not to MPW make.
+/\$\$/s/\$\$/$/g
+
+# Change pathname syntax.
+/\//s,\.\./\/\.\./,:::,g
+/\//s,\.\./,::,g
+/\.\//s,\./,:,g
+/\//s,/,:,g
+# Undo excess changes.
+/and/s,and:or$,and/or,
+/and/s,and:or ,and/or ,
+/want/s,want:need,want/need,
+# Fixing up sed commands.
+/-e/s_":\([^:]*\):d"_"/\1/d"_g
+/-e/s_":\([^:]*\):,:\([^:]*\):d"_"/\1/,/\2/d"_g
+
+/=/s/ = \.$/ = :/
+
+# Make these go away so that later edits not confused.
+/HLDENV/s/{HLDENV}//
+
+# Comment out any explicit srcdir setting.
+/srcdir/s/^srcdir/# srcdir/
+
+/BASEDIR/s/^BASEDIR =.*$/BASEDIR = "{srcroot}"/
+/{BASEDIR}:/s/{BASEDIR}:/{BASEDIR}/g
+/{srcdir}:/s/{srcdir}:/"{srcdir}"/g
+/"{srcdir}":/s/"{srcdir}":/"{srcdir}"/g
+
+# Tweak some conventions that are backwards for the Mac.
+/bindir/s/{exec_prefix}:bin/{exec_prefix}bin:/
+/libdir/s/{exec_prefix}:lib/{exec_prefix}lib:/
+
+# Comment out settings of anything set by mpw host config.
+/CC/s/^CC *=/#CC =/
+/CFLAGS/s/^CFLAGS *=/#CFLAGS =/
+/AR/s/^AR *=/#AR =/
+/AR_FLAGS/s/^AR_FLAGS *=/#AR_FLAGS =/
+/RANLIB/s/^RANLIB *=/#RANLIB =/
+/CC_LD/s/^CC_LD *=/#CC_LD =/
+/LDFLAGS/s/^LDFLAGS *=/#LDFLAGS =/
+
+# Change -I usages.
+/-I/s/-I\./-i :/g
+/-I/s/-I::bfd/-i ::bfd:/g
+/-I/s/-I::include/-i ::include:/g
+/-I/s/-I/-i /g
+
+# Change -D usage.
+/-D/s/\([ =]\)-D\([^ ]*\)/\1-d \2/g
+
+# Change continuation char.
+/\\$/s/\\$/\\Option-d/
+
+# Change wildcard char.
+/\*/s/\*/\\Option-x/g
+
+# Change path of various types of source files.  This rule does not allow
+# for file names with multiple dots in the name.
+/\.[chly]/s/\([ 	><=]\)\([-a-zA-Z0-9_${}:"]*\)\.\([chly]\)/\1"{s}"\2.\3/g
+/\.[chly]/s/^\([-a-zA-Z0-9_${}:"]*\)\.\([chly]\)/"{s}"\1.\2/
+# Allow files named *.tab.[ch] as a special case.
+/\.tab\.[ch]/s/\([ 	><=]\)\([-a-zA-Z0-9_${}:"]*\.tab\)\.\([ch]\)/\1"{s}"\2.\3/g
+/\.tab\.[ch]/s/^\([-a-zA-Z0-9_${}:"]*\.tab\)\.\([ch]\)/"{s}"\1.\2/
+# Fix some overenthusiasms.
+/{s}/s/"{s}""{srcdir}"/"{srcdir}"/g
+/{s}/s/"{s}"{\([a-zA-Z0-9_]*\)dir}/"{\1dir}"/g
+/{s}/s/"{s}"{\([a-zA-Z0-9_]*\)DIR}/"{\1DIR}"/g
+/{s}/s/"{s}""{\([a-zA-Z0-9_]*\)dir}"/"{\1dir}"/g
+/{s}/s/"{s}""{\([a-zA-Z0-9_]*\)DIR}"/"{\1DIR}"/g
+/{s}/s/"{s}":/:/g
+/{s}/s/^"{s}"//g
+/{s}/s/"{s}""{s}"/"{s}"/g
+/{s}/s/"{s}""{srcdir}"/"{s}"/g
+/{s}/s/"{srcdir}""{s}"/"{s}"/g
+
+# The .def files are also typically source files.
+/\.def/s/\([ 	><]\)\([-a-zA-Z0-9_${}:"]*\)\.def/\1"{s}"\2.def/g
+/\.def/s/^\([-a-zA-Z0-9_${}:"]*\)\.def/"{s}"\1.def/g
+
+# Change extension and path of objects.
+/\.o/s/\([ 	=]\)\([-a-zA-Z0-9_${}:"]*\)\.o/\1"{o}"\2.c.o/g
+/\.o/s/^\([-a-zA-Z0-9_${}:"]*\)\.o/"{o}"\1.c.o/
+# Allow *.tab.o files as a special case of a 2-dot-name file.
+/\.o/s/\([ 	=]\)\([-a-zA-Z0-9_${}:"]*\)\.tab\.o/\1"{o}"\2.tab.c.o/g
+/\.o/s/^\([-a-zA-Z0-9_${}:"]*\)\.tab\.o/"{o}"\1.tab.c.o/
+# Clean up.
+/"{o}"/s/"{o}""{o}"/"{o}"/g
+/"{o}"/s/^"{o}"\([a-zA-Z0-9_]*\)=/\1=/
+
+# Change extension of libs.
+/\.a/s/lib\([a-z]*\)\.a/lib\1.o/g
+
+# Remove non-fail option.
+/-/s/^\([ 	]*\)-/\1/
+# Fix overeagernesses - assumes no one-letter commands.
+/^[ 	]*[a-z] /s/^\([ 	]*\)\([a-z]\) /\1-\2 /
+
+# Remove non-echo option. (watch out for autoconf things)
+/@/s/^\([ 	]*\)@/\1/
+
+# Change cp to Duplicate.
+# Catenate is perhaps more accurate, but the pattern would have to
+# identify the output file and add a '>' redirection into it.
+/cp/s/^\([ 	]*\)cp /\1Duplicate -d -y /
+# Change mv to Rename.
+/mv/s/^\([ 	]*\)mv /\1Rename -y /
+/Rename/s/^\([ 	]*\)Rename -y -f/\1Rename -y/
+# Change rm to Delete.
+/rm -rf/s/^\([ 	]*\)rm -rf /\1Delete -i -y /
+/rm -f/s/^\([ 	]*\)rm -f /\1Delete -i -y /
+/rm/s/^\([ 	]*\)rm /\1Delete -i -y /
+# Note that we don't mess with ln - directory-specific scripts
+# must decide what to do with symlinks.
+# Change cat to Catenate.
+/cat/s/^\([ 	]*\)cat /\1Catenate /
+# Change touch to mpw-touch.
+/touch/s/^\([ 	]*\)touch /\1mpw-touch /
+# Change mkdir to NewFolder.
+/mkdir/s/^\([ 	]*\)mkdir /\1NewFolder /
+# Change var setting to Set.
+/=/s/^\([ 	]*\)\([-a-zA-Z0-9_]*\)=\([^;]*\); \\Option-d/\1Set \2 \3/
+
+# Change tests.
+/if /s/if \[ *-f \([^ ]*\) ] *; *\\Option-d/If "`Exists "\1"`" != ""/
+/if /s/if \[ *-f \([^ ]*\) ] *; *then *\\Option-d/If "`Exists "\1"`" != ""/
+/if /s/if \[ ! *-f \([^ ]*\) ] *; *\\Option-d/If "`Exists "\1"`" == ""/
+/if /s/if \[ ! *-f \([^ ]*\) ] *; *then \\Option-d/If "`Exists "\1"`" == ""/
+
+/if /s/if \[ *-d \([^ ]*\) ] *; *\\Option-d/If "`Exists "\1"`" != ""/
+/if /s/if \[ *-d \([^ ]*\) ] *; *then *\\Option-d/If "`Exists "\1"`" != ""/
+/if /s/if \[ ! *-d \([^ ]*\) ] *; *\\Option-d/If "`Exists "\1"`" == ""/
+/if /s/if \[ ! *-d \([^ ]*\) ] *; *then *\\Option-d/If "`Exists "\1"`" == ""/
+
+/if /s/if \[ -d \([^ ]*\) ] *; then true *; else mkdir \([^ ;]*\) *; fi/If "`Exists "\1"`" != "" NewFolder \2 End If/
+
+/if /s/if \[ \([^ ]*\) = \([^ ]*\) ] *; *\\Option-d/If "\1" == "\2"/
+/if /s/if \[ \([^ ]*\) = \([^ ]*\) ] *; *then *\\Option-d/If "\1" == "\2"/
+
+/if /s/if \[ \([^ ]*\) != \([^ ]*\) ] *; *\\Option-d/If "\1" != "\2"/
+/if /s/if \[ \([^ ]*\) != \([^ ]*\) ] *; *then *\\Option-d/If "\1" != "\2"/
+
+/if /s/if \[ \([^ ]*\) -eq \([^ ]*\) ] *; *\\Option-d/If "\1" != "\2"/
+/if /s/if \[ \([^ ]*\) -eq \([^ ]*\) ] *; *then *\\Option-d/If "\1" != "\2"/
+
+/^[ 	]*else true$/c\
+	Else\
+		mpw-true\
+
+
+/else/s/^\([ 	]*\)else[ 	]*$/\1Else/
+/else/s/^\([ 	]*\)else[; 	]*\\Option-d$/\1Else/
+
+/^[ 	]*else[ 	]*true[ 	]*$/c\
+	Else\
+		mpw-true
+
+/^[ 	]*else[ 	]*true[; 	]*fi$/c\
+	Else\
+		mpw-true\
+	End If
+
+/fi/s/^\([ 	]*\)fi *$/\1End/
+/fi/s/^\([ 	]*\)fi *; *\\Option-d/\1End/
+
+# Change looping.
+/for/s/^\([ 	]*\)for \([-a-zA-Z0-9_]*\) in \([^;]*\); *do *\\Option-d/\1For \2 In \3/
+/^\([ 	]*\)do *\\Option-d/d
+/done/s/^\([ 	]*\)done *; *\\Option-d/\1End/
+/done/s/^\([ 	]*\)done$/\1End/
+
+# Trailing semicolons and continued lines are unneeded sh syntax.
+/; \\Option-d/s/; \\Option-d//
+
+# Change move-if-change to MoveIfChange.
+/move-if-change/s/\([^ 	]*\)move-if-change/MoveIfChange/g
+
+# Change $(SHELL) to the script name by itself.
+/SHELL/s/^\([ 	]*\){SHELL} /\1/
+
+# Change syntax of default rule dependency.
+/^\.c\.o/s/^\.c\.o \\Option-f$/.c.o \\Option-f .c/
+
+# Change default rule's action.
+/{CC} -c/s/{CC} -c \(.*\) \$<$/{CC} @DASH_C_FLAG@ {DepDir}{Default}.c \1 @SEGMENT_FLAG({Default})@ -o {TargDir}{Default}.c.o/
+
+# This is pretty disgusting, but I can't seem to detect empty rules.
+/Option-f$/s/Option-f$/Option-f _oldest/g
+
+# Remove -c from explicit compiler calls. (but should not if GCC)
+# Handle the case of a source file that is "{xxx}"file.c.
+/ -c /s/{\([A-Z_]*\)CC}\(.*\) -c \(.*\)"\([^"]*\)"\([-a-z_]*\)\.c/{\1CC}\2 @DASH_C_FLAG@ \3"\4"\5.c -o "{o}"\5.c.o/
+# Handle the case of a source file that is "{xxx}"dir:file.c.
+/ -c /s/{\([A-Z_]*\)CC}\(.*\) -c \(.*\)"\([^"]*\)"\([-a-z_]*\):\([-a-z_]*\)\.c/{\1CC}\2 @DASH_C_FLAG@ \3"\4"\5:\6.c -o "{o}"\6.c.o/
+
+# Change linking cc to linking sequence.
+/-o/s/^\([ 	]*\){CC} \(.*\){\([A-Z_]*\)CFLAGS} \(.*\){LDFLAGS} \(.*\)-o \([^ ]*\) \(.*\)$/\1{CC_LD} \2 {\3CFLAGS} \4 {LDFLAGS} \5 -o \6{PROG_EXT} \7\
+\1{MAKEPEF} \6{PROG_EXT} -o \6 {MAKEPEF_TOOL_FLAGS} {MAKEPEF_FLAGS}\
+\1{REZ} "{s}"\6.r -o \6 -append -d PROG_NAME='"'\6'"' -d VERSION_STRING='"'{version}'"'/
+/-o/s/^\([ 	]*\){CC} \(.*\){\([A-Z_]*\)CFLAGS} \(.*\)-o \([^ ]*\) \(.*\){LDFLAGS} \(.*\)$/\1{CC_LD} \2 {\3CFLAGS} \4 {LDFLAGS} \6 -o \5{PROG_EXT} \7\
+\1{MAKEPEF} \5{PROG_EXT} -o \5 {MAKEPEF_TOOL_FLAGS} {MAKEPEF_FLAGS}\
+\1{REZ} "{s}"\5.r -o \5 -append -d PROG_NAME='"'\5'"' -d VERSION_STRING='"'{version}'"'/
+/-o/s/^\([ 	]*\){HOST_CC} \(.*\)-o \([^ ]*\) \(.*\)$/\1{HOST_CC_LD} \2 -o \3{PROG_EXT} \4\
+\1{MAKEPEF} \3{PROG_EXT} -o \3 {MAKEPEF_TOOL_FLAGS} {MAKEPEF_FLAGS}\
+\1{REZ} "{s}"\3.r -o \3 -append -d PROG_NAME='"'\3'"' -d VERSION_STRING='"'{version}'"'/
+
+# Comment out .NOEXPORT rules.
+/\.NOEXPORT/s/^\.NOEXPORT/#\.NOEXPORT/
+# Comment out .PHONY rules.
+/\.PHONY/s/^\.PHONY/#\.PHONY/
+# Comment out .PRECIOUS rules.
+/\.PRECIOUS/s/^\.PRECIOUS/#\.PRECIOUS/
+# Comment out .SUFFIXES rules.
+/\.SUFFIXES/s/^\.SUFFIXES/#\.SUFFIXES/
+
+# Set the install program appropriately.
+/INSTALL/s/^INSTALL *= *`.*`:install.sh -c/INSTALL = Duplicate -y/
+
+# Don't try to decide whether to use the tree's own tools.
+/bison/s/`.*bison:bison.*`/bison -y/
+/byacc/s/`.*byacc:byacc.*`/byacc/
+/flex/s/`.*flex:flex.*`/flex/
+
+# Turn transformed C comments in echo commands back into comments.
+/echo/s,echo '\(.*\):\\Option-x\(.*\)\\Option-x:\(.*\)',echo '\1/*\2*/\3',
+
+# Whack out various clever expressions that search for tools, since
+# the clever code is too /bin/sh specific.
+
+/^AR_FOR_TARGET = `/,/`$/c\
+AR_FOR_TARGET = ::binutils:ar\
+
+
+/^RANLIB_FOR_TARGET = `/,/`$/c\
+RANLIB_FOR_TARGET = ::binutils:ranlib\
+
+
+/^RANLIB_TEST_FOR_TARGET = /,/ranlib ] )$/c\
+RANLIB_TEST_FOR_TARGET = \
+
+
+/^EXPECT = `/,/`$/c\
+EXPECT = \
+
+
+/^RUNTEST = `/,/`$/c\
+RUNTEST = \
+
+
+/^CC_FOR_TARGET = `/,/`$/c\
+CC_FOR_TARGET = \
+
+
+/^CXX_FOR_TARGET = `/,/`$/c\
+CXX_FOR_TARGET = \
+
+
+/^CHILL_FOR_TARGET = `/,/`$/c\
+CHILL_FOR_TARGET = \
+
+
+/^CHILL_LIB = `/,/`$/c\
+CHILL_LIB = \
+
+/sanit/s/{start-sanit...-[a-z0-9]*}//
+/sanit/s/{end-sanit...-[a-z0-9]*}//
+
+# Add standard defines and default rules.
+/^# srcdir/a\
+\
+s = "{srcdir}"\
+\
+o = :\
+\
+"{o}" \\Option-f : "{s}"
+
diff --git a/config/mpw/mpw-touch b/config/mpw/mpw-touch
new file mode 100644
index 0000000..c743a51
--- /dev/null
+++ b/config/mpw/mpw-touch
@@ -0,0 +1,7 @@
+# "Touch" command.
+
+If "`Exists "{1}"`" != ""
+	SetFile -m . "{1}"
+Else
+	Echo ' ' > "{1}"
+End If
diff --git a/config/mpw/mpw-true b/config/mpw/mpw-true
new file mode 100644
index 0000000..0506530
--- /dev/null
+++ b/config/mpw/mpw-true
@@ -0,0 +1 @@
+Exit 0
diff --git a/config/mpw/null-command b/config/mpw/null-command
new file mode 100644
index 0000000..4844c8e
--- /dev/null
+++ b/config/mpw/null-command
@@ -0,0 +1 @@
+# This command does nothing.
diff --git a/config/mpw/open-brace b/config/mpw/open-brace
new file mode 100644
index 0000000..58465dc
--- /dev/null
+++ b/config/mpw/open-brace
@@ -0,0 +1,4 @@
+# MPW makefiles seem not to have any way to get a literal open
+# brace into a rule anywhere, so this does the job.
+
+Echo '{'
diff --git a/config/mpw/tr-7to8-src b/config/mpw/tr-7to8-src
new file mode 100644
index 0000000..b20b649
--- /dev/null
+++ b/config/mpw/tr-7to8-src
@@ -0,0 +1,9 @@
+StreamEdit -e \Option-d
+  '/\Option-x/ \Option-d
+    Replace /\Option-d\SrcOption-d/ "\Option-d\Option-d" -c \Option-5 ; \Option-d
+    Replace /\Option-d\SrcOption-f/ "\Option-d\Option-f" -c \Option-5 ; \Option-d
+	Replace /\Option-d\SrcOption-8/ "\Option-d\Option-8" -c \Option-5 ; \Option-d
+	Replace /\Option-d\SrcOption-5/ "\Option-d\Option-5" -c \Option-5 ; \Option-d
+	Replace /\Option-d\SrcOption-x/ "\Option-d\Option-x" -c \Option-5 ; \Option-d
+	Replace /\Option-d\SrcOption-r/ "\Option-d\Option-r" -c \Option-5'  \Option-d
+  "{1}"
diff --git a/config/mpw/true b/config/mpw/true
new file mode 100644
index 0000000..0506530
--- /dev/null
+++ b/config/mpw/true
@@ -0,0 +1 @@
+Exit 0
diff --git a/config/mt-aix43 b/config/mt-aix43
new file mode 100644
index 0000000..9eb750c
--- /dev/null
+++ b/config/mt-aix43
@@ -0,0 +1,4 @@
+# AIX 4.3 and above requires -X32_64 flag to all ar and nm commands
+# to handle both 32-bit and 64-bit objects.
+AR_FOR_TARGET=ar -X32_64
+NM_FOR_TARGET=nm -X32_64
diff --git a/config/mt-alphaieee b/config/mt-alphaieee
deleted file mode 100644
index 9c20531..0000000
--- a/config/mt-alphaieee
+++ /dev/null
@@ -1,2 +0,0 @@
-CFLAGS_FOR_TARGET += -mieee
-CXXFLAGS_FOR_TARGET += -mieee
diff --git a/config/mt-armpic b/config/mt-armpic
new file mode 100644
index 0000000..35b8c9e
--- /dev/null
+++ b/config/mt-armpic
@@ -0,0 +1 @@
+PICFLAG_FOR_TARGET=-fPIC
diff --git a/config/mt-elfalphapic b/config/mt-elfalphapic
new file mode 100644
index 0000000..35b8c9e
--- /dev/null
+++ b/config/mt-elfalphapic
@@ -0,0 +1 @@
+PICFLAG_FOR_TARGET=-fPIC
diff --git a/config/mt-gnu b/config/mt-gnu
deleted file mode 100644
index f05c4f9..0000000
--- a/config/mt-gnu
+++ /dev/null
@@ -1 +0,0 @@
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) -D_GNU_SOURCE
diff --git a/config/mt-i370pic b/config/mt-i370pic
new file mode 100644
index 0000000..35b8c9e
--- /dev/null
+++ b/config/mt-i370pic
@@ -0,0 +1 @@
+PICFLAG_FOR_TARGET=-fPIC
diff --git a/config/mt-ia64pic b/config/mt-ia64pic
new file mode 100644
index 0000000..ff98727
--- /dev/null
+++ b/config/mt-ia64pic
@@ -0,0 +1 @@
+PICFLAG_FOR_TARGET=-fpic
diff --git a/config/mt-linux b/config/mt-linux
new file mode 100644
index 0000000..a09e6f1
--- /dev/null
+++ b/config/mt-linux
@@ -0,0 +1,2 @@
+# When using glibc 2 on Linux we must always use vtable thunks.
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -fvtable-thunks -D_GNU_SOURCE
diff --git a/config/mt-m68kpic b/config/mt-m68kpic
new file mode 100644
index 0000000..ff98727
--- /dev/null
+++ b/config/mt-m68kpic
@@ -0,0 +1 @@
+PICFLAG_FOR_TARGET=-fpic
diff --git a/config/mt-papic b/config/mt-papic
new file mode 100644
index 0000000..35b8c9e
--- /dev/null
+++ b/config/mt-papic
@@ -0,0 +1 @@
+PICFLAG_FOR_TARGET=-fPIC
diff --git a/config/mt-ppcpic b/config/mt-ppcpic
new file mode 100644
index 0000000..35b8c9e
--- /dev/null
+++ b/config/mt-ppcpic
@@ -0,0 +1 @@
+PICFLAG_FOR_TARGET=-fPIC
diff --git a/config/mt-s390pic b/config/mt-s390pic
new file mode 100644
index 0000000..ff98727
--- /dev/null
+++ b/config/mt-s390pic
@@ -0,0 +1 @@
+PICFLAG_FOR_TARGET=-fpic
diff --git a/config/mt-sparcpic b/config/mt-sparcpic
new file mode 100644
index 0000000..a62b38b
--- /dev/null
+++ b/config/mt-sparcpic
@@ -0,0 +1 @@
+PICFLAG_FOR_TARGET=`case '${LIBCFLAGS} ${LIBCXXFLAGS}' in *-fpic* ) echo -fpic ;; * ) echo -fPIC ;; esac`
diff --git a/config/mt-v810 b/config/mt-v810
index f5714f8..97da6c2 100644
--- a/config/mt-v810
+++ b/config/mt-v810
@@ -1,3 +1,4 @@
 CC_FOR_TARGET = ca732 -ansi
 AS_FOR_TARGET = as732
 AR_FOR_TARGET = ar732
+RANLIB_FOR_TARGET = true
diff --git a/config/mt-x86pic b/config/mt-x86pic
new file mode 100644
index 0000000..ff98727
--- /dev/null
+++ b/config/mt-x86pic
@@ -0,0 +1 @@
+PICFLAG_FOR_TARGET=-fpic
diff --git a/config/nls.m4 b/config/nls.m4
deleted file mode 100644
index 36bc493..0000000
--- a/config/nls.m4
+++ /dev/null
@@ -1,49 +0,0 @@
-# nls.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
-])
-
-AC_DEFUN([AM_MKINSTALLDIRS],
-[
-  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-  dnl Try to locate it.
-  MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    case "$ac_aux_dir" in
-      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
-      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
-    esac
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-  AC_SUBST(MKINSTALLDIRS)
-])
diff --git a/config/no-executables.m4 b/config/no-executables.m4
deleted file mode 100644
index 54e5a02..0000000
--- a/config/no-executables.m4
+++ /dev/null
@@ -1,61 +0,0 @@
-# GCC_NO_EXECUTABLES
-# -----------------
-# FIXME: The GCC team has specific needs which the current Autoconf
-# framework cannot solve elegantly.  This macro implements a dirty
-# hack until Autoconf is able to provide the services its users
-# need.
-#
-# Several of the support libraries that are often built with GCC can't
-# assume the tool-chain is already capable of linking a program: the
-# compiler often expects to be able to link with some of such
-# libraries.
-#
-# In several of these libraries, workarounds have been introduced to
-# avoid the AC_PROG_CC_WORKS test, that would just abort their
-# configuration.  The introduction of AC_EXEEXT, enabled either by
-# libtool or by CVS autoconf, have just made matters worse.
-#
-# Unlike the previous AC_NO_EXECUTABLES, this test does not
-# disable link tests at autoconf time, but at configure time.
-# This allows AC_NO_EXECUTABLES to be invoked conditionally.
-AC_DEFUN_ONCE([GCC_NO_EXECUTABLES],
-[m4_divert_push([KILL])
-
-AC_BEFORE([$0], [_AC_COMPILER_EXEEXT])
-AC_BEFORE([$0], [AC_LINK_IFELSE])
-
-m4_define([_AC_COMPILER_EXEEXT],
-AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
-# FIXME: Cleanup?
-AS_IF([AC_TRY_EVAL(ac_link)], [gcc_no_link=no], [gcc_no_link=yes])
-if test x$gcc_no_link = xyes; then
-  # Setting cross_compile will disable run tests; it will
-  # also disable AC_CHECK_FILE but that's generally
-  # correct if we can't link.
-  cross_compiling=yes
-  EXEEXT=
-else
-  m4_defn([_AC_COMPILER_EXEEXT])dnl
-fi
-)
-
-m4_define([AC_LINK_IFELSE],
-if test x$gcc_no_link = xyes; then
-  AC_MSG_ERROR([Link tests are not allowed after [[$0]].])
-fi
-m4_defn([AC_LINK_IFELSE]))
-
-dnl This is a shame.  We have to provide a default for some link tests,
-dnl similar to the default for run tests.
-m4_define([AC_FUNC_MMAP],
-if test x$gcc_no_link = xyes; then
-  if test "x${ac_cv_func_mmap_fixed_mapped+set}" != xset; then
-    ac_cv_func_mmap_fixed_mapped=no
-  fi
-fi
-if test "x${ac_cv_func_mmap_fixed_mapped}" != xno; then
-  m4_defn([AC_FUNC_MMAP])
-fi)
-
-m4_divert_pop()dnl
-])# GCC_NO_EXECUTABLES
diff --git a/config/po.m4 b/config/po.m4
deleted file mode 100644
index 861e3de..0000000
--- a/config/po.m4
+++ /dev/null
@@ -1,197 +0,0 @@
-# po.m4 serial 1 (gettext-0.12)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AM_NLS])dnl
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU msgfmt.
-  if test "$GMSGFMT" != ":"; then
-    dnl If it is no GNU msgfmt we define it as : so that the
-    dnl Makefiles still can work.
-    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      AC_MSG_RESULT(
-        [found $GMSGFMT program is not GNU msgfmt; ignore it])
-      GMSGFMT=":"
-    fi
-  fi
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU xgettext.
-  if test "$XGETTEXT" != ":"; then
-    dnl If it is no GNU xgettext we define it as : so that the
-    dnl Makefiles still can work.
-    if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      AC_MSG_RESULT(
-        [found xgettext program is not GNU xgettext; ignore it])
-      XGETTEXT=":"
-    fi
-    dnl Remove leftover from FreeBSD xgettext call.
-    rm -f messages.po
-  fi
-
-  AC_OUTPUT_COMMANDS([
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          GMOFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
diff --git a/config/progtest.m4 b/config/progtest.m4
deleted file mode 100644
index 8fe527c..0000000
--- a/config/progtest.m4
+++ /dev/null
@@ -1,91 +0,0 @@
-# progtest.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  [[\\/]]* | ?:[[\\/]]*)
-    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in ifelse([$5], , $PATH, [$5]); do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          if [$3]; then
-            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-    ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
diff --git a/config/stdint.m4 b/config/stdint.m4
deleted file mode 100644
index 21ef2ec..0000000
--- a/config/stdint.m4
+++ /dev/null
@@ -1,486 +0,0 @@
-dnl @synopsis GCC_HEADER_STDINT [( HEADER-TO-GENERATE [, HEADERS-TO-CHECK])]
-dnl
-dnl the "ISO C9X: 7.18 Integer types <stdint.h>" section requires the
-dnl existence of an include file <stdint.h> that defines a set of
-dnl typedefs, especially uint8_t,int32_t,uintptr_t.
-dnl Many older installations will not provide this file, but some will
-dnl have the very same definitions in <inttypes.h>. In other enviroments
-dnl we can use the inet-types in <sys/types.h> which would define the
-dnl typedefs int8_t and u_int8_t respectivly.
-dnl
-dnl This macros will create a local "_stdint.h" or the headerfile given as
-dnl an argument. In many cases that file will pick the definition from a
-dnl "#include <stdint.h>" or "#include <inttypes.h>" statement, while
-dnl in other environments it will provide the set of basic 'stdint's defined:
-dnl int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,intptr_t,uintptr_t
-dnl int_least32_t.. int_fast32_t.. intmax_t
-dnl which may or may not rely on the definitions of other files.
-dnl
-dnl Sometimes the stdint.h or inttypes.h headers conflict with sys/types.h,
-dnl so we test the headers together with sys/types.h and always include it
-dnl into the generated header (to match the tests with the generated file).
-dnl Hopefully this is not a big annoyance.
-dnl
-dnl If your installed header files require the stdint-types you will want to
-dnl create an installable file mylib-int.h that all your other installable
-dnl header may include. So, for a library package named "mylib", just use
-dnl      GCC_HEADER_STDINT(mylib-int.h)
-dnl in configure.in and install that header file in Makefile.am along with
-dnl the other headers (mylib.h).  The mylib-specific headers can simply
-dnl use "#include <mylib-int.h>" to obtain the stdint-types.
-dnl
-dnl Remember, if the system already had a valid <stdint.h>, the generated
-dnl file will include it directly. No need for fuzzy HAVE_STDINT_H things...
-dnl
-dnl @author  Guido Draheim <guidod@gmx.de>, Paolo Bonzini <bonzini@gnu.org>
-
-AC_DEFUN([GCC_HEADER_STDINT],
-[m4_define(_GCC_STDINT_H, m4_ifval($1, $1, _stdint.h))
-
-inttype_headers=`echo inttypes.h sys/inttypes.h $2 | sed -e 's/,/ /g'`
-
-acx_cv_header_stdint=stddef.h
-acx_cv_header_stdint_kind="(already complete)"
-for i in stdint.h $inttype_headers; do
-  unset ac_cv_type_uintptr_t
-  unset ac_cv_type_uintmax_t
-  unset ac_cv_type_int_least32_t
-  unset ac_cv_type_int_fast32_t
-  unset ac_cv_type_uint64_t
-  _AS_ECHO_N([looking for a compliant stdint.h in $i, ])
-  AC_CHECK_TYPE(uintmax_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h>
-#include <$i>])
-  AC_CHECK_TYPE(uintptr_t,,[acx_cv_header_stdint_kind="(mostly complete)"], [#include <sys/types.h>
-#include <$i>])
-  AC_CHECK_TYPE(int_least32_t,,[acx_cv_header_stdint_kind="(mostly complete)"], [#include <sys/types.h>
-#include <$i>])
-  AC_CHECK_TYPE(int_fast32_t,,[acx_cv_header_stdint_kind="(mostly complete)"], [#include <sys/types.h>
-#include <$i>])
-  AC_CHECK_TYPE(uint64_t,,[acx_cv_header_stdint_kind="(lacks uint64_t)"], [#include <sys/types.h>
-#include <$i>])
-  break
-done
-if test "$acx_cv_header_stdint" = stddef.h; then
-  acx_cv_header_stdint_kind="(lacks uintptr_t)"
-  for i in stdint.h $inttype_headers; do
-    unset ac_cv_type_uint32_t
-    unset ac_cv_type_uint64_t
-    _AS_ECHO_N([looking for an incomplete stdint.h in $i, ])
-    AC_CHECK_TYPE(uint32_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h>
-#include <$i>])
-    AC_CHECK_TYPE(uint64_t,,[acx_cv_header_stdint_kind="(lacks uintptr_t and uint64_t)"], [#include <sys/types.h>
-#include <$i>])
-    break
-  done
-fi
-if test "$acx_cv_header_stdint" = stddef.h; then
-  acx_cv_header_stdint_kind="(u_intXX_t style)"
-  for i in sys/types.h $inttype_headers; do
-    unset ac_cv_type_u_int32_t
-    unset ac_cv_type_u_int64_t
-    _AS_ECHO_N([looking for u_intXX_t types in $i, ])
-    AC_CHECK_TYPE(u_int32_t,[acx_cv_header_stdint=$i],continue,[#include <sys/types.h>
-#include <$i>])
-    AC_CHECK_TYPE(u_int64_t,,[acx_cv_header_stdint_kind="(u_intXX_t style, lacks u_int64_t)"], [#include <sys/types.h>
-#include <$i>])
-    break
-  done
-fi
-if test "$acx_cv_header_stdint" = stddef.h; then
-  acx_cv_header_stdint_kind="(using manual detection)"
-fi
-
-test -z "$ac_cv_type_uintptr_t" && ac_cv_type_uintptr_t=no
-test -z "$ac_cv_type_uint64_t" && ac_cv_type_uint64_t=no
-test -z "$ac_cv_type_u_int64_t" && ac_cv_type_u_int64_t=no
-test -z "$ac_cv_type_int_least32_t" && ac_cv_type_int_least32_t=no
-test -z "$ac_cv_type_int_fast32_t" && ac_cv_type_int_fast32_t=no
-
-# ----------------- Summarize what we found so far
-
-AC_MSG_CHECKING([what to include in _GCC_STDINT_H])
-
-case `AS_BASENAME(_GCC_STDINT_H)` in
-  stdint.h) AC_MSG_WARN([are you sure you want it there?]) ;;
-  inttypes.h) AC_MSG_WARN([are you sure you want it there?]) ;;
-  *) ;;
-esac
-
-AC_MSG_RESULT($acx_cv_header_stdint $acx_cv_header_stdint_kind)
-
-# ----------------- done included file, check C basic types --------
-
-# Lacking an uintptr_t?  Test size of void *
-case "$acx_cv_header_stdint:$ac_cv_type_uintptr_t" in
-  stddef.h:* | *:no) AC_CHECK_SIZEOF(void *) ;;
-esac
-
-# Lacking an uint64_t?  Test size of long
-case "$acx_cv_header_stdint:$ac_cv_type_uint64_t:$ac_cv_type_u_int64_t" in
-  stddef.h:*:* | *:no:no) AC_CHECK_SIZEOF(long) ;;
-esac
-
-if test $acx_cv_header_stdint = stddef.h; then
-  # Lacking a good header?  Test size of everything and deduce all types.
-  AC_CHECK_SIZEOF(int)
-  AC_CHECK_SIZEOF(short)
-  AC_CHECK_SIZEOF(char)
-
-  AC_MSG_CHECKING(for type equivalent to int8_t)
-  case "$ac_cv_sizeof_char" in
-    1) acx_cv_type_int8_t=char ;;
-    *) AC_MSG_ERROR(no 8-bit type, please report a bug)
-  esac
-  AC_MSG_RESULT($acx_cv_type_int8_t)
-
-  AC_MSG_CHECKING(for type equivalent to int16_t)
-  case "$ac_cv_sizeof_int:$ac_cv_sizeof_short" in
-    2:*) acx_cv_type_int16_t=int ;;
-    *:2) acx_cv_type_int16_t=short ;;
-    *) AC_MSG_ERROR(no 16-bit type, please report a bug)
-  esac
-  AC_MSG_RESULT($acx_cv_type_int16_t)
-
-  AC_MSG_CHECKING(for type equivalent to int32_t)
-  case "$ac_cv_sizeof_int:$ac_cv_sizeof_long" in
-    4:*) acx_cv_type_int32_t=int ;;
-    *:4) acx_cv_type_int32_t=long ;;
-    *) AC_MSG_ERROR(no 32-bit type, please report a bug)
-  esac
-  AC_MSG_RESULT($acx_cv_type_int32_t)
-fi
-
-# These tests are here to make the output prettier
-
-if test "$ac_cv_type_uint64_t" != yes && test "$ac_cv_type_u_int64_t" != yes; then
-  case "$ac_cv_sizeof_long" in
-    8) acx_cv_type_int64_t=long ;;
-  esac
-  AC_MSG_CHECKING(for type equivalent to int64_t)
-  AC_MSG_RESULT(${acx_cv_type_int64_t-'using preprocessor symbols'})
-fi
-
-# Now we can use the above types
-
-if test "$ac_cv_type_uintptr_t" != yes; then
-  AC_MSG_CHECKING(for type equivalent to intptr_t)
-  case $ac_cv_sizeof_void_p in
-    2) acx_cv_type_intptr_t=int16_t ;;
-    4) acx_cv_type_intptr_t=int32_t ;;
-    8) acx_cv_type_intptr_t=int64_t ;;
-    *) AC_MSG_ERROR(no equivalent for intptr_t, please report a bug)
-  esac
-  AC_MSG_RESULT($acx_cv_type_intptr_t)
-fi
-
-# ----------------- done all checks, emit header -------------
-AC_CONFIG_COMMANDS(_GCC_STDINT_H, [
-if test "$GCC" = yes; then
-  echo "/* generated for " `$CC --version | sed 1q` "*/" > tmp-stdint.h
-else
-  echo "/* generated for $CC */" > tmp-stdint.h
-fi
-
-sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-  #ifndef GCC_GENERATED_STDINT_H
-  #define GCC_GENERATED_STDINT_H 1
-
-  #include <sys/types.h>
-EOF
-
-if test "$acx_cv_header_stdint" != stdint.h; then
-  echo "#include <stddef.h>" >> tmp-stdint.h
-fi
-if test "$acx_cv_header_stdint" != stddef.h; then
-  echo "#include <$acx_cv_header_stdint>" >> tmp-stdint.h
-fi
-
-sed 's/^ *//' >> tmp-stdint.h <<EOF
-  /* glibc uses these symbols as guards to prevent redefinitions.  */
-  #ifdef __int8_t_defined
-  #define _INT8_T
-  #define _INT16_T
-  #define _INT32_T
-  #endif
-  #ifdef __uint32_t_defined
-  #define _UINT32_T
-  #endif
-
-EOF
-
-# ----------------- done header, emit basic int types -------------
-if test "$acx_cv_header_stdint" = stddef.h; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    #ifndef _UINT8_T
-    #define _UINT8_T
-    typedef unsigned $acx_cv_type_int8_t uint8_t;
-    #endif
-
-    #ifndef _UINT16_T
-    #define _UINT16_T
-    typedef unsigned $acx_cv_type_int16_t uint16_t;
-    #endif
-
-    #ifndef _UINT32_T
-    #define _UINT32_T
-    typedef unsigned $acx_cv_type_int32_t uint32_t;
-    #endif
-
-    #ifndef _INT8_T
-    #define _INT8_T
-    typedef $acx_cv_type_int8_t int8_t;
-    #endif
-
-    #ifndef _INT16_T
-    #define _INT16_T
-    typedef $acx_cv_type_int16_t int16_t;
-    #endif
-
-    #ifndef _INT32_T
-    #define _INT32_T
-    typedef $acx_cv_type_int32_t int32_t;
-    #endif
-EOF
-elif test "$ac_cv_type_u_int32_t" = yes; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* int8_t int16_t int32_t defined by inet code, we do the u_intXX types */
-    #ifndef _INT8_T
-    #define _INT8_T
-    #endif
-    #ifndef _INT16_T
-    #define _INT16_T
-    #endif
-    #ifndef _INT32_T
-    #define _INT32_T
-    #endif
-
-    #ifndef _UINT8_T
-    #define _UINT8_T
-    typedef u_int8_t uint8_t;
-    #endif
-
-    #ifndef _UINT16_T
-    #define _UINT16_T
-    typedef u_int16_t uint16_t;
-    #endif
-
-    #ifndef _UINT32_T
-    #define _UINT32_T
-    typedef u_int32_t uint32_t;
-    #endif
-EOF
-else
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* Some systems have guard macros to prevent redefinitions, define them.  */
-    #ifndef _INT8_T
-    #define _INT8_T
-    #endif
-    #ifndef _INT16_T
-    #define _INT16_T
-    #endif
-    #ifndef _INT32_T
-    #define _INT32_T
-    #endif
-    #ifndef _UINT8_T
-    #define _UINT8_T
-    #endif
-    #ifndef _UINT16_T
-    #define _UINT16_T
-    #endif
-    #ifndef _UINT32_T
-    #define _UINT32_T
-    #endif
-EOF
-fi
-
-# ------------- done basic int types, emit int64_t types ------------
-if test "$ac_cv_type_uint64_t" = yes; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* system headers have good uint64_t and int64_t */
-    #ifndef _INT64_T
-    #define _INT64_T
-    #endif
-    #ifndef _UINT64_T
-    #define _UINT64_T
-    #endif
-EOF
-elif test "$ac_cv_type_u_int64_t" = yes; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* system headers have an u_int64_t (and int64_t) */
-    #ifndef _INT64_T
-    #define _INT64_T
-    #endif
-    #ifndef _UINT64_T
-    #define _UINT64_T
-    typedef u_int64_t uint64_t;
-    #endif
-EOF
-elif test -n "$acx_cv_type_int64_t"; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* architecture has a 64-bit type, $acx_cv_type_int64_t */
-    #ifndef _INT64_T
-    #define _INT64_T
-    typedef $acx_cv_type_int64_t int64_t;
-    #endif
-    #ifndef _UINT64_T
-    #define _UINT64_T
-    typedef unsigned $acx_cv_type_int64_t uint64_t;
-    #endif
-EOF
-else
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* some common heuristics for int64_t, using compiler-specific tests */
-    #if defined __STDC_VERSION__ && (__STDC_VERSION__-0) >= 199901L
-    #ifndef _INT64_T
-    #define _INT64_T
-    typedef long long int64_t;
-    #endif
-    #ifndef _UINT64_T
-    #define _UINT64_T
-    typedef unsigned long long uint64_t;
-    #endif
-
-    #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
-    /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
-       does not implement __extension__.  But that compiler doesn't define
-       __GNUC_MINOR__.  */
-    # if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
-    # define __extension__
-    # endif
-
-    # ifndef _INT64_T
-    # define _INT64_T
-    __extension__ typedef long long int64_t;
-    # endif
-    # ifndef _UINT64_T
-    # define _UINT64_T
-    __extension__ typedef unsigned long long uint64_t;
-    # endif
-
-    #elif !defined __STRICT_ANSI__
-    # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
-
-    #  ifndef _INT64_T
-    #  define _INT64_T
-    typedef __int64 int64_t;
-    #  endif
-    #  ifndef _UINT64_T
-    #  define _UINT64_T
-    typedef unsigned __int64 uint64_t;
-    #  endif
-    # endif /* compiler */
-
-    #endif /* ANSI version */
-EOF
-fi
-
-# ------------- done int64_t types, emit intptr types ------------
-if test "$ac_cv_type_uintptr_t" != yes; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */
-    typedef u$acx_cv_type_intptr_t uintptr_t;
-    typedef $acx_cv_type_intptr_t  intptr_t;
-EOF
-fi
-
-# ------------- done intptr types, emit int_least types ------------
-if test "$ac_cv_type_int_least32_t" != yes; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* Define int_least types */
-    typedef int8_t     int_least8_t;
-    typedef int16_t    int_least16_t;
-    typedef int32_t    int_least32_t;
-    #ifdef _INT64_T
-    typedef int64_t    int_least64_t;
-    #endif
-
-    typedef uint8_t    uint_least8_t;
-    typedef uint16_t   uint_least16_t;
-    typedef uint32_t   uint_least32_t;
-    #ifdef _UINT64_T
-    typedef uint64_t   uint_least64_t;
-    #endif
-EOF
-fi
-
-# ------------- done intptr types, emit int_fast types ------------
-if test "$ac_cv_type_int_fast32_t" != yes; then
-  dnl NOTE: The following code assumes that sizeof (int) > 1.
-  dnl Fix when strange machines are reported.
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* Define int_fast types.  short is often slow */
-    typedef int8_t       int_fast8_t;
-    typedef int          int_fast16_t;
-    typedef int32_t      int_fast32_t;
-    #ifdef _INT64_T
-    typedef int64_t      int_fast64_t;
-    #endif
-
-    typedef uint8_t      uint_fast8_t;
-    typedef unsigned int uint_fast16_t;
-    typedef uint32_t     uint_fast32_t;
-    #ifdef _UINT64_T
-    typedef uint64_t     uint_fast64_t;
-    #endif
-EOF
-fi
-
-if test "$ac_cv_type_uintmax_t" != yes; then
-  sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-    /* Define intmax based on what we found */
-    #ifdef _INT64_T
-    typedef int64_t       intmax_t;
-    #else
-    typedef long          intmax_t;
-    #endif
-    #ifdef _UINT64_T
-    typedef uint64_t      uintmax_t;
-    #else
-    typedef unsigned long uintmax_t;
-    #endif
-EOF
-fi
-
-sed 's/^ *//' >> tmp-stdint.h <<EOF
-
-  #endif /* GCC_GENERATED_STDINT_H */
-EOF
-
-if test -r ]_GCC_STDINT_H[ && cmp -s tmp-stdint.h ]_GCC_STDINT_H[; then
-  rm -f tmp-stdint.h
-else
-  mv -f tmp-stdint.h ]_GCC_STDINT_H[
-fi
-
-], [
-GCC="$GCC"
-CC="$CC"
-acx_cv_header_stdint="$acx_cv_header_stdint"
-acx_cv_type_int8_t="$acx_cv_type_int8_t"
-acx_cv_type_int16_t="$acx_cv_type_int16_t"
-acx_cv_type_int32_t="$acx_cv_type_int32_t"
-acx_cv_type_int64_t="$acx_cv_type_int64_t"
-acx_cv_type_intptr_t="$acx_cv_type_intptr_t"
-ac_cv_type_uintmax_t="$ac_cv_type_uintmax_t"
-ac_cv_type_uintptr_t="$ac_cv_type_uintptr_t"
-ac_cv_type_uint64_t="$ac_cv_type_uint64_t"
-ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t"
-ac_cv_type_u_int32_t="$ac_cv_type_u_int32_t"
-ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t"
-ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t"
-ac_cv_sizeof_void_p="$ac_cv_sizeof_void_p"
-])
-
-])
diff --git a/config/stdint_h.m4 b/config/stdint_h.m4
deleted file mode 100644
index 32ba7ae..0000000
--- a/config/stdint_h.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-# stdint_h.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
-# doesn't clash with <sys/types.h>, and declares uintmax_t.
-
-AC_DEFUN([jm_AC_HEADER_STDINT_H],
-[
-  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
-  [AC_TRY_COMPILE(
-    [#include <sys/types.h>
-#include <stdint.h>],
-    [uintmax_t i = (uintmax_t) -1;],
-    jm_ac_cv_header_stdint_h=yes,
-    jm_ac_cv_header_stdint_h=no)])
-  if test $jm_ac_cv_header_stdint_h = yes; then
-    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-       and declares uintmax_t. ])
-  fi
-])
diff --git a/config/tls.m4 b/config/tls.m4
deleted file mode 100644
index 5cbb685..0000000
--- a/config/tls.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-dnl Check whether the target supports TLS.
-AC_DEFUN([GCC_CHECK_TLS], [
-  GCC_ENABLE(tls, yes, [Use thread-local storage])
-  AC_CACHE_CHECK([whether the target supports thread-local storage],
-		 have_tls, [
-    AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
-      [dnl If the test case passed with dynamic linking, try again with
-      dnl static linking.  This fails at least with some older Red Hat
-      dnl releases.
-      save_LDFLAGS="$LDFLAGS"
-      LDFLAGS="-static $LDFLAGS"
-      AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }],
-		    [have_tls=yes], [have_tls=no], [])
-      LDFLAGS="$save_LDFLAGS"],
-      [have_tls=no],
-      [AC_COMPILE_IFELSE([__thread int foo;], [have_tls=yes], [have_tls=no])]
-    )])
-  if test "$enable_tls $have_tls" = "yes yes"; then
-    AC_DEFINE(HAVE_TLS, 1,
-	      [Define to 1 if the target supports thread-local storage.])
-  fi])
diff --git a/config/uintmax_t.m4 b/config/uintmax_t.m4
deleted file mode 100644
index b5f28d4..0000000
--- a/config/uintmax_t.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-# uintmax_t.m4 serial 7 (gettext-0.12)
-dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-AC_PREREQ(2.13)
-
-# Define uintmax_t to 'unsigned long' or 'unsigned long long'
-# if it is not already defined in <stdint.h> or <inttypes.h>.
-
-AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
-[
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
-  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
-    test $ac_cv_type_unsigned_long_long = yes \
-      && ac_type='unsigned long long' \
-      || ac_type='unsigned long'
-    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-      [Define to unsigned long or unsigned long long
-       if <stdint.h> and <inttypes.h> don't define.])
-  else
-    AC_DEFINE(HAVE_UINTMAX_T, 1,
-      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
-  fi
-])
diff --git a/config/ulonglong.m4 b/config/ulonglong.m4
deleted file mode 100644
index c375e47..0000000
--- a/config/ulonglong.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
-dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
-[
-  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
-  [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
-    [unsigned long long ullmax = (unsigned long long) -1;
-     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
-    ac_cv_type_unsigned_long_long=yes,
-    ac_cv_type_unsigned_long_long=no)])
-  if test $ac_cv_type_unsigned_long_long = yes; then
-    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
-      [Define if you have the unsigned long long type.])
-  fi
-])
diff --git a/config/warnings.m4 b/config/warnings.m4
deleted file mode 100644
index 8b83238..0000000
--- a/config/warnings.m4
+++ /dev/null
@@ -1,99 +0,0 @@
-# Autoconf include file defining macros related to compile-time warnings.
-
-# Copyright 2004, 2005 Free Software Foundation, Inc.
-
-#This file is part of GCC.
-
-#GCC 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.
-
-#GCC 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 GCC; see the file COPYING.  If not, write to the Free
-#Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-#02110-1301, USA.
-
-# ACX_PROG_CC_WARNING_OPTS([-Wfoo -Wbar -Wbaz])
-#   Sets @WARN_CFLAGS@ to the subset of the given options which the
-#   compiler accepts.
-AC_DEFUN([ACX_PROG_CC_WARNING_OPTS],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_SUBST([WARN_CFLAGS])dnl
-WARN_CFLAGS=
-save_CFLAGS="$CFLAGS"
-for option in $1; do
-  AS_VAR_PUSHDEF([acx_Woption], [acx_cv_prog_cc_warning_$option])
-  AC_CACHE_CHECK([whether $CC supports $option], acx_Woption,
-    [CFLAGS="$option"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_VAR_SET(acx_Woption, yes)],
-      [AS_VAR_SET(acx_Woption, no)])
-  ])
-  AS_IF([test AS_VAR_GET(acx_Woption) = yes],
-        [WARN_CFLAGS="$WARN_CFLAGS${WARN_CFLAGS:+ }$option"])
-  AS_VAR_POPDEF([acx_Woption])dnl
-done
-CFLAGS="$save_CFLAGS"
-])# ACX_PROG_CC_WARNING_OPTS
-
-# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC([-Wno-long-long ...])
-#   Sets WARN_PEDANTIC to "-pedantic" + the argument, if the compiler is GCC
-#   and accepts all of those options simultaneously, otherwise to nothing.
-AC_DEFUN([ACX_PROG_CC_WARNING_ALMOST_PEDANTIC],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_SUBST([WARN_PEDANTIC])dnl
-AS_VAR_PUSHDEF([acx_Pedantic], [acx_cv_prog_cc_pedantic_$1])dnl
-WARN_PEDANTIC=
-AS_IF([test "$GCC" = yes],
-[AC_CACHE_CHECK([whether $CC supports -pedantic $1], acx_Pedantic,
-[save_CFLAGS="$CFLAGS"
-CFLAGS="-pedantic $1"
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
-   [AS_VAR_SET(acx_Pedantic, yes)],
-   [AS_VAR_SET(acx_Pedantic, no)])
-CFLAGS="$save_CFLAGS"])
-AS_IF([test AS_VAR_GET(acx_Pedantic) = yes],
-      [WARN_PEDANTIC="-pedantic $1"])
-])
-AS_VAR_POPDEF([acx_Pedantic])dnl
-])# ACX_PROG_CC_WARNING_ALMOST_PEDANTIC
-
-# ACX_PROG_CC_WARNINGS_ARE_ERRORS([x.y.z])
-#   sets WERROR to "-Werror" if the compiler is GCC >=x.y.z, or if
-#   --enable-werror-always was given on the command line, otherwise
-#   to nothing.
-#   If the argument is the word "manual" instead of a version number,
-#   then WERROR will be set to -Werror only if --enable-werror-always
-#   appeared on the configure command line.
-AC_DEFUN([ACX_PROG_CC_WARNINGS_ARE_ERRORS],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_SUBST([WERROR])dnl
-WERROR=
-AC_ARG_ENABLE(werror-always, 
-    AS_HELP_STRING([--enable-werror-always],
-		   [enable -Werror despite compiler version]),
-[], [enable_werror_always=no])
-AS_IF([test $enable_werror_always = yes],
-      [WERROR=-Werror],
- m4_if($1, [manual],,
- [AS_VAR_PUSHDEF([acx_GCCvers], [acx_cv_prog_cc_gcc_$1_or_newer])dnl
-  AC_CACHE_CHECK([whether $CC is GCC >=$1], acx_GCCvers,
-    [set fnord `echo $1 | tr '.' ' '`
-     shift
-     AC_PREPROC_IFELSE(
-[#if __GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ \
-  < [$]1 * 10000 + [$]2 * 100 + [$]3
-#error insufficient
-#endif],
-   [AS_VAR_SET(acx_GCCvers, yes)],
-   [AS_VAR_SET(acx_GCCvers, no)])])
- AS_IF([test AS_VAR_GET(acx_GCCvers) = yes],
-       [WERROR=-WerrorB])
-  AS_VAR_POPDEF([acx_GCCvers])]))
-])# ACX_PROG_CC_WARNINGS_ARE_ERRORS
diff --git a/configure b/configure
index 2dae3f1..9a8b197 100755
--- a/configure
+++ b/configure
@@ -1,70 +1,93 @@
-#! /bin/sh
+#!/bin/sh
 
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+### WARNING: this file contains embedded tabs.  Do not run untabify on this file.
+
+# Configuration script
+# Copyright (C) 1988, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999
+# Free Software Foundation, Inc.
+
+# This program 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 of the License, or
+# (at your option) any later version.
+# 
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# This file was originally written by K. Richard Pixley.
+
+#
+# Shell script to create proper links to machine-dependent files in
+# preparation for compilation.
+#
+# If configure succeeds, it leaves its status in config.status.
+# If configure fails after disturbing the status quo, 
+#       config.status is removed.
 #
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-libada        Builds libada directory"
-ac_help="$ac_help
-  --enable-libssp        Builds libssp directory"
-ac_help="$ac_help
-  --enable-libgcc-math   Builds libgcc-math directory"
-ac_help="$ac_help
-  --with-mpfr-dir=PATH    Specify source directory for MPFR library"
-ac_help="$ac_help
-  --with-mpfr=PATH        Specify directory for installed MPFR library"
-ac_help="$ac_help
-  --with-gmp-dir=PATH     Specify source directory for GMP library"
-ac_help="$ac_help
-  --with-gmp=PATH         Specify directory for installed GMP library"
-ac_help="$ac_help
-  --with-build-sysroot=sysroot
-                          use sysroot as the system root during the build"
-ac_help="$ac_help
-  --enable-bootstrap           Enable bootstrapping [yes if native build]"
-ac_help="$ac_help
-  --enable-serial-[{host,target,build}-]configure
-                          Force sequential configuration of
-                          sub-packages for the host, target or build
-			  machine, or all sub-packages"
-ac_help="$ac_help
-  --with-build-time-tools=path
-                          use given path to find target tools during the build"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
-  --enable-werror         enable -Werror in bootstrap stage2 and later"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
+
+export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0 $argv; kill $$)
+
+remove=rm
+hard_link=ln
+symbolic_link='ln -s'
+
+#for Test
+#remove="echo rm"
+#hard_link="echo ln"
+#symbolic_link="echo ln -s"
+
+# clear some things potentially inherited from environment.
+
+Makefile=Makefile
+Makefile_in=Makefile.in
+arguments=
+build_alias=
+cache_file=config.cache
+cache_file_option=
+configdirs=
+extraconfigdirs=
+diroptions=
+exec_prefix=
+exec_prefixoption=
+fatal=
+floating_point=default
+gas=default
+gcc_version=
+gcc_version_trigger=
+host_alias=NOHOST
+host_makefile_frag=
+moveifchange=
+norecursion=
+other_options=
+package_makefile_frag=
+package_makefile_rules_frag=
+prefix=/usr/local
+progname=
+program_prefix=
+program_prefixoption=
+program_suffix=
+program_suffixoption=
+program_transform_name=
+program_transform_nameoption=
+redirect=
+removing=
 site=
+site_makefile_frag=
+site_option=
 srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
+srctrigger=
+subdirs=
+target_alias=NOTARGET
+target_makefile_frag=
+undefs=NOUNDEFS
+version="$Revision$"
+x11=default
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
@@ -78,731 +101,17 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=move-if-change
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:605: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:626: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:644: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-# Get 'install' or 'install-sh' and its variants.
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:699: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether ln works""... $ac_c" 1>&6
-echo "configure:752: checking whether ln works" >&5
-if eval "test \"`echo '$''{'acx_cv_prog_LN'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata_t
-echo >conftestdata_f
-if ln conftestdata_f conftestdata_t 2>/dev/null
-then
-  acx_cv_prog_LN=ln
-else
-  acx_cv_prog_LN=no
-fi
-rm -f conftestdata_f conftestdata_t
-
-fi
-if test $acx_cv_prog_LN = no; then
-  LN="cp"
-  echo "$ac_t""no, using $LN" 1>&6
-else
-  LN="$acx_cv_prog_LN"
-  echo "$ac_t""yes" 1>&6
-fi
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:776: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
 ### we might need to use some other shell than /bin/sh for running subshells
+
 ### If we are on Windows, search for the shell.  This will permit people
 ### to not have /bin/sh, but to be able to see /SOME/PATH/sh configure
 ### without also having to set CONFIG_SHELL.  This code will work when
 ### using bash, which sets OSTYPE.
 case "${OSTYPE}" in
 *win32*)
-  if test x${CONFIG_SHELL} = x ; then
-    if test ! -f /bin/sh ; then
-      if test x${SHELL} != x && test -f ${SHELL} ; then
+  if [ x${CONFIG_SHELL} = x ]; then
+    if [ ! -f /bin/sh ]; then
+      if [ x${SHELL} != x ] && [ -f ${SHELL} ]; then
 	CONFIG_SHELL=${SHELL}
 	export CONFIG_SHELL
       else
@@ -827,6763 +136,1490 @@ esac
 
 config_shell=${CONFIG_SHELL-/bin/sh}
 
-progname=$0
-# if PWD already has a value, it is probably wrong.
-if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
-
-# Export original configure arguments for use by sub-configures.  These
-# will be expanded by make, so quote '$'.
-tmp="$progname $@"
-sed -e 's,\$,$$,g' <<EOF_SED > conftestsed.out
-$tmp
-EOF_SED
-TOPLEVEL_CONFIGURE_ARGUMENTS=`cat conftestsed.out`
-rm -f conftestsed.out
-
-
-moveifchange=${srcdir}/move-if-change
+NO_EDIT="This file was generated automatically by configure.  Do not edit."
 
-srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}`
+## this is a little touchy and won't always work, but...
+##
+## if the argv[0] starts with a slash then it is an absolute name that can (and
+## must) be used as is.
+##
+## otherwise, if argv[0] has no slash in it, we can assume that it is on the
+## path.  Since PATH might include "." we also add `pwd` to the end of PATH.
+##
 
-# We pass INSTALL explicitly to sub-makes.  Make sure that it is not
-# a relative path.
-if test "$INSTALL" = "${srcdir}/install-sh -c"; then
-  INSTALL="${srcpwd}/install-sh -c"
-fi
+progname=$0
+# if PWD already has a value, it is probably wrong.
+if [ -n "$PWD" ]; then PWD=`pwd`; fi
 
-# Set srcdir to "." if that's what it is.
-# This is important for multilib support.
-pwd=`${PWDCMD-pwd}`
-if test "${pwd}" = "${srcpwd}" ; then
-  srcdir=.
-fi
+case "${progname}" in
+/*) ;;
+*/*) ;;
+*)
+        PATH=$PATH:${PWD=`pwd`} ; export PATH
+        ;;
+esac
 
-topsrcdir=$srcpwd
+# Loop over all args
 
-extra_host_args=
+while :
+do
 
-### To add a new directory to the tree, first choose whether it is a target
-### or a host dependent tool.  Then put it into the appropriate list
-### (library or tools, host or target), doing a dependency sort.
+# Break out if there are no more args
+	case $# in
+	0)
+		break
+		;;
+	esac
 
-# Subdirs will be configured in the order listed in build_configdirs, 
-# configdirs, or target_configdirs; see the serialization section below.
+# Get the first arg, and shuffle
+	option=$1
+	shift
 
-# Dependency sorting is only needed when *configuration* must be done in 
-# a particular order.  In all cases a dependency should be specified in 
-# the Makefile, whether or not it's implicitly specified here.
+# Make all options have two hyphens
+	orig_option=$option	# Save original for error messages
+	case $option in
+	--*) ;;
+	-*) option=-$option ;;
+	esac
+		
+# Split out the argument for options that take them
+	case $option in
+	--*=*)
+		optarg=`echo $option | sed -e 's/^[^=]*=//'`
+		arguments="$arguments $option"
+		;;
+# These options have mandatory values.  Since we didn't find an = sign,
+# the value must be in the next argument
+	--bu* | --cache* | --ex* | --ho* | --pre* | --program-p* | --program-s* | --program-t* | --si* | --sr* | --ta* | --tm* | --x-* | --bi* | --sb* | --li* | --da* | --sy* | --sh* | --lo* | --in* | --ol* | --ma*)
+		optarg=$1
+		shift
+		arguments="$arguments $option=$optarg"
+		;;
+	--v)
+		arguments="$arguments -v"
+		;;
+	--*)
+		arguments="$arguments $option"
+		;;
+	esac
 
-# Double entries in build_configdirs, configdirs, or target_configdirs may
-# cause circular dependencies and break everything horribly.
+# Now, process the options
+	case $option in
 
-# these library is used by various programs built for the build
-# environment
-#
-build_libs="build-libiberty"
+	--bi*)
+		bindir=$optarg
+		diroptions="$diroptions --bindir=$optarg"
+		;;
+	--build* | --bu*)
+		case "$build_alias" in
+		"") build_alias=$optarg ;;
+		*) echo '***' Can only configure for one build machine at a time.  1>&2
+		   fatal=yes
+		   ;;
+		esac
+		;;
+	--cache*)
+		cache_file=$optarg
+		;;
+	--da*)
+		datadir=$optarg
+		diroptions="$diroptions --datadir=$optarg"
+		;;
+	--disable-*)
+		enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
+		eval $enableopt=no
+		disableoptions="$disableoptions $option"
+		;;
+	--enable-*)
+		case "$option" in
+		*=*)	;;
+		*)	optarg=yes ;;
+		esac
+
+		enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
+		eval "$enableopt=\$optarg"
+		enableoptions="$enableoptions '$option'"
+		;;
+	--exec-prefix* | --ex*)
+		exec_prefix=$optarg
+		exec_prefixoption="--exec-prefix=$optarg"
+		;;
+	--gas | --g*)
+		gas=yes
+		;;
+	--help | --he*)
+		fatal=yes
+		;;
+	--host* | --ho*)
+		case $host_alias in
+		NOHOST) host_alias=$optarg ;;
+		*) echo '***' Can only configure for one host at a time.  1>&2
+		   fatal=yes
+		   ;;
+		esac
+		;;
+	--inc*)
+		includedir=$optarg
+		diroptions="$diroptions --includedir=$optarg"
+		;;
+	--inf*)
+		infodir=$optarg
+		diroptions="$diroptions --infodir=$optarg"
+		;;
+	--libd*)
+		libdir=$optarg
+		diroptions="$diroptions --libdir=$optarg"
+		;;
+	--libe*)
+		libexecdir=$optarg
+		diroptions="$diroptions --libexecdir=$optarg"
+		;;
+	--lo*)
+		localstatedir=$optarg
+		diroptions="$diroptions --localstatedir=$optarg"
+		;;
+	--ma*)
+		mandir=$optarg
+		diroptions="$diroptions --mandir=$optarg"
+		;;
+	--nfp | --nf*)
+		floating_point=no
+		floating_pointoption="--nfp"
+		;;
+	--norecursion | --no*)
+		norecursion=yes
+		;;
+	--ol*)
+		oldincludedir=$optarg
+		diroptions="$diroptions --oldincludedir=$optarg"
+		;;
+	--prefix* | --pre*)
+		prefix=$optarg
+		prefixoption="--prefix=$optarg"
+		;;
+	--program-prefix* | --program-p*)
+		program_prefix=$optarg
+		program_prefixoption="--program-prefix=$optarg"
+		;;
+	--program-suffix* | --program-s*)
+		program_suffix=$optarg
+		program_suffixoption="--program-suffix=$optarg"
+		;;
+	--program-transform-name* | --program-t*)
+		# Double any backslashes or dollar signs in the argument
+		program_transform_name="${program_transform_name} -e `echo ${optarg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`"
+		program_transform_nameoption="${program_transform_nameoption} --program-transform-name='$optarg'"
+		;;
+	--rm)
+		removing=--rm
+		;;
+	--sb*)
+		sbindir=$optarg
+		diroptions="$diroptions --sbindir=$optarg"
+		;;
+	--sh*)
+		sharedstatedir=$optarg
+		diroptions="$diroptions --sharedstatedir=$optarg"
+		;;
+	--silent | --sil* | --quiet | --q*)
+		redirect=">/dev/null"
+		verbose=--silent
+		;;
+	--site* | --sit*)
+		site=$optarg
+		site_option="--site=$optarg"
+		;;
+	--srcdir*/ | --sr*/)
+                # Remove trailing slashes.  Otherwise, when the file name gets
+                # bolted into an object file as debug info, it has two slashes
+                # in it.  Ordinarily this is ok, but emacs takes double slash
+                # to mean "forget the first part".
+		srcdir=`echo $optarg | sed -e 's:/$::'`
+		;;
+	--srcdir* | --sr*)
+		srcdir=$optarg
+		;;
+	--sy*)
+		sysconfdir=$optarg
+		diroptions="$diroptions --sysconfdir=$optarg"
+		;;
+	--target* | --ta*)
+		case $target_alias in
+		NOTARGET) target_alias=$optarg ;;
+		*) echo '***' Can only configure for one target at a time.  1>&2
+		   fatal=yes
+		   ;;
+		esac
+		;;
+	--tmpdir* | --tm*)
+		TMPDIR=$optarg
+		tmpdiroption="--tmpdir=$optarg"
+		;;
+	--verbose | --v | --verb*)
+		redirect=
+		verbose=--verbose
+		;;
+	--version | --V | --vers*)
+		echo "This is Cygnus Configure version" `echo ${version} | sed 's/[ $:]//g'`
+		exit 0
+		;;
+	--with-*)
+		case "$option" in
+		*=*)	;;
+		*)	optarg=yes ;;
+		esac
+
+		withopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
+		eval $withopt="\$optarg"
+		withoptions="$withoptions $option"
+		;;
+	--without-*)
+		withopt=`echo ${option} | sed 's:^--::;s:out::;s:-:_:g'`
+		eval $withopt=no
+		withoutoptions="$withoutoptions $option"
+		;;
+	--x)	with_x=yes
+		withoptions="$withoptions --with-x"
+		;;
+	--x-i* | --x-l*) other_options="$other_options $orig_option"
+		;;
+	--*)
+		echo "configure: Unrecognized option: \"$orig_option\"; use --help for usage." >&2
+		exit 1
+		;;
+	*)
+		case $undefs in
+		NOUNDEFS) undefs=$option ;;
+		*) echo '***' Can only configure for one host and one target at a time.  1>&2
+		   fatal=yes
+		   ;;
+		esac
+		;;
+	esac
+done
 
-# these tools are built for the build environment
-build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fixincludes"
+# process host and target
 
-# these libraries are used by various programs built for the host environment
-#
-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber"
-
-# these tools are built for the host environment
-# Note, the powerpc-eabi build depends on sim occurring before gdb in order to
-# know that we are building the simulator.
-# binutils, gas and ld appear in that order because it makes sense to run
-# "make check" in that particular order.
-host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
-
-# libgcj represents the runtime libraries only used by gcj.
-libgcj="target-libffi \
-	target-boehm-gc \
-	target-zlib \
-	target-qthreads \
-	target-libjava"
-
-# these libraries are built for the target environment, and are built after
-# the host libraries and the host tools (which may be a cross compiler)
-#
-target_libraries="target-libiberty \
-		target-libgloss \
-		target-newlib \
-		target-libstdc++-v3 \
-		target-libmudflap \
-		target-libssp \
-		target-libgcc-math \
-		target-libgfortran \
-		${libgcj} \
-		target-libobjc \
-		target-libada \
-		target-libgomp"
-
-# these tools are built using the target libraries, and are intended to
-# run only in the target environment
-#
-# note: any program that *uses* libraries that are in the "target_libraries"
-# list belongs in this list.  those programs are also very likely
-# candidates for the "native_only" list which follows
+# Do some error checking and defaulting for the host and target type.
+# The inputs are:
+#    configure --host=HOST --target=TARGET UNDEFS
 #
-target_tools="target-examples target-groff target-gperf target-rda"
-
-################################################################################
-
-## All tools belong in one of the four categories, and are assigned above
-## We assign ${configdirs} this way to remove all embedded newlines.  This
-## is important because configure will choke if they ever get through.
-## ${configdirs} is directories we build using the host tools.
-## ${target_configdirs} is directories we build using the target tools.
-configdirs=`echo ${host_libs} ${host_tools}`
-target_configdirs=`echo ${target_libraries} ${target_tools}`
-build_configdirs=`echo ${build_libs} ${build_tools}`
-
-################################################################################
-
-srcname="gnu development package"
-
-# This gets set non-empty for some net releases of packages.
-appdirs=""
-
-# Define is_cross_compiler to save on calls to 'test'.
-is_cross_compiler=
-if test x"${host}" = x"${target}" ; then
-  is_cross_compiler=no
-else
-  is_cross_compiler=yes
-fi	
-
-# Find the build and target subdir names.
- case ${build_alias} in
-  "") build_noncanonical=${build} ;;
-  *) build_noncanonical=${build_alias} ;;
-esac
-
- case ${host_alias} in
-  "") host_noncanonical=${build_noncanonical} ;;
-  *) host_noncanonical=${host_alias} ;;
-esac
-
- case ${target_alias} in
-  "") target_noncanonical=${host_noncanonical} ;;
-  *) target_noncanonical=${target_alias} ;;
-esac
-
-  # Prefix 'build-' so this never conflicts with target_subdir.
-build_subdir="build-${build_noncanonical}"
-# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories
-if ( test $srcdir = . && test -d gcc ) \
-   || test -d $srcdir/../host-${host_noncanonical}; then
-  host_subdir="host-${host_noncanonical}"
-else
-  host_subdir=.
-fi
-# No prefix.
-target_subdir=${target_noncanonical}
-   
-
-# Skipdirs are removed silently.
-skipdirs=
-# Noconfigdirs are removed loudly.
-noconfigdirs=""
-
-use_gnu_ld=
-# Make sure we don't let GNU ld be added if we didn't want it.
-if test x$with_gnu_ld = xno ; then
-  use_gnu_ld=no
-  noconfigdirs="$noconfigdirs ld"
-fi
+# The rules are:
+# 1. You aren't allowed to specify --host, --target, and undefs at the
+#    same time.
+# 2. Host defaults to undefs.
+# 3. If undefs is not specified, then host defaults to the current host,
+#    as determined by config.guess.
+# 4. Target defaults to undefs.
+# 5. If undefs is not specified, then target defaults to host.
+
+case "${fatal}" in
+"")
+	# Make sure that host, target & undefs aren't all specified at the
+	# same time.
+	case $host_alias---$target_alias---$undefs in
+	NOHOST---*---* | *---NOTARGET---* | *---*---NOUNDEFS)
+		;;
+	*) echo '***' Can only configure for one host and one target at a time.  1>&2
+	   fatal=yes
+	   break 2
+		;;
+	esac
 
-use_gnu_as=
-# Make sure we don't let GNU as be added if we didn't want it.
-if test x$with_gnu_as = xno ; then
-  use_gnu_as=no
-  noconfigdirs="$noconfigdirs gas"
-fi
+	# Now, do defaulting for host.
+	case $host_alias in
+	NOHOST)
+		case $undefs in
+		NOUNDEFS)
+			# Neither --host option nor undefs were present.
+			# Call config.guess.
+			guesssys=`echo ${progname} | sed 's/configure$/config.guess/'`
+			if host_alias=`${config_shell} ${guesssys}`
+			then
+				# If the string we are going to use for
+				# the target is a prefix of the string
+				# we just guessed for the host, then
+				# assume we are running native, and force
+				# the same string for both target and host.
+				case $target_alias in
+				NOTARGET) ;;
+				*)
+					if expr $host_alias : $target_alias >/dev/null
+					then
+						host_alias=$target_alias
+					fi
+					;;
+				esac
+				echo "Configuring for a ${host_alias} host."
+				arguments="--host=$host_alias $arguments"
+			else
+				echo 'Config.guess failed to determine the host type.  You need to specify one.' 1>&2
+				fatal=yes
+			fi
+			;;
+		*)
+			host_alias=$undefs
+			arguments="--host=$host_alias $arguments"
+			undefs=NOUNDEFS
+			;;
+		esac
+	esac
 
-# some tools are so dependent upon X11 that if we're not building with X, 
-# it's not even worth trying to configure, much less build, that tool.
-
-case ${with_x} in
-  yes | "") ;; # the default value for this tree is that X11 is available
-  no)
-    skipdirs="${skipdirs} tk itcl libgui"
-    # We won't be able to build gdbtk without X.
-    enable_gdbtk=no 
-    ;;
-  *)  echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 ;;
+	# Do defaulting for target.  If --target option isn't present, default
+	# to undefs.  If undefs isn't present, default to host.
+	case $target_alias in
+	NOTARGET)
+		case $undefs in
+		NOUNDEFS)
+			target_alias=$host_alias
+			;;
+		*)
+			target_alias=$undefs
+			arguments="--target=$target_alias $arguments"
+			;;
+		esac
+	esac
+	;;
+*) ;;
 esac
 
-# Some tools are only suitable for building in a "native" situation.
-# Remove these if host!=target.  
-native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf"
-
-# Similarly, some are only suitable for cross toolchains.
-# Remove these if host=target.
-cross_only="target-libgloss target-newlib target-opcodes"
-
-case $is_cross_compiler in
-  no) skipdirs="${skipdirs} ${cross_only}" ;;
-  yes) skipdirs="${skipdirs} ${native_only}" ;;
-esac
+if [ -n "${fatal}" -o "${host_alias}" = "help" ] ; then
+	exec 1>&2
+	echo Usage: configure [OPTIONS] [HOST]
+	echo
+	echo Options: [defaults in brackets]
+	echo ' --prefix=MYDIR		 install into MYDIR [/usr/local]'
+	echo ' --exec-prefix=MYDIR	 install host-dependent files into MYDIR [/usr/local]'
+	echo ' --help			 print this message [normal config]'
+	echo ' --build=BUILD		 configure for building on BUILD [BUILD=HOST]'
+	echo ' --host=HOST		 configure for HOST [determined via config.guess]'
+	echo ' --norecursion		 configure this directory only [recurse]'
+	echo ' --program-prefix=FOO	 prepend FOO to installed program names [""]'
+	echo ' --program-suffix=FOO	 append FOO to installed program names [""]'
+	echo ' --program-transform-name=P transform installed names by sed pattern P [""]'
+	echo ' --site=SITE		 configure with site-specific makefile for SITE'
+	echo ' --srcdir=DIR		 find the sources in DIR [. or ..]'
+	echo ' --target=TARGET	 configure for TARGET [TARGET=HOST]'
+	echo ' --tmpdir=TMPDIR	 create temporary files in TMPDIR [/tmp]'
+	echo ' --nfp			 configure for software floating point [hard float]'
+	echo ' --with-FOO, --with-FOO=BAR package FOO is available (parameter BAR)'
+	echo ' --without-FOO		 package FOO is NOT available'
+	echo ' --enable-FOO, --enable-FOO=BAR include feature FOO (parameter BAR)'
+	echo ' --disable-FOO		 do not include feature FOO'
+	echo
+	echo 'Where HOST and TARGET are something like "sparc-sunos", "mips-sgi-irix5", etc.'
+	echo
+	if [ -r config.status ] ; then
+		cat config.status
+	fi
 
-# If both --with-headers and --with-libs are specified, default to
-# --without-newlib.
-if test x"${with_headers}" != x && test x"${with_headers}" != xno \
-   && test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
-  if test x"${with_newlib}" = x ; then
-    with_newlib=no
-  fi
+	exit 1
 fi
 
-# Recognize --with-newlib/--without-newlib.
-case ${with_newlib} in
-  no) skipdirs="${skipdirs} target-newlib" ;;
-  yes) skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;;
-esac
-
-# Configure extra directories which are host specific
-
-case "${host}" in
-  *-cygwin*)
-    configdirs="$configdirs libtermcap" ;;
-esac
-
-# A target can indicate whether a language isn't supported for some reason.
-# Only spaces may be used in this macro; not newlines or tabs.
-unsupported_languages=
-
-# Remove more programs from consideration, based on the host or 
-# target this usually means that a port of the program doesn't
-# exist yet.
-
-case "${host}" in
-  hppa*64*-*-*)
-    noconfigdirs="$noconfigdirs byacc"
-    ;;
-  i[3456789]86-*-vsta)
-    noconfigdirs="$noconfigdirs tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl gnuserv gettext"
-    ;;
-  i[3456789]86-*-go32* | i[3456789]86-*-msdosdjgpp*)
-    noconfigdirs="$noconfigdirs tcl tk expect dejagnu send-pr uudecode guile itcl gnuserv libffi"
-    ;;
-  i[3456789]86-*-mingw32*)
-    # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl itcl gnuserv"
-    noconfigdirs="$noconfigdirs expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool"
-    ;;
-  i[3456789]86-*-beos*)
-    noconfigdirs="$noconfigdirs tk itcl libgui gdb"
-    ;;
-  *-*-cygwin*)
-    noconfigdirs="$noconfigdirs autoconf automake send-pr rcs guile perl"
-    ;;
-  *-*-netbsd*)
-    noconfigdirs="$noconfigdirs rcs"
-    ;;
-  ppc*-*-pe)
-    noconfigdirs="$noconfigdirs patch diff make tk tcl expect dejagnu autoconf automake texinfo bison send-pr gprof rcs guile perl itcl gnuserv"
-    ;;
-  powerpc-*-beos*)
-    noconfigdirs="$noconfigdirs tk itcl libgui gdb dejagnu readline"
-    ;;
-esac
+configsub=`echo ${progname} | sed 's/configure$/config.sub/'`
+moveifchange=`echo ${progname} | sed 's/configure$/move-if-change/'`
+## the sed command below emulates the dirname command
+topsrcdir=`cd \`echo ${progname} | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'\`; pwd`
 
 
-# Check whether --enable-libada or --disable-libada was given.
-if test "${enable_libada+set}" = set; then
-  enableval="$enable_libada"
-  ENABLE_LIBADA=$enableval
+# this is a hack.  sun4 must always be a valid host alias or this will fail.
+if ${config_shell} ${configsub} sun4 >/dev/null 2>&1 ; then
+        true
 else
-  ENABLE_LIBADA=yes
+        echo '***' cannot find config.sub.  1>&2
+        exit 1
 fi
 
-if test "${ENABLE_LIBADA}" != "yes" ; then
-  noconfigdirs="$noconfigdirs gnattools"
-fi
-
-# Check whether --enable-libssp or --disable-libssp was given.
-if test "${enable_libssp+set}" = set; then
-  enableval="$enable_libssp"
-  ENABLE_LIBSSP=$enableval
-else
-  ENABLE_LIBSSP=yes
-fi
-
-
-# Set the default so we build libgcc-math for ix86 and x86_64
-# Check whether --enable-libgcc-math or --disable-libgcc-math was given.
-if test "${enable_libgcc_math+set}" = set; then
-  enableval="$enable_libgcc_math"
-  :
+touch config.junk
+if ${config_shell} ${moveifchange} config.junk config.trash ; then
+        true
 else
-  
-case "${target}" in
-  i?86-* | x86_64-* )
-    enable_libgcc_math=yes ;;
-  *)
-    enable_libgcc_math=no ;;
-esac
-
+        echo '***' cannot find move-if-change.  1>&2
+        exit 1
 fi
+rm -f config.junk config.trash
 
-
-# Save it here so that, even in case of --enable-libgcj, if the Java
-# front-end isn't enabled, we still get libgcj disabled.
-libgcj_saved=$libgcj
-case $enable_libgcj in
-yes)
-  # If we reset it here, it won't get added to noconfigdirs in the
-  # target-specific build rules, so it will be forcibly enabled
-  # (unless the Java language itself isn't enabled).
-  libgcj=
-  ;;
-no)
-  # Make sure we get it printed in the list of not supported target libs.
-  noconfigdirs="$noconfigdirs ${libgcj}"
-  ;;
+case "${srcdir}" in
+"")
+        if [ -r configure.in ] ; then
+                srcdir=.
+        else
+                if [ -r ${progname}.in ] ; then
+                        srcdir=`echo ${progname} | sed 's:/configure$::'`
+                else
+                        echo '***' "Can't find configure.in.  Try using --srcdir=some_dir"  1>&2
+                        exit 1
+                fi
+        fi
+        ;;
+*)
+	# Set srcdir to "." if that's what it is.
+	# This is important for multilib support.
+	if [ ! -d ${srcdir} ] ; then
+		echo "Invalid source directory ${srcdir}" >&2
+		exit 1
+	fi
+	pwd=`pwd`
+	srcpwd=`cd ${srcdir} ; pwd`
+	if [ "${pwd}" = "${srcpwd}" ] ; then
+		srcdir=.
+	fi
 esac
 
+### warn about some conflicting configurations.
 
-# Disable libmudflap on some systems.
-if test x$enable_libmudflap = x ; then
-    case "${target}" in
-    *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
-        # Enable libmudflap by default in GNU and friends.
-	;;
-    *-*-freebsd*)
-        # Enable libmudflap by default in FreeBSD.
-	;;
-    *)
-        # Disable it by default everywhere else.
-	noconfigdirs="$noconfigdirs target-libmudflap"
-	;;
-    esac
-fi
-
-# Disable libgomp on non POSIX hosted systems.
-if test x$enable_libgomp = x ; then
-    # Enable libgomp by default on hosted POSIX systems.
-    case "${target}" in
-    *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
-	;;
-    *-*-netbsd* | *-*-freebsd* | *-*-openbsd*)
-	;;
-    *-*-solaris2* | *-*-sysv4* | *-*-irix* | *-*-osf* | *-*-hpux*)
-	;;
-    *-*-darwin* | *-*-aix*)
-	;;
-    *)
-	noconfigdirs="$noconfigdirs target-libgomp"
-	;;
-    esac
-fi
-
-
-case "${target}" in
-  *-*-chorusos)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-    ;;
-  powerpc-*-darwin*)
-    noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
-    noconfigdirs="$noconfigdirs sim target-rda"
-    ;;
-  *-*-darwin*)
-    noconfigdirs="$noconfigdirs ld gas gdb gprof"
-    noconfigdirs="$noconfigdirs sim target-rda"
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-    ;;
-  *-*-freebsd*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-    if test "x$with_gmp" = x && test "x$with_gmp_dir" = x \
-	&& test -f /usr/local/include/gmp.h; then
-      with_gmp=/usr/local
-    fi
-
-    # Skip some stuff that's unsupported on some FreeBSD configurations.
-    case "${target}" in
-      i*86-*-*) ;;
-      alpha*-*-*) ;;
-      *)
-	noconfigdirs="$noconfigdirs ${libgcj}"
-	;;
-    esac
-    ;;
-  *-*-kaos*)
-    # Remove unsupported stuff on all kaOS configurations.
-    skipdirs="target-libiberty ${libgcj} target-libstdc++-v3 target-librx"
-    skipdirs="$skipdirs target-libobjc target-examples target-groff target-gperf"
-    skipdirs="$skipdirs zlib fastjar target-libjava target-boehm-gc target-zlib"
-    noconfigdirs="$noconfigdirs target-libgloss"
-    ;;
-  *-*-netbsd*)
-    # Skip some stuff on all NetBSD configurations.
-    noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss"
-
-    # Skip some stuff that's unsupported on some NetBSD configurations.
-    case "${target}" in
-      i*86-*-netbsdelf*) ;;
-      arm*-*-netbsdelf*) ;;
-      *)
-	noconfigdirs="$noconfigdirs ${libgcj}"
-	;;
-    esac
-    ;;
-  *-*-netware*)
-    noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap"
-    ;;
-  *-*-rtems*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-    # The tpf target doesn't support gdb yet.
-  *-*-tpf*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj} target-libmudflap gdb tcl tk libgui itcl"
-    ;;
-  *-*-uclinux*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}"
-    ;;
-  *-*-vxworks*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty target-libstdc++-v3 ${libgcj}"
-    ;;
-  m32c-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3"
-    ;;
-  alpha*-dec-osf*)
-    # ld works, but does not support shared libraries.
-    # newlib is not 64 bit ready.  I'm not sure about fileutils.
-    # gas doesn't generate exception information.
-    noconfigdirs="$noconfigdirs gas ld fileutils target-newlib target-libgloss"
-    ;;
-  alpha*-*-*vms*)
-    noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss ${libgcj}"
-    ;;
-  alpha*-*-linux*)
-    # newlib is not 64 bit ready
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-    ;;
-  alpha*-*-*)
-    # newlib is not 64 bit ready
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-    ;;
-  am33_2.0-*-linux*)
-    noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-    ;;
-  sh-*-linux*)
-    noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-    ;;    
-  sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    noconfigdirs="$noconfigdirs target-examples"
-    noconfigdirs="$noconfigdirs target-libiberty texinfo send-pr"
-    noconfigdirs="$noconfigdirs tcl tk itcl libgui sim"
-    noconfigdirs="$noconfigdirs expect dejagnu"
-    # the C++ libraries don't build on top of CE's C libraries
-    noconfigdirs="$noconfigdirs target-libstdc++-v3"
-    noconfigdirs="$noconfigdirs target-newlib"
-    case "${host}" in
-      *-*-cygwin*) ;; # keep gdb and readline
-      *) noconfigdirs="$noconfigdirs gdb readline"
-	 ;;
-    esac
-    ;;
-  arc-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-  arm-semi-aof )
-    ;;
-  arm-*-coff | strongarm-*-coff | xscale-*-coff)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
-    noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-    ;;
-  arm*-*-linux-gnueabi)
-    noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-    noconfigdirs="$noconfigdirs target-libjava target-libobjc"
-    ;;
-  arm*-*-symbianelf*)
-    noconfigdirs="$noconfigdirs ${libgcj} target-libiberty"
-    ;;
-  arm-*-pe*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-  thumb-*-coff)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-  thumb-*-elf)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-  thumb-*-pe)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-  arm-*-riscix*)
-    noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
-    ;;
-  avr-*-*)
-    noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
-    ;;
-  bfin-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss gdb"
-    if test x${is_cross_compiler} != xno ; then
-      target_configdirs="${target_configdirs} target-bsp target-cygmon"
-    fi
-    ;;
-  c4x-*-* | tic4x-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
-    ;;
-  c54x*-*-* | tic54x-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb newlib"
-    ;;
-  cris-*-* | crisv32-*-*)
-    unsupported_languages="$unsupported_languages java"
-    case "${target}" in
-      *-*-aout)
-	unsupported_languages="$unsupported_languages fortran"
-	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
-      *-*-elf)
-	unsupported_languages="$unsupported_languages fortran"
-	noconfigdirs="$noconfigdirs target-boehm-gc";;
-      *-*-linux*)
-	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
-      *)
-	unsupported_languages="$unsupported_languages fortran"
-	noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;
-    esac
-    ;;
-  crx-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-mudflap ${libgcj}"
-    ;;
-  d10v-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
-    ;;
-  d30v-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj} gdb"
-    ;;
-  fr30-*-elf*)
-    noconfigdirs="$noconfigdirs ${libgcj} gdb"
-    ;;
-  frv-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  h8300*-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-  h8500-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
-    ;;
-  hppa1.1-*-osf* | hppa1.1-*-bsd* )
-    ;;
-  hppa*64*-*-linux* | parisc*64*-*-linux*)
-    # In this case, it's because the hppa64-linux target is for
-    # the kernel only at this point and has no libc, and thus no
-    # headers, crt*.o, etc., all of which are needed by these.
-    noconfigdirs="$noconfigdirs target-zlib"
-    ;;
-  parisc*-*-linux* | hppa*-*-linux*)
-    ;;
-  hppa*-*-*elf* | \
-  hppa*-*-lites* | \
-  hppa*-*-openbsd* | \
-  hppa*64*-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  hppa*-*-*)
-    # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't
-    # build on HP-UX 10.20.
-    noconfigdirs="$noconfigdirs ld shellutils ${libgcj}"
-    ;;
-  i960-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj} gdb"
-    ;;
-  ia64*-*-elf*)
-    # No gdb support yet.
-    noconfigdirs="$noconfigdirs readline mmalloc libgui itcl gdb"
-    ;;
-  ia64*-**-hpux*)
-    # No gdb or ld support yet.
-    noconfigdirs="$noconfigdirs ${libgcj} readline mmalloc libgui itcl gdb ld"
-    ;;
-  i370-*-opened*)
-    ;;
-  i[3456789]86-*-coff | i[3456789]86-*-elf)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  i[3456789]86-*-linux*)
-    # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's
-    # not build java stuff by default.
-    case "${target}" in
-      *-*-*libc1*)
-	noconfigdirs="$noconfigdirs ${libgcj}";;
-    esac
-
-    # This section makes it possible to build newlib natively on linux.
-    # If we are using a cross compiler then don't configure newlib.
-    if test x${is_cross_compiler} != xno ; then
-      noconfigdirs="$noconfigdirs target-newlib"
-    fi
-    noconfigdirs="$noconfigdirs target-libgloss"
-    # If we are not using a cross compiler, do configure newlib.
-    # Note however, that newlib will only be configured in this situation
-    # if the --with-newlib option has been given, because otherwise
-    # 'target-newlib' will appear in skipdirs.
-    ;;
-  i[3456789]86-*-mingw32*)
-    target_configdirs="$target_configdirs target-mingw"
-    noconfigdirs="$noconfigdirs expect target-libgloss ${libgcj}"
-
-    # Can't build gdb for mingw32 if not native.
-    case "${host}" in
-      i[3456789]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
-      *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl gnuserv"
-         ;;
-    esac
-    ;;    
-  *-*-cygwin*)
-    target_configdirs="$target_configdirs target-libtermcap target-winsup"
-    noconfigdirs="$noconfigdirs target-gperf target-libgloss ${libgcj}"
-    # always build newlib if winsup directory is present.
-    if test -d "$srcdir/winsup"; then
-      skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
-    elif test -d "$srcdir/newlib"; then
-      echo "Warning: winsup is missing so newlib can't be built."
-    fi
-
-    # Can't build gdb for Cygwin if not native.
-    case "${host}" in
-      *-*-cygwin*) ;; # keep gdb tcl tk expect etc.
-      *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl libgui gnuserv"
-         ;;
-    esac
-    ;;    
-  i[3456789]86-moss-msdos | i[3456789]86-*-moss* | \
-  i[3456789]86-*-uwin* | i[3456789]86-*-interix* )
-    ;;
-  i[3456789]86-*-pe)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
-    ;;
-  i[3456789]86-*-sco3.2v5*)
-    # The linker does not yet know about weak symbols in COFF,
-    # and is not configured to handle mixed ELF and COFF.
-    noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
-    ;;
-  i[3456789]86-*-sco*)
-    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
-    ;;
-  i[3456789]86-*-solaris2*)
-    noconfigdirs="$noconfigdirs target-libgloss"
-    ;;
-  i[3456789]86-*-sysv4*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-  i[3456789]86-*-beos*)
-    noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
-    ;;
-  i[3456789]86-*-rdos*)
-    noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
-    ;;
-  m32r-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
-    noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
-    ;;
-  m68k-*-elf*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  m68k-*-coff*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  mcore-*-pe*)
-  # The EPOC C++ environment does not support exceptions or rtti,
-  # and so building libstdc++-v3 tends not to always work.
-    noconfigdirs="$noconfigdirs target-libstdc++-v3"
-    ;;
-  mmix-*-*)
-    noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb libgloss"
-    unsupported_languages="$unsupported_languages fortran java"
-    ;;
-  mn10200-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  mn10300-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  mt-*-*)
-    noconfigdirs="$noconfigdirs sim"
-    ;;
-  powerpc-*-aix*)
-    # copied from rs6000-*-* entry
-    noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}"
-    ;;
-  powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
-    target_configdirs="$target_configdirs target-winsup"
-    noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl gnuserv ${libgcj}"
-    # always build newlib.
-    skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
-    ;;
-    # This is temporary until we can link against shared libraries
-  powerpcle-*-solaris*)
-    noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl gnuserv ${libgcj}"
-    ;;
-  powerpc-*-beos*)
-    noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
-    ;;
-  powerpc-*-eabi)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* )
-    ;;
-  rs6000-*-lynxos*)
-    noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}"
-    ;;
-  rs6000-*-aix*)
-    noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}"
-    ;;
-  rs6000-*-*)
-    noconfigdirs="$noconfigdirs gprof ${libgcj}"
-    ;;
-  m68k-apollo-*)
-    noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss ${libgcj}"
-    ;;
-  mips*-*-irix5*)
-    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
-    ;;
-  mips*-*-irix6*)
-    # Linking libjava exceeds command-line length limits on at least
-    # IRIX 6.2, but not on IRIX 6.5.
-    # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham
-    # <oldham@codesourcery.com>
-    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
-    ;;
-  mips*-dec-bsd*)
-    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
-    ;;
-  mips*-*-bsd*)
-    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
-    ;;
-  mipstx39-*-*)
-    noconfigdirs="$noconfigdirs gprof ${libgcj}"   # same as generic mips
-    ;;
-  mips64*-*-linux*)
-    noconfigdirs="$noconfigdirs target-newlib ${libgcj}"
-    ;;
-  mips*-*-linux*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-    ;;
-  mips*-*-*)
-    noconfigdirs="$noconfigdirs gprof ${libgcj}"
-    ;;
-  romp-*-*)
-    noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-    ;;
-  sh-*-* | sh64-*-*)
-    case "${host}" in
-      i[3456789]86-*-vsta) ;; # don't add gprof back in
-      i[3456789]86-*-go32*) ;; # don't add gprof back in
-      i[3456789]86-*-msdosdjgpp*) ;; # don't add gprof back in
-      *) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;;
-    esac
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-  sparc-*-elf*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  sparc64-*-elf*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  sparclite-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  sparc-*-sunos4*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    if test x${is_cross_compiler} != xno ; then
-           noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
-    else
-           use_gnu_ld=no
-    fi
-    ;;
-  sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  sparc-*-solaris* | sparc64-*-solaris* | sparcv9-*-solaris*)
-    ;;
-  v810-*-*)
-    noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libstdc++-v3 opcodes target-libgloss ${libgcj}"
-    ;;
-  v850-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-  v850e-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-  v850ea-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-  vax-*-vms)
-    noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes target-libgloss ${libgcj}"
-    ;;
-  vax-*-*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-    ;;
-  xtensa-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  ip2k-*-*)
-    noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
-    ;;
-  *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-    ;;
-  *-*-lynxos*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-    ;; 
-  *-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-esac
-
-# If we aren't building newlib, then don't build libgloss, since libgloss
-# depends upon some newlib header files.
-case "${noconfigdirs}" in
-  *target-libgloss*) ;;
-  *target-newlib*) noconfigdirs="$noconfigdirs target-libgloss" ;;
+case "${srcdir}" in
+".") ;;
+*)
+        if [ -f ${srcdir}/config.status ] ; then
+                echo '***' Cannot configure here in \"${PWD=`pwd`}\" when \"${srcdir}\" is currently configured. 1>&2
+                exit 1
+        fi
 esac
 
-# Work in distributions that contain no compiler tools, like Autoconf.
-tentative_cc=""
-host_makefile_frag=/dev/null
-if test -d ${srcdir}/config ; then
-case "${host}" in
-  m68k-hp-hpux*)
-    # Avoid "too much defining" errors from HPUX compiler.
-    tentative_cc="cc -Wp,-H256000"
-    # If "ar" in $PATH is GNU ar, the symbol table may need rebuilding.
-    # If it's HP/UX ar, this should be harmless.
-    RANLIB="ar ts"
-    ;;
-  m68k-apollo-sysv*)
-    tentative_cc="cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DUSG"
-    ;;
-  m68k-apollo-bsd*)
-    #None of the Apollo compilers can compile gas or binutils.  The preprocessor
-    # chokes on bfd, the compiler won't let you assign integers to enums, and
-    # other problems.  Defining CC to gcc is a questionable way to say "don't use
-    # the apollo compiler" (the preferred version of GCC could be called cc,
-    # or whatever), but I'm not sure leaving CC as cc is any better...
-    #CC=cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DNO_STDARG
-    # Used to have BISON=yacc.
-    tentative_cc=gcc
-    ;;
-  m88k-dg-dgux*)
-    tentative_cc="gcc -Wall -ansi -D__using_DGUX"
-    ;;
-  m88k-harris-cxux*)
-    # Under CX/UX, we want to tell the compiler to use ANSI mode.
-    tentative_cc="cc -Xa"
-    host_makefile_frag="config/mh-cxux"
-    ;;
-  m88k-motorola-sysv*)
-    ;;
-  mips*-dec-ultrix*)
-    tentative_cc="cc -Wf,-XNg1000"
-    host_makefile_frag="config/mh-decstation"
-    ;;
-  mips*-nec-sysv4*)
-    # The C compiler on NEC MIPS SVR4 needs bigger tables.
-    tentative_cc="cc -ZXNd=5000 -ZXNg=1000"
-    host_makefile_frag="config/mh-necv4"
-    ;;
-  mips*-sgi-irix4*)
-    # Tell compiler to use K&R C.  We can't compile under the SGI Ansi
-    # environment.  Also bump switch table size so that cp-parse will
-    # compile.  Bump string length limit so linker builds.
-    tentative_cc="cc -cckr -Wf,-XNg1500 -Wf,-XNk1000 -Wf,-XNh2000 -Wf,-XNl8192"
-    ;;
-  mips*-*-sysv4*)
-    host_makefile_frag="config/mh-sysv4"
-    ;;
-  mips*-*-sysv*)
-    # This is for a MIPS running RISC/os 4.52C.
-
-    # This is needed for GDB, but needs to be in the top-level make because
-    # if a library is compiled with the bsd headers and gets linked with the
-    # sysv system libraries all hell can break loose (e.g. a jmp_buf might be
-    # a different size).
-    # ptrace(2) apparently has problems in the BSD environment.  No workaround is
-    # known except to select the sysv environment.  Could we use /proc instead?
-    # These "sysv environments" and "bsd environments" often end up being a pain.
-    #
-    # This is not part of CFLAGS because perhaps not all C compilers have this
-    # option.
-    tentative_cc="cc -systype sysv"
-    ;;
-  i370-ibm-opened*)
-    tentative_cc="c89"
-    ;;
-  i[3456789]86-*-sysv5*)
-    host_makefile_frag="config/mh-sysv5"
-    ;;
-  i[3456789]86-*-dgux*)
-    tentative_cc="gcc -Wall -ansi -D__using_DGUX"
-    host_makefile_frag="config/mh-dgux386"
-    ;;
-  i[3456789]86-ncr-sysv4.3*)
-    # The MetaWare compiler will generate a copyright message unless you
-    # turn it off by adding the -Hnocopyr flag.
-    tentative_cc="cc -Hnocopyr"
-    ;;
-  i[3456789]86-ncr-sysv4*)
-    # for an NCR 3000 (i486/SVR4) system.
-    # The NCR 3000 ships with a MetaWare compiler installed as /bin/cc.
-    # This compiler not only emits obnoxious copyright messages every time
-    # you run it, but it chokes and dies on a whole bunch of GNU source
-    # files.  Default to using the AT&T compiler installed in /usr/ccs/ATT/cc.
-    tentative_cc="/usr/ccs/ATT/cc"
-    host_makefile_frag="config/mh-ncr3000"
-    ;;
-  i[3456789]86-*-sco3.2v5*)
-    ;;
-  i[3456789]86-*-sco*)
-    # The native C compiler botches some simple uses of const.  Unfortunately,
-    # it doesn't defined anything like "__sco__" for us to test for in ansidecl.h.
-    tentative_cc="cc -Dconst="
-    host_makefile_frag="config/mh-sco"
-    ;;
-  i[3456789]86-*-udk*)
-    host_makefile_frag="config/mh-sysv5"
-    ;;
-  i[3456789]86-*-solaris2*)
-    host_makefile_frag="config/mh-sysv4"
-    ;;
-  i[3456789]86-*-msdosdjgpp*)
-    host_makefile_frag="config/mh-djgpp"
-    ;;
-  *-cygwin*)
-    host_makefile_frag="config/mh-cygwin"
-    ;;
-  *-mingw32*)
-    ;;
-  *-interix*)
-    host_makefile_frag="config/mh-interix"
-    ;;
-  vax-*-ultrix2*)
-    # The old BSD pcc isn't up to compiling parts of gdb so use gcc
-    tentative_cc=gcc
-    ;;
-  *-*-solaris2*)
-    host_makefile_frag="config/mh-solaris"
-    ;;
-  m68k-sun-sunos*)
-    # Sun's C compiler needs the -J flag to be able to compile cp-parse.c
-    # without overflowing the jump tables (-J says to use a 32 bit table)
-    tentative_cc="cc -J"
-    ;;
-  *-hp-hpux*)
-    tentative_cc="cc -Wp,-H256000"
-    ;;
-  *-*-hiux*)
-    tentative_cc="cc -Wp,-H256000"
-    ;;
-  rs6000-*-lynxos*)
-    # /bin/cc is less than useful for our purposes.  Always use GCC
-    tentative_cc="/usr/cygnus/progressive/bin/gcc"
-    host_makefile_frag="config/mh-lynxrs6k"
-    ;;
-  powerpc-*-darwin*)
-    host_makefile_frag="config/mh-ppc-darwin"
-    ;;
-  powerpc-*-aix*)
-    host_makefile_frag="config/mh-ppc-aix"
-    ;;
-  rs6000-*-aix*)
-    host_makefile_frag="config/mh-ppc-aix"
-    ;;
-  *-*-lynxos*)
-    # /bin/cc is less than useful for our purposes.  Always use GCC
-    tentative_cc="/bin/gcc"
-    ;;
-  *-*-sysv4*)
-    host_makefile_frag="config/mh-sysv4"
-    ;;
-  # This is placed last to prevent interfering with the cases above.
-  i[3456789]86-*-*)
-    # Build the stage2 and stage3 compilers with -fomit-frame-pointer.
-    host_makefile_frag="config/mh-x86omitfp"
-    ;;
+# default exec_prefix
+case "${exec_prefixoption}" in
+"") exec_prefix="\$(prefix)" ;;
+*) ;;
 esac
-fi
-
-# If we aren't going to be using gcc, see if we can extract a definition
-# of CC from the fragment.
-# Actually, use the 'pre-extracted' version above.
-if test -z "${CC}" && test "${build}" = "${host}" ; then
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
-  found=
-  for dir in $PATH; do
-    test -z "$dir" && dir=.
-    if test -f $dir/gcc; then
-      found=yes
-      break
-    fi
-  done
-  IFS="$save_ifs"
-  if test -z "${found}" && test -n "${tentative_cc}" ; then
-    CC=$tentative_cc
-  fi
-fi
-
-if test "${build}" != "${host}" ; then
-  # If we are doing a Canadian Cross, in which the host and build systems
-  # are not the same, we set reasonable default values for the tools.
-
-  CC=${CC-${host_alias}-gcc}
-  CFLAGS=${CFLAGS-"-g -O2"}
-  CXX=${CXX-${host_alias}-c++}
-  CXXFLAGS=${CXXFLAGS-"-g -O2"}
-  CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-
-else
-  # Set reasonable default values for some tools even if not Canadian.
-  # Of course, these are different reasonable default values, originally
-  # specified directly in the Makefile.
-  # We don't export, so that autoconf can do its job.
-  # Note that all these settings are above the fragment inclusion point
-  # in Makefile.in, so can still be overridden by fragments.
-  # This is all going to change when we autoconfiscate...
-
-  CC_FOR_BUILD="\$(CC)"
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1861: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1891: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1942: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1974: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1985 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2016: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2021: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2049: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
 
-
-  # We must set the default linker to the linker used by gcc for the correct
-  # operation of libtool.  If LD is not defined and we are using gcc, try to
-  # set the LD default to the ld used by gcc.
-  if test -z "$LD"; then
-    if test "$GCC" = yes; then
-      case $build in
-      *-*-mingw*)
-	gcc_prog_ld=`$CC -print-prog-name=ld 2>&1 | tr -d '\015'` ;;
-      *)
-	gcc_prog_ld=`$CC -print-prog-name=ld 2>&1` ;;
-      esac
-      case $gcc_prog_ld in
-      # Accept absolute paths.
-      [\\/]* | [A-Za-z]:[\\/]*)
-        LD="$gcc_prog_ld" ;;
-      esac
-    fi
-  fi
-
-  CXX=${CXX-"c++"}
-  CFLAGS=${CFLAGS-"-g"}
-  CXXFLAGS=${CXXFLAGS-"-g -O2"}
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gnatbind; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2116: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GNATBIND"; then
-  ac_cv_prog_GNATBIND="$GNATBIND" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GNATBIND="${ac_tool_prefix}gnatbind"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GNATBIND="$ac_cv_prog_GNATBIND"
-if test -n "$GNATBIND"; then
-  echo "$ac_t""$GNATBIND" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_GNATBIND"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "gnatbind", so it can be a program name with args.
-set dummy gnatbind; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2148: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GNATBIND"; then
-  ac_cv_prog_GNATBIND="$GNATBIND" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GNATBIND="gnatbind"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_GNATBIND" && ac_cv_prog_GNATBIND="no"
-fi
-fi
-GNATBIND="$ac_cv_prog_GNATBIND"
-if test -n "$GNATBIND"; then
-  echo "$ac_t""$GNATBIND" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  GNATBIND="no"
-fi
-fi
-
-echo $ac_n "checking whether compiler driver understands Ada""... $ac_c" 1>&6
-echo "configure:2181: checking whether compiler driver understands Ada" >&5
-if eval "test \"`echo '$''{'acx_cv_cc_gcc_supports_ada'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat >conftest.adb <<EOF
-procedure conftest is begin null; end conftest;
-EOF
-acx_cv_cc_gcc_supports_ada=no
-# There is a bug in old released versions of GCC which causes the
-# driver to exit successfully when the appropriate language module
-# has not been installed.  This is fixed in 2.95.4, 3.0.2, and 3.1.
-# Therefore we must check for the error message as well as an
-# unsuccessful exit.
-# Other compilers, like HP Tru64 UNIX cc, exit successfully when
-# given a .adb file, but produce no object file.  So we must check
-# if an object file was really produced to guard against this.
-errors=`(${CC} -c conftest.adb) 2>&1 || echo failure`
-if test x"$errors" = x && test -f conftest.$ac_objext; then
-  acx_cv_cc_gcc_supports_ada=yes
-fi
-rm -f conftest.*
-fi
-
-echo "$ac_t""$acx_cv_cc_gcc_supports_ada" 1>&6
-
-if test x$GNATBIND != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
-  have_gnat=yes
-else
-  have_gnat=no
-fi
-
-echo $ac_n "checking how to compare bootstrapped objects""... $ac_c" 1>&6
-echo "configure:2213: checking how to compare bootstrapped objects" >&5
-if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-   echo abfoo >t1
-  echo cdfoo >t2
-  gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
-  if cmp t1 t2 2 2 > /dev/null 2>&1; then
-    if cmp t1 t2 1 1 > /dev/null 2>&1; then
-      :
-    else
-      gcc_cv_prog_cmp_skip='cmp $$f1 $$f2 16 16'
-    fi
-  fi
-  if cmp --ignore-initial=2 t1 t2 > /dev/null 2>&1; then
-    if cmp --ignore-initial=1 t1 t2 > /dev/null 2>&1; then
-      :
-    else
-      gcc_cv_prog_cmp_skip='cmp --ignore-initial=16 $$f1 $$f2'
-    fi
-  fi
-  rm t1 t2
-
-fi
-
-echo "$ac_t""$gcc_cv_prog_cmp_skip" 1>&6
-do_compare="$gcc_cv_prog_cmp_skip"
-
-
-
-# Check for GMP and MPFR
-gmplibs=
-gmpinc=
-have_gmp=yes
-# Specify a location for mpfr
-# check for this first so it ends up on the link line before gmp.
-# Check whether --with-mpfr-dir or --without-mpfr-dir was given.
-if test "${with_mpfr_dir+set}" = set; then
-  withval="$with_mpfr_dir"
-  :
-fi
-
-
-if test "x$with_mpfr_dir" != x; then
-  gmpinc="-I$with_mpfr_dir"
-  gmplibs="$with_mpfr_dir/libmpfr.a"
-else
-  gmplibs="-lmpfr"
-fi
-
-# Check whether --with-mpfr or --without-mpfr was given.
-if test "${with_mpfr+set}" = set; then
-  withval="$with_mpfr"
-  :
-fi
-
-
-if test "x$with_mpfr" != x; then
-  gmplibs="-L$with_mpfr/lib $gmplibs"
-  gmpinc="-I$with_mpfr/include"
-fi
-
-# Specify a location for gmp
-# Check whether --with-gmp-dir or --without-gmp-dir was given.
-if test "${with_gmp_dir+set}" = set; then
-  withval="$with_gmp_dir"
-  :
-fi
-
-
-if test "x$with_gmp_dir" != x; then
-  gmpinc="$gmpinc -I$with_gmp_dir"
-  if test -f "$with_gmp_dir/.libs/libgmp.a"; then
-    gmplibs="$gmplibs $with_gmp_dir/.libs/libgmp.a"
-  elif test -f "$with_gmp_dir/_libs/libgmp.a"; then
-    gmplibs="$gmplibs $with_gmp_dir/_libs/libgmp.a"
-  fi
-  # One of the later tests will catch the error if neither library is present.
-else
-  gmplibs="$gmplibs -lgmp"
-fi
-
-# Check whether --with-gmp or --without-gmp was given.
-if test "${with_gmp+set}" = set; then
-  withval="$with_gmp"
-  :
-fi
-
-
-if test "x$with_gmp" != x; then
-  gmplibs="-L$with_gmp/lib $gmplibs"
-  gmpinc="-I$with_gmp/include $gmpinc"
-fi
-
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $gmpinc"
-# Check GMP actually works
-echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6
-echo "configure:2311: checking for correct version of gmp.h" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2313 "configure"
-#include "confdefs.h"
-#include "gmp.h"
-int main() {
-
-#if __GNU_MP_VERSION < 3
-choke me
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:2324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""no" 1>&6; have_gmp=no
-fi
-rm -f conftest*
-
-if test x"$have_gmp" = xyes; then
-  echo $ac_n "checking for MPFR""... $ac_c" 1>&6
-echo "configure:2337: checking for MPFR" >&5
-
-  saved_LIBS="$LIBS"
-  LIBS="$LIBS $gmplibs"
-  cat > conftest.$ac_ext <<EOF
-#line 2342 "configure"
-#include "confdefs.h"
-#include <gmp.h>
-#include <mpfr.h>
-int main() {
-mpfr_t n; mpfr_init(n);
-; return 0; }
-EOF
-if { (eval echo configure:2350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""no" 1>&6; have_gmp=no
-fi
-rm -f conftest*
-  LIBS="$saved_LIBS"
-  CFLAGS="$saved_CFLAGS"
-fi
-
-# Flags needed for both GMP and/or MPFR
-
-
-
-# By default, C is the only stage 1 language.
-stage1_languages=c
-
-
-# Figure out what language subdirectories are present.
-# Look if the user specified --enable-languages="..."; if not, use
-# the environment variable $LANGUAGES if defined. $LANGUAGES might
-# go away some day.
-# NB:  embedded tabs in this IF block -- do not untabify
-if test -d ${srcdir}/gcc; then
-  if test x"${enable_languages+set}" != xset; then
-    if test x"${LANGUAGES+set}" = xset; then
-      enable_languages="${LANGUAGES}"
-        echo configure.in: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2
-    else
-      enable_languages=all
-    fi
-  else
-    if test x"${enable_languages}" = x ||
-       test x"${enable_languages}" = xyes;
-       then
-      echo configure.in: --enable-languages needs at least one language argument 1>&2
-      exit 1
-    fi
-  fi
-  enable_languages=`echo "${enable_languages}" | sed -e 's/[ 	,][ 	,]*/,/g' -e 's/,$//'`
-
-  # 'f95' is the old name for the 'fortran' language. We issue a warning
-  # and make the substitution.
-  case ,${enable_languages}, in
-    *,f95,*)
-      echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
-      enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
-      ;;
-  esac
-
-  # First scan to see if an enabled language requires some other language.
-  # We assume that a given config-lang.in will list all the language
-  # front ends it requires, even if some are required indirectly.
-  for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
-    case ${lang_frag} in
-      ..) ;;
-      # The odd quoting in the next line works around
-      # an apparent bug in bash 1.12 on linux.
-      ${srcdir}/gcc/[*]/config-lang.in) ;;
-      *)
-        # From the config-lang.in, get $language, $lang_requires
-        language=
-        lang_requires=
-        . ${lang_frag}
-        for other in ${lang_requires} ; do
-          case ,${enable_languages}, in
-	    *,$other,*) ;;
-	    *,all,*) ;;
-	    *,$language,*)
-	      echo " \`$other' language required by \`$language'; enabling" 1>&2
-	      enable_languages="${enable_languages},${other}"
-	      ;;
-	  esac
-        done
-        ;;
-    esac
-  done
-
-  new_enable_languages=c
-  missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e s/,c,/,/ `
-  potential_languages=c
-
-  for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
-    case ${lang_frag} in
-      ..) ;;
-      # The odd quoting in the next line works around
-      # an apparent bug in bash 1.12 on linux.
-      ${srcdir}/gcc/[*]/config-lang.in) ;;
-      *)
-        # From the config-lang.in, get $language, $target_libs, 
-        # $lang_dirs, $boot_language, and $build_by_default
-        language=
-        target_libs=
-        lang_dirs=
-        boot_language=
-        build_by_default=
-        need_gmp=
-        . ${lang_frag}
-        potential_languages="${potential_languages},${language}"
-        # This is quite sensitive to the ordering of the case statement arms.
-        case ,${enable_languages},:${language}:${have_gnat}:${build_by_default} in
-          *::*:*)
-            echo "${lang_frag} doesn't set \$language." 1>&2
-            exit 1
-            ;;
-          *:ada:no:*)
-            # Ada was requested with no preexisting GNAT.  Disable unconditionally.
-            add_this_lang=no
-            ;;
-          *,${language},*:*:*:*)
-            # Language was explicitly selected; include it.
-            add_this_lang=yes
-            ;;
-          *,all,*:*:*:no)
-            # 'all' was selected, but this is not a default language
-            # so do not include it.
-            add_this_lang=no
-            ;;
-          *,all,*:*:*:*)
-            # 'all' was selected and this is a default language; include it.
-            add_this_lang=yes
-            ;;
-          *)
-            add_this_lang=no
-            ;;
-        esac
-
-        # Disable languages that need GMP if it isn't available.
-        case ,${enable_languages},:${have_gmp}:${need_gmp} in
-          *,${language},*:no:yes)
-            # Specifically requested language; tell them.
-            { echo "configure: error: GMP with MPFR support is required to build $language" 1>&2; exit 1; }
-            ;;
-          *:no:yes)
-            # Silently disable.
-            add_this_lang=no
-            ;;
-        esac
-
-	# Disable a language that is unsupported by the target.
-	case " $unsupported_languages " in
-	  *" $language "*)
-	    add_this_lang=no
+# Define the trigger file to make sure configure will re-run whenever
+# the gcc version number changes.
+if [ "${with_gcc_version_trigger+set}" = set ]; then
+    gcc_version_trigger="$with_gcc_version_trigger"
+    gcc_version=`grep version_string ${with_gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
+else
+    # If gcc's sources are available, define the trigger file.
+    if [ -f ${topsrcdir}/gcc/version.c ] ; then
+	gcc_version_trigger=${topsrcdir}/gcc/version.c
+	gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
+	case "$arguments" in
+	  *--with-gcc-version-trigger=$gcc_version_trigger* )
 	    ;;
-	esac
-
-	case $add_this_lang in
-	  no)
-            # Remove language-dependent dirs.
-            eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\"
+	  * )
+	    # Make sure configure.in knows about this.
+	    arguments="--with-gcc-version-trigger=$gcc_version_trigger $arguments"
 	    ;;
-          *)
-	    new_enable_languages="$new_enable_languages,$language"
-	    missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"`
-	    case ${boot_language} in
-	      yes)
-		# Add to (comma-separated) list of stage 1 languages.
-		stage1_languages="${stage1_languages},${language}"
-		;;
+	esac
+	withoptions="--with-gcc-version-trigger=$gcc_version_trigger $withoptions"
+    fi
+fi
+
+### break up ${srcdir}/configure.in.
+case "`grep '^# per\-host:' ${srcdir}/configure.in`" in
+"")
+        echo '***' ${srcdir}/configure.in has no \"per-host:\" line. 1>&2
+	# Check for a directory that's been converted to use autoconf since
+	# it was last configured.
+	if grep AC_OUTPUT ${srcdir}/configure.in >/dev/null ; then
+	  echo '***' Hmm, looks like this directory has been autoconfiscated. 1>&2
+	  if [ -r ${srcdir}/configure ] ; then
+	    echo '***' Running the local configure script. 1>&2
+	    case "${cache_file}" in
+	    "") cache_file_option= ;;
+	    *)  cache_file_option="--cache-file=${cache_file}" ;;
 	    esac
-	    ;;
-        esac
+	    srcdiroption="--srcdir=${srcdir}"
+	    case "${build_alias}" in
+	    "") buildopt= ;;
+	    *)  buildopt="--build=${build_alias}" ;;
+	    esac
+	    eval exec ${config_shell} ${srcdir}/configure ${verbose} \
+		${buildopt} --host=${host_alias} --target=${target_alias} \
+		${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
+		${srcdiroption} ${diroptions} \
+		${program_prefixoption} ${program_suffixoption} \
+		${program_transform_nameoption} ${site_option} \
+		${withoptions} ${withoutoptions} \
+		${enableoptions} ${disableoptions} ${floating_pointoption} \
+		${cache_file_option} ${removing} ${other_options} ${redirect}
+	  else
+	    echo '***' There is no configure script present though. 1>&2
+	  fi
+	fi
+        exit 1
         ;;
-    esac
-  done
-
-  missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"`
-  if test "x$missing_languages" != x; then
-    { echo "configure: error: 
-The following requested languages could not be built: ${missing_languages}
-Recognised languages are: ${potential_languages}" 1>&2; exit 1; }
-  fi
-
-  if test "x$new_enable_languages" != "x$enable_languages"; then
-    echo The following languages will be built: ${new_enable_languages}
-  fi
-  enable_languages="$new_enable_languages"
-  ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[^ ]*//' -e 's/$/ --enable-languages='"$enable_languages"/ `
-fi
-
-# Handle --disable-<component> generically.
-for dir in $configdirs $build_configdirs $target_configdirs ; do
-  dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g`
-  if eval test x\${enable_${dirname}} "=" xno ; then
-    noconfigdirs="$noconfigdirs $dir"
-  fi
-done
-
-# Remove the entries in $skipdirs and $noconfigdirs from $configdirs,
-# $build_configdirs and $target_configdirs.
-# If we have the source for $noconfigdirs entries, add them to $notsupp.
-
-notsupp=""
-for dir in . $skipdirs $noconfigdirs ; do
-  dirname=`echo $dir | sed -e s/target-//g -e s/build-//g`
-  if test $dir != .  && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
-    configdirs=`echo " ${configdirs} " | sed -e "s/ ${dir} / /"`
-    if test -r $srcdir/$dirname/configure ; then
-      if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
-	true
-      else
-	notsupp="$notsupp $dir"
-      fi
-    fi
-  fi
-  if test $dir != .  && echo " ${build_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
-    build_configdirs=`echo " ${build_configdirs} " | sed -e "s/ ${dir} / /"`
-    if test -r $srcdir/$dirname/configure ; then
-      if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
-	true
-      else
-	notsupp="$notsupp $dir"
-      fi
-    fi
-  fi
-  if test $dir != . && echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
-    target_configdirs=`echo " ${target_configdirs} " | sed -e "s/ ${dir} / /"`
-    if test -r $srcdir/$dirname/configure ; then
-      if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
-	true
-      else
-	notsupp="$notsupp $dir"
-      fi
-    fi
-  fi
-done
-
-# Sometimes the tools are distributed with libiberty but with no other
-# libraries.  In that case, we don't want to build target-libiberty.
-if test -n "${target_configdirs}" ; then
-  others=
-  for i in `echo ${target_configdirs} | sed -e s/target-//g` ; do
-    if test "$i" != "libiberty" ; then
-      if test -r $srcdir/$i/configure ; then
-	others=yes;
-	break;
-      fi
-    fi
-  done
-  if test -z "${others}" ; then
-    target_configdirs=
-  fi
-fi
+*) ;;
+esac
 
-# Quietly strip out all directories which aren't configurable in this tree.
-# This relies on all configurable subdirectories being autoconfiscated, which
-# is now the case.
-build_configdirs_all="$build_configdirs"
-build_configdirs=
-for i in ${build_configdirs_all} ; do
-  j=`echo $i | sed -e s/build-//g` 
-  if test -f ${srcdir}/$j/configure ; then
-    build_configdirs="${build_configdirs} $i"
-  fi
-done
+case "`grep '^# per\-target:' ${srcdir}/configure.in`" in
+"")
+        echo '***' ${srcdir}/configure.in has no \"per-target:\" line. 1>&2
+        exit 1
+        ;;
+*) ;;
+esac
 
-configdirs_all="$configdirs"
-configdirs=
-for i in ${configdirs_all} ; do
-  if test -f ${srcdir}/$i/configure ; then
-    configdirs="${configdirs} $i"
-  fi
-done
+case "${TMPDIR}" in
+"") TMPDIR=/tmp ; export TMPDIR ;;
+*) ;;
+esac
 
-target_configdirs_all="$target_configdirs"
-target_configdirs=
-for i in ${target_configdirs_all} ; do
-  j=`echo $i | sed -e s/target-//g` 
-  if test -f ${srcdir}/$j/configure ; then
-    target_configdirs="${target_configdirs} $i"
-  fi
-done
+# keep this filename short for &%*%$*# 14 char file names and 8+3 file names
+tmpfile=${TMPDIR}/cNf$$
+# Note that under many versions of sh a trap handler for 0 will *override* any
+# exit status you explicitly specify!  At this point, the only non-error exit
+# is at the end of the script; these actions are duplicated there, minus
+# the "exit 1".  Don't use "exit 0" anywhere after this without resetting the
+# trap handler, or you'll lose.
+trap "rm -f Makefile.tem ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos; exit 1" 0 1 2 15
+
+# split ${srcdir}/configure.in into common, per-host, per-target,
+# and post-target parts.  Post-target is optional.
+sed -e '/^# per\-host:/,$d' ${srcdir}/configure.in > ${tmpfile}.com
+sed -e '1,/^# per\-host:/d' -e '/^# per\-target:/,$d' ${srcdir}/configure.in > ${tmpfile}.hst
+if grep '^# post-target:' ${srcdir}/configure.in >/dev/null ; then
+  sed -e '1,/^# per\-target:/d' -e '/^# post\-target:/,$d' ${srcdir}/configure.in > ${tmpfile}.tgt
+  sed -e '1,/^# post\-target:/d' ${srcdir}/configure.in > ${tmpfile}.pos
+else
+  sed -e '1,/^# per\-target:/d' ${srcdir}/configure.in > ${tmpfile}.tgt
+  echo >${tmpfile}.pos
+fi
+
+### do common part of configure.in
+
+# If the language specific compiler does not exist, but the "gcc" directory does,
+# we will skip this directory; in this case the sub-directory's common part
+# of configure.in will create a small shell script "skip-this-dir" containing
+# commands to completely clean up any temporary or created files.
+
+. ${tmpfile}.com
+
+if test -f skip-this-dir; then
+	# Perform the same cleanup as the trap handler, minus the "exit 1" of course,
+	# and reset the trap handler.
+	trap 0
+	rm -f Makefile* ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos
+	# Execute the final clean-up actions
+	${config_shell} skip-this-dir
+	# and stop configuring this directory.
+	exit 0
+fi
+
+# some sanity checks on configure.in
+case "${srctrigger}" in
+"")
+        echo '***' srctrigger not set in ${PWD=`pwd`}/configure.in.  1>&2
+        exit 1
+        ;;
+*) ;;
+esac
 
-# Produce a warning message for the subdirs we can't configure.
-# This isn't especially interesting in the Cygnus tree, but in the individual
-# FSF releases, it's important to let people know when their machine isn't
-# supported by the one or two programs in a package.
-
-if test -n "${notsupp}" && test -z "${norecursion}" ; then
-  # If $appdirs is non-empty, at least one of those directories must still
-  # be configured, or we error out.  (E.g., if the gas release supports a
-  # specified target in some subdirs but not the gas subdir, we shouldn't
-  # pretend that all is well.)
-  if test -n "$appdirs" ; then
-    for dir in $appdirs ; do
-      if test -r $dir/Makefile.in ; then
-	if echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
-	  appdirs=""
-	  break
+case "${build_alias}" in
+"")
+	if result=`${config_shell} ${configsub} ${host_alias}` ; then
+	    build_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+	    build_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+	    build_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+	    build=${build_cpu}-${build_vendor}-${build_os}
+	    build_alias=${host_alias}
 	fi
-	if echo " ${target_configdirs} " | grep " target-${dir} " >/dev/null 2>&1; then
-	  appdirs=""
-	  break
+	;;
+*)
+	if result=`${config_shell} ${configsub} ${build_alias}` ; then
+	    buildopt="--build=${build_alias}"
+	    build_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+	    build_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+	    build_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+	    build=${build_cpu}-${build_vendor}-${build_os}
+	else
+	    echo "Unrecognized build system name ${build_alias}." 1>&2
+	    exit 1
 	fi
-      fi
-    done
-    if test -n "$appdirs" ; then
-      echo "*** This configuration is not supported by this package." 1>&2
-      exit 1
-    fi
-  fi
-  # Okay, some application will build, or we don't care to check.  Still
-  # notify of subdirs not getting built.
-  echo "*** This configuration is not supported in the following subdirectories:" 1>&2
-  echo "    ${notsupp}" 1>&2
-  echo "    (Any other directories should still work fine.)" 1>&2
-fi
-
-case "$host" in
-  *msdosdjgpp*)
-    enable_gdbtk=no ;;
+	;;
 esac
 
-copy_dirs=
-
-# Check whether --with-build-sysroot or --without-build-sysroot was given.
-if test "${with_build_sysroot+set}" = set; then
-  withval="$with_build_sysroot"
-  if test x"$withval" != x ; then
-     SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
-   fi
+if result=`${config_shell} ${configsub} ${host_alias}` ; then
+    true
 else
-  SYSROOT_CFLAGS_FOR_TARGET=
-fi
-
-
-
-# Handle --with-headers=XXX.  If the value is not "yes", the contents of
-# the named directory are copied to $(tooldir)/sys-include.
-if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
-  if test x${is_cross_compiler} = xno ; then
-    echo 1>&2 '***' --with-headers is only supported when cross compiling
+    echo "Unrecognized host system name ${host_alias}." 1>&2
     exit 1
-  fi
-  if test x"${with_headers}" != xyes ; then
-    case "${exec_prefixoption}" in
-    "") x=${prefix} ;;
-    *) x=${exec_prefix} ;;
-    esac
-    copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/sys-include"
-  fi
 fi
+host_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+host=${host_cpu}-${host_vendor}-${host_os}
 
-# Handle --with-libs=XXX.  If the value is not "yes", the contents of
-# the name directories are copied to $(tooldir)/lib.  Multiple directories
-# are permitted.
-if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
-  if test x${is_cross_compiler} = xno ; then
-    echo 1>&2 '***' --with-libs is only supported when cross compiling
-    exit 1
-  fi
-  if test x"${with_libs}" != xyes ; then
-    # Copy the libraries in reverse order, so that files in the first named
-    # library override files in subsequent libraries.
-    case "${exec_prefixoption}" in
-    "") x=${prefix} ;;
-    *) x=${exec_prefix} ;;
-    esac
-    for l in ${with_libs}; do
-      copy_dirs="$l $x/${target_alias}/lib ${copy_dirs}"
-    done
-  fi
-fi
+. ${tmpfile}.hst
 
-# Set with_gnu_as and with_gnu_ld as appropriate.
-#
-# This is done by determining whether or not the appropriate directory
-# is available, and by checking whether or not specific configurations
-# have requested that this magic not happen.
-# 
-# The command line options always override the explicit settings in 
-# configure.in, and the settings in configure.in override this magic.
-#
-# If the default for a toolchain is to use GNU as and ld, and you don't 
-# want to do that, then you should use the --without-gnu-as and
-# --without-gnu-ld options for the configure script.
-
-if test x${use_gnu_as} = x &&
-   echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then
-  with_gnu_as=yes
-  extra_host_args="$extra_host_args --with-gnu-as"
-fi
-
-if test x${use_gnu_ld} = x &&
-   echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then
-  with_gnu_ld=yes
-  extra_host_args="$extra_host_args --with-gnu-ld"
-fi
-
-# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure
-# can detect this case.
-
-if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then
-  with_newlib=yes
-  extra_host_args="$extra_host_args --with-newlib"
+if result=`${config_shell} ${configsub} ${target_alias}` ; then
+    true
+else
+    echo "Unrecognized target system name ${target_alias}." 1>&2
+    exit 1
 fi
+target_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+target=${target_cpu}-${target_vendor}-${target_os}
 
-# Handle ${copy_dirs}
-set fnord ${copy_dirs}
-shift
-while test $# != 0 ; do
-  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
-    :
-  else
-    echo Copying $1 to $2
-
-    # Use the install script to create the directory and all required
-    # parent directories.
-    if test -d $2 ; then
-      :
-    else
-      echo >config.temp
-      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
-    fi
-
-    # Copy the directory, assuming we have tar.
-    # FIXME: Should we use B in the second tar?  Not all systems support it.
-    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
-
-    # It is the responsibility of the user to correctly adjust all
-    # symlinks.  If somebody can figure out how to handle them correctly
-    # here, feel free to add the code.
-
-    echo $1 > $2/COPIED
-  fi
-  shift; shift
-done
-
-# Determine a target-dependent exec_prefix that the installed
-# gcc will search in.  Keep this list sorted by triplet, with
-# the *-*-osname triplets last.
-md_exec_prefix=
-case "${target}" in
-  alpha*-*-*vms*)
-    md_exec_prefix=/gnu/lib/gcc-lib
-    ;;
-  i3456786-pc-msdosdjgpp*)
-    md_exec_prefix=/dev/env/DJDIR/bin
-    ;;
-  i3456786-*-sco3.2v5*)
-    if test $with_gnu_as = yes; then
-      md_exec_prefix=/usr/gnu/bin
-    else
-      md_exec_prefix=/usr/ccs/bin/elf
-    fi
-    ;;
-
-  mn10300-*-* | \
-  powerpc-*-chorusos* | \
-  powerpc*-*-eabi* | \
-  powerpc*-*-sysv* | \
-  powerpc*-*-kaos* | \
-  s390x-ibm-tpf*)
-    md_exec_prefix=/usr/ccs/bin
-    ;;
-  sparc64-*-elf*)
-    ;;
-  v850*-*-*)
-    md_exec_prefix=/usr/ccs/bin
-    ;;
-  xtensa-*-elf*)
-    ;;
-
-  *-*-beos* | \
-  *-*-elf* | \
-  *-*-hpux* | \
-  *-*-netware* | \
-  *-*-nto-qnx* | \
-  *-*-rtems* | \
-  *-*-solaris2* | \
-  *-*-sysv45* | \
-  *-*-vxworks* | \
-  *-wrs-windiss)
-    md_exec_prefix=/usr/ccs/bin
-    ;;
-esac
-
-extra_arflags_for_target=
-extra_nmflags_for_target=
-extra_ranlibflags_for_target=
-target_makefile_frag=/dev/null
-case "${target}" in
-  *-*-netware*)
-    target_makefile_frag="config/mt-netware"
-    ;;
-  *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
-    target_makefile_frag="config/mt-gnu"
-    ;;
-  *-*-aix4.[3456789]* | *-*-aix[56789].*)
-    # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm 
-    # commands to handle both 32-bit and 64-bit objects.  These flags are
-    # harmless if we're using GNU nm or ar.
-    extra_arflags_for_target=" -X32_64"
-    extra_nmflags_for_target=" -B -X32_64"
-    ;;
-  *-*-darwin*)
-    # ranlib from Darwin requires the -c flag to look at common symbols.
-    extra_ranlibflags_for_target=" -c"
-    ;;
-  mips*-*-pe | sh*-*-pe | *arm-wince-pe)
-    target_makefile_frag="config/mt-wince"
-    ;;
-esac
+. ${tmpfile}.tgt
 
-alphaieee_frag=/dev/null
-case $target in
-  alpha*-*-*)
-    # This just makes sure to use the -mieee option to build target libs.
-    # This should probably be set individually by each library.
-    alphaieee_frag="config/mt-alphaieee"
-    ;;
+# Find the source files, if location was not specified.
+case "${srcdir}" in
+"")
+        srcdirdefaulted=1
+        srcdir=.
+        if [ ! -r ${srctrigger} ] ; then
+                srcdir=..
+        fi
+        ;;
+*) ;;
 esac
 
-# If --enable-target-optspace always use -Os instead of -O2 to build
-# the target libraries, similarly if it is not specified, use -Os
-# on selected platforms.
-ospace_frag=/dev/null
-case "${enable_target_optspace}:${target}" in
-  yes:*)
-    ospace_frag="config/mt-ospace"
-    ;;
-  :d30v-*)
-    ospace_frag="config/mt-d30v"
-    ;;
-  :m32r-* | :d10v-* | :fr30-*)
-    ospace_frag="config/mt-ospace"
-    ;;
-  no:* | :*)
-    ;;
-  *)
-    echo "*** bad value \"${enable_target_optspace}\" for --enable-target-optspace flag; ignored" 1>&2
-    ;;
-esac
+if [ ! -r ${srcdir}/${srctrigger} ] ; then
+        case "${srcdirdefaulted}" in
+        "") echo '***' "${progname}: Can't find ${srcname} sources in ${PWD=`pwd`}/${srcdir}" 1>&2 ;;
+        *)  echo '***' "${progname}: Can't find ${srcname} sources in ${PWD=`pwd`}/. or ${PWD=`pwd`}/.." 1>&2 ;;
+        esac
 
-# Default to using --with-stabs for certain targets.
-if test x${with_stabs} = x ; then
-  case "${target}" in
-  mips*-*-irix[56]*)
-    ;;
-  mips*-*-* | alpha*-*-osf*)
-    with_stabs=yes;
-    extra_host_args="${extra_host_args} --with-stabs"
-    ;;
-  esac
+        echo '***' \(At least ${srctrigger} is missing.\) 1>&2
+        exit 1
 fi
 
-# hpux11 in 64bit mode has libraries in a weird place.  Arrange to find
-# them automatically.
-case "${host}" in
-  hppa*64*-*-hpux11*)	
-    extra_host_args="$extra_host_args -x-libraries=/usr/lib/pa20_64 -x-includes=/usr/X11R6/include"
-    ;;
-esac
-
 # Some systems (e.g., one of the i386-aix systems the gas testers are
 # using) don't handle "\$" correctly, so don't use it here.
-tooldir='${exec_prefix}'/${target_alias}
-build_tooldir=${tooldir}
-
-# Create a .gdbinit file which runs the one in srcdir
-# and tells GDB to look there for source files.
-
-if test -r ${srcdir}/.gdbinit ; then
-  case ${srcdir} in
-    .) ;;
-    *) cat > ./.gdbinit <<EOF
-# ${NO_EDIT}
-dir ${srcdir}
-dir .
-source ${srcdir}/.gdbinit
-EOF
-    ;;
-  esac
-fi
-
-# Make sure that the compiler is able to generate an executable.  If it
-# can't, we are probably in trouble.  We don't care whether we can run the
-# executable--we might be using a cross compiler--we only care whether it
-# can be created.  At this point the main configure script has set CC.
-we_are_ok=no
-echo "int main () { return 0; }" > conftest.c
-${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c
-if test $? = 0 ; then
-  if test -s conftest || test -s conftest.exe ; then
-    we_are_ok=yes
-  fi
-fi 
-case $we_are_ok in
-  no)
-    echo 1>&2 "*** The command '${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c' failed."
-    echo 1>&2 "*** You must set the environment variable CC to a working compiler."
-    rm -f conftest*
-    exit 1
-    ;;
-esac
-rm -f conftest*
-
-# The Solaris /usr/ucb/cc compiler does not appear to work.
-case "${host}" in
-  sparc-sun-solaris2*)
-      CCBASE="`echo ${CC-cc} | sed 's/ .*$//'`"
-      if test "`type $CCBASE | sed 's/^[^/]*//'`" = "/usr/ucb/cc" ; then
-          could_use=
-          test -d /opt/SUNWspro/bin && could_use="/opt/SUNWspro/bin"
-          if test -d /opt/cygnus/bin ; then
-              if test "$could_use" = "" ; then
-                  could_use="/opt/cygnus/bin"
-              else
-                  could_use="$could_use or /opt/cygnus/bin"
-              fi
-          fi
-        if test "$could_use" = "" ; then
-            echo "Warning: compilation may fail because you're using"
-            echo "/usr/ucb/cc.  You should change your PATH or CC "
-            echo "variable and rerun configure."
-        else
-            echo "Warning: compilation may fail because you're using"
-            echo "/usr/ucb/cc, when you should use the C compiler from"
-            echo "$could_use.  You should change your"
-            echo "PATH or CC variable and rerun configure."
+tooldir='$(exec_prefix)'/${target_alias}
+
+if [ "${host_alias}" != "${target_alias}" ] ; then
+    if [ "${program_prefixoption}" = "" ] ; then
+        if [ "${program_suffixoption}" = "" ] ; then 
+            if [ "${program_transform_nameoption}" = "" ] ; then
+                program_prefix=${target_alias}- ;
+            fi
         fi
-      fi
-  ;;
-esac
-
-case "${host}" in
-  *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
-  *-*-darwin* | *-*-rhapsody* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
-  *) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
-esac
-
-# Record target_configdirs and the configure arguments for target and
-# build configuration in Makefile.
-target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
-build_configdirs=`echo "${build_configdirs}" | sed -e 's/build-//g'`
-
-# Determine whether gdb needs tk/tcl or not.
-# Use 'maybe' since enable_gdbtk might be true even if tk isn't available
-# and in that case we want gdb to be built without tk.  Ugh!
-# In fact I believe gdb is the *only* package directly dependent on tk,
-# so we should be able to put the 'maybe's in unconditionally and
-# leave out the maybe dependencies when enable_gdbtk is false.  I'm not
-# 100% sure that that's safe though.
-
-gdb_tk="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-libgui"
-case "$enable_gdbtk" in
-  no)
-    GDB_TK="" ;;
-  yes)
-    GDB_TK="${gdb_tk}" ;;
-  *)
-    # Only add the dependency on gdbtk when GDBtk is part of the gdb
-    # distro.  Eventually someone will fix this and move Insight, nee
-    # gdbtk to a separate directory.
-    if test -d ${srcdir}/gdb/gdbtk ; then
-      GDB_TK="${gdb_tk}"
-    else
-      GDB_TK=""
     fi
-    ;;
-esac
-CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
-INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
-
-# Strip out unwanted targets.
-
-# While at that, we remove Makefiles if we were started for recursive
-# configuration, so that the top-level Makefile reconfigures them,
-# like we used to do when configure itself was recursive.
-
-# Loop over modules.  $extrasub must be used with care, limiting as
-# much as possible the usage of range addresses.  That's because autoconf
-# splits the sed script to overcome limits in the number of commands,
-# and relying on carefully-timed sed passes may turn out to be very hard
-# to maintain later.  In this particular case, you just have to be careful
-# not to nest @if/@endif pairs, because configure will not warn you at all.
-
-# Check whether --enable-bootstrap or --disable-bootstrap was given.
-if test "${enable_bootstrap+set}" = set; then
-  enableval="$enable_bootstrap"
-  :
-else
-  enable_bootstrap=default
 fi
 
-
-# Issue errors and warnings for invalid/strange bootstrap combinations.
-case "$configdirs" in
-  *gcc*) have_compiler=yes ;;
-  *) have_compiler=no ;;
-esac
-
-case "$have_compiler:$host:$target:$enable_bootstrap" in
-  *:*:*:no) ;;
-
-  # Default behavior.  Enable bootstrap if we have a compiler
-  # and we are in a native configuration.
-  yes:$build:$build:default)
-    enable_bootstrap=yes ;;
-
-  *:*:*:default)
-    enable_bootstrap=no ;;
-
-  # We have a compiler and we are in a native configuration, bootstrap is ok
-  yes:$build:$build:yes)
-    ;;
-
-  # Other configurations, but we have a compiler.  Assume the user knows
-  # what he's doing.
-  yes:*:*:yes)
-    echo "configure: warning: trying to bootstrap a cross compiler" 1>&2
-    ;;
-
-  # No compiler: if they passed --enable-bootstrap explicitly, fail
-  no:*:*:yes)
-    { echo "configure: error: cannot bootstrap without a compiler" 1>&2; exit 1; } ;;
-
-  # Fail if wrong command line
-  *)
-    { echo "configure: error: invalid option for --enable-bootstrap" 1>&2; exit 1; }
-    ;;
-esac
-
-# Adjust the toplevel makefile according to whether bootstrap was selected.
-case "$enable_bootstrap" in
-  yes)
-    bootstrap_suffix=bootstrap ;;
-  no)
-    bootstrap_suffix=no-bootstrap ;;
-esac
-
-for module in ${build_configdirs} ; do
-  if test -z "${no_recursion}" \
-     && test -f ${build_subdir}/${module}/Makefile; then
-    echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
-    rm -f ${build_subdir}/${module}/Makefile
-  fi
-  extrasub="$extrasub
-/^@if build-$module\$/d
-/^@endif build-$module\$/d
-/^@if build-$module-$bootstrap_suffix\$/d
-/^@endif build-$module-$bootstrap_suffix\$/d"
-done
-for module in ${configdirs} ; do
-  if test -z "${no_recursion}"; then
-    for file in stage*-${module}/Makefile ${module}/Makefile; do
-      if test -f ${file}; then
-	echo 1>&2 "*** removing ${file} to force reconfigure"
-	rm -f ${file}
-      fi
-    done
-  fi
-  extrasub="$extrasub
-/^@if $module\$/d
-/^@endif $module\$/d
-/^@if $module-$bootstrap_suffix\$/d
-/^@endif $module-$bootstrap_suffix\$/d"
-done
-for module in ${target_configdirs} ; do
-  if test -z "${no_recursion}" \
-     && test -f ${target_subdir}/${module}/Makefile; then
-    echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
-    rm -f ${target_subdir}/${module}/Makefile
-  fi
-  extrasub="$extrasub
-/^@if target-$module\$/d
-/^@endif target-$module\$/d
-/^@if target-$module-$bootstrap_suffix\$/d
-/^@endif target-$module-$bootstrap_suffix\$/d"
-done
-
-extrasub="$extrasub
-/^@if /,/^@endif /d"
-
-# Create the serialization dependencies.  This uses a temporary file.
-
-# Check whether --enable-serial-configure or --disable-serial-configure was given.
-if test "${enable_serial_configure+set}" = set; then
-  enableval="$enable_serial_configure"
-  :
-fi
-
-
-case ${enable_serial_configure} in
-  yes)
-    enable_serial_build_configure=yes
-    enable_serial_host_configure=yes
-    enable_serial_target_configure=yes
-    ;;
-esac
-
-# These force 'configure's to be done one at a time, to avoid problems
-# with contention over a shared config.cache.
-rm -f serdep.tmp
-echo '# serdep.tmp' > serdep.tmp
-olditem=
-test "x${enable_serial_build_configure}" = xyes &&
-for item in ${build_configdirs} ; do
-  case ${olditem} in
-    "") ;;
-    *) echo "configure-build-${item}: configure-build-${olditem}" >> serdep.tmp ;;
-  esac
-  olditem=${item}
-done
-olditem=
-test "x${enable_serial_host_configure}" = xyes &&
-for item in ${configdirs} ; do
-  case ${olditem} in
-    "") ;;
-    *) echo "configure-${item}: configure-${olditem}" >> serdep.tmp ;;
-  esac
-  olditem=${item}
-done
-olditem=
-test "x${enable_serial_target_configure}" = xyes &&
-for item in ${target_configdirs} ; do
-  case ${olditem} in
-    "") ;;
-    *) echo "configure-target-${item}: configure-target-${olditem}" >> serdep.tmp ;;
-  esac
-  olditem=${item}
-done
-serialization_dependencies=serdep.tmp
-
-
-# Base args.  Strip norecursion, cache-file, srcdir, host, build,
-# target and nonopt.  These are the ones we might not want to pass
-# down to subconfigures.  Also strip program-prefix, program-suffix,
-# and program-transform-name, so that we can pass down a consistent
-# program-transform-name.  If autoconf has put single quotes around
-# any of these arguments (because they contain shell metacharacters)
-# then this will fail; in practice this only happens for
-# --program-transform-name, so be sure to override --program-transform-name
-# at the end of the argument list.
-# These will be expanded by make, so quote '$'.
-cat <<\EOF_SED > conftestsed
-s/ --no[^ ]*/ /g
-s/ --c[a-z-]*[= ][^ ]*//g
-s/ --sr[a-z-]*[= ][^ ]*//g
-s/ --ho[a-z-]*[= ][^ ]*//g
-s/ --bu[a-z-]*[= ][^ ]*//g
-s/ --t[a-z-]*[= ][^ ]*//g
-s/ --program-[pst][a-z-]*[= ][^ ]*//g
-s/ -cache-file[= ][^ ]*//g
-s/ -srcdir[= ][^ ]*//g
-s/ -host[= ][^ ]*//g
-s/ -build[= ][^ ]*//g
-s/ -target[= ][^ ]*//g
-s/ -program-prefix[= ][^ ]*//g
-s/ -program-suffix[= ][^ ]*//g
-s/ -program-transform-name[= ][^ ]*//g
-s/ [^' -][^ ]* / /
-s/^ *//;s/ *$//
-s,\$,$$,g
-EOF_SED
-sed -f conftestsed <<EOF_SED > conftestsed.out
- ${ac_configure_args} 
-EOF_SED
-baseargs=`cat conftestsed.out`
-rm -f conftestsed conftestsed.out
-
-# Add in --program-transform-name, after --program-prefix and
-# --program-suffix have been applied to it.  Autoconf has already
-# doubled dollar signs and backslashes in program_transform_name; we want
-# the backslashes un-doubled, and then the entire thing wrapped in single
-# quotes, because this will be expanded first by make and then by the shell. 
-# Also, because we want to override the logic in subdir configure scripts to
-# choose program_transform_name, replace any s,x,x, with s,y,y,.
-sed -e "s,\\\\\\\\,\\\\,g; s,','\\\\'',g; s/s,x,x,/s,y,y,/" <<EOF_SED > conftestsed.out
-${program_transform_name}
-EOF_SED
-gcc_transform_name=`cat conftestsed.out`
-rm -f conftestsed.out
-baseargs="$baseargs --program-transform-name='${gcc_transform_name}'"
-
-# For the build-side libraries, we just need to pretend we're native,
-# and not use the same cache file.  Multilibs are neither needed nor
-# desired.
-build_configargs="--cache-file=../config.cache --build=${build_alias} --host=${build_alias} --target=${target_alias} ${baseargs}"
-
-# For host modules, accept cache file option, or specification as blank.
-case "${cache_file}" in
-"") # empty
-  cache_file_option="" ;;
-/* | [A-Za-z]:[\\/]* ) # absolute path
-  cache_file_option="--cache-file=${cache_file}" ;;
-*) # relative path
-  cache_file_option="--cache-file=../${cache_file}" ;;
-esac
-
-# Host dirs don't like to share a cache file either, horribly enough.
-# This seems to be due to autoconf 2.5x stupidity.
-host_configargs="--cache-file=./config.cache --build=${build_alias} --host=${host_alias} --target=${target_alias} ${extra_host_args} ${baseargs}"
-
-target_configargs=${baseargs}
-
-# Passing a --with-cross-host argument lets the target libraries know
-# whether they are being built with a cross-compiler or being built
-# native.  However, it would be better to use other mechanisms to make the
-# sorts of decisions they want to make on this basis.  Please consider
-# this option to be deprecated.  FIXME.
-if test x${is_cross_compiler} = xyes ; then
-  target_configargs="--with-cross-host=${host_alias} ${target_configargs}"
-fi
-
-# Default to --enable-multilib.
-if test x${enable_multilib} = x ; then
-  target_configargs="--enable-multilib ${target_configargs}"
-fi
-
-# Pass --with-newlib if appropriate.  Note that target_configdirs has
-# changed from the earlier setting of with_newlib.
-if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " newlib " > /dev/null 2>&1 && test -d ${srcdir}/newlib ; then
-  target_configargs="--with-newlib ${target_configargs}"
-fi
-
-# Different target subdirs use different values of certain variables
-# (notably CXX).  Worse, multilibs use *lots* of different values.
-# Worse yet, autoconf 2.5x makes some of these 'precious', meaning that
-# it doesn't automatically accept command-line overrides of them.
-# This means it's not safe for target subdirs to share a cache file,
-# which is disgusting, but there you have it.  Hopefully this can be
-# fixed in future.  It's still worthwhile to use a cache file for each
-# directory.  I think.
-
-# Pass the appropriate --build, --host, --target and --cache-file arguments.
-# We need to pass --target, as newer autoconf's requires consistency
-# for target_alias and gcc doesn't manage it consistently.
-target_configargs="--cache-file=./config.cache --build=${build_alias} --host=${target_alias} --target=${target_alias} ${target_configargs}"
-
-FLAGS_FOR_TARGET=
-case " $target_configdirs " in
- *" newlib "*)
-  case " $target_configargs " in
-  *" --with-newlib "*)
-   case "$target" in
-   *-cygwin*)
-     FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/include -isystem $$s/winsup/cygwin/include -isystem $$s/winsup/w32api/include' ;;
-   esac
-
-   # If we're not building GCC, don't discard standard headers.
-   if test -d ${srcdir}/gcc; then
-     FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -nostdinc'
-
-     if test "${build}" != "${host}"; then
-       # On Canadian crosses, CC_FOR_TARGET will have already been set
-       # by `configure', so we won't have an opportunity to add -Bgcc/
-       # to it.  This is right: we don't want to search that directory
-       # for binaries, but we want the header files in there, so add
-       # them explicitly.
-       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include'
-
-       # Someone might think of using the pre-installed headers on
-       # Canadian crosses, in case the installed compiler is not fully
-       # compatible with the compiler being built.  In this case, it
-       # would be better to flag an error than risking having
-       # incompatible object files being constructed.  We can't
-       # guarantee that an error will be flagged, but let's hope the
-       # compiler will do it, when presented with incompatible header
-       # files.
-     fi
-   fi
-
-   case "${target}-${is_cross_compiler}" in
-   i[3456789]86-*-linux*-no)
-      # Here host == target, so we don't need to build gcc,
-      # so we don't want to discard standard headers.
-      FLAGS_FOR_TARGET=`echo " $FLAGS_FOR_TARGET " | sed -e 's/ -nostdinc / /'`
-      ;;
-   *)
-      # If we're building newlib, use its generic headers last, but search
-      # for any libc-related directories first (so make it the last -B
-      # switch).
-      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/newlib/ -isystem $$r/$(TARGET_SUBDIR)/newlib/targ-include -isystem $$s/newlib/libc/include'
-      ;;
-   esac
-   ;;
-  esac
-  ;;
-esac
-
-# Allow the user to override the flags for
-# our build compiler if desired.
-CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
-
-# On Canadian crosses, we'll be searching the right directories for
-# the previously-installed cross compiler, so don't bother to add
-# flags for directories within the install tree of the compiler
-# being built; programs in there won't even run.
-if test "${build}" = "${host}" && test -d ${srcdir}/gcc; then
-  # Search for pre-installed headers if nothing else fits.
-  FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -isystem $(build_tooldir)/include -isystem $(build_tooldir)/sys-include'
+# Merge program_prefix and program_suffix onto program_transform_name.
+# (program_suffix used to use $, but it's hard to preserve $ through both
+# make and sh.)
+if [ "${program_suffix}" != "" ] ; then
+    program_transform_name="-e s,\\\\(.*\\\\),\\\\1${program_suffix}, ${program_transform_name}"
 fi
 
-if test "x${use_gnu_ld}" = x &&
-   echo " ${configdirs} " | grep " ld " > /dev/null ; then
-  # Arrange for us to find uninstalled linker scripts.
-  FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(HOST_SUBDIR)/ld'
-fi
-
-# Makefile fragments.
-for frag in host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag;
-do
-  eval fragval=\$$frag
-  if test $fragval != /dev/null; then
-    eval $frag=${srcdir}/$fragval
-  fi
-done
-
-
-
-
-
-# Miscellanea: directories, flags, etc.
-
-
-
-
-
-
-
-# Build module lists & subconfigure args.
-
-
-
-# Host module lists & subconfigure args.
-
-
-
-# Target module lists & subconfigure args.
-
-
-
-# Build tools.
-
-
-
-# Generate default definitions for YACC, M4, LEX and other programs that run
-# on the build machine.  These are used if the Makefile can't locate these
-# programs in objdir.
-MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
-
-for ac_prog in 'bison -y' byacc yacc
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3401: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YACC="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YACC="$ac_cv_prog_YACC"
-if test -n "$YACC"; then
-  echo "$ac_t""$YACC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+if [ "${program_prefix}" != "" ] ; then
+    program_transform_name="-e s,^,${program_prefix}, ${program_transform_name}"
 fi
 
-test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="$MISSING bison -y"
-
-case " $build_configdirs " in
-  *" bison "*) YACC='$$r/$(BUILD_SUBDIR)/bison/tests/bison -y' ;;
-  *" byacc "*) YACC='$$r/$(BUILD_SUBDIR)/byacc/byacc' ;;
-esac
-
-for ac_prog in bison
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3441: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$BISON"; then
-  ac_cv_prog_BISON="$BISON" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_BISON="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-BISON="$ac_cv_prog_BISON"
-if test -n "$BISON"; then
-  echo "$ac_t""$BISON" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+# If CC and CXX are not set in the environment, and the Makefile
+# exists, try to extract them from it.  This is to handle running
+# ./config.status by hand.
+if [ -z "${CC}" ] && [ -r Makefile ]; then
+  sed -n -e ':loop
+/\\$/ N
+s/\\\n//g
+t loop
+/^CC[ 	]*=/ s/CC[ 	]*=[ 	]*\(.*\)/\1/p' < Makefile > Makefile.cc
+  CC=`tail -1 Makefile.cc`
+  rm -f Makefile.cc
 fi
 
-test -n "$BISON" && break
-done
-test -n "$BISON" || BISON="$MISSING bison"
-
-case " $build_configdirs " in
-  *" bison "*) BISON='$$r/$(BUILD_SUBDIR)/bison/tests/bison' ;;
-esac
-
-for ac_prog in gm4 gnum4 m4
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3480: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$M4"; then
-  ac_cv_prog_M4="$M4" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_M4="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
+if [ -z "${CFLAGS}" ] && [ -r Makefile ]; then
+  sed -n -e ':loop
+/\\$/ N
+s/\\\n//g
+t loop
+/^CFLAGS[ 	]*=/ s/CFLAGS[ 	]*=[ 	]*\(.*\)/\1/p' < Makefile > Makefile.cc
+  CFLAGS=`tail -1 Makefile.cc`
+  rm -f Makefile.cc
 fi
-M4="$ac_cv_prog_M4"
-if test -n "$M4"; then
-  echo "$ac_t""$M4" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$M4" && break
-done
-test -n "$M4" || M4="$MISSING m4"
 
-case " $build_configdirs " in
-  *" m4 "*) M4='$$r/$(BUILD_SUBDIR)/m4/m4' ;;
-esac
-
-for ac_prog in flex lex
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3519: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+if [ -z "${CXX}" ] && [ -r Makefile ]; then
+  sed -n -e ':loop
+/\\$/ N
+s/\\\n//g
+t loop
+/^CXX[ 	]*=/ s/CXX[ 	]*=[ 	]*\(.*\)/\1/p' < Makefile > Makefile.cc
+  CXX=`tail -1 Makefile.cc`
+  rm -f Makefile.cc
 fi
-fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$LEX" && break
-done
-test -n "$LEX" || LEX="$MISSING flex"
-
-case " $build_configdirs " in
-  *" flex "*) LEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;;
-  *" lex "*) LEX='$$r/$(BUILD_SUBDIR)/lex/lex' ;;
-esac
 
-for ac_prog in flex
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3559: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$FLEX"; then
-  ac_cv_prog_FLEX="$FLEX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_FLEX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-FLEX="$ac_cv_prog_FLEX"
-if test -n "$FLEX"; then
-  echo "$ac_t""$FLEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+if [ -z "${CXXFLAGS}" ] && [ -r Makefile ]; then
+  sed -n -e ':loop
+/\\$/ N
+s/\\\n//g
+t loop
+/^CXXFLAGS[ 	]*=/ s/CXXFLAGS[ 	]*=[ 	]*\(.*\)/\1/p' < Makefile > Makefile.cc
+  CXXFLAGS=`tail -1 Makefile.cc`
+  rm -f Makefile.cc
 fi
 
-test -n "$FLEX" && break
-done
-test -n "$FLEX" || FLEX="$MISSING flex"
-
-case " $build_configdirs " in
-  *" flex "*) FLEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;;
-esac
+# Generate a default definition for YACC.  This is used if the makefile can't
+# locate bison or byacc in objdir.
 
-for ac_prog in makeinfo
+for prog in 'bison -y' byacc yacc
 do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3598: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$MAKEINFO"; then
-  ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_MAKEINFO="$ac_prog"
+  set dummy $prog; tmp=$2
+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+  for dir in $PATH; do
+    test -z "$dir" && dir=.
+    if test -f $dir/$tmp; then
+      DEFAULT_YACC="$prog"
       break
     fi
   done
-  IFS="$ac_save_ifs"
-fi
-fi
-MAKEINFO="$ac_cv_prog_MAKEINFO"
-if test -n "$MAKEINFO"; then
-  echo "$ac_t""$MAKEINFO" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+  IFS="$save_ifs"
 
-test -n "$MAKEINFO" && break
+  test -n "$DEFAULT_YACC" && break
 done
-test -n "$MAKEINFO" || MAKEINFO="$MISSING makeinfo"
-
-case " $build_configdirs " in
-  *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
-  *)
-
-    # For an installed makeinfo, we require it to be from texinfo 4.2 or
-    # higher, else we use the "missing" dummy.
-    if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
-      :
-    else
-      MAKEINFO="$MISSING makeinfo"
-    fi
-    ;;
-
-esac
 
-# FIXME: expect and dejagnu may become build tools?
+# Generate a default definition for M4.  This is used if the makefile can't
+# locate m4 in objdir.
 
-for ac_prog in expect
+for prog in gm4 gnum4 m4
 do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3651: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_EXPECT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$EXPECT"; then
-  ac_cv_prog_EXPECT="$EXPECT" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_EXPECT="$ac_prog"
+  set dummy $prog; tmp=$2
+  IFS="${IFS=   }"; save_ifs="$IFS"; IFS="${IFS}:"
+  for dir in $PATH; do
+    test -z "$dir" && dir=.
+    if test -f $dir/$tmp; then
+      DEFAULT_M4="$prog"
       break
     fi
   done
-  IFS="$ac_save_ifs"
-fi
-fi
-EXPECT="$ac_cv_prog_EXPECT"
-if test -n "$EXPECT"; then
-  echo "$ac_t""$EXPECT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+  IFS="$save_ifs"
 
-test -n "$EXPECT" && break
+  test -n "$DEFAULT_M4" && break
 done
-test -n "$EXPECT" || EXPECT="expect"
 
-case " $configdirs " in
-  *" expect "*)
-    test $host = $build && EXPECT='$$r/$(HOST_SUBDIR)/expect/expect'
-    ;;
-esac
+# Generate a default definition for LEX.  This is used if the makefile can't
+# locate flex in objdir.
 
-for ac_prog in runtest
+for prog in flex lex
 do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3692: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RUNTEST'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RUNTEST"; then
-  ac_cv_prog_RUNTEST="$RUNTEST" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RUNTEST="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RUNTEST="$ac_cv_prog_RUNTEST"
-if test -n "$RUNTEST"; then
-  echo "$ac_t""$RUNTEST" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$RUNTEST" && break
-done
-test -n "$RUNTEST" || RUNTEST="runtest"
-
-case " $configdirs " in
-  *" dejagnu "*)
-    test $host = $build && RUNTEST='$$r/$(HOST_SUBDIR)/dejagnu/runtest'
-    ;;
-esac
-
-
-# Host tools.
-ncn_tool_prefix=
-test -n "$host_alias" && ncn_tool_prefix=$host_alias-
-ncn_target_tool_prefix=
-test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
-
- for ncn_progname in ar; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3740: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  fi
-  if test -z "$ac_cv_prog_AR" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3771: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-  fi
-  test -n "$ac_cv_prog_AR" && break
-done
-
-if test -z "$ac_cv_prog_AR" ; then
-  set dummy ar
-  if test $build = $host ; then
-    AR="$2"
-  else
-    AR="${ncn_tool_prefix}$2"
-  fi
-fi
-
- for ncn_progname in as; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3815: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  fi
-  if test -z "$ac_cv_prog_AS" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3846: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-  fi
-  test -n "$ac_cv_prog_AS" && break
-done
-
-if test -z "$ac_cv_prog_AS" ; then
-  set dummy as
-  if test $build = $host ; then
-    AS="$2"
-  else
-    AS="${ncn_tool_prefix}$2"
-  fi
-fi
-
- for ncn_progname in dlltool; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3890: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  fi
-  if test -z "$ac_cv_prog_DLLTOOL" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3921: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-  fi
-  test -n "$ac_cv_prog_DLLTOOL" && break
-done
-
-if test -z "$ac_cv_prog_DLLTOOL" ; then
-  set dummy dlltool
-  if test $build = $host ; then
-    DLLTOOL="$2"
-  else
-    DLLTOOL="${ncn_tool_prefix}$2"
-  fi
-fi
-
- for ncn_progname in ld; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3965: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LD="$ac_cv_prog_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  fi
-  if test -z "$ac_cv_prog_LD" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3996: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LD="$ac_cv_prog_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-  fi
-  test -n "$ac_cv_prog_LD" && break
-done
-
-if test -z "$ac_cv_prog_LD" ; then
-  set dummy ld
-  if test $build = $host ; then
-    LD="$2"
-  else
-    LD="${ncn_tool_prefix}$2"
-  fi
-fi
-
- for ncn_progname in lipo; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4040: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LIPO="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LIPO="$ac_cv_prog_LIPO"
-if test -n "$LIPO"; then
-  echo "$ac_t""$LIPO" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  fi
-  if test -z "$ac_cv_prog_LIPO" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4071: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LIPO'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LIPO="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LIPO="$ac_cv_prog_LIPO"
-if test -n "$LIPO"; then
-  echo "$ac_t""$LIPO" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-  fi
-  test -n "$ac_cv_prog_LIPO" && break
-done
-
-if test -z "$ac_cv_prog_LIPO" ; then
-  set dummy lipo
-  if test $build = $host ; then
-    LIPO="$2"
-  else
-    LIPO="${ncn_tool_prefix}$2"
-  fi
-fi
-
- for ncn_progname in nm; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4115: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-NM="$ac_cv_prog_NM"
-if test -n "$NM"; then
-  echo "$ac_t""$NM" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  fi
-  if test -z "$ac_cv_prog_NM" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4146: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-NM="$ac_cv_prog_NM"
-if test -n "$NM"; then
-  echo "$ac_t""$NM" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-  fi
-  test -n "$ac_cv_prog_NM" && break
-done
-
-if test -z "$ac_cv_prog_NM" ; then
-  set dummy nm
-  if test $build = $host ; then
-    NM="$2"
-  else
-    NM="${ncn_tool_prefix}$2"
-  fi
-fi
-
- for ncn_progname in ranlib; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4190: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  fi
-  if test -z "$ac_cv_prog_RANLIB" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4221: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-  fi
-  test -n "$ac_cv_prog_RANLIB" && break
-done
-
-if test -z "$ac_cv_prog_RANLIB" ; then
-  RANLIB=":"
-fi
-
- for ncn_progname in strip; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4260: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  fi
-  if test -z "$ac_cv_prog_STRIP" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4291: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-  fi
-  test -n "$ac_cv_prog_STRIP" && break
-done
-
-if test -z "$ac_cv_prog_STRIP" ; then
-  STRIP=":"
-fi
-
- for ncn_progname in windres; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4330: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-WINDRES="$ac_cv_prog_WINDRES"
-if test -n "$WINDRES"; then
-  echo "$ac_t""$WINDRES" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  fi
-  if test -z "$ac_cv_prog_WINDRES" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4361: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-WINDRES="$ac_cv_prog_WINDRES"
-if test -n "$WINDRES"; then
-  echo "$ac_t""$WINDRES" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-  fi
-  test -n "$ac_cv_prog_WINDRES" && break
-done
-
-if test -z "$ac_cv_prog_WINDRES" ; then
-  set dummy windres
-  if test $build = $host ; then
-    WINDRES="$2"
-  else
-    WINDRES="${ncn_tool_prefix}$2"
-  fi
-fi
-
- for ncn_progname in objcopy; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4405: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJCOPY"; then
-  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJCOPY="${ncn_tool_prefix}${ncn_progname}"
+  set dummy $prog; tmp=$2
+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+  for dir in $PATH; do
+    test -z "$dir" && dir=.
+    if test -f $dir/$tmp; then
+      DEFAULT_LEX="$prog"
       break
     fi
   done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJCOPY="$ac_cv_prog_OBJCOPY"
-if test -n "$OBJCOPY"; then
-  echo "$ac_t""$OBJCOPY" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+  IFS="$save_ifs"
 
-  fi
-  if test -z "$ac_cv_prog_OBJCOPY" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4436: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJCOPY"; then
-  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJCOPY="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJCOPY="$ac_cv_prog_OBJCOPY"
-if test -n "$OBJCOPY"; then
-  echo "$ac_t""$OBJCOPY" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-  fi
-  test -n "$ac_cv_prog_OBJCOPY" && break
+  test -n "$DEFAULT_LEX" && break
 done
 
-if test -z "$ac_cv_prog_OBJCOPY" ; then
-  set dummy objcopy
-  if test $build = $host ; then
-    OBJCOPY="$2"
-  else
-    OBJCOPY="${ncn_tool_prefix}$2"
-  fi
-fi
-
- for ncn_progname in objdump; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4480: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="${ncn_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  fi
-  if test -z "$ac_cv_prog_OBJDUMP" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4511: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-  fi
-  test -n "$ac_cv_prog_OBJDUMP" && break
-done
-
-if test -z "$ac_cv_prog_OBJDUMP" ; then
-  set dummy objdump
-  if test $build = $host ; then
-    OBJDUMP="$2"
-  else
-    OBJDUMP="${ncn_tool_prefix}$2"
-  fi
-fi
-
-
-
-
-
-
-
-# Target tools.
-# Check whether --with-build-time-tools or --without-build-time-tools was given.
-if test "${with_build_time_tools+set}" = set; then
-  withval="$with_build_time_tools"
-  case x"$withval" in
-     x/*) ;;
-     *)
-       with_build_time_tools=
-       echo "configure: warning: argument to --with-build-time-tools must be an absolute path" 1>&2
-       ;;
-   esac
-else
-  with_build_time_tools=
-fi
-
+if [ "${build}" != "${host}" ]; then
+  # If we are doing a Canadian Cross, in which the host and build systems
+  # are not the same, we set reasonable default values for the tools.
 
- if test -n "$with_build_time_tools"; then
-  for ncn_progname in cc gcc; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4575: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_CC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
+  tools="AR AR_FOR_TARGET AS AS_FOR_TARGET BISON CC_FOR_BUILD"
+  tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET"
+  tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET HOST_PREFIX"
+  tools="${tools} HOST_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"
+  tools="${tools} NM_FOR_TARGET RANLIB RANLIB_FOR_TARGET"
+  tools="${tools} WINDRES WINDRES_FOR_TARGET YACC"
+  tools="${tools} OBJCOPY OBJDUMP"
+
+  for var in ${tools}; do
+    if eval [ -z \"\$${var}\" ] && [ -r Makefile ]; then
+      sed -n -e ':loop
+/\\$/ N
+s/\\\n//g
+t loop
+/^'"${var}"'[ 	]*=/ s/'"${var}"'[ 	]*=[ 	]*\(.*\)/\1/p' \
+	< Makefile > Makefile.v
+      t=`tail -1 Makefile.v`
+      if [ -n "${t}" ]; then
+	eval "${var}=\${t}"
+      fi
+      rm -f Makefile.v
     fi
   done
-fi
 
-if test -z "$ac_cv_prog_CC_FOR_TARGET"; then
-  for ncn_progname in cc gcc; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4592: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC_FOR_TARGET"; then
-  ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET"
-if test -n "$CC_FOR_TARGET"; then
-  echo "$ac_t""$CC_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_CC_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4623: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC_FOR_TARGET"; then
-  ac_cv_prog_CC_FOR_TARGET="$CC_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET"
-if test -n "$CC_FOR_TARGET"; then
-  echo "$ac_t""$CC_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
+  AR=${AR-${host_alias}-ar}
+  AR_FOR_TARGET=${AR_FOR_TARGET-${target_alias}-ar}
+  AS=${AS-${host_alias}-as}
+  AS_FOR_TARGET=${AS_FOR_TARGET-${target_alias}-as}
+  BISON=${BISON-bison}
+  CC=${CC-${host_alias}-gcc}
+  CFLAGS=${CFLAGS-"-g -O2"}
+  CXX=${CXX-${host_alias}-c++}
+  CXXFLAGS=${CXXFLAGS-"-g -O2"}
+  CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
+  CC_FOR_TARGET=${CC_FOR_TARGET-${target_alias}-gcc}
+  CXX_FOR_TARGET=${CXX_FOR_TARGET-${target_alias}-c++}
+  DLLTOOL=${DLLTOOL-${host_alias}-dlltool}
+  DLLTOOL_FOR_TARGET=${DLLTOOL_FOR_TARGET-${target_alias}-dlltool}
+  GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}}
+  HOST_PREFIX=${build_alias}-
+  HOST_PREFIX_1=${build_alias}-
+  LD=${LD-${host_alias}-ld}
+  LD_FOR_TARGET=${LD_FOR_TARGET-${target_alias}-ld}
+  MAKEINFO=${MAKEINFO-makeinfo}
+  NM=${NM-${host_alias}-nm}
+  NM_FOR_TARGET=${NM_FOR_TARGET-${target_alias}-nm}
+  RANLIB=${RANLIB-${host_alias}-ranlib}
+  RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET-${target_alias}-ranlib}
+  WINDRES=${WINDRES-${host_alias}-windres}
+  WINDRES_FOR_TARGET=${WINDRES_FOR_TARGET-${target_alias}-windres}
+  OBJCOPY=${OBJCOPY-${host_alias}-objcopy}
+  OBJDUMP=${OBJDUMP-${host_alias}-objdump}
+
+  if [ -z "${YACC}" ]; then
+    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+    for dir in $PATH; do
+      test -z "$dir" && dir=.
+      if test -f $dir/bison; then
+	YACC="bison -y"
+	break
+      fi
+      if test -f $dir/byacc; then
+	YACC=byacc
+	break
+      fi
+      if test -f $dir/yacc; then
+	YACC=yacc
+	break
+      fi
+    done
+    IFS="$save_ifs"
+    if [ -z "${YACC}" ]; then
+      YACC="bison -y"
     fi
-    test -n "$ac_cv_prog_CC_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_CC_FOR_TARGET" ; then
-  set dummy cc gcc
-  if test $build = $target ; then
-    CC_FOR_TARGET="$2"
-  else
-    CC_FOR_TARGET="${ncn_target_tool_prefix}$2"
   fi
-fi
 
- if test -n "$with_build_time_tools"; then
-  for ncn_progname in c++ g++ cxx gxx; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4666: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_CXX_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_CXX_FOR_TARGET"; then
-  for ncn_progname in c++ g++ cxx gxx; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4683: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX_FOR_TARGET"; then
-  ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET"
-if test -n "$CXX_FOR_TARGET"; then
-  echo "$ac_t""$CXX_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_CXX_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4714: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX_FOR_TARGET"; then
-  ac_cv_prog_CXX_FOR_TARGET="$CXX_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET"
-if test -n "$CXX_FOR_TARGET"; then
-  echo "$ac_t""$CXX_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
+  if [ -z "${LEX}" ]; then
+    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+    for dir in $PATH; do
+      test -z "$dir" && dir=.
+      if test -f $dir/flex; then
+	LEX=flex
+	break
+      fi
+      if test -f $dir/lex; then
+	LEX=lex
+	break
+      fi
+    done
+    IFS="$save_ifs"
+    LEX=${LEX-flex}
+  fi
+
+  # Export variables which autoconf might try to set.
+  export AS
+  export AR
+  export CC_FOR_BUILD
+  export DLLTOOL
+  export LD
+  export NM
+  export RANLIB
+  export WINDRES
+  export OBJCOPY
+  export OBJDUMP
+else
+  # If CC is still not set, try to get gcc.
+  if [ -z "${CC}" ]; then
+    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+    for dir in $PATH; do
+      test -z "$dir" && dir=.
+      if test -f $dir/gcc; then
+	CC="gcc"
+	echo 'void f(){}' > conftest.c
+	if test -z "`${CC} -g -c conftest.c 2>&1`"; then
+	  CFLAGS=${CFLAGS-"-g -O2"}
+	  CXXFLAGS=${CXXFLAGS-"-g -O2"}
+	else
+	  CFLAGS=${CFLAGS-"-O2"}
+	  CXXFLAGS=${CXXFLAGS-"-O2"}
+	fi
+	rm -f conftest*
+	break
+      fi
+    done
+    IFS="$save_ifs"
+    CC=${CC-cc}
+  else
+    if test -z "${CFLAGS}"; then
+      # Here CC is set but CFLAGS is not.  Use a quick hack to use -O2 if CC
+      # is set to a version of gcc.
+      case "${CC}" in
+      *gcc)
+	echo 'void f(){}' > conftest.c
+	if test -z "`${CC} -g -c conftest.c 2>&1`"; then
+	  CFLAGS=${CFLAGS-"-g -O2"}
+	  CXXFLAGS=${CXXFLAGS-"-g -O2"}
+	else
+	  CFLAGS=${CFLAGS-"-O2"}
+	  CXXFLAGS=${CXXFLAGS-"-O2"}
+	fi
+	rm -f conftest*
+	;;
+      esac
     fi
-    test -n "$ac_cv_prog_CXX_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_CXX_FOR_TARGET" ; then
-  set dummy c++ g++ cxx gxx
-  if test $build = $target ; then
-    CXX_FOR_TARGET="$2"
-  else
-    CXX_FOR_TARGET="${ncn_target_tool_prefix}$2"
   fi
-fi
-
- if test -n "$with_build_time_tools"; then
-  for ncn_progname in gcc; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4757: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_GCC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_GCC_FOR_TARGET"; then
-  for ncn_progname in gcc; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4774: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GCC_FOR_TARGET"; then
-  ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GCC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET"
-if test -n "$GCC_FOR_TARGET"; then
-  echo "$ac_t""$GCC_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
 
-    fi
-    if test -z "$ac_cv_prog_GCC_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4805: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GCC_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GCC_FOR_TARGET"; then
-  ac_cv_prog_GCC_FOR_TARGET="$GCC_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GCC_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET"
-if test -n "$GCC_FOR_TARGET"; then
-  echo "$ac_t""$GCC_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_GCC_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_GCC_FOR_TARGET" ; then
-  GCC_FOR_TARGET="${CC_FOR_TARGET}"
+  CXX=${CXX-"c++"}
+  CFLAGS=${CFLAGS-"-g"}
+  CXXFLAGS=${CXXFLAGS-"-g -O2"}
 fi
 
- if test -n "$with_build_time_tools"; then
-  for ncn_progname in gcj; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4843: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_GCJ_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
+export CC
+export CXX
+export CFLAGS
+export CXXFLAGS
 
-if test -z "$ac_cv_prog_GCJ_FOR_TARGET"; then
-  for ncn_progname in gcj; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4860: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GCJ_FOR_TARGET"; then
-  ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GCJ_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET"
-if test -n "$GCJ_FOR_TARGET"; then
-  echo "$ac_t""$GCJ_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+# FIXME: This should be in configure.in, not configure
+case "$host" in
+	*go32*)
+	    enable_gdbtk=no ;;
+	*msdosdjgpp*)
+	    enable_gdbtk=no ;;
+esac
 
-    fi
-    if test -z "$ac_cv_prog_GCJ_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4891: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GCJ_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GCJ_FOR_TARGET"; then
-  ac_cv_prog_GCJ_FOR_TARGET="$GCJ_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GCJ_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET"
-if test -n "$GCJ_FOR_TARGET"; then
-  echo "$ac_t""$GCJ_FOR_TARGET" 1>&6
+# FIXME: This should be in configure.in, not configure
+# Determine whether gdb needs tk/tcl or not.
+if [ "$enable_gdbtk" != "no" ]; then
+	GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui"
 else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_GCJ_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then
-  set dummy gcj
-  if test $build = $target ; then
-    GCJ_FOR_TARGET="$2"
-  else
-    GCJ_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
- if test -n "$with_build_time_tools"; then
-  for ncn_progname in gfortran; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:4934: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_GFORTRAN_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
+	GDB_TK=""
 fi
 
-if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET"; then
-  for ncn_progname in gfortran; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4951: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GFORTRAN_FOR_TARGET"; then
-  ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET"
-if test -n "$GFORTRAN_FOR_TARGET"; then
-  echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+all_build_modules=
+if test x"${build_alias}" != x"${host_alias}"
+then
+  all_build_modules='$(ALL_BUILD_MODULES_LIST)'
+fi
+
+for subdir in . ${subdirs} ; do
+
+    # ${subdir} is relative path from . to the directory we're currently
+    # configuring.
+    # ${invsubdir} is inverse of ${subdir), *with* trailing /, if needed.
+    invsubdir=`echo ${subdir}/ | sed -e 's|\./||g' -e 's|[^/]*/|../|g'`
+
+    ### figure out what to do with srcdir
+    case "${srcdir}" in
+        ".")  # no -srcdir option.  We're building in place.
+                makesrcdir=. ;;
+        /*) # absolute path
+                makesrcdir=`echo ${srcdir}/${subdir} | sed -e 's|/\.$||'`
+                ;;
+        *) # otherwise relative
+                case "${subdir}" in
+                .) makesrcdir=${srcdir} ;;
+                *) makesrcdir=${invsubdir}${srcdir}/${subdir} ;;
+                esac
+                ;;
+    esac
 
+    if [ "${subdir}/" != "./" ] ; then
+        Makefile=${subdir}/Makefile
     fi
-    if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4982: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$GFORTRAN_FOR_TARGET"; then
-  ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET"
-if test -n "$GFORTRAN_FOR_TARGET"; then
-  echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then
-  set dummy gfortran
-  if test $build = $target ; then
-    GFORTRAN_FOR_TARGET="$2"
-  else
-    GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=: 
-  fi
-  rm -f conf$$.sh
-fi
 
-
-
-if test "x$exec_prefix" = xNONE; then
-        if test "x$prefix" = xNONE; then
-                gcc_cv_tool_prefix=$ac_default_prefix
+    if [ ! -d ${subdir} ] ; then
+        if mkdir ${subdir} ; then
+                true
         else
-                gcc_cv_tool_prefix=$prefix
+                echo '***' "${progname}: could not make ${PWD=`pwd`}/${subdir}" 1>&2
+                exit 1
         fi
-else
-        gcc_cv_tool_prefix=$exec_prefix
-fi
-
-# If there is no compiler in the tree, use the PATH only.  In any
-# case, if there is no compiler in the tree nobody should use
-# AS_FOR_TARGET and LD_FOR_TARGET.
-if test x$host = x$build && test -f $srcdir/gcc/BASE-VER; then
-    gcc_version=`cat $srcdir/gcc/BASE-VER`
-    gcc_cv_tool_dirs="$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/libexec/gcc/$target_noncanonical$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs/usr/lib/gcc/$target_noncanonical$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version$PATH_SEPARATOR"
-    gcc_cv_tool_dirs="$gcc_cv_tool_dirs$gcc_cv_tool_prefix/$target_noncanonical/bin$PATH_SEPARATOR"
-else
-    gcc_cv_tool_dirs=
-fi
-
-if test x$build = x$target && test -n "$md_exec_prefix"; then
-        gcc_cv_tool_dirs="$gcc_cv_tool_dirs$md_exec_prefix$PATH_SEPARATOR"
-fi
-
-
-
-cat > conftest.c << \EOF
-#ifdef __GNUC__
-  gcc_yay;
-#endif
-EOF
-if ($GCC_FOR_TARGET -E conftest.c | grep gcc_yay) > /dev/null 2>&1; then
-  have_gcc_for_target=yes
-else
-  GCC_FOR_TARGET=${ncn_target_tool_prefix}gcc
-  have_gcc_for_target=no
-fi
-rm conftest.c
-
-
-
-
-if test -z "$ac_cv_path_AR_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ar in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5089: checking for ar in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/ar; then
-      AR_FOR_TARGET=`cd $with_build_time_tools && pwd`/ar
-      ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_AR_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    AR_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ar`
-    test $AR_FOR_TARGET=ar && AR_FOR_TARGET=
-    ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_AR_FOR_TARGET" ; then
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5107: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$AR_FOR_TARGET" in
-  /*)
-  ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_AR_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-AR_FOR_TARGET="$ac_cv_path_AR_FOR_TARGET"
-if test -n "$AR_FOR_TARGET"; then
-  echo "$ac_t""$AR_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_AR_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in ar; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5144: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_AR_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_AR_FOR_TARGET"; then
-  for ncn_progname in ar; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5161: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR_FOR_TARGET"; then
-  ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
     fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET"
-if test -n "$AR_FOR_TARGET"; then
-  echo "$ac_t""$AR_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_AR_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5192: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR_FOR_TARGET"; then
-  ac_cv_prog_AR_FOR_TARGET="$AR_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET"
-if test -n "$AR_FOR_TARGET"; then
-  echo "$ac_t""$AR_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_AR_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then
-  set dummy ar
-  if test $build = $target ; then
-    AR_FOR_TARGET="$2"
-  else
-    AR_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  AR_FOR_TARGET=$ac_cv_path_AR_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for as in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5242: checking for as in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/as; then
-      AS_FOR_TARGET=`cd $with_build_time_tools && pwd`/as
-      ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_AS_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    AS_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=as`
-    test $AS_FOR_TARGET=as && AS_FOR_TARGET=
-    ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5260: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$AS_FOR_TARGET" in
-  /*)
-  ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_AS_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-AS_FOR_TARGET="$ac_cv_path_AS_FOR_TARGET"
-if test -n "$AS_FOR_TARGET"; then
-  echo "$ac_t""$AS_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_AS_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in as; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5297: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_AS_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_AS_FOR_TARGET"; then
-  for ncn_progname in as; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5314: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS_FOR_TARGET"; then
-  ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET"
-if test -n "$AS_FOR_TARGET"; then
-  echo "$ac_t""$AS_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_AS_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5345: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS_FOR_TARGET"; then
-  ac_cv_prog_AS_FOR_TARGET="$AS_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET"
-if test -n "$AS_FOR_TARGET"; then
-  echo "$ac_t""$AS_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_AS_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then
-  set dummy as
-  if test $build = $target ; then
-    AS_FOR_TARGET="$2"
-  else
-    AS_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  AS_FOR_TARGET=$ac_cv_path_AS_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for dlltool in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5395: checking for dlltool in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/dlltool; then
-      DLLTOOL_FOR_TARGET=`cd $with_build_time_tools && pwd`/dlltool
-      ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_DLLTOOL_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    DLLTOOL_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=dlltool`
-    test $DLLTOOL_FOR_TARGET=dlltool && DLLTOOL_FOR_TARGET=
-    ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5413: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$DLLTOOL_FOR_TARGET" in
-  /*)
-  ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_DLLTOOL_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-DLLTOOL_FOR_TARGET="$ac_cv_path_DLLTOOL_FOR_TARGET"
-if test -n "$DLLTOOL_FOR_TARGET"; then
-  echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in dlltool; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5450: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_DLLTOOL_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET"; then
-  for ncn_progname in dlltool; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5467: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL_FOR_TARGET"; then
-  ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET"
-if test -n "$DLLTOOL_FOR_TARGET"; then
-  echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5498: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL_FOR_TARGET"; then
-  ac_cv_prog_DLLTOOL_FOR_TARGET="$DLLTOOL_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET"
-if test -n "$DLLTOOL_FOR_TARGET"; then
-  echo "$ac_t""$DLLTOOL_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_DLLTOOL_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then
-  set dummy dlltool
-  if test $build = $target ; then
-    DLLTOOL_FOR_TARGET="$2"
-  else
-    DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  DLLTOOL_FOR_TARGET=$ac_cv_path_DLLTOOL_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ld in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5548: checking for ld in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/ld; then
-      LD_FOR_TARGET=`cd $with_build_time_tools && pwd`/ld
-      ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_LD_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    LD_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ld`
-    test $LD_FOR_TARGET=ld && LD_FOR_TARGET=
-    ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
-  # Extract the first word of "ld", so it can be a program name with args.
-set dummy ld; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5566: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$LD_FOR_TARGET" in
-  /*)
-  ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_LD_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-LD_FOR_TARGET="$ac_cv_path_LD_FOR_TARGET"
-if test -n "$LD_FOR_TARGET"; then
-  echo "$ac_t""$LD_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_LD_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in ld; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5603: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_LD_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_LD_FOR_TARGET"; then
-  for ncn_progname in ld; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5620: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD_FOR_TARGET"; then
-  ac_cv_prog_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET"
-if test -n "$LD_FOR_TARGET"; then
-  echo "$ac_t""$LD_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_LD_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5651: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD_FOR_TARGET"; then
-  ac_cv_prog_LD_FOR_TARGET="$LD_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET"
-if test -n "$LD_FOR_TARGET"; then
-  echo "$ac_t""$LD_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_LD_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then
-  set dummy ld
-  if test $build = $target ; then
-    LD_FOR_TARGET="$2"
-  else
-    LD_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  LD_FOR_TARGET=$ac_cv_path_LD_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for lipo in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5701: checking for lipo in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/lipo; then
-      LIPO_FOR_TARGET=`cd $with_build_time_tools && pwd`/lipo
-      ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_LIPO_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    LIPO_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=lipo`
-    test $LIPO_FOR_TARGET=lipo && LIPO_FOR_TARGET=
-    ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5719: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_LIPO_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$LIPO_FOR_TARGET" in
-  /*)
-  ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_LIPO_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-LIPO_FOR_TARGET="$ac_cv_path_LIPO_FOR_TARGET"
-if test -n "$LIPO_FOR_TARGET"; then
-  echo "$ac_t""$LIPO_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_LIPO_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in lipo; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5756: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_LIPO_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_LIPO_FOR_TARGET"; then
-  for ncn_progname in lipo; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5773: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LIPO_FOR_TARGET"; then
-  ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LIPO_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET"
-if test -n "$LIPO_FOR_TARGET"; then
-  echo "$ac_t""$LIPO_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_LIPO_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5804: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LIPO_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LIPO_FOR_TARGET"; then
-  ac_cv_prog_LIPO_FOR_TARGET="$LIPO_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LIPO_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET"
-if test -n "$LIPO_FOR_TARGET"; then
-  echo "$ac_t""$LIPO_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_LIPO_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then
-  set dummy lipo
-  if test $build = $target ; then
-    LIPO_FOR_TARGET="$2"
-  else
-    LIPO_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  LIPO_FOR_TARGET=$ac_cv_path_LIPO_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for nm in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5854: checking for nm in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/nm; then
-      NM_FOR_TARGET=`cd $with_build_time_tools && pwd`/nm
-      ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_NM_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    NM_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=nm`
-    test $NM_FOR_TARGET=nm && NM_FOR_TARGET=
-    ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
-  # Extract the first word of "nm", so it can be a program name with args.
-set dummy nm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5872: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$NM_FOR_TARGET" in
-  /*)
-  ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_NM_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-NM_FOR_TARGET="$ac_cv_path_NM_FOR_TARGET"
-if test -n "$NM_FOR_TARGET"; then
-  echo "$ac_t""$NM_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_NM_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in nm; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:5909: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_NM_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_NM_FOR_TARGET"; then
-  for ncn_progname in nm; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5926: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM_FOR_TARGET"; then
-  ac_cv_prog_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET"
-if test -n "$NM_FOR_TARGET"; then
-  echo "$ac_t""$NM_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_NM_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5957: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM_FOR_TARGET"; then
-  ac_cv_prog_NM_FOR_TARGET="$NM_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET"
-if test -n "$NM_FOR_TARGET"; then
-  echo "$ac_t""$NM_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_NM_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then
-  set dummy nm
-  if test $build = $target ; then
-    NM_FOR_TARGET="$2"
-  else
-    NM_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  NM_FOR_TARGET=$ac_cv_path_NM_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for objdump in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6007: checking for objdump in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/objdump; then
-      OBJDUMP_FOR_TARGET=`cd $with_build_time_tools && pwd`/objdump
-      ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_OBJDUMP_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    OBJDUMP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=objdump`
-    test $OBJDUMP_FOR_TARGET=objdump && OBJDUMP_FOR_TARGET=
-    ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6025: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$OBJDUMP_FOR_TARGET" in
-  /*)
-  ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_OBJDUMP_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-OBJDUMP_FOR_TARGET="$ac_cv_path_OBJDUMP_FOR_TARGET"
-if test -n "$OBJDUMP_FOR_TARGET"; then
-  echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in objdump; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6062: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_OBJDUMP_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET"; then
-  for ncn_progname in objdump; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6079: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP_FOR_TARGET"; then
-  ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET"
-if test -n "$OBJDUMP_FOR_TARGET"; then
-  echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6110: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP_FOR_TARGET"; then
-  ac_cv_prog_OBJDUMP_FOR_TARGET="$OBJDUMP_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET"
-if test -n "$OBJDUMP_FOR_TARGET"; then
-  echo "$ac_t""$OBJDUMP_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_OBJDUMP_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then
-  set dummy objdump
-  if test $build = $target ; then
-    OBJDUMP_FOR_TARGET="$2"
-  else
-    OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  OBJDUMP_FOR_TARGET=$ac_cv_path_OBJDUMP_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for ranlib in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6160: checking for ranlib in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/ranlib; then
-      RANLIB_FOR_TARGET=`cd $with_build_time_tools && pwd`/ranlib
-      ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_RANLIB_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    RANLIB_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ranlib`
-    test $RANLIB_FOR_TARGET=ranlib && RANLIB_FOR_TARGET=
-    ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6178: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$RANLIB_FOR_TARGET" in
-  /*)
-  ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_RANLIB_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-RANLIB_FOR_TARGET="$ac_cv_path_RANLIB_FOR_TARGET"
-if test -n "$RANLIB_FOR_TARGET"; then
-  echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in ranlib; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6215: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_RANLIB_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_RANLIB_FOR_TARGET"; then
-  for ncn_progname in ranlib; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6232: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB_FOR_TARGET"; then
-  ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET"
-if test -n "$RANLIB_FOR_TARGET"; then
-  echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6263: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB_FOR_TARGET"; then
-  ac_cv_prog_RANLIB_FOR_TARGET="$RANLIB_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET"
-if test -n "$RANLIB_FOR_TARGET"; then
-  echo "$ac_t""$RANLIB_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_RANLIB_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then
-  set dummy ranlib
-  if test $build = $target ; then
-    RANLIB_FOR_TARGET="$2"
-  else
-    RANLIB_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  RANLIB_FOR_TARGET=$ac_cv_path_RANLIB_FOR_TARGET
-fi
-
-
-
-
-if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for strip in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6313: checking for strip in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/strip; then
-      STRIP_FOR_TARGET=`cd $with_build_time_tools && pwd`/strip
-      ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_STRIP_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    STRIP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=strip`
-    test $STRIP_FOR_TARGET=strip && STRIP_FOR_TARGET=
-    ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6331: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$STRIP_FOR_TARGET" in
-  /*)
-  ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_STRIP_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-STRIP_FOR_TARGET="$ac_cv_path_STRIP_FOR_TARGET"
-if test -n "$STRIP_FOR_TARGET"; then
-  echo "$ac_t""$STRIP_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test -z "$ac_cv_path_STRIP_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in strip; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6368: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_STRIP_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_STRIP_FOR_TARGET"; then
-  for ncn_progname in strip; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6385: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP_FOR_TARGET"; then
-  ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET"
-if test -n "$STRIP_FOR_TARGET"; then
-  echo "$ac_t""$STRIP_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-    if test -z "$ac_cv_prog_STRIP_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6416: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP_FOR_TARGET"; then
-  ac_cv_prog_STRIP_FOR_TARGET="$STRIP_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET"
-if test -n "$STRIP_FOR_TARGET"; then
-  echo "$ac_t""$STRIP_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_STRIP_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then
-  set dummy strip
-  if test $build = $target ; then
-    STRIP_FOR_TARGET="$2"
-  else
-    STRIP_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  STRIP_FOR_TARGET=$ac_cv_path_STRIP_FOR_TARGET
-fi
-
-
 
+    case "${removing}" in
+    "")
+        case "${subdir}" in
+        .) ;;
+        *) eval echo Building in ${subdir} ${redirect} ;;
+        esac
 
-if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    echo $ac_n "checking for windres in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6466: checking for windres in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/windres; then
-      WINDRES_FOR_TARGET=`cd $with_build_time_tools && pwd`/windres
-      ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET
-      echo "$ac_t""$ac_cv_path_WINDRES_FOR_TARGET" 1>&6
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    WINDRES_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=windres`
-    test $WINDRES_FOR_TARGET=windres && WINDRES_FOR_TARGET=
-    ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
-  # Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6484: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_WINDRES_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$WINDRES_FOR_TARGET" in
-  /*)
-  ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$gcc_cv_tool_dirs"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_WINDRES_FOR_TARGET="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-WINDRES_FOR_TARGET="$ac_cv_path_WINDRES_FOR_TARGET"
-if test -n "$WINDRES_FOR_TARGET"; then
-  echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+        # FIXME Should this be done recursively ??? (Useful for e.g. gdbtest)
+        # Set up the list of links to be made.
+        # ${links} is the list of link names, and ${files} is the list of names to link to.
 
-fi
-if test -z "$ac_cv_path_WINDRES_FOR_TARGET" ; then
-   if test -n "$with_build_time_tools"; then
-  for ncn_progname in windres; do
-    echo $ac_n "checking for ${ncn_progname} in $with_build_time_tools""... $ac_c" 1>&6
-echo "configure:6521: checking for ${ncn_progname} in $with_build_time_tools" >&5
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_WINDRES_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      echo "$ac_t""yes" 1>&6
-      break
-    else
-      echo "$ac_t""no" 1>&6
-    fi
-  done
-fi
+        # Make the links.
+        configlinks="${links}"
+        if [ -r ${subdir}/config.status ] ; then
+                mv -f ${subdir}/config.status ${subdir}/config.back
+        fi
+        while [ -n "${files}" ] ; do
+                # set file to car of files, files to cdr of files
+                set ${files}; file=$1; shift; files=$*
+                set ${links}; link=$1; shift; links=$*
+
+                if [ ! -r ${srcdir}/${file} ] ; then
+                  if [ ! -r ${file} ] ; then
+		    
+                        echo '***' "${progname}: cannot create a link \"${link}\"," 1>&2
+                        echo '***' "since the file \"${srcdir}/${file}\" does not exist." 1>&2
+                        exit 1
+		  else
+			srcfile=${file}
+		  fi
+		else
+			srcfile=${srcdir}/${file}
+                fi
+
+                ${remove} -f ${link}
+		# Make a symlink if possible, otherwise try a hard link
+		if ${symbolic_link} ${srcfile} ${link} >/dev/null 2>&1 ; then
+			true
+		else
+			# We need to re-remove the file because Lynx leaves a 
+			# very strange directory there when it fails an NFS symlink.
+			${remove} -r -f ${link}
+			${hard_link} ${srcfile} ${link}
+		fi
+                if [ ! -r ${link} ] ; then
+                        echo '***' "${progname}: unable to link \"${link}\" to \"${srcfile}\"." 1>&2
+                        exit 1
+                fi
+
+                echo "Linked \"${link}\" to \"${srcfile}\"."
+        done
 
-if test -z "$ac_cv_prog_WINDRES_FOR_TARGET"; then
-  for ncn_progname in windres; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6538: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$WINDRES_FOR_TARGET"; then
-  ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET"
-if test -n "$WINDRES_FOR_TARGET"; then
-  echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+        # Create a .gdbinit file which runs the one in srcdir
+        # and tells GDB to look there for source files.
 
-    fi
-    if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6569: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES_FOR_TARGET'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$WINDRES_FOR_TARGET"; then
-  ac_cv_prog_WINDRES_FOR_TARGET="$WINDRES_FOR_TARGET" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES_FOR_TARGET="${ncn_progname}"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET"
-if test -n "$WINDRES_FOR_TARGET"; then
-  echo "$ac_t""$WINDRES_FOR_TARGET" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- 
-    fi
-    test -n "$ac_cv_prog_WINDRES_FOR_TARGET" && break
-  done
-fi
-  
-if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then
-  set dummy windres
-  if test $build = $target ; then
-    WINDRES_FOR_TARGET="$2"
-  else
-    WINDRES_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-fi
-
-else
-  WINDRES_FOR_TARGET=$ac_cv_path_WINDRES_FOR_TARGET
-fi
+        if [ -r ${srcdir}/${subdir}/.gdbinit ] ; then
+                case ${srcdir} in
+                .) ;;
+                *) cat > ${subdir}/.gdbinit <<EOF
+# ${NO_EDIT}
+dir ${makesrcdir}
+dir .
+source ${makesrcdir}/.gdbinit
+EOF
+                        ;;
+                esac
+        fi
 
+        # Install a makefile, and make it set VPATH
+        # if necessary so that the sources are found.
+        # Also change its value of srcdir.
+        # NOTE: Makefile generation constitutes the majority of the time in configure.  Hence, this section has
+        # been somewhat optimized and is perhaps a bit twisty.
+
+        # code is order so as to try to sed the smallest input files we know.
+        # so do these separately because I don't trust the order of sed -e expressions.
+
+        # the five makefile fragments MUST end up in the resulting Makefile in this order: 
+        # package macros, target, host, site, and package rules.
+
+        if [ -f ${srcdir}/${subdir}/${Makefile_in} ] ; then
+
+            # Conditionalize the makefile for this package from "Makefile.in" (or whatever it's called) into Makefile.tem.
+            rm -f ${subdir}/${Makefile}.tem
+            case "${package_makefile_rules_frag}" in
+              "") cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem ;;
+              *)
+                      if [ ! -f ${package_makefile_rules_frag} ] ; then
+                              package_makefile_rules_frag=${srcdir}/${package_makefile_rules_frag}
+                      fi
+                      if [ -f ${package_makefile_rules_frag} ] ; then
+                              sed -e "/^####/  r ${package_makefile_rules_frag}" ${srcdir}/${subdir}/${Makefile_in} > ${Makefile}.tem
+                      else
+                              echo '***' Expected package makefile rules fragment \"${package_makefile_rules_frag}\" 1>&2
+                              echo '***' is missing in ${PWD=`pwd`}. 1>&2
+                              cp ${srcdir}/${subdir}/${Makefile_in} ${subdir}/Makefile.tem
+                      fi
+            esac
+            # working copy now in ${Makefile}.tem
+
+            # Conditionalize for this site.
+            rm -f ${Makefile}
+              case "${site}" in
+              "") mv ${subdir}/Makefile.tem ${Makefile} ;;
+              *)
+                      site_makefile_frag=${srcdir}/config/ms-${site}
+
+                      if [ -f ${site_makefile_frag} ] ; then
+                              sed -e "/^####/  r ${site_makefile_frag}" ${subdir}/Makefile.tem \
+                                      > ${Makefile}
+                      else
+                              mv ${subdir}/Makefile.tem ${Makefile}
+                              site_makefile_frag=
+                      fi
+                      ;;
+            esac
+            # working copy now in ${Makefile}
+
+            # Conditionalize the makefile for this host.
+            rm -f ${subdir}/Makefile.tem
+            case "${host_makefile_frag}" in
+              "") mv ${Makefile} ${subdir}/Makefile.tem ;;
+              *)
+                      if [ ! -f ${host_makefile_frag} ] ; then
+                              host_makefile_frag=${srcdir}/${host_makefile_frag}
+                      fi
+                      if [ -f ${host_makefile_frag} ] ; then
+                              sed -e "/^####/  r ${host_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem
+                      else
+                              echo '***' Expected host makefile fragment \"${host_makefile_frag}\" 1>&2
+                              echo '***' is missing in ${PWD=`pwd`}. 1>&2
+                              mv ${Makefile} ${subdir}/Makefile.tem
+                      fi
+            esac
+            # working copy now in ${subdir)/Makefile.tem
+
+            # Conditionalize the makefile for this target.
+            rm -f ${Makefile}
+            case "${target_makefile_frag}" in
+              "") mv ${subdir}/Makefile.tem ${Makefile} ;;
+              *)
+                      if [ ! -f ${target_makefile_frag} ] ; then
+                              target_makefile_frag=${srcdir}/${target_makefile_frag}
+                      fi
+                      if [ -f ${target_makefile_frag} ] ; then
+                              sed -e "/^####/  r ${target_makefile_frag}" ${subdir}/Makefile.tem > ${Makefile}
+                      else
+                              mv ${subdir}/Makefile.tem ${Makefile}
+                              target_makefile_frag=
+                      fi
+                      ;;
+            esac
+            # working copy now in ${Makefile}
+
+            # Emit the default values of this package's macros.
+            rm -f ${subdir}/Makefile.tem
+            case "${package_makefile_frag}" in
+              "") mv ${Makefile} ${subdir}/Makefile.tem ;;
+              *)
+                      if [ ! -f ${package_makefile_frag} ] ; then
+                              package_makefile_frag=${srcdir}/${package_makefile_frag}
+                      fi
+                      if [ -f ${package_makefile_frag} ] ; then
+                              sed -e "/^####/  r ${package_makefile_frag}" ${Makefile} > ${subdir}/Makefile.tem
+                      else
+                              echo '***' Expected package makefile fragment \"${package_makefile_rules_frag}\" 1>&2
+                              echo '***' is missing in ${PWD=`pwd`}. 1>&2
+                              mv ${Makefile} ${subdir}/Makefile.tem
+                      fi
+            esac
+            # real copy now in ${subdir}/Makefile.tem
+
+            # prepend warning about editting, and a bunch of variables.
+            rm -f ${Makefile}
+            cat > ${Makefile} <<EOF
+# ${NO_EDIT}
+VPATH = ${makesrcdir}
+links = ${configlinks}
+host_alias = ${host_alias}
+host_cpu = ${host_cpu}
+host_vendor = ${host_vendor}
+host_os = ${host_os}
+host_canonical = ${host_cpu}-${host_vendor}-${host_os}
+target_alias = ${target_alias}
+target_cpu = ${target_cpu}
+target_vendor = ${target_vendor}
+target_os = ${target_os}
+target_canonical = ${target_cpu}-${target_vendor}-${target_os}
+EOF
+	    case "${build}" in
+	      "") ;;
+	      *)  cat >> ${Makefile} << EOF
+build_alias = ${build_alias}
+build_cpu = ${build_cpu}
+build_vendor = ${build_vendor}
+build_os = ${build_os}
+build_canonical = ${build_cpu}-${build_vendor}-${build_os}
+EOF
+	    esac
 
-RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
+            case "${package_makefile_frag}" in
+              "") ;;
+              /*) echo package_makefile_frag = ${package_makefile_frag} >>${Makefile} ;;
+              *)  echo package_makefile_frag = ${invsubdir}${package_makefile_frag} >>${Makefile} ;;
+            esac
+
+            case "${target_makefile_frag}" in
+              "") ;;
+              /*) echo target_makefile_frag = ${target_makefile_frag} >>${Makefile} ;;
+              *)  echo target_makefile_frag = ${invsubdir}${target_makefile_frag} >>${Makefile} ;;
+            esac
+
+            case "${host_makefile_frag}" in
+              "") ;;
+              /*) echo host_makefile_frag = ${host_makefile_frag} >>${Makefile} ;;
+              *)  echo host_makefile_frag = ${invsubdir}${host_makefile_frag} >>${Makefile} ;;
+            esac
+
+            if [ "${site_makefile_frag}" != "" ] ; then
+                echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile}
+            fi 
+
+	    # record if we want to build shared libs.
+	    if test -z "${enable_shared}"; then
+	        echo enable_shared = no >> ${Makefile}
+	    else
+	        echo enable_shared = ${enable_shared} >> ${Makefile}
+	    fi
+	    # record if we want to rumtime library stuff installed in libsubdir.
+	    if test -z "${enable_version_specific_runtime_libs}"; then
+	        echo enable_version_specific_runtime_libs = no >> ${Makefile}
+	    else
+	        echo enable_version_specific_runtime_libs = ${enable_version_specific_runtime_libs} >> ${Makefile}
+	    fi
 
-echo $ac_n "checking where to find the target ar""... $ac_c" 1>&6
-echo "configure:6617: checking where to find the target ar" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $AR_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    AR_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ar'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$AR_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $AR_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    AR_FOR_TARGET='$(AR)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target as""... $ac_c" 1>&6
-echo "configure:6650: checking where to find the target as" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $AS_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gas "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gas/as-new'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$AS_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $AS_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    AS_FOR_TARGET='$(AS)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target cc""... $ac_c" 1>&6
-echo "configure:6683: checking where to find the target cc" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $CC_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    CC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$CC_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $CC_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    CC_FOR_TARGET='$(CC)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target c++""... $ac_c" 1>&6
-echo "configure:6716: checking where to find the target c++" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $CXX_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  case ,${enable_languages}, in
-    *,c++,*) ;;
-    *) ok=no ;;
-  esac
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $CXX_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    CXX_FOR_TARGET='$(CXX)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target c++ for libstdc++""... $ac_c" 1>&6
-echo "configure:6752: checking where to find the target c++ for libstdc++" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $RAW_CXX_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  case ,${enable_languages}, in
-    *,c++,*) ;;
-    *) ok=no ;;
-  esac
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $RAW_CXX_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    RAW_CXX_FOR_TARGET='$(CXX)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target dlltool""... $ac_c" 1>&6
-echo "configure:6788: checking where to find the target dlltool" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $DLLTOOL_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    DLLTOOL_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/dlltool'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$DLLTOOL_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $DLLTOOL_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    DLLTOOL_FOR_TARGET='$(DLLTOOL)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target gcc""... $ac_c" 1>&6
-echo "configure:6821: checking where to find the target gcc" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $GCC_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    GCC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$GCC_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $GCC_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    GCC_FOR_TARGET='$()'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target gcj""... $ac_c" 1>&6
-echo "configure:6854: checking where to find the target gcj" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $GCJ_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  case ,${enable_languages}, in
-    *,java,*) ;;
-    *) ok=no ;;
-  esac
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $GCJ_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    GCJ_FOR_TARGET='$(GCJ)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target gfortran""... $ac_c" 1>&6
-echo "configure:6890: checking where to find the target gfortran" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $GFORTRAN_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  case ,${enable_languages}, in
-    *,fortran,*) ;;
-    *) ok=no ;;
-  esac
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$GFORTRAN_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $GFORTRAN_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    GFORTRAN_FOR_TARGET='$(GFORTRAN)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target ld""... $ac_c" 1>&6
-echo "configure:6926: checking where to find the target ld" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $LD_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" ld "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/ld/ld-new'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$LD_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $LD_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    LD_FOR_TARGET='$(LD)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target lipo""... $ac_c" 1>&6
-echo "configure:6959: checking where to find the target lipo" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $LIPO_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  if expr "x$LIPO_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $LIPO_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    LIPO_FOR_TARGET='$(LIPO)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target nm""... $ac_c" 1>&6
-echo "configure:6982: checking where to find the target nm" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $NM_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/nm-new'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$NM_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $NM_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    NM_FOR_TARGET='$(NM)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target objdump""... $ac_c" 1>&6
-echo "configure:7015: checking where to find the target objdump" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $OBJDUMP_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    OBJDUMP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/objdump'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$OBJDUMP_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $OBJDUMP_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    OBJDUMP_FOR_TARGET='$(OBJDUMP)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target ranlib""... $ac_c" 1>&6
-echo "configure:7048: checking where to find the target ranlib" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $RANLIB_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    RANLIB_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/ranlib'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$RANLIB_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $RANLIB_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    RANLIB_FOR_TARGET='$(RANLIB)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target strip""... $ac_c" 1>&6
-echo "configure:7081: checking where to find the target strip" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $STRIP_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
-  
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $STRIP_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    STRIP_FOR_TARGET='$(STRIP)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-echo $ac_n "checking where to find the target windres""... $ac_c" 1>&6
-echo "configure:7114: checking where to find the target windres" >&5
-if test "x${build}" != "x${host}" ; then
-  if expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $WINDRES_FOR_TARGET`" 1>&6
-  else
-    # Canadian cross, just use what we found
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" binutils "*) ;;
-    *) ok=no ;;
-  esac
+	    # Emit a macro which describes the file containing gcc's
+	    # version number.
+	    echo gcc_version_trigger = ${gcc_version_trigger} >> ${Makefile}
+	    # And emit a macro defining gcc's version number.
+	    echo gcc_version = ${gcc_version} >> ${Makefile}
+
+            # reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS,
+            # remove any form feeds.
+            if [ -z "${subdirs}" ]; then
+                rm -f ${subdir}/Makefile.tm2
+                sed -e "s:^SUBDIRS[ 	]*=.*$:SUBDIRS = ${configdirs}:" \
+                    -e "s:^NONSUBDIRS[ 	]*=.*$:NONSUBDIRS = ${noconfigdirs}:" \
+                    ${subdir}/Makefile.tem > ${subdir}/Makefile.tm2
+                rm -f ${subdir}/Makefile.tem
+                mv ${subdir}/Makefile.tm2 ${subdir}/Makefile.tem
+	    fi
+	    sed     -e "s|^prefix[ 	]*=.*$|prefix = ${prefix}|" \
+                    -e "s|^exec_prefix[ 	]*=.*$|exec_prefix = ${exec_prefix}|" \
+                    -e "s|^bindir[ 	]*=.*$|bindir = ${bindir}|" \
+                    -e "s|^sbindir[ 	]*=.*$|sbindir = ${sbindir}|" \
+                    -e "s|^libexecdir[ 	]*=.*$|libexecdir = ${libexecdir}|" \
+                    -e "s|^datadir[ 	]*=.*$|datadir = ${datadir}|" \
+                    -e "s|^sysconfdir[ 	]*=.*$|sysconfdir = ${sysconfdir}|" \
+                    -e "s|^sharedstatedir[ 	]*=.*$|sharedstatedir = ${sharedstatedir}|" \
+                    -e "s|^localstatedir[ 	]*=.*$|localstatedir = ${localstatedir}|" \
+                    -e "s|^libdir[ 	]*=.*$|libdir = ${libdir}|" \
+                    -e "s|^includedir[ 	]*=.*$|includedir = ${includedir}|" \
+                    -e "s|^oldincludedir[ 	]*=.*$|oldincludedir = ${oldincludedir}|" \
+                    -e "s|^infodir[ 	]*=.*$|infodir = ${infodir}|" \
+                    -e "s|^mandir[ 	]*=.*$|mandir = ${mandir}|" \
+		    -e "s|^ALL_BUILD_MODULES =.*|ALL_BUILD_MODULES =${all_build_modules}|" \
+		    -e "/^CC[ 	]*=/{
+			:loop1
+			/\\\\$/ N
+			s/\\\\\\n//g
+			t loop1
+			s%^CC[ 	]*=.*$%CC = ${CC}%
+			}" \
+		    -e "/^CXX[ 	]*=/{
+			:loop2
+			/\\\\$/ N
+			s/\\\\\\n//g
+			t loop2
+			s%^CXX[ 	]*=.*$%CXX = ${CXX}%
+			}" \
+		    -e "/^CFLAGS[ 	]*=/{
+			:loop3
+			/\\\\$/ N
+			s/\\\\\\n//g
+			t loop3
+			s%^CFLAGS[ 	]*=.*$%CFLAGS = ${CFLAGS}%
+			}" \
+		    -e "/^CXXFLAGS[ 	]*=/{
+			:loop4
+			/\\\\$/ N
+			s/\\\\\\n//g
+			t loop4
+			s%^CXXFLAGS[ 	]*=.*$%CXXFLAGS = ${CXXFLAGS}%
+			}" \
+		    -e "s|^SHELL[	 ]*=.*$|SHELL = ${config_shell}|" \
+                    -e "s|^srcdir[ 	]*=.*$|srcdir = ${makesrcdir}|" \
+                    -e "s///" \
+                    -e "s:^program_prefix[ 	]*=.*$:program_prefix = ${program_prefix}:" \
+                    -e "s:^program_suffix[ 	]*=.*$:program_suffix = ${program_suffix}:" \
+                    -e "s:^program_transform_name[ 	]*=.*$:program_transform_name = ${program_transform_name}:" \
+                    -e "s|^tooldir[ 	]*=.*$|tooldir = ${tooldir}|" \
+                    -e "s|^build_tooldir[ 	]*=.*$|build_tooldir = ${tooldir}|" \
+		    -e "s:^DEFAULT_YACC[	 ]*=.*$:DEFAULT_YACC = ${DEFAULT_YACC}:" \
+		    -e "s:^DEFAULT_LEX[	 ]*=.*$:DEFAULT_LEX = ${DEFAULT_LEX}:" \
+		    -e "s:^DEFAULT_M4[  ]*=.*$:DEFAULT_M4 = ${DEFAULT_M4}:" \
+                    ${subdir}/Makefile.tem >> ${Makefile}
   
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    WINDRES_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/windres'
-    echo "$ac_t""just compiled" 1>&6
-  elif expr "x$WINDRES_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    echo "$ac_t""pre-installed in `dirname $WINDRES_FOR_TARGET`" 1>&6
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    WINDRES_FOR_TARGET='$(WINDRES)'
-    echo "$ac_t""host tool" 1>&6
-  else
-    # We need a cross tool
-    echo "$ac_t""pre-installed" 1>&6
-  fi
-fi
-
-
-
-
-# Certain tools may need extra flags.
-AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target}
-RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
-NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
-
-# When building target libraries, except in a Canadian cross, we use
-# the same toolchain as the compiler we just built.
-COMPILER_AS_FOR_TARGET='$(AS_FOR_TARGET)'
-COMPILER_LD_FOR_TARGET='$(LD_FOR_TARGET)'
-COMPILER_NM_FOR_TARGET='$(NM_FOR_TARGET)'
-if test $host = $build; then
-  case " $configdirs " in
-    *" gcc "*)
-      COMPILER_AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/as'
-      COMPILER_LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/collect-ld'
-      COMPILER_NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/nm'${extra_nmflags_for_target}
-      ;;
-  esac
-fi
-
-
-
+	    sed -e "s:^GDB_TK[	 ]*=.*$:GDB_TK = ${GDB_TK}:" ${Makefile} >${Makefile}.tem
+	    mv -f ${Makefile}.tem ${Makefile}
+
+	    # If this is a Canadian Cross, preset the values of many more
+	    # tools.
+	    if [ "${build}" != "${host}" ]; then
+		for var in ${tools}; do
+		    eval val=\$${var}
+		    sed -e "/^${var}[ 	]*=/{
+			   :loop1
+			   /\\\\$/ N
+			   /\\\\$/ b loop1
+			   s/\\\\\\n//g
+			   s%^${var}[ 	]*=.*$%${var} = ${val}%
+			   }" ${Makefile} > ${Makefile}.tem
+		    mv -f ${Makefile}.tem ${Makefile}
+		done
+	    fi
 
+            # final copy now in ${Makefile}
 
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:7175: checking whether to enable maintainer-specific portions of Makefiles" >&5
-# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
+        else
+           echo "No Makefile.in found in ${srcdir}/${subdir}, unable to configure" 1>&2
+        fi
 
-echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
+        rm -f ${subdir}/Makefile.tem
 
+        case "${host_makefile_frag}" in
+        "") using= ;;
+        *) using="and \"${host_makefile_frag}\"" ;;
+        esac
 
-if test "$USE_MAINTAINER_MODE" = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi	
-MAINT=$MAINTAINER_MODE_TRUE
-
-# ---------------------
-# GCC bootstrap support
-# ---------------------
-
-# Stage specific cflags for build.
-stage1_cflags="-g"
-case $build in
-  vax-*-*)
-    case ${GCC} in
-      yes) stage1_cflags="-g -Wa,-J" ;;
-      *) stage1_cflags="-g -J" ;;
-    esac ;;
-  powerpc-*-darwin*)
-    # The spiffy cpp-precomp chokes on some legitimate constructs in GCC
-    # sources; use -no-cpp-precomp to get to GNU cpp.
-    # Apple's GCC has bugs in designated initializer handling, so disable
-    # that too.
-    stage1_cflags="-g -no-cpp-precomp -DHAVE_DESIGNATED_INITIALIZERS=0"
-    ;;
-esac
+        case "${target_makefile_frag}" in
+        "") ;;
+        *) using="${using} and \"${target_makefile_frag}\"" ;;
+        esac
 
+        case "${site_makefile_frag}" in
+        "") ;;
+        *) using="${using} and \"${site_makefile_frag}\"" ;;
+        esac
 
-# Enable -Werror in bootstrap stage2 and later.
-# Change the default to "no" on release branches.
-# Check whether --enable-werror or --disable-werror was given.
-if test "${enable_werror+set}" = set; then
-  enableval="$enable_werror"
-  :
-else
-  enable_werror=yes
-fi
+        newusing=`echo "${using}" | sed 's/and/using/'`
+        using=${newusing}
+        echo "Created \"${Makefile}\" in" ${PWD=`pwd`} ${using}
 
-case ${enable_werror} in
-  yes) stage2_werror_flag="--enable-werror-always" ;;
-  *) stage2_werror_flag="" ;;
-esac
+        . ${tmpfile}.pos
 
+        # describe the chosen configuration in config.status.
+        # Make that file a shellscript which will reestablish
+        # the same configuration.  Used in Makefiles to rebuild
+        # Makefiles.
 
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
+        case "${norecursion}" in
+        "") arguments="${arguments} --norecursion" ;;
+        *) ;;
+        esac
 
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+        if [ ${subdir} = . ] ; then
+            echo "#!/bin/sh
+# ${NO_EDIT}
+# This directory was configured as follows:
+${progname}" ${arguments}  "
+# ${using}" > ${subdir}/config.new
+        else
+            echo "#!/bin/sh
+# ${NO_EDIT}
+# This directory was configured as follows:
+cd ${invsubdir}
+${progname}" ${arguments}  "
+# ${using}" > ${subdir}/config.new
+        fi
+        chmod a+x ${subdir}/config.new
+        if [ -r ${subdir}/config.back ] ; then
+                mv -f ${subdir}/config.back ${subdir}/config.status
+        fi
+	${config_shell} ${moveifchange} ${subdir}/config.new ${subdir}/config.status
+        ;;
 
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+    *)  rm -f ${Makefile} ${subdir}/config.status ${links} ;;
+    esac
+done
 
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+# If there are subdirectories, then recur.
+if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then 
+        for configdir in ${configdirs} ${extraconfigdirs} ; do
+
+		# If configdir contains ',' it is
+		# srcdir,builddir,target_alias
+		# These come from extraconfigdirs.
+		case ${configdir} in
+		*,*)
+		    eval `echo ${configdir} | sed -e 's/\([^,]*\),\([^,]*\),\(.*\)/cfg_dir=\1 bld_dir=\2 tgt_alias=\3/'`
+		    ;;
+		*)
+		    cfg_dir=${configdir}
+		    bld_dir=${configdir}
+		    tgt_alias=${target_alias}
+		    ;;
+		esac
+
+                if [ -d ${srcdir}/${cfg_dir} ] ; then
+                        eval echo Configuring ${configdir}... ${redirect}
+                        case "${srcdir}" in
+                        ".") ;;
+                        *)
+                                if [ ! -d ./${bld_dir} ] ; then
+                                        if mkdir ./${bld_dir} ; then
+                                                true
+                                        else
+                                                echo '***' "${progname}: could not make ${PWD=`pwd`}/${bld_dir}" 1>&2
+                                                exit 1
+                                        fi
+                                fi
+                                ;;
+                        esac
+
+                        POPDIR=${PWD=`pwd`}
+                        cd ${bld_dir} 
+
+### figure out what to do with srcdir
+                        case "${srcdir}" in
+                        ".") newsrcdir=${srcdir} ;; # no -srcdir option.  We're building in place.
+                        /*) # absolute path
+                                newsrcdir=${srcdir}/${cfg_dir}
+                                srcdiroption="--srcdir=${newsrcdir}"
+                                ;;
+                        ?:*) # absolute path on win32
+                                newsrcdir=${srcdir}/${cfg_dir}
+                                srcdiroption="--srcdir=${newsrcdir}"
+                                ;;
+                        *) # otherwise relative
+                                newsrcdir=../${srcdir}/${cfg_dir}
+                                srcdiroption="--srcdir=${newsrcdir}"
+                                ;;
+                        esac
+
+			# Handle --cache-file=../XXX
+			case "${cache_file}" in
+			"") # empty
+				;;
+			/*) # absolute path
+				cache_file_option="--cache-file=${cache_file}"
+				;;
+			?:*) # absolute path on win32
+				cache_file_option="--cache-file=${cache_file}"
+				;;
+			*) # relative path
+				cache_file_option="--cache-file=../${cache_file}"
+				;;
+			esac
+
+### check for guested configure, otherwise fix possibly relative progname
+                        if [ -f ${newsrcdir}/configure ] ; then
+                                recprog=${newsrcdir}/configure
+                        elif [ -f ${newsrcdir}/configure.in ] ; then
+                                case "${progname}" in
+                                /*)     recprog=${progname} ;;
+                                ?:*)    recprog=${progname} ;;
+                                *)      recprog=../${progname} ;;
+                                esac
+			else
+				eval echo No configuration information in ${cfg_dir} ${redirect}
+				recprog=
+                        fi
+
+### The recursion line is here.
+			if [ ! -z "${recprog}" ] ; then
+	                        if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${tgt_alias} \
+        	                        ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
+                	                ${srcdiroption} ${diroptions} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${removing} ${other_options} ${redirect} ; then
+	                                true
+        	                else
+					echo Configure in `pwd` failed, exiting. 1>&2
+                	                exit 1
+                        	fi
+			fi
+
+                        cd ${POPDIR}
+                fi
+        done
 fi
 
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
+# Perform the same cleanup as the trap handler, minus the "exit 1" of course,
+# and reset the trap handler.
+rm -f ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos
+trap 0
 
+exit 0
 
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 #
-# $0 $ac_configure_args
+# Local Variables:
+# fill-column: 131
+# End:
 #
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@LN@%$LN%g
-s%@LN_S@%$LN_S%g
-s%@TOPLEVEL_CONFIGURE_ARGUMENTS@%$TOPLEVEL_CONFIGURE_ARGUMENTS%g
-s%@build_subdir@%$build_subdir%g
-s%@host_subdir@%$host_subdir%g
-s%@target_subdir@%$target_subdir%g
-s%@CC@%$CC%g
-s%@GNATBIND@%$GNATBIND%g
-s%@do_compare@%$do_compare%g
-s%@gmplibs@%$gmplibs%g
-s%@gmpinc@%$gmpinc%g
-s%@stage1_languages@%$stage1_languages%g
-s%@SYSROOT_CFLAGS_FOR_TARGET@%$SYSROOT_CFLAGS_FOR_TARGET%g
-/@serialization_dependencies@/r $serialization_dependencies
-s%@serialization_dependencies@%%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-/@target_makefile_frag@/r $target_makefile_frag
-s%@target_makefile_frag@%%g
-/@alphaieee_frag@/r $alphaieee_frag
-s%@alphaieee_frag@%%g
-/@ospace_frag@/r $ospace_frag
-s%@ospace_frag@%%g
-s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
-s%@tooldir@%$tooldir%g
-s%@build_tooldir@%$build_tooldir%g
-s%@CONFIGURE_GDB_TK@%$CONFIGURE_GDB_TK%g
-s%@GDB_TK@%$GDB_TK%g
-s%@INSTALL_GDB_TK@%$INSTALL_GDB_TK%g
-s%@build_configargs@%$build_configargs%g
-s%@build_configdirs@%$build_configdirs%g
-s%@host_configargs@%$host_configargs%g
-s%@configdirs@%$configdirs%g
-s%@target_configargs@%$target_configargs%g
-s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g
-s%@config_shell@%$config_shell%g
-s%@YACC@%$YACC%g
-s%@BISON@%$BISON%g
-s%@M4@%$M4%g
-s%@LEX@%$LEX%g
-s%@FLEX@%$FLEX%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@EXPECT@%$EXPECT%g
-s%@RUNTEST@%$RUNTEST%g
-s%@AR@%$AR%g
-s%@AS@%$AS%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@LD@%$LD%g
-s%@LIPO@%$LIPO%g
-s%@NM@%$NM%g
-s%@RANLIB@%$RANLIB%g
-s%@STRIP@%$STRIP%g
-s%@WINDRES@%$WINDRES%g
-s%@OBJCOPY@%$OBJCOPY%g
-s%@OBJDUMP@%$OBJDUMP%g
-s%@CXX@%$CXX%g
-s%@CFLAGS_FOR_BUILD@%$CFLAGS_FOR_BUILD%g
-s%@CC_FOR_TARGET@%$CC_FOR_TARGET%g
-s%@CXX_FOR_TARGET@%$CXX_FOR_TARGET%g
-s%@GCC_FOR_TARGET@%$GCC_FOR_TARGET%g
-s%@GCJ_FOR_TARGET@%$GCJ_FOR_TARGET%g
-s%@GFORTRAN_FOR_TARGET@%$GFORTRAN_FOR_TARGET%g
-s%@AR_FOR_TARGET@%$AR_FOR_TARGET%g
-s%@AS_FOR_TARGET@%$AS_FOR_TARGET%g
-s%@DLLTOOL_FOR_TARGET@%$DLLTOOL_FOR_TARGET%g
-s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g
-s%@LIPO_FOR_TARGET@%$LIPO_FOR_TARGET%g
-s%@NM_FOR_TARGET@%$NM_FOR_TARGET%g
-s%@OBJDUMP_FOR_TARGET@%$OBJDUMP_FOR_TARGET%g
-s%@RANLIB_FOR_TARGET@%$RANLIB_FOR_TARGET%g
-s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g
-s%@WINDRES_FOR_TARGET@%$WINDRES_FOR_TARGET%g
-s%@FLAGS_FOR_TARGET@%$FLAGS_FOR_TARGET%g
-s%@RAW_CXX_FOR_TARGET@%$RAW_CXX_FOR_TARGET%g
-s%@COMPILER_AS_FOR_TARGET@%$COMPILER_AS_FOR_TARGET%g
-s%@COMPILER_LD_FOR_TARGET@%$COMPILER_LD_FOR_TARGET%g
-s%@COMPILER_NM_FOR_TARGET@%$COMPILER_NM_FOR_TARGET%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@stage1_cflags@%$stage1_cflags%g
-s%@stage2_werror_flag@%$stage2_werror_flag%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
+# end of configure
diff --git a/configure.in b/configure.in
index da7c63f..0a91207 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,20 @@
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#! /bin/bash
+##############################################################################
+
+## This file is a shell script fragment that supplies the information
+## necessary to tailor a template configure script into the configure
+## script appropriate for this directory.  For more information, check
+## any existing configure script.  
+
+## Be warned, there are two types of configure.in files.  There are those
+## used by Autoconf, which are macros which are expanded into a configure
+## script by autoconf.  The other sort, of which this is one, is executed
+## by Cygnus configure.  
+
+## For more information on these two systems, check out the documentation
+## for 'Autoconf' (autoconf.texi) and 'Configure' (configure.texi).  
+
+#   Copyright (C) 1992-99, 2000, 2001 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -13,318 +28,562 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 ##############################################################################
-### WARNING: this file contains embedded tabs.  Do not run untabify on this file.
-
-sinclude(config/acx.m4)
-
-AC_INIT(move-if-change)
-AC_PREREQ(2.13)
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-# Get 'install' or 'install-sh' and its variants.
-AC_PROG_INSTALL
-ACX_PROG_LN
-AC_PROG_LN_S
-
-### we might need to use some other shell than /bin/sh for running subshells
-### If we are on Windows, search for the shell.  This will permit people
-### to not have /bin/sh, but to be able to see /SOME/PATH/sh configure
-### without also having to set CONFIG_SHELL.  This code will work when
-### using bash, which sets OSTYPE.
-case "${OSTYPE}" in
-*win32*)
-  if test x${CONFIG_SHELL} = x ; then
-    if test ! -f /bin/sh ; then
-      if test x${SHELL} != x && test -f ${SHELL} ; then
-	CONFIG_SHELL=${SHELL}
-	export CONFIG_SHELL
-      else
-	for prog in sh sh.exe bash bash.exe; do
-	  IFS="${IFS=	}"; save_ifs="$IFS"; IFS="${IFS}:"
-	  for dir in $PATH; do
-	    test -z "$dir" && dir=.
-	    if test -f $dir/$prog; then
-	      CONFIG_SHELL=$dir/$prog
-	      export CONFIG_SHELL
-	      break
-	    fi
-	  done
-	  IFS="$save_ifs"
-	  test -n "${CONFIG_SHELL}" && break
-	done
-      fi
-    fi
-  fi
-  ;;
-esac
-
-config_shell=${CONFIG_SHELL-/bin/sh}
-
-progname=$0
-# if PWD already has a value, it is probably wrong.
-if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
-
-# Export original configure arguments for use by sub-configures.  These
-# will be expanded by make, so quote '$'.
-tmp="$progname $@"
-sed -e 's,\$,$$,g' <<EOF_SED > conftestsed.out
-$tmp
-EOF_SED
-TOPLEVEL_CONFIGURE_ARGUMENTS=`cat conftestsed.out`
-rm -f conftestsed.out
-AC_SUBST(TOPLEVEL_CONFIGURE_ARGUMENTS)
-
-moveifchange=${srcdir}/move-if-change
-
-srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}`
-
-# We pass INSTALL explicitly to sub-makes.  Make sure that it is not
-# a relative path.
-if test "$INSTALL" = "${srcdir}/install-sh -c"; then
-  INSTALL="${srcpwd}/install-sh -c"
-fi
-
-# Set srcdir to "." if that's what it is.
-# This is important for multilib support.
-pwd=`${PWDCMD-pwd}`
-if test "${pwd}" = "${srcpwd}" ; then
-  srcdir=.
-fi
-
-topsrcdir=$srcpwd
-
-extra_host_args=
 
 ### To add a new directory to the tree, first choose whether it is a target
 ### or a host dependent tool.  Then put it into the appropriate list
-### (library or tools, host or target), doing a dependency sort.
+### (library or tools, host or target), doing a dependency sort.  For
+### example, gdb requires that byacc (or bison) be built first, so it is in
+### the ${host_tools} list after byacc and bison.  
 
-# Subdirs will be configured in the order listed in build_configdirs, 
-# configdirs, or target_configdirs; see the serialization section below.
 
-# Dependency sorting is only needed when *configuration* must be done in 
-# a particular order.  In all cases a dependency should be specified in 
-# the Makefile, whether or not it's implicitly specified here.
-
-# Double entries in build_configdirs, configdirs, or target_configdirs may
-# cause circular dependencies and break everything horribly.
-
-# these library is used by various programs built for the build
-# environment
+# these libraries are used by various programs built for the host environment
 #
-build_libs="build-libiberty"
+host_libs="intl mmalloc libiberty opcodes bfd readline gash db tcl tk tcl8.1 tk8.1 tclX itcl tix libgui"
 
-# these tools are built for the build environment
-build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fixincludes"
+if [ "${enable_gdbgui}" = "yes" ] ; then
+	host_libs="${host_libs} libgui"
+fi
 
-# these libraries are used by various programs built for the host environment
-#
-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber"
+# Set up configure/Makefile variables if libstdc++-v3 is to be built.
+if [ "${enable_libstdcxx_v3}" = "yes" ] && test -d $srcdir/libstdc++-v3; then
+        libstdcxx_version="target-libstdc++-v3"
+	# Don't use libstdc++-v3's flags to configure/build itself.
+	libstdcxx_flags='`case $$dir in libstdc++-v3) ;; *) cat $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/libstdc++.INC 2>/dev/null || : ;; esac` -L$$r/$(TARGET_SUBDIR)/libstd++-v3/src -L$$r/$(TARGET_SUBDIR)/libstd++-v3/src/.libs'
+else
+        libstdcxx_version="target-libio target-libstdc++"
+        libstdcxx_flags='-isystem $$s/libstdc++ -isystem $$s/libstdc++/std -isystem $$s/libstdc++/stl -isystem $$s/libio/ -isystem $$s/libio/stdio -L$$r/$(TARGET_SUBDIR)/libstdc++'
+fi
 
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
 # know that we are building the simulator.
-# binutils, gas and ld appear in that order because it makes sense to run
-# "make check" in that particular order.
-host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
-
-# libgcj represents the runtime libraries only used by gcj.
-libgcj="target-libffi \
-	target-boehm-gc \
-	target-zlib \
-	target-qthreads \
-	target-libjava"
+host_tools="texinfo byacc flex bison binutils ld gas gcc cgen sid sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find emacs emacs19 uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext zip"
 
 # these libraries are built for the target environment, and are built after
 # the host libraries and the host tools (which may be a cross compiler)
 #
-target_libraries="target-libiberty \
+target_libs="target-libiberty \
 		target-libgloss \
 		target-newlib \
-		target-libstdc++-v3 \
-		target-libmudflap \
-		target-libssp \
-		target-libgcc-math \
-		target-libgfortran \
-		${libgcj} \
-		target-libobjc \
-		target-libada \
-		target-libgomp"
-
-# these tools are built using the target libraries, and are intended to
-# run only in the target environment
+		${libstdcxx_version} \
+		target-libf2c \
+		target-libchill \
+		target-libffi \
+		target-libjava \
+		target-zlib \
+		target-boehm-gc \
+		target-qthreads \
+		target-libobjc"
+
+# these tools are built using the target libs, and are intended to run only
+# in the target environment
 #
-# note: any program that *uses* libraries that are in the "target_libraries"
+# note: any program that *uses* libraries that are in the "target_libs"
 # list belongs in this list.  those programs are also very likely
 # candidates for the "native_only" list which follows
 #
-target_tools="target-examples target-groff target-gperf target-rda"
+target_tools="target-examples target-groff target-gperf"
 
 ################################################################################
 
+## These two lists are of directories that are to be removed from the
+## ${configdirs} list for either cross-compilations or for native-
+## compilations.  For example, it doesn't make that much sense to
+## cross-compile Emacs, nor is it terribly useful to compile target-libiberty in
+## a native environment.  
+
+# directories to be built in the native environment only
+#
+# This must be a single line because of the way it is searched by grep in
+# the code below.
+native_only="autoconf automake libtool cvssrc emacs emacs19 fileutils find gawk gettext grep gzip hello indent ispell m4 rcs recode sed shellutils tar textutils gash uudecode wdiff gprof target-groff guile perl apache inet time ash bash bzip2 prms snavigator gnuserv target-gperf"
+
+# directories to be built in a cross environment only
+#
+cross_only="target-libgloss target-newlib target-cygmon target-opcodes target-libstub"
+
 ## All tools belong in one of the four categories, and are assigned above
 ## We assign ${configdirs} this way to remove all embedded newlines.  This
 ## is important because configure will choke if they ever get through.
 ## ${configdirs} is directories we build using the host tools.
 ## ${target_configdirs} is directories we build using the target tools.
+#
 configdirs=`echo ${host_libs} ${host_tools}`
-target_configdirs=`echo ${target_libraries} ${target_tools}`
-build_configdirs=`echo ${build_libs} ${build_tools}`
+target_configdirs=`echo ${target_libs} ${target_tools}`
 
 ################################################################################
 
+srctrigger=move-if-change
 srcname="gnu development package"
 
 # This gets set non-empty for some net releases of packages.
 appdirs=""
 
-# Define is_cross_compiler to save on calls to 'test'.
-is_cross_compiler=
-if test x"${host}" = x"${target}" ; then
-  is_cross_compiler=no
-else
-  is_cross_compiler=yes
-fi	
+# per-host:
+
+# Work in distributions that contain no compiler tools, like Autoconf.
+if [ -d ${srcdir}/config ]; then
+case "${host}" in
+  m68k-hp-hpux*)
+    host_makefile_frag="${host_makefile_frag} config/mh-hp300"
+    ;;
+  m68k-apollo-sysv*)
+    host_makefile_frag="${host_makefile_frag} config/mh-apollo68"
+    ;;
+  m68k-apollo-bsd*)
+    host_makefile_frag="${host_makefile_frag} config/mh-a68bsd"
+    ;;
+  m88k-dg-dgux*)
+    host_makefile_frag="${host_makefile_frag} config/mh-dgux"
+    ;;
+  m88k-harris-cxux*)
+    host_makefile_frag="${host_makefile_frag} config/mh-cxux"
+    ;;
+  m88k-motorola-sysv*)
+    host_makefile_frag="${host_makefile_frag} config/mh-delta88"
+    ;;
+  mips*-dec-ultrix*)
+    host_makefile_frag="${host_makefile_frag} config/mh-decstation"
+    ;;
+  mips*-nec-sysv4*)
+    host_makefile_frag="${host_makefile_frag} config/mh-necv4"
+    ;;
+  mips*-sgi-irix6*)
+    host_makefile_frag="${host_makefile_frag} config/mh-irix6"
+    ;;
+  mips*-sgi-irix5*)
+    host_makefile_frag="${host_makefile_frag} config/mh-irix5"
+    ;;
+  mips*-sgi-irix4*)
+    host_makefile_frag="${host_makefile_frag} config/mh-irix4"
+    ;;
+  mips*-sgi-irix3*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    ;;
+  mips*-*-sysv4*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
+    ;;
+  mips*-*-sysv*)
+    host_makefile_frag="${host_makefile_frag} config/mh-riscos"
+    ;;
+  i370-ibm-opened*)
+    host_makefile_frag="${host_makefile_frag} config/mh-openedition"
+    ;;
+  i[3456]86-*-sysv5*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv5"
+    ;;
+  i[3456]86-*-dgux*)
+    host_makefile_frag="${host_makefile_frag} config/mh-dgux386"
+    ;;
+  i[3456]86-ncr-sysv4.3*)
+    host_makefile_frag="${host_makefile_frag} config/mh-ncrsvr43"
+    ;;
+  i[3456]86-ncr-sysv4*)
+    host_makefile_frag="${host_makefile_frag} config/mh-ncr3000"
+    ;;
+  i[3456]86-*-sco3.2v5*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    ;;
+  i[3456]86-*-sco*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sco"
+    ;;
+  i[3456]86-*-udk*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv5"
+    ;;
+  i[3456]86-*-isc*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    ;;
+  i[3456]86-*-solaris2*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
+    ;;
+  i[3456]86-*-aix*)
+    host_makefile_frag="${host_makefile_frag} config/mh-aix386"
+    ;;
+  i[3456]86-*-msdosdjgpp*)
+    host_makefile_frag="${host_makefile_frag} config/mh-djgpp"
+    ;;
+  *-cygwin*)
+    host_makefile_frag="${host_makefile_frag} config/mh-cygwin"
+    ;;
+  *-mingw32*)
+    host_makefile_frag="${host_makefile_frag} config/mh-mingw32"
+    ;;
+  *-interix*)
+    host_makefile_frag="${host_makefile_frag} config/mh-interix"
+    ;;
+  *-windows*)
+    host_makefile_frag="${host_makefile_frag} config/mh-windows"
+    ;;
+  vax-*-ultrix2*)
+    host_makefile_frag="${host_makefile_frag} config/mh-vaxult2"
+    ;;
+  *-*-solaris2*)
+    host_makefile_frag="${host_makefile_frag} config/mh-solaris"
+    ;;
+  m68k-sun-sunos*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sun3"
+    ;;
+  *-hp-hpux[78]*)
+    host_makefile_frag="${host_makefile_frag} config/mh-hpux8"
+    ;;
+  *-hp-hpux*)
+    host_makefile_frag="${host_makefile_frag} config/mh-hpux"
+    ;;
+  *-*-hiux*)
+    host_makefile_frag="${host_makefile_frag} config/mh-hpux"
+    ;;
+  rs6000-*-lynxos*)
+    host_makefile_frag="${host_makefile_frag} config/mh-lynxrs6k"
+    ;;
+  *-*-lynxos*)
+    host_makefile_frag="${host_makefile_frag} config/mh-lynxos"
+    ;;
+  *-*-sysv4*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
+    ;;
+  *-*-sysv*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv"
+    ;;
+esac
+fi
 
-# Find the build and target subdir names.
-GCC_TOPLEV_SUBDIRS
+# If we aren't going to be using gcc, see if we can extract a definition
+# of CC from the fragment.
+if [ -z "${CC}" ] && [ "${build}" = "${host}" ]; then
+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+  found=
+  for dir in $PATH; do
+    test -z "$dir" && dir=.
+    if test -f $dir/gcc; then
+      found=yes
+      break
+    fi
+  done
+  IFS="$save_ifs"
+  if [ -z "${found}" ] && [ -n "${host_makefile_frag}" ] && [ -f "${srcdir}/${host_makefile_frag}" ]; then
+    xx=`sed -n -e 's/^[ 	]*CC[ 	]*=[ 	]*\(.*\)$/\1/p' < ${srcdir}/${host_makefile_frag}`
+    if [ -n "${xx}" ] ; then
+      CC=$xx
+    fi
+  fi
+fi
 
-# Skipdirs are removed silently.
-skipdirs=
-# Noconfigdirs are removed loudly.
-noconfigdirs=""
+# We default to --with-shared on platforms where -fpic is meaningless.
+# Well, we don't yet, but we will.
+if false && [ "${host}" = "${target}" ] && [ x${enable_shared} = x ]; then
+  case "${target}" in
+    alpha*-dec-osf*)	enable_shared=yes ;;
+    alpha*-*-linux*)	enable_shared=yes ;;
+    mips-sgi-irix5*)	enable_shared=yes ;;
+    *)			enable_shared=no ;;
+  esac
+fi
 
-use_gnu_ld=
-# Make sure we don't let GNU ld be added if we didn't want it.
-if test x$with_gnu_ld = xno ; then
-  use_gnu_ld=no
-  noconfigdirs="$noconfigdirs ld"
+case "${enable_shared}" in
+  yes) shared=yes ;;
+  no) shared=no ;;
+  "") shared=no ;;
+  *) shared=yes ;;
+esac
+
+if [ x${shared} = xyes ]; then
+  case "${host}" in
+    alpha*-*-linux*)
+      host_makefile_frag="${host_makefile_frag} config/mh-elfalphapic"
+      ;;
+    arm*-*-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-armpic"
+      ;;
+    hppa*-*-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-papic"
+      ;;
+    i[3456]86-*-cygwin*)
+      # We don't want -fPIC on Cygwin.
+      ;;
+    i[3456]86-*-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-x86pic"
+      ;;
+    i370-*-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-i370pic"
+      ;;
+    ia64-*-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-ia64pic"
+      ;;
+    sparc64-*-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-sparcpic"
+      ;;
+    powerpc*-*-aix*)
+      # We don't want -fPIC on AIX.
+      ;;
+    powerpc*-*-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-ppcpic"
+      ;;
+    s390-* | s390x-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-s390pic"
+      ;;
+    *-*-*)
+      if test -f ${srcdir}/config/mh-${host_cpu}pic; then
+        host_makefile_frag="${host_makefile_frag} config/mh-${host_cpu}pic"
+      fi
+      ;;
+  esac
 fi
 
-use_gnu_as=
-# Make sure we don't let GNU as be added if we didn't want it.
-if test x$with_gnu_as = xno ; then
-  use_gnu_as=no
-  noconfigdirs="$noconfigdirs gas"
+rm -f mh-frag
+if [ -n "${host_makefile_frag}" ] ; then
+  for f in ${host_makefile_frag}
+  do
+    cat ${srcdir}/$f >> mh-frag
+  done
+  host_makefile_frag=mh-frag
 fi
 
+# per-target:
+
+case "${target}" in
+  v810*)
+    target_makefile_frag="${target_makefile_frag} config/mt-v810"
+    ;;
+  i[3456]86-*-netware*)
+    target_makefile_frag="${target_makefile_frag} config/mt-netware"
+    ;;
+  powerpc-*-netware*)
+    target_makefile_frag="${target_makefile_frag} config/mt-netware"
+    ;;
+  *-*-linux-gnu*)
+    target_makefile_frag="${target_makefile_frag} config/mt-linux"
+    ;;
+  *-*-aix4.[3456789]* | *-*-aix[56789].*)
+    target_makefile_frag="${target_makefile_frag} config/mt-aix43"
+    ;;
+  mips*-*-pe | sh*-*-pe | *arm-wince-pe)
+    target_makefile_frag="${target_makefile_frag} config/mt-wince"
+    ;;
+esac
+
+# If --enable-target-optspace always use -Os instead of -O2 to build
+# the target libraries, similarly if it is not specified, use -Os
+# on selected platforms.
+case "${enable_target_optspace}:${target}" in
+  yes:*)
+    target_makefile_frag="${target_makefile_frag} config/mt-ospace"
+    ;;
+  :d30v-*)
+    target_makefile_frag="${target_makefile_frag} config/mt-d30v"
+    ;;
+  :m32r-* | :d10v-* | :fr30-*)
+    target_makefile_frag="${target_makefile_frag} config/mt-ospace"
+    ;;
+  no:* | :*)
+    ;;
+  *)
+    echo "*** bad value \"${enable_target_optspace}\" for --enable-target-optspace flag; ignored" 1>&2
+    ;;
+esac
+
+skipdirs=
+gasdir=gas
+use_gnu_ld=
+use_gnu_as=
+
 # some tools are so dependent upon X11 that if we're not building with X, 
 # it's not even worth trying to configure, much less build, that tool.
 
 case ${with_x} in
-  yes | "") ;; # the default value for this tree is that X11 is available
+  yes | "")  # the default value for this tree is that X11 is available
+	;;
   no)
-    skipdirs="${skipdirs} tk itcl libgui"
-    # We won't be able to build gdbtk without X.
-    enable_gdbtk=no 
-    ;;
-  *)  echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 ;;
+	skipdirs="${skipdirs} tk libgui gash"
+	;;
+  *)
+    	echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2
+    	;;
 esac
 
 # Some tools are only suitable for building in a "native" situation.
-# Remove these if host!=target.  
-native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf"
+# Those are added when we have a host==target configuration.  For cross
+# toolchains, we add some directories that should only be useful in a
+# cross-compiler.
 
-# Similarly, some are only suitable for cross toolchains.
-# Remove these if host=target.
-cross_only="target-libgloss target-newlib target-opcodes"
+is_cross_compiler=
 
-case $is_cross_compiler in
-  no) skipdirs="${skipdirs} ${cross_only}" ;;
-  yes) skipdirs="${skipdirs} ${native_only}" ;;
-esac
+if [ x"${host}" = x"${target}" ] ; then
+	# when doing a native toolchain, don't build the targets
+	# that are in the 'cross only' list
+	skipdirs="${skipdirs} ${cross_only}"
+	is_cross_compiler=no
+else
+	# similarly, don't build the targets in the 'native only' 
+	# list when building a cross compiler
+	skipdirs="${skipdirs} ${native_only}"
+	is_cross_compiler=yes
+fi	
+
+# We always want to use the same name for this directory, so that dejagnu
+# can reliably find it.
+target_subdir=${target_alias}
+
+if [ ! -d ${target_subdir} ] ; then
+  if mkdir ${target_subdir} ; then true
+  else
+    echo "'*** could not make ${PWD=`pwd`}/${target_subdir}" 1>&2
+    exit 1
+  fi
+fi
+
+build_subdir=${build_alias}
+
+if [ x"${build_alias}" != x"${host}" ] ; then
+  if [ ! -d ${build_subdir} ] ; then
+    if mkdir ${build_subdir} ; then true
+    else
+      echo "'*** could not make ${PWD=`pwd`}/${build_subdir}" 1>&2
+      exit 1
+    fi
+  fi
+fi
+
+copy_dirs=
+
+# Handle --with-headers=XXX.  The contents of the named directory are
+# copied to $(tooldir)/sys-include.
+if [ x"${with_headers}" != x ]; then
+  if [ x${is_cross_compiler} = xno ]; then
+    echo 1>&2 '***' --with-headers is only supported when cross compiling
+    exit 1
+  fi
+  case "${exec_prefixoption}" in
+  "") x=${prefix} ;;
+  *) x=${exec_prefix} ;;
+  esac
+  copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/sys-include"
+fi
+
+# Handle --with-libs=XXX.  Multiple directories are permitted.  The
+# contents are copied to $(tooldir)/lib.
+if [ x"${with_libs}" != x ]; then
+  if [ x${is_cross_compiler} = xno ]; then
+    echo 1>&2 '***' --with-libs is only supported when cross compiling
+    exit 1
+  fi
+  # Copy the libraries in reverse order, so that files in the first named
+  # library override files in subsequent libraries.
+  case "${exec_prefixoption}" in
+  "") x=${prefix} ;;
+  *) x=${exec_prefix} ;;
+  esac
+  for l in ${with_libs}; do
+    copy_dirs="$l $x/${target_alias}/lib ${copy_dirs}"
+  done
+fi
 
 # If both --with-headers and --with-libs are specified, default to
 # --without-newlib.
-if test x"${with_headers}" != x && test x"${with_headers}" != xno \
-   && test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
-  if test x"${with_newlib}" = x ; then
+if [ x"${with_headers}" != x ] && [ x"${with_libs}" != x ]; then
+  if [ x"${with_newlib}" = x ]; then
     with_newlib=no
   fi
 fi
 
 # Recognize --with-newlib/--without-newlib.
-case ${with_newlib} in
-  no) skipdirs="${skipdirs} target-newlib" ;;
-  yes) skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;;
-esac
+if [ x${with_newlib} = xno ]; then
+  skipdirs="${skipdirs} target-newlib"
+elif [ x${with_newlib} = xyes ]; then
+  skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
+fi
+
+# Default to using --with-stabs for certain targets.
+if [ x${with_stabs} = x ]; then
+  case "${target}" in
+  mips*-*-irix6*)
+    ;;
+  mips*-*-* | alpha*-*-osf*)
+    with_stabs=yes;
+    withoptions="${withoptions} --with-stabs"
+    ;;
+  esac
+fi
+
+# Handle ${copy_dirs}
+set fnord ${copy_dirs}
+shift
+while [ $# != 0 ]; do
+  if [ -f $2/COPIED ] && [ x"`cat $2/COPIED`" = x"$1" ]; then
+    :
+  else
+    echo Copying $1 to $2
+
+    # Use the install script to create the directory and all required
+    # parent directories.
+    if [ -d $2 ]; then
+      :
+    else
+      echo >config.temp
+      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
+    fi
+
+    # Copy the directory, assuming we have tar.
+    # FIXME: Should we use B in the second tar?  Not all systems support it.
+    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
+
+    # It is the responsibility of the user to correctly adjust all
+    # symlinks.  If somebody can figure out how to handle them correctly
+    # here, feel free to add the code.
+
+    echo $1 > $2/COPIED
+  fi
+  shift; shift
+done
 
 # Configure extra directories which are host specific
 
 case "${host}" in
-  *-cygwin*)
-    configdirs="$configdirs libtermcap" ;;
+	i[3456]86-*-go32*)
+	  configdirs="$configdirs dosrel" ;;
+	i[3456]86-*-mingw32*)
+	  configdirs="$configdirs dosrel" ;;
+	*-cygwin*)
+	  configdirs="$configdirs libtermcap dosrel" ;;
 esac
 
-# A target can indicate whether a language isn't supported for some reason.
-# Only spaces may be used in this macro; not newlines or tabs.
-unsupported_languages=
-
 # Remove more programs from consideration, based on the host or 
 # target this usually means that a port of the program doesn't
 # exist yet.
 
+noconfigdirs=""
+
 case "${host}" in
-  hppa*64*-*-*)
-    noconfigdirs="$noconfigdirs byacc"
-    ;;
-  i[[3456789]]86-*-vsta)
-    noconfigdirs="$noconfigdirs tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl itcl gnuserv gettext"
-    ;;
-  i[[3456789]]86-*-go32* | i[[3456789]]86-*-msdosdjgpp*)
-    noconfigdirs="$noconfigdirs tcl tk expect dejagnu send-pr uudecode guile itcl gnuserv libffi"
-    ;;
-  i[[3456789]]86-*-mingw32*)
-    # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl itcl gnuserv"
-    noconfigdirs="$noconfigdirs expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool"
-    ;;
-  i[[3456789]]86-*-beos*)
-    noconfigdirs="$noconfigdirs tk itcl libgui gdb"
+  i[3456]86-*-vsta)
+    noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff guile perl apache inet itcl tix db snavigator gnuserv gettext"
     ;;
+  i[3456]86-*-go32* | i[3456]86-*-msdosdjgpp*)
+    noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl apache inet itcl tix db snavigator gnuserv gettext libffi"
+	;;
+  i[3456]86-*-mingw32*)
+    # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl apache inet itcl tix db snavigator gnuserv"
+     noconfigdirs="expect dejagnu cvs autoconf automake send-pr rcs guile perl texinfo apache inet libtool"
+	;;
+  i[3456]86-*-beos*)
+     noconfigdirs="$noconfigdirs tk itcl tix libgui gdb"
+     ;;
   *-*-cygwin*)
-    noconfigdirs="$noconfigdirs autoconf automake send-pr rcs guile perl"
+     noconfigdirs="autoconf automake send-pr rcs guile perl apache inet"
     ;;
   *-*-netbsd*)
-    noconfigdirs="$noconfigdirs rcs"
+    noconfigdirs="rcs"
     ;;
   ppc*-*-pe)
-    noconfigdirs="$noconfigdirs patch diff make tk tcl expect dejagnu autoconf automake texinfo bison send-pr gprof rcs guile perl itcl gnuserv"
+     noconfigdirs="patch diff make tk tcl expect dejagnu cvssrc autoconf automake texinfo bison send-pr gprof rcs guile perl apache inet itcl tix db snavigator gnuserv"
     ;;
   powerpc-*-beos*)
-    noconfigdirs="$noconfigdirs tk itcl libgui gdb dejagnu readline"
+    noconfigdirs="$noconfigdirs tk itcl tix libgui gdb dejagnu readline"
     ;;
 esac
 
 
-AC_ARG_ENABLE(libada,
-[  --enable-libada        Builds libada directory],
-ENABLE_LIBADA=$enableval,
-ENABLE_LIBADA=yes)
-if test "${ENABLE_LIBADA}" != "yes" ; then
-  noconfigdirs="$noconfigdirs gnattools"
-fi
-
-AC_ARG_ENABLE(libssp,
-[  --enable-libssp        Builds libssp directory],
-ENABLE_LIBSSP=$enableval,
-ENABLE_LIBSSP=yes)
-
-# Set the default so we build libgcc-math for ix86 and x86_64
-AC_ARG_ENABLE(libgcc-math,
-[  --enable-libgcc-math   Builds libgcc-math directory],,
-[
-case "${target}" in
-  i?86-* | x86_64-* )
-    enable_libgcc_math=yes ;;
-  *)
-    enable_libgcc_math=no ;;
-esac
-])
-
 # Save it here so that, even in case of --enable-libgcj, if the Java
 # front-end isn't enabled, we still get libgcj disabled.
 libgcj_saved=$libgcj
@@ -341,505 +600,369 @@ no)
   ;;
 esac
 
-
-# Disable libmudflap on some systems.
-if test x$enable_libmudflap = x ; then
-    case "${target}" in
-    *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
-        # Enable libmudflap by default in GNU and friends.
-	;;
-    *-*-freebsd*)
-        # Enable libmudflap by default in FreeBSD.
-	;;
-    *)
-        # Disable it by default everywhere else.
-	noconfigdirs="$noconfigdirs target-libmudflap"
-	;;
-    esac
-fi
-
-# Disable libgomp on non POSIX hosted systems.
-if test x$enable_libgomp = x ; then
-    # Enable libgomp by default on hosted POSIX systems.
-    case "${target}" in
-    *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
-	;;
-    *-*-netbsd* | *-*-freebsd* | *-*-openbsd*)
-	;;
-    *-*-solaris2* | *-*-sysv4* | *-*-irix* | *-*-osf* | *-*-hpux*)
-	;;
-    *-*-darwin* | *-*-aix*)
-	;;
-    *)
-	noconfigdirs="$noconfigdirs target-libgomp"
-	;;
-    esac
-fi
-
-
 case "${target}" in
-  *-*-chorusos)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-    ;;
-  powerpc-*-darwin*)
-    noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
-    noconfigdirs="$noconfigdirs sim target-rda"
-    ;;
-  *-*-darwin*)
-    noconfigdirs="$noconfigdirs ld gas gdb gprof"
-    noconfigdirs="$noconfigdirs sim target-rda"
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  *-*-freebsd[[12]] | *-*-freebsd[[12]].* | *-*-freebsd*aout*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-    ;;
-  *-*-freebsd*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-    if test "x$with_gmp" = x && test "x$with_gmp_dir" = x \
-	&& test -f /usr/local/include/gmp.h; then
-      with_gmp=/usr/local
-    fi
-
-    # Skip some stuff that's unsupported on some FreeBSD configurations.
-    case "${target}" in
-      i*86-*-*) ;;
-      alpha*-*-*) ;;
-      *)
-	noconfigdirs="$noconfigdirs ${libgcj}"
-	;;
-    esac
-    ;;
-  *-*-kaos*)
-    # Remove unsupported stuff on all kaOS configurations.
-    skipdirs="target-libiberty ${libgcj} target-libstdc++-v3 target-librx"
-    skipdirs="$skipdirs target-libobjc target-examples target-groff target-gperf"
-    skipdirs="$skipdirs zlib fastjar target-libjava target-boehm-gc target-zlib"
-    noconfigdirs="$noconfigdirs target-libgloss"
-    ;;
-  *-*-netbsd*)
-    # Skip some stuff on all NetBSD configurations.
-    noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss"
-
-    # Skip some stuff that's unsupported on some NetBSD configurations.
-    case "${target}" in
-      i*86-*-netbsdelf*) ;;
-      arm*-*-netbsdelf*) ;;
-      *)
-	noconfigdirs="$noconfigdirs ${libgcj}"
-	;;
-    esac
-    ;;
-  *-*-netware*)
-    noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap"
+  *-*-netware)
+    noconfigdirs="$noconfigdirs ${libstdcxx_version} target-newlib target-libiberty target-libgloss target-libffi"
     ;;
   *-*-rtems*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-    # The tpf target doesn't support gdb yet.
-  *-*-tpf*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty ${libgcj} target-libmudflap gdb tcl tk libgui itcl"
-    ;;
-  *-*-uclinux*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-rda ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
     ;;
   *-*-vxworks*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libiberty target-libstdc++-v3 ${libgcj}"
-    ;;
-  m32c-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3"
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libffi"
     ;;
   alpha*-dec-osf*)
-    # ld works, but does not support shared libraries.
-    # newlib is not 64 bit ready.  I'm not sure about fileutils.
+    # ld works, but does not support shared libraries.  emacs doesn't
+    # work.  newlib is not 64 bit ready.  I'm not sure about fileutils.
     # gas doesn't generate exception information.
-    noconfigdirs="$noconfigdirs gas ld fileutils target-newlib target-libgloss"
+    noconfigdirs="$noconfigdirs gas ld emacs fileutils target-newlib target-libgloss"
     ;;
   alpha*-*-*vms*)
-    noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss ${libgcj}"
-    ;;
-  alpha*-*-linux*)
-    # newlib is not 64 bit ready
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss target-libffi"
     ;;
   alpha*-*-*)
     # newlib is not 64 bit ready
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-    ;;
-  am33_2.0-*-linux*)
-    noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
-  sh-*-linux*)
-    noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
-    ;;    
   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    noconfigdirs="$noconfigdirs target-examples"
+    noconfigdirs="$noconfigdirs target-libjava target-libffi target-zlib"
+    noconfigdirs="$noconfigdirs target-boehm-gc target-qthreads target-examples"
     noconfigdirs="$noconfigdirs target-libiberty texinfo send-pr"
-    noconfigdirs="$noconfigdirs tcl tk itcl libgui sim"
+    noconfigdirs="$noconfigdirs tcl tix tk itcl libgui sim"
     noconfigdirs="$noconfigdirs expect dejagnu"
     # the C++ libraries don't build on top of CE's C libraries
-    noconfigdirs="$noconfigdirs target-libstdc++-v3"
-    noconfigdirs="$noconfigdirs target-newlib"
+    noconfigdirs="$noconfigdirs ${libstdcxx_version}"
+    skipdirs="$skipdirs target-newlib"
     case "${host}" in
       *-*-cygwin*) ;; # keep gdb and readline
-      *) noconfigdirs="$noconfigdirs gdb readline"
+      *) noconfigdirs="$noconfigdirs gdb readline ${libstdcxx_version}"
 	 ;;
     esac
     ;;
   arc-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
     ;;
-  arm-semi-aof )
-    ;;
-  arm-*-coff | strongarm-*-coff | xscale-*-coff)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
-    noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+  arm-*-pe*)
+    noconfigdirs="$noconfigdirs target-libgloss"
     ;;
-  arm*-*-linux-gnueabi)
-    noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-    noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+  arm-*-coff*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+    fi
     ;;
-  arm*-*-symbianelf*)
-    noconfigdirs="$noconfigdirs ${libgcj} target-libiberty"
+  arm-*-elf*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+    fi
     ;;
-  arm-*-pe*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+  arm-*-oabi*)
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
     ;;
   thumb-*-coff)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
     ;;
   thumb-*-elf)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
     ;;
-  thumb-*-pe)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+  thumb-*-oabi)
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
     ;;
-  arm-*-riscix*)
-    noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
+  strongarm-*-elf)
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+    fi
     ;;
-  avr-*-*)
-    noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
+  strongarm-*-coff)
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+    fi
     ;;
-  bfin-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss gdb"
-    if test x${is_cross_compiler} != xno ; then
-      target_configdirs="${target_configdirs} target-bsp target-cygmon"
+  xscale-*-elf)
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
     fi
     ;;
-  c4x-*-* | tic4x-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
+  xscale-*-coff)
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+    fi
     ;;
-  c54x*-*-* | tic54x-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj} gcc gdb newlib"
-    ;;
-  cris-*-* | crisv32-*-*)
-    unsupported_languages="$unsupported_languages java"
-    case "${target}" in
-      *-*-aout)
-	unsupported_languages="$unsupported_languages fortran"
-	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
-      *-*-elf)
-	unsupported_languages="$unsupported_languages fortran"
-	noconfigdirs="$noconfigdirs target-boehm-gc";;
-      *-*-linux*)
-	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
-      *)
-	unsupported_languages="$unsupported_languages fortran"
-	noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;
-    esac
+  thumb-*-pe)
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
+    ;;
+  arm-*-riscix*)
+    noconfigdirs="$noconfigdirs ld target-libgloss target-libffi"
+    ;;
+  c4x-*-*)
+    noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi"
     ;;
-  crx-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-mudflap ${libgcj}"
+  c54x*-*-* | tic54x-*-*)
+    noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi gcc gdb newlib"
     ;;
   d10v-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi"
     ;;
   d30v-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj} gdb"
     ;;
   fr30-*-elf*)
-    noconfigdirs="$noconfigdirs ${libgcj} gdb"
-    ;;
-  frv-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
+    fi
     ;;
   h8300*-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libgloss"
     ;;
   h8500-*-*)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
-    ;;
-  hppa1.1-*-osf* | hppa1.1-*-bsd* )
-    ;;
-  hppa*64*-*-linux* | parisc*64*-*-linux*)
-    # In this case, it's because the hppa64-linux target is for
-    # the kernel only at this point and has no libc, and thus no
-    # headers, crt*.o, etc., all of which are needed by these.
-    noconfigdirs="$noconfigdirs target-zlib"
-    ;;
-  parisc*-*-linux* | hppa*-*-linux*)
+    noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi"
     ;;
   hppa*-*-*elf* | \
+  hppa*-*-linux-gnu* | \
   hppa*-*-lites* | \
-  hppa*-*-openbsd* | \
   hppa*64*-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    # Do configure ld/binutils/gas for this case.
     ;;
   hppa*-*-*)
+    # HP's C compiler doesn't handle Emacs correctly (but on BSD and Mach
+    # cc is gcc, and on any system a user should be able to link cc to
+    # whatever they want.  FIXME, emacs emacs19).
+    case "${CC}" in
+	"" | cc*) noconfigdirs="$noconfigdirs emacs emacs19" ;;
+        *) ;;
+    esac
     # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't
     # build on HP-UX 10.20.
     noconfigdirs="$noconfigdirs ld shellutils ${libgcj}"
     ;;
-  i960-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj} gdb"
-    ;;
   ia64*-*-elf*)
     # No gdb support yet.
-    noconfigdirs="$noconfigdirs readline mmalloc libgui itcl gdb"
-    ;;
-  ia64*-**-hpux*)
-    # No gdb or ld support yet.
-    noconfigdirs="$noconfigdirs ${libgcj} readline mmalloc libgui itcl gdb ld"
-    ;;
-  i370-*-opened*)
+    noconfigdirs="$noconfigdirs tix readline mmalloc libgui itcl gdb"
     ;;
-  i[[3456789]]86-*-coff | i[[3456789]]86-*-elf)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  i[[3456789]]86-*-linux*)
-    # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's
-    # not build java stuff by default.
-    case "${target}" in
-      *-*-*libc1*)
-	noconfigdirs="$noconfigdirs ${libgcj}";;
-    esac
-
-    # This section makes it possible to build newlib natively on linux.
-    # If we are using a cross compiler then don't configure newlib.
-    if test x${is_cross_compiler} != xno ; then
-      noconfigdirs="$noconfigdirs target-newlib"
+  i[3456]86-*-coff | i[3456]86-*-elf)
+    if [ x${is_cross_compiler} != xno ] ; then
+         target_configdirs="${target_configdirs} target-libstub target-cygmon"
     fi
-    noconfigdirs="$noconfigdirs target-libgloss"
-    # If we are not using a cross compiler, do configure newlib.
-    # Note however, that newlib will only be configured in this situation
-    # if the --with-newlib option has been given, because otherwise
-    # 'target-newlib' will appear in skipdirs.
     ;;
-  i[[3456789]]86-*-mingw32*)
+  i[3456]86-*-go32* | i[3456]-*-msdosdjgpp*)
+    # but don't build gdb
+    noconfigdirs="$noconfigdirs gdb ${libstdcxx_version} target-libffi"
+    ;;
+  i[3456]86-*-mingw32*)
     target_configdirs="$target_configdirs target-mingw"
     noconfigdirs="$noconfigdirs expect target-libgloss ${libgcj}"
 
     # Can't build gdb for mingw32 if not native.
     case "${host}" in
-      i[[3456789]]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
-      *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl gnuserv"
+      i[3456]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
+      *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix db snavigator gnuserv"
          ;;
     esac
     ;;    
   *-*-cygwin*)
     target_configdirs="$target_configdirs target-libtermcap target-winsup"
     noconfigdirs="$noconfigdirs target-gperf target-libgloss ${libgcj}"
-    # always build newlib if winsup directory is present.
-    if test -d "$srcdir/winsup"; then
-      skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
-    elif test -d "$srcdir/newlib"; then
-      echo "Warning: winsup is missing so newlib can't be built."
-    fi
+    # always build newlib.
+    skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
 
     # Can't build gdb for Cygwin if not native.
     case "${host}" in
       *-*-cygwin*) ;; # keep gdb tcl tk expect etc.
-      *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl libgui gnuserv"
+      *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix libgui db snavigator gnuserv"
          ;;
     esac
     ;;    
-  i[[3456789]]86-moss-msdos | i[[3456789]]86-*-moss* | \
-  i[[3456789]]86-*-uwin* | i[[3456789]]86-*-interix* )
-    ;;
-  i[[3456789]]86-*-pe)
-    noconfigdirs="$noconfigdirs target-libstdc++-v3 target-libgloss ${libgcj}"
+  i[3456]86-*-pe)
+    noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss target-libffi"
     ;;
-  i[[3456789]]86-*-sco3.2v5*)
+  i[3456]86-*-sco3.2v5*)
     # The linker does not yet know about weak symbols in COFF,
     # and is not configured to handle mixed ELF and COFF.
-    noconfigdirs="$noconfigdirs ld target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs ld target-libgloss target-libffi"
     ;;
-  i[[3456789]]86-*-sco*)
-    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
+  i[3456]86-*-sco*)
+    noconfigdirs="$noconfigdirs gprof target-libgloss target-libffi"
     ;;
-  i[[3456789]]86-*-solaris2*)
+  i[3456]86-*-solaris2*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
-  i[[3456789]]86-*-sysv4*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-    ;;
-  i[[3456789]]86-*-beos*)
-    noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
-    ;;
-  i[[3456789]]86-*-rdos*)
-    noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
-    ;;
-  m32r-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
-    noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
-    ;;
-  m68k-*-elf*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+  i[3456]86-*-sysv4*)
+    # The SYSV4 C compiler doesn't handle Emacs correctly
+    case "${CC}" in
+	"" | cc*) noconfigdirs="$noconfigdirs emacs emacs19" ;;
+        *) ;;
+    esac
+    # but that's okay since emacs doesn't work anyway
+    noconfigdirs="$noconfigdirs emacs emacs19 target-libgloss target-libffi"
+    ;;
+  i[3456]86-*-beos*)
+     noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
+     ;;
+ m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
+    noconfigdirs="$noconfigdirs target-libiberty target-librx target-libg++ target-libstdc++ target-libio target-libf2c target-libchill target-zlib target-libobjc"
+    ;;
+ m68k-*-elf*)
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+    fi
     ;;
   m68k-*-coff*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  mcore-*-pe*)
-  # The EPOC C++ environment does not support exceptions or rtti,
-  # and so building libstdc++-v3 tends not to always work.
-    noconfigdirs="$noconfigdirs target-libstdc++-v3"
-    ;;
-  mmix-*-*)
-    noconfigdirs="$noconfigdirs target-libffi target-boehm-gc gdb libgloss"
-    unsupported_languages="$unsupported_languages fortran java"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-cygmon"
+    fi
     ;;
   mn10200-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-libstub target-cygmon"
+    fi
     ;;
   mn10300-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  mt-*-*)
-    noconfigdirs="$noconfigdirs sim"
+    noconfigdirs="$noconfigdirs target-libffi"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
+    fi
     ;;
   powerpc-*-aix*)
     # copied from rs6000-*-* entry
-    noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}"
+    use_gnu_ld=yes
     ;;
   powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
     target_configdirs="$target_configdirs target-winsup"
-    noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl gnuserv ${libgcj}"
+    noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl tix db snavigator gnuserv target-libffi"
     # always build newlib.
     skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
     ;;
     # This is temporary until we can link against shared libraries
   powerpcle-*-solaris*)
-    noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl gnuserv ${libgcj}"
+    noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl tix db snavigator gnuserv target-libffi"
     ;;
   powerpc-*-beos*)
-    noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
     ;;
   powerpc-*-eabi)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* )
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
+    fi
     ;;
   rs6000-*-lynxos*)
-    noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}"
+    # The CVS server code doesn't work on the RS/6000
+    noconfigdirs="$noconfigdirs target-newlib gprof cvssrc target-libffi"
     ;;
   rs6000-*-aix*)
-    noconfigdirs="$noconfigdirs gprof target-libgloss target-libssp ${libgcj}"
+    noconfigdirs="$noconfigdirs gprof target-libffi"
+    use_gnu_ld=yes
     ;;
   rs6000-*-*)
-    noconfigdirs="$noconfigdirs gprof ${libgcj}"
+    noconfigdirs="$noconfigdirs gprof target-libffi"
     ;;
   m68k-apollo-*)
-    noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss target-libffi"
     ;;
   mips*-*-irix5*)
-    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
+    # The GNU linker does not support shared libraries.
+    # emacs is emacs 18, which does not work on Irix 5 (emacs19 does work)
+    noconfigdirs="$noconfigdirs ld gprof emacs target-libgloss"
     ;;
   mips*-*-irix6*)
+    # The GNU assembler does not support IRIX 6.
+    # emacs is emacs 18, which does not work on Irix 5 (emacs19 does work)
     # Linking libjava exceeds command-line length limits on at least
     # IRIX 6.2, but not on IRIX 6.5.
     # Also, boehm-gc won't build on IRIX 6.5, according to Jeffrey Oldham
     # <oldham@codesourcery.com>
-    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs gas gprof emacs target-libgloss ${libgcj}"
     ;;
   mips*-dec-bsd*)
-    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs gprof target-libgloss target-libffi"
     ;;
   mips*-*-bsd*)
-    noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs gprof target-libgloss target-libffi"
     ;;
   mipstx39-*-*)
-    noconfigdirs="$noconfigdirs gprof ${libgcj}"   # same as generic mips
-    ;;
-  mips64*-*-linux*)
-    noconfigdirs="$noconfigdirs target-newlib ${libgcj}"
-    ;;
-  mips*-*-linux*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-    ;;
+    noconfigdirs="$noconfigdirs gprof target-libffi"   # same as generic mips
+    target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
+   ;;
   mips*-*-*)
-    noconfigdirs="$noconfigdirs gprof ${libgcj}"
+    noconfigdirs="$noconfigdirs gprof target-libffi"
     ;;
   romp-*-*)
-    noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss target-libffi"
     ;;
-  sh-*-* | sh64-*-*)
+  sh-*-*)
     case "${host}" in
-      i[[3456789]]86-*-vsta) ;; # don't add gprof back in
-      i[[3456789]]86-*-go32*) ;; # don't add gprof back in
-      i[[3456789]]86-*-msdosdjgpp*) ;; # don't add gprof back in
+      i[3456]86-*-vsta) ;; # don't add gprof back in
+      i[3456]86-*-go32*) ;; # don't add gprof back in
+      i[3456]86-*-msdosdjgpp*) ;; # don't add gprof back in
       *) skipdirs=`echo " ${skipdirs} " | sed -e 's/ gprof / /'` ;;
     esac
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
     ;;
   sparc-*-elf*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-libstub target-cygmon"
+    fi
     ;;
   sparc64-*-elf*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-libstub target-cygmon"
+    fi
+    noconfigdirs="$noconfigdirs target-libffi"
     ;;
   sparclite-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-bsp target-libstub target-cygmon"
+    fi
+    noconfigdirs="$noconfigdirs target-libffi"
     ;;
   sparc-*-sunos4*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    if test x${is_cross_compiler} != xno ; then
-           noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss"
+    if [ x${is_cross_compiler} != xno ] ; then
+           noconfigdirs="$noconfigdirs gdb gdbtest target-newlib target-libgloss"
     else
            use_gnu_ld=no
     fi
     ;;
-  sparc-*-solaris2.[[0-6]] | sparc-*-solaris2.[[0-6]].*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  sparc-*-solaris* | sparc64-*-solaris* | sparcv9-*-solaris*)
+  sparc-*-solaris*)
+    case "${host}" in
+    sparc-*-solaris2.8)
+      # According to Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>, libjava
+      # won't build correctly on Solaris 8 if there's a
+      # previously-installed version of GCC in the configured prefix.
+      # This problem does not show up on earlier versions of Solaris.
+      noconfigdirs="$noconfigdirs ${libgcj}"
+      ;;
+    esac
     ;;
   v810-*-*)
-    noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libstdc++-v3 opcodes target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld ${libstdcxx_version} opcodes target-libgloss target-libffi"
     ;;
   v850-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
     ;;
   v850e-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
     ;;
   v850ea-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libgloss target-libffi"
     ;;
   vax-*-vms)
-    noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes target-libgloss target-libffi"
     ;;
   vax-*-*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-    ;;
-  xtensa-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  ip2k-*-*)
-    noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
-    ;;
-  *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libffi"
     ;;
   *-*-lynxos*)
-    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss target-libffi"
     ;; 
-  *-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
+  *-*-macos* | \
+  *-*-mpw*)
+    # Macs want a resource compiler.
+    configdirs="$configdirs grez"
+    noconfigdirs="$noconfigdirs target-libffi"
+    ;;    
 esac
 
 # If we aren't building newlib, then don't build libgloss, since libgloss
@@ -849,503 +972,84 @@ case "${noconfigdirs}" in
   *target-newlib*) noconfigdirs="$noconfigdirs target-libgloss" ;;
 esac
 
-# Work in distributions that contain no compiler tools, like Autoconf.
-tentative_cc=""
-host_makefile_frag=/dev/null
-if test -d ${srcdir}/config ; then
-case "${host}" in
-  m68k-hp-hpux*)
-    # Avoid "too much defining" errors from HPUX compiler.
-    tentative_cc="cc -Wp,-H256000"
-    # If "ar" in $PATH is GNU ar, the symbol table may need rebuilding.
-    # If it's HP/UX ar, this should be harmless.
-    RANLIB="ar ts"
-    ;;
-  m68k-apollo-sysv*)
-    tentative_cc="cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DUSG"
-    ;;
-  m68k-apollo-bsd*)
-    #None of the Apollo compilers can compile gas or binutils.  The preprocessor
-    # chokes on bfd, the compiler won't let you assign integers to enums, and
-    # other problems.  Defining CC to gcc is a questionable way to say "don't use
-    # the apollo compiler" (the preferred version of GCC could be called cc,
-    # or whatever), but I'm not sure leaving CC as cc is any better...
-    #CC=cc -A ansi -A runtype,any -A systype,any -U__STDC__ -DNO_STDARG
-    # Used to have BISON=yacc.
-    tentative_cc=gcc
-    ;;
-  m88k-dg-dgux*)
-    tentative_cc="gcc -Wall -ansi -D__using_DGUX"
-    ;;
-  m88k-harris-cxux*)
-    # Under CX/UX, we want to tell the compiler to use ANSI mode.
-    tentative_cc="cc -Xa"
-    host_makefile_frag="config/mh-cxux"
-    ;;
-  m88k-motorola-sysv*)
-    ;;
-  mips*-dec-ultrix*)
-    tentative_cc="cc -Wf,-XNg1000"
-    host_makefile_frag="config/mh-decstation"
-    ;;
-  mips*-nec-sysv4*)
-    # The C compiler on NEC MIPS SVR4 needs bigger tables.
-    tentative_cc="cc -ZXNd=5000 -ZXNg=1000"
-    host_makefile_frag="config/mh-necv4"
-    ;;
-  mips*-sgi-irix4*)
-    # Tell compiler to use K&R C.  We can't compile under the SGI Ansi
-    # environment.  Also bump switch table size so that cp-parse will
-    # compile.  Bump string length limit so linker builds.
-    tentative_cc="cc -cckr -Wf,-XNg1500 -Wf,-XNk1000 -Wf,-XNh2000 -Wf,-XNl8192"
-    ;;
-  mips*-*-sysv4*)
-    host_makefile_frag="config/mh-sysv4"
-    ;;
-  mips*-*-sysv*)
-    # This is for a MIPS running RISC/os 4.52C.
-
-    # This is needed for GDB, but needs to be in the top-level make because
-    # if a library is compiled with the bsd headers and gets linked with the
-    # sysv system libraries all hell can break loose (e.g. a jmp_buf might be
-    # a different size).
-    # ptrace(2) apparently has problems in the BSD environment.  No workaround is
-    # known except to select the sysv environment.  Could we use /proc instead?
-    # These "sysv environments" and "bsd environments" often end up being a pain.
-    #
-    # This is not part of CFLAGS because perhaps not all C compilers have this
-    # option.
-    tentative_cc="cc -systype sysv"
-    ;;
-  i370-ibm-opened*)
-    tentative_cc="c89"
-    ;;
-  i[[3456789]]86-*-sysv5*)
-    host_makefile_frag="config/mh-sysv5"
-    ;;
-  i[[3456789]]86-*-dgux*)
-    tentative_cc="gcc -Wall -ansi -D__using_DGUX"
-    host_makefile_frag="config/mh-dgux386"
-    ;;
-  i[[3456789]]86-ncr-sysv4.3*)
-    # The MetaWare compiler will generate a copyright message unless you
-    # turn it off by adding the -Hnocopyr flag.
-    tentative_cc="cc -Hnocopyr"
-    ;;
-  i[[3456789]]86-ncr-sysv4*)
-    # for an NCR 3000 (i486/SVR4) system.
-    # The NCR 3000 ships with a MetaWare compiler installed as /bin/cc.
-    # This compiler not only emits obnoxious copyright messages every time
-    # you run it, but it chokes and dies on a whole bunch of GNU source
-    # files.  Default to using the AT&T compiler installed in /usr/ccs/ATT/cc.
-    tentative_cc="/usr/ccs/ATT/cc"
-    host_makefile_frag="config/mh-ncr3000"
-    ;;
-  i[[3456789]]86-*-sco3.2v5*)
-    ;;
-  i[[3456789]]86-*-sco*)
-    # The native C compiler botches some simple uses of const.  Unfortunately,
-    # it doesn't defined anything like "__sco__" for us to test for in ansidecl.h.
-    tentative_cc="cc -Dconst="
-    host_makefile_frag="config/mh-sco"
-    ;;
-  i[[3456789]]86-*-udk*)
-    host_makefile_frag="config/mh-sysv5"
-    ;;
-  i[[3456789]]86-*-solaris2*)
-    host_makefile_frag="config/mh-sysv4"
-    ;;
-  i[[3456789]]86-*-msdosdjgpp*)
-    host_makefile_frag="config/mh-djgpp"
-    ;;
-  *-cygwin*)
-    host_makefile_frag="config/mh-cygwin"
-    ;;
-  *-mingw32*)
-    ;;
-  *-interix*)
-    host_makefile_frag="config/mh-interix"
-    ;;
-  vax-*-ultrix2*)
-    # The old BSD pcc isn't up to compiling parts of gdb so use gcc
-    tentative_cc=gcc
-    ;;
-  *-*-solaris2*)
-    host_makefile_frag="config/mh-solaris"
-    ;;
-  m68k-sun-sunos*)
-    # Sun's C compiler needs the -J flag to be able to compile cp-parse.c
-    # without overflowing the jump tables (-J says to use a 32 bit table)
-    tentative_cc="cc -J"
-    ;;
-  *-hp-hpux*)
-    tentative_cc="cc -Wp,-H256000"
-    ;;
-  *-*-hiux*)
-    tentative_cc="cc -Wp,-H256000"
-    ;;
-  rs6000-*-lynxos*)
-    # /bin/cc is less than useful for our purposes.  Always use GCC
-    tentative_cc="/usr/cygnus/progressive/bin/gcc"
-    host_makefile_frag="config/mh-lynxrs6k"
-    ;;
-  powerpc-*-darwin*)
-    host_makefile_frag="config/mh-ppc-darwin"
-    ;;
-  powerpc-*-aix*)
-    host_makefile_frag="config/mh-ppc-aix"
-    ;;
-  rs6000-*-aix*)
-    host_makefile_frag="config/mh-ppc-aix"
-    ;;
-  *-*-lynxos*)
-    # /bin/cc is less than useful for our purposes.  Always use GCC
-    tentative_cc="/bin/gcc"
-    ;;
-  *-*-sysv4*)
-    host_makefile_frag="config/mh-sysv4"
-    ;;
-  # This is placed last to prevent interfering with the cases above.
-  i[[3456789]]86-*-*)
-    # Build the stage2 and stage3 compilers with -fomit-frame-pointer.
-    host_makefile_frag="config/mh-x86omitfp"
-    ;;
-esac
-fi
-
-# If we aren't going to be using gcc, see if we can extract a definition
-# of CC from the fragment.
-# Actually, use the 'pre-extracted' version above.
-if test -z "${CC}" && test "${build}" = "${host}" ; then
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
-  found=
-  for dir in $PATH; do
-    test -z "$dir" && dir=.
-    if test -f $dir/gcc; then
-      found=yes
-      break
-    fi
-  done
-  IFS="$save_ifs"
-  if test -z "${found}" && test -n "${tentative_cc}" ; then
-    CC=$tentative_cc
-  fi
-fi
-
-if test "${build}" != "${host}" ; then
-  # If we are doing a Canadian Cross, in which the host and build systems
-  # are not the same, we set reasonable default values for the tools.
-
-  CC=${CC-${host_alias}-gcc}
-  CFLAGS=${CFLAGS-"-g -O2"}
-  CXX=${CXX-${host_alias}-c++}
-  CXXFLAGS=${CXXFLAGS-"-g -O2"}
-  CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-
-else
-  # Set reasonable default values for some tools even if not Canadian.
-  # Of course, these are different reasonable default values, originally
-  # specified directly in the Makefile.
-  # We don't export, so that autoconf can do its job.
-  # Note that all these settings are above the fragment inclusion point
-  # in Makefile.in, so can still be overridden by fragments.
-  # This is all going to change when we autoconfiscate...
-
-  CC_FOR_BUILD="\$(CC)"
-  AC_PROG_CC
-
-  # We must set the default linker to the linker used by gcc for the correct
-  # operation of libtool.  If LD is not defined and we are using gcc, try to
-  # set the LD default to the ld used by gcc.
-  if test -z "$LD"; then
-    if test "$GCC" = yes; then
-      case $build in
-      *-*-mingw*)
-	gcc_prog_ld=`$CC -print-prog-name=ld 2>&1 | tr -d '\015'` ;;
-      *)
-	gcc_prog_ld=`$CC -print-prog-name=ld 2>&1` ;;
-      esac
-      case $gcc_prog_ld in
-      # Accept absolute paths.
-      [[\\/]* | [A-Za-z]:[\\/]*)]
-        LD="$gcc_prog_ld" ;;
-      esac
-    fi
-  fi
-
-  CXX=${CXX-"c++"}
-  CFLAGS=${CFLAGS-"-g"}
-  CXXFLAGS=${CXXFLAGS-"-g -O2"}
-fi
-
-ACX_PROG_GNAT
-ACX_PROG_CMP_IGNORE_INITIAL
-
-# Check for GMP and MPFR
-gmplibs=
-gmpinc=
-have_gmp=yes
-# Specify a location for mpfr
-# check for this first so it ends up on the link line before gmp.
-AC_ARG_WITH(mpfr-dir, [  --with-mpfr-dir=PATH    Specify source directory for MPFR library])
-
-if test "x$with_mpfr_dir" != x; then
-  gmpinc="-I$with_mpfr_dir"
-  gmplibs="$with_mpfr_dir/libmpfr.a"
-else
-  gmplibs="-lmpfr"
-fi
-
-AC_ARG_WITH(mpfr, [  --with-mpfr=PATH        Specify directory for installed MPFR library])
-
-if test "x$with_mpfr" != x; then
-  gmplibs="-L$with_mpfr/lib $gmplibs"
-  gmpinc="-I$with_mpfr/include"
-fi
-
-# Specify a location for gmp
-AC_ARG_WITH(gmp-dir, [  --with-gmp-dir=PATH     Specify source directory for GMP library])
-
-if test "x$with_gmp_dir" != x; then
-  gmpinc="$gmpinc -I$with_gmp_dir"
-  if test -f "$with_gmp_dir/.libs/libgmp.a"; then
-    gmplibs="$gmplibs $with_gmp_dir/.libs/libgmp.a"
-  elif test -f "$with_gmp_dir/_libs/libgmp.a"; then
-    gmplibs="$gmplibs $with_gmp_dir/_libs/libgmp.a"
-  fi
-  # One of the later tests will catch the error if neither library is present.
-else
-  gmplibs="$gmplibs -lgmp"
-fi
-
-AC_ARG_WITH(gmp, [  --with-gmp=PATH         Specify directory for installed GMP library])
-
-if test "x$with_gmp" != x; then
-  gmplibs="-L$with_gmp/lib $gmplibs"
-  gmpinc="-I$with_gmp/include $gmpinc"
+# Make sure we don't let GNU ld be added if we didn't want it.
+if [ x$with_gnu_ld = xno ]; then
+  use_gnu_ld=no
+  noconfigdirs="$noconfigdirs ld"
 fi
 
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $gmpinc"
-# Check GMP actually works
-AC_MSG_CHECKING([for correct version of gmp.h])
-AC_TRY_COMPILE([#include "gmp.h"],[
-#if __GNU_MP_VERSION < 3
-choke me
-#endif
-], [AC_MSG_RESULT([yes])],
-  [AC_MSG_RESULT([no]); have_gmp=no])
-
-if test x"$have_gmp" = xyes; then
-  AC_MSG_CHECKING([for MPFR])
-
-  saved_LIBS="$LIBS"
-  LIBS="$LIBS $gmplibs"
-  AC_TRY_LINK([#include <gmp.h>
-#include <mpfr.h>], [mpfr_t n; mpfr_init(n);],
-    [AC_MSG_RESULT([yes])],  [AC_MSG_RESULT([no]); have_gmp=no])
-  LIBS="$saved_LIBS"
-  CFLAGS="$saved_CFLAGS"
+# Make sure we don't let GNU as be added if we didn't want it.
+if [ x$with_gnu_as = xno ]; then
+  use_gnu_as=no
+  noconfigdirs="$noconfigdirs gas"
 fi
 
-# Flags needed for both GMP and/or MPFR
-AC_SUBST(gmplibs)
-AC_SUBST(gmpinc)
-
-# By default, C is the only stage 1 language.
-stage1_languages=c
-AC_SUBST(stage1_languages)
-
 # Figure out what language subdirectories are present.
 # Look if the user specified --enable-languages="..."; if not, use
 # the environment variable $LANGUAGES if defined. $LANGUAGES might
 # go away some day.
 # NB:  embedded tabs in this IF block -- do not untabify
-if test -d ${srcdir}/gcc; then
-  if test x"${enable_languages+set}" != xset; then
-    if test x"${LANGUAGES+set}" = xset; then
-      enable_languages="${LANGUAGES}"
-        echo configure.in: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2
-    else
-      enable_languages=all
-    fi
-  else
-    if test x"${enable_languages}" = x ||
-       test x"${enable_languages}" = xyes;
-       then
-      echo configure.in: --enable-languages needs at least one language argument 1>&2
-      exit 1
-    fi
-  fi
-  enable_languages=`echo "${enable_languages}" | sed -e 's/[[ 	,]][[ 	,]]*/,/g' -e 's/,$//'`
-
-  # 'f95' is the old name for the 'fortran' language. We issue a warning
-  # and make the substitution.
-  case ,${enable_languages}, in
-    *,f95,*)
-      echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
-      enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
-      ;;
-  esac
+if test x"${enable_languages+set}" != xset; then
+	if test x"${LANGUAGES+set}" = xset; then
+		enable_languages="${LANGUAGES}"
+		echo configure.in: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2
+	else
+		enable_languages=all
+	fi
+else
+	if test x"${enable_languages}" = x ||
+	   test x"${enable_languages}" = xyes;
+	then
+		echo configure.in: --enable-languages needs at least one language argument 1>&2
+		exit 1
+	fi
+fi
+enable_languages=`echo "${enable_languages}" | sed -e 's/[ 	,][ 	,]*/,/g' -e 's/,$//'`
 
-  # First scan to see if an enabled language requires some other language.
-  # We assume that a given config-lang.in will list all the language
-  # front ends it requires, even if some are required indirectly.
-  for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
-    case ${lang_frag} in
-      ..) ;;
-      # The odd quoting in the next line works around
-      # an apparent bug in bash 1.12 on linux.
-      ${srcdir}/gcc/[[*]]/config-lang.in) ;;
-      *)
-        # From the config-lang.in, get $language, $lang_requires
-        language=
-        lang_requires=
-        . ${lang_frag}
-        for other in ${lang_requires} ; do
-          case ,${enable_languages}, in
-	    *,$other,*) ;;
-	    *,all,*) ;;
-	    *,$language,*)
-	      echo " \`$other' language required by \`$language'; enabling" 1>&2
-	      enable_languages="${enable_languages},${other}"
-	      ;;
+subdirs=
+for lang in ${srcdir}/gcc/*/config-lang.in ..
+do
+	case $lang in
+	..) ;;
+	# The odd quoting in the next line works around
+	# an apparent bug in bash 1.12 on linux.
+	${srcdir}/gcc/[*]/config-lang.in) ;;
+	*)
+	  lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^ 	]*\).*$,\1,p' $lang`
+	  this_lang_libs=`sed -n -e 's,^target_libs=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^target_libs=\([^ 	]*\).*$,\1,p' $lang`
+	  build_by_default=`sed -n -e 's,^build_by_default=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^build_by_default=\([^ 	]*\).*$,\1,p' $lang`
+	  if test "x$lang_alias" = x
+	  then
+		echo "$lang doesn't set \$language." 1>&2
+		exit 1
+	  fi
+	  case ${build_by_default},${enable_languages}, in
+	  *,$lang_alias,*) add_this_lang=yes ;;
+	  no,*) add_this_lang=no ;;
+	  *,all,*) add_this_lang=yes ;;
+	  *) add_this_lang=no ;;
 	  esac
-        done
-        ;;
-    esac
-  done
-
-  new_enable_languages=c
-  missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e s/,c,/,/ `
-  potential_languages=c
-
-  for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
-    case ${lang_frag} in
-      ..) ;;
-      # The odd quoting in the next line works around
-      # an apparent bug in bash 1.12 on linux.
-      ${srcdir}/gcc/[[*]]/config-lang.in) ;;
-      *)
-        # From the config-lang.in, get $language, $target_libs, 
-        # $lang_dirs, $boot_language, and $build_by_default
-        language=
-        target_libs=
-        lang_dirs=
-        boot_language=
-        build_by_default=
-        need_gmp=
-        . ${lang_frag}
-        potential_languages="${potential_languages},${language}"
-        # This is quite sensitive to the ordering of the case statement arms.
-        case ,${enable_languages},:${language}:${have_gnat}:${build_by_default} in
-          *::*:*)
-            echo "${lang_frag} doesn't set \$language." 1>&2
-            exit 1
-            ;;
-          *:ada:no:*)
-            # Ada was requested with no preexisting GNAT.  Disable unconditionally.
-            add_this_lang=no
-            ;;
-          *,${language},*:*:*:*)
-            # Language was explicitly selected; include it.
-            add_this_lang=yes
-            ;;
-          *,all,*:*:*:no)
-            # 'all' was selected, but this is not a default language
-            # so do not include it.
-            add_this_lang=no
-            ;;
-          *,all,*:*:*:*)
-            # 'all' was selected and this is a default language; include it.
-            add_this_lang=yes
-            ;;
-          *)
-            add_this_lang=no
-            ;;
-        esac
-
-        # Disable languages that need GMP if it isn't available.
-        case ,${enable_languages},:${have_gmp}:${need_gmp} in
-          *,${language},*:no:yes)
-            # Specifically requested language; tell them.
-            AC_MSG_ERROR([GMP with MPFR support is required to build $language])
-            ;;
-          *:no:yes)
-            # Silently disable.
-            add_this_lang=no
-            ;;
-        esac
-
-	# Disable a language that is unsupported by the target.
-	case " $unsupported_languages " in
-	  *" $language "*)
-	    add_this_lang=no
-	    ;;
+	  if test x"${add_this_lang}" = xyes; then
+	      eval target_libs='"$target_libs "'\"$this_lang_libs\"
+	  else
+	      eval noconfigdirs='"$noconfigdirs "'\"$this_lang_libs\"
+	  fi
+	  ;;
 	esac
-
-	case $add_this_lang in
-	  no)
-            # Remove language-dependent dirs.
-            eval noconfigdirs='"$noconfigdirs "'\"$target_libs $lang_dirs\"
-	    ;;
-          *)
-	    new_enable_languages="$new_enable_languages,$language"
-	    missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"`
-	    case ${boot_language} in
-	      yes)
-		# Add to (comma-separated) list of stage 1 languages.
-		stage1_languages="${stage1_languages},${language}"
-		;;
-	    esac
-	    ;;
-        esac
-        ;;
-    esac
-  done
-
-  missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"`
-  if test "x$missing_languages" != x; then
-    AC_MSG_ERROR([
-The following requested languages could not be built: ${missing_languages}
-Recognised languages are: ${potential_languages}])
-  fi
-
-  if test "x$new_enable_languages" != "x$enable_languages"; then
-    echo The following languages will be built: ${new_enable_languages}
-  fi
-  enable_languages="$new_enable_languages"
-  ac_configure_args=`echo " $ac_configure_args" | sed -e 's/ --enable-languages=[[^ ]]*//' -e 's/$/ --enable-languages='"$enable_languages"/ `
-fi
-
-# Handle --disable-<component> generically.
-for dir in $configdirs $build_configdirs $target_configdirs ; do
-  dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g`
-  if eval test x\${enable_${dirname}} "=" xno ; then
-    noconfigdirs="$noconfigdirs $dir"
-  fi
 done
 
-# Remove the entries in $skipdirs and $noconfigdirs from $configdirs,
-# $build_configdirs and $target_configdirs.
+
+# Remove the entries in $skipdirs and $noconfigdirs from $configdirs and
+# $target_configdirs.
 # If we have the source for $noconfigdirs entries, add them to $notsupp.
 
 notsupp=""
 for dir in . $skipdirs $noconfigdirs ; do
-  dirname=`echo $dir | sed -e s/target-//g -e s/build-//g`
-  if test $dir != .  && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+  dirname=`echo $dir | sed -e s/target-//g`
+  if [ $dir != . ]  && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
     configdirs=`echo " ${configdirs} " | sed -e "s/ ${dir} / /"`
-    if test -r $srcdir/$dirname/configure ; then
-      if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
-	true
-      else
-	notsupp="$notsupp $dir"
-      fi
-    fi
-  fi
-  if test $dir != .  && echo " ${build_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
-    build_configdirs=`echo " ${build_configdirs} " | sed -e "s/ ${dir} / /"`
-    if test -r $srcdir/$dirname/configure ; then
+    if [ -r $srcdir/$dirname/configure ] \
+	|| [ -r $srcdir/$dirname/configure.in ]; then
       if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
 	true
       else
@@ -1353,9 +1057,10 @@ for dir in . $skipdirs $noconfigdirs ; do
       fi
     fi
   fi
-  if test $dir != . && echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
+  if [ $dir != . ]  && echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
     target_configdirs=`echo " ${target_configdirs} " | sed -e "s/ ${dir} / /"`
-    if test -r $srcdir/$dirname/configure ; then
+    if [ -r $srcdir/$dirname/configure ] \
+	|| [ -r $srcdir/$dirname/configure.in ]; then
       if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
 	true
       else
@@ -1367,74 +1072,59 @@ done
 
 # Sometimes the tools are distributed with libiberty but with no other
 # libraries.  In that case, we don't want to build target-libiberty.
-if test -n "${target_configdirs}" ; then
+if [ -n "${target_configdirs}" ]; then
   others=
   for i in `echo ${target_configdirs} | sed -e s/target-//g` ; do
-    if test "$i" != "libiberty" ; then
-      if test -r $srcdir/$i/configure ; then
+    if [ "$i" != "libiberty" ]; then
+      if [ -r $srcdir/$i/configure ] || [ -r $srcdir/$i/configure.in ]; then
 	others=yes;
 	break;
       fi
     fi
   done
-  if test -z "${others}" ; then
+  if [ -z "${others}" ]; then
     target_configdirs=
   fi
 fi
 
-# Quietly strip out all directories which aren't configurable in this tree.
-# This relies on all configurable subdirectories being autoconfiscated, which
-# is now the case.
-build_configdirs_all="$build_configdirs"
-build_configdirs=
-for i in ${build_configdirs_all} ; do
-  j=`echo $i | sed -e s/build-//g` 
-  if test -f ${srcdir}/$j/configure ; then
-    build_configdirs="${build_configdirs} $i"
-  fi
-done
-
-configdirs_all="$configdirs"
-configdirs=
-for i in ${configdirs_all} ; do
-  if test -f ${srcdir}/$i/configure ; then
-    configdirs="${configdirs} $i"
-  fi
-done
-
-target_configdirs_all="$target_configdirs"
-target_configdirs=
-for i in ${target_configdirs_all} ; do
-  j=`echo $i | sed -e s/target-//g` 
-  if test -f ${srcdir}/$j/configure ; then
-    target_configdirs="${target_configdirs} $i"
-  fi
-done
+# Deconfigure all subdirectories, in case we are changing the
+# configuration from one where a subdirectory is supported to one where it
+# is not.
+if [ -z "${norecursion}" ] && [ -n "${configdirs}" ]; then
+  for i in `echo ${configdirs} | sed -e s/target-//g` ; do
+    rm -f $i/Makefile
+  done
+fi
+if [ -z "${norecursion}" ] && [ -n "${target_configdirs}" ]; then
+  for i in `echo ${target_configdirs} | sed -e s/target-//g` ; do
+    rm -f ${target_subdir}/$i/Makefile
+  done
+fi
 
 # Produce a warning message for the subdirs we can't configure.
 # This isn't especially interesting in the Cygnus tree, but in the individual
 # FSF releases, it's important to let people know when their machine isn't
 # supported by the one or two programs in a package.
 
-if test -n "${notsupp}" && test -z "${norecursion}" ; then
+if [ -n "${notsupp}" ] && [ -z "${norecursion}" ]; then
   # If $appdirs is non-empty, at least one of those directories must still
   # be configured, or we error out.  (E.g., if the gas release supports a
   # specified target in some subdirs but not the gas subdir, we shouldn't
   # pretend that all is well.)
-  if test -n "$appdirs" ; then
+  if [ -n "$appdirs" ]; then
     for dir in $appdirs ; do
-      if test -r $dir/Makefile.in ; then
+      if [ -r $dir/Makefile.in ]; then
 	if echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
 	  appdirs=""
 	  break
 	fi
-	if echo " ${target_configdirs} " | grep " target-${dir} " >/dev/null 2>&1; then
+	if echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
 	  appdirs=""
 	  break
 	fi
       fi
     done
-    if test -n "$appdirs" ; then
+    if [ -n "$appdirs" ]; then
       echo "*** This configuration is not supported by this package." 1>&2
       exit 1
     fi
@@ -1446,59 +1136,6 @@ if test -n "${notsupp}" && test -z "${norecursion}" ; then
   echo "    (Any other directories should still work fine.)" 1>&2
 fi
 
-case "$host" in
-  *msdosdjgpp*)
-    enable_gdbtk=no ;;
-esac
-
-copy_dirs=
-
-AC_ARG_WITH([build-sysroot], 
-  [  --with-build-sysroot=sysroot
-                          use sysroot as the system root during the build],
-  [if test x"$withval" != x ; then
-     SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval"
-   fi],
-  [SYSROOT_CFLAGS_FOR_TARGET=])
-AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)
-
-# Handle --with-headers=XXX.  If the value is not "yes", the contents of
-# the named directory are copied to $(tooldir)/sys-include.
-if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
-  if test x${is_cross_compiler} = xno ; then
-    echo 1>&2 '***' --with-headers is only supported when cross compiling
-    exit 1
-  fi
-  if test x"${with_headers}" != xyes ; then
-    case "${exec_prefixoption}" in
-    "") x=${prefix} ;;
-    *) x=${exec_prefix} ;;
-    esac
-    copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/sys-include"
-  fi
-fi
-
-# Handle --with-libs=XXX.  If the value is not "yes", the contents of
-# the name directories are copied to $(tooldir)/lib.  Multiple directories
-# are permitted.
-if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then
-  if test x${is_cross_compiler} = xno ; then
-    echo 1>&2 '***' --with-libs is only supported when cross compiling
-    exit 1
-  fi
-  if test x"${with_libs}" != xyes ; then
-    # Copy the libraries in reverse order, so that files in the first named
-    # library override files in subsequent libraries.
-    case "${exec_prefixoption}" in
-    "") x=${prefix} ;;
-    *) x=${exec_prefix} ;;
-    esac
-    for l in ${with_libs}; do
-      copy_dirs="$l $x/${target_alias}/lib ${copy_dirs}"
-    done
-  fi
-fi
-
 # Set with_gnu_as and with_gnu_ld as appropriate.
 #
 # This is done by determining whether or not the appropriate directory
@@ -1512,241 +1149,98 @@ fi
 # want to do that, then you should use the --without-gnu-as and
 # --without-gnu-ld options for the configure script.
 
-if test x${use_gnu_as} = x &&
-   echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then
-  with_gnu_as=yes
-  extra_host_args="$extra_host_args --with-gnu-as"
+if [ x${use_gnu_as} = x ] ; then
+  if [ x${with_gnu_as} != xno ] && echo " ${configdirs} " | grep " ${gasdir} " > /dev/null 2>&1 && [ -d ${srcdir}/${gasdir} ] ; then
+    with_gnu_as=yes
+    withoptions="$withoptions --with-gnu-as"
+  fi
 fi
 
-if test x${use_gnu_ld} = x &&
-   echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 ; then
-  with_gnu_ld=yes
-  extra_host_args="$extra_host_args --with-gnu-ld"
+if [ x${use_gnu_ld} = x ] ; then
+  if [ x${with_gnu_ld} != xno ] && echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 && [ -d ${srcdir}/ld ] ; then
+    with_gnu_ld=yes
+    withoptions="$withoptions --with-gnu-ld"
+  fi
 fi
 
-# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure
+# If using newlib, add --with-newlib to the withoptions so that gcc/configure
 # can detect this case.
 
-if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then
+if [ x${with_newlib} != xno ] && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 && [ -d ${srcdir}/newlib ] ; then
   with_newlib=yes
-  extra_host_args="$extra_host_args --with-newlib"
+  withoptions="$withoptions --with-newlib"
 fi
 
-# Handle ${copy_dirs}
-set fnord ${copy_dirs}
-shift
-while test $# != 0 ; do
-  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
-    :
-  else
-    echo Copying $1 to $2
-
-    # Use the install script to create the directory and all required
-    # parent directories.
-    if test -d $2 ; then
-      :
-    else
-      echo >config.temp
-      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
-    fi
-
-    # Copy the directory, assuming we have tar.
-    # FIXME: Should we use B in the second tar?  Not all systems support it.
-    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
-
-    # It is the responsibility of the user to correctly adjust all
-    # symlinks.  If somebody can figure out how to handle them correctly
-    # here, feel free to add the code.
-
-    echo $1 > $2/COPIED
-  fi
-  shift; shift
-done
-
-# Determine a target-dependent exec_prefix that the installed
-# gcc will search in.  Keep this list sorted by triplet, with
-# the *-*-osname triplets last.
-md_exec_prefix=
-case "${target}" in
-  alpha*-*-*vms*)
-    md_exec_prefix=/gnu/lib/gcc-lib
-    ;;
-  i[34567]86-pc-msdosdjgpp*)
-    md_exec_prefix=/dev/env/DJDIR/bin
-    ;;
-  i[34567]86-*-sco3.2v5*)
-    if test $with_gnu_as = yes; then
-      md_exec_prefix=/usr/gnu/bin
-    else
-      md_exec_prefix=/usr/ccs/bin/elf
-    fi
-    ;;
-
-  mn10300-*-* | \
-  powerpc-*-chorusos* | \
-  powerpc*-*-eabi* | \
-  powerpc*-*-sysv* | \
-  powerpc*-*-kaos* | \
-  s390x-ibm-tpf*)
-    md_exec_prefix=/usr/ccs/bin
-    ;;
-  sparc64-*-elf*)
-    ;;
-  v850*-*-*)
-    md_exec_prefix=/usr/ccs/bin
-    ;;
-  xtensa-*-elf*)
-    ;;
-
-  *-*-beos* | \
-  *-*-elf* | \
-  *-*-hpux* | \
-  *-*-netware* | \
-  *-*-nto-qnx* | \
-  *-*-rtems* | \
-  *-*-solaris2* | \
-  *-*-sysv[45]* | \
-  *-*-vxworks* | \
-  *-wrs-windiss)
-    md_exec_prefix=/usr/ccs/bin
-    ;;
-esac
-
-extra_arflags_for_target=
-extra_nmflags_for_target=
-extra_ranlibflags_for_target=
-target_makefile_frag=/dev/null
-case "${target}" in
-  *-*-netware*)
-    target_makefile_frag="config/mt-netware"
-    ;;
-  *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
-    target_makefile_frag="config/mt-gnu"
-    ;;
-  *-*-aix4.[[3456789]]* | *-*-aix[[56789]].*)
-    # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm 
-    # commands to handle both 32-bit and 64-bit objects.  These flags are
-    # harmless if we're using GNU nm or ar.
-    extra_arflags_for_target=" -X32_64"
-    extra_nmflags_for_target=" -B -X32_64"
-    ;;
-  *-*-darwin*)
-    # ranlib from Darwin requires the -c flag to look at common symbols.
-    extra_ranlibflags_for_target=" -c"
-    ;;
-  mips*-*-pe | sh*-*-pe | *arm-wince-pe)
-    target_makefile_frag="config/mt-wince"
-    ;;
-esac
-
-alphaieee_frag=/dev/null
-case $target in
-  alpha*-*-*)
-    # This just makes sure to use the -mieee option to build target libs.
-    # This should probably be set individually by each library.
-    alphaieee_frag="config/mt-alphaieee"
-    ;;
-esac
-
-# If --enable-target-optspace always use -Os instead of -O2 to build
-# the target libraries, similarly if it is not specified, use -Os
-# on selected platforms.
-ospace_frag=/dev/null
-case "${enable_target_optspace}:${target}" in
-  yes:*)
-    ospace_frag="config/mt-ospace"
-    ;;
-  :d30v-*)
-    ospace_frag="config/mt-d30v"
-    ;;
-  :m32r-* | :d10v-* | :fr30-*)
-    ospace_frag="config/mt-ospace"
-    ;;
-  no:* | :*)
-    ;;
-  *)
-    echo "*** bad value \"${enable_target_optspace}\" for --enable-target-optspace flag; ignored" 1>&2
-    ;;
-esac
-
-# Default to using --with-stabs for certain targets.
-if test x${with_stabs} = x ; then
+if [ x${shared} = xyes ]; then
   case "${target}" in
-  mips*-*-irix[[56]]*)
-    ;;
-  mips*-*-* | alpha*-*-osf*)
-    with_stabs=yes;
-    extra_host_args="${extra_host_args} --with-stabs"
-    ;;
+    hppa*)
+      target_makefile_frag="${target_makefile_frag} config/mt-papic"
+      ;;
+    i[3456]86-*)
+      target_makefile_frag="${target_makefile_frag} config/mt-x86pic"
+      ;;
+    ia64-*)
+      target_makefile_frag="${target_makefile_frag} config/mt-ia64pic"
+      ;;
+    powerpc*-*-aix*)
+      # We don't want -fPIC on AIX.
+      ;;
+    powerpc*-*)
+      target_makefile_frag="${target_makefile_frag} config/mt-ppcpic"
+      ;;
+    alpha*-*-linux*)
+      target_makefile_frag="${target_makefile_frag} config/mt-elfalphapic"
+      ;;
+    *)
+      if test -f ${srcdir}/config/mt-${target_cpu}pic; then
+        target_makefile_frag="${target_makefile_frag} config/mt-${target_cpu}pic"
+      fi
+      ;;
   esac
 fi
 
-# hpux11 in 64bit mode has libraries in a weird place.  Arrange to find
-# them automatically.
-case "${host}" in
-  hppa*64*-*-hpux11*)	
-    extra_host_args="$extra_host_args -x-libraries=/usr/lib/pa20_64 -x-includes=/usr/X11R6/include"
-    ;;
-esac
-
-# Some systems (e.g., one of the i386-aix systems the gas testers are
-# using) don't handle "\$" correctly, so don't use it here.
-tooldir='${exec_prefix}'/${target_alias}
-build_tooldir=${tooldir}
-
-# Create a .gdbinit file which runs the one in srcdir
-# and tells GDB to look there for source files.
-
-if test -r ${srcdir}/.gdbinit ; then
-  case ${srcdir} in
-    .) ;;
-    *) cat > ./.gdbinit <<EOF
-# ${NO_EDIT}
-dir ${srcdir}
-dir .
-source ${srcdir}/.gdbinit
-EOF
-    ;;
-  esac
+rm -f mt-frag
+if [ -n "${target_makefile_frag}" ] ; then
+  for f in ${target_makefile_frag}
+  do
+    cat ${srcdir}/$f >> mt-frag
+  done
+  target_makefile_frag=mt-frag
 fi
 
+# post-target:
+
 # Make sure that the compiler is able to generate an executable.  If it
 # can't, we are probably in trouble.  We don't care whether we can run the
 # executable--we might be using a cross compiler--we only care whether it
 # can be created.  At this point the main configure script has set CC.
-we_are_ok=no
 echo "int main () { return 0; }" > conftest.c
 ${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c
-if test $? = 0 ; then
-  if test -s conftest || test -s conftest.exe ; then
-    we_are_ok=yes
-  fi
-fi 
-case $we_are_ok in
-  no)
-    echo 1>&2 "*** The command '${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c' failed."
-    echo 1>&2 "*** You must set the environment variable CC to a working compiler."
-    rm -f conftest*
-    exit 1
-    ;;
-esac
+if [ $? = 0 ] && [ -s conftest -o -s conftest.exe ]; then
+  :
+else
+  echo 1>&2 "*** The command '${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c' failed."
+  echo 1>&2 "*** You must set the environment variable CC to a working compiler."
+  rm -f conftest*
+  exit 1
+fi
 rm -f conftest*
 
 # The Solaris /usr/ucb/cc compiler does not appear to work.
 case "${host}" in
   sparc-sun-solaris2*)
       CCBASE="`echo ${CC-cc} | sed 's/ .*$//'`"
-      if test "`type $CCBASE | sed 's/^[[^/]]*//'`" = "/usr/ucb/cc" ; then
+      if [ "`type $CCBASE | sed 's/^[^/]*//'`" = "/usr/ucb/cc" ] ; then 
           could_use=
-          test -d /opt/SUNWspro/bin && could_use="/opt/SUNWspro/bin"
-          if test -d /opt/cygnus/bin ; then
-              if test "$could_use" = "" ; then
+          [ -d /opt/SUNWspro/bin ] && could_use="/opt/SUNWspro/bin"
+          if [ -d /opt/cygnus/bin ] ; then
+              if [ "$could_use" = "" ] ; then
                   could_use="/opt/cygnus/bin"
               else
                   could_use="$could_use or /opt/cygnus/bin"
               fi
           fi
-        if test "$could_use" = "" ; then
+        if [ "$could_use" = "" ] ; then
             echo "Warning: compilation may fail because you're using"
             echo "/usr/ucb/cc.  You should change your PATH or CC "
             echo "variable and rerun configure."
@@ -1760,317 +1254,102 @@ case "${host}" in
   ;;
 esac
 
-case "${host}" in
-  *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
-  *-*-darwin* | *-*-rhapsody* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;;
-  *) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
-esac
+# If --enable-shared was set, we must set LD_LIBRARY_PATH so that the
+# binutils tools will find libbfd.so.
+if [ "${shared}" = "yes" ]; then
+  sed -e 's/^SET_LIB_PATH[ 	]*=.*$/SET_LIB_PATH = $(REALLY_SET_LIB_PATH)/' \
+      Makefile > Makefile.tem
+  rm -f Makefile
+  mv -f Makefile.tem Makefile
+
+  case "${host}" in
+  *-*-hpux*)
+    sed -e 's/^RPATH_ENVVAR[ 	]*=.*$/RPATH_ENVVAR = SHLIB_PATH/' \
+	Makefile > Makefile.tem
+    rm -f Makefile
+    mv -f Makefile.tem Makefile
+    ;;
+  esac
+fi
 
 # Record target_configdirs and the configure arguments for target and
 # build configuration in Makefile.
 target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
-build_configdirs=`echo "${build_configdirs}" | sed -e 's/build-//g'`
-
-# Determine whether gdb needs tk/tcl or not.
-# Use 'maybe' since enable_gdbtk might be true even if tk isn't available
-# and in that case we want gdb to be built without tk.  Ugh!
-# In fact I believe gdb is the *only* package directly dependent on tk,
-# so we should be able to put the 'maybe's in unconditionally and
-# leave out the maybe dependencies when enable_gdbtk is false.  I'm not
-# 100% sure that that's safe though.
-
-gdb_tk="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-libgui"
-case "$enable_gdbtk" in
-  no)
-    GDB_TK="" ;;
-  yes)
-    GDB_TK="${gdb_tk}" ;;
-  *)
-    # Only add the dependency on gdbtk when GDBtk is part of the gdb
-    # distro.  Eventually someone will fix this and move Insight, nee
-    # gdbtk to a separate directory.
-    if test -d ${srcdir}/gdb/gdbtk ; then
-      GDB_TK="${gdb_tk}"
-    else
-      GDB_TK=""
-    fi
-    ;;
-esac
-CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g`
-INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g`
-
-# Strip out unwanted targets.
-
-# While at that, we remove Makefiles if we were started for recursive
-# configuration, so that the top-level Makefile reconfigures them,
-# like we used to do when configure itself was recursive.
-
-# Loop over modules.  $extrasub must be used with care, limiting as
-# much as possible the usage of range addresses.  That's because autoconf
-# splits the sed script to overcome limits in the number of commands,
-# and relying on carefully-timed sed passes may turn out to be very hard
-# to maintain later.  In this particular case, you just have to be careful
-# not to nest @if/@endif pairs, because configure will not warn you at all.
-
-AC_ARG_ENABLE([bootstrap],
-[  --enable-bootstrap           Enable bootstrapping [yes if native build]],,
-enable_bootstrap=default)
-
-# Issue errors and warnings for invalid/strange bootstrap combinations.
-case "$configdirs" in
-  *gcc*) have_compiler=yes ;;
-  *) have_compiler=no ;;
-esac
-
-case "$have_compiler:$host:$target:$enable_bootstrap" in
-  *:*:*:no) ;;
-
-  # Default behavior.  Enable bootstrap if we have a compiler
-  # and we are in a native configuration.
-  yes:$build:$build:default)
-    enable_bootstrap=yes ;;
-
-  *:*:*:default)
-    enable_bootstrap=no ;;
-
-  # We have a compiler and we are in a native configuration, bootstrap is ok
-  yes:$build:$build:yes)
-    ;;
-
-  # Other configurations, but we have a compiler.  Assume the user knows
-  # what he's doing.
-  yes:*:*:yes)
-    AC_MSG_WARN([trying to bootstrap a cross compiler])
-    ;;
-
-  # No compiler: if they passed --enable-bootstrap explicitly, fail
-  no:*:*:yes)
-    AC_MSG_ERROR([cannot bootstrap without a compiler]) ;;
-
-  # Fail if wrong command line
-  *)
-    AC_MSG_ERROR([invalid option for --enable-bootstrap])
-    ;;
-esac
-
-# Adjust the toplevel makefile according to whether bootstrap was selected.
-case "$enable_bootstrap" in
-  yes)
-    bootstrap_suffix=bootstrap ;;
-  no)
-    bootstrap_suffix=no-bootstrap ;;
-esac
-
-for module in ${build_configdirs} ; do
-  if test -z "${no_recursion}" \
-     && test -f ${build_subdir}/${module}/Makefile; then
-    echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
-    rm -f ${build_subdir}/${module}/Makefile
-  fi
-  extrasub="$extrasub
-/^@if build-$module\$/d
-/^@endif build-$module\$/d
-/^@if build-$module-$bootstrap_suffix\$/d
-/^@endif build-$module-$bootstrap_suffix\$/d"
-done
-for module in ${configdirs} ; do
-  if test -z "${no_recursion}"; then
-    for file in stage*-${module}/Makefile ${module}/Makefile; do
-      if test -f ${file}; then
-	echo 1>&2 "*** removing ${file} to force reconfigure"
-	rm -f ${file}
-      fi
-    done
-  fi
-  extrasub="$extrasub
-/^@if $module\$/d
-/^@endif $module\$/d
-/^@if $module-$bootstrap_suffix\$/d
-/^@endif $module-$bootstrap_suffix\$/d"
-done
-for module in ${target_configdirs} ; do
-  if test -z "${no_recursion}" \
-     && test -f ${target_subdir}/${module}/Makefile; then
-    echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
-    rm -f ${target_subdir}/${module}/Makefile
-  fi
-  extrasub="$extrasub
-/^@if target-$module\$/d
-/^@endif target-$module\$/d
-/^@if target-$module-$bootstrap_suffix\$/d
-/^@endif target-$module-$bootstrap_suffix\$/d"
-done
-
-extrasub="$extrasub
-/^@if /,/^@endif /d"
-
-# Create the serialization dependencies.  This uses a temporary file.
-
-AC_ARG_ENABLE([serial-configure],
-[  --enable-serial-[{host,target,build}-]configure
-                          Force sequential configuration of
-                          sub-packages for the host, target or build
-			  machine, or all sub-packages])
-
-case ${enable_serial_configure} in
-  yes)
-    enable_serial_build_configure=yes
-    enable_serial_host_configure=yes
-    enable_serial_target_configure=yes
-    ;;
-esac
-
-# These force 'configure's to be done one at a time, to avoid problems
-# with contention over a shared config.cache.
-rm -f serdep.tmp
-echo '# serdep.tmp' > serdep.tmp
-olditem=
-test "x${enable_serial_build_configure}" = xyes &&
-for item in ${build_configdirs} ; do
-  case ${olditem} in
-    "") ;;
-    *) echo "configure-build-${item}: configure-build-${olditem}" >> serdep.tmp ;;
-  esac
-  olditem=${item}
-done
-olditem=
-test "x${enable_serial_host_configure}" = xyes &&
-for item in ${configdirs} ; do
-  case ${olditem} in
-    "") ;;
-    *) echo "configure-${item}: configure-${olditem}" >> serdep.tmp ;;
-  esac
-  olditem=${item}
-done
-olditem=
-test "x${enable_serial_target_configure}" = xyes &&
-for item in ${target_configdirs} ; do
-  case ${olditem} in
-    "") ;;
-    *) echo "configure-target-${item}: configure-target-${olditem}" >> serdep.tmp ;;
-  esac
-  olditem=${item}
-done
-serialization_dependencies=serdep.tmp
-AC_SUBST_FILE(serialization_dependencies)
-
-# Base args.  Strip norecursion, cache-file, srcdir, host, build,
-# target and nonopt.  These are the ones we might not want to pass
-# down to subconfigures.  Also strip program-prefix, program-suffix,
-# and program-transform-name, so that we can pass down a consistent
-# program-transform-name.  If autoconf has put single quotes around
-# any of these arguments (because they contain shell metacharacters)
-# then this will fail; in practice this only happens for
-# --program-transform-name, so be sure to override --program-transform-name
-# at the end of the argument list.
-# These will be expanded by make, so quote '$'.
-cat <<\EOF_SED > conftestsed
-s/ --no[[^ ]]*/ /g
-s/ --c[[a-z-]]*[[= ]][[^ ]]*//g
-s/ --sr[[a-z-]]*[[= ]][[^ ]]*//g
-s/ --ho[[a-z-]]*[[= ]][[^ ]]*//g
-s/ --bu[[a-z-]]*[[= ]][[^ ]]*//g
-s/ --t[[a-z-]]*[[= ]][[^ ]]*//g
-s/ --program-[[pst]][[a-z-]]*[[= ]][[^ ]]*//g
-s/ -cache-file[[= ]][[^ ]]*//g
-s/ -srcdir[[= ]][[^ ]]*//g
-s/ -host[[= ]][[^ ]]*//g
-s/ -build[[= ]][[^ ]]*//g
-s/ -target[[= ]][[^ ]]*//g
-s/ -program-prefix[[= ]][[^ ]]*//g
-s/ -program-suffix[[= ]][[^ ]]*//g
-s/ -program-transform-name[[= ]][[^ ]]*//g
-s/ [[^' -][^ ]*] / /
-s/^ *//;s/ *$//
-s,\$,$$,g
-EOF_SED
-sed -f conftestsed <<EOF_SED > conftestsed.out
- ${ac_configure_args} 
-EOF_SED
-baseargs=`cat conftestsed.out`
-rm -f conftestsed conftestsed.out
-
-# Add in --program-transform-name, after --program-prefix and
-# --program-suffix have been applied to it.  Autoconf has already
-# doubled dollar signs and backslashes in program_transform_name; we want
-# the backslashes un-doubled, and then the entire thing wrapped in single
-# quotes, because this will be expanded first by make and then by the shell. 
-# Also, because we want to override the logic in subdir configure scripts to
-# choose program_transform_name, replace any s,x,x, with s,y,y,.
-sed -e "s,\\\\\\\\,\\\\,g; s,','\\\\'',g; s/s,x,x,/s,y,y,/" <<EOF_SED > conftestsed.out
-${program_transform_name}
-EOF_SED
-gcc_transform_name=`cat conftestsed.out`
-rm -f conftestsed.out
-baseargs="$baseargs --program-transform-name='${gcc_transform_name}'"
+targargs=`echo "${arguments}" | \
+	sed -e 's/--no[^ 	]*//' \
+	    -e 's/--cache[a-z-]*=[^ 	]*//' \
+	    -e 's/--ho[a-z-]*=[^ 	]*//' \
+	    -e 's/--bu[a-z-]*=[^ 	]*//' \
+	    -e 's/--ta[a-z-]*=[^ 	]*//'`
 
 # For the build-side libraries, we just need to pretend we're native,
 # and not use the same cache file.  Multilibs are neither needed nor
 # desired.
-build_configargs="--cache-file=../config.cache --build=${build_alias} --host=${build_alias} --target=${target_alias} ${baseargs}"
-
-# For host modules, accept cache file option, or specification as blank.
-case "${cache_file}" in
-"") # empty
-  cache_file_option="" ;;
-/* | [[A-Za-z]]:[[\\/]]* ) # absolute path
-  cache_file_option="--cache-file=${cache_file}" ;;
-*) # relative path
-  cache_file_option="--cache-file=../${cache_file}" ;;
-esac
-
-# Host dirs don't like to share a cache file either, horribly enough.
-# This seems to be due to autoconf 2.5x stupidity.
-host_configargs="--cache-file=./config.cache --build=${build_alias} --host=${host_alias} --target=${target_alias} ${extra_host_args} ${baseargs}"
-
-target_configargs=${baseargs}
+buildargs="--cache-file=../config.cache --build=${build_alias} --host=${build_alias} ${targargs}"
 
 # Passing a --with-cross-host argument lets the target libraries know
 # whether they are being built with a cross-compiler or being built
 # native.  However, it would be better to use other mechanisms to make the
 # sorts of decisions they want to make on this basis.  Please consider
 # this option to be deprecated.  FIXME.
-if test x${is_cross_compiler} = xyes ; then
-  target_configargs="--with-cross-host=${host_alias} ${target_configargs}"
+if [ x${is_cross_compiler} = xyes ]; then
+  targargs="--with-cross-host=${host_alias} ${targargs}"
 fi
 
 # Default to --enable-multilib.
-if test x${enable_multilib} = x ; then
-  target_configargs="--enable-multilib ${target_configargs}"
+if [ x${enable_multilib} = x ]; then
+  targargs="--enable-multilib ${targargs}"
 fi
 
 # Pass --with-newlib if appropriate.  Note that target_configdirs has
 # changed from the earlier setting of with_newlib.
-if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " newlib " > /dev/null 2>&1 && test -d ${srcdir}/newlib ; then
-  target_configargs="--with-newlib ${target_configargs}"
+if [ x${with_newlib} != xno ] && echo " ${target_configdirs} " | grep " newlib " > /dev/null 2>&1 && [ -d ${srcdir}/newlib ] ; then
+  targargs="--with-newlib ${targargs}"
 fi
 
-# Different target subdirs use different values of certain variables
-# (notably CXX).  Worse, multilibs use *lots* of different values.
-# Worse yet, autoconf 2.5x makes some of these 'precious', meaning that
-# it doesn't automatically accept command-line overrides of them.
-# This means it's not safe for target subdirs to share a cache file,
-# which is disgusting, but there you have it.  Hopefully this can be
-# fixed in future.  It's still worthwhile to use a cache file for each
-# directory.  I think.
-
-# Pass the appropriate --build, --host, --target and --cache-file arguments.
-# We need to pass --target, as newer autoconf's requires consistency
-# for target_alias and gcc doesn't manage it consistently.
-target_configargs="--cache-file=./config.cache --build=${build_alias} --host=${target_alias} --target=${target_alias} ${target_configargs}"
+# Pass the appropriate --host, --build, and --cache-file arguments.
+targargs="--cache-file=../config.cache --host=${target_alias} --build=${build_alias} ${targargs}"
+
+# provide a proper gxx_include_dir.
+# Note, if you change the default, make sure to fix both here and in
+# the gcc, libio, and libstdc++ subdirectories.
+# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
+gxx_include_dir=
+if test -n "${with_gxx_include_dir}"; then
+  case "${with_gxx_include_dir}" in
+    yes )
+      echo "configure.in: error: bad value ${withval} given for g++ include directory" 1>&2
+      exit 1
+      ;;
+    no )
+      ;;
+    * )
+      gxx_include_dir=${with_gxx_include_dir}
+      ;;
+  esac
+fi
+if test x${gxx_include_dir} = x; then
+  if test x${enable_version_specific_runtime_libs} = xyes; then
+    gxx_include_dir='${libsubdir}/include/g++'
+  else
+    . ${topsrcdir}/config.if
+    gxx_include_dir='${prefix}/include/g++'-${libstdcxx_interface}
+  fi
+else
+  gxx_include_dir=${gxx_include_dir}
+fi
 
 FLAGS_FOR_TARGET=
-case " $target_configdirs " in
- *" newlib "*)
-  case " $target_configargs " in
-  *" --with-newlib "*)
+case " $skipdirs " in
+*" target-newlib "*) ;;
+*)
    case "$target" in
    *-cygwin*)
-     FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/include -isystem $$s/winsup/cygwin/include -isystem $$s/winsup/w32api/include' ;;
+     FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/include -isystem $$s/winsup/cygwin/include -isystem $$s/winsup/w32api/include -isystem $$s/newlib/libc/sys/cygwin -isystem $$s/newlib/libc/sys/cygwin32' ;;
    esac
 
    # If we're not building GCC, don't discard standard headers.
-   if test -d ${srcdir}/gcc; then
+   if test -d ${topsrcdir}/gcc; then
      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -nostdinc'
 
      if test "${build}" != "${host}"; then
@@ -2079,7 +1358,7 @@ case " $target_configdirs " in
        # to it.  This is right: we don't want to search that directory
        # for binaries, but we want the header files in there, so add
        # them explicitly.
-       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include'
+       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/gcc/include'
 
        # Someone might think of using the pre-installed headers on
        # Canadian crosses, in case the installed compiler is not fully
@@ -2093,10 +1372,11 @@ case " $target_configdirs " in
    fi
 
    case "${target}-${is_cross_compiler}" in
-   i[[3456789]]86-*-linux*-no)
+   i[3456]86-pc-linux*-no)
       # Here host == target, so we don't need to build gcc,
       # so we don't want to discard standard headers.
       FLAGS_FOR_TARGET=`echo " $FLAGS_FOR_TARGET " | sed -e 's/ -nostdinc / /'`
+      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/newlib/'
       ;;
    *)
       # If we're building newlib, use its generic headers last, but search
@@ -2106,282 +1386,94 @@ case " $target_configdirs " in
       ;;
    esac
    ;;
-  esac
-  ;;
 esac
 
-# Allow the user to override the flags for
-# our build compiler if desired.
-CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
-
 # On Canadian crosses, we'll be searching the right directories for
 # the previously-installed cross compiler, so don't bother to add
 # flags for directories within the install tree of the compiler
 # being built; programs in there won't even run.
-if test "${build}" = "${host}" && test -d ${srcdir}/gcc; then
+if test "${build}" = "${host}" && test -d ${topsrcdir}/gcc; then
   # Search for pre-installed headers if nothing else fits.
-  FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -isystem $(build_tooldir)/include -isystem $(build_tooldir)/sys-include'
+  FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -isystem $(build_tooldir)/include'
 fi
 
-if test "x${use_gnu_ld}" = x &&
-   echo " ${configdirs} " | grep " ld " > /dev/null ; then
+if test "x${use_gnu_ld}" = x && test "x${with_gnu_ld}" != xno &&
+   echo " ${configdirs} " | grep " ld " > /dev/null &&
+   test -d ${srcdir}/ld; then
   # Arrange for us to find uninstalled linker scripts.
-  FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(HOST_SUBDIR)/ld'
+  FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/ld'
 fi
 
-# Makefile fragments.
-for frag in host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag;
-do
-  eval fragval=\$$frag
-  if test $fragval != /dev/null; then
-    eval $frag=${srcdir}/$fragval
-  fi
-done
-AC_SUBST_FILE(host_makefile_frag)
-AC_SUBST_FILE(target_makefile_frag)
-AC_SUBST_FILE(alphaieee_frag)
-AC_SUBST_FILE(ospace_frag)
-
-# Miscellanea: directories, flags, etc.
-AC_SUBST(RPATH_ENVVAR)
-AC_SUBST(tooldir)
-AC_SUBST(build_tooldir)
-AC_SUBST(CONFIGURE_GDB_TK)
-AC_SUBST(GDB_TK)
-AC_SUBST(INSTALL_GDB_TK)
-
-# Build module lists & subconfigure args.
-AC_SUBST(build_configargs)
-AC_SUBST(build_configdirs)
-
-# Host module lists & subconfigure args.
-AC_SUBST(host_configargs)
-AC_SUBST(configdirs)
-
-# Target module lists & subconfigure args.
-AC_SUBST(target_configargs)
-
-
-# Build tools.
-AC_SUBST(CC_FOR_BUILD)
-AC_SUBST(config_shell)
-
-# Generate default definitions for YACC, M4, LEX and other programs that run
-# on the build machine.  These are used if the Makefile can't locate these
-# programs in objdir.
-MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
-
-AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [$MISSING bison -y])
-case " $build_configdirs " in
-  *" bison "*) YACC='$$r/$(BUILD_SUBDIR)/bison/tests/bison -y' ;;
-  *" byacc "*) YACC='$$r/$(BUILD_SUBDIR)/byacc/byacc' ;;
-esac
-
-AC_CHECK_PROGS([BISON], [bison], [$MISSING bison])
-case " $build_configdirs " in
-  *" bison "*) BISON='$$r/$(BUILD_SUBDIR)/bison/tests/bison' ;;
-esac
-
-AC_CHECK_PROGS([M4], [gm4 gnum4 m4], [$MISSING m4])
-case " $build_configdirs " in
-  *" m4 "*) M4='$$r/$(BUILD_SUBDIR)/m4/m4' ;;
-esac
-
-AC_CHECK_PROGS([LEX], [flex lex], [$MISSING flex])
-case " $build_configdirs " in
-  *" flex "*) LEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;;
-  *" lex "*) LEX='$$r/$(BUILD_SUBDIR)/lex/lex' ;;
-esac
-
-AC_CHECK_PROGS([FLEX], [flex], [$MISSING flex])
-case " $build_configdirs " in
-  *" flex "*) FLEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;;
-esac
-
-AC_CHECK_PROGS([MAKEINFO], makeinfo, [$MISSING makeinfo])
-case " $build_configdirs " in
-  *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
-  *)
-changequote(,)
-    # For an installed makeinfo, we require it to be from texinfo 4.2 or
-    # higher, else we use the "missing" dummy.
-    if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
-      :
-    else
-      MAKEINFO="$MISSING makeinfo"
-    fi
-    ;;
-changequote([,])
-esac
-
-# FIXME: expect and dejagnu may become build tools?
-
-AC_CHECK_PROGS(EXPECT, expect, expect)
-case " $configdirs " in
-  *" expect "*)
-    test $host = $build && EXPECT='$$r/$(HOST_SUBDIR)/expect/expect'
-    ;;
-esac
-
-AC_CHECK_PROGS(RUNTEST, runtest, runtest)
-case " $configdirs " in
-  *" dejagnu "*)
-    test $host = $build && RUNTEST='$$r/$(HOST_SUBDIR)/dejagnu/runtest'
-    ;;
+if test "x${CC_FOR_TARGET+set}" = xset; then
+  :
+elif test -d ${topsrcdir}/gcc; then
+  CC_FOR_TARGET='$$r/gcc/xgcc -B$$r/gcc/'
+elif test "$host" = "$target"; then
+  CC_FOR_TARGET='$(CC)'
+else
+  CC_FOR_TARGET=`echo gcc | sed -e 's/x/x/' ${program_transform_name}`
+fi
+# On Canadian crosses, configure reads CC_FOR_TARGET from Makefile,
+# if Makefile exists.  Prevent $(FLAGS_FOR_TARGET) from being duplicated.
+case $CC_FOR_TARGET in
+*' $(FLAGS_FOR_TARGET)') ;;
+*) CC_FOR_TARGET=$CC_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;;
 esac
 
-
-# Host tools.
-NCN_STRICT_CHECK_TOOLS(AR, ar)
-NCN_STRICT_CHECK_TOOLS(AS, as)
-NCN_STRICT_CHECK_TOOLS(DLLTOOL, dlltool)
-NCN_STRICT_CHECK_TOOLS(LD, ld)
-NCN_STRICT_CHECK_TOOLS(LIPO, lipo)
-NCN_STRICT_CHECK_TOOLS(NM, nm)
-NCN_STRICT_CHECK_TOOLS(RANLIB, ranlib, :)
-NCN_STRICT_CHECK_TOOLS(STRIP, strip, :)
-NCN_STRICT_CHECK_TOOLS(WINDRES, windres)
-NCN_STRICT_CHECK_TOOLS(OBJCOPY, objcopy)
-NCN_STRICT_CHECK_TOOLS(OBJDUMP, objdump)
-AC_SUBST(CC)
-AC_SUBST(CXX)
-AC_SUBST(CFLAGS)
-AC_SUBST(CFLAGS_FOR_BUILD)
-AC_SUBST(CXXFLAGS)
-
-# Target tools.
-AC_ARG_WITH([build-time-tools], 
-  [  --with-build-time-tools=path
-                          use given path to find target tools during the build],
-  [case x"$withval" in
-     x/*) ;;
-     *)
-       with_build_time_tools=
-       AC_MSG_WARN([argument to --with-build-time-tools must be an absolute path])
-       ;;
-   esac],
-  [with_build_time_tools=])
-
-NCN_STRICT_CHECK_TARGET_TOOLS(CC_FOR_TARGET, cc gcc)
-NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TARGET, c++ g++ cxx gxx)
-NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
-NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj)
-NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
-
-ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar)
-ACX_CHECK_INSTALLED_TARGET_TOOL(AS_FOR_TARGET, as)
-ACX_CHECK_INSTALLED_TARGET_TOOL(DLLTOOL_FOR_TARGET, dlltool)
-ACX_CHECK_INSTALLED_TARGET_TOOL(LD_FOR_TARGET, ld)
-ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo)
-ACX_CHECK_INSTALLED_TARGET_TOOL(NM_FOR_TARGET, nm)
-ACX_CHECK_INSTALLED_TARGET_TOOL(OBJDUMP_FOR_TARGET, objdump)
-ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib, :)
-ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip)
-ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres)
-
-RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
-
-GCC_TARGET_TOOL(ar, AR_FOR_TARGET, AR, [binutils/ar])
-GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [gas/as-new])
-GCC_TARGET_TOOL(cc, CC_FOR_TARGET, CC, [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
-GCC_TARGET_TOOL(c++, CXX_FOR_TARGET, CXX,
-		[gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs],
-		c++)
-GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX,
-		[gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs],
-		c++)
-GCC_TARGET_TOOL(dlltool, DLLTOOL_FOR_TARGET, DLLTOOL, [binutils/dlltool])
-GCC_TARGET_TOOL(gcc, GCC_FOR_TARGET, , [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
-GCC_TARGET_TOOL(gcj, GCJ_FOR_TARGET, GCJ,
-		[gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/], java)
-GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_TARGET, GFORTRAN,
-		[gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran)
-GCC_TARGET_TOOL(ld, LD_FOR_TARGET, LD, [ld/ld-new])
-GCC_TARGET_TOOL(lipo, LIPO_FOR_TARGET, LIPO)
-GCC_TARGET_TOOL(nm, NM_FOR_TARGET, NM, [binutils/nm-new])
-GCC_TARGET_TOOL(objdump, OBJDUMP_FOR_TARGET, OBJDUMP, [binutils/objdump])
-GCC_TARGET_TOOL(ranlib, RANLIB_FOR_TARGET, RANLIB, [binutils/ranlib])
-GCC_TARGET_TOOL(strip, STRIP_FOR_TARGET, STRIP, [binutils/strip])
-GCC_TARGET_TOOL(windres, WINDRES_FOR_TARGET, WINDRES, [binutils/windres])
-
-AC_SUBST(FLAGS_FOR_TARGET)
-AC_SUBST(RAW_CXX_FOR_TARGET)
-
-# Certain tools may need extra flags.
-AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target}
-RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
-NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
-
-# When building target libraries, except in a Canadian cross, we use
-# the same toolchain as the compiler we just built.
-COMPILER_AS_FOR_TARGET='$(AS_FOR_TARGET)'
-COMPILER_LD_FOR_TARGET='$(LD_FOR_TARGET)'
-COMPILER_NM_FOR_TARGET='$(NM_FOR_TARGET)'
-if test $host = $build; then
-  case " $configdirs " in
-    *" gcc "*)
-      COMPILER_AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/as'
-      COMPILER_LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/collect-ld'
-      COMPILER_NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/nm'${extra_nmflags_for_target}
-      ;;
-  esac
+if test "x${CHILL_FOR_TARGET+set}" = xset; then
+  :
+elif test -d ${topsrcdir}/gcc; then
+  CHILL_FOR_TARGET='$$r/gcc/xgcc -B$$r/gcc/ -L$$r/gcc/ch/runtime/'
+elif test "$host" = "$target"; then
+  CHILL_FOR_TARGET='$(CC)'
+else
+  CHILL_FOR_TARGET=`echo gcc | sed -e 's/x/x/' ${program_transform_name}`
 fi
+case $CHILL_FOR_TARGET in
+*' $(FLAGS_FOR_TARGET)') ;;
+*) CHILL_FOR_TARGET=$CHILL_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;;
+esac
 
-AC_SUBST(COMPILER_AS_FOR_TARGET)
-AC_SUBST(COMPILER_LD_FOR_TARGET)
-AC_SUBST(COMPILER_NM_FOR_TARGET)
-
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-AC_MSG_RESULT($USE_MAINTAINER_MODE)
-AC_SUBST(MAINTAINER_MODE_TRUE)
-AC_SUBST(MAINTAINER_MODE_FALSE)
-if test "$USE_MAINTAINER_MODE" = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
+if test "x${CXX_FOR_TARGET+set}" = xset; then
+  :
+elif test -d ${topsrcdir}/gcc; then
+  CXX_FOR_TARGET='$$r/gcc/`case $$dir in libstdc++-v3) echo xgcc ;; *) echo g++ ;; esac` -B$$r/gcc/ -nostdinc++ '$libstdcxx_flags
+elif test "$host" = "$target"; then
+  CXX_FOR_TARGET='$(CXX)'
 else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi	
-MAINT=$MAINTAINER_MODE_TRUE
-AC_SUBST(MAINT)dnl
-
-# ---------------------
-# GCC bootstrap support
-# ---------------------
-
-# Stage specific cflags for build.
-stage1_cflags="-g"
-case $build in
-  vax-*-*)
-    case ${GCC} in
-      yes) stage1_cflags="-g -Wa,-J" ;;
-      *) stage1_cflags="-g -J" ;;
-    esac ;;
-  powerpc-*-darwin*)
-    # The spiffy cpp-precomp chokes on some legitimate constructs in GCC
-    # sources; use -no-cpp-precomp to get to GNU cpp.
-    # Apple's GCC has bugs in designated initializer handling, so disable
-    # that too.
-    stage1_cflags="-g -no-cpp-precomp -DHAVE_DESIGNATED_INITIALIZERS=0"
-    ;;
-esac
-AC_SUBST(stage1_cflags)
-
-# Enable -Werror in bootstrap stage2 and later.
-# Change the default to "no" on release branches.
-AC_ARG_ENABLE(werror,
-[  --enable-werror         enable -Werror in bootstrap stage2 and later], [],
-[enable_werror=yes])
-case ${enable_werror} in
-  yes) stage2_werror_flag="--enable-werror-always" ;;
-  *) stage2_werror_flag="" ;;
+  CXX_FOR_TARGET=`echo c++ | sed -e 's/x/x/' ${program_transform_name}`
+fi
+case $CXX_FOR_TARGET in
+*' $(FLAGS_FOR_TARGET)') ;;
+*) CXX_FOR_TARGET=$CXX_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;;
 esac
-AC_SUBST(stage2_werror_flag)
+qCXX_FOR_TARGET=`echo "$CXX_FOR_TARGET" | sed 's,[&%],\\\&,g'`
+
+# We want to defer the evaluation of `cmd`s and shell variables in
+# CXX_FOR_TARGET when recursing in the top-level Makefile, such as for
+# bootstrap.  We'll enclose CXX_FOR_TARGET_FOR_RECURSIVE_MAKE in single
+# quotes, but we still have to duplicate `$'s so that shell variables
+# can be expanded by the nested make as shell variables, not as make
+# macros.
+qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'`
+
+sed -e "s:^TARGET_CONFIGDIRS[ 	]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:" \
+    -e "s%^TARGET_CONFIGARGS[ 	]*=.*$%TARGET_CONFIGARGS = ${targargs}%" \
+    -e "s%^FLAGS_FOR_TARGET[ 	]*=.*$%FLAGS_FOR_TARGET = ${FLAGS_FOR_TARGET}%" \
+    -e "s%^CC_FOR_TARGET[ 	]*=.*$%CC_FOR_TARGET = ${CC_FOR_TARGET}%" \
+    -e "s%^CHILL_FOR_TARGET[ 	]*=.*$%CHILL_FOR_TARGET = ${CHILL_FOR_TARGET}%" \
+    -e "s%^CXX_FOR_TARGET[ 	]*=.*$%CXX_FOR_TARGET = ${qCXX_FOR_TARGET}%" \
+    -e "s%^CXX_FOR_TARGET_FOR_RECURSIVE_MAKE[ 	]*=.*$%CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = ${qqCXX_FOR_TARGET}%" \
+    -e "s%^TARGET_SUBDIR[ 	]*=.*$%TARGET_SUBDIR = ${target_subdir}%" \
+    -e "s%^BUILD_SUBDIR[ 	]*=.*$%BUILD_SUBDIR = ${build_subdir}%" \
+    -e "s%^BUILD_CONFIGARGS[ 	]*=.*$%BUILD_CONFIGARGS = ${buildargs}%" \
+    -e "s%^gxx_include_dir[ 	]*=.*$%gxx_include_dir=${gxx_include_dir}%" \
+       Makefile > Makefile.tem
+rm -f Makefile
+mv -f Makefile.tem Makefile
 
-AC_OUTPUT(Makefile)
+#
+# Local Variables:
+# fill-column: 131
+# End:
+#
diff --git a/depcomp b/depcomp
deleted file mode 100755
index 3510ab0..0000000
--- a/depcomp
+++ /dev/null
@@ -1,553 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2005-05-16.16
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-ia64hp)
-  # The "hp" stanza above does not work with HP's ia64 compilers,
-  # which have integrated preprocessors.  The correct option to use
-  # with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  tmpdepfile=`echo "$object" | sed -e 's/\.o$/.d/'`
-  "$@" +Maked
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile"
-     exit $stat
-  fi
-  rm -f "$depfile"
-
-  # The object file name is correct already.
-  cat "$tmpdepfile" > "$depfile"
-  # Add `dependent.h:' lines.
-  sed -ne '2,${; s/^ //; s/ \\*$//; s/$/:/; p; }' "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 64fdee6..788d11c 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,73 +1,3 @@
-2006-02-27  Carlos O'Donell  <carlos@codesourcery.com>
-
-	* Makefile.in: TEXI2HTML uses makeinfo. Define 
-	HTMLFILES. Add html targets.
-	* configure.texi: Use ifnottex. Add alternative 
-	image format specifier as jpg.
-	* standards.texi: Use ifnottex.
-
-2005-10-21  Mark Mitchell  <mark@codesourcery.com>
-
-	* texi2pod.pl: Substitue for @value even when part of @include. 
-
-2005-10-21  Bob Wilson  <bob.wilson@acm.org>
-
-	* texi2pod.pl: Import latest version from GCC.
-
-2005-05-19  Zack Weinberg  <zack@codesourcery.com>
-
-	* Makefile.in: Have 'all' depend on 'info'.
-
-2003-05-16  Kelley Cook  <kelleycook@wideopenwest.com>
-
-	* configure.texi: Use "i[3-7]86" in example.
-
-2003-01-02  H.J. Lu <hjl@gnu.org>
-
-	* Makefile.in (DESTDIR): New.
-	(install-info): Use it.
-
-2002-06-11  Nick Clifton  <nickc@cambridge.redhat.com>
-
-	Import the following patches from the FSF GCC sources:
-	2002-03-25  Zack Weinberg  <zack@codesourcery.com>
-
-	* texi2pod.pl: Handle @end ftable and @end vtable.
-
-	2001-12-12  Matthias Klose  <doko@debian.org>
-
-	* texi2pod.pl: Merge changes from binutils' texi2pod.pl. Allows
-	generation of more than one man page from one source.
-	Add '-' to set of valid chars for an identifier.
-	Let -D option accept flags of the form <flag>=<value>.
-	Use \s+ for whitespace detection in '@c man' lines.
-	Handle @set and @clear independent of $output.
-	Substitute all @value{}'s in a line.
-
-	2001-11-14  Joseph S. Myers  <jsm28@cam.ac.uk>
-
-	* texi2pod.pl: Handle @ifnottex, @iftex and @display.  Handle @var
-	in verbatim blocks specially.  Handle @unnumbered, @unnumberedsec
-	and @center.  Allow [a-z] after @enumerate.  Handle 0 and numbers
-	greater than 9 in enumerations.
-
-	2001-07-03  Joseph S. Myers  <jsm28@cam.ac.uk>
-
-	* texi2pod.pl: Handle @r inside @item.
-
-2002-02-27  Andrew Cagney  <ac131313@redhat.com>
-
-	* fdl.texi: New file.
-
-2002-02-24  Andrew Cagney  <ac131313@redhat.com>
-
-	* standards.texi: Import February 14, 2002 version.
-	* make-stds.texi: Import 2001 version.
-
-2002-01-26  Hans-Peter Nilsson  <hp@bitrange.com>
-
-	* Makefile.in (install): Depend on install-info.
-
 2001-03-25  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
 
 	* texi2pod.pl: New file (from gcc/contrib).
@@ -76,24 +6,24 @@
 
 	* add-log.el, add-log.vi: New files.
 
-1999-01-20  Angela Marie Thomas (angela@cygnus.com)
+Wed Jan 20 01:33:50 1999  Angela Marie Thomas (angela@cygnus.com)
 
 	* comp-tools-verify: Remove some checks that are no longer valid.
 
 1998-12-03  Nick Clifton  <nickc@cygnus.com>
 
 	* targetdoc/fr30.texi: New document.
-
-1998-10-01  Angela Marie Thomas (angela@cygnus.com)
+	
+Thu Oct  1 21:15:59 1998  Angela Marie Thomas (angela@cygnus.com)
 
 	* comp-tools-fix, cross-tools-fix: Replace /usr/include
 	with ${FIXINCDIR}.
 
-1998-08-11  Doug Evans  <devans@canuck.cygnus.com>
+Tue Aug 11 19:22:11 1998  Doug Evans  <devans@canuck.cygnus.com>
 
 	* make-rel-sym-tree (version): Update calculation.
 
-1998-06-12  Ian Lance Taylor  <ian@cygnus.com>
+Fri Jun 12 21:34:01 1998  Ian Lance Taylor  <ian@cygnus.com>
 
 	* configure.texi: Various additions.
 	* Makefile.in (TEXI2HTML, DVIPS): New variables.
@@ -108,7 +38,7 @@
 	* configbuild.ein: New file (EPS version of configbuild.fig).
 	* configbuild.jin: New file (JPEG version of configbuild.fig).
 
-1998-06-10  Ian Lance Taylor  <ian@cygnus.com>
+Wed Jun 10 14:41:25 1998  Ian Lance Taylor  <ian@cygnus.com>
 
 	* configure.texi: New file.
 	* configdev.tin: New file.
@@ -148,7 +78,7 @@ Mon May 18 14:27:37 1998  Angela Marie Thomas (angela@cygnus.com)
 Thu May 14 14:43:10 1998  Nick Clifton  <nickc@cygnus.com>
 
 	* targetdoc/arm-interwork.texi: Document dlltool support of
-	interworking.
+	interworking. 
 
 Thu May  7 16:49:38 1998  Jason Molenda  (crash@bugshack.cygnus.com)
 
@@ -157,7 +87,7 @@ Thu May  7 16:49:38 1998  Jason Molenda  (crash@bugshack.cygnus.com)
 
 Wed Apr  1 17:11:44 1998  Nick Clifton  <nickc@cygnus.com>
 
-	* targetdoc/arm-interwork.texi: Document ARM/thumb interworking.
+	* targetdoc/arm-interwork.texi: Document ARM/thumb interworking. 
 
 Tue Mar 31 15:28:20 1998  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -167,7 +97,7 @@ Tue Mar 31 15:28:20 1998  Ian Lance Taylor  <ian@cygnus.com>
 Tue Mar 24 16:13:26 1998  Stu Grossman  <grossman@bhuna.cygnus.co.uk>
 
 	* configure:  Regenerate with autoconf 2.12.1 to fix shell issues
-	for NT native builds.
+	for NT native builds. 
 
 Mon Mar  9 16:41:04 1998  Doug Evans  <devans@canuck.cygnus.com>
 
@@ -203,7 +133,7 @@ Tue Jun 17 15:50:23 1997  Angela Marie Thomas (angela@cygnus.com)
 
 Thu Jun 12 13:47:00 1997  Angela Marie Thomas (angela@cygnus.com)
 
-	* Install.in (show_exec_prefix_msg): fix quoting
+        * Install.in (show_exec_prefix_msg): fix quoting
 
 Wed Jun  4 15:31:43 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
 
@@ -251,8 +181,8 @@ Thu Apr 10 23:23:33 1997  Jason Molenda  (crash@godzilla.cygnus.co.jp)
 
 Mon Apr  7 18:15:00 1997  Brendan Kehoe <brendan@cygnus.com>
 
-	* Fix the version string for OSF1 4.0 to recognize either
-	V4.* or X4.*
+        * Fix the version string for OSF1 4.0 to recognize either
+        V4.* or X4.*
 
 Mon Apr  7 15:34:47 1997  Ian Lance Taylor  <ian@cygnus.com>
 
@@ -323,8 +253,8 @@ Mon Aug 28 17:25:49 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
 Tue Aug 15 21:51:58 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
-	* Install.in (guess_system): Match OSF/1 v3.x as the same as
-	v2.x--v2.x binaries are upward compatible.
+	* Install.in (guess_system): Match OSF/1 v3.x as the same as 
+        v2.x--v2.x binaries are upward compatible.
 
 Tue Aug 15 21:46:54 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
 
@@ -339,8 +269,8 @@ Tue Aug  8 13:11:56 1995  Brendan Kehoe  <brendan@lisa.cygnus.com>
 
 Thu Jun  8 00:42:56 1995  Angela Marie Thomas  <angela@cirdan.cygnus.com>
 
-	* subst-strings: change du commands to $BINDIR/. & $SRCDIR/. just
-	in case they are symlinks.
+        * subst-strings: change du commands to $BINDIR/. & $SRCDIR/. just
+        in case they are symlinks.
 
 Tue Apr 18 14:23:10 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 
@@ -355,7 +285,7 @@ Tue Apr 18 14:23:10 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 	* Install.in (do_mkdir): New function.
 
 	* Install.in: Added support for --with and --without options.
-	  Changed so that tape commands are not run when extracting
+	  Changed so that tape commands are not run when extracting 
 	  from a file.
 	  (do_mt): Changed to take only one argument.
 
@@ -363,7 +293,7 @@ Wed Mar 29 11:16:38 1995  Jason Molenda (crash@phydeaux.cygnus.com)
 
 	* Install.in: catch UNAME==alpha-dec-osf2.x and correct entry for
 	alpha-dec-osf1.x
-
+	
 Fri Jan 27 12:04:29 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 
 	* subst-strings (mips-sgi-irix5): New entry in table.
@@ -408,8 +338,8 @@ Thu Apr 28 14:42:22 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
 
 Tue Apr 26 17:18:03 1994  Jason Molenda (crash@sendai.cygnus.com)
 
-	* Install.in:  fixincludes output is actually put in fixincludes.log,
-	but echo'ed messages claim it is fixinc.log.  This is the same
+        * Install.in:  fixincludes output is actually put in fixincludes.log,
+        but echo'ed messages claim it is fixinc.log.  This is the same
 	messages as I logged in March 4 1994, but for some reason we found
 	the change hadn't been done.  I'll have to dig through the logs
 	and find out what I really did do that day. :)
@@ -469,21 +399,21 @@ Wed Mar 23 23:38:24 1994  Jason Molenda  (crash@sendai.cygnus.com)
 
 Wed Mar 23 13:42:48 1994  Jason Molenda  (crash@sendai.cygnus.com)
 
-	* Install.in: set PATH to $PATH:/bin:/usr/bin so we can pick
-	up native tools even if the user doesn't have them in his
-	path.
+        * Install.in: set PATH to $PATH:/bin:/usr/bin so we can pick
+        up native tools even if the user doesn't have them in his
+        path.
 
-	* Install.in: ``hppa-1.1-hp-hpux'' -> ``hppa1.1-hp-hpux''.
+        * Install.in: ``hppa-1.1-hp-hpux'' -> ``hppa1.1-hp-hpux''.
 
 Tue Mar 15 22:09:20 1994  Jason Molenda  (crash@sendai.cygnus.com)
-
-	* Install.in: TAPE_REWIND and TAPE_FORWARD variables for Unixunaware,
-	added switch statement to detect if system is Unixunaware.
+        
+        * Install.in: TAPE_REWIND and TAPE_FORWARD variables for Unixunaware,
+        added switch statement to detect if system is Unixunaware.
 
 Fri Mar  4 12:10:30 1994  Jason Molenda (crash@sendai.cygnus.com)
 
-	* Install.in:  fixincludes output is actually put in fixincludes.log,
-	but echo'ed messages claim it is fixinc.log.
+        * Install.in:  fixincludes output is actually put in fixincludes.log,
+        but echo'ed messages claim it is fixinc.log.
 
 Wed Nov  3 02:58:02 1993  Jeffrey Osier  (jeffrey@thepub.cygnus.com)
 
@@ -514,9 +444,9 @@ Thu Jun 10 16:01:25 1993  Jeffrey Osier  (jeffrey@cygnus.com)
 
 Wed Jun  9 19:23:59 1993  Jeffrey Osier  (jeffrey@rtl.cygnus.com)
 
-	* install-texi.in:	added conditionals (nearly complete)
-				  cleaned up
-				  added support for other releases (not done)
+        * install-texi.in:        added conditionals (nearly complete)
+                                  cleaned up
+                                  added support for other releases (not done)
 
 Wed Jun  9 15:53:58 1993  Jim Kingdon  (kingdon@cygnus.com)
 
@@ -531,7 +461,7 @@ Fri Jun  4 17:09:56 1993  Jeffrey Osier  (jeffrey@cygnus.com)
 
 Thu Jun  3 00:37:01 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
-	* Install.in: pull COPYING and COPYING.LIB off of the tape
+	* Install.in: pull COPYING and COPYING.LIB off of the tape 
 
 Tue Jun  1 16:52:08 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
diff --git a/etc/Makefile.in b/etc/Makefile.in
index df461cf..eedc8c9 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -2,8 +2,6 @@
 # Makefile.in for etc
 #
 
-DESTDIR		=
-
 prefix 		= @prefix@
 exec_prefix 	= @exec_prefix@
 
@@ -39,10 +37,7 @@ MAKEINFO = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
 TEXI2DVI = `if [ -f ../texinfo/util/texi2dvi ]; \
 	then echo ../texinfo/util/texi2dvi; \
 	else echo texi2dvi; fi`
-TEXI2HTML = `if [ -f ../texinfo/makeinfo/makeinfo ]; \
-	then echo "../texinfo/makeinfo/makeinfo --html"; \
-	else echo "makeinfo --html"; fi`
-
+TEXI2HTML = texi2html
 DVIPS = dvips
 
 # Where to find texinfo.tex to format documentation with TeX.
@@ -53,10 +48,10 @@ TEXIDIR = $(srcdir)/../texinfo
 
 INFOFILES = standards.info configure.info
 DVIFILES = standards.dvi configure.dvi
-HTMLFILES = standards.html configure.html
 
-all: info
-install: install-info
+all:
+
+install:
 
 uninstall:
 
@@ -72,32 +67,20 @@ info:
 	done
 
 install-info: info
-	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir)
+	$(SHELL) $(srcdir)/../mkinstalldirs $(infodir)
 	if test ! -f standards.info; then cd $(srcdir); fi; \
 	if test -f standards.info; then \
 	  for i in standards.info*; do \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
+	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
 	  done; \
 	fi
 	if test ! -f configure.info; then cd $(srcdir); fi; \
 	if test -f configure.info; then \
 	  for i in configure.info*; do \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
+	    $(INSTALL_DATA) $$i $(infodir)/$$i; \
 	  done; \
 	fi
 
-html:
-	for f in $(HTMLFILES); do \
-	  if test -f $(srcdir)/`echo $$f | sed -e 's/.html$$/.texi/'`; then \
-	    if $(MAKE) "TEXI2HTML=$(TEXI2HTML)" $$f; then \
-	      true; \
-	    else \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	done
-
-
 dvi:
 	for f in $(DVIFILES); do \
 	  if test -f $(srcdir)/`echo $$f | sed -e 's/.dvi$$/.texi/'`; then \
@@ -112,9 +95,6 @@ dvi:
 standards.info: $(srcdir)/standards.texi $(srcdir)/make-stds.texi
 	$(MAKEINFO) --no-split -I$(srcdir) -o standards.info $(srcdir)/standards.texi
 
-standards.html: $(srcdir)/standards.texi $(srcdir)/make-stds.texi
-	$(TEXI2HTML) --no-split -I$(srcdir) -o standards.html $(srcdir)/standards.texi
-
 standards.dvi: $(srcdir)/standards.texi
 	TEXINPUTS=$(TEXIDIR):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/standards.texi
 
@@ -150,15 +130,12 @@ configure.ps: configure.dvi $(srcdir)/configdev.ein $(srcdir)/configbuild.ein
 	rm -f configdev.eps configbuild.eps
 
 configure.html: $(srcdir)/configure.texi
-	cp $(srcdir)/configdev.jin configdev.jpg
-	cp $(srcdir)/configbuild.jin configbuild.jpg
-	$(TEXI2HTML) --no-split -I$(srcdir) -o configure.html $(srcdir)/configure.texi
+	$(TEXI2HTML) -split_chapter $(srcdir)/configure.texi
 
 clean:
 	rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
 	rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs
-	rm -f configdev.txt configbuild.txt 
-	rm -f configdev.eps configbuild.eps
+	rm -f configdev.txt configbuild.txt configdev.eps configbuild.eps
 	rm -f configdev.jpg configbuild.jpg
 
 mostlyclean: clean
@@ -167,7 +144,6 @@ distclean:   clean
 	rm -f Makefile config.status config.cache
 
 maintainer-clean realclean:   distclean
-	rm -f *.html*
 	rm -f *.info*
 
 Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
diff --git a/etc/configure.texi b/etc/configure.texi
index 385a7c4..9140167 100644
--- a/etc/configure.texi
+++ b/etc/configure.texi
@@ -10,7 +10,7 @@
 * configure: (configure).	The GNU configure and build system
 @end direntry
 
-@ifnottex
+@ifinfo
 This file documents the GNU configure and build system.
 
 Copyright (C) 1998 Cygnus Solutions.
@@ -35,7 +35,7 @@ Permission is granted to copy and distribute translations of this manual
 into another language, under the above conditions for modified versions,
 except that this permission notice may be stated in a translation approved
 by the Foundation.
-@end ifnottex
+@end ifinfo
 
 @titlepage
 @title The GNU configure and build system
@@ -60,7 +60,7 @@ except that this permission notice may be stated in a translation
 approved by the Free Software Foundation.
 @end titlepage
 
-@ifnottex
+@ifinfo
 @node Top
 @top GNU configure and build system
 
@@ -79,7 +79,7 @@ The GNU configure and build system.
 * Index::			Index.
 @end menu
 
-@end ifnottex
+@end ifinfo
 
 @node Introduction
 @chapter Introduction
@@ -1085,7 +1085,7 @@ are in rectangles with rounded corners
 @end ifnotinfo
 (e.g., @samp{autoheader} is the name of a tool, not the name of a file).
 
-@image{configdev,,,,jpg}
+@image{configdev}
 
 @node Written Developer Files
 @subsection Written Developer Files
@@ -1235,7 +1235,7 @@ Here is a picture of the files which will be created at build time.
 @file{config.status} is both a created file and a shell script which is
 run to create other files, and the picture attempts to show that.
 
-@image{configbuild,,,,jpg}
+@image{configbuild}
 
 @node Build Files Description
 @subsection Build Files Description
@@ -1451,7 +1451,7 @@ canonical configuration name (which will be the case if
 
 @smallexample
 case "$@{host@}" in
-i[3-7]86-*-linux-gnu*) do something ;;
+i[3456]86-*-linux-gnu*) do something ;;
 sparc*-sun-solaris2.[56789]*) do something ;;
 sparc*-sun-solaris*) do something ;;
 mips*-*-elf*) do something ;;
@@ -1465,7 +1465,7 @@ field, in order to match the version number which will be generated by
 In most cases you must be careful to match a range of processor types.
 For most processor families, a trailing @samp{*} suffices, as in
 @samp{mips*} above.  For the i386 family, something along the lines of
-@samp{i[3-7]86} suffices at present.  For the m68k family, you will
+@samp{i[3456]86} suffices at present.  For the m68k family, you will
 need something like @samp{m68*}.  Of course, if you do not need to match
 on the processor, it is simpler to just replace the entire field by a
 @samp{*}, as in @samp{*-*-irix*}.
diff --git a/etc/fdl.texi b/etc/fdl.texi
deleted file mode 100644
index 1387056..0000000
--- a/etc/fdl.texi
+++ /dev/null
@@ -1,368 +0,0 @@
-@c -*-texinfo-*-
-@node GNU Free Documentation License, , , Copying This Manual
-
-@appendix GNU Free Documentation License
-@center Version 1.1, March 2000
-
-@display
-Copyright (C) 2000  Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-@end display
-@sp 1
-@enumerate 0
-@item
-PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-written document ``free'' in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially.  Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
-
-This License is a kind of ``copyleft'', which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-@sp 1
-@item
-APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License.  The ``Document'', below, refers to any
-such manual or work.  Any member of the public is a licensee, and is
-addressed as ``you.''
-
-A ``Modified Version'' of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A ``Secondary Section'' is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The ``Invariant Sections'' are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
-
-The ``Cover Texts'' are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
-
-A ``Transparent'' copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent.  A copy that is
-not ``Transparent'' is called ``Opaque.''
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML designed for human modification.  Opaque formats include
-PostScript, PDF, proprietary formats that can be read and edited only
-by proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML produced by some word processors for output
-purposes only.
-
-The ``Title Page'' means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, ``Title Page'' means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-@sp 1
-@item
-VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-@sp 1
-@item
-COPYING IN QUANTITY
-
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols.  If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-@sp 1
-@item
-MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.@*
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has less than five).@*
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.@*
-D. Preserve all the copyright notices of the Document.@*
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.@*
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.@*
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.@*
-H. Include an unaltered copy of this License.@*
-I. Preserve the section entitled ``History'', and its title, and add to
-   it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section entitled ``History'' in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.@*
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the ``History'' section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.@*
-K. In any section entitled ``Acknowledgements'' or ``Dedications'',
-   preserve the section's title, and preserve in the section all the
-   substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.@*
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.@*
-M. Delete any section entitled ``Endorsements.''  Such a section
-   may not be included in the Modified Version.@*
-N. Do not retitle any existing section as ``Endorsements''
-   or to conflict in title with any Invariant Section.@*
-@sp 1
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section entitled ``Endorsements'', provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-@sp 1
-@item
-COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections entitled ``History''
-in the various original documents, forming one section entitled
-``History''; likewise combine any sections entitled ``Acknowledgements'',
-and any sections entitled ``Dedications.''  You must delete all sections
-entitled ``Endorsements.''
-@sp 1
-@item
-COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-@sp 1
-@item
-AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation.  Such a compilation is called an ``aggregate'', and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
-@sp 1
-@item
-TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
-original English version of this License.  In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
-@sp 1
-@item
-TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-@sp 1
-@item
-FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License ``or any later version'' applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-@end enumerate
-
-@unnumberedsec ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-@smallexample
-@group
-Copyright (C)  @var{year}  @var{your name}.
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with the Invariant Sections being @var{list their titles}, with the
-Front-Cover Texts being @var{list}, and with the Back-Cover Texts being @var{list}.
-A copy of the license is included in the section entitled "GNU
-Free Documentation License."
-@end group
-@end smallexample
-
-If you have no Invariant Sections, write ``with no Invariant Sections''
-instead of saying which ones are invariant.  If you have no
-Front-Cover Texts, write ``no Front-Cover Texts'' instead of
-``Front-Cover Texts being @var{list}''; likewise for Back-Cover Texts.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
diff --git a/etc/make-stds.texi b/etc/make-stds.texi
index 250867a..2149764 100644
--- a/etc/make-stds.texi
+++ b/etc/make-stds.texi
@@ -8,17 +8,6 @@
 @cindex conventions for makefiles
 @cindex standards for makefiles
 
-@c Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001 Free
-@c Software Foundation, Inc.
-
-@c Permission is granted to copy, distribute and/or modify this document
-@c under the terms of the GNU Free Documentation License, Version 1.1
-@c or any later version published by the Free Software Foundation;
-@c with no Invariant Sections, with no
-@c Front-Cover Texts, and with no Back-Cover Texts.
-@c A copy of the license is included in the section entitled ``GNU
-@c Free Documentation License''.
-
 This
 @ifinfo
 node
@@ -32,15 +21,13 @@ chapter
 @end ifclear
 @end iftex
 describes conventions for writing the Makefiles for GNU programs.
-Using Automake will help you write a Makefile that follows these
-conventions.
 
 @menu
-* Makefile Basics::             General Conventions for Makefiles
-* Utilities in Makefiles::      Utilities in Makefiles
-* Command Variables::           Variables for Specifying Commands
-* Directory Variables::         Variables for Installation Directories
-* Standard Targets::            Standard Targets for Users
+* Makefile Basics::		General Conventions for Makefiles
+* Utilities in Makefiles::	Utilities in Makefiles
+* Command Variables::		Variables for Specifying Commands
+* Directory Variables::		Variables for Installation Directories
+* Standard Targets::		Standard Targets for Users
 * Install Command Categories::  Three categories of commands in the `install'
                                   rule: normal, pre-install and post-install.
 @end menu
@@ -92,7 +79,7 @@ foo.1 : foo.man sedscript
 
 @noindent
 will fail when the build directory is not the source directory, because
-@file{foo.man} and @file{sedscript} are in the source directory.
+@file{foo.man} and @file{sedscript} are in the the source directory.
 
 When using GNU @code{make}, relying on @samp{VPATH} to find the source
 file will work in the case where there is a single dependency file,
@@ -151,7 +138,7 @@ installation should not use any utilities directly except these:
 
 @c dd find
 @c gunzip gzip md5sum
-@c mkfifo mknod tee uname
+@c mkfifo mknod tee uname 
 
 @example
 cat cmp cp diff echo egrep expr false grep install-info
@@ -260,10 +247,9 @@ Every Makefile should define the variable @code{INSTALL}, which is the
 basic command for installing a file into the system.
 
 Every Makefile should also define the variables @code{INSTALL_PROGRAM}
-and @code{INSTALL_DATA}.  (The default for @code{INSTALL_PROGRAM} should
-be @code{$(INSTALL)}; the default for @code{INSTALL_DATA} should be
-@code{$@{INSTALL@} -m 644}.)  Then it should use those variables as the
-commands for actual installation, for executables and nonexecutables
+and @code{INSTALL_DATA}.  (The default for each of these should be
+@code{$(INSTALL)}.)  Then it should use those variables as the commands
+for actual installation, for executables and nonexecutables
 respectively.  Use these variables as follows:
 
 @example
@@ -294,28 +280,26 @@ installed.
 Installation directories should always be named by variables, so it is
 easy to install in a nonstandard place.  The standard names for these
 variables are described below.  They are based on a standard filesystem
-layout; variants of it are used in SVR4, 4.4BSD, GNU/Linux, Ultrix v4,
-and other modern operating systems.
+layout; variants of it are used in SVR4, 4.4BSD, Linux, Ultrix v4, and
+other modern operating systems.
 
 These two variables set the root for the installation.  All the other
 installation directories should be subdirectories of one of these two,
 and nothing should be directly installed into these two directories.
 
-@table @code
+@table @samp
 @item prefix
-@vindex prefix
 A prefix used in constructing the default values of the variables listed
 below.  The default value of @code{prefix} should be @file{/usr/local}.
 When building the complete GNU system, the prefix will be empty and
 @file{/usr} will be a symbolic link to @file{/}.
 (If you are using Autoconf, write it as @samp{@@prefix@@}.)
 
-Running @samp{make install} with a different value of @code{prefix} from
-the one used to build the program should @emph{not} recompile the
-program.
+Running @samp{make install} with a different value of @code{prefix}
+from the one used to build the program should @var{not} recompile
+the program.
 
 @item exec_prefix
-@vindex exec_prefix
 A prefix used in constructing the default values of some of the
 variables listed below.  The default value of @code{exec_prefix} should
 be @code{$(prefix)}.
@@ -326,22 +310,20 @@ machine-specific files (such as executables and subroutine libraries),
 while @code{$(prefix)} is used directly for other directories.
 
 Running @samp{make install} with a different value of @code{exec_prefix}
-from the one used to build the program should @emph{not} recompile the
+from the one used to build the program should @var{not} recompile the
 program.
 @end table
 
 Executable programs are installed in one of the following directories.
 
-@table @code
+@table @samp
 @item bindir
-@vindex bindir
 The directory for installing executable programs that users can run.
 This should normally be @file{/usr/local/bin}, but write it as
 @file{$(exec_prefix)/bin}.
 (If you are using Autoconf, write it as @samp{@@bindir@@}.)
 
 @item sbindir
-@vindex sbindir
 The directory for installing executable programs that can be run from
 the shell, but are only generally useful to system administrators.  This
 should normally be @file{/usr/local/sbin}, but write it as
@@ -349,7 +331,6 @@ should normally be @file{/usr/local/sbin}, but write it as
 (If you are using Autoconf, write it as @samp{@@sbindir@@}.)
 
 @item libexecdir
-@vindex libexecdir
 @comment This paragraph adjusted to avoid overfull hbox --roland 5jul94
 The directory for installing executable programs to be run by other
 programs rather than by users.  This directory should normally be
@@ -642,8 +623,7 @@ the installation commands.  @xref{Install Command Categories}.
 
 @item install-strip
 Like @code{install}, but strip the executable files while installing
-them.  In simple cases, this target can use the @code{install} target in
-a simple way:
+them.  In many cases, the definition of this target can be very simple:
 
 @smallexample
 install-strip:
@@ -651,14 +631,6 @@ install-strip:
                 install
 @end smallexample
 
-But if the package installs scripts as well as real executables, the
-@code{install-strip} target can't just refer to the @code{install}
-target; it has to strip the executables but not the scripts.
-
-@code{install-strip} should not strip the executables in the build
-directory which are being copied for installation.  It should only strip
-the copies that are installed.
-
 Normally we do not recommend stripping an executable unless you are sure
 the program has no bugs.  However, it can be reasonable to install a
 stripped executable for actual execution while saving the unstripped
@@ -773,7 +745,7 @@ The easiest way to do this is to create a subdirectory appropriately
 named, use @code{ln} or @code{cp} to install the proper files in it, and
 then @code{tar} that subdirectory.
 
-Compress the tar file with @code{gzip}.  For example, the actual
+Compress the tar file file with @code{gzip}.  For example, the actual
 distribution file for GCC version 1.40 is called @file{gcc-1.40.tar.gz}.
 
 The @code{dist} target should explicitly depend on all non-source files
@@ -821,19 +793,6 @@ installdirs: mkinstalldirs
                                 $(mandir)
 @end smallexample
 
-@noindent
-or, if you wish to support @env{DESTDIR},
-
-@smallexample
-# Make sure all installation directories (e.g. $(bindir))
-# actually exist by making them if necessary.
-installdirs: mkinstalldirs
-        $(srcdir)/mkinstalldirs \
-            $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) \
-            $(DESTDIR)$(libdir) $(DESTDIR)$(infodir) \
-            $(DESTDIR)$(mandir)
-@end smallexample
-
 This rule should not modify the directories where compilation is done.
 It should do nothing but create installation directories.
 @end table
diff --git a/etc/standards.texi b/etc/standards.texi
index 490e15b..910bf8b 100644
--- a/etc/standards.texi
+++ b/etc/standards.texi
@@ -3,85 +3,94 @@
 @setfilename standards.info
 @settitle GNU Coding Standards
 @c This date is automagically updated when you save this file:
-@set lastupdate February 14, 2002
+@set lastupdate March 13, 1998
 @c %**end of header
 
-@ifnottex
+@ifinfo
 @format
 START-INFO-DIR-ENTRY
 * Standards: (standards).        GNU coding standards.
 END-INFO-DIR-ENTRY
 @end format
-@end ifnottex
+@end ifinfo
 
 @c @setchapternewpage odd
 @setchapternewpage off
 
-@c Put everything in one index (arbitrarily chosen to be the concept index).
-@syncodeindex fn cp
-@syncodeindex ky cp
-@syncodeindex pg cp
-@syncodeindex vr cp
-
 @c This is used by a cross ref in make-stds.texi
 @set CODESTD  1
 @iftex
 @set CHAPTER chapter
 @end iftex
-@ifnottex
+@ifinfo
 @set CHAPTER node
-@end ifnottex
+@end ifinfo
 
-@ifnottex
+@ifinfo
 GNU Coding Standards
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with no Invariant Sections, with no
-Front-Cover Texts, and with no Back-Cover Texts.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
-@end ifnottex
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+
+Permission is granted to make and distribute verbatim copies of
+this manual provided the copyright notice and this permission notice
+are preserved on all copies.
+
+@ignore
+Permission is granted to process this file through TeX and print the
+results, provided the printed document carries copying permission
+notice identical to this one except for the removal of this paragraph
+(this paragraph not being relevant to the printed manual).
+@end ignore
+
+Permission is granted to copy and distribute modified versions of this
+manual under the conditions for verbatim copying, provided that the entire
+resulting derived work is distributed under the terms of a permission
+notice identical to this one.
+
+Permission is granted to copy and distribute translations of this manual
+into another language, under the above conditions for modified versions,
+except that this permission notice may be stated in a translation approved
+by the Free Software Foundation.
+@end ifinfo
 
 @titlepage
 @title GNU Coding Standards
-@author Richard Stallman, et al.
+@author Richard Stallman
 @author last updated @value{lastupdate}
 @page
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1
-or any later version published by the Free Software Foundation;
-with no Invariant Sections, with no
-Front-Cover Texts, and with no Back-Cover Texts.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
+Copyright @copyright{} 1992, 1993, 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+
+Permission is granted to make and distribute verbatim copies of
+this manual provided the copyright notice and this permission notice
+are preserved on all copies.
+
+Permission is granted to copy and distribute modified versions of this
+manual under the conditions for verbatim copying, provided that the entire
+resulting derived work is distributed under the terms of a permission
+notice identical to this one.
+
+Permission is granted to copy and distribute translations of this manual
+into another language, under the above conditions for modified versions,
+except that this permission notice may be stated in a translation approved
+by the Free Software Foundation.
 @end titlepage
 
-@ifnottex
+@ifinfo
 @node Top, Preface, (dir), (dir)
 @top Version
 
 Last updated @value{lastupdate}.
-@end ifnottex
+@end ifinfo
 
 @menu
 * Preface::                     About the GNU Coding Standards
-* Legal Issues::                Keeping Free Software Free
+* Intellectual Property::       Keeping Free Software Free
 * Design Advice::               General Program Design
 * Program Behavior::            Program Behavior for All Programs
 * Writing C::                   Making The Best Use of C
 * Documentation::               Documenting Programs
 * Managing Releases::           The Release Process
-* References::                  References to Non-Free Software or Documentation
-* Copying This Manual::         How to Make Copies of This Manual
-* Index::                       
-
 @end menu
 
 @node Preface
@@ -95,57 +104,28 @@ programs written in C, but many of the rules and principles are useful
 even if you write in another programming language.  The rules often
 state reasons for writing in a certain way.
 
-This release of the GNU Coding Standards was last updated
-@value{lastupdate}.
-
-@cindex where to obtain @code{standards.texi}
-@cindex downloading this manual
-If you did not obtain this file directly from the GNU project and
-recently, please check for a newer version.  You can ftp the GNU
-Coding Standards from any GNU FTP host in the directory
-@file{/pub/gnu/standards/}.  The GNU Coding Standards are available
-there in several different formats: @file{standards.text},
-@file{standards.info}, and @file{standards.dvi}, as well as the
-Texinfo ``source'' which is divided in two files:
-@file{standards.texi} and @file{make-stds.texi}.  The GNU Coding
-Standards are also available on the GNU World Wide Web server:
-@uref{http://www.gnu.org/prep/standards_toc.html}.
-
 Corrections or suggestions for this document should be sent to
-@email{bug-standards@@gnu.org}.  If you make a suggestion, please include a
+@email{gnu@@gnu.org}.  If you make a suggestion, please include a
 suggested new wording for it; our time is limited.  We prefer a context
 diff to the @file{standards.texi} or @file{make-stds.texi} files, but if
 you don't have those files, please mail your suggestion anyway.
 
-These standards cover the minimum of what is important when writing a
-GNU package.  Likely, the needs for additional standards will come up.
-Sometimes, you might suggest that such standards be added to this
-document.  If you think your standards would be generally useful, please
-do suggest them.
-
-You should also set standards for your package on many questions not
-addressed or not firmly specified here.  The most important point is to
-be self-consistent---try to stick to the conventions you pick, and try
-to document them as much as possible.  That way, your program will be
-more maintainable by others.
+This release of the GNU Coding Standards was last updated
+@value{lastupdate}.
 
-@node Legal Issues
+@node Intellectual Property
 @chapter Keeping Free Software Free
-@cindex legal aspects
 
 This @value{CHAPTER} discusses how you can make sure that GNU software
-avoids legal difficulties, and other related issues.
+remains unencumbered.
 
 @menu
 * Reading Non-Free Code::       Referring to Proprietary Programs
 * Contributions::               Accepting Contributions
-* Trademarks::                  How We Deal with Trademark Issues
 @end menu
 
 @node Reading Non-Free Code
 @section Referring to Proprietary Programs
-@cindex proprietary programs
-@cindex avoiding proprietary code
 
 Don't in any circumstances refer to Unix source code for or during
 your work on GNU!  (Or to any other proprietary programs.)
@@ -177,17 +157,15 @@ Or turn some parts of the program into independently usable libraries.
 Or use a simple garbage collector instead of tracking precisely when
 to free memory, or use a new GNU facility such as obstacks.
 
+
 @node Contributions
 @section Accepting Contributions
-@cindex legal papers
-@cindex accepting contributions
-
-If the program you are working on is copyrighted by the Free Software
-Foundation, then when someone else sends you a piece of code to add to
-the program, we need legal papers to use it---just as we asked you to
-sign papers initially.  @emph{Each} person who makes a nontrivial
-contribution to a program must sign some sort of legal papers in order
-for us to have clear title to the program; the main author alone is not
+
+If someone else sends you a piece of code to add to the program you are
+working on, we need legal papers to use it---the same sort of legal
+papers we will need to get from you.  @emph{Each} significant
+contributor to a program must sign some sort of legal papers in order
+for us to have clear title to the program.  The main author alone is not
 enough.
 
 So, before adding in any contributions from other people, please tell
@@ -203,17 +181,16 @@ This also applies to comments and documentation files.  For copyright
 law, comments and code are just text.  Copyright applies to all kinds of
 text, so we need legal papers for all kinds.
 
-We know it is frustrating to ask for legal papers; it's frustrating for
-us as well.  But if you don't wait, you are going out on a limb---for
-example, what if the contributor's employer won't sign a disclaimer?
-You might have to take that code out again!
-
 You don't need papers for changes of a few lines here or there, since
 they are not significant for copyright purposes.  Also, you don't need
 papers if all you get from the suggestion is some ideas, not actual code
-which you use.  For example, if someone send you one implementation, but
-you write a different implementation of the same idea, you don't need to
-get papers.
+which you use.  For example, if you write a different solution to the
+problem, you don't need to get papers.
+
+We know this is frustrating; it's frustrating for us as well.  But if
+you don't wait, you are going out on a limb---for example, what if the
+contributor's employer won't sign a disclaimer?  You might have to take
+that code out again!
 
 The very worst thing is if you forget to tell us about the other
 contributor.  We could be very embarrassed in court some day as a
@@ -223,124 +200,39 @@ We have more detailed advice for maintainers of programs; if you have
 reached the stage of actually maintaining a program for GNU (whether
 released or not), please ask us for a copy.
 
-@node Trademarks
-@section Trademarks
-@cindex trademarks
-
-Please do not include any trademark acknowledgements in GNU software
-packages or documentation.
-
-Trademark acknowledgements are the statements that such-and-such is a
-trademark of so-and-so.  The GNU Project has no objection to the basic
-idea of trademarks, but these acknowledgements feel like kowtowing, so
-we don't use them.  There is no legal requirement for them.
-
-What is legally required, as regards other people's trademarks, is to
-avoid using them in ways which a reader might read as naming or labeling
-our own programs or activities.  For example, since ``Objective C'' is
-(or at least was) a trademark, we made sure to say that we provide a
-``compiler for the Objective C language'' rather than an ``Objective C
-compiler''.  The latter is meant to be short for the former, but it does
-not explicitly state the relationship, so it could be misinterpreted as
-using ``Objective C'' as a label for the compiler rather than for the
-language.
-
 @node Design Advice
 @chapter General Program Design
-@cindex program design
 
 This @value{CHAPTER} discusses some of the issues you should take into
 account when designing your program.
 
-@c                         Standard or ANSI C
-@c
-@c In 1989 the American National Standards Institute (ANSI) standardized
-@c C   as  standard  X3.159-1989.    In  December   of  that   year  the
-@c International Standards Organization ISO  adopted the ANSI C standard
-@c making  minor changes.   In 1990  ANSI then  re-adopted  ISO standard
-@c C. This version of C is known as either ANSI C or Standard C.
-
-@c A major revision of the C Standard appeared in 1999.
-
 @menu
-* Source Language::             Which languges to use.
 * Compatibility::               Compatibility with other implementations
 * Using Extensions::            Using non-standard features
-* Standard C::                  Using Standard C features
-* Conditional Compilation::     Compiling Code Only If A Conditional is True
+* ANSI C::                      Using ANSI C features
+* Source Language::             Using languages other than C
 @end menu
 
-@node Source Language
-@section Which Languages to Use
-@cindex programming languges
-
-When you want to use a language that gets compiled and runs at high
-speed, the best language to use is C.  Using another language is like
-using a non-standard feature: it will cause trouble for users.  Even if
-GCC supports the other language, users may find it inconvenient to have
-to install the compiler for that other language in order to build your
-program.  For example, if you write your program in C++, people will
-have to install the GNU C++ compiler in order to compile your program.
-
-C has one other advantage over C++ and other compiled languages: more
-people know C, so more people will find it easy to read and modify the
-program if it is written in C.
-
-So in general it is much better to use C, rather than the
-comparable alternatives.
-
-But there are two exceptions to that conclusion:
-
-@itemize @bullet
-@item
-It is no problem to use another language to write a tool specifically
-intended for use with that language.  That is because the only people
-who want to build the tool will be those who have installed the other
-language anyway.
-
-@item
-If an application is of interest only to a narrow part of the community,
-then the question of which language it is written in has less effect on
-other people, so you may as well please yourself.
-@end itemize
-
-Many programs are designed to be extensible: they include an interpreter
-for a language that is higher level than C.  Often much of the program
-is written in that language, too.  The Emacs editor pioneered this
-technique.
-
-@cindex GUILE
-The standard extensibility interpreter for GNU software is GUILE, which
-implements the language Scheme (an especially clean and simple dialect
-of Lisp).  @uref{http://www.gnu.org/software/guile/}.  We don't reject
-programs written in other ``scripting languages'' such as Perl and
-Python, but using GUILE is very important for the overall consistency of
-the GNU system.
-
 @node Compatibility
 @section Compatibility with Other Implementations
-@cindex compatibility with C and @sc{posix} standards
-@cindex @sc{posix} compatibility
 
 With occasional exceptions, utility programs and libraries for GNU
 should be upward compatible with those in Berkeley Unix, and upward
-compatible with Standard C if Standard C specifies their
-behavior, and upward compatible with @sc{posix} if @sc{posix} specifies
-their behavior.
+compatible with @sc{ansi} C if @sc{ansi} C specifies their behavior, and
+upward compatible with @sc{POSIX} if @sc{POSIX} specifies their
+behavior.
 
 When these standards conflict, it is useful to offer compatibility
 modes for each of them.
 
-@cindex options for compatibility
-Standard C and @sc{posix} prohibit many kinds of extensions.  Feel
-free to make the extensions anyway, and include a @samp{--ansi},
+@sc{ansi} C and @sc{POSIX} prohibit many kinds of extensions.  Feel free
+to make the extensions anyway, and include a @samp{--ansi},
 @samp{--posix}, or @samp{--compatible} option to turn them off.
 However, if the extension has a significant chance of breaking any real
-programs or scripts, then it is not really upward compatible.  So you
-should try to redesign its interface to make it upward compatible.
+programs or scripts, then it is not really upward compatible.  Try to
+redesign its interface.
 
-@cindex @code{POSIXLY_CORRECT}, environment variable
-Many GNU programs suppress extensions that conflict with @sc{posix} if the
+Many GNU programs suppress extensions that conflict with POSIX if the
 environment variable @code{POSIXLY_CORRECT} is defined (even if it is
 defined with a null value).  Please make your program recognize this
 variable if appropriate.
@@ -351,12 +243,10 @@ completely with something totally different and better.  (For example,
 @code{vi} is replaced with Emacs.)  But it is nice to offer a compatible
 feature as well.  (There is a free @code{vi} clone, so we offer it.)
 
-Additional useful features are welcome regardless of whether
-there is any precedent for them.
+Additional useful features not in Berkeley Unix are welcome.
 
 @node Using Extensions
 @section Using Non-standard Features
-@cindex non-standard extensions
 
 Many GNU facilities that already exist support a number of convenient
 extensions over the comparable Unix facilities.  Whether to use these
@@ -377,33 +267,29 @@ straightforwardly do without them, but to use the extensions if they
 are a big improvement.
 
 An exception to this rule are the large, established programs (such as
-Emacs) which run on a great variety of systems.  Using GNU extensions in
-such programs would make many users unhappy, so we don't do that.
+Emacs) which run on a great variety of systems.  Such programs would
+be broken by use of GNU extensions.
 
-Another exception is for programs that are used as part of compilation:
-anything that must be compiled with other compilers in order to
-bootstrap the GNU compilation facilities.  If these require the GNU
-compiler, then no one can compile them without having them installed
-already.  That would be extremely troublesome in certain cases.
+Another exception is for programs that are used as part of
+compilation: anything that must be compiled with other compilers in
+order to bootstrap the GNU compilation facilities.  If these require
+the GNU compiler, then no one can compile them without having them
+installed already.  That would be no good.
 
-@node Standard C
-@section Standard C and Pre-Standard C
-@cindex @sc{ansi} C standard
+@node ANSI C
+@section @sc{ansi} C and pre-@sc{ansi} C
 
-1989 Standard C is widespread enough now that it is ok to use its
-features in new programs.  There is one exception: do not ever use the
-``trigraph'' feature of Standard C.
+Do not ever use the ``trigraph'' feature of @sc{ansi} C.
 
-1999 Standard C is not widespread yet, so please do not require its
-features in programs.  It is ok to use its features if they are present.
+@sc{ansi} C is widespread enough now that it is ok to write new programs
+that use @sc{ansi} C features (and therefore will not work in
+non-@sc{ansi} compilers).  And if a program is already written in
+@sc{ansi} C, there's no need to convert it to support non-@sc{ansi}
+compilers.
 
-However, it is easy to support pre-standard compilers in most programs,
-so if you know how to do that, feel free.  If a program you are
-maintaining has such support, you should try to keep it working.
-
-@cindex function prototypes
-To support pre-standard C, instead of writing function definitions in
-standard prototype form,
+However, it is easy to support non-@sc{ansi} compilers in most programs,
+so you might still consider doing so when you write a program.  Instead
+of writing function definitions in @sc{ansi} prototype form,
 
 @example
 int
@@ -412,7 +298,7 @@ foo (int x, int y)
 @end example
 
 @noindent
-write the definition in pre-standard style like this,
+write the definition in pre-@sc{ansi} style like this,
 
 @example
 int
@@ -429,123 +315,79 @@ int foo (int, int);
 @end example
 
 You need such a declaration anyway, in a header file, to get the benefit
-of prototypes in all the files where the function is called.  And once
-you have the declaration, you normally lose nothing by writing the
-function definition in the pre-standard style.
-
-This technique does not work for integer types narrower than @code{int}.
-If you think of an argument as being of a type narrower than @code{int},
-declare it as @code{int} instead.
-
-There are a few special cases where this technique is hard to use.  For
-example, if a function argument needs to hold the system type
-@code{dev_t}, you run into trouble, because @code{dev_t} is shorter than
-@code{int} on some machines; but you cannot use @code{int} instead,
-because @code{dev_t} is wider than @code{int} on some machines.  There
-is no type you can safely use on all machines in a non-standard
-definition.  The only way to support non-standard C and pass such an
-argument is to check the width of @code{dev_t} using Autoconf and choose
-the argument type accordingly.  This may not be worth the trouble.
-
-In order to support pre-standard compilers that do not recognize
-prototypes, you may want to use a preprocessor macro like this:
-
-@example
-/* Declare the prototype for a general external function.  */
-#if defined (__STDC__) || defined (WINDOWSNT)
-#define P_(proto) proto
-#else
-#define P_(proto) ()
-#endif
-@end example
+of @sc{ansi} C prototypes in all the files where the function is called.
+And once you have it, you lose nothing by writing the function
+definition in the pre-@sc{ansi} style.
 
-@node Conditional Compilation
-@section Conditional Compilation
+If you don't know non-@sc{ansi} C, there's no need to learn it; just
+write in @sc{ansi} C.
 
-When supporting configuration options already known when building your
-program we prefer using @code{if (... )} over conditional compilation,
-as in the former case the compiler is able to perform more extensive
-checking of all possible code paths.
+@node Source Language
+@section Using Languages Other Than C
 
-For example, please write
+Using a language other than C is like using a non-standard feature: it
+will cause trouble for users.  Even if GCC supports the other language,
+users may find it inconvenient to have to install the compiler for that
+other language in order to build your program.  For example, if you
+write your program in C++, people will have to install the C++ compiler
+in order to compile your program.  Thus, it is better if you write in C.
 
-@smallexample
-  if (HAS_FOO)
-    ...
-  else
-    ...
-@end smallexample
+But there are three situations when there is no disadvantage in using
+some other language:
 
-instead of:
+@itemize @bullet
+@item
+It is okay to use another language if your program contains an
+interpreter for that language.
 
-@smallexample
-  #ifdef HAS_FOO
-    ...
-  #else
-    ...
-  #endif
-@end smallexample
+For example, if your program links with GUILE, it is ok to write part of
+the program in Scheme or another language supported by GUILE.
 
-A modern compiler such as GCC will generate exactly the same code in
-both cases, and we have been using similar techniques with good success
-in several projects.
+@item
+It is okay to use another language in a tool specifically intended for
+use with that language.
 
-While this is not a silver bullet solving all portability problems,
-following this policy would have saved the GCC project alone many person
-hours if not days per year.
+This is okay because the only people who want to build the tool will be
+those who have installed the other language anyway.
 
-In the case of function-like macros like @code{REVERSIBLE_CC_MODE} in
-GCC which cannot be simply used in @code{if( ...)} statements, there is
-an easy workaround.  Simply introduce another macro
-@code{HAS_REVERSIBLE_CC_MODE} as in the following example:
+@item
+If an application is of interest to a narrow community, then perhaps
+it's not important if the application is inconvenient to install.
+@end itemize
 
-@smallexample
-  #ifdef REVERSIBLE_CC_MODE
-  #define HAS_REVERSIBLE_CC_MODE 1
-  #else
-  #define HAS_REVERSIBLE_CC_MODE 0
-  #endif
-@end smallexample
+C has one other advantage over C++ and other compiled languages: more
+people know C, so more people will find it easy to read and modify the
+program if it is written in C.
 
 @node Program Behavior
 @chapter Program Behavior for All Programs
 
-This @value{CHAPTER} describes conventions for writing robust
-software.  It also describes general standards for error messages, the
-command line interface, and how libraries should behave.
+This @value{CHAPTER} describes how to write robust software. It also
+describes general standards for error messages, the command line interface,
+and how libraries should behave.
 
 @menu
 * Semantics::                   Writing robust programs
 * Libraries::                   Library behavior
 * Errors::                      Formatting error messages
-* User Interfaces::             Standards about interfaces generally
-* Graphical Interfaces::        Standards for graphical interfaces
-* Command-Line Interfaces::     Standards for command line interfaces
-* Option Table::                Table of long options
+* User Interfaces::             Standards for command line interfaces
+* Option Table::                Table of long options.
 * Memory Usage::                When and how to care about memory needs
-* File Usage::                  Which files to use, and where
 @end menu
 
 @node Semantics
 @section Writing Robust Programs
 
-@cindex arbitrary limits on data
 Avoid arbitrary limits on the length or number of @emph{any} data
 structure, including file names, lines, files, and symbols, by allocating
 all data structures dynamically.  In most Unix utilities, ``long lines
 are silently truncated''.  This is not acceptable in a GNU utility.
 
-@cindex @code{NUL} characters
 Utilities reading files should not drop NUL characters, or any other
-nonprinting characters @emph{including those with codes above 0177}.
-The only sensible exceptions would be utilities specifically intended
-for interface to certain types of terminals or printers
-that can't handle those characters.
-Whenever possible, try to make programs work properly with
-sequences of bytes that represent multibyte characters, using encodings
-such as UTF-8 and others.
-
-@cindex error messages
+nonprinting characters @emph{including those with codes above 0177}.  The
+only sensible exceptions would be utilities specifically intended for
+interface to certain types of printers that can't handle those characters.
+
 Check every system call for an error return, unless you know you wish to
 ignore errors.  Include the system error text (from @code{perror} or
 equivalent) in @emph{every} error message resulting from a failing
@@ -553,8 +395,6 @@ system call, as well as the name of the file if any and the name of the
 utility.  Just ``cannot open foo.c'' or ``stat failed'' is not
 sufficient.
 
-@cindex @code{malloc} return value
-@cindex memory allocation failure
 Check every call to @code{malloc} or @code{realloc} to see if it
 returned zero.  Check @code{realloc} even if you are making the block
 smaller; in a system that rounds block sizes to a power of 2,
@@ -576,7 +416,6 @@ user), it is better to abort the command and return to the command
 reader loop.  This allows the user to kill other processes to free up
 virtual memory, and then try the command again.
 
-@cindex command-line arguments, decoding
 Use @code{getopt_long} to decode arguments, unless the argument syntax
 makes this unreasonable.
 
@@ -589,21 +428,12 @@ Try to avoid low-level interfaces to obscure Unix data structures (such
 as file directories, utmp, or the layout of kernel memory), since these
 are less likely to work compatibly.  If you need to find all the files
 in a directory, use @code{readdir} or some other high-level interface.
-These are supported compatibly by GNU.
+These will be supported compatibly by GNU.
 
-@cindex signal handling
-The preferred signal handling facilities are the BSD variant of
-@code{signal}, and the @sc{posix} @code{sigaction} function; the
-alternative USG @code{signal} interface is an inferior design.
+By default, the GNU system will provide the signal handling functions of
+@sc{BSD} and of @sc{POSIX}.  So GNU software should be written to use
+these.
 
-Nowadays, using the @sc{posix} signal functions may be the easiest way
-to make a program portable.  If you use @code{signal}, then on GNU/Linux
-systems running GNU libc version 1, you should include
-@file{bsd/signal.h} instead of @file{signal.h}, so as to get BSD
-behavior.  It is up to you whether to support systems where
-@code{signal} has only the USG behavior, or give up on them.
-
-@cindex impossible conditions
 In error checks that detect ``impossible'' conditions, just abort.
 There is usually no point in printing any message.  These checks
 indicate the existence of bugs.  Whoever wants to fix the bugs will have
@@ -618,28 +448,12 @@ bits (0 through 255).  A single run of the program might have 256
 errors; if you try to return 256 as the exit status, the parent process
 will see 0 as the status, and it will appear that the program succeeded.
 
-@cindex temporary files
-@cindex @code{TMPDIR} environment variable
 If you make temporary files, check the @code{TMPDIR} environment
 variable; if that variable is defined, use the specified directory
 instead of @file{/tmp}.
 
-In addition, be aware that there is a possible security problem when
-creating temporary files in world-writable directories.  In C, you can
-avoid this problem by creating temporary files in this manner:
-
-@example
-fd = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0600);
-@end example
-
-@noindent
-or by using the @code{mkstemps} function from libiberty.
-
-In bash, use @code{set -C} to avoid this problem.
-
 @node Libraries
 @section Library Behavior
-@cindex libraries
 
 Try to make library functions reentrant.  If they need to do dynamic
 storage allocation, at least try to avoid any nonreentrancy aside from
@@ -659,18 +473,16 @@ together, so that no reasonable program could use one without the
 other; then they can both go in the same file.
 
 External symbols that are not documented entry points for the user
-should have names beginning with @samp{_}.  The @samp{_} should be
-followed by the chosen name prefix for the library, to prevent
-collisions with other libraries.  These can go in the same files with
-user entry points if you like.
+should have names beginning with @samp{_}.  They should also contain
+the chosen name prefix for the library, to prevent collisions with
+other libraries.  These can go in the same files with user entry
+points if you like.
 
 Static functions and variables can be used as you like and need not
 fit any naming convention.
 
 @node Errors
 @section Formatting Error Messages
-@cindex formatting error messages
-@cindex error messages, formatting
 
 Error messages from compilers should look like this:
 
@@ -678,20 +490,6 @@ Error messages from compilers should look like this:
 @var{source-file-name}:@var{lineno}: @var{message}
 @end example
 
-@noindent
-If you want to mention the column number, use this format:
-
-@example
-@var{source-file-name}:@var{lineno}:@var{column}: @var{message}
-@end example
-
-@noindent
-Line numbers should start from 1 at the beginning of the file, and
-column numbers should start from 1 at the beginning of the line.  (Both
-of these conventions are chosen for compatibility.)  Calculate column
-numbers assuming that space and all ASCII printing characters have
-equal width, and assuming tab stops every 8 columns.
-
 Error messages from other noninteractive programs should look like this:
 
 @example
@@ -708,12 +506,6 @@ when there is an appropriate source file, or like this:
 @noindent
 when there is no relevant source file.
 
-If you want to mention the column number, use this format:
-
-@example
-@var{program}:@var{source-file-name}:@var{lineno}:@var{column}: @var{message}
-@end example
-
 In an interactive program (one that is reading commands from a
 terminal), it is better not to include the program name in an error
 message.  The place to indicate which program is running is in the
@@ -730,10 +522,8 @@ usage messages, should start with a capital letter.  But they should not
 end with a period.
 
 @node User Interfaces
-@section Standards for Interfaces Generally
+@section Standards for Command Line Interfaces
 
-@cindex program name and its behavior
-@cindex behavior, dependent on program's name
 Please don't make the behavior of a utility depend on the name used
 to invoke it.  It is useful sometimes to make a link to a utility
 with a different name, and that should not change what it does.
@@ -741,13 +531,10 @@ with a different name, and that should not change what it does.
 Instead, use a run time option or a compilation switch or both
 to select among the alternate behaviors.
 
-@cindex output device and program's behavior
 Likewise, please don't make the behavior of the program depend on the
 type of output device it is used with.  Device independence is an
-important principle of the system's design; do not compromise it merely
-to save someone from typing an option now and then.  (Variation in error
-message syntax when using a terminal is ok, because that is a side issue
-that people do not depend on.)
+important principle of the system's design; do not compromise it
+merely to save someone from typing an option now and then.
 
 If you think one behavior is most useful when the output is to a
 terminal, and another is most useful when the output is a file or a
@@ -763,42 +550,13 @@ output device type.  For example, we provide a @code{dir} program much
 like @code{ls} except that its default output format is always
 multi-column format.
 
-@node Graphical Interfaces
-@section Standards for Graphical Interfaces
-@cindex graphical user interface
-
-@cindex gtk
-When you write a program that provides a graphical user interface,
-please make it work with X Windows and the GTK toolkit unless the
-functionality specifically requires some alternative (for example,
-``displaying jpeg images while in console mode'').
-
-In addition, please provide a command-line interface to control the
-functionality.  (In many cases, the graphical user interface can be a
-separate program which invokes the command-line program.)  This is
-so that the same jobs can be done from scripts.
-
-@cindex corba
-@cindex gnome
-Please also consider providing a CORBA interface (for use from GNOME), a
-library interface (for use from C), and perhaps a keyboard-driven
-console interface (for use by users from console mode).  Once you are
-doing the work to provide the functionality and the graphical interface,
-these won't be much extra work.
-
-@node Command-Line Interfaces
-@section Standards for Command Line Interfaces
-@cindex command-line interface
-
-@findex getopt
-It is a good idea to follow the @sc{posix} guidelines for the
+It is a good idea to follow the @sc{POSIX} guidelines for the
 command-line options of a program.  The easiest way to do this is to use
 @code{getopt} to parse them.  Note that the GNU version of @code{getopt}
 will normally permit options anywhere among the arguments unless the
-special argument @samp{--} is used.  This is not what @sc{posix}
+special argument @samp{--} is used.  This is not what @sc{POSIX}
 specifies; it is a GNU extension.
 
-@cindex long-named options
 Please define long-named options that are equivalent to the
 single-letter Unix-style options.  We hope to make GNU more user
 friendly this way.  This is easy to do with the GNU function
@@ -818,20 +576,16 @@ file name as an ordinary argument for compatibility, try to provide an
 option as another way to specify it.  This will lead to more consistency
 among GNU utilities, and fewer idiosyncracies for users to remember.
 
-@cindex standard command-line options
 All programs should support two standard options: @samp{--version}
 and @samp{--help}.
 
 @table @code
-@cindex @samp{--version} option
 @item --version
-This option should direct the program to print information about its name,
+This option should direct the program to information about its name,
 version, origin and legal status, all on standard output, and then exit
 successfully.  Other options and arguments should be ignored once this
 is seen, and the program should not perform its normal function.
 
-@cindex canonical name of a program
-@cindex program's canonical name
 The first line is meant to be easy for a program to parse; the version
 number proper starts after the last space.  In addition, it contains
 the canonical name for this program, in this format:
@@ -904,33 +658,12 @@ versions' changes.  You don't have to mention the name of the program in
 these notices, if that is inconvenient, since it appeared in the first
 line.
 
-Translations of the above lines must preserve the validity of the
-copyright notices (@pxref{Internationalization}).  If the translation's
-character set supports it, the @samp{(C)} should be replaced with the
-copyright symbol, as follows:
-
-@ifinfo 
-(the official copyright symbol, which is the letter C in a circle); 
-@end ifinfo 
-@ifnotinfo 
-@copyright{}
-@end ifnotinfo 
-
-Write the word ``Copyright'' exactly like that, in English.  Do not
-translate it into another language.  International treaties recognize
-the English word ``Copyright''; translations into other languages do not
-have legal significance.
-
-
-@cindex @samp{--help} option
 @item --help
 This option should output brief documentation for how to invoke the
 program, on standard output, then exit successfully.  Other options and
 arguments should be ignored once this is seen, and the program should
 not perform its normal function.
 
-@cindex address for bug reports
-@cindex bug reports
 Near the end of the @samp{--help} option's output there should be a line
 that says where to mail bug reports.  It should have this format:
 
@@ -941,13 +674,11 @@ Report bugs to @var{mailing-address}.
 
 @node Option Table
 @section Table of Long Options
-@cindex long option names
-@cindex table of long options
 
 Here is a table of long options used by GNU programs.  It is surely
 incomplete, but we aim to list all the options that a new program might
 want to be compatible with.  If you use names not already in the table,
-please send @email{bug-standards@@gnu.org} a list of them, with their
+please send @email{gnu@@gnu.org} a list of them, with their
 meanings, so we can update the table.
 
 @c Please leave newlines between items in this table; it's much easier
@@ -1007,9 +738,6 @@ and @code{unexpand}.
 @item avoid-wraps
 @samp{-n} in @code{wdiff}.
 
-@item background
-For server programs, run in the background.
-
 @item backward-search
 @samp{-B} in @code{ctags}.
 
@@ -1134,9 +862,6 @@ Used in @code{tar} and @code{cpio}.
 @item dereference-args
 @samp{-D} in @code{du}.
 
-@item device
-Specify an I/O device (special file name).
-
 @item diacritics
 @samp{-d} in @code{recode}.
 
@@ -1269,11 +994,6 @@ Used in @code{makeinfo}.
 @item force-prefix
 @samp{-F} in @code{shar}.
 
-@item foreground
-For server programs, run in the foreground;
-in other words, don't do anything special to run the server
-in the background.
-
 @item format
 Used in @code{ls}, @code{time}, and @code{ptx}.
 
@@ -1319,9 +1039,6 @@ Used to ask for brief usage information.
 @item hide-control-chars
 @samp{-q} in @code{ls}.
 
-@item html
-In @code{makeinfo}, output HTML.
-
 @item idle
 @samp{-u} in @code{who}.
 
@@ -1382,10 +1099,6 @@ In @code{makeinfo}, output HTML.
 @item info
 @samp{-i}, @samp{-l}, and @samp{-m} in Finger.
 
-@item init-file
-In some programs, specify the name of the file to read as the user's
-init file.
-
 @item initial
 @samp{-i} in @code{expand}.
 
@@ -1404,9 +1117,6 @@ init file.
 @item intermix-type
 @samp{-p} in @code{shar}.
 
-@item iso-8601
-Used in @code{date}
-
 @item jobs
 @samp{-j} in Make.
 
@@ -1642,10 +1352,6 @@ Used in GDB.
 @item only-time
 @samp{-F} in @code{gprof}.
 
-@item options
-@samp{-o} in @code{getopt}, @code{fdlist}, @code{fdmount},
-@code{fdmountd}, and @code{fdumount}.
-
 @item output
 In various programs, specify the output file name.
 
@@ -1730,9 +1436,6 @@ Used in @code{tar} and @code{cp}.
 @item prompt
 @samp{-p} in @code{ed}.
 
-@item proxy
-Specify an HTTP proxy.
-
 @item query-user
 @samp{-X} in @code{shar}.
 
@@ -1861,12 +1564,6 @@ Used in many programs to inhibit the usual output.
 @item size
 @samp{-s} in @code{ls}.
 
-@item socket
-Specify a file descriptor for a network server to use for its socket,
-instead of opening and binding a new socket.  This provides a way to
-run, in a nonpriveledged process, a server that normally needs a
-reserved port number.
-
 @item sort
 Used in @code{ls}.
 
@@ -1965,9 +1662,6 @@ Used in GDB and @code{objdump}.
 @item time
 Used in @code{ls} and @code{touch}.
 
-@item timeout
-Specify how long to wait before giving up on some operation.
-
 @item to-stdout
 @samp{-O} in @code{tar}.
 
@@ -2060,9 +1754,8 @@ Print the version number.
 
 @node Memory Usage
 @section Memory Usage
-@cindex memory usage
 
-If a program typically uses just a few meg of memory, don't bother making any
+If it typically uses just a few meg of memory, don't bother making any
 effort to reduce memory usage.  For example, if it is impractical for
 other reasons to operate on files more than a few meg long, it is
 reasonable to read entire input files into core to operate on them.
@@ -2078,23 +1771,6 @@ files that are bigger than will fit in core all at once.
 If your program creates complicated data structures, just make them in
 core and give a fatal error if @code{malloc} returns zero.
 
-@node File Usage
-@section File Usage
-@cindex file usage
-
-Programs should be prepared to operate when @file{/usr} and @file{/etc}
-are read-only file systems.  Thus, if the program manages log files,
-lock files, backup files, score files, or any other files which are
-modified for internal purposes, these files should not be stored in
-@file{/usr} or @file{/etc}.
-
-There are two exceptions.  @file{/etc} is used to store system
-configuration information; it is reasonable for a program to modify
-files in @file{/etc} when its job is to update the system configuration.
-Also, if the user explicitly asks to modify one file in a directory, it
-is reasonable for the program to store other files in the same
-directory.
-
 @node Writing C
 @chapter Making The Best Use of C
 
@@ -2105,7 +1781,7 @@ when writing GNU software.
 * Formatting::                  Formatting Your Source Code
 * Comments::                    Commenting Your Work
 * Syntactic Conventions::       Clean Use of C Constructs
-* Names::                       Naming Variables, Functions, and Files
+* Names::                       Naming Variables and Functions
 * System Portability::          Portability between different operating systems
 * CPU Portability::             Supporting the range of CPU types
 * System Functions::            Portability and ``standard'' library functions
@@ -2115,10 +1791,7 @@ when writing GNU software.
 
 @node Formatting
 @section Formatting Your Source Code
-@cindex formatting source code
 
-@cindex open brace
-@cindex braces, in C source
 It is important to put the open-brace that starts the body of a C
 function in column zero, and avoid putting any other open-brace or
 open-parenthesis or open-bracket in column zero.  Several tools look
@@ -2140,8 +1813,7 @@ concat (s1, s2)        /* Name starts in column zero here */
 @end example
 
 @noindent
-or, if you want to use Standard C syntax, format the definition like
-this:
+or, if you want to use @sc{ansi} C, format the definition like this:
 
 @example
 static char *
@@ -2151,7 +1823,7 @@ concat (char *s1, char *s2)
 @}
 @end example
 
-In Standard C, if the arguments don't fit nicely on one line,
+In @sc{ansi} C, if the arguments don't fit nicely on one line,
 split it like this:
 
 @example
@@ -2161,25 +1833,7 @@ lots_of_args (int an_integer, long a_long, short a_short,
 @dots{}
 @end example
 
-The rest of this section gives our recommendations for other aspects of
-C formatting style, which is also the default style of the @code{indent}
-program in version 1.2 and newer.  It corresponds to the options
-
-@smallexample
--nbad -bap -nbc -bbo -bl -bli2 -bls -ncdb -nce -cp1 -cs -di2
--ndj -nfc1 -nfca -hnl -i2 -ip5 -lp -pcs -psl -nsc -nsob
-@end smallexample
-
-We don't think of these recommendations as requirements, because it
-causes no problems for users if two different programs have different
-formatting styles.
-
-But whatever style you use, please use it consistently, since a mixture
-of styles within one program tends to look ugly.  If you are
-contributing changes to an existing program, please follow the style of
-that program.
-
-For the body of the function, our recommended style looks like this:
+For the body of the function, we prefer code formatted like this:
 
 @example
 if (x < foo (y, z))
@@ -2195,14 +1849,12 @@ else
   @}
 @end example
 
-@cindex spaces before open-paren
 We find it easier to read a program when it has spaces before the
 open-parentheses and after the commas.  Especially after the commas.
 
 When you split an expression into multiple lines, split it
 before an operator, not after one.  Here is the right way:
 
-@cindex expressions, splitting
 @example
 if (foo_this_is_long && bar > win (x, y, z)
     && remaining_condition)
@@ -2227,15 +1879,14 @@ mode = ((inmode[j] == VOIDmode
 
 Insert extra parentheses so that Emacs will indent the code properly.
 For example, the following indentation looks nice if you do it by hand,
+but Emacs would mess it up:
 
 @example
 v = rup->ru_utime.tv_sec*1000 + rup->ru_utime.tv_usec/1000
     + rup->ru_stime.tv_sec*1000 + rup->ru_stime.tv_usec/1000;
 @end example
 
-@noindent
-but Emacs would alter it.  Adding a set of parentheses produces
-something that looks equally nice, and which Emacs will preserve:
+But adding a set of parentheses solves the problem:
 
 @example
 v = (rup->ru_utime.tv_sec*1000 + rup->ru_utime.tv_usec/1000
@@ -2252,16 +1903,14 @@ do
 while (a > 0);
 @end example
 
-@cindex formfeed
-@cindex control-L
 Please use formfeed characters (control-L) to divide the program into
 pages at logical places (but not within a function).  It does not matter
 just how long the pages are, since they do not have to fit on a printed
 page.  The formfeeds should appear alone on lines by themselves.
 
+
 @node Comments
 @section Commenting Your Work
-@cindex commenting
 
 Every program should start with a comment saying briefly what it is for.
 Example: @samp{fmt - filter for simple filling of text}.
@@ -2313,8 +1962,6 @@ There should be a comment on each static variable as well, like this:
 int truncate_lines;
 @end example
 
-@cindex conditionals, comments for
-@cindex @code{#endif}, commenting
 Every @samp{#endif} should have a comment, except in the case of short
 conditionals (just a few lines) that are not nested.  The comment should
 state the condition of the conditional that is ending, @emph{including
@@ -2356,23 +2003,9 @@ but, by contrast, write the comments this way for a @samp{#ifndef}:
 
 @node Syntactic Conventions
 @section Clean Use of C Constructs
-@cindex syntactic conventions
-
-@cindex implicit @code{int}
-@cindex function argument, declaring
-Please explicitly declare the types of all objects.  For example, you
-should explicitly declare all arguments to functions, and you should
-declare functions to return @code{int} rather than omitting the
-@code{int}.
-
-@cindex compiler warnings
-@cindex @samp{-Wall} compiler option
-Some programmers like to use the GCC @samp{-Wall} option, and change the
-code whenever it issues a warning.  If you want to do this, then do.
-Other programmers prefer not to use @samp{-Wall}, because it gives
-warnings for valid and legitimate code which they do not want to change.
-If you want to do this, then do.  The compiler should be your servant,
-not your master.
+
+Please explicitly declare all arguments to functions.
+Don't omit them just because they are @code{int}s.
 
 Declarations of external functions and functions to appear later in the
 source file should all go in one place near the beginning of the file
@@ -2380,7 +2013,6 @@ source file should all go in one place near the beginning of the file
 should go in a header file.  Don't put @code{extern} declarations inside
 functions.
 
-@cindex temporary variables
 It used to be common practice to use the same local variables (with
 names like @code{tem}) over and over for different values within one
 function.  Instead of doing this, it is better declare a separate local
@@ -2392,7 +2024,6 @@ all its uses.  This makes the program even cleaner.
 
 Don't use local variables or parameters that shadow global identifiers.
 
-@cindex multiple variables in a line
 Don't declare multiple variables in one declaration that spans lines.
 Start a new declaration on each line, instead.  For example, instead
 of this:
@@ -2493,15 +2124,13 @@ if (foo == 0)
   fatal ("virtual memory exhausted");
 @end example
 
-@pindex lint
 Don't make the program ugly to placate @code{lint}.  Please don't insert any
 casts to @code{void}.  Zero without a cast is perfectly fine as a null
 pointer constant, except when calling a varargs function.
 
-@node Names
-@section Naming Variables, Functions, and Files
+@node  Names
+@section Naming Variables and Functions
 
-@cindex names of variables, functions, and files
 The names of global variables and functions in a program serve as
 comments of a sort.  So don't choose terse names---instead, look for
 names that give useful information about the meaning of the variable or
@@ -2511,10 +2140,6 @@ comments.
 Local variable names can be shorter, because they are used only within
 one context, where (presumably) comments explain their purpose.
 
-Try to limit your use of abbreviations in symbol names.  It is ok to
-make a few abbreviations, explain what they mean, and then use them
-frequently, but don't use lots of obscure abbreviations.
-
 Please use underscores to separate words in a name, so that the Emacs
 word commands can be useful within them.  Stick to lower case; reserve
 upper case for macros and @code{enum} constants, and for name-prefixes
@@ -2539,41 +2164,30 @@ When you want to define names with constant integer values, use
 @code{enum} rather than @samp{#define}.  GDB knows about enumeration
 constants.
 
-@cindex file-name limitations
-@pindex doschk
-You might want to make sure that none of the file names would conflict
-the files were loaded onto an MS-DOS file system which shortens the
-names.  You can use the program @code{doschk} to test for this.
-
-Some GNU programs were designed to limit themselves to file names of 14
-characters or less, to avoid file name conflicts if they are read into
-older System V systems.  Please preserve this feature in the existing
-GNU programs that have it, but there is no need to do this in new GNU
-programs.  @code{doschk} also reports file names longer than 14
-characters.
+Use file names of 14 characters or less, to avoid creating gratuitous
+problems on older System V systems.  You can use the program
+@code{doschk} to test for this.  @code{doschk} also tests for potential
+name conflicts if the files were loaded onto an MS-DOS file
+system---something you may or may not care about.
 
 @node System Portability
 @section Portability between System Types
-@cindex portability, between system types
 
 In the Unix world, ``portability'' refers to porting to different Unix
 versions.  For a GNU program, this kind of portability is desirable, but
 not paramount.
 
 The primary purpose of GNU software is to run on top of the GNU kernel,
-compiled with the GNU C compiler, on various types of @sc{cpu}.  So the
-kinds of portability that are absolutely necessary are quite limited.
-But it is important to support Linux-based GNU systems, since they
-are the form of GNU that is popular.
-
-Beyond that, it is good to support the other free operating systems
-(*BSD), and it is nice to support other Unix-like systems if you want
-to.  Supporting a variety of Unix-like systems is desirable, although
-not paramount.  It is usually not too hard, so you may as well do it.
-But you don't have to consider it an obligation, if it does turn out to
-be hard.
-
-@pindex autoconf
+compiled with the GNU C compiler, on various types of @sc{cpu}.  The
+amount and kinds of variation among GNU systems on different @sc{cpu}s
+will be comparable to the variation among Linux-based GNU systems or
+among BSD systems today.  So the kinds of portability that are absolutely
+necessary are quite limited.
+
+But many users do run GNU software on non-GNU Unix or Unix-like systems.
+So supporting a variety of Unix-like systems is desirable, although not
+paramount.
+
 The easiest way to achieve portability to most Unix-like systems is to
 use Autoconf.  It's unlikely that your program needs to know more
 information about the host platform than Autoconf can provide, simply
@@ -2583,30 +2197,19 @@ written.
 Avoid using the format of semi-internal data bases (e.g., directories)
 when there is a higher-level alternative (@code{readdir}).
 
-@cindex non-@sc{posix} systems, and portability
 As for systems that are not like Unix, such as MSDOS, Windows, the
-Macintosh, VMS, and MVS, supporting them is often a lot of work.  When
-that is the case, it is better to spend your time adding features that
-will be useful on GNU and GNU/Linux, rather than on supporting other
-incompatible systems.
-
-It is a good idea to define the ``feature test macro''
-@code{_GNU_SOURCE} when compiling your C files.  When you compile on GNU
-or GNU/Linux, this will enable the declarations of GNU library extension
-functions, and that will usually give you a compiler error message if
-you define the same function names in some other way in your program.
-(You don't have to actually @emph{use} these functions, if you prefer
-to make the program more portable to other systems.)
-
-But whether or not you use these GNU extensions, you should avoid
-using their names for any other meanings.  Doing so would make it hard
-to move your code into other GNU programs.
+Macintosh, VMS, and MVS, supporting them is usually so much work that it
+is better if you don't.
+
+The planned GNU kernel is not finished yet, but you can tell which
+facilities it will provide by looking at the GNU C Library Manual.  The
+GNU kernel is based on Mach, so the features of Mach will also be
+available.  However, if you use Mach features, you'll probably have
+trouble debugging your program today.
 
 @node CPU Portability
 @section Portability between @sc{cpu}s
 
-@cindex data types, and portability
-@cindex portability, and data types
 Even GNU systems will differ because of differences among @sc{cpu}
 types---for example, difference in byte ordering and alignment
 requirements.  It is absolutely essential to handle these differences.
@@ -2614,25 +2217,6 @@ However, don't make any effort to cater to the possibility that an
 @code{int} will be less than 32 bits.  We don't support 16-bit machines
 in GNU.
 
-Similarly, don't make any effort to cater to the possibility that
-@code{long} will be smaller than predefined types like @code{size_t}.
-For example, the following code is ok:
-
-@example
-printf ("size = %lu\n", (unsigned long) sizeof array);
-printf ("diff = %ld\n", (long) (pointer2 - pointer1));
-@end example
-
-1989 Standard C requires this to work, and we know of only one
-counterexample: 64-bit programs on Microsoft Windows IA-64.  We will
-leave it to those who want to port GNU programs to that environment
-to figure out how to do it.
-
-Predefined file-size types like @code{off_t} are an exception: they are
-longer than @code{long} on many platforms, so code like the above won't
-work with them.  One way to print an @code{off_t} value portably is to
-print its digits yourself, one by one.
-
 Don't assume that the address of an @code{int} object is also the
 address of its least-significant byte.  This is false on big-endian
 machines.  Thus, don't make the following mistake:
@@ -2647,9 +2231,9 @@ while ((c = getchar()) != EOF)
 When calling functions, you need not worry about the difference between
 pointers of various types, or between pointers and integers.  On most
 machines, there's no difference anyway.  As for the few machines where
-there is a difference, all of them support Standard C prototypes, so you can
-use prototypes (perhaps conditionalized to be active only in Standard C)
-to make the code work on those systems.
+there is a difference, all of them support @sc{ansi} C, so you can use
+prototypes (conditionalized to be active only in @sc{ansi} C) to make
+the code work on those systems.
 
 In certain cases, it is ok to pass integer and pointer arguments
 indiscriminately to the same function, and use no prototype on any
@@ -2659,7 +2243,7 @@ that pass their arguments along to @code{printf} and friends:
 @example
 error (s, a1, a2, a3)
      char *s;
-     char *a1, *a2, *a3;
+     int a1, a2, a3;
 @{
   fprintf (stderr, "error: ");
   fprintf (stderr, s, a1, a2, a3);
@@ -2667,50 +2251,36 @@ error (s, a1, a2, a3)
 @end example
 
 @noindent
-In practice, this works on all machines, since a pointer is generally
-the widest possible kind of argument; it is much simpler than any
-``correct'' alternative.  Be sure @emph{not} to use a prototype for such
-functions.
+In practice, this works on all machines, and it is much simpler than any
+``correct'' alternative.  Be sure @emph{not} to use a prototype
+for such functions.
 
-If you have decided to use Standard C, then you can instead define
-@code{error} using @file{stdarg.h}, and pass the arguments along to
-@code{vfprintf}.
-
-@cindex casting pointers to integers
-Avoid casting pointers to integers if you can.  Such casts greatly
-reduce portability, and in most programs they are easy to avoid.  In the
-cases where casting pointers to integers is essential---such as, a Lisp
-interpreter which stores type information as well as an address in one
-word---you'll have to make explicit provisions to handle different word
-sizes.  You will also need to make provision for systems in which the
-normal range of addresses you can get from @code{malloc} starts far away
-from zero.
+However, avoid casting pointers to integers unless you really need to.
+These assumptions really reduce portability, and in most programs they
+are easy to avoid.  In the cases where casting pointers to integers is
+essential---such as, a Lisp interpreter which stores type information as
+well as an address in one word---it is ok to do so, but you'll have to
+make explicit provisions to handle different word sizes.
 
 @node System Functions
 @section Calling System Functions
-@cindex library functions, and portability
-@cindex portability, and library functions
 
-C implementations differ substantially.  Standard C reduces but does
-not eliminate the incompatibilities; meanwhile, many GNU packages still
-support pre-standard compilers because this is not hard to do.  This
-chapter gives recommendations for how to use the more-or-less standard C
-library functions to avoid unnecessary loss of portability.
+C implementations differ substantially.  @sc{ansi} C reduces but does not
+eliminate the incompatibilities; meanwhile, many users wish to compile
+GNU software with pre-@sc{ansi} compilers.  This chapter gives
+recommendations for how to use the more or less standard C library
+functions to avoid unnecessary loss of portability.
 
 @itemize @bullet
 @item
-Don't use the return value of @code{sprintf}.  It returns the number of
+Don't use the value of @code{sprintf}.  It returns the number of
 characters written on some systems, but not on all systems.
 
 @item
-Be aware that @code{vfprintf} is not always available.
-
-@item
 @code{main} should be declared to return type @code{int}.  It should
 terminate either by calling @code{exit} or by returning the integer
 status code; make sure it cannot ever return an undefined value.
 
-@cindex declaration for system functions
 @item
 Don't declare system functions explicitly.
 
@@ -2727,7 +2297,7 @@ actual conflicts.
 
 @item
 If you must declare a system function, don't specify the argument types.
-Use an old-style declaration, not a Standard C prototype.  The more you
+Use an old-style declaration, not an @sc{ansi} prototype.  The more you
 specify about the function, the more likely a conflict.
 
 @item
@@ -2749,7 +2319,6 @@ exceptional systems (mostly 64-bit machines), you can use
 @code{realloc}---or put these declarations in configuration files
 specific to those systems.
 
-@cindex string library functions
 @item
 The string functions require special treatment.  Some Unix systems have
 a header file @file{string.h}; others have @file{strings.h}.  Neither
@@ -2760,7 +2329,7 @@ figure out which file to include, or don't include either file.
 If you don't include either strings file, you can't get declarations for
 the string functions from the header file in the usual way.
 
-That causes less of a problem than you might think.  The newer standard
+That causes less of a problem than you might think.  The newer @sc{ansi}
 string functions should be avoided anyway because many systems still
 don't support them.  The string functions you can use are these:
 
@@ -2790,7 +2359,7 @@ names, but neither pair works on all systems.
 
 You should pick a single pair of names and use it throughout your
 program.  (Nowadays, it is better to choose @code{strchr} and
-@code{strrchr} for new programs, since those are the standard
+@code{strrchr} for new programs, since those are the standard @sc{ansi}
 names.)  Declare both of those names as functions returning @code{char
 *}.  On systems which don't support those names, define them as macros
 in terms of the other pair.  For example, here is what to put at the
@@ -2816,9 +2385,7 @@ One way to get them properly defined is to use Autoconf.
 
 @node Internationalization
 @section Internationalization
-@cindex internationalization
 
-@pindex gettext
 GNU has a library called GNU gettext that makes it easy to translate the
 messages in a program into various languages.  You should use this
 library in every program.  Use English for the messages as they appear
@@ -2845,7 +2412,6 @@ translations for this package from the translations for other packages.
 Normally, the text domain name should be the same as the name of the
 package---for example, @samp{fileutils} for the GNU file utilities.
 
-@cindex message text, and internationalization
 To enable gettext to work well, avoid writing code that makes
 assumptions about the structure of words or sentences.  When you want
 the precise text of a sentence to vary depending on the data, use two or
@@ -2917,7 +2483,6 @@ printf (f->tried_implicit
 
 @node Mmap
 @section Mmap
-@findex mmap
 
 Don't assume that @code{mmap} either works on all files or fails
 for all files.  It may work on some files and fail on others.
@@ -2934,20 +2499,10 @@ all these kinds of files.
 
 @node Documentation
 @chapter Documenting Programs
-@cindex documentation
-
-A GNU program should ideally come with full free documentation, adequate
-for both reference and tutorial purposes.  If the package can be
-programmed or extended, the documentation should cover programming or
-extending it, as well as just using it.
 
 @menu
 * GNU Manuals::                 Writing proper manuals.
-* Doc Strings and Manuals::     Compiling doc strings doesn't make a manual.
 * Manual Structure Details::    Specific structure conventions.
-* License for Manuals::         Writing the distribution terms for a manual.
-* Manual Credits::              Giving credit to documentation contributors.
-* Printed Manuals::             Mentioning the printed manual.
 * NEWS File::                   NEWS files supplement manuals.
 * Change Logs::                 Recording Changes
 * Man Pages::                   Man pages are secondary.
@@ -2958,18 +2513,10 @@ extending it, as well as just using it.
 @node GNU Manuals
 @section GNU Manuals
 
-The preferred document format for the GNU system is the Texinfo
-formatting language.  Every GNU package should (ideally) have
-documentation in Texinfo both for reference and for learners.  Texinfo
-makes it possible to produce a good quality formatted book, using
-@TeX{}, and to generate an Info file.  It is also possible to generate
-HTML output from Texinfo source.  See the Texinfo manual, either the
-hardcopy, or the on-line version available through @code{info} or the
-Emacs Info subsystem (@kbd{C-h i}).
-
-Nowadays some other formats such as Docbook and Sgmltexi can be
-converted automatically into Texinfo.  It is ok to produce the Texinfo
-documentation by conversion this way, as long as it gives good results.
+The preferred way to document part of the GNU system is to write a
+manual in the Texinfo formatting language.  See the Texinfo manual,
+either the hardcopy, or the on-line version available through
+@code{info} or the Emacs Info subsystem (@kbd{C-h i}).
 
 Programmers often find it most natural to structure the documentation
 following the structure of the implementation, which they know.  But
@@ -2998,9 +2545,9 @@ have one manual for ``comparison of files'' which covers both of those
 programs, as well as @code{cmp}.  By documenting these programs
 together, we can make the whole subject clearer.
 
-The manual which discusses a program should certainly document all of
-the program's command-line options and all of its commands.  It should
-give examples of their use.  But don't organize the manual as a list of
+The manual which discusses a program should document all of the
+program's command-line options and all of its commands.  It should give
+examples of their use.  But don't organize the manual as a list of
 features.  Instead, organize it logically, by subtopics.  Address the
 questions that a user will ask when thinking about the job that the
 program does.
@@ -3010,8 +2557,6 @@ It should be set up for convenient access to each topic through Info,
 and for reading straight through (appendixes aside).  A GNU manual
 should give a good introduction to a beginner reading through from the
 start, and should also provide all the details that hackers want.
-The Bison manual is a good example of this---please take a look at it
-to see what we mean.
 
 That is not as hard as it first sounds.  Arrange each chapter as a
 logical breakdown of its topic, but order the sections, and write their
@@ -3025,62 +2570,22 @@ are purely tutorial and cover the basics of the subject.  These provide
 the framework for a beginner to understand the rest of the manual.  The
 Bison manual provides a good example of how to do this.
 
-To serve as a reference, a manual should have an Index that list all the
-functions, variables, options, and important concepts that are part of
-the program.  One combined Index should do for a short manual, but
-sometimes for a complex package it is better to use multiple indices.
-The Texinfo manual includes advice on preparing good index entries, see
-@ref{Index Entries, , Making Index Entries, texinfo, The GNU Texinfo
-Manual}, and see @ref{Indexing Commands, , Defining the Entries of an
-Index, texinfo, The GNU Texinfo manual}.
-
 Don't use Unix man pages as a model for how to write GNU documentation;
 most of them are terse, badly structured, and give inadequate
-explanation of the underlying concepts.  (There are, of course, some
-exceptions.)  Also, Unix man pages use a particular format which is
+explanation of the underlying concepts.  (There are, of course
+exceptions.)  Also Unix man pages use a particular format which is
 different from what we use in GNU manuals.
 
-Please include an email address in the manual for where to report
-bugs @emph{in the manual}.
-
 Please do not use the term ``pathname'' that is used in Unix
 documentation; use ``file name'' (two words) instead.  We use the term
-``path'' only for search paths, which are lists of directory names.
+``path'' only for search paths, which are lists of file names.
 
 Please do not use the term ``illegal'' to refer to erroneous input to a
 computer program.  Please use ``invalid'' for this, and reserve the term
-``illegal'' for activities punishable by law.
-
-@node Doc Strings and Manuals
-@section Doc Strings and Manuals
-
-Some programming systems, such as Emacs, provide a documentation string
-for each function, command or variable.  You may be tempted to write a
-reference manual by compiling the documentation strings and writing a
-little additional text to go around them---but you must not do it.  That
-approach is a fundamental mistake.  The text of well-written
-documentation strings will be entirely wrong for a manual.
-
-A documentation string needs to stand alone---when it appears on the
-screen, there will be no other text to introduce or explain it.
-Meanwhile, it can be rather informal in style.
-
-The text describing a function or variable in a manual must not stand
-alone; it appears in the context of a section or subsection.  Other text
-at the beginning of the section should explain some of the concepts, and
-should often make some general points that apply to several functions or
-variables.  The previous descriptions of functions and variables in the
-section will also have given information about the topic.  A description
-written to stand alone would repeat some of that information; this
-redundance looks bad.  Meanwhile, the informality that is acceptable in
-a documentation string is totally unacceptable in a manual.
-
-The only good way to use documentation strings in writing a good manual
-is to use them as a source of information for writing good text.
+``illegal'' for violations of law.
 
 @node Manual Structure Details
 @section Manual Structure Details
-@cindex manual structure
 
 The title page of the manual should state the version of the programs or
 packages documented in the manual.  The Top node of the manual should
@@ -3088,7 +2593,7 @@ also contain this information.  If the manual is changing more
 frequently than or independent of the program, also state a version
 number for the manual in both of these places.
 
-Each program documented in the manual should have a node named
+Each program documented in the manual should should have a node named
 @samp{@var{program} Invocation} or @samp{Invoking @var{program}}.  This
 node (together with its subnodes, if any) should describe the program's
 command line arguments and how to run it (the sort of information people
@@ -3100,57 +2605,14 @@ Alternatively, put a menu item in some menu whose item name fits one of
 the above patterns.  This identifies the node which that item points to
 as the node for this purpose, regardless of the node's actual name.
 
-The @samp{--usage} feature of the Info reader looks for such a node
-or menu item in order to find the relevant text, so it is essential
-for every Texinfo file to have one.
+There will be automatic features for specifying a program name and
+quickly reading just this part of its manual.
 
 If one manual describes several programs, it should have such a node for
-each program described in the manual.
-
-@node License for Manuals
-@section License for Manuals
-@cindex license for manuals
-
-Please use the GNU Free Documentation License for all GNU manuals that
-are more than a few pages long.  Likewise for a collection of short
-documents---you only need one copy of the GNU FDL for the whole
-collection.  For a single short document, you can use a very permissive
-non-copyleft license, to avoid taking up space with a long license.
-
-See @uref{http://www.gnu.org/copyleft/fdl-howto.html} for more explanation
-of how to employ the GFDL.
-
-Note that it is not obligatory to include a copy of the GNU GPL or GNU
-LGPL in a manual whose license is neither the GPL nor the LGPL.  It can
-be a good idea to include the program's license in a large manual; in a
-short manual, whose size would be increased considerably by including
-the program's license, it is probably better not to include it.
-
-@node Manual Credits
-@section Manual Credits
-@cindex credits for manuals
-
-Please credit the principal human writers of the manual as the authors,
-on the title page of the manual.  If a company sponsored the work, thank
-the company in a suitable place in the manual, but do not cite the
-company as an author.
-
-@node Printed Manuals
-@section Printed Manuals
-
-The FSF publishes some GNU manuals in printed form.  To encourage sales
-of these manuals, the on-line versions of the manual should mention at
-the very start that the printed manual is available and should point at
-information for getting it---for instance, with a link to the page
-@url{http://www.gnu.org/order/order.html}.  This should not be included
-in the printed manual, though, because there it is redundant.
-
-It is also useful to explain in the on-line forms of the manual how the
-user can print out the manual from the sources.
+each program described.
 
 @node NEWS File
 @section The NEWS File
-@cindex @file{NEWS} file
 
 In addition to its manual, the package should have a file named
 @file{NEWS} which contains a list of user-visible changes worth
@@ -3165,7 +2627,6 @@ user to that file.
 
 @node Change Logs
 @section Change Logs
-@cindex change logs
 
 Keep a change log to describe all the changes made to program source
 files.  The purpose of this is so that people investigating bugs in the
@@ -3180,7 +2641,6 @@ history of how the conflicting concepts arose and who they came from.
 * Style of Change Logs::        
 * Simple Changes::              
 * Conditional Changes::         
-* Indicating the Part Changed::
 @end menu
 
 @node Change Log Concepts
@@ -3199,8 +2659,7 @@ you.
 
 Another alternative is to record change log information with a version
 control system such as RCS or CVS.  This can be converted automatically
-to a @file{ChangeLog} file using @code{rcs2log}; in Emacs, the command
-@kbd{C-x v a} (@code{vc-update-change-log}) does the job.
+to a @file{ChangeLog} file.
 
 There's no need to describe the full purpose of the changes or how they
 work together.  If you think that a change calls for explanation, you're
@@ -3221,16 +2680,10 @@ Then describe the changes you made to that function or variable.
 
 @node Style of Change Logs
 @subsection Style of Change Logs
-@cindex change logs, style
 
-Here are some simple examples of change log entries, starting with the
-header line that says who made the change and when, followed by
-descriptions of specific changes.  (These examples are drawn from Emacs
-and GCC.)
+Here are some examples of change log entries:
 
 @example
-1998-08-17  Richard Stallman  <rms@@gnu.org>
-
 * register.el (insert-register): Return nil.
 (jump-to-register): Likewise.
 
@@ -3261,15 +2714,6 @@ entries represent parts of the same change, so that they work together,
 then don't put blank lines between them.  Then you can omit the file
 name and the asterisk when successive entries are in the same file.
 
-Break long lists of function names by closing continued lines with
-@samp{)}, rather than @samp{,}, and opening the continuation with
-@samp{(} as in this example:
-
-@example
-* keyboard.c (menu_bar_items, tool_bar_items)
-(Fexecute_extended_command): Deal with `keymap' property.
-@end example
-
 @node Simple Changes
 @subsection Simple Changes
 
@@ -3277,10 +2721,9 @@ Certain simple kinds of changes don't need much detail in the change
 log.
 
 When you change the calling sequence of a function in a simple fashion,
-and you change all the callers of the function to use the new calling
-sequence, there is no need to make individual entries for all the
-callers that you changed.  Just write in the entry for the function
-being called, ``All callers changed''---like this:
+and you change all the callers of the function, there is no need to make
+individual entries for all the callers that you changed.  Just write in
+the entry for the function being called, ``All callers changed.''
 
 @example
 * keyboard.c (Fcommand_execute): New arg SPECIAL.
@@ -3300,8 +2743,6 @@ documentation says with the way the program actually works.
 
 @node Conditional Changes
 @subsection Conditional Changes
-@cindex conditional changes, and change logs
-@cindex change logs, conditional changes
 
 C programs often contain compile-time @code{#if} conditionals.  Many
 changes are conditional; sometimes you add a new definition which is
@@ -3341,23 +2782,8 @@ a certain macro is @emph{not} defined:
 (gethostname) [!HAVE_SOCKETS]: Replace with winsock version.
 @end example
 
-@node Indicating the Part Changed
-@subsection Indicating the Part Changed
-
-Indicate the part of a function which changed by using angle brackets
-enclosing an indication of what the changed part does.  Here is an entry
-for a change in the part of the function @code{sh-while-getopts} that
-deals with @code{sh} commands:
-
-@example
-* progmodes/sh-script.el (sh-while-getopts) <sh>: Handle case that
-user-specified option string is empty.
-@end example
-
-
 @node Man Pages
 @section Man Pages
-@cindex man pages
 
 In the GNU project, man pages are secondary.  It is not necessary or
 expected for every GNU program to have a man page, but some of them do.
@@ -3404,7 +2830,6 @@ with the FSF about the individual case.
 
 @node Managing Releases
 @chapter The Release Process
-@cindex releasing
 
 Making a release is more than just bundling up your source files in a
 tar file and putting it up for FTP.  You should set up your software so
@@ -3416,15 +2841,13 @@ all GNU software.
 
 @menu
 * Configuration::               How Configuration Should Work
-* Makefile Conventions::        Makefile Conventions
+* Makefile Conventions::	Makefile Conventions
 * Releases::                    Making Releases
 @end menu
 
 @node Configuration
 @section How Configuration Should Work
-@cindex program configuration
 
-@pindex configure
 Each GNU distribution should come with a shell script named
 @code{configure}.  This script is given arguments which describe the
 kind of machine and system you want to compile the program for.
@@ -3492,14 +2915,13 @@ The @code{configure} script needs to be able to decode all plausible
 alternatives for how to describe a machine.  Thus, @samp{sun3-sunos4.1}
 would be a valid alias.  For many programs, @samp{vax-dec-ultrix} would
 be an alias for @samp{vax-dec-bsd}, simply because the differences
-between Ultrix and @sc{bsd} are rarely noticeable, but a few programs
+between Ultrix and @sc{BSD} are rarely noticeable, but a few programs
 might need to distinguish them.
 @c Real 4.4BSD now runs on some Suns.
 
 There is a shell script called @file{config.sub} that you can use
 as a subroutine to validate system types and canonicalize aliases.
 
-@cindex optional features, configure-time
 Other options are permitted to specify in more detail the software
 or hardware present on the machine, and include or exclude optional
 parts of the package:
@@ -3525,16 +2947,27 @@ to work with @var{package}.
 @c  Giving an optional @var{parameter} of
 @c @samp{no} should omit @var{package}, if it is used by default.
 
-Possible values of @var{package} include
+Possible values of @var{package} include 
 @samp{gnu-as} (or @samp{gas}), @samp{gnu-ld}, @samp{gnu-libc},
 @samp{gdb},
-@samp{x},
+@samp{x}, 
 and
 @samp{x-toolkit}.
 
 Do not use a @samp{--with} option to specify the file name to use to
 find certain files.  That is outside the scope of what @samp{--with}
 options are for.
+
+@item --nfp
+The target machine has no floating point processor.
+
+@item --gas
+The target machine assembler is GAS, the GNU assembler.
+This is obsolete; users should use @samp{--with-gnu-as} instead.
+
+@item --x
+The target machine has the X Window System installed.
+This is obsolete; users should use @samp{--with-x} instead.
 @end table
 
 All @code{configure} scripts should accept all of these ``detail''
@@ -3550,36 +2983,27 @@ you might think of.  That is deliberate.  We want to limit the possible
 configuration options in GNU software.  We do not want GNU programs to
 have idiosyncratic configuration options.
 
-Packages that perform part of the compilation process may support
-cross-compilation.  In such a case, the host and target machines for the
-program may be different.
-
-The @code{configure} script should normally treat the specified type of
-system as both the host and the target, thus producing a program which
-works for the same type of machine that it runs on.
+Packages that perform part of the compilation process may support cross-compilation.
+In such a case, the host and target machines for the program may be
+different.  The @code{configure} script should normally treat the
+specified type of system as both the host and the target, thus producing
+a program which works for the same type of machine that it runs on.
 
-To configure a cross-compiler, cross-assembler, or what have you, you
-should specify a target different from the host, using the configure
-option @samp{--target=@var{targettype}}.  The syntax for
-@var{targettype} is the same as for the host type.  So the command would
-look like this:
-
-@example
-./configure @var{hosttype} --target=@var{targettype}
-@end example
-
-Programs for which cross-operation is not meaningful need not accept the
-@samp{--target} option, because configuring an entire operating system for
-cross-operation is not a meaningful operation.
+The way to build a cross-compiler, cross-assembler, or what have you, is
+to specify the option @samp{--host=@var{hosttype}} when running
+@code{configure}.  This specifies the host system without changing the
+type of target system.  The syntax for @var{hosttype} is the same as
+described above.
 
 Bootstrapping a cross-compiler requires compiling it on a machine other
 than the host it will run on.  Compilation packages accept a
-configuration option @samp{--build=@var{buildtype}} for specifying the
-configuration on which you will compile them, but the configure script
-should normally guess the build machine type (using
-@file{config.guess}), so this option is probably not necessary.  The
-host and target types normally default from the build type, so in
-bootstrapping a cross-compiler you must specify them both explicitly.
+configuration option @samp{--build=@var{hosttype}} for specifying the
+configuration on which you will compile them, in case that is different
+from the host.
+
+Programs for which cross-operation is not meaningful need not accept the
+@samp{--host} option, because configuring an entire operating system for
+cross-operation is not a meaningful thing.
 
 Some programs have ways of configuring themselves automatically.  If
 your program is set up to do this, your @code{configure} script can simply
@@ -3594,7 +3018,6 @@ ignore most of its arguments.
 
 @node Releases
 @section Making Releases
-@cindex packaging
 
 Package the distribution of @code{Foo version 69.96} up in a gzipped tar
 file with the name @file{foo-69.96.tar.gz}.  It should unpack into a
@@ -3607,22 +3030,6 @@ files} and @dfn{non-source files}.  Source files are written by humans
 and never changed automatically; non-source files are produced from
 source files by programs under the control of the Makefile.
 
-@cindex @file{README} file
-The distribution should contain a file named @file{README} which gives
-the name of the package, and a general description of what it does.  It
-is also good to explain the purpose of each of the first-level
-subdirectories in the package, if there are any.  The @file{README} file
-should either state the version number of the package, or refer to where
-in the package it can be found.
-
-The @file{README} file should refer to the file @file{INSTALL}, which
-should contain an explanation of the installation procedure.
-
-The @file{README} file should also refer to the file which contains the
-copying conditions.  The GNU GPL, if used, should be in a file called
-@file{COPYING}.  If the GNU LGPL is used, it should be in a file called
-@file{COPYING.LIB}.
-
 Naturally, all the source files must be in the distribution.  It is okay
 to include non-source files in the distribution, provided they are
 up-to-date and machine-independent, so that building the distribution
@@ -3647,7 +3054,7 @@ Make sure that all the files in the distribution are world-readable.
 Make sure that no file name in the distribution is more than 14
 characters long.  Likewise, no file created by building the program
 should have a name longer than 14 characters.  The reason for this is
-that some systems adhere to a foolish interpretation of the @sc{posix}
+that some systems adhere to a foolish interpretation of the POSIX
 standard, and refuse to open a longer name, rather than truncating as
 they did in the past.
 
@@ -3666,7 +3073,6 @@ characters both before and after the period.  Thus,
 are truncated to @file{foobarha.c} and @file{foobarha.o}, which are
 distinct.
 
-@cindex @file{texinfo.tex}, in a distribution
 Include in your distribution a copy of the @file{texinfo.tex} you used
 to test print any @file{*.texinfo} or @file{*.texi} files.
 
@@ -3676,67 +3082,12 @@ Leaving them out would make the distribution file a little smaller at
 the expense of possible inconvenience to a user who doesn't know what
 other files to get.
 
-@node References
-@chapter References to Non-Free Software and Documentation
-@cindex references to non-free material
-
-A GNU program should not recommend use of any non-free program.  We
-can't stop some people from writing proprietary programs, or stop
-other people from using them, but we can and should avoid helping to
-advertise them to new potential customers.  Proprietary software is a
-social and ethical problem, and the point of GNU is to solve that
-problem.
-
-When a non-free program or system is well known, you can mention it in
-passing---that is harmless, since users who might want to use it
-probably already know about it.  For instance, it is fine to explain
-how to build your package on top of some non-free operating system, or
-how to use it together with some widely used non-free program.
-
-However, you should give only the necessary information to help those
-who already use the non-free program to use your program with
-it---don't give, or refer to, any further information about the
-proprietary program, and don't imply that the proprietary program
-enhances your program, or that its existence is in any way a good
-thing.  The goal should be that people already using the proprietary
-program will get the advice they need about how to use your free
-program, while people who don't already use the proprietary program
-will not see anything to lead them to take an interest in it.
-
-If a non-free program or system is obscure in your program's domain,
-your program should not mention or support it at all, since doing so
-would tend to popularize the non-free program more than it popularizes
-your program.  (You cannot hope to find many additional users among
-the users of Foobar if the users of Foobar are few.)
-
-A GNU package should not refer the user to any non-free documentation
-for free software.  Free documentation that can be included in free
-operating systems is essential for completing the GNU system, so it is
-a major focus of the GNU Project; to recommend use of documentation
-that we are not allowed to use in GNU would undermine the efforts to
-get documentation that we can include.  So GNU packages should never
-recommend non-free documentation.
-
-@node Copying This Manual
-@appendix Copying This Manual
-
-@menu
-* GNU Free Documentation License::  License for copying this manual
-@end menu
-
-@include fdl.texi
-
-@node Index
-@unnumbered Index
-@printindex cp
-
 @contents
 
 @bye
-@c Local variables:
-@c eval: (add-hook 'write-file-hooks 'time-stamp)
-@c time-stamp-start: "@set lastupdate "
-@c time-stamp-end: "$"
-@c time-stamp-format: "%:b %:d, %:y"
-@c compile-command: "make just-standards"
-@c End:
+Local variables:
+update-date-leading-regexp: "@c This date is automagically updated when you save this file:\n@set lastupdate "
+update-date-trailing-regexp: ""
+eval: (load "/gd/gnuorg/update-date.el")
+eval: (add-hook 'write-file-hooks 'update-date)
+End:
diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl
index 9696a12..e6ad9f9 100644
--- a/etc/texi2pod.pl
+++ b/etc/texi2pod.pl
@@ -1,23 +1,23 @@
 #! /usr/bin/perl -w
 
-#   Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+#   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
 
-# This file is part of GCC.
+# This file is part of GNU CC.
 
-# GCC is free software; you can redistribute it and/or modify
+# GNU CC 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.
 
-# GCC is distributed in the hope that it will be useful,
+# GNU CC 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 GCC; see the file COPYING.  If not, write to
-# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-# Boston MA 02110-1301, USA.
+# along with GNU CC; see the file COPYING.  If not, write to
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston MA 02111-1307, USA.
 
 # This does trivial (and I mean _trivial_) conversion of Texinfo
 # markup to Perl POD format.  It's intended to be used to extract
@@ -30,12 +30,9 @@ $section = "";
 @icstack = ();
 @endwstack = ();
 @skstack = ();
-@instack = ();
 $shift = "";
 %defs = ();
 $fnno = 1;
-$inf = "";
-$ibase = "";
 
 while ($_ = shift) {
     if (/^-D(.*)$/) {
@@ -44,13 +41,15 @@ while ($_ = shift) {
 	} else {
 	    $flag = shift;
 	}
-	$value = "";
-	($flag, $value) = ($flag =~ /^([^=]+)(?:=(.+))?/);
+	$value=$flag;
+	$value =~ s,^[a-zA-Z0-9_]+,,;
+	$value =~ s,.*=,,;
+	$flag =~ s,=.*$,,;
 	die "no flag specified for -D\n"
 	    unless $flag ne "";
-	die "flags may only contain letters, digits, hyphens, dashes and underscores\n"
-	    unless $flag =~ /^[a-zA-Z0-9_-]+$/;
+	#print STDERR "FL = $flag, V = $value\n";
 	$defs{$flag} = $value;
+
     } elsif (/^-/) {
 	usage();
     } else {
@@ -61,19 +60,14 @@ while ($_ = shift) {
 }
 
 if (defined $in) {
-    $inf = gensym();
-    open($inf, "<$in") or die "opening \"$in\": $!\n";
-    $ibase = $1 if $in =~ m|^(.+)/[^/]+$|;
-} else {
-    $inf = \*STDIN;
+    open(STDIN, $in) or die "opening \"$in\": $!\n";
 }
-
 if (defined $out) {
     open(STDOUT, ">$out") or die "opening \"$out\": $!\n";
 }
 
-while(defined $inf) {
-while(<$inf>) {
+while(<STDIN>)
+{
     # Certain commands are discarded without further processing.
     /^\@(?:
 	 [a-z]+index		# @*index: useful only in complete manual
@@ -81,9 +75,8 @@ while(<$inf>) {
 	 |(?:end\s+)?group	# @group .. @end group: ditto
 	 |page			# @page: ditto
 	 |node			# @node: useful only in .info file
-	 |(?:end\s+)?ifnottex   # @ifnottex .. @end ifnottex: use contents
 	)\b/x and next;
-
+    
     chomp;
 
     # Look for filename and title markers.
@@ -91,7 +84,7 @@ while(<$inf>) {
     /^\@settitle\s+([^.]+)/ and $tl = postprocess($1), next;
 
     # Identify a man title but keep only the one we are interested in.
-    /^\@c\s+man\s+title\s+([A-Za-z0-9-]+)\s+(.+)/ and do {
+    /^\@c man title ([A-Za-z0-9]+) (.+)/ and do {
 	if (exists $defs{$1}) {
 	    $fn = $1;
 	    $tl = postprocess($2);
@@ -102,30 +95,19 @@ while(<$inf>) {
     # Look for blocks surrounded by @c man begin SECTION ... @c man end.
     # This really oughta be @ifman ... @end ifman and the like, but such
     # would require rev'ing all other Texinfo translators.
-    /^\@c\s+man\s+begin\s+([A-Z]+)\s+([A-Za-z0-9-]+)/ and do {
+    /^\@c man begin ([A-Z]+) ([A-Za-z0-9]+)/ and do {
 	$output = 1 if exists $defs{$2};
         $sect = $1;
 	next;
     };
-    /^\@c\s+man\s+begin\s+([A-Z]+)/ and $sect = $1, $output = 1, next;
-    /^\@c\s+man\s+end/ and do {
+    /^\@c man begin ([A-Z]+)/ and $sect = $1, $output = 1, next;
+    /^\@c man end/ and do {
 	$sects{$sect} = "" unless exists $sects{$sect};
 	$sects{$sect} .= postprocess($section);
 	$section = "";
 	$output = 0;
 	next;
     };
-
-    # handle variables
-    /^\@set\s+([a-zA-Z0-9_-]+)\s*(.*)$/ and do {
-	$defs{$1} = $2;
-	next;
-    };
-    /^\@clear\s+([a-zA-Z0-9_-]+)/ and do {
-	delete $defs{$1};
-	next;
-    };
-
     next unless $output;
 
     # Discard comments.  (Can't do it above, because then we'd never see
@@ -138,20 +120,20 @@ while(<$inf>) {
 	# Ignore @end foo, where foo is not an operation which may
 	# cause us to skip, if we are presently skipping.
 	my $ended = $1;
-	next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex|copying)$/;
+	next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu)$/;
 
 	die "\@end $ended without \@$ended at line $.\n" unless defined $endw;
 	die "\@$endw ended by \@end $ended at line $.\n" unless $ended eq $endw;
 
 	$endw = pop @endwstack;
 
-	if ($ended =~ /^(?:ifset|ifclear|ignore|menu|iftex)$/) {
+	if ($ended =~ /^(?:ifset|ifclear|ignore|menu)$/) {
 	    $skipping = pop @skstack;
 	    next;
-	} elsif ($ended =~ /^(?:example|smallexample|display)$/) {
+	} elsif ($ended =~ /^(?:example|smallexample)$/) {
 	    $shift = "";
 	    $_ = "";	# need a paragraph break
-	} elsif ($ended =~ /^(?:itemize|enumerate|[fv]?table)$/) {
+	} elsif ($ended =~ /^(?:itemize|enumerate|table)$/) {
 	    $_ = "\n=back\n";
 	    $ic = pop @icstack;
 	} else {
@@ -178,7 +160,7 @@ while(<$inf>) {
 	next;
     };
 
-    /^\@(ignore|menu|iftex|copying)\b/ and do {
+    /^\@(ignore|menu)\b/ and do {
 	push @endwstack, $endw;
 	push @skstack, $skipping;
 	$endw = $1;
@@ -207,12 +189,6 @@ while(<$inf>) {
     s/\@\{/&lbrace;/g;
     s/\@\}/&rbrace;/g;
     s/\@\@/&at;/g;
-
-    # Inside a verbatim block, handle @var specially.
-    if ($shift ne "") {
-	s/\@var\{([^\}]*)\}/<$1>/g;
-    }
-
     # POD doesn't interpret E<> inside a verbatim block.
     if ($shift eq "") {
 	s/</&lt;/g;
@@ -223,38 +199,22 @@ while(<$inf>) {
     }
 
     # Single line command handlers.
+    /^\@set\s+([a-zA-Z0-9_-]+)\s*(.*)$/ and $defs{$1} = $2, next;
+    /^\@clear\s+([a-zA-Z0-9_-]+)/ and delete $defs{$1}, next;
 
-    /^\@include\s+(.+)$/ and do {
-	push @instack, $inf;
-	$inf = gensym();
-	$file = postprocess($1);
-
-	# Try cwd and $ibase.
-	open($inf, "<" . $file) 
-	    or open($inf, "<" . $ibase . "/" . $file)
-		or die "cannot open $file or $ibase/$file: $!\n";
-	next;
-    };
-
-    /^\@(?:section|unnumbered|unnumberedsec|center)\s+(.+)$/
-	and $_ = "\n=head2 $1\n";
-    /^\@subsection\s+(.+)$/
-	and $_ = "\n=head3 $1\n";
+    /^\@section\s+(.+)$/ and $_ = "\n=head2 $1\n";
+    /^\@subsection\s+(.+)$/ and $_ = "\n=head3 $1\n";
 
     # Block command handlers:
-    /^\@itemize(?:\s+(\@[a-z]+|\*|-))?/ and do {
+    /^\@itemize\s+(\@[a-z]+|\*|-)/ and do {
 	push @endwstack, $endw;
 	push @icstack, $ic;
-	if (defined $1) {
-	    $ic = $1;
-	} else {
-	    $ic = '@bullet';
-	}
+	$ic = $1;
 	$_ = "\n=over 4\n";
 	$endw = "itemize";
     };
 
-    /^\@enumerate(?:\s+([a-zA-Z0-9]+))?/ and do {
+    /^\@enumerate(?:\s+([A-Z0-9]+))?/ and do {
 	push @endwstack, $endw;
 	push @icstack, $ic;
 	if (defined $1) {
@@ -266,19 +226,19 @@ while(<$inf>) {
 	$endw = "enumerate";
     };
 
-    /^\@([fv]?table)\s+(\@[a-z]+)/ and do {
+    /^\@table\s+(\@[a-z]+)/ and do {
 	push @endwstack, $endw;
 	push @icstack, $ic;
-	$endw = $1;
-	$ic = $2;
+	$ic = $1;
 	$ic =~ s/\@(?:samp|strong|key|gcctabopt|env)/B/;
 	$ic =~ s/\@(?:code|kbd)/C/;
 	$ic =~ s/\@(?:dfn|var|emph|cite|i)/I/;
 	$ic =~ s/\@(?:file)/F/;
 	$_ = "\n=over 4\n";
+	$endw = "table";
     };
 
-    /^\@((?:small)?example|display)/ and do {
+    /^\@((?:small)?example)/ and do {
 	push @endwstack, $endw;
 	$endw = $1;
 	$shift = "\t";
@@ -291,17 +251,12 @@ while(<$inf>) {
 	    $_ = "\n=item $ic\&LT;$1\&GT;\n";
 	} else {
 	    $_ = "\n=item $ic\n";
-	    $ic =~ y/A-Ya-y/B-Zb-z/;
-	    $ic =~ s/(\d+)/$1 + 1/eg;
+	    $ic =~ y/A-Ya-y1-8/B-Zb-z2-9/;
 	}
     };
 
     $section .= $shift.$_."\n";
 }
-# End of current file.
-close($inf);
-$inf = pop @instack;
-}
 
 die "No filename or title\n" unless defined $fn && defined $tl;
 
@@ -329,15 +284,13 @@ sub postprocess
     local $_ = $_[0];
 
     # @value{foo} is replaced by whatever 'foo' is defined as.
-    while (m/(\@value\{([a-zA-Z0-9_-]+)\})/g) {
-	if (! exists $defs{$2}) {
-	    print STDERR "Option $2 not defined\n";
-	    s/\Q$1\E//;
-	} else {
-	    $value = $defs{$2};
-	    s/\Q$1\E/$value/;
+    if (/\@value\{([a-zA-Z0-9_-]+)\}/) {
+	if (! exists $defs{$1}) {
+	    print STDERR "Option $1 not define\n";
 	}
+
     }
+    s/\@value\{([a-zA-Z0-9_-]+)\}/$defs{$1}/g;
 
     # Formatting commands.
     # Temporary escape for @r.
@@ -350,12 +303,8 @@ sub postprocess
     s/\@w\{([^\}]*)\}/S<$1>/g;
     s/\@(?:dmn|math)\{([^\}]*)\}/$1/g;
 
-    # keep references of the form @ref{...}, print them bold
-    s/\@(?:ref)\{([^\}]*)\}/B<$1>/g;
-
-    # Change double single quotes to double quotes.
-    s/''/"/g;
-    s/``/"/g;
+    # Handle @r inside bold.
+    1 while s/B<((?:[^<>]|I<[^<>]*>)*)R<([^>]*)>/B<$1>${2}B</g;
 
     # Cross references are thrown away, as are @noindent and @refill.
     # (@noindent is impossible in .pod, and @refill is unnecessary.)
@@ -377,18 +326,12 @@ sub postprocess
     s/\@uref\{([^\},]*),([^\},]*)\}/$2 (C<$1>)/g;
     s/\@uref\{([^\},]*),([^\},]*),([^\},]*)\}/$3/g;
 
-    # Un-escape <> at this point.
+    # Turn B<blah I<blah> blah> into B<blah> I<blah> B<blah> to
+    # match Texinfo semantics of @emph inside @samp.
     s/&LT;/</g;
     s/&GT;/>/g;
-
-    # Now un-nest all B<>, I<>, R<>.  Theoretically we could have
-    # indefinitely deep nesting; in practice, one level suffices.
-    1 while s/([BIR])<([^<>]*)([BIR])<([^<>]*)>/$1<$2>$3<$4>$1</g;
-
-    # Replace R<...> with bare ...; eliminate empty markup, B<>;
-    # shift white space at the ends of [BI]<...> expressions outside
-    # the expression.
-    s/R<([^<>]*)>/$1/g;
+    1 while (s/B<([^<>]*)I<([^>]+)>/B<$1>I<$2>B</g);
+    1 while (s/I<([^<>]*)B<([^>]+)>/I<$1>B<$2>I</g);
     s/[BI]<>//g;
     s/([BI])<(\s+)([^>]+)>/$2$1<$3>/g;
     s/([BI])<([^>]+?)(\s+)>/$1<$2>$3/g;
@@ -429,15 +372,4 @@ sub add_footnote
     $sects{FOOTNOTES} .= $_[0];
     $sects{FOOTNOTES} .= "\n\n";
 }
-
-# stolen from Symbol.pm
-{
-    my $genseq = 0;
-    sub gensym
-    {
-	my $name = "GEN" . $genseq++;
-	my $ref = \*{$name};
-	delete $::{$name};
-	return $ref;
-    }
-}
+    
diff --git a/gettext.m4 b/gettext.m4
index 2c54fb8..82a5277 100644
--- a/gettext.m4
+++ b/gettext.m4
@@ -11,7 +11,7 @@
 
 # serial 3
 
-AC_DEFUN([CY_WITH_NLS],
+AC_DEFUN(CY_WITH_NLS,
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
@@ -24,6 +24,7 @@ AC_DEFUN([CY_WITH_NLS],
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
+      AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested])
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -39,7 +40,7 @@ AC_DEFUN([CY_WITH_NLS],
 	dnl catgets is only used if permitted by option --with-catgets.
 	nls_cv_header_intl=
 	nls_cv_header_libgt=
-	CATOBJEXT=
+	CATOBJEXT=NONE
 
 	AC_CHECK_HEADER(libintl.h,
 	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
@@ -80,9 +81,9 @@ AC_DEFUN([CY_WITH_NLS],
 	dnl In the standard gettext, we would now check for catgets.
         dnl However, we never want to use catgets for our releases.
 
-        if test x"$CATOBJEXT" = x && test -d $srcdir/../intl; then
-	  # Neither gettext nor catgets in included in the C library.
-	  # Fall back on GNU gettext library (assuming it is present).
+        if test "$CATOBJEXT" = "NONE"; then
+	  dnl Neither gettext nor catgets in included in the C library.
+	  dnl Fall back on GNU gettext library.
 	  nls_cv_use_gnu_gettext=yes
         fi
       fi
@@ -155,12 +156,9 @@ AC_DEFUN([CY_WITH_NLS],
     AC_SUBST(INTLOBJS)
     AC_SUBST(POFILES)
     AC_SUBST(POSUB)
-    if test "x$CATOBJEXT" != "x"; then
-      AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested])
-    fi
   ])
 
-AC_DEFUN([CY_GNU_GETTEXT],
+AC_DEFUN(CY_GNU_GETTEXT,
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
@@ -288,7 +286,7 @@ __argz_count __argz_stringify __argz_next])
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+AC_DEFUN(AM_PATH_PROG_WITH_TEST,
 [# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
@@ -334,7 +332,7 @@ AC_SUBST($1)dnl
 
 # serial 1
 
-AC_DEFUN([AM_LC_MESSAGES],
+AC_DEFUN(AM_LC_MESSAGES,
   [if test $ac_cv_header_locale_h = yes; then
     AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
       [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
diff --git a/install-sh b/install-sh
index 4d4a951..e9de238 100755
--- a/install-sh
+++ b/install-sh
@@ -1,38 +1,19 @@
 #!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2005-05-14.22
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
 #
+# Copyright 1991 by the Massachusetts Institute of Technology
 #
-# FSF changes to this file are in the public domain.
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
@@ -42,11 +23,13 @@ scriptversion=2005-05-14.22
 # from scratch.  It can only install one file at a time, a restriction
 # shared with many OS's install programs.
 
+
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 
+
 # put in absolute paths if you don't have them in your path; or use env. vars.
 
 mvprog="${MVPROG-mv}"
@@ -58,266 +41,211 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
-chowncmd=
-chgrpcmd=
-stripcmd=
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
 rmcmd="$rmprog -f"
 mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test -n "$1"; do
-  case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
-	break;;
-  esac
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
 done
 
-if test -z "$1"; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	true
 fi
 
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src ;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
-  else
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dstarg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst ;;
-    esac
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+		chmodcmd=""
+	else
+		instcmd=mkdir
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
+fi
 
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
-	exit 1
-      fi
-      dst=$dst/`basename "$src"`
-    fi
-  fi
-
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-  # Make sure that the destination directory exists.
-
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
-
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
-
-    pathcomp=
-
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
-      shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
-      fi
-      pathcomp=$pathcomp/
-    done
-  fi
-
-  if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
-  else
-    dstfile=`basename "$dst"`
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
-
-    # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
 done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
+exit 0
diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 095dec1..60fcc7f 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,1031 +1,3 @@
-2006-03-22  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* mt/startup-16-002.S (.internal_io): Make @nobits.
-	* mt/startup-16-003.S (.internal_io): Make @nobits.
-	* mt/startup-ms2.S (.internal_io): Make @nobits.
-
-2006-03-02  DJ Delorie  <dj@redhat.com>
-
-	* m32c/exit.S: Preserve r1.
-
-2006-02-24  Paul Brook  <paul@codesourcery.com>
-
-	* arm/redboot-crt0.S: Use cps in Thumb-2 mode.
-
-2006-02-22  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* m68k/Makefile.in (CF_SCRIPTS): New.
-	(all): Add CF_SCRIPTS.
-	(m5208evb.ld, m5213evb.ld, m5235evb.ld, m5272c3.ld,
-	m5282evb.ld): New targets
-	(install): Iterate over CF_SCRIPTS.
-	* m68k/crt0.S: Don't use dbra on any cf chips.
-	* m68k/dbug-cf.sc: New.
-
-2006-02-07  Paul Brook  <paul@codesourcery.com>
-
-	* arm/crt0.S: Add Thumb-2 startup code.
-	* arm/redboot-crt0.S: Ditto.
-	* arm/libcfunc.c (do_AngelSWI): Use AngelSWIInsn.
-	* arm/swi.h (AngelSWIInsn, AngelSWIAsm): Define.
-	* arm/trap.S: Disable for Thumb-2.
-
-2006-01-18  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* mt/ms2.ld (.sram): Correct typo in section names.
-
-2006-01-16  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* mt/Makefile.in (SCRIPTS, CRT0): Add ms2 files.
-	(crt0-ms2.o): New target.
-	* mt/crt0-ms2.S, mt/exit-ms2.c, mt/ms2.ld, mt/startup-ms2.S: New.
-
-2006-01-04  Paul Brook  <paul@codesourcery.com>
-
-	* m68k/bcc.ld: Add .got.plt and .got
-	* m68k/idp.ld: Ditto.
-	* m68k/idpgdb: Ditto.
-	* m68k/mvme135.ld: Ditto.
-	* m68k/sbc5204.ld: Ditto.
-	* m68k/sbc5206.ld: Ditto.
-	* m68k/sim.ld: Ditto.
-
-2005-12-13  DJ Delorie  <dj@redhat.com>
-
-	* m32c/crt0.S: Add support for preinit, init, and fini arrays, and
-	.init and .fini processing.
-	* m32c/crtn.S: Likewise.
-	* m32c/exit.S: Likewise.
-
-2005-12-13  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* mt/16-002.ld: Change architecture to 'mt'.  Remove
-	SEARCH_DIR.
-	* mt/16-003.ld: Likewise.
-	* mt/64-001.ld: Likewise.
-	* mt/Makefile.in: Change comment to reference 'mt' rather than 'ms1'.
-	* mt/crt0.S: Likewise.
-
-2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* configure.in: Replace ms1 arch with mt arch.
-	* configure: Rebuilt.
-	* mt: Renamed from ms1 dir.
-
-2005-12-06  Paul Brook  <paul@codesourcery.com>
-
-	* m68k/bcc.ld: Add .text.*, .rodata.*, .data.* and .bss.*.
-	* m68k/idp.ld: Ditto.
-	* m68k/idpgdb: Ditto.
-	* m68k/mvme135.ld: Ditto.
-	* m68k/sbc5204.ld: Ditto.
-	* m68k/sbc5206.ld: Ditto.
-	* m68k/sim.ld: Ditto.
-
-2005-11-30  Shaun Jackman  <sjackman@gmail.com>
-
-	* libnosys/Makefile.in (OBJS): Add chown, readlink, and symlink.
-	* libnosys/chown.c: New file.
-	* libnosys/readlink.c: New file.
-	* libnosys/symlink.c: New file.
-
-2005-11-30  Shaun Jackman  <sjackman@gmail.com>
-
-	* arm/libcfunc.c (clock, sleep, usleep): New functions.
-	* arm/syscalls.c (_clock): New function.
-	(_times): Call _clock.
-
-2005-11-17  Shaun Jackman  <sjackman@gmail.com>
-
-	* libgloss/arm/libcfunc.c (isatty): Call _isatty. GDB now supports
-	the IsTTY SWI that _isatty calls.
-
-2005-11-17  Hans-Peter Nilsson  <hp@axis.com>
-
-	* cris/linunistd.h: Don't redefine errno as extern int.
-
-2005-10-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* arm/configure.in: Add AC_SUBST for BUILD_CRT0_TRUE and
-	BUILD_CRT0_FALSE.
-	* arm/configure: Regenerate.
-
-2005-10-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* arm/configure.in: Support building crt0.o when syscalls
-	are disabled in newlib.
-	* arm/configure: Regenerated.
-
-2005-10-03  James E Wilson  <wilson@specifix.com>
-
-	* mips/array.ld, mips/cfe.ld, mips/ddb-kseg0.ld, mips/ddb.ld,
-	mips/dve.ld, mips/idt.ld, mips/idt32.ld, mips/idt64.ld,
-	mips/idtecoff.ld, mips/jmr3904app-java.ld, mips/jmr3904app.ld,
-	jmr3904dram-java.ld, mips/jmr3904dram.ld, mips/lsi.ld, mips/nullmon.ld,
-	mips/pmon.ld: Add support for .bss.* sections.
-
-2005-09-23  James E Wilson  <wilson@specifix.com>
-
-	* mips/array.ld, mips/cfe.ld, mips/ddb-kseg0.ld, mips/ddb.ld,
-	mips/dve.ld, mips/idt.ld, mips/idt32.ld, mips/idt64.ld,
-	mips/idtecoff.ld, mips/jmr3904app-java.ld, mips/jmr3904app.ld,
-	jmr3904dram-java.ld, mips/jmr3904dram.ld, mips/lsi.ld, mips/nullmon.ld,
-	mips/pmon.ld: Change x* to x.* in existing linkonce lines.  Add
-	support for .gnu.linkonce.b.*.
-
-2005-08-30  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* rs6000/Makefile.in (VPATH): Use colon as separator.
-
-2005-08-24  Aldy Hernandez  <aldyh@redhat.com>
-
-        * ms1/access.c: Change copyright notice.
-
-2005-08-19  DJ Delorie  <dj@redhat.com>
-
-	* m32c/Makefile.in (m16cmon.ld, m32cmon.ld): Fix output names.
-	(*.o): Add dependencies.
-	* m32c/m32csys.h: Move syscall location to 0x400 as per Renesas
-	recommendations.
-
-2005-08-18  DJ Delorie  <dj@redhat.com>
-
-	* m32c/Makefile.in: Block out memory regions reserved for monitors
-	and simulators.  Add monitor link scripts.
-
-2005-08-16  Shaun Jackman  <sjackman@gmail.com>
-
-	* arm/syscalls.c (initialise_monitor_handles): Set
-	monitor_stderr to the result of SWI_open(":tt", "a")
-	instead of simply duplicating stdout.
-
-2005-08-10  DJ Delorie  <dj@redhat.com>
-
-	* configure.in: Add m32c support.
-	* configure: Regenerated
-	* m32c: New directory, Renesas R8C/M16C/M32C support.
-	* m32c/abort.S m32c/argvlen.S m32c/argv.S m32c/chdir.S, 
-	m32c/chmod.S m32c/close.S m32c/configure m32c/configure.in,
-	m32c/crt0.S, m32c/crtn.S, m32c/exit.S, m32c/fstat.S,
-	m32c/genscript, m32c/getpid.S, m32c/gettimeofday.S,
-	m32c/heaptop.S, m32c/isatty.S, m32c/kill.S, m32c/link.S,
-	m32c/lseek.S, m32c/m32csys.h, m32c/m32c.tmpl, m32c/Makefile.in,
-	m32c/open.S, m32c/read.S, m32c/sbrk.c, m32c/stat.S, m32c/time.S,
-	m32c/times.S, m32c/unlink.S, m32c/utime.S, m32c/write.S: New files
-
-2005-08-02  Shaun Jackman  <sjackman@gmail.com>
-
-        * libgloss/arm/libcfunc.c (isatty): New function.
-
-2005-08-02  Shaun Jackman  <sjackman@gmail.com>
-
-        * libgloss/arm/syscalls.c (_exit): Call _kill with the second
-        argument set to -1, which is an invalid signal number.
-        (_kill): Comment and coding style changes only.
-        (_raise): Remove function.
-
-2005-07-19  Paul Brook  <paul@codesourcery.com>
-
-	* arm/crt0.S: Ensure doubleword stack alignment.
-
-2005-07-18  Richard Sandiford  <richard@codesourcery.com>
-
-	* mips/array.ld (.sdata): Include .gnu.linkonce.s.*, not
-	.gnu.linkonce.s*.
-	(.sbss): Include .sbss.* and .gnu.linkonce.sb.*.
-	* mips/cfe.ld, mips/ddb-kseg0.ld, mips/ddb.ld, mips/dve.ld,
-	* mips/idt32.ld, mips/idt64.ld, mips/idtecoff.ld, mips/idt.ld,
-	* mips/jmr3904app-java.ld, mips/jmr3904app.ld,
-	* mips/jmr3904dram-java.ld, mips/jmr3904dram.ld,
-	* mips/lsi.ld, mips/nullmon.ld, mips/pmon.ld: As for mips/array.ld.
-
-2005-07-18  Shaun Jackman  <sjackman@gmail.com>
-
-	* libgloss/arm/libcfunc.c (abort): Call _exit instead of the RDI swi.
-	(alarm): Add the weak attribute.
-	(pause): New function. Return ENOSYS.
-	* libgloss/arm/syscalls.c (_getpid): Add the weak attribute.
-	(_fstat): Ditto.
-	(_stat): Ditto.
-	(_link): Ditto. Return ENOSYS.
-	(_unlink): Call the swi instead of returning -1.
-	(_raise): Add the weak attribute. Return ENOSYS.
-	(isatty): Rename to _isatty. Call the swi instead of returning 1.
-	(_system): Call the swi instead of returning ENOSYS.
-	(_rename): Ditto.
-
-2005-07-06  Aldy Hernandez  <aldyh@redhat.com>
-
-	* configure.in: Add ms1 case.
-	* configure: Regenerate.
-	* ms1/16-002.ld: New.
-	* ms1/16-003.ld: New.
-	* ms1/64-001.ld: New.
-	* ms1/access.c: New.
-	* ms1/chmod.c: New.
-	* ms1/close.c: New.
-	* ms1/configure: New.
-	* ms1/configure.in: New.
-	* ms1/crt0-16-002.S: New.
-	* ms1/crt0-16-003.S: New.
-	* ms1/crt0-64-001.S: New.
-	* ms1/crt0.S: New.
-	* ms1/exit-16-002.c: New.
-	* ms1/exit-16-003.c: New.
-	* ms1/exit-64-001.c: New.
-	* ms1/exit.c: New.
-	* ms1/fstat.c: New.
-	* ms1/getpid.c: New.
-	* ms1/gettime.c: New.
-	* ms1/isatty.c: New.
-	* ms1/kill.c: New.
-	* ms1/lseek.c: New.
-	* ms1/Makefile.in: New.
-	* ms1/open.c: New.
-	* ms1/read.c: New.
-	* ms1/sbrk.c: New.
-	* ms1/startup-16-002.S: New.
-	* ms1/startup-16-003.S: New.
-	* ms1/startup-64-001.S: New.
-	* ms1/stat.c: New.
-	* ms1/time.c: New.
-	* ms1/times.c: New.
-	* ms1/trap.h: New.
-	* ms1/trap.S: New.
-	* ms1/unlink.c: New.
-	* ms1/utime.c: New.
-	* ms1/write.c: New.
-
-2005-05-19  Corinna Vinschen  <vinschen@redhat.com>
-
-	* arm/elf-redboot.ld, iq2000/sim.ld, m68hc11/sim-valid-m68hc11.ld,
-	* m68hc11/sim-valid-m68hc12.ld, mcore/elf-cmb.ld, mips/cfe.ld,
-	* mips/ddb-kseg0.ld, mips/ddb.ld, mips/dve.ld, mips/idt.ld,
-	* mips/idt32.ld, mips/idt64.ld, mips/jmr3904app-java.ld,
-	* mips/jmr3904app.ld, mips/jmr3904dram-java.ld, mips/jmr3904dram.ld,
-	* mips/nullmon.ld, mips/pmon.ld, mn10200/eval.ld, mn10200/sim.ld,
-	* mn10300/asb2303.ld, mn10300/asb2305.ld, mn10300/eval.ld,
-	* mn10300/sim.ld, rs6000/ads.ld, rs6000/mbx.ld, rs6000/yellowknife.ld,
-	* sh/sh1lcevb.ld, sh/sh2lcevb.ld, sh/sh3bb.ld, sh/sh3lcevb.ld,
-	* sparc/elfsim.ld, sparc/ex930.ld, sparc/ex931.ld, sparc/ex934.ld,
-	* sparc/sparc86x.ld, xstormy16/eva_app.ld, xstormy16/eva_stub.ld,
-	* xstormy16/sim_high.ld, xstormy16/sim_rom.ld: Add .debug_ranges
-	section.
-
-2005-05-05  Tobias Anderberg  <tobias.anderberg@axis.com>
-
-        * arm/syscalls.c (get_errno): Fix output register constraint.
-
-2005-05-05  J"orn Rennecke <joern.rennecke@st.com>
-
-        * rs6000/sim-getrusage.S: New file, broken out of:
-        (simulator.S).
-        * rs6000/Makefile.in (SIM_OBJS): Add sim-getrusage.o.
-        (sim-getrusage.o): New rule.
-
-2005-04-28  Shaun Jackman  <sjackman@gmail.com>
-
-	* libgloss/syscalls.c (get_errno): Add an output register constraint.
-
-2005-04-19  Eric Christopher  <echristo@redhat.com>
-
-	* mips/regs.S: Sign extend constants for mips64 and unify
-        address handling.
-
-2005-04-12  Shaun Jackman  <sjackman@gmail.com>
-
-	* libgloss/arm/Makefile.in (RDPMON_BSP): librdpmon.a was empty due 
-	to a typo. Fixed.
-	(RDIMON_BSP): Ditto.
-
-2005-04-12  Richard Sandiford  <rsandifo@redhat.com>
-
-	* mips/array.ld, mips/cfe.ld, mips/dve.ld, mips/idt32.ld,
-	* mips/idt64.ld, mips/idtecoff.ld, mips/idt.ld,
-	* mips/jmr3904app-java.ld, mips/jmr3904app.ld,
-	* mips/jmr3904dram-java.ld, mips/jmr3904dram.ld, mips/lsi.ld,
-	* mips/nullmon.ld, mips/pmon.ld: Keep .init and .fini.
-
-2005-02-08  Antony King  <antony.king@st.com>
-
-	* arm/syscalls.c: Change CHECK_INIT to pass reentrant struct
-	instead of file pointer.
-
-2005-02-01  Hans-Peter Nilsson  <hp@axis.com>
-
-	* cris/Makefile.in (ALL_INSTALL_FILES): New macro.
-	(ALL_INSTALL_FILES_NEWLIB_COPY): New macro.
-	(all): Use ALL_INSTALL_FILES instead of its contents.  Add
-	ALL_INSTALL_FILES_NEWLIB_COPY.
-	($(objroot)/newlib/%, $(objroot)/newlib/libnosys.a): New rules
-
-2005-01-27  Hans-Peter Nilsson  <hp@axis.com>
-
-        * configure.in: Support cris-*-* and crisv32-*-*.
-        * libnosys/configure.in: Ditto.
-	* configure, libnosys/configure: Regenerate.
-	* cris: New directory.
-	* cris/crt0.S, cris/crtn.c, cris/gensyscalls, cris/linunistd.h,
-	cris/outbyte.c, cris/configure.in, cris/crti.c, cris/lcrt0.c,
-	cris/Makefile.in, cris/setup.S, cris/configure: New files.
-
-2005-01-21  Hans-Peter Nilsson  <hp@axis.com>
-
-	* libnosys/warning.h (stub_warning): Remove "warning: " prefix.
-
-2005-01-18  Hans-Peter Nilsson  <hp@axis.com>
-
-	* libnosys/warning.h (link_warning) [HAVE_GNU_LD and HAVE_ELF]:
-	Prefix symbol in section name with __SYMBOL_PREFIX.  Do not use
-	__make_section_unallocated.  Mark magic variable as used.
-
-2005-01-18  Hans-Peter Nilsson  <hp@axis.com>
-
-	* libnosys/configure.in (libc_cv_asm_previous_directive): Set
-	cache-id variable.
-	(libc_cv_asm_popsection_directive): Ditto.
-	(libc_cv_section_attributes): Ditto.
-	(libc_symbol_prefix): Rename from libc_dollar_prefix.  Check for
-	"_" as well, and set __SYMBOL_PREFIX accordingly.
-	* libnosys/configure: Regenerate.
-
-2005-01-18  Hans-Peter Nilsson  <hp@axis.com>
-
-	* libnosys/Makefile.in (LD, AS): Correct obsoleted suffix: Say
-	as-new and ld-new, not as.new and ld.new.
-
-2005-01-14  Hans-Peter Nilsson  <hp@axis.com>
-                                                                                
-        * libnosys/warning.h (__make_section_unallocated)
-        [HAVE_ASM_PREVIOUS_DIRECTIVE, HAVE_ASM_POPSECTION_DIRECTIVE]: Use "\n"
-        instead of ";" to delimit assembly lines.
-                                                                                
-2005-01-07  Paul Brook  <paul@codesourcery.com>
-                                                                                
-	* arm/crt0.S: Call __libc_{init,fini}_array instead of
-	_init/_fini if they exist.
-
-2004-11-26  Paul Brook  <paul@codesourcery.com>
-                                                                                
-        * arm/crt0.S (_start): Add .cantunwind annotation.
-                                                                                
-2004-10-28  Nick Clifton  <nickc@redhat.com>
-
-	* configure.in: Add support for iq2000 target.
-	* configure: Regenerate.
-
-2004-10-05  Tomer Levi  <Tomer.Levi@nsc.com>
-
-        * configure.in: Support crx-*-*.
-        * configure: regenerate.
-        * crx/_exit.c: New file.
-        * crx/_getenv.c: Ditto.
-        * crx/_rename: Ditto.
-        * crx/close.c: Ditto.
-        * crx/configure.in: Ditto.
-        * crx/crti.S: Ditto.
-        * crx/crtn.S: Ditto.
-        * crx/crt0.S: Ditto.
-        * crx/dvz_hndl.c: Ditto.
-        * crx/flg_hndl.c: Ditto.
-        * crx/fstat.c: Ditto.
-        * crx/getpid.c: Ditto.
-        * crx/iad_hndl.c: Ditto.
-        * crx/intable.c: Ditto.
-        * crx/isatty.c: Ditto.
-        * crx/kill.c: Ditto.
-        * crx/lseek.c: Ditto.
-        * crx/Makefile.in: Ditto.
-        * crx/open.c: Ditto.
-        * crx/putnum.c: Ditto.
-        * crx/read.c: Ditto.
-        * crx/sbrk.c: Ditto.
-        * crx/sim.ld: Ditto.
-        * crx/stat.c: Ditto.
-        * crx/svc_hndl.c: Ditto.
-        * crx/time.c: Ditto.
-        * crx/und_hndl.c: Ditto.
-        * crx/unlink.c: Ditto.
-        * crx/write.c: Ditto.
-
-2004-10-01  Paul Brook  <paul@codesourcery.com>
-
-	* arm/configure.in: Add *-*-aebi target.
-	* arm/configure: Regenerate.
-
-2004-08-25  Corinna Vinschen  <vinschen@redhat.com>
-
-	* i386/cygmon.ld (.text): Fix alignment.
-	(.rodata): Handle .rodata.* sections.
-
-2004-06-27  Hideki Iwamoto <h-iwamoto@kit.hi-ho.ne.jp>
-
-	* Makefile.in: Support $(DESTDIR).
-	* arm/Makefile.in: Ditto.
-	* d30v/Makefile.in: Ditto.
-	* doc/Makefile.in: Ditto.
-	* fr30/Makefile.in: Ditto.
-	* frv/Makefile.in: Ditto.
-	* hp74x/Makefile.in: Ditto.
-	* i386/Makefile.in: Ditto.
-	* i960/Makefile.in: Ditto.
-	* iq2000/Makefile.in: Ditto.
-	* libnosys/Makefile.in: Ditto.
-	* m32r/Makefile.in: Ditto.
-	* m68hc11/Makefile.in: Ditto.
-	* m68k/Makefile.in: Ditto.
-	* mcore/Makefile.in: Ditto.
-	* mips/Makefile.in: Ditto.
-	* mn10200/Makefile.in: Ditto.
-	* mn10300/Makefile.in: Ditto.
-	* pa/Makefile.in: Ditto.
-	* rs6000/Makefile.in: Ditto.
-	* sparc/Makefile.in: Ditto.
-	* sparc/libsys/Makefile.in: Ditto.
-	* xstormy16/Makefile.in: Ditto.
-
-2004-06-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libnosys/_exit.c: New file.
-	* libnosys/Makefile.in: Add _exit.o.
-
-2004-06-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* arm/configure.in: Check the value of newlib-may-supply-syscalls
-	enablement variable to determine if crt0 should or should not be
-	built.
-	* arm/configure: Regenerated.
-	* arm/Makefile.in: Changed to look at @BUILD_CRT0_TRUE@ and
-	@BUILD_CRT0_FALSE@ variables set in configure to determine
-	if crt0.o should be built and installed.
-
-2004-06-09  Toralf Lund  <toralf@procaptura.com>
-
-	* arm/crt0.S: Copied from newlib and it now also sets up stacks for 
-	FIQ and IRQ mode, plus calls hardware_init_hook() and 
-	software_init_hook() if present.
-	* arm/libcfunc.c, arm/swi.h, arm/syscalls.c: Copied
-	from newlib.
-	* arm/Makefile.in: Build crt0.o, rdpmon-crt0.o, rdimon-crt0.o,
-	librdpmon.a, librdimon.a - support file for "bare" setup, as well
-	as "RDP" and "RDI" monitors.
-	* arm/coff-rdpmon.specs, arm/elf-rdpmon.specs,
-	arm/coff-rdimon.specs, arm/elf-rdimon.specs: gcc specs files to go
-	with above mentioned support libs and startfiles.
-
-2004-06-03  Alexandre Oliva  <aoliva@redhat.com>
-
-        * mn10300/sim.ld: Start at address 4, to avoid ambiguity with NULL
-        pointers.
-
-2004-05-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libnosys/sbrk.c: Add include of <_syslist.h> and "config.h".
-
-2004-05-05  Richard Sandiford  <rsandifo@redhat.com>
-
-	* mips/array.ld, mips/cfe.ld, mips/ddb-kseg0.ld, mips/ddb.ld,
-	* mips/dve.ld, mips/idt32.ld, mips/idt64.ld, mips/idt.ld
-	* mips/jmr3904app.ld, mips/lsi.ld, mips/nullmon.ld, mips/pmon.ld
-	(.eh_frame_hdr, .eh_frame, .gcc_except_table, .jcr): New sections.
-
-2004-04-02  Chris Demetriou  <cgd@broadcom.com>
-
-	* mips/regs.S (C0_COUNT): Fix comment that kept this from being
-	defined.
-	* mips/vr4300.S: Use C0_COUNT as appropriate instead of hardcoding $9.
-	* mips/vr5xxx.S: Likewise.
-
-2004-03-23  Eric Christopher  <echristo@redhat.com>
-
-	* frv/crt0.S: Fix comment.
-	* mips/configure.in: Add mipsisa64-*-* to target support.
-	* mips/configure: Regenerate.
-
-2004-03-03  Stephane Carrez  <stcarrez@nerim.fr>
-
-	* m68hc11/sci-inout.S: Supports -mlong-calls.
-	* m68hc11/sim-valid-m68hc11.ld (.tramp): New section for trampolines.
-	(.text): Mark the .installN and .finiN section with KEEP.
-	(.vectors): Likewise for .vectors.
-	(.gcc_except_table): New section.
-	* m68hc11/sim-valid-m68hc12.ld (.tramp): New section for trampolines.
-	(.text): Mark the .installN and .finiN section with KEEP.
-	(.vectors): Likewise for .vectors.
-	(.gcc_except_table): New section.
-
-2004-01-23  Gábor Lóki  <loki@inf.u-szeged.hu>
-
-	* m68k/leds.c: remove led_putnum(), zylons() forward
-	function declarations.
-	* m68k/leds.h: add zylons() forward function declaration.
-
-2004-01-06  Alexandre Oliva  <aoliva@redhat.com>
-
-	2003-12-02  Richard Sandiford  <rsandifo@redhat.com>
-	* frv/crt0.S (_start): Fix use of FDPIC conditionals.  Move the set of
-	gr11 outside the FDPIC conditional.  Avoid clobbering gr4 too early.
-	2003-11-14  Richard Sandiford  <rsandifo@redhat.com>
-	* frv/crt0.S: Fix fdpic sp calculation.
-	2003-11-05  Alexandre Oliva  <aoliva@redhat.com>
-	* frv/crt0.S: Use __stacksize, not __stack, to initialize sp on
-	FDPIC.  Update comments on computing _GLOBAL_OFFSET_TABLE_.  Don't
-	fixup ctors nor dtors on FDPIC.
-	2003-09-19  Alexandre Oliva  <aoliva@redhat.com>
-	* frv/crt0.S (_start): Set up gr15 only for FDPIC.
-	* frv/crt0.S (_start): Save _GLOBAL_OFFSET_TABLE_ in gr17, and set
-	gr15 before function calls.
-	2003-09-19  DJ Delorie  <dj@redhat.com>, Alexandre Oliva  <aoliva@redhat.com>
-	* frv/crt0.S (_start): Set up gr15 with _GLOBAL_OFFSET_TABLE_'s
-	value.
-
-2003-10-27  Bernardo Innocenti  <bernie@develer.com>
-
-	* m68k/asm.h: Add macros for -fPIC, -msep-data and
-	-mid-shared-library support.
-	* m68k/crt0.S: Use macros for -fPIC, -msep-data and
-	-mid-shared-library support.
-	* m68k/sim-crt0.S: Likewise.
-
-2003-10-15  Bernardo Innocenti  <bernie@develer.com>
-
-	* m68k/sim-funcs.c (_XOPEN_SOURCE): Define to get the pid_t
-	typedef from <unistd.h>.
-
-2003-08-26  Jason Merrill  <jason@redhat.com>
-
-	* sparc/elfsim.ld: Fix __EH_FRAME_BEGIN__ definition.
-	* sparc/sparc86x.ld: Likewise.
-
-2003-08-20  Chris Demetriou  <cgd@broadcom.com>
-
-        * mips/crt0_cfe.S: New file.
-        * mips/cfe_mem.c: New file.
-        * mips/cfe_prestart.S: Remove.
-        * mips/cfe.ld: Adjust to use crt0_cfe.o as the startup file, and
-        and use _start as the entry point.  Align BSS to 32-byte boundary.
-        * mips/cfe.c: Reimplement to fit on top of a crt0_cfe.o file.
-        * mips/cfe_api.h (__libcfe_stack_size, __libcfe_mem_limit)
-        (__libcfe_meminit, __libcfe_stack_top): New prototypes.
-        * mips/Makefile.in (CFEOBJS): Replace cfe_prestart.o with cfe_mem.o.
-        (cfe.o, cfe_api.o, cfe_mem.o, crt0_cfe.o): New targets.
-        * mips/configure.in: Build and install crt0_cfe.o when CFE support
-        is built.
-        * mips/configure: Regenerate.
-
-2003-08-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* i386/cygmon-salib.c (unlink): New stub.
-
-2003-08-08  Mark Salter <msalter@redhat.com>
-
-        * i386/cygmon.ld: Add 4 byte alignment to __CTOR_LIST__
-
-        Bernd Schmidt  <bernds@redhat.com>
-
-        * i386/cygmon.ld: Add entry for .rodata.
-
-2003-07-14  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
-
-	* m32r/configure.in: fixed bug to delete ../config-ml.in.
-
-2003-07-10  Alexandre Oliva  <aoliva@redhat.com>
-
-	2001-10-30  Jeff Johnston  <jjohnstn@redhat.com>
-	* mn10300/asb2305.ld: Added ASB2305 support.
-	* mn10300/configure: Ditto.
-	* mn10300/configure.in: Ditto.
-	2001-09-12  Stan Cox  <scox@redhat.com>
-	* mn10300/asb2303.ld: New file.  Linker script for the ASB2303
-	AM33/2.00 board.
-	* mn10300/configure.in: Add support for asb2303 board script.
-
-2003-07-08  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.in: Reapply Kazuhiro Inaoko's multilib patch from
-	04-17-03.
-	* configure: Regenerated.
-
-2003-06-23  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
-
-	* m32r/crt0.S (_start): Allow _stack to be placed anywhere
-	in memory.
-
-2003-06-06  Stan Cox  <scox@redhat.com>
-            Jeff Johnston  <jjohnstn@redhat.com>
-            Anthony Green  <green@redhat.com>
-
-	* configure.in: Add iq2000 support.
-	* configure: Rebuilt.
-	* iq2000/Makefile.in, iq2000/access.c, iq2000/_exit.c,
-	iq2000/configure, iq2000/chmod.c, iq2000/chown.c, iq2000/close.c,
-	iq2000/configure.in, iq2000/creat.c, iq2000/crt0.S, iq2000/crt1.c,
-	iq2000/execv.c, iq2000/execve.c, iq2000/fork.c, iq2000/fstat.c,
-	iq2000/getpid.c, iq2000/gettime.c, iq2000/isatty.c, iq2000/kill.c,
-	iq2000/lseek.c, iq2000/open.c, iq2000/pipe.c, iq2000/read.c,
-	iq2000/sbrk.c, iq2000/sim.ld, iq2000/stat.c, iq2000/test.c,
-	iq2000/time.c, iq2000/times.c, iq2000/trap.c, iq2000/trap.h,
-	iq2000/unlink.c, iq2000/utime.c, iq2000/wait.c, iq2000/write.c:
-	New files.
-
-2003-05-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libnosys/Makefile.in: Add errno.o.
-	* libnosys/errno.c: New file to supply errno definition if
-	one not provided yet.
-
-2003-05-26  Eric Christopher  <echristo@redhat.com>
-
-	* mips/crt0.S: Remove stackbase variable set.
-
-2003-05-02  Eric Christopher  <echristo@redhat.com>
-
-	* mips/cma101.c (__sizemem): Make sure that end is not in .sdata.
-
-2003-04-29  Nick Clifton  <nickc@redhat.com>
-
-	* libnosys/sbrk.c: Remove unnecessary #include's.
-	Change return type of _sbrk() function to void * to match
-	definition in system header files.
-	Fix formatting.
-
-2003-04-23  Andrew Haley  <aph@cambridge.redhat.com>
-
-	* xstormy16/sim_rom.ld: New.
-	* xstormy16/Makefile.in (SIM_SCRIPTS): Add sim_rom.ld.
-	* xstormy16/crt0.s (_int_reset): Copy ROM data to RAM.
-	* xstormy16/eva_app.ld (_rdata, _data): New.
-	* xstormy16/sim_high.ld (_rdata, _data): New.
-
-2003-04-17  Inaoka Kazuhiro  <inaoka.kazuhiro@renesas.com>
-
-	* m32r/Makefile.in: Add multilib support.
-	* m32r/configure.in: Ditto.
-	* m32r/configure: Regenerated.
-
-2003-04-16  Nick Clifton  <nickc@redhat.com>
-
-	* xstormy16/sim_high.ld: Add .jcr section mapping.
-	* xstormy16/eva_stub.ld: Likewise.
-	* xstormy16/eva_app.ld: Likewise.
-
-2003-04-09  Chris Demetriou  <cgd@broadcom.com>
-
-	* mips/cfe.c (_flush_cache): New function.
-
-2003-02-18  Richard Sandiford  <rsandifo@redhat.com>
-
-	* mips/nullmon.c (_ftext, _end): Adjust declaration.
-	(get_mem_info): Rework.
-
-2003-02-18  Richard Sandiford  <rsandifo@redhat.com>
-
-	* mips/crt0.S (zerobss): Reload __memsize after call.
-
-2003-02-17  Chris Demetriou  <cgd@broadcom.com>
-
-	* mips/cfe.c (__cfe_handle, __cfe_entrypt): Fix types.
-
-2003-02-05  Chris Demetriou  <cgd@broadcom.com>
-
-	* mips/configure.in (mipsisa32el-*-*): Handle in the same way
-	as mipsisa32-*-*.
-	(mipsisa32r2-*-*, mipsisa32r2el-*-*): New, handled in the same
-	way as mipsisa32-*-*.
-	* mips/configure: Regenerate.
-
-2003-02-05  Chris Demetriou  <cgd@broadcom.com>
-
-	* mips/cfe.c (hardware_hazard_hook): Move...
-	* mips/cfe_prestart.S (hardware_hazard_hook): To here,
-	and translate into assembly.
-
-2003-01-08  Richard Sandiford  <rsandifo@redhat.com
-
-	* mips/crt0.S (_start): Allocate 64 bytes of stack instead of 32.
-	Pass an empty argv and envp to main().
-
-2003-01-08  Richard Sandiford  <rsandifo@redhat.com
-
-	* mips/configure.in (mips64vr-elf, mips64vrel-elf): New config.
-	* mips/configure: Regenerate.
-
-2003-01-07  Chris Demetriou  <cgd@broadcom.com>
-
-	* crt0.S: Check for definition of __mips64 rather than
-	checking (__mips < 3).
-	* pmon.S: Likewise.
-	* cygmon.c (sysCall): Avoid multi-line string literals.
-
-2002-11-12 Jeff Johnston  <jjohnstn@redhat.com>
-
-	*  mips/Makefile.in: Add cygmon support.
-	*  mips/configure.in: Ditto.
-	*  mips/configure: Regenerated.
-	*  mips/crt0_cygmon.S: New file.
-	*  mips/cygmon.c: Ditto.
-	*  mips/pmon.S: Minor formatting and copyright changes.
-	*  mips/crt0.S: Ditto.
-
-2002-11-08 Jeff Johnston  <jjohnstn@redhat.com>
-
-	* arm/Makefile.in: Add support for new pid specs.
-	* arm/coff-iq80310.specs: Change to allow future support.
-	* arm/elf-iq80310.specs: Ditto.
-	* arm/elf-redboot.specs: Ditto.
-	* arm/coff-redboot.ld: Add EH frame support.
-	* arm/redboot-crt0.S: Add optional code to clear bss without
-	memset.
-	* arm/coff-pid.specs: New file.
-	* arm/elf-pid.specs: New file.
-
-2002-11-08 Jeff Johnston  <jjohnstn@redhat.com>
-	   Catherine Moore  <clm@redhat.com>
-
-        * m32r/configure.in:  Do not require gcc to be able to link an
-        executable.
-        * m32r/configure: Regenerate.
-	* m32r/Makefile.in: Directly reference gdbstub.
-
-2002-10-25  Bernd Schmidt  <bernds@redhat.com>
-
-        * i386/cygmon.ld: Add entry for .gcc_except_table.
-
-2000-10-25  Mark Salter  <msalter@redhat.com>
-
-        * i386/cygmon-crt0.S: Use __USER_LABEL_PREFIX__ for symbols. Always
-        use __start for start symbol.
-        * i386/cygmon-salib.c: Don't build __do_global_[cd]tors for AOUT.
-        Disable file I/O extensions to make Plum Hall happy.
-        * i386/cygmon.ld: Set __start as entry point.
-        * i386/Makefile.in: Support IS_AOUT.
-        * i386/configure.in: Support IS_AOUT.
-        * i386/configure: Regenerated.
-        * i386/cygmon-salib.c:
-        * i386/cygmon-gmon.c (_mcount): It's _etext.
-
-2002-10-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.in: Clarify some of the triplets so unsupported
-	configurations don't pass through.
-	* configure: Regenerated.
-
-2002-10-18  Stephane Carrez  <stcarrez@nerim.fr>
-
-	* m68hc11/syscalls.c (sbrk): Use ptrdiff_t for increment parameter.
-
-2002-10-07  Richard Sandiford  <rsandifo@redhat.com>
-
-	* mips/ddb.ld: KEEP .init and .fini.
-	* mips/ddb-kseg0.ld: Likewise.
-
-2002-10-04  Michael Snyder  <msnyder@redhat.com>
-
-        * m32r/m32r-lib.c (exceptionHandler): Fix computation of
-        exception vector address, as suggested by Mitsubishi.
-        (getExceptionVector): Ditto.
-
-2002-08-01  Chris Demetriou  <cgd@broadcom.com>
-
-	* mips/cfe.ld (STARTUP): New definition.
-	* mips/ddb-kseg0.ld (STARTUP): Likewise.
-	* mips/ddb.ld (STARTUP): Likewise.
-	* mips/dve.ld (STARTUP): Likewise.
-	* mips/idt.ld (STARTUP): Likewise.
-	* mips/jmr3904app-java.ld (STARTUP): Likewise.
-	* mips/jmr3904app.ld (STARTUP): Likewise.
-	* mips/jmr3904dram-java.ld (STARTUP): Likewise.
-	* mips/jmr3904dram.ld (STARTUP): Likewise.
-	* mips/lsi.ld (STARTUP): Likewise.
-	* mips/nullmon.ld (STARTUP): Likewise.
-	* mips/pmon.ld (STARTUP): Likewise.
-
-2002-07-23  Stephane Carrez  <stcarrez@nerim.fr>
-
-        * README: Mention 68HC11/68HC12 support.
-        * configure.in: Recognize m6811-elf and m6812-elf.
-	* configure: Regenerated.
-        * m68hc11/Makefile.in: New file.
-        * m68hc11/configure.in: New file.
-        * m68hc11/configure: New file.
-        * m68hc11/crt0.S: New file.
-        * m68hc11/sci-inout.S: New file for 68hc11/68hc12 sio.
-        * m68hc11/sim-valid-m68hc11.ld: New file.
-        * m68hc11/sim-valid-m68hc12.ld: New file.
-        * m68hc11/syscalls.c: New file.
-
-2002-07-22  Aldy Hernandez  <aldyh@redhat.com>
-
-        * rs6000/simulator.S (gettimeofday): New.
-        (getrusage): New.
-
-2002-07-18  Chris Demetriou  <cgd@broadcom.com>
-
-        * read.c (read): Don't assign past end of buffer, fix return value.
-
-2002-07-12  Chris Demetriou  <cgd@broadcom.com>
-
-        * mips/Makefile.in (GENOBJS2): New variable to name other
-        commonly used objects.
-        (DVEOBJS, JMR3904OBJS): Reference GENOBJS2.
-
-        * mips/Makefile.in: Add support for Broadcom CFE firmware.
-        * mips/configure.in: (mipsisa32*-*-*, *): Likewise.
-        * mips/configure: Regenerate.
-        * mips/cfe.c: New file.
-        * mips/cfe.ld: New file.
-        * mips/cfe_api.c: New file.
-        * mips/cfe_api.h: New file.
-        * mips/cfe_api_int.h: New file.
-        * mips/cfe_error.h: New file.
-        * mips/cfe_prestart.S: New file.
-
-2002-07-12  Chris Demetriou  <cgd@broadcom.com>
-
-        * mips/array.ld (hardware_exit_hook, hardware_hazard_hook): New
-        symbols for optionally-provided functions.
-        * mips/ddb-kseg0.ld: Likewise.
-        * mips/ddb.ld: Likewise.
-        * mips/dve.ld: Likewise.
-        * mips/idt.ld: Likewise.
-        * mips/idt32.ld: Likewise.
-        * mips/idt64.ld: Likewise.
-        * mips/idtecoff.ld: Likewise.
-        * mips/jmr3904app-java.ld: Likewise.
-        * mips/jmr3904app.ld: Likewise.
-        * mips/jmr3904dram-java.ld: Likewise.
-        * mips/jmr3904dram.ld: Likewise.
-        * mips/lsi.ld: Likewise.
-        * mips/nullmon.ld: Likewise.
-        * mips/pmon.ld: Likewise.
-        * mips/crt0.S: Invoke hardware_exit_hook and hardware_hazard_hook
-        functions if they are provided.
-        (_exit): Handle __embedded_pic properly.
-
-2002-06-18  Dave Brolley  <brolley@redhat.com>
-
-	From Catherine Moore, Michael Meissner, Richard Sandiford:
-	* configure.in: Support frv*-*-*.
-	* frv/Makefile.in: New file.
-	* frv/configure: New file.
-	* frv/configure.in: New file.
-	* frv/crt0.S: New file.
-	* frv/fstat.c: New file.
-	* frv/getpid.c: New file.
-	* frv/isatty.c: New file.
-	* frv/kill.c: New file.
-	* frv/print.c: New file.
-	* frv/putnum.c: New file.
-	* frv/sbrk.c: New file.
-	* frv/sim-close.S: New file.
-	* frv/sim-exit.S: New file.
-	* frv/sim-inbyte.c: New file.
-	* frv/sim-lseek.S: New file.
-	* frv/sim-open.S: New file.
-	* frv/sim-read.S: New file.
-	* frv/sim-time.c: New file.
-	* frv/sim-unlink.S: New file.
-	* frv/sim-write.S: New file.
-	* frv/stat.c: New file.
-
-2002-05-11  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libnosys/acconfig.h (HAVE_SECTION_ATTRIBUTES): New macro.
-	* libnosys/configure.in: Check gcc's support for section attributes.
-	* libnosys/warning.h: Have link_warning expand to nothing if gcc
-	does not support section attributes.
-
-2002-04-22  Jonathan Larmour  <jlarmour@redhat.com>
-
-	* arm/syscall.h: New file. To define extra syscall values for RedBoot.
-
-	* arm/redboot-syscalls.c (_close): Fix setting of errno value.
-	(_lseek): Ditto.
-	(_open): Ditto.
-	(_write): Ditto.
-	(_read): Ditto.
-	(_rename): New function.
-	(_system): Ditto.
-	(_stat): Ditto.
-	(_unlink): Call a syscall for this now.
-	(isatty): Ditto.
-	(_fstat): Ditto.
-	(_gettimeofday): Ditto.
-
-2002-04-17  Joel Sherrill <joel@OARcorp.com>
-
-	* debug.h: Change mem_err to volatile to match definition in
-	debug.c.
-
-2002-04-17  Joel Sherrill <joel@OARcorp.com>
-
-	* sparc/cygmon-salib.c, sparc/erc32-stub.c: Don't use multi-line
-	strings.
-
-2002-04-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* m68k/configure.in: Change to use LIB_AC_PROG_CC instead
-	of AC_PROG_CC to avoid building an executable in configuration.
-	* m68k/configure: Regenerated.
-
-2002-04-15  Hans-Peter Nilsson  <hp@bitrange.com>
-
-        * d30v/syscalls.c: #include <time.h>.  Don't use multi-line
-        strings.
-
-2002-04-15  Hans-Peter Nilsson  <hp@bitrange.com>
-
-        * m32r/trapmon0.c (__trap0): Don't use multi-line strings.
-
-2002-02-05  Mark Salter  <msalter@redhat.com>
-
-	* arm/elf-iq80310.specs: Ditto.
-	* arm/elf-redboot.specs: Ditto.
-	* arm/elf-redboot.ld: Fix eh_frame sections. Add .jcr section.
-	* arm/redboot-crt0.S: Add support for __USES_INITFINI__.
-
-2002-02-01  Geoffrey Keating  <geoffk@redhat.com>
-
-	* xstormy16/Makefile.in (SIM_OBJS): Remove sbrk.o, add
-	sim_malloc_start.o.
-	* xstormy16/eva_app.ld: Add __malloc_start.
-	* xstormy16/sbrk.c: Remove.
-	* xstormy16/sim_malloc_start.s: New file.
-	* xstormy16/sim_high.ld: Make the stack start immediately at the
-	end of the program.
-
-2002-02-01  Michael Meissner  <meissner@redhat.com>
-
-	* mips/cma101.c (__sizemem_default): Allow user to specify the
-	memory size.
-	(__sizemem): Use it.
-
-2002-01-24  Mark Salter  <msalter@redhat.com>
-
-	* arm/redboot-crt0.S: Use __get_memtop to put stack in high memory.
-
-	* arm/redboot-syscalls.c (_times): Unconditionally use SYS_times.
-	(__get_memtop): New funtion to return top of memory.
-
-2002-01-15  Mark Salter  <msalter@redhat.com>
-
-	* xstormy16/eva_stub.ld: Provide interrupt routine symbols which
-	forward interrupts to user application vectors.
-
-	* xstormy16/crt0_stub.s: Remove default interrupt routines.
-
-	* xstormy16/Makefile.in: Rename stub app to eva_stub.elf and
-	add it to install list.
-
-2002-01-07  Mark Salter  <msalter@redhat.com>
-
-	* configure.in: Add support for arm, strongarm, and xscale.
-	* configure: Regenerated.
-	* arm/coff-iq80310.specs: New file.
-	* arm/coff-redboot.ld: New file.
-	* arm/coff-redboot.specs: New file.
-	* arm/configure: New file.
-	* arm/configure.in: New file.
-	* arm/elf-iq80310.specs: New file.
-	* arm/elf-redboot.ld: New file.
-	* arm/elf-redboot.specs: New file.
-	* arm/Makefile.in: New file.
-	* arm/redboot-crt0.S: New file.
-	* arm/redboot-syscalls.c: New file.
-
-2001-12-22  Geoffrey Keating  <geoffk@redhat.com>
-	    Mark Salter  <msalter@redhat.com>
-	    Catherine Moore  <clm@redhat.com>
-	    Richard Henderson  <rth@redhat.com>
-
-	* configure.in: Add xstormy16.
-	* libnosys/configure.in: Add xstormy16.
-	* configure: Regenerated.
-	* libnosys/configure: Regenerated.
-	* xstormy16/Makefile.in: New file.
-	* xstormy16/close.c: New file.
-	* xstormy16/configure: New file.
-	* xstormy16/configure.in: New file.
-	* xstormy16/crt0.s: New file.
-	* xstormy16/crt0_stub.s: New file.
-	* xstormy16/crti.s: New file.
-	* xstormy16/crtn.s: New file.
-	* xstormy16/eva_app.c: New file.
-	* xstormy16/eva_app.ld: New file.
-	* xstormy16/eva_stub.ld: New file.
-	* xstormy16/fstat.c: New file.
-	* xstormy16/getpid.c: New file.
-	* xstormy16/kill.c: New file.
-	* xstormy16/lseek.c: New file.
-	* xstormy16/open.c: New file.
-	* xstormy16/sbrk.c: New file.
-	* xstormy16/sim_high.ld: New file.
-	* xstormy16/stat.c: New file.
-	* xstormy16/syscalls.S: New file.
-	* xstormy16/syscalls.m4: New file.
-	* xstormy16/unlink.c: New file.
-	* xstormy16/xstormy16_stub.c: New file.
-
 2001-10-31  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* m32r/Makefile.in: Use gdb stub set by configure.
@@ -1061,7 +33,7 @@
 
 	* configure.in: Treat ddb-kseg0.ld like ddb.ld.
 	* configure: Regenerate.
-
+	
 2001-09-15  Eric Christopher  <echristo@redhat.com>
 
 	* mips/configure.in (LIB_AC_PROG_CC): Fix typo in mipsisa32 to
diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in
index 62a8f5b..4e9c4c4 100644
--- a/libgloss/Makefile.in
+++ b/libgloss/Makefile.in
@@ -13,7 +13,6 @@
 # they apply.
 #
 
-DESTDIR =
 VPATH = @srcdir@
 srcdir = @srcdir@
 objdir = .
@@ -85,8 +84,7 @@ FLAGS_TO_PASS = \
 	"tooldir=$(tooldir)" \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-	"INSTALL_DATA=$(INSTALL_DATA)" \
-	"DESTDIR=$(DESTDIR)"
+	"INSTALL_DATA=$(INSTALL_DATA)"
 
 all: stmp-bsp force
 	@rootpre=`pwd`/; export rootpre; \
diff --git a/libgloss/README b/libgloss/README
index 4c93f07..197980b 100644
--- a/libgloss/README
+++ b/libgloss/README
@@ -1,6 +1,5 @@
 sparc	- Fujitsu Sparclite board. Works on the ex930, ex931, ex933
 hp74x	- Hewlett Packard HP742 board. Also some support for the hp743.
-m68hc11 - Motorola 68HC11 or 68HC12 support.
 m68k	- Motorola MVME135 and IDP board. For CPU32 systems.
 pa	- WinBond and Oki boards with a PA.
 mips	- R3000 support. Array Tech LSI33k based RAID disk controller.
diff --git a/libgloss/arm/Makefile.in b/libgloss/arm/Makefile.in
deleted file mode 100644
index 436db13..0000000
--- a/libgloss/arm/Makefile.in
+++ /dev/null
@@ -1,167 +0,0 @@
-#
-#
-DESTDIR =
-VPATH = @srcdir@ @srcdir@/..
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-objtype = @objtype@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTISRCTOP =
-MULTIBUILDTOP =
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-SHELL =	/bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-@BUILD_CRT0_TRUE@CRT0		= crt0.o
-@BUILD_CRT0_TRUE@CRT0_INSTALL	= install-crt0
-@BUILD_CRT0_FALSE@CRT0		= 
-@BUILD_CRT0_FALSE@CRT0_INSTALL	= 
-
-REDBOOT_CRT0	= redboot-crt0.o 
-REDBOOT_OBJS	= redboot-syscalls.o
-REDBOOT_SCRIPTS	= redboot.ld redboot.specs
-REDBOOT_INSTALL	= install-redboot
-
-RDPMON_CRT0	= rdpmon-crt0.o
-RDPMON_BSP	= librdpmon.a
-RDPMON_OBJS	= syscalls.o libcfunc.o trap.o
-RDPMON_SCRIPTS	= rdpmon.specs
-RDPMON_INSTALL	= install-rdpmon
-
-RDIMON_CRT0	= rdimon-crt0.o
-RDIMON_BSP	= librdimon.a
-RDIMON_OBJS	= rdimon-syscalls.o rdimon-libcfunc.o rdimon-trap.o
-RDIMON_SCRIPTS	= rdimon.specs
-RDIMON_INSTALL	= install-rdimon
-
-CFLAGS		= -g
-
-# Here is all of the eval board stuff
-PID_SCRIPTS	= pid.specs
-PID_INSTALL	= install-pid
-
-IQ80310_SCRIPTS	= iq80310.specs
-IQ80310_INSTALL	= install-iq80310
-
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-#
-# build a test program for each target board. Just trying to get
-# it to link is a good test, so we ignore all the errors for now.
-#
-all: ${CRT0} ${REDBOOT_CRT0} ${REDBOOT_OBJS} ${RDPMON_CRT0} ${RDPMON_BSP} ${RDIMON_CRT0} ${RDIMON_BSP}
-
-#
-# here's where we build the test programs for each target
-#
-.PHONY: test
-test:
-
-#
-crt0.o: crt0.S
-redboot-crt0.o: redboot-crt0.S
-redboot-syscalls.o: redboot-syscalls.c $(srcdir)/../syscall.h
-
-rdpmon-crt0.o: crt0.S
-	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -DARM_RDP_MONITOR -o $@ -c $<
-
-rdimon-crt0.o: crt0.S
-	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
-
-rdimon-trap.o: trap.S
-	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
-
-rdimon-syscalls.o: syscalls.c
-	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
-
-rdimon-libcfunc.o: libcfunc.c
-	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -DARM_RDI_MONITOR -o $@ -c $<
-
-$(RDPMON_BSP): $(RDPMON_OBJS)
-	${AR} ${ARFLAGS} $@ $^
-	${RANLIB} $@
-
-$(RDIMON_BSP): $(RDIMON_OBJS)
-	${AR} ${ARFLAGS} $@ $^
-	${RANLIB} $@
-
-clean mostlyclean:
-	rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) $(IQ80310_BSP)
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.status *~
-
-.PHONY: install info install-info clean-info
-install: ${CRT0_INSTALL} ${REDBOOT_INSTALL} ${RDPMON_INSTALL} ${RDIMON_INSTALL} ${IQ80310_INSTALL}  ${PID_INSTALL}
-
-install-crt0:
-	${INSTALL_DATA} ${CRT0} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x
-
-install-redboot:
-	set -e; for x in ${REDBOOT_CRT0} ${REDBOOT_OBJS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-	set -e; for x in ${REDBOOT_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/${objtype}$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-
-install-rdpmon:
-	set -e; for x in ${RDPMON_CRT0} ${RDPMON_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-	set -e; for x in ${RDPMON_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/${objtype}$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-
-install-rdimon:
-	set -e; for x in ${RDIMON_CRT0} ${RDIMON_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-	set -e; for x in ${RDIMON_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/${objtype}$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-
-
-install-pid:
-	set -e; for x in ${PID_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/${objtype}$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-
-install-iq80310:
-	set -e; for x in ${IQ80310_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/${objtype}$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-
-
-doc:
-info:
-install-info:
-clean-info:
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/libgloss/arm/coff-iq80310.specs b/libgloss/arm/coff-iq80310.specs
deleted file mode 100644
index 2cd2d87..0000000
--- a/libgloss/arm/coff-iq80310.specs
+++ /dev/null
@@ -1,8 +0,0 @@
-%rename link                old_link
-
-*link:
--T redboot.ld%s -Ttext 0xA0020000 %(old_link)
-
-*startfile:
-%{!pg:redboot-crt0%O%s} %{pg:redboot-crt0%O%s} redboot-syscalls%O%s
-
diff --git a/libgloss/arm/coff-pid.specs b/libgloss/arm/coff-pid.specs
deleted file mode 100644
index 61bec3e..0000000
--- a/libgloss/arm/coff-pid.specs
+++ /dev/null
@@ -1,8 +0,0 @@
-%rename link                old_link
-
-*link:
--T redboot.ld%s -Ttext 0x10000 %(old_link)
-
-*startfile:
-redboot-crt0%O%s redboot-syscalls%O%s
-
diff --git a/libgloss/arm/coff-rdimon.specs b/libgloss/arm/coff-rdimon.specs
deleted file mode 100644
index ace5506..0000000
--- a/libgloss/arm/coff-rdimon.specs
+++ /dev/null
@@ -1,8 +0,0 @@
-%rename link                old_link
-
-*link:
-%(old_link) -lrdimon
-
-*startfile:
-rdimon-crt0%O%s
-
diff --git a/libgloss/arm/coff-rdpmon.specs b/libgloss/arm/coff-rdpmon.specs
deleted file mode 100644
index 6614612..0000000
--- a/libgloss/arm/coff-rdpmon.specs
+++ /dev/null
@@ -1,8 +0,0 @@
-%rename link                old_link
-
-*link:
-%(old_link) -lrdpmon
-
-*startfile:
-rdpmon-crt0%O%s
-
diff --git a/libgloss/arm/coff-redboot.ld b/libgloss/arm/coff-redboot.ld
deleted file mode 100644
index 0c33c3b..0000000
--- a/libgloss/arm/coff-redboot.ld
+++ /dev/null
@@ -1,54 +0,0 @@
-OUTPUT_FORMAT("coff-arm-little", "coff-arm-big", "coff-arm-little")
- SEARCH_DIR(/toolbin/xscale-coff/lib);
-ENTRY(_start)
-SECTIONS
-{
-  /* We start at 0x8000 because gdb assumes it (see FRAME_CHAIN).
-     This is an artifact of the ARM Demon monitor using the bottom 32k
-     as workspace (shared with the FP instruction emulator if
-     present): */
-  .text  0x8000 : {
-    *(.init)
-    *(.text*)
-    *(.glue_7t)
-    *(.glue_7)
-    *(.rdata)
-     ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; 
-			LONG (-1); *(.ctors); *(.ctor); LONG (0); 
-     ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; 
-			LONG (-1); *(.dtors); *(.dtor);  LONG (0); 
-    *(.fini)
-     etext  =  .;
-     _etext  =  .;
-  }
-  .data 0x40000 + (. & 0xfffc0fff) : {
-      __data_start__ = . ;
-    *(.data*)
-    *(.gcc_exc*)
-    ___EH_FRAME_BEGIN__ = . ;
-    *(.eh_fram*)
-    ___EH_FRAME_END__ = . ;
-    LONG(0);
-     __data_end__ = . ;
-     edata  =  .;
-     _edata  =  .;
-  }
-  .bss  SIZEOF(.data) + ADDR(.data) :
-  { 					
-     __bss_start__ = . ;
-    *(.bss)
-    *(COMMON)
-     __bss_end__ = . ;
-  }
-   end = .;
-   _end = .;
-   __end__ = .;
-  .stab  0 (NOLOAD) : 
-  {
-    [ .stab ]
-  }
-  .stabstr  0 (NOLOAD) :
-  {
-    [ .stabstr ]
-  }
-}
diff --git a/libgloss/arm/coff-redboot.specs b/libgloss/arm/coff-redboot.specs
deleted file mode 100644
index 2197761..0000000
--- a/libgloss/arm/coff-redboot.specs
+++ /dev/null
@@ -1,8 +0,0 @@
-%rename link                old_link
-
-*link:
--T redboot.ld%s -Ttext 0x20000 %(old_link)
-
-*startfile:
-redboot-crt0%O%s redboot-syscalls%O%s
-
diff --git a/libgloss/arm/configure b/libgloss/arm/configure
deleted file mode 100644
index 47d91ec..0000000
--- a/libgloss/arm/configure
+++ /dev/null
@@ -1,1239 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=redboot-crt0.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-if test "x$newlib_may_supply_syscalls" = "xyes"; then
-  BUILD_CRT0_TRUE='#'
-  BUILD_CRT0_FALSE=
-else
-  BUILD_CRT0_TRUE=
-  BUILD_CRT0_FALSE='#'
-fi
-
-
-
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-ac_aux_dir=
-for ac_dir in $libgloss_topdir $srcdir/$libgloss_topdir; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $libgloss_topdir $srcdir/$libgloss_topdir" 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:608: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:629: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:647: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:701: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:765: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:795: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:844: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:868: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:904: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-case "${target}" in
-  *-*-elf | *-*-eabi)
-	objtype=elf-
-	;;
-  *-*-coff)
-	objtype=coff-
-	;;
-esac
-
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-host_makefile_frag_path=$host_makefile_frag
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@BUILD_CRT0_TRUE@%$BUILD_CRT0_TRUE%g
-s%@BUILD_CRT0_FALSE@%$BUILD_CRT0_FALSE%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@objtype@%$objtype%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-. ${libgloss_topdir}/config-ml.in
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-
diff --git a/libgloss/arm/configure.in b/libgloss/arm/configure.in
deleted file mode 100644
index 7159599..0000000
--- a/libgloss/arm/configure.in
+++ /dev/null
@@ -1,117 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
-AC_INIT(redboot-crt0.S)
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-if test "x$newlib_may_supply_syscalls" = "xyes"; then
-  BUILD_CRT0_TRUE='#'
-  BUILD_CRT0_FALSE=
-else
-  BUILD_CRT0_TRUE=
-  BUILD_CRT0_FALSE='#'
-fi
-
-AC_SUBST(BUILD_CRT0_TRUE)
-AC_SUBST(BUILD_CRT0_FALSE)
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-case "${target}" in
-  *-*-elf | *-*-eabi)
-	objtype=elf-
-	;;
-  *-*-coff)
-	objtype=coff-
-	;;
-esac
-
-AC_SUBST(objtype)
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AC_OUTPUT(Makefile,
-. ${libgloss_topdir}/config-ml.in,
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-)
-
diff --git a/libgloss/arm/crt0.S b/libgloss/arm/crt0.S
deleted file mode 100644
index 823f409..0000000
--- a/libgloss/arm/crt0.S
+++ /dev/null
@@ -1,397 +0,0 @@
-#include "newlib.h"
-#include "swi.h"
-
-/* ANSI concatenation macros.  */
-#define CONCAT(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a ## b
-
-#ifdef __USER_LABEL_PREFIX__
-#define FUNCTION( name ) CONCAT (__USER_LABEL_PREFIX__, name)
-#else
-#error __USER_LABEL_PREFIX is not defined
-#endif
-
-#ifdef HAVE_INITFINI_ARRAY
-#define _init	__libc_init_array
-#define _fini	__libc_fini_array
-#endif
-
-/* .text is used instead of .section .text so it works with arm-aout too.  */
-	.text
-#if defined(__thumb2__)
-	.syntax unified
-	.thumb
-.macro FUNC_START name
-	.global \name
-	.thumb_func
-\name:
-.endm
-#else
-	.code 32
-.macro FUNC_START name
-	.global \name
-\name:
-.endm
-#endif
-	.align 	0
-
-	FUNC_START	_mainCRTStartup
-	FUNC_START	_start
-	FUNC_START	start
-#if defined(__ELF__) && !defined(__USING_SJLJ_EXCEPTIONS__)
-	/* Annotation for EABI unwinding tables.  */
-	.fnstart
-#endif
-
-/* Start by setting up a stack */
-#ifdef ARM_RDP_MONITOR
-	/*  Issue Demon SWI to read stack info */
-	swi	SWI_GetEnv	/*  Returns command line in r0 */
-	mov	sp,r1		/*  and the highest memory address in r1 */
-	ldr	sl, .LC2	/*  stack limit is at end of data */
-	add	sl, sl, #256	/*  allow slop for stack overflow handling */
-				/*  and small frames */
-#else
-#ifdef ARM_RDI_MONITOR
-	/*  Issue Angel SWI to read stack info */
-	mov	r0, #AngelSWI_Reason_HeapInfo
-	adr	r1, .LC0	/*  point at ptr to 4 words to receive data */
-#if defined(__thumb2__)
-	bkpt	AngelSWI
-#else
-	/*  We are always in ARM mode for startup */
-	AngelSWIAsm	AngelSWI_ARM
-#endif
-	ldr	r0, .LC0	/*  point at values read */
-	ldr	sp, [r0, #8]
-	ldr	sl, [r0, #12]
-	add	sl, sl, #256	/*  allow slop for stack overflow handling */
-				/*  and small frames */
-#else
-	/*  Set up the stack pointer to a fixed value */
-	/*  Changes by toralf:
-	    - Allow linker script to provide stack via __stack symbol - see
-	      defintion of .Lstack
-	    - Provide "hooks" that may be used by the application to add
-	      custom init code - see .Lhwinit and .Lswinit	
-	    - Go through all execution modes and set up stack for each of them.
-	      Loosely based on init.s from ARM/Motorola example code.
-              Note: Mode switch via CPSR is not allowed once in non-privileged
-		    mode, so we take care not to enter "User" to set up its sp,
-		    and also skip most operations if already in that mode. */
-
-	ldr	r3, .Lstack
-	cmp	r3, #0
-	ldreq	r3, .LC0
-	/* Note: This 'mov' is essential when starting in User, and ensures we
-		 always get *some* sp value for the initial mode, even if we 
-		 have somehow missed it below (in which case it gets the same
-		 value as FIQ - not ideal, but better than nothing.) */
-	mov	sp, r3
-	mrs	r2, CPSR
-	tst	r2, #0x0F	/* Test mode bits - in User of all are 0 */
-	beq	.LC23		/* "eq" means r2 AND #0x0F is 0 */
-	msr     CPSR_c, #0xD1	/* FIRQ mode, interrupts disabled */
-	mov 	sp, r3
-	sub	sl, sp, #0x1000	/* This mode also has its own sl (see below) */
-	
-	mov	r3, sl	
-	msr     CPSR_c, #0xD7	/* Abort mode, interrupts disabled */
-	mov	sp, r3
-	sub	r3, r3, #0x1000
-
-	msr     CPSR_c, #0xDB	/* Undefined mode, interrupts disabled */
-	mov	sp, r3
-	sub	r3, r3, #0x1000
-
-	msr     CPSR_c, #0xD2	/* IRQ mode, interrupts disabled */
-	mov	sp, r3
-	sub	r3, r3, #0x2000
-		
-	msr     CPSR_c, #0xD3	/* Supervisory mode, interrupts disabled */
-	mov	sp, r3
-	sub	r3, r3, #0x8000	/* Min size 32k */
-	bic	r3, r3, #0x00FF	/* Align with current 64k block */
-	bic	r3, r3, #0xFF00
-
-	str	r3, [r3, #-4]	/* Move value into user mode sp without */ 
-	ldmdb	r3, {sp}^       /* changing modes, via '^' form of ldm */ 
-	
-	orr	r2, r2, #0xC0	/* Back to original mode, presumably SVC, */
-	msr	CPSR_c, r2	/* with FIQ/IRQ disable bits forced to 1 */
-.LC23:
-	/* Setup a default stack-limit in-case the code has been
-	   compiled with "-mapcs-stack-check".  Hard-wiring this value
-	   is not ideal, since there is currently no support for
-	   checking that the heap and stack have not collided, or that
-	   this default 64k is enough for the program being executed.
-	   However, it ensures that this simple crt0 world will not
-	   immediately cause an overflow event:  */
-	sub	sl, r3, #64 << 10	/* Still assumes 256bytes below sl */
-#endif
-#endif
-	/* Zero the memory in the .bss section.  */
-	mov 	a2, #0			/* Second arg: fill value */
-	mov	fp, a2			/* Null frame pointer */
-	mov	r7, a2			/* Null frame pointer for Thumb */
-	
-	ldr	a1, .LC1		/* First arg: start of memory block */
-	ldr	a3, .LC2	
-	sub	a3, a3, a1		/* Third arg: length of block */
-	
-
-#if defined(__thumb__) && !defined(__thumb2__)
-	/* Enter Thumb mode.... */
-	add	a4, pc, #1	/* Get the address of the Thumb block */
-	bx	a4		/* Go there and start Thumb decoding  */
-
-	.code 16
-	.global __change_mode
-	.thumb_func
-__change_mode:	
-#endif
-	
-	bl	FUNCTION (memset)
-#if !defined (ARM_RDP_MONITOR) && !defined (ARM_RDI_MONITOR)
-/* Changes by toralf: Taken from libgloss/m68k/crt0.S
- * initialize target specific stuff. Only execute these
- * functions it they exist.
- */
-	ldr	r3, .Lhwinit
-	cmp	r3, #0
-	beq	.LC24
-	mov	lr, pc
-	mov	pc, r3
-.LC24:	
-	ldr	r3, .Lswinit
-	cmp	r3, #0
-	beq	.LC25
-	mov	lr, pc
-	mov	pc, r3
-.LC25:	
-	mov	r0, #0		/*  no arguments  */
-	mov	r1, #0		/*  no argv either */
-#else
-	/* Need to set up standard file handles */
-	bl	FUNCTION (initialise_monitor_handles)
-	
-#ifdef ARM_RDP_MONITOR
-	swi	SWI_GetEnv	/*  sets r0 to point to the command line */
-	mov	r1, r0
-#else
-	mov	r0, #AngelSWI_Reason_GetCmdLine
-	adr	r1, .LC30	/*  Space for command line */
-	AngelSWIAsm	AngelSWI
-	ldr	r1, .LC30
-#endif
-	/*  Parse string at r1 */
-	mov	r0, #0		/*  count of arguments so far */
-	/* Push a NULL argument onto the end of the list.  */
-#ifdef __thumb__
-	push	{r0}
-#else
-	stmfd	sp!, {r0}
-#endif
-.LC10:
-/*  Skip leading blanks */
-#ifdef __thumb__
-	ldrb	r3, [r1]
-	add	r1, #1
-#else
-	ldrb	r3, [r1], #1
-#endif
-	cmp	r3, #0
-	beq	.LC12
-	cmp	r3, #' '
-	beq	.LC10
-
-/*  See whether we are scanning a string */
-	cmp	r3, #'"'
-#ifdef __thumb__
-	beq	.LC20
-	cmp	r3, #'\''
-	bne	.LC21
-.LC20:
-	mov	r2, r3
-	b	.LC22
-
-.LC21:
-	mov	r2, #' '	/*  terminator type */
-	sub	r1, r1, #1	/*  adjust back to point at start char */
-.LC22:
-#else
-	cmpne	r3, #'\''
-	moveq	r2, r3
-	movne	r2, #' '	/*  terminator type */
-	subne	r1, r1, #1	/*  adjust back to point at start char */
-#endif
-
-/*  Stack a pointer to the current argument */
-#ifdef __thumb__
-	push	{r1}
-#else
-	stmfd	sp!, {r1}
-#endif
-	add	r0, r0, #1
-.LC11:
-#ifdef __thumb__
-	ldrb	r3, [r1]
-	add	r1, #1
-#else
-	ldrb	r3, [r1], #1
-#endif
-	cmp	r3, #0
-	beq	.LC12
-	cmp	r2, r3		/*  reached terminator? */
-	bne	.LC11
-	mov	r2, #0
-	sub	r3, r1, #1
-	strb	r2, [r3]	/*  terminate the arg string */
-	b	.LC10
-
-.LC12:
-	mov	r1, sp		/*  point at stacked arg pointers */
-	/* We've now got the stacked args in order reverse the */
-#ifdef __thumb__
-	mov	r2, r0
-	lsl	r2, #2
-	add	r2, sp
-	mov	r3, sp
-.LC15:	cmp	r2, r3
-	bls	.LC14
-	sub	r2, #4
-	ldr	r4, [r2]
-	ldr	r5, [r3]
-	str	r5, [r2]
-	str	r4, [r3]
-	add	r3, #4
-	b	.LC15
-.LC14:	
-	/* Ensure doubleword stack alignment.  */
-	mov	r4, sp
-	mov	r5, #7
-	bic	r4, r5
-	mov	sp, r4
-#else
-	add	r2, sp, r0, LSL #2	/* End of args */
-	mov	r3, sp			/* Start of args */
-.LC13:	cmp	r2, r3
-	ldrhi	r4,[r2, #-4]		/* Reverse ends of list */
-	ldrhi	r5, [r3]
-	strhi	r5, [r2, #-4]!
-	strhi	r4, [r3], #4
-	bhi	.LC13
-	/* Ensure doubleword stack alignment.  */
-	bic	sp, sp, #7
-#endif
-#endif
-
-#ifdef __USES_INITFINI__
-	/* Some arm/elf targets use the .init and .fini sections
-	   to create constructors and destructors, and for these
-	   targets we need to call the _init function and arrange
-	   for _fini to be called at program exit.  */
-	mov	r4, r0
-	mov	r5, r1
-	ldr	r0, .Lfini
-	bl	FUNCTION (atexit)
-	bl	FUNCTION (_init)
-	mov	r0, r4
-	mov	r1, r5
-#endif	
-	bl	FUNCTION (main)
-
-	bl	FUNCTION (exit)		/* Should not return.  */
-
-#if defined(__thumb__) && !defined(__thumb2__)
-	/* Come out of Thumb mode.  This code should be redundant.  */
-
-	mov	a4, pc
-	bx	a4
-
-	.code 32
-	.global change_back
-change_back:
-	/* Halt the execution.  This code should never be executed.  */
-	/* With no debug monitor, this probably aborts (eventually).
-	   With a Demon debug monitor, this halts cleanly.
-	   With an Angel debug monitor, this will report 'Unknown SWI'.	 */
-	swi	SWI_Exit
-#endif
-	
-	/* For Thumb, constants must be after the code since only 
-	   positive offsets are supported for PC relative addresses.  */
-	
-	.align 0
-.LC0:
-#ifdef ARM_RDI_MONITOR
-	.word	HeapBase
-#else
-#ifndef ARM_RDP_MONITOR
-	/* Changes by toralf: Provide alternative "stack" variable whose value
-	   may be defined externally; .Lstack will be used instead of .LC0 if
-	   it points to a non-0 value. Also set up references to "hooks" that
-           may be used by the application to provide additional init code. */
-	
-#ifdef __pe__
-	.word	0x800000
-#else
-	.word	0x80000			/* Top of RAM on the PIE board.  */
-#endif
-.Lstack:	
-	.word	__stack
-.Lhwinit:	
-	.word	FUNCTION (hardware_init_hook)
-.Lswinit:
-	.word	FUNCTION (software_init_hook)
-
-	/* Set up defaults for the above variables in the form of weak symbols
-	   - so that application will link correctly, and get value 0 in
-	   runtime (meaning "ignore setting") for the variables, when the user
-	   does not provide the symbols. (The linker uses a weak symbol if,
-	   and only if, a normal version of the same symbol isn't provided
-	   e.g. by a linker script or another object file.) */	
-
-	.set __stack, 0
-	.set FUNCTION (hardware_init_hook), 0
-	.set FUNCTION (software_init_hook), 0
-	
-	.weak __stack
-	.weak FUNCTION (hardware_init_hook) 
-	.weak FUNCTION (software_init_hook)
-#endif
-	
-#endif
-#if defined(__ELF__) && !defined(__USING_SJLJ_EXCEPTIONS__)
-	/* Protect against unhandled exceptions.  */
-	.cantunwind
-	.fnend
-#endif
-.LC1:
-	.word	__bss_start__
-.LC2:
-	.word	__bss_end__
-#ifdef __USES_INITFINI__
-.Lfini:
-	.word	FUNCTION(_fini)
-#endif
-#ifdef ARM_RDI_MONITOR
-.LC30:
-	.word	CommandLine
-	.word	255
-
-/*  Workspace for Angel calls.  */
-	.data
-/*  Data returned by monitor SWI.  */
-.global	__stack_base__
-HeapBase:	.word	0
-HeapLimit:	.word	0
-__stack_base__:	.word	0
-StackLimit:	.word	0
-CommandLine:	.space	256,0	/*  Maximum length of 255 chars handled.  */
-#endif
-	
-#ifdef __pe__
-	.section .idata$3
-	.long	0,0,0,0,0,0,0,0
-#endif
diff --git a/libgloss/arm/elf-iq80310.specs b/libgloss/arm/elf-iq80310.specs
deleted file mode 100644
index a016e88..0000000
--- a/libgloss/arm/elf-iq80310.specs
+++ /dev/null
@@ -1,8 +0,0 @@
-%rename link                old_link
-
-*link:
--T redboot.ld%s -Ttext 0xA0020000 %(old_link)
-
-*startfile:
-crti%O%s crtbegin%O%s %{!pg:redboot-crt0%O%s} %{pg:redboot-crt0%O%s} redboot-syscalls%O%s
-
diff --git a/libgloss/arm/elf-pid.specs b/libgloss/arm/elf-pid.specs
deleted file mode 100644
index c8a9f14..0000000
--- a/libgloss/arm/elf-pid.specs
+++ /dev/null
@@ -1,8 +0,0 @@
-%rename link                old_link
-
-*link:
--T redboot.ld%s -Ttext 0x10000 %(old_link)
-
-*startfile:
-crti%O%s crtbegin%O%s %{!pg:redboot-crt0%O%s} %{pg:redboot-crt0%O%s} redboot-syscalls%O%s
-
diff --git a/libgloss/arm/elf-rdimon.specs b/libgloss/arm/elf-rdimon.specs
deleted file mode 100644
index 153cf0c..0000000
--- a/libgloss/arm/elf-rdimon.specs
+++ /dev/null
@@ -1,8 +0,0 @@
-%rename link                old_link
-
-*link:
-%(old_link) -lrdimon
-
-*startfile:
-crti%O%s crtbegin%O%s %{!pg:rdimon-crt0%O%s} %{pg:rdimon-crt0%O%s}
-
diff --git a/libgloss/arm/elf-rdpmon.specs b/libgloss/arm/elf-rdpmon.specs
deleted file mode 100644
index 903db1f..0000000
--- a/libgloss/arm/elf-rdpmon.specs
+++ /dev/null
@@ -1,8 +0,0 @@
-%rename link                old_link
-
-*link:
-%(old_link) -lrdpmon
-
-*startfile:
-crti%O%s crtbegin%O%s %{!pg:rdpmon-crt0%O%s} %{pg:rdpmon-crt0%O%s}
-
diff --git a/libgloss/arm/elf-redboot.ld b/libgloss/arm/elf-redboot.ld
deleted file mode 100644
index 3d1f8d8..0000000
--- a/libgloss/arm/elf-redboot.ld
+++ /dev/null
@@ -1,220 +0,0 @@
-OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
-	      "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = 0x00020000;
-  .interp     : { *(.interp) 	}
-  .hash          : { *(.hash)		}
-  .dynsym        : { *(.dynsym)		}
-  .dynstr        : { *(.dynstr)		}
-  .gnu.version   : { *(.gnu.version)	}
-  .gnu.version_d   : { *(.gnu.version_d)	}
-  .gnu.version_r   : { *(.gnu.version_r)	}
-  .rel.init      : { *(.rel.init)	}
-  .rela.init     : { *(.rela.init)	}
-  .rel.text      :
-    {
-      *(.rel.text)
-      *(.rel.text.*)
-      *(.rel.gnu.linkonce.t*)
-    }
-  .rela.text     :
-    {
-      *(.rela.text)
-      *(.rela.text.*)
-      *(.rela.gnu.linkonce.t*)
-    }
-  .rel.fini      : { *(.rel.fini)	}
-  .rela.fini     : { *(.rela.fini)	}
-  .rel.rodata    :
-    {
-      *(.rel.rodata)
-      *(.rel.rodata.*)
-      *(.rel.gnu.linkonce.r*)
-    }
-  .rela.rodata   :
-    {
-      *(.rela.rodata)
-      *(.rela.rodata.*)
-      *(.rela.gnu.linkonce.r*)
-    }
-  .rel.data      :
-    {
-      *(.rel.data)
-      *(.rel.data.*)
-      *(.rel.gnu.linkonce.d*)
-    }
-  .rela.data     :
-    {
-      *(.rela.data)
-      *(.rela.data.*)
-      *(.rela.gnu.linkonce.d*)
-    }
-  .rel.ctors     : { *(.rel.ctors)	}
-  .rela.ctors    : { *(.rela.ctors)	}
-  .rel.dtors     : { *(.rel.dtors)	}
-  .rela.dtors    : { *(.rela.dtors)	}
-  .rel.got       : { *(.rel.got)		}
-  .rela.got      : { *(.rela.got)		}
-  .rel.sdata     :
-    {
-      *(.rel.sdata)
-      *(.rel.sdata.*)
-      *(.rel.gnu.linkonce.s*)
-    }
-  .rela.sdata     :
-    {
-      *(.rela.sdata)
-      *(.rela.sdata.*)
-      *(.rela.gnu.linkonce.s*)
-    }
-  .rel.sbss      : { *(.rel.sbss)		}
-  .rela.sbss     : { *(.rela.sbss)	}
-  .rel.bss       : { *(.rel.bss)		}
-  .rela.bss      : { *(.rela.bss)		}
-  .rel.plt       : { *(.rel.plt)		}
-  .rela.plt      : { *(.rela.plt)		}
-  .plt      : { *(.plt)	}
-  .text      :
-  {
-    *(.text)
-    *(.text.*)
-    *(.stub)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t*)
-    *(.glue_7t) *(.glue_7)
-  } =0
-  .init          : 
-  { 
-    KEEP (*(.init))
-  } =0
-  _etext = .;
-  PROVIDE (etext = .);
-  .fini      :
-  {
-    KEEP (*(.fini))
-  } =0
-  .rodata   : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r*) }
-  .rodata1   : { *(.rodata1) }
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(256) + (. & (256 - 1));
-  .data    :
-  {
-    *(.data)
-    *(.data.*)
-    *(.gnu.linkonce.d*)
-    SORT(CONSTRUCTORS)
-  }
-  .data1   : { *(.data1) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .ctors   : 
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  }
-   .dtors         :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  }
-  .jcr            : { KEEP (*(.jcr)) }
-  .got           : { *(.got.plt) *(.got) }
-  .dynamic       : { *(.dynamic) }
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata     : 
-  {
-    *(.sdata) 
-    *(.sdata.*)
-    *(.gnu.linkonce.s.*)
-  }
-  _edata = .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  __bss_start__ = .;
-  .sbss      :
-  {
-    *(.dynsbss)
-    *(.sbss)
-    *(.sbss.*)
-    *(.scommon)
-  }
-  .bss       :
-  {
-   *(.dynbss)
-   *(.bss)
-   *(.bss.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-   . = ALIGN(32 / 8);
-  }
-  . = ALIGN(32 / 8);
-  _end = .;
-  _bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
-  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  .stack 0x80000 : { _stack = .; *(.stack) }
-  /* These must appear regardless of  .  */
-}
diff --git a/libgloss/arm/elf-redboot.specs b/libgloss/arm/elf-redboot.specs
deleted file mode 100644
index 8a00c3b..0000000
--- a/libgloss/arm/elf-redboot.specs
+++ /dev/null
@@ -1,8 +0,0 @@
-%rename link                old_link
-
-*link:
--T redboot.ld%s -Ttext 0x20000 %(old_link)
-
-*startfile:
-crti%O%s crtbegin%O%s %{!pg:redboot-crt0%O%s} %{pg:redboot-crt0%O%s} redboot-syscalls%O%s
-
diff --git a/libgloss/arm/libcfunc.c b/libgloss/arm/libcfunc.c
deleted file mode 100644
index 4f13193..0000000
--- a/libgloss/arm/libcfunc.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Support files for GNU libc.  Files in the C namespace go here.
-   Files in the system namespace (ie those that start with an underscore)
-   go in syscalls.c.
-   
-   Note: These functions are in a seperate file so that OS providers can
-   overrride the system call stubs (defined in syscalls.c) without having
-   to provide libc funcitons as well.  */
-
-#include "swi.h"
-#include <errno.h>
-#include <unistd.h>
-
-#ifdef ARM_RDI_MONITOR
-static inline int
-do_AngelSWI (int reason, void * arg)
-{
-  int value;
-  asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0"
-       : "=r" (value) /* Outputs */
-       : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */
-       : "r0", "r1", "lr"
-		/* Clobbers r0 and r1, and lr if in supervisor mode */);
-  return value;
-}
-#endif /* ARM_RDI_MONITOR */
-
-void
-abort (void)
-{
-  extern void _exit (int n);
-#ifdef ARM_RDI_MONITOR
-  do_AngelSWI (AngelSWI_Reason_ReportException,
-	      (void *) ADP_Stopped_RunTimeError);
-#else
-  _exit(17);
-#endif
-}
-
-unsigned __attribute__((weak))
-alarm (unsigned seconds)
-{
-	(void)seconds;
-	return 0;
-}
-
-clock_t _clock(void);
-clock_t __attribute__((weak))
-clock(void)
-{
-      return _clock();
-}
-
-int _isatty(int fildes);
-int __attribute__((weak))
-isatty(int fildes)
-{
-	return _isatty(fildes);
-}
-
-int __attribute__((weak))
-pause(void)
-{
-	errno = ENOSYS;
-	return -1;
-}
-
-#include <sys/types.h>
-#include <time.h>
-
-unsigned __attribute__((weak))
-sleep(unsigned seconds)
-{
-	clock_t t0 = _clock();
-	clock_t dt = seconds * CLOCKS_PER_SEC;
-
-	while (_clock() - t0  < dt);
-	return 0;
-}
-
-int __attribute__((weak))
-usleep(useconds_t useconds)
-{
-	clock_t t0 = _clock();
-	clock_t dt = useconds / (1000000/CLOCKS_PER_SEC);
-
-	while (_clock() - t0  < dt);
-	return 0;
-}
diff --git a/libgloss/arm/redboot-crt0.S b/libgloss/arm/redboot-crt0.S
deleted file mode 100644
index 2499ac0..0000000
--- a/libgloss/arm/redboot-crt0.S
+++ /dev/null
@@ -1,127 +0,0 @@
-	
-    .file   "crt0.S"
-	
-#define XGLUE(a,b) a##b
-#define GLUE(a,b) XGLUE(a,b)
-	
-#ifdef __USER_LABEL_PREFIX__
-#define SYM_NAME( name ) GLUE (__USER_LABEL_PREFIX__, name)
-#else
-#error __USER_LABEL_PREFIX is not defined
-#endif
-
-    .text
-     /* Setup the assembly entry point.  */
-#ifdef __thumb2__
-.macro FUNC_START name
-	.global \name
-	.thumb_func
-\name:
-.endm
-	.syntax unified
-	.thumb
-#else
-.macro FUNC_START name
-	.global \name
-\name:
-.endm
-	.code 32
-#endif
-	FUNC_START SYM_NAME(start)
-	FUNC_START SYM_NAME(_start)
-	mov	fp, #0	/* Null frame pointer.  */
-	mov	r7, #0	/* Null frame pointer for Thumb.  */
-
-	/* Enable interrupts for gdb debugging.  */
-#ifdef __thumb2__
-	cpsie if
-#else
-	mrs    r0, cpsr
-	bic    r0, r0, #0xC0
-	msr    cpsr, r0
-#endif
-	
-	mov 	a2, #0			/* Second arg: fill value.  */
-	ldr	a1, .LC1		/* First arg: start of memory block.  */
-	ldr	a3, .LC2	
-	sub	a3, a3, a1		/* Third arg: length of block.  */
-
-#ifdef	GCRT0
-	/* Zero out the bss without using memset. 
-	   Using memset is bad because it may be instrumented for
-	   profiling, but at this point, the profiling data structures
-	   have not been set up. 
-	   FIXME: This loop could be a lot more efficient.  */
-	subs	a3, a3, #0
-	beq	2f
-1:	strb	a2, [a1]
-	subs	a3, a3, #1
-	add	a1, a1, #1
-	bne	1b
-2:	
-	/* Nothing to left to clear.  */
-#endif
-
-#if defined(__thumb__) && !defined(__thumb2__)	/* Enter Thumb mode. */
-	add	a4, pc, #1	/* Get the address of the Thumb block.  */
-	bx	a4		/* Go there and start Thumb decoding.   */
-
-	.code 16
-	.global __change_mode
-	.thumb_func
-__change_mode:	
-#endif
-
-#ifndef	GCRT0
-	bl	SYM_NAME(memset)
-#endif
-	bl	SYM_NAME(__get_memtop)
-	sub	r0, r0, #32
-	mov	sp, r0
-
-#ifdef __USES_INITFINI__
-	/* Some arm/elf targets use the .init and .fini sections
-	   to create constructors and destructors, and for these
-	   targets we need to call the _init function and arrange
-	   for _fini to be called at program exit.  */
-	ldr	r0, .Lfini
-	bl	SYM_NAME (atexit)
-	bl	SYM_NAME (_init)
-#endif	
-
-	mov 	a1, #0
-	ldr	a2, .LC3
-	mov	a3, a2
-	bl	SYM_NAME(main)
-    1:	bl	SYM_NAME(exit)
-	b	1b
-	.align	2
-.LC1:
-	.word	__bss_start__
-.LC2:
-	.word	__bss_end__
-.LC3:
-	.word	0
-#ifdef __USES_INITFINI__
-.Lfini:
-	.word	SYM_NAME(_fini)
-#endif
-#if 0
-#ifdef __thumb__
-	.code 16
-#endif
-	.global SYM_NAME(__syscall)
-#ifdef __thumb__
-        .thumb_func
-#else
-	.align  4
-#endif
-SYM_NAME(__syscall):
-	mov	r12, lr
-#ifdef __thumb__
-	swi	0x18
-#else
-	swi	0x180001
-#endif
-	mov	pc, r12
-#endif
diff --git a/libgloss/arm/redboot-syscalls.c b/libgloss/arm/redboot-syscalls.c
deleted file mode 100644
index 3b5a02b..0000000
--- a/libgloss/arm/redboot-syscalls.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * redboot-syscalls.c -- provide system call support for RedBoot
- *
- * Copyright (c) 1997, 2001, 2002 Red Hat, Inc.
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- *
- */
-
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/times.h>
-#include <errno.h>
-#include "syscall.h"
-
-// Use "naked" attribute to suppress C prologue/epilogue
-static int __attribute__ ((naked)) __syscall(int func_no, ...)
-{
-    asm ("mov	r12, lr\n");
-#ifdef __thumb__
-    asm ("swi 0x18\n");
-#else
-    asm ("swi 0x180001\n");
-#endif
-    asm ("mov	pc, r12\n");
-}
-
-int
-_close(int fd)
-{
-    int  err;
-    err = __syscall(SYS_close, fd);
-    if (err<0)
-      {
-        errno = -err;
-        return -1;
-      }
-    return err;
-}
-
-
-void
-_exit(int stat)
-{
-    while (1)
-        __syscall(SYS_exit, stat);
-}
-
-
-int
-_stat (const char *filename, struct stat *st)
-{
-    int err;
-    err = __syscall(SYS_stat, filename, st);
-    if (err<0)
-      {
-        errno = -err;
-        return -1;
-      }
-    return err;
-}
-
-int
-_fstat (int file, struct stat *st)
-{
-    int err;
-    err = __syscall(SYS_fstat, file, st);
-    if (err<0)
-      {
-        errno = -err;
-        return -1;
-      }
-    return err;
-}
-
-int
-_getpid(void)
-{
-    return 1;
-}
-
-
-int
-_gettimeofday (void * tp, void * tzp)
-{
-    int err;
-    err = __syscall(SYS_gettimeofday, tp, tzp);
-    if (err<0)
-      {
-        errno = -err;
-        return -1;
-      }
-    return err;
-}
-
-
-int
-isatty(int fd)
-{
-    int err;
-    err = __syscall(SYS_isatty, fd);
-    if (err<0)
-      {
-        errno = -err;
-        return -1;
-      }
-    return err;
-}
-
-
-int
-_kill(int pid, int sig)
-{
-  if(pid == 1)
-    _exit(sig);
-  return 0;
-}
-
-
-off_t
-_lseek(int fd, off_t offset, int whence)
-{
-    int err;
-    err = __syscall(SYS_lseek, fd, offset, whence);
-    if (err<0)
-      {
-        errno = -err;
-        return (off_t)-1;
-      }
-    return err;
-}
-
-
-int
-_open(const char *buf, int flags, int mode)
-{
-    int err ;
-    err = __syscall(SYS_open, buf, flags, mode);
-    if (err<0)
-      {
-        errno = -err;
-        return -1;
-      }
-    return err;
-}
-
-
-int
-_write(int fd, const char *buf, int nbytes)
-{
-    int err;
-
-    err = __syscall(SYS_write, fd, buf, nbytes);
-    if (err<0)
-      {
-        errno = -err;
-        return -1;
-      }
-    return err;
-}
-
-
-void
-print(char *ptr)
-{
-  char *p = ptr;
-
-  while (*p != '\0')
-    p++;
-
-  _write (1, ptr, p-ptr);
-}
-
-void
-_raise (void)
-{
-    return;
-}
-
-
-int
-_read(int fd, char *buf, int nbytes)
-{
-    int err;
-    err = __syscall(SYS_read, fd, buf, nbytes);
-    if (err<0)
-      {
-        errno = -err;
-        return -1;
-      }
-    return err;
-}
-
-
-extern char end[];                /* end is set in the linker command file */
-
-char *heap_ptr;
-
-char *
-_sbrk (int nbytes)
-{
-    char        *base;
-
-    if (!heap_ptr)
-	heap_ptr = (char *)&end;
-    base = heap_ptr;
-    heap_ptr += nbytes;
-
-    return base;
-}
-
-
-clock_t
-_times(struct tms * tp)
-{
-    clock_t utime;
-    int err;
-    err = __syscall(SYS_times, &utime);
-    if (err)
-	utime = 0;
-
-    if (tp) {
-	tp->tms_utime = utime;
-	tp->tms_stime = 0;
-	tp->tms_cutime = 0;
-	tp->tms_cstime = 0;
-    }
-
-    return utime;
-}
-
-int
-_rename (const char *oldpath, const char *newpath)
-{
-    int err ;
-    err = __syscall(SYS_rename, oldpath, newpath);
-    if (err<0)
-      {
-        errno = -err;
-        return -1;
-      }
-    return err;
-}
-
-int
-_unlink (const char *pathname)
-{
-    int err ;
-    err = __syscall(SYS_unlink, pathname);
-    if (err<0)
-      {
-        errno = -err;
-        return -1;
-      }
-    return err;
-}
-
-int
-_system (const char *command)
-{
-    int err ;
-    err = __syscall(SYS_system, command);
-    return err;
-}
-
-#define SYS_meminfo     1001
-
-void *
-__get_memtop(void)
-{
-  unsigned long totmem = 0, topmem = 0;
-  int numbanks;
-
-  __syscall(SYS_meminfo, (unsigned long)&totmem, (unsigned long)&topmem, 0);
-  return (void*)topmem;
-}
diff --git a/libgloss/arm/swi.h b/libgloss/arm/swi.h
deleted file mode 100644
index f5c9103..0000000
--- a/libgloss/arm/swi.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* SWI numbers for RDP (Demon) monitor.  */
-#define SWI_WriteC                 0x0
-#define SWI_Write0                 0x2
-#define SWI_ReadC                  0x4
-#define SWI_CLI                    0x5
-#define SWI_GetEnv                 0x10
-#define SWI_Exit                   0x11
-#define SWI_EnterOS                0x16
-
-#define SWI_GetErrno               0x60
-#define SWI_Clock                  0x61
-#define SWI_Time                   0x63
-#define SWI_Remove                 0x64
-#define SWI_Rename                 0x65
-#define SWI_Open                   0x66
-
-#define SWI_Close                  0x68
-#define SWI_Write                  0x69
-#define SWI_Read                   0x6a
-#define SWI_Seek                   0x6b
-#define SWI_Flen                   0x6c
-
-#define SWI_IsTTY                  0x6e
-#define SWI_TmpNam                 0x6f
-#define SWI_InstallHandler         0x70
-#define SWI_GenerateError          0x71
-
-
-/* Now the SWI numbers and reason codes for RDI (Angel) monitors.  */
-#define AngelSWI_ARM 			0x123456
-#ifdef __thumb__
-#define AngelSWI 			0xAB
-#else
-#define AngelSWI 			AngelSWI_ARM
-#endif
-/* For Thumb-2 code use the BKPT instruction instead of SWI.  */
-#ifdef __thumb2__
-#define AngelSWIInsn			"bkpt"
-#define AngelSWIAsm			bkpt
-#else
-#define AngelSWIInsn			"swi"
-#define AngelSWIAsm			swi
-#endif
-
-/* The reason codes:  */
-#define AngelSWI_Reason_Open		0x01
-#define AngelSWI_Reason_Close		0x02
-#define AngelSWI_Reason_WriteC		0x03
-#define AngelSWI_Reason_Write0		0x04
-#define AngelSWI_Reason_Write		0x05
-#define AngelSWI_Reason_Read		0x06
-#define AngelSWI_Reason_ReadC		0x07
-#define AngelSWI_Reason_IsTTY		0x09
-#define AngelSWI_Reason_Seek		0x0A
-#define AngelSWI_Reason_FLen		0x0C
-#define AngelSWI_Reason_TmpNam		0x0D
-#define AngelSWI_Reason_Remove		0x0E
-#define AngelSWI_Reason_Rename		0x0F
-#define AngelSWI_Reason_Clock		0x10
-#define AngelSWI_Reason_Time		0x11
-#define AngelSWI_Reason_System		0x12
-#define AngelSWI_Reason_Errno		0x13
-#define AngelSWI_Reason_GetCmdLine 	0x15
-#define AngelSWI_Reason_HeapInfo 	0x16
-#define AngelSWI_Reason_EnterSVC 	0x17
-#define AngelSWI_Reason_ReportException 0x18
-#define ADP_Stopped_ApplicationExit 	((2 << 16) + 38)
-#define ADP_Stopped_RunTimeError 	((2 << 16) + 35)
diff --git a/libgloss/arm/syscall.h b/libgloss/arm/syscall.h
deleted file mode 100644
index 759801f..0000000
--- a/libgloss/arm/syscall.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* General use syscall.h file.
-   The more ports that use this file, the simpler sim/common/nltvals.def
-   remains.  */
-
-#ifndef LIBGLOSS_SYSCALL_H
-#define LIBGLOSS_SYSCALL_H
-
-/* Note: This file may be included by assembler source.  */
-
-/* These should be as small as possible to allow a port to use a trap type
-   instruction, which the system call # as the trap (the d10v for instance
-   supports traps 0..31).  An alternative would be to define one trap for doing
-   system calls, and put the system call number in a register that is not used
-   for the normal calling sequence (so that you don't have to shift down the
-   arguments to add the system call number).  Obviously, if these system call
-   numbers are ever changed, all of the simulators and potentially user code
-   will need to be updated.  */
-
-/* There is no current need for the following: SYS_execv, SYS_creat, SYS_wait,
-   etc. etc.  Don't add them.  */
-
-/* These are required by the ANSI C part of newlib (excluding system() of
-   course).  */
-#define	SYS_exit	1
-#define	SYS_open	2
-#define	SYS_close	3
-#define	SYS_read	4
-#define	SYS_write	5
-#define	SYS_lseek	6
-#define	SYS_unlink	7
-#define	SYS_getpid	8
-#define	SYS_kill	9
-#define SYS_fstat       10
-/*#define SYS_sbrk	11 - not currently a system call, but reserved.  */
-
-/* ARGV support.  */
-#define SYS_argvlen	12
-#define SYS_argv	13
-
-/* These are extras added for one reason or another.  */
-#define SYS_chdir	 14
-#define SYS_stat	 15
-#define SYS_chmod 	 16
-#define SYS_utime 	 17
-#define SYS_time 	 18
-#define SYS_gettimeofday 19
-#define SYS_times	 20
-#define SYS_link	 21
-/* These are additional syscalls in RedBoot. */
-#define SYS_rename       3001
-#define SYS_isatty       3002
-#define SYS_system       3003
-
-#endif
diff --git a/libgloss/arm/syscalls.c b/libgloss/arm/syscalls.c
deleted file mode 100644
index a6d2f74..0000000
--- a/libgloss/arm/syscalls.c
+++ /dev/null
@@ -1,663 +0,0 @@
-/* Support files for GNU libc.  Files in the system namespace go here.
-   Files in the C namespace (ie those that do not start with an
-   underscore) go in .c.  */
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <errno.h>
-#include <reent.h>
-#include <unistd.h>
-#include "swi.h"
-
-/* Forward prototypes.  */
-int     _system     _PARAMS ((const char *));
-int     _rename     _PARAMS ((const char *, const char *));
-int     _isatty		_PARAMS ((int));
-clock_t _times		_PARAMS ((struct tms *));
-int     _gettimeofday	_PARAMS ((struct timeval *, struct timezone *));
-int     _unlink		_PARAMS ((const char *));
-int     _link 		_PARAMS ((void));
-int     _stat 		_PARAMS ((const char *, struct stat *));
-int     _fstat 		_PARAMS ((int, struct stat *));
-caddr_t _sbrk		_PARAMS ((int));
-int     _getpid		_PARAMS ((int));
-int     _kill		_PARAMS ((int, int));
-void    _exit		_PARAMS ((int));
-int     _close		_PARAMS ((int));
-clock_t _clock		_PARAMS ((void));
-int     _swiclose	_PARAMS ((int));
-int     _open		_PARAMS ((const char *, int, ...));
-int     _swiopen	_PARAMS ((const char *, int));
-int     _write 		_PARAMS ((int, char *, int));
-int     _swiwrite	_PARAMS ((int, char *, int));
-int     _lseek		_PARAMS ((int, int, int));
-int     _swilseek	_PARAMS ((int, int, int));
-int     _read		_PARAMS ((int, char *, int));
-int     _swiread	_PARAMS ((int, char *, int));
-void    initialise_monitor_handles _PARAMS ((void));
-
-static int	wrap		_PARAMS ((int));
-static int	error		_PARAMS ((int));
-static int	get_errno	_PARAMS ((void));
-static int	remap_handle	_PARAMS ((int));
-static int	do_AngelSWI	_PARAMS ((int, void *));
-static int 	findslot	_PARAMS ((int));
-
-/* Register name faking - works in collusion with the linker.  */
-register char * stack_ptr asm ("sp");
-
-
-/* following is copied from libc/stdio/local.h to check std streams */
-extern void   _EXFUN(__sinit,(struct _reent *));
-#define CHECK_INIT(ptr) \
-  do						\
-    {						\
-      if ((ptr) && !(ptr)->__sdidinit)		\
-	__sinit (ptr);				\
-    }						\
-  while (0)
-
-/* Adjust our internal handles to stay away from std* handles.  */
-#define FILE_HANDLE_OFFSET (0x20)
-
-static int monitor_stdin;
-static int monitor_stdout;
-static int monitor_stderr;
-
-/* Struct used to keep track of the file position, just so we
-   can implement fseek(fh,x,SEEK_CUR).  */
-typedef struct
-{
-  int handle;
-  int pos;
-}
-poslog;
-
-#define MAX_OPEN_FILES 20
-static poslog openfiles [MAX_OPEN_FILES];
-
-static int
-findslot (int fh)
-{
-  int i;
-  for (i = 0; i < MAX_OPEN_FILES; i ++)
-    if (openfiles[i].handle == fh)
-      break;
-  return i;
-}
-
-#ifdef ARM_RDI_MONITOR
-
-static inline int
-do_AngelSWI (int reason, void * arg)
-{
-  int value;
-  asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0"
-       : "=r" (value) /* Outputs */
-       : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */
-       : "r0", "r1", "r2", "r3", "ip", "lr", "memory", "cc"
-		/* Clobbers r0 and r1, and lr if in supervisor mode */);
-                /* Accordingly to page 13-77 of ARM DUI 0040D other registers
-                   can also be clobbered.  Some memory positions may also be
-                   changed by a system call, so they should not be kept in
-                   registers. Note: we are assuming the manual is right and
-                   Angel is respecting the APCS.  */
-  return value;
-}
-#endif /* ARM_RDI_MONITOR */
-
-/* Function to convert std(in|out|err) handles to internal versions.  */
-static int
-remap_handle (int fh)
-{
-  CHECK_INIT(_REENT);
-
-  if (fh == STDIN_FILENO)
-    return monitor_stdin;
-  if (fh == STDOUT_FILENO)
-    return monitor_stdout;
-  if (fh == STDERR_FILENO)
-    return monitor_stderr;
-
-  return fh - FILE_HANDLE_OFFSET;
-}
-
-void
-initialise_monitor_handles (void)
-{
-  int i;
-  
-  /* Open the standard file descriptors by opening the special
-   * teletype device, ":tt", read-only to obtain a descritpor for
-   * standard input and write-only to obtain a descriptor for standard
-   * output. Finally, open ":tt" in append mode to obtain a descriptor
-   * for standard error. Since this is a write mode, most kernels will
-   * probably return the same value as for standard output, but the
-   * kernel can differentiate the two using the mode flag and return a
-   * different descriptor for standard error.
-   */
-
-#ifdef ARM_RDI_MONITOR
-  int volatile block[3];
-  
-  block[0] = (int) ":tt";
-  block[2] = 3;     /* length of filename */
-  block[1] = 0;     /* mode "r" */
-  monitor_stdin = do_AngelSWI (AngelSWI_Reason_Open, (void *) block);
-
-  block[0] = (int) ":tt";
-  block[2] = 3;     /* length of filename */
-  block[1] = 4;     /* mode "w" */
-  monitor_stdout = do_AngelSWI (AngelSWI_Reason_Open, (void *) block);
-
-  block[0] = (int) ":tt";
-  block[2] = 3;     /* length of filename */
-  block[1] = 8;     /* mode "a" */
-  monitor_stderr = do_AngelSWI (AngelSWI_Reason_Open, (void *) block);
-#else
-  int fh;
-  const char * name;
-
-  name = ":tt";
-  asm ("mov r0,%2; mov r1, #0; swi %a1; mov %0, r0"
-       : "=r"(fh)
-       : "i" (SWI_Open),"r"(name)
-       : "r0","r1");
-  monitor_stdin = fh;
-
-  name = ":tt";
-  asm ("mov r0,%2; mov r1, #4; swi %a1; mov %0, r0"
-       : "=r"(fh)
-       : "i" (SWI_Open),"r"(name)
-       : "r0","r1");
-  monitor_stdout = fh;
-
-  name = ":tt";
-  asm ("mov r0,%2; mov r1, #8; swi %a1; mov %0, r0"
-       : "=r"(fh)
-       : "i" (SWI_Open),"r"(name)
-       : "r0","r1");
-  monitor_stderr = fh;
-#endif
-
-  for (i = 0; i < MAX_OPEN_FILES; i ++)
-    openfiles[i].handle = -1;
-
-  openfiles[0].handle = monitor_stdin;
-  openfiles[0].pos = 0;
-  openfiles[1].handle = monitor_stdout;
-  openfiles[1].pos = 0;
-  openfiles[2].handle = monitor_stderr;
-  openfiles[2].pos = 0;
-}
-
-static int
-get_errno (void)
-{
-#ifdef ARM_RDI_MONITOR
-  return do_AngelSWI (AngelSWI_Reason_Errno, NULL);
-#else
-  register r0 asm("r0");
-  asm ("swi %a1" : "=r"(r0) : "i" (SWI_GetErrno));
-  return r0;
-#endif
-}
-
-static int
-error (int result)
-{
-  errno = get_errno ();
-  return result;
-}
-
-static int
-wrap (int result)
-{
-  if (result == -1)
-    return error (-1);
-  return result;
-}
-
-/* Returns # chars not! written.  */
-int
-_swiread (int file,
-	  char * ptr,
-	  int len)
-{
-  int fh = remap_handle (file);
-#ifdef ARM_RDI_MONITOR
-  int block[3];
-  
-  block[0] = fh;
-  block[1] = (int) ptr;
-  block[2] = len;
-  
-  return do_AngelSWI (AngelSWI_Reason_Read, block);
-#else
-  asm ("mov r0, %1; mov r1, %2;mov r2, %3; swi %a0"
-       : /* No outputs */
-       : "i"(SWI_Read), "r"(fh), "r"(ptr), "r"(len)
-       : "r0","r1","r2");
-#endif
-}
-
-int
-_read (int file,
-       char * ptr,
-       int len)
-{
-  int slot = findslot (remap_handle (file));
-  int x = _swiread (file, ptr, len);
-
-  if (x < 0)
-    return error (-1);
-
-  if (slot != MAX_OPEN_FILES)
-    openfiles [slot].pos += len - x;
-
-  /* x == len is not an error, at least if we want feof() to work.  */
-  return len - x;
-}
-
-int
-_swilseek (int file,
-	   int ptr,
-	   int dir)
-{
-  int res;
-  int fh = remap_handle (file);
-  int slot = findslot (fh);
-#ifdef ARM_RDI_MONITOR
-  int block[2];
-#endif
-
-  if (dir == SEEK_CUR)
-    {
-      if (slot == MAX_OPEN_FILES)
-	return -1;
-      ptr = openfiles[slot].pos + ptr;
-      dir = SEEK_SET;
-    }
-  
-#ifdef ARM_RDI_MONITOR
-  if (dir == SEEK_END)
-    {
-      block[0] = fh;
-      ptr += do_AngelSWI (AngelSWI_Reason_FLen, block);
-    }
-  
-  /* This code only does absolute seeks.  */
-  block[0] = remap_handle (file);
-  block[1] = ptr;
-  res = do_AngelSWI (AngelSWI_Reason_Seek, block);
-#else
-  if (dir == SEEK_END)
-    {
-      asm ("mov r0, %2; swi %a1; mov %0, r0"
-	   : "=r" (res)
-	   : "i" (SWI_Flen), "r" (fh)
-	   : "r0");
-      ptr += res;
-    }
-
-  /* This code only does absolute seeks.  */
-  asm ("mov r0, %2; mov r1, %3; swi %a1; mov %0, r0"
-       : "=r" (res)
-       : "i" (SWI_Seek), "r" (fh), "r" (ptr)
-       : "r0", "r1");
-#endif
-
-  if (slot != MAX_OPEN_FILES && res == 0)
-    openfiles[slot].pos = ptr;
-
-  /* This is expected to return the position in the file.  */
-  return res == 0 ? ptr : -1;
-}
-
-int
-_lseek (int file,
-	int ptr,
-	int dir)
-{
-  return wrap (_swilseek (file, ptr, dir));
-}
-
-/* Returns #chars not! written.  */
-int
-_swiwrite (
-	   int    file,
-	   char * ptr,
-	   int    len)
-{
-  int fh = remap_handle (file);
-#ifdef ARM_RDI_MONITOR
-  int block[3];
-  
-  block[0] = fh;
-  block[1] = (int) ptr;
-  block[2] = len;
-  
-  return do_AngelSWI (AngelSWI_Reason_Write, block);
-#else
-  asm ("mov r0, %1; mov r1, %2;mov r2, %3; swi %a0"
-       : /* No outputs */
-       : "i"(SWI_Write), "r"(fh), "r"(ptr), "r"(len)
-       : "r0","r1","r2");
-#endif
-}
-
-int
-_write (int    file,
-	char * ptr,
-	int    len)
-{
-  int slot = findslot (remap_handle (file));
-  int x = _swiwrite (file, ptr,len);
-
-  if (x == -1 || x == len)
-    return error (-1);
-  
-  if (slot != MAX_OPEN_FILES)
-    openfiles[slot].pos += len - x;
-  
-  return len - x;
-}
-
-int
-_swiopen (const char * path,
-	  int          flags)
-{
-  int aflags = 0, fh;
-#ifdef ARM_RDI_MONITOR
-  int block[3];
-#endif
-  
-  int i = findslot (-1);
-  
-  if (i == MAX_OPEN_FILES)
-    return -1;
-
-  /* The flags are Unix-style, so we need to convert them.  */
-#ifdef O_BINARY
-  if (flags & O_BINARY)
-    aflags |= 1;
-#endif
-
-  if (flags & O_RDWR)
-    aflags |= 2;
-
-  if (flags & O_CREAT)
-    aflags |= 4;
-
-  if (flags & O_TRUNC)
-    aflags |= 4;
-
-  if (flags & O_APPEND)
-    {
-      aflags &= ~4;     /* Can't ask for w AND a; means just 'a'.  */
-      aflags |= 8;
-    }
-  
-#ifdef ARM_RDI_MONITOR
-  block[0] = (int) path;
-  block[2] = strlen (path);
-  block[1] = aflags;
-  
-  fh = do_AngelSWI (AngelSWI_Reason_Open, block);
-  
-#else
-  asm ("mov r0,%2; mov r1, %3; swi %a1; mov %0, r0"
-       : "=r"(fh)
-       : "i" (SWI_Open),"r"(path),"r"(aflags)
-       : "r0","r1");
-#endif
-  
-  if (fh >= 0)
-    {
-      openfiles[i].handle = fh;
-      openfiles[i].pos = 0;
-    }
-
-  return fh >= 0 ? fh + FILE_HANDLE_OFFSET : error (fh);
-}
-
-int
-_open (const char * path,
-       int          flags,
-       ...)
-{
-  return wrap (_swiopen (path, flags));
-}
-
-int
-_swiclose (int file)
-{
-  int myhan = remap_handle (file);
-  int slot = findslot (myhan);
-  
-  if (slot != MAX_OPEN_FILES)
-    openfiles[slot].handle = -1;
-
-#ifdef ARM_RDI_MONITOR
-  return do_AngelSWI (AngelSWI_Reason_Close, & myhan);
-#else
-  asm ("mov r0, %1; swi %a0" :: "i" (SWI_Close),"r"(myhan):"r0");
-#endif
-}
-
-int
-_close (int file)
-{
-  return wrap (_swiclose (file));
-}
-
-int
-_kill (int pid, int sig)
-{
-  (void)pid; (void)sig;
-#ifdef ARM_RDI_MONITOR
-  /* Note: Both arguments are thrown away.  */
-  return do_AngelSWI (AngelSWI_Reason_ReportException,
-		      (void *) ADP_Stopped_ApplicationExit);
-#else
-  asm ("swi %a0" :: "i" (SWI_Exit));
-#endif
-}
-
-void
-_exit (int status)
-{
-  /* There is only one SWI for both _exit and _kill. For _exit, call
-     the SWI with the second argument set to -1, an invalid value for
-     signum, so that the SWI handler can distinguish the two calls.
-     Note: The RDI implementation of _kill throws away both its
-     arguments.  */
-  _kill(status, -1);
-}
-
-int __attribute__((weak))
-_getpid (int n)
-{
-  return 1;
-  n = n;
-}
-
-caddr_t
-_sbrk (int incr)
-{
-  extern char   end asm ("end");	/* Defined by the linker.  */
-  static char * heap_end;
-  char *        prev_heap_end;
-
-  if (heap_end == NULL)
-    heap_end = & end;
-  
-  prev_heap_end = heap_end;
-  
-  if (heap_end + incr > stack_ptr)
-    {
-      /* Some of the libstdc++-v3 tests rely upon detecting
-	 out of memory errors, so do not abort here.  */
-#if 0
-      extern void abort (void);
-
-      _write (1, "_sbrk: Heap and stack collision\n", 32);
-      
-      abort ();
-#else
-      errno = ENOMEM;
-      return (caddr_t) -1;
-#endif
-    }
-  
-  heap_end += incr;
-
-  return (caddr_t) prev_heap_end;
-}
-
-int __attribute__((weak))
-_fstat (int file, struct stat * st)
-{
-  memset (st, 0, sizeof (* st));
-  st->st_mode = S_IFCHR;
-  st->st_blksize = 1024;
-  return 0;
-  file = file;
-}
-
-int __attribute__((weak))
-_stat (const char *fname, struct stat *st)
-{
-  int file;
-
-  /* The best we can do is try to open the file readonly.  If it exists,
-     then we can guess a few things about it.  */
-  if ((file = _open (fname, O_RDONLY)) < 0)
-    return -1;
-
-  memset (st, 0, sizeof (* st));
-  st->st_mode = S_IFREG | S_IREAD;
-  st->st_blksize = 1024;
-  _swiclose (file); /* Not interested in the error.  */
-  return 0;
-}
-
-int __attribute__((weak))
-_link (void)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-_unlink (const char *path)
-{
-#ifdef ARM_RDI_MONITOR
-  return do_AngelSWI (AngelSWI_Reason_Remove, &path);
-#else
-  (void)path;
-  asm ("swi %a0" :: "i" (SWI_Remove));
-#endif
-}
-
-int
-_gettimeofday (struct timeval * tp, struct timezone * tzp)
-{
-
-  if (tp)
-    {
-    /* Ask the host for the seconds since the Unix epoch.  */
-#ifdef ARM_RDI_MONITOR
-      tp->tv_sec = do_AngelSWI (AngelSWI_Reason_Time,NULL);
-#else
-      {
-        int value;
-        asm ("swi %a1; mov %0, r0" : "=r" (value): "i" (SWI_Time) : "r0");
-        tp->tv_sec = value;
-      }
-#endif
-      tp->tv_usec = 0;
-    }
-
-  /* Return fixed data for the timezone.  */
-  if (tzp)
-    {
-      tzp->tz_minuteswest = 0;
-      tzp->tz_dsttime = 0;
-    }
-
-  return 0;
-}
-
-/* Return a clock that ticks at 100Hz.  */
-clock_t 
-_clock (void)
-{
-  clock_t timeval;
-
-#ifdef ARM_RDI_MONITOR
-  timeval = do_AngelSWI (AngelSWI_Reason_Clock,NULL);
-#else
-  asm ("swi %a1; mov %0, r0" : "=r" (timeval): "i" (SWI_Clock) : "r0");
-#endif
-  return timeval;
-}
-
-/* Return a clock that ticks at 100Hz.  */
-clock_t
-_times (struct tms * tp)
-{
-  clock_t timeval = _clock();
-
-  if (tp)
-    {
-      tp->tms_utime  = timeval;	/* user time */
-      tp->tms_stime  = 0;	/* system time */
-      tp->tms_cutime = 0;	/* user time, children */
-      tp->tms_cstime = 0;	/* system time, children */
-    }
-  
-  return timeval;
-};
-
-
-int
-_isatty (int fd)
-{
-#ifdef ARM_RDI_MONITOR
-  return do_AngelSWI (AngelSWI_Reason_IsTTY, &fd);
-#else
-  (void)fd;
-  asm ("swi %a0" :: "i" (SWI_IsTTY));
-#endif
-}
-
-int
-_system (const char *s)
-{
-#ifdef ARM_RDI_MONITOR
-  return do_AngelSWI (AngelSWI_Reason_System, &s);
-#else
-  (void)s;
-  asm ("swi %a0" :: "i" (SWI_CLI));
-#endif
-}
-
-int
-_rename (const char * oldpath, const char * newpath)
-{
-#ifdef ARM_RDI_MONITOR
-  const char *block[2] = {oldpath, newpath};
-  return do_AngelSWI (AngelSWI_Reason_Rename, block);
-#else
-  (void)oldpath; (void)newpath;
-  asm ("swi %a0" :: "i" (SWI_Rename));
-#endif
-}
diff --git a/libgloss/arm/trap.S b/libgloss/arm/trap.S
deleted file mode 100644
index 21b6937..0000000
--- a/libgloss/arm/trap.S
+++ /dev/null
@@ -1,95 +0,0 @@
-        /* Run-time exception support */
-#if !defined(__thumb2__)
-#include "swi.h"
-
-/* .text is used instead of .section .text so it works with arm-aout too.  */
-	.text
-        .align 0
-        .global __rt_stkovf_split_big
-        .global __rt_stkovf_split_small
-
-/* The following functions are provided for software stack checking.
-   If hardware stack-checking is being used then the code can be
-   compiled without the PCS entry checks, and simply rely on VM
-   management to extend the stack for a thread.
-
-   The stack extension event occurs when the PCS function entry code
-   would result in a stack-pointer beneath the stack-limit register
-   value.  The system relies on the following map:
-
-        +-----------------------------------+ <-- end of stack block
-        | ...                               |
-        | ...                               |
-        | active stack                      |
-        | ...                               | <-- sp (stack-pointer) somewhere in here
-        | ...                               |
-        +-----------------------------------+ <-- sl (stack-limit)
-        | stack-extension handler workspace |
-        +-----------------------------------+ <-- base of stack block
-
-   The "stack-extension handler workspace" is an amount of memory in
-   which the stack overflow support code must execute.  It must be
-   large enough to deal with the worst case path through the extension
-   code.  At the moment the compiler expects this to be AT LEAST
-   256bytes.  It uses this fact to code functions with small local
-   data usage within the overflow space.
-
-   In a true target environment We may need to increase the space
-   between sl and the true limit to allow for the stack extension
-   code, SWI handlers and for undefined instruction handlers of the
-   target environment.  */
-
-__rt_stkovf_split_small:
-        mov     ip,sp   @ Ensure we can calculate the stack required
-        @ and fall through to...
-__rt_stkovf_split_big:
-        @ in:   sp = current stack-pointer (beneath stack-limit)
-        @       sl = current stack-limit
-        @       ip = low stack point we require for the current function
-        @       lr = return address into the current function
-        @       fp = frame-pointer
-        @               original sp --> +----------------------------------+
-        @                               | pc (12 ahead of PCS entry store) |
-        @               current fp ---> +----------------------------------+
-        @                               | lr (on entry) pc (on exit)       |
-        @                               +----------------------------------+
-        @                               | sp ("original sp" on entry)      |
-        @                               +----------------------------------+
-        @                               | fp (on entry to function)        |
-        @                               +----------------------------------+
-        @                               |                                  |
-        @                               | ..argument and work registers..  |
-        @                               |                                  |
-        @               current sp ---> +----------------------------------+
-        @
-        @ The "current sl" is somewhere between "original sp" and "current sp"
-        @ but above "true sl". The "current sl" should be at least 256bytes
-        @ above the "true sl". The 256byte stack guard should be large enough
-        @ to deal with the worst case function entry stacking (160bytes) plus
-        @ the stack overflow handler stacking requirements, plus the stack
-        @ required for the memory allocation routines.
-        @
-        @ Normal PCS entry (before stack overflow check) can stack 16
-        @ standard registers (64bytes) and 8 floating point registers
-        @ (96bytes). This gives a minimum stack guard of 160bytes (excluding
-        @ the stack required for the code). (Actually only a maximum of
-        @ 14standard registers are ever stacked on entry to a function).
-        @
-        @ NOTE: Structure returns are performed by the caller allocating a
-        @       dummy space on the stack and passing in a "phantom" arg1 into
-        @       the function. This means that we do not need to worry about
-        @       preserving the stack under "sp" even on function return.
-        @ 
-        @        Code should never poke values beneath sp. The sp register
-        @        should always be "dropped" first to cover the data. This
-        @        protects the data against any events that may try and use
-        @        the stack.
-
-        SUB     ip, sp, ip      @ extra stack required for function
-        @ Add stack extension code here.  If desired a new stack chunk
-        @ can be allocated, and the register state updated suitably.
-
-        @ We now know how much extra stack the function requires.
-        @ Terminate the program for the moment:
-        swi     SWI_Exit
-#endif
diff --git a/libgloss/configure b/libgloss/configure
index 1b2f623..17845c9 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -28,6 +28,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -142,6 +143,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -312,6 +314,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -477,12 +484,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -567,7 +578,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:571: checking for a BSD compatible install" >&5
+echo "configure:582: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -648,7 +659,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:652: checking host system type" >&5
+echo "configure:663: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -669,7 +680,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:673: checking target system type" >&5
+echo "configure:684: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -687,7 +698,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:691: checking build system type" >&5
+echo "configure:702: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -717,15 +728,12 @@ else
 fi
 
 case "${target}" in
-  i[3456]86-*-elf*|i[3456]86-*-coff*)
+  i386-*-elf*)
 	configdirs="${configdirs} i386 testsuite";
 	;;
   m32r-*-*)
 	configdirs="${configdirs} m32r testsuite"
 	;;
-  m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
-	configdirs="m68hc11 testsuite"
-	;;
   m68*-*-*)
 	configdirs="${configdirs} m68k testsuite"
 	;;
@@ -753,9 +761,6 @@ case "${target}" in
   *arm-wince-pe)
 	configdirs="wince"
 	;;
-  *arm-*-*)
-	configdirs="${configdirs} arm"
-	;;
   sh*-*-pe)
 	configdirs="wince"
 	;;
@@ -774,47 +779,15 @@ case "${target}" in
   mn10300-*-*)
 	configdirs="${configdirs} mn10300 testsuite"
 	;;
-  cris-*-* | crisv32-*-*)
-	configdirs="${configdirs} cris testsuite"
-	;;
-  crx-*-*)
-	configdirs="${configdirs} crx"
-	;;
   d30v-*-*)
 	configdirs="${configdirs} d30v testsuite"
 	;;
   fr30-*-*)
 	configdirs="${configdirs} fr30 testsuite"
 	;;
-  frv*-*-*)
-	configdirs="${configdirs} frv testsuite"
-	;;
   mcore-*-*)
 	configdirs="${configdirs} mcore testsuite"
 	;;
-  mt-*-*)
-        configdirs="${configdirs} mt testsuite";;
-  xstormy16-*-*)
-	configdirs="${configdirs} xstormy16 testsuite"
-	;;
-  m32c-*-*)
-	configdirs="${configdirs} m32c testsuite"
-	;;
-  strongarm-*-elf | strongarm-*-coff)
-	configdirs="${configdirs} arm testsuite";
-	;;
-  arm*-*-elf | arm*-*-coff)
-	configdirs="${configdirs} arm testsuite";
-	;;
-  ep9312-*-elf | ep9312-*-coff)
-	configdirs="${configdirs} arm testsuite";
-	;;
-  xscale-*-elf | xscale-*-coff)
-	configdirs="${configdirs} arm testsuite";
-	;;
-  iq2000-*-*)
-	configdirs="${configdirs} iq2000 testsuite";;
-
 esac
 
 # temporarily strip out testsuite
@@ -834,7 +807,7 @@ subdirs="$configdirs"
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:838: checking for $ac_word" >&5
+echo "configure:826: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -864,7 +837,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:868: checking for $ac_word" >&5
+echo "configure:856: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -913,7 +886,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:917: checking whether we are using GNU C" >&5
+echo "configure:905: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -922,7 +895,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -937,7 +910,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:941: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:929: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -969,7 +942,7 @@ AS=${AS-as}
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:973: checking for $ac_word" >&5
+echo "configure:961: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1003,7 +976,7 @@ LD=${LD-ld}
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1007: checking for $ac_word" >&5
+echo "configure:995: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/libgloss/configure.in b/libgloss/configure.in
index 3eca088..9d9edd0 100644
--- a/libgloss/configure.in
+++ b/libgloss/configure.in
@@ -28,15 +28,12 @@ else
 fi
 
 case "${target}" in
-  i[[3456]]86-*-elf*|i[[3456]]86-*-coff*)
+  i386-*-elf*)
 	configdirs="${configdirs} i386 testsuite";
 	;;
   m32r-*-*)
 	configdirs="${configdirs} m32r testsuite"
 	;;
-  m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
-	configdirs="m68hc11 testsuite"
-	;;
   m68*-*-*)
 	configdirs="${configdirs} m68k testsuite"
 	;;
@@ -64,9 +61,6 @@ case "${target}" in
   *arm-wince-pe)
 	configdirs="wince"
 	;;
-  *arm-*-*)
-	configdirs="${configdirs} arm"
-	;;
   sh*-*-pe)
 	configdirs="wince"
 	;;
@@ -85,47 +79,15 @@ case "${target}" in
   mn10300-*-*)
 	configdirs="${configdirs} mn10300 testsuite"
 	;;
-  cris-*-* | crisv32-*-*)
-	configdirs="${configdirs} cris testsuite"
-	;;
-  crx-*-*)
-	configdirs="${configdirs} crx"
-	;;
   d30v-*-*)
 	configdirs="${configdirs} d30v testsuite"
 	;;
   fr30-*-*)
 	configdirs="${configdirs} fr30 testsuite"
 	;;
-  frv*-*-*)
-	configdirs="${configdirs} frv testsuite"
-	;;
   mcore-*-*)
 	configdirs="${configdirs} mcore testsuite"
 	;;
-  mt-*-*)
-        configdirs="${configdirs} mt testsuite";;
-  xstormy16-*-*)
-	configdirs="${configdirs} xstormy16 testsuite"
-	;;
-  m32c-*-*)
-	configdirs="${configdirs} m32c testsuite"
-	;;
-  strongarm-*-elf | strongarm-*-coff)
-	configdirs="${configdirs} arm testsuite";
-	;;
-  arm*-*-elf | arm*-*-coff)
-	configdirs="${configdirs} arm testsuite";
-	;;
-  ep9312-*-elf | ep9312-*-coff)
-	configdirs="${configdirs} arm testsuite";
-	;;
-  xscale-*-elf | xscale-*-coff)
-	configdirs="${configdirs} arm testsuite";
-	;;
-  iq2000-*-*)
-	configdirs="${configdirs} iq2000 testsuite";;
-
 esac
 
 # temporarily strip out testsuite
diff --git a/libgloss/cris/Makefile.in b/libgloss/cris/Makefile.in
deleted file mode 100644
index ca3ec38..0000000
--- a/libgloss/cris/Makefile.in
+++ /dev/null
@@ -1,277 +0,0 @@
-#
-# libgloss Makefile.in for CRIS.  Copied and modified from mcore long ago.
-#
-
-DESTDIR =
-VPATH = @srcdir@
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-
-SHELL =	/bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-CFLAGS		= -g
-SCRIPTS		=
-
-OBJS = outbyte.o
-
-# Beware: GNU make construct used (shell call).  Since GCC at the time
-# of this writing requires GNU make >= 3.79.1, this should pose no
-# problem.
-SYSCALL_CFILES := $(shell sed -ne 's/^cat > \([^ ]*\).*/\1/p' < $(srcdir)/gensyscalls)
-
-# Here is all of the simulator stuff.
-# Actually, now it's just the GNU/Linux stuff, as that's also the
-# simulator ABI.  The name of the library is different, though.
-SIM_SCRIPTS	=
-SIM_LDFLAGS	=
-SIM_BSP		= libsyssim.a
-SIM_CRT0	= $(LIN_CRT0)
-SIM_OBJS	= $(LIN_OBJS)
-SIM_TEST	= sim-test
-SIM_INSTALL	= install-sim
-
-# Here is all of the GNU/Linux stuff.  At present we don't build newlib
-# and libgloss for cris*-linux-gnu*, but it's nice to keep that as an
-# option.
-LIN_PREFIX	=
-LIN_LDFLAGS	=
-LIN_BSP		= libsyslinux.a
-LIN_CRT0	= lcrt0.o
-LIN_EXTRA	= crti.o crtn.o crt1.o
-LIN_OBJS	= close.o execve.o exit.o fcntl.o fork.o fstat.o getpid.o \
- gettod.o isatty.o kill.o link.o lseek.o open.o read.o \
- rename.o sbrk.o stat.o times.o unlink.o wait.o write.o ${OBJS}
-LIN_SCRIPTS	=
-LIN_TEST	=
-LIN_INSTALL	= install-lin
-
-# In (over)due time, here will be all stuff necessary for a development
-# board.
-BSP_PREFIX	=
-BSP_LDFLAGS	=
-BSP_BSP		= libbsp.a
-BSP_CRT0	= crt0.o
-BSP_OBJS	= ${OBJS} setup.o
-BSP_SCRIPTS	=
-BSP_TEST	=
-BSP_INSTALL	= install-bsp
-
-ALL_INSTALL_FILES = \
- ${SIM_CRT0} ${SIM_EXTRA} ${SIM_BSP} \
- ${LIN_CRT0} ${LIN_EXTRA} ${LIN_BSP} \
- ${BSP_CRT0} ${BSP_EXTRA} ${BSP_BSP}
-
-ALL_INSTALL_FILES_NEWLIB_COPY = \
- $(sort ${ALL_INSTALL_FILES:%=$(objroot)/newlib/%}) $(objroot)/newlib/libnosys.a
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-# Need to augment the definition from host_makefile_frag above.
-INCLUDES += -I$(srcdir)
-
-all: ${ALL_INSTALL_FILES} ${ALL_INSTALL_FILES_NEWLIB_COPY} libnosys.a
-
-#
-# Here's where we build the board support packages for each target.
-#
-${SIM_BSP}: ${SIM_OBJS}
-	${AR} ${ARFLAGS} ${SIM_BSP} ${SIM_OBJS}
-	${RANLIB} ${SIM_BSP}
-
-${BSP_BSP}: ${BSP_OBJS}
-	${AR} ${ARFLAGS} ${BSP_BSP} ${BSP_OBJS}
-	${RANLIB} ${BSP_BSP}
-
-${LIN_BSP}: ${LIN_OBJS}
-	${AR} ${ARFLAGS} ${LIN_BSP} ${LIN_OBJS}
-	${RANLIB} ${LIN_BSP}
-
-# We need a link to libnosys.a in this directory, since this is the
-# directory used when test-compiling for configuration for other parts and
-# when running the testsuite.  By using a symbolic link, it does not
-# matter whether libnosys.a is built yet when the rule is executed.
-libnosys.a:
-	ln -s ../libnosys/libnosys.a
-
-# Toplevel build rules for various other libraries have gcc -B options
-# applied so the newlib build directory is reached, but not the target
-# libgloss directory (whose name is unknown to the toplevel configury
-# anyway).  Configury tests that check for a successful link therefore
-# fail; they can't find crt0.o and non-libc.a+libm.a libraries.  We copy
-# over all files we would install to the neighboring newlib directory.
-# Only the default crt0.o and libraries are needed, but we do them all for
-# completeness.  They're however installed from here, not from the newlib
-# build directory.
-$(objroot)/newlib/%: %
-	cp -p $^ $@
-
-# This rule, being more specific, overrides the pattern rule above.
-$(objroot)/newlib/libnosys.a:
-	ln -s ../libgloss/libnosys/libnosys.a $(objroot)/newlib
-
-#
-# Build a test program for each target board. Just trying to get
-# it to link is a good test, so we ignore all the errors for now.
-#
-#
-# Here's where we build the test programs for each target.
-#
-.PHONY: test
-test:	${SIM_TEST} ${BSP_TEST}
-
-sim-test:	sim-test.x sim-test.dis
-
-sim-test.x:	test.o ${SIM_CRT0} ${SIM_BSP}
-	${CC} ${LDFLAGS_FOR_TARGET} -L${objdir} \
-	${SIM_CRT0} test.o \
-	-o sim-test.x ${LIBS_FOR_TARGET} -lc ${SIM_BSP}
-
-sim-test.dis:	sim-test.x
-	${OBJDUMP} -d sim-test.x > sim-test.dis
-
-
-test.o: ${srcdir}/m68k/test.c
-
-# Debug usage.
-.c.S:
-	${CC} ${CFLAGS_FOR_TARGET} $(INCLUDES) $(CFLAGS) -c $<
-
-# Caveat: for the -melinux multilib in cris-axis-aout, crt0.o is the
-# same as lcrt0.o, while elsewhere (other cris-axis-aout multilib and
-# cris-axis-elf) it's crt0.c compiled.
-crt0.o: lcrt0.o crt0.S
-	case "${MULTISUBDIR}" in \
-          */elinux) \
-	   cp -p $< $@; st=$$?;; \
-          *) \
-           case "$?" in \
-            *crt0.S) \
-	     $(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -xassembler-with-cpp -c $(srcdir)/crt0.S;; \
-            *) touch $@;; \
-            esac; \
-	   st=$$?;; \
-	esac; exit $$st
-
-crt1.o: lcrt0.o
-	cp -p $< $@
-
-clean mostlyclean:
-	rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) $(BSP_BSP) $(LIN_BSP) libnosys.a
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.status *~
-
-.PHONY: install info install-info clean-info
-install: ${SIM_INSTALL} ${BSP_INSTALL} ${LIN_INSTALL}
-
-# Note that bsp and elinux objects are exclusive: do not overlap
-# installed files.
-install-bsp:
-	case "${MULTISUBDIR}" in \
-          */elinux) ;; \
-	  *) set -e; \
-	     for x in ${BSP_CRT0} ${BSP_BSP} ${BSP_SCRIPTS}; do \
-		${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	     done;; \
-	esac
-
-install-sim:
-	set -e; \
-	for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do \
-	  ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	done
-
-install-lin:
-	case "${MULTISUBDIR}" in \
-          */elinux) \
-	    ${INSTALL_DATA} ${LIN_CRT0} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/crt0.o; \
-	    set -e; \
-	    for x in ${LIN_BSP} ${LIN_SCRIPTS}; do \
-	      ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	    done;; \
-          *) \
-	    set -e; \
-	    for x in ${LIN_BSP} ${LIN_SCRIPTS} ${LIN_EXTRA}; do \
-	      ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; \
-	    done;; \
-	esac
-
-doc:
-info:
-install-info:
-clean-info:
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
-
-$(SYSCALL_CFILES): syscalls.stamp
-
-syscalls.stamp: gensyscalls
-	$(SHELL) $(srcdir)/gensyscalls
-	touch $@
-
-# Dependencies that could and should be auto-generated.
-close.o: close.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-execve.o: execve.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-exit.o: exit.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-fork.o: fork.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-fstat.o: fstat.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-fcntl.o: fcntl.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-getpid.o: getpid.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-gettod.o: gettod.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-isatty.o: isatty.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-kill.o: kill.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-link.o: link.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-lseek.o: lseek.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-open.o: open.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-read.o: read.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-rename.o: rename.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-sbrk.o: sbrk.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-stat.o: stat.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-times.o: times.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-unlink.o: unlink.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-wait.o: wait.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-write.o: write.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-lcrt0.o: lcrt0.c linunistd.h $(objdir)/../libnosys/config.h $(srcdir)/../libnosys/warning.h
-setup.o: setup.S
-crti.o: crti.c
-crtn.o: crtn.c
diff --git a/libgloss/cris/configure b/libgloss/cris/configure
deleted file mode 100755
index edda802..0000000
--- a/libgloss/cris/configure
+++ /dev/null
@@ -1,1203 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.in
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-ac_aux_dir=
-for ac_dir in $libgloss_topdir $srcdir/$libgloss_topdir; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $libgloss_topdir $srcdir/$libgloss_topdir" 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:680: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:744: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:823: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:847: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:883: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-host_makefile_frag_path=$host_makefile_frag
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-. ${libgloss_topdir}/config-ml.in
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/libgloss/cris/configure.in b/libgloss/cris/configure.in
deleted file mode 100644
index 9ac0d45..0000000
--- a/libgloss/cris/configure.in
+++ /dev/null
@@ -1,90 +0,0 @@
-dnl This file is based on ../mcore/configure.in
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
-AC_INIT(Makefile.in)
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AC_OUTPUT(Makefile,
-. ${libgloss_topdir}/config-ml.in,
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-)
diff --git a/libgloss/cris/crt0.S b/libgloss/cris/crt0.S
deleted file mode 100644
index a48efce..0000000
--- a/libgloss/cris/crt0.S
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Generic simplistic start-up-stub for CRIS/CRISv32.
-   Copyright (C) 1993-2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-#undef cris
-#undef L
-#ifdef __NO_UNDERSCORES__
-#define L(x) x
-#else
-#define L(x) _ ## x
-#endif
-
-; Rudimentary v0..v32-compatible startup stub.
-
-#ifdef __ELF__
- .section .startup,"ax"
-#endif
- .global __start
- nop
-__start:
- ba 0f
- nop
-
- .rept 256 - 2
- .dword _.int
- .endr
-
-_.int:
-#ifdef __arch_common_v10_v32
- ; This is just to allow the multilib to compile without
- ; hackery: the "common" subset doesn't recognize
- ; interrupt-return insns.
-#elif __CRIS_arch_version >= 32
- rete
- rfe
-#else
- reti
- nop
-#endif
-
-0:
- move.d __setup,$r9
- jsr $r9
- nop
-#ifdef __ELF__
- jsr L(_init)
- nop
- move.d L(_fini),$r10
- jsr L(atexit)
- nop
-#endif
- jsr L(main)
- nop
- jsr L(exit)
- nop
-0:
- nop
- ba 0b
- nop
diff --git a/libgloss/cris/crti.c b/libgloss/cris/crti.c
deleted file mode 100644
index ceb71e5..0000000
--- a/libgloss/cris/crti.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Executable and DSO init/fini start for cris*-axis-linux-gnu and simulators
-   Copyright (C) 2000, 2001, 2004, 2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-#ifdef __ELF__
-__asm__ (".syntax no_register_prefix");
-
-__asm__ (".section .init\n"
-#ifdef __NO_UNDERSCORES__
-         " .globl _init\n"
-         "_init:\n"
-#else /* not __NO_UNDERSCORES__ */
-         " .globl __init\n"
-         "__init:\n"
-#endif /* not __NO_UNDERSCORES__ */
-         "\tsubq 4,sp\n"
-	 "\tmove srp,[sp]\n"
-#ifdef __PIC__
-         "\tsubq 4,sp\n"
-	 "\tmove.d r0,[sp]\n"
-#if __CRIS_arch_version >= 32
-	 "\tlapc _GLOBAL_OFFSET_TABLE_,$r0\n"
-#else /* not __CRIS_arch_version >= 32 */
-	 "\tmove.d $pc,$r0\n"
-	 "\tsub.d .:GOTOFF,$r0\n"
-#endif /* not __CRIS_arch_version >= 32 */
-#endif /* __PIC__ */
-
-         "\t.section .fini\n"
-#ifdef __NO_UNDERSCORES__
-         " .globl _fini\n"
-         "_fini:\n"
-#else /* not __NO_UNDERSCORES__ */
-         " .globl __fini\n"
-         "__fini:\n"
-#endif /* not __NO_UNDERSCORES__ */
-         "\tsubq 4,sp\n"
-	 "\tmove srp,[sp]\n"
-#ifdef __PIC__
-         "\tsubq 4,sp\n"
-	 "\tmove.d r0,[sp]\n"
-#if __CRIS_arch_version >= 32
-	 "\tlapc _GLOBAL_OFFSET_TABLE_,$r0\n"
-#else /* not __CRIS_arch_version >= 32 */
-	 "\tmove.d $pc,$r0\n"
-	 "\tsub.d .:GOTOFF,$r0\n"
-#endif /* not __CRIS_arch_version >= 32 */
-#endif /* __PIC__ */
-);
-
-#else /* not __ELF__ */
-extern int Dummy;
-#endif /* not __ELF__ */
diff --git a/libgloss/cris/crtn.c b/libgloss/cris/crtn.c
deleted file mode 100644
index 012e5b1..0000000
--- a/libgloss/cris/crtn.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Executable and DSO init/fini end for cris*-axis-linux-gnu and simulators
-   Copyright (C) 2000, 2001, 2004, 2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-#ifdef __ELF__
-
-__asm__ (".syntax no_register_prefix");
-
-__asm__ (".section .init\n"
-#ifdef __PIC__
-	 "\tmove.d [sp+],r0\n"
-#endif
-         "\tmove.d [sp+],r9\n"
-         "\tjump r9\n"
-         "\tnop\n"
-
-         "\t.section .fini\n"
-#ifdef __PIC__
-	 "\tmove.d [sp+],r0\n"
-#endif
-         "\tmove.d [sp+],r9\n"
-         "\tjump r9\n"
-         "\tnop\n");
-
-#else
-extern int Dummy;
-#endif
diff --git a/libgloss/cris/gensyscalls b/libgloss/cris/gensyscalls
deleted file mode 100644
index 9df8b03..0000000
--- a/libgloss/cris/gensyscalls
+++ /dev/null
@@ -1,252 +0,0 @@
-#! /bin/sh
-#  Copyright (C) 2005 Axis Communications.
-#  All rights reserved.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#
-#  1. Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#  2. Neither the name of Axis Communications nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-#  THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-#  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-#  COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-#  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-#  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-#  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-#  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-#  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-#  POSSIBILITY OF SUCH DAMAGE.
-
-# To avoid an abundance of copyright/license messages for boilerplate
-# code, we instead generate them from this file.  Generating the
-# function code could also be done automatically, but at the cost of
-# slightly more intricate build machinery and/or scattered syscall
-# information.  Beware that the cat-lines must match the sed regexp
-# "^cat > \([^ ]*\).*".
-
-lu='/* -*- buffer-read-only: t -*-
-   THIS FILE IS AUTOMATICALLY GENERATED
-   FROM "'$0'".  */
-#include "linunistd.h"
-#define R(x) return (x); }
-'
-lui="$lu int"
-r=") { R (_Sys_"
-
-cat > close.c <<EOF
-$lui _close (int fd${r}close (fd))
-EOF
-cat > execve.c <<EOF
-$lui _execve (char *path, char **argv, char **env${r}execve (path, argv, env))
-EOF
-cat > exit.c <<EOF
-$lu void _exit (int val) { _Sys_exit (val); /* Appease GCC: */ while (1) ; }
-EOF
-cat > fcntl.c <<EOF
-$lui _fcntl (int fd, int cmd, long arg${r}fcntl (fd, cmd, arg))
-EOF
-cat > fork.c <<EOF
-$lui _fork (void${r}fork ())
-EOF
-cat > fstat.c <<EOF
-$lu#include <string.h>
-#include <sys/stat.h>
-int
-_fstat (int fd, struct stat *buf)
-{
-  struct new_stat ks;
-  int retval = _Sys_fstat (fd, &ks);
-
-  /* Blank before filling it in.  */
-  memset (buf, 0, sizeof (*buf));
-
-  /* We have to translate from the linux struct new_stat.
-     It seems we don't have to translate the contents, though.  */
-  buf->st_dev = ks.st_dev;
-  buf->st_ino = ks.st_ino;
-  buf->st_mode = ks.st_mode;
-  buf->st_nlink = ks.st_nlink;
-  buf->st_uid = ks.st_uid;
-  buf->st_gid = ks.st_gid;
-  buf->st_rdev = ks.st_rdev;
-  buf->st_size = ks.st_size;
-  buf->st_blksize = ks.st_blksize;
-  buf->st_blocks = ks.st_blocks;
-  buf->st_atime = ks.st_atime;
-  buf->st_mtime = ks.st_mtime;
-  buf->st_ctime = ks.st_ctime;
-  R (retval)
-EOF
-cat > getpid.c <<EOF
-$lui _getpid (void${r}getpid ())
-EOF
-cat > gettod.c <<EOF
-$lu#include <sys/time.h>
-#include <sys/times.h>
-int
-_gettimeofday (struct timeval *tp, struct timezone *tzp
-${r}gettimeofday (tp, tzp))
-EOF
-cat > isatty.c <<EOF
-$lu
-typedef unsigned int tcflag_t;
-typedef unsigned char cc_t;
-#define NCCS 19
-
-struct termios {
-	tcflag_t c_iflag;		/* input mode flags */
-	tcflag_t c_oflag;		/* output mode flags */
-	tcflag_t c_cflag;		/* control mode flags */
-	tcflag_t c_lflag;		/* local mode flags */
-	cc_t c_line;			/* line discipline */
-	cc_t c_cc[NCCS];		/* control characters */
-};
-
-/* From asm-etrax100/ioctls.h: beware of updates.  */
-#define TCGETS          0x5401
-
-/* Note that this name does not have a prepended underscore.  */
-int
-isatty (int fd)
-{
-  struct termios dummy;
-  int save_errno = errno;
-  int ret = _Sys_ioctl (fd, TCGETS, (unsigned long) &dummy);
-  errno = save_errno;
-  R (ret == 0)
-EOF
-cat > kill.c <<EOF
-$lui _kill (int pid, int sig${r}kill (pid, sig))
-EOF
-cat > link.c <<EOF
-$lui _link (const char *old, const char *new${r}link (old, new))
-EOF
-cat > lseek.c <<EOF
-$lui _lseek (int fd, int offset, int whence${r}lseek (fd, offset, whence))
-EOF
-cat > open.c <<EOF
-$lui _open (const char *fnam, int flags, int mode${r}open (fnam, flags, mode))
-EOF
-cat > read.c <<EOF
-$lui _read (int fd, char *buf, int nbytes${r}read (fd, buf, nbytes))
-EOF
-cat > rename.c <<EOF
-$lui _rename (const char *old, const char *new${r}rename (old, new))
-EOF
-cat > sbrk.c <<EOF
-$lu
-/* From asm-etrax100/mman.h: beware of updates.  */
-#define PROT_READ	0x1		/* page can be read */
-#define PROT_WRITE	0x2		/* page can be written */
-#define MAP_ANONYMOUS	0x20		/* don't use a file */
-char *
-_sbrk (int d)
-{
-  static long last_alloc = 0;
-
-  /* FIXME: Things are a whole lot different than elinux.  */
-#ifdef __elinux__
-
-  /* We can't promise linear memory from a predetermined location.
-     We're NO_MM.  We're paria.  We have to rely on tweaks and unclean
-     behavior.  We abuse the fact that the malloc function in newlib
-     accepts nonlinear chunks in return to its sbrk calls (with a minor
-     patch).  */
-
-  /* We use an "old" type mmap, which takes a pointer to a vector of 6
-     longs where the parameters are stored.  */
-  long buffer[6];
-
-  /* We can't return memory.  Well we could, but we would have to keep a
-     list of previous allocations.  FIXME:  Seems reasonable to do that
-     later.  */
-  if (d < 0)
-    return (char *) last_alloc;
-
-  buffer[3] = MAP_ANONYMOUS;    /* Not associated with a file.  */
-  buffer[4] = -1;               /* No file.  */
-  buffer[0] = 0;                /* Address 0: let mmap pick one.  */
-  buffer[1] = d;                /* Length.  */
-  buffer[2] = (PROT_READ | PROT_WRITE); /* Protection flags.  */
-  buffer[5] = 0;                /* Offset into file.  */
-
-  last_alloc = _Sys_mmap (buffer);
-
-  return (char *) last_alloc;
-
-#else /* not __elinux__ */
-
-  long prev_brk;
-
-  if (last_alloc == 0)
-  {
-    last_alloc = _Sys_brk (0);
-
-    if (last_alloc < 0)
-      return (char *) -1;
-  }
-
-  prev_brk = last_alloc;
-
-  if (_Sys_brk (last_alloc + d) < last_alloc + d)
-    return (char *) -1;
-
-  last_alloc += d;
-
-  return (char *) prev_brk;
-#endif
-}
-EOF
-cat > stat.c <<EOF
-$lu#include <string.h>
-#include <sys/stat.h>
-int
-_stat (const char *path, struct stat *buf)
-{
-  struct new_stat ks;
-  int retval = _Sys_stat (path, &ks);
-
-  /* Blank before filling it in.  */
-  memset (buf, 0, sizeof (*buf));
-
-  /* We have to translate from the linux struct new_stat.
-     It seems we don't have to translate the contents, though.  */
-  buf->st_dev = ks.st_dev;
-  buf->st_ino = ks.st_ino;
-  buf->st_mode = ks.st_mode;
-  buf->st_nlink = ks.st_nlink;
-  buf->st_uid = ks.st_uid;
-  buf->st_gid = ks.st_gid;
-  buf->st_rdev = ks.st_rdev;
-  buf->st_size = ks.st_size;
-  buf->st_blksize = ks.st_blksize;
-  buf->st_blocks = ks.st_blocks;
-  buf->st_atime = ks.st_atime;
-  buf->st_mtime = ks.st_mtime;
-  buf->st_ctime = ks.st_ctime;
-  R (retval)
-EOF
-cat > times.c <<EOF
-$lu#include <sys/times.h>
-clock_t
-_times (struct tms * tp${r}times (tp))
-EOF
-cat > unlink.c <<EOF
-$lui _unlink (const char *f${r}unlink (f))
-EOF
-cat > wait.c <<EOF
-$lui _wait (int *status${r}wait4 (_getpid(), status, 0, 0))
-EOF
-cat > write.c <<EOF
-$lui _write (int fd, char *buf, int nbytes${r}write (fd, buf, nbytes))
-EOF
-exit 0
diff --git a/libgloss/cris/lcrt0.c b/libgloss/cris/lcrt0.c
deleted file mode 100644
index ee50746..0000000
--- a/libgloss/cris/lcrt0.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Support for cris*-axis-linux-gnu and src/sim/cris simulator.
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-#include "linunistd.h"
-
-extern void exit (int) __attribute ((__noreturn__));
-
-__asm__ (".syntax no_register_prefix");
-
-#ifdef __ELF__
-/* This simulator magic for an earlier simulator was supposed to be
-   found two bytes before _start.  Let's keep it for sake of
-   compatibility.  Trying to emit them with an ordinary const char[]
-   and attribute section makes gcc barf; it doesn't like having the
-   same section attribute for both code and data.
-   The code is supposed to cause a crash if someone jumps to 0.  */
-__asm__
- (
-  " .section .startup,\"ax\",@progbits\n"
-  " .byte 55,55\n"
-  " move.d 0xbadacce5,r9\n"
-  " clear.d [r9]\n"
-  " setf\n"
-  " setf\n"
-  " .previous");
-#endif
-
-__asm__
- (
-#ifdef __AOUT__
-  " .text\n\t"
-#elif defined (__ELF__)
-  " .section .startup,\"ax\",@progbits\n"
-#endif
-  " .global __start\n"
-  "__start:\n"
-  /* SP must be set up by the simulator or the system.  */
-
-  /* Find ARGC, ARGV and ENV.  */
-  /* ARGC.  */
-  " move.d [sp],r10\n"
-
-  /* ARGV.  */
-  " move.d sp,r11\n"
-  " addq 4,r11\n"
-
-  /* ENVP.  */
-  " move.d sp,r12\n"
-  " addi r10.d,r12\n"
-  " addq 8,r12\n"
-
-  /* Terminate R9 and R6; we don't have a "console_print_etrax" or system
-     call function.  */
-  " clear.d r9\n"
-  " clear.d r6\n"
-  " move.d __start1,r13\n"
-  " jump r13\n"
-  " setf\n"
-#ifndef __AOUT__
-  /* We rely on a.out not being in .data here.  Quite fragile, but
-     covered by e.g. running the GCC test-suite for cris-unknown-aout. */
-  " .previous"
-#endif
-  );
-
-extern void _Libctors (void);
-extern void _Libdtors (void);
-
-extern void __init__start (void) __attribute ((weak));
-extern void __aout__ctors (void) __attribute ((weak));
-
-static void start1 () __asm__ ("__start1") __attribute ((__used__));
-static void
-start1 (int argc, char **argv, char **env)
-{
-#ifdef __ELF__
-  /* For ELF systems, we call _init and register _fini with atexit.  */
-  {
-    extern void _init (void);
-    extern void _fini (void);
-    _init ();
-    if (atexit (_fini) != 0)
-      exit (-1);
-  }
-#else
-  /* Constructors which may get here through the ELF .init section, when
-     linking ELF and producing a.out.  */
-  if (__init__start)
-    __init__start ();
-
-  if (__aout__ctors)
-    __aout__ctors ();
-
-  /* Call constructors in shared libraries. */
-  _Libctors ();
-
-  if (atexit (_Libdtors) != 0)
-    exit (-1);
-#endif
-
-  /* Call the user program.  */
-  exit (main (argc, argv, env));
-}
diff --git a/libgloss/cris/linunistd.h b/libgloss/cris/linunistd.h
deleted file mode 100644
index 039679d..0000000
--- a/libgloss/cris/linunistd.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/* Support for syscalls for cris*-axis-linux-gnu and simulators
-   Copyright (C) 1998-2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* Derived from asm-etrax100/unistd.h with minor modifications to fit as
-   LOSS for newlib.  */
-
-#ifndef _ASM_ELINUX_UNISTD_H_
-#define _ASM_ELINUX_UNISTD_H_
-
-/* Our callers might want to use link_warning, so provide it from here.  */
-#include "../libnosys/config.h"
-#include "libnosys/warning.h"
-
-#include <errno.h>
-
-/*
- * This file contains the system call numbers, and stub macros for libc.
- */
-
-#define __NR_setup		  0	/* used only by init, to get system going */
-#define __NR_exit		  1
-#define __NR_fork		  2
-#define __NR_read		  3
-#define __NR_write		  4
-#define __NR_open		  5
-#define __NR_close		  6
-#define __NR_waitpid		  7
-#define __NR_creat		  8
-#define __NR_link		  9
-#define __NR_unlink		 10
-#define __NR_execve		 11
-#define __NR_chdir		 12
-#define __NR_time		 13
-#define __NR_mknod		 14
-#define __NR_chmod		 15
-#define __NR_chown		 16
-#define __NR_break		 17
-#define __NR_oldstat		 18
-#define __NR_lseek		 19
-#define __NR_getpid		 20
-#define __NR_mount		 21
-#define __NR_umount		 22
-#define __NR_setuid		 23
-#define __NR_getuid		 24
-#define __NR_stime		 25
-#define __NR_ptrace		 26
-#define __NR_alarm		 27
-#define __NR_oldfstat		 28
-#define __NR_pause		 29
-#define __NR_utime		 30
-#define __NR_stty		 31
-#define __NR_gtty		 32
-#define __NR_access		 33
-#define __NR_nice		 34
-#define __NR_ftime		 35
-#define __NR_sync		 36
-#define __NR_kill		 37
-#define __NR_rename		 38
-#define __NR_mkdir		 39
-#define __NR_rmdir		 40
-#define __NR_dup		 41
-#define __NR_pipe		 42
-#define __NR_times		 43
-#define __NR_prof		 44
-#define __NR_brk		 45
-#define __NR_setgid		 46
-#define __NR_getgid		 47
-#define __NR_signal		 48
-#define __NR_geteuid		 49
-#define __NR_getegid		 50
-#define __NR_acct		 51
-#define __NR_phys		 52
-#define __NR_lock		 53
-#define __NR_ioctl		 54
-#define __NR_fcntl		 55
-#define __NR_mpx		 56
-#define __NR_setpgid		 57
-#define __NR_ulimit		 58
-#define __NR_oldolduname	 59
-#define __NR_umask		 60
-#define __NR_chroot		 61
-#define __NR_ustat		 62
-#define __NR_dup2		 63
-#define __NR_getppid		 64
-#define __NR_getpgrp		 65
-#define __NR_setsid		 66
-#define __NR_sigaction		 67
-#define __NR_sgetmask		 68
-#define __NR_ssetmask		 69
-#define __NR_setreuid		 70
-#define __NR_setregid		 71
-#define __NR_sigsuspend		 72
-#define __NR_sigpending		 73
-#define __NR_sethostname	 74
-#define __NR_setrlimit		 75
-#define __NR_getrlimit		 76
-#define __NR_getrusage		 77
-#define __NR_gettimeofday	 78
-#define __NR_settimeofday	 79
-#define __NR_getgroups		 80
-#define __NR_setgroups		 81
-#define __NR_select		 82
-#define __NR_symlink		 83
-#define __NR_oldlstat		 84
-#define __NR_readlink		 85
-#define __NR_uselib		 86
-#define __NR_swapon		 87
-#define __NR_reboot		 88
-#define __NR_readdir		 89
-#define __NR_mmap		 90
-#define __NR_munmap		 91
-#define __NR_truncate		 92
-#define __NR_ftruncate		 93
-#define __NR_fchmod		 94
-#define __NR_fchown		 95
-#define __NR_getpriority	 96
-#define __NR_setpriority	 97
-#define __NR_profil		 98
-#define __NR_statfs		 99
-#define __NR_fstatfs		100
-#define __NR_ioperm		101
-#define __NR_socketcall		102
-#define __NR_syslog		103
-#define __NR_setitimer		104
-#define __NR_getitimer		105
-#define __NR_stat		106
-#define __NR_lstat		107
-#define __NR_fstat		108
-#define __NR_olduname		109
-#define __NR_iopl		110
-#define __NR_vhangup		111
-#define __NR_idle		112
-#define __NR_vm86		113
-#define __NR_wait4		114
-#define __NR_swapoff		115
-#define __NR_sysinfo		116
-#define __NR_ipc		117
-#define __NR_fsync		118
-#define __NR_sigreturn		119
-#define __NR_clone		120
-#define __NR_setdomainname	121
-#define __NR_uname		122
-#define __NR_modify_ldt		123
-#define __NR_adjtimex		124
-#define __NR_mprotect		125
-#define __NR_sigprocmask	126
-#define __NR_create_module	127
-#define __NR_init_module	128
-#define __NR_delete_module	129
-#define __NR_get_kernel_syms	130
-#define __NR_quotactl		131
-#define __NR_getpgid		132
-#define __NR_fchdir		133
-#define __NR_bdflush		134
-#define __NR_sysfs		135
-#define __NR_personality	136
-#define __NR_afs_syscall	137 /* Syscall for Andrew File System */
-#define __NR_setfsuid		138
-#define __NR_setfsgid		139
-#define __NR__llseek		140
-#define __NR_getdents		141
-#define __NR__newselect		142
-#define __NR_flock		143
-#define __NR_msync		144
-#define __NR_readv		145
-#define __NR_writev		146
-#define __NR_getsid		147
-#define __NR_fdatasync		148
-#define __NR__sysctl		149
-#define __NR_mlock		150
-#define __NR_munlock		151
-#define __NR_mlockall		152
-#define __NR_munlockall		153
-#define __NR_sched_setparam		154
-#define __NR_sched_getparam		155
-#define __NR_sched_setscheduler		156
-#define __NR_sched_getscheduler		157
-#define __NR_sched_yield		158
-#define __NR_sched_get_priority_max	159
-#define __NR_sched_get_priority_min	160
-#define __NR_sched_rr_get_interval	161
-#define __NR_nanosleep		162
-#define __NR_mremap		163
-
-#define __NR_mmap2		192
-
-#define PASTE(x,y) x##y
-#define XSTR(x) # x
-#define STR(x) XSTR (x)
-
-#ifdef __elinux__
-# define CRIS_SYSCALL "jir .$System.call"
-# define CALLNO_REG r1
-# define ARG5_REG r0
-# define MOVE_ARG5 "move.d"
-# define COLON_ARG5_CLOBBER : "r0"
-#else
-# define CRIS_SYSCALL "break 13"
-# define CALLNO_REG r9
-# define ARG5_REG srp
-# define MOVE_ARG5 "move"
-# define COLON_ARG5_CLOBBER
-#endif
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-#define _syscall0(type,name) \
-type PASTE(_Sys_,name) (void) \
-{ \
-  register long __a __asm__ ("r10"); \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_)); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define _syscall1(type,name,type1,arg1) \
-type PASTE(_Sys_,name) (type1 arg1) \
-{ \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_), "0" (__a)); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type PASTE(_Sys_,name) (type1 arg1,type2 arg2) \
-{ \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_), "0" (__a), "r" (__b)); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type PASTE(_Sys_,name) (type1 arg1,type2 arg2,type3 arg3) \
-{ \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_), "0" (__a), "r" (__b), "r" (__c)); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type PASTE(_Sys_,name) (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __d __asm__ ("r13") = (long) arg4; \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_), "0" (__a), "r" (__b), \
-			  "r" (__c), "r" (__d)); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5) \
-type PASTE(_Sys_,name) (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __d __asm__ ("r13") = (long) arg4; \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (MOVE_ARG5 " %6,$" STR (ARG5_REG) "\n\t" \
-			CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_), "0" (__a), "r" (__b), \
-			  "r" (__c), "r" (__d), "g" (arg5) \
-			COLON_ARG5_CLOBBER); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-	  type5,arg5,type6,arg6) \
-type PASTE(_Sys_,name) (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, type6 arg6) \
-{ \
-  register long __a __asm__ ("r10") = (long) arg1; \
-  register long __b __asm__ ("r11") = (long) arg2; \
-  register long __c __asm__ ("r12") = (long) arg3; \
-  register long __d __asm__ ("r13") = (long) arg4; \
-  register long __n_ __asm__ (STR (CALLNO_REG)) = (__NR_##name); \
-  __asm__ __volatile__ (MOVE_ARG5 " %6,$" STR (ARG5_REG) "\n\t" \
-			"move %7,$mof\n\t" \
-			CRIS_SYSCALL \
-			: "=r" (__a) \
-			: "r" (__n_), "0" (__a), "r" (__b), \
-			  "r" (__c), "r" (__d), "g" (arg5), "g" (arg6) \
-			COLON_ARG5_CLOBBER); \
-  if (__a >= 0) \
-     return (type) __a; \
-  errno = -__a; \
-  return -1; \
-}
-
-#define __NR__exit __NR_exit
-static inline _syscall0(int,idle)
-static inline _syscall0(int,fork)
-static inline _syscall2(int,clone,unsigned long,flags,char *,esp)
-static inline _syscall0(int,pause)
-static inline _syscall0(int,setup)
-static inline _syscall0(int,sync)
-static inline _syscall3(int,write,int,fd,const char *,buf,unsigned,count)
-static inline _syscall1(int,dup,int,fd)
-static inline _syscall3(int,execve,const char *,file,char **,argv,char **,envp)
-static inline _syscall3(int,open,const char *,file,int,flag,int,mode)
-static inline _syscall1(int,close,int,fd)
-static inline _syscall1(int,_exit,int,exitcode)
-static inline _syscall1(int,exit,int,exitcode)
-static inline _syscall3(int,waitpid,int,pid,int *,wait_stat,int,options)
-static inline _syscall3(int,read,int,fd,char *,buf,unsigned,count)
-static inline _syscall2(int,socketcall,int,call,unsigned long *,args)
-static inline _syscall3(int,ioctl,unsigned int,fd,unsigned int,cmd,unsigned long,arg)
-static inline _syscall3(int,fcntl,unsigned int,fd,unsigned int,cmd,unsigned long,arg)
-static inline _syscall5(int,mount,const char *,a,const char *,b,const char *,c,unsigned long,rwflag,const void *,data)
-static inline _syscall2(int,rename,const char *,a,const char*,b)
-
-#ifndef __elinux__
-/* Make sure these are only used where they are supported.  */
-static inline _syscall6(int,mmap2,unsigned long, addr, unsigned long, len,
-			unsigned long, prot, unsigned long, flags,
-			unsigned long, fd, unsigned long, pgoff)
-static inline _syscall1(long,brk,long,addr)
-#endif
-
-/* This structure is ripped from asm-etrax100/stat.h: beware of updates.  */
-struct new_stat {
-	unsigned short st_dev;
-	unsigned short __pad1;
-	unsigned long st_ino;
-	unsigned short st_mode;
-	unsigned short st_nlink;
-	unsigned short st_uid;
-	unsigned short st_gid;
-	unsigned short st_rdev;
-	unsigned short __pad2;
-	unsigned long  st_size;
-	unsigned long  st_blksize;
-	unsigned long  st_blocks;
-	unsigned long  st_atime;
-	unsigned long  __unused1;
-	unsigned long  st_mtime;
-	unsigned long  __unused2;
-	unsigned long  st_ctime;
-	unsigned long  __unused3;
-	unsigned long  __unused4;
-	unsigned long  __unused5;
-};
-
-static inline _syscall2(int,stat,const char *,path,struct new_stat *,statbuf)
-static inline _syscall2(int,fstat,int,fd,struct new_stat *,statbuf)
-static inline _syscall0(int,getpid)
-static inline _syscall2(int,kill,int,pid,int,sig)
-static inline _syscall3(int,lseek,int,fd,int,offset,int,whence)
-struct tms;
-static inline _syscall1(long,times,struct tms *,tbuf)
-static inline _syscall1(long,mmap,long *, buf)
-struct timeval;
-struct timezone;
-static inline _syscall2(int,gettimeofday,struct timeval *,tp,
-                        struct timezone *, tzp)
-static inline _syscall2(int,link,const char *,old,const char *,new)
-static inline _syscall1(int,unlink,const char *, f)
-struct rusage;
-static inline _syscall4(int,wait4,int,pid,int *,sa,int,op,struct rusage *,ru)
-#endif /* _ASM_ELINUX_UNISTD_H_ */
diff --git a/libgloss/cris/outbyte.c b/libgloss/cris/outbyte.c
deleted file mode 100644
index 1cb686b..0000000
--- a/libgloss/cris/outbyte.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Low-level kind-of-support for CRIS.  Mostly used as a placeholder
-   function.  Too small and obvious to warrant a copyright notice.  */
-
-#include <stdio.h>
-void
-outbyte (int ch)
-{
-  write (1, &ch, 1);
-}
diff --git a/libgloss/cris/setup.S b/libgloss/cris/setup.S
deleted file mode 100644
index ef0be71..0000000
--- a/libgloss/cris/setup.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Support for standalone CRIS/CRISv32 code.
-   Copyright (C) 2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
- .text
- .global __setup
-__setup:
- /* Make sure to save SRP.  */
-#ifdef __arch_common_v10_v32
- /* Can't do anything if we don't know for which arch.  This file is
-    then only a placeholder.  Oh, and we can't use the "ret" insn in
-    "common" code.  */
-#else
- /* Code missing:
-    - Initialize RAM circuits.
-    - Initialize serial output and input.
-    - Set stack-pointer.  */
- ret
- nop
-#endif
diff --git a/libgloss/crx/Makefile.in b/libgloss/crx/Makefile.in
deleted file mode 100644
index a4abe3f..0000000
--- a/libgloss/crx/Makefile.in
+++ /dev/null
@@ -1,156 +0,0 @@
-#
-#
-
-DESTDIR =
-
-VPATH = @srcdir@ @srcdir@/..
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-
-SHELL =	/bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-# Here is all of the handlers stuff
-H_SCRIPTS	=
-H_BSP	= libh.a
-H_OBJS	= intable.o dvz_hndl.o flg_hndl.o iad_hndl.o svc_hndl.o und_hndl.o
-H_TEST	= hndl-test
-H_INSTALL	= install-hndl
-
-# Here is all of the simulator stuff
-SIM_SCRIPTS	= sim.ld
-SIM_BSP	= libsim.a
-SIM_OBJS = _exit.o close.o _getenv.o lseek.o open.o read.o \
-	_rename.o sbrk.o time.o unlink.o write.o \
-	stat.o putnum.o kill.o getpid.o isatty.o fstat.o
-SIM_TEST	= sim-test
-SIM_INSTALL	= install-sim
-
-# Here is all of the CRT stuff
-CRT	= crti.o crtn.o crt0.o
-CRT_INSTALL = install-crt
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-#
-# build a test program for each target board. Just trying to get
-# it to link is a good test, so we ignore all the errors for now.
-#
-all: ${CRT} ${SIM_BSP} ${H_BSP}
-
-#
-# here's where we build the board support packages for each target
-#
-${H_BSP}: ${H_OBJS}
-	${AR} ${ARFLAGS} ${H_BSP} ${H_OBJS}
-	${RANLIB} ${H_BSP}
-
-${SIM_BSP}: ${SIM_OBJS}
-	${AR} ${ARFLAGS} ${SIM_BSP} ${SIM_OBJS}
-	${RANLIB} ${SIM_BSP}
-
-#
-# here's where we build the test programs for each target
-#
-.PHONY: test
-test:	${SIM_TEST} ${H_TEST} 
-
-hndl-test:	hndl-test.x hndl-test.dis
-
-hndl-test.x:	test.o ${H_BSP}
-	${CC} ${LDFLAGS_FOR_TARGET} -L${objdir} \
-	test.o \
-	-o hndl-test.x ${LIBS_FOR_TARGET} -lc ${H_BSP} -Wl,-T${SIM_SCRIPTS}
-
-hndl-test.dis:	hndl-test.x
-	${OBJDUMP} -d hndl-test.x > hndl-test.dis
-
-
-sim-test:	sim-test.x sim-test.dis
-
-sim-test.x:	test.o ${SIM_BSP}
-	${CC} ${LDFLAGS_FOR_TARGET} -L${objdir} \
-	test.o \
-	-o sim-test.x ${LIBS_FOR_TARGET} -lc ${SIM_BSP} -Wl,-T${SIM_SCRIPTS}
-
-sim-test.dis:	sim-test.x
-	${OBJDUMP} -d sim-test.x > sim-test.dis
-
-#
-#
-#
-.c.S:
-	${CC} ${CFLAGS_FOR_TARGET} -c $<
-
-clean mostlyclean:
-	rm -f a.out core *.i *.o *-test *.srec *.dis *.x $(SIM_BSP) $(H_BSP)
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.status *~
-
-.PHONY: install info install-info clean-info
-install: ${CRT_INSTALL} ${SIM_INSTALL} ${H_INSTALL}
-
-install-crt:
-	set -e; for x in ${CRT} ; do\
-	  ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	done
-
-install-sim:
-	for x in ${SIM_BSP} ; do\
-	 ${INSTALL_PROGRAM} $${x} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	done
-	for x in ${SIM_SCRIPTS}; do\
-	 ${INSTALL_DATA} ${srcdir}/$${x} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	done
-
-install-hndl:
-	for x in ${H_BSP}; do\
-	 ${INSTALL_PROGRAM} $${x} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	done
-
-doc:
-info:
-install-info:
-clean-info:
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/libgloss/crx/_exit.c b/libgloss/crx/_exit.c
deleted file mode 100644
index 9a3cfa6..0000000
--- a/libgloss/crx/_exit.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* _exit.c -- Implementation of the low-level _exit() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <stdlib.h>
-#include <sys/syscall.h>
-
-/* Returns control to the debugger.  */
-void _exit (int stat)
-{
-  HOST_SERVICE (SVC_EOP);
-}
diff --git a/libgloss/crx/_getenv.c b/libgloss/crx/_getenv.c
deleted file mode 100644
index c43555d..0000000
--- a/libgloss/crx/_getenv.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* _getenv.c -- Implementation of the low-level _getenv() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-#include <stdlib.h>
-
-register char *R2 __asm__("r2");
-register char *R3 __asm__("r3");
-
-char * _getenv (const char *name)
-{
-  char *x;
-  char *y;
-
-  x  = R2;
-
-  y  = (char *) calloc (256, 1);
-  R3 = y;
-
-  R2 = x;
- 
-  HOST_SERVICE (SVC_GETENV);
-}
-
diff --git a/libgloss/crx/_rename.c b/libgloss/crx/_rename.c
deleted file mode 100644
index b3d7bd0..0000000
--- a/libgloss/crx/_rename.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* _rename.c -- Implementation of the low-level rename() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-int _rename (char *from, char *to)
-{
-  HOST_SERVICE (SVC_RENAME);
-}
diff --git a/libgloss/crx/close.c b/libgloss/crx/close.c
deleted file mode 100644
index 72ce4bd..0000000
--- a/libgloss/crx/close.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* close.c -- Implementation of the low-level close() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-int close (int fd)
-{
-  HOST_SERVICE (SVC_CLOSE);
-}
diff --git a/libgloss/crx/configure b/libgloss/crx/configure
deleted file mode 100755
index 26420ea..0000000
--- a/libgloss/crx/configure
+++ /dev/null
@@ -1,1228 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=intable.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:573: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:594: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:612: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../.. $srcdir/${mdir}../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ${mdir}../../.. $srcdir/${mdir}../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../.. $srcdir/${srcdir}/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ${srcdir}/../.. $srcdir/${srcdir}/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:710: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:804: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:853: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:877: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:913: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-host_makefile_frag_path=$host_makefile_frag
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/libgloss/crx/configure.in b/libgloss/crx/configure.in
deleted file mode 100644
index 63a902e..0000000
--- a/libgloss/crx/configure.in
+++ /dev/null
@@ -1,75 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
-AC_INIT(intable.c)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../..)
-else
-  AC_CONFIG_AUX_DIR(${srcdir}/../..)
-fi
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AC_OUTPUT(Makefile)
diff --git a/libgloss/crx/crt0.S b/libgloss/crx/crt0.S
deleted file mode 100644
index c498497..0000000
--- a/libgloss/crx/crt0.S
+++ /dev/null
@@ -1,93 +0,0 @@
- ##############################################################################
- # crt0.S -- CRX default start-up routine                                     #
- #                                                                            #
- # Copyright (c) 2004 National Semiconductor Corporation                      #
- #                                                                            #
- # The authors hereby grant permission to use, copy, modify, distribute,      #
- # and license this software and its documentation for any purpose, provided  #
- # that existing copyright notices are retained in all copies and that this   #
- # notice is included verbatim in any distributions. No written agreement,    #
- # license, or royalty fee is required for any of the authorized uses.        #
- # Modifications to this software may be copyrighted by their authors         #
- # and need not follow the licensing terms described here, provided that      #
- # the new terms are clearly indicated on the first page of each file where   #
- # they apply.                                                                #
- #                                                                            #
- # This is the  start routine of your CRX program.                            #
- # It is linked with your application automatically. You can use              #
- # this routine as a template and modify it to your needs, yet this           #
- # file must be supplied for the compiler.                                    #
- # It is assumed that the following symbols are defined in your linker        #
- # script: __STACK_START, __ISTACK_START, __DATA_START, __DATA_END,           #
- # __DATA_IMAGE_START, __BSS_START, __BSS_END.                                #
- ##############################################################################
-
-	.text
-	.align	4
-	.globl		_main
-	.globl		_start
-	.globl		_atexit
-	.globl		_exit
-	.globl		__dispatch_table
-
-_start:
-
- #----------------------------------------------------------------------------#
- # Initialize the stack pointers. The constants __STACK_START and             #
- # __ISTACK_START should be defined in the linker script.                     #
-
-	movd	$__STACK_START, sp
-	movd	$__ISTACK_START, r0
-	mtpr    r0, isp
-
- #----------------------------------------------------------------------------#
- # Initialize the default sections according to the linker script.            #
-
-	movd	$__DATA_END, r4
-	subd	$__DATA_START, r4
-	movd	$__DATA_START, r2
-	movd	$__DATA_IMAGE_START, r3
-	bal	ra,	_memcpy
-	movd	$__BSS_END, r4
-	subd	$__BSS_START, r4
-	movd	$__BSS_START, r2
-	movd	$0, r3
-	bal	ra,	_memset
-
- #----------------------------------------------------------------------------#
- # Initialize the intbase (pointer to the dispatch table).                    #
-
-	movd	$__dispatch_table, r0
-	mtpr    r0, intbase
-
- #----------------------------------------------------------------------------#
- # Handle global and static constructurs execution and setup                  #
- # destructors to be called from exit.                                        #
-	bal	ra,	_init
-	movd	$_fini, r2
-	bal     ra, _atexit 
-
- #----------------------------------------------------------------------------#
- # Here you may add initializations that are specific to your                 #
- # environment. For example:                                                  #
- # 1. Configure wait states and other BIU parameters in order to get          #
- #    the best performance out of your target (see the specification          #
- #    document).                                                              #
- # 2. Enable maskable interrupts that should be enabled when your             #
- #    program starts to execute.                                              #
-
-
- #----------------------------------------------------------------------------#
- # Jump to the main function in your application.                             #
-
-	bal	ra, _main
-
- #----------------------------------------------------------------------------#
- # Upon returning from the main function (if it isn't an infinite loop),      #
- # jump to the exit function. The exit function is located in the             #
- # library 'libc.a'.                                                          #
-
-	movd	r0, r2		# _main return value is passed as a
-						# parameter to exit.
-	br	_exit			# returns control to the debugger.
-
diff --git a/libgloss/crx/crti.S b/libgloss/crx/crti.S
deleted file mode 100644
index 7bca798..0000000
--- a/libgloss/crx/crti.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Specialized code needed to support construction and destruction of
-   file-scope objects in C++ and Java code, and to support exception handling.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   Contributed by Charles-Antoine Gauthier (charles.gauthier@iit.nrc.ca).
-
-This file is part of GCC.
-
-GCC 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.
-
-GCC 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 GCC; 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, if you link this library with files
-   compiled with GCC to produce an executable, this does not 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.  */
-
-/*
- * This file just supplies function prologues for the .init and .fini
- * sections.  It is linked in before crtbegin.o.
- */
-
-	.file   "crti.o"
-	.ident  "GNU C crti.o"
-
-	.section .init
-	.globl  _init
-	.type   _init,@function
-_init:
-        push ra
-	.section .fini
-	.globl  _fini
-	.type   _fini,@function
-_fini:
-        push ra
-	
diff --git a/libgloss/crx/crtn.S b/libgloss/crx/crtn.S
deleted file mode 100644
index 8375f43..0000000
--- a/libgloss/crx/crtn.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Specialized code needed to support construction and destruction of
-   file-scope objects in C++ and Java code, and to support exception handling.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   Contributed by Charles-Antoine Gauthier (charles.gauthier@iit.nrc.ca).
-
-This file is part of GCC.
-
-GCC 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.
-
-GCC 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 GCC; 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, if you link this library with files
-   compiled with GCC to produce an executable, this does not 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.  */
-
-/*
- * This file supplies function epilogues for the .init and .fini sections.
- * It is linked in after all other files.
- */
-
-	.file   "crtn.o"
-	.ident  "GNU C crtn.o"
-
-	.section .init
-        popret ra
-
-	.section .fini
-        popret ra
diff --git a/libgloss/crx/dvz_hndl.c b/libgloss/crx/dvz_hndl.c
deleted file mode 100644
index a9bde40..0000000
--- a/libgloss/crx/dvz_hndl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* dvz_hndl.c -- Implementation of the DVZ trap handler
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-void dvz_handler (void) __attribute__ ((interrupt ()));
-
-void dvz_handler (void)
-{
-  HOST_SERVICE (SVC_DVZ);
-}
diff --git a/libgloss/crx/flg_hndl.c b/libgloss/crx/flg_hndl.c
deleted file mode 100644
index 0bb9c86..0000000
--- a/libgloss/crx/flg_hndl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* flg_hndl.c -- Implementation of the FLG trap handler
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-void flg_handler (void) __attribute__ ((interrupt ()));
-
-void flg_handler (void)
-{
-  HOST_SERVICE (SVC_FLG);
-}
diff --git a/libgloss/crx/fstat.c b/libgloss/crx/fstat.c
deleted file mode 100644
index 380fc2a..0000000
--- a/libgloss/crx/fstat.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* fstat.c -- get status of a file.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <_ansi.h>
-#include <sys/stat.h>
-
-/*
- * fstat -- Since we have no file system, we just return an error.
- */
-int
-_DEFUN (fstat, (fd, buf),
-       int fd _AND
-       struct stat *buf)
-{
-  buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */
-  buf->st_blksize = 0;
-
-  return (0);
-}
diff --git a/libgloss/crx/getpid.c b/libgloss/crx/getpid.c
deleted file mode 100644
index 3c1a7b8..0000000
--- a/libgloss/crx/getpid.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* getpid.c -- get the current process id.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <_ansi.h>
-#define __MYPID 1
-
-/*
- * getpid -- only one process, so just return 1.
- */
-int
-_DEFUN (getpid, (),
-        )
-{
-  return __MYPID;
-}
diff --git a/libgloss/crx/iad_hndl.c b/libgloss/crx/iad_hndl.c
deleted file mode 100644
index 875dbe6..0000000
--- a/libgloss/crx/iad_hndl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* iad_hndl.c -- Implementation of the IAD trap handler
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-void iad_handler (void) __attribute__ ((interrupt ()));
-
-void iad_handler (void)
-{
-  HOST_SERVICE (SVC_IAD);
-}
diff --git a/libgloss/crx/intable.c b/libgloss/crx/intable.c
deleted file mode 100644
index 02ca66b..0000000
--- a/libgloss/crx/intable.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* intable.c -- CompactRISC default dispatch table definition
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <stdio.h>
-#include <sys/libh.h>
-
-void (* const _dispatch_table[32])(void)=
-{
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  svc_handler,
-  dvz_handler,
-  flg_handler,
-  NULL,
-  NULL,
-  und_handler,
-  NULL,
-  iad_handler,
-  NULL,
-  NULL,
-  NULL
-};
diff --git a/libgloss/crx/isatty.c b/libgloss/crx/isatty.c
deleted file mode 100644
index 927d754..0000000
--- a/libgloss/crx/isatty.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* isatty.c -- chek the terminal device.
- * 
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <_ansi.h>
-
-/*
- * isatty -- returns 1 if connected to a terminal device,
- *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
- */
-int
-_DEFUN (isatty, (fd),
-       int fd)
-{
-  return (1);
-}
diff --git a/libgloss/crx/kill.c b/libgloss/crx/kill.c
deleted file mode 100644
index 3ed228f..0000000
--- a/libgloss/crx/kill.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* kill.c -- remove a process.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <_ansi.h>
-#define __MYPID 1
-
-/*
- * kill -- go out via exit...
- */
-int
-_DEFUN (kill, (pid, sig),
-        int pid _AND 
-        int sig)
-{
-  if(pid == __MYPID)
-    _exit(sig);
-  return 0;
-}
diff --git a/libgloss/crx/lseek.c b/libgloss/crx/lseek.c
deleted file mode 100644
index 6c4354c..0000000
--- a/libgloss/crx/lseek.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* lseek.c -- Implementation of the low-level lseek() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-long lseek (int fd, long offset, int whence)
-{
-  HOST_SERVICE (SVC_LSEEK);
-}
diff --git a/libgloss/crx/open.c b/libgloss/crx/open.c
deleted file mode 100644
index abe7bbf..0000000
--- a/libgloss/crx/open.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* open.c -- Implementation of the low-level open() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-#include <stdarg.h>
-
-int open_aux (char *, int, int);
-
-/* The prototype in <fcntl.h> for open() uses ..., meaning function 
- * parameters reside on stack, but the debugger expects the parameters 
- * to reside in registers, thus we call an auxiliary function with 
- * bounded number of parameters.
- */
-int open (char *path, int flags, ...)
-{
-  int mode;
-  va_list ap;
-  
-  va_start(ap, flags);
-  mode = va_arg(ap, int);
-  open_aux (path, flags, mode);
-  va_end(ap);
-}
-
-int open_aux (char *path, int flags, int mode)
-{
-  HOST_SERVICE (SVC_OPEN);
-}
-
diff --git a/libgloss/crx/putnum.c b/libgloss/crx/putnum.c
deleted file mode 100644
index 3317bbf..0000000
--- a/libgloss/crx/putnum.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* putnum.c -- put a hex number on the output device.
- * 
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <_ansi.h>
-
-/*
- * putnum -- print a 32 bit number in hex
- */
-void
-_DEFUN (putnum, (num),
-	unsigned int num)
-{
-  char  buf[9];
-  int   cnt;
-  char  *ptr;
-  int   digit;
-  
-  ptr = buf;
-  for (cnt = 7 ; cnt >= 0 ; cnt--) {
-    digit = (num >> (cnt * 4)) & 0xf;
-    
-    if (digit <= 9)
-      *ptr++ = (char) ('0' + digit);
-    else
-      *ptr++ = (char) ('a' - 10 + digit);
-  }
-
-  *ptr = (char) 0;
-  print (buf);
-}
diff --git a/libgloss/crx/read.c b/libgloss/crx/read.c
deleted file mode 100644
index f0cb43a..0000000
--- a/libgloss/crx/read.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* read.c -- Implementation of the low-level read() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-int read (int fd, char *buffer, int nbytes)
-{
-  HOST_SERVICE (SVC_READ);
-}
diff --git a/libgloss/crx/sbrk.c b/libgloss/crx/sbrk.c
deleted file mode 100644
index 70d5d4f..0000000
--- a/libgloss/crx/sbrk.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* sbrk.c -- Implementation of the low-level sbrk() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <errno.h>
-#include <stddef.h> /* where ptrdiff_t is defined */
-#include <stdlib.h>
-
-/* Extend heap space by size bytes.
-   Return start of new space allocated, or -1 for errors 
-   Error cases:
-    1. Allocation is not within heap range */
-
-void * sbrk (ptrdiff_t size)
-{
-  /*
-  * The following two memory locations should be defined in the linker script file
-  */
-  extern const char _HEAP_START; /* start of heap */
-  extern const char _HEAP_MAX;	 /* end of heap (maximum value of heap_ptr) */
-
-  static const char * heap_ptr;  /* pointer to head of heap */
-  const char * old_heap_ptr;
-  static unsigned char init_sbrk = 0;
-
-  /* heap_ptr is initialized to HEAP_START */
-  if (init_sbrk == 0) 
-  {
-    heap_ptr = &_HEAP_START;
-    init_sbrk = 1;
-  }
-
-  old_heap_ptr = heap_ptr;
-
-  if ((heap_ptr + size) > &_HEAP_MAX)
-  { 
-    /* top of heap is bigger than _HEAP_MAX */
-    errno = ENOMEM;
-    return (void *) -1;
-  }
-
-  /* success: update heap_ptr and return previous value */
-  heap_ptr += size;
-  return (void *)old_heap_ptr;
-}
diff --git a/libgloss/crx/sim.ld b/libgloss/crx/sim.ld
deleted file mode 100644
index a75c03d..0000000
--- a/libgloss/crx/sim.ld
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Example Linker Script for linking NS CRX elf32 files. */
-OUTPUT_FORMAT("elf32-crx")
-OUTPUT_ARCH(crx)
-
-/* 
- The libh.a library includes various CR default handlers.
- The libsim.a library includes low-level functions, which
- are used as an interface to communicate with the simulator.
-*/
-GROUP(-lc -lsim -lh -lgcc)
-
-/*
- The next line forces the entry point (_start in this script)
- to be entered in the output file as an undefined symbol.
- It is needed in case the entry point is not called explicitly
- (which is the usual case) AND is in an archive.
-*/
-EXTERN(_start)
-ENTRY(_start)
-
-/* Define memory regions */
-MEMORY
-{
-  rom  : ORIGIN = 0x2,  LENGTH = 3M
-  ram  : ORIGIN = 4M,   LENGTH = 10M
-}
-
-SECTIONS
-{
-  .init :
-  { 
-    __INIT_START = .; 
-    KEEP (*(.init))
-    __INIT_END = .; 
-  } > rom
-
-  .fini :
-  { 
-    __FINI_START = .; 
-    KEEP (*(.fini))
-    __FINI_END = .; 
-  } > rom
-
-  .jcr :
-  { 
-    KEEP (*(.jcr))
-  } > rom
-
-  .text : 
-  { 
-    __TEXT_START = .; 
-    *(.text) *(.text.*) *(.gnu.linkonce.t.*) 
-    __TEXT_END = .; 
-  } > rom
-
-  .rdata : 
-  {
-     __RDATA_START = .; 
-     *(.rdata_4) *(.rdata_2) *(.rdata_1) *(.rdata.*) *(.gnu.linkonce.r.*) 
-     __RDATA_END = .; 
-  } > rom
-
-  .ctor ALIGN(4) : 
-  { 
-    __CTOR_START = .; 
-    KEEP (*crtbegin*.o(.ctors))
-    KEEP (*(EXCLUDE_FILE (*crtend*.o) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-    __CTOR_END = .; 
-  } > rom
-
-  .dtor ALIGN(4) : 
-  { 
-    __DTOR_START = .; 
-    KEEP (*crtbegin*.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend*.o) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-    __DTOR_END = .; 
-  } > rom
-
-  .data : 
-  {
-    __DATA_START = .; 
-    *(.data_4) *(.data_2) *(.data_1) *(.data) *(.data.*) *(.gnu.linkonce.d.*) 
-    __DATA_END = .; 
-  } > ram AT > rom
-
-  .bss (NOLOAD) : 
-  {
-    __BSS_START = .; 
-    *(.bss_4) *(.bss_2) *(.bss_1) *(.bss) *(COMMON) *(.bss.*) *(.gnu.linkonce.b.*) 
-    __BSS_END = .; 
-  } > ram
-
-/*
- You may change the sizes of the following sections to fit the actual
- size your program requires.
- The heap and stack are aligned to the bus width, as a speed optimization
- for accessing data located there.
-*/
-  .heap : 
-  { 
-    . = ALIGN(4); 
-    __HEAP_START = .; 
-    . += 0x2000; 
-    __HEAP_MAX = .; 
-  } > ram
-
-  .stack : 
-  { 
-    . = ALIGN(4); 
-    . += 0x6000; 
-    __STACK_START = .; 
-  } > ram
-
-  .istack : 
-  { 
-    . = ALIGN(4); 
-    . += 0x100; 
-    __ISTACK_START = .; 
-  } > ram
-}
-
-__DATA_IMAGE_START = LOADADDR(.data);
diff --git a/libgloss/crx/stat.c b/libgloss/crx/stat.c
deleted file mode 100644
index 6ffef82..0000000
--- a/libgloss/crx/stat.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* stat.c -- Get the status of a file.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <_ansi.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-/*
- * stat -- Since we have no file system, we just return an error.
- */
-int
-_DEFUN (stat, (path, buf),
-       const char *path _AND
-       struct stat *buf)
-{
-  errno = EIO;
-  return (-1);
-}
-
diff --git a/libgloss/crx/svc_hndl.c b/libgloss/crx/svc_hndl.c
deleted file mode 100644
index ab93a4d..0000000
--- a/libgloss/crx/svc_hndl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* svc_hndl.c -- Implementation of the SVC trap handler
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-void svc_handler (void) __attribute__ ((interrupt ()));
-
-void svc_handler (void)
-{
-  HOST_SERVICE (SVC_SVC);
-}
diff --git a/libgloss/crx/time.c b/libgloss/crx/time.c
deleted file mode 100644
index 4d7cfa1..0000000
--- a/libgloss/crx/time.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* time.c -- Implementation of the low-level time() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <unistd.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/syscall.h>
-
-time_t _Time (time_t *timer)
-{
-  HOST_SERVICE (SVC_TIME);
-}
-
-time_t time (time_t *tod)
-{
-  time_t t = _Time (NULL);
-
-  if (tod)
-    *tod = t;
-  
-  return (t);
-}
-
-/* _times -- no clock, so return an error.  */
-clock_t times (struct tms *buf)
-{
-  errno = EINVAL;
-  return (-1);
-}
-
-/* _gettimeofday -- implement in terms of time.  */
-int gettimeofday (struct timeval *tv, struct timezone *tz)
-{
-  if (tz)
-    tz->tz_minuteswest = tz->tz_dsttime = 0;
-
-  tv->tv_usec = 0;
-  tv->tv_sec = time (0);
-  return 0;
-}
-
diff --git a/libgloss/crx/und_hndl.c b/libgloss/crx/und_hndl.c
deleted file mode 100644
index 4c5cca3..0000000
--- a/libgloss/crx/und_hndl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* und_hndl.c -- Implementation of the UND trap handler
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-void und_handler (void) __attribute__ ((interrupt ()));
-
-void und_handler (void)
-{
-  HOST_SERVICE (SVC_UND);
-}
diff --git a/libgloss/crx/unlink.c b/libgloss/crx/unlink.c
deleted file mode 100644
index 3a93471..0000000
--- a/libgloss/crx/unlink.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* unlink.c -- Implementation of the low-level unlink() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-int unlink (char *path)
-{
-  HOST_SERVICE (SVC_UNLINK);
-}
diff --git a/libgloss/crx/write.c b/libgloss/crx/write.c
deleted file mode 100644
index a9a7ff4..0000000
--- a/libgloss/crx/write.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* write.c -- Implementation of the low-level write() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/syscall.h>
-
-int write (int fd, char *buffer, int nbytes)
-{
-  HOST_SERVICE (SVC_WRITE);
-}
diff --git a/libgloss/d30v/Makefile.in b/libgloss/d30v/Makefile.in
index 83148b5..b652016 100644
--- a/libgloss/d30v/Makefile.in
+++ b/libgloss/d30v/Makefile.in
@@ -15,7 +15,6 @@
 # This currently works with the D30V simulator.
 #
 
-DESTDIR =
 VPATH = @srcdir@ @srcdir@/..
 srcdir = @srcdir@
 objdir = .
@@ -115,7 +114,7 @@ distclean maintainer-clean realclean: clean
 install: ${SIM_INSTALL}
 
 install-sim:
-	set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
 
 doc:
 info:
diff --git a/libgloss/d30v/syscalls.c b/libgloss/d30v/syscalls.c
index b55bb62..58c738c 100644
--- a/libgloss/d30v/syscalls.c
+++ b/libgloss/d30v/syscalls.c
@@ -17,19 +17,18 @@
  */
 
 #include <stdlib.h>
-#include <time.h>
 #include "syscall.h"
 
 extern int *__errno(), errno;
 
 __asm__ (
-"	.globl	__syscall					\n\
-	.type	__syscall,@function				\n\
-__syscall:							\n\
-	trap	31		|| nop				\n\
-	cmpge	f0,r2,0		-> jmp/tx	link		\n\
-	bra	__set_errno					\n\
-	.size	__syscall,.-__syscall				\n\
+"	.globl	__syscall
+	.type	__syscall,@function
+__syscall:
+	trap	31		|| nop
+	cmpge	f0,r2,0		-> jmp/tx	link
+	bra	__set_errno
+	.size	__syscall,.-__syscall
 ");
 
 int
diff --git a/libgloss/debug.h b/libgloss/debug.h
index 9a78076..9535341 100644
--- a/libgloss/debug.h
+++ b/libgloss/debug.h
@@ -77,7 +77,7 @@ extern char *gdb_set(char *);			/* Q - set value */
  * indicate to caller of mem2hex or hex2mem that there has been an error. 
  * 0 means ok, 1 means error
  */
-extern volatile int mem_err;
+extern int mem_err;
 
 /*
  * indicate whether the debug vectors have been initialized
diff --git a/libgloss/doc/Makefile.in b/libgloss/doc/Makefile.in
index 336f70a..0432e02 100644
--- a/libgloss/doc/Makefile.in
+++ b/libgloss/doc/Makefile.in
@@ -11,7 +11,6 @@
 # they apply.
 #
 
-DESTDIR =
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -132,7 +131,7 @@ install:
 
 install-info: info
 	for i in *.info* ; do \
-		$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
+		$(INSTALL_DATA) $$i $(infodir)/$$i ; \
 	done
 
 clean-info:
diff --git a/libgloss/fr30/Makefile.in b/libgloss/fr30/Makefile.in
index e0318a0..d318093 100644
--- a/libgloss/fr30/Makefile.in
+++ b/libgloss/fr30/Makefile.in
@@ -1,7 +1,6 @@
 #
 #
 
-DESTDIR =
 VPATH = @srcdir@ @srcdir@/..
 srcdir = @srcdir@
 objdir = .
@@ -126,11 +125,11 @@ distclean maintainer-clean realclean: clean
 install: ${SIM_INSTALL}
 
 install-mon:
-	set -e; for x in ${MON_CRT0} ${MON_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-	set -e; for x in ${MON_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${MON_CRT0} ${MON_BSP}; do ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${MON_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/$$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
 
 install-sim:
-	set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib/$$x; done
+	set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA} $$x ${tooldir}/lib/$$x; done
 
 doc:
 info:
diff --git a/libgloss/frv/Makefile.in b/libgloss/frv/Makefile.in
deleted file mode 100644
index 64f3345..0000000
--- a/libgloss/frv/Makefile.in
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2002 Red Hat, Inc
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-
-# Makefile for libgloss/frv. This is the board support
-# code for the various frv targets.
-
-DESTDIR =
-VPATH = @srcdir@ @srcdir@/..
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-SHELL = /bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-AR_FLAGS = rc
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-CRT0 = crt0.o
-SIM_BSP = libsim.a
-SIM_OBJS = fstat.o \
-	   getpid.o \
-	   isatty.o \
-	   kill.o \
-	   putnum.o \
-	   sbrk.o \
-	   sim-close.o \
-	   sim-exit.o \
-	   sim-inbyte.o \
-	   sim-lseek.o \
-	   sim-open.o \
-	   sim-read.o \
-	   sim-time.o \
-	   sim-unlink.o \
-	   sim-write.o \
-	   stat.o
-
-#### Host specific Makefile fragment comes in here.
-@host_makefile_frag@
-
-all: $(CRT0) $(SIM_BSP)
-
-$(SIM_BSP): $(SIM_OBJS)
-	$(AR) $(ARFLAGS) $@ $?
-	$(RANLIB) $@
-
-fstat.o: $(srcdir)/fstat.c
-getpid.o: $(srcdir)/getpid.c
-isatty.o: $(srcdir)/isatty.c
-kill.o: $(srcdir)/kill.c
-putnum.o: $(srcdir)/putnum.c
-sbrk.o: $(srcdir)/sbrk.c
-sim-close.o: $(srcdir)/sim-close.S
-sim-exit.o: $(srcdir)/sim-exit.S
-sim-inbyte.o: $(srcdir)/sim-inbyte.c
-sim-lseek.o: $(srcdir)/sim-lseek.S
-sim-open.o: $(srcdir)/sim-open.S
-sim-read.o: $(srcdir)/sim-read.S
-sim-time.o: $(srcdir)/sim-time.c
-sim-unlink.o: $(srcdir)/sim-unlink.S
-sim-write.o: $(srcdir)/sim-write.S
-stat.o: $(srcdir)/stat.c
-
-install: $($(CPU)_INSTALL)
-	$(INSTALL_DATA) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
-	$(INSTALL_DATA) $(SIM_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(SIM_BSP)
-
-clean mostlyclean:
-	rm -f *.o *.a
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.cache config.log config.status
-
-.PHONY: info dvi doc install-info clean-info
-info doc dvi:
-install-info:
-clean-info:
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/libgloss/frv/configure b/libgloss/frv/configure
deleted file mode 100755
index 5d272c9..0000000
--- a/libgloss/frv/configure
+++ /dev/null
@@ -1,1204 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=crt0.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-ac_aux_dir=
-for ac_dir in $libgloss_topdir $srcdir/$libgloss_topdir; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $libgloss_topdir $srcdir/$libgloss_topdir" 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:680: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:744: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:823: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:847: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:884: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-host_makefile_frag_path=$host_makefile_frag
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-. ${libgloss_topdir}/config-ml.in
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/libgloss/frv/configure.in b/libgloss/frv/configure.in
deleted file mode 100644
index 877f6a0..0000000
--- a/libgloss/frv/configure.in
+++ /dev/null
@@ -1,90 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
-AC_INIT(crt0.S)
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AC_OUTPUT(Makefile,
-. ${libgloss_topdir}/config-ml.in,
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-)
diff --git a/libgloss/frv/crt0.S b/libgloss/frv/crt0.S
deleted file mode 100644
index af14b91..0000000
--- a/libgloss/frv/crt0.S
+++ /dev/null
@@ -1,270 +0,0 @@
-/* crt0.S -- startup file for frv.
- * 
- * Copyright (c) 2002, 2003 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <frv-asm.h>
-
-	/* statically store .Lcall's address so we can see if we are running
-	   at the location we were linked for or a different location.  */
-	.data
-	.type	EXT(__start_cmp),@object
-	.size	EXT(__start_cmp),4
-	.p2align 2
-EXT(__start_cmp):
-	.picptr	 .Lcall
-	
-	.globl	__start
-	.weak	_start
-	.text
-	.type	__start,@function
-__start:
-_start:
-	call	.Lcall				/* set up _gp in a pic-friendly manor */
-.Lcall:	movsg	lr, gr4
-	P(sethi) #gprelhi(.Lcall), gr5
-	setlo	 #gprello(.Lcall), gr5
-	P(sub)	 gr4, gr5, gr16
-
-#if ! __FRV_FDPIC__
-	sethi	 #gprelhi(EXT(_stack)), sp	/* load up stack pointer */
-	P(setlo) #gprello(EXT(_stack)), sp
-	setlos   #0, fp				/* zero fp to allow unwinders to stop */
-	P(add)	 sp, gr16, sp
-
-#define FDPIC(...)
-#else
-#define FDPIC(...) __VA_ARGS__
-	
-	/* The assembler will rightfully claim that
-	#hi/lo(__stacksize) are unsafe for PIC, but since __stacksize
-	is absolute, and we don't want it to be relocated, we should
-	be fine.  */
-
-	sethi	#gprelhi(EXT(__end)), gr6
-	P(sethi) #hi(EXT(__stacksize+7)), gr5
-	setlo	#gprello(EXT(__end)), gr6
-	P(setlo) #lo(EXT(__stacksize+7)), gr5
-	add	gr6, gr16, gr6
-	add	gr6, gr5, gr5
-	andi	gr5, -8, sp
-
-	/* Using GPREL to compute _GLOBAL_OFFSET_TABLE_'s will force
-	the entire program to relocate as a unit, which is fine for
-	frv-elf.  */
-	
-	P(sethi) #gprelhi(EXT(_GLOBAL_OFFSET_TABLE_)), gr15
-	setlo    #gprello(EXT(_GLOBAL_OFFSET_TABLE_)), gr15
-	/* We compute the value in a call-saved register (that happens
-	to be the PIC register in the EABI, and copy it to gr15 before
-	every call.  */
-	add	 gr15, gr16, gr17
-#endif
-
-	sethi	 #gprelhi(EXT(__start_cmp)), gr5
-	setlo    #gprello(EXT(__start_cmp)), gr5
-	ld	 @(gr5,gr16), gr6
-	subcc	gr4, gr6, gr8, icc0
-	beq	icc0, 0, .Lfixed
-
-	P(st)	gr4, @(gr5, gr16)	/* update so if we restart no need to fixup */
-	setlos	4, gr11
-
-#if ! __FRV_FDPIC__
-
-					/* fixup the .ctors list */
-	sethi	 #gprelhi(EXT(__CTOR_LIST__)), gr9
-	P(sethi) #gprelhi(EXT(__CTOR_END__)), gr10
-	setlo	 #gprello(EXT(__CTOR_LIST__)), gr9
-	P(setlo) #gprello(EXT(__CTOR_END__)), gr10
-	add	 gr9, gr16, gr9
-	P(add)	 gr10, gr16, gr10
-	addi	 gr9, 4, gr9
-	P(subi)	 gr10, 4, gr10
-	call	 EXT(__frv_fixptrs)
-
-					/* fixup the .dtors list */
-	P(sethi) #gprelhi(EXT(__DTOR_LIST__)), gr9
-	sethi	 #gprelhi(EXT(__DTOR_END__)), gr10
-	P(setlo) #gprello(EXT(__DTOR_LIST__)), gr9
-	setlo	 #gprello(EXT(__DTOR_END__)), gr10
-	P(add)	 gr9, gr16, gr9
-	add	 gr10, gr16, gr10
-	P(addi)	 gr9, 4, gr9
-	subi	 gr10, 4, gr10
-	call	 EXT(__frv_fixptrs)
-#endif /* ! __FRV_FDPIC__ */
-
-					/* fixup the user .rofixup list */
-	P(sethi) #gprelhi(EXT(__ROFIXUP_LIST__)), gr9
-	sethi	 #gprelhi(EXT(__ROFIXUP_END__)), gr10
-	P(setlo) #gprello(EXT(__ROFIXUP_LIST__)), gr9
-	setlo	 #gprello(EXT(__ROFIXUP_END__)), gr10
-	P(add)	 gr9, gr16, gr9
-	add	 gr10, gr16, gr10
-	FDPIC(mov gr17, gr15)
-	call	 EXT(__frv_fix_usrptrs)
-
-.Lfixed:
-
-/* HSR flags */
-#define HSR_ICE  0x80000000		/* Instruction cache enable */
-#define HSR_DCE  0x40000000		/* Data cache enable */
-#define HSR_CBM  0x08000000		/* Cache copy back mode */
-#define HSR_EIMM 0x04000000		/* Enable Instruction MMU */
-#define HSR_EDMM 0x02000000		/* Enable Data MMU */
-#define HSR_EMEM 0x00800000		/* Enable MMU miss exception mask */
-#define HSR_RME  0x00400000		/* Ram mode enable */
-#define HSR_SA   0x00001000		/* Start address */
-#define HSR_FRN  0x00000800		/* Number of FPRs */
-#define HSR_GRN  0x00000400		/* Number of GPRs */
-#define HSR_FRHE 0x00000200		/* FR Higher Enable */
-#define HSR_FRLE 0x00000100		/* FR Lower Enable */
-#define HSR_GRHE 0x00000080		/* GR Higher Enable */
-#define HSR_GRLE 0x00000040		/* GR Lower Enable */
-
-#ifndef HSR_CLEAR
-#define HSR_CLEAR 0
-#endif
-
-#ifndef HSR_SET
-#ifndef FRV_NO_CACHE
-#define HSR_SET (HSR_ICE|HSR_DCE|HSR_FRHE|HSR_FRLE|HSR_GRHE|HSR_GRLE)
-#else
-#define HSR_SET (HSR_FRHE|HSR_FRLE|HSR_GRHE|HSR_GRLE)
-#endif
-#endif
-
-/* PSR flags */
-#define PSR_ICE  0x00010000		/* In circuit emulation mode */
-#define PSR_NEM  0x00004000		/* Non-exception mode */
-#define PSR_CM   0x00002000		/* Conditional mode */
-#define PSR_BE   0x00001000		/* Big endian mode */
-#define PSR_EF   0x00000100		/* Enable floating point */
-#define PSR_EM   0x00000080		/* Enable media instructions */
-#define PSR_S    0x00000004		/* Enable supervisor mode */
-#define PSR_PS   0x00000002		/* Previous supervisor mode */
-#define PSR_ET   0x00000001		/* Enable interrupts */
-
-#ifndef PSR_CLEAR
-#if __FRV_FPR__
-#define PSR_CLEAR 0
-#else
-#define PSR_CLEAR (PSR_EF|PSR_EM)
-#endif
-#endif
-
-#ifndef PSR_SET
-#if __FRV_FPR__
-#define PSR_SET (PSR_NEM|PSR_CM|PSR_EF|PSR_EM)
-#else
-#define PSR_SET (PSR_NEM|PSR_CM)
-#endif
-#endif
-
-	/* Enable floating point */
-	movsg	  hsr0, gr4
-	P(sethi)  #hi(HSR_SET), gr5
-	setlo	  #lo(HSR_SET), gr5
-	P(sethi)  #hi(~HSR_CLEAR), gr6
-	setlo     #lo(~HSR_CLEAR), gr6
-	or	  gr4, gr5, gr4
-	and	  gr4, gr6, gr4
-	movgs	  gr4, hsr0
-
-	movsg	  psr, gr4
-	P(sethi)  #hi(PSR_SET), gr5
-	setlo	  #lo(PSR_SET), gr5
-	P(sethi)  #hi(~PSR_CLEAR), gr6
-	setlo     #lo(~PSR_CLEAR), gr6
-	or	  gr4, gr5, gr4
-	and	  gr4, gr6, gr4
-	movgs	  gr4, psr
-
-	/* zero the bss area */
-	P(sethi)  #gprelhi(__bss_start), gr8
-	sethi	  #gprelhi(__end), gr4
-	P(setlo)  #gprello(__bss_start), gr8
-	setlo	  #gprello(__end), gr4
-	P(add)	  gr8, gr16, gr8
-	add	  gr4, gr16, gr4
-	P(setlos) #0, gr9
-	sub	  gr4, gr8, gr10
-	FDPIC(mov gr17, gr15)
-	call	  EXT(memset)
-
-	P(setlos) #0, gr8		/* zero argc, argv, envp */
-	setlos	  #0, gr9
-	P(setlos) #0, gr10
-
-	FDPIC(mov gr17, gr15)
-	call	  EXT(main)
-	FDPIC(mov gr17, gr15)
-	call	  EXT(exit)
-.Lend:
-	.size	__start,(.Lend-__start)
-
-#if ! __FRV_FDPIC__
-	/* Routine to adjust pointers
-	   gr8  = difference to adjust by
-	   gr9  = starting address
-	   gr10 = ending address + 4
-	   gr11 = amount to add to the pointer each iteration.  */
-	.globl	EXT(__frv_fixptrs)
-	.type	EXT(__frv_fixptrs),@function
-EXT(__frv_fixptrs):
-	P(sub)	gr9, gr11, gr9
-	sub	gr10, gr11, gr10
-.Lloop2:
-	cmp	gr10, gr9, icc0
-	bls	icc0, 0, .Lret2
-
-	ldu	@(gr9,gr11), gr5
-	add	gr8, gr5, gr5
-	P(st)	gr5, @(gr9,gr0)
-	bra	.Lloop2
-
-.Lret2:	ret
-.Lend2:
-	.size	EXT(__frv_fixptrs),.Lend2-EXT(__frv_fixptrs)
-#endif /* ! __FRV_FDPIC__ */
-
-	/* Routine to adjust statically initialized pointers
-	   Note since these are pointers to pointers, they
-	   need to be adjusted themsevles.
-
-	   gr8  = difference to adjust by
-	   gr9  = starting address
-	   gr10 = ending address + 4
-	   gr11 = amount to add to the pointer each iteration.  */
-	.globl	EXT(__frv_fix_usrptrs)
-	.type	EXT(__frv_fix_usrptrs),@function
-EXT(__frv_fix_usrptrs):
-	P(sub)	gr9, gr11, gr9
-	sub	gr10, gr11, gr10
-.Lloop3:
-	cmp	gr10, gr9, icc0
-	bls	icc0, 0, .Lret3
-
-	ldu	@(gr9,gr11), gr5
-	ld	@(gr5, gr8), gr6
-	cmp	gr6, gr0, icc0		/* skip pointers initialized to 0 */
-	beq	icc0, 0, .Lloop3
-
-	add	gr8, gr6, gr6
-	P(st)	gr6, @(gr5,gr8)
-	bra	.Lloop3
-
-.Lret3:	ret
-.Lend3:
-	.size	EXT(__frv_fix_usrptrs),.Lend2-EXT(__frv_fix_usrptrs)
diff --git a/libgloss/frv/fstat.c b/libgloss/frv/fstat.c
deleted file mode 100644
index 756f7b2..0000000
--- a/libgloss/frv/fstat.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* fstat.c -- get status of a file.
- *
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <sys/stat.h>
-#include "glue.h"
-
-/*
- * fstat -- Since we have no file system, we just return an error.
- */
-int
-_DEFUN (_fstat, (fd, buf),
-       int fd _AND
-       struct stat *buf)
-{
-  buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */
-  buf->st_blksize = 0;
-
-  return (0);
-}
diff --git a/libgloss/frv/getpid.c b/libgloss/frv/getpid.c
deleted file mode 100644
index e6d5682..0000000
--- a/libgloss/frv/getpid.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* getpid.c -- get the current process id.
- *
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include "glue.h"
-
-/*
- * getpid -- only one process, so just return 1.
- */
-int
-_DEFUN (_getpid, (),
-        )
-{
-  return __MYPID;
-}
diff --git a/libgloss/frv/isatty.c b/libgloss/frv/isatty.c
deleted file mode 100644
index 7494531..0000000
--- a/libgloss/frv/isatty.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* isatty.c -- chek the terminal device.
- * 
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include "glue.h"
-
-/*
- * isatty -- returns 1 if connected to a terminal device,
- *           returns 0 if not. Since we're hooked up to a
- *           serial port, we'll say yes _AND return a 1.
- */
-int
-_DEFUN (isatty, (fd),
-       int fd)
-{
-  return (1);
-}
diff --git a/libgloss/frv/kill.c b/libgloss/frv/kill.c
deleted file mode 100644
index 7c365fd..0000000
--- a/libgloss/frv/kill.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* kill.c -- remove a process.
- *
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include "glue.h"
-
-extern void _exit (int) __attribute__((__noreturn__));
-
-/*
- * kill -- go out via exit...
- */
-int
-_DEFUN (_kill, (pid, sig),
-        int pid _AND 
-        int sig)
-{
-  if(pid == __MYPID)
-    _exit(sig);
-  return 0;
-}
diff --git a/libgloss/frv/print.c b/libgloss/frv/print.c
deleted file mode 100644
index 8c8be84..0000000
--- a/libgloss/frv/print.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* print.c -- print a string on the output device.
- *
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include "glue.h"
-
-/*
- * print -- do a raw print of a string
- */ 
-void
-_DEFUN (_print, (ptr),
-char *ptr)
-{
-  while (*ptr) {
-    outbyte (*ptr++);
-  }
-}
diff --git a/libgloss/frv/putnum.c b/libgloss/frv/putnum.c
deleted file mode 100644
index c7fa121..0000000
--- a/libgloss/frv/putnum.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* putnum.c -- put a hex number on the output device.
- * 
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include "glue.h"
-
-/*
- * putnum -- print a 32 bit number in hex
- */
-void
-_DEFUN (_putnum, (num),
-	unsigned int num)
-{
-  char  buf[9];
-  int   cnt;
-  char  *ptr;
-  int   digit;
-  
-  ptr = buf;
-  for (cnt = 7 ; cnt >= 0 ; cnt--) {
-    digit = (num >> (cnt * 4)) & 0xf;
-    
-    if (digit <= 9)
-      *ptr++ = (char) ('0' + digit);
-    else
-      *ptr++ = (char) ('a' - 10 + digit);
-  }
-
-  *ptr = (char) 0;
-  print (buf);
-}
diff --git a/libgloss/frv/sbrk.c b/libgloss/frv/sbrk.c
deleted file mode 100644
index 469257d..0000000
--- a/libgloss/frv/sbrk.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* sbrk.c -- allocate memory dynamically.
- * 
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <errno.h>
-#include "glue.h"
-
-/* just in case, most boards have at least some memory */
-#ifndef RAMSIZE
-#  define RAMSIZE             (caddr_t)0x100000
-#endif
-
-char *__heap_ptr = (char *)&_end;
-
-/*
- * sbrk -- changes heap size size. Get nbytes more
- *         RAM. We just increment a pointer in what's
- *         left of memory on the board.
- */
-char *
-_sbrk (nbytes)
-     int nbytes;
-{
-  char *base;
-  char *sp;
-
-  base = __heap_ptr;
-  __heap_ptr += nbytes;
-
-  return base;
-/* FIXME: We really want to make sure we don't run out of RAM, but this
- *       isn't very portable.
- */
-#if 0
-  if ((RAMSIZE - heap_ptr - nbytes) >= 0) {
-    base = heap_ptr;
-    heap_ptr += nbytes;
-    return (base);
-  } else {
-    errno = ENOMEM;
-    return ((char *)-1);
-  }
-#endif
-}
diff --git a/libgloss/frv/sim-close.S b/libgloss/frv/sim-close.S
deleted file mode 100644
index 96caf0a..0000000
--- a/libgloss/frv/sim-close.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * sim-close.S -- close interface for frv simulator
- * 
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <frv-asm.h>
-
-#include "syscall.h"
-
-/*
- * Input:
- * gr8	  -- File descriptor to close.
- *
- * Output:
- * gr8	  -- 0 or -1.
- * errno  -- Set if an error
- */
-
-	.globl	EXT(_close)
-	.type	EXT(_close),@function
-	.weak	EXT(close)
-	.text
-EXT(_close):
-EXT(close):
-	setlos	#SYS_close,gr7
-	tira	gr0,#0
-	ret
-.Lend:
-	.size	EXT(_close),.Lend-EXT(_close)
diff --git a/libgloss/frv/sim-exit.S b/libgloss/frv/sim-exit.S
deleted file mode 100644
index 7b6d4a0..0000000
--- a/libgloss/frv/sim-exit.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * sim-exit.S -- _exit interface for frv simulator
- * 
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <frv-asm.h>
-
-#include "syscall.h"
-
-/*
- * Input:
- * gr8	-- exit value
- *
- * Output:
- * none
- */
-
-	.globl	EXT(_exit)
-	.type	EXT(_exit),@function
-	.text
-EXT(_exit):
-	setlos	#SYS_exit,gr7
-	tira	gr0,#0
-.Lend:
-	.size	EXT(_exit),.Lend-EXT(_exit)
diff --git a/libgloss/frv/sim-inbyte.c b/libgloss/frv/sim-inbyte.c
deleted file mode 100644
index 9d39751..0000000
--- a/libgloss/frv/sim-inbyte.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * sim-inbyte.c -- read a character from standard input.
- *
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-int
-inbyte ()
-{
-  char c;
-
-  if (read (0, &c, 1) <= 0)
-    return -1;
-
-  return c;
-}
diff --git a/libgloss/frv/sim-lseek.S b/libgloss/frv/sim-lseek.S
deleted file mode 100644
index f545e90..0000000
--- a/libgloss/frv/sim-lseek.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * sim-lseek.S -- write interface for frv simulator
- * 
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <frv-asm.h>
-
-#include "syscall.h"
-
-/*
- * Input:
- * gr8	  -- File descriptor
- * gr9	  -- Offset
- * gr10   -- Base from which offset should be taken
- *
- * Output:
- * gr8	  -- Zero on success, -1 on failure.
- * errno  -- Set if an error
- */
-
-	.globl	EXT(_lseek)
-	.type	EXT(_lseek),@function
-	.weak	EXT(lseek)
-	.text
-EXT(_lseek):
-EXT(lseek):
-	setlos	#SYS_lseek,gr7
-	tira	gr0,#0
-	ret
-.Lend:
-	.size	EXT(_lseek),.Lend-EXT(_lseek)
diff --git a/libgloss/frv/sim-open.S b/libgloss/frv/sim-open.S
deleted file mode 100644
index 9a8fd00..0000000
--- a/libgloss/frv/sim-open.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * sim-open.S -- open interface for frv simulator
- * 
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <frv-asm.h>
-
-#include "syscall.h"
-
-/*
- * Input:
- * gr8	  -- File name to open.
- * gr9	  -- open mode.
- * gr10	  -- optionally, the permission bits to set the file to.
- *
- * Output:
- * gr8	  -- file descriptor or -1.
- * errno  -- Set if an error
- */
-
-	.globl	EXT(_open)
-	.type	EXT(_open),@function
-	.weak	EXT(open)
-	.text
-EXT(_open):
-EXT(open):
-	setlos	#SYS_open,gr7
-	tira	gr0,#0
-	ret
-.Lend:
-	.size	EXT(_open),.Lend-EXT(_open)
diff --git a/libgloss/frv/sim-read.S b/libgloss/frv/sim-read.S
deleted file mode 100644
index e058ce8..0000000
--- a/libgloss/frv/sim-read.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * sim-read.S -- read interface for frv simulator
- * 
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <frv-asm.h>
-
-#include "syscall.h"
-
-/*
- * Input:
- * gr8	  -- File descriptor.
- * gr9	  -- Buffer to be read into.
- * gr10	  -- Length of the buffer.
- *
- * Output:
- * gr8	  -- Length read or -1.
- * errno  -- Set if an error
- */
-
-	.globl	EXT(_read)
-	.type	EXT(_read),@function
-	.weak	EXT(read)
-	.text
-EXT(_read):
-EXT(read):
-	setlos	#SYS_read,gr7
-	tira	gr0,#0
-	ret
-.Lend:
-	.size	EXT(_read),.Lend-EXT(_read)
diff --git a/libgloss/frv/sim-time.c b/libgloss/frv/sim-time.c
deleted file mode 100644
index b28ceca..0000000
--- a/libgloss/frv/sim-time.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* sim-time.c -- stubs so clock can be linked in.
- *
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include "glue.h"
-
-/*
- * time -- simulator interface to return current time in seconds.
- */
-__asm__ ("\
-	.text\n\
-	.globl	_sim_time\n\
-	.type	_sim_time,@function\n\
-_sim_time:\n\
-	setlos	#18, gr7\n\
-	tira	gr0, #0\n\
-	ret\n\
-.Lsim:\n\
-	.size	_sim_time,.Lsim-_sim_time");
-
-extern time_t _sim_time (void) __asm__("_sim_time");
-
-
-/*
- * time -- return current time in seconds.
- */
-time_t
-_DEFUN (time, time (t),
-	time_t *t)
-{
-  time_t ret = _sim_time ();
-
-  if (t)
-    *t = ret;
-
-  return ret;
-}
-
-/*
- * _times -- no clock, so return an error.
- */
-int
-_DEFUN (_times, _times (buf),
-	struct tms *buf)
-{
-  errno = EINVAL;
-  return (-1);
-}
-
-/*
- * _gettimeofday -- implement in terms of time, which means we can't return the
- * microseconds.
- */
-int
-_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
-	struct timeval *tv _AND
-	struct timezone *tz)
-{
-  if (tz)
-    tz->tz_minuteswest = tz->tz_dsttime = 0;
-
-  tv->tv_usec = 0;
-  tv->tv_sec = _sim_time ();
-  return 0;
-}
diff --git a/libgloss/frv/sim-unlink.S b/libgloss/frv/sim-unlink.S
deleted file mode 100644
index bb44f35..0000000
--- a/libgloss/frv/sim-unlink.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * sim-unlink.S -- write interface for frv simulator
- * 
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <frv-asm.h>
-
-#include "syscall.h"
-
-/*
- * Input:
- * gr8	  -- Filename
- *
- * Output:
- * gr8	  -- Zero on success, -1 on failure.
- * errno  -- Set if an error
- */
-
-	.globl	EXT(_unlink)
-	.type	EXT(_unlink),@function
-	.weak	EXT(unlink)
-	.text
-EXT(_unlink):
-EXT(unlink):
-	setlos	#SYS_unlink,gr7
-	tira	gr0,#0
-	ret
-.Lend:
-	.size	EXT(_unlink),.Lend-EXT(_unlink)
diff --git a/libgloss/frv/sim-write.S b/libgloss/frv/sim-write.S
deleted file mode 100644
index 580f9bd..0000000
--- a/libgloss/frv/sim-write.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * sim-write.S -- write interface for frv simulator
- * 
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <frv-asm.h>
-
-#include "syscall.h"
-
-/*
- * Input:
- * gr8	  -- File descriptor.
- * gr9	  -- String to be printed.
- * gr10	  -- Length of the string.
- *
- * Output:
- * gr8	  -- Length written or -1.
- * errno  -- Set if an error
- */
-
-	.globl	EXT(_write)
-	.type	EXT(_write),@function
-	.weak	EXT(write)
-	.text
-EXT(_write):
-EXT(write):
-	setlos	#SYS_write,gr7
-	tira	gr0,#0
-	ret
-.Lend:
-	.size	EXT(_write),.Lend-EXT(_write)
diff --git a/libgloss/frv/stat.c b/libgloss/frv/stat.c
deleted file mode 100644
index 094ab48..0000000
--- a/libgloss/frv/stat.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* stat.c -- Get the status of a file.
- *
- * Copyright (c) 2002 Red Hat, Inc
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <sys/stat.h>
-#include <errno.h>
-#include "glue.h"
-
-/*
- * stat -- Since we have no file system, we just return an error.
- */
-int
-_DEFUN (_stat, (path, buf),
-       const char *path _AND
-       struct stat *buf)
-{
-  errno = EIO;
-  return (-1);
-}
-
diff --git a/libgloss/hp74x/Makefile.in b/libgloss/hp74x/Makefile.in
index 307da0b..5a90c9b 100644
--- a/libgloss/hp74x/Makefile.in
+++ b/libgloss/hp74x/Makefile.in
@@ -22,7 +22,6 @@
 # for the HP-PRO hppa embedded boards. <rob@cygnus.com>
 #
 
-DESTDIR =
 VPATH = @srcdir@
 srcdir = @srcdir@
 objdir = .
@@ -101,9 +100,9 @@ hpstub: $(OBJS)
 	$(OBJS) -lc -m >stub.map
 
 install:
-	$(INSTALL_PROGRAM) $(STUBLIB) $(DESTDIR)$(tooldir)/lib/$(MULTISUBDIR)$(STUBLIB)
-	$(INSTALL_PROGRAM) $(SHARED_DIR)/$(STUBCRT0) $(DESTDIR)$(tooldir)/lib/$(MULTISUBDIR)$(STUBCRT0)
-	$(INSTALL_PROGRAM) $(srcdir)/$(LDSCRIPT) $(DESTDIR)$(tooldir)/lib/$(LDSCRIPT)
+	$(INSTALL_PROGRAM) $(STUBLIB) $(tooldir)/lib/$(MULTISUBDIR)$(STUBLIB)
+	$(INSTALL_PROGRAM) $(SHARED_DIR)/$(STUBCRT0) $(tooldir)/lib/$(MULTISUBDIR)$(STUBCRT0)
+	$(INSTALL_PROGRAM) $(srcdir)/$(LDSCRIPT) $(tooldir)/lib/$(LDSCRIPT)
 
 .c.o:
 	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $<
diff --git a/libgloss/hp74x/configure b/libgloss/hp74x/configure
index 9103894..efa6b88 100755
--- a/libgloss/hp74x/configure
+++ b/libgloss/hp74x/configure
@@ -28,6 +28,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -142,6 +143,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -312,6 +314,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -477,12 +484,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -578,7 +589,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:582: checking for a BSD compatible install" >&5
+echo "configure:593: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -634,7 +645,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:638: checking for $ac_word" >&5
+echo "configure:649: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -664,7 +675,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:668: checking for $ac_word" >&5
+echo "configure:679: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -715,7 +726,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:719: checking for $ac_word" >&5
+echo "configure:730: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -747,7 +758,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:751: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:762: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -758,12 +769,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 762 "configure"
+#line 773 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -789,12 +800,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:793: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:798: checking whether we are using GNU C" >&5
+echo "configure:809: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -803,7 +814,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -822,7 +833,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:826: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:837: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -862,7 +873,7 @@ LD=${LD-ld}
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:866: checking for $ac_word" >&5
+echo "configure:877: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/libgloss/i386/Makefile.in b/libgloss/i386/Makefile.in
index 536f37f..d68657a 100644
--- a/libgloss/i386/Makefile.in
+++ b/libgloss/i386/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2000 Cygnus Support
+# Copyright (c) 1997 Cygnus Support
 #
 # The authors hereby grant permission to use, copy, modify, distribute,
 # and license this software and its documentation for any purpose, provided
@@ -10,7 +10,6 @@
 # the new terms are clearly indicated on the first page of each file where
 # they apply.
 
-DESTDIR =
 VPATH = @srcdir@
 srcdir = @srcdir@
 objdir = .
@@ -88,10 +87,10 @@ libcygmon.a: $(CYGMON_OBJS)
 	${RANLIB} $@
 
 cygmon-salib.o: ${srcdir}/cygmon-salib.c
-	$(CC) -c $(CFLAGS) @NEED_UNDERSCORE@ @IS_COFF@ @IS_AOUT@ $(<) -o $@
+	$(CC) -c $(CFLAGS) @NEED_UNDERSCORE@ @IS_COFF@ $(<) -o $@
 
 cygmon-crt0.o: ${srcdir}/cygmon-crt0.S
-	$(CC) -c $(CFLAGS) @NEED_UNDERSCORE@ @IS_COFF@ @IS_AOUT@ $(<) -o $@
+	$(CC) -c $(CFLAGS) @NEED_UNDERSCORE@ @IS_COFF@ $(<) -o $@
 
 doc:	
 
@@ -103,12 +102,12 @@ distclean maintainer-clean realclean: clean
 
 .PHONY: install info install-info clean-info
 install:
-	$(INSTALL_PROGRAM) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
+	$(INSTALL_PROGRAM) $(CRT0) $(tooldir)/lib${MULTISUBDIR}/$(CRT0)
 	@for bsp in ${BSP}; do\
-	 $(INSTALL_PROGRAM) $${bsp} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
+	 $(INSTALL_PROGRAM) $${bsp} $(tooldir)/lib${MULTISUBDIR}; \
 	done
 	@for script in ${SCRIPTS}; do\
-	 $(INSTALL_DATA) ${srcdir}/$${script}.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${script}.ld; \
+	 $(INSTALL_DATA) ${srcdir}/$${script}.ld $(tooldir)/lib${MULTISUBDIR}/$${script}.ld; \
 	done
 
 info:
diff --git a/libgloss/i386/configure b/libgloss/i386/configure
index 534c8b4..d0e35b2 100755
--- a/libgloss/i386/configure
+++ b/libgloss/i386/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
+# Generated automatically using autoconf version 2.12.1 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -333,7 +333,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
+    echo "configure generated by autoconf version 2.12.1"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -503,11 +503,9 @@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
-ac_exeext=
-ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -583,7 +581,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
+echo "configure:585: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -604,7 +602,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
+echo "configure:606: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -622,7 +620,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
+echo "configure:624: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -676,12 +674,12 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:680: checking for a BSD compatible install" >&5
+echo "configure:678: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
     case "$ac_dir/" in
@@ -724,8 +722,6 @@ echo "$ac_t""$INSTALL" 1>&6
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
@@ -736,29 +732,24 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # autoconf should provide a way to do this.
 
 
-
 case "$target" in
     *coff)
 	IS_COFF="-DCOFF"
 	;;
-    *aout)
-	IS_AOUT="-DAOUT"
-	;;
 esac
 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:753: checking for $ac_word" >&5
+echo "configure:746: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="gcc"
@@ -779,17 +770,16 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:783: checking for $ac_word" >&5
+echo "configure:775: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
   ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
@@ -828,7 +818,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:832: checking whether we are using GNU C" >&5
+echo "configure:823: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -837,7 +827,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -852,7 +842,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:856: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:847: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -887,20 +877,18 @@ LD=${LD-ld}
 
 
 
-
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:895: checking for $ac_word" >&5
+echo "configure:885: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_RANLIB="ranlib"
@@ -948,7 +936,7 @@ EOF
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  case `(ac_space=' '; set) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
@@ -1027,7 +1015,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12.1"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -1051,7 +1039,6 @@ s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
@@ -1086,14 +1073,12 @@ s%@build_cpu@%$build_cpu%g
 s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@CC@%$CC%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@LD@%$LD%g
 s%@IS_COFF@%$IS_COFF%g
-s%@IS_AOUT@%$IS_AOUT%g
 s%@NEED_UNDERSCORE@%$NEED_UNDERSCORE%g
 s%@RANLIB@%$RANLIB%g
 s%@host_makefile_frag_path@%$host_makefile_frag_path%g
diff --git a/libgloss/i386/configure.in b/libgloss/i386/configure.in
index 722241c..fe9224c 100644
--- a/libgloss/i386/configure.in
+++ b/libgloss/i386/configure.in
@@ -77,9 +77,6 @@ case "$target" in
     *coff)
 	IS_COFF="-DCOFF"
 	;;
-    *aout)
-	IS_AOUT="-DAOUT"
-	;;
 esac
 
 LIB_AC_PROG_CC
@@ -90,7 +87,6 @@ AC_SUBST(AR)
 LD=${LD-ld}
 AC_SUBST(LD)
 AC_SUBST(IS_COFF)
-AC_SUBST(IS_AOUT)
 AC_SUBST(NEED_UNDERSCORE)
 AC_PROG_RANLIB
 
diff --git a/libgloss/i386/cygmon-crt0.S b/libgloss/i386/cygmon-crt0.S
index 1c4535e..9be0209 100644
--- a/libgloss/i386/cygmon-crt0.S
+++ b/libgloss/i386/cygmon-crt0.S
@@ -1,7 +1,7 @@
 /*
  * crt0 startup code for user programs running under Cygmon
  *
- * Copyright (c) 1998, 2000 Cygnus Support
+ * Copyright (c) 1998 Cygnus Support
  *
  * The authors hereby grant permission to use, copy, modify, distribute,
  * and license this software and its documentation for any purpose, provided
@@ -14,9 +14,11 @@
  * they apply.
  */
 
-#define _S2(P,X) P ## X
-#define _S1(P,X) _S2(P,X)
-#define SYM(X) _S1(__USER_LABEL_PREFIX__,X)
+#ifndef NEED_UNDERSCORE
+#define SYM(X) X
+#else
+#define SYM(X) _ ## X
+#endif
 
 .data
         .align  8
@@ -29,51 +31,52 @@ SYM(argc):
 	.text
 	.align 4
 
-	.globl __start
-__start:
+	.globl SYM(_start)
+SYM(_start):
 	/* see if the stack is already setup. if not, then default
          *  to using the value of %sp as set by the ROM monitor
          */
-	movl	$__stack, %eax
-	testl	%eax, %eax
-	jz	1f
-	movl	%eax, %esp
+	lea __stack,%eax
+	cmpl $0,%eax
+	jz 1f
+	mov %eax, %esp
 1:
 	mov $0, %ebp
 
-	movl	$__bss_start, %edi
-	movl	$__bss_end, %ecx
-	subl	%edi, %ecx
-	xorl	%eax, %eax
-	rep; stosb
+	lea __bss_start, %eax
+2:
+	movb $0,(%eax)
+	inc %eax
+	cmp $__bss_end,%eax
+	jl 2b
+	
+2:
+	pushl $SYM(__sigtramp)
+	pushl $0
+	call SYM(__install_signal_handler)
+	add $4, %esp
 
-	pushl	$SYM(__sigtramp)
-	pushl	$0
-	call	SYM(__install_signal_handler)
-	popl	%eax
+	pushl $SYM(__do_global_dtors)
+	call SYM(atexit)
+	add $4, %esp
 
-	pushl	$SYM(__do_global_dtors)
-	call	SYM(atexit)
-	popl	%eax
+	call SYM(__do_global_ctors)
 
-	call	SYM(__do_global_ctors)
+	pushl $SYM(argc)
+	call SYM(__get_program_arguments)
+	add $4, %esp
 
-	pushl	$SYM(argc)
-	call	SYM(__get_program_arguments)
-	popl	%ecx
-
-	movl	SYM(argc), %ecx
-	pushl	%eax
-	pushl	%ecx
-	call	SYM(main)
-	popl	%ecx
-	popl	%edx
+	pushl %eax
+	lea SYM(argc), %ebx
+	pushl (%ebx)
+	call SYM(main)
+	add $8, %esp
 
 	/* call exit from the C library so atexit gets called, and the
 	 * C++ destructors get run. This calls our exit routine below	 
 	 * when it's done.
 	 */
-	pushl	%eax
+	pushl %eax
 	call	SYM(exit)
 3:
-	jmp	3b
+	jmp 3b
diff --git a/libgloss/i386/cygmon-gmon.c b/libgloss/i386/cygmon-gmon.c
index 480b2ec..30b1147 100644
--- a/libgloss/i386/cygmon-gmon.c
+++ b/libgloss/i386/cygmon-gmon.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1991, 2000 The Regents of the University of California.
+ * Copyright (c) 1991 The Regents of the University of California.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -221,10 +221,10 @@ _mcount()
 
   if (! already_setup) 
     {
-      extern _etext();
+      extern etext();
       extern _ftext();
       already_setup = 1;
-      monstartup(_ftext, _etext);
+      monstartup(_ftext, etext);
       atexit(_mcleanup);
     }
   /*
diff --git a/libgloss/i386/cygmon-salib.c b/libgloss/i386/cygmon-salib.c
index 466045d..e0d5e72 100644
--- a/libgloss/i386/cygmon-salib.c
+++ b/libgloss/i386/cygmon-salib.c
@@ -1,7 +1,7 @@
 /*
  * Standard x86 syscalls for user programs running under Cygmon
  *
- * Copyright (c) 1998, 2000 Cygnus Support
+ * Copyright (c) 1998 Cygnus Support
  *
  * The authors hereby grant permission to use, copy, modify, distribute,
  * and license this software and its documentation for any purpose, provided
@@ -22,15 +22,8 @@
 extern int errno;
 
 _syscall3(int,write,int,i,char *,c,int,len);
-#if 0
+
 _syscall3(int,read,int,i,char *,c,int,len);
-#else
-int
-read (int des, char *dest, int len)
-{
-  return -1;
-}
-#endif
 
 _syscall2(int,kill,int,pid,int,signal);
 
@@ -50,11 +43,7 @@ _syscall1(int, close, int, fd);
 int
 open (const char *filename, int mode, ...)
 {
-#if 0
   return __open (filename, mode, 0644); 
-#else
-  return -1;
-#endif
 }
 
 /* Ultra-super cheezy. */
@@ -64,12 +53,6 @@ isatty (int i)
   return i<3;
 }
 
-int unlink (const char *p)
-{
-  return -1;
-}
-
-
 char *
 sbrk (int amt)
 {
@@ -125,7 +108,7 @@ clock ()
   return t.tv_sec * 1000 + (t.tv_usec / 1000);
 }
 
-#if ! defined(COFF) && ! defined(AOUT)
+#ifndef COFF
 typedef void (*ctp)();
 void
 __do_global_ctors ()
diff --git a/libgloss/i386/cygmon.ld b/libgloss/i386/cygmon.ld
index ae0d908..03bbb60 100644
--- a/libgloss/i386/cygmon.ld
+++ b/libgloss/i386/cygmon.ld
@@ -1,5 +1,5 @@
 STARTUP(cygmon-crt0.o)
-ENTRY(__start)
+ENTRY(_start)
 GROUP(-lcygmon -lc -lcygmon -lgcc)
 SEARCH_DIR(.)
 __DYNAMIC  =  0;
@@ -34,7 +34,6 @@ SECTIONS
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
     *(.fini)
-    . = ALIGN(4);
      __CTOR_LIST__ = .;
     CONSTRUCTORS
     LONG(-1)
@@ -46,28 +45,16 @@ SECTIONS
     *(.dtors)
      LONG(0)
     __DTOR_END__ = .;
-    PROVIDE(_etext  =  .);
-    PROVIDE(__etext  =  .);
+     etext  =  .;
+     _etext  =  .;
   }
   . = .;
   .rdata : {
     *(.rdata)
   }
-  .rodata : {
-    *(.rodata)
-    *(.rodata.*)
-  }
-  .eh_frame :
-  {
-    PROVIDE (__EH_FRAME_BEGIN__ = .);
-    *(.eh_frame)
-    PROVIDE (__EH_FRAME_END__ = .);
-  }
-  _fdata = ALIGN(16);
+   _fdata = ALIGN(16);
   .data : {
     *(.data)
-    *(.gcc_except_table)
-    *(.gcc_exc)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -82,20 +69,20 @@ SECTIONS
     *(.sdata)
   }
   . = ALIGN(4);
-   PROVIDE(_edata  =  .);
-   PROVIDE(__edata  =  .);
+   edata  =  .;
+   _edata  =  .;
    fbss = .;
    _fbss = .;
   .sbss : {
-    PROVIDE(__bss_start = .);
     *(.sbss)
     *(.scommon)
   }
   .bss : {
+    __bss_start = . ;
     *(.bss)
     *(COMMON)
-    PROVIDE(__bss_end = .);
+    __bss_end = . ;
   }
-  PROVIDE(_end = .);
-  PROVIDE(__end = .);
+   end = .;
+   _end = .;
 }
diff --git a/libgloss/i960/Makefile.in b/libgloss/i960/Makefile.in
index 0ca1597..5b483dc 100644
--- a/libgloss/i960/Makefile.in
+++ b/libgloss/i960/Makefile.in
@@ -1,7 +1,6 @@
 #
 #
 
-DESTDIR =
 VPATH = @srcdir@ @srcdir@/..
 srcdir = @srcdir@
 objdir = .
@@ -125,11 +124,11 @@ distclean maintainer-clean realclean: clean
 install: ${MON_INSTALL}
 
 install-mon:
-	set -e; for x in ${MON_CRT0} ${MON_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-	set -e; for x in ${MON_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${MON_CRT0} ${MON_BSP}; do ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${MON_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/$$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
 
 install-sim:
-	set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib/$$x; done
+	set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA} $$x ${tooldir}/lib/$$x; done
 
 doc:
 info:
diff --git a/libgloss/iq2000/Makefile.in b/libgloss/iq2000/Makefile.in
deleted file mode 100644
index 21cc286..0000000
--- a/libgloss/iq2000/Makefile.in
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright (c) 2000, Cygnus Solutions, A Red Hat Company
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-
-DESTDIR =
-VPATH = @srcdir@
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-program_transform_name = @program_transform_name@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-SHELL =	/bin/sh
-
-CC = @CC@
-
-#AS = @AS@
-AS = `if [ -f ${objroot}/../gas/as.new ] ; \
-	then echo ${objroot}/../gas/as.new ; \
-	else echo as ; fi`
-
-AR = @AR@
-
-#LD = @LD@
-LD = `if [ -f ${objroot}/../ld/ld.new ] ; \
-	then echo ${objroot}/../ld/ld.new ; \
-	else echo ld ; fi`
-
-RANLIB = @RANLIB@
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-CRT0 = crt0.o
-
-# Generic object files common to all targets.
-GENOBJS = _exit.o access.o chmod.o close.o crt1.o \
-	fstat.o getpid.o gettime.o isatty.o \
-	kill.o lseek.o open.o read.o \
-	sbrk.o stat.o time.o trap.o unlink.o utime.o write.o
-
-# Object files specific to particular targets.
-EVALOBJS = ${GENOBJS}
-
-CFLAGS = -g 
-
-GCC_LDFLAGS = `if [ -d ${objroot}/../gcc ] ; \
-	then echo -L${objroot}/../gcc ; fi`
-
-SCRIPTS = sim
-BSP = libeval.a
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-#
-# build a test program for each target board. Just trying to get
-# it to link is a good test, so we ignore all the errors for now.
-#
-
-all: ${CRT0} test.o ${BSP}
-
-#
-# here's where we build the board support packages for each target
-#
-
-libeval.a: $(EVALOBJS)
-	${AR} ${ARFLAGS} $@ $(EVALOBJS)
-	${RANLIB} $@
-
-
-# compile a fully linked binary. The -Wl,-T*.ld is for the linker
-# script. By using -Wl, the linker script is put on the proper place
-# in the comand line for ld, and all the symbols will get fully
-# resolved.
-
-test: $(CRT0) test.o
-	${CC} $(CFLAGS_FOR_TARGET) -L${srcdir} -L${objdir} \
-	test.o -o $@ $(NEWLIB_LDFLAGS) 
-	@echo Done...
-
-doc:	
-
-clean mostlyclean:
-	rm -f a.out core *.i *~ *.o *-test *.srec *.dis *.map *.x
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.status a.out
-
-.PHONY: install info install-info clean-info
-install:
-	$(INSTALL_PROGRAM) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
-	@for bsp in ${BSP}; do\
-	 $(INSTALL_PROGRAM) $${bsp} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
-	done
-	@for script in ${SCRIPTS}; do\
-	 $(INSTALL_DATA) $(srcdir)/$${script}.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${script}.ld; \
-	done
-
-info:
-install-info:
-clean-info:
-
-test.o:	${srcdir}/test.c
-
-# these are for the BSPs
-${CRT0}: ${srcdir}/crt0.S
-
-# target specific makefile fragment comes in here.
-@target_makefile_frag@
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@ @target_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/libgloss/iq2000/_exit.c b/libgloss/iq2000/_exit.c
deleted file mode 100644
index 318984b..0000000
--- a/libgloss/iq2000/_exit.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-static void _do_dtors()
-{
-  /* The loop variable is static so that if a destructor calls exit, 
-     and we return here, we simply continue with the next destructor. */
-  typedef void (*pfunc) ();
-  extern pfunc __dtors[];
-  extern pfunc __dtors_end[];
-  static pfunc *p = __dtors;
-  
-  while (p < __dtors_end)
-    (*p++) ();
-}
-
-
-void _exit (n)
-{
-  extern unsigned char __eh_frame_begin[];
-  extern void __deregister_frame_info (void *);
-
-  /* Destructors should be done earlier because they need to be done before the
-     files are closed, but here is better than nowhere (and this balances the
-     constructors done in crt1.c. */
-  _do_dtors();
-
-  /* Deregister any eh frames.  */
-  __deregister_frame_info (__eh_frame_begin);
-
-  TRAP0 (SYS_exit, n, 0, 0);
-}
diff --git a/libgloss/iq2000/access.c b/libgloss/iq2000/access.c
deleted file mode 100644
index 8e08b3a..0000000
--- a/libgloss/iq2000/access.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* This is file ACCESS.C */
-/*
- * Copyright (C) 1993 DJ Delorie
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms is permitted
- * provided that the above copyright notice and following paragraph are
- * duplicated in all such forms.
- *
- * This file is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-int access(const char *fn, int flags)
-{
-  struct stat s;
-  if (stat(fn, &s))
-    return -1;
-  if (s.st_mode & S_IFDIR)
-    return 0;
-  if (flags & W_OK)
-  {
-    if (s.st_mode & S_IWRITE)
-      return 0;
-    return -1;
-  }
-  return 0;
-}
-	
diff --git a/libgloss/iq2000/chmod.c b/libgloss/iq2000/chmod.c
deleted file mode 100644
index 8200506..0000000
--- a/libgloss/iq2000/chmod.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-chmod (const char *path, mode_t mode)
-{
-  return TRAP0 (SYS_chmod, path, mode, 0);
-}
diff --git a/libgloss/iq2000/chown.c b/libgloss/iq2000/chown.c
deleted file mode 100644
index 6630d3b..0000000
--- a/libgloss/iq2000/chown.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-
-int
-chown (const char *path, short owner, short group)
-{
-  return TRAP0 (SYS_chown, path, owner, group);
-}
diff --git a/libgloss/iq2000/close.c b/libgloss/iq2000/close.c
deleted file mode 100644
index 8474b38..0000000
--- a/libgloss/iq2000/close.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-_close (int file)
-{
-  return TRAP0 (SYS_close, file, 0, 0);
-}
diff --git a/libgloss/iq2000/configure b/libgloss/iq2000/configure
deleted file mode 100755
index b9cfbab..0000000
--- a/libgloss/iq2000/configure
+++ /dev/null
@@ -1,1232 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-sitefile=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --site-file=FILE        use FILE as the site file
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -site-file | --site-file | --site-fil | --site-fi | --site-f)
-    ac_prev=sitefile ;;
-  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
-    sitefile="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=crt0.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$sitefile"; then
-  if test -z "$CONFIG_SITE"; then
-    if test "x$prefix" != xNONE; then
-      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-    else
-      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-    fi
-  fi
-else
-  CONFIG_SITE="$sitefile"
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-ac_aux_dir=
-for ac_dir in $libgloss_topdir $srcdir/$libgloss_topdir; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $libgloss_topdir $srcdir/$libgloss_topdir" 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:598: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:619: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:637: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:691: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are building a library that must be included in all links, so we 
-# can't link an executable until this lib is built.
-# autoconf should provide a way to do this.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:755: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:785: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:834: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:858: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:894: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-if test "${with_multisubdir}" = "m32"; then
-  LD_TYPE="m32"
-else
-  LD_TYPE="m16"
-fi
-
- 
-host_makefile_frag_path=$host_makefile_frag
-
-
-target_makefile_frag_path=$target_makefile_frag
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@LD_TYPE@%$LD_TYPE%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-s%@target_makefile_frag_path@%$target_makefile_frag_path%g
-/@target_makefile_frag@/r $target_makefile_frag
-s%@target_makefile_frag@%%g
-s%@part_specific_obj@%$part_specific_obj%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-. ${libgloss_topdir}/config-ml.in
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-
-
diff --git a/libgloss/iq2000/configure.in b/libgloss/iq2000/configure.in
deleted file mode 100644
index 4baabcb..0000000
--- a/libgloss/iq2000/configure.in
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright (c) 2000, Cygnus Solutions, A Red Hat Company
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-#
-# Process this file with autoconf to produce a configure script.
-#
-AC_PREREQ(2.5)dnl
-AC_INIT(crt0.S)
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are building a library that must be included in all links, so we 
-# can't link an executable until this lib is built.
-# autoconf should provide a way to do this.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-if test "${with_multisubdir}" = "m32"; then
-  LD_TYPE="m32"
-else
-  LD_TYPE="m16"
-fi
-AC_SUBST(LD_TYPE)
- 
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-target_makefile_frag_path=$target_makefile_frag
-AC_SUBST(target_makefile_frag_path)
-AC_SUBST_FILE(target_makefile_frag)
-AC_SUBST(part_specific_obj)
-
-AC_OUTPUT(Makefile,
-. ${libgloss_topdir}/config-ml.in,
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-)
-
-
diff --git a/libgloss/iq2000/creat.c b/libgloss/iq2000/creat.c
deleted file mode 100644
index 1003a2a..0000000
--- a/libgloss/iq2000/creat.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-creat (const char *path,
-	int mode)
-{
-  return TRAP0 (SYS_creat, path, mode, 0);
-}
diff --git a/libgloss/iq2000/crt0.S b/libgloss/iq2000/crt0.S
deleted file mode 100644
index 12d2a5b..0000000
--- a/libgloss/iq2000/crt0.S
+++ /dev/null
@@ -1,56 +0,0 @@
-##==============================================================================
-##
-##	crt0.S
-##
-##	IQ2000 startup code
-##
-##==============================================================================
-##
-## Copyright (c) 2000, Cygnus Solutions, A Red Hat Company
-## 
-## The authors hereby grant permission to use, copy, modify, distribute,
-## and license this software and its documentation for any purpose, provided
-## that existing copyright notices are retained in all copies and that this
-## notice is included verbatim in any distributions. No written agreement,
-## license, or royalty fee is required for any of the authorized uses.
-## Modifications to this software may be copyrighted by their authors
-## and need not follow the licensing terms described here, provided that
-## the new terms are clearly indicated on the first page of each file where
-## they apply.
-##
-	
-##------------------------------------------------------------------------------
-	
-	.file	"crt0.S"
-
-##------------------------------------------------------------------------------
-## Startup code
-	.section .text
-	.global	_start
-_start:
-	lui %29,%hi(__stack)
-	ori %29,%29,%lo(__stack)
-
-	lui %24,%hi(_edata)	# get start of bss
-	ori %24,%24,%lo(_edata)
-
-	lui %25,%hi(_end)	# get end of bss
-	ori %25,%25,%lo(_end)
-
-	beq	%24,%25,.L0	# check if end and start are the same
-				# do nothing if no bss
-	
-.L1:
-	sb %0,0(%24)		#  clear a byte and bump pointer
-	addi %24,%24,1
-	bne %24,%25,.L1
-	nop
-	
-.L0:
-	jal  _main		# call _main to run ctors/dtors
-	nop
-	xor %4,%4,%4
-	jal main		# call main program
-	xor %5,%5,%5
-	jal exit		# all done, no need to return or
-	or %4,%0,%2		# exit with main's return value
diff --git a/libgloss/iq2000/crt1.c b/libgloss/iq2000/crt1.c
deleted file mode 100644
index fb333a8..0000000
--- a/libgloss/iq2000/crt1.c
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-/* This object reserves enough space for an EH frame initialization
-object.  */
-
-struct object {
-  void *reserve[7];
-};
-
-
-void _main ()
-{
-  static int initialized;
-  static struct object object;
-  if (! initialized)
-    {
-      typedef void (*pfunc) ();
-      extern pfunc __ctors[];
-      extern pfunc __ctors_end[];
-      extern unsigned char __eh_frame_begin[];
-      extern void __register_frame_info (void *, struct object *);
-
-      pfunc *p;
-
-      initialized = 1;
-      for (p = __ctors_end; p > __ctors; )
-	(*--p) ();
-
-      __register_frame_info (__eh_frame_begin, &object);
-    }
-}
diff --git a/libgloss/iq2000/execv.c b/libgloss/iq2000/execv.c
deleted file mode 100644
index 16f3ca5..0000000
--- a/libgloss/iq2000/execv.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-execv (const char *path, char *const argv[])
-{
-  return TRAP0 (SYS_execv, path, argv, 0);
-}
diff --git a/libgloss/iq2000/execve.c b/libgloss/iq2000/execve.c
deleted file mode 100644
index bd6c7a2..0000000
--- a/libgloss/iq2000/execve.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-_execve (const char *path, char *const argv[], char *const envp[])
-{
-  return TRAP0 (SYS_execve, path, argv, envp);
-}
diff --git a/libgloss/iq2000/fork.c b/libgloss/iq2000/fork.c
deleted file mode 100644
index 53df5a9..0000000
--- a/libgloss/iq2000/fork.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-_fork ()
-{
-  return TRAP0 (SYS_fork, 0, 0, 0);
-}
diff --git a/libgloss/iq2000/fstat.c b/libgloss/iq2000/fstat.c
deleted file mode 100644
index c3b2fa0..0000000
--- a/libgloss/iq2000/fstat.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-_fstat (int file,
-	struct stat *st)
-{
-  st->st_mode = S_IFCHR;
-  st->st_blksize = 4096;
-  return 0;
-}
diff --git a/libgloss/iq2000/getpid.c b/libgloss/iq2000/getpid.c
deleted file mode 100644
index 20ab186..0000000
--- a/libgloss/iq2000/getpid.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-_getpid (n)
-{
-  return 1;
-}
diff --git a/libgloss/iq2000/gettime.c b/libgloss/iq2000/gettime.c
deleted file mode 100644
index 1a04267..0000000
--- a/libgloss/iq2000/gettime.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-#include "sys/time.h"
-
-
-int
-_gettimeofday (struct timeval *tp, void *tzp)
-{
-  return TRAP0 (SYS_gettimeofday, tp, tzp, 0);
-}
diff --git a/libgloss/iq2000/isatty.c b/libgloss/iq2000/isatty.c
deleted file mode 100644
index 0930a53..0000000
--- a/libgloss/iq2000/isatty.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-isatty (fd)
-     int fd;
-{
-  return 1;
-}
diff --git a/libgloss/iq2000/kill.c b/libgloss/iq2000/kill.c
deleted file mode 100644
index 40afa6a..0000000
--- a/libgloss/iq2000/kill.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-_kill (n, m)
-{
-  return TRAP0 (SYS_exit, 0xdead, 0, 0);
-}
-
diff --git a/libgloss/iq2000/lseek.c b/libgloss/iq2000/lseek.c
deleted file mode 100644
index 339baea..0000000
--- a/libgloss/iq2000/lseek.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/unistd.h>
-#include "trap.h"
-
-
-off_t
-_lseek (int file,
-	off_t ptr,
-	int dir)
-{
-  return TRAP0 (SYS_lseek, file, ptr, dir);
-}
diff --git a/libgloss/iq2000/open.c b/libgloss/iq2000/open.c
deleted file mode 100644
index 770defe..0000000
--- a/libgloss/iq2000/open.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-_open (const char *path,
-	int flags)
-{
-  return TRAP0 (SYS_open, path, flags, 0);
-}
diff --git a/libgloss/iq2000/pipe.c b/libgloss/iq2000/pipe.c
deleted file mode 100644
index dfade5c..0000000
--- a/libgloss/iq2000/pipe.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-pipe (int fd)
-{
-  return TRAP0 (SYS_pipe, fd, 0, 0);
-}
diff --git a/libgloss/iq2000/read.c b/libgloss/iq2000/read.c
deleted file mode 100644
index 31d24cc..0000000
--- a/libgloss/iq2000/read.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-_read (int file,
-       char *ptr,
-       size_t len)
-{
-  return TRAP0 (SYS_read, file, ptr, len);
-}
diff --git a/libgloss/iq2000/sbrk.c b/libgloss/iq2000/sbrk.c
deleted file mode 100644
index 6dfd93b..0000000
--- a/libgloss/iq2000/sbrk.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <_ansi.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-caddr_t
-_sbrk (size_t incr)
-{
-  extern char __stack;       /* Defined by the linker */
-  extern char _end;		/* Defined by the linker */
-  static char *heap_end;
-  char *prev_heap_end;
-  char *sp = (char *)&sp;
-
-  if (heap_end == 0)
-    {
-      heap_end = &_end;
-    }
-  prev_heap_end = heap_end;
-  heap_end += incr;
-  if (heap_end > sp)
-    {
-      _write (1, "Heap and stack collision\n", 25);
-      errno = ENOMEM;
-      return (caddr_t)-1;
-    }
-  return (caddr_t) prev_heap_end;
-}
diff --git a/libgloss/iq2000/sim.ld b/libgloss/iq2000/sim.ld
deleted file mode 100644
index 5f59d02..0000000
--- a/libgloss/iq2000/sim.ld
+++ /dev/null
@@ -1,279 +0,0 @@
-/* Special linker script for running C executables on simulator */
-OUTPUT_FORMAT("elf32-iq2000", "elf32-iq2000",
-	      "elf32-iq2000")
-OUTPUT_ARCH(iq2000)
-ENTRY(_start)
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-SECTIONS
-{
-  . = 0x80000000;
-  .interp     : { *(.interp) 	}
-  .rel.init      : { *(.rel.init)	}
-  .rela.init     : { *(.rela.init)	}
-  .rel.text      :
-    {
-      *(.rel.text)
-      *(.rel.text.*)
-      *(.rel.gnu.linkonce.t.*)
-    }
-  .rela.text     :
-    {
-      *(.rela.text)
-      *(.rela.text.*)
-      *(.rela.gnu.linkonce.t.*)
-    }
-  .rel.fini      : { *(.rel.fini)	}
-  .rela.fini     : { *(.rela.fini)	}
-  .rel.rodata    :
-    {
-      *(.rel.rodata)
-      *(.rel.rodata.*)
-      *(.rel.gnu.linkonce.r.*)
-    }
-  .rela.rodata   :
-    {
-      *(.rela.rodata)
-      *(.rela.rodata.*)
-      *(.rela.gnu.linkonce.r.*)
-    }
-  .rel.data      :
-    {
-      *(.rel.data)
-      *(.rel.data.*)
-      *(.rel.gnu.linkonce.d.*)
-    }
-  .rela.data     :
-    {
-      *(.rela.data)
-      *(.rela.data.*)
-      *(.rela.gnu.linkonce.d.*)
-    }
-  .rel.ctors     : { *(.rel.ctors)	}
-  .rela.ctors    : { *(.rela.ctors)	}
-  .rel.dtors     : { *(.rel.dtors)	}
-  .rela.dtors    : { *(.rela.dtors)	}
-  .rel.got       : { *(.rel.got)		}
-  .rela.got      : { *(.rela.got)		}
-  .rel.sdata     :
-    {
-      *(.rel.sdata)
-      *(.rel.sdata.*)
-      *(.rel.gnu.linkonce.s.*)
-    }
-  .rela.sdata     :
-    {
-      *(.rela.sdata)
-      *(.rela.sdata.*)
-      *(.rela.gnu.linkonce.s.*)
-    }
-  .rel.sbss      :
-    {
-      *(.rel.sbss)
-      *(.rel.sbss.*)
-      *(.rel.gnu.linkonce.sb.*)
-    }
-  .rela.sbss     :
-    {
-      *(.rela.sbss)
-      *(.rela.sbss.*)
-      *(.rela.gnu.linkonce.sb.*)
-    }
-  .rel.sdata2    :
-    {
-      *(.rel.sdata2)
-      *(.rel.sdata2.*)
-      *(.rel.gnu.linkonce.s2.*)
-    }
-  .rela.sdata2   :
-    {
-      *(.rela.sdata2)
-      *(.rela.sdata2.*)
-      *(.rela.gnu.linkonce.s2.*)
-    }
-  .rel.sbss2     :
-    {
-      *(.rel.sbss2)
-      *(.rel.sbss2.*)
-      *(.rel.gnu.linkonce.sb2.*)
-    }
-  .rela.sbss2    :
-    {
-      *(.rela.sbss2)
-      *(.rela.sbss2.*)
-      *(.rela.gnu.linkonce.sb2.*)
-    }
-  .rel.bss       :
-    {
-      *(.rel.bss)
-      *(.rel.bss.*)
-      *(.rel.gnu.linkonce.b.*)
-    }
-  .rela.bss      :
-    {
-      *(.rela.bss)
-      *(.rela.bss.*)
-      *(.rela.gnu.linkonce.b.*)
-    }
-  .rel.plt       : { *(.rel.plt)		}
-  .rela.plt      : { *(.rela.plt)		}
-  .init          :
-  {
-    KEEP (*(.init))
-  } =0
-  .plt      : { *(.plt)	}
-  .text      :
-  {
-    *(.text)
-    *(.text.*)
-    *(.stub)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t.*)
-  } =0
-  .fini      :
-  {
-    KEEP (*(.fini))
-  } =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = 0x1000;
-  .data    :
-  {
-    *(.data)
-    *(.data.*)
-    *(.gnu.linkonce.d.*)
-    SORT(CONSTRUCTORS)
-  }
-  .data1   : { *(.data1) }
-  .eh_frame   :
-  {
-    PROVIDE (__eh_frame_begin = .);
-    *(.eh_frame)
-    LONG (0);
-    PROVIDE (__eh_frame_end = .);
-  }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .hash          : { *(.hash)		}
-  .dynsym        : { *(.dynsym)		}
-  .dynstr        : { *(.dynstr)		}
-  .gnu.version   : { *(.gnu.version)	}
-  .gnu.version_d   : { *(.gnu.version_d)	}
-  .gnu.version_r   : { *(.gnu.version_r)	}
-  .rodata   : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) }
-  .rodata1   : { *(.rodata1) }
-  .sdata2   : { *(.sdata2) *(.sdata2.*) *(.gnu.linkonce.s2.*) }
-  .sbss2   : { *(.sbss2) *(.sbss2.*) *(.gnu.linkonce.sb2.*) }
-  .dynamic       : { *(.dynamic) }
-  .ctors   :
-  {
-    __ctors = .;
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-    __ctors_end = .;
-  }
-   .dtors         :
-  {
-    __dtors = .;
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-    __dtors_end = .;
-  }
-  .jcr : { KEEP (*(.jcr)) }
-  .got		  : { *(.got.plt) *(.got) }
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata     :
-  {
-    *(.sdata)
-    *(.sdata.*)
-    *(.gnu.linkonce.s.*)
-  }
-  _edata = .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  .sbss      :
-  {
-    PROVIDE (__sbss_start = .);
-    PROVIDE (___sbss_start = .);
-    *(.dynsbss)
-    *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
-    *(.scommon)
-    PROVIDE (__sbss_end = .);
-    PROVIDE (___sbss_end = .);
-  }
-  .bss       :
-  {
-   *(.dynbss)
-   *(.bss)
-   *(.bss.*)
-   *(.gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-   . = ALIGN(32 / 8);
-  }
-  . = ALIGN(32 / 8);
-  _end = .;
-  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  PROVIDE (__stack = 0x80000);
-  /* These must appear regardless of  .  */
-}
diff --git a/libgloss/iq2000/stat.c b/libgloss/iq2000/stat.c
deleted file mode 100644
index 4e1fddf..0000000
--- a/libgloss/iq2000/stat.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-_stat (const char *path, struct stat *st)
-
-{
-  return TRAP0 (SYS_stat, path, st, 0);
-}
diff --git a/libgloss/iq2000/test.c b/libgloss/iq2000/test.c
deleted file mode 100644
index 9ea873a..0000000
--- a/libgloss/iq2000/test.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <stdio.h>
-
-static void
-send_msg1 (void)
-{
-  static char msg[] = "Hello World\r\n";
-  write(1, msg, strlen (msg));
-}
-
-static void
-send_msg2 (void)
-{
-  static char msg[] = "Goodnight Irene\r\n";
-  write(1, msg, strlen (msg));
-}
-
-static void
-delay (void)
-{
-  int i;
-
-  for (i = 0; i < 1000000; i++)
-    ;
-}
-
-int
-main(int argc, char *argv[])
-{
-  int i, j;
-  for (i = 0; i < 10; i++)
-    {
-      send_msg1 ();
-      delay ();
-      send_msg2 ();
-    }
-  return 0;
-}
-
-
diff --git a/libgloss/iq2000/time.c b/libgloss/iq2000/time.c
deleted file mode 100644
index 2df8d48..0000000
--- a/libgloss/iq2000/time.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-time_t
-time (time_t *tloc)
-{
-  return TRAP0 (SYS_time, tloc, 0, 0);
-}
diff --git a/libgloss/iq2000/times.c b/libgloss/iq2000/times.c
deleted file mode 100644
index b804be4..0000000
--- a/libgloss/iq2000/times.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-#include "sys/times.h"
-
-
-clock_t
-times (struct tms *buffer)
-{
-  return TRAP0 (SYS_times, buffer, 0, 0);
-}
diff --git a/libgloss/iq2000/trap.c b/libgloss/iq2000/trap.c
deleted file mode 100644
index 217cef2..0000000
--- a/libgloss/iq2000/trap.c
+++ /dev/null
@@ -1,13 +0,0 @@
-// Perform a system call.
-// Unused parameters should be set to 0.
-int __trap0(unsigned long func, unsigned long p1, unsigned long p2, unsigned long p3)
-{
-  int ret = 0;
-  asm volatile ("nop\n\tor %%4,%%0,%0" : : "r"(func));
-  asm volatile ("nop\n\tor %%5,%%0,%0" : : "r"(p1));
-  asm volatile ("nop\n\tor %%6,%%0,%0" : : "r"(p2));
-  asm volatile ("nop\n\tor %%7,%%0,%0" : : "r"(p3));
-  asm volatile ("nop\n\tor %%11,%%0,%0" : : "r"(func));
-  asm volatile ("syscall\n\tnop\n\tor %0,%%0,%%2" : "=r"(ret));
-  return ret;
-}
diff --git a/libgloss/iq2000/trap.h b/libgloss/iq2000/trap.h
deleted file mode 100644
index 27636c0..0000000
--- a/libgloss/iq2000/trap.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "syscall.h"
-
-int __trap0 ();
-
-#define TRAP0(f, p1, p2, p3) __trap0(f, (p1), (p2), (p3))
diff --git a/libgloss/iq2000/unlink.c b/libgloss/iq2000/unlink.c
deleted file mode 100644
index 84fb711..0000000
--- a/libgloss/iq2000/unlink.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-_unlink ()
-{
-  return -1;
-}
diff --git a/libgloss/iq2000/utime.c b/libgloss/iq2000/utime.c
deleted file mode 100644
index 3fce7e3..0000000
--- a/libgloss/iq2000/utime.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-utime (path, times)
-     const char *path;
-     char *times;
-{
-  return TRAP0 (SYS_utime, path, times, 0);
-}
diff --git a/libgloss/iq2000/wait.c b/libgloss/iq2000/wait.c
deleted file mode 100644
index c8d8b4c..0000000
--- a/libgloss/iq2000/wait.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-_wait (statusp)
-     int *statusp;
-{
-  return TRAP0 (SYS_wait, 0, 0, 0);
-}
diff --git a/libgloss/iq2000/write.c b/libgloss/iq2000/write.c
deleted file mode 100644
index 3ecf4a8..0000000
--- a/libgloss/iq2000/write.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-_write ( int file,
-	 char *ptr,
-	 size_t len)
-{
-  return TRAP0 (SYS_write, file, ptr, len);
-}
diff --git a/libgloss/libnosys/Makefile.in b/libgloss/libnosys/Makefile.in
index d6634fc..4856154 100644
--- a/libgloss/libnosys/Makefile.in
+++ b/libgloss/libnosys/Makefile.in
@@ -10,7 +10,6 @@
 # the new terms are clearly indicated on the first page of each file where
 # they apply.
 
-DESTDIR =
 VPATH = @srcdir@
 srcdir = @srcdir@
 objdir = .
@@ -44,15 +43,15 @@ SHELL =	/bin/sh
 CC = @CC@
 
 #AS = @AS@
-AS = `if [ -f ${objroot}/../gas/as-new ] ; \
-	then echo ${objroot}/../gas/as-new ; \
+AS = `if [ -f ${objroot}/../gas/as.new ] ; \
+	then echo ${objroot}/../gas/as.new ; \
 	else echo as ; fi`
 
 AR = @AR@
 
 #LD = @LD@
-LD = `if [ -f ${objroot}/../ld/ld-new ] ; \
-	then echo ${objroot}/../ld/ld-new ; \
+LD = `if [ -f ${objroot}/../ld/ld.new ] ; \
+	then echo ${objroot}/../ld/ld.new ; \
 	else echo ld ; fi`
 
 RANLIB = @RANLIB@
@@ -65,10 +64,9 @@ OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
 	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
 
 # object files needed
-OBJS = chown.o close.o environ.o errno.o execve.o fork.o fstat.o \
-	getpid.o gettod.o isatty.o kill.o link.o lseek.o open.o \
-	read.o readlink.o sbrk.o stat.o symlink.o times.o unlink.o \
-	wait.o write.o _exit.o
+OBJS = close.o environ.o execve.o fork.o fstat.o getpid.o gettod.o isatty.o \
+	kill.o link.o lseek.o open.o read.o sbrk.o stat.o \
+	times.o unlink.o wait.o write.o
 
 # Object files specific to particular targets.
 EVALOBJS = ${OBJS}
@@ -131,8 +129,8 @@ distclean maintainer-clean realclean: clean
 .PHONY: install info install-info clean-info
 install:
 	@for outputs in ${OUTPUTS}; do\
-	 mkdir -p $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
-	 $(INSTALL_PROGRAM) $${outputs} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
+	 mkdir -p $(tooldir)/lib${MULTISUBDIR}; \
+	 $(INSTALL_PROGRAM) $${outputs} $(tooldir)/lib${MULTISUBDIR}; \
 	done
 
 info:
diff --git a/libgloss/libnosys/_exit.c b/libgloss/libnosys/_exit.c
deleted file mode 100644
index d4dd232..0000000
--- a/libgloss/libnosys/_exit.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Stub version of _exit.  */
-
-#include <limits.h>
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-
-_VOID
-_DEFUN (_exit, (rc),
-	int rc)
-{
-  /* Default stub just causes a divide by 0 exception.  */
-  int x = rc / INT_MAX;
-  x = 4 / x;
-}
diff --git a/libgloss/libnosys/acconfig.h b/libgloss/libnosys/acconfig.h
index c6df5d5..a9508c7 100644
--- a/libgloss/libnosys/acconfig.h
+++ b/libgloss/libnosys/acconfig.h
@@ -19,8 +19,5 @@
 /* .pushsection/.popsection directives allowed */
 #undef HAVE_ASM_POPSECTION_DIRECTIVE
 
-/* support for section attributes */
-#undef HAVE_SECTION_ATTRIBUTES
-
 /* symbol prefix */
 #undef __SYMBOL_PREFIX
diff --git a/libgloss/libnosys/chown.c b/libgloss/libnosys/chown.c
deleted file mode 100644
index 67f98d5..0000000
--- a/libgloss/libnosys/chown.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Stub version of chown.
- */
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include <sys/types.h>
-#undef errno
-extern int errno;
-#include "warning.h"
-
-int
-_DEFUN (_chown, (path, owner, group),
-        const char *path  _AND
-        uid_t owner _AND
-        gid_t group)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-stub_warning(_chown)
diff --git a/libgloss/libnosys/config.h.in b/libgloss/libnosys/config.h.in
index f7fe3fef..fa5d9d9 100644
--- a/libgloss/libnosys/config.h.in
+++ b/libgloss/libnosys/config.h.in
@@ -15,8 +15,5 @@
 /* .pushsection/.popsection directives allowed */
 #undef HAVE_ASM_POPSECTION_DIRECTIVE
 
-/* support for section attributes */
-#undef HAVE_SECTION_ATTRIBUTES
-
 /* symbol prefix */
 #undef __SYMBOL_PREFIX
diff --git a/libgloss/libnosys/configure b/libgloss/libnosys/configure
index a3de0b1..944d970 100755
--- a/libgloss/libnosys/configure
+++ b/libgloss/libnosys/configure
@@ -755,8 +755,6 @@ case "${target}" in
 	;;
   strongarm-*-*)
 	;;
-  cris-*-* | crisv32-*-*)
-	;;
   d10v*)
 	;;
   h8300*-*-*)
@@ -789,8 +787,6 @@ case "${target}" in
 	;;
   w65-*-*)
 	;;	
-  xstormy16-*-*)
-	;;
   z8k-*-*)
 	;;
   *)
@@ -813,94 +809,64 @@ echo "configure:813: checking for .previous assembler directive" >&5
 if eval "test \"`echo '$''{'libc_cv_asm_previous_directive'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-          libc_cv_asm_previous_directive=no
-        cat > conftest.s <<EOF
+          cat > conftest.s <<EOF
 .section foo_section
 .previous
 EOF
-        if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-          libc_cv_asm_previous_directive=yes
+        if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
           cat >> confdefs.h <<\EOF
 #define HAVE_ASM_PREVIOUS_DIRECTIVE 1
 EOF
 
-        fi
-        rm -f conftest*
+        else
+          rm -f conftest*
 fi
 
 echo "$ac_t""$libc_cv_asm_previous_directive" 1>&6
-
-        echo $ac_n "checking for .popsection assembler directive""... $ac_c" 1>&6
-echo "configure:835: checking for .popsection assembler directive" >&5
+          echo $ac_n "checking for .popsection assembler directive""... $ac_c" 1>&6
+echo "configure:832: checking for .popsection assembler directive" >&5
 if eval "test \"`echo '$''{'libc_cv_asm_popsection_directive'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-          libc_cv_asm_popsection_directive=no
-        cat > conftest.s <<EOF
+            cat > conftest.s <<EOF
 .pushsection foo_section
 .popsection
 EOF
-        if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-          libc_cv_asm_popsection_directive=yes
-          cat >> confdefs.h <<\EOF
+          if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+            cat >> confdefs.h <<\EOF
 #define HAVE_ASM_POPSECTION_DIRECTIVE 1
 EOF
 
+          fi
         fi
         rm -f conftest*
 fi
 
 echo "$ac_t""$libc_cv_asm_popsection_directive" 1>&6
-
-        echo $ac_n "checking for section attributes""... $ac_c" 1>&6
-echo "configure:857: checking for section attributes" >&5
-if eval "test \"`echo '$''{'libc_cv_section_attributes'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-          libc_cv_section_attributes=no
-        cat > conftest.c <<EOF
-int secttest __attribute__ ((section (".gnu.warning.secttest"))) = 10;
-int main() {}
-EOF
-        if { ac_try='${CC-cc} -c $CFLAGS conftest.c 1>&5'; { (eval echo configure:866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-          libc_cv_section_attributes=yes
-          cat >> confdefs.h <<\EOF
-#define HAVE_SECTION_ATTRIBUTES 1
-EOF
-
-        fi
-        rm -f conftest*
-fi
-
-echo "$ac_t""$libc_cv_section_attributes" 1>&6
-        ;;
+	;;
 esac
 
-echo $ac_n "checking for symbol prefix""... $ac_c" 1>&6
-echo "configure:881: checking for symbol prefix" >&5
-if eval "test \"`echo '$''{'libc_symbol_prefix'+set}'`\" = set"; then
+echo $ac_n "checking for function prefix""... $ac_c" 1>&6
+echo "configure:855: checking for function prefix" >&5
+if eval "test \"`echo '$''{'libc_dollar_prefix'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.c <<\EOF
 foo () { }
 EOF
-libc_symbol_prefix=none
-if { ac_try='${CC-cc} -S conftest.c -o - | fgrep "\$foo" > /dev/null'; { (eval echo configure:889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; };
+if { ac_try='${CC-cc} -S conftest.c -o - | fgrep "\$foo" > /dev/null'; { (eval echo configure:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; };
 then
-  libc_symbol_prefix='$'
+  libc_dollar_prefix=yes
 else
-  if { ac_try='${CC-cc} -S conftest.c -o - | fgrep "_foo" > /dev/null'; { (eval echo configure:893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; };
-  then
-    libc_symbol_prefix=_
-  fi
+  libc_dollar_prefix=no
 fi
 rm -f conftest* 
 fi
 
-echo "$ac_t""$libc_symbol_prefix" 1>&6
-if test $libc_symbol_prefix != none; then
-  cat >> confdefs.h <<EOF
-#define __SYMBOL_PREFIX "$libc_symbol_prefix"
+echo "$ac_t""$libc_dollar_prefix" 1>&6
+if test $libc_dollar_prefix = yes ; then
+  cat >> confdefs.h <<\EOF
+#define __SYMBOL_PREFIX "$"
 EOF
 
 else
@@ -913,7 +879,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:917: checking for $ac_word" >&5
+echo "configure:887: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -943,7 +909,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:947: checking for $ac_word" >&5
+echo "configure:917: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -992,7 +958,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:996: checking whether we are using GNU C" >&5
+echo "configure:966: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1001,7 +967,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1016,7 +982,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1020: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:990: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1052,7 +1018,7 @@ LD=${LD-ld}
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1056: checking for $ac_word" >&5
+echo "configure:1026: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/libgloss/libnosys/configure.in b/libgloss/libnosys/configure.in
index b39799f..45cbfdd 100644
--- a/libgloss/libnosys/configure.in
+++ b/libgloss/libnosys/configure.in
@@ -89,8 +89,6 @@ case "${target}" in
 	;;
   strongarm-*-*)
 	;;
-  cris-*-* | crisv32-*-*)
-	;;
   d10v*)
 	;;
   h8300*-*-*)
@@ -123,8 +121,6 @@ case "${target}" in
 	;;
   w65-*-*)
 	;;	
-  xstormy16-*-*)
-	;;
   z8k-*-*)
 	;;
   *)
@@ -138,64 +134,43 @@ case "${target}" in
         AC_DEFINE(HAVE_ELF)
 
         AC_CACHE_CHECK(for .previous assembler directive,
-                         libc_cv_asm_previous_directive, [dnl
-        libc_cv_asm_previous_directive=no
+                       libc_cv_asm_previous_directive, [dnl
         cat > conftest.s <<EOF
 .section foo_section
 .previous
 EOF
         if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s 1>&AC_FD_CC); then
-          libc_cv_asm_previous_directive=yes
           AC_DEFINE(HAVE_ASM_PREVIOUS_DIRECTIVE)
-        fi
-        rm -f conftest*])
-
-        AC_CACHE_CHECK(for .popsection assembler directive,
+        else
+          rm -f conftest*])
+          AC_CACHE_CHECK(for .popsection assembler directive,
                          libc_cv_asm_popsection_directive, [dnl
-        libc_cv_asm_popsection_directive=no
-        cat > conftest.s <<EOF
+          cat > conftest.s <<EOF
 .pushsection foo_section
 .popsection
 EOF
-        if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s 1>&AC_FD_CC); then
-          libc_cv_asm_popsection_directive=yes
-          AC_DEFINE(HAVE_ASM_POPSECTION_DIRECTIVE)
+          if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s 1>&AC_FD_CC); then
+            AC_DEFINE(HAVE_ASM_POPSECTION_DIRECTIVE)
+          fi
         fi
         rm -f conftest*])
-
-        AC_CACHE_CHECK(for section attributes,
-                         libc_cv_section_attributes, [dnl
-        libc_cv_section_attributes=no
-        cat > conftest.c <<EOF
-int secttest __attribute__ ((section (".gnu.warning.secttest"))) = 10;
-int main() {}
-EOF
-        if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.c 1>&AC_FD_CC); then
-          libc_cv_section_attributes=yes
-          AC_DEFINE(HAVE_SECTION_ATTRIBUTES)
-        fi
-        rm -f conftest*])
-        ;;
+	;;
 esac
 
-AC_CACHE_CHECK(for symbol prefix, libc_symbol_prefix, [dnl
+AC_CACHE_CHECK(for function prefix, libc_dollar_prefix, [dnl
 cat > conftest.c <<\EOF
 foo () { }
 EOF
 dnl
-libc_symbol_prefix=none
 if AC_TRY_COMMAND([${CC-cc} -S conftest.c -o - | fgrep "\$foo" > /dev/null]);
 then
-  libc_symbol_prefix='$'
+  libc_dollar_prefix=yes
 else
-  if AC_TRY_COMMAND([${CC-cc} -S conftest.c -o - | fgrep "_foo" > /dev/null]);
-  then
-    libc_symbol_prefix=_
-  fi
+  libc_dollar_prefix=no
 fi
 rm -f conftest* ])
-if test $libc_symbol_prefix != none; then
-  AC_DEFINE_UNQUOTED(__SYMBOL_PREFIX, "$libc_symbol_prefix")
+if test $libc_dollar_prefix = yes ; then
+  AC_DEFINE(__SYMBOL_PREFIX, "$")
 else
   AC_DEFINE(__SYMBOL_PREFIX, "")
 fi
diff --git a/libgloss/libnosys/errno.c b/libgloss/libnosys/errno.c
deleted file mode 100644
index 27d8e3a..0000000
--- a/libgloss/libnosys/errno.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Supply a definition of errno if one not already provided.  */
-
-int errno;
diff --git a/libgloss/libnosys/readlink.c b/libgloss/libnosys/readlink.c
deleted file mode 100644
index 7df253c..0000000
--- a/libgloss/libnosys/readlink.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Stub version of readlink.
- */
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include <sys/types.h>
-#undef errno
-extern int errno;
-#include "warning.h"
-
-int
-_DEFUN (_readlink, (path, buf, bufsize),
-        const char *path _AND
-        char *buf _AND
-        size_t bufsize)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-stub_warning(_readlink)
diff --git a/libgloss/libnosys/sbrk.c b/libgloss/libnosys/sbrk.c
index 39f411c..8091d70 100644
--- a/libgloss/libnosys/sbrk.c
+++ b/libgloss/libnosys/sbrk.c
@@ -1,21 +1,27 @@
-/* Version of sbrk for no operating system.  */
+/*
+ * Version of sbrk for no operating system.
+ */
 
 #include "config.h"
+#include <_ansi.h>
 #include <_syslist.h>
+#include <sys/types.h>
+#include <errno.h>
+#undef errno
+extern int errno;
 
-void *
-_sbrk (incr)
-     int incr;
+caddr_t 
+_DEFUN (_sbrk, (incr),
+        int incr)
 { 
-   extern char   end; /* Set by linker.  */
-   static char * heap_end; 
-   char *        prev_heap_end; 
-
-   if (heap_end == 0)
-     heap_end = & end; 
+   extern char end; /* set by linker */
+   static char *heap_end; 
+   char *prev_heap_end; 
 
+   if (heap_end == 0) { 
+      heap_end = &end; 
+   } 
    prev_heap_end = heap_end; 
    heap_end += incr; 
-
-   return (void *) prev_heap_end; 
+   return (caddr_t) prev_heap_end; 
 } 
diff --git a/libgloss/libnosys/symlink.c b/libgloss/libnosys/symlink.c
deleted file mode 100644
index d9e29f2..0000000
--- a/libgloss/libnosys/symlink.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Stub version of symlink.
- */
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#undef errno
-extern int errno;
-#include "warning.h"
-
-int
-_DEFUN (_symlink, (path1, path2),
-        const char *path1 _AND
-        const char *path2)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-stub_warning(_symlink)
diff --git a/libgloss/libnosys/warning.h b/libgloss/libnosys/warning.h
index 9232a92..99f3e0d 100644
--- a/libgloss/libnosys/warning.h
+++ b/libgloss/libnosys/warning.h
@@ -7,22 +7,18 @@
 /* We want the .gnu.warning.SYMBOL section to be unallocated.  */
 #  ifdef HAVE_ASM_PREVIOUS_DIRECTIVE
 #   define __make_section_unallocated(section_string)   \
-  asm(".section " section_string "\n .previous");
+  asm(".section " section_string "; .previous");
 #  elif defined (HAVE_ASM_POPSECTION_DIRECTIVE)
 #   define __make_section_unallocated(section_string)   \
-  asm(".pushsection " section_string "\n .popsection");
+  asm(".pushsection " section_string "; .popsection");
 #  else
 #   define __make_section_unallocated(section_string)
 #  endif
 
-#  ifdef HAVE_SECTION_ATTRIBUTES
-#   define link_warning(symbol, msg)                     \
+#  define link_warning(symbol, msg)                     \
+  __make_section_unallocated (".gnu.warning." #symbol)  \
   static const char __evoke_link_warning_##symbol[]     \
-    __attribute__ ((section (".gnu.warning." __SYMBOL_PREFIX #symbol), \
-		   __used__)) = msg;
-#  else
-#   define link_warning(symbol, msg)
-#  endif
+    __attribute__ ((section (".gnu.warning." #symbol))) = msg;
 
 #else /* !ELF */
 
@@ -35,10 +31,9 @@
 # define link_warning(symbol, msg)
 #endif
 
-/* A canned warning for sysdeps/stub functions.
-   The GNU linker prepends a "warning: " string.  */
+/* A canned warning for sysdeps/stub functions.  */
 #define stub_warning(name) \
   link_warning (name, \
-                #name " is not implemented and will always fail")
+                "warning: " #name " is not implemented and will always fail")
 
 #endif /* __WARNING_H__ */
diff --git a/libgloss/m32c/Makefile.in b/libgloss/m32c/Makefile.in
deleted file mode 100644
index eb00aae..0000000
--- a/libgloss/m32c/Makefile.in
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright (c) 2005 Red Hat Inc
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-
-# Makefile for libgloss/m32c.
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-SHELL = /bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-AR_FLAGS = rc
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-SCRIPTS = r8c.ld m16c.ld m32cm.ld m32c.ld m16cmon.ld m32cmon.ld sim8.ld sim16.ld sim24.ld
-CRT = crt0.o crtn.o
-SIM_BSP = libsim.a
-LIBNOSYS = ../libnosys/libnosys.a
-SIM_OBJS = \
-	sbrk.o \
-	heaptop.o \
-	exit.o \
-	open.o \
-	close.o \
-	read.o \
-	write.o \
-	lseek.o \
-	unlink.o \
-	getpid.o \
-	kill.o \
-	fstat.o \
-	argvlen.o \
-	argv.o \
-	chdir.o \
-	stat.o \
-	chmod.o \
-	utime.o \
-	time.o \
-	gettimeofday.o \
-	times.o \
-	link.o \
-	isatty.o \
-	abort.o
-
-
-#### Host specific Makefile fragment comes in here.
-@host_makefile_frag@
-
-
-# Override .S.o rule to pass assembler debugging flags
-.S.o:
-	$(CC) -Wa,-gdwarf2 -Wa,-I$(srcdir) $(CFLAGS_FOR_TARGET) $(INCLUDES) $(CFLAGS) -c $<
-
-all: $(CRT) $(SIM_BSP) $(SCRIPTS)
-
-$(SIM_BSP): $(SIM_OBJS)
-	$(AR) $(ARFLAGS) $@ $?
-	$(RANLIB) $@
-
-# genscript parameters: srcdir name ramstart ramsize romstart romsize vecprefix
-
-GDEP = $(srcdir)/m32c.tmpl $(srcdir)/genscript Makefile
-GS = $(SHELL) $(srcdir)/genscript $(srcdir) 
-
-# NOTE: The simulators and monitors reserve the following locations
-# for themselves, so we skip them:
-#   R8C/M16C:	0x400-0x4ff	0x0ff600-0x0ffcff
-#   M32C:	0x400-0x4ff	0xfff600-0xfffcff
-
-r8c.ld : $(GDEP)
-	$(GS) r8c   0x500  0x300   0xc000   0x3f24   0xff
-
-m16c.ld : $(GDEP)
-	$(GS) m16c  0x500 0x4f00  0xc0000  0x3f600  0xfff
-
-m32cm.ld : $(GDEP)
-	$(GS) m32cm 0x500 0x2700 0xfe0000 0x01f600 0xffff
-
-m32c.ld : $(GDEP)
-	$(GS) m32c  0x500 0x7b00 0xf80000 0x07f600 0xffff
-
-
-m16cmon.ld : $(GDEP)
-	$(GS) m16cmon  0x400  0x100  0xff600    0x800  0xfff
-
-m32cmon.ld : $(GDEP)
-	$(GS) m32cmon  0x400  0x100 0xfff600    0x800 0xffff
-
-
-sim8.ld : $(GDEP)
-	$(GS) sim8  0x500 0xf624        0        0   0xff
-
-sim16.ld : $(GDEP)
-	$(GS) sim16 0x500 0xf700  0x20000  0x80000  0xfff
-
-sim24.ld : $(GDEP)
-	$(GS) sim24 0x200000 0x800000   0        0 0xffff
-
-# Dependencies
-
-SDEPS = $(srcdir)/m32csys.h $(srcdir)/../syscall.h
-
-abort.o : $(SDEPS)
-argv.o : $(SDEPS)
-argvlen.o : $(SDEPS)
-chdir.o : $(SDEPS)
-chmod.o : $(SDEPS)
-close.o : $(SDEPS)
-exit.o : $(SDEPS)
-fstat.o : $(SDEPS)
-getpid.o : $(SDEPS)
-gettimeofday.o : $(SDEPS)
-heaptop.o : $(SDEPS)
-kill.o : $(SDEPS)
-link.o : $(SDEPS)
-lseek.o : $(SDEPS)
-open.o : $(SDEPS)
-read.o : $(SDEPS)
-stat.o : $(SDEPS)
-time.o : $(SDEPS)
-times.o : $(SDEPS)
-unlink.o : $(SDEPS)
-utime.o : $(SDEPS)
-write.o : $(SDEPS)
-
-install: $(CRT) $(SIM_BSP) $(SCRIPTS)
-	for c in $(CRT) $(SIM_BSP); do \
-	  $(INSTALL_DATA) $$c $(tooldir)/lib${MULTISUBDIR}/$$c ;\
-	done
-	for c in $(SCRIPTS); do \
-	  $(INSTALL_DATA) $$c $(tooldir)/lib${MULTISUBDIR}/$$c ;\
-	done
-
-clean mostlyclean:
-	rm -f *.o *.a
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.cache config.log config.status
-
-.PHONY: info dvi doc install-info clean-info
-info doc dvi:
-install-info:
-clean-info:
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/libgloss/m32c/abort.S b/libgloss/m32c/abort.S
deleted file mode 100644
index 41d2942..0000000
--- a/libgloss/m32c/abort.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-	.global _abort
-_abort:
-	/* This is for debuggers.  The simulator stops here too. */
-	brk
-
-	/* Else, fall back on the simulator's "kill me" option.  */
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-	mov.w	#42,r1
-#else
-	mov.w	#42,r0
-#endif
-	
-	SYSCALL(SYS_kill)
-
-	/* Else, exit. */
-	jmp.a	__exit
diff --git a/libgloss/m32c/argv.S b/libgloss/m32c/argv.S
deleted file mode 100644
index 850964c..0000000
--- a/libgloss/m32c/argv.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(argv)
diff --git a/libgloss/m32c/argvlen.S b/libgloss/m32c/argvlen.S
deleted file mode 100644
index 073c69b..0000000
--- a/libgloss/m32c/argvlen.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(argvlen)
diff --git a/libgloss/m32c/chdir.S b/libgloss/m32c/chdir.S
deleted file mode 100644
index a68aeb2..0000000
--- a/libgloss/m32c/chdir.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(chdir)
diff --git a/libgloss/m32c/chmod.S b/libgloss/m32c/chmod.S
deleted file mode 100644
index 7fc14c9..0000000
--- a/libgloss/m32c/chmod.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(chmod)
diff --git a/libgloss/m32c/close.S b/libgloss/m32c/close.S
deleted file mode 100644
index ae6b63c..0000000
--- a/libgloss/m32c/close.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(close)
diff --git a/libgloss/m32c/configure b/libgloss/m32c/configure
deleted file mode 100755
index 5d272c9..0000000
--- a/libgloss/m32c/configure
+++ /dev/null
@@ -1,1204 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=crt0.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-ac_aux_dir=
-for ac_dir in $libgloss_topdir $srcdir/$libgloss_topdir; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $libgloss_topdir $srcdir/$libgloss_topdir" 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:680: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:744: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:823: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:847: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:884: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-host_makefile_frag_path=$host_makefile_frag
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-. ${libgloss_topdir}/config-ml.in
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/libgloss/m32c/configure.in b/libgloss/m32c/configure.in
deleted file mode 100644
index 877f6a0..0000000
--- a/libgloss/m32c/configure.in
+++ /dev/null
@@ -1,90 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
-AC_INIT(crt0.S)
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AC_OUTPUT(Makefile,
-. ${libgloss_topdir}/config-ml.in,
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-)
diff --git a/libgloss/m32c/crt0.S b/libgloss/m32c/crt0.S
deleted file mode 100644
index 9b29ffc..0000000
--- a/libgloss/m32c/crt0.S
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-#define A16
-#define A(n,w) n
-#define W w
-#define ADDR .2byte
-#define ALIGN 1
-#else
-#define A24
-#define A(n,w) w
-#define W l
-#define ADDR .4byte
-#define ALIGN 2
-#endif
-
-	.text
-
-	.global _start
-_start:
-.LFB2:
-	fset	U	/* User stack */
-	ldc	#__stack,sp
-
-#ifdef A16
-	mov.b	#%hi8(__romdatastart),r1h
-	mov.w	#%lo16(__romdatastart),a0
-	mov.w	#__datastart,a1
-#else
-	mov.l	#__romdatastart,a0
-	mov.l	#__datastart,a1
-#endif
-	mov.w	#__romdatacopysize,r3
-	shl.w	#-1,r3
-	smovf.w
-
-#ifdef A16
-	mov.w	#__bssstart,a1
-#else
-	mov.l	#__bssstart,a1
-#endif
-	mov.w	#__bsssize,r3
-	shl.w	#-1,r3
-	mov.w	#0,r0
-	sstr.w
-
-	jsr.a	__m32c_init
-
-	jsr.a	_main
-.LFE2:
-
-#ifdef A24
-	/* rv in r0, ok for arg0 */
-#else
-	mov.w	r0,r1
-#endif
-
-	jsr.a	_exit
-
-	.text
-
-	.global	_m32c_run_preinit_array
-	.type	_m32c_run_preinit_array,@function
-_m32c_run_preinit_array:
-	mov.W	#__preinit_array_start,a0
-	mov.W	#__preinit_array_end,a1
-	jmp.w	_m32c_run_inilist
-
-	.global	_m32c_run_init_array
-	.type	_m32c_run_init_array,@function
-_m32c_run_init_array:
-	mov.W	#__init_array_start,a0
-	mov.W	#__init_array_end,a1
-	jmp.w	_m32c_run_inilist
-
-	.global	_m32c_run_fini_array
-	.type	_m32c_run_fini_array,@function
-_m32c_run_fini_array:
-	mov.W	#__fini_array_start,a0
-	mov.W	#__fini_array_end,a1
-	/* fall through */
-
-_m32c_run_inilist:
-next_inilist:
-	cmp.W	a0,a1
-	jeq	done_inilist
-	pushm	a0,a1
-	mov.W	[a0],a0
-#ifdef A16
-	mov.b:s	#0,a1	/* zero extends */
-	jsri.a	a1a0
-#else
-	jsri.a	a0
-#endif
-	popm	a0,a1
-	add.W	A(#2,#4),a0
-	jmp.b	next_inilist
-done_inilist:
-	rts
-
-	.section	.init,"ax",@progbits
-
-	.global __m32c_init
-__m32c_init:
-	enter	#0
-
-	.section	.fini,"ax",@progbits
-
-	.global __m32c_fini
-__m32c_fini:
-	enter	#0
-	jsr.a	_m32c_run_fini_array
-
-
-;;; Provide Dwarf unwinding information that will help GDB stop
-;;; backtraces at the right place.  This is stolen from assembly
-;;; code generated by GCC with -dA.
-	.section	.debug_frame,"",@progbits
-.Lframe0:
-	.4byte	.LECIE0-.LSCIE0	; Length of Common Information Entry
-.LSCIE0:
-	.4byte	0xffffffff	; CIE Identifier Tag
-	.byte	0x1	; CIE Version
-	.ascii "\0"	; CIE Augmentation
-	.uleb128 0x1	; CIE Code Alignment Factor
-	.sleb128 -1	; CIE Data Alignment Factor
-	.byte	0xd	; CIE RA Column
-	.byte	0xc	; DW_CFA_def_cfa
-	.uleb128 0xc
-	.uleb128 0x3
-	.byte	0x8d	; DW_CFA_offset, column 0xd
-	.uleb128 0x3
-	.p2align ALIGN
-.LECIE0:
-.LSFDE0:
-	.4byte	.LEFDE0-.LASFDE0	; FDE Length
-.LASFDE0:
-	.4byte	.Lframe0	; FDE CIE offset
-	ADDR	.LFB2		; FDE initial location
-	ADDR	.LFE2-.LFB2	; FDE address range
-	.byte   0xf     	; DW_CFA_def_cfa_expression
-	.uleb128 1		; length of expression
-	.byte 	0x30		; DW_OP_lit0
-	.p2align ALIGN
-.LEFDE0:
-
-	.text
diff --git a/libgloss/m32c/crtn.S b/libgloss/m32c/crtn.S
deleted file mode 100644
index d4e86b8..0000000
--- a/libgloss/m32c/crtn.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-#define A16
-#define A(n,w) n
-#define W w
-#else
-#define A24
-#define A(n,w) w
-#define W l
-#endif
-
-	.section	.init,"ax",@progbits
-	jsr.a	_m32c_run_preinit_array
-	jsr.a	_m32c_run_init_array
-	exitd
-	.global	__m32c_init_end
-__m32c_init_end:
-
-	.section	.fini,"ax",@progbits
-
-	exitd
-	.global	__m32c_fini_end
-__m32c_fini_end:
-
-	.text
-
diff --git a/libgloss/m32c/exit.S b/libgloss/m32c/exit.S
deleted file mode 100644
index e27d73d..0000000
--- a/libgloss/m32c/exit.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-	.global	__exit
-__exit:
-	push.w	r1
-	jsr.a	__m32c_fini
-	pop.w	r1
-	SYSCALL(SYS_exit)
diff --git a/libgloss/m32c/fstat.S b/libgloss/m32c/fstat.S
deleted file mode 100644
index 44815b1..0000000
--- a/libgloss/m32c/fstat.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(fstat)
diff --git a/libgloss/m32c/genscript b/libgloss/m32c/genscript
deleted file mode 100644
index 665778e..0000000
--- a/libgloss/m32c/genscript
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2005 Red Hat Incorporated.
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
-# modification, are permitted provided that the following conditions are met: 
-# 
-#     Redistributions of source code must retain the above copyright 
-#     notice, this list of conditions and the following disclaimer.
-# 
-#     Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-# 
-#     The name of Red Hat Incorporated may not be used to endorse 
-#     or promote products derived from this software without specific 
-#     prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-srcdir="$1"
-name="$2"
-ramstart="$3"
-ramsize="$4"
-romstart="$5"
-romsize="$6"
-vecprefix="$7"
-
-sedcmd="s/RAMSTART/$ramstart/g; s/RAMSIZE/$ramsize/g"
-sedcmd="$sedcmd; s/ROMSTART/$romstart/g; s/ROMSIZE/$romsize/g"
-
-# .rodata can be left with .text
-rotext='/IF_ROCOPY/d'
-# .rodata needs to be with .data
-rodata='/IF_ROROM/d'
-
-# All sections are put in one region
-simram='s/LOWROM/RAM/g; s/= .*SIZEOF.*/= 0);/; s/AT>ROM//g'
-oneram='s/> ROM/> RAM/g;'
-# RW data needs to be copied to RAM
-rwonly='s/LOWROM/ROM/g; s/ SIZEOF(.rodata) + //g'
-# all data needs to be copied to RAM
-rocopy='s/LOWROM/RAM AT>ROM/g'
-
-case $name:$romstart in
-  sim*:0 )
-    # The r8c and m32c simulators have only a single memory region
-    sedcmd="$sedcmd; $simram; $oneram; $rotext"
-    ;;
-  sim*:* )
-    # This is most likely the m16c simulator
-    sedcmd="$sedcmd; $simram; $rodata"
-    ;;
-  *:0x???? )
-    # This is most likely the r8c chip
-    sedcmd="$sedcmd; $rwonly; $rotext"
-    ;;
-  m32*:* )
-    sedcmd="$sedcmd; $rwonly; $rotext"
-    ;;
-  *:* )
-    sedcmd="$sedcmd; $rocopy; $rodata"
-    ;;
-esac
-sedcmd="$sedcmd; /ORIGIN = 0,/d"
-
-sedcmd="$sedcmd; s/VECSTART/${vecprefix}dc/; s/RESETSTART/${vecprefix}fc/"
-
-sed "$sedcmd" < ${srcdir}/m32c.tmpl > ${name}.ld
diff --git a/libgloss/m32c/getpid.S b/libgloss/m32c/getpid.S
deleted file mode 100644
index 00b5d39..0000000
--- a/libgloss/m32c/getpid.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(getpid)
diff --git a/libgloss/m32c/gettimeofday.S b/libgloss/m32c/gettimeofday.S
deleted file mode 100644
index 8537a1a..0000000
--- a/libgloss/m32c/gettimeofday.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(gettimeofday)
diff --git a/libgloss/m32c/heaptop.S b/libgloss/m32c/heaptop.S
deleted file mode 100644
index 36c95df..0000000
--- a/libgloss/m32c/heaptop.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-#define SYS__set_heaptop 11
-
-S(_set_heaptop)
diff --git a/libgloss/m32c/isatty.S b/libgloss/m32c/isatty.S
deleted file mode 100644
index 490c8cb..0000000
--- a/libgloss/m32c/isatty.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-	.global _isatty
-_isatty:
-	mov.w   #1,r0
-	rts
diff --git a/libgloss/m32c/kill.S b/libgloss/m32c/kill.S
deleted file mode 100644
index 61d8469..0000000
--- a/libgloss/m32c/kill.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(kill)
diff --git a/libgloss/m32c/link.S b/libgloss/m32c/link.S
deleted file mode 100644
index 08efad8..0000000
--- a/libgloss/m32c/link.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(link)
diff --git a/libgloss/m32c/lseek.S b/libgloss/m32c/lseek.S
deleted file mode 100644
index 9026e92..0000000
--- a/libgloss/m32c/lseek.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(lseek)
diff --git a/libgloss/m32c/m32c.tmpl b/libgloss/m32c/m32c.tmpl
deleted file mode 100644
index b06ce4f..0000000
--- a/libgloss/m32c/m32c.tmpl
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-/* Default linker script, for normal executables */
-OUTPUT_FORMAT("elf32-m32c", "elf32-m32c",
-	      "elf32-m32c")
-OUTPUT_ARCH(m32c)
-ENTRY(_start)
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-MEMORY {
-	RAM (w) : ORIGIN = RAMSTART, LENGTH = RAMSIZE
-	ROM (r) : ORIGIN = ROMSTART, LENGTH = ROMSIZE
-	VEC (r) : ORIGIN = VECSTART, LENGTH = 32
-	RESETVEC (r) : ORIGIN = RESETSTART, LENGTH = 4
-}
-SECTIONS
-{
-  /* There are three cases we care about: First, RW data that must be
-     in the low 64k.  This will always be copied from ROM.  Second, RO
-     data that must be in the low 64k.  This may be copied from ROM if
-     the ROM is above 64k.  Third, anything that does not need to be
-     in the first 64k.  Chips normally only have two memory regions;
-     low ram and either high or low rom.  We map the low rom needs
-     into one of the actual regions.  */
-
-  /* .text goes first so the rom image of ram data will follow it.  */
-  .text           :
-  {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.interp .hash .dynsym .dynstr .gnu.version*)
-    PROVIDE (__etext = .);
-    PROVIDE (_etext = .);
-    PROVIDE (etext = .);
-    . = ALIGN(2);
-    PROVIDE(__romdatastart = .); /* IF_ROCOPY */
-  } > ROM =0
-
-  /* rodata will either be part of data, or will be in low rom.  So we
-     might be spanning it, or we might not.  This lets us include it
-     in our calculations when appropriate.  */
-
-  .rodata : {
-    . = ALIGN(2);
-    PROVIDE(__datastart = .); /* IF_ROCOPY */
-    *(.plt)
-    KEEP (*(.init))
-    KEEP (*(.fini))
-    *(.rodata .rodata.* .gnu.linkonce.r.*)
-    *(.rodata1)
-    *(.eh_frame_hdr)
-    KEEP (*(.eh_frame))
-    KEEP (*(.gcc_except_table)) *(.gcc_except_table.*)
-    . = ALIGN(2);
-    PROVIDE(__romdatastart = .); /* IF_ROROM */
-  } > LOWROM
-
-  .data : {
-    . = ALIGN(32 / 8);
-    PROVIDE (__datastart = .); /* IF_ROROM */
-    PROVIDE (__preinit_array_start = .);
-    KEEP (*(.preinit_array))
-    PROVIDE (__preinit_array_end = .);
-    PROVIDE (__init_array_start = .);
-    KEEP (*(.init_array))
-    PROVIDE (__init_array_end = .);
-    PROVIDE (__fini_array_start = .);
-    KEEP (*(.fini_array))
-    PROVIDE (__fini_array_end = .);
-
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin*.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-
-    KEEP (*crtbegin*.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-
-    KEEP (*(.jcr))
-    *(.data.rel.ro.local) *(.data.rel.ro*)
-    *(.dynamic)
-
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-    *(.data1)
-    *(.got.plt) *(.got)
-
-    . = ALIGN(2);
-    _edata = .;
-    PROVIDE (edata = .);
-    PROVIDE (__dataend = .);
-  } > RAM AT>ROM
-
-  /* Note that __romdatacopysize may be ZERO for the simulator, which
-     knows how to intialize RAM directly.  It should ONLY be used for
-     copying data from ROM to RAM; if you need to know the size of the
-     data section, subtract the end symbol from the start symbol.  */
-  /* Note that crt0 assumes this is even; all the start/stop symbols
-     are also assumed word-aligned.  */
-  PROVIDE (__romdatacopysize = SIZEOF(.rodata) + SIZEOF(.data));
-
-  .bss : {
-    . = ALIGN(2);
-    PROVIDE (__bssstart = .);
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-    . = ALIGN(2);
-    PROVIDE (__bssend = .);
-    _end = .;
-    PROVIDE (end = .);
-  } > RAM
-  PROVIDE (__bsssize = SIZEOF(.bss));
-
-  .stack (RAMSTART + RAMSIZE - 2) :
-  {
-    PROVIDE (__stack = .);
-    *(.stack)
-  }
-
-  .vec : {
-    *(.vec)
-  } > VEC
-  .resetvec : {
-    *(.resetvec)
-  } > RESETVEC
-
-  /* The rest are all not normally part of the runtime image.  */
-
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /DISCARD/ : { *(.note.GNU-stack) }
-}
diff --git a/libgloss/m32c/m32csys.h b/libgloss/m32c/m32csys.h
deleted file mode 100644
index e8b9b5f..0000000
--- a/libgloss/m32c/m32csys.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "syscall.h"
-
-/* Both the simulators and monitors reserve RAM areas 0x400 through
-   0x4ff for their internal use.  We use one of those memory locations
-   as our system call trap.  */
-
-#define POUND #
-#define SYSCALL(N) mov.b POUND N,0x400
-
-#define SYS__exit SYS_exit
-
-#define S(n) _##n: .global _##n | SYSCALL(SYS_##n) | rts
diff --git a/libgloss/m32c/open.S b/libgloss/m32c/open.S
deleted file mode 100644
index a645851..0000000
--- a/libgloss/m32c/open.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(open)
diff --git a/libgloss/m32c/read.S b/libgloss/m32c/read.S
deleted file mode 100644
index 0aa4f13..0000000
--- a/libgloss/m32c/read.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(read)
diff --git a/libgloss/m32c/sbrk.c b/libgloss/m32c/sbrk.c
deleted file mode 100644
index 69375aa..0000000
--- a/libgloss/m32c/sbrk.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-extern void _set_heaptop(void *ptr);
-
-char *
-sbrk(int adj)
-{
-  extern char end;
-  static char *heap = &end;
-  char *rv = heap;
-
-  heap += adj;
-  _set_heaptop(heap);
-  return rv;
-}
diff --git a/libgloss/m32c/stat.S b/libgloss/m32c/stat.S
deleted file mode 100644
index a96dcbd..0000000
--- a/libgloss/m32c/stat.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(stat)
diff --git a/libgloss/m32c/time.S b/libgloss/m32c/time.S
deleted file mode 100644
index 61f5dd5..0000000
--- a/libgloss/m32c/time.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(time)
diff --git a/libgloss/m32c/times.S b/libgloss/m32c/times.S
deleted file mode 100644
index bf77a56..0000000
--- a/libgloss/m32c/times.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(times)
diff --git a/libgloss/m32c/unlink.S b/libgloss/m32c/unlink.S
deleted file mode 100644
index 8dfb059..0000000
--- a/libgloss/m32c/unlink.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(unlink)
diff --git a/libgloss/m32c/utime.S b/libgloss/m32c/utime.S
deleted file mode 100644
index b244a21..0000000
--- a/libgloss/m32c/utime.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(utime)
diff --git a/libgloss/m32c/write.S b/libgloss/m32c/write.S
deleted file mode 100644
index 273eb47..0000000
--- a/libgloss/m32c/write.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#include "m32csys.h"
-
-S(write)
diff --git a/libgloss/m32r/Makefile.in b/libgloss/m32r/Makefile.in
index ea9eba3..7226e94 100644
--- a/libgloss/m32r/Makefile.in
+++ b/libgloss/m32r/Makefile.in
@@ -14,8 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-DESTDIR =
-VPATH = @srcdir@ @srcdir@/..
+VPATH = @srcdir@
 srcdir = @srcdir@
 objdir = .
 srcroot = $(srcdir)/../..
@@ -65,7 +64,7 @@ TARGETDOC = ../../targetdep.tex
 
 CRT0 = crt0.o
 GDBLIB = m32r-lib.o
-GDBSTUB = m32r-stub.o
+GDBSTUB = @GDBSTUB@
 EVASCRIPT = eva.ld
 STUBSCRIPT = eva-stub.ld
 
@@ -97,15 +96,14 @@ libmon.a: $(MONLIBOBJS)
 	$(RANLIB) $@
 
 install:
-	mkdir -p $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
-	$(INSTALL_DATA) $(LIBGLOSS) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(LIBGLOSS)
-	$(INSTALL_DATA) $(MONLIBGLOSS) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(MONLIBGLOSS)
-	$(INSTALL_DATA) $(GDBLIB) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(GDBLIB)
-	$(INSTALL_DATA) $(GDBSTUB) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(GDBSTUB)
-	$(INSTALL_DATA) $(srcdir)/$(EVASCRIPT) $(DESTDIR)$(tooldir)/lib/$(EVASCRIPT)
-	$(INSTALL_DATA) $(srcdir)/$(STUBSCRIPT) $(DESTDIR)$(tooldir)/lib/$(STUBSCRIPT)
-	$(INSTALL_DATA) $(srcdir)/$(MONSPECS) $(DESTDIR)$(tooldir)/lib/$(MONSPECS)
+	$(INSTALL_DATA) $(CRT0) $(tooldir)/lib${MULTISUBDIR}/$(CRT0)
+	$(INSTALL_DATA) $(LIBGLOSS) $(tooldir)/lib${MULTISUBDIR}/$(LIBGLOSS)
+	$(INSTALL_DATA) $(MONLIBGLOSS) $(tooldir)/lib${MULTISUBDIR}/$(MONLIBGLOSS)
+	$(INSTALL_DATA) $(GDBLIB) $(tooldir)/lib${MULTISUBDIR}/$(GDBLIB)
+	$(INSTALL_DATA) $(GDBSTUB) $(tooldir)/lib${MULTISUBDIR}/$(GDBSTUB)
+	$(INSTALL_DATA) $(srcdir)/$(EVASCRIPT) $(tooldir)/lib/$(EVASCRIPT)
+	$(INSTALL_DATA) $(srcdir)/$(STUBSCRIPT) $(tooldir)/lib/$(STUBSCRIPT)
+	$(INSTALL_DATA) $(srcdir)/$(MONSPECS) $(tooldir)/lib/$(MONSPECS)
 
 clean mostlyclean:
 	rm -f *~ *.[oa]
diff --git a/libgloss/m32r/configure b/libgloss/m32r/configure
index 5e13aa2..567c0e0 100755
--- a/libgloss/m32r/configure
+++ b/libgloss/m32r/configure
@@ -28,6 +28,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -142,6 +143,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -312,6 +314,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -477,12 +484,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -522,8 +533,21 @@ fi
 
 
 
+if test "${enable_shared}" = "yes" ; then
+    echo "Shared libraries not supported for cross compiling, ignored"
+fi
+
+if test "$srcdir" = "." ; then
+  if test "${with_target_subdir}" != "." ; then
+    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
+  else
+    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
+  fi
+else
+  libgloss_topdir="${srcdir}/../.."
+fi
 ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+for ac_dir in $libgloss_topdir $srcdir/$libgloss_topdir; do
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -535,13 +559,21 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+  { echo "configure: error: can not find install-sh or install.sh in $libgloss_topdir $srcdir/$libgloss_topdir" 1>&2; exit 1; }
 fi
 ac_config_guess=$ac_aux_dir/config.guess
 ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
+if test -f "${srcdir}/${with_multisrctop}../../gdb/m32r-stub.c"; then
+  GDBSTUB=${srcdir}/${with_multisrctop}../../gdb/m32r-stub.c
+else
+  GDBSTUB=
+fi
+
+
+
 # Do some error checking and defaulting for the host and target type.
 # The inputs are:
 #    configure --host=HOST --target=TARGET --build=BUILD NONOPT
@@ -569,7 +601,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:573: checking host system type" >&5
+echo "configure:605: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -590,7 +622,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:594: checking target system type" >&5
+echo "configure:626: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -608,7 +640,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:612: checking build system type" >&5
+echo "configure:644: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -650,50 +682,6 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../.. $srcdir/${mdir}../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ${mdir}../../.. $srcdir/${mdir}../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../.. $srcdir/${srcdir}/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ${srcdir}/../.. $srcdir/${srcdir}/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-fi
-
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -706,7 +694,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:710: checking for a BSD compatible install" >&5
+echo "configure:698: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -770,7 +758,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
+echo "configure:762: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -800,7 +788,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:804: checking for $ac_word" >&5
+echo "configure:792: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -849,7 +837,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:853: checking whether we are using GNU C" >&5
+echo "configure:841: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -858,7 +846,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -873,7 +861,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:877: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:865: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -909,7 +897,7 @@ LD=${LD-ld}
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:913: checking for $ac_word" >&5
+echo "configure:901: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1088,6 +1076,7 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@GDBSTUB@%$GDBSTUB%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
@@ -1220,11 +1209,11 @@ srcdir=${srcdir}
 target=${target}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${srcdir}/../..
+libgloss_topdir=${libgloss_topdir}
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-. ${srcdir}/../../config-ml.in
+. ${libgloss_topdir}/config-ml.in
 exit 0
 EOF
 chmod +x $CONFIG_STATUS
diff --git a/libgloss/m32r/configure.in b/libgloss/m32r/configure.in
index 7ea64c8..6bffc70 100644
--- a/libgloss/m32r/configure.in
+++ b/libgloss/m32r/configure.in
@@ -2,16 +2,30 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.5)dnl
 AC_INIT(crt0.S)
 
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
+if test "${enable_shared}" = "yes" ; then
+    echo "Shared libraries not supported for cross compiling, ignored"
+fi
 
 if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../..)
+  if test "${with_target_subdir}" != "." ; then
+    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
+  else
+    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
+  fi
 else
-  AC_CONFIG_AUX_DIR(${srcdir}/../..)
+  libgloss_topdir="${srcdir}/../.."
 fi
+AC_CONFIG_AUX_DIR($libgloss_topdir)
+
+if test -f "${srcdir}/${with_multisrctop}../../gdb/m32r-stub.c"; then
+  GDBSTUB=${srcdir}/${with_multisrctop}../../gdb/m32r-stub.c
+else
+  GDBSTUB=
+fi
+AC_SUBST(GDBSTUB)
+
+AC_CANONICAL_SYSTEM
+AC_ARG_PROGRAM
 
 AC_PROG_INSTALL
 
@@ -73,10 +87,10 @@ AC_SUBST(host_makefile_frag_path)
 AC_SUBST_FILE(host_makefile_frag)
 
 AC_OUTPUT(Makefile,
-. ${srcdir}/../../config-ml.in,
+. ${libgloss_topdir}/config-ml.in,
 srcdir=${srcdir}
 target=${target}
 ac_configure_args="${ac_configure_args} --enable-multilib"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${srcdir}/../..
+libgloss_topdir=${libgloss_topdir}
 )
diff --git a/libgloss/m32r/crt0.S b/libgloss/m32r/crt0.S
index 7c22f5a..f60a1a6 100644
--- a/libgloss/m32r/crt0.S
+++ b/libgloss/m32r/crt0.S
@@ -3,8 +3,7 @@
 	.global	_start
 _start:
 
-	seth	sp, #shigh(_stack)
-	add3	sp, sp, #low(_stack)
+	ld24	sp, _stack
 	ldi	fp, #0
 
 # Clear the BSS.  Do it in two parts for efficiency: longwords first
diff --git a/libgloss/m32r/m32r-lib.c b/libgloss/m32r/m32r-lib.c
index 1d2d291..cad55f5 100644
--- a/libgloss/m32r/m32r-lib.c
+++ b/libgloss/m32r/m32r-lib.c
@@ -109,22 +109,15 @@ void phex(long x)
   mesg(buf);
 }
 
-/*
- * These routines set and get exception handlers.  They look a little
- * funny because the M32R uses branch instructions in its exception
- * vectors, not just the addresses.  The instruction format used is
- * BRA pcdisp24.
- */
-
-#define TRAP_VECTOR_BASE_ADDR   0x00000040
-
 /* Setup trap TT to go to ROUTINE. */
-void 
+
+void
 exceptionHandler (int tt, unsigned long routine)
 {
 #ifndef REVC
-  unsigned long *tb = (unsigned long *) TRAP_VECTOR_BASE_ADDR;
-  tb[tt] = (0xff000000 | ((routine - (unsigned long) (&tb[tt])) >> 2));
+  unsigned long *tb = (unsigned long *) 0x40;	/* Trap vector base address */
+
+  tb[tt] = ((routine >> 2) | 0xff000000) - tt - (0x40 >> 2);
 #else
   unsigned long *tb = 0;	/* Trap vector base address */
 
@@ -133,12 +126,14 @@ exceptionHandler (int tt, unsigned long routine)
 }
 
 /* Return the address of trap TT handler */
+
 unsigned long
 getExceptionHandler (int tt)
 {
 #ifndef REVC
-  unsigned long *tb = (unsigned long *) TRAP_VECTOR_BASE_ADDR;
-  return ((tb[tt] & ~0xff000000) << 2) + (unsigned long) (&tb[tt]);
+  unsigned long *tb = (unsigned long *) 0x40;	/* Trap vector base address */
+
+  return ((tb[tt] + tt + (0x40 >> 2)) | 0xff000000) << 2;
 #else
   unsigned long *tb = 0;	/* Trap vector base address */
 
diff --git a/libgloss/m32r/trapmon0.c b/libgloss/m32r/trapmon0.c
index 20a2fcb..44bf6a5 100644
--- a/libgloss/m32r/trapmon0.c
+++ b/libgloss/m32r/trapmon0.c
@@ -14,9 +14,9 @@ int __trap0 (int function, int p1, int p2, int p3, struct _reent *r)
   case SYS_exit:
     /* loop so GDB can't go past system exit call */
     while (1) {
-      asm volatile (
-          "ldi	  r0, #0						\n"
-          "trap    #15        ; return control to Mon2000");
+      asm volatile (" 
+          ldi	  r0, #0
+          trap    #15        ; return control to Mon2000");
     }
     break;
 
@@ -25,15 +25,15 @@ int __trap0 (int function, int p1, int p2, int p3, struct _reent *r)
     int i;
 
     for( i=0; i<p3; i++ ) {
-      asm volatile (
-          "ldi   r0, #2							\n"
-          "ldi   r1, #15      ; load Ctrl-O (ASCII 15)			\n"
-          "trap  #15          ; write Ctrl-O for quoting purposes" );
-
-      asm volatile (
-          "ldi   r0, #2							\n"
-          "ldb   r1, %0							\n"
-          "trap  #15          ; write character to console" 
+      asm volatile (" 
+          ldi   r0, #2
+          ldi   r1, #15      ; load Ctrl-O (ASCII 15)
+          trap  #15          ; write Ctrl-O for quoting purposes" );
+
+      asm volatile (" 
+          ldi   r0, #2
+          ldb   r1, %0
+          trap  #15          ; write character to console" 
           : /* no outputs */
           : "m" (((char*)p2)[i]));
     }
diff --git a/libgloss/m68hc11/Makefile.in b/libgloss/m68hc11/Makefile.in
deleted file mode 100644
index 4a4ab59..0000000
--- a/libgloss/m68hc11/Makefile.in
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright (c) 1995, 1996, 1997 Cygnus Support
-# Copyright (c) 1999, 2000, 2001, 2002 Stephane Carrez
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-#
-# This currently works with Motorola's 68HC11 based target boards.
-# (should work with 68HC12 but not tested yet)
-
-DESTDIR =
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-VPATH = $(srcdir) $(srcdir)/..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-program_transform_name = @program_transform_name@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-SHELL =	/bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-AR_FLAGS = qv
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-SCRIPTS = sim-valid
-
-OBJS =  syscalls.o close.o fstat.o getpid.o isatty.o kill.o \
-	lseek.o open.o print.o stat.o \
-	unlink.o sci-inout.o
-
-CFLAGS = 
-
-CRT0 = crt0.o
-
-#
-# here's all the generic target stuff
-#
-GEN_LDFLAGS=	-L${srcdir}
-BSP=	libbcc.a
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-#
-# build a test program for each target board. Just trying to get
-# it to link is a good test, so we ignore all the errors for now.
-#
-all: ${CRT0} ${BSP}
-
-#
-# here's where we build the board support packages for each target
-#
-${BSP}: $(OBJS)
-	${AR} ${ARFLAGS} $@ $(OBJS)
-	${RANLIB} $@
-
-
-syscalls.o: $(srcdir)/syscalls.c
-	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
-
-close.o: $(srcdir)/../close.c
-	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
-
-fstat.o: $(srcdir)/../fstat.c
-	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
-
-getpid.o: $(srcdir)/../getpid.c
-	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
-
-isatty.o: $(srcdir)/../isatty.c
-	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
-
-kill.o: $(srcdir)/../kill.c
-	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
-
-lseek.o: $(srcdir)/../lseek.c
-	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
-
-open.o: $(srcdir)/../open.c
-	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
-
-print.o: $(srcdir)/../print.c
-	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
-
-putnum.o: $(srcdir)/../putnum.c
-	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
-
-stat.o: $(srcdir)/../stat.c
-	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
-
-unlink.o: $(srcdir)/../unlink.c
-	$(CC) $(CFLAGS_FOR_TARGET) -O2 $(INCLUDES) -c $(CFLAGS) $<
-
-
-.PHONY: install info dvi doc install-info clean-info
-
-clean mostlyclean:
-	rm -f a.out core *.[oais] *-test *.srec *.dis *.x syscall.h
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.status *~
-
-.PHONY: install info install-info clean-info
-install:	install-scripts
-	$(INSTALL_PROGRAM) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
-	@for bsp in ${BSP}; do\
-	 $(INSTALL_PROGRAM) $${bsp} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
-	done
-
-# Install the linker script in the correct place.
-install-scripts:
-	if [ -f ${objroot}/../binutils/objdump ] ; then \
-	   objdump="${objroot}/../binutils/objdump"; \
-	else \
-	   t='$(program_transform_name)'; \
-	   objdump=`echo objdump | sed -e $$t`; \
-	fi ; \
-	name=`$$objdump -f $(CRT0) | sed '/^$$/d'`; \
-	case $$name in \
-	*elf32-m68hc11*) \
-	   $(INSTALL_DATA) ${srcdir}/sim-valid-m68hc11.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/sim-valid.ld \
-	   ;; \
-	*elf32-m68hc12*) \
-	   $(INSTALL_DATA) ${srcdir}/sim-valid-m68hc12.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/sim-valid.ld \
-	   ;; \
-	esac
-
-doc:
-info:
-install-info:
-clean-info:
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/libgloss/m68hc11/configure b/libgloss/m68hc11/configure
deleted file mode 100755
index 7757771..0000000
--- a/libgloss/m68hc11/configure
+++ /dev/null
@@ -1,1216 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-sitefile=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --site-file=FILE        use FILE as the site file
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -site-file | --site-file | --site-fil | --site-fi | --site-f)
-    ac_prev=sitefile ;;
-  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
-    sitefile="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=sci-inout.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$sitefile"; then
-  if test -z "$CONFIG_SITE"; then
-    if test "x$prefix" != xNONE; then
-      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-    else
-      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-    fi
-  fi
-else
-  CONFIG_SITE="$sitefile"
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-ac_aux_dir=
-for ac_dir in $libgloss_topdir $srcdir/$libgloss_topdir; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $libgloss_topdir $srcdir/$libgloss_topdir" 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:598: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:619: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:637: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:691: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:755: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:785: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:834: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:858: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:895: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-host_makefile_frag_path=$host_makefile_frag
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-. ${libgloss_topdir}/config-ml.in
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-
diff --git a/libgloss/m68hc11/configure.in b/libgloss/m68hc11/configure.in
deleted file mode 100644
index dc482cf..0000000
--- a/libgloss/m68hc11/configure.in
+++ /dev/null
@@ -1,91 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
-AC_INIT(sci-inout.S)
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AC_OUTPUT(Makefile,
-. ${libgloss_topdir}/config-ml.in,
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-)
-
diff --git a/libgloss/m68hc11/crt0.S b/libgloss/m68hc11/crt0.S
deleted file mode 100644
index 73dd217..0000000
--- a/libgloss/m68hc11/crt0.S
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Startup code for M68HC11/M68HC12.
- * Copyright (C) 1999, 2000, 2001, 2002 Stephane Carrez (stcarrez@nerim.fr)	
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-;-----------------------------------------
-; startup code
-;-----------------------------------------
-	.file	"crt0.s"
-
-;; 
-;; 
-;; The linker concatenate the .install* sections in the following order:
-;; 
-;; .install0	Setup the stack pointer
-;; .install1	Place holder for applications
-;; .install2	Optional installation of data section in memory
-;; .install3	Place holder for applications
-;; .install4	Invokes the main
-;; 
-	.sect   .install0,"ax",@progbits
-	.globl _start
-
-_start:
-;;
-;; At this step, the stack is not initialized and interrupts are masked.
-;; Applications only have 64 cycles to initialize some registers.
-;;
-;; To have a generic/configurable startup, initialize the stack to
-;; the end of some memory region.  The _stack symbol is defined by
-;; the linker.
-;;
-	lds	#_stack
-	
-	.sect	.install2,"ax",@progbits
-;;
-;; Call a specific initialization operation.  The default is empty.
-;; It can be overriden by applications.  It is intended to initialize
-;; the 68hc11 registers.  Function prototype is:
-;; 
-;;	int __premain(void);
-;; 
-	jsr	__premain
-	
-;;
-;; 
-;;
-	.sect	.install4,"ax",@progbits
-	jsr     main
-fatal:
-	jsr	exit
-	bra fatal
-
-;-----------------------------------------
-; end startup code
-;-----------------------------------------
-;; Force loading of data section mapping and bss clear
-	.globl	__map_data_section
-	.globl	__init_bss_section
-
diff --git a/libgloss/m68hc11/sci-inout.S b/libgloss/m68hc11/sci-inout.S
deleted file mode 100644
index a8675d2..0000000
--- a/libgloss/m68hc11/sci-inout.S
+++ /dev/null
@@ -1,153 +0,0 @@
-/* M68HC11/M68HC12 serial line operations
- * Copyright (C) 1999, 2001, 2003, 2004 Stephane Carrez (stcarrez@nerim.fr)
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#ifdef __HAVE_SHORT_INT__
-	.mode mshort
-#else
-	.mode mlong
-#endif
-
-#if defined(__USE_RTC__)
-	.macro ret
-#if defined(mc68hc12)
-	rtc
-#else
-	jmp __return_32
-#endif
-	.endm
-#else
-	.macro ret
-	rts
-	.endm
-#endif
-#ifdef mc68hc12
-	SC0CR1 = 0xC2
-	SC0CR2 = 0xC3
-	SC0SR1 = 0xC4
-	SC0DRL = 0xC7
-	SC0BD  = 0xC0
-
-	.sect .data
-	.globl _m68hc12_ports
-_m68hc12_ports:	.word	0
-
-	.sect .text
-	.globl outbyte
-;;;
-;;; int outbyte(char c);
-;;;
-;;; B :	Character to send
-;;; 
-outbyte:
-	bsr	_sci_init
-L1:
-	ldaa	SC0SR1,x
-	bge	L1
-	stab	SC0DRL,x
-	ldab	SC0CR2,x
-	orab	#0x8
-	stab	SC0CR2,x
-	ret
-
-	.sect .text
-	.globl inbyte
-;;;
-;;; char inbyte(void);
-;;; 
-inbyte:
-	bsr	_sci_init
-	ldaa	SC0SR1,x
-	bita	#0x20
-	beq	inbyte
-	ldab	SC0CR2,x
-	ret
-
-	.globl _sci_init
-	.sect .text
-_sci_init:
-	ldx	_m68hc12_ports
-	beq	do_init
-	dex
-	rts
-do_init:
-	ldx	#0x1
-	stx	_m68hc12_ports
-	dex
-	ldd	#26
-	std	SC0BD,x
-	ldaa	#0
-	staa	SC0CR1,x
-	ldaa	#0xC
-	staa	SC0CR2,x
-	rts
-#else	
-	BAUD = 0x2b
-	SCCR1= 0x2c
-	SCCR2= 0x2d
-	SCSR = 0x2e
-	SCDR = 0x2f
-
-	.sect .data
-	.globl _m68hc11_ports
-_m68hc11_ports:	.word	0
-
-	.sect .text
-	.globl outbyte
-;;;
-;;; int outbyte(char c);
-;;;
-;;; B :	Character to send
-;;; 
-outbyte:
-	bsr	_sci_init
-L1:
-	ldaa	SCSR,x
-	bge	L1
-	stab	SCDR,x
-	ldab	SCCR2,x
-	orab	#0x8
-	stab	SCCR2,x
-	ret
-
-	.sect .text
-	.globl inbyte
-;;;
-;;; char inbyte(void);
-;;; 
-inbyte:
-	bsr	_sci_init
-	ldaa	SCSR,x
-	bita	#0x20
-	beq	inbyte
-	ldab	SCDR,x
-	ret
-
-	.globl _sci_init
-	.sect .text
-_sci_init:
-	ldx	_m68hc11_ports
-	beq	do_init
-	rts
-do_init:
-	ldx	#0x1000
-	stx	_m68hc11_ports
-	ldaa	#0x30
-	staa	BAUD,x
-	clra
-	staa	SCCR1,x
-	ldaa	#0xC
-	staa	SCCR2,x
-	rts
-
-#endif
diff --git a/libgloss/m68hc11/sim-valid-m68hc11.ld b/libgloss/m68hc11/sim-valid-m68hc11.ld
deleted file mode 100644
index 82e3b68..0000000
--- a/libgloss/m68hc11/sim-valid-m68hc11.ld
+++ /dev/null
@@ -1,310 +0,0 @@
-/* Linker script for 68HC11 executable (PROM).  */
-ENTRY(_start)
-OUTPUT_FORMAT("elf32-m68hc11", "elf32-m68hc11", "elf32-m68hc11")
-OUTPUT_ARCH(m68hc11)
-
-GROUP(-lc -lbcc -lgcc)
-SEARCH_DIR(.);
-/* Fixed definition of the available memory banks.
-   See generic emulation script for a user defined configuration.  */
-
-/* The memory layout below is suitable for gcc validation.
-   It takes care of big programs allowing up to 48128 bytes
-   of text while allowing some programs that consume some
-   memory (comp-goto-1 requires the RAM to be set to 0x4400
-   to avoid head<->stack collision in malloc/sbrk).  */
-MEMORY
-{
-  page0 (rwx) : ORIGIN = 0x00, LENGTH = 256
-  text  (rx)  : ORIGIN = 0x04400, LENGTH = 0x10000 - 0x4400
-  data        : ORIGIN = 0x01100, LENGTH = 0x2000 - 0x1100
-}
-/* Setup the stack on the top of the data memory bank.  */
-PROVIDE (_stack = 0x04400 - 1);
-SECTIONS
-{
-  .hash          : { *(.hash)		}
-  .dynsym        : { *(.dynsym)		}
-  .dynstr        : { *(.dynstr)		}
-  .gnu.version		  : { *(.gnu.version) }
-  .gnu.version_d	  : { *(.gnu.version_d) }
-  .gnu.version_r	  : { *(.gnu.version_r) }
-  .rel.text      :
-    {
-      *(.rel.text)
-      *(.rel.text.*)
-      *(.rel.gnu.linkonce.t.*)
-    }
-  .rela.text     :
-    {
-      *(.rela.text)
-      *(.rela.text.*)
-      *(.rela.gnu.linkonce.t.*)
-    }
-  .rel.data      :
-    {
-      *(.rel.data)
-      *(.rel.data.*)
-      *(.rel.gnu.linkonce.d.*)
-    }
-  .rela.data     :
-    {
-      *(.rela.data)
-      *(.rela.data.*)
-      *(.rela.gnu.linkonce.d.*)
-    }
-  .rel.rodata    :
-    {
-      *(.rel.rodata)
-      *(.rel.rodata.*)
-      *(.rel.gnu.linkonce.r.*)
-    }
-  .rela.rodata   :
-    {
-      *(.rela.rodata)
-      *(.rela.rodata.*)
-      *(.rela.gnu.linkonce.r.*)
-    }
-  .rel.sdata     :
-    {
-      *(.rel.sdata)
-      *(.rel.sdata.*)
-      *(.rel.gnu.linkonce.s.*)
-    }
-  .rela.sdata     :
-    {
-      *(.rela.sdata)
-      *(.rela.sdata.*)
-      *(.rela.gnu.linkonce.s.*)
-    }
-  .rel.sbss      :
-    { 
-      *(.rel.sbss)
-      *(.rel.sbss.*)
-      *(.rel.gnu.linkonce.sb.*)
-    }
-  .rela.sbss     :
-    {
-      *(.rela.sbss)
-      *(.rela.sbss.*)
-      *(.rel.gnu.linkonce.sb.*)
-    }
-  .rel.bss       : 
-    { 
-      *(.rel.bss)
-      *(.rel.bss.*)
-      *(.rel.gnu.linkonce.b.*)
-    }
-  .rela.bss      : 
-    { 
-      *(.rela.bss)
-      *(.rela.bss.*)
-      *(.rela.gnu.linkonce.b.*)
-    }
-  .rela.stext		  : { *(.rela.stest) }
-  .rela.etext		  : { *(.rela.etest) }
-  .rela.sdata		  : { *(.rela.sdata) }
-  .rela.edata		  : { *(.rela.edata) }
-  .rela.eit_v		  : { *(.rela.eit_v) }
-  .rela.ebss		  : { *(.rela.ebss) }
-  .rela.srodata		  : { *(.rela.srodata) }
-  .rela.erodata		  : { *(.rela.erodata) }
-  .rela.got		  : { *(.rela.got) }
-  .rela.ctors		  : { *(.rela.ctors) }
-  .rela.dtors		  : { *(.rela.dtors) }
-  .rela.init		  : { *(.rela.init) }
-  .rela.fini		  : { *(.rela.fini) }
-  .rela.plt		  : { *(.rela.plt) }
-  .rel.stext		  : { *(.rel.stest) }
-  .rel.etext		  : { *(.rel.etest) }
-  .rel.sdata		  : { *(.rel.sdata) }
-  .rel.edata		  : { *(.rel.edata) }
-  .rel.ebss		  : { *(.rel.ebss) }
-  .rel.eit_v		  : { *(.rel.eit_v) }
-  .rel.srodata		  : { *(.rel.srodata) }
-  .rel.erodata		  : { *(.rel.erodata) }
-  .rel.got		  : { *(.rel.got) }
-  .rel.ctors		  : { *(.rel.ctors) }
-  .rel.dtors		  : { *(.rel.dtors) }
-  .rel.init		  : { *(.rel.init) }
-  .rel.fini		  : { *(.rel.fini) }
-  .rel.plt		  : { *(.rel.plt) }
-  /* Concatenate .page0 sections.  Put them in the page0 memory bank
-     unless we are creating a relocatable file.  */
-  .page0 :
-  {
-    *(.page0)
-    *(.softregs)
-  }  > page0
-
-  /* Start of text section.  */
-  .stext   : 
-  {
-    *(.stext)
-  }  > text
-  .init	  :
-  {
-    *(.init) 
-  } =0
-  /* Put trampolines at beginning of text at 0x4400 so that they
-     are not in memory bank window.  */
-  .tramp :
-  {
-    *(.tramp)
-  } > text
-  .text  :
-  {
-    /* Put startup code at beginning so that _start keeps same address.  */
-    /* Startup code.  */
-    KEEP (*(.install0))	/* Section should setup the stack pointer.  */
-    KEEP (*(.install1))	/* Place holder for applications.  */
-    KEEP (*(.install2))	/* Optional installation of data sections in RAM.  */
-    KEEP (*(.install3))	/* Place holder for applications.  */
-    KEEP (*(.install4))	/* Section that calls the main.  */
-    *(.init)
-    *(.text)
-    *(.text.*)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t.*)
-    /* Finish code.  */
-    KEEP (*(.fini0))	/* Beginning of finish code (_exit symbol).  */
-    KEEP (*(.fini1))	/* Place holder for applications.  */
-    KEEP (*(.fini2))	/* C++ destructors.  */
-    KEEP (*(.fini3))	/* Place holder for applications.  */
-    KEEP (*(.fini4))	/* Runtime exit.  */
-    _etext = .;
-    PROVIDE (etext = .);
-  }  > text
-  .eh_frame   :
-  {
-    *(.eh_frame)
-  }  > text
-  .gcc_except_table :
-  {
-    *(.gcc_except_table)
-  } > text
-  .rodata    :
-  {
-    *(.rodata)
-    *(.rodata.*)
-    *(.gnu.linkonce.r*)
-  }  > text
-  .rodata1   :
-  {
-    *(.rodata1)
-  }  > text
-  /* Constructor and destructor tables are in ROM.  */
-  .ctors   : 
-  {
-     PROVIDE (__CTOR_LIST__ = .); 
-     KEEP (*(.ctors))
-     PROVIDE(__CTOR_END__ = .); 
-  }  > text
-    .dtors	  :
-  {
-     PROVIDE(__DTOR_LIST__ = .); 
-     KEEP (*(.dtors))
-     PROVIDE(__DTOR_END__ = .); 
-  }  > text
-  /* Start of the data section image in ROM.  */
-  __data_image = .;
-  PROVIDE (__data_image = .);
-  /* All read-only sections that normally go in PROM must be above.
-     We construct the DATA image section in PROM at end of all these
-     read-only sections.  The data image must be copied at init time.
-     Refer to GNU ld, Section 3.6.8.2 Output Section LMA.  */
-  .data    : AT (__data_image)
-  {
-    __data_section_start = .;
-    PROVIDE (__data_section_start = .);
-    *(.sdata)
-    *(.data)
-    *(.data.*)
-    *(.data1)
-    *(.gnu.linkonce.d.*)
-    CONSTRUCTORS
-    _edata  =  .;
-    PROVIDE (edata = .);
-  }  > data
-  __data_section_size = SIZEOF(.data);
-  PROVIDE (__data_section_size = SIZEOF(.data));
-  __data_image_end = __data_image + __data_section_size;
-/* SCz: this does not work yet... This is supposed to force the loading
-   of _map_data.o (from libgcc.a) when the .data section is not empty.
-   By doing so, this should bring the code that copies the .data section
-   from ROM to RAM at init time.
-  ___pre_comp_data_size = SIZEOF(.data);
-  __install_data_sections = ___pre_comp_data_size > 0 ?
-		__map_data_sections : 0;
-*/
-  /* .install  :
-  {
-    . = _data_image_end;
-  }  > text */
-  /* Relocation for some bss and data sections.  */
-  .bss   :
-  {
-    __bss_start = .;
-    *(.sbss)
-    *(.scommon)
-    *(.dynbss)
-    *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
-    *(COMMON)
-    PROVIDE (_end = .);
-  }  > data
-  __bss_size = SIZEOF(.bss);
-  PROVIDE (__bss_size = SIZEOF(.bss));
-  /* If the 'vectors_addr' symbol is defined, it indicates the start address
-     of interrupt vectors.  This depends on the 68HC11 operating mode:
-			Addr
-     Single chip	0xffc0
-     Extended mode	0xffc0
-     Bootstrap		0x00c0
-     Test		0xbfc0
-     In general, the vectors address is 0xffc0.  This can be overriden 
-     with the '-defsym vectors_addr=0xbfc0' ld option.
-     Note: for the bootstrap mode, the interrupt vectors are at 0xbfc0 but
-     they are redirected to 0x00c0 by the internal PROM.  Application's vectors
-     must also consist of jump instructions (see Motorola's manual).  */
-  PROVIDE (_vectors_addr = DEFINED (vectors_addr) ? vectors_addr : 0xffc0);
-  .vectors DEFINED (vectors_addr) ? vectors_addr : 0xffc0 :
-  {
-    KEEP (*(.vectors))
-  }
-  /* Stabs debugging sections.  */
-  .stab		 0 : { *(.stab) }
-  .stabstr	 0 : { *(.stabstr) }
-  .stab.excl	 0 : { *(.stab.excl) }
-  .stab.exclstr	 0 : { *(.stab.exclstr) }
-  .stab.index	 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment	 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.
-     Treatment of DWARF debug section must be at end of the linker
-     script to avoid problems when there are undefined symbols. It's necessary
-     to avoid that the DWARF section is relocated before such undefined
-     symbols are found.  */
-  /* DWARF 1 */
-  .debug	 0 : { *(.debug) }
-  .line		 0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo 0 : { *(.debug_srcinfo) }
-  .debug_sfnames 0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-}
diff --git a/libgloss/m68hc11/sim-valid-m68hc12.ld b/libgloss/m68hc11/sim-valid-m68hc12.ld
deleted file mode 100644
index 681bc6d..0000000
--- a/libgloss/m68hc11/sim-valid-m68hc12.ld
+++ /dev/null
@@ -1,310 +0,0 @@
-/* Linker script for 68HC12 executable (PROM).  */
-ENTRY(_start)
-OUTPUT_FORMAT("elf32-m68hc12", "elf32-m68hc12", "elf32-m68hc12")
-OUTPUT_ARCH(m68hc12)
-
-GROUP(-lc -lbcc -lgcc)
-SEARCH_DIR(.);
-/* Fixed definition of the available memory banks.
-   See generic emulation script for a user defined configuration.  */
-
-/* The memory layout below is suitable for gcc validation.
-   It takes care of big programs allowing up to 48128 bytes
-   of text while allowing some programs that consume some
-   memory (comp-goto-1 requires the RAM to be set to 0x4400
-   to avoid head<->stack collision in malloc/sbrk).  */
-MEMORY
-{
-  page0 (rwx) : ORIGIN = 0x00, LENGTH = 256
-  text  (rx)  : ORIGIN = 0x04400, LENGTH = 0x10000 - 0x4400
-  data        : ORIGIN = 0x01100, LENGTH = 0x2000 - 0x1100
-}
-/* Setup the stack on the top of the data memory bank.  */
-PROVIDE (_stack = 0x04400 - 1);
-SECTIONS
-{
-  .hash          : { *(.hash)		}
-  .dynsym        : { *(.dynsym)		}
-  .dynstr        : { *(.dynstr)		}
-  .gnu.version		  : { *(.gnu.version) }
-  .gnu.version_d	  : { *(.gnu.version_d) }
-  .gnu.version_r	  : { *(.gnu.version_r) }
-  .rel.text      :
-    {
-      *(.rel.text)
-      *(.rel.text.*)
-      *(.rel.gnu.linkonce.t.*)
-    }
-  .rela.text     :
-    {
-      *(.rela.text)
-      *(.rela.text.*)
-      *(.rela.gnu.linkonce.t.*)
-    }
-  .rel.data      :
-    {
-      *(.rel.data)
-      *(.rel.data.*)
-      *(.rel.gnu.linkonce.d.*)
-    }
-  .rela.data     :
-    {
-      *(.rela.data)
-      *(.rela.data.*)
-      *(.rela.gnu.linkonce.d.*)
-    }
-  .rel.rodata    :
-    {
-      *(.rel.rodata)
-      *(.rel.rodata.*)
-      *(.rel.gnu.linkonce.r.*)
-    }
-  .rela.rodata   :
-    {
-      *(.rela.rodata)
-      *(.rela.rodata.*)
-      *(.rela.gnu.linkonce.r.*)
-    }
-  .rel.sdata     :
-    {
-      *(.rel.sdata)
-      *(.rel.sdata.*)
-      *(.rel.gnu.linkonce.s.*)
-    }
-  .rela.sdata     :
-    {
-      *(.rela.sdata)
-      *(.rela.sdata.*)
-      *(.rela.gnu.linkonce.s.*)
-    }
-  .rel.sbss      :
-    { 
-      *(.rel.sbss)
-      *(.rel.sbss.*)
-      *(.rel.gnu.linkonce.sb.*)
-    }
-  .rela.sbss     :
-    {
-      *(.rela.sbss)
-      *(.rela.sbss.*)
-      *(.rel.gnu.linkonce.sb.*)
-    }
-  .rel.bss       : 
-    { 
-      *(.rel.bss)
-      *(.rel.bss.*)
-      *(.rel.gnu.linkonce.b.*)
-    }
-  .rela.bss      : 
-    { 
-      *(.rela.bss)
-      *(.rela.bss.*)
-      *(.rela.gnu.linkonce.b.*)
-    }
-  .rela.stext		  : { *(.rela.stest) }
-  .rela.etext		  : { *(.rela.etest) }
-  .rela.sdata		  : { *(.rela.sdata) }
-  .rela.edata		  : { *(.rela.edata) }
-  .rela.eit_v		  : { *(.rela.eit_v) }
-  .rela.ebss		  : { *(.rela.ebss) }
-  .rela.srodata		  : { *(.rela.srodata) }
-  .rela.erodata		  : { *(.rela.erodata) }
-  .rela.got		  : { *(.rela.got) }
-  .rela.ctors		  : { *(.rela.ctors) }
-  .rela.dtors		  : { *(.rela.dtors) }
-  .rela.init		  : { *(.rela.init) }
-  .rela.fini		  : { *(.rela.fini) }
-  .rela.plt		  : { *(.rela.plt) }
-  .rel.stext		  : { *(.rel.stest) }
-  .rel.etext		  : { *(.rel.etest) }
-  .rel.sdata		  : { *(.rel.sdata) }
-  .rel.edata		  : { *(.rel.edata) }
-  .rel.ebss		  : { *(.rel.ebss) }
-  .rel.eit_v		  : { *(.rel.eit_v) }
-  .rel.srodata		  : { *(.rel.srodata) }
-  .rel.erodata		  : { *(.rel.erodata) }
-  .rel.got		  : { *(.rel.got) }
-  .rel.ctors		  : { *(.rel.ctors) }
-  .rel.dtors		  : { *(.rel.dtors) }
-  .rel.init		  : { *(.rel.init) }
-  .rel.fini		  : { *(.rel.fini) }
-  .rel.plt		  : { *(.rel.plt) }
-  /* Concatenate .page0 sections.  Put them in the page0 memory bank
-     unless we are creating a relocatable file.  */
-  .page0 :
-  {
-    *(.page0)
-  }  > page0
-
-  /* Start of text section.  */
-  .stext   : 
-  {
-    *(.stext)
-  }  > text
-  .init	  :
-  {
-    *(.init) 
-  } =0
-  /* Put trampolines at beginning of text at 0x4400 so that they
-     are not in memory bank window.  */
-  .tramp :
-  {
-    *(.tramp)
-  } > text
-  .text  :
-  {
-    /* Put startup code at beginning so that _start keeps same address.  */
-    /* Startup code.  */
-    KEEP (*(.install0))	/* Section should setup the stack pointer.  */
-    KEEP (*(.install1))	/* Place holder for applications.  */
-    KEEP (*(.install2))	/* Optional installation of data sections in RAM.  */
-    KEEP (*(.install3))	/* Place holder for applications.  */
-    KEEP (*(.install4))	/* Section that calls the main.  */
-    *(.init)
-    *(.text)
-    *(.text.*)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t.*)
-    /* Finish code.  */
-    KEEP (*(.fini0))	/* Beginning of finish code (_exit symbol).  */
-    KEEP (*(.fini1))	/* Place holder for applications.  */
-    KEEP (*(.fini2))	/* C++ destructors.  */
-    KEEP (*(.fini3))	/* Place holder for applications.  */
-    KEEP (*(.fini4))	/* Runtime exit.  */
-    _etext = .;
-    PROVIDE (etext = .);
-  }  > text
-  .eh_frame   :
-  {
-    *(.eh_frame)
-  }  > text
-  .gcc_except_table :
-  {
-    *(.gcc_except_table)
-  } > text
-  .rodata    :
-  {
-    *(.rodata)
-    *(.rodata.*)
-    *(.gnu.linkonce.r*)
-  }  > text
-  .rodata1   :
-  {
-    *(.rodata1)
-  }  > text
-  /* Constructor and destructor tables are in ROM.  */
-  .ctors   : 
-  {
-     PROVIDE (__CTOR_LIST__ = .); 
-     KEEP (*(.ctors))
-     PROVIDE(__CTOR_END__ = .); 
-  }  > text
-    .dtors	  :
-  {
-     PROVIDE(__DTOR_LIST__ = .); 
-     KEEP (*(.dtors))
-     PROVIDE(__DTOR_END__ = .); 
-  }  > text
-  /* Start of the data section image in ROM.  */
-  __data_image = .;
-  PROVIDE (__data_image = .);
-  /* All read-only sections that normally go in PROM must be above.
-     We construct the DATA image section in PROM at end of all these
-     read-only sections.  The data image must be copied at init time.
-     Refer to GNU ld, Section 3.6.8.2 Output Section LMA.  */
-  .data    : AT (__data_image)
-  {
-    __data_section_start = .;
-    PROVIDE (__data_section_start = .);
-    *(.sdata)
-    *(.data)
-    *(.data.*)
-    *(.data1)
-    *(.gnu.linkonce.d.*)
-    CONSTRUCTORS
-    _edata  =  .;
-    PROVIDE (edata = .);
-  }  > data
-  __data_section_size = SIZEOF(.data);
-  PROVIDE (__data_section_size = SIZEOF(.data));
-  __data_image_end = __data_image + __data_section_size;
-/* SCz: this does not work yet... This is supposed to force the loading
-   of _map_data.o (from libgcc.a) when the .data section is not empty.
-   By doing so, this should bring the code that copies the .data section
-   from ROM to RAM at init time.
-  ___pre_comp_data_size = SIZEOF(.data);
-  __install_data_sections = ___pre_comp_data_size > 0 ?
-		__map_data_sections : 0;
-*/
-  /* .install  :
-  {
-    . = _data_image_end;
-  }  > text */
-  /* Relocation for some bss and data sections.  */
-  .bss   :
-  {
-    __bss_start = .;
-    *(.softregs)
-    *(.sbss)
-    *(.scommon)
-    *(.dynbss)
-    *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
-    *(COMMON)
-    PROVIDE (_end = .);
-  }  > data
-  __bss_size = SIZEOF(.bss);
-  PROVIDE (__bss_size = SIZEOF(.bss));
-  /* If the 'vectors_addr' symbol is defined, it indicates the start address
-     of interrupt vectors.  This depends on the 68HC11 operating mode:
-			Addr
-     Single chip	0xffc0
-     Extended mode	0xffc0
-     Bootstrap		0x00c0
-     Test		0xbfc0
-     In general, the vectors address is 0xffc0.  This can be overriden 
-     with the '-defsym vectors_addr=0xbfc0' ld option.
-     Note: for the bootstrap mode, the interrupt vectors are at 0xbfc0 but
-     they are redirected to 0x00c0 by the internal PROM.  Application's vectors
-     must also consist of jump instructions (see Motorola's manual).  */
-  PROVIDE (_vectors_addr = DEFINED (vectors_addr) ? vectors_addr : 0xffc0);
-  .vectors DEFINED (vectors_addr) ? vectors_addr : 0xffc0 :
-  {
-    KEEP (*(.vectors))
-  }
-  /* Stabs debugging sections.  */
-  .stab		 0 : { *(.stab) }
-  .stabstr	 0 : { *(.stabstr) }
-  .stab.excl	 0 : { *(.stab.excl) }
-  .stab.exclstr	 0 : { *(.stab.exclstr) }
-  .stab.index	 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment	 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.
-     Treatment of DWARF debug section must be at end of the linker
-     script to avoid problems when there are undefined symbols. It's necessary
-     to avoid that the DWARF section is relocated before such undefined
-     symbols are found.  */
-  /* DWARF 1 */
-  .debug	 0 : { *(.debug) }
-  .line		 0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo 0 : { *(.debug_srcinfo) }
-  .debug_sfnames 0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-}
diff --git a/libgloss/m68hc11/syscalls.c b/libgloss/m68hc11/syscalls.c
deleted file mode 100644
index 9620146..0000000
--- a/libgloss/m68hc11/syscalls.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* pseudo system calls for M68HC11 & M68HC12.
- * Copyright (C) 1999, 2000, 2001, 2002 Stephane Carrez (stcarrez@nerim.fr)	
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-extern void outbyte(char c);
-extern char inbyte(void);
-
-int
-read(int file, void *p, size_t nbytes)
-{
-  int i = 0;
-  char* buf = (char*) p;
-  
-  for (i = 0; i < nbytes; i++) {
-    *(buf + i) = inbyte();
-    if ((*(buf + i) == '\n') || (*(buf + i) == '\r')) {
-      i++;
-      break;
-    }
-  }
-  return (i);
-}
-
-int
-write(int file, const void *p, size_t len)
-{
-  const char *ptr = (const char*) p;
-  int todo;
-  
-  for (todo = len; todo; --todo)
-    {
-      outbyte (*ptr++);
-    }
-  return(len);
-}
-
-void *
-sbrk(ptrdiff_t incr)
-{
-  extern char _end;		/* Defined by the linker */
-  static char *heap_end;
-  char *prev_heap_end;
-
-  register char *stack_ptr asm ("sp");
-
-  if (heap_end == 0) 
-    {
-      heap_end = &_end;
-    }
-  prev_heap_end = heap_end;
-  if (heap_end + incr > stack_ptr)
-    {
-      write (1, "Heap and stack collision\n", 25);
-      abort ();
-    }
-  heap_end += incr;
-  return ((void*) prev_heap_end);
-}
-
-/* end of syscalls.c */
diff --git a/libgloss/m68k/Makefile.in b/libgloss/m68k/Makefile.in
index 8faf5ff..5705b11 100644
--- a/libgloss/m68k/Makefile.in
+++ b/libgloss/m68k/Makefile.in
@@ -14,7 +14,6 @@
 # target boards.
 #
 
-DESTDIR =
 VPATH = @srcdir@
 srcdir = @srcdir@
 objdir = .
@@ -123,8 +122,6 @@ IDPGDB_OBJS=	leds.o idp-inbyte.o idp-gdb-outbyte.o mc68ec.o
 DBUG_BSP=	libdbug.a
 DBUG_OBJS=	dbug-exit.o dbug-inbyte.o dbug-outbyte.o
 
-CF_SCRIPTS=   m5208evb.ld m5213evb.ld m5235evb.ld m5272c3.ld m5282evb.ld
-
 # Host specific makefile fragment comes in here.
 @host_makefile_frag@
 
@@ -132,7 +129,7 @@ CF_SCRIPTS=   m5208evb.ld m5213evb.ld m5235evb.ld m5272c3.ld m5282evb.ld
 # build a test program for each target board. Just trying to get
 # it to link is a good test, so we ignore all the errors for now.
 #
-all: ${SIM_CRT0} ${SIM_BSP} ${CRT0} ${BCC_BSP} ${IDP_BSP} ${IDPGDB_BSP} ${MVME135_BSP} ${MVME162_BSP} ${DBUG_BSP} ${CF_SCRIPTS}
+all: ${SIM_CRT0} ${SIM_BSP} ${CRT0} ${BCC_BSP} ${IDP_BSP} ${IDPGDB_BSP} ${MVME135_BSP} ${MVME162_BSP} ${DBUG_BSP}
 
 #
 # here's where we build the board support packages for each target
@@ -165,21 +162,6 @@ ${MVME162_BSP}: $(OBJS) ${MVME162_OBJS}
 	${AR} ${ARFLAGS} $@ $(OBJS) ${MVME162_OBJS}
 	${RANLIB} $@
 
-m5208evb.ld: dbug-cf.sc Makefile
-	RAMSTART=1024M RAMSIZE=16M RAMDBUG=128K ${SHELL} $< > $@
-
-m5213evb.ld: dbug-cf.sc Makefile
-	RAMSTART=512M RAMSIZE=32K RAMDBUG=8K ${SHELL} $< > $@
-
-m5235evb.ld: dbug-cf.sc Makefile
-	RAMSTART=0M RAMSIZE=16M RAMDBUG=64K ${SHELL} $< > $@
-
-m5272c3.ld: dbug-cf.sc Makefile
-	RAMSTART=0M RAMSIZE=4M RAMDBUG=128K ${SHELL} $< > $@
-
-m5282evb.ld: dbug-cf.sc Makefile
-	RAMSTART=0M RAMSIZE=16M RAMDBUG=64K ${SHELL} $< > $@
-
 leds.o: ${srcdir}/leds.c
 	$(CC) $(CFLAGS_FOR_TARGET) $(INCLUDES) -c $<
 
@@ -276,33 +258,30 @@ unlink.o: $(srcdir)/../unlink.c
 .PHONY: install info dvi doc install-info clean-info
 install:
 	# install SIM stuff
-	$(INSTALL_PROGRAM) $(SIM_CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(SIM_CRT0)
-	$(INSTALL_PROGRAM) $(SIM_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(SIM_BSP)
-	$(INSTALL_DATA) ${srcdir}/sim.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/sim.ld
+	$(INSTALL_PROGRAM) $(SIM_CRT0) $(tooldir)/lib${MULTISUBDIR}/$(SIM_CRT0)
+	$(INSTALL_PROGRAM) $(SIM_BSP) $(tooldir)/lib${MULTISUBDIR}/$(SIM_BSP)
+	$(INSTALL_DATA) ${srcdir}/sim.ld $(tooldir)/lib${MULTISUBDIR}/sim.ld
 	#
-	$(INSTALL_PROGRAM) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
+	$(INSTALL_PROGRAM) $(CRT0) $(tooldir)/lib${MULTISUBDIR}/$(CRT0)
 	# install BCC stuff
-	$(INSTALL_PROGRAM) $(BCC_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(BCC_BSP)
-	$(INSTALL_DATA) ${srcdir}/bcc.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/bcc.ld
+	$(INSTALL_PROGRAM) $(BCC_BSP) $(tooldir)/lib${MULTISUBDIR}/$(BCC_BSP)
+	$(INSTALL_DATA) ${srcdir}/bcc.ld $(tooldir)/lib${MULTISUBDIR}/bcc.ld
 	# install IDP stuff
-	$(INSTALL_PROGRAM) $(IDP_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(IDP_BSP)
-	$(INSTALL_DATA) ${srcdir}/idp.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/idp.ld
+	$(INSTALL_PROGRAM) $(IDP_BSP) $(tooldir)/lib${MULTISUBDIR}/$(IDP_BSP)
+	$(INSTALL_DATA) ${srcdir}/idp.ld $(tooldir)/lib${MULTISUBDIR}/idp.ld
 	# install IDPGDB stuff
-	$(INSTALL_PROGRAM) $(IDPGDB_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(IDPGDB_BSP)
-	$(INSTALL_DATA) ${srcdir}/idpgdb.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/idpgdb.ld
+	$(INSTALL_PROGRAM) $(IDPGDB_BSP) $(tooldir)/lib${MULTISUBDIR}/$(IDPGDB_BSP)
+	$(INSTALL_DATA) ${srcdir}/idpgdb.ld $(tooldir)/lib${MULTISUBDIR}/idpgdb.ld
 	# install MVME135 stuff
-	$(INSTALL_PROGRAM) $(MVME135_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(MVME135_BSP)
-	$(INSTALL_DATA) ${srcdir}/mvme135.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/mvme135.ld
+	$(INSTALL_PROGRAM) $(MVME135_BSP) $(tooldir)/lib${MULTISUBDIR}/$(MVME135_BSP)
+	$(INSTALL_DATA) ${srcdir}/mvme135.ld $(tooldir)/lib${MULTISUBDIR}/mvme135.ld
 	# install MVME162lx stuff
-	$(INSTALL_PROGRAM) $(MVME162_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(MVME162_BSP)
-	$(INSTALL_DATA) ${srcdir}/mvme162.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/mvme162.ld
+	$(INSTALL_PROGRAM) $(MVME162_BSP) $(tooldir)/lib${MULTISUBDIR}/$(MVME162_BSP)
+	$(INSTALL_DATA) ${srcdir}/mvme162.ld $(tooldir)/lib${MULTISUBDIR}/mvme162.ld
 	# install DBUG stuff
-	$(INSTALL_PROGRAM) $(DBUG_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(DBUG_BSP)
-	$(INSTALL_DATA) ${srcdir}/sbc5204.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/sbc5204.ld
-	$(INSTALL_DATA) ${srcdir}/sbc5206.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/sbc5206.ld
-	for script in $(CF_SCRIPTS) ; \
-	do $(INSTALL_DATA) $$script $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$script ; \
-	done
+	$(INSTALL_PROGRAM) $(DBUG_BSP) $(tooldir)/lib${MULTISUBDIR}/$(DBUG_BSP)
+	$(INSTALL_DATA) ${srcdir}/sbc5204.ld $(tooldir)/lib${MULTISUBDIR}/sbc5204.ld
+	$(INSTALL_DATA) ${srcdir}/sbc5206.ld $(tooldir)/lib${MULTISUBDIR}/sbc5206.ld
 
 # target specific makefile fragment comes in here.
 @target_makefile_frag@
diff --git a/libgloss/m68k/asm.h b/libgloss/m68k/asm.h
index e341385..035024a 100644
--- a/libgloss/m68k/asm.h
+++ b/libgloss/m68k/asm.h
@@ -83,72 +83,3 @@
 #define fpcr REG (fpcr)
 #define fpsr REG (fpsr)
 #define fpi REG (fpi)
-
-/* Provide a few macros to allow for PIC code support.
- * With PIC, data is stored A5 relative so we've got to take a bit of special
- * care to ensure that all loads of global data is via A5.  PIC also requires
- * jumps and subroutine calls to be PC relative rather than absolute.  We cheat
- * a little on this and in the PIC case, we use short offset branches and
- * hope that the final object code is within range (which it should be).
- */
-#ifndef __PIC__
-
-	/* Non PIC (absolute/relocatable) versions */
-
-	.macro PICCALL addr
-	jbsr	\addr
-	.endm
-
-	.macro PICJUMP addr
-	jmp	\addr
-	.endm
-
-	.macro PICLEA sym, reg
-	lea	\sym, \reg
-	.endm
-
-	.macro PICPEA sym, areg
-	pea	\sym
-	.endm
-
-#else /* __PIC__ */
-
-	/* Common for -mid-shared-libary and -msep-data */
-
-	.macro PICCALL addr
-	bsr	\addr
-	.endm
-
-	.macro PICJUMP addr
-	bra	\addr
-	.endm
-
-# if defined(__ID_SHARED_LIBRARY__)
-
-	/* -mid-shared-library versions  */
-
-	.macro PICLEA sym, reg
-	movel	a5@(_current_shared_library_a5_offset_), \reg
-	movel	\sym@GOT(\reg), \reg
-	.endm
-
-	.macro PICPEA sym, areg
-	movel	a5@(_current_shared_library_a5_offset_), \areg
-	movel	\sym@GOT(\areg), sp@-
-	.endm
-
-# else /* !__ID_SHARED_LIBRARY__ */
-
-	/* Versions for -msep-data */
-
-	.macro PICLEA sym, reg
-	movel	\sym@GOT(a5), \reg
-	.endm
-
-	.macro PICPEA sym, areg
-	movel	\sym@GOT(a5), sp@-
-	.endm
-
-# endif /* !__ID_SHARED_LIBRARY__ */
-#endif /* __PIC__ */
-
diff --git a/libgloss/m68k/bcc.ld b/libgloss/m68k/bcc.ld
index b9acfb3..65f6441 100644
--- a/libgloss/m68k/bcc.ld
+++ b/libgloss/m68k/bcc.ld
@@ -63,7 +63,7 @@ SECTIONS
 {
   .text :
   {
-    *(.text .text.*)
+    *(.text)
     . = ALIGN(0x4);
      __CTOR_LIST__ = .;
     ___CTOR_LIST__ = .;
@@ -77,7 +77,7 @@ SECTIONS
     *(.dtors)
      LONG(0)
     __DTOR_END__ = .;
-    *(.rodata .rodata.*)
+    *(.rodata)
     *(.gcc_except_table) 
 
     . = ALIGN(0x2);
@@ -99,9 +99,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -110,7 +109,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/configure b/libgloss/m68k/configure
index 1fbf8c8..36af25e 100755
--- a/libgloss/m68k/configure
+++ b/libgloss/m68k/configure
@@ -740,18 +740,10 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:755: checking for $ac_word" >&5
+echo "configure:747: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -781,7 +773,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:785: checking for $ac_word" >&5
+echo "configure:777: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -826,11 +818,92 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:828: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:860: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext << EOF
+
+#line 871 "configure"
+#include "confdefs.h"
+
+main(){return(0);}
+EOF
+if { (eval echo configure:876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  ac_cv_prog_cc_works=yes
+  # If we can't run a trivial program, we are probably using a cross compiler.
+  if (./conftest; exit) 2>/dev/null; then
+    ac_cv_prog_cc_cross=no
+  else
+    ac_cv_prog_cc_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+if test $ac_cv_prog_cc_works = no; then
+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:902: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+cross_compiling=$ac_cv_prog_cc_cross
+
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:834: checking whether we are using GNU C" >&5
+echo "configure:907: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -839,7 +912,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -850,11 +923,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:858: checking whether ${CC-cc} accepts -g" >&5
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:935: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -869,19 +946,22 @@ rm -f conftest*
 fi
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
     CFLAGS="-g -O2"
   else
-    CFLAGS="-O2"
+    CFLAGS="-g"
   fi
 else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
 fi
 
-
 AS=${AS-as}
 
 AR=${AR-ar}
@@ -891,7 +971,7 @@ LD=${LD-ld}
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:895: checking for $ac_word" >&5
+echo "configure:975: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1111,7 +1191,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/libgloss/m68k/configure.in b/libgloss/m68k/configure.in
index 6cb89ca..1770226 100644
--- a/libgloss/m68k/configure.in
+++ b/libgloss/m68k/configure.in
@@ -34,46 +34,7 @@ AC_ARG_PROGRAM
 
 AC_PROG_INSTALL
 
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
+AC_PROG_CC
 AS=${AS-as}
 AC_SUBST(AS)
 AR=${AR-ar}
diff --git a/libgloss/m68k/crt0.S b/libgloss/m68k/crt0.S
index 1aa0dd6..cb78481 100644
--- a/libgloss/m68k/crt0.S
+++ b/libgloss/m68k/crt0.S
@@ -84,7 +84,7 @@ SYM (start):
 	subql	IMM(1), d0
 2:
 	clrb	(a0)+
-#if !defined(__mcoldfire__)
+#ifndef __mcf5200__
 	dbra	d0, 2b
 	clrw	d0
 	subql	IMM(1), d0
@@ -100,13 +100,13 @@ SYM (start):
  * initialize target specific stuff. Only execute these
  * functions it they exist.
  */
-	PICLEA	SYM (hardware_init_hook), a0
+	lea	SYM (hardware_init_hook), a0
 	cmpl	IMM(0),a0
 	jbeq	4f
 	jsr     (a0)
 4:
 
-	PICLEA	SYM (software_init_hook), a0
+	lea	SYM (software_init_hook), a0
 	cmpl	IMM(0),a0
 	jbeq	5f
 	jsr     (a0)
@@ -121,18 +121,18 @@ SYM (start):
 #ifdef ADD_DTORS
 	/* put __do_global_dtors in the atexit list so the destructors get run */
 	movel	IMM (SYM(__do_global_dtors)),(sp)
-	PICCALL	SYM (atexit)
+	jsr	SYM (atexit)
 #endif
 	movel	IMM (__FINI_SECTION__),(sp)
-	PICCALL	SYM (atexit)
+	jsr	SYM (atexit)
 
-	PICCALL	__INIT_SECTION__
+	jsr	__INIT_SECTION__
 
         pea     0
-	PICPEA	SYM (environ),a0
+        pea     SYM (environ)
         pea     sp@(4)
         pea     0
-	PICCALL	SYM (main)
+	jsr	SYM (main)
 	movel	d0, sp@-
 
 /*
@@ -140,4 +140,4 @@ SYM (start):
  * control back to the ROM monitor, if there is one. This calls the
  * exit() from the C library so the C++ tables get cleaned up right.
  */
-	PICCALL	SYM (exit)
+        jsr     SYM (exit)
diff --git a/libgloss/m68k/dbug-cf.sc b/libgloss/m68k/dbug-cf.sc
deleted file mode 100644
index 0342ed1..0000000
--- a/libgloss/m68k/dbug-cf.sc
+++ /dev/null
@@ -1,112 +0,0 @@
-# a linker script template.
-# RAMSTART - start of board's ram
-# RAMSIZE - size of board's ram
-# RAMDBUG - bytes at start of RAM for DBUG use
-
-cat <<EOF
-STARTUP(crt0.o)
-OUTPUT_ARCH(m68k)
-/* DBUG loads SREC files */
-/*OUTPUT_FORMAT(srec)*/
-ENTRY(start)
-SEARCH_DIR(.)
-GROUP(-ldbug -lc -lgcc -ldbug)
-__DYNAMIC  =  0;
-
-MEMORY
-{
-  ram (rwx) : ORIGIN = ${RAMSTART} + ${RAMDBUG:-0},
-		 LENGTH = ${RAMSIZE} - ${RAMDBUG:-0}
-}
-
-PROVIDE (__stack = ${RAMSTART} + ${RAMSIZE});
-
-/*
- * Initalize some symbols to be zero so we can reference them in the
- * crt0 without core dumping. These functions are all optional, but
- * we do this so we can have our crt0 always use them if they exist. 
- * This is so BSPs work better when using the crt0 installed gcc.
- * We have to initalize them twice, so we cover a.out (which prepends
- * an underscore) and coff object file formats.
- */
-PROVIDE (hardware_init_hook = 0);
-PROVIDE (_hardware_init_hook = 0);
-PROVIDE (software_init_hook = 0);
-PROVIDE (_software_init_hook = 0);
-/*
- * stick everything in ram (of course)
- */
-SECTIONS
-{
-  .text :
-  {
-    CREATE_OBJECT_SYMBOLS
-    *(.text .text.*)
-
-    . = ALIGN(0x4);
-    /* These are for running static constructors and destructors under ELF.  */
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-
-    *(.rodata .rodata.*)
-
-    . = ALIGN(0x4);
-    *(.gcc_except_table) 
-
-    . = ALIGN(0x4);
-    *(.eh_frame)
-
-    . = ALIGN(0x4);
-    __INIT_SECTION__ = . ;
-    LONG (0x4e560000)	/* linkw %fp,#0 */
-    *(.init)
-    SHORT (0x4e5e)	/* unlk %fp */
-    SHORT (0x4e75)	/* rts */
-
-    . = ALIGN(0x4);
-    __FINI_SECTION__ = . ;
-    LONG (0x4e560000)	/* linkw %fp,#0 */
-    *(.fini)
-    SHORT (0x4e5e)	/* unlk %fp */
-    SHORT (0x4e75)	/* rts */
-
-    _etext = .;
-    *(.lit)
-  } > ram
-
-  .data :
-  {
-    *(.got.plt) *(.got)
-    *(.shdata)
-    *(.data .data.*)
-    _edata = .;
-  } > ram
-
-  .bss :
-  {
-    . = ALIGN(0x4);
-    __bss_start = . ;
-    *(.shbss)
-    *(.bss .bss.*)
-    *(COMMON)
-    _end =  ALIGN (0x8);
-    __end = _end;
-  } > ram
-
-  .stab 0 (NOLOAD) :
-  {
-    *(.stab)
-  }
-
-  .stabstr 0 (NOLOAD) :
-  {
-    *(.stabstr)
-  }
-}
-EOF
diff --git a/libgloss/m68k/idp.ld b/libgloss/m68k/idp.ld
index 7359783..db6d8c5 100644
--- a/libgloss/m68k/idp.ld
+++ b/libgloss/m68k/idp.ld
@@ -77,7 +77,7 @@ SECTIONS
   .text :
   {
     CREATE_OBJECT_SYMBOLS
-    *(.text .text.*)
+    *(.text)
 
     . = ALIGN(0x4);
     /* These are for running static constructors and destructors under ELF.  */
@@ -90,7 +90,7 @@ SECTIONS
     KEEP (*(SORT(.dtors.*)))
     KEEP (*(.dtors))
 
-    *(.rodata .rodata.*)
+    *(.rodata)
 
     . = ALIGN(0x4);
     *(.gcc_except_table) 
@@ -118,9 +118,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -129,7 +128,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/idpgdb.ld b/libgloss/m68k/idpgdb.ld
index a8a13ee..9d24e28 100644
--- a/libgloss/m68k/idpgdb.ld
+++ b/libgloss/m68k/idpgdb.ld
@@ -77,7 +77,7 @@ SECTIONS
   .text :
   {
     CREATE_OBJECT_SYMBOLS
-    *(.text .text.*)
+    *(.text)
 
     . = ALIGN(0x4);
     /* These are for running static constructors and destructors under ELF.  */
@@ -90,7 +90,7 @@ SECTIONS
     KEEP (*(SORT(.dtors.*)))
     KEEP (*(.dtors))
 
-    *(.rodata .rodata.*)
+    *(.rodata)
 
     . = ALIGN(0x4);
     *(.gcc_except_table) 
@@ -118,9 +118,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -129,7 +128,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/leds.c b/libgloss/m68k/leds.c
index b911237..125ae8b 100644
--- a/libgloss/m68k/leds.c
+++ b/libgloss/m68k/leds.c
@@ -15,6 +15,9 @@
  */
 #include "leds.h"
 
+void zylons();
+void led_putnum();
+
 /*
  * led_putnum -- print a hex number on the LED. the value of num must be a char with
  *              the ascii value. ie... number 0 is '0', a is 'a', ' ' (null) clears
diff --git a/libgloss/m68k/leds.h b/libgloss/m68k/leds.h
index c3fd6a3..919c381 100644
--- a/libgloss/m68k/leds.h
+++ b/libgloss/m68k/leds.h
@@ -32,6 +32,5 @@
 #define FUDGE(x) ((x >= 0xa && x <= 0xf) ? (x + 'a') & 0x7f : (x + '0') & 0x7f)
 
 extern void led_putnum( char );
-void zylons();
 
 #endif		/* __LEDS_H__ */
diff --git a/libgloss/m68k/mvme135.ld b/libgloss/m68k/mvme135.ld
index fd52e4e..dba0dbe 100644
--- a/libgloss/m68k/mvme135.ld
+++ b/libgloss/m68k/mvme135.ld
@@ -64,7 +64,7 @@ SECTIONS
 {
   .text :
   {
-    *(.text .text.*)
+    *(.text)
     . = ALIGN(0x4);
      __CTOR_LIST__ = .;
     ___CTOR_LIST__ = .;
@@ -78,7 +78,7 @@ SECTIONS
     *(.dtors)
      LONG(0)
     __DTOR_END__ = .;
-    *(.rodata .rodata.*)
+    *(.rodata)
     *(.gcc_except_table) 
 
     . = ALIGN(0x2);
@@ -100,9 +100,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -111,7 +110,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/mvme162.ld b/libgloss/m68k/mvme162.ld
index 18d5f62..fd3ae10 100644
--- a/libgloss/m68k/mvme162.ld
+++ b/libgloss/m68k/mvme162.ld
@@ -65,7 +65,7 @@ SECTIONS
 {
   .text :
   {
-    *(.text .text.*)
+    *(.text)
     . = ALIGN(0x4);
      __CTOR_LIST__ = .;
     ___CTOR_LIST__ = .;
@@ -79,7 +79,7 @@ SECTIONS
     *(.dtors)
      LONG(0)
     __DTOR_END__ = .;
-    *(.rodata .rodata.*)
+    *(.rodata)
     *(.gcc_except_table) 
 
     . = ALIGN(0x2);
@@ -101,9 +101,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -112,7 +111,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/sbc5204.ld b/libgloss/m68k/sbc5204.ld
index da10fe8..4570b0e 100644
--- a/libgloss/m68k/sbc5204.ld
+++ b/libgloss/m68k/sbc5204.ld
@@ -63,7 +63,7 @@ SECTIONS
 {
   .text :
   {
-    *(.text .text.*)
+    *(.text)
     . = ALIGN(0x4);
      __CTOR_LIST__ = .;
     ___CTOR_LIST__ = .;
@@ -77,7 +77,7 @@ SECTIONS
     *(.dtors)
      LONG(0)
     __DTOR_END__ = .;
-    *(.rodata .rodata.*)
+    *(.rodata)
     *(.gcc_except_table) 
 
     . = ALIGN(0x2);
@@ -99,9 +99,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -110,7 +109,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/sbc5206.ld b/libgloss/m68k/sbc5206.ld
index e0707d8..d082a08 100644
--- a/libgloss/m68k/sbc5206.ld
+++ b/libgloss/m68k/sbc5206.ld
@@ -63,7 +63,7 @@ SECTIONS
 {
   .text :
   {
-    *(.text .text.*)
+    *(.text)
     . = ALIGN(0x4);
      __CTOR_LIST__ = .;
     ___CTOR_LIST__ = .;
@@ -77,7 +77,7 @@ SECTIONS
     *(.dtors)
      LONG(0)
     __DTOR_END__ = .;
-    *(.rodata .rodata.*)
+    *(.rodata)
     *(.gcc_except_table) 
 
     . = ALIGN(0x2);
@@ -99,9 +99,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -110,7 +109,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/m68k/sim-crt0.S b/libgloss/m68k/sim-crt0.S
index 49f7777..bc25514 100644
--- a/libgloss/m68k/sim-crt0.S
+++ b/libgloss/m68k/sim-crt0.S
@@ -78,7 +78,7 @@ SYM (start):
 	subql	IMM(1), d0
 2:
 	clrb	(a0)+
-#if !defined(__mcoldfire__) && !defined(__mcf5200__)
+#ifndef __mcf5200__
 	dbra	d0, 2b
 	clrw	d0
 	subql	IMM(1), d0
@@ -99,18 +99,18 @@ SYM (start):
 #ifdef ADD_DTORS
 	/* put __do_global_dtors in the atexit list so the destructors get run */
 	movel	IMM (SYM(__do_global_dtors)),(sp)
-	PICCALL	SYM (atexit)
+	jsr	SYM (atexit)
 #endif
 	movel	IMM (__FINI_SECTION__),(sp)
-	PICCALL	SYM (atexit)
+	jsr	SYM (atexit)
 
-	PICCALL	__INIT_SECTION__
+	jsr	__INIT_SECTION__
 
         pea     0
-	PICPEA	SYM (environ),a0
+        pea     SYM (environ)
         pea     sp@(4)
         pea     0
-	PICCALL	SYM (main)
+	jsr	SYM (main)
 	movel	d0, sp@-
 
 /*
@@ -118,4 +118,4 @@ SYM (start):
  * control back to the ROM monitor, if there is one. This calls the
  * exit() from the C library so the C++ tables get cleaned up right.
  */
-	PICCALL	SYM (exit)
+        jsr     SYM (exit)
diff --git a/libgloss/m68k/sim-funcs.c b/libgloss/m68k/sim-funcs.c
index 712c566..a4b14ca 100644
--- a/libgloss/m68k/sim-funcs.c
+++ b/libgloss/m68k/sim-funcs.c
@@ -13,7 +13,6 @@
  * they apply.
  */
 
-#define _XOPEN_SOURCE
 #include <unistd.h>
 
 int
diff --git a/libgloss/m68k/sim.ld b/libgloss/m68k/sim.ld
index 57a41d0..b44fd07 100644
--- a/libgloss/m68k/sim.ld
+++ b/libgloss/m68k/sim.ld
@@ -18,7 +18,7 @@ SECTIONS
   .text :
   {
     CREATE_OBJECT_SYMBOLS
-    *(.text .text.*)
+    *(.text)
 
     . = ALIGN(0x4);
     /* These are for running static constructors and destructors under ELF.  */
@@ -31,7 +31,7 @@ SECTIONS
     KEEP (*(SORT(.dtors.*)))
     KEEP (*(.dtors))
 
-    *(.rodata .rodata.*)
+    *(.rodata)
 
     . = ALIGN(0x4);
     *(.gcc_except_table) 
@@ -59,9 +59,8 @@ SECTIONS
 
   .data :
   {
-    *(.got.plt) *(.got)
     *(.shdata)
-    *(.data .data.*)
+    *(.data)
     _edata = .;
   } > ram
 
@@ -70,7 +69,7 @@ SECTIONS
     . = ALIGN(0x4);
     __bss_start = . ;
     *(.shbss)
-    *(.bss .bss.*)
+    *(.bss)
     *(COMMON)
     _end =  ALIGN (0x8);
     __end = _end;
diff --git a/libgloss/mcore/Makefile.in b/libgloss/mcore/Makefile.in
index ecfd2b6..236496c 100644
--- a/libgloss/mcore/Makefile.in
+++ b/libgloss/mcore/Makefile.in
@@ -1,7 +1,6 @@
 #
 #
 
-DESTDIR =
 VPATH = @srcdir@ @srcdir@/..
 srcdir = @srcdir@
 objdir = .
@@ -125,11 +124,11 @@ distclean maintainer-clean realclean: clean
 install: ${SIM_INSTALL} ${MON_INSTALL}
 
 install-mon:
-	set -e; for x in ${MON_CRT0} ${MON_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-	set -e; for x in ${MON_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/${MON_PREFIX}$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${MON_CRT0} ${MON_BSP}; do ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${MON_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/${MON_PREFIX}$$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
 
 install-sim:
-	set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
 
 doc:
 info:
diff --git a/libgloss/mcore/elf-cmb.ld b/libgloss/mcore/elf-cmb.ld
index 611e6b9..591aa9d 100644
--- a/libgloss/mcore/elf-cmb.ld
+++ b/libgloss/mcore/elf-cmb.ld
@@ -180,7 +180,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/mips/Makefile.in b/libgloss/mips/Makefile.in
index 00f65a0..51c3a5a 100644
--- a/libgloss/mips/Makefile.in
+++ b/libgloss/mips/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000 Cygnus Support
+# Copyright (c) 1995, 1996, 1997, 1998, 1999 Cygnus Support
 #
 # The authors hereby grant permission to use, copy, modify, distribute,
 # and license this software and its documentation for any purpose, provided
@@ -10,7 +10,6 @@
 # the new terms are clearly indicated on the first page of each file where
 # they apply.
 
-DESTDIR =
 VPATH = @srcdir@
 srcdir = @srcdir@
 objdir = .
@@ -68,14 +67,12 @@ CRT0 = @crt0@
 PCRT0 = @pcrt0@
 GENOBJS = syscalls.o fstat.o getpid.o isatty.o kill.o \
 	lseek.o print.o putnum.o stat.o unlink.o
-GENOBJS2 = open.o close.o read.o write.o
 IDTOBJS = idtmon.o @part_specific_obj@ ${GENOBJS}
 PMONOBJS = pmon.o @part_specific_obj@ ${GENOBJS}
 LSIOBJS = lsipmon.o @part_specific_obj@ ${GENOBJS}
-DVEOBJS = dvemon.o @part_specific_obj@ ${GENOBJS} ${GENOBJS2}
-JMR3904OBJS = jmr3904-io.o @part_specific_obj@ ${GENOBJS} ${GENOBJS2}
-CFEOBJS = cfe.o cfe_api.o cfe_mem.o @part_specific_obj@ ${GENOBJS} ${GENOBJS2}
-CYGMONOBJS = open.o close.o cygmon.o @part_specific_obj@ ${GENOBJS}
+DVEOBJS = open.o close.o dvemon.o read.o write.o @part_specific_obj@ ${GENOBJS}
+JMR3904OBJS = open.o close.o jmr3904-io.o read.o write.o \
+  @part_specific_obj@ ${GENOBJS}
 
 # Nullmon cannot support read and write, but the test cases pull them in via libs
 NULLMONOBJS = nullmon.o @part_specific_obj@ ${GENOBJS}
@@ -132,14 +129,6 @@ libjmr3904.a: $(JMR3904OBJS)
 	${AR} ${ARFLAGS} $@ $(JMR3904OBJS)
 	${RANLIB} $@
 
-libcygmon.a: $(CYGMONOBJS)
-	${AR} ${ARFLAGS} $@ $(CYGMONOBJS)
-	${RANLIB} $@
-
-libcfe.a: $(CFEOBJS)
-	${AR} ${ARFLAGS} $@ $(CFEOBJS)
-	${RANLIB} $@
-
 # nullmon.a , This is what you want if you want crt0 but NO mon services
 # Supports GDB sim testing, board bringups, ICE operation.
 libnullmon.a: $(NULLMONOBJS)
@@ -152,7 +141,7 @@ libnullmon.a: $(NULLMONOBJS)
 # in the comand line for ld, and all the symbols will get fully
 # resolved.
 
-test: $(OBJS) ${BSP} pmon-test idt-test cfe-test
+test: $(OBJS) ${BSP} pmon-test idt-test
 	@echo Done...
 
 dtor.o:  $(srcdir)/dtor.C
@@ -181,16 +170,6 @@ idt-test.dis: idt-test.x
 	$(OBJDUMP) -d idt-test.x > $@
 idt-test: idt-test.srec idt-test.dis
 
-cfe-test.x: test.o ${CRT0} Makefile libcfe.a
-	${CC} $(CFLAGS_FOR_TARGET) -L${srcdir} -L${objdir} \
-	test.o -o $@ $(NEWLIB_LDFLAGS) -Wl,-Tcfe.ld
-cfe-test.srec: cfe-test.x
-	$(OBJCOPY) -O srec cfe-test.x $@
-cfe-test.dis: cfe-test.x
-	@rm -fr cfe-test.dis
-	$(OBJDUMP) -d cfe-test.x > $@
-cfe-test: cfe-test.srec cfe-test.dis
-
 doc:	
 
 clean mostlyclean:
@@ -201,11 +180,17 @@ distclean maintainer-clean realclean: clean
 
 .PHONY: install info install-info clean-info
 install:
-	@for file in $(CRT0) $(PCRT0) $(BSP); do \
-	  $(INSTALL_DATA) $${file} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
+	if test "x$(CRT0)" != x ; then \
+	  $(INSTALL_PROGRAM) $(CRT0) $(tooldir)/lib${MULTISUBDIR}/$(CRT0) ; \
+	fi
+	if test "x$(PCRT0)" != x ; then \
+	  $(INSTALL_PROGRAM) $(PCRT0) $(tooldir)/lib${MULTISUBDIR}/$(PCRT0) ; \
+	fi
+	@for bsp in ${BSP}; do\
+	 $(INSTALL_PROGRAM) $${bsp} $(tooldir)/lib${MULTISUBDIR}; \
 	done
 	@for script in ${SCRIPTS}; do\
-	  $(INSTALL_DATA) ${srcdir}/$${script}.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${script}.ld; \
+	 $(INSTALL_DATA) ${srcdir}/$${script}.ld $(tooldir)/lib${MULTISUBDIR}/$${script}.ld; \
 	done
 
 info:
@@ -218,8 +203,6 @@ test.o:	${srcdir}/test.c
 crt0.o: ${srcdir}/crt0.S
 pcrt0.o: ${srcdir}/crt0.S
 	$(CC) -c $(CFLAGS_FOR_TARGET) $(CFLAGS) -DGCRT0 ${srcdir}/crt0.S -o ${PCRT0}
-crt0_cfe.o: ${srcdir}/crt0_cfe.S
-crt0_cygmon.o: ${srcdir}/crt0_cygmon.S
 idtmon.o: ${srcdir}/idtmon.S
 pmon.o: ${srcdir}/pmon.S
 	$(CC) -c $(CFLAGS_FOR_TARGET) $(CFLAGS) $(PART_SPECIFIC_DEFINES) ${srcdir}/pmon.S -o pmon.o
@@ -230,12 +213,6 @@ vr5xxx.o: ${srcdir}/vr5xxx.S
 lsipmon.o: $(srcdir)/lsipmon.S $(srcdir)/pmon.S
 jmr3904-io.o: ${srcdir}/jmr3904-io.c
 	$(CC) -c $(CFLAGS_FOR_TARGET) $(CFLAGS) ${srcdir}/jmr3904-io.c -o $@
-cfe.o: ${srcdir}/cfe.c ${srcdir}/cfe_api.h
-	$(CC) -c $(CFLAGS_FOR_TARGET) $(CFLAGS) ${srcdir}/cfe.c -o $@
-cfe_api.o: ${srcdir}/cfe_api.c ${srcdir}/cfe_api.h ${srcdir}/cfe_api_int.h
-	$(CC) -c $(CFLAGS_FOR_TARGET) $(CFLAGS) ${srcdir}/cfe_api.c -o $@
-cfe_mem.o: ${srcdir}/cfe_mem.c ${srcdir}/cfe_api.h
-	$(CC) -c $(CFLAGS_FOR_TARGET) $(CFLAGS) ${srcdir}/cfe_mem.c -o $@
 
 # cma101 can not be compiled mips16, if a mips16 version is needed then
 # it will have to be built, then this rule can be scrapped, allowing
diff --git a/libgloss/mips/array.ld b/libgloss/mips/array.ld
index fc4cc8f..4675105 100644
--- a/libgloss/mips/array.ld
+++ b/libgloss/mips/array.ld
@@ -74,8 +74,6 @@ PROVIDE (__stack = 1M - 8);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -84,25 +82,21 @@ SECTIONS
   . = 0x80020000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
   
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .jcr : { KEEP (*(.jcr)) }
   .ctors    :
   {
     /* gcc uses crtbegin.o to find the start of
@@ -140,13 +134,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
    _gp = ALIGN(16) + 0x8000;
   .lit8 : {
@@ -158,22 +152,18 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
    edata  =  .;
    _edata  =  .;
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
    end = .;
diff --git a/libgloss/mips/cfe.c b/libgloss/mips/cfe.c
deleted file mode 100644
index c1d8af5..0000000
--- a/libgloss/mips/cfe.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* cfe.c -- I/O code for the MIPS boards running CFE.  */
-
-/*
- * Copyright 2001, 2002, 2003
- * Broadcom Corporation. All rights reserved.
- * 
- * This software is furnished under license and may be used and copied only
- * in accordance with the following terms and conditions.  Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * modified or unmodified copies of this software in source and/or binary
- * form. No title or ownership is transferred hereby.
- * 
- * 1) Any source code used, modified or distributed must reproduce and
- *    retain this copyright notice and list of conditions as they appear in
- *    the source file.
- * 
- * 2) No right is granted to use any trade name, trademark, or logo of
- *    Broadcom Corporation.  The "Broadcom Corporation" name may not be
- *    used to endorse or promote products derived from this software
- *    without the prior written permission of Broadcom Corporation.
- * 
- * 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED
- *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
- *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
- *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
- *    LIABLE FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- */
-
-#include "cfe_api.h"
-
-void *__libcfe_init (long handle, long a1, long cfe_entrypoint, long a3);
-void __libcfe_exit (long status);
-
-char inbyte (void);
-int outbyte (char c);
-
-/* Echo input characters?  */
-int	__libcfe_echo_input = 0;
-
-/* CFE handle used to access console device.  */
-static int cfe_conshandle;
-
-
-/* Initialize firmware callbacks.  Called from crt0_cfe.  Returns desired
-   stack pointer.  */
-void *
-__libcfe_init (long handle, long a1, long entrypoint, long a3)
-{
-  cfe_init (handle, entrypoint);
-  cfe_conshandle = cfe_getstdhandle (CFE_STDHANDLE_CONSOLE);
-
-  __libcfe_meminit ();
-  return __libcfe_stack_top ();
-}
-
-/* Exit back to monitor, with the given status code.  */
-void
-__libcfe_exit (long status)
-{
-  outbyte ('\r');
-  outbyte ('\n');
-  cfe_exit (CFE_FLG_WARMSTART, status);
-}
-
-char
-inbyte (void)
-{
-  unsigned char c;
-  int rv;
-
-  while (cfe_read (cfe_conshandle, &c, 1) != 1)
-    ;
-  if (c == '\r')
-    c = '\n';
-  if (__libcfe_echo_input)
-    outbyte (c);
-  return c;
-}
-
-int
-outbyte (char c)
-{
-  int res;
-
-  do
-    {
-      res = cfe_write (cfe_conshandle, &c, 1);
-    }
-  while (res == 0);
-  if (c == '\n')
-    outbyte ('\r');
-  return 0;
-}
-
-/* This is the MIPS cache flush function call.  No defines are provided
-   by libgloss for 'cache', and CFE doesn't let you flush ranges, so
-   we just flush all I & D for every call.  */
-int
-_flush_cache (char *addr, int nbytes, int cache)
-{
-  cfe_flushcache (0);
-  return 0;
-}
diff --git a/libgloss/mips/cfe.ld b/libgloss/mips/cfe.ld
deleted file mode 100644
index 58e8014..0000000
--- a/libgloss/mips/cfe.ld
+++ /dev/null
@@ -1,173 +0,0 @@
-/* The following TEXT start address leaves space for the monitor
-   workspace. */
-
-ENTRY(_start)
-STARTUP(crt0_cfe.o)
-OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
-GROUP(-lc -lcfe -lgcc)
-SEARCH_DIR(.)
-__DYNAMIC  =  0;
-
-/*
- * Allocate the stack to be at the top of memory, since the stack
- * grows down
- */
-PROVIDE (__stack = 0);
-/* PROVIDE (__global = 0); */
-
-/*
- * Initalize some symbols to be zero so we can reference them in the
- * crt0 without core dumping. These functions are all optional, but
- * we do this so we can have our crt0 always use them if they exist. 
- * This is so BSPs work better when using the crt0 installed with gcc.
- * We have to initalize them twice, so we multiple object file
- * formats, as some prepend an underscore.
- */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
-PROVIDE (hardware_init_hook = 0);
-PROVIDE (software_init_hook = 0);
-
-SECTIONS
-{	
-  . = 0x80020000;
-  .text : {
-    _ftext = . ;
-    PROVIDE (eprol = .);
-    *(.text)
-    *(.text.*)
-    *(.gnu.linkonce.t.*)
-    *(.mips16.fn.*)
-    *(.mips16.call.*)
-  }
-  .init : {
-    KEEP (*(.init))
-  }
-  .fini : {
-    KEEP (*(.fini))
-  }
-  .rel.sdata : {
-    PROVIDE (__runtime_reloc_start = .);
-    *(.rel.sdata)
-    PROVIDE (__runtime_reloc_stop = .);
-  }
-  PROVIDE (etext = .);
-  _etext  =  .;
-  
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .jcr : { KEEP (*(.jcr)) }
-  .ctors    :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-
-    KEEP (*crtbegin.o(.ctors))
-
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-
-    KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  }
-
-  .dtors    :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  }
-
-  . = .;
-  .rodata : {
-    *(.rdata)
-    *(.rodata)
-    *(.rodata.*)
-    *(.gnu.linkonce.r.*)
-  }
-   _fdata = ALIGN(16);
-  .data : {
-    *(.data)
-    *(.data.*)
-    *(.gnu.linkonce.d.*)
-  }
-  . = ALIGN(8);
-  _gp = . + 0x8000;
-  __global = _gp;
-  .lit8 : {
-    *(.lit8)
-  }
-  .lit4 : {
-    *(.lit4)
-  }
-  .sdata : {
-    *(.sdata)
-    *(.sdata.*)
-    *(.gnu.linkonce.s.*)
-  }
-  . = ALIGN(4);
-   PROVIDE (edata  =  .);
-   _edata  =  .;
-   _fbss = .;
-  .sbss : {
-    *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
-    *(.scommon)
-  }
-  .bss : {
-    _bss_start = . ;
-    *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
-    *(COMMON)
-  }
-
-  . = ALIGN(32);
-  PROVIDE (end = .);
-  _end = .;
-
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to 
-     the beginning of the section so we begin them at 0.  */
-
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-}
diff --git a/libgloss/mips/cfe_api.c b/libgloss/mips/cfe_api.c
deleted file mode 100644
index ab5ac90..0000000
--- a/libgloss/mips/cfe_api.c
+++ /dev/null
@@ -1,534 +0,0 @@
-/* From: CFE Id: cfe_api.c,v 1.16 2002/07/09 23:29:11 cgd Exp $ */
-
-/*
- * Copyright 2000, 2001, 2002
- * Broadcom Corporation. All rights reserved.
- * 
- * This software is furnished under license and may be used and copied only
- * in accordance with the following terms and conditions.  Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * modified or unmodified copies of this software in source and/or binary
- * form. No title or ownership is transferred hereby.
- * 
- * 1) Any source code used, modified or distributed must reproduce and
- *    retain this copyright notice and list of conditions as they appear in
- *    the source file.
- * 
- * 2) No right is granted to use any trade name, trademark, or logo of
- *    Broadcom Corporation.  The "Broadcom Corporation" name may not be
- *    used to endorse or promote products derived from this software
- *    without the prior written permission of Broadcom Corporation.
- * 
- * 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED
- *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
- *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
- *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
- *    LIABLE FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *    OR OTHERWISE), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*  *********************************************************************
-    *
-    *  Broadcom Common Firmware Environment (CFE)
-    *
-    *  Device Function stubs			File: cfe_api.c
-    *
-    *  This module contains device function stubs (small routines to
-    *  call the standard "iocb" interface entry point to CFE).
-    *  There should be one routine here per iocb function call.
-    *
-    *  Authors:  Mitch Lichtenberg, Chris Demetriou
-    *
-    ********************************************************************* */
-
-#include "cfe_api.h"
-#include "cfe_api_int.h"
-
-/* Cast from a native pointer to a cfe_xptr_t and back.  */
-#define XPTR_FROM_NATIVE(n)	((cfe_xptr_t) (intptr_t) (n))
-#define NATIVE_FROM_XPTR(x)	((void *) (intptr_t) (x))
-
-#ifdef CFE_API_IMPL_NAMESPACE
-#define cfe_iocb_dispatch(a)		__cfe_iocb_dispatch(a)
-#endif
-int cfe_iocb_dispatch(cfe_xiocb_t *xiocb);
-
-#if defined(CFE_API_common) || defined(CFE_API_ALL)
-/*
- * Declare the dispatch function with args of "intptr_t".
- * This makes sure whatever model we're compiling in
- * puts the pointers in a single register.  For example,
- * combining -mlong64 and -mips1 or -mips2 would lead to
- * trouble, since the handle and IOCB pointer will be
- * passed in two registers each, and CFE expects one.
- */
-
-static int (*cfe_dispfunc)(intptr_t handle, intptr_t xiocb) = 0;
-static cfe_xuint_t cfe_handle = 0;
-
-int
-cfe_init(cfe_xuint_t handle, cfe_xuint_t ept)
-{
-    cfe_dispfunc = NATIVE_FROM_XPTR(ept);
-    cfe_handle = handle;
-    return 0;
-}
-
-int
-cfe_iocb_dispatch(cfe_xiocb_t *xiocb)
-{
-    if (!cfe_dispfunc) return -1;
-    return (*cfe_dispfunc)((intptr_t)cfe_handle, (intptr_t)xiocb);
-}
-#endif /* CFE_API_common || CFE_API_ALL */
-
-#if defined(CFE_API_close) || defined(CFE_API_ALL)
-int
-cfe_close(int handle)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_DEV_CLOSE;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = handle;
-    xiocb.xiocb_flags = 0;
-    xiocb.xiocb_psize = 0;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    return xiocb.xiocb_status;
-
-}
-#endif /* CFE_API_close || CFE_API_ALL */
-
-#if defined(CFE_API_cpu_start) || defined(CFE_API_ALL)
-int
-cfe_cpu_start(int cpu, void (*fn)(void), long sp, long gp, long a1)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_FW_CPUCTL;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags  = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_cpuctl_t);
-    xiocb.plist.xiocb_cpuctl.cpu_number = cpu;
-    xiocb.plist.xiocb_cpuctl.cpu_command = CFE_CPU_CMD_START;
-    xiocb.plist.xiocb_cpuctl.gp_val = gp;
-    xiocb.plist.xiocb_cpuctl.sp_val = sp;
-    xiocb.plist.xiocb_cpuctl.a1_val = a1;
-    xiocb.plist.xiocb_cpuctl.start_addr = (long)fn;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    return xiocb.xiocb_status;
-}
-#endif /* CFE_API_cpu_start || CFE_API_ALL */
-
-#if defined(CFE_API_cpu_stop) || defined(CFE_API_ALL)
-int
-cfe_cpu_stop(int cpu)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_FW_CPUCTL;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags  = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_cpuctl_t);
-    xiocb.plist.xiocb_cpuctl.cpu_number = cpu;
-    xiocb.plist.xiocb_cpuctl.cpu_command = CFE_CPU_CMD_STOP;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    return xiocb.xiocb_status;
-}
-#endif /* CFE_API_cpu_stop || CFE_API_ALL */
-
-#if defined(CFE_API_enumenv) || defined(CFE_API_ALL)
-int
-cfe_enumenv(int idx, char *name, int namelen, char *val, int vallen)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_ENV_SET;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_envbuf_t);
-    xiocb.plist.xiocb_envbuf.enum_idx = idx;
-    xiocb.plist.xiocb_envbuf.name_ptr = XPTR_FROM_NATIVE(name);
-    xiocb.plist.xiocb_envbuf.name_length = namelen;
-    xiocb.plist.xiocb_envbuf.val_ptr = XPTR_FROM_NATIVE(val);
-    xiocb.plist.xiocb_envbuf.val_length = vallen;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    return xiocb.xiocb_status;
-}
-#endif /* CFE_API_enumenv || CFE_API_ALL */
-
-#if defined(CFE_API_enummem) || defined(CFE_API_ALL)
-int
-cfe_enummem(int idx, int flags, cfe_xuint_t *start, cfe_xuint_t *length,
-	    cfe_xuint_t *type)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_FW_MEMENUM;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags = flags;
-    xiocb.xiocb_psize = sizeof(xiocb_meminfo_t);
-    xiocb.plist.xiocb_meminfo.mi_idx = idx;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    if (xiocb.xiocb_status < 0)
-	return xiocb.xiocb_status;
-
-    *start = xiocb.plist.xiocb_meminfo.mi_addr;
-    *length = xiocb.plist.xiocb_meminfo.mi_size;
-    *type = xiocb.plist.xiocb_meminfo.mi_type;
-
-    return 0;
-}
-#endif /* CFE_API_enummem || CFE_API_ALL */
-
-#if defined(CFE_API_exit) || defined(CFE_API_ALL)
-int
-cfe_exit(int warm, int status)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_FW_RESTART;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags = warm ? CFE_FLG_WARMSTART : 0;
-    xiocb.xiocb_psize = sizeof(xiocb_exitstat_t);
-    xiocb.plist.xiocb_exitstat.status = status;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    return xiocb.xiocb_status;
-}
-#endif /* CFE_API_exit || CFE_API_ALL */
-
-#if defined(CFE_API_flushcache) || defined(CFE_API_ALL)
-int
-cfe_flushcache(int flg)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_FW_FLUSHCACHE;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags = flg;
-    xiocb.xiocb_psize = 0;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    return xiocb.xiocb_status;
-}
-#endif /* CFE_API_flushcache || CFE_API_ALL */
-
-#if defined(CFE_API_getdevinfo) || defined(CFE_API_ALL)
-int
-cfe_getdevinfo(char *name)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_DEV_GETINFO;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
-    xiocb.plist.xiocb_buffer.buf_offset = 0;
-    xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(name);
-    xiocb.plist.xiocb_buffer.buf_length = cfe_strlen(name);
-
-    cfe_iocb_dispatch(&xiocb);
-
-    if (xiocb.xiocb_status < 0)
-	return xiocb.xiocb_status;
-    return xiocb.plist.xiocb_buffer.buf_devflags;
-}
-#endif /* CFE_API_getdevinfo || CFE_API_ALL */
-
-#if defined(CFE_API_getenv) || defined(CFE_API_ALL)
-int
-cfe_getenv(char *name, char *dest, int destlen)
-{
-    cfe_xiocb_t xiocb;
-
-    *dest = 0;
-
-    xiocb.xiocb_fcode = CFE_CMD_ENV_GET;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_envbuf_t);
-    xiocb.plist.xiocb_envbuf.enum_idx = 0;
-    xiocb.plist.xiocb_envbuf.name_ptr = XPTR_FROM_NATIVE(name);
-    xiocb.plist.xiocb_envbuf.name_length = cfe_strlen(name);
-    xiocb.plist.xiocb_envbuf.val_ptr = XPTR_FROM_NATIVE(dest);
-    xiocb.plist.xiocb_envbuf.val_length = destlen;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    return xiocb.xiocb_status;
-}
-#endif /* CFE_API_getenv || CFE_API_ALL */
-
-#if defined(CFE_API_getfwinfo) || defined(CFE_API_ALL)
-int
-cfe_getfwinfo(cfe_fwinfo_t *info)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_FW_GETINFO;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_fwinfo_t);
-
-    cfe_iocb_dispatch(&xiocb);
-
-    if (xiocb.xiocb_status < 0)
-	return xiocb.xiocb_status;
-
-    info->fwi_version = xiocb.plist.xiocb_fwinfo.fwi_version;
-    info->fwi_totalmem = xiocb.plist.xiocb_fwinfo.fwi_totalmem;
-    info->fwi_flags = xiocb.plist.xiocb_fwinfo.fwi_flags;
-    info->fwi_boardid = xiocb.plist.xiocb_fwinfo.fwi_boardid;
-    info->fwi_bootarea_va = xiocb.plist.xiocb_fwinfo.fwi_bootarea_va;
-    info->fwi_bootarea_pa = xiocb.plist.xiocb_fwinfo.fwi_bootarea_pa;
-    info->fwi_bootarea_size = xiocb.plist.xiocb_fwinfo.fwi_bootarea_size;
-#if 0
-    info->fwi_reserved1 = xiocb.plist.xiocb_fwinfo.fwi_reserved1;
-    info->fwi_reserved2 = xiocb.plist.xiocb_fwinfo.fwi_reserved2;
-    info->fwi_reserved3 = xiocb.plist.xiocb_fwinfo.fwi_reserved3;
-#endif
-
-    return 0;
-}
-#endif /* CFE_API_getfwinfo || CFE_API_ALL */
-
-#if defined(CFE_API_getstdhandle) || defined(CFE_API_ALL)
-int
-cfe_getstdhandle(int flg)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_DEV_GETHANDLE;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags = flg;
-    xiocb.xiocb_psize = 0;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    if (xiocb.xiocb_status < 0)
-	return xiocb.xiocb_status;
-    return xiocb.xiocb_handle;
-
-}
-#endif /* CFE_API_getstdhandle || CFE_API_ALL */
-
-#if defined(CFE_API_getticks) || defined(CFE_API_ALL)
-int64_t
-#ifdef CFE_API_IMPL_NAMESPACE
-__cfe_getticks(void)
-#else
-cfe_getticks(void)
-#endif
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_FW_GETTIME;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_time_t);
-    xiocb.plist.xiocb_time.ticks = 0;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    return xiocb.plist.xiocb_time.ticks;
-
-}
-#endif /* CFE_API_getticks || CFE_API_ALL */
-
-#if defined(CFE_API_inpstat) || defined(CFE_API_ALL)
-int
-cfe_inpstat(int handle)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_DEV_INPSTAT;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = handle;
-    xiocb.xiocb_flags = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_inpstat_t);
-    xiocb.plist.xiocb_inpstat.inp_status = 0;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    if (xiocb.xiocb_status < 0)
-	return xiocb.xiocb_status;
-    return xiocb.plist.xiocb_inpstat.inp_status;
-
-}
-#endif /* CFE_API_inpstat || CFE_API_ALL */
-
-#if defined(CFE_API_ioctl) || defined(CFE_API_ALL)
-int
-cfe_ioctl(int handle, unsigned int ioctlnum, unsigned char *buffer, int length,
-	  int *retlen, cfe_xuint_t offset)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_DEV_IOCTL;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = handle;
-    xiocb.xiocb_flags = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
-    xiocb.plist.xiocb_buffer.buf_offset = offset;
-    xiocb.plist.xiocb_buffer.buf_ioctlcmd = ioctlnum;
-    xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(buffer);
-    xiocb.plist.xiocb_buffer.buf_length = length;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    if (retlen)
-	*retlen = xiocb.plist.xiocb_buffer.buf_retlen;
-    return xiocb.xiocb_status;
-}
-#endif /* CFE_API_ioctl || CFE_API_ALL */
-
-#if defined(CFE_API_open) || defined(CFE_API_ALL)
-int
-cfe_open(char *name)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_DEV_OPEN;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
-    xiocb.plist.xiocb_buffer.buf_offset = 0;
-    xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(name);
-    xiocb.plist.xiocb_buffer.buf_length = cfe_strlen(name);
-
-    cfe_iocb_dispatch(&xiocb);
-
-    if (xiocb.xiocb_status < 0)
-	return xiocb.xiocb_status;
-    return xiocb.xiocb_handle;
-}
-#endif /* CFE_API_open || CFE_API_ALL */
-
-#if defined(CFE_API_read) || defined(CFE_API_ALL)
-int
-cfe_read(int handle, unsigned char *buffer, int length)
-{
-    return cfe_readblk(handle, 0, buffer, length);
-}
-#endif /* CFE_API_read || CFE_API_ALL */
-
-#if defined(CFE_API_readblk) || defined(CFE_API_ALL)
-int
-cfe_readblk(int handle, cfe_xint_t offset, unsigned char *buffer, int length)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_DEV_READ;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = handle;
-    xiocb.xiocb_flags = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
-    xiocb.plist.xiocb_buffer.buf_offset = offset;
-    xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(buffer);
-    xiocb.plist.xiocb_buffer.buf_length = length;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    if (xiocb.xiocb_status < 0)
-	return xiocb.xiocb_status;
-    return xiocb.plist.xiocb_buffer.buf_retlen;
-}
-#endif /* CFE_API_readblk || CFE_API_ALL */
-
-#if defined(CFE_API_setenv) || defined(CFE_API_ALL)
-int
-cfe_setenv(char *name, char *val)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_ENV_SET;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = 0;
-    xiocb.xiocb_flags = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_envbuf_t);
-    xiocb.plist.xiocb_envbuf.enum_idx = 0;
-    xiocb.plist.xiocb_envbuf.name_ptr = XPTR_FROM_NATIVE(name);
-    xiocb.plist.xiocb_envbuf.name_length = cfe_strlen(name);
-    xiocb.plist.xiocb_envbuf.val_ptr = XPTR_FROM_NATIVE(val);
-    xiocb.plist.xiocb_envbuf.val_length = cfe_strlen(val);
-
-    cfe_iocb_dispatch(&xiocb);
-
-    return xiocb.xiocb_status;
-}
-#endif /* CFE_API_setenv || CFE_API_ALL */
-
-#if (defined(CFE_API_strlen) || defined(CFE_API_ALL)) \
-    && !defined(CFE_API_STRLEN_CUSTOM)
-int
-cfe_strlen(char *name)
-{
-    int count = 0;
-
-    while (*name++)
-	count++;
-
-    return count;
-}
-#endif /* CFE_API_strlen || CFE_API_ALL */
-
-#if defined(CFE_API_write) || defined(CFE_API_ALL)
-int
-cfe_write(int handle, unsigned char *buffer, int length)
-{
-    return cfe_writeblk(handle, 0, buffer, length);
-}
-#endif /* CFE_API_write || CFE_API_ALL */
-
-#if defined(CFE_API_writeblk) || defined(CFE_API_ALL)
-int
-cfe_writeblk(int handle, cfe_xint_t offset, unsigned char *buffer, int length)
-{
-    cfe_xiocb_t xiocb;
-
-    xiocb.xiocb_fcode = CFE_CMD_DEV_WRITE;
-    xiocb.xiocb_status = 0;
-    xiocb.xiocb_handle = handle;
-    xiocb.xiocb_flags = 0;
-    xiocb.xiocb_psize = sizeof(xiocb_buffer_t);
-    xiocb.plist.xiocb_buffer.buf_offset = offset;
-    xiocb.plist.xiocb_buffer.buf_ptr = XPTR_FROM_NATIVE(buffer);
-    xiocb.plist.xiocb_buffer.buf_length = length;
-
-    cfe_iocb_dispatch(&xiocb);
-
-    if (xiocb.xiocb_status < 0)
-	return xiocb.xiocb_status;
-    return xiocb.plist.xiocb_buffer.buf_retlen;
-}
-#endif /* CFE_API_writeblk || CFE_API_ALL */
diff --git a/libgloss/mips/cfe_api.h b/libgloss/mips/cfe_api.h
deleted file mode 100644
index afe4683..0000000
--- a/libgloss/mips/cfe_api.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/* From: CFE Id: cfe_api.h,v 1.29 2002/07/09 23:29:11 cgd Exp $ */
-
-/*
- * Copyright 2000, 2001, 2002
- * Broadcom Corporation. All rights reserved.
- * 
- * This software is furnished under license and may be used and copied only
- * in accordance with the following terms and conditions.  Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * modified or unmodified copies of this software in source and/or binary
- * form. No title or ownership is transferred hereby.
- * 
- * 1) Any source code used, modified or distributed must reproduce and
- *    retain this copyright notice and list of conditions as they appear in
- *    the source file.
- * 
- * 2) No right is granted to use any trade name, trademark, or logo of
- *    Broadcom Corporation.  The "Broadcom Corporation" name may not be
- *    used to endorse or promote products derived from this software
- *    without the prior written permission of Broadcom Corporation.
- * 
- * 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED
- *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
- *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
- *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
- *    LIABLE FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *    OR OTHERWISE), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*  *********************************************************************
-    *
-    *  Broadcom Common Firmware Environment (CFE)
-    *
-    *  Device function prototypes		File: cfe_api.h
-    *
-    *  This file contains declarations for doing callbacks to
-    *  cfe from an application.  It should be the only header
-    *  needed by the application to use this library
-    *
-    *  Authors:  Mitch Lichtenberg, Chris Demetriou
-    *
-    ********************************************************************* */
-
-#ifndef CFE_API_H
-#define CFE_API_H
-
-/*
- * Apply customizations here for different OSes.  These need to:
- *	* typedef uint64_t, int64_t, intptr_t, uintptr_t.
- *	* define cfe_strlen() if use of an existing function is desired.
- *	* define CFE_API_IMPL_NAMESPACE if API functions are to use
- *	  names in the implementation namespace.
- * Also, optionally, if the build environment does not do so automatically,
- * CFE_API_* can be defined here as desired.
- */
-/* Begin customization. */
-#include <sys/types.h>		/* for __uint64_t and __int64_t. */
-#define int64_t __int64_t
-#define uint64_t __int64_t
-#include <_ansi.h>		/* for _POINTER_INT. */
-typedef _POINTER_INT intptr_t;
-typedef unsigned _POINTER_INT uintptr_t;
-
-#include <string.h>
-#define cfe_strlen(s)	strlen(s)
-
-#define CFE_API_ALL
-#define CFE_API_IMPL_NAMESPACE
-
-/* Return the stack size to be used for the program.  Normally 32KB.  The
-   normal memory allocator uses the bottom of the stack as its heap limit,
-   so if your application uses a lot of stack space define this function
-   appropriately to keep the heap from growing into the stack.  */
-unsigned long __libcfe_stack_size(void) __attribute__((__weak__));
-
-/* Return the (max address + 1) to be used by this program.  (This address
-   minus '_end' is used as the heap size, so the address should be in the
-   same address space segments as _end.  The normal memory allocator
-   queries CFE to determine the available memory.  */
-void *__libcfe_mem_limit(void) __attribute__((__weak__));
-
-/* If the configuration ability provided by __libcfe_mem_limit() and
-   __libcfe_stack_size() do not provide enough flexibility for your
-   application's memory allocation needs, you can replace the normal
-   low-level allocator by providing the functions listed below and
-   also the function:
-
-	void *sbrk(ptrdiff_t incr);
-
-   If you provide any of these functions, you should provide all three,
-   and be sure to link them into your application as a .o file (rather
-   than a .a).
-
-   __libcfe_meminit() is responsible for initializing the low-level
-   memory allocator.
-
-   __libcfe_stack_top() returns a pointer to the top (highest address;
-   the stack grows down from that address) of the stack to be used by
-   the program.  */
-void __libcfe_meminit (void);
-void *__libcfe_stack_top (void);
-
-/* End customization. */
-
-
-/*  *********************************************************************
-    *  Constants
-    ********************************************************************* */
-
-/* Seal indicating CFE's presence, passed to user program. */
-#define CFE_EPTSEAL 0x43464531
-
-#define CFE_MI_RESERVED	0		/* memory is reserved, do not use */
-#define CFE_MI_AVAILABLE 1		/* memory is available */
-
-#define CFE_FLG_WARMSTART     0x00000001
-#define CFE_FLG_FULL_ARENA    0x00000001
-#define CFE_FLG_ENV_PERMANENT 0x00000001
-
-#define CFE_CPU_CMD_START 1
-#define CFE_CPU_CMD_STOP 0
-
-#define CFE_STDHANDLE_CONSOLE	0
-
-#define CFE_DEV_NETWORK 	1
-#define CFE_DEV_DISK		2
-#define CFE_DEV_FLASH		3
-#define CFE_DEV_SERIAL		4
-#define CFE_DEV_CPU		5
-#define CFE_DEV_NVRAM		6
-#define CFE_DEV_CLOCK           7
-#define CFE_DEV_OTHER		8
-#define CFE_DEV_MASK		0x0F
-
-#define CFE_CACHE_FLUSH_D	1
-#define CFE_CACHE_INVAL_I	2
-#define CFE_CACHE_INVAL_D	4
-#define CFE_CACHE_INVAL_L2	8
-
-#define CFE_FWI_64BIT		0x00000001
-#define CFE_FWI_32BIT		0x00000002
-#define CFE_FWI_RELOC		0x00000004
-#define CFE_FWI_UNCACHED	0x00000008
-#define CFE_FWI_MULTICPU	0x00000010
-#define CFE_FWI_FUNCSIM		0x00000020
-#define CFE_FWI_RTLSIM		0x00000040
-
-typedef struct {
-    int64_t fwi_version;		/* major, minor, eco version */
-    int64_t fwi_totalmem;		/* total installed mem */
-    int64_t fwi_flags;		        /* various flags */
-    int64_t fwi_boardid;		/* board ID */
-    int64_t fwi_bootarea_va;		/* VA of boot area */
-    int64_t fwi_bootarea_pa;		/* PA of boot area */
-    int64_t fwi_bootarea_size;	        /* size of boot area */
-} cfe_fwinfo_t;
-
-
-/*
- * cfe_strlen is handled specially: If already defined, it has been
- * overridden in this environment with a standard strlen-like function.
- */
-#ifdef cfe_strlen
-# define CFE_API_STRLEN_CUSTOM
-#else
-# ifdef CFE_API_IMPL_NAMESPACE
-#  define cfe_strlen(a)			__cfe_strlen(a)
-# endif
-int cfe_strlen(char *name);
-#endif
-
-/*
- * Defines and prototypes for functions which take no arguments.
- */
-#ifdef CFE_API_IMPL_NAMESPACE
-int64_t __cfe_getticks(void);
-#define cfe_getticks()			__cfe_getticks()
-#else
-int64_t cfe_getticks(void);
-#endif
-
-/*
- * Defines and prototypes for the rest of the functions.
- */
-#ifdef CFE_API_IMPL_NAMESPACE
-#define cfe_close(a)			__cfe_close(a)
-#define cfe_cpu_start(a,b,c,d,e)	__cfe_cpu_start(a,b,c,d,e)
-#define cfe_cpu_stop(a)			__cfe_cpu_stop(a)
-#define cfe_enumenv(a,b,d,e,f)		__cfe_enumenv(a,b,d,e,f)
-#define cfe_enummem(a,b,c,d,e)		__cfe_enummem(a,b,c,d,e)
-#define cfe_exit(a,b)			__cfe_exit(a,b)
-#define cfe_flushcache(a)		__cfe_cacheflush(a)
-#define cfe_getdevinfo(a)		__cfe_getdevinfo(a)
-#define cfe_getenv(a,b,c)		__cfe_getenv(a,b,c)
-#define cfe_getfwinfo(a)		__cfe_getfwinfo(a)
-#define cfe_getstdhandle(a)		__cfe_getstdhandle(a)
-#define cfe_init(a,b)			__cfe_init(a,b)
-#define cfe_inpstat(a)			__cfe_inpstat(a)
-#define cfe_ioctl(a,b,c,d,e,f)		__cfe_ioctl(a,b,c,d,e,f)
-#define cfe_open(a)			__cfe_open(a)
-#define cfe_read(a,b,c)			__cfe_read(a,b,c)
-#define cfe_readblk(a,b,c,d)		__cfe_readblk(a,b,c,d)
-#define cfe_setenv(a,b)			__cfe_setenv(a,b)
-#define cfe_write(a,b,c)		__cfe_write(a,b,c)
-#define cfe_writeblk(a,b,c,d)		__cfe_writeblk(a,b,c,d)
-#endif /* CFE_API_IMPL_NAMESPACE */
-
-int cfe_close(int handle);
-int cfe_cpu_start(int cpu, void (*fn)(void), long sp, long gp, long a1);
-int cfe_cpu_stop(int cpu);
-int cfe_enumenv(int idx, char *name, int namelen, char *val, int vallen);
-int cfe_enummem(int idx, int flags, uint64_t *start, uint64_t *length,
-		uint64_t *type);
-int cfe_exit(int warm,int status);
-int cfe_flushcache(int flg);
-int cfe_getdevinfo(char *name);
-int cfe_getenv(char *name, char *dest, int destlen);
-int cfe_getfwinfo(cfe_fwinfo_t *info);
-int cfe_getstdhandle(int flg);
-int cfe_init(uint64_t handle,uint64_t ept);
-int cfe_inpstat(int handle);
-int cfe_ioctl(int handle, unsigned int ioctlnum, unsigned char *buffer,
-	      int length, int *retlen, uint64_t offset);
-int cfe_open(char *name);
-int cfe_read(int handle, unsigned char *buffer, int length);
-int cfe_readblk(int handle, int64_t offset, unsigned char *buffer, int length);
-int cfe_setenv(char *name, char *val);
-int cfe_write(int handle, unsigned char *buffer, int length);
-int cfe_writeblk(int handle, int64_t offset, unsigned char *buffer,
-		 int length);
-
-#endif /* CFE_API_H */
diff --git a/libgloss/mips/cfe_api_int.h b/libgloss/mips/cfe_api_int.h
deleted file mode 100644
index 618211a..0000000
--- a/libgloss/mips/cfe_api_int.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* From: CFE Id: cfe_api_int.h,v 1.21 2002/07/09 23:29:11 cgd Exp $ */
-
-/*
- * Copyright 2000, 2001, 2002
- * Broadcom Corporation. All rights reserved.
- * 
- * This software is furnished under license and may be used and copied only
- * in accordance with the following terms and conditions.  Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * modified or unmodified copies of this software in source and/or binary
- * form. No title or ownership is transferred hereby.
- * 
- * 1) Any source code used, modified or distributed must reproduce and
- *    retain this copyright notice and list of conditions as they appear in
- *    the source file.
- * 
- * 2) No right is granted to use any trade name, trademark, or logo of
- *    Broadcom Corporation.  The "Broadcom Corporation" name may not be
- *    used to endorse or promote products derived from this software
- *    without the prior written permission of Broadcom Corporation.
- * 
- * 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED
- *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
- *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
- *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
- *    LIABLE FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *    OR OTHERWISE), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*  *********************************************************************
-    *
-    *  Broadcom Common Firmware Environment (CFE)
-    *
-    *  Device function prototypes		File: cfe_api_int.h
-    *
-    *  This header defines all internal types and macros for the
-    *  library.  This is stuff that's not exported to an app
-    *  using the library.
-    *
-    *  Authors:  Mitch Lichtenberg, Chris Demetriou
-    *
-    ********************************************************************* */
-
-#ifndef CFE_API_INT_H
-#define CFE_API_INT_H
-
-/*  *********************************************************************
-    *  Constants
-    ********************************************************************* */
-
-#define CFE_CMD_FW_GETINFO	0
-#define CFE_CMD_FW_RESTART	1
-#define CFE_CMD_FW_BOOT		2
-#define CFE_CMD_FW_CPUCTL	3
-#define CFE_CMD_FW_GETTIME      4
-#define CFE_CMD_FW_MEMENUM	5
-#define CFE_CMD_FW_FLUSHCACHE	6
-
-#define CFE_CMD_DEV_GETHANDLE	9
-#define CFE_CMD_DEV_ENUM	10
-#define CFE_CMD_DEV_OPEN	11
-#define CFE_CMD_DEV_INPSTAT	12
-#define CFE_CMD_DEV_READ	13
-#define CFE_CMD_DEV_WRITE	14
-#define CFE_CMD_DEV_IOCTL	15
-#define CFE_CMD_DEV_CLOSE	16
-#define CFE_CMD_DEV_GETINFO	17
-
-#define CFE_CMD_ENV_ENUM	20
-#define CFE_CMD_ENV_GET		22
-#define CFE_CMD_ENV_SET		23
-#define CFE_CMD_ENV_DEL		24
-
-#define CFE_CMD_MAX		32
-
-#define CFE_CMD_VENDOR_USE	0x8000	/* codes above this are for customer use */
-
-/*  *********************************************************************
-    *  Structures
-    ********************************************************************* */
-
-typedef uint64_t cfe_xuint_t;
-typedef int64_t cfe_xint_t;
-typedef int64_t cfe_xptr_t;
-
-typedef struct xiocb_buffer_s {
-    cfe_xuint_t   buf_offset;		/* offset on device (bytes) */
-    cfe_xptr_t 	  buf_ptr;		/* pointer to a buffer */
-    cfe_xuint_t   buf_length;		/* length of this buffer */
-    cfe_xuint_t   buf_retlen;		/* returned length (for read ops) */
-    cfe_xuint_t   buf_ioctlcmd;		/* IOCTL command (used only for IOCTLs) */
-} xiocb_buffer_t;
-
-#define buf_devflags buf_ioctlcmd	/* returned device info flags */
-
-typedef struct xiocb_inpstat_s {
-    cfe_xuint_t inp_status;		/* 1 means input available */
-} xiocb_inpstat_t;
-
-typedef struct xiocb_envbuf_s {
-    cfe_xint_t enum_idx;		/* 0-based enumeration index */
-    cfe_xptr_t name_ptr;		/* name string buffer */
-    cfe_xint_t name_length;		/* size of name buffer */
-    cfe_xptr_t val_ptr;			/* value string buffer */
-    cfe_xint_t val_length;		/* size of value string buffer */
-} xiocb_envbuf_t;
-
-typedef struct xiocb_cpuctl_s {
-    cfe_xuint_t  cpu_number;		/* cpu number to control */
-    cfe_xuint_t  cpu_command;		/* command to issue to CPU */
-    cfe_xuint_t  start_addr;		/* CPU start address */
-    cfe_xuint_t  gp_val;		/* starting GP value */
-    cfe_xuint_t  sp_val;		/* starting SP value */
-    cfe_xuint_t  a1_val;		/* starting A1 value */
-} xiocb_cpuctl_t;
-
-typedef struct xiocb_time_s {
-    cfe_xint_t ticks;			/* current time in ticks */
-} xiocb_time_t;
-
-typedef struct xiocb_exitstat_s {
-    cfe_xint_t status;
-} xiocb_exitstat_t;
-
-typedef struct xiocb_meminfo_s {
-    cfe_xint_t  mi_idx;			/* 0-based enumeration index */
-    cfe_xint_t  mi_type;		/* type of memory block */
-    cfe_xuint_t mi_addr;		/* physical start address */
-    cfe_xuint_t mi_size;		/* block size */
-} xiocb_meminfo_t;
-
-typedef struct xiocb_fwinfo_s {
-    cfe_xint_t fwi_version;		/* major, minor, eco version */
-    cfe_xint_t fwi_totalmem;		/* total installed mem */
-    cfe_xint_t fwi_flags;		/* various flags */
-    cfe_xint_t fwi_boardid;		/* board ID */
-    cfe_xint_t fwi_bootarea_va;		/* VA of boot area */
-    cfe_xint_t fwi_bootarea_pa;		/* PA of boot area */
-    cfe_xint_t fwi_bootarea_size;	/* size of boot area */
-    cfe_xint_t fwi_reserved1;
-    cfe_xint_t fwi_reserved2;
-    cfe_xint_t fwi_reserved3;
-} xiocb_fwinfo_t;
-
-typedef struct cfe_xiocb_s {
-    cfe_xuint_t xiocb_fcode;		/* IOCB function code */
-    cfe_xint_t  xiocb_status;		/* return status */
-    cfe_xint_t  xiocb_handle;		/* file/device handle */
-    cfe_xuint_t xiocb_flags;		/* flags for this IOCB */
-    cfe_xuint_t xiocb_psize;		/* size of parameter list */
-    union {
-	xiocb_buffer_t  xiocb_buffer;	/* buffer parameters */
-	xiocb_inpstat_t xiocb_inpstat;	/* input status parameters */
-	xiocb_envbuf_t  xiocb_envbuf;	/* environment function parameters */
-	xiocb_cpuctl_t  xiocb_cpuctl;	/* CPU control parameters */
-	xiocb_time_t    xiocb_time;	/* timer parameters */
-	xiocb_meminfo_t xiocb_meminfo;	/* memory arena info parameters */
-	xiocb_fwinfo_t  xiocb_fwinfo;	/* firmware information */
-	xiocb_exitstat_t xiocb_exitstat; /* Exit Status */
-    } plist;
-} cfe_xiocb_t;
-
-#endif /* CFE_API_INT_H */
diff --git a/libgloss/mips/cfe_error.h b/libgloss/mips/cfe_error.h
deleted file mode 100644
index a12af4b..0000000
--- a/libgloss/mips/cfe_error.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* From: CFE Id: cfe_error.h,v 1.2 2002/07/09 19:37:52 cgd Exp $ */
-
-/*
- * Copyright 2000, 2001, 2002
- * Broadcom Corporation. All rights reserved.
- * 
- * This software is furnished under license and may be used and copied only
- * in accordance with the following terms and conditions.  Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * modified or unmodified copies of this software in source and/or binary
- * form. No title or ownership is transferred hereby.
- * 
- * 1) Any source code used, modified or distributed must reproduce and
- *    retain this copyright notice and list of conditions as they appear in
- *    the source file.
- * 
- * 2) No right is granted to use any trade name, trademark, or logo of
- *    Broadcom Corporation.  The "Broadcom Corporation" name may not be
- *    used to endorse or promote products derived from this software
- *    without the prior written permission of Broadcom Corporation.
- * 
- * 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED
- *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
- *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
- *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
- *    LIABLE FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *    OR OTHERWISE), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*  *********************************************************************
-    *  
-    *  Broadcom Common Firmware Environment (CFE)
-    *  
-    *  Error codes				File: cfe_error.h
-    *  
-    *  CFE's global error code list is here.
-    *  
-    *  Author:  Mitch Lichtenberg
-    *  
-    ********************************************************************* */
-
-
-#define CFE_OK			 0
-#define CFE_ERR                 -1	/* generic error */
-#define CFE_ERR_INV_COMMAND	-2
-#define CFE_ERR_EOF		-3
-#define CFE_ERR_IOERR		-4
-#define CFE_ERR_NOMEM		-5
-#define CFE_ERR_DEVNOTFOUND	-6
-#define CFE_ERR_DEVOPEN		-7
-#define CFE_ERR_INV_PARAM	-8
-#define CFE_ERR_ENVNOTFOUND	-9
-#define CFE_ERR_ENVREADONLY	-10
-
-#define CFE_ERR_NOTELF		-11
-#define CFE_ERR_NOT32BIT 	-12
-#define CFE_ERR_WRONGENDIAN 	-13
-#define CFE_ERR_BADELFVERS 	-14
-#define CFE_ERR_NOTMIPS 	-15
-#define CFE_ERR_BADELFFMT 	-16
-#define CFE_ERR_BADADDR 	-17
-
-#define CFE_ERR_FILENOTFOUND	-18
-#define CFE_ERR_UNSUPPORTED	-19
-
-#define CFE_ERR_HOSTUNKNOWN	-20
-
-#define CFE_ERR_TIMEOUT		-21
-
-#define CFE_ERR_PROTOCOLERR	-22
-
-#define CFE_ERR_NETDOWN		-23
-#define CFE_ERR_NONAMESERVER	-24
-
-#define CFE_ERR_NOHANDLES	-25
-#define CFE_ERR_ALREADYBOUND	-26
-
-#define CFE_ERR_CANNOTSET	-27
-#define CFE_ERR_NOMORE		-28
-#define CFE_ERR_BADFILESYS	-29
-#define CFE_ERR_FSNOTAVAIL	-30
-
-#define CFE_ERR_INVBOOTBLOCK	-31
-#define CFE_ERR_WRONGDEVTYPE	-32
-#define CFE_ERR_BBCHECKSUM	-33
-#define CFE_ERR_BOOTPROGCHKSUM	-34
-
-#define CFE_ERR_LDRNOTAVAIL	-35
-
-#define CFE_ERR_NOTREADY	-36
-
-#define CFE_ERR_GETMEM          -37
-#define CFE_ERR_SETMEM          -38
-
-#define CFE_ERR_NOTCONN		-39
-#define CFE_ERR_ADDRINUSE	-40
diff --git a/libgloss/mips/cfe_mem.c b/libgloss/mips/cfe_mem.c
deleted file mode 100644
index 87caabf..0000000
--- a/libgloss/mips/cfe_mem.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* cfe_mem.c -- Replaceable memory management hooks for MIPS boards
-   running CFE.  */
-
-/*
- * Copyright 2003
- * Broadcom Corporation. All rights reserved.
- * 
- * This software is furnished under license and may be used and copied only
- * in accordance with the following terms and conditions.  Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * modified or unmodified copies of this software in source and/or binary
- * form. No title or ownership is transferred hereby.
- * 
- * 1) Any source code used, modified or distributed must reproduce and
- *    retain this copyright notice and list of conditions as they appear in
- *    the source file.
- * 
- * 2) No right is granted to use any trade name, trademark, or logo of
- *    Broadcom Corporation.  The "Broadcom Corporation" name may not be
- *    used to endorse or promote products derived from this software
- *    without the prior written permission of Broadcom Corporation.
- * 
- * 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED
- *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
- *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
- *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
- *    LIABLE FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- */
-
-#include "cfe_api.h"
-
-/* Structure filled in by get_mem_info.  Only the size field is
-   actually used (by sbrk), so the others aren't even filled in.
-   Note that 'size' is the __size__ of the heap starting at _end!  */
-struct s_mem {
-  unsigned int size;
-  unsigned int icsize;
-  unsigned int dcsize;
-};
-
-void *get_mem_info (struct s_mem *);
-
-extern char _end[];
-
-/* Address immediately after available memory.  */
-static unsigned long memtop;
-
-/* Program stack size.  */
-static unsigned long stack_size;
-
-void
-__libcfe_meminit (void)
-{
-  /* If the user has provided a memory-limit function, use it to
-     determine the end of usable memory.  */
-  if (&__libcfe_mem_limit != NULL)
-    memtop = __libcfe_mem_limit ();
-  else
-    {
-      uint64_t start, length, type;
-      int i, rv;
-      long end_segbits, end_pa;
-
-      /* Note that this only works if _end and the program live in kseg0
-         or kseg1.  Not a problem with the default linker script, but
-         if you're writing your own, keep it in mind.  For more complex
-         memory allocation needs, you're encouraged to copy this file
-         and syscalls.c (for sbrk()), and reimplement as appropriate.  */
-      end_segbits = (long)_end & ~ 0x1fffffffL;
-      end_pa = (long)_end & 0x1fffffffL;
-
-      for (i = 0; ; i++)
-        {
-          rv = cfe_enummem(i, 0, &start, &length, &type);
-          if (rv < 0)
-            {
-              /* Did not find an available entry containing _end.
-                 Assume a minimal amount of memory (1MB).  */
-              memtop = _end + (1 * 1024 * 1024);
-              break;
-            }
-
-          /* If not available, try the next.  */
-          if (type != CFE_MI_AVAILABLE)
-            continue;
-
-          /* If end_pa is between start and (start + length) then we have
-	     a winner.  */
-          if (end_pa >= start && end_pa < (start + length))
-            {
-              memtop = (start + length) | end_segbits;
-              break;
-            }
-        }
-    }
-
-  /* If the user has provided a memory-limit function, use it to
-     determine the end of usable memory.  */
-  if (&__libcfe_stack_size != NULL)
-    stack_size = __libcfe_stack_size ();
-  else
-    stack_size = (32 * 1024);		/* Default = 32KB.  */
-
-  /* Chop the top of memory to a 32-byte aligned location, and
-     round the stack size up to a 32-byte multiple.  */
-  memtop = memtop & ~(unsigned long)31;
-  stack_size = (stack_size + 31) & ~(unsigned long)31;
-}
-
-void *
-__libcfe_stack_top (void)
-{
-  /* Grow down from the top of available memory.  Obviously, if
-     code writes above this limit, problems could result!  */
-  return (void *) memtop;
-}
-
-/* For compatibility, get_mem_info returns the top of memory
-   (i.e., the stack address).  Nothing actually uses that,
-   though.  */
-void *
-get_mem_info (struct s_mem *meminfo)
-{
-  meminfo->size = (char *)(memtop - stack_size) - _end;
-  return (void *) memtop;
-}
diff --git a/libgloss/mips/cma101.c b/libgloss/mips/cma101.c
index e8f3818..83fa4d5 100644
--- a/libgloss/mips/cma101.c
+++ b/libgloss/mips/cma101.c
@@ -1,7 +1,7 @@
 /*
  * cma101.c -- lo-level support for Cogent CMA101 development board.
  *
- * Copyright (c) 1996, 2001, 2002 Cygnus Support
+ * Copyright (c) 1996, 2001 Cygnus Support
  *
  * The authors hereby grant permission to use, copy, modify, distribute,
  * and license this software and its documentation for any purpose, provided
@@ -179,9 +179,6 @@ extern unsigned int __buserr_count(void);
 extern void __default_buserr_handler(void);
 extern void __restore_buserr_handler(void);
 
-/* Allow the user to provide his/her own defaults.  */
-unsigned int __sizemem_default;
-
 unsigned int
 __sizemem ()
 {
@@ -189,15 +186,10 @@ __sizemem ()
   volatile unsigned int *probe;
   unsigned int baseorig;
   unsigned int sr;
-  extern char end[];
+  extern void *end;
   char *endptr = (char *)&end;
   int extra;
 
-  /* If the linker script provided a value for the memory size (or the user
-     overrode it in a debugger), use that.  */
-  if (__sizemem_default)
-    return __sizemem_default;
-
   /* If we are running in kernel segment 0 (possibly cached), try sizing memory
      in kernel segment 1 (uncached) to avoid some problems with monitors.  */
   if (endptr >= K0BASE_ADDR && endptr < K1BASE_ADDR)
diff --git a/libgloss/mips/configure b/libgloss/mips/configure
index c313805..68e55a8 100755
--- a/libgloss/mips/configure
+++ b/libgloss/mips/configure
@@ -28,6 +28,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -142,6 +143,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -312,6 +314,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -477,12 +484,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -583,7 +594,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
+echo "configure:598: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -604,7 +615,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
+echo "configure:619: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -622,7 +633,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
+echo "configure:637: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -676,7 +687,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:680: checking for a BSD compatible install" >&5
+echo "configure:691: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -740,7 +751,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:744: checking for $ac_word" >&5
+echo "configure:755: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -770,7 +781,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
+echo "configure:785: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -819,7 +830,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:823: checking whether we are using GNU C" >&5
+echo "configure:834: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -828,7 +839,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -843,7 +854,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:858: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -879,7 +890,7 @@ LD=${LD-ld}
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:883: checking for $ac_word" >&5
+echo "configure:894: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -917,16 +928,6 @@ case "${target}" in
         script_list="dve idt jmr3904app jmr3904dram jmr3904dram-java jmr3904app-java"
         bsp_list="libdve.a libidt.a libjmr3904.a"
         ;;
-  mipsisa32-*-* | mipsisa32el-*-* | \
-  mipsisa32r2-*-* | mipsisa32r2el-*-* | \
-  mipsisa64-*-*)
-	crt0="crt0_cfe.o crt0_cygmon.o crt0.o"
-	pcrt0="pcrt0.o"
-	part_specific_obj=
-	part_specific_defines=
-	script_list="idt32 idt64 cfe"
-	bsp_list="libcygmon.a libidt.a libcfe.a"
-	;;
   mips*-lsi*-*)
 	part_specific_obj=entry.o
 	part_specific_defines=
@@ -939,17 +940,17 @@ case "${target}" in
         script_list="idt pmon ddb ddb-kseg0 lsi idtecoff nullmon"
         bsp_list="libidt.a libpmon.a liblsi.a libnullmon.a"
 	;;
-  mips64vr-*-* | mips64vrel-*-*)
-	part_specific_obj="vr5xxx.o cma101.o"
-	script_list="ddb ddb-kseg0 nullmon"
-	bsp_list="libpmon.a libnullmon.a"
-	;;
+  mipsisa32*-*-*)
+        part_specific_obj=
+        part_specific_defines=
+        script_list="idt32 idt64"
+        bsp_list="libidt.a"
+        ;;
   *)
-	crt0="crt0_cfe.o crt0.o"
         part_specific_obj="vr4300.o cma101.o"
 	part_specific_defines=
-        script_list="idt pmon ddb ddb-kseg0 lsi cfe idtecoff nullmon"
-        bsp_list="libidt.a libpmon.a liblsi.a libcfe.a libnullmon.a"
+        script_list="idt pmon ddb ddb-kseg0 lsi idtecoff nullmon"
+        bsp_list="libidt.a libpmon.a liblsi.a libnullmon.a"
         ;;
 esac
 
@@ -1035,34 +1036,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
-t quote
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
 
 
 # Without the "./", some shells look in PATH for config.status.
diff --git a/libgloss/mips/configure.in b/libgloss/mips/configure.in
index cfc0d24..5660104 100644
--- a/libgloss/mips/configure.in
+++ b/libgloss/mips/configure.in
@@ -1,4 +1,4 @@
-# Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2002 Cygnus Support
+# Copyright (c) 1995, 1996, 1997, 1998, 1999 Cygnus Support
 #
 # The authors hereby grant permission to use, copy, modify, distribute,
 # and license this software and its documentation for any purpose, provided
@@ -92,16 +92,6 @@ case "${target}" in
         script_list="dve idt jmr3904app jmr3904dram jmr3904dram-java jmr3904app-java"
         bsp_list="libdve.a libidt.a libjmr3904.a"
         ;;
-  mipsisa32-*-* | mipsisa32el-*-* | \
-  mipsisa32r2-*-* | mipsisa32r2el-*-* | \
-  mipsisa64-*-*)
-	crt0="crt0_cfe.o crt0_cygmon.o crt0.o"
-	pcrt0="pcrt0.o"
-	part_specific_obj=
-	part_specific_defines=
-	script_list="idt32 idt64 cfe"
-	bsp_list="libcygmon.a libidt.a libcfe.a"
-	;;
   mips*-lsi*-*)
 	part_specific_obj=entry.o
 	part_specific_defines=
@@ -114,17 +104,17 @@ case "${target}" in
         script_list="idt pmon ddb ddb-kseg0 lsi idtecoff nullmon"
         bsp_list="libidt.a libpmon.a liblsi.a libnullmon.a"
 	;;
-  mips64vr-*-* | mips64vrel-*-*)
-	part_specific_obj="vr5xxx.o cma101.o"
-	script_list="ddb ddb-kseg0 nullmon"
-	bsp_list="libpmon.a libnullmon.a"
-	;;
+  mipsisa32*-*-*)
+        part_specific_obj=
+        part_specific_defines=
+        script_list="idt32 idt64"
+        bsp_list="libidt.a"
+        ;;
   *)
-	crt0="crt0_cfe.o crt0.o"
         part_specific_obj="vr4300.o cma101.o"
 	part_specific_defines=
-        script_list="idt pmon ddb ddb-kseg0 lsi cfe idtecoff nullmon"
-        bsp_list="libidt.a libpmon.a liblsi.a libcfe.a libnullmon.a"
+        script_list="idt pmon ddb ddb-kseg0 lsi idtecoff nullmon"
+        bsp_list="libidt.a libpmon.a liblsi.a libnullmon.a"
         ;;
 esac
 
diff --git a/libgloss/mips/crt0.S b/libgloss/mips/crt0.S
index 8810afa..8bd46eb 100644
--- a/libgloss/mips/crt0.S
+++ b/libgloss/mips/crt0.S
@@ -37,12 +37,13 @@
 # else
 #  define LA(t,x) la t,x-PICBASE ; addu t,s0,t
 # endif
-#else /* __mips_embedded_pic */
+#else /* __mips_embedded_pic */ 
 # define LA(t,x) la t,x
-#endif /* __mips_embedded_pic */
+#endif /* __mips_embedded_pic */ 
 
 	.comm	__memsize, 12
 	.comm	__lstack, STARTUP_STACK_SIZE
+	.comm   __stackbase,4
 
 	.text
 	.align	2
@@ -53,19 +54,17 @@
  */
 	nop
 
-	.globl	hardware_hazard_hook .text
 	.globl	_start
 	.ent	_start
 _start:
 	.set	noreorder
 #ifdef __mips_embedded_pic
-#define PICBASE start_PICBASE
 	PICBASE = .+8
         bal	PICBASE
 	nop
 	move	s0,$31
 #endif
-#if !defined(__mips64) || (__mips_fpr==32)
+#if (__mips < 3) || (__mips_fpr==32)
 #define STATUS_MASK (SR_CU1|SR_PE)
 #else
 # For mips3 or mips4, turn on 64-bit addressing and additional float regs
@@ -76,14 +75,6 @@ _start:
 	mtc0	zero, C0_CAUSE
 	nop
 
-	/* Avoid hazard from FPU enable and other SR changes.  */
-	LA (t0, hardware_hazard_hook)
-	beq	t0,zero,1f
-	nop
-	jal	t0
-	nop
-1:
-
 /* Check for FPU presence.  Don't check if we know that soft_float is
    being used.  (This also avoids illegal instruction exceptions.)  */
 
@@ -106,16 +97,10 @@ _start:
 	li	v0, (STATUS_MASK-(STATUS_MASK & SR_CU1))
 	mtc0	v0, C0_SR
 	nop
-	/* Avoid hazard from FPU disable.  */
-	LA (t0, hardware_hazard_hook)
-	beq	t0,zero,2f
-	nop
-	jal	t0
-	nop
 2:
 
 
-/* Fix high bits, if any, of the PC so that exception handling
+/* Fix high bits, if any, of the PC so that exception handling 
    doesn't get confused.  */
 	LA (v0, 3f)
 	jr	v0
@@ -153,16 +138,22 @@ zerobss:
 
 	/* NOTE: a0[0] contains the amount of memory available, and
 	         not the last memory address. */
-	la	a0, __memsize
 	lw	t0,0(a0)			# last address of memory available
 	la	t1,K0BASE			# cached kernel memory
 	addu	t0,t0,t1			# get the end of memory address
-	/* Allocate 32 bytes for the register parameters.  Allocate 16
-	   bytes for a null argv and envp.  Round the result up to 64
-	   bytes to preserve alignment.  */
-	subu	t0,t0,64
+	/* We must subtract 24 bytes for the 3 8 byte arguments to main, in
+	   case main wants to write them back to the stack.  The caller is
+	   supposed to allocate stack space for parameters in registers in
+	   the old MIPS ABIs.  We must do this even though we aren't passing
+	   arguments, because main might be declared to have them. 
+
+	   Some ports need a larger alignment for the stack, so we subtract
+	   32, which satisifes the stack for the arguments and keeps the
+	   stack pointer better aligned.  */
+	subu	t0,t0,32			# and generate a starting stack-pointer
 4:
 	move	sp,t0				# set stack pointer
+	sw	sp,__stackbase			# keep this for future ref
 	.end	zerobss
 
 /*
@@ -202,33 +193,18 @@ init:
 	nop
 #endif
 
-
 	jal	_init				# run global constructors
 	nop
 
-	addiu	a1,sp,32			# argv = sp + 32
-	addiu	a2,sp,40			# envp = sp + 40
-#if __mips64
-	sd	zero,(a1)			# argv[argc] = 0
-	sd	zero,(a2)			# envp[0] = 0
-#else
-	sw	zero,(a1)
-	sw	zero,(a2)
-#endif
-	jal	main				# call the program start function
 	move	a0,zero				# set argc to 0
+	jal	main				# call the program start function
+	nop
 
 	# fall through to the "exit" routine
 	jal	exit				# call libc exit to run the G++
 						# destructors
 	move	a0,v0				# pass through the exit code
 	.end	init
-
- 
-/* Assume the PICBASE set up above is no longer valid below here.  */
-#ifdef __mips_embedded_pic
-#undef PICBASE
-#endif
 	
 /*
  * _exit -- Exit from the application. Normally we cause a user trap
@@ -238,41 +214,19 @@ init:
  *          executables that contain a complete world to be linked with
  *          just the crt0.o object.
  */
-	.globl	hardware_exit_hook .text
 	.globl	_exit
 	.ent _exit
 _exit:
 7:
-#ifdef __mips_embedded_pic
-	/* Need to reinit PICBASE, since we might be called via exit()
-	   rather than via a return path which would restore old s0.  */
-#define PICBASE exit_PICBASE
-	PICBASE = .+8
-	bal	PICBASE
-	nop
-	move	s0,$31
-#endif
 #ifdef GCRT0
-	LA (t0, _mcleanup)
-	jal	t0
+	jal	_mcleanup
 	nop
 #endif
-	LA (t0, hardware_exit_hook)
-	beq	t0,zero,1f
-	nop
-	jal	t0
-	nop
-1:
-
 	# break instruction can cope with 0xfffff, but GAS limits the range:
 	break	1023
+	nop
 	b	7b				# but loop back just in-case
 	nop
 	.end _exit
- 
-/* Assume the PICBASE set up above is no longer valid below here.  */
-#ifdef __mips_embedded_pic
-#undef PICBASE
-#endif
 
 /* EOF crt0.S */
diff --git a/libgloss/mips/crt0_cfe.S b/libgloss/mips/crt0_cfe.S
deleted file mode 100644
index 9e920e2..0000000
--- a/libgloss/mips/crt0_cfe.S
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * crt0_cfe.S -- Runtime startup for MIPS targets running CFE.
- *
- * Copyright 2003
- * Broadcom Corporation. All rights reserved.
- *
- * This software is furnished under license and may be used and copied only
- * in accordance with the following terms and conditions.  Subject to these
- * conditions, you may download, copy, install, use, modify and distribute
- * modified or unmodified copies of this software in source and/or binary
- * form. No title or ownership is transferred hereby.
- *
- * 1) Any source code used, modified or distributed must reproduce and
- *    retain this copyright notice and list of conditions as they appear in
- *    the source file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of
- *    Broadcom Corporation.  The "Broadcom Corporation" name may not be
- *    used to endorse or promote products derived from this software
- *    without the prior written permission of Broadcom Corporation.
- *
- * 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED
- *    WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
- *    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- *    NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
- *    FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
- *    LIABLE FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- *    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- *    BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- *    OR OTHERWISE), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Derived from crt0_cygmon.S:
- *
- * Copyright (c) 1995, 1996, 1997, 2000 Red Hat, Inc.
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-/*
- * This file does minimal runtime startup for code running under
- * CFE firmware.
- *
- * It does minimal hardware initialization.  In particular
- * it sets Status:FR to match the requested floating point
- * mode.
- *
- * It is meant to be linked with the other files provided by libcfe.a,
- * and calls routines in those files.
- */
-
-#ifdef __mips16
-/* This file contains 32 bit assembly code.  */
-	.set nomips16
-#endif
-#ifdef __mips_embedded_pic
-# error -membedded-pic is not supported.
-#endif
-
-#include "regs.S"
-
-/*
- * Set up some room for a stack. We just grab a chunk of memory.
- */
-#define STARTUP_STACK_SIZE	(1 * 1024)		
-
-	.comm	_lstack, STARTUP_STACK_SIZE
-
-	.text
-	.align	4
-
-    /*
-     * Without the following nop, GDB thinks _start is a data variable.
-     * This is probably a bug in GDB in handling a symbol that is at the
-     * start of the .text section.
-     */
-	nop
-
-
-    /*
-     * On entry, the following values have been passed in registers
-     * by the firmware:
-     *
-     * a0: firmware handle
-     * a1: zero (unused)
-     * a2: firmware callback entrypoint
-     * a3: CFE entrypoint seal (unused)
-     *
-     * They must be preserved until the CFE entrypoint and handle
-     * are passed to __libcfe_init().
-     */
-
-	.globl	_start
-	.ent	_start
-_start:
-	.set	noreorder
-    /* Set the global data pointer, defined in the linker script.  */
-	la		gp, _gp
-
-#ifndef __mips_soft_float
-    /* If compiled for hard float, set the FPU mode based on the
-       compilation flags.  Note that this assumes that enough code
-       will run after the mtc0 to clear any hazards.  */
-	mfc0	t0, C0_SR
-	or	t0, t0, (SR_CU1 | SR_FR)
-#if (__mips_fpr == 32)
-	xor	t0, t0, SR_FR		/* If 32-bit FP mode, clear FR.  */
-#endif
-	mtc0	t0, C0_SR
-#endif
-	.end	_start
-
-    /*
-     * zero out the bss section.
-     */
-	.globl	_zerobss
-	.ent	_zerobss
-_zerobss:
-    /* These variables are defined in the linker script.  */
-	la		v0, _fbss
-	la		v1, _end
-
-3:
-	sw		zero, 0(v0)
-	bltu	v0, v1, 3b
-	addiu	v0, v0, 4		/* Delay slot.  */
-	.end	_zerobss
-
-    /*
-     * Setup a small stack so we can run some C code, and do
-     * the library initialization.  (32 bytes are saved for
-     * the argument registers' stack slots.)
-     */
-	.globl	_stackinit
-	.ent	_stackinit
-_stackinit:
-	la	t0, _lstack
-	addiu	sp, t0, (STARTUP_STACK_SIZE - 32)
-	jal	__libcfe_init
-	nop
-
-    /*
-     * Setup the stack pointer -- 
-     *    __libcfe_init() returns the value to be used as the top of
-     *    the program's stack.
-     *
-     *    We subtract 32 bytes for the 4 argument registers, in case
-     *    main() wants to write them back to the stack.  The caller
-     *    allocates stack space for parameters in the old MIPS ABIs.
-     *    We must do this even though we aren't passing arguments,
-     *    because main might be declared to have them.)
-     *
-     *    We subtract 32 more bytes for the argv/envp setup for the
-     *    call to main().
-     */
-	subu	v0, v0, 64
-	move	sp, v0
-
-	.end	_stackinit
-
-    /*
-     * initialize target specific stuff. Only execute these
-     * functions it they exist.
-     */
-	.globl	hardware_init_hook .text
-	.globl	software_init_hook .text
-	.type	_fini,@function
-	.type	_init,@function
-	.globl	atexit .text
-	.globl	exit .text
-	.globl	_crt0init
-	.ent	_crt0init
-_crt0init:
-	la		t9, hardware_init_hook	# init the hardware if needed
-	beq		t9, zero, 6f
-	nop
-	jal		t9
-	nop
-6:
-	la		t9, software_init_hook	# init the software if needed
-	beq		t9, zero, 7f
-	nop
-	jal		t9
-	nop
-7:
-	la		a0, _fini
-	jal		atexit
-	nop
-
-#ifdef GCRT0
-	.globl	_ftext
-	.globl	_extext
-	la		a0, _ftext
-	la		a1, _etext
-	jal		monstartup
-	nop
-#endif
-
-	jal	_init			# run global constructors
-	nop
-
-	addiu	a1,sp,32			# argv = sp + 32
-	addiu	a2,sp,40			# envp = sp + 40
-#if __mips64
-	sd	zero,(a1)			# argv[argc] = 0
-	sd	zero,(a2)			# envp[0] = 0
-#else
-	sw	zero,(a1)
-	sw	zero,(a2)
-#endif
-
-	jal	main			# call the program start function
-	move	a0,zero			# set argc to 0; delay slot.
-
-	# fall through to the "exit" routine
-	jal	exit			# call libc exit to run the G++
-					# destructors
-	move	a0, v0			# pass through the exit code
-	.end	_crt0init
-	
-/*
- * _exit -- Exit from the application.  This is provided in this file because
- *          program exit should shut down profiling (if GCRT0 is defined),
- *          and only this file is compiled with GCRT0 defined.
- */
-	.globl	_exit
-	.ent	_exit
-_exit:
-7:
-	move	s0, a0			/* Save in case we loop.  */
-
-#ifdef GCRT0
-	jal	_mcleanup
-	nop
-#endif
-
-	la	t0, hardware_exit_hook
-	beq	t0,zero,1f
-	nop
-	jal	t0
-	nop
-
-1:
-	/* Call into the library to do the heavy lifting.  */
-        jal	__libcfe_exit
-	move	a0, s0			/* Delay slot.  */
-
-	b	7b			/* Loop back just in case.  */
-	nop
-	.end	_exit
-
-/* EOF crt0_cfe.S */
diff --git a/libgloss/mips/crt0_cygmon.S b/libgloss/mips/crt0_cygmon.S
deleted file mode 100644
index ae0a9e3..0000000
--- a/libgloss/mips/crt0_cygmon.S
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * crt0_cygmon.S -- Minimal startup file for MIPS targets running Cygmon.
- *
- * Copyright (c) 1995, 1996, 1997, 2000 Red Hat, Inc.
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-/*
- * This file contains the minimal startup code necessary.
- * This will not do any hardware initialization.  It is assumed that we are talking to Cygmon
- * and therefore the hardware will be initialized properly.
- */
-
-#ifdef __mips16
-/* This file contains 32 bit assembly code.  */
-	.set nomips16
-#endif
-
-#include "regs.S"
-
-/*
- * Set up some room for a stack. We just grab a chunk of memory.
- */
-#define STACK_SIZE  0x4000
-#define GLOBAL_SIZE 0x2000
-
-#define STARTUP_STACK_SIZE	0x0100
-
-	.comm	__memsize, 12
-	.comm	__lstack, STARTUP_STACK_SIZE
-	.comm   __stackbase,4
-
-	.text
-	.align	4
-    /*
-     * Without the following nop, GDB thinks _start is a data variable.
-     * This is probably a bug in GDB in handling a symbol that is at the
-     * start of the .text section.
-     */
-	nop
-
-	.globl	_start
-	.ent	_start
-_start:
-	.set	noreorder
-	la		gp, _gp					# set the global data pointer, defined in the linker script
-	.end	_start
-
-    /*
-     * zero out the bss section.
-     */
-	.globl	__memsize
-	.globl	get_mem_info .text
-	.globl	zerobss
-	.ent	zerobss
-zerobss:
-	la		v0, _fbss				# These variables are defined in the linker script
-	la		v1, _end
-
-3:
-	sw		zero, 0(v0)
-	bltu	v0, v1, 3b
-	addiu	v0, v0, 4				# executed in delay slot
-
-    /*
-     * Setup a small stack so we can run some C code,
-     * and get the usable memory size.
-     */
-	la		t0, __lstack
-	addiu	sp, t0, STARTUP_STACK_SIZE
-	la		a0, __memsize
-	jal		get_mem_info
-	nop
-
-	/*
-     * Setup the stack pointer -- 
-     *    get_mem_info returns the top of memory, so just use that In
-     *    addition, we must subtract 24 bytes for the 3 8 byte
-     *    arguments to main, in case main wants to write them back to
-     *    the stack.  The caller is supposed to allocate stack space
-     *    for parameters in registers in the old MIPS ABIs.  We must
-     *    do this even though we aren't passing arguments, because
-     *    main might be declared to have them.
-	 *    Some ports need a larger alignment for the stack, so we
-	 *    subtract 32, which satisifes the stack for the arguments and
-	 *    keeps the stack pointer better aligned.
-     */
-	subu	v0, v0, 32
-	move	sp, v0
-
-	sw		sp, __stackbase			# keep this for future ref
-	.end	zerobss
-
-    /*
-     * initialize target specific stuff. Only execute these
-     * functions it they exist.
-     */
-	.globl	hardware_init_hook .text
-	.globl	software_init_hook .text
-	.globl	__do_global_dtors .text
-	.globl	atexit .text
-	.globl	exit .text
-	.globl	init
-	.ent	init
-init:
-	la		t9, hardware_init_hook	# init the hardware if needed
-	beq		t9, zero, 6f
-	nop
-	jal		t9
-	nop
-6:
-	la		t9, software_init_hook	# init the software if needed
-	beq		t9, zero, 7f
-	nop
-	jal		t9
-	nop
-7:
-	la		a0, __do_global_dtors
-	jal		atexit
-	nop
-
-#ifdef GCRT0
-	.globl	_ftext
-	.globl	_extext
-	la		a0, _ftext
-	la		a1, _etext
-	jal		monstartup
-	nop
-#endif
-
-	move	a0,zero					# set argc to 0
-	jal		main					# call the program start function
-	nop
-
-	# fall through to the "exit" routine
-	jal		exit					# call libc exit to run the G++
-									# destructors
-	move	a0, v0					# pass through the exit code
-	.end	init
-	
-/*
- * _exit -- Exit from the application. Normally we cause a user trap
- *          to return to the ROM monitor for another run. NOTE: This is
- *          the only other routine we provide in the crt0.o object, since
- *          it may be tied to the "_start" routine. It also allows
- *          executables that contain a complete world to be linked with
- *          just the crt0.o object.
- */
-	.globl	_exit
-	.ent	_exit
-_exit:
-7:
-#ifdef GCRT0
-	jal		_mcleanup
-	nop
-#endif
-	# Cygmon expects a break 5
-	break	5
-	nop
-	b		7b						# loop back just in-case
-	nop
-	.end	_exit
-
-/* EOF crt0.S */
diff --git a/libgloss/mips/cygmon.c b/libgloss/mips/cygmon.c
deleted file mode 100644
index 506e853..0000000
--- a/libgloss/mips/cygmon.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* cygmon.c -- Glue code for linking apps to run on top of Cygmon.
- *
- * Copyright (c) 1998, 1999, 2000 Red Hat, Inc.
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include "syscall.h"
-
-int
-write ( int file,
-        char *buf,
-        int nbytes)
-{
-  return sysCall(SYS_write, file, (unsigned long)buf, nbytes);
-}
-
-int
-read (int file,
-      char *buf,
-      int nbytes)
-{
-  return sysCall(SYS_read, file, (unsigned long)buf, nbytes);
-}
-
-int
-outbyte (unsigned char c)
-{
-  return sysCall(SYS_write, 0, (unsigned long)&c, 1);
-}
-
-unsigned char
-inbyte (void)
-{
-  char c;
-  sysCall(SYS_read, 0, (unsigned long)&c, 1);
-  return c;
-}
-
-
-/* Structure filled in by get_mem_info.  Only the size field is
-   actually used (by sbrk), so the others aren't even filled in.  */
-struct s_mem
-{
-  unsigned int size;
-  unsigned int icsize;
-  unsigned int dcsize;
-};
-
-// Perform a system call.
-// Unused parameters should be set to 0.
-int sysCall(unsigned long func, unsigned long p1, unsigned long p2, unsigned long p3)
-{
-  int ret = 0;
-  asm volatile ( "		\n\
-          move $4, %1		\n\
-          move $5, %2		\n\
-          move $6, %3		\n\
-          move $7, %4		\n\
-          syscall 		\n\
-          nop			\n\
-          move %0, $2" : "=r"(ret) : "r"(func), "r"(p1), "r"(p2), "r"(p3));
-  return ret;
-}
-
-// These need to be kept in sync with the definitions in Cygmon.
-#define SYS_meminfo     1001
-
-void *
-get_mem_info (mem)
-     struct s_mem *mem;
-{
-  unsigned long totmem = 0, topmem = 0;
-  int numbanks;
-
-  numbanks = sysCall(SYS_meminfo, (unsigned long)&totmem, (unsigned long)&topmem, 0);
-  mem->size = totmem;
-  return (void*)topmem;
-}
diff --git a/libgloss/mips/ddb-kseg0.ld b/libgloss/mips/ddb-kseg0.ld
index db3759e..420fb6f 100644
--- a/libgloss/mips/ddb-kseg0.ld
+++ b/libgloss/mips/ddb-kseg0.ld
@@ -2,7 +2,6 @@
    workspace. */
 
 ENTRY(_start)
-STARTUP(crt0.o)
 OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
 GROUP(-lc -lpmon -lgcc)
 SEARCH_DIR(.)
@@ -23,8 +22,6 @@ PROVIDE (__stack = 0);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -33,25 +30,21 @@ SECTIONS
   . = 0x80100000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
   
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .jcr : { KEEP (*(.jcr)) }
   .ctors    :
   {
     /* gcc uses crtbegin.o to find the start of
@@ -89,13 +82,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -109,7 +102,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -117,15 +110,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -156,7 +145,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/ddb.ld b/libgloss/mips/ddb.ld
index 0280783..73dbad9 100644
--- a/libgloss/mips/ddb.ld
+++ b/libgloss/mips/ddb.ld
@@ -2,7 +2,6 @@
    workspace. */
 
 ENTRY(_start)
-STARTUP(crt0.o)
 OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
 GROUP(-lc -lpmon -lgcc)
 SEARCH_DIR(.)
@@ -23,8 +22,6 @@ PROVIDE (__stack = 0);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -33,25 +30,21 @@ SECTIONS
   . = 0xA0100000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
   
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .jcr : { KEEP (*(.jcr)) }
   .ctors    :
   {
     /* gcc uses crtbegin.o to find the start of
@@ -89,13 +82,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -109,7 +102,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -117,15 +110,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -156,7 +145,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/dve.ld b/libgloss/mips/dve.ld
index 073d1e9..a09eeee 100644
--- a/libgloss/mips/dve.ld
+++ b/libgloss/mips/dve.ld
@@ -1,7 +1,6 @@
 /* Linker script for Densan DVE-R3900/20A board */
 
 ENTRY(_start)
-STARTUP(crt0.o)
 OUTPUT_ARCH("mips:3000")
 OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
 GROUP(-lc -ldve -lgcc)
@@ -23,8 +22,6 @@ PROVIDE (__stack = 0);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -33,25 +30,21 @@ SECTIONS
   . = 0xA0040000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
   
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .jcr : { KEEP (*(.jcr)) }
   .ctors    :
   {
     /* gcc uses crtbegin.o to find the start of
@@ -89,13 +82,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
       CONSTRUCTORS
   }
   . = ALIGN(8);
@@ -110,7 +103,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -118,15 +111,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -157,7 +146,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/idt.ld b/libgloss/mips/idt.ld
index e0f87a7..5dd26fa 100644
--- a/libgloss/mips/idt.ld
+++ b/libgloss/mips/idt.ld
@@ -3,7 +3,6 @@
    0xa001af20. */
 
 ENTRY(_start)
-STARTUP(crt0.o)
 OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
 GROUP(-lc -lidt -lgcc)
 SEARCH_DIR(.)
@@ -24,8 +23,6 @@ PROVIDE (__stack = 0);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -37,15 +34,15 @@ SECTIONS
     PROVIDE (eprol = .);
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
   }
   .init : {
-    KEEP (*(.init))
+    *(.init)
   }
   .fini : {
-    KEEP (*(.fini))
+    *(.fini)
   }
   .rel.sdata : {
     PROVIDE (__runtime_reloc_start = .);
@@ -55,10 +52,6 @@ SECTIONS
   PROVIDE (etext = .);
   _etext  =  .;
   
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .jcr : { KEEP (*(.jcr)) }
   .ctors    :
   {
     /* gcc uses crtbegin.o to find the start of
@@ -96,13 +89,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -116,7 +109,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    PROVIDE (edata  =  .);
@@ -124,15 +117,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -163,7 +152,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/idt32.ld b/libgloss/mips/idt32.ld
index b5bba04..4214b7b 100644
--- a/libgloss/mips/idt32.ld
+++ b/libgloss/mips/idt32.ld
@@ -25,8 +25,6 @@ PROVIDE (__stack = 0);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -38,15 +36,15 @@ SECTIONS
     PROVIDE (eprol  =  .);
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
   }
   .init : {
-    KEEP (*(.init))
+    *(.init)
   }
   .fini : {
-    KEEP (*(.fini))
+    *(.fini)
   }
   .rel.sdata : {
     PROVIDE (__runtime_reloc_start = .);
@@ -57,10 +55,6 @@ SECTIONS
   _etext  =  .;
 
 
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .jcr : { KEEP (*(.jcr)) }
   .ctors    :
   {
     /* gcc uses crtbegin.o to find the start of
@@ -98,13 +92,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -118,7 +112,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
   PROVIDE (edata  =  .);
@@ -126,15 +120,11 @@ SECTIONS
   _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -165,7 +155,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/idt64.ld b/libgloss/mips/idt64.ld
index 4a400ae..751c0f1 100644
--- a/libgloss/mips/idt64.ld
+++ b/libgloss/mips/idt64.ld
@@ -25,8 +25,6 @@ PROVIDE (__stack = 0);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -38,15 +36,15 @@ SECTIONS
     PROVIDE (eprol  =  .);
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
   }
   .init : {
-    KEEP (*(.init))
+    *(.init)
   }
   .fini : {
-    KEEP (*(.fini))
+    *(.fini)
   }
   .rel.sdata : {
     PROVIDE (__runtime_reloc_start = .);
@@ -56,10 +54,6 @@ SECTIONS
   PROVIDE (etext  =  .);
   _etext  =  .;
 
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .jcr : { KEEP (*(.jcr)) }
   .ctors    :
   {
     /* gcc uses crtbegin.o to find the start of
@@ -97,13 +91,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -117,7 +111,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
   PROVIDE (edata  =  .);
@@ -125,15 +119,11 @@ SECTIONS
   _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -164,7 +154,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/idtecoff.ld b/libgloss/mips/idtecoff.ld
index 2788cc8..08534d2 100644
--- a/libgloss/mips/idtecoff.ld
+++ b/libgloss/mips/idtecoff.ld
@@ -25,8 +25,6 @@ PROVIDE (__stack = 0);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -35,17 +33,17 @@ SECTIONS
   . = 0xA0020000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -54,13 +52,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
     CONSTRUCTORS
   }
   . = ALIGN(8);
@@ -75,7 +73,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -83,15 +81,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
    end = .;
diff --git a/libgloss/mips/jmr3904app-java.ld b/libgloss/mips/jmr3904app-java.ld
index 98ce535..b23d8e3 100644
--- a/libgloss/mips/jmr3904app-java.ld
+++ b/libgloss/mips/jmr3904app-java.ld
@@ -1,7 +1,6 @@
 /* Linker script forJMR 3904 board using Java + qthreads */
 
 ENTRY(_start)
-STARTUP(crt0.o)
 OUTPUT_ARCH("mips:3000")
 OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
 GROUP(-lc -ljmr3904 -lgcc -lgcjcoop)
@@ -23,8 +22,6 @@ PROVIDE (_Jv_QthreadsStackSize = 0x10000);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -35,17 +32,17 @@ SECTIONS
       /* It fits the Cygmon ROMS */
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -54,13 +51,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
     CONSTRUCTORS
   }
   . = ALIGN(8);
@@ -75,7 +72,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -83,15 +80,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
     . += 0x2000 ;  /* 8k bytes of stack. */
     __stack = ALIGN(64) ;
@@ -125,7 +118,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/jmr3904app.ld b/libgloss/mips/jmr3904app.ld
index 3056a36..f5808fd 100644
--- a/libgloss/mips/jmr3904app.ld
+++ b/libgloss/mips/jmr3904app.ld
@@ -1,7 +1,6 @@
 /* Linker script forJMR 3904 board */
 
 ENTRY(_start)
-STARTUP(crt0.o)
 OUTPUT_ARCH("mips:3000")
 OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
 GROUP(-lc -ljmr3904 -lgcc)
@@ -20,8 +19,6 @@ PROVIDE (_mem_size = 0x100000); /* JMR3904 comes as standard with 512k of RAM */
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -32,25 +29,21 @@ SECTIONS
       /* It fits the Cygmon ROMS */
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
   
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .jcr : { KEEP (*(.jcr)) }
   .ctors    :
   {
     /* gcc uses crtbegin.o to find the start of
@@ -88,13 +81,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -108,7 +101,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -116,15 +109,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
     . += 0x2000 ;  /* 8k bytes of stack. */
     __stack = ALIGN(64) ;
@@ -158,7 +147,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/jmr3904dram-java.ld b/libgloss/mips/jmr3904dram-java.ld
index 71e8403..ce9595d 100644
--- a/libgloss/mips/jmr3904dram-java.ld
+++ b/libgloss/mips/jmr3904dram-java.ld
@@ -1,7 +1,6 @@
 /* Linker script forJMR 3904 board using Java + qthreads */
 
 ENTRY(_start)
-STARTUP(crt0.o)
 OUTPUT_ARCH("mips:3000")
 OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
 GROUP(-lc -ljmr3904 -lgcc -lgcjcoop)
@@ -24,8 +23,6 @@ PROVIDE (_Jv_QthreadsStackSize = 0x10000);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -37,17 +34,17 @@ SECTIONS
       /* It fits the Cygmon ROMS */
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -56,13 +53,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
     CONSTRUCTORS
   }
   . = ALIGN(8);
@@ -77,7 +74,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -85,15 +82,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -128,7 +121,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/jmr3904dram.ld b/libgloss/mips/jmr3904dram.ld
index a2cb1ea..cf28364 100644
--- a/libgloss/mips/jmr3904dram.ld
+++ b/libgloss/mips/jmr3904dram.ld
@@ -1,7 +1,6 @@
 /* Linker script forJMR 3904 board */
 
 ENTRY(_start)
-STARTUP(crt0.o)
 OUTPUT_ARCH("mips:3000")
 OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
 GROUP(-lc -ljmr3904 -lgcc)
@@ -21,8 +20,6 @@ PROVIDE (_mem_size = 0x100000); /* JMR3904 comes as standard with 512k of RAM */
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -34,17 +31,17 @@ SECTIONS
       /* It fits the Cygmon ROMS */
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
@@ -53,13 +50,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
     CONSTRUCTORS
   }
   . = ALIGN(8);
@@ -74,7 +71,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -82,15 +79,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -125,7 +118,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/lsi.ld b/libgloss/mips/lsi.ld
index 8393825..c567157 100644
--- a/libgloss/mips/lsi.ld
+++ b/libgloss/mips/lsi.ld
@@ -2,7 +2,6 @@
    workspace. */
 
 ENTRY(_start)
-STARTUP(crt0.o)
 OUTPUT_ARCH("mips:4000")
 OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
 GROUP(-lc -llsi -lgcc)
@@ -24,8 +23,6 @@ PROVIDE (__stack = 0);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -34,23 +31,19 @@ SECTIONS
   . = 0xA0020000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
   
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .jcr : { KEEP (*(.jcr)) }
   .ctors    :
   {
     /* gcc uses crtbegin.o to find the start of
@@ -88,13 +81,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
     CONSTRUCTORS
   }
   . = ALIGN(8);
@@ -109,22 +102,18 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
    edata  =  .;
    _edata  =  .;
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
    end = .;
diff --git a/libgloss/mips/nullmon.c b/libgloss/mips/nullmon.c
index 0b519bf..12a157e 100644
--- a/libgloss/mips/nullmon.c
+++ b/libgloss/mips/nullmon.c
@@ -32,8 +32,8 @@
 #if ! defined(BOARD_MEM_SIZE)
 #define BOARD_MEM_SIZE 0x100000 /* About a megabyte */
 #endif
-extern char _ftext[]; /* Defined in nullmon.ld */
-extern char _end[];   /* Defined in nullmon.ld */
+extern unsigned char _ftext ; /* Defined in nullmon.ld */
+extern unsigned char _end ;   /* Defined in nullmon.ld */
 
 #if defined(FIXME_WARNINGS)
 #warning("FIXME: struct s_mem belongs in a header file")
@@ -47,8 +47,13 @@ struct s_mem
 void
 get_mem_info (mem)
      struct s_mem *mem;
-{
-  mem->size = BOARD_MEM_SIZE - (_end - _ftext);
+{ char * t1, * t2 ;
+  unsigned long long tmp ;
+  t1 = & _ftext ;
+  t2 = & _end ;
+  tmp = (unsigned long long) (t2 - t1) ;
+  tmp = (unsigned long long) BOARD_MEM_SIZE - tmp ;
+  mem->size = tmp ;
 }
 
 /*  SYSTEM INTERFACE
diff --git a/libgloss/mips/nullmon.ld b/libgloss/mips/nullmon.ld
index 1d93195..82d8016 100644
--- a/libgloss/mips/nullmon.ld
+++ b/libgloss/mips/nullmon.ld
@@ -2,7 +2,6 @@
    workspace. */
 
 ENTRY(_start)
-STARTUP(crt0.o)
 OUTPUT_ARCH("mips:4000")
 OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
 GROUP(-lc -lnullmon -lgcc)
@@ -24,8 +23,6 @@ PROVIDE (__stack = 0);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -34,25 +31,21 @@ SECTIONS
   . = 0xA0020000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
   
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .jcr : { KEEP (*(.jcr)) }
   .ctors    :
   {
     /* gcc uses crtbegin.o to find the start of
@@ -90,13 +83,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -110,7 +103,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -118,15 +111,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
    . = ALIGN(64) ;
@@ -158,7 +147,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/pmon.S b/libgloss/mips/pmon.S
index 5485979..a4496c9 100644
--- a/libgloss/mips/pmon.S
+++ b/libgloss/mips/pmon.S
@@ -1,7 +1,7 @@
 /*
  * pmon.S -- low-level entry points into PMON monitor.
  *
- * Copyright (c) 1996, 1997, 2002 Cygnus Support
+ * Copyright (c) 1996, 1997 Cygnus Support
  *
  * The authors hereby grant permission to use, copy, modify, distribute,
  * and license this software and its documentation for any purpose, provided
@@ -19,7 +19,7 @@
 	.set nomips16
 #endif
 
-#if !defined(__mips64)
+#if __mips < 3
   /* This machine does not support 64-bit operations.  */
   #define ADDU addu
   #define SUBU subu
diff --git a/libgloss/mips/pmon.ld b/libgloss/mips/pmon.ld
index e9a20ae..f8dc54b 100644
--- a/libgloss/mips/pmon.ld
+++ b/libgloss/mips/pmon.ld
@@ -2,7 +2,6 @@
    workspace. */
 
 ENTRY(_start)
-STARTUP(crt0.o)
 OUTPUT_ARCH("mips:4000")
 OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
 GROUP(-lc -lpmon -lgcc)
@@ -24,8 +23,6 @@ PROVIDE (__stack = 0);
  * We have to initalize them twice, so we multiple object file
  * formats, as some prepend an underscore.
  */
-PROVIDE (hardware_exit_hook = 0);
-PROVIDE (hardware_hazard_hook = 0);
 PROVIDE (hardware_init_hook = 0);
 PROVIDE (software_init_hook = 0);
 
@@ -34,25 +31,21 @@ SECTIONS
   . = 0xA0020000;
   .text : {
      _ftext = . ;
-    KEEP (*(.init))
+    *(.init)
      eprol  =  .;
     *(.text)
     *(.text.*)
-    *(.gnu.linkonce.t.*)
+    *(.gnu.linkonce.t*)
     *(.mips16.fn.*)
     *(.mips16.call.*)
     PROVIDE (__runtime_reloc_start = .);
     *(.rel.sdata)
     PROVIDE (__runtime_reloc_stop = .);
-    KEEP (*(.fini))
+    *(.fini)
      etext  =  .;
      _etext  =  .;
   }
   
-  .eh_frame_hdr : { *(.eh_frame_hdr) }
-  .eh_frame : { KEEP (*(.eh_frame)) }
-  .gcc_except_table : { *(.gcc_except_table) }
-  .jcr : { KEEP (*(.jcr)) }
   .ctors    :
   {
     /* gcc uses crtbegin.o to find the start of
@@ -90,13 +83,13 @@ SECTIONS
     *(.rdata)
     *(.rodata)
     *(.rodata.*)
-    *(.gnu.linkonce.r.*)
+    *(.gnu.linkonce.r*)
   }
    _fdata = ALIGN(16);
   .data : {
     *(.data)
     *(.data.*)
-    *(.gnu.linkonce.d.*)
+    *(.gnu.linkonce.d*)
   }
   . = ALIGN(8);
   _gp = . + 0x8000;
@@ -110,7 +103,7 @@ SECTIONS
   .sdata : {
     *(.sdata)
     *(.sdata.*)
-    *(.gnu.linkonce.s.*)
+    *(.gnu.linkonce.s*)
   }
   . = ALIGN(4);
    edata  =  .;
@@ -118,15 +111,11 @@ SECTIONS
    _fbss = .;
   .sbss : {
     *(.sbss)
-    *(.sbss.*)
-    *(.gnu.linkonce.sb.*)
     *(.scommon)
   }
   .bss : {
     _bss_start = . ;
     *(.bss)
-    *(.bss.*)
-    *(.gnu.linkonce.b.*)
     *(COMMON)
   }
 
@@ -157,7 +146,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
 
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
diff --git a/libgloss/mips/regs.S b/libgloss/mips/regs.S
index bdf933f..7ade6e8 100644
--- a/libgloss/mips/regs.S
+++ b/libgloss/mips/regs.S
@@ -53,21 +53,20 @@
 #define fp1	$f1
 
 /* Useful memory constants: */
+#define K0BASE		0x80000000
 #ifndef __mips64
-#define K0BASE          0x80000000
 #define K1BASE		0xA0000000
 #define K0BASE_ADDR	((char *)K0BASE)
 #define K1BASE_ADDR	((char *)K1BASE)
 #else
-#define K0BASE          0xFFFFFFFF80000000
-#define K1BASE		0xFFFFFFFFA0000000
+#define K1BASE		0xFFFFFFFFA0000000LL
 #define K0BASE_ADDR	((char *)0xFFFFFFFF80000000LL)
-#define K1BASE_ADDR	((char *)0xFFFFFFFFA0000000LL)
+#define K1BASE_ADDR	((char *)K1BASE)
 #endif
 
 #define PHYS_TO_K1(a)   ((unsigned)(a) | K1BASE)
 
-/* Standard Co-Processor 0 registers */
+/* Standard Co-Processor 0 register numbers:
 #define C0_COUNT	$9		/* Count Register */
 #define C0_SR		$12		/* Status Register */
 #define C0_CAUSE	$13		/* last exception description */
diff --git a/libgloss/mips/vr4300.S b/libgloss/mips/vr4300.S
index 9737ddc..2fc576e 100644
--- a/libgloss/mips/vr4300.S
+++ b/libgloss/mips/vr4300.S
@@ -47,7 +47,7 @@ __cpu_timer_poll:
 	j	ra
 	nop			#				{DELAY SLOT}
 1:
-	mfc0	v0, C0_COUNT	# get current counter value
+	mfc0	v0, $9		# C0_COUNT:  get current counter value
 	nop
 	nop
 	# We cannot just do the simple test, of adding our delta onto
@@ -66,7 +66,7 @@ __cpu_timer_poll:
 	# sign-extended to fill the 64bit register value).
 2:
 	# get current counter value:
-	mfc0	v0, C0_COUNT
+	mfc0	v0, $9	# C0_COUNT
 	nop
 	nop
 	# This is an unsigned 32bit subtraction:
diff --git a/libgloss/mips/vr5xxx.S b/libgloss/mips/vr5xxx.S
index f89e88a..4d2b38b 100644
--- a/libgloss/mips/vr5xxx.S
+++ b/libgloss/mips/vr5xxx.S
@@ -64,7 +64,7 @@ __cpu_timer_poll:
 	j	ra
 	nop			#				{DELAY SLOT}
 1:
-	mfc0	v0, C0_COUNT	# get current counter value
+	mfc0	v0, $9		# C0_COUNT:  get current counter value
 	nop
 	nop
 	# We cannot just do the simple test, of adding our delta onto
@@ -83,7 +83,7 @@ __cpu_timer_poll:
 	# sign-extended to fill the 64bit register value).
 2:
 	# get current counter value:
-	mfc0	v0, C0_COUNT
+	mfc0	v0, $9	# C0_COUNT
 	nop
 	nop
 	# This is an unsigned 32bit subtraction:
diff --git a/libgloss/mn10200/Makefile.in b/libgloss/mn10200/Makefile.in
index 5a6e10b..9ed0055 100644
--- a/libgloss/mn10200/Makefile.in
+++ b/libgloss/mn10200/Makefile.in
@@ -10,7 +10,6 @@
 # the new terms are clearly indicated on the first page of each file where
 # they apply.
 
-DESTDIR =
 VPATH = @srcdir@
 srcdir = @srcdir@
 objdir = .
@@ -122,12 +121,12 @@ distclean maintainer-clean realclean: clean
 
 .PHONY: install info install-info clean-info
 install:
-	$(INSTALL_PROGRAM) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
+	$(INSTALL_PROGRAM) $(CRT0) $(tooldir)/lib${MULTISUBDIR}/$(CRT0)
 	@for bsp in ${BSP}; do\
-	 $(INSTALL_PROGRAM) $${bsp} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
+	 $(INSTALL_PROGRAM) $${bsp} $(tooldir)/lib${MULTISUBDIR}; \
 	done
 	@for script in ${SCRIPTS}; do\
-	 $(INSTALL_DATA) ${srcdir}/$${script}.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${script}.ld; \
+	 $(INSTALL_DATA) ${srcdir}/$${script}.ld $(tooldir)/lib${MULTISUBDIR}/$${script}.ld; \
 	done
 
 info:
diff --git a/libgloss/mn10200/eval.ld b/libgloss/mn10200/eval.ld
index c5c958b..7c91ed7 100644
--- a/libgloss/mn10200/eval.ld
+++ b/libgloss/mn10200/eval.ld
@@ -144,7 +144,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/mn10200/sim.ld b/libgloss/mn10200/sim.ld
index 4c75169..90c9e57 100644
--- a/libgloss/mn10200/sim.ld
+++ b/libgloss/mn10200/sim.ld
@@ -140,7 +140,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/mn10300/Makefile.in b/libgloss/mn10300/Makefile.in
index 4153fd4..11cd3db 100644
--- a/libgloss/mn10300/Makefile.in
+++ b/libgloss/mn10300/Makefile.in
@@ -10,7 +10,6 @@
 # the new terms are clearly indicated on the first page of each file where
 # they apply.
 
-DESTDIR =
 VPATH = @srcdir@
 srcdir = @srcdir@
 objdir = .
@@ -129,13 +128,13 @@ distclean maintainer-clean realclean: clean
 .PHONY: install info install-info clean-info
 install:
 	@for crt in ${CRT0}; do\
-	$(INSTALL_PROGRAM) $${crt} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${crt}; \
+	$(INSTALL_PROGRAM) $${crt} $(tooldir)/lib${MULTISUBDIR}/$${crt}; \
 	done
 	@for bsp in ${BSP}; do\
-	 $(INSTALL_PROGRAM) $${bsp} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
+	 $(INSTALL_PROGRAM) $${bsp} $(tooldir)/lib${MULTISUBDIR}; \
 	done
 	@for script in ${SCRIPTS}; do\
-	 $(INSTALL_DATA) ${srcdir}/$${script}.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${script}.ld; \
+	 $(INSTALL_DATA) ${srcdir}/$${script}.ld $(tooldir)/lib${MULTISUBDIR}/$${script}.ld; \
 	done
 
 info:
diff --git a/libgloss/mn10300/asb2303.ld b/libgloss/mn10300/asb2303.ld
deleted file mode 100644
index 0fe2784..0000000
--- a/libgloss/mn10300/asb2303.ld
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Linker script for the MN10300 AM33/2.00 Panasonic ASB2303 Evaluation Board.
-*/
-
-OUTPUT_FORMAT("elf32-mn10300", "elf32-mn10300",
-	      "elf32-mn10300")
-OUTPUT_ARCH(mn10300)
-ENTRY(_start)
-GROUP(-lc -lcygmon -lgcc)
- SEARCH_DIR(.);
-STARTUP(crt0_cygmon.o)
-
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  /* Start of RAM (leaving room for Cygmon data) */
-  . = 0x90080000;
-
-  .interp     : { *(.interp) 	}
-  .hash          : { *(.hash)		}
-  .dynsym        : { *(.dynsym)		}
-  .dynstr        : { *(.dynstr)		}
-  .gnu.version   : { *(.gnu.version)	}
-  .gnu.version_d   : { *(.gnu.version_d)	}
-  .gnu.version_r   : { *(.gnu.version_r)	}
-  .rel.text      :
-    { *(.rel.text) *(.rel.gnu.linkonce.t*) }
-  .rela.text     :
-    { *(.rela.text) *(.rela.gnu.linkonce.t*) }
-  .rel.data      :
-    { *(.rel.data) *(.rel.gnu.linkonce.d*) }
-  .rela.data     :
-    { *(.rela.data) *(.rela.gnu.linkonce.d*) }
-  .rel.rodata    :
-    { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
-  .rela.rodata   :
-    { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
-  .rel.got       : { *(.rel.got)		}
-  .rela.got      : { *(.rela.got)		}
-  .rel.ctors     : { *(.rel.ctors)	}
-  .rela.ctors    : { *(.rela.ctors)	}
-  .rel.dtors     : { *(.rel.dtors)	}
-  .rela.dtors    : { *(.rela.dtors)	}
-  .rel.init      : { *(.rel.init)	}
-  .rela.init     : { *(.rela.init)	}
-  .rel.fini      : { *(.rel.fini)	}
-  .rela.fini     : { *(.rela.fini)	}
-  .rel.bss       : { *(.rel.bss)		}
-  .rela.bss      : { *(.rela.bss)		}
-  .rel.plt       : { *(.rel.plt)		}
-  .rela.plt      : { *(.rela.plt)		}
-  .init          : { *(.init)	} =0
-  .plt      : { *(.plt)	}
-  .text      :
-  {
-    *(.text)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t*)
-    *(.gcc_except_table)
-  } =0
-  _etext = .;
-  PROVIDE (etext = .);
-  .fini      : { *(.fini)    } =0
-  .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
-  .rodata1   : { *(.rodata1) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(1) + (. & (1 - 1));
-  .data    :
-  {
-    *(.data)
-    *(.gnu.linkonce.d*)
-    CONSTRUCTORS
-  }
-  .data1   : { *(.data1) }
-  .ctors         :
-  {
-    ___ctors = .;
-    KEEP(*crtbegin.o(.ctors))
-    KEEP(*(SORT(.ctors.*)))
-    KEEP(*(.ctors))
-    ___ctors_end = .;
-  }
-  .dtors         :
-  {
-    ___dtors = .;
-    KEEP(*crtbegin.o(.dtors))
-    KEEP(*(SORT(.dtors.*)))
-    KEEP(*(.dtors))
-    ___dtors_end = .;
-  }
-  .got           : { *(.got.plt) *(.got) }
-  .dynamic       : { *(.dynamic) }
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata     : { *(.sdata) }
-  _edata  =  .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  .sbss      : { *(.sbss) *(.scommon) }
-  .bss       :
-  {
-   *(.dynbss)
-   *(.bss)
-   *(COMMON)
-  }
-  _end = . ;
-  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-
-   /* Top of RAM is 0x48100000, but Cygmon uses the top 4K for its stack.  */
-  .stack 0x480ff000 : { _stack = .; *(.stack) *(._stack) }
-
-  /* These must appear regardless of  .  */
-}
diff --git a/libgloss/mn10300/asb2305.ld b/libgloss/mn10300/asb2305.ld
deleted file mode 100644
index b827469..0000000
--- a/libgloss/mn10300/asb2305.ld
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Linker script for the MN10300 AM33/2.00 Panasonic ASB2305 Evaluation Board.
-*/
-
-OUTPUT_FORMAT("elf32-mn10300", "elf32-mn10300",
-	      "elf32-mn10300")
-OUTPUT_ARCH(am33-2)
-ENTRY(_start)
-GROUP(-lc -lcygmon -lgcc)
- SEARCH_DIR(.);
-STARTUP(crt0_redboot.o)
-
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  /* Start of RAM (leaving room for RedBoot data) */
-  . = 0x90700000;
-
-  .interp     : { *(.interp) 	}
-  .hash          : { *(.hash)		}
-  .dynsym        : { *(.dynsym)		}
-  .dynstr        : { *(.dynstr)		}
-  .gnu.version   : { *(.gnu.version)	}
-  .gnu.version_d   : { *(.gnu.version_d)	}
-  .gnu.version_r   : { *(.gnu.version_r)	}
-  .rel.text      :
-    { *(.rel.text) *(.rel.gnu.linkonce.t*) }
-  .rela.text     :
-    { *(.rela.text) *(.rela.gnu.linkonce.t*) }
-  .rel.data      :
-    { *(.rel.data) *(.rel.gnu.linkonce.d*) }
-  .rela.data     :
-    { *(.rela.data) *(.rela.gnu.linkonce.d*) }
-  .rel.rodata    :
-    { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
-  .rela.rodata   :
-    { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
-  .rel.got       : { *(.rel.got)		}
-  .rela.got      : { *(.rela.got)		}
-  .rel.ctors     : { *(.rel.ctors)	}
-  .rela.ctors    : { *(.rela.ctors)	}
-  .rel.dtors     : { *(.rel.dtors)	}
-  .rela.dtors    : { *(.rela.dtors)	}
-  .rel.init      : { *(.rel.init)	}
-  .rela.init     : { *(.rela.init)	}
-  .rel.fini      : { *(.rel.fini)	}
-  .rela.fini     : { *(.rela.fini)	}
-  .rel.bss       : { *(.rel.bss)		}
-  .rela.bss      : { *(.rela.bss)		}
-  .rel.plt       : { *(.rel.plt)		}
-  .rela.plt      : { *(.rela.plt)		}
-  .init          : { *(.init)	} =0
-  .plt      : { *(.plt)	}
-  .text      :
-  {
-    *(.text)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t*)
-    *(.gcc_except_table)
-  } =0
-  _etext = .;
-  PROVIDE (etext = .);
-  .fini      : { *(.fini)    } =0
-  .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
-  .rodata1   : { *(.rodata1) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(1) + (. & (1 - 1));
-  .data    :
-  {
-    *(.data)
-    *(.gnu.linkonce.d*)
-    CONSTRUCTORS
-  }
-  .data1   : { *(.data1) }
-  .ctors         :
-  {
-    ___ctors = .;
-    KEEP(*crtbegin.o(.ctors))
-    KEEP(*(SORT(.ctors.*)))
-    KEEP(*(.ctors))
-    ___ctors_end = .;
-  }
-  .dtors         :
-  {
-    ___dtors = .;
-    KEEP(*crtbegin.o(.dtors))
-    KEEP(*(SORT(.dtors.*)))
-    KEEP(*(.dtors))
-    ___dtors_end = .;
-  }
-  .got           : { *(.got.plt) *(.got) }
-  .dynamic       : { *(.dynamic) }
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata     : { *(.sdata) }
-  _edata  =  .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  .sbss      : { *(.sbss) *(.scommon) }
-  .bss       :
-  {
-   *(.dynbss)
-   *(.bss)
-   *(COMMON)
-  }
-  _end = . ;
-  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-
-   /* Top of usable RAM is 0x91000000  */
-  .stack 0x91000000 : { _stack = .; *(.stack) *(._stack) }
-
-  /* These must appear regardless of  .  */
-}
diff --git a/libgloss/mn10300/configure b/libgloss/mn10300/configure
index b814eb1..6371dbf 100755
--- a/libgloss/mn10300/configure
+++ b/libgloss/mn10300/configure
@@ -28,6 +28,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -142,6 +143,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -312,6 +314,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -477,12 +484,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -583,7 +594,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
+echo "configure:598: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -604,7 +615,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
+echo "configure:619: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -622,7 +633,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
+echo "configure:637: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -676,7 +687,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:680: checking for a BSD compatible install" >&5
+echo "configure:691: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -740,7 +751,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:744: checking for $ac_word" >&5
+echo "configure:755: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -770,7 +781,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
+echo "configure:785: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -819,7 +830,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:823: checking whether we are using GNU C" >&5
+echo "configure:834: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -828,7 +839,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -843,7 +854,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:858: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -879,7 +890,7 @@ LD=${LD-ld}
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:883: checking for $ac_word" >&5
+echo "configure:894: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -908,11 +919,6 @@ fi
 
 
 case "${target}" in
-  mn10300-*elf)
-        part_specific_obj=vr4300.o
-        script_list="eval sim asb2303 asb2305"
-        bsp_list="libeval.a libcygmon.a"
-        ;;
   *)
         part_specific_obj=vr4300.o
         script_list="eval sim"
@@ -1118,7 +1124,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/libgloss/mn10300/configure.in b/libgloss/mn10300/configure.in
index 78d0b18..fd566f8 100644
--- a/libgloss/mn10300/configure.in
+++ b/libgloss/mn10300/configure.in
@@ -83,11 +83,6 @@ AC_SUBST(LD)
 AC_PROG_RANLIB
 
 case "${target}" in
-  mn10300-*elf)
-        part_specific_obj=vr4300.o
-        script_list="eval sim asb2303 asb2305"
-        bsp_list="libeval.a libcygmon.a"
-        ;;
   *)
         part_specific_obj=vr4300.o
         script_list="eval sim"
diff --git a/libgloss/mn10300/eval.ld b/libgloss/mn10300/eval.ld
index f26f582..ca54949 100644
--- a/libgloss/mn10300/eval.ld
+++ b/libgloss/mn10300/eval.ld
@@ -137,7 +137,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/mn10300/sim.ld b/libgloss/mn10300/sim.ld
index 97fe454..6824cdd 100644
--- a/libgloss/mn10300/sim.ld
+++ b/libgloss/mn10300/sim.ld
@@ -13,7 +13,7 @@ SECTIONS
 {
   /* Read-only sections, merged into text segment: */
   /* Start of RAM (leaving room for Cygmon data) */
-  . = 4;
+  . = 0;
 
   .interp     : { *(.interp) 	}
   .hash          : { *(.hash)		}
@@ -135,7 +135,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/mt/16-002.ld b/libgloss/mt/16-002.ld
deleted file mode 100644
index 9dfd62e..0000000
--- a/libgloss/mt/16-002.ld
+++ /dev/null
@@ -1,248 +0,0 @@
-OUTPUT_FORMAT("elf32-mt", "elf32-mt", "elf32-mt")
-OUTPUT_ARCH(mt)
-ENTRY(__boot_start)
-
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-MEMORY
-{
-  ram (rwx) : ORIGIN = 0x0, LENGTH = 128K
-  frame-buffer (w) : ORIGIN = 0xde0000, LENGTH = 40K
-  ports (w) : ORIGIN = 0xfff000, LENGTH = 4K
-  dma-ram (w) : ORIGIN = 0x1000000, LENGTH = 16M-4K
-}
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = 0x0;
-  PROVIDE(__executable_start = 0x0);
-  .interp         : { *(.interp) }
-  .hash           : { *(.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.init       : { *(.rel.init) }
-  .rela.init      : { *(.rela.init) }
-  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
-  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
-  .rel.fini       : { *(.rel.fini) }
-  .rela.fini      : { *(.rela.fini) }
-  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
-  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
-  .rel.data.rel.ro  : { *(.rel.data.rel.ro*) }
-  .rela.data.rel.ro : { *(.rela.data.rel.ro*) }
-  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
-  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
-  .rel.tdata      : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
-  .rela.tdata     : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
-  .rel.tbss       : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
-  .rela.tbss      : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
-  .rel.ctors      : { *(.rel.ctors) }
-  .rela.ctors     : { *(.rela.ctors) }
-  .rel.dtors      : { *(.rel.dtors) }
-  .rela.dtors     : { *(.rela.dtors) }
-  .rel.got        : { *(.rel.got) }
-  .rela.got       : { *(.rela.got) }
-  .rel.sdata      : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
-  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
-  .rel.sbss       : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rel.sdata2     : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
-  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
-  .rel.sbss2      : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
-  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
-  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
-  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-
-  .startup        : { *startup-16-002.o(.startup) } >ram =0 
-  . = 0x40 ;
-
-  .init           : { KEEP (*(.init)) } >ram =0 
-  .plt            : { *(.plt) } >ram
-  .text           :
-  {
-    *startup-16-002.o(.text)
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } >ram =0
-  .fini           : { KEEP (*(.fini)) } >ram =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) } >ram
-  .rodata1        : { *(.rodata1) } >ram
-  .sdata2         : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } >ram
-  .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } >ram
-  .eh_frame_hdr   : { *(.eh_frame_hdr) } >ram
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) } >ram
-  .gcc_except_table : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(256) + (. & (256 - 1));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) } >ram
-  .gcc_except_table   : ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram
-  /* Thread Local Storage sections  */
-  .tdata          : { *(.tdata .tdata.* .gnu.linkonce.td.*) } >ram
-  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } >ram
-  /* Ensure the __preinit_array_start label is properly aligned.  We
-     could instead move the label definition inside the section, but
-     the linker would then create the section even if it turns out to
-     be empty, which isn't pretty.  */
-  . = ALIGN(32 / 8);
-  PROVIDE (__preinit_array_start = .);
-  .preinit_array  : { *(.preinit_array) } >ram
-  PROVIDE (__preinit_array_end = .);
-  PROVIDE (__init_array_start = .);
-  .init_array     : { *(.init_array) } >ram
-  PROVIDE (__init_array_end = .);
-  PROVIDE (__fini_array_start = .);
-  .fini_array     : { *(.fini_array) } >ram
-  PROVIDE (__fini_array_end = .);
-  .ctors :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } >ram
-  .dtors :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } >ram
-  .jcr            : { KEEP (*(.jcr)) } >ram
-  .data.rel.ro    : { *(.data.rel.ro.local) *(.data.rel.ro*) } >ram
-  .dynamic        : { *(.dynamic) } >ram
-
-  /* DJK - Re-align the data section from the read-only section. */
-  . = ALIGN(16) + (. & (16 - 1));
-  PROVIDE (_data = .);
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    SORT(CONSTRUCTORS)
-  } >ram
-  .data1          : { *(.data1) } >ram
-  .got            : { *(.got.plt) *(.got) } >ram
-
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata          : { *(.sdata .sdata.* .gnu.linkonce.s.*) } >ram
-  _edata = .;
-  PROVIDE ( edata = . ) ;
-  .sbss           :
-  {
-    PROVIDE (__sbss_start = .);
-    PROVIDE (___sbss_start = .);
-    *(.dynsbss)
-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
-    *(.scommon)
-    PROVIDE (__sbss_end = .);
-    PROVIDE (___sbss_end = .);
-  } >ram
-  .bss            :
-  {
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-    /* Align here to ensure that the .bss section occupies space up to
-       _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-    . = ALIGN(32 / 8);
-  } >ram
-  . = ALIGN(32 / 8);
-  __bss_start = ADDR ( .sbss ) ;
-  __bss_end = __bss_start + SIZEOF ( .sbss ) + SIZEOF ( .bss ) - 4 ;
-  _end = .;
-  PROVIDE (end = .);
-
-  /* DJK - Initialized frame buffer data is copied from RAM to FB. */
-  .auxbss         : AT (ADDR(.bss) + SIZEOF(.bss)) { *(.auxbss) } >frame-buffer
-  .auxdata        : AT (LOADADDR(.auxbss) + SIZEOF(.auxbss))
-  {
-    *(.auxdata)
-  } >frame-buffer
-
-  _fbbss_start = ADDR ( .auxbss );
-  _fbbss_end = _fbbss_start + SIZEOF ( .auxbss ) - 4;
-  _fbdata_start = LOADADDR ( .auxdata );
-  _fbdata_end = _fbdata_start + SIZEOF ( .auxdata ) ;
-  _fbdata_vma = ADDR ( .auxdata );
-
-  PROVIDE (__FRAME_BUFFER_START = ADDR(.auxbss) );
-  PROVIDE (__FRAME_BUFFER_SIZE = 0xa000);
-  PROVIDE (__FRAME_BUFFER_END = __FRAME_BUFFER_START + __FRAME_BUFFER_SIZE);
-
-  .dma            : { _dma_start = .; *(.dma) _dma_end = .; } >dma-ram
-  .internal_io (NOLOAD) : { *(.internal_io) } >ports 
-
-  /* Stabs debugging sections.  */
-  .stab            0 : { *(.stab) }
-  .stabstr         0 : { *(.stabstr) }
-  .stab.excl       0 : { *(.stab.excl) }
-  .stab.exclstr    0 : { *(.stab.exclstr) }
-  .stab.index      0 : { *(.stab.index) }
-  .stab.indexstr   0 : { *(.stab.indexstr) }
-  .comment         0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug           0 : { *(.debug) }
-  .line            0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo   0 : { *(.debug_srcinfo) }
-  .debug_sfnames   0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges   0 : { *(.debug_aranges) }
-  .debug_pubnames  0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info      0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev    0 : { *(.debug_abbrev) }
-  .debug_line      0 : { *(.debug_line) }
-  .debug_frame     0 : { *(.debug_frame) }
-  .debug_str       0 : { *(.debug_str) }
-  .debug_loc       0 : { *(.debug_loc) }
-  .debug_macinfo   0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-
-  /* In a multi-core environment, each core is given its own stack space
-     equal to __stack_size. */
-  PROVIDE (__stack = 0x1fff0);
-  PROVIDE (__stack_size = 0x800);
-
-  .stack (DEFINED(__stack) ? __stack : 0x007ffff0) :
-  {
-     __stack = .;
-    *(.stack)
-    LONG(0xdeaddead)
-  }
-  /DISCARD/ : { *(.note.GNU-stack) }
-}
diff --git a/libgloss/mt/16-003.ld b/libgloss/mt/16-003.ld
deleted file mode 100644
index c837b75..0000000
--- a/libgloss/mt/16-003.ld
+++ /dev/null
@@ -1,258 +0,0 @@
-OUTPUT_FORMAT("elf32-mt", "elf32-mt", "elf32-mt")
-OUTPUT_ARCH(mt)
-ENTRY(__boot_start)
-
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-MEMORY
-{
-  ram (rwx) : ORIGIN = 0x0, LENGTH = 608K
-  frame-buffer (w) : ORIGIN = 0xff000000, LENGTH = 80K
-  dma-ram (w) : ORIGIN = 0x1000000, LENGTH = 16M-4K
-  ports (w) : ORIGIN = 0xfffff000, LENGTH = 4K
-}
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = 0x0;
-  PROVIDE(__executable_start = 0x0);
-  .interp         : { *(.interp) }
-  .hash           : { *(.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.init       : { *(.rel.init) }
-  .rela.init      : { *(.rela.init) }
-  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
-  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
-  .rel.fini       : { *(.rel.fini) }
-  .rela.fini      : { *(.rela.fini) }
-  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
-  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
-  .rel.data.rel.ro  : { *(.rel.data.rel.ro*) }
-  .rela.data.rel.ro : { *(.rela.data.rel.ro*) }
-  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
-  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
-  .rel.tdata      : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
-  .rela.tdata     : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
-  .rel.tbss       : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
-  .rela.tbss      : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
-  .rel.ctors      : { *(.rel.ctors) }
-  .rela.ctors     : { *(.rela.ctors) }
-  .rel.dtors      : { *(.rel.dtors) }
-  .rela.dtors     : { *(.rela.dtors) }
-  .rel.got        : { *(.rel.got) }
-  .rela.got       : { *(.rela.got) }
-  .rel.sdata      : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
-  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
-  .rel.sbss       : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rel.sdata2     : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
-  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
-  .rel.sbss2      : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
-  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
-  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
-  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-
-  .startup        : { *startup-16-003.o(.startup) } >ram =0
-  . = 0x40;
-
-  .init           : { KEEP (*(.init)) } >ram =0
-  .plt            : { *(.plt) } >ram
-  .text           :
-  {
-    *startup-16-003.o(.text);
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } >ram =0
-  .fini           : { KEEP (*(.fini)) } >ram =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) } >ram
-  .rodata1        : { *(.rodata1) } >ram
-  .sdata2         : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } >ram
-  .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } >ram
-  .eh_frame_hdr   : { *(.eh_frame_hdr) } >ram
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) } >ram
-  .gcc_except_table : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(256) + (. & (256 - 1));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) } >ram
-  .gcc_except_table   : ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram
-  /* Thread Local Storage sections  */
-  .tdata          : { *(.tdata .tdata.* .gnu.linkonce.td.*) } >ram
-  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } >ram
-  /* Ensure the __preinit_array_start label is properly aligned.  We
-     could instead move the label definition inside the section, but
-     the linker would then create the section even if it turns out to
-     be empty, which isn't pretty.  */
-  . = ALIGN(32 / 8);
-  PROVIDE (__preinit_array_start = .);
-  .preinit_array  : { *(.preinit_array) } >ram
-  PROVIDE (__preinit_array_end = .);
-  PROVIDE (__init_array_start = .);
-  .init_array     : { *(.init_array) } >ram
-  PROVIDE (__init_array_end = .);
-  PROVIDE (__fini_array_start = .);
-  .fini_array     : { *(.fini_array) } >ram
-  PROVIDE (__fini_array_end = .);
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } >ram
-  .dtors          :
-  {
-    KEEP (*crtbegin*.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } >ram
-  .jcr            : { KEEP (*(.jcr)) } >ram
-  .data.rel.ro    : { *(.data.rel.ro.local) *(.data.rel.ro*) } >ram
-  .dynamic        : { *(.dynamic) } >ram
-
-  /* DJK - Re-align the data section from the read-only section. */
-  . = ALIGN(16) + (. & (16 - 1));
-  PROVIDE (_data = .);
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  } >ram
-  .data1          : { *(.data1) } >ram
-  .got            : { *(.got.plt) *(.got) } >ram
-
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata          : { *(.sdata .sdata.* .gnu.linkonce.s.*) } >ram
-  _edata = .;
-  PROVIDE ( edata = . );
-  .sbss           :
-  {
-    PROVIDE (__sbss_start = .);
-    PROVIDE (___sbss_start = .);
-    *(.dynsbss)
-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
-    *(.scommon)
-    PROVIDE (__sbss_end = .);
-    PROVIDE (___sbss_end = .);
-  } >ram
-  .bss            :
-  {
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-    /* Align here to ensure that the .bss section occupies space up to
-       _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-    . = ALIGN(32 / 8);
-  } >ram
-  . = ALIGN(32 / 8);
-  __bss_start = ADDR ( .sbss ) ;
-  __bss_end = __bss_start + SIZEOF ( .sbss ) + SIZEOF ( .bss ) - 4 ;
-  _end = .;
-  PROVIDE (end = .);
-
-  /* DJK - Initialized frame buffer data is copied from RAM to FB. */
-  .auxbss         : AT (ADDR(.bss) + SIZEOF(.bss)) { *(.auxbss) } >frame-buffer
-  .auxdata        : AT (LOADADDR(.auxbss) + SIZEOF(.auxbss))
-  {
-    *(.auxdata.bank0)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank1)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank2)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank3)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank4)
-    *(.auxdata)
-  } >frame-buffer
-
-  _fbbss_start = ADDR ( .auxbss );
-  _fbbss_end = _fbbss_start + SIZEOF ( .auxbss ) - 4;
-  _fbdata_start = LOADADDR ( .auxdata );
-  _fbdata_end = _fbdata_start + SIZEOF ( .auxdata ) ;
-  _fbdata_vma = ADDR ( .auxdata );
-  
-  PROVIDE (__FRAME_BUFFER_START = ADDR(.auxbss) );
-  PROVIDE (__FRAME_BUFFER_SIZE = 0x14000);
-  PROVIDE (__FRAME_BUFFER_END = __FRAME_BUFFER_START + __FRAME_BUFFER_SIZE);
-
-  .dma            : { _dma_start = .; *(.dma) _dma_end = .; } >dma-ram
-  .internal_io (NOLOAD) : { *(.internal_io) } >ports
-
-  /* Stabs debugging sections.  */
-  .stab            0 : { *(.stab) }
-  .stabstr         0 : { *(.stabstr) }
-  .stab.excl       0 : { *(.stab.excl) }
-  .stab.exclstr    0 : { *(.stab.exclstr) }
-  .stab.index      0 : { *(.stab.index) }
-  .stab.indexstr   0 : { *(.stab.indexstr) }
-  .comment         0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug           0 : { *(.debug) }
-  .line            0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo   0 : { *(.debug_srcinfo) }
-  .debug_sfnames   0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges   0 : { *(.debug_aranges) }
-  .debug_pubnames  0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info      0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev    0 : { *(.debug_abbrev) }
-  .debug_line      0 : { *(.debug_line) }
-  .debug_frame     0 : { *(.debug_frame) }
-  .debug_str       0 : { *(.debug_str) }
-  .debug_loc       0 : { *(.debug_loc) }
-  .debug_macinfo   0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-
-  /* In a multi-core environment, each core is given its own stack space
-     equal to __stack_size, growing downwards. */
-  PROVIDE (__stack = 0x97ff0);
-  PROVIDE (__stack_size = 0x800);
-
-  .stack (DEFINED(__stack) ? __stack : 0x007ffff0) :
-  {
-     __stack = .;
-    *(.stack)
-    LONG(0xdeaddead)
-  }
-  /DISCARD/ : { *(.note.GNU-stack) }
-}
diff --git a/libgloss/mt/64-001.ld b/libgloss/mt/64-001.ld
deleted file mode 100644
index 501ec32..0000000
--- a/libgloss/mt/64-001.ld
+++ /dev/null
@@ -1,282 +0,0 @@
-OUTPUT_FORMAT("elf32-mt", "elf32-mt", "elf32-mt")
-OUTPUT_ARCH(mt)
-ENTRY(__boot_start)
-
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-MEMORY
-{
-  rom (rx) : ORIGIN = 0x000000, LENGTH = 8M
-  frame-buffer (w) : ORIGIN = 0x800000, LENGTH = 64K
-  ram (w) : ORIGIN = 0xc00000, LENGTH = 4M
-  dma-ram (w) : ORIGIN = 0x1000000, LENGTH = 16M
-}
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  PROVIDE (__executable_start = 0x0); . = 0x0;
-  .interp         : { *(.interp) }
-  .hash           : { *(.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.init       : { *(.rel.init) }
-  .rela.init      : { *(.rela.init) }
-  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
-  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
-  .rel.fini       : { *(.rel.fini) }
-  .rela.fini      : { *(.rela.fini) }
-  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
-  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
-  .rel.data.rel.ro  : { *(.rel.data.rel.ro*) }
-  .rela.data.rel.ro : { *(.rel.data.rel.ro*) }
-  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
-  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
-  .rel.tdata      : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
-  .rela.tdata     : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
-  .rel.tbss       : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
-  .rela.tbss      : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
-  .rel.ctors      : { *(.rel.ctors) }
-  .rela.ctors     : { *(.rela.ctors) }
-  .rel.dtors      : { *(.rel.dtors) }
-  .rela.dtors     : { *(.rela.dtors) }
-  .rel.got        : { *(.rel.got) }
-  .rela.got       : { *(.rela.got) }
-  .rel.sdata      : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
-  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
-  .rel.sbss       : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rel.sdata2     : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
-  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
-  .rel.sbss2      : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
-  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
-  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
-  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-
-  .startup        : { *startup-64-001.o(.startup) } >rom =0
-
-  .init           : { KEEP (*(.init)) } >rom =0
-  .plt            : { *(.plt) } >rom 
-  .text           :
-  {
-    *startup-64-001.o(.text)
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } >rom =0
-  .fini           :
-  {
-    KEEP (*(.fini))
-  } >rom =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) } >rom
-  .rodata1        : { *(.rodata1) } >rom
-
-  /* Data starting here needs to be copied from ROM to the frame buffer. */
-  /* Section .sdata2 is used as the beginning marker of the frame buffer
-     address as well as the start of the data that needs to be copied.   */
-  .sdata2         : AT (ADDR(.rodata1) + SIZEOF(.rodata1))
-                    { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } >frame-buffer
-  .sbss2          : AT (LOADADDR(.sdata2) + SIZEOF(.sdata2))
-                    { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } >frame-buffer
-  .eh_frame_hdr   : AT (LOADADDR(.sbss2) + SIZEOF(.sbss2))
-                    { *(.eh_frame_hdr) } >frame-buffer
-  .eh_frame       : AT (LOADADDR(.eh_frame_hdr) + SIZEOF(.eh_frame_hdr))
-                    ONLY_IF_RO { KEEP (*(.eh_frame)) } >frame-buffer 
-  .gcc_except_table : AT (LOADADDR(.eh_frame) + SIZEOF(.eh_frame))
-                    ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >frame-buffer
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(256) + (. & (256 - 1));
-  /* Exception handling */
-  .eh_frame       : AT (LOADADDR(.eh_frame_hdr) + SIZEOF(.eh_frame_hdr))
-                    ONLY_IF_RW { KEEP (*(.eh_frame)) } >frame-buffer 
-  .gcc_except_table : AT (LOADADDR(.eh_frame) + SIZEOF(.eh_frame))
-                    ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >frame-buffer
-  /* Thread Local Storage sections  */
-  .tdata          : AT (LOADADDR(.gcc_except_table) + SIZEOF(.gcc_except_table))
-                    { *(.tdata .tdata.* .gnu.linkonce.td.*) } >frame-buffer
-  .tbss           : AT (LOADADDR(.tdata) + SIZEOF(.tdata))
-                    { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } >frame-buffer
-  /* Ensure the __preinit_array_start label is properly aligned.  We
-     could instead move the label definition inside the section, but
-     the linker would then create the section even if it turns out to
-     be empty, which isn't pretty.  */
-  . = ALIGN(32 / 8);
-  PROVIDE (__preinit_array_start = .);
-  .preinit_array  : AT (LOADADDR(.tbss) + SIZEOF(.tbss))
-                    { *(.preinit_array) } >frame-buffer
-  PROVIDE (__preinit_array_end = .);
-  PROVIDE (__init_array_start = .);
-  .init_array     : AT (LOADADDR(.preinit_array) + SIZEOF(.preinit_array))
-                    { *(.init_array) } >frame-buffer
-  PROVIDE (__init_array_end = .);
-  PROVIDE (__fini_array_start = .);
-  .fini_array     : AT (LOADADDR(.init_array) + SIZEOF(.init_array))
-                    { *(.fini_array) } >frame-buffer
-  PROVIDE (__fini_array_end = .);
-  .ctors          : AT (LOADADDR(.fini_array) + SIZEOF(.fini_array))
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin*.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } >frame-buffer
-  .dtors : AT (LOADADDR(.ctors) + SIZEOF(.ctors))
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } >frame-buffer
-  .jcr            : AT (LOADADDR(.dtors) + SIZEOF(.dtors))
-                    { KEEP (*(.jcr)) } >frame-buffer
-  .data.rel.ro    : AT (LOADADDR(.jcr) + SIZEOF(.jcr))
-                    { *(.data.rel.ro.local) *(.data.rel.ro*) } >frame-buffer
-  .dynamic        : AT (LOADADDR(.data.rel.ro) + SIZEOF(.data.rel.ro))
-                    { *(.dynamic) } >frame-buffer
-
-  /* DJK - Re-align the data section from the read-only section. */
-  . = ALIGN(16) + (. & (16 - 1));
-  PROVIDE (_data = .);
-  .data           : AT (LOADADDR(.dynamic) + SIZEOF(.dynamic))
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  } >frame-buffer
-  .data1          : AT (LOADADDR(.data) + SIZEOF(.data))
-                    { *(.data1) } >frame-buffer
-  .got            : AT (LOADADDR(.data1) + SIZEOF(.data1))
-                    { *(.got.plt) *(.got) }
-
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata          : AT (LOADADDR(.got) + SIZEOF(.got))
-                    { *(.sdata .sdata.* .gnu.linkonce.s.*) } >frame-buffer
-  _edata = .;
-  PROVIDE ( edata = . ) ;
-
-  _fbdata_start = LOADADDR(.sdata2) ;
-  _fbdata_end = LOADADDR(.sdata) + SIZEOF(.sdata) - 4 ;
-
-  PROVIDE (__FRAME_BUFFER_START = ADDR(.sdata2));
-  PROVIDE (__FRAME_BUFFER_SIZE = 0x10000);
-  PROVIDE (__FRAME_BUFFER_END = __FRAME_BUFFER_START + __FRAME_BUFFER_SIZE);
-  
-  .sbss           : AT (LOADADDR(.sdata) + SIZEOF(.sdata))
-  {
-    PROVIDE (__sbss_start = .);
-    PROVIDE (___sbss_start = .);
-    *(.dynsbss)
-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
-    *(.scommon)
-    PROVIDE (__sbss_end = .);
-    PROVIDE (___sbss_end = .);
-  } >frame-buffer
-  .bss            : AT (LOADADDR(.sbss) + SIZEOF(.sbss))
-  {
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-    /* Align here to ensure that the .bss section occupies space up to
-       _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-    . = ALIGN(32 / 8);
-  } >frame-buffer
-  . = ALIGN(32 / 8);
-  __bss_start = ADDR(.sbss) ;
-  __bss_end = __bss_start + SIZEOF(.sbss) + SIZEOF(.bss) - 4 ;
-  _end = .;
-  PROVIDE (end = .);
-
-  PROVIDE ( _extdata_start = ADDR(.bss) + SIZEOF(.bss));
-  .extdata        : AT ( LOADADDR(.bss) + SIZEOF(.bss))
-  {
-    *(.extdata)
-  }  >ram
-  PROVIDE (_extdata_end = _extdata_start + SIZEOF(.extdata) - 4 );
-
-  .extbss         : AT ( LOADADDR(.extdata) + SIZEOF(.extdata))
-  {
-    _extbss_start = .;
-    *(.extbss);
-    . = ALIGN(4);
-    _extbss_end = .;
-  } >ram
-  . = ALIGN(4);
-
-  PROVIDE (__EXTERNAL_MEMORY_START = 0xc00000);
-
-  .dma :
-  {
-    _dma_start = .;
-    *(.dma)
-    _dma_end = .;
-  } >dma-ram
-
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug         0 : { *(.debug) }
-  .line          0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo 0 : { *(.debug_srcinfo) }
-  .debug_sfnames 0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges 0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info    0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev  0 : { *(.debug_abbrev) }
-  .debug_line    0 : { *(.debug_line) }
-  .debug_frame   0 : { *(.debug_frame) }
-  .debug_str     0 : { *(.debug_str) }
-  .debug_loc     0 : { *(.debug_loc) }
-  .debug_macinfo 0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-
-
-  PROVIDE (__stack = 0x80fff0);
-
-  .stack (DEFINED(__stack) ? __stack : 0x7FFFF0) :
-  {
-    __stack = .;
-    *(.stack)
-    LONG(0xdeaddead)
-  }
-  /DISCARD/ : { *(.note.GNU-stack) }
-}
diff --git a/libgloss/mt/Makefile.in b/libgloss/mt/Makefile.in
deleted file mode 100644
index 031c864..0000000
--- a/libgloss/mt/Makefile.in
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright (c) 2001, 2005 Red Hat, Inc.
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-
-# Makefile for libgloss/mt. This is the board support for the Morpho mt.
-
-VPATH = @srcdir@ @srcdir@/..
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-SHELL = /bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-AR_FLAGS = rc
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-SCRIPTS = 16-002.ld  16-003.ld  64-001.ld ms2.ld
-CRT0 = crt0.o crt0-64-001.o crt0-16-002.o crt0-16-003.o crt0-ms2.o \
-	startup-64-001.o startup-16-002.o startup-16-003.o startup-ms2.o \
-	exit.o exit-64-001.o exit-16-002.o exit-16-003.o exit-ms2.o
-
-SIM_BSP = libsim.a
-SIM_OBJS = access.o chmod.o close.o \
-	fstat.o getpid.o gettime.o isatty.o kill.o lseek.o open.o \
-	read.o sbrk.o stat.o time.o times.o trap.o unlink.o utime.o write.o
-
-#### Host specific Makefile fragment comes in here.
-@host_makefile_frag@
-
-all: $(CRT0) $(SIM_BSP)
-
-$(SIM_BSP): $(SIM_OBJS)
-	$(AR) $(ARFLAGS) $@ $?
-	$(RANLIB) $@
-
-access.o: $(srcdir)/access.c
-chmod.o: $(srcdir)/chmod.c
-close.o: $(srcdir)/close.c
-fstat.o: $(srcdir)/fstat.c
-getpid.o: $(srcdir)/getpid.c
-gettime.o: $(srcdir)/gettime.c
-isatty.o: $(srcdir)/isatty.c
-kill.o: $(srcdir)/kill.c
-lseek.o: $(srcdir)/lseek.c
-open.o: $(srcdir)/open.c
-read.o: $(srcdir)/read.c
-sbrk.o: $(srcdir)/sbrk.c
-stat.o: $(srcdir)/stat.c
-time.o: $(srcdir)/time.c
-times.o: $(srcdir)/times.c
-unlink.o: $(srcdir)/unlink.c
-utime.o: $(srcdir)/utime.c
-write.o: $(srcdir)/write.c
-crt0.o: $(srcdir)/crt0.S
-crt0-16-002.o: $(srcdir)/crt0-16-002.S
-crt0-16-003.o: $(srcdir)/crt0-16-003.S
-crt0-64-001.o: $(srcdir)/crt0-64-001.S
-crt0-ms2.o: $(srcdir)/crt0-ms2.S
-
-trap.o:	$(srcdir)/trap.S
-
-install: $($(CPU)_INSTALL)
-	for c in $(CRT0); do \
-	  $(INSTALL_DATA) $$c $(tooldir)/lib${MULTISUBDIR}/$$c ; \
-	done; 
-	$(INSTALL_DATA) $(SIM_BSP) $(tooldir)/lib${MULTISUBDIR}/$(SIM_BSP)
-	for c in $(SCRIPTS); do \
-	  $(INSTALL_DATA) $(srcdir)/$$c $(tooldir)/lib/$$c ; \
-	done;
-
-clean mostlyclean:
-	rm -f *.o *.a
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.cache config.log config.status
-
-.PHONY: info dvi doc install-info clean-info
-info doc dvi:
-install-info:
-clean-info:
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/libgloss/mt/access.c b/libgloss/mt/access.c
deleted file mode 100644
index 8e08b3a..0000000
--- a/libgloss/mt/access.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* This is file ACCESS.C */
-/*
- * Copyright (C) 1993 DJ Delorie
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms is permitted
- * provided that the above copyright notice and following paragraph are
- * duplicated in all such forms.
- *
- * This file is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-int access(const char *fn, int flags)
-{
-  struct stat s;
-  if (stat(fn, &s))
-    return -1;
-  if (s.st_mode & S_IFDIR)
-    return 0;
-  if (flags & W_OK)
-  {
-    if (s.st_mode & S_IWRITE)
-      return 0;
-    return -1;
-  }
-  return 0;
-}
-	
diff --git a/libgloss/mt/chmod.c b/libgloss/mt/chmod.c
deleted file mode 100644
index 8200506..0000000
--- a/libgloss/mt/chmod.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-chmod (const char *path, mode_t mode)
-{
-  return TRAP0 (SYS_chmod, path, mode, 0);
-}
diff --git a/libgloss/mt/close.c b/libgloss/mt/close.c
deleted file mode 100644
index 02ee072..0000000
--- a/libgloss/mt/close.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-close (int file)
-{
-  return TRAP0 (SYS_close, file, 0, 0);
-}
diff --git a/libgloss/mt/configure b/libgloss/mt/configure
deleted file mode 100755
index 5d272c9..0000000
--- a/libgloss/mt/configure
+++ /dev/null
@@ -1,1204 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=crt0.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-ac_aux_dir=
-for ac_dir in $libgloss_topdir $srcdir/$libgloss_topdir; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $libgloss_topdir $srcdir/$libgloss_topdir" 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:680: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:744: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:774: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:823: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:847: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:884: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-host_makefile_frag_path=$host_makefile_frag
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-. ${libgloss_topdir}/config-ml.in
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/libgloss/mt/configure.in b/libgloss/mt/configure.in
deleted file mode 100644
index 877f6a0..0000000
--- a/libgloss/mt/configure.in
+++ /dev/null
@@ -1,90 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
-AC_INIT(crt0.S)
-
-if test "${enable_shared}" = "yes" ; then
-    echo "Shared libraries not supported for cross compiling, ignored"
-fi
-
-if test "$srcdir" = "." ; then
-  if test "${with_target_subdir}" != "." ; then
-    libgloss_topdir="${srcdir}/${with_multisrctop}../../.."
-  else
-    libgloss_topdir="${srcdir}/${with_multisrctop}../.."
-  fi
-else
-  libgloss_topdir="${srcdir}/../.."
-fi
-AC_CONFIG_AUX_DIR($libgloss_topdir)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AC_OUTPUT(Makefile,
-. ${libgloss_topdir}/config-ml.in,
-srcdir=${srcdir}
-target=${target}
-ac_configure_args="${ac_configure_args} --enable-multilib"
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${libgloss_topdir}
-)
diff --git a/libgloss/mt/crt0-16-002.S b/libgloss/mt/crt0-16-002.S
deleted file mode 100644
index ac2727e..0000000
--- a/libgloss/mt/crt0-16-002.S
+++ /dev/null
@@ -1,111 +0,0 @@
-; crt0_2.s - Startup code for the mrisc1. This code initializes the C
-;              run-time model.
-;
-; Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-;
-;  The authors hereby grant permission to use, copy, modify, distribute,
-;  and license this software and its documentation for any purpose, provided
-;  that existing copyright notices are retained in all copies and that this
-;  notice is included verbatim in any distributions. No written agreement,
-;  license, or royalty fee is required for any of the authorized uses.
-;  Modifications to this software may be copyrighted by their authors
-;  and need not follow the licensing terms described here, provided that
-;  the new terms are clearly indicated on the first page of each file where
-;  they apply.
-;
-
-	; Create a label for the start of the eh_frame section.
-	.section .eh_frame
-__eh_frame_begin:
-
-	.text
-	.global	_start
-_start:
-	;; Initialize the stack pointer
-	ldui	sp, #%hi16(__stack)
-	addui	sp, sp, #%lo16(__stack)
-	or	fp, sp, sp
-	;; Zero the bss space
-	ldui	r9, #%hi16(__bss_start)
-	addui	r9, r9, #%lo16(__bss_start)
-	ldui	r10, #%hi16(__bss_end)
-	addui	r10, r10, #%lo16(__bss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext1
-	or	r0, r0, r0
-.Lcpy0:	
-	stw	r0, r9, #0
-	addi	r9, r9, #4
-	or	r0, r0, r0	; nop
-	brle	r9, r10, .Lcpy0
-	or	r0, r0, r0	; nop
-
-.Lnext1:
-	;; Copy data from ROM to Frame Buffer (on-chip memory)
-	ldui	r9, #%hi16(_fbdata_start)
-	ori	r9, r9, #%lo16(_fbdata_start)
-	ldui	r10, #%hi16(_fbdata_end)
-	ori	r10, r10, #%lo16(_fbdata_end)
-	ldui	r11, #%hi16(_fbdata_vma)
-	brle	r10, r9, .Lnext2
-	ori	r11, r11, #%lo16(_fbdata_vma)
-.Lcpy1:
-	ldw	r5, r9, #$0
-	addi	r9, r9, #$4
-	stw	r5, r11, #$0
-	brlt	r9, r10, .Lcpy1
-	addi	r11, r11, #$4
-
-.Lnext2:
-	;; Zero the frame buffer bss section
-        ldui    r9, #%hi16(_fbbss_start)
-        ori     r9, r9, #%lo16(_fbbss_start)
-        ldui    r10, #%hi16(_fbbss_end)
-        ori     r10, r10, #%lo16(_fbbss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext3
-	or	r0, r0, r0
-.Lcpy2:
-        stw     r0, r9, #$0
-        addi    r9, r9, #$4
-        or      r0, r0, r0
-        brle    r9, r10, .Lcpy2
-        or      r0, r0, r0
-
-.Lnext3:
-	;; Call global and static constructors
-	ldui	r10, #%hi16(_init)
-	ori	r10, r10, #%lo16(_init)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Call main
-	ldui	r10, #%hi16(main)
-	ori	r10, r10, #%lo16(main)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; DJK - Added 12Nov01. Pass main's return value to exit.
-	or	r1, r11, r0
-
-	;; Jump to exit
-	ldui	r10, #%hi16(exit)
-	ori	r10, r10, #%lo16(exit)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Exit does not return, however, this code is to catch an
-	;;   error if it does. Set the processor into sleep mode.
-	ori	r1, r0, #$1
-	stw	r1, r0, #%lo16(_DEBUG_HALT_REG)
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-.Lend:
-	jmp .Lend
-	or	r0, r0, r0
diff --git a/libgloss/mt/crt0-16-003.S b/libgloss/mt/crt0-16-003.S
deleted file mode 100644
index bd88bcc..0000000
--- a/libgloss/mt/crt0-16-003.S
+++ /dev/null
@@ -1,112 +0,0 @@
-; crt0.s - Startup code for the mrisc1. This code initializes the C
-;              run-time model.
-;
-;
-; Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-;
-;  The authors hereby grant permission to use, copy, modify, distribute,
-;  and license this software and its documentation for any purpose, provided
-;  that existing copyright notices are retained in all copies and that this
-;  notice is included verbatim in any distributions. No written agreement,
-;  license, or royalty fee is required for any of the authorized uses.
-;  Modifications to this software may be copyrighted by their authors
-;  and need not follow the licensing terms described here, provided that
-;  the new terms are clearly indicated on the first page of each file where
-;  they apply.
-;
-
-	; Create a label for the start of the eh_frame section.
-	.section .eh_frame
-__eh_frame_begin:
-
-	.text
-	.global	_start
-_start:
-	;; Initialize the stack pointer
-	ldui	sp, #%hi16(__stack)
-	addui	sp, sp, #%lo16(__stack)
-	or	fp, sp, sp
-	;; Zero the bss space
-	ldui	r9, #%hi16(__bss_start)
-	addui	r9, r9, #%lo16(__bss_start)
-	ldui	r10, #%hi16(__bss_end)
-	addui	r10, r10, #%lo16(__bss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext1
-	or	r0, r0, r0
-.Lcpy0:	
-	stw	r0, r9, #0
-	addi	r9, r9, #4
-	or	r0, r0, r0	; nop
-	brle	r9, r10, .Lcpy0
-	or	r0, r0, r0	; nop
-
-.Lnext1:
-	;; Copy data from ROM to Frame Buffer (on-chip memory)
-	ldui	r9, #%hi16(_fbdata_start)
-	ori	r9, r9, #%lo16(_fbdata_start)
-	ldui	r10, #%hi16(_fbdata_end)
-	ori	r10, r10, #%lo16(_fbdata_end)
-	ldui	r11, #%hi16(_fbdata_vma)
-	brle	r10, r9, .Lnext2
-	ori	r11, r11, #%lo16(_fbdata_vma)
-.Lcpy1:
-	ldw	r5, r9, #$0
-	addi	r9, r9, #$4
-	stw	r5, r11, #$0
-	brlt	r9, r10, .Lcpy1
-	addi	r11, r11, #$4
-
-.Lnext2:
-	;; Zero the frame buffer bss section
-        ldui    r9, #%hi16(_fbbss_start)
-        ori     r9, r9, #%lo16(_fbbss_start)
-        ldui    r10, #%hi16(_fbbss_end)
-        ori     r10, r10, #%lo16(_fbbss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext3
-	or	r0, r0, r0
-.Lcpy2:
-        stw     r0, r9, #$0
-        addi    r9, r9, #$4
-        or      r0, r0, r0
-        brle    r9, r10, .Lcpy2
-        or      r0, r0, r0
-
-.Lnext3:
-	;; Call global and static constructors
-	ldui	r10, #%hi16(_init)
-	ori	r10, r10, #%lo16(_init)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Call main
-	ldui	r10, #%hi16(main)
-	ori	r10, r10, #%lo16(main)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; DJK - Added 12Nov01. Pass main's return value to exit.
-	or	r1, r11, r0
-
-	;; Jump to exit
-	ldui	r10, #%hi16(exit)
-	ori	r10, r10, #%lo16(exit)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Exit does not return, however, this code is to catch an
-	;;   error if it does. Set the processor into sleep mode.
-	ori	r1, r0, #$1
-	stw	r1, r0, #%lo16(_DEBUG_HALT_REG)
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-.Lend:
-	jmp .Lend
-	or	r0, r0, r0
diff --git a/libgloss/mt/crt0-64-001.S b/libgloss/mt/crt0-64-001.S
deleted file mode 100644
index b78e780..0000000
--- a/libgloss/mt/crt0-64-001.S
+++ /dev/null
@@ -1,144 +0,0 @@
-; crt0_2.s - Startup code for the mrisc1. This code initializes the C
-;              run-time model.
-;
-; 12Nov01 (DJK) - The return code from main was not being passed to exit().
-;                   Now it is passed as a parameter in R1.
-;
-; 10Sep01 (DJK) - The function exit() does not return. However, in the
-;                   the case of device error (if the halt bit does not
-;                   function properly, for instance), then a catch loop
-;                   has been added.
-;
-;
-; Copyright 2001, 2002, 2003, 2004 Morpho Technologies, Inc.
-;
-
-	; Create a label for the start of the eh_frame section.
-	.section .eh_frame
-__eh_frame_begin:
-
-	.equ	HALT_REG, 0x300
-	.section .text
-	.global	_start
-_start:
-	;; Initialize the stack pointer
-	ldui	sp, #%hi16(__stack)
-	addui	sp, sp, #%lo16(__stack)
-	or	fp, sp, sp
-
-	;; Copy data from ROM to Frame Buffer (on-chip memory)
-	ldui	r9, #%hi16(_fbdata_start)
-	ori	r9, r9, #%lo16(_fbdata_start)
-	ldui	r10, #%hi16(_fbdata_end)
-	ori	r10, r10, #%lo16(_fbdata_end)
-	ldui	r11, #%hi16(__FRAME_BUFFER_START)
-	brle	r10, r9, .Lnext1
-	ori	r11, r11, #%lo16(__FRAME_BUFFER_START)
-.Lcpy0:
-	ldw	r5, r9, #$0
-	addi	r9, r9, #$4
-	stw	r5, r11, #$0
-	brlt	r9, r10, .Lcpy0
-	addi	r11, r11, #$4
-
-.Lnext1:
-	;; Copy data from ROM to External Memory (off-chip memory)
-	ldui	r9, #%hi16(_extdata_start)
-	ori	r9, r9, #%lo16(_extdata_start)
-	ldui	r10, #%hi16(_extdata_end)
-	ori	r10, r10, #%lo16(_extdata_end)
-	ldui	r11, #%hi16(__EXTERNAL_MEMORY_START)
-	brle	r10, r9, .Lnext2
-	ori	r11, r11, #%lo16(__EXTERNAL_MEMORY_START)
-.Lcpy1:
-	ldw	r5, r9, #$0
-	addi	r9, r9, #$4
-	stw	r5, r11, #$0
-	brlt	r9, r10, .Lcpy1
-	addi	r11, r11, #$4
-
-
-.Lnext2:
-	;; Zero the bss space
-	ldui	r9, #%hi16(__bss_start)
-	addui	r9, r9, #%lo16(__bss_start)
-	ldui	r10, #%hi16(__bss_end)
-	addui	r10, r10, #%lo16(__bss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext3
-	or	r0, r0, r0
-.Lcpy2:	
-	stw	r0, r9, #0
-	addi	r9, r9, #4
-	or	r0, r0, r0	; nop
-	brle	r9, r10, .Lcpy2
-	or	r0, r0, r0	; nop
-
-.Lnext3:
-	;; Zero the external memory bss section
-        ldui    r9, #%hi16(_extbss_start)
-        ori     r9, r9, #%lo16(_extbss_start)
-        ldui    r10, #%hi16(_extbss_end)
-        ori     r10, r10, #%lo16(_extbss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext4
-	or	r0, r0, r0
-.Lcpy3:
-        stw     r0, r9, #$0
-        addi    r9, r9, #$4
-        or      r0, r0, r0
-        brle    r9, r10, .Lcpy3
-        or      r0, r0, r0
-
-.Lnext4:
-	;; Call global and static constructors
-	ldui	r10, #%hi16(_init)
-	ori	r10, r10, #%lo16(_init)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;;  Setup destructors to be called from exit.
-	;;  (Just in case main never returns....)
-	ldui	r10, #%hi16(atexit)
-	ori	r10, r10, #%lo16(atexit)
-	ldui	r1, #%hi16(_fini)
-	ori	r1, r1, #%lo16(_fini)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;;  Initialise argc, argv and envp to empty
-	addi	r1, r0, #0
-	addi	r2, r0, #0
-	addi	r3, r0, #0
-
-	;; Call main
-	ldui	r10, #%hi16(main)
-	ori	r10, r10, #%lo16(main)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; DJK - Added 12Nov01. Pass main's return value to exit.
-	or	r1, r11, r0
-
-	;; Jump to exit
-	ldui	r10, #%hi16(exit)
-	ori	r10, r10, #%lo16(exit)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Exit does not return, however, this code is to catch an
-	;;   error if it does. Set the processor into sleep mode.
-	ori	r1, r0, #$1
-	stw	r1, r0, #HALT_REG
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-.Lend:
-	jmp .Lend
-	or	r0, r0, r0
diff --git a/libgloss/mt/crt0-ms2.S b/libgloss/mt/crt0-ms2.S
deleted file mode 100644
index 2efaebd..0000000
--- a/libgloss/mt/crt0-ms2.S
+++ /dev/null
@@ -1,121 +0,0 @@
-; crt0.s - Startup code for the ms2. This code initializes the C
-;              run-time model.
-;
-;
-; Copyright 2001, 2002, 2003, 2004 Morpho Technologies
-;
-
-	; Create a label for the start of the eh_frame section.
-	.section .eh_frame
-__eh_frame_begin:
-
-	.text
-	.global	_start
-_start:
-	;; Initialize the stack pointer
-	ldui	sp, #%hi16(__stack)
-	addui	sp, sp, #%lo16(__stack)
-	or	fp, sp, sp
-	;; Zero the bss space
-	ldui	r9, #%hi16(__bss_start)
-	addui	r9, r9, #%lo16(__bss_start)
-	ldui	r10, #%hi16(__bss_end)
-	addui	r10, r10, #%lo16(__bss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext1
-	or	r0, r0, r0
-.Lcpy0:	
-	stw	r0, r9, #0
-	addi	r9, r9, #4
-	or	r0, r0, r0	; nop
-	brle	r9, r10, .Lcpy0
-	or	r0, r0, r0	; nop
-
-.Lnext1:
-	;; Copy data from ROM to Frame Buffer (on-chip memory)
-	ldui	r9, #%hi16(_fbdata_start)
-	ori	r9, r9, #%lo16(_fbdata_start)
-	ldui	r10, #%hi16(_fbdata_end)
-	ori	r10, r10, #%lo16(_fbdata_end)
-	ldui	r11, #%hi16(_fbdata_vma)
-	brle	r10, r9, .Lnext2
-	ori	r11, r11, #%lo16(_fbdata_vma)
-.Lcpy1:
-	ldw	r5, r9, #$0
-	addi	r9, r9, #$4
-	stw	r5, r11, #$0
-	brlt	r9, r10, .Lcpy1
-	addi	r11, r11, #$4
-
-.Lnext2:
-	;; Zero the frame buffer bss section
-        ldui    r9, #%hi16(_fbbss_start)
-        ori     r9, r9, #%lo16(_fbbss_start)
-        ldui    r10, #%hi16(_fbbss_end)
-        ori     r10, r10, #%lo16(_fbbss_end)
-	or	r0, r0, r0
-	brle	r10, r9, .Lnext3
-	or	r0, r0, r0
-.Lcpy2:
-        stw     r0, r9, #$0
-        addi    r9, r9, #$4
-        or      r0, r0, r0
-        brle    r9, r10, .Lcpy2
-        or      r0, r0, r0
-
-.Lnext3:
-	;; Copy data from ROM to SRAM (another on-chip memory)
-	ldui	r9, #%hi16(_sram_data_start)
-	ori	r9, r9, #%lo16(_sram_data_start)
-	ldui	r10, #%hi16(_sram_data_end)
-	ori	r10, r10, #%lo16(_sram_data_end)
-	ldui	r11, #%hi16(_sram_data_vma)
-	brle	r10, r9, .Lnext4
-	ori	r11, r11, #%lo16(_sram_data_vma)
-.Lcpy3:
-	ldw	r5, r9, #$0
-	addi	r9, r9, #$4
-	stw	r5, r11, #$0
-	brlt	r9, r10, .Lcpy3
-	addi	r11, r11, #$4
-
-.Lnext4:
-	;; Call global and static constructors
-	ldui	r10, #%hi16(_init)
-	ori	r10, r10, #%lo16(_init)
-	or	r0, r0, r0	; nop
-	or	r0, r0, r0	; nop, added 06Sep05
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Call main
-	ldui	r10, #%hi16(main)
-	ori	r10, r10, #%lo16(main)
-	or	r0, r0, r0	; nop
-	or	r0, r0, r0	; nop, added 06Sep05
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; DJK - Added 12Nov01. Pass main's return value to exit.
-	or	r1, r11, r0
-
-	;; Jump to exit
-	ldui	r10, #%hi16(exit)
-	ori	r10, r10, #%lo16(exit)
-	or	r0, r0, r0	; nop
-	or	r0, r0, r0	; nop, added 06Sep05
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Exit does not return, however, this code is to catch an
-	;;   error if it does. Set the processor into sleep mode.
-	ori	r1, r0, #$1
-	stw	r1, r0, #%lo16(_DEBUG_HALT_REG)
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-.Lend:
-	jmp .Lend
-	or	r0, r0, r0
diff --git a/libgloss/mt/crt0.S b/libgloss/mt/crt0.S
deleted file mode 100644
index ba5249e..0000000
--- a/libgloss/mt/crt0.S
+++ /dev/null
@@ -1,63 +0,0 @@
-# Startup Code for the Morpho mt
-
-# Create a label for the start of the eh_frame section.
-	.section .eh_frame
-__eh_frame_begin:
-
-	.section .text
-	.global	_start
-_start:
-	
-	;; Initialise the stack pointer
-	ldui	sp, #%hi16(__stack)
-	addui	sp, sp, #%lo16(__stack)
-	or	fp, sp, sp
-
-	;; Zero the data space
-	ldui	r9, #%hi16(_edata)
-	addui	r9, r9, #%lo16(_edata)
-	ldui	r10, #%hi16(_end)
-	addui	r10, r10, #%lo16(_end)
-	addi	r5,  r0, #0
-
-.L0:	
-	stw	r5, r9, #0
-	addi	r9, r9, #4
-	or	r0, r0, r0	; nop
-	brle	r9, r10, .L0
-	or	r0, r0, r0	; nop
-
-	;; Call global and static constructors
-	ldui	r10, #%hi16(_init)
-	addui	r10, r10, #%lo16(_init)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-	;;  Setup destructors to be called from exit.
-	;;  (Just in case main never returns....)
-	ldui	r10, #%hi16(atexit)
-	addui	r10, r10, #%lo16(atexit)
-	ldui	r1, #%hi16(_fini)
-	addui	r1, r1, #%lo16(_fini)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;;  Initialise argc, argv and envp to empty
-	addi	r1, r0, #0
-	addi	r2, r0, #0
-	addi	r3, r0, #0
-
-	;; Call main
-	ldui	r10, #%hi16(main)
-	addui	r10, r10, #%lo16(main)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
-
-	;; Jump to exit
-	ldui	r10, #%hi16(exit)
-	addui	r10, r10, #%lo16(exit)
-	or	r0, r0, r0	; nop
-	jal	r14, r10
-	or	r0, r0, r0	; nop
diff --git a/libgloss/mt/exit-16-002.c b/libgloss/mt/exit-16-002.c
deleted file mode 100644
index ba048d9..0000000
--- a/libgloss/mt/exit-16-002.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-
-void _exit (n)
-{
-  /* Set bit #0 in the _DEBUG_HALT_REG to trigger program exit to
-     the simulator. (The simulator will return a SIGQUIT signal.)  */
-  asm("ori r1, r0, #$1\n");
-  asm("stw r1, r0, #$fffff300\n");
-}
diff --git a/libgloss/mt/exit-16-003.c b/libgloss/mt/exit-16-003.c
deleted file mode 100644
index ba048d9..0000000
--- a/libgloss/mt/exit-16-003.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-
-void _exit (n)
-{
-  /* Set bit #0 in the _DEBUG_HALT_REG to trigger program exit to
-     the simulator. (The simulator will return a SIGQUIT signal.)  */
-  asm("ori r1, r0, #$1\n");
-  asm("stw r1, r0, #$fffff300\n");
-}
diff --git a/libgloss/mt/exit-64-001.c b/libgloss/mt/exit-64-001.c
deleted file mode 100644
index 97c7b8c..0000000
--- a/libgloss/mt/exit-64-001.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-
-void _exit (n)
-{
-  /* Set bit #0 in the _DEBUG_HALT_REG to trigger program exit to
-     the simulator. (The simulator will return a SIGQUIT signal.)  */
-  asm("ori r1, r0, #$1\n");
-  asm("stw r1, r0, #$300\n");
-}
diff --git a/libgloss/mt/exit-ms2.c b/libgloss/mt/exit-ms2.c
deleted file mode 100644
index 93a3f85..0000000
--- a/libgloss/mt/exit-ms2.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-
-void _exit (n)
-{
-  // Set bit #0 in the _DEBUG_HALT_REG to trigger program exit to
-  // the simulator. (The simulator will return a SIGQUIT signal.)
-  asm("ori r1, r0, #$1\n");
-  asm("stw r1, r0, #$fffff300\n");
-}  // exit
diff --git a/libgloss/mt/exit.c b/libgloss/mt/exit.c
deleted file mode 100644
index cc7983b..0000000
--- a/libgloss/mt/exit.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-void _exit (n)
-{
-  TRAP0 (SYS_exit, n, 0, 0);
-}
diff --git a/libgloss/mt/fstat.c b/libgloss/mt/fstat.c
deleted file mode 100644
index 1d7d2dc..0000000
--- a/libgloss/mt/fstat.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-fstat (int file,
-	struct stat *st)
-{
-  st->st_mode = S_IFCHR;
-  st->st_blksize = 4096;
-  return 0;
-}
diff --git a/libgloss/mt/getpid.c b/libgloss/mt/getpid.c
deleted file mode 100644
index 8d686b8..0000000
--- a/libgloss/mt/getpid.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-getpid (n)
-{
-  return 1;
-}
diff --git a/libgloss/mt/gettime.c b/libgloss/mt/gettime.c
deleted file mode 100644
index 1a04267..0000000
--- a/libgloss/mt/gettime.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-#include "sys/time.h"
-
-
-int
-_gettimeofday (struct timeval *tp, void *tzp)
-{
-  return TRAP0 (SYS_gettimeofday, tp, tzp, 0);
-}
diff --git a/libgloss/mt/isatty.c b/libgloss/mt/isatty.c
deleted file mode 100644
index 0930a53..0000000
--- a/libgloss/mt/isatty.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-isatty (fd)
-     int fd;
-{
-  return 1;
-}
diff --git a/libgloss/mt/kill.c b/libgloss/mt/kill.c
deleted file mode 100644
index e8ea437..0000000
--- a/libgloss/mt/kill.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-kill (n, m)
-{
-  return TRAP0 (SYS_exit, 0xdead, 0, 0);
-}
-
diff --git a/libgloss/mt/lseek.c b/libgloss/mt/lseek.c
deleted file mode 100644
index 7839091..0000000
--- a/libgloss/mt/lseek.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/unistd.h>
-#include "trap.h"
-
-
-off_t
-lseek (int file,
-	off_t ptr,
-	int dir)
-{
-  return TRAP0 (SYS_lseek, file, ptr, dir);
-}
diff --git a/libgloss/mt/ms2.ld b/libgloss/mt/ms2.ld
deleted file mode 100644
index 3dac307..0000000
--- a/libgloss/mt/ms2.ld
+++ /dev/null
@@ -1,271 +0,0 @@
-OUTPUT_FORMAT("elf32-mt", "elf32-mt", "elf32-mt")
-OUTPUT_ARCH(mt)
-ENTRY(__boot_start)
-
-/* Do we need any of these for elf?
-   __DYNAMIC = 0;    */
-MEMORY
-{
-  ram (rwx) : ORIGIN = 0x0, LENGTH = 16M
-  sram (wx) : ORIGIN = 0xfef00000, LENGTH = 64K
-  frame-buffer (w) : ORIGIN = 0xff000000, LENGTH = 80K
-  dma-ram (w) : ORIGIN = 0x1000000, LENGTH = 32M
-  ports (w) : ORIGIN = 0xfffff000, LENGTH = 4K
-}
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = 0x0;
-  PROVIDE(__executable_start = 0x0);
-  .interp         : { *(.interp) }
-  .hash           : { *(.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rel.init       : { *(.rel.init) }
-  .rela.init      : { *(.rela.init) }
-  .rel.text       : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
-  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
-  .rel.fini       : { *(.rel.fini) }
-  .rela.fini      : { *(.rela.fini) }
-  .rel.rodata     : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
-  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
-  .rel.data.rel.ro  : { *(.rel.data.rel.ro*) }
-  .rela.data.rel.ro : { *(.rela.data.rel.ro*) }
-  .rel.data       : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
-  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
-  .rel.tdata      : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
-  .rela.tdata     : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
-  .rel.tbss       : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
-  .rela.tbss      : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
-  .rel.ctors      : { *(.rel.ctors) }
-  .rela.ctors     : { *(.rela.ctors) }
-  .rel.dtors      : { *(.rel.dtors) }
-  .rela.dtors     : { *(.rela.dtors) }
-  .rel.got        : { *(.rel.got) }
-  .rela.got       : { *(.rela.got) }
-  .rel.sdata      : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
-  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
-  .rel.sbss       : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) }
-  .rel.sdata2     : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
-  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
-  .rel.sbss2      : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
-  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
-  .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
-  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-  .rel.plt        : { *(.rel.plt) }
-  .rela.plt       : { *(.rela.plt) }
-
-  .startup        : { *startup-16-003.o(.startup) } >ram =0
-  . = 0x40;
-
-  .init           : { KEEP (*(.init)) } >ram =0
-  .plt            : { *(.plt) } >ram
-  .text           :
-  {
-    *startup-16-004.o(.text);
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    KEEP (*(.text.*personality*))
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } >ram =0
-  .fini           : { KEEP (*(.fini)) } >ram =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) } >ram
-  .rodata1        : { *(.rodata1) } >ram
-  .sdata2         : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } >ram
-  .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } >ram
-  .eh_frame_hdr   : { *(.eh_frame_hdr) } >ram
-  .eh_frame       : ONLY_IF_RO { KEEP (*(.eh_frame)) } >ram
-  .gcc_except_table : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(256) + (. & (256 - 1));
-  /* Exception handling  */
-  .eh_frame       : ONLY_IF_RW { KEEP (*(.eh_frame)) } >ram
-  .gcc_except_table   : ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } >ram
-  /* Thread Local Storage sections  */
-  .tdata          : { *(.tdata .tdata.* .gnu.linkonce.td.*) } >ram
-  .tbss           : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } >ram
-  /* Ensure the __preinit_array_start label is properly aligned.  We
-     could instead move the label definition inside the section, but
-     the linker would then create the section even if it turns out to
-     be empty, which isn't pretty.  */
-  . = ALIGN(32 / 8);
-  PROVIDE (__preinit_array_start = .);
-  .preinit_array  : { *(.preinit_array) } >ram
-  PROVIDE (__preinit_array_end = .);
-  PROVIDE (__init_array_start = .);
-  .init_array     : { *(.init_array) } >ram
-  PROVIDE (__init_array_end = .);
-  PROVIDE (__fini_array_start = .);
-  .fini_array     : { *(.fini_array) } >ram
-  PROVIDE (__fini_array_end = .);
-  .ctors          :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } >ram
-  .dtors          :
-  {
-    KEEP (*crtbegin*.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } >ram
-  .jcr            : { KEEP (*(.jcr)) } >ram
-  .data.rel.ro    : { *(.data.rel.ro.local) *(.data.rel.ro*) } >ram
-  .dynamic        : { *(.dynamic) } >ram
-
-  /* DJK - Re-align the data section from the read-only section. */
-  . = ALIGN(16) + (. & (16 - 1));
-  PROVIDE (_data = .);
-  .data           :
-  {
-    *(.data .data.* .gnu.linkonce.d.*)
-    KEEP (*(.gnu.linkonce.d.*personality*))
-    SORT(CONSTRUCTORS)
-  } >ram
-  .data1          : { *(.data1) } >ram
-  .got            : { *(.got.plt) *(.got) } >ram
-
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata          : { *(.sdata .sdata.* .gnu.linkonce.s.*) } >ram
-  _edata = .;
-  PROVIDE ( edata = . );
-  .sbss           :
-  {
-    PROVIDE (__sbss_start = .);
-    PROVIDE (___sbss_start = .);
-    *(.dynsbss)
-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
-    *(.scommon)
-    PROVIDE (__sbss_end = .);
-    PROVIDE (___sbss_end = .);
-  } >ram
-  .bss            :
-  {
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-    /* Align here to ensure that the .bss section occupies space up to
-       _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-    . = ALIGN(32 / 8);
-  } >ram
-  . = ALIGN(32 / 8);
-  __bss_start = ADDR ( .sbss ) ;
-  __bss_end = __bss_start + SIZEOF ( .sbss ) + SIZEOF ( .bss ) - 4 ;
-  _end = .;
-  PROVIDE (end = .);
-
-  /* DJK - Initialized frame buffer data is copied from RAM to FB. */
-  .auxbss         : AT (ADDR(.bss) + SIZEOF(.bss)) { *(.auxbss) } >frame-buffer
-  .auxdata        : AT (LOADADDR(.auxbss) + SIZEOF(.auxbss))
-  {
-    *(.auxdata.bank0)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank1)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank2)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank3)
-    . = ALIGN(0x4000);
-    *(.auxdata.bank4)
-    *(.auxdata)
-  } >frame-buffer
-
-  _fbbss_start = ADDR ( .auxbss );
-  _fbbss_end = _fbbss_start + SIZEOF ( .auxbss ) - 4;
-  _fbdata_start = LOADADDR ( .auxdata );
-  _fbdata_end = _fbdata_start + SIZEOF ( .auxdata ) ;
-  _fbdata_vma = ADDR ( .auxdata );
-
-  PROVIDE (__FRAME_BUFFER_START = ADDR(.auxbss) );
-  PROVIDE (__FRAME_BUFFER_SIZE = 0x14000);
-  PROVIDE (__FRAME_BUFFER_END = __FRAME_BUFFER_START + __FRAME_BUFFER_SIZE);
-
-  /* For now, locate data ahead of code in onchip sram/memory. */
-  .sram           : AT (LOADADDR(.auxdata) + SIZEOF(.auxdata))
-  {
-    *(.sram.data)
-    . = ALIGN(4) ; /* Make sure that instructions are aligned... */
-    *(.sram.text)
-  } >sram
-  
-  _sram_data_start = LOADADDR ( .sram );
-  _sram_data_end = _sram_data_start + SIZEOF ( .sram ) ;
-  _sram_data_vma = ADDR ( .sram );
-
-  .dma            : { _dma_start = .; *(.dma) _dma_end = .; } >dma-ram
-  .internal_io (NOLOAD) : { *(.internal_io) } >ports
-
-  /* Stabs debugging sections.  */
-  .stab            0 : { *(.stab) }
-  .stabstr         0 : { *(.stabstr) }
-  .stab.excl       0 : { *(.stab.excl) }
-  .stab.exclstr    0 : { *(.stab.exclstr) }
-  .stab.index      0 : { *(.stab.index) }
-  .stab.indexstr   0 : { *(.stab.indexstr) }
-  .comment         0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug           0 : { *(.debug) }
-  .line            0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo   0 : { *(.debug_srcinfo) }
-  .debug_sfnames   0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges   0 : { *(.debug_aranges) }
-  .debug_pubnames  0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info      0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev    0 : { *(.debug_abbrev) }
-  .debug_line      0 : { *(.debug_line) }
-  .debug_frame     0 : { *(.debug_frame) }
-  .debug_str       0 : { *(.debug_str) }
-  .debug_loc       0 : { *(.debug_loc) }
-  .debug_macinfo   0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-
-  /* In a multi-core environment, each core is given its own stack space
-     equal to __stack_size, growing downwards. */
-  PROVIDE (__stack = 0x97ff0);
-  PROVIDE (__stack_size = 0x800);
-
-  .stack (DEFINED(__stack) ? __stack : 0x007ffff0) :
-  {
-     __stack = .;
-    *(.stack)
-    LONG(0xdeaddead)
-  }
-  /DISCARD/ : { *(.note.GNU-stack) }
-}
diff --git a/libgloss/mt/open.c b/libgloss/mt/open.c
deleted file mode 100644
index d727bdd..0000000
--- a/libgloss/mt/open.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-open (const char *path, int flags, int mode)
-{
-  return TRAP0 (SYS_open, path, flags, mode);
-}
diff --git a/libgloss/mt/read.c b/libgloss/mt/read.c
deleted file mode 100644
index e7f37fa..0000000
--- a/libgloss/mt/read.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-read (int file,
-       char *ptr,
-       size_t len)
-{
-  return TRAP0 (SYS_read, file, ptr, len);
-}
diff --git a/libgloss/mt/sbrk.c b/libgloss/mt/sbrk.c
deleted file mode 100644
index 1f959c0..0000000
--- a/libgloss/mt/sbrk.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-caddr_t
-sbrk (size_t incr)
-{
-  extern char end;		/* Defined by the linker */
-  static char *heap_end;
-  char *prev_heap_end;
-
-  char *sp = (char *) &sp;
-
-  if (heap_end == 0)
-    {
-      heap_end = &end;
-    }
-  prev_heap_end = heap_end;
-  heap_end += incr;
-
-  return (caddr_t) prev_heap_end;
-}
diff --git a/libgloss/mt/startup-16-002.S b/libgloss/mt/startup-16-002.S
deleted file mode 100644
index d1732d6..0000000
--- a/libgloss/mt/startup-16-002.S
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
- * interrupt_vectors.s -- the interrupt handler jump table. 
- *
- *
- * There are a total of 32 interrupt vector possible, however, only
- *   11 of those are currently used (the others are reserved). The
- *   order of vectors is as follows:
- *
- *     1. Boot Vector. Vector for power-on/reset.
- *     2. Software Vector. Vector for handling the SI instruction (an
- *          explicit interrupt caused by software).
- *     3. Break Vector. Vector for handling the Break instruction.
- *     4. Device 0 Vector. Service vector for device zero. 
- *     5. Device 1 Vector. Service vector for device one. 
- *     6. Device 2 Vector. Service vector for device two. 
- *     7. Device 3 Vector. Service vector for device three. 
- *     8. Device 4 Vector. Service vector for device four. 
- *     9. Device 5 Vector. Service vector for device five. 
- *    10. Device 6 Vector. Service vector for device six. 
- *    11. Device 7 Vector. Service vector for device seven. 
- *
- *   The rest of the interrupt vectors are reserved for future use.
- *
- *
- * Each jump table entry consists of the following two instructions:
- *
- *   jmp Label		; Label as appropriate
- *   nop 		; implemented as or r0,r0,r0
- *
- *   The following labels are reserved for the vectors named above,
- *   respectively:
- *
- *     _BOOTIVEC, _SOFTIVEC, _BRKIVEC, _DEV0IVEC, _DEV1IVEC, _DEV2IVEC,
- *     _DEV3IVEC, _DEV4IVEC, _DEV5IVEC, _DEV6IVEC, _DEV7IVEC
- *
- *
- *
- * Copyright (c) 2001, 2002, 2003, 2004 Morpho Technologies
- *
- */
-
-	.section .startup, "a", @progbits
-	.global __boot_start
-__boot_start:
-_INTERRUPT_VECTOR_TABLE:
-	jmp	_BOOTIVEC		; Boot vector
-	or	r0, r0, r0
-	jmp	_SOFTIVEC		; Vector for SI instruction
-	or	r0,r0,r0
-	jmp	_BRKIVEC		; Vector for Break instruction
-	or	r0,r0,r0
-	; The illegal instruction trap is not implemented.
-_RESERVED1_IVEC:
-        jmp	_RESERVED1_IVEC		; Vector for illegal instruction
-        or	r0,r0,r0
-	jmp	_OVFIVEC		; Vector for overflow exception
-	or	r0,r0,r0
-_RESERVED2_IVEC:
-        jmp	_RESERVED2_IVEC
-        or	r0,r0,r0
-_RESERVED3_IVEC:
-        jmp	_RESERVED3_IVEC
-        or	r0,r0,r0
-_RESERVED4_IVEC:
-        jmp	_RESERVED4_IVEC
-        or	r0,r0,r0
-
-	.text
-
-	.equ SI_IOPORT_ADR, _DEBUG_SW_SYSREQ_REG
-	.equ SI_IOPORT_BIT, 0x1
-	.equ BRK_IOPORT_ADR, _DEBUG_BREAK_REG
-	.equ BRK_IOPORT_BIT, 0x1
-
-	.global _BOOTIVEC
-_BOOTIVEC:
-	; Initialize the interrupt controller's interrupt vector registers
-	ldui	r1, #%hi16(_IVEC_DEFAULT)
-	ori	r1, r1, #%lo16(_IVEC_DEFAULT)
-	stw	r1, r0, #%lo16(_DEV0_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV1_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV2_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV3_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV4_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV5_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV6_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV7_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV8_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV9_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV10_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV11_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV12_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV13_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV14_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV15_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV16_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV17_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV18_INTERRUPT_REG)
-
-	; Statically initialized data must be copied from ROM to RAM.
-	; This is done in the C run-time start-up code (crt0.o).
-
-	; Jump to the beginning of the application and enable interrupts.
-	jmp	_start
-	ei
-
-
-
-	; Handler for the SI instruction. To perform a system call, the
-	; C model uses a trapping mechanism which executes an SI instruction.
-	; The Morpho Technologies simulator simply performs a branch to
-	; this vector to simulate the SI instruction (this is as the hardware
-	; behaves). In order to trigger the simulator that a system call
-	; is needed a write into the I/O register at address $40005 to
-	; set bit #2 (0x4) is necessary.
-	;
-	; The above address has been changed to 0x00031C and the bit number
-	; is zero. (The manifest constants have been changed to reflect this.)
-	.global _SOFTIVEC
-_SOFTIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(SI_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(SI_IOPORT_ADR)
-	ori	r10, r0, #SI_IOPORT_BIT
-	stw	r10, r9, #$0
-	or	r0, r0, r0	; SYS_call is handled by simulator here...
-	ldw	r10, sp, #$0
-	or	r0, r0, r0
-	ldw	r9, sp, #$4
-	reti	r14
-	addi	sp, sp, #$8
-
-
-
-	; Handler for BREAK instruction. This handler triggers the simulator
-	; to send a SIGTRAP signal to gdb by writing to the I/O register at
-	; address $40005, setting bit #0 (0x1).
-	;
-	; The above address has been changed to 0x000304 and the bit number
-	; is zero. (The manifest constants have been changed to reflect this.)
-	.global _BRKIVEC
-_BRKIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(BRK_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(BRK_IOPORT_ADR)
-	ori	r10, r0, #BRK_IOPORT_BIT
-	stw	r10, r9, #$0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	ldw	r9, sp, #$4
-	reti	r15
-	addi	sp, sp, #$8
-
-
-	; The documentation is lacking in the specification of the Overflow
-	;   Exception generation. The address of the instruction causing the
-	;   overflow is placed into R15 and the overflow exception interrupt
-	;   is triggered. So, to continue execution, return to the address
-	;   of the next instruction (i.e., R15 + one instruction).
-_OVFIVEC:
-	addi    r15, r15, #$4
-	or      r0, r0, r0
-	reti    r15
-	or      r0, r0, r0
-
-
-	.global _IVEC_DEFAULT
-_IVEC_DEFAULT:
-	reti	r15
-	or	r0, r0, r0
-
-
-	.section .internal_io, "a", @nobits
-	.fill 256		; Fill the first page.
-
-	; This is the memory-mapped I/O region.
-
-	; Hardware Interrupt Registers
-	;.org 0xfff100
-	.global _DEV0_INTERRUPT_REG
-_DEV0_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV1_INTERRUPT_REG
-_DEV1_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV2_INTERRUPT_REG
-_DEV2_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV3_INTERRUPT_REG
-_DEV3_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV4_INTERRUPT_REG
-_DEV4_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV5_INTERRUPT_REG
-_DEV5_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV6_INTERRUPT_REG
-_DEV6_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV7_INTERRUPT_REG
-_DEV7_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV8_INTERRUPT_REG
-_DEV8_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV9_INTERRUPT_REG
-_DEV9_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV10_INTERRUPT_REG
-_DEV10_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV11_INTERRUPT_REG
-_DEV11_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV12_INTERRUPT_REG
-_DEV12_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV13_INTERRUPT_REG
-_DEV13_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV14_INTERRUPT_REG
-_DEV14_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV15_INTERRUPT_REG
-_DEV15_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV16_INTERRUPT_REG
-_DEV16_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV17_INTERRUPT_REG
-_DEV17_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV18_INTERRUPT_REG
-_DEV18_INTERRUPT_REG:
-	.word 0x00000000
-
-	; 128 bytes minus ten registers (four bytes per register)
-	.fill (128 - 19 * 4)
-
-	.global	_INTERRUPT_MASK_REG
-_INTERRUPT_MASK_REG:
-	.word 0x00000000
-
-	; 128 bytes minus one register (four bytes per register)
-	.fill (128 - 1 * 4)
-
-
-	;.org 0xfff200
-	; MorphoSys Decoder Registers
-	.global _MS_DEC_CIRC_BUFF_SEL_REG
-_MS_DEC_CIRC_BUFF_SEL_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_SKIP_FACTOR_REG
-_MS_DEC_SKIP_FACTOR_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_CUSTOM_PERM_REG
-_MS_DEC_CUSTOM_PERM_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_CTXT_BASE_REG
-_MS_DEC_CTXT_BASE_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_LOOKUP_TBL_REG
-_MS_DEC_LOOKUP_TBL_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF0_END_REG
-_MS_CIRC_BUFF0_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF0_SIZE_REG
-_MS_CIRC_BUFF0_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK0_END_REG
-_MS_DATA_BLK0_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK0_SIZE_REG
-_MS_DATA_BLK0_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF1_END_REG
-_MS_CIRC_BUFF1_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF1_SIZE_REG
-_MS_CIRC_BUFF1_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK1_END_REG
-_MS_DATA_BLK1_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK1_SIZE_REG
-_MS_DATA_BLK1_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF2_END_REG
-_MS_CIRC_BUFF2_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF2_SIZE_REG
-_MS_CIRC_BUFF2_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK2_END_REG
-_MS_DATA_BLK2_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK2_SIZE_REG
-_MS_DATA_BLK2_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF3_END_REG
-_MS_CIRC_BUFF3_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF3_SIZE_REG
-_MS_CIRC_BUFF3_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK3_END_REG
-_MS_DATA_BLK3_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK3_SIZE_REG
-_MS_DATA_BLK3_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF4_END_REG
-_MS_CIRC_BUFF4_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF4_SIZE_REG
-_MS_CIRC_BUFF4_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK4_END_REG
-_MS_DATA_BLK4_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK4_SIZE_REG
-_MS_DATA_BLK4_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF5_END_REG
-_MS_CIRC_BUFF5_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF5_SIZE_REG
-_MS_CIRC_BUFF5_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK5_END_REG
-_MS_DATA_BLK5_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK5_SIZE_REG
-_MS_DATA_BLK5_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF6_END_REG
-_MS_CIRC_BUFF6_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF6_SIZE_REG
-_MS_CIRC_BUFF6_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK6_END_REG
-_MS_DATA_BLK6_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK6_SIZE_REG
-_MS_DATA_BLK6_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF7_END_REG
-_MS_CIRC_BUFF7_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF7_SIZE_REG
-_MS_CIRC_BUFF7_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLK7_END_REG
-_MS_DATA_BLK7_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLK7_SIZE_REG
-_MS_DATA_BLK7_SIZE_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC0_REG
-_MS_DEC_AUTO_INC0_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC1_REG
-_MS_DEC_AUTO_INC1_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC2_REG
-_MS_DEC_AUTO_INC2_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC3_REG
-_MS_DEC_AUTO_INC3_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC4_REG
-_MS_DEC_AUTO_INC4_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC5_REG
-_MS_DEC_AUTO_INC5_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC6_REG
-_MS_DEC_AUTO_INC6_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_AUTO_INC7_REG
-_MS_DEC_AUTO_INC7_REG:
-	.word 0x00000000
-
-
-	; 256 bytes minus forty-five registers (four bytes per register)
-	.fill (256 - 45 * 4)
-
-
-
-	;.org 0xfff300
-	; Debug Registers
-	.global _DEBUG_HALT_REG
-_DEBUG_HALT_REG:
-	.word 0x00000000
-
-	.global _DEBUG_BREAK_REG
-_DEBUG_BREAK_REG:
-	.word 0x00000000
-
-	; There are five reserved registers.
-	.fill (5 * 4)
-
-        .global _DEBUG_SW_SYSREQ_REG
-_DEBUG_SW_SYSREQ_REG:
-        .word 0x00000000
-
-        ; 256 bytes minus eight registers (four bytes per register)
-        .fill (256 - 8 * 4)
-
-
-
-	;.org 0xfff400
-	; Sequence Generator Registers
-	.global _SEQ_GEN_CTRL_REG
-_SEQ_GEN_CTRL_REG:
-	.word 0x00000000
-
-	.global _SEQ_GEN_MASK_REGS
-_SEQ_GEN_MASK_REGS:
-	; The mask registers consume two pages (less one control register).
-	; 512 bytes minus one register (four bytes per register).
-	.fill (256 + 256 - 1 * 4)
-
-
-
-        ;.org 0xfff600
-	; Timer Registers
-        .global _TIMER0_VAL_REG
-_TIMER0_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER1_VAL_REG
-_TIMER1_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER2_VAL_REG
-_TIMER2_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER3_VAL_REG
-_TIMER3_VAL_REG:
-        .word 0x00000000
-
-	; 256 bytes minus four registers (four bytes per register)
-	.fill (256 - 4 * 4)
-
-
-
-	;.org 0xfff700
-	; Output Line Control Registers
-	.global _OUTPUT0_CTRL
-_OUTPUT0_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT1_CTRL
-_OUTPUT1_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT2_CTRL
-_OUTPUT2_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT3_CTRL
-_OUTPUT3_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT4_CTRL
-_OUTPUT4_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT5_CTRL
-_OUTPUT5_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT6_CTRL
-_OUTPUT6_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT7_CTRL
-_OUTPUT7_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT8_CTRL
-_OUTPUT8_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT9_CTRL
-_OUTPUT9_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT10_CTRL
-_OUTPUT10_CTRL:
-	.word 0x00000000
-
-	;; 128 bytes minus eleven registers (four bytes per register)
-	;.fill (128 - 11 * 4)
-
-	.global _INPUT0_CTRL
-_INPUT0_CTRL:
-	.word 0x00000000
-
-	;; 128 bytes minus one register (four bytes per register)
-	;.fill (128 - 1 * 4)
-	; 256 bytes minus twelve registers (four bytes per register)
-	.fill (256 - 12 * 4)
-
-
-
-	;.org 0xfff800
-	; IQ Buffer Registers
-	.global _IQ_BUFF_CTRL_REG
-_IQ_BUFF_CTRL_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_PARAMETER1_REG
-_IQ_BUFF_PARAMETER1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_DATA_SIZE1_REG
-_IQ_BUFF_DATA_SIZE1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_TRANSFER_SIZE1_REG
-_IQ_BUFF_TRANSFER_SIZE1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_FB_ADDR1_REG
-_IQ_BUFF_FB_ADDR1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_PARAMETER2_REG
-_IQ_BUFF_PARAMETER2_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_DATA_SIZE2_REG
-_IQ_BUFF_DATA_SIZE2_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_TRANSFER_SIZE2_REG
-_IQ_BUFF_TRANSFER_SIZE2_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_FB_ADDR2_REG
-_IQ_BUFF_FB_ADDR2_REG:
-	.word 0x00000000
-
-	; 256 bytes minus nine registers (four bytes per register)
-	.fill (256 - 9 * 4)
-
-
-	;.org 0xfff900
-	; Reserved memory-mapped space.
-	.fill (0x1000 - 0x900)
diff --git a/libgloss/mt/startup-16-003.S b/libgloss/mt/startup-16-003.S
deleted file mode 100644
index 9fe23b9..0000000
--- a/libgloss/mt/startup-16-003.S
+++ /dev/null
@@ -1,838 +0,0 @@
-/*
- * $Header$
- *
- * interrupt_vectors.s -- the interrupt handler jump table. 
- *
- *
- * There are a total of 32 interrupt vector possible, however, only
- *   11 of those are currently used (the others are reserved). The
- *   order of vectors is as follows:
- *
- *     1. Boot Vector. Vector for power-on/reset.
- *     2. Software Vector. Vector for handling the SI instruction (an
- *          explicit interrupt caused by software).
- *     3. Break Vector. Vector for handling the Break instruction.
- *     4. Device 0 Vector. Service vector for device zero. 
- *     5. Device 1 Vector. Service vector for device one. 
- *     6. Device 2 Vector. Service vector for device two. 
- *     7. Device 3 Vector. Service vector for device three. 
- *     8. Device 4 Vector. Service vector for device four. 
- *     9. Device 5 Vector. Service vector for device five. 
- *    10. Device 6 Vector. Service vector for device six. 
- *    11. Device 7 Vector. Service vector for device seven. 
- *
- *   The rest of the interrupt vectors are reserved for future use.
- *
- *
- * Each jump table entry consists of the following two instructions:
- *
- *   jmp Label		; Label as appropriate
- *   nop 		; implemented as or r0,r0,r0
- *
- *   The following labels are reserved for the vectors named above,
- *   respectively:
- *
- *     _BOOTIVEC, _SOFTIVEC, _BRKIVEC, _DEV0IVEC, _DEV1IVEC, _DEV2IVEC,
- *     _DEV3IVEC, _DEV4IVEC, _DEV5IVEC, _DEV6IVEC, _DEV7IVEC
- *
- *   09Jan04 (DJK) Modified internal I/O port definitions for the
- *                   MS1-16-003.
- *
- *   10Oct01 (DJK) The memory map is finalized and the first 4K of address
- *                   space is now reserved for memory-mapped I/O devices.
- *                   (There is over 2K unused, reserved space in this area.)
- *
- *   26Sep01 (DJK) The memory map is changed and the device interrupts are
- *                   now memory-mapped.
- *
- *
- *
- * Copyright (c) 2001, 2002, 2003, 2004 Morpho Technologies
- *
- */
-
-	.section .startup, "a", @progbits
-	.global __boot_start
-__boot_start:
-_INTERRUPT_VECTOR_TABLE:
-	jmp	_BOOTIVEC		; Boot vector
-	or	r0, r0, r0
-	jmp	_SOFTIVEC		; Vector for SI instruction
-	or	r0,r0,r0
-	jmp	_BRKIVEC		; Vector for Break instruction
-	or	r0,r0,r0
-	; The illegal instruction trap is not implemented.
-	;jmp	_ILLIVEC		; Vector for illegal instruction
-	or	r0,r0,r0
-	or	r0,r0,r0
-_RESERVED1_IVEC:
-        jmp	_RESERVED1_IVEC
-        or	r0,r0,r0
-_RESERVED2_IVEC:
-        jmp	_RESERVED2_IVEC
-        or	r0,r0,r0
-_RESERVED3_IVEC:
-        jmp	_RESERVED3_IVEC
-        or	r0,r0,r0
-_RESERVED4_IVEC:
-        jmp	_RESERVED4_IVEC
-        or	r0,r0,r0
-
-
-	.text
-
-	.equ SI_IOPORT_ADR, _DEBUG_SW_SYSREQ_REG
-	.equ SI_IOPORT_BIT, 0x1
-	.equ BRK_IOPORT_ADR, _DEBUG_BREAK_REG
-	.equ BRK_IOPORT_BIT, 0x1
-
-	.global _BOOTIVEC
-_BOOTIVEC:
-	; Initialize the interrupt controller's interrupt vector registers
-	ldui	r1, #%hi16(_IVEC_DEFAULT)
-	ori	r1, r1, #%lo16(_IVEC_DEFAULT)
-	stw	r1, r0, #%lo16(_DEV0_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV1_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV2_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV3_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV4_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV5_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV6_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV7_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV8_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV9_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV10_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV11_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV12_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV13_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV14_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV15_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV16_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV17_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV18_INTERRUPT_REG)
-
-	; Statically initialized data must be copied from ROM to RAM.
-	; This is done in the C run-time start-up code (crt0.o).
-
-	; Jump to the beginning of the application and enable interrupts.
-	jmp	_start
-	ei
-
-
-	; Handler for the SI instruction. To perform a system call, the
-	; C model uses a trapping mechanism which executes an SI instruction.
-	; The Morpho Technologies simulator simply performs a branch to
-	; this vector to simulate the SI instruction (this is as the hardware
-	; behaves). In order to trigger the simulator that a system call
-	; is needed a write into the I/O register at address $40005 to
-	; set bit #2 (0x4) is necessary.
-	;
-	; The above address has been changed to 0x00031C and the bit number
-	; is zero. (The manifest constants have been changed to reflect this.)
-	.global _SOFTIVEC
-_SOFTIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(SI_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(SI_IOPORT_ADR)
-	ori	r10, r0, #SI_IOPORT_BIT
-	stw	r10, r9, #$0
-	; SYS_call is handled by simulator here...
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	or	r0, r0, r0
-	ldw	r9, sp, #$4
-	reti	r14
-	addi	sp, sp, #$8
-
-
-
-	.global _BRKIVEC
-_BRKIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(BRK_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(BRK_IOPORT_ADR)
-	ori	r10, r0, #BRK_IOPORT_BIT
-	stw	r10, r9, #$0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	ldw	r9, sp, #$4
-	reti	r15
-	addi	sp, sp, #$8
-
-
-.if 0
-	; Handler for illegal instruction.
-	.global _ILLIVEC
-_ILLIVEC:
-	reti r15
-	or r0, r0, r0
-.endif
-
-
-	.global _IVEC_DEFAULT
-_IVEC_DEFAULT:
-	reti	r15
-	or	r0, r0, r0
-
-
-	.section .internal_io, "a", @nobits
-	.fill 256		; Fill the first page.
-
-	; This is the memory-mapped I/O region.
-
-	; Hardware Interrupt Registers
-	;.org 0xfffff100
-	.global _DEV0_INTERRUPT_REG
-_DEV0_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV1_INTERRUPT_REG
-_DEV1_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV2_INTERRUPT_REG
-_DEV2_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV3_INTERRUPT_REG
-_DEV3_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV4_INTERRUPT_REG
-_DEV4_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV5_INTERRUPT_REG
-_DEV5_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV6_INTERRUPT_REG
-_DEV6_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV7_INTERRUPT_REG
-_DEV7_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV8_INTERRUPT_REG
-_DEV8_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV9_INTERRUPT_REG
-_DEV9_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV10_INTERRUPT_REG
-_DEV10_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV11_INTERRUPT_REG
-_DEV11_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV12_INTERRUPT_REG
-_DEV12_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV13_INTERRUPT_REG
-_DEV13_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV14_INTERRUPT_REG
-_DEV14_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV15_INTERRUPT_REG
-_DEV15_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV16_INTERRUPT_REG
-_DEV16_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV17_INTERRUPT_REG
-_DEV17_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV18_INTERRUPT_REG
-_DEV18_INTERRUPT_REG:
-	.word 0x00000000
-
-	; 128 bytes minus nineteen registers (four bytes per register)
-	.fill (128 - 19 * 4)
-
-	.global	_INTERRUPT_MASK_REG
-_INTERRUPT_MASK_REG:
-	.word 0x00000000
-
-	.global	_INTERRUPT_PENDING_REG
-_INTERRUPT_PENDING_REG:
-	.word 0x00000000
-
-	; 16 bytes minus two registers (four bytes per register)
-	.fill (16 - 2 * 4)
-
-	.global _DEV0_INTERRUPT_LEVEL_REG
-_DEV0_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV1_INTERRUPT_LEVEL_REG
-_DEV1_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV2_INTERRUPT_LEVEL_REG
-_DEV2_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV3_INTERRUPT_LEVEL_REG
-_DEV3_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV4_INTERRUPT_LEVEL_REG
-_DEV4_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV5_INTERRUPT_LEVEL_REG
-_DEV5_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV6_INTERRUPT_LEVEL_REG
-_DEV6_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV7_INTERRUPT_LEVEL_REG
-_DEV7_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV8_INTERRUPT_LEVEL_REG
-_DEV8_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV9_INTERRUPT_LEVEL_REG
-_DEV9_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV10_INTERRUPT_LEVEL_REG
-_DEV10_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV11_INTERRUPT_LEVEL_REG
-_DEV11_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV12_INTERRUPT_LEVEL_REG
-_DEV12_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV13_INTERRUPT_LEVEL_REG
-_DEV13_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV14_INTERRUPT_LEVEL_REG
-_DEV14_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV15_INTERRUPT_LEVEL_REG
-_DEV15_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV16_INTERRUPT_LEVEL_REG
-_DEV16_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV17_INTERRUPT_LEVEL_REG
-_DEV17_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	.global _DEV18_INTERRUPT_LEVEL_REG
-_DEV18_INTERRUPT_LEVEL_REG:
-	.word 0x00000000
-
-	; 128 bytes minus twenty-three registers (four bytes per register)
-	.fill (128 - 23 * 4)
-
-
-	;.org 0xfffff200
-	; MorphoSys Decoder Registers
-	.global _MS_DEC_CIRC_BUFF_SEL_REG
-_MS_DEC_CIRC_BUFF_SEL_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_SKIP_FACTOR_REG
-_MS_DEC_SKIP_FACTOR_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_CUSTOM_PERM_REG
-_MS_DEC_CUSTOM_PERM_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_CTXT_BASE_REG
-_MS_DEC_CTXT_BASE_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_LOOKUP_TBL_REG
-_MS_DEC_LOOKUP_TBL_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF0_I_REG
-_MS_CIRC_BUFF0_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF0_P_REG
-_MS_CIRC_BUFF0_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF0_B_REG
-_MS_DATA_BUFF0_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF0_S_REG
-_MS_DATA_BUFF0_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF1_I_REG
-_MS_CIRC_BUFF1_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF1_P_REG
-_MS_CIRC_BUFF1_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF1_B_REG
-_MS_DATA_BUFF1_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF1_S_REG
-_MS_DATA_BUFF1_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF2_I_REG
-_MS_CIRC_BUFF2_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF2_P_REG
-_MS_CIRC_BUFF2_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF2_B_REG
-_MS_DATA_BUFF2_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF2_S_REG
-_MS_DATA_BUFF2_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF3_I_REG
-_MS_CIRC_BUFF3_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF3_P_REG
-_MS_CIRC_BUFF3_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF3_B_REG
-_MS_DATA_BUFF3_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF3_S_REG
-_MS_DATA_BUFF3_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF4_I_REG
-_MS_CIRC_BUFF4_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF4_P_REG
-_MS_CIRC_BUFF4_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF4_B_REG
-_MS_DATA_BUFF4_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF4_S_REG
-_MS_DATA_BUFF4_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF5_I_REG
-_MS_CIRC_BUFF5_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF5_P_REG
-_MS_CIRC_BUFF5_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF5_B_REG
-_MS_DATA_BUFF5_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF5_S_REG
-_MS_DATA_BUFF5_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF6_I_REG
-_MS_CIRC_BUFF6_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF6_P_REG
-_MS_CIRC_BUFF6_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF6_B_REG
-_MS_DATA_BUFF6_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF6_S_REG
-_MS_DATA_BUFF6_S_REG:
-	.word 0x00000000
-
-	.global _MS_CIRC_BUFF7_I_REG
-_MS_CIRC_BUFF7_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF7_P_REG
-_MS_CIRC_BUFF7_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF7_B_REG
-_MS_DATA_BUFF7_B_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BUFF7_S_REG
-_MS_DATA_BUFF7_S_REG:
-	.word 0x00000000
-
-	.global _MS_OMEGA_PERM1_REG
-_MS_OMEGA_PERM1_REG:
-	.word 0x00000000
-
-	.global _MS_WRITE_FB_ADDR_REG
-_MS_WRITE_FB_ADDR_REG:
-	.word 0x00000000
-
-	.global _MS_OMEGA_PERM2_REG
-_MS_OMEGA_PERM2_REG:
-	.word 0x00000000
-
-
-	; 256 bytes minus forty registers (four bytes per register)
-	.fill (256 - 40 * 4)
-
-
-
-	;.org 0xfffff300
-	; Debug Registers
-	.global _DEBUG_HALT_REG
-_DEBUG_HALT_REG:
-	.word 0x00000000
-
-	.global _DEBUG_BREAK_REG
-_DEBUG_BREAK_REG:
-	.word 0x00000000
-
-	.global _DEBUG_CRITICAL_REG
-_DEBUG_OWNERSHIP_REG:
-	.word 0x00000000
-
-	.global _DEBUG_KERNEL_ID_REG
-_DEBUG_KERNEL_ID_REG:
-	.word 0x00000000
-
-	.global _DEBUG_IRQ_STATUS_REG
-_DEBUG_IRQ_STATUS_REG:
-	.word 0x00000000
-
-	; There are two reserved registers.
-	.fill (2 * 4)
-
-        .global _DEBUG_SW_SYSREQ_REG
-_DEBUG_SW_SYSREQ_REG:
-        .word 0x00000000
-
-	; 128 bytes minus eight registers (four bytes per register)
-	.fill (128 - 8 * 4)
-
-	.global _EXTENDED_GP0_REG
-_EXTENDED_GP0_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP1_REG
-_EXTENDED_GP1_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP2_REG
-_EXTENDED_GP2_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP3_REG
-_EXTENDED_GP3_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP4_REG
-_EXTENDED_GP4_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP5_REG
-_EXTENDED_GP5_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP6_REG
-_EXTENDED_GP6_REG:
-	.word 0x00000000
-
-	.global _EXTENDED_GP7_REG
-_EXTENDED_GP7_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_EN_NC_MEM_REG
-_MEM_CTRL_EN_NC_MEM_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_BASE0_ADDR_REG
-_MEM_CTRL_BASE0_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_MASK0_ADDR_REG
-_MEM_CTRL_MASK0_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_BASE1_ADDR_REG
-_MEM_CTRL_BASE1_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_MASK1_ADDR_REG
-_MEM_CTRL_MASK1_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_BASE2_ADDR_REG
-_MEM_CTRL_BASE2_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_MASK2_ADDR_REG
-_MEM_CTRL_MASK2_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_BASE3_ADDR_REG
-_MEM_CTRL_BASE3_ADDR_REG:
-	.word 0x00000000
-
-	.global _MEM_CTRL_MASK3_ADDR_REG
-_MEM_CTRL_MASK3_ADDR_REG:
-	.word 0x00000000
-
-        ; 128 bytes minus seventeen registers (four bytes per register)
-        .fill (128 - 17 * 4)
-
-
-
-	; Reserved memory-map space
-	.fill (256 + 256)
-
-
-
-        ;.org 0xfffff600
-	; Timer Registers
-        .global _TIMER0_VAL_REG
-_TIMER0_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER1_VAL_REG
-_TIMER1_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER2_VAL_REG
-_TIMER2_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER3_VAL_REG
-_TIMER3_VAL_REG:
-        .word 0x00000000
-
-	; 256 bytes minus four registers (four bytes per register)
-	.fill (256 - 4 * 4)
-
-
-
-	;.org 0xfffff700
-	; Output Line Control Registers
-	.global _OUTPUT0_CTRL
-_OUTPUT0_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT1_CTRL
-_OUTPUT1_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT2_CTRL
-_OUTPUT2_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT3_CTRL
-_OUTPUT3_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT4_CTRL
-_OUTPUT4_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT5_CTRL
-_OUTPUT5_CTRL:
-	.word 0x00000000
-
-	.global _OUTPUT6_CTRL
-_OUTPUT6_CTRL:
-	.word 0x00000000
-
-	; 128 bytes minus seven registers (four bytes per register)
-	.fill (128 - 7 * 4)
-
-	.global _INPUT0_CTRL
-_INPUT0_CTRL:
-	.word 0x00000000
-
-	; 128 bytes minus one register (four bytes per register)
-	.fill (128 - 1 * 4)
-
-
-
-	;.org 0xfffff800
-	; IQ Buffer Registers
-	.global _IQ_BUFF_CTRL_REG
-_IQ_BUFF_CTRL_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_STATUS_REG
-_IQ_BUFF_STATUS_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_PARAMETER1_REG
-_IQ_BUFF_PARAMETER1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_TRANSFER_SIZE1_REG
-_IQ_BUFF_TRANSFER_SIZE1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_FB_BASE1_REG
-_IQ_BUFF_FB_BASE1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_FB_SIZE1_REG
-_IQ_BUFF_FB_SIZE1_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_PARAMETER2_REG
-_IQ_BUFF_PARAMETER2_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_TRANSFER_SIZE2_REG
-_IQ_BUFF_TRANSFER_SIZE2_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_FB_BASE2_REG
-_IQ_BUFF_FB_BASE2_REG:
-	.word 0x00000000
-
-	.global _IQ_BUFF_FB_SIZE2_REG
-_IQ_BUFF_FB_SIZE2_REG:
-	.word 0x00000000
-
-	; 256 bytes minus ten registers (four bytes per register)
-	.fill (256 - 10 * 4)
-
-
-
-	;.org 0xfffff900
-	; DMA Controller
-	.global _DMA_CTRL_REG
-_DMA_CTRL_REG:
-	.word 0x00000000
-
-	.global _DMA_STATUS_REG
-_DMA_STATUS_REG:
-	.word 0x00000000
-
-	.global _DMA_CH0_EADDR_REG
-_DMA_CH0_EADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH0_IADDR_REG
-_DMA_CH0_IADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH0_SIZE_REG
-_DMA_CH0_SIZE_REG:
-	.word 0x00000000
-
-	.global _DMA_CH1_EADDR_REG
-_DMA_CH1_EADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH1_IADDR_REG
-_DMA_CH1_IADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH1_SIZE_REG
-_DMA_CH1_SIZE_REG:
-	.word 0x00000000
-
-	.global _DMA_CH2_EADDR_REG
-_DMA_CH2_EADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH2_IADDR_REG
-_DMA_CH2_IADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH2_SIZE_REG
-_DMA_CH2_SIZE_REG:
-	.word 0x00000000
-
-	.global _DMA_CH3_EADDR_REG
-_DMA_CH3_EADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH3_IADDR_REG
-_DMA_CH3_IADDR_REG:
-	.word 0x00000000
-
-	.global _DMA_CH3_SIZE_REG
-_DMA_CH3_SIZE_REG:
-	.word 0x00000000
-
-	; 256 bytes minus fourteen registers (four bytes per register)
-	.fill (256 - 14 * 4)
-
-
-
-	;.org 0xfffffa00
-	; Sequence Generator
-	.global _SEQ_GEN_CTRL_STATUS_REG
-_SEQ_GEN_CTRL_STATUS_REG:
-	.word 0x00000000
-
-	.global _SEQ_GEN_MASK_REGS
-_SEQ_GEN_MASK_REGS:
-	.fill (302 * 4)
-
-	.global _SEQ_GEN_SHIFT_REG
-_SEQ_GEN_SHIFT_REG:
-	.word 0x00000000
-
-	; 256 bytes minus seven registers (four bytes per register)
-	.fill (256 - 48 * 4)
-
-
-
-	; Reserved memory-map space
-	.fill (0x1000 - 0xf00)
diff --git a/libgloss/mt/startup-64-001.S b/libgloss/mt/startup-64-001.S
deleted file mode 100644
index 5ceb42b..0000000
--- a/libgloss/mt/startup-64-001.S
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * $Header$
- *
- * interrupt_vectors.s -- the interrupt handler jump table. 
- *
- *
- * There are a total of 32 interrupt vector possible, however, only
- *   11 of those are currently used (the others are reserved). The
- *   order of vectors is as follows:
- *
- *     1. Boot Vector. Vector for power-on/reset.
- *     2. Software Vector. Vector for handling the SI instruction (an
- *          explicit interrupt caused by software).
- *     3. Break Vector. Vector for handling the Break instruction.
- *     4. Device 0 Vector. Service vector for device zero. 
- *     5. Device 1 Vector. Service vector for device one. 
- *     6. Device 2 Vector. Service vector for device two. 
- *     7. Device 3 Vector. Service vector for device three. 
- *     8. Device 4 Vector. Service vector for device four. 
- *     9. Device 5 Vector. Service vector for device five. 
- *    10. Device 6 Vector. Service vector for device six. 
- *    11. Device 7 Vector. Service vector for device seven. 
- *
- *   The rest of the interrupt vectors are reserved for future use.
- *
- *
- * Each jump table entry consists of the following two instructions:
- *
- *   jmp Label		; Label as appropriate
- *   nop 		; implemented as or r0,r0,r0
- *
- *   The following labels are reserved for the vectors named above,
- *   respectively:
- *
- *     _BOOTIVEC, _SOFTIVEC, _BRKIVEC, _DEV0IVEC, _DEV1IVEC, _DEV2IVEC,
- *     _DEV3IVEC, _DEV4IVEC, _DEV5IVEC, _DEV6IVEC, _DEV7IVEC
- *
- *
- *   26Sep01 (DJK) The memory map is changed and the device interrupts are
- *                   now memory-mapped.
- *
- *   10Oct01 (DJK) The memory map is finalized and the first 4K of address
- *                   space is now reserved for memory-mapped I/O devices.
- *                   (There is over 2K unused, reserved space in this area.)
- *
- *   27Jul02 (DJK) Fixed the address for the interrupt mask register. Old
- *                   documentation stated the port address as 0x140, but
- *                   the implementation uses 0x13c.
- *
- *   30Jul02 (DJK) Added support for printf. This only supports output to
- *                   stderr and stdout. Using the message box interface,
- *                   a (newly defined) message or series of messages is
- *                   passed to the controller to output bytes as text to
- *                   the debug console. These messages are constructed in
- *                   the interrupt handler for the SI instruction.
- *                   With this implementation, the user is unable to
- *                   utilize the message box interface in applications as
- *                   specialized interrupt handlers for the external
- *                   interrupts are necessary.
- *
- *
- *
- * Copyright (c) 2001, 2002, 2003, 2004 Morpho Technologies, Inc.
- *
- */
-
-	.section .startup, "a", @progbits
-	.global __boot_start
-_INTERRUPT_VECTOR_TABLE:
-__boot_start:
-	jmp	_BOOTIVEC		; Boot vector
-	or	r0, r0, r0
-	jmp	_SOFTIVEC		; Vector for SI instruction
-	or	r0,r0,r0
-	jmp	_BRKIVEC		; Vector for Break instruction
-	or	r0,r0,r0
-
-
-	; This is the memory-mapped I/O region.
-
-	; Hardware Interrupt Registers
-	.org 0x100
-	.global _DEV0_INTERRUPT_REG
-_DEV0_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV1_INTERRUPT_REG
-_DEV1_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV2_INTERRUPT_REG
-_DEV2_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV3_INTERRUPT_REG
-_DEV3_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV4_INTERRUPT_REG
-_DEV4_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV5_INTERRUPT_REG
-_DEV5_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV6_INTERRUPT_REG
-_DEV6_INTERRUPT_REG:
-	.word 0x00000000
-
-	.global _DEV7_INTERRUPT_REG
-_DEV7_INTERRUPT_REG:
-	.word 0x00000000
-
-	; 60 bytes minus eight registers (four bytes per register)
-	.fill (60 - 8 * 4)
-
-	.global _INTERRUPT_MASK_REG
-_INTERRUPT_MASK_REG:
-	.word 0x00000000
-
-	; 256 bytes minus sixteen registers (four bytes per register)
-	.fill (256 - 16 * 4)
-
-
-
-	.org 0x200
-	; MorphoSys Decoder Registers
-	.global _MS_DEC_AUTO_INCREMENT_REG
-_MS_DEC_AUTO_INCREMENT_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_SKIP_FACTOR_REG
-_MS_DEC_SKIP_FACTOR_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_CUSTOM_PERMUTATION_REG
-_MS_DEC_CUSTOM_PERMUTATION_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_CONTEXT_BASE_REG
-_MS_DEC_CONTEXT_BASE_REG:
-	.word 0x00000000
-
-	.global _MS_DEC_LOOKUP_TABLE_BASE_REG
-_MS_DEC_LOOKUP_TABLE_BASE_REG:
-	.word 0x00000000
-
-	.global _MS_CIRCULAR_BUFFER_END_REG
-_MS_CIRCULAR_BUFFER_END_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRCULAR_BUFFER_SIZE_REG
-_MS_CIRCULAR_BUFFER_SIZE_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BLOCK_END_REG
-_MS_DATA_BLOCK_END_REG:
-	.word 0x00000000
-
-	.global _MS_DATA_BLOCK_SIZE_REG
-_MS_DATA_BLOCK_SIZE_REG:
-	.word 0x00000000
-
-	; 256 bytes minus nine registers (four bytes per register)
-	.fill (256 - 9 * 4)
-
-
-
-	.org 0x300
-	; Debug Registers
-	.global _DEBUG_HALT_REG
-_DEBUG_HALT_REG:
-	.word 0x00000000
-
-	.global _DEBUG_BREAK_REG
-_DEBUG_BREAK_REG:
-	.word 0x00000000
-
-	.global _DEBUG_HW_RESERVED0_REG
-_DEBUG_HW_RESERVED0_REG:
-	.word 0x00000000
-
-	.global _DEBUG_HW_RESERVED1_REG
-_DEBUG_HW_RESERVED1_REG:
-	.word 0x00000000
-
-	.global _DEBUG_HW_RESERVED2_REG
-_DEBUG_HW_RESERVED2_REG:
-	.word 0x00000000
-
-	.global _DEBUG_HW_RESERVED3_REG
-_DEBUG_HW_RESERVED3_REG:
-	.word 0x00000000
-
-	.global _DEBUG_HW_RESERVED4_REG
-_DEBUG_HW_RESERVED4_REG:
-	.word 0x00000000
-
-	.global _DEBUG_SW_SYSREQ_REG
-_DEBUG_SW_SYSREQ_REG:
-	.word 0x00000000
-
-	; 256 bytes minus eight registers (four bytes per register)
-	.fill (256 - 8 * 4)
-
-
-
-	.org 0x400
-	; Sequence Generator Registers
-_SEQ_GEN_REGS:
-	.fill 256
-
-
-
-	.org 0x500
-_RESERVED_SEQ_GEN_REGS:
-	.fill 256
-
-
-
-        .org 0x600
-        .global _TIMER0_VAL_REG
-_TIMER0_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER0_CTRL_REG
-_TIMER0_CTRL_REG:
-        .word 0x00000000
-
-        .global _TIMER1_VAL_REG
-_TIMER1_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER1_CTRL_REG
-_TIMER1_CTRL_REG:
-        .word 0x00000000
-
-        .global _TIMER2_VAL_REG
-_TIMER2_VAL_REG:
-        .word 0x00000000
-
-        .global _TIMER2_CTRL_REG
-_TIMER2_CTRL_REG:
-        .word 0x00000000
-
-	; 256 bytes minus six registers (four bytes per register)
-	.fill (256 - 6 * 4)
-
-
-
-	.org 0x700
-	.global _OUTPUT0_CONTROL
-_OUTPUT0_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT1_CONTROL
-_OUTPUT1_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT2_CONTROL
-_OUTPUT2_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT3_CONTROL
-_OUTPUT3_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT4_CONTROL
-_OUTPUT4_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT5_CONTROL
-_OUTPUT5_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT6_CONTROL
-_OUTPUT6_CONTROL:
-	.word 0x00000000
-
-	.global _OUTPUT7_CONTROL
-_OUTPUT7_CONTROL:
-	.word 0x00000000
-
-	; 256 bytes minus eight registers (four bytes per register)
-	.fill (256 - 8 * 4)
-
-
-
-	.org 0x800
-	; Reserved memory-mapped space.
-	.fill (0x1000 - 0x800)
-
-
-
-	.text
-
-	.equ SI_IOPORT_ADR, _DEBUG_SW_SYSREQ_REG
-	.equ SI_IOPORT_BIT, 0x1
-	.equ BRK_IOPORT_ADR, _DEBUG_BREAK_REG
-	.equ BRK_IOPORT_BIT, 0x1
-
-	.global _BOOTIVEC
-_BOOTIVEC:
-
-	; Initialize the interrupt controller's interrupt vector registers
-	; for devices zero through seven.
-	ldui    r1, #%hi16(_IVEC_DEFAULT)
-	ori     r1, r1, #%lo16(_IVEC_DEFAULT)
-	stw     r1, r0, #%lo16(_DEV0_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV1_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV2_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV3_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV4_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV5_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV6_INTERRUPT_REG)
-	stw     r1, r0, #%lo16(_DEV7_INTERRUPT_REG)
-
-	; Jump to the beginning of the application and enable interrupts.
-	jmp	_start
-	ei
-
-
-
-	; Handler for the SI instruction. To perform a system call, the
-	; C model uses a trapping mechanism which executes an SI instruction.
-	; The Morpho Technologies simulator simply performs a branch to
-	; this vector to simulate the SI instruction (this is as the hardware
-	; behaves). In order to trigger the simulator that a system call
-	; is needed, a write into the I/O register at address $40005 to
-	; set bit #2 (0x4) is necessary.
-	;
-	; The above address has been changed to 0x31C and the bit number
-	; is zero. (The manifest constants have been changed to reflect this.)
-	;
-	.global _SOFTIVEC
-_SOFTIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(SI_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(SI_IOPORT_ADR)
-	ori	r10, r0, #SI_IOPORT_BIT
-	stw	r10, r9, #$0
-	; SYS_call is handled by simulator here...
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	or	r0, r0, r0
-	ldw	r9, sp, #$4
-	reti	r14
-	addi	sp, sp, #$8
-
-
-
-	.global _BRKIVEC
-_BRKIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(BRK_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(BRK_IOPORT_ADR)
-	ori	r10, r0, #BRK_IOPORT_BIT
-	stw	r10, r9, #$0
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	subi	r15, r15, #$4		; Backup to address of break
-	ldw	r9, sp, #$4
-	reti	r15
-	addi	sp, sp, #$8
-
-
-
-	.global _IVEC_DEFAULT
-_IVEC_DEFAULT:
-	reti	r15
-	or	r0, r0, r0
diff --git a/libgloss/mt/startup-ms2.S b/libgloss/mt/startup-ms2.S
deleted file mode 100644
index 846c72c..0000000
--- a/libgloss/mt/startup-ms2.S
+++ /dev/null
@@ -1,840 +0,0 @@
-/*
- *
- * interrupt_vectors.s -- the interrupt handler jump table. 
- *
- *
- * There are a total of 32 interrupt vector possible, however, only
- *   11 of those are currently used (the others are reserved). The
- *   order of vectors is as follows:
- *
- *     1. Boot Vector. Vector for power-on/reset.
- *     2. Software Vector. Vector for handling the SI instruction (an
- *          explicit interrupt caused by software).
- *     3. Break Vector. Vector for handling the Break instruction.
- *     4. Device 0 Vector. Service vector for device zero. 
- *     5. Device 1 Vector. Service vector for device one. 
- *     6. Device 2 Vector. Service vector for device two. 
- *     7. Device 3 Vector. Service vector for device three. 
- *     8. Device 4 Vector. Service vector for device four. 
- *     9. Device 5 Vector. Service vector for device five. 
- *    10. Device 6 Vector. Service vector for device six. 
- *    11. Device 7 Vector. Service vector for device seven. 
- *
- *   The rest of the interrupt vectors are reserved for future use.
- *
- *
- * Each jump table entry consists of the following two instructions:
- *
- *   jmp Label		; Label as appropriate
- *   nop 		; implemented as or r0,r0,r0
- *
- *   The following labels are reserved for the vectors named above,
- *   respectively:
- *
- *     _BOOTIVEC, _SOFTIVEC, _BRKIVEC, _DEV0IVEC, _DEV1IVEC, _DEV2IVEC,
- *     _DEV3IVEC, _DEV4IVEC, _DEV5IVEC, _DEV6IVEC, _DEV7IVEC
- *
- *   28Apr05 (DJK) Added support for the overflow vector.
- *
- *   XXXXXXX (DJK) Modified for the MS2 target
- *
- *   09Jan04 (DJK) Modified internal I/O port definitions for the
- *                   MS1-16-003.
- *
- *   10Oct01 (DJK) The memory map is finalized and the first 4K of address
- *                   space is now reserved for memory-mapped I/O devices.
- *                   (There is over 2K unused, reserved space in this area.)
- *
- *   26Sep01 (DJK) The memory map is changed and the device interrupts are
- *                   now memory-mapped.
- *
- *
- *
- * Copyright (c) 2001, 2002, 2003, 2004 Morpho Technologies
- *
- */
-
-	.section .startup, "a", @progbits
-	.global __boot_start
-__boot_start:
-_INTERRUPT_VECTOR_TABLE:
-	jmp	_BOOTIVEC		; Boot vector
-	or	r0, r0, r0
-	jmp	_SOFTIVEC		; Vector for SI instruction
-	or	r0, r0, r0
-	jmp	_BRKIVEC		; Vector for Break instruction
-	or	r0, r0, r0
-	; The illegal instruction trap is not implemented.
-_RESERVED1_IVEC:
-	jmp	_RESERVED1_IVEC
-	or	r0, r0, r0
-	jmp	_OVFIVEC
-	or	r0, r0, r0
-_RESERVED2_IVEC:
-	jmp	_RESERVED2_IVEC
-	or	r0, r0, r0
-_RESERVED3_IVEC:
-	jmp	_RESERVED3_IVEC
-	or	r0, r0, r0
-_RESERVED4_IVEC:
-	jmp	_RESERVED4_IVEC
-	or	r0, r0, r0
-
-
-	.text
-
-	.equ SI_IOPORT_ADR, _DEBUG_SW_SYSREQ_REG
-	.equ SI_IOPORT_BIT, 0x1
-	.equ BRK_IOPORT_ADR, _DEBUG_BREAK_REG
-	.equ BRK_IOPORT_BIT, 0x1
-
-	.global _BOOTIVEC
-_BOOTIVEC:
-	; Initialize the interrupt controller's interrupt vector registers
-	ldui	r1, #%hi16(_IVEC_DEFAULT)
-	ori	r1, r1, #%lo16(_IVEC_DEFAULT)
-	stw	r1, r0, #%lo16(_DEV0_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV1_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV2_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV3_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV4_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV5_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV6_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV7_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV8_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV9_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV10_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV11_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV12_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV13_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV14_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV15_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV16_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV17_INTERRUPT_REG)
-	stw	r1, r0, #%lo16(_DEV18_INTERRUPT_REG)
-
-	; Statically initialized data must be copied from ROM to RAM.
-	; This is done in the C run-time start-up code (crt0.o).
-
-	; Jump to the beginning of the application and enable interrupts.
-	jmp	_start
-	ei
-
-
-	; Handler for the SI instruction. To perform a system call, the
-	; C model uses a trapping mechanism which executes an SI instruction.
-	; The Morpho Technologies simulator simply performs a branch to
-	; this vector to simulate the SI instruction (this is as the hardware
-	; behaves). In order to trigger the simulator that a system call
-	; is needed a write into the I/O register at address $40005 to
-	; set bit #2 (0x4) is necessary.
-	;
-	; The above address has been changed to 0x00031C and the bit number
-	; is zero. (The manifest constants have been changed to reflect this.)
-	.global _SOFTIVEC
-_SOFTIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(SI_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(SI_IOPORT_ADR)
-	ori	r10, r0, #SI_IOPORT_BIT
-	stw	r10, r9, #$0
-	; SYS_call is handled by simulator here...
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	or	r0, r0, r0
-	ldw	r9, sp, #$4
-	reti	r14
-	addi	sp, sp, #$8
-
-
-
-	.global _BRKIVEC
-_BRKIVEC:
-	; Build a frame to save registers.
-	subi	sp, sp, #$8
-	stw	r9, sp, #$4
-	ldui	r9, #%hi16(BRK_IOPORT_ADR)
-	stw	r10, sp, #$0
-	ori	r9, r9, #%lo16(BRK_IOPORT_ADR)
-	ori	r10, r0, #BRK_IOPORT_BIT
-	stw	r10, r9, #$0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	or	r0, r0, r0
-	ldw	r10, sp, #$0
-	ldw	r9, sp, #$4
-	reti	r15
-	addi	sp, sp, #$8
-
-
-	.global _OVFIVEC
-_OVFIVEC:
-	addi	r15, r15, #$4
-	or	r0, r0, r0
-	or	r0, r0, r0	; added 06Sep05
-	reti	r15
-	or	r0, r0, r0
-
-
-	.global _IVEC_DEFAULT
-_IVEC_DEFAULT:
-	reti	r15
-	or	r0, r0, r0
-
-
-	.section .internal_io, "a", @nobits
-	.fill 256		; Fill the first page.
-
-	; This is the memory-mapped I/O region.
-
-	; Hardware Interrupt Registers
-	;.org 0xfffff100
-	.global _DEV0_INTERRUPT_REG
-_DEV0_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV1_INTERRUPT_REG
-_DEV1_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV2_INTERRUPT_REG
-_DEV2_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV3_INTERRUPT_REG
-_DEV3_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV4_INTERRUPT_REG
-_DEV4_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV5_INTERRUPT_REG
-_DEV5_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV6_INTERRUPT_REG
-_DEV6_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV7_INTERRUPT_REG
-_DEV7_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV8_INTERRUPT_REG
-_DEV8_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV9_INTERRUPT_REG
-_DEV9_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV10_INTERRUPT_REG
-_DEV10_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV11_INTERRUPT_REG
-_DEV11_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV12_INTERRUPT_REG
-_DEV12_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV13_INTERRUPT_REG
-_DEV13_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV14_INTERRUPT_REG
-_DEV14_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV15_INTERRUPT_REG
-_DEV15_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV16_INTERRUPT_REG
-_DEV16_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV17_INTERRUPT_REG
-_DEV17_INTERRUPT_REG:
-	.word	0x00000000
-
-	.global _DEV18_INTERRUPT_REG
-_DEV18_INTERRUPT_REG:
-	.word	0x00000000
-
-	; 128 bytes minus nineteen registers (four bytes per register)
-	.fill (128 - 19 * 4)
-
-	.global	_INTERRUPT_MASK_REG
-_INTERRUPT_MASK_REG:
-	.word	0x00000000
-
-	.global	_INTERRUPT_PENDING_REG
-_INTERRUPT_PENDING_REG:
-	.word	0x00000000
-
-	; 16 bytes minus two registers (four bytes per register)
-	.fill (16 - 2 * 4)
-
-	.global _DEV0_INTERRUPT_LEVEL_REG
-_DEV0_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV1_INTERRUPT_LEVEL_REG
-_DEV1_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV2_INTERRUPT_LEVEL_REG
-_DEV2_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV3_INTERRUPT_LEVEL_REG
-_DEV3_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV4_INTERRUPT_LEVEL_REG
-_DEV4_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV5_INTERRUPT_LEVEL_REG
-_DEV5_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV6_INTERRUPT_LEVEL_REG
-_DEV6_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV7_INTERRUPT_LEVEL_REG
-_DEV7_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV8_INTERRUPT_LEVEL_REG
-_DEV8_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV9_INTERRUPT_LEVEL_REG
-_DEV9_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV10_INTERRUPT_LEVEL_REG
-_DEV10_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV11_INTERRUPT_LEVEL_REG
-_DEV11_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV12_INTERRUPT_LEVEL_REG
-_DEV12_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV13_INTERRUPT_LEVEL_REG
-_DEV13_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV14_INTERRUPT_LEVEL_REG
-_DEV14_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV15_INTERRUPT_LEVEL_REG
-_DEV15_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV16_INTERRUPT_LEVEL_REG
-_DEV16_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV17_INTERRUPT_LEVEL_REG
-_DEV17_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	.global _DEV18_INTERRUPT_LEVEL_REG
-_DEV18_INTERRUPT_LEVEL_REG:
-	.word	0x00000000
-
-	; 128 bytes minus twenty-three registers (four bytes per register)
-	.fill (128 - 23 * 4)
-
-
-	;.org 0xfffff200
-	; MorphoSys Decoder Registers
-	.global _MS_DEC_CIRC_BUFF_SEL_REG
-_MS_DEC_CIRC_BUFF_SEL_REG:
-	.word	0x00000000
-
-	.global _MS_DEC_SKIP_FACTOR_REG
-_MS_DEC_SKIP_FACTOR_REG:
-	.word	0x00000000
-
-	.global _MS_DEC_CUSTOM_PERM_REG
-_MS_DEC_CUSTOM_PERM_REG:
-	.word	0x00000000
-
-	.global _MS_DEC_CTXT_BASE_REG
-_MS_DEC_CTXT_BASE_REG:
-	.word	0x00000000
-
-	.global _MS_DEC_LOOKUP_TBL_REG
-_MS_DEC_LOOKUP_TBL_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF0_I_REG
-_MS_CIRC_BUFF0_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF0_P_REG
-_MS_CIRC_BUFF0_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF0_B_REG
-_MS_DATA_BUFF0_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF0_S_REG
-_MS_DATA_BUFF0_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF1_I_REG
-_MS_CIRC_BUFF1_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF1_P_REG
-_MS_CIRC_BUFF1_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF1_B_REG
-_MS_DATA_BUFF1_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF1_S_REG
-_MS_DATA_BUFF1_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF2_I_REG
-_MS_CIRC_BUFF2_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF2_P_REG
-_MS_CIRC_BUFF2_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF2_B_REG
-_MS_DATA_BUFF2_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF2_S_REG
-_MS_DATA_BUFF2_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF3_I_REG
-_MS_CIRC_BUFF3_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF3_P_REG
-_MS_CIRC_BUFF3_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF3_B_REG
-_MS_DATA_BUFF3_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF3_S_REG
-_MS_DATA_BUFF3_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF4_I_REG
-_MS_CIRC_BUFF4_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF4_P_REG
-_MS_CIRC_BUFF4_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF4_B_REG
-_MS_DATA_BUFF4_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF4_S_REG
-_MS_DATA_BUFF4_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF5_I_REG
-_MS_CIRC_BUFF5_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF5_P_REG
-_MS_CIRC_BUFF5_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF5_B_REG
-_MS_DATA_BUFF5_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF5_S_REG
-_MS_DATA_BUFF5_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF6_I_REG
-_MS_CIRC_BUFF6_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF6_P_REG
-_MS_CIRC_BUFF6_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF6_B_REG
-_MS_DATA_BUFF6_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF6_S_REG
-_MS_DATA_BUFF6_S_REG:
-	.word	0x00000000
-
-	.global _MS_CIRC_BUFF7_I_REG
-_MS_CIRC_BUFF7_I_REG:
-	.word (__FRAME_BUFFER_END)
-
-	.global _MS_CIRC_BUFF7_P_REG
-_MS_CIRC_BUFF7_P_REG:
-	.word __FRAME_BUFFER_SIZE
-
-	.global _MS_DATA_BUFF7_B_REG
-_MS_DATA_BUFF7_B_REG:
-	.word	0x00000000
-
-	.global _MS_DATA_BUFF7_S_REG
-_MS_DATA_BUFF7_S_REG:
-	.word	0x00000000
-
-	.global _MS_OMEGA_PERM1_REG
-_MS_OMEGA_PERM1_REG:
-	.word	0x00000000
-
-	.global _MS_WRITE_FB_ADDR_REG
-_MS_WRITE_FB_ADDR_REG:
-	.word	0x00000000
-
-	.global _MS_OMEGA_PERM2_REG
-_MS_OMEGA_PERM2_REG:
-	.word	0x00000000
-
-
-	; 256 bytes minus forty registers (four bytes per register)
-	.fill (256 - 40 * 4)
-
-
-
-	;.org 0xfffff300
-	; Debug Registers
-	.global _DEBUG_HALT_REG
-_DEBUG_HALT_REG:
-	.word	0x00000000
-
-	.global _DEBUG_BREAK_REG
-_DEBUG_BREAK_REG:
-	.word	0x00000000
-
-	.global _DEBUG_CRITICAL_REG
-_DEBUG_OWNERSHIP_REG:
-	.word	0x00000000
-
-	.global _DEBUG_KERNEL_ID_REG
-_DEBUG_KERNEL_ID_REG:
-	.word	0x00000000
-
-	.global _DEBUG_IRQ_STATUS_REG
-_DEBUG_IRQ_STATUS_REG:
-	.word	0x00000000
-
-	; There are two reserved registers.
-	.fill (2 * 4)
-
-	.global _DEBUG_SW_SYSREQ_REG
-_DEBUG_SW_SYSREQ_REG:
-	.word	0x00000000
-
-	; 128 bytes minus eight registers (four bytes per register)
-	.fill (128 - 8 * 4)
-
-	.global _EXTENDED_GP0_REG
-_EXTENDED_GP0_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP1_REG
-_EXTENDED_GP1_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP2_REG
-_EXTENDED_GP2_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP3_REG
-_EXTENDED_GP3_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP4_REG
-_EXTENDED_GP4_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP5_REG
-_EXTENDED_GP5_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP6_REG
-_EXTENDED_GP6_REG:
-	.word	0x00000000
-
-	.global _EXTENDED_GP7_REG
-_EXTENDED_GP7_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_EN_NC_MEM_REG
-_MEM_CTRL_EN_NC_MEM_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_BASE0_ADDR_REG
-_MEM_CTRL_BASE0_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_MASK0_ADDR_REG
-_MEM_CTRL_MASK0_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_BASE1_ADDR_REG
-_MEM_CTRL_BASE1_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_MASK1_ADDR_REG
-_MEM_CTRL_MASK1_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_BASE2_ADDR_REG
-_MEM_CTRL_BASE2_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_MASK2_ADDR_REG
-_MEM_CTRL_MASK2_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_BASE3_ADDR_REG
-_MEM_CTRL_BASE3_ADDR_REG:
-	.word	0x00000000
-
-	.global _MEM_CTRL_MASK3_ADDR_REG
-_MEM_CTRL_MASK3_ADDR_REG:
-	.word	0x00000000
-
-	; 128 bytes minus seventeen registers (four bytes per register)
-	.fill (128 - 17 * 4)
-
-
-
-	; Reserved memory-map space
-	.fill (256 + 256)
-
-
-
-	;.org 0xfffff600
-	; Timer Registers
-	.global _TIMER0_VAL_REG
-_TIMER0_VAL_REG:
-	.word	0x00000000
-
-	.global _TIMER1_VAL_REG
-_TIMER1_VAL_REG:
-	.word	0x00000000
-
-	.global _TIMER2_VAL_REG
-_TIMER2_VAL_REG:
-	.word	0x00000000
-
-	.global _TIMER3_VAL_REG
-_TIMER3_VAL_REG:
-	.word	0x00000000
-
-	; 256 bytes minus four registers (four bytes per register)
-	.fill (256 - 4 * 4)
-
-
-
-	;.org 0xfffff700
-	; Output Line Control Registers
-	.global _OUTPUT0_CTRL
-_OUTPUT0_CTRL:
-	.word	0x00000000
-
-	.global _OUTPUT1_CTRL
-_OUTPUT1_CTRL:
-	.word	0x00000000
-
-	.global _OUTPUT2_CTRL
-_OUTPUT2_CTRL:
-	.word	0x00000000
-
-	.global _OUTPUT3_CTRL
-_OUTPUT3_CTRL:
-	.word	0x00000000
-
-	.global _OUTPUT4_CTRL
-_OUTPUT4_CTRL:
-	.word	0x00000000
-
-	.global _OUTPUT5_CTRL
-_OUTPUT5_CTRL:
-	.word	0x00000000
-
-	.global _OUTPUT6_CTRL
-_OUTPUT6_CTRL:
-	.word	0x00000000
-
-	; 128 bytes minus seven registers (four bytes per register)
-	.fill (128 - 7 * 4)
-
-	.global _INPUT0_CTRL
-_INPUT0_CTRL:
-	.word	0x00000000
-
-	; 128 bytes minus one register (four bytes per register)
-	.fill (128 - 1 * 4)
-
-
-
-	;.org 0xfffff800
-	; IQ Buffer Registers
-	.global _IQ_BUFF_CTRL_REG
-_IQ_BUFF_CTRL_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_STATUS_REG
-_IQ_BUFF_STATUS_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_PARAMETER1_REG
-_IQ_BUFF_PARAMETER1_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_TRANSFER_SIZE1_REG
-_IQ_BUFF_TRANSFER_SIZE1_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_FB_BASE1_REG
-_IQ_BUFF_FB_BASE1_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_FB_SIZE1_REG
-_IQ_BUFF_FB_SIZE1_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_PARAMETER2_REG
-_IQ_BUFF_PARAMETER2_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_TRANSFER_SIZE2_REG
-_IQ_BUFF_TRANSFER_SIZE2_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_FB_BASE2_REG
-_IQ_BUFF_FB_BASE2_REG:
-	.word	0x00000000
-
-	.global _IQ_BUFF_FB_SIZE2_REG
-_IQ_BUFF_FB_SIZE2_REG:
-	.word	0x00000000
-
-	; 256 bytes minus ten registers (four bytes per register)
-	.fill (256 - 10 * 4)
-
-
-
-	;.org 0xfffff900
-	; DMA Controller
-	.global _DMA_CTRL_REG
-_DMA_CTRL_REG:
-	.word	0x00000000
-
-	.global _DMA_STATUS_REG
-_DMA_STATUS_REG:
-	.word	0x00000000
-
-	.global _DMA_CH0_EADDR_REG
-_DMA_CH0_EADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH0_IADDR_REG
-_DMA_CH0_IADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH0_SIZE_REG
-_DMA_CH0_SIZE_REG:
-	.word	0x00000000
-
-	.global _DMA_CH1_EADDR_REG
-_DMA_CH1_EADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH1_IADDR_REG
-_DMA_CH1_IADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH1_SIZE_REG
-_DMA_CH1_SIZE_REG:
-	.word	0x00000000
-
-	.global _DMA_CH2_EADDR_REG
-_DMA_CH2_EADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH2_IADDR_REG
-_DMA_CH2_IADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH2_SIZE_REG
-_DMA_CH2_SIZE_REG:
-	.word	0x00000000
-
-	.global _DMA_CH3_EADDR_REG
-_DMA_CH3_EADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH3_IADDR_REG
-_DMA_CH3_IADDR_REG:
-	.word	0x00000000
-
-	.global _DMA_CH3_SIZE_REG
-_DMA_CH3_SIZE_REG:
-	.word	0x00000000
-
-	; 256 bytes minus fourteen registers (four bytes per register)
-	.fill (256 - 14 * 4)
-
-
-
-	;.org 0xfffffa00
-	; Sequence Generator
-	.global _SEQ_GEN_CTRL_STATUS_REG
-_SEQ_GEN_CTRL_STATUS_REG:
-	.word	0x00000000
-
-	.global _SEQ_GEN_MASK_REGS
-_SEQ_GEN_MASK_REGS:
-	.fill (302 * 4)
-
-	.global _SEQ_GEN_SHIFT_REG
-_SEQ_GEN_SHIFT_REG:
-	.word	0x00000000
-
-	; 256 bytes minus seven registers (four bytes per register)
-	.fill (256 - 48 * 4)
-
-
-
-	; Reserved memory-map space
-	.fill (0x1000 - 0xf00)
diff --git a/libgloss/mt/stat.c b/libgloss/mt/stat.c
deleted file mode 100644
index 9a6ca7c..0000000
--- a/libgloss/mt/stat.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-stat (const char *path, struct stat *st)
-
-{
-  return TRAP0 (SYS_stat, path, st, 0);
-}
diff --git a/libgloss/mt/time.c b/libgloss/mt/time.c
deleted file mode 100644
index 2df8d48..0000000
--- a/libgloss/mt/time.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-time_t
-time (time_t *tloc)
-{
-  return TRAP0 (SYS_time, tloc, 0, 0);
-}
diff --git a/libgloss/mt/times.c b/libgloss/mt/times.c
deleted file mode 100644
index b804be4..0000000
--- a/libgloss/mt/times.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-#include "sys/times.h"
-
-
-clock_t
-times (struct tms *buffer)
-{
-  return TRAP0 (SYS_times, buffer, 0, 0);
-}
diff --git a/libgloss/mt/trap.S b/libgloss/mt/trap.S
deleted file mode 100644
index 9fca720..0000000
--- a/libgloss/mt/trap.S
+++ /dev/null
@@ -1,34 +0,0 @@
-;;
-;;  The errno will be in r5 if r11 is -1.
-;;
-	.text
-	.global __trap0
-__trap0:
-	;; non-leaf function so need to create stack frame to
-	;; store ra and fp
-	subi	sp, sp, #16
-	stw	ra, sp, #12
-	or	r0, r0, r0		;; nop
-	stw	fp, sp, #8
-	or	fp, sp, sp
-	stw	r5, sp, #4
-	or	r0, r0, r0		;; nop
-	stw	r6, sp, #0
-	addi	r6, r0, #$-1
-	si	r14
-	or	r0, r0, r0		;; nop
-	brne	r11, r6, .L0
-	ldui	r6, #%hi16(errno)
-	addui	r6, r6, #%lo16(errno)
-	stw	r5, r6, #0
-	or	r0, r0, r0		;; nop
-.L0:
-	ldw	r6, sp, #0
-	or	r0, r0, r0		;; nop
-	ldw	r5, sp, #4
-	or	r0, r0, r0		;; nop
-	ldw	ra, sp, #12
-	or	r0, r0, r0		;; nop
-	ldw	fp, sp, #8
-	jal	r0, r14
-	addi	sp, sp, #16
diff --git a/libgloss/mt/trap.h b/libgloss/mt/trap.h
deleted file mode 100644
index 27636c0..0000000
--- a/libgloss/mt/trap.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "syscall.h"
-
-int __trap0 ();
-
-#define TRAP0(f, p1, p2, p3) __trap0(f, (p1), (p2), (p3))
diff --git a/libgloss/mt/unlink.c b/libgloss/mt/unlink.c
deleted file mode 100644
index a620e89..0000000
--- a/libgloss/mt/unlink.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-unlink ()
-{
-  return -1;
-}
diff --git a/libgloss/mt/utime.c b/libgloss/mt/utime.c
deleted file mode 100644
index 3fce7e3..0000000
--- a/libgloss/mt/utime.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-utime (path, times)
-     const char *path;
-     char *times;
-{
-  return TRAP0 (SYS_utime, path, times, 0);
-}
diff --git a/libgloss/mt/write.c b/libgloss/mt/write.c
deleted file mode 100644
index 88b5ff8..0000000
--- a/libgloss/mt/write.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "trap.h"
-
-
-int
-write ( int file,
-	 char *ptr,
-	 size_t len)
-{
-  return TRAP0 (SYS_write, file, ptr, len);
-}
diff --git a/libgloss/pa/Makefile.in b/libgloss/pa/Makefile.in
index 03323c3..f33c15a 100644
--- a/libgloss/pa/Makefile.in
+++ b/libgloss/pa/Makefile.in
@@ -10,7 +10,6 @@
 # the new terms are clearly indicated on the first page of each file where
 # they apply.
 #
-DESTDIR =
 VPATH = @srcdir@
 srcdir = @srcdir@
 objdir = .
@@ -129,13 +128,13 @@ distclean maintainer-clean realclean: clean
 
 .PHONY: install info install-info clean-info
 install:
-	$(INSTALL_PROGRAM) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
+	$(INSTALL_PROGRAM) $(CRT0) $(tooldir)/lib${MULTISUBDIR}/$(CRT0)
 	# install Oki stuff
-	$(INSTALL_PROGRAM) $(OKI_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(OKI_BSP)
-	$(INSTALL_DATA) ${srcdir}/op50n.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/op50n.ld
+	$(INSTALL_PROGRAM) $(OKI_BSP) $(tooldir)/lib${MULTISUBDIR}/$(OKI_BSP)
+	$(INSTALL_DATA) ${srcdir}/op50n.ld $(tooldir)/lib${MULTISUBDIR}/op50n.ld
 	# install WinBond stuff
-	$(INSTALL_PROGRAM) $(WEC_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(WEC_BSP)
-	$(INSTALL_DATA) ${srcdir}/w89k.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/w89k.ld
+	$(INSTALL_PROGRAM) $(WEC_BSP) $(tooldir)/lib${MULTISUBDIR}/$(WEC_BSP)
+	$(INSTALL_DATA) ${srcdir}/w89k.ld $(tooldir)/lib${MULTISUBDIR}/w89k.ld
 
 info:
 install-info:
diff --git a/libgloss/pa/configure b/libgloss/pa/configure
index 702c6b2..8d0bb3c 100755
--- a/libgloss/pa/configure
+++ b/libgloss/pa/configure
@@ -28,6 +28,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -142,6 +143,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -312,6 +314,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -477,12 +484,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -583,7 +594,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
+echo "configure:598: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -604,7 +615,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
+echo "configure:619: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -622,7 +633,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
+echo "configure:637: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -676,7 +687,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:680: checking for a BSD compatible install" >&5
+echo "configure:691: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -732,7 +743,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:736: checking for $ac_word" >&5
+echo "configure:747: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -762,7 +773,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:766: checking for $ac_word" >&5
+echo "configure:777: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -813,7 +824,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:817: checking for $ac_word" >&5
+echo "configure:828: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -845,7 +856,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:849: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:860: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -856,12 +867,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 860 "configure"
+#line 871 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -887,12 +898,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:891: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:902: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:896: checking whether we are using GNU C" >&5
+echo "configure:907: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -901,7 +912,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -920,7 +931,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:924: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:935: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -960,7 +971,7 @@ LD=${LD-ld}
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:964: checking for $ac_word" >&5
+echo "configure:975: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/libgloss/read.c b/libgloss/read.c
index 419a8ed..eb86ea3 100644
--- a/libgloss/read.c
+++ b/libgloss/read.c
@@ -31,7 +31,7 @@ _DEFUN (read, (fd, buf, nbytes),
   for (i = 0; i < nbytes; i++) {
     *(buf + i) = inbyte();
     if ((*(buf + i) == '\n') || (*(buf + i) == '\r')) {
-      i++;
+      (*(buf + i + 1)) = 0;
       break;
     }
   }
diff --git a/libgloss/rs6000/Makefile.in b/libgloss/rs6000/Makefile.in
index 3c41ef0..6f1deae 100644
--- a/libgloss/rs6000/Makefile.in
+++ b/libgloss/rs6000/Makefile.in
@@ -15,8 +15,7 @@
 # This currently works with the PPC simulator.
 #
 
-DESTDIR =
-VPATH = @srcdir@:@srcdir@/..
+VPATH = @srcdir@ @srcdir@/..
 srcdir = @srcdir@
 objdir = .
 srcroot = $(srcdir)/../..
@@ -68,7 +67,7 @@ SIM_SCRIPTS	=
 SIM_LDFLAGS	=
 SIM_BSP		= libsim.a
 SIM_CRT0	= sim-crt0.o
-SIM_OBJS	= sim-print.o sim-inbyte.o sim-sbrk.o sim-abort.o sim-errno.o simulator.o sim-getrusage.o
+SIM_OBJS	= sim-print.o sim-inbyte.o sim-sbrk.o sim-abort.o sim-errno.o simulator.o
 SIM_TEST	= sim-test
 SIM_INSTALL	= install-sim
 
@@ -270,7 +269,6 @@ mbx-test.srec:	mbx-test.x
 crt0.o: crt0.S
 
 simulator.o: simulator.S
-sim-getrusage.o: sim-getrusage.S
 sim-crt0.o: sim-crt0.S
 mount.o: mount.S
 
@@ -317,28 +315,28 @@ distclean maintainer-clean realclean: clean
 install: ${SIM_INSTALL} ${MVME_INSTALL} ${SOLARIS_INSTALL} ${LINUX_INSTALL} ${YELLOWKNIFE_INSTALL} ${ADS_INSTALL} ${MBX_INSTALL}
 
 install-sim:
-	set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${SIM_CRT0} ${SIM_BSP} ${SIM_SCRIPTS}; do ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
 
 install-mvme:
-	set -e; for x in ${MVME_CRT0} ${MVME_BSP} ${MVME_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${MVME_CRT0} ${MVME_BSP} ${MVME_SCRIPTS}; do ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
 
 install-solaris:
-	set -e; for x in ${SOLARIS_CRT0} ${SOLARIS_BSP} ${SOLARIS_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${SOLARIS_CRT0} ${SOLARIS_BSP} ${SOLARIS_SCRIPTS}; do ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
 
 install-linux:
-	set -e; for x in ${LINUX_CRT0} ${LINUX_BSP} ${LINUX_SCRIPTS}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${LINUX_CRT0} ${LINUX_BSP} ${LINUX_SCRIPTS}; do ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
 
 install-yellowknife:
-	set -e; for x in ${YELLOWKNIFE_CRT0} ${YELLOWKNIFE_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-	set -e; for x in ${YELLOWKNIFE_SCRIPTS}; do ${INSTALL_DATA} $(srcdir)/$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${YELLOWKNIFE_CRT0} ${YELLOWKNIFE_BSP}; do ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${YELLOWKNIFE_SCRIPTS}; do ${INSTALL_DATA} $(srcdir)/$$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
 
 install-ads:
-	set -e; for x in ${ADS_CRT0} ${ADS_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-	set -e; for x in ${ADS_SCRIPTS}; do ${INSTALL_DATA} $(srcdir)/$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${ADS_CRT0} ${ADS_BSP}; do ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${ADS_SCRIPTS}; do ${INSTALL_DATA} $(srcdir)/$$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
 
 install-mbx:
-	set -e; for x in ${MBX_CRT0} ${MBX_BSP}; do ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
-	set -e; for x in ${MBX_SCRIPTS} ${MBX_SPECS}; do ${INSTALL_DATA} $(srcdir)/$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${MBX_CRT0} ${MBX_BSP}; do ${INSTALL_DATA} $$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
+	set -e; for x in ${MBX_SCRIPTS} ${MBX_SPECS}; do ${INSTALL_DATA} $(srcdir)/$$x ${tooldir}/lib${MULTISUBDIR}/$$x; done
 
 doc:
 info:
diff --git a/libgloss/rs6000/ads.ld b/libgloss/rs6000/ads.ld
index ef5038e..1fe80d8 100644
--- a/libgloss/rs6000/ads.ld
+++ b/libgloss/rs6000/ads.ld
@@ -145,7 +145,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/rs6000/mbx.ld b/libgloss/rs6000/mbx.ld
index cedf4e8..7ba3db9 100644
--- a/libgloss/rs6000/mbx.ld
+++ b/libgloss/rs6000/mbx.ld
@@ -125,7 +125,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/rs6000/sim-getrusage.S b/libgloss/rs6000/sim-getrusage.S
deleted file mode 100644
index 20f1c62..0000000
--- a/libgloss/rs6000/sim-getrusage.S
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * sim-getrusage.S -- PowerPC simulator getrusage call.
- *
- * Copyright (c) 1995, 2000, 2001 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include "ppc-asm.h"
-
-FUNC_START(getrusage)
-	li	r0,117
-	sc
-	bns+	0f
-	b	FUNC_NAME(_cerror)
-0:	blr
-FUNC_END(getrusage)
diff --git a/libgloss/rs6000/simulator.S b/libgloss/rs6000/simulator.S
index 914a761..e8c1838 100644
--- a/libgloss/rs6000/simulator.S
+++ b/libgloss/rs6000/simulator.S
@@ -79,14 +79,6 @@ FUNC_START(dup)
 	b	FUNC_NAME(_cerror)
 FUNC_END(dup)
 
-FUNC_START(gettimeofday)
-	li	r0,116
-	sc
-	bns+	0f
-	b	FUNC_NAME(_cerror)
-0:	blr
-FUNC_END(gettimeofday)
-
 FUNC_START(lseek)
 	li	r0,199
 	sc
diff --git a/libgloss/rs6000/yellowknife.ld b/libgloss/rs6000/yellowknife.ld
index 36c3009..96c4260 100644
--- a/libgloss/rs6000/yellowknife.ld
+++ b/libgloss/rs6000/yellowknife.ld
@@ -137,7 +137,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sh/sh1lcevb.ld b/libgloss/sh/sh1lcevb.ld
index b2979d7..efe9ab3 100644
--- a/libgloss/sh/sh1lcevb.ld
+++ b/libgloss/sh/sh1lcevb.ld
@@ -105,7 +105,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sh/sh2lcevb.ld b/libgloss/sh/sh2lcevb.ld
index 06a85ad..8ae7f31 100644
--- a/libgloss/sh/sh2lcevb.ld
+++ b/libgloss/sh/sh2lcevb.ld
@@ -101,7 +101,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sh/sh3bb.ld b/libgloss/sh/sh3bb.ld
index f2a3319..c3fc657 100644
--- a/libgloss/sh/sh3bb.ld
+++ b/libgloss/sh/sh3bb.ld
@@ -103,7 +103,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sh/sh3lcevb.ld b/libgloss/sh/sh3lcevb.ld
index d41c65f..0129921 100644
--- a/libgloss/sh/sh3lcevb.ld
+++ b/libgloss/sh/sh3lcevb.ld
@@ -101,7 +101,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sparc/Makefile.in b/libgloss/sparc/Makefile.in
index 67f19ac..fcf5448 100644
--- a/libgloss/sparc/Makefile.in
+++ b/libgloss/sparc/Makefile.in
@@ -13,7 +13,6 @@
 # Makefile for libgloss/sparc. This is the board support
 # code for the various sparc targets.
 
-DESTDIR =
 VPATH = @srcdir@
 srcdir = @srcdir@
 objdir = .
@@ -172,36 +171,36 @@ $(objdir)/cygmon.ld: @CYGMONLDSCRIPTTEMPL@
 	sed 's/TARGET_OBJ_FORMAT/$($(CPU)_OBJ_FORMAT)/g;s/TARGET_RAM_START/$($(CPU)_RAM_START)/g;' < $(<) > $(objdir)/cygmon.ld
 
 install: $($(CPU)_INSTALL)
-	$(INSTALL_DATA) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
+	$(INSTALL_DATA) $(CRT0) $(tooldir)/lib${MULTISUBDIR}/$(CRT0)
 
 sparc-install:
-	$(INSTALL_DATA) $(CYGMON_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(CYGMON_OBJS) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(objdir)/cygmon.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(CYGMON_CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(CYGMON_BSP) $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(CYGMON_OBJS) $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(objdir)/cygmon.ld $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(CYGMON_CRT0) $(tooldir)/lib${MULTISUBDIR}
 
 slite-install:
-	$(INSTALL_DATA) $(930_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(930_BSP)
-	$(INSTALL_DATA) $(931_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(931_BSP)
-	$(INSTALL_DATA) $(934_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(934_BSP)
-	$(INSTALL_DATA) $(86X_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(86X_BSP)
-	$(INSTALL_DATA) $(srcdir)/ex930.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(srcdir)/ex931.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(srcdir)/ex934.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(srcdir)/sparc86x.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(srcdir)/elfsim.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(ERC32_CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(ERC32_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(objdir)/traps.o $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(CYGMON_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(CYGMON_OBJS) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(objdir)/cygmon.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(CYGMON_CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(930_BSP) $(tooldir)/lib${MULTISUBDIR}/$(930_BSP)
+	$(INSTALL_DATA) $(931_BSP) $(tooldir)/lib${MULTISUBDIR}/$(931_BSP)
+	$(INSTALL_DATA) $(934_BSP) $(tooldir)/lib${MULTISUBDIR}/$(934_BSP)
+	$(INSTALL_DATA) $(86X_BSP) $(tooldir)/lib${MULTISUBDIR}/$(86X_BSP)
+	$(INSTALL_DATA) $(srcdir)/ex930.ld $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(srcdir)/ex931.ld $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(srcdir)/ex934.ld $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(srcdir)/sparc86x.ld $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(srcdir)/elfsim.ld $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(ERC32_CRT0) $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(ERC32_BSP) $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(objdir)/traps.o $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(CYGMON_BSP) $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(CYGMON_OBJS) $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(objdir)/cygmon.ld $(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(CYGMON_CRT0) $(tooldir)/lib${MULTISUBDIR}
 
 splet-install:
-	$(INSTALL_DATA) $(701_CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(701_CRT0)
-	$(INSTALL_DATA) $(701_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(701_BSP)
-	$(INSTALL_DATA) $(srcdir)/tsc701.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
+	$(INSTALL_DATA) $(701_CRT0) $(tooldir)/lib${MULTISUBDIR}/$(701_CRT0)
+	$(INSTALL_DATA) $(701_BSP) $(tooldir)/lib${MULTISUBDIR}/$(701_BSP)
+	$(INSTALL_DATA) $(srcdir)/tsc701.ld $(tooldir)/lib${MULTISUBDIR}
 
 # Make a simple test case to test the linker script, startup code, and
 # I/O code
diff --git a/libgloss/sparc/configure b/libgloss/sparc/configure
index 2e499c4..c507e7a 100755
--- a/libgloss/sparc/configure
+++ b/libgloss/sparc/configure
@@ -28,6 +28,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -142,6 +143,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -312,6 +314,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -477,12 +484,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -568,7 +579,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:572: checking for a BSD compatible install" >&5
+echo "configure:583: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -649,7 +660,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:653: checking host system type" >&5
+echo "configure:664: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -670,7 +681,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:674: checking target system type" >&5
+echo "configure:685: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -688,7 +699,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:692: checking build system type" >&5
+echo "configure:703: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -722,7 +733,7 @@ test "$host_alias" != "$target_alias" &&
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:726: checking for $ac_word" >&5
+echo "configure:737: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -752,7 +763,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:756: checking for $ac_word" >&5
+echo "configure:767: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -801,7 +812,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:805: checking whether we are using GNU C" >&5
+echo "configure:816: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -810,7 +821,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -825,7 +836,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:829: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:840: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -861,7 +872,7 @@ LD=${LD-ld}
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:865: checking for $ac_word" >&5
+echo "configure:876: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/libgloss/sparc/cygmon-salib.c b/libgloss/sparc/cygmon-salib.c
index 395e16f..4f65c0f 100644
--- a/libgloss/sparc/cygmon-salib.c
+++ b/libgloss/sparc/cygmon-salib.c
@@ -7,9 +7,9 @@ void
 putTtyChar(int c)
 {
   /* 2 is fork under solaris; bad juju */
-  asm("	mov %i0,%o0		\n\
-	or %g0,2,%g1		\n\
-	ta 8			\n\
+  asm("	mov %i0,%o0
+	or %g0,2,%g1
+	ta 8
 	nop");
 }
 
@@ -20,8 +20,8 @@ write(int fd,char *ptr,int amt)
     {
       return -1;
     }
-  asm(" or %g0, 4, %g1		\n\
-	ta 8			\n\
+  asm(" or %g0, 4, %g1
+	ta 8
 	nop");
   return amt;
 }
@@ -33,8 +33,8 @@ read(int fd,char *ptr,int amt)
     {
       return -1;
     }
-  asm(" or %g0, 3, %g1		\n\
-	ta 8			\n\
+  asm(" or %g0, 3, %g1
+	ta 8
 	nop");
   return amt;
 }
@@ -43,19 +43,19 @@ void
 _exit(int code)
 {
   while(1) {
-    asm(" or %g0,1,%g1		\n\
-	  ta 8			\n\
-	  nop			\n\
-	  ta 1			\n\
-	  nop");
+    asm("	or %g0,1,%g1
+		ta 8
+		nop
+		ta 1
+		nop");
   }
 }
 
 int
 setitimer(int which, const struct itimerval *value, struct itimerval *ovalue)
 {
-  asm(" or %g0, 158, %g1	\n\
-	ta 8			\n\
+  asm(" or %g0, 158, %g1
+	ta 8
 	nop");
 }
 
@@ -138,8 +138,8 @@ isatty(int fd)
 int
 kill (int pid, int signal)
 {
-  asm ("or %g0, 37, %g1		\n\
-	ta 8			\n\
+  asm ("or %g0, 37, %g1
+	ta 8
 	nop");
 }
 
@@ -152,50 +152,50 @@ getpid ()
 int
 getitimer (int which, struct itimerval *value)
 {
-  asm ("or %g0, 157, %g1	\n\
-	ta 8			\n\
+  asm ("or %g0, 157, %g1
+	ta 8
 	nop");
 }
 
 void
 __install_signal_handler (void *func)
 {
-  asm ("mov %o0, %o1		\n\
-	mov %g0, %o0		\n\
-	or %g0, 48, %g1		\n\
-	ta 8			\n\
+  asm ("mov %o0, %o1
+	mov %g0, %o0
+	or %g0, 48, %g1
+	ta 8
 	nop");
 }
 
 int
 gettimeofday (struct timeval *tp, struct timezone *tzp)
 {
-  asm ("or %g0, 156, %g1	\n\
-	ta 8			\n\
+  asm ("or %g0, 156, %g1
+	ta 8
 	nop");
 }
 
 int
 stime (long *seconds)
 {
-  asm ("or %g0, 25, %g1		\n\
-	ta 8			\n\
+  asm ("or %g0, 25, %g1
+	ta 8
 	nop");
 }
 
 int
 add_mapping (long vma, long pma, long size)
 {
-  asm ("or %g0, 115, %g1	\n\
-	ta 8			\n\
+  asm ("or %g0, 115, %g1
+	ta 8
 	nop");
 }
 
 int
 remove_mapping (long vma, long vma_end)
 {
-  asm ("or %g0, 117, %g1	\n\
-	ta 8			\n\
+  asm ("or %g0, 117, %g1
+	ta 8
 	nop");
 }
 
@@ -211,10 +211,10 @@ __getProgramArgs (int *argv)
   int *res;
 
   /* 184 is tsolsys under solaris; bad juju */
-  asm ("mov %1, %%o0		\n\
-	or %%g0, 184, %%g1	\n\
-	ta 8			\n\
-	nop			\n\
+  asm ("mov %1, %%o0
+	or %%g0, 184, %%g1
+	ta 8
+	nop
 	mov %%o0, %0" : "=r" (res) : "r" (argv): "g1");
   return res;
 }
diff --git a/libgloss/sparc/elfsim.ld b/libgloss/sparc/elfsim.ld
index a047a05..d1831be 100644
--- a/libgloss/sparc/elfsim.ld
+++ b/libgloss/sparc/elfsim.ld
@@ -95,6 +95,7 @@ SECTIONS
   {
     _stext = .;
     PROVIDE (stext = .);
+    __EH_FRAME_BEGIN__ = .;
     *(.text)
     _etext = .;
     PROVIDE (etext = .);
@@ -122,7 +123,6 @@ SECTIONS
     *(.lit)
     *(.rodata)
     *(.shdata)
-    __EH_FRAME_BEGIN__ = .;
     *(.eh_frame)
     *(.gnu.linkonce.t*)
     *(.gnu.linkonce.r*)
@@ -193,7 +193,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sparc/erc32-stub.c b/libgloss/sparc/erc32-stub.c
index 98866e3..71a65b2 100644
--- a/libgloss/sparc/erc32-stub.c
+++ b/libgloss/sparc/erc32-stub.c
@@ -136,22 +136,22 @@ handle_exception (registers)
   DEBUG (1, "Entering handle_exception()");
 
 /*  asm("mov %g0, %wim ; nop; nop; nop"); */
-  asm("	save %sp, -64, %sp	\n\
-	save %sp, -64, %sp	\n\
-	save %sp, -64, %sp	\n\
-	save %sp, -64, %sp	\n\
-	save %sp, -64, %sp	\n\
-	save %sp, -64, %sp	\n\
-	save %sp, -64, %sp	\n\
-	save %sp, -64, %sp	\n\
-	restore			\n\
-	restore			\n\
-	restore			\n\
-	restore			\n\
-	restore			\n\
-	restore			\n\
-	restore			\n\
-	restore			\n\
+  asm("	save %sp, -64, %sp
+	save %sp, -64, %sp
+	save %sp, -64, %sp
+	save %sp, -64, %sp
+	save %sp, -64, %sp
+	save %sp, -64, %sp
+	save %sp, -64, %sp
+	save %sp, -64, %sp
+	restore
+	restore
+	restore
+	restore
+	restore
+	restore
+	restore
+	restore
 ");
 
   if (registers[PC] == (unsigned long)breakinst) {
@@ -180,10 +180,10 @@ breakpoint()
   if (!initialized)
     return;
 
-  asm("	.globl " STRINGSYM(breakinst) "		\n\
-	" STRINGSYM(breakinst) ": ta 128+1	\n\
-	nop					\n\
-	nop					\n\
+  asm("	.globl " STRINGSYM(breakinst) "
+	" STRINGSYM(breakinst) ": ta 128+1
+	nop
+	nop
       ");
 }
 
@@ -197,9 +197,9 @@ int tt;
   print ("Got a bad trap #");
   outbyte (tt);
   outbyte ('\n');
-  asm("ta 0		\n\
-	nop		\n\
-	nop		\n\
+  asm("ta 0
+	nop
+	nop
       ");
 }
 
@@ -213,9 +213,9 @@ int tt;
   print ("Got a soft trap #");
   outbyte (tt);
   outbyte ('\n');
-  asm("ta 0		\n\
-	nop		\n\
-	nop		\n\
+  asm("ta 0
+	nop
+	nop
       ");
 }
 
@@ -239,7 +239,7 @@ flush_i_cache ()
 void
 target_reset()
 {
-  asm ("call 0		\n\
+  asm ("call 0
 	nop ");
 }
 
diff --git a/libgloss/sparc/ex930.ld b/libgloss/sparc/ex930.ld
index 9822dca..b501b2e 100644
--- a/libgloss/sparc/ex930.ld
+++ b/libgloss/sparc/ex930.ld
@@ -151,7 +151,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sparc/ex931.ld b/libgloss/sparc/ex931.ld
index b3e6107..26ffb4d 100644
--- a/libgloss/sparc/ex931.ld
+++ b/libgloss/sparc/ex931.ld
@@ -151,7 +151,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sparc/ex934.ld b/libgloss/sparc/ex934.ld
index ff2f91b..7d1d5ed 100644
--- a/libgloss/sparc/ex934.ld
+++ b/libgloss/sparc/ex934.ld
@@ -151,7 +151,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/sparc/libsys/Makefile.in b/libgloss/sparc/libsys/Makefile.in
index b4c4be6..f3a036f 100644
--- a/libgloss/sparc/libsys/Makefile.in
+++ b/libgloss/sparc/libsys/Makefile.in
@@ -14,7 +14,6 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-DESTDIR =
 VPATH = @srcdir@
 srcdir = @srcdir@
 objdir = .
@@ -92,8 +91,8 @@ libsys.a: $(OFILES)
 	$(AR) $(AR_FLAGS) $@ $(OFILES)
 
 install:
-	$(INSTALL_DATA) libsys-crt0.o $(DESTDIR)$(tooldir)/lib/libsys-crt0.o
-	$(INSTALL_DATA) libsys.a $(DESTDIR)$(tooldir)/lib/libsys.a
+	$(INSTALL_DATA) libsys-crt0.o $(tooldir)/lib/libsys-crt0.o
+	$(INSTALL_DATA) libsys.a $(tooldir)/lib/libsys.a
 
 doc:
 
diff --git a/libgloss/sparc/sparc86x.ld b/libgloss/sparc/sparc86x.ld
index 585b16c..e7cf27e 100644
--- a/libgloss/sparc/sparc86x.ld
+++ b/libgloss/sparc/sparc86x.ld
@@ -82,6 +82,7 @@ SECTIONS
   .text : {
     stext = .;
     _stext = .;
+    __EH_FRAME_BEGIN__ = .;
 
     CREATE_OBJECT_SYMBOLS
     *(.text)
@@ -107,7 +108,6 @@ SECTIONS
     *(.lit)
     *(.rodata)
     *(.shdata)
-    __EH_FRAME_BEGIN__ = .;
     *(.eh_frame)
     *(.gnu.linkonce.t*)
     *(.gnu.linkonce.r*)
@@ -168,7 +168,6 @@ SECTIONS
   .debug_str      0 : { *(.debug_str) }
   .debug_loc      0 : { *(.debug_loc) }
   .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
   /* SGI/MIPS DWARF 2 extensions */
   .debug_weaknames 0 : { *(.debug_weaknames) }
   .debug_funcnames 0 : { *(.debug_funcnames) }
diff --git a/libgloss/xstormy16/Makefile.in b/libgloss/xstormy16/Makefile.in
deleted file mode 100644
index b33e1ac..0000000
--- a/libgloss/xstormy16/Makefile.in
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-#
-
-DESTDIR =
-VPATH = @srcdir@ @srcdir@/..
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-
-SHELL =	/bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-
-# Yuk.
-OBJCOPY = $(subst ranlib,objcopy,$(RANLIB))
-
-OBJS		= isatty.o
-CFLAGS		= -g -O2
-ASFLAGS		= --gdwarf2
-SCRIPTS		= 
-CRT		= crt0.o crti.o crtn.o
-
-# Here is all of the simulator stuff
-SIM_SCRIPTS	= sim_high.ld sim_rom.ld
-SIM_LDFLAGS	=
-SIM_BSP		= libsim.a
-SIM_OBJS	= syscalls.o sim_malloc_start.o
-
-# Here is stuff for building apps for GDB on the EVA board
-EVA_APP_BSP     = libeva_app.a
-EVA_APP_OBJS    = close.o fstat.o getpid.o kill.o lseek.o open.o \
-                  stat.o unlink.o eva_app.o
-EVA_APP_SCRIPTS = eva_app.ld
-
-# Stub stuff
-EVA_STUB_HEX    = eva_stub.hex
-EVA_STUB        = eva_stub.elf
-EVA_STUB_OBJS   = xstormy16_stub.o crt0_stub.o
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-#
-# build a test program for each target board. Just trying to get
-# it to link is a good test, so we ignore all the errors for now.
-#
-# all: ${MON_CRT0} ${MON_BSP}
-all: ${CRT} ${SIM_BSP} ${EVA_APP_BSP} ${EVA_STUB_HEX}
-
-#
-# here's where we build the board support packages for each target
-#
-${SIM_BSP}: ${OBJS} ${SIM_OBJS}
-	${AR} ${ARFLAGS} ${SIM_BSP} ${SIM_OBJS} ${OBJS}
-	${RANLIB} ${SIM_BSP}
-
-${EVA_APP_BSP}: ${OBJS} ${EVA_APP_OBJS}
-	${AR} ${ARFLAGS} ${EVA_APP_BSP} ${EVA_APP_OBJS} ${OBJS}
-	${RANLIB} ${EVA_APP_BSP}
-
-${EVA_STUB_HEX}: ${EVA_STUB}
-	${OBJCOPY} -O ihex $< $@
-
-${EVA_STUB}: ${EVA_STUB_OBJS} ${srcdir}/eva_stub.ld
-	${CC} -g -Os -nostartfiles -T${srcdir}/eva_stub.ld ${EVA_STUB_OBJS} -o $@
-
-
-#
-# here's where we build the test programs for each target
-#
-.PHONY: test
-test:	
-	true
-
-#
-#
-#
-.c.S:
-	${CC} ${CFLAGS_FOR_TARGET} -c $<
-
-clean mostlyclean:
-	rm -f a.out core *.i *.o *-test *.srec *.dis *.x *.hex $(SIM_BSP) $(EVA_APP_BSP) $(EVA_STUB} 
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile config.status *~
-
-.PHONY: install info install-info clean-info
-install: 
-	set -e; for x in ${SIM_BSP} ${CRT} ${EVA_APP_BSP} ${EVA_STUB_HEX} ${EVA_STUB} ; do\
-	  ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	done
-	@for script in ${SCRIPTS} ${SIM_SCRIPTS} ${EVA_APP_SCRIPTS}; do\
-	  ${INSTALL_DATA} ${srcdir}/$${script} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$${script}; \
-	done
-
-
-doc:
-info:
-install-info:
-clean-info:
-
-Makefile: Makefile.in config.status @host_makefile_frag_path@
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/libgloss/xstormy16/close.c b/libgloss/xstormy16/close.c
deleted file mode 100644
index 5fcfbf5..0000000
--- a/libgloss/xstormy16/close.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* close.c -- close a file descriptor.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include "glue.h"
-
-/*
- * close -- We don't need to do anything, but pretend we did.
- */
-int
-_DEFUN (_close ,(fd),
-       int fd)
-{
-  return (0);
-}
diff --git a/libgloss/xstormy16/configure b/libgloss/xstormy16/configure
deleted file mode 100755
index d0e7f7c..0000000
--- a/libgloss/xstormy16/configure
+++ /dev/null
@@ -1,1219 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12.1 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12.1"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=crt0.s
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:571: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:592: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:610: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'`
-  ac_aux_dir=
-for ac_dir in ${mdir}../../.. $srcdir/${mdir}../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ${mdir}../../.. $srcdir/${mdir}../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-else
-  ac_aux_dir=
-for ac_dir in ${srcdir}/../.. $srcdir/${srcdir}/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ${srcdir}/../.. $srcdir/${srcdir}/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:708: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:770: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:799: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  ac_prog_rejected=no
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:847: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:871: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:907: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-host_makefile_frag_path=$host_makefile_frag
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12.1"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@host_makefile_frag_path@%$host_makefile_frag_path%g
-/@host_makefile_frag@/r $host_makefile_frag
-s%@host_makefile_frag@%%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/libgloss/xstormy16/configure.in b/libgloss/xstormy16/configure.in
deleted file mode 100644
index 5824402..0000000
--- a/libgloss/xstormy16/configure.in
+++ /dev/null
@@ -1,75 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
-AC_INIT(crt0.s)
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-
-if test "$srcdir" = "." ; then
-  mdir=`echo "${with_multisubdir}/" \
-    | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'`
-  AC_CONFIG_AUX_DIR(${mdir}../../..)
-else
-  AC_CONFIG_AUX_DIR(${srcdir}/../..)
-fi
-
-AC_PROG_INSTALL
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-AC_PROG_RANLIB
-
-host_makefile_frag=${srcdir}/../config/default.mh
-
-dnl We have to assign the same value to other variables because autoconf
-dnl doesn't provide a mechanism to substitute a replacement keyword with
-dnl arbitrary data or pathnames.
-dnl
-host_makefile_frag_path=$host_makefile_frag
-AC_SUBST(host_makefile_frag_path)
-AC_SUBST_FILE(host_makefile_frag)
-
-AC_OUTPUT(Makefile)
diff --git a/libgloss/xstormy16/crt0.s b/libgloss/xstormy16/crt0.s
deleted file mode 100644
index 39e00d2..0000000
--- a/libgloss/xstormy16/crt0.s
+++ /dev/null
@@ -1,114 +0,0 @@
-# XSTORMY16 startup code
-
-# Interrupt vectors at 0x8000.
-	.section .int_vec,"ax"
-	.global	_start
-	.align 1
-_start:
-	;; Reset, watchdog timer interrupt
-	jmpf _int_reset
-	;; base timer interrupt
-	jmpf _int_basetimer
-	;; timer 0
-	jmpf _int_timer0
-	;; timer 1
-	jmpf _int_timer1
-	;; SIO0 interrupt
-	jmpf _int_sio0
-	;; SIO1 interrupt
-	jmpf _int_sio1
-	;; port0 interrupt
-	jmpf _int_port0
-	;; port1 interrupt
-	jmpf _int_port1
-
-# Reset code, set up memory and call main.
-        .section        .rodata
-2:	.word	__rdata
-	.text
-_int_reset:
-	;; Set up the stack pointer.
-	mov r0,#__stack
-        bz  r0,#0,0f
-	mov sp,r0
-0:
-	;; Zero the data space
-	mov r0,#_edata
-	mov r1,#_end
-	mov r2,#0
-0:	mov.w (r0++),r2
-	blt r0,r1,0b
-
-	;; Copy data from ROM into RAM.  ROM area may be above 64k,
-	;; but RAM may not.
-	mov r1,#__data
-	mov r3,#_edata
-	mov r4,#2b
-	mov.w r0,(r4++)
-	mov.w r2,(r4) 
-	mov r8,r2
-	;; If _data == _rdata there's no need to copy anything.
-	bnz r0,r1,0f
-	bz r2,#0,1f
-0:	movf.w r2,(r0++)
-	bnz r0,#0,2f
-	add r8,#1
-2:	mov.w (r1++),r2
-	blt r1,r3,0b
-1:	
-	;; Call hardware init routine
-	callf _hwinit
-	;; Call initialization routines
-	callf _init
-	;; Set up fini routines to be called from exit
-	mov r2,#@fptr(_fini)
-	callf atexit
-	;; Call main() with empty argc/argv/envp
-	mov r2,#0
-	mov r3,#0
-	mov r4,#0
-	callf main
-	;; Exit.
-	callf exit
-	;; Should never reach this code.
-	halt
-1:	.size _int_reset,1b-_int_reset
-		
-# Stub interrupt routines.
-	.globl _int_timer0
-	.weak _int_timer0
-	.globl _int_timer1
-	.weak _int_timer1
-	.globl _int_sio0
-	.weak _int_sio0
-	.globl _int_sio1
-	.weak _int_sio1
-	.globl _int_port0
-	.weak _int_port0
-	.globl _int_port1
-	.weak _int_port1
-	.globl _int_basetimer
-	.weak _int_basetimer
-_int_timer0:
-_int_timer1:
-_int_sio0:
-_int_sio1:
-_int_port0:
-_int_port1:
-_int_basetimer:
-	iret
-1:	.size _int_timer0,1b-_int_timer0
-
-# Stub hardware init
-	.globl _hwinit
-	.weak _hwinit
-_hwinit:
-	ret
-1:	.size _int_hwinit,1b-_int_hwinit
-
-# The first word in .data has address 0, so it's not a good
-# idea to use it as its address conflicts with NULL.
-# Place a HALT instruction there to try to catch NULL pointer
-# dereferences.
-	.data
-	halt
diff --git a/libgloss/xstormy16/crt0_stub.s b/libgloss/xstormy16/crt0_stub.s
deleted file mode 100644
index 14ec471..0000000
--- a/libgloss/xstormy16/crt0_stub.s
+++ /dev/null
@@ -1,151 +0,0 @@
-# XSTORMY16 startup code for GDB stub.
-
-# CPU Data for Sanyo EVA debugger at 0x7F00
-        .section .cpudata,"ax"
-        .byte   0x00,0x02,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x44,0x35,0x39,0x52,0x30,0x30,0x30,0x30,0x2E,0x4F,0x50,0x54,0x00,0x00,0x00,0x00
-        .byte   0x4c,0x43,0x35,0x39,0x52,0x30,0x30,0x30,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x80,0x00,0x20,0x48,0x00,0x00,0x00
-        .byte   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x20,0x01,0x12,0x31,0x23,0x59
-
-# Interrupt vectors at 0x8000.
-	.section .int_vec,"ax"
-	.global	_start
-	.align 1
-_start:
-	;; Reset, watchdog timer interrupt
-	jmpf _int_reset
-	;; base timer interrupt
-	jmpf _int_basetimer
-	;; timer 0
-	jmpf _int_timer0
-	;; timer 1
-	jmpf _int_timer1
-	;; SIO0 interrupt
-	jmpf _int_sio0
-	;; SIO1 interrupt
-	jmpf _int_sio1
-	;; port0 interrupt
-	jmpf _int_port0
-	;; port1 interrupt
-	jmpf _int_port1
-
-	.org 0x80
-	;; sys interrupt (0x8080)
-	jmpf _int_sys
-
-	;; Application void write(char *buf, int nbytes)
-	;; This jmps to a stub function to packetize the buf for GDB
-	jmpf gdb_write
-	;; Application int read(char *buf, int nbytes)
-	jmpf gdb_read
-
-	.text
-# Reset code, set up memory and call main.
-_int_reset:
-	;; Set up the application stack pointer.
-	mov sp,#0x002
-
-	;; Zero the data space
-	mov r0,#_edata
-	mov r1,#_end
-	mov r2,#0
-0:	mov.w (r0++),r2
-	blt r0,r1,0b
-
-	;; Init the UART
-	callf uart_init
-
-	;; Turn on illegal insn trap
-	mov   r0,r14
-	set1  r0,#11
-	mov   r14,r0
-	mov.b 0x7f08,#0x11
-	mov.b 0x7f09,#0x10
-
-	;; "breakpoint" sends us into stub.
-0:
-	.hword 0x0006
-	br  0b
-
-_int_sys:
-	push  r13
-	mov   r13,#registers
-	mov.w (r13++),r0
-	mov.w (r13++),r1
-	mov.w (r13++),r2
-	mov.w (r13++),r3
-	mov.w (r13++),r4
-	mov.w (r13++),r5
-	mov.w (r13++),r6
-	mov.w (r13++),r7
-	mov   r0,r8
-	mov.w (r13++),r0
-	mov   r0,r9
-	mov.w (r13++),r0
-	mov   r0,r10
-	mov.w (r13++),r0
-	mov   r0,r11
-	mov.w (r13++),r0
-	mov   r0,r12
-	mov.w (r13++),r0
-	pop   r0
-	mov.w (r13++),r0    ; R13
-	pop   r0
-	mov.w (r13++),r0    ; PSW
-	mov   r0,r15
-	sub   r0,#4
-	mov.w (r13++),r0    ; SP
-	pop   r0
-	pop   r1
-	mov.w (r13++),r1    ; PCL
-	mov.w (r13++),r0    ; PCH
-
-	;; switch to stub stack and invoke stub
-	mov sp,#0x700
-	callf handle_exception
-
-	mov   r0,#registers+34
-	mov.w r1,(r0)		; PCH
-	mov.w r2,(--r0)		; PCL
-	mov.w r3,(--r0)		; SP
-	mov   r15,r3
-	push  r2
-	push  r1
-	mov.w r1,(--r0)    ; PSW
-	push  r1
-	mov.w r1,(--r0)
-	mov   r13,r1
-	mov.w r1,(--r0)
-	mov   r12,r1
-	mov.w r1,(--r0)
-	mov   r11,r1
-	mov.w r1,(--r0)
-	mov   r10,r1
-	mov.w r1,(--r0)
-	mov   r9,r1
-	mov.w r1,(--r0)
-	mov   r8,r1
-	mov.w r7,(--r0)
-	mov.w r6,(--r0)
-	mov.w r5,(--r0)
-	mov.w r4,(--r0)
-	mov.w r3,(--r0)
-	mov.w r2,(--r0)
-	mov.w r1,(--r0)
-	mov.w r0,(--r0)
-	iret
-1:	.size _int_sys,1b-_int_sys
-
-
diff --git a/libgloss/xstormy16/crti.s b/libgloss/xstormy16/crti.s
deleted file mode 100644
index 3713ba3..0000000
--- a/libgloss/xstormy16/crti.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.section	.init,"ax"
-	.align 1
-	.globl _init
-_init:	
-
-	.section	.fini,"ax"
-	.align 1
-	.globl _fini
-_fini:	
diff --git a/libgloss/xstormy16/crtn.s b/libgloss/xstormy16/crtn.s
deleted file mode 100644
index 22d71b8..0000000
--- a/libgloss/xstormy16/crtn.s
+++ /dev/null
@@ -1,5 +0,0 @@
-	.section	.init,"ax"
-        ret
-
-	.section	.fini,"ax"
-        ret
diff --git a/libgloss/xstormy16/eva_app.c b/libgloss/xstormy16/eva_app.c
deleted file mode 100644
index f6069fc..0000000
--- a/libgloss/xstormy16/eva_app.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* eva_app.c -- Glue code for linking apps to run under GDB debugger control.
- *
- * Copyright (c) 2001 Red Hat, Inc.
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include "glue.h"
-
-typedef void (*write_proc_t)(char *buf, int nbytes);
-typedef int  (*read_proc_t)(char *buf, int nbytes);
-
-/* There is no "syscall", so we just call directly into the stub code
-   at fixed addresses. */
-#define STUB_WRITE(p,n) ((write_proc_t)0x8084)((p),(n))
-#define STUB_READ(p,n)  ((read_proc_t)0x8088)((p),(n))
-
-/*
- * print -- do a raw print of a string
- */ 
-void
-print(char *ptr)
-{
-  STUB_WRITE(ptr, strlen(ptr));
-}
-
-/*
- * write -- write bytes to the serial port. Ignore fd, since
- *          stdout and stderr are the same. Since we have no filesystem,
- *          open will only return an error.
- */
-int
-_write (int fd, char *buf, int nbytes)
-{
-  STUB_WRITE(buf, nbytes);
-  return (nbytes);
-}
-
-int
-_read (int fd, char *buf, int nbytes)
-{
-  return STUB_READ(buf, nbytes);
-}
-
-extern char _end[];
-#define HEAP_LIMIT ((char *)0xffff)
-
-void *
-_sbrk(int inc)
-{
-  static char *heap_ptr = _end;
-  void *base;
-
-  if (inc > (HEAP_LIMIT - heap_ptr))
-    return (void *)-1;
-
-  base = heap_ptr;
-  heap_ptr += inc;
-
-  return base;
-}
-
-void
-_exit(int n)
-{
-  while (1)
-   {
-     asm volatile ("nop");
-     asm volatile (".hword 0x0006");  /* breakpoint (special illegal insn) */
-   }
-}
diff --git a/libgloss/xstormy16/eva_app.ld b/libgloss/xstormy16/eva_app.ld
deleted file mode 100644
index 6699b05..0000000
--- a/libgloss/xstormy16/eva_app.ld
+++ /dev/null
@@ -1,133 +0,0 @@
-OUTPUT_FORMAT("elf32-xstormy16", "elf32-xstormy16",
-	      "elf32-xstormy16")
-OUTPUT_ARCH(xstormy16)
-ENTRY(_start)
-GROUP(-lc -leva_app -lgcc)
-
-MEMORY 
-{
-  RAM   (w)  : ORIGIN = 0x9000,  LENGTH = 0x7000
-  ROM   (!w)  : ORIGIN = 0x10000, LENGTH = 0x70000
-}
-
-SECTIONS
-{
-  __stack = 2 ;
-  __malloc_start = 0x800;
-  .data    :
-  {
-    __rdata = .;
-    __data = .;
-    *(.data)
-    *(.data.*)
-    *(.gnu.linkonce.d.*)
-    SORT(CONSTRUCTORS)
-  } > RAM
-  /* Read-only sections */
-  .rodata   : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) } > RAM
-  .ctors   : 
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } > RAM
-   .dtors         :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } > RAM
-  .eh_frame : { KEEP (*(.eh_frame)) } > RAM
-  .gcc_except_table : { *(.gcc_except_table) } > RAM
-  .jcr : { *(.jcr) } > RAM
-  .plt : { *(.plt) } > RAM
-  _edata = .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  .bss       :
-  {
-   *(.dynbss)
-   *(.bss)
-   *(.bss.*)
-   *(.gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-   . = ALIGN(2);
-  } > RAM
-  . = ALIGN(2);
-  _end = .;
-  PROVIDE (end = .);
-  .text      :
-  {
-    *(.int_vec)
-    *(.text)
-    *(.text.*)
-    *(.stub)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t.*)
-  } > ROM =0
-  .init          : 
-  { 
-    KEEP (*(.init))
-  } > ROM =0
-  .fini      :
-  {
-    KEEP (*(.fini))
-  } > ROM =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* These must appear regardless of  .  */
-}
diff --git a/libgloss/xstormy16/eva_stub.ld b/libgloss/xstormy16/eva_stub.ld
deleted file mode 100644
index 34f3b91..0000000
--- a/libgloss/xstormy16/eva_stub.ld
+++ /dev/null
@@ -1,142 +0,0 @@
-OUTPUT_FORMAT("elf32-xstormy16", "elf32-xstormy16",
-	      "elf32-xstormy16")
-OUTPUT_ARCH(xstormy16)
-ENTRY(_start)
-
-MEMORY 
-{
-  CPUDATA (!w) : ORIGIN = 0x7F00, LENGTH = 0x100
-  ROM     (w)  : ORIGIN = 0x8000, LENGTH = 0x1000
-}
-
-/* Point interrupt vectors to user application. */
-PROVIDE (_int_basetimer = 0x10004);
-PROVIDE (_int_timer0 = 0x10008);
-PROVIDE (_int_timer1 = 0x1000C);
-PROVIDE (_int_sio0   = 0x10010);
-PROVIDE (_int_sio1   = 0x10014);
-PROVIDE (_int_port0  = 0x10018);
-PROVIDE (_int_port1  = 0x1001C);
-
-SECTIONS
-{
-  /* CPU data for Sanyo debugger */
-  .cpudata :  { KEEP (*(.cpudata)) } > CPUDATA
-  /* Read-only sections in ROM.  */
-  .int_vec  : { *(.int_vec) } > ROM
-  .rodata   : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) } > ROM
-  .ctors   : 
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } > ROM
-   .dtors         :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } > ROM
-  .eh_frame : { KEEP (*(.eh_frame)) } > ROM
-  .gcc_except_table : { *(.gcc_except_table) } > ROM
-  .jcr : { *(.jcr) } > ROM
-  .plt : { *(.plt) } > ROM
-  .text      :
-  {
-    *(.text)
-    *(.text.*)
-    *(.stub)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t.*)
-  } > ROM =0
-  .init          : 
-  { 
-    KEEP (*(.init))
-  } > ROM =0
-  .fini      :
-  {
-    KEEP (*(.fini))
-  } > ROM =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  .data    :
-  {
-    __data = .;
-    __rdata = .;
-    *(.data)
-    *(.data.*)
-    *(.gnu.linkonce.d.*)
-    SORT(CONSTRUCTORS)
-  } > ROM
-  _edata = .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  .bss       :
-  {
-   *(.dynbss)
-   *(.bss)
-   *(.bss.*)
-   *(.gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-   . = ALIGN(2);
-  } > ROM
-  . = ALIGN(2);
-  _end = .;
-  PROVIDE (end = .);
-
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* These must appear regardless of  .  */
-}
diff --git a/libgloss/xstormy16/fstat.c b/libgloss/xstormy16/fstat.c
deleted file mode 100644
index 982d578..0000000
--- a/libgloss/xstormy16/fstat.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* fstat.c -- get status of a file.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <sys/stat.h>
-#include "glue.h"
-
-/*
- * fstat -- Since we have no file system, we just return an error.
- */
-int
-_DEFUN (_fstat, (fd, buf),
-       int fd _AND
-       struct stat *buf)
-{
-  buf->st_mode = S_IFCHR;	/* Always pretend to be a tty */
-  buf->st_blksize = 0;
-
-  return (0);
-}
diff --git a/libgloss/xstormy16/getpid.c b/libgloss/xstormy16/getpid.c
deleted file mode 100644
index 0f081a1..0000000
--- a/libgloss/xstormy16/getpid.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* getpid.c -- get the current process id.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include "glue.h"
-
-/*
- * getpid -- only one process, so just return 1.
- */
-int
-_DEFUN (_getpid, (),
-        )
-{
-  return __MYPID;
-}
diff --git a/libgloss/xstormy16/kill.c b/libgloss/xstormy16/kill.c
deleted file mode 100644
index 0bbc014..0000000
--- a/libgloss/xstormy16/kill.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* kill.c -- remove a process.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include "glue.h"
-
-/*
- * kill -- go out via exit...
- */
-int
-_DEFUN (_kill, (pid, sig),
-        int pid _AND 
-        int sig)
-{
-  if(pid == __MYPID)
-    _exit(sig);
-  return 0;
-}
diff --git a/libgloss/xstormy16/lseek.c b/libgloss/xstormy16/lseek.c
deleted file mode 100644
index 640a96e..0000000
--- a/libgloss/xstormy16/lseek.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* lseek.c -- move read/write pointer.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <sys/types.h>
-#include <errno.h>
-#include "glue.h"
-
-/*
- * lseek --  Since a serial port is non-seekable, we return an error.
- */
-off_t
-_DEFUN (_lseek, (fd,  offset, whence),
-       int fd _AND
-       off_t offset _AND
-       int whence)
-{
-  errno = ESPIPE;
-  return ((off_t)-1);
-}
-
diff --git a/libgloss/xstormy16/open.c b/libgloss/xstormy16/open.c
deleted file mode 100644
index a2c318e..0000000
--- a/libgloss/xstormy16/open.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* open.c -- open a file.
- * 
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <errno.h>
-#include "glue.h"
-
-/*
- * open -- open a file descriptor. We don't have a filesystem, so
- *         we return an error.
- */
-int
-_DEFUN (_open, (buf, flags, mode),
-       const char *buf _AND
-       int flags _AND
-       int mode)
-{
-  errno = EIO;
-  return (-1);
-}
-
diff --git a/libgloss/xstormy16/sim_high.ld b/libgloss/xstormy16/sim_high.ld
deleted file mode 100644
index a7f4aa0..0000000
--- a/libgloss/xstormy16/sim_high.ld
+++ /dev/null
@@ -1,135 +0,0 @@
-/* A modified version of the basic linker script, for testing purposes,
-   which puts all code above 0x10000.  */
-OUTPUT_FORMAT("elf32-xstormy16", "elf32-xstormy16",
-	      "elf32-xstormy16")
-OUTPUT_ARCH(xstormy16)
-ENTRY(_start)
- SEARCH_DIR(/es/scratch/geoffk/objs/mainline-sX/H-i686-pc-linux-gnulibc2.2/xstormy16-elf/lib);
-/* There are two memory regions we care about, one from 0 through 0x7F00
-   that is RAM and one from 0x8000 up which is ROM.  */
-MEMORY
-{
-  RAM (w) : ORIGIN = 0, LENGTH = 0x7F00
-  LOROM (!w) : ORIGIN = 0x8000, LENGTH = 0x8000
-  HIROM (!w) : ORIGIN = 0x10000, LENGTH = 0xFF0000
-}
-SECTIONS
-{
-  .data    :
-  {
-    __data = .;
-    __rdata = .;
-    *(.data)
-    *(.data.*)
-    *(.gnu.linkonce.d.*)
-    SORT(CONSTRUCTORS)
-  } > RAM
-  _edata = .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  .bss       :
-  {
-   *(.dynbss)
-   *(.bss)
-   *(.bss.*)
-   *(.gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-   . = ALIGN(2);
-  } > RAM
-  . = ALIGN(2);
-  __stack = .;
-  _end = .;
-  PROVIDE (end = .);
-  /* Read-only sections in ROM.  */
-  .int_vec       : { *(.int_vec)	} > LOROM
-  .rodata   : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) } > LOROM
-  .ctors   :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } > LOROM
-   .dtors         :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } > LOROM
-  .eh_frame : { KEEP (*(.eh_frame)) } > LOROM
-  .gcc_except_table : { *(.gcc_except_table) } > LOROM
-  .jcr : { *(.jcr) } > LOROM
-  .plt : { *(.plt) } > LOROM
-  .text      :
-  {
-    *(.text)
-    *(.text.*)
-    *(.stub)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t.*)
-  } > HIROM =0
-  .init          :
-  {
-    KEEP (*(.init))
-  } > HIROM =0
-  .fini      :
-  {
-    KEEP (*(.fini))
-  } > HIROM =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* These must appear regardless of  .  */
-}
diff --git a/libgloss/xstormy16/sim_malloc_start.s b/libgloss/xstormy16/sim_malloc_start.s
deleted file mode 100644
index 143053f..0000000
--- a/libgloss/xstormy16/sim_malloc_start.s
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file just defines __malloc_start for newlib for the simulator.
-# The simulator has RAM up to the I/O area at 0x7F00.
-	.globl __malloc_start
-	.set __malloc_start,0x7F00
-	
diff --git a/libgloss/xstormy16/sim_rom.ld b/libgloss/xstormy16/sim_rom.ld
deleted file mode 100644
index e7ef6fb..0000000
--- a/libgloss/xstormy16/sim_rom.ld
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Test xstormy16 programs that have initial data in ROM and copy it
-   to RAM.  */
-
-OUTPUT_FORMAT("elf32-xstormy16", "elf32-xstormy16",
-	      "elf32-xstormy16")
-OUTPUT_ARCH(xstormy16)
-ENTRY(_start)
- SEARCH_DIR(/cuddles/aph/sanyo-011113-branch/install/xstormy16-elf/lib);
-/* There are two memory regions we care about, one from 0 through 0x7F00
-   that is RAM and one from 0x8000 up which is ROM.  */
-MEMORY
-{
-  RAM (w) : ORIGIN = 0, LENGTH = 0x7F00
-  ROM (!w) : ORIGIN = 0x8000, LENGTH = 0xFF8000
-}
-SECTIONS
-{
-  /* Read-only sections in ROM.  */
-  .int_vec       : { *(.int_vec)	} > ROM
-  .rodata   : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) } > ROM
-  .ctors   :
-  {
-    /* gcc uses crtbegin.o to find the start of
-       the constructors, so we make sure it is
-       first.  Because this is a wildcard, it
-       doesn't matter if the user does not
-       actually link against crtbegin.o; the
-       linker won't look for a file to match a
-       wildcard.  The wildcard also means that it
-       doesn't matter which directory crtbegin.o
-       is in.  */
-    KEEP (*crtbegin.o(.ctors))
-    /* We don't want to include the .ctor section from
-       from the crtend.o file until after the sorted ctors.
-       The .ctor section from the crtend file contains the
-       end of ctors marker and it must be last */
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*(.ctors))
-  } > ROM
-   .dtors         :
-  {
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*(.dtors))
-  } > ROM
-  .jcr : { KEEP (*(.jcr)) } > ROM
-  .eh_frame : { KEEP (*(.eh_frame)) } > ROM
-  .gcc_except_table : { *(.gcc_except_table) } > ROM
-  .plt : { *(.plt) } > ROM
-  .text      :
-  {
-    *(.text)
-    *(.text.*)
-    *(.stub)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t.*)
-  } > ROM =0
-  .init          :
-  {
-    KEEP (*(.init))
-  } > ROM =0
-  .fini      :
-  {
-    KEEP (*(.fini))
-  } > ROM =0
-  PROVIDE (__etext = .);
-  PROVIDE (_etext = .);
-  PROVIDE (etext = .);
-  . = ALIGN(2);
-  __rdata = .;
-  .data    : AT (__rdata)
-  {
-    __data = .;
-    *(.data)
-    *(.data.*)
-    *(.gnu.linkonce.d.*)
-    SORT(CONSTRUCTORS)
-  } > RAM
-  _edata = .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  /* Why do we need to give bss an AT address at all?  Because if we
-     don't, ld will generate another program header for it rather than
-     using the one for .data.  */
-  .bss       : AT (LOADADDR(.data) + SIZEOF(.data))
-  {
-   *(.dynbss)
-   *(.bss)
-   *(.bss.*)
-   *(.gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-   . = ALIGN(2);
-  } > RAM
-  . = ALIGN(2);
-  _end = .;
-  __stack = .;
-  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  .debug_ranges   0 : { *(.debug_ranges) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* These must appear regardless of  .  */
-}
diff --git a/libgloss/xstormy16/stat.c b/libgloss/xstormy16/stat.c
deleted file mode 100644
index c766a34..0000000
--- a/libgloss/xstormy16/stat.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* stat.c -- Get the status of a file.
- *
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <sys/stat.h>
-#include <errno.h>
-#include "glue.h"
-
-/*
- * stat -- Since we have no file system, we just return an error.
- */
-int
-_DEFUN (_stat, (path, buf),
-       const char *path _AND
-       struct stat *buf)
-{
-  errno = EIO;
-  return (-1);
-}
-
diff --git a/libgloss/xstormy16/syscalls.S b/libgloss/xstormy16/syscalls.S
deleted file mode 100644
index 8f4175f..0000000
--- a/libgloss/xstormy16/syscalls.S
+++ /dev/null
@@ -1,162 +0,0 @@
-# xstormy16 system calls for the simulator
-
-#include <syscall.h>
-
-	.text
-
-	.globl _exit
-_exit:
-	mov r1,#SYS_exit
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size exit,0b-_exit
-
-	.globl _open
-_open:
-	mov r1,#SYS_open
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size open,0b-_open
-
-	.globl _close
-_close:
-	mov r1,#SYS_close
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size close,0b-_close
-
-	.globl _read
-_read:
-	mov r1,#SYS_read
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size read,0b-_read
-
-	.globl _write
-_write:
-	mov r1,#SYS_write
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size write,0b-_write
-
-	.globl _lseek
-_lseek:
-	mov r1,#SYS_lseek
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size lseek,0b-_lseek
-
-	.globl _unlink
-_unlink:
-	mov r1,#SYS_unlink
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size unlink,0b-_unlink
-
-	.globl _getpid
-_getpid:
-	mov r1,#SYS_getpid
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size getpid,0b-_getpid
-
-	.globl _kill
-_kill:
-	mov r1,#SYS_kill
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size kill,0b-_kill
-
-	.globl _fstat
-_fstat:
-	mov r1,#SYS_fstat
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size fstat,0b-_fstat
-
-	.globl _chdir
-_chdir:
-	mov r1,#SYS_chdir
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size chdir,0b-_chdir
-
-	.globl _stat
-_stat:
-	mov r1,#SYS_stat
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size stat,0b-_stat
-
-	.globl _chmod
-_chmod:
-	mov r1,#SYS_chmod
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size chmod,0b-_chmod
-
-	.globl _utime
-_utime:
-	mov r1,#SYS_utime
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size utime,0b-_utime
-
-	.globl _time
-_time:
-	mov r1,#SYS_time
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size time,0b-_time
-
-	.globl _gettimeofday
-_gettimeofday:
-	mov r1,#SYS_gettimeofday
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size gettimeofday,0b-_gettimeofday
-
-	.globl _times
-_times:
-	mov r1,#SYS_times
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size times,0b-_times
-
-	.globl _link
-_link:
-	mov r1,#SYS_link
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size link,0b-_link
-
-syscall_error:
-# Return value for the syscall is in r2.  Save it here, as
-# _errno will overwrite it with the address of the errno
-# variable.  r0 is the errno.
-	push r2
-	push r0
-	callf __errno
-	pop r0
-	mov.w (r2),r0
-	pop r2
-	ret
-0:	.size syscall_error,0b-syscall_error
diff --git a/libgloss/xstormy16/syscalls.m4 b/libgloss/xstormy16/syscalls.m4
deleted file mode 100644
index ab71fc6..0000000
--- a/libgloss/xstormy16/syscalls.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-# xstormy16 system calls for the simulator
-
-#include <syscall.h>
-
-	.text
-
-define(`syscall',`.globl _`'$1
-_`'$1`':
-	mov r1,#SYS_$1
-	.hword 0x0001
-	bnz r1,#0,syscall_error
-	ret
-0:	.size $1,0b-_$1
-')dnl
-	syscall(exit)
-	syscall(open)
-	syscall(close)
-	syscall(read)
-	syscall(write)
-	syscall(lseek)
-	syscall(unlink)
-	syscall(getpid)
-	syscall(kill)
-	syscall(fstat)
-	syscall(chdir)
-	syscall(stat)
-	syscall(chmod)
-	syscall(utime)
-	syscall(time)
-	syscall(gettimeofday)
-	syscall(times)
-	syscall(link)
-dnl
-syscall_error:
-	push r0
-	callf __errno
-	pop r0
-	mov.w (r2),r0
-	ret
-0:	.size syscall_error,0b-syscall_error
diff --git a/libgloss/xstormy16/unlink.c b/libgloss/xstormy16/unlink.c
deleted file mode 100644
index 1c56663..0000000
--- a/libgloss/xstormy16/unlink.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* unlink.c -- remove a file.
- * 
- * Copyright (c) 1995 Cygnus Support
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-#include <errno.h>
-#include "glue.h"
-
-/*
- * unlink -- since we have no file system, 
- *           we just return an error.
- */
-int
-_DEFUN (_unlink, (path),
-        char * path)
-{
-  errno = EIO;
-  return (-1);
-}
diff --git a/libgloss/xstormy16/xstormy16_stub.c b/libgloss/xstormy16/xstormy16_stub.c
deleted file mode 100644
index 7706031..0000000
--- a/libgloss/xstormy16/xstormy16_stub.c
+++ /dev/null
@@ -1,837 +0,0 @@
-/****************************************************************************
-
-		THIS SOFTWARE IS NOT COPYRIGHTED
-
-   HP offers the following for use in the public domain.  HP makes no
-   warranty with regard to the software or it's performance and the
-   user accepts the software "AS IS" with all faults.
-
-   HP DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD
-   TO THIS SOFTWARE INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-****************************************************************************/
-
-/****************************************************************************
- *  Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $
- *
- *  Module name: remcom.c $
- *  Revision: 1.34 $
- *  Date: 91/03/09 12:29:49 $
- *  Contributor:     Lake Stevens Instrument Division$
- *
- *  Description:     low level support for gdb debugger. $
- *
- *  Considerations:  only works on target hardware $
- *
- *  Written by:      Glenn Engel $
- *  ModuleState:     Experimental $
- *
- *  NOTES:           See Below $
- *
- *  Heavily modified for XStormy16 by Mark Salter, Red Hat.
- *  Optimisations and 'X' support by Geoff Keating, Red Hat.
- *
- *  To enable debugger support, two things need to happen.  One, a
- *  call to set_debug_traps() is necessary in order to allow any breakpoints
- *  or error conditions to be properly intercepted and reported to gdb.
- *  Two, a breakpoint needs to be generated to begin communication.  This
- *  is most easily accomplished by a call to breakpoint().  Breakpoint()
- *  simulates a breakpoint by executing a trap #1.
- *
- *  Because gdb will sometimes write to the stack area to execute function
- *  calls, this program cannot rely on using the inferior stack so it uses
- *  it's own stack area.
- *
- *************
- *
- *    The following gdb commands are supported:
- *
- * command          function                               Return value
- *
- *    g             return the value of the CPU registers  hex data or ENN
- *    G             set the value of the CPU registers     OK or ENN
- *
- *    mAA..AA,LLLL  Read LLLL bytes at address AA..AA      hex data or ENN
- *    MAA..AA,LLLL: Write LLLL bytes at address AA.AA      OK or ENN
- *    XAA..AA,LLLL: Write LLLL binary bytes at address     OK or ENN
- *                  AA..AA
- *
- *    c             Resume at current address              SNN   ( signal NN)
- *    cAA..AA       Continue at address AA..AA             SNN
- *
- *    s             Step one instruction                   SNN
- *    sAA..AA       Step one instruction from AA..AA       SNN
- *
- *    k             kill
- *
- *    ?             What was the last sigval ?             SNN   (signal NN)
- *
- * All commands and responses are sent with a packet which includes a
- * checksum.  A packet consists of
- *
- * $<packet info>#<checksum>.
- *
- * where
- * <packet info> :: <characters representing the command or response>
- * <checksum>    :: <two hex digits computed as modulo 256 sum of <packetinfo>>
- *
- * When a packet is received, it is first acknowledged with either '+' or '-'.
- * '+' indicates a successful transfer.  '-' indicates a failed transfer.
- *
- * Example:
- *
- * Host:                  Reply:
- * $m0,10#2a               +$00010203040506070809101112131415#42
- *
- ****************************************************************************/
-
-/* Local functions:
- */
-static void putDebugChar(unsigned ch);
-static unsigned char getDebugChar(void);
-static void putPacket(unsigned char *);
-static void putHex (char c, unsigned long mem_arg, int count);
-static unsigned char *getpacket(void);
-static void hex2mem(unsigned char *, unsigned long, int);
-static int valid_addr_range (unsigned long mem, int count);
-static int  hexToInt(unsigned char **, long *);
-static void prepare_to_step(void);
-static void finish_from_step(void);
-
-/* breakpoint opcode */
-#define BREAKPOINT_OPCODE 0x0006
-
-/* Error Detection Register */
-#define ERR_DETECT_REG  (*(volatile unsigned *)0x7f08)
-#define UNDEF_INSN_ENA   0x01
-#define UNDEF_INSN_FLAG  0x02
-#define ODD_ADDR_ENA     0x04
-#define ODD_ADDR_FLAG    0x08
-#define BAD_ADDR_ENA     0x10
-#define BAD_ADDR_FLAG    0x20
-#define SER0_IRQ_ENA     0x1000
-#define SER0_IRQ_FLAG    0x2000
-
-/*****************************************************************************
- * BUFMAX defines the maximum number of characters in inbound/outbound buffers
- * at least NUMREGBYTES*2 are needed for register packets 
- */
-#define BUFMAX 80
-
-static const unsigned char hexchars[]="0123456789abcdef";
-
-#define NUMREGS 17
-
-/* Number of bytes of registers (extra 2 bytes is for 4 byte PC).  */
-#define NUMREGBYTES ((NUMREGS * 2) + 2)
-enum regnames { R0,  R1,  R2,  R3,  R4,  R5,  R6,   R7,
-		R8,  R9,  R10, R11, R12, R13, R14,  R15,
-		PC };
-
-#define FP  R13
-#define PSW R14
-#define SP  R15
-
-struct regs {
-    int  r[16];
-    long pc;
-} registers;
-
-static struct regs orig_registers;
-
-static unsigned char remcomBuffer[BUFMAX];
-
-/* Indicate whether inferior is running. Used to decide whether or not to
-   send T packet when stub is entered. */
-static char is_running;
-
-static inline unsigned char
-get_char(unsigned long addr)
-{
-  unsigned int msw, lsw;
-  unsigned char ret;
-
-  msw = addr >> 16;
-  lsw = addr & 0xffff;
-
-  asm("movf.b %0,(%2)\n" 
-      : "=e"(ret) : "d"(msw), "r"(lsw) : "memory");
-
-  return ret;
-}
-
-static inline void
-set_char(unsigned long addr, unsigned int val)
-{
-  unsigned int msw, lsw;
-
-  msw = addr >> 16;
-  lsw = addr & 0xffff;
-
-  asm("movf.b (%1),%2\n" 
-      : /* none */ : "d"(msw), "r"(lsw), "e"(val) : "memory" );
-}
-
-static inline unsigned int
-get_word(unsigned long addr)
-{
-  unsigned int ret, msw, lsw;
-
-  msw = addr >> 16;
-  lsw = addr & 0xffff;
-
-  asm("movf.w %0,(%2)\n" 
-      : "=e"(ret) : "d"(msw), "r"(lsw) : "memory" );
-
-  return ret;
-}
-
-static inline void
-set_word(unsigned long addr, unsigned int val)
-{
-  unsigned int msw, lsw;
-
-  msw = addr >> 16;
-  lsw = addr & 0xffff;
-
-  asm("movf.w (%1),%2\n" 
-      : /* none */ : "d"(msw), "r"(lsw), "e"(val) : "memory" );
-}
-
-static void
-assign_regs (struct regs *dest, const struct regs *src)
-{
-  int i;
-  char *d = (char *)dest, *s = (char *)src;
-  for (i = 0; i < sizeof (struct regs); i++)
-    *d++ = *s++;
-}
-
-/* Write out a register for a 'T' packet.  */
-
-static unsigned char *
-putreg (unsigned char *buf, int regnum, void *mem_p, int count)
-{
-  int i;
-  unsigned char ch;
-  char *mem = (char *)mem_p;
-
-  *buf++ = hexchars[regnum >> 4];
-  *buf++ = hexchars[regnum % 16];
-  *buf++ = ':';
-
-  for (i=0;i<count;i++)
-    {
-      ch = *mem++;
-      *buf++ = hexchars[ch >> 4];
-      *buf++ = hexchars[ch % 16];
-    }
-  *buf++ = ';';
-  return(buf);
-}
-
-/*
- * This function does all command procesing for interfacing to gdb.
- */
-void 
-handle_exception(void)
-{
-  char sigval;
-  unsigned char *ptr;
-  long addr, length;
-
-  /* reply to host that an exception has occurred */
-  sigval = 5; /* SIGTRAP is default */
-  if (ERR_DETECT_REG & UNDEF_INSN_FLAG)
-    {
-      ERR_DETECT_REG &= ~UNDEF_INSN_FLAG;
-      registers.pc -= 2;
-      if (get_word(registers.pc) != BREAKPOINT_OPCODE)
-	sigval = 4; /* SIGILL */
-    }
-  if (ERR_DETECT_REG & BAD_ADDR_FLAG)
-    {
-      ERR_DETECT_REG &= ~BAD_ADDR_FLAG;
-      sigval = 11; /* SIGSEGV */
-    }
-  if (ERR_DETECT_REG & SER0_IRQ_FLAG)
-    {
-      unsigned char ch;
-      
-      ch = getDebugChar();
-      ERR_DETECT_REG &= ~SER0_IRQ_FLAG;
-      if (ch != 0x03)
-	return;
-      sigval = 2; /* SIGINT */
-    }
-
-  finish_from_step();
-
-  /* save original context so it can be restored as a result of
-     a kill packet. */
-  if (orig_registers.pc == 0L)
-    assign_regs (&orig_registers, &registers);
-
-  if (is_running)
-    {
-      ptr = remcomBuffer;
- 
-      *ptr++ = 'T';         /* notify gdb with signo, PC, FP and SP */
-      *ptr++ = hexchars[sigval >> 4];
-      *ptr++ = hexchars[sigval & 0xf];
- 
-      ptr = putreg (ptr, PC, &registers.pc, 4);
-      ptr = putreg (ptr, FP, &registers.r[FP], 2);
-      ptr = putreg (ptr, SP, &registers.r[SP], 2);
-
-      *ptr++ = 0;
- 
-      putPacket(remcomBuffer);
-    }
-
-  while (1) {
-    char kind;
-    
-    ptr = getpacket();
-    kind = *ptr++;
-    if (kind == 'M' || kind == 'X')
-      {
-	/* MAA..AA,LLLL: Write LLLL bytes at address AA.AA return OK */
-        /* TRY TO READ '%x,%x:'.  IF SUCCEED, SET PTR = 0 */
-	if (hexToInt(&ptr,&addr)
-	    && *(ptr++) == ','
-	    && hexToInt(&ptr,&length)
-	    && *(ptr++) == ':')
-	  {
-	    if (valid_addr_range (addr, length))
-	      {
-		if (kind == 'M')
-		  hex2mem(ptr, addr, length);
-		else
-		  {
-		    int i;
-		    for (i = 0; i < length; i++)
-		      if (*ptr++ == 0x7d)
-			set_char (addr++, *ptr++ ^ 0x20);
-		      else
-			set_char (addr++, ptr[-1]);
-		    
-		  }
-		putPacket ("OK");
-	      }
-	    else
-	      putPacket ("E03");
-	  }
-	else
-	  putPacket ("E02");
-      }
-    else if (kind == 'm')
-      {
-	/* mAA..AA,LLLL  Read LLLL bytes at address AA..AA */
-	/* TRY TO READ %x,%x.  IF SUCCEED, SET PTR = 0 */
-        if (hexToInt(&ptr,&addr)
-	    && *(ptr++) == ','
-	    && hexToInt (&ptr,&length))
-	  {
-	    if (valid_addr_range (addr, length))
-	      putHex (0, addr, length);
-	    else
-	      putPacket ("E03");
-	  }
-	else
-	  putPacket ("E02");
-      }
-    else if (kind == 'R')
-      {
-	if (hexToInt (&ptr, &addr))
-	  registers.pc = addr;
-	putPacket ("OK");
-      }
-    else if (kind == '!')
-      putPacket ("OK");
-    else if (kind == '?')
-      putHex ('S', (unsigned long)(unsigned int)&sigval, 1);
-    else if (kind == 'g')
-      putHex (0, (unsigned long)(unsigned int)&registers, NUMREGBYTES);
-    else if (kind == 'P')
-      {
-	/* set the value of a single CPU register - return OK */
-	unsigned long regno;
-	
-	if (hexToInt (&ptr, &regno) 
-	    && *ptr++ == '='
-	    && regno < NUMREGS)
-	  {
-	    hex2mem (ptr, (unsigned long)(unsigned int)(registers.r + regno),
-		     regno == PC ? 4 : 2);
-	    putPacket ("OK");
-	  }
-	else
-	  putPacket ("E01");
-      }
-    else if (kind == 'G')
-      {
-	/* set the value of the CPU registers - return OK */
-	hex2mem(ptr, (unsigned long)(unsigned int)&registers, NUMREGBYTES);
-	putPacket ("OK");
-      }
-    else if (kind == 's' || kind == 'c')
-      {
-	/* sAA..AA	Step one instruction from AA..AA(optional) */
-	/* cAA..AA	Continue from address AA..AA(optional) */
-	/* try to read optional parameter, pc unchanged if no parm */
-
-	is_running = 1;
-	
-	if (hexToInt(&ptr,&addr))
-	  registers.pc = addr;
-	
-	if (kind == 's')	/* single-stepping */
-	  prepare_to_step();
-	return;
-      }
-    else if (kind == 'k')
-      {
-	/* kill the program */
-	assign_regs (&registers, &orig_registers);
-	is_running = 0;
-	putPacket ("");
-      }
-    else
-      /* Unknown code.  Return an empty reply message. */
-      putPacket ("");
-  }
-}
-
-static int 
-hex (int ch)
-{
-  if ((ch >= '0') && (ch <= '9')) return (ch-'0');
-  if ((ch >= 'a') && (ch <= 'f')) return (ch-'a'+10);
-  if ((ch >= 'A') && (ch <= 'F')) return (ch-'A'+10);
-  return (-1);
-}
-
-/* scan for the sequence $<data>#<checksum>     */
-
-static unsigned char *
-getpacket (void)
-{
-  unsigned char *buffer = &remcomBuffer[0];
-  unsigned checksum;
-  int count;
-  char ch;
-
-  while (1)
-    {
-      /* wait around for the start character, ignore all other characters */
-      while (getDebugChar () != '$')
-	;
-
-      checksum = 0;
-      count = 0;
-      while ((ch = getDebugChar ()) == '$')
-	;
-
-      /* now, read until a # or end of buffer is found */
-      while (ch != '#' && count < BUFMAX - 1)
-	{
-	  checksum = checksum + ch;
-	  buffer[count] = ch;
-	  count = count + 1;
-	  ch = getDebugChar ();
-	}
-      buffer[count] = 0;
-
-      if (ch == '#')
-	{
-	  unsigned xmitcsum;
-	  ch = getDebugChar ();
-	  xmitcsum = hex (ch) << 4;
-	  ch = getDebugChar ();
-	  xmitcsum += hex (ch);
-
-	  /* If one of the above 'hex' calls returns -1, xmitcsum will
-	     have high bits set, and so the test below will fail.  */
-
-	  if ((checksum & 0xFF) != xmitcsum)
-	    putDebugChar ('-');	/* failed checksum */
-	  else
-	    {
-	      putDebugChar ('+');	/* successful transfer */
-	      return &buffer[0];
-	    }
-	}
-    }
-}
-
-/* send the packet in buffer.  */
-
-static void 
-putPacket (unsigned char *buffer_p)
-{
-  /*  $<packet info>#<checksum>. */
-  do {
-    unsigned checksum;
-    unsigned char *buffer = buffer_p;
-
-    putDebugChar('$');
-    checksum = 0;
-
-    while (*buffer) {
-      putDebugChar(*buffer);
-      checksum += *buffer;
-      buffer++;
-    }
-    putDebugChar('#');
-    putDebugChar(hexchars[(checksum >> 4) % 16]);
-    putDebugChar(hexchars[checksum % 16]);
-  } while (getDebugChar() != '+');
-}
-
-/* Convert the memory pointed to by mem into hex, and return it as a packet. */
-
-static void
-putHex (char c, unsigned long mem_arg, int count)
-{
-  do {
-    unsigned long mem = mem_arg;
-    int i;
-    unsigned checksum;
-
-    putDebugChar('$');
-    checksum = 0;
-
-    if (c)
-      {
-	checksum = c;
-	putDebugChar(c);
-      }
-
-    for (i = 0; i < count; i++)
-      {
-	unsigned char c = get_char (mem);
-	char ch = hexchars[c >> 4];
-	putDebugChar(ch);
-	checksum += ch;
-	ch = hexchars[c % 16];
-	putDebugChar(ch);
-	checksum += ch;
-	mem++;
-      }
-    putDebugChar('#');
-    putDebugChar(hexchars[(checksum >> 4) % 16]);
-    putDebugChar(hexchars[checksum % 16]);
-  } while (getDebugChar() != '+');
-}
-
-/* Function: gdb_write(char *, int)
-   Make gdb write n bytes to stdout (not assumed to be null-terminated). */
- 
-void
-gdb_write (char *data, int len)
-{
-  ERR_DETECT_REG &= ~SER0_IRQ_ENA;
-  putHex ('O', (unsigned long)(unsigned int)data, len);
-  ERR_DETECT_REG |= SER0_IRQ_ENA;
-}
-
-int
-gdb_read (char *buf, int nbytes)
-{
-  int i = 0;
-
-  ERR_DETECT_REG &= ~SER0_IRQ_ENA;
-  for (i = 0; i < nbytes; i++)
-    {
-      *(buf + i) = getDebugChar();
-      if ((*(buf + i) == '\n') || (*(buf + i) == '\r'))
-        {
-          (*(buf + i + 1)) = 0;
-          break;
-        }
-    }
-  ERR_DETECT_REG |= SER0_IRQ_ENA;
-  return (i);
-}
-
-static int
-valid_addr_range (unsigned long mem, int count)
-{
-  unsigned long last = mem + count - 1;
-
-  if (last < 0x800L)
-    return 1;
-
-  if (mem < 0x7f00L)
-    return 0;
-
-  if (last > 0x7ffffL)
-    return 0;
-
-  return 1;
-}
-
-/* Convert the hex array pointed to by buf into binary to be placed in mem.
-   Return a pointer to the character AFTER the last byte written. */
-
-static void
-hex2mem (unsigned char *buf, unsigned long mem, int count)
-{
-  int i;
-  unsigned char ch;
-
-  for (i=0;i<count;i++)
-    {
-      ch = hex(*buf++) << 4;
-      ch = ch + hex(*buf++);
-      set_char (mem++, ch);
-    }
-}
-
-/**********************************************/
-/* WHILE WE FIND NICE HEX CHARS, BUILD AN INT */
-/* RETURN NUMBER OF CHARS PROCESSED           */
-/**********************************************/
-static int 
-hexToInt (unsigned char **ptr, long *intValue)
-{
-  int numChars = 0;
-  int hexValue;
-
-  *intValue = 0;
-  while (**ptr)
-    {
-      hexValue = hex(**ptr);
-      if (hexValue >=0)
-        {
-	  *intValue = (*intValue <<4) | (unsigned) hexValue;
-	  numChars ++;
-        }
-      else
-	break;
-      (*ptr)++;
-    }
-  return (numChars);
-}
-
-
-/* Function: opcode_size
-   Determine number of bytes in full opcode by examining first word.
-*/
-static int
-opcode_size(unsigned int opcode)
-{
-  if ((opcode & 0xff00) == 0)
-    return 2;
-
-  if ((opcode & 0xf800) == 0)
-    return 4;
-
-  if ((opcode & 0xf800) == 0x7800)
-    return 4;
-
-  if ((opcode & 0xf000) == 0xc000)
-    return 4;
-
-  if ((opcode & 0xf100) == 0x2000)
-    return 4;
-
-  if ((opcode & 0xfff0) == 0x30e0)
-    return 4;
-
-  if ((opcode & 0xf008) == 0x6008)
-    return 4;
-
-  if ((opcode & 0xf808) == 0x7008)
-    return 4;
-
-  opcode >>= 8;
-  if (opcode == 0x0c || opcode == 0x0d || opcode == 0x31)
-    return 4;
-
-  return 2;
-}
-
-static struct {
-  unsigned long  addr;
-  unsigned long  addr2;
-  unsigned int   opcode;
-  unsigned int   opcode2;
-} stepinfo;
-
-/* Function: prepare_to_step
-   Called from handle_exception to prepare the user program to single-step.
-   Places a trap instruction after the target instruction, with special 
-   extra handling for branch instructions.
-*/
-
-static void
-prepare_to_step(void)
-{
-  unsigned long pc = registers.pc;
-  unsigned long next_pc, next_pc2;
-  unsigned int  op, op2, sp;
-  unsigned char op_msb, op_lsb;
-  int  r12;
-  char r8;
-
-  op = get_word(pc);
-  op_msb = (op >> 8) & 0xff;
-  op_lsb = op & 0xff;
-  op2 = get_word(pc + 2);
-  next_pc = pc + opcode_size(op);
-  next_pc2 = 0;
-
-  if (op_msb == 0)
-    {
-      if (op_lsb == 2)
-	{
-	  /* IRET */
-	  sp = registers.r[SP];
-	  next_pc = *(unsigned *)(sp - 4);
-	  next_pc = (next_pc << 16) | *(unsigned *)(sp - 6);
-	}
-      else if (op_lsb == 3)
-	{
-	  /* RET */
-	  sp = registers.r[SP];
-	  next_pc = *(unsigned *)(sp - 2);
-	  next_pc = (next_pc << 16) | *(unsigned *)(sp - 4);
-	}
-      else
-	{
-	  op2 = op_lsb & 0xf0;
-	  if (op2 && op2 < 0x40)
-	    {
-	      /* {CALLR,BR,ICALLR} Rs */
-	      next_pc = (pc + 2) + (int)registers.r[op_lsb & 0xf];
-	    }
-	  else if (op2 < 0x80 || op2 == 0xa0 || op2 == 0xb0)
-	    {
-	      /* {JMP,ICALL,CALL} Rb,Rs */
-	      next_pc = registers.r[(op_lsb & 0x10) ? 9 : 8];
-	      next_pc = (next_pc << 16) | (unsigned int)registers.r[op_lsb & 0xf];
-	    }
-	}
-    }
-  else if (op_msb < 4)
-    {
-      /* {CALLF,JMPF,ICALLF} a24 */
-      next_pc = ((unsigned long)op2) << 8;
-      next_pc |= op_lsb;
-    }
-  else if (op_msb < 8)
-    {
-      if ((op2 & 0xf000) == 0)
-	{
-	    /* Bx Rd,#imm4,r12 */
-	    /* Bx Rd,Rs,r12    */
-	    r12 = op2 << 4;
-	    r12 >>= 4;
-	    next_pc2 = (pc + 4) + r12;
-	}
-    }
-  else if (op_msb == 0x0c || op_msb == 0x0d || (op_msb & 0xf1) == 0x20 ||
-	   ((op_msb >= 0x7c && op_msb <= 0x7f) && (op2 & 0x8000) == 0))
-    {
-      /* Bxx Rd,Rs,r12    */
-      /* Bxx Rd,#imm8,r12 */
-      /* Bx  m8,#imm3,r12 */
-      /* Bx s8,#imm3,r12  */
-      r12 = op2 << 4;
-      r12 >>= 4;
-      next_pc2 = (pc + 4) + r12;
-    }
-  else if ((op_msb & 0xf0) == 0x10)
-    {
-      /* {BR,CALLR} r12 */
-      r12 = (op & 0xffe) << 4;
-      r12 >>= 4;
-      next_pc = (pc + 2) + r12;
-    }
-  else if ((op_msb & 0xe0) == 0xc0)
-    {
-      /* Bxx Rx,#imm16,r8 */
-      /* TBxx r8 */
-      r8 = op_lsb;
-      next_pc2 = next_pc + r8;
-    }
-
-  stepinfo.addr = next_pc;
-  stepinfo.opcode = get_word(next_pc);
-  set_word(next_pc, BREAKPOINT_OPCODE);
-
-  if (next_pc2)
-    {
-      stepinfo.addr2 = next_pc2;
-      stepinfo.opcode2 = get_word(next_pc2);
-      set_word(next_pc2, BREAKPOINT_OPCODE);
-    }
-}
-
-/* Function: finish_from_step
-   Called from handle_exception to finish up when the user program 
-   returns from a single-step.  Replaces the instructions that had
-   been overwritten by breakpoint. */
-
-static void
-finish_from_step (void)
-{
-  if (stepinfo.addr)	/* anything to do? */
-    {
-      set_word(stepinfo.addr, stepinfo.opcode);
-      stepinfo.addr = 0;
-      if (stepinfo.addr2)
-	{
-	  set_word(stepinfo.addr2, stepinfo.opcode2);
-          stepinfo.addr2 = 0;
-	}
-    }
-}
-
-
-/*
- * UART support
- */
-#define UART0_BASE 0x7f38
-#define UART1_BASE 0x7f48
-
-#define UART_CR(base)  (*(volatile unsigned char *)(base))
-#define UART_RXD(base) (*(volatile unsigned int *)((base) + 2))
-#define UART_TXD(base) (*(volatile unsigned int *)((base) + 4))
-
-#define UART_CR_RUN       0x80
-#define UART_CR_ERR       0x40
-#define UART_CR_BAUD_115k 0x20
-#define UART_CR_PARITY    0x10
-#define UART_CR_TXEMPTY   0x08
-#define UART_CR_TXIEN     0x04
-#define UART_CR_RXRDY     0x02
-#define UART_CR_RXIEN     0x01
-
-#define DBG_UART UART0_BASE
-
-static void
-putDebugChar(unsigned ch)
-{
-  while ((UART_CR(DBG_UART) & UART_CR_TXEMPTY) == 0) ;
-
-  UART_TXD(DBG_UART) = ch;
-}
-
-static unsigned char
-getDebugChar(void)
-{
-  while ((UART_CR(DBG_UART) & UART_CR_RXRDY) == 0) ;
-
-  return UART_RXD(DBG_UART);
-}
-
-void
-uart_init(void)
-{
-  UART_CR(DBG_UART) |= (UART_CR_RUN | UART_CR_RXIEN);
-}
-
diff --git a/libtool.m4 b/libtool.m4
index cbd74d5..aa7e62a 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -15,7 +15,7 @@
 ##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ##
 ## As a special exception to the GNU General Public License, if you
 ## distribute this file as part of a program that contains a
@@ -103,8 +103,6 @@ AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -146,19 +144,6 @@ case $host in
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -170,65 +155,6 @@ case $host in
       LD="${LD-ld} -64"
       ;;
     esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
   fi
   rm -rf conftest*
   ;;
@@ -281,65 +207,6 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
 esac
 ])
 
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-  esac
-])
-if test -n "$lt_cv_sys_max_cmd_len" ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
 # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
 AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
 
@@ -668,7 +535,6 @@ cygwin* | mingw* |pw32*)
   ;;
 
 darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
   lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   case "$host_os" in
@@ -679,10 +545,9 @@ darwin* | rhapsody*)
     lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
     ;;
   esac
-  lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* )
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -703,18 +568,9 @@ gnu*)
   ;;
 
 hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
+  lt_cv_deplibs_check_method=['file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libc.sl
   ;;
 
 irix5* | irix6*)
@@ -740,10 +596,17 @@ irix5* | irix6*)
 
 # This must be Linux ELF.
 linux-gnu*)
-  lt_cv_deplibs_check_method=pass_all
+  case $host_cpu in
+  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
+    lt_cv_deplibs_check_method=pass_all ;;
+  *)
+    # glibc up to 2.1.1 does not perform some relocations on ARM
+    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
+  esac
+  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   ;;
 
-netbsd* | knetbsd*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
   else
@@ -836,9 +699,8 @@ AC_DEFUN([AC_CHECK_LIBM],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cygwin* | *-*-pw32*)
   # These system don't have libm
-  # on darwin the libm is a symbolic link to libSystem.dylib
   ;;
 *-ncr-sysv4.3*)
   AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
diff --git a/ltcf-c.sh b/ltcf-c.sh
index 7a91c40..f11a0cf 100644
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -108,7 +108,7 @@ EOF
     extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
       sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/impgen.c~
       test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-      if test "x$BUILD_CC" != "x" ; then $BUILD_CC -o impgen impgen.c ; \
+      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
       else $CC -o impgen impgen.c ; fi)~
       $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
 
@@ -185,7 +185,7 @@ EOF
     whole_archive_flag_spec='-all_load $convenience'
     ;;
 
-  netbsd* | knetbsd*-gnu)
+  netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
       wlarc=
@@ -223,10 +223,6 @@ EOF
     hardcode_shlibpath_var=no
     ;;
 
-  tpf*)
-    ld_shlibs=yes
-    ;;
-
   *)
     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -413,7 +409,7 @@ else
     ;;
 
   # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-  freebsd* | kfreebsd*-gnu)
+  freebsd*)
     archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
@@ -421,32 +417,23 @@ else
     ;;
 
   hpux9* | hpux10* | hpux11*)
-    case "$host_cpu" in
-    ia64*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir' ;;
-    *)
-      if test $with_gcc = yes; then
-        case "$host_os" in
-        hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-        *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;;
-        esac
-      else
-        case $host_os in
-        hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-        *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
-        esac
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_minus_L=yes # Not in the search PATH, but as the default
-			   # location of the library.
-      ;;
-    esac
-    export_dynamic_flag_spec='${wl}-E'
+    if test $with_gcc = yes; then
+      case "$host_os" in
+      hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+      *) archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;;
+      esac
+    else
+      case $host_os in
+      hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+      *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
+      esac
+    fi
+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+    hardcode_libdir_separator=:
     hardcode_direct=yes
+    hardcode_minus_L=yes # Not in the search PATH, but as the default
+			 # location of the library.
+    export_dynamic_flag_spec='${wl}-E'
     ;;
 
   irix5* | irix6*)
@@ -460,7 +447,7 @@ else
     link_all_deplibs=yes
     ;;
 
-  netbsd* | knetbsd*-gnu)
+  netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
     else
diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh
index fa8dbd0..22875d0 100644
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -2,7 +2,7 @@
 
 # ltcf-cxx.sh - Create a C++ compiler specific configuration
 #
-# Copyright (C) 1996-1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # Original C++ support by:Gary V. Vaughan <gvv@techie.com>
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -68,16 +68,11 @@ if { ac_try='${CC-c++} -E conftest.$ac_ext'; { (eval echo \"$ac_try\") 1>&5; (ev
   # Set up default GNU C++ configuration
 
   # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.  The
-  # assumption here is that the linker is going to be the same as that
-  # used by the C compiler.  For the purposes of GCC, this is ok, but
-  # if someone uses g++ along with a non-GNU C compiler that doesn't
-  # use GNU ld, we may lose.  This is ok for the toolchain tree, since
-  # the only users of ltcf-cxx.sh are libstdc++-v3 and libjava,
-  # anyway, and those use both gcc and g++, so the settings are bound
-  # to be the same.
-
-  if test "$with_gnu_ld" = yes; then
+  # archiving commands below assume that GNU ld is being used.
+  if eval "`$CC -print-prog-name=ld` --version 2>&1" | \
+      egrep 'GNU ld' > /dev/null; then
+    with_gnu_ld=yes
+
     archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
     archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
@@ -97,6 +92,7 @@ if { ac_try='${CC-c++} -E conftest.$ac_ext'; { (eval echo \"$ac_try\") 1>&5; (ev
       whole_archive_flag_spec=
     fi
   else
+    with_gnu_ld=no
     wlarc=
 
     # A generic and very simple default shared library creation
@@ -114,6 +110,7 @@ if { ac_try='${CC-c++} -E conftest.$ac_ext'; { (eval echo \"$ac_try\") 1>&5; (ev
 
 else
   with_gcc=no
+  with_gnu_ld=no
   wlarc=
 fi
 
@@ -244,7 +241,7 @@ case $host_os in
     # C++ shared libraries reported to be fairly broken before switch to ELF
     ld_shlibs=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs=yes
@@ -253,17 +250,11 @@ case $host_os in
     ;;
   hpux*)
     if test $with_gnu_ld = no; then
-      case "$host_cpu" in
-	ia64*)
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_shlibpath_var=no ;;
-	*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ;;
-      esac
-      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
       hardcode_libdir_separator=:
       export_dynamic_flag_spec='${wl}-E'
     fi
+    hardcode_direct=yes
     hardcode_minus_L=yes # Not in the search PATH, but as the default
 			 # location of the library.
 
@@ -292,14 +283,7 @@ case $host_os in
 	  if test $with_gnu_ld = no; then
 	    case "$host_os" in
 	    hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
-	    *)
-	      case "$host_cpu" in
-		ia64*)
-		  archive_cmds='$LD -b +h $soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ;;
-		*)
-		  archive_cmds='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
-	      esac
-	      ;;
+	    *) archive_cmds='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
 	    esac
 	  fi
 	else
@@ -326,7 +310,7 @@ case $host_os in
           if test "$with_gnu_ld" = no; then
             archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
           else
-            archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib'
+            archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib'
           fi
         fi
         hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -404,7 +388,7 @@ case $host_os in
         ;;
     esac
     ;;
-  netbsd* | knetbsd*-gnu)
+  netbsd*)
     # NetBSD uses g++ - do we need to do anything?
     ;;
   osf3*)
@@ -613,9 +597,9 @@ case $host_os in
         if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
 	  no_undefined_flag=' ${wl}-z ${wl}defs'
           if $CC --version | egrep -v '^2\.7' > /dev/null; then
-            archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+            archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $linker_flags ${wl}-h $wl$soname -o $lib'
             archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags~$rm $lib.exp'
 
             # Commands to make compiler produce verbose output that lists
             # what "hidden" libraries, object files and flags are used when
@@ -624,9 +608,9 @@ case $host_os in
           else
             # g++ 2.7 appears to require `-G' NOT `-shared' on this
             # platform.
-            archive_cmds='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+            archive_cmds='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $linker_flags ${wl}-h $wl$soname -o $lib'
             archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags~$rm $lib.exp'
 
             # Commands to make compiler produce verbose output that lists
             # what "hidden" libraries, object files and flags are used when
@@ -652,9 +636,6 @@ case $host_os in
         ;;
     esac
     ;;
-  tpf*)
-    ld_shlibs=yes
-    ;;
   unixware*)
     # FIXME: insert proper C++ library support
     ld_shlibs=no
@@ -762,7 +743,7 @@ else
           ;;
       esac
       ;;
-    freebsd* | kfreebsd*-gnu)
+    freebsd*)
       # FreeBSD uses GNU C++
       ;;
     gnu*)
diff --git a/ltcf-gcj.sh b/ltcf-gcj.sh
index 51faf04..7be8712 100644
--- a/ltcf-gcj.sh
+++ b/ltcf-gcj.sh
@@ -2,7 +2,7 @@
 
 # ltcf-gcj.sh - Create a GCJ compiler specific configuration
 #
-# Copyright (C) 1996-1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # Original GCJ support by:
@@ -20,7 +20,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -111,7 +111,7 @@ EOF
     extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
       sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/impgen.c~
       test -f $output_objdir/impgen.exe || (cd $output_objdir && \
-      if test "x$BUILD_CC" != "x" ; then $BUILD_CC -o impgen impgen.c ; \
+      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
       else $CC -o impgen impgen.c ; fi)~
       $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
 
@@ -178,7 +178,7 @@ EOF
       $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
     ;;
 
-  netbsd* | knetbsd*-gnu)
+  netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
       wlarc=
@@ -402,7 +402,7 @@ else
     ;;
 
   # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-  freebsd* | kfreebsd*-gnu)
+  freebsd*)
     archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
@@ -433,7 +433,7 @@ else
     link_all_deplibs=yes
     ;;
 
-  netbsd* | knetbsd*-gnu)
+  netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
     else
@@ -492,9 +492,9 @@ else
 
   solaris*)
     no_undefined_flag=' ${wl}-z ${wl}defs'
-    archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+    archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $linker_flags ${wl}-h $wl$soname -o $lib'
     archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-      $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+      $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags~$rm $lib.exp'
 
     # Commands to make compiler produce verbose output that lists
     # what "hidden" libraries, object files and flags are used when
diff --git a/ltconfig b/ltconfig
index 15f986c..746e15b 100755
--- a/ltconfig
+++ b/ltconfig
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -1111,18 +1111,6 @@ darwin* | rhapsody*)
   shlibpath_var=DYLD_LIBRARY_PATH
   ;;
 
-freebsd*-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-  soname_spec='${libname}${release}.so${major}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU/FreeBSD ld.so'
-  ;;
-
 freebsd1*)
   dynamic_linker=no
   ;;
@@ -1164,56 +1152,22 @@ gnu*)
   hardcode_into_libs=yes
   ;;
 
-kfreebsd*-gnu | knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
 hpux9* | hpux10* | hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
+  dynamic_linker="$host_os dld.sl"
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
-  ia64*)
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-    soname_spec='${libname}${release}.so$major'
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-    soname_spec='${libname}${release}.sl$major'
-    ;;
-  esac
+  shlibpath_var=SHLIB_PATH
+  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
+  soname_spec='${libname}${release}.sl$major'
   # HP-UX runs *really* slowly unless shared libraries are mode 555.
   postinstall_cmds='chmod 555 $lib'
   ;;
 
 irix5* | irix6*)
-  if test "$with_gnu_ld" = yes; then
-    version_type=linux
-  else
-    version_type=irix
-  fi
   version_type=irix
   need_lib_prefix=no
   need_version=no
@@ -1225,12 +1179,9 @@ irix5* | irix6*)
     ;;
   *)
     case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
     *) libsuff= shlibsuff= libmagic=never-match;;
     esac
     ;;
@@ -1371,18 +1322,6 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
   esac
   ;;
 
-tpf*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
@@ -2211,7 +2150,7 @@ case $ltmain in
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -2635,7 +2574,7 @@ EOF
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #  */
 #
 #  #include <stdio.h>		/* for printf() */
diff --git a/ltmain.sh b/ltmain.sh
index d5173bc..bd76cfb 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -107,7 +107,6 @@ show_help=
 execute_dlfiles=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
-taglist=
 
 # Parse our command line options once, thoroughly.
 while test $# -gt 0
@@ -141,7 +140,6 @@ do
       CC)
 	# Don't test for the "default" C tag, as we know, it's there, but
 	# not specially marked.
-	taglist="$taglist $tagname"
 	;;
       *)
         if grep "^### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
@@ -3550,7 +3548,7 @@ EOF
       # Now hardcode the library paths
       rpath=
       hardcode_libdirs=
-      for libdir in $compile_rpath; do
+      for libdir in $compile_rpath $finalize_rpath; do
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
@@ -4234,63 +4232,6 @@ fi\
 #	  fi
 #	done
 
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-        if (for obj in $oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $echo "copying selected object files to avoid basename conflicts..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test $status -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	    generated="$generated $gentop"
-	  fi
-
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-	        newobj=lt$counter-$objbase
-	        counter=`expr $counter + 1`
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-
         eval cmds=\"$old_archive_cmds\"
 
         if len=`expr "X$cmds" : ".*"` &&
@@ -4304,7 +4245,6 @@ fi\
           objlist=
           concat_cmds=
           save_oldobjs=$oldobjs
-
           for obj in $save_oldobjs
           do
             oldobjs="$objlist $obj"
@@ -4359,11 +4299,7 @@ fi\
 	fi
       done
       # Quote the link command for shipping.
-      tagopts=
-      for tag in $taglist; do
-        tagopts="$tagopts --tag $tag"
-      done
-      relink_command="(cd `pwd`; $SHELL $0$tagopts --mode=relink $libtool_args)"
+      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
 
       # Only create the output if not a dry run.
@@ -4669,7 +4605,7 @@ relink_command=\"$relink_command\""
 	  if $run eval "$relink_command"; then :
 	  else
 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit 1
+	    continue
 	  fi
 	fi
 
diff --git a/missing b/missing
index 894e786..7789652 100755
--- a/missing
+++ b/missing
@@ -1,11 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-
-scriptversion=2005-06-08.21
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,47 +15,15 @@ scriptversion=2005-06-08.21
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
 
 if test $# -eq 0; then
   echo 1>&2 "Try \`$0 --help' for more information"
   exit 1
 fi
 
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
 case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
@@ -71,7 +35,6 @@ error status if there is no known handling for PROGRAM.
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
@@ -80,19 +43,13 @@ Supported PROGRAM values:
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
+    echo "missing - GNU libit 0.0"
     ;;
 
   -*)
@@ -101,45 +58,10 @@ Send bug reports to <bug-automake@gnu.org>."
     exit 1
     ;;
 
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-  aclocal*)
+  aclocal)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acinclude.m4' or \`configure.in'.  You might want
          to install the \`Automake' and \`Perl' packages.  Grab them from
          any GNU archive site."
     touch aclocal.m4
@@ -147,8 +69,8 @@ WARNING: \`$1' is $msg.  You should only need it if
 
   autoconf)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`configure.in'.  You might want to install the
          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
          archive site."
     touch configure
@@ -156,11 +78,11 @@ WARNING: \`$1' is $msg.  You should only need it if
 
   autoheader)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acconfig.h' or \`configure.in'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
@@ -173,10 +95,10 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch $touch_files
     ;;
 
-  automake*)
+  automake)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
     find . -type f -name Makefile.am -print |
@@ -184,32 +106,9 @@ WARNING: \`$1' is $msg.  You should only need it if
 	   while read f; do touch "$f"; done
     ;;
 
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
   bison|yacc)
     echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
+WARNING: \`$1' is missing on your system.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
@@ -239,7 +138,7 @@ WARNING: \`$1' $msg.  You should only need it if
 
   lex|flex)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
+WARNING: \`$1' is missing on your system.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
@@ -260,90 +159,28 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
     ;;
 
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
   makeinfo)
     echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
+WARNING: \`$1' is missing on your system.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
          indirectly affecting the aspect of the manual.  The spurious
          call might also be the consequence of using a buggy \`make' (AIX,
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
     file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
     if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
     fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
     touch $file
     ;;
 
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
          proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
+         it often tells you about the needed prerequirements for installing
          this package.  You may also peek at any GNU archive site, in case
          some other package would contain this missing \`$1' program."
     exit 1
@@ -351,10 +188,3 @@ WARNING: \`$1' is needed, and is $msg.
 esac
 
 exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/mkinstalldirs b/mkinstalldirs
index 259dbfc..cc8783e 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,158 +1,36 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-
-scriptversion=2005-06-29.22
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
+# Last modified: 1994-03-25
+# Public domain
 
 errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
 
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
+for file in ${1+"$@"} ; do 
+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+   shift
 
-  for d
-  do
-    test "x$d" = x && continue
+   pathcomp=
+   for d in ${1+"$@"} ; do
+     pathcomp="$pathcomp$d"
+     case "$pathcomp" in
+       -* ) pathcomp=./$pathcomp ;;
+     esac
 
-    pathcomp=$pathcomp$d
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
+     if test ! -d "$pathcomp"; then
+        echo "mkdir $pathcomp" 1>&2
+        mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
+     fi
 
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
+     if test ! -d "$pathcomp"; then
 	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
+     fi
 
-    pathcomp=$pathcomp/
-  done
+     pathcomp="$pathcomp/"
+   done
 done
 
 exit $errstatus
 
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
+# mkinstalldirs ends here
diff --git a/move-if-change b/move-if-change
index ff74a55..ee1b348 100755
--- a/move-if-change
+++ b/move-if-change
@@ -1,22 +1,32 @@
 #!/bin/sh
-# Like mv $1 $2, but if the files are the same, just delete $1.
-# Status is zero if successful, nonzero otherwise.
 
-usage="$0: usage: $0 SOURCE DEST"
+# Copyright (C) 1996 Free Software Foundation, Inc.
+#
+# This program 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 of the License, or
+# (at your option) any later version.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-case $# in
-2) ;;
-*) echo "$usage" >&2; exit 1;;
-esac
-
-for arg in "$1" "$2"; do
-  case $arg in
-   -*) echo "$usage" >&2; exit 1;;
-  esac
-done
-
-if test -r "$2" && cmp -s "$1" "$2"; then
-  rm -f "$1"
+if
+test -r $2
+then
+if
+cmp $1 $2 > /dev/null
+then
+echo $2 is unchanged
+rm -f $1
+else
+mv -f $1 $2
+fi
 else
-  mv -f "$1" "$2"
+mv -f $1 $2
 fi
diff --git a/mpw-README b/mpw-README
new file mode 100644
index 0000000..767140b
--- /dev/null
+++ b/mpw-README
@@ -0,0 +1,376 @@
+This is basic information about the Macintosh(tm) MPW(tm) port of the
+GNU tools.  The information below applies to both native and cross
+compilers.
+
+(Please note that there are two versions of this file; "mpw-README"
+is the source form, and "Read Me for MPW" is the distribution form.
+"Read Me for MPW" has 8-bit chars such as \Option-d embedded in it.)
+
+INSTALLING GNU TOOLS
+
+* System Requirements
+
+To use these tools, you will need a Mac with a 68020 or better or else
+any PowerMac, System 7.1 or later, and MPW 3.3 or 3.4.  You will *not*
+need any other MPW compiler unless you want to rebuild from sources,
+nor even any include files, unless you are building actual Mac
+applications.  For PowerMac native you will need PPCLink, however;
+also the executables are PowerPC-only.
+
+* Automated Installation
+
+The simplest way to install GNU tools is to run the Install script.
+The script will copy things to where you want to keep them, will build
+a UserStartup file with settings corresponding to where things were
+copied, and offer to put that UserStartup file in your MPW folder.
+
+The Install script does not alter anything in the System Folder, and
+it does not take any action without confirmation.
+
+The Install script will be at the top level of the binary
+distribution, or at the top level of the object directory if
+rebuilding from source.  (The sources include a file called
+"mpw-install" at the top level, but it is the source to the Install
+script and cannot be run directly.)
+
+* Manual Installation
+
+If you don't want to run the Install script, you can do installation
+manually; this section describes the steps involved.
+
+The GNU tools can go in any directory that is in your {Commands} list.
+We generally put all the tools somewhere like {Boot}Cygnus:latest:bin,
+and then add to a UserStartup file:
+
+	set Commands "{Boot}Cygnus:latest:bin:,{Commands}"
+
+However, the cpp and cc1 programs of GCC are not normally stored here.
+Instead, they will be in a "lib" directory that is alongside "bin",
+and organized by target and version underneath, with names like
+
+	:lib:gcc-lib:<target>:cygnus-<version>:
+
+If you build and install everything yourself according to the build
+instructions below, then you will not have any problems.  However, you
+may discover that GCC seems unable to find the right cpp and cc1;
+usually this will be because directory names have changed.  (Even
+renaming your hard disk will make this happen.)  In such cases, you
+have several choices.  One is just to add this directory to
+{Commands}, but then you will not be able to get any other cpp or cc1,
+such as those used by a different target or version.  Another way is
+to rename your disk and directories to match the prefix used when the
+tools were compiled.  Finally, you can set the variable
+GCC_EXEC_PREFIX to point to the library directory:
+
+	set GCC_EXEC_PREFIX MyDisk:Stuff:lib:gcc-lib:
+	export GCC_EXEC_PREFIX
+
+You may also want to edit MPW's HEXA 128 resource.  When GCC is built
+using a native GCC, it is compiled to use a special stack allocator
+function alloca().  While this is very efficient, it means that GCC
+will need considerable stack space to run, especially when compiling
+large programs with optimization turned on.  You give MPW more stack
+by editing the HEXA 128 resource of the MPW Shell.  A value of "0008
+0000" gives 512K of stack size, which is usually sufficient.
+
+USING GNU TOOLS
+
+* Using Native PowerMac GCC
+
+Using a native PowerMac GCC to produce MPW tools or MacOS applications
+is more complicated than just "gC foo.c", although no more complicated
+than with other Mac compilers.
+
+To build a native PowerMac MPW tool, use this sequence, where hello.c
+is the usual "hello world" program, and genericcfrg.r is the Rez file
+with the code fragment resource:
+
+gC -I{CIncludes} -fno-builtin -Dpascal= -c -g hello.c
+PPCLink hello.o -o hello \Option-d
+	"{PPCLibraries}"StdCRuntime.o \Option-d
+	"{SharedLibraries}"InterfaceLib \Option-d
+	"{SharedLibraries}"StdCLib \Option-d
+	"{PPCLibraries}"PPCToolLibs.o \Option-d
+	"{PPCLibraries}"PPCCRuntime.o \Option-d
+	"{GCCPPCLibraries}"libgcc.xcoff
+rez -d APPNAME='"'hello'"' GenericCFRG.r -o hello
+setfile -t 'MPST' -c 'MPS ' hello
+
+The same sequence works to build a MacOS application, but you set the file
+type to 'APPL' and don't link in PPCToolLibs.o.  For further details on
+using MPW to build Mac applications, see the general MPW documentation.
+
+Recent versions of PPCLink have an option to generate the code
+fragment resource and automatically set creator and file type;
+here is what GenericCFRG.r should look like if you have an older
+PPCLink or are using GNU ld:
+
+#include "CodeFragmentTypes.r"
+
+resource 'cfrg' (0) {
+        {
+                kPowerPC,
+                kFullLib,
+                kNoVersionNum,kNoVersionNum,
+                0,0,
+                kIsApp,kOnDiskFlat,kZeroOffset,kWholeFork,
+                APPNAME // must be defined on Rez command line with -d option
+        }
+};
+
+In general this port of GCC supports the same option syntax and
+behavior as its Unix counterpart.  It also has similar compilation
+rules, so it will run the assembler on .s files and so forth.
+
+The GCC manual includes full information on the available options.
+One option that may be especially useful is "-v", which shows you what
+tools and options are being used; unlike most Mac C compilers, GCC
+directs assembly and linking in addition to compilation.
+
+MPW GCC does feature two extensions to the option syntax; '-d macro=name'
+works just as '-Dmacro=name' does in Unix, and '-i directory' works the
+same as '-Idirectory'.
+
+MPW GCC supports the usual Pascal-style strings and alignment pragmas.
+
+To find standard include files you can set the variable GCCIncludes:
+
+	set GCCIncludes MyDisk:MyIncludes:
+	export GCCIncludes
+
+GCCIncludes is similar to MPW's CIncludes or CW's MWCIncludes.  In
+order to use MPW's usual include files, just say:
+
+	set GCCIncludes "{CIncludes}"
+	export GCCIncludes
+
+* Using GCC as a Cross-Compiler
+
+If you have a cross-compiler, and you have all of the correct
+target-side crt0 and libraries available, then to compile and link a
+file "foo.c", you can say just
+
+	gC foo.c
+
+The output file will be an MPW binary file named "a.out"; the format
+of the contents will depend on which target is in use, so for instance
+a MIPS-targeting GCC will produce ECOFF or ELF executables.
+
+Note that using MPW include files with a cross-compiler is somewhat
+dangerous.
+
+* Using the Assembler and Friends
+
+The assembler ("as") and linker ("ld") are faithful ports of their
+Unix counterparts.  Similarly, the binutils "ar", "cplusfilt", "nm",
+"objcopy", "objdump", "ranlib", "size", "strings", and "strip" are all
+like they are under Unix.  (Note that "cplusfilt" is usually called
+"c++filt" under Unix.)
+
+* Using GDB
+
+There are two flavors of GDB.  "gdb" is an MPW tool that works very
+much like it does in Unix; put a command into the MPW worksheet and
+type the <enter> key to send it to GDB.  While "gdb" is running, you
+cannot do anything else in MPW, although you can switch to other
+Mac applications and use them.
+
+"SiowGDB" is also a Mac application, but it is GDB using the SIOW
+package to provide console emulation.  Commands are exactly as for the
+MPW tool, but since this is its own application, you can switch
+between it and MPW.
+
+BUILDING GNU TOOLS
+
+This port of the GNU tools uses a configure script similar to
+that used for GNU tools under Unix, but rewritten for MPW.  As with
+Unix configuration, there is an "object" directory that may be
+different from the "source" directory.  In the example commands below,
+we will assume that we are currently in the object directory, and that
+the source directory is "{Boot}Cygnus:src:".
+
+* Requirements for Building
+
+In addition to the sources, you will need a set of tools that the
+configure and build scripts assume to be available.  These tools
+(and their versions, if relevant) are as follows:
+
+	byacc tool
+	flex (2.3.7) tool (and Flex.skel file)
+	forward-include script
+	MoveIfChange script
+	mpw-touch script
+	mpw-true script
+	NewFolderRecursive script
+	null-command script
+	open-brace script
+	sed (1.13) tool
+	tr-7to8 script
+	true script
+
+The scripts are in the sources, under utils:mpw:. You must arrange to
+get the other tools yourself (they are readily available from the
+"usual" net sites, and are also on many CDROMS).  In addition, there
+will usually be a set of these available at ftp.cygnus.com, in pub/mac.
+
+You may put the build tools in your usual Tools or Scripts
+directories, or keep them in a separate directories.  We prefer to
+make a directory called "buildtools" and we put this in one of our
+UserStartup files:
+
+	set Commands "{Boot}Cygnus:buildtools:,{Commands}"
+
+Flex uses an environment variable FLEX_SKELETON to locate its skeleton
+file, so you need to do something like this, preferably in a UserStartup:
+
+	Set FLEX_SKELETON "{Boot}"Cygnus:buildtools:Flex.skel
+	Export FLEX_SKELETON
+
+* Configuring
+
+Before you can build anything, you must configure.  You do this by
+creating an directory where object files will be stored, setdirectory
+to that directory and do a configure command:
+
+	{Boot}Cygnus:src:mpw-configure --target <name> --cc <compiler> --srcdir {Boot}Cygnus:src: --prefix <whatever>
+
+If the source directory is not in your {Commands} list, then you must
+supply a full pathname to mpw-configure, since mpw-configure invokes
+itself after switching into each subdirectory.  Using a relative
+pathname, even something like ':mpw-configure', will therefore not work.
+
+<name> must be a known target.  Valid ones include "m68k-apple-macos",
+"powerpc-apple-macos", "i386-unknown-go32", "mips-idt-ecoff", and
+"sh-hitachi-hms".  Not all target types are accepted for all of the
+tools yet.
+
+<compiler> must be the name of the compiler to use.  It defaults to "mpwc".
+
+	(m68k)
+	mpwc	MPW C
+	sc68k	Symantec C
+	mwc68k	Metrowerks C (Codewarrior)
+	gcc68k	GCC
+
+	(powerpc)
+	ppcc	PPCC
+	mrc	Macintosh on RisC (Mister C, aka(?) Frankenstein)
+	scppc	Symantec C
+	mwcppc	Metrowerks C (Codewarrior)
+	gccppc	GCC
+
+Not all compilers will compile all tools equally well!  For m68k Macs,
+MPW C has the best record so far (it has problems, but they can be
+worked around), while for PowerMacs, CodeWarrior is the only compiler
+that has successfully compiled everything into running code.
+
+<prefix> is the path that "gcc" will prepend when looking for tools
+to execute.  GCC_EXEC_PREFIX overrides this value, so you need not
+include it if you plan to use GCC_EXEC_PREFIX.
+
+As an example, here is the configure line that you could use to build
+native PowerMac GCC:
+
+"{Boot}"Cygnus:src:mpw-configure --cc mwcppc --target powerpc-apple-macos --srcdir "{Boot}"Cygnus:src: --prefix "{Boot}"GNUTools:
+
+* Building
+
+If you use CodeWarrior, you *must* first set MWCIncludes to
+{CIncludes}.  This is because you will be building MPW tools, and
+their standard I/O works by making references to data that is part of
+the MPW Shell, which means that the code must be compiled and linked
+with macros that refer to that data, and those macros are in
+{CIncludes}, not the default {MWCIncludes}.  Without this change, you
+will encounter problems compiling libiberty/mpw.c, but tweaking that
+file only masks the real problem, and does not fix it.
+
+The command
+
+	mpw-build
+
+will build everything. Building will take over an hour on a Quadra 800
+or PowerMac 8100/110, longer if the sources are on a shared volume.
+
+You may see some warnings; these are mostly likely benign, typically
+disagreements about declarations of library and system functions.
+
+* Installing
+
+To install the just-built tools, use the command
+
+	mpw-build install
+
+This part of the installation procedure just copies files to the
+location specified at configure time by <prefix>, and, in some cases,
+renames them from temporary internal names to their usual names. This
+install process is *not* the same as what the Install script does;
+Install can copy tools from the installation location chosen at
+configuration time to a user-chosen place, and sets up a UserStartup
+file.  Note that while the Install script is optional, the install
+build action performs some tasks would be very hard to replicate
+manually, so you should always do it before using the tools.
+
+* Known Problems With Using Various Compilers to Build
+
+Most versions of MPW C have problems with compiling GNU software.
+
+MPW C 3.2.x has preprocessing bugs that render it incapable of
+compiling the BFD library, so it can't be used at all for building BFD.
+
+MPW C 3.3, 3.3.1, and 3.3.2 will spontaneously claim to have found
+errors in the source code, but in fact the code is perfectly fine.  If
+this happens, just set the working directory back to the top-level
+objdir (where the configure command above was performed), and type
+"mpw-build all" again.  If it goes on through the supposed error, then
+you got one of the spurious errors.  A full build may require a number
+of these restarts.
+
+MPW C 3.3.3 seems to work OK, at least with the aid of a number of
+workarounds that are in the sources (look for #ifdef MPW_C).
+
+Versions of MPW Make earlier than 4.0d2 have exhibited bizarre behavior,
+failure to substitute variables and the like.
+
+Metrowerks CW6 PPC linker (MWLinkPPC) seems to do bad things with memory
+if the "Modern Memory Manager" is turned on (in the Memory control panel),
+but works OK if it is turned off.
+
+Metrowerks CW6 loses bigtime compiling opcodes:ppc-opc.c, which has
+some deeply nested macros.  (CW7 is OK.)  There is a way to patch the
+file, by substituting constant values.  If you need to do this,
+contact shebs@cygnus.com for details.
+
+<Gestalt.h> is missing from {CIncludes} in the MPW version that comes
+with CW7.  You can just copy the one in CW7's {MWCIncludes}.
+
+CW8 and later have changes to headers and such that will require changes
+to the source in order to be able to use them to rebuild.
+
+KNOWN BUGS
+
+The declarations for memcpy and memcmp in some versions of header files
+may conflict with GCC's builtin definition.  Either use -fno-builtin
+or ignore the warnings.
+
+This is not a bug, but - watch out for cr/nl translation!  For instance,
+if config/mpw-mh-mpw is not properly translated because it has been
+copied or updated separately, then everything will almost build, but
+you will get puzzling error messages from make or the compiler.
+
+'/' or ' ' embedded in any device, directory, or file name may or may
+not work.
+
+objcopy -O srec foo.o makes random output filenames.
+
+Mac-x-mips requires -mgas but Unix hosts don't.
+
+GDB will frequently require a '/' on the front of a device name in order
+to recognize it as an absolute rather than a relative pathname.
+
+GDB doesn't seem to use the printer port correctly, although it tries.
+
+The cursor doesn't always spin as much as it should.  To get elaborate
+statistics and warnings about spin rates, add this to UserStartup:
+
+	set MEASURE_SPIN all
+	export MEASURE_SPIN
diff --git a/mpw-build.in b/mpw-build.in
new file mode 100644
index 0000000..86d9530
--- /dev/null
+++ b/mpw-build.in
@@ -0,0 +1,204 @@
+# Top-level script fragment to build everything for MPW.
+
+Set savedir "`Directory`"
+
+#Set Echo 1
+
+Set ThisScript "{0}"
+
+Set objdir ":"
+
+Set verify 0
+
+Set BuildTarget "none"
+
+# Parse arguments.
+
+Loop
+	Break If {#} == 0
+		If "{BuildTarget}" =~ /none/
+			Set BuildTarget "{1}"
+		Else
+			Echo Only one build target allowed, ignoring "{1}"
+		End If
+	Shift 1
+End Loop
+
+If "{BuildTarget}" =~ /none/
+	Set BuildTarget "all"
+End If
+
+If {verify} == 1
+	Echo "#" Doing "{ThisScript}" "{BuildTarget}" in "`Directory`" ... 
+End If
+
+Set ranmake 0
+
+If "`Exists Makefile`" != ""
+	Echo "Set Echo 1" >{BuildTarget}.makeout
+	Make -f Makefile {BuildTarget} >>{BuildTarget}.makeout
+	{BuildTarget}.makeout
+	Delete {BuildTarget}.makeout
+	Set ranmake 1
+End If
+
+If "`Exists Makefile.PPC`" != ""
+	Echo "Set Echo 1" >{BuildTarget}.makeout.ppc
+	Make -f Makefile.PPC {BuildTarget} >>{BuildTarget}.makeout.ppc
+	{BuildTarget}.makeout.ppc
+	Delete {BuildTarget}.makeout.ppc
+	Set ranmake 1
+End If
+
+If {ranmake} == 1
+	Exit
+End If
+
+# Dispatch on various pseudo-targets.
+
+If "{BuildTarget}" =~ /all/
+	Echo Started `Date`
+	"{ThisScript}" all-gcc
+	"{ThisScript}" all-gdb
+	Echo Finished `Date`
+Else If "{BuildTarget}" =~ /all-libiberty/
+	"{ThisScript}" do-libiberty
+Else If "{BuildTarget}" =~ /all-bfd/
+	"{ThisScript}" do-bfd
+Else If "{BuildTarget}" =~ /all-opcodes/
+	"{ThisScript}" do-opcodes
+Else If "{BuildTarget}" =~ /all-byacc/
+	"{ThisScript}" do-byacc
+Else If "{BuildTarget}" =~ /all-flex/
+	"{ThisScript}" all-libiberty
+	"{ThisScript}" do-flex
+Else If "{BuildTarget}" =~ /all-binutils/
+	"{ThisScript}" all-libiberty
+	"{ThisScript}" all-bfd
+	"{ThisScript}" all-opcodes
+	"{ThisScript}" do-binutils
+Else If "{BuildTarget}" =~ /all-gas/
+	"{ThisScript}" all-libiberty
+	"{ThisScript}" all-bfd
+	"{ThisScript}" all-opcodes
+	"{ThisScript}" do-gas
+Else If "{BuildTarget}" =~ /all-gcc/
+	"{ThisScript}" all-libiberty
+	"{ThisScript}" all-gas
+	"{ThisScript}" all-binutils
+	"{ThisScript}" all-ld
+	"{ThisScript}" do-gcc
+Else If "{BuildTarget}" =~ /all-gdb/
+	"{ThisScript}" all-libiberty
+	"{ThisScript}" all-bfd
+	"{ThisScript}" all-opcodes
+	"{ThisScript}" do-gdb
+Else If "{BuildTarget}" =~ /all-grez/
+	"{ThisScript}" all-libiberty
+	"{ThisScript}" all-bfd
+	"{ThisScript}" do-grez
+Else If "{BuildTarget}" =~ /all-ld/
+	"{ThisScript}" all-libiberty
+	"{ThisScript}" all-bfd
+	"{ThisScript}" all-opcodes
+	"{ThisScript}" do-ld
+Else If "{BuildTarget}" =~ /do-byacc/
+	SetDirectory :byacc:
+	::mpw-build all
+Else If "{BuildTarget}" =~ /do-flex/
+	SetDirectory :flex:
+	::mpw-build _bootstrap
+	::mpw-build all
+Else If "{BuildTarget}" =~ /do-bfd/
+	SetDirectory :bfd:
+	::mpw-build all
+Else If "{BuildTarget}" =~ /do-libiberty/
+	SetDirectory :libiberty:
+	::mpw-build all
+Else If "{BuildTarget}" =~ /do-opcodes/
+	SetDirectory :opcodes:
+	::mpw-build all
+Else If "{BuildTarget}" =~ /do-binutils/
+	SetDirectory :binutils:
+	::mpw-build stamps
+	::mpw-build all
+Else If "{BuildTarget}" =~ /do-gas/
+	SetDirectory :gas:
+	::mpw-build stamps
+	::mpw-build all
+Else If "{BuildTarget}" =~ /do-gcc/
+	SetDirectory :gcc:
+	:mpw-build all
+Else If "{BuildTarget}" =~ /do-gdb/
+	SetDirectory :gdb:
+	::mpw-build all
+Else If "{BuildTarget}" =~ /do-grez/
+	SetDirectory :grez:
+	::mpw-build all
+Else If "{BuildTarget}" =~ /do-ld/
+	SetDirectory :ld:
+	::mpw-build all
+Else If "{BuildTarget}" =~ /do-newlib/
+	SetDirectory :newlib:
+	::mpw-build all
+Else If "{BuildTarget}" =~ /install/
+	"{ThisScript}" install-only-top
+	"{ThisScript}" install-binutils
+	"{ThisScript}" install-gas
+	"{ThisScript}" install-gcc
+	"{ThisScript}" install-ld
+	"{ThisScript}" install-gdb
+Else If "{BuildTarget}" =~ /install-binutils/
+	SetDirectory :binutils:
+	::mpw-build install
+Else If "{BuildTarget}" =~ /install-gas/
+	SetDirectory :gas:
+	::mpw-build install
+Else If "{BuildTarget}" =~ /install-gcc/
+	SetDirectory :gcc:
+	:mpw-build install
+Else If "{BuildTarget}" =~ /install-gdb/
+	SetDirectory :gdb:
+	::mpw-build install
+Else If "{BuildTarget}" =~ /install-grez/
+	SetDirectory :grez:
+	::mpw-build install
+Else If "{BuildTarget}" =~ /install-ld/
+	SetDirectory :ld:
+	::mpw-build install
+Else If "{BuildTarget}" =~ /install-only/
+	"{ThisScript}" install-only-top
+	"{ThisScript}" install-only-binutils
+	"{ThisScript}" install-only-gas
+	"{ThisScript}" install-only-gcc
+	"{ThisScript}" install-only-gdb
+	"{ThisScript}" install-only-ld
+Else If "{BuildTarget}" =~ /install-only-binutils/
+	SetDirectory :binutils:
+	::mpw-build install-only
+Else If "{BuildTarget}" =~ /install-only-gas/
+	SetDirectory :gas:
+	::mpw-build install-only
+Else If "{BuildTarget}" =~ /install-only-gcc/
+	SetDirectory :gcc:
+	:mpw-build install-only
+Else If "{BuildTarget}" =~ /install-only-gdb/
+	SetDirectory :gdb:
+	::mpw-build install-only
+Else If "{BuildTarget}" =~ /install-only-grez/
+	SetDirectory :grez:
+	::mpw-build install-only
+Else If "{BuildTarget}" =~ /install-only-ld/
+	SetDirectory :ld:
+	::mpw-build install-only
+Else If "{BuildTarget}" =~ /install-only-top/
+	NewFolderRecursive "{prefix}"
+	If "{prefix}" != "`Directory`"
+		Duplicate -y 'Read Me for MPW' "{prefix}"'Read Me for MPW'
+		Duplicate -y Install "{prefix}"Install
+	End If
+Else
+	Echo {BuildTarget} not understood, ignoring
+End If
+
+SetDirectory "{savedir}"
diff --git a/mpw-config.in b/mpw-config.in
new file mode 100644
index 0000000..8028737
--- /dev/null
+++ b/mpw-config.in
@@ -0,0 +1,113 @@
+# Configuration fragment for Cygnus source tree.
+
+# Check that we can find all the special tools that we will need.
+# The test for sed is semi-pointless, because it's already been invoked
+# by the calculation of target_cpu in the main configure script, but
+# the test will also show which one is being used.
+
+Set Exit 0
+Echo byacc is `Which byacc`
+Echo flex is `Which flex`
+Echo forward-include is `Which forward-include`
+Echo MoveIfChange is `Which MoveIfChange`
+Echo mpw-touch is `Which mpw-touch`
+Echo mpw-true is `Which mpw-true`
+Echo NewFolderRecursive is `Which NewFolderRecursive`
+Echo null-command is `Which null-command`
+Echo open-brace is `Which open-brace`
+Echo sed is `Which sed`
+Echo 'tr-7to8' is `Which tr-7to8`
+Echo true is `Which true`
+Set Exit 1
+
+Set host_libs "mmalloc libiberty opcodes bfd readline gash tcl tk tclX"
+
+Set host_tools "texinfo byacc flex bison binutils ld gas gcc gdb make patch \Option-d
+	    prms send-pr gprof gdbtest tgas etc expect dejagnu sim bash \Option-d
+	    m4 autoconf ispell grep diff rcs cvs fileutils shellutils time \Option-d
+	    textutils wdiff find emacs emacs19 uudecode hello tar gzip indent \Option-d
+	    recode release sed utils guile perl apache inet gawk"
+
+Set target_libs "newlib"
+
+Set target_tools "examples"
+
+# Configure the resource compiler if targeting Macs.
+If {target_os} =~ /macos/ || {target_os} =~ /mpw/
+	Set host_tools "{host_tools} grez"
+End If
+	
+Set configdirs "{host_libs} {host_tools} {target_libs} {target_tools}"
+Export configdirs
+
+# Make up a special include directory that tools will share.
+
+If "`Exists "{objdir}"extra-include`" == ""
+	NewFolder "{objdir}"extra-include
+End If
+
+Set edir "{objdir}extra-include:"
+
+forward-include "{srcdir}"include:mpw:sys:file.h "{edir}"'sys/file.h'
+forward-include "{srcdir}"include:mpw:sys:ioctl.h "{edir}"'sys/ioctl.h'
+forward-include "{srcdir}"include:mpw:sys:param.h "{edir}"'sys/param.h'
+forward-include "{srcdir}"include:mpw:sys:resource.h "{edir}"'sys/resource.h'
+forward-include "{srcdir}"include:mpw:sys:stat.h "{edir}"'sys/stat.h'
+forward-include "{srcdir}"include:mpw:sys:time.h "{edir}"'sys/time.h'
+forward-include "{srcdir}"include:mpw:sys:types.h "{edir}"'sys/types.h'
+
+forward-include "{srcroot}"include:aout:aout64.h "{edir}"'aout/aout64.h'
+forward-include "{srcroot}"include:aout:ar.h "{edir}"'aout/ar.h'
+forward-include "{srcroot}"include:aout:ranlib.h "{edir}"'aout/ranlib.h'
+forward-include "{srcroot}"include:aout:reloc.h "{edir}"'aout/reloc.h'
+forward-include "{srcroot}"include:aout:stab.def "{edir}"'aout/stab.def'
+forward-include "{srcroot}"include:aout:stab_gnu.h "{edir}"'aout/stab_gnu.h'
+
+If "`Exists "{srcroot}"include:aout:"{target_cpu}".h`" != ""
+	forward-include "{srcroot}"include:aout:"{target_cpu}".h "{edir}"'aout/'"{target_cpu}"'.h'
+End If
+
+forward-include "{srcroot}"include:coff:ecoff.h "{edir}"'coff/ecoff.h'
+forward-include "{srcroot}"include:coff:internal.h "{edir}"'coff/internal.h'
+forward-include "{srcroot}"include:coff:sym.h "{edir}"'coff/sym.h'
+forward-include "{srcroot}"include:coff:symconst.h "{edir}"'coff/symconst.h'
+
+If "`Exists "{srcroot}"include:coff:"{target_cpu}".h`" != ""
+	forward-include "{srcroot}"include:coff:"{target_cpu}".h "{edir}"'coff/'"{target_cpu}"'.h'
+End If
+If "{target_cpu}" =~ /powerpc/
+	forward-include "{srcroot}"include:coff:rs6000.h "{edir}"'coff/rs6000.h'
+End If
+
+forward-include "{srcroot}"include:elf:common.h "{edir}"'elf/common.h'
+forward-include "{srcroot}"include:elf:dwarf.h "{edir}"'elf/dwarf.h'
+forward-include "{srcroot}"include:elf:dwarf2.h "{edir}"'elf/dwarf2.h'
+forward-include "{srcroot}"include:elf:external.h "{edir}"'elf/external.h'
+forward-include "{srcroot}"include:elf:internal.h "{edir}"'elf/internal.h'
+
+# Believe it or not, GDB needs this for all targets.
+forward-include "{srcroot}"include:elf:mips.h "{edir}"'elf/mips.h'
+
+If "`Exists "{srcroot}"include:elf:"{target_cpu}".h`" != ""
+	forward-include "{srcroot}"include:elf:"{target_cpu}".h "{edir}"'elf/'"{target_cpu}"'.h'
+End If
+If "{target_cpu}" =~ /powerpc/
+	forward-include "{srcroot}"include:elf:ppc.h "{edir}"'elf/ppc.h'
+End If
+
+If "`Exists "{srcroot}"include:opcode:"{target_cpu}".h`" != ""
+	forward-include "{srcroot}"include:opcode:"{target_cpu}".h "{edir}"'opcode/'"{target_cpu}"'.h'
+End If
+If "{target_cpu}" =~ /powerpc/
+	forward-include "{srcroot}"include:opcode:ppc.h "{edir}"'opcode/ppc.h'
+End If
+
+# Add some bfd includes that get mentioned outside the bfd dir.
+	
+forward-include "{srcroot}"bfd:libcoff.h "{edir}"'bfd/libcoff.h'
+forward-include "{srcroot}"bfd:libecoff.h "{edir}"'bfd/libecoff.h'
+
+# Translate random files into MPW-only character set.
+
+tr-7to8 "{srcdir}"mpw-README > "{objdir}Read Me for MPW"
+tr-7to8 "{srcdir}"mpw-install > "{objdir}"Install
diff --git a/mpw-configure b/mpw-configure
new file mode 100644
index 0000000..cf45148
--- /dev/null
+++ b/mpw-configure
@@ -0,0 +1,448 @@
+# Configuration script
+# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+
+# This program 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 of the License, or
+# (at your option) any later version.
+# 
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+### WARNING
+### This script must NOT use any 8-bit chars!
+### WARNING
+
+# This is an MPW Shell script that sets everything up for compilation,
+# mainly creating directories, and editing copies of files.
+
+Set savedir "`Directory`"
+
+#Set Echo 1
+
+Set ThisScript "{0}"
+
+Set srcroot "--------"
+
+Set srcdir ":"
+
+Set objdir ":"
+
+Set prefix "{MPW}":GNUTools:
+
+Set exec_prefix ""
+
+Set bindir ""
+
+Set host_alias "m68k-apple-mpw"
+
+Set target_alias {host_alias}
+
+Set host_cc "mpwc"
+
+Set with_gnu_ld 0
+
+Set helpoutput 0
+
+Set recurse 1
+
+Set verify 0
+Set verifystr ""
+
+Set enable_options ""
+Set disable_options ""
+
+# Parse arguments.
+
+Loop
+	Break If {#} == 0
+	If "{1}" =~ /--cc/
+		Set host_cc "{2}"
+		Shift 1
+	Else If "{1}" =~ /--bindir/
+		Set bindir "{2}"
+		Shift 1
+	Else If "{1}" =~ /--disable-?+/
+		Set `Echo {1} | sed -e 's/--disable-/enable_/'` no
+		Set disable_options "{disable_options} '{1}'"
+	Else If "{1}" =~ /--enable-?+/
+		Set `Echo {1} | sed -e 's/--enable-/enable_/'` yes
+		Set enable_options "{enable_options} '{1}'"
+	Else If "{1}" =~ /--exec-prefix/
+		Set exec_prefix "{2}"
+		Shift 1
+	Else If "{1}" =~ /--help/
+		Set helpoutput 1
+	Else If "{1}" =~ /--host/
+		Set host_alias "{2}"
+		Shift 1
+	Else If "{1}" =~ /--norecursion/
+		Set recurse 0
+	Else If "{1}" =~ /--prefix/
+		Set prefix "{2}"
+		Shift 1
+	Else If "{1}" =~ /--srcdir/
+		Set srcdir "{2}"
+		Shift 1
+	Else If "{1}" =~ /--srcroot/
+		Set srcroot "{2}"
+		Shift 1
+	Else If "{1}" =~ /--target/
+		Set target_alias "{2}"
+		Shift 1
+	Else If "{1}" =~ /-v/
+		Set verify 1
+		Set verifystr "-v"
+	Else If "{1}" =~ /--with-gnu-ld/
+		Set with_gnu_ld 1
+	Else
+		Echo -n 'mpw-configure: Unrecognized option: "'
+		Echo -n "{1}"
+		Echo '"; use --help for usage.'
+		Exit 1
+	End If
+	Shift 1
+End Loop
+
+If {helpoutput} == 1
+	Echo "Usage: mpw-configure [OPTIONS]"
+	Echo ""
+	Echo "Options: [defaults in brackets]"
+	Echo "--bindir DIR      directory for binaries []"
+	Echo "--cc CC           use C compiler CC [mpwc]"
+	Echo "--disable-FOO     do not include feature FOO"
+	Echo "--enable-FOO      include feature FOO"
+	Echo "--exec-prefix DIR install host-dependent files into DIR []"
+	Echo "--help            print this message"
+	Echo "--host HOST       configure for HOST [m68k-apple-mpw]"
+	Echo "--norecursion     configure this directory only [recurse]"
+	Echo "--prefix DIR      install into DIR [{MPW}:GNUTools:]"
+	Echo "--srcdir DIR      find the sources in DIR [:]"
+	Echo "--srcroot DIR     find the toplevel sources in DIR [:]"
+	Echo "--target TARGET   configure for TARGET [TARGET=HOST]"
+	Echo "-v                verbose"
+	Echo "--with-gnu-ld     link using GNU ld [no]"
+	Exit 0
+End If
+
+Set Exit 0
+
+# Default exec_prefix from prefix.
+
+If "{exec_prefix}" == ""
+	Set exec_prefix "{prefix}"
+End If
+
+If "{bindir}" == ""
+	Set bindir "{prefix}"bin:
+End If
+
+# Point to the correct set of tools to use with the chosen compiler.
+
+If "{host_cc}" =~ /mpwc/
+	Set host_alias "m68k-apple-mpw"
+	Set cc_name '{CC_MPW_C}'
+	Set segment_flag '-s '
+	Set ar_name '{AR_LIB}'
+	Set ranlib_name '{RANLIB_NULL}'
+	Set cc_ld_name '{CC_LD_LINK}'
+	Set prog_ext_name '{PROG_EXT_68K}'
+	Set extralibs_name '{EXTRALIBS_C}'
+	Set makepef_name '{MAKEPEF_NULL}'
+	Set rez_name '{REZ_68K}'
+Else If "{host_cc}" =~ /sc68k/
+	Set host_alias "m68k-apple-mpw"
+	Set cc_name '{CC_SC}'
+	Set segment_flag '-s '
+	Set ar_name '{AR_LIB}'
+	Set ranlib_name '{RANLIB_NULL}'
+	Set cc_ld_name '{CC_LD_LINK}'
+	Set prog_ext_name '{PROG_EXT_68K}'
+	Set extralibs_name '{EXTRALIBS_C}'
+	Set makepef_name '{MAKEPEF_NULL}'
+	Set rez_name '{REZ_68K}'
+Else If "{host_cc}" =~ /mwc68k/
+	Set host_alias "m68k-apple-mpw"
+	Set cc_name '{CC_MWC68K}'
+	Set segment_flag '-s '
+	Set ar_name '{AR_MWLINK68K}'
+	Set ranlib_name '{RANLIB_NULL}'
+	Set cc_ld_name '{CC_LD_MWLINK68K}'
+	Set prog_ext_name '{PROG_EXT_68K}'
+	Set extralibs_name '{EXTRALIBS_MWC68K}'
+	Set makepef_name '{MAKEPEF_NULL}'
+	Set rez_name '{REZ_68K}'
+Else If "{host_cc}" =~ /gcc68k/
+	Set host_alias "m68k-apple-mpw"
+	Set cc_name '{CC_68K_GCC}'
+	Set segment_flag '-s '
+	Set ar_name '{AR_68K_AR}'
+	Set ranlib_name '{RANLIB_RANLIB}'
+	Set cc_ld_name '{CC_68K_GCC}'
+	Set prog_ext_name '{PROG_EXT_68K}'
+	Set extralibs_name '{EXTRALIBS_C}'
+	Set makepef_name '{MAKEPEF_NULL}'
+	Set rez_name '{REZ_68K}'
+Else If "{host_cc}" =~ /ppcc/
+	Set host_alias "powerpc-apple-mpw"
+	Set cc_name '{CC_PPCC}'
+	Set segment_flag '-d ___s_e_g___='
+	Set ar_name '{AR_PPCLINK}'
+	Set ranlib_name '{RANLIB_NULL}'
+	Set cc_ld_name '{CC_LD_PPCLINK}'
+	Set prog_ext_name '{PROG_EXT_XCOFF}'
+	Set extralibs_name '{EXTRALIBS_PPC}'
+	Set makepef_name '{MAKEPEF_PPC}'
+	Set rez_name '{REZ_PPC}'
+Else If "{host_cc}" =~ /mrc/
+	Set host_alias "powerpc-apple-mpw"
+	Set cc_name '{CC_MRC}'
+	Set segment_flag '-d ___s_e_g___='
+	Set ar_name '{AR_PPCLINK}'
+	Set ranlib_name '{RANLIB_NULL}'
+	Set cc_ld_name '{CC_LD_PPCLINK}'
+	Set prog_ext_name '{PROG_EXT_XCOFF}'
+	Set extralibs_name '{EXTRALIBS_PPC}'
+	Set makepef_name '{MAKEPEF_PPC}'
+	Set rez_name '{REZ_PPC}'
+Else If "{host_cc}" =~ /scppc/
+	Set host_alias "powerpc-apple-mpw"
+	Set cc_name '{CC_SC}'
+	Set segment_flag '-d ___s_e_g___='
+	Set ar_name '{AR_PPCLINK}'
+	Set ranlib_name '{RANLIB_NULL}'
+	Set cc_ld_name '{CC_LD_PPCLINK}'
+	Set prog_ext_name '{PROG_EXT_XCOFF}'
+	Set extralibs_name '{EXTRALIBS_PPC}'
+	Set makepef_name '{MAKEPEF_PPC}'
+	Set rez_name '{REZ_PPC}'
+Else If "{host_cc}" =~ /mwcppc/
+	Set host_alias "powerpc-apple-mpw"
+	Set cc_name '{CC_MWCPPC}'
+	Set segment_flag '-d ___s_e_g___='
+	Set ar_name '{AR_MWLINKPPC}'
+	Set ranlib_name '{RANLIB_NULL}'
+	Set cc_ld_name '{CC_LD_MWLINKPPC}'
+	# Misleading, but we don't need a PEF step.
+	Set prog_ext_name '{PROG_EXT_68K}'
+	Set extralibs_name '{EXTRALIBS_MWCPPC}'
+	Set makepef_name '{MAKEPEF_NULL}'
+	Set rez_name '{REZ_PPC}'
+Else If "{host_cc}" =~ /gccppc/
+	Set host_alias "powerpc-apple-mpw"
+	Set cc_name '{CC_PPC_GCC}'
+	Set segment_flag '-d ___s_e_g___='
+	Set ar_name '{AR_PPCLINK}'
+	If {with_gnu_ld} == 1
+		Set ranlib_name '{RANLIB_RANLIB}'
+		Set cc_ld_name '{CC_LD_GLD}'
+	Else
+		Set ranlib_name '{RANLIB_NULL}'
+		Set cc_ld_name '{CC_LD_PPCLINK}'
+	End If
+	Set prog_ext_name '{PROG_EXT_XCOFF}'
+	Set extralibs_name '{EXTRALIBS_PPC}'
+	Set makepef_name '{MAKEPEF_PPC}'
+	Set rez_name '{REZ_PPC}'
+Else
+	Echo "{host_cc}" is not a known MPW compiler type
+End If
+
+Set dash_c_flag ''
+If "{host_cc}" =~ /gcc68k/
+	Set dash_c_flag '-c'
+Else If "{host_cc}" =~ /gccppc/
+	Set dash_c_flag '-c'
+End If
+
+# (should interpret aliases if not in canonical form)
+
+Set host_canonical "{host_alias}"
+
+Set target_canonical "{target_alias}"
+
+Set configdirs ""
+
+If "{srcroot}" =~ /--------/
+	Set srcroot "{srcdir}"
+End If
+If "`Exists "{srcdir}"`" == ""
+	Echo Source directory {srcdir} does not exist!
+	Exit 1
+End If
+If "`Exists "{srcroot}"`" == ""
+	Echo Top-level source directory {srcroot} does not exist!
+	Exit 1
+End If
+
+Set target_cpu "`echo {target_canonical} | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`"
+Set target_vendor "`echo {target_canonical} | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`"
+Set target_os "`echo {target_canonical} | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`"
+
+# Create a file that is guaranteed to be older than any other here.
+
+If "`Exists "{objdir}"_oldest`" == ""
+	mpw-touch _oldest
+End If
+
+# Record this before creating any files, makefiles sometimes mention
+# dependencies on config.status.
+
+Echo "# This directory was configured as follows:" >config.new
+Echo "{ThisScript} --host {host_alias} --target {target_alias} --srcdir {srcdir}  --srcroot {srcroot}  --prefix {prefix} --cc {host_cc} {verifystr} {enable_options} {disable_options} --norecursion" >>config.new
+MoveIfChange config.new config.status
+
+If "`Exists "{srcdir}"mpw-config.in`" != ""
+	tr-7to8 "{srcdir}"mpw-config.in >"{objdir}"mpw-config.in
+	Execute "{objdir}"mpw-config.in
+End If
+
+# Start Makefile construction by defining all the variables chosen by
+# configuration.
+
+Echo "# This Makefile produced by mpw-configure.  Changes may get lost!" > "{objdir}"Makefile.tem
+Echo "srcroot = " {srcroot}			>> "{objdir}"Makefile.tem
+Echo "topsrcdir = " {srcroot}			>> "{objdir}"Makefile.tem
+Echo "srcdir = " {srcdir}			>> "{objdir}"Makefile.tem
+Echo "mpw_prefix = " {prefix}			>> "{objdir}"Makefile.tem
+Echo "mpw_exec_prefix = " {exec_prefix}		>> "{objdir}"Makefile.tem
+Echo "mpw_bindir = " {bindir}			>> "{objdir}"Makefile.tem
+Echo "host_alias = " {host_alias}		>> "{objdir}"Makefile.tem
+Echo "target_alias = " {target_alias}		>> "{objdir}"Makefile.tem
+Echo "target_cpu = " {target_cpu}		>> "{objdir}"Makefile.tem
+Echo "target_vendor = " {target_vendor}		>> "{objdir}"Makefile.tem
+Echo "target_os = " {target_os}			>> "{objdir}"Makefile.tem
+Echo "target_canonical = " {target_canonical}	>> "{objdir}"Makefile.tem
+Echo "host_makefile_frag = "			>> "{objdir}"Makefile.tem
+Echo "target_makefile_frag = "			>> "{objdir}"Makefile.tem
+Echo "CC = " {cc_name}				>> "{objdir}"Makefile.tem
+Echo "AR = " {ar_name}				>> "{objdir}"Makefile.tem
+Echo "RANLIB = " {ranlib_name}			>> "{objdir}"Makefile.tem
+Echo "CC_LD = " {cc_ld_name}			>> "{objdir}"Makefile.tem
+Echo "PROG_EXT = " {prog_ext_name}		>> "{objdir}"Makefile.tem
+Echo "EXTRALIBS = " {extralibs_name}		>> "{objdir}"Makefile.tem
+Echo "MAKEPEF = " {makepef_name}		>> "{objdir}"Makefile.tem
+Echo "REZ = " {rez_name}			>> "{objdir}"Makefile.tem
+
+If {host_cc} =~ /gccppc/
+	Echo -n "dq =\Option-d\Option-d\Option-d" > "{objdir}"Makefile.tem0
+	Echo '"' 				 >> "{objdir}"Makefile.tem0
+	tr-7to8  "{objdir}"Makefile.tem0	>>"{objdir}"Makefile.tem
+Else
+	Echo -n "dq ='" 			>> "{objdir}"Makefile.tem
+	Echo -n '"' 				>> "{objdir}"Makefile.tem
+	Echo    "'" 				>> "{objdir}"Makefile.tem
+End If
+
+# Append the master set of definitions for the various compilers.
+
+If "`Exists "{srcdir}"config:mpw-mh-mpw`" != ""
+	tr-7to8 "{srcdir}"config:mpw-mh-mpw >>"{objdir}"Makefile.tem
+Else If "`Exists "{srcroot}"config:mpw-mh-mpw`" != ""
+	tr-7to8 "{srcroot}"config:mpw-mh-mpw >>"{objdir}"Makefile.tem
+Else
+	Echo "can't find a host config file!"
+	Exit 0
+End If
+
+# Append anything produced by the directory's mpw-config.in.
+
+If "`Exists "{objdir}"mk.tmp`" != ""
+	Catenate "{objdir}"mk.tmp >>"{objdir}"Makefile.tem
+	# An mpw-config.in might change so as not to create this
+	# anymore, so get rid of it now to be safe.
+	Delete -i -y "{objdir}"mk.tmp
+End If
+
+# If there are sed scripts to edit the Unix Makefile.in, use them; otherwise
+# use an mpw-make.in if present.
+
+If "`Exists "{srcdir}"mpw-make.sed`" != ""
+	If "`Exists "{objdir}"hacked_Makefile.in`" != ""
+		Set MakefileIn "{objdir}"hacked_Makefile.in
+	Else
+		Set MakefileIn "{srcdir}"Makefile.in
+	End If
+	# Find the generic makefile editing script.
+	If "`Exists "{srcroot}"config:mpw:g-mpw-make.sed`" != ""
+		sed -f "{srcroot}"config:mpw:g-mpw-make.sed "{MakefileIn}" >"{objdir}"Makefile.tem1
+	Else If "`Exists "{srcroot}"utils:mpw:g-mpw-make.sed`" != ""
+		sed -f "{srcroot}"utils:mpw:g-mpw-make.sed "{MakefileIn}" >"{objdir}"Makefile.tem1
+	Else If "`Exists "{srcdir}"g-mpw-make.sed`" != ""
+		sed -f "{srcdir}"g-mpw-make.sed "{MakefileIn}" >"{objdir}"Makefile.tem1
+	Else
+		Echo Warning: g-mpw-make.sed not found, copying "{MakefileIn}" verbatim...
+		Catenate "{MakefileIn}" >"{objdir}"Makefile.tem1
+	End If
+	sed -f "{srcdir}"mpw-make.sed "{objdir}"Makefile.tem1 >"{objdir}"Makefile.tem2
+	sed -e 's/^prefix = .*$/prefix = {mpw_prefix}/g' -e 's/^exec_prefix = .*$/exec_prefix = {mpw_exec_prefix}/g' -e 's/^bindir = @bindir@/bindir = {mpw_bindir}/g' "{objdir}"Makefile.tem2 >"{objdir}"Makefile.tem3
+	sed -e "s/@DASH_C_FLAG@/{dash_c_flag}/" -e "s/@SEGMENT_FLAG(\([^)]*\))@/{segment_flag}\1/" "{objdir}"Makefile.tem3 >"{objdir}"mpw-make.in
+	tr-7to8 "{objdir}"mpw-make.in >>"{objdir}"Makefile.tem
+	If "`Exists "{objdir}"mk.sed`" != ""
+		sed -f "{objdir}"mk.sed "{objdir}"Makefile.tem >"{objdir}"Makefile.tem2
+		Rename -y "{objdir}"Makefile.tem2 "{objdir}"Makefile.tem
+	End If
+	MoveIfChange "{objdir}"Makefile.tem "{objdir}"Makefile
+	Delete -i -y "{objdir}"Makefile.tem[12]
+	If {verify} == 1
+		Echo Created Makefile in "`Directory`"
+	End If
+Else If "`Exists "{srcdir}"mpw-make.in`" != ""
+	sed -e 's/^prefix = .*$/prefix = {mpw_prefix}/g' "{srcdir}"mpw-make.in >"{objdir}"Makefile.tem1
+	sed -e "s/@DASH_C_FLAG@/{dash_c_flag}/" -e "s/@SEGMENT_FLAG(\([^)]*\))@/{segment_flag}}\1/" "{objdir}"Makefile.tem1 >"{objdir}"Makefile.tem2
+	tr-7to8 "{objdir}"Makefile.tem2 >>"{objdir}"Makefile.tem
+	If "`Exists "{objdir}"mk.sed`" != ""
+		sed -f "{objdir}"mk.sed "{objdir}"Makefile.tem >"{objdir}"Makefile.tem2
+		Rename -y "{objdir}"Makefile.tem2 "{objdir}"Makefile.tem
+	End If
+	MoveIfChange "{objdir}"Makefile.tem "{objdir}"Makefile
+	Delete -i -y "{objdir}"Makefile.tem[12]
+	If {verify} == 1
+		Echo Created Makefile in "`Directory`"
+	End If
+End If
+
+# Produce a build script if the source is defined.
+
+If "`Exists "{srcdir}"mpw-build.in`" != ""
+	Echo "Set srcroot " {srcroot} > "{objdir}"mpw-build.tem
+	Echo "Set srcdir " {srcdir} >> "{objdir}"mpw-build.tem
+	Echo "Set target_canonical " {target_canonical} >> "{objdir}"mpw-build.tem
+	Echo "Set prefix " {prefix} >> "{objdir}"mpw-build.tem
+	tr-7to8 "{srcdir}"mpw-build.in >>"{objdir}"mpw-build.tem
+	MoveIfChange "{objdir}"mpw-build.tem "{objdir}"mpw-build
+	If {verify} == 1
+		Echo Created mpw-build in "`Directory`"
+	End If
+End If
+
+# Apply ourselves recursively to the list of subdirectories to configure.
+
+If {recurse} == 1
+	For subdir In {configdirs}
+		Set savedir "`Directory`"
+		If "`Exists "{srcdir}{subdir}:"`" == ""
+			If {verify} == 1
+				Echo No "{srcdir}{subdir}:" found, skipping
+			End If
+			Continue
+		End If
+		If {verify} == 1
+			Echo Configuring {subdir}...
+		End If
+		If "`Exists "{objdir}{subdir}:"`" == ""
+			NewFolder "{objdir}{subdir}"
+		End If
+		SetDirectory "{objdir}{subdir}:"
+		"{ThisScript}" --target "{target_canonical}" --srcdir "{srcdir}{subdir}:" --srcroot "{srcroot}" --prefix "{prefix}" --cc "{host_cc}" {verifystr} {enable_options} {disable_options}
+		SetDirectory "{savedir}"
+	End For
+End If
+
+SetDirectory "{savedir}"
diff --git a/mpw-install b/mpw-install
new file mode 100644
index 0000000..04c5aac
--- /dev/null
+++ b/mpw-install
@@ -0,0 +1,122 @@
+# GNU Install script for MPW.
+
+Set OldExit "{Exit}"
+Set Exit 0
+
+Set TempUserStartup "{TempFolder}"__temp__UserStartup
+
+Echo '# UserStartup generated by GNU Install script' > "{TempUserStartup}"
+Echo ''						>> "{TempUserStartup}"
+
+# (should) Check that disk space is sufficient for installation.
+
+# Assume that the install script is where everything else is.
+
+Set thisdir "`Directory`"
+
+# Copy the binaries to the desired place.
+
+Confirm -t "Copy the binaries to somewhere else?"
+Set TmpStatus {Status}
+If {TmpStatus} == 0
+	Set bindest "`GetFileName -d -m "Where to install the binaries?"`"
+	If {Status} == 0
+		If "`Exists "{thisdir}bin"`" != ""
+			For afile In "{thisdir}"bin:\Option-x
+				Duplicate -y "{afile}" "{bindest}"
+			End For
+		Else
+			Echo "bin directory not found, exiting"
+			Exit 1
+		End If
+	Else
+		Echo "No destination supplied, exiting"
+		Exit 1
+	End If
+Else If {TmpStatus} == 4
+	# Use the existing directory.
+	Set bindest "{thisdir}bin:"
+Else
+	# Cancelled from confirmation, escape altogether.
+	Exit 1
+End If
+
+# Copy the libraries to the desired place.
+
+Confirm -t "Copy the libraries to somewhere else?"
+Set TmpStatus {Status}
+If {TmpStatus} == 0
+	Set libdest "`GetFileName -d -m "Where to install the libraries?"`"
+	If {Status} == 0
+		If "`Exists "{thisdir}lib:"`" != ""
+			For afile In "{thisdir}"lib:\Option-x
+				Duplicate -y "{afile}" "{libdest}"
+			End For
+		Else
+			Echo "lib directory not found, exiting"
+			Exit 1
+		End If
+	Else
+		Echo "No destination supplied, exiting"
+		Exit 1
+	End If
+Else If {TmpStatus} == 4
+	# Use the existing directory.
+	Set libdest "{thisdir}lib:"
+Else
+	# Cancelled from confirmation, escape altogether.
+	Exit 1
+End If
+
+
+# Add the location of the binaries to the command path.
+
+Echo -n 'Set Commands "'			>> "{TempUserStartup}"
+Echo -n "{bindest}"				>> "{TempUserStartup}"
+Echo    ',{Commands}"'				>> "{TempUserStartup}"
+Echo ''						>> "{TempUserStartup}"
+
+# Set up GCC exec prefix.
+
+Set gcclibdir "{libdest}"gcc-lib:
+
+Echo -n 'Set GCC_EXEC_PREFIX "'			>> "{TempUserStartup}"
+Echo -n "{gcclibdir}"				>> "{TempUserStartup}"
+Echo    '"'					>> "{TempUserStartup}"
+Echo "Export GCC_EXEC_PREFIX"			>> "{TempUserStartup}"
+Echo ''						>> "{TempUserStartup}"
+
+# Set up path to libgcc.xcoff etc.
+
+Echo -n 'Set GCCPPCLibraries "'			>> "{TempUserStartup}"
+Echo -n "{libdest}"				>> "{TempUserStartup}"
+Echo    '"'					>> "{TempUserStartup}"
+Echo "Export GCCPPCLibraries"			>> "{TempUserStartup}"
+Echo ''						>> "{TempUserStartup}"
+
+# Display contents of UserStartup, confirm installation.
+
+Set UserStartupName "UserStartup\Option-8GNU"
+
+Echo "Contents of" {UserStartupName} "will be:"
+Catenate "{TempUserStartup}"
+
+Confirm "Install {UserStartupName} into the MPW folder {MPW} ?"
+If {Status} == 0
+	Duplicate "{TempUserStartup}" "{MPW}{UserStartupName}"
+	Delete -y "{TempUserStartup}"
+Else
+	Echo "{UserStartupName} file not installed"
+End If
+
+# (should) Check HEXA resource, warn if low.
+
+# (should) Check for spaces in pathnames, warn if found.
+
+Echo "Installation was successful."
+Echo ""
+Echo "Be sure to review the usage notes in 'Read Me for MPW' before proceeding!"
+
+# Restore previous settings.
+
+Set Exit "{OldExit}"
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 506d2cc..9f63fbe 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,7329 +1,3 @@
-2006-03-29  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/sys/linux/include/netinet/ip.h: Include netinet/in_systm.h
-	for the declaration of n_long.
-
-2006-03-29  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/sys/linux/include/net/if.h: Include sys/socket.h for
-	struct sockaddr.
-	(IFF_SMART): Replace this define with IFF_NOTRAILERS.
-	(IFF_CANTCHANGE): Replace IFF_SMART reference with IFF_NOTRAILERS.
-	(IFF_NOTRAILERS): New define.
-	(struct ifreq): Add ifru_netmask.
-	(ifr_netmask): New define.
-
-2006-03-29  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/sys/linux/sys/ioccom.h (ioctl): Change declaration to
-	match sys/ioctl.h.
-
-2006-03-29  Shaun Jackman  <sjackman@gmail.com>
-
-	* libtool.m4: Set lt_cv_deplibs_check_method=pass_all for 
-	linux-newlib libc implementations.
-
-2006-03-29  Eric Blake  <ebb9@byu.net>
-
-	* libc/stdio/freopen.c (_freopen_r) [__SCLE]: Fix typo.
-	* libc/stdio64/freopen64.c (_freopen64_r) [__SCLE]: Likewise.
-
-2006-03-29  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/io.c (__mknod): Fix declaration of
-	syscall to pass a dev_t as third argument rather than
-	a pointer to dev_t.
-
-2006-03-29  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/net/name6.c: Fix struct references.
-
-2006-03-22  Mark Mitchell  <mark@codesourcery.com>
-
-	* configure.host: Allow hosts to set the default
-	newlib_atexit_dynamic_alloc value.
-	* configure.in: Likewise.
-	* configure: Regenerated.
-
-2006-03-20  Mark Mitchell  <mark@codesourcery.com>
-
-	* acconfig.h (_ATEXIT_DYNAMIC_ALLOC): Undef.
-	* configure.in (--disable-newlib-atexit-dynamic-alloc): New
-	option. 
-	* configure: Regenerated.
-	* newlib.hin: Regenerated.
-	* libc/stdlib/__atexit.c (__register_exitproc): Don't call malloc
-	if _ATEXIT_DYNAMIC_ALLOC is undefined.
-	* libc/stdlib/__call_atexit.c (__call_exitprocs): Don't call free
-	if _ATEXIT_DYNAMIC_ALLOC is undefined.
-
-2006-03-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/linuxthreads/config.h: Remove definition
-	of UINT32_C.
-
-2006-03-15  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/wsetup.c (__swsetup): Don't make a buffer
-	for a string I/O file that isn't using the asprintf family.
-
-2006-03-07  Eric Blake  <ebb9@byu.net>
-
-	* libc/stdio/freopen.c (_freopen_r) [HAVE_FCNTL]: For NULL
-	filename, allow read-only or write-only FILE atop O_RDWR file
-	descriptor.
-	* libc/stdio64/freopen64.c (_freopen64_r) [HAVE_FCNTL]: Likewise.
-
-2006-03-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libm/common/sf_isinf.c[_DOUBLE_IS_32BITS]: Undef isinf.
-	* libm/common/sf_isnan.c[_DOUBLE_IS_32BITS]: Undef isnan.
-
-2006-03-02  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libm/math/math.tex: Fix reference to sisnan.def which
-	is now in common subdirectory.
-	* libm/mathfp/mathfp.tex: Ditto.
-
-2006-02-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* Makefile.am (MATHOBJS_IN_LIBC): Add s_isinfd, sf_isinff, 
-	s_isnand, and sf_isnanf object files.
-	* Makefile.in: Regenerated.
-	* libc/include/ieeefp.h: Undef isnan and isinf to avoid
-	conflict if <math.h> has previously been included.
-	* libc/include/math.h
-	* libc/include/math.h: Make isnan and isinf macros to
-	conform to C99.
-	(__isinfd, __isinff, __isnand, __isnanf): New functions.
-	* libm/common/Makefile.am: Add new s_isinfd, s_isnand, sf_isinff,
-	and sf_isnanf files.  Also support s_isnan, sf_isnan, s_isinf, and
-	sf_isinf files which have been moved from math/mathfp directories. 
-	* libm/common/Makefile.in: Regenerated.
-	* libm/common/s_isinfd.c: New file.
-	* libm/common/s_isnand.c: Ditto.
-	* libm/common/sf_isinff.c: Ditto.
-	* libm/common/sf_isnanf.c: Ditto.
-	* libm/common/s_isinf.c: Moved from libm/math directory.
-	* libm/common/s_isnan.c: Ditto.
-	* libm/common/sf_isinf.c: Ditto.
-	* libm/common/sf_isnan.c: Ditto.
-	* libm/math/Makefile.am: Remove isinf and isnan family functions
-	which have been moved into common directory.
-	* libm/mathfp/Makefile.am: Ditto.
-	* libm/math/Makefile.in: Regenerated.
-	* libm/mathfp/Makefile.in: Ditto.
-	* libm/math/s_isinf.c: Removed.
-	* libm/math/s_isnan.c: Ditto.
-	* libm/math/sf_isinf.c: Ditto.
-	* libm/math/sf_isnan.c: Ditto.
-	* libm/mathfp/s_isinf.c: Ditto.
-	* libm/mathfp/s_isnan.c: Ditto.
-	* libm/mathfp/sf_isinf.c: Ditto.
-	* libm/mathfp/sf_isnan.c: Ditto.
-
-2006-02-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/fflush.c (fflush): For an fflush on a read-only
-	stream, turn off fseek/rewind optimization as per POSIX/SUSv3.
-	* libc/stdio/fseek.c (_fseek_r): After a successful unoptimized
-	seek, turn off the __SNPT no-optimization flag.
-
-2006-02-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/aio.c: Define _GNU_SOURCE so struct aioinit
-	will be defined.
-	* libc/sys/linux/sys/types.h: Move <sys/config.h> ahead of
-	<features.h> to preset special flags.
-
-2006-02-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/time.h (struct timeval): Change member types
-	according to SUSv3.
-	* libc/include/sys/types.h (useconds_t): Change to unsigned
-	according to SUSv3.
-	(suseconds_t): Define type.
-
-2006-02-13  Jeff Johnston  <jjohnstn@redhat.com>
-	    David Carne  <davidcarne@gmail.com>
-
-	* libc/string/strndup_r.c (_strndup_r): Use strnlen logic
-	instead of strlen to determine number of bytes to copy.
-	* libc/string/strnlen.c (strnlen): Fix so check for max limit occurs
-	before looking at storage location.
-
-2006-02-07  Paul Brook  <paul@codesourcery.com>
-
-	* libc/machine/arm/setjmp.S: Add Thumb-2 support.
-	* libc/sys/arm/crt0.S: Add Thumb-2 startup code.
-	* libc/sys/arm/libcfunc.c (do_AngelSWI): Use AngelSWIInsn.
-	* libc/sys/arm/swi.h (AngelSWIInsn, AngelSWIAsm): Define.
-	* libc/sys/arm/trap.S: Disable for Thumb-2.
-
-2006-01-31  Leif Ekblad  <leif@rdos.net>
-
-	* configure.host: RDOS support added
-	* libc/include/sys/config.h: Ditto.
-	* libc/sys/rdos/Makefile.am, libc/sys/rdos/Makefile.in: New files.
-	* libc/sys/rdos/aclocal.m4, libc/sys/rdos/chown.c: Ditto.
-	* libc/sys/rdos/close.c, libc/sys/rdos/config.h: Ditto.
-	* libc/sys/rdos/configure, libc/sys/rdos/configure.in: Ditto.
-	* libc/sys/rdos/crt0.S, libc/sys/rdos/execve.c: Ditto.
-	* libc/sys/rdos/fork.c, libc/sys/rdos/fstat.c: Ditto.
-	* libc/sys/rdos/getenv.c, libc/sys/rdos/getpid.c: Ditto.
-	* libc/sys/rdos/gettod.c, libc/sys/rdos/isatty.c: Ditto.
-	* libc/sys/rdos/kill.c, libc/sys/rdos/link.c: Ditto.
-	* libc/sys/rdos/lseek.c, libc/sys/rdos/open.c: Ditto.
-	* libc/sys/rdos/rdos.S, libc/sys/rdos/rdos.h: Ditto.
-	* libc/sys/rdos/rdoshelp.c, libc/sys/rdos/read.c: Ditto.
-	* libc/sys/rdos/readlink.c, libc/sys/rdos/sbrk.c: Ditto.
-	* libc/sys/rdos/stat.c, libc/sys/rdos/symlink.c: Ditto.
-	* libc/sys/rdos/times.c, libc/sys/rdos/unlink.c: Ditto.
-	* libc/sys/rdos/user.def, libc/sys/rdos/wait.c: Ditto.
-	* libc/sys/rdos/write.c: Ditto.
-
-2006-01-24  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* acinclude.m4: Add nodefine to AM_INIT_AUTOMAKE macro invocation
-	so as not to define PACKAGE and VERSION in newlib.h.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* newlib.hin: Ditto.
-
-2006-01-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* acconfig.h: New file to generate newlib.hin from.
-	* newlib.hin: Regenerated.
-	* stamp-h.in: Regenerated.
-	* Makefile.am: Add ACLOCAL_AMFLAGS so aclocal can be
-	called automatically.
-	* Makefile.in: Regenerated.
-	* acinclude.m4: Add proper comment for hack in previous change.
-	* aclocal.m4 */aclocal.m4: Regenerated.
-	* configure */configure: Regenerated.
-
-2006-01-11  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* acinclude.m4: Add hack to prevent INSTALL in subdirs
-	from being set to "../".
-	* Makefile.am: Pass INSTALL in AM_MAKEFLAGS.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* Makefile.in: Ditto.
-	* doc/aclocal.m4: Ditto.
-	* doc/configure: Ditto.
-	* iconvdata/aclocal.m4: Ditto.
-	* iconvdata/configure: Ditto.
-	* libc/*/aclocal.m4: Ditto.
-	* libc/*/configure: Ditto.
-	* libc/libc.texinfo: Ditto.
-	* libm/*/aclocal.m4: Ditto.
-	* libm/*/configure: Ditto.
-
-2006-01-10  Eric Blake  <ebb9@byu.net>
-
-	* libc/stdio/freopen.c (_freopen_r): Fix use of oflags.
-	* libc/stdio64/freopen64.c (_freopen64_r): Likewise.
-
-2006-01-10  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libm/mathfp/s_frexp.c: Check for special values on
-	the original input, not the manipulated output value.
-	* libm/mathfp/sf_frexp.c: Ditto.
-	* libm/mathfp/s_atangent.c: Don't use local value branch
-	when checking for quadrant.
-	* libm/mathfp/sf_atangent.c: Ditto.
-
-2006-01-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/freopen.c: Switch to use isatty instead of _isatty.
-	* libc/stdio64/freopen64.c: Ditto.
-
-2006-01-09  Eric Blake  <ebb9@byu.net>
-
-	* libc/stdio/freopen.c (_freopen_r): Accept NULL filename.
-	* libc/stdio64/freopen64.c (_freopen64_r): Likewise.
-
-2006-01-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/include/getopt.h: Add macros needed by
-	new version of getopt.c in libc/stdlib.
-
-2006-01-04  Gregory Pietsch  <gpietsch@comcast.net>
-
-	* libc/stdlib/getopt.c: Replaced with version
-	that adds getopt_long and getopt_long_only support.
-	* libc/include/getopt.h: New file.
-
-2005-12-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* NEWS: Update with 1.14.0 info.
-	* README: Ditto.
-	* acinclude.m4: Change version number to 1.14.0.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* doc/aclocal.m4: Ditto.
-	* doc/configure: Ditto.
-	* libc/*/aclocal.m4: Ditto.
-	* libc/*/configure: Ditto.
-	* libc/libc.texinfo: Ditto.
-	* libm/*/aclocal.m4: Ditto.
-	* libm/*/configure: Ditto.
-	* libm/libm.texinfo: Ditto.
-	* libc/sys/linux/shared.ld: Add VERS_1.14.
-
-2005-12-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/sys/stat.h: Change *stat64 prototypes to
-	take a pointer to struct stat64 rather than struct stat.
-
-2005-12-16  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/include/stdint.h: Prefer long over int for int32_t.
-	Use __have_long32 to set up int32_t.
-	* libc/include/inttypes.h: Use "#if xxx" instead of "#ifdef xxx"
-	(Sync with stdint.h).
-
-2005-12-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/fcntl.h: Define O_SYNC unconditionally.  Fix
-	typo in O_NDELAY comment.
-
-2005-12-13  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* libc/include/machine/ieeefp.h (__mt__): Renamed from __ms1__.
-	* libc/include/machine/setjmp.h (__mt__): Likewise.
-	* libc/machine/mt/setjmp.S: Rename ms1 reference to mt.
-	* libc/machine/configure.in: Ditto.
-
-2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* configure.host: Replace ms1 arch with mt arch.
-	* libc/machine/mt: Renamed from ms1 dir.
-
-2005-12-08  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/include/sys/types.h: Remove the ifdef armour around
-	standard POSIX types.
-
-2005-12-06  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/sys/rtems/crt0.c: Add rtems_gxx_key_create,
-	rtems_gxx_key_delete, rtems_gxx_getspecific,
-	rtems_gxx_setspecific, rtems_gxx_mutex_trylock, 
-	rtems_gxx_recursive_mutex_init, rtems_gxx_recursive_mutex_lock, 
-	rtems_gxx_recursive_mutex_trylock, rtems_gxx_recursive_mutex_unlock.
-
-2005-12-05  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/include/stdlib.h: Move cygwin declarations to cygwin-specific
-	file.  Declare unsetenv and _unsetenv_r when not cygwin.
-
-2005-11-18  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/time/strptime.c (strptime): Don't abort for %c and %Z.
-	Treat %c as "%a %b %e %H:%M:%S %Y" and ignore %Z.
-
-2005-11-18  Christopher Faylor  <cgf@timesys.com>
-
-	* include/sys/time.h: Move more cygwin stuff to cygwin-specific header.
-
-2005-11-18  Christopher Faylor  <cgf@timesys.com>
-
-	* include/time.h: Remove more cygwin-specific stuff.
-
-2005-11-18  Christopher Faylor  <cgf@timesys.com>
-
-	* include/time.h: Move cygwin declarations to cygwin-specific header.
-	* include/sys/time.h: Rename cygwin include to "sys_time.h".
-
-2005-11-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/dl/dl-local.h: New file based on old dlfcn.h
-	in libc/sys/linux/include.
-	* libc/sys/linux/dl/dlfcn.h: Moved to libc/sys/linux/include.
-	* libc/sys/linux/dl/ldsodefs.h: Include dl-local.h instead of dlfcn.h.
-	* libc/sys/linux/include/dlfcn.h: Replaced with dlfcn.h formerly
-	in libc/sys/linux/dl.
-
-2005-11-11  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/include/sys/time.h: For cygwin, use general header rather than
-	specific "sys/select.h".
-
-2005-11-08  Tom Walsh  <tom@openhardware.net>
-
-	* libc/time/tzvars.c: New file.
-	* libc/time/tzset_r.c: Moved globals into tzvars.c
-	so other time functions needn't link in __tzset_r and its
-	dependencies.
-	* libc/time/Makefile.am: Add the new file.
-	* libc/time/Makefile.in: Regenerated.
-
-2005-11-08  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/include/string.h: Add cygwin-specific function declaration.
-
-2005-11-07  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/ieeefp.h: Add C++ guards.
-
-2005-11-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/unix/getcwd.c: Don't use non-reentrant syscall names.
-	* libc/unix/getlogin.c: Ditto.
-	* libc/unix/getpass.c: Ditto.
-	* libc/unix/getut.c: Ditto.
-	* libc/unix/ttyname.c: Ditto.
-
-2005-11-03  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/include/sys/unistd.h (readlink, symlink): Provide these
-	prototypes by default.
-	* libc/sys/linux/include/unistd.h (readlink): Remove this
-	prototype.
-	* libc/sys/linux/sys/unistd.h (readlink, symlink): New
-	prototypes.
-
-2005-11-01  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/include/stdint.h: Cleanup #if vs. #ifdef.
-
-2005-10-31  Darin Johnson  <darin@usa.net>
-
-	* libm/mathfp/s_mathcnst.c: Fix endian-ness check to be
-	correct for constants.
-
-2005-10-28  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/stdio/siprintf.c: Wrap long lines in ANSI_SYNOPSIS.
-	* libc/stdio/siscanf.c: Likewise.
-	* libc/stdio/sprintf.c: Likewise.
-	* libc/stdio/sscanf.c: Likewise.
-	* libc/stdio/vfprintf.c: Likewise.
-	* libc/stdio/vfscanf.c: Likewise.
-	* libc/stdio/viprintf.c: Likewise.
-	* libc/stdio/viscanf.c: Likewise.
-
-2005-10-28  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/sys.tex (Stubs): Format examples consistently.   Change sbrk
-	example to use "_end" symbol instead of "end".  Change write  example
-	to use "outbyte" instead of "writechar".
-
-2005-10-28  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/ctype/ctype.tex: Use hyphens as appropriate, but not  otherwise.
-	* libc/ctype/islower.c: Likewise.
-	* libc/ctype/isupper.c: Likewise.
-	* libc/ctype/iswalnum.c: Likewise.
-	* libc/ctype/iswalpha.c: Likewise.
-	* libc/ctype/iswblank.c: Likewise.
-	* libc/ctype/iswcntrl.c: Likewise.
-	* libc/ctype/iswdigit.c: Likewise.
-	* libc/ctype/iswgraph.c: Likewise.
-	* libc/ctype/iswlower.c: Likewise.
-	* libc/ctype/iswprint.c: Likewise.
-	* libc/ctype/iswpunct.c: Likewise.
-	* libc/ctype/iswspace.c: Likewise.
-	* libc/ctype/iswupper.c: Likewise.
-	* libc/ctype/iswxdigit.c: Likewise.
-	* libc/ctype/tolower.c: Likewise.
-	* libc/ctype/toupper.c: Likewise.
-	* libc/ctype/towctrans.c: Likewise.
-	* libc/ctype/towlower.c: Likewise.
-	* libc/ctype/towupper.c: Likewise.
-	* libc/string/strcasecmp.c: Likewise.
-	* libc/string/strcoll.c: Likewise.
-	* libc/string/strings.tex: Likewise.
-	* libc/string/strlwr.c: Likewise.
-	* libc/string/strncasecmp.c: Likewise.
-	* libc/string/strupr.c: Likewise.
-	* libc/string/wcscoll.c: Likewise.
-	* libc/string/wcslcat.c: Likewise.
-	* libc/string/wcslcpy.c: Likewise.
-	* libc/string/wcsnlen.c: Likewise.
-	* libc/string/wcsstr.c: Likewise.
-	* libc/string/wcstrings.tex: Likewise.
-	* libc/string/wmemchr.c: Likewise.
-	* libc/string/wmemcmp.c: Likewise.
-	* libc/string/wmemcpy.c: Likewise.
-	* libc/string/wmemmove.c: Likewise.
-	* libc/string/wmemset.c: Likewise. 
-
-2005-10-28  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/misc/unctrl.c: Replace FUNCTION description.
-	* libc/signal/signal.c: Remove documentation for raise and  _raise_r.
-	* libc/stdio/getdelim.c: Fix spelling errors.
-	* libc/stdio/getw.c: Put RETURNS on a separate line.  Fix  punctuation.
-	* libc/stdio/putw.c: Likewise.
-	* libc/stdlib/a64l.c: Fix formatting, spelling and  punctuation in
-        documentation.
-	* libc/stdlib/assert.c: Do not capitalize FUNCTION description.
-	* libc/stdlib/efgcvt.c: Add spaces to FUNCTION description.
-	* libc/stdlib/envlock.c: Use em-dash in FUNCTION description.
-	* libc/stdlib/mlock.c: Likewise.
-	* libc/stdlib/mstats.c: Likewise.
-	* libc/time/tzlock.c: Likewise.
-	* libc/stdlib/rand.c: Use "multi-threaded" and "thread-safe"  in NOTES.
-	* libc/stdlib/rand48.c: Remove extra space in FUNCTION  description
-        and hyphenate "pseudo-random".
-	* libc/string/bcmp.c: Remove extra blank lines in  documentation.
-	* libc/string/strncat.c: Likewise.
-	* libc/string/memchr.c: Remove extra ">" character in  documentation.
-	* libc/string/strcspn.c: Use "characters" instead of "chars".
-	* libc/string/strpbrk.c: Likewise.
-	* libc/string/strerror_r.c: Capitalize "GNU".
-	* libc/string/strnlen.c: Likewise.
-	* libc/string/strtok.c: Fix formatting, spelling and  punctuation in
-        documentation.  Use "multi-threaded" and "thread-safe" in  NOTES.
-	* libc/string/wcscat.c: Split PORTABILITY into two paragraphs.
-	* libc/string/wcschr.c: Likewise.
-	* libc/string/wcscmp.c: Likewise.
-	* libc/string/wcscpy.c: Likewise.
-	* libc/string/wcscspn.c: Likewise.
-	* libc/string/wcslen.c: Likewise.
-	* libc/string/wcsncat.c: Likewise.
-	* libc/string/wcsncmp.c: Likewise.
-	* libc/string/wcsncpy.c: Likewise.
-	* libc/string/wcsnlen.c: Likewise.
-	* libc/string/wcspbrk.c: Likewise.
-	* libc/string/wcsrchr.c: Likewise.
-	* libc/string/wcsspn.c: Likewise.
-	* libc/string/wmemchr.c: Likewise.
-	* libc/string/wmemcmp.c: Likewise.
-	* libc/string/wmemcpy.c: Likewise.
-	* libc/string/wmemset.c: Likewise.
-	* libc/string/wmemmove.c: Likewise.  Also fix FUNCTION  description.
-	* libc/string/wcswidth.c: Formatting and punctuation in  documentation.
-	* libc/string/wcwidth.c: Likewise.
-	* libm/common/s_modf.c: Remove extra period from documentation.
-	* libm/math/s_isnan.c: Fix formatting, grammar and  punctuation in
-        documentation.
-	* libm/mathfp/s_isnan.c: Likewise.
-	* libm/math/s_ldexp.c: Fix punctuation.
-	* libm/mathfp/s_ldexp.c: Likewise.
-	* libm/math/w_log.c: Likewise.
-	* libm/mathfp/s_logarithm.c: Likewise.
-	* libm/math/w_j0.c: Add spaces to FUNCTION description.
-	* libm/mathfp/w_jn.c: Likewise. 
-
-2005-10-26  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/posix/scandir.c (scandir): Update the function
-	prototype to match the header.
-	* libc/sys/linux/linuxthreads/bits/libc-lock.h: Remove an
-	extraneous #endif.
-	* libc/sys/linux/sys/lock.h: Do not include
-	machine/weakalias.h, since it's not used by this file.
-
-2005-10-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/Makefile.am: Reorder SUBLIBS so machine and sys
-	directories can override properly.
-
-2005-10-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/math.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): When
-	gcc is 3.3 or greater, use special gcc builtins.
-
-2005-10-20  Corinna Vinschen <corinna@vinschen.de>
-
-	* libc/include/sys/time.h: Declare futimes and lutimes for Cygwin.
-
-2005-10-18  Corinna Vinschen <corinna@vinschen.de>
-
-	* libc/include/sys/features.h: Define _POSIX_MEMLOCK_RANGE for Cygwin.
-
-2005-10-14  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/math.h (HUGE_VALF, HUGE_VALL): New.
-	* libm/common/Makefile.am: Add s_infconst.c support.
-	* libm/common/Makefile.in: Regenerated.
-	* libm/common/s_infconst.c: New file with float and
-	long double infinity support added.
-	* libm/math/Makefile.am: Remove s_infconst.c support.
-	* libm/math/Makefile.in: Regenerated.
-	* libm/math/s_infconst.c: Moved to common directory.
-	* libm/mathfp/Makefile.am: Remove s_infconst.c support.
-	* libm/mathfp/Makefile.in: Regenerated.
-	* libm/mathfp/s_infconst.c: Moved to common directory.
-
-2005-10-14  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/net/gethostbydns.c (dprintf): Rename to
-	dbgprintf to prevent conflict with new dprintf function.
-
-2005-10-14  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/vfprintf.c (_VFPRINTF_R): Fix up "inf" and
-	"nan" processing for systems that have long double support.
-
-2005-10-14  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/sys/types.h (int8_t): Add type.
-
-2005-10-14  Bob Wilson  <bob.wilson@acm.org>
-
-        * libm/common/Makefile.am (doc): Do not append to $(TARGETDOC).
-        * libm/common/Makefile.in: Regenerate.
-        * libm/common/common.tex: Delete file.
-        * libm/math/math.tex: Include .def files from common/.
-        * libm/mathfp/mathfp.tex: Likewise.
-
-2005-10-14  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/libc.texinfo (Top): Surround this node with @ifnottex
-	instead of @ifinfo.  Update menu to add Introduction and match
-	SUBDIRS order.
-        (Introduction): New section.
-
-2005-10-14  Bob Wilson  <bob.wilson@acm.org>
-
-        * libc/reent/reent.tex (Reentrancy): Replace "Cygnus C Library"
-        with "Red Hat newlib C Library".
-        * libc/sys.tex (Stubs): Likewise.
-        * libm/math/math.tex (Math): Likewise.
-        * libm/mathfp/mathfp.tex (Math): Likewise.
-
-2005-10-11  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/include/stdio.h (dprintf): New declaration.
-	(vdprintf): Ditto.
-	* libc/stdio/Makefile.am (GENERAL_SOURCES): Add dprintf.c
-	and vdprintf.c.
-	* libc/stdio/Makefile.in: Regenerate.
-	* libc/stdio/dprintf.c: New file.
-	* libc/stdio/vdprintf.c: New file.
-	* libc/stdio/stdio.tex (dprintf): New entry.
-
-2005-10-11  David Weatherford  <weath@tensilica.com>
-
-	* libc/stdio/vfprintf.c (_VFPRINTF_R): Recognize 'F' format.
-	Print "inf" and "nan" in lowercase for e/f/g formats and in 
-	uppercase for E/F/G formats.
-
-2005-10-07  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/stdlib/mallocr.c (mALLOc, rEALLOCc, mEMALIGn): Set errno
-	to ENOMEM on failure.
-
-2005-10-06  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/include/stdint.h: Add [u]int_fast<N>_t types.
-
-2005-10-04  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/include/stdint.h: Move magic to set __have_long* to the
-	beginning.  Use #if __have* instead of #if defined(__have*).
-	Minor typo fixes.
-
-2005-10-04  James E Wilson  <wilson@specifix.com>
-
-	* libc/include/sys/dirent.h (_DIRENT_H_): Delete #include_next.  Add
-	#error.
-
-2005-10-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/include/stdint.h: Include <sys/types.h> and
-	incorporate Ralf's change below.
-
-2005-10-03  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/include/stdint.h: 
-	Use __INTMAX_TYPE__ to derive intmax_t.
-	Use __UINTMAX_TYPE__ to derive uintmax_t.
-	Fix minor typo.
-
-2005-09-27  Ralf Corsepius <ralf.corsepius@rtems.org>
-
-	* libc/include/stdint.h: Correct __STDINT_EXP macro incorrectly 
-	handling GCC >= 4.
-
-2005-09-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/include/stdint.h: Update to match functionality
-	of generic newlib stdint.h.
-
-2005-09-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdint.h (__EXP): Rename to __STDINT_EXP
-	and do not #undef the macro after it is used.  Fix typos.
-	Also change 64-bit constants to use the __have_long64 and
-	__have_longlong64 flags to determine if long or long long
-	constants should be used.
-	* libc/include/inttypes.h: Include stddef.h to get wchar_t
-	type defined.
-
-2005-09-20  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/include/stdint.h: Fix typo in names of
-	LEAST macros.
-
-2005-09-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/rtems/include/inttypes.h: Moved to...
-	* libc/include/inttypes.h: ...here.
-
-2005-09-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/rtems/include/stdint.h: Moved to...
-	* libc/include/stdint.h: ...here.
-
-2005-09-08  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* Makefile.am: Add include files under bits sub-directory.
-	* Makefile.in: Regenerated.
-	* libc/sys/linux/argp/argp-fs-xinl.c: Set __OPTIMIZE__ to
-	actual value of 1 to be compatible with newer glibc headers.
-	* libc/sys/linux/sys/cdefs.h: Fix to be compatible with newer
-	glibc headers.
-	* libc/sys/linux/sys/dirent.h: Ditto.
-	* libc/sys/linux/argp/argp-xinl.c: Ditto.
-	* libc/sys/linux/dl/dl-runtime.c: Make sure fixup and
-	profile_fixup routines are marked used so they won't be
-	optimized away.
-	* libc/sys/linux/dl/dl-cache.c: Don't use weak_extern macro
-	to mark functions as weak.
-	* libc/sys/linux/dl/dl-open.c: Ditto.
-	* libc/sys/linux/iconv/gconv_open.c: Fix to obey new gcc4
-	rules about lvalues.
-	* libc/sys/linux/iconv/gconv_simple.c: Ditto.
-	* libc/sys/linux/linuxthreads/bits/libc-lock.h: Don't use
-	weak_extern macro to mark functions as weak.  Instead always
-	use #pragma weak.
-	* iconvdata/jis0208.h: Fix to work with gcc4.
-	* libc/sys/linux/dl/dl-load.c: Ditto.
-	* libc/sys/linux/dl/dl-reloc.c: Ditto.
-	* libc/sys/linux/dl/do-rel.h: Ditto.
-	* libc/sys/linux/dl/dynamic-link.h: Ditto.
-	* libc/sys/linux/include/ltdl.h: Ditto.
-	* libc/sys/linux/machine/i386/dl-machine.h: Ditto.
-	* libc/sys/linux/machine/i386/weakalias.h: Ditto.
-	* libc/sys/linux/net/ns_ntoa.c: Ditto.
-	* libc/sys/linux/bits/initspin.h: New file.
-	* libc/sys/linux/bits/libc-lock.h: Ditto.
-	* libc/sys/linux/bits/pthreadtypes.h: Ditto.
-	* libc/sys/linux/bits/typesizes.h: Ditto.
-
-2005-09-08  Eric Blake  <ebb9@byu.net>
-
-	* libc/argz/argz_insert.c (argz_insert): Don't die with EINVAL when
-	before is NULL.
-
-2005-09-08  Brian Dessent  <brian@dessent.net>
-
-	* sf_lrint.c (lrintf): Mask 'i0' correctly when extracting
-	mantissa.
-	* s_lrint.c: Ditto.
-
-2005-09-02  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdio.h: Add prototype for viprintf.
-
-2005-09-01  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libm/mathfp/s_pow.c: (pow): Change code so 0 raised to
-	any positive power results in 0.
-	* libm/mathfp/sf_pow.c (powf): Ditto.
-
-2005-08-31  Paul Brook  <paul@codesourcery.com>
-
-	* configure.host: Set have_crt0 to no for Arm targts when not
-	providing syscalls.  Set sys_dir=arm unconditionally.
-	Default have_crt0 based on sys_dir.
-	* configure.in: Use have_crt0.
-	* libc/configure.in: Ditto.
-	* libc/sys/configure.in: Ditto.
-	* configure: Regenerate.
-	* libc/configure: Regenerate.
-	* libc/sys/configure: Regenerate.
-	* libc/sys/arm/Makefile.am (lib_a_SOURCES): Add aeabi_atexit.c.
-	Only build other files when providing syscalls.
-	* libc/sys/arm/Makefile.in: Regenerate.
-	* libc/sys/arm/aeabi_atexit.c: New file.
-
-2005-08-26  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/include/string.h: Revert previous change.
-
-2005-08-25  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/include/string.h: For Cygwin, Define strerror_r as per ISO C.
-
-2005-08-22  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/include/_syslist.h: If HAVE_OPENDIR is not defined,
-	define _opendir as opendir, _readdir as readdir, and
-	_closedir as closedir so that the implementations in
-	libc/posix will be used.
-
-2005-08-10  DJ Delorie  <dj@redhat.com>
-
-	* MAINTAINERS (CPU Ports): Add CPU port maintainer section.
-
-2005-08-10  Stephen Huw Clarke  <stephen.clarke@st.com>
-
-	* libm/common/sf_fmax.c: Fix to properly handle NaNs.
-	* libm/common/s_max.c: Ditto.
-	* libm/common/sf_fmin.c: Ditto.
-	* libm/common/s_min.c: Ditto.
-
-2005-08-10  DJ Delorie  <dj@redhat.com>
-
-	* configure.host: Add m32c support.
-	* libc/include/machine/ieeefp.h: Likewise.
-	* libc/include/machine/setjmp.h: Likewise.
-	* libc/include/sys/config.h: Likewise.
-	* libc/machine/m32c: New directory, Renesas R8C/M16C/M32C support.
-	* libc/machine/m32c/aclocal.m4: New file.
-	* libc/machine/m32c/configure: Ditto.
-	* libc/machine/m32c/configure.in: Ditto.
-	* libc/machine/m32c/Makefile.am: Ditto.
-	* libc/machine/m32c/Makefile.in: Ditto.
-	* libc/machine/m32c/setjmp.S: Ditto.
-
-2005-08-02  Bob Wilson  <bob.wilson@acm.org>
-
-        * libm/math/ef_hypot.c (__ieee754_hypotf): Add missing exponent bias
-        to the value for 2^126.
-
-2005-07-26  Hans-Peter Nilsson  <hp@bitrange.com>
-
-	* libc/machine/cris/libcdtor.c (defaultors): Mark artificially as
-	used.
-
-2005-07-20  Bob Wilson  <bob.wilson@acm.org>
-           Darin Petkov <darin@tensilica.com>
-
-       * libm/math/ef_atan2.c (pi, pi_lo): Use round-to-nearest value of pi.
-
-2005-07-19  Paul Brook  <paul@codesourcery.com>
-
-	* libc/sys/arm/crt0.S: Ensure doubleword stack alignment.
-
-2005-07-18  Joseph S. Myers  <joseph@codesourcery.com>
-
-	* testsuite/lib/checkoutput.exp (newlib_check_output): Use test
-	names after PASS and FAIL which do not depend on source directory
-	name or on whether test passed or failed.
-	* testsuite/lib/passfail.exp (newlib_pass_fail): Likewise.
-
-2005-07-08  Ola Hugosson   <Ola.Hugosson@anoto.com>
-
-	* libc/string/wcsspn.c (wcsspn): Add missing increment of q.
-
-2005-07-07  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/unix/ttyname.c (ttyname): Avoid calling _closedir
-	twice for the same directory. _closedir calls free, and freeing
-	the same pointer twice may cause a crash.
-
-2005-07-06  Aldy Hernandez  <aldyh@redhat.com>
-
-        * configure.host: Added entry for ms1*.
-        * libc/include/machine/ieeefp.h: Handle ms1.
-        * libc/include/machine/setjmp.h (_JBLEN): Define for ms1.
-        * libc/machine/ms1/aclocal.m4: New.
-        * libc/machine/ms1/configure: New.
-        * libc/machine/ms1/configure.in: New.
-        * libc/machine/ms1/Makefile.am: New.
-        * libc/machine/ms1/Makefile.in: New.
-        * libc/machine/ms1/setjmp.S: New.
-
-2005-07-04  Mark Mitchell  <mark@codesourcery.com>
-
-	* Makefile.am (site.exp): Set tmpdir.
-	* Makefile.in: Regenerated.
-	* testsuite/lib/checkoutput.exp (newlib_check_output): Put
-	executables in $tmpdir.
-	* testsuite/lib/flags.exp (libgloss_link_flags): Use the original
-	libgloss version if not running in the build directory.
-	* testsuite/lib/newlib.exp (newlib_init): Put testglue.o in
-	$tmpdir.
-	* testsuite/lib/passfail.exp (newlib_pass_fail): Put executables
-	in $tmpdir.
-
-2005-06-28  Dave Korn  <dave.korn@artimi.com>
-
-	* libm/common/s_lrint.c (lrint):  Fix signed-vs-unsigned comparison
-	and miscalculation caused by fp representation of zero.
-	* libm/common/sf_lrint.c (lrintf):  Likewise.
-
-2005-06-16  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/stdio/vfprintf.c (cvt): Don't rely on pointer aliasing to
-	determine characteristics of long double.  Use a union instead.
-	* ldtoa.c (_ldtoa_r): Ditto.
-	(_ldcheck): Ditto.
-	(_strtold): Ditto.
-	(union uconv): New union.
-
-2005-06-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdlib/mallocr.c (MALLOC_COPY): Switch to use memmove
-	instead of memcpy.
-
-2005-05-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host (mn10300-*): Add long long I/O support by default.
-
-2005-05-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/getpwuid.c: Removed.
-	* libc/sys/linux/getpwnam.c: Removed.
-	* libc/sys/linux/getpwent.c: New file containing logic
-	from files removed above.  This allows overriding of file
-	in libc/unix.
-	* libc/sys/linux/Makefile.am: Support changes above.
-	* libc/sys/linux/Makefile.in: Regenerated.
-
-2005-04-28  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/vfscanf.c (__svfscanf_r): Fix code thinko
-	when checking for multiple flags.
-
-2005-04-18  Hans-Peter Nilsson  <hp@axis.com>
-
-	* configure.host <cris-*-* | crisv32-*-*>: Set
-        default_newlib_io_long_long="yes".
-
-2005-04-08  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/libgen.h: New file.
-
-2005-04-08  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/unix/Makefile.am: Add support for basename and dirname.
-	* libc/unix/Makefile.in: Regenerated.
-	* libc/unix/basename.c: New file.
-	* libc/unix/dirname.c: New file.
-
-2005-04-07  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/sys/linux/inode.c (lchown): New function.
-
-2005-04-07  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/unix/Makefile.am (LIB_OBJS): Include all the ELIX objects if no
-	ELIX level is defined.
-	* libc/unix/Makefile.in: Regenerated.
-
-2005-04-05  Dave Korn  <dave.korn@artimi.com>
-
-	* libc/stdio/vfscanf.c (__svfscanf_r): If an error occurs processing
-	something that looks like a "NaN", put back the characters processed.
-
-2005-04-01  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/stdlib/strtod.c (_strtod_r): Never change s00.
-
-2005-03-23  Christopher Faylor  <cgf@timesys.com>
-
-	* configure.host: For cygwin, redefine CC with cygwin include directory
-	first to mimic the behavior of the top-level configury.  Move include
-	directory out of newlib_cflags.
-
-2005-03-22  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: For arc, set -DREENTRANT_SYSCALLS_PROVIDED flag on.
-	* libc/sys/arc/syscalls.c: Change functions to use __errno_r rather 
-	than errno.
-
-2005-03-22  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/include/machine/_types.h: Make trivial change to comment to
-	avoid a spurious warning from gcc.
-
-2005-03-21  Nicholas Wourms  <nwourms@netscape.net>
-
-	* libc/stdio/vfprintf.c: Move newlib.h before _WANT_IO_POS_ARGS test,
-	since _WANT_IO_POS_ARGS is now defined in there.  Remove duplicate
-	reent.h include.
-
-2005-03-18  Hans-Peter Nilsson  <hp@axis.com>
-            Corinna Vinschen  <corinna@vinschen.de>
-
-        * libc/include/ctype.h: Remove invalid +1 offset from
-        ctype macro references to __ctype_ptr.
-        (_ctype_): Move declaration outside #ifndef __cplusplus.
-
-2005-03-18  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/machine/setjmp.h (sigsetjmp): Use GCC extension to
-	evaluate first parameter only once.
-	(siglongjmp): Ditto.
-
-2005-03-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.in: Add new check to see if compiler supports
-	aliasing of arrays and define _HAVE_ARRAY_ALIASING if true.
-	* configure: Regenerated.
-	* Makefile.in: Ditto.
-	* newlib.hin: Add _HAVE_ARRAY_ALIASING.
-	* libc/ctype/ctype_.c: Check for _HAVE_ARRAY_ALIASING before
-	aliasing the _ctype_ array to _ctype_b.
-	* libc/include/ctype.h: Change macros to use __ctype_ptr.  Mark
-	_ctype_ as deprecated.
-
-2005-03-17  Hans-Peter Nilsson  <hp@axis.com>
-
-	* configure.host (newlib_cflags) <cris-*-*, crisv32-*-*>: Add
-	-DCOMPACT_CTYPE.
-
-2005-03-06  Ralf Corsepious  <ralf.corsepius@rtems.org>
-
-	* libc/sys/rtems/include/inttypes.h: New file.
-	* libc/sys/rtems/include/stdint.h: Ditto.
-
-2005-03-06  Ralf Corsepious  <ralf.corsepius@rtems.org>
-
-	* libc/string/memcmp.c: Fix to avoid pointer signedness warning.
-
-2005-03-06  Ralf Corsepious  <ralf.corsepius@rtems.org>
-
-	* libc/include/machine/_types.h: New file.
-	* libc/include/sys/types.h: Do not check for __rtems__
-	when including <machine/_types.h>.  Remove some redundant
-	declarations now that <machine/_types.h> is included.
-	* libc/sys/rtems/machine/_types.h: Removed.  Replaced with
-	shared header file.
-
-2005-02-25  Ralf Corsepious  <ralf.corsepius@rtems.org>
-
-	* libm/common/fdlibm.h (FLT_UWORD_MAX, FLT_UWORD_HALF_MAX): Add
-	L qualifier for these long constants.
-
-2005-02-25  Eric Blake  <ebb9@byu.net>
-
-	* libc/include/time.h (__tzrule_struct): Make offset long, since
-	a 16-bit int overflows on a 12-hour offset.
-	* libc/sys/linux/include/time.h: Ditto.
-	* libc/time/mktime.c (mktime): Use new type of __tzrule.offset.
-	* libc/time/mktm_r.c: Ditto.
-	* libc/time/gettzinfo.c: Ditto.
-	* libc/time/strftime.c (strftime): Fix '%x' to deal with negative
-	years.  Fix '%z' to use long, not int.
-
-2005-02-24  Ralf Corsepious  <ralf.corsepius@rtems.org>
-
-	* libm/common/s_fpclassify.c: Use __uint32_t instead of int to
-	manipulate float values in integer form.
-	* libm/common/sf_round.c: Ditto.
-
-2005-02-24  Ralf Corsepious  <ralf.corsepius@rtems.org>
-
-	* libc/include/sys/types.h [__rtems__]: Include new
-	header file machine/_types.h.
-	* libc/include/machine/types.h: Ditto.
-	* libc/sys/rtems/machine/_types.h: New file.
-
-2005-02-23  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/time.h (_timezone): Change to long also for Cygwin.
-	(timezone): Drop cast from definition.
-
-2005-02-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/time.h [!CYGWIN](_timezone): Change to long.
-	(__tzrule_type, __tzinfo_type): New types.
-	(__gettzinfo): New function.
-	* libc/sys/linux/include/time.h: Ditto.
-	* libc/time/Makefile.am: Add gettzinfo.c.
-	* libc/time/Makefile.in: Regenerated.
-	* libc/time/local.h: Moved __tzrule_type to time.h.
-	* libc/time/mktime.c: Call __gettzinfo to reference
-	__tznorth, __tzyear, and __tzrule array.
-	* libc/time/mktm_r.c: Ditto.
-	* libc/time/strftime.c: Ditto.
-	* libc/time/tzset_r.c: Ditto.  Also remove definition
-	of __tzrule which is now in gettzinfo.c.  Change _timezone
-	references to not cast to time_t.
-	* libc/time/gettzinfo.c: New file.
-
-2005-02-23  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/unistd.h: Define getpeereid for Cygwin.
-
-2005-02-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/unistd.h: Define fdatasync also for Cygwin.
-
-2005-02-16  Eric Blake  <ebb9@byu.net>
-
-	* libc/time/time.tex: Improve the documentation.
-	* libc/time/strftime.c: Improve the documentation.
-	(iso_year_adjust): New helper function.
-	(strftime): Simplify '%E' and '%O'. Change '%c' to use
-	recursion. Fix '%C', '%y', and '%Y' to deal with years with more
-	than 4 characters.  Combine '%d' and '%e'. Implement '%D', '%F',
-	'%g', '%G', '%n', '%R', '%t', '%T', '%u', '%V', '%X', and '%z'.
-	Avoid core dumps on valid inputs (maxsize == 0, or
-	tim_p->tm_isdst > 1).
-
-2005-02-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/pwd.h (struct passwd): Change pw_uid and pw_gid
-	members to uid_t and gid_t according to SUSv3.
-	* libc/include/sys/time.h (utimes):  Change second parameter
-	to const according to SUSv3.
-
-2005-02-07  Antony King  <antony.king@st.com>
-
-	* libc/stdio/clearerr.c (clearerr): Ensure CHECK_INIT() is
-	called before _flockfile to prevent lock object use before
-	initialisation. _REENT_SMALL_CHECK_INIT() and CHECK_INIT()
-	take a struct _reent * instead of a FILE *.
-	* libc/stdio/fclose.c (_fclose_r): Ditto.
-	* libc/stdio/feof.c (feof): Ditto.
-	* libc/stdio/ferror.c (ferror): Ditto.
-	* libc/stdio/fflush.c (fflush): Ditto.
-	* libc/stdio/fgetc.c (fgetc): Ditto.
-	* libc/stdio/fgets.c (fgets): Ditto.
-	* libc/stdio/fileno.c (fileno): Ditto.
-	* libc/stdio/fputc.c (fputc): Ditto.
-	* libc/stdio/fputs.c (fputs): Ditto.
-	* libc/stdio/fread.c (fread): Ditto.
-	* libc/stdio/freopen.c (_freopen_r): Ditto.
-	* libc/stdio/fseek.c (_fseek_r): Ditto.
-	* libc/stdio/ftell.c (_ftell_r): Ditto.
-	* libc/stdio/fwrite.c (fwrite): Ditto.
-	* libc/stdio/getc.c (getc): Ditto.
-	* libc/stdio/getdelim.c (__getdelim): Ditto.
-	* libc/stdio/putc.c (putc): Ditto.
-	* libc/stdio/setvbuf.c (setvbuf): Ditto.
-	* libc/stdio/ungetc.c (_ungetc_r): Ditto.
-	* libc/stdio/vfprintf.c (_VFPRINTF_R): Ditto.
-	* libc/stdio64/freopen64.c (_freopen64_r): Ditto.
-	* libc/stdio64/fseeko64.c (_fseeko64_r): Ditto.
-	* libc/stdio64/ftello64.c (_ftello64_r): Ditto.
-	* libc/stdio/local.h (CHECK_INIT): Argument is now a struct
-	_reent * instead of a FILE * and so replace incorrect use of
-	_REENT with argument.
-	* libc/sys/arm/syscalls.c (CHECK_INIT): Ditto.
-	* libc/stdio/getchar.c (getchar): _REENT_SMALL_CHECK_INIT() and
-	CHECK_INIT() take a struct _reent * instead of a FILE *.
-	* libc/stdio/iprintf.c (iprintf, _iprintf_r): Ditto.
-	* libc/stdio/iscanf.c (iscanf, _iscanf_r): Ditto.
-	* libc/stdio/perror.c (perror): Ditto.
-	* libc/stdio/printf.c (printf, _printf_r): Ditto.
-	* libc/stdio/putchar.c (putchar): Ditto.
-	* libc/stdio/puts.c (puts): Ditto.
-	* libc/stdio/refill.c (__srefill): Ditto.
-	* libc/stdio/scanf.c (scanf, _scanf_r): Ditto.
-	* libc/stdio/vfscanf.c (VFSCANF, _VFSCANF_R): Ditto.
-	* libc/stdio/viprintf.c (viprintf, _viprintf_r): Ditto.
-	* libc/stdio/viscanf.c (viscanf, _viscanf_r): Ditto.
-	* libc/stdio/vprintf.c (vprintf, _vprintf_r): Ditto.
-	* libc/stdio/vscanf.c (vscanf, _vscanf_r): Ditto.
-	* libc/stdio/wbuf.c (__swbuf): Ditto.
-	* libc/stdio/wsetup.c (__swsetup): Ditto.
-	* libc/stdlib/mallocr.c (malloc_stats): Ditto.
-	* libc/stdlib/mstats.c (_mstats_r): Ditto.
-	* libc/include/sys/reent.h (_REENT_SMALL_CHECK_INIT): Ditto.
-	* libc/machine/powerpc/vfscanf.c (vfscanf): Ditto.
-	* libc/stdio/fgetpos.c (_fgetpos_r): Removed unnecessary calls
-	to _flockfile and _funlockfile; rely on locking in _ftell_r.
-	* libc/stdio64/fgetpos64.c (_fgetpos64_r): Ditto (_ftello64_r).
-	* libc/machine/powerpc/vfprintf.c (__sbprintf): Removed unnecessary
-	initialision of _data field in FILE structure.
-	* libc/machine/powerpc/vfprintf.c (VFPRINTF): Added CHECK_INIT() call.
-
-2005-02-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/findfp.c (__sinit): Protect with new lock.
-	(__sinit_lock): New lock.
-	(__sinit_lock_acquire, __sinit_lock_release): New functions.
-	* libc/stdio/local.h: Add reference to new __sinit locking
-	functions.
-
-2005-02-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/math.h (isfinite, isnormal, isunordered): Change
-	input variable names to avoid mixups with nesting macros.
-
-2005-01-27  Hans-Peter Nilsson  <hp@axis.com>
-
-	* configure.host: Add support for cris-*-* and crisv32-*-*.
-	* libc/include/machine/ieeefp.h: Ditto.
-	* libc/include/machine/setjmp.h: Ditto.
-	* libc/machine/cris/configure.in, libc/machine/cris/Makefile.am,
-	libc/machine/cris/libcdtor.c, libc/machine/cris/setjmp.c,
-	libc/machine/cris/memmove.c, libc/machine/cris/memcpy.c,
-	libc/machine/cris/memset.c, libc/machine/cris/include/pthread.h,
-	libc/machine/cris/sys/signal.h, libc/machine/cris/sys/fcntl.h,
-	libc/machine/cris/sys/errno.h, libc/machine/cris/aclocal.m4,
-	libc/machine/cris/configure, libc/machine/cris/Makefile.in: New
-	files.
-
-2005-01-27  Hans-Peter Nilsson  <hp@axis.com>
-
-	* testsuite/newlib.string/memmove1.c: New test.
-
-2005-01-27  Hans-Peter Nilsson  <hp@axis.com>
-
-	* testsuite/include/check.h: Include stdlib.h.
-
-2005-01-27  Hans-Peter Nilsson  <hp@axis.com>
-
-	* Makefile.am (stmp-targ-include): Support include header files
-	from machine directories.
-	(install-data-local): Ditto.
-	* Makefile.in: Regenerate.
-
-2005-01-24  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/string.h: Remove Linux-specific declaration of
-	strsignal and add #include <sys/string.h>.
-	* libc/include/sys/string.h: New file.
-	* libc/include/sys/linux/sys/string.h: New file with strsignal
-	declaration deleted above.
-
-2005-01-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/time/strftime.c (strftime): Change %r and %x to be compliant
-	to POSIX standard for "C" locale.  Allow %E and %O modifiers
-	to be ignored as long as they precede valid specifiers according
-	to POSIX.
-
-2005-01-19  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/stdlib/setenv_r.c (_setenv_r): Call tzset() if the TZ
-	environment variable is set.
-
-2005-01-19  Shaun Jackman  <sjackman@gmail.com>
-
-        * tzset_r.c (_tzname): Add a comma.
-
-2005-01-18  Aldy Hernandez  <aldyh@redhat.com>
-
-	* libc/machine/powerpc/vfprintf.c: Use _REENT when calling
-	_VFPRINTF_R.
-
-2005-01-07  Paul Brook  <paul@codesourcery.com>
-                                                                                
-	* configure.in: Add test for .init_array.
-	* configure: Regenerate.
-	* newlib.hin: Add HAVE_INITFINI_ARRAY.
-	* libc/misc/Makefile.am: Add init.c
-	* libc/misc/Makefile.in: Regenerate.
-	* libc/misc/init.c: New file.
-	* libc/sys/arm/crt0.S: Call __libc_{init,fini}_array instead of
-	_init/_fini if they exist.
-                                                                                
-2005-01-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdlib/strtod.c (_strtod_r): Add NaN support.
-	* (strtof): Ditto.
-	* libc/stdio/vfscanf.c (__svfscanf_r): Ditto.
-	* Makefile.am (MATHOBJS_IN_LIBC): Add s_nan and sf_nan
-	functions for use by strtod and strtof.
-	* Makefile.in: Regenerated.
-                                                                                
-2005-01-06  Hans-Peter Nilsson  <hp@axis.com>
-                                                                                
-	* libc/stdio/ftell.c (ftell_r): Add parenthesis for __SWR
-	bit-test in combination with NULL test.
-                                                                                
-2005-01-06  Hans-Peter Nilsson  <hp@axis.com>
-                                                                                
-        * README: Fix typo of LGPL.  Change "license" to "copyright".
-                                                                                
-2004-12-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* NEWS: Update with 1.13.0 info.
-	* README: Ditto.
-	* acinclude.m4: Change version number to 1.13.0.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* doc/aclocal.m4: Ditto.
-	* doc/configure: Ditto.
-	* libc/*/aclocal.m4: Ditto.
-	* libc/*/configure: Ditto.
-	* libc/libc.texinfo: Ditto.
-	* libm/*/aclocal.m4: Ditto.
-	* libm/*/configure: Ditto.
-	* libm/libm.texinfo: Ditto.
-	* libc/sys/linux/shared.ld: Add VERS_1.13.
-
-2004-12-17  Christian Groessler  <chris@groessler.org>
-
-	* libc/machine/z8k/memcmp.S: New file.
-	* libc/machine/z8k/memcpy.S: Ditto.
-	* libc/machine/z8k/memmove.S: Ditto.
-	* libc/machine/z8k/memset.S: Ditto.
-	* libc/machine/z8k/Makefile.am: Add new files.
-	* libc/machine/z8k/Makefile.in: Regenerated.
-	* libc/machine/z8k/setjmp.S: Fix indirect register usage in Z8002
-	part.  Implement Z8002 stdcall version.
-
-2004-12-13  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/fread.c (fread): For unbuffered I/O, attempt
-	a low-level read if we don't get the full amount of bytes so
-	EOF or error flags will be set.
-
-2004-12-09  Alex Mogilnikov  <alx@intellectronika.ru>
-
-	* libc/time/tzset_r (_tzset_r): Properly skip over
-	'/' when it is detected.
-
-2004-12-08  Alex Mogilnikov  <alx@intellectronika.ru>
-
-	* libc/time/tzset_r (_tzset_r): Fix loop.
-
-2004-12-08  Alex Mogilnikov  <alx@intellectronika.ru>
-
-	* libc/time/mktm_r (_mktm_r): Fix overflow calculation for
-	m_day.
-	(__tzcalc_limits): Fix reference to month array to be zero-based.
-
-2004-12-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/sys/unistd.h: Add prototypes for ftruncate, truncate,
-	and usleep.
-
-2004-12-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* Makefile.am (libc_la_LDFLAGS): Add -lgcc to handle any
-	libgcc dependencies.
-	(libm_la_LDFLAGS): Ditto.
-	* Makefile.in: Regenerated.
-
-2004-12-03  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/sys/linux/linuxthreads/Makefile.am (install-data-local): Fix
-	our link to use readlink so as to preserve any relative link created
-	by install-toollibLIBRARIES.
-	* libc/sys/linux/linuxthreads/Makefile.in: Regenerated.
-
-2004-12-02  Shaun Jackman  <sjackman@gmail.com>
-
-	* libc/sys/linux/stdlib/glob.c: Include <sys/types.h> which defines
-	time_t before including sys/stat.h, which uses it.
-	* libc/sys/linux/sys/stat.h: Include <sys/types.h> and
-	<linux/time.h> just prior to definition of __KERNEL__ so as to
-	allow building on Debian Linux where otherwise, mktime would
-	be redefined.
-
-2004-11-26  Paul Brook  <paul@codesourcery.com>
-
-	* libc/sys/arm/crt0.S (_start): Add .cantunwind annotation.
-                                                                                
-2004-11-24  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdlib.h (putenv, _putenv_r): Change to remove
-	const for value string parameter to match Single Unix and glibc.
-	* libc/stdlib/putenv.c: Ditto.
-	* libc/stdlib/putenv_r.c: Ditto.
-
-2004-11-24  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/Makefile.am: Fix missing vfscanf.
-	* libc/stdio/Makefile.in: Regenerated.
-                                                                                
-2004-11-23  Jeff Johnston  <jjohnstn@redhat.com>
-                                                                                
-	* libc/include/stdio.h: Add new iprintf and iscanf variants.  Also
-	do some reordering.
-	* libc/machine/powerpc/vfscanf.c: Remove __sccl function.
-	* libc/stdio/Makefile.am: Add support for new iprintf and iscanf
-	family functions.
-	* libc/stdio/Makefile.in: Regenerated.
-	* libc/stdio/fiprintf.c: Remove doc to siprintf.c.
-	* libc/stdio/iprintf.c: Ditto.
-	* libc/stdio/local.h (__svfiscanf_r): New prototype.
-	* libc/stdio/siprintf.c: Add docs for various iprintf family functions.
-	* libc/stdio/sniprintf.c: Move docs to siprintf.c.
-	* libc/stdio/stdio.tex: Add new functions.
-	* libc/stdio/vfscanf.c: Split out __sccl function to separate
-	file and add special name defines so this file can be used
-	to build vfiscanf.o.
-	* libc/stdio/asiprintf.c: New file.
-	* libc/stdio/fiscanf.c: Ditto.
-	* libc/stdio/iscanf.c: Ditto.
-	* libc/stdio/sccl.c: Ditto.
-	* libc/stdio/siscanf.c: Ditto.
-	* libc/stdio/vasiprintf.c: Ditto.
-	* libc/stdio/viprintf.c: Ditto.
-	* libc/stdio/viscanf.c: Ditto.
-	* libc/stdio/vsiprintf.c: Ditto.
-	* libc/stdio/vsiscanf.c: Ditto.
-	* libc/stdio/vsniprintf.c: Ditto.
-
-2004-11-19  Shaun Jackman  <sjackman@gmail.com>
-                                                                                
-        * libc/include/stdio.h: Add sniprintf.
-        * libc/stdio/Makefile.am: Add sniprintf.c.
-        * libc/stdio/Makefile.in: Regenerated.
-        * libc/stdio/sniprintf.c: New file.
-        * libc/stdio/stdio.tex: Add sniprintf.
-                                                                                
-2004-11-17  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/stdio/refill.c (__srefill): Try again after EOF on Cygwin.  Clear
-	EOF flag if successful.
-
-2004-10-28  Christopher Faylor  <cgf@timesys.com>
-
-	* libc/include/sys/signal.h: Move <signal.h> include to bottom of file
-	so that all relevant definitions have been performed for use in the
-	include.
-
-2004-10-26  Jason Tishler  <jason@tishler.net>
-
-	* libc/stdio/fread.c (fread): Fix return value for unbuffered
-	fread.
-
-2004-10-25  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
-
-	* libc/include/machine/setjmp.h: Add AVR support.
-	* libc/sys/rtems/crt0.S [__AVR__]: Add __stack.
-
-2004-10-08  Jeff Johnston  <jjohnstn@redhat.com>
-                                                                                
-        * libc/include/sys/signal.h: If <signal.h> didn't include
-        this header file, include <signal.h> to account for
-        applications that take advantage that the two header
-        files are the same in glibc.
-                                                                                
-2004-10-05  Tomer Levi  <Tomer.Levi@nsc.com>
-
-        * configure.host: Add support for crx.
-        * libc/include/machine/ieeefp.h: Ditto.
-        * libc/include/machine/setjmp.h: Ditto.
-        * libc/machine/crx/Makefile.am: New file.
-        * libc/machine/crx/configure.in: Ditto.
-        * libc/machine/crx/setjmp.S: Ditto.
-        * libc/machine/crx/getenv.c: Ditto.
-        * libc/machine/crx/aclocal.m4: Generate.
-        * libc/machine/crx/configure: Ditto.
-        * libc/machine/crx/Makefile.in: Ditto.
-        * libc/machine/crx/sys/asm.h: New file.
-        * libc/machine/crx/sys/libh.h: Ditto.
-        * libc/machine/crx/sys/syscall.h: Ditto.
-
-2004-10-05  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* Makefile.am (stmp-targ-include): Support sys header files
-	from machine directories.
-	* Makefile.in: Regenerated.
-
-2004-10-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/vfscanf.c (__svfscanf_r): For int conversions,
-	count skipped zero characters as part of the nread count for %n.
-	* libc/machine/powerpc/vfscanf.c: Ditto.
-
-2004-09-24  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/local.h: Include <stdlib.h>.
-
-2004-09-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/stdio/fread.c (fread): Include <malloc.h>.
-
-2004-09-22  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/fread.c (fread):  For non-space-optimized case,
-	add special code for unbuffered files to use user buffer and
-	only require one low-level system read.
-
-2004-09-21  Ian Lance Taylor  <ian@wasabisystems.com>
-
-	* libc/machine/xscale/setjmp.S: New file, copied from
-	libc/machine/arm/setjmp.S.
-	* libc/machine/xscale/Makefile.am (lib_a_SOURCES): Add setjmp.S.
-	* libc/machine/xscale/Makefile.in: Regenerate.
-
-2004-09-16  Antony King  <antony.king@st.com>
-
-	* libc/include/sys/lock.h: Replaced empty {} with (0) to conform
-	with locking API.
-	* libc/include/sys/stdio.h: (_flockfile)[!_SINGLE_THREAD]: Add 
-	check for__SSTR in _flags and if set, skip lock request.
-	(_funlockfile)[!SINGLE_THREAD]: Ditto.
-	* libc/stdio/local.h (CHECK_INIT): Added check that _REENT is
-	not NULL.
-	* libc/stdio/siprintf.c (siprintf, _siprintf_r): Added missing
-	initialisation of _file to -1 in local FILE.
-	* libc/stdio/snprintf.c (snprintf, _snprintf_r): Ditto.
-	* libc/stdio/sscanf.c (sscanf, _sscanf_r): Ditto.
-	* libc/stdio/vsnprintf.c (vsnprintf, _vsnprintf_r): Ditto.
-	* libc/stdio/vsscanf.c (_vsscanf_r): Ditto.
-	* libc/stdio/sscanf.c (sscanf, _sscanf_r): Added __SSTR flag to
-	_flags in local FILE to prevent locking.
-	* libc/stdio/vsscanf.c (_vsscanf_r): Ditto.
-
-2004-09-16  Antony King  <antony.king@st.com>
-
-	* libc/stdio/fwalk.c (_fwalk): Remove check for _GLOBAL_REENT
-	and only walk the reentrancy parameter.
-	(_fwalk_reent): Ditto.
-	* libc/stdlib/exit.c: Remove out of date _REENT_ONLY check.
-
-2004-09-16  Antony King  <antony.king@st.com>
-
-	* libc/stdio64/freopen64.c: Remove casting of fp lock to
-	_LOCK_RECURSIVE_T.
-
-2004-09-16  Antony King  <antony.king@st.com>
-
-	* libc/time/tzlock.c: Add default stubs that use generic
-	locking code.
-
-2004-09-16  Antony King  <antony.king@st.com>
-
-	* libc/ctype/ctype.tex: Added missing documentation.
-	* libc/stdio/stdio.tex Ditto.
-	* libc/stdlib/stdlib.tex Ditto.
-	* libc/string/strings.tex Ditto.
-	* libc/time/time.tex: Ditto.
-	* libc/stdio/setbuffer.c: Removed setlinebuf documentation.
-
-2004-09-15  Corinna Vinschen  <vinschen@redhat.com>
-
-	* libc/reent/impure.c (reent_data): Define as alias to impure_data
-	when building for Cygwin.
-	* libc/include/sys/reent.h (_GLOBAL_REENT): Revert definition to
-	_global_impure_ptr.
-
-2004-09-15  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: Reverting 2004-09-14 change as fix has occurred on
-	Cygwin side.
-	* configure.in: Ditto.
-	* libc/configure.in: Ditto.
-	* libc/sys/configure.in: Ditto.
-	* configure: Ditto.
-	* libc/configure: Ditto.
-	* libc/sys/configure: Ditto.
-	* libc/include/sys/reent.h: Ditto.
-	* libc/stdlib/__atexit.c: Ditto.
-	* libc/stdlib/__call_atexit.c: Ditto.
-	* libc/stdlib/cxa_atexit.c: Ditto.
-	* libc/stdlib/cxa_finalize.c: Ditto.
-	* libc/sys/cygwin/Makefile.am: Removed again.
-	* libc/sys/cygwin/Makefile.in: Ditto.
-	* libc/sys/cygwin/aclocal.m4: Ditto.
-	* libc/sys/cygwin/configure: Ditto.
-	* libc/sys/cygwin/configure.in: Ditto.
-	* libc/sys/cygwin/dummy.c: Ditto.
-	* libc/sys/cygwin/sys/reent.h: Ditto.
-
-2004-09-14  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: Add Cygwin sys directory.
-	* configure.in: Do not set CRT0 for cygwin.
-	* libc/configure.in: Ditto.
-	* libc/sys/configure.in: Ditto.
-	* configure: Regenerated.
-	* libc/configure: Ditto.
-	* libc/sys/configure: Ditto.
-	* libc/include/sys/reent.h: Add __REENT_HAS_CXA_SUPPORT flag.
-	* libc/stdlib/__atexit.c: Keep cxa support protected by new
-	__REENT_HAS_CXA_SUPPORT flag.
-	* libc/stdlib/__call_atexit.c: Ditto.
-	* libc/stdlib/cxa_atexit.c: Ditto.
-	* libc/stdlib/cxa_finalize.c: Ditto.
-	* libc/sys/cygwin/Makefile.am: New file.
-	* libc/sys/cygwin/Makefile.in: Ditto.
-	* libc/sys/cygwin/aclocal.m4: Ditto.
-	* libc/sys/cygwin/configure: Ditto.
-	* libc/sys/cygwin/configure.in: Ditto.
-	* libc/sys/cygwin/dummy.c: Ditto.
-	* libc/sys/cygwin/sys/reent.h: Ditto.  This file is stabilized
-	version of reent.h.
-
-2004-09-13 Artem B. Bityuckiy  <dedekind@oktetlabs.ru>
-
-	* libc/iconv/iconv.tex: Updated with new content.
-	* libc/iconv/lib/iconvnls.c: Reference ICONV_DEFAULT_NLSPATH
-	instead of NLS_DEFAULT_NLSPATH.
-	* libc/iconv/lib/iconvnls.h: Fix typo.
-	* libc/include/sys/iconvnls.h: New file.
-
-2004-09-09  Paul Brook  <paul@codesourcery.com>
-
-	* libc/include/sys/reent.h (struct _on_exit_args): Add _dso_handle
-	and _is_cxa.
-	(struct _atexit): Add _next when _REENT_SMALL.
-	(struct _reent): Add _atexit0 when _REENT_SMALL.
-	(_REENT_INIT_PTR): Adjust.
-	* libc/stdlib/Makefile.am (GENERAL_SOURCES): Add __atexit.c and
-	__call_exit.c.
-	(EXTENDED_SOURCES): Add cxa_atexit.c and cxa_finalize.c.
-	* libc/stdlib/Makefile.in: Regenerate.
-	* libc/stdlib/__atexit.c: New file.
-	* libc/stdlib/__call_atexit.c: New file.
-	* libc/stdlib/atexit.h: Remove old definitions.  Add new.
-	* libc/stdlib/atexit.c (atexit): Use __register_exitproc.
-	* libc/stdlib/cxa_atexit.c: New file.
-	* libc/stdlib/cxa_finalize.c: New file.
-	* libc/stdlib/exit.c (exit): Use __call_exitprocs.
-	* libc/stdlib/on_exit.c (on_exit): Use __register_exitproc.
-	2004-09-09  Jeff Johnston  <jjohnstn@redhat.com>
-	* libc/reent/reent.c [_REENT_SMALL]: Fix reference to
-	_on_exit_args_ptr.
-
-2004-08-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/unistd.h (getpass): Change prototype to use
-	const instead of __const.
-
-2004-08-16  Nathan Sidwell  <nathan@codesourcery.com>
-
-	* libc/stdio/vfscanf.c (_NO_LONGLONG): Move out of FLOATING_POINT
-	#if.
-
-2004-08-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/sys/types.h (u64): New typedef to allow building
-	on linux systems with glibc 2.3.3 installed.
-	* libc/sys/linux/dl/dl-runtime.c: Fix prototypes for fixup and
-	profile_fixup so newlib can build on fc3 system.
- 
-2004-07-30  Alexandre Oliva  <aoliva@redhat.com>
-
-	Introduce SH2a support.
-	2004-03-16  Corinna Vinschen  <vinschen@redhat.com>
-	* libc/include/machine/ieeefp.h: Define _DOUBLE_IS_32BITS for
-	__SH2A_SINGLE_ONLY__, too.
-	* libc/machine/sh/asm.h: Define DELAYED_BRANCHES for __SH2A__, too.
-	2004-02-24  Corinna Vinschen  <vinschen@redhat.com>
-	* libc/sys/sh/crt0.S (start_l): Support sh2a-nofpu.  Fix comments.
-	2004-02-10  DJ Delorie  <dj@redhat.com>
-	* libc/sys/sh/crt0.S (start_l): Support sh2a.
-
-2004-07-29  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/time/strptime.c: Correct full-name of "March" typo.
-
-2004-07-16  Anil Paranjpe  <anilp1@kpitcummins.com>
-
-	* configure.host (h8300*-*-*): Default long long printing support. 
-
-2004-07-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/fvwrite.c (_sfvwrite):  For asprintf family
-	calls, if realloc fails, free up buffer as it is no longer
-	used.
-
-2004-07-07  Artem B. Bityuckiy  <dedekind@oktetlabs.ru>
-
-	* libc/iconv/iconv.tex: Updated to represent recent changes.
-	* libc/iconv/lib/iconv.c: Documentation updated.
-
-2004-07-07  Nick Clifton  <nickc@redhat.com>
-
-	* configure.host (newlib_cflags): Define PREFER_SIZE_OVER_SPEED
-	for xStormy16.
-
-2004-07-06  Chris Demetriou  <cgd@broadcom.com>
-
-	* configure.host (mips*-*-elf*): Default long long printing
-	support.
-
-2004-07-05  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/Makefile.am (libc.dvi): Add target and specify
-	same dependencies as libc.info.
-	* libc/Makefile.in: Regenerated.
-	* libm/Makefile.am (libm.dvi): Add target and specify
-	same dependencies as libm.info.
-	* libm/Makefile.in: Regenerated.
-
-2004-06-29  Artem B. Bityuckiy  <dedekind@oktetlabs.ru>
-
-	* acinclude.m4: Move --enable-newlib-iconv option back here.
-	* configure.in: Remove --enable-newlib-iconv option.  Don't
-	tie iconv support to --enable-newlib-mb.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* doc/aclocal.m4, doc/configure: Ditto.
-	* iconvdata/aclocal.m4, iconvdata/configure: Ditto.
-	* libm/*/aclocal.m4: Ditto.
-	* libm/*/configure: Ditto.
-	* libc/*/aclocal.m4: Ditto.
-	* libc/*/configure: Ditto.
-
-2004-06-25  Artem B. Bityuckiy  <dedekind@oktetlabs.ru>
-
-	* acinclude.m4: Move iconv options into configure.in.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* configure.in: Add iconv options.
-	* newlib.hin: Add new iconv encodings and remove deleted ones.
-	* doc/aclocal.m4: Regenerated.
-	* doc/configure: Ditto.
-	* iconvdata/aclocal.m4: Ditto.
-	* iconvdata/configure: Ditto.
-	* libc/iconv: Design change.  New size-optimized ccs format.
-	* libc/iconv/AUTHORS: Removed.
-	* libc/iconv/COPYING: Ditto.
-	* libc/iconv/README.ORIGINAL: Ditto.
-	* libc/iconv/README.TODO: Ditto.
-	* libc/iconv/charset.aliases: Ditto.
-	* libc/iconv/encoding.aliases: New file.
-	* libc/iconv/Makefile.am: Updated.
-	* libc/iconv/Makefile.in: Regenerated.
-	* libc/iconv/iconv.tex: Updated.
-	* libc/iconv/ccs/Makefile.am: Ditto.
-	* libc/iconv/ccs/Makefile.in: Regenerated.
-	* libc/iconv/ccs/big5.c: Updated.
-	* libc/iconv/ccs/cns11643_plane1.c: Ditto.
-	* libc/iconv/ccs/cns11643_plane14.c: Ditto.
-	* libc/iconv/ccs/cns11643_plane2.c: Ditto.
-	* libc/iconv/ccs/cp775.c: Ditto.
-	* libc/iconv/ccs/cp850.c: Ditto.
-	* libc/iconv/ccs/cp852.c: Ditto.
-	* libc/iconv/ccs/cp855.c: Ditto.
-	* libc/iconv/ccs/cp866.c: Ditto.
-	* libc/iconv/ccs/iso_8859_1.c: Ditto.
-	* libc/iconv/ccs/README.CCS.SOURCES: Removed.
-	* libc/iconv/ccs/gb_2312_80.c: Ditto.
-	* libc/iconv/ccs/iconv_mktbl: Ditto.
-	* libc/iconv/ccs/jis_x0201.c: Ditto.
-	* libc/iconv/ccs/jis_x0208_1983.c: Ditto.
-	* libc/iconv/ccs/shift_jis.c: Ditto.
-	* libc/iconv/ccs/us_ascii.c: Ditto.
-	* libc/iconv/ccs/ccs.h: New file.
-	* libc/iconv/ccs/ccsbi.c: Ditto.
-	* libc/iconv/ccs/ccsbi.h: Ditto.
-	* libc/iconv/ccs/ccsnames.h: Ditto.
-	* libc/iconv/ccs/iso_8859_10.c: Ditto.
-	* libc/iconv/ccs/iso_8859_11.c: Ditto.
-	* libc/iconv/ccs/iso_8859_13.c: Ditto.
-	* libc/iconv/ccs/iso_8859_14.c: Ditto.
-	* libc/iconv/ccs/iso_8859_3.c: Ditto.
-	* libc/iconv/ccs/iso_8859_6.c: Ditto.
-	* libc/iconv/ccs/iso_8859_7.c: Ditto.
-	* libc/iconv/ccs/iso_8859_8.c: Ditto.
-	* libc/iconv/ccs/iso_8859_9.c: Ditto.
-	* libc/iconv/ccs/iso_ir_111.c: Ditto.
-	* libc/iconv/ccs/jis_x0201_1976.c: Ditto.
-	* libc/iconv/ccs/jis_x0208_1990.c: Ditto.
-	* libc/iconv/ccs/koi8_ru.c: Ditto.
-	* libc/iconv/ccs/koi8_uni.c: Ditto.
-	* libc/iconv/ccs/mktbl.pl: Ditto.
-	* libc/iconv/ccs/win_1250.c: Ditto.
-	* libc/iconv/ccs/win_1251.c: Ditto.
-	* libc/iconv/ccs/win_1252.c: Ditto.
-	* libc/iconv/ccs/win_1253.c: Ditto.
-	* libc/iconv/ccs/win_1254.c: Ditto.
-	* libc/iconv/ccs/win_1255.c: Ditto.
-	* libc/iconv/ccs/win_1256.c: Ditto.
-	* libc/iconv/ccs/win_1257.c: Ditto.
-	* libc/iconv/ccs/win_1258.c: Ditto.
-	* libc/iconv/ccs/iso_8859_15.c: Updated.
-	* libc/iconv/ccs/iso_8859_2.c: Ditto.
-	* libc/iconv/ccs/iso_8859_4.c: Ditto.
-	* libc/iconv/ccs/iso_8859_5.c: Ditto.
-	* libc/iconv/ccs/jis_x0212_1990.c: Ditto.
-	* libc/iconv/ccs/koi8_r.c: Ditto.
-	* libc/iconv/ccs/koi8_u.c: Ditto.
-	* libc/iconv/ccs/ksx1001.c: Ditto.
-	* libc/iconv/ccs/binary/gb_2312_80.cct: Removed.
-	* libc/iconv/ccs/binary/jis_x0201.cct: Ditto.
-	* libc/iconv/ccs/binary/shift_jis.cct: Ditto.
-	* libc/iconv/ccs/binary/us_ascii.cct: Ditto.
-	* libc/iconv/ccs/binary/jis_x0208_1983.cct: Ditto.
-	* libc/iconv/ccs/binary/Makefile.am: Updated.
-	* libc/iconv/ccs/binary/Makefile.in: Regenerated.
-	* libc/iconv/ccs/binary/big5.cct: Updated.
-	* libc/iconv/ccs/binary/cns11643_plane1.cct: Ditto.
-	* libc/iconv/ccs/binary/cns11643_plane14.cct: Ditto.
-	* libc/iconv/ccs/binary/cns11643_plane2.cct: Ditto.
-	* libc/iconv/ccs/binary/cp775.cct: Updated.: Ditto.
-	* libc/iconv/ccs/binary/cp850.cct: Ditto.: Ditto.
-	* libc/iconv/ccs/binary/cp852.cct: Ditto.: Ditto.
-	* libc/iconv/ccs/binary/cp855.cct: Ditto.: Ditto.
-	* libc/iconv/ccs/binary/cp866.cct: Ditto.: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_1.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_15.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_4.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_5.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_2.cct: Ditto.
-	* libc/iconv/ccs/binary/jis_x0212_1990.cct: Ditto.
-	* libc/iconv/ccs/binary/koi8_r.cct: Ditto.
-	* libc/iconv/ccs/binary/koi8_u.cct: Ditto.
-	* libc/iconv/ccs/binary/ksx1001.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_10.cct: New file.
-	* libc/iconv/ccs/binary/iso_8859_11.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_13.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_14.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_3.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_6.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_7.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_8.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_9.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_ir_111.cct: Ditto.
-	* libc/iconv/ccs/binary/jis_x0201_1976.cct: Ditto.
-	* libc/iconv/ccs/binary/jis_x0208_1990.cct: Ditto.
-	* libc/iconv/ccs/binary/koi8_ru.cct: Ditto.
-	* libc/iconv/ccs/binary/koi8_uni.cct: Ditto.
-	* libc/iconv/ccs/binary/win_1250.cct: Ditto.
-	* libc/iconv/ccs/binary/win_1251.cct: Ditto.
-	* libc/iconv/ccs/binary/win_1252.cct: Ditto.
-	* libc/iconv/ccs/binary/win_1253.cct: Ditto.
-	* libc/iconv/ccs/binary/win_1254.cct: Ditto.
-	* libc/iconv/ccs/binary/win_1255.cct: Ditto.
-	* libc/iconv/ccs/binary/win_1256.cct: Ditto.
-	* libc/iconv/ccs/binary/win_1257.cct: Ditto.
-	* libc/iconv/ccs/binary/win_1258.cct: Ditto.
-	* libc/iconv/ces/Makefile.am: Updated.
-	* libc/iconv/ces/Makefile.in: Regenerated.
-	* libc/iconv/ces/ucs-2-internal.c: Updated.
-	* libc/iconv/ces/ucs-4-internal.c: Ditto.
-	* libc/iconv/ces/utf-16.c: Ditto.
-	* libc/iconv/ces/utf-8.c: Ditto.
-	* libc/iconv/ces/cesbi.c: New file.
-	* libc/iconv/ces/cesbi.h: Ditto.
-	* libc/iconv/ces/cesdeps.h: Ditto.
-	* libc/iconv/ces/euc.c: Ditto.
-	* libc/iconv/ces/mkdeps.pl: Ditto.
-	* libc/iconv/ces/table-pcs.c: Ditto.
-	* libc/iconv/ces/table.c: Ditto.
-	* libc/iconv/ces/ucs-2.c: Ditto.
-	* libc/iconv/ces/ucs-4.c: Ditto.
-	* libc/iconv/ces/us-ascii.c: Ditto.
-	* libc/iconv/ces/euc-jp.c: Removed.
-	* libc/iconv/ces/euc-kr.c: Ditto.
-	* libc/iconv/ces/euc-tw.c: Ditto.
-	* libc/iconv/ces/gb2312.c: Ditto.
-	* libc/iconv/ces/iso-10646-ucs-2.: Ditto.c
-	* libc/iconv/ces/iso-10646-ucs-4.c: Ditto.
-	* libc/iconv/lib/Makefile.am: Updated.
-	* libc/iconv/lib/Makefile.in: Regenerated.
-	* libc/iconv/lib/endian.h: Updated.
-	* libc/iconv/lib/iconv.c: Ditto.
-	* libc/iconv/lib/local.h: Ditto.
-	* libc/iconv/lib/aliases.c: Removed.
-	* libc/iconv/lib/bialiasesi.c: Ditto.
-	* libc/iconv/lib/biccs.c: Ditto.
-	* libc/iconv/lib/bices.c: Ditto.
-	* libc/iconv/lib/ccs.c: Ditto.
-	* libc/iconv/lib/ces.c: Ditto.
-	* libc/iconv/lib/ces_euc.c: Ditto.
-	* libc/iconv/lib/ces_iso2022.c: Ditto.
-	* libc/iconv/lib/ces_table.c: Ditto.
-	* libc/iconv/lib/converter.c: Ditto.
-	* libc/iconv/lib/deps.h: Ditto.
-	* libc/iconv/lib/loaddata.c: Ditto.
-	* libc/iconv/lib/aliasesbi.c: New file.
-	* libc/iconv/lib/aliasesi.c: Ditto.
-	* libc/iconv/lib/conv.h: Ditto.
-	* libc/iconv/lib/encnames.h: Ditto.
-	* libc/iconv/lib/encoding.deps: Ditto.
-	* libc/iconv/lib/iconvnls.c: Ditto.
-	* libc/iconv/lib/iconvnls.h: Ditto.
-	* libc/iconv/lib/nullconv.c: Ditto.
-	* libc/iconv/lib/ucsconv.c: Ditto.
-	* libc/iconv/lib/ucsconv.h: Ditto.
-	* libc/include/iconv.h: Update copyright.
-	* libc/*/aclocal.m4: Regenerated.
-	* libc/*/configure: Ditto.
-	* libm/*/aclocal.m4: Ditto.
-	* libm/*/configure: Ditto.
-
-2004-06-22  Alexandre Oliva  <aoliva@redhat.com>
-
-	* libc/include/machine/setjmp.h [__H8300__] (_JBTYPE): Define,
-	instead of typedefing jmp_buf.
-
-	2003-07-02  Richard Sandiford  <rsandifo@redhat.com>
-	* libc/machine/h8300/Makefile.am (lib_a_SOURCES): Add h8sx_strcpy.S.
-	* libc/machine/h8300/defines.h (LEN): New macro.
-	* libc/machine/h8300/memcpy.S: Add h8sx version.
-	* libc/machine/h8300/memset.S: Likewise.
-	* libc/machine/h8300/strcmp.S: Likewise.
-	* libc/machine/h8300/setjmp.S: Use h8sx move instructions.
-	* libc/machine/h8300/h8sx_strcpy.S: New file.
-	2003-06-30  Richard Sandiford  <rsandifo@redhat.com>
-	* libc/include/machine/ieeefp.h: Extend __H8300S__ handling to
-	__H8300SX__.
-	* libc/include/machine/setjmp.h: Likewise.
-	* libc/include/sys/config.h: Likewise.
-	* libc/machine/h8300/defines.h: Likewise.
-	* libc/machine/h8300/setjmp.S: Likewise.
-	* libc/machine/h8300/strcmp.S: Likewise.
-	* libc/sys/h8300hms/close.S: Likewise.
-	* libc/sys/h8300hms/fstat.S: Likewise.
-	* libc/sys/h8300hms/lseek.S: Likewise.
-	* libc/sys/h8300hms/read.S: Likewise.
-	* libc/sys/h8300hms/write.S: Likewise.
-	* libc/sys/h8300hms/crt0.S: Likewise.
-	* libc/machine/h8300/setarch.h: Use .h8300sx or .h8300sxn if
-	__H8300SX__ is defined.
-	* libc/sys/h8300hms/setarch.h: Likewise.
-
-2004-06-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/reent.h (_GLOBAL_REENT): Back
-	out change which set _GLOBAL_REENT to _global_impure_ptr until
-	we understand why Cygwin breaks because of it.
-
-2004-06-14  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/machine/i386/syscall.h: For now, set up
-	__syscall_return macro for systems with vsyscall.
-
-2004-06-11  Antony King  <antony.king@st.com>
-
-	* libc/include/sys/_types.h: Include <sys/lock.h> and change
-	_flock_t to be of type _LOCK_RECURSIVE_T.
-	* libc/include/sys/reent.h: (_REENT_INIT): Reformat.
-	(_REENT_INIT_PTR): Ditto.  Use memset where appropriate.
-	(_global_impure_ptr): New declaration.
-	(_GLOBAL_REENT): Change to be _global_impure_ptr.
-	* libc/include/sys/stdio.h: Include <sys/lock.h> and
-	<sys/reent.h>.
-	(_flockfile)[!_SINGLE_THREAD]: Add code for lock call.
-	(_funlockfile)[!SINGLE_THREAD]: Ditto.
-	* libc/reent/impure.c: Set _global_impure_ptr to _impure_ptr.
-	* libc/stdio/fclose.c: Remove casting of fp lock to
-	_LOCK_RECURSIVE_T.
-	* libc/stdio/findfp.c: Ditto.
-	* libc/stdio/fopen.c: Ditto.
-	* libc/stdio/freopen.c: Ditto.
-	* libc/stdio/vfprintf.c: Ditto.
-	* libc/stdio64/fopen64.c: Ditto.
-	* libc/stdlib/envlock.c: Add default stubs that use generic
-	locking code.
-	* libc/stdlib/mlock.c: Ditto.
-
-	Jeff Johnston  <jjohnstn@redhat.com>
-	* libc/sys/linux/sys/_types.h (__flock_mutex_t): New subtype.
-	(_flock_t): Change to be a struct containing a single member
-	named mutex which is of type __flock_mutex_t.
-
-2004-06-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/Makefile.am: Change siglist.inc to be generated
-	from /usr/include/asm/signal.h instead of kernel sources.  Also
-	default max to 32 if not found in header file.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/machine/i386/socketcall.h: Fix for Fedora Core 2
-	systems where __syscall_return is not defined.
-	* libc/sys/linux/machine/i386/syscall.h: Change for Fedora Core 2
-	systems to use syscall() function instead of assembler interrupt.
-
-2004-06-09  Toralf Lund  <toralf@procaptura.com>
-
-	* libc/sys/arm/setjmp.S, libc/sys/arm/access.c: Move
-	files from libc/sys/arm to libc/machine/arm.
-	* libc/machine/arm/Makefile.am, libc/machine/arm/Makefile.in: Add
-	library build support for files moved from libc/sys/arm.
-	* libc/sys/arm/Makefile.am, libc/sys/arm/Makefile.in:  Remove
-	references to access and setjmp.
-	* configure.host: Add checks for newlib_may_supply_syscalls to
-	determine whether or not to use sys/arm directory and use
-	special compiler flags: ARM_RDI_MONITOR and ARM_RDP_MONITOR.
-       
-2004-06-02  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/vfscanf.c (__svfscanf_r): For CT_INT conversions,
-	reset digit flags appropriately after we have discovered "0x".
-	* libc/machine/powerpc/vfscanf.c (__svfscanf_r): Ditto.
-
-2004-05-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/vfprintf.c (_VFPRINTF): Move file locking
-	from here ...
-	(_VFPRINTF_R): ... to here so all I/O printf routines
-	are covered.
-
-2004-05-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/search/hash_buf.c: Protect MAX and MIN macros from
-	redefinition.
-	* libc/search/hash.c: Ditto.
-
-2004-05-25  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* newlib.hin: (_WANT_IO_POS_ARGS): New define.
-	(_WANT_IO_LONG_LONG): Ditto.
-	(_WANT_IO_LONG_DOUBLE): Ditto.
-	* configure.in: Add new configuration options
-	--enable-newlib-io-long-long and --enable-newlib-io-long-double
-	which tie to new defines in newlib.hin.
-	* configure: Regenerated.
-	* configure.host: Add checks for new configuration options.  Also
-	fix up check for --enable-newlib-io-pos-args so configuration
-	option will override any default for a given platform.
-	Remove defining compiler flags for the _WANT_IO* options.
-	* libc/stdio/vfprintf.c: Change to use new newlib.hin defines
-	instead of looking for old compiler flags.
-	* libc/stdio/vfscanf.c: Ditto.
-	* libc/stdio/vfieeefp.h: Ditto.
-	* libc/machine/powerpc/vfprintf.c: Ditto.
-	* libc/machine/powerpc/vfscanf.c: Ditto.
-
-2004-05-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* testsuite/include/check.h: Add include of <stdio.h>.
-
-2004-05-17  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/grp.h: Declare getgrnam_r and getgrgid_r also on Cygwin.
-
-2004-05-11  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/stdio/vfprintf.c (VFPRINTF_R): Use _free_r instead
-	of free.
-
-2004-05-07  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/stdio/iprintf.c (_iprintf_r): Fix old-style argument
-	list for reentrant pointer.  Call _vfiprintf_r.
-	* libc/stdio/siprintf.c (_siprintf_r): New function.
-	* libc/stdio/vfprintf.c (__sbprintf): Add reetrant struct
-	pointer argument.  Change all callers.  Call _VFPRINTF_R.
-	* libc/include/stdio.h (_siprintf_r, _vfiprintf_r): New
-	prototypes.
-
-2004-05-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/param.h: Remove endian info and include
-	<machine/endian.h> instead.
-	* libc/include/machine/endian.h: New file.
-	* libc/include/machine/param.h: Ditto.
-	* libc/machine/arm/machine/endian.h: Ditto.
-	* libc/machine/arm/machine/param.h: Ditto.
-	* libc/sys/arm/sys/param.h: Removed.
-	* libc/sys/sysvi386/sys/param.h: Ditto.
-	* libc/sys/rtems/sys/param.h: Modified to include <machine/endian.h>.
-
-2004-05-03  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/stdio/vfprintf.c (_VFPRINTF_R): Set error flag when
-	multibyte functions return failure for %C, %S, %lc, and %ls
-	format specifiers.
-
-2004-05-03  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* testsuite/include/check.h (CHECK): Add flush of stdout.
-
-2004-05-03  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/include/stdio.h (_ungetc_r): New prototype.
-	* libc/stdio/ungetc.c (_ungetc_r): New reentrant function.
-	(__submore): Add reentrant struct pointer argument.
-	(ungetc): Change to call _ungetc_r.
-
-2004-04-28  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/stdio/local.h (_fwalk_reent): Specify prototype of
-	function pointer argument.
-	* libc/stdio/fwalk.c (_fwalk, _fwalk_reent): Change prototypes
-	to specify function pointer arguments.
-	(__fwalk, __fwalk_reent): Ditto.
-
-2004-04-26  Aldy Hernandez  <aldyh@redhat.com>
-
-        * libc/machine/powerpc/vfscanf.c (__svfscanf_r): Fix typo in
-        CT_INT case.
-
-2004-04-23  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* configure.in: Define _MB_CAPABLE if mb supported.
-	* configure: Regenerated.
-	* configure.host: Remove manual setting of MB_CAPABLE compiler
-	flag.
-	* newlib.hin: Add _MB_CAPABLE flag.
-	* libc/ctype/iswalpha.c, libc/ctype/iswblank.c: Include <newlib.h>
-	and check for _MB_CAPABLE flag instead of MB_CAPABLE.
-	* libc/ctype/iswcntrl.c, libc/ctype/iswprint.c: Ditto.
-	* libc/ctype/iswpunct.c, libc/ctype/iswspace.c: Ditto.
-	* libc/ctype/jp2uc.c: Ditto.
-	* libc/ctype/towlower.c, libc/ctype/towupper.c: Ditto.
-	* libc/locale/locale.c: Ditto
-	* libc/machine/powerpc/vfscanf.c: Ditto
-	* libc/stdio/vfprintf.c, libc/stdio/vfscanf.c: Ditto
-	* libc/stdlib/mblen.c: Ditto
-	* libc/stdlib/mblen_r.c, libc/stdlib/mbrlen.c: Ditto
-	* libc/stdlib/mbrtowc.c, libc/stdlib/mbsrtowcs.c: Ditto
-	* libc/stdlib/mbstowcs.c, libc/stdlib/mbtowc.c: Ditto
-	* libc/stdlib/mbtowc_r.c, libc/stdlib/wcrtomb.c: Ditto
-	* libc/stdlib/wcsrtombs.c, libc/stdlib/wcstombs.c: Ditto
-	* libc/stdlib/wctomb.c, libc/sys/linux/intl/dcigettext.c: Ditto
-	* libc/sys/linux/intl/explodename.c: Ditto
-	* libc/sys/linux/intl/finddomain.c: Ditto
-	* libc/sys/linux/intl/l10nflist.c: Ditto
-	* libc/sys/linux/intl/loadmsgcat.c: Ditto
-	* libc/sys/linux/intl/localealias.c: Ditto
-
-2004-04-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/machine/powerpc/vfscanf.c (NNZDIGITS): New define.
-	(__svfscanf_r): In integer conversions, leave out leading zeroes
-	which are not part of a base prefix.
-	Keep track of width truncation to fit into buf, not counting left-out
-	zeroes against width till the truncation has been compensated for.
-	This is based on Joern's patch of 04/21 for libc/stdio/vfscanf.c.
-
-2004-04-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdio.h: (_ftell_r, _fseek_r): New prototypes.
-
-2004-04-23  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/stdio/asprintf.c libc/stdio/clearerr.c,
-	libc/stdio/fclose.c libc/stdio/fcloseall.c libc/stdio/fdopen.c,
-	libc/stdio/feof.c libc/stdio/ferror.c libc/stdio/fflush.c,
-	libc/stdio/fgetc.c libc/stdio/fgetpos.c libc/stdio/fgets.c,
-	libc/stdio/fileno.c libc/stdio/findfp.c libc/stdio/fiprintf.c,
-	libc/stdio/flags.c libc/stdio/fopen.c libc/stdio/fprintf.c,
-	libc/stdio/fputc.c libc/stdio/fputs.c libc/stdio/fread.c,
-	libc/stdio/freopen.c libc/stdio/fscanf.c libc/stdio/fseek.c,
-	libc/stdio/fseeko.c libc/stdio/fsetpos.c libc/stdio/ftell.c,
-	libc/stdio/ftello.c libc/stdio/fvwrite.c libc/stdio/fwalk.c,
-	libc/stdio/fwrite.c libc/stdio/getc.c libc/stdio/getc_u.c,
-	libc/stdio/getchar.c libc/stdio/getchar_u.c,
-	libc/stdio/getdelim.c libc/stdio/getline.c libc/stdio/gets.c,
-	libc/stdio/getw.c libc/stdio/iprintf.c libc/stdio/local.h,
-	libc/stdio/makebuf.c libc/stdio/mktemp.c libc/stdio/perror.c,
-	libc/stdio/printf.c libc/stdio/putc.c libc/stdio/putc_u.c,
-	libc/stdio/putchar.c libc/stdio/putchar_u.c libc/stdio/puts.c,
-	libc/stdio/putw.c libc/stdio/refill.c libc/stdio/remove.c,
-	libc/stdio/rename.c libc/stdio/rewind.c libc/stdio/rget.c,
-	libc/stdio/scanf.c libc/stdio/setbuf.c libc/stdio/setbuffer.c,
-	libc/stdio/setlinebuf.c libc/stdio/setvbuf.c,
-	libc/stdio/siprintf.c libc/stdio/snprintf.c,
-	libc/stdio/sprintf.c libc/stdio/sscanf.c libc/stdio/stdio.c,
-	libc/stdio/tmpfile.c libc/stdio/tmpnam.c libc/stdio/ungetc.c,
-	libc/stdio/vasprintf.c libc/stdio/vfieeefp.h,
-	libc/stdio/vfprintf.c libc/stdio/vfscanf.c,
-	libc/stdio/vprintf.c libc/stdio/vscanf.c,
-	libc/stdio/vsnprintf.c libc/stdio/vsprintf.c,
-	libc/stdio/vsscanf.c libc/stdio/wbuf.c,
-	libc/stdio/wsetup.c: Perform minor formatting changes.  Move
-	copyright notices to top of file, ensure that <_ansi.h> is
-	included, be consistent with open parentheses, use _DEFUN macro,
-	include "local.h" where needed, and remove various compiler
-	warnings.
-
-2004-04-21  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/stdio/vfscanf.c (NNZDIGITS): New define.
-	(__svfscanf_r): In integer conversions, leave out leading zeroes
-	which are not part of a base prefix.
-	Keep track of width truncation to fit into buf, not counting left-out
-	zeroes against width till the truncation has been compensated for.
-
-2004-04-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/unistd.h (ttyname_r): Add missing comma.
-
-2004-04-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/unistd.h (ttyname_r): Add declaration for Cygwin.
-
-2004-04-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/unistd.h (sync): Define void on Cygwin according
-	to SUSv3.
-
-2004-04-08  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/stdio/fclose.c (_fclose_r): New function.
-	* libc/stdio/freopen.c (_freopen_r): Call _fclose_r.
-	* libc/stdio/fcloseall.c (_fcloseall_r): Call _fwalk_reent.
-	* libc/stdio64/freopen64.c (_freopen64_r): Use _fclose_r.
-	* libc/include/stdio.h (_fclose_r): New prototype.
-	* libc/stdio/fopen.c: Fix typo in comment.
-
-2004-04-08  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/fwalk.c (_fwalk_reent): New version of _fwalk
-	to handle _r reentrant functions.
-
-2004-04-08  Eric Christopher  <echristo@redhat.com>
-
-	* libc/include/machine/setjmp.h: Fix endif locations.
-
-2004-04-01  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/time/strptime.c: Add standard includes to avoid
-	warning messages at compilation time.
-
-2004-04-01  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/vfscanf.c (__svfscanf_r): Add locking/unlocking
-	of file.
-
-2004-03-30  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/machine/h8300/Makefile.am: Reformat slightly.
-	* libc/machine/h8300/Makefile.in: Regenerate.
-
-2004-03-30  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* libc/stdio/findfp.c (__fp_lock_all): Add call to
-	__sfp_lock_acquire.
-	(__fp_unlock_all): Add call to __sfp_lock_release. 
-
-2004-03-25  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* libc/stdio/fclose.c (fclose): Protect file pointer list when
-	releasing a file.
-	 * libc/stdio/fcloseall.c (_fcloseall_r): Close all files via
-	fwalk.
-	* libc/stdio/fdopen.c (_fdopen_r): Add calls to
-	_flockfile/_funlockfile.
-	* libc/stdio/findfp.c: Move __sfp_lock. Change __sfp_lock type
-	to recursive.
-	Change __lock_acquire/__lock_release calls for __sfp_lock to
-	__sfp_lock_acquire/__sfp_lock_release throughout.
-	(std): Make sure that file lock is only initialized once.
-	(__sfp): Move _file initialization. Initialize file lock.
-	(__sfp_lock_acquire): New function.
-	(__sfp_lock_release): Ditto.
-	(__fp_lock_all): Remove __sfp_lock_acquire call.
-	(__fp_unlock_all): Remove __sfp_lock_release call.
-	* libc/stdio/fopen.c (_fopen_r): Protect file pointer list.
-	Add calls to _flockfile/_funlockfile. Remove
-	__lock_init_recursive call.
-	* libc/stdio/freopen.c (_freopen_r): Protect file pointer list.
-	* libc/stdio/fwalk.c (__fwalk): New static function.
-	(_fwalk): Protect file pointer list. Use __fwalk to walk through
-	file pointers.
-	* libc/stdio/local.h: Add defines for
-	__sfp_lock_acquire/__sfp_lock_release when
-	single threaded. Add function prototypes otherwise.
-	* libc/stdio64/fdopen64.c (_fdopen64_r): Add calls to
-	_flockfile/_funlockfile.
-	* libc/stdio/fopen64.c (_fopen64_r): Protect file pointer list.
-	Add calls to _flockfile/_funlockfile. Remove
-	 __lock_init_recursive call.
-	* libc/stdio/freopen64.c (_freopen64_r): Protect file pointer
-	list. 
-
-2004-03-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/sys/lock.h: Turn on __USE_GNU flag if not already
-	defined.  Change __LOCK_RECURSIVE_INIT to be __LOCK_INIT_RECURSIVE.
-	* libc/sys/linux/dl/dl-support.c: Change __LOCK_RECURSIVE_INIT
-	to be __LOCK_INIT_RECURSIVE.
-
-2004-03-11  Kazu Hirata  <kazu@cs.umass.edu>
-
-	* libc/sys/h8300hms/Makefile.am (lib_a_SOURCES): Replace
-	_exit.c with _exit.S.
-	* libc/sys/h8300hms/Makefile.in: Regenerate.
-	* libc/sys/h8300hms/_exit.c: Remove.
-	* libc/sys/h8300hms/_exit.S: New.
-
-2004-03-09  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* libc/stdio/findfp.c (__sfp): Rename lock to __sfp_lock.
-	Change __sfp_lock to static global.
-	(__fp_lock): New static function.
-	(__fp_unlock): Ditto.
-	(__fp_lock_all): New function.
-	(__fp_unlock_all): Ditto. 
-
-2004-02-10  Christopher Faylor  <cgf@redhat.com>
-
-	* libm/mathfp/er_gamma.c (gamma): Add new non-reentrant function.
-	* libm/mathfp/er_lgamma.c (lgamma): Ditto.
-	* libm/mathfp/erf_gamma.c (gammaf): Ditto.
-	* libm/mathfp/erf_lgamma.c (lgammaf): Ditto.
-
-2004-02-09  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/include/time.h (TIMER_RELTIME): New define.
-
-2004-02-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdlib/Makefile.am: Add mallstatsr to LIBADD_OBJS.
-	* libc/stdlib/Makefile.in: Regenerated.
-
-2004-02-08  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/include/sys/features.h: Add _POSIX_TIMERS define for __CYGWIN__.
-	* libc/include/sys/reent.h (__getreent): Protect against possibly being
-	defined.
-	* libc/include/sys/unistd.h (fdatasync): Don't define for __CYGWIN__.
-
-2004-02-05  Paul Brook  <paul@codesourcery.com>
-
-	* libc/include/machine/ieeefp.h[__arm__][__VFP_FP__]: Set 
-	IEEE_{BIG,LITTLE} based on __ARMEL__ flag.
-
-2004-02-02  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* NEWS: Update with 1.12.0 info.
-	* README: Ditto.
-	* acinclude.m4: Change version number to 1.12.0.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* doc/aclocal.m4: Ditto.
-	* doc/configure: Ditto.
-	* libc/*/aclocal.m4: Ditto.
-	* libc/*/configure: Ditto.
-	* libc/libc.texinfo: Ditto.
-	* libm/*/aclocal.m4: Ditto.
-	* libm/*/configure: Ditto.
-	* libm/libm.texinfo: Ditto.
-	* libc/sys/linux/shared.ld: Add VERS_1.12.
-
-2004-02-02  Joel Sherrill  <joel@oarcorp.com>
-
-	* configure.host: Add support for tic4x.
-	* libc/include/machine/ieeefp.h: Ditto.
-	* libc/include/machine/setjmp.h: Ditto.
-	* libc/machine/tic4x/Makefile.am: New file.
-	* libc/machine/tic4x/configure.in: Ditto.
-	* libc/machine/tic4x/setjmp.S: Ditto.
-	* libc/machine/tic4x/aclocal.m4: Generated.
-	* libc/machine/tic4x/configure: Ditto.
-	* libc/machine/tic4x/Makefile.in: Ditto.
-
-2004-01-30  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/fwalk.c (_fwalk.c): Don't traverse the
-	file chain on the passed in reentrancy struct if it
-	is _GLOBAL_REENT.
-
-2004-01-30  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-            Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/iconv/iconv.tex: Updated with more information.
-
-2004-01-30  Thomas Pfaff  <tpfaff@gmx.net>
-            Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/fwalk.c (_fwalk): Traverse the given reentrancy
-	struct for std streams and traverse the global reeentrancy
-	struct for all other streams.
-
-2004-01-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdlib/atexit.c: Protect global atexit list with a
-	lock when newlib is multithreaded.
-
-2004-01-27  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* configure.in: Add support to generate iconv converter flags
-	for newlib.h
-	* newlib.hin: Add iconv converter flags.
-	* configure: Regenerated.
-	* libc/Makefile.in: Ditto.
-	* libc/configure.in: Moved iconv converter parsing logic to
-	top level newlib configure.in.
-	* libc/configure: Regenerated.
-	* libc/iconv/Makefile.in: Ditto.
-	* libc/iconv/README.TODO
-	* libc/iconv/charset.aliases: Remove wrong BE aliases for
-	UCS2/UCS4/UTF8.
-	* libc/iconv/ccs/Makefile.am: Remove C flag setting now that
-	newlib.h can be used.
-	* libc/iconv/ces/Makefile.am: Ditto.
-	* libc/iconv/lib/Makefile.am: Ditto.
-	* libc/iconv/ccs/Makefile.in: Regenerated.
-	* libc/iconv/ces/Makefile.in: Ditto.
-	* libc/iconv/lib/Makefile.in: Ditto.
-	* libc/iconv/ccs/README.CCS.SOURCES: Updated.
-	* libc/iconv/ccs/iconv_mktbl: Don't write junk strings to binaries.
-	* libc/iconv/ccs/big5.c: Switch to use new underscored flags
-	defined in newlib.h.
-	* libc/iconv/ccs/cns11643_plane1.c: Ditto.
-	* libc/iconv/ccs/cns11643_plane14.c: Ditto.
-	* libc/iconv/ccs/cns11643_plane2.c: Ditto.
-	* libc/iconv/ccs/cp775.c: Ditto.
-	* libc/iconv/ccs/cp850.c: Ditto.
-	* libc/iconv/ccs/cp852.c: Ditto.
-	* libc/iconv/ccs/cp855.c: Ditto.
-	* libc/iconv/ccs/cp866.c: Ditto.
-	* libc/iconv/ccs/gb_2312_80.c: Ditto.
-	* libc/iconv/ccs/iso_8859_1.c: Ditto.
-	* libc/iconv/ccs/iso_8859_15.c: Ditto.
-	* libc/iconv/ccs/iso_8859_2.c: Ditto.
-	* libc/iconv/ccs/iso_8859_4.c: Ditto.
-	* libc/iconv/ccs/iso_8859_5.c: Ditto.
-	* libc/iconv/ccs/jis_x0201.c: Ditto.
-	* libc/iconv/ccs/jis_x0208_1983.c: Ditto.
-	* libc/iconv/ccs/jis_x0212_1990.c: Ditto.
-	* libc/iconv/ccs/koi8_r.c: Ditto.
-	* libc/iconv/ccs/koi8_u.c: Ditto.
-	* libc/iconv/ccs/ksx1001.c: Ditto.
-	* libc/iconv/ccs/shift_jis.c: Ditto.
-	* libc/iconv/ccs/us_ascii.c: Ditto.
-	* libc/iconv/ccs/binary/big5.cct: Newly generated.
-	* libc/iconv/ccs/binary/cns11643_plane1.cct: Ditto.
-	* libc/iconv/ccs/binary/cns11643_plane14.cct: Ditto.
-	* libc/iconv/ccs/binary/cns11643_plane2.cct: Ditto.
-	* libc/iconv/ccs/binary/cp775.cct: Ditto.
-	* libc/iconv/ccs/binary/cp850.cct: Ditto.
-	* libc/iconv/ccs/binary/cp852.cct: Ditto.
-	* libc/iconv/ccs/binary/cp855.cct: Ditto.
-	* libc/iconv/ccs/binary/cp866.cct: Ditto.
-	* libc/iconv/ccs/binary/gb_2312_80.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_1.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_15.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_2.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_4.cct: Ditto.
-	* libc/iconv/ccs/binary/iso_8859_5.cct: Ditto.
-	* libc/iconv/ccs/binary/jis_x0201.cct: Ditto.
-	* libc/iconv/ccs/binary/jis_x0208_1983.cct: Ditto.
-	* libc/iconv/ccs/binary/jis_x0212_1990.cct: Ditto.
-	* libc/iconv/ccs/binary/koi8_r.cct: Ditto.
-	* libc/iconv/ccs/binary/koi8_u.cct: Ditto.
-	* libc/iconv/ccs/binary/ksx1001.cct: Ditto.
-	* libc/iconv/ccs/binary/shift_jis.cct: Ditto.
-	* libc/iconv/ccs/binary/us_ascii.cct: Ditto.
-	* libc/iconv/lib/bialiasesi.c: Sync with charset.aliases.
-	* libc/iconv/ces/euc-jp.c: Use newlib.h macros.
-	* libc/iconv/ces/euc-kr.c: Ditto.
-	* libc/iconv/ces/euc-tw.c: Ditto.
-	* libc/iconv/ces/gb2312.c: Ditto.
-	* libc/iconv/ces/iso-10646-ucs-2.c: Ditto.
-	* libc/iconv/ces/iso-10646-ucs-4.c: Ditto.
-	* libc/iconv/ces/ucs-2-internal.c: Ditto.
-	* libc/iconv/ces/ucs-4-internal.c: Ditto.
-	* libc/iconv/ces/utf-16.c: Ditto.
-	* libc/iconv/ces/utf-8.c: Ditto.
-	* libc/iconv/lib/aliases.c: Ditto.
-	* libc/iconv/lib/biccs.c: Ditto.
-	* libc/iconv/lib/bices.c: Ditto.
-	* libc/iconv/lib/ccs.c: Ditto.
-	* libc/iconv/lib/ces.c: Ditto.
-	* libc/iconv/lib/ces_euc.c: Ditto.
-	* libc/iconv/lib/ces_iso2022.c: Ditto.
-	* libc/iconv/lib/ces_table.c: Ditto.
-	* libc/iconv/lib/converter.c: Ditto.
-	* libc/iconv/lib/deps.h: Ditto.
-	* libc/iconv/lib/endian.h: Ditto.
-	* libc/iconv/lib/iconv.c: Ditto.
-	* libc/iconv/lib/loaddata.c: Ditto.
-	* libc/iconv/lib/local.h: Include newlib.h.
-	* libc/argz/Makefile.in: Regenerated.
-	* libc/ctype/Makefile.in: Ditto.
-	* libc/errno/Makefile.in: Ditto.
-	* libc/iconv/ccs/binary/Makefile.in: Ditto.
-	* libc/locale/Makefile.in: Ditto.
-	* libc/misc/Makefile.in: Ditto.
-	* libc/posix/Makefile.in: Ditto.
-	* libc/reent/Makefile.in: Ditto.
-	* libc/search/Makefile.in: Ditto.
-	* libc/signal/Makefile.in: Ditto.
-	* libc/stdio/Makefile.in: Ditto.
-	* libc/stdio64/Makefile.in: Ditto.
-	* libc/stdlib/Makefile.in: Ditto.
-	* libc/string/Makefile.in: Ditto.
-	* libc/syscalls/Makefile.in: Ditto.
-	* libc/time/Makefile.in: Ditto.
-	* libc/unix/Makefile.in: Ditto.
-	* testsuite/newlib.iconv/iconv.exp: New file.
-	* testsuite/newlib.iconv/iconvjp.c: Ditto.
-	* testsuite/newlib.iconv/iconvnm.c: Ditto.
-	* testsuite/newlib.iconv/iconvru.c: Ditto.
-
-2004-01-23  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* acinclude.m4 (--enable-newlib-iconv): New configuration option.
-	(--enable-newlib-builtin-converters): Ditto.
-	* configure.in: Add code to set _ICONV_ENABLED flag.
-	Set _MB_LEN_MAX to 1 if not mb enabled.
-	* configure: Regenerated.
-	* aclocal.m4: Ditto.
-	* Makefile.in: Ditto.
-	* newlib.hin: Add _ICONV_ENABLED flag.
-	* libc/Makefile.am: Add support for iconv.
-	* libc/configure.in: Ditto.
-	* libc/Makefile.in: Regenerated.
-	* libc/aclocal.m4: Ditto.
-	* libc/configure: Ditto.
-	* libc/libc.texinfo: Add iconv documentation.
-	* libc/iconv/AUTHORS, libc/iconv/COPYING, libc/iconv/Makefile.am,
-	libc/iconv/Makefile.in, libc/iconv/README.ORIGINAL,
-	libc/iconv/README.TODO, libc/iconv/charset.aliases,
-	libc/iconv/iconv.tex, libc/iconv/ccs/Makefile.am,
-	libc/iconv/ccs/Makefile.in, libc/iconv/ccs/README.CCS.SOURCES,
-	libc/iconv/ccs/big5.c, libc/iconv/ccs/cns11643_plane1.c,
-	libc/iconv/ccs/cns11643_plane14.c, libc/iconv/ccs/cns11643_plane2.c,
-	libc/iconv/ccs/cp775.c, libc/iconv/ccs/cp850.c,
-	libc/iconv/ccs/cp852.c, libc/iconv/ccs/cp855.c,
-	libc/iconv/ccs/cp866.c, libc/iconv/ccs/gb_2312_80.c,
-	libc/iconv/ccs/iconv_mktbl, libc/iconv/ccs/iso_8859_1.c,
-	libc/iconv/ccs/iso_8859_15.c, libc/iconv/ccs/iso_8859_2.c,
-	libc/iconv/ccs/iso_8859_4.c, libc/iconv/ccs/iso_8859_5.c,
-	libc/iconv/ccs/jis_x0201.c, libc/iconv/ccs/jis_x0208_1983.c,
-	libc/iconv/ccs/jis_x0212_1990.c, libc/iconv/ccs/koi8_r.c,
-	libc/iconv/ccs/koi8_u.c, libc/iconv/ccs/ksx1001.c,
-	libc/iconv/ccs/shift_jis.c, libc/iconv/ccs/us_ascii.c,
-	libc/iconv/ccs/binary/Makefile.am, libc/iconv/ccs/binary/Makefile.in,
-	libc/iconv/ccs/binary/big5.cct,
-	libc/iconv/ccs/binary/cns11643_plane1.cct,
-	libc/iconv/ccs/binary/cns11643_plane14.cct,
-	libc/iconv/ccs/binary/cns11643_plane2.cct,
-	libc/iconv/ccs/binary/cp775.cct, libc/iconv/ccs/binary/cp850.cct,
-	libc/iconv/ccs/binary/cp852.cct, libc/iconv/ccs/binary/cp855.cct,
-	libc/iconv/ccs/binary/cp866.cct, libc/iconv/ccs/binary/gb_2312_80.cct,
-	libc/iconv/ccs/binary/iso_8859_1.cct,
-	libc/iconv/ccs/binary/iso_8859_15.cct,
-	libc/iconv/ccs/binary/iso_8859_2.cct,
-	libc/iconv/ccs/binary/iso_8859_4.cct,
-	libc/iconv/ccs/binary/iso_8859_5.cct,
-	libc/iconv/ccs/binary/jis_x0201.cct,
-	libc/iconv/ccs/binary/jis_x0208_1983.cct,
-	libc/iconv/ccs/binary/jis_x0212_1990.cct,
-	libc/iconv/ccs/binary/koi8_r.cct, libc/iconv/ccs/binary/koi8_u.cct,
-	libc/iconv/ccs/binary/ksx1001.cct,
-	libc/iconv/ccs/binary/shift_jis.cct,
-	libc/iconv/ccs/binary/us_ascii.cct,
-	libc/iconv/ces/Makefile.am, libc/iconv/ces/Makefile.in,
-	libc/iconv/ces/euc-jp.c, libc/iconv/ces/euc-kr.c,
-	libc/iconv/ces/euc-tw.c, libc/iconv/ces/gb2312.c,
-	libc/iconv/ces/iso-10646-ucs-2.c, libc/iconv/ces/iso-10646-ucs-4.c,
-	libc/iconv/ces/ucs-2-internal.c, libc/iconv/ces/ucs-4-internal.c,
-	libc/iconv/ces/utf-16.c, libc/iconv/ces/utf-8.c,
-	libc/iconv/lib/Makefile.am, libc/iconv/lib/Makefile.in,
-	libc/iconv/lib/aliases.c, libc/iconv/lib/bialiasesi.c,
-	libc/iconv/lib/biccs.c, libc/iconv/lib/bices.c,
-	libc/iconv/lib/ccs.c, libc/iconv/lib/ces.c,
-	libc/iconv/lib/ces_euc.c, libc/iconv/lib/ces_iso2022.c,
-	libc/iconv/lib/ces_table.c, libc/iconv/lib/converter.c,
-	libc/iconv/lib/deps.h, libc/iconv/lib/endian.h,
-	libc/iconv/lib/iconv.c, libc/iconv/lib/loaddata.c,
-	libc/iconv/lib/local.h, libc/include/iconv.h: New files.
-	* libc/sys/linux/include/iconv.h: Ditto.
-	* libc/include/sys/_types.h (_iconv_t): Added.
-	* doc/aclocal.m4: Regenerated.
-	* doc/configure: Ditto.
-	* doc/Makefile.in: Ditto.
-	* iconvdata/Makefile.in: Ditto.
-	* iconvdata/aclocal.m4: Ditto.
-	* iconvdata/configure: Ditto.
-	* libc/*aclocal.m4: Ditto.
-	* libc/*Makefile.in: Ditto.
-	* libc/*configure: Ditto.
-	* libm/*aclocal.m4: Ditto.
-	* libm/*Makefile.in: Ditto.
-	* libm/*configure: Ditto.
-
-2004-01-22  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* libc/stdio/findfp.c (__sfp): Protect global FILE pointer list
-	by a lock when newlib is multithreaded. 
-
-2004-01-21  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdlib/mbrtowc.c (_mbrtowc_r): Fix case where s is null
-	pointer to match C99 spec.
-	* libc/stdlib/mbsrtowcs.c (_mbsrtowc_r): Fix to ignore len when
-	dst is NULL.  Also fix to not alter src pointer when dst is NULL
-	and call _mbrtowc_r instead of _mbtowc_r.
-	* libc/stdlib/wcsrtombs.c (_wcsrtombs_r): Call _wcrtomb_r instead
-	of _wctomb_r.
-
-2004-01-19  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* libc/stdio/fclose.c (fclose): Release FILE as the last step.
-	* libc/stdio/freopen.c (freopen): Ditto.
-
-2004-01-16  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/stdio/vfprintf.c: Add sys/lock.h include.
-
-2004-01-16  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* libc/stdio/findfp.c (__sfp): Remove unnecessary memset.
-	* libc/stdio/vfprintf.c (__sbprintf): Ditto.
-	Add calls to __lock_init_recursive and __lock_close_recursive
-	instead.
-
-2004-01-15  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* libc/stdio/fclose.c: Include sys/lock.h.
-	(fclose): Destroy lock when file is closed.
-	* libc/stdio/findfp.c (__sfp): Initialize file pointers _lock
-	member.
-	* libc/stdio/freopen.c: Include sys/lock.h.
-	(_freopen_r): Destroy lock when file is closed.
-	* libc/stdio/vfprintf.c (__sbprintf): Initialize file pointers
-	_lock member.
-
-2004-01-08  Joel Sherrill  <joel@oarcorp.com>
-
-        * libc/ctype/iswctype.c, include/sys/reent.h, libc/stdlib/a64l.c:
-        Remove warnings.
-
-2004-01-08  Joel Sherrill  <joel@oarcorp.com>
-
-        * libc/sys/rtems/sys/queue.h: New file.
-        * libc/include/sys/signal.h: Reflect renumbering of signals to
-        fit into 32-bit mask.
-        * libc/include/sys/unistd.h: Add fdatasync() prototype.
-        * libc/sys/rtems/crt0.c: Add more symbols which may be implicitly
-        required.  In particular, add the reentrant variants of libc calls.
-        * libc/sys/rtems/sys/dirent.h: Add scandir() prototype.
-
-2004-01-06  Mark Mitchell  <mark@codesourcery.com>
-
-	* libc/sys/arm/syscalls.c (unistd.h): Include it.
-	(remap_handle): Use STDIN_FILENO instead of __sfileno(stdin).
-	Similarly for stdout and stderr.
-
-2004-01-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/libc.texinfo: Correct escape character for @ sign
-	so file will be processed by make info.  Update copyright years.
-	* libm/libm.texinfo: Ditto.
-
-2003-12-05  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/stat.h: No longer include stat-dj.h.
-	* libc/include/sys/stat-dj.h: Removed.
-
-2003-12-05  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/wchar.h: Include <sys/reent.h>.
-
-2003-12-05  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/stdlib/mbrlen.c: Change include order to prevent compiler errors
-	when defining _mbrtowc.
-	* libc/stdlib/mbsinit.c: Ditto.
-	* libc/stdlib/mbsrtowcs.c: Ditto.
-	* libc/stdlib/wcrtomb.c: Ditto.
-	* libc/stdlib/wcsrtombs.c: Ditto.
-	* libc/stdlib/wctob.c: Ditto.
-
-2003-12-05  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/stdlib/mbrlen.c: Change include order to prevent compiler
-	errors when defining _mbrtowc.
-	* libc/stdlib/mbsinit.c: Ditto.
-	* libc/stdlib/mbsrtowcs.c: Ditto.
-
-2003-12-05  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/stdlib/mbrtowc.c: Change include order to prevent compiler
-	errors when defining _mbrtowc.
-
-2003-12-04  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/stdio/vfprintf.c (_VFPRINTF_R): Use _r versions
-	of mb routines for %lc and %ls support.
-	* libc/stdio/vfscanf.c (_svfscanf_r): Add %lc, %C,
-	%ls, and %S support.  Remove CYGNUS_NEC markers and
-	code within.
-
-2003-12-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/wchar.h: Add prototypes for _mbrtowc_r,
-	_wcrtomb_r, and _wcsrtombs_r.
-
-2003-12-01  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/fcntl.h: Don't define struct flock when on
-	Cygwin.  This is done in winsup/cygwin/include/cygwin/types.h now.
-
-2003-11-28  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/include/sys/signal.h: Use system specific signal file when
-	building on cygwin.
-
-2003-11-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdlib.h (_atoi_r): New prototype.
-	* libc/stdlib/atoi.c (_atoi_r): New reentrant function.
-
-2003-11-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdlib.h (_atoll_r, _atol_r): New prototypes.
-	* libc/stdlib/atol.c (_atol_r): New reentrant function.
-	* libc/stdlib/atoll.c (_atoll_r): Ditto.
-
-2003-11-27  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-	    Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdlib.h (lldiv_t): New type.
-	(atoll, llabs, lldiv): New prototypes.
-	* libc/stdlib/Makefile.am: Add support for atoll, llabs, and lldiv.
-	* libc/stdlib/stdlib.tex: Ditto.
-	* libc/stdlib/Makefile.in: Regenerated.
-	* libc/stdlib/atoll.c: New file.
-	* libc/stdlib/llabs.c: Ditto.
-	* libc/stdlib/lldiv.c: Ditto.
-
-2003-11-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/fcntl.h: Declare syscalls only when building newlib.
-	* libc/include/unistd.h: Ditto.
-	* libc/include/stat.h: Ditto.  Also declare struct stat64.
-
-2003-11-24  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/stdio/vfprintf.c (_VFPRINTF_R): Fix check for 'C' format
-	specifier to use ch instead of *fmt.
-
-2003-11-21  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/stdio/vfprintf.c (_VFPRINTF_R, get_arg): Move mb-specific
-	code within checks for MB_CAPABLE.  For non-mb-capable platforms,
-	use simple byte logic.
-
-2003-11-21  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/vfscanf.c (__svfscanf_r)[!_NO_LONGDBL]: Don't use
-	_strtold routine for processing floats and doubles since it
-	is not as fast as _strtod_r.
-
-2003-11-20 Dhananjay Deshpande <dhananjayd@kpitcummins.com> 
-
-	* libc/machine/h8300/defines.h : Correct pointer register defines 
-	for normal mode.
-	* libc/machine/h8300/memcpy.S : Use add/sub instead of adds/subs 
-	for normal mode.
-	* libc/machine/h8300/reg_memcpy.S : Likewise.
-	* libc/machine/h8300/reg_memset.S : Likewise.
-	* libc/machine/h8300/strcmp.S : Likewise.
-
-2003-11-19  Nicholas Wourms  <nwourms@netscape.net>
-
-	* configure.host: Enable positional arguments for printf
-	family for Cygwin.
-	* libc/stdio/vfprintf.c (_VFPRINTF_R): Remove extraneous
-	pointer reference for quad_ptr_t.
-
-2003-11-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/scanf.c: Don't include local.h more than once.
-
-2003-11-18  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/fcntl.h: Declare _open64.
-	* libc/include/sys/stat.h: Declare _fstat64.
-	* libc/include/sys/unistd.h: Declare _lseek64.
-
-2003-11-17  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/stdlib.h (getprogname): Declare for Cygwin.
-	(setprogname): Ditto.
-
-2003-11-10  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/machine/powerpc/ufix64toa.c (_ufix64to_r): Fix shifts
-	to use (Ebits + 1) which accounts for the sign-bit.
-
-2003-11-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: Remove -DLOOSE_KERNEL_NAMES flag for linux 
-	x86 build.
-	* iconvdata/Makefile.am: Make dependent on newlib's configure.host
-	and set up default flags to pass to aclocal.
-	* iconvdata/Makefile.in: Regenerated.
-	* libc/sys/linux/Makefile.am: Add _ELIX_LEVEL_4 getlogin, getpwnam,
-	and getpwuid routines.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/getlogin.c: New stub file to allow x86-linux
-	applications to link with newlib's shared libc library.
-	* libc/sys/linux/getpwnam.c: Ditto.
-	* libc/sys/linux/getpwuid.c: Ditto.
-	* libc/sys/linux/sys/types.h: Include <features.h> and supply types
-	that were formerly supplied by /usr/include/linux/types.h with
-	kernel types.
-	* testsuite/newlib.wctype/twctype.c: Fix testcase to properly
-	test _ELIX_LEVEL macro.
-
-2003-11-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/vfprintf.c (_VFPRINTF_R): Fix typos that should be
-	referring to _NO_LONGLONG macro.
-
-2003-11-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/linuxthreads/td_init.c: Replace function name
-	in LOG() macro so this will compile on gcc 3.4 and up.
-	* libc/sys/linux/linuxthreads/td_log.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_clear_event.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_delete.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_enable_stats.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_event_addr.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_event_getmsg.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_get_nthreads.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_get_ph.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_get_stats.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_map_id2thr.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_map_lwp2thr.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_new.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_reset_stats.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_set_event.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_setconcurrency.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_thr_iter.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_tsd_iter.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_clear_event.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_dbresume.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_dbsuspend.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_event_enable.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_event_getmsg.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_get_info.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_getfpregs.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_getgregs.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_getxregs.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_getxregsize.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_set_event.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_setfpregs.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_setgregs.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_setprio.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_setsigpending.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_setxregs.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_sigsetmask.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_tsd.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_validate.c: Ditto.
-
-2003-11-05  Jeff Johnston  <jjohnstn@redhat.com>
-            Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/stdio/vfprintf.c (_VFPRINTF_R): Add support for
-	%ls, %S, %lc, and %C format specifiers.
-	(get_arg): Ditto.
-	* libc/stdio/sprintf.c: Add documentation regarding new
-	format specifiers added in vfprintf.c.
-
-2003-11-05  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdlib/wcsrtombs.c (_wcsrtombs_r): Numerous fixes
-	to make code work as specified in standard.
-
-2003-10-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.in: Use absolute newlib basedir when forming
-	CC_FOR_NEWLIB include options.
-	* configure: Regenerated.
-
-2003-10-23  Artem B. Bityuckiy  <abitytsky@softminecorp.com>
-
-	* libc/string/wcsnlen.c: New file.
-	* libc/include/wchar.h: Add wcsnlen prototype.
-	* libc/string/Makefile.am: Add wcsnlen support.
-	* libc/string/Makefile.in: Regenerated.
-	* libc/string/wcstrings.tex: Add wcsnlen documentation.
-
-2003-10-22  Richard Sandiford  <rsandifo@redhat.com>
-
-	* libc/stdlib/exit.c (exit): Handle null _GLOBAL_REENT->_atexits.
-
-2003-10-20  Bob Wilson  <bob.wilson@acm.org>
-
-	* libc/locale/locale.c: Use double quotes in code.
-	* libc/locale/locale.tex: Likewise.
-	* libc/libc.texinfo: Hyphenate "floating-point".
-	* libc/machine/necv70/necv70.tex: Likewise.
-	* libc/stdio/sprintf.c: Likewise.
-	* libc/stdio/sscanf.c: Likewise.
-	* libc/stdlib/atof.c: Likewise.
-	* libc/stdlib/ldtoa.c: Fix comment typo.
-	* libc/stdlib/div.c: Use @ifnottex instead of @ifinfo.
-	* libc/stdlib/ldiv.c: Likewise.
-	* libm/common/s_expm1.c: Likewise.
-	* libm/common/s_ilogb.c: Hyphenate "floating-point".  Use "nonzero".
-	* libm/common/s_infinity: Hyphenate "double- and single-precision".
-	* libm/common/s_nan.c: Likewise.  Also correct the FUNCTION summary.
-	* libm/common/s_nextafter.c: Fix typo.  Hyphenate "double-precision"
-	and "floating-point".
-	* libm/common/s_scalbn.c: Correct the FUNCTION summary.
-	* libm/math/e_pow.c: Fix comment typo.
-	* libm/math/math.tex: Hyphenate "single-precision" and "floating-point".
-	* libm/math/s_asinh.c: Use @ifnottex instead of @ifinfo.
-	* libm/math/s_atan.c: Likewise.
-	* libm/math/s_frexp.c: Likewise.  Also use "nonzero".
-	* libm/math/s_isnan.c: Hyphenate "single-precision" and
-	"floating-point".  Use "nonzero".
-	* libm/math/s_ldexp.c: Use @ifnottex instead of @ifinfo.
-	* libm/math/w_acos.c: Likewise.
-	* libm/math/w_acosh.c: Likewise.
-	* libm/math/w_asin.c: Likewise.
-	* libm/math/w_atan2.c: Likewise.
-	* libm/math/w_atanh.c: Likewise.
-	* libm/math/w_cosh.c: Likewise.
-	* libm/math/w_exp.c: Likewise.
-	* libm/math/w_exp2.c: Likewise.  Add missing @end and missing @tex
-	version of 2^x in the description.
-	* libm/math/w_fmod.c: Use @ifnottex instead of @ifinfo.
-	* libm/math/w_gamma.c: Likewise.
-	* libm/math/w_hypot.c: Likewise.
-	* libm/math/w_j0.c: Likewise.
-	* libm/math/w_sinh.c: Likewise.
-	* libm/math/w_pow.c: Replace "exp1.0nt" with "exponent".
-	* libm/mathfp/mathfp.tex: Hyphenate "single-precision" and
-	"floating-point".
-	* libm/mathfp/e_acosh.c: Use @ifnottex instead of @ifinfo.
-	* libm/mathfp/e_atanh.c: Likewise.
-	* libm/mathfp/e_hypot.c: Likewise.
-	* libm/mathfp/er_lgamma.c: Likewise.
-	* libm/mathfp/s_acos.c: Likewise.
-	* libm/mathfp/s_asine.c: Likewise.
-	* libm/mathfp/s_asinh.c: Likewise.
-	* libm/mathfp/s_atan.c: Likewise.
-	* libm/mathfp/s_atan2.c: Likewise.
-	* libm/mathfp/s_atangent.c: Likewise.
-	* libm/mathfp/s_cosh.c: Likewise.
-	* libm/mathfp/s_exp.c: Likewise.
-	* libm/mathfp/s_fmod.c: Likewise.
-	* libm/mathfp/s_frexp.c: Likewise.  Also use "nonzero".
-	* libm/mathfp/s_isnan.c: Hyphenate "single-precision" and
-	"floating-point".  Use "nonzero".
-	* libm/math/s_pow.c: Replace "exp1.0nt" with "exponent".
-	* libm/mathfp/s_ldexp.c: Use @ifnottex instead of @ifinfo.
-	* libm/mathfp/s_sineh.c: Likewise.
-	* libm/mathfp/w_jn.c: Likewise.
-
-2003-10-15  Alexandre Oliva  <aoliva@redhat.com>
-
-	* Makefile.am: Add $(MAKE) comments to multido and multiclean
-	lines, to enable parallel make.
-	* Makefile.in: Rebuilt.
-
-2003-10-14  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/time/clock.c: Clarify documentation of return value when no
-	measurement is available.
-
-2003-09-29  Ian Lance Taylor  <ian@wasabisystems.com>
-
-	* libm/configure.in: Check libm_machine_dir, not machine_dir.
-	* libm/configure: Regenerate.
-	* libm/Makefile.in: Ditto.
-
-2003-09-29  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/machine/sh/strncpy.S: New file.
-	* libc/machine/sh/Makefile.am: Add entry & rule for new file.
-	* libc/machine/sh/Makefile.in: Regenerate.
-
-2003-09-11  James E Wilson  <wilson@specifixinc.com>
-
-	* MAINTAINERS: Update my e-mail address.
-
-2003-09-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/unistd.h: Declare function daemon for Cygwin.
-
-2003-09-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/machine/powerpc/fix64.h: Fix typo for _simdldcheck
-	prototype.
-	* libc/machine/powerpc/simdldtoa.c: Remove prototype for
-	_simdldcheck().  Also add unsigned cast for index variable in
-	for loop using sizeof operators.
-	* libc/machine/powerpc/strtoufix32.c: Remove unused variable.
-	* libc/machine/powerpc/strtosfix64.c: Fix call to _simdldcheck.
-	* libc/machine/powerpc/strtoufix64.c (_strtoufix64_r): Ditto
-	plus fix shift calculation for determining if there is a
-	carry from word2.
-
-2003-09-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/grp.h: Don't define setgrfile, group_from_gid and
-	setgroupent for Cygwin.
-
-2003-09-05  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdlib/exit.c (exit): Setting of struct _atexit ptr p
-	is different for _REENT_SMALL than when using regular reent
-	struct.
-
-2003-09-05  Ben Elliston  <bje@wasabisystems.com>
-
-	* libc/ctype/wctype.c (_DEFUN): Remove empty default case, as
-	modern versions of GCC issue a warning.
-
-	* libc/machine/xscale/memcmp.c (memcmp): Strip trailing whitespace
-	after continuation characters that induces a warning from modern
-	versions of GCC.
-
-2003-09-04  Ben Elliston  <bje@wasabisystems.com>
-
-	* libc/stdlib/mstats.c[_ELIX_LEVEL]: Fix guards.  #ifndef FOO ||
-	FOO >= 2 is invalid; use #if !defined (FOO) || FOO >= 2 instead.
-
-2003-09-02  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* libc/stdlib/atexit.c: Rename _REENT to _GLOBAL_REENT throughout.
-	* libc/stdlib/exit.c : Ditto.
-	* libc/stdlib/on_exit.c: Ditto.
-
-2003-08-27  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/reent.h: Define stat64 as __stat64 when
-	compiling newlib for Cygwin.
-
-2003-08-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/stat.h[__CYGWIN__]: Only define stat64 as
-	__stat64 when compiling newlib.
-
-2003-08-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdio.h: Allow the io64 function prototypes for
-	Cygwin when compiling newlib.
-	* libc/include/sys/stat.h[__CYGWIN__]: Define stat64 as __stat64
-	to expose the Cygwin struct __stat64 type.
-	* libc/stdio64/fseeko64.c: Use _fstat64_r and pass a struct stat64
-	pointer.
-	* libc/stdio64/tmpfile64.c(_tmpfile64_r): Call _fopen64_r.
-
-2003-08-23  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/stdio64/fseeko64.c (fseeko64_r): Rename second fseeko64_r
-	definition to fseeko64.
-
-2003-08-22  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/reent.h: Add _GLOBAL_REENT macro.
-	* libc/stdio: Globally remove/replace all references to fp->_data.
-	Replace with _REENT or _GLOBAL_REENT where appropriate.
-	* libc/stdio/asprintf.c: Ditto.
-	* libc/stdio/fclose.c: Ditto.
-	* libc/stdio/fvwrite.c: Ditto.
-	* libc/stdio/makebuf.c: Ditto.
-	* libc/stdio/refill.c: Ditto.
-	* libc/stdio/local.h: Ditto.
-	* libc/stdio/setvbuf.c: Ditto.
-	* libc/stdio/sscanf.c: Ditto.
-	* libc/stdio/stdio.c: Ditto.
-	* libc/stdio/ungetc.c: Ditto.
-	* libc/stdio/vfscanf.c: Ditto.
-	* libc/stdio/vsscanf.c: Ditto.
-	* libc/stdio/fopen.c: Ditto.  Also use _fseek_r in _fopen_r.
-	* libc/stdio/vasprintf.c: Ditto.  Also call _vfprintf_r directly.
-	* libc/stdio/vsnprintf.c: Ditto.
-	* libc/stdio/vsprintf.c: Ditto.
-	* libc/stdio/fcloseall.c(fcloseall): Use _GLOBAL_REENT macro
-	instead of _REENT to walk file list.
-	* libc/stdio/fflush.c: Ditto.
-	* libc/stdio/fgetpos.c: Add reentrant version and have regular
-	version call reentrant version with _REENT argument.
-	* libc/stdio/fsetpos.c: Ditto.
-	* libc/stdio/fseek.c: Ditto.
-	* libc/stdio/fseeko.c: Ditto.
-	* libc/stdio/ftell.c: Ditto.
-	* libc/stdio/ftello.c: Ditto.
-	* libc/stdio/freopen.c: Ditto.
-	* libc/stdio/findfp.c: Use _GLOBAL_REENT pointer when adding
-	new files to chain.  Also use _GLOBAL_REENT pointer for
-	cleaning up.
-	* libc/stdio/fiprintf.c: Reformatted to minimize duplicate code.
-	* libc/stdio/siprintf.c: Ditto.
-	* libc/stdio/iprintf.c: Ditto.
-	* libc/stdio/fprintf.c: Ditto.
-	* libc/stdio/printf.c: Ditto.
-	* libc/stdio/snprintf.c: Call _vfprintf_r directly.
-	* libc/stdio/sprintf.c: Ditto.
-	* libc/stdio/vprintf.c: Ditto.  Also add _REENT_ONLY check.
-	* libc/stdio/rewind.c: Call _fseek_r directly.
-	* libc/stdio/tmpfile.c: Call _fopen_r and _remove_r directly.
-	* libc/stdio/vfprintf.c (_VFPRINTF_R): Change _r routines to use
-	data pointer.
-	(get_arg): Add extra struct _reent pointer argument.
-	* libc/stdio64/fgetpos64.c: Add _r versions, remove any reference
-	to fp->_data.
-	* libc/stdio64/fopen64.c: Ditto.
-	* libc/stdio64/freopen64.c: Ditto.
-	* libc/stdio64/fsetpos64.c: Ditto.
-	* libc/stdio64/ftello64.c: Ditto.
-	* libc/stdio64/local64.h: Ditto.
-	* libc/stdio64/stdio64.c: Ditto.
-	* libc/stdio64/fseeko64.c: Ditto plus use _fstat_r instead of
-	_fstat64_r for the meantime.
-
-2003-08-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdlib/mallocr.c (mALLOc, rEALLOc, mEMEALIGn): Enhance
-	overflow detection.
-	
-2003-08-13  Aldy Hernandez  <aldyh@redhat.com>
-	
-	* libc/machine/powerpc/machine/stdlib.h: Wrap SPE functions in
-	extern "C".
-
-2003-08-13  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/math.h: Add prototypes for __signbitf and
-	__signbitd.
-
-2003-07-31  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/ctype/iswalpha.c: Fix calls to __jp2uc to pass the
-	correct type of conversion when dealing with EUCJP or SJIS.
-	* libc/ctype/iswblank.c: Ditto.
-	* libc/ctype/iswcntrl.c: Ditto.
-	* libc/ctype/iswprint.c: Ditto.
-	* libc/ctype/iswpunct.c: Ditto.
-	* libc/ctype/iswspace.c: Ditto.
-	* libc/ctype/towlower.c: Ditto.
-	* libc/ctype/towupper.c: Ditto.
-
-2003-07-31  Nick Clifton  <nickc@redhat.com>
-
-	* libc/sys/sysnecv850/crt0.S (_start): Allocate 4 slots on stack
-	before calling main, in case it saves its argument registers.
-        Remove reference to deleted v850ea port.
-        * configure.host: Remove reference to deleted v850ea port.
-        Do not use -mv850 when building for v850e target.  This
-	prevents the ctbp system register from being initialised.
-
-2003-07-29  Honda Hiroki  <hhonda@ipflex.com>
-
-	* libc/stdio/vfprintf.c: Set output size to 1 when
-	we have %f format with precision 0 and # flag not specified.
-
-2003-07-29  Alexandre Oliva  <aoliva@redhat.com>
-
-	* libc/machine/mn10300/setjmp.S: Never emit both .am33 and
-	.am33_2.
-
-2003-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/stdio64/fdopen64.c: Include sys/lock.h.
-
-2003-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.host: Find cygwin include directory, when appropriate.
-
-2003-07-24  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/stdio64/fdopen64.c: New file.
-	* libc/stdio64/Makefile.am (LIB_OBJS): Add fdopen64.o
-	* libc/stdio64/Makefile.in: Regenerate.
-	* libc/include/stdio.h (fdopen64): Define.
-	* libc/include/stdio.h (_fdopen64_r): Ditto.
-
-2003-07-10  Alexandre Oliva  <aoliva@redhat.com>
-
-	2000-04-27  Alexandre Oliva  <aoliva@cygnus.com>
-	* libc/include/machine/setjmp.h (_JBLEN, AM33/2.0): Set to 26.
-	* libc/machine/mn10300/setjmp.S (setjmp, longjmp): Save and
-	restore callee-saved FP registers.
-
-2003-07-10  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/include/sys/unistd.h (ftruncate, truncate): Also declare
-	for __sh__.
-	* libc/sys/sh/Makefile.am (lib_a_SOURCES): Add ftruncate.c and
-	truncate.c.
-	* libc/sys/sh/Makefile.in: Regenerate.
-	* libc/sys/sh/sys/syscall.h: (SYS_truncate, SYS_ftruncate): Define.
-	* libc/sys/sh/ftruncate.c: New file.
-	* libc/sys/sh/truncate.c: Likewise.
-
-2003-07-09  Alexandre Oliva  <aoliva@redhat.com>
-
-	* libc/include/math.h (nan, nanf): Update prototype to C99.
-	* libm/common/s_nan.c (nan): Likewise.
-	* libm/common/s_nanf.c (nanf, nan): Likewise.
-	* libc/sys/linux/cmath/math_private.h (nan, nanf): Likewise.
-
-2003-07-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdbool.h: Removed as this is defined by gcc.
-
-2003-07-03  Shaun Jackman  <sjackman@pathwayconnect.com>
-
-	* libc/include/stdbool.h: New header file defined by C99.
-
-2003-07-02  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/types.h (int8_t): Make signed.
-
-2003-07-02  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/include/mqueue.h: Add include of <sys/fcntl.h>.
-
-2003-06-27  Jose Goncalves  <jose.goncalves@inov.pt>
-
-	* libc/sys/linux/mq_open.c (mq_open): Only set created flag
-	on if we actually created the shared memory file exclusively.
-
-2003-06-27  Joe Vornehm  <joev@mitre.org>
-
-	* libm/common/s_fpclassify.c (__fpclassifyf): Fix
-	comparisons to account for unsigned internal value w.
-
-2003-06-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/mq_open.c (mq_open): Must allocate rdbuf and
-	wrbuf for a non-creating open.
-
-2003-06-24  Kazu Hirata  <kazu@cs.umass.edu>
-
-	* libc/machine/h8300/setarch.h: New.
-	* libc/machine/h8300/memcpy.S: Use it.
-	* libc/machine/h8300/memset.S: Likewise.
-	* libc/machine/h8300/reg_memcpy.S: Likewise.
-	* libc/machine/h8300/reg_memset.S: Likewise.
-	* libc/machine/h8300/setjmp.S: Likewise.
-	* libc/machine/h8300/strcmp.S: Likewise.
-
-2003-06-24  Richard Sandiford  <rsandifo@redhat.com>
-
-	* libc/sys/h8300hms/crt0.S (_start): Fix register sizes in call
-	to atexit().
-
-2003-06-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host (iq2000): Add tabs.
-
-2003-06-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/reent.h (_REENT_INIT_PTR): Fix macros
-	to handle latest on_exit change.
-	* libc/sys/linux/Makefile.am: Remove special compilation
-	for malloc.c and mcheck.c.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/mntent.c: Add definition of _LIBC flag
-	after including <features.h>.
-	* libc/sys/linux/mcheck.c: Ditto.
-	* libc/sys/linux/malloc.c: Ditto plus define _GNU_SOURCE
-	for <features.h>.
-	* libc/sys/linux/intl/Makefile.am: Remove -D_LIBC and
-	add -DNOT_IN_libc to C flags.
-	* libc/sys/linux/intl/Makefile.in: Regenerated.
-	* libc/sys/linux/intl/config.h: Add definition of _LIBC.
-	* libc/sys/linux/linuxthreads/semaphore.h: Include
-	<bits/pthreadtypes.h>.
-	* libc/sys/linux/sys/dirent.h: Define _LIBC and NOT_IN_libc after
-	including <features.h>.
-	* libc/sys/linux/sys/lock.h: Ditto.
-
-2003-06-11  Nick Clifton  <nickc@redhat.com>
-
-	* libc/reent/reent.c (reclaim_reent): Fix typo in code to free
-	_on_exit_args_ptr.
-
-2003-06-10  Stan Cox  <scox@redhat.com>
-            Anthony Green  <green@redhat.com>
-	
-	* configure.host: Add iq2000 support.
-	* newlib/libc/include/machine/ieeefp.h: Ditto.
-	* newlib/libc/include/machine/setjmp.h: Ditto.
-	* libc/machine/iq2000, libc/machine/iq2000/setjmp.S,
-	libc/machine/iq2000/aclocal.m4, libc/machine/iq2000/configure,
-	libc/machine/iq2000/configure.in, libc/machine/iq2000/Makefile.am,
-	libc/machine/iq2000/Makefile.in: New files.
-
-2003-06-10  Richard Sandiford  <rsandifo@redhat.com>
-
-	* libc/sys/h8300hms/setarch.h: New file.
-	* libc/sys/h8300hms/close.S, libc/sys/h8300hms/fstat.S,
-	libc/sys/h8300hms/lseek.S, libc/sys/h8300hms/open.S,
-	libc/sys/h8300hms/read.S, libc/sys/h8300hms/stat.S,
-	libc/sys/h8300hms/write.S, libc/sys/h8300hms/crt0.S: Use it.
-
-2003-06-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/argz/argz_add.c: Change to use _DEFUN macro for function
-        definition.
-        * libc/argz/argz_add_sep.c: Ditto.
-        * libc/argz/argz_append.c libc/argz/argz_count.c: Ditto.
-        * libc/argz/argz_create.c libc/argz/argz_create_sep.c: Ditto.
-        * libc/argz/argz_delete.c libc/argz/argz_extract.c: Ditto.
-        * libc/argz/argz_insert.c libc/argz/argz_next.c: Ditto.
-        * libc/argz/argz_replace.c libc/argz/argz_stringify.c: Ditto.
-        * libc/argz/envz_add.c libc/argz/envz_entry.c: Ditto.
-        * libc/argz/envz_get.c libc/argz/envz_merge.c: Ditto.
-        * libc/argz/envz_remove.c libc/argz/envz_strip.c: Ditto.
-        * libc/locale/nl_langinfo.c libc/misc/ffs.c: Ditto.
-        * libc/posix/closedir.c libc/posix/creat.c: Ditto.
-        * libc/posix/execl.c libc/posix/execle.c: Ditto.
-        * libc/posix/execlp.c libc/posix/execve.c: Ditto.
-        * libc/posix/isatty.c libc/posix/opendir.c: Ditto.
-        * libc/posix/popen.c libc/posix/readdir.c: Ditto.
-        * libc/posix/readdir_r.c libc/posix/rewinddir.c: Ditto.
-        * libc/posix/scandir.c libc/posix/seekdir.c: Ditto.
-        * libc/posix/telldir.c libc/search/hcreate.c: Ditto.
-        * libc/search/tdelete.c libc/search/tdestroy.c: Ditto.
-        * libc/search/tfind.c libc/search/tsearch.c: Ditto.
-        * libc/search/twalk.c libc/signal/signal.c: Ditto.
-
-2003-06-05  Nick Clifton  <nickc@redhat.com>
-	
-	* libc/include/sys/reent.h (struct _on_exit_args): New
-	structure containing fields used by the on_exit() function.
-        (struct _atexit): Include struct _on_exit_args.  For
-	_REENT_SMALL do his via a pointer that is initialised when
-	needed.
-        * libc/reent/reent.c (_reclaim_reent): Free the _on_exit_args
-	structure, if one has been allocated.
-        * libc/stdlib/atexit.c (atexit): Update indirection to
-	_fntypes field.
-        * libc/stdlib/on_exit.c (on_exit): Indirect via the
-	_on_exit_args structure.  For _REENT_SMALL, allocate a
-	structure if one does not exist.
-        * libc/stdlib/exit.c (exit): Indirect via the _on_exit_args
-	structure.
-
-2003-06-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/net/Makefile.am: Remove extraneous markers.
-	* libc/sys/linux/net/Makefile.in: Regenerated.
-
-2003-06-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/reent/execr.c: Use _DEFUN macro for function declaration.
-	* libc/reent/fcntlr.c: Ditto.
-	* libc/reent/fstat64r.c: Ditto.
-	* libc/reent/linkr.c: Ditto.
-	* libc/reent/lseek64r.c: Ditto.
-	* libc/reent/lseekr.c: Ditto.
-	* libc/reent/openr.c: Ditto.
-	* libc/reent/readr.c: Ditto.
-	* libc/reent/reent.c: Ditto.
-	* libc/reent/sbrkr.c: Ditto.
-	* libc/reent/signalr.c: Ditto.
-	* libc/reent/signgam.c: Ditto.
-	* libc/reent/statr.c: Ditto.
-	* libc/reent/timer.c: Ditto.
-	* libc/reent/unlinkr.c: Ditto.
-	* libc/reent/writer.c: Ditto.
-	* libc/syscalls/sysclose.c: Ditto.
-	* libc/syscalls/sysexecve.c: Ditto.
-	* libc/syscalls/sysfcntl.c: Ditto.
-	* libc/syscalls/sysfork.c: Ditto.
-	* libc/syscalls/sysfstat.c: Ditto.
-	* libc/syscalls/sysgetpid.c: Ditto.
-	* libc/syscalls/sysgettod.c: Ditto.
-	* libc/syscalls/syskill.c: Ditto.
-	* libc/syscalls/syslink.c: Ditto.
-	* libc/syscalls/syslseek.c: Ditto.
-	* libc/syscalls/sysopen.c: Ditto.
-	* libc/syscalls/sysread.c: Ditto.
-	* libc/syscalls/syssbrk.c: Ditto.
-	* libc/syscalls/sysstat.c: Ditto.
-	* libc/syscalls/systimes.c: Ditto.
-	* libc/syscalls/sysunlink.c: Ditto.
-	* libc/syscalls/syswait.c: Ditto.
-	* libc/syscalls/syswrite.c: Ditto.
-
-2003-06-03  Till Straumann  <strauman@SLAC.Stanford.EDU>
-
-	* libc/time/tzset_r.c: Change local variables that are
-	set via sscanf using the %h format specifier to be unsigned short
-	instead of int.
-
-2003-05-30  Kelley Cook  <kelleycook@wideopenwest.com>
-
-	* configure.host:  Allow i[34567]86 variant.
-	* configure.in: Likewise.
-	* README: Likewise to the docs.
-	* configure: Regenerated.
-	* Makefile.in: Ditto.
-
-2003-05-28  Jeff Johnston  <jjohnstn@redhat.com>
-	    Tom Fitzsimmons  <fitzsim@redhat.com>
-
-	* configure.in: Add iconvdata support for x86 linux.
-	* configure: Regenerated.
-	* libc/sys/linux/Makefile.am: Add EL/IX level 3 network, dynamic 
-	library, iconv, and linuxthreads support.
-	* libc/sys/linux/configure.in: Ditto.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/configure: Ditto.
-	* iconvdata/EUC-JP.irreversible: New file.
-	* iconvdata/Makefile.am: Ditto.
-	* iconvdata/Makefile.in: Ditto.
-	* iconvdata/SJIS.irreversible: Ditto.
-	* iconvdata/aclocal.m4: Ditto.
-	* iconvdata/configure: Ditto.
-	* iconvdata/configure.in: Ditto.
-	* iconvdata/dummy.c: Ditto.
-	* iconvdata/euc-jp.c: Ditto.
-	* iconvdata/gconv-modules: Ditto.
-	* iconvdata/jis0201.c: Ditto.
-	* iconvdata/jis0201.h: Ditto.
-	* iconvdata/jis0208.c: Ditto.
-	* iconvdata/jis0208.h: Ditto.
-	* iconvdata/jis0212.c: Ditto.
-	* iconvdata/jis0212.h: Ditto.
-	* iconvdata/sjis.c: Ditto.
-	* libc/include/errno.h: Protect definition of error_t.
-	* libc/sys/linux/gethostid.c: New file.
-	* libc/sys/linux/sethostid.c: Ditto.
-	* libc/sys/linux/dl/Makefile.am: Ditto.
-	* libc/sys/linux/dl/Makefile.in: Ditto.
-	* libc/sys/linux/dl/abi-tag.h: Ditto.
-	* libc/sys/linux/dl/atomicity.h: Ditto.
-	* libc/sys/linux/dl/dl-addr.c: Ditto.
-	* libc/sys/linux/dl/dl-cache.c: Ditto.
-	* libc/sys/linux/dl/dl-cache.h: Ditto.
-	* libc/sys/linux/dl/dl-close.c: Ditto.
-	* libc/sys/linux/dl/dl-debug.c: Ditto.
-	* libc/sys/linux/dl/dl-deps.c: Ditto.
-	* libc/sys/linux/dl/dl-dst.h: Ditto.
-	* libc/sys/linux/dl/dl-error.c: Ditto.
-	* libc/sys/linux/dl/dl-fini.c: Ditto.
-	* libc/sys/linux/dl/dl-init.c: Ditto.
-	* libc/sys/linux/dl/dl-iteratephdr.c: Ditto.
-	* libc/sys/linux/dl/dl-libc.c: Ditto.
-	* libc/sys/linux/dl/dl-librecon.h: Ditto.
-	* libc/sys/linux/dl/dl-load.c: Ditto.
-	* libc/sys/linux/dl/dl-lookup.c: Ditto.
-	* libc/sys/linux/dl/dl-lookupcfg.h: Ditto.
-	* libc/sys/linux/dl/dl-minimal.c: Ditto.
-	* libc/sys/linux/dl/dl-misc.c: Ditto.
-	* libc/sys/linux/dl/dl-object.c: Ditto.
-	* libc/sys/linux/dl/dl-open.c: Ditto.
-	* libc/sys/linux/dl/dl-osinfo.h: Ditto.
-	* libc/sys/linux/dl/dl-profile.c: Ditto.
-	* libc/sys/linux/dl/dl-profstub.c: Ditto.
-	* libc/sys/linux/dl/dl-reloc.c: Ditto.
-	* libc/sys/linux/dl/dl-runtime.c: Ditto.
-	* libc/sys/linux/dl/dl-support.c: Ditto.
-	* libc/sys/linux/dl/dl-sym.c: Ditto.
-	* libc/sys/linux/dl/dl-version.c: Ditto.
-	* libc/sys/linux/dl/dlfcn.h: Ditto.
-	* libc/sys/linux/dl/do-lookup.h: Ditto.
-	* libc/sys/linux/dl/do-rel.h: Ditto.
-	* libc/sys/linux/dl/dynamic-link.h: Ditto.
-	* libc/sys/linux/dl/kernel-features.h: Ditto.
-	* libc/sys/linux/dl/ldsodefs.h: Ditto.
-	* libc/sys/linux/dl/libintl.h: Ditto.
-	* libc/sys/linux/dl/trusted-dirs.h: Ditto.
-	* libc/sys/linux/dl/unsecvars.h: Ditto.
-	* libc/sys/linux/iconv/Makefile.am: Ditto.
-	* libc/sys/linux/iconv/Makefile.in: Ditto.
-	* libc/sys/linux/iconv/categories.def: Ditto.
-	* libc/sys/linux/iconv/dummy-repertoire.c: Ditto.
-	* libc/sys/linux/iconv/gconv.c: Ditto.
-	* libc/sys/linux/iconv/gconv_builtin.c: Ditto.
-	* libc/sys/linux/iconv/gconv_builtin.h: Ditto.
-	* libc/sys/linux/iconv/gconv_cache.c: Ditto.
-	* libc/sys/linux/iconv/gconv_charset.h: Ditto.
-	* libc/sys/linux/iconv/gconv_close.c: Ditto.
-	* libc/sys/linux/iconv/gconv_conf.c: Ditto.
-	* libc/sys/linux/iconv/gconv_db.c: Ditto.
-	* libc/sys/linux/iconv/gconv_dl.c: Ditto.
-	* libc/sys/linux/iconv/gconv_int.h: Ditto.
-	* libc/sys/linux/iconv/gconv_open.c: Ditto.
-	* libc/sys/linux/iconv/gconv_simple.c: Ditto.
-	* libc/sys/linux/iconv/gconv_trans.c: Ditto.
-	* libc/sys/linux/iconv/hash-string.h: Ditto.
-	* libc/sys/linux/iconv/iconv.c: Ditto.
-	* libc/sys/linux/iconv/iconv.h: Ditto.
-	* libc/sys/linux/iconv/iconv_charmap.c: Ditto.
-	* libc/sys/linux/iconv/iconv_close.c: Ditto.
-	* libc/sys/linux/iconv/iconv_open.c: Ditto.
-	* libc/sys/linux/iconv/iconvconfig.c: Ditto.
-	* libc/sys/linux/iconv/iconvconfig.h: Ditto.
-	* libc/sys/linux/iconv/loadinfo.h: Ditto.
-	* libc/sys/linux/iconv/localeinfo.h: Ditto.
-	* libc/sys/linux/iconv/loop.c: Ditto.
-	* libc/sys/linux/iconv/skeleton.c: Ditto.
-	* libc/sys/linux/iconv/strtab.c: Ditto.
-	* libc/sys/linux/include/dl-hash.h: Ditto.
-	* libc/sys/linux/include/dlfcn.h: Ditto.
-	* libc/sys/linux/include/fnmatch.h: Ditto.
-	* libc/sys/linux/include/gconv.h: Ditto.
-	* libc/sys/linux/include/glob.h: Ditto.
-	* libc/sys/linux/include/hesiod.h: Ditto.
-	* libc/sys/linux/include/ifaddrs.h: Ditto.
-	* libc/sys/linux/include/libc_private.h: Ditto.
-	* libc/sys/linux/include/link.h: Ditto.
-	* libc/sys/linux/include/namespace.h: Ditto.
-	* libc/sys/linux/include/netconfig.h: Ditto.
-	* libc/sys/linux/include/netdb.h: Ditto.
-	* libc/sys/linux/include/nsswitch.h: Ditto.
-	* libc/sys/linux/include/regex.h: Ditto.
-	* libc/sys/linux/include/resolv.h: Ditto.
-	* libc/sys/linux/include/rune.h: Ditto.
-	* libc/sys/linux/include/runetype.h: Ditto.
-	* libc/sys/linux/include/semaphore.h: Ditto.
-	* libc/sys/linux/include/setlocale.h: Ditto.
-	* libc/sys/linux/include/un-namespace.h: Ditto.
-	* libc/sys/linux/include/wordexp.h: Ditto.
-	* libc/sys/linux/include/arpa/ftp.h: Ditto.
-	* libc/sys/linux/include/arpa/inet.h: Ditto.
-	* libc/sys/linux/include/arpa/nameser.h: Ditto.
-	* libc/sys/linux/include/arpa/nameser_compat.h: Ditto.
-	* libc/sys/linux/include/arpa/telnet.h: Ditto.
-	* libc/sys/linux/include/arpa/tftp.h: Ditto.
-	* libc/sys/linux/include/net/bpf.h: Ditto.
-	* libc/sys/linux/include/net/bpf_compat.h: Ditto.
-	* libc/sys/linux/include/net/bpfdesc.h: Ditto.
-	* libc/sys/linux/include/net/bridge.h: Ditto.
-	* libc/sys/linux/include/net/ethernet.h: Ditto.
-	* libc/sys/linux/include/net/fddi.h: Ditto.
-	* libc/sys/linux/include/net/if.h: Ditto.
-	* libc/sys/linux/include/net/if_arc.h: Ditto.
-	* libc/sys/linux/include/net/if_arp.h: Ditto.
-	* libc/sys/linux/include/net/if_atm.h: Ditto.
-	* libc/sys/linux/include/net/if_dl.h: Ditto.
-	* libc/sys/linux/include/net/if_gif.h: Ditto.
-	* libc/sys/linux/include/net/if_ieee80211.h: Ditto.
-	* libc/sys/linux/include/net/if_llc.h: Ditto.
-	* libc/sys/linux/include/net/if_media.h: Ditto.
-	* libc/sys/linux/include/net/if_mib.h: Ditto.
-	* libc/sys/linux/include/net/if_ppp.h: Ditto.
-	* libc/sys/linux/include/net/if_pppvar.h: Ditto.
-	* libc/sys/linux/include/net/if_slvar.h: Ditto.
-	* libc/sys/linux/include/net/if_sppp.h: Ditto.
-	* libc/sys/linux/include/net/if_stf.h: Ditto.
-	* libc/sys/linux/include/net/if_tap.h: Ditto.
-	* libc/sys/linux/include/net/if_tapvar.h: Ditto.
-	* libc/sys/linux/include/net/if_tun.h: Ditto.
-	* libc/sys/linux/include/net/if_tunvar.h: Ditto.
-	* libc/sys/linux/include/net/if_types.h: Ditto.
-	* libc/sys/linux/include/net/if_var.h: Ditto.
-	* libc/sys/linux/include/net/if_vlan_var.h: Ditto.
-	* libc/sys/linux/include/net/intrq.h: Ditto.
-	* libc/sys/linux/include/net/iso88025.h: Ditto.
-	* libc/sys/linux/include/net/net_osdep.h: Ditto.
-	* libc/sys/linux/include/net/netisr.h: Ditto.
-	* libc/sys/linux/include/net/pfil.h: Ditto.
-	* libc/sys/linux/include/net/pfkeyv2.h: Ditto.
-	* libc/sys/linux/include/net/ppp_comp.h: Ditto.
-	* libc/sys/linux/include/net/ppp_defs.h: Ditto.
-	* libc/sys/linux/include/net/radix.h: Ditto.
-	* libc/sys/linux/include/net/raw_cb.h: Ditto.
-	* libc/sys/linux/include/net/route.h: Ditto.
-	* libc/sys/linux/include/net/slcompress.h: Ditto.
-	* libc/sys/linux/include/net/slip.h: Ditto.
-	* libc/sys/linux/include/net/zlib.h: Ditto.
-	* libc/sys/linux/include/netinet/icmp6.h: Ditto.
-	* libc/sys/linux/include/netinet/icmp_var.h: Ditto.
-	* libc/sys/linux/include/netinet/if_atm.h: Ditto.
-	* libc/sys/linux/include/netinet/if_ether.h: Ditto.
-	* libc/sys/linux/include/netinet/igmp.h: Ditto.
-	* libc/sys/linux/include/netinet/igmp_var.h: Ditto.
-	* libc/sys/linux/include/netinet/in.h: Ditto.
-	* libc/sys/linux/include/netinet/in_gif.h: Ditto.
-	* libc/sys/linux/include/netinet/in_pcb.h: Ditto.
-	* libc/sys/linux/include/netinet/in_systm.h: Ditto.
-	* libc/sys/linux/include/netinet/in_var.h: Ditto.
-	* libc/sys/linux/include/netinet/ip.h: Ditto.
-	* libc/sys/linux/include/netinet/ip6.h: Ditto.
-	* libc/sys/linux/include/netinet/ip_dummynet.h: Ditto.
-	* libc/sys/linux/include/netinet/ip_ecn.h: Ditto.
-	* libc/sys/linux/include/netinet/ip_encap.h: Ditto.
-	* libc/sys/linux/include/netinet/ip_flow.h: Ditto.
-	* libc/sys/linux/include/netinet/ip_fw.h: Ditto.
-	* libc/sys/linux/include/netinet/ip_icmp.h: Ditto.
-	* libc/sys/linux/include/netinet/ip_mroute.h: Ditto.
-	* libc/sys/linux/include/netinet/ip_var.h: Ditto.
-	* libc/sys/linux/include/netinet/ipprotosw.h: Ditto.
-	* libc/sys/linux/include/netinet/tcp.h: Ditto.
-	* libc/sys/linux/include/netinet/tcp_debug.h: Ditto.
-	* libc/sys/linux/include/netinet/tcp_fsm.h: Ditto.
-	* libc/sys/linux/include/netinet/tcp_seq.h: Ditto.
-	* libc/sys/linux/include/netinet/tcp_timer.h: Ditto.
-	* libc/sys/linux/include/netinet/tcp_var.h: Ditto.
-	* libc/sys/linux/include/netinet/tcpip.h: Ditto.
-	* libc/sys/linux/include/netinet/udp.h: Ditto.
-	* libc/sys/linux/include/netinet/udp_var.h: Ditto.
-	* libc/sys/linux/include/netinet6/ah.h: Ditto.
-	* libc/sys/linux/include/netinet6/ah6.h: Ditto.
-	* libc/sys/linux/include/netinet6/esp.h: Ditto.
-	* libc/sys/linux/include/netinet6/esp6.h: Ditto.
-	* libc/sys/linux/include/netinet6/esp_rijndael.h: Ditto.
-	* libc/sys/linux/include/netinet6/icmp6.h: Ditto.
-	* libc/sys/linux/include/netinet6/in6.h: Ditto.
-	* libc/sys/linux/include/netinet6/in6_gif.h: Ditto.
-	* libc/sys/linux/include/netinet6/in6_ifattach.h: Ditto.
-	* libc/sys/linux/include/netinet6/in6_pcb.h: Ditto.
-	* libc/sys/linux/include/netinet6/in6_prefix.h: Ditto.
-	* libc/sys/linux/include/netinet6/in6_var.h: Ditto.
-	* libc/sys/linux/include/netinet6/ip6.h: Ditto.
-	* libc/sys/linux/include/netinet6/ip6_ecn.h: Ditto.
-	* libc/sys/linux/include/netinet6/ip6_fw.h: Ditto.
-	* libc/sys/linux/include/netinet6/ip6_mroute.h: Ditto.
-	* libc/sys/linux/include/netinet6/ip6_var.h: Ditto.
-	* libc/sys/linux/include/netinet6/ip6protosw.h: Ditto.
-	* libc/sys/linux/include/netinet6/ipcomp.h: Ditto.
-	* libc/sys/linux/include/netinet6/ipcomp6.h: Ditto.
-	* libc/sys/linux/include/netinet6/ipsec.h: Ditto.
-	* libc/sys/linux/include/netinet6/ipsec6.h: Ditto.
-	* libc/sys/linux/include/netinet6/mld6_var.h: Ditto.
-	* libc/sys/linux/include/netinet6/nd6.h: Ditto.
-	* libc/sys/linux/include/netinet6/pim6.h: Ditto.
-	* libc/sys/linux/include/netinet6/pim6_var.h: Ditto.
-	* libc/sys/linux/include/netinet6/raw_ip6.h: Ditto.
-	* libc/sys/linux/include/netinet6/scope6_var.h: Ditto.
-	* libc/sys/linux/include/netinet6/tcp6_var.h: Ditto.
-	* libc/sys/linux/include/netinet6/udp6_var.h: Ditto.
-	* libc/sys/linux/include/netns/idp.h: Ditto.
-	* libc/sys/linux/include/netns/idp_var.h: Ditto.
-	* libc/sys/linux/include/netns/ns.h: Ditto.
-	* libc/sys/linux/include/netns/ns_error.h: Ditto.
-	* libc/sys/linux/include/netns/ns_if.h: Ditto.
-	* libc/sys/linux/include/netns/ns_pcb.h: Ditto.
-	* libc/sys/linux/include/netns/sp.h: Ditto.
-	* libc/sys/linux/include/netns/spidp.h: Ditto.
-	* libc/sys/linux/include/netns/spp_debug.h: Ditto.
-	* libc/sys/linux/include/netns/spp_timer.h: Ditto.
-	* libc/sys/linux/include/netns/spp_var.h: Ditto.
-	* libc/sys/linux/include/rpc/Makefile: Ditto.
-	* libc/sys/linux/include/rpc/auth.h: Ditto.
-	* libc/sys/linux/include/rpc/auth_des.h: Ditto.
-	* libc/sys/linux/include/rpc/auth_kerb.h: Ditto.
-	* libc/sys/linux/include/rpc/auth_unix.h: Ditto.
-	* libc/sys/linux/include/rpc/clnt.h: Ditto.
-	* libc/sys/linux/include/rpc/clnt_soc.h: Ditto.
-	* libc/sys/linux/include/rpc/clnt_stat.h: Ditto.
-	* libc/sys/linux/include/rpc/des.h: Ditto.
-	* libc/sys/linux/include/rpc/des_crypt.h: Ditto.
-	* libc/sys/linux/include/rpc/nettype.h: Ditto.
-	* libc/sys/linux/include/rpc/pmap_clnt.h: Ditto.
-	* libc/sys/linux/include/rpc/pmap_prot.h: Ditto.
-	* libc/sys/linux/include/rpc/pmap_rmt.h: Ditto.
-	* libc/sys/linux/include/rpc/raw.h: Ditto.
-	* libc/sys/linux/include/rpc/rpc.h: Ditto.
-	* libc/sys/linux/include/rpc/rpc_com.h: Ditto.
-	* libc/sys/linux/include/rpc/rpc_msg.h: Ditto.
-	* libc/sys/linux/include/rpc/rpcb_clnt.h: Ditto.
-	* libc/sys/linux/include/rpc/rpcb_prot.h: Ditto.
-	* libc/sys/linux/include/rpc/rpcb_prot.x: Ditto.
-	* libc/sys/linux/include/rpc/rpcent.h: Ditto.
-	* libc/sys/linux/include/rpc/svc.h: Ditto.
-	* libc/sys/linux/include/rpc/svc_auth.h: Ditto.
-	* libc/sys/linux/include/rpc/svc_dg.h: Ditto.
-	* libc/sys/linux/include/rpc/svc_soc.h: Ditto.
-	* libc/sys/linux/include/rpc/types.h: Ditto.
-	* libc/sys/linux/include/rpc/xdr.h: Ditto.
-	* libc/sys/linux/intl/Makefile.am: Ditto.
-	* libc/sys/linux/intl/Makefile.in: Ditto.
-	* libc/sys/linux/intl/bindtextdom.c: Ditto.
-	* libc/sys/linux/intl/catgets.c: Ditto.
-	* libc/sys/linux/intl/catgetsinfo.h: Ditto.
-	* libc/sys/linux/intl/config.h: Ditto.
-	* libc/sys/linux/intl/dcgettext.c: Ditto.
-	* libc/sys/linux/intl/dcigettext.c: Ditto.
-	* libc/sys/linux/intl/dcngettext.c: Ditto.
-	* libc/sys/linux/intl/dgettext.c: Ditto.
-	* libc/sys/linux/intl/dngettext.c: Ditto.
-	* libc/sys/linux/intl/explodename.c: Ditto.
-	* libc/sys/linux/intl/finddomain.c: Ditto.
-	* libc/sys/linux/intl/gettext.c: Ditto.
-	* libc/sys/linux/intl/gettext.h: Ditto.
-	* libc/sys/linux/intl/gettextP.h: Ditto.
-	* libc/sys/linux/intl/hash-string.h: Ditto.
-	* libc/sys/linux/intl/l10nflist.c: Ditto.
-	* libc/sys/linux/intl/loadinfo.h: Ditto.
-	* libc/sys/linux/intl/loadmsgcat.c: Ditto.
-	* libc/sys/linux/intl/locale.alias: Ditto.
-	* libc/sys/linux/intl/localealias.c: Ditto.
-	* libc/sys/linux/intl/ngettext.c: Ditto.
-	* libc/sys/linux/intl/open_catalog.c: Ditto.
-	* libc/sys/linux/intl/plural.c: Ditto.
-	* libc/sys/linux/intl/plural.y: Ditto.
-	* libc/sys/linux/intl/stpcpy.c: Ditto.
-	* libc/sys/linux/intl/textdomain.c: Ditto.
-	* libc/sys/linux/linuxthreads/LICENSE: Ditto.
-	* libc/sys/linux/linuxthreads/Makefile.am: Ditto.
-	* libc/sys/linux/linuxthreads/Makefile.in: Ditto.
-	* libc/sys/linux/linuxthreads/aclocal.m4: Ditto.
-	* libc/sys/linux/linuxthreads/attr.c: Ditto.
-	* libc/sys/linux/linuxthreads/barrier.c: Ditto.
-	* libc/sys/linux/linuxthreads/bp-sym.h: Ditto.
-	* libc/sys/linux/linuxthreads/cancel.c: Ditto.
-	* libc/sys/linux/linuxthreads/condvar.c: Ditto.
-	* libc/sys/linux/linuxthreads/config.h: Ditto.
-	* libc/sys/linux/linuxthreads/configure: Ditto.
-	* libc/sys/linux/linuxthreads/configure.in: Ditto.
-	* libc/sys/linux/linuxthreads/defs.awk: Ditto.
-	* libc/sys/linux/linuxthreads/ecmutex.c: Ditto.
-	* libc/sys/linux/linuxthreads/events.c: Ditto.
-	* libc/sys/linux/linuxthreads/getcpuclockid.c: Ditto.
-	* libc/sys/linux/linuxthreads/getreent.c: Ditto.
-	* libc/sys/linux/linuxthreads/internals.h: Ditto.
-	* libc/sys/linux/linuxthreads/join.c: Ditto.
-	* libc/sys/linux/linuxthreads/joinrace.c: Ditto.
-	* libc/sys/linux/linuxthreads/kernel-features.h: Ditto.
-	* libc/sys/linux/linuxthreads/libc-internal.h: Ditto.
-	* libc/sys/linux/linuxthreads/libc-symbols.h: Ditto.
-	* libc/sys/linux/linuxthreads/linuxthreads.texi: Ditto.
-	* libc/sys/linux/linuxthreads/lockfile.c: Ditto.
-	* libc/sys/linux/linuxthreads/manager.c: Ditto.
-	* libc/sys/linux/linuxthreads/mq_notify.c: Ditto.
-	* libc/sys/linux/linuxthreads/mutex.c: Ditto.
-	* libc/sys/linux/linuxthreads/no-tsd.c: Ditto.
-	* libc/sys/linux/linuxthreads/oldsemaphore.c: Ditto.
-	* libc/sys/linux/linuxthreads/posix-timer.h: Ditto.
-	* libc/sys/linux/linuxthreads/prio.c: Ditto.
-	* libc/sys/linux/linuxthreads/proc_service.h: Ditto.
-	* libc/sys/linux/linuxthreads/pt-machine.c: Ditto.
-	* libc/sys/linux/linuxthreads/ptclock_gettime.c: Ditto.
-	* libc/sys/linux/linuxthreads/ptclock_settime.c: Ditto.
-	* libc/sys/linux/linuxthreads/ptfork.c: Ditto.
-	* libc/sys/linux/linuxthreads/pthread.c: Ditto.
-	* libc/sys/linux/linuxthreads/ptlongjmp.c: Ditto.
-	* libc/sys/linux/linuxthreads/queue.h: Ditto.
-	* libc/sys/linux/linuxthreads/reent.c: Ditto.
-	* libc/sys/linux/linuxthreads/reqsyscalls.c: Ditto.
-	* libc/sys/linux/linuxthreads/restart.h: Ditto.
-	* libc/sys/linux/linuxthreads/rwlock.c: Ditto.
-	* libc/sys/linux/linuxthreads/semaphore.c: Ditto.
-	* libc/sys/linux/linuxthreads/semaphore.h: Ditto.
-	* libc/sys/linux/linuxthreads/shlib-compat.h: Ditto.
-	* libc/sys/linux/linuxthreads/signals.c: Ditto.
-	* libc/sys/linux/linuxthreads/specific.c: Ditto.
-	* libc/sys/linux/linuxthreads/spinlock.c: Ditto.
-	* libc/sys/linux/linuxthreads/spinlock.h: Ditto.
-	* libc/sys/linux/linuxthreads/sysctl.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_init.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_log.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_symbol_list.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_clear_event.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_delete.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_enable_stats.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_event_addr.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_event_getmsg.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_get_nthreads.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_get_ph.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_get_stats.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_map_id2thr.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_map_lwp2thr.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_new.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_reset_stats.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_set_event.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_setconcurrency.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_thr_iter.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_ta_tsd_iter.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_clear_event.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_dbresume.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_dbsuspend.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_event_enable.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_event_getmsg.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_get_info.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_getfpregs.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_getgregs.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_getxregs.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_getxregsize.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_set_event.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_setfpregs.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_setgregs.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_setprio.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_setsigpending.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_setxregs.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_sigsetmask.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_tsd.c: Ditto.
-	* libc/sys/linux/linuxthreads/td_thr_validate.c: Ditto.
-	* libc/sys/linux/linuxthreads/testrtsig.h: Ditto.
-	* libc/sys/linux/linuxthreads/thread_db.h: Ditto.
-	* libc/sys/linux/linuxthreads/thread_dbP.h: Ditto.
-	* libc/sys/linux/linuxthreads/timer_create.c: Ditto.
-	* libc/sys/linux/linuxthreads/timer_delete.c: Ditto.
-	* libc/sys/linux/linuxthreads/timer_getoverr.c: Ditto.
-	* libc/sys/linux/linuxthreads/timer_gettime.c: Ditto.
-	* libc/sys/linux/linuxthreads/timer_routines.c: Ditto.
-	* libc/sys/linux/linuxthreads/timer_settime.c: Ditto.
-	* libc/sys/linux/linuxthreads/tst-cancel.c: Ditto.
-	* libc/sys/linux/linuxthreads/tst-context.c: Ditto.
-	* libc/sys/linux/linuxthreads/tststack.c: Ditto.
-	* libc/sys/linux/linuxthreads/unload.c: Ditto.
-	* libc/sys/linux/linuxthreads/weaks.c: Ditto.
-	* libc/sys/linux/linuxthreads/wrapsyscall.c: Ditto.
-	* libc/sys/linux/linuxthreads/bits/initspin.h: Ditto.
-	* libc/sys/linux/linuxthreads/bits/libc-lock.h: Ditto.
-	* libc/sys/linux/linuxthreads/bits/libc-tsd.h: Ditto.
-	* libc/sys/linux/linuxthreads/bits/local_lim.h: Ditto.
-	* libc/sys/linux/linuxthreads/bits/posix_opt.h: Ditto.
-	* libc/sys/linux/linuxthreads/bits/pthreadtypes.h: Ditto.
-	* libc/sys/linux/linuxthreads/bits/sigthread.h: Ditto.
-	* libc/sys/linux/linuxthreads/machine/Makefile.am: Ditto.
-	* libc/sys/linux/linuxthreads/machine/Makefile.in: Ditto.
-	* libc/sys/linux/linuxthreads/machine/aclocal.m4: Ditto.
-	* libc/sys/linux/linuxthreads/machine/configure: Ditto.
-	* libc/sys/linux/linuxthreads/machine/configure.in: Ditto.
-	* libc/sys/linux/linuxthreads/machine/generic/generic-sysd: Ditto.ep.h
-	* libc/sys/linux/linuxthreads/machine/i386/Makefile.am: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/Makefile.in: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/aclocal.m4: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/bp-asm.h: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/clone.S: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/configure: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/configure.in: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/i386-sysdep.S: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/i386-sysdep.h: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/pspinlock.c: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/pt-machine.h: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/sigcontextinfo.h: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/stackinfo.h: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/sysdep.S: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/sysdep.h: Ditto.
-	* libc/sys/linux/linuxthreads/machine/i386/useldt.h: Ditto.
-	* libc/sys/linux/machine/i386/dl-machine.h: Ditto.
-	* libc/sys/linux/net/Makefile.am: Ditto.
-	* libc/sys/linux/net/Makefile.in: Ditto.
-	* libc/sys/linux/net/addr2ascii.3: Ditto.
-	* libc/sys/linux/net/addr2ascii.c: Ditto.
-	* libc/sys/linux/net/ascii2addr.c: Ditto.
-	* libc/sys/linux/net/base64.c: Ditto.
-	* libc/sys/linux/net/bindresvport.c: Ditto.
-	* libc/sys/linux/net/byteorder.3: Ditto.
-	* libc/sys/linux/net/ether_addr.c: Ditto.
-	* libc/sys/linux/net/ethers.3: Ditto.
-	* libc/sys/linux/net/getaddrinfo.3: Ditto.
-	* libc/sys/linux/net/getaddrinfo.c: Ditto.
-	* libc/sys/linux/net/gethostbydns.c: Ditto.
-	* libc/sys/linux/net/gethostbyht.c: Ditto.
-	* libc/sys/linux/net/gethostbyname.3: Ditto.
-	* libc/sys/linux/net/gethostbynis.c: Ditto.
-	* libc/sys/linux/net/gethostnamadr.c: Ditto.
-	* libc/sys/linux/net/getifaddrs.3: Ditto.
-	* libc/sys/linux/net/getifaddrs.c: Ditto.
-	* libc/sys/linux/net/getipnodebyname.3: Ditto.
-	* libc/sys/linux/net/getnameinfo.3: Ditto.
-	* libc/sys/linux/net/getnameinfo.c: Ditto.
-	* libc/sys/linux/net/getnetbydns.c: Ditto.
-	* libc/sys/linux/net/getnetbyht.c: Ditto.
-	* libc/sys/linux/net/getnetbynis.c: Ditto.
-	* libc/sys/linux/net/getnetent.3: Ditto.
-	* libc/sys/linux/net/getnetnamadr.c: Ditto.
-	* libc/sys/linux/net/getproto.c: Ditto.
-	* libc/sys/linux/net/getprotoent.3: Ditto.
-	* libc/sys/linux/net/getprotoent.c: Ditto.
-	* libc/sys/linux/net/getprotoname.c: Ditto.
-	* libc/sys/linux/net/getservbyname.c: Ditto.
-	* libc/sys/linux/net/getservbyport.c: Ditto.
-	* libc/sys/linux/net/getservent.3: Ditto.
-	* libc/sys/linux/net/getservent.c: Ditto.
-	* libc/sys/linux/net/herror.c: Ditto.
-	* libc/sys/linux/net/hesiod.3: Ditto.
-	* libc/sys/linux/net/hesiod.c: Ditto.
-	* libc/sys/linux/net/if_indextoname.3: Ditto.
-	* libc/sys/linux/net/ifname.c: Ditto.
-	* libc/sys/linux/net/inet.3: Ditto.
-	* libc/sys/linux/net/inet6_option_s: Ditto.pace.3
-	* libc/sys/linux/net/inet6_rthdr_space.3: Ditto.
-	* libc/sys/linux/net/inet_addr.c: Ditto.
-	* libc/sys/linux/net/inet_lnaof.c: Ditto.
-	* libc/sys/linux/net/inet_makeaddr.c: Ditto.
-	* libc/sys/linux/net/inet_net.3: Ditto.
-	* libc/sys/linux/net/inet_net_ntop.c: Ditto.
-	* libc/sys/linux/net/inet_net_pton.c: Ditto.
-	* libc/sys/linux/net/inet_neta.c: Ditto.
-	* libc/sys/linux/net/inet_netof.c: Ditto.
-	* libc/sys/linux/net/inet_network.c: Ditto.
-	* libc/sys/linux/net/inet_ntoa.c: Ditto.
-	* libc/sys/linux/net/inet_ntop.c: Ditto.
-	* libc/sys/linux/net/inet_pton.c: Ditto.
-	* libc/sys/linux/net/innetgr-stub.c: Ditto.
-	* libc/sys/linux/net/ip6opt.c: Ditto.
-	* libc/sys/linux/net/iso_addr.3: Ditto.
-	* libc/sys/linux/net/iso_addr.c: Ditto.
-	* libc/sys/linux/net/issetugid-stub.c: Ditto.
-	* libc/sys/linux/net/linkaddr.3: Ditto.
-	* libc/sys/linux/net/linkaddr.c: Ditto.
-	* libc/sys/linux/net/map_v4v6.c: Ditto.
-	* libc/sys/linux/net/name6.c: Ditto.
-	* libc/sys/linux/net/namespace.h: Ditto.
-	* libc/sys/linux/net/ns.3: Ditto.
-	* libc/sys/linux/net/ns_addr.c: Ditto.
-	* libc/sys/linux/net/ns_name.c: Ditto.
-	* libc/sys/linux/net/ns_netint.c: Ditto.
-	* libc/sys/linux/net/ns_ntoa.c: Ditto.
-	* libc/sys/linux/net/ns_parse.c: Ditto.
-	* libc/sys/linux/net/ns_print.c: Ditto.
-	* libc/sys/linux/net/ns_ttl.c: Ditto.
-	* libc/sys/linux/net/nsap_addr.c: Ditto.
-	* libc/sys/linux/net/nsdispatch.3: Ditto.
-	* libc/sys/linux/net/nsdispatch.c: Ditto.
-	* libc/sys/linux/net/nslexer.c: Ditto.
-	* libc/sys/linux/net/nslexer.l: Ditto.
-	* libc/sys/linux/net/nsparser.c: Ditto.
-	* libc/sys/linux/net/nsparser.h: Ditto.
-	* libc/sys/linux/net/nsparser.y: Ditto.
-	* libc/sys/linux/net/rcmd.3: Ditto.
-	* libc/sys/linux/net/rcmd.c: Ditto.
-	* libc/sys/linux/net/rcmdsh.3: Ditto.
-	* libc/sys/linux/net/rcmdsh.c: Ditto.
-	* libc/sys/linux/net/recv.c: Ditto.
-	* libc/sys/linux/net/res_comp.c: Ditto.
-	* libc/sys/linux/net/res_config.h: Ditto.
-	* libc/sys/linux/net/res_data.c: Ditto.
-	* libc/sys/linux/net/res_debug.c: Ditto.
-	* libc/sys/linux/net/res_init.c: Ditto.
-	* libc/sys/linux/net/res_mkquery.c: Ditto.
-	* libc/sys/linux/net/res_mkupdate.c: Ditto.
-	* libc/sys/linux/net/res_query.c: Ditto.
-	* libc/sys/linux/net/res_send.c: Ditto.
-	* libc/sys/linux/net/res_update.c: Ditto.
-	* libc/sys/linux/net/resolver.3: Ditto.
-	* libc/sys/linux/net/rthdr.c: Ditto.
-	* libc/sys/linux/net/send.c: Ditto.
-	* libc/sys/linux/net/un-namespace.h: Ditto.
-	* libc/sys/linux/net/vars.c: Ditto.
-	* libc/sys/linux/stdlib/COPYRIGHT: Ditto.
-	* libc/sys/linux/stdlib/Makefile.am: Ditto.
-	* libc/sys/linux/stdlib/Makefile.in: Ditto.
-	* libc/sys/linux/stdlib/cclass.h: Ditto.
-	* libc/sys/linux/stdlib/cname.h: Ditto.
-	* libc/sys/linux/stdlib/collate.c: Ditto.
-	* libc/sys/linux/stdlib/collate.h: Ditto.
-	* libc/sys/linux/stdlib/collcmp.c: Ditto.
-	* libc/sys/linux/stdlib/engine.c: Ditto.
-	* libc/sys/linux/stdlib/fnmatch.3: Ditto.
-	* libc/sys/linux/stdlib/fnmatch.c: Ditto.
-	* libc/sys/linux/stdlib/glob.3: Ditto.
-	* libc/sys/linux/stdlib/glob.c: Ditto.
-	* libc/sys/linux/stdlib/reallocf.c: Ditto.
-	* libc/sys/linux/stdlib/regcomp.c: Ditto.
-	* libc/sys/linux/stdlib/regerror.c: Ditto.
-	* libc/sys/linux/stdlib/regex.3: Ditto.
-	* libc/sys/linux/stdlib/regex2.h: Ditto.
-	* libc/sys/linux/stdlib/regexec.c: Ditto.
-	* libc/sys/linux/stdlib/regfree.c: Ditto.
-	* libc/sys/linux/stdlib/utils.h: Ditto.
-	* libc/sys/linux/stdlib/wordexp.c: Ditto.
-	* libc/sys/linux/stdlib/wordfree.c: Ditto.
-	* libc/sys/linux/sys/dlfcn.h: Ditto.
-	* libc/sys/linux/sys/elfclass.h: Ditto.
-	* libc/sys/linux/sys/event.h: Ditto.
-	* libc/sys/linux/sys/ioccom.h: Ditto.
-	* libc/sys/linux/sys/libc-tsd.h: Ditto.
-	* libc/sys/linux/sys/link.h: Ditto.
-	* libc/sys/linux/sys/lock.h: Ditto.
-	* libc/sys/linux/sys/param.h: Ditto.
-	* libc/sys/linux/sys/socket.h: Ditto.
-	* libc/sys/linux/sys/sockio.h: Ditto.
-
-2003-05-28  Dhananjay Deshpande  <dhananjayd@kpitcummins.com> 
-
-	* newlib/libc/machine/h8300/memcpy.S: Use .h8300hn and .h8300sn for 
-	normal mode
-	* newlib/libc/machine/h8300/memset.S: Likewise
-	* newlib/lib/machine/h8300/reg_memcpy.S: Likewise
-	* newlib/lib/machine/h8300/reg_memset.S: Likewise
-	* newlib/lib/machine/h8300/setjmp.S: Likewise
-	* newlib/lib/machine/h8300/strcmp.S: Likewise
-	* newlib/lib/sys/h8300hms/crt0.S: Likewise
-
-2003-05-13  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/ctype/ctype_.c: Remove checks for deprecated __CYGWIN32__.
-	* libc/include/stdio.h: Ditto.
-	* libc/include/sys/config.h: Ditto.
-	* libc/stdio/mktemp.c: Ditto.
-
-2003-05-13  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/locale/ldpart.c (__part_load_locale): Substitute
-	__CYGWIN_USE_BIG_TYPES__ by __USE_INTERNAL_STAT64.
-	* libc/search/hash.c (__hash_open): Ditto.
-	(init_hash): Ditto.
-	* libc/stdio/fseek.c (fseek): Ditto.
-	* libc/stdio/makebuf.c (__smakebuf): Ditto.
-	* libc/stdio/mktemp.c (_gettemp): Ditto.
-
-2003-05-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/stdio.h: Change one __CYGWIN__ to __CYGWIN32__.
-
-2003-05-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* configure.host: Accomodate removing the libc/sys/cygwin dir.
-	* libc/locale/ldpart.c (__part_load_locale): Use 64 bit stat call
-	if __CYGWIN_USE_BIG_TYPES__ is set.
-	* libc/search/hash.c (__hash_open): Ditto.
-	(init_hash): Ditto.
-	* libc/stdio/fseek.c (fseek): Ditto.
-	* libc/stdio/makebuf.c (__smakebuf): Ditto.
-	* libc/stdio/mktemp.c (_gettemp): Ditto.
-	* libc/sys/cygwin/Makefile.am: Remove.
-	* libc/sys/cygwin/Makefile.in: Remove.
-	* libc/sys/cygwin/aclocal.m4: Remove.
-	* libc/sys/cygwin/configure: Remove.
-	* libc/sys/cygwin/configure.in: Remove.
-	* libc/sys/cygwin/crt0.c: Move to winsup/cygwin directory.
-	* libc/sys/cygwin/sys/dirent.h: Move to winsup/cygwin/include/sys
-	directory.
-	* libc/sys/cygwin/sys/param.h: Ditto.
-	* libc/sys/cygwin/sys/utime.h: Ditto.
-	* libc/sys/cygwin/sys/utmp.h: Ditto.
-
-2003-05-11  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/types.h: Don't define key_t for Cygwin.
-
-2003-05-10  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/sys/cygwin/sys/dirent.h (struct dirent): Accommodate (slightly)
-	64 bit inodes.
-
-2003-05-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/config.h: Remove all Cygwin specific configuration.
-	Include cygwin/config.h instead.
-
-2003-04-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* newlib/libc/machine/powerpc (ato*fix*.c,strto*fix*.c): Shield
-	all code with #ifdef __SPE__ test.
-	* newlib/libc/machine/powerpc (simdldtoa.c, ufix64toa.c): Ditto.
-
-2003-04-15  Chris January <chris@atomice.net>
-
-	* newlib/libc/include/sys/unistd.h: add declaration for gethostid on
-	Cygwin.
-
-2003-04-09  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/machine/sh/memset.S: Avoid clobbering volatile
-	objects following a tiny to-be-set array in the same quadword.
-
-2001-04-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/wchar.h: Add definitions for wcswidth and wcwidth.  
-	* libc/string/Makefile.am: Add wcswidth.c and wcwidth.c
-	* libc/string/Makefile.in: Regenerated.
-	* libc/string/wcswidth.c: New file.
-	* libc/string/wcwidth.c: New file.
-	* libc/string/wcstrings.tex: Add wcswidth and wcwidth.
-
-Thu Apr  3 14:01:16 2003  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/machine/sh/memset.S: Fix problem with alloco region
-	exceeding destination region for length >= 88 bytes, start
-	& 0x16 == 0, end & 0x1f == 18.
-
-2001-04-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/string/wcscoll.c: Fix comment.
-
-2001-04-02  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/wchar.h: Add definition for wcscoll.
-	* libc/string/Makefile.am: Add wcscoll.c.
-	* libc/string/Makefile.in: Regenerated.
-	* libc/string/wcscoll.c: New file.
-	* libc/string/wcstrings.tex: Add wcscoll.   
-
-2003-04-01  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/stdio/sscanf.c: Update flags description.
-	* libc/stdio/vfscanf.c: Add CHAR flag value to denote 8 bit target
-	type.
-	(__svfscanf_r): Add 'hh' and 'll' handling.
-
-2003-04-01  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/sys/cygwin/sys/dirent.h (struct DIR): Change type of
-	__d_position member to _off_t.
-
-2003-03-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/vfscanf.c (__svfscanf_r): For floating point conversion,
-	count all characters used to create number against maximum width.
-	* libc/machine/powerpc/vfscanf.c (__svfscanf_r): Ditto.
-
-2003-03-18  D.Venkatasubramanian  <dvenkat@noida.hcltech.com>
-
-	* libc/include/sys/h8300hms/crt0.S[__SIMULATOR__]: Add commandline
-	support.
-	* configure.host (h8300*-*-*): Added comment regarding -D__SIMULATOR__
-	flag to support simulator only extensions.
-
-2003-03-17  Bob Cassels  <bcassels@abinitio.com>
-
-        * libc/string/wcschr.c: (wcschr): Look for character first, 
-	then for end of string, so you can do wcschr(x, '\0').
-
-2003-03-10  Corinna Vinschen  <corinna@vinschen.de>     
-
-	* libc/include/stdio.h: Declare fgetpos, fsetpos, fseeko and ftello
-	with internal (_fpos_t and _off_t) datatypes when compiling newlib.
-	* libc/include/sys/unistd.h: Declare _lseek using _off_t.
-	* libc/reent/lseekr.c (_lseek_r): Use _off_t instead of off_t.
-	* libc/stdio/fseeko.c (fseeko): Ditto.
-	* libc/stdio/ftello.c (ftello): Ditto.
-	* libc/stdio/stdio.c (__swrite): Ditto.
-	(__sseek): Ditto.
-	* libc/stdio/fgetpos.c (fgetpos): Use _fpos_t instead of fpos_t.
-	* libc/stdio/fseek.c (fseek): Ditto.
-	* libc/stdio/fsetpos.c (fsetpos): Ditto.
-	* libc/stdio/ftell.c (ftell): Ditto.
-	* libc/stdio/local.h: Declare __sseek using _off_t.
-
-2003-03-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/reent/lseekr.c (lseek_r): Use _off_t instead of off_t.
-
-2003-03-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/config.h: Define __CYGWIN_USE_BIG_TYPES__ for
-	Cygwin.
-
-2003-03-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/pwd.h: Add guards to avoid type clashes when compiling
-	Cygwin.
-	* libc/include/sys/stat.h: Ditto.
-	* libc/include/sys/unistd.h: Ditto.
-	* libc/sys/cygwin/sys/dirent.h: Ditto.
-
-2003-03-07  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/include/sys/unistd.h: Guard getopt.h call to force only
-	declaration of getopt and avoid getopt_long declaration.
-	* libc/sys/cygwin/include/unistd.h: Remove.
-
-2003-03-07  Corinna Vinschen  <corinna@vinschen.de>
-
-	* configure.host: Define stdio64_dir for Cygwin.
-	* libc/include/stdio.h: Change definition of fpos_t to fulfill
-	Cygwin 64bit file access requirements.
-	Drop definition of f*64() functions when compiled for Cygwin.
-	* libc/include/sys/config.h: Define __LARGE64_FILES for Cygwin.
-	* libc/reent/lseek64r.c: Use _off64_t instead of off64_t.
-	* libc/stdio64/local64.h: Use _fpos64_t instead of fpos64_t.
-
-2003-03-07   Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/reent.h: Remove extraneous _sig_func
-	declaration.
-
-2003-02-25   D.Venkatasubramanian <dvenkat@noida.hcltech.com>
-
-	* libc/sys/h8300hms/Makefile.am: Add support for new files.
-	* libc/sys/h8300hms/Makefile.in: Regenerated.
-	* libc/sys/h8300hms/close.S: New file.
-	* libc/sys/h8300hms/fstat.S: Ditto.
-	* libc/sys/h8300hms/lseek.S: Ditto.
-	* libc/sys/h8300hms/open.S: Ditto.
-	* libc/sys/h8300hms/stat.S: Ditto.
-	* libc/sys/h8300hms/read.S: New file to replace read.c.
-	* libc/sys/h8300hms/read.c: Removed.
-	* libc/sys/h8300hms/syscalls.c: Removed functions _open,
-	_lseek, _close, _stat, _fstat.
-	* libc/sys/h8300hms/write.S: New file to replace write.c.
-	* libc/sys/h8300hms/write.c: Removed.
-
-2003-02-20  Nick Clifton  <nickc@redhat.com>
-
-	* Add support for Cirrus Maverick ARM co-processor:
-	
-	2000-09-13  Aldy Hernandez  <aldyh@redhat.com>
-
-		* libc/include/machine/ieeefp.h: Set IEEE_BIG_ENDIAN or
-		IEEE_LITTLE_ENDIAN depending on endian mode (cirrus).
-
-	2000-08-11  Aldy Hernandez  <aldyh@redhat.com>
-
-		* configure.host: set sys_dir, syscall_dir, and
-		newlib_cflags for ep9312 host.
-
-        * configure.host: Restore alpha sorting of entries in case
-	statements.
-
-2003-02-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/stdlib/mallocr.c (unlink): Revert 02/18 fix.
-
-2003-02-18  Christian Groessler  <chris@groessler.org>
-
-	* libc/machine/z8k/setjmp.S (_setjmp / _longjmp): Fix to
-	support z8001 segmented mode.
-
-2003-02-18  Earnie Boyd  <earnie@users.sf.net>
-
-	* libc/stdlib/mallocr.c (unlink): Don't assign a value to a pointer
-	with a NULL value.
-
-2003-02-10  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/include/sys/types.h: Don't define __MS_types__ for Cygwin.
-	Don't define some types under cygwin.
-
-2003-02-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* acinclude.m4 (--disable-newlib-supplied-syscalls): New configuration 
-	option to allow disabling of syscalls being supplied in newlib.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* configure.host: Add support of new configuration option and add
-	-D__NO_SYSCALLS__ if newlib supplied syscalls are disabled.
-	* doc/aclocal.m4: Regenerated.
-	* doc/configure: Ditto.
-	* libc/*aclocal.m4: Ditto.
-	* libc/*configure: Ditto.
-	* libm/*aclocal.m4: Ditto.
-	* libm/*configure: Ditto.
-	* libc/sys/arm/Makefile.am: Don't build syscalls.o if new option
-	is disabled.
-	* libc/sys/arm/Makefile.in: Regenerated.
-
-2003-02-05  Jonathan Larmour  <jifl@eCosCentric.com>
-
-	* libc/stdio/vsprintf.c (vsprintf, _vsprintf_r): Set _file fd to
-	-1 to be sure it cannot later match a valid file fd causing
-	isatty() to return 1.
-	* libc/stdio/asprintf.c (asprintf, _asprintf_r): Ditto.
-	* libc/stdio/sprintf.c (sprintf, _sprintf_r): Ditto.
-	* libc/stdio/vasprintf.c (vasprintf, _vasprintf_r): Ditto.
-
-2003-02-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdlib/ldtoa.c (_ldtoa_r): Fix code to allocate the format
-	buffer based on the precision, after we have processed the input value 
-	in a local buffer and know its relative magnitude. 
-
-2003-01-31  Michael Snyder  <msnyder@redhat.com>
-
-	* libc/sys/h8300hms/_exit.c (_exit, __exit):  Slip a magic cookie
-	into registers r1 and r2, so that the simulator can distinguish
-	this trap from a breakpoint trap.  Copied from libgloss.
-
-2003-01-31  Michael Snyder  <msnyder@redhat.com>
-
-	* libc/sys/h8300hms/crt0.S (_start): Change local label
-	from .loop to .Loop, so that ld and gdb will ignore it.
-
-2003-01-29  Jason Tishler  <jason@tishler.net>
-
-	* libc/include/time.h: Declare nanosleep() under Cygwin.
-
-2003-01-24  Nick Clifton  <nickc@redhat.com>
-
-	* Add sh2e support:
-
-	2002-04-02  Alexandre Oliva  <aoliva@redhat.com>
-
-		* libc/machine/sh/asm.h: Added __SH2E__ next to __SH3E__.
-		* libc/machine/sh/setjmp.S: Likewise.
-		* libc/include/machine/ieeefp.h: Likewise.
-
-2003-01-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/unistd.h: Add setregid and setreuid declarations
-	for Cygwin.
-
-2003-01-21 Anita Kulkarni  <anitak@kpit.com>
-  
-	* libc/time/difftime.c : Typecast the result to double.
-
-2003-01-20  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/include/sys/unistd.h: Add rresvport declaration for cygwin.
-
-2003-01-18  Nick Clifton  <nickc@redhat.com>
-
-	* libc/include/machine/ieeefp.h : Define __IEEE_BIG_ENDIAN,
-	__SMALL_BITFIELDS and _DOUBLE_IS_32BITS for IP2K.
-
-2003-01-16  Joel Sherrill <joel@OARcorp.com>
-
-        * libc/sys/rtems/include/limits.h, libc/sys/rtems/sys/param.h,
-        libc/sys/rtems/sys/syslimits.h: Update to be in sync with what 
-        constants are defined in each file in the shared versions in
-        libc/include.
-        * libc/sys/rtems/crt0.c: Define extra symbols on SH and HP-PA to
-        autoconf can link programs.
-        * libc/include/machine/types.h: Explicitly specify signed on
-        intXX_t types to ensure they are signed.
-
-2003-01-14  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/time/strftime.c (strftime): Add '%h' and '%l, %k' GNU
-	extensions.
-
-2003-01-08  Richard Sandiford  <rsandifo@redhat.com>
-
-	* configure.host (mips64vr-elf, mips64vrel-elf): New config.
-
-2003-01-07  Charles Wilson  <cwilson@ece.gatech.edu>
-
-	* libc/stdio/sprintf.c: fix typo
-	* libc/stdio/vfprintf.c: fix typo
-
-2003-01-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: Support long double I/O for x86-linux.
-	* libc/stdlib/ldtoa.c (_ldtoa_r): Fix code to allocate a buffer
-	large enough to hold formatted result.
-	* libc/machine/powerpc/simdldtoa.c (_simdldtoa_r): Ditto.
-
-2003-01-06  Charles Wilson  <cwilson@ece.gatech.edu>
-
-	* Makefile.am: Add vasprintf.
-	* Makefile.in: Regenerated.
-
-2003-01-06  Charles Wilson  <cwilson@ece.gatech.edu>
-
-	* asprintf.c (_asprintf_r): insure both declarations
-	are the same.
-
-2002-12-28  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/include/sys/unistd.h: Under cygwin, just include getopt.h rather
-	than defining getopt directly.
-
-2002-12-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* NEWS: Update with 1.11.0 info.
-	* README: Ditto.
-	* acinclude.m4: Change version number to 1.11.0.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* doc/aclocal.m4: Ditto.
-	* doc/configure: Ditto.
-	* libc/*/aclocal.m4: Ditto.
-	* libc/*/configure: Ditto.
-	* libc/libc.texinfo: Ditto.
-	* libm/*/aclocal.m4: Ditto.
-	* libm/*/configure: Ditto.
-	* libm/libm.texinfo: Ditto.
-	* libc/sys/linux/shared.ld: Add VERS_1.11.
-
-2002-12-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/machine/i386/f_atan2.S: Change copyright from Cygnus
-	Solutions to Red Hat Inc.
-	* libc/machine/i386/f_atan2f.S: Ditto.
-	* libc/machine/i386/f_exp.c: Ditto.
-	* libc/machine/i386/f_expf.c: Ditto.
-	* libc/machine/i386/f_frexp.S: Ditto.
-	* libc/machine/i386/f_frexpf.S: Ditto.
-	* libc/machine/i386/f_ldexp.S: Ditto.
-	* libc/machine/i386/f_ldexpf.S: Ditto.
-	* libc/machine/i386/f_log.S: Ditto.
-	* libc/machine/i386/f_log10.S: Ditto.
-	* libc/machine/i386/f_log10f.S: Ditto.
-	* libc/machine/i386/f_logf.S: Ditto.
-	* libc/machine/i386/f_pow.c: Ditto.
-	* libc/machine/i386/f_powf.c: Ditto.
-	* libc/machine/i386/f_tan.S: Ditto.
-	* libc/machine/i386/f_tanf.S: Ditto.
-	* libc/machine/i386/memchr.S: Ditto.
-	* libc/machine/i386/memcmp.S: Ditto.
-	* libc/machine/i386/memcpy.S: Ditto.
-	* libc/machine/i386/memmove.S: Ditto.
-	* libc/machine/i386/memset.S: Ditto.
-	* libc/machine/i386/strchr.S: Ditto.
-	* libc/machine/i386/strlen.S: Ditto.
-	* libm/machine/i386/f_atan2.S: Ditto.
-	* libm/machine/i386/f_atan2f.S: Ditto.
-	* libm/machine/i386/f_exp.c: Ditto.
-	* libm/machine/i386/f_expf.c: Ditto.
-	* libm/machine/i386/f_frexp.S: Ditto.
-	* libm/machine/i386/f_frexpf.S: Ditto.
-	* libm/machine/i386/f_ldexp.S: Ditto.
-	* libm/machine/i386/f_ldexpf.S: Ditto.
-	* libm/machine/i386/f_log.S: Ditto.
-	* libm/machine/i386/f_log10.S: Ditto.
-	* libm/machine/i386/f_log10f.S: Ditto.
-	* libm/machine/i386/f_logf.S: Ditto.
-	* libm/machine/i386/f_pow.c: Ditto.
-	* libm/machine/i386/f_powf.c: Ditto.
-	* libm/machine/i386/f_tan.S: Ditto.
-	* libm/machine/i386/f_tanf.S: Ditto.
-
-2002-12-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdlib/environ.c: Update license to Red Hat.
-	* libc/machine/hppa/setjmp.S: Ditto.
-	* libm/test/Makefile.in: Ditto.
-
-2002-12-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: Remove references to go32.
-	* libc/sys/go32/*: Removed.
-
-2002-12-16  Kazu Hirata  <kazu@cs.umass.edu>
-
-	* libc/include/sys/config.h: Change setting of INT_MAX
-	and UINT_MAX, to use __INT_MAX__ for __H8300__, __H8300H__,
-	__H8300S__.  Also consolidate flag settings for these
-	platforms.
-
-2002-12-10  Joel Sherrill  <joel@OARcorp.com>
-
-	* libc/include/machine/setjmp.h: Make sure _JBLEN is defined
-	for i386-rtems targets.
-
-2002-12-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdlib.h (strtof): New prototype (from C99).
-	(strtodf): Changed from prototype to macro which redefines
-	to strtof.
-	* libc/stdlib/atof.c: Change documentation to refer to strtof
-	instead of strtodf.
-	* libc/stdlib/atoff.c (atoff): Change to call strtof instead of
-	strtodf.
-	* libc/stdlib/strtod.c (strtodf): Renamed to strtof.
-	(strtof): New function.
-	* libm/test/convert.c (test_strtodf): Renamed to test_strtof which
-	calls strtof.
-
-2002-11-27  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/string/memset.c (memset): Fix comment.
-
-2002-11-26  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/string/memset.c (memset): Move initialization of 'd' earlier in
-	function.
-
-2002-11-25  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/string/memset.c (memset): Minor optimization: Use new 'd'
-	variable, introduced below, everywhere.
-
-2002-11-25  Kazu Hirata  <kazu@cs.umass.edu>
-
-	* libc/string/memset.c (memset): Make it safe even if
-	sizeof (int) = 2.
-
-2002-11-22  Joe Buehler  <jbuehler@hekimian.com>
-
-	* configure.in: Change check for libc/include in ${CC} to
-	use an intermediate value so as to work with different shells.
-	* configure: Regenerated.
-	* Makefile.in: Ditto.
-
-2002-11-22  Vijay L. Khuspe  <vijayk1@kpit.com>
-
-	* libc/sys/h8300hms/read.c: Add support for normal mode
-	architecture.
-
-2002-11-20  Ryo Tsuruta  <ryo@kitanet.ne.jp>
-
-	* libc/machine/h8300/setjmp.S (setjmp, longjmp): Combine common
-	code for __H8300H__ and __H8300S__.  Also return 32-bit return code
-	when -mint32 is used.
-
-2002-11-18  Nick Clifton  <nickc@redhat.com>
-
-	* libc/sys/arm/crt0.S: Add NULL to end of argv array.
-
-2002-11-14  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * testsuite/lib/passfail.exp (newlib_pass_fail): Changed to
-        only issue one pass/fail message for a compile/link/execute.
-        * testsuite/newlib.elix/elix.exp: New file.
-        * testsuite/newlib.elix/tmmap.c: Ditto.
-
-2002-11-06  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/stdlib/malign.c: Don't compile if MALLOC_PROVIDED.
-	* libc/stdlib/mlock.c: Ditto.
-	* libc/stdlib/msize.c: Ditto.
-	* libc/stdlib/msize.c: Ditto.
-	* libc/stdlib/mtrim.c: Ditto.
-	* libc/stdlib/valloc.c: Ditto.
-
-2002-11-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/stdlib/ldtoa.c (e64toe): When checking the exponent
-        for inf/nan, make sure that the check ignores the sign bit.
-
-2002-11-07  Joel Sherrill <joel@OARcorp.com>
-
-        * libc/sys/rtems/machine: New directory.
-        * libc/sys/rtems/machine/limits.h, libc/sys/rtems/machine/param.h,
-        libc/sys/rtems/sys/param.h, libc/sys/rtems/sys/syslimits.h,
-        libc/sys/rtems/sys/utime.h: New files added to make *-rtems newlib
-        targets more BSD like when installed without requiring files to
-        be overwritten at install point when RTEMS itself is installed.
-        * Makefile.am: Pick up system dependent machine .h files such as
-        might be found on a BSD-ish system.
-        * Makefile.in: Regenerate.
-        * libc/include/machine/types.h: When on an RTEMS target, define a
-        few BSD flavor types. 
-
-2002-11-06  Sergey Okhapkin  <sos@prospect.com.ru>
-
-	* include/utmp.h: Define WTMP_FILE.  Define and use UT_IDLEN.
-
-2002-11-06  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-        * libc/include/wchar.h: Use _{BEGIN,END}_STD_C instead of extern "C".
-        * libc/include/wctype.h: Ditto.
-
-2002-11-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/wchar.h: Add extern "C" specifier if C++.
-        * libc/include/wctype.h: Ditto.
-
-2002-10-18  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * testsuite/newlib.wctype/tiswctype.c: New test case.
-        * testsuite/newlib.wctype/twctrans.c: Ditto.
-
-2002-10-18  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/machine/i386/include/endian.h: New file.
-        * libc/sys/linux/machine/i386/include/param.h: Ditto.
-
-2002-10-18  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libm/machine/i386/aclocal.m4: Regenerated.
-	* libm/machine/i386/configure: Ditto.
-
-2002-10-18  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * testsuite/include/check.h: New header file to use with
-        test cases.
-        * testsuite/lib/newlib.exp: Add testsuite/include directory
-        to list of header files to use.
-        * testsuite/newlib.wctype/twctype.c: New test case for iswctype fns.
-        * testsuite/newlib.wctype/wctype.exp: New file.
-
-2002-10-11  Graham Stott  <graham.stott@btinternet.com>
-	    Richard Sandiford  <rsandifo@redhat.com>
-
-	* libc/include/sys/config.h (SIZE_T_SMALLER_THAN_LONG): Undefine.
-	* libc/stdlib/mallocr.c (long_sub_size_t): Define in a way that
-	doesn't require the SIZE_T_SMALLER_THAN_LONG macro.
-
-2002-10-07	Joel Sherrill <joel@OARcorp.com>
-
-	* libc/sys/rtems/crt0.c: Add even more symbols so gcc() can link
-	dummy programs.
-
-2002-10-07	Joel Sherrill <joel@OARcorp.com>
-
-	* libc/include/pthread.h: Define PTHREAD_CANCELED.
-
-2002-10-07	Joel Sherrill <joel@OARcorp.com>
-
-	* libc/machine/hppa/DEFS.h, libc/machine/hppa/pcc_prefix.s,
-	libc/machine/hppa/setjmp.S, libc/machine/hppa/DEFS.h: Make this
-	compile with current GNU tools.
-
-2002-10-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* Makefile.am: Add EXTRA_DIRS to allow future dependencies on
-	the build library.
-	* configure.in: Ditto.
-	* Makefile.in: Regenerated.
-	* configure: Ditto.
-	* libc/sys/linux/Makefile.am: Add EXTRA_SUBDIRS and EXTRA_SUBLIBS
-	for specifying configured libraries/directories.
-	* libc/sys/linux/configure.in: Ditto.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/configure: Ditto.
-
-2002-10-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/reent.h: Update documentation at start of file.
-
-2002-09-27  Jim Wilson  <wilson@redhat.com>
-
-	* libc/sys/sysnecv850/crt0.S (start): Delete v850 code for initializing
-	the ctbp register.
-
-2002-09-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/ctype/jp2uc.c: Change to use multiple arrays in jp2uc.h.
-	Also convert to EUCJP before using arrays.  For values not in
-	the conversion arrays, return WEOF.
-	* libc/ctype/jp2uc.h: Change from one array to a number of
-	arrays to account for the fact that the originating table
-	is not contiguous for the input values since some are invalid.
-
-2002-09-24  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/time/ctime.c: Fix prototype documentation.
-
-2002-09-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/errno.h: Add EOVERFLOW.
-
-2002-09-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/wctype.h: New file.
-
-2002-09-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/ctype/Makefile.am: Add new files.
-        * libc/ctype/Makefile.in: Regenerated.
-        * libc/ctype/ctype.tex: Add new iswxxxx, towxxxx, wctype,
-        and wctrans functions to documentation index.
-        * libc/ctype/iswalnum.c: New file.
-        * libc/ctype/iswalpha.c: Ditto.
-        * libc/ctype/iswblank.c: Ditto.
-        * libc/ctype/iswcntrl.c: Ditto.
-        * libc/ctype/iswctype.c: Ditto.
-        * libc/ctype/iswdigit.c: Ditto.
-        * libc/ctype/iswgraph.c: Ditto.
-        * libc/ctype/iswlower.c: Ditto.
-        * libc/ctype/iswprint.c: Ditto.
-        * libc/ctype/iswpunct.c: Ditto.
-        * libc/ctype/iswspace.c: Ditto.
-        * libc/ctype/iswupper.c: Ditto.
-        * libc/ctype/iswxdigit.c: Ditto.
-        * libc/ctype/jp2uc.c: Ditto.
-        * libc/ctype/jp2uc.h: Ditto.
-        * libc/ctype/local.h: Ditto.
-        * libc/ctype/towctrans.c: Ditto.
-        * libc/ctype/towlower.c: Ditto.
-        * libc/ctype/towupper.c: Ditto.
-        * libc/ctype/utf8alpha.h: Ditto.
-        * libc/ctype/utf8print.h: Ditto.
-        * libc/ctype/utf8punct.h: Ditto.
-        * libc/ctype/wctrans.c: Ditto.
-        * libc/ctype/wctype.c: Ditto.
-        * libc/locale/locale.c (__lc_ctype): New external array to
-        replace static lc_ctype array.
-        * libc/stdlib/mbtowc_r.c: Use __lc_ctype to check current lc_ctype
-        rather than reentrancy structure's _current_locale field.
-        * libc/stdlib/wctomb_r.c: Ditto.
-
-2002-09-20  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: Minor comment and formatting changes.
-	* libc/Makefile.am: Add libc_la_DEPENDENCIES.
-	* libc/Makefile.in: Regenerated.
-	* libc/include/sys/config.h: Minor format change.
-
-2002-09-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/syscalls/sysfcntl.c (fcntl): Fix typo in preprocessor
-	statement comment.
-
-2002-09-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/posix/opendir.c (opendir): Change code to check
-	for HAVE_FCNTL before calling fcntl.
-	* libc/search/hash.c (hash_open): Ditto.
-	* libc/search/hash_page.c (open_tmp): Ditto.
-	* libc/reent/Makefile.am: Add fcntlr.c.
-	* libc/reent/Makefile.in: Regenerated.
-	* libc/reent/fcntlr.c: New file.
-	* libc/stdio/fdopen.c (_fdopen_r): Change to call _fcntl_r
-	instead of _fcntl when HAVE_FCNTL flag is set.
-	* libc/syscalls/sysfcntl.c (fcntl): Check for HAVE_FCNTL flag
-	to see if _fcntl or _fcntl_r should be called.  If flag is not
-	set, default to ENOSYS stub.
-
-2002-09-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/wchar.h (mbstate_t): Change protective flag to
-	be _MBSTATE_T.
-	* libc/include/sys/_types.h (_mbstate_t): Remove protective flag.
-	[__CYGWIN__]: Remove special code that defines mbstate_t and WEOF
-	for Cygwin.
-	* libc/sys/linux/sys/_types.h (_mbstate_t): Remove protective flag.
-
-2002-09-11  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * acinclude.m4 (enable-newlib-mb): Change check to
-        default newlib_mb variable to empty string rather than "no".
-        * configure.host: Remove hard-coding of -DMB_CAPABLE for
-        x86-linux and Cygwin.  Add code to check for newlib_mb
-        being unset in which case set to "yes" for x86-linux and
-        Cygwin.  Change check for newlib_mb being "yes" to allow
-        for an empty string.
-        * configure.in (_MB_LEN_MAX): New AC_DEFINE.
-        * newlib.hin (_MB_LEN_MAX): New define to configure.
-        * aclocal.m4: Regenerated.
-        * configure: Ditto.
-        * libc/include/limits.h: New file.
-        * libc/sys/linux/include/limits.h: Ditto.
-        * doc/aclocal.m4 doc/configure libc/aclocal.m4
-          libc/configure libc/include/%redact libc/machine/aclocal.m4
-          libc/machine/configure libc/machine/a29k/aclocal.m4
-          libc/machine/a29k/configure libc/machine/arm/aclocal.m4
-          libc/machine/arm/configure libc/machine/d10v/aclocal.m4
-          libc/machine/d10v/configure libc/machine/d30v/aclocal.m4
-          libc/machine/d30v/configure libc/machine/fr30/aclocal.m4
-          libc/machine/fr30/configure libc/machine/frv/aclocal.m4
-          libc/machine/frv/configure libc/machine/h8300/aclocal.m4
-          libc/machine/h8300/configure libc/machine/h8500/aclocal.m4
-          libc/machine/h8500/configure libc/machine/hppa/aclocal.m4
-          libc/machine/hppa/configure libc/machine/i386/aclocal.m4
-          libc/machine/i386/configure libc/machine/i960/aclocal.m4
-          libc/machine/i960/configure libc/machine/m32r/aclocal.m4
-          libc/machine/m32r/configure libc/machine/m68hc11/aclocal.m4
-          libc/machine/m68hc11/configure libc/machine/m68k/aclocal.m4
-          libc/machine/m68k/configure libc/machine/m88k/aclocal.m4
-          libc/machine/m88k/configure libc/machine/mips/aclocal.m4
-          libc/machine/mips/configure libc/machine/mn10200/aclocal.m4
-          libc/machine/mn10200/configure libc/machine/mn10300/aclocal.m4
-          libc/machine/mn10300/configure libc/machine/necv70/aclocal.m4
-          libc/machine/necv70/configure libc/machine/powerpc/aclocal.m4
-          libc/machine/powerpc/configure libc/machine/sh/aclocal.m4
-          libc/machine/sh/configure libc/machine/sparc/aclocal.m4
-          libc/machine/sparc/configure libc/machine/tic80/aclocal.m4
-          libc/machine/tic80/configure libc/machine/v850/aclocal.m4
-          libc/machine/v850/configure libc/machine/w65/aclocal.m4
-          libc/machine/w65/configure libc/machine/xscale/aclocal.m4
-          libc/machine/xscale/configure
-          libc/machine/xstormy16/aclocal.m4
-          libc/machine/xstormy16/configure libc/machine/z8k/aclocal.m4
-          libc/machine/z8k/configure libc/sys/aclocal.m4
-          libc/sys/configure libc/sys/a29khif/aclocal.m4
-          libc/sys/a29khif/configure libc/sys/arc/aclocal.m4
-          libc/sys/arc/configure libc/sys/arm/aclocal.m4
-          libc/sys/arm/configure libc/sys/cygwin/aclocal.m4
-          libc/sys/cygwin/configure libc/sys/d10v/aclocal.m4
-          libc/sys/d10v/configure libc/sys/decstation/aclocal.m4
-          libc/sys/decstation/configure libc/sys/go32/aclocal.m4
-          libc/sys/go32/configure libc/sys/h8300hms/aclocal.m4
-          libc/sys/h8300hms/configure libc/sys/h8500hms/aclocal.m4
-          libc/sys/h8500hms/configure libc/sys/idt/aclocal.m4
-          libc/sys/idt/configure libc/sys/linux/aclocal.m4
-          libc/sys/linux/configure libc/sys/linux/include/%redact
-          libc/sys/linux/machine/aclocal.m4
-          libc/sys/linux/machine/configure
-          libc/sys/linux/machine/i386/aclocal.m4
-          libc/sys/linux/machine/i386/configure
-          libc/sys/m88kbug/aclocal.m4 libc/sys/m88kbug/configure
-          libc/sys/mmixware/aclocal.m4 libc/sys/mmixware/configure
-          libc/sys/netware/aclocal.m4 libc/sys/netware/configure
-          libc/sys/rtems/aclocal.m4 libc/sys/rtems/configure
-          libc/sys/sh/aclocal.m4 libc/sys/sh/configure
-          libc/sys/sparc64/aclocal.m4 libc/sys/sparc64/configure
-          libc/sys/sun4/aclocal.m4 libc/sys/sun4/configure
-          libc/sys/sysmec/aclocal.m4 libc/sys/sysmec/configure
-          libc/sys/sysnec810/aclocal.m4 libc/sys/sysnec810/configure
-          libc/sys/sysnecv850/aclocal.m4 libc/sys/sysnecv850/configure
-          libc/sys/sysvi386/aclocal.m4 libc/sys/sysvi386/configure
-          libc/sys/sysvnecv70/aclocal.m4 libc/sys/sysvnecv70/configure
-          libc/sys/tic80/aclocal.m4 libc/sys/tic80/configure
-          libc/sys/w65/aclocal.m4 libc/sys/w65/configure
-          libc/sys/z8ksim/aclocal.m4 libc/sys/z8ksim/configure
-          libm/aclocal.m4 libm/configure: Regenerated.
-
-2002-09-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/machine/i386/crt0.c (_start): Remove
-        code that clears the .bss section.
-
-2002-09-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/sys/_types.h (_mbstate_t): Changed to use
-        unsigned char internally.
-        * libc/sys/linux/sys/_types.h: Ditto.
-        * libc/include/sys/reent.h
-        * libc/stdlib/mblen.c (mblen): Use function-specific state
-        value from default reentrancy structure.
-        * libc/stdlib/mblen_r.c (_mblen_r):  If return code from
-        _mbtowc_r is less than 0, reset state __count value and
-        return -1.
-        * libc/stdlib/mbrlen.c (mbrlen): If the input state pointer
-        is NULL, use the function-specific pointer provided in the
-        default reentrancy structure.
-        * libc/stdlib/mbrtowc.c: Add reentrant form of function.
-        If input state pointer is NULL, use function-specific area
-        provided in reentrancy structure.
-        * libc/stdlib/mbsrtowcs.c: Ditto.
-        * libc/stdlib/wcrtomb.c: Ditto.
-        * libc/stdlib/wcsrtombs.c: Ditto.
-        * libc/stdlib/mbstowcs.c: Reformat.
-        * libc/stdlib/wcstombs.c: Ditto.
-        * libc/stdlib/mbstowcs_r.c (_mbstowcs_r): If an error occurs,
-        reset the state's __count value and return -1.
-        * libc/stdlib/mbtowc.c: Ditto.
-        * libc/stdlib/mbtowc_r.c (_mbtowc_r): Add restartable functionality.
-        If number of bytes is used up before completing a valid multibyte
-        character, return -2 and save the state.
-        * libc/stdlib/wctomb_r.c (_wctomb_r): Define __state as __count
-        and change some __count references to __state for clarity.
-
-2002-09-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/config.h (MB_LEN_MAX): Removed as this
-	is defined by <limits.h>.
-
-2002-09-05  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* libc/include/wchar.h (WCHAR_MAX): Only define if not already
-	defined.
-
-2002-09-04  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-        * libc/include/sys/config.h: Define accordingly __WCHAR_MAX__.
-        * libc/include/wchar.h: Define WCHAR_MIN as 0 and WCHAR_MAX as
-        __WCHAR_MAX__ or 0x7fffffffu.
-        * libc/string/wcscmp.c: Delete wrong and unnecessary type cast.
-        * libc/string/wcsncmp.c: Ditto.
-
-2002-09-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/string/wcschr.c: Add include of <stddef.h>.
-	* libc/string/wcspbrk.c: Ditto.
-	* libc/string/wcsrchr.c: Ditto.
-	* libc/string/wcsstr.c: Ditto.
-
-2002-09-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/sys/_types.h (_flock_t): Added.
-        * libc/include/sys/lock.h (__lock_try_acquire): New interface.
-        (__lock_try_acquire_recursive): Ditto.
-        * libc/include/sys/reent.h (__sFILE, __sFILE64): Add new
-        _lock field.
-        * libc/stdio/findfp.c (std)[!__SINGLE_THREAD__]: Initialize _lock
-        field.
-        * libc/stdio/fopen.c (_fopen_r)[!__SINGLE_THREAD__]: Ditto.
-        * libc/stdio64/fopen64.c (_fopen64_r)[!__SINGLE_THREAD__]: Ditto.
-        * libc/sys/linux/include/time.h (struct timespec): Moved from
-        <sys/types.h> and added check for __need_timespec flag so type
-        can be defined by itself.
-        * libc/sys/linux/sys/_types.h (_flock_t): New type.
-        * libc/sys/linux/sys/types.h (struct timespec): Moved to
-        <time.h>.
-
-2002-08-29  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/sys/linux/argp: New directory.
-	* libc/sys/linux/getopt.c: New file.
-	* libc/sys/linux/getopt1.c: New file.
-	* libc/sys/linux/getoptlong.c: Remove file.
-	* libc/sys/linux/include/argp.h: New file.
-	* libc/sys/linux/Makefile.am: Define argp_dir and ARGP_LIB,
-	based on ELIX level.
-	(SUBDIRS): Add argp_dir.
-	(SUBLIBS): Add ARGP_LIB.
-	(ELIX_2_OBJS): Add getopt.$(oext), getopt1.$(oext), remove
-	getopt_long.$(oext).
-	* libc/sys/linux/configure.in (AC_OUTPUT): Add argp/Makefile.
-
-2002-08-29  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/libc.texinfo: Add node reference to wide-character strings.
-        * libc/string/wcstrings.tex: New file.
-	* libc/string/strtok_r.c: Remove outdated advertising clause.
-        * libc/string/Makefile.am (doc): Add wide-character string
-        chapter to documentation.
-        * libc/string/Makefile.in: Regenerated.
-
-2002-08-29  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-        * libc/include/wchar.h: Define NULL. Define WEOF more general
-        way. Declare functions in newlib manner.
-        * libc/stdlib/Makefile.am: Delete wmem*.c
-        * libc/stdlib/Makefile.in: Regenerated.
-        * libc/stdlib/wmemchr.c: Delete.
-        * libc/stdlib/wmemcmp.c: Ditto.
-        * libc/stdlib/wmemcpy.c: Ditto.
-        * libc/stdlib/wmemmove.c: Ditto.
-        * libc/stdlib/wmemset.c: Ditto.
-        * libc/string/Makefile.am: Add wmem*.c and wcs*.c.
-        * libc/string/Makefile.in: Regenerated.
-        * libc/string/wcscat.c: New file derived from the NetBSD C Library.
-        * libc/string/wcschr.c: Ditto.
-        * libc/string/wcscmp.c: Ditto.
-        * libc/string/wcscpy.c: Ditto.
-        * libc/string/wcscspn.c: Ditto.
-        * libc/string/wcslcat.c: Ditto.
-        * libc/string/wcslcpy.c: Ditto.
-        * libc/string/wcslen.c: Ditto.
-        * libc/string/wcsncat.c: Ditto.
-        * libc/string/wcsncmp.c: Ditto.
-        * libc/string/wcsncpy.c: Ditto.
-        * libc/string/wcspbrk.c: Ditto.
-        * libc/string/wcsrchr.c: Ditto.
-        * libc/string/wcsspn.c: Ditto.
-        * libc/string/wcsstr.c: Ditto.
-        * libc/string/wmemchr.c: Ditto.
-        * libc/string/wmemcmp.c: Ditto.
-        * libc/string/wmemcpy.c: Ditto.
-        * libc/string/wmemmove.c: Ditto.
-        * libc/string/wmemset.c: Ditto.
-
-2002-08-29  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/locale/locale.c (_setlocale_r)[MB_CAPABLE]: Fix so
-        default locale "" is accepted for LC_CTYPE or LC_MESSAGES
-        and is treated as if "C" was specified.
-
-2002-08-28  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * Makefile.am (install-data-local): Move install of build
-        newlib.h after installing headers in libc/include so as to
-        overwrite default newlib.h.
-        * Makefile.in: Regenerated.
-
-2002-08-28  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/newlib.h: New file for tools that use newlib
-        headers but don't build newlib first (e.g. gcc).
-
-2002-08-28  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdlib/wmemchr.c: Explicitly include <_ansi.h>.
-	* libc/stdlib/wmemcmp.c: Ditto.
-	* libc/stdlib/wmemcpy.c: Ditto.
-	* libc/stdlib/wmemmove.c: Ditto.
-	* libc/stdlib/wmemset.c: Ditto.
-
-2002-08-27  Egor Duda  <deo@logos-m.ru>
-
-	* libc/stdlib/wmemchr.c: New file.
-	* libc/stdlib/wmemcmp.c: Ditto.
-	* libc/stdlib/wmemcpy.c: Ditto.
-	* libc/stdlib/wmemmove.c: Ditto.
-	* libc/stdlib/wmemset.c: Ditto.
-	* libc/stdlib/Makefile.am (GENERAL_SOURCES): Add new files.
-	* configure.host: Default -DMB_CAPABLE for cygwin.
-	* libc/include/wchar.h: Declare wmemchr(), wmemcmp(), wmemcpy(),
-	wmemmove() and wmemset().  Add include of <_ansi.h>.
-	* libc/stdlib/Makefile.in: Regenerate.
-
-2002-08-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: Remove _ELIX_LEVEL flag setting.
-	* Makefile.am(stmp-targ-include): Copy newlib.h to targ-include.
-	(install-data-local): Install newlib.h.
-	* Makefile.in: Regenerated.
-	* aclocal.m4: Ditto.
-	* configure: Ditto.
-	* configure.in: Add AM_CONFIG_HEADER to generate newlib.h based on 
-	newlib.hin.  Add AC_DEFINE_UNQUOTED entries for _ELIX_LEVEL
-	and _NEWLIB_VERSION to fill in newlib.h header file entries.
-	In AC_OUTPUT statement, unset ac_file so multilib support does
-	not use last ac_file temporary used in newlib.h configuration.
-	* libc/include/_ansi.h: Include <newlib.h>.
-	* newlib.hin: New template file for newlib.h.
-	* stamp-h.in: New file.
-
-2002-08-26  Wu Yongwei <adah@netstd.com>
-
-        * time.h (timezonevar): Change "#if" to "#ifdef".
-
-2002-08-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* Makefile.am(LIBC_OBJECTLISTS): Add STDIO64_OBJECTLIST.
-	* Makefile.in: Regenerated.
-	* acinclude.m4: Add support for --enable-newlib-elix-level option.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* configure.host: Add code to define _ELIX_LEVEL if
-	--enable-newlib-elix-level option is used.
-	* configure.in: 
-	* libc/aclocal.m4: Regenerated.
-	* libc/configure: Ditto.
-	* libc/argz/Makefile.am: Add EL/IX level checking.
-	* libc/argz/Makefile.in: Regenerated.
-	* libc/argz/dummy.c: New file.
-	* libc/ctype/Makefile.am: Add EL/IX level checking.
-	* libc/ctype/Makefile.in: Regenerated.
-	* libc/locale/Makefile.am: Add EL/IX level checking.
-	* libc/locale/Makefile.in: Regenerated.
-	* libc/posix/Makefile.am: Add EL/IX level checking.
-	* libc/posix/Makefile.in: Regenerated.
-	* libc/posix/telldir.c: Add EL/IX level checking.
-	* libc/reent/Makefile.am: Ditto.
-	* libc/reent/fstat64r.c: Ditto.
-	* libc/reent/lseek64r.c: Ditto.
-	* libc/reent/open64r.c: Ditto.
-	* libc/reent/Makefile.in: Regenerated.
-	* libc/search/Makefile.am: Add EL/IX level checking.
-	* libc/search/Makefile.in: Regenerated.
-	* libc/stdio/Makefile.am: Add EL/IX level checking.
-	* libc/stdio/Makefile.in: Regenerated.
-	* libc/stdio64/Makefile.am: Add EL/IX level checking.
-	* libc/stdio64/Makefile.in: Regenerated.
-	* libc/stdio64/dummy.c: New file.
-	* libc/stdio64/fgetpos64.c: Fix so _LARGE64_FILES macro is checked
-	after first include.
-	* libc/stdio64/fopen64.c: Ditto.
-	* libc/stdio64/freopen64.c: Ditto.
-	* libc/stdio64/fseeko64.c: Ditto.
-	* libc/stdio64/fsetpos64.c: Ditto.
-	* libc/stdio64/ftello64.c: Ditto.
-	* libc/stdio64/tmpfile64.c: Ditto.
-	* libc/stdlib/Makefile.am: Add EL/IX level checking.
-	* libc/stdlib/Makefile.in: Regenerated.
-	* libc/stdlib/mstats.c: Add EL/IX level checking.
-	* libc/string/Makefile.am: Ditto.
-	* libc/string/Makefile.in: Regenerated.
-	* libc/sys/linux/Makefile.am: Add EL/IX level checking.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/aclocal.m4: Ditto.
-	* libc/sys/linux/configure: Ditto.
-	* libc/sys/linux/aio.c: Add EL/IX level checking.
-	* libc/sys/linux/ftok.c: Ditto.
-	* libc/sys/linux/getdate.c: Ditto.
-	* libc/sys/linux/ids.c: Ditto.
-	* libc/sys/linux/inode.c: Ditto.
-	* libc/sys/linux/io.c: Ditto.
-	* libc/sys/linux/process.c: Ditto.
-	* libc/sys/linux/resource.c: Ditto.
-	* libc/sys/linux/sched.c: Ditto.
-	* libc/sys/linux/sig.c: Ditto.
-	* libc/sys/linux/termios.c: Ditto.
-	* libc/sys/linux/wait.c: Ditto plus add __waitpid and
-	__libc___waitpid weak aliases.
-	* libc/sys/linux/machine/i386/syscall.h: Add new _base macros
-	that generate the code for a syscall, but do not create a
-	weak alias.
-	* libc/syscalls/Makefile.am: Add EL/IX level checking.
-	* libc/syscalls/Makefile.in: Regenerated.
-	* libc/time/tzset_r.c: Change to replace strdup with equivalent
-	functionality.
-	* libc/unix/Makefile.am: Add EL/IX level checking.
-	* libc/unix/Makefile.in: Regenerated.
-
-2002-08-26  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/include/malloc.h: On cygwin, define malloc _r functions as
-	wrapper macros to standard malloc functions.
-	* libc/include/stdlib.h: Ditto.
-	* configure.host: Always define MALLOC_PROVIDED on cygwin.
-
-2002-08-22  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/include/langinfo.h: New file.
-	* libc/include/wchar.h: Likewise.
-	* libc/include/sys/syslimits.h: Likewise.
-	* libc/locale/fix_grouping.c: Likewise.
-	* libc/locale/ldpart.c: Likewise.
-	* libc/locale/ldpart.h: Likewise.
-	* libc/locale/lmessages.c: Likewise.
-	* libc/locale/lmessages.h: Likewise.
-	* libc/locale/lmonetary.c: Likewise.
-	* libc/locale/lmonetary.h: Likewise.
-	* libc/locale/lnumeric.c: Likewise.
-	* libc/locale/lnumeric.h: Likewise.
-	* libc/locale/nl_langinfo.3: Likewise.
-	* libc/locale/nl_langinfo.c: Likewise.
-	* libc/locale/timelocal.c: Likewise.
-	* libc/locale/timelocal.h: Likewise.
-	* libc/stdlib/btowc.c: Likewise.
-	* libc/stdlib/mbrlen.c: Likewise.
-	* libc/stdlib/mbrtowc.c: Likewise.
-	* libc/stdlib/mbsinit.c: Likewise.
-	* libc/stdlib/mbsrtowcs.c: Likewise.
-	* libc/stdlib/wcrtomb.c: Likewise.
-	* libc/stdlib/wcsrtombs.c: Likewise.
-	* libc/stdlib/wctob.c: Likewise.
-	* libc/sys/linux/prof-freq.c: Likewise.
-	* libc/sys/linux/profile.c: Likewise.
-	* libc/sys/linux/machine/i386/dl-procinfo.c: Likewise.
-	* libc/sys/linux/machine/i386/dl-procinfo.h: Likewise.
-	* libc/include/stdlib.h: Change re-entrant functions to take
-	mbstate_t pointers.
-	* libc/include/sys/_types.h: Define _mbstate_t.
-	* libc/include/sys/config.h (MB_LEN_MAX): New macro.
-	* libc/include/sys/errno.h (EILSEQ): New error code.
-	* libc/include/sys/reent.h: Include wchar.h.  Change reentrant
-	structure to use mbstate_t.
-	* libc/locale/Makefile.am (LIB_SOURCES): Add new files.
-	* libc/machine/powerpc/vfprintf.c: Use mbstate_t.
-	* libc/machine/powerpc/vfscanf.c: Likewise.
-	* libc/stdio/getdelim.c: Reallocate buffer only when necessary.
-	* libc/stdio/vfprintf.c: Likewise.
-	* libc/stdio/vfscanf.c: Likewise.
-	* libc/stdlib/Makefile.am (LIB_SOURCES): Add new files.
-	* libc/stdlib/mblen.c: Use mbstate_t.
-	* libc/stdlib/mblen_r.c: Likewise.
-	* libc/stdlib/mbstowcs.c: Likewise.
-	* libc/stdlib/mbstowcs_r.c: Likewise.
-	* libc/stdlib/mbtowc.c: Likewise.
-	* libc/stdlib/mbtowc_r.c: Likewise.
-	* libc/stdlib/wcstombs.c: Likewise.
-	* libc/stdlib/wcstombs_r.c: Likewise.
-	* libc/stdlib/wctomb_r.c: Likewise.
-	* libc/sys/linux/Makefile.am (LIB_SOURCES): Add prof-freq.c and
-	profile.c.
-	* libc/sys/linux/machine/i386/Makefile.am (LIB_SOURCES): Add
-	dl-procinfo.c.
-	* libc/sys/linux/sys/errno.h (EILSEQ): New error code.
-	* libc/sys/linux/sys/types.h (off_t): Define type.
-	* testsuite/newlib.locale/UTF-8.c: Change locale name from UTF-8
-	to C-UTF-8.
-	* testsuite/newlib.locale/UTF-8.exp: Likewise.
-
-2002-08-20  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-        * libc/stdlib/mallocr.c: #include windows.h on Win32.
-          (AlignPage): Continue macro on next line.
-
-2002-08-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/include/pthread.h: New file.
-
-2002-08-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/types.h: Support __need_inttypes macro
-	that only sets the __intxx and __uintxx types.  
-	* libc/machine/powerpc/Makefile.am: Add stdlib to include directories
-	to get mprec.h.
-	* libc/machine/powerpc/Makefile.in: Regenerated.
-	* libc/machine/powerpc/vfprintf.c: Fix state variable type.
-	* libc/machine/powerpc/vfscanf.c: Fix state variable type.  Remove
-	redundant fixed-point conversion prototypes.
-	* libc/machine/powerpc/machine/stdlib.h[__SPE__]: Include <sys/types.h>
-	after setting __need_inttypes.
-
-2002-08-18  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/include/sys/unistd.h: Add getsid declaration for cygwin.
-
-2002-08-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/sys/config.h[__PPC__][__SPE__]: Set
-        _LONG_DOUBLE to double.
-
-2002-08-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: Add powerpc*-*-eabispe* configuration.
-	* libc/machine/powerpc/atosfix16.c: New fixed-point conversion file.
-	* libc/machine/powerpc/atosfix32.c: Ditto.
-	* libc/machine/powerpc/atosfix64.c: Ditto.
-	* libc/machine/powerpc/atoufix16.c: Ditto.
-	* libc/machine/powerpc/atoufix32.c: Ditto.
-	* libc/machine/powerpc/atoufix64.c: Ditto.
-	* libc/machine/powerpc/fix64.h: Ditto.
-	* libc/machine/powerpc/simdldtoa.c: Ditto.
-	* libc/machine/powerpc/strtosfix16.c: Ditto.
-	* libc/machine/powerpc/strtosfix32.c: Ditto.
-	* libc/machine/powerpc/strtosfix64.c: Ditto.
-	* libc/machine/powerpc/strtoufix16.c: Ditto.
-	* libc/machine/powerpc/strtoufix32.c: Ditto.
-	* libc/machine/powerpc/strtoufix64.c: Ditto.
-	* libc/machine/powerpc/ufix64toa.c: Ditto.
-	* libc/machine/powerpc/configure.in: Add check for
-	powerpc*-eabispe and add fixed-point conversion functions.
-	* libc/machine/powerpc/configure: Regenerated.
-	* libc/machine/powerpc/vfprintf.c[__SPE__]: Add support for
-	%r and %R format specifiers which handle fixed-point data.
-	* libc/machine/powerpc/vfscanf.c[__SPE__]: Ditto.
-	* libc/machine/powerpc/machine/stdlib.h[__SPE__]: Add fixed-point
-	function prototypes.
-
-2002-08-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	*  Makefile.am: Move cmath stuff into libc/sys/linux.
-	*  Makefile.in: Regenerated.
-	*  configure.host: Default -DMB_CAPABLE for x86-linux.
-	*  libc/include/reent.h: Define _sbrk to take signed int argument.
-	*  libc/include/sys/unistd.h: Ditto for _sbrk_r and sbrk.
-	*  libc/locale/locale.c[MB_CAPABLE]: Add LC_MESSAGES support and 
-	make locale name checking more efficient.  Also allow "C-ISO-8859-1" 
-	locale for LC_CTYPE and LC_MESSAGES.
-	*  libc/reent/sbrkr.c: Change prototype to take ptrdiff_t.
-	*  libc/sys/linux/brk.c: Change sbrk prototype.
-	*  libc/sys/linux/include/time.h: Remove Cygwin stuff and
-	include <sys/features.h>.
-	(CLOCK_THREAD_CPUTIME): Renamed to CLOCK_THREAD_CPUTIME_ID.
-	(CLOCK_PROCESS_CPUTIME): Renamed to CLOCK_PROCESS_CPUTIME_ID.
-	*  libc/sys/linux/sys/cdefs.h: Replace with glibc sys/cdefs.h
-	with a few local additions.
-	*  libc/sys/linux/sys/features.h: New file.
-	*  libc/sys/linux/sys/unistd.h: Change _sbrk_r and sbrk prototypes
-	to take signed argument.
-	*  libc/syscalls/syssbrk.c: Change sbrk, _sbrk_r, and _sbrk
-	prototypes to take signed size argument.
-
-2002-08-16  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/sys/linux/cmath: New directory.
-	* libc/sys/linux/include/cmathcalls.h: New file.
-	* libc/sys/linux/include/complex.h: New file.
-	* libc/sys/linux/machine/i386/huge_val.h: New file
-	* libm/math/w_sincos.c: New file
-	* libm/math/wf_sincos.c: New file
-	* libm/mathfp/s_sincos.c: New file
-	* libm/mathfp/sf_sincos.c: New file
-	* Makefile.am (LIBC_OBJECTLISTS): Add cmath/objectlist.awk.in.
-	* libc/include/math.h: Add sincos and sincosf declarations.
-	* libc/sys/linux/Makefile.am (SUBDIRS): Add cmath.
-	(SUBLIBS): Likewise.
-	* libc/sys/linux/configure.in (AC_OUTPUT): Add cmath.
-	* libm/math/Makefile.am (src): Add w_sincos.c.
-	(fsrc): Add wf_sincos.c.
-	* libm/mathfp/Makefile.am (src): Add s_sincos.c
-	(fsrc): Add sf_sincos.c.
-
-2002-08-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/machine/i386/crt0.c (__bss_start,_end):
-	Declare as extern chars and use the address operator to
-	properly use values set in linker script.
-
-2002-08-09  Jason Tishler  <jason@tishler.net>
-
-	* libc/stdlib/mallocr.c: Include <limits.h>.
-	(request2size): Change macro to do
-	unsigned long comparisons and avoid signed overflow.
-	(mALLOc): Add overflow check for the number of bytes to allocate.
-	(rEALLOc): Ditto.
-
-2002-08-09  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: Add check for --enable-newlib-io-pos-args
-	and define WANT_IO_POS_ARGS flag if enabled.  Define
-	the flag by default for x86-linux configurations.
-	* configure.in: Add support for --enable-newlib-io-pos-args.
-	* libc/configure.in: Ditto.
-	* configure: Regenerated.
-	* libc/configure: Ditto.
-	* libc/stdio/Makefile.am: Specify -fshort-enums for compiling
-	vfprintf.c and vfiprintf.c.
-	* libc/stdio/Makefile.in: Regenerated.
-	* libc/stdio/vfprintf.c: Add positional argument support that
-	is enabled by compiling with -DWANT_IO_POS_ARGS.
-
-2002-08-07  Richard Sandiford  <rsandifo@redhat.com>
-
-	* libc/include/machine/setjmp.h: For mips, define _JBLEN based
-	based on __mips_soft_float rather than __mips64.
-	* libc/machine/mips/setjmp.S: Provide hard and soft float versions
-	of both 32-bit and 64-bit code.
-
-2002-08-04  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/stdio/popen.c (popen): Allow "rb", "rt", "wb", and "wt"
-	arguments for popen to match similar functionality in fopen.
-
-2002-07-29  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* libc/include/sys/unistd.h: Add setgroups prototype for Cygwin.
-
-2002-07-29  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/Makefile.am: Add aio64.c. 
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/aio.c (aio_init): ENOSYS stub added.
-        * libc/sys/linux/aio64.c: New file.
-
-2002-07-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	*  libc/include/sys/param.h (MAX, MIN): Added macros.
-	*  libc/sys/linux/Makefile.am: Add new files.
-	*  libc/sys/linux/Makefile.in: Regenerated.
-	*  libc/sys/linux/sys/stat.h: Add *stat64 prototypes.
-	*  libc/sys/linux/inode.c (fchdir): Added syscall.
-	*  libc/sys/linux/ftw.c: New file.
-	*  libc/sys/linux/ftw64.c: Ditto.
-	*  libc/sys/linux/getwd.c: Ditto.
-	*  libc/sys/linux/scandir64.c: Ditto.
-	*  libc/sys/linux/strverscmp.c: Ditto.
-	*  libc/sys/linux/versionsort.c: Ditto.
-	*  libc/sys/linux/versionsort64.c: Ditto.
-
-2002-07-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/string/strings.tex: Fix typo for memccpy.
-
-2002-07-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/io64.c (truncate64, ftruncate64): Added.
-	* libc/sys/linux/sys/types.h (off64_t): Definition added.
-
-2002-07-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/Makefile.am: Add fclean.c.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/fclean.c: New file.
-
-2002-07-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/Makefile.am: Add confstr.c.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/confstr.c: New file.
-	* libc/sys/linux/confstr.h: Ditto.
-	* libc/sys/linux/sys/unistd.h: Include <features.h> and
-	<bits/environments.h>.
-
-2002-07-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/config.h (__set_errno): Macro definition removed.
-	* libc/sys/linux/fpathconf.c (__set_errno): Ditto.
-	* libc/sys/linux/libc-internal.h (__set_errno): Ditto.
-	* libc/sys/linux/pathconf.c (__set_errno): Ditto.
-	* libc/sys/linux/ttyname_r.c (__set_errno): Ditto.
-	* libc/sys/linux/sys/errno.h (__set_errno): Macro definition added.
-
-2002-07-24  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/Makefile.am: Add new files.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/fstab.c: New file.
-	* libc/sys/linux/fstatvfs.c: Ditto.
-	* libc/sys/linux/fstatvfs64.c: Ditto.
-	* libc/sys/linux/internal_statvfs.c: Ditto.
-	* libc/sys/linux/mntent.c: Ditto.
-	* libc/sys/linux/mntent_r.c: Ditto.
-	* libc/sys/linux/statvfs.c: Ditto.
-	* libc/sys/linux/statvfs64.c: Ditto.
-	* libc/sys/linux/include/paths.h: Ditto.
-	* libc/sys/linux/inode.c (statfs, fstatfs): New syscalls
-	with double-underscore weak-aliases.
-	* libc/sys/linux/sys/stat.h: Add *stat64 prototypes.
-
-2002-07-24  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/signal.h (SIG_IGN, SIG_DFL, SIG_ERR): Change
-	to use _sig_func_ptr type casted constants.
-	(_sig_func_ptr): Typedef moved to sys/signal.h.
-	* libc/include/sys/signal.h (_sig_func_ptr): Typedef added.
-	For __rtems, use POSIX definition, otherwise default to ANSI.
-	* libc/sys/linux/sys/signal.h (_sig_func_ptr): Typedef added.
-
-2002-07-24  Stephane Carrez  <stcarrez@nerim.fr>
-
-        * configure.host: Recognize m6811-elf and m6812-elf targets.
-        * libc/include/machine/setjmp.h (_JBLEN): Define for 68hc11/68hc12.
-        * libc/include/machine/ieeefp.h (__IEEE_BIG_ENDIAN): Define for 68HC11.
-        (_DOUBLE_IS_32BITS): Define when compiling with -fshort-double.
-        * libc/include/sys/config.h (INT_MAX, UINT_MAX): Define
-        according to __INT_MAX__.
-        (_POINTER_INT): Define to short.
-        * libc/machine/m68hc11/Makefile.am: New file.
-        * libc/machine/m68hc11/Makefile.in: New file.
-        * libc/machine/m68hc11/configure.in: New file.
-        * libc/machine/m68hc11/configure: New file.
-        * libc/machine/m68hc11/aclocal.m4: New file.
-        * libc/machine/m68hc11/setjmp.S: New file.
-
-2002-07-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/string.h: Add mempcpy, strndup, and _strndup_r
-	prototypes.
-	* libc/stdlib/Makefile.am: Remove strdup.c and strdup_r.c.
-	* libc/stdlib/Makefile.in: Regenerated.
-	* libc/stdlib/strdup.c: Removed.
-	* libc/stdlib/strdup_r.c: Removed.
-	* libc/string/Makefile.am: Add strdup.c, strdup_r.c, memccpy.c,
-	mempcpy.c, strndup.c, and strndup_r.c.
-	* libc/string/Makefile.in: Regenerated.
-	* libc/string/memccpy.c: New file.
-	* libc/string/mempcpy.c: Ditto.
-	* libc/string/strndup.c: Ditto.
-	* libc/string/strndup_r.c: Ditto.
-	* libc/string/strdup.c: New file moved from stdlib.
-	* libc/string/strdup_r.c: Ditto.
-	* libc/string/strings.tex: Add memccpy and mempcpy documentation.
-
-2002-07-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/stdio.h: Move fcloseall prototype within
-        #ifndef _REENT_ONLY section.
-        * libc/sys/linux/Makefile.am: Add new files.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/sys/stdio.h: Add ctermid prototype.
-        * libc/sys/linux/sys/unistd.h: Add ttyname_r prototype.
-	* libc/sys/linux/sys/types.h: Add ino64_t type.
-        * libc/sys/linux/ctermid.c: New file.
-        * libc/sys/linux/ttyname_r.c: Ditto.
-	* libc/sys/linux/readdir64.c: Ditto.
-
-2002-07-22  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdio.h (fcloseall, _fcloseall_r): Added prototypes.
-	* libc/stdio/Makefile.am: Added fcloseall.c support.
-	* libc/stdio/Makefile.in: Regenerated.
-	* libc/stdio/fcloseall.c: New file.
-	* libc/stdio64/Makefile.am: Remove missing .def references.
-	* libc/stdio64/Makefile.in: Regenerated.
-
-2002-07-22  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/machine/powerpc/time.c: Removed..renamed to times.c.
-	* libc/machine/powerpc/times.c: New file.
-	* libc/machine/powerpc/Makefile.am: Change time.c to times.c.
-	* libc/machine/powerpc/Makefile.in: Regenerated.
-
-2002-07-22  Aldy Hernandez  <aldyh@redhat.com>
-
-        * libc/machine/powerpc/time.c: New file.
-        * libc/machine/powerpc/Makefile.am (lib_a_SOURCES): Add
-        time.c.
-	* libc/machine/powerpc/Makefile.in: Regenerated.
-
-2002-07-22  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/libc.texinfo: Change copyright notices to Red Hat from
-	Cygnus.
-	* libm/libm.texinfo: Likewise.
-	* README: Change docs URL to
-	http://sources.redhat.com/newlib/docs.html.
-
-2002-07-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/Makefile.am: Add pathconf.c and fpathconf.c.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/inode.c: Add chmod, fchmod, and chown syscalls.
-        * libc/sys/linux/io.c: Add ftruncate syscall.
-        * libc/sys/linux/fpathconf.c: New file.
-        * libc/sys/linux/pathconf.c: Ditto.
-	* libc/sys/linux/linux_fsinfo.h: Ditto.
-        * libc/sys/linux/sys/unistd.h: Ditto.
-
-2002-07-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio64/Makefile.am: Remove missing files.
-	* libc/stdio64/Makefile.in: Regenerated.
-
-2002-07-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/sys/config.h[__i386__][__linux__]: Define
-        _LARGE64FILE_SOURCE to 1.
-        * libc/sys/linux/Makefile.am: Add getrlimit64.c and setrlimit64.c.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/resource.c: Add __getrlimit and __setrlimit aliases.
-        * libc/sys/linux/sys/linux_time.h: Protect struct timeval definition.
-        * libc/sys/linux/sys/resource.h: Include <bits/resource.h> instead
-        of <linux/resource.h>.
-        * libc/sys/linux/getrlimit64.c: New file.
-        * libc/sys/linux/setrlimit64.c: Ditto.
-
-2002-07-19  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/argz/argz_replace.c: Include buf_findstr.h.
-	* libc/argz/buf_findstr.c: Likewise.
-	* libc/argz/envz_entry.c: Include buf_findstr.h.  Cast return
-	value to (char *).
-	* libc/argz/envz_get.c: Likewise.
-	* libc/include/sys/unistd.h: Add getopt and getsubopt declarations.
-	* libc/stdlib/Makefile.am (LIB_SOURCES): Add getsubopt.c.
-	* libc/stdlib/getsubopt.3: New file.
-	* libc/stdlib/getsubopt.c: New file.
-	* libc/sys/linux/machine/i386/socketcall.h (__sockcall_base):
-	Change esp to ebp.
-
-2002-07-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host(stdio64_dir): New setting that is used to
-	enable building of new stdio64 directory.
-	* libc/Makefile.am[HAVE_STDIO64_DIR]: Add support for
-	large files.
-	(stmp-stdio64,stdio64.texi): New targets to optionally add in
-	stdio64 info to info files.
-	* libc/Makefile.in: Regenerated.
-	* libc/configure: Ditto.
-	* libc/configure.in: Add configuration variables that are set
-	when stdio64 is selected as subdir in configure.host.
-	* libc/libc.texinfo: Add optional menu item for Stdio64, based
-	on whether STDIO64 flag is set or not.
-	* libc/sys.tex: Add optional stdio64 syscalls based on whether
-	STDIO64 flag is set or not.
-	* libc/include/reent.h[__LARGE64_FILES]: Add new stdio64
-	_r sycall routines.
-	* libc/include/stdio.h[__LARGE64_FILES]: Add new stdio64 prototypes.
-	(FILE): Typedef'd to __FILE instead of struct __sFILE directly.
-	(__SL64): New file flag indicating file is opened via fopen64.
-	* libc/include/sys/_types.h(_off64_t): Added.
-	* libc/include/sys/config.h: For x86-linux, define __LARGE64_FILES.
-	* libc/include/sys/reent.h(struct __sFILE64): New file structure
-	for 64-bit offset large file support.
-	(__FILE): New intermediate type either set to struct __sFILE64 or
-	struct __sFILE, depending on whether __LARGE64_FILES is set or not.
-	* libc/reent/Makefile.am[HAVE_STDIO64_DIR]: Add new files.
-	* libc/reent/Makefile.in: Regenerated.
-	* libc/reent/fstat64r.c: New file.
-	* libc/reent/lseek64r.c: Ditto.
-	* libc/reent/open64r.c: Ditto.
-	* libc/reent/reent.tex: Optionally add stdio64 reentrant syscalls
-	based on whether STDIO64 flag is set. 
-	* libc/stdio/stdio.tex: Add blank line.
-	* libc/stdio64/Makefile.am: New file.
-	* libc/stdio64/Makefile.in: Ditto.
-	* libc/stdio64/fgetpos64.c: Ditto.
-	* libc/stdio64/fopen64.: Ditto.
-	* libc/stdio64/freopen64.c: Ditto.
-	* libc/stdio64/fseeko64.c: Ditto.
-	* libc/stdio64/fsetpos64.c: Ditto.
-	* libc/stdio64/ftello64.c: Ditto.
-	* libc/stdio64/local64.h: Ditto.
-	* libc/stdio64/stdio64.c: Ditto.
-	* libc/stdio64/stdio64.tex: Ditto.
-	* libc/stdio64/tmpfile64.c: Ditto.
-	* libc/sys/linux/io64.c: Add weak aliases for lseek64, fstat64, and
-	open64.
-
-2002-07-16  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/Makefile.am (stmp-extra): New target to set makeinfo flag
-        if LIBC_EXTRA_LIB is present.
-        * libc/Makefile.in: Regenerated.
-	* libc/libc.texinfo: Add blank line.
-        * libc/argz/Makefile.am: Add doc support.
-        * libc/search/Makefile.am: Ditto.
-        * libc/argz/Makefile.in: Regenerated.
-        * libc/search/Makefile.in: Ditto.
-        * libc/misc/misc.tex: Add ffs function.
-        * libc/stdio/ftell.c: Fix missing doc delimeter in description.
-
-2002-07-15  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/config.h[__H8300__]: Replace __SMALL_BITFIELDS
-	definition that was removed in error.
-
-2002-07-15  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/machine/ieeefp.h: Change to only define
-	floating point defines (e.g one of __IEEE_BIG_ENDIAN or 
-	__IEEE_LITTLE_ENDIAN must be defined for each platform).
-	* libc/include/sys/config.h: Include <machine/ieeefp.h> and
-	remove redundant floating point definitions.
-
-2002-07-15  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/callocr.c: Fix so code references
-        calloc.
-
-2002-07-15  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/Makefile.am: Add new files.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/bp-sym.h: Moved to include directory.
-        * libc/sys/linux/mmap.c: Add weak aliases: __mmap, __munmap, __mremap.
-        * libc/sys/linux/inode.c: Set _LIBC to 1.
-        * libc/sys/linux/mq_close.c: Ditto.
-        * libc/sys/linux/mq_getattr.c: Ditto.
-        * libc/sys/linux/mq_open.c: Ditto.
-        * libc/sys/linux/mq_receive.c: Ditto.
-        * libc/sys/linux/mq_send.c: Ditto.
-        * libc/sys/linux/mq_setattr.c: Ditto.
-        * libc/sys/linux/mq_unlink.c: Ditto.
-        * libc/sys/linux/calloc.c: New file.
-        * libc/sys/linux/callocr.c: Ditto.
-        * libc/sys/linux/cfreer.c: Ditto.
-        * libc/sys/linux/config.h: Ditto.
-        * libc/sys/linux/free.c: Ditto.
-        * libc/sys/linux/freer.c: Ditto.
-        * libc/sys/linux/msize.c: Ditto.
-        * libc/sys/linux/msizer.c: Ditto.
-        * libc/sys/linux/mstats.c: Ditto.
-        * libc/sys/linux/mtrim.c: Ditto.
-        * libc/sys/linux/mtrimr.c: Ditto.
-        * libc/sys/linux/pvallocr.c: Ditto.
-        * libc/sys/linux/realloc.c: Ditto.
-        * libc/sys/linux/reallocr.c: Ditto.
-        * libc/sys/linux/thread-m.h: Ditto.
-        * libc/sys/linux/vallocr.c: Ditto.
-        * libc/sys/linux/bp-checks.h: Ditto.
-        * libc/sys/linux/libc-symbols.h: Ditto.
-        * libc/sys/linux/libc-tsd.h: Ditto.
-        * libc/sys/linux/libintl.h: Ditto.
-        * libc/sys/linux/malign.c: Ditto.
-        * libc/sys/linux/malignr.c: Ditto.
-        * libc/sys/linux/mallinfor.c: Ditto.
-        * libc/sys/linux/malloc.c: Ditto.
-        * libc/sys/linux/mallocr.c: Ditto.
-        * libc/sys/linux/malloptr.c: Ditto.
-        * libc/sys/linux/mallstatsr.c: Ditto.
-        * libc/sys/linux/mcheck.c: Ditto.
-        * libc/sys/linux/mhooks.h: Ditto.
-        * libc/sys/linux/include/bp-sym.h: Ditto.
-        * libc/sys/linux/include/malloc.h: Ditto.
-        * libc/sys/linux/include/mcheck.h: Ditto.
-        * libc/sys/linux/linuxthreads/machine/i386/Makefile.am: Remove
-        getpagesize.c.
-        * libc/sys/linux/linuxthreads/machine/i386/Makefile.in: Regenerated.
-        * libc/sys/linux/linuxthreads/machine/i386/getpagesize.c: Moved.
-        * libc/sys/linux/machine/i386/getpagesize.c: New file.
-        * libc/sys/linux/machine/i386/Makefile.am: Add getpagesize.c.
-        * libc/sys/linux/machine/i386/Makefile.in: Regenerated.
-        * libc/sys/linux/machine/i386/sysdep.h: New file.
-        * libc/sys/linux/machine/i386/weakalias.h: Add weak_function support.
-        * libc/sys/linux/sys/dirent.h: Set _LIBC to 1.
-        * libc/sys/linux/sys/lock.h: Include <machine/weakalias.h>.
-
-2002-07-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/include/mqueue.h: Change to use <bits/siginfo.h>
-	instead of <asm/siginfo.h>.
-	* libc/sys/linux/sys/signal.h: Change to include various linux
-	<bits/xxx.h> header files, rather than <linux/signal.h> so as
-	to work with multiple releases of glibc header files.
-
-2002-07-11  Chris Demetriou  <cgd@broadcom.com>
-
-        * testsuite/newlib.search/hsearchtest.c: New file to test
-        newlib/libc/search.
-        * testsuite/newlib.search/hsearchtest.exp: Likewise.
-
-2002-07-10  Florian Schrack  <florian.schrack@freenet.de>
-
-	* libc/sys/mmixware/read.c: Use SYS_Fgets syscall if dealing with
-	a terminal.
-	* libc/sys/mmixware/sys/syscall.h (SYS_Fgets): Definition added.
-
-2002-07-08  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/math.h (MAXFLOAT): Added.
-
-Mon Jul  8 13:55:23 2002  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/machine/sh/Makefile.am (lib_a_SOURCES):
-	Make strcmp.S unconditional.
-	* libc/machine/sh/Makefile.in: Regenerate.
-	* libc/machine/sh/asm.h (DELAYED_BRANCHES, SL): Also for __SH5__ .
-	* strcmp.S (strcmp): Add SHmedia variant.  Use different registers
-	for SHcompact.
-
-2002-07-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/inode.c: Fix utime prototype and add _LIBC
-	define before including <sys/lock.h>.
-
-2002-07-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/utime.h: Add include of <_ansi.h>.
-	* libc/sys/linux/Makefile.am: Add utimes.c.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/inode.c(__umask): New static routine.
-	(umask): Written to use __umask and attempt to thread lock.
-	(getumask): New function written to use __umask and thread lock.
-	* libc/sys/linux/utimes.c: New file.
-	* libc/sys/linux/sys/time.h: Fix utimes prototype.
-	* libc/sys/linux/sys/utime.h: New file.
-
-2002-07-04  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libtool.m4: New file.
-	* libc/sys/linux/process.c: Implement vfork in terms of fork,
-	rather than as a syscall.
-
-2002-07-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdio.h: Add new prototypes.
-	* libc/stdio/Makefile.am: Add fseeko.c and ftello.c.
-	* libc/stdio/Makefile.in: Regenerated.
-	* libc/stdio/fseek.c: Add fseeko documentation.
-	* libc/stdio/ftell.c: Add ftello documentation.
-	* libc/stdio/fseeko.c: New file.
-	* libc/stdio/ftello.c: New file.
-
-2002-07-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/stdio/Makefile.am: Add asprintf.c and vasprintf.c.
-        * libc/stdio/Makefile.in: Regenerated.
-        * libc/stdio/asprintf.c: New file.
-        * libc/stdio/vasprintf.c: Ditto.
-        * libc/stdio/fvwrite.c: Add code to dynamically reallocate
-        the buffer for asprintf support.
-        * libc/stdio/sprintf.c: Add asprintf documentation.
-        * libc/stdio/vfprintf.c: Add vasprintf documentation.
-        * libc/include/stdio.h: Add new prototypes.
-
-2002-07-02  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/search/hcreate.c: Remove advertising clause from license.
-	* libc/search/hcreate_r.c: Likewise.
-
-2002-07-02  Chris Demetriou  <cgd@broadcom.com>
-
-        * libc/include/sys/config.h (__IEEE_LITTLE_ENDIAN)
-        (__IEEE_BIG_ENDIAN): Define appropriately for MIPS.
-        Check that one of them is defined and error out if not.
-	Add any platforms defined in <machine/ieeefp.h> that are missing.
-        * libc/search/hash.h (DB_BYTE_ORDER, DB_BIG_ENDIAN)
-        (DB_LITTLE_ENDIAN): New defines.
-        * libc/search/hash.c: Replace all incorrect checks for
-        _IEEE_LITTLE_ENDIAN with tests of BYTE_ORDER, and all uses of
-        BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN with DB_* versions.
-        * libc/search/hash_page.c: Likewise.
-
-2002-06-28  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libm/mathfp/sf_pow.c (powf): Change k from int to float.
-
-2002-06-27  Benjamin Kosnik  <bkoz@redhat.com>
-
-        * libc/include/stdio.h: Untangle, add _BEGIN_STD_C and _END_STD_C.
-        * libc/include/time.h: Same.
-        * libc/include/string.h: Same.
-        * libc/include/stdlib.h: Same.
-        * libc/include/signal.h: Same.
-        * libc/include/setjmp.h: Same.
-        * libc/include/math.h: Same.
-        * libc/include/locale.h: Same.
-        * libc/include/ctype.h: Same.
-        * libc/include/machine/setjmp.h: Same.
-        * libc/include/_ansi.h (_BEGIN_STD_C): Add.
-        (_END_STD_C): Add.
-
-2002-06-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/sys/_types.h: Define _ssize_t as int if int is
-        32-bits, otherwise define it as long.
-        * libc/include/sys/types.h: Include <_ansi.h> and <sys/_types.h>
-        and define ssize_t as _ssize_t.
-        * libc/reent/readr.c: Change return type to _ssize_t.
-        * libc/reent/writer.c: Ditto.
-        * libc/sys/linux/Makefile.am: Add aio.c.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/aio.c: New file.
-        * libc/sys/linux/sys/cdefs.h: Add __restrict_arr definition.
-        * libm/common/fdlibm.h: Undef __P before defining it.
-
-2002-06-27  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libm/mathfp/s_pow.c (pow): Fix checks on variable k.  Add
-	exponent_is_even_int variable.  Handle case where x is
-	negative, and y is an odd integer.
-	* libm/mathfp/sf_pow.c (powf): Likewise.
-
-	* libm/mathfp/er_lgamma.c: Remove __kernel references.
-	* libm/mathfp/erf_lgamma.c: Likewise.
-	* libm/mathfp/s_tgamma.c: Likewise.
-	* libm/mathfp/sf_tgamma.c: Likewise.
-
-2002-06-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/Makefile.am: Add new clock routines.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/clock_getres.c: New file.
-        * libc/sys/linux/clock_gettime.c: Ditto.
-        * libc/sys/linux/clock_settime.c: Ditto.
-        * libc/sys/linux/hp-timing.h: Ditto.
-        * libc/sys/linux/libc-internal.h: Ditto.
-        * libc/sys/linux/sysconf.c: Fix typo.
-        * libc/sys/linux/include/time.h: Add include of <sys/linux_time.h>.
-        * libc/sys/linux/machine/hp-timing.h: New file.
-        * libc/sys/linux/machine/i386/Makefile.am: Add new files.
-        * libc/sys/linux/machine/i386/Makefile.in: Regenerated.
-        * libc/sys/linux/machine/i386/get_clockfreq.c: New file.
-        * libc/sys/linux/machine/i386/hp-timing.c: Ditto.
-        * libc/sys/linux/machine/i386/hp-timing.h: Ditto.
-        * libc/sys/linux/sys/linux_time.h: New file.
-        * libc/sys/linux/sys/time.h: Remove include of <linux/time.h> and
-        replace with <sys/linux_time.h>.
-
-Wed Jun 26 16:33:25 2002  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/sys/sh/crt0.S: Remove vestigial .section directive.
-
-2002-06-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/Makefile.am: Consolidate additional items under
-        ADD_OBJS.
-        * libc/sys/linux/Makefile.in: Regenerated.
-
-2002-06-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/sethostname.c: New file.
-        * libc/sys/linux/Makefile.am: Add sethostname.c support.
-        * libc/sys/linux/Makefile.in: Regenerated.
-
-2002-06-24  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/search/db_local.h: New file.
-	* libc/include/db.h: Remove.
-	* libc/search/Makefile.am (LIB_SOURCES): Add db_local.h.
-	* libc/search/hash.c (MIN,MAX): Add macros.  Change <db.h> to
-	"db_local.h".
-	* libc/search/hash_bigkey.c: Likewise.
-	* libc/search/hash_buf.c: Likewise.
-	* libc/search/hash_func.c: Likewise.
-	* libc/search/hash_log2.c: Likewise.
-	* libc/search/hash_page.c: Likewise.
-
-2002-06-24  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/machine/sh/strlen.S: New file.
-	* libc/machine/sh/Makefile.am (lib_a_SOURCES): Add rule for it.
-	* libc/machine/sh/Makefile.am: Regenerate.
-
-2002-06-24  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/gethostname.c: Change name to __gethostname and
-        add gethostname alias.
-
-2002-06-24  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/math.h: Remove <sys/types.h>.
-	(__dmath): Use __ULong instead of __uint32_t.
-	* libc/include/sys/reent.h: If long or int is not 32-bits,
-	include <sys/types.h> to get definitions for __int32_t and __uint32_t.
-	* libc/stdlib/mprec.h: Include <sys/types.h> to get integer defs.
-	* libm/common/fdlibm.h: Ditto.
-
-2002-06-24  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/include/ndbm.h: Remove.
-	* libc/search/ndbm.c: Remove.
-
-2002-06-24  WATANABE Hirofumi <eban@os.rim.or.jp>
-
-	* libc/stdio/fseek.c (fseek): Fix braces.
-
-2002-06-21  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/time/strftime.c (strftime): Add %e format specifier.
-
-2002-06-21  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/search/hash.h (LITTLE_ENDIAN, BIG_ENDIAN): Define if not
-	previously defined.
-
-2002-06-21  Richard Earnshaw  (rearnsha@arm.com)
-
-        * libc/sys/arm/sys/param.h (BIG_ENDIAN, LITTLE_ENDIAN): Define.
-        (BYTE_ORDER): Define as appropriate for the target.
-
-2002-06-21  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/config.h[__linux__]: Set _READ_WRITE_RETURN_TYPE
-	to _ssize_t.
-	* libc/sys/linux/io.c (read, write): Change to return ssize_t.
-
-2002-06-21  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdio.h (__getline, __getdelim): New prototypes.
-	* libc/include/time.h [HAVE_GETDATE](getdate, getdate_r): Ditto.
-	[HAVE_GETDATE](getdate_err): New error code.
-	* libc/stdio/Makefile.am: Add support for getline.c and getdelim.c.
-	* libc/stdio/Makefile.in: Regenerated.
-	* libc/stdio/getdelim.c: New file.
-	* libc/stdio/getline.c: Ditto.
-	* libc/sys/linux/Makefile.am: Add support for getdate.c, getdate_err.c
-	and ntp_gettime.c.  Also add AM_CFLAGS to point to libc/stdio.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/getdate.c: New file.
-	* libc/sys/linux/getdate_err.c: Ditto.
-	* libc/sys/linux/ntp_gettime.c: Ditto.
-	* libc/sys/linux/time.c (adjtimex, ntp_adjtime): New functions.
-	* libc/sys/linux/sys/stdio.h (getline, getdelim): New macros.
-
-2002-06-21  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/math.h: Add <sys/types.h> to get _uint32_t definition.
-	* libc/include/machine/types.h: Skip __off_t, __pid_t, and
-	__loff_t definitions if special _HAVE_SYSTYPES macro defined.
-	* libc/include/sys/config.h: Removed _uint*, _int* definitions.
-	* libc/include/sys/param.h: Remove i386 case which is handled
-	by default case.
-	(BIG_ENDIAN, LITTLE_ENDIAN): Protect
-	definitions in case they are already defined.
-	(BYTE_ORDER): Add default case using _IEEE_BIG_ENDIAN and
-	_IEEE_LITTLE_ENDIAN flags.
-	* libc/include/sys/reent.h: Change __uint32_t references to
-	use _ULong instead.
-	(_REENT_GETDATE_REENT_P): New macro.
-	* libc/include/sys/types.h (__int16_t, __uint16_t): Added.
-	(__int32_t, __uint32_t, __int64_t, __uint64_t): Ditto.
-	* libc/search/hash.h: Add default setting of BYTE_ORDER,
-	LITTLE_ENDIAN, and BIG_ENDIAN, if not already defined.
-	* libc/sys/linux/sys/types.h: Include <sys/_types.h>.  Define
-	ssize_t based on _ssize_t.  Remove __socklen_t, __uintptr_t,
-	pid_t, off_t, loff_t, caddr_t, and daddr_t type
-	definitions which are done by subsequent glibc headers.
-	Add macro definitions to prevent subsequent header files from
-	defining pid_t, off_t, ssize_t, and key_t.  Move uintptr_t and
-	intptr_t to after glibc definitions of types they are based on.
-
-2002-06-21  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/errno.h: Protect from multiple inclusion.
-
-2002-06-21  Nick Clifton  <nickc@cambridge.redhat.com>
-
-	* libc/sys/arm/swi.h (ADP_Stopped_RunTimeError): Set correct value.
-
-2002-06-20  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* Makefile.am (LIB_OBJECTLISTS): Add
-	libc/search/objectlist.awk.in.
-	* libc/Makefile.am (SUBDIRS): Add search.
-	(SUBLIBS): Add search/libsearch.la.
-	* libc/configure.in (AC_OUTPUT): Add search/Makefile.
-	* libc/search: New directory.
-	* libc/search/Makefile.am: New file.
-	* libc/search/extern.h: New file.
-	* libc/search/hash.c: New file.
-	* libc/search/hash.h: New file.
-	* libc/search/hash_bigkey.c: New file.
-	* libc/search/hash_buf.c: New file.
-	* libc/search/hash_func.c: New file.
-	* libc/search/hash_log2.c: New file.
-	* libc/search/hash_page.c: New file.
-	* libc/search/hcreate.3: New file.
-	* libc/search/hcreate.c: New file.
-	* libc/search/hcreate_r.c: New file.
-	* libc/search/ndbm.c: New file.
-	* libc/search/page.h: New file.
-	* libc/search/tdelete.c: New file.
-	* libc/search/tdestroy.c: New file.
-	* libc/search/tfind.c: New file.
-	* libc/search/tsearch.3: New file.
-	* libc/search/tsearch.c: New file.
-	* libc/search/twalk.c: New file.
-	* libc/include/db.h: New file.
-	* libc/include/ndbm.h: New file.
-	* libc/include/search.h: New file.
-	* libc/include/sys/queue.h: New file.
-	* libc/include/sys/cdefs.h: New file.
-	* libc/include/sys/param.h
-	[__IEEE_LITTLE_ENDIAN,__IEEE_BIG_ENDIAN]: Set BYTE_ORDER to
-	LITTLE_ENDIAN or BIG_ENDIAN.
-	* libc/include/sys/errno.h (EFTYPE): New macro.
-	* libc/search/bsearch.c: Move from libc/stdlib.
-	* libc/search/qsort.c: Likewise.
-	* libc/stdlib/Makefile.am (LIB_SOURCES): Remove bsearch.c and
-	qsort.c.
-	(CHEWOUT_FILES): Remove bsearch.def and qsort.def.
-	* libc/stdlib/stdlib.tex: Remove references to bsearch and qsort.
-
-2002-06-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/Makefile.am: Add support for message queue routines,
-        ipc routines, and ftok.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/ftok.c: New file.
-        * libc/sys/linux/ipc.c: Ditto.
-        * libc/sys/linux/mq_close.c: Ditto.
-        * libc/sys/linux/mq_getattr.c: Ditto.
-        * libc/sys/linux/mq_notify.c: Ditto.
-        * libc/sys/linux/mq_open.c: Ditto.
-        * libc/sys/linux/mq_receive.c: Ditto.
-        * libc/sys/linux/mq_send.c: Ditto.
-        * libc/sys/linux/mq_setattr.c: Ditto.
-        * libc/sys/linux/mq_unlink.c: Ditto.
-        * libc/sys/linux/mqlocal.h: Ditto.
-        * libc/sys/linux/include/mqueue.h: Ditto.
-        * libc/sys/linux/sys/types.h: Define __gid_t_defined and
-        __uid_t_defined.
-
-2002-06-19  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libm/common/sf_lround.c (round): Change name to: (lround).
-	* libm/common/sf_remquo.c (remquo): Pass all arguemnts to
-	remquof.
-
-2002-06-18  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* testsuite/lib/passfail.exp (newlib_pass_fail_all): New
-	procedure.
-	(newlib_pass_fail): Change to compile and run only one file.
-	* testsuite/newlib.locale/locale.exp: Use new
-	newlib_pass_fail_all procedure.
-	* testsuite/newlib.string/string.exp: Likewise.
-
-2002-06-18  Dave Brolley  <brolley@redhat.com>
-
-	From Catherine Moore, Michael Meissner, Richard Sandiford:
-	* libc/include/machine/setjmp.h (_JBLEN): Define for __frv__.
-	(_JBTYPE): Ditto.
-	* libc/include/sys/config.h (__IEEE_BIG_ENDIAN): Ditto.
-	(__ATTRIBUTE_IMPURE_PTR__): Ditto.
-	* libc/include/machine/ieeefp.h (__IEEE_BIG_ENDIAN): Ditto.
-	* configure.host: Support frv-*-*.
-	* libc/machine/frv/Makefile.am: New file.
-	* libc/machine/frv/configure.in: New file.
-	* libc/machine/frv/setjmp.S: New file.
-
-2002-06-18  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/include/ctype.h: Remove isblank macro.
-
-	* libc/ctype/Makefile.am (LIB_SOURCES): Add isblank.c.
-	* libc/ctype/isblank.c: New file.
-	* libc/include/ctype.h [!__STRICT_ANSI__]: Add isblank
-	declaration.  Add isblank macro.
-
-2002-06-18  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * testsuite/newlib.stdlib/atexit.c: New file.
-        * testsuite/newlib.stdlib/atexit.exp: Ditto.
-        * testsuite/newlib.string/tstring.c: Change default start size
-        to something more reasonable for embedded platforms.
-
-2002-06-14  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/sys/linux/sys/errno.h (EFTYPE): Add macro.
-
-	* libc/argz: New directory.
-	* libc/argz/*: New files.
-	* libc/argz/argz_add.c: New file.
-	* libc/argz/argz_add_sep.c: New file.
-	* libc/argz/argz_append.c: New file.
-	* libc/argz/argz_count.c: New file.
-	* libc/argz/argz_create.c: New file.
-	* libc/argz/argz_create_sep.c: New file.
-	* libc/argz/argz_delete.c: New file.
-	* libc/argz/argz_extract.c: New file.
-	* libc/argz/argz_insert.c: New file.
-	* libc/argz/argz_next.c: New file.
-	* libc/argz/argz_replace.c: New file.
-	* libc/argz/argz_stringify.c: New file.
-	* libc/argz/buf_findstr.c: New file.
-	* libc/argz/envz_add.c: New file.
-	* libc/argz/envz_entry.c: New file.
-	* libc/argz/envz_get.c: New file.
-	* libc/argz/envz_merge.c: New file.
-	* libc/argz/envz_remove.c: New file.
-	* libc/argz/envz_strip.c: New file.
-	* libc/include/argz.h: New file.
-	* libc/include/envz.h: New file.
-	* Makefile.am (LIBC_OBJECTLISTS): Add
-	libc/argz/objectlist.awk.in.
-	* libc/Makefile.am (SUBDIRS): Add argz.
-	(SUBLIBS): Add argz/libargz.la.
-	* libc/configure.in (AC_OUTPUT): Add argz/Makefile.
-	* libc/include/errno.h: Add error_t typedef.
-
-2002-06-13  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/stdlib.h: Add _Exit prototype.
-	* libc/stdlib/Makefile.am: Add _Exit.c support.
-	* libc/stdlib/Makefile.in: Ditto.
-	* libc/stdlib/_Exit.c: New file.
-
-2002-06-13  Stephen L. Moshier  <steve@moshier.net>
-
-	* libm/math/e_pow.c (__ieee754_pow): Fix case whereby
-	x is close to -1.0 and y is very large to use ax (absolute value)
-	instead of x.
-	* libm/math/ef_pow.c (__ieee754_powf): Ditto.
-
-Thu Jun 13 19:23:40 2002  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/machine/sh/strcpy.S (strcpy, __SHMEDIA__ code):
-	Fix clobbering bytes before destination if src and dst have same
-	non-zero misalignment.
-
-	* libc/machine/sh/memset.S (memset, __SHMEDIA__ code):
-	Fixed bug in writing end of set region.
-
-2002-06-10  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/include/process.h: Remove cygwin-only sexec* declarations.  Fix
-	spawnve declaration.
-
-2002-06-06  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libm/common/s_fdim.c: New file.
-	* libm/common/s_fma.c: Likewise.
-	* libm/common/s_fmax.c: Likewise.
-	* libm/common/s_fmin.c: Likewise.
-	* libm/common/s_fpclassify.c: Likewise.
-	* libm/common/s_lrint.c: Likewise.
-	* libm/common/s_lround.c: Likewise.
-	* libm/common/s_nearbyint.c: Likewise.
-	* libm/common/s_remquo.c: Likewise.
-	* libm/common/s_round.c: Likewise.
-	* libm/common/s_scalbln.c: Likewise.
-	* libm/common/s_signbit.c: Likewise.
-	* libm/common/s_trunc.c: Likewise.
-	* libm/common/sf_fdim.c: Likewise.
-	* libm/common/sf_fma.c: Likewise.
-	* libm/common/sf_fmax.c: Likewise.
-	* libm/common/sf_fmin.c: Likewise.
-	* libm/common/sf_lrint.c: Likewise.
-	* libm/common/sf_lround.c: Likewise.
-	* libm/common/sf_nearbyint.c: Likewise.
-	* libm/common/sf_remquo.c: Likewise.
-	* libm/common/sf_round.c: Likewise.
-	* libm/common/sf_scalbln.c: Likewise.
-	* libm/common/sf_trunc.c: Likewise.
-	* libm/math/w_exp2.c: Likewise.
-	* libm/math/w_tgamma.c: Likewise.
-	* libm/math/wf_exp2.c: Likewise.
-	* libm/math/wf_tgamma.c: Likewise.
-	* libm/mathfp/s_exp2.c: Likewise.
-	* libm/mathfp/s_tgamma.c: Likewise.
-	* libm/mathfp/sf_exp2.c: Likewise.
-	* libm/mathfp/sf_tgamma.c: Likewise.
-	* libm/math/er_gamma.c: Fix return value.
-	* libm/math/erf_gamma.c: Likewise.
-	* libm/mathfp/er_gamma.c: Likewise.
-	* libm/mathfp/erf_gamma.c: Likewise.
-	* libc/include/math.h (!__STRICT_ANSI__): Include ISOC99-specific
-	declarations and macros.
-	Regenerated all Makefile.in, aclocal.m4 and configure files to
-	use new libtool macros in top-level libtool.m4
-
-2002-06-05  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/string.h[__linux__]: Add strsignal prototype.
-        * libc/include/sys/lock.h: New file with default locking support.
-        * libc/include/sys/reent.h: Add signal buffer support for strsignal
-        and psignal.
-        * libc/posix/Makefile.am: Add support for readdir_r.c.
-        * libc/posix/Makefile.in: Regenerated.
-        * libc/posix/closedir.c: Add locking support and hash table cleanup.
-        * libc/posix/opendir.c: Add lock support.
-        * libc/posix/readdir.c: Ditto.
-        * libc/posix/rewinddir.c: Ditto.
-        * libc/posix/scandir.c: Ditto.
-        * libc/posix/seekdir.c: Ditto.
-        * libc/posix/telldir.c: Ditto plus add _cleanupdir routine to
-        clean up leftover hash table entries.
-        * libc/posix/readdir_r.c: New file.
-        * libc/sys/linux/Makefile.am: Add psignal.c and strsignal.c support.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/sys/dirent.h: Add dd_lock to DIR structure.
-        * libc/sys/linux/sys/signal.h: Add psignal prototype.
-        * libc/sys/linux/psignal.c: New file.
-        * libc/sys/linux/strsignal.c: Ditto.
-
-2002-06-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/types.h: Don't define dev_t when compiling for
-	Cygwin.
-
-2002-05-31  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/Makefile.am: Add sig.c and sigaction.c.  Also
-        make siglist.inc dependent on sig.c instead of signal.c.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/sig.c: Rename from signal.c and change code to
-        use NSIG instead of _NSIG. 
-        * libc/sys/linux/sigaction.c: New file.
-        * libc/sys/linux/signal.c: Changed to be linux signal() function
-        so as to override regular newlib default signal.c.
-        * libc/sys/linux/machine/i386/Makefile.am: Remove sigset.c.
-        * libc/sys/linux/machine/i386/Makefile.in: Regenerated.
-        * libc/sys/linux/machine/i386/sigset.c: Moved to linux main directory.
-        * libc/sys/linux/sigset.c: Moved from machine/i386 directory.
-        * libc/sys/linux/sys/signal.h: Redefine NSIG to _NSIG and override
-        default linux sigset_t typedef by defining it equal to __sigset_t.
-        * libc/unix/sigset.c: Add check so code isn't compiled on systems
-        with a sigset_t that isn't implemented with a single int.
-
-2002-05-30  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/Makefile.am: Add support for new files.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/ids.c: Add __getuid weak alias for getuid.
-        * libc/sys/linux/signal.c: Change to use real-time syscalls for
-        sigsuspend, sigprocmask, and sigpending.  Also remove sigaction as
-        it is in a separate file now.
-        * libc/sys/linux/machine/i386/Makefile.am
-        * libc/sys/linux/machine/i386/Makefile.in
-        * libc/sys/linux/sys/signal.h: Add include of <bits/signum.h>.
-        * libc/sys/linux/sigaction.c: New file.
-        * libc/sys/linux/sigqueue.c: Ditto.
-        * libc/sys/linux/sigwait.c: Ditto.
-        * libc/sys/linux/machine/i386/sigaction.c: Ditto.
-        * libc/sys/linux/kernel_sigaction.h: Ditto.
-
-2002-05-28  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/Makefile.am: Add support for cfspeed.c and
-        tcsendbrk.c.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/termios.c: Add tcflow(), tcflush(),
-        tcgetpgrp(), and tcsetpgrp() functions.
-        * libc/sys/linux/sys/termios.h: Add include of machine/termios.h
-        to get __MAX_BAUD rate.
-        * libc/sys/linux/machine/i386/include/termios.h: New file.
-        * libc/include/machine/termios.h: Ditto.
-        * libc/sys/linux/cfspeed.c: Ditto.
-        * libc/sys/linux/tcsendbrk.c: Ditto.
-
-2002-05-24  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/string.h: Add strnlen and strerror_r prototypes.
-        * libc/string/Makefile.am: Add strnlen.c and strerror_r.c support.
-        * libc/string/Makefile.in: Regenerated.
-        * libc/string/strerror_r.c: New file.
-        * libc/string/strnlen.c: New file.
-        * libc/sys/linux/Makefile.am: Add rename.c.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/rename.c: New file to override default rename.
-
-2002-05-24  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/sys/linux/sys/cdefs.h: Add __weak_reference macros.
-	* libc/sys/linux/sys/time.h: Add conversion macros.
-	* libc/sys/linux/sys/types.h: Add FD_ macros.  Include <bits/types.h>.
-	* libc/sys/linux/ids.c: Add setresuid and syslog syscalls.
-	* libc/sys/linux/gethostname.c: New file.
-	* libc/sys/linux/seteuid.c: New file.
-	* libc/sys/linux/sysctl.c: New file.
-	
-2002-05-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/string/Makefile.am: Add support for strsep.c.
-        * libc/string/Makefile.in: Regenerated.
-        * libc/string/strsep.c: New file.
-        * libc/string/strtok.c: Change to call __strtok_r service routine.
-        * libc/string/strtok_r.c: Add __strtok_r routine which takes
-        additional flag parameter regarding whether to skip leading delimeters.
-        Change strtok_r to call __strtok_r.
-
-2002-05-23  Gareth Pearce  <tilps@hotmail.com>
-
-        * libc/stdio/Makefile.am: Modify to add setbuffer.c and setlinebuf.c.
-        * libc/stdio/Makefile.in: Regenerated.
-        * libc/stdio/setbuffer.c: New file.
-        * libc/stdio/setlinebuf.c: New file.
-
-2002-05-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/Makefile.am: Add resource.c.
-        * libc/sys/linux/Makefile.in: Regenerated.
-        * libc/sys/linux/resource.c: New file.
-        * libc/sys/linux/time.c: Add settimeofday, getitimer, and setitimer.
-        * libc/sys/linux/machine/i386/Makefile.am: Remove syscalls.c.
-        * libc/sys/linux/machine/i386/Makefile.in: Regenerated.
-        * libc/sys/linux/machine/i386/syscalls.c: Removed as functions
-        are now found in libc/sys/linux/resource.c.
-
-2002-05-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/string.h (bcmp, bcopy, bzero): Change prototypes
-        to use void * pointers and comply with Single Unix spec.
-        * libc/string/bcmp.c: Change to use void * instead of char *.
-        * libc/string/bcopy.c: Ditto.
-        * libc/string/bzero.c: Ditto.
-
-2002-05-22  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/shm_open.c: New file.
-	* libc/sys/linux/shm_unlink.c: Ditto.
-	* libc/sys/linux/Makefile.am: Add support for shm_open.c and
-	shm_unlink.c.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/sys/types.h: Add some additional checks to see
-	if clock_t or time_t is already defined.
-
-2002-05-22  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * Makefile.am: Don't pass $toollibdir down directly in
-        AM_MAKEFLAGS as it causes all multilibs to use the same toollibdir.
-        Pass it under the name: top_toollibdir.
-        * Makefile.in: Regenerated.
-
-2002-05-22  Corinna Vinschen  <vinschen@redhat.com>
-
-	* libc/include/sys/types.h: Revert previous patch.
-
-2002-05-22  Corinna Vinschen  <vinschen@redhat.com>
-
-	* libc/include/sys/types.h: Include cygwin/types.h always under
-	Cygwin, not only if _POSIX_THREADS is defined.
-
-2002-05-21 Dhananjay Deshpande <dhananjayd@kpit.com>
-
-	* configure.host: Specify sys_dir=h8300hms for h8300-*-coff* target.
-
-2002-05-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* Makefile.am: Copy and install headers from sys/machine/include
-	directory.  Also pass $toollibdir to lower-level directories.
-	* Makefile.in: Regenerated.
-	* libc/include/stdio.h[!_REENT_ONLY]: Change stdin, stdout, and 
-	stderr to use _REENT macro instead of _impure_ptr directly.
-	* libc/include/sys/config.h[__i386__][__linux__]: Define
-	__DYNAMIC_REENT__.
-	* libc/include/sys/reent.h[!_REENT_ONLY]: Change _REENT macro to be 
-	call to __getreent() function if !__SINGLE_THREAD__ and
-	__DYNAMIC_REENT__ is set.
-	* libc/reent/Makefile.am: Add support for getreent.c.
-	* libc/reent/Makefile.in: Regenerated.
-	* libc/string/strerror.c: Add check if EOPNOTSUPP and ENOTSUP are same.
-	* libc/sys/linux/Makefile.am: Add support for new files.
-	* libc/sys/linux/configure.in: Add $EXTRA_DIRS variable.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/configure: Ditto.
-	* libc/sys/linux/io.c: Add poll syscall.  Also weak-alias
-	__close, __read, __write, __poll, __open, __lseek, __fcntl from
-	their __libc_ counterparts.
-	* libc/sys/linux/io64.c: Add __libc_ prefix to lseek64 and open64
-	and weak-alias to regular names.
-	* libc/sys/linux/pread64.c: Rename to __libc_pread64 and weak-alias
-	to pread64 and __pread64.
-	* libc/sys/linux/process.c: Weak_alias __libc_getpid to __getpid.
-	* libc/sys/linux/pwrite64.c: Rename to __libc_pwrite64 and
-	weak-alias to pwrite64.
-	* libc/sys/linux/sched.c: Weak-alias __libc_sched_getparam,
-	__libc_sched_getscheduler, __libc_sched_get_priority_max,
-	__libc_sched_get_priority_min, and __libc_sched_setschedule to
-	name with __ instead of __libc_. 
-	* libc/sys/linux/siglongjmp.c: Include <machine/weakalias.h>.
-	Rename siglongjmp to __libc_siglongjmp and weak-alias to siglongjmp.
-	Call __libc_longjmp instead of longjmp, from __libc_siglongjmp.
-	* libc/sys/linux/signal.c: Rename raise to __libc_raise and weak-alias
-	to raise.
-	* libc/sys/linux/socket.c: Weak-alias __libc_connect to __connect and
-	__libc_send to __send.
-	* libc/sys/linux/time.c: Weak-alias __libc_gettimeofday to
-	__gettimeofday.
-	* libc/sys/linux/wait.c: Rename wait to __libc_wait and weak-alias
-	it to wait.  Rename wait3 to __libc_wait3 and weak-alias it to wait3.
-	* libc/sys/linux/include/setjmp.h: Use __jmp_buf in sigjmp_buf
-	type and typedef __jmp_buf to jmp_buf.
-	* libc/sys/linux/machine/i386/Makefile.am: Add syscalls.c and
-	setjmp.S.
-	* libc/sys/linux/machine/i386/Makefile.in: Regenerated.
-	* libc/sys/linux/machine/i386/crt0.c: Add support to clear .bss
-	section.
-	* libc/sys/linux/machine/i386/socketcall.h: Change to use __libc_
-	prefix for function macros and then use weak_alias() to regular names.
-	* libc/sys/linux/machine/i386/syscall.h: Ditto.
-	* libc/sys/linux/sys/errno.h: Define EOPNOTSUP to be ENOTSUP.
-	* libc/sys/linux/sys/stdio.h: Define _flockfile and _funlockfile
-	to be flockfile() and funlockfile() respectively.
-	* libc/sys/linux/sys/types.h
-	* libc/reent/getreent.c: New file.
-	* libc/sys/linux/flockfile.c: Ditto.
-	* libc/sys/linux/funlockfile.c: Ditto.
-	* libc/sys/linux/getreent.c: Ditto.
-	* libc/sys/linux/pread.c: Ditto.
-	* libc/sys/linux/pwrite.c: Ditto.
-	* libc/sys/linux/raise.c: Ditto.
-	* libc/sys/linux/system.c: Ditto.
-	* libc/sys/linux/tcdrain.c: Ditto.
-	* libc/sys/linux/machine/i386/i386mach.h: Ditto.
-	* libc/sys/linux/machine/i386/setjmp.S: Ditto.
-	* libc/sys/linux/machine/i386/syscalls.c: Ditto.
-	* libc/sys/linux/machine/i386/weakalias.h: Ditto.
-	* libc/sys/linux/machine/i386/include/setjmp.h: Ditto.
-
-2002-05-14 Dhananjay Deshpande <dhananjayd@kpit.com>
-
-	* newlib/libc/sys/h8300hms/Makeile.am (lib_a_SOURCES): Add read.c.
-	* newlib/libc/sys/h8300hms/read.c: New file.  Magic trap 0xC8 for sim.
-	* newlib/libc/sys/h8300hms/syscalls.c: Move _read() to read.c.
-	* newlib/libs/sys/h8300hms/sys/syscall.h: New file.
-
-Thu May 16 17:24:57 2002  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/machine/sh/strcpy.S (strcpy): Replace LITTLE_ENDIAN with
-	__LITTLE_ENDIAN__.  make sure r0 has right value at first loop
-	exit point.
-
-2002-05-15  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* testsuite/lib/newlib.exp: Add newlib_include_flags to compile
-	options when testing natively on i[3456]86-*-linux.
-
-	* testsuite/lib/checkoutput.exp (newlib_check_output): Output
-	only one pass or fail per test file.  Trim \r's from output
-	values received from test programs.  Remove support for named
-	tests.
-	* testsuite/newlib.locale/UTF-8.exp: Update to support new
-	newlib_check_output behaviour.
-	* testsuite/newlib.locale/UTF-8.c: Likewise.
-
-2002-05-15  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/stdlib.h: Add on_exit prototype.
-        * libc/include/sys/reent.h (struct _atexit): Add argument array
-        and bits to track type of exit routine to support both on_exit
-        and atexit.
-        (_REENT_INIT_PTR): Add missing fields that won't be zeroed out
-        by default and change the setting of the atexit structure.
-        (_REENT_INIT)[!_REENT_SMALL]: Remove extraneous end brace.
-        * libc/stdlib/on_exit.c: New file.
-        * libc/stdlib/Makefile.am: Add support for on_exit.
-        * libc/stdlib/Makefile.in: Regenerated.
-        * libc/stdlib/atexit.c: Change to initialize types field.
-        * libc/stdlib/exit.c: Change to look at types field for each
-        exit routine and either call an atexit-style or an on_exit-style
-        routine accordingly.
-
-2002-05-13  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/machine/powerpc/vfprintf.c(__VFPRINTF_R)[__ALTIVEC__]: Don't
-        allow v specifier with n or L specifiers.  For vector c format,
-        move tmp declaration to the top.
-
-2002-05-13  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/machine/powerpc/vfprintf.c(__VFPRINTF_R)[__ALTIVEC__]: Restore
-        the original format specifier when looping for vectors to compensate
-        for any changes made in vector %g format processing.
-        Also add syntax checking for various invalid scenarios
-        involving vector format extensions.
-        * libc/machine/powerpc/vfscanf.c(__VFSCANF_R)[__ALTIVEC__]: Fix
-        return code setting for vector formats.  Also treat vector
-        separator mismatch as a match error instead of an input error.
-        Perform some syntax checking for vector formats.
-
-2002-05-10  Mark Bradshaw  <bradshaw@staff.crosswalk.com>
-
-	* libc/include/string.h (!__STRICT_ANSI__): Add strlcat and strlcpy.
-	* libc/string/Makefile.am: Add strlcat.c and strlcpy.c.
-	* libc/string/strlcat.c: New file.
-	* libc/string/strlcpy.c: New file.
-
-2002-05-10  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/string/strchr.c: Fix comment typo.
-
-2002-05-08  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* acinclude.m4: Add support for --enable-newlib-multithread.
-	* configure.host (newlib_cflags): Add -D__SINGLE_THREAD__ if
-	--enable-newlib-multithread=no.
-
-	* libc/stdio/getc_u.c: New file.
-	* libc/stdio/getchar_u.c: New file.
-	* libc/stdio/putc_u.c: New file.
-	* libc/stdio/putchar_u.c: New file.
-	* libc/include/stdio.h: Add declarations for getc_unlocked,
-	getchar_unlocked, putc_unlocked and putchar_unlocked.
-	* libc/stdio/Makefile.am (LIB_SOURCES): Add new files.
-	(CHEWOUT_FILES): Add new files' .def's.
-	* libc/stdio/putchar.c (_putchar_r): Replace __sputc with putc.
-
-Wed May  8 17:47:35 2002  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/machine/sh/memset.S (memset, __SHMEDIA__ code):
-	Also handle as single quad word when destination ends at last
-	byte of first quad word.  Fix byte selection in single quad code.
-
-2002-05-07  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/include/sys/stdio.h: New file.
-	* libc/sys/linux/sys/stdio.h: New file.
-	* libc/include/stdio.h: Add declarations for flockfile,
-	ftrylockfile, and funlockfile.  Include <sys/stdio.h>.
-	* libc/stdio/clearerr.c: Add file locking.
-	* libc/stdio/fclose.c: Likewise.
-	* libc/stdio/feof.c: Likewise.
-	* libc/stdio/ferror.c: Likewise.
-	* libc/stdio/fflush.c: Likewise.
-	* libc/stdio/fgetc.c: Likewise.
-	* libc/stdio/fgetpos.c: Likewise.
-	* libc/stdio/fgets.c: Likewise.
-	* libc/stdio/fileno.c: Likewise.
-	* libc/stdio/fputc.c: Likewise.
-	* libc/stdio/fputs.c: Likewise.
-	* libc/stdio/fread.c: Likewise.
-	* libc/stdio/freopen.c: Likewise.
-	* libc/stdio/fseek.c: Likewise.
-	* libc/stdio/ftell.c: Likewise.
-	* libc/stdio/fwrite.c: Likewise.
-	* libc/stdio/getc.c: Likewise.
-	* libc/stdio/putc.c: Likewise.
-	* libc/stdio/setvbuf.c: Likewise.
-	* libc/stdio/ungetc.c: Likewise.
-	* libc/stdio/vfprintf.c: Likewise.
-
-2002-05-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/machine/powerpc/vfprintf.c[__ALTIVEC__]: Add vector
-	support for 'p' format.  Fix code to print bytes for vector
-	integer formats that do not specify 'h' or 'l'.
-	* libc/machine/powerpc/vfscanf.c[__ALTIVEC__]: Add vector support
-	for 'p' specifier.  Fix code to scan 16 bytes for vector integer
-	formats that do not specify 'h' or 'l'.
-
-	* libc/include/stdlib.h (a64l, l64a, _l64a_r): Added prototypes.
-
-2002-05-06  Nick Clifton  <nickc@cambridge.redhat.com>
-
-	* libc/sys/arm/syscalls.c (_rename): Add parameter names.
-	(_sbrk): Add cast of return value.
-
-2002-05-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-	*  libc/include/sys/reent.h (_l64a_buf): New reentrant area.
-	(_REENT_L64A_BUF): New macro for accessing area.
-	*  libc/stdlib/Makefile.am: Add a64l.c and l64a.c.
-	*  libc/stdlib/Makefile.in: Regenerated.
-	*  libc/stdlib/a64l.c: New file.
-	*  libc/stdlib/l64a.c: New file.
-
-2002-05-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/unix/pread.c: Fix typo for _pread_r.
-        * libc/unix/pwrite.c: Fix type for _pwrite_r.
-        * libc/sys/linux/pread64.c: Fix typo for read syscall.
-        * libc/sys/linux/pwrite64.c: Fix typo for write syscall.
-
-2002-05-03  Christopher Faylor  <cgf@redhat.com>
-
-	* libc/include/sys/unistd.h: Define getdomainname under cygwin.
-
-2002-05-03  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* configure.in (CC_FOR_NEWLIB): Change -isystem's to -I's.
-
-2002-05-01  Christopher Faylor  <cgf@redhat.com>
-
-	* utmp.h: Define more UNIX constants.
-
-2002-05-01  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* Makefile.am: Add support for checking multilibs.
-
-	* libc/Makefile.am (SUBLIBS): Add LIBC_EXTRA_LIB.
-	(SUBDEFS): Add LIBC_EXTRA_DEF.
-	* libc/configure.in (LIBC_EXTRA_LIB): New variable.
-	(LIBC_EXTRA_DEF): Likewise.
-	(extra_dir): Likewise.
-	* libc/machine/xscale/machine: New directory.
-	* libc/machine/xscale/machine/profile.h: New file.
-
-	* Makefile.am (site.exp): Remove newlib_cflags.  Add
-	multibuildtop.
-	* testsuite/newlib.locale/UTF-8.c: Change fprintf's to printf's.
-	* testsuite/lib/flags.exp: New file.
-	* testsuite/lib/newlib.exp: Load flags.exp.
-	(newlib_target_compile): Remove libgloss directory references.
-	(newlib_init): Remove newlib_cflags references.
-
-2002-04-30  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* testsuite/lib/newlib.exp (newlib_target_compile): Change
-	method of finding libgloss_target_dir.
-
-	* Makefile.am (site.exp): Change host_alias, host_triplet,
-	target_alias, target_triplet to refer to gcc's host and target
-	variables (newlib's build and host variables).
-	* testsuite/lib/newlib.exp (newlib_init): Change build
-	references to host references, host references to target
-	references to reflect Makefile.am changes.
-	(newlib_target_compile): Likewise.
-	(newlib_finish): Likewise.
-
-2002-04-29  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/io64.c (fstat64, lstat64): New syscalls added.
-
-2002-04-29  Jonathan Larmour  <jlarmour@redhat.com>
-
-	* libc/sys/arm/syscalls.c (_rename): New function. Just a stub.
-	(_system): New function. Ditto.
-	* libc/stdlib/system.c (_system_r): Call _system if HAVE_SYSTEM.
-	* configure.host: define HAVE_SYSTEM and HAVE_RENAME for xscale
-	targets.
-
-2002-04-29  Jeff Johnston  <jjohnstn@redhat.com>
-
-        *  libc/include/sys/unistd.h (pread, pwrite): Added prototypes.
-        *  libc/unix/Makefile.am: Add pread.c and pwrite.c.
-        *  libc/sys/linux/Makefile.am: Add pread64.c and pwrite64.c.
-        *  libc/sys/linux/Makefile.in: Regenerated.
-        *  libc/unix/Makefile.in: Ditto.
-        *  libc/sys/linux/pread64.c: New file.
-        *  libc/sys/linux/pwrite64.c: Ditto.
-        *  libc/unix/pread.c: Ditto.
-        *  libc/unix/pwrite.c: Ditto.
-
-2002-04-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	*  libc/sys/linux/Makefile.am: Add io64.c.
-	*  libc/sys/linux/Makefile.in: Regenerated.
-	*  libc/sys/linux/io.c(mkfifo, fsync, fdatasync): Added syscalls.
-	*  libc/sys/linux/signal.c (sigwaitinfo, sigtimedwait): Ditto. 
-	*  libc/sys/linux/io64.c: New file.
-
-2002-04-26  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.in (CC_FOR_NEWLIB): New variable that
-	bases on $(CC) and adds targ-include and libc/include as
-	-isystem directives if they are not already part of $(CC).
-	* Makefile.am (AM_MAKEFLAGS): Change setting of CC to equal
-	$(CC_FOR_NEWLIB).
-	* configure: Regenerated.
-	* Makefile.in: Ditto.
-
-2002-04-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-	*  libc/sys/linux/Makefile.am: Add support for sched.c.
-	*  libc/sys/linux/Makefile.in: Regenerated.
-	*  libc/sys/linux/sched.c: New file.
-	*  libc/sys/linux/sys/types.h: Add struct timespec.
-
-2002-04-25  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* configure.in (CC_FOR_BUILD): Set to gcc whether
-	cross-compiling or not.
-	(CC): Add -isystem's for targ-include and libc/include when they
-	do not already appear in CC.
-
-2002-04-24  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* Makefile.am (check-DEJAGNU): New target.
-	(site.exp): Likewise.
-	* acinclude.m4 (NEWLIB_CONFIGURE): Replace AC_CANONICAL_HOST
-	with AC_CANONICAL_SYSTEM.  Remove AC_CANONICAL_BUILD.
-	* libc/locale/locale.c (_setlocale_r): Add UTF-8 support.
-	* libc/stdlib/mbtowc_r.c (_mbtowc_r): Likewise.
-	* libc/stdlib/wctomb_r.c (_wctomb_r): Likewise.
-	* testsuite: New directory.
-	* testsuite/config: Likewise.
-	* testsuite/lib: Likewise.
-	* testsuite/newlib.locale: Likewise.
-	* testsuite/newlib.string: Likewise.
-	* testsuite/config/default.exp: New file.
-	* testsuite/lib/checkoutput.exp: New file.
-	* testsuite/lib/newlib.exp: New file.
-	* testsuite/lib/passfail.exp: New file.
-	* testsuite/newlib.locale/UTF-8.c: New file.
-	* testsuite/newlib.locale/UTF-8.exp: New file.
-	* testsuite/newlib.locale/locale.exp: New file.
-	* testsuite/newlib.string/string.exp: New file.
-	* testsuite/newlib.string/tstring.c: New file.
-
-2002-04-23  Jeff Johnston  <jjohnstn@redhat.com>
-
-        *  libc/include/machine/types.h (__pid_t, __off_t, __loff_t): Added.
-        *  libc/sys/linux/Makefile.am: Add support for mmap.c.
-        *  libc/sys/linux/Makefile.in: Regenerated.
-        *  libc/sys/linux/mmap.c: New file.
-        *  libc/sys/linux/machine/i386/syscall.h: Add _syscall6 macro.
-        *  libc/sys/linux/sys/types.h (pid_t, off_t, loff_t): Added.
-
-2002-04-22  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* acinclude.m4 (newlib_cflags): Remove include directories that
-	are already specified in the top-level configure.in's FLAGS_FOR_TARGET.
-
-2002-04-19  Bill Siegmund  <ctc-dsl@pacbell.net>
-
-	* libc/machine/xscale/memchr.c: Don't use multi-line strings.
-	* libc/machine/xscale/memcmp.c: Ditto.
-	* libc/machine/xscale/memcpy.c: Ditto.
-	* libc/machine/xscale/memmove.c: Ditto.
-	* libc/machine/xscale/memset.c: Ditto.
-	* libc/machine/xscale/strchr.c: Ditto.
-	* libc/machine/xscale/strcmp.c: Ditto.
-	* libc/machine/xscale/strcpy.c: Ditto.
-	* libc/machine/xscale/strlen.c: Ditto.
-
-2002-04-19  Alexandre Oliva  <aoliva@redhat.com>
-
-        * libc/include/sys/config.h: Remove include of <limits.h>.
-        (__INT_MAX__, __LONG_MAX__): Define like GCC's limits.h would
-        define INT_MAX and LONG_MAX.  Use them in tests.
-
-2002-04-19  Jeff Johnston  <jjohnstn@redhat.com>
-
-	*  configure.host: Add support for powerpc-eabialtivec*.
-	*  libc/include/malloc.h: Add include of <machine/malloc.h>.
-	*  libc/include/stdlib.h: Add include of <machine/stdlib.h>.
-	*  libc/include/machine/malloc.h: New file.
-	*  libc/include/machine/stdlib.h: Ditto.
-	*  libc/include/machine/setjmp.h: Add support for powerpc altivec.
-	*  libc/machine/powerpc/Makefile.am: Add conditional objects and
-	sources based on configuration.
-	*  libc/machine/powerpc/Makefile.in: Regenerated.
-	*  libc/machine/powerpc/configure: Ditto.
-	*  libc/machine/powerpc/configure.in: Add check for
-	powerpc-eabialtivec* in which case add in additional source files.
-	*  libc/machine/powerpc/setjmp.S: Add altivec support.
-	*  libc/machine/powerpc/vec_calloc.c: New file.
-	*  libc/machine/powerpc/vec_free.c: Ditto.
-	*  libc/machine/powerpc/vec_malloc.c: Ditto.
-	*  libc/machine/powerpc/vec_mallocr.c: Ditto.
-	*  libc/machine/powerpc/vec_realloc.c: Ditto.
-	*  libc/machine/powerpc/machine/malloc.h: Ditto.
-	*  libc/machine/powerpc/machine/stdlib.h: Ditto.
-	*  libc/machine/powerpc/vfprintf.c: New file that is vfprintf.c
-	with added altivec format specifiers.
-	*  libc/machine/powerpc/vfscanf.c: New file that is vfscanf.c with
-	added altivec format specifiers.
-
-2002-04-19	Joel Sherrill <joel@OARcorp.com>
-
-	* libs/sys/rtems/crt0.c: Satisfy gcc's references to libc functions
-	while autoconf is trying to link main(){}.
-
-2002-04-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/linux/signal.c: Remove include of <bits/sigset.h>.
-        * libc/sys/linux/sys/signal.h: Add include of <bits/sigset.h>.
-
-2002-04-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/time/time.tex: Add tzset info.
-
-2002-04-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/time.h (tzset, _tzset_r): Added prototypes.
-	(strptime): Moved prototype to be within !__STRICT_ANSI__.
-	(_tzname, _daylight, _timezone): No long __CYGWIN__ only.
-	(tzname): Defined for all platforms.
-	(daylight, timezone): Defined only for CYGWIN.
-	* libc/sys/linux/machine/i386/crt0.c: Add call to tzset() after
-	environment set up.
-	* libc/stdlib/setenv_r.c (_setenv_r): Call tzset() if the TZ
-	environment variable is set.
-	* libc/time/Makefile.am: Add support for tzset.c, tzlock.c, and
-	tzset_r.c.
-	* libc/time/Makefile.in: Regenerated.
-	* libc/time/gmtime.c (gmtime): Changed to call gmtime_r.
-	* libc/time/gmtime_r.c (gmtime_r): Changed to call _mktm_r.
-	* libc/time/lcltime_r.c (lcltime_r): Ditto.
-	* libc/time/local.h: New local header file.
-	* libc/time/mktime.c (mktime): Add timezone support.
-	* libc/time/mktm_r.c: New file which is the common engine
-	for gmtime_r and lcltime_r.  This code has timezone support.
-	* libc/time/strftime.c (strftime): Add %Z timezone support.
-	* libc/time/tzlock.c: New file containing timezone lock stubs.
-	* libc/time/tzset.c: New file containing tzset() routine.
-	* libc/time/tzset_r.c: New file containing _tzset_r and
-	internal routine for calculating timezone changes for specified year.
-
-2002-04-17  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* configure.in (CRT0_DIR): Set to libc/.
-	(CRT1_DIR): Set to ${crt1_dir}/ if crt1_dir is non-empty.
-	* Makefile.am: Change all occurrences of $(CRT0_DIR)/$(CRT0) to
-	$(CRT0_DIR)$(CRT0) to prevent make warnings.  Likewise for
-	$(CRT1_DIR)/$(CRT1).
-	* libc/machine/xstormy16/Makefile.in: Regenerated.
-	* libc/machine/xstormy16/aclocal.m4: Regenerated.
-	* libc/machine/xstormy16/configure: Regenerated.
-
-2002-04-13  Alexandre Oliva  <aoliva@redhat.com>
-
-	* libc/stdlib/mallocr.c (malloc_extend_top): If correction sbrk
-	fails, don't bail out, and try to correct next time.
-
-	* libc/include/sys/config.h: Include limits.h.
-
-2002-04-12  Eric Norum  <eric.norum@usask.com>
-
-	* libc/sys/rtems/crt0.c (rtems_gxx_mutex_init): Dummy
-	routine to allow autoconf to determine that building executables
-	for rtems works.
-	(rtems_gxx_mutex_lock, rtems_gxx_mutex_unlock): Ditto.
-	(rtems_gxx_mutex_once): Ditto.
-
-2002-04-09  Tom Rix  <trix@redhat.com>
-
-	* libc/include/sys/reent.h (_REENT_INIT_PTR): Fix typo.
-
-2002-04-09  Mark Bradshaw  <bradshaw@staff.crosswalk.com>
-
-        * libc/include/time.h: Fix strptime declaration.
-        * libc/time/Makefile.am: Add strptime.c.
-	* libc/time/Makefile.in: Regenerated.
-        * libc/time/strptime.c: New file.
-
-2002-04-08  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/include/setjmp.h: Add sigjmp_buf type,
-	siglongjmp prototype, and sigsetjmp macro definition.
-	* libc/sys/linux/siglongjmp.c: New file.
-	* libc/sys/linux/Makefile.am: Add support for siglongjmp.
-	* libc/sys/linux/Makefile.in: Regenerated.
-
-2002-04-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* Makefile.am: Add support for installing crt1.o if one exists.
-	* configure.host: Specify crt1.o for linux.
-	* configure.in: Expose CRT1 and CRT1_DIR for Makefile.am to use.
-	* Makefile.in: Regenerated.
-	* configure: Ditto.
-	* libc/include/sys/unistd.h (_SC_STREAM_MAX, _SC_PRIORITY_SCHEDULING):
-	Added for non-Cygwin, non-RTEMS configurations.
-	* libc/sys/linux/Makefile.am: Add support for crt1 and sysconf.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/crt1.c: New empty file to override one defaulted
-	by gcc.  This fixes problem with reconfiguring linux newlib build.
-	* libc/sys/linux/sysconf.c: New file.
-
-2002-04-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: Add support for machine subdirectory of
-	sys subdirectory.
-	* configure.in: Add check for sys machine subdirectory.
-	* Makefile.am: Ditto.
-	* configure: Regenerated.
-	* Makefile.in: Ditto.
-	* libc/sys/linux/crt0.c: Moved to machine/i386 directory.
-	* libc/sys/linux/sys/syscall.h: Ditto.
-	* libc/sys/linux/sleep.c: New file.
-	* libc/sys/linux/socket.c: Ditto.
-	* libc/sys/linux/sockops.h: Ditto.
-	* libc/sys/linux/stack.c: Ditto.
-	* libc/sys/linux/usleep.c: Ditto.
-	* libc/sys/linux/machine/Makefile.am: Ditto.
-	* libc/sys/linux/machine/Makefile.in: Ditto.
-	* libc/sys/linux/machine/aclocal.m4: Ditto.
-	* libc/sys/linux/machine/configure: Ditto.
-	* libc/sys/linux/machine/configure.in: Ditto.
-	* libc/sys/linux/machine/i386/Makefile.am: Ditto.
-	* libc/sys/linux/machine/i386/Makefile.in: Ditto.
-	* libc/sys/linux/machine/i386/aclocal.m4: Ditto.
-	* libc/sys/linux/machine/i386/configure: Ditto.
-	* libc/sys/linux/machine/i386/configure.in: Ditto.
-	* libc/sys/linux/machine/i386/crt0.c: Ditto.
-	* libc/sys/linux/machine/i386/sigset.c: Ditto.
-	* libc/sys/linux/machine/i386/sigstack.h: Ditto.
-	* libc/sys/linux/machine/i386/socketcall.h: Ditto.
-	* libc/sys/linux/machine/i386/syscall.h: Ditto.
-	* libc/sys/linux/sys/select.h: Ditto.
-	* libc/sys/linux/configure.in: Add support for machine directory.
-	* libc/sys/linux/Makefile.am: Ditto plus add new files above.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/configure: Ditto.
-	* libc/sys/linux/brk.c: Use machine/syscall.h instead of sys/syscall.h.
-	* libc/sys/linux/inode.c: Ditto.
-	* libc/sys/linux/linux.c: Ditto.
-	* libc/sys/linux/process.c: Ditto.
-	* libc/sys/linux/systat.c: Ditto.
-	* libc/sys/linux/time.c: Ditto.
-	* libc/sys/linux/wait.c: Ditto.
-	* libc/sys/linux/ids.c: Change header plus add setfsgid/setfsuid.
-	* libc/sys/linux/io.c: Change header plus add readv/writev.
-	* libc/sys/linux/signal.c: Change header plus change sigsuspend to
-	use __sigsuspend syscall.
-	* libc/sys/linux/select.c: Change header plus change select to
-	use _newselect syscall.
-	* libc/sys/linux/sys/cdefs.h: Add a number of standard definitions
-	used by glibc header files.
-	* libc/sys/linux/sys/types.h: Add __socklen_t and __useconds_t
-	types.
-
-2002-04-01  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/reent.h (_REENT_INIT_PTR): New macro for
-	initializing a struct _reent that has been dynamically allocated.
-	(_REENT_CHECK_MISC): New macro that checks _misc struct for
-	_REENT_SMALL and does nothing otherwise.
-	(_REENT_STRTOK_LAST): New macro for reentrant strtok.
-	(_REENT_MBLEN_STATE): New macro for reentrant mblen.
-	(_REENT_MBTOWC_STATE): New macro for reentrant mbtowc.
-	(_REENT_WCTOMB_STATE): New macro for reentrant wctomb.
-	[_REENT_SMALL](struct _misc_reent): New structure containing
-	miscellaneous reentrant areas needed by newlib.
-	[_REENT_SMALL](struct _reent): Add _misc pointer.
-	[_REENT_SMALL](_REENT_INIT_MISC): New macro.
-	* libc/string/strtok (strtok): Change to use _REENT_CHECK_MISC
-	and _REENT_STRTOK_LAST macros.
-	* libc/stdlib/mblen (mblen): Change to use _REENT_CHECK_MISC
-	and _REENT_MBLEN_STATE macros.
-	* libc/stdlib/mbtowc (mbtowc): Change to use _REENT_CHECK_MISC
-	and _REENT_MBTOWC_STATE macros.
-	* libc/stdlib/wctomb (wctomb): Change to use _REENT_CHECK_MISC
-	and _REENT_WCTOMB_STATE macros.
-
-2002-04-01  Till Straumann <strauman@SLAC.Stanford.EDU>
-
-	* libc/stdlib/getenv_r.c (_findenv_r): Add missing ENV_UNLOCK.
-
-Wed Mar 27 07:34:44 2002  Jason Tishler <jason@tishler.net>
-
-	* libc/include/sys/features.h (_POSIX_SEMAPHORES): New Cygwin define.
-
-Tue Mar 26 17:17:10 2002  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/machine/sh/memcpy.S (Large): Fix alignment rounding.
-	Store high part of leading bytes too.
-
-2002-03-22  Richard Sandiford  <rsandifo@redhat.com>
-
-	* libm/math/ef_hypot.c: Increase scale factor to 68.
-
-2002-03-13  Alexandre Oliva  <aoliva@redhat.com>
-
-	* libc/machine/mips/strlen.c (strlen) [__mips16]: Fix off-by-two
-	error.
-
-2002-03-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/go32/access.c: Change license to relaxed license
-        used in identical file throughout newlib/libgloss.
-
-2002-03-12  Richard Earnshaw  <rearnsha@arm.com>
-
-	* libc/sys/arm/access.c: New file.
-	* libc/sys/arm/Makefile.am (lib_a_SOURCES): Add access.c.
-	* libc/sys/arm/Makefile.in: Regenerate.
-	* libc/sys/arm/syscalls.c (_stat): New function.
-
-2002-03-11  Michael Meissner  <meissner@redhat.com>
-
-	* libc/machine/mips/Makefile.am (lib_a_SOURCES): Add Mips specific
-	variants strlen.c, strcmp.c, strncpy.c, memset.c and memcpy.c.
-	* libc/machine/mips/Makefile.in: Regenerate.
-	* libc/machine/mips/memcpy.c: New file, optimized for MIPS.
-	* libc/machine/mips/memset.c: Dito.
-	* libc/machine/mips/strcmp.c: Dito.
-	* libc/machine/mips/strlen.c: Dito.
-	* libc/machine/mips/strncmp.c: Dito.
-
-2002-03-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/machine/i386/Makefile.am: Add $(oext) for setjmp
-	object so it works for shared library or statici library.
-2002-04-17  Jeff Johnston  <jjohnstn@redhat.com>
-
-	*  libc/include/time.h (tzset, _tzset_r): Added prototypes.
-	(strptime): Moved prototype to be within !__STRICT_ANSI__.
-	(_tzname, _daylight, _timezone): No long __CYGWIN__ only.
-	(tzname): Defined for all platforms.
-	(daylight, timezone): Defined only for CYGWIN.
-	*  libc/sys/linux/machine/i386/crt0.c: Add call to tzset() after
-	environment set up.
-	* libc/stdlib/setenv_r.c (_setenv_r): Call tzset() if the TZ
-	environment variable is set.
-	*  libc/time/Makefile.am: Add support for tzset.c, tzlock.c, and
-	tzset_r.c.
-	*  libc/time/Makefile.in: Regenerated.
-	*  libc/time/gmtime.c (gmtime): Changed to call gmtime_r.
-	*  libc/time/gmtime_r.c (gmtime_r): Changed to call _mktm_r.
-	*  libc/time/lcltime_r.c (lcltime_r): Ditto.
-	*  libc/time/local.h: New local header file.
-	*  libc/time/mktime.c (mktime): Add timezone support.
-	*  libc/time/mktm_r.c: New file which is the common engine
-	for gmtime_r and lcltime_r.  This code has timezone support.
-	*  libc/time/strftime.c (strftime): Add %Z timezone support.
-	*  libc/time/tzlock.c: New file containing timezone lock stubs.
-	*  libc/time/tzset.c: New file containing tzset() routine.
-	*  libc/time/tzset_r.c: New file containing _tzset_r and
-	internal routine for calculating timezone changes for specified year.
-
-2002-04-17  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* configure.in (CRT0_DIR): Set to libc/.
-	(CRT1_DIR): Set to ${crt1_dir}/ if crt1_dir is non-empty.
-	* Makefile.am: Change all occurrences of $(CRT0_DIR)/$(CRT0) to
-	$(CRT0_DIR)$(CRT0) to prevent make warnings.  Likewise for
-	$(CRT1_DIR)/$(CRT1).
-	* libc/machine/xstormy16/Makefile.in: Regenerated.
-	* libc/machine/xstormy16/aclocal.m4: Regenerated.
-	* libc/machine/xstormy16/configure: Regenerated.
-
-2002-04-13  Alexandre Oliva  <aoliva@redhat.com>
-
-	* libc/stdlib/mallocr.c (malloc_extend_top): If correction sbrk
-	fails, don't bail out, and try to correct next time.
-
-	* libc/include/sys/config.h: Include limits.h.
-
-2002-04-12  Eric Norum  <eric.norum@usask.com>
-
-	* libc/sys/rtems/crt0.c (rtems_gxx_mutex_init): Dummy
-	routine to allow autoconf to determine that building executables
-	for rtems works.
-	(rtems_gxx_mutex_lock, rtems_gxx_mutex_unlock): Ditto.
-	(rtems_gxx_mutex_once): Ditto.
-
-2002-04-09  Tom Rix  <trix@redhat.com>
-
-	* libc/include/sys/reent.h (_REENT_INIT_PTR): Fix typo.
-
-2002-04-09  Mark Bradshaw  <bradshaw@staff.crosswalk.com>
-
-        * libc/include/time.h: Fix strptime declaration.
-        * libc/time/Makefile.am: Add strptime.c.
-	* libc/time/Makefile.in: Regenerated.
-        * libc/time/strptime.c: New file.
-
-2002-04-08  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/sys/linux/include/setjmp.h: Add sigjmp_buf type,
-	siglongjmp prototype, and sigsetjmp macro definition.
-	* libc/sys/linux/siglongjmp.c: New file.
-	* libc/sys/linux/Makefile.am: Add support for siglongjmp.
-	* libc/sys/linux/Makefile.in: Regenerated.
-
-2002-04-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* Makefile.am: Add support for installing crt1.o if one exists.
-	* configure.host: Specify crt1.o for linux.
-	* configure.in: Expose CRT1 and CRT1_DIR for Makefile.am to use.
-	* Makefile.in: Regenerated.
-	* configure: Ditto.
-	* libc/include/sys/unistd.h (_SC_STREAM_MAX, _SC_PRIORITY_SCHEDULING):
-	Added for non-Cygwin, non-RTEMS configurations.
-	* libc/sys/linux/Makefile.am: Add support for crt1 and sysconf.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/crt1.c: New empty file to override one defaulted
-	by gcc.  This fixes problem with reconfiguring linux newlib build.
-	* libc/sys/linux/sysconf.c: New file.
-
-2002-04-03  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: Add support for machine subdirectory of
-	sys subdirectory.
-	* configure.in: Add check for sys machine subdirectory.
-	* Makefile.am: Ditto.
-	* configure: Regenerated.
-	* Makefile.in: Ditto.
-	* libc/sys/linux/crt0.c: Moved to machine/i386 directory.
-	* libc/sys/linux/sys/syscall.h: Ditto.
-	* libc/sys/linux/sleep.c: New file.
-	* libc/sys/linux/socket.c: Ditto.
-	* libc/sys/linux/sockops.h: Ditto.
-	* libc/sys/linux/stack.c: Ditto.
-	* libc/sys/linux/usleep.c: Ditto.
-	* libc/sys/linux/machine/Makefile.am: Ditto.
-	* libc/sys/linux/machine/Makefile.in: Ditto.
-	* libc/sys/linux/machine/aclocal.m4: Ditto.
-	* libc/sys/linux/machine/configure: Ditto.
-	* libc/sys/linux/machine/configure.in: Ditto.
-	* libc/sys/linux/machine/i386/Makefile.am: Ditto.
-	* libc/sys/linux/machine/i386/Makefile.in: Ditto.
-	* libc/sys/linux/machine/i386/aclocal.m4: Ditto.
-	* libc/sys/linux/machine/i386/configure: Ditto.
-	* libc/sys/linux/machine/i386/configure.in: Ditto.
-	* libc/sys/linux/machine/i386/crt0.c: Ditto.
-	* libc/sys/linux/machine/i386/sigset.c: Ditto.
-	* libc/sys/linux/machine/i386/sigstack.h: Ditto.
-	* libc/sys/linux/machine/i386/socketcall.h: Ditto.
-	* libc/sys/linux/machine/i386/syscall.h: Ditto.
-	* libc/sys/linux/sys/select.h: Ditto.
-	* libc/sys/linux/configure.in: Add support for machine directory.
-	* libc/sys/linux/Makefile.am: Ditto plus add new files above.
-	* libc/sys/linux/Makefile.in: Regenerated.
-	* libc/sys/linux/configure: Ditto.
-	* libc/sys/linux/brk.c: Use machine/syscall.h instead of sys/syscall.h.
-	* libc/sys/linux/inode.c: Ditto.
-	* libc/sys/linux/linux.c: Ditto.
-	* libc/sys/linux/process.c: Ditto.
-	* libc/sys/linux/systat.c: Ditto.
-	* libc/sys/linux/time.c: Ditto.
-	* libc/sys/linux/wait.c: Ditto.
-	* libc/sys/linux/ids.c: Change header plus add setfsgid/setfsuid.
-	* libc/sys/linux/io.c: Change header plus add readv/writev.
-	* libc/sys/linux/signal.c: Change header plus change sigsuspend to
-	use __sigsuspend syscall.
-	* libc/sys/linux/select.c: Change header plus change select to
-	use _newselect syscall.
-	* libc/sys/linux/sys/cdefs.h: Add a number of standard definitions
-	used by glibc header files.
-	* libc/sys/linux/sys/types.h: Add __socklen_t and __useconds_t
-	types.
-
-2002-04-01  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/reent.h (_REENT_INIT_PTR): New macro for
-	initializing a struct _reent that has been dynamically allocated.
-	(_REENT_CHECK_MISC): New macro that checks _misc struct for
-	_REENT_SMALL and does nothing otherwise.
-	(_REENT_STRTOK_LAST): New macro for reentrant strtok.
-	(_REENT_MBLEN_STATE): New macro for reentrant mblen.
-	(_REENT_MBTOWC_STATE): New macro for reentrant mbtowc.
-	(_REENT_WCTOMB_STATE): New macro for reentrant wctomb.
-	[_REENT_SMALL](struct _misc_reent): New structure containing
-	miscellaneous reentrant areas needed by newlib.
-	[_REENT_SMALL](struct _reent): Add _misc pointer.
-	[_REENT_SMALL](_REENT_INIT_MISC): New macro.
-	* libc/string/strtok (strtok): Change to use _REENT_CHECK_MISC
-	and _REENT_STRTOK_LAST macros.
-	* libc/stdlib/mblen (mblen): Change to use _REENT_CHECK_MISC
-	and _REENT_MBLEN_STATE macros.
-	* libc/stdlib/mbtowc (mbtowc): Change to use _REENT_CHECK_MISC
-	and _REENT_MBTOWC_STATE macros.
-	* libc/stdlib/wctomb (wctomb): Change to use _REENT_CHECK_MISC
-	and _REENT_WCTOMB_STATE macros.
-
-2002-04-01  Till Straumann <strauman@SLAC.Stanford.EDU>
-
-	* libc/stdlib/getenv_r.c (_findenv_r): Add missing ENV_UNLOCK.
-
-Wed Mar 27 07:34:44 2002  Jason Tishler <jason@tishler.net>
-
-	* libc/include/sys/features.h (_POSIX_SEMAPHORES): New Cygwin define.
-
-Tue Mar 26 17:17:10 2002  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/machine/sh/memcpy.S (Large): Fix alignment rounding.
-	Store high part of leading bytes too.
-
-2002-03-22  Richard Sandiford  <rsandifo@redhat.com>
-
-	* libm/math/ef_hypot.c: Increase scale factor to 68.
-
-2002-03-13  Alexandre Oliva  <aoliva@redhat.com>
-
-	* libc/machine/mips/strlen.c (strlen) [__mips16]: Fix off-by-two
-	error.
-
-2002-03-12  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/sys/go32/access.c: Change license to relaxed license
-        used in identical file throughout newlib/libgloss.
-
-2002-03-12  Richard Earnshaw  <rearnsha@arm.com>
-
-	* libc/sys/arm/access.c: New file.
-	* libc/sys/arm/Makefile.am (lib_a_SOURCES): Add access.c.
-	* libc/sys/arm/Makefile.in: Regenerate.
-	* libc/sys/arm/syscalls.c (_stat): New function.
-
-2002-03-11  Michael Meissner  <meissner@redhat.com>
-
-	* libc/machine/mips/Makefile.am (lib_a_SOURCES): Add Mips specific
-	variants strlen.c, strcmp.c, strncpy.c, memset.c and memcpy.c.
-	* libc/machine/mips/Makefile.in: Regenerate.
-	* libc/machine/mips/memcpy.c: New file, optimized for MIPS.
-	* libc/machine/mips/memset.c: Dito.
-	* libc/machine/mips/strcmp.c: Dito.
-	* libc/machine/mips/strlen.c: Dito.
-	* libc/machine/mips/strncmp.c: Dito.
-
-2002-03-06  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/machine/i386/Makefile.am: Add $(oext) for setjmp
-	object so it works for shared library or statici library.
-	* libc/machine/i386/Makefile.in: Regenerated.
-
-Wed Mar  6 10:24:26 2002  J"orn Rennecke <joern.rennecke@superh.com>
-
-	* libc/machine/sh/Makefile.am (lib_a_SOURCES, SH64 case):
-	Add memcpy.S, memset.S and strcpy.S.
-	* libc/machine/sh/Makefile.in: Regenerate.
-	* libc/machine/sh/asm.h (_ENTRY): Set SH5 alignment to 8 bytes.
-	(SHHI, SHLO): Define.
-	* libc/machine/sh/memset.S: Add code for SH5.
-	* libc/machine/sh/memset.S: Likewise.
-	* libc/machine/sh/strcpy.S: Likewise.
-
-2002-02-27  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* configure.host: Add check for --disable-newlib-io-float
-	configuration option and add -DNO_FLOATING_POINT to newlib cflags
-	if appropriate.
-	* acinclude.m4: Added --disable-newlib-io-float option.
-	* aclocal.m4: Regenerated.
-	* configure: Ditto.
-	* doc/aclocal.m4 doc/configure libc/aclocal.m4 libc/configure
-	* libc/*/aclocal.m4 libc/*/configure 
-	* libm/*/aclocal.m4 libm/*/configure: Ditto.
-	* libc/stdio/vfprintf.c [!INTEGER_ONLY]: Only set FLOATING_POINT
-	if NO_FLOATING_POINT flag is not defined.
-
-2002-02-25  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/config.h: Add __extension__ in front of
-	long long references.
-
-2002-02-23  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/sys/stat.h (_fstat): Don't declare when compiling Cygwin.
-	(_stat): Ditto.
-
-2002-02-23  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/sys/cygwin/sys/dirent.h (struct __DIR): Use __off32_t instead
-	of off_t.
-
-2002-02-20  Nick Clifton  <nickc@cambridge.redhat.com>
-
-	* libc/machine/xscale/strchr.c (strchr): Add 'r1' to the list of
-	clobbered registers.
-
-2002-02-19  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* configure.host (newlib_cflags): When host is in m68* add
-	-DCOMPACT_CTYPE.
-
-2002-02-15  Jeff Johnston  <jjohnstn@redhat.com>
-
-        * libc/include/sys/config.h: Add definitions for
-        __int16_t, __uint16_t, __int64_t, and __uint64_t.
-
-2002-02-12  Hans-Peter Nilsson  <hp@bitrange.com>
-
-        * libc/sys/mmixware/link.c: New.
-        * libc/sys/mmixware/sys/syscall.h (TRAP1i, I3f): Make asm
-        volatile.
-        * libc/sys/mmixware/times.c (_times): Renamed from times.
-        * libc/sys/mmixware/open.c (_open): Attempt to handle O_APPEND
-        properly by reading previous contents, not through BinaryReadWrite.
-        * libc/sys/mmixware/Makefile.am (lib_a_SOURCES): Add link.c
-        * libc/sys/mmixware/Makefile.in: Regenerate.
-
-2002-02-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/grp.h: Don't declare group functions when compiling
-	Cygwin.
-
-2002-02-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/include/grp.h: Include Cygwin specific header.
-	* libc/include/sys/stat.h: Ditto.  Don't define `struct stat'
-	when compiling for Cygwin.
-	* libc/include/sys/types.h: Don't define off_t, uid_t
-	and gid_t when compiling for Cygwin.
-
-2002-02-08  matthew green  <mrg@redhat.com>
-
-	* libc/include/sys/reent.h (_REENT_CHECK_EMERGENCY): Allocate
-	_REENT_EMERGENCY_SIZE, not sizeof(char *).
-
-2002-02-08  Alexandre Oliva  <aoliva@redhat.com>
-
-	Contribute sh64-elf.
-	2001-03-13  Alexandre Oliva  <aoliva@redhat.com>
-	* configure.host (newlib_cflags) [sh*-*-*]: Enable long long
-	support in printf.
-	2001-01-29  Alexandre Oliva  <aoliva@redhat.com>
-	* libc/machine/sh/setjmp.S [SH5]: Switch to SHmedia mode before
-	any labels.
-	2001-01-24  Alexandre Oliva  <aoliva@redhat.com>
-	* libc/sys/sh/trap.S (___trap34) [SH5]: Don't trash r2.
-	2000-12-16  Alexandre Oliva  <aoliva@redhat.com>
-	* libc/machine/sh/configure.in: Rework conditionals.
-	* libc/machine/sh/Makefile.am: Likewise.
-	* libc/machine/sh/configure, libc/machine/sh/Makefile.in: Rebuilt.
-	2000-12-01  Alexandre Oliva  <aoliva@redhat.com>
-	* configure.host: Match `sh*'.
-	* libc/include/machine/setjmp.h: Define for SH5.
-	* libc/machine/sh/configure.in: Detect SH5.
-	* libc/machine/sh/configure: Rebuilt.
-	* libc/machine/sh/Makefile.am: Use only setjmp.S for SH5.
-	* libc/machine/sh/Makefile.in: Rebuilt.
-	* libc/machine/sh/asm.h: Adjust for SH5.
-	* libc/machine/sh/setjmp.S: Implement in SHmedia.
-	* libc/sys/sh/crt0.S: Likewise.
-	* libc/sys/sh/trap.S: Likewise.
-
-2002-02-07  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/machine/i386/Makefile.am: (mach_add_src): Remove.
-	(mach_add_obj): Conditionally set to setjmp.o or nothing.
-	(LIB_SOURCES): Remove $(mach_add_src).
-	(lib_a_LIBADD, lib_a_DEPENDENCIES): Add and set to $(mach_add_src).
-	(lib_la_LIBADD, lib_la_DEPENDENCIES): Ditto.
-	* libc/machine/i386/Makefile.in: Regenerate.
-
-2002-02-05  Manik Raina <manik@cisco.com>
-
-	* libc/misc/dprintf.c (parse_number): #if 0 unused function.
-	* libc/stdlib/ldtoa.c (_ldcheck): Remove unused local variables
-	s, p, k, and outstr.
-	* libc/stdlib/dtoa.c (_dtoa_r): Initialize mlo.
-
-2002-02-04  Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/include/sys/reent.h [(!_REENT_SMALL]: Add
-	_REENT_CHECK_EMERGENCY macro.
-
-2002-02-03  matthew green  <mrg@redhat.com>
-
-	* libc/reent/signgam.c (__signgam): Fix error in previous.
-
-2002-02-02  matthew green  <mrg@redhat.com>
-
-	* libc/include/sys/config.h (_REENT_SMALL): Define for Xstormy16.
-
-	* libc/reent/reent.c (_reclaim_reent): Clean for _REENT_SMALL case.
-	* libc/reent/reent.tex: Add blurb about _REENT_SMALL.
-	* libc/include/sys/reent.h (struct _reent): Completely new version
-	for _REENT_SMALL.
-	(_REENT_INIT): New defines, different defintion depending on _REENT_SMALL.
-	(_REENT_CHECK, _REENT_CHECK_TM): Likewise.
-	(_REENT_CHECK_ASCTIME_BUF, _REENT_INIT_RAND48): Likewise.
-	(_REENT_CHECK_RAND48, _REENT_INIT_MP, _REENT_CHECK_MP): Likewise.
-	(_REENT_CHECK_EMERGENCY, _REENT_SIGNGAM, _REENT_RAND_NEXT): Likewise.
-	(_REENT_RAND48_SEED, _REENT_RAND48_MULT, _REENT_RAND48_ADD): Likewise.
-	(_REENT_MP_RESULT, _REENT_MP_RESULT_K, _REENT_MP_P5S): Likewise.
-	(_REENT_MP_FREELIST, _REENT_ASCTIME_BUF, _REENT_TM): Likewise.
-	(_REENT_EMERGENCY): Likewise.
-
-	* libc/include/sys/reent.h (struct __sFILE_fake): New struct, same as
-	the start of the real __sFILE, used for stdin, stdout and stderr until
-	they are setup properly.
-	(struct __sFILE): Move location of _data in _REENT_SMALL case.
-	* libc/stdio/findfp.c (__sinit): Rearrange for _REENT_SMALL case by
-	allocated stdin, stdout and stderr.
-	* libc/stdio/getchar.c (_getchar_r): Call _REENT_SMALL_CHECK_INIT().
-	* libc/stdio/iprintf.c (iprintf, _iprintf_r): Likewise.
-	* libc/stdio/perror.c (_perror_r): Likewise.
-	* libc/stdio/printf.c (printf, _printf_r): Likewise.
-	* libc/stdio/putchar.c (_putchar_r): Likewise.
-	* libc/stdio/puts.c (_puts_r): Likewise.
-	* libc/stdio/scanf.c (scanf, _scanf_r): Likewise.
-	* libc/stdio/vprintf.c (vprintf): Likewise.
-	* libc/stdio/vscanf.c (vscanf, _vscanf_r): Likewise.
-
-	* libc/stdio/tmpnam.c (_tmpnam_r): Use _REENT_EMERGENCY().
-
-	* libc/reent/reent.c (_wrapup_reent): Adjust for _REENT_SMALL atexit.
-	* libc/include/sys/reent.h (_atexit): Limit atexit() entries to 32
-	for _REENT_SMALL.
-	* libc/stdlib/atexit.c (atexit): Rearrange for _REENT_SMALL case.
-	* libc/stdlib/exit.c (exit): Rearrange for _REENT_SMALL case.
-
-	* libc/include/sys/reent.h (struct _rand48): Keep _rand_next if
-	_REENT_SMALL.
-	* libc/stdlib/drand48.c (_drand48_r): Call _REENT_CHECK_RAND48().
-	* libc/stdlib/lcong48.c (_lcong48_r): Likewise.
-	* libc/stdlib/lrand48.c (_lrand48_r): Likewise.
-	* libc/stdlib/mrand48.c (_mrand48_r): Likewise.
-	* libc/stdlib/rand48.c (__dorand48): Likewise.
-	* libc/stdlib/seed48.c (_seed48_r): Likewise.
-	* libc/stdlib/srand48.c (_srand48_r): Likewise.
-	* libc/stdlib/rand48.h (__rand48_seed, __rand48_mult, __rand48_add): Define
-	as _REENT_RAND48_SEED(), _REENT_RAND48_MULT() and _REENT_RAND48_ADD().
-	* libc/stdlib/dtoa.c (_dtoa_r): Call _REENT_CHECK_MP().  Use
-	_REENT_MP_RESULT() and _REENT_MP_RESULT_K().
-	* libc/stdlib/ldtoa.c (_ldtoa_r): Likewise.
-	* libc/stdlib/rand.c (srand): Use _REENT_RAND_NEXT().
-	* libc/stdlib/rand.c (rand): Likewise.
-
-	* libc/stdlib/mallocr.c (malloc_stats): Call _REENT_SMALL_CHECK_INIT().
-	* libc/stdlib/mstats.c (_mstats_r): Call _REENT_SMALL_CHECK_INIT().
-
-	* libc/stdlib/mprec.c (Balloc): Call _REENT_CHECK_MP.  Use
-	_REENT_MP_FREELIST() and _REENT_MP_P5S.
-	* libc/include/sys/reent.h (struct _mprec): New structure.
-
-	* libc/include/sys/reent.h (struct _reent): Rename _strtok_last to
-	_unused_strtok_last.
-	* libc/string/strtok.c (strtok): Use a local static variable.
-
-	* libc/include/sys/reent.h (_REENT_ASCTIME_SIZE): New define.
-	(_REENT_EMERGENCY_SIZE): Likewise.
-	* libc/time/asctime.c (asctime): Call _REENT_CHECK_ASCTIME_BUF().  Use
-	_REENT_ASCTIME_BUF().
-	* libc/time/lcltime.c (localtime): Call _REENT_CHECK_TM().  Use
-	_REENT_TM().
-
-	* libc/include/math.h (__singam_r): Use _REENT_SIGNGAM().
-	* libc/reent/signgam.c (__signgam): Use _REENT_SIGNGAM().
-	* libm/math/w_gamma.c (gamma): Use _REENT_SIGNGAM().
-	* libm/math/w_lgamma.c (lgamma): Use _REENT_SIGNGAM().
-	* libm/math/wf_gamma.c (gammaf): Use _REENT_SIGNGAM().
-	* libm/math/wf_lgamma.c (lgammaf): Use _REENT_SIGNGAM().
-
-2002-02-01  Geoffrey Keating  <geoffk@redhat.com>
-
-	* configure.host (xstormy16): Don't use the generic malloc.
-	* libc/machine/xstormy16/Makefile.am: Build tiny-malloc.
-	* libc/machine/xstormy16/Makefile.in: Regenerate.
-	* libc/machine/xstormy16/mallocr.c: New file.
-	* libc/machine/xstormy16/tiny-malloc.c: New file.
-
-2002-01-28  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/include/sys/signal.h [__CYGWIN__]: Issue error message
-	when _CYGWIN_TYPES_H is not defined.
-
-2002-01-24  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/include/sys/signal.h: Revert 2002-01-23 change.
-
-2002-01-23  Thomas Fitzsimmons  <fitzsim@redhat.com>
-
-	* libc/include/sys/signal.h: Remove pthread_kill declaration
-	when __CYGWIN__ is defined.
-
-2002-01-18  Mark Bradshaw  <bradshaw@staff.crosswalk.com>
-
-	* libc/include/time.h: Add prototype for strptime for Cygwin.
-
-2002-01-17  Nick Clifton  <nickc@cambridge.redhat.com>
-
-	* libc/machine/xscale/memset.c (memset): Fix bug when len == 1 and
-	dst was not word aligned.
-
-	* libc/sys/arm/syscalls.c (_sbrk): Return -1 rather than aborting
-	if too much memory is requested.
-
-2002-01-11 Jeff Johnston  <jjohnstn@redhat.com>
-
-	* libc/stdio/vfscanf.c (__svfscanf_r): Change loop that
-	reads blanks from the input file to break if EOF reached
-	rather than end processing.
-
-2002-01-07 Jeff Johnston  <jjohnstn@redhat.com>
-
-	* MAINTAINERS: Change e-mail addresses to refer to redhat domain.
-
-2002-01-07 Alan Matsuoka <alanm@redhat.com>
-
-        * libc/include/machine/ieeefp.h: Configure d10v doubles to
-        be 32 bits if __DOUBLE__ == 32  otherwise doubles are 64 bits.
-        libc/include/sys/config.h: Ditto.
-
-2001-12-28  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libc/sys/cygwin/sys/utmp.h: Add definition of UTMP_FILE.
-
-2001-12-22  Geoffrey Keating  <geoffk@redhat.com>
-	    Catherine Moore  <clm@redhat.com>
-	    Richard Henderson  <rth@redhat.com>
-	    Corinna Vinschen  <vinschen@redhat.com>
-
-	* configure.host: Add support for xstormy16.
-	* libc/include/machine/ieeefp.h: Add support for xstormy16.
-	* libc/include/machine/setjmp.h: Add support for xstormy16.
-	* libc/include/sys/config.h: Add support for xstormy16.
-	* libc/machine/xstormy16/Makefile.am: New file.
-	* libc/machine/xstormy16/Makefile.in: New file.
-	* libc/machine/xstormy16/aclocal.m4: New file.
-	* libc/machine/xstormy16/configure: New file.
-	* libc/machine/xstormy16/configure.in: New file.
-	* libc/machine/xstormy16/setjmp.S: New file.
-
 2001-12-19  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* libm/machine/configure.in (HAVE_LIBM_MACHINE_DIR): New conditional.
diff --git a/newlib/MAINTAINERS b/newlib/MAINTAINERS
index cca33c3..413862b 100644
--- a/newlib/MAINTAINERS
+++ b/newlib/MAINTAINERS
@@ -5,7 +5,7 @@
 
 The official maintainers of newlib:
 
-Jeff Johnston			jjohnstn@redhat.com
+Jeff Johnston			jjohnstn@cygnus.com
 
 
 		     Various Domain Maintainers
@@ -21,25 +21,17 @@ If there are several maintainers for a given domain then
 responsibility falls to the first maintainer.  The first maintainer is
 free to devolve that responsibility among the other maintainers.
 
-Makefile.in, configure*:	jjohnstn@redhat.com
+Makefile.in, configure*:	jjohnstn@cygnus.com
 
-Cygwin:				cgf@redhat.com
+Cygwin:				cgf@cygnus.com
 
-Web pages:			jjohnstn@redhat.com
+Web pages:			jjohnstn@cygnus.com
 
 
-			CPU Port Maintainers	(CPU alphabetical order)
-
-CPU port maintainers may make changes in cpu-specific directories, as
-well as cpu-specific portions of the build system, without approval.
-
-m32c port		DJ Delorie		dj@redhat.com
-
 
 			Write After Approval
 
 These are users with general write privileges after getting approval:
 
-DJ Delorie			dj@redhat.com
-Christopher G. Faylor		cgf@redhat.com
-Jim Wilson			wilson@specifixinc.com
+DJ Delorie			dj@cygnus.com
+Christopher G. Faylor		cgf@cygnus.com
diff --git a/newlib/Makefile.am b/newlib/Makefile.am
index 9da9349..a759e2c 100644
--- a/newlib/Makefile.am
+++ b/newlib/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to generate Makefile.in
 
-AUTOMAKE_OPTIONS = cygnus dejagnu
-ACLOCAL_AMFLAGS = -I .
+AUTOMAKE_OPTIONS = cygnus
 
 # Multilib support variables.
 MULTISRCTOP =
@@ -28,7 +27,6 @@ AM_MAKEFLAGS = \
 	"CFLAGS=$(CFLAGS)" \
 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
 	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-	"INSTALL=$(INSTALL)" \
 	"LDFLAGS=$(LDFLAGS)" \
 	"LIBCFLAGS=$(LIBCFLAGS)" \
 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
@@ -45,10 +43,9 @@ AM_MAKEFLAGS = \
 	"libdir=$(libdir)" \
 	"prefix=$(prefix)" \
 	"tooldir=$(tooldir)" \
-	"top_toollibdir=$(toollibdir)" \
 	"AR=$(AR)" \
 	"AS=$(AS)" \
-	"CC=$(CC_FOR_NEWLIB)" \
+	"CC=$(CC)" \
 	"LD=$(LD)" \
 	"LIBCFLAGS=$(LIBCFLAGS)" \
 	"NM=$(NM)" \
@@ -60,12 +57,9 @@ FLAGS_TO_PASS=$(AM_MAKEFLAGS)
 
 if HAVE_DOC
 DOCDIR = doc
-else
-DOCDIR =
 endif
 
-SUBDIRS = libc libm \
-	$(DOCDIR) . $(EXTRA_DIRS)
+SUBDIRS = libc libm $(DOCDIR) .
 
 tooldir = $(exec_prefix)/$(host_alias)
 toollibdir = $(tooldir)/lib$(MULTISUBDIR)
@@ -73,16 +67,14 @@ toollibdir = $(tooldir)/lib$(MULTISUBDIR)
 AR_FLAGS = rc
 
 if USE_LIBTOOL
-toollib_LTLIBRARIES = libm.la \
-	libc.la
+toollib_LTLIBRARIES = libm.la libc.la
 else
-toollib_LIBRARIES = libm.a \
-	libc.a
+toollib_LIBRARIES = libm.a libc.a
 endif
 
 noinst_DATA = stmp-targ-include
 
-toollib_DATA = $(CRT0) $(CRT1)
+toollib_DATA = $(CRT0)
 
 
 # The functions ldexp, frexp and modf are traditionally supplied in
@@ -91,9 +83,6 @@ toollib_DATA = $(CRT0) $(CRT1)
 MATHOBJS_IN_LIBC = \
 	s_isinf.$(oext) sf_isinf.$(oext) \
 	s_isnan.$(oext) sf_isnan.$(oext) \
-	s_isinfd.$(oext) sf_isinff.$(oext) \
-	s_isnand.$(oext) sf_isnanf.$(oext) \
-	s_nan.$(oext) sf_nan.$(oext) \
 	s_ldexp.$(oext) sf_ldexp.$(oext) \
 	s_frexp.$(oext) sf_frexp.$(oext) \
 	s_modf.$(oext) \
@@ -108,12 +97,9 @@ LIBC_OBJECTLISTS = \
 	$(SIGNAL_OBJECTLIST) \
 	$(SYSCALL_OBJECTLIST) \
 	$(UNIX_OBJECTLIST) \
-	$(STDIO64_OBJECTLIST) \
-	libc/argz/objectlist.awk.in \
 	libc/stdlib/objectlist.awk.in \
 	libc/time/objectlist.awk.in \
 	libc/ctype/objectlist.awk.in \
-	libc/search/objectlist.awk.in \
 	libc/string/objectlist.awk.in \
 	libc/locale/objectlist.awk.in \
 	libc/misc/objectlist.awk.in \
@@ -121,17 +107,16 @@ LIBC_OBJECTLISTS = \
 	libc/errno/objectlist.awk.in \
 	libc/stdio/objectlist.awk.in \
 	$(MACHINE_OBJECTLIST) \
-	$(SYS_OBJECTLIST) \
-	$(SYS_MACH_OBJECTLIST)
+	$(SYS_OBJECTLIST)
 
 LIBM_OBJECTLISTS = \
 	libm/$(MATHDIR)/objectlist.awk.in \
 	libm/common/objectlist.awk.in \
 	$(LIBM_MACHINE_OBJECTLIST)
 
-libm_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/libc/sys/linux/shared.ld -lgcc -objectlist libm-libtool-objectlist
+libm_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/libc/sys/linux/shared.ld `cat libm-libtool-objectlist`
 
-libc_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/libc/sys/linux/shared.ld -lgcc -objectlist libc-libtool-objectlist
+libc_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/libc/sys/linux/shared.ld `cat libc-libtool-objectlist`
 
 if USE_LIBTOOL
 libm_la_SOURCES =
@@ -171,20 +156,12 @@ libm/libm.a: ; @true
 
 endif # USE_LIBTOOL
 
-crt0.o: $(CRT0_DIR)$(CRT0)
-	rm -f $@
-	ln $(CRT0_DIR)$(CRT0) $@ >/dev/null 2>/dev/null \
-	 || cp $(CRT0_DIR)$(CRT0) $@
-
-$(CRT0_DIR)$(CRT0): ; @true
-
-crt1.o: $(CRT1_DIR)$(CRT1)
+crt0.o: $(CRT0_DIR)/$(CRT0)
 	rm -f $@
-	ln $(CRT0_DIR)$(CRT0) $@ >/dev/null 2>/dev/null \
-	 || cp $(CRT0_DIR)$(CRT0) $@
-
-$(CRT1_DIR)$(CRT1): ; @true
+	ln $(CRT0_DIR)/$(CRT0) $@ >/dev/null 2>/dev/null \
+	 || cp $(CRT0_DIR)/$(CRT0) $@
 
+$(CRT0_DIR)/$(CRT0): ; @true
 
 all-recursive: stmp-targ-include
 
@@ -193,23 +170,12 @@ all-recursive: stmp-targ-include
 # used while building.
 stmp-targ-include: config.status
 	-rm -rf targ-include stmp-targ-include
-	mkdir targ-include targ-include/sys targ-include/machine targ-include/bits
-	cp newlib.h targ-include/newlib.h
+	mkdir targ-include targ-include/sys targ-include/machine
 	-for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
 	      cp $$i targ-include/machine/`basename $$i`; \
 	    else true; fi ; \
 	  done
-	-for i in $(srcdir)/libc/machine/$(machine_dir)/sys/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/sys/`basename $$i`; \
-	    else true; fi ; \
-	  done
-	-for i in $(srcdir)/libc/machine/$(machine_dir)/include/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/`basename $$i`; \
-	    else true; fi ; \
-	  done
 	-for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \
 	    if [ -f $$i ]; then \
 	      cp $$i targ-include/`basename $$i`; \
@@ -220,26 +186,6 @@ stmp-targ-include: config.status
 	      cp $$i targ-include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done
-	-for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/bits/`basename $$i`; \
-	    else true; fi ; \
-	  done
-	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/machine/`basename $$i`; \
-	    else true; fi ; \
-	  done
-	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/$(machine_dir)/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/machine/`basename $$i`; \
-	    else true; fi ; \
-	  done
-	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/$(machine_dir)/include/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/machine/`basename $$i`; \
-	    else true; fi ; \
-	  done
 	touch $@
 
 CLEANFILES = targ-include stmp-targ-include
@@ -250,13 +196,12 @@ else
 	rm -f $(DESTDIR)$(toollibdir)/libg.a
 	ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a >/dev/null 2>/dev/null || cp $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a
 endif
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
 	-if [ -z "$(MULTISUBDIR)" ]; then \
 	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include; \
 	  for i in $(srcdir)/libc/include/*.h; do \
 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
 	  done; \
-	  $(INSTALL_DATA) newlib.h $(DESTDIR)$(tooldir)/include/newlib.h; \
 	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/machine; \
 	  for i in $(srcdir)/libc/include/machine/*.h; do \
 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
@@ -270,42 +215,16 @@ endif
 	  for i in $(srcdir)/libc/include/sys/*.h; do \
 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
 	  done; \
-	  for i in $(srcdir)/libc/machine/$(machine_dir)/sys/*.h; do \
-	    if [ -f $$i ]; then \
-	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
-	    else true; fi ; \
-	  done ; \
-	  for i in $(srcdir)/libc/machine/$(machine_dir)/include/*.h; do \
-	    if [ -f $$i ]; then \
-	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
-	    else true; fi ; \
-	  done ; \
 	  for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \
 	    if [ -f $$i ]; then \
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done ; \
-	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/bits; \
-	  for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
-	    if [ -f $$i ]; then \
-	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/bits/`basename $$i`; \
-	    else true; fi ; \
-	  done ; \
-	  for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
-	    if [ -f $$i ]; then \
-	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
-	    else true; fi ; \
-	  done ; \
 	  for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \
 	    if [ -f $$i ]; then \
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
 	    else true; fi ; \
 	  done ; \
-	  for i in $(srcdir)/libc/sys/$(sys_dir)/machine/$(machine_dir)/include/*.h; do \
-	    if [ -f $$i ]; then \
-	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
-	    else true; fi ; \
-	  done ; \
 	else true; fi
 
 # Force makedoc to be built before building info files.
@@ -317,92 +236,24 @@ doc/makedoc:
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
 
 # Multilib support.
-.PHONY: all-multi check-multi mostlyclean-multi clean-multi distclean-multi \
+.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
 	maintainer-clean-multi
 
 all-recursive: all-multi
-check-recursive: check-multi
 mostlyclean-recursive: mostlyclean-multi
 clean-recursive: clean-multi
 distclean-recursive: distclean-multi
 maintainer-clean-recursive: maintainer-clean-multi
 
-# The $(MAKE) comments below are to enable parallel building.
 all-multi:
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
-check-multi:
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=check multi-do # $(MAKE)
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
 mostlyclean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
+	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean
 clean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
+	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean
 distclean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
+	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean
 maintainer-clean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
+	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
 
 MAKEOVERRIDES=
-
-# dejagnu support
-
-RUNTESTFLAGS=
-
-site.exp: Makefile
-	@echo 'Making a new site.exp file...'
-	@test ! -f site.bak || rm -f site.bak
-	@echo '## these variables are automatically generated by make ##' > $@-t
-	@echo '# Do not edit here.  If you wish to override these values' >> $@-t
-	@echo '# edit the last section' >> $@-t
-	@echo 'set tool $(DEJATOOL)' >> $@-t
-	@echo 'set tool_version $(VERSION)' >> $@-t
-	@echo 'set srcdir $(srcdir)/testsuite' >> $@-t
-	@echo 'set objdir' `pwd` >> $@-t
-	@echo 'set tmpdir' `pwd`/testsuite >> $@-t
-	@echo 'set multibuildtop ./$(MULTIBUILDTOP)' >> $@-t
-	@echo 'set host_alias $(build_alias)' >> $@-t
-	@echo 'set host_triplet $(build_triplet)' >> $@-t
-	@echo 'set target_alias $(host_alias)' >> $@-t
-	@echo 'set target_triplet $(host_triplet)' >> $@-t
-	@echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
-	@test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
-	@test ! -f site.exp || mv site.exp site.bak
-	@mv $@-t site.exp
-
-check-DEJAGNU: site.exp
-	@if [ -d testsuite ] ; then \
-	  true ; \
-	else \
-	  mkdir testsuite ; \
-	fi
-	@rm -f testsuite/site.exp
-	@cp site.exp testsuite/site.exp
-	@rootme=`pwd` ; \
-	export rootme ; \
-	srcdir=`cd ${srcdir}; pwd` ; \
-	export srcdir ; \
-	EXPECT=`if [ -f $${rootme}/${MULTIBUILDTOP}../../expect/expect ] ; then \
-	          echo $${rootme}/${MULTIBUILDTOP}../../expect/expect ; \
-	        else \
-	          echo expect ; \
-	        fi` ; \
-	export EXPECT ; \
-	echo "Found expect: $${EXPECT}" ; \
-	if [ -f $(top_builddir)/$(MULTIBUILDTOP)../../expect/expect ] ; then \
-	  TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd` ; \
-	  export TCL_LIBRARY ; \
-	  echo "Found TCL library directory: $${TCL_LIBRARY}" ; \
-	fi ; \
-	RUNTEST=`if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
-	           echo $${srcdir}/../dejagnu/runtest ; \
-	         else \
-	           echo runtest ; \
-	         fi` ; \
-	export RUNTEST ; \
-	echo "Found runtest: $${RUNTEST}" ; \
-	cd testsuite ; \
-	if $(SHELL) -c "$$RUNTEST --version" > /dev/null 2>&1 ; then \
-	   $$RUNTEST --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite $(RUNTESTFLAGS) ; \
-	   : ; \
-	else \
-	   echo "WARNING: could not find \`runtest'" 1>&2 ; \
-	fi
diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index ce3f148..eb35a57 100644
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,30 +57,18 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 AWK = @AWK@
 CC = @CC@
 CC_FOR_BUILD = @CC_FOR_BUILD@
-CC_FOR_NEWLIB = @CC_FOR_NEWLIB@
 CPP = @CPP@
 CRT0 = @CRT0@
 CRT0_DIR = @CRT0_DIR@
-CRT1 = @CRT1@
-CRT1_DIR = @CRT1_DIR@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-EXTRA_DIRS = @EXTRA_DIRS@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBM_MACHINE_OBJECTLIST = @LIBM_MACHINE_OBJECTLIST@
 LIBTOOL = @LIBTOOL@
@@ -90,29 +78,22 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POSIX_OBJECTLIST = @POSIX_OBJECTLIST@
 RANLIB = @RANLIB@
 SIGNAL_OBJECTLIST = @SIGNAL_OBJECTLIST@
-STDIO64_OBJECTLIST = @STDIO64_OBJECTLIST@
-STRIP = @STRIP@
 SYSCALL_OBJECTLIST = @SYSCALL_OBJECTLIST@
-SYS_MACH_OBJECTLIST = @SYS_MACH_OBJECTLIST@
 SYS_OBJECTLIST = @SYS_OBJECTLIST@
 UNIX_OBJECTLIST = @UNIX_OBJECTLIST@
 VERSION = @VERSION@
 aext = @aext@
-libc_cv_array_aliasing = @libc_cv_array_aliasing@
-libc_cv_initfinit_array = @libc_cv_initfinit_array@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
 oext = @oext@
 sys_dir = @sys_dir@
 
-AUTOMAKE_OPTIONS = cygnus dejagnu
-ACLOCAL_AMFLAGS = -I .
+AUTOMAKE_OPTIONS = cygnus
 
 # Multilib support variables.
 MULTISRCTOP = 
@@ -123,81 +104,133 @@ MULTIDO = true
 MULTICLEAN = true
 
 LIBTOOL_VERSION_INFO = 0:0:0
-@NEWLIB_HW_FP_TRUE@MATHDIR = mathfp
-@NEWLIB_HW_FP_FALSE@MATHDIR = math
+@NEWLIB_HW_FP_TRUE@MATHDIR = @NEWLIB_HW_FP_TRUE@mathfp
+@NEWLIB_HW_FP_FALSE@MATHDIR = @NEWLIB_HW_FP_FALSE@math
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
 # friends when we are called from the top level Makefile.
-AM_MAKEFLAGS =  	"AR_FLAGS=$(AR_FLAGS)" 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" 	"CFLAGS=$(CFLAGS)" 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" 	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" 	"INSTALL=$(INSTALL)" 	"LDFLAGS=$(LDFLAGS)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" 	"MAKE=$(MAKE)" 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 	"PICFLAG=$(PICFLAG)" 	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" 	"SHELL=$(SHELL)" 	"EXPECT=$(EXPECT)" 	"RUNTEST=$(RUNTEST)" 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" 	"exec_prefix=$(exec_prefix)" 	"infodir=$(infodir)" 	"libdir=$(libdir)" 	"prefix=$(prefix)" 	"tooldir=$(tooldir)" 	"top_toollibdir=$(toollibdir)" 	"AR=$(AR)" 	"AS=$(AS)" 	"CC=$(CC_FOR_NEWLIB)" 	"LD=$(LD)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"NM=$(NM)" 	"PICFLAG=$(PICFLAG)" 	"RANLIB=$(RANLIB)" 	"DESTDIR=$(DESTDIR)"
+AM_MAKEFLAGS = \
+	"AR_FLAGS=$(AR_FLAGS)" \
+	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+	"CFLAGS=$(CFLAGS)" \
+	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+	"LDFLAGS=$(LDFLAGS)" \
+	"LIBCFLAGS=$(LIBCFLAGS)" \
+	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+	"MAKE=$(MAKE)" \
+	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+	"PICFLAG=$(PICFLAG)" \
+	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+	"SHELL=$(SHELL)" \
+	"EXPECT=$(EXPECT)" \
+	"RUNTEST=$(RUNTEST)" \
+	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+	"exec_prefix=$(exec_prefix)" \
+	"infodir=$(infodir)" \
+	"libdir=$(libdir)" \
+	"prefix=$(prefix)" \
+	"tooldir=$(tooldir)" \
+	"AR=$(AR)" \
+	"AS=$(AS)" \
+	"CC=$(CC)" \
+	"LD=$(LD)" \
+	"LIBCFLAGS=$(LIBCFLAGS)" \
+	"NM=$(NM)" \
+	"PICFLAG=$(PICFLAG)" \
+	"RANLIB=$(RANLIB)" \
+	"DESTDIR=$(DESTDIR)"
 
 
 FLAGS_TO_PASS = $(AM_MAKEFLAGS)
-@HAVE_DOC_TRUE@DOCDIR = doc
-@HAVE_DOC_FALSE@DOCDIR = 
 
-SUBDIRS = libc libm 	$(DOCDIR) . $(EXTRA_DIRS)
+@HAVE_DOC_TRUE@DOCDIR = @HAVE_DOC_TRUE@doc
 
+SUBDIRS = libc libm $(DOCDIR) .
 
 tooldir = $(exec_prefix)/$(host_alias)
 toollibdir = $(tooldir)/lib$(MULTISUBDIR)
 
 AR_FLAGS = rc
 
-@USE_LIBTOOL_TRUE@toollib_LTLIBRARIES = libm.la 	libc.la
-@USE_LIBTOOL_FALSE@toollib_LIBRARIES = libm.a 	libc.a
+@USE_LIBTOOL_TRUE@toollib_LTLIBRARIES = @USE_LIBTOOL_TRUE@libm.la libc.la
+@USE_LIBTOOL_FALSE@toollib_LIBRARIES = @USE_LIBTOOL_FALSE@libm.a libc.a
 
 noinst_DATA = stmp-targ-include
 
-toollib_DATA = $(CRT0) $(CRT1)
+toollib_DATA = $(CRT0)
 
 # The functions ldexp, frexp and modf are traditionally supplied in
 # both libc.a and libm.a.  We build them in libm.a and copy them over,
 # along with some required supporting routines.
-MATHOBJS_IN_LIBC =  	s_isinf.$(oext) sf_isinf.$(oext) 	s_isnan.$(oext) sf_isnan.$(oext) 	s_isinfd.$(oext) sf_isinff.$(oext) 	s_isnand.$(oext) sf_isnanf.$(oext) 	s_nan.$(oext) sf_nan.$(oext) 	s_ldexp.$(oext) sf_ldexp.$(oext) 	s_frexp.$(oext) sf_frexp.$(oext) 	s_modf.$(oext) 	sf_modf.$(oext) s_scalbn.$(oext) 	sf_scalbn.$(oext) 	s_finite.$(oext) sf_finite.$(oext) 	s_copysign.$(oext) sf_copysign.$(oext) 	s_infconst.$(oext)
-
-
-LIBC_OBJECTLISTS =  	$(POSIX_OBJECTLIST) 	$(SIGNAL_OBJECTLIST) 	$(SYSCALL_OBJECTLIST) 	$(UNIX_OBJECTLIST) 	$(STDIO64_OBJECTLIST) 	libc/argz/objectlist.awk.in 	libc/stdlib/objectlist.awk.in 	libc/time/objectlist.awk.in 	libc/ctype/objectlist.awk.in 	libc/search/objectlist.awk.in 	libc/string/objectlist.awk.in 	libc/locale/objectlist.awk.in 	libc/misc/objectlist.awk.in 	libc/reent/objectlist.awk.in 	libc/errno/objectlist.awk.in 	libc/stdio/objectlist.awk.in 	$(MACHINE_OBJECTLIST) 	$(SYS_OBJECTLIST) 	$(SYS_MACH_OBJECTLIST)
-
-
-LIBM_OBJECTLISTS =  	libm/$(MATHDIR)/objectlist.awk.in 	libm/common/objectlist.awk.in 	$(LIBM_MACHINE_OBJECTLIST)
-
-
-libm_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/libc/sys/linux/shared.ld -lgcc -objectlist libm-libtool-objectlist
-
-libc_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/libc/sys/linux/shared.ld -lgcc -objectlist libc-libtool-objectlist
+MATHOBJS_IN_LIBC = \
+	s_isinf.$(oext) sf_isinf.$(oext) \
+	s_isnan.$(oext) sf_isnan.$(oext) \
+	s_ldexp.$(oext) sf_ldexp.$(oext) \
+	s_frexp.$(oext) sf_frexp.$(oext) \
+	s_modf.$(oext) \
+	sf_modf.$(oext) s_scalbn.$(oext) \
+	sf_scalbn.$(oext) \
+	s_finite.$(oext) sf_finite.$(oext) \
+	s_copysign.$(oext) sf_copysign.$(oext) \
+	s_infconst.$(oext)
+
+
+LIBC_OBJECTLISTS = \
+	$(POSIX_OBJECTLIST) \
+	$(SIGNAL_OBJECTLIST) \
+	$(SYSCALL_OBJECTLIST) \
+	$(UNIX_OBJECTLIST) \
+	libc/stdlib/objectlist.awk.in \
+	libc/time/objectlist.awk.in \
+	libc/ctype/objectlist.awk.in \
+	libc/string/objectlist.awk.in \
+	libc/locale/objectlist.awk.in \
+	libc/misc/objectlist.awk.in \
+	libc/reent/objectlist.awk.in \
+	libc/errno/objectlist.awk.in \
+	libc/stdio/objectlist.awk.in \
+	$(MACHINE_OBJECTLIST) \
+	$(SYS_OBJECTLIST)
+
+
+LIBM_OBJECTLISTS = \
+	libm/$(MATHDIR)/objectlist.awk.in \
+	libm/common/objectlist.awk.in \
+	$(LIBM_MACHINE_OBJECTLIST)
+
+
+libm_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/libc/sys/linux/shared.ld `cat libm-libtool-objectlist`
+
+libc_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/libc/sys/linux/shared.ld `cat libc-libtool-objectlist`
 
 @USE_LIBTOOL_TRUE@libm_la_SOURCES = 
-@USE_LIBTOOL_TRUE@libm_la_DEPENDENCIES = libm-libtool-objectlist
+@USE_LIBTOOL_TRUE@libm_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@libm-libtool-objectlist
 
 @USE_LIBTOOL_TRUE@libc_la_SOURCES = 
-@USE_LIBTOOL_TRUE@libc_la_DEPENDENCIES = libc-libtool-objectlist
+@USE_LIBTOOL_TRUE@libc_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@libc-libtool-objectlist
 
 CLEANFILES = targ-include stmp-targ-include
 
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
 
 MAKEOVERRIDES = 
-
-# dejagnu support
-
-RUNTESTFLAGS = 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-CONFIG_HEADER = newlib.h
 CONFIG_CLEAN_FILES = 
 LIBRARIES =  $(toollib_LIBRARIES)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
+DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 libm_a_LIBADD = 
 libm_a_SOURCES = libm.a.c
-libm_a_OBJECTS =  libm.a.$(OBJEXT)
+libm_a_OBJECTS =  libm.a.o
 libc_a_LIBADD = 
 libc_a_SOURCES = libc.a.c
-libc_a_OBJECTS =  libc.a.$(OBJEXT)
+libc_a_OBJECTS =  libc.a.o
 LTLIBRARIES =  $(toollib_LTLIBRARIES)
 
 libm_la_LIBADD = 
@@ -211,24 +244,21 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DATA =  $(noinst_DATA) $(toollib_DATA)
 
-DIST_COMMON =  README ./stamp-h.in ChangeLog Makefile.am Makefile.in \
-NEWS acconfig.h acinclude.m4 aclocal.m4 configure configure.in \
-newlib.hin
+DIST_COMMON =  README ChangeLog Makefile.am Makefile.in NEWS \
+acinclude.m4 aclocal.m4 configure configure.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
-DIST_SUBDIRS =  libc libm doc . @EXTRA_DIRS@
-EXPECT = `if test -f $(top_builddir)/../expect/expect; then echo $(top_builddir)/../expect/expect; else echo expect; fi`
-RUNTEST = `if test -f $(top_srcdir)/../dejagnu/runtest; then echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi`
+DIST_SUBDIRS =  libc libm doc .
 SOURCES = libm.a.c libc.a.c $(libm_la_SOURCES) $(libc_la_SOURCES)
-OBJECTS = libm.a.$(OBJEXT) libc.a.$(OBJEXT) $(libm_la_OBJECTS) $(libc_la_OBJECTS)
+OBJECTS = libm.a.o libc.a.o $(libm_la_OBJECTS) $(libc_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
+.SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
 
@@ -236,43 +266,14 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4 \
-		./acinclude.m4 ./aclocal.m4 ./libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
+	cd $(srcdir) && $(ACLOCAL)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-newlib.h: stamp-h
-	@if test ! -f $@; then \
-		rm -f stamp-h; \
-		$(MAKE) stamp-h; \
-	else :; fi
-stamp-h: $(srcdir)/newlib.hin $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=newlib.h:newlib.hin \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/newlib.hin: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
-	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f newlib.h
-
-maintainer-clean-hdr:
-
 mostlyclean-toollibLIBRARIES:
 
 clean-toollibLIBRARIES:
@@ -308,11 +309,6 @@ uninstall-toollibLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -321,7 +317,6 @@ uninstall-toollibLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -435,7 +430,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
+	  test "$$subdir" = "." && dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -464,7 +459,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP)
 	here=`pwd` && cd $(srcdir) \
 	  && mkid -f$$here/ID $$unique $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) newlib.hin $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -476,8 +471,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) newlib.hin $(TAGS_DEPENDENCIES) $(LIS
 	unique=`for i in $$list; do echo $$i; done | \
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)newlib.hin$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags newlib.hin $$unique $(LISP) -o $$here/TAGS)
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
@@ -546,24 +541,16 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
-
-DEJATOOL = $(PACKAGE)
-
-RUNTESTDEFAULTFLAGS = --tool $(DEJATOOL) --srcdir $$srcdir
 info-am:
 info: info-recursive
 dvi-am:
 dvi: dvi-recursive
 check-am:
-	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
 check: check-recursive
 installcheck-am:
 installcheck: installcheck-recursive
 install-info-am: 
 install-info: install-info-recursive
-all-recursive-am: newlib.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
 install-exec-am:
 install-exec: install-exec-recursive
 
@@ -577,8 +564,8 @@ install: install-recursive
 uninstall-am: uninstall-toollibLIBRARIES uninstall-toollibLTLIBRARIES \
 		uninstall-toollibDATA
 uninstall: uninstall-recursive
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) newlib.h
-all-redirect: all-recursive-am
+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
+all-redirect: all-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: installdirs-recursive
@@ -597,30 +584,27 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-toollibLIBRARIES \
-		mostlyclean-compile mostlyclean-libtool \
-		mostlyclean-toollibLTLIBRARIES mostlyclean-tags \
-		mostlyclean-generic
+mostlyclean-am:  mostlyclean-toollibLIBRARIES mostlyclean-compile \
+		mostlyclean-libtool mostlyclean-toollibLTLIBRARIES \
+		mostlyclean-tags mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-hdr clean-toollibLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-toollibLIBRARIES clean-compile clean-libtool \
 		clean-toollibLTLIBRARIES clean-tags clean-generic \
 		mostlyclean-am
 
 clean: clean-recursive
 
-distclean-am:  distclean-hdr distclean-toollibLIBRARIES \
-		distclean-compile distclean-libtool \
-		distclean-toollibLTLIBRARIES distclean-tags \
-		distclean-generic clean-am
+distclean-am:  distclean-toollibLIBRARIES distclean-compile \
+		distclean-libtool distclean-toollibLTLIBRARIES \
+		distclean-tags distclean-generic clean-am
 	-rm -f libtool
 
 distclean: distclean-recursive
 	-rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-hdr \
-		maintainer-clean-toollibLIBRARIES \
+maintainer-clean-am:  maintainer-clean-toollibLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-toollibLTLIBRARIES \
 		maintainer-clean-tags maintainer-clean-generic \
@@ -631,8 +615,7 @@ maintainer-clean-am:  maintainer-clean-hdr \
 maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-toollibLIBRARIES distclean-toollibLIBRARIES \
+.PHONY: mostlyclean-toollibLIBRARIES distclean-toollibLIBRARIES \
 clean-toollibLIBRARIES maintainer-clean-toollibLIBRARIES \
 uninstall-toollibLIBRARIES install-toollibLIBRARIES mostlyclean-compile \
 distclean-compile clean-compile maintainer-clean-compile \
@@ -646,13 +629,13 @@ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir check-DEJAGNU \
-info-am info dvi-am dvi check check-am installcheck-am installcheck \
-install-info-am install-info all-recursive-am install-exec-am \
-install-exec install-data-local install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-info-am \
+install-info install-exec-am install-exec install-data-local \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
 
 # objects listed later in LIBM_OBJECTLISTS will override those listed earlier
@@ -682,19 +665,12 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 @USE_LIBTOOL_FALSE@libm/libm.a: ; @true
 
-crt0.o: $(CRT0_DIR)$(CRT0)
-	rm -f $@
-	ln $(CRT0_DIR)$(CRT0) $@ >/dev/null 2>/dev/null \
-	 || cp $(CRT0_DIR)$(CRT0) $@
-
-$(CRT0_DIR)$(CRT0): ; @true
-
-crt1.o: $(CRT1_DIR)$(CRT1)
+crt0.o: $(CRT0_DIR)/$(CRT0)
 	rm -f $@
-	ln $(CRT0_DIR)$(CRT0) $@ >/dev/null 2>/dev/null \
-	 || cp $(CRT0_DIR)$(CRT0) $@
+	ln $(CRT0_DIR)/$(CRT0) $@ >/dev/null 2>/dev/null \
+	 || cp $(CRT0_DIR)/$(CRT0) $@
 
-$(CRT1_DIR)$(CRT1): ; @true
+$(CRT0_DIR)/$(CRT0): ; @true
 
 all-recursive: stmp-targ-include
 
@@ -703,23 +679,12 @@ all-recursive: stmp-targ-include
 # used while building.
 stmp-targ-include: config.status
 	-rm -rf targ-include stmp-targ-include
-	mkdir targ-include targ-include/sys targ-include/machine targ-include/bits
-	cp newlib.h targ-include/newlib.h
+	mkdir targ-include targ-include/sys targ-include/machine
 	-for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
 	      cp $$i targ-include/machine/`basename $$i`; \
 	    else true; fi ; \
 	  done
-	-for i in $(srcdir)/libc/machine/$(machine_dir)/sys/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/sys/`basename $$i`; \
-	    else true; fi ; \
-	  done
-	-for i in $(srcdir)/libc/machine/$(machine_dir)/include/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/`basename $$i`; \
-	    else true; fi ; \
-	  done
 	-for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \
 	    if [ -f $$i ]; then \
 	      cp $$i targ-include/`basename $$i`; \
@@ -730,38 +695,17 @@ stmp-targ-include: config.status
 	      cp $$i targ-include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done
-	-for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/bits/`basename $$i`; \
-	    else true; fi ; \
-	  done
-	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/machine/`basename $$i`; \
-	    else true; fi ; \
-	  done
-	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/$(machine_dir)/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/machine/`basename $$i`; \
-	    else true; fi ; \
-	  done
-	-for i in $(srcdir)/libc/sys/$(sys_dir)/machine/$(machine_dir)/include/*.h; do \
-	    if [ -f $$i ]; then \
-	      cp $$i targ-include/machine/`basename $$i`; \
-	    else true; fi ; \
-	  done
 	touch $@
 
 install-data-local:	install-toollibLIBRARIES
 @USE_LIBTOOL_FALSE@	rm -f $(DESTDIR)$(toollibdir)/libg.a
 @USE_LIBTOOL_FALSE@	ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a >/dev/null 2>/dev/null || cp $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
 	-if [ -z "$(MULTISUBDIR)" ]; then \
 	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include; \
 	  for i in $(srcdir)/libc/include/*.h; do \
 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
 	  done; \
-	  $(INSTALL_DATA) newlib.h $(DESTDIR)$(tooldir)/include/newlib.h; \
 	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/machine; \
 	  for i in $(srcdir)/libc/include/machine/*.h; do \
 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
@@ -775,42 +719,16 @@ install-data-local:	install-toollibLIBRARIES
 	  for i in $(srcdir)/libc/include/sys/*.h; do \
 	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
 	  done; \
-	  for i in $(srcdir)/libc/machine/$(machine_dir)/sys/*.h; do \
-	    if [ -f $$i ]; then \
-	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
-	    else true; fi ; \
-	  done ; \
-	  for i in $(srcdir)/libc/machine/$(machine_dir)/include/*.h; do \
-	    if [ -f $$i ]; then \
-	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
-	    else true; fi ; \
-	  done ; \
 	  for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \
 	    if [ -f $$i ]; then \
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
 	    else true; fi ; \
 	  done ; \
-	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/bits; \
-	  for i in $(srcdir)/libc/sys/$(sys_dir)/bits/*.h; do \
-	    if [ -f $$i ]; then \
-	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/bits/`basename $$i`; \
-	    else true; fi ; \
-	  done ; \
-	  for i in $(srcdir)/libc/sys/$(sys_dir)/machine/*.h; do \
-	    if [ -f $$i ]; then \
-	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
-	    else true; fi ; \
-	  done ; \
 	  for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \
 	    if [ -f $$i ]; then \
 	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
 	    else true; fi ; \
 	  done ; \
-	  for i in $(srcdir)/libc/sys/$(sys_dir)/machine/$(machine_dir)/include/*.h; do \
-	    if [ -f $$i ]; then \
-	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
-	    else true; fi ; \
-	  done ; \
 	else true; fi
 
 # Force makedoc to be built before building info files.
@@ -820,89 +738,25 @@ doc/makedoc:
 	cd doc && $(MAKE) all
 
 # Multilib support.
-.PHONY: all-multi check-multi mostlyclean-multi clean-multi distclean-multi \
+.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
 	maintainer-clean-multi
 
 all-recursive: all-multi
-check-recursive: check-multi
 mostlyclean-recursive: mostlyclean-multi
 clean-recursive: clean-multi
 distclean-recursive: distclean-multi
 maintainer-clean-recursive: maintainer-clean-multi
 
-# The $(MAKE) comments below are to enable parallel building.
 all-multi:
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
-check-multi:
-	$(MULTIDO) $(AM_MAKEFLAGS) DO=check multi-do # $(MAKE)
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do
 mostlyclean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
+	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean
 clean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
+	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean
 distclean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
+	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean
 maintainer-clean-multi:
-	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
-
-site.exp: Makefile
-	@echo 'Making a new site.exp file...'
-	@test ! -f site.bak || rm -f site.bak
-	@echo '## these variables are automatically generated by make ##' > $@-t
-	@echo '# Do not edit here.  If you wish to override these values' >> $@-t
-	@echo '# edit the last section' >> $@-t
-	@echo 'set tool $(DEJATOOL)' >> $@-t
-	@echo 'set tool_version $(VERSION)' >> $@-t
-	@echo 'set srcdir $(srcdir)/testsuite' >> $@-t
-	@echo 'set objdir' `pwd` >> $@-t
-	@echo 'set tmpdir' `pwd`/testsuite >> $@-t
-	@echo 'set multibuildtop ./$(MULTIBUILDTOP)' >> $@-t
-	@echo 'set host_alias $(build_alias)' >> $@-t
-	@echo 'set host_triplet $(build_triplet)' >> $@-t
-	@echo 'set target_alias $(host_alias)' >> $@-t
-	@echo 'set target_triplet $(host_triplet)' >> $@-t
-	@echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
-	@test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
-	@test ! -f site.exp || mv site.exp site.bak
-	@mv $@-t site.exp
-
-check-DEJAGNU: site.exp
-	@if [ -d testsuite ] ; then \
-	  true ; \
-	else \
-	  mkdir testsuite ; \
-	fi
-	@rm -f testsuite/site.exp
-	@cp site.exp testsuite/site.exp
-	@rootme=`pwd` ; \
-	export rootme ; \
-	srcdir=`cd ${srcdir}; pwd` ; \
-	export srcdir ; \
-	EXPECT=`if [ -f $${rootme}/${MULTIBUILDTOP}../../expect/expect ] ; then \
-	          echo $${rootme}/${MULTIBUILDTOP}../../expect/expect ; \
-	        else \
-	          echo expect ; \
-	        fi` ; \
-	export EXPECT ; \
-	echo "Found expect: $${EXPECT}" ; \
-	if [ -f $(top_builddir)/$(MULTIBUILDTOP)../../expect/expect ] ; then \
-	  TCL_LIBRARY=`cd $(top_srcdir)/../tcl/library && pwd` ; \
-	  export TCL_LIBRARY ; \
-	  echo "Found TCL library directory: $${TCL_LIBRARY}" ; \
-	fi ; \
-	RUNTEST=`if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
-	           echo $${srcdir}/../dejagnu/runtest ; \
-	         else \
-	           echo runtest ; \
-	         fi` ; \
-	export RUNTEST ; \
-	echo "Found runtest: $${RUNTEST}" ; \
-	cd testsuite ; \
-	if $(SHELL) -c "$$RUNTEST --version" > /dev/null 2>&1 ; then \
-	   $$RUNTEST --tool $(DEJATOOL) --srcdir $${srcdir}/testsuite $(RUNTESTFLAGS) ; \
-	   : ; \
-	else \
-	   echo "WARNING: could not find \`runtest'" 1>&2 ; \
-	fi
+	$(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/newlib/NEWS b/newlib/NEWS
index 3b8f9cf..9a606f2 100644
--- a/newlib/NEWS
+++ b/newlib/NEWS
@@ -1,46 +1,3 @@
-*** Major changes in newlib version 1.14.0:
-
-* new platforms added (cris, mt, m32c)
-* more locking protection macros added
-* various C99/POSIX/SUSV3 compliance issue improvements
-* reentrancy cleanup
-* header file improvements (e.g. adding RTEMS stdint.h/inttypes.h)
-* various math fixes
-* changes made to allow use of gcc4 to build newlib
-* general bug fixes and cleanups
-
-*** Major changes in newlib version 1.13.0:
-
-* optimized iconv support
-* new configuration option to disable syscalls in newlib (e.g. sys/arm)
-* new configuration options controlling long long, long double support
-* ability of configuration options to override platform defaults
-* improved locking protection for file I/O functions
-* new reentrant functions
-* various fixes to allow building under FC3 and Debian Linux
-* cxa exit support
-* new platforms (e.g. crx)
-* new iprintf and iscanf family functions
-
-*** Major changes in newlib version 1.12.0:
-
-* general iconv support added
-* major cleanup with linux header files regarding warnings
-* thread-safety and reentrancy fixes
-* additional wide character C99 functions
-* addition of %lc, %ls, %S, and %C printf format specifiers
-* doc cleanup
-
-*** Major changes in newlib version 1.11.0:
-
-* enhanced EL/IX support for i[3456]86-pc-linux 
-* new --enable-newlib-elix-level configuration option
-* positional arg I/O support for printf family (--enable-newlib-io-pos-args)
-* support for the Fujitsu FRV architecture added by Red Hat
-* support for Motorola Altivec and SPE added by Red Hat
-* new small reentrancy structure support
-* dynamic reentrancy structure support
-
 *** Major changes in newlib version 1.10.0:
 
 * libtool support for i[3456]86-pc-linux native builds
diff --git a/newlib/README b/newlib/README
index 7e8cef7..e07d29b 100644
--- a/newlib/README
+++ b/newlib/README
@@ -1,13 +1,13 @@
-                        README for newlib-1.14.0 release
+                        README for newlib-1.10.0 release
            (mostly cribbed from the README in the gdb-4.13 release)
 
 This is `newlib', a simple ANSI C library, math library, and collection
 of board support packages.
 
 The newlib and libgloss subdirectories are a collection of software from
-several sources, each with their own copyright and license.  See the file
-COPYING.NEWLIB for details.  The rest of the release tree is under either
-the GNU GPL or LGPL licenses.
+several sources, each with their own copyright.  See the file COPYING.NEWLIB
+for details.  The rest of the release tree is under either the GNU GPL or
+LPGL copyright.
 
 THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
@@ -17,8 +17,8 @@ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 Unpacking and Installation -- quick overview
 ==========================
 
-When you unpack the newlib-1.14.0.tar.gz file, you'll find a directory
-called `newlib-1.14.0', which contains:
+When you unpack the newlib-1.10.0.tar.gz file, you'll find a directory
+called `newlib-1.10.0', which contains:
 
 COPYING          config/          install-sh*      mpw-configure
 COPYING.LIB      config-ml.in     libgloss/        mpw-install
@@ -43,7 +43,7 @@ More Documentation
 ==================
 
    Newlib documentation is available on the net via:
-   http://sources.redhat.com/newlib/docs.html
+   http://www.cygnus.com/pubs/gnupro
 
    All the documentation for NEWLIB comes as part of the machine-readable
 distribution.  The documentation is written in Texinfo format, which is
@@ -94,13 +94,13 @@ directory.  If the path to `configure' would be the same as the
 argument to `--srcdir', you can leave out the `--srcdir' option; it
 will be assumed.)
 
-   For example, with version 1.14.0, you can build NEWLIB in a separate
+   For example, with version 1.10.0, you can build NEWLIB in a separate
 directory for a Sun 4 cross m68k-aout environment like this:
 
-     cd newlib-1.14.0
+     cd newlib-1.10.0
      mkdir ../newlib-m68k-aout
      cd ../newlib-m68k-aout
-     ../newlib-1.14.0/configure --host=sun4 --target=m68k-aout
+     ../newlib-1.10.0/configure --host=sun4 --target=m68k-aout
      make
 
    When `configure' builds a configuration using a remote source
@@ -116,8 +116,8 @@ called `configure' (or one of its subdirectories).
 
    The `Makefile' that `configure' generates in each source directory
 also runs recursively.  If you type `make' in a source directory such
-as `newlib-1.14.0' (or in a separate configured directory configured with
-`--srcdir=PATH/newlib-1.14.0'), you will build all the required libraries.
+as `newlib-1.10.0' (or in a separate configured directory configured with
+`--srcdir=PATH/newlib-1.10.0'), you will build all the required libraries.
 
    When you have multiple hosts or targets configured in separate
 directories, you can run `make' on them in parallel (for example, if
@@ -158,25 +158,6 @@ you can use it to test your guesses on abbreviations--for example:
      % sh config.sub i786v
      Invalid configuration `i786v': machine `i786v' not recognized
 
-The Build, Host and Target Concepts in newlib
-=============================================
-
-The build, host and target concepts are defined for gcc as follows:
-
-build: the platform on which gcc is built.
-host: the platform on which gcc is run.
-target: the platform for which gcc generates code.
-
-Since newlib is a library, the target concept does not apply to it, and the
-build, host, and target options given to the top-level configure script must
-be changed for newlib's use.
-
-The options are shifted according to these correspondences:
-
-gcc's build platform has no equivalent in newlib.
-gcc's host platform is newlib's build platform.
-gcc's target platform is newlib's host platform.
-and as mentioned before, newlib has no concept of target.
 
 `configure' options
 ===================
@@ -233,62 +214,24 @@ prefer; but you may abbreviate option names if you use `--'.
      There is no convenient way to generate a list of all available
      hosts.
 
-Running the Testsuite
-=====================
-
-To run newlib's testsuite, you'll need a site.exp in your home
-directory which points dejagnu to the proper baseboards directory and
-the proper exp file for your target.
-
-Before running make check-target-newlib, set the DEJAGNU environment
-variable to point to ~/site.exp.
-
-Here is a sample site.exp:
-
-# Make sure we look in the right place for the board description files.
-if ![info exists boards_dir] {
-    set boards_dir {}
-}
-lappend boards_dir "your dejagnu/baseboards here"
-
-verbose "Global Config File: target_triplet is $target_triplet" 2
-
-global target_list
-case "$target_triplet" in {
-
-    { "mips-*elf*" } {
-	set target_list "mips-sim"
-    }
-
-    default {
-	set target_list { "unix" }
-    }
-}
-
-mips-sim refers to an exp file in the baseboards directory.  You'll
-need to add the other targets you're testing to the case statement.
-
-Now type make check-target-newlib in the top-level build directory to
-run the testsuite.
-
 Shared newlib
 =============
 
-newlib uses libtool when it is being compiled natively (with
---target=i[34567]86-pc-linux-gnu) on an i[34567]86-pc-linux-gnu
-host. This allows newlib to be compiled as a shared library.
+newlib now uses libtool when it is being compiled natively (with
+--target=i[3456]86-pc-linux-gnu) on an i[3456]86-pc-linux-gnu host. This
+allows newlib to be compiled as a shared library.
 
 To configure newlib, do the following from your build directory:
 
 $(source_dir)/src/configure --with-newlib --prefix=$(install_dir)
 
 configure will recognize that host == target ==
-i[34567]86-pc-linux-gnu, so it will tell newlib to compile itself using
+i[3456]86-pc-linux-gnu, so it will tell newlib to compile itself using
 libtool. By default, libtool will build shared and static versions of
 newlib.
 
 To compile a program against shared newlib, do the following (where
-target_install_dir = $(install_dir)/i[34567]86-pc-linux-gnu):
+target_install_dir = $(install_dir)/i[3456]86-pc-linux-gnu):
 
 gcc -nostdlib $(target_install_dir)/lib/crt0.o progname.c -I $(target_install_dir)/include -L $(target_install_dir)/lib -lc -lm -lgcc
 
@@ -310,7 +253,7 @@ Reporting Bugs
 
 The correct address for reporting bugs found in NEWLIB is
 "newlib@sources.redhat.com".  Please email all bug reports to that
-address.  Please include the NEWLIB version number (e.g., newlib-1.14.0),
+address.  Please include the NEWLIB version number (e.g., newlib-1.10.0),
 and how you configured it (e.g., "sun4 host and m68k-aout target").
 Since NEWLIB supports many different configurations, it is important
 that you be precise about this.
diff --git a/newlib/acconfig.h b/newlib/acconfig.h
deleted file mode 100644
index 86f484e..0000000
--- a/newlib/acconfig.h
+++ /dev/null
@@ -1,153 +0,0 @@
-#ifndef __NEWLIB_H__
-
-#define __NEWLIB_H__ 1
-@TOP@
-
-/* EL/IX level */
-#undef _ELIX_LEVEL
-
-/* Newlib version */
-#undef _NEWLIB_VERSION
-
-/* long long type support in IO functions like printf/scanf enabled */
-#undef _WANT_IO_LONG_LONG
-
-/* long double type support in IO functions like printf/scanf enabled */
-#undef _WANT_IO_LONG_DOUBLE
-
-/* Positional argument support in printf functions enabled.  */
-#undef _WANT_IO_POS_ARGS
-
-/* Multibyte supported */
-#undef _MB_CAPABLE
-
-/* MB_LEN_MAX */
-#undef _MB_LEN_MAX
-
-/* ICONV enabled */
-#undef _ICONV_ENABLED
-
-/* Enable ICONV external CCS files loading capabilities */
-#undef _ICONV_ENABLE_EXTERNAL_CCS
-
-/* Define if the linker supports .preinit_array/.init_array/.fini_array
- * sections.  */
-#undef  HAVE_INITFINI_ARRAY
-
-/* True if atexit() may dynamically allocate space for cleanup
-   functions.  */
-#undef  _ATEXIT_DYNAMIC_ALLOC
-
-/* Define if the compiler supports aliasing an array to an address.  */
-#undef  _HAVE_ARRAY_ALIASING
-@BOTTOM@
-/*
- * Iconv encodings enabled ("to" direction)
- */
-#undef _ICONV_TO_ENCODING_BIG5
-#undef _ICONV_TO_ENCODING_CP775
-#undef _ICONV_TO_ENCODING_CP850
-#undef _ICONV_TO_ENCODING_CP852
-#undef _ICONV_TO_ENCODING_CP855
-#undef _ICONV_TO_ENCODING_CP866
-#undef _ICONV_TO_ENCODING_EUC_JP
-#undef _ICONV_TO_ENCODING_EUC_TW
-#undef _ICONV_TO_ENCODING_EUC_KR
-#undef _ICONV_TO_ENCODING_ISO_8859_1
-#undef _ICONV_TO_ENCODING_ISO_8859_10
-#undef _ICONV_TO_ENCODING_ISO_8859_11
-#undef _ICONV_TO_ENCODING_ISO_8859_13
-#undef _ICONV_TO_ENCODING_ISO_8859_14
-#undef _ICONV_TO_ENCODING_ISO_8859_15
-#undef _ICONV_TO_ENCODING_ISO_8859_2
-#undef _ICONV_TO_ENCODING_ISO_8859_3
-#undef _ICONV_TO_ENCODING_ISO_8859_4
-#undef _ICONV_TO_ENCODING_ISO_8859_5
-#undef _ICONV_TO_ENCODING_ISO_8859_6
-#undef _ICONV_TO_ENCODING_ISO_8859_7
-#undef _ICONV_TO_ENCODING_ISO_8859_8
-#undef _ICONV_TO_ENCODING_ISO_8859_9
-#undef _ICONV_TO_ENCODING_ISO_IR_111
-#undef _ICONV_TO_ENCODING_KOI8_R
-#undef _ICONV_TO_ENCODING_KOI8_RU
-#undef _ICONV_TO_ENCODING_KOI8_U
-#undef _ICONV_TO_ENCODING_KOI8_UNI
-#undef _ICONV_TO_ENCODING_UCS_2
-#undef _ICONV_TO_ENCODING_UCS_2_INTERNAL
-#undef _ICONV_TO_ENCODING_UCS_2BE
-#undef _ICONV_TO_ENCODING_UCS_2LE
-#undef _ICONV_TO_ENCODING_UCS_4
-#undef _ICONV_TO_ENCODING_UCS_4_INTERNAL
-#undef _ICONV_TO_ENCODING_UCS_4BE
-#undef _ICONV_TO_ENCODING_UCS_4LE
-#undef _ICONV_TO_ENCODING_US_ASCII
-#undef _ICONV_TO_ENCODING_UTF_16
-#undef _ICONV_TO_ENCODING_UTF_16BE
-#undef _ICONV_TO_ENCODING_UTF_16LE
-#undef _ICONV_TO_ENCODING_UTF_8
-#undef _ICONV_TO_ENCODING_WIN_1250
-#undef _ICONV_TO_ENCODING_WIN_1251
-#undef _ICONV_TO_ENCODING_WIN_1252
-#undef _ICONV_TO_ENCODING_WIN_1253
-#undef _ICONV_TO_ENCODING_WIN_1254
-#undef _ICONV_TO_ENCODING_WIN_1255
-#undef _ICONV_TO_ENCODING_WIN_1256
-#undef _ICONV_TO_ENCODING_WIN_1257
-#undef _ICONV_TO_ENCODING_WIN_1258
-
-/*
- * Iconv encodings enabled ("from" direction)
- */
-#undef _ICONV_FROM_ENCODING_BIG5
-#undef _ICONV_FROM_ENCODING_CP775
-#undef _ICONV_FROM_ENCODING_CP850
-#undef _ICONV_FROM_ENCODING_CP852
-#undef _ICONV_FROM_ENCODING_CP855
-#undef _ICONV_FROM_ENCODING_CP866
-#undef _ICONV_FROM_ENCODING_EUC_JP
-#undef _ICONV_FROM_ENCODING_EUC_TW
-#undef _ICONV_FROM_ENCODING_EUC_KR
-#undef _ICONV_FROM_ENCODING_ISO_8859_1
-#undef _ICONV_FROM_ENCODING_ISO_8859_10
-#undef _ICONV_FROM_ENCODING_ISO_8859_11
-#undef _ICONV_FROM_ENCODING_ISO_8859_13
-#undef _ICONV_FROM_ENCODING_ISO_8859_14
-#undef _ICONV_FROM_ENCODING_ISO_8859_15
-#undef _ICONV_FROM_ENCODING_ISO_8859_2
-#undef _ICONV_FROM_ENCODING_ISO_8859_3
-#undef _ICONV_FROM_ENCODING_ISO_8859_4
-#undef _ICONV_FROM_ENCODING_ISO_8859_5
-#undef _ICONV_FROM_ENCODING_ISO_8859_6
-#undef _ICONV_FROM_ENCODING_ISO_8859_7
-#undef _ICONV_FROM_ENCODING_ISO_8859_8
-#undef _ICONV_FROM_ENCODING_ISO_8859_9
-#undef _ICONV_FROM_ENCODING_ISO_IR_111
-#undef _ICONV_FROM_ENCODING_KOI8_R
-#undef _ICONV_FROM_ENCODING_KOI8_RU
-#undef _ICONV_FROM_ENCODING_KOI8_U
-#undef _ICONV_FROM_ENCODING_KOI8_UNI
-#undef _ICONV_FROM_ENCODING_UCS_2
-#undef _ICONV_FROM_ENCODING_UCS_2_INTERNAL
-#undef _ICONV_FROM_ENCODING_UCS_2BE
-#undef _ICONV_FROM_ENCODING_UCS_2LE
-#undef _ICONV_FROM_ENCODING_UCS_4
-#undef _ICONV_FROM_ENCODING_UCS_4_INTERNAL
-#undef _ICONV_FROM_ENCODING_UCS_4BE
-#undef _ICONV_FROM_ENCODING_UCS_4LE
-#undef _ICONV_FROM_ENCODING_US_ASCII
-#undef _ICONV_FROM_ENCODING_UTF_16
-#undef _ICONV_FROM_ENCODING_UTF_16BE
-#undef _ICONV_FROM_ENCODING_UTF_16LE
-#undef _ICONV_FROM_ENCODING_UTF_8
-#undef _ICONV_FROM_ENCODING_WIN_1250
-#undef _ICONV_FROM_ENCODING_WIN_1251
-#undef _ICONV_FROM_ENCODING_WIN_1252
-#undef _ICONV_FROM_ENCODING_WIN_1253
-#undef _ICONV_FROM_ENCODING_WIN_1254
-#undef _ICONV_FROM_ENCODING_WIN_1255
-#undef _ICONV_FROM_ENCODING_WIN_1256
-#undef _ICONV_FROM_ENCODING_WIN_1257
-#undef _ICONV_FROM_ENCODING_WIN_1258
-
-#endif /* !__NEWLIB_H__ */
-
diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4
index 0b6b8ed..f8a129f 100644
--- a/newlib/acinclude.m4
+++ b/newlib/acinclude.m4
@@ -35,57 +35,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -103,9 +60,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0, nodefine)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -147,15 +104,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -171,6 +131,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -179,19 +151,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
diff --git a/newlib/aclocal.m4 b/newlib/aclocal.m4
index 5303ae4..a5208f1 100644
--- a/newlib/aclocal.m4
+++ b/newlib/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0, nodefine)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,83 +284,41 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-
-
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
+
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
 # Save cache, so that ltconfig can load it
 AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
 AC_CACHE_LOAD
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -454,43 +329,27 @@ AC_SUBST(LIBTOOL)dnl
 exec 5>>./config.log
 ])
 
-AC_DEFUN([AC_LIBTOOL_SETUP],
+AC_DEFUN(AC_LIBTOOL_SETUP,
 [AC_PREREQ(2.13)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 AC_REQUIRE([AC_PROG_NM])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
 [libtool_flags="$libtool_flags --enable-dlopen"])
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
@@ -500,20 +359,14 @@ AC_ARG_ENABLE(libtool-lock,
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -528,31 +381,12 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -560,56 +394,33 @@ ia64-*-hpux*)
   ;;
 
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+[*-*-cygwin* | *-*-mingw*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  ])
+])
 esac
 ])
 
 # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
 
 # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
 
 # AC_ENABLE_SHARED - implement the --enable-shared flag
 # Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
 <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -628,21 +439,21 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
 # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)])
 
 # AC_ENABLE_STATIC - implement the --enable-static flag
 # Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
 <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -661,8 +472,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])
 
 # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_STATIC(no)])
 
 
@@ -670,14 +480,14 @@ AC_ENABLE_STATIC(no)])
 # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(fast-install,
 changequote(<<, >>)dnl
 <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -695,98 +505,12 @@ esac],
 enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_FAST_INSTALL(no)])
 
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
 # AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -794,20 +518,16 @@ AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
+changequote(,)dnl
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
@@ -829,17 +549,17 @@ elif test "$with_gnu_ld" = yes; then
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL(lt_cv_path_LD,
+AC_CACHE_VAL(ac_cv_path_LD,
 [if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -848,9 +568,9 @@ AC_CACHE_VAL(lt_cv_path_LD,
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -860,240 +580,56 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_PROG_LD_GNU
 ])
 
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
 ])
 
-
 # AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
+AC_CACHE_VAL(ac_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi])
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
 ])
 
 # AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
+AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
+case "$host" in
+*-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
@@ -1107,39 +643,33 @@ esac
 ])
 
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case "$enable_ltdl_convenience" in
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   AC_CHECK_LIB(ltdl, main,
   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
   [if test x"$enable_ltdl_install" = xno; then
@@ -1150,8 +680,8 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
@@ -1159,91 +689,15 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   fi
 ])
 
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
 dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
 
 dnl This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])dnl
 
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/configure b/newlib/configure
index e3004c3..cbfd2b8 100755
--- a/newlib/configure
+++ b/newlib/configure
@@ -12,39 +12,13 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --enable-newlib-io-pos-args enable printf-family positional arg support"
-ac_help="$ac_help
-  --enable-newlib-io-long-long   enable long long type support in IO functions like printf/scanf"
-ac_help="$ac_help
-  --enable-newlib-io-long-double   enable long double type support in IO functions printf/scanf"
-ac_help="$ac_help
-  --enable-newlib-mb        enable multibyte support"
-ac_help="$ac_help
-  --enable-newlib-iconv-encodings   enable specific comma-separated list of bidirectional iconv encodings to be built-in"
-ac_help="$ac_help
-  --enable-newlib-iconv-from-encodings   enable specific comma-separated list of \"from\" iconv encodings to be built-in"
-ac_help="$ac_help
-  --enable-newlib-iconv-to-encodings   enable specific comma-separated list of \"to\" iconv encodings to be built-in"
-ac_help="$ac_help
-  --enable-newlib-iconv-external-ccs     enable capabilities to load external CCS files for iconv"
-ac_help="$ac_help
-  --disable-newlib-atexit-alloc    disable dynamic allocation of atexit entries"
-ac_help="$ac_help
   --enable-multilib         build many library versions (default)"
 ac_help="$ac_help
   --enable-target-optspace  optimize for space"
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -59,8 +33,6 @@ ac_help="$ac_help
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
 ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-ac_help="$ac_help
   --enable-newlib-hw-fp    Turn on hardware floating point math"
 
 # Initialize some variables set by options.
@@ -79,6 +51,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -193,6 +166,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -363,6 +337,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -528,12 +507,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -573,9 +556,6 @@ fi
 
 
 
-
-
-
 ac_aux_dir=
 for ac_dir in .. $srcdir/..; do
   if test -f $ac_dir/install-sh; then
@@ -596,119 +576,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-# Check whether --enable-newlib-io-pos-args or --disable-newlib-io-pos-args was given.
-if test "${enable_newlib_io_pos_args+set}" = set; then
-  enableval="$enable_newlib_io_pos_args"
-  case "${enableval}" in
-  yes) newlib_io_pos_args=yes ;;
-  no)  newlib_io_pos_args=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-pos-args option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_pos_args=
-fi
-
-# Check whether --enable-newlib-io-long-long or --disable-newlib-io-long-long was given.
-if test "${enable_newlib_io_long_long+set}" = set; then
-  enableval="$enable_newlib_io_long_long"
-  case "${enableval}" in
-  yes) newlib_io_long_long=yes;;
-  no)  newlib_io_long_long=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-long-long option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_long_long=
-fi
-
-# Check whether --enable-newlib-io-long-double or --disable-newlib-io-long-double was given.
-if test "${enable_newlib_io_long_double+set}" = set; then
-  enableval="$enable_newlib_io_long_double"
-  case "${enableval}" in
-  yes) newlib_io_long_double=yes;;
-  no)  newlib_io_long_double=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-long-double option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_long_double=
-fi
-
-# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
-if test "${enable_newlib_mb+set}" = set; then
-  enableval="$enable_newlib_mb"
-  case "${enableval}" in
-  yes) newlib_mb=yes;;
-  no)  newlib_mb=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_mb=
-fi
-
-# Check whether --enable-newlib-iconv-encodings or --disable-newlib-iconv-encodings was given.
-if test "${enable_newlib_iconv_encodings+set}" = set; then
-  enableval="$enable_newlib_iconv_encodings"
-  if test x${enableval} = x; then
-   { echo "configure: error: bad value ${enableval} for newlib-iconv-encodings option - use comma-separated encodings list" 1>&2; exit 1; }
- fi
- iconv_encodings=${enableval}
- 
-else
-  iconv_encodings=
-fi
-
-# Check whether --enable-newlib-iconv-from-encodings or --disable-newlib-iconv-from-encodings was given.
-if test "${enable_newlib_iconv_from_encodings+set}" = set; then
-  enableval="$enable_newlib_iconv_from_encodings"
-  if test x${enableval} = x; then
-   { echo "configure: error: bad value ${enableval} for newlib-iconv-from-encodings option - use comma-separated encodings list" 1>&2; exit 1; }
- fi
- iconv_from_encodings=${enableval}
- 
-else
-  iconv_from_encodings=
-fi
-
-# Check whether --enable-newlib-iconv-to-encodings or --disable-newlib-iconv-to-encodings was given.
-if test "${enable_newlib_iconv_to_encodings+set}" = set; then
-  enableval="$enable_newlib_iconv_to_encodings"
-  if test x${enableval} = x; then
-   { echo "configure: error: bad value ${enableval} for newlib-iconv-to-encodings option - use comma-separated encodings list" 1>&2; exit 1; }
- fi
- iconv_to_encodings=${enableval}
- 
-else
-  iconv_to_encodings=
-fi
-
-# Check whether --enable-newlib-iconv-external-ccs or --disable-newlib-iconv-external-ccs was given.
-if test "${enable_newlib_iconv_external_ccs+set}" = set; then
-  enableval="$enable_newlib_iconv_external_ccs"
-  if test "${newlib_iconv_external_ccs+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv_external_ccs=yes ;;
-     no)  newlib_iconv_external_ccs=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv-external-ccs option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv_external_ccs=${newlib_iconv_external_ccs}
-fi
-
-# Check whether --enable-newlib-atexit-dynamic-alloc or --disable-newlib-atexit-dynamic-alloc was given.
-if test "${enable_newlib_atexit_dynamic_alloc+set}" = set; then
-  enableval="$enable_newlib_atexit_dynamic_alloc"
-  if test "${newlib_atexit_dynamic_alloc+set}" != set; then
-  case "${enableval}" in
-    yes) newlib_atexit_dynamic_alloc=yes ;;
-    no)  newlib_atexit_dynamic_alloc=no  ;;
-    *)   { echo "configure: error: bad value ${enableval} for newlib-atexit-dynamic-alloc option" 1>&2; exit 1; } ;;
-  esac
- fi
-else
-  newlib_atexit_dynamic_alloc=${newlib_atexit_dynamic_alloc}
-fi
-
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -721,7 +588,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:725: checking for a BSD compatible install" >&5
+echo "configure:592: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -774,7 +641,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:778: checking whether build environment is sane" >&5
+echo "configure:645: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -831,7 +698,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:835: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:702: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -864,12 +731,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:868: checking for Cygwin environment" >&5
+echo "configure:735: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 873 "configure"
+#line 740 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -880,7 +747,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -897,19 +764,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:901: checking for mingw32 environment" >&5
+echo "configure:768: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 906 "configure"
+#line 773 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -962,79 +829,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -1052,34 +856,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1083: checking host system type" >&5
+echo "configure:866: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1099,75 +882,41 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:1104: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1122: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
 fi
+cat >> confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
 
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1158: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:907: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1171: checking for working autoconf" >&5
+echo "configure:920: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1179,21 +928,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1184: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:933: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1197: checking for working autoheader" >&5
+echo "configure:946: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1206,7 +955,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1210: checking for working makeinfo" >&5
+echo "configure:959: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1231,7 +980,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1235: checking for $ac_word" >&5
+echo "configure:984: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1261,7 +1010,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1265: checking for $ac_word" >&5
+echo "configure:1014: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1310,7 +1059,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1314: checking whether we are using GNU C" >&5
+echo "configure:1063: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1319,7 +1068,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1334,7 +1083,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1338: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1087: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1362,10 +1111,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1120: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1369: checking for $ac_word" >&5
+echo "configure:1141: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1397,7 +1169,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1401: checking for $ac_word" >&5
+echo "configure:1173: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1429,7 +1201,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1433: checking for $ac_word" >&5
+echo "configure:1205: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1461,7 +1233,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1465: checking for $ac_word" >&5
+echo "configure:1237: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1506,7 +1278,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1510: checking for a BSD compatible install" >&5
+echo "configure:1282: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1559,11 +1331,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1567: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1336: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1597,7 +1366,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1601: checking for executable suffix" >&5
+echo "configure:1370: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1607,10 +1376,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1631,6 +1400,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/./targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1641,52 +1422,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1695,12 +1430,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1714,7 +1443,7 @@ if test "${use_libtool}" = "yes"; then
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -1737,7 +1466,7 @@ fi
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -1760,7 +1489,7 @@ fi
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -1779,10 +1508,40 @@ else
   enable_fast_install=yes
 fi
 
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1515: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1786: checking for $ac_word" >&5
+echo "configure:1545: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1812,7 +1571,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1816: checking for $ac_word" >&5
+echo "configure:1575: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1863,7 +1622,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1867: checking for $ac_word" >&5
+echo "configure:1626: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1895,7 +1654,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1899: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1658: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1906,12 +1665,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1910 "configure"
+#line 1669 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1937,12 +1696,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1941: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1700: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1946: checking whether we are using GNU C" >&5
+echo "configure:1705: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1951,7 +1710,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1970,7 +1729,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1974: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1733: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2010,18 +1769,12 @@ else
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:2017: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+echo "configure:1776: checking for ld used by GCC" >&5
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
@@ -2043,12 +1796,12 @@ echo "configure:2017: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:2047: checking for GNU ld" >&5
+echo "configure:1800: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:2050: checking for non-GNU ld" >&5
+echo "configure:1803: checking for non-GNU ld" >&5
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -z "$LD"; then
@@ -2056,11 +1809,11 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -2069,11 +1822,11 @@ else
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   echo "$ac_t""$LD" 1>&6
 else
@@ -2081,74 +1834,59 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:2085: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
+echo "configure:1838: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi
 fi
 
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:2102: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
+echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:2114: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
+echo "configure:1854: checking for BSD-compatible nm" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi
 fi
 
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2152: checking whether ln -s works" >&5
+echo "configure:1890: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2168,482 +1906,14 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2173: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2346: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2376: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2438: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2509: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2541: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2576: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2608: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
 
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 
 libtool_flags="$libtool_flags --enable-win32-dll"
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
@@ -2655,25 +1925,14 @@ fi
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2675 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
+  echo '#line 1934 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -2688,48 +1947,24 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2713: checking whether the C compiler needs -belf" >&5
+echo "configure:1956: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2726 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1961 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2739,13 +1974,6 @@ else
   lt_cv_cc_needs_belf=no
 fi
 rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
 fi
 
 echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
@@ -2755,11 +1983,11 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   fi
   ;;
 
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+*-*-cygwin* | *-*-mingw*)
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2763: checking for $ac_word" >&5
+echo "configure:1991: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2791,7 +2019,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2795: checking for $ac_word" >&5
+echo "configure:2023: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2826,7 +2054,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2830: checking for $ac_word" >&5
+echo "configure:2058: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2858,7 +2086,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2862: checking for $ac_word" >&5
+echo "configure:2090: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2893,7 +2121,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2897: checking for $ac_word" >&5
+echo "configure:2125: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2925,7 +2153,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2929: checking for $ac_word" >&5
+echo "configure:2157: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2957,77 +2185,8 @@ else
 fi
 fi
 
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2965: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2970 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2999: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3004 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:3011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  
+
 esac
 
 
@@ -3081,14 +2240,12 @@ rm -f confcache
 
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -3102,7 +2259,7 @@ fi
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -3111,17 +2268,12 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 # clobbered by the next message.
 exec 5>>./config.log
 
-  
-
-  
-	 
-	 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3125: checking for $ac_word" >&5
+echo "configure:2277: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3192,42 +2344,14 @@ else
   HAVE_DOC_FALSE=
 fi
 
-EXTRA_DIRS=
-case $host in
-  i[34567]86-pc-linux-*)
-	configdirs="${configdirs} iconvdata"
-	EXTRA_DIRS=iconvdata
-	;;
-esac
-
-
-# These get added in the top-level configure.in, except in the case where
-# newlib is being built natively.
-LIBC_INCLUDE_GREP=`echo ${CC} | grep \/libc\/include`
-abs_newlib_basedir=`cd ${newlib_basedir} && pwd`
-if test -z "${LIBC_INCLUDE_GREP}"; then
-  CC_FOR_NEWLIB="${CC} -I$PWD/targ-include -I${abs_newlib_basedir}/libc/include"
-else
-  CC_FOR_NEWLIB="${CC}"
-fi
-
-
 subdirs="${configdirs}"
 
 
 CRT0=
 CRT0_DIR=
-if test "x${have_crt0}" = "xyes"; then
+if test -n "${sys_dir}"; then
   CRT0=crt0.o
-  CRT0_DIR=libc/
-fi
-
-
-
-CRT1=${crt1}
-CRT1_DIR=
-if test -n "${crt1_dir}"; then
-  CRT1_DIR=${crt1_dir}/
+  CRT0_DIR=libc
 fi
 
 
@@ -3247,11 +2371,6 @@ if test -n "${sys_dir}"; then
 fi
 
 
-if test "${have_sys_mach_dir}" = "yes"; then
-  SYS_MACH_OBJECTLIST=libc/sys/${sys_dir}/machine/${machine_dir}/objectlist.awk.in
-fi
-
-
 if test -n "${posix_dir}"; then
   POSIX_OBJECTLIST=libc/${posix_dir}/objectlist.awk.in
 fi
@@ -3272,79 +2391,15 @@ if test -n "${unix_dir}"; then
 fi
 
 
-if test -n "${stdio64_dir}"; then
-  STDIO64_OBJECTLIST=libc/${stdio64_dir}/objectlist.awk.in
-fi
-
-
 # Put a plausible default for CC_FOR_BUILD in Makefile.
 if test -z "$CC_FOR_BUILD"; then
-  CC_FOR_BUILD=gcc
-fi
-
-
-if test "${newlib_elix_level}" -gt "0"; then
-cat >> confdefs.h <<EOF
-#define _ELIX_LEVEL ${newlib_elix_level}
-EOF
-
-fi
-
-if test "${newlib_io_long_long}" = "yes"; then
-cat >> confdefs.h <<EOF
-#define _WANT_IO_LONG_LONG 1
-EOF
-
-fi
-
-if test "${newlib_io_long_double}" = "yes"; then
-cat >> confdefs.h <<EOF
-#define _WANT_IO_LONG_DOUBLE 1
-EOF
-
-fi
-
-if test "${newlib_io_pos_args}" = "yes"; then
-cat >> confdefs.h <<EOF
-#define _WANT_IO_POS_ARGS 1
-EOF
-
-fi
-
-if test "${newlib_mb}" = "yes"; then
-cat >> confdefs.h <<EOF
-#define _MB_CAPABLE 1
-EOF
-
-cat >> confdefs.h <<EOF
-#define _MB_LEN_MAX 8
-EOF
-
-else
-cat >> confdefs.h <<EOF
-#define _MB_LEN_MAX 1
-EOF
-
-fi
-
-if test "${newlib_iconv_external_ccs}" = "yes"; then
-cat >> confdefs.h <<EOF
-#define _ICONV_ENABLE_EXTERNAL_CCS 1
-EOF
-
-fi
-
-if test "${newlib_atexit_dynamic_alloc}" = "yes"; then
-cat >> confdefs.h <<EOF
-#define _ATEXIT_DYNAMIC_ALLOC 1
-EOF
-
+  if test "x$cross_compiling" = "xno"; then
+    CC_FOR_BUILD='$(CC)'
+  else
+    CC_FOR_BUILD=gcc
+  fi
 fi
 
-cat >> confdefs.h <<EOF
-#define _NEWLIB_VERSION "$VERSION"
-EOF
-
 
 if test "${multilib}" = "yes"; then
   multilib_arg="--enable-multilib"
@@ -3352,159 +2407,6 @@ else
   multilib_arg=
 fi
 
-if test "${newlib_iconv}" = "yes"; then
-cat >> confdefs.h <<EOF
-#define _ICONV_ENABLED 1
-EOF
-
-fi
-
-if test "x${newlib_iconv_external_ccs}" = "xyes"; then
-  if test "x${newlib_iconv}" = "x"; then
-      { echo "configure: error: --enable-newlib-iconv-external-ccs option can't be used if iconv library is disabled" 1>&2; exit 1; }
-  fi
-  cat >> confdefs.h <<EOF
-#define _ICONV_ENABLE_EXTERNAL_CCS 1
-EOF
-
-fi
-
-if test "x${iconv_encodings}" != "x" \
-   || test "x${iconv_to_encodings}" != "x" \
-   || test "x${iconv_from_encodings}" != "x"; then
-  
-    if test "x${newlib_iconv}" = "x"; then
-      { echo "configure: error: --enable-newlib-iconv-encodings" 1>&2; exit 1; }
-  fi
-  
-    iconv_encodings=`echo "${iconv_encodings}" | sed -e 's/,/ /g' -e 's/-/_/g' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-  iconv_to_encodings=`echo "${iconv_to_encodings}" | sed -e 's/,/ /g' -e 's/-/_/g' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-  iconv_from_encodings=`echo "${iconv_from_encodings}" | sed -e 's/,/ /g' -e 's/-/_/g' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- 
-      available_encodings=`cat "${srcdir}/libc/iconv/encoding.aliases" | sed -e '/^#.*/d'`
-  
-      
-    iconv_encodings1="${iconv_encodings}"
-  iconv_encodings=""
-  for encoding in ${iconv_encodings1}; do
-      result=`echo "${available_encodings}" | grep -e "\(^\| \)${encoding}\( \|\$\)"`
-      if test $? != "0"; then
-          { echo "configure: error: ${encoding} is not supported - see ${srcdir}/libc/iconv/encoding.aliases file for the list of available encodings" 1>&2; exit 1; }
-      fi
-      encoding1=`echo "${result}" | sed -e 's/\(^[^ ]*\).*$/\1/'`
-      iconv_encodings="${iconv_encodings} ${encoding1}"
-  done
-    for encoding in ${iconv_encodings}; do
-      opt=_ICONV_TO_ENCODING_`echo "${encoding}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-      cat >> confdefs.h <<EOF
-#define $opt 1
-EOF
-
-      opt=_ICONV_FROM_ENCODING_`echo "${encoding}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-      cat >> confdefs.h <<EOF
-#define $opt 1
-EOF
-
-  done
-
-    iconv_encodings1="${iconv_to_encodings}"
-  iconv_to_encodings=""
-  for encoding in ${iconv_encodings1}; do
-      result=`echo "${available_encodings}" | grep -e "\(^\| \)${encoding}\( \|\$\)"`
-      if test $? != "0"; then
-          { echo "configure: error: ${encoding} is not supported - see ${srcdir}/libc/iconv/encoding.aliases file for the list of available encodings" 1>&2; exit 1; }
-      fi
-      encoding1=`echo "${result}" | sed -e 's/\(^[^ ]*\).*$/\1/'`
-      iconv_to_encodings="${iconv_to_encodings} ${encoding1}"
-  done
-    for encoding in ${iconv_to_encodings}; do
-      opt=_ICONV_TO_ENCODING_`echo "${encoding}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-      cat >> confdefs.h <<EOF
-#define $opt 1
-EOF
-
-  done
-
-    iconv_encodings1="${iconv_from_encodings}"
-  iconv_from_encodings=""
-  for encoding in ${iconv_encodings1}; do
-      result=`echo "${available_encodings}" | grep -e "\(^\| \)${encoding}\( \|\$\)"`
-      if test $? != "0"; then
-          { echo "configure: error: ${encoding} is not supported - see ${srcdir}/libc/iconv/encoding.aliases file for the list of available encodings" 1>&2; exit 1; }
-      fi
-      encoding1=`echo "${result}" | sed -e 's/\(^[^ ]*\).*$/\1/'`
-      iconv_from_encodings="${iconv_from_encodings} ${encoding1}"
-  done
-    for encoding in ${iconv_from_encodings}; do
-      opt=_ICONV_FROM_ENCODING_`echo "${encoding}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-      cat >> confdefs.h <<EOF
-#define $opt 1
-EOF
-
-  done
-fi;
-
-echo $ac_n "checking for .preinit_array/.init_array/.fini_array support""... $ac_c" 1>&6
-echo "configure:3449: checking for .preinit_array/.init_array/.fini_array support" >&5
-if eval "test \"`echo '$''{'libc_cv_initfinit_array'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-int _start (void) { return 0; }
-int __start (void) { return 0; }
-int foo (void) { return 1; }
-int (*fp) (void) __attribute__ ((section (".init_array"))) = foo;
-EOF
-if { ac_try='${CC} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest conftest.c
-		   -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:3460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
-then
-  if readelf -S conftest | grep -e INIT_ARRAY > /dev/null; then
-    libc_cv_initfinit_array=yes
-  else
-    libc_cv_initfinit_array=no
-  fi
-else
-  libc_cv_initfinit_array=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$libc_cv_initfinit_array" 1>&6
-
-if test $libc_cv_initfinit_array = yes; then
-  cat >> confdefs.h <<EOF
-#define HAVE_INITFINI_ARRAY 1
-EOF
-
-fi
-
-echo $ac_n "checking for array aliasing support""... $ac_c" 1>&6
-echo "configure:3483: checking for array aliasing support" >&5
-if eval "test \"`echo '$''{'libc_cv_array_aliasing'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-char x3 = { 'a', 'b', 'c' };
-extern char y2 __attribute__((alias ("x+1")));
-EOF
-if { ac_try='${CC} $CFLAGS $CPPFLAGS -c conftest.c
-		   1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:3492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
-then
-  libc_cv_array_aliasing=yes
-else
-  libc_cv_array_aliasing=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$libc_cv_array_aliasing" 1>&6
-
-if test $libc_cv_array_aliasing = yes; then
-  cat >> confdefs.h <<EOF
-#define _HAVE_ARRAY_ALIASING 1
-EOF
-
-fi
 
 trap '' 1 2 15
 cat > confcache <<\EOF
@@ -3569,7 +2471,19 @@ fi
 
 trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 
-DEFS=-DHAVE_CONFIG_H
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
+
 
 # Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
@@ -3607,7 +2521,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile newlib.h:newlib.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -3639,24 +2553,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -3669,6 +2571,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -3677,26 +2584,14 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
 s%@machine_dir@%$machine_dir%g
 s%@sys_dir@%$sys_dir%g
 s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@OBJDUMP@%$OBJDUMP%g
 s%@LIBTOOL@%$LIBTOOL%g
@@ -3705,25 +2600,17 @@ s%@NEWLIB_HW_FP_TRUE@%$NEWLIB_HW_FP_TRUE%g
 s%@NEWLIB_HW_FP_FALSE@%$NEWLIB_HW_FP_FALSE%g
 s%@HAVE_DOC_TRUE@%$HAVE_DOC_TRUE%g
 s%@HAVE_DOC_FALSE@%$HAVE_DOC_FALSE%g
-s%@EXTRA_DIRS@%$EXTRA_DIRS%g
-s%@CC_FOR_NEWLIB@%$CC_FOR_NEWLIB%g
 s%@subdirs@%$subdirs%g
 s%@CRT0@%$CRT0%g
 s%@CRT0_DIR@%$CRT0_DIR%g
-s%@CRT1@%$CRT1%g
-s%@CRT1_DIR@%$CRT1_DIR%g
 s%@LIBM_MACHINE_OBJECTLIST@%$LIBM_MACHINE_OBJECTLIST%g
 s%@MACHINE_OBJECTLIST@%$MACHINE_OBJECTLIST%g
 s%@SYS_OBJECTLIST@%$SYS_OBJECTLIST%g
-s%@SYS_MACH_OBJECTLIST@%$SYS_MACH_OBJECTLIST%g
 s%@POSIX_OBJECTLIST@%$POSIX_OBJECTLIST%g
 s%@SIGNAL_OBJECTLIST@%$SIGNAL_OBJECTLIST%g
 s%@SYSCALL_OBJECTLIST@%$SYSCALL_OBJECTLIST%g
 s%@UNIX_OBJECTLIST@%$UNIX_OBJECTLIST%g
-s%@STDIO64_OBJECTLIST@%$STDIO64_OBJECTLIST%g
 s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g
-s%@libc_cv_initfinit_array@%$libc_cv_initfinit_array%g
-s%@libc_cv_array_aliasing@%$libc_cv_array_aliasing%g
 
 CEOF
 EOF
@@ -3732,7 +2619,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
@@ -3824,116 +2711,8 @@ s%@INSTALL@%$INSTALL%g
 fi; done
 rm -f conftest.s*
 
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="newlib.h:newlib.hin"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-
-rm -f conftest.tail
-while :
-do
-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-  echo 'CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
-done
-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
-  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
-  fi
-fi; done
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
 srcdir=${srcdir}
 host=${host}
 target=${target}
@@ -3946,9 +2725,7 @@ LDFLAGS="${LDFLAGS}"
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
 if test -n "$CONFIG_FILES"; then
-  unset ac_file
   . ${newlib_basedir}/../config-ml.in
 fi
 exit 0
diff --git a/newlib/configure.host b/newlib/configure.host
index 759c38a..b2f5428 100644
--- a/newlib/configure.host
+++ b/newlib/configure.host
@@ -22,28 +22,18 @@
 #   host_cpu		The configuration host CPU
 #   newlib_mb		--enable-newlib-mb ("yes", "no")
 #   target_optspace	--enable-target-optspace ("yes", "no", "")
-#   newlib_multithread	--enable-newlib-multithread ("yes", "no", "yes")
-#   newlib_elix_level	--enable-newlib-elix-level ("1","2","3","4") ("4")
-#   newlib_io_long_long --enable-newlib-io-long-long ("yes", "no", "")
-#   newlib_io_long_double --enable-newlib-io-long-double ("yes", "no", "")
 
 # It sets the following shell variables:
 #   newlib_cflags	Special CFLAGS to use when building
 #   machine_dir		Subdirectory of libc/machine to configure
 #   sys_dir		Subdirectory of libc/sys to configure
-#   have_sys_mach_dir	Is there a machine subdirectory in sys subdirectory
 #   posix_dir		"posix" to build libc/posix, "" otherwise
 #   signal_dir		"signal" to build libc/signal, "" otherwise
-#   stdio64_dir		"stdio64" to build libc/stdio64, "" otherwise
 #   syscall_dir		"syscalls" to build libc/syscalls, "" otherwise
 #   unix_dir		"unix" to build libc/unix, "" otherwise
 #   use_libtool         flag: use libtool to build newlib?
 #   aext                library extension - needed for libtool support
 #   oext                object file extension - needed for libtool support
-#   crt1                name of crt1 object if one is provided
-#   crt1_dir            directory where crt1 object is found
-#   have_crt0		"yes"/"no" if crt0 is/isn't provided.
-#			"" if crt0 is provided when sys_dir is set
 
 newlib_cflags=
 libm_machine_dir=
@@ -51,19 +41,10 @@ machine_dir=
 sys_dir=
 posix_dir=
 signal_dir=signal
-stdio64_dir=
 syscall_dir=
 unix_dir=
 mach_add_setjmp=
-crt1=
-crt1_dir=
-have_crt0=
 use_libtool=no
-have_sys_mach_dir=no
-default_newlib_io_long_long=no
-default_newlib_io_long_double=no
-default_newlib_io_pos_args=no
-default_newlib_atexit_dynamic_alloc=yes
 aext=a
 oext=o
 
@@ -71,7 +52,7 @@ case "${target_optspace}:${host}" in
   yes:*)
     newlib_cflags="${newlib_cflags} -Os"
     ;;
-  :m32r-* | :d10v-* | :d30v-* | :avr-* | :m32c-* )
+  :m32r-* | :d10v-* | :d30v-* | :avr-*)
     newlib_cflags="${newlib_cflags} -Os"
     ;;
   no:* | :*)
@@ -97,27 +78,16 @@ case "${host_cpu}" in
   avr*)
 	newlib_cflags="${newlib_cflags} -DPREFER_SIZE_OVER_SPEED -mcall-prologues"
 	;;
-  cris | crisv32)
-	machine_dir=cris
-	;;
-  crx*)
-	machine_dir=crx
-	;;
+
   d10v*)
 	machine_dir=d10v
 	;;
   d30v*)
 	machine_dir=d30v
 	;;
-  ep9312)
-	machine_dir=arm
-	;;
   fr30)
 	machine_dir=fr30
 	;;
-  frv)
-	machine_dir=frv
-        ;;
   h8300)
 	machine_dir=h8300
 	;;
@@ -130,10 +100,10 @@ case "${host_cpu}" in
   i960)
 	machine_dir=i960
 	;;
-  i[34567]86)
+  i[3456]86)
 	# Don't use for these since they provide their own setjmp.
 	case ${host} in
-	*-*-sco* | *-*-cygwin*) 
+	*-*-go32 | *-*-sco* | *-*-cygwin*) 
 		libm_machine_dir=i386
 		machine_dir=i386
 		;;
@@ -146,27 +116,11 @@ case "${host_cpu}" in
 	;;
   ia64*)
 	;;
-  iq2000)
-	machine_dir=iq2000
-	;;
-  m32c)
-	machine_dir=m32c
-	newlib_cflags="${newlib_cflags} -DPREFER_SIZE_OVER_SPEED -DABORT_PROVIDED -DSMALL_MEMORY"
-	;;
-
   m32r*)
 	machine_dir=m32r
 	;;
-
-  m68hc11|m6811|m68hc12|m6812)
-	machine_dir=m68hc11
-	newlib_cflags="-DPREFER_SIZE_OVER_SPEED -Os -mrelax"
-	CFLAGS="-g -Os"
-	;;
-  
   m68*)
 	machine_dir=m68k
-	newlib_cflags="${newlib_cflags} -DCOMPACT_CTYPE"
 	;;
   m88k)
 	machine_dir=m88k
@@ -187,12 +141,8 @@ case "${host_cpu}" in
 	machine_dir=mn10200
 	;;
   mn10300)
-	default_newlib_io_long_long="yes"
 	machine_dir=mn10300
 	;;
-  mt*)
-        machine_dir=mt
-        ;;
   or16)
 	;;
   or32)
@@ -200,7 +150,7 @@ case "${host_cpu}" in
   powerpc*)
 	machine_dir=powerpc
 	;;
-  sh | sh64)
+  sh)
 	machine_dir=sh
 	;;
   sparc*)
@@ -217,9 +167,6 @@ case "${host_cpu}" in
   thumb)
 	machine_dir=arm
 	;;
-  tic4x|c4x)
-	machine_dir=tic4x
-	;;
   tic80*)
 	machine_dir=tic80
 	;;
@@ -233,16 +180,15 @@ case "${host_cpu}" in
 	;;
   v850e)
 	machine_dir=v850
-	newlib_cflags="${newlib_cflags} -DPREFER_SIZE_OVER_SPEED "
+	newlib_cflags="${newlib_cflags} -DPREFER_SIZE_OVER_SPEED -mv850 "
+	;;
+  v850ea)
+	machine_dir=v850
+	newlib_cflags="${newlib_cflags} -DPREFER_SIZE_OVER_SPEED -mv850 "
 	;;
   w65*)
 	machine_dir=w65
 	;;
-  xstormy16)
-	machine_dir=xstormy16
-	newlib_cflags="${newlib_cflags} -DMALLOC_PROVIDED"
-	newlib_cflags="${newlib_cflags} -DPREFER_SIZE_OVER_SPEED"
-        ;;
   z8k)
 	machine_dir=z8k
 	;;
@@ -252,33 +198,10 @@ case "${host_cpu}" in
 	;;
 esac
 
-# Disable thread support if requested.
-
-if [ "${newlib_multithread}" = "no" ] ; then
-	newlib_cflags="${newlib_cflags} -D__SINGLE_THREAD__"
-fi
-
-# Disable syscall support if requested.
-
-if [ "${newlib_may_supply_syscalls}" = "no" ] ; then
-        newlib_cflags="${newlib_cflags} -D__NO_SYSCALLS__"
-fi
-
-# Enable multibyte support if requested or it is defaulted
-# for target.
+# Enable multibyte support if requested.
 
-if [ "x${newlib_mb}" = "x" ]; then
-	case "${host}" in
-  	  i[34567]86-pc-linux-*|*-*-cygwin*)
-		newlib_mb=yes
-	  	;;
-	esac
-fi
-
-# Disable printf/scanf floating-point support if requested.
-
-if [ "${newlib_io_float}" = "no" ] ; then
-	newlib_cflags="${newlib_cflags} -DNO_FLOATING_POINT"
+if [ "${newlib_mb}" = "yes" ] ; then
+	newlib_cflags="${newlib_cflags} -DMB_CAPABLE"
 fi
 
 # Verify if shared newlib support is allowed and set appropriate variables
@@ -286,10 +209,8 @@ fi
 # support shared libraries.  This is because it adds executable tests which
 # we don't want for most embedded platforms.
 case "${host}" in
-  i[34567]86-pc-linux-*)
+  i[3456]86-pc-linux-*)
     use_libtool=yes
-    have_sys_mach_dir=yes
-    stdio64_dir=stdio64
     oext=lo
     aext=la ;;
   *) ;; #shared library not supported for ${host}
@@ -303,8 +224,8 @@ esac
 
 case "${host}" in
   *-*-cygwin*)
+	sys_dir=cygwin
 	posix_dir=posix
-	stdio64_dir=stdio64
 	;;
   *-*-netware*)
 	signal_dir=
@@ -322,13 +243,7 @@ case "${host}" in
 	sys_dir=arc
 	;;
   arm-*-*)
-	sys_dir=arm
-	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
-	  have_crt0="no"
-	fi
-	;;
-  crx*)
-	sys_dir=
+	sys_dir=arm 
 	;;
   d10v*)
 	sys_dir=d10v
@@ -336,24 +251,12 @@ case "${host}" in
   d30v*)
 	sys_dir=
 	;;
-  ep9312-*-*)
-	sys_dir=arm
-	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
-	  have_crt0="no"
-	fi
-	;;
-  frv*)
-        sys_dir=
-        ;;
   h8300-*-hms*)
 	sys_dir=h8300hms
 	;;
   h8300-*-elf*)
 	sys_dir=h8300hms
 	;;
-  h8300-*-coff*)
-	sys_dir=h8300hms
-	;;
   h8300-*-xray*)
 	sys_dir=h8300xray
 	;;
@@ -363,28 +266,22 @@ case "${host}" in
   h8500-*-elf*)
 	sys_dir=h8500hms
 	;;
-  i[34567]86-*-rdos*)
-	sys_dir=rdos
-	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
+  i[3456]86-*-go32)
+	sys_dir=go32
 	;;
-  i[34567]86-*-sco*)
+  i[3456]86-*-sco*)
 	sys_dir=sysvi386
 	unix_dir=unix
 	;;
-  i[34567]86-pc-linux-*)
+  i[3456]86-pc-linux-*)
 	sys_dir=linux
 	unix_dir=unix
 	posix_dir=posix
-	crt1=crt1.o
-	crt1_dir=libc/sys/${sys_dir}	
 	gcc_dir=`gcc -print-search-dirs | awk '/^install:/{print $2}'`
-	default_newlib_io_long_double="yes"
-	default_newlib_io_long_long="yes"
-	default_newlib_io_pos_args="yes"
 	#newlib_cflags="${newlib_cflags} -Werror" # DEBUGGING ONLY;BREAKS BUILD
 	newlib_cflags="${newlib_cflags} -Wall"
 	newlib_cflags="${newlib_cflags} -D_I386MACH_ALLOW_HW_INTERRUPTS"
-	newlib_cflags="${newlib_cflags} -DHAVE_FCNTL"
+	newlib_cflags="${newlib_cflags} -D_LOOSE_KERNEL_NAMES -DHAVE_FCNTL"
 	# --- Required when building a shared library ------------------------
 	newlib_cflags="${newlib_cflags} -fPIC -D_I386MACH_NEED_SOTYPE_FUNCTION"
 	# --- The three lines below are optional ------------------------------
@@ -392,10 +289,6 @@ case "${host}" in
 	##newlib_cflags="${newlib_cflags} -I`newlib-flags --kernel-dir`/include"
 	##newlib_cflags="${newlib_cflags} -idirafter ${gcc_dir}include"
 	;;
-
-  m68hc11-*-*|m6811-*-*|m6812-*-*|m68hc12-*-*)
-	;;
-
   m68k-sun-sunos*)
 	unix_dir=unix
 	;;
@@ -409,6 +302,7 @@ case "${host}" in
 	sys_dir=mmixware
 	;;
   powerpcle-*-pe)
+	sys_dir=cygwin
 	posix_dir=posix
 	;;
   sh*-*)
@@ -423,16 +317,13 @@ case "${host}" in
 	unix_dir=unix
 	;;
   strongarm-*-*)
-	sys_dir=arm
-	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
-	  have_crt0="no"
-	fi
+	sys_dir=arm 
+	;;
+  xscale-*-*)
+	sys_dir=arm 
 	;;
   thumb-*-*)
-	sys_dir=arm
-	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
-	  have_crt0="no"
-	fi
+	sys_dir=arm 
 	;;
   tic80*)
 	sys_dir=tic80
@@ -455,12 +346,6 @@ case "${host}" in
   w65-*-*)
 	sys_dir=w65
 	;;
-  xscale-*-*)
-	sys_dir=arm
-	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
-	  have_crt0="no"
-	fi
-	;;
   z8k-*-coff)
 	sys_dir=z8ksim
 	;;
@@ -472,13 +357,11 @@ esac
 
 case "${host}" in
   *-*-cygwin*)
-	test -z "$cygwin_srcdir" && cygwin_srcdir=`cd ${srcdir}/../winsup/cygwin; pwd`
-	export cygwin_srcdir
-	default_newlib_io_long_long="yes"
-	default_newlib_io_long_double="yes"
-	default_newlib_io_pos_args="yes"
-	CC="${CC} -I${cygwin_srcdir}/include"
-	newlib_cflags="${newlib_cflags} -DHAVE_OPENDIR -DHAVE_RENAME -DSIGNAL_PROVIDED -D_COMPILING_NEWLIB -DHAVE_FCNTL -DMALLOC_PROVIDED"
+	newlib_cflags="${newlib_cflags} -DHAVE_OPENDIR -DHAVE_RENAME -DSIGNAL_PROVIDED -DWANT_IO_LONG_DBL -DWANT_PRINTF_LONG_LONG -D_COMPILING_NEWLIB -DHAVE_FCNTL"
+# CYGWIN provides its own malloc if --enable-malloc-debugging is set
+	if [ "x${malloc_debugging}" = "xyes" ] ; then
+	  newlib_cflags="${newlib_cflags} -DMALLOC_PROVIDED"
+	fi
 	syscall_dir=syscalls
 	;;
 # RTEMS supplies its own versions of some routines:
@@ -489,8 +372,7 @@ case "${host}" in
 #
 #  NOTE: When newlib malloc uses a semaphore, RTEMS will switch to that.
   *-*-rtems*)
-	default_newlib_io_long_long="yes"
-	newlib_cflags="${newlib_cflags} -DHAVE_GETTIMEOFDAY -DMALLOC_PROVIDED -DEXIT_PROVIDED -DMISSING_SYSCALL_NAMES -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_OPENDIR -DNO_EXEC -DHAVE_FCNTL"
+	newlib_cflags="${newlib_cflags} -DHAVE_GETTIMEOFDAY -DMALLOC_PROVIDED -DEXIT_PROVIDED -DMISSING_SYSCALL_NAMES -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_OPENDIR -DNO_EXEC -DWANT_PRINTF_LONG_LONG -DHAVE_FCNTL"
 	;;
 # VxWorks supplies its own version of malloc, and the newlib one
 # doesn't work because VxWorks does not have sbrk.
@@ -508,38 +390,23 @@ case "${host}" in
   arm-*-pe)
 	syscall_dir=syscalls
 	newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
+# Don't use the debugging protocols just yet.
 	;;
   arm-*-*)
 	syscall_dir=syscalls
 	newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
-# If newlib is supplying syscalls, select which debug protocol is being used.
+# Select which debug protocol is being used.
 # ARM_RDP_MONITOR selects the Demon monitor.
 # ARM_RDI_MONITOR selects the Angel monitor.
 # If neither are defined, then hard coded defaults will be used
 # to create the program's environment.
-# If --disable-newlib-supplied-syscalls is specified, then the end-user
-# may specify the protocol via gcc spec files supplied by libgloss.
 # See also thumb below.
-	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
-#         newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
-	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
-	fi
-	;;
-  arc*)
-	newlib_cflags="${newlib_cflags} -DREENTRANT_SYSCALLS_PROVIDED"
+#	newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
+	newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
 	;;
   avr*)
 	newlib_cflags="${newlib_cflags} -DNO_EXEC -DSMALL_MEMORY -DMISSING_SYSCALL_NAMES"
 	;;
-  cris-*-* | crisv32-*-*)
-	default_newlib_io_long_long="yes"
-	newlib_cflags="${newlib_cflags} -DHAVE_RENAME -DHAVE_GETTIMEOFDAY -D_USE_WRITE -DCOMPACT_CTYPE"
-	syscall_dir=syscalls
-	;;
-  crx-*-*)
-	newlib_cflags="${newlib_cflags} -DHAVE_RENAME -DMISSING_SYSCALL_NAMES"
-	syscall_dir=
-	;;
   d10v*)
 	newlib_cflags="${newlib_cflags} -DSMALL_MEMORY"
 	syscall_dir=syscalls
@@ -548,41 +415,26 @@ case "${host}" in
 	newlib_cflags="${newlib_cflags} -DABORT_MESSAGE -DSMALL_MEMORY -DMISSING_SYSCALL_NAMES"
 	syscall_dir=
 	;;
-  ep9312-*-*)
-	syscall_dir=syscalls
-	newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
-	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
-	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
-	fi
-	;;
   fr30-*-*)
+	newlib_cflags="${newlib_cflags}"
 	syscall_dir=syscalls
 	;;
-  frv-*-*)
-        syscall_dir=syscalls
-	default_newlib_io_long_long="yes"
-        ;;
   h8300*-*-*)
 	syscall_dir=syscalls	
-	default_newlib_io_long_long="yes"
 	newlib_cflags="${newlib_cflags} -DSMALL_DTOA -DSMALL_MEMORY"
-	# Simulator only extensions for H8300.
-	# Uncomment the next line to enable them.
-	# newlib_cflags="${newlib_cflags} -D__SIMULATOR__"
 	;;	
   h8500-*-*)
 	syscall_dir=syscalls	
 	newlib_cflags="${newlib_cflags} -DSMALL_DTOA -DSMALL_MEMORY"
 	;;	
-  i[34567]86-*-sco*)
+  i[3456]86-*-sco*)
 	newlib_cflags="${newlib_cflags} -DSIGNAL_PROVIDED -DHAVE_FCNTL"
 	;;
-  i[34567]86-*-netware*)
+  i[3456]86-*-netware*)
 	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES -DNO_EXEC -DABORT_PROVIDED -DCLOCK_PROVIDED -DMALLOC_PROVIDED -DHAVE_FCNTL"
 	;;
-  iq2000*)
-	syscall_dir=syscalls
-	default_newlib_io_long_long="yes"
+  i[3456]86-*-go32)
+	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES -DNO_EXEC -DHAVE_FCNTL"
 	;;
   m32r-*-*)
 	# Pass -msdata=sdata so _impure_ptr goes in .sdata.
@@ -592,20 +444,10 @@ case "${host}" in
 	newlib_cflags="${newlib_cflags} -msdata=sdata"
 	syscall_dir=syscalls
 	;;
-  m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
-	newlib_cflags="${newlib_cflags} -DNO_EXEC -DABORT_PROVIDED -DSMALL_MEMORY -DMISSING_SYSCALL_NAMES"
-	;;
   mcore-*-*)
+	newlib_cflags="${newlib_cflags}"
 	syscall_dir=syscalls
 	;;
-  mips64vr*-*-*)
-	default_newlib_io_long_long="yes"
-	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
-	;;
-  mips*-*-elf*)
-	default_newlib_io_long_long="yes"
-	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
-	;;
   mmix-*)
 	syscall_dir=syscalls
 	# We need every symbol 32-bit aligned, so the invalid
@@ -615,21 +457,12 @@ case "${host}" in
   mn10?00-*-*)
 	syscall_dir=syscalls
 	;;
-  powerpc*-*-eabialtivec*)
-	default_newlib_io_long_long="yes"
-	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
-	;;
-  powerpc*-*-eabispe*)
-	default_newlib_io_long_long="yes"
-	newlib_cflags="${newlib_cflags} -DMISSING_SYSCALL_NAMES"
-	;;
   powerpc*-*-eabi* | \
   powerpc*-*-elf* | \
   powerpc*-*-linux* | \
   powerpc*-*-rtem* | \
   powerpc*-*-sysv* | \
   powerpc*-*-solaris*)
-	default_newlib_io_long_long="yes"
 	newlib_cflags="${newlib_cflags} -mrelocatable-lib -mno-eabi -mstrict-align -DMISSING_SYSCALL_NAMES"
 	;;
   powerpcle-*-pe)
@@ -637,7 +470,6 @@ case "${host}" in
 	syscall_dir=syscalls
 	;;
   sh*-*-*)
-	default_newlib_io_long_long="yes"
 	newlib_cflags="${newlib_cflags} -DHAVE_GETTIMEOFDAY"
 	syscall_dir=syscalls
 	;;
@@ -658,6 +490,12 @@ case "${host}" in
   strongarm-*-*)
 	syscall_dir=syscalls
 	newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
+	newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
+	;;
+  xscale-*-*)
+	syscall_dir=syscalls
+	newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
+	newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
 	;;
   thumb-*-pe)
 	syscall_dir=syscalls
@@ -667,17 +505,14 @@ case "${host}" in
   thumb-*-*)
 	syscall_dir=syscalls
 	newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
-# If newlib is supplying syscalls, select which debug protocol is being used.
+# Select which debug protocol is being used.
 # ARM_RDP_MONITOR selects the Demon monitor.
 # ARM_RDI_MONITOR selects the Angel monitor.
 # If neither are defined, then hard coded defaults will be used
 # to create the program's environment.
-# If --disable-newlib-supplied-syscalls is specified, then the end-user
-# may specify the protocol via gcc spec files supplied by libgloss.
-	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
-#         newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
-	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
-	fi
+# See also arm and strongarm above.
+#	newlib_cflags="${newlib_cflags} -DARM_RDP_MONITOR"
+	newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
 	;;
   tic80*)
 	syscall_dir=syscalls
@@ -695,18 +530,6 @@ case "${host}" in
 	syscall_dir=syscalls	
 	newlib_cflags="${newlib_cflags} -DSMALL_DTOA -DSMALL_MEMORY"
 	;;	
-  xscale-*-*)
-	syscall_dir=syscalls
-	newlib_cflags="${newlib_cflags} -DABORT_PROVIDED -DHAVE_GETTIMEOFDAY"
-	newlib_cflags="${newlib_cflags} -DHAVE_SYSTEM -DHAVE_RENAME"
-	if [ "x${newlib_may_supply_syscalls}" = "xyes" ] ; then
-	  newlib_cflags="${newlib_cflags} -DARM_RDI_MONITOR"
-	fi
-	;;
-  xstormy16-*-*)
-	newlib_cflags="${newlib_cflags} -DHAVE_GETTIMEOFDAY"
-	syscall_dir=syscalls
-	;;
   z8k-*-*)
 	syscall_dir=syscalls
 	;;
@@ -715,37 +538,3 @@ case "${host}" in
 	syscall_dir=
 	;;
 esac
-
-# Use defaults for certain settings if not specified by user
-
-# Enable long long support in I/O routines if requested.
-if [ "x${newlib_io_long_long}" = "x" ]; then
-	if [ ${default_newlib_io_long_long} = "yes" ]; then
-		newlib_io_long_long="yes";
-	fi
-fi
-
-# Enable long double support in I/O routines if requested.
-if [ "x${newlib_io_long_double}" = "x" ]; then
-	if [ ${default_newlib_io_long_double} = "yes" ]; then
-		newlib_io_long_double="yes";
-	fi
-fi
-
-# Enable printf positional argument support if requested.
-if [ "x${newlib_io_pos_args}" = "x" ]; then
-	if [ ${default_newlib_io_pos_args} = "yes" ]; then
-		newlib_io_pos_args="yes";
-	fi
-fi
-
-# Disable atexit dynamic allocation if requested.
-if [ "x${newlib_atexit_dynamic_alloc}" = "x" ]; then
-	if [ ${default_newlib_atexit_dynamic_alloc} = "yes" ]; then
-		newlib_atexit_dynamic_alloc="yes"; 
-	fi
-fi
-
-if test -z "${have_crt0}" && test -n "${sys_dir}"; then
-  have_crt0="yes"
-fi
diff --git a/newlib/configure.in b/newlib/configure.in
index 3cd213c..3b33510 100644
--- a/newlib/configure.in
+++ b/newlib/configure.in
@@ -1,101 +1,12 @@
 dnl This is the newlib configure.in file.
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.13)
+AC_PREREQ(2.5)
 AC_INIT(libc)
-AM_CONFIG_HEADER(newlib.h:newlib.hin)
 
 dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
 AC_CONFIG_AUX_DIR(..)
 
-dnl Support --enable-newlib-io-pos-args
-dnl This option is actually read in libc/configure.in.  It is repeated
-dnl here so that it shows up in the help text.
-AC_ARG_ENABLE(newlib-io-pos-args,
-[  --enable-newlib-io-pos-args enable printf-family positional arg support],
-[case "${enableval}" in
-  yes) newlib_io_pos_args=yes ;;
-  no)  newlib_io_pos_args=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-pos-args option) ;;
- esac], [newlib_io_pos_args=])dnl
-
-dnl Support --enable-newlib-io-long-long
-AC_ARG_ENABLE(newlib-io-long-long,
-[  --enable-newlib-io-long-long   enable long long type support in IO functions like printf/scanf],
-[case "${enableval}" in
-  yes) newlib_io_long_long=yes;;
-  no)  newlib_io_long_long=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-long-long option) ;;
- esac], [newlib_io_long_long=])dnl
-
-dnl Support --enable-newlib-io-long-double
-AC_ARG_ENABLE(newlib-io-long-double,
-[  --enable-newlib-io-long-double   enable long double type support in IO functions printf/scanf],
-[case "${enableval}" in
-  yes) newlib_io_long_double=yes;;
-  no)  newlib_io_long_double=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-long-double option) ;;
- esac], [newlib_io_long_double=])dnl
-
-dnl If multibyte support is enabled, iconv should be enabled too
-dnl Support --enable-newlib-mb
-AC_ARG_ENABLE(newlib-mb,
-[  --enable-newlib-mb        enable multibyte support],
-[case "${enableval}" in
-  yes) newlib_mb=yes;;
-  no)  newlib_mb=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
- esac], [newlib_mb=])dnl
-
-dnl Support --enable-newlib-iconv-encodings
-AC_ARG_ENABLE(newlib-iconv-encodings,
-[  --enable-newlib-iconv-encodings   enable specific comma-separated list of bidirectional iconv encodings to be built-in],
-[if test x${enableval} = x; then
-   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv-encodings option - use comma-separated encodings list)
- fi
- iconv_encodings=${enableval}
- ], [iconv_encodings=])dnl
-
-dnl Support --enable-newlib-iconv-from-encodings
-AC_ARG_ENABLE(newlib-iconv-from-encodings,
-[  --enable-newlib-iconv-from-encodings   enable specific comma-separated list of \"from\" iconv encodings to be built-in],
-[if test x${enableval} = x; then
-   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv-from-encodings option - use comma-separated encodings list)
- fi
- iconv_from_encodings=${enableval}
- ], [iconv_from_encodings=])dnl
-
-dnl Support --enable-newlib-iconv-to-encodings
-AC_ARG_ENABLE(newlib-iconv-to-encodings,
-[  --enable-newlib-iconv-to-encodings   enable specific comma-separated list of \"to\" iconv encodings to be built-in],
-[if test x${enableval} = x; then
-   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv-to-encodings option - use comma-separated encodings list)
- fi
- iconv_to_encodings=${enableval}
- ], [iconv_to_encodings=])dnl
-
-dnl Support --enable-newlib-iconv-external-ccs
-AC_ARG_ENABLE(newlib-iconv-external-ccs,
-[  --enable-newlib-iconv-external-ccs     enable capabilities to load external CCS files for iconv],
-[if test "${newlib_iconv_external_ccs+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv_external_ccs=yes ;;
-     no)  newlib_iconv_external_ccs=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv-external-ccs option) ;;
-   esac
- fi], [newlib_iconv_external_ccs=${newlib_iconv_external_ccs}])dnl
-
-dnl Support --disable-newlib-atexit-dynamic-alloc
-AC_ARG_ENABLE(newlib-atexit-dynamic-alloc,
-[  --disable-newlib-atexit-alloc    disable dynamic allocation of atexit entries],
-[if test "${newlib_atexit_dynamic_alloc+set}" != set; then
-  case "${enableval}" in
-    yes) newlib_atexit_dynamic_alloc=yes ;;
-    no)  newlib_atexit_dynamic_alloc=no  ;;
-    *)   AC_MSG_ERROR(bad value ${enableval} for newlib-atexit-dynamic-alloc option) ;;
-  esac
- fi], [newlib_atexit_dynamic_alloc=${newlib_atexit_dynamic_alloc}])dnl
-
 NEWLIB_CONFIGURE(.)
 
 dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
@@ -126,45 +37,17 @@ else
 fi
 AM_CONDITIONAL(HAVE_DOC, test x$have_doc = xyes)
 
-EXTRA_DIRS=
-case $host in
-  i[[34567]]86-pc-linux-*)
-	configdirs="${configdirs} iconvdata"
-	EXTRA_DIRS=iconvdata
-	;;
-esac
-AC_SUBST(EXTRA_DIRS)
-
-# These get added in the top-level configure.in, except in the case where
-# newlib is being built natively.
-LIBC_INCLUDE_GREP=`echo ${CC} | grep \/libc\/include`
-abs_newlib_basedir=`cd ${newlib_basedir} && pwd`
-if test -z "${LIBC_INCLUDE_GREP}"; then
-  CC_FOR_NEWLIB="${CC} -I$PWD/targ-include -I${abs_newlib_basedir}/libc/include"
-else
-  CC_FOR_NEWLIB="${CC}"
-fi
-AC_SUBST(CC_FOR_NEWLIB)
-
 AC_CONFIG_SUBDIRS(${configdirs})
 
 CRT0=
 CRT0_DIR=
-if test "x${have_crt0}" = "xyes"; then
+if test -n "${sys_dir}"; then
   CRT0=crt0.o
-  CRT0_DIR=libc/
+  CRT0_DIR=libc
 fi
 AC_SUBST(CRT0)
 AC_SUBST(CRT0_DIR)
 
-CRT1=${crt1}
-CRT1_DIR=
-if test -n "${crt1_dir}"; then
-  CRT1_DIR=${crt1_dir}/
-fi
-AC_SUBST(CRT1)
-AC_SUBST(CRT1_DIR)
-
 if test -n "${libm_machine_dir}"; then
   LIBM_MACHINE_OBJECTLIST=libm/machine/${libm_machine_dir}/objectlist.awk.in
 fi
@@ -180,11 +63,6 @@ if test -n "${sys_dir}"; then
 fi
 AC_SUBST(SYS_OBJECTLIST)
 
-if test "${have_sys_mach_dir}" = "yes"; then
-  SYS_MACH_OBJECTLIST=libc/sys/${sys_dir}/machine/${machine_dir}/objectlist.awk.in
-fi
-AC_SUBST(SYS_MACH_OBJECTLIST)
-
 if test -n "${posix_dir}"; then
   POSIX_OBJECTLIST=libc/${posix_dir}/objectlist.awk.in
 fi
@@ -205,192 +83,25 @@ if test -n "${unix_dir}"; then
 fi
 AC_SUBST(UNIX_OBJECTLIST)
 
-if test -n "${stdio64_dir}"; then
-  STDIO64_OBJECTLIST=libc/${stdio64_dir}/objectlist.awk.in
-fi
-AC_SUBST(STDIO64_OBJECTLIST)
-
 # Put a plausible default for CC_FOR_BUILD in Makefile.
 if test -z "$CC_FOR_BUILD"; then
-  CC_FOR_BUILD=gcc
+  if test "x$cross_compiling" = "xno"; then
+    CC_FOR_BUILD='$(CC)'
+  else
+    CC_FOR_BUILD=gcc
+  fi
 fi
 AC_SUBST(CC_FOR_BUILD)
 
-if test "${newlib_elix_level}" -gt "0"; then
-AC_DEFINE_UNQUOTED(_ELIX_LEVEL,${newlib_elix_level})
-fi
-
-if test "${newlib_io_long_long}" = "yes"; then
-AC_DEFINE_UNQUOTED(_WANT_IO_LONG_LONG)
-fi
-
-if test "${newlib_io_long_double}" = "yes"; then
-AC_DEFINE_UNQUOTED(_WANT_IO_LONG_DOUBLE)
-fi
-
-if test "${newlib_io_pos_args}" = "yes"; then
-AC_DEFINE_UNQUOTED(_WANT_IO_POS_ARGS)
-fi
-
-if test "${newlib_mb}" = "yes"; then
-AC_DEFINE_UNQUOTED(_MB_CAPABLE)
-AC_DEFINE_UNQUOTED(_MB_LEN_MAX,8)
-else
-AC_DEFINE_UNQUOTED(_MB_LEN_MAX,1)
-fi
-
-if test "${newlib_iconv_external_ccs}" = "yes"; then
-AC_DEFINE_UNQUOTED(_ICONV_ENABLE_EXTERNAL_CCS)
-fi
-
-if test "${newlib_atexit_dynamic_alloc}" = "yes"; then
-AC_DEFINE_UNQUOTED(_ATEXIT_DYNAMIC_ALLOC)
-fi
-
-AC_DEFINE_UNQUOTED(_NEWLIB_VERSION,"$VERSION")
-
 if test "${multilib}" = "yes"; then
   multilib_arg="--enable-multilib"
 else
   multilib_arg=
 fi
 
-if test "${newlib_iconv}" = "yes"; then
-AC_DEFINE_UNQUOTED(_ICONV_ENABLED,1)
-fi
-
-if test "x${newlib_iconv_external_ccs}" = "xyes"; then
-  if test "x${newlib_iconv}" = "x"; then
-      AC_MSG_ERROR(--enable-newlib-iconv-external-ccs option can't be used if iconv library is disabled, use --enable-newlib-iconv to enable it.)
-  fi
-  AC_DEFINE_UNQUOTED(_ICONV_ENABLE_EXTERNAL_CCS,1)
-fi
-
-dnl
-dnl Parse --enable-newlib-iconv-encodings option argument
-dnl
-if test "x${iconv_encodings}" != "x" \
-   || test "x${iconv_to_encodings}" != "x" \
-   || test "x${iconv_from_encodings}" != "x"; then
-  
-  dnl Check that --enable-newlib-iconv was enabled
-  if test "x${newlib_iconv}" = "x"; then
-      AC_MSG_ERROR(--enable-newlib-iconv-encodings, --enable-newlib-iconv-from-encodings and --enable-newlib-iconv-to-encodings option can't be used if iconv library is disabled, use --enable-newlib-iconv to enable it.)
-  fi
-  
-  dnl Normalize encodings names and delete commas
-  iconv_encodings=`echo "${iconv_encodings}" | sed -e 's/,/ /g' -e 's/-/_/g' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-  iconv_to_encodings=`echo "${iconv_to_encodings}" | sed -e 's/,/ /g' -e 's/-/_/g' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-  iconv_from_encodings=`echo "${iconv_from_encodings}" | sed -e 's/,/ /g' -e 's/-/_/g' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- 
-  dnl Get the list of available encodings excluding comments
-  dnl Join line with previous if the first character is whitespace
-  available_encodings=`cat "${srcdir}/libc/iconv/encoding.aliases" | sed -e '/^#.*/d'`
-  
-  dnl Check if required encodings are supported
-  dnl Convert aliases to names
-  
-  dnl iconv_encodings
-  iconv_encodings1="${iconv_encodings}"
-  iconv_encodings=""
-  for encoding in ${iconv_encodings1}; do
-      result=`echo "${available_encodings}" | grep -e "\(^\| \)${encoding}\( \|\$\)"`
-      if test $? != "0"; then
-          AC_MSG_ERROR(${encoding} is not supported - see ${srcdir}/libc/iconv/encoding.aliases file for the list of available encodings)
-      fi
-      encoding1=`echo "${result}" | sed -e 's/\(^[[^ ]]*\).*$/\1/'`
-      iconv_encodings="${iconv_encodings} ${encoding1}"
-  done
-  dnl Enable appropriate option in newlib.h
-  for encoding in ${iconv_encodings}; do
-      opt=_ICONV_TO_ENCODING_`echo "${encoding}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-      AC_DEFINE_UNQUOTED($opt,1)
-      opt=_ICONV_FROM_ENCODING_`echo "${encoding}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-      AC_DEFINE_UNQUOTED($opt,1)
-  done
-
-  dnl iconv_to_encodings
-  iconv_encodings1="${iconv_to_encodings}"
-  iconv_to_encodings=""
-  for encoding in ${iconv_encodings1}; do
-      result=`echo "${available_encodings}" | grep -e "\(^\| \)${encoding}\( \|\$\)"`
-      if test $? != "0"; then
-          AC_MSG_ERROR(${encoding} is not supported - see ${srcdir}/libc/iconv/encoding.aliases file for the list of available encodings)
-      fi
-      encoding1=`echo "${result}" | sed -e 's/\(^[[^ ]]*\).*$/\1/'`
-      iconv_to_encodings="${iconv_to_encodings} ${encoding1}"
-  done
-  dnl Enable appropriate option in newlib.h
-  for encoding in ${iconv_to_encodings}; do
-      opt=_ICONV_TO_ENCODING_`echo "${encoding}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-      AC_DEFINE_UNQUOTED($opt,1)
-  done
-
-  dnl iconv_from_encodings
-  iconv_encodings1="${iconv_from_encodings}"
-  iconv_from_encodings=""
-  for encoding in ${iconv_encodings1}; do
-      result=`echo "${available_encodings}" | grep -e "\(^\| \)${encoding}\( \|\$\)"`
-      if test $? != "0"; then
-          AC_MSG_ERROR(${encoding} is not supported - see ${srcdir}/libc/iconv/encoding.aliases file for the list of available encodings)
-      fi
-      encoding1=`echo "${result}" | sed -e 's/\(^[[^ ]]*\).*$/\1/'`
-      iconv_from_encodings="${iconv_from_encodings} ${encoding1}"
-  done
-  dnl Enable appropriate option in newlib.h
-  for encoding in ${iconv_from_encodings}; do
-      opt=_ICONV_FROM_ENCODING_`echo "${encoding}" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-      AC_DEFINE_UNQUOTED($opt,1)
-  done
-fi;
-
-AC_CACHE_CHECK(for .preinit_array/.init_array/.fini_array support,
-	       libc_cv_initfinit_array, [dnl
-cat > conftest.c <<EOF
-int _start (void) { return 0; }
-int __start (void) { return 0; }
-int foo (void) { return 1; }
-int (*fp) (void) __attribute__ ((section (".init_array"))) = foo;
-EOF
-if AC_TRY_COMMAND([${CC} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest conftest.c
-		   -static -nostartfiles -nostdlib 1>&AS_MESSAGE_LOG_FD])
-then
-  if readelf -S conftest | grep -e INIT_ARRAY > /dev/null; then
-    libc_cv_initfinit_array=yes
-  else
-    libc_cv_initfinit_array=no
-  fi
-else
-  libc_cv_initfinit_array=no
-fi
-rm -f conftest*])
-AC_SUBST(libc_cv_initfinit_array)
-if test $libc_cv_initfinit_array = yes; then
-  AC_DEFINE_UNQUOTED(HAVE_INITFINI_ARRAY)
-fi
-
-AC_CACHE_CHECK(for array aliasing support,
-	       libc_cv_array_aliasing, [dnl
-cat > conftest.c <<EOF
-char x[3] = { 'a', 'b', 'c' };
-extern char y[2] __attribute__((alias ("x+1")));
-EOF
-if AC_TRY_COMMAND([${CC} $CFLAGS $CPPFLAGS -c conftest.c
-		   1>&AS_MESSAGE_LOG_FD])
-then
-  libc_cv_array_aliasing=yes
-else
-  libc_cv_array_aliasing=no
-fi
-rm -f conftest*])
-AC_SUBST(libc_cv_array_aliasing)
-if test $libc_cv_array_aliasing = yes; then
-  AC_DEFINE_UNQUOTED(_HAVE_ARRAY_ALIASING)
-fi
 
 AC_OUTPUT(Makefile,
 [if test -n "$CONFIG_FILES"; then
-  unset ac_file
   . ${newlib_basedir}/../config-ml.in
 fi],
 srcdir=${srcdir}
diff --git a/newlib/doc/Makefile.in b/newlib/doc/Makefile.in
index ba8dc1d..e911c2c 100644
--- a/newlib/doc/Makefile.in
+++ b/newlib/doc/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -74,7 +70,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -116,7 +111,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  ../acinclude.m4 \
-		../aclocal.m4 ../libtool.m4
+		../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/doc/aclocal.m4 b/newlib/doc/aclocal.m4
index b03b0d2..9a25f7b 100644
--- a/newlib/doc/aclocal.m4
+++ b/newlib/doc/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/doc/configure b/newlib/doc/configure
index 47e5888..5ad07a9 100755
--- a/newlib/doc/configure
+++ b/newlib/doc/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1583,7 +1440,7 @@ if test "x$cross_compiling" = "xno"; then
   EXEEXT_FOR_BUILD='$(EXEEXT)'
 else
   echo $ac_n "checking for build system executable suffix""... $ac_c" 1>&6
-echo "configure:1587: checking for build system executable suffix" >&5
+echo "configure:1444: checking for build system executable suffix" >&5
 if eval "test \"`echo '$''{'newlib_cv_build_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1749,24 +1606,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1779,6 +1624,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1787,19 +1637,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1815,7 +1654,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/iconvdata/EUC-JP.irreversible b/newlib/iconvdata/EUC-JP.irreversible
deleted file mode 100644
index 1921ac8..0000000
--- a/newlib/iconvdata/EUC-JP.irreversible
+++ /dev/null
@@ -1,2 +0,0 @@
-0x5C	0x00A5
-0x7E	0x203E
diff --git a/newlib/iconvdata/Makefile.am b/newlib/iconvdata/Makefile.am
deleted file mode 100644
index 33138d2..0000000
--- a/newlib/iconvdata/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir) -I$(srcdir)/../libc/sys/linux $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-if ELIX_LEVEL_1
-LIB_OBJS = 
-else
-LIB_OBJS = euc-jp.$(oext) jis0201.$(oext) jis0208.$(oext) jis0212.$(oext)
-endif
-
-AM_CFLAGS = -DNDEBUG
-
-all: Makefile
-
-pkglib_LTLIBRARIES = EUC-JP.la
-EUC_JP_la_SOURCES = dummy.c
-EUC_JP_la_LIBADD = $(LIB_OBJS)
-EUC_JP_la_DEPENDENCIES = $(LIB_OBJS)
-EUC_JP_la_LDFLAGS = -module -no-undefined -Xcompiler -Wl,-rpath-link=.. -Xcompiler -nostdlib -L.. -lc
-
-install-data-local: install-pkglibLTLIBRARIES $(srcdir)/gconv-modules
-	$(INSTALL_DATA) $(srcdir)/gconv-modules $(DESTDIR)$(pkglibdir)/gconv-modules
-
-ACLOCAL_AMFLAGS = -I ..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/iconvdata/Makefile.in b/newlib/iconvdata/Makefile.in
deleted file mode 100644
index e4e5310..0000000
--- a/newlib/iconvdata/Makefile.in
+++ /dev/null
@@ -1,393 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir) -I$(srcdir)/../libc/sys/linux $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = euc-jp.$(oext) jis0201.$(oext) jis0208.$(oext) jis0212.$(oext)
-
-AM_CFLAGS = -DNDEBUG
-
-pkglib_LTLIBRARIES = EUC-JP.la
-EUC_JP_la_SOURCES = dummy.c
-EUC_JP_la_LIBADD = $(LIB_OBJS)
-EUC_JP_la_DEPENDENCIES = $(LIB_OBJS)
-EUC_JP_la_LDFLAGS = -module -no-undefined -Xcompiler -Wl,-rpath-link=.. -Xcompiler -nostdlib -L.. -lc
-
-ACLOCAL_AMFLAGS = -I ..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(pkglib_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-EUC_JP_la_OBJECTS =  dummy.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(EUC_JP_la_SOURCES)
-OBJECTS = $(EUC_JP_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  ../acinclude.m4 \
-		../aclocal.m4 ../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-pkglibLTLIBRARIES:
-
-clean-pkglibLTLIBRARIES:
-	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
-
-distclean-pkglibLTLIBRARIES:
-
-maintainer-clean-pkglibLTLIBRARIES:
-
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-pkglibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-EUC-JP.la: $(EUC_JP_la_OBJECTS) $(EUC_JP_la_DEPENDENCIES)
-	$(LINK) -rpath $(pkglibdir) $(EUC_JP_la_LDFLAGS) $(EUC_JP_la_OBJECTS) $(EUC_JP_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am: install-pkglibLTLIBRARIES
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-pkglibLTLIBRARIES
-uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-pkglibLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-pkglibLTLIBRARIES clean-compile clean-libtool \
-		clean-tags clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-pkglibLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-pkglibLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-pkglibLTLIBRARIES distclean-pkglibLTLIBRARIES \
-clean-pkglibLTLIBRARIES maintainer-clean-pkglibLTLIBRARIES \
-uninstall-pkglibLTLIBRARIES install-pkglibLTLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-local \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-all: Makefile
-
-install-data-local: install-pkglibLTLIBRARIES $(srcdir)/gconv-modules
-	$(INSTALL_DATA) $(srcdir)/gconv-modules $(DESTDIR)$(pkglibdir)/gconv-modules
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/iconvdata/SJIS.irreversible b/newlib/iconvdata/SJIS.irreversible
deleted file mode 100644
index c3c28e2..0000000
--- a/newlib/iconvdata/SJIS.irreversible
+++ /dev/null
@@ -1,5 +0,0 @@
-0x5C	0x005C
-0x7E	0x007E
-0x8191	0xFFE0
-0x8192	0xFFE1
-0x81CA	0xFFE2
diff --git a/newlib/iconvdata/aclocal.m4 b/newlib/iconvdata/aclocal.m4
deleted file mode 100644
index 35519ac..0000000
--- a/newlib/iconvdata/aclocal.m4
+++ /dev/null
@@ -1,1226 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  ])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)])
-
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/iconvdata/configure b/newlib/iconvdata/configure
deleted file mode 100755
index a4f8cf4..0000000
--- a/newlib/iconvdata/configure
+++ /dev/null
@@ -1,3311 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=yes]"
-ac_help="$ac_help
-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=jis0201.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:590: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:643: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:700: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:733: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 738 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:766: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 771 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}.."
-  fi
-else
-  newlib_basedir="${srcdir}/.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:948: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:969: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:987: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1030: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1043: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1056: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1069: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1082: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1186: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1210: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1337: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1382: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-
-if test "${use_libtool}" = "yes"; then
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_shared=yes
-fi
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_static=yes
-fi
-
-# Check whether --enable-fast-install or --disable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_fast_install=yes
-fi
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1783 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
-else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi
-fi
-
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-
-NM="$lt_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-libtool_flags="$libtool_flags --enable-win32-dll"
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-  :
-fi
-
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
-fi
-rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-fi
-
-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_DLLTOOL"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  DLLTOOL="false"
-fi
-fi
-
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AS="false"
-fi
-fi
-
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_OBJDUMP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="objdump"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  OBJDUMP="false"
-fi
-fi
-
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  
-esac
-
-
-# Save cache, so that ltconfig can load it
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
-# Reload cache, that may have been modified by ltconfig
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-
-  
-
-  
-	 
-	 
-fi
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@OBJDUMP@%$OBJDUMP%g
-s%@LIBTOOL@%$LIBTOOL%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/iconvdata/configure.in b/newlib/iconvdata/configure.in
deleted file mode 100644
index 7aee568..0000000
--- a/newlib/iconvdata/configure.in
+++ /dev/null
@@ -1,21 +0,0 @@
-dnl This is the newlib/iconvdata configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(jis0201.c)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../..)
-
-NEWLIB_CONFIGURE(..)
-
-dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
-dnl add it into NEWLIB_CONFIGURE, executable tests are made before the first
-dnl line of the macro which fail because appropriate LDFLAGS are not set.
-
-if test "${use_libtool}" = "yes"; then
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-fi
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/iconvdata/dummy.c b/newlib/iconvdata/dummy.c
deleted file mode 100644
index 9b13d4b..0000000
--- a/newlib/iconvdata/dummy.c
+++ /dev/null
@@ -1 +0,0 @@
-/* empty file to force proper Makefile creation */
diff --git a/newlib/iconvdata/euc-jp.c b/newlib/iconvdata/euc-jp.c
deleted file mode 100644
index 1a63899..0000000
--- a/newlib/iconvdata/euc-jp.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* Mapping tables for EUC-JP handling.
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <dlfcn.h>
-#include <stdint.h>
-#include <gconv.h>
-#include <jis0201.h>
-#include <jis0208.h>
-#include <jis0212.h>
-
-/* Definitions used in the body of the `gconv' function.  */
-#define CHARSET_NAME		"EUC-JP//"
-#define FROM_LOOP		from_euc_jp
-#define TO_LOOP			to_euc_jp
-#define DEFINE_INIT		1
-#define DEFINE_FINI		1
-#define MIN_NEEDED_FROM		1
-#define MAX_NEEDED_FROM		3
-#define MIN_NEEDED_TO		4
-
-
-/* First define the conversion function from EUC-JP to UCS4.  */
-#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
-#define MAX_NEEDED_INPUT	MAX_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
-#define LOOPFCT			FROM_LOOP
-#define BODY \
-  {									      \
-    uint32_t ch = *inptr;						      \
-									      \
-    if (ch < 0x8e || (ch >= 0x90 && ch <= 0x9f))			      \
-      ++inptr;								      \
-    else if (ch == 0xff)						      \
-      {									      \
-	/* This is illegal.  */						      \
-	if (! ignore_errors_p ())					      \
-	  {								      \
-	    result = __GCONV_ILLEGAL_INPUT;				      \
-	    break;							      \
-	  }								      \
-									      \
-	++inptr;							      \
-	++*irreversible;						      \
-	continue;							      \
-      }									      \
-    else								      \
-      {									      \
-	/* Two or more byte character.  First test whether the next	      \
-	   character is also available.  */				      \
-	int ch2;							      \
-									      \
-	if (__builtin_expect (inptr + 1 >= inend, 0))			      \
-	  {								      \
-	    /* The second character is not available.  Store the	      \
-	       intermediate result.  */					      \
-	    result = __GCONV_INCOMPLETE_INPUT;				      \
-	    break;							      \
-	  }								      \
-									      \
-	ch2 = inptr[1];							      \
-									      \
-	/* All second bytes of a multibyte character must be >= 0xa1. */      \
-	if (__builtin_expect (ch2 < 0xa1, 0))				      \
-	  {								      \
-	    /* This is an illegal character.  */			      \
-	    if (! ignore_errors_p ())					      \
-	      {								      \
-		result = __GCONV_ILLEGAL_INPUT;				      \
-		break;							      \
-	      }								      \
-									      \
-	    ++inptr;							      \
-	    ++*irreversible;						      \
-	    continue;							      \
-	  }								      \
-									      \
-	if (ch == 0x8e)							      \
-	  {								      \
-	    /* This is code set 2: half-width katakana.  */		      \
-	    ch = jisx0201_to_ucs4 (ch2);				      \
-	    if (__builtin_expect (ch, 0) == __UNKNOWN_10646_CHAR)	      \
-	      {								      \
-		/* Illegal character.  */				      \
-		if (! ignore_errors_p ())				      \
-		  {							      \
-		    /* This is an illegal character.  */		      \
-		    result = __GCONV_ILLEGAL_INPUT;			      \
-		    break;						      \
-		  }							      \
-	      }								      \
-									      \
-	    inptr += 2;							      \
-	  }								      \
-	else								      \
-	  {								      \
-	    const unsigned char *endp;					      \
-									      \
-	    if (ch == 0x8f)						      \
-	      {								      \
-		/* This is code set 3: JIS X 0212-1990.  */		      \
-		endp = inptr + 1;					      \
-									      \
-		ch = jisx0212_to_ucs4 (&endp, inend - endp, 0x80);	      \
-	      }								      \
-	    else							      \
-	      {								      \
-		/* This is code set 1: JIS X 0208.  */			      \
-		endp = inptr;						      \
-									      \
-		ch = jisx0208_to_ucs4 (&endp, inend - inptr, 0x80);	      \
-	      }								      \
-									      \
-	    if (__builtin_expect (ch, 1) == 0)				      \
-	      {								      \
-		/* Not enough input available.  */			      \
-		result = __GCONV_INCOMPLETE_INPUT;			      \
-		break;							      \
-	      }								      \
-	    if (__builtin_expect (ch, 0) == __UNKNOWN_10646_CHAR)	      \
-	      {								      \
-		/* Illegal character.  */				      \
-		if (! ignore_errors_p ())				      \
-		  {							      \
-		    /* This is an illegal character.  */		      \
-		    result = __GCONV_ILLEGAL_INPUT;			      \
-		    break;						      \
-		  }							      \
-									      \
-		inptr += 2;						      \
-		++*irreversible;					      \
-		continue;						      \
-	      }								      \
-	    inptr = endp;						      \
-	  }								      \
-      }									      \
-									      \
-    put32 (outptr, ch);							      \
-    outptr += 4;							      \
-  }
-#define LOOP_NEED_FLAGS
-#include <iconv/loop.c>
-
-
-/* Next, define the other direction.  */
-#define MIN_NEEDED_INPUT	MIN_NEEDED_TO
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_FROM
-#define MAX_NEEDED_OUTPUT	MAX_NEEDED_FROM
-#define LOOPFCT			TO_LOOP
-#define BODY \
-  {									      \
-    uint32_t ch = get32 (inptr);					      \
-									      \
-    if (ch < 0x8e || (ch >= 0x90 && ch <= 0x9f))			      \
-      /* It's plain ASCII or C1.  */					      \
-      *outptr++ = ch;							      \
-    else if (ch == 0xa5)						      \
-      /* YEN sign => backslash  */					      \
-      *outptr++ = 0x5c;							      \
-    else if (ch == 0x203e)						      \
-      /* overscore => asciitilde */					      \
-      *outptr++ = 0x7e;							      \
-    else								      \
-      {									      \
-	/* Try the JIS character sets.  */				      \
-	size_t found;							      \
-									      \
-	/* See whether we have room for at least two characters.  */	      \
-	if (__builtin_expect (outptr + 1 >= outend, 0))			      \
-	  {								      \
-	    result = __GCONV_FULL_OUTPUT;				      \
-	    break;							      \
-	  }								      \
-									      \
-	found = ucs4_to_jisx0201 (ch, outptr + 1);			      \
-	if (found != __UNKNOWN_10646_CHAR)				      \
-	  {								      \
-	    /* Yes, it's a JIS 0201 character.  Store the shift byte.  */     \
-	    *outptr = 0x8e;						      \
-	    outptr += 2;						      \
-	  }								      \
-	else								      \
-	  {								      \
-	    /* No JIS 0201 character.  */				      \
-	    found = ucs4_to_jisx0208 (ch, outptr, 2);			      \
-	    /* Please note that we always have enough room for the output. */ \
-	    if (found != __UNKNOWN_10646_CHAR)				      \
-	      {								      \
-		/* It's a JIS 0208 character, adjust it for EUC-JP.  */	      \
-		*outptr++ += 0x80;					      \
-		*outptr++ += 0x80;					      \
-	      }								      \
-	    else							      \
-	      {								      \
-		/* No JIS 0208 character.  */				      \
-		found = ucs4_to_jisx0212 (ch, outptr + 1,		      \
-					  outend - outptr - 1);		      \
-		  							      \
-		if (__builtin_expect (found, 1) == 0)			      \
-		  {							      \
-		    /* We ran out of space.  */				      \
-		    result = __GCONV_FULL_OUTPUT;			      \
-		    break;						      \
-		  }							      \
-		else if (__builtin_expect (found, 0) != __UNKNOWN_10646_CHAR) \
-		  {							      \
-		    /* It's a JIS 0212 character, adjust it for EUC-JP.  */   \
-		    *outptr++ = 0x8f;					      \
-		    *outptr++ += 0x80;					      \
-		    *outptr++ += 0x80;					      \
-		  }							      \
-		else							      \
-		  {							      \
-		    UNICODE_TAG_HANDLER (ch, 4);			      \
-									      \
-		    /* Illegal character.  */				      \
-		    STANDARD_ERR_HANDLER (4);				      \
-		  }							      \
-	      }								      \
-	  }								      \
-      }									      \
-									      \
-    inptr += 4;								      \
-  }
-#define LOOP_NEED_FLAGS
-#include <iconv/loop.c>
-
-
-/* Now define the toplevel functions.  */
-#include <iconv/skeleton.c>
diff --git a/newlib/iconvdata/gconv-modules b/newlib/iconvdata/gconv-modules
deleted file mode 100644
index 66bb473..0000000
--- a/newlib/iconvdata/gconv-modules
+++ /dev/null
@@ -1,1511 +0,0 @@
-# GNU libc iconv configuration.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-# This file is part of the GNU C Library.
-#
-
-# The GNU C Library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# The GNU C 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
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with the GNU C Library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-# All lines contain the following information:
-
-# If the lines start with `module'
-#  fromset:	either a name triple or a regular expression triple.
-#  toset:	a name triple or an expression with \N to get regular
-#		expression matching results.
-#  filename:	filename of the module implementing the transformation.
-#		If it is not absolute the path is made absolute by prepending
-#		the directory the configuration file is found in.
-#  cost:	optional cost of the transformation.  Default is 1.
-
-# If the lines start with `alias'
-#  alias:	alias name which is not really recognized.
-#  name:	the real name of the character set
-
-alias	ISO-IR-4//		BS_4730//
-alias	ISO646-GB//		BS_4730//
-alias	GB//			BS_4730//
-alias	UK//			BS_4730//
-alias	CSISO4UNITEDKINGDOM//	BS_4730//
-module	BS_4730//		INTERNAL		ISO646		2
-module	INTERNAL		BS_4730//		ISO646		2
-
-alias	ISO-IR-121//		CSA_Z243.4-1985-1//
-alias	ISO646-CA//		CSA_Z243.4-1985-1//
-alias	CSA7-1//		CSA_Z243.4-1985-1//
-alias	CA//			CSA_Z243.4-1985-1//
-alias	CSISO121CANADIAN1//	CSA_Z243.4-1985-1//
-alias	CSA_Z243.419851//	CSA_Z243.4-1985-1//
-module	CSA_Z243.4-1985-1//	INTERNAL		ISO646		2
-module	INTERNAL		CSA_Z243.4-1985-1//	ISO646		2
-
-alias	ISO-IR-122//		CSA_Z243.4-1985-2//
-alias	ISO646-CA2//		CSA_Z243.4-1985-2//
-alias	CSA7-2//		CSA_Z243.4-1985-2//
-alias	CSISO122CANADIAN2//	CSA_Z243.4-1985-2//
-alias	CSA_Z243.419852//	CSA_Z243.4-1985-2//
-module	CSA_Z243.4-1985-2//	INTERNAL		ISO646		2
-module	INTERNAL		CSA_Z243.4-1985-2//	ISO646		2
-
-alias	ISO-IR-21//		DIN_66003//
-alias	DE//			DIN_66003//
-alias	ISO646-DE//		DIN_66003//
-alias	CSISO21GERMAN//		DIN_66003//
-module	DIN_66003//		INTERNAL		ISO646		2
-module	INTERNAL		DIN_66003//		ISO646		2
-
-alias	DS2089//		DS_2089//
-alias	ISO646-DK//		DS_2089//
-alias	DK//			DS_2089//
-alias	CSISO646DANISH//	DS_2089//
-module	DS_2089//		INTERNAL		ISO646		2
-module	INTERNAL		DS_2089//		ISO646		2
-
-alias	ISO-IR-17//		ES//
-alias	ISO646-ES//		ES//
-alias	CSISO17SPANISH//	ES//
-module	ES//			INTERNAL		ISO646		2
-module	INTERNAL		ES//			ISO646		2
-
-alias	ISO-IR-85//		ES2//
-alias	ISO646-ES2//		ES2//
-alias	CSISO85SPANISH2//	ES2//
-module	ES2//			INTERNAL		ISO646		2
-module	INTERNAL		ES2//			ISO646		2
-
-alias	ISO-IR-57//		GB_1988-80//
-alias	CN//			GB_1988-80//
-alias	ISO646-CN//		GB_1988-80//
-alias	CSISO58GB1988//		GB_1988-80//
-alias	GB_198880//		GB_1988-80//
-module	GB_1988-80//		INTERNAL		ISO646		2
-module	INTERNAL		GB_1988-80//		ISO646		2
-
-alias	ISO-IR-15//		IT//
-alias	ISO646-IT//		IT//
-alias	CSISO15ITALIAN//	IT//
-module	IT//			INTERNAL		ISO646		2
-module	INTERNAL		IT//			ISO646		2
-
-alias	ISO-IR-14//		JIS_C6220-1969-RO//
-alias	JP//			JIS_C6220-1969-RO//
-alias	ISO646-JP//		JIS_C6220-1969-RO//
-alias	CSISO14JISC6220RO//	JIS_C6220-1969-RO//
-alias	JIS_C62201969RO//	JIS_C6220-1969-RO//
-module	JIS_C6220-1969-RO//	INTERNAL		ISO646		2
-module	INTERNAL		JIS_C6220-1969-RO//	ISO646		2
-
-alias	ISO-IR-92//		JIS_C6229-1984-B//
-alias	ISO646-JP-OCR-B//	JIS_C6229-1984-B//
-alias	JP-OCR-B//		JIS_C6229-1984-B//
-alias	CSISO92JISC62991984B//	JIS_C6229-1984-B//
-alias	JIS_C62291984B//	JIS_C6229-1984-B//
-module	JIS_C6229-1984-B//	INTERNAL		ISO646		2
-module	INTERNAL		JIS_C6229-1984-B//	ISO646		2
-
-alias	ISO-IR-141//		JUS_I.B1.002//
-alias	ISO646-YU//		JUS_I.B1.002//
-alias	JS//			JUS_I.B1.002//
-alias	YU//			JUS_I.B1.002//
-alias	CSISO141JUSIB1002//	JUS_I.B1.002//
-module	JUS_I.B1.002//		INTERNAL		ISO646		2
-module	INTERNAL		JUS_I.B1.002//		ISO646		2
-
-alias	ISO646-KR//		KSC5636//
-alias	CSKSC5636//		KSC5636//
-module	KSC5636//		INTERNAL		ISO646		2
-module	INTERNAL		KSC5636//		ISO646		2
-
-alias	ISO-IR-86//		MSZ_7795.3//
-alias	ISO646-HU//		MSZ_7795.3//
-alias	HU//			MSZ_7795.3//
-alias	CSISO86HUNGARIAN//	MSZ_7795.3//
-module	MSZ_7795.3//		INTERNAL		ISO646		2
-module	INTERNAL		MSZ_7795.3//		ISO646		2
-
-alias	CUBA//			NC_NC00-10//
-alias	NC_NC00-10:81//		NC_NC00-10//
-alias	ISO-IR-151//		NC_NC00-10//
-alias	ISO646-CU//		NC_NC00-10//
-alias	CSISO151CUBA//		NC_NC00-10//
-alias	NC_NC0010//		NC_NC00-10//
-module	NC_NC00-10//		INTERNAL		ISO646		2
-module	INTERNAL		NC_NC00-10//		ISO646		2
-
-alias	ISO-IR-69//		NF_Z_62-010//
-alias	ISO646-FR//		NF_Z_62-010//
-alias	FR//			NF_Z_62-010//
-alias	CSISO69FRENCH//		NF_Z_62-010//
-alias	NF_Z_62010//		NF_Z_62-010//
-module	NF_Z_62-010//		INTERNAL		ISO646		2
-module	INTERNAL		NF_Z_62-010//		ISO646		2
-
-alias	ISO-IR-25//		NF_Z_62-010_1973//
-alias	ISO646-FR1//		NF_Z_62-010_1973//
-alias	NF_Z_62-010_(1973)//	NF_Z_62-010_1973//
-alias	CSISO25FRENCH//		NF_Z_62-010_1973//
-alias	NF_Z_62010_1973//	NF_Z_62-010_1973//
-module	NF_Z_62-010_1973//	INTERNAL		ISO646		2
-module	INTERNAL		NF_Z_62-010_1973//	ISO646		2
-
-alias	ISO-IR-60//		NS_4551-1//
-alias	ISO646-NO//		NS_4551-1//
-alias	NO//			NS_4551-1//
-alias	CSISO60DANISHNORWEGIAN// NS_4551-1//
-alias	CSISO60NORWEGIAN1//	NS_4551-1//
-alias	NS_45511//		NS_4551-1//
-module	NS_4551-1//		INTERNAL		ISO646		2
-module	INTERNAL		NS_4551-1//		ISO646		2
-
-alias	ISO646-NO2//		NS_4551-2//
-alias	ISO-IR-61//		NS_4551-2//
-alias	NO2//			NS_4551-2//
-alias	CSISO61NORWEGIAN2//	NS_4551-2//
-alias	NS_45512//		NS_4551-2//
-module	NS_4551-2//		INTERNAL		ISO646		2
-module	INTERNAL		NS_4551-2//		ISO646		2
-
-alias	ISO-IR-16//		PT//
-alias	ISO646-PT//		PT//
-alias	CSISO16PORTUGESE//	PT//
-module	PT//			INTERNAL		ISO646		2
-module	INTERNAL		PT//			ISO646		2
-
-alias	ISO-IR-84//		PT2//
-alias	ISO646-PT2//		PT2//
-alias	CSISO84PORTUGUESE2//	PT2//
-module	PT2//			INTERNAL		ISO646		2
-module	INTERNAL		PT2//			ISO646		2
-
-alias	ISO-IR-10//		SEN_850200_B//
-alias	FI//			SEN_850200_B//
-alias	ISO646-FI//		SEN_850200_B//
-alias	ISO646-SE//		SEN_850200_B//
-alias	SE//			SEN_850200_B//
-alias	CSISO10SWEDISH//	SEN_850200_B//
-alias	SS636127//		SEN_850200_B//
-module	SEN_850200_B//		INTERNAL		ISO646		2
-module	INTERNAL		SEN_850200_B//		ISO646		2
-
-alias	ISO-IR-11//		SEN_850200_C//
-alias	ISO646-SE2//		SEN_850200_C//
-alias	SE2//			SEN_850200_C//
-alias	CSISO11SWEDISHFORNAMES// SEN_850200_C//
-module	SEN_850200_C//		INTERNAL		ISO646		2
-module	INTERNAL		SEN_850200_C//		ISO646		2
-
-#	from			to			module		cost
-alias	ISO-IR-100//		ISO-8859-1//
-alias	ISO_8859-1:1987//	ISO-8859-1//
-alias	ISO_8859-1//		ISO-8859-1//
-alias	ISO8859-1//		ISO-8859-1//
-alias	ISO88591//		ISO-8859-1//
-alias	LATIN1//		ISO-8859-1//
-alias	L1//			ISO-8859-1//
-alias	IBM819//		ISO-8859-1//
-alias	CP819//			ISO-8859-1//
-alias	CSISOLATIN1//		ISO-8859-1//
-alias	8859_1//		ISO-8859-1//
-alias	OSF00010001//		ISO-8859-1//
-module	ISO-8859-1//		INTERNAL		ISO8859-1	1
-module	INTERNAL		ISO-8859-1//		ISO8859-1	1
-
-#	from			to			module		cost
-alias	ISO-IR-101//		ISO-8859-2//
-alias	ISO_8859-2:1987//	ISO-8859-2//
-alias	ISO_8859-2//		ISO-8859-2//
-alias	ISO8859-2//		ISO-8859-2//
-alias	ISO88592//		ISO-8859-2//
-alias	LATIN2//		ISO-8859-2//
-alias	L2//			ISO-8859-2//
-alias	CSISOLATIN2//		ISO-8859-2//
-alias	8859_2//		ISO-8859-2//
-alias	OSF00010002//		ISO-8859-2//
-alias	IBM912//		ISO-8859-2//
-alias	CP912//			ISO-8859-2//
-module	ISO-8859-2//		INTERNAL		ISO8859-2	1
-module	INTERNAL		ISO-8859-2//		ISO8859-2	1
-
-#	from			to			 module		cost
-alias	ISO-IR-109//		ISO-8859-3//
-alias	ISO_8859-3:1988//	ISO-8859-3//
-alias	ISO_8859-3//		ISO-8859-3//
-alias	ISO8859-3//		ISO-8859-3//
-alias	ISO88593//		ISO-8859-3//
-alias	LATIN3//		ISO-8859-3//
-alias	L3//			ISO-8859-3//
-alias	CSISOLATIN3//		ISO-8859-3//
-alias	8859_3//		ISO-8859-3//
-alias	OSF00010003//		ISO-8859-3//
-module	ISO-8859-3//		INTERNAL		ISO8859-3	1
-module	INTERNAL		ISO-8859-3//		ISO8859-3	1
-
-#	from			to			module		cost
-alias	ISO-IR-110//		ISO-8859-4//
-alias	ISO_8859-4:1988//	ISO-8859-4//
-alias	ISO_8859-4//		ISO-8859-4//
-alias	ISO8859-4//		ISO-8859-4//
-alias	ISO88594//		ISO-8859-4//
-alias	LATIN4//		ISO-8859-4//
-alias	L4//			ISO-8859-4//
-alias	CSISOLATIN4//		ISO-8859-4//
-alias	8859_4//		ISO-8859-4//
-alias	OSF00010004//		ISO-8859-4//
-module	ISO-8859-4//		INTERNAL		ISO8859-4	1
-module	INTERNAL		ISO-8859-4//		ISO8859-4	1
-
-#	from			to			module		cost
-alias	ISO-IR-144//		ISO-8859-5//
-alias	ISO_8859-5:1988//	ISO-8859-5//
-alias	ISO_8859-5//		ISO-8859-5//
-alias	ISO8859-5//		ISO-8859-5//
-alias	ISO88595//		ISO-8859-5//
-alias	CYRILLIC//		ISO-8859-5//
-alias	CSISOLATINCYRILLIC//	ISO-8859-5//
-alias	8859_5//		ISO-8859-5//
-alias	OSF00010005//		ISO-8859-5//
-alias	IBM915//		ISO-8859-5//
-alias	CP915//			ISO-8859-5//
-module	ISO-8859-5//		INTERNAL		ISO8859-5	1
-module	INTERNAL		ISO-8859-5//		ISO8859-5	1
-
-#	from			to			module		cost
-alias	ISO-IR-127//		ISO-8859-6//
-alias	ISO_8859-6:1987//	ISO-8859-6//
-alias	ISO_8859-6//		ISO-8859-6//
-alias	ISO8859-6//		ISO-8859-6//
-alias	ISO88596//		ISO-8859-6//
-alias	ECMA-114//		ISO-8859-6//
-alias	ASMO-708//		ISO-8859-6//
-alias	ARABIC//		ISO-8859-6//
-alias	CSISOLATINARABIC//	ISO-8859-6//
-alias	8859_6//		ISO-8859-6//
-alias	OSF00010006//		ISO-8859-6//
-alias	IBM1089//		ISO-8859-6//
-alias	CP1089//		ISO-8859-6//
-module	ISO-8859-6//		INTERNAL		ISO8859-6	1
-module	INTERNAL		ISO-8859-6//		ISO8859-6	1
-
-#	from			to			module		cost
-alias	ISO-IR-126//		ISO-8859-7//
-alias	ISO_8859-7:1987//	ISO-8859-7//
-alias	ISO_8859-7//		ISO-8859-7//
-alias	ISO8859-7//		ISO-8859-7//
-alias	ISO88597//		ISO-8859-7//
-alias	ELOT_928//		ISO-8859-7//
-alias	ECMA-118//		ISO-8859-7//
-alias	GREEK//			ISO-8859-7//
-alias	GREEK8//		ISO-8859-7//
-alias	CSISOLATINGREEK//	ISO-8859-7//
-alias	8859_7//		ISO-8859-7//
-alias	OSF00010007//		ISO-8859-7//
-alias	IBM813//		ISO-8859-7//
-alias	CP813//			ISO-8859-7//
-module	ISO-8859-7//		INTERNAL		ISO8859-7	1
-module	INTERNAL		ISO-8859-7//		ISO8859-7	1
-
-#	from			to			module		cost
-alias	ISO-IR-138//		ISO-8859-8//
-alias	ISO_8859-8:1988//	ISO-8859-8//
-alias	ISO_8859-8//		ISO-8859-8//
-alias	ISO8859-8//		ISO-8859-8//
-alias	ISO88598//		ISO-8859-8//
-alias	HEBREW//		ISO-8859-8//
-alias	CSISOLATINHEBREW//	ISO-8859-8//
-alias	8859_8//		ISO-8859-8//
-alias	OSF00010008//		ISO-8859-8//
-alias	IBM916//		ISO-8859-8//
-alias	CP916//			ISO-8859-8//
-module	ISO-8859-8//		INTERNAL		ISO8859-8	1
-module	INTERNAL		ISO-8859-8//		ISO8859-8	1
-
-#	from			to			module		cost
-alias	ISO-IR-148//		ISO-8859-9//
-alias	ISO_8859-9:1989//	ISO-8859-9//
-alias	ISO_8859-9//		ISO-8859-9//
-alias	ISO8859-9//		ISO-8859-9//
-alias	ISO88599//		ISO-8859-9//
-alias	LATIN5//		ISO-8859-9//
-alias	L5//			ISO-8859-9//
-alias	CSISOLATIN5//		ISO-8859-9//
-alias	8859_9//		ISO-8859-9//
-alias	OSF00010009//		ISO-8859-9//
-alias	IBM920//		ISO-8859-9//
-alias	CP920//			ISO-8859-9//
-alias	TS-5881//		ISO-8859-9//
-alias	ECMA-128//		ISO-8859-9//
-module	ISO-8859-9//		INTERNAL		ISO8859-9	1
-module	INTERNAL		ISO-8859-9//		ISO8859-9	1
-
-#	from			to			module		cost
-alias	ISO-IR-157//		ISO-8859-10//
-alias	ISO_8859-10:1992//	ISO-8859-10//
-alias	ISO_8859-10//		ISO-8859-10//
-alias	ISO8859-10//		ISO-8859-10//
-alias	ISO885910//		ISO-8859-10//
-alias	LATIN6//		ISO-8859-10//
-alias	L6//			ISO-8859-10//
-alias	CSISOLATIN6//		ISO-8859-10//
-alias	OSF0001000A//		ISO-8859-10//
-module	ISO-8859-10//		INTERNAL		ISO8859-10	1
-module	INTERNAL		ISO-8859-10//		ISO8859-10	1
-
-#	from			to			module		cost
-module	ISO-8859-11//		INTERNAL		ISO8859-11	1
-module	INTERNAL		ISO-8859-11//		ISO8859-11	1
-
-#	from			to			module		cost
-alias	ISO8859-13//		ISO-8859-13//
-alias	ISO885913//		ISO-8859-13//
-alias	ISO-IR-179//		ISO-8859-13//
-alias	LATIN7//		ISO-8859-13//
-alias	L7//			ISO-8859-13//
-alias	BALTIC//		ISO-8859-13//
-module	ISO-8859-13//		INTERNAL		ISO8859-13	1
-module	INTERNAL		ISO-8859-13//		ISO8859-13	1
-
-#	from			to			module		cost
-alias	ISO8859-14//		ISO-8859-14//
-alias	ISO885914//		ISO-8859-14//
-alias	ISO-IR-199//		ISO-8859-14//
-alias	LATIN8//		ISO-8859-14//
-alias	L8//			ISO-8859-14//
-alias	ISO_8859-14:1998//	ISO-8859-14//
-alias	ISO_8859-14//		ISO-8859-14//
-alias	ISO-CELTIC//		ISO-8859-14//
-module	ISO-8859-14//		INTERNAL		ISO8859-14	1
-module	INTERNAL		ISO-8859-14//		ISO8859-14	1
-
-#	from			to			module		cost
-alias	ISO8859-15//		ISO-8859-15//
-alias	ISO885915//		ISO-8859-15//
-alias	ISO-IR-203//		ISO-8859-15//
-alias	ISO_8859-15:1998//	ISO-8859-15//
-module	ISO-8859-15//		INTERNAL		ISO8859-15	1
-module	INTERNAL		ISO-8859-15//		ISO8859-15	1
-
-#	from			to			module		cost
-alias	ISO8859-16//		ISO-8859-16//
-alias	ISO885916//		ISO-8859-16//
-alias	ISO-IR-226//		ISO-8859-16//
-alias	LATIN10//		ISO-8859-16//
-alias	L10//			ISO-8859-16//
-module	ISO-8859-16//		INTERNAL		ISO8859-16	1
-module	INTERNAL		ISO-8859-16//		ISO8859-16	1
-
-#	from			to			module		cost
-alias	T.61//			T.61-8BIT//
-alias	ISO-IR-103//		T.61-8BIT//
-alias	CSISO103T618BIT//	T.61-8BIT//
-alias	T.618BIT//		T.61-8BIT//
-module	T.61-8BIT//		INTERNAL		T.61		1
-module	INTERNAL		T.61-8BIT//		T.61		1
-
-#	from			to			module		cost
-alias	ISO-IR-156//		ISO_6937//
-alias	ISO_6937:1992//		ISO_6937//
-alias	ISO6937//		ISO_6937//
-module	ISO_6937//		INTERNAL		ISO_6937	1
-module	INTERNAL		ISO_6937//		ISO_6937	1
-
-
-#	from			to			module		cost
-alias	ISO-IR-90//		ISO_6937-2//
-alias	ISO_6937-2:1983//	ISO_6937-2//
-alias	CSISO90//		ISO_6937-2//
-alias	ISO_69372//		ISO_6937-2//
-module	ISO_6937-2//		INTERNAL		ISO_6937-2	1
-module	INTERNAL		ISO_6937-2//		ISO_6937-2	1
-
-#	from			to			module		cost
-alias	SHIFT-JIS//		SJIS//
-alias	SHIFT_JIS//		SJIS//
-alias	CP932//			SJIS//
-alias	MS_KANJI//		SJIS//
-alias	CSSHIFTJIS//		SJIS//
-module	SJIS//			INTERNAL		SJIS		1
-module	INTERNAL		SJIS//			SJIS		1
-
-#	from			to			module		cost
-alias	KOI8//			KOI-8//
-module	KOI-8//			INTERNAL		KOI-8		1
-module	INTERNAL		KOI-8//			KOI-8		1
-
-#	from			to			module		cost
-alias	CSKOI8R//		KOI8-R//
-alias	KOI8R//			KOI8-R//
-module	KOI8-R//		INTERNAL		KOI8-R		1
-module	INTERNAL		KOI8-R//		KOI8-R		1
-
-#	from			to			module		cost
-alias	ISO-IR-19//		LATIN-GREEK//
-alias	CSISO19LATINGREEK//	LATIN-GREEK//
-alias	LATINGREEK//		LATIN-GREEK//
-module	LATIN-GREEK//		INTERNAL		LATIN-GREEK	1
-module	INTERNAL		LATIN-GREEK//		LATIN-GREEK	1
-
-#	from			to			module		cost
-alias	ISO-IR-27//		LATIN-GREEK-1//
-alias	CSISO27LATINGREEK1//	LATIN-GREEK-1//
-alias	LATINGREEK1//		LATIN-GREEK-1//
-module	LATIN-GREEK-1//		INTERNAL		LATIN-GREEK-1	1
-module	INTERNAL		LATIN-GREEK-1//		LATIN-GREEK-1	1
-
-#	from			to			module		cost
-alias	ROMAN8//		HP-ROMAN8//
-alias	R8//			HP-ROMAN8//
-alias	CSHPROMAN8//		HP-ROMAN8//
-alias	OSF10010001//		HP-ROMAN8//
-alias	HPROMAN8//		HP-ROMAN8//
-module	HP-ROMAN8//		INTERNAL		HP-ROMAN8	1
-module	INTERNAL		HP-ROMAN8//		HP-ROMAN8	1
-
-#	from			to			module		cost
-alias	CSEBCDICATDE//		EBCDIC-AT-DE//
-alias	EBCDICATDE//		EBCDIC-AT-DE//
-module	EBCDIC-AT-DE//		INTERNAL		EBCDIC-AT-DE	1
-module	INTERNAL		EBCDIC-AT-DE//		EBCDIC-AT-DE	1
-
-#	from			to			module		cost
-alias	CSEBCDICATDEA//		EBCDIC-AT-DE-A//
-alias	EBCDICATDEA//		EBCDIC-AT-DE-A//
-module	EBCDIC-AT-DE-A//	INTERNAL		EBCDIC-AT-DE-A	1
-module	INTERNAL		EBCDIC-AT-DE-A//	EBCDIC-AT-DE-A	1
-
-#	from			to			module		cost
-alias	CSEBCDICCAFR//		EBCDIC-CA-FR//
-alias	EBCDICCAFR//		EBCDIC-CA-FR//
-module	EBCDIC-CA-FR//		INTERNAL		EBCDIC-CA-FR	1
-module	INTERNAL		EBCDIC-CA-FR//		EBCDIC-CA-FR	1
-
-#	from			to			module		cost
-alias	CSEBCDICDKNO//		EBCDIC-DK-NO//
-alias	EBCDICDKNO//		EBCDIC-DK-NO//
-module	EBCDIC-DK-NO//		INTERNAL		EBCDIC-DK-NO	1
-module	INTERNAL		EBCDIC-DK-NO//		EBCDIC-DK-NO	1
-
-#	from			to			module		cost
-alias	CSEBCDICDKNOA//		EBCDIC-DK-NO-A//
-alias	EBCDICDKNOA//		EBCDIC-DK-NO-A//
-module	EBCDIC-DK-NO-A//	INTERNAL		EBCDIC-DK-NO-A	1
-module	INTERNAL		EBCDIC-DK-NO-A//	EBCDIC-DK-NO-A	1
-
-#	from			to			module		cost
-alias	CSEBCDICES//		EBCDIC-ES//
-alias	EBCDICES//		EBCDIC-ES//
-module	EBCDIC-ES//		INTERNAL		EBCDIC-ES	1
-module	INTERNAL		EBCDIC-ES//		EBCDIC-ES	1
-
-#	from			to			module		cost
-alias	CSEBCDICESA//		EBCDIC-ES-A//
-alias	EBCDICESA//		EBCDIC-ES-A//
-module	EBCDIC-ES-A//		INTERNAL		EBCDIC-ES-A	1
-module	INTERNAL		EBCDIC-ES-A//		EBCDIC-ES-A	1
-
-#	from			to			module		cost
-alias	CSEBCDICESS//		EBCDIC-ES-S//
-alias	EBCDICESS//		EBCDIC-ES-S//
-module	EBCDIC-ES-S//		INTERNAL		EBCDIC-ES-S	1
-module	INTERNAL		EBCDIC-ES-S//		EBCDIC-ES-S	1
-
-#	from			to			module		cost
-alias	CSEBCDICFISE//		EBCDIC-FI-SE//
-alias	EBCDICFISE//		EBCDIC-FI-SE//
-module	EBCDIC-FI-SE//		INTERNAL		EBCDIC-FI-SE	1
-module	INTERNAL		EBCDIC-FI-SE//		EBCDIC-FI-SE	1
-
-#	from			to			module		cost
-alias	CSEBCDICFISEA//		EBCDIC-FI-SE-A//
-alias	EBCDICFISEA//		EBCDIC-FI-SE-A//
-module	EBCDIC-FI-SE-A//	INTERNAL		EBCDIC-FI-SE-A	1
-module	INTERNAL		EBCDIC-FI-SE-A//	EBCDIC-FI-SE-A	1
-
-#	from			to			module		cost
-alias	CSEBCDICFR//		EBCDIC-FR//
-alias	EBCDICFR//		EBCDIC-FR//
-module	EBCDIC-FR//		INTERNAL		EBCDIC-FR	1
-module	INTERNAL		EBCDIC-FR//		EBCDIC-FR	1
-
-#	from			to			module		cost
-alias	EBCDICISFRISS//		EBCDIC-IS-FRISS//
-module	EBCDIC-IS-FRISS//	INTERNAL		EBCDIC-IS-FRISS	1
-module	INTERNAL		EBCDIC-IS-FRISS//	EBCDIC-IS-FRISS	1
-
-#	from			to			module		cost
-alias	CSEBCDICIT//		EBCDIC-IT//
-alias	EBCDICIT//		EBCDIC-IT//
-module	EBCDIC-IT//		INTERNAL		EBCDIC-IT	1
-module	INTERNAL		EBCDIC-IT//		EBCDIC-IT	1
-
-#	from			to			module		cost
-alias	CSEBCDICPT//		EBCDIC-PT//
-alias	EBCDICPT//		EBCDIC-PT//
-module	EBCDIC-PT//		INTERNAL		EBCDIC-PT	1
-module	INTERNAL		EBCDIC-PT//		EBCDIC-PT	1
-
-#	from			to			module		cost
-alias	CSEBCDICUK//		EBCDIC-UK//
-alias	EBCDICUK//		EBCDIC-UK//
-module	EBCDIC-UK//		INTERNAL		EBCDIC-UK	1
-module	INTERNAL		EBCDIC-UK//		EBCDIC-UK	1
-
-#	from			to			module		cost
-alias	CSEBCDICUS//		EBCDIC-US//
-alias	EBCDICUS//		EBCDIC-US//
-module	EBCDIC-US//		INTERNAL		EBCDIC-US	1
-module	INTERNAL		EBCDIC-US//		EBCDIC-US	1
-
-#	from			to			module		cost
-alias	CP037//			IBM037//
-alias	EBCDIC-CP-US//		IBM037//
-alias	EBCDIC-CP-CA//		IBM037//
-alias	EBCDIC-CP-WT//		IBM037//
-alias	EBCDIC-CP-NL//		IBM037//
-alias	CSIBM037//		IBM037//
-alias	OSF10020025//		IBM037//
-alias	CP1070//		IBM037//
-alias	CP282//			IBM037//
-module	IBM037//		INTERNAL		IBM037		1
-module	INTERNAL		IBM037//		IBM037		1
-
-#	from			to			module		cost
-alias	EBCDIC-INT//		IBM038//
-alias	CP038//			IBM038//
-alias	CSIBM038//		IBM038//
-module	IBM038//		INTERNAL		IBM038		1
-module	INTERNAL		IBM038//		IBM038		1
-
-#	from			to			module		cost
-alias	EBCDIC-INT1//		IBM256//
-module	IBM256//		INTERNAL		IBM256		1
-module	INTERNAL		IBM256//		IBM256		1
-
-#	from			to			module		cost
-alias	CP273//			IBM273//
-alias	CSIBM273//		IBM273//
-alias	OSF10020111//		IBM273//
-module	IBM273//		INTERNAL		IBM273		1
-module	INTERNAL		IBM273//		IBM273		1
-
-#	from			to			module		cost
-alias	EBCDIC-BE//		IBM274//
-alias	CP274//			IBM274//
-alias	CSIBM274//		IBM274//
-module	IBM274//		INTERNAL		IBM274		1
-module	INTERNAL		IBM274//		IBM274		1
-
-#	from			to			module		cost
-alias	EBCDIC-BR//		IBM275//
-alias	CP275//			IBM275//
-alias	CSIBM275//		IBM275//
-module	IBM275//		INTERNAL		IBM275		1
-module	INTERNAL		IBM275//		IBM275		1
-
-#	from			to			module		cost
-alias	EBCDIC-CP-DK//		IBM277//
-alias	EBCDIC-CP-NO//		IBM277//
-alias	CSIBM277//		IBM277//
-alias	OSF10020115//		IBM277//
-module	IBM277//		INTERNAL		IBM277		1
-module	INTERNAL		IBM277//		IBM277		1
-
-#	from			to			module		cost
-alias	CP278//			IBM278//
-alias	EBCDIC-CP-FI//		IBM278//
-alias	EBCDIC-CP-SE//		IBM278//
-alias	CSIBM278//		IBM278//
-alias	OSF10020116//		IBM278//
-module	IBM278//		INTERNAL		IBM278		1
-module	INTERNAL		IBM278//		IBM278		1
-
-#	from			to			module		cost
-alias	CP280//			IBM280//
-alias	EBCDIC-CP-IT//		IBM280//
-alias	CSIBM280//		IBM280//
-alias	OSF10020118//		IBM280//
-module	IBM280//		INTERNAL		IBM280		1
-module	INTERNAL		IBM280//		IBM280		1
-
-#	from			to			module		cost
-alias	EBCDIC-JP-E//		IBM281//
-alias	CP281//			IBM281//
-alias	CSIBM281//		IBM281//
-module	IBM281//		INTERNAL		IBM281		1
-module	INTERNAL		IBM281//		IBM281		1
-
-#	from			to			module		cost
-alias	CP284//			IBM284//
-alias	EBCDIC-CP-ES//		IBM284//
-alias	CSIBM284//		IBM284//
-alias	OSF1002011C//		IBM284//
-alias	CP1079//		IBM284//
-module	IBM284//		INTERNAL		IBM284		1
-module	INTERNAL		IBM284//		IBM284		1
-
-#	from			to			module		cost
-alias	CP285//			IBM285//
-alias	EBCDIC-CP-GB//		IBM285//
-alias	CSIBM285//		IBM285//
-alias	OSF1002011D//		IBM285//
-module	IBM285//		INTERNAL		IBM285		1
-module	INTERNAL		IBM285//		IBM285		1
-
-#	from			to			module		cost
-alias	CP290//			IBM290//
-alias	EBCDIC-JP-KANA//	IBM290//
-alias	CSIBM290//		IBM290//
-alias	OSF10020122//		IBM290//
-module	IBM290//		INTERNAL		IBM290		1
-module	INTERNAL		IBM290//		IBM290		1
-
-#	from			to			module		cost
-alias	CP297//			IBM297//
-alias	EBCDIC-CP-FR//		IBM297//
-alias	CSIBM297//		IBM297//
-alias	OSF10020129//		IBM297//
-alias	CP1081//		IBM297//
-module	IBM297//		INTERNAL		IBM297		1
-module	INTERNAL		IBM297//		IBM297		1
-
-#	from			to			module		cost
-alias	CP420//			IBM420//
-alias	EBCDIC-CP-AR1//		IBM420//
-alias	CSIBM420//		IBM420//
-alias	OSF100201A4//		IBM420//
-module	IBM420//		INTERNAL		IBM420		1
-module	INTERNAL		IBM420//		IBM420		1
-
-#	from			to			module		cost
-alias	CP423//			IBM423//
-alias	EBCDIC-CP-GR//		IBM423//
-alias	CSIBM423//		IBM423//
-module	IBM423//		INTERNAL		IBM423		1
-module	INTERNAL		IBM423//		IBM423		1
-
-#	from			to			module		cost
-alias	CP424//			IBM424//
-alias	EBCDIC-CP-HE//		IBM424//
-alias	CSIBM424//		IBM424//
-alias	OSF100201A8//		IBM424//
-module	IBM424//		INTERNAL		IBM424		1
-module	INTERNAL		IBM424//		IBM424		1
-
-#	from			to			module		cost
-alias	CP437//			IBM437//
-alias	437//			IBM437//
-alias	CSPC8CODEPAGE437//	IBM437//
-alias	OSF100201B5//		IBM437//
-module	IBM437//		INTERNAL		IBM437		1
-module	INTERNAL		IBM437//		IBM437		1
-
-#	from			to			module		cost
-alias	CP500//			IBM500//
-alias	500//			IBM500//
-alias	500V1//			IBM500//
-alias	EBCDIC-CP-BE//		IBM500//
-alias	EBCDIC-CP-CH//		IBM500//
-alias	CSIBM500//		IBM500//
-alias	OSF100201F4//		IBM500//
-alias	CP1084//		IBM500//
-module	IBM500//		INTERNAL		IBM500		1
-module	INTERNAL		IBM500//		IBM500		1
-
-#	from			to			module		cost
-alias	CP850//			IBM850//
-alias	850//			IBM850//
-alias	CSPC850MULTILINGUAL//	IBM850//
-alias	OSF10020352//		IBM850//
-module	IBM850//		INTERNAL		IBM850		1
-module	INTERNAL		IBM850//		IBM850		1
-
-#	from			to			module		cost
-alias	CP851//			IBM851//
-alias	851//			IBM851//
-alias	CSIBM851//		IBM851//
-module	IBM851//		INTERNAL		IBM851		1
-module	INTERNAL		IBM851//		IBM851		1
-
-#	from			to			module		cost
-alias	CP852//			IBM852//
-alias	852//			IBM852//
-alias	CSPCP852//		IBM852//
-alias	OSF10020354//		IBM852//
-module	IBM852//		INTERNAL		IBM852		1
-module	INTERNAL		IBM852//		IBM852		1
-
-#	from			to			module		cost
-alias	CP855//			IBM855//
-alias	855//			IBM855//
-alias	CSIBM855//		IBM855//
-alias	OSF10020357//		IBM855//
-module	IBM855//		INTERNAL		IBM855		1
-module	INTERNAL		IBM855//		IBM855		1
-
-#	from			to			module		cost
-alias	IBM-856//		IBM856//
-alias	CP856//			IBM856//
-alias	856//			IBM856//
-alias	CSIBM856//		IBM856//
-module	IBM856//		INTERNAL		IBM856		1
-module	INTERNAL		IBM856//		IBM856		1
-
-#	from			to			module		cost
-alias	CP857//			IBM857//
-alias	857//			IBM857//
-alias	CSIBM857//		IBM857//
-alias	OSF10020359//		IBM857//
-module	IBM857//		INTERNAL		IBM857		1
-module	INTERNAL		IBM857//		IBM857		1
-
-#	from			to			module		cost
-alias	CP860//			IBM860//
-alias	860//			IBM860//
-alias	CSIBM860//		IBM860//
-module	IBM860//		INTERNAL		IBM860		1
-module	INTERNAL		IBM860//		IBM860		1
-
-#	from			to			module		cost
-alias	CP861//			IBM861//
-alias	861//			IBM861//
-alias	CPIBM861//		IBM861//
-alias	OSF1002035D//		IBM861//
-module	IBM861//		INTERNAL		IBM861		1
-module	INTERNAL		IBM861//		IBM861		1
-
-#	from			to			module		cost
-alias	CP862//			IBM862//
-alias	862//			IBM862//
-alias	CSPC862LATINHEBREW//	IBM862//
-alias	OSF1002035E//		IBM862//
-module	IBM862//		INTERNAL		IBM862		1
-module	INTERNAL		IBM862//		IBM862		1
-
-#	from			to			module		cost
-alias	CP863//			IBM863//
-alias	863//			IBM863//
-alias	CSIBM863//		IBM863//
-alias	OSF1002035F//		IBM863//
-module	IBM863//		INTERNAL		IBM863		1
-module	INTERNAL		IBM863//		IBM863		1
-
-#	from			to			module		cost
-alias	CP864//			IBM864//
-alias	864//			IBM864//
-alias	CSIBM864//		IBM864//
-alias	OSF10020360//		IBM864//
-module	IBM864//		INTERNAL		IBM864		1
-module	INTERNAL		IBM864//		IBM864		1
-
-#	from			to			module		cost
-alias	CP865//			IBM865//
-alias	865//			IBM865//
-alias	CSIBM865//		IBM865//
-module	IBM865//		INTERNAL		IBM865		1
-module	INTERNAL		IBM865//		IBM865		1
-
-#	from			to			module		cost
-alias	CP866//			IBM866//
-alias	866//			IBM866//
-alias	CSIBM866//		IBM866//
-module	IBM866//		INTERNAL		IBM866		1
-module	INTERNAL		IBM866//		IBM866		1
-
-#	from			to			module		cost
-alias	CP868//			IBM868//
-alias	CP-AR//			IBM868//
-alias	CSIBM868//		IBM868//
-alias	OSF10020364//		IBM868//
-module	IBM868//		INTERNAL		IBM868		1
-module	INTERNAL		IBM868//		IBM868		1
-
-#	from			to			module		cost
-alias	CP869//			IBM869//
-alias	869//			IBM869//
-alias	CP-GR//			IBM869//
-alias	CSIBM869//		IBM869//
-alias	OSF10020365//		IBM869//
-module	IBM869//		INTERNAL		IBM869		1
-module	INTERNAL		IBM869//		IBM869		1
-
-#	from			to			module		cost
-alias	CP870//			IBM870//
-alias	EBCDIC-CP-ROECE//	IBM870//
-alias	EBCDIC-CP-YU//		IBM870//
-alias	CSIBM870//		IBM870//
-alias	OSF10020366//		IBM870//
-module	IBM870//		INTERNAL		IBM870		1
-module	INTERNAL		IBM870//		IBM870		1
-
-#	from			to			module		cost
-alias	CP871//			IBM871//
-alias	EBCDIC-CP-IS//		IBM871//
-alias	CSIBM871//		IBM871//
-alias	OSF10020367//		IBM871//
-module	IBM871//		INTERNAL		IBM871		1
-module	INTERNAL		IBM871//		IBM871		1
-
-#	from			to			module		cost
-alias	CP875//			IBM875//
-alias	EBCDIC-GREEK//		IBM875//
-alias	OSF1002036B//		IBM875//
-module	IBM875//		INTERNAL		IBM875		1
-module	INTERNAL		IBM875//		IBM875		1
-
-#	from			to			module		cost
-alias	CP880//			IBM880//
-alias	EBCDIC-CYRILLIC//	IBM880//
-alias	CSIBM880//		IBM880//
-alias	OSF10020370//		IBM880//
-module	IBM880//		INTERNAL		IBM880		1
-module	INTERNAL		IBM880//		IBM880		1
-
-#	from			to			module		cost
-alias	CP891//			IBM891//
-alias	CSIBM891//		IBM891//
-alias	OSF1002037B//		IBM891//
-module	IBM891//		INTERNAL		IBM891		1
-module	INTERNAL		IBM891//		IBM891		1
-
-#	from			to			module		cost
-alias	CP903//			IBM903//
-alias	CSIBM903//		IBM903//
-alias	OSF10020387//		IBM903//
-module	IBM903//		INTERNAL		IBM903		1
-module	INTERNAL		IBM903//		IBM903		1
-
-#	from			to			module		cost
-alias	CP904//			IBM904//
-alias	904//			IBM904//
-alias	CSIBM904//		IBM904//
-alias	OSF10020388//		IBM904//
-module	IBM904//		INTERNAL		IBM904		1
-module	INTERNAL		IBM904//		IBM904		1
-
-#	from			to			module		cost
-alias	CP905//			IBM905//
-alias	EBCDIC-CP-TR//		IBM905//
-alias	CSIBM905//		IBM905//
-module	IBM905//		INTERNAL		IBM905		1
-module	INTERNAL		IBM905//		IBM905		1
-
-#	from			to			module		cost
-alias	CP918//			IBM918//
-alias	EBCDIC-CP-AR2//		IBM918//
-alias	CSIBM918//		IBM918//
-alias	OSF10020396//		IBM918//
-module	IBM918//		INTERNAL		IBM918		1
-module	INTERNAL		IBM918//		IBM918		1
-
-#	from			to			module		cost
-alias	IBM-922//		IBM922//
-alias	CP922//			IBM922//
-alias	CSIBM922//		IBM922//
-module	IBM922//		INTERNAL		IBM922		1
-module	INTERNAL		IBM922//		IBM922		1
-
-#	from			to			module		cost
-alias	IBM-930//		IBM930//
-alias	CP930//			IBM930//
-alias	EBCDIC-CP-AR2//		IBM930//
-alias	CSIBM930//		IBM930//
-module	IBM930//		INTERNAL		IBM930		1
-module	INTERNAL		IBM930//		IBM930		1
-
-#	from			to			module		cost
-alias	IBM-932//		IBM932//
-alias	CSIBM932//		IBM932//
-module	IBM932//		INTERNAL		IBM932		1
-module	INTERNAL		IBM932//		IBM932		1
-
-#	from			to			module		cost
-alias	IBM-933//		IBM933//
-alias	CP933//			IBM933//
-alias	EBCDIC-CP-AR2//		IBM933//
-alias	CSIBM933//		IBM933//
-module	IBM933//		INTERNAL		IBM933		1
-module	INTERNAL		IBM933//		IBM933		1
-
-#	from			to			module		cost
-alias	IBM-935//		IBM935//
-alias	CP935//			IBM935//
-alias	EBCDIC-CP-AR2//		IBM935//
-alias	CSIBM935//		IBM935//
-module	IBM935//		INTERNAL		IBM935		1
-module	INTERNAL		IBM935//		IBM935		1
-
-#	from			to			module		cost
-alias	IBM-937//		IBM937//
-alias	CP937//			IBM937//
-alias	EBCDIC-CP-AR2//		IBM937//
-alias	CSIBM937//		IBM937//
-module	IBM937//		INTERNAL		IBM937		1
-module	INTERNAL		IBM937//		IBM937		1
-
-#	from			to			module		cost
-alias	IBM-939//		IBM939//
-alias	CP939//			IBM939//
-alias	EBCDIC-CP-AR2//		IBM939//
-alias	CSIBM939//		IBM939//
-module	IBM939//		INTERNAL		IBM939		1
-module	INTERNAL		IBM939//		IBM939		1
-
-#	from			to			module		cost
-alias	IBM-943//		IBM943//
-alias	CSIBM943//		IBM943//
-module	IBM943//		INTERNAL		IBM943		1
-module	INTERNAL		IBM943//		IBM943		1
-
-#	from			to			module		cost
-alias	CP1004//		IBM1004//
-alias	OS2LATIN1//		IBM1004//
-module	IBM1004//		INTERNAL		IBM1004		1
-module	INTERNAL		IBM1004//		IBM1004		1
-
-#	from			to			module		cost
-alias	CP1026//		IBM1026//
-alias	1026//			IBM1026//
-alias	CSIBM1026//		IBM1026//
-alias	OSF10020402//		IBM1026//
-module	IBM1026//		INTERNAL		IBM1026		1
-module	INTERNAL		IBM1026//		IBM1026		1
-
-#	from			to			module		cost
-alias	IBM-1046//		IBM1046//
-alias	CP1046//		IBM1046//
-alias	1046//			IBM1046//
-module	IBM1046//		INTERNAL		IBM1046		1
-module	INTERNAL		IBM1046//		IBM1046		1
-
-#	from			to			module		cost
-alias	CP1047//		IBM1047//
-alias	1047//			IBM1047//
-alias	OSF10020417//		IBM1047//
-module	IBM1047//		INTERNAL		IBM1047		1
-module	INTERNAL		IBM1047//		IBM1047		1
-
-#	from			to			module		cost
-alias	IBM-1124//		IBM1124//
-alias	CP1124//		IBM1124//
-alias	CSIBM1124//		IBM1124//
-module	IBM1124//		INTERNAL		IBM1124		1
-module	INTERNAL		IBM1124//		IBM1124		1
-
-#	from			to			module		cost
-alias	IBM-1129//		IBM1129//
-alias	CP1129//		IBM1129//
-alias	CSIBM1129//		IBM1129//
-module	IBM1129//		INTERNAL		IBM1129		1
-module	INTERNAL		IBM1129//		IBM1129		1
-
-#	from			to			module		cost
-alias	IBM-1160//		IBM1160//
-alias	CP1160//		IBM1160//
-alias	CSIBM1160//		IBM1160//
-module	IBM1160//		INTERNAL		IBM1160		1
-module	INTERNAL		IBM1160//		IBM1160		1
-
-#	from			to			module		cost
-alias	IBM-1161//		IBM1161//
-alias	CP1161//		IBM1161//
-alias	CSIBM1161//		IBM1161//
-module	IBM1161//		INTERNAL		IBM1161		1
-module	INTERNAL		IBM1161//		IBM1161		1
-
-#	from			to			module		cost
-alias	IBM-1132//		IBM1132//
-alias	CP1132//		IBM1132//
-alias	CSIBM1132//		IBM1132//
-module	IBM1132//		INTERNAL		IBM1132		1
-module	INTERNAL		IBM1132//		IBM1132		1
-
-#	from			to			module		cost
-alias	IBM-1133//		IBM1133//
-alias	CP1133//		IBM1133//
-alias	CSIBM1133//		IBM1133//
-module	IBM1133//		INTERNAL		IBM1133		1
-module	INTERNAL		IBM1133//		IBM1133		1
-
-#	from			to			module		cost
-alias	IBM-1162//		IBM1162//
-alias	CP1162//		IBM1162//
-alias	CSIBM11621162//		IBM1162//
-module	IBM1162//		INTERNAL		IBM1162		1
-module	INTERNAL		IBM1162//		IBM1162		1
-
-#	from			to			module		cost
-alias	IBM-1163//		IBM1163//
-alias	CP1163//		IBM1163//
-alias	CSIBM1163//		IBM1163//
-module	IBM1163//		INTERNAL		IBM1163		1
-module	INTERNAL		IBM1163//		IBM1163		1
-
-#	from			to			module		cost
-alias	IBM-1164//		IBM1164//
-alias	CP1164//		IBM1164//
-alias	CSIBM1164//		IBM1164//
-module	IBM1164//		INTERNAL		IBM1164		1
-module	INTERNAL		IBM1164//		IBM1164		1
-
-#	from			to			module		cost
-alias	EUCKR//			EUC-KR//
-alias	CSEUCKR//		EUC-KR//
-alias	OSF0004000a//		EUC-KR//
-module	EUC-KR//		INTERNAL		EUC-KR		1
-module	INTERNAL		EUC-KR//		EUC-KR		1
-
-#	from			to			module		cost
-alias	MSCP949//		UHC//
-alias	CP949//			UHC//
-alias	OSF100203B5//		UHC//
-module	UHC//			INTERNAL		UHC		1
-module	INTERNAL		UHC//			UHC		1
-
-#	from			to			module		cost
-alias	MSCP1361//		JOHAB//
-alias	CP1361//		JOHAB//
-module	JOHAB//			INTERNAL		JOHAB		1
-module	INTERNAL		JOHAB//			JOHAB		1
-
-#	from			to			module		cost
-alias	BIG-FIVE//		BIG5//
-alias	BIGFIVE//		BIG5//
-alias	BIG-5//			BIG5//
-alias	CN-BIG5//		BIG5//
-alias	CP950//			BIG5//
-module	BIG5//			INTERNAL		BIG5		1
-module	INTERNAL		BIG5//			BIG5		1
-
-#	from			to			module		cost
-alias	BIG5-HKSCS//		BIG5HKSCS//
-module	BIG5HKSCS//		INTERNAL		BIG5HKSCS	1
-module	INTERNAL		BIG5HKSCS//		BIG5HKSCS	1
-
-#	from			to			module		cost
-alias	EUCJP//			EUC-JP//
-alias	CSEUCPKDFMTJAPANESE//	EUC-JP//
-alias	OSF00030010//		EUC-JP//
-alias	UJIS//			EUC-JP//
-module	EUC-JP//		INTERNAL		EUC-JP		1
-module	INTERNAL		EUC-JP//		EUC-JP		1
-
-#	from			to			module		cost
-alias	EUCCN//			EUC-CN//
-alias	GB2312//		EUC-CN//
-alias	csGB2312//		EUC-CN//
-alias	CN-GB//			EUC-CN//
-module	EUC-CN//		INTERNAL		EUC-CN		1
-module	INTERNAL		EUC-CN//		EUC-CN		1
-
-#	from			to			module		cost
-module	EUC-CN//		BIG5//			GBBIG5		1
-module	BIG5//			EUC-CN//		GBBIG5		1
-
-#	from			to			module		cost
-alias	GB13000//		GBK//
-alias	CP936//			GBK//
-module	GBK//			INTERNAL		GBK		1
-module	INTERNAL		GBK//			GBK		1
-
-#	from			to			module		cost
-module	GBK//			EUC-CN//		GBGBK		1
-module	EUC-CN//		GBK//			GBGBK		1
-
-#	from			to			module		cost
-alias	EUCTW//			EUC-TW//
-alias	OSF0005000a//		EUC-TW//
-module	EUC-TW//		INTERNAL		EUC-TW		1
-module	INTERNAL		EUC-TW//		EUC-TW		1
-
-#	from			to			module		cost
-alias	MS-EE//			CP1250//
-alias	WINDOWS-1250//		CP1250//
-module	CP1250//		INTERNAL		CP1250		1
-module	INTERNAL		CP1250//		CP1250		1
-
-#	from			to			module		cost
-alias	MS-CYRL//		CP1251//
-alias	WINDOWS-1251//		CP1251//
-module	CP1251//		INTERNAL		CP1251		1
-module	INTERNAL		CP1251//		CP1251		1
-
-#	from			to			module		cost
-alias	MS-ANSI//		CP1252//
-alias	WINDOWS-1252//		CP1252//
-module	CP1252//		INTERNAL		CP1252		1
-module	INTERNAL		CP1252//		CP1252		1
-
-#	from			to			module		cost
-alias	MS-GREEK//		CP1253//
-alias	WINDOWS-1253//		CP1253//
-module	CP1253//		INTERNAL		CP1253		1
-module	INTERNAL		CP1253//		CP1253		1
-
-#	from			to			module		cost
-alias	MS-TURK//		CP1254//
-alias	WINDOWS-1254//		CP1254//
-module	CP1254//		INTERNAL		CP1254		1
-module	INTERNAL		CP1254//		CP1254		1
-
-#	from			to			module		cost
-alias	MS-HEBR//		CP1255//
-alias	WINDOWS-1255//		CP1255//
-module	CP1255//		INTERNAL		CP1255		1
-module	INTERNAL		CP1255//		CP1255		1
-
-#	from			to			module		cost
-alias	MS-ARAB//		CP1256//
-alias	WINDOWS-1256//		CP1256//
-module	CP1256//		INTERNAL		CP1256		1
-module	INTERNAL		CP1256//		CP1256		1
-
-#	from			to			module		cost
-alias	WINBALTRIM//		CP1257//
-alias	WINDOWS-1257//		CP1257//
-module	CP1257//		INTERNAL		CP1257		1
-module	INTERNAL		CP1257//		CP1257		1
-
-#	from			to			module		cost
-alias	WINDOWS-1258//		CP1258//
-module	CP1258//		INTERNAL		CP1258		1
-module	INTERNAL		CP1258//		CP1258		1
-
-#	from			to			module		cost
-alias	874//			IBM874//
-alias	CP874//			IBM874//
-module	IBM874//		INTERNAL		IBM874		1
-module	INTERNAL		IBM874//		IBM874		1
-
-#	from			to			module		cost
-module	CP737//			INTERNAL		CP737		1
-module	INTERNAL		CP737//			CP737		1
-
-#	from			to			module		cost
-alias	IBM775//		CP775//
-alias	CSPC775BALTIC//		CP775//
-module	CP775//			INTERNAL		CP775		1
-module	INTERNAL		CP775//			CP775		1
-
-#	from			to			module		cost
-alias	CSISO2022JP//		ISO-2022-JP//
-alias	ISO2022JP//		ISO-2022-JP//
-module	ISO-2022-JP//		INTERNAL		ISO-2022-JP	1
-module	INTERNAL		ISO-2022-JP//		ISO-2022-JP	1
-
-#	from			to			module		cost
-alias	CSISO2022JP2//		ISO-2022-JP-2//
-alias	ISO2022JP2//		ISO-2022-JP-2//
-module	ISO-2022-JP-2//		INTERNAL		ISO-2022-JP	1
-module	INTERNAL		ISO-2022-JP-2//		ISO-2022-JP	1
-
-#	from			to			module		cost
-alias	CSISO2022KR//		ISO-2022-KR//
-alias	ISO2022KR//		ISO-2022-KR//
-module	ISO-2022-KR//		INTERNAL		ISO-2022-KR	1
-module	INTERNAL		ISO-2022-KR//		ISO-2022-KR	1
-
-#	from			to			module		cost
-alias	CSISO2022CN//		ISO-2022-CN//
-alias	ISO2022CN//		ISO-2022-CN//
-module	ISO-2022-CN//		INTERNAL		ISO-2022-CN	1
-module	INTERNAL		ISO-2022-CN//		ISO-2022-CN	1
-
-#	from			to			module		cost
-alias	ISO2022CNEXT//		ISO-2022-CN-EXT//
-module	ISO-2022-CN-EXT//	INTERNAL		ISO-2022-CN-EXT	1
-module	INTERNAL		ISO-2022-CN-EXT//	ISO-2022-CN-EXT	1
-
-#	from			to			module		cost
-alias	MAC//			MACINTOSH//
-alias	CSMACINTOSH//		MACINTOSH//
-module	MACINTOSH//		INTERNAL		MACINTOSH	1
-module	INTERNAL		MACINTOSH//		MACINTOSH	1
-
-#	from			to			module		cost
-alias	ISO-IR-143//		IEC_P27-1//
-alias	CSISO143IECP271//	IEC_P27-1//
-alias	IEC_P271//		IEC_P27-1//
-module	IEC_P27-1//		INTERNAL		IEC_P27-1	1
-module	INTERNAL		IEC_P27-1//		IEC_P27-1	1
-
-#	from			to			module		cost
-alias	ISO_9036//		ASMO_449//
-alias	ARABIC7//		ASMO_449//
-alias	ISO-IR-89//		ASMO_449//
-alias	CSISO89ASMO449//	ASMO_449//
-module	ASMO_449//		INTERNAL		ASMO_449	1
-module	INTERNAL		ASMO_449//		ASMO_449	1
-
-#	from			to			module		cost
-alias	ANSI_X3.110-1983//	ANSI_X3.110//
-alias	ISO-IR-99//		ANSI_X3.110//
-alias	CSA_T500-1983//		ANSI_X3.110//
-alias	CSA_T500//		ANSI_X3.110//
-alias	NAPLPS//		ANSI_X3.110//
-alias	CSISO99NAPLPS//		ANSI_X3.110//
-module	ANSI_X3.110//		INTERNAL		ANSI_X3.110	1
-module	INTERNAL		ANSI_X3.110//		ANSI_X3.110	1
-
-#	from			to			module		cost
-alias	ISO-IR-139//		CSN_369103//
-alias	CSISO139CSN369103//	CSN_369103//
-module	CSN_369103//		INTERNAL		CSN_369103	1
-module	INTERNAL		CSN_369103//		CSN_369103	1
-
-#	from			to			module		cost
-alias	CWI-2//			CWI//
-alias	CP-HU//			CWI//
-module	CWI//			INTERNAL		CWI		1
-module	INTERNAL		CWI//			CWI		1
-
-#	from			to			module		cost
-alias	DEC//			DEC-MCS//
-alias	CSDECMCS//		DEC-MCS//
-alias	DECMCS//		DEC-MCS//
-module	DEC-MCS//		INTERNAL		DEC-MCS		1
-module	INTERNAL		DEC-MCS//		DEC-MCS		1
-
-#	from			to			module		cost
-alias	ISO-IR-111//		ECMA-CYRILLIC//
-alias	CSISO111ECMACYRILLIC//	ECMA-CYRILLIC//
-alias	ECMACYRILLIC//		ECMA-CYRILLIC//
-module	ECMA-CYRILLIC//		INTERNAL		ECMA-CYRILLIC	1
-module	INTERNAL		ECMA-CYRILLIC//		ECMA-CYRILLIC	1
-
-#	from			to			module		cost
-alias	ST_SEV_358-88//		GOST_19768-74//
-alias	GOST_19768//		GOST_19768-74//
-alias	ISO-IR-153//		GOST_19768-74//
-alias	CSISO153GOST1976874//	GOST_19768-74//
-alias	GOST_1976874//		GOST_19768-74//
-module	GOST_19768-74//		INTERNAL		GOST_19768-74	1
-module	INTERNAL		GOST_19768-74//		GOST_19768-74	1
-
-#	from			to			module		cost
-alias	ISO-IR-150//		GREEK-CCITT//
-alias	CSISO150//		GREEK-CCITT//
-alias	CSISO150GREEKCCITT//	GREEK-CCITT//
-alias	GREEKCCITT//		GREEK-CCITT//
-module	GREEK-CCITT//		INTERNAL		GREEK-CCITT	1
-module	INTERNAL		GREEK-CCITT//		GREEK-CCITT	1
-
-#	from			to			module		cost
-alias	ISO-IR-88//		GREEK7//
-alias	CSISO88GREEK7//		GREEK7//
-module	GREEK7//		INTERNAL		GREEK7		1
-module	INTERNAL		GREEK7//		GREEK7		1
-
-#	from			to			module		cost
-alias	ISO-IR-18//		GREEK7-OLD//
-alias	CSISO18GREEK7OLD//	GREEK7-OLD//
-alias	GREEK7OLD//		GREEK7-OLD//
-module	GREEK7-OLD//		INTERNAL		GREEK7-OLD	1
-module	INTERNAL		GREEK7-OLD//		GREEK7-OLD	1
-
-#	from			to			module		cost
-alias	ISO-IR-49//		INIS//
-alias	CSISO49INIS//		INIS//
-module	INIS//			INTERNAL		INIS		1
-module	INTERNAL		INIS//			INIS		1
-
-#	from			to			module		cost
-alias	ISO-IR-50//		INIS-8//
-alias	CSISO50INIS8//		INIS-8//
-alias	INIS8//			INIS-8//
-module	INIS-8//		INTERNAL		INIS-8		1
-module	INTERNAL		INIS-8//		INIS-8		1
-
-#	from			to			module		cost
-alias	ISO-IR-51//		INIS-CYRILLIC//
-alias	CSISO51INISCYRILLIC//	INIS-CYRILLIC//
-alias	INISCYRILLIC//		INIS-CYRILLIC//
-module	INIS-CYRILLIC//		INTERNAL		INIS-CYRILLIC	1
-module	INTERNAL		INIS-CYRILLIC//		INIS-CYRILLIC	1
-
-#	from			to			module		cost
-alias	ISO-IR-98//		ISO_2033//
-alias	ISO_2033-1983//		ISO_2033//
-alias	E13B/			ISO_2033//
-alias	CSISO2033//		ISO_2033//
-module	ISO_2033//		INTERNAL		ISO_2033	1
-module	INTERNAL		ISO_2033//		ISO_2033	1
-
-#	from			to			module		cost
-alias	ISO-IR-37//		ISO_5427//
-alias	KOI-7//			ISO_5427//
-alias	CSISO5427CYRILLIC//	ISO_5427//
-module	ISO_5427//		INTERNAL		ISO_5427	1
-module	INTERNAL		ISO_5427//		ISO_5427	1
-
-#	from			to			module		cost
-alias	ISO-IR-54//		ISO_5427-EXT//
-alias	ISO_5427:1981//		ISO_5427-EXT//
-alias	CSISO5427CYRILLIC1981//	ISO_5427-EXT//
-alias	ISO_5427EXT//		ISO_5427-EXT//
-module	ISO_5427-EXT//		INTERNAL		ISO_5427-EXT	1
-module	INTERNAL		ISO_5427-EXT//		ISO_5427-EXT	1
-
-#	from			to			module		cost
-alias	ISO-IR-55//		ISO_5428//
-alias	ISO_5428:1980//		ISO_5428//
-alias	CSISO5428GREEK//	ISO_5428//
-module	ISO_5428//		INTERNAL		ISO_5428	1
-module	INTERNAL		ISO_5428//		ISO_5428	1
-
-#	from			to			module		cost
-alias	ISO-IR-155//		ISO_10367-BOX//
-alias	CSISO10367BOX//		ISO_10367-BOX//
-alias	ISO_10367BOX//		ISO_10367-BOX//
-module	ISO_10367-BOX//		INTERNAL		ISO_10367-BOX	1
-module	INTERNAL		ISO_10367-BOX//		ISO_10367-BOX	1
-
-#	from			to			module		cost
-alias	MACIS//			MAC-IS//
-module	MAC-IS//		INTERNAL		MAC-IS		1
-module	INTERNAL		MAC-IS//		MAC-IS		1
-
-#	from			to			module		cost
-alias	MACUK//			MAC-UK//
-alias	MACUKRAINIAN//		MAC-UK//
-alias	MAC-CYRILLIC//		MAC-UK//
-alias	MACCYRILLIC//		MAC-UK//
-module	MAC-UK//		INTERNAL		MAC-UK		1
-module	INTERNAL		MAC-UK//		MAC-UK		1
-
-#	from			to			module		cost
-alias	MS-MAC-CYRILLIC//	CP10007//
-alias	MSMACCYRILLIC//		CP10007//
-module	CP10007//		INTERNAL		CP10007		1
-module	INTERNAL		CP10007//		CP10007		1
-
-#	from			to			module		cost
-alias	ISO-IR-9-1//		NATS-DANO//
-alias	CSNATSDANO//		NATS-DANO//
-alias	NATSDANO//		NATS-DANO//
-module	NATS-DANO//		INTERNAL		NATS-DANO	1
-module	INTERNAL		NATS-DANO//		NATS-DANO	1
-
-#	from			to			module		cost
-alias	ISO-IR-8-1//		NATS-SEFI//
-alias	CSNATSSEFI//		NATS-SEFI//
-alias	NATSSEFI//		NATS-SEFI//
-module	NATS-SEFI//		INTERNAL		NATS-SEFI	1
-module	INTERNAL		NATS-SEFI//		NATS-SEFI	1
-
-#	from			to			module		cost
-alias	WS2//			WIN-SAMI-2//
-alias	WINSAMI2//		WIN-SAMI-2//
-module	WIN-SAMI-2//		INTERNAL		SAMI-WS2	1
-module	INTERNAL		WIN-SAMI-2//		SAMI-WS2	1
-
-#	from			to			module		cost
-module	ISO-IR-197//		INTERNAL		ISO-IR-197	1
-module	INTERNAL		ISO-IR-197//		ISO-IR-197	1
-
-#	from			to			module		cost
-alias	TIS620//		TIS-620//
-alias	TIS620-0//		TIS-620//
-alias	TIS620.2529-1//		TIS-620//
-alias	TIS620.2533-0//		TIS-620//
-alias	ISO-IR-166//		TIS-620//
-module	TIS-620//		INTERNAL		TIS-620		1
-module	INTERNAL		TIS-620//		TIS-620		1
-
-#	from			to			module		cost
-alias	KOI8U//			KOI8-U//
-module	KOI8-U//		INTERNAL		KOI8-U		1
-module	INTERNAL		KOI8-U//		KOI8-U		1
-
-#	from			to			module		cost
-alias	ISIRI3342//		ISIRI-3342//
-module	ISIRI-3342//		INTERNAL		ISIRI-3342	1
-module	INTERNAL		ISIRI-3342//		ISIRI-3342	1
-
-#	from			to			module		cost
-alias	UTF16//			UTF-16//
-module	UTF-16//		INTERNAL		UTF-16		1
-module	INTERNAL		UTF-16//		UTF-16		1
-
-#	from			to			module		cost
-alias	UTF16LE//		UTF-16LE//
-module	UTF-16LE//		INTERNAL		UTF-16		1
-module	INTERNAL		UTF-16LE//		UTF-16		1
-
-#	from			to			module		cost
-alias	UTF16BE//		UTF-16BE//
-module	UTF-16BE//		INTERNAL		UTF-16		1
-module	INTERNAL		UTF-16BE//		UTF-16		1
-
-#	from			to			module		cost
-alias	CSUNICODE//		UNICODE//
-module	UNICODE//		INTERNAL		UNICODE		1
-module	INTERNAL		UNICODE//		UNICODE		1
-
-#	from			to			module		cost
-alias	UTF32//			UTF-32//
-module	UTF-32//		INTERNAL		UTF-32		1
-module	INTERNAL		UTF-32//		UTF-32		1
-
-#	from			to			module		cost
-alias	UTF32LE//		UTF-32LE//
-module	UTF-32LE//		INTERNAL		UTF-32		1
-module	INTERNAL		UTF-32LE//		UTF-32		1
-
-#	from			to			module		cost
-alias	UTF32BE//		UTF-32BE//
-module	UTF-32BE//		INTERNAL		UTF-32		1
-module	INTERNAL		UTF-32BE//		UTF-32		1
-
-#	from			to			module		cost
-alias	UTF7//			UTF-7//
-module	UTF-7//			INTERNAL		UTF-7		1
-module	INTERNAL		UTF-7//			UTF-7		1
-
-#	from			to			module		cost
-module	GB18030//		INTERNAL		GB18030		1
-module	INTERNAL		GB18030//		GB18030		1
-
-#	from			to			module		cost
-module	VISCII//		INTERNAL		VISCII		1
-module	INTERNAL		VISCII//		VISCII		1
-
-#	from			to			module		cost
-module	KOI8-T//		INTERNAL		KOI8-T		1
-module	INTERNAL		KOI8-T//		KOI8-T		1
-
-#	from			to			module		cost
-module	GEORGIAN-PS//		INTERNAL		GEORGIAN-PS	1
-module	INTERNAL		GEORGIAN-PS//		GEORGIAN-PS	1
-
-#	from			to			module		cost
-module	GEORGIAN-ACADEMY//	INTERNAL		GEORGIAN-ACADEMY 1
-module	INTERNAL		GEORGIAN-ACADEMY//	GEORGIAN-ACADEMY 1
-
-#	from			to			module		cost
-module	ISO-IR-209//		INTERNAL		ISO-IR-209	1
-module	INTERNAL		ISO-IR-209//		ISO-IR-209	1
-
-#	from			to			module		cost
-module	MAC-SAMI//		INTERNAL		MAC-SAMI	1
-module	INTERNAL		MAC-SAMI//		MAC-SAMI	1
-
-#	from			to			module		cost
-module	ARMSCII-8//		INTERNAL		ARMSCII-8	1
-module	INTERNAL		ARMSCII-8//		ARMSCII-8	1
-
-#	from			to			module		cost
-alias	TCVN//			TCVN5712-1//
-alias	TCVN-5712//		TCVN5712-1//
-alias	TCVN5712-1:1993//	TCVN5712-1//
-module	TCVN5712-1//		INTERNAL		TCVN5712-1	1
-module	INTERNAL		TCVN5712-1//		TCVN5712-1	1
diff --git a/newlib/iconvdata/jis0201.c b/newlib/iconvdata/jis0201.c
deleted file mode 100644
index a4a23cb..0000000
--- a/newlib/iconvdata/jis0201.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Mapping tables for JIS0201 handling.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stdint.h>
-
-
-const uint32_t __jisx0201_to_ucs4[256] =
-{
-  0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007,
-  0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
-  0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017,
-  0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
-  0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027,
-  0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
-  0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037,
-  0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
-  0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047,
-  0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
-  0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057,
-  0x0058, 0x0059, 0x005a, 0x005b, 0x00a5, 0x005d, 0x005e, 0x005f,
-  0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067,
-  0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
-  0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077,
-  0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x203e, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0xff61, 0xff62, 0xff63, 0xff64, 0xff65, 0xff66, 0xff67,
-  0xff68, 0xff69, 0xff6a, 0xff6b, 0xff6c, 0xff6d, 0xff6e, 0xff6f,
-  0xff70, 0xff71, 0xff72, 0xff73, 0xff74, 0xff75, 0xff76, 0xff77,
-  0xff78, 0xff79, 0xff7a, 0xff7b, 0xff7c, 0xff7d, 0xff7e, 0xff7f,
-  0xff80, 0xff81, 0xff82, 0xff83, 0xff84, 0xff85, 0xff86, 0xff87,
-  0xff88, 0xff89, 0xff8a, 0xff8b, 0xff8c, 0xff8d, 0xff8e, 0xff8f,
-  0xff90, 0xff91, 0xff92, 0xff93, 0xff94, 0xff95, 0xff96, 0xff97,
-  0xff98, 0xff99, 0xff9a, 0xff9b, 0xff9c, 0xff9d, 0xff9e, 0xff9f,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-};
diff --git a/newlib/iconvdata/jis0201.h b/newlib/iconvdata/jis0201.h
deleted file mode 100644
index 6fae3a2..0000000
--- a/newlib/iconvdata/jis0201.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Access functions for JISX0201 conversion.
-   Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _JIS0201_H
-#define _JIS0201_H	1
-
-/* Conversion table.  */
-extern const uint32_t __jisx0201_to_ucs4[];
-
-
-static inline uint32_t
-jisx0201_to_ucs4 (char ch)
-{
-  uint32_t val = __jisx0201_to_ucs4[(unsigned char) ch];
-
-  if (val == 0 && ch != '\0')
-    val = __UNKNOWN_10646_CHAR;
-
-  return val;
-}
-
-
-static inline size_t
-ucs4_to_jisx0201 (uint32_t wch, char *s)
-{
-  char ch;
-
-  if (wch == 0xa5)
-    ch = '\x5c';
-  else if (wch == 0x203e)
-    ch = '\x7e';
-  else if (wch < 0x7e && wch != 0x5c)
-    ch = wch;
-  else if (wch >= 0xff61 && wch <= 0xff9f)
-    ch = wch - 0xfec0;
-  else
-    return __UNKNOWN_10646_CHAR;
-
-  s[0] = ch;
-  return 1;
-}
-
-#endif /* jis0201.h */
diff --git a/newlib/iconvdata/jis0208.c b/newlib/iconvdata/jis0208.c
deleted file mode 100644
index 1f16ad2..0000000
--- a/newlib/iconvdata/jis0208.c
+++ /dev/null
@@ -1,5012 +0,0 @@
-/* Mapping tables for JIS0208 handling.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stdint.h>
-
-#include "jis0208.h"
-
-
-/* We use one big table for the mapping.  We know that the first byte
-   is in range 0x21 to 0xea.  The second byte never is in the ranges
-   0x00 to 0x20 and 0x7f to 0xff.  Compacting the table by excluding
-   these ranges we get a table with only this gaps:
-
-   at	0x222e	0x2241	0x2250	0x226a	0x2279	0x2321	0x2339	0x235a
-   len	12	9	12	8	5	15	8	7
-
-   at	0x237a	0x2473	0x2576	0x2638	0x2658	0x2741	0x2771	0x2840
-   len	4	11	8	9	38	16	13	62
-
-   at	0x4f53
-   len	43
-
-   It's not worth trying to use these gaps.  The table can be generated
-   using
-
-   egrep '^0x' < .../eastasia/jis/jis0208.txt |
-   perl tab.pl
-
-   with tab.pl containing:
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   $n=0;
-   while (<>) {
-     local($sjis, $jis, $ucs4, %rest) = split;
-     local($u)=hex($ucs4);
-     local($s)=hex($jis);
-     printf ("\n ") if ($n % 4 eq 0);
-     ++$n;
-     printf (" [0x%04x] = 0x%04x,",
-	     int(($s - 0x2121) / 256) * 94 + (($s - 0x2121) & 0xff), $u);
-   }
-   printf ("\n");
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-const uint16_t __jis0208_to_ucs[0x1e80] =
-{
-  [0x0000] = 0x3000, [0x0001] = 0x3001, [0x0002] = 0x3002, [0x0003] = 0xff0c,
-  [0x0004] = 0xff0e, [0x0005] = 0x30fb, [0x0006] = 0xff1a, [0x0007] = 0xff1b,
-  [0x0008] = 0xff1f, [0x0009] = 0xff01, [0x000a] = 0x309b, [0x000b] = 0x309c,
-  [0x000c] = 0x00b4, [0x000d] = 0xff40, [0x000e] = 0x00a8, [0x000f] = 0xff3e,
-  [0x0010] = 0xffe3, [0x0011] = 0xff3f, [0x0012] = 0x30fd, [0x0013] = 0x30fe,
-  [0x0014] = 0x309d, [0x0015] = 0x309e, [0x0016] = 0x3003, [0x0017] = 0x4edd,
-  [0x0018] = 0x3005, [0x0019] = 0x3006, [0x001a] = 0x3007, [0x001b] = 0x30fc,
-  [0x001c] = 0x2015, [0x001d] = 0x2010, [0x001e] = 0xff0f, [0x001f] = 0xff3c,
-  [0x0020] = 0x301c, [0x0021] = 0x2016, [0x0022] = 0xff5c, [0x0023] = 0x2026,
-  [0x0024] = 0x2025, [0x0025] = 0x2018, [0x0026] = 0x2019, [0x0027] = 0x201c,
-  [0x0028] = 0x201d, [0x0029] = 0xff08, [0x002a] = 0xff09, [0x002b] = 0x3014,
-  [0x002c] = 0x3015, [0x002d] = 0xff3b, [0x002e] = 0xff3d, [0x002f] = 0xff5b,
-  [0x0030] = 0xff5d, [0x0031] = 0x3008, [0x0032] = 0x3009, [0x0033] = 0x300a,
-  [0x0034] = 0x300b, [0x0035] = 0x300c, [0x0036] = 0x300d, [0x0037] = 0x300e,
-  [0x0038] = 0x300f, [0x0039] = 0x3010, [0x003a] = 0x3011, [0x003b] = 0xff0b,
-  [0x003c] = 0x2212, [0x003d] = 0x00b1, [0x003e] = 0x00d7, [0x003f] = 0x00f7,
-  [0x0040] = 0xff1d, [0x0041] = 0x2260, [0x0042] = 0xff1c, [0x0043] = 0xff1e,
-  [0x0044] = 0x2266, [0x0045] = 0x2267, [0x0046] = 0x221e, [0x0047] = 0x2234,
-  [0x0048] = 0x2642, [0x0049] = 0x2640, [0x004a] = 0x00b0, [0x004b] = 0x2032,
-  [0x004c] = 0x2033, [0x004d] = 0x2103, [0x004e] = 0xffe5, [0x004f] = 0xff04,
-  [0x0050] = 0x00a2, [0x0051] = 0x00a3, [0x0052] = 0xff05, [0x0053] = 0xff03,
-  [0x0054] = 0xff06, [0x0055] = 0xff0a, [0x0056] = 0xff20, [0x0057] = 0x00a7,
-  [0x0058] = 0x2606, [0x0059] = 0x2605, [0x005a] = 0x25cb, [0x005b] = 0x25cf,
-  [0x005c] = 0x25ce, [0x005d] = 0x25c7, [0x005e] = 0x25c6, [0x005f] = 0x25a1,
-  [0x0060] = 0x25a0, [0x0061] = 0x25b3, [0x0062] = 0x25b2, [0x0063] = 0x25bd,
-  [0x0064] = 0x25bc, [0x0065] = 0x203b, [0x0066] = 0x3012, [0x0067] = 0x2192,
-  [0x0068] = 0x2190, [0x0069] = 0x2191, [0x006a] = 0x2193, [0x006b] = 0x3013,
-  [0x0077] = 0x2208, [0x0078] = 0x220b, [0x0079] = 0x2286, [0x007a] = 0x2287,
-  [0x007b] = 0x2282, [0x007c] = 0x2283, [0x007d] = 0x222a, [0x007e] = 0x2229,
-  [0x0087] = 0x2227, [0x0088] = 0x2228, [0x0089] = 0x00ac, [0x008a] = 0x21d2,
-  [0x008b] = 0x21d4, [0x008c] = 0x2200, [0x008d] = 0x2203, [0x0099] = 0x2220,
-  [0x009a] = 0x22a5, [0x009b] = 0x2312, [0x009c] = 0x2202, [0x009d] = 0x2207,
-  [0x009e] = 0x2261, [0x009f] = 0x2252, [0x00a0] = 0x226a, [0x00a1] = 0x226b,
-  [0x00a2] = 0x221a, [0x00a3] = 0x223d, [0x00a4] = 0x221d, [0x00a5] = 0x2235,
-  [0x00a6] = 0x222b, [0x00a7] = 0x222c, [0x00af] = 0x212b, [0x00b0] = 0x2030,
-  [0x00b1] = 0x266f, [0x00b2] = 0x266d, [0x00b3] = 0x266a, [0x00b4] = 0x2020,
-  [0x00b5] = 0x2021, [0x00b6] = 0x00b6, [0x00bb] = 0x25ef, [0x00cb] = 0xff10,
-  [0x00cc] = 0xff11, [0x00cd] = 0xff12, [0x00ce] = 0xff13, [0x00cf] = 0xff14,
-  [0x00d0] = 0xff15, [0x00d1] = 0xff16, [0x00d2] = 0xff17, [0x00d3] = 0xff18,
-  [0x00d4] = 0xff19, [0x00dc] = 0xff21, [0x00dd] = 0xff22, [0x00de] = 0xff23,
-  [0x00df] = 0xff24, [0x00e0] = 0xff25, [0x00e1] = 0xff26, [0x00e2] = 0xff27,
-  [0x00e3] = 0xff28, [0x00e4] = 0xff29, [0x00e5] = 0xff2a, [0x00e6] = 0xff2b,
-  [0x00e7] = 0xff2c, [0x00e8] = 0xff2d, [0x00e9] = 0xff2e, [0x00ea] = 0xff2f,
-  [0x00eb] = 0xff30, [0x00ec] = 0xff31, [0x00ed] = 0xff32, [0x00ee] = 0xff33,
-  [0x00ef] = 0xff34, [0x00f0] = 0xff35, [0x00f1] = 0xff36, [0x00f2] = 0xff37,
-  [0x00f3] = 0xff38, [0x00f4] = 0xff39, [0x00f5] = 0xff3a, [0x00fc] = 0xff41,
-  [0x00fd] = 0xff42, [0x00fe] = 0xff43, [0x00ff] = 0xff44, [0x0100] = 0xff45,
-  [0x0101] = 0xff46, [0x0102] = 0xff47, [0x0103] = 0xff48, [0x0104] = 0xff49,
-  [0x0105] = 0xff4a, [0x0106] = 0xff4b, [0x0107] = 0xff4c, [0x0108] = 0xff4d,
-  [0x0109] = 0xff4e, [0x010a] = 0xff4f, [0x010b] = 0xff50, [0x010c] = 0xff51,
-  [0x010d] = 0xff52, [0x010e] = 0xff53, [0x010f] = 0xff54, [0x0110] = 0xff55,
-  [0x0111] = 0xff56, [0x0112] = 0xff57, [0x0113] = 0xff58, [0x0114] = 0xff59,
-  [0x0115] = 0xff5a, [0x011a] = 0x3041, [0x011b] = 0x3042, [0x011c] = 0x3043,
-  [0x011d] = 0x3044, [0x011e] = 0x3045, [0x011f] = 0x3046, [0x0120] = 0x3047,
-  [0x0121] = 0x3048, [0x0122] = 0x3049, [0x0123] = 0x304a, [0x0124] = 0x304b,
-  [0x0125] = 0x304c, [0x0126] = 0x304d, [0x0127] = 0x304e, [0x0128] = 0x304f,
-  [0x0129] = 0x3050, [0x012a] = 0x3051, [0x012b] = 0x3052, [0x012c] = 0x3053,
-  [0x012d] = 0x3054, [0x012e] = 0x3055, [0x012f] = 0x3056, [0x0130] = 0x3057,
-  [0x0131] = 0x3058, [0x0132] = 0x3059, [0x0133] = 0x305a, [0x0134] = 0x305b,
-  [0x0135] = 0x305c, [0x0136] = 0x305d, [0x0137] = 0x305e, [0x0138] = 0x305f,
-  [0x0139] = 0x3060, [0x013a] = 0x3061, [0x013b] = 0x3062, [0x013c] = 0x3063,
-  [0x013d] = 0x3064, [0x013e] = 0x3065, [0x013f] = 0x3066, [0x0140] = 0x3067,
-  [0x0141] = 0x3068, [0x0142] = 0x3069, [0x0143] = 0x306a, [0x0144] = 0x306b,
-  [0x0145] = 0x306c, [0x0146] = 0x306d, [0x0147] = 0x306e, [0x0148] = 0x306f,
-  [0x0149] = 0x3070, [0x014a] = 0x3071, [0x014b] = 0x3072, [0x014c] = 0x3073,
-  [0x014d] = 0x3074, [0x014e] = 0x3075, [0x014f] = 0x3076, [0x0150] = 0x3077,
-  [0x0151] = 0x3078, [0x0152] = 0x3079, [0x0153] = 0x307a, [0x0154] = 0x307b,
-  [0x0155] = 0x307c, [0x0156] = 0x307d, [0x0157] = 0x307e, [0x0158] = 0x307f,
-  [0x0159] = 0x3080, [0x015a] = 0x3081, [0x015b] = 0x3082, [0x015c] = 0x3083,
-  [0x015d] = 0x3084, [0x015e] = 0x3085, [0x015f] = 0x3086, [0x0160] = 0x3087,
-  [0x0161] = 0x3088, [0x0162] = 0x3089, [0x0163] = 0x308a, [0x0164] = 0x308b,
-  [0x0165] = 0x308c, [0x0166] = 0x308d, [0x0167] = 0x308e, [0x0168] = 0x308f,
-  [0x0169] = 0x3090, [0x016a] = 0x3091, [0x016b] = 0x3092, [0x016c] = 0x3093,
-  [0x0178] = 0x30a1, [0x0179] = 0x30a2, [0x017a] = 0x30a3, [0x017b] = 0x30a4,
-  [0x017c] = 0x30a5, [0x017d] = 0x30a6, [0x017e] = 0x30a7, [0x017f] = 0x30a8,
-  [0x0180] = 0x30a9, [0x0181] = 0x30aa, [0x0182] = 0x30ab, [0x0183] = 0x30ac,
-  [0x0184] = 0x30ad, [0x0185] = 0x30ae, [0x0186] = 0x30af, [0x0187] = 0x30b0,
-  [0x0188] = 0x30b1, [0x0189] = 0x30b2, [0x018a] = 0x30b3, [0x018b] = 0x30b4,
-  [0x018c] = 0x30b5, [0x018d] = 0x30b6, [0x018e] = 0x30b7, [0x018f] = 0x30b8,
-  [0x0190] = 0x30b9, [0x0191] = 0x30ba, [0x0192] = 0x30bb, [0x0193] = 0x30bc,
-  [0x0194] = 0x30bd, [0x0195] = 0x30be, [0x0196] = 0x30bf, [0x0197] = 0x30c0,
-  [0x0198] = 0x30c1, [0x0199] = 0x30c2, [0x019a] = 0x30c3, [0x019b] = 0x30c4,
-  [0x019c] = 0x30c5, [0x019d] = 0x30c6, [0x019e] = 0x30c7, [0x019f] = 0x30c8,
-  [0x01a0] = 0x30c9, [0x01a1] = 0x30ca, [0x01a2] = 0x30cb, [0x01a3] = 0x30cc,
-  [0x01a4] = 0x30cd, [0x01a5] = 0x30ce, [0x01a6] = 0x30cf, [0x01a7] = 0x30d0,
-  [0x01a8] = 0x30d1, [0x01a9] = 0x30d2, [0x01aa] = 0x30d3, [0x01ab] = 0x30d4,
-  [0x01ac] = 0x30d5, [0x01ad] = 0x30d6, [0x01ae] = 0x30d7, [0x01af] = 0x30d8,
-  [0x01b0] = 0x30d9, [0x01b1] = 0x30da, [0x01b2] = 0x30db, [0x01b3] = 0x30dc,
-  [0x01b4] = 0x30dd, [0x01b5] = 0x30de, [0x01b6] = 0x30df, [0x01b7] = 0x30e0,
-  [0x01b8] = 0x30e1, [0x01b9] = 0x30e2, [0x01ba] = 0x30e3, [0x01bb] = 0x30e4,
-  [0x01bc] = 0x30e5, [0x01bd] = 0x30e6, [0x01be] = 0x30e7, [0x01bf] = 0x30e8,
-  [0x01c0] = 0x30e9, [0x01c1] = 0x30ea, [0x01c2] = 0x30eb, [0x01c3] = 0x30ec,
-  [0x01c4] = 0x30ed, [0x01c5] = 0x30ee, [0x01c6] = 0x30ef, [0x01c7] = 0x30f0,
-  [0x01c8] = 0x30f1, [0x01c9] = 0x30f2, [0x01ca] = 0x30f3, [0x01cb] = 0x30f4,
-  [0x01cc] = 0x30f5, [0x01cd] = 0x30f6, [0x01d6] = 0x0391, [0x01d7] = 0x0392,
-  [0x01d8] = 0x0393, [0x01d9] = 0x0394, [0x01da] = 0x0395, [0x01db] = 0x0396,
-  [0x01dc] = 0x0397, [0x01dd] = 0x0398, [0x01de] = 0x0399, [0x01df] = 0x039a,
-  [0x01e0] = 0x039b, [0x01e1] = 0x039c, [0x01e2] = 0x039d, [0x01e3] = 0x039e,
-  [0x01e4] = 0x039f, [0x01e5] = 0x03a0, [0x01e6] = 0x03a1, [0x01e7] = 0x03a3,
-  [0x01e8] = 0x03a4, [0x01e9] = 0x03a5, [0x01ea] = 0x03a6, [0x01eb] = 0x03a7,
-  [0x01ec] = 0x03a8, [0x01ed] = 0x03a9, [0x01f6] = 0x03b1, [0x01f7] = 0x03b2,
-  [0x01f8] = 0x03b3, [0x01f9] = 0x03b4, [0x01fa] = 0x03b5, [0x01fb] = 0x03b6,
-  [0x01fc] = 0x03b7, [0x01fd] = 0x03b8, [0x01fe] = 0x03b9, [0x01ff] = 0x03ba,
-  [0x0200] = 0x03bb, [0x0201] = 0x03bc, [0x0202] = 0x03bd, [0x0203] = 0x03be,
-  [0x0204] = 0x03bf, [0x0205] = 0x03c0, [0x0206] = 0x03c1, [0x0207] = 0x03c3,
-  [0x0208] = 0x03c4, [0x0209] = 0x03c5, [0x020a] = 0x03c6, [0x020b] = 0x03c7,
-  [0x020c] = 0x03c8, [0x020d] = 0x03c9, [0x0234] = 0x0410, [0x0235] = 0x0411,
-  [0x0236] = 0x0412, [0x0237] = 0x0413, [0x0238] = 0x0414, [0x0239] = 0x0415,
-  [0x023a] = 0x0401, [0x023b] = 0x0416, [0x023c] = 0x0417, [0x023d] = 0x0418,
-  [0x023e] = 0x0419, [0x023f] = 0x041a, [0x0240] = 0x041b, [0x0241] = 0x041c,
-  [0x0242] = 0x041d, [0x0243] = 0x041e, [0x0244] = 0x041f, [0x0245] = 0x0420,
-  [0x0246] = 0x0421, [0x0247] = 0x0422, [0x0248] = 0x0423, [0x0249] = 0x0424,
-  [0x024a] = 0x0425, [0x024b] = 0x0426, [0x024c] = 0x0427, [0x024d] = 0x0428,
-  [0x024e] = 0x0429, [0x024f] = 0x042a, [0x0250] = 0x042b, [0x0251] = 0x042c,
-  [0x0252] = 0x042d, [0x0253] = 0x042e, [0x0254] = 0x042f, [0x0264] = 0x0430,
-  [0x0265] = 0x0431, [0x0266] = 0x0432, [0x0267] = 0x0433, [0x0268] = 0x0434,
-  [0x0269] = 0x0435, [0x026a] = 0x0451, [0x026b] = 0x0436, [0x026c] = 0x0437,
-  [0x026d] = 0x0438, [0x026e] = 0x0439, [0x026f] = 0x043a, [0x0270] = 0x043b,
-  [0x0271] = 0x043c, [0x0272] = 0x043d, [0x0273] = 0x043e, [0x0274] = 0x043f,
-  [0x0275] = 0x0440, [0x0276] = 0x0441, [0x0277] = 0x0442, [0x0278] = 0x0443,
-  [0x0279] = 0x0444, [0x027a] = 0x0445, [0x027b] = 0x0446, [0x027c] = 0x0447,
-  [0x027d] = 0x0448, [0x027e] = 0x0449, [0x027f] = 0x044a, [0x0280] = 0x044b,
-  [0x0281] = 0x044c, [0x0282] = 0x044d, [0x0283] = 0x044e, [0x0284] = 0x044f,
-  [0x0292] = 0x2500, [0x0293] = 0x2502, [0x0294] = 0x250c, [0x0295] = 0x2510,
-  [0x0296] = 0x2518, [0x0297] = 0x2514, [0x0298] = 0x251c, [0x0299] = 0x252c,
-  [0x029a] = 0x2524, [0x029b] = 0x2534, [0x029c] = 0x253c, [0x029d] = 0x2501,
-  [0x029e] = 0x2503, [0x029f] = 0x250f, [0x02a0] = 0x2513, [0x02a1] = 0x251b,
-  [0x02a2] = 0x2517, [0x02a3] = 0x2523, [0x02a4] = 0x2533, [0x02a5] = 0x252b,
-  [0x02a6] = 0x253b, [0x02a7] = 0x254b, [0x02a8] = 0x2520, [0x02a9] = 0x252f,
-  [0x02aa] = 0x2528, [0x02ab] = 0x2537, [0x02ac] = 0x253f, [0x02ad] = 0x251d,
-  [0x02ae] = 0x2530, [0x02af] = 0x2525, [0x02b0] = 0x2538, [0x02b1] = 0x2542,
-  [0x0582] = 0x4e9c, [0x0583] = 0x5516, [0x0584] = 0x5a03, [0x0585] = 0x963f,
-  [0x0586] = 0x54c0, [0x0587] = 0x611b, [0x0588] = 0x6328, [0x0589] = 0x59f6,
-  [0x058a] = 0x9022, [0x058b] = 0x8475, [0x058c] = 0x831c, [0x058d] = 0x7a50,
-  [0x058e] = 0x60aa, [0x058f] = 0x63e1, [0x0590] = 0x6e25, [0x0591] = 0x65ed,
-  [0x0592] = 0x8466, [0x0593] = 0x82a6, [0x0594] = 0x9bf5, [0x0595] = 0x6893,
-  [0x0596] = 0x5727, [0x0597] = 0x65a1, [0x0598] = 0x6271, [0x0599] = 0x5b9b,
-  [0x059a] = 0x59d0, [0x059b] = 0x867b, [0x059c] = 0x98f4, [0x059d] = 0x7d62,
-  [0x059e] = 0x7dbe, [0x059f] = 0x9b8e, [0x05a0] = 0x6216, [0x05a1] = 0x7c9f,
-  [0x05a2] = 0x88b7, [0x05a3] = 0x5b89, [0x05a4] = 0x5eb5, [0x05a5] = 0x6309,
-  [0x05a6] = 0x6697, [0x05a7] = 0x6848, [0x05a8] = 0x95c7, [0x05a9] = 0x978d,
-  [0x05aa] = 0x674f, [0x05ab] = 0x4ee5, [0x05ac] = 0x4f0a, [0x05ad] = 0x4f4d,
-  [0x05ae] = 0x4f9d, [0x05af] = 0x5049, [0x05b0] = 0x56f2, [0x05b1] = 0x5937,
-  [0x05b2] = 0x59d4, [0x05b3] = 0x5a01, [0x05b4] = 0x5c09, [0x05b5] = 0x60df,
-  [0x05b6] = 0x610f, [0x05b7] = 0x6170, [0x05b8] = 0x6613, [0x05b9] = 0x6905,
-  [0x05ba] = 0x70ba, [0x05bb] = 0x754f, [0x05bc] = 0x7570, [0x05bd] = 0x79fb,
-  [0x05be] = 0x7dad, [0x05bf] = 0x7def, [0x05c0] = 0x80c3, [0x05c1] = 0x840e,
-  [0x05c2] = 0x8863, [0x05c3] = 0x8b02, [0x05c4] = 0x9055, [0x05c5] = 0x907a,
-  [0x05c6] = 0x533b, [0x05c7] = 0x4e95, [0x05c8] = 0x4ea5, [0x05c9] = 0x57df,
-  [0x05ca] = 0x80b2, [0x05cb] = 0x90c1, [0x05cc] = 0x78ef, [0x05cd] = 0x4e00,
-  [0x05ce] = 0x58f1, [0x05cf] = 0x6ea2, [0x05d0] = 0x9038, [0x05d1] = 0x7a32,
-  [0x05d2] = 0x8328, [0x05d3] = 0x828b, [0x05d4] = 0x9c2f, [0x05d5] = 0x5141,
-  [0x05d6] = 0x5370, [0x05d7] = 0x54bd, [0x05d8] = 0x54e1, [0x05d9] = 0x56e0,
-  [0x05da] = 0x59fb, [0x05db] = 0x5f15, [0x05dc] = 0x98f2, [0x05dd] = 0x6deb,
-  [0x05de] = 0x80e4, [0x05df] = 0x852d, [0x05e0] = 0x9662, [0x05e1] = 0x9670,
-  [0x05e2] = 0x96a0, [0x05e3] = 0x97fb, [0x05e4] = 0x540b, [0x05e5] = 0x53f3,
-  [0x05e6] = 0x5b87, [0x05e7] = 0x70cf, [0x05e8] = 0x7fbd, [0x05e9] = 0x8fc2,
-  [0x05ea] = 0x96e8, [0x05eb] = 0x536f, [0x05ec] = 0x9d5c, [0x05ed] = 0x7aba,
-  [0x05ee] = 0x4e11, [0x05ef] = 0x7893, [0x05f0] = 0x81fc, [0x05f1] = 0x6e26,
-  [0x05f2] = 0x5618, [0x05f3] = 0x5504, [0x05f4] = 0x6b1d, [0x05f5] = 0x851a,
-  [0x05f6] = 0x9c3b, [0x05f7] = 0x59e5, [0x05f8] = 0x53a9, [0x05f9] = 0x6d66,
-  [0x05fa] = 0x74dc, [0x05fb] = 0x958f, [0x05fc] = 0x5642, [0x05fd] = 0x4e91,
-  [0x05fe] = 0x904b, [0x05ff] = 0x96f2, [0x0600] = 0x834f, [0x0601] = 0x990c,
-  [0x0602] = 0x53e1, [0x0603] = 0x55b6, [0x0604] = 0x5b30, [0x0605] = 0x5f71,
-  [0x0606] = 0x6620, [0x0607] = 0x66f3, [0x0608] = 0x6804, [0x0609] = 0x6c38,
-  [0x060a] = 0x6cf3, [0x060b] = 0x6d29, [0x060c] = 0x745b, [0x060d] = 0x76c8,
-  [0x060e] = 0x7a4e, [0x060f] = 0x9834, [0x0610] = 0x82f1, [0x0611] = 0x885b,
-  [0x0612] = 0x8a60, [0x0613] = 0x92ed, [0x0614] = 0x6db2, [0x0615] = 0x75ab,
-  [0x0616] = 0x76ca, [0x0617] = 0x99c5, [0x0618] = 0x60a6, [0x0619] = 0x8b01,
-  [0x061a] = 0x8d8a, [0x061b] = 0x95b2, [0x061c] = 0x698e, [0x061d] = 0x53ad,
-  [0x061e] = 0x5186, [0x061f] = 0x5712, [0x0620] = 0x5830, [0x0621] = 0x5944,
-  [0x0622] = 0x5bb4, [0x0623] = 0x5ef6, [0x0624] = 0x6028, [0x0625] = 0x63a9,
-  [0x0626] = 0x63f4, [0x0627] = 0x6cbf, [0x0628] = 0x6f14, [0x0629] = 0x708e,
-  [0x062a] = 0x7114, [0x062b] = 0x7159, [0x062c] = 0x71d5, [0x062d] = 0x733f,
-  [0x062e] = 0x7e01, [0x062f] = 0x8276, [0x0630] = 0x82d1, [0x0631] = 0x8597,
-  [0x0632] = 0x9060, [0x0633] = 0x925b, [0x0634] = 0x9d1b, [0x0635] = 0x5869,
-  [0x0636] = 0x65bc, [0x0637] = 0x6c5a, [0x0638] = 0x7525, [0x0639] = 0x51f9,
-  [0x063a] = 0x592e, [0x063b] = 0x5965, [0x063c] = 0x5f80, [0x063d] = 0x5fdc,
-  [0x063e] = 0x62bc, [0x063f] = 0x65fa, [0x0640] = 0x6a2a, [0x0641] = 0x6b27,
-  [0x0642] = 0x6bb4, [0x0643] = 0x738b, [0x0644] = 0x7fc1, [0x0645] = 0x8956,
-  [0x0646] = 0x9d2c, [0x0647] = 0x9d0e, [0x0648] = 0x9ec4, [0x0649] = 0x5ca1,
-  [0x064a] = 0x6c96, [0x064b] = 0x837b, [0x064c] = 0x5104, [0x064d] = 0x5c4b,
-  [0x064e] = 0x61b6, [0x064f] = 0x81c6, [0x0650] = 0x6876, [0x0651] = 0x7261,
-  [0x0652] = 0x4e59, [0x0653] = 0x4ffa, [0x0654] = 0x5378, [0x0655] = 0x6069,
-  [0x0656] = 0x6e29, [0x0657] = 0x7a4f, [0x0658] = 0x97f3, [0x0659] = 0x4e0b,
-  [0x065a] = 0x5316, [0x065b] = 0x4eee, [0x065c] = 0x4f55, [0x065d] = 0x4f3d,
-  [0x065e] = 0x4fa1, [0x065f] = 0x4f73, [0x0660] = 0x52a0, [0x0661] = 0x53ef,
-  [0x0662] = 0x5609, [0x0663] = 0x590f, [0x0664] = 0x5ac1, [0x0665] = 0x5bb6,
-  [0x0666] = 0x5be1, [0x0667] = 0x79d1, [0x0668] = 0x6687, [0x0669] = 0x679c,
-  [0x066a] = 0x67b6, [0x066b] = 0x6b4c, [0x066c] = 0x6cb3, [0x066d] = 0x706b,
-  [0x066e] = 0x73c2, [0x066f] = 0x798d, [0x0670] = 0x79be, [0x0671] = 0x7a3c,
-  [0x0672] = 0x7b87, [0x0673] = 0x82b1, [0x0674] = 0x82db, [0x0675] = 0x8304,
-  [0x0676] = 0x8377, [0x0677] = 0x83ef, [0x0678] = 0x83d3, [0x0679] = 0x8766,
-  [0x067a] = 0x8ab2, [0x067b] = 0x5629, [0x067c] = 0x8ca8, [0x067d] = 0x8fe6,
-  [0x067e] = 0x904e, [0x067f] = 0x971e, [0x0680] = 0x868a, [0x0681] = 0x4fc4,
-  [0x0682] = 0x5ce8, [0x0683] = 0x6211, [0x0684] = 0x7259, [0x0685] = 0x753b,
-  [0x0686] = 0x81e5, [0x0687] = 0x82bd, [0x0688] = 0x86fe, [0x0689] = 0x8cc0,
-  [0x068a] = 0x96c5, [0x068b] = 0x9913, [0x068c] = 0x99d5, [0x068d] = 0x4ecb,
-  [0x068e] = 0x4f1a, [0x068f] = 0x89e3, [0x0690] = 0x56de, [0x0691] = 0x584a,
-  [0x0692] = 0x58ca, [0x0693] = 0x5efb, [0x0694] = 0x5feb, [0x0695] = 0x602a,
-  [0x0696] = 0x6094, [0x0697] = 0x6062, [0x0698] = 0x61d0, [0x0699] = 0x6212,
-  [0x069a] = 0x62d0, [0x069b] = 0x6539, [0x069c] = 0x9b41, [0x069d] = 0x6666,
-  [0x069e] = 0x68b0, [0x069f] = 0x6d77, [0x06a0] = 0x7070, [0x06a1] = 0x754c,
-  [0x06a2] = 0x7686, [0x06a3] = 0x7d75, [0x06a4] = 0x82a5, [0x06a5] = 0x87f9,
-  [0x06a6] = 0x958b, [0x06a7] = 0x968e, [0x06a8] = 0x8c9d, [0x06a9] = 0x51f1,
-  [0x06aa] = 0x52be, [0x06ab] = 0x5916, [0x06ac] = 0x54b3, [0x06ad] = 0x5bb3,
-  [0x06ae] = 0x5d16, [0x06af] = 0x6168, [0x06b0] = 0x6982, [0x06b1] = 0x6daf,
-  [0x06b2] = 0x788d, [0x06b3] = 0x84cb, [0x06b4] = 0x8857, [0x06b5] = 0x8a72,
-  [0x06b6] = 0x93a7, [0x06b7] = 0x9ab8, [0x06b8] = 0x6d6c, [0x06b9] = 0x99a8,
-  [0x06ba] = 0x86d9, [0x06bb] = 0x57a3, [0x06bc] = 0x67ff, [0x06bd] = 0x86ce,
-  [0x06be] = 0x920e, [0x06bf] = 0x5283, [0x06c0] = 0x5687, [0x06c1] = 0x5404,
-  [0x06c2] = 0x5ed3, [0x06c3] = 0x62e1, [0x06c4] = 0x64b9, [0x06c5] = 0x683c,
-  [0x06c6] = 0x6838, [0x06c7] = 0x6bbb, [0x06c8] = 0x7372, [0x06c9] = 0x78ba,
-  [0x06ca] = 0x7a6b, [0x06cb] = 0x899a, [0x06cc] = 0x89d2, [0x06cd] = 0x8d6b,
-  [0x06ce] = 0x8f03, [0x06cf] = 0x90ed, [0x06d0] = 0x95a3, [0x06d1] = 0x9694,
-  [0x06d2] = 0x9769, [0x06d3] = 0x5b66, [0x06d4] = 0x5cb3, [0x06d5] = 0x697d,
-  [0x06d6] = 0x984d, [0x06d7] = 0x984e, [0x06d8] = 0x639b, [0x06d9] = 0x7b20,
-  [0x06da] = 0x6a2b, [0x06db] = 0x6a7f, [0x06dc] = 0x68b6, [0x06dd] = 0x9c0d,
-  [0x06de] = 0x6f5f, [0x06df] = 0x5272, [0x06e0] = 0x559d, [0x06e1] = 0x6070,
-  [0x06e2] = 0x62ec, [0x06e3] = 0x6d3b, [0x06e4] = 0x6e07, [0x06e5] = 0x6ed1,
-  [0x06e6] = 0x845b, [0x06e7] = 0x8910, [0x06e8] = 0x8f44, [0x06e9] = 0x4e14,
-  [0x06ea] = 0x9c39, [0x06eb] = 0x53f6, [0x06ec] = 0x691b, [0x06ed] = 0x6a3a,
-  [0x06ee] = 0x9784, [0x06ef] = 0x682a, [0x06f0] = 0x515c, [0x06f1] = 0x7ac3,
-  [0x06f2] = 0x84b2, [0x06f3] = 0x91dc, [0x06f4] = 0x938c, [0x06f5] = 0x565b,
-  [0x06f6] = 0x9d28, [0x06f7] = 0x6822, [0x06f8] = 0x8305, [0x06f9] = 0x8431,
-  [0x06fa] = 0x7ca5, [0x06fb] = 0x5208, [0x06fc] = 0x82c5, [0x06fd] = 0x74e6,
-  [0x06fe] = 0x4e7e, [0x06ff] = 0x4f83, [0x0700] = 0x51a0, [0x0701] = 0x5bd2,
-  [0x0702] = 0x520a, [0x0703] = 0x52d8, [0x0704] = 0x52e7, [0x0705] = 0x5dfb,
-  [0x0706] = 0x559a, [0x0707] = 0x582a, [0x0708] = 0x59e6, [0x0709] = 0x5b8c,
-  [0x070a] = 0x5b98, [0x070b] = 0x5bdb, [0x070c] = 0x5e72, [0x070d] = 0x5e79,
-  [0x070e] = 0x60a3, [0x070f] = 0x611f, [0x0710] = 0x6163, [0x0711] = 0x61be,
-  [0x0712] = 0x63db, [0x0713] = 0x6562, [0x0714] = 0x67d1, [0x0715] = 0x6853,
-  [0x0716] = 0x68fa, [0x0717] = 0x6b3e, [0x0718] = 0x6b53, [0x0719] = 0x6c57,
-  [0x071a] = 0x6f22, [0x071b] = 0x6f97, [0x071c] = 0x6f45, [0x071d] = 0x74b0,
-  [0x071e] = 0x7518, [0x071f] = 0x76e3, [0x0720] = 0x770b, [0x0721] = 0x7aff,
-  [0x0722] = 0x7ba1, [0x0723] = 0x7c21, [0x0724] = 0x7de9, [0x0725] = 0x7f36,
-  [0x0726] = 0x7ff0, [0x0727] = 0x809d, [0x0728] = 0x8266, [0x0729] = 0x839e,
-  [0x072a] = 0x89b3, [0x072b] = 0x8acc, [0x072c] = 0x8cab, [0x072d] = 0x9084,
-  [0x072e] = 0x9451, [0x072f] = 0x9593, [0x0730] = 0x9591, [0x0731] = 0x95a2,
-  [0x0732] = 0x9665, [0x0733] = 0x97d3, [0x0734] = 0x9928, [0x0735] = 0x8218,
-  [0x0736] = 0x4e38, [0x0737] = 0x542b, [0x0738] = 0x5cb8, [0x0739] = 0x5dcc,
-  [0x073a] = 0x73a9, [0x073b] = 0x764c, [0x073c] = 0x773c, [0x073d] = 0x5ca9,
-  [0x073e] = 0x7feb, [0x073f] = 0x8d0b, [0x0740] = 0x96c1, [0x0741] = 0x9811,
-  [0x0742] = 0x9854, [0x0743] = 0x9858, [0x0744] = 0x4f01, [0x0745] = 0x4f0e,
-  [0x0746] = 0x5371, [0x0747] = 0x559c, [0x0748] = 0x5668, [0x0749] = 0x57fa,
-  [0x074a] = 0x5947, [0x074b] = 0x5b09, [0x074c] = 0x5bc4, [0x074d] = 0x5c90,
-  [0x074e] = 0x5e0c, [0x074f] = 0x5e7e, [0x0750] = 0x5fcc, [0x0751] = 0x63ee,
-  [0x0752] = 0x673a, [0x0753] = 0x65d7, [0x0754] = 0x65e2, [0x0755] = 0x671f,
-  [0x0756] = 0x68cb, [0x0757] = 0x68c4, [0x0758] = 0x6a5f, [0x0759] = 0x5e30,
-  [0x075a] = 0x6bc5, [0x075b] = 0x6c17, [0x075c] = 0x6c7d, [0x075d] = 0x757f,
-  [0x075e] = 0x7948, [0x075f] = 0x5b63, [0x0760] = 0x7a00, [0x0761] = 0x7d00,
-  [0x0762] = 0x5fbd, [0x0763] = 0x898f, [0x0764] = 0x8a18, [0x0765] = 0x8cb4,
-  [0x0766] = 0x8d77, [0x0767] = 0x8ecc, [0x0768] = 0x8f1d, [0x0769] = 0x98e2,
-  [0x076a] = 0x9a0e, [0x076b] = 0x9b3c, [0x076c] = 0x4e80, [0x076d] = 0x507d,
-  [0x076e] = 0x5100, [0x076f] = 0x5993, [0x0770] = 0x5b9c, [0x0771] = 0x622f,
-  [0x0772] = 0x6280, [0x0773] = 0x64ec, [0x0774] = 0x6b3a, [0x0775] = 0x72a0,
-  [0x0776] = 0x7591, [0x0777] = 0x7947, [0x0778] = 0x7fa9, [0x0779] = 0x87fb,
-  [0x077a] = 0x8abc, [0x077b] = 0x8b70, [0x077c] = 0x63ac, [0x077d] = 0x83ca,
-  [0x077e] = 0x97a0, [0x077f] = 0x5409, [0x0780] = 0x5403, [0x0781] = 0x55ab,
-  [0x0782] = 0x6854, [0x0783] = 0x6a58, [0x0784] = 0x8a70, [0x0785] = 0x7827,
-  [0x0786] = 0x6775, [0x0787] = 0x9ecd, [0x0788] = 0x5374, [0x0789] = 0x5ba2,
-  [0x078a] = 0x811a, [0x078b] = 0x8650, [0x078c] = 0x9006, [0x078d] = 0x4e18,
-  [0x078e] = 0x4e45, [0x078f] = 0x4ec7, [0x0790] = 0x4f11, [0x0791] = 0x53ca,
-  [0x0792] = 0x5438, [0x0793] = 0x5bae, [0x0794] = 0x5f13, [0x0795] = 0x6025,
-  [0x0796] = 0x6551, [0x0797] = 0x673d, [0x0798] = 0x6c42, [0x0799] = 0x6c72,
-  [0x079a] = 0x6ce3, [0x079b] = 0x7078, [0x079c] = 0x7403, [0x079d] = 0x7a76,
-  [0x079e] = 0x7aae, [0x079f] = 0x7b08, [0x07a0] = 0x7d1a, [0x07a1] = 0x7cfe,
-  [0x07a2] = 0x7d66, [0x07a3] = 0x65e7, [0x07a4] = 0x725b, [0x07a5] = 0x53bb,
-  [0x07a6] = 0x5c45, [0x07a7] = 0x5de8, [0x07a8] = 0x62d2, [0x07a9] = 0x62e0,
-  [0x07aa] = 0x6319, [0x07ab] = 0x6e20, [0x07ac] = 0x865a, [0x07ad] = 0x8a31,
-  [0x07ae] = 0x8ddd, [0x07af] = 0x92f8, [0x07b0] = 0x6f01, [0x07b1] = 0x79a6,
-  [0x07b2] = 0x9b5a, [0x07b3] = 0x4ea8, [0x07b4] = 0x4eab, [0x07b5] = 0x4eac,
-  [0x07b6] = 0x4f9b, [0x07b7] = 0x4fa0, [0x07b8] = 0x50d1, [0x07b9] = 0x5147,
-  [0x07ba] = 0x7af6, [0x07bb] = 0x5171, [0x07bc] = 0x51f6, [0x07bd] = 0x5354,
-  [0x07be] = 0x5321, [0x07bf] = 0x537f, [0x07c0] = 0x53eb, [0x07c1] = 0x55ac,
-  [0x07c2] = 0x5883, [0x07c3] = 0x5ce1, [0x07c4] = 0x5f37, [0x07c5] = 0x5f4a,
-  [0x07c6] = 0x602f, [0x07c7] = 0x6050, [0x07c8] = 0x606d, [0x07c9] = 0x631f,
-  [0x07ca] = 0x6559, [0x07cb] = 0x6a4b, [0x07cc] = 0x6cc1, [0x07cd] = 0x72c2,
-  [0x07ce] = 0x72ed, [0x07cf] = 0x77ef, [0x07d0] = 0x80f8, [0x07d1] = 0x8105,
-  [0x07d2] = 0x8208, [0x07d3] = 0x854e, [0x07d4] = 0x90f7, [0x07d5] = 0x93e1,
-  [0x07d6] = 0x97ff, [0x07d7] = 0x9957, [0x07d8] = 0x9a5a, [0x07d9] = 0x4ef0,
-  [0x07da] = 0x51dd, [0x07db] = 0x5c2d, [0x07dc] = 0x6681, [0x07dd] = 0x696d,
-  [0x07de] = 0x5c40, [0x07df] = 0x66f2, [0x07e0] = 0x6975, [0x07e1] = 0x7389,
-  [0x07e2] = 0x6850, [0x07e3] = 0x7c81, [0x07e4] = 0x50c5, [0x07e5] = 0x52e4,
-  [0x07e6] = 0x5747, [0x07e7] = 0x5dfe, [0x07e8] = 0x9326, [0x07e9] = 0x65a4,
-  [0x07ea] = 0x6b23, [0x07eb] = 0x6b3d, [0x07ec] = 0x7434, [0x07ed] = 0x7981,
-  [0x07ee] = 0x79bd, [0x07ef] = 0x7b4b, [0x07f0] = 0x7dca, [0x07f1] = 0x82b9,
-  [0x07f2] = 0x83cc, [0x07f3] = 0x887f, [0x07f4] = 0x895f, [0x07f5] = 0x8b39,
-  [0x07f6] = 0x8fd1, [0x07f7] = 0x91d1, [0x07f8] = 0x541f, [0x07f9] = 0x9280,
-  [0x07fa] = 0x4e5d, [0x07fb] = 0x5036, [0x07fc] = 0x53e5, [0x07fd] = 0x533a,
-  [0x07fe] = 0x72d7, [0x07ff] = 0x7396, [0x0800] = 0x77e9, [0x0801] = 0x82e6,
-  [0x0802] = 0x8eaf, [0x0803] = 0x99c6, [0x0804] = 0x99c8, [0x0805] = 0x99d2,
-  [0x0806] = 0x5177, [0x0807] = 0x611a, [0x0808] = 0x865e, [0x0809] = 0x55b0,
-  [0x080a] = 0x7a7a, [0x080b] = 0x5076, [0x080c] = 0x5bd3, [0x080d] = 0x9047,
-  [0x080e] = 0x9685, [0x080f] = 0x4e32, [0x0810] = 0x6adb, [0x0811] = 0x91e7,
-  [0x0812] = 0x5c51, [0x0813] = 0x5c48, [0x0814] = 0x6398, [0x0815] = 0x7a9f,
-  [0x0816] = 0x6c93, [0x0817] = 0x9774, [0x0818] = 0x8f61, [0x0819] = 0x7aaa,
-  [0x081a] = 0x718a, [0x081b] = 0x9688, [0x081c] = 0x7c82, [0x081d] = 0x6817,
-  [0x081e] = 0x7e70, [0x081f] = 0x6851, [0x0820] = 0x936c, [0x0821] = 0x52f2,
-  [0x0822] = 0x541b, [0x0823] = 0x85ab, [0x0824] = 0x8a13, [0x0825] = 0x7fa4,
-  [0x0826] = 0x8ecd, [0x0827] = 0x90e1, [0x0828] = 0x5366, [0x0829] = 0x8888,
-  [0x082a] = 0x7941, [0x082b] = 0x4fc2, [0x082c] = 0x50be, [0x082d] = 0x5211,
-  [0x082e] = 0x5144, [0x082f] = 0x5553, [0x0830] = 0x572d, [0x0831] = 0x73ea,
-  [0x0832] = 0x578b, [0x0833] = 0x5951, [0x0834] = 0x5f62, [0x0835] = 0x5f84,
-  [0x0836] = 0x6075, [0x0837] = 0x6176, [0x0838] = 0x6167, [0x0839] = 0x61a9,
-  [0x083a] = 0x63b2, [0x083b] = 0x643a, [0x083c] = 0x656c, [0x083d] = 0x666f,
-  [0x083e] = 0x6842, [0x083f] = 0x6e13, [0x0840] = 0x7566, [0x0841] = 0x7a3d,
-  [0x0842] = 0x7cfb, [0x0843] = 0x7d4c, [0x0844] = 0x7d99, [0x0845] = 0x7e4b,
-  [0x0846] = 0x7f6b, [0x0847] = 0x830e, [0x0848] = 0x834a, [0x0849] = 0x86cd,
-  [0x084a] = 0x8a08, [0x084b] = 0x8a63, [0x084c] = 0x8b66, [0x084d] = 0x8efd,
-  [0x084e] = 0x981a, [0x084f] = 0x9d8f, [0x0850] = 0x82b8, [0x0851] = 0x8fce,
-  [0x0852] = 0x9be8, [0x0853] = 0x5287, [0x0854] = 0x621f, [0x0855] = 0x6483,
-  [0x0856] = 0x6fc0, [0x0857] = 0x9699, [0x0858] = 0x6841, [0x0859] = 0x5091,
-  [0x085a] = 0x6b20, [0x085b] = 0x6c7a, [0x085c] = 0x6f54, [0x085d] = 0x7a74,
-  [0x085e] = 0x7d50, [0x085f] = 0x8840, [0x0860] = 0x8a23, [0x0861] = 0x6708,
-  [0x0862] = 0x4ef6, [0x0863] = 0x5039, [0x0864] = 0x5026, [0x0865] = 0x5065,
-  [0x0866] = 0x517c, [0x0867] = 0x5238, [0x0868] = 0x5263, [0x0869] = 0x55a7,
-  [0x086a] = 0x570f, [0x086b] = 0x5805, [0x086c] = 0x5acc, [0x086d] = 0x5efa,
-  [0x086e] = 0x61b2, [0x086f] = 0x61f8, [0x0870] = 0x62f3, [0x0871] = 0x6372,
-  [0x0872] = 0x691c, [0x0873] = 0x6a29, [0x0874] = 0x727d, [0x0875] = 0x72ac,
-  [0x0876] = 0x732e, [0x0877] = 0x7814, [0x0878] = 0x786f, [0x0879] = 0x7d79,
-  [0x087a] = 0x770c, [0x087b] = 0x80a9, [0x087c] = 0x898b, [0x087d] = 0x8b19,
-  [0x087e] = 0x8ce2, [0x087f] = 0x8ed2, [0x0880] = 0x9063, [0x0881] = 0x9375,
-  [0x0882] = 0x967a, [0x0883] = 0x9855, [0x0884] = 0x9a13, [0x0885] = 0x9e78,
-  [0x0886] = 0x5143, [0x0887] = 0x539f, [0x0888] = 0x53b3, [0x0889] = 0x5e7b,
-  [0x088a] = 0x5f26, [0x088b] = 0x6e1b, [0x088c] = 0x6e90, [0x088d] = 0x7384,
-  [0x088e] = 0x73fe, [0x088f] = 0x7d43, [0x0890] = 0x8237, [0x0891] = 0x8a00,
-  [0x0892] = 0x8afa, [0x0893] = 0x9650, [0x0894] = 0x4e4e, [0x0895] = 0x500b,
-  [0x0896] = 0x53e4, [0x0897] = 0x547c, [0x0898] = 0x56fa, [0x0899] = 0x59d1,
-  [0x089a] = 0x5b64, [0x089b] = 0x5df1, [0x089c] = 0x5eab, [0x089d] = 0x5f27,
-  [0x089e] = 0x6238, [0x089f] = 0x6545, [0x08a0] = 0x67af, [0x08a1] = 0x6e56,
-  [0x08a2] = 0x72d0, [0x08a3] = 0x7cca, [0x08a4] = 0x88b4, [0x08a5] = 0x80a1,
-  [0x08a6] = 0x80e1, [0x08a7] = 0x83f0, [0x08a8] = 0x864e, [0x08a9] = 0x8a87,
-  [0x08aa] = 0x8de8, [0x08ab] = 0x9237, [0x08ac] = 0x96c7, [0x08ad] = 0x9867,
-  [0x08ae] = 0x9f13, [0x08af] = 0x4e94, [0x08b0] = 0x4e92, [0x08b1] = 0x4f0d,
-  [0x08b2] = 0x5348, [0x08b3] = 0x5449, [0x08b4] = 0x543e, [0x08b5] = 0x5a2f,
-  [0x08b6] = 0x5f8c, [0x08b7] = 0x5fa1, [0x08b8] = 0x609f, [0x08b9] = 0x68a7,
-  [0x08ba] = 0x6a8e, [0x08bb] = 0x745a, [0x08bc] = 0x7881, [0x08bd] = 0x8a9e,
-  [0x08be] = 0x8aa4, [0x08bf] = 0x8b77, [0x08c0] = 0x9190, [0x08c1] = 0x4e5e,
-  [0x08c2] = 0x9bc9, [0x08c3] = 0x4ea4, [0x08c4] = 0x4f7c, [0x08c5] = 0x4faf,
-  [0x08c6] = 0x5019, [0x08c7] = 0x5016, [0x08c8] = 0x5149, [0x08c9] = 0x516c,
-  [0x08ca] = 0x529f, [0x08cb] = 0x52b9, [0x08cc] = 0x52fe, [0x08cd] = 0x539a,
-  [0x08ce] = 0x53e3, [0x08cf] = 0x5411, [0x08d0] = 0x540e, [0x08d1] = 0x5589,
-  [0x08d2] = 0x5751, [0x08d3] = 0x57a2, [0x08d4] = 0x597d, [0x08d5] = 0x5b54,
-  [0x08d6] = 0x5b5d, [0x08d7] = 0x5b8f, [0x08d8] = 0x5de5, [0x08d9] = 0x5de7,
-  [0x08da] = 0x5df7, [0x08db] = 0x5e78, [0x08dc] = 0x5e83, [0x08dd] = 0x5e9a,
-  [0x08de] = 0x5eb7, [0x08df] = 0x5f18, [0x08e0] = 0x6052, [0x08e1] = 0x614c,
-  [0x08e2] = 0x6297, [0x08e3] = 0x62d8, [0x08e4] = 0x63a7, [0x08e5] = 0x653b,
-  [0x08e6] = 0x6602, [0x08e7] = 0x6643, [0x08e8] = 0x66f4, [0x08e9] = 0x676d,
-  [0x08ea] = 0x6821, [0x08eb] = 0x6897, [0x08ec] = 0x69cb, [0x08ed] = 0x6c5f,
-  [0x08ee] = 0x6d2a, [0x08ef] = 0x6d69, [0x08f0] = 0x6e2f, [0x08f1] = 0x6e9d,
-  [0x08f2] = 0x7532, [0x08f3] = 0x7687, [0x08f4] = 0x786c, [0x08f5] = 0x7a3f,
-  [0x08f6] = 0x7ce0, [0x08f7] = 0x7d05, [0x08f8] = 0x7d18, [0x08f9] = 0x7d5e,
-  [0x08fa] = 0x7db1, [0x08fb] = 0x8015, [0x08fc] = 0x8003, [0x08fd] = 0x80af,
-  [0x08fe] = 0x80b1, [0x08ff] = 0x8154, [0x0900] = 0x818f, [0x0901] = 0x822a,
-  [0x0902] = 0x8352, [0x0903] = 0x884c, [0x0904] = 0x8861, [0x0905] = 0x8b1b,
-  [0x0906] = 0x8ca2, [0x0907] = 0x8cfc, [0x0908] = 0x90ca, [0x0909] = 0x9175,
-  [0x090a] = 0x9271, [0x090b] = 0x783f, [0x090c] = 0x92fc, [0x090d] = 0x95a4,
-  [0x090e] = 0x964d, [0x090f] = 0x9805, [0x0910] = 0x9999, [0x0911] = 0x9ad8,
-  [0x0912] = 0x9d3b, [0x0913] = 0x525b, [0x0914] = 0x52ab, [0x0915] = 0x53f7,
-  [0x0916] = 0x5408, [0x0917] = 0x58d5, [0x0918] = 0x62f7, [0x0919] = 0x6fe0,
-  [0x091a] = 0x8c6a, [0x091b] = 0x8f5f, [0x091c] = 0x9eb9, [0x091d] = 0x514b,
-  [0x091e] = 0x523b, [0x091f] = 0x544a, [0x0920] = 0x56fd, [0x0921] = 0x7a40,
-  [0x0922] = 0x9177, [0x0923] = 0x9d60, [0x0924] = 0x9ed2, [0x0925] = 0x7344,
-  [0x0926] = 0x6f09, [0x0927] = 0x8170, [0x0928] = 0x7511, [0x0929] = 0x5ffd,
-  [0x092a] = 0x60da, [0x092b] = 0x9aa8, [0x092c] = 0x72db, [0x092d] = 0x8fbc,
-  [0x092e] = 0x6b64, [0x092f] = 0x9803, [0x0930] = 0x4eca, [0x0931] = 0x56f0,
-  [0x0932] = 0x5764, [0x0933] = 0x58be, [0x0934] = 0x5a5a, [0x0935] = 0x6068,
-  [0x0936] = 0x61c7, [0x0937] = 0x660f, [0x0938] = 0x6606, [0x0939] = 0x6839,
-  [0x093a] = 0x68b1, [0x093b] = 0x6df7, [0x093c] = 0x75d5, [0x093d] = 0x7d3a,
-  [0x093e] = 0x826e, [0x093f] = 0x9b42, [0x0940] = 0x4e9b, [0x0941] = 0x4f50,
-  [0x0942] = 0x53c9, [0x0943] = 0x5506, [0x0944] = 0x5d6f, [0x0945] = 0x5de6,
-  [0x0946] = 0x5dee, [0x0947] = 0x67fb, [0x0948] = 0x6c99, [0x0949] = 0x7473,
-  [0x094a] = 0x7802, [0x094b] = 0x8a50, [0x094c] = 0x9396, [0x094d] = 0x88df,
-  [0x094e] = 0x5750, [0x094f] = 0x5ea7, [0x0950] = 0x632b, [0x0951] = 0x50b5,
-  [0x0952] = 0x50ac, [0x0953] = 0x518d, [0x0954] = 0x6700, [0x0955] = 0x54c9,
-  [0x0956] = 0x585e, [0x0957] = 0x59bb, [0x0958] = 0x5bb0, [0x0959] = 0x5f69,
-  [0x095a] = 0x624d, [0x095b] = 0x63a1, [0x095c] = 0x683d, [0x095d] = 0x6b73,
-  [0x095e] = 0x6e08, [0x095f] = 0x707d, [0x0960] = 0x91c7, [0x0961] = 0x7280,
-  [0x0962] = 0x7815, [0x0963] = 0x7826, [0x0964] = 0x796d, [0x0965] = 0x658e,
-  [0x0966] = 0x7d30, [0x0967] = 0x83dc, [0x0968] = 0x88c1, [0x0969] = 0x8f09,
-  [0x096a] = 0x969b, [0x096b] = 0x5264, [0x096c] = 0x5728, [0x096d] = 0x6750,
-  [0x096e] = 0x7f6a, [0x096f] = 0x8ca1, [0x0970] = 0x51b4, [0x0971] = 0x5742,
-  [0x0972] = 0x962a, [0x0973] = 0x583a, [0x0974] = 0x698a, [0x0975] = 0x80b4,
-  [0x0976] = 0x54b2, [0x0977] = 0x5d0e, [0x0978] = 0x57fc, [0x0979] = 0x7895,
-  [0x097a] = 0x9dfa, [0x097b] = 0x4f5c, [0x097c] = 0x524a, [0x097d] = 0x548b,
-  [0x097e] = 0x643e, [0x097f] = 0x6628, [0x0980] = 0x6714, [0x0981] = 0x67f5,
-  [0x0982] = 0x7a84, [0x0983] = 0x7b56, [0x0984] = 0x7d22, [0x0985] = 0x932f,
-  [0x0986] = 0x685c, [0x0987] = 0x9bad, [0x0988] = 0x7b39, [0x0989] = 0x5319,
-  [0x098a] = 0x518a, [0x098b] = 0x5237, [0x098c] = 0x5bdf, [0x098d] = 0x62f6,
-  [0x098e] = 0x64ae, [0x098f] = 0x64e6, [0x0990] = 0x672d, [0x0991] = 0x6bba,
-  [0x0992] = 0x85a9, [0x0993] = 0x96d1, [0x0994] = 0x7690, [0x0995] = 0x9bd6,
-  [0x0996] = 0x634c, [0x0997] = 0x9306, [0x0998] = 0x9bab, [0x0999] = 0x76bf,
-  [0x099a] = 0x6652, [0x099b] = 0x4e09, [0x099c] = 0x5098, [0x099d] = 0x53c2,
-  [0x099e] = 0x5c71, [0x099f] = 0x60e8, [0x09a0] = 0x6492, [0x09a1] = 0x6563,
-  [0x09a2] = 0x685f, [0x09a3] = 0x71e6, [0x09a4] = 0x73ca, [0x09a5] = 0x7523,
-  [0x09a6] = 0x7b97, [0x09a7] = 0x7e82, [0x09a8] = 0x8695, [0x09a9] = 0x8b83,
-  [0x09aa] = 0x8cdb, [0x09ab] = 0x9178, [0x09ac] = 0x9910, [0x09ad] = 0x65ac,
-  [0x09ae] = 0x66ab, [0x09af] = 0x6b8b, [0x09b0] = 0x4ed5, [0x09b1] = 0x4ed4,
-  [0x09b2] = 0x4f3a, [0x09b3] = 0x4f7f, [0x09b4] = 0x523a, [0x09b5] = 0x53f8,
-  [0x09b6] = 0x53f2, [0x09b7] = 0x55e3, [0x09b8] = 0x56db, [0x09b9] = 0x58eb,
-  [0x09ba] = 0x59cb, [0x09bb] = 0x59c9, [0x09bc] = 0x59ff, [0x09bd] = 0x5b50,
-  [0x09be] = 0x5c4d, [0x09bf] = 0x5e02, [0x09c0] = 0x5e2b, [0x09c1] = 0x5fd7,
-  [0x09c2] = 0x601d, [0x09c3] = 0x6307, [0x09c4] = 0x652f, [0x09c5] = 0x5b5c,
-  [0x09c6] = 0x65af, [0x09c7] = 0x65bd, [0x09c8] = 0x65e8, [0x09c9] = 0x679d,
-  [0x09ca] = 0x6b62, [0x09cb] = 0x6b7b, [0x09cc] = 0x6c0f, [0x09cd] = 0x7345,
-  [0x09ce] = 0x7949, [0x09cf] = 0x79c1, [0x09d0] = 0x7cf8, [0x09d1] = 0x7d19,
-  [0x09d2] = 0x7d2b, [0x09d3] = 0x80a2, [0x09d4] = 0x8102, [0x09d5] = 0x81f3,
-  [0x09d6] = 0x8996, [0x09d7] = 0x8a5e, [0x09d8] = 0x8a69, [0x09d9] = 0x8a66,
-  [0x09da] = 0x8a8c, [0x09db] = 0x8aee, [0x09dc] = 0x8cc7, [0x09dd] = 0x8cdc,
-  [0x09de] = 0x96cc, [0x09df] = 0x98fc, [0x09e0] = 0x6b6f, [0x09e1] = 0x4e8b,
-  [0x09e2] = 0x4f3c, [0x09e3] = 0x4f8d, [0x09e4] = 0x5150, [0x09e5] = 0x5b57,
-  [0x09e6] = 0x5bfa, [0x09e7] = 0x6148, [0x09e8] = 0x6301, [0x09e9] = 0x6642,
-  [0x09ea] = 0x6b21, [0x09eb] = 0x6ecb, [0x09ec] = 0x6cbb, [0x09ed] = 0x723e,
-  [0x09ee] = 0x74bd, [0x09ef] = 0x75d4, [0x09f0] = 0x78c1, [0x09f1] = 0x793a,
-  [0x09f2] = 0x800c, [0x09f3] = 0x8033, [0x09f4] = 0x81ea, [0x09f5] = 0x8494,
-  [0x09f6] = 0x8f9e, [0x09f7] = 0x6c50, [0x09f8] = 0x9e7f, [0x09f9] = 0x5f0f,
-  [0x09fa] = 0x8b58, [0x09fb] = 0x9d2b, [0x09fc] = 0x7afa, [0x09fd] = 0x8ef8,
-  [0x09fe] = 0x5b8d, [0x09ff] = 0x96eb, [0x0a00] = 0x4e03, [0x0a01] = 0x53f1,
-  [0x0a02] = 0x57f7, [0x0a03] = 0x5931, [0x0a04] = 0x5ac9, [0x0a05] = 0x5ba4,
-  [0x0a06] = 0x6089, [0x0a07] = 0x6e7f, [0x0a08] = 0x6f06, [0x0a09] = 0x75be,
-  [0x0a0a] = 0x8cea, [0x0a0b] = 0x5b9f, [0x0a0c] = 0x8500, [0x0a0d] = 0x7be0,
-  [0x0a0e] = 0x5072, [0x0a0f] = 0x67f4, [0x0a10] = 0x829d, [0x0a11] = 0x5c61,
-  [0x0a12] = 0x854a, [0x0a13] = 0x7e1e, [0x0a14] = 0x820e, [0x0a15] = 0x5199,
-  [0x0a16] = 0x5c04, [0x0a17] = 0x6368, [0x0a18] = 0x8d66, [0x0a19] = 0x659c,
-  [0x0a1a] = 0x716e, [0x0a1b] = 0x793e, [0x0a1c] = 0x7d17, [0x0a1d] = 0x8005,
-  [0x0a1e] = 0x8b1d, [0x0a1f] = 0x8eca, [0x0a20] = 0x906e, [0x0a21] = 0x86c7,
-  [0x0a22] = 0x90aa, [0x0a23] = 0x501f, [0x0a24] = 0x52fa, [0x0a25] = 0x5c3a,
-  [0x0a26] = 0x6753, [0x0a27] = 0x707c, [0x0a28] = 0x7235, [0x0a29] = 0x914c,
-  [0x0a2a] = 0x91c8, [0x0a2b] = 0x932b, [0x0a2c] = 0x82e5, [0x0a2d] = 0x5bc2,
-  [0x0a2e] = 0x5f31, [0x0a2f] = 0x60f9, [0x0a30] = 0x4e3b, [0x0a31] = 0x53d6,
-  [0x0a32] = 0x5b88, [0x0a33] = 0x624b, [0x0a34] = 0x6731, [0x0a35] = 0x6b8a,
-  [0x0a36] = 0x72e9, [0x0a37] = 0x73e0, [0x0a38] = 0x7a2e, [0x0a39] = 0x816b,
-  [0x0a3a] = 0x8da3, [0x0a3b] = 0x9152, [0x0a3c] = 0x9996, [0x0a3d] = 0x5112,
-  [0x0a3e] = 0x53d7, [0x0a3f] = 0x546a, [0x0a40] = 0x5bff, [0x0a41] = 0x6388,
-  [0x0a42] = 0x6a39, [0x0a43] = 0x7dac, [0x0a44] = 0x9700, [0x0a45] = 0x56da,
-  [0x0a46] = 0x53ce, [0x0a47] = 0x5468, [0x0a48] = 0x5b97, [0x0a49] = 0x5c31,
-  [0x0a4a] = 0x5dde, [0x0a4b] = 0x4fee, [0x0a4c] = 0x6101, [0x0a4d] = 0x62fe,
-  [0x0a4e] = 0x6d32, [0x0a4f] = 0x79c0, [0x0a50] = 0x79cb, [0x0a51] = 0x7d42,
-  [0x0a52] = 0x7e4d, [0x0a53] = 0x7fd2, [0x0a54] = 0x81ed, [0x0a55] = 0x821f,
-  [0x0a56] = 0x8490, [0x0a57] = 0x8846, [0x0a58] = 0x8972, [0x0a59] = 0x8b90,
-  [0x0a5a] = 0x8e74, [0x0a5b] = 0x8f2f, [0x0a5c] = 0x9031, [0x0a5d] = 0x914b,
-  [0x0a5e] = 0x916c, [0x0a5f] = 0x96c6, [0x0a60] = 0x919c, [0x0a61] = 0x4ec0,
-  [0x0a62] = 0x4f4f, [0x0a63] = 0x5145, [0x0a64] = 0x5341, [0x0a65] = 0x5f93,
-  [0x0a66] = 0x620e, [0x0a67] = 0x67d4, [0x0a68] = 0x6c41, [0x0a69] = 0x6e0b,
-  [0x0a6a] = 0x7363, [0x0a6b] = 0x7e26, [0x0a6c] = 0x91cd, [0x0a6d] = 0x9283,
-  [0x0a6e] = 0x53d4, [0x0a6f] = 0x5919, [0x0a70] = 0x5bbf, [0x0a71] = 0x6dd1,
-  [0x0a72] = 0x795d, [0x0a73] = 0x7e2e, [0x0a74] = 0x7c9b, [0x0a75] = 0x587e,
-  [0x0a76] = 0x719f, [0x0a77] = 0x51fa, [0x0a78] = 0x8853, [0x0a79] = 0x8ff0,
-  [0x0a7a] = 0x4fca, [0x0a7b] = 0x5cfb, [0x0a7c] = 0x6625, [0x0a7d] = 0x77ac,
-  [0x0a7e] = 0x7ae3, [0x0a7f] = 0x821c, [0x0a80] = 0x99ff, [0x0a81] = 0x51c6,
-  [0x0a82] = 0x5faa, [0x0a83] = 0x65ec, [0x0a84] = 0x696f, [0x0a85] = 0x6b89,
-  [0x0a86] = 0x6df3, [0x0a87] = 0x6e96, [0x0a88] = 0x6f64, [0x0a89] = 0x76fe,
-  [0x0a8a] = 0x7d14, [0x0a8b] = 0x5de1, [0x0a8c] = 0x9075, [0x0a8d] = 0x9187,
-  [0x0a8e] = 0x9806, [0x0a8f] = 0x51e6, [0x0a90] = 0x521d, [0x0a91] = 0x6240,
-  [0x0a92] = 0x6691, [0x0a93] = 0x66d9, [0x0a94] = 0x6e1a, [0x0a95] = 0x5eb6,
-  [0x0a96] = 0x7dd2, [0x0a97] = 0x7f72, [0x0a98] = 0x66f8, [0x0a99] = 0x85af,
-  [0x0a9a] = 0x85f7, [0x0a9b] = 0x8af8, [0x0a9c] = 0x52a9, [0x0a9d] = 0x53d9,
-  [0x0a9e] = 0x5973, [0x0a9f] = 0x5e8f, [0x0aa0] = 0x5f90, [0x0aa1] = 0x6055,
-  [0x0aa2] = 0x92e4, [0x0aa3] = 0x9664, [0x0aa4] = 0x50b7, [0x0aa5] = 0x511f,
-  [0x0aa6] = 0x52dd, [0x0aa7] = 0x5320, [0x0aa8] = 0x5347, [0x0aa9] = 0x53ec,
-  [0x0aaa] = 0x54e8, [0x0aab] = 0x5546, [0x0aac] = 0x5531, [0x0aad] = 0x5617,
-  [0x0aae] = 0x5968, [0x0aaf] = 0x59be, [0x0ab0] = 0x5a3c, [0x0ab1] = 0x5bb5,
-  [0x0ab2] = 0x5c06, [0x0ab3] = 0x5c0f, [0x0ab4] = 0x5c11, [0x0ab5] = 0x5c1a,
-  [0x0ab6] = 0x5e84, [0x0ab7] = 0x5e8a, [0x0ab8] = 0x5ee0, [0x0ab9] = 0x5f70,
-  [0x0aba] = 0x627f, [0x0abb] = 0x6284, [0x0abc] = 0x62db, [0x0abd] = 0x638c,
-  [0x0abe] = 0x6377, [0x0abf] = 0x6607, [0x0ac0] = 0x660c, [0x0ac1] = 0x662d,
-  [0x0ac2] = 0x6676, [0x0ac3] = 0x677e, [0x0ac4] = 0x68a2, [0x0ac5] = 0x6a1f,
-  [0x0ac6] = 0x6a35, [0x0ac7] = 0x6cbc, [0x0ac8] = 0x6d88, [0x0ac9] = 0x6e09,
-  [0x0aca] = 0x6e58, [0x0acb] = 0x713c, [0x0acc] = 0x7126, [0x0acd] = 0x7167,
-  [0x0ace] = 0x75c7, [0x0acf] = 0x7701, [0x0ad0] = 0x785d, [0x0ad1] = 0x7901,
-  [0x0ad2] = 0x7965, [0x0ad3] = 0x79f0, [0x0ad4] = 0x7ae0, [0x0ad5] = 0x7b11,
-  [0x0ad6] = 0x7ca7, [0x0ad7] = 0x7d39, [0x0ad8] = 0x8096, [0x0ad9] = 0x83d6,
-  [0x0ada] = 0x848b, [0x0adb] = 0x8549, [0x0adc] = 0x885d, [0x0add] = 0x88f3,
-  [0x0ade] = 0x8a1f, [0x0adf] = 0x8a3c, [0x0ae0] = 0x8a54, [0x0ae1] = 0x8a73,
-  [0x0ae2] = 0x8c61, [0x0ae3] = 0x8cde, [0x0ae4] = 0x91a4, [0x0ae5] = 0x9266,
-  [0x0ae6] = 0x937e, [0x0ae7] = 0x9418, [0x0ae8] = 0x969c, [0x0ae9] = 0x9798,
-  [0x0aea] = 0x4e0a, [0x0aeb] = 0x4e08, [0x0aec] = 0x4e1e, [0x0aed] = 0x4e57,
-  [0x0aee] = 0x5197, [0x0aef] = 0x5270, [0x0af0] = 0x57ce, [0x0af1] = 0x5834,
-  [0x0af2] = 0x58cc, [0x0af3] = 0x5b22, [0x0af4] = 0x5e38, [0x0af5] = 0x60c5,
-  [0x0af6] = 0x64fe, [0x0af7] = 0x6761, [0x0af8] = 0x6756, [0x0af9] = 0x6d44,
-  [0x0afa] = 0x72b6, [0x0afb] = 0x7573, [0x0afc] = 0x7a63, [0x0afd] = 0x84b8,
-  [0x0afe] = 0x8b72, [0x0aff] = 0x91b8, [0x0b00] = 0x9320, [0x0b01] = 0x5631,
-  [0x0b02] = 0x57f4, [0x0b03] = 0x98fe, [0x0b04] = 0x62ed, [0x0b05] = 0x690d,
-  [0x0b06] = 0x6b96, [0x0b07] = 0x71ed, [0x0b08] = 0x7e54, [0x0b09] = 0x8077,
-  [0x0b0a] = 0x8272, [0x0b0b] = 0x89e6, [0x0b0c] = 0x98df, [0x0b0d] = 0x8755,
-  [0x0b0e] = 0x8fb1, [0x0b0f] = 0x5c3b, [0x0b10] = 0x4f38, [0x0b11] = 0x4fe1,
-  [0x0b12] = 0x4fb5, [0x0b13] = 0x5507, [0x0b14] = 0x5a20, [0x0b15] = 0x5bdd,
-  [0x0b16] = 0x5be9, [0x0b17] = 0x5fc3, [0x0b18] = 0x614e, [0x0b19] = 0x632f,
-  [0x0b1a] = 0x65b0, [0x0b1b] = 0x664b, [0x0b1c] = 0x68ee, [0x0b1d] = 0x699b,
-  [0x0b1e] = 0x6d78, [0x0b1f] = 0x6df1, [0x0b20] = 0x7533, [0x0b21] = 0x75b9,
-  [0x0b22] = 0x771f, [0x0b23] = 0x795e, [0x0b24] = 0x79e6, [0x0b25] = 0x7d33,
-  [0x0b26] = 0x81e3, [0x0b27] = 0x82af, [0x0b28] = 0x85aa, [0x0b29] = 0x89aa,
-  [0x0b2a] = 0x8a3a, [0x0b2b] = 0x8eab, [0x0b2c] = 0x8f9b, [0x0b2d] = 0x9032,
-  [0x0b2e] = 0x91dd, [0x0b2f] = 0x9707, [0x0b30] = 0x4eba, [0x0b31] = 0x4ec1,
-  [0x0b32] = 0x5203, [0x0b33] = 0x5875, [0x0b34] = 0x58ec, [0x0b35] = 0x5c0b,
-  [0x0b36] = 0x751a, [0x0b37] = 0x5c3d, [0x0b38] = 0x814e, [0x0b39] = 0x8a0a,
-  [0x0b3a] = 0x8fc5, [0x0b3b] = 0x9663, [0x0b3c] = 0x976d, [0x0b3d] = 0x7b25,
-  [0x0b3e] = 0x8acf, [0x0b3f] = 0x9808, [0x0b40] = 0x9162, [0x0b41] = 0x56f3,
-  [0x0b42] = 0x53a8, [0x0b43] = 0x9017, [0x0b44] = 0x5439, [0x0b45] = 0x5782,
-  [0x0b46] = 0x5e25, [0x0b47] = 0x63a8, [0x0b48] = 0x6c34, [0x0b49] = 0x708a,
-  [0x0b4a] = 0x7761, [0x0b4b] = 0x7c8b, [0x0b4c] = 0x7fe0, [0x0b4d] = 0x8870,
-  [0x0b4e] = 0x9042, [0x0b4f] = 0x9154, [0x0b50] = 0x9310, [0x0b51] = 0x9318,
-  [0x0b52] = 0x968f, [0x0b53] = 0x745e, [0x0b54] = 0x9ac4, [0x0b55] = 0x5d07,
-  [0x0b56] = 0x5d69, [0x0b57] = 0x6570, [0x0b58] = 0x67a2, [0x0b59] = 0x8da8,
-  [0x0b5a] = 0x96db, [0x0b5b] = 0x636e, [0x0b5c] = 0x6749, [0x0b5d] = 0x6919,
-  [0x0b5e] = 0x83c5, [0x0b5f] = 0x9817, [0x0b60] = 0x96c0, [0x0b61] = 0x88fe,
-  [0x0b62] = 0x6f84, [0x0b63] = 0x647a, [0x0b64] = 0x5bf8, [0x0b65] = 0x4e16,
-  [0x0b66] = 0x702c, [0x0b67] = 0x755d, [0x0b68] = 0x662f, [0x0b69] = 0x51c4,
-  [0x0b6a] = 0x5236, [0x0b6b] = 0x52e2, [0x0b6c] = 0x59d3, [0x0b6d] = 0x5f81,
-  [0x0b6e] = 0x6027, [0x0b6f] = 0x6210, [0x0b70] = 0x653f, [0x0b71] = 0x6574,
-  [0x0b72] = 0x661f, [0x0b73] = 0x6674, [0x0b74] = 0x68f2, [0x0b75] = 0x6816,
-  [0x0b76] = 0x6b63, [0x0b77] = 0x6e05, [0x0b78] = 0x7272, [0x0b79] = 0x751f,
-  [0x0b7a] = 0x76db, [0x0b7b] = 0x7cbe, [0x0b7c] = 0x8056, [0x0b7d] = 0x58f0,
-  [0x0b7e] = 0x88fd, [0x0b7f] = 0x897f, [0x0b80] = 0x8aa0, [0x0b81] = 0x8a93,
-  [0x0b82] = 0x8acb, [0x0b83] = 0x901d, [0x0b84] = 0x9192, [0x0b85] = 0x9752,
-  [0x0b86] = 0x9759, [0x0b87] = 0x6589, [0x0b88] = 0x7a0e, [0x0b89] = 0x8106,
-  [0x0b8a] = 0x96bb, [0x0b8b] = 0x5e2d, [0x0b8c] = 0x60dc, [0x0b8d] = 0x621a,
-  [0x0b8e] = 0x65a5, [0x0b8f] = 0x6614, [0x0b90] = 0x6790, [0x0b91] = 0x77f3,
-  [0x0b92] = 0x7a4d, [0x0b93] = 0x7c4d, [0x0b94] = 0x7e3e, [0x0b95] = 0x810a,
-  [0x0b96] = 0x8cac, [0x0b97] = 0x8d64, [0x0b98] = 0x8de1, [0x0b99] = 0x8e5f,
-  [0x0b9a] = 0x78a9, [0x0b9b] = 0x5207, [0x0b9c] = 0x62d9, [0x0b9d] = 0x63a5,
-  [0x0b9e] = 0x6442, [0x0b9f] = 0x6298, [0x0ba0] = 0x8a2d, [0x0ba1] = 0x7a83,
-  [0x0ba2] = 0x7bc0, [0x0ba3] = 0x8aac, [0x0ba4] = 0x96ea, [0x0ba5] = 0x7d76,
-  [0x0ba6] = 0x820c, [0x0ba7] = 0x8749, [0x0ba8] = 0x4ed9, [0x0ba9] = 0x5148,
-  [0x0baa] = 0x5343, [0x0bab] = 0x5360, [0x0bac] = 0x5ba3, [0x0bad] = 0x5c02,
-  [0x0bae] = 0x5c16, [0x0baf] = 0x5ddd, [0x0bb0] = 0x6226, [0x0bb1] = 0x6247,
-  [0x0bb2] = 0x64b0, [0x0bb3] = 0x6813, [0x0bb4] = 0x6834, [0x0bb5] = 0x6cc9,
-  [0x0bb6] = 0x6d45, [0x0bb7] = 0x6d17, [0x0bb8] = 0x67d3, [0x0bb9] = 0x6f5c,
-  [0x0bba] = 0x714e, [0x0bbb] = 0x717d, [0x0bbc] = 0x65cb, [0x0bbd] = 0x7a7f,
-  [0x0bbe] = 0x7bad, [0x0bbf] = 0x7dda, [0x0bc0] = 0x7e4a, [0x0bc1] = 0x7fa8,
-  [0x0bc2] = 0x817a, [0x0bc3] = 0x821b, [0x0bc4] = 0x8239, [0x0bc5] = 0x85a6,
-  [0x0bc6] = 0x8a6e, [0x0bc7] = 0x8cce, [0x0bc8] = 0x8df5, [0x0bc9] = 0x9078,
-  [0x0bca] = 0x9077, [0x0bcb] = 0x92ad, [0x0bcc] = 0x9291, [0x0bcd] = 0x9583,
-  [0x0bce] = 0x9bae, [0x0bcf] = 0x524d, [0x0bd0] = 0x5584, [0x0bd1] = 0x6f38,
-  [0x0bd2] = 0x7136, [0x0bd3] = 0x5168, [0x0bd4] = 0x7985, [0x0bd5] = 0x7e55,
-  [0x0bd6] = 0x81b3, [0x0bd7] = 0x7cce, [0x0bd8] = 0x564c, [0x0bd9] = 0x5851,
-  [0x0bda] = 0x5ca8, [0x0bdb] = 0x63aa, [0x0bdc] = 0x66fe, [0x0bdd] = 0x66fd,
-  [0x0bde] = 0x695a, [0x0bdf] = 0x72d9, [0x0be0] = 0x758f, [0x0be1] = 0x758e,
-  [0x0be2] = 0x790e, [0x0be3] = 0x7956, [0x0be4] = 0x79df, [0x0be5] = 0x7c97,
-  [0x0be6] = 0x7d20, [0x0be7] = 0x7d44, [0x0be8] = 0x8607, [0x0be9] = 0x8a34,
-  [0x0bea] = 0x963b, [0x0beb] = 0x9061, [0x0bec] = 0x9f20, [0x0bed] = 0x50e7,
-  [0x0bee] = 0x5275, [0x0bef] = 0x53cc, [0x0bf0] = 0x53e2, [0x0bf1] = 0x5009,
-  [0x0bf2] = 0x55aa, [0x0bf3] = 0x58ee, [0x0bf4] = 0x594f, [0x0bf5] = 0x723d,
-  [0x0bf6] = 0x5b8b, [0x0bf7] = 0x5c64, [0x0bf8] = 0x531d, [0x0bf9] = 0x60e3,
-  [0x0bfa] = 0x60f3, [0x0bfb] = 0x635c, [0x0bfc] = 0x6383, [0x0bfd] = 0x633f,
-  [0x0bfe] = 0x63bb, [0x0bff] = 0x64cd, [0x0c00] = 0x65e9, [0x0c01] = 0x66f9,
-  [0x0c02] = 0x5de3, [0x0c03] = 0x69cd, [0x0c04] = 0x69fd, [0x0c05] = 0x6f15,
-  [0x0c06] = 0x71e5, [0x0c07] = 0x4e89, [0x0c08] = 0x75e9, [0x0c09] = 0x76f8,
-  [0x0c0a] = 0x7a93, [0x0c0b] = 0x7cdf, [0x0c0c] = 0x7dcf, [0x0c0d] = 0x7d9c,
-  [0x0c0e] = 0x8061, [0x0c0f] = 0x8349, [0x0c10] = 0x8358, [0x0c11] = 0x846c,
-  [0x0c12] = 0x84bc, [0x0c13] = 0x85fb, [0x0c14] = 0x88c5, [0x0c15] = 0x8d70,
-  [0x0c16] = 0x9001, [0x0c17] = 0x906d, [0x0c18] = 0x9397, [0x0c19] = 0x971c,
-  [0x0c1a] = 0x9a12, [0x0c1b] = 0x50cf, [0x0c1c] = 0x5897, [0x0c1d] = 0x618e,
-  [0x0c1e] = 0x81d3, [0x0c1f] = 0x8535, [0x0c20] = 0x8d08, [0x0c21] = 0x9020,
-  [0x0c22] = 0x4fc3, [0x0c23] = 0x5074, [0x0c24] = 0x5247, [0x0c25] = 0x5373,
-  [0x0c26] = 0x606f, [0x0c27] = 0x6349, [0x0c28] = 0x675f, [0x0c29] = 0x6e2c,
-  [0x0c2a] = 0x8db3, [0x0c2b] = 0x901f, [0x0c2c] = 0x4fd7, [0x0c2d] = 0x5c5e,
-  [0x0c2e] = 0x8cca, [0x0c2f] = 0x65cf, [0x0c30] = 0x7d9a, [0x0c31] = 0x5352,
-  [0x0c32] = 0x8896, [0x0c33] = 0x5176, [0x0c34] = 0x63c3, [0x0c35] = 0x5b58,
-  [0x0c36] = 0x5b6b, [0x0c37] = 0x5c0a, [0x0c38] = 0x640d, [0x0c39] = 0x6751,
-  [0x0c3a] = 0x905c, [0x0c3b] = 0x4ed6, [0x0c3c] = 0x591a, [0x0c3d] = 0x592a,
-  [0x0c3e] = 0x6c70, [0x0c3f] = 0x8a51, [0x0c40] = 0x553e, [0x0c41] = 0x5815,
-  [0x0c42] = 0x59a5, [0x0c43] = 0x60f0, [0x0c44] = 0x6253, [0x0c45] = 0x67c1,
-  [0x0c46] = 0x8235, [0x0c47] = 0x6955, [0x0c48] = 0x9640, [0x0c49] = 0x99c4,
-  [0x0c4a] = 0x9a28, [0x0c4b] = 0x4f53, [0x0c4c] = 0x5806, [0x0c4d] = 0x5bfe,
-  [0x0c4e] = 0x8010, [0x0c4f] = 0x5cb1, [0x0c50] = 0x5e2f, [0x0c51] = 0x5f85,
-  [0x0c52] = 0x6020, [0x0c53] = 0x614b, [0x0c54] = 0x6234, [0x0c55] = 0x66ff,
-  [0x0c56] = 0x6cf0, [0x0c57] = 0x6ede, [0x0c58] = 0x80ce, [0x0c59] = 0x817f,
-  [0x0c5a] = 0x82d4, [0x0c5b] = 0x888b, [0x0c5c] = 0x8cb8, [0x0c5d] = 0x9000,
-  [0x0c5e] = 0x902e, [0x0c5f] = 0x968a, [0x0c60] = 0x9edb, [0x0c61] = 0x9bdb,
-  [0x0c62] = 0x4ee3, [0x0c63] = 0x53f0, [0x0c64] = 0x5927, [0x0c65] = 0x7b2c,
-  [0x0c66] = 0x918d, [0x0c67] = 0x984c, [0x0c68] = 0x9df9, [0x0c69] = 0x6edd,
-  [0x0c6a] = 0x7027, [0x0c6b] = 0x5353, [0x0c6c] = 0x5544, [0x0c6d] = 0x5b85,
-  [0x0c6e] = 0x6258, [0x0c6f] = 0x629e, [0x0c70] = 0x62d3, [0x0c71] = 0x6ca2,
-  [0x0c72] = 0x6fef, [0x0c73] = 0x7422, [0x0c74] = 0x8a17, [0x0c75] = 0x9438,
-  [0x0c76] = 0x6fc1, [0x0c77] = 0x8afe, [0x0c78] = 0x8338, [0x0c79] = 0x51e7,
-  [0x0c7a] = 0x86f8, [0x0c7b] = 0x53ea, [0x0c7c] = 0x53e9, [0x0c7d] = 0x4f46,
-  [0x0c7e] = 0x9054, [0x0c7f] = 0x8fb0, [0x0c80] = 0x596a, [0x0c81] = 0x8131,
-  [0x0c82] = 0x5dfd, [0x0c83] = 0x7aea, [0x0c84] = 0x8fbf, [0x0c85] = 0x68da,
-  [0x0c86] = 0x8c37, [0x0c87] = 0x72f8, [0x0c88] = 0x9c48, [0x0c89] = 0x6a3d,
-  [0x0c8a] = 0x8ab0, [0x0c8b] = 0x4e39, [0x0c8c] = 0x5358, [0x0c8d] = 0x5606,
-  [0x0c8e] = 0x5766, [0x0c8f] = 0x62c5, [0x0c90] = 0x63a2, [0x0c91] = 0x65e6,
-  [0x0c92] = 0x6b4e, [0x0c93] = 0x6de1, [0x0c94] = 0x6e5b, [0x0c95] = 0x70ad,
-  [0x0c96] = 0x77ed, [0x0c97] = 0x7aef, [0x0c98] = 0x7baa, [0x0c99] = 0x7dbb,
-  [0x0c9a] = 0x803d, [0x0c9b] = 0x80c6, [0x0c9c] = 0x86cb, [0x0c9d] = 0x8a95,
-  [0x0c9e] = 0x935b, [0x0c9f] = 0x56e3, [0x0ca0] = 0x58c7, [0x0ca1] = 0x5f3e,
-  [0x0ca2] = 0x65ad, [0x0ca3] = 0x6696, [0x0ca4] = 0x6a80, [0x0ca5] = 0x6bb5,
-  [0x0ca6] = 0x7537, [0x0ca7] = 0x8ac7, [0x0ca8] = 0x5024, [0x0ca9] = 0x77e5,
-  [0x0caa] = 0x5730, [0x0cab] = 0x5f1b, [0x0cac] = 0x6065, [0x0cad] = 0x667a,
-  [0x0cae] = 0x6c60, [0x0caf] = 0x75f4, [0x0cb0] = 0x7a1a, [0x0cb1] = 0x7f6e,
-  [0x0cb2] = 0x81f4, [0x0cb3] = 0x8718, [0x0cb4] = 0x9045, [0x0cb5] = 0x99b3,
-  [0x0cb6] = 0x7bc9, [0x0cb7] = 0x755c, [0x0cb8] = 0x7af9, [0x0cb9] = 0x7b51,
-  [0x0cba] = 0x84c4, [0x0cbb] = 0x9010, [0x0cbc] = 0x79e9, [0x0cbd] = 0x7a92,
-  [0x0cbe] = 0x8336, [0x0cbf] = 0x5ae1, [0x0cc0] = 0x7740, [0x0cc1] = 0x4e2d,
-  [0x0cc2] = 0x4ef2, [0x0cc3] = 0x5b99, [0x0cc4] = 0x5fe0, [0x0cc5] = 0x62bd,
-  [0x0cc6] = 0x663c, [0x0cc7] = 0x67f1, [0x0cc8] = 0x6ce8, [0x0cc9] = 0x866b,
-  [0x0cca] = 0x8877, [0x0ccb] = 0x8a3b, [0x0ccc] = 0x914e, [0x0ccd] = 0x92f3,
-  [0x0cce] = 0x99d0, [0x0ccf] = 0x6a17, [0x0cd0] = 0x7026, [0x0cd1] = 0x732a,
-  [0x0cd2] = 0x82e7, [0x0cd3] = 0x8457, [0x0cd4] = 0x8caf, [0x0cd5] = 0x4e01,
-  [0x0cd6] = 0x5146, [0x0cd7] = 0x51cb, [0x0cd8] = 0x558b, [0x0cd9] = 0x5bf5,
-  [0x0cda] = 0x5e16, [0x0cdb] = 0x5e33, [0x0cdc] = 0x5e81, [0x0cdd] = 0x5f14,
-  [0x0cde] = 0x5f35, [0x0cdf] = 0x5f6b, [0x0ce0] = 0x5fb4, [0x0ce1] = 0x61f2,
-  [0x0ce2] = 0x6311, [0x0ce3] = 0x66a2, [0x0ce4] = 0x671d, [0x0ce5] = 0x6f6e,
-  [0x0ce6] = 0x7252, [0x0ce7] = 0x753a, [0x0ce8] = 0x773a, [0x0ce9] = 0x8074,
-  [0x0cea] = 0x8139, [0x0ceb] = 0x8178, [0x0cec] = 0x8776, [0x0ced] = 0x8abf,
-  [0x0cee] = 0x8adc, [0x0cef] = 0x8d85, [0x0cf0] = 0x8df3, [0x0cf1] = 0x929a,
-  [0x0cf2] = 0x9577, [0x0cf3] = 0x9802, [0x0cf4] = 0x9ce5, [0x0cf5] = 0x52c5,
-  [0x0cf6] = 0x6357, [0x0cf7] = 0x76f4, [0x0cf8] = 0x6715, [0x0cf9] = 0x6c88,
-  [0x0cfa] = 0x73cd, [0x0cfb] = 0x8cc3, [0x0cfc] = 0x93ae, [0x0cfd] = 0x9673,
-  [0x0cfe] = 0x6d25, [0x0cff] = 0x589c, [0x0d00] = 0x690e, [0x0d01] = 0x69cc,
-  [0x0d02] = 0x8ffd, [0x0d03] = 0x939a, [0x0d04] = 0x75db, [0x0d05] = 0x901a,
-  [0x0d06] = 0x585a, [0x0d07] = 0x6802, [0x0d08] = 0x63b4, [0x0d09] = 0x69fb,
-  [0x0d0a] = 0x4f43, [0x0d0b] = 0x6f2c, [0x0d0c] = 0x67d8, [0x0d0d] = 0x8fbb,
-  [0x0d0e] = 0x8526, [0x0d0f] = 0x7db4, [0x0d10] = 0x9354, [0x0d11] = 0x693f,
-  [0x0d12] = 0x6f70, [0x0d13] = 0x576a, [0x0d14] = 0x58f7, [0x0d15] = 0x5b2c,
-  [0x0d16] = 0x7d2c, [0x0d17] = 0x722a, [0x0d18] = 0x540a, [0x0d19] = 0x91e3,
-  [0x0d1a] = 0x9db4, [0x0d1b] = 0x4ead, [0x0d1c] = 0x4f4e, [0x0d1d] = 0x505c,
-  [0x0d1e] = 0x5075, [0x0d1f] = 0x5243, [0x0d20] = 0x8c9e, [0x0d21] = 0x5448,
-  [0x0d22] = 0x5824, [0x0d23] = 0x5b9a, [0x0d24] = 0x5e1d, [0x0d25] = 0x5e95,
-  [0x0d26] = 0x5ead, [0x0d27] = 0x5ef7, [0x0d28] = 0x5f1f, [0x0d29] = 0x608c,
-  [0x0d2a] = 0x62b5, [0x0d2b] = 0x633a, [0x0d2c] = 0x63d0, [0x0d2d] = 0x68af,
-  [0x0d2e] = 0x6c40, [0x0d2f] = 0x7887, [0x0d30] = 0x798e, [0x0d31] = 0x7a0b,
-  [0x0d32] = 0x7de0, [0x0d33] = 0x8247, [0x0d34] = 0x8a02, [0x0d35] = 0x8ae6,
-  [0x0d36] = 0x8e44, [0x0d37] = 0x9013, [0x0d38] = 0x90b8, [0x0d39] = 0x912d,
-  [0x0d3a] = 0x91d8, [0x0d3b] = 0x9f0e, [0x0d3c] = 0x6ce5, [0x0d3d] = 0x6458,
-  [0x0d3e] = 0x64e2, [0x0d3f] = 0x6575, [0x0d40] = 0x6ef4, [0x0d41] = 0x7684,
-  [0x0d42] = 0x7b1b, [0x0d43] = 0x9069, [0x0d44] = 0x93d1, [0x0d45] = 0x6eba,
-  [0x0d46] = 0x54f2, [0x0d47] = 0x5fb9, [0x0d48] = 0x64a4, [0x0d49] = 0x8f4d,
-  [0x0d4a] = 0x8fed, [0x0d4b] = 0x9244, [0x0d4c] = 0x5178, [0x0d4d] = 0x586b,
-  [0x0d4e] = 0x5929, [0x0d4f] = 0x5c55, [0x0d50] = 0x5e97, [0x0d51] = 0x6dfb,
-  [0x0d52] = 0x7e8f, [0x0d53] = 0x751c, [0x0d54] = 0x8cbc, [0x0d55] = 0x8ee2,
-  [0x0d56] = 0x985b, [0x0d57] = 0x70b9, [0x0d58] = 0x4f1d, [0x0d59] = 0x6bbf,
-  [0x0d5a] = 0x6fb1, [0x0d5b] = 0x7530, [0x0d5c] = 0x96fb, [0x0d5d] = 0x514e,
-  [0x0d5e] = 0x5410, [0x0d5f] = 0x5835, [0x0d60] = 0x5857, [0x0d61] = 0x59ac,
-  [0x0d62] = 0x5c60, [0x0d63] = 0x5f92, [0x0d64] = 0x6597, [0x0d65] = 0x675c,
-  [0x0d66] = 0x6e21, [0x0d67] = 0x767b, [0x0d68] = 0x83df, [0x0d69] = 0x8ced,
-  [0x0d6a] = 0x9014, [0x0d6b] = 0x90fd, [0x0d6c] = 0x934d, [0x0d6d] = 0x7825,
-  [0x0d6e] = 0x783a, [0x0d6f] = 0x52aa, [0x0d70] = 0x5ea6, [0x0d71] = 0x571f,
-  [0x0d72] = 0x5974, [0x0d73] = 0x6012, [0x0d74] = 0x5012, [0x0d75] = 0x515a,
-  [0x0d76] = 0x51ac, [0x0d77] = 0x51cd, [0x0d78] = 0x5200, [0x0d79] = 0x5510,
-  [0x0d7a] = 0x5854, [0x0d7b] = 0x5858, [0x0d7c] = 0x5957, [0x0d7d] = 0x5b95,
-  [0x0d7e] = 0x5cf6, [0x0d7f] = 0x5d8b, [0x0d80] = 0x60bc, [0x0d81] = 0x6295,
-  [0x0d82] = 0x642d, [0x0d83] = 0x6771, [0x0d84] = 0x6843, [0x0d85] = 0x68bc,
-  [0x0d86] = 0x68df, [0x0d87] = 0x76d7, [0x0d88] = 0x6dd8, [0x0d89] = 0x6e6f,
-  [0x0d8a] = 0x6d9b, [0x0d8b] = 0x706f, [0x0d8c] = 0x71c8, [0x0d8d] = 0x5f53,
-  [0x0d8e] = 0x75d8, [0x0d8f] = 0x7977, [0x0d90] = 0x7b49, [0x0d91] = 0x7b54,
-  [0x0d92] = 0x7b52, [0x0d93] = 0x7cd6, [0x0d94] = 0x7d71, [0x0d95] = 0x5230,
-  [0x0d96] = 0x8463, [0x0d97] = 0x8569, [0x0d98] = 0x85e4, [0x0d99] = 0x8a0e,
-  [0x0d9a] = 0x8b04, [0x0d9b] = 0x8c46, [0x0d9c] = 0x8e0f, [0x0d9d] = 0x9003,
-  [0x0d9e] = 0x900f, [0x0d9f] = 0x9419, [0x0da0] = 0x9676, [0x0da1] = 0x982d,
-  [0x0da2] = 0x9a30, [0x0da3] = 0x95d8, [0x0da4] = 0x50cd, [0x0da5] = 0x52d5,
-  [0x0da6] = 0x540c, [0x0da7] = 0x5802, [0x0da8] = 0x5c0e, [0x0da9] = 0x61a7,
-  [0x0daa] = 0x649e, [0x0dab] = 0x6d1e, [0x0dac] = 0x77b3, [0x0dad] = 0x7ae5,
-  [0x0dae] = 0x80f4, [0x0daf] = 0x8404, [0x0db0] = 0x9053, [0x0db1] = 0x9285,
-  [0x0db2] = 0x5ce0, [0x0db3] = 0x9d07, [0x0db4] = 0x533f, [0x0db5] = 0x5f97,
-  [0x0db6] = 0x5fb3, [0x0db7] = 0x6d9c, [0x0db8] = 0x7279, [0x0db9] = 0x7763,
-  [0x0dba] = 0x79bf, [0x0dbb] = 0x7be4, [0x0dbc] = 0x6bd2, [0x0dbd] = 0x72ec,
-  [0x0dbe] = 0x8aad, [0x0dbf] = 0x6803, [0x0dc0] = 0x6a61, [0x0dc1] = 0x51f8,
-  [0x0dc2] = 0x7a81, [0x0dc3] = 0x6934, [0x0dc4] = 0x5c4a, [0x0dc5] = 0x9cf6,
-  [0x0dc6] = 0x82eb, [0x0dc7] = 0x5bc5, [0x0dc8] = 0x9149, [0x0dc9] = 0x701e,
-  [0x0dca] = 0x5678, [0x0dcb] = 0x5c6f, [0x0dcc] = 0x60c7, [0x0dcd] = 0x6566,
-  [0x0dce] = 0x6c8c, [0x0dcf] = 0x8c5a, [0x0dd0] = 0x9041, [0x0dd1] = 0x9813,
-  [0x0dd2] = 0x5451, [0x0dd3] = 0x66c7, [0x0dd4] = 0x920d, [0x0dd5] = 0x5948,
-  [0x0dd6] = 0x90a3, [0x0dd7] = 0x5185, [0x0dd8] = 0x4e4d, [0x0dd9] = 0x51ea,
-  [0x0dda] = 0x8599, [0x0ddb] = 0x8b0e, [0x0ddc] = 0x7058, [0x0ddd] = 0x637a,
-  [0x0dde] = 0x934b, [0x0ddf] = 0x6962, [0x0de0] = 0x99b4, [0x0de1] = 0x7e04,
-  [0x0de2] = 0x7577, [0x0de3] = 0x5357, [0x0de4] = 0x6960, [0x0de5] = 0x8edf,
-  [0x0de6] = 0x96e3, [0x0de7] = 0x6c5d, [0x0de8] = 0x4e8c, [0x0de9] = 0x5c3c,
-  [0x0dea] = 0x5f10, [0x0deb] = 0x8fe9, [0x0dec] = 0x5302, [0x0ded] = 0x8cd1,
-  [0x0dee] = 0x8089, [0x0def] = 0x8679, [0x0df0] = 0x5eff, [0x0df1] = 0x65e5,
-  [0x0df2] = 0x4e73, [0x0df3] = 0x5165, [0x0df4] = 0x5982, [0x0df5] = 0x5c3f,
-  [0x0df6] = 0x97ee, [0x0df7] = 0x4efb, [0x0df8] = 0x598a, [0x0df9] = 0x5fcd,
-  [0x0dfa] = 0x8a8d, [0x0dfb] = 0x6fe1, [0x0dfc] = 0x79b0, [0x0dfd] = 0x7962,
-  [0x0dfe] = 0x5be7, [0x0dff] = 0x8471, [0x0e00] = 0x732b, [0x0e01] = 0x71b1,
-  [0x0e02] = 0x5e74, [0x0e03] = 0x5ff5, [0x0e04] = 0x637b, [0x0e05] = 0x649a,
-  [0x0e06] = 0x71c3, [0x0e07] = 0x7c98, [0x0e08] = 0x4e43, [0x0e09] = 0x5efc,
-  [0x0e0a] = 0x4e4b, [0x0e0b] = 0x57dc, [0x0e0c] = 0x56a2, [0x0e0d] = 0x60a9,
-  [0x0e0e] = 0x6fc3, [0x0e0f] = 0x7d0d, [0x0e10] = 0x80fd, [0x0e11] = 0x8133,
-  [0x0e12] = 0x81bf, [0x0e13] = 0x8fb2, [0x0e14] = 0x8997, [0x0e15] = 0x86a4,
-  [0x0e16] = 0x5df4, [0x0e17] = 0x628a, [0x0e18] = 0x64ad, [0x0e19] = 0x8987,
-  [0x0e1a] = 0x6777, [0x0e1b] = 0x6ce2, [0x0e1c] = 0x6d3e, [0x0e1d] = 0x7436,
-  [0x0e1e] = 0x7834, [0x0e1f] = 0x5a46, [0x0e20] = 0x7f75, [0x0e21] = 0x82ad,
-  [0x0e22] = 0x99ac, [0x0e23] = 0x4ff3, [0x0e24] = 0x5ec3, [0x0e25] = 0x62dd,
-  [0x0e26] = 0x6392, [0x0e27] = 0x6557, [0x0e28] = 0x676f, [0x0e29] = 0x76c3,
-  [0x0e2a] = 0x724c, [0x0e2b] = 0x80cc, [0x0e2c] = 0x80ba, [0x0e2d] = 0x8f29,
-  [0x0e2e] = 0x914d, [0x0e2f] = 0x500d, [0x0e30] = 0x57f9, [0x0e31] = 0x5a92,
-  [0x0e32] = 0x6885, [0x0e33] = 0x6973, [0x0e34] = 0x7164, [0x0e35] = 0x72fd,
-  [0x0e36] = 0x8cb7, [0x0e37] = 0x58f2, [0x0e38] = 0x8ce0, [0x0e39] = 0x966a,
-  [0x0e3a] = 0x9019, [0x0e3b] = 0x877f, [0x0e3c] = 0x79e4, [0x0e3d] = 0x77e7,
-  [0x0e3e] = 0x8429, [0x0e3f] = 0x4f2f, [0x0e40] = 0x5265, [0x0e41] = 0x535a,
-  [0x0e42] = 0x62cd, [0x0e43] = 0x67cf, [0x0e44] = 0x6cca, [0x0e45] = 0x767d,
-  [0x0e46] = 0x7b94, [0x0e47] = 0x7c95, [0x0e48] = 0x8236, [0x0e49] = 0x8584,
-  [0x0e4a] = 0x8feb, [0x0e4b] = 0x66dd, [0x0e4c] = 0x6f20, [0x0e4d] = 0x7206,
-  [0x0e4e] = 0x7e1b, [0x0e4f] = 0x83ab, [0x0e50] = 0x99c1, [0x0e51] = 0x9ea6,
-  [0x0e52] = 0x51fd, [0x0e53] = 0x7bb1, [0x0e54] = 0x7872, [0x0e55] = 0x7bb8,
-  [0x0e56] = 0x8087, [0x0e57] = 0x7b48, [0x0e58] = 0x6ae8, [0x0e59] = 0x5e61,
-  [0x0e5a] = 0x808c, [0x0e5b] = 0x7551, [0x0e5c] = 0x7560, [0x0e5d] = 0x516b,
-  [0x0e5e] = 0x9262, [0x0e5f] = 0x6e8c, [0x0e60] = 0x767a, [0x0e61] = 0x9197,
-  [0x0e62] = 0x9aea, [0x0e63] = 0x4f10, [0x0e64] = 0x7f70, [0x0e65] = 0x629c,
-  [0x0e66] = 0x7b4f, [0x0e67] = 0x95a5, [0x0e68] = 0x9ce9, [0x0e69] = 0x567a,
-  [0x0e6a] = 0x5859, [0x0e6b] = 0x86e4, [0x0e6c] = 0x96bc, [0x0e6d] = 0x4f34,
-  [0x0e6e] = 0x5224, [0x0e6f] = 0x534a, [0x0e70] = 0x53cd, [0x0e71] = 0x53db,
-  [0x0e72] = 0x5e06, [0x0e73] = 0x642c, [0x0e74] = 0x6591, [0x0e75] = 0x677f,
-  [0x0e76] = 0x6c3e, [0x0e77] = 0x6c4e, [0x0e78] = 0x7248, [0x0e79] = 0x72af,
-  [0x0e7a] = 0x73ed, [0x0e7b] = 0x7554, [0x0e7c] = 0x7e41, [0x0e7d] = 0x822c,
-  [0x0e7e] = 0x85e9, [0x0e7f] = 0x8ca9, [0x0e80] = 0x7bc4, [0x0e81] = 0x91c6,
-  [0x0e82] = 0x7169, [0x0e83] = 0x9812, [0x0e84] = 0x98ef, [0x0e85] = 0x633d,
-  [0x0e86] = 0x6669, [0x0e87] = 0x756a, [0x0e88] = 0x76e4, [0x0e89] = 0x78d0,
-  [0x0e8a] = 0x8543, [0x0e8b] = 0x86ee, [0x0e8c] = 0x532a, [0x0e8d] = 0x5351,
-  [0x0e8e] = 0x5426, [0x0e8f] = 0x5983, [0x0e90] = 0x5e87, [0x0e91] = 0x5f7c,
-  [0x0e92] = 0x60b2, [0x0e93] = 0x6249, [0x0e94] = 0x6279, [0x0e95] = 0x62ab,
-  [0x0e96] = 0x6590, [0x0e97] = 0x6bd4, [0x0e98] = 0x6ccc, [0x0e99] = 0x75b2,
-  [0x0e9a] = 0x76ae, [0x0e9b] = 0x7891, [0x0e9c] = 0x79d8, [0x0e9d] = 0x7dcb,
-  [0x0e9e] = 0x7f77, [0x0e9f] = 0x80a5, [0x0ea0] = 0x88ab, [0x0ea1] = 0x8ab9,
-  [0x0ea2] = 0x8cbb, [0x0ea3] = 0x907f, [0x0ea4] = 0x975e, [0x0ea5] = 0x98db,
-  [0x0ea6] = 0x6a0b, [0x0ea7] = 0x7c38, [0x0ea8] = 0x5099, [0x0ea9] = 0x5c3e,
-  [0x0eaa] = 0x5fae, [0x0eab] = 0x6787, [0x0eac] = 0x6bd8, [0x0ead] = 0x7435,
-  [0x0eae] = 0x7709, [0x0eaf] = 0x7f8e, [0x0eb0] = 0x9f3b, [0x0eb1] = 0x67ca,
-  [0x0eb2] = 0x7a17, [0x0eb3] = 0x5339, [0x0eb4] = 0x758b, [0x0eb5] = 0x9aed,
-  [0x0eb6] = 0x5f66, [0x0eb7] = 0x819d, [0x0eb8] = 0x83f1, [0x0eb9] = 0x8098,
-  [0x0eba] = 0x5f3c, [0x0ebb] = 0x5fc5, [0x0ebc] = 0x7562, [0x0ebd] = 0x7b46,
-  [0x0ebe] = 0x903c, [0x0ebf] = 0x6867, [0x0ec0] = 0x59eb, [0x0ec1] = 0x5a9b,
-  [0x0ec2] = 0x7d10, [0x0ec3] = 0x767e, [0x0ec4] = 0x8b2c, [0x0ec5] = 0x4ff5,
-  [0x0ec6] = 0x5f6a, [0x0ec7] = 0x6a19, [0x0ec8] = 0x6c37, [0x0ec9] = 0x6f02,
-  [0x0eca] = 0x74e2, [0x0ecb] = 0x7968, [0x0ecc] = 0x8868, [0x0ecd] = 0x8a55,
-  [0x0ece] = 0x8c79, [0x0ecf] = 0x5edf, [0x0ed0] = 0x63cf, [0x0ed1] = 0x75c5,
-  [0x0ed2] = 0x79d2, [0x0ed3] = 0x82d7, [0x0ed4] = 0x9328, [0x0ed5] = 0x92f2,
-  [0x0ed6] = 0x849c, [0x0ed7] = 0x86ed, [0x0ed8] = 0x9c2d, [0x0ed9] = 0x54c1,
-  [0x0eda] = 0x5f6c, [0x0edb] = 0x658c, [0x0edc] = 0x6d5c, [0x0edd] = 0x7015,
-  [0x0ede] = 0x8ca7, [0x0edf] = 0x8cd3, [0x0ee0] = 0x983b, [0x0ee1] = 0x654f,
-  [0x0ee2] = 0x74f6, [0x0ee3] = 0x4e0d, [0x0ee4] = 0x4ed8, [0x0ee5] = 0x57e0,
-  [0x0ee6] = 0x592b, [0x0ee7] = 0x5a66, [0x0ee8] = 0x5bcc, [0x0ee9] = 0x51a8,
-  [0x0eea] = 0x5e03, [0x0eeb] = 0x5e9c, [0x0eec] = 0x6016, [0x0eed] = 0x6276,
-  [0x0eee] = 0x6577, [0x0eef] = 0x65a7, [0x0ef0] = 0x666e, [0x0ef1] = 0x6d6e,
-  [0x0ef2] = 0x7236, [0x0ef3] = 0x7b26, [0x0ef4] = 0x8150, [0x0ef5] = 0x819a,
-  [0x0ef6] = 0x8299, [0x0ef7] = 0x8b5c, [0x0ef8] = 0x8ca0, [0x0ef9] = 0x8ce6,
-  [0x0efa] = 0x8d74, [0x0efb] = 0x961c, [0x0efc] = 0x9644, [0x0efd] = 0x4fae,
-  [0x0efe] = 0x64ab, [0x0eff] = 0x6b66, [0x0f00] = 0x821e, [0x0f01] = 0x8461,
-  [0x0f02] = 0x856a, [0x0f03] = 0x90e8, [0x0f04] = 0x5c01, [0x0f05] = 0x6953,
-  [0x0f06] = 0x98a8, [0x0f07] = 0x847a, [0x0f08] = 0x8557, [0x0f09] = 0x4f0f,
-  [0x0f0a] = 0x526f, [0x0f0b] = 0x5fa9, [0x0f0c] = 0x5e45, [0x0f0d] = 0x670d,
-  [0x0f0e] = 0x798f, [0x0f0f] = 0x8179, [0x0f10] = 0x8907, [0x0f11] = 0x8986,
-  [0x0f12] = 0x6df5, [0x0f13] = 0x5f17, [0x0f14] = 0x6255, [0x0f15] = 0x6cb8,
-  [0x0f16] = 0x4ecf, [0x0f17] = 0x7269, [0x0f18] = 0x9b92, [0x0f19] = 0x5206,
-  [0x0f1a] = 0x543b, [0x0f1b] = 0x5674, [0x0f1c] = 0x58b3, [0x0f1d] = 0x61a4,
-  [0x0f1e] = 0x626e, [0x0f1f] = 0x711a, [0x0f20] = 0x596e, [0x0f21] = 0x7c89,
-  [0x0f22] = 0x7cde, [0x0f23] = 0x7d1b, [0x0f24] = 0x96f0, [0x0f25] = 0x6587,
-  [0x0f26] = 0x805e, [0x0f27] = 0x4e19, [0x0f28] = 0x4f75, [0x0f29] = 0x5175,
-  [0x0f2a] = 0x5840, [0x0f2b] = 0x5e63, [0x0f2c] = 0x5e73, [0x0f2d] = 0x5f0a,
-  [0x0f2e] = 0x67c4, [0x0f2f] = 0x4e26, [0x0f30] = 0x853d, [0x0f31] = 0x9589,
-  [0x0f32] = 0x965b, [0x0f33] = 0x7c73, [0x0f34] = 0x9801, [0x0f35] = 0x50fb,
-  [0x0f36] = 0x58c1, [0x0f37] = 0x7656, [0x0f38] = 0x78a7, [0x0f39] = 0x5225,
-  [0x0f3a] = 0x77a5, [0x0f3b] = 0x8511, [0x0f3c] = 0x7b86, [0x0f3d] = 0x504f,
-  [0x0f3e] = 0x5909, [0x0f3f] = 0x7247, [0x0f40] = 0x7bc7, [0x0f41] = 0x7de8,
-  [0x0f42] = 0x8fba, [0x0f43] = 0x8fd4, [0x0f44] = 0x904d, [0x0f45] = 0x4fbf,
-  [0x0f46] = 0x52c9, [0x0f47] = 0x5a29, [0x0f48] = 0x5f01, [0x0f49] = 0x97ad,
-  [0x0f4a] = 0x4fdd, [0x0f4b] = 0x8217, [0x0f4c] = 0x92ea, [0x0f4d] = 0x5703,
-  [0x0f4e] = 0x6355, [0x0f4f] = 0x6b69, [0x0f50] = 0x752b, [0x0f51] = 0x88dc,
-  [0x0f52] = 0x8f14, [0x0f53] = 0x7a42, [0x0f54] = 0x52df, [0x0f55] = 0x5893,
-  [0x0f56] = 0x6155, [0x0f57] = 0x620a, [0x0f58] = 0x66ae, [0x0f59] = 0x6bcd,
-  [0x0f5a] = 0x7c3f, [0x0f5b] = 0x83e9, [0x0f5c] = 0x5023, [0x0f5d] = 0x4ff8,
-  [0x0f5e] = 0x5305, [0x0f5f] = 0x5446, [0x0f60] = 0x5831, [0x0f61] = 0x5949,
-  [0x0f62] = 0x5b9d, [0x0f63] = 0x5cf0, [0x0f64] = 0x5cef, [0x0f65] = 0x5d29,
-  [0x0f66] = 0x5e96, [0x0f67] = 0x62b1, [0x0f68] = 0x6367, [0x0f69] = 0x653e,
-  [0x0f6a] = 0x65b9, [0x0f6b] = 0x670b, [0x0f6c] = 0x6cd5, [0x0f6d] = 0x6ce1,
-  [0x0f6e] = 0x70f9, [0x0f6f] = 0x7832, [0x0f70] = 0x7e2b, [0x0f71] = 0x80de,
-  [0x0f72] = 0x82b3, [0x0f73] = 0x840c, [0x0f74] = 0x84ec, [0x0f75] = 0x8702,
-  [0x0f76] = 0x8912, [0x0f77] = 0x8a2a, [0x0f78] = 0x8c4a, [0x0f79] = 0x90a6,
-  [0x0f7a] = 0x92d2, [0x0f7b] = 0x98fd, [0x0f7c] = 0x9cf3, [0x0f7d] = 0x9d6c,
-  [0x0f7e] = 0x4e4f, [0x0f7f] = 0x4ea1, [0x0f80] = 0x508d, [0x0f81] = 0x5256,
-  [0x0f82] = 0x574a, [0x0f83] = 0x59a8, [0x0f84] = 0x5e3d, [0x0f85] = 0x5fd8,
-  [0x0f86] = 0x5fd9, [0x0f87] = 0x623f, [0x0f88] = 0x66b4, [0x0f89] = 0x671b,
-  [0x0f8a] = 0x67d0, [0x0f8b] = 0x68d2, [0x0f8c] = 0x5192, [0x0f8d] = 0x7d21,
-  [0x0f8e] = 0x80aa, [0x0f8f] = 0x81a8, [0x0f90] = 0x8b00, [0x0f91] = 0x8c8c,
-  [0x0f92] = 0x8cbf, [0x0f93] = 0x927e, [0x0f94] = 0x9632, [0x0f95] = 0x5420,
-  [0x0f96] = 0x982c, [0x0f97] = 0x5317, [0x0f98] = 0x50d5, [0x0f99] = 0x535c,
-  [0x0f9a] = 0x58a8, [0x0f9b] = 0x64b2, [0x0f9c] = 0x6734, [0x0f9d] = 0x7267,
-  [0x0f9e] = 0x7766, [0x0f9f] = 0x7a46, [0x0fa0] = 0x91e6, [0x0fa1] = 0x52c3,
-  [0x0fa2] = 0x6ca1, [0x0fa3] = 0x6b86, [0x0fa4] = 0x5800, [0x0fa5] = 0x5e4c,
-  [0x0fa6] = 0x5954, [0x0fa7] = 0x672c, [0x0fa8] = 0x7ffb, [0x0fa9] = 0x51e1,
-  [0x0faa] = 0x76c6, [0x0fab] = 0x6469, [0x0fac] = 0x78e8, [0x0fad] = 0x9b54,
-  [0x0fae] = 0x9ebb, [0x0faf] = 0x57cb, [0x0fb0] = 0x59b9, [0x0fb1] = 0x6627,
-  [0x0fb2] = 0x679a, [0x0fb3] = 0x6bce, [0x0fb4] = 0x54e9, [0x0fb5] = 0x69d9,
-  [0x0fb6] = 0x5e55, [0x0fb7] = 0x819c, [0x0fb8] = 0x6795, [0x0fb9] = 0x9baa,
-  [0x0fba] = 0x67fe, [0x0fbb] = 0x9c52, [0x0fbc] = 0x685d, [0x0fbd] = 0x4ea6,
-  [0x0fbe] = 0x4fe3, [0x0fbf] = 0x53c8, [0x0fc0] = 0x62b9, [0x0fc1] = 0x672b,
-  [0x0fc2] = 0x6cab, [0x0fc3] = 0x8fc4, [0x0fc4] = 0x4fad, [0x0fc5] = 0x7e6d,
-  [0x0fc6] = 0x9ebf, [0x0fc7] = 0x4e07, [0x0fc8] = 0x6162, [0x0fc9] = 0x6e80,
-  [0x0fca] = 0x6f2b, [0x0fcb] = 0x8513, [0x0fcc] = 0x5473, [0x0fcd] = 0x672a,
-  [0x0fce] = 0x9b45, [0x0fcf] = 0x5df3, [0x0fd0] = 0x7b95, [0x0fd1] = 0x5cac,
-  [0x0fd2] = 0x5bc6, [0x0fd3] = 0x871c, [0x0fd4] = 0x6e4a, [0x0fd5] = 0x84d1,
-  [0x0fd6] = 0x7a14, [0x0fd7] = 0x8108, [0x0fd8] = 0x5999, [0x0fd9] = 0x7c8d,
-  [0x0fda] = 0x6c11, [0x0fdb] = 0x7720, [0x0fdc] = 0x52d9, [0x0fdd] = 0x5922,
-  [0x0fde] = 0x7121, [0x0fdf] = 0x725f, [0x0fe0] = 0x77db, [0x0fe1] = 0x9727,
-  [0x0fe2] = 0x9d61, [0x0fe3] = 0x690b, [0x0fe4] = 0x5a7f, [0x0fe5] = 0x5a18,
-  [0x0fe6] = 0x51a5, [0x0fe7] = 0x540d, [0x0fe8] = 0x547d, [0x0fe9] = 0x660e,
-  [0x0fea] = 0x76df, [0x0feb] = 0x8ff7, [0x0fec] = 0x9298, [0x0fed] = 0x9cf4,
-  [0x0fee] = 0x59ea, [0x0fef] = 0x725d, [0x0ff0] = 0x6ec5, [0x0ff1] = 0x514d,
-  [0x0ff2] = 0x68c9, [0x0ff3] = 0x7dbf, [0x0ff4] = 0x7dec, [0x0ff5] = 0x9762,
-  [0x0ff6] = 0x9eba, [0x0ff7] = 0x6478, [0x0ff8] = 0x6a21, [0x0ff9] = 0x8302,
-  [0x0ffa] = 0x5984, [0x0ffb] = 0x5b5f, [0x0ffc] = 0x6bdb, [0x0ffd] = 0x731b,
-  [0x0ffe] = 0x76f2, [0x0fff] = 0x7db2, [0x1000] = 0x8017, [0x1001] = 0x8499,
-  [0x1002] = 0x5132, [0x1003] = 0x6728, [0x1004] = 0x9ed9, [0x1005] = 0x76ee,
-  [0x1006] = 0x6762, [0x1007] = 0x52ff, [0x1008] = 0x9905, [0x1009] = 0x5c24,
-  [0x100a] = 0x623b, [0x100b] = 0x7c7e, [0x100c] = 0x8cb0, [0x100d] = 0x554f,
-  [0x100e] = 0x60b6, [0x100f] = 0x7d0b, [0x1010] = 0x9580, [0x1011] = 0x5301,
-  [0x1012] = 0x4e5f, [0x1013] = 0x51b6, [0x1014] = 0x591c, [0x1015] = 0x723a,
-  [0x1016] = 0x8036, [0x1017] = 0x91ce, [0x1018] = 0x5f25, [0x1019] = 0x77e2,
-  [0x101a] = 0x5384, [0x101b] = 0x5f79, [0x101c] = 0x7d04, [0x101d] = 0x85ac,
-  [0x101e] = 0x8a33, [0x101f] = 0x8e8d, [0x1020] = 0x9756, [0x1021] = 0x67f3,
-  [0x1022] = 0x85ae, [0x1023] = 0x9453, [0x1024] = 0x6109, [0x1025] = 0x6108,
-  [0x1026] = 0x6cb9, [0x1027] = 0x7652, [0x1028] = 0x8aed, [0x1029] = 0x8f38,
-  [0x102a] = 0x552f, [0x102b] = 0x4f51, [0x102c] = 0x512a, [0x102d] = 0x52c7,
-  [0x102e] = 0x53cb, [0x102f] = 0x5ba5, [0x1030] = 0x5e7d, [0x1031] = 0x60a0,
-  [0x1032] = 0x6182, [0x1033] = 0x63d6, [0x1034] = 0x6709, [0x1035] = 0x67da,
-  [0x1036] = 0x6e67, [0x1037] = 0x6d8c, [0x1038] = 0x7336, [0x1039] = 0x7337,
-  [0x103a] = 0x7531, [0x103b] = 0x7950, [0x103c] = 0x88d5, [0x103d] = 0x8a98,
-  [0x103e] = 0x904a, [0x103f] = 0x9091, [0x1040] = 0x90f5, [0x1041] = 0x96c4,
-  [0x1042] = 0x878d, [0x1043] = 0x5915, [0x1044] = 0x4e88, [0x1045] = 0x4f59,
-  [0x1046] = 0x4e0e, [0x1047] = 0x8a89, [0x1048] = 0x8f3f, [0x1049] = 0x9810,
-  [0x104a] = 0x50ad, [0x104b] = 0x5e7c, [0x104c] = 0x5996, [0x104d] = 0x5bb9,
-  [0x104e] = 0x5eb8, [0x104f] = 0x63da, [0x1050] = 0x63fa, [0x1051] = 0x64c1,
-  [0x1052] = 0x66dc, [0x1053] = 0x694a, [0x1054] = 0x69d8, [0x1055] = 0x6d0b,
-  [0x1056] = 0x6eb6, [0x1057] = 0x7194, [0x1058] = 0x7528, [0x1059] = 0x7aaf,
-  [0x105a] = 0x7f8a, [0x105b] = 0x8000, [0x105c] = 0x8449, [0x105d] = 0x84c9,
-  [0x105e] = 0x8981, [0x105f] = 0x8b21, [0x1060] = 0x8e0a, [0x1061] = 0x9065,
-  [0x1062] = 0x967d, [0x1063] = 0x990a, [0x1064] = 0x617e, [0x1065] = 0x6291,
-  [0x1066] = 0x6b32, [0x1067] = 0x6c83, [0x1068] = 0x6d74, [0x1069] = 0x7fcc,
-  [0x106a] = 0x7ffc, [0x106b] = 0x6dc0, [0x106c] = 0x7f85, [0x106d] = 0x87ba,
-  [0x106e] = 0x88f8, [0x106f] = 0x6765, [0x1070] = 0x83b1, [0x1071] = 0x983c,
-  [0x1072] = 0x96f7, [0x1073] = 0x6d1b, [0x1074] = 0x7d61, [0x1075] = 0x843d,
-  [0x1076] = 0x916a, [0x1077] = 0x4e71, [0x1078] = 0x5375, [0x1079] = 0x5d50,
-  [0x107a] = 0x6b04, [0x107b] = 0x6feb, [0x107c] = 0x85cd, [0x107d] = 0x862d,
-  [0x107e] = 0x89a7, [0x107f] = 0x5229, [0x1080] = 0x540f, [0x1081] = 0x5c65,
-  [0x1082] = 0x674e, [0x1083] = 0x68a8, [0x1084] = 0x7406, [0x1085] = 0x7483,
-  [0x1086] = 0x75e2, [0x1087] = 0x88cf, [0x1088] = 0x88e1, [0x1089] = 0x91cc,
-  [0x108a] = 0x96e2, [0x108b] = 0x9678, [0x108c] = 0x5f8b, [0x108d] = 0x7387,
-  [0x108e] = 0x7acb, [0x108f] = 0x844e, [0x1090] = 0x63a0, [0x1091] = 0x7565,
-  [0x1092] = 0x5289, [0x1093] = 0x6d41, [0x1094] = 0x6e9c, [0x1095] = 0x7409,
-  [0x1096] = 0x7559, [0x1097] = 0x786b, [0x1098] = 0x7c92, [0x1099] = 0x9686,
-  [0x109a] = 0x7adc, [0x109b] = 0x9f8d, [0x109c] = 0x4fb6, [0x109d] = 0x616e,
-  [0x109e] = 0x65c5, [0x109f] = 0x865c, [0x10a0] = 0x4e86, [0x10a1] = 0x4eae,
-  [0x10a2] = 0x50da, [0x10a3] = 0x4e21, [0x10a4] = 0x51cc, [0x10a5] = 0x5bee,
-  [0x10a6] = 0x6599, [0x10a7] = 0x6881, [0x10a8] = 0x6dbc, [0x10a9] = 0x731f,
-  [0x10aa] = 0x7642, [0x10ab] = 0x77ad, [0x10ac] = 0x7a1c, [0x10ad] = 0x7ce7,
-  [0x10ae] = 0x826f, [0x10af] = 0x8ad2, [0x10b0] = 0x907c, [0x10b1] = 0x91cf,
-  [0x10b2] = 0x9675, [0x10b3] = 0x9818, [0x10b4] = 0x529b, [0x10b5] = 0x7dd1,
-  [0x10b6] = 0x502b, [0x10b7] = 0x5398, [0x10b8] = 0x6797, [0x10b9] = 0x6dcb,
-  [0x10ba] = 0x71d0, [0x10bb] = 0x7433, [0x10bc] = 0x81e8, [0x10bd] = 0x8f2a,
-  [0x10be] = 0x96a3, [0x10bf] = 0x9c57, [0x10c0] = 0x9e9f, [0x10c1] = 0x7460,
-  [0x10c2] = 0x5841, [0x10c3] = 0x6d99, [0x10c4] = 0x7d2f, [0x10c5] = 0x985e,
-  [0x10c6] = 0x4ee4, [0x10c7] = 0x4f36, [0x10c8] = 0x4f8b, [0x10c9] = 0x51b7,
-  [0x10ca] = 0x52b1, [0x10cb] = 0x5dba, [0x10cc] = 0x601c, [0x10cd] = 0x73b2,
-  [0x10ce] = 0x793c, [0x10cf] = 0x82d3, [0x10d0] = 0x9234, [0x10d1] = 0x96b7,
-  [0x10d2] = 0x96f6, [0x10d3] = 0x970a, [0x10d4] = 0x9e97, [0x10d5] = 0x9f62,
-  [0x10d6] = 0x66a6, [0x10d7] = 0x6b74, [0x10d8] = 0x5217, [0x10d9] = 0x52a3,
-  [0x10da] = 0x70c8, [0x10db] = 0x88c2, [0x10dc] = 0x5ec9, [0x10dd] = 0x604b,
-  [0x10de] = 0x6190, [0x10df] = 0x6f23, [0x10e0] = 0x7149, [0x10e1] = 0x7c3e,
-  [0x10e2] = 0x7df4, [0x10e3] = 0x806f, [0x10e4] = 0x84ee, [0x10e5] = 0x9023,
-  [0x10e6] = 0x932c, [0x10e7] = 0x5442, [0x10e8] = 0x9b6f, [0x10e9] = 0x6ad3,
-  [0x10ea] = 0x7089, [0x10eb] = 0x8cc2, [0x10ec] = 0x8def, [0x10ed] = 0x9732,
-  [0x10ee] = 0x52b4, [0x10ef] = 0x5a41, [0x10f0] = 0x5eca, [0x10f1] = 0x5f04,
-  [0x10f2] = 0x6717, [0x10f3] = 0x697c, [0x10f4] = 0x6994, [0x10f5] = 0x6d6a,
-  [0x10f6] = 0x6f0f, [0x10f7] = 0x7262, [0x10f8] = 0x72fc, [0x10f9] = 0x7bed,
-  [0x10fa] = 0x8001, [0x10fb] = 0x807e, [0x10fc] = 0x874b, [0x10fd] = 0x90ce,
-  [0x10fe] = 0x516d, [0x10ff] = 0x9e93, [0x1100] = 0x7984, [0x1101] = 0x808b,
-  [0x1102] = 0x9332, [0x1103] = 0x8ad6, [0x1104] = 0x502d, [0x1105] = 0x548c,
-  [0x1106] = 0x8a71, [0x1107] = 0x6b6a, [0x1108] = 0x8cc4, [0x1109] = 0x8107,
-  [0x110a] = 0x60d1, [0x110b] = 0x67a0, [0x110c] = 0x9df2, [0x110d] = 0x4e99,
-  [0x110e] = 0x4e98, [0x110f] = 0x9c10, [0x1110] = 0x8a6b, [0x1111] = 0x85c1,
-  [0x1112] = 0x8568, [0x1113] = 0x6900, [0x1114] = 0x6e7e, [0x1115] = 0x7897,
-  [0x1116] = 0x8155, [0x1142] = 0x5f0c, [0x1143] = 0x4e10, [0x1144] = 0x4e15,
-  [0x1145] = 0x4e2a, [0x1146] = 0x4e31, [0x1147] = 0x4e36, [0x1148] = 0x4e3c,
-  [0x1149] = 0x4e3f, [0x114a] = 0x4e42, [0x114b] = 0x4e56, [0x114c] = 0x4e58,
-  [0x114d] = 0x4e82, [0x114e] = 0x4e85, [0x114f] = 0x8c6b, [0x1150] = 0x4e8a,
-  [0x1151] = 0x8212, [0x1152] = 0x5f0d, [0x1153] = 0x4e8e, [0x1154] = 0x4e9e,
-  [0x1155] = 0x4e9f, [0x1156] = 0x4ea0, [0x1157] = 0x4ea2, [0x1158] = 0x4eb0,
-  [0x1159] = 0x4eb3, [0x115a] = 0x4eb6, [0x115b] = 0x4ece, [0x115c] = 0x4ecd,
-  [0x115d] = 0x4ec4, [0x115e] = 0x4ec6, [0x115f] = 0x4ec2, [0x1160] = 0x4ed7,
-  [0x1161] = 0x4ede, [0x1162] = 0x4eed, [0x1163] = 0x4edf, [0x1164] = 0x4ef7,
-  [0x1165] = 0x4f09, [0x1166] = 0x4f5a, [0x1167] = 0x4f30, [0x1168] = 0x4f5b,
-  [0x1169] = 0x4f5d, [0x116a] = 0x4f57, [0x116b] = 0x4f47, [0x116c] = 0x4f76,
-  [0x116d] = 0x4f88, [0x116e] = 0x4f8f, [0x116f] = 0x4f98, [0x1170] = 0x4f7b,
-  [0x1171] = 0x4f69, [0x1172] = 0x4f70, [0x1173] = 0x4f91, [0x1174] = 0x4f6f,
-  [0x1175] = 0x4f86, [0x1176] = 0x4f96, [0x1177] = 0x5118, [0x1178] = 0x4fd4,
-  [0x1179] = 0x4fdf, [0x117a] = 0x4fce, [0x117b] = 0x4fd8, [0x117c] = 0x4fdb,
-  [0x117d] = 0x4fd1, [0x117e] = 0x4fda, [0x117f] = 0x4fd0, [0x1180] = 0x4fe4,
-  [0x1181] = 0x4fe5, [0x1182] = 0x501a, [0x1183] = 0x5028, [0x1184] = 0x5014,
-  [0x1185] = 0x502a, [0x1186] = 0x5025, [0x1187] = 0x5005, [0x1188] = 0x4f1c,
-  [0x1189] = 0x4ff6, [0x118a] = 0x5021, [0x118b] = 0x5029, [0x118c] = 0x502c,
-  [0x118d] = 0x4ffe, [0x118e] = 0x4fef, [0x118f] = 0x5011, [0x1190] = 0x5006,
-  [0x1191] = 0x5043, [0x1192] = 0x5047, [0x1193] = 0x6703, [0x1194] = 0x5055,
-  [0x1195] = 0x5050, [0x1196] = 0x5048, [0x1197] = 0x505a, [0x1198] = 0x5056,
-  [0x1199] = 0x506c, [0x119a] = 0x5078, [0x119b] = 0x5080, [0x119c] = 0x509a,
-  [0x119d] = 0x5085, [0x119e] = 0x50b4, [0x119f] = 0x50b2, [0x11a0] = 0x50c9,
-  [0x11a1] = 0x50ca, [0x11a2] = 0x50b3, [0x11a3] = 0x50c2, [0x11a4] = 0x50d6,
-  [0x11a5] = 0x50de, [0x11a6] = 0x50e5, [0x11a7] = 0x50ed, [0x11a8] = 0x50e3,
-  [0x11a9] = 0x50ee, [0x11aa] = 0x50f9, [0x11ab] = 0x50f5, [0x11ac] = 0x5109,
-  [0x11ad] = 0x5101, [0x11ae] = 0x5102, [0x11af] = 0x5116, [0x11b0] = 0x5115,
-  [0x11b1] = 0x5114, [0x11b2] = 0x511a, [0x11b3] = 0x5121, [0x11b4] = 0x513a,
-  [0x11b5] = 0x5137, [0x11b6] = 0x513c, [0x11b7] = 0x513b, [0x11b8] = 0x513f,
-  [0x11b9] = 0x5140, [0x11ba] = 0x5152, [0x11bb] = 0x514c, [0x11bc] = 0x5154,
-  [0x11bd] = 0x5162, [0x11be] = 0x7af8, [0x11bf] = 0x5169, [0x11c0] = 0x516a,
-  [0x11c1] = 0x516e, [0x11c2] = 0x5180, [0x11c3] = 0x5182, [0x11c4] = 0x56d8,
-  [0x11c5] = 0x518c, [0x11c6] = 0x5189, [0x11c7] = 0x518f, [0x11c8] = 0x5191,
-  [0x11c9] = 0x5193, [0x11ca] = 0x5195, [0x11cb] = 0x5196, [0x11cc] = 0x51a4,
-  [0x11cd] = 0x51a6, [0x11ce] = 0x51a2, [0x11cf] = 0x51a9, [0x11d0] = 0x51aa,
-  [0x11d1] = 0x51ab, [0x11d2] = 0x51b3, [0x11d3] = 0x51b1, [0x11d4] = 0x51b2,
-  [0x11d5] = 0x51b0, [0x11d6] = 0x51b5, [0x11d7] = 0x51bd, [0x11d8] = 0x51c5,
-  [0x11d9] = 0x51c9, [0x11da] = 0x51db, [0x11db] = 0x51e0, [0x11dc] = 0x8655,
-  [0x11dd] = 0x51e9, [0x11de] = 0x51ed, [0x11df] = 0x51f0, [0x11e0] = 0x51f5,
-  [0x11e1] = 0x51fe, [0x11e2] = 0x5204, [0x11e3] = 0x520b, [0x11e4] = 0x5214,
-  [0x11e5] = 0x520e, [0x11e6] = 0x5227, [0x11e7] = 0x522a, [0x11e8] = 0x522e,
-  [0x11e9] = 0x5233, [0x11ea] = 0x5239, [0x11eb] = 0x524f, [0x11ec] = 0x5244,
-  [0x11ed] = 0x524b, [0x11ee] = 0x524c, [0x11ef] = 0x525e, [0x11f0] = 0x5254,
-  [0x11f1] = 0x526a, [0x11f2] = 0x5274, [0x11f3] = 0x5269, [0x11f4] = 0x5273,
-  [0x11f5] = 0x527f, [0x11f6] = 0x527d, [0x11f7] = 0x528d, [0x11f8] = 0x5294,
-  [0x11f9] = 0x5292, [0x11fa] = 0x5271, [0x11fb] = 0x5288, [0x11fc] = 0x5291,
-  [0x11fd] = 0x8fa8, [0x11fe] = 0x8fa7, [0x11ff] = 0x52ac, [0x1200] = 0x52ad,
-  [0x1201] = 0x52bc, [0x1202] = 0x52b5, [0x1203] = 0x52c1, [0x1204] = 0x52cd,
-  [0x1205] = 0x52d7, [0x1206] = 0x52de, [0x1207] = 0x52e3, [0x1208] = 0x52e6,
-  [0x1209] = 0x98ed, [0x120a] = 0x52e0, [0x120b] = 0x52f3, [0x120c] = 0x52f5,
-  [0x120d] = 0x52f8, [0x120e] = 0x52f9, [0x120f] = 0x5306, [0x1210] = 0x5308,
-  [0x1211] = 0x7538, [0x1212] = 0x530d, [0x1213] = 0x5310, [0x1214] = 0x530f,
-  [0x1215] = 0x5315, [0x1216] = 0x531a, [0x1217] = 0x5323, [0x1218] = 0x532f,
-  [0x1219] = 0x5331, [0x121a] = 0x5333, [0x121b] = 0x5338, [0x121c] = 0x5340,
-  [0x121d] = 0x5346, [0x121e] = 0x5345, [0x121f] = 0x4e17, [0x1220] = 0x5349,
-  [0x1221] = 0x534d, [0x1222] = 0x51d6, [0x1223] = 0x535e, [0x1224] = 0x5369,
-  [0x1225] = 0x536e, [0x1226] = 0x5918, [0x1227] = 0x537b, [0x1228] = 0x5377,
-  [0x1229] = 0x5382, [0x122a] = 0x5396, [0x122b] = 0x53a0, [0x122c] = 0x53a6,
-  [0x122d] = 0x53a5, [0x122e] = 0x53ae, [0x122f] = 0x53b0, [0x1230] = 0x53b6,
-  [0x1231] = 0x53c3, [0x1232] = 0x7c12, [0x1233] = 0x96d9, [0x1234] = 0x53df,
-  [0x1235] = 0x66fc, [0x1236] = 0x71ee, [0x1237] = 0x53ee, [0x1238] = 0x53e8,
-  [0x1239] = 0x53ed, [0x123a] = 0x53fa, [0x123b] = 0x5401, [0x123c] = 0x543d,
-  [0x123d] = 0x5440, [0x123e] = 0x542c, [0x123f] = 0x542d, [0x1240] = 0x543c,
-  [0x1241] = 0x542e, [0x1242] = 0x5436, [0x1243] = 0x5429, [0x1244] = 0x541d,
-  [0x1245] = 0x544e, [0x1246] = 0x548f, [0x1247] = 0x5475, [0x1248] = 0x548e,
-  [0x1249] = 0x545f, [0x124a] = 0x5471, [0x124b] = 0x5477, [0x124c] = 0x5470,
-  [0x124d] = 0x5492, [0x124e] = 0x547b, [0x124f] = 0x5480, [0x1250] = 0x5476,
-  [0x1251] = 0x5484, [0x1252] = 0x5490, [0x1253] = 0x5486, [0x1254] = 0x54c7,
-  [0x1255] = 0x54a2, [0x1256] = 0x54b8, [0x1257] = 0x54a5, [0x1258] = 0x54ac,
-  [0x1259] = 0x54c4, [0x125a] = 0x54c8, [0x125b] = 0x54a8, [0x125c] = 0x54ab,
-  [0x125d] = 0x54c2, [0x125e] = 0x54a4, [0x125f] = 0x54be, [0x1260] = 0x54bc,
-  [0x1261] = 0x54d8, [0x1262] = 0x54e5, [0x1263] = 0x54e6, [0x1264] = 0x550f,
-  [0x1265] = 0x5514, [0x1266] = 0x54fd, [0x1267] = 0x54ee, [0x1268] = 0x54ed,
-  [0x1269] = 0x54fa, [0x126a] = 0x54e2, [0x126b] = 0x5539, [0x126c] = 0x5540,
-  [0x126d] = 0x5563, [0x126e] = 0x554c, [0x126f] = 0x552e, [0x1270] = 0x555c,
-  [0x1271] = 0x5545, [0x1272] = 0x5556, [0x1273] = 0x5557, [0x1274] = 0x5538,
-  [0x1275] = 0x5533, [0x1276] = 0x555d, [0x1277] = 0x5599, [0x1278] = 0x5580,
-  [0x1279] = 0x54af, [0x127a] = 0x558a, [0x127b] = 0x559f, [0x127c] = 0x557b,
-  [0x127d] = 0x557e, [0x127e] = 0x5598, [0x127f] = 0x559e, [0x1280] = 0x55ae,
-  [0x1281] = 0x557c, [0x1282] = 0x5583, [0x1283] = 0x55a9, [0x1284] = 0x5587,
-  [0x1285] = 0x55a8, [0x1286] = 0x55da, [0x1287] = 0x55c5, [0x1288] = 0x55df,
-  [0x1289] = 0x55c4, [0x128a] = 0x55dc, [0x128b] = 0x55e4, [0x128c] = 0x55d4,
-  [0x128d] = 0x5614, [0x128e] = 0x55f7, [0x128f] = 0x5616, [0x1290] = 0x55fe,
-  [0x1291] = 0x55fd, [0x1292] = 0x561b, [0x1293] = 0x55f9, [0x1294] = 0x564e,
-  [0x1295] = 0x5650, [0x1296] = 0x71df, [0x1297] = 0x5634, [0x1298] = 0x5636,
-  [0x1299] = 0x5632, [0x129a] = 0x5638, [0x129b] = 0x566b, [0x129c] = 0x5664,
-  [0x129d] = 0x562f, [0x129e] = 0x566c, [0x129f] = 0x566a, [0x12a0] = 0x5686,
-  [0x12a1] = 0x5680, [0x12a2] = 0x568a, [0x12a3] = 0x56a0, [0x12a4] = 0x5694,
-  [0x12a5] = 0x568f, [0x12a6] = 0x56a5, [0x12a7] = 0x56ae, [0x12a8] = 0x56b6,
-  [0x12a9] = 0x56b4, [0x12aa] = 0x56c2, [0x12ab] = 0x56bc, [0x12ac] = 0x56c1,
-  [0x12ad] = 0x56c3, [0x12ae] = 0x56c0, [0x12af] = 0x56c8, [0x12b0] = 0x56ce,
-  [0x12b1] = 0x56d1, [0x12b2] = 0x56d3, [0x12b3] = 0x56d7, [0x12b4] = 0x56ee,
-  [0x12b5] = 0x56f9, [0x12b6] = 0x5700, [0x12b7] = 0x56ff, [0x12b8] = 0x5704,
-  [0x12b9] = 0x5709, [0x12ba] = 0x5708, [0x12bb] = 0x570b, [0x12bc] = 0x570d,
-  [0x12bd] = 0x5713, [0x12be] = 0x5718, [0x12bf] = 0x5716, [0x12c0] = 0x55c7,
-  [0x12c1] = 0x571c, [0x12c2] = 0x5726, [0x12c3] = 0x5737, [0x12c4] = 0x5738,
-  [0x12c5] = 0x574e, [0x12c6] = 0x573b, [0x12c7] = 0x5740, [0x12c8] = 0x574f,
-  [0x12c9] = 0x5769, [0x12ca] = 0x57c0, [0x12cb] = 0x5788, [0x12cc] = 0x5761,
-  [0x12cd] = 0x577f, [0x12ce] = 0x5789, [0x12cf] = 0x5793, [0x12d0] = 0x57a0,
-  [0x12d1] = 0x57b3, [0x12d2] = 0x57a4, [0x12d3] = 0x57aa, [0x12d4] = 0x57b0,
-  [0x12d5] = 0x57c3, [0x12d6] = 0x57c6, [0x12d7] = 0x57d4, [0x12d8] = 0x57d2,
-  [0x12d9] = 0x57d3, [0x12da] = 0x580a, [0x12db] = 0x57d6, [0x12dc] = 0x57e3,
-  [0x12dd] = 0x580b, [0x12de] = 0x5819, [0x12df] = 0x581d, [0x12e0] = 0x5872,
-  [0x12e1] = 0x5821, [0x12e2] = 0x5862, [0x12e3] = 0x584b, [0x12e4] = 0x5870,
-  [0x12e5] = 0x6bc0, [0x12e6] = 0x5852, [0x12e7] = 0x583d, [0x12e8] = 0x5879,
-  [0x12e9] = 0x5885, [0x12ea] = 0x58b9, [0x12eb] = 0x589f, [0x12ec] = 0x58ab,
-  [0x12ed] = 0x58ba, [0x12ee] = 0x58de, [0x12ef] = 0x58bb, [0x12f0] = 0x58b8,
-  [0x12f1] = 0x58ae, [0x12f2] = 0x58c5, [0x12f3] = 0x58d3, [0x12f4] = 0x58d1,
-  [0x12f5] = 0x58d7, [0x12f6] = 0x58d9, [0x12f7] = 0x58d8, [0x12f8] = 0x58e5,
-  [0x12f9] = 0x58dc, [0x12fa] = 0x58e4, [0x12fb] = 0x58df, [0x12fc] = 0x58ef,
-  [0x12fd] = 0x58fa, [0x12fe] = 0x58f9, [0x12ff] = 0x58fb, [0x1300] = 0x58fc,
-  [0x1301] = 0x58fd, [0x1302] = 0x5902, [0x1303] = 0x590a, [0x1304] = 0x5910,
-  [0x1305] = 0x591b, [0x1306] = 0x68a6, [0x1307] = 0x5925, [0x1308] = 0x592c,
-  [0x1309] = 0x592d, [0x130a] = 0x5932, [0x130b] = 0x5938, [0x130c] = 0x593e,
-  [0x130d] = 0x7ad2, [0x130e] = 0x5955, [0x130f] = 0x5950, [0x1310] = 0x594e,
-  [0x1311] = 0x595a, [0x1312] = 0x5958, [0x1313] = 0x5962, [0x1314] = 0x5960,
-  [0x1315] = 0x5967, [0x1316] = 0x596c, [0x1317] = 0x5969, [0x1318] = 0x5978,
-  [0x1319] = 0x5981, [0x131a] = 0x599d, [0x131b] = 0x4f5e, [0x131c] = 0x4fab,
-  [0x131d] = 0x59a3, [0x131e] = 0x59b2, [0x131f] = 0x59c6, [0x1320] = 0x59e8,
-  [0x1321] = 0x59dc, [0x1322] = 0x598d, [0x1323] = 0x59d9, [0x1324] = 0x59da,
-  [0x1325] = 0x5a25, [0x1326] = 0x5a1f, [0x1327] = 0x5a11, [0x1328] = 0x5a1c,
-  [0x1329] = 0x5a09, [0x132a] = 0x5a1a, [0x132b] = 0x5a40, [0x132c] = 0x5a6c,
-  [0x132d] = 0x5a49, [0x132e] = 0x5a35, [0x132f] = 0x5a36, [0x1330] = 0x5a62,
-  [0x1331] = 0x5a6a, [0x1332] = 0x5a9a, [0x1333] = 0x5abc, [0x1334] = 0x5abe,
-  [0x1335] = 0x5acb, [0x1336] = 0x5ac2, [0x1337] = 0x5abd, [0x1338] = 0x5ae3,
-  [0x1339] = 0x5ad7, [0x133a] = 0x5ae6, [0x133b] = 0x5ae9, [0x133c] = 0x5ad6,
-  [0x133d] = 0x5afa, [0x133e] = 0x5afb, [0x133f] = 0x5b0c, [0x1340] = 0x5b0b,
-  [0x1341] = 0x5b16, [0x1342] = 0x5b32, [0x1343] = 0x5ad0, [0x1344] = 0x5b2a,
-  [0x1345] = 0x5b36, [0x1346] = 0x5b3e, [0x1347] = 0x5b43, [0x1348] = 0x5b45,
-  [0x1349] = 0x5b40, [0x134a] = 0x5b51, [0x134b] = 0x5b55, [0x134c] = 0x5b5a,
-  [0x134d] = 0x5b5b, [0x134e] = 0x5b65, [0x134f] = 0x5b69, [0x1350] = 0x5b70,
-  [0x1351] = 0x5b73, [0x1352] = 0x5b75, [0x1353] = 0x5b78, [0x1354] = 0x6588,
-  [0x1355] = 0x5b7a, [0x1356] = 0x5b80, [0x1357] = 0x5b83, [0x1358] = 0x5ba6,
-  [0x1359] = 0x5bb8, [0x135a] = 0x5bc3, [0x135b] = 0x5bc7, [0x135c] = 0x5bc9,
-  [0x135d] = 0x5bd4, [0x135e] = 0x5bd0, [0x135f] = 0x5be4, [0x1360] = 0x5be6,
-  [0x1361] = 0x5be2, [0x1362] = 0x5bde, [0x1363] = 0x5be5, [0x1364] = 0x5beb,
-  [0x1365] = 0x5bf0, [0x1366] = 0x5bf6, [0x1367] = 0x5bf3, [0x1368] = 0x5c05,
-  [0x1369] = 0x5c07, [0x136a] = 0x5c08, [0x136b] = 0x5c0d, [0x136c] = 0x5c13,
-  [0x136d] = 0x5c20, [0x136e] = 0x5c22, [0x136f] = 0x5c28, [0x1370] = 0x5c38,
-  [0x1371] = 0x5c39, [0x1372] = 0x5c41, [0x1373] = 0x5c46, [0x1374] = 0x5c4e,
-  [0x1375] = 0x5c53, [0x1376] = 0x5c50, [0x1377] = 0x5c4f, [0x1378] = 0x5b71,
-  [0x1379] = 0x5c6c, [0x137a] = 0x5c6e, [0x137b] = 0x4e62, [0x137c] = 0x5c76,
-  [0x137d] = 0x5c79, [0x137e] = 0x5c8c, [0x137f] = 0x5c91, [0x1380] = 0x5c94,
-  [0x1381] = 0x599b, [0x1382] = 0x5cab, [0x1383] = 0x5cbb, [0x1384] = 0x5cb6,
-  [0x1385] = 0x5cbc, [0x1386] = 0x5cb7, [0x1387] = 0x5cc5, [0x1388] = 0x5cbe,
-  [0x1389] = 0x5cc7, [0x138a] = 0x5cd9, [0x138b] = 0x5ce9, [0x138c] = 0x5cfd,
-  [0x138d] = 0x5cfa, [0x138e] = 0x5ced, [0x138f] = 0x5d8c, [0x1390] = 0x5cea,
-  [0x1391] = 0x5d0b, [0x1392] = 0x5d15, [0x1393] = 0x5d17, [0x1394] = 0x5d5c,
-  [0x1395] = 0x5d1f, [0x1396] = 0x5d1b, [0x1397] = 0x5d11, [0x1398] = 0x5d14,
-  [0x1399] = 0x5d22, [0x139a] = 0x5d1a, [0x139b] = 0x5d19, [0x139c] = 0x5d18,
-  [0x139d] = 0x5d4c, [0x139e] = 0x5d52, [0x139f] = 0x5d4e, [0x13a0] = 0x5d4b,
-  [0x13a1] = 0x5d6c, [0x13a2] = 0x5d73, [0x13a3] = 0x5d76, [0x13a4] = 0x5d87,
-  [0x13a5] = 0x5d84, [0x13a6] = 0x5d82, [0x13a7] = 0x5da2, [0x13a8] = 0x5d9d,
-  [0x13a9] = 0x5dac, [0x13aa] = 0x5dae, [0x13ab] = 0x5dbd, [0x13ac] = 0x5d90,
-  [0x13ad] = 0x5db7, [0x13ae] = 0x5dbc, [0x13af] = 0x5dc9, [0x13b0] = 0x5dcd,
-  [0x13b1] = 0x5dd3, [0x13b2] = 0x5dd2, [0x13b3] = 0x5dd6, [0x13b4] = 0x5ddb,
-  [0x13b5] = 0x5deb, [0x13b6] = 0x5df2, [0x13b7] = 0x5df5, [0x13b8] = 0x5e0b,
-  [0x13b9] = 0x5e1a, [0x13ba] = 0x5e19, [0x13bb] = 0x5e11, [0x13bc] = 0x5e1b,
-  [0x13bd] = 0x5e36, [0x13be] = 0x5e37, [0x13bf] = 0x5e44, [0x13c0] = 0x5e43,
-  [0x13c1] = 0x5e40, [0x13c2] = 0x5e4e, [0x13c3] = 0x5e57, [0x13c4] = 0x5e54,
-  [0x13c5] = 0x5e5f, [0x13c6] = 0x5e62, [0x13c7] = 0x5e64, [0x13c8] = 0x5e47,
-  [0x13c9] = 0x5e75, [0x13ca] = 0x5e76, [0x13cb] = 0x5e7a, [0x13cc] = 0x9ebc,
-  [0x13cd] = 0x5e7f, [0x13ce] = 0x5ea0, [0x13cf] = 0x5ec1, [0x13d0] = 0x5ec2,
-  [0x13d1] = 0x5ec8, [0x13d2] = 0x5ed0, [0x13d3] = 0x5ecf, [0x13d4] = 0x5ed6,
-  [0x13d5] = 0x5ee3, [0x13d6] = 0x5edd, [0x13d7] = 0x5eda, [0x13d8] = 0x5edb,
-  [0x13d9] = 0x5ee2, [0x13da] = 0x5ee1, [0x13db] = 0x5ee8, [0x13dc] = 0x5ee9,
-  [0x13dd] = 0x5eec, [0x13de] = 0x5ef1, [0x13df] = 0x5ef3, [0x13e0] = 0x5ef0,
-  [0x13e1] = 0x5ef4, [0x13e2] = 0x5ef8, [0x13e3] = 0x5efe, [0x13e4] = 0x5f03,
-  [0x13e5] = 0x5f09, [0x13e6] = 0x5f5d, [0x13e7] = 0x5f5c, [0x13e8] = 0x5f0b,
-  [0x13e9] = 0x5f11, [0x13ea] = 0x5f16, [0x13eb] = 0x5f29, [0x13ec] = 0x5f2d,
-  [0x13ed] = 0x5f38, [0x13ee] = 0x5f41, [0x13ef] = 0x5f48, [0x13f0] = 0x5f4c,
-  [0x13f1] = 0x5f4e, [0x13f2] = 0x5f2f, [0x13f3] = 0x5f51, [0x13f4] = 0x5f56,
-  [0x13f5] = 0x5f57, [0x13f6] = 0x5f59, [0x13f7] = 0x5f61, [0x13f8] = 0x5f6d,
-  [0x13f9] = 0x5f73, [0x13fa] = 0x5f77, [0x13fb] = 0x5f83, [0x13fc] = 0x5f82,
-  [0x13fd] = 0x5f7f, [0x13fe] = 0x5f8a, [0x13ff] = 0x5f88, [0x1400] = 0x5f91,
-  [0x1401] = 0x5f87, [0x1402] = 0x5f9e, [0x1403] = 0x5f99, [0x1404] = 0x5f98,
-  [0x1405] = 0x5fa0, [0x1406] = 0x5fa8, [0x1407] = 0x5fad, [0x1408] = 0x5fbc,
-  [0x1409] = 0x5fd6, [0x140a] = 0x5ffb, [0x140b] = 0x5fe4, [0x140c] = 0x5ff8,
-  [0x140d] = 0x5ff1, [0x140e] = 0x5fdd, [0x140f] = 0x60b3, [0x1410] = 0x5fff,
-  [0x1411] = 0x6021, [0x1412] = 0x6060, [0x1413] = 0x6019, [0x1414] = 0x6010,
-  [0x1415] = 0x6029, [0x1416] = 0x600e, [0x1417] = 0x6031, [0x1418] = 0x601b,
-  [0x1419] = 0x6015, [0x141a] = 0x602b, [0x141b] = 0x6026, [0x141c] = 0x600f,
-  [0x141d] = 0x603a, [0x141e] = 0x605a, [0x141f] = 0x6041, [0x1420] = 0x606a,
-  [0x1421] = 0x6077, [0x1422] = 0x605f, [0x1423] = 0x604a, [0x1424] = 0x6046,
-  [0x1425] = 0x604d, [0x1426] = 0x6063, [0x1427] = 0x6043, [0x1428] = 0x6064,
-  [0x1429] = 0x6042, [0x142a] = 0x606c, [0x142b] = 0x606b, [0x142c] = 0x6059,
-  [0x142d] = 0x6081, [0x142e] = 0x608d, [0x142f] = 0x60e7, [0x1430] = 0x6083,
-  [0x1431] = 0x609a, [0x1432] = 0x6084, [0x1433] = 0x609b, [0x1434] = 0x6096,
-  [0x1435] = 0x6097, [0x1436] = 0x6092, [0x1437] = 0x60a7, [0x1438] = 0x608b,
-  [0x1439] = 0x60e1, [0x143a] = 0x60b8, [0x143b] = 0x60e0, [0x143c] = 0x60d3,
-  [0x143d] = 0x60b4, [0x143e] = 0x5ff0, [0x143f] = 0x60bd, [0x1440] = 0x60c6,
-  [0x1441] = 0x60b5, [0x1442] = 0x60d8, [0x1443] = 0x614d, [0x1444] = 0x6115,
-  [0x1445] = 0x6106, [0x1446] = 0x60f6, [0x1447] = 0x60f7, [0x1448] = 0x6100,
-  [0x1449] = 0x60f4, [0x144a] = 0x60fa, [0x144b] = 0x6103, [0x144c] = 0x6121,
-  [0x144d] = 0x60fb, [0x144e] = 0x60f1, [0x144f] = 0x610d, [0x1450] = 0x610e,
-  [0x1451] = 0x6147, [0x1452] = 0x613e, [0x1453] = 0x6128, [0x1454] = 0x6127,
-  [0x1455] = 0x614a, [0x1456] = 0x613f, [0x1457] = 0x613c, [0x1458] = 0x612c,
-  [0x1459] = 0x6134, [0x145a] = 0x613d, [0x145b] = 0x6142, [0x145c] = 0x6144,
-  [0x145d] = 0x6173, [0x145e] = 0x6177, [0x145f] = 0x6158, [0x1460] = 0x6159,
-  [0x1461] = 0x615a, [0x1462] = 0x616b, [0x1463] = 0x6174, [0x1464] = 0x616f,
-  [0x1465] = 0x6165, [0x1466] = 0x6171, [0x1467] = 0x615f, [0x1468] = 0x615d,
-  [0x1469] = 0x6153, [0x146a] = 0x6175, [0x146b] = 0x6199, [0x146c] = 0x6196,
-  [0x146d] = 0x6187, [0x146e] = 0x61ac, [0x146f] = 0x6194, [0x1470] = 0x619a,
-  [0x1471] = 0x618a, [0x1472] = 0x6191, [0x1473] = 0x61ab, [0x1474] = 0x61ae,
-  [0x1475] = 0x61cc, [0x1476] = 0x61ca, [0x1477] = 0x61c9, [0x1478] = 0x61f7,
-  [0x1479] = 0x61c8, [0x147a] = 0x61c3, [0x147b] = 0x61c6, [0x147c] = 0x61ba,
-  [0x147d] = 0x61cb, [0x147e] = 0x7f79, [0x147f] = 0x61cd, [0x1480] = 0x61e6,
-  [0x1481] = 0x61e3, [0x1482] = 0x61f6, [0x1483] = 0x61fa, [0x1484] = 0x61f4,
-  [0x1485] = 0x61ff, [0x1486] = 0x61fd, [0x1487] = 0x61fc, [0x1488] = 0x61fe,
-  [0x1489] = 0x6200, [0x148a] = 0x6208, [0x148b] = 0x6209, [0x148c] = 0x620d,
-  [0x148d] = 0x620c, [0x148e] = 0x6214, [0x148f] = 0x621b, [0x1490] = 0x621e,
-  [0x1491] = 0x6221, [0x1492] = 0x622a, [0x1493] = 0x622e, [0x1494] = 0x6230,
-  [0x1495] = 0x6232, [0x1496] = 0x6233, [0x1497] = 0x6241, [0x1498] = 0x624e,
-  [0x1499] = 0x625e, [0x149a] = 0x6263, [0x149b] = 0x625b, [0x149c] = 0x6260,
-  [0x149d] = 0x6268, [0x149e] = 0x627c, [0x149f] = 0x6282, [0x14a0] = 0x6289,
-  [0x14a1] = 0x627e, [0x14a2] = 0x6292, [0x14a3] = 0x6293, [0x14a4] = 0x6296,
-  [0x14a5] = 0x62d4, [0x14a6] = 0x6283, [0x14a7] = 0x6294, [0x14a8] = 0x62d7,
-  [0x14a9] = 0x62d1, [0x14aa] = 0x62bb, [0x14ab] = 0x62cf, [0x14ac] = 0x62ff,
-  [0x14ad] = 0x62c6, [0x14ae] = 0x64d4, [0x14af] = 0x62c8, [0x14b0] = 0x62dc,
-  [0x14b1] = 0x62cc, [0x14b2] = 0x62ca, [0x14b3] = 0x62c2, [0x14b4] = 0x62c7,
-  [0x14b5] = 0x629b, [0x14b6] = 0x62c9, [0x14b7] = 0x630c, [0x14b8] = 0x62ee,
-  [0x14b9] = 0x62f1, [0x14ba] = 0x6327, [0x14bb] = 0x6302, [0x14bc] = 0x6308,
-  [0x14bd] = 0x62ef, [0x14be] = 0x62f5, [0x14bf] = 0x6350, [0x14c0] = 0x633e,
-  [0x14c1] = 0x634d, [0x14c2] = 0x641c, [0x14c3] = 0x634f, [0x14c4] = 0x6396,
-  [0x14c5] = 0x638e, [0x14c6] = 0x6380, [0x14c7] = 0x63ab, [0x14c8] = 0x6376,
-  [0x14c9] = 0x63a3, [0x14ca] = 0x638f, [0x14cb] = 0x6389, [0x14cc] = 0x639f,
-  [0x14cd] = 0x63b5, [0x14ce] = 0x636b, [0x14cf] = 0x6369, [0x14d0] = 0x63be,
-  [0x14d1] = 0x63e9, [0x14d2] = 0x63c0, [0x14d3] = 0x63c6, [0x14d4] = 0x63e3,
-  [0x14d5] = 0x63c9, [0x14d6] = 0x63d2, [0x14d7] = 0x63f6, [0x14d8] = 0x63c4,
-  [0x14d9] = 0x6416, [0x14da] = 0x6434, [0x14db] = 0x6406, [0x14dc] = 0x6413,
-  [0x14dd] = 0x6426, [0x14de] = 0x6436, [0x14df] = 0x651d, [0x14e0] = 0x6417,
-  [0x14e1] = 0x6428, [0x14e2] = 0x640f, [0x14e3] = 0x6467, [0x14e4] = 0x646f,
-  [0x14e5] = 0x6476, [0x14e6] = 0x644e, [0x14e7] = 0x652a, [0x14e8] = 0x6495,
-  [0x14e9] = 0x6493, [0x14ea] = 0x64a5, [0x14eb] = 0x64a9, [0x14ec] = 0x6488,
-  [0x14ed] = 0x64bc, [0x14ee] = 0x64da, [0x14ef] = 0x64d2, [0x14f0] = 0x64c5,
-  [0x14f1] = 0x64c7, [0x14f2] = 0x64bb, [0x14f3] = 0x64d8, [0x14f4] = 0x64c2,
-  [0x14f5] = 0x64f1, [0x14f6] = 0x64e7, [0x14f7] = 0x8209, [0x14f8] = 0x64e0,
-  [0x14f9] = 0x64e1, [0x14fa] = 0x62ac, [0x14fb] = 0x64e3, [0x14fc] = 0x64ef,
-  [0x14fd] = 0x652c, [0x14fe] = 0x64f6, [0x14ff] = 0x64f4, [0x1500] = 0x64f2,
-  [0x1501] = 0x64fa, [0x1502] = 0x6500, [0x1503] = 0x64fd, [0x1504] = 0x6518,
-  [0x1505] = 0x651c, [0x1506] = 0x6505, [0x1507] = 0x6524, [0x1508] = 0x6523,
-  [0x1509] = 0x652b, [0x150a] = 0x6534, [0x150b] = 0x6535, [0x150c] = 0x6537,
-  [0x150d] = 0x6536, [0x150e] = 0x6538, [0x150f] = 0x754b, [0x1510] = 0x6548,
-  [0x1511] = 0x6556, [0x1512] = 0x6555, [0x1513] = 0x654d, [0x1514] = 0x6558,
-  [0x1515] = 0x655e, [0x1516] = 0x655d, [0x1517] = 0x6572, [0x1518] = 0x6578,
-  [0x1519] = 0x6582, [0x151a] = 0x6583, [0x151b] = 0x8b8a, [0x151c] = 0x659b,
-  [0x151d] = 0x659f, [0x151e] = 0x65ab, [0x151f] = 0x65b7, [0x1520] = 0x65c3,
-  [0x1521] = 0x65c6, [0x1522] = 0x65c1, [0x1523] = 0x65c4, [0x1524] = 0x65cc,
-  [0x1525] = 0x65d2, [0x1526] = 0x65db, [0x1527] = 0x65d9, [0x1528] = 0x65e0,
-  [0x1529] = 0x65e1, [0x152a] = 0x65f1, [0x152b] = 0x6772, [0x152c] = 0x660a,
-  [0x152d] = 0x6603, [0x152e] = 0x65fb, [0x152f] = 0x6773, [0x1530] = 0x6635,
-  [0x1531] = 0x6636, [0x1532] = 0x6634, [0x1533] = 0x661c, [0x1534] = 0x664f,
-  [0x1535] = 0x6644, [0x1536] = 0x6649, [0x1537] = 0x6641, [0x1538] = 0x665e,
-  [0x1539] = 0x665d, [0x153a] = 0x6664, [0x153b] = 0x6667, [0x153c] = 0x6668,
-  [0x153d] = 0x665f, [0x153e] = 0x6662, [0x153f] = 0x6670, [0x1540] = 0x6683,
-  [0x1541] = 0x6688, [0x1542] = 0x668e, [0x1543] = 0x6689, [0x1544] = 0x6684,
-  [0x1545] = 0x6698, [0x1546] = 0x669d, [0x1547] = 0x66c1, [0x1548] = 0x66b9,
-  [0x1549] = 0x66c9, [0x154a] = 0x66be, [0x154b] = 0x66bc, [0x154c] = 0x66c4,
-  [0x154d] = 0x66b8, [0x154e] = 0x66d6, [0x154f] = 0x66da, [0x1550] = 0x66e0,
-  [0x1551] = 0x663f, [0x1552] = 0x66e6, [0x1553] = 0x66e9, [0x1554] = 0x66f0,
-  [0x1555] = 0x66f5, [0x1556] = 0x66f7, [0x1557] = 0x670f, [0x1558] = 0x6716,
-  [0x1559] = 0x671e, [0x155a] = 0x6726, [0x155b] = 0x6727, [0x155c] = 0x9738,
-  [0x155d] = 0x672e, [0x155e] = 0x673f, [0x155f] = 0x6736, [0x1560] = 0x6741,
-  [0x1561] = 0x6738, [0x1562] = 0x6737, [0x1563] = 0x6746, [0x1564] = 0x675e,
-  [0x1565] = 0x6760, [0x1566] = 0x6759, [0x1567] = 0x6763, [0x1568] = 0x6764,
-  [0x1569] = 0x6789, [0x156a] = 0x6770, [0x156b] = 0x67a9, [0x156c] = 0x677c,
-  [0x156d] = 0x676a, [0x156e] = 0x678c, [0x156f] = 0x678b, [0x1570] = 0x67a6,
-  [0x1571] = 0x67a1, [0x1572] = 0x6785, [0x1573] = 0x67b7, [0x1574] = 0x67ef,
-  [0x1575] = 0x67b4, [0x1576] = 0x67ec, [0x1577] = 0x67b3, [0x1578] = 0x67e9,
-  [0x1579] = 0x67b8, [0x157a] = 0x67e4, [0x157b] = 0x67de, [0x157c] = 0x67dd,
-  [0x157d] = 0x67e2, [0x157e] = 0x67ee, [0x157f] = 0x67b9, [0x1580] = 0x67ce,
-  [0x1581] = 0x67c6, [0x1582] = 0x67e7, [0x1583] = 0x6a9c, [0x1584] = 0x681e,
-  [0x1585] = 0x6846, [0x1586] = 0x6829, [0x1587] = 0x6840, [0x1588] = 0x684d,
-  [0x1589] = 0x6832, [0x158a] = 0x684e, [0x158b] = 0x68b3, [0x158c] = 0x682b,
-  [0x158d] = 0x6859, [0x158e] = 0x6863, [0x158f] = 0x6877, [0x1590] = 0x687f,
-  [0x1591] = 0x689f, [0x1592] = 0x688f, [0x1593] = 0x68ad, [0x1594] = 0x6894,
-  [0x1595] = 0x689d, [0x1596] = 0x689b, [0x1597] = 0x6883, [0x1598] = 0x6aae,
-  [0x1599] = 0x68b9, [0x159a] = 0x6874, [0x159b] = 0x68b5, [0x159c] = 0x68a0,
-  [0x159d] = 0x68ba, [0x159e] = 0x690f, [0x159f] = 0x688d, [0x15a0] = 0x687e,
-  [0x15a1] = 0x6901, [0x15a2] = 0x68ca, [0x15a3] = 0x6908, [0x15a4] = 0x68d8,
-  [0x15a5] = 0x6922, [0x15a6] = 0x6926, [0x15a7] = 0x68e1, [0x15a8] = 0x690c,
-  [0x15a9] = 0x68cd, [0x15aa] = 0x68d4, [0x15ab] = 0x68e7, [0x15ac] = 0x68d5,
-  [0x15ad] = 0x6936, [0x15ae] = 0x6912, [0x15af] = 0x6904, [0x15b0] = 0x68d7,
-  [0x15b1] = 0x68e3, [0x15b2] = 0x6925, [0x15b3] = 0x68f9, [0x15b4] = 0x68e0,
-  [0x15b5] = 0x68ef, [0x15b6] = 0x6928, [0x15b7] = 0x692a, [0x15b8] = 0x691a,
-  [0x15b9] = 0x6923, [0x15ba] = 0x6921, [0x15bb] = 0x68c6, [0x15bc] = 0x6979,
-  [0x15bd] = 0x6977, [0x15be] = 0x695c, [0x15bf] = 0x6978, [0x15c0] = 0x696b,
-  [0x15c1] = 0x6954, [0x15c2] = 0x697e, [0x15c3] = 0x696e, [0x15c4] = 0x6939,
-  [0x15c5] = 0x6974, [0x15c6] = 0x693d, [0x15c7] = 0x6959, [0x15c8] = 0x6930,
-  [0x15c9] = 0x6961, [0x15ca] = 0x695e, [0x15cb] = 0x695d, [0x15cc] = 0x6981,
-  [0x15cd] = 0x696a, [0x15ce] = 0x69b2, [0x15cf] = 0x69ae, [0x15d0] = 0x69d0,
-  [0x15d1] = 0x69bf, [0x15d2] = 0x69c1, [0x15d3] = 0x69d3, [0x15d4] = 0x69be,
-  [0x15d5] = 0x69ce, [0x15d6] = 0x5be8, [0x15d7] = 0x69ca, [0x15d8] = 0x69dd,
-  [0x15d9] = 0x69bb, [0x15da] = 0x69c3, [0x15db] = 0x69a7, [0x15dc] = 0x6a2e,
-  [0x15dd] = 0x6991, [0x15de] = 0x69a0, [0x15df] = 0x699c, [0x15e0] = 0x6995,
-  [0x15e1] = 0x69b4, [0x15e2] = 0x69de, [0x15e3] = 0x69e8, [0x15e4] = 0x6a02,
-  [0x15e5] = 0x6a1b, [0x15e6] = 0x69ff, [0x15e7] = 0x6b0a, [0x15e8] = 0x69f9,
-  [0x15e9] = 0x69f2, [0x15ea] = 0x69e7, [0x15eb] = 0x6a05, [0x15ec] = 0x69b1,
-  [0x15ed] = 0x6a1e, [0x15ee] = 0x69ed, [0x15ef] = 0x6a14, [0x15f0] = 0x69eb,
-  [0x15f1] = 0x6a0a, [0x15f2] = 0x6a12, [0x15f3] = 0x6ac1, [0x15f4] = 0x6a23,
-  [0x15f5] = 0x6a13, [0x15f6] = 0x6a44, [0x15f7] = 0x6a0c, [0x15f8] = 0x6a72,
-  [0x15f9] = 0x6a36, [0x15fa] = 0x6a78, [0x15fb] = 0x6a47, [0x15fc] = 0x6a62,
-  [0x15fd] = 0x6a59, [0x15fe] = 0x6a66, [0x15ff] = 0x6a48, [0x1600] = 0x6a38,
-  [0x1601] = 0x6a22, [0x1602] = 0x6a90, [0x1603] = 0x6a8d, [0x1604] = 0x6aa0,
-  [0x1605] = 0x6a84, [0x1606] = 0x6aa2, [0x1607] = 0x6aa3, [0x1608] = 0x6a97,
-  [0x1609] = 0x8617, [0x160a] = 0x6abb, [0x160b] = 0x6ac3, [0x160c] = 0x6ac2,
-  [0x160d] = 0x6ab8, [0x160e] = 0x6ab3, [0x160f] = 0x6aac, [0x1610] = 0x6ade,
-  [0x1611] = 0x6ad1, [0x1612] = 0x6adf, [0x1613] = 0x6aaa, [0x1614] = 0x6ada,
-  [0x1615] = 0x6aea, [0x1616] = 0x6afb, [0x1617] = 0x6b05, [0x1618] = 0x8616,
-  [0x1619] = 0x6afa, [0x161a] = 0x6b12, [0x161b] = 0x6b16, [0x161c] = 0x9b31,
-  [0x161d] = 0x6b1f, [0x161e] = 0x6b38, [0x161f] = 0x6b37, [0x1620] = 0x76dc,
-  [0x1621] = 0x6b39, [0x1622] = 0x98ee, [0x1623] = 0x6b47, [0x1624] = 0x6b43,
-  [0x1625] = 0x6b49, [0x1626] = 0x6b50, [0x1627] = 0x6b59, [0x1628] = 0x6b54,
-  [0x1629] = 0x6b5b, [0x162a] = 0x6b5f, [0x162b] = 0x6b61, [0x162c] = 0x6b78,
-  [0x162d] = 0x6b79, [0x162e] = 0x6b7f, [0x162f] = 0x6b80, [0x1630] = 0x6b84,
-  [0x1631] = 0x6b83, [0x1632] = 0x6b8d, [0x1633] = 0x6b98, [0x1634] = 0x6b95,
-  [0x1635] = 0x6b9e, [0x1636] = 0x6ba4, [0x1637] = 0x6baa, [0x1638] = 0x6bab,
-  [0x1639] = 0x6baf, [0x163a] = 0x6bb2, [0x163b] = 0x6bb1, [0x163c] = 0x6bb3,
-  [0x163d] = 0x6bb7, [0x163e] = 0x6bbc, [0x163f] = 0x6bc6, [0x1640] = 0x6bcb,
-  [0x1641] = 0x6bd3, [0x1642] = 0x6bdf, [0x1643] = 0x6bec, [0x1644] = 0x6beb,
-  [0x1645] = 0x6bf3, [0x1646] = 0x6bef, [0x1647] = 0x9ebe, [0x1648] = 0x6c08,
-  [0x1649] = 0x6c13, [0x164a] = 0x6c14, [0x164b] = 0x6c1b, [0x164c] = 0x6c24,
-  [0x164d] = 0x6c23, [0x164e] = 0x6c5e, [0x164f] = 0x6c55, [0x1650] = 0x6c62,
-  [0x1651] = 0x6c6a, [0x1652] = 0x6c82, [0x1653] = 0x6c8d, [0x1654] = 0x6c9a,
-  [0x1655] = 0x6c81, [0x1656] = 0x6c9b, [0x1657] = 0x6c7e, [0x1658] = 0x6c68,
-  [0x1659] = 0x6c73, [0x165a] = 0x6c92, [0x165b] = 0x6c90, [0x165c] = 0x6cc4,
-  [0x165d] = 0x6cf1, [0x165e] = 0x6cd3, [0x165f] = 0x6cbd, [0x1660] = 0x6cd7,
-  [0x1661] = 0x6cc5, [0x1662] = 0x6cdd, [0x1663] = 0x6cae, [0x1664] = 0x6cb1,
-  [0x1665] = 0x6cbe, [0x1666] = 0x6cba, [0x1667] = 0x6cdb, [0x1668] = 0x6cef,
-  [0x1669] = 0x6cd9, [0x166a] = 0x6cea, [0x166b] = 0x6d1f, [0x166c] = 0x884d,
-  [0x166d] = 0x6d36, [0x166e] = 0x6d2b, [0x166f] = 0x6d3d, [0x1670] = 0x6d38,
-  [0x1671] = 0x6d19, [0x1672] = 0x6d35, [0x1673] = 0x6d33, [0x1674] = 0x6d12,
-  [0x1675] = 0x6d0c, [0x1676] = 0x6d63, [0x1677] = 0x6d93, [0x1678] = 0x6d64,
-  [0x1679] = 0x6d5a, [0x167a] = 0x6d79, [0x167b] = 0x6d59, [0x167c] = 0x6d8e,
-  [0x167d] = 0x6d95, [0x167e] = 0x6fe4, [0x167f] = 0x6d85, [0x1680] = 0x6df9,
-  [0x1681] = 0x6e15, [0x1682] = 0x6e0a, [0x1683] = 0x6db5, [0x1684] = 0x6dc7,
-  [0x1685] = 0x6de6, [0x1686] = 0x6db8, [0x1687] = 0x6dc6, [0x1688] = 0x6dec,
-  [0x1689] = 0x6dde, [0x168a] = 0x6dcc, [0x168b] = 0x6de8, [0x168c] = 0x6dd2,
-  [0x168d] = 0x6dc5, [0x168e] = 0x6dfa, [0x168f] = 0x6dd9, [0x1690] = 0x6de4,
-  [0x1691] = 0x6dd5, [0x1692] = 0x6dea, [0x1693] = 0x6dee, [0x1694] = 0x6e2d,
-  [0x1695] = 0x6e6e, [0x1696] = 0x6e2e, [0x1697] = 0x6e19, [0x1698] = 0x6e72,
-  [0x1699] = 0x6e5f, [0x169a] = 0x6e3e, [0x169b] = 0x6e23, [0x169c] = 0x6e6b,
-  [0x169d] = 0x6e2b, [0x169e] = 0x6e76, [0x169f] = 0x6e4d, [0x16a0] = 0x6e1f,
-  [0x16a1] = 0x6e43, [0x16a2] = 0x6e3a, [0x16a3] = 0x6e4e, [0x16a4] = 0x6e24,
-  [0x16a5] = 0x6eff, [0x16a6] = 0x6e1d, [0x16a7] = 0x6e38, [0x16a8] = 0x6e82,
-  [0x16a9] = 0x6eaa, [0x16aa] = 0x6e98, [0x16ab] = 0x6ec9, [0x16ac] = 0x6eb7,
-  [0x16ad] = 0x6ed3, [0x16ae] = 0x6ebd, [0x16af] = 0x6eaf, [0x16b0] = 0x6ec4,
-  [0x16b1] = 0x6eb2, [0x16b2] = 0x6ed4, [0x16b3] = 0x6ed5, [0x16b4] = 0x6e8f,
-  [0x16b5] = 0x6ea5, [0x16b6] = 0x6ec2, [0x16b7] = 0x6e9f, [0x16b8] = 0x6f41,
-  [0x16b9] = 0x6f11, [0x16ba] = 0x704c, [0x16bb] = 0x6eec, [0x16bc] = 0x6ef8,
-  [0x16bd] = 0x6efe, [0x16be] = 0x6f3f, [0x16bf] = 0x6ef2, [0x16c0] = 0x6f31,
-  [0x16c1] = 0x6eef, [0x16c2] = 0x6f32, [0x16c3] = 0x6ecc, [0x16c4] = 0x6f3e,
-  [0x16c5] = 0x6f13, [0x16c6] = 0x6ef7, [0x16c7] = 0x6f86, [0x16c8] = 0x6f7a,
-  [0x16c9] = 0x6f78, [0x16ca] = 0x6f81, [0x16cb] = 0x6f80, [0x16cc] = 0x6f6f,
-  [0x16cd] = 0x6f5b, [0x16ce] = 0x6ff3, [0x16cf] = 0x6f6d, [0x16d0] = 0x6f82,
-  [0x16d1] = 0x6f7c, [0x16d2] = 0x6f58, [0x16d3] = 0x6f8e, [0x16d4] = 0x6f91,
-  [0x16d5] = 0x6fc2, [0x16d6] = 0x6f66, [0x16d7] = 0x6fb3, [0x16d8] = 0x6fa3,
-  [0x16d9] = 0x6fa1, [0x16da] = 0x6fa4, [0x16db] = 0x6fb9, [0x16dc] = 0x6fc6,
-  [0x16dd] = 0x6faa, [0x16de] = 0x6fdf, [0x16df] = 0x6fd5, [0x16e0] = 0x6fec,
-  [0x16e1] = 0x6fd4, [0x16e2] = 0x6fd8, [0x16e3] = 0x6ff1, [0x16e4] = 0x6fee,
-  [0x16e5] = 0x6fdb, [0x16e6] = 0x7009, [0x16e7] = 0x700b, [0x16e8] = 0x6ffa,
-  [0x16e9] = 0x7011, [0x16ea] = 0x7001, [0x16eb] = 0x700f, [0x16ec] = 0x6ffe,
-  [0x16ed] = 0x701b, [0x16ee] = 0x701a, [0x16ef] = 0x6f74, [0x16f0] = 0x701d,
-  [0x16f1] = 0x7018, [0x16f2] = 0x701f, [0x16f3] = 0x7030, [0x16f4] = 0x703e,
-  [0x16f5] = 0x7032, [0x16f6] = 0x7051, [0x16f7] = 0x7063, [0x16f8] = 0x7099,
-  [0x16f9] = 0x7092, [0x16fa] = 0x70af, [0x16fb] = 0x70f1, [0x16fc] = 0x70ac,
-  [0x16fd] = 0x70b8, [0x16fe] = 0x70b3, [0x16ff] = 0x70ae, [0x1700] = 0x70df,
-  [0x1701] = 0x70cb, [0x1702] = 0x70dd, [0x1703] = 0x70d9, [0x1704] = 0x7109,
-  [0x1705] = 0x70fd, [0x1706] = 0x711c, [0x1707] = 0x7119, [0x1708] = 0x7165,
-  [0x1709] = 0x7155, [0x170a] = 0x7188, [0x170b] = 0x7166, [0x170c] = 0x7162,
-  [0x170d] = 0x714c, [0x170e] = 0x7156, [0x170f] = 0x716c, [0x1710] = 0x718f,
-  [0x1711] = 0x71fb, [0x1712] = 0x7184, [0x1713] = 0x7195, [0x1714] = 0x71a8,
-  [0x1715] = 0x71ac, [0x1716] = 0x71d7, [0x1717] = 0x71b9, [0x1718] = 0x71be,
-  [0x1719] = 0x71d2, [0x171a] = 0x71c9, [0x171b] = 0x71d4, [0x171c] = 0x71ce,
-  [0x171d] = 0x71e0, [0x171e] = 0x71ec, [0x171f] = 0x71e7, [0x1720] = 0x71f5,
-  [0x1721] = 0x71fc, [0x1722] = 0x71f9, [0x1723] = 0x71ff, [0x1724] = 0x720d,
-  [0x1725] = 0x7210, [0x1726] = 0x721b, [0x1727] = 0x7228, [0x1728] = 0x722d,
-  [0x1729] = 0x722c, [0x172a] = 0x7230, [0x172b] = 0x7232, [0x172c] = 0x723b,
-  [0x172d] = 0x723c, [0x172e] = 0x723f, [0x172f] = 0x7240, [0x1730] = 0x7246,
-  [0x1731] = 0x724b, [0x1732] = 0x7258, [0x1733] = 0x7274, [0x1734] = 0x727e,
-  [0x1735] = 0x7282, [0x1736] = 0x7281, [0x1737] = 0x7287, [0x1738] = 0x7292,
-  [0x1739] = 0x7296, [0x173a] = 0x72a2, [0x173b] = 0x72a7, [0x173c] = 0x72b9,
-  [0x173d] = 0x72b2, [0x173e] = 0x72c3, [0x173f] = 0x72c6, [0x1740] = 0x72c4,
-  [0x1741] = 0x72ce, [0x1742] = 0x72d2, [0x1743] = 0x72e2, [0x1744] = 0x72e0,
-  [0x1745] = 0x72e1, [0x1746] = 0x72f9, [0x1747] = 0x72f7, [0x1748] = 0x500f,
-  [0x1749] = 0x7317, [0x174a] = 0x730a, [0x174b] = 0x731c, [0x174c] = 0x7316,
-  [0x174d] = 0x731d, [0x174e] = 0x7334, [0x174f] = 0x732f, [0x1750] = 0x7329,
-  [0x1751] = 0x7325, [0x1752] = 0x733e, [0x1753] = 0x734e, [0x1754] = 0x734f,
-  [0x1755] = 0x9ed8, [0x1756] = 0x7357, [0x1757] = 0x736a, [0x1758] = 0x7368,
-  [0x1759] = 0x7370, [0x175a] = 0x7378, [0x175b] = 0x7375, [0x175c] = 0x737b,
-  [0x175d] = 0x737a, [0x175e] = 0x73c8, [0x175f] = 0x73b3, [0x1760] = 0x73ce,
-  [0x1761] = 0x73bb, [0x1762] = 0x73c0, [0x1763] = 0x73e5, [0x1764] = 0x73ee,
-  [0x1765] = 0x73de, [0x1766] = 0x74a2, [0x1767] = 0x7405, [0x1768] = 0x746f,
-  [0x1769] = 0x7425, [0x176a] = 0x73f8, [0x176b] = 0x7432, [0x176c] = 0x743a,
-  [0x176d] = 0x7455, [0x176e] = 0x743f, [0x176f] = 0x745f, [0x1770] = 0x7459,
-  [0x1771] = 0x7441, [0x1772] = 0x745c, [0x1773] = 0x7469, [0x1774] = 0x7470,
-  [0x1775] = 0x7463, [0x1776] = 0x746a, [0x1777] = 0x7476, [0x1778] = 0x747e,
-  [0x1779] = 0x748b, [0x177a] = 0x749e, [0x177b] = 0x74a7, [0x177c] = 0x74ca,
-  [0x177d] = 0x74cf, [0x177e] = 0x74d4, [0x177f] = 0x73f1, [0x1780] = 0x74e0,
-  [0x1781] = 0x74e3, [0x1782] = 0x74e7, [0x1783] = 0x74e9, [0x1784] = 0x74ee,
-  [0x1785] = 0x74f2, [0x1786] = 0x74f0, [0x1787] = 0x74f1, [0x1788] = 0x74f8,
-  [0x1789] = 0x74f7, [0x178a] = 0x7504, [0x178b] = 0x7503, [0x178c] = 0x7505,
-  [0x178d] = 0x750c, [0x178e] = 0x750e, [0x178f] = 0x750d, [0x1790] = 0x7515,
-  [0x1791] = 0x7513, [0x1792] = 0x751e, [0x1793] = 0x7526, [0x1794] = 0x752c,
-  [0x1795] = 0x753c, [0x1796] = 0x7544, [0x1797] = 0x754d, [0x1798] = 0x754a,
-  [0x1799] = 0x7549, [0x179a] = 0x755b, [0x179b] = 0x7546, [0x179c] = 0x755a,
-  [0x179d] = 0x7569, [0x179e] = 0x7564, [0x179f] = 0x7567, [0x17a0] = 0x756b,
-  [0x17a1] = 0x756d, [0x17a2] = 0x7578, [0x17a3] = 0x7576, [0x17a4] = 0x7586,
-  [0x17a5] = 0x7587, [0x17a6] = 0x7574, [0x17a7] = 0x758a, [0x17a8] = 0x7589,
-  [0x17a9] = 0x7582, [0x17aa] = 0x7594, [0x17ab] = 0x759a, [0x17ac] = 0x759d,
-  [0x17ad] = 0x75a5, [0x17ae] = 0x75a3, [0x17af] = 0x75c2, [0x17b0] = 0x75b3,
-  [0x17b1] = 0x75c3, [0x17b2] = 0x75b5, [0x17b3] = 0x75bd, [0x17b4] = 0x75b8,
-  [0x17b5] = 0x75bc, [0x17b6] = 0x75b1, [0x17b7] = 0x75cd, [0x17b8] = 0x75ca,
-  [0x17b9] = 0x75d2, [0x17ba] = 0x75d9, [0x17bb] = 0x75e3, [0x17bc] = 0x75de,
-  [0x17bd] = 0x75fe, [0x17be] = 0x75ff, [0x17bf] = 0x75fc, [0x17c0] = 0x7601,
-  [0x17c1] = 0x75f0, [0x17c2] = 0x75fa, [0x17c3] = 0x75f2, [0x17c4] = 0x75f3,
-  [0x17c5] = 0x760b, [0x17c6] = 0x760d, [0x17c7] = 0x7609, [0x17c8] = 0x761f,
-  [0x17c9] = 0x7627, [0x17ca] = 0x7620, [0x17cb] = 0x7621, [0x17cc] = 0x7622,
-  [0x17cd] = 0x7624, [0x17ce] = 0x7634, [0x17cf] = 0x7630, [0x17d0] = 0x763b,
-  [0x17d1] = 0x7647, [0x17d2] = 0x7648, [0x17d3] = 0x7646, [0x17d4] = 0x765c,
-  [0x17d5] = 0x7658, [0x17d6] = 0x7661, [0x17d7] = 0x7662, [0x17d8] = 0x7668,
-  [0x17d9] = 0x7669, [0x17da] = 0x766a, [0x17db] = 0x7667, [0x17dc] = 0x766c,
-  [0x17dd] = 0x7670, [0x17de] = 0x7672, [0x17df] = 0x7676, [0x17e0] = 0x7678,
-  [0x17e1] = 0x767c, [0x17e2] = 0x7680, [0x17e3] = 0x7683, [0x17e4] = 0x7688,
-  [0x17e5] = 0x768b, [0x17e6] = 0x768e, [0x17e7] = 0x7696, [0x17e8] = 0x7693,
-  [0x17e9] = 0x7699, [0x17ea] = 0x769a, [0x17eb] = 0x76b0, [0x17ec] = 0x76b4,
-  [0x17ed] = 0x76b8, [0x17ee] = 0x76b9, [0x17ef] = 0x76ba, [0x17f0] = 0x76c2,
-  [0x17f1] = 0x76cd, [0x17f2] = 0x76d6, [0x17f3] = 0x76d2, [0x17f4] = 0x76de,
-  [0x17f5] = 0x76e1, [0x17f6] = 0x76e5, [0x17f7] = 0x76e7, [0x17f8] = 0x76ea,
-  [0x17f9] = 0x862f, [0x17fa] = 0x76fb, [0x17fb] = 0x7708, [0x17fc] = 0x7707,
-  [0x17fd] = 0x7704, [0x17fe] = 0x7729, [0x17ff] = 0x7724, [0x1800] = 0x771e,
-  [0x1801] = 0x7725, [0x1802] = 0x7726, [0x1803] = 0x771b, [0x1804] = 0x7737,
-  [0x1805] = 0x7738, [0x1806] = 0x7747, [0x1807] = 0x775a, [0x1808] = 0x7768,
-  [0x1809] = 0x776b, [0x180a] = 0x775b, [0x180b] = 0x7765, [0x180c] = 0x777f,
-  [0x180d] = 0x777e, [0x180e] = 0x7779, [0x180f] = 0x778e, [0x1810] = 0x778b,
-  [0x1811] = 0x7791, [0x1812] = 0x77a0, [0x1813] = 0x779e, [0x1814] = 0x77b0,
-  [0x1815] = 0x77b6, [0x1816] = 0x77b9, [0x1817] = 0x77bf, [0x1818] = 0x77bc,
-  [0x1819] = 0x77bd, [0x181a] = 0x77bb, [0x181b] = 0x77c7, [0x181c] = 0x77cd,
-  [0x181d] = 0x77d7, [0x181e] = 0x77da, [0x181f] = 0x77dc, [0x1820] = 0x77e3,
-  [0x1821] = 0x77ee, [0x1822] = 0x77fc, [0x1823] = 0x780c, [0x1824] = 0x7812,
-  [0x1825] = 0x7926, [0x1826] = 0x7820, [0x1827] = 0x792a, [0x1828] = 0x7845,
-  [0x1829] = 0x788e, [0x182a] = 0x7874, [0x182b] = 0x7886, [0x182c] = 0x787c,
-  [0x182d] = 0x789a, [0x182e] = 0x788c, [0x182f] = 0x78a3, [0x1830] = 0x78b5,
-  [0x1831] = 0x78aa, [0x1832] = 0x78af, [0x1833] = 0x78d1, [0x1834] = 0x78c6,
-  [0x1835] = 0x78cb, [0x1836] = 0x78d4, [0x1837] = 0x78be, [0x1838] = 0x78bc,
-  [0x1839] = 0x78c5, [0x183a] = 0x78ca, [0x183b] = 0x78ec, [0x183c] = 0x78e7,
-  [0x183d] = 0x78da, [0x183e] = 0x78fd, [0x183f] = 0x78f4, [0x1840] = 0x7907,
-  [0x1841] = 0x7912, [0x1842] = 0x7911, [0x1843] = 0x7919, [0x1844] = 0x792c,
-  [0x1845] = 0x792b, [0x1846] = 0x7940, [0x1847] = 0x7960, [0x1848] = 0x7957,
-  [0x1849] = 0x795f, [0x184a] = 0x795a, [0x184b] = 0x7955, [0x184c] = 0x7953,
-  [0x184d] = 0x797a, [0x184e] = 0x797f, [0x184f] = 0x798a, [0x1850] = 0x799d,
-  [0x1851] = 0x79a7, [0x1852] = 0x9f4b, [0x1853] = 0x79aa, [0x1854] = 0x79ae,
-  [0x1855] = 0x79b3, [0x1856] = 0x79b9, [0x1857] = 0x79ba, [0x1858] = 0x79c9,
-  [0x1859] = 0x79d5, [0x185a] = 0x79e7, [0x185b] = 0x79ec, [0x185c] = 0x79e1,
-  [0x185d] = 0x79e3, [0x185e] = 0x7a08, [0x185f] = 0x7a0d, [0x1860] = 0x7a18,
-  [0x1861] = 0x7a19, [0x1862] = 0x7a20, [0x1863] = 0x7a1f, [0x1864] = 0x7980,
-  [0x1865] = 0x7a31, [0x1866] = 0x7a3b, [0x1867] = 0x7a3e, [0x1868] = 0x7a37,
-  [0x1869] = 0x7a43, [0x186a] = 0x7a57, [0x186b] = 0x7a49, [0x186c] = 0x7a61,
-  [0x186d] = 0x7a62, [0x186e] = 0x7a69, [0x186f] = 0x9f9d, [0x1870] = 0x7a70,
-  [0x1871] = 0x7a79, [0x1872] = 0x7a7d, [0x1873] = 0x7a88, [0x1874] = 0x7a97,
-  [0x1875] = 0x7a95, [0x1876] = 0x7a98, [0x1877] = 0x7a96, [0x1878] = 0x7aa9,
-  [0x1879] = 0x7ac8, [0x187a] = 0x7ab0, [0x187b] = 0x7ab6, [0x187c] = 0x7ac5,
-  [0x187d] = 0x7ac4, [0x187e] = 0x7abf, [0x187f] = 0x9083, [0x1880] = 0x7ac7,
-  [0x1881] = 0x7aca, [0x1882] = 0x7acd, [0x1883] = 0x7acf, [0x1884] = 0x7ad5,
-  [0x1885] = 0x7ad3, [0x1886] = 0x7ad9, [0x1887] = 0x7ada, [0x1888] = 0x7add,
-  [0x1889] = 0x7ae1, [0x188a] = 0x7ae2, [0x188b] = 0x7ae6, [0x188c] = 0x7aed,
-  [0x188d] = 0x7af0, [0x188e] = 0x7b02, [0x188f] = 0x7b0f, [0x1890] = 0x7b0a,
-  [0x1891] = 0x7b06, [0x1892] = 0x7b33, [0x1893] = 0x7b18, [0x1894] = 0x7b19,
-  [0x1895] = 0x7b1e, [0x1896] = 0x7b35, [0x1897] = 0x7b28, [0x1898] = 0x7b36,
-  [0x1899] = 0x7b50, [0x189a] = 0x7b7a, [0x189b] = 0x7b04, [0x189c] = 0x7b4d,
-  [0x189d] = 0x7b0b, [0x189e] = 0x7b4c, [0x189f] = 0x7b45, [0x18a0] = 0x7b75,
-  [0x18a1] = 0x7b65, [0x18a2] = 0x7b74, [0x18a3] = 0x7b67, [0x18a4] = 0x7b70,
-  [0x18a5] = 0x7b71, [0x18a6] = 0x7b6c, [0x18a7] = 0x7b6e, [0x18a8] = 0x7b9d,
-  [0x18a9] = 0x7b98, [0x18aa] = 0x7b9f, [0x18ab] = 0x7b8d, [0x18ac] = 0x7b9c,
-  [0x18ad] = 0x7b9a, [0x18ae] = 0x7b8b, [0x18af] = 0x7b92, [0x18b0] = 0x7b8f,
-  [0x18b1] = 0x7b5d, [0x18b2] = 0x7b99, [0x18b3] = 0x7bcb, [0x18b4] = 0x7bc1,
-  [0x18b5] = 0x7bcc, [0x18b6] = 0x7bcf, [0x18b7] = 0x7bb4, [0x18b8] = 0x7bc6,
-  [0x18b9] = 0x7bdd, [0x18ba] = 0x7be9, [0x18bb] = 0x7c11, [0x18bc] = 0x7c14,
-  [0x18bd] = 0x7be6, [0x18be] = 0x7be5, [0x18bf] = 0x7c60, [0x18c0] = 0x7c00,
-  [0x18c1] = 0x7c07, [0x18c2] = 0x7c13, [0x18c3] = 0x7bf3, [0x18c4] = 0x7bf7,
-  [0x18c5] = 0x7c17, [0x18c6] = 0x7c0d, [0x18c7] = 0x7bf6, [0x18c8] = 0x7c23,
-  [0x18c9] = 0x7c27, [0x18ca] = 0x7c2a, [0x18cb] = 0x7c1f, [0x18cc] = 0x7c37,
-  [0x18cd] = 0x7c2b, [0x18ce] = 0x7c3d, [0x18cf] = 0x7c4c, [0x18d0] = 0x7c43,
-  [0x18d1] = 0x7c54, [0x18d2] = 0x7c4f, [0x18d3] = 0x7c40, [0x18d4] = 0x7c50,
-  [0x18d5] = 0x7c58, [0x18d6] = 0x7c5f, [0x18d7] = 0x7c64, [0x18d8] = 0x7c56,
-  [0x18d9] = 0x7c65, [0x18da] = 0x7c6c, [0x18db] = 0x7c75, [0x18dc] = 0x7c83,
-  [0x18dd] = 0x7c90, [0x18de] = 0x7ca4, [0x18df] = 0x7cad, [0x18e0] = 0x7ca2,
-  [0x18e1] = 0x7cab, [0x18e2] = 0x7ca1, [0x18e3] = 0x7ca8, [0x18e4] = 0x7cb3,
-  [0x18e5] = 0x7cb2, [0x18e6] = 0x7cb1, [0x18e7] = 0x7cae, [0x18e8] = 0x7cb9,
-  [0x18e9] = 0x7cbd, [0x18ea] = 0x7cc0, [0x18eb] = 0x7cc5, [0x18ec] = 0x7cc2,
-  [0x18ed] = 0x7cd8, [0x18ee] = 0x7cd2, [0x18ef] = 0x7cdc, [0x18f0] = 0x7ce2,
-  [0x18f1] = 0x9b3b, [0x18f2] = 0x7cef, [0x18f3] = 0x7cf2, [0x18f4] = 0x7cf4,
-  [0x18f5] = 0x7cf6, [0x18f6] = 0x7cfa, [0x18f7] = 0x7d06, [0x18f8] = 0x7d02,
-  [0x18f9] = 0x7d1c, [0x18fa] = 0x7d15, [0x18fb] = 0x7d0a, [0x18fc] = 0x7d45,
-  [0x18fd] = 0x7d4b, [0x18fe] = 0x7d2e, [0x18ff] = 0x7d32, [0x1900] = 0x7d3f,
-  [0x1901] = 0x7d35, [0x1902] = 0x7d46, [0x1903] = 0x7d73, [0x1904] = 0x7d56,
-  [0x1905] = 0x7d4e, [0x1906] = 0x7d72, [0x1907] = 0x7d68, [0x1908] = 0x7d6e,
-  [0x1909] = 0x7d4f, [0x190a] = 0x7d63, [0x190b] = 0x7d93, [0x190c] = 0x7d89,
-  [0x190d] = 0x7d5b, [0x190e] = 0x7d8f, [0x190f] = 0x7d7d, [0x1910] = 0x7d9b,
-  [0x1911] = 0x7dba, [0x1912] = 0x7dae, [0x1913] = 0x7da3, [0x1914] = 0x7db5,
-  [0x1915] = 0x7dc7, [0x1916] = 0x7dbd, [0x1917] = 0x7dab, [0x1918] = 0x7e3d,
-  [0x1919] = 0x7da2, [0x191a] = 0x7daf, [0x191b] = 0x7ddc, [0x191c] = 0x7db8,
-  [0x191d] = 0x7d9f, [0x191e] = 0x7db0, [0x191f] = 0x7dd8, [0x1920] = 0x7ddd,
-  [0x1921] = 0x7de4, [0x1922] = 0x7dde, [0x1923] = 0x7dfb, [0x1924] = 0x7df2,
-  [0x1925] = 0x7de1, [0x1926] = 0x7e05, [0x1927] = 0x7e0a, [0x1928] = 0x7e23,
-  [0x1929] = 0x7e21, [0x192a] = 0x7e12, [0x192b] = 0x7e31, [0x192c] = 0x7e1f,
-  [0x192d] = 0x7e09, [0x192e] = 0x7e0b, [0x192f] = 0x7e22, [0x1930] = 0x7e46,
-  [0x1931] = 0x7e66, [0x1932] = 0x7e3b, [0x1933] = 0x7e35, [0x1934] = 0x7e39,
-  [0x1935] = 0x7e43, [0x1936] = 0x7e37, [0x1937] = 0x7e32, [0x1938] = 0x7e3a,
-  [0x1939] = 0x7e67, [0x193a] = 0x7e5d, [0x193b] = 0x7e56, [0x193c] = 0x7e5e,
-  [0x193d] = 0x7e59, [0x193e] = 0x7e5a, [0x193f] = 0x7e79, [0x1940] = 0x7e6a,
-  [0x1941] = 0x7e69, [0x1942] = 0x7e7c, [0x1943] = 0x7e7b, [0x1944] = 0x7e83,
-  [0x1945] = 0x7dd5, [0x1946] = 0x7e7d, [0x1947] = 0x8fae, [0x1948] = 0x7e7f,
-  [0x1949] = 0x7e88, [0x194a] = 0x7e89, [0x194b] = 0x7e8c, [0x194c] = 0x7e92,
-  [0x194d] = 0x7e90, [0x194e] = 0x7e93, [0x194f] = 0x7e94, [0x1950] = 0x7e96,
-  [0x1951] = 0x7e8e, [0x1952] = 0x7e9b, [0x1953] = 0x7e9c, [0x1954] = 0x7f38,
-  [0x1955] = 0x7f3a, [0x1956] = 0x7f45, [0x1957] = 0x7f4c, [0x1958] = 0x7f4d,
-  [0x1959] = 0x7f4e, [0x195a] = 0x7f50, [0x195b] = 0x7f51, [0x195c] = 0x7f55,
-  [0x195d] = 0x7f54, [0x195e] = 0x7f58, [0x195f] = 0x7f5f, [0x1960] = 0x7f60,
-  [0x1961] = 0x7f68, [0x1962] = 0x7f69, [0x1963] = 0x7f67, [0x1964] = 0x7f78,
-  [0x1965] = 0x7f82, [0x1966] = 0x7f86, [0x1967] = 0x7f83, [0x1968] = 0x7f88,
-  [0x1969] = 0x7f87, [0x196a] = 0x7f8c, [0x196b] = 0x7f94, [0x196c] = 0x7f9e,
-  [0x196d] = 0x7f9d, [0x196e] = 0x7f9a, [0x196f] = 0x7fa3, [0x1970] = 0x7faf,
-  [0x1971] = 0x7fb2, [0x1972] = 0x7fb9, [0x1973] = 0x7fae, [0x1974] = 0x7fb6,
-  [0x1975] = 0x7fb8, [0x1976] = 0x8b71, [0x1977] = 0x7fc5, [0x1978] = 0x7fc6,
-  [0x1979] = 0x7fca, [0x197a] = 0x7fd5, [0x197b] = 0x7fd4, [0x197c] = 0x7fe1,
-  [0x197d] = 0x7fe6, [0x197e] = 0x7fe9, [0x197f] = 0x7ff3, [0x1980] = 0x7ff9,
-  [0x1981] = 0x98dc, [0x1982] = 0x8006, [0x1983] = 0x8004, [0x1984] = 0x800b,
-  [0x1985] = 0x8012, [0x1986] = 0x8018, [0x1987] = 0x8019, [0x1988] = 0x801c,
-  [0x1989] = 0x8021, [0x198a] = 0x8028, [0x198b] = 0x803f, [0x198c] = 0x803b,
-  [0x198d] = 0x804a, [0x198e] = 0x8046, [0x198f] = 0x8052, [0x1990] = 0x8058,
-  [0x1991] = 0x805a, [0x1992] = 0x805f, [0x1993] = 0x8062, [0x1994] = 0x8068,
-  [0x1995] = 0x8073, [0x1996] = 0x8072, [0x1997] = 0x8070, [0x1998] = 0x8076,
-  [0x1999] = 0x8079, [0x199a] = 0x807d, [0x199b] = 0x807f, [0x199c] = 0x8084,
-  [0x199d] = 0x8086, [0x199e] = 0x8085, [0x199f] = 0x809b, [0x19a0] = 0x8093,
-  [0x19a1] = 0x809a, [0x19a2] = 0x80ad, [0x19a3] = 0x5190, [0x19a4] = 0x80ac,
-  [0x19a5] = 0x80db, [0x19a6] = 0x80e5, [0x19a7] = 0x80d9, [0x19a8] = 0x80dd,
-  [0x19a9] = 0x80c4, [0x19aa] = 0x80da, [0x19ab] = 0x80d6, [0x19ac] = 0x8109,
-  [0x19ad] = 0x80ef, [0x19ae] = 0x80f1, [0x19af] = 0x811b, [0x19b0] = 0x8129,
-  [0x19b1] = 0x8123, [0x19b2] = 0x812f, [0x19b3] = 0x814b, [0x19b4] = 0x968b,
-  [0x19b5] = 0x8146, [0x19b6] = 0x813e, [0x19b7] = 0x8153, [0x19b8] = 0x8151,
-  [0x19b9] = 0x80fc, [0x19ba] = 0x8171, [0x19bb] = 0x816e, [0x19bc] = 0x8165,
-  [0x19bd] = 0x8166, [0x19be] = 0x8174, [0x19bf] = 0x8183, [0x19c0] = 0x8188,
-  [0x19c1] = 0x818a, [0x19c2] = 0x8180, [0x19c3] = 0x8182, [0x19c4] = 0x81a0,
-  [0x19c5] = 0x8195, [0x19c6] = 0x81a4, [0x19c7] = 0x81a3, [0x19c8] = 0x815f,
-  [0x19c9] = 0x8193, [0x19ca] = 0x81a9, [0x19cb] = 0x81b0, [0x19cc] = 0x81b5,
-  [0x19cd] = 0x81be, [0x19ce] = 0x81b8, [0x19cf] = 0x81bd, [0x19d0] = 0x81c0,
-  [0x19d1] = 0x81c2, [0x19d2] = 0x81ba, [0x19d3] = 0x81c9, [0x19d4] = 0x81cd,
-  [0x19d5] = 0x81d1, [0x19d6] = 0x81d9, [0x19d7] = 0x81d8, [0x19d8] = 0x81c8,
-  [0x19d9] = 0x81da, [0x19da] = 0x81df, [0x19db] = 0x81e0, [0x19dc] = 0x81e7,
-  [0x19dd] = 0x81fa, [0x19de] = 0x81fb, [0x19df] = 0x81fe, [0x19e0] = 0x8201,
-  [0x19e1] = 0x8202, [0x19e2] = 0x8205, [0x19e3] = 0x8207, [0x19e4] = 0x820a,
-  [0x19e5] = 0x820d, [0x19e6] = 0x8210, [0x19e7] = 0x8216, [0x19e8] = 0x8229,
-  [0x19e9] = 0x822b, [0x19ea] = 0x8238, [0x19eb] = 0x8233, [0x19ec] = 0x8240,
-  [0x19ed] = 0x8259, [0x19ee] = 0x8258, [0x19ef] = 0x825d, [0x19f0] = 0x825a,
-  [0x19f1] = 0x825f, [0x19f2] = 0x8264, [0x19f3] = 0x8262, [0x19f4] = 0x8268,
-  [0x19f5] = 0x826a, [0x19f6] = 0x826b, [0x19f7] = 0x822e, [0x19f8] = 0x8271,
-  [0x19f9] = 0x8277, [0x19fa] = 0x8278, [0x19fb] = 0x827e, [0x19fc] = 0x828d,
-  [0x19fd] = 0x8292, [0x19fe] = 0x82ab, [0x19ff] = 0x829f, [0x1a00] = 0x82bb,
-  [0x1a01] = 0x82ac, [0x1a02] = 0x82e1, [0x1a03] = 0x82e3, [0x1a04] = 0x82df,
-  [0x1a05] = 0x82d2, [0x1a06] = 0x82f4, [0x1a07] = 0x82f3, [0x1a08] = 0x82fa,
-  [0x1a09] = 0x8393, [0x1a0a] = 0x8303, [0x1a0b] = 0x82fb, [0x1a0c] = 0x82f9,
-  [0x1a0d] = 0x82de, [0x1a0e] = 0x8306, [0x1a0f] = 0x82dc, [0x1a10] = 0x8309,
-  [0x1a11] = 0x82d9, [0x1a12] = 0x8335, [0x1a13] = 0x8334, [0x1a14] = 0x8316,
-  [0x1a15] = 0x8332, [0x1a16] = 0x8331, [0x1a17] = 0x8340, [0x1a18] = 0x8339,
-  [0x1a19] = 0x8350, [0x1a1a] = 0x8345, [0x1a1b] = 0x832f, [0x1a1c] = 0x832b,
-  [0x1a1d] = 0x8317, [0x1a1e] = 0x8318, [0x1a1f] = 0x8385, [0x1a20] = 0x839a,
-  [0x1a21] = 0x83aa, [0x1a22] = 0x839f, [0x1a23] = 0x83a2, [0x1a24] = 0x8396,
-  [0x1a25] = 0x8323, [0x1a26] = 0x838e, [0x1a27] = 0x8387, [0x1a28] = 0x838a,
-  [0x1a29] = 0x837c, [0x1a2a] = 0x83b5, [0x1a2b] = 0x8373, [0x1a2c] = 0x8375,
-  [0x1a2d] = 0x83a0, [0x1a2e] = 0x8389, [0x1a2f] = 0x83a8, [0x1a30] = 0x83f4,
-  [0x1a31] = 0x8413, [0x1a32] = 0x83eb, [0x1a33] = 0x83ce, [0x1a34] = 0x83fd,
-  [0x1a35] = 0x8403, [0x1a36] = 0x83d8, [0x1a37] = 0x840b, [0x1a38] = 0x83c1,
-  [0x1a39] = 0x83f7, [0x1a3a] = 0x8407, [0x1a3b] = 0x83e0, [0x1a3c] = 0x83f2,
-  [0x1a3d] = 0x840d, [0x1a3e] = 0x8422, [0x1a3f] = 0x8420, [0x1a40] = 0x83bd,
-  [0x1a41] = 0x8438, [0x1a42] = 0x8506, [0x1a43] = 0x83fb, [0x1a44] = 0x846d,
-  [0x1a45] = 0x842a, [0x1a46] = 0x843c, [0x1a47] = 0x855a, [0x1a48] = 0x8484,
-  [0x1a49] = 0x8477, [0x1a4a] = 0x846b, [0x1a4b] = 0x84ad, [0x1a4c] = 0x846e,
-  [0x1a4d] = 0x8482, [0x1a4e] = 0x8469, [0x1a4f] = 0x8446, [0x1a50] = 0x842c,
-  [0x1a51] = 0x846f, [0x1a52] = 0x8479, [0x1a53] = 0x8435, [0x1a54] = 0x84ca,
-  [0x1a55] = 0x8462, [0x1a56] = 0x84b9, [0x1a57] = 0x84bf, [0x1a58] = 0x849f,
-  [0x1a59] = 0x84d9, [0x1a5a] = 0x84cd, [0x1a5b] = 0x84bb, [0x1a5c] = 0x84da,
-  [0x1a5d] = 0x84d0, [0x1a5e] = 0x84c1, [0x1a5f] = 0x84c6, [0x1a60] = 0x84d6,
-  [0x1a61] = 0x84a1, [0x1a62] = 0x8521, [0x1a63] = 0x84ff, [0x1a64] = 0x84f4,
-  [0x1a65] = 0x8517, [0x1a66] = 0x8518, [0x1a67] = 0x852c, [0x1a68] = 0x851f,
-  [0x1a69] = 0x8515, [0x1a6a] = 0x8514, [0x1a6b] = 0x84fc, [0x1a6c] = 0x8540,
-  [0x1a6d] = 0x8563, [0x1a6e] = 0x8558, [0x1a6f] = 0x8548, [0x1a70] = 0x8541,
-  [0x1a71] = 0x8602, [0x1a72] = 0x854b, [0x1a73] = 0x8555, [0x1a74] = 0x8580,
-  [0x1a75] = 0x85a4, [0x1a76] = 0x8588, [0x1a77] = 0x8591, [0x1a78] = 0x858a,
-  [0x1a79] = 0x85a8, [0x1a7a] = 0x856d, [0x1a7b] = 0x8594, [0x1a7c] = 0x859b,
-  [0x1a7d] = 0x85ea, [0x1a7e] = 0x8587, [0x1a7f] = 0x859c, [0x1a80] = 0x8577,
-  [0x1a81] = 0x857e, [0x1a82] = 0x8590, [0x1a83] = 0x85c9, [0x1a84] = 0x85ba,
-  [0x1a85] = 0x85cf, [0x1a86] = 0x85b9, [0x1a87] = 0x85d0, [0x1a88] = 0x85d5,
-  [0x1a89] = 0x85dd, [0x1a8a] = 0x85e5, [0x1a8b] = 0x85dc, [0x1a8c] = 0x85f9,
-  [0x1a8d] = 0x860a, [0x1a8e] = 0x8613, [0x1a8f] = 0x860b, [0x1a90] = 0x85fe,
-  [0x1a91] = 0x85fa, [0x1a92] = 0x8606, [0x1a93] = 0x8622, [0x1a94] = 0x861a,
-  [0x1a95] = 0x8630, [0x1a96] = 0x863f, [0x1a97] = 0x864d, [0x1a98] = 0x4e55,
-  [0x1a99] = 0x8654, [0x1a9a] = 0x865f, [0x1a9b] = 0x8667, [0x1a9c] = 0x8671,
-  [0x1a9d] = 0x8693, [0x1a9e] = 0x86a3, [0x1a9f] = 0x86a9, [0x1aa0] = 0x86aa,
-  [0x1aa1] = 0x868b, [0x1aa2] = 0x868c, [0x1aa3] = 0x86b6, [0x1aa4] = 0x86af,
-  [0x1aa5] = 0x86c4, [0x1aa6] = 0x86c6, [0x1aa7] = 0x86b0, [0x1aa8] = 0x86c9,
-  [0x1aa9] = 0x8823, [0x1aaa] = 0x86ab, [0x1aab] = 0x86d4, [0x1aac] = 0x86de,
-  [0x1aad] = 0x86e9, [0x1aae] = 0x86ec, [0x1aaf] = 0x86df, [0x1ab0] = 0x86db,
-  [0x1ab1] = 0x86ef, [0x1ab2] = 0x8712, [0x1ab3] = 0x8706, [0x1ab4] = 0x8708,
-  [0x1ab5] = 0x8700, [0x1ab6] = 0x8703, [0x1ab7] = 0x86fb, [0x1ab8] = 0x8711,
-  [0x1ab9] = 0x8709, [0x1aba] = 0x870d, [0x1abb] = 0x86f9, [0x1abc] = 0x870a,
-  [0x1abd] = 0x8734, [0x1abe] = 0x873f, [0x1abf] = 0x8737, [0x1ac0] = 0x873b,
-  [0x1ac1] = 0x8725, [0x1ac2] = 0x8729, [0x1ac3] = 0x871a, [0x1ac4] = 0x8760,
-  [0x1ac5] = 0x875f, [0x1ac6] = 0x8778, [0x1ac7] = 0x874c, [0x1ac8] = 0x874e,
-  [0x1ac9] = 0x8774, [0x1aca] = 0x8757, [0x1acb] = 0x8768, [0x1acc] = 0x876e,
-  [0x1acd] = 0x8759, [0x1ace] = 0x8753, [0x1acf] = 0x8763, [0x1ad0] = 0x876a,
-  [0x1ad1] = 0x8805, [0x1ad2] = 0x87a2, [0x1ad3] = 0x879f, [0x1ad4] = 0x8782,
-  [0x1ad5] = 0x87af, [0x1ad6] = 0x87cb, [0x1ad7] = 0x87bd, [0x1ad8] = 0x87c0,
-  [0x1ad9] = 0x87d0, [0x1ada] = 0x96d6, [0x1adb] = 0x87ab, [0x1adc] = 0x87c4,
-  [0x1add] = 0x87b3, [0x1ade] = 0x87c7, [0x1adf] = 0x87c6, [0x1ae0] = 0x87bb,
-  [0x1ae1] = 0x87ef, [0x1ae2] = 0x87f2, [0x1ae3] = 0x87e0, [0x1ae4] = 0x880f,
-  [0x1ae5] = 0x880d, [0x1ae6] = 0x87fe, [0x1ae7] = 0x87f6, [0x1ae8] = 0x87f7,
-  [0x1ae9] = 0x880e, [0x1aea] = 0x87d2, [0x1aeb] = 0x8811, [0x1aec] = 0x8816,
-  [0x1aed] = 0x8815, [0x1aee] = 0x8822, [0x1aef] = 0x8821, [0x1af0] = 0x8831,
-  [0x1af1] = 0x8836, [0x1af2] = 0x8839, [0x1af3] = 0x8827, [0x1af4] = 0x883b,
-  [0x1af5] = 0x8844, [0x1af6] = 0x8842, [0x1af7] = 0x8852, [0x1af8] = 0x8859,
-  [0x1af9] = 0x885e, [0x1afa] = 0x8862, [0x1afb] = 0x886b, [0x1afc] = 0x8881,
-  [0x1afd] = 0x887e, [0x1afe] = 0x889e, [0x1aff] = 0x8875, [0x1b00] = 0x887d,
-  [0x1b01] = 0x88b5, [0x1b02] = 0x8872, [0x1b03] = 0x8882, [0x1b04] = 0x8897,
-  [0x1b05] = 0x8892, [0x1b06] = 0x88ae, [0x1b07] = 0x8899, [0x1b08] = 0x88a2,
-  [0x1b09] = 0x888d, [0x1b0a] = 0x88a4, [0x1b0b] = 0x88b0, [0x1b0c] = 0x88bf,
-  [0x1b0d] = 0x88b1, [0x1b0e] = 0x88c3, [0x1b0f] = 0x88c4, [0x1b10] = 0x88d4,
-  [0x1b11] = 0x88d8, [0x1b12] = 0x88d9, [0x1b13] = 0x88dd, [0x1b14] = 0x88f9,
-  [0x1b15] = 0x8902, [0x1b16] = 0x88fc, [0x1b17] = 0x88f4, [0x1b18] = 0x88e8,
-  [0x1b19] = 0x88f2, [0x1b1a] = 0x8904, [0x1b1b] = 0x890c, [0x1b1c] = 0x890a,
-  [0x1b1d] = 0x8913, [0x1b1e] = 0x8943, [0x1b1f] = 0x891e, [0x1b20] = 0x8925,
-  [0x1b21] = 0x892a, [0x1b22] = 0x892b, [0x1b23] = 0x8941, [0x1b24] = 0x8944,
-  [0x1b25] = 0x893b, [0x1b26] = 0x8936, [0x1b27] = 0x8938, [0x1b28] = 0x894c,
-  [0x1b29] = 0x891d, [0x1b2a] = 0x8960, [0x1b2b] = 0x895e, [0x1b2c] = 0x8966,
-  [0x1b2d] = 0x8964, [0x1b2e] = 0x896d, [0x1b2f] = 0x896a, [0x1b30] = 0x896f,
-  [0x1b31] = 0x8974, [0x1b32] = 0x8977, [0x1b33] = 0x897e, [0x1b34] = 0x8983,
-  [0x1b35] = 0x8988, [0x1b36] = 0x898a, [0x1b37] = 0x8993, [0x1b38] = 0x8998,
-  [0x1b39] = 0x89a1, [0x1b3a] = 0x89a9, [0x1b3b] = 0x89a6, [0x1b3c] = 0x89ac,
-  [0x1b3d] = 0x89af, [0x1b3e] = 0x89b2, [0x1b3f] = 0x89ba, [0x1b40] = 0x89bd,
-  [0x1b41] = 0x89bf, [0x1b42] = 0x89c0, [0x1b43] = 0x89da, [0x1b44] = 0x89dc,
-  [0x1b45] = 0x89dd, [0x1b46] = 0x89e7, [0x1b47] = 0x89f4, [0x1b48] = 0x89f8,
-  [0x1b49] = 0x8a03, [0x1b4a] = 0x8a16, [0x1b4b] = 0x8a10, [0x1b4c] = 0x8a0c,
-  [0x1b4d] = 0x8a1b, [0x1b4e] = 0x8a1d, [0x1b4f] = 0x8a25, [0x1b50] = 0x8a36,
-  [0x1b51] = 0x8a41, [0x1b52] = 0x8a5b, [0x1b53] = 0x8a52, [0x1b54] = 0x8a46,
-  [0x1b55] = 0x8a48, [0x1b56] = 0x8a7c, [0x1b57] = 0x8a6d, [0x1b58] = 0x8a6c,
-  [0x1b59] = 0x8a62, [0x1b5a] = 0x8a85, [0x1b5b] = 0x8a82, [0x1b5c] = 0x8a84,
-  [0x1b5d] = 0x8aa8, [0x1b5e] = 0x8aa1, [0x1b5f] = 0x8a91, [0x1b60] = 0x8aa5,
-  [0x1b61] = 0x8aa6, [0x1b62] = 0x8a9a, [0x1b63] = 0x8aa3, [0x1b64] = 0x8ac4,
-  [0x1b65] = 0x8acd, [0x1b66] = 0x8ac2, [0x1b67] = 0x8ada, [0x1b68] = 0x8aeb,
-  [0x1b69] = 0x8af3, [0x1b6a] = 0x8ae7, [0x1b6b] = 0x8ae4, [0x1b6c] = 0x8af1,
-  [0x1b6d] = 0x8b14, [0x1b6e] = 0x8ae0, [0x1b6f] = 0x8ae2, [0x1b70] = 0x8af7,
-  [0x1b71] = 0x8ade, [0x1b72] = 0x8adb, [0x1b73] = 0x8b0c, [0x1b74] = 0x8b07,
-  [0x1b75] = 0x8b1a, [0x1b76] = 0x8ae1, [0x1b77] = 0x8b16, [0x1b78] = 0x8b10,
-  [0x1b79] = 0x8b17, [0x1b7a] = 0x8b20, [0x1b7b] = 0x8b33, [0x1b7c] = 0x97ab,
-  [0x1b7d] = 0x8b26, [0x1b7e] = 0x8b2b, [0x1b7f] = 0x8b3e, [0x1b80] = 0x8b28,
-  [0x1b81] = 0x8b41, [0x1b82] = 0x8b4c, [0x1b83] = 0x8b4f, [0x1b84] = 0x8b4e,
-  [0x1b85] = 0x8b49, [0x1b86] = 0x8b56, [0x1b87] = 0x8b5b, [0x1b88] = 0x8b5a,
-  [0x1b89] = 0x8b6b, [0x1b8a] = 0x8b5f, [0x1b8b] = 0x8b6c, [0x1b8c] = 0x8b6f,
-  [0x1b8d] = 0x8b74, [0x1b8e] = 0x8b7d, [0x1b8f] = 0x8b80, [0x1b90] = 0x8b8c,
-  [0x1b91] = 0x8b8e, [0x1b92] = 0x8b92, [0x1b93] = 0x8b93, [0x1b94] = 0x8b96,
-  [0x1b95] = 0x8b99, [0x1b96] = 0x8b9a, [0x1b97] = 0x8c3a, [0x1b98] = 0x8c41,
-  [0x1b99] = 0x8c3f, [0x1b9a] = 0x8c48, [0x1b9b] = 0x8c4c, [0x1b9c] = 0x8c4e,
-  [0x1b9d] = 0x8c50, [0x1b9e] = 0x8c55, [0x1b9f] = 0x8c62, [0x1ba0] = 0x8c6c,
-  [0x1ba1] = 0x8c78, [0x1ba2] = 0x8c7a, [0x1ba3] = 0x8c82, [0x1ba4] = 0x8c89,
-  [0x1ba5] = 0x8c85, [0x1ba6] = 0x8c8a, [0x1ba7] = 0x8c8d, [0x1ba8] = 0x8c8e,
-  [0x1ba9] = 0x8c94, [0x1baa] = 0x8c7c, [0x1bab] = 0x8c98, [0x1bac] = 0x621d,
-  [0x1bad] = 0x8cad, [0x1bae] = 0x8caa, [0x1baf] = 0x8cbd, [0x1bb0] = 0x8cb2,
-  [0x1bb1] = 0x8cb3, [0x1bb2] = 0x8cae, [0x1bb3] = 0x8cb6, [0x1bb4] = 0x8cc8,
-  [0x1bb5] = 0x8cc1, [0x1bb6] = 0x8ce4, [0x1bb7] = 0x8ce3, [0x1bb8] = 0x8cda,
-  [0x1bb9] = 0x8cfd, [0x1bba] = 0x8cfa, [0x1bbb] = 0x8cfb, [0x1bbc] = 0x8d04,
-  [0x1bbd] = 0x8d05, [0x1bbe] = 0x8d0a, [0x1bbf] = 0x8d07, [0x1bc0] = 0x8d0f,
-  [0x1bc1] = 0x8d0d, [0x1bc2] = 0x8d10, [0x1bc3] = 0x9f4e, [0x1bc4] = 0x8d13,
-  [0x1bc5] = 0x8ccd, [0x1bc6] = 0x8d14, [0x1bc7] = 0x8d16, [0x1bc8] = 0x8d67,
-  [0x1bc9] = 0x8d6d, [0x1bca] = 0x8d71, [0x1bcb] = 0x8d73, [0x1bcc] = 0x8d81,
-  [0x1bcd] = 0x8d99, [0x1bce] = 0x8dc2, [0x1bcf] = 0x8dbe, [0x1bd0] = 0x8dba,
-  [0x1bd1] = 0x8dcf, [0x1bd2] = 0x8dda, [0x1bd3] = 0x8dd6, [0x1bd4] = 0x8dcc,
-  [0x1bd5] = 0x8ddb, [0x1bd6] = 0x8dcb, [0x1bd7] = 0x8dea, [0x1bd8] = 0x8deb,
-  [0x1bd9] = 0x8ddf, [0x1bda] = 0x8de3, [0x1bdb] = 0x8dfc, [0x1bdc] = 0x8e08,
-  [0x1bdd] = 0x8e09, [0x1bde] = 0x8dff, [0x1bdf] = 0x8e1d, [0x1be0] = 0x8e1e,
-  [0x1be1] = 0x8e10, [0x1be2] = 0x8e1f, [0x1be3] = 0x8e42, [0x1be4] = 0x8e35,
-  [0x1be5] = 0x8e30, [0x1be6] = 0x8e34, [0x1be7] = 0x8e4a, [0x1be8] = 0x8e47,
-  [0x1be9] = 0x8e49, [0x1bea] = 0x8e4c, [0x1beb] = 0x8e50, [0x1bec] = 0x8e48,
-  [0x1bed] = 0x8e59, [0x1bee] = 0x8e64, [0x1bef] = 0x8e60, [0x1bf0] = 0x8e2a,
-  [0x1bf1] = 0x8e63, [0x1bf2] = 0x8e55, [0x1bf3] = 0x8e76, [0x1bf4] = 0x8e72,
-  [0x1bf5] = 0x8e7c, [0x1bf6] = 0x8e81, [0x1bf7] = 0x8e87, [0x1bf8] = 0x8e85,
-  [0x1bf9] = 0x8e84, [0x1bfa] = 0x8e8b, [0x1bfb] = 0x8e8a, [0x1bfc] = 0x8e93,
-  [0x1bfd] = 0x8e91, [0x1bfe] = 0x8e94, [0x1bff] = 0x8e99, [0x1c00] = 0x8eaa,
-  [0x1c01] = 0x8ea1, [0x1c02] = 0x8eac, [0x1c03] = 0x8eb0, [0x1c04] = 0x8ec6,
-  [0x1c05] = 0x8eb1, [0x1c06] = 0x8ebe, [0x1c07] = 0x8ec5, [0x1c08] = 0x8ec8,
-  [0x1c09] = 0x8ecb, [0x1c0a] = 0x8edb, [0x1c0b] = 0x8ee3, [0x1c0c] = 0x8efc,
-  [0x1c0d] = 0x8efb, [0x1c0e] = 0x8eeb, [0x1c0f] = 0x8efe, [0x1c10] = 0x8f0a,
-  [0x1c11] = 0x8f05, [0x1c12] = 0x8f15, [0x1c13] = 0x8f12, [0x1c14] = 0x8f19,
-  [0x1c15] = 0x8f13, [0x1c16] = 0x8f1c, [0x1c17] = 0x8f1f, [0x1c18] = 0x8f1b,
-  [0x1c19] = 0x8f0c, [0x1c1a] = 0x8f26, [0x1c1b] = 0x8f33, [0x1c1c] = 0x8f3b,
-  [0x1c1d] = 0x8f39, [0x1c1e] = 0x8f45, [0x1c1f] = 0x8f42, [0x1c20] = 0x8f3e,
-  [0x1c21] = 0x8f4c, [0x1c22] = 0x8f49, [0x1c23] = 0x8f46, [0x1c24] = 0x8f4e,
-  [0x1c25] = 0x8f57, [0x1c26] = 0x8f5c, [0x1c27] = 0x8f62, [0x1c28] = 0x8f63,
-  [0x1c29] = 0x8f64, [0x1c2a] = 0x8f9c, [0x1c2b] = 0x8f9f, [0x1c2c] = 0x8fa3,
-  [0x1c2d] = 0x8fad, [0x1c2e] = 0x8faf, [0x1c2f] = 0x8fb7, [0x1c30] = 0x8fda,
-  [0x1c31] = 0x8fe5, [0x1c32] = 0x8fe2, [0x1c33] = 0x8fea, [0x1c34] = 0x8fef,
-  [0x1c35] = 0x9087, [0x1c36] = 0x8ff4, [0x1c37] = 0x9005, [0x1c38] = 0x8ff9,
-  [0x1c39] = 0x8ffa, [0x1c3a] = 0x9011, [0x1c3b] = 0x9015, [0x1c3c] = 0x9021,
-  [0x1c3d] = 0x900d, [0x1c3e] = 0x901e, [0x1c3f] = 0x9016, [0x1c40] = 0x900b,
-  [0x1c41] = 0x9027, [0x1c42] = 0x9036, [0x1c43] = 0x9035, [0x1c44] = 0x9039,
-  [0x1c45] = 0x8ff8, [0x1c46] = 0x904f, [0x1c47] = 0x9050, [0x1c48] = 0x9051,
-  [0x1c49] = 0x9052, [0x1c4a] = 0x900e, [0x1c4b] = 0x9049, [0x1c4c] = 0x903e,
-  [0x1c4d] = 0x9056, [0x1c4e] = 0x9058, [0x1c4f] = 0x905e, [0x1c50] = 0x9068,
-  [0x1c51] = 0x906f, [0x1c52] = 0x9076, [0x1c53] = 0x96a8, [0x1c54] = 0x9072,
-  [0x1c55] = 0x9082, [0x1c56] = 0x907d, [0x1c57] = 0x9081, [0x1c58] = 0x9080,
-  [0x1c59] = 0x908a, [0x1c5a] = 0x9089, [0x1c5b] = 0x908f, [0x1c5c] = 0x90a8,
-  [0x1c5d] = 0x90af, [0x1c5e] = 0x90b1, [0x1c5f] = 0x90b5, [0x1c60] = 0x90e2,
-  [0x1c61] = 0x90e4, [0x1c62] = 0x6248, [0x1c63] = 0x90db, [0x1c64] = 0x9102,
-  [0x1c65] = 0x9112, [0x1c66] = 0x9119, [0x1c67] = 0x9132, [0x1c68] = 0x9130,
-  [0x1c69] = 0x914a, [0x1c6a] = 0x9156, [0x1c6b] = 0x9158, [0x1c6c] = 0x9163,
-  [0x1c6d] = 0x9165, [0x1c6e] = 0x9169, [0x1c6f] = 0x9173, [0x1c70] = 0x9172,
-  [0x1c71] = 0x918b, [0x1c72] = 0x9189, [0x1c73] = 0x9182, [0x1c74] = 0x91a2,
-  [0x1c75] = 0x91ab, [0x1c76] = 0x91af, [0x1c77] = 0x91aa, [0x1c78] = 0x91b5,
-  [0x1c79] = 0x91b4, [0x1c7a] = 0x91ba, [0x1c7b] = 0x91c0, [0x1c7c] = 0x91c1,
-  [0x1c7d] = 0x91c9, [0x1c7e] = 0x91cb, [0x1c7f] = 0x91d0, [0x1c80] = 0x91d6,
-  [0x1c81] = 0x91df, [0x1c82] = 0x91e1, [0x1c83] = 0x91db, [0x1c84] = 0x91fc,
-  [0x1c85] = 0x91f5, [0x1c86] = 0x91f6, [0x1c87] = 0x921e, [0x1c88] = 0x91ff,
-  [0x1c89] = 0x9214, [0x1c8a] = 0x922c, [0x1c8b] = 0x9215, [0x1c8c] = 0x9211,
-  [0x1c8d] = 0x925e, [0x1c8e] = 0x9257, [0x1c8f] = 0x9245, [0x1c90] = 0x9249,
-  [0x1c91] = 0x9264, [0x1c92] = 0x9248, [0x1c93] = 0x9295, [0x1c94] = 0x923f,
-  [0x1c95] = 0x924b, [0x1c96] = 0x9250, [0x1c97] = 0x929c, [0x1c98] = 0x9296,
-  [0x1c99] = 0x9293, [0x1c9a] = 0x929b, [0x1c9b] = 0x925a, [0x1c9c] = 0x92cf,
-  [0x1c9d] = 0x92b9, [0x1c9e] = 0x92b7, [0x1c9f] = 0x92e9, [0x1ca0] = 0x930f,
-  [0x1ca1] = 0x92fa, [0x1ca2] = 0x9344, [0x1ca3] = 0x932e, [0x1ca4] = 0x9319,
-  [0x1ca5] = 0x9322, [0x1ca6] = 0x931a, [0x1ca7] = 0x9323, [0x1ca8] = 0x933a,
-  [0x1ca9] = 0x9335, [0x1caa] = 0x933b, [0x1cab] = 0x935c, [0x1cac] = 0x9360,
-  [0x1cad] = 0x937c, [0x1cae] = 0x936e, [0x1caf] = 0x9356, [0x1cb0] = 0x93b0,
-  [0x1cb1] = 0x93ac, [0x1cb2] = 0x93ad, [0x1cb3] = 0x9394, [0x1cb4] = 0x93b9,
-  [0x1cb5] = 0x93d6, [0x1cb6] = 0x93d7, [0x1cb7] = 0x93e8, [0x1cb8] = 0x93e5,
-  [0x1cb9] = 0x93d8, [0x1cba] = 0x93c3, [0x1cbb] = 0x93dd, [0x1cbc] = 0x93d0,
-  [0x1cbd] = 0x93c8, [0x1cbe] = 0x93e4, [0x1cbf] = 0x941a, [0x1cc0] = 0x9414,
-  [0x1cc1] = 0x9413, [0x1cc2] = 0x9403, [0x1cc3] = 0x9407, [0x1cc4] = 0x9410,
-  [0x1cc5] = 0x9436, [0x1cc6] = 0x942b, [0x1cc7] = 0x9435, [0x1cc8] = 0x9421,
-  [0x1cc9] = 0x943a, [0x1cca] = 0x9441, [0x1ccb] = 0x9452, [0x1ccc] = 0x9444,
-  [0x1ccd] = 0x945b, [0x1cce] = 0x9460, [0x1ccf] = 0x9462, [0x1cd0] = 0x945e,
-  [0x1cd1] = 0x946a, [0x1cd2] = 0x9229, [0x1cd3] = 0x9470, [0x1cd4] = 0x9475,
-  [0x1cd5] = 0x9477, [0x1cd6] = 0x947d, [0x1cd7] = 0x945a, [0x1cd8] = 0x947c,
-  [0x1cd9] = 0x947e, [0x1cda] = 0x9481, [0x1cdb] = 0x947f, [0x1cdc] = 0x9582,
-  [0x1cdd] = 0x9587, [0x1cde] = 0x958a, [0x1cdf] = 0x9594, [0x1ce0] = 0x9596,
-  [0x1ce1] = 0x9598, [0x1ce2] = 0x9599, [0x1ce3] = 0x95a0, [0x1ce4] = 0x95a8,
-  [0x1ce5] = 0x95a7, [0x1ce6] = 0x95ad, [0x1ce7] = 0x95bc, [0x1ce8] = 0x95bb,
-  [0x1ce9] = 0x95b9, [0x1cea] = 0x95be, [0x1ceb] = 0x95ca, [0x1cec] = 0x6ff6,
-  [0x1ced] = 0x95c3, [0x1cee] = 0x95cd, [0x1cef] = 0x95cc, [0x1cf0] = 0x95d5,
-  [0x1cf1] = 0x95d4, [0x1cf2] = 0x95d6, [0x1cf3] = 0x95dc, [0x1cf4] = 0x95e1,
-  [0x1cf5] = 0x95e5, [0x1cf6] = 0x95e2, [0x1cf7] = 0x9621, [0x1cf8] = 0x9628,
-  [0x1cf9] = 0x962e, [0x1cfa] = 0x962f, [0x1cfb] = 0x9642, [0x1cfc] = 0x964c,
-  [0x1cfd] = 0x964f, [0x1cfe] = 0x964b, [0x1cff] = 0x9677, [0x1d00] = 0x965c,
-  [0x1d01] = 0x965e, [0x1d02] = 0x965d, [0x1d03] = 0x965f, [0x1d04] = 0x9666,
-  [0x1d05] = 0x9672, [0x1d06] = 0x966c, [0x1d07] = 0x968d, [0x1d08] = 0x9698,
-  [0x1d09] = 0x9695, [0x1d0a] = 0x9697, [0x1d0b] = 0x96aa, [0x1d0c] = 0x96a7,
-  [0x1d0d] = 0x96b1, [0x1d0e] = 0x96b2, [0x1d0f] = 0x96b0, [0x1d10] = 0x96b4,
-  [0x1d11] = 0x96b6, [0x1d12] = 0x96b8, [0x1d13] = 0x96b9, [0x1d14] = 0x96ce,
-  [0x1d15] = 0x96cb, [0x1d16] = 0x96c9, [0x1d17] = 0x96cd, [0x1d18] = 0x894d,
-  [0x1d19] = 0x96dc, [0x1d1a] = 0x970d, [0x1d1b] = 0x96d5, [0x1d1c] = 0x96f9,
-  [0x1d1d] = 0x9704, [0x1d1e] = 0x9706, [0x1d1f] = 0x9708, [0x1d20] = 0x9713,
-  [0x1d21] = 0x970e, [0x1d22] = 0x9711, [0x1d23] = 0x970f, [0x1d24] = 0x9716,
-  [0x1d25] = 0x9719, [0x1d26] = 0x9724, [0x1d27] = 0x972a, [0x1d28] = 0x9730,
-  [0x1d29] = 0x9739, [0x1d2a] = 0x973d, [0x1d2b] = 0x973e, [0x1d2c] = 0x9744,
-  [0x1d2d] = 0x9746, [0x1d2e] = 0x9748, [0x1d2f] = 0x9742, [0x1d30] = 0x9749,
-  [0x1d31] = 0x975c, [0x1d32] = 0x9760, [0x1d33] = 0x9764, [0x1d34] = 0x9766,
-  [0x1d35] = 0x9768, [0x1d36] = 0x52d2, [0x1d37] = 0x976b, [0x1d38] = 0x9771,
-  [0x1d39] = 0x9779, [0x1d3a] = 0x9785, [0x1d3b] = 0x977c, [0x1d3c] = 0x9781,
-  [0x1d3d] = 0x977a, [0x1d3e] = 0x9786, [0x1d3f] = 0x978b, [0x1d40] = 0x978f,
-  [0x1d41] = 0x9790, [0x1d42] = 0x979c, [0x1d43] = 0x97a8, [0x1d44] = 0x97a6,
-  [0x1d45] = 0x97a3, [0x1d46] = 0x97b3, [0x1d47] = 0x97b4, [0x1d48] = 0x97c3,
-  [0x1d49] = 0x97c6, [0x1d4a] = 0x97c8, [0x1d4b] = 0x97cb, [0x1d4c] = 0x97dc,
-  [0x1d4d] = 0x97ed, [0x1d4e] = 0x9f4f, [0x1d4f] = 0x97f2, [0x1d50] = 0x7adf,
-  [0x1d51] = 0x97f6, [0x1d52] = 0x97f5, [0x1d53] = 0x980f, [0x1d54] = 0x980c,
-  [0x1d55] = 0x9838, [0x1d56] = 0x9824, [0x1d57] = 0x9821, [0x1d58] = 0x9837,
-  [0x1d59] = 0x983d, [0x1d5a] = 0x9846, [0x1d5b] = 0x984f, [0x1d5c] = 0x984b,
-  [0x1d5d] = 0x986b, [0x1d5e] = 0x986f, [0x1d5f] = 0x9870, [0x1d60] = 0x9871,
-  [0x1d61] = 0x9874, [0x1d62] = 0x9873, [0x1d63] = 0x98aa, [0x1d64] = 0x98af,
-  [0x1d65] = 0x98b1, [0x1d66] = 0x98b6, [0x1d67] = 0x98c4, [0x1d68] = 0x98c3,
-  [0x1d69] = 0x98c6, [0x1d6a] = 0x98e9, [0x1d6b] = 0x98eb, [0x1d6c] = 0x9903,
-  [0x1d6d] = 0x9909, [0x1d6e] = 0x9912, [0x1d6f] = 0x9914, [0x1d70] = 0x9918,
-  [0x1d71] = 0x9921, [0x1d72] = 0x991d, [0x1d73] = 0x991e, [0x1d74] = 0x9924,
-  [0x1d75] = 0x9920, [0x1d76] = 0x992c, [0x1d77] = 0x992e, [0x1d78] = 0x993d,
-  [0x1d79] = 0x993e, [0x1d7a] = 0x9942, [0x1d7b] = 0x9949, [0x1d7c] = 0x9945,
-  [0x1d7d] = 0x9950, [0x1d7e] = 0x994b, [0x1d7f] = 0x9951, [0x1d80] = 0x9952,
-  [0x1d81] = 0x994c, [0x1d82] = 0x9955, [0x1d83] = 0x9997, [0x1d84] = 0x9998,
-  [0x1d85] = 0x99a5, [0x1d86] = 0x99ad, [0x1d87] = 0x99ae, [0x1d88] = 0x99bc,
-  [0x1d89] = 0x99df, [0x1d8a] = 0x99db, [0x1d8b] = 0x99dd, [0x1d8c] = 0x99d8,
-  [0x1d8d] = 0x99d1, [0x1d8e] = 0x99ed, [0x1d8f] = 0x99ee, [0x1d90] = 0x99f1,
-  [0x1d91] = 0x99f2, [0x1d92] = 0x99fb, [0x1d93] = 0x99f8, [0x1d94] = 0x9a01,
-  [0x1d95] = 0x9a0f, [0x1d96] = 0x9a05, [0x1d97] = 0x99e2, [0x1d98] = 0x9a19,
-  [0x1d99] = 0x9a2b, [0x1d9a] = 0x9a37, [0x1d9b] = 0x9a45, [0x1d9c] = 0x9a42,
-  [0x1d9d] = 0x9a40, [0x1d9e] = 0x9a43, [0x1d9f] = 0x9a3e, [0x1da0] = 0x9a55,
-  [0x1da1] = 0x9a4d, [0x1da2] = 0x9a5b, [0x1da3] = 0x9a57, [0x1da4] = 0x9a5f,
-  [0x1da5] = 0x9a62, [0x1da6] = 0x9a65, [0x1da7] = 0x9a64, [0x1da8] = 0x9a69,
-  [0x1da9] = 0x9a6b, [0x1daa] = 0x9a6a, [0x1dab] = 0x9aad, [0x1dac] = 0x9ab0,
-  [0x1dad] = 0x9abc, [0x1dae] = 0x9ac0, [0x1daf] = 0x9acf, [0x1db0] = 0x9ad1,
-  [0x1db1] = 0x9ad3, [0x1db2] = 0x9ad4, [0x1db3] = 0x9ade, [0x1db4] = 0x9adf,
-  [0x1db5] = 0x9ae2, [0x1db6] = 0x9ae3, [0x1db7] = 0x9ae6, [0x1db8] = 0x9aef,
-  [0x1db9] = 0x9aeb, [0x1dba] = 0x9aee, [0x1dbb] = 0x9af4, [0x1dbc] = 0x9af1,
-  [0x1dbd] = 0x9af7, [0x1dbe] = 0x9afb, [0x1dbf] = 0x9b06, [0x1dc0] = 0x9b18,
-  [0x1dc1] = 0x9b1a, [0x1dc2] = 0x9b1f, [0x1dc3] = 0x9b22, [0x1dc4] = 0x9b23,
-  [0x1dc5] = 0x9b25, [0x1dc6] = 0x9b27, [0x1dc7] = 0x9b28, [0x1dc8] = 0x9b29,
-  [0x1dc9] = 0x9b2a, [0x1dca] = 0x9b2e, [0x1dcb] = 0x9b2f, [0x1dcc] = 0x9b32,
-  [0x1dcd] = 0x9b44, [0x1dce] = 0x9b43, [0x1dcf] = 0x9b4f, [0x1dd0] = 0x9b4d,
-  [0x1dd1] = 0x9b4e, [0x1dd2] = 0x9b51, [0x1dd3] = 0x9b58, [0x1dd4] = 0x9b74,
-  [0x1dd5] = 0x9b93, [0x1dd6] = 0x9b83, [0x1dd7] = 0x9b91, [0x1dd8] = 0x9b96,
-  [0x1dd9] = 0x9b97, [0x1dda] = 0x9b9f, [0x1ddb] = 0x9ba0, [0x1ddc] = 0x9ba8,
-  [0x1ddd] = 0x9bb4, [0x1dde] = 0x9bc0, [0x1ddf] = 0x9bca, [0x1de0] = 0x9bb9,
-  [0x1de1] = 0x9bc6, [0x1de2] = 0x9bcf, [0x1de3] = 0x9bd1, [0x1de4] = 0x9bd2,
-  [0x1de5] = 0x9be3, [0x1de6] = 0x9be2, [0x1de7] = 0x9be4, [0x1de8] = 0x9bd4,
-  [0x1de9] = 0x9be1, [0x1dea] = 0x9c3a, [0x1deb] = 0x9bf2, [0x1dec] = 0x9bf1,
-  [0x1ded] = 0x9bf0, [0x1dee] = 0x9c15, [0x1def] = 0x9c14, [0x1df0] = 0x9c09,
-  [0x1df1] = 0x9c13, [0x1df2] = 0x9c0c, [0x1df3] = 0x9c06, [0x1df4] = 0x9c08,
-  [0x1df5] = 0x9c12, [0x1df6] = 0x9c0a, [0x1df7] = 0x9c04, [0x1df8] = 0x9c2e,
-  [0x1df9] = 0x9c1b, [0x1dfa] = 0x9c25, [0x1dfb] = 0x9c24, [0x1dfc] = 0x9c21,
-  [0x1dfd] = 0x9c30, [0x1dfe] = 0x9c47, [0x1dff] = 0x9c32, [0x1e00] = 0x9c46,
-  [0x1e01] = 0x9c3e, [0x1e02] = 0x9c5a, [0x1e03] = 0x9c60, [0x1e04] = 0x9c67,
-  [0x1e05] = 0x9c76, [0x1e06] = 0x9c78, [0x1e07] = 0x9ce7, [0x1e08] = 0x9cec,
-  [0x1e09] = 0x9cf0, [0x1e0a] = 0x9d09, [0x1e0b] = 0x9d08, [0x1e0c] = 0x9ceb,
-  [0x1e0d] = 0x9d03, [0x1e0e] = 0x9d06, [0x1e0f] = 0x9d2a, [0x1e10] = 0x9d26,
-  [0x1e11] = 0x9daf, [0x1e12] = 0x9d23, [0x1e13] = 0x9d1f, [0x1e14] = 0x9d44,
-  [0x1e15] = 0x9d15, [0x1e16] = 0x9d12, [0x1e17] = 0x9d41, [0x1e18] = 0x9d3f,
-  [0x1e19] = 0x9d3e, [0x1e1a] = 0x9d46, [0x1e1b] = 0x9d48, [0x1e1c] = 0x9d5d,
-  [0x1e1d] = 0x9d5e, [0x1e1e] = 0x9d64, [0x1e1f] = 0x9d51, [0x1e20] = 0x9d50,
-  [0x1e21] = 0x9d59, [0x1e22] = 0x9d72, [0x1e23] = 0x9d89, [0x1e24] = 0x9d87,
-  [0x1e25] = 0x9dab, [0x1e26] = 0x9d6f, [0x1e27] = 0x9d7a, [0x1e28] = 0x9d9a,
-  [0x1e29] = 0x9da4, [0x1e2a] = 0x9da9, [0x1e2b] = 0x9db2, [0x1e2c] = 0x9dc4,
-  [0x1e2d] = 0x9dc1, [0x1e2e] = 0x9dbb, [0x1e2f] = 0x9db8, [0x1e30] = 0x9dba,
-  [0x1e31] = 0x9dc6, [0x1e32] = 0x9dcf, [0x1e33] = 0x9dc2, [0x1e34] = 0x9dd9,
-  [0x1e35] = 0x9dd3, [0x1e36] = 0x9df8, [0x1e37] = 0x9de6, [0x1e38] = 0x9ded,
-  [0x1e39] = 0x9def, [0x1e3a] = 0x9dfd, [0x1e3b] = 0x9e1a, [0x1e3c] = 0x9e1b,
-  [0x1e3d] = 0x9e1e, [0x1e3e] = 0x9e75, [0x1e3f] = 0x9e79, [0x1e40] = 0x9e7d,
-  [0x1e41] = 0x9e81, [0x1e42] = 0x9e88, [0x1e43] = 0x9e8b, [0x1e44] = 0x9e8c,
-  [0x1e45] = 0x9e92, [0x1e46] = 0x9e95, [0x1e47] = 0x9e91, [0x1e48] = 0x9e9d,
-  [0x1e49] = 0x9ea5, [0x1e4a] = 0x9ea9, [0x1e4b] = 0x9eb8, [0x1e4c] = 0x9eaa,
-  [0x1e4d] = 0x9ead, [0x1e4e] = 0x9761, [0x1e4f] = 0x9ecc, [0x1e50] = 0x9ece,
-  [0x1e51] = 0x9ecf, [0x1e52] = 0x9ed0, [0x1e53] = 0x9ed4, [0x1e54] = 0x9edc,
-  [0x1e55] = 0x9ede, [0x1e56] = 0x9edd, [0x1e57] = 0x9ee0, [0x1e58] = 0x9ee5,
-  [0x1e59] = 0x9ee8, [0x1e5a] = 0x9eef, [0x1e5b] = 0x9ef4, [0x1e5c] = 0x9ef6,
-  [0x1e5d] = 0x9ef7, [0x1e5e] = 0x9ef9, [0x1e5f] = 0x9efb, [0x1e60] = 0x9efc,
-  [0x1e61] = 0x9efd, [0x1e62] = 0x9f07, [0x1e63] = 0x9f08, [0x1e64] = 0x76b7,
-  [0x1e65] = 0x9f15, [0x1e66] = 0x9f21, [0x1e67] = 0x9f2c, [0x1e68] = 0x9f3e,
-  [0x1e69] = 0x9f4a, [0x1e6a] = 0x9f52, [0x1e6b] = 0x9f54, [0x1e6c] = 0x9f63,
-  [0x1e6d] = 0x9f5f, [0x1e6e] = 0x9f60, [0x1e6f] = 0x9f61, [0x1e70] = 0x9f66,
-  [0x1e71] = 0x9f67, [0x1e72] = 0x9f6c, [0x1e73] = 0x9f6a, [0x1e74] = 0x9f77,
-  [0x1e75] = 0x9f72, [0x1e76] = 0x9f76, [0x1e77] = 0x9f95, [0x1e78] = 0x9f9c,
-  [0x1e79] = 0x9fa0, [0x1e7a] = 0x582f, [0x1e7b] = 0x69c7, [0x1e7c] = 0x9059,
-  [0x1e7d] = 0x7464, [0x1e7e] = 0x51dc, [0x1e7f] = 0x7199
-};
-
-
-const char __jisx0208_from_ucs4_lat1[256][2] =
-{
-  [0x005C] = "\x21\x40", [0x00A2] = "\x21\x71", [0x00A3] = "\x21\x72",
-  [0x00A7] = "\x21\x78", [0x00A8] = "\x21\x2f", [0x00AC] = "\x22\x4c",
-  [0x00B0] = "\x21\x6B", [0x00B1] = "\x21\x5e", [0x00B4] = "\x21\x2d",
-  [0x00B6] = "\x22\x79", [0x00D7] = "\x21\x5f", [0x00F7] = "\x21\x60"
-};
-
-
-/* The following table can be generated using
-
-   egrep '^0x' < .../eastasia/jis/jis0208.txt |
-   awk '{ print $3, $2}' | egrep '^0x0[34]' | sort -u | perl tab.pl
-
-   where tab.pl contains:
-
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   $n=0;
-   while (<>) {
-     local($ucs4, $jis, %rest) = split;
-     local($u)=hex($ucs4);
-     local($s)=hex($jis);
-     printf ("\n ") if ($n % 3 eq 0);
-     ++$n;
-     printf (" [0x%02x] = \"\\x%02x\\x%02x\",",
-	     int(($u - 0x391) / 256) * 94 + (($u - 0x391) & 0xff),
-	     int($s/256), $s % 256);
-   }
-   printf ("\n");
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-const char __jisx0208_from_ucs4_greek[0xc1][2] =
-{
-  [0x00] = "\x26\x21", [0x01] = "\x26\x22", [0x02] = "\x26\x23",
-  [0x03] = "\x26\x24", [0x04] = "\x26\x25", [0x05] = "\x26\x26",
-  [0x06] = "\x26\x27", [0x07] = "\x26\x28", [0x08] = "\x26\x29",
-  [0x09] = "\x26\x2a", [0x0a] = "\x26\x2b", [0x0b] = "\x26\x2c",
-  [0x0c] = "\x26\x2d", [0x0d] = "\x26\x2e", [0x0e] = "\x26\x2f",
-  [0x0f] = "\x26\x30", [0x10] = "\x26\x31", [0x12] = "\x26\x32",
-  [0x13] = "\x26\x33", [0x14] = "\x26\x34", [0x15] = "\x26\x35",
-  [0x16] = "\x26\x36", [0x17] = "\x26\x37", [0x18] = "\x26\x38",
-  [0x20] = "\x26\x41", [0x21] = "\x26\x42", [0x22] = "\x26\x43",
-  [0x23] = "\x26\x44", [0x24] = "\x26\x45", [0x25] = "\x26\x46",
-  [0x26] = "\x26\x47", [0x27] = "\x26\x48", [0x28] = "\x26\x49",
-  [0x29] = "\x26\x4a", [0x2a] = "\x26\x4b", [0x2b] = "\x26\x4c",
-  [0x2c] = "\x26\x4d", [0x2d] = "\x26\x4e", [0x2e] = "\x26\x4f",
-  [0x2f] = "\x26\x50", [0x30] = "\x26\x51", [0x32] = "\x26\x52",
-  [0x33] = "\x26\x53", [0x34] = "\x26\x54", [0x35] = "\x26\x55",
-  [0x36] = "\x26\x56", [0x37] = "\x26\x57", [0x38] = "\x26\x58",
-  [0x70] = "\x27\x27", [0x7f] = "\x27\x21", [0x80] = "\x27\x22",
-  [0x81] = "\x27\x23", [0x82] = "\x27\x24", [0x83] = "\x27\x25",
-  [0x84] = "\x27\x26", [0x85] = "\x27\x28", [0x86] = "\x27\x29",
-  [0x87] = "\x27\x2a", [0x88] = "\x27\x2b", [0x89] = "\x27\x2c",
-  [0x8a] = "\x27\x2d", [0x8b] = "\x27\x2e", [0x8c] = "\x27\x2f",
-  [0x8d] = "\x27\x30", [0x8e] = "\x27\x31", [0x8f] = "\x27\x32",
-  [0x90] = "\x27\x33", [0x91] = "\x27\x34", [0x92] = "\x27\x35",
-  [0x93] = "\x27\x36", [0x94] = "\x27\x37", [0x95] = "\x27\x38",
-  [0x96] = "\x27\x39", [0x97] = "\x27\x3a", [0x98] = "\x27\x3b",
-  [0x99] = "\x27\x3c", [0x9a] = "\x27\x3d", [0x9b] = "\x27\x3e",
-  [0x9c] = "\x27\x3f", [0x9d] = "\x27\x40", [0x9e] = "\x27\x41",
-  [0x9f] = "\x27\x51", [0xa0] = "\x27\x52", [0xa1] = "\x27\x53",
-  [0xa2] = "\x27\x54", [0xa3] = "\x27\x55", [0xa4] = "\x27\x56",
-  [0xa5] = "\x27\x58", [0xa6] = "\x27\x59", [0xa7] = "\x27\x5a",
-  [0xa8] = "\x27\x5b", [0xa9] = "\x27\x5c", [0xaa] = "\x27\x5d",
-  [0xab] = "\x27\x5e", [0xac] = "\x27\x5f", [0xad] = "\x27\x60",
-  [0xae] = "\x27\x61", [0xaf] = "\x27\x62", [0xb0] = "\x27\x63",
-  [0xb1] = "\x27\x64", [0xb2] = "\x27\x65", [0xb3] = "\x27\x66",
-  [0xb4] = "\x27\x67", [0xb5] = "\x27\x68", [0xb6] = "\x27\x69",
-  [0xb7] = "\x27\x6a", [0xb8] = "\x27\x6b", [0xb9] = "\x27\x6c",
-  [0xba] = "\x27\x6d", [0xbb] = "\x27\x6e", [0xbc] = "\x27\x6f",
-  [0xbd] = "\x27\x70", [0xbe] = "\x27\x71", [0xc0] = "\x27\x57"
-};
-
-
-/* The mapping of all the other UCS values is quite difficult since they
-   are distributed from 0x2010 upto to 0xffe5.  There are many gaps with
-   unpredictable place and size.  Therefore we use a table which maps
-   ranges to idexes in a table.  This table ca be generated with:
-
-   egrep '^0x' < .../eastasia/jis/jis0208.txt | awk '{ print $3, $2}' |
-   egrep '^0x[^01]' | sort -u | perl tab.pl
-
-   where tab.pl is
-
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   $first=$last=$idx=0;
-   while (<>) {
-     local($ucs,$jis,%rest) = split;
-     local($u)=hex($ucs);
-     if ($u - $last > 6) {
-       if ($last != 0) {
-	 printf (" { start: %#06x, end: %#06x, idx: %5d },\n",
-		 $first, $last, $idx);
-	 $idx += $last - $first + 1;
-       }
-       $first=$u;
-     }
-     $last=$u;
-   }
-   printf (" { start: %#06x, end: %#06x, idx: %5d }\n",
-	   $first, $last, $idx);
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-
-const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[] =
-{
-  { start: 0x2010, end: 0x2026, idx:     0 },
-  { start: 0x2030, end: 0x2033, idx:    23 },
-  { start: 0x203b, end: 0x203b, idx:    27 },
-  { start: 0x2103, end: 0x2103, idx:    28 },
-  { start: 0x212b, end: 0x212b, idx:    29 },
-  { start: 0x2190, end: 0x2193, idx:    30 },
-  { start: 0x21d2, end: 0x21d4, idx:    34 },
-  { start: 0x2200, end: 0x220b, idx:    37 },
-  { start: 0x2212, end: 0x2212, idx:    49 },
-  { start: 0x221a, end: 0x2220, idx:    50 },
-  { start: 0x2227, end: 0x222c, idx:    57 },
-  { start: 0x2234, end: 0x2235, idx:    63 },
-  { start: 0x223d, end: 0x223d, idx:    65 },
-  { start: 0x2252, end: 0x2252, idx:    66 },
-  { start: 0x2260, end: 0x226b, idx:    67 },
-  { start: 0x2282, end: 0x2287, idx:    79 },
-  { start: 0x22a5, end: 0x22a5, idx:    85 },
-  { start: 0x2312, end: 0x2312, idx:    86 },
-  { start: 0x2500, end: 0x2503, idx:    87 },
-  { start: 0x250c, end: 0x2542, idx:    91 },
-  { start: 0x254b, end: 0x254b, idx:   146 },
-  { start: 0x25a0, end: 0x25a1, idx:   147 },
-  { start: 0x25b2, end: 0x25b3, idx:   149 },
-  { start: 0x25bc, end: 0x25bd, idx:   151 },
-  { start: 0x25c6, end: 0x25cf, idx:   153 },
-  { start: 0x25ef, end: 0x25ef, idx:   163 },
-  { start: 0x2605, end: 0x2606, idx:   164 },
-  { start: 0x2640, end: 0x2642, idx:   166 },
-  { start: 0x266a, end: 0x266f, idx:   169 },
-  { start: 0x3000, end: 0x3015, idx:   175 },
-  { start: 0x301c, end: 0x301c, idx:   197 },
-  { start: 0x3041, end: 0x3093, idx:   198 },
-  { start: 0x309b, end: 0x30fe, idx:   281 },
-  { start: 0x4e00, end: 0x4e62, idx:   381 },
-  { start: 0x4e71, end: 0x4e73, idx:   480 },
-  { start: 0x4e7e, end: 0x4ee5, idx:   483 },
-  { start: 0x4eed, end: 0x4f01, idx:   587 },
-  { start: 0x4f09, end: 0x4f11, idx:   608 },
-  { start: 0x4f1a, end: 0x4f1d, idx:   617 },
-  { start: 0x4f2f, end: 0x4f5e, idx:   621 },
-  { start: 0x4f69, end: 0x4fa1, idx:   669 },
-  { start: 0x4fab, end: 0x4fb6, idx:   726 },
-  { start: 0x4fbf, end: 0x4fe5, idx:   738 },
-  { start: 0x4fee, end: 0x4ffe, idx:   777 },
-  { start: 0x5005, end: 0x502d, idx:   794 },
-  { start: 0x5036, end: 0x5039, idx:   835 },
-  { start: 0x5043, end: 0x505c, idx:   839 },
-  { start: 0x5065, end: 0x5065, idx:   865 },
-  { start: 0x506c, end: 0x5085, idx:   866 },
-  { start: 0x508d, end: 0x5091, idx:   892 },
-  { start: 0x5098, end: 0x509a, idx:   897 },
-  { start: 0x50ac, end: 0x50b7, idx:   900 },
-  { start: 0x50be, end: 0x50ee, idx:   912 },
-  { start: 0x50f5, end: 0x5109, idx:   961 },
-  { start: 0x5112, end: 0x5121, idx:   982 },
-  { start: 0x512a, end: 0x512a, idx:   998 },
-  { start: 0x5132, end: 0x5199, idx:   999 },
-  { start: 0x51a0, end: 0x51bd, idx:  1103 },
-  { start: 0x51c4, end: 0x51cd, idx:  1133 },
-  { start: 0x51d6, end: 0x521d, idx:  1143 },
-  { start: 0x5224, end: 0x523b, idx:  1215 },
-  { start: 0x5243, end: 0x5275, idx:  1239 },
-  { start: 0x527d, end: 0x5294, idx:  1290 },
-  { start: 0x529b, end: 0x52e7, idx:  1314 },
-  { start: 0x52f2, end: 0x5323, idx:  1391 },
-  { start: 0x532a, end: 0x5384, idx:  1441 },
-  { start: 0x5396, end: 0x53bb, idx:  1532 },
-  { start: 0x53c2, end: 0x53fa, idx:  1570 },
-  { start: 0x5401, end: 0x5411, idx:  1627 },
-  { start: 0x541b, end: 0x542e, idx:  1644 },
-  { start: 0x5436, end: 0x5451, idx:  1664 },
-  { start: 0x545f, end: 0x545f, idx:  1692 },
-  { start: 0x5468, end: 0x5492, idx:  1693 },
-  { start: 0x54a2, end: 0x54c9, idx:  1736 },
-  { start: 0x54d8, end: 0x54d8, idx:  1776 },
-  { start: 0x54e1, end: 0x54f2, idx:  1777 },
-  { start: 0x54fa, end: 0x54fd, idx:  1795 },
-  { start: 0x5504, end: 0x5507, idx:  1799 },
-  { start: 0x550f, end: 0x5516, idx:  1803 },
-  { start: 0x552e, end: 0x5563, idx:  1811 },
-  { start: 0x557b, end: 0x558b, idx:  1865 },
-  { start: 0x5598, end: 0x559f, idx:  1882 },
-  { start: 0x55a7, end: 0x55b6, idx:  1890 },
-  { start: 0x55c4, end: 0x55c7, idx:  1906 },
-  { start: 0x55d4, end: 0x55e4, idx:  1910 },
-  { start: 0x55f7, end: 0x55fe, idx:  1927 },
-  { start: 0x5606, end: 0x5609, idx:  1935 },
-  { start: 0x5614, end: 0x561b, idx:  1939 },
-  { start: 0x5629, end: 0x5638, idx:  1947 },
-  { start: 0x5642, end: 0x5642, idx:  1963 },
-  { start: 0x564c, end: 0x5650, idx:  1964 },
-  { start: 0x565b, end: 0x565b, idx:  1969 },
-  { start: 0x5664, end: 0x566c, idx:  1970 },
-  { start: 0x5674, end: 0x5694, idx:  1979 },
-  { start: 0x56a0, end: 0x56a5, idx:  2012 },
-  { start: 0x56ae, end: 0x56e3, idx:  2018 },
-  { start: 0x56ee, end: 0x571f, idx:  2072 },
-  { start: 0x5726, end: 0x5730, idx:  2122 },
-  { start: 0x5737, end: 0x5751, idx:  2133 },
-  { start: 0x5761, end: 0x576a, idx:  2160 },
-  { start: 0x577f, end: 0x578b, idx:  2170 },
-  { start: 0x5793, end: 0x5793, idx:  2183 },
-  { start: 0x57a0, end: 0x57b3, idx:  2184 },
-  { start: 0x57c0, end: 0x57e3, idx:  2204 },
-  { start: 0x57f4, end: 0x580b, idx:  2240 },
-  { start: 0x5815, end: 0x5841, idx:  2264 },
-  { start: 0x584a, end: 0x5862, idx:  2309 },
-  { start: 0x5869, end: 0x5885, idx:  2334 },
-  { start: 0x5893, end: 0x589f, idx:  2363 },
-  { start: 0x58a8, end: 0x5902, idx:  2376 },
-  { start: 0x5909, end: 0x59b2, idx:  2467 },
-  { start: 0x59b9, end: 0x59be, idx:  2637 },
-  { start: 0x59c6, end: 0x59dc, idx:  2643 },
-  { start: 0x59e5, end: 0x59eb, idx:  2666 },
-  { start: 0x59f6, end: 0x5a09, idx:  2673 },
-  { start: 0x5a11, end: 0x5a11, idx:  2693 },
-  { start: 0x5a18, end: 0x5a49, idx:  2694 },
-  { start: 0x5a5a, end: 0x5a5a, idx:  2744 },
-  { start: 0x5a62, end: 0x5a6c, idx:  2745 },
-  { start: 0x5a7f, end: 0x5a7f, idx:  2756 },
-  { start: 0x5a92, end: 0x5a92, idx:  2757 },
-  { start: 0x5a9a, end: 0x5a9b, idx:  2758 },
-  { start: 0x5abc, end: 0x5ac2, idx:  2760 },
-  { start: 0x5ac9, end: 0x5ad7, idx:  2767 },
-  { start: 0x5ae1, end: 0x5ae9, idx:  2782 },
-  { start: 0x5afa, end: 0x5afb, idx:  2791 },
-  { start: 0x5b09, end: 0x5b0c, idx:  2793 },
-  { start: 0x5b16, end: 0x5b16, idx:  2797 },
-  { start: 0x5b22, end: 0x5b22, idx:  2798 },
-  { start: 0x5b2a, end: 0x5b36, idx:  2799 },
-  { start: 0x5b3e, end: 0x5b45, idx:  2812 },
-  { start: 0x5b50, end: 0x5ba6, idx:  2820 },
-  { start: 0x5bae, end: 0x5bd4, idx:  2907 },
-  { start: 0x5bdb, end: 0x5c31, idx:  2946 },
-  { start: 0x5c38, end: 0x5c55, idx:  3033 },
-  { start: 0x5c5e, end: 0x5c65, idx:  3063 },
-  { start: 0x5c6c, end: 0x5c79, idx:  3071 },
-  { start: 0x5c8c, end: 0x5c94, idx:  3085 },
-  { start: 0x5ca1, end: 0x5ca1, idx:  3094 },
-  { start: 0x5ca8, end: 0x5cbe, idx:  3095 },
-  { start: 0x5cc5, end: 0x5cc7, idx:  3118 },
-  { start: 0x5cd9, end: 0x5cd9, idx:  3121 },
-  { start: 0x5ce0, end: 0x5ce1, idx:  3122 },
-  { start: 0x5ce8, end: 0x5cfd, idx:  3124 },
-  { start: 0x5d07, end: 0x5d22, idx:  3146 },
-  { start: 0x5d29, end: 0x5d29, idx:  3174 },
-  { start: 0x5d4b, end: 0x5d52, idx:  3175 },
-  { start: 0x5d5c, end: 0x5d5c, idx:  3183 },
-  { start: 0x5d69, end: 0x5d76, idx:  3184 },
-  { start: 0x5d82, end: 0x5d90, idx:  3198 },
-  { start: 0x5d9d, end: 0x5da2, idx:  3213 },
-  { start: 0x5dac, end: 0x5dae, idx:  3219 },
-  { start: 0x5db7, end: 0x5dbd, idx:  3222 },
-  { start: 0x5dc9, end: 0x5e1d, idx:  3229 },
-  { start: 0x5e25, end: 0x5e57, idx:  3314 },
-  { start: 0x5e5f, end: 0x5e64, idx:  3365 },
-  { start: 0x5e72, end: 0x5ead, idx:  3371 },
-  { start: 0x5eb5, end: 0x5eb8, idx:  3431 },
-  { start: 0x5ec1, end: 0x5f41, idx:  3435 },
-  { start: 0x5f48, end: 0x5fa1, idx:  3564 },
-  { start: 0x5fa8, end: 0x5fc5, idx:  3654 },
-  { start: 0x5fcc, end: 0x5fcd, idx:  3684 },
-  { start: 0x5fd6, end: 0x5fe4, idx:  3686 },
-  { start: 0x5feb, end: 0x5fff, idx:  3701 },
-  { start: 0x600e, end: 0x6031, idx:  3722 },
-  { start: 0x603a, end: 0x603a, idx:  3758 },
-  { start: 0x6041, end: 0x6077, idx:  3759 },
-  { start: 0x6081, end: 0x60aa, idx:  3814 },
-  { start: 0x60b2, end: 0x60bd, idx:  3856 },
-  { start: 0x60c5, end: 0x60c7, idx:  3868 },
-  { start: 0x60d1, end: 0x60e8, idx:  3871 },
-  { start: 0x60f0, end: 0x612c, idx:  3895 },
-  { start: 0x6134, end: 0x6134, idx:  3956 },
-  { start: 0x613c, end: 0x6177, idx:  3957 },
-  { start: 0x617e, end: 0x619a, idx:  4017 },
-  { start: 0x61a4, end: 0x61d0, idx:  4046 },
-  { start: 0x61e3, end: 0x61e6, idx:  4091 },
-  { start: 0x61f2, end: 0x6200, idx:  4095 },
-  { start: 0x6208, end: 0x628a, idx:  4110 },
-  { start: 0x6291, end: 0x629e, idx:  4241 },
-  { start: 0x62ab, end: 0x62e1, idx:  4255 },
-  { start: 0x62ec, end: 0x62f7, idx:  4310 },
-  { start: 0x62fe, end: 0x6311, idx:  4322 },
-  { start: 0x6319, end: 0x631f, idx:  4342 },
-  { start: 0x6327, end: 0x632f, idx:  4349 },
-  { start: 0x633a, end: 0x633f, idx:  4358 },
-  { start: 0x6349, end: 0x635c, idx:  4364 },
-  { start: 0x6367, end: 0x63fa, idx:  4384 },
-  { start: 0x6406, end: 0x6406, idx:  4532 },
-  { start: 0x640d, end: 0x641c, idx:  4533 },
-  { start: 0x6426, end: 0x642d, idx:  4549 },
-  { start: 0x6434, end: 0x6442, idx:  4557 },
-  { start: 0x644e, end: 0x644e, idx:  4572 },
-  { start: 0x6458, end: 0x6458, idx:  4573 },
-  { start: 0x6467, end: 0x646f, idx:  4574 },
-  { start: 0x6476, end: 0x647a, idx:  4583 },
-  { start: 0x6483, end: 0x6488, idx:  4588 },
-  { start: 0x6492, end: 0x64b2, idx:  4594 },
-  { start: 0x64b9, end: 0x6505, idx:  4627 },
-  { start: 0x6518, end: 0x6578, idx:  4704 },
-  { start: 0x6582, end: 0x65b0, idx:  4801 },
-  { start: 0x65b7, end: 0x65f1, idx:  4848 },
-  { start: 0x65fa, end: 0x65fb, idx:  4907 },
-  { start: 0x6602, end: 0x6614, idx:  4909 },
-  { start: 0x661c, end: 0x6652, idx:  4928 },
-  { start: 0x665d, end: 0x667a, idx:  4983 },
-  { start: 0x6681, end: 0x66c9, idx:  5013 },
-  { start: 0x66d6, end: 0x66e9, idx:  5086 },
-  { start: 0x66f0, end: 0x671f, idx:  5106 },
-  { start: 0x6726, end: 0x67b9, idx:  5154 },
-  { start: 0x67c1, end: 0x6804, idx:  5302 },
-  { start: 0x6813, end: 0x6817, idx:  5370 },
-  { start: 0x681e, end: 0x6822, idx:  5375 },
-  { start: 0x6829, end: 0x682b, idx:  5380 },
-  { start: 0x6832, end: 0x6867, idx:  5383 },
-  { start: 0x6874, end: 0x6877, idx:  5437 },
-  { start: 0x687e, end: 0x6885, idx:  5441 },
-  { start: 0x688d, end: 0x68bc, idx:  5449 },
-  { start: 0x68c4, end: 0x68e7, idx:  5497 },
-  { start: 0x68ee, end: 0x68f2, idx:  5533 },
-  { start: 0x68f9, end: 0x6912, idx:  5538 },
-  { start: 0x6919, end: 0x693f, idx:  5564 },
-  { start: 0x694a, end: 0x694a, idx:  5603 },
-  { start: 0x6953, end: 0x6962, idx:  5604 },
-  { start: 0x696a, end: 0x6982, idx:  5620 },
-  { start: 0x698a, end: 0x69a0, idx:  5645 },
-  { start: 0x69a7, end: 0x69a7, idx:  5668 },
-  { start: 0x69ae, end: 0x69b4, idx:  5669 },
-  { start: 0x69bb, end: 0x69de, idx:  5676 },
-  { start: 0x69e7, end: 0x69f2, idx:  5712 },
-  { start: 0x69f9, end: 0x6a2e, idx:  5724 },
-  { start: 0x6a35, end: 0x6a3d, idx:  5778 },
-  { start: 0x6a44, end: 0x6a4b, idx:  5787 },
-  { start: 0x6a58, end: 0x6a66, idx:  5795 },
-  { start: 0x6a72, end: 0x6a78, idx:  5810 },
-  { start: 0x6a7f, end: 0x6a84, idx:  5817 },
-  { start: 0x6a8d, end: 0x6a90, idx:  5823 },
-  { start: 0x6a97, end: 0x6aa3, idx:  5827 },
-  { start: 0x6aaa, end: 0x6ac3, idx:  5840 },
-  { start: 0x6ad1, end: 0x6ad3, idx:  5866 },
-  { start: 0x6ada, end: 0x6adf, idx:  5869 },
-  { start: 0x6ae8, end: 0x6aea, idx:  5875 },
-  { start: 0x6afa, end: 0x6afb, idx:  5878 },
-  { start: 0x6b04, end: 0x6b0a, idx:  5880 },
-  { start: 0x6b12, end: 0x6b16, idx:  5887 },
-  { start: 0x6b1d, end: 0x6b27, idx:  5892 },
-  { start: 0x6b32, end: 0x6b8d, idx:  5903 },
-  { start: 0x6b95, end: 0x6bdf, idx:  5995 },
-  { start: 0x6beb, end: 0x6bf3, idx:  6070 },
-  { start: 0x6c08, end: 0x6c08, idx:  6079 },
-  { start: 0x6c0f, end: 0x6c1b, idx:  6080 },
-  { start: 0x6c23, end: 0x6c24, idx:  6093 },
-  { start: 0x6c34, end: 0x6c42, idx:  6095 },
-  { start: 0x6c4e, end: 0x6c73, idx:  6110 },
-  { start: 0x6c7a, end: 0x6ca2, idx:  6148 },
-  { start: 0x6cab, end: 0x6ccc, idx:  6189 },
-  { start: 0x6cd3, end: 0x6cf3, idx:  6223 },
-  { start: 0x6d0b, end: 0x6d2b, idx:  6256 },
-  { start: 0x6d32, end: 0x6d45, idx:  6289 },
-  { start: 0x6d59, end: 0x6d5c, idx:  6309 },
-  { start: 0x6d63, end: 0x6d79, idx:  6313 },
-  { start: 0x6d85, end: 0x6d9c, idx:  6336 },
-  { start: 0x6daf, end: 0x6dfb, idx:  6360 },
-  { start: 0x6e05, end: 0x6e0b, idx:  6437 },
-  { start: 0x6e13, end: 0x6e2f, idx:  6444 },
-  { start: 0x6e38, end: 0x6e43, idx:  6473 },
-  { start: 0x6e4a, end: 0x6e4e, idx:  6485 },
-  { start: 0x6e56, end: 0x6e5f, idx:  6490 },
-  { start: 0x6e67, end: 0x6e76, idx:  6500 },
-  { start: 0x6e7e, end: 0x6e82, idx:  6516 },
-  { start: 0x6e8c, end: 0x6ed5, idx:  6521 },
-  { start: 0x6edd, end: 0x6ede, idx:  6595 },
-  { start: 0x6eec, end: 0x6f15, idx:  6597 },
-  { start: 0x6f20, end: 0x6f23, idx:  6639 },
-  { start: 0x6f2b, end: 0x6f45, idx:  6643 },
-  { start: 0x6f54, end: 0x6f66, idx:  6670 },
-  { start: 0x6f6d, end: 0x6f86, idx:  6689 },
-  { start: 0x6f8e, end: 0x6f97, idx:  6715 },
-  { start: 0x6fa1, end: 0x6faa, idx:  6725 },
-  { start: 0x6fb1, end: 0x6fb9, idx:  6735 },
-  { start: 0x6fc0, end: 0x6fc6, idx:  6744 },
-  { start: 0x6fd4, end: 0x6fe4, idx:  6751 },
-  { start: 0x6feb, end: 0x7001, idx:  6768 },
-  { start: 0x7009, end: 0x701f, idx:  6791 },
-  { start: 0x7026, end: 0x7032, idx:  6814 },
-  { start: 0x703e, end: 0x703e, idx:  6827 },
-  { start: 0x704c, end: 0x7051, idx:  6828 },
-  { start: 0x7058, end: 0x7058, idx:  6834 },
-  { start: 0x7063, end: 0x7063, idx:  6835 },
-  { start: 0x706b, end: 0x7070, idx:  6836 },
-  { start: 0x7078, end: 0x707d, idx:  6842 },
-  { start: 0x7089, end: 0x7092, idx:  6848 },
-  { start: 0x7099, end: 0x7099, idx:  6858 },
-  { start: 0x70ac, end: 0x70ba, idx:  6859 },
-  { start: 0x70c8, end: 0x70cf, idx:  6874 },
-  { start: 0x70d9, end: 0x70df, idx:  6882 },
-  { start: 0x70f1, end: 0x70f1, idx:  6889 },
-  { start: 0x70f9, end: 0x70fd, idx:  6890 },
-  { start: 0x7109, end: 0x7109, idx:  6895 },
-  { start: 0x7114, end: 0x7126, idx:  6896 },
-  { start: 0x7136, end: 0x713c, idx:  6915 },
-  { start: 0x7149, end: 0x714e, idx:  6922 },
-  { start: 0x7155, end: 0x7159, idx:  6928 },
-  { start: 0x7162, end: 0x716e, idx:  6933 },
-  { start: 0x717d, end: 0x717d, idx:  6946 },
-  { start: 0x7184, end: 0x719f, idx:  6947 },
-  { start: 0x71a8, end: 0x71b1, idx:  6975 },
-  { start: 0x71b9, end: 0x71d7, idx:  6985 },
-  { start: 0x71df, end: 0x71ee, idx:  7016 },
-  { start: 0x71f5, end: 0x71ff, idx:  7032 },
-  { start: 0x7206, end: 0x7206, idx:  7043 },
-  { start: 0x720d, end: 0x7210, idx:  7044 },
-  { start: 0x721b, end: 0x721b, idx:  7048 },
-  { start: 0x7228, end: 0x7269, idx:  7049 },
-  { start: 0x7272, end: 0x7287, idx:  7115 },
-  { start: 0x7292, end: 0x7296, idx:  7137 },
-  { start: 0x72a0, end: 0x72b9, idx:  7142 },
-  { start: 0x72c2, end: 0x72c6, idx:  7168 },
-  { start: 0x72ce, end: 0x72e2, idx:  7173 },
-  { start: 0x72e9, end: 0x72ed, idx:  7194 },
-  { start: 0x72f7, end: 0x72fd, idx:  7199 },
-  { start: 0x730a, end: 0x730a, idx:  7206 },
-  { start: 0x7316, end: 0x7337, idx:  7207 },
-  { start: 0x733e, end: 0x7345, idx:  7241 },
-  { start: 0x734e, end: 0x734f, idx:  7249 },
-  { start: 0x7357, end: 0x7357, idx:  7251 },
-  { start: 0x7363, end: 0x737b, idx:  7252 },
-  { start: 0x7384, end: 0x738b, idx:  7277 },
-  { start: 0x7396, end: 0x7396, idx:  7285 },
-  { start: 0x73a9, end: 0x73a9, idx:  7286 },
-  { start: 0x73b2, end: 0x73b3, idx:  7287 },
-  { start: 0x73bb, end: 0x73ce, idx:  7289 },
-  { start: 0x73de, end: 0x73f1, idx:  7309 },
-  { start: 0x73f8, end: 0x7409, idx:  7329 },
-  { start: 0x7422, end: 0x7425, idx:  7347 },
-  { start: 0x7432, end: 0x7441, idx:  7351 },
-  { start: 0x7455, end: 0x7476, idx:  7367 },
-  { start: 0x747e, end: 0x7483, idx:  7401 },
-  { start: 0x748b, end: 0x748b, idx:  7407 },
-  { start: 0x749e, end: 0x74a7, idx:  7408 },
-  { start: 0x74b0, end: 0x74b0, idx:  7418 },
-  { start: 0x74bd, end: 0x74bd, idx:  7419 },
-  { start: 0x74ca, end: 0x74d4, idx:  7420 },
-  { start: 0x74dc, end: 0x74f8, idx:  7431 },
-  { start: 0x7503, end: 0x7505, idx:  7460 },
-  { start: 0x750c, end: 0x753c, idx:  7463 },
-  { start: 0x7544, end: 0x7578, idx:  7512 },
-  { start: 0x757f, end: 0x75e9, idx:  7565 },
-  { start: 0x75f0, end: 0x7601, idx:  7672 },
-  { start: 0x7609, end: 0x760d, idx:  7690 },
-  { start: 0x761f, end: 0x7627, idx:  7695 },
-  { start: 0x7630, end: 0x7634, idx:  7704 },
-  { start: 0x763b, end: 0x763b, idx:  7709 },
-  { start: 0x7642, end: 0x769a, idx:  7710 },
-  { start: 0x76ae, end: 0x770c, idx:  7799 },
-  { start: 0x771b, end: 0x7729, idx:  7894 },
-  { start: 0x7737, end: 0x7740, idx:  7909 },
-  { start: 0x7747, end: 0x7747, idx:  7919 },
-  { start: 0x775a, end: 0x776b, idx:  7920 },
-  { start: 0x7779, end: 0x777f, idx:  7938 },
-  { start: 0x778b, end: 0x7791, idx:  7945 },
-  { start: 0x779e, end: 0x77a5, idx:  7952 },
-  { start: 0x77ac, end: 0x77bf, idx:  7960 },
-  { start: 0x77c7, end: 0x77cd, idx:  7980 },
-  { start: 0x77d7, end: 0x77f3, idx:  7987 },
-  { start: 0x77fc, end: 0x7802, idx:  8016 },
-  { start: 0x780c, end: 0x7815, idx:  8023 },
-  { start: 0x7820, end: 0x7827, idx:  8033 },
-  { start: 0x7832, end: 0x7845, idx:  8041 },
-  { start: 0x785d, end: 0x785d, idx:  8061 },
-  { start: 0x786b, end: 0x7874, idx:  8062 },
-  { start: 0x787c, end: 0x789a, idx:  8072 },
-  { start: 0x78a3, end: 0x78da, idx:  8103 },
-  { start: 0x78e7, end: 0x78f4, idx:  8159 },
-  { start: 0x78fd, end: 0x7907, idx:  8173 },
-  { start: 0x790e, end: 0x7912, idx:  8184 },
-  { start: 0x7919, end: 0x7919, idx:  8189 },
-  { start: 0x7926, end: 0x792c, idx:  8190 },
-  { start: 0x793a, end: 0x7949, idx:  8197 },
-  { start: 0x7950, end: 0x796d, idx:  8213 },
-  { start: 0x7977, end: 0x798f, idx:  8243 },
-  { start: 0x799d, end: 0x799d, idx:  8268 },
-  { start: 0x79a6, end: 0x79c1, idx:  8269 },
-  { start: 0x79c9, end: 0x79d8, idx:  8297 },
-  { start: 0x79df, end: 0x79f0, idx:  8313 },
-  { start: 0x79fb, end: 0x7a00, idx:  8331 },
-  { start: 0x7a08, end: 0x7a20, idx:  8337 },
-  { start: 0x7a2e, end: 0x7a50, idx:  8362 },
-  { start: 0x7a57, end: 0x7a57, idx:  8397 },
-  { start: 0x7a61, end: 0x7a88, idx:  8398 },
-  { start: 0x7a92, end: 0x7a98, idx:  8438 },
-  { start: 0x7a9f, end: 0x7a9f, idx:  8445 },
-  { start: 0x7aa9, end: 0x7b11, idx:  8446 },
-  { start: 0x7b18, end: 0x7b2c, idx:  8551 },
-  { start: 0x7b33, end: 0x7b39, idx:  8572 },
-  { start: 0x7b45, end: 0x7b56, idx:  8579 },
-  { start: 0x7b5d, end: 0x7b5d, idx:  8597 },
-  { start: 0x7b65, end: 0x7b7a, idx:  8598 },
-  { start: 0x7b86, end: 0x7ba1, idx:  8620 },
-  { start: 0x7baa, end: 0x7bb8, idx:  8648 },
-  { start: 0x7bc0, end: 0x7bcf, idx:  8663 },
-  { start: 0x7bdd, end: 0x7bf7, idx:  8679 },
-  { start: 0x7c00, end: 0x7c00, idx:  8706 },
-  { start: 0x7c07, end: 0x7c17, idx:  8707 },
-  { start: 0x7c1f, end: 0x7c2b, idx:  8724 },
-  { start: 0x7c37, end: 0x7c43, idx:  8737 },
-  { start: 0x7c4c, end: 0x7c58, idx:  8750 },
-  { start: 0x7c5f, end: 0x7c65, idx:  8763 },
-  { start: 0x7c6c, end: 0x7c6c, idx:  8770 },
-  { start: 0x7c73, end: 0x7c75, idx:  8771 },
-  { start: 0x7c7e, end: 0x7ce7, idx:  8774 },
-  { start: 0x7cef, end: 0x7d22, idx:  8880 },
-  { start: 0x7d2b, end: 0x7d7d, idx:  8932 },
-  { start: 0x7d89, end: 0x7da3, idx:  9015 },
-  { start: 0x7dab, end: 0x7dbf, idx:  9042 },
-  { start: 0x7dc7, end: 0x7df4, idx:  9063 },
-  { start: 0x7dfb, end: 0x7e0b, idx:  9109 },
-  { start: 0x7e12, end: 0x7e12, idx:  9126 },
-  { start: 0x7e1b, end: 0x7e4d, idx:  9127 },
-  { start: 0x7e54, end: 0x7e5e, idx:  9178 },
-  { start: 0x7e66, end: 0x7e70, idx:  9189 },
-  { start: 0x7e79, end: 0x7e9c, idx:  9200 },
-  { start: 0x7f36, end: 0x7f3a, idx:  9236 },
-  { start: 0x7f45, end: 0x7f45, idx:  9241 },
-  { start: 0x7f4c, end: 0x7f58, idx:  9242 },
-  { start: 0x7f5f, end: 0x7f60, idx:  9255 },
-  { start: 0x7f67, end: 0x7f79, idx:  9257 },
-  { start: 0x7f82, end: 0x7fd5, idx:  9276 },
-  { start: 0x7fe0, end: 0x8021, idx:  9360 },
-  { start: 0x8028, end: 0x8028, idx:  9426 },
-  { start: 0x8033, end: 0x803f, idx:  9427 },
-  { start: 0x8046, end: 0x804a, idx:  9440 },
-  { start: 0x8052, end: 0x8068, idx:  9445 },
-  { start: 0x806f, end: 0x808c, idx:  9468 },
-  { start: 0x8093, end: 0x80ba, idx:  9498 },
-  { start: 0x80c3, end: 0x80ce, idx:  9538 },
-  { start: 0x80d6, end: 0x80e5, idx:  9550 },
-  { start: 0x80ef, end: 0x810a, idx:  9566 },
-  { start: 0x811a, end: 0x811b, idx:  9594 },
-  { start: 0x8123, end: 0x813e, idx:  9596 },
-  { start: 0x8146, end: 0x8155, idx:  9624 },
-  { start: 0x815f, end: 0x81a9, idx:  9640 },
-  { start: 0x81b0, end: 0x821f, idx:  9715 },
-  { start: 0x8229, end: 0x8239, idx:  9827 },
-  { start: 0x8240, end: 0x8240, idx:  9844 },
-  { start: 0x8247, end: 0x8247, idx:  9845 },
-  { start: 0x8258, end: 0x827e, idx:  9846 },
-  { start: 0x828b, end: 0x8292, idx:  9885 },
-  { start: 0x8299, end: 0x82bd, idx:  9893 },
-  { start: 0x82c5, end: 0x82c5, idx:  9930 },
-  { start: 0x82d1, end: 0x82fb, idx:  9931 },
-  { start: 0x8302, end: 0x830e, idx:  9974 },
-  { start: 0x8316, end: 0x831c, idx:  9987 },
-  { start: 0x8323, end: 0x8339, idx:  9994 },
-  { start: 0x8340, end: 0x8358, idx: 10017 },
-  { start: 0x8373, end: 0x837c, idx: 10042 },
-  { start: 0x8385, end: 0x83b5, idx: 10052 },
-  { start: 0x83bd, end: 0x83e0, idx: 10101 },
-  { start: 0x83e9, end: 0x8413, idx: 10137 },
-  { start: 0x8420, end: 0x8422, idx: 10180 },
-  { start: 0x8429, end: 0x843d, idx: 10183 },
-  { start: 0x8446, end: 0x844e, idx: 10204 },
-  { start: 0x8457, end: 0x847a, idx: 10213 },
-  { start: 0x8482, end: 0x8484, idx: 10249 },
-  { start: 0x848b, end: 0x84a1, idx: 10252 },
-  { start: 0x84ad, end: 0x84da, idx: 10275 },
-  { start: 0x84ec, end: 0x84f4, idx: 10321 },
-  { start: 0x84fc, end: 0x8506, idx: 10330 },
-  { start: 0x8511, end: 0x852d, idx: 10341 },
-  { start: 0x8535, end: 0x8535, idx: 10370 },
-  { start: 0x853d, end: 0x854e, idx: 10371 },
-  { start: 0x8555, end: 0x855a, idx: 10389 },
-  { start: 0x8563, end: 0x856d, idx: 10395 },
-  { start: 0x8577, end: 0x8577, idx: 10406 },
-  { start: 0x857e, end: 0x859c, idx: 10407 },
-  { start: 0x85a4, end: 0x85af, idx: 10438 },
-  { start: 0x85b9, end: 0x85ba, idx: 10450 },
-  { start: 0x85c1, end: 0x85c1, idx: 10452 },
-  { start: 0x85c9, end: 0x85d5, idx: 10453 },
-  { start: 0x85dc, end: 0x85dd, idx: 10466 },
-  { start: 0x85e4, end: 0x85ea, idx: 10468 },
-  { start: 0x85f7, end: 0x860b, idx: 10475 },
-  { start: 0x8613, end: 0x861a, idx: 10496 },
-  { start: 0x8622, end: 0x8622, idx: 10504 },
-  { start: 0x862d, end: 0x8630, idx: 10505 },
-  { start: 0x863f, end: 0x863f, idx: 10509 },
-  { start: 0x864d, end: 0x865f, idx: 10510 },
-  { start: 0x8667, end: 0x8671, idx: 10529 },
-  { start: 0x8679, end: 0x867b, idx: 10540 },
-  { start: 0x868a, end: 0x868c, idx: 10543 },
-  { start: 0x8693, end: 0x8695, idx: 10546 },
-  { start: 0x86a3, end: 0x86b6, idx: 10549 },
-  { start: 0x86c4, end: 0x86ef, idx: 10569 },
-  { start: 0x86f8, end: 0x871c, idx: 10613 },
-  { start: 0x8725, end: 0x8729, idx: 10650 },
-  { start: 0x8734, end: 0x873f, idx: 10655 },
-  { start: 0x8749, end: 0x8778, idx: 10667 },
-  { start: 0x877f, end: 0x8782, idx: 10715 },
-  { start: 0x878d, end: 0x878d, idx: 10719 },
-  { start: 0x879f, end: 0x87a2, idx: 10720 },
-  { start: 0x87ab, end: 0x87b3, idx: 10724 },
-  { start: 0x87ba, end: 0x87d2, idx: 10733 },
-  { start: 0x87e0, end: 0x87e0, idx: 10758 },
-  { start: 0x87ef, end: 0x87fe, idx: 10759 },
-  { start: 0x8805, end: 0x8805, idx: 10775 },
-  { start: 0x880d, end: 0x8816, idx: 10776 },
-  { start: 0x8821, end: 0x8827, idx: 10786 },
-  { start: 0x8831, end: 0x88a4, idx: 10793 },
-  { start: 0x88ab, end: 0x88b7, idx: 10909 },
-  { start: 0x88bf, end: 0x88c5, idx: 10922 },
-  { start: 0x88cf, end: 0x88e1, idx: 10929 },
-  { start: 0x88e8, end: 0x88e8, idx: 10948 },
-  { start: 0x88f2, end: 0x8913, idx: 10949 },
-  { start: 0x891d, end: 0x891e, idx: 10983 },
-  { start: 0x8925, end: 0x892b, idx: 10985 },
-  { start: 0x8936, end: 0x8944, idx: 10992 },
-  { start: 0x894c, end: 0x894d, idx: 11007 },
-  { start: 0x8956, end: 0x8956, idx: 11009 },
-  { start: 0x895e, end: 0x8977, idx: 11010 },
-  { start: 0x897e, end: 0x899a, idx: 11036 },
-  { start: 0x89a1, end: 0x89b3, idx: 11065 },
-  { start: 0x89ba, end: 0x89c0, idx: 11084 },
-  { start: 0x89d2, end: 0x89d2, idx: 11091 },
-  { start: 0x89da, end: 0x89e7, idx: 11092 },
-  { start: 0x89f4, end: 0x89f8, idx: 11106 },
-  { start: 0x8a00, end: 0x8a48, idx: 11111 },
-  { start: 0x8a50, end: 0x8a73, idx: 11184 },
-  { start: 0x8a7c, end: 0x8ab2, idx: 11220 },
-  { start: 0x8ab9, end: 0x8b2c, idx: 11275 },
-  { start: 0x8b33, end: 0x8b41, idx: 11391 },
-  { start: 0x8b49, end: 0x8b4f, idx: 11406 },
-  { start: 0x8b56, end: 0x8b5f, idx: 11413 },
-  { start: 0x8b66, end: 0x8b83, idx: 11423 },
-  { start: 0x8b8a, end: 0x8b9a, idx: 11453 },
-  { start: 0x8c37, end: 0x8c5a, idx: 11470 },
-  { start: 0x8c61, end: 0x8c62, idx: 11506 },
-  { start: 0x8c6a, end: 0x8c6c, idx: 11508 },
-  { start: 0x8c78, end: 0x8cd3, idx: 11511 },
-  { start: 0x8cda, end: 0x8ced, idx: 11603 },
-  { start: 0x8cfa, end: 0x8cfd, idx: 11623 },
-  { start: 0x8d04, end: 0x8d16, idx: 11627 },
-  { start: 0x8d64, end: 0x8d77, idx: 11646 },
-  { start: 0x8d81, end: 0x8d8a, idx: 11666 },
-  { start: 0x8d99, end: 0x8d99, idx: 11676 },
-  { start: 0x8da3, end: 0x8da8, idx: 11677 },
-  { start: 0x8db3, end: 0x8db3, idx: 11683 },
-  { start: 0x8dba, end: 0x8dc2, idx: 11684 },
-  { start: 0x8dcb, end: 0x8dcf, idx: 11693 },
-  { start: 0x8dd6, end: 0x8df5, idx: 11698 },
-  { start: 0x8dfc, end: 0x8dff, idx: 11730 },
-  { start: 0x8e08, end: 0x8e10, idx: 11734 },
-  { start: 0x8e1d, end: 0x8e1f, idx: 11743 },
-  { start: 0x8e2a, end: 0x8e35, idx: 11746 },
-  { start: 0x8e42, end: 0x8e64, idx: 11758 },
-  { start: 0x8e72, end: 0x8e99, idx: 11793 },
-  { start: 0x8ea1, end: 0x8ea1, idx: 11833 },
-  { start: 0x8eaa, end: 0x8eb1, idx: 11834 },
-  { start: 0x8ebe, end: 0x8ebe, idx: 11842 },
-  { start: 0x8ec5, end: 0x8ed2, idx: 11843 },
-  { start: 0x8edb, end: 0x8ee3, idx: 11857 },
-  { start: 0x8eeb, end: 0x8eeb, idx: 11866 },
-  { start: 0x8ef8, end: 0x8f1f, idx: 11867 },
-  { start: 0x8f26, end: 0x8f4e, idx: 11907 },
-  { start: 0x8f57, end: 0x8f64, idx: 11948 },
-  { start: 0x8f9b, end: 0x8fc5, idx: 11962 },
-  { start: 0x8fce, end: 0x8fda, idx: 12005 },
-  { start: 0x8fe2, end: 0x9027, idx: 12018 },
-  { start: 0x902e, end: 0x9091, idx: 12088 },
-  { start: 0x90a3, end: 0x90b8, idx: 12188 },
-  { start: 0x90c1, end: 0x90c1, idx: 12210 },
-  { start: 0x90ca, end: 0x90ce, idx: 12211 },
-  { start: 0x90db, end: 0x90ed, idx: 12216 },
-  { start: 0x90f5, end: 0x9102, idx: 12235 },
-  { start: 0x9112, end: 0x9112, idx: 12249 },
-  { start: 0x9119, end: 0x9119, idx: 12250 },
-  { start: 0x912d, end: 0x9132, idx: 12251 },
-  { start: 0x9149, end: 0x9158, idx: 12257 },
-  { start: 0x9162, end: 0x9178, idx: 12273 },
-  { start: 0x9182, end: 0x91e7, idx: 12296 },
-  { start: 0x91f5, end: 0x91ff, idx: 12398 },
-  { start: 0x920d, end: 0x9215, idx: 12409 },
-  { start: 0x921e, end: 0x921e, idx: 12418 },
-  { start: 0x9229, end: 0x922c, idx: 12419 },
-  { start: 0x9234, end: 0x9237, idx: 12423 },
-  { start: 0x923f, end: 0x9250, idx: 12427 },
-  { start: 0x9257, end: 0x9266, idx: 12445 },
-  { start: 0x9271, end: 0x9271, idx: 12461 },
-  { start: 0x927e, end: 0x9285, idx: 12462 },
-  { start: 0x9291, end: 0x929c, idx: 12470 },
-  { start: 0x92ad, end: 0x92ad, idx: 12482 },
-  { start: 0x92b7, end: 0x92b9, idx: 12483 },
-  { start: 0x92cf, end: 0x92d2, idx: 12486 },
-  { start: 0x92e4, end: 0x92fc, idx: 12490 },
-  { start: 0x9306, end: 0x9306, idx: 12515 },
-  { start: 0x930f, end: 0x9310, idx: 12516 },
-  { start: 0x9318, end: 0x933b, idx: 12518 },
-  { start: 0x9344, end: 0x9344, idx: 12554 },
-  { start: 0x934b, end: 0x934d, idx: 12555 },
-  { start: 0x9354, end: 0x9360, idx: 12558 },
-  { start: 0x936c, end: 0x936e, idx: 12571 },
-  { start: 0x9375, end: 0x9375, idx: 12574 },
-  { start: 0x937c, end: 0x937e, idx: 12575 },
-  { start: 0x938c, end: 0x938c, idx: 12578 },
-  { start: 0x9394, end: 0x939a, idx: 12579 },
-  { start: 0x93a7, end: 0x93b0, idx: 12586 },
-  { start: 0x93b9, end: 0x93b9, idx: 12596 },
-  { start: 0x93c3, end: 0x93c8, idx: 12597 },
-  { start: 0x93d0, end: 0x93e8, idx: 12603 },
-  { start: 0x9403, end: 0x9407, idx: 12628 },
-  { start: 0x9410, end: 0x941a, idx: 12633 },
-  { start: 0x9421, end: 0x9421, idx: 12644 },
-  { start: 0x942b, end: 0x942b, idx: 12645 },
-  { start: 0x9435, end: 0x943a, idx: 12646 },
-  { start: 0x9441, end: 0x9444, idx: 12652 },
-  { start: 0x9451, end: 0x9453, idx: 12656 },
-  { start: 0x945a, end: 0x9462, idx: 12659 },
-  { start: 0x946a, end: 0x9481, idx: 12668 },
-  { start: 0x9577, end: 0x9577, idx: 12692 },
-  { start: 0x9580, end: 0x9599, idx: 12693 },
-  { start: 0x95a0, end: 0x95b2, idx: 12719 },
-  { start: 0x95b9, end: 0x95cd, idx: 12738 },
-  { start: 0x95d4, end: 0x95e5, idx: 12759 },
-  { start: 0x961c, end: 0x9621, idx: 12777 },
-  { start: 0x9628, end: 0x9632, idx: 12783 },
-  { start: 0x963b, end: 0x9644, idx: 12794 },
-  { start: 0x964b, end: 0x9650, idx: 12804 },
-  { start: 0x965b, end: 0x967d, idx: 12810 },
-  { start: 0x9685, end: 0x9749, idx: 12845 },
-  { start: 0x9752, end: 0x9790, idx: 13042 },
-  { start: 0x9798, end: 0x97b4, idx: 13105 },
-  { start: 0x97c3, end: 0x97cb, idx: 13134 },
-  { start: 0x97d3, end: 0x97d3, idx: 13143 },
-  { start: 0x97dc, end: 0x97dc, idx: 13144 },
-  { start: 0x97ed, end: 0x981a, idx: 13145 },
-  { start: 0x9821, end: 0x9824, idx: 13191 },
-  { start: 0x982c, end: 0x982d, idx: 13195 },
-  { start: 0x9834, end: 0x983d, idx: 13197 },
-  { start: 0x9846, end: 0x985e, idx: 13207 },
-  { start: 0x9867, end: 0x9874, idx: 13232 },
-  { start: 0x98a8, end: 0x98b6, idx: 13246 },
-  { start: 0x98c3, end: 0x98c6, idx: 13261 },
-  { start: 0x98db, end: 0x98e2, idx: 13265 },
-  { start: 0x98e9, end: 0x98f4, idx: 13273 },
-  { start: 0x98fc, end: 0x992e, idx: 13285 },
-  { start: 0x993d, end: 0x9957, idx: 13336 },
-  { start: 0x9996, end: 0x9999, idx: 13363 },
-  { start: 0x99a5, end: 0x99b4, idx: 13367 },
-  { start: 0x99bc, end: 0x99c8, idx: 13383 },
-  { start: 0x99d0, end: 0x99e2, idx: 13396 },
-  { start: 0x99ed, end: 0x9a05, idx: 13415 },
-  { start: 0x9a0e, end: 0x9a19, idx: 13440 },
-  { start: 0x9a28, end: 0x9a30, idx: 13452 },
-  { start: 0x9a37, end: 0x9a37, idx: 13461 },
-  { start: 0x9a3e, end: 0x9a45, idx: 13462 },
-  { start: 0x9a4d, end: 0x9a4d, idx: 13470 },
-  { start: 0x9a55, end: 0x9a6b, idx: 13471 },
-  { start: 0x9aa8, end: 0x9ab0, idx: 13494 },
-  { start: 0x9ab8, end: 0x9ac4, idx: 13503 },
-  { start: 0x9acf, end: 0x9afb, idx: 13516 },
-  { start: 0x9b06, end: 0x9b06, idx: 13561 },
-  { start: 0x9b18, end: 0x9b32, idx: 13562 },
-  { start: 0x9b3b, end: 0x9b45, idx: 13589 },
-  { start: 0x9b4d, end: 0x9b5a, idx: 13600 },
-  { start: 0x9b6f, end: 0x9b74, idx: 13614 },
-  { start: 0x9b83, end: 0x9b83, idx: 13620 },
-  { start: 0x9b8e, end: 0x9b97, idx: 13621 },
-  { start: 0x9b9f, end: 0x9ba0, idx: 13631 },
-  { start: 0x9ba8, end: 0x9bb9, idx: 13633 },
-  { start: 0x9bc0, end: 0x9be8, idx: 13651 },
-  { start: 0x9bf0, end: 0x9bf5, idx: 13692 },
-  { start: 0x9c04, end: 0x9c25, idx: 13698 },
-  { start: 0x9c2d, end: 0x9c32, idx: 13732 },
-  { start: 0x9c39, end: 0x9c3e, idx: 13738 },
-  { start: 0x9c46, end: 0x9c48, idx: 13744 },
-  { start: 0x9c52, end: 0x9c60, idx: 13747 },
-  { start: 0x9c67, end: 0x9c67, idx: 13762 },
-  { start: 0x9c76, end: 0x9c78, idx: 13763 },
-  { start: 0x9ce5, end: 0x9cf6, idx: 13766 },
-  { start: 0x9d03, end: 0x9d2c, idx: 13784 },
-  { start: 0x9d3b, end: 0x9d48, idx: 13826 },
-  { start: 0x9d50, end: 0x9d51, idx: 13840 },
-  { start: 0x9d59, end: 0x9d64, idx: 13842 },
-  { start: 0x9d6c, end: 0x9d72, idx: 13854 },
-  { start: 0x9d7a, end: 0x9d7a, idx: 13861 },
-  { start: 0x9d87, end: 0x9d8f, idx: 13862 },
-  { start: 0x9d9a, end: 0x9d9a, idx: 13871 },
-  { start: 0x9da4, end: 0x9dc6, idx: 13872 },
-  { start: 0x9dcf, end: 0x9dd9, idx: 13907 },
-  { start: 0x9de6, end: 0x9de6, idx: 13918 },
-  { start: 0x9ded, end: 0x9dfd, idx: 13919 },
-  { start: 0x9e1a, end: 0x9e1e, idx: 13936 },
-  { start: 0x9e75, end: 0x9e81, idx: 13941 },
-  { start: 0x9e88, end: 0x9ead, idx: 13954 },
-  { start: 0x9eb8, end: 0x9ec4, idx: 13992 },
-  { start: 0x9ecc, end: 0x9ee8, idx: 14005 },
-  { start: 0x9eef, end: 0x9efd, idx: 14034 },
-  { start: 0x9f07, end: 0x9f15, idx: 14049 },
-  { start: 0x9f20, end: 0x9f21, idx: 14064 },
-  { start: 0x9f2c, end: 0x9f2c, idx: 14066 },
-  { start: 0x9f3b, end: 0x9f3e, idx: 14067 },
-  { start: 0x9f4a, end: 0x9f54, idx: 14071 },
-  { start: 0x9f5f, end: 0x9f77, idx: 14082 },
-  { start: 0x9f8d, end: 0x9f8d, idx: 14107 },
-  { start: 0x9f95, end: 0x9f95, idx: 14108 },
-  { start: 0x9f9c, end: 0x9fa0, idx: 14109 },
-  { start: 0xff01, end: 0xff5d, idx: 14114 },
-  { start: 0xffe3, end: 0xffe5, idx: 14207 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
-};
-
-
-/* The following table is indexed using the previous tables.  It is
-   therefore indexed using UCS with leaving large gaps out.  It can
-   be computed with
-
-   egrep '^0x' < .../eastasia/jis/jis0208.txt | awk '{ print $3, $2}' |
-   egrep '^0x[^01]' | sort -u | perl tag.pl
-
-   where tab.pl is
-
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   $n=$first=$last=$idx=0;
-
-   sub fmt {
-     printf ("\n ") if (($n % 6) == 0);
-     ++$n;
-     my($val) = pop(@_);
-     printf (" \"\\x%02x\\x%02x\",", int($val / 256), $val % 256);
-   }
-
-   while (<>) {
-     local($ucs,$jis,%rest) = split;
-     local($u)=hex($ucs);
-     local($j)=hex($jis);
-     if ($u - $last > 6) {
-       if ($last != 0) {
-         $idx += $last - $first + 1;
-       }
-       $first=$u;
-     } else {
-       for ($m = $last + 1; $m < $u; ++$m) {
-	 fmt (0);
-       }
-     }
-     fmt ($j);
-     $last=$u;
-   }
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-const char __jisx0208_from_ucs_tab[14210][2] =
-{
-  "\x21\x3e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x21\x3d",
-  "\x21\x42", "\x00\x00", "\x21\x46", "\x21\x47", "\x00\x00", "\x00\x00",
-  "\x21\x48", "\x21\x49", "\x00\x00", "\x00\x00", "\x22\x77", "\x22\x78",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x21\x45", "\x21\x44", "\x22\x73",
-  "\x00\x00", "\x21\x6c", "\x21\x6d", "\x22\x28", "\x21\x6e", "\x22\x72",
-  "\x22\x2b", "\x22\x2c", "\x22\x2a", "\x22\x2d", "\x22\x4d", "\x00\x00",
-  "\x22\x4e", "\x22\x4f", "\x00\x00", "\x22\x5f", "\x22\x50", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x22\x60", "\x22\x3a", "\x00\x00", "\x00\x00",
-  "\x22\x3b", "\x21\x5d", "\x22\x65", "\x00\x00", "\x00\x00", "\x22\x67",
-  "\x21\x67", "\x00\x00", "\x22\x5c", "\x22\x4a", "\x22\x4b", "\x22\x41",
-  "\x22\x40", "\x22\x69", "\x22\x6a", "\x21\x68", "\x22\x68", "\x22\x66",
-  "\x22\x62", "\x21\x62", "\x22\x61", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x21\x65", "\x21\x66", "\x00\x00", "\x00\x00", "\x22\x63",
-  "\x22\x64", "\x22\x3e", "\x22\x3f", "\x00\x00", "\x00\x00", "\x22\x3c",
-  "\x22\x3d", "\x22\x5d", "\x22\x5e", "\x28\x21", "\x28\x2c", "\x28\x22",
-  "\x28\x2d", "\x28\x23", "\x00\x00", "\x00\x00", "\x28\x2e", "\x28\x24",
-  "\x00\x00", "\x00\x00", "\x28\x2f", "\x28\x26", "\x00\x00", "\x00\x00",
-  "\x28\x31", "\x28\x25", "\x00\x00", "\x00\x00", "\x28\x30", "\x28\x27",
-  "\x28\x3c", "\x00\x00", "\x00\x00", "\x28\x37", "\x00\x00", "\x00\x00",
-  "\x28\x32", "\x28\x29", "\x28\x3e", "\x00\x00", "\x00\x00", "\x28\x39",
-  "\x00\x00", "\x00\x00", "\x28\x34", "\x28\x28", "\x00\x00", "\x00\x00",
-  "\x28\x38", "\x28\x3d", "\x00\x00", "\x00\x00", "\x28\x33", "\x28\x2a",
-  "\x00\x00", "\x00\x00", "\x28\x3a", "\x28\x3f", "\x00\x00", "\x00\x00",
-  "\x28\x35", "\x28\x2b", "\x00\x00", "\x00\x00", "\x28\x3b", "\x00\x00",
-  "\x00\x00", "\x28\x40", "\x28\x36", "\x22\x23", "\x22\x22", "\x22\x25",
-  "\x22\x24", "\x22\x27", "\x22\x26", "\x22\x21", "\x21\x7e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x21\x7b", "\x00\x00", "\x00\x00", "\x21\x7d",
-  "\x21\x7c", "\x22\x7e", "\x21\x7a", "\x21\x79", "\x21\x6a", "\x00\x00",
-  "\x21\x69", "\x22\x76", "\x00\x00", "\x00\x00", "\x22\x75", "\x00\x00",
-  "\x22\x74", "\x21\x21", "\x21\x22", "\x21\x23", "\x21\x37", "\x00\x00",
-  "\x21\x39", "\x21\x3a", "\x21\x3b", "\x21\x52", "\x21\x53", "\x21\x54",
-  "\x21\x55", "\x21\x56", "\x21\x57", "\x21\x58", "\x21\x59", "\x21\x5a",
-  "\x21\x5b", "\x22\x29", "\x22\x2e", "\x21\x4c", "\x21\x4d", "\x21\x41",
-  "\x24\x21", "\x24\x22", "\x24\x23", "\x24\x24", "\x24\x25", "\x24\x26",
-  "\x24\x27", "\x24\x28", "\x24\x29", "\x24\x2a", "\x24\x2b", "\x24\x2c",
-  "\x24\x2d", "\x24\x2e", "\x24\x2f", "\x24\x30", "\x24\x31", "\x24\x32",
-  "\x24\x33", "\x24\x34", "\x24\x35", "\x24\x36", "\x24\x37", "\x24\x38",
-  "\x24\x39", "\x24\x3a", "\x24\x3b", "\x24\x3c", "\x24\x3d", "\x24\x3e",
-  "\x24\x3f", "\x24\x40", "\x24\x41", "\x24\x42", "\x24\x43", "\x24\x44",
-  "\x24\x45", "\x24\x46", "\x24\x47", "\x24\x48", "\x24\x49", "\x24\x4a",
-  "\x24\x4b", "\x24\x4c", "\x24\x4d", "\x24\x4e", "\x24\x4f", "\x24\x50",
-  "\x24\x51", "\x24\x52", "\x24\x53", "\x24\x54", "\x24\x55", "\x24\x56",
-  "\x24\x57", "\x24\x58", "\x24\x59", "\x24\x5a", "\x24\x5b", "\x24\x5c",
-  "\x24\x5d", "\x24\x5e", "\x24\x5f", "\x24\x60", "\x24\x61", "\x24\x62",
-  "\x24\x63", "\x24\x64", "\x24\x65", "\x24\x66", "\x24\x67", "\x24\x68",
-  "\x24\x69", "\x24\x6a", "\x24\x6b", "\x24\x6c", "\x24\x6d", "\x24\x6e",
-  "\x24\x6f", "\x24\x70", "\x24\x71", "\x24\x72", "\x24\x73", "\x21\x2b",
-  "\x21\x2c", "\x21\x35", "\x21\x36", "\x00\x00", "\x00\x00", "\x25\x21",
-  "\x25\x22", "\x25\x23", "\x25\x24", "\x25\x25", "\x25\x26", "\x25\x27",
-  "\x25\x28", "\x25\x29", "\x25\x2a", "\x25\x2b", "\x25\x2c", "\x25\x2d",
-  "\x25\x2e", "\x25\x2f", "\x25\x30", "\x25\x31", "\x25\x32", "\x25\x33",
-  "\x25\x34", "\x25\x35", "\x25\x36", "\x25\x37", "\x25\x38", "\x25\x39",
-  "\x25\x3a", "\x25\x3b", "\x25\x3c", "\x25\x3d", "\x25\x3e", "\x25\x3f",
-  "\x25\x40", "\x25\x41", "\x25\x42", "\x25\x43", "\x25\x44", "\x25\x45",
-  "\x25\x46", "\x25\x47", "\x25\x48", "\x25\x49", "\x25\x4a", "\x25\x4b",
-  "\x25\x4c", "\x25\x4d", "\x25\x4e", "\x25\x4f", "\x25\x50", "\x25\x51",
-  "\x25\x52", "\x25\x53", "\x25\x54", "\x25\x55", "\x25\x56", "\x25\x57",
-  "\x25\x58", "\x25\x59", "\x25\x5a", "\x25\x5b", "\x25\x5c", "\x25\x5d",
-  "\x25\x5e", "\x25\x5f", "\x25\x60", "\x25\x61", "\x25\x62", "\x25\x63",
-  "\x25\x64", "\x25\x65", "\x25\x66", "\x25\x67", "\x25\x68", "\x25\x69",
-  "\x25\x6a", "\x25\x6b", "\x25\x6c", "\x25\x6d", "\x25\x6e", "\x25\x6f",
-  "\x25\x70", "\x25\x71", "\x25\x72", "\x25\x73", "\x25\x74", "\x25\x75",
-  "\x25\x76", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x21\x26",
-  "\x21\x3c", "\x21\x33", "\x21\x34", "\x30\x6c", "\x43\x7a", "\x00\x00",
-  "\x3c\x37", "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x7c", "\x3e\x66",
-  "\x3b\x30", "\x3e\x65", "\x32\x3c", "\x00\x00", "\x49\x54", "\x4d\x3f",
-  "\x00\x00", "\x50\x22", "\x31\x2f", "\x00\x00", "\x00\x00", "\x33\x6e",
-  "\x50\x23", "\x40\x24", "\x52\x42", "\x35\x56", "\x4a\x3a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x67", "\x00\x00", "\x00\x00",
-  "\x4e\x3e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x42",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x24", "\x00\x00", "\x00\x00",
-  "\x43\x66", "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x25", "\x36\x7a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x26", "\x00\x00", "\x34\x5d",
-  "\x43\x30", "\x00\x00", "\x3c\x67", "\x50\x27", "\x00\x00", "\x00\x00",
-  "\x50\x28", "\x00\x00", "\x00\x00", "\x50\x29", "\x47\x35", "\x00\x00",
-  "\x35\x57", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x47\x37", "\x00\x00", "\x46\x63", "\x38\x43", "\x4b\x33", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x49", "\x50\x2a",
-  "\x3e\x68", "\x50\x2b", "\x32\x35", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x36\x65", "\x38\x70", "\x4c\x69", "\x00\x00", "\x00\x00", "\x56\x26",
-  "\x4d\x70", "\x00\x00", "\x46\x7d", "\x34\x25", "\x00\x00", "\x35\x35",
-  "\x00\x00", "\x50\x2c", "\x00\x00", "\x00\x00", "\x50\x2d", "\x4e\x3b",
-  "\x00\x00", "\x4d\x3d", "\x41\x68", "\x50\x2f", "\x3b\x76", "\x46\x73",
-  "\x00\x00", "\x50\x32", "\x00\x00", "\x00\x00", "\x31\x3e", "\x38\x5f",
-  "\x00\x00", "\x38\x5e", "\x30\x66", "\x00\x00", "\x00\x00", "\x4f\x4b",
-  "\x4f\x4a", "\x00\x00", "\x3a\x33", "\x30\x21", "\x00\x00", "\x50\x33",
-  "\x50\x34", "\x50\x35", "\x4b\x34", "\x50\x36", "\x00\x00", "\x38\x72",
-  "\x30\x67", "\x4b\x72", "\x00\x00", "\x35\x7c", "\x00\x00", "\x00\x00",
-  "\x35\x7d", "\x35\x7e", "\x44\x62", "\x4e\x3c", "\x00\x00", "\x50\x37",
-  "\x00\x00", "\x00\x00", "\x50\x38", "\x00\x00", "\x00\x00", "\x50\x39",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x4d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x3a", "\x3f\x4e", "\x50\x3e",
-  "\x00\x00", "\x50\x3c", "\x00\x00", "\x50\x3d", "\x35\x58", "\x00\x00",
-  "\x00\x00", "\x3a\x23", "\x32\x70", "\x00\x00", "\x50\x3b", "\x50\x3a",
-  "\x4a\x29", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x46",
-  "\x3b\x45", "\x42\x3e", "\x50\x3f", "\x49\x55", "\x40\x67", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x21\x38", "\x50\x40", "\x50\x42", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x42\x65", "\x4e\x61", "\x30\x4a", "\x50\x41",
-  "\x32\x3e", "\x00\x00", "\x36\x44", "\x00\x00", "\x43\x67", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x37\x6f", "\x50\x43", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x47\x24", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x34\x6b", "\x50\x44", "\x30\x4b", "\x00\x00", "\x00\x00",
-  "\x38\x60", "\x34\x6c", "\x49\x7a", "\x48\x32", "\x35\x59", "\x32\x71",
-  "\x00\x00", "\x50\x67", "\x45\x41", "\x47\x6c", "\x50\x46", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x48\x3c", "\x00\x00", "\x4e\x62", "\x00\x00",
-  "\x3f\x2d", "\x00\x00", "\x3b\x47", "\x00\x00", "\x3b\x77", "\x32\x40",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x51",
-  "\x00\x00", "\x00\x00", "\x43\x22", "\x50\x4a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x4c", "\x44\x63", "\x3d\x3b",
-  "\x3a\x34", "\x4d\x24", "\x00\x00", "\x42\x4e", "\x00\x00", "\x32\x3f",
-  "\x00\x00", "\x50\x49", "\x00\x00", "\x4d\x3e", "\x50\x45", "\x50\x47",
-  "\x3a\x6e", "\x50\x48", "\x55\x24", "\x50\x50", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x53", "\x50\x51", "\x00\x00",
-  "\x00\x00", "\x32\x42", "\x00\x00", "\x4a\x3b", "\x50\x4b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x4f", "\x38\x73", "\x00\x00",
-  "\x00\x00", "\x3b\x48", "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x26",
-  "\x00\x00", "\x00\x00", "\x50\x54", "\x00\x00", "\x50\x4c", "\x00\x00",
-  "\x00\x00", "\x4e\x63", "\x00\x00", "\x3b\x78", "\x00\x00", "\x50\x4d",
-  "\x00\x00", "\x50\x52", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x50\x55", "\x00\x00", "\x50\x4e", "\x00\x00", "\x00\x00", "\x36\x21",
-  "\x00\x00", "\x30\x4d", "\x00\x00", "\x00\x00", "\x36\x22", "\x32\x41",
-  "\x55\x25", "\x00\x00", "\x4b\x79", "\x49\x6e", "\x38\x74", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x2f", "\x4e\x37",
-  "\x4a\x58", "\x00\x00", "\x00\x00", "\x37\x38", "\x42\x25", "\x32\x64",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x53",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x59", "\x00\x00", "\x50\x5e",
-  "\x50\x5c", "\x00\x00", "\x00\x00", "\x50\x57", "\x00\x00", "\x00\x00",
-  "\x42\x2f", "\x50\x5a", "\x00\x00", "\x50\x5d", "\x50\x5b", "\x00\x00",
-  "\x4a\x5d", "\x00\x00", "\x50\x58", "\x00\x00", "\x3f\x2e", "\x00\x00",
-  "\x4b\x73", "\x50\x5f", "\x50\x60", "\x3d\x24", "\x50\x6d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x47\x50", "\x00\x00", "\x49\x36", "\x50\x68",
-  "\x00\x00", "\x4a\x70", "\x00\x00", "\x32\x36", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x50\x6c", "\x50\x66", "\x50\x6f", "\x00\x00", "\x00\x00",
-  "\x41\x52", "\x00\x00", "\x38\x44", "\x00\x00", "\x47\x5c", "\x00\x00",
-  "\x60\x47", "\x00\x00", "\x50\x6e", "\x45\x5d", "\x00\x00", "\x50\x63",
-  "\x00\x00", "\x38\x76", "\x00\x00", "\x00\x00", "\x38\x75", "\x50\x61",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x5a", "\x00\x00",
-  "\x50\x69", "\x00\x00", "\x4a\x6f", "\x43\x4d", "\x50\x65", "\x37\x71",
-  "\x00\x00", "\x50\x62", "\x50\x6a", "\x50\x64", "\x4e\x51", "\x50\x6b",
-  "\x4f\x41", "\x36\x66", "\x00\x00", "\x00\x00", "\x37\x70", "\x50\x70",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x71", "\x50\x75", "\x30\x4e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x50",
-  "\x50\x74", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x73",
-  "\x50\x77", "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x76", "\x00\x00",
-  "\x44\x64", "\x37\x72", "\x50\x78", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3c\x45", "\x00\x00", "\x42\x26", "\x44\x65",
-  "\x36\x76", "\x00\x00", "\x50\x79", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x35\x36", "\x00\x00", "\x00\x00", "\x50\x7a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x7c", "\x4b\x35", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x37\x66", "\x3b\x31", "\x48\x77", "\x50\x7b",
-  "\x3a\x45", "\x4d\x43", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x50\x7e", "\x51\x23", "\x50\x7d", "\x3a\x44", "\x00\x00", "\x3d\x7d",
-  "\x37\x39", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x24", "\x00\x00",
-  "\x00\x00", "\x36\x4f", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x21",
-  "\x51\x22", "\x00\x00", "\x00\x00", "\x46\x2f", "\x00\x00", "\x41\x7c",
-  "\x00\x00", "\x36\x23", "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x4d",
-  "\x51\x25", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x3d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x51\x26", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x51\x29", "\x00\x00", "\x51\x27", "\x00\x00", "\x41\x4e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x28",
-  "\x51\x2a", "\x51\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x2b",
-  "\x00\x00", "\x4a\x48", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x35\x37", "\x51\x2e", "\x51\x2f", "\x00\x00", "\x32\x2f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x2d", "\x3c\x74", "\x00\x00",
-  "\x51\x32", "\x51\x31", "\x51\x30", "\x00\x00", "\x50\x56", "\x00\x00",
-  "\x51\x33", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x7e",
-  "\x00\x00", "\x51\x34", "\x4d\x25", "\x4c\x59", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x51\x36", "\x00\x00", "\x00\x00", "\x51\x35",
-  "\x51\x38", "\x51\x37", "\x00\x00", "\x00\x00", "\x51\x39", "\x51\x3a",
-  "\x30\x74", "\x00\x00", "\x38\x35", "\x37\x3b", "\x3d\x3c", "\x43\x7b",
-  "\x36\x24", "\x40\x68", "\x38\x77", "\x00\x00", "\x39\x6e", "\x51\x3c",
-  "\x4c\x48", "\x45\x46", "\x00\x00", "\x3b\x79", "\x00\x00", "\x51\x3b",
-  "\x00\x00", "\x51\x3d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x45\x5e", "\x00\x00", "\x33\x75", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x3e", "\x00\x00", "\x00\x00",
-  "\x46\x7e", "\x00\x00", "\x00\x00", "\x41\x34", "\x51\x40", "\x51\x41",
-  "\x48\x2c", "\x38\x78", "\x4f\x3b", "\x51\x42", "\x00\x00", "\x00\x00",
-  "\x36\x26", "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x3c", "\x42\x36",
-  "\x36\x71", "\x45\x35", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x73",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x43", "\x00\x00", "\x51\x44",
-  "\x00\x00", "\x00\x00", "\x46\x62", "\x31\x5f", "\x00\x00", "\x00\x00",
-  "\x51\x47", "\x3a\x7d", "\x00\x00", "\x51\x46", "\x3a\x46", "\x00\x00",
-  "\x51\x48", "\x66\x6e", "\x51\x49", "\x4b\x41", "\x51\x4a", "\x00\x00",
-  "\x51\x4b", "\x51\x4c", "\x3e\x69", "\x00\x00", "\x3c\x4c", "\x34\x27",
-  "\x00\x00", "\x51\x4f", "\x00\x00", "\x51\x4d", "\x4c\x3d", "\x51\x4e",
-  "\x00\x00", "\x49\x5a", "\x51\x50", "\x51\x51", "\x51\x52", "\x45\x5f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x56", "\x51\x54", "\x51\x55",
-  "\x51\x53", "\x3a\x63", "\x51\x57", "\x4c\x6a", "\x4e\x64", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x58", "\x40\x28",
-  "\x51\x59", "\x3d\x5a", "\x00\x00", "\x00\x00", "\x51\x5a", "\x00\x00",
-  "\x43\x7c", "\x4e\x3f", "\x45\x60", "\x52\x45", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x51\x5b", "\x74\x25", "\x36\x45", "\x00\x00",
-  "\x00\x00", "\x51\x5c", "\x4b\x5e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3d\x68", "\x42\x7c", "\x00\x00", "\x51\x5e", "\x46\x64",
-  "\x00\x00", "\x00\x00", "\x51\x5f", "\x00\x00", "\x00\x00", "\x51\x60",
-  "\x33\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x61", "\x36\x27",
-  "\x00\x00", "\x46\x4c", "\x31\x7a", "\x3d\x50", "\x00\x00", "\x00\x00",
-  "\x48\x21", "\x51\x62", "\x00\x00", "\x45\x61", "\x00\x00", "\x00\x00",
-  "\x3f\x4f", "\x51\x63", "\x00\x00", "\x4a\x2c", "\x40\x5a", "\x34\x22",
-  "\x00\x00", "\x34\x29", "\x51\x64", "\x00\x00", "\x00\x00", "\x51\x66",
-  "\x00\x00", "\x00\x00", "\x37\x3a", "\x00\x00", "\x00\x00", "\x51\x65",
-  "\x00\x00", "\x00\x00", "\x4e\x73", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3d\x69", "\x48\x3d", "\x4a\x4c", "\x00\x00",
-  "\x51\x67", "\x00\x00", "\x4d\x78", "\x51\x68", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x51\x69", "\x00\x00", "\x45\x7e", "\x00\x00", "\x00\x00",
-  "\x51\x6a", "\x00\x00", "\x00\x00", "\x40\x29", "\x3a\x7e", "\x37\x74",
-  "\x51\x6b", "\x3b\x49", "\x39\x6f", "\x44\x66", "\x51\x6d", "\x00\x00",
-  "\x00\x00", "\x42\x27", "\x00\x00", "\x00\x00", "\x3a\x6f", "\x51\x6e",
-  "\x51\x6f", "\x41\x30", "\x00\x00", "\x51\x6c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x51\x71", "\x00\x00", "\x4b\x36", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x64", "\x00\x00", "\x00\x00",
-  "\x51\x70", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x75",
-  "\x3a\x5e", "\x47\x6d", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x74",
-  "\x51\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x7b",
-  "\x3e\x6a", "\x51\x7b", "\x33\x64", "\x51\x75", "\x51\x73", "\x41\x4f",
-  "\x51\x77", "\x00\x00", "\x51\x76", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x33\x44", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x60", "\x51\x7c",
-  "\x4e\x2d", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x78", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x51\x7d", "\x51\x7a", "\x00\x00", "\x51\x79",
-  "\x4e\x4f", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x79", "\x32\x43",
-  "\x00\x00", "\x00\x00", "\x4e\x74", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3d\x75", "\x45\x58", "\x39\x65", "\x52\x22",
-  "\x52\x23", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x65", "\x00\x00",
-  "\x00\x00", "\x4f\x2b", "\x52\x25", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x38\x7a", "\x00\x00", "\x00\x00", "\x52\x24", "\x00\x00", "\x33\x2f",
-  "\x00\x00", "\x00\x00", "\x52\x26", "\x00\x00", "\x4b\x56", "\x00\x00",
-  "\x44\x3c", "\x00\x00", "\x4d\x26", "\x00\x00", "\x4a\x59", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x52\x27", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x70\x55", "\x00\x00", "\x00\x00", "\x46\x30", "\x00\x00",
-  "\x52\x28", "\x34\x2a", "\x4c\x33", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3e\x21", "\x52\x29", "\x4a\x67", "\x52\x2d", "\x00\x00", "\x40\x2a",
-  "\x52\x2a", "\x36\x50", "\x00\x00", "\x52\x2b", "\x34\x2b", "\x37\x2e",
-  "\x52\x2e", "\x00\x00", "\x52\x2f", "\x00\x00", "\x00\x00", "\x52\x30",
-  "\x52\x31", "\x3c\x5b", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x7b",
-  "\x4c\x5e", "\x00\x00", "\x4c\x68", "\x46\x77", "\x00\x00", "\x00\x00",
-  "\x4a\x71", "\x52\x32", "\x00\x00", "\x52\x33", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x52\x35", "\x00\x00", "\x52\x37", "\x52\x36",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x52\x38", "\x32\x3d",
-  "\x4b\x4c", "\x00\x00", "\x3a\x7c", "\x52\x39", "\x00\x00", "\x00\x00",
-  "\x41\x59", "\x00\x00", "\x00\x00", "\x3e\x22", "\x36\x29", "\x00\x00",
-  "\x52\x3a", "\x48\x5b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x52\x3b", "\x00\x00", "\x52\x3c", "\x00\x00", "\x52\x3d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x52\x3e", "\x49\x24", "\x36\x68",
-  "\x30\x65", "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x3f", "\x52\x3f",
-  "\x3d\x3d", "\x00\x00", "\x40\x69", "\x00\x00", "\x52\x41", "\x52\x40",
-  "\x3e\x23", "\x38\x61", "\x52\x43", "\x48\x3e", "\x00\x00", "\x00\x00",
-  "\x52\x44", "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x5c", "\x42\x34",
-  "\x42\x6e", "\x36\x28", "\x00\x00", "\x00\x00", "\x46\x6e", "\x43\x31",
-  "\x00\x00", "\x47\x6e", "\x00\x00", "\x4b\x4e", "\x00\x00", "\x52\x46",
-  "\x00\x00", "\x40\x6a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x37\x35", "\x00\x00", "\x00\x00", "\x52\x47", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x52\x48", "\x31\x2c", "\x30\x75",
-  "\x34\x6d", "\x00\x00", "\x42\x28", "\x35\x51", "\x4d\x71", "\x00\x00",
-  "\x52\x4b", "\x32\x37", "\x00\x00", "\x00\x00", "\x52\x4a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x36\x2a", "\x00\x00", "\x00\x00", "\x52\x4c",
-  "\x00\x00", "\x4c\x71", "\x52\x4d", "\x00\x00", "\x4e\x52", "\x00\x00",
-  "\x38\x7c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x36",
-  "\x52\x4e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x52\x50",
-  "\x52\x4f", "\x00\x00", "\x3f\x5f", "\x31\x39", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x31\x5e", "\x52\x51", "\x00\x00", "\x52\x52", "\x00\x00",
-  "\x00\x00", "\x38\x37", "\x00\x00", "\x00\x00", "\x52\x53", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x6e", "\x3b\x32", "\x52\x54",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x74", "\x3a\x35",
-  "\x35\x5a", "\x4d\x27", "\x41\x50", "\x48\x3f", "\x3c\x7d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x47", "\x00\x00",
-  "\x3c\x68", "\x3c\x75", "\x00\x00", "\x3d\x76", "\x00\x00", "\x48\x40",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x52\x57", "\x00\x00", "\x31\x43",
-  "\x41\x51", "\x38\x7d", "\x38\x45", "\x36\x67", "\x00\x00", "\x00\x00",
-  "\x52\x5b", "\x43\x21", "\x42\x7e", "\x36\x2b", "\x3e\x24", "\x52\x5c",
-  "\x52\x5a", "\x32\x44", "\x42\x66", "\x3c\x38", "\x3b\x4b", "\x31\x26",
-  "\x00\x00", "\x00\x00", "\x33\x70", "\x39\x66", "\x3b\x4a", "\x00\x00",
-  "\x52\x5d", "\x52\x5e", "\x00\x00", "\x35\x49", "\x33\x46", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x39\x67", "\x35\x48", "\x44\x5f", "\x31\x25",
-  "\x46\x31", "\x4c\x3e", "\x39\x21", "\x4d\x79", "\x45\x47", "\x38\x7e",
-  "\x37\x2f", "\x00\x00", "\x52\x67", "\x00\x00", "\x36\x63", "\x4b\x4a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x5d",
-  "\x00\x00", "\x00\x00", "\x52\x66", "\x00\x00", "\x34\x5e", "\x52\x61",
-  "\x52\x62", "\x52\x64", "\x52\x65", "\x00\x00", "\x35\x5b", "\x3f\x61",
-  "\x00\x00", "\x4a\x2d", "\x52\x63", "\x52\x5f", "\x38\x63", "\x00\x00",
-  "\x52\x60", "\x00\x00", "\x4f\x24", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4a\x72", "\x00\x00", "\x44\x68", "\x38\x62", "\x39\x70", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x52\x68", "\x00\x00", "\x00\x00", "\x46\x5d",
-  "\x52\x6c", "\x3c\x7e", "\x00\x00", "\x3c\x76", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x52\x6f", "\x52\x6d", "\x00\x00",
-  "\x4c\x23", "\x00\x00", "\x52\x6a", "\x52\x73", "\x52\x6e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x52\x71", "\x38\x46", "\x4c\x3f", "\x00\x00",
-  "\x00\x00", "\x52\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x52\x74",
-  "\x00\x00", "\x52\x76", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3a\x70", "\x4f\x42", "\x00\x00", "\x52\x6b", "\x52\x69", "\x52\x75",
-  "\x00\x00", "\x52\x70", "\x52\x78", "\x00\x00", "\x53\x23", "\x52\x7a",
-  "\x00\x00", "\x00\x00", "\x52\x7e", "\x00\x00", "\x00\x00", "\x53\x21",
-  "\x52\x7b", "\x00\x00", "\x00\x00", "\x53\x3e", "\x00\x00", "\x00\x00",
-  "\x3a\x69", "\x33\x31", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x52\x79", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x25", "\x30\x76",
-  "\x53\x24", "\x00\x00", "\x30\x25", "\x49\x4a", "\x53\x22", "\x00\x00",
-  "\x52\x7c", "\x00\x00", "\x00\x00", "\x52\x77", "\x52\x7d", "\x3a\x48",
-  "\x53\x26", "\x30\x77", "\x53\x2f", "\x00\x00", "\x00\x00", "\x53\x27",
-  "\x53\x28", "\x00\x00", "\x3e\x25", "\x4b\x69", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x53\x2d", "\x53\x2c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x45\x2f", "\x53\x2e", "\x00\x00", "\x00\x00", "\x53\x2b", "\x31\x34",
-  "\x00\x00", "\x3a\x36", "\x3f\x30", "\x53\x29", "\x45\x62", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x53\x2a", "\x00\x00", "\x30\x22", "\x53\x34",
-  "\x4d\x23", "\x00\x00", "\x3e\x27", "\x00\x00", "\x53\x3a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x39", "\x53\x30", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x43", "\x00\x00", "\x53\x31",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x6f", "\x53\x36", "\x3e\x26",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x33",
-  "\x00\x00", "\x00\x00", "\x4c\x64", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x37\x3c", "\x00\x00", "\x00\x00", "\x53\x37", "\x53\x38", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x35", "\x53\x3b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x32", "\x53\x41",
-  "\x53\x46", "\x00\x00", "\x53\x42", "\x00\x00", "\x53\x3d", "\x00\x00",
-  "\x00\x00", "\x53\x47", "\x41\x31", "\x00\x00", "\x00\x00", "\x53\x49",
-  "\x00\x00", "\x39\x22", "\x53\x3f", "\x43\x7d", "\x53\x43", "\x53\x3c",
-  "\x34\x2d", "\x00\x00", "\x34\x6e", "\x33\x65", "\x53\x44", "\x53\x40",
-  "\x37\x76", "\x53\x4a", "\x53\x48", "\x41\x53", "\x35\x4a", "\x36\x2c",
-  "\x00\x00", "\x53\x45", "\x00\x00", "\x36\x74", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x44", "\x53\x4e", "\x53\x4c",
-  "\x00\x00", "\x54\x27", "\x53\x51", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x53\x4b", "\x00\x00", "\x53\x4f", "\x00\x00",
-  "\x00\x00", "\x53\x4d", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x4c",
-  "\x53\x50", "\x53\x53", "\x00\x00", "\x53\x58", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x53\x56", "\x53\x55", "\x43\x32", "\x00\x00", "\x00\x00",
-  "\x32\x45", "\x53\x52", "\x00\x00", "\x53\x54", "\x3e\x28", "\x31\x33",
-  "\x00\x00", "\x00\x00", "\x53\x57", "\x32\x5e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x62", "\x00\x00", "\x3e\x7c",
-  "\x53\x5e", "\x00\x00", "\x53\x5c", "\x00\x00", "\x53\x5d", "\x00\x00",
-  "\x53\x5f", "\x31\x3d", "\x41\x39", "\x00\x00", "\x53\x59", "\x00\x00",
-  "\x53\x5a", "\x33\x7a", "\x53\x61", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x34\x6f", "\x00\x00", "\x53\x64", "\x53\x60", "\x53\x63", "\x4a\x2e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x55", "\x00\x00", "\x48\x38",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x66",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x65",
-  "\x33\x45", "\x00\x00", "\x00\x00", "\x53\x67", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x53\x6a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x53\x69", "\x53\x68", "\x00\x00", "\x47\x39", "\x00\x00",
-  "\x00\x00", "\x53\x6b", "\x53\x6c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x53\x6e", "\x00\x00", "\x53\x6d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x70", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x53\x73", "\x53\x71", "\x53\x6f", "\x53\x72",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x74", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x75", "\x00\x00",
-  "\x00\x00", "\x53\x76", "\x00\x00", "\x53\x77", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x53\x78", "\x51\x45", "\x00\x00", "\x3c\x7c", "\x3b\x4d",
-  "\x00\x00", "\x00\x00", "\x32\x73", "\x00\x00", "\x30\x78", "\x00\x00",
-  "\x00\x00", "\x43\x44", "\x53\x79", "\x00\x00", "\x3a\x24", "\x00\x00",
-  "\x30\x4f", "\x3f\x5e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x53\x7a", "\x38\x47", "\x00\x00", "\x00\x00", "\x39\x71",
-  "\x00\x00", "\x53\x7c", "\x53\x7b", "\x00\x00", "\x00\x00", "\x4a\x60",
-  "\x53\x7d", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x21", "\x53\x7e",
-  "\x00\x00", "\x54\x22", "\x00\x00", "\x54\x23", "\x00\x00", "\x37\x77",
-  "\x00\x00", "\x00\x00", "\x31\x60", "\x54\x24", "\x00\x00", "\x00\x00",
-  "\x54\x26", "\x00\x00", "\x54\x25", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x54\x28", "\x00\x00", "\x00\x00", "\x45\x5a", "\x54\x29", "\x30\x35",
-  "\x3a\x5f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x3d",
-  "\x00\x00", "\x00\x00", "\x43\x4f", "\x54\x2a", "\x54\x2b", "\x00\x00",
-  "\x00\x00", "\x54\x2d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x54\x2e", "\x00\x00", "\x3a\x64", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x36\x51", "\x00\x00", "\x00\x00", "\x4b\x37", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x54\x2c", "\x54\x2f", "\x3a\x41", "\x39\x23",
-  "\x54\x33", "\x00\x00", "\x00\x00", "\x3a\x25", "\x00\x00", "\x43\x33",
-  "\x00\x00", "\x00\x00", "\x54\x30", "\x44\x5a", "\x54\x34", "\x00\x00",
-  "\x00\x00", "\x3f\x62", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x54\x32", "\x54\x35", "\x00\x00", "\x37\x3f", "\x54\x36",
-  "\x54\x37", "\x00\x00", "\x39\x24", "\x33\x40", "\x54\x39", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x3a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x3b", "\x00\x00",
-  "\x00\x00", "\x54\x38", "\x54\x31", "\x00\x00", "\x00\x00", "\x54\x3c",
-  "\x00\x00", "\x00\x00", "\x54\x3d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4b\x64", "\x00\x00", "\x00\x00", "\x3e\x6b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x54\x3f", "\x54\x40", "\x54\x3e", "\x00\x00",
-  "\x54\x42", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x47\x38", "\x00\x00", "\x00\x00", "\x30\x68", "\x49\x56", "\x00\x00",
-  "\x00\x00", "\x54\x43", "\x3e\x7d", "\x00\x00", "\x00\x00", "\x3c\x39",
-  "\x00\x00", "\x47\x5d", "\x34\x70", "\x00\x00", "\x3a\x6b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4b\x59", "\x00\x00", "\x46\x32", "\x00\x00",
-  "\x00\x00", "\x37\x78", "\x42\x4f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x54\x41", "\x54\x44", "\x42\x44", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x54\x45", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x46", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x54\x48", "\x00\x00", "\x00\x00", "\x44\x69",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x2e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x74\x21", "\x31\x61",
-  "\x4a\x73", "\x00\x00", "\x00\x00", "\x3e\x6c", "\x45\x48", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x66", "\x00\x00", "\x00\x00",
-  "\x54\x4e", "\x00\x00", "\x00\x00", "\x4a\x3d", "\x4e\x5d", "\x32\x74",
-  "\x54\x4a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x41\x3a", "\x54\x4d", "\x00\x00", "\x45\x63", "\x00\x00", "\x00\x00",
-  "\x45\x49", "\x45\x64", "\x48\x39", "\x44\x4d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3a\x49", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x49",
-  "\x31\x76", "\x00\x00", "\x45\x36", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x54\x4b", "\x00\x00", "\x54\x47", "\x00\x00", "\x00\x00",
-  "\x3f\x50", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x4f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x4e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x36\x2d", "\x00\x00", "\x54\x50", "\x4a\x68",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x7d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x44\x46", "\x00\x00", "\x00\x00", "\x54\x52",
-  "\x4b\x4f", "\x00\x00", "\x00\x00", "\x54\x53", "\x00\x00", "\x00\x00",
-  "\x54\x58", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x2f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x57", "\x54\x51",
-  "\x54\x54", "\x54\x56", "\x00\x00", "\x00\x00", "\x3a\x26", "\x00\x00",
-  "\x00\x00", "\x4a\x49", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x59",
-  "\x00\x00", "\x43\x45", "\x00\x00", "\x00\x00", "\x32\x75", "\x00\x00",
-  "\x3e\x6d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x5b",
-  "\x00\x00", "\x54\x5a", "\x00\x00", "\x39\x68", "\x00\x00", "\x54\x5c",
-  "\x54\x5e", "\x54\x5d", "\x00\x00", "\x00\x00", "\x54\x60", "\x00\x00",
-  "\x54\x55", "\x54\x62", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x54\x61", "\x54\x5f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3b\x4e", "\x3f\x51", "\x00\x00", "\x41\x54", "\x54\x63",
-  "\x40\x3c", "\x30\x6d", "\x47\x64", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x44\x5b", "\x00\x00", "\x54\x65", "\x54\x64", "\x54\x66",
-  "\x54\x67", "\x54\x68", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x54\x69", "\x4a\x51", "\x54\x6a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x32\x46", "\x54\x6b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4d\x3c", "\x33\x30", "\x00\x00", "\x52\x49", "\x3d\x48",
-  "\x42\x3f", "\x54\x6c", "\x4c\x6b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4c\x34", "\x00\x00", "\x00\x00", "\x54\x6e",
-  "\x00\x00", "\x42\x67", "\x00\x00", "\x45\x37", "\x42\x40", "\x49\x57",
-  "\x54\x6f", "\x54\x70", "\x31\x7b", "\x00\x00", "\x00\x00", "\x3c\x3a",
-  "\x54\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x50",
-  "\x54\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x54\x73", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x31\x62", "\x00\x00", "\x00\x00", "\x34\x71", "\x46\x60", "\x4a\x74",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x77", "\x41\x55",
-  "\x54\x76", "\x37\x40", "\x00\x00", "\x00\x00", "\x4b\x5b", "\x54\x75",
-  "\x00\x00", "\x45\x65", "\x54\x79", "\x00\x00", "\x54\x78", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x7b", "\x00\x00",
-  "\x54\x7a", "\x00\x00", "\x00\x00", "\x31\x7c", "\x00\x00", "\x54\x7c",
-  "\x3e\x29", "\x54\x7e", "\x43\x25", "\x00\x00", "\x54\x7d", "\x00\x00",
-  "\x4a\x33", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x77",
-  "\x45\x5b", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x21", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x25", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x55\x22", "\x47\x21", "\x48\x5e", "\x4c\x51", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x25", "\x00\x00",
-  "\x00\x00", "\x55\x2b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x35\x38", "\x00\x00", "\x00\x00", "\x4d\x45", "\x00\x00",
-  "\x00\x00", "\x4c\x2f", "\x00\x00", "\x56\x2c", "\x00\x00", "\x55\x23",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x26",
-  "\x00\x00", "\x42\x45", "\x00\x00", "\x00\x00", "\x4b\x38", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x45\x4a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x55\x27", "\x4b\x65", "\x00\x00", "\x3a\x4a",
-  "\x00\x00", "\x00\x00", "\x3e\x2a", "\x55\x28", "\x00\x00", "\x00\x00",
-  "\x3b\x50", "\x00\x00", "\x3b\x4f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x30\x39", "\x38\x48", "\x00\x00", "\x40\x2b", "\x30\x51",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x2c", "\x55\x2d",
-  "\x00\x00", "\x55\x2a", "\x31\x38", "\x34\x2f", "\x00\x00", "\x55\x29",
-  "\x00\x00", "\x4c\x45", "\x49\x31", "\x30\x28", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x30\x79", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3b\x51", "\x00\x00", "\x30\x52", "\x00\x00", "\x30\x23", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x32", "\x55\x30",
-  "\x4c\x3c", "\x00\x00", "\x55\x33", "\x00\x00", "\x55\x31", "\x00\x00",
-  "\x00\x00", "\x55\x2f", "\x3f\x31", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x55\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x5a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x64",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x37",
-  "\x55\x38", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3e\x2b", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x34", "\x4f\x2c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x4c", "\x00\x00",
-  "\x00\x00", "\x55\x36", "\x3a\x27", "\x55\x39", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x49\x58", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x3a",
-  "\x00\x00", "\x55\x35", "\x4c\x3b", "\x47\x5e", "\x55\x3b", "\x49\x32",
-  "\x55\x3c", "\x55\x40", "\x55\x3d", "\x00\x00", "\x00\x00", "\x32\x47",
-  "\x55\x3f", "\x3c\x3b", "\x00\x00", "\x55\x3e", "\x37\x79", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x55\x4c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x55\x45", "\x55\x42", "\x43\x64", "\x00\x00",
-  "\x55\x41", "\x00\x00", "\x00\x00", "\x55\x43", "\x00\x00", "\x00\x00",
-  "\x55\x44", "\x55\x46", "\x55\x47", "\x34\x72", "\x00\x00", "\x55\x49",
-  "\x55\x48", "\x55\x4a", "\x3e\x6e", "\x55\x4d", "\x00\x00", "\x44\x5c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x45", "\x00\x00", "\x55\x4b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x4e", "\x55\x4f", "\x00\x00",
-  "\x55\x52", "\x00\x00", "\x00\x00", "\x55\x50", "\x00\x00", "\x55\x51",
-  "\x3b\x52", "\x55\x53", "\x00\x00", "\x00\x00", "\x39\x26", "\x55\x54",
-  "\x00\x00", "\x3b\x7a", "\x42\x38", "\x00\x00", "\x55\x55", "\x55\x56",
-  "\x3b\x5a", "\x39\x27", "\x00\x00", "\x4c\x52", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x35\x28", "\x38\x49", "\x55\x57", "\x33\x58", "\x00\x00",
-  "\x00\x00", "\x55\x58", "\x00\x00", "\x42\x39", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x55\x59", "\x56\x23", "\x00\x00", "\x55\x5a",
-  "\x00\x00", "\x55\x5b", "\x00\x00", "\x00\x00", "\x55\x5c", "\x00\x00",
-  "\x55\x5e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x55\x5f", "\x00\x00", "\x00\x00", "\x55\x60", "\x00\x00", "\x42\x70",
-  "\x00\x00", "\x31\x27", "\x3c\x69", "\x30\x42", "\x00\x00", "\x41\x57",
-  "\x34\x30", "\x3c\x35", "\x00\x00", "\x39\x28", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x66", "\x00\x00", "\x3d\x21",
-  "\x34\x31", "\x43\x68", "\x44\x6a", "\x30\x38", "\x35\x39", "\x4a\x75",
-  "\x00\x00", "\x3c\x42", "\x00\x00", "\x00\x00", "\x35\x52", "\x40\x6b",
-  "\x3c\x3c", "\x4d\x28", "\x55\x61", "\x35\x5c", "\x00\x00", "\x3a\x4b",
-  "\x00\x00", "\x00\x00", "\x33\x32", "\x31\x63", "\x3e\x2c", "\x32\x48",
-  "\x00\x00", "\x55\x62", "\x4d\x46", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3d\x49", "\x00\x00", "\x00\x00", "\x3c\x64",
-  "\x55\x63", "\x34\x73", "\x46\x52", "\x4c\x29", "\x55\x64", "\x00\x00",
-  "\x55\x65", "\x00\x00", "\x00\x00", "\x49\x59", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x55\x67", "\x00\x00", "\x34\x28", "\x36\x77", "\x55\x66",
-  "\x34\x32", "\x00\x00", "\x3f\x32", "\x55\x6b", "\x3b\x21", "\x00\x00",
-  "\x32\x49", "\x55\x6a", "\x00\x00", "\x55\x68", "\x55\x6c", "\x55\x69",
-  "\x47\x2b", "\x5c\x4d", "\x3f\x33", "\x00\x00", "\x55\x6d", "\x00\x00",
-  "\x00\x00", "\x4e\x40", "\x00\x00", "\x55\x6e", "\x00\x00", "\x00\x00",
-  "\x55\x70", "\x00\x00", "\x43\x7e", "\x55\x6f", "\x00\x00", "\x40\x23",
-  "\x00\x00", "\x3b\x7b", "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x50",
-  "\x3c\x77", "\x00\x00", "\x49\x75", "\x40\x6c", "\x00\x00", "\x3c\x4d",
-  "\x55\x71", "\x3e\x2d", "\x55\x72", "\x55\x73", "\x30\x53", "\x42\x3a",
-  "\x3f\x52", "\x00\x00", "\x55\x74", "\x46\x33", "\x3e\x2e", "\x00\x00",
-  "\x3e\x2f", "\x00\x00", "\x55\x75", "\x00\x00", "\x00\x00", "\x40\x6d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x30", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x76", "\x00\x00", "\x55\x77",
-  "\x00\x00", "\x4c\x60", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x78",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x46", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3d\x22", "\x55\x79", "\x55\x7a", "\x3c\x5c",
-  "\x3f\x2c", "\x46\x74", "\x3f\x54", "\x48\x78", "\x47\x22", "\x36\x49",
-  "\x55\x7b", "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x6f", "\x55\x7c",
-  "\x00\x00", "\x36\x7e", "\x00\x00", "\x46\x4f", "\x32\x30", "\x00\x00",
-  "\x3b\x53", "\x55\x7d", "\x56\x22", "\x56\x21", "\x36\x7d", "\x00\x00",
-  "\x55\x7e", "\x00\x00", "\x45\x38", "\x42\x30", "\x00\x00", "\x45\x4b",
-  "\x3c\x48", "\x00\x00", "\x00\x00", "\x41\x58", "\x4d\x7a", "\x56\x24",
-  "\x00\x00", "\x56\x25", "\x46\x56", "\x00\x00", "\x3b\x33", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x27", "\x00\x00", "\x00\x00",
-  "\x56\x28", "\x56\x29", "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x74",
-  "\x56\x2a", "\x00\x00", "\x00\x00", "\x56\x2b", "\x32\x2c", "\x41\x3b",
-  "\x34\x64", "\x00\x00", "\x56\x2d", "\x4c\x28", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x42\x52", "\x00\x00", "\x33\x59", "\x00\x00",
-  "\x00\x00", "\x56\x2f", "\x56\x31", "\x34\x5f", "\x00\x00", "\x00\x00",
-  "\x56\x2e", "\x56\x30", "\x00\x00", "\x56\x33", "\x56\x32", "\x00\x00",
-  "\x56\x34", "\x56\x35", "\x46\x3d", "\x36\x2e", "\x32\x65", "\x56\x36",
-  "\x56\x3b", "\x00\x00", "\x00\x00", "\x56\x39", "\x00\x00", "\x4a\x77",
-  "\x4a\x76", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x45\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x38", "\x3d\x54",
-  "\x00\x00", "\x56\x37", "\x3f\x72", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x56\x3c", "\x00\x00", "\x00\x00", "\x3a\x6a", "\x00\x00", "\x00\x00",
-  "\x56\x42", "\x00\x00", "\x00\x00", "\x56\x43", "\x56\x3d", "\x33\x33",
-  "\x56\x3e", "\x56\x47", "\x56\x46", "\x56\x45", "\x56\x41", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x56\x40", "\x00\x00", "\x00\x00", "\x56\x44",
-  "\x4a\x78", "\x56\x4b", "\x56\x48", "\x00\x00", "\x56\x4a", "\x00\x00",
-  "\x4d\x72", "\x00\x00", "\x56\x49", "\x56\x3f", "\x3f\x73", "\x00\x00",
-  "\x00\x00", "\x56\x4c", "\x00\x00", "\x00\x00", "\x3a\x37", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x56\x4d", "\x00\x00", "\x00\x00", "\x56\x4e",
-  "\x56\x51", "\x00\x00", "\x56\x50", "\x00\x00", "\x00\x00", "\x56\x4f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x68", "\x56\x3a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x56\x57", "\x56\x53", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x56\x52", "\x56\x54", "\x00\x00", "\x56\x55",
-  "\x56\x58", "\x00\x00", "\x00\x00", "\x4e\x66", "\x00\x00", "\x56\x59",
-  "\x56\x56", "\x56\x5a", "\x00\x00", "\x00\x00", "\x34\x60", "\x56\x5b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x5d", "\x56\x5c",
-  "\x00\x00", "\x00\x00", "\x56\x5e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x56\x5f", "\x00\x00", "\x40\x6e", "\x3d\x23", "\x00\x00",
-  "\x00\x00", "\x3d\x64", "\x00\x00", "\x41\x63", "\x00\x00", "\x39\x29",
-  "\x3a\x38", "\x39\x2a", "\x35\x70", "\x00\x00", "\x00\x00", "\x56\x60",
-  "\x00\x00", "\x00\x00", "\x3a\x39", "\x00\x00", "\x00\x00", "\x38\x4a",
-  "\x56\x61", "\x4c\x26", "\x47\x43", "\x56\x62", "\x00\x00", "\x39\x2b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x2c", "\x00\x00", "\x43\x27",
-  "\x36\x52", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x54", "\x49\x5b",
-  "\x00\x00", "\x00\x00", "\x48\x41", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x56\x63", "\x34\x75", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x56\x66", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x44\x21", "\x00\x00", "\x00\x00", "\x56\x65", "\x56\x64", "\x56\x67",
-  "\x00\x00", "\x44\x6b", "\x3f\x63", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3b\x55", "\x00\x00", "\x40\x4a", "\x00\x00",
-  "\x42\x53", "\x35\x22", "\x00\x00", "\x00\x00", "\x44\x22", "\x00\x00",
-  "\x00\x00", "\x56\x68", "\x56\x69", "\x3e\x6f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4b\x39", "\x00\x00", "\x00\x00", "\x56\x6c",
-  "\x00\x00", "\x00\x00", "\x56\x6b", "\x56\x6a", "\x49\x7d", "\x00\x00",
-  "\x56\x73", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x5a",
-  "\x00\x00", "\x56\x6d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x56\x6f", "\x4b\x6b", "\x00\x00", "\x56\x6e", "\x56\x70",
-  "\x00\x00", "\x48\x28", "\x56\x71", "\x4a\x3e", "\x56\x72", "\x34\x33",
-  "\x4a\x3f", "\x47\x2f", "\x56\x74", "\x56\x75", "\x00\x00", "\x39\x2c",
-  "\x34\x34", "\x56\x76", "\x38\x38", "\x4d\x44", "\x4d\x29", "\x34\x76",
-  "\x56\x78", "\x00\x00", "\x44\x23", "\x00\x00", "\x39\x2d", "\x3e\x31",
-  "\x00\x00", "\x00\x00", "\x48\x5f", "\x00\x00", "\x00\x00", "\x3e\x32",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x78", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x6c", "\x4a\x79",
-  "\x45\x39", "\x00\x00", "\x00\x00", "\x39\x2e", "\x00\x00", "\x49\x5c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x79", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x59", "\x3a\x42", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x38\x4b", "\x00\x00", "\x44\x6d", "\x30\x43",
-  "\x3d\x6e", "\x39\x2f", "\x4d\x47", "\x56\x7a", "\x56\x7b", "\x47\x51",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x7c", "\x4e\x77",
-  "\x4f\x2d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x7e",
-  "\x56\x7d", "\x00\x00", "\x00\x00", "\x33\x47", "\x00\x00", "\x00\x00",
-  "\x57\x21", "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x24", "\x57\x25",
-  "\x00\x00", "\x57\x23", "\x00\x00", "\x49\x40", "\x3e\x33", "\x57\x27",
-  "\x57\x26", "\x57\x22", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x57\x28", "\x57\x29", "\x00\x00", "\x00\x00", "\x57\x2a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x57\x2d", "\x57\x2b", "\x00\x00", "\x57\x2c",
-  "\x57\x2e", "\x00\x00", "\x31\x64", "\x44\x6e", "\x57\x2f", "\x00\x00",
-  "\x37\x7a", "\x32\x76", "\x47\x36", "\x00\x00", "\x57\x30", "\x46\x7b",
-  "\x00\x00", "\x4a\x5b", "\x00\x00", "\x57\x31", "\x4f\x2e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x32", "\x4a\x40", "\x57\x35",
-  "\x50\x21", "\x50\x31", "\x00\x00", "\x3c\x30", "\x46\x75", "\x57\x36",
-  "\x00\x00", "\x35\x5d", "\x44\x24", "\x30\x7a", "\x57\x37", "\x4a\x26",
-  "\x39\x30", "\x00\x00", "\x00\x00", "\x43\x50", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x44\x6f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4c\x6f", "\x38\x39", "\x38\x4c", "\x00\x00", "\x57\x38",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x39", "\x00\x00", "\x57\x3f",
-  "\x00\x00", "\x3c\x65", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x25",
-  "\x00\x00", "\x36\x2f", "\x57\x3a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x49\x2b", "\x00\x00", "\x43\x46", "\x00\x00", "\x00\x00", "\x57\x3b",
-  "\x57\x3c", "\x00\x00", "\x36\x30", "\x00\x00", "\x57\x3d", "\x00\x00",
-  "\x57\x3e", "\x00\x00", "\x00\x00", "\x57\x40", "\x00\x00", "\x45\x76",
-  "\x00\x00", "\x00\x00", "\x57\x41", "\x57\x42", "\x00\x00", "\x57\x43",
-  "\x00\x00", "\x00\x00", "\x57\x34", "\x57\x33", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x57\x44", "\x37\x41", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x49\x27", "\x00\x00", "\x00\x00", "\x3a\x4c", "\x49\x37", "\x44\x26",
-  "\x49\x4b", "\x57\x45", "\x00\x00", "\x00\x00", "\x3e\x34", "\x31\x46",
-  "\x00\x00", "\x57\x46", "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x47",
-  "\x00\x00", "\x4c\x72", "\x00\x00", "\x00\x00", "\x48\x60", "\x00\x00",
-  "\x00\x00", "\x57\x4a", "\x31\x7d", "\x40\x2c", "\x57\x49", "\x57\x48",
-  "\x37\x42", "\x42\x54", "\x00\x00", "\x57\x4e", "\x57\x4c", "\x00\x00",
-  "\x57\x4b", "\x4e\x27", "\x38\x65", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3d\x79", "\x57\x4d", "\x45\x4c", "\x3d\x3e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x46\x40", "\x57\x51", "\x57\x50", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x57\x4f", "\x00\x00", "\x57\x52", "\x38\x66",
-  "\x57\x53", "\x49\x7c", "\x3d\x5b", "\x00\x00", "\x00\x00", "\x57\x54",
-  "\x48\x79", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x41",
-  "\x44\x27", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x30",
-  "\x00\x00", "\x00\x00", "\x57\x55", "\x35\x2b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x34", "\x00\x00", "\x49\x2c",
-  "\x34\x77", "\x47\x26", "\x57\x56", "\x3b\x56", "\x4b\x3a", "\x4b\x3b",
-  "\x00\x00", "\x00\x00", "\x31\x7e", "\x57\x5b", "\x00\x00", "\x00\x00",
-  "\x43\x69", "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x58", "\x32\x77",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x2d", "\x57\x5a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x30", "\x00\x00", "\x00\x00",
-  "\x57\x59", "\x00\x00", "\x00\x00", "\x57\x57", "\x00\x00", "\x39\x7a",
-  "\x00\x00", "\x57\x5d", "\x57\x63", "\x57\x69", "\x57\x61", "\x00\x00",
-  "\x45\x5c", "\x00\x00", "\x00\x00", "\x57\x66", "\x49\x5d", "\x00\x00",
-  "\x00\x00", "\x57\x60", "\x00\x00", "\x57\x65", "\x4e\x67", "\x3b\x57",
-  "\x00\x00", "\x00\x00", "\x42\x55", "\x57\x5e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x35\x5e", "\x57\x68", "\x40\x2d", "\x31\x65", "\x57\x62",
-  "\x32\x78", "\x57\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x31",
-  "\x00\x00", "\x57\x64", "\x57\x6a", "\x57\x6c", "\x57\x76", "\x57\x74",
-  "\x00\x00", "\x00\x00", "\x57\x71", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x57\x70", "\x4e\x78", "\x00\x00", "\x57\x72", "\x00\x00", "\x00\x00",
-  "\x36\x32", "\x00\x00", "\x39\x31", "\x00\x00", "\x00\x00", "\x3d\x7a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x79", "\x57\x6b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x6f", "\x57\x5f", "\x00\x00",
-  "\x32\x7a", "\x57\x73", "\x57\x75", "\x43\x51", "\x00\x00", "\x00\x00",
-  "\x3a\x28", "\x32\x38", "\x57\x6d", "\x57\x78", "\x57\x77", "\x36\x33",
-  "\x00\x00", "\x42\x29", "\x33\x66", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x37\x43", "\x00\x00", "\x57\x6e", "\x57\x7a", "\x00\x00",
-  "\x57\x7d", "\x58\x21", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3c\x3d", "\x00\x00", "\x58\x27", "\x44\x70", "\x57\x7b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x25", "\x00\x00", "\x32\x79",
-  "\x00\x00", "\x58\x23", "\x58\x24", "\x00\x00", "\x00\x00", "\x57\x7e",
-  "\x58\x22", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x67", "\x4d\x2a",
-  "\x00\x00", "\x00\x00", "\x34\x35", "\x00\x00", "\x00\x00", "\x31\x59",
-  "\x58\x26", "\x00\x00", "\x47\x3a", "\x30\x2d", "\x48\x61", "\x57\x5c",
-  "\x58\x2c", "\x58\x30", "\x4c\x65", "\x00\x00", "\x58\x29", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x45\x69", "\x58\x2e", "\x3e\x70", "\x58\x2f",
-  "\x46\x57", "\x4f\x47", "\x00\x00", "\x58\x2b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x58\x31", "\x00\x00", "\x39\x7b", "\x00\x00",
-  "\x40\x4b", "\x00\x00", "\x00\x00", "\x30\x54", "\x58\x2a", "\x58\x28",
-  "\x00\x00", "\x41\x5a", "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x7c",
-  "\x3b\x34", "\x42\x46", "\x58\x3d", "\x00\x00", "\x41\x5b", "\x58\x38",
-  "\x00\x00", "\x58\x35", "\x58\x36", "\x00\x00", "\x3c\x66", "\x58\x39",
-  "\x58\x3c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x37",
-  "\x3d\x25", "\x00\x00", "\x58\x3a", "\x00\x00", "\x00\x00", "\x58\x34",
-  "\x00\x00", "\x4c\x7c", "\x4c\x7b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x58\x3e", "\x58\x3f", "\x30\x55", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x58\x33", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x36\x72", "\x30\x26", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x34\x36", "\x00\x00", "\x58\x3b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x58\x43", "\x58\x42", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x58\x47", "\x58\x48", "\x58\x46", "\x58\x49", "\x58\x41",
-  "\x58\x45", "\x00\x00", "\x00\x00", "\x58\x4a", "\x00\x00", "\x58\x4b",
-  "\x00\x00", "\x00\x00", "\x58\x40", "\x3b\x7c", "\x00\x00", "\x58\x44",
-  "\x42\x56", "\x39\x32", "\x58\x32", "\x3f\x35", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x58\x58", "\x00\x00", "\x4a\x69", "\x00\x00",
-  "\x00\x00", "\x58\x4e", "\x58\x4f", "\x58\x50", "\x00\x00", "\x00\x00",
-  "\x58\x57", "\x00\x00", "\x58\x56", "\x00\x00", "\x00\x00", "\x4b\x7d",
-  "\x34\x37", "\x00\x00", "\x58\x54", "\x00\x00", "\x37\x45", "\x33\x34",
-  "\x00\x00", "\x00\x00", "\x58\x51", "\x00\x00", "\x00\x00", "\x4e\x38",
-  "\x58\x53", "\x30\x56", "\x58\x55", "\x00\x00", "\x58\x4c", "\x58\x52",
-  "\x58\x59", "\x37\x44", "\x58\x4d", "\x4d\x5d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4d\x2b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x58\x5c", "\x00\x00", "\x00\x00", "\x58\x60", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x41\x7e", "\x00\x00", "\x4e\x79", "\x58\x61", "\x00\x00",
-  "\x00\x00", "\x58\x5e", "\x00\x00", "\x58\x5b", "\x00\x00", "\x00\x00",
-  "\x58\x5a", "\x58\x5f", "\x4a\x30", "\x00\x00", "\x00\x00", "\x46\x34",
-  "\x00\x00", "\x37\x46", "\x00\x00", "\x58\x62", "\x58\x5d", "\x00\x00",
-  "\x58\x63", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x7b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x32\x31", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x58\x6b", "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x38", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x69", "\x00\x00", "\x00\x00",
-  "\x58\x6a", "\x3a\x29", "\x58\x68", "\x58\x66", "\x58\x65", "\x58\x6c",
-  "\x58\x64", "\x58\x6e", "\x00\x00", "\x00\x00", "\x32\x7b", "\x58\x70",
-  "\x00\x00", "\x00\x00", "\x58\x6f", "\x44\x28", "\x00\x00", "\x58\x73",
-  "\x00\x00", "\x58\x71", "\x58\x67", "\x37\x7c", "\x00\x00", "\x58\x72",
-  "\x00\x00", "\x58\x76", "\x58\x75", "\x58\x77", "\x58\x74", "\x58\x78",
-  "\x58\x79", "\x58\x7a", "\x4a\x6a", "\x00\x00", "\x58\x7c", "\x58\x7b",
-  "\x3d\x3f", "\x00\x00", "\x40\x2e", "\x32\x66", "\x32\x7c", "\x00\x00",
-  "\x58\x7d", "\x00\x00", "\x30\x3f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x40\x4c", "\x58\x7e", "\x00\x00", "\x6c\x43", "\x59\x21", "\x37\x61",
-  "\x00\x00", "\x59\x22", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x40\x6f", "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x23", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x59\x24", "\x35\x3a", "\x59\x25", "\x00\x00",
-  "\x59\x26", "\x59\x27", "\x42\x57", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x38\x4d", "\x00\x00", "\x00\x00", "\x4c\x61", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4b\x3c", "\x3d\x6a", "\x59\x28", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x70", "\x6e\x3d", "\x48\x62",
-  "\x00\x00", "\x3c\x6a", "\x00\x00", "\x3a\x4d", "\x59\x29", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x47", "\x00\x00", "\x4a\x27",
-  "\x00\x00", "\x00\x00", "\x42\x71", "\x00\x00", "\x00\x00", "\x59\x2c",
-  "\x00\x00", "\x00\x00", "\x59\x2a", "\x00\x00", "\x59\x2d", "\x00\x00",
-  "\x00\x00", "\x59\x2b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x59\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4a\x31", "\x00\x00", "\x00\x00", "\x30\x37", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x49\x5e", "\x00\x00", "\x00\x00", "\x48\x63",
-  "\x00\x00", "\x00\x00", "\x59\x2f", "\x00\x00", "\x59\x32", "\x3e\x35",
-  "\x35\x3b", "\x00\x00", "\x59\x30", "\x59\x37", "\x3e\x36", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x31", "\x47\x44", "\x4d\x5e",
-  "\x59\x33", "\x59\x34", "\x59\x38", "\x45\x6a", "\x59\x35", "\x39\x33",
-  "\x40\x5e", "\x00\x00", "\x00\x00", "\x59\x46", "\x48\x34", "\x00\x00",
-  "\x42\x72", "\x48\x64", "\x5a\x2d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4a\x7a", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x71",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x75", "\x00\x00", "\x59\x3b",
-  "\x32\x21", "\x43\x6a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x59\x44", "\x00\x00", "\x00\x00", "\x43\x34", "\x59\x3e", "\x59\x45",
-  "\x59\x40", "\x59\x47", "\x59\x43", "\x00\x00", "\x59\x42", "\x47\x6f",
-  "\x00\x00", "\x59\x3c", "\x32\x7d", "\x59\x3a", "\x35\x71", "\x42\x73",
-  "\x59\x36", "\x00\x00", "\x00\x00", "\x59\x39", "\x39\x34", "\x40\x5b",
-  "\x00\x00", "\x3e\x37", "\x59\x41", "\x47\x52", "\x00\x00", "\x00\x00",
-  "\x35\x72", "\x33\x48", "\x33\x67", "\x3f\x21", "\x59\x49", "\x59\x4e",
-  "\x00\x00", "\x59\x4a", "\x00\x00", "\x37\x7d", "\x00\x00", "\x59\x4f",
-  "\x3b\x22", "\x39\x69", "\x3d\x26", "\x59\x3d", "\x00\x00", "\x3b\x7d",
-  "\x59\x4c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x58",
-  "\x59\x4d", "\x30\x44", "\x00\x00", "\x00\x00", "\x59\x48", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x29", "\x35\x73", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x34", "\x59\x4b",
-  "\x30\x27", "\x00\x00", "\x00\x00", "\x3a\x43", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3f\x36", "\x44\x72", "\x00\x00", "\x00\x00", "\x48\x54",
-  "\x59\x51", "\x41\x5e", "\x42\x2a", "\x00\x00", "\x00\x00", "\x3b\x2b",
-  "\x59\x52", "\x00\x00", "\x59\x54", "\x59\x50", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4a\x61", "\x00\x00", "\x44\x3d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x5c", "\x4a\x7b", "\x3c\x4e",
-  "\x59\x60", "\x00\x00", "\x59\x5f", "\x00\x00", "\x00\x00", "\x3f\x78",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x7e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x59\x59", "\x3e\x39", "\x00\x00", "\x00\x00", "\x46\x68",
-  "\x47\x31", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x57",
-  "\x00\x00", "\x00\x00", "\x41\x5d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3c\x78", "\x59\x5c", "\x00\x00", "\x00\x00", "\x3e\x38",
-  "\x00\x00", "\x59\x56", "\x59\x5b", "\x00\x00", "\x00\x00", "\x47\x53",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x55", "\x00\x00", "\x37\x21",
-  "\x00\x00", "\x00\x00", "\x33\x5d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x59\x5d", "\x4e\x2b", "\x3a\x4e", "\x43\x35", "\x59\x5a", "\x00\x00",
-  "\x40\x5c", "\x00\x00", "\x39\x35", "\x3f\x64", "\x31\x66", "\x41\x3c",
-  "\x59\x58", "\x35\x45", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x37\x47", "\x00\x00", "\x44\x4f", "\x59\x5e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x5f", "\x00\x00",
-  "\x00\x00", "\x59\x61", "\x00\x00", "\x59\x63", "\x00\x00", "\x00\x00",
-  "\x42\x37", "\x59\x69", "\x00\x00", "\x59\x64", "\x00\x00", "\x00\x00",
-  "\x59\x66", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x49\x41", "\x44\x73", "\x00\x00", "\x59\x67", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4d\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x48",
-  "\x34\x39", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x30\x2e", "\x00\x00", "\x59\x65", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x59\x62", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x34\x78", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x31\x67", "\x00\x00", "\x59\x68", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4d\x49", "\x59\x6c", "\x42\x3b", "\x00\x00", "\x59\x73",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x6d", "\x00\x00", "\x00\x00",
-  "\x59\x6a", "\x59\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x59\x53", "\x59\x6e", "\x00\x00", "\x59\x72", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x48\x42", "\x45\x6b", "\x59\x6b", "\x00\x00", "\x59\x6f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x48", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3a\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x5d",
-  "\x59\x77", "\x45\x26", "\x59\x74", "\x00\x00", "\x4b\x60", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x75", "\x59\x76",
-  "\x00\x00", "\x4c\x4e", "\x00\x00", "\x40\x22", "\x37\x62", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x7d", "\x3b\x35", "\x59\x7a",
-  "\x00\x00", "\x59\x79", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x47\x32", "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x35", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x31", "\x59\x7b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x7c", "\x00\x00", "\x49\x6f",
-  "\x00\x00", "\x47\x45", "\x3b\x23", "\x00\x00", "\x40\x71", "\x00\x00",
-  "\x4b\x50", "\x33\x49", "\x00\x00", "\x5a\x25", "\x59\x7e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x4a", "\x5a\x27", "\x00\x00",
-  "\x00\x00", "\x5a\x23", "\x00\x00", "\x5a\x24", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x60", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5a\x22", "\x00\x00", "\x59\x3f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5a\x26", "\x00\x00", "\x5a\x21", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x2b", "\x5a\x2c",
-  "\x45\x27", "\x5a\x2e", "\x00\x00", "\x00\x00", "\x3b\x24", "\x5a\x29",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x3c", "\x00\x00",
-  "\x00\x00", "\x5a\x2f", "\x00\x00", "\x5a\x28", "\x5a\x33", "\x00\x00",
-  "\x5a\x32", "\x00\x00", "\x5a\x31", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5a\x34", "\x00\x00", "\x00\x00", "\x5a\x36", "\x3e\x71", "\x00\x00",
-  "\x5a\x35", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x39",
-  "\x5a\x37", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x38", "\x59\x70",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x3b",
-  "\x5a\x3a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x59\x78", "\x5a\x3c", "\x5a\x30", "\x00\x00", "\x00\x00", "\x3b\x59",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x3d", "\x5a\x3e",
-  "\x5a\x40", "\x5a\x3f", "\x5a\x41", "\x32\x7e", "\x00\x00", "\x39\x36",
-  "\x00\x00", "\x00\x00", "\x4a\x7c", "\x40\x2f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x4e", "\x00\x00", "\x00\x00",
-  "\x5a\x43", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x46",
-  "\x00\x00", "\x49\x52", "\x00\x00", "\x35\x5f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5a\x45", "\x5a\x44", "\x47\x54", "\x5a\x47", "\x36\x35",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x49", "\x5a\x48", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x34\x3a", "\x3b\x36", "\x00\x00", "\x00\x00",
-  "\x46\x58", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x37\x49", "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x74", "\x00\x00",
-  "\x5a\x4a", "\x00\x00", "\x40\x30", "\x45\x28", "\x00\x00", "\x49\x5f",
-  "\x5a\x4b", "\x5a\x4c", "\x5a\x4d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4a\x38", "\x55\x5d", "\x40\x46", "\x00\x00", "\x00\x00", "\x49\x4c",
-  "\x00\x00", "\x3a\x58", "\x00\x00", "\x48\x65", "\x48\x43", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x4d", "\x00\x00",
-  "\x4e\x41", "\x00\x00", "\x5a\x4f", "\x3c\x50", "\x00\x00", "\x00\x00",
-  "\x5a\x50", "\x00\x00", "\x30\x36", "\x00\x00", "\x00\x00", "\x36\x54",
-  "\x40\x4d", "\x00\x00", "\x49\x60", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5a\x51", "\x3b\x42", "\x43\x47", "\x00\x00", "\x3b\x5b", "\x3f\x37",
-  "\x5a\x52", "\x00\x00", "\x4a\x7d", "\x00\x00", "\x00\x00", "\x31\x77",
-  "\x3b\x5c", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x55", "\x00\x00",
-  "\x5a\x53", "\x5a\x56", "\x4e\x39", "\x5a\x54", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x40\x7b", "\x5a\x57", "\x00\x00", "\x00\x00",
-  "\x42\x32", "\x00\x00", "\x00\x00", "\x5a\x58", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x34\x7a", "\x00\x00", "\x5a\x5a", "\x00\x00",
-  "\x5a\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x5b",
-  "\x5a\x5c", "\x34\x7b", "\x00\x00", "\x00\x00", "\x46\x7c", "\x43\x36",
-  "\x35\x6c", "\x3b\x5d", "\x41\x61", "\x00\x00", "\x00\x00", "\x3d\x5c",
-  "\x30\x30", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x5d", "\x32\x22",
-  "\x5a\x61", "\x39\x37", "\x5a\x60", "\x00\x00", "\x00\x00", "\x3a\x2b",
-  "\x3e\x3a", "\x00\x00", "\x00\x00", "\x5a\x5f", "\x00\x00", "\x3e\x3b",
-  "\x00\x00", "\x4c\x40", "\x3a\x2a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x30\x57", "\x40\x4e", "\x5a\x66", "\x00\x00", "\x00\x00", "\x40\x31",
-  "\x31\x47", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x55",
-  "\x00\x00", "\x4b\x66", "\x3a\x72", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3e\x3c", "\x00\x00", "\x40\x27", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5a\x65", "\x5a\x63", "\x5a\x64", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x6b", "\x00\x00",
-  "\x00\x00", "\x5b\x26", "\x00\x00", "\x5a\x6a", "\x3b\x7e", "\x39\x38",
-  "\x5a\x68", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x69",
-  "\x00\x00", "\x3f\x38", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x67",
-  "\x00\x00", "\x00\x00", "\x3b\x2f", "\x5a\x6c", "\x5a\x6b", "\x5a\x70",
-  "\x00\x00", "\x00\x00", "\x5a\x71", "\x00\x00", "\x5a\x6d", "\x00\x00",
-  "\x33\x22", "\x5a\x6e", "\x5a\x6f", "\x48\x55", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x49\x61", "\x37\x4a", "\x5a\x72", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x40\x32", "\x00\x00", "\x3e\x3d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x43\x52", "\x36\x47", "\x00\x00", "\x5a\x73",
-  "\x5a\x77", "\x00\x00", "\x00\x00", "\x32\x4b", "\x5a\x74", "\x5a\x76",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x75", "\x00\x00",
-  "\x00\x00", "\x3d\x6b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x43\x48", "\x30\x45", "\x5a\x78", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5a\x79", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x44\x2a", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x71", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x43", "\x00\x00", "\x00\x00",
-  "\x4a\x6b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4b\x3d", "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x22", "\x5a\x7b",
-  "\x00\x00", "\x00\x00", "\x5a\x7e", "\x00\x00", "\x5a\x7d", "\x00\x00",
-  "\x00\x00", "\x5a\x7a", "\x00\x00", "\x00\x00", "\x5b\x21", "\x00\x00",
-  "\x00\x00", "\x46\x5e", "\x00\x00", "\x5a\x7c", "\x5b\x23", "\x00\x00",
-  "\x00\x00", "\x3d\x6c", "\x5b\x24", "\x00\x00", "\x4d\x4b", "\x47\x78",
-  "\x00\x00", "\x00\x00", "\x5b\x25", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5b\x27", "\x00\x00", "\x00\x00", "\x5b\x28",
-  "\x5b\x29", "\x00\x00", "\x36\x4a", "\x31\x48", "\x39\x39", "\x5b\x2a",
-  "\x00\x00", "\x5b\x2b", "\x3d\x71", "\x41\x62", "\x00\x00", "\x00\x00",
-  "\x52\x58", "\x41\x3e", "\x41\x3d", "\x42\x58", "\x3a\x47", "\x00\x00",
-  "\x00\x00", "\x50\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x37\x6e", "\x4d\x2d", "\x00\x00", "\x4a\x7e", "\x00\x00", "\x49\x7e",
-  "\x00\x00", "\x5b\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3a\x73", "\x44\x3f", "\x5b\x2d", "\x4f\x2f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4b\x3e", "\x00\x00", "\x44\x2b", "\x5b\x2e", "\x34\x7c",
-  "\x5b\x2f", "\x5b\x30", "\x4c\x5a", "\x00\x00", "\x4c\x24", "\x4b\x76",
-  "\x4b\x5c", "\x3b\x25", "\x5b\x32", "\x00\x00", "\x00\x00", "\x3c\x6b",
-  "\x00\x00", "\x00\x00", "\x4b\x51", "\x00\x00", "\x5b\x34", "\x5b\x37",
-  "\x5b\x36", "\x00\x00", "\x34\x79", "\x00\x00", "\x00\x00", "\x35\x60",
-  "\x00\x00", "\x5b\x33", "\x00\x00", "\x5b\x35", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5b\x38", "\x00\x00", "\x00\x00", "\x3f\x79",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x7b", "\x30\x49",
-  "\x3a\x60", "\x42\x3c", "\x00\x00", "\x3c\x5d", "\x00\x00", "\x00\x00",
-  "\x3e\x73", "\x00\x00", "\x00\x00", "\x5b\x3b", "\x00\x00", "\x00\x00",
-  "\x45\x4e", "\x00\x00", "\x5b\x39", "\x42\x2b", "\x5b\x3a", "\x3e\x72",
-  "\x4c\x5d", "\x5b\x3c", "\x5b\x3d", "\x4d\x68", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5b\x42", "\x00\x00", "\x00\x00", "\x39\x3a",
-  "\x00\x00", "\x47\x55", "\x5b\x3f", "\x45\x6c", "\x5a\x5e", "\x5a\x62",
-  "\x00\x00", "\x35\x4f", "\x00\x00", "\x47\x47", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5b\x41", "\x00\x00", "\x3e\x3e", "\x48\x44",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x47",
-  "\x00\x00", "\x48\x7a", "\x00\x00", "\x5b\x3e", "\x00\x00", "\x5b\x44",
-  "\x5b\x43", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x4f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x6d", "\x00\x00", "\x4e\x53",
-  "\x00\x00", "\x00\x00", "\x4b\x67", "\x00\x00", "\x32\x4c", "\x3b\x5e",
-  "\x00\x00", "\x00\x00", "\x4f\x48", "\x5b\x46", "\x3f\x75", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5b\x45", "\x00\x00", "\x00\x00", "\x5b\x40",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x4f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x4c", "\x5b\x4a", "\x00\x00",
-  "\x32\x4d", "\x5b\x48", "\x5b\x4e", "\x5b\x54", "\x42\x48", "\x00\x00",
-  "\x00\x00", "\x4a\x41", "\x00\x00", "\x5b\x56", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x49\x22", "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x55",
-  "\x47\x70", "\x4b\x3f", "\x34\x3b", "\x00\x00", "\x40\x77", "\x3d\x40",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x53", "\x00\x00", "\x4d\x2e",
-  "\x00\x00", "\x00\x00", "\x5b\x51", "\x5b\x50", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5b\x52", "\x00\x00", "\x5b\x4f", "\x00\x00", "\x00\x00",
-  "\x5b\x57", "\x00\x00", "\x5b\x4d", "\x00\x00", "\x00\x00", "\x5b\x4b",
-  "\x00\x00", "\x5b\x53", "\x5b\x49", "\x00\x00", "\x43\x6c", "\x00\x00",
-  "\x4c\x78", "\x3c\x46", "\x3a\x74", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3a\x3a", "\x00\x00", "\x00\x00", "\x4b\x6f",
-  "\x33\x41", "\x00\x00", "\x00\x00", "\x44\x4e", "\x46\x4a", "\x31\x49",
-  "\x40\x72", "\x00\x00", "\x00\x00", "\x40\x34", "\x37\x2a", "\x5b\x59",
-  "\x00\x00", "\x00\x00", "\x39\x3b", "\x33\x7c", "\x5b\x5b", "\x33\x74",
-  "\x5b\x61", "\x5b\x5e", "\x00\x00", "\x40\x73", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x33\x4b", "\x3a\x2c", "\x00\x00", "\x00\x00", "\x33\x4a",
-  "\x3a\x4f", "\x00\x00", "\x00\x00", "\x5b\x5c", "\x37\x65", "\x37\x4b",
-  "\x45\x6d", "\x00\x00", "\x00\x00", "\x5b\x5a", "\x00\x00", "\x30\x46",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x5d", "\x5b\x5f",
-  "\x00\x00", "\x36\x4d", "\x37\x2c", "\x00\x00", "\x34\x3c", "\x35\x4b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x62", "\x00\x00",
-  "\x00\x00", "\x3a\x79", "\x4b\x71", "\x00\x00", "\x3b\x37", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5b\x63", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x49\x30", "\x5b\x6f", "\x00\x00", "\x32\x33", "\x5b\x64", "\x5b\x75",
-  "\x5b\x65", "\x00\x00", "\x4e\x42", "\x00\x00", "\x5b\x6c", "\x00\x00",
-  "\x47\x5f", "\x5b\x74", "\x00\x00", "\x5b\x67", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x30\x34", "\x5b\x69", "\x00\x00", "\x00\x00", "\x39\x3c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x6b", "\x00\x00", "\x5b\x6a",
-  "\x00\x00", "\x5b\x66", "\x5b\x71", "\x00\x00", "\x3e\x3f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x54\x6d", "\x38\x68", "\x4d\x7c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x68", "\x00\x00", "\x44\x74",
-  "\x33\x23", "\x3a\x2d", "\x00\x00", "\x5b\x60", "\x00\x00", "\x5b\x70",
-  "\x33\x61", "\x00\x00", "\x00\x00", "\x5b\x6e", "\x5b\x72", "\x00\x00",
-  "\x45\x6e", "\x34\x7e", "\x00\x00", "\x5c\x32", "\x00\x00", "\x00\x00",
-  "\x4c\x49", "\x5b\x77", "\x34\x7d", "\x00\x00", "\x5b\x7e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x40", "\x00\x00", "\x5c\x21",
-  "\x5c\x23", "\x00\x00", "\x5c\x27", "\x5b\x79", "\x00\x00", "\x43\x2a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x6f", "\x5c\x2b",
-  "\x5b\x7c", "\x00\x00", "\x5c\x28", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5c\x22", "\x3f\x39", "\x5c\x2c", "\x00\x00", "\x00\x00", "\x40\x33",
-  "\x5c\x2a", "\x34\x3d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4f\x50", "\x5b\x76", "\x00\x00", "\x00\x00", "\x5c\x26",
-  "\x30\x58", "\x00\x00", "\x00\x00", "\x5b\x78", "\x00\x00", "\x00\x00",
-  "\x4c\x3a", "\x5b\x7d", "\x3f\x22", "\x44\x47", "\x5b\x73", "\x00\x00",
-  "\x00\x00", "\x5c\x25", "\x3f\x7a", "\x5c\x2f", "\x33\x71", "\x38\x21",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x31", "\x5b\x7a",
-  "\x5c\x30", "\x00\x00", "\x5c\x29", "\x5b\x7b", "\x00\x00", "\x5c\x2d",
-  "\x00\x00", "\x5c\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5c\x3f", "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x4e",
-  "\x00\x00", "\x5c\x24", "\x00\x00", "\x00\x00", "\x5c\x3b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5c\x3d", "\x00\x00", "\x44\x58", "\x4d\x4c",
-  "\x49\x76", "\x5c\x38", "\x42\x4a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5c\x3e", "\x41\x3f", "\x00\x00", "\x5c\x35", "\x5c\x42", "\x5c\x41",
-  "\x00\x00", "\x46\x6f", "\x5c\x40", "\x46\x6a", "\x5c\x44", "\x5c\x37",
-  "\x00\x00", "\x36\x48", "\x5c\x3a", "\x3d\x5d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x47\x60", "\x5c\x3c", "\x36\x4b", "\x00\x00", "\x5c\x34",
-  "\x5c\x36", "\x5c\x33", "\x00\x00", "\x00\x00", "\x4f\x30", "\x33\x5a",
-  "\x5c\x39", "\x00\x00", "\x00\x00", "\x5c\x43", "\x33\x35", "\x3a\x67",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x5d", "\x00\x00", "\x00\x00",
-  "\x5c\x54", "\x00\x00", "\x00\x00", "\x4f\x31", "\x5c\x57", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x3a", "\x5c\x56",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x55", "\x5c\x52", "\x5c\x46",
-  "\x00\x00", "\x00\x00", "\x5c\x63", "\x5c\x45", "\x00\x00", "\x5c\x58",
-  "\x5c\x50", "\x00\x00", "\x00\x00", "\x5c\x4b", "\x5c\x48", "\x00\x00",
-  "\x5c\x49", "\x00\x00", "\x5c\x51", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x74\x22", "\x00\x00", "\x00\x00", "\x5c\x4e", "\x39\x3d", "\x44\x48",
-  "\x41\x64", "\x5c\x4c", "\x00\x00", "\x5c\x47", "\x00\x00", "\x00\x00",
-  "\x5c\x4a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x4d",
-  "\x4b\x6a", "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x4f", "\x5c\x59",
-  "\x5c\x61", "\x5c\x5a", "\x00\x00", "\x00\x00", "\x5c\x67", "\x00\x00",
-  "\x5c\x65", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x60",
-  "\x5c\x5f", "\x00\x00", "\x44\x50", "\x00\x00", "\x41\x65", "\x00\x00",
-  "\x5c\x5d", "\x00\x00", "\x00\x00", "\x5c\x5b", "\x00\x00", "\x00\x00",
-  "\x5c\x62", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x68",
-  "\x48\x75", "\x5c\x6e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5c\x69", "\x5c\x6c", "\x5c\x66", "\x00\x00", "\x00\x00",
-  "\x43\x74", "\x00\x00", "\x49\x38", "\x00\x00", "\x5c\x5c", "\x00\x00",
-  "\x00\x00", "\x5c\x64", "\x3e\x40", "\x00\x00", "\x4c\x4f", "\x5c\x78",
-  "\x5c\x6b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x38\x22", "\x32\x23", "\x33\x5f", "\x00\x00", "\x00\x00", "\x5c\x53",
-  "\x3e\x41", "\x5c\x70", "\x00\x00", "\x5c\x77", "\x3c\x79", "\x33\x72",
-  "\x00\x00", "\x00\x00", "\x43\x2e", "\x5c\x6d", "\x00\x00", "\x00\x00",
-  "\x5c\x72", "\x5c\x76", "\x00\x00", "\x00\x00", "\x36\x36", "\x35\x4c",
-  "\x5c\x74", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x35\x21", "\x00\x00", "\x46\x4b", "\x5c\x73", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5c\x75", "\x5c\x6f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5c\x71", "\x33\x60", "\x43\x49", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5c\x7c", "\x5c\x7a", "\x38\x69", "\x00\x00",
-  "\x5c\x79", "\x5d\x21", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5b\x58", "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x7b", "\x00\x00",
-  "\x5c\x7d", "\x5c\x7e", "\x5d\x2c", "\x00\x00", "\x5d\x28", "\x00\x00",
-  "\x5b\x6d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x27",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x26", "\x00\x00",
-  "\x00\x00", "\x5d\x23", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5c\x6a", "\x5d\x25", "\x5d\x24", "\x5d\x2a", "\x00\x00",
-  "\x4f\x26", "\x5d\x2d", "\x36\x7b", "\x00\x00", "\x00\x00", "\x5d\x29",
-  "\x5d\x2b", "\x48\x27", "\x00\x00", "\x5d\x2e", "\x5d\x32", "\x5d\x2f",
-  "\x4d\x73", "\x5d\x30", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5c\x5e", "\x5d\x33", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x34",
-  "\x31\x35", "\x00\x00", "\x5d\x36", "\x37\x67", "\x3c\x21", "\x00\x00",
-  "\x36\x55", "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x24", "\x4d\x5f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x38", "\x5d\x37",
-  "\x5d\x3a", "\x35\x3d", "\x00\x00", "\x00\x00", "\x36\x56", "\x34\x3e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x3d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5d\x3c", "\x00\x00", "\x5d\x3e", "\x00\x00",
-  "\x00\x00", "\x32\x4e", "\x00\x00", "\x43\x37", "\x00\x00", "\x5d\x3f",
-  "\x00\x00", "\x00\x00", "\x34\x3f", "\x5d\x41", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5d\x40", "\x00\x00", "\x5d\x42", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5d\x43", "\x00\x00", "\x5d\x44", "\x3b\x5f",
-  "\x40\x35", "\x3a\x21", "\x00\x00", "\x49\x70", "\x00\x00", "\x00\x00",
-  "\x4a\x62", "\x4f\x44", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3b\x75", "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x50", "\x4e\x72",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x45", "\x5d\x46", "\x00\x00",
-  "\x3b\x60", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x47", "\x5d\x48",
-  "\x00\x00", "\x00\x00", "\x5d\x4a", "\x5d\x49", "\x00\x00", "\x4b\x58",
-  "\x00\x00", "\x00\x00", "\x3d\x5e", "\x3c\x6c", "\x3b\x44", "\x00\x00",
-  "\x5d\x4b", "\x5d\x4d", "\x3f\x23", "\x00\x00", "\x5d\x4c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x4e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x4f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x50", "\x5d\x51",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x52", "\x00\x00", "\x5d\x54",
-  "\x5d\x53", "\x5d\x55", "\x32\x25", "\x43\x4a", "\x00\x00", "\x5d\x56",
-  "\x00\x00", "\x00\x00", "\x3b\x26", "\x33\x4c", "\x5d\x57", "\x00\x00",
-  "\x00\x00", "\x45\x42", "\x54\x4c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x35\x23", "\x5d\x58", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5d\x59", "\x00\x00", "\x4a\x6c", "\x4b\x68", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x46\x47", "\x5d\x5a", "\x48\x66", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x48\x7b", "\x00\x00", "\x00\x00", "\x4c\x53",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x5b", "\x5d\x5d", "\x5d\x5c",
-  "\x00\x00", "\x00\x00", "\x5d\x5f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5d\x5e", "\x5d\x61", "\x3b\x61", "\x00\x00", "\x4c\x31", "\x00\x00",
-  "\x5d\x62", "\x5d\x63", "\x00\x00", "\x00\x00", "\x35\x24", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5d\x64", "\x5d\x66", "\x5d\x65", "\x3f\x65",
-  "\x00\x00", "\x00\x00", "\x49\x39", "\x31\x4a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x45", "\x00\x00", "\x44\x75",
-  "\x3d\x41", "\x35\x61", "\x48\x46", "\x00\x00", "\x3c\x2e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x68", "\x00\x00", "\x34\x40",
-  "\x00\x00", "\x00\x00", "\x31\x78", "\x00\x00", "\x00\x00", "\x46\x72",
-  "\x5d\x67", "\x39\x3e", "\x43\x53", "\x00\x00", "\x5d\x69", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x71", "\x00\x00",
-  "\x5d\x6a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x42\x41", "\x00\x00", "\x35\x62", "\x5d\x72", "\x37\x68", "\x00\x00",
-  "\x00\x00", "\x35\x25", "\x5d\x70", "\x00\x00", "\x00\x00", "\x5d\x6e",
-  "\x5d\x6b", "\x4d\x60", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x44\x40", "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x59", "\x5d\x6c",
-  "\x00\x00", "\x00\x00", "\x5d\x74", "\x00\x00", "\x5d\x73", "\x37\x23",
-  "\x00\x00", "\x00\x00", "\x32\x2d", "\x00\x00", "\x00\x00", "\x3a\x3b",
-  "\x5d\x6d", "\x5d\x6f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4b\x57", "\x42\x74", "\x4b\x77", "\x00\x00", "\x00\x00",
-  "\x5d\x7c", "\x00\x00", "\x00\x00", "\x5d\x7d", "\x00\x00", "\x32\x4f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x28", "\x4c\x7d",
-  "\x5e\x21", "\x3c\x23", "\x3e\x42", "\x5d\x78", "\x5d\x7e", "\x31\x68",
-  "\x00\x00", "\x36\x37", "\x00\x00", "\x00\x00", "\x5d\x75", "\x5d\x7a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x74", "\x47\x71", "\x00\x00",
-  "\x48\x67", "\x5d\x77", "\x00\x00", "\x4b\x21", "\x00\x00", "\x5d\x79",
-  "\x00\x00", "\x5e\x24", "\x00\x00", "\x5e\x22", "\x00\x00", "\x5d\x7b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x22", "\x47\x48", "\x35\x63",
-  "\x00\x00", "\x45\x25", "\x00\x00", "\x00\x00", "\x43\x6d", "\x00\x00",
-  "\x5e\x25", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x23",
-  "\x42\x59", "\x5d\x76", "\x00\x00", "\x31\x4b", "\x4d\x4e", "\x5e\x30",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x2f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x76", "\x00\x00",
-  "\x5e\x2c", "\x00\x00", "\x4d\x6c", "\x00\x00", "\x00\x00", "\x46\x36",
-  "\x5e\x26", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x44\x45", "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x4c", "\x39\x3f",
-  "\x5e\x29", "\x3d\x27", "\x5e\x2e", "\x00\x00", "\x5e\x2d", "\x5e\x28",
-  "\x00\x00", "\x5e\x2b", "\x00\x00", "\x00\x00", "\x33\x68", "\x00\x00",
-  "\x5e\x2a", "\x47\x49", "\x00\x00", "\x00\x00", "\x4e\x2e", "\x00\x00",
-  "\x00\x00", "\x3e\x74", "\x40\x75", "\x5e\x36", "\x5e\x34", "\x00\x00",
-  "\x49\x4d", "\x5e\x31", "\x5e\x33", "\x00\x00", "\x31\x3a", "\x00\x00",
-  "\x00\x00", "\x39\x40", "\x4f\x32", "\x00\x00", "\x33\x3d", "\x00\x00",
-  "\x49\x62", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4d\x61", "\x00\x00", "\x00\x00", "\x33\x24", "\x3f\x3b", "\x5e\x35",
-  "\x5e\x3a", "\x00\x00", "\x00\x00", "\x3e\x43", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4d\x30", "\x00\x00", "\x5e\x37", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5e\x32", "\x00\x00", "\x5e\x38", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4e\x5e", "\x00\x00", "\x45\x73", "\x46\x42",
-  "\x33\x36", "\x00\x00", "\x00\x00", "\x31\x55", "\x00\x00", "\x00\x00",
-  "\x5e\x3e", "\x00\x00", "\x00\x00", "\x5e\x41", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4e\x43", "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x64",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x48", "\x5e\x42",
-  "\x5e\x3f", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x54", "\x5e\x45",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x4a", "\x5e\x47",
-  "\x00\x00", "\x00\x00", "\x5e\x4c", "\x00\x00", "\x00\x00", "\x45\x71",
-  "\x5e\x4a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x44",
-  "\x00\x00", "\x00\x00", "\x43\x38", "\x00\x00", "\x00\x00", "\x5e\x4b",
-  "\x00\x00", "\x5e\x40", "\x00\x00", "\x5e\x46", "\x00\x00", "\x5e\x4d",
-  "\x30\x7c", "\x5e\x43", "\x00\x00", "\x5e\x4e", "\x00\x00", "\x00\x00",
-  "\x3f\x3c", "\x00\x00", "\x3d\x5f", "\x00\x00", "\x4a\x25", "\x00\x00",
-  "\x3a\x2e", "\x00\x00", "\x5e\x3b", "\x5e\x49", "\x45\x3a", "\x40\x36",
-  "\x00\x00", "\x33\x69", "\x3a\x51", "\x3e\x44", "\x5e\x3d", "\x3d\x42",
-  "\x37\x4c", "\x00\x00", "\x5e\x3c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5e\x52", "\x3d\x6d", "\x38\x3a", "\x00\x00", "\x5e\x61", "\x00\x00",
-  "\x5e\x5b", "\x35\x74", "\x45\x4f", "\x00\x00", "\x5e\x56", "\x5e\x5f",
-  "\x30\x2f", "\x31\x32", "\x00\x00", "\x00\x00", "\x32\x39", "\x00\x00",
-  "\x5e\x58", "\x42\x2c", "\x5e\x4f", "\x5e\x51", "\x39\x41", "\x5e\x62",
-  "\x00\x00", "\x5e\x5d", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x55",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x5c", "\x4c\x2b",
-  "\x00\x00", "\x00\x00", "\x5e\x5a", "\x5e\x5e", "\x38\x50", "\x00\x00",
-  "\x3e\x45", "\x00\x00", "\x00\x00", "\x43\x39", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5e\x54", "\x4d\x2f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5e\x57", "\x00\x00", "\x00\x00", "\x5e\x50", "\x45\x72", "\x00\x00",
-  "\x00\x00", "\x5e\x53", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x59",
-  "\x4f\x51", "\x3c\x3e", "\x4b\x7e", "\x00\x00", "\x5e\x63", "\x48\x2e",
-  "\x00\x00", "\x00\x00", "\x5e\x6f", "\x38\x3b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x60", "\x00\x00", "\x5e\x65",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x2f", "\x39\x42", "\x00\x00",
-  "\x5e\x72", "\x00\x00", "\x00\x00", "\x30\x6e", "\x00\x00", "\x00\x00",
-  "\x5e\x70", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x64",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x6a", "\x00\x00",
-  "\x00\x00", "\x5e\x6c", "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x4f",
-  "\x5e\x67", "\x00\x00", "\x00\x00", "\x45\x2e", "\x00\x00", "\x00\x00",
-  "\x5e\x69", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x71",
-  "\x00\x00", "\x5e\x6b", "\x4c\x47", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5e\x66", "\x00\x00", "\x3c\x22", "\x5e\x7e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x33\x6a", "\x00\x00", "\x5e\x68", "\x5e\x6d",
-  "\x5e\x6e", "\x42\x6c", "\x42\x5a", "\x5e\x76", "\x00\x00", "\x00\x00",
-  "\x5e\x7c", "\x00\x00", "\x00\x00", "\x5e\x7a", "\x00\x00", "\x45\x29",
-  "\x00\x00", "\x00\x00", "\x5f\x23", "\x5e\x77", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x78", "\x5e\x60", "\x00\x00",
-  "\x35\x79", "\x49\x3a", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x3f",
-  "\x00\x00", "\x00\x00", "\x39\x77", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4f\x33", "\x00\x00", "\x5e\x74", "\x00\x00",
-  "\x5f\x22", "\x31\x69", "\x41\x66", "\x47\x79", "\x00\x00", "\x34\x41",
-  "\x4e\x7a", "\x4c\x21", "\x44\x52", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5e\x7b", "\x5e\x7d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x41\x32", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5f\x21", "\x5e\x79", "\x00\x00", "\x5e\x73",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x43", "\x37\x69", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5f\x2f", "\x00\x00", "\x00\x00", "\x5f\x2a",
-  "\x40\x78", "\x00\x00", "\x00\x00", "\x33\x63", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3d\x61", "\x00\x00", "\x5f\x33", "\x5f\x2c",
-  "\x44\x2c", "\x5f\x29", "\x44\x59", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5f\x4c", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x26", "\x00\x00",
-  "\x5f\x25", "\x00\x00", "\x5f\x2e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5f\x28", "\x5f\x27", "\x5f\x2d", "\x00\x00", "\x40\x21", "\x00\x00",
-  "\x5f\x24", "\x5f\x30", "\x00\x00", "\x00\x00", "\x5f\x31", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x42", "\x5f\x36",
-  "\x00\x00", "\x5f\x35", "\x5f\x37", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5f\x3a", "\x45\x43", "\x00\x00", "\x5f\x34",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x38",
-  "\x37\x63", "\x42\x79", "\x5f\x32", "\x47\x3b", "\x00\x00", "\x00\x00",
-  "\x5f\x39", "\x5f\x3e", "\x5f\x3c", "\x00\x00", "\x00\x00", "\x5f\x3f",
-  "\x00\x00", "\x00\x00", "\x5f\x42", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5f\x3b", "\x39\x6a", "\x47\x28", "\x00\x00", "\x00\x00", "\x5e\x39",
-  "\x4d\x74", "\x5f\x3d", "\x00\x00", "\x5f\x41", "\x42\x75", "\x00\x00",
-  "\x5f\x40", "\x00\x00", "\x5f\x2b", "\x00\x00", "\x00\x00", "\x6f\x69",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x45", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5f\x49", "\x00\x00", "\x00\x00", "\x5f\x47", "\x5f\x43",
-  "\x00\x00", "\x5f\x44", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x48",
-  "\x00\x00", "\x5f\x46", "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x4e",
-  "\x00\x00", "\x00\x00", "\x5f\x4e", "\x00\x00", "\x5f\x4b", "\x5f\x4a",
-  "\x00\x00", "\x5f\x4d", "\x46\x54", "\x5f\x4f", "\x43\x75", "\x42\x6d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x25", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5f\x50", "\x00\x00", "\x5f\x52", "\x5f\x51",
-  "\x5e\x75", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x53",
-  "\x46\x67", "\x5f\x54", "\x32\x50", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x45\x74", "\x33\x25", "\x35\x64", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3c\x5e", "\x3a\x52", "\x4f\x27", "\x3f\x66", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x31\x6a", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x56",
-  "\x5f\x55", "\x5f\x59", "\x43\x3a", "\x5f\x5c", "\x5f\x57", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5f\x5b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5f\x5a", "\x45\x40", "\x30\x59", "\x4e\x75", "\x00\x00",
-  "\x00\x00", "\x5f\x5e", "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x28",
-  "\x5f\x60", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x5f", "\x00\x00",
-  "\x5f\x5d", "\x5f\x58", "\x4b\x23", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5f\x62", "\x5f\x61", "\x31\x6b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5f\x64", "\x4a\x32", "\x00\x00", "\x5f\x63", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x35", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3e\x47", "\x41\x33", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x46", "\x4e\x7b", "\x00\x00",
-  "\x00\x00", "\x5f\x6a", "\x00\x00", "\x40\x79", "\x5f\x66", "\x5f\x6b",
-  "\x00\x00", "\x00\x00", "\x31\x6c", "\x5f\x69", "\x00\x00", "\x47\x61",
-  "\x5f\x65", "\x5f\x68", "\x3e\x48", "\x00\x00", "\x48\x51", "\x00\x00",
-  "\x00\x00", "\x5f\x6c", "\x00\x00", "\x3c\x51", "\x40\x7a", "\x5f\x6f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x67", "\x00\x00", "\x37\x27",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x6d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x50", "\x5f\x70", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x74\x26", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3d\x4f", "\x5f\x71", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5f\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x47\x2e", "\x5f\x74", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5f\x75", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x33",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x75", "\x5f\x77",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x79", "\x00\x00",
-  "\x4e\x55", "\x00\x00", "\x5f\x76", "\x00\x00", "\x5f\x78", "\x31\x6d",
-  "\x00\x00", "\x5f\x73", "\x53\x5b", "\x5f\x7a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x41\x67", "\x3b\x38", "\x5f\x7c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x7b", "\x3f\x24", "\x52\x59",
-  "\x5f\x7d", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x21", "\x00\x00",
-  "\x5f\x6e", "\x5f\x7e", "\x00\x00", "\x00\x00", "\x60\x22", "\x47\x7a",
-  "\x60\x23", "\x00\x00", "\x00\x00", "\x60\x24", "\x60\x25", "\x60\x26",
-  "\x00\x00", "\x44\x5e", "\x00\x00", "\x60\x28", "\x60\x27", "\x00\x00",
-  "\x00\x00", "\x60\x29", "\x00\x00", "\x60\x2a", "\x00\x00", "\x00\x00",
-  "\x3c\x5f", "\x49\x63", "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x6c",
-  "\x60\x2b", "\x60\x2c", "\x41\x56", "\x3c\x24", "\x60\x2d", "\x60\x2e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x2f",
-  "\x4a\x52", "\x48\x47", "\x00\x00", "\x00\x00", "\x60\x30", "\x47\x57",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x2d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x31",
-  "\x32\x67", "\x00\x00", "\x35\x6d", "\x00\x00", "\x4c\x46", "\x00\x00",
-  "\x4c\x36", "\x00\x00", "\x32\x34", "\x4f\x34", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4b\x52", "\x00\x00", "\x4a\x2a", "\x40\x37",
-  "\x00\x00", "\x60\x32", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x46\x43", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x23", "\x60\x33",
-  "\x00\x00", "\x3a\x54", "\x60\x35", "\x60\x34", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x60\x36", "\x60\x37", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x60\x38", "\x35\x3e", "\x00\x00", "\x60\x39", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x3a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x38\x24", "\x00\x00", "\x00\x00", "\x48\x48",
-  "\x00\x00", "\x00\x00", "\x60\x3c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3e\x75", "\x00\x00", "\x00\x00", "\x60\x3b", "\x36\x38", "\x60\x3d",
-  "\x60\x3f", "\x00\x00", "\x60\x3e", "\x60\x40", "\x00\x00", "\x38\x51",
-  "\x00\x00", "\x60\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x36\x69", "\x00\x00", "\x41\x40", "\x00\x00", "\x39\x7d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x43", "\x60\x44", "\x60\x42",
-  "\x3c\x6d", "\x00\x00", "\x00\x00", "\x46\x48", "\x36\x39", "\x60\x46",
-  "\x43\x2c", "\x60\x45", "\x00\x00", "\x00\x00", "\x4f\x35", "\x47\x62",
-  "\x60\x49", "\x60\x4b", "\x60\x48", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4c\x54", "\x60\x4a", "\x60\x4c", "\x00\x00", "\x4e\x44", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x50", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x60\x4f", "\x43\x76", "\x47\x2d", "\x00\x00",
-  "\x00\x00", "\x38\x25", "\x60\x4e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x60\x4d", "\x00\x00", "\x4d\x31", "\x4d\x32", "\x60\x51",
-  "\x31\x6e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x76",
-  "\x3b\x62", "\x60\x52", "\x60\x53", "\x60\x55", "\x3d\x43", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x57", "\x00\x00", "\x60\x56",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x58",
-  "\x00\x00", "\x33\x4d", "\x00\x00", "\x00\x00", "\x60\x5a", "\x00\x00",
-  "\x00\x00", "\x60\x59", "\x00\x00", "\x60\x5c", "\x60\x5b", "\x38\x3c",
-  "\x00\x00", "\x00\x00", "\x4e\x28", "\x00\x00", "\x36\x4c", "\x00\x00",
-  "\x32\x26", "\x36\x6a", "\x34\x61", "\x4e\x68", "\x60\x5e", "\x60\x60",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x61", "\x00\x00",
-  "\x32\x51", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x60\x5d", "\x00\x00", "\x3b\x39", "\x00\x00", "\x00\x00", "\x44\x41",
-  "\x60\x5f", "\x60\x64", "\x00\x00", "\x3c\x6e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x60\x62", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x37\x3e", "\x00\x00", "\x00\x00", "\x48\x49", "\x60\x63",
-  "\x00\x00", "\x00\x00", "\x60\x7e", "\x60\x69", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x3d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x35\x65", "\x00\x00", "\x60\x66", "\x4d\x7d",
-  "\x00\x00", "\x00\x00", "\x4e\x30", "\x42\x76", "\x00\x00", "\x00\x00",
-  "\x60\x68", "\x60\x6a", "\x4e\x56", "\x36\x57", "\x48\x7c", "\x47\x4a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x6b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x60\x6d", "\x00\x00", "\x60\x70", "\x60\x6c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x6f", "\x38\x6a", "\x31\x4d",
-  "\x60\x71", "\x00\x00", "\x3f\x70", "\x60\x6e", "\x4e\x5c", "\x00\x00",
-  "\x00\x00", "\x60\x74", "\x74\x24", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x60\x72", "\x60\x75", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x60\x67", "\x60\x73", "\x00\x00", "\x00\x00", "\x3a\x3c",
-  "\x00\x00", "\x00\x00", "\x60\x76", "\x60\x77", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4d\x7e", "\x60\x78", "\x60\x79", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x60\x65", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x60\x7a", "\x34\x44", "\x3c\x25", "\x60\x7b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x7c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x60\x7d", "\x31\x3b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x61\x21", "\x00\x00", "\x49\x3b", "\x61\x22", "\x00\x00",
-  "\x00\x00", "\x34\x24", "\x61\x23", "\x00\x00", "\x61\x24", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x25", "\x00\x00", "\x61\x27",
-  "\x61\x28", "\x61\x26", "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x53",
-  "\x61\x2a", "\x61\x29", "\x61\x2c", "\x61\x2b", "\x61\x2d", "\x61\x2e",
-  "\x61\x30", "\x61\x2f", "\x00\x00", "\x00\x00", "\x39\x79", "\x00\x00",
-  "\x61\x32", "\x00\x00", "\x61\x31", "\x00\x00", "\x00\x00", "\x34\x45",
-  "\x00\x00", "\x3f\x53", "\x00\x00", "\x45\x3c", "\x00\x00", "\x61\x33",
-  "\x40\x38", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x3a", "\x00\x00",
-  "\x31\x79", "\x61\x34", "\x00\x00", "\x4d\x51", "\x00\x00", "\x00\x00",
-  "\x4a\x63", "\x61\x35", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x44",
-  "\x4d\x33", "\x39\x43", "\x3f\x3d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x43\x4b", "\x52\x34", "\x00\x00", "\x44\x2e", "\x32\x68", "\x61\x36",
-  "\x61\x37", "\x00\x00", "\x61\x3c", "\x00\x00", "\x00\x00", "\x61\x3a",
-  "\x61\x39", "\x5a\x42", "\x33\x26", "\x61\x38", "\x00\x00", "\x30\x5a",
-  "\x00\x00", "\x48\x2a", "\x00\x00", "\x00\x00", "\x48\x4a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x31", "\x61\x3d", "\x61\x3b",
-  "\x43\x5c", "\x40\x26", "\x00\x00", "\x00\x00", "\x48\x2b", "\x00\x00",
-  "\x49\x2d", "\x00\x00", "\x61\x3f", "\x4e\x2c", "\x37\x4d", "\x61\x40",
-  "\x00\x00", "\x61\x3e", "\x48\x56", "\x61\x41", "\x00\x00", "\x61\x42",
-  "\x00\x00", "\x00\x00", "\x30\x5b", "\x00\x00", "\x00\x00", "\x3e\x76",
-  "\x61\x47", "\x00\x00", "\x61\x44", "\x46\x6d", "\x61\x43", "\x35\x26",
-  "\x00\x00", "\x00\x00", "\x61\x4a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x61\x45", "\x61\x46", "\x00\x00", "\x61\x49", "\x61\x48", "\x49\x25",
-  "\x00\x00", "\x00\x00", "\x41\x42", "\x41\x41", "\x00\x00", "\x35\x3f",
-  "\x00\x00", "\x00\x00", "\x61\x4b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x61\x4c", "\x00\x00", "\x00\x00", "\x61\x4d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x4f",
-  "\x00\x00", "\x61\x4e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x31\x56", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x61\x57", "\x48\x68", "\x61\x51", "\x00\x00", "\x61\x53",
-  "\x00\x00", "\x00\x00", "\x61\x55", "\x3f\x3e", "\x00\x00", "\x00\x00",
-  "\x61\x56", "\x61\x54", "\x3c\x40", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x61\x50", "\x61\x52", "\x00\x00", "\x49\x42", "\x00\x00", "\x3e\x49",
-  "\x00\x00", "\x00\x00", "\x61\x59", "\x00\x00", "\x00\x00", "\x61\x58",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x5a", "\x00\x00",
-  "\x3c\x26", "\x3a\x2f", "\x00\x00", "\x00\x00", "\x45\x77", "\x61\x5b",
-  "\x00\x00", "\x44\x4b", "\x00\x00", "\x00\x00", "\x61\x5d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4e\x21", "\x61\x5c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x69", "\x61\x62", "\x00\x00",
-  "\x61\x64", "\x61\x65", "\x43\x54", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x61\x63", "\x00\x00", "\x61\x60", "\x00\x00",
-  "\x61\x5e", "\x61\x5f", "\x00\x00", "\x61\x61", "\x61\x68", "\x00\x00",
-  "\x61\x66", "\x00\x00", "\x61\x67", "\x61\x69", "\x61\x6b", "\x61\x6c",
-  "\x61\x6d", "\x00\x00", "\x61\x6e", "\x00\x00", "\x00\x00", "\x61\x6a",
-  "\x61\x70", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x6f", "\x61\x71",
-  "\x4e\x45", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x74", "\x61\x72",
-  "\x61\x73", "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x62", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x7e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4a\x4a", "\x00\x00", "\x61\x76", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x61\x75", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x61\x77", "\x61\x78", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x61\x7c", "\x61\x79", "\x61\x7a", "\x61\x7b", "\x00\x00",
-  "\x61\x7d", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x7e", "\x00\x00",
-  "\x62\x21", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x22", "\x00\x00",
-  "\x62\x23", "\x00\x00", "\x48\x2f", "\x45\x50", "\x62\x24", "\x47\x72",
-  "\x49\x34", "\x00\x00", "\x62\x25", "\x00\x00", "\x00\x00", "\x62\x26",
-  "\x45\x2a", "\x00\x00", "\x33\x27", "\x39\x44", "\x62\x27", "\x00\x00",
-  "\x00\x00", "\x62\x28", "\x00\x00", "\x00\x00", "\x62\x29", "\x00\x00",
-  "\x3b\x29", "\x00\x00", "\x00\x00", "\x62\x2b", "\x00\x00", "\x00\x00",
-  "\x62\x2a", "\x00\x00", "\x00\x00", "\x62\x2c", "\x62\x2d", "\x48\x69",
-  "\x00\x00", "\x62\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x2f",
-  "\x00\x00", "\x00\x00", "\x73\x69", "\x62\x30", "\x62\x31", "\x62\x32",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x2e", "\x00\x00",
-  "\x00\x00", "\x62\x33", "\x47\x56", "\x00\x00", "\x00\x00", "\x4b\x5f",
-  "\x00\x00", "\x31\x4e", "\x00\x00", "\x31\x57", "\x00\x00", "\x00\x00",
-  "\x62\x34", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x36",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x35", "\x45\x70", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x40\x39", "\x5d\x39", "\x00\x00", "\x62\x37",
-  "\x4c\x41", "\x00\x00", "\x62\x38", "\x00\x00", "\x34\x46", "\x48\x57",
-  "\x62\x39", "\x00\x00", "\x62\x3a", "\x00\x00", "\x00\x00", "\x62\x3b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x5c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4c\x55", "\x00\x00", "\x44\x3e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x41\x6a", "\x00\x00", "\x00\x00", "\x62\x3d", "\x00\x00",
-  "\x00\x00", "\x3d\x62", "\x00\x00", "\x00\x00", "\x3e\x4a", "\x00\x00",
-  "\x00\x00", "\x62\x40", "\x00\x00", "\x00\x00", "\x62\x3f", "\x62\x3e",
-  "\x48\x7d", "\x00\x00", "\x34\x47", "\x38\x29", "\x62\x46", "\x00\x00",
-  "\x00\x00", "\x62\x43", "\x3f\x3f", "\x4c\x32", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x62\x42", "\x62\x44", "\x62\x45", "\x00\x00", "\x00\x00",
-  "\x62\x41", "\x62\x47", "\x62\x48", "\x00\x00", "\x44\x2f", "\x00\x00",
-  "\x34\x63", "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x65", "\x62\x49",
-  "\x62\x4a", "\x62\x4d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3f\x67", "\x00\x00", "\x46\x44", "\x00\x00", "\x62\x4e",
-  "\x4b\x53", "\x00\x00", "\x62\x4b", "\x00\x00", "\x00\x00", "\x62\x4c",
-  "\x62\x51", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x50",
-  "\x62\x4f", "\x62\x53", "\x00\x00", "\x00\x00", "\x62\x52", "\x00\x00",
-  "\x00\x00", "\x62\x54", "\x62\x56", "\x00\x00", "\x62\x55", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x4d", "\x3d\x56", "\x4e\x46",
-  "\x00\x00", "\x00\x00", "\x62\x57", "\x00\x00", "\x00\x00", "\x46\x37",
-  "\x00\x00", "\x00\x00", "\x62\x58", "\x00\x00", "\x00\x00", "\x62\x59",
-  "\x00\x00", "\x62\x5d", "\x62\x5b", "\x62\x5c", "\x00\x00", "\x62\x5a",
-  "\x62\x5e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x62\x5f", "\x62\x60", "\x00\x00", "\x00\x00", "\x62\x61", "\x4c\x37",
-  "\x62\x62", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4c\x70", "\x62\x63", "\x00\x00", "\x43\x4e", "\x00\x00", "\x47\x6a",
-  "\x00\x00", "\x36\x6b", "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x3b",
-  "\x62\x64", "\x36\x3a", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x50",
-  "\x62\x65", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3a\x3d", "\x62\x66", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x62\x67", "\x00\x00", "\x38\x26", "\x3a\x55", "\x62\x69",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x56", "\x3a\x56",
-  "\x35\x4e", "\x4b\x24", "\x00\x00", "\x47\x4b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x57", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x39\x5c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x62\x6b", "\x3e\x4b", "\x4e\x32", "\x39\x45",
-  "\x00\x00", "\x00\x00", "\x38\x27", "\x00\x00", "\x00\x00", "\x48\x23",
-  "\x00\x00", "\x62\x6d", "\x62\x6f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x38\x6b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x62\x6e", "\x44\x76", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x62\x71", "\x33\x37", "\x62\x6c", "\x00\x00", "\x00\x00", "\x48\x6a",
-  "\x00\x00", "\x31\x30", "\x00\x00", "\x3a\x6c", "\x00\x00", "\x4f\x52",
-  "\x00\x00", "\x00\x00", "\x62\x70", "\x62\x72", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4a\x4b", "\x00\x00", "\x40\x59", "\x62\x74", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x75", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x73", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x33\x4e", "\x00\x00", "\x62\x7b", "\x00\x00",
-  "\x62\x7a", "\x00\x00", "\x00\x00", "\x3c\x27", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x62\x7c", "\x62\x77", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x62\x7d", "\x62\x78", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x48\x58", "\x62\x76", "\x00\x00", "\x00\x00", "\x62\x79", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x63\x22", "\x63\x21",
-  "\x4b\x61", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x7e", "\x00\x00",
-  "\x00\x00", "\x30\x6b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x63\x24", "\x63\x23", "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x4c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x63\x25",
-  "\x41\x43", "\x00\x00", "\x00\x00", "\x63\x27", "\x63\x26", "\x63\x28",
-  "\x62\x68", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x6a", "\x63\x2a",
-  "\x63\x29", "\x3c\x28", "\x00\x00", "\x4e\x69", "\x00\x00", "\x3c\x52",
-  "\x00\x00", "\x63\x2b", "\x37\x37", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x35\x40", "\x35\x27", "\x3b\x63", "\x4d\x34",
-  "\x00\x00", "\x00\x00", "\x63\x31", "\x00\x00", "\x63\x30", "\x41\x44",
-  "\x63\x2d", "\x00\x00", "\x00\x00", "\x63\x2f", "\x00\x00", "\x00\x00",
-  "\x3d\x4b", "\x3f\x40", "\x63\x2e", "\x63\x2c", "\x00\x00", "\x47\x2a",
-  "\x00\x00", "\x00\x00", "\x3e\x4d", "\x00\x00", "\x00\x00", "\x49\x3c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x57", "\x45\x78",
-  "\x00\x00", "\x00\x00", "\x63\x32", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x63\x33", "\x63\x49", "\x36\x58", "\x00\x00", "\x00\x00",
-  "\x4f\x3d", "\x41\x35", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x63\x34", "\x00\x00", "\x00\x00", "\x32\x52", "\x44\x77", "\x4a\x21",
-  "\x63\x35", "\x35\x7a", "\x63\x36", "\x00\x00", "\x00\x00", "\x63\x38",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x63\x39", "\x00\x00", "\x47\x29",
-  "\x00\x00", "\x00\x00", "\x63\x3a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x63\x3b", "\x63\x3c", "\x00\x00", "\x00\x00",
-  "\x36\x59", "\x32\x53", "\x46\x45", "\x3d\x28", "\x3b\x64", "\x63\x3d",
-  "\x00\x00", "\x3d\x29", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x32\x4a", "\x49\x43", "\x00\x00", "\x00\x00", "\x63\x3e",
-  "\x00\x00", "\x00\x00", "\x48\x6b", "\x41\x45", "\x00\x00", "\x63\x41",
-  "\x00\x00", "\x63\x42", "\x47\x69", "\x00\x00", "\x3f\x41", "\x63\x3f",
-  "\x00\x00", "\x43\x61", "\x00\x00", "\x00\x00", "\x63\x40", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3e\x4e", "\x30\x5c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x35\x29", "\x63\x43", "\x00\x00", "\x00\x00",
-  "\x44\x78", "\x00\x00", "\x63\x44", "\x40\x47", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x2d", "\x00\x00", "\x00\x00",
-  "\x49\x23", "\x63\x45", "\x63\x46", "\x43\x55", "\x00\x00", "\x4e\x47",
-  "\x00\x00", "\x00\x00", "\x63\x48", "\x63\x47", "\x3c\x6f", "\x00\x00",
-  "\x00\x00", "\x63\x4a", "\x30\x70", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x63\x4d", "\x00\x00", "\x00\x00", "\x00\x00", "\x63\x4b",
-  "\x32\x54", "\x37\x4e", "\x63\x4c", "\x39\x46", "\x39\x72", "\x00\x00",
-  "\x4a\x66", "\x63\x4e", "\x00\x00", "\x00\x00", "\x4b\x54", "\x00\x00",
-  "\x00\x00", "\x63\x50", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x51",
-  "\x31\x4f", "\x32\x3a", "\x30\x2c", "\x63\x4f", "\x63\x51", "\x63\x52",
-  "\x3e\x77", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x63\x53", "\x00\x00", "\x33\x4f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x63\x55", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x6a",
-  "\x00\x00", "\x35\x66", "\x00\x00", "\x00\x00", "\x63\x56", "\x36\x75",
-  "\x00\x00", "\x00\x00", "\x63\x57", "\x00\x00", "\x40\x7c", "\x00\x00",
-  "\x46\x4d", "\x00\x00", "\x40\x60", "\x3a\x75", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x63\x58", "\x43\x62", "\x41\x6b", "\x00\x00", "\x63\x5a",
-  "\x63\x5c", "\x63\x59", "\x63\x5b", "\x37\x22", "\x63\x5d", "\x37\x26",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x67", "\x4d\x52", "\x63\x5f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x63\x60",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x2e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x63\x63", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x33\x76", "\x63\x62", "\x63\x61", "\x00\x00", "\x63\x65", "\x63\x5e",
-  "\x00\x00", "\x63\x66", "\x4e\x29", "\x00\x00", "\x63\x67", "\x00\x00",
-  "\x63\x68", "\x00\x00", "\x00\x00", "\x54\x74", "\x63\x6a", "\x00\x00",
-  "\x63\x69", "\x00\x00", "\x00\x00", "\x00\x00", "\x63\x6b", "\x63\x6c",
-  "\x00\x00", "\x4e\x35", "\x63\x6d", "\x00\x00", "\x70\x6f", "\x3e\x4f",
-  "\x63\x6e", "\x63\x6f", "\x3d\x57", "\x00\x00", "\x46\x38", "\x63\x70",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x28", "\x00\x00", "\x00\x00",
-  "\x63\x71", "\x00\x00", "\x43\x3c", "\x63\x72", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x25", "\x00\x00", "\x51\x3f",
-  "\x43\x5d", "\x3c\x33", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x34\x48", "\x00\x00", "\x00\x00", "\x63\x73", "\x00\x00", "\x64\x22",
-  "\x00\x00", "\x63\x76", "\x00\x00", "\x35\x68", "\x00\x00", "\x63\x75",
-  "\x64\x24", "\x00\x00", "\x00\x00", "\x00\x00", "\x63\x74", "\x00\x00",
-  "\x3e\x50", "\x63\x78", "\x63\x79", "\x00\x00", "\x45\x2b", "\x00\x00",
-  "\x00\x00", "\x63\x7a", "\x00\x00", "\x33\x5e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3f\x5a", "\x49\x64", "\x00\x00", "\x63\x7c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x68", "\x63\x77", "\x00\x00",
-  "\x63\x7b", "\x63\x7d", "\x00\x00", "\x00\x00", "\x3a\x7b", "\x64\x26",
-  "\x49\x2e", "\x00\x00", "\x48\x26", "\x45\x79", "\x00\x00", "\x36\x5a",
-  "\x64\x25", "\x64\x23", "\x00\x00", "\x48\x35", "\x63\x7e", "\x43\x5e",
-  "\x45\x7b", "\x00\x00", "\x45\x7a", "\x00\x00", "\x3a\x76", "\x64\x38",
-  "\x64\x28", "\x00\x00", "\x64\x2a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x64\x2d", "\x00\x00", "\x64\x2e", "\x00\x00", "\x64\x2b",
-  "\x64\x2c", "\x00\x00", "\x00\x00", "\x64\x29", "\x64\x27", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x21", "\x4a\x4f", "\x32\x55",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x35", "\x00\x00", "\x64\x32",
-  "\x00\x00", "\x64\x37", "\x00\x00", "\x00\x00", "\x64\x36", "\x00\x00",
-  "\x47\x73", "\x4c\x27", "\x00\x00", "\x3b\x3b", "\x64\x30", "\x64\x39",
-  "\x64\x34", "\x00\x00", "\x64\x33", "\x64\x2f", "\x00\x00", "\x64\x31",
-  "\x00\x00", "\x34\x49", "\x43\x3d", "\x00\x00", "\x00\x00", "\x40\x7d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x22", "\x00\x00", "\x00\x00",
-  "\x64\x3e", "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x24", "\x40\x61",
-  "\x64\x3b", "\x00\x00", "\x00\x00", "\x48\x4f", "\x00\x00", "\x64\x3f",
-  "\x4a\x53", "\x00\x00", "\x43\x5b", "\x00\x00", "\x64\x3a", "\x64\x3c",
-  "\x00\x00", "\x00\x00", "\x64\x3d", "\x64\x40", "\x00\x00", "\x00\x00",
-  "\x3c\x44", "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x46", "\x64\x45",
-  "\x64\x44", "\x00\x00", "\x00\x00", "\x64\x41", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4f\x36", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x64\x4a", "\x00\x00", "\x00\x00", "\x64\x4e", "\x64\x4b",
-  "\x64\x47", "\x64\x48", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x64\x4d", "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x42",
-  "\x52\x55", "\x64\x49", "\x64\x43", "\x00\x00", "\x00\x00", "\x64\x4c",
-  "\x64\x52", "\x00\x00", "\x34\x4a", "\x00\x00", "\x64\x4f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x64\x50", "\x00\x00", "\x00\x00", "\x64\x51",
-  "\x64\x54", "\x64\x53", "\x48\x76", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x64\x55", "\x4e\x7c", "\x4a\x6d", "\x64\x5a", "\x00\x00",
-  "\x00\x00", "\x64\x57", "\x64\x56", "\x40\x52", "\x00\x00", "\x64\x59",
-  "\x64\x5b", "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x58", "\x00\x00",
-  "\x64\x5f", "\x00\x00", "\x64\x5c", "\x64\x5d", "\x64\x46", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x64\x5e", "\x64\x60", "\x64\x61", "\x4a\x46",
-  "\x00\x00", "\x64\x62", "\x4c\x62", "\x00\x00", "\x00\x00", "\x36\x4e",
-  "\x37\x29", "\x64\x63", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4a\x34", "\x00\x00", "\x3f\x68", "\x00\x00", "\x4c\x30",
-  "\x00\x00", "\x00\x00", "\x64\x64", "\x00\x00", "\x4e\x33", "\x00\x00",
-  "\x00\x00", "\x47\x74", "\x00\x00", "\x41\x46", "\x47\x34", "\x00\x00",
-  "\x00\x00", "\x3d\x4d", "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x40",
-  "\x00\x00", "\x64\x69", "\x64\x67", "\x00\x00", "\x64\x65", "\x34\x21",
-  "\x00\x00", "\x3e\x51", "\x64\x6a", "\x00\x00", "\x00\x00", "\x64\x68",
-  "\x00\x00", "\x64\x66", "\x64\x6e", "\x00\x00", "\x00\x00", "\x64\x6d",
-  "\x64\x6c", "\x64\x6b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x64\x6f", "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x70",
-  "\x40\x3a", "\x00\x00", "\x64\x71", "\x00\x00", "\x64\x73", "\x00\x00",
-  "\x00\x00", "\x64\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x38\x52", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x38", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x64\x75", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x45\x7c", "\x00\x00", "\x64\x74", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x64\x76", "\x00\x00", "\x4a\x35", "\x41\x6c", "\x39\x47", "\x00\x00",
-  "\x64\x77", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x48",
-  "\x64\x79", "\x00\x00", "\x00\x00", "\x64\x7a", "\x00\x00", "\x64\x7b",
-  "\x00\x00", "\x64\x7c", "\x00\x00", "\x3b\x65", "\x00\x00", "\x64\x7d",
-  "\x37\x4f", "\x00\x00", "\x00\x00", "\x35\x6a", "\x00\x00", "\x35\x2a",
-  "\x00\x00", "\x65\x21", "\x00\x00", "\x4c\x73", "\x39\x48", "\x64\x7e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x24", "\x4c\x66", "\x00\x00",
-  "\x47\x3c", "\x00\x00", "\x00\x00", "\x49\x33", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3d\x63", "\x65\x23", "\x00\x00", "\x3c\x53", "\x39\x49",
-  "\x3b\x66", "\x35\x69", "\x4a\x36", "\x65\x22", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x41\x47", "\x4b\x42", "\x3a\x77", "\x3b\x67", "\x44\x5d",
-  "\x00\x00", "\x65\x27", "\x4e\x5f", "\x3a\x59", "\x00\x00", "\x65\x28",
-  "\x3f\x42", "\x00\x00", "\x65\x2a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3e\x52", "\x3a\x30", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x65\x29", "\x00\x00", "\x00\x00", "\x3d\x2a", "\x38\x3e", "\x41\x48",
-  "\x65\x25", "\x65\x2b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x65\x26", "\x37\x50", "\x00\x00", "\x65\x2e", "\x65\x32", "\x37\x6b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x2d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x36", "\x00\x00",
-  "\x00\x00", "\x39\x4a", "\x00\x00", "\x00\x00", "\x4d\x6d", "\x30\x3c",
-  "\x65\x33", "\x00\x00", "\x00\x00", "\x35\x6b", "\x00\x00", "\x65\x30",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x31",
-  "\x00\x00", "\x00\x00", "\x45\x7d", "\x65\x2f", "\x65\x2c", "\x00\x00",
-  "\x33\x28", "\x40\x64", "\x00\x00", "\x00\x00", "\x38\x28", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x65\x38", "\x65\x35", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x37", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x65\x34", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x37\x51", "\x42\x33", "\x65\x39", "\x41\x6e", "\x00\x00",
-  "\x00\x00", "\x65\x46", "\x00\x00", "\x00\x00", "\x65\x42", "\x65\x3c",
-  "\x65\x40", "\x3c\x7a", "\x30\x5d", "\x65\x3b", "\x65\x43", "\x65\x47",
-  "\x39\x4b", "\x4c\x56", "\x00\x00", "\x44\x56", "\x65\x3d", "\x00\x00",
-  "\x00\x00", "\x65\x45", "\x00\x00", "\x65\x3a", "\x43\x3e", "\x00\x00",
-  "\x65\x3f", "\x30\x3d", "\x4c\x4a", "\x65\x3e", "\x00\x00", "\x00\x00",
-  "\x36\x5b", "\x48\x6c", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x6d",
-  "\x00\x00", "\x4e\x50", "\x3d\x6f", "\x00\x00", "\x00\x00", "\x65\x6e",
-  "\x00\x00", "\x00\x00", "\x65\x48", "\x00\x00", "\x40\x7e", "\x00\x00",
-  "\x65\x44", "\x65\x49", "\x65\x4b", "\x00\x00", "\x44\x79", "\x65\x4e",
-  "\x00\x00", "\x00\x00", "\x65\x4a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4a\x54", "\x34\x4b", "\x00\x00", "\x00\x00", "\x4c\x4b", "\x00\x00",
-  "\x00\x00", "\x30\x5e", "\x00\x00", "\x00\x00", "\x65\x4d", "\x00\x00",
-  "\x4e\x7d", "\x65\x4c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x31\x6f", "\x00\x00", "\x00\x00", "\x46\x6c", "\x65\x4f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x56", "\x65\x50", "\x65\x57",
-  "\x65\x53", "\x47\x7b", "\x00\x00", "\x00\x00", "\x3c\x4a", "\x65\x55",
-  "\x00\x00", "\x65\x52", "\x65\x58", "\x65\x51", "\x00\x00", "\x00\x00",
-  "\x3d\x44", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x25",
-  "\x00\x00", "\x00\x00", "\x3d\x4c", "\x00\x00", "\x00\x00", "\x65\x54",
-  "\x65\x60", "\x00\x00", "\x00\x00", "\x65\x5c", "\x00\x00", "\x65\x5f",
-  "\x00\x00", "\x65\x5d", "\x65\x61", "\x65\x5b", "\x00\x00", "\x65\x41",
-  "\x40\x53", "\x00\x00", "\x00\x00", "\x48\x4b", "\x00\x00", "\x65\x5e",
-  "\x00\x00", "\x00\x00", "\x65\x59", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x41\x21", "\x37\x52", "\x00\x00", "\x3d\x2b", "\x3f\x25", "\x41\x36",
-  "\x65\x64", "\x00\x00", "\x00\x00", "\x65\x66", "\x65\x67", "\x00\x00",
-  "\x00\x00", "\x65\x63", "\x65\x65", "\x65\x5a", "\x65\x62", "\x00\x00",
-  "\x65\x6a", "\x65\x69", "\x00\x00", "\x00\x00", "\x4b\x7a", "\x00\x00",
-  "\x00\x00", "\x37\x2b", "\x65\x68", "\x00\x00", "\x65\x6c", "\x65\x6b",
-  "\x65\x6f", "\x00\x00", "\x65\x71", "\x00\x00", "\x00\x00", "\x3b\x3c",
-  "\x65\x6d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x72",
-  "\x65\x73", "\x00\x00", "\x00\x00", "\x65\x74", "\x00\x00", "\x65\x7a",
-  "\x45\x3b", "\x65\x76", "\x00\x00", "\x65\x75", "\x65\x77", "\x65\x78",
-  "\x00\x00", "\x65\x79", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x65\x7b", "\x65\x7c", "\x34\x4c", "\x00\x00", "\x65\x7d", "\x00\x00",
-  "\x65\x7e", "\x66\x21", "\x66\x22", "\x66\x23", "\x66\x24", "\x00\x00",
-  "\x66\x25", "\x66\x26", "\x00\x00", "\x00\x00", "\x66\x28", "\x66\x27",
-  "\x00\x00", "\x00\x00", "\x66\x29", "\x66\x2a", "\x66\x2b", "\x66\x2e",
-  "\x66\x2c", "\x66\x2d", "\x3a\x61", "\x37\x53", "\x00\x00", "\x00\x00",
-  "\x43\x56", "\x00\x00", "\x48\x33", "\x00\x00", "\x3d\x70", "\x00\x00",
-  "\x00\x00", "\x47\x4d", "\x00\x00", "\x48\x6d", "\x66\x2f", "\x58\x6d",
-  "\x66\x30", "\x66\x32", "\x00\x00", "\x4d\x65", "\x66\x31", "\x66\x34",
-  "\x66\x33", "\x00\x00", "\x4d\x53", "\x00\x00", "\x66\x35", "\x00\x00",
-  "\x48\x7e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x66\x36", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x66\x39", "\x00\x00", "\x00\x00", "\x66\x38", "\x66\x37", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x3a", "\x37\x32", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x41\x22", "\x35\x41", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x66\x3e", "\x66\x3b", "\x00\x00", "\x00\x00",
-  "\x66\x3c", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x3f", "\x00\x00",
-  "\x66\x40", "\x66\x3d", "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x29",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x27", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x66\x42", "\x66\x43", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x66\x44", "\x00\x00", "\x4d\x62", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3d\x2c", "\x00\x00", "\x66\x46", "\x66\x45",
-  "\x3f\x69", "\x66\x47", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x66\x48", "\x00\x00", "\x00\x00", "\x66\x49", "\x00\x00", "\x34\x65",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x4d", "\x00\x00",
-  "\x00\x00", "\x66\x4a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x66\x4b", "\x00\x00", "\x4b\x5d", "\x4d\x63", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4d\x54", "\x4f\x37", "\x00\x00", "\x39\x4d",
-  "\x66\x4e", "\x3c\x54", "\x66\x4d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x66\x4f", "\x3c\x29", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x42\x51", "\x00\x00", "\x66\x50", "\x00\x00", "\x00\x00", "\x39\x4c",
-  "\x00\x00", "\x4c\x57", "\x66\x51", "\x66\x52", "\x00\x00", "\x00\x00",
-  "\x66\x53", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x54",
-  "\x66\x55", "\x3c\x2a", "\x00\x00", "\x00\x00", "\x4c\x6d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x57", "\x00\x00", "\x43\x3f",
-  "\x00\x00", "\x66\x56", "\x66\x59", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x66\x58", "\x66\x5a", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x3b",
-  "\x00\x00", "\x66\x5b", "\x00\x00", "\x66\x5c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4a\x39", "\x66\x5d", "\x00\x00", "\x41\x6f", "\x66\x5e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x5f",
-  "\x4e\x7e", "\x66\x62", "\x00\x00", "\x66\x61", "\x66\x60", "\x44\x30",
-  "\x00\x00", "\x66\x63", "\x3f\x26", "\x00\x00", "\x66\x64", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x66\x65", "\x4f\x38", "\x66\x66", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x67", "\x66\x69", "\x66\x68",
-  "\x48\x25", "\x00\x00", "\x46\x79", "\x00\x00", "\x4f\x3e", "\x48\x29",
-  "\x66\x6b", "\x00\x00", "\x00\x00", "\x3e\x53", "\x00\x00", "\x49\x2a",
-  "\x00\x00", "\x66\x6c", "\x66\x6a", "\x00\x00", "\x34\x4e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x38\x54", "\x3b\x68", "\x00\x00", "\x00\x00",
-  "\x48\x6e", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x2a", "\x4b\x43",
-  "\x00\x00", "\x66\x6f", "\x66\x6d", "\x00\x00", "\x39\x4e", "\x00\x00",
-  "\x39\x4f", "\x30\x69", "\x00\x00", "\x3a\x68", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x59", "\x30\x5f", "\x66\x74",
-  "\x00\x00", "\x43\x40", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x47\x58", "\x00\x00", "\x42\x5b", "\x66\x76", "\x00\x00",
-  "\x00\x00", "\x66\x72", "\x66\x75", "\x66\x70", "\x00\x00", "\x66\x73",
-  "\x4b\x26", "\x00\x00", "\x00\x00", "\x38\x55", "\x00\x00", "\x00\x00",
-  "\x30\x7d", "\x66\x71", "\x66\x78", "\x00\x00", "\x66\x79", "\x00\x00",
-  "\x00\x00", "\x46\x39", "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x3b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x26", "\x47\x3d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x69", "\x00\x00", "\x00\x00",
-  "\x36\x3c", "\x40\x48", "\x4f\x46", "\x4c\x2e", "\x66\x77", "\x40\x54",
-  "\x35\x53", "\x66\x7a", "\x66\x7c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x66\x7b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x66\x7d", "\x00\x00", "\x43\x26", "\x00\x00",
-  "\x47\x3e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x44\x31", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x23",
-  "\x67\x22", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x7e",
-  "\x00\x00", "\x00\x00", "\x3f\x55", "\x00\x00", "\x49\x65", "\x67\x25",
-  "\x00\x00", "\x67\x24", "\x39\x50", "\x4f\x53", "\x67\x35", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x29", "\x67\x2a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x70", "\x00\x00",
-  "\x00\x00", "\x67\x28", "\x00\x00", "\x39\x78", "\x67\x27", "\x00\x00",
-  "\x00\x00", "\x67\x2b", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x32",
-  "\x4a\x22", "\x41\x23", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x42\x5c", "\x67\x2f", "\x00\x00", "\x67\x30", "\x67\x2c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x2d", "\x00\x00", "\x67\x2e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x51", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x67\x36", "\x00\x00", "\x67\x32", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x66", "\x00\x00", "\x4b\x6c",
-  "\x49\x28", "\x00\x00", "\x00\x00", "\x67\x31", "\x00\x00", "\x00\x00",
-  "\x67\x34", "\x67\x33", "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x44",
-  "\x67\x37", "\x67\x38", "\x00\x00", "\x00\x00", "\x41\x37", "\x00\x00",
-  "\x67\x39", "\x00\x00", "\x00\x00", "\x67\x3b", "\x00\x00", "\x67\x3f",
-  "\x00\x00", "\x00\x00", "\x67\x3c", "\x67\x3a", "\x47\x3f", "\x67\x3d",
-  "\x00\x00", "\x67\x3e", "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x32",
-  "\x00\x00", "\x67\x45", "\x67\x40", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x67\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x42", "\x00\x00",
-  "\x42\x21", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x44",
-  "\x67\x43", "\x67\x46", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x67\x47", "\x67\x48", "\x00\x00", "\x00\x00", "\x3f\x43", "\x00\x00",
-  "\x32\x69", "\x00\x00", "\x67\x49", "\x4e\x57", "\x00\x00", "\x3c\x2b",
-  "\x00\x00", "\x00\x00", "\x3d\x2d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3b\x6a", "\x43\x57", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x4a", "\x67\x4b", "\x31\x31",
-  "\x00\x00", "\x67\x4c", "\x00\x00", "\x00\x00", "\x67\x4d", "\x67\x4e",
-  "\x00\x00", "\x00\x00", "\x67\x4f", "\x00\x00", "\x67\x50", "\x36\x3d",
-  "\x5a\x2a", "\x67\x51", "\x00\x00", "\x40\x65", "\x67\x52", "\x3c\x4b",
-  "\x00\x00", "\x67\x53", "\x00\x00", "\x50\x30", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x67\x54", "\x4a\x5e", "\x34\x5c", "\x00\x00", "\x00\x00",
-  "\x41\x24", "\x3d\x58", "\x00\x00", "\x49\x71", "\x3d\x2e", "\x67\x55",
-  "\x39\x52", "\x67\x56", "\x48\x4c", "\x00\x00", "\x67\x64", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x58", "\x00\x00", "\x42\x49",
-  "\x47\x75", "\x38\x3f", "\x67\x57", "\x41\x25", "\x67\x59", "\x44\x7a",
-  "\x67\x5b", "\x67\x5a", "\x67\x5d", "\x00\x00", "\x00\x00", "\x67\x5c",
-  "\x00\x00", "\x67\x5e", "\x00\x00", "\x00\x00", "\x67\x60", "\x00\x00",
-  "\x67\x5f", "\x00\x00", "\x34\x4f", "\x00\x00", "\x67\x61", "\x00\x00",
-  "\x67\x62", "\x67\x63", "\x00\x00", "\x00\x00", "\x3a\x31", "\x4e\x49",
-  "\x00\x00", "\x67\x65", "\x3f\x27", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x31\x70", "\x67\x66", "\x67\x67", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x67\x68", "\x30\x72", "\x00\x00", "\x67\x69",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x6a", "\x49\x67",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x47", "\x00\x00", "\x67\x6c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x29",
-  "\x30\x32", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x6b",
-  "\x67\x6e", "\x47\x4e", "\x00\x00", "\x3f\x44", "\x00\x00", "\x32\x56",
-  "\x00\x00", "\x4b\x27", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x37\x5d", "\x36\x5c", "\x00\x00", "\x67\x6d", "\x00\x00", "\x32\x6a",
-  "\x34\x23", "\x31\x71", "\x67\x72", "\x4e\x6a", "\x42\x5d", "\x00\x00",
-  "\x00\x00", "\x49\x44", "\x00\x00", "\x67\x7e", "\x00\x00", "\x32\x57",
-  "\x67\x7c", "\x00\x00", "\x67\x7a", "\x67\x71", "\x00\x00", "\x67\x6f",
-  "\x00\x00", "\x67\x70", "\x00\x00", "\x3c\x63", "\x36\x6c", "\x43\x77",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x51", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x51", "\x00\x00", "\x67\x74",
-  "\x67\x73", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x79",
-  "\x67\x75", "\x67\x78", "\x4c\x50", "\x67\x77", "\x32\x58", "\x33\x7d",
-  "\x67\x7b", "\x00\x00", "\x00\x00", "\x67\x7d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x37\x54", "\x68\x23", "\x68\x2c", "\x68\x2d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x2b", "\x68\x34", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x71", "\x00\x00", "\x00\x00",
-  "\x68\x2b", "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x2a", "\x00\x00",
-  "\x68\x25", "\x68\x24", "\x00\x00", "\x68\x22", "\x68\x21", "\x43\x63",
-  "\x00\x00", "\x42\x7b", "\x68\x27", "\x68\x26", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x68\x29", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x41\x70", "\x37\x55", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x31\x41", "\x68\x28", "\x00\x00", "\x39\x53", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x71", "\x68\x3a", "\x00\x00",
-  "\x68\x3b", "\x00\x00", "\x32\x59", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x32\x2e", "\x68\x38", "\x68\x2e", "\x00\x00", "\x68\x36", "\x00\x00",
-  "\x68\x3d", "\x68\x37", "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x35",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x76", "\x00\x00",
-  "\x00\x00", "\x68\x33", "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x2f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x50", "\x68\x31", "\x68\x3c",
-  "\x00\x00", "\x68\x32", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x68\x3e", "\x00\x00", "\x68\x30", "\x47\x7c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x69", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x68\x39", "\x68\x4f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x68\x47", "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x7b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x46", "\x00\x00",
-  "\x36\x5d", "\x00\x00", "\x68\x42", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x32\x5b", "\x00\x00", "\x00\x00", "\x3e\x54", "\x00\x00",
-  "\x68\x45", "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x5a", "\x00\x00",
-  "\x00\x00", "\x45\x51", "\x68\x4a", "\x4a\x6e", "\x00\x00", "\x68\x41",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x5a", "\x38\x56", "\x49\x29",
-  "\x68\x4b", "\x00\x00", "\x68\x3f", "\x00\x00", "\x00\x00", "\x68\x48",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x52", "\x00\x00", "\x68\x43",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x44",
-  "\x46\x3a", "\x00\x00", "\x00\x00", "\x68\x49", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x68\x46", "\x4b\x28", "\x68\x4c", "\x30\x60", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x40", "\x68\x4e", "\x00\x00",
-  "\x68\x4d", "\x47\x6b", "\x68\x54", "\x00\x00", "\x68\x5f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x7e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x68\x62", "\x00\x00", "\x00\x00", "\x68\x50", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x68\x55", "\x4d\x6e", "\x68\x5e", "\x00\x00",
-  "\x00\x00", "\x4d\x55", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4e\x2a", "\x43\x78", "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x6b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x72",
-  "\x68\x64", "\x46\x21", "\x00\x00", "\x00\x00", "\x30\x31", "\x00\x00",
-  "\x00\x00", "\x68\x5d", "\x00\x00", "\x68\x59", "\x41\x72", "\x68\x53",
-  "\x68\x5b", "\x68\x60", "\x00\x00", "\x47\x2c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x30\x2a", "\x00\x00", "\x68\x58", "\x00\x00", "\x68\x61",
-  "\x49\x78", "\x68\x5c", "\x00\x00", "\x68\x57", "\x3e\x55", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x2f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3c\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4c\x58", "\x00\x00", "\x00\x00", "\x49\x47", "\x00\x00", "\x00\x00",
-  "\x68\x67", "\x00\x00", "\x68\x70", "\x68\x5a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x33\x77", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3e\x78", "\x68\x65", "\x00\x00", "\x68\x6a",
-  "\x41\x73", "\x00\x00", "\x00\x00", "\x68\x66", "\x00\x00", "\x68\x6d",
-  "\x00\x00", "\x00\x00", "\x43\x5f", "\x00\x00", "\x68\x6e", "\x00\x00",
-  "\x00\x00", "\x4d\x56", "\x68\x63", "\x33\x38", "\x00\x00", "\x68\x69",
-  "\x00\x00", "\x00\x00", "\x68\x6c", "\x4c\x2c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x68\x6f", "\x00\x00", "\x00\x00", "\x68\x68",
-  "\x68\x6b", "\x4b\x29", "\x00\x00", "\x4f\x21", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x73", "\x68\x7a", "\x00\x00",
-  "\x00\x00", "\x68\x72", "\x3c\x43", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x68\x51", "\x4a\x4e", "\x00\x00", "\x4c\x22",
-  "\x68\x79", "\x68\x78", "\x00\x00", "\x68\x74", "\x68\x75", "\x00\x00",
-  "\x31\x36", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x77",
-  "\x00\x00", "\x68\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x44\x55", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x68\x76", "\x30\x7e", "\x42\x22", "\x4a\x43", "\x00\x00", "\x00\x00",
-  "\x68\x7b", "\x69\x21", "\x00\x00", "\x48\x59", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x68\x7e", "\x3e\x56", "\x3c\x49", "\x69\x23",
-  "\x00\x00", "\x00\x00", "\x36\x3e", "\x69\x24", "\x00\x00", "\x49\x79",
-  "\x68\x7d", "\x00\x00", "\x68\x56", "\x68\x7c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4f\x4f", "\x46\x22", "\x49\x73", "\x00\x00",
-  "\x00\x00", "\x69\x2b", "\x69\x31", "\x69\x32", "\x00\x00", "\x69\x25",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x76", "\x00\x00", "\x00\x00",
-  "\x69\x2f", "\x69\x27", "\x00\x00", "\x69\x29", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x33", "\x69\x28", "\x00\x00",
-  "\x00\x00", "\x69\x2c", "\x00\x00", "\x00\x00", "\x31\x72", "\x00\x00",
-  "\x46\x65", "\x00\x00", "\x69\x2d", "\x69\x30", "\x69\x26", "\x00\x00",
-  "\x41\x26", "\x00\x00", "\x69\x2a", "\x3b\x27", "\x3f\x45", "\x37\x30",
-  "\x4c\x74", "\x00\x00", "\x4c\x79", "\x3d\x72", "\x69\x37", "\x69\x35",
-  "\x4f\x4e", "\x69\x34", "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x75",
-  "\x00\x00", "\x69\x36", "\x69\x38", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x69\x39", "\x69\x3c", "\x69\x3a", "\x46\x23", "\x69\x3b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x4d", "\x69\x2e", "\x3d\x73",
-  "\x00\x00", "\x69\x3d", "\x69\x42", "\x41\x74", "\x00\x00", "\x00\x00",
-  "\x69\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x22", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x69\x43", "\x41\x49", "\x00\x00", "\x00\x00",
-  "\x69\x3e", "\x69\x40", "\x69\x3f", "\x00\x00", "\x00\x00", "\x5d\x31",
-  "\x5d\x22", "\x00\x00", "\x00\x00", "\x69\x45", "\x69\x44", "\x4d\x76",
-  "\x00\x00", "\x62\x3c", "\x69\x46", "\x69\x47", "\x69\x48", "\x38\x57",
-  "\x00\x00", "\x35\x54", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x4a",
-  "\x51\x5d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x75",
-  "\x00\x00", "\x4e\x3a", "\x00\x00", "\x36\x73", "\x69\x4b", "\x69\x4c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x6e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x4d", "\x46\x7a", "\x00\x00",
-  "\x30\x3a", "\x32\x63", "\x69\x52", "\x69\x53", "\x69\x4e", "\x00\x00",
-  "\x3b\x3d", "\x69\x4f", "\x47\x42", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x69\x50", "\x69\x51", "\x69\x5b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x69\x55", "\x69\x58", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x69\x54", "\x69\x56", "\x00\x00", "\x69\x57",
-  "\x3c\x58", "\x00\x00", "\x69\x59", "\x00\x00", "\x43\x41", "\x00\x00",
-  "\x37\x56", "\x33\x42", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x69\x5c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x33\x3f", "\x00\x00", "\x69\x61", "\x00\x00", "\x00\x00", "\x69\x5d",
-  "\x69\x60", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x3a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x5e", "\x00\x00",
-  "\x00\x00", "\x69\x5f", "\x49\x48", "\x48\x5a", "\x69\x62", "\x42\x7d",
-  "\x69\x6c", "\x00\x00", "\x69\x68", "\x00\x00", "\x00\x00", "\x32\x6b",
-  "\x00\x00", "\x69\x66", "\x00\x00", "\x4b\x2a", "\x69\x67", "\x00\x00",
-  "\x00\x00", "\x69\x64", "\x00\x00", "\x69\x65", "\x69\x6a", "\x69\x6d",
-  "\x00\x00", "\x00\x00", "\x69\x6b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x69\x69", "\x69\x63", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x43\x58", "\x00\x00", "\x69\x74", "\x00\x00", "\x4c\x2a",
-  "\x69\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x73", "\x69\x6e",
-  "\x00\x00", "\x00\x00", "\x69\x70", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x69\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x6f", "\x40\x66",
-  "\x00\x00", "\x4f\x39", "\x69\x78", "\x00\x00", "\x69\x79", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x21", "\x00\x00", "\x3f\x2a",
-  "\x00\x00", "\x69\x7b", "\x00\x00", "\x69\x7e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x76", "\x69\x75", "\x00\x00",
-  "\x00\x00", "\x6a\x22", "\x00\x00", "\x00\x00", "\x32\x5c", "\x00\x00",
-  "\x69\x7c", "\x00\x00", "\x6a\x23", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x69\x7d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x69\x7a", "\x00\x00", "\x44\x33", "\x00\x00", "\x69\x77", "\x47\x68",
-  "\x00\x00", "\x00\x00", "\x6a\x27", "\x4d\x3b", "\x6a\x26", "\x00\x00",
-  "\x00\x00", "\x6a\x25", "\x6a\x2e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6a\x28", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x30", "\x4d\x66",
-  "\x6a\x33", "\x00\x00", "\x6a\x2a", "\x00\x00", "\x00\x00", "\x6a\x2b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x2f", "\x00\x00", "\x6a\x32",
-  "\x6a\x31", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x29", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x2c", "\x00\x00", "\x6a\x3d",
-  "\x6a\x36", "\x6a\x34", "\x00\x00", "\x00\x00", "\x6a\x35", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6a\x3a", "\x6a\x3b", "\x00\x00", "\x33\x2a",
-  "\x00\x00", "\x35\x42", "\x00\x00", "\x00\x00", "\x6a\x39", "\x6a\x24",
-  "\x6a\x38", "\x6a\x3c", "\x6a\x37", "\x00\x00", "\x6a\x3e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6a\x40", "\x6a\x3f", "\x6a\x42", "\x6a\x41",
-  "\x69\x5a", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x46", "\x6a\x43",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x44", "\x00\x00",
-  "\x00\x00", "\x6a\x45", "\x00\x00", "\x6a\x47", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x37\x6c", "\x00\x00", "\x6a\x49", "\x00\x00",
-  "\x6a\x48", "\x00\x00", "\x3d\x30", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x39\x54", "\x5e\x27", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6a\x4a", "\x3d\x51", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x33\x39", "\x00\x00", "\x6a\x4b", "\x00\x00", "\x31\x52",
-  "\x00\x00", "\x3e\x57", "\x6a\x4c", "\x00\x00", "\x00\x00", "\x39\x55",
-  "\x6a\x4d", "\x30\x61", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x49\x3d", "\x00\x00", "\x00\x00", "\x6a\x4e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3f\x6a", "\x00\x00", "\x6a\x55", "\x00\x00",
-  "\x00\x00", "\x6a\x52", "\x00\x00", "\x43\x6f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x53", "\x6a\x50", "\x36\x5e",
-  "\x00\x00", "\x6a\x4f", "\x6a\x56", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x37\x36", "\x00\x00", "\x00\x00", "\x42\x5e",
-  "\x00\x00", "\x6a\x5c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6a\x58", "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x35", "\x6a\x57",
-  "\x00\x00", "\x6a\x5a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6a\x51", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x5b", "\x00\x00",
-  "\x6a\x5d", "\x48\x6f", "\x00\x00", "\x00\x00", "\x6a\x59", "\x00\x00",
-  "\x6a\x5e", "\x6a\x60", "\x00\x00", "\x00\x00", "\x38\x53", "\x6a\x54",
-  "\x00\x00", "\x30\x41", "\x6a\x5f", "\x00\x00", "\x3a\x5b", "\x4e\x76",
-  "\x6a\x61", "\x6a\x62", "\x41\x75", "\x4e\x22", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6a\x63", "\x4d\x35", "\x00\x00", "\x00\x00",
-  "\x6a\x64", "\x6a\x65", "\x00\x00", "\x00\x00", "\x4a\x64", "\x6a\x66",
-  "\x00\x00", "\x3a\x40", "\x00\x00", "\x4e\x23", "\x6a\x6b", "\x6a\x6c",
-  "\x3e\x58", "\x6a\x6a", "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x67",
-  "\x6a\x67", "\x00\x00", "\x00\x00", "\x6a\x69", "\x40\x3d", "\x3f\x7e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x68", "\x00\x00", "\x6a\x6d",
-  "\x00\x00", "\x00\x00", "\x4a\x23", "\x00\x00", "\x00\x00", "\x6a\x6f",
-  "\x00\x00", "\x6a\x6e", "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x6c",
-  "\x00\x00", "\x4b\x2b", "\x6a\x70", "\x6a\x7c", "\x6a\x72", "\x6a\x73",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x74", "\x6a\x75",
-  "\x6a\x79", "\x00\x00", "\x6a\x7a", "\x00\x00", "\x00\x00", "\x6a\x78",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x76",
-  "\x00\x00", "\x6a\x71", "\x6a\x77", "\x6a\x7b", "\x70\x37", "\x32\x28",
-  "\x6a\x7e", "\x36\x5f", "\x6a\x7d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6b\x22", "\x00\x00", "\x6b\x21", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6b\x24", "\x00\x00", "\x00\x00", "\x6b\x23", "\x00\x00", "\x6b\x25",
-  "\x00\x00", "\x00\x00", "\x3d\x31", "\x00\x00", "\x6b\x26", "\x00\x00",
-  "\x00\x00", "\x6b\x27", "\x6b\x28", "\x40\x3e", "\x00\x00", "\x4d\x57",
-  "\x00\x00", "\x6b\x29", "\x00\x00", "\x00\x00", "\x4a\x24", "\x47\x46",
-  "\x6b\x2a", "\x00\x00", "\x6b\x2b", "\x38\x2b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x35\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x2c",
-  "\x00\x00", "\x00\x00", "\x3b\x6b", "\x47\x41", "\x6b\x2d", "\x00\x00",
-  "\x33\x50", "\x6b\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6b\x30", "\x4d\x77", "\x00\x00", "\x6b\x2f", "\x3f\x46", "\x00\x00",
-  "\x6b\x31", "\x00\x00", "\x00\x00", "\x6b\x32", "\x00\x00", "\x00\x00",
-  "\x6b\x33", "\x34\x51", "\x6b\x34", "\x00\x00", "\x00\x00", "\x6b\x35",
-  "\x00\x00", "\x6b\x36", "\x6b\x37", "\x33\x51", "\x6b\x38", "\x00\x00",
-  "\x6b\x39", "\x6b\x3a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x32\x72", "\x00\x00", "\x00\x00", "\x3f\x28", "\x6b\x3b",
-  "\x6b\x3c", "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x3d", "\x38\x40",
-  "\x00\x00", "\x44\x7b", "\x6b\x3e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x37\x57", "\x00\x00", "\x3f\x56", "\x00\x00", "\x6b\x41",
-  "\x00\x00", "\x46\x24", "\x00\x00", "\x6b\x40", "\x00\x00", "\x00\x00",
-  "\x37\x31", "\x00\x00", "\x00\x00", "\x6b\x3f", "\x42\x77", "\x35\x2d",
-  "\x00\x00", "\x00\x00", "\x6b\x42", "\x00\x00", "\x6b\x43", "\x00\x00",
-  "\x3e\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x6d", "\x00\x00",
-  "\x6b\x44", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x2c",
-  "\x00\x00", "\x00\x00", "\x40\x5f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x35\x76", "\x00\x00", "\x4c\x75", "\x41\x4a", "\x00\x00", "\x6b\x45",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x47", "\x43\x70", "\x3e\x5a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x46", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x49", "\x00\x00", "\x6b\x4a",
-  "\x3a\x3e", "\x42\x42", "\x6b\x48", "\x00\x00", "\x3e\x5b", "\x49\x3e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x47",
-  "\x00\x00", "\x00\x00", "\x3b\x6c", "\x00\x00", "\x31\x53", "\x00\x00",
-  "\x6b\x4e", "\x37\x58", "\x00\x00", "\x00\x00", "\x3b\x6e", "\x00\x00",
-  "\x00\x00", "\x3b\x6d", "\x00\x00", "\x4f\x4d", "\x6b\x4d", "\x6b\x4c",
-  "\x41\x27", "\x00\x00", "\x35\x4d", "\x4f\x43", "\x33\x3a", "\x3e\x5c",
-  "\x6b\x4b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6b\x50", "\x00\x00", "\x6b\x51", "\x6b\x4f", "\x00\x00", "\x38\x58",
-  "\x00\x00", "\x4d\x40", "\x00\x00", "\x00\x00", "\x3b\x6f", "\x47\x27",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x54", "\x00\x00", "\x40\x40",
-  "\x00\x00", "\x43\x42", "\x00\x00", "\x00\x00", "\x4d\x36", "\x00\x00",
-  "\x6b\x57", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x6c", "\x00\x00",
-  "\x40\x3f", "\x6b\x53", "\x00\x00", "\x6b\x58", "\x38\x6d", "\x6b\x55",
-  "\x6b\x56", "\x00\x00", "\x6b\x52", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x40\x62", "\x46\x49", "\x00\x00", "\x00\x00", "\x43\x2f", "\x00\x00",
-  "\x32\x5d", "\x48\x70", "\x00\x00", "\x00\x00", "\x35\x43", "\x00\x00",
-  "\x00\x00", "\x44\x34", "\x00\x00", "\x00\x00", "\x6b\x5b", "\x00\x00",
-  "\x6b\x59", "\x00\x00", "\x00\x00", "\x43\x4c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x40\x41", "\x34\x52", "\x6b\x5a", "\x00\x00", "\x3f\x5b",
-  "\x00\x00", "\x00\x00", "\x4e\x4a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4f\x40", "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x5c", "\x6b\x67",
-  "\x44\x35", "\x00\x00", "\x6b\x66", "\x00\x00", "\x6b\x63", "\x6b\x6b",
-  "\x6b\x64", "\x00\x00", "\x6b\x60", "\x00\x00", "\x44\x7c", "\x6b\x5f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x5d", "\x00\x00", "\x4d\x21",
-  "\x3b\x70", "\x00\x00", "\x00\x00", "\x6b\x61", "\x00\x00", "\x6b\x5e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x65", "\x3d\x74", "\x00\x00",
-  "\x38\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x7a", "\x00\x00",
-  "\x4b\x45", "\x31\x5a", "\x30\x62", "\x00\x00", "\x46\x25", "\x00\x00",
-  "\x00\x00", "\x6b\x69", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6b\x68", "\x00\x00", "\x46\x66", "\x00\x00", "\x6b\x6d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6b\x62", "\x00\x00", "\x6b\x6c", "\x6b\x6e",
-  "\x00\x00", "\x38\x2c", "\x6b\x6a", "\x39\x56", "\x00\x00", "\x3c\x55",
-  "\x00\x00", "\x00\x00", "\x6b\x6f", "\x4d\x58", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6b\x72", "\x00\x00", "\x6b\x75", "\x00\x00",
-  "\x00\x00", "\x6b\x73", "\x49\x35", "\x6b\x70", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x60", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6b\x74", "\x00\x00", "\x00\x00", "\x6b\x76",
-  "\x6b\x7a", "\x00\x00", "\x00\x00", "\x6b\x77", "\x00\x00", "\x6b\x79",
-  "\x6b\x78", "\x6b\x7b", "\x00\x00", "\x3c\x31", "\x00\x00", "\x6b\x7d",
-  "\x6b\x7c", "\x49\x68", "\x00\x00", "\x00\x00", "\x6c\x21", "\x37\x59",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x7e", "\x6c\x22",
-  "\x00\x00", "\x00\x00", "\x6c\x23", "\x35\x44", "\x66\x41", "\x3e\x79",
-  "\x00\x00", "\x6c\x24", "\x00\x00", "\x00\x00", "\x38\x6e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x25", "\x00\x00",
-  "\x00\x00", "\x6c\x26", "\x00\x00", "\x00\x00", "\x3b\x3e", "\x5a\x4e",
-  "\x00\x00", "\x6c\x27", "\x00\x00", "\x6c\x28", "\x00\x00", "\x3d\x32",
-  "\x00\x00", "\x6c\x29", "\x6c\x2a", "\x00\x00", "\x00\x00", "\x6c\x2b",
-  "\x00\x00", "\x00\x00", "\x6c\x2c", "\x6c\x2d", "\x43\x2b", "\x00\x00",
-  "\x00\x00", "\x6c\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6c\x30", "\x00\x00", "\x6c\x2f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x46\x26", "\x00\x00", "\x6c\x31", "\x00\x00", "\x4b\x2d",
-  "\x00\x00", "\x6c\x32", "\x00\x00", "\x6c\x33", "\x00\x00", "\x6c\x34",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x35", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x5a", "\x3e\x5d", "\x6c\x36",
-  "\x39\x6b", "\x50\x2e", "\x6c\x37", "\x6c\x38", "\x49\x3f", "\x6c\x39",
-  "\x00\x00", "\x6c\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6c\x3a", "\x00\x00", "\x00\x00", "\x6c\x3c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6c\x3b", "\x6c\x3d", "\x00\x00", "\x4b\x46",
-  "\x6c\x3e", "\x6c\x3f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6c\x40", "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x42",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x2d", "\x44\x67",
-  "\x00\x00", "\x49\x69", "\x3a\x62", "\x39\x57", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x49\x4f", "\x32\x5f", "\x48\x4e", "\x6c\x45",
-  "\x34\x53", "\x40\x55", "\x6c\x44", "\x6c\x49", "\x43\x79", "\x4c\x63",
-  "\x00\x00", "\x6c\x47", "\x6c\x48", "\x35\x2e", "\x00\x00", "\x6c\x4a",
-  "\x47\x63", "\x42\x5f", "\x00\x00", "\x00\x00", "\x48\x71", "\x45\x3d",
-  "\x6c\x46", "\x00\x00", "\x4b\x47", "\x32\x6c", "\x6c\x4c", "\x4f\x28",
-  "\x44\x42", "\x4f\x45", "\x00\x00", "\x00\x00", "\x3b\x71", "\x6c\x4b",
-  "\x00\x00", "\x42\x31", "\x00\x00", "\x00\x00", "\x6c\x5c", "\x41\x28",
-  "\x00\x00", "\x00\x00", "\x46\x78", "\x00\x00", "\x49\x50", "\x6c\x4f",
-  "\x3b\x3f", "\x3b\x72", "\x00\x00", "\x3e\x5e", "\x00\x00", "\x47\x65",
-  "\x00\x00", "\x38\x2d", "\x6c\x4e", "\x6c\x4d", "\x00\x00", "\x49\x6a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x41", "\x00\x00", "\x00\x00",
-  "\x45\x52", "\x6c\x51", "\x6c\x52", "\x39\x58", "\x6c\x50", "\x6c\x53",
-  "\x6c\x54", "\x00\x00", "\x6c\x56", "\x42\x23", "\x00\x00", "\x6c\x55",
-  "\x34\x66", "\x00\x00", "\x6c\x58", "\x00\x00", "\x6c\x57", "\x6c\x59",
-  "\x00\x00", "\x00\x00", "\x6c\x5b", "\x6c\x5d", "\x00\x00", "\x6c\x5e",
-  "\x40\x56", "\x00\x00", "\x3c\x4f", "\x6c\x5f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x33\x52", "\x00\x00", "\x6c\x60", "\x00\x00", "\x00\x00",
-  "\x41\x76", "\x6c\x61", "\x00\x00", "\x6c\x62", "\x49\x6b", "\x00\x00",
-  "\x00\x00", "\x35\x2f", "\x6c\x63", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x44\x36", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x5b",
-  "\x6c\x64", "\x3c\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3f\x76", "\x42\x2d", "\x6c\x67", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6c\x66", "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x65", "\x6c\x6d",
-  "\x6c\x6b", "\x00\x00", "\x00\x00", "\x6c\x68", "\x6c\x6a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6c\x69", "\x6c\x6c", "\x00\x00", "\x35\x77",
-  "\x00\x00", "\x6c\x70", "\x00\x00", "\x40\x57", "\x00\x00", "\x6c\x71",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x59", "\x00\x00",
-  "\x6c\x6e", "\x6c\x6f", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x29",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x37", "\x00\x00", "\x41\x29",
-  "\x6c\x72", "\x00\x00", "\x00\x00", "\x6c\x75", "\x6c\x73", "\x6c\x74",
-  "\x4d\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x27",
-  "\x6c\x78", "\x6c\x76", "\x6c\x77", "\x6c\x79", "\x6d\x29", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x7c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6c\x7d", "\x6c\x7b", "\x6c\x7a", "\x00\x00",
-  "\x44\x7d", "\x00\x00", "\x00\x00", "\x6d\x21", "\x6d\x25", "\x6d\x22",
-  "\x6c\x7e", "\x00\x00", "\x6d\x23", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6d\x24", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6d\x2b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6d\x26", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x58", "\x6d\x28", "\x00\x00",
-  "\x00\x00", "\x6d\x2a", "\x6d\x27", "\x6d\x2d", "\x00\x00", "\x3d\x33",
-  "\x00\x00", "\x6d\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6d\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6d\x2f", "\x00\x00", "\x00\x00", "\x6d\x32", "\x6d\x31", "\x00\x00",
-  "\x6d\x30", "\x00\x00", "\x00\x00", "\x6d\x34", "\x6d\x33", "\x00\x00",
-  "\x4c\x76", "\x00\x00", "\x00\x00", "\x00\x00", "\x6d\x36", "\x00\x00",
-  "\x6d\x35", "\x6d\x37", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6d\x38", "\x6d\x3a", "\x6d\x39", "\x3f\x48", "\x6d\x3b", "\x00\x00",
-  "\x00\x00", "\x36\x6d", "\x6d\x3c", "\x6d\x3e", "\x6d\x3f", "\x6d\x40",
-  "\x6d\x3d", "\x00\x00", "\x6d\x41", "\x00\x00", "\x3c\x56", "\x6d\x42",
-  "\x35\x30", "\x37\x33", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x38\x2e", "\x6d\x43", "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x70",
-  "\x00\x00", "\x00\x00", "\x45\x3e", "\x6d\x44", "\x6d\x47", "\x3c\x34",
-  "\x00\x00", "\x00\x00", "\x6d\x46", "\x6d\x45", "\x37\x5a", "\x6d\x48",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x53", "\x00\x00",
-  "\x6d\x4a", "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x5c", "\x6d\x49",
-  "\x00\x00", "\x6d\x52", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6d\x4c", "\x6d\x4e", "\x4a\x65", "\x6d\x4b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6d\x4d", "\x00\x00", "\x6d\x51", "\x6d\x4f",
-  "\x35\x31", "\x00\x00", "\x6d\x50", "\x6d\x53", "\x00\x00", "\x00\x00",
-  "\x47\x5a", "\x4e\x58", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3d\x34", "\x00\x00", "\x00\x00", "\x00\x00", "\x6d\x54", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x22", "\x6d\x56", "\x00\x00",
-  "\x6d\x55", "\x00\x00", "\x00\x00", "\x6d\x59", "\x4d\x41", "\x00\x00",
-  "\x00\x00", "\x6d\x58", "\x00\x00", "\x33\x6d", "\x6d\x57", "\x6d\x5c",
-  "\x00\x00", "\x00\x00", "\x6d\x5b", "\x00\x00", "\x00\x00", "\x6d\x5a",
-  "\x45\x32", "\x6d\x5d", "\x6d\x5e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6d\x5f", "\x00\x00", "\x00\x00", "\x39\x6c", "\x00\x00",
-  "\x37\x25", "\x6d\x60", "\x6d\x61", "\x6d\x62", "\x3f\x49", "\x6d\x63",
-  "\x00\x00", "\x3c\x2d", "\x6d\x64", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6d\x65", "\x00\x00", "\x00\x00", "\x00\x00", "\x52\x21", "\x51\x7e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6d\x66", "\x65\x70",
-  "\x6d\x67", "\x43\x24", "\x3f\x2b", "\x47\x40", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6d\x68", "\x00\x00", "\x00\x00", "\x4a\x55",
-  "\x44\x54", "\x39\x7e", "\x00\x00", "\x00\x00", "\x43\x29", "\x00\x00",
-  "\x00\x00", "\x31\x2a", "\x00\x00", "\x4b\x78", "\x3f\x57", "\x37\x5e",
-  "\x00\x00", "\x00\x00", "\x36\x61", "\x00\x00", "\x00\x00", "\x4a\x56",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6d\x69",
-  "\x6d\x6b", "\x00\x00", "\x00\x00", "\x6d\x6a", "\x32\x60", "\x00\x00",
-  "\x00\x00", "\x46\x76", "\x6d\x6c", "\x47\x77", "\x00\x00", "\x45\x33",
-  "\x00\x00", "\x6d\x6d", "\x3d\x52", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6d\x6f", "\x00\x00", "\x00\x00", "\x4c\x42", "\x6d\x7e", "\x6d\x71",
-  "\x6d\x72", "\x00\x00", "\x00\x00", "\x44\x49", "\x00\x00", "\x00\x00",
-  "\x42\x60", "\x41\x77", "\x00\x00", "\x46\x28", "\x00\x00", "\x6d\x70",
-  "\x35\x55", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6d\x79",
-  "\x00\x00", "\x6d\x76", "\x6e\x25", "\x46\x29", "\x43\x60", "\x6d\x73",
-  "\x00\x00", "\x44\x7e", "\x45\x53", "\x6d\x74", "\x6d\x78", "\x3f\x60",
-  "\x00\x00", "\x47\x67", "\x44\x4c", "\x00\x00", "\x00\x00", "\x40\x42",
-  "\x6d\x77", "\x42\x2e", "\x42\x24", "\x6d\x75", "\x30\x29", "\x4f\x22",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6d\x7a", "\x42\x61", "\x00\x00",
-  "\x00\x00", "\x3d\x35", "\x3f\x4a", "\x00\x00", "\x00\x00", "\x6d\x7c",
-  "\x6d\x7b", "\x00\x00", "\x30\x6f", "\x6d\x7d", "\x00\x00", "\x00\x00",
-  "\x49\x2f", "\x00\x00", "\x6e\x27", "\x00\x00", "\x00\x00", "\x46\x5b",
-  "\x3f\x6b", "\x00\x00", "\x00\x00", "\x43\x59", "\x00\x00", "\x36\x78",
-  "\x00\x00", "\x6e\x26", "\x4d\x37", "\x31\x3f", "\x00\x00", "\x4a\x57",
-  "\x32\x61", "\x6e\x21", "\x6e\x22", "\x6e\x23", "\x6e\x24", "\x46\x3b",
-  "\x43\x23", "\x30\x63", "\x6e\x28", "\x00\x00", "\x6e\x29", "\x74\x23",
-  "\x00\x00", "\x00\x00", "\x42\x3d", "\x00\x00", "\x6e\x2a", "\x00\x00",
-  "\x31\x73", "\x41\x4c", "\x00\x00", "\x38\x2f", "\x00\x00", "\x4d\x5a",
-  "\x00\x00", "\x00\x00", "\x6e\x2b", "\x45\x2c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x41\x78", "\x3c\x57", "\x6e\x2c", "\x00\x00", "\x00\x00",
-  "\x6e\x2f", "\x00\x00", "\x00\x00", "\x3d\x65", "\x6e\x2d", "\x41\x2b",
-  "\x41\x2a", "\x00\x00", "\x30\x64", "\x00\x00", "\x4e\x4b", "\x6e\x31",
-  "\x00\x00", "\x48\x72", "\x6e\x33", "\x6e\x32", "\x6e\x30", "\x63\x64",
-  "\x34\x54", "\x00\x00", "\x00\x00", "\x6d\x6e", "\x00\x00", "\x6e\x35",
-  "\x6e\x34", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6e\x36",
-  "\x00\x00", "\x4d\x38", "\x46\x61", "\x00\x00", "\x00\x00", "\x4b\x2e",
-  "\x00\x00", "\x6e\x37", "\x00\x00", "\x3c\x59", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6e\x38", "\x00\x00", "\x6e\x39", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6e\x3a", "\x00\x00", "\x00\x00", "\x45\x21",
-  "\x30\x6a", "\x39\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x3a",
-  "\x6e\x3e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x37\x34", "\x6e\x3b", "\x00\x00", "\x6e\x3c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x49\x74", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x33\x54", "\x4d\x39", "\x00\x00", "\x36\x3f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x54", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6e\x3f", "\x6e\x40", "\x6e\x41", "\x45\x22",
-  "\x00\x00", "\x00\x00", "\x6e\x43", "\x00\x00", "\x6e\x42", "\x46\x53",
-  "\x6e\x44", "\x3d\x36", "\x3c\x60", "\x47\x5b", "\x43\x71", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3c\x72", "\x00\x00", "\x3f\x6c", "\x00\x00",
-  "\x6e\x45", "\x00\x00", "\x6e\x46", "\x3f\x5d", "\x6e\x47", "\x00\x00",
-  "\x6e\x48", "\x00\x00", "\x00\x00", "\x00\x00", "\x6e\x49", "\x4d\x6f",
-  "\x00\x00", "\x3d\x37", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6e\x4b", "\x6e\x4a", "\x00\x00", "\x39\x5a", "\x00\x00",
-  "\x39\x73", "\x3b\x40", "\x6e\x4e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3d\x66", "\x00\x00", "\x6e\x4d", "\x00\x00", "\x6e\x4c",
-  "\x00\x00", "\x42\x69", "\x00\x00", "\x00\x00", "\x38\x6f", "\x00\x00",
-  "\x40\x43", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x30",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x39", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6e\x4f", "\x00\x00",
-  "\x3e\x5f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6e\x52", "\x6e\x50", "\x00\x00", "\x00\x00", "\x00\x00", "\x6e\x51",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6e\x54", "\x6e\x53",
-  "\x00\x00", "\x00\x00", "\x3e\x7a", "\x00\x00", "\x6e\x55", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6e\x56", "\x6e\x57",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x50", "\x3a\x53",
-  "\x3c\x61", "\x6e\x58", "\x00\x00", "\x6e\x59", "\x4e\x24", "\x3d\x45",
-  "\x4c\x6e", "\x4e\x4c", "\x6e\x5a", "\x36\x62", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6e\x5b", "\x00\x00", "\x45\x23", "\x00\x00",
-  "\x00\x00", "\x6e\x5e", "\x33\x78", "\x3f\x4b", "\x00\x00", "\x6e\x5c",
-  "\x00\x00", "\x6e\x5d", "\x00\x00", "\x44\x60", "\x00\x00", "\x00\x00",
-  "\x4b\x55", "\x36\x7c", "\x6e\x60", "\x6e\x61", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6e\x5f", "\x00\x00", "\x00\x00",
-  "\x6e\x63", "\x46\x5f", "\x33\x43", "\x00\x00", "\x00\x00", "\x6e\x67",
-  "\x00\x00", "\x00\x00", "\x6e\x64", "\x6e\x66", "\x6e\x62", "\x6f\x4f",
-  "\x00\x00", "\x00\x00", "\x6e\x65", "\x4e\x6b", "\x00\x00", "\x00\x00",
-  "\x38\x5a", "\x6e\x6f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x45\x34", "\x6e\x6a", "\x00\x00", "\x00\x00", "\x6e\x6d", "\x6e\x6b",
-  "\x00\x00", "\x6e\x70", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6e\x71", "\x6e\x69", "\x00\x00", "\x00\x00", "\x6e\x76", "\x31\x74",
-  "\x00\x00", "\x00\x00", "\x6e\x68", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x48\x2d", "\x00\x00", "\x6e\x6c", "\x00\x00", "\x3e\x60", "\x39\x5b",
-  "\x4b\x48", "\x00\x00", "\x36\x64", "\x00\x00", "\x00\x00", "\x3d\x46",
-  "\x00\x00", "\x46\x3c", "\x41\x2d", "\x00\x00", "\x6e\x74", "\x00\x00",
-  "\x6e\x6e", "\x6e\x73", "\x00\x00", "\x4c\x43", "\x00\x00", "\x44\x38",
-  "\x6e\x75", "\x6e\x72", "\x41\x2c", "\x6e\x79", "\x00\x00", "\x6e\x78",
-  "\x6e\x77", "\x00\x00", "\x00\x00", "\x4b\x2f", "\x3d\x7b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6e\x7a", "\x4a\x5f", "\x00\x00",
-  "\x00\x00", "\x31\x54", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x49\x46", "\x43\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x35\x78", "\x00\x00", "\x6e\x7c", "\x00\x00", "\x39\x5d", "\x3b\x2c",
-  "\x6e\x7b", "\x3f\x6d", "\x3f\x6e", "\x6f\x21", "\x6f\x23", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x7b", "\x00\x00",
-  "\x6f\x22", "\x6f\x24", "\x00\x00", "\x00\x00", "\x36\x53", "\x00\x00",
-  "\x49\x45", "\x00\x00", "\x00\x00", "\x3c\x62", "\x4f\x23", "\x00\x00",
-  "\x6e\x7e", "\x3a\x78", "\x00\x00", "\x00\x00", "\x4f\x3f", "\x00\x00",
-  "\x00\x00", "\x6f\x26", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6f\x25", "\x6f\x27", "\x6e\x7d", "\x46\x69", "\x00\x00", "\x45\x55",
-  "\x44\x57", "\x00\x00", "\x6f\x2c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x43\x43", "\x6f\x28", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6f\x29", "\x37\x2d", "\x00\x00", "\x6f\x2b", "\x38\x30", "\x6f\x2a",
-  "\x00\x00", "\x3e\x61", "\x33\x79", "\x6f\x30", "\x00\x00", "\x3a\x3f",
-  "\x41\x79", "\x00\x00", "\x00\x00", "\x44\x4a", "\x33\x3b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6f\x2e", "\x6f\x2f", "\x44\x43",
-  "\x00\x00", "\x6f\x2d", "\x6f\x31", "\x6f\x37", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6f\x3a", "\x6f\x39", "\x45\x2d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6f\x32", "\x6f\x33", "\x6f\x36",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6f\x38", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x36\x40", "\x00\x00", "\x00\x00", "\x6f\x3b",
-  "\x6f\x35", "\x00\x00", "\x00\x00", "\x6f\x34", "\x6f\x3f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6f\x40", "\x6f\x41", "\x00\x00", "\x00\x00",
-  "\x6f\x3e", "\x6f\x3d", "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x62",
-  "\x46\x2a", "\x6f\x3c", "\x6f\x45", "\x6f\x43", "\x6f\x44", "\x6f\x42",
-  "\x00\x00", "\x42\x78", "\x00\x00", "\x6f\x46", "\x6f\x47", "\x00\x00",
-  "\x00\x00", "\x6f\x49", "\x34\x55", "\x6f\x48", "\x4c\x7a", "\x6f\x54",
-  "\x6f\x4a", "\x00\x00", "\x00\x00", "\x6f\x4d", "\x00\x00", "\x6f\x4b",
-  "\x00\x00", "\x6f\x4c", "\x6f\x4e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6f\x50", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6f\x51", "\x00\x00", "\x6f\x52", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6f\x55", "\x6f\x53", "\x6f\x56", "\x6f\x58",
-  "\x00\x00", "\x6f\x57", "\x44\x39", "\x4c\x67", "\x00\x00", "\x6f\x59",
-  "\x41\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x6f\x5a", "\x00\x00",
-  "\x4a\x44", "\x6f\x5b", "\x33\x2b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x31\x3c", "\x00\x00", "\x34\x57", "\x00\x00", "\x34\x56", "\x6f\x5c",
-  "\x00\x00", "\x6f\x5d", "\x00\x00", "\x6f\x5e", "\x6f\x5f", "\x6f\x60",
-  "\x00\x00", "\x34\x58", "\x33\x55", "\x39\x5e", "\x48\x36", "\x00\x00",
-  "\x6f\x62", "\x6f\x61", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6f\x63", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x5c",
-  "\x6f\x66", "\x00\x00", "\x6f\x65", "\x6f\x64", "\x00\x00", "\x6f\x67",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6f\x6a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x30\x47", "\x00\x00", "\x00\x00", "\x6f\x68",
-  "\x00\x00", "\x6f\x6c", "\x6f\x6b", "\x6f\x6e", "\x6f\x6d", "\x6f\x6f",
-  "\x00\x00", "\x46\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x6f\x70",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6f\x71", "\x6f\x73",
-  "\x00\x00", "\x00\x00", "\x6f\x72", "\x49\x6c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6f\x74", "\x6f\x75", "\x00\x00", "\x3a\x65",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6f\x76", "\x6f\x77", "\x00\x00",
-  "\x00\x00", "\x4b\x49", "\x41\x4b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x30\x24", "\x42\x4b", "\x00\x00", "\x6f\x78", "\x00\x00", "\x49\x6d",
-  "\x6f\x7b", "\x6f\x79", "\x39\x5f", "\x00\x00", "\x6f\x7a", "\x38\x42",
-  "\x4a\x45", "\x6f\x7d", "\x70\x21", "\x6f\x7e", "\x70\x22", "\x00\x00",
-  "\x00\x00", "\x31\x21", "\x3f\x58", "\x3d\x7c", "\x34\x59", "\x70\x23",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x66", "\x00\x00", "\x70\x25",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x22", "\x00\x00", "\x70\x24",
-  "\x44\x44", "\x00\x00", "\x4e\x4d", "\x46\x2b", "\x6f\x7c", "\x4e\x26",
-  "\x00\x00", "\x38\x31", "\x00\x00", "\x00\x00", "\x4d\x5b", "\x36\x79",
-  "\x4e\x34", "\x00\x00", "\x37\x28", "\x00\x00", "\x42\x62", "\x67\x21",
-  "\x00\x00", "\x70\x26", "\x33\x2c", "\x3f\x6f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x33\x56", "\x70\x28", "\x00\x00", "\x70\x29",
-  "\x70\x27", "\x37\x64", "\x00\x00", "\x3a\x5d", "\x3e\x63", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x31\x23", "\x00\x00", "\x00\x00", "\x4e\x59",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x70\x2b", "\x6e\x2e", "\x00\x00",
-  "\x70\x2a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x70\x2e", "\x70\x2c", "\x70\x2d", "\x00\x00", "\x70\x2f", "\x00\x00",
-  "\x70\x30", "\x4e\x6c", "\x70\x31", "\x70\x32", "\x00\x00", "\x40\x49",
-  "\x48\x3b", "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x7d", "\x34\x67",
-  "\x00\x00", "\x00\x00", "\x4d\x3a", "\x32\x6d", "\x3d\x38", "\x38\x5b",
-  "\x00\x00", "\x70\x35", "\x00\x00", "\x70\x34", "\x3b\x73", "\x70\x36",
-  "\x70\x33", "\x00\x00", "\x00\x00", "\x3b\x28", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x70\x3a", "\x6a\x2d", "\x00\x00", "\x00\x00", "\x52\x56",
-  "\x00\x00", "\x3f\x77", "\x70\x38", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4e\x25", "\x46\x71", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x31\x2b", "\x00\x00", "\x40\x63", "\x3c\x36",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x37", "\x00\x00",
-  "\x31\x40", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x6d", "\x4d\x6b",
-  "\x00\x00", "\x70\x3b", "\x00\x00", "\x45\x45", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3c\x7b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x70\x3c", "\x00\x00", "\x70\x3d", "\x3f\x4c", "\x70\x3e", "\x00\x00",
-  "\x4e\x6e", "\x00\x00", "\x00\x00", "\x70\x39", "\x70\x40", "\x70\x42",
-  "\x00\x00", "\x70\x41", "\x00\x00", "\x70\x3f", "\x00\x00", "\x00\x00",
-  "\x70\x43", "\x00\x00", "\x00\x00", "\x70\x44", "\x00\x00", "\x00\x00",
-  "\x41\x7a", "\x00\x00", "\x32\x62", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x70\x45", "\x00\x00", "\x00\x00", "\x4c\x38",
-  "\x00\x00", "\x00\x00", "\x70\x46", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x70\x47", "\x00\x00", "\x4f\x2a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x31", "\x70\x48",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x70\x49", "\x70\x4a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x70\x4e", "\x00\x00", "\x70\x4b", "\x00\x00",
-  "\x70\x4c", "\x00\x00", "\x70\x4d", "\x70\x4f", "\x40\x44", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4c\x77", "\x00\x00", "\x00\x00", "\x40\x45",
-  "\x00\x00", "\x00\x00", "\x70\x50", "\x00\x00", "\x48\x73", "\x00\x00",
-  "\x70\x51", "\x73\x53", "\x4c\x4c", "\x00\x00", "\x70\x52", "\x00\x00",
-  "\x70\x53", "\x00\x00", "\x70\x54", "\x33\x57", "\x00\x00", "\x70\x56",
-  "\x00\x00", "\x3f\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x70\x57",
-  "\x00\x00", "\x00\x00", "\x37\x24", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x70\x58", "\x70\x5c", "\x00\x00", "\x70\x5a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x70\x5b", "\x00\x00", "\x00\x00",
-  "\x33\x73", "\x70\x59", "\x70\x5d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x70\x5e", "\x00\x00", "\x30\x48", "\x00\x00", "\x70\x5f",
-  "\x70\x60", "\x3e\x64", "\x00\x00", "\x00\x00", "\x00\x00", "\x70\x61",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x47", "\x00\x00", "\x00\x00",
-  "\x70\x64", "\x00\x00", "\x00\x00", "\x70\x63", "\x00\x00", "\x70\x62",
-  "\x00\x00", "\x00\x00", "\x6b\x71", "\x00\x00", "\x4a\x5c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x70\x65", "\x70\x66",
-  "\x70\x67", "\x00\x00", "\x00\x00", "\x70\x68", "\x00\x00", "\x70\x69",
-  "\x00\x00", "\x00\x00", "\x70\x6a", "\x34\x5a", "\x70\x6b", "\x70\x6c",
-  "\x47\x23", "\x00\x00", "\x00\x00", "\x00\x00", "\x70\x6e", "\x32\x3b",
-  "\x00\x00", "\x70\x71", "\x70\x70", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x31\x24", "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x41",
-  "\x00\x00", "\x4a\x47", "\x44\x3a", "\x3a\x22", "\x00\x00", "\x39\x60",
-  "\x3d\x67", "\x00\x00", "\x3f\x5c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x70\x73", "\x00\x00", "\x00\x00", "\x70\x72", "\x4d\x42", "\x34\x68",
-  "\x48\x52", "\x46\x5c", "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x7c",
-  "\x4e\x4e", "\x00\x00", "\x37\x5b", "\x70\x76", "\x00\x00", "\x00\x00",
-  "\x70\x75", "\x4b\x4b", "\x46\x2c", "\x31\x50", "\x00\x00", "\x00\x00",
-  "\x70\x77", "\x70\x74", "\x00\x00", "\x00\x00", "\x49\x51", "\x4d\x6a",
-  "\x70\x78", "\x70\x79", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x70\x7b", "\x42\x6a", "\x33\x5b", "\x33\x5c", "\x70\x7a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x69", "\x38\x32", "\x00\x00",
-  "\x00\x00", "\x34\x6a", "\x00\x00", "\x00\x00", "\x45\x3f", "\x00\x00",
-  "\x00\x00", "\x4e\x60", "\x38\x5c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x70\x7c", "\x00\x00", "\x00\x00", "\x00\x00", "\x70\x7d", "\x70\x7e",
-  "\x71\x21", "\x00\x00", "\x71\x23", "\x71\x22", "\x49\x77", "\x00\x00",
-  "\x71\x24", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x25",
-  "\x00\x00", "\x71\x26", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x71\x27", "\x71\x29", "\x71\x28", "\x00\x00", "\x71\x2a", "\x48\x74",
-  "\x66\x4c", "\x00\x00", "\x00\x00", "\x3f\x29", "\x00\x00", "\x00\x00",
-  "\x35\x32", "\x71\x2b", "\x00\x00", "\x71\x2c", "\x00\x00", "\x52\x2c",
-  "\x5d\x3b", "\x48\x53", "\x00\x00", "\x00\x00", "\x30\x7b", "\x00\x00",
-  "\x30\x3b", "\x3b\x74", "\x4b\x30", "\x3e\x7e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x71\x2d", "\x00\x00", "\x4c\x5f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x71\x2e", "\x4d\x5c", "\x00\x00", "\x31\x42",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x41", "\x00\x00", "\x71\x2f",
-  "\x32\x6e", "\x71\x30", "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x31",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x33", "\x71\x34",
-  "\x00\x00", "\x71\x36", "\x71\x32", "\x00\x00", "\x00\x00", "\x71\x35",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x5b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x71\x37", "\x00\x00", "\x71\x38", "\x71\x39", "\x71\x3a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x3b", "\x00\x00", "\x00\x00",
-  "\x71\x3d", "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x3c", "\x00\x00",
-  "\x71\x3f", "\x71\x42", "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x3e",
-  "\x71\x40", "\x71\x41", "\x00\x00", "\x00\x00", "\x71\x43", "\x00\x00",
-  "\x36\x42", "\x3c\x73", "\x71\x44", "\x71\x45", "\x39\x61", "\x71\x46",
-  "\x00\x00", "\x00\x00", "\x33\x3e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x47\x4f", "\x71\x47", "\x71\x48", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x43\x5a", "\x46\x6b", "\x71\x49", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x47\x7d", "\x00\x00", "\x00\x00", "\x42\x4c",
-  "\x31\x58", "\x36\x6e", "\x00\x00", "\x36\x6f", "\x43\x73", "\x71\x4e",
-  "\x36\x70", "\x00\x00", "\x00\x00", "\x32\x6f", "\x00\x00", "\x00\x00",
-  "\x71\x4d", "\x00\x00", "\x00\x00", "\x71\x4b", "\x00\x00", "\x71\x4c",
-  "\x00\x00", "\x71\x4a", "\x00\x00", "\x00\x00", "\x71\x58", "\x71\x4f",
-  "\x71\x50", "\x00\x00", "\x00\x00", "\x71\x51", "\x71\x52", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x54", "\x00\x00",
-  "\x00\x00", "\x71\x53", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x59",
-  "\x00\x00", "\x71\x55", "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x57",
-  "\x35\x33", "\x71\x56", "\x00\x00", "\x00\x00", "\x41\x7b", "\x38\x33",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x59",
-  "\x42\x4d", "\x00\x00", "\x00\x00", "\x71\x5a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x46\x2d", "\x71\x5b", "\x71\x60", "\x00\x00",
-  "\x71\x5e", "\x00\x00", "\x71\x5d", "\x71\x5f", "\x00\x00", "\x71\x5c",
-  "\x71\x62", "\x71\x61", "\x00\x00", "\x71\x64", "\x00\x00", "\x00\x00",
-  "\x36\x43", "\x71\x63", "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x65",
-  "\x00\x00", "\x00\x00", "\x71\x66", "\x00\x00", "\x71\x68", "\x71\x67",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x69", "\x71\x6b", "\x71\x6a",
-  "\x39\x7c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x6c",
-  "\x00\x00", "\x00\x00", "\x71\x6d", "\x33\x3c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x71\x6e", "\x00\x00", "\x00\x00", "\x00\x00", "\x71\x6f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x71", "\x71\x70", "\x00\x00",
-  "\x71\x71", "\x00\x00", "\x71\x72", "\x71\x73", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x39\x62", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x71\x74", "\x71\x75", "\x00\x00", "\x00\x00", "\x71\x76",
-  "\x71\x77", "\x00\x00", "\x00\x00", "\x71\x78", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x48\x31", "\x71\x7a", "\x00\x00", "\x49\x26", "\x71\x7b",
-  "\x71\x79", "\x00\x00", "\x71\x7d", "\x00\x00", "\x00\x00", "\x71\x7c",
-  "\x00\x00", "\x00\x00", "\x71\x7e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x72\x21", "\x72\x22", "\x72\x23", "\x00\x00", "\x72\x24", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x72\x25", "\x00\x00", "\x00\x00",
-  "\x72\x26", "\x72\x27", "\x00\x00", "\x72\x28", "\x00\x00", "\x72\x29",
-  "\x72\x2a", "\x72\x2b", "\x72\x2c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x72\x2d", "\x72\x2e", "\x00\x00", "\x5d\x35", "\x72\x2f", "\x64\x78",
-  "\x35\x34", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x21",
-  "\x3a\x32", "\x72\x31", "\x72\x30", "\x4c\x25", "\x72\x33", "\x72\x34",
-  "\x72\x32", "\x00\x00", "\x72\x35", "\x00\x00", "\x00\x00", "\x4b\x62",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x72\x36", "\x00\x00", "\x35\x7b",
-  "\x4f\x25", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x72\x37",
-  "\x72\x39", "\x30\x3e", "\x00\x00", "\x00\x00", "\x72\x3a", "\x4a\x2b",
-  "\x72\x38", "\x00\x00", "\x00\x00", "\x72\x3b", "\x72\x3c", "\x72\x3d",
-  "\x72\x3e", "\x72\x3f", "\x00\x00", "\x4b\x6e", "\x3b\x2d", "\x00\x00",
-  "\x3a\x7a", "\x41\x2f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x72\x40", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x72\x43", "\x72\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x72\x44", "\x00\x00", "\x00\x00", "\x38\x71", "\x72\x42",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x72\x45", "\x00\x00",
-  "\x72\x46", "\x72\x47", "\x00\x00", "\x72\x4b", "\x00\x00", "\x3b\x2a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x64", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x72\x4c", "\x72\x49",
-  "\x72\x48", "\x72\x4a", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x5f",
-  "\x72\x50", "\x72\x4f", "\x72\x4e", "\x00\x00", "\x00\x00", "\x30\x33",
-  "\x72\x5a", "\x00\x00", "\x72\x56", "\x00\x00", "\x72\x57", "\x72\x53",
-  "\x72\x59", "\x00\x00", "\x72\x55", "\x33\x62", "\x00\x00", "\x00\x00",
-  "\x4f\x4c", "\x00\x00", "\x72\x58", "\x72\x54", "\x72\x52", "\x72\x51",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x72\x5c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x72\x5f",
-  "\x00\x00", "\x00\x00", "\x72\x5e", "\x72\x5d", "\x49\x49", "\x72\x5b",
-  "\x30\x73", "\x72\x60", "\x00\x00", "\x72\x62", "\x33\x6f", "\x72\x4d",
-  "\x31\x37", "\x00\x00", "\x00\x00", "\x72\x64", "\x72\x63", "\x72\x61",
-  "\x43\x2d", "\x4b\x70", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4e\x5a", "\x00\x00", "\x00\x00", "\x72\x65", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x72\x66", "\x72\x67", "\x72\x68",
-  "\x00\x00", "\x72\x69", "\x44\x3b", "\x00\x00", "\x72\x6a", "\x00\x00",
-  "\x48\x37", "\x00\x00", "\x72\x6f", "\x72\x6b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x72\x6c", "\x00\x00", "\x00\x00", "\x4b\x31", "\x4c\x44",
-  "\x00\x00", "\x46\x50", "\x72\x70", "\x00\x00", "\x00\x00", "\x72\x71",
-  "\x46\x3e", "\x72\x6e", "\x72\x6d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x32\x2a", "\x00\x00", "\x00\x00", "\x00\x00", "\x72\x79",
-  "\x00\x00", "\x00\x00", "\x72\x78", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x31\x75", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x72\x76", "\x00\x00", "\x00\x00", "\x00\x00", "\x72\x75", "\x00\x00",
-  "\x00\x00", "\x72\x73", "\x00\x00", "\x33\x7b", "\x00\x00", "\x72\x72",
-  "\x3c\x32", "\x32\x29", "\x39\x63", "\x00\x00", "\x00\x00", "\x72\x7c",
-  "\x72\x7b", "\x00\x00", "\x72\x7a", "\x00\x00", "\x00\x00", "\x72\x77",
-  "\x00\x00", "\x72\x7d", "\x00\x00", "\x72\x7e", "\x73\x25", "\x73\x24",
-  "\x73\x26", "\x00\x00", "\x00\x00", "\x31\x2d", "\x73\x21", "\x73\x22",
-  "\x00\x00", "\x39\x74", "\x4c\x39", "\x00\x00", "\x00\x00", "\x73\x23",
-  "\x4b\x32", "\x00\x00", "\x00\x00", "\x73\x2b", "\x00\x00", "\x00\x00",
-  "\x73\x27", "\x73\x2c", "\x73\x29", "\x00\x00", "\x73\x28", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x5c", "\x73\x2d",
-  "\x73\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x73\x2f",
-  "\x00\x00", "\x73\x2a", "\x00\x00", "\x00\x00", "\x00\x00", "\x72\x74",
-  "\x00\x00", "\x00\x00", "\x73\x30", "\x00\x00", "\x44\x61", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x73\x34", "\x00\x00", "\x73\x35", "\x73\x33",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x73\x32",
-  "\x73\x38", "\x00\x00", "\x73\x31", "\x00\x00", "\x73\x36", "\x73\x37",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x73\x3a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x73\x39", "\x73\x3c", "\x73\x3d",
-  "\x00\x00", "\x73\x3e", "\x00\x00", "\x00\x00", "\x4f\x49", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x73\x3b", "\x42\x6b",
-  "\x3a\x6d", "\x00\x00", "\x00\x00", "\x73\x3f", "\x73\x40", "\x73\x41",
-  "\x00\x00", "\x00\x00", "\x73\x42", "\x73\x43", "\x00\x00", "\x00\x00",
-  "\x38\x34", "\x73\x44", "\x00\x00", "\x00\x00", "\x00\x00", "\x73\x45",
-  "\x00\x00", "\x3c\x2f", "\x00\x00", "\x73\x46", "\x73\x47", "\x00\x00",
-  "\x00\x00", "\x73\x48", "\x73\x49", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x73\x4c", "\x73\x4a", "\x4f\x3c", "\x00\x00", "\x73\x4b",
-  "\x00\x00", "\x4e\x6f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x73\x4d", "\x00\x00", "\x4e\x5b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x73\x4e", "\x47\x7e", "\x00\x00",
-  "\x00\x00", "\x73\x4f", "\x73\x51", "\x00\x00", "\x00\x00", "\x73\x52",
-  "\x73\x50", "\x39\x6d", "\x4c\x4d", "\x4b\x63", "\x56\x77", "\x00\x00",
-  "\x5d\x60", "\x4b\x7b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x32\x2b", "\x73\x54", "\x35\x50", "\x73\x55", "\x73\x56", "\x73\x57",
-  "\x00\x00", "\x39\x75", "\x00\x00", "\x73\x58", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x60\x54", "\x4c\x5b", "\x00\x00", "\x42\x63", "\x73\x59",
-  "\x73\x5b", "\x73\x5a", "\x00\x00", "\x73\x5c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x73\x5d", "\x00\x00", "\x00\x00", "\x73\x5e",
-  "\x73\x5f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x73\x60",
-  "\x00\x00", "\x73\x61", "\x73\x62", "\x00\x00", "\x73\x63", "\x00\x00",
-  "\x73\x64", "\x73\x65", "\x73\x66", "\x73\x67", "\x73\x68", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x24", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x5d", "\x00\x00", "\x73\x6a",
-  "\x41\x4d", "\x73\x6b", "\x73\x6c", "\x49\x21", "\x00\x00", "\x00\x00",
-  "\x73\x6d", "\x73\x6e", "\x63\x37", "\x00\x00", "\x00\x00", "\x6c\x5a",
-  "\x70\x6d", "\x00\x00", "\x00\x00", "\x73\x6f", "\x00\x00", "\x73\x70",
-  "\x73\x72", "\x73\x73", "\x73\x74", "\x4e\x70", "\x73\x71", "\x00\x00",
-  "\x00\x00", "\x73\x75", "\x73\x76", "\x00\x00", "\x00\x00", "\x73\x78",
-  "\x00\x00", "\x73\x77", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x73\x7a", "\x00\x00", "\x00\x00", "\x00\x00", "\x73\x7b",
-  "\x73\x79", "\x4e\x36", "\x73\x7c", "\x73\x7d", "\x63\x54", "\x00\x00",
-  "\x00\x00", "\x73\x7e", "\x21\x2a", "\x00\x00", "\x21\x74", "\x21\x70",
-  "\x21\x73", "\x21\x75", "\x00\x00", "\x21\x4a", "\x21\x4b", "\x21\x76",
-  "\x21\x5c", "\x21\x24", "\x00\x00", "\x21\x25", "\x21\x3f", "\x23\x30",
-  "\x23\x31", "\x23\x32", "\x23\x33", "\x23\x34", "\x23\x35", "\x23\x36",
-  "\x23\x37", "\x23\x38", "\x23\x39", "\x21\x27", "\x21\x28", "\x21\x63",
-  "\x21\x61", "\x21\x64", "\x21\x29", "\x21\x77", "\x23\x41", "\x23\x42",
-  "\x23\x43", "\x23\x44", "\x23\x45", "\x23\x46", "\x23\x47", "\x23\x48",
-  "\x23\x49", "\x23\x4a", "\x23\x4b", "\x23\x4c", "\x23\x4d", "\x23\x4e",
-  "\x23\x4f", "\x23\x50", "\x23\x51", "\x23\x52", "\x23\x53", "\x23\x54",
-  "\x23\x55", "\x23\x56", "\x23\x57", "\x23\x58", "\x23\x59", "\x23\x5a",
-  "\x21\x4e", "\x21\x40", "\x21\x4f", "\x21\x30", "\x21\x32", "\x21\x2e",
-  "\x23\x61", "\x23\x62", "\x23\x63", "\x23\x64", "\x23\x65", "\x23\x66",
-  "\x23\x67", "\x23\x68", "\x23\x69", "\x23\x6a", "\x23\x6b", "\x23\x6c",
-  "\x23\x6d", "\x23\x6e", "\x23\x6f", "\x23\x70", "\x23\x71", "\x23\x72",
-  "\x23\x73", "\x23\x74", "\x23\x75", "\x23\x76", "\x23\x77", "\x23\x78",
-  "\x23\x79", "\x23\x7a", "\x21\x50", "\x21\x43", "\x21\x51", "\x21\x31",
-  "\x00\x00", "\x21\x6f"
-};
diff --git a/newlib/iconvdata/jis0208.h b/newlib/iconvdata/jis0208.h
deleted file mode 100644
index 131a5c5..0000000
--- a/newlib/iconvdata/jis0208.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Access functions for JISX0208 conversion.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _JIS0208_H
-#define _JIS0208_H	1
-
-#include <gconv.h>
-#include <stdint.h>
-
-/* Struct for table with indeces in UCS mapping table.  */
-struct jisx0208_ucs_idx
-{
-  uint16_t start;
-  uint16_t end;
-  uint16_t idx;
-};
-
-/* Conversion table.  */
-extern const uint16_t __jis0208_to_ucs[];
-
-extern const char __jisx0208_from_ucs4_lat1[256][2];
-extern const char __jisx0208_from_ucs4_greek[0xc1][2];
-extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
-extern const char __jisx0208_from_ucs_tab[][2];
-
-static inline uint32_t
-jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)
-{
-  unsigned char ch = *(*s);
-  unsigned char ch2;
-  int idx;
-
-  if (ch < offset || (ch - offset) <= 0x20)
-    return __UNKNOWN_10646_CHAR;
-
-  if (avail < 2)
-    return 0;
-
-  ch2 = (*s)[1];
-  if (ch2 < offset || (ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f)
-    return __UNKNOWN_10646_CHAR;
-
-  idx = (ch - 0x21 - offset) * 94 + (ch2 - 0x21 - offset);
-  if (idx >= 0x1e80)
-    return __UNKNOWN_10646_CHAR;
-
-  (*s) += 2;
-
-  return __jis0208_to_ucs[idx] ?: ((*s) -= 2, __UNKNOWN_10646_CHAR);
-}
-
-
-static inline size_t
-ucs4_to_jisx0208 (uint32_t wch, char *s, size_t avail)
-{
-  unsigned int ch = (unsigned int) wch;
-  const char *cp;
-
-  if (avail < 2)
-    return 0;
-
-  if (ch < 0x100)
-    cp = __jisx0208_from_ucs4_lat1[ch];
-  else if (ch >= 0x391 && ch <= 0x451)
-    cp = __jisx0208_from_ucs4_greek[ch - 0x391];
-  else
-    {
-      const struct jisx0208_ucs_idx *rp = __jisx0208_from_ucs_idx;
-
-      if (ch >= 0xffff)
-	return __UNKNOWN_10646_CHAR;
-      while (ch > rp->end)
-	++rp;
-      if (ch >= rp->start)
-	cp = __jisx0208_from_ucs_tab[rp->idx + ch - rp->start];
-      else
-	return __UNKNOWN_10646_CHAR;
-    }
-
-  if (cp[0] == '\0')
-    return __UNKNOWN_10646_CHAR;
-
-  s[0] = cp[0];
-  s[1] = cp[1];
-
-  return 2;
-}
-
-#endif /* jis0208.h */
diff --git a/newlib/iconvdata/jis0212.c b/newlib/iconvdata/jis0212.c
deleted file mode 100644
index 8ad1c90..0000000
--- a/newlib/iconvdata/jis0212.c
+++ /dev/null
@@ -1,3940 +0,0 @@
-/* Mapping tables for JIS0212 handling.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stdint.h>
-
-#include <jis0212.h>
-
-/* The defined JIS 0201 positions contains large gaps.  It's better to
-   avoid using one large table with such big gaps.  Instead we match each
-   char in a table resulting in an index to a table with the UCS.  The
-   following command can be used to generate the table:
-
-   egrep '^0x[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]' \
-     .../eastasia/jis/jis0212.txt | perl tab.pl
-
-   where tab.pl is
-
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   $first=$last=$idx=0;
-   while (<>) {
-     local($jis,$ucs,%rest) = split;
-     local($u)=hex($ucs);
-     local($j)=hex($jis);
-     local($k) = int(($j - 0x2121) / 256) * 94 + (($j - 0x2121) % 256);
-     if ($k - $last > 6) {
-       if ($last != 0) {
-	 printf (" { start: %#06x, end: %#06x, idx: %5d },\n",
-		 $first, $last, $idx);
-	 $idx += $last - $first + 1;
-       }
-       $first=$k;
-     }
-     $last=$k;
-   }
-   printf (" { start: %#06x, end: %#06x, idx: %5d }\n",
-	   $first, $last, $idx);
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-const struct jisx0212_idx __jisx0212_to_ucs_idx[] =
-{
- { start: 0x006c, end: 0x0076, idx:     0 },
- { start: 0x007f, end: 0x0081, idx:    11 },
- { start: 0x00a8, end: 0x00ae, idx:    14 },
- { start: 0x0216, end: 0x0231, idx:    21 },
- { start: 0x0255, end: 0x0261, idx:    49 },
- { start: 0x0285, end: 0x0291, idx:    62 },
- { start: 0x02f0, end: 0x02ff, idx:    75 },
- { start: 0x0310, end: 0x031f, idx:    91 },
- { start: 0x034e, end: 0x03a4, idx:   107 },
- { start: 0x03ac, end: 0x0402, idx:   194 },
- { start: 0x0582, end: 0x1c2a, idx:   281 },
- { start: 0xffff, end: 0xffff, idx:     0 },
-};
-
-
-/* The table which the UCS values indexed by the table above can be
-   generated using the following code:
-
-   egrep '^0x[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]' \
-     .../eastasia/jis/jis0212.txt | perl tab.pl
-
-   where tab.pl is:
-
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   $first=$last=$idx=0;
-
-   sub fmt {
-     printf ("\n ") if (($n % 8) == 0);
-     ++$n;
-     my($val) = pop(@_);
-     printf (" %#06x,", $val);
-   }
-
-   while (<>) {
-     local($jis,$ucs,%rest) = split;
-     local($u)=hex($ucs);
-     local($j)=hex($jis);
-     local($k) = int(($j - 0x2121) / 256) * 94 + (($j - 0x2121) % 256);
-     if ($k - $last > 6) {
-       if ($last != 0) {
-	 $idx += $last - $first + 1;
-       }
-       $first=$k;
-     } else {
-       for ($m = $last + 1; $m < $k; ++$m) {
-         fmt (0);
-       }
-     }
-     fmt ($u);
-     $last=$k;
-   }
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-const uint16_t __jisx0212_to_ucs[] =
-{
-  0x02d8, 0x02c7, 0x00b8, 0x02d9, 0x02dd, 0x00af, 0x02db, 0x02da,
-  0xff5e, 0x0384, 0x0385, 0x00a1, 0x00a6, 0x00bf, 0x00ba, 0x00aa,
-  0x00a9, 0x00ae, 0x2122, 0x00a4, 0x2116, 0x0386, 0x0388, 0x0389,
-  0x038a, 0x03aa, 000000, 0x038c, 000000, 0x038e, 0x03ab, 000000,
-  0x038f, 000000, 000000, 000000, 000000, 0x03ac, 0x03ad, 0x03ae,
-  0x03af, 0x03ca, 0x0390, 0x03cc, 0x03c2, 0x03cd, 0x03cb, 0x03b0,
-  0x03ce, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408,
-  0x0409, 0x040a, 0x040b, 0x040c, 0x040e, 0x040f, 0x0452, 0x0453,
-  0x0454, 0x0455, 0x0456, 0x0457, 0x0458, 0x0459, 0x045a, 0x045b,
-  0x045c, 0x045e, 0x045f, 0x00c6, 0x0110, 000000, 0x0126, 000000,
-  0x0132, 000000, 0x0141, 0x013f, 000000, 0x014a, 0x00d8, 0x0152,
-  000000, 0x0166, 0x00de, 0x00e6, 0x0111, 0x00f0, 0x0127, 0x0131,
-  0x0133, 0x0138, 0x0142, 0x0140, 0x0149, 0x014b, 0x00f8, 0x0153,
-  0x00df, 0x0167, 0x00fe, 0x00c1, 0x00c0, 0x00c4, 0x00c2, 0x0102,
-  0x01cd, 0x0100, 0x0104, 0x00c5, 0x00c3, 0x0106, 0x0108, 0x010c,
-  0x00c7, 0x010a, 0x010e, 0x00c9, 0x00c8, 0x00cb, 0x00ca, 0x011a,
-  0x0116, 0x0112, 0x0118, 000000, 0x011c, 0x011e, 0x0122, 0x0120,
-  0x0124, 0x00cd, 0x00cc, 0x00cf, 0x00ce, 0x01cf, 0x0130, 0x012a,
-  0x012e, 0x0128, 0x0134, 0x0136, 0x0139, 0x013d, 0x013b, 0x0143,
-  0x0147, 0x0145, 0x00d1, 0x00d3, 0x00d2, 0x00d6, 0x00d4, 0x01d1,
-  0x0150, 0x014c, 0x00d5, 0x0154, 0x0158, 0x0156, 0x015a, 0x015c,
-  0x0160, 0x015e, 0x0164, 0x0162, 0x00da, 0x00d9, 0x00dc, 0x00db,
-  0x016c, 0x01d3, 0x0170, 0x016a, 0x0172, 0x016e, 0x0168, 0x01d7,
-  0x01db, 0x01d9, 0x01d5, 0x0174, 0x00dd, 0x0178, 0x0176, 0x0179,
-  0x017d, 0x017b, 0x00e1, 0x00e0, 0x00e4, 0x00e2, 0x0103, 0x01ce,
-  0x0101, 0x0105, 0x00e5, 0x00e3, 0x0107, 0x0109, 0x010d, 0x00e7,
-  0x010b, 0x010f, 0x00e9, 0x00e8, 0x00eb, 0x00ea, 0x011b, 0x0117,
-  0x0113, 0x0119, 0x01f5, 0x011d, 0x011f, 000000, 0x0121, 0x0125,
-  0x00ed, 0x00ec, 0x00ef, 0x00ee, 0x01d0, 000000, 0x012b, 0x012f,
-  0x0129, 0x0135, 0x0137, 0x013a, 0x013e, 0x013c, 0x0144, 0x0148,
-  0x0146, 0x00f1, 0x00f3, 0x00f2, 0x00f6, 0x00f4, 0x01d2, 0x0151,
-  0x014d, 0x00f5, 0x0155, 0x0159, 0x0157, 0x015b, 0x015d, 0x0161,
-  0x015f, 0x0165, 0x0163, 0x00fa, 0x00f9, 0x00fc, 0x00fb, 0x016d,
-  0x01d4, 0x0171, 0x016b, 0x0173, 0x016f, 0x0169, 0x01d8, 0x01dc,
-  0x01da, 0x01d6, 0x0175, 0x00fd, 0x00ff, 0x0177, 0x017a, 0x017e,
-  0x017c, 0x4e02, 0x4e04, 0x4e05, 0x4e0c, 0x4e12, 0x4e1f, 0x4e23,
-  0x4e24, 0x4e28, 0x4e2b, 0x4e2e, 0x4e2f, 0x4e30, 0x4e35, 0x4e40,
-  0x4e41, 0x4e44, 0x4e47, 0x4e51, 0x4e5a, 0x4e5c, 0x4e63, 0x4e68,
-  0x4e69, 0x4e74, 0x4e75, 0x4e79, 0x4e7f, 0x4e8d, 0x4e96, 0x4e97,
-  0x4e9d, 0x4eaf, 0x4eb9, 0x4ec3, 0x4ed0, 0x4eda, 0x4edb, 0x4ee0,
-  0x4ee1, 0x4ee2, 0x4ee8, 0x4eef, 0x4ef1, 0x4ef3, 0x4ef5, 0x4efd,
-  0x4efe, 0x4eff, 0x4f00, 0x4f02, 0x4f03, 0x4f08, 0x4f0b, 0x4f0c,
-  0x4f12, 0x4f15, 0x4f16, 0x4f17, 0x4f19, 0x4f2e, 0x4f31, 0x4f60,
-  0x4f33, 0x4f35, 0x4f37, 0x4f39, 0x4f3b, 0x4f3e, 0x4f40, 0x4f42,
-  0x4f48, 0x4f49, 0x4f4b, 0x4f4c, 0x4f52, 0x4f54, 0x4f56, 0x4f58,
-  0x4f5f, 0x4f63, 0x4f6a, 0x4f6c, 0x4f6e, 0x4f71, 0x4f77, 0x4f78,
-  0x4f79, 0x4f7a, 0x4f7d, 0x4f7e, 0x4f81, 0x4f82, 0x4f84, 0x4f85,
-  0x4f89, 0x4f8a, 0x4f8c, 0x4f8e, 0x4f90, 0x4f92, 0x4f93, 0x4f94,
-  0x4f97, 0x4f99, 0x4f9a, 0x4f9e, 0x4f9f, 0x4fb2, 0x4fb7, 0x4fb9,
-  0x4fbb, 0x4fbc, 0x4fbd, 0x4fbe, 0x4fc0, 0x4fc1, 0x4fc5, 0x4fc6,
-  0x4fc8, 0x4fc9, 0x4fcb, 0x4fcc, 0x4fcd, 0x4fcf, 0x4fd2, 0x4fdc,
-  0x4fe0, 0x4fe2, 0x4ff0, 0x4ff2, 0x4ffc, 0x4ffd, 0x4fff, 0x5000,
-  0x5001, 0x5004, 0x5007, 0x500a, 0x500c, 0x500e, 0x5010, 0x5013,
-  0x5017, 0x5018, 0x501b, 0x501c, 0x501d, 0x501e, 0x5022, 0x5027,
-  0x502e, 0x5030, 0x5032, 0x5033, 0x5035, 0x5040, 0x5041, 0x5042,
-  0x5045, 0x5046, 0x504a, 0x504c, 0x504e, 0x5051, 0x5052, 0x5053,
-  0x5057, 0x5059, 0x505f, 0x5060, 0x5062, 0x5063, 0x5066, 0x5067,
-  0x506a, 0x506d, 0x5070, 0x5071, 0x503b, 0x5081, 0x5083, 0x5084,
-  0x5086, 0x508a, 0x508e, 0x508f, 0x5090, 0x5092, 0x5093, 0x5094,
-  0x5096, 0x509b, 0x509c, 0x509e, 0x509f, 0x50a0, 0x50a1, 0x50a2,
-  0x50aa, 0x50af, 0x50b0, 0x50b9, 0x50ba, 0x50bd, 0x50c0, 0x50c3,
-  0x50c4, 0x50c7, 0x50cc, 0x50ce, 0x50d0, 0x50d3, 0x50d4, 0x50d8,
-  0x50dc, 0x50dd, 0x50df, 0x50e2, 0x50e4, 0x50e6, 0x50e8, 0x50e9,
-  0x50ef, 0x50f1, 0x50f6, 0x50fa, 0x50fe, 0x5103, 0x5106, 0x5107,
-  0x5108, 0x510b, 0x510c, 0x510d, 0x510e, 0x50f2, 0x5110, 0x5117,
-  0x5119, 0x511b, 0x511c, 0x511d, 0x511e, 0x5123, 0x5127, 0x5128,
-  0x512c, 0x512d, 0x512f, 0x5131, 0x5133, 0x5134, 0x5135, 0x5138,
-  0x5139, 0x5142, 0x514a, 0x514f, 0x5153, 0x5155, 0x5157, 0x5158,
-  0x515f, 0x5164, 0x5166, 0x517e, 0x5183, 0x5184, 0x518b, 0x518e,
-  0x5198, 0x519d, 0x51a1, 0x51a3, 0x51ad, 0x51b8, 0x51ba, 0x51bc,
-  0x51be, 0x51bf, 0x51c2, 0x51c8, 0x51cf, 0x51d1, 0x51d2, 0x51d3,
-  0x51d5, 0x51d8, 0x51de, 0x51e2, 0x51e5, 0x51ee, 0x51f2, 0x51f3,
-  0x51f4, 0x51f7, 0x5201, 0x5202, 0x5205, 0x5212, 0x5213, 0x5215,
-  0x5216, 0x5218, 0x5222, 0x5228, 0x5231, 0x5232, 0x5235, 0x523c,
-  0x5245, 0x5249, 0x5255, 0x5257, 0x5258, 0x525a, 0x525c, 0x525f,
-  0x5260, 0x5261, 0x5266, 0x526e, 0x5277, 0x5278, 0x5279, 0x5280,
-  0x5282, 0x5285, 0x528a, 0x528c, 0x5293, 0x5295, 0x5296, 0x5297,
-  0x5298, 0x529a, 0x529c, 0x52a4, 0x52a5, 0x52a6, 0x52a7, 0x52af,
-  0x52b0, 0x52b6, 0x52b7, 0x52b8, 0x52ba, 0x52bb, 0x52bd, 0x52c0,
-  0x52c4, 0x52c6, 0x52c8, 0x52cc, 0x52cf, 0x52d1, 0x52d4, 0x52d6,
-  0x52db, 0x52dc, 0x52e1, 0x52e5, 0x52e8, 0x52e9, 0x52ea, 0x52ec,
-  0x52f0, 0x52f1, 0x52f4, 0x52f6, 0x52f7, 0x5300, 0x5303, 0x530a,
-  0x530b, 0x530c, 0x5311, 0x5313, 0x5318, 0x531b, 0x531c, 0x531e,
-  0x531f, 0x5325, 0x5327, 0x5328, 0x5329, 0x532b, 0x532c, 0x532d,
-  0x5330, 0x5332, 0x5335, 0x533c, 0x533d, 0x533e, 0x5342, 0x534c,
-  0x534b, 0x5359, 0x535b, 0x5361, 0x5363, 0x5365, 0x536c, 0x536d,
-  0x5372, 0x5379, 0x537e, 0x5383, 0x5387, 0x5388, 0x538e, 0x5393,
-  0x5394, 0x5399, 0x539d, 0x53a1, 0x53a4, 0x53aa, 0x53ab, 0x53af,
-  0x53b2, 0x53b4, 0x53b5, 0x53b7, 0x53b8, 0x53ba, 0x53bd, 0x53c0,
-  0x53c5, 0x53cf, 0x53d2, 0x53d3, 0x53d5, 0x53da, 0x53dd, 0x53de,
-  0x53e0, 0x53e6, 0x53e7, 0x53f5, 0x5402, 0x5413, 0x541a, 0x5421,
-  0x5427, 0x5428, 0x542a, 0x542f, 0x5431, 0x5434, 0x5435, 0x5443,
-  0x5444, 0x5447, 0x544d, 0x544f, 0x545e, 0x5462, 0x5464, 0x5466,
-  0x5467, 0x5469, 0x546b, 0x546d, 0x546e, 0x5474, 0x547f, 0x5481,
-  0x5483, 0x5485, 0x5488, 0x5489, 0x548d, 0x5491, 0x5495, 0x5496,
-  0x549c, 0x549f, 0x54a1, 0x54a6, 0x54a7, 0x54a9, 0x54aa, 0x54ad,
-  0x54ae, 0x54b1, 0x54b7, 0x54b9, 0x54ba, 0x54bb, 0x54bf, 0x54c6,
-  0x54ca, 0x54cd, 0x54ce, 0x54e0, 0x54ea, 0x54ec, 0x54ef, 0x54f6,
-  0x54fc, 0x54fe, 0x54ff, 0x5500, 0x5501, 0x5505, 0x5508, 0x5509,
-  0x550c, 0x550d, 0x550e, 0x5515, 0x552a, 0x552b, 0x5532, 0x5535,
-  0x5536, 0x553b, 0x553c, 0x553d, 0x5541, 0x5547, 0x5549, 0x554a,
-  0x554d, 0x5550, 0x5551, 0x5558, 0x555a, 0x555b, 0x555e, 0x5560,
-  0x5561, 0x5564, 0x5566, 0x557f, 0x5581, 0x5582, 0x5586, 0x5588,
-  0x558e, 0x558f, 0x5591, 0x5592, 0x5593, 0x5594, 0x5597, 0x55a3,
-  0x55a4, 0x55ad, 0x55b2, 0x55bf, 0x55c1, 0x55c3, 0x55c6, 0x55c9,
-  0x55cb, 0x55cc, 0x55ce, 0x55d1, 0x55d2, 0x55d3, 0x55d7, 0x55d8,
-  0x55db, 0x55de, 0x55e2, 0x55e9, 0x55f6, 0x55ff, 0x5605, 0x5608,
-  0x560a, 0x560d, 0x560e, 0x560f, 0x5610, 0x5611, 0x5612, 0x5619,
-  0x562c, 0x5630, 0x5633, 0x5635, 0x5637, 0x5639, 0x563b, 0x563c,
-  0x563d, 0x563f, 0x5640, 0x5641, 0x5643, 0x5644, 0x5646, 0x5649,
-  0x564b, 0x564d, 0x564f, 0x5654, 0x565e, 0x5660, 0x5661, 0x5662,
-  0x5663, 0x5666, 0x5669, 0x566d, 0x566f, 0x5671, 0x5672, 0x5675,
-  0x5684, 0x5685, 0x5688, 0x568b, 0x568c, 0x5695, 0x5699, 0x569a,
-  0x569d, 0x569e, 0x569f, 0x56a6, 0x56a7, 0x56a8, 0x56a9, 0x56ab,
-  0x56ac, 0x56ad, 0x56b1, 0x56b3, 0x56b7, 0x56be, 0x56c5, 0x56c9,
-  0x56ca, 0x56cb, 0x56cf, 0x56d0, 0x56cc, 0x56cd, 0x56d9, 0x56dc,
-  0x56dd, 0x56df, 0x56e1, 0x56e4, 0x56e5, 0x56e6, 0x56e7, 0x56e8,
-  0x56f1, 0x56eb, 0x56ed, 0x56f6, 0x56f7, 0x5701, 0x5702, 0x5707,
-  0x570a, 0x570c, 0x5711, 0x5715, 0x571a, 0x571b, 0x571d, 0x5720,
-  0x5722, 0x5723, 0x5724, 0x5725, 0x5729, 0x572a, 0x572c, 0x572e,
-  0x572f, 0x5733, 0x5734, 0x573d, 0x573e, 0x573f, 0x5745, 0x5746,
-  0x574c, 0x574d, 0x5752, 0x5762, 0x5765, 0x5767, 0x5768, 0x576b,
-  0x576d, 0x576e, 0x576f, 0x5770, 0x5771, 0x5773, 0x5774, 0x5775,
-  0x5777, 0x5779, 0x577a, 0x577b, 0x577c, 0x577e, 0x5781, 0x5783,
-  0x578c, 0x5794, 0x5797, 0x5799, 0x579a, 0x579c, 0x579d, 0x579e,
-  0x579f, 0x57a1, 0x5795, 0x57a7, 0x57a8, 0x57a9, 0x57ac, 0x57b8,
-  0x57bd, 0x57c7, 0x57c8, 0x57cc, 0x57cf, 0x57d5, 0x57dd, 0x57de,
-  0x57e4, 0x57e6, 0x57e7, 0x57e9, 0x57ed, 0x57f0, 0x57f5, 0x57f6,
-  0x57f8, 0x57fd, 0x57fe, 0x57ff, 0x5803, 0x5804, 0x5808, 0x5809,
-  0x57e1, 0x580c, 0x580d, 0x581b, 0x581e, 0x581f, 0x5820, 0x5826,
-  0x5827, 0x582d, 0x5832, 0x5839, 0x583f, 0x5849, 0x584c, 0x584d,
-  0x584f, 0x5850, 0x5855, 0x585f, 0x5861, 0x5864, 0x5867, 0x5868,
-  0x5878, 0x587c, 0x587f, 0x5880, 0x5881, 0x5887, 0x5888, 0x5889,
-  0x588a, 0x588c, 0x588d, 0x588f, 0x5890, 0x5894, 0x5896, 0x589d,
-  0x58a0, 0x58a1, 0x58a2, 0x58a6, 0x58a9, 0x58b1, 0x58b2, 0x58c4,
-  0x58bc, 0x58c2, 0x58c8, 0x58cd, 0x58ce, 0x58d0, 0x58d2, 0x58d4,
-  0x58d6, 0x58da, 0x58dd, 0x58e1, 0x58e2, 0x58e9, 0x58f3, 0x5905,
-  0x5906, 0x590b, 0x590c, 0x5912, 0x5913, 0x5914, 0x8641, 0x591d,
-  0x5921, 0x5923, 0x5924, 0x5928, 0x592f, 0x5930, 0x5933, 0x5935,
-  0x5936, 0x593f, 0x5943, 0x5946, 0x5952, 0x5953, 0x5959, 0x595b,
-  0x595d, 0x595e, 0x595f, 0x5961, 0x5963, 0x596b, 0x596d, 0x596f,
-  0x5972, 0x5975, 0x5976, 0x5979, 0x597b, 0x597c, 0x598b, 0x598c,
-  0x598e, 0x5992, 0x5995, 0x5997, 0x599f, 0x59a4, 0x59a7, 0x59ad,
-  0x59ae, 0x59af, 0x59b0, 0x59b3, 0x59b7, 0x59ba, 0x59bc, 0x59c1,
-  0x59c3, 0x59c4, 0x59c8, 0x59ca, 0x59cd, 0x59d2, 0x59dd, 0x59de,
-  0x59df, 0x59e3, 0x59e4, 0x59e7, 0x59ee, 0x59ef, 0x59f1, 0x59f2,
-  0x59f4, 0x59f7, 0x5a00, 0x5a04, 0x5a0c, 0x5a0d, 0x5a0e, 0x5a12,
-  0x5a13, 0x5a1e, 0x5a23, 0x5a24, 0x5a27, 0x5a28, 0x5a2a, 0x5a2d,
-  0x5a30, 0x5a44, 0x5a45, 0x5a47, 0x5a48, 0x5a4c, 0x5a50, 0x5a55,
-  0x5a5e, 0x5a63, 0x5a65, 0x5a67, 0x5a6d, 0x5a77, 0x5a7a, 0x5a7b,
-  0x5a7e, 0x5a8b, 0x5a90, 0x5a93, 0x5a96, 0x5a99, 0x5a9c, 0x5a9e,
-  0x5a9f, 0x5aa0, 0x5aa2, 0x5aa7, 0x5aac, 0x5ab1, 0x5ab2, 0x5ab3,
-  0x5ab5, 0x5ab8, 0x5aba, 0x5abb, 0x5abf, 0x5ac4, 0x5ac6, 0x5ac8,
-  0x5acf, 0x5ada, 0x5adc, 0x5ae0, 0x5ae5, 0x5aea, 0x5aee, 0x5af5,
-  0x5af6, 0x5afd, 0x5b00, 0x5b01, 0x5b08, 0x5b17, 0x5b34, 0x5b19,
-  0x5b1b, 0x5b1d, 0x5b21, 0x5b25, 0x5b2d, 0x5b38, 0x5b41, 0x5b4b,
-  0x5b4c, 0x5b52, 0x5b56, 0x5b5e, 0x5b68, 0x5b6e, 0x5b6f, 0x5b7c,
-  0x5b7d, 0x5b7e, 0x5b7f, 0x5b81, 0x5b84, 0x5b86, 0x5b8a, 0x5b8e,
-  0x5b90, 0x5b91, 0x5b93, 0x5b94, 0x5b96, 0x5ba8, 0x5ba9, 0x5bac,
-  0x5bad, 0x5baf, 0x5bb1, 0x5bb2, 0x5bb7, 0x5bba, 0x5bbc, 0x5bc0,
-  0x5bc1, 0x5bcd, 0x5bcf, 0x5bd6, 0x5bd7, 0x5bd8, 0x5bd9, 0x5bda,
-  0x5be0, 0x5bef, 0x5bf1, 0x5bf4, 0x5bfd, 0x5c0c, 0x5c17, 0x5c1e,
-  0x5c1f, 0x5c23, 0x5c26, 0x5c29, 0x5c2b, 0x5c2c, 0x5c2e, 0x5c30,
-  0x5c32, 0x5c35, 0x5c36, 0x5c59, 0x5c5a, 0x5c5c, 0x5c62, 0x5c63,
-  0x5c67, 0x5c68, 0x5c69, 0x5c6d, 0x5c70, 0x5c74, 0x5c75, 0x5c7a,
-  0x5c7b, 0x5c7c, 0x5c7d, 0x5c87, 0x5c88, 0x5c8a, 0x5c8f, 0x5c92,
-  0x5c9d, 0x5c9f, 0x5ca0, 0x5ca2, 0x5ca3, 0x5ca6, 0x5caa, 0x5cb2,
-  0x5cb4, 0x5cb5, 0x5cba, 0x5cc9, 0x5ccb, 0x5cd2, 0x5cdd, 0x5cd7,
-  0x5cee, 0x5cf1, 0x5cf2, 0x5cf4, 0x5d01, 0x5d06, 0x5d0d, 0x5d12,
-  0x5d2b, 0x5d23, 0x5d24, 0x5d26, 0x5d27, 0x5d31, 0x5d34, 0x5d39,
-  0x5d3d, 0x5d3f, 0x5d42, 0x5d43, 0x5d46, 0x5d48, 0x5d55, 0x5d51,
-  0x5d59, 0x5d4a, 0x5d5f, 0x5d60, 0x5d61, 0x5d62, 0x5d64, 0x5d6a,
-  0x5d6d, 0x5d70, 0x5d79, 0x5d7a, 0x5d7e, 0x5d7f, 0x5d81, 0x5d83,
-  0x5d88, 0x5d8a, 0x5d92, 0x5d93, 0x5d94, 0x5d95, 0x5d99, 0x5d9b,
-  0x5d9f, 0x5da0, 0x5da7, 0x5dab, 0x5db0, 0x5db4, 0x5db8, 0x5db9,
-  0x5dc3, 0x5dc7, 0x5dcb, 0x5dd0, 0x5dce, 0x5dd8, 0x5dd9, 0x5de0,
-  0x5de4, 0x5de9, 0x5df8, 0x5df9, 0x5e00, 0x5e07, 0x5e0d, 0x5e12,
-  0x5e14, 0x5e15, 0x5e18, 0x5e1f, 0x5e20, 0x5e2e, 0x5e28, 0x5e32,
-  0x5e35, 0x5e3e, 0x5e4b, 0x5e50, 0x5e49, 0x5e51, 0x5e56, 0x5e58,
-  0x5e5b, 0x5e5c, 0x5e5e, 0x5e68, 0x5e6a, 0x5e6b, 0x5e6c, 0x5e6d,
-  0x5e6e, 0x5e70, 0x5e80, 0x5e8b, 0x5e8e, 0x5ea2, 0x5ea4, 0x5ea5,
-  0x5ea8, 0x5eaa, 0x5eac, 0x5eb1, 0x5eb3, 0x5ebd, 0x5ebe, 0x5ebf,
-  0x5ec6, 0x5ecc, 0x5ecb, 0x5ece, 0x5ed1, 0x5ed2, 0x5ed4, 0x5ed5,
-  0x5edc, 0x5ede, 0x5ee5, 0x5eeb, 0x5f02, 0x5f06, 0x5f07, 0x5f08,
-  0x5f0e, 0x5f19, 0x5f1c, 0x5f1d, 0x5f21, 0x5f22, 0x5f23, 0x5f24,
-  0x5f28, 0x5f2b, 0x5f2c, 0x5f2e, 0x5f30, 0x5f34, 0x5f36, 0x5f3b,
-  0x5f3d, 0x5f3f, 0x5f40, 0x5f44, 0x5f45, 0x5f47, 0x5f4d, 0x5f50,
-  0x5f54, 0x5f58, 0x5f5b, 0x5f60, 0x5f63, 0x5f64, 0x5f67, 0x5f6f,
-  0x5f72, 0x5f74, 0x5f75, 0x5f78, 0x5f7a, 0x5f7d, 0x5f7e, 0x5f89,
-  0x5f8d, 0x5f8f, 0x5f96, 0x5f9c, 0x5f9d, 0x5fa2, 0x5fa7, 0x5fab,
-  0x5fa4, 0x5fac, 0x5faf, 0x5fb0, 0x5fb1, 0x5fb8, 0x5fc4, 0x5fc7,
-  0x5fc8, 0x5fc9, 0x5fcb, 0x5fd0, 0x5fd1, 0x5fd2, 0x5fd3, 0x5fd4,
-  0x5fde, 0x5fe1, 0x5fe2, 0x5fe8, 0x5fe9, 0x5fea, 0x5fec, 0x5fed,
-  0x5fee, 0x5fef, 0x5ff2, 0x5ff3, 0x5ff6, 0x5ffa, 0x5ffc, 0x6007,
-  0x600a, 0x600d, 0x6013, 0x6014, 0x6017, 0x6018, 0x601a, 0x601f,
-  0x6024, 0x602d, 0x6033, 0x6035, 0x6040, 0x6047, 0x6048, 0x6049,
-  0x604c, 0x6051, 0x6054, 0x6056, 0x6057, 0x605d, 0x6061, 0x6067,
-  0x6071, 0x607e, 0x607f, 0x6082, 0x6086, 0x6088, 0x608a, 0x608e,
-  0x6091, 0x6093, 0x6095, 0x6098, 0x609d, 0x609e, 0x60a2, 0x60a4,
-  0x60a5, 0x60a8, 0x60b0, 0x60b1, 0x60b7, 0x60bb, 0x60be, 0x60c2,
-  0x60c4, 0x60c8, 0x60c9, 0x60ca, 0x60cb, 0x60ce, 0x60cf, 0x60d4,
-  0x60d5, 0x60d9, 0x60db, 0x60dd, 0x60de, 0x60e2, 0x60e5, 0x60f2,
-  0x60f5, 0x60f8, 0x60fc, 0x60fd, 0x6102, 0x6107, 0x610a, 0x610c,
-  0x6110, 0x6111, 0x6112, 0x6113, 0x6114, 0x6116, 0x6117, 0x6119,
-  0x611c, 0x611e, 0x6122, 0x612a, 0x612b, 0x6130, 0x6131, 0x6135,
-  0x6136, 0x6137, 0x6139, 0x6141, 0x6145, 0x6146, 0x6149, 0x615e,
-  0x6160, 0x616c, 0x6172, 0x6178, 0x617b, 0x617c, 0x617f, 0x6180,
-  0x6181, 0x6183, 0x6184, 0x618b, 0x618d, 0x6192, 0x6193, 0x6197,
-  0x6198, 0x619c, 0x619d, 0x619f, 0x61a0, 0x61a5, 0x61a8, 0x61aa,
-  0x61ad, 0x61b8, 0x61b9, 0x61bc, 0x61c0, 0x61c1, 0x61c2, 0x61ce,
-  0x61cf, 0x61d5, 0x61dc, 0x61dd, 0x61de, 0x61df, 0x61e1, 0x61e2,
-  0x61e7, 0x61e9, 0x61e5, 0x61ec, 0x61ed, 0x61ef, 0x6201, 0x6203,
-  0x6204, 0x6207, 0x6213, 0x6215, 0x621c, 0x6220, 0x6222, 0x6223,
-  0x6227, 0x6229, 0x622b, 0x6239, 0x623d, 0x6242, 0x6243, 0x6244,
-  0x6246, 0x624c, 0x6250, 0x6251, 0x6252, 0x6254, 0x6256, 0x625a,
-  0x625c, 0x6264, 0x626d, 0x626f, 0x6273, 0x627a, 0x627d, 0x628d,
-  0x628e, 0x628f, 0x6290, 0x62a6, 0x62a8, 0x62b3, 0x62b6, 0x62b7,
-  0x62ba, 0x62be, 0x62bf, 0x62c4, 0x62ce, 0x62d5, 0x62d6, 0x62da,
-  0x62ea, 0x62f2, 0x62f4, 0x62fc, 0x62fd, 0x6303, 0x6304, 0x630a,
-  0x630b, 0x630d, 0x6310, 0x6313, 0x6316, 0x6318, 0x6329, 0x632a,
-  0x632d, 0x6335, 0x6336, 0x6339, 0x633c, 0x6341, 0x6342, 0x6343,
-  0x6344, 0x6346, 0x634a, 0x634b, 0x634e, 0x6352, 0x6353, 0x6354,
-  0x6358, 0x635b, 0x6365, 0x6366, 0x636c, 0x636d, 0x6371, 0x6374,
-  0x6375, 0x6378, 0x637c, 0x637d, 0x637f, 0x6382, 0x6384, 0x6387,
-  0x638a, 0x6390, 0x6394, 0x6395, 0x6399, 0x639a, 0x639e, 0x63a4,
-  0x63a6, 0x63ad, 0x63ae, 0x63af, 0x63bd, 0x63c1, 0x63c5, 0x63c8,
-  0x63ce, 0x63d1, 0x63d3, 0x63d4, 0x63d5, 0x63dc, 0x63e0, 0x63e5,
-  0x63ea, 0x63ec, 0x63f2, 0x63f3, 0x63f5, 0x63f8, 0x63f9, 0x6409,
-  0x640a, 0x6410, 0x6412, 0x6414, 0x6418, 0x641e, 0x6420, 0x6422,
-  0x6424, 0x6425, 0x6429, 0x642a, 0x642f, 0x6430, 0x6435, 0x643d,
-  0x643f, 0x644b, 0x644f, 0x6451, 0x6452, 0x6453, 0x6454, 0x645a,
-  0x645b, 0x645c, 0x645d, 0x645f, 0x6460, 0x6461, 0x6463, 0x646d,
-  0x6473, 0x6474, 0x647b, 0x647d, 0x6485, 0x6487, 0x648f, 0x6490,
-  0x6491, 0x6498, 0x6499, 0x649b, 0x649d, 0x649f, 0x64a1, 0x64a3,
-  0x64a6, 0x64a8, 0x64ac, 0x64b3, 0x64bd, 0x64be, 0x64bf, 0x64c4,
-  0x64c9, 0x64ca, 0x64cb, 0x64cc, 0x64ce, 0x64d0, 0x64d1, 0x64d5,
-  0x64d7, 0x64e4, 0x64e5, 0x64e9, 0x64ea, 0x64ed, 0x64f0, 0x64f5,
-  0x64f7, 0x64fb, 0x64ff, 0x6501, 0x6504, 0x6508, 0x6509, 0x650a,
-  0x650f, 0x6513, 0x6514, 0x6516, 0x6519, 0x651b, 0x651e, 0x651f,
-  0x6522, 0x6526, 0x6529, 0x652e, 0x6531, 0x653a, 0x653c, 0x653d,
-  0x6543, 0x6547, 0x6549, 0x6550, 0x6552, 0x6554, 0x655f, 0x6560,
-  0x6567, 0x656b, 0x657a, 0x657d, 0x6581, 0x6585, 0x658a, 0x6592,
-  0x6595, 0x6598, 0x659d, 0x65a0, 0x65a3, 0x65a6, 0x65ae, 0x65b2,
-  0x65b3, 0x65b4, 0x65bf, 0x65c2, 0x65c8, 0x65c9, 0x65ce, 0x65d0,
-  0x65d4, 0x65d6, 0x65d8, 0x65df, 0x65f0, 0x65f2, 0x65f4, 0x65f5,
-  0x65f9, 0x65fe, 0x65ff, 0x6600, 0x6604, 0x6608, 0x6609, 0x660d,
-  0x6611, 0x6612, 0x6615, 0x6616, 0x661d, 0x661e, 0x6621, 0x6622,
-  0x6623, 0x6624, 0x6626, 0x6629, 0x662a, 0x662b, 0x662c, 0x662e,
-  0x6630, 0x6631, 0x6633, 0x6639, 0x6637, 0x6640, 0x6645, 0x6646,
-  0x664a, 0x664c, 0x6651, 0x664e, 0x6657, 0x6658, 0x6659, 0x665b,
-  0x665c, 0x6660, 0x6661, 0x66fb, 0x666a, 0x666b, 0x666c, 0x667e,
-  0x6673, 0x6675, 0x667f, 0x6677, 0x6678, 0x6679, 0x667b, 0x6680,
-  0x667c, 0x668b, 0x668c, 0x668d, 0x6690, 0x6692, 0x6699, 0x669a,
-  0x669b, 0x669c, 0x669f, 0x66a0, 0x66a4, 0x66ad, 0x66b1, 0x66b2,
-  0x66b5, 0x66bb, 0x66bf, 0x66c0, 0x66c2, 0x66c3, 0x66c8, 0x66cc,
-  0x66ce, 0x66cf, 0x66d4, 0x66db, 0x66df, 0x66e8, 0x66eb, 0x66ec,
-  0x66ee, 0x66fa, 0x6705, 0x6707, 0x670e, 0x6713, 0x6719, 0x671c,
-  0x6720, 0x6722, 0x6733, 0x673e, 0x6745, 0x6747, 0x6748, 0x674c,
-  0x6754, 0x6755, 0x675d, 0x6766, 0x676c, 0x676e, 0x6774, 0x6776,
-  0x677b, 0x6781, 0x6784, 0x678e, 0x678f, 0x6791, 0x6793, 0x6796,
-  0x6798, 0x6799, 0x679b, 0x67b0, 0x67b1, 0x67b2, 0x67b5, 0x67bb,
-  0x67bc, 0x67bd, 0x67f9, 0x67c0, 0x67c2, 0x67c3, 0x67c5, 0x67c8,
-  0x67c9, 0x67d2, 0x67d7, 0x67d9, 0x67dc, 0x67e1, 0x67e6, 0x67f0,
-  0x67f2, 0x67f6, 0x67f7, 0x6852, 0x6814, 0x6819, 0x681d, 0x681f,
-  0x6828, 0x6827, 0x682c, 0x682d, 0x682f, 0x6830, 0x6831, 0x6833,
-  0x683b, 0x683f, 0x6844, 0x6845, 0x684a, 0x684c, 0x6855, 0x6857,
-  0x6858, 0x685b, 0x686b, 0x686e, 0x686f, 0x6870, 0x6871, 0x6872,
-  0x6875, 0x6879, 0x687a, 0x687b, 0x687c, 0x6882, 0x6884, 0x6886,
-  0x6888, 0x6896, 0x6898, 0x689a, 0x689c, 0x68a1, 0x68a3, 0x68a5,
-  0x68a9, 0x68aa, 0x68ae, 0x68b2, 0x68bb, 0x68c5, 0x68c8, 0x68cc,
-  0x68cf, 0x68d0, 0x68d1, 0x68d3, 0x68d6, 0x68d9, 0x68dc, 0x68dd,
-  0x68e5, 0x68e8, 0x68ea, 0x68eb, 0x68ec, 0x68ed, 0x68f0, 0x68f1,
-  0x68f5, 0x68f6, 0x68fb, 0x68fc, 0x68fd, 0x6906, 0x6909, 0x690a,
-  0x6910, 0x6911, 0x6913, 0x6916, 0x6917, 0x6931, 0x6933, 0x6935,
-  0x6938, 0x693b, 0x6942, 0x6945, 0x6949, 0x694e, 0x6957, 0x695b,
-  0x6963, 0x6964, 0x6965, 0x6966, 0x6968, 0x6969, 0x696c, 0x6970,
-  0x6971, 0x6972, 0x697a, 0x697b, 0x697f, 0x6980, 0x698d, 0x6992,
-  0x6996, 0x6998, 0x69a1, 0x69a5, 0x69a6, 0x69a8, 0x69ab, 0x69ad,
-  0x69af, 0x69b7, 0x69b8, 0x69ba, 0x69bc, 0x69c5, 0x69c8, 0x69d1,
-  0x69d6, 0x69d7, 0x69e2, 0x69e5, 0x69ee, 0x69ef, 0x69f1, 0x69f3,
-  0x69f5, 0x69fe, 0x6a00, 0x6a01, 0x6a03, 0x6a0f, 0x6a11, 0x6a15,
-  0x6a1a, 0x6a1d, 0x6a20, 0x6a24, 0x6a28, 0x6a30, 0x6a32, 0x6a34,
-  0x6a37, 0x6a3b, 0x6a3e, 0x6a3f, 0x6a45, 0x6a46, 0x6a49, 0x6a4a,
-  0x6a4e, 0x6a50, 0x6a51, 0x6a52, 0x6a55, 0x6a56, 0x6a5b, 0x6a64,
-  0x6a67, 0x6a6a, 0x6a71, 0x6a73, 0x6a7e, 0x6a81, 0x6a83, 0x6a86,
-  0x6a87, 0x6a89, 0x6a8b, 0x6a91, 0x6a9b, 0x6a9d, 0x6a9e, 0x6a9f,
-  0x6aa5, 0x6aab, 0x6aaf, 0x6ab0, 0x6ab1, 0x6ab4, 0x6abd, 0x6abe,
-  0x6abf, 0x6ac6, 0x6ac9, 0x6ac8, 0x6acc, 0x6ad0, 0x6ad4, 0x6ad5,
-  0x6ad6, 0x6adc, 0x6add, 0x6ae4, 0x6ae7, 0x6aec, 0x6af0, 0x6af1,
-  0x6af2, 0x6afc, 0x6afd, 0x6b02, 0x6b03, 0x6b06, 0x6b07, 0x6b09,
-  0x6b0f, 0x6b10, 0x6b11, 0x6b17, 0x6b1b, 0x6b1e, 0x6b24, 0x6b28,
-  0x6b2b, 0x6b2c, 0x6b2f, 0x6b35, 0x6b36, 0x6b3b, 0x6b3f, 0x6b46,
-  0x6b4a, 0x6b4d, 0x6b52, 0x6b56, 0x6b58, 0x6b5d, 0x6b60, 0x6b67,
-  0x6b6b, 0x6b6e, 0x6b70, 0x6b75, 0x6b7d, 0x6b7e, 0x6b82, 0x6b85,
-  0x6b97, 0x6b9b, 0x6b9f, 0x6ba0, 0x6ba2, 0x6ba3, 0x6ba8, 0x6ba9,
-  0x6bac, 0x6bad, 0x6bae, 0x6bb0, 0x6bb8, 0x6bb9, 0x6bbd, 0x6bbe,
-  0x6bc3, 0x6bc4, 0x6bc9, 0x6bcc, 0x6bd6, 0x6bda, 0x6be1, 0x6be3,
-  0x6be6, 0x6be7, 0x6bee, 0x6bf1, 0x6bf7, 0x6bf9, 0x6bff, 0x6c02,
-  0x6c04, 0x6c05, 0x6c09, 0x6c0d, 0x6c0e, 0x6c10, 0x6c12, 0x6c19,
-  0x6c1f, 0x6c26, 0x6c27, 0x6c28, 0x6c2c, 0x6c2e, 0x6c33, 0x6c35,
-  0x6c36, 0x6c3a, 0x6c3b, 0x6c3f, 0x6c4a, 0x6c4b, 0x6c4d, 0x6c4f,
-  0x6c52, 0x6c54, 0x6c59, 0x6c5b, 0x6c5c, 0x6c6b, 0x6c6d, 0x6c6f,
-  0x6c74, 0x6c76, 0x6c78, 0x6c79, 0x6c7b, 0x6c85, 0x6c86, 0x6c87,
-  0x6c89, 0x6c94, 0x6c95, 0x6c97, 0x6c98, 0x6c9c, 0x6c9f, 0x6cb0,
-  0x6cb2, 0x6cb4, 0x6cc2, 0x6cc6, 0x6ccd, 0x6ccf, 0x6cd0, 0x6cd1,
-  0x6cd2, 0x6cd4, 0x6cd6, 0x6cda, 0x6cdc, 0x6ce0, 0x6ce7, 0x6ce9,
-  0x6ceb, 0x6cec, 0x6cee, 0x6cf2, 0x6cf4, 0x6d04, 0x6d07, 0x6d0a,
-  0x6d0e, 0x6d0f, 0x6d11, 0x6d13, 0x6d1a, 0x6d26, 0x6d27, 0x6d28,
-  0x6c67, 0x6d2e, 0x6d2f, 0x6d31, 0x6d39, 0x6d3c, 0x6d3f, 0x6d57,
-  0x6d5e, 0x6d5f, 0x6d61, 0x6d65, 0x6d67, 0x6d6f, 0x6d70, 0x6d7c,
-  0x6d82, 0x6d87, 0x6d91, 0x6d92, 0x6d94, 0x6d96, 0x6d97, 0x6d98,
-  0x6daa, 0x6dac, 0x6db4, 0x6db7, 0x6db9, 0x6dbd, 0x6dbf, 0x6dc4,
-  0x6dc8, 0x6dca, 0x6dce, 0x6dcf, 0x6dd6, 0x6ddb, 0x6ddd, 0x6ddf,
-  0x6de0, 0x6de2, 0x6de5, 0x6de9, 0x6def, 0x6df0, 0x6df4, 0x6df6,
-  0x6dfc, 0x6e00, 0x6e04, 0x6e1e, 0x6e22, 0x6e27, 0x6e32, 0x6e36,
-  0x6e39, 0x6e3b, 0x6e3c, 0x6e44, 0x6e45, 0x6e48, 0x6e49, 0x6e4b,
-  0x6e4f, 0x6e51, 0x6e52, 0x6e53, 0x6e54, 0x6e57, 0x6e5c, 0x6e5d,
-  0x6e5e, 0x6e62, 0x6e63, 0x6e68, 0x6e73, 0x6e7b, 0x6e7d, 0x6e8d,
-  0x6e93, 0x6e99, 0x6ea0, 0x6ea7, 0x6ead, 0x6eae, 0x6eb1, 0x6eb3,
-  0x6ebb, 0x6ebf, 0x6ec0, 0x6ec1, 0x6ec3, 0x6ec7, 0x6ec8, 0x6eca,
-  0x6ecd, 0x6ece, 0x6ecf, 0x6eeb, 0x6eed, 0x6eee, 0x6ef9, 0x6efb,
-  0x6efd, 0x6f04, 0x6f08, 0x6f0a, 0x6f0c, 0x6f0d, 0x6f16, 0x6f18,
-  0x6f1a, 0x6f1b, 0x6f26, 0x6f29, 0x6f2a, 0x6f2f, 0x6f30, 0x6f33,
-  0x6f36, 0x6f3b, 0x6f3c, 0x6f2d, 0x6f4f, 0x6f51, 0x6f52, 0x6f53,
-  0x6f57, 0x6f59, 0x6f5a, 0x6f5d, 0x6f5e, 0x6f61, 0x6f62, 0x6f68,
-  0x6f6c, 0x6f7d, 0x6f7e, 0x6f83, 0x6f87, 0x6f88, 0x6f8b, 0x6f8c,
-  0x6f8d, 0x6f90, 0x6f92, 0x6f93, 0x6f94, 0x6f96, 0x6f9a, 0x6f9f,
-  0x6fa0, 0x6fa5, 0x6fa6, 0x6fa7, 0x6fa8, 0x6fae, 0x6faf, 0x6fb0,
-  0x6fb5, 0x6fb6, 0x6fbc, 0x6fc5, 0x6fc7, 0x6fc8, 0x6fca, 0x6fda,
-  0x6fde, 0x6fe8, 0x6fe9, 0x6ff0, 0x6ff5, 0x6ff9, 0x6ffc, 0x6ffd,
-  0x7000, 0x7005, 0x7006, 0x7007, 0x700d, 0x7017, 0x7020, 0x7023,
-  0x702f, 0x7034, 0x7037, 0x7039, 0x703c, 0x7043, 0x7044, 0x7048,
-  0x7049, 0x704a, 0x704b, 0x7054, 0x7055, 0x705d, 0x705e, 0x704e,
-  0x7064, 0x7065, 0x706c, 0x706e, 0x7075, 0x7076, 0x707e, 0x7081,
-  0x7085, 0x7086, 0x7094, 0x7095, 0x7096, 0x7097, 0x7098, 0x709b,
-  0x70a4, 0x70ab, 0x70b0, 0x70b1, 0x70b4, 0x70b7, 0x70ca, 0x70d1,
-  0x70d3, 0x70d4, 0x70d5, 0x70d6, 0x70d8, 0x70dc, 0x70e4, 0x70fa,
-  0x7103, 0x7104, 0x7105, 0x7106, 0x7107, 0x710b, 0x710c, 0x710f,
-  0x711e, 0x7120, 0x712b, 0x712d, 0x712f, 0x7130, 0x7131, 0x7138,
-  0x7141, 0x7145, 0x7146, 0x7147, 0x714a, 0x714b, 0x7150, 0x7152,
-  0x7157, 0x715a, 0x715c, 0x715e, 0x7160, 0x7168, 0x7179, 0x7180,
-  0x7185, 0x7187, 0x718c, 0x7192, 0x719a, 0x719b, 0x71a0, 0x71a2,
-  0x71af, 0x71b0, 0x71b2, 0x71b3, 0x71ba, 0x71bf, 0x71c0, 0x71c1,
-  0x71c4, 0x71cb, 0x71cc, 0x71d3, 0x71d6, 0x71d9, 0x71da, 0x71dc,
-  0x71f8, 0x71fe, 0x7200, 0x7207, 0x7208, 0x7209, 0x7213, 0x7217,
-  0x721a, 0x721d, 0x721f, 0x7224, 0x722b, 0x722f, 0x7234, 0x7238,
-  0x7239, 0x7241, 0x7242, 0x7243, 0x7245, 0x724e, 0x724f, 0x7250,
-  0x7253, 0x7255, 0x7256, 0x725a, 0x725c, 0x725e, 0x7260, 0x7263,
-  0x7268, 0x726b, 0x726e, 0x726f, 0x7271, 0x7277, 0x7278, 0x727b,
-  0x727c, 0x727f, 0x7284, 0x7289, 0x728d, 0x728e, 0x7293, 0x729b,
-  0x72a8, 0x72ad, 0x72ae, 0x72b1, 0x72b4, 0x72be, 0x72c1, 0x72c7,
-  0x72c9, 0x72cc, 0x72d5, 0x72d6, 0x72d8, 0x72df, 0x72e5, 0x72f3,
-  0x72f4, 0x72fa, 0x72fb, 0x72fe, 0x7302, 0x7304, 0x7305, 0x7307,
-  0x730b, 0x730d, 0x7312, 0x7313, 0x7318, 0x7319, 0x731e, 0x7322,
-  0x7324, 0x7327, 0x7328, 0x732c, 0x7331, 0x7332, 0x7335, 0x733a,
-  0x733b, 0x733d, 0x7343, 0x734d, 0x7350, 0x7352, 0x7356, 0x7358,
-  0x735d, 0x735e, 0x735f, 0x7360, 0x7366, 0x7367, 0x7369, 0x736b,
-  0x736c, 0x736e, 0x736f, 0x7371, 0x7377, 0x7379, 0x737c, 0x7380,
-  0x7381, 0x7383, 0x7385, 0x7386, 0x738e, 0x7390, 0x7393, 0x7395,
-  0x7397, 0x7398, 0x739c, 0x739e, 0x739f, 0x73a0, 0x73a2, 0x73a5,
-  0x73a6, 0x73aa, 0x73ab, 0x73ad, 0x73b5, 0x73b7, 0x73b9, 0x73bc,
-  0x73bd, 0x73bf, 0x73c5, 0x73c6, 0x73c9, 0x73cb, 0x73cc, 0x73cf,
-  0x73d2, 0x73d3, 0x73d6, 0x73d9, 0x73dd, 0x73e1, 0x73e3, 0x73e6,
-  0x73e7, 0x73e9, 0x73f4, 0x73f5, 0x73f7, 0x73f9, 0x73fa, 0x73fb,
-  0x73fd, 0x73ff, 0x7400, 0x7401, 0x7404, 0x7407, 0x740a, 0x7411,
-  0x741a, 0x741b, 0x7424, 0x7426, 0x7428, 0x7429, 0x742a, 0x742b,
-  0x742c, 0x742d, 0x742e, 0x742f, 0x7430, 0x7431, 0x7439, 0x7440,
-  0x7443, 0x7444, 0x7446, 0x7447, 0x744b, 0x744d, 0x7451, 0x7452,
-  0x7457, 0x745d, 0x7462, 0x7466, 0x7467, 0x7468, 0x746b, 0x746d,
-  0x746e, 0x7471, 0x7472, 0x7480, 0x7481, 0x7485, 0x7486, 0x7487,
-  0x7489, 0x748f, 0x7490, 0x7491, 0x7492, 0x7498, 0x7499, 0x749a,
-  0x749c, 0x749f, 0x74a0, 0x74a1, 0x74a3, 0x74a6, 0x74a8, 0x74a9,
-  0x74aa, 0x74ab, 0x74ae, 0x74af, 0x74b1, 0x74b2, 0x74b5, 0x74b9,
-  0x74bb, 0x74bf, 0x74c8, 0x74c9, 0x74cc, 0x74d0, 0x74d3, 0x74d8,
-  0x74da, 0x74db, 0x74de, 0x74df, 0x74e4, 0x74e8, 0x74ea, 0x74eb,
-  0x74ef, 0x74f4, 0x74fa, 0x74fb, 0x74fc, 0x74ff, 0x7506, 0x7512,
-  0x7516, 0x7517, 0x7520, 0x7521, 0x7524, 0x7527, 0x7529, 0x752a,
-  0x752f, 0x7536, 0x7539, 0x753d, 0x753e, 0x753f, 0x7540, 0x7543,
-  0x7547, 0x7548, 0x754e, 0x7550, 0x7552, 0x7557, 0x755e, 0x755f,
-  0x7561, 0x756f, 0x7571, 0x7579, 0x757a, 0x757b, 0x757c, 0x757d,
-  0x757e, 0x7581, 0x7585, 0x7590, 0x7592, 0x7593, 0x7595, 0x7599,
-  0x759c, 0x75a2, 0x75a4, 0x75b4, 0x75ba, 0x75bf, 0x75c0, 0x75c1,
-  0x75c4, 0x75c6, 0x75cc, 0x75ce, 0x75cf, 0x75d7, 0x75dc, 0x75df,
-  0x75e0, 0x75e1, 0x75e4, 0x75e7, 0x75ec, 0x75ee, 0x75ef, 0x75f1,
-  0x75f9, 0x7600, 0x7602, 0x7603, 0x7604, 0x7607, 0x7608, 0x760a,
-  0x760c, 0x760f, 0x7612, 0x7613, 0x7615, 0x7616, 0x7619, 0x761b,
-  0x761c, 0x761d, 0x761e, 0x7623, 0x7625, 0x7626, 0x7629, 0x762d,
-  0x7632, 0x7633, 0x7635, 0x7638, 0x7639, 0x763a, 0x763c, 0x764a,
-  0x7640, 0x7641, 0x7643, 0x7644, 0x7645, 0x7649, 0x764b, 0x7655,
-  0x7659, 0x765f, 0x7664, 0x7665, 0x766d, 0x766e, 0x766f, 0x7671,
-  0x7674, 0x7681, 0x7685, 0x768c, 0x768d, 0x7695, 0x769b, 0x769c,
-  0x769d, 0x769f, 0x76a0, 0x76a2, 0x76a3, 0x76a4, 0x76a5, 0x76a6,
-  0x76a7, 0x76a8, 0x76aa, 0x76ad, 0x76bd, 0x76c1, 0x76c5, 0x76c9,
-  0x76cb, 0x76cc, 0x76ce, 0x76d4, 0x76d9, 0x76e0, 0x76e6, 0x76e8,
-  0x76ec, 0x76f0, 0x76f1, 0x76f6, 0x76f9, 0x76fc, 0x7700, 0x7706,
-  0x770a, 0x770e, 0x7712, 0x7714, 0x7715, 0x7717, 0x7719, 0x771a,
-  0x771c, 0x7722, 0x7728, 0x772d, 0x772e, 0x772f, 0x7734, 0x7735,
-  0x7736, 0x7739, 0x773d, 0x773e, 0x7742, 0x7745, 0x7746, 0x774a,
-  0x774d, 0x774e, 0x774f, 0x7752, 0x7756, 0x7757, 0x775c, 0x775e,
-  0x775f, 0x7760, 0x7762, 0x7764, 0x7767, 0x776a, 0x776c, 0x7770,
-  0x7772, 0x7773, 0x7774, 0x777a, 0x777d, 0x7780, 0x7784, 0x778c,
-  0x778d, 0x7794, 0x7795, 0x7796, 0x779a, 0x779f, 0x77a2, 0x77a7,
-  0x77aa, 0x77ae, 0x77af, 0x77b1, 0x77b5, 0x77be, 0x77c3, 0x77c9,
-  0x77d1, 0x77d2, 0x77d5, 0x77d9, 0x77de, 0x77df, 0x77e0, 0x77e4,
-  0x77e6, 0x77ea, 0x77ec, 0x77f0, 0x77f1, 0x77f4, 0x77f8, 0x77fb,
-  0x7805, 0x7806, 0x7809, 0x780d, 0x780e, 0x7811, 0x781d, 0x7821,
-  0x7822, 0x7823, 0x782d, 0x782e, 0x7830, 0x7835, 0x7837, 0x7843,
-  0x7844, 0x7847, 0x7848, 0x784c, 0x784e, 0x7852, 0x785c, 0x785e,
-  0x7860, 0x7861, 0x7863, 0x7864, 0x7868, 0x786a, 0x786e, 0x787a,
-  0x787e, 0x788a, 0x788f, 0x7894, 0x7898, 0x78a1, 0x789d, 0x789e,
-  0x789f, 0x78a4, 0x78a8, 0x78ac, 0x78ad, 0x78b0, 0x78b1, 0x78b2,
-  0x78b3, 0x78bb, 0x78bd, 0x78bf, 0x78c7, 0x78c8, 0x78c9, 0x78cc,
-  0x78ce, 0x78d2, 0x78d3, 0x78d5, 0x78d6, 0x78e4, 0x78db, 0x78df,
-  0x78e0, 0x78e1, 0x78e6, 0x78ea, 0x78f2, 0x78f3, 0x7900, 0x78f6,
-  0x78f7, 0x78fa, 0x78fb, 0x78ff, 0x7906, 0x790c, 0x7910, 0x791a,
-  0x791c, 0x791e, 0x791f, 0x7920, 0x7925, 0x7927, 0x7929, 0x792d,
-  0x7931, 0x7934, 0x7935, 0x793b, 0x793d, 0x793f, 0x7944, 0x7945,
-  0x7946, 0x794a, 0x794b, 0x794f, 0x7951, 0x7954, 0x7958, 0x795b,
-  0x795c, 0x7967, 0x7969, 0x796b, 0x7972, 0x7979, 0x797b, 0x797c,
-  0x797e, 0x798b, 0x798c, 0x7991, 0x7993, 0x7994, 0x7995, 0x7996,
-  0x7998, 0x799b, 0x799c, 0x79a1, 0x79a8, 0x79a9, 0x79ab, 0x79af,
-  0x79b1, 0x79b4, 0x79b8, 0x79bb, 0x79c2, 0x79c4, 0x79c7, 0x79c8,
-  0x79ca, 0x79cf, 0x79d4, 0x79d6, 0x79da, 0x79dd, 0x79de, 0x79e0,
-  0x79e2, 0x79e5, 0x79ea, 0x79eb, 0x79ed, 0x79f1, 0x79f8, 0x79fc,
-  0x7a02, 0x7a03, 0x7a07, 0x7a09, 0x7a0a, 0x7a0c, 0x7a11, 0x7a15,
-  0x7a1b, 0x7a1e, 0x7a21, 0x7a27, 0x7a2b, 0x7a2d, 0x7a2f, 0x7a30,
-  0x7a34, 0x7a35, 0x7a38, 0x7a39, 0x7a3a, 0x7a44, 0x7a45, 0x7a47,
-  0x7a48, 0x7a4c, 0x7a55, 0x7a56, 0x7a59, 0x7a5c, 0x7a5d, 0x7a5f,
-  0x7a60, 0x7a65, 0x7a67, 0x7a6a, 0x7a6d, 0x7a75, 0x7a78, 0x7a7e,
-  0x7a80, 0x7a82, 0x7a85, 0x7a86, 0x7a8a, 0x7a8b, 0x7a90, 0x7a91,
-  0x7a94, 0x7a9e, 0x7aa0, 0x7aa3, 0x7aac, 0x7ab3, 0x7ab5, 0x7ab9,
-  0x7abb, 0x7abc, 0x7ac6, 0x7ac9, 0x7acc, 0x7ace, 0x7ad1, 0x7adb,
-  0x7ae8, 0x7ae9, 0x7aeb, 0x7aec, 0x7af1, 0x7af4, 0x7afb, 0x7afd,
-  0x7afe, 0x7b07, 0x7b14, 0x7b1f, 0x7b23, 0x7b27, 0x7b29, 0x7b2a,
-  0x7b2b, 0x7b2d, 0x7b2e, 0x7b2f, 0x7b30, 0x7b31, 0x7b34, 0x7b3d,
-  0x7b3f, 0x7b40, 0x7b41, 0x7b47, 0x7b4e, 0x7b55, 0x7b60, 0x7b64,
-  0x7b66, 0x7b69, 0x7b6a, 0x7b6d, 0x7b6f, 0x7b72, 0x7b73, 0x7b77,
-  0x7b84, 0x7b89, 0x7b8e, 0x7b90, 0x7b91, 0x7b96, 0x7b9b, 0x7b9e,
-  0x7ba0, 0x7ba5, 0x7bac, 0x7baf, 0x7bb0, 0x7bb2, 0x7bb5, 0x7bb6,
-  0x7bba, 0x7bbb, 0x7bbc, 0x7bbd, 0x7bc2, 0x7bc5, 0x7bc8, 0x7bca,
-  0x7bd4, 0x7bd6, 0x7bd7, 0x7bd9, 0x7bda, 0x7bdb, 0x7be8, 0x7bea,
-  0x7bf2, 0x7bf4, 0x7bf5, 0x7bf8, 0x7bf9, 0x7bfa, 0x7bfc, 0x7bfe,
-  0x7c01, 0x7c02, 0x7c03, 0x7c04, 0x7c06, 0x7c09, 0x7c0b, 0x7c0c,
-  0x7c0e, 0x7c0f, 0x7c19, 0x7c1b, 0x7c20, 0x7c25, 0x7c26, 0x7c28,
-  0x7c2c, 0x7c31, 0x7c33, 0x7c34, 0x7c36, 0x7c39, 0x7c3a, 0x7c46,
-  0x7c4a, 0x7c55, 0x7c51, 0x7c52, 0x7c53, 0x7c59, 0x7c5a, 0x7c5b,
-  0x7c5c, 0x7c5d, 0x7c5e, 0x7c61, 0x7c63, 0x7c67, 0x7c69, 0x7c6d,
-  0x7c6e, 0x7c70, 0x7c72, 0x7c79, 0x7c7c, 0x7c7d, 0x7c86, 0x7c87,
-  0x7c8f, 0x7c94, 0x7c9e, 0x7ca0, 0x7ca6, 0x7cb0, 0x7cb6, 0x7cb7,
-  0x7cba, 0x7cbb, 0x7cbc, 0x7cbf, 0x7cc4, 0x7cc7, 0x7cc8, 0x7cc9,
-  0x7ccd, 0x7ccf, 0x7cd3, 0x7cd4, 0x7cd5, 0x7cd7, 0x7cd9, 0x7cda,
-  0x7cdd, 0x7ce6, 0x7ce9, 0x7ceb, 0x7cf5, 0x7d03, 0x7d07, 0x7d08,
-  0x7d09, 0x7d0f, 0x7d11, 0x7d12, 0x7d13, 0x7d16, 0x7d1d, 0x7d1e,
-  0x7d23, 0x7d26, 0x7d2a, 0x7d2d, 0x7d31, 0x7d3c, 0x7d3d, 0x7d3e,
-  0x7d40, 0x7d41, 0x7d47, 0x7d48, 0x7d4d, 0x7d51, 0x7d53, 0x7d57,
-  0x7d59, 0x7d5a, 0x7d5c, 0x7d5d, 0x7d65, 0x7d67, 0x7d6a, 0x7d70,
-  0x7d78, 0x7d7a, 0x7d7b, 0x7d7f, 0x7d81, 0x7d82, 0x7d83, 0x7d85,
-  0x7d86, 0x7d88, 0x7d8b, 0x7d8c, 0x7d8d, 0x7d91, 0x7d96, 0x7d97,
-  0x7d9d, 0x7d9e, 0x7da6, 0x7da7, 0x7daa, 0x7db3, 0x7db6, 0x7db7,
-  0x7db9, 0x7dc2, 0x7dc3, 0x7dc4, 0x7dc5, 0x7dc6, 0x7dcc, 0x7dcd,
-  0x7dce, 0x7dd7, 0x7dd9, 0x7e00, 0x7de2, 0x7de5, 0x7de6, 0x7dea,
-  0x7deb, 0x7ded, 0x7df1, 0x7df5, 0x7df6, 0x7df9, 0x7dfa, 0x7e08,
-  0x7e10, 0x7e11, 0x7e15, 0x7e17, 0x7e1c, 0x7e1d, 0x7e20, 0x7e27,
-  0x7e28, 0x7e2c, 0x7e2d, 0x7e2f, 0x7e33, 0x7e36, 0x7e3f, 0x7e44,
-  0x7e45, 0x7e47, 0x7e4e, 0x7e50, 0x7e52, 0x7e58, 0x7e5f, 0x7e61,
-  0x7e62, 0x7e65, 0x7e6b, 0x7e6e, 0x7e6f, 0x7e73, 0x7e78, 0x7e7e,
-  0x7e81, 0x7e86, 0x7e87, 0x7e8a, 0x7e8d, 0x7e91, 0x7e95, 0x7e98,
-  0x7e9a, 0x7e9d, 0x7e9e, 0x7f3c, 0x7f3b, 0x7f3d, 0x7f3e, 0x7f3f,
-  0x7f43, 0x7f44, 0x7f47, 0x7f4f, 0x7f52, 0x7f53, 0x7f5b, 0x7f5c,
-  0x7f5d, 0x7f61, 0x7f63, 0x7f64, 0x7f65, 0x7f66, 0x7f6d, 0x7f71,
-  0x7f7d, 0x7f7e, 0x7f7f, 0x7f80, 0x7f8b, 0x7f8d, 0x7f8f, 0x7f90,
-  0x7f91, 0x7f96, 0x7f97, 0x7f9c, 0x7fa1, 0x7fa2, 0x7fa6, 0x7faa,
-  0x7fad, 0x7fb4, 0x7fbc, 0x7fbf, 0x7fc0, 0x7fc3, 0x7fc8, 0x7fce,
-  0x7fcf, 0x7fdb, 0x7fdf, 0x7fe3, 0x7fe5, 0x7fe8, 0x7fec, 0x7fee,
-  0x7fef, 0x7ff2, 0x7ffa, 0x7ffd, 0x7ffe, 0x7fff, 0x8007, 0x8008,
-  0x800a, 0x800d, 0x800e, 0x800f, 0x8011, 0x8013, 0x8014, 0x8016,
-  0x801d, 0x801e, 0x801f, 0x8020, 0x8024, 0x8026, 0x802c, 0x802e,
-  0x8030, 0x8034, 0x8035, 0x8037, 0x8039, 0x803a, 0x803c, 0x803e,
-  0x8040, 0x8044, 0x8060, 0x8064, 0x8066, 0x806d, 0x8071, 0x8075,
-  0x8081, 0x8088, 0x808e, 0x809c, 0x809e, 0x80a6, 0x80a7, 0x80ab,
-  0x80b8, 0x80b9, 0x80c8, 0x80cd, 0x80cf, 0x80d2, 0x80d4, 0x80d5,
-  0x80d7, 0x80d8, 0x80e0, 0x80ed, 0x80ee, 0x80f0, 0x80f2, 0x80f3,
-  0x80f6, 0x80f9, 0x80fa, 0x80fe, 0x8103, 0x810b, 0x8116, 0x8117,
-  0x8118, 0x811c, 0x811e, 0x8120, 0x8124, 0x8127, 0x812c, 0x8130,
-  0x8135, 0x813a, 0x813c, 0x8145, 0x8147, 0x814a, 0x814c, 0x8152,
-  0x8157, 0x8160, 0x8161, 0x8167, 0x8168, 0x8169, 0x816d, 0x816f,
-  0x8177, 0x8181, 0x8190, 0x8184, 0x8185, 0x8186, 0x818b, 0x818e,
-  0x8196, 0x8198, 0x819b, 0x819e, 0x81a2, 0x81ae, 0x81b2, 0x81b4,
-  0x81bb, 0x81cb, 0x81c3, 0x81c5, 0x81ca, 0x81ce, 0x81cf, 0x81d5,
-  0x81d7, 0x81db, 0x81dd, 0x81de, 0x81e1, 0x81e4, 0x81eb, 0x81ec,
-  0x81f0, 0x81f1, 0x81f2, 0x81f5, 0x81f6, 0x81f8, 0x81f9, 0x81fd,
-  0x81ff, 0x8200, 0x8203, 0x820f, 0x8213, 0x8214, 0x8219, 0x821a,
-  0x821d, 0x8221, 0x8222, 0x8228, 0x8232, 0x8234, 0x823a, 0x8243,
-  0x8244, 0x8245, 0x8246, 0x824b, 0x824e, 0x824f, 0x8251, 0x8256,
-  0x825c, 0x8260, 0x8263, 0x8267, 0x826d, 0x8274, 0x827b, 0x827d,
-  0x827f, 0x8280, 0x8281, 0x8283, 0x8284, 0x8287, 0x8289, 0x828a,
-  0x828e, 0x8291, 0x8294, 0x8296, 0x8298, 0x829a, 0x829b, 0x82a0,
-  0x82a1, 0x82a3, 0x82a4, 0x82a7, 0x82a8, 0x82a9, 0x82aa, 0x82ae,
-  0x82b0, 0x82b2, 0x82b4, 0x82b7, 0x82ba, 0x82bc, 0x82be, 0x82bf,
-  0x82c6, 0x82d0, 0x82d5, 0x82da, 0x82e0, 0x82e2, 0x82e4, 0x82e8,
-  0x82ea, 0x82ed, 0x82ef, 0x82f6, 0x82f7, 0x82fd, 0x82fe, 0x8300,
-  0x8301, 0x8307, 0x8308, 0x830a, 0x830b, 0x8354, 0x831b, 0x831d,
-  0x831e, 0x831f, 0x8321, 0x8322, 0x832c, 0x832d, 0x832e, 0x8330,
-  0x8333, 0x8337, 0x833a, 0x833c, 0x833d, 0x8342, 0x8343, 0x8344,
-  0x8347, 0x834d, 0x834e, 0x8351, 0x8355, 0x8356, 0x8357, 0x8370,
-  0x8378, 0x837d, 0x837f, 0x8380, 0x8382, 0x8384, 0x8386, 0x838d,
-  0x8392, 0x8394, 0x8395, 0x8398, 0x8399, 0x839b, 0x839c, 0x839d,
-  0x83a6, 0x83a7, 0x83a9, 0x83ac, 0x83be, 0x83bf, 0x83c0, 0x83c7,
-  0x83c9, 0x83cf, 0x83d0, 0x83d1, 0x83d4, 0x83dd, 0x8353, 0x83e8,
-  0x83ea, 0x83f6, 0x83f8, 0x83f9, 0x83fc, 0x8401, 0x8406, 0x840a,
-  0x840f, 0x8411, 0x8415, 0x8419, 0x83ad, 0x842f, 0x8439, 0x8445,
-  0x8447, 0x8448, 0x844a, 0x844d, 0x844f, 0x8451, 0x8452, 0x8456,
-  0x8458, 0x8459, 0x845a, 0x845c, 0x8460, 0x8464, 0x8465, 0x8467,
-  0x846a, 0x8470, 0x8473, 0x8474, 0x8476, 0x8478, 0x847c, 0x847d,
-  0x8481, 0x8485, 0x8492, 0x8493, 0x8495, 0x849e, 0x84a6, 0x84a8,
-  0x84a9, 0x84aa, 0x84af, 0x84b1, 0x84b4, 0x84ba, 0x84bd, 0x84be,
-  0x84c0, 0x84c2, 0x84c7, 0x84c8, 0x84cc, 0x84cf, 0x84d3, 0x84dc,
-  0x84e7, 0x84ea, 0x84ef, 0x84f0, 0x84f1, 0x84f2, 0x84f7, 0x8532,
-  0x84fa, 0x84fb, 0x84fd, 0x8502, 0x8503, 0x8507, 0x850c, 0x850e,
-  0x8510, 0x851c, 0x851e, 0x8522, 0x8523, 0x8524, 0x8525, 0x8527,
-  0x852a, 0x852b, 0x852f, 0x8533, 0x8534, 0x8536, 0x853f, 0x8546,
-  0x854f, 0x8550, 0x8551, 0x8552, 0x8553, 0x8556, 0x8559, 0x855c,
-  0x855d, 0x855e, 0x855f, 0x8560, 0x8561, 0x8562, 0x8564, 0x856b,
-  0x856f, 0x8579, 0x857a, 0x857b, 0x857d, 0x857f, 0x8581, 0x8585,
-  0x8586, 0x8589, 0x858b, 0x858c, 0x858f, 0x8593, 0x8598, 0x859d,
-  0x859f, 0x85a0, 0x85a2, 0x85a5, 0x85a7, 0x85b4, 0x85b6, 0x85b7,
-  0x85b8, 0x85bc, 0x85bd, 0x85be, 0x85bf, 0x85c2, 0x85c7, 0x85ca,
-  0x85cb, 0x85ce, 0x85ad, 0x85d8, 0x85da, 0x85df, 0x85e0, 0x85e6,
-  0x85e8, 0x85ed, 0x85f3, 0x85f6, 0x85fc, 0x85ff, 0x8600, 0x8604,
-  0x8605, 0x860d, 0x860e, 0x8610, 0x8611, 0x8612, 0x8618, 0x8619,
-  0x861b, 0x861e, 0x8621, 0x8627, 0x8629, 0x8636, 0x8638, 0x863a,
-  0x863c, 0x863d, 0x8640, 0x8642, 0x8646, 0x8652, 0x8653, 0x8656,
-  0x8657, 0x8658, 0x8659, 0x865d, 0x8660, 0x8661, 0x8662, 0x8663,
-  0x8664, 0x8669, 0x866c, 0x866f, 0x8675, 0x8676, 0x8677, 0x867a,
-  0x868d, 0x8691, 0x8696, 0x8698, 0x869a, 0x869c, 0x86a1, 0x86a6,
-  0x86a7, 0x86a8, 0x86ad, 0x86b1, 0x86b3, 0x86b4, 0x86b5, 0x86b7,
-  0x86b8, 0x86b9, 0x86bf, 0x86c0, 0x86c1, 0x86c3, 0x86c5, 0x86d1,
-  0x86d2, 0x86d5, 0x86d7, 0x86da, 0x86dc, 0x86e0, 0x86e3, 0x86e5,
-  0x86e7, 0x8688, 0x86fa, 0x86fc, 0x86fd, 0x8704, 0x8705, 0x8707,
-  0x870b, 0x870e, 0x870f, 0x8710, 0x8713, 0x8714, 0x8719, 0x871e,
-  0x871f, 0x8721, 0x8723, 0x8728, 0x872e, 0x872f, 0x8731, 0x8732,
-  0x8739, 0x873a, 0x873c, 0x873d, 0x873e, 0x8740, 0x8743, 0x8745,
-  0x874d, 0x8758, 0x875d, 0x8761, 0x8764, 0x8765, 0x876f, 0x8771,
-  0x8772, 0x877b, 0x8783, 0x8784, 0x8785, 0x8786, 0x8787, 0x8788,
-  0x8789, 0x878b, 0x878c, 0x8790, 0x8793, 0x8795, 0x8797, 0x8798,
-  0x8799, 0x879e, 0x87a0, 0x87a3, 0x87a7, 0x87ac, 0x87ad, 0x87ae,
-  0x87b1, 0x87b5, 0x87be, 0x87bf, 0x87c1, 0x87c8, 0x87c9, 0x87ca,
-  0x87ce, 0x87d5, 0x87d6, 0x87d9, 0x87da, 0x87dc, 0x87df, 0x87e2,
-  0x87e3, 0x87e4, 0x87ea, 0x87eb, 0x87ed, 0x87f1, 0x87f3, 0x87f8,
-  0x87fa, 0x87ff, 0x8801, 0x8803, 0x8806, 0x8809, 0x880a, 0x880b,
-  0x8810, 0x8819, 0x8812, 0x8813, 0x8814, 0x8818, 0x881a, 0x881b,
-  0x881c, 0x881e, 0x881f, 0x8828, 0x882d, 0x882e, 0x8830, 0x8832,
-  0x8835, 0x883a, 0x883c, 0x8841, 0x8843, 0x8845, 0x8848, 0x8849,
-  0x884a, 0x884b, 0x884e, 0x8851, 0x8855, 0x8856, 0x8858, 0x885a,
-  0x885c, 0x885f, 0x8860, 0x8864, 0x8869, 0x8871, 0x8879, 0x887b,
-  0x8880, 0x8898, 0x889a, 0x889b, 0x889c, 0x889f, 0x88a0, 0x88a8,
-  0x88aa, 0x88ba, 0x88bd, 0x88be, 0x88c0, 0x88ca, 0x88cb, 0x88cc,
-  0x88cd, 0x88ce, 0x88d1, 0x88d2, 0x88d3, 0x88db, 0x88de, 0x88e7,
-  0x88ef, 0x88f0, 0x88f1, 0x88f5, 0x88f7, 0x8901, 0x8906, 0x890d,
-  0x890e, 0x890f, 0x8915, 0x8916, 0x8918, 0x8919, 0x891a, 0x891c,
-  0x8920, 0x8926, 0x8927, 0x8928, 0x8930, 0x8931, 0x8932, 0x8935,
-  0x8939, 0x893a, 0x893e, 0x8940, 0x8942, 0x8945, 0x8946, 0x8949,
-  0x894f, 0x8952, 0x8957, 0x895a, 0x895b, 0x895c, 0x8961, 0x8962,
-  0x8963, 0x896b, 0x896e, 0x8970, 0x8973, 0x8975, 0x897a, 0x897b,
-  0x897c, 0x897d, 0x8989, 0x898d, 0x8990, 0x8994, 0x8995, 0x899b,
-  0x899c, 0x899f, 0x89a0, 0x89a5, 0x89b0, 0x89b4, 0x89b5, 0x89b6,
-  0x89b7, 0x89bc, 0x89d4, 0x89d5, 0x89d6, 0x89d7, 0x89d8, 0x89e5,
-  0x89e9, 0x89eb, 0x89ed, 0x89f1, 0x89f3, 0x89f6, 0x89f9, 0x89fd,
-  0x89ff, 0x8a04, 0x8a05, 0x8a07, 0x8a0f, 0x8a11, 0x8a12, 0x8a14,
-  0x8a15, 0x8a1e, 0x8a20, 0x8a22, 0x8a24, 0x8a26, 0x8a2b, 0x8a2c,
-  0x8a2f, 0x8a35, 0x8a37, 0x8a3d, 0x8a3e, 0x8a40, 0x8a43, 0x8a45,
-  0x8a47, 0x8a49, 0x8a4d, 0x8a4e, 0x8a53, 0x8a56, 0x8a57, 0x8a58,
-  0x8a5c, 0x8a5d, 0x8a61, 0x8a65, 0x8a67, 0x8a75, 0x8a76, 0x8a77,
-  0x8a79, 0x8a7a, 0x8a7b, 0x8a7e, 0x8a7f, 0x8a80, 0x8a83, 0x8a86,
-  0x8a8b, 0x8a8f, 0x8a90, 0x8a92, 0x8a96, 0x8a97, 0x8a99, 0x8a9f,
-  0x8aa7, 0x8aa9, 0x8aae, 0x8aaf, 0x8ab3, 0x8ab6, 0x8ab7, 0x8abb,
-  0x8abe, 0x8ac3, 0x8ac6, 0x8ac8, 0x8ac9, 0x8aca, 0x8ad1, 0x8ad3,
-  0x8ad4, 0x8ad5, 0x8ad7, 0x8add, 0x8adf, 0x8aec, 0x8af0, 0x8af4,
-  0x8af5, 0x8af6, 0x8afc, 0x8aff, 0x8b05, 0x8b06, 0x8b0b, 0x8b11,
-  0x8b1c, 0x8b1e, 0x8b1f, 0x8b0a, 0x8b2d, 0x8b30, 0x8b37, 0x8b3c,
-  0x8b42, 0x8b43, 0x8b44, 0x8b45, 0x8b46, 0x8b48, 0x8b52, 0x8b53,
-  0x8b54, 0x8b59, 0x8b4d, 0x8b5e, 0x8b63, 0x8b6d, 0x8b76, 0x8b78,
-  0x8b79, 0x8b7c, 0x8b7e, 0x8b81, 0x8b84, 0x8b85, 0x8b8b, 0x8b8d,
-  0x8b8f, 0x8b94, 0x8b95, 0x8b9c, 0x8b9e, 0x8b9f, 0x8c38, 0x8c39,
-  0x8c3d, 0x8c3e, 0x8c45, 0x8c47, 0x8c49, 0x8c4b, 0x8c4f, 0x8c51,
-  0x8c53, 0x8c54, 0x8c57, 0x8c58, 0x8c5b, 0x8c5d, 0x8c59, 0x8c63,
-  0x8c64, 0x8c66, 0x8c68, 0x8c69, 0x8c6d, 0x8c73, 0x8c75, 0x8c76,
-  0x8c7b, 0x8c7e, 0x8c86, 0x8c87, 0x8c8b, 0x8c90, 0x8c92, 0x8c93,
-  0x8c99, 0x8c9b, 0x8c9c, 0x8ca4, 0x8cb9, 0x8cba, 0x8cc5, 0x8cc6,
-  0x8cc9, 0x8ccb, 0x8ccf, 0x8cd6, 0x8cd5, 0x8cd9, 0x8cdd, 0x8ce1,
-  0x8ce8, 0x8cec, 0x8cef, 0x8cf0, 0x8cf2, 0x8cf5, 0x8cf7, 0x8cf8,
-  0x8cfe, 0x8cff, 0x8d01, 0x8d03, 0x8d09, 0x8d12, 0x8d17, 0x8d1b,
-  0x8d65, 0x8d69, 0x8d6c, 0x8d6e, 0x8d7f, 0x8d82, 0x8d84, 0x8d88,
-  0x8d8d, 0x8d90, 0x8d91, 0x8d95, 0x8d9e, 0x8d9f, 0x8da0, 0x8da6,
-  0x8dab, 0x8dac, 0x8daf, 0x8db2, 0x8db5, 0x8db7, 0x8db9, 0x8dbb,
-  0x8dc0, 0x8dc5, 0x8dc6, 0x8dc7, 0x8dc8, 0x8dca, 0x8dce, 0x8dd1,
-  0x8dd4, 0x8dd5, 0x8dd7, 0x8dd9, 0x8de4, 0x8de5, 0x8de7, 0x8dec,
-  0x8df0, 0x8dbc, 0x8df1, 0x8df2, 0x8df4, 0x8dfd, 0x8e01, 0x8e04,
-  0x8e05, 0x8e06, 0x8e0b, 0x8e11, 0x8e14, 0x8e16, 0x8e20, 0x8e21,
-  0x8e22, 0x8e23, 0x8e26, 0x8e27, 0x8e31, 0x8e33, 0x8e36, 0x8e37,
-  0x8e38, 0x8e39, 0x8e3d, 0x8e40, 0x8e41, 0x8e4b, 0x8e4d, 0x8e4e,
-  0x8e4f, 0x8e54, 0x8e5b, 0x8e5c, 0x8e5d, 0x8e5e, 0x8e61, 0x8e62,
-  0x8e69, 0x8e6c, 0x8e6d, 0x8e6f, 0x8e70, 0x8e71, 0x8e79, 0x8e7a,
-  0x8e7b, 0x8e82, 0x8e83, 0x8e89, 0x8e90, 0x8e92, 0x8e95, 0x8e9a,
-  0x8e9b, 0x8e9d, 0x8e9e, 0x8ea2, 0x8ea7, 0x8ea9, 0x8ead, 0x8eae,
-  0x8eb3, 0x8eb5, 0x8eba, 0x8ebb, 0x8ec0, 0x8ec1, 0x8ec3, 0x8ec4,
-  0x8ec7, 0x8ecf, 0x8ed1, 0x8ed4, 0x8edc, 0x8ee8, 0x8eee, 0x8ef0,
-  0x8ef1, 0x8ef7, 0x8ef9, 0x8efa, 0x8eed, 0x8f00, 0x8f02, 0x8f07,
-  0x8f08, 0x8f0f, 0x8f10, 0x8f16, 0x8f17, 0x8f18, 0x8f1e, 0x8f20,
-  0x8f21, 0x8f23, 0x8f25, 0x8f27, 0x8f28, 0x8f2c, 0x8f2d, 0x8f2e,
-  0x8f34, 0x8f35, 0x8f36, 0x8f37, 0x8f3a, 0x8f40, 0x8f41, 0x8f43,
-  0x8f47, 0x8f4f, 0x8f51, 0x8f52, 0x8f53, 0x8f54, 0x8f55, 0x8f58,
-  0x8f5d, 0x8f5e, 0x8f65, 0x8f9d, 0x8fa0, 0x8fa1, 0x8fa4, 0x8fa5,
-  0x8fa6, 0x8fb5, 0x8fb6, 0x8fb8, 0x8fbe, 0x8fc0, 0x8fc1, 0x8fc6,
-  0x8fca, 0x8fcb, 0x8fcd, 0x8fd0, 0x8fd2, 0x8fd3, 0x8fd5, 0x8fe0,
-  0x8fe3, 0x8fe4, 0x8fe8, 0x8fee, 0x8ff1, 0x8ff5, 0x8ff6, 0x8ffb,
-  0x8ffe, 0x9002, 0x9004, 0x9008, 0x900c, 0x9018, 0x901b, 0x9028,
-  0x9029, 0x902f, 0x902a, 0x902c, 0x902d, 0x9033, 0x9034, 0x9037,
-  0x903f, 0x9043, 0x9044, 0x904c, 0x905b, 0x905d, 0x9062, 0x9066,
-  0x9067, 0x906c, 0x9070, 0x9074, 0x9079, 0x9085, 0x9088, 0x908b,
-  0x908c, 0x908e, 0x9090, 0x9095, 0x9097, 0x9098, 0x9099, 0x909b,
-  0x90a0, 0x90a1, 0x90a2, 0x90a5, 0x90b0, 0x90b2, 0x90b3, 0x90b4,
-  0x90b6, 0x90bd, 0x90cc, 0x90be, 0x90c3, 0x90c4, 0x90c5, 0x90c7,
-  0x90c8, 0x90d5, 0x90d7, 0x90d8, 0x90d9, 0x90dc, 0x90dd, 0x90df,
-  0x90e5, 0x90d2, 0x90f6, 0x90eb, 0x90ef, 0x90f0, 0x90f4, 0x90fe,
-  0x90ff, 0x9100, 0x9104, 0x9105, 0x9106, 0x9108, 0x910d, 0x9110,
-  0x9114, 0x9116, 0x9117, 0x9118, 0x911a, 0x911c, 0x911e, 0x9120,
-  0x9125, 0x9122, 0x9123, 0x9127, 0x9129, 0x912e, 0x912f, 0x9131,
-  0x9134, 0x9136, 0x9137, 0x9139, 0x913a, 0x913c, 0x913d, 0x9143,
-  0x9147, 0x9148, 0x914f, 0x9153, 0x9157, 0x9159, 0x915a, 0x915b,
-  0x9161, 0x9164, 0x9167, 0x916d, 0x9174, 0x9179, 0x917a, 0x917b,
-  0x9181, 0x9183, 0x9185, 0x9186, 0x918a, 0x918e, 0x9191, 0x9193,
-  0x9194, 0x9195, 0x9198, 0x919e, 0x91a1, 0x91a6, 0x91a8, 0x91ac,
-  0x91ad, 0x91ae, 0x91b0, 0x91b1, 0x91b2, 0x91b3, 0x91b6, 0x91bb,
-  0x91bc, 0x91bd, 0x91bf, 0x91c2, 0x91c3, 0x91c5, 0x91d3, 0x91d4,
-  0x91d7, 0x91d9, 0x91da, 0x91de, 0x91e4, 0x91e5, 0x91e9, 0x91ea,
-  0x91ec, 0x91ed, 0x91ee, 0x91ef, 0x91f0, 0x91f1, 0x91f7, 0x91f9,
-  0x91fb, 0x91fd, 0x9200, 0x9201, 0x9204, 0x9205, 0x9206, 0x9207,
-  0x9209, 0x920a, 0x920c, 0x9210, 0x9212, 0x9213, 0x9216, 0x9218,
-  0x921c, 0x921d, 0x9223, 0x9224, 0x9225, 0x9226, 0x9228, 0x922e,
-  0x922f, 0x9230, 0x9233, 0x9235, 0x9236, 0x9238, 0x9239, 0x923a,
-  0x923c, 0x923e, 0x9240, 0x9242, 0x9243, 0x9246, 0x9247, 0x924a,
-  0x924d, 0x924e, 0x924f, 0x9251, 0x9258, 0x9259, 0x925c, 0x925d,
-  0x9260, 0x9261, 0x9265, 0x9267, 0x9268, 0x9269, 0x926e, 0x926f,
-  0x9270, 0x9275, 0x9276, 0x9277, 0x9278, 0x9279, 0x927b, 0x927c,
-  0x927d, 0x927f, 0x9288, 0x9289, 0x928a, 0x928d, 0x928e, 0x9292,
-  0x9297, 0x9299, 0x929f, 0x92a0, 0x92a4, 0x92a5, 0x92a7, 0x92a8,
-  0x92ab, 0x92af, 0x92b2, 0x92b6, 0x92b8, 0x92ba, 0x92bb, 0x92bc,
-  0x92bd, 0x92bf, 0x92c0, 0x92c1, 0x92c2, 0x92c3, 0x92c5, 0x92c6,
-  0x92c7, 0x92c8, 0x92cb, 0x92cc, 0x92cd, 0x92ce, 0x92d0, 0x92d3,
-  0x92d5, 0x92d7, 0x92d8, 0x92d9, 0x92dc, 0x92dd, 0x92df, 0x92e0,
-  0x92e1, 0x92e3, 0x92e5, 0x92e7, 0x92e8, 0x92ec, 0x92ee, 0x92f0,
-  0x92f9, 0x92fb, 0x92ff, 0x9300, 0x9302, 0x9308, 0x930d, 0x9311,
-  0x9314, 0x9315, 0x931c, 0x931d, 0x931e, 0x931f, 0x9321, 0x9324,
-  0x9325, 0x9327, 0x9329, 0x932a, 0x9333, 0x9334, 0x9336, 0x9337,
-  0x9347, 0x9348, 0x9349, 0x9350, 0x9351, 0x9352, 0x9355, 0x9357,
-  0x9358, 0x935a, 0x935e, 0x9364, 0x9365, 0x9367, 0x9369, 0x936a,
-  0x936d, 0x936f, 0x9370, 0x9371, 0x9373, 0x9374, 0x9376, 0x937a,
-  0x937d, 0x937f, 0x9380, 0x9381, 0x9382, 0x9388, 0x938a, 0x938b,
-  0x938d, 0x938f, 0x9392, 0x9395, 0x9398, 0x939b, 0x939e, 0x93a1,
-  0x93a3, 0x93a4, 0x93a6, 0x93a8, 0x93ab, 0x93b4, 0x93b5, 0x93b6,
-  0x93ba, 0x93a9, 0x93c1, 0x93c4, 0x93c5, 0x93c6, 0x93c7, 0x93c9,
-  0x93ca, 0x93cb, 0x93cc, 0x93cd, 0x93d3, 0x93d9, 0x93dc, 0x93de,
-  0x93df, 0x93e2, 0x93e6, 0x93e7, 0x93f9, 0x93f7, 0x93f8, 0x93fa,
-  0x93fb, 0x93fd, 0x9401, 0x9402, 0x9404, 0x9408, 0x9409, 0x940d,
-  0x940e, 0x940f, 0x9415, 0x9416, 0x9417, 0x941f, 0x942e, 0x942f,
-  0x9431, 0x9432, 0x9433, 0x9434, 0x943b, 0x943f, 0x943d, 0x9443,
-  0x9445, 0x9448, 0x944a, 0x944c, 0x9455, 0x9459, 0x945c, 0x945f,
-  0x9461, 0x9463, 0x9468, 0x946b, 0x946d, 0x946e, 0x946f, 0x9471,
-  0x9472, 0x9484, 0x9483, 0x9578, 0x9579, 0x957e, 0x9584, 0x9588,
-  0x958c, 0x958d, 0x958e, 0x959d, 0x959e, 0x959f, 0x95a1, 0x95a6,
-  0x95a9, 0x95ab, 0x95ac, 0x95b4, 0x95b6, 0x95ba, 0x95bd, 0x95bf,
-  0x95c6, 0x95c8, 0x95c9, 0x95cb, 0x95d0, 0x95d1, 0x95d2, 0x95d3,
-  0x95d9, 0x95da, 0x95dd, 0x95de, 0x95df, 0x95e0, 0x95e4, 0x95e6,
-  0x961d, 0x961e, 0x9622, 0x9624, 0x9625, 0x9626, 0x962c, 0x9631,
-  0x9633, 0x9637, 0x9638, 0x9639, 0x963a, 0x963c, 0x963d, 0x9641,
-  0x9652, 0x9654, 0x9656, 0x9657, 0x9658, 0x9661, 0x966e, 0x9674,
-  0x967b, 0x967c, 0x967e, 0x967f, 0x9681, 0x9682, 0x9683, 0x9684,
-  0x9689, 0x9691, 0x9696, 0x969a, 0x969d, 0x969f, 0x96a4, 0x96a5,
-  0x96a6, 0x96a9, 0x96ae, 0x96af, 0x96b3, 0x96ba, 0x96ca, 0x96d2,
-  0x5db2, 0x96d8, 0x96da, 0x96dd, 0x96de, 0x96df, 0x96e9, 0x96ef,
-  0x96f1, 0x96fa, 0x9702, 0x9703, 0x9705, 0x9709, 0x971a, 0x971b,
-  0x971d, 0x9721, 0x9722, 0x9723, 0x9728, 0x9731, 0x9733, 0x9741,
-  0x9743, 0x974a, 0x974e, 0x974f, 0x9755, 0x9757, 0x9758, 0x975a,
-  0x975b, 0x9763, 0x9767, 0x976a, 0x976e, 0x9773, 0x9776, 0x9777,
-  0x9778, 0x977b, 0x977d, 0x977f, 0x9780, 0x9789, 0x9795, 0x9796,
-  0x9797, 0x9799, 0x979a, 0x979e, 0x979f, 0x97a2, 0x97ac, 0x97ae,
-  0x97b1, 0x97b2, 0x97b5, 0x97b6, 0x97b8, 0x97b9, 0x97ba, 0x97bc,
-  0x97be, 0x97bf, 0x97c1, 0x97c4, 0x97c5, 0x97c7, 0x97c9, 0x97ca,
-  0x97cc, 0x97cd, 0x97ce, 0x97d0, 0x97d1, 0x97d4, 0x97d7, 0x97d8,
-  0x97d9, 0x97dd, 0x97de, 0x97e0, 0x97db, 0x97e1, 0x97e4, 0x97ef,
-  0x97f1, 0x97f4, 0x97f7, 0x97f8, 0x97fa, 0x9807, 0x980a, 0x9819,
-  0x980d, 0x980e, 0x9814, 0x9816, 0x981c, 0x981e, 0x9820, 0x9823,
-  0x9826, 0x982b, 0x982e, 0x982f, 0x9830, 0x9832, 0x9833, 0x9835,
-  0x9825, 0x983e, 0x9844, 0x9847, 0x984a, 0x9851, 0x9852, 0x9853,
-  0x9856, 0x9857, 0x9859, 0x985a, 0x9862, 0x9863, 0x9865, 0x9866,
-  0x986a, 0x986c, 0x98ab, 0x98ad, 0x98ae, 0x98b0, 0x98b4, 0x98b7,
-  0x98b8, 0x98ba, 0x98bb, 0x98bf, 0x98c2, 0x98c5, 0x98c8, 0x98cc,
-  0x98e1, 0x98e3, 0x98e5, 0x98e6, 0x98e7, 0x98ea, 0x98f3, 0x98f6,
-  0x9902, 0x9907, 0x9908, 0x9911, 0x9915, 0x9916, 0x9917, 0x991a,
-  0x991b, 0x991c, 0x991f, 0x9922, 0x9926, 0x9927, 0x992b, 0x9931,
-  0x9932, 0x9933, 0x9934, 0x9935, 0x9939, 0x993a, 0x993b, 0x993c,
-  0x9940, 0x9941, 0x9946, 0x9947, 0x9948, 0x994d, 0x994e, 0x9954,
-  0x9958, 0x9959, 0x995b, 0x995c, 0x995e, 0x995f, 0x9960, 0x999b,
-  0x999d, 0x999f, 0x99a6, 0x99b0, 0x99b1, 0x99b2, 0x99b5, 0x99b9,
-  0x99ba, 0x99bd, 0x99bf, 0x99c3, 0x99c9, 0x99d3, 0x99d4, 0x99d9,
-  0x99da, 0x99dc, 0x99de, 0x99e7, 0x99ea, 0x99eb, 0x99ec, 0x99f0,
-  0x99f4, 0x99f5, 0x99f9, 0x99fd, 0x99fe, 0x9a02, 0x9a03, 0x9a04,
-  0x9a0b, 0x9a0c, 0x9a10, 0x9a11, 0x9a16, 0x9a1e, 0x9a20, 0x9a22,
-  0x9a23, 0x9a24, 0x9a27, 0x9a2d, 0x9a2e, 0x9a33, 0x9a35, 0x9a36,
-  0x9a38, 0x9a47, 0x9a41, 0x9a44, 0x9a4a, 0x9a4b, 0x9a4c, 0x9a4e,
-  0x9a51, 0x9a54, 0x9a56, 0x9a5d, 0x9aaa, 0x9aac, 0x9aae, 0x9aaf,
-  0x9ab2, 0x9ab4, 0x9ab5, 0x9ab6, 0x9ab9, 0x9abb, 0x9abe, 0x9abf,
-  0x9ac1, 0x9ac3, 0x9ac6, 0x9ac8, 0x9ace, 0x9ad0, 0x9ad2, 0x9ad5,
-  0x9ad6, 0x9ad7, 0x9adb, 0x9adc, 0x9ae0, 0x9ae4, 0x9ae5, 0x9ae7,
-  0x9ae9, 0x9aec, 0x9af2, 0x9af3, 0x9af5, 0x9af9, 0x9afa, 0x9afd,
-  0x9aff, 0x9b00, 0x9b01, 0x9b02, 0x9b03, 0x9b04, 0x9b05, 0x9b08,
-  0x9b09, 0x9b0b, 0x9b0c, 0x9b0d, 0x9b0e, 0x9b10, 0x9b12, 0x9b16,
-  0x9b19, 0x9b1b, 0x9b1c, 0x9b20, 0x9b26, 0x9b2b, 0x9b2d, 0x9b33,
-  0x9b34, 0x9b35, 0x9b37, 0x9b39, 0x9b3a, 0x9b3d, 0x9b48, 0x9b4b,
-  0x9b4c, 0x9b55, 0x9b56, 0x9b57, 0x9b5b, 0x9b5e, 0x9b61, 0x9b63,
-  0x9b65, 0x9b66, 0x9b68, 0x9b6a, 0x9b6b, 0x9b6c, 0x9b6d, 0x9b6e,
-  0x9b73, 0x9b75, 0x9b77, 0x9b78, 0x9b79, 0x9b7f, 0x9b80, 0x9b84,
-  0x9b85, 0x9b86, 0x9b87, 0x9b89, 0x9b8a, 0x9b8b, 0x9b8d, 0x9b8f,
-  0x9b90, 0x9b94, 0x9b9a, 0x9b9d, 0x9b9e, 0x9ba6, 0x9ba7, 0x9ba9,
-  0x9bac, 0x9bb0, 0x9bb1, 0x9bb2, 0x9bb7, 0x9bb8, 0x9bbb, 0x9bbc,
-  0x9bbe, 0x9bbf, 0x9bc1, 0x9bc7, 0x9bc8, 0x9bce, 0x9bd0, 0x9bd7,
-  0x9bd8, 0x9bdd, 0x9bdf, 0x9be5, 0x9be7, 0x9bea, 0x9beb, 0x9bef,
-  0x9bf3, 0x9bf7, 0x9bf8, 0x9bf9, 0x9bfa, 0x9bfd, 0x9bff, 0x9c00,
-  0x9c02, 0x9c0b, 0x9c0f, 0x9c11, 0x9c16, 0x9c18, 0x9c19, 0x9c1a,
-  0x9c1c, 0x9c1e, 0x9c22, 0x9c23, 0x9c26, 0x9c27, 0x9c28, 0x9c29,
-  0x9c2a, 0x9c31, 0x9c35, 0x9c36, 0x9c37, 0x9c3d, 0x9c41, 0x9c43,
-  0x9c44, 0x9c45, 0x9c49, 0x9c4a, 0x9c4e, 0x9c4f, 0x9c50, 0x9c53,
-  0x9c54, 0x9c56, 0x9c58, 0x9c5b, 0x9c5d, 0x9c5e, 0x9c5f, 0x9c63,
-  0x9c69, 0x9c6a, 0x9c5c, 0x9c6b, 0x9c68, 0x9c6e, 0x9c70, 0x9c72,
-  0x9c75, 0x9c77, 0x9c7b, 0x9ce6, 0x9cf2, 0x9cf7, 0x9cf9, 0x9d0b,
-  0x9d02, 0x9d11, 0x9d17, 0x9d18, 0x9d1c, 0x9d1d, 0x9d1e, 0x9d2f,
-  0x9d30, 0x9d32, 0x9d33, 0x9d34, 0x9d3a, 0x9d3c, 0x9d45, 0x9d3d,
-  0x9d42, 0x9d43, 0x9d47, 0x9d4a, 0x9d53, 0x9d54, 0x9d5f, 0x9d63,
-  0x9d62, 0x9d65, 0x9d69, 0x9d6a, 0x9d6b, 0x9d70, 0x9d76, 0x9d77,
-  0x9d7b, 0x9d7c, 0x9d7e, 0x9d83, 0x9d84, 0x9d86, 0x9d8a, 0x9d8d,
-  0x9d8e, 0x9d92, 0x9d93, 0x9d95, 0x9d96, 0x9d97, 0x9d98, 0x9da1,
-  0x9daa, 0x9dac, 0x9dae, 0x9db1, 0x9db5, 0x9db9, 0x9dbc, 0x9dbf,
-  0x9dc3, 0x9dc7, 0x9dc9, 0x9dca, 0x9dd4, 0x9dd5, 0x9dd6, 0x9dd7,
-  0x9dda, 0x9dde, 0x9ddf, 0x9de0, 0x9de5, 0x9de7, 0x9de9, 0x9deb,
-  0x9dee, 0x9df0, 0x9df3, 0x9df4, 0x9dfe, 0x9e0a, 0x9e02, 0x9e07,
-  0x9e0e, 0x9e10, 0x9e11, 0x9e12, 0x9e15, 0x9e16, 0x9e19, 0x9e1c,
-  0x9e1d, 0x9e7a, 0x9e7b, 0x9e7c, 0x9e80, 0x9e82, 0x9e83, 0x9e84,
-  0x9e85, 0x9e87, 0x9e8e, 0x9e8f, 0x9e96, 0x9e98, 0x9e9b, 0x9e9e,
-  0x9ea4, 0x9ea8, 0x9eac, 0x9eae, 0x9eaf, 0x9eb0, 0x9eb3, 0x9eb4,
-  0x9eb5, 0x9ec6, 0x9ec8, 0x9ecb, 0x9ed5, 0x9edf, 0x9ee4, 0x9ee7,
-  0x9eec, 0x9eed, 0x9eee, 0x9ef0, 0x9ef1, 0x9ef2, 0x9ef5, 0x9ef8,
-  0x9eff, 0x9f02, 0x9f03, 0x9f09, 0x9f0f, 0x9f10, 0x9f11, 0x9f12,
-  0x9f14, 0x9f16, 0x9f17, 0x9f19, 0x9f1a, 0x9f1b, 0x9f1f, 0x9f22,
-  0x9f26, 0x9f2a, 0x9f2b, 0x9f2f, 0x9f31, 0x9f32, 0x9f34, 0x9f37,
-  0x9f39, 0x9f3a, 0x9f3c, 0x9f3d, 0x9f3f, 0x9f41, 0x9f43, 0x9f44,
-  0x9f45, 0x9f46, 0x9f47, 0x9f53, 0x9f55, 0x9f56, 0x9f57, 0x9f58,
-  0x9f5a, 0x9f5d, 0x9f5e, 0x9f68, 0x9f69, 0x9f6d, 0x9f6e, 0x9f6f,
-  0x9f70, 0x9f71, 0x9f73, 0x9f75, 0x9f7a, 0x9f7d, 0x9f8f, 0x9f90,
-  0x9f91, 0x9f92, 0x9f94, 0x9f96, 0x9f97, 0x9f9e, 0x9fa1, 0x9fa2,
-  0x9fa3, 0x9fa5
-};
-
-
-/* The UCS char covered by JIS X0212 are sparsely distributed.  So we
-   use again a two-step mapping table.  The index table can be computed
-   using
-
-   egrep '^0x[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]' \
-     ../eastasia/jis/jis0212.txt | awk '{ print $2, $1 }' | sort -u |
-   perl tab.pl
-
-   where tab.pl is
-
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   $first=$last=$idx=0;
-   while (<>) {
-     local($ucs,$jis,%rest) = split;
-     local($u)=hex($ucs);
-     local($j)=hex($jis);
-     if ($u - $last > 6) {
-       if ($last != 0) {
-	 printf ("  { start: %#06x, end: %#06x, idx: %5d },\n",
-		 $first, $last, $idx);
-	 $idx += $last - $first + 1;
-       }
-       $first=$u;
-     }
-     $last=$u;
-   }
-   printf ("  { start: %#06x, end: %#06x, idx: %5d }, \n",
-	   $first, $last, $idx);
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-const struct jisx0212_idx __jisx0212_from_ucs_idx[] =
-{
-  { start: 0x007e, end: 0x007e, idx:     0 },
-  { start: 0x00a1, end: 0x00af, idx:     1 },
-  { start: 0x00b8, end: 0x017e, idx:    16 },
-  { start: 0x01cd, end: 0x01dc, idx:   215 },
-  { start: 0x01f5, end: 0x01f5, idx:   231 },
-  { start: 0x02c7, end: 0x02c7, idx:   232 },
-  { start: 0x02d8, end: 0x02dd, idx:   233 },
-  { start: 0x0384, end: 0x0390, idx:   239 },
-  { start: 0x03aa, end: 0x03b0, idx:   252 },
-  { start: 0x03c2, end: 0x03c2, idx:   259 },
-  { start: 0x03ca, end: 0x03ce, idx:   260 },
-  { start: 0x0402, end: 0x040f, idx:   265 },
-  { start: 0x0452, end: 0x045f, idx:   279 },
-  { start: 0x2116, end: 0x2116, idx:   293 },
-  { start: 0x2122, end: 0x2122, idx:   294 },
-  { start: 0x4e02, end: 0x4e05, idx:   295 },
-  { start: 0x4e0c, end: 0x4e12, idx:   299 },
-  { start: 0x4e1f, end: 0x4e35, idx:   306 },
-  { start: 0x4e40, end: 0x4e47, idx:   329 },
-  { start: 0x4e51, end: 0x4e51, idx:   337 },
-  { start: 0x4e5a, end: 0x4e5c, idx:   338 },
-  { start: 0x4e63, end: 0x4e69, idx:   341 },
-  { start: 0x4e74, end: 0x4e7f, idx:   348 },
-  { start: 0x4e8d, end: 0x4e8d, idx:   360 },
-  { start: 0x4e96, end: 0x4e9d, idx:   361 },
-  { start: 0x4eaf, end: 0x4eaf, idx:   369 },
-  { start: 0x4eb9, end: 0x4eb9, idx:   370 },
-  { start: 0x4ec3, end: 0x4ec3, idx:   371 },
-  { start: 0x4ed0, end: 0x4ed0, idx:   372 },
-  { start: 0x4eda, end: 0x4ee8, idx:   373 },
-  { start: 0x4eef, end: 0x4ef5, idx:   388 },
-  { start: 0x4efd, end: 0x4f19, idx:   395 },
-  { start: 0x4f2e, end: 0x4f58, idx:   424 },
-  { start: 0x4f5f, end: 0x4f63, idx:   467 },
-  { start: 0x4f6a, end: 0x4f9f, idx:   472 },
-  { start: 0x4fb2, end: 0x4fd2, idx:   526 },
-  { start: 0x4fdc, end: 0x4fe2, idx:   559 },
-  { start: 0x4ff0, end: 0x4ff2, idx:   566 },
-  { start: 0x4ffc, end: 0x5027, idx:   569 },
-  { start: 0x502e, end: 0x5071, idx:   613 },
-  { start: 0x5081, end: 0x50a2, idx:   681 },
-  { start: 0x50aa, end: 0x50b0, idx:   715 },
-  { start: 0x50b9, end: 0x5110, idx:   722 },
-  { start: 0x5117, end: 0x5139, idx:   810 },
-  { start: 0x5142, end: 0x5142, idx:   845 },
-  { start: 0x514a, end: 0x5158, idx:   846 },
-  { start: 0x515f, end: 0x5166, idx:   861 },
-  { start: 0x517e, end: 0x5184, idx:   869 },
-  { start: 0x518b, end: 0x518e, idx:   876 },
-  { start: 0x5198, end: 0x51a3, idx:   880 },
-  { start: 0x51ad, end: 0x51ad, idx:   892 },
-  { start: 0x51b8, end: 0x51c8, idx:   893 },
-  { start: 0x51cf, end: 0x51e5, idx:   910 },
-  { start: 0x51ee, end: 0x51f7, idx:   933 },
-  { start: 0x5201, end: 0x5205, idx:   943 },
-  { start: 0x5212, end: 0x5218, idx:   948 },
-  { start: 0x5222, end: 0x5228, idx:   955 },
-  { start: 0x5231, end: 0x5235, idx:   962 },
-  { start: 0x523c, end: 0x523c, idx:   967 },
-  { start: 0x5245, end: 0x5249, idx:   968 },
-  { start: 0x5255, end: 0x5266, idx:   973 },
-  { start: 0x526e, end: 0x526e, idx:   991 },
-  { start: 0x5277, end: 0x5279, idx:   992 },
-  { start: 0x5280, end: 0x528c, idx:   995 },
-  { start: 0x5293, end: 0x529c, idx:  1008 },
-  { start: 0x52a4, end: 0x52a7, idx:  1018 },
-  { start: 0x52af, end: 0x52f7, idx:  1022 },
-  { start: 0x5300, end: 0x5303, idx:  1095 },
-  { start: 0x530a, end: 0x5335, idx:  1099 },
-  { start: 0x533c, end: 0x5342, idx:  1143 },
-  { start: 0x534b, end: 0x534c, idx:  1150 },
-  { start: 0x5359, end: 0x5365, idx:  1152 },
-  { start: 0x536c, end: 0x5372, idx:  1165 },
-  { start: 0x5379, end: 0x53c5, idx:  1172 },
-  { start: 0x53cf, end: 0x53e7, idx:  1249 },
-  { start: 0x53f5, end: 0x53f5, idx:  1274 },
-  { start: 0x5402, end: 0x5402, idx:  1275 },
-  { start: 0x5413, end: 0x5413, idx:  1276 },
-  { start: 0x541a, end: 0x541a, idx:  1277 },
-  { start: 0x5421, end: 0x5435, idx:  1278 },
-  { start: 0x5443, end: 0x544f, idx:  1299 },
-  { start: 0x545e, end: 0x5474, idx:  1312 },
-  { start: 0x547f, end: 0x54bf, idx:  1335 },
-  { start: 0x54c6, end: 0x54ce, idx:  1400 },
-  { start: 0x54e0, end: 0x54e0, idx:  1409 },
-  { start: 0x54ea, end: 0x54ef, idx:  1410 },
-  { start: 0x54f6, end: 0x550e, idx:  1416 },
-  { start: 0x5515, end: 0x5515, idx:  1441 },
-  { start: 0x552a, end: 0x552b, idx:  1442 },
-  { start: 0x5532, end: 0x5551, idx:  1444 },
-  { start: 0x5558, end: 0x5566, idx:  1476 },
-  { start: 0x557f, end: 0x5597, idx:  1491 },
-  { start: 0x55a3, end: 0x55a4, idx:  1516 },
-  { start: 0x55ad, end: 0x55b2, idx:  1518 },
-  { start: 0x55bf, end: 0x55e2, idx:  1524 },
-  { start: 0x55e9, end: 0x55e9, idx:  1560 },
-  { start: 0x55f6, end: 0x55f6, idx:  1561 },
-  { start: 0x55ff, end: 0x5612, idx:  1562 },
-  { start: 0x5619, end: 0x5619, idx:  1582 },
-  { start: 0x562c, end: 0x5654, idx:  1583 },
-  { start: 0x565e, end: 0x5675, idx:  1624 },
-  { start: 0x5684, end: 0x568c, idx:  1648 },
-  { start: 0x5695, end: 0x569f, idx:  1657 },
-  { start: 0x56a6, end: 0x56b7, idx:  1668 },
-  { start: 0x56be, end: 0x56be, idx:  1686 },
-  { start: 0x56c5, end: 0x56d0, idx:  1687 },
-  { start: 0x56d9, end: 0x56f7, idx:  1699 },
-  { start: 0x5701, end: 0x5734, idx:  1730 },
-  { start: 0x573d, end: 0x5752, idx:  1782 },
-  { start: 0x5762, end: 0x5783, idx:  1804 },
-  { start: 0x578c, end: 0x578c, idx:  1838 },
-  { start: 0x5794, end: 0x57ac, idx:  1839 },
-  { start: 0x57b8, end: 0x57bd, idx:  1864 },
-  { start: 0x57c7, end: 0x57d5, idx:  1870 },
-  { start: 0x57dd, end: 0x580d, idx:  1885 },
-  { start: 0x581b, end: 0x5832, idx:  1934 },
-  { start: 0x5839, end: 0x583f, idx:  1958 },
-  { start: 0x5849, end: 0x5855, idx:  1965 },
-  { start: 0x585f, end: 0x5868, idx:  1978 },
-  { start: 0x5878, end: 0x5896, idx:  1988 },
-  { start: 0x589d, end: 0x58a9, idx:  2019 },
-  { start: 0x58b1, end: 0x58b2, idx:  2032 },
-  { start: 0x58bc, end: 0x58e2, idx:  2034 },
-  { start: 0x58e9, end: 0x58e9, idx:  2073 },
-  { start: 0x58f3, end: 0x58f3, idx:  2074 },
-  { start: 0x5905, end: 0x5914, idx:  2075 },
-  { start: 0x591d, end: 0x5928, idx:  2091 },
-  { start: 0x592f, end: 0x5936, idx:  2103 },
-  { start: 0x593f, end: 0x5946, idx:  2111 },
-  { start: 0x5952, end: 0x5963, idx:  2119 },
-  { start: 0x596b, end: 0x597c, idx:  2137 },
-  { start: 0x598b, end: 0x5997, idx:  2155 },
-  { start: 0x599f, end: 0x59d2, idx:  2168 },
-  { start: 0x59dd, end: 0x59e7, idx:  2220 },
-  { start: 0x59ee, end: 0x59f7, idx:  2231 },
-  { start: 0x5a00, end: 0x5a04, idx:  2241 },
-  { start: 0x5a0c, end: 0x5a13, idx:  2246 },
-  { start: 0x5a1e, end: 0x5a30, idx:  2254 },
-  { start: 0x5a44, end: 0x5a55, idx:  2273 },
-  { start: 0x5a5e, end: 0x5a6d, idx:  2291 },
-  { start: 0x5a77, end: 0x5a7e, idx:  2307 },
-  { start: 0x5a8b, end: 0x5ac8, idx:  2315 },
-  { start: 0x5acf, end: 0x5acf, idx:  2377 },
-  { start: 0x5ada, end: 0x5aee, idx:  2378 },
-  { start: 0x5af5, end: 0x5af6, idx:  2399 },
-  { start: 0x5afd, end: 0x5b01, idx:  2401 },
-  { start: 0x5b08, end: 0x5b08, idx:  2406 },
-  { start: 0x5b17, end: 0x5b25, idx:  2407 },
-  { start: 0x5b2d, end: 0x5b2d, idx:  2422 },
-  { start: 0x5b34, end: 0x5b38, idx:  2423 },
-  { start: 0x5b41, end: 0x5b41, idx:  2428 },
-  { start: 0x5b4b, end: 0x5b56, idx:  2429 },
-  { start: 0x5b5e, end: 0x5b5e, idx:  2441 },
-  { start: 0x5b68, end: 0x5b6f, idx:  2442 },
-  { start: 0x5b7c, end: 0x5b96, idx:  2450 },
-  { start: 0x5ba8, end: 0x5bc1, idx:  2477 },
-  { start: 0x5bcd, end: 0x5bcf, idx:  2503 },
-  { start: 0x5bd6, end: 0x5be0, idx:  2506 },
-  { start: 0x5bef, end: 0x5bf4, idx:  2517 },
-  { start: 0x5bfd, end: 0x5bfd, idx:  2523 },
-  { start: 0x5c0c, end: 0x5c0c, idx:  2524 },
-  { start: 0x5c17, end: 0x5c17, idx:  2525 },
-  { start: 0x5c1e, end: 0x5c36, idx:  2526 },
-  { start: 0x5c59, end: 0x5c7d, idx:  2551 },
-  { start: 0x5c87, end: 0x5c92, idx:  2588 },
-  { start: 0x5c9d, end: 0x5caa, idx:  2600 },
-  { start: 0x5cb2, end: 0x5cba, idx:  2614 },
-  { start: 0x5cc9, end: 0x5ccb, idx:  2623 },
-  { start: 0x5cd2, end: 0x5cdd, idx:  2626 },
-  { start: 0x5cee, end: 0x5cf4, idx:  2638 },
-  { start: 0x5d01, end: 0x5d06, idx:  2645 },
-  { start: 0x5d0d, end: 0x5d12, idx:  2651 },
-  { start: 0x5d23, end: 0x5d4a, idx:  2657 },
-  { start: 0x5d51, end: 0x5d70, idx:  2697 },
-  { start: 0x5d79, end: 0x5d8a, idx:  2729 },
-  { start: 0x5d92, end: 0x5da0, idx:  2747 },
-  { start: 0x5da7, end: 0x5db9, idx:  2762 },
-  { start: 0x5dc3, end: 0x5dd0, idx:  2781 },
-  { start: 0x5dd8, end: 0x5dd9, idx:  2795 },
-  { start: 0x5de0, end: 0x5de9, idx:  2797 },
-  { start: 0x5df8, end: 0x5df9, idx:  2807 },
-  { start: 0x5e00, end: 0x5e00, idx:  2809 },
-  { start: 0x5e07, end: 0x5e18, idx:  2810 },
-  { start: 0x5e1f, end: 0x5e20, idx:  2828 },
-  { start: 0x5e28, end: 0x5e35, idx:  2830 },
-  { start: 0x5e3e, end: 0x5e3e, idx:  2844 },
-  { start: 0x5e49, end: 0x5e5e, idx:  2845 },
-  { start: 0x5e68, end: 0x5e70, idx:  2867 },
-  { start: 0x5e80, end: 0x5e80, idx:  2876 },
-  { start: 0x5e8b, end: 0x5e8e, idx:  2877 },
-  { start: 0x5ea2, end: 0x5eb3, idx:  2881 },
-  { start: 0x5ebd, end: 0x5ebf, idx:  2899 },
-  { start: 0x5ec6, end: 0x5ed5, idx:  2902 },
-  { start: 0x5edc, end: 0x5ede, idx:  2918 },
-  { start: 0x5ee5, end: 0x5eeb, idx:  2921 },
-  { start: 0x5f02, end: 0x5f0e, idx:  2928 },
-  { start: 0x5f19, end: 0x5f67, idx:  2941 },
-  { start: 0x5f6f, end: 0x5f7e, idx:  3020 },
-  { start: 0x5f89, end: 0x5f8f, idx:  3036 },
-  { start: 0x5f96, end: 0x5fb1, idx:  3043 },
-  { start: 0x5fb8, end: 0x5fb8, idx:  3071 },
-  { start: 0x5fc4, end: 0x5fd4, idx:  3072 },
-  { start: 0x5fde, end: 0x5ffc, idx:  3089 },
-  { start: 0x6007, end: 0x6024, idx:  3120 },
-  { start: 0x602d, end: 0x6035, idx:  3150 },
-  { start: 0x6040, end: 0x6040, idx:  3159 },
-  { start: 0x6047, end: 0x6067, idx:  3160 },
-  { start: 0x6071, end: 0x6071, idx:  3193 },
-  { start: 0x607e, end: 0x60a8, idx:  3194 },
-  { start: 0x60b0, end: 0x60e5, idx:  3237 },
-  { start: 0x60f2, end: 0x6122, idx:  3291 },
-  { start: 0x612a, end: 0x6139, idx:  3340 },
-  { start: 0x6141, end: 0x6149, idx:  3356 },
-  { start: 0x615e, end: 0x6160, idx:  3365 },
-  { start: 0x616c, end: 0x6184, idx:  3368 },
-  { start: 0x618b, end: 0x61ad, idx:  3393 },
-  { start: 0x61b8, end: 0x61c2, idx:  3428 },
-  { start: 0x61ce, end: 0x61d5, idx:  3439 },
-  { start: 0x61dc, end: 0x61ef, idx:  3447 },
-  { start: 0x6201, end: 0x6207, idx:  3467 },
-  { start: 0x6213, end: 0x6215, idx:  3474 },
-  { start: 0x621c, end: 0x622b, idx:  3477 },
-  { start: 0x6239, end: 0x625c, idx:  3493 },
-  { start: 0x6264, end: 0x6264, idx:  3529 },
-  { start: 0x626d, end: 0x6273, idx:  3530 },
-  { start: 0x627a, end: 0x627d, idx:  3537 },
-  { start: 0x628d, end: 0x6290, idx:  3541 },
-  { start: 0x62a6, end: 0x62a8, idx:  3545 },
-  { start: 0x62b3, end: 0x62c4, idx:  3548 },
-  { start: 0x62ce, end: 0x62ce, idx:  3566 },
-  { start: 0x62d5, end: 0x62da, idx:  3567 },
-  { start: 0x62ea, end: 0x62ea, idx:  3573 },
-  { start: 0x62f2, end: 0x62f4, idx:  3574 },
-  { start: 0x62fc, end: 0x6318, idx:  3577 },
-  { start: 0x6329, end: 0x632d, idx:  3606 },
-  { start: 0x6335, end: 0x635b, idx:  3611 },
-  { start: 0x6365, end: 0x63a6, idx:  3650 },
-  { start: 0x63ad, end: 0x63af, idx:  3716 },
-  { start: 0x63bd, end: 0x63d5, idx:  3719 },
-  { start: 0x63dc, end: 0x63f9, idx:  3744 },
-  { start: 0x6409, end: 0x6435, idx:  3774 },
-  { start: 0x643d, end: 0x643f, idx:  3819 },
-  { start: 0x644b, end: 0x6463, idx:  3822 },
-  { start: 0x646d, end: 0x6474, idx:  3847 },
-  { start: 0x647b, end: 0x647d, idx:  3855 },
-  { start: 0x6485, end: 0x6487, idx:  3858 },
-  { start: 0x648f, end: 0x6491, idx:  3861 },
-  { start: 0x6498, end: 0x64ac, idx:  3864 },
-  { start: 0x64b3, end: 0x64b3, idx:  3885 },
-  { start: 0x64bd, end: 0x64d7, idx:  3886 },
-  { start: 0x64e4, end: 0x6531, idx:  3913 },
-  { start: 0x653a, end: 0x6549, idx:  3991 },
-  { start: 0x6550, end: 0x6554, idx:  4007 },
-  { start: 0x655f, end: 0x6560, idx:  4012 },
-  { start: 0x6567, end: 0x656b, idx:  4014 },
-  { start: 0x657a, end: 0x658a, idx:  4019 },
-  { start: 0x6592, end: 0x65a6, idx:  4036 },
-  { start: 0x65ae, end: 0x65b4, idx:  4057 },
-  { start: 0x65bf, end: 0x65d8, idx:  4064 },
-  { start: 0x65df, end: 0x65df, idx:  4090 },
-  { start: 0x65f0, end: 0x6616, idx:  4091 },
-  { start: 0x661d, end: 0x6639, idx:  4130 },
-  { start: 0x6640, end: 0x6661, idx:  4159 },
-  { start: 0x666a, end: 0x666c, idx:  4193 },
-  { start: 0x6673, end: 0x6680, idx:  4196 },
-  { start: 0x668b, end: 0x6692, idx:  4210 },
-  { start: 0x6699, end: 0x66a4, idx:  4218 },
-  { start: 0x66ad, end: 0x66d4, idx:  4230 },
-  { start: 0x66db, end: 0x66df, idx:  4270 },
-  { start: 0x66e8, end: 0x66ee, idx:  4275 },
-  { start: 0x66fa, end: 0x66fb, idx:  4282 },
-  { start: 0x6705, end: 0x6707, idx:  4284 },
-  { start: 0x670e, end: 0x6722, idx:  4287 },
-  { start: 0x6733, end: 0x6733, idx:  4308 },
-  { start: 0x673e, end: 0x673e, idx:  4309 },
-  { start: 0x6745, end: 0x674c, idx:  4310 },
-  { start: 0x6754, end: 0x6755, idx:  4318 },
-  { start: 0x675d, end: 0x675d, idx:  4320 },
-  { start: 0x6766, end: 0x6784, idx:  4321 },
-  { start: 0x678e, end: 0x679b, idx:  4352 },
-  { start: 0x67b0, end: 0x67c9, idx:  4366 },
-  { start: 0x67d2, end: 0x67e6, idx:  4392 },
-  { start: 0x67f0, end: 0x67f9, idx:  4413 },
-  { start: 0x6814, end: 0x681f, idx:  4423 },
-  { start: 0x6827, end: 0x6833, idx:  4435 },
-  { start: 0x683b, end: 0x685b, idx:  4448 },
-  { start: 0x686b, end: 0x6888, idx:  4481 },
-  { start: 0x6896, end: 0x68b2, idx:  4511 },
-  { start: 0x68bb, end: 0x68bb, idx:  4540 },
-  { start: 0x68c5, end: 0x68dd, idx:  4541 },
-  { start: 0x68e5, end: 0x68fd, idx:  4566 },
-  { start: 0x6906, end: 0x6917, idx:  4591 },
-  { start: 0x6931, end: 0x693b, idx:  4609 },
-  { start: 0x6942, end: 0x694e, idx:  4620 },
-  { start: 0x6957, end: 0x695b, idx:  4633 },
-  { start: 0x6963, end: 0x6972, idx:  4638 },
-  { start: 0x697a, end: 0x6980, idx:  4654 },
-  { start: 0x698d, end: 0x6998, idx:  4661 },
-  { start: 0x69a1, end: 0x69af, idx:  4673 },
-  { start: 0x69b7, end: 0x69bc, idx:  4688 },
-  { start: 0x69c5, end: 0x69c8, idx:  4694 },
-  { start: 0x69d1, end: 0x69d7, idx:  4698 },
-  { start: 0x69e2, end: 0x69e5, idx:  4705 },
-  { start: 0x69ee, end: 0x69f5, idx:  4709 },
-  { start: 0x69fe, end: 0x6a03, idx:  4717 },
-  { start: 0x6a0f, end: 0x6a28, idx:  4723 },
-  { start: 0x6a30, end: 0x6a5b, idx:  4749 },
-  { start: 0x6a64, end: 0x6a6a, idx:  4793 },
-  { start: 0x6a71, end: 0x6a73, idx:  4800 },
-  { start: 0x6a7e, end: 0x6a91, idx:  4803 },
-  { start: 0x6a9b, end: 0x6ab4, idx:  4823 },
-  { start: 0x6abd, end: 0x6abf, idx:  4849 },
-  { start: 0x6ac6, end: 0x6add, idx:  4852 },
-  { start: 0x6ae4, end: 0x6af2, idx:  4876 },
-  { start: 0x6afc, end: 0x6b3f, idx:  4891 },
-  { start: 0x6b46, end: 0x6b60, idx:  4959 },
-  { start: 0x6b67, end: 0x6b75, idx:  4986 },
-  { start: 0x6b7d, end: 0x6b85, idx:  5001 },
-  { start: 0x6b97, end: 0x6bb0, idx:  5010 },
-  { start: 0x6bb8, end: 0x6bcc, idx:  5036 },
-  { start: 0x6bd6, end: 0x6bda, idx:  5057 },
-  { start: 0x6be1, end: 0x6be7, idx:  5062 },
-  { start: 0x6bee, end: 0x6c12, idx:  5069 },
-  { start: 0x6c19, end: 0x6c1f, idx:  5106 },
-  { start: 0x6c26, end: 0x6c3f, idx:  5113 },
-  { start: 0x6c4a, end: 0x6c5c, idx:  5139 },
-  { start: 0x6c67, end: 0x6c7b, idx:  5158 },
-  { start: 0x6c85, end: 0x6c89, idx:  5179 },
-  { start: 0x6c94, end: 0x6c9f, idx:  5184 },
-  { start: 0x6cb0, end: 0x6cb4, idx:  5196 },
-  { start: 0x6cc2, end: 0x6cc6, idx:  5201 },
-  { start: 0x6ccd, end: 0x6ce0, idx:  5206 },
-  { start: 0x6ce7, end: 0x6cf4, idx:  5226 },
-  { start: 0x6d04, end: 0x6d13, idx:  5240 },
-  { start: 0x6d1a, end: 0x6d1a, idx:  5256 },
-  { start: 0x6d26, end: 0x6d31, idx:  5257 },
-  { start: 0x6d39, end: 0x6d3f, idx:  5269 },
-  { start: 0x6d57, end: 0x6d57, idx:  5276 },
-  { start: 0x6d5e, end: 0x6d67, idx:  5277 },
-  { start: 0x6d6f, end: 0x6d70, idx:  5287 },
-  { start: 0x6d7c, end: 0x6d87, idx:  5289 },
-  { start: 0x6d91, end: 0x6d98, idx:  5301 },
-  { start: 0x6daa, end: 0x6dac, idx:  5309 },
-  { start: 0x6db4, end: 0x6dcf, idx:  5312 },
-  { start: 0x6dd6, end: 0x6e04, idx:  5340 },
-  { start: 0x6e1e, end: 0x6e27, idx:  5387 },
-  { start: 0x6e32, end: 0x6e3c, idx:  5397 },
-  { start: 0x6e44, end: 0x6e68, idx:  5408 },
-  { start: 0x6e73, end: 0x6e73, idx:  5445 },
-  { start: 0x6e7b, end: 0x6e7d, idx:  5446 },
-  { start: 0x6e8d, end: 0x6e99, idx:  5449 },
-  { start: 0x6ea0, end: 0x6ea0, idx:  5462 },
-  { start: 0x6ea7, end: 0x6eb3, idx:  5463 },
-  { start: 0x6ebb, end: 0x6ecf, idx:  5476 },
-  { start: 0x6eeb, end: 0x6eee, idx:  5497 },
-  { start: 0x6ef9, end: 0x6efd, idx:  5501 },
-  { start: 0x6f04, end: 0x6f0d, idx:  5506 },
-  { start: 0x6f16, end: 0x6f1b, idx:  5516 },
-  { start: 0x6f26, end: 0x6f3c, idx:  5522 },
-  { start: 0x6f4f, end: 0x6f6c, idx:  5545 },
-  { start: 0x6f7d, end: 0x6fbc, idx:  5575 },
-  { start: 0x6fc5, end: 0x6fca, idx:  5639 },
-  { start: 0x6fda, end: 0x6fde, idx:  5645 },
-  { start: 0x6fe8, end: 0x6fe9, idx:  5650 },
-  { start: 0x6ff0, end: 0x700d, idx:  5652 },
-  { start: 0x7017, end: 0x7017, idx:  5682 },
-  { start: 0x7020, end: 0x7023, idx:  5683 },
-  { start: 0x702f, end: 0x703c, idx:  5687 },
-  { start: 0x7043, end: 0x7055, idx:  5701 },
-  { start: 0x705d, end: 0x7065, idx:  5720 },
-  { start: 0x706c, end: 0x706e, idx:  5729 },
-  { start: 0x7075, end: 0x7076, idx:  5732 },
-  { start: 0x707e, end: 0x7086, idx:  5734 },
-  { start: 0x7094, end: 0x709b, idx:  5743 },
-  { start: 0x70a4, end: 0x70a4, idx:  5751 },
-  { start: 0x70ab, end: 0x70b7, idx:  5752 },
-  { start: 0x70ca, end: 0x70ca, idx:  5765 },
-  { start: 0x70d1, end: 0x70dc, idx:  5766 },
-  { start: 0x70e4, end: 0x70e4, idx:  5778 },
-  { start: 0x70fa, end: 0x70fa, idx:  5779 },
-  { start: 0x7103, end: 0x710f, idx:  5780 },
-  { start: 0x711e, end: 0x7120, idx:  5793 },
-  { start: 0x712b, end: 0x7131, idx:  5796 },
-  { start: 0x7138, end: 0x7138, idx:  5803 },
-  { start: 0x7141, end: 0x7160, idx:  5804 },
-  { start: 0x7168, end: 0x7168, idx:  5836 },
-  { start: 0x7179, end: 0x7179, idx:  5837 },
-  { start: 0x7180, end: 0x7192, idx:  5838 },
-  { start: 0x719a, end: 0x71a2, idx:  5857 },
-  { start: 0x71af, end: 0x71b3, idx:  5866 },
-  { start: 0x71ba, end: 0x71c4, idx:  5871 },
-  { start: 0x71cb, end: 0x71cc, idx:  5882 },
-  { start: 0x71d3, end: 0x71dc, idx:  5884 },
-  { start: 0x71f8, end: 0x7200, idx:  5894 },
-  { start: 0x7207, end: 0x7209, idx:  5903 },
-  { start: 0x7213, end: 0x7224, idx:  5906 },
-  { start: 0x722b, end: 0x7239, idx:  5924 },
-  { start: 0x7241, end: 0x7245, idx:  5939 },
-  { start: 0x724e, end: 0x7293, idx:  5944 },
-  { start: 0x729b, end: 0x729b, idx:  6014 },
-  { start: 0x72a8, end: 0x72b4, idx:  6015 },
-  { start: 0x72be, end: 0x72cc, idx:  6028 },
-  { start: 0x72d5, end: 0x72d8, idx:  6043 },
-  { start: 0x72df, end: 0x72e5, idx:  6047 },
-  { start: 0x72f3, end: 0x7343, idx:  6054 },
-  { start: 0x734d, end: 0x7386, idx:  6135 },
-  { start: 0x738e, end: 0x73ad, idx:  6193 },
-  { start: 0x73b5, end: 0x73e9, idx:  6225 },
-  { start: 0x73f4, end: 0x740a, idx:  6278 },
-  { start: 0x7411, end: 0x7411, idx:  6301 },
-  { start: 0x741a, end: 0x741b, idx:  6302 },
-  { start: 0x7424, end: 0x7431, idx:  6304 },
-  { start: 0x7439, end: 0x7439, idx:  6318 },
-  { start: 0x7440, end: 0x7472, idx:  6319 },
-  { start: 0x7480, end: 0x74bf, idx:  6370 },
-  { start: 0x74c8, end: 0x74ff, idx:  6434 },
-  { start: 0x7506, end: 0x7506, idx:  6490 },
-  { start: 0x7512, end: 0x7517, idx:  6491 },
-  { start: 0x7520, end: 0x752f, idx:  6497 },
-  { start: 0x7536, end: 0x7557, idx:  6513 },
-  { start: 0x755e, end: 0x7561, idx:  6547 },
-  { start: 0x756f, end: 0x7571, idx:  6551 },
-  { start: 0x7579, end: 0x7585, idx:  6554 },
-  { start: 0x7590, end: 0x75a4, idx:  6567 },
-  { start: 0x75b4, end: 0x75cf, idx:  6588 },
-  { start: 0x75d7, end: 0x75f1, idx:  6616 },
-  { start: 0x75f9, end: 0x75f9, idx:  6643 },
-  { start: 0x7600, end: 0x764b, idx:  6644 },
-  { start: 0x7655, end: 0x7665, idx:  6720 },
-  { start: 0x766d, end: 0x7674, idx:  6737 },
-  { start: 0x7681, end: 0x7685, idx:  6745 },
-  { start: 0x768c, end: 0x768d, idx:  6750 },
-  { start: 0x7695, end: 0x76ad, idx:  6752 },
-  { start: 0x76bd, end: 0x76d9, idx:  6777 },
-  { start: 0x76e0, end: 0x7784, idx:  6806 },
-  { start: 0x778c, end: 0x778d, idx:  6971 },
-  { start: 0x7794, end: 0x77b5, idx:  6973 },
-  { start: 0x77be, end: 0x77c9, idx:  7007 },
-  { start: 0x77d1, end: 0x77fb, idx:  7019 },
-  { start: 0x7805, end: 0x7811, idx:  7062 },
-  { start: 0x781d, end: 0x7823, idx:  7075 },
-  { start: 0x782d, end: 0x7837, idx:  7082 },
-  { start: 0x7843, end: 0x7852, idx:  7093 },
-  { start: 0x785c, end: 0x786e, idx:  7109 },
-  { start: 0x787a, end: 0x787e, idx:  7128 },
-  { start: 0x788a, end: 0x78b3, idx:  7133 },
-  { start: 0x78bb, end: 0x78bf, idx:  7175 },
-  { start: 0x78c7, end: 0x78ea, idx:  7180 },
-  { start: 0x78f2, end: 0x7910, idx:  7216 },
-  { start: 0x791a, end: 0x795c, idx:  7247 },
-  { start: 0x7967, end: 0x796b, idx:  7314 },
-  { start: 0x7972, end: 0x7972, idx:  7319 },
-  { start: 0x7979, end: 0x797e, idx:  7320 },
-  { start: 0x798b, end: 0x79a1, idx:  7326 },
-  { start: 0x79a8, end: 0x79bb, idx:  7349 },
-  { start: 0x79c2, end: 0x79f1, idx:  7369 },
-  { start: 0x79f8, end: 0x7a3a, idx:  7417 },
-  { start: 0x7a44, end: 0x7a4c, idx:  7484 },
-  { start: 0x7a55, end: 0x7a6d, idx:  7493 },
-  { start: 0x7a75, end: 0x7a94, idx:  7518 },
-  { start: 0x7a9e, end: 0x7aa3, idx:  7550 },
-  { start: 0x7aac, end: 0x7aac, idx:  7556 },
-  { start: 0x7ab3, end: 0x7abc, idx:  7557 },
-  { start: 0x7ac6, end: 0x7ad1, idx:  7567 },
-  { start: 0x7adb, end: 0x7adb, idx:  7579 },
-  { start: 0x7ae8, end: 0x7af4, idx:  7580 },
-  { start: 0x7afb, end: 0x7afe, idx:  7593 },
-  { start: 0x7b07, end: 0x7b07, idx:  7597 },
-  { start: 0x7b14, end: 0x7b14, idx:  7598 },
-  { start: 0x7b1f, end: 0x7b34, idx:  7599 },
-  { start: 0x7b3d, end: 0x7b47, idx:  7621 },
-  { start: 0x7b4e, end: 0x7b4e, idx:  7632 },
-  { start: 0x7b55, end: 0x7b55, idx:  7633 },
-  { start: 0x7b60, end: 0x7b77, idx:  7634 },
-  { start: 0x7b84, end: 0x7ba5, idx:  7658 },
-  { start: 0x7bac, end: 0x7bca, idx:  7692 },
-  { start: 0x7bd4, end: 0x7bdb, idx:  7723 },
-  { start: 0x7be8, end: 0x7bea, idx:  7731 },
-  { start: 0x7bf2, end: 0x7c0f, idx:  7734 },
-  { start: 0x7c19, end: 0x7c3a, idx:  7764 },
-  { start: 0x7c46, end: 0x7c4a, idx:  7798 },
-  { start: 0x7c51, end: 0x7c72, idx:  7803 },
-  { start: 0x7c79, end: 0x7c7d, idx:  7837 },
-  { start: 0x7c86, end: 0x7c87, idx:  7842 },
-  { start: 0x7c8f, end: 0x7c94, idx:  7844 },
-  { start: 0x7c9e, end: 0x7ca6, idx:  7850 },
-  { start: 0x7cb0, end: 0x7cdd, idx:  7859 },
-  { start: 0x7ce6, end: 0x7ceb, idx:  7905 },
-  { start: 0x7cf5, end: 0x7cf5, idx:  7911 },
-  { start: 0x7d03, end: 0x7d16, idx:  7912 },
-  { start: 0x7d1d, end: 0x7d31, idx:  7932 },
-  { start: 0x7d3c, end: 0x7d5d, idx:  7953 },
-  { start: 0x7d65, end: 0x7d70, idx:  7987 },
-  { start: 0x7d78, end: 0x7d9e, idx:  7999 },
-  { start: 0x7da6, end: 0x7daa, idx:  8038 },
-  { start: 0x7db3, end: 0x7db9, idx:  8043 },
-  { start: 0x7dc2, end: 0x7dce, idx:  8050 },
-  { start: 0x7dd7, end: 0x7dd9, idx:  8063 },
-  { start: 0x7de2, end: 0x7e00, idx:  8066 },
-  { start: 0x7e08, end: 0x7e08, idx:  8097 },
-  { start: 0x7e10, end: 0x7e20, idx:  8098 },
-  { start: 0x7e27, end: 0x7e36, idx:  8115 },
-  { start: 0x7e3f, end: 0x7e47, idx:  8131 },
-  { start: 0x7e4e, end: 0x7e58, idx:  8140 },
-  { start: 0x7e5f, end: 0x7e9e, idx:  8151 },
-  { start: 0x7f3b, end: 0x7f47, idx:  8215 },
-  { start: 0x7f4f, end: 0x7f53, idx:  8228 },
-  { start: 0x7f5b, end: 0x7f66, idx:  8233 },
-  { start: 0x7f6d, end: 0x7f71, idx:  8245 },
-  { start: 0x7f7d, end: 0x7f80, idx:  8250 },
-  { start: 0x7f8b, end: 0x7fad, idx:  8254 },
-  { start: 0x7fb4, end: 0x7fb4, idx:  8289 },
-  { start: 0x7fbc, end: 0x7fcf, idx:  8290 },
-  { start: 0x7fdb, end: 0x7ff2, idx:  8310 },
-  { start: 0x7ffa, end: 0x7fff, idx:  8334 },
-  { start: 0x8007, end: 0x8016, idx:  8340 },
-  { start: 0x801d, end: 0x8044, idx:  8356 },
-  { start: 0x8060, end: 0x8066, idx:  8396 },
-  { start: 0x806d, end: 0x8075, idx:  8403 },
-  { start: 0x8081, end: 0x8081, idx:  8412 },
-  { start: 0x8088, end: 0x808e, idx:  8413 },
-  { start: 0x809c, end: 0x809e, idx:  8420 },
-  { start: 0x80a6, end: 0x80ab, idx:  8423 },
-  { start: 0x80b8, end: 0x80b9, idx:  8429 },
-  { start: 0x80c8, end: 0x80d8, idx:  8431 },
-  { start: 0x80e0, end: 0x80e0, idx:  8448 },
-  { start: 0x80ed, end: 0x8103, idx:  8449 },
-  { start: 0x810b, end: 0x810b, idx:  8472 },
-  { start: 0x8116, end: 0x813c, idx:  8473 },
-  { start: 0x8145, end: 0x8157, idx:  8512 },
-  { start: 0x8160, end: 0x816f, idx:  8531 },
-  { start: 0x8177, end: 0x8177, idx:  8547 },
-  { start: 0x8181, end: 0x81a2, idx:  8548 },
-  { start: 0x81ae, end: 0x81b4, idx:  8582 },
-  { start: 0x81bb, end: 0x81bb, idx:  8589 },
-  { start: 0x81c3, end: 0x81e4, idx:  8590 },
-  { start: 0x81eb, end: 0x8203, idx:  8624 },
-  { start: 0x820f, end: 0x8228, idx:  8649 },
-  { start: 0x8232, end: 0x823a, idx:  8675 },
-  { start: 0x8243, end: 0x826d, idx:  8684 },
-  { start: 0x8274, end: 0x8274, idx:  8727 },
-  { start: 0x827b, end: 0x82bf, idx:  8728 },
-  { start: 0x82c6, end: 0x82c6, idx:  8797 },
-  { start: 0x82d0, end: 0x82ef, idx:  8798 },
-  { start: 0x82f6, end: 0x830b, idx:  8830 },
-  { start: 0x831b, end: 0x8322, idx:  8852 },
-  { start: 0x832c, end: 0x8357, idx:  8860 },
-  { start: 0x8370, end: 0x8370, idx:  8904 },
-  { start: 0x8378, end: 0x8386, idx:  8905 },
-  { start: 0x838d, end: 0x839d, idx:  8920 },
-  { start: 0x83a6, end: 0x83ad, idx:  8937 },
-  { start: 0x83be, end: 0x83c0, idx:  8945 },
-  { start: 0x83c7, end: 0x83d4, idx:  8948 },
-  { start: 0x83dd, end: 0x83dd, idx:  8962 },
-  { start: 0x83e8, end: 0x83ea, idx:  8963 },
-  { start: 0x83f6, end: 0x8419, idx:  8966 },
-  { start: 0x842f, end: 0x842f, idx:  9002 },
-  { start: 0x8439, end: 0x8439, idx:  9003 },
-  { start: 0x8445, end: 0x8485, idx:  9004 },
-  { start: 0x8492, end: 0x8495, idx:  9069 },
-  { start: 0x849e, end: 0x849e, idx:  9073 },
-  { start: 0x84a6, end: 0x84d3, idx:  9074 },
-  { start: 0x84dc, end: 0x84dc, idx:  9120 },
-  { start: 0x84e7, end: 0x8510, idx:  9121 },
-  { start: 0x851c, end: 0x8536, idx:  9163 },
-  { start: 0x853f, end: 0x853f, idx:  9190 },
-  { start: 0x8546, end: 0x8546, idx:  9191 },
-  { start: 0x854f, end: 0x8564, idx:  9192 },
-  { start: 0x856b, end: 0x856f, idx:  9214 },
-  { start: 0x8579, end: 0x85ad, idx:  9219 },
-  { start: 0x85b4, end: 0x85ce, idx:  9272 },
-  { start: 0x85d8, end: 0x8605, idx:  9299 },
-  { start: 0x860d, end: 0x8629, idx:  9345 },
-  { start: 0x8636, end: 0x8646, idx:  9374 },
-  { start: 0x8652, end: 0x867a, idx:  9391 },
-  { start: 0x8688, end: 0x86c5, idx:  9432 },
-  { start: 0x86d1, end: 0x86e7, idx:  9494 },
-  { start: 0x86fa, end: 0x86fd, idx:  9517 },
-  { start: 0x8704, end: 0x8732, idx:  9521 },
-  { start: 0x8739, end: 0x8745, idx:  9568 },
-  { start: 0x874d, end: 0x874d, idx:  9581 },
-  { start: 0x8758, end: 0x8765, idx:  9582 },
-  { start: 0x876f, end: 0x8772, idx:  9596 },
-  { start: 0x877b, end: 0x877b, idx:  9600 },
-  { start: 0x8783, end: 0x87b5, idx:  9601 },
-  { start: 0x87be, end: 0x87c1, idx:  9652 },
-  { start: 0x87c8, end: 0x87ce, idx:  9656 },
-  { start: 0x87d5, end: 0x881f, idx:  9663 },
-  { start: 0x8828, end: 0x8869, idx:  9738 },
-  { start: 0x8871, end: 0x8871, idx:  9804 },
-  { start: 0x8879, end: 0x8880, idx:  9805 },
-  { start: 0x8898, end: 0x88a0, idx:  9813 },
-  { start: 0x88a8, end: 0x88aa, idx:  9822 },
-  { start: 0x88ba, end: 0x88c0, idx:  9825 },
-  { start: 0x88ca, end: 0x88d3, idx:  9832 },
-  { start: 0x88db, end: 0x88de, idx:  9842 },
-  { start: 0x88e7, end: 0x88e7, idx:  9846 },
-  { start: 0x88ef, end: 0x88f7, idx:  9847 },
-  { start: 0x8901, end: 0x8906, idx:  9856 },
-  { start: 0x890d, end: 0x8928, idx:  9862 },
-  { start: 0x8930, end: 0x8963, idx:  9890 },
-  { start: 0x896b, end: 0x897d, idx:  9942 },
-  { start: 0x8989, end: 0x89a5, idx:  9961 },
-  { start: 0x89b0, end: 0x89bc, idx:  9990 },
-  { start: 0x89d4, end: 0x89d8, idx: 10003 },
-  { start: 0x89e5, end: 0x8a07, idx: 10008 },
-  { start: 0x8a0f, end: 0x8a15, idx: 10043 },
-  { start: 0x8a1e, end: 0x8a67, idx: 10050 },
-  { start: 0x8a75, end: 0x8a9f, idx: 10124 },
-  { start: 0x8aa7, end: 0x8aca, idx: 10167 },
-  { start: 0x8ad1, end: 0x8adf, idx: 10203 },
-  { start: 0x8aec, end: 0x8b11, idx: 10218 },
-  { start: 0x8b1c, end: 0x8b1f, idx: 10256 },
-  { start: 0x8b2d, end: 0x8b30, idx: 10260 },
-  { start: 0x8b37, end: 0x8b63, idx: 10264 },
-  { start: 0x8b6d, end: 0x8b6d, idx: 10309 },
-  { start: 0x8b76, end: 0x8b95, idx: 10310 },
-  { start: 0x8b9c, end: 0x8b9f, idx: 10342 },
-  { start: 0x8c38, end: 0x8c3e, idx: 10346 },
-  { start: 0x8c45, end: 0x8c7e, idx: 10353 },
-  { start: 0x8c86, end: 0x8c9c, idx: 10411 },
-  { start: 0x8ca4, end: 0x8ca4, idx: 10434 },
-  { start: 0x8cb9, end: 0x8cba, idx: 10435 },
-  { start: 0x8cc5, end: 0x8ce1, idx: 10437 },
-  { start: 0x8ce8, end: 0x8d09, idx: 10466 },
-  { start: 0x8d12, end: 0x8d1b, idx: 10500 },
-  { start: 0x8d65, end: 0x8d6e, idx: 10510 },
-  { start: 0x8d7f, end: 0x8d95, idx: 10520 },
-  { start: 0x8d9e, end: 0x8dd9, idx: 10543 },
-  { start: 0x8de4, end: 0x8df4, idx: 10603 },
-  { start: 0x8dfd, end: 0x8e16, idx: 10620 },
-  { start: 0x8e20, end: 0x8e27, idx: 10646 },
-  { start: 0x8e31, end: 0x8e41, idx: 10654 },
-  { start: 0x8e4b, end: 0x8e54, idx: 10671 },
-  { start: 0x8e5b, end: 0x8e62, idx: 10681 },
-  { start: 0x8e69, end: 0x8e71, idx: 10689 },
-  { start: 0x8e79, end: 0x8e7b, idx: 10698 },
-  { start: 0x8e82, end: 0x8e89, idx: 10701 },
-  { start: 0x8e90, end: 0x8ec7, idx: 10709 },
-  { start: 0x8ecf, end: 0x8ed4, idx: 10765 },
-  { start: 0x8edc, end: 0x8edc, idx: 10771 },
-  { start: 0x8ee8, end: 0x8f08, idx: 10772 },
-  { start: 0x8f0f, end: 0x8f47, idx: 10805 },
-  { start: 0x8f4f, end: 0x8f5e, idx: 10862 },
-  { start: 0x8f65, end: 0x8f65, idx: 10878 },
-  { start: 0x8f9d, end: 0x8fa6, idx: 10879 },
-  { start: 0x8fb5, end: 0x8fd5, idx: 10889 },
-  { start: 0x8fe0, end: 0x900c, idx: 10922 },
-  { start: 0x9018, end: 0x901b, idx: 10967 },
-  { start: 0x9028, end: 0x9037, idx: 10971 },
-  { start: 0x903f, end: 0x9044, idx: 10987 },
-  { start: 0x904c, end: 0x904c, idx: 10993 },
-  { start: 0x905b, end: 0x9079, idx: 10994 },
-  { start: 0x9085, end: 0x90a5, idx: 11025 },
-  { start: 0x90b0, end: 0x90b6, idx: 11058 },
-  { start: 0x90bd, end: 0x90f6, idx: 11065 },
-  { start: 0x90fe, end: 0x9148, idx: 11123 },
-  { start: 0x914f, end: 0x916d, idx: 11198 },
-  { start: 0x9174, end: 0x91c5, idx: 11229 },
-  { start: 0x91d3, end: 0x9251, idx: 11311 },
-  { start: 0x9258, end: 0x927f, idx: 11438 },
-  { start: 0x9288, end: 0x92f0, idx: 11478 },
-  { start: 0x92f9, end: 0x9315, idx: 11583 },
-  { start: 0x931c, end: 0x932a, idx: 11612 },
-  { start: 0x9333, end: 0x9337, idx: 11627 },
-  { start: 0x9347, end: 0x9349, idx: 11632 },
-  { start: 0x9350, end: 0x93ab, idx: 11635 },
-  { start: 0x93b4, end: 0x93ba, idx: 11727 },
-  { start: 0x93c1, end: 0x93e7, idx: 11734 },
-  { start: 0x93f7, end: 0x9417, idx: 11773 },
-  { start: 0x941f, end: 0x941f, idx: 11806 },
-  { start: 0x942e, end: 0x9434, idx: 11807 },
-  { start: 0x943b, end: 0x944c, idx: 11814 },
-  { start: 0x9455, end: 0x9472, idx: 11832 },
-  { start: 0x9483, end: 0x9484, idx: 11862 },
-  { start: 0x9578, end: 0x958e, idx: 11864 },
-  { start: 0x959d, end: 0x95ac, idx: 11887 },
-  { start: 0x95b4, end: 0x95bf, idx: 11903 },
-  { start: 0x95c6, end: 0x95e6, idx: 11915 },
-  { start: 0x961d, end: 0x9641, idx: 11948 },
-  { start: 0x9652, end: 0x9658, idx: 11985 },
-  { start: 0x9661, end: 0x9661, idx: 11992 },
-  { start: 0x966e, end: 0x9674, idx: 11993 },
-  { start: 0x967b, end: 0x9689, idx: 12000 },
-  { start: 0x9691, end: 0x96b3, idx: 12015 },
-  { start: 0x96ba, end: 0x96ba, idx: 12050 },
-  { start: 0x96ca, end: 0x96ca, idx: 12051 },
-  { start: 0x96d2, end: 0x96df, idx: 12052 },
-  { start: 0x96e9, end: 0x96f1, idx: 12066 },
-  { start: 0x96fa, end: 0x96fa, idx: 12075 },
-  { start: 0x9702, end: 0x9709, idx: 12076 },
-  { start: 0x971a, end: 0x9728, idx: 12084 },
-  { start: 0x9731, end: 0x9733, idx: 12099 },
-  { start: 0x9741, end: 0x9743, idx: 12102 },
-  { start: 0x974a, end: 0x975b, idx: 12105 },
-  { start: 0x9763, end: 0x9780, idx: 12123 },
-  { start: 0x9789, end: 0x9789, idx: 12153 },
-  { start: 0x9795, end: 0x97a2, idx: 12154 },
-  { start: 0x97ac, end: 0x97e4, idx: 12168 },
-  { start: 0x97ef, end: 0x97fa, idx: 12225 },
-  { start: 0x9807, end: 0x9835, idx: 12237 },
-  { start: 0x983e, end: 0x984a, idx: 12284 },
-  { start: 0x9851, end: 0x985a, idx: 12297 },
-  { start: 0x9862, end: 0x986c, idx: 12307 },
-  { start: 0x98ab, end: 0x98cc, idx: 12318 },
-  { start: 0x98e1, end: 0x98ea, idx: 12352 },
-  { start: 0x98f3, end: 0x98f6, idx: 12362 },
-  { start: 0x9902, end: 0x9908, idx: 12366 },
-  { start: 0x9911, end: 0x9960, idx: 12373 },
-  { start: 0x999b, end: 0x999f, idx: 12453 },
-  { start: 0x99a6, end: 0x99a6, idx: 12458 },
-  { start: 0x99b0, end: 0x99c9, idx: 12459 },
-  { start: 0x99d3, end: 0x99de, idx: 12485 },
-  { start: 0x99e7, end: 0x9a04, idx: 12497 },
-  { start: 0x9a0b, end: 0x9a16, idx: 12527 },
-  { start: 0x9a1e, end: 0x9a38, idx: 12539 },
-  { start: 0x9a41, end: 0x9a56, idx: 12566 },
-  { start: 0x9a5d, end: 0x9a5d, idx: 12588 },
-  { start: 0x9aaa, end: 0x9b3d, idx: 12589 },
-  { start: 0x9b48, end: 0x9b4c, idx: 12737 },
-  { start: 0x9b55, end: 0x9b9e, idx: 12742 },
-  { start: 0x9ba6, end: 0x9bd0, idx: 12816 },
-  { start: 0x9bd7, end: 0x9c02, idx: 12859 },
-  { start: 0x9c0b, end: 0x9c2a, idx: 12903 },
-  { start: 0x9c31, end: 0x9c7b, idx: 12935 },
-  { start: 0x9ce6, end: 0x9ce6, idx: 13010 },
-  { start: 0x9cf2, end: 0x9cf9, idx: 13011 },
-  { start: 0x9d02, end: 0x9d02, idx: 13019 },
-  { start: 0x9d0b, end: 0x9d1e, idx: 13020 },
-  { start: 0x9d2f, end: 0x9d4a, idx: 13040 },
-  { start: 0x9d53, end: 0x9d54, idx: 13068 },
-  { start: 0x9d5f, end: 0x9d98, idx: 13070 },
-  { start: 0x9da1, end: 0x9da1, idx: 13128 },
-  { start: 0x9daa, end: 0x9dca, idx: 13129 },
-  { start: 0x9dd4, end: 0x9df4, idx: 13162 },
-  { start: 0x9dfe, end: 0x9e1d, idx: 13195 },
-  { start: 0x9e7a, end: 0x9e87, idx: 13227 },
-  { start: 0x9e8e, end: 0x9e8f, idx: 13241 },
-  { start: 0x9e96, end: 0x9eb5, idx: 13243 },
-  { start: 0x9ec6, end: 0x9ecb, idx: 13275 },
-  { start: 0x9ed5, end: 0x9ed5, idx: 13281 },
-  { start: 0x9edf, end: 0x9ef8, idx: 13282 },
-  { start: 0x9eff, end: 0x9f47, idx: 13308 },
-  { start: 0x9f53, end: 0x9f5e, idx: 13381 },
-  { start: 0x9f68, end: 0x9f7d, idx: 13393 },
-  { start: 0x9f8f, end: 0x9f97, idx: 13415 },
-  { start: 0x9f9e, end: 0x9fa5, idx: 13424 },
-  { start: 0xff5e, end: 0xff5e, idx: 13432 },
-  { start: 0xffff, end: 0xffff, idx:     0 }
-};
-
-/* The values corresponding to the table can be computed using
-
-    egrep '^0x[[:xdigit:]][[:xdigit:]][[:xdigit:]][[:xdigit:]]' \
-      .../eastasia/jis/jis0212.txt | awk '{ print $2, $1 }' |
-    sort -u | perl tab.pl
-
-   where tab.pl contains:
-
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   $first=$last=$idx=0;
-
-   sub fmt {
-     printf ("\n ") if (($n % 6) == 0);
-     ++$n;
-     my($val) = pop(@_);
-     printf (" \"\\x%02x\\x%02x\",",
-	     $val < 256 ? $val : int($val / 256),
-	     $val < 256 ? 0 : $val % 256);
-   }
-
-   while (<>) {
-     local($ucs,$jis,%rest) = split;
-     local($u)=hex($ucs);
-     local($j)=hex($jis);
-     if ($u - $last > 6) {
-       if ($last != 0) {
-	 $idx += $last - $first + 1;
-       }
-       $first=$u;
-     } else {
-       for ($m = $last + 1; $m < $u; ++$m) {
-	 fmt (0);
-       }
-     }
-     fmt ($j);
-     $last=$u;
-   }
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-const char __jisx0212_from_ucs[][2] =
-{
-  "\x22\x37", "\x22\x42", "\x00\x00", "\x00\x00", "\x22\x70", "\x00\x00",
-  "\x22\x43", "\x00\x00", "\x00\x00", "\x22\x6d", "\x22\x6c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x22\x6e", "\x22\x34", "\x22\x31", "\x00\x00",
-  "\x22\x6b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x22\x44",
-  "\x2a\x22", "\x2a\x21", "\x2a\x24", "\x2a\x2a", "\x2a\x23", "\x2a\x29",
-  "\x29\x21", "\x2a\x2e", "\x2a\x32", "\x2a\x31", "\x2a\x34", "\x2a\x33",
-  "\x2a\x40", "\x2a\x3f", "\x2a\x42", "\x2a\x41", "\x00\x00", "\x2a\x50",
-  "\x2a\x52", "\x2a\x51", "\x2a\x54", "\x2a\x58", "\x2a\x53", "\x00\x00",
-  "\x29\x2c", "\x2a\x63", "\x2a\x62", "\x2a\x65", "\x2a\x64", "\x2a\x72",
-  "\x29\x30", "\x29\x4e", "\x2b\x22", "\x2b\x21", "\x2b\x24", "\x2b\x2a",
-  "\x2b\x23", "\x2b\x29", "\x29\x41", "\x2b\x2e", "\x2b\x32", "\x2b\x31",
-  "\x2b\x34", "\x2b\x33", "\x2b\x40", "\x2b\x3f", "\x2b\x42", "\x2b\x41",
-  "\x29\x43", "\x2b\x50", "\x2b\x52", "\x2b\x51", "\x2b\x54", "\x2b\x58",
-  "\x2b\x53", "\x00\x00", "\x29\x4c", "\x2b\x63", "\x2b\x62", "\x2b\x65",
-  "\x2b\x64", "\x2b\x72", "\x29\x50", "\x2b\x73", "\x2a\x27", "\x2b\x27",
-  "\x2a\x25", "\x2b\x25", "\x2a\x28", "\x2b\x28", "\x2a\x2b", "\x2b\x2b",
-  "\x2a\x2c", "\x2b\x2c", "\x2a\x2f", "\x2b\x2f", "\x2a\x2d", "\x2b\x2d",
-  "\x2a\x30", "\x2b\x30", "\x29\x22", "\x29\x42", "\x2a\x37", "\x2b\x37",
-  "\x00\x00", "\x00\x00", "\x2a\x36", "\x2b\x36", "\x2a\x38", "\x2b\x38",
-  "\x2a\x35", "\x2b\x35", "\x2a\x3a", "\x2b\x3a", "\x2a\x3b", "\x2b\x3b",
-  "\x2a\x3d", "\x2b\x3d", "\x2a\x3c", "\x00\x00", "\x2a\x3e", "\x2b\x3e",
-  "\x29\x24", "\x29\x44", "\x2a\x47", "\x2b\x47", "\x2a\x45", "\x2b\x45",
-  "\x00\x00", "\x00\x00", "\x2a\x46", "\x2b\x46", "\x2a\x44", "\x29\x45",
-  "\x29\x26", "\x29\x46", "\x2a\x48", "\x2b\x48", "\x2a\x49", "\x2b\x49",
-  "\x29\x47", "\x2a\x4a", "\x2b\x4a", "\x2a\x4c", "\x2b\x4c", "\x2a\x4b",
-  "\x2b\x4b", "\x29\x29", "\x29\x49", "\x29\x28", "\x29\x48", "\x2a\x4d",
-  "\x2b\x4d", "\x2a\x4f", "\x2b\x4f", "\x2a\x4e", "\x2b\x4e", "\x29\x4a",
-  "\x29\x2b", "\x29\x4b", "\x2a\x57", "\x2b\x57", "\x00\x00", "\x00\x00",
-  "\x2a\x56", "\x2b\x56", "\x29\x2d", "\x29\x4d", "\x2a\x59", "\x2b\x59",
-  "\x2a\x5b", "\x2b\x5b", "\x2a\x5a", "\x2b\x5a", "\x2a\x5c", "\x2b\x5c",
-  "\x2a\x5d", "\x2b\x5d", "\x2a\x5f", "\x2b\x5f", "\x2a\x5e", "\x2b\x5e",
-  "\x2a\x61", "\x2b\x61", "\x2a\x60", "\x2b\x60", "\x29\x2f", "\x29\x4f",
-  "\x2a\x6c", "\x2b\x6c", "\x2a\x69", "\x2b\x69", "\x2a\x66", "\x2b\x66",
-  "\x2a\x6b", "\x2b\x6b", "\x2a\x68", "\x2b\x68", "\x2a\x6a", "\x2b\x6a",
-  "\x2a\x71", "\x2b\x71", "\x2a\x74", "\x2b\x74", "\x2a\x73", "\x2a\x75",
-  "\x2b\x75", "\x2a\x77", "\x2b\x77", "\x2a\x76", "\x2b\x76", "\x2a\x26",
-  "\x2b\x26", "\x2a\x43", "\x2b\x43", "\x2a\x55", "\x2b\x55", "\x2a\x67",
-  "\x2b\x67", "\x2a\x70", "\x2b\x70", "\x2a\x6d", "\x2b\x6d", "\x2a\x6f",
-  "\x2b\x6f", "\x2a\x6e", "\x2b\x6e", "\x2b\x39", "\x22\x30", "\x22\x2f",
-  "\x22\x32", "\x22\x36", "\x22\x35", "\x00\x00", "\x22\x33", "\x22\x38",
-  "\x22\x39", "\x26\x61", "\x00\x00", "\x26\x62", "\x26\x63", "\x26\x64",
-  "\x00\x00", "\x26\x67", "\x00\x00", "\x26\x69", "\x26\x6c", "\x26\x76",
-  "\x26\x65", "\x26\x6a", "\x26\x71", "\x26\x72", "\x26\x73", "\x26\x74",
-  "\x26\x7b", "\x26\x78", "\x26\x75", "\x26\x7a", "\x26\x77", "\x26\x79",
-  "\x26\x7c", "\x27\x42", "\x27\x43", "\x27\x44", "\x27\x45", "\x27\x46",
-  "\x27\x47", "\x27\x48", "\x27\x49", "\x27\x4a", "\x27\x4b", "\x27\x4c",
-  "\x00\x00", "\x27\x4d", "\x27\x4e", "\x27\x72", "\x27\x73", "\x27\x74",
-  "\x27\x75", "\x27\x76", "\x27\x77", "\x27\x78", "\x27\x79", "\x27\x7a",
-  "\x27\x7b", "\x27\x7c", "\x00\x00", "\x27\x7d", "\x27\x7e", "\x22\x71",
-  "\x22\x6f", "\x30\x21", "\x00\x00", "\x30\x22", "\x30\x23", "\x30\x24",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x25",
-  "\x30\x26", "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x27", "\x30\x28",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x29", "\x00\x00", "\x00\x00",
-  "\x30\x2a", "\x00\x00", "\x00\x00", "\x30\x2b", "\x30\x2c", "\x30\x2d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x2e", "\x30\x2f",
-  "\x30\x30", "\x00\x00", "\x00\x00", "\x30\x31", "\x00\x00", "\x00\x00",
-  "\x30\x32", "\x30\x33", "\x30\x34", "\x00\x00", "\x30\x35", "\x30\x36",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x37", "\x30\x38",
-  "\x30\x39", "\x30\x3a", "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x3b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x3c",
-  "\x30\x3d", "\x30\x3e", "\x30\x3f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x30\x40", "\x30\x41", "\x30\x42", "\x30\x43",
-  "\x30\x44", "\x30\x45", "\x30\x46", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x30\x47", "\x30\x48", "\x30\x49", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x4a", "\x30\x4b", "\x00\x00",
-  "\x30\x4c", "\x00\x00", "\x30\x4d", "\x00\x00", "\x30\x4e", "\x30\x4f",
-  "\x30\x50", "\x30\x51", "\x30\x52", "\x00\x00", "\x30\x53", "\x30\x54",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x55", "\x00\x00",
-  "\x00\x00", "\x30\x56", "\x30\x57", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x30\x58", "\x00\x00", "\x00\x00", "\x30\x59",
-  "\x30\x5a", "\x30\x5b", "\x00\x00", "\x30\x5c", "\x30\x5d", "\x00\x00",
-  "\x00\x00", "\x30\x5e", "\x00\x00", "\x30\x60", "\x00\x00", "\x30\x61",
-  "\x00\x00", "\x30\x62", "\x00\x00", "\x30\x63", "\x00\x00", "\x30\x64",
-  "\x00\x00", "\x00\x00", "\x30\x65", "\x00\x00", "\x30\x66", "\x00\x00",
-  "\x30\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x30\x68", "\x30\x69", "\x00\x00", "\x30\x6a", "\x30\x6b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x6c", "\x00\x00",
-  "\x30\x6d", "\x00\x00", "\x30\x6e", "\x00\x00", "\x30\x6f", "\x30\x70",
-  "\x30\x5f", "\x00\x00", "\x00\x00", "\x30\x71", "\x30\x72", "\x00\x00",
-  "\x30\x73", "\x00\x00", "\x30\x74", "\x00\x00", "\x00\x00", "\x30\x75",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x30\x76",
-  "\x30\x77", "\x30\x78", "\x30\x79", "\x00\x00", "\x00\x00", "\x30\x7a",
-  "\x30\x7b", "\x00\x00", "\x00\x00", "\x30\x7c", "\x30\x7d", "\x00\x00",
-  "\x30\x7e", "\x31\x21", "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x22",
-  "\x31\x23", "\x00\x00", "\x31\x24", "\x00\x00", "\x31\x25", "\x00\x00",
-  "\x31\x26", "\x00\x00", "\x31\x27", "\x31\x28", "\x31\x29", "\x00\x00",
-  "\x00\x00", "\x31\x2a", "\x00\x00", "\x31\x2b", "\x31\x2c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x31\x2d", "\x31\x2e", "\x31\x2f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x30", "\x00\x00", "\x31\x31",
-  "\x00\x00", "\x31\x32", "\x31\x33", "\x31\x34", "\x31\x35", "\x00\x00",
-  "\x31\x36", "\x31\x37", "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x38",
-  "\x31\x39", "\x00\x00", "\x31\x3a", "\x31\x3b", "\x00\x00", "\x31\x3c",
-  "\x31\x3d", "\x31\x3e", "\x00\x00", "\x31\x3f", "\x00\x00", "\x00\x00",
-  "\x31\x40", "\x31\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x42",
-  "\x00\x00", "\x31\x43", "\x31\x44", "\x00\x00", "\x31\x45", "\x31\x46",
-  "\x31\x47", "\x00\x00", "\x31\x48", "\x31\x49", "\x31\x4a", "\x00\x00",
-  "\x00\x00", "\x31\x4b", "\x00\x00", "\x00\x00", "\x31\x4c", "\x00\x00",
-  "\x00\x00", "\x31\x4d", "\x00\x00", "\x31\x4e", "\x00\x00", "\x31\x4f",
-  "\x00\x00", "\x31\x50", "\x00\x00", "\x00\x00", "\x31\x51", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x31\x52", "\x31\x53", "\x00\x00", "\x00\x00",
-  "\x31\x54", "\x31\x55", "\x31\x56", "\x31\x57", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x31\x58", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x31\x59", "\x31\x5a", "\x00\x00", "\x31\x5b", "\x00\x00", "\x31\x5c",
-  "\x31\x5d", "\x00\x00", "\x31\x5e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x31\x76", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x31\x5f", "\x31\x60", "\x31\x61", "\x00\x00", "\x00\x00",
-  "\x31\x62", "\x31\x63", "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x64",
-  "\x00\x00", "\x31\x65", "\x00\x00", "\x31\x66", "\x00\x00", "\x00\x00",
-  "\x31\x67", "\x31\x68", "\x31\x69", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x31\x6a", "\x00\x00", "\x31\x6b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x31\x6c", "\x31\x6d", "\x00\x00", "\x31\x6e",
-  "\x31\x6f", "\x00\x00", "\x00\x00", "\x31\x70", "\x31\x71", "\x00\x00",
-  "\x00\x00", "\x31\x72", "\x00\x00", "\x00\x00", "\x31\x73", "\x00\x00",
-  "\x00\x00", "\x31\x74", "\x31\x75", "\x31\x77", "\x00\x00", "\x31\x78",
-  "\x31\x79", "\x00\x00", "\x31\x7a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x31\x7b", "\x00\x00", "\x00\x00", "\x00\x00", "\x31\x7c", "\x31\x7d",
-  "\x31\x7e", "\x00\x00", "\x32\x21", "\x32\x22", "\x32\x23", "\x00\x00",
-  "\x32\x24", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x25",
-  "\x32\x26", "\x00\x00", "\x32\x27", "\x32\x28", "\x32\x29", "\x32\x2a",
-  "\x32\x2b", "\x32\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x32\x2d", "\x32\x2e", "\x32\x2f", "\x32\x30", "\x00\x00", "\x00\x00",
-  "\x32\x31", "\x00\x00", "\x00\x00", "\x32\x32", "\x00\x00", "\x00\x00",
-  "\x32\x33", "\x32\x34", "\x00\x00", "\x00\x00", "\x32\x35", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x36", "\x00\x00", "\x32\x37",
-  "\x00\x00", "\x32\x38", "\x00\x00", "\x00\x00", "\x32\x39", "\x32\x3a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x3b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x32\x3c", "\x32\x3d", "\x00\x00", "\x32\x3e", "\x00\x00",
-  "\x00\x00", "\x32\x3f", "\x00\x00", "\x32\x40", "\x00\x00", "\x32\x41",
-  "\x00\x00", "\x32\x42", "\x32\x43", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x32\x44", "\x00\x00", "\x32\x45", "\x32\x51",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x46", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x32\x47", "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x48",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x49", "\x00\x00",
-  "\x00\x00", "\x32\x4a", "\x32\x4b", "\x32\x4c", "\x00\x00", "\x00\x00",
-  "\x32\x4d", "\x32\x4e", "\x32\x4f", "\x32\x50", "\x00\x00", "\x32\x52",
-  "\x32\x53", "\x00\x00", "\x32\x54", "\x00\x00", "\x32\x55", "\x32\x56",
-  "\x32\x57", "\x32\x58", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x32\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x5a", "\x32\x5b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x5c", "\x32\x5d", "\x00\x00",
-  "\x32\x5e", "\x00\x00", "\x32\x5f", "\x00\x00", "\x32\x60", "\x32\x61",
-  "\x32\x62", "\x00\x00", "\x00\x00", "\x32\x63", "\x32\x64", "\x32\x65",
-  "\x32\x66", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x67",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x68", "\x00\x00", "\x32\x69",
-  "\x00\x00", "\x32\x6a", "\x32\x6b", "\x32\x6c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x32\x6d", "\x00\x00", "\x32\x6e", "\x32\x6f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x70", "\x32\x71",
-  "\x32\x72", "\x00\x00", "\x00\x00", "\x32\x73", "\x32\x74", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x32\x75", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x32\x76", "\x00\x00", "\x32\x77", "\x32\x78", "\x32\x79",
-  "\x00\x00", "\x32\x7a", "\x00\x00", "\x32\x7b", "\x00\x00", "\x32\x7c",
-  "\x32\x7d", "\x00\x00", "\x00\x00", "\x32\x7e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x21", "\x33\x22", "\x00\x00",
-  "\x33\x23", "\x33\x24", "\x33\x25", "\x00\x00", "\x33\x26", "\x00\x00",
-  "\x00\x00", "\x33\x27", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x33\x28", "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x29",
-  "\x00\x00", "\x00\x00", "\x33\x2a", "\x33\x2b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x33\x2c", "\x33\x2d", "\x33\x2e", "\x00\x00", "\x00\x00",
-  "\x33\x2f", "\x33\x30", "\x33\x31", "\x00\x00", "\x00\x00", "\x33\x32",
-  "\x33\x33", "\x33\x34", "\x00\x00", "\x33\x35", "\x33\x36", "\x00\x00",
-  "\x33\x37", "\x33\x38", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x33\x39", "\x33\x3a", "\x33\x3b", "\x00\x00", "\x00\x00",
-  "\x33\x3c", "\x33\x3d", "\x33\x3e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x33\x3f", "\x33\x40", "\x00\x00", "\x33\x41", "\x33\x42", "\x00\x00",
-  "\x33\x43", "\x00\x00", "\x33\x44", "\x00\x00", "\x00\x00", "\x33\x45",
-  "\x33\x46", "\x33\x47", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x33\x48", "\x33\x49", "\x33\x4a", "\x33\x4b", "\x33\x4c", "\x33\x4d",
-  "\x00\x00", "\x33\x4e", "\x00\x00", "\x00\x00", "\x33\x4f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x50", "\x00\x00", "\x33\x51",
-  "\x33\x52", "\x00\x00", "\x33\x53", "\x33\x54", "\x33\x55", "\x33\x56",
-  "\x00\x00", "\x33\x57", "\x00\x00", "\x33\x58", "\x33\x59", "\x33\x5a",
-  "\x33\x5b", "\x33\x5c", "\x33\x5d", "\x33\x5e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x5f", "\x33\x60", "\x33\x61",
-  "\x00\x00", "\x33\x62", "\x33\x63", "\x00\x00", "\x33\x64", "\x00\x00",
-  "\x00\x00", "\x33\x65", "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x66",
-  "\x00\x00", "\x33\x67", "\x00\x00", "\x33\x68", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x33\x69", "\x00\x00", "\x00\x00", "\x33\x6a", "\x00\x00",
-  "\x33\x6b", "\x00\x00", "\x00\x00", "\x33\x6c", "\x00\x00", "\x33\x6d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x6e", "\x33\x6f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x33\x70", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x33\x71", "\x00\x00", "\x00\x00", "\x33\x72",
-  "\x33\x73", "\x33\x74", "\x00\x00", "\x33\x75", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x33\x76", "\x33\x77", "\x00\x00", "\x00\x00", "\x33\x78",
-  "\x00\x00", "\x33\x79", "\x33\x7a", "\x33\x7b", "\x00\x00", "\x00\x00",
-  "\x33\x7c", "\x33\x7d", "\x33\x7e", "\x34\x21", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x34\x22", "\x00\x00", "\x34\x23", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x24", "\x00\x00", "\x00\x00",
-  "\x34\x25", "\x34\x26", "\x00\x00", "\x34\x27", "\x34\x28", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x29", "\x00\x00",
-  "\x34\x2a", "\x34\x2b", "\x34\x2c", "\x00\x00", "\x34\x2d", "\x34\x2e",
-  "\x34\x2f", "\x00\x00", "\x00\x00", "\x34\x30", "\x00\x00", "\x34\x31",
-  "\x00\x00", "\x00\x00", "\x34\x32", "\x34\x33", "\x34\x34", "\x34\x35",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x36", "\x34\x38", "\x34\x37",
-  "\x34\x39", "\x00\x00", "\x34\x3a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x34\x3b", "\x00\x00", "\x34\x3c", "\x00\x00",
-  "\x34\x3d", "\x34\x3e", "\x34\x3f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x34\x40", "\x34\x41", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x34\x42", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x34\x43", "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x44", "\x34\x45",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x46",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x47", "\x34\x48",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x49", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x34\x4a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x34\x4b", "\x00\x00", "\x00\x00", "\x34\x4c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x34\x4d", "\x34\x4e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x34\x4f", "\x00\x00", "\x00\x00", "\x34\x50",
-  "\x00\x00", "\x34\x51", "\x34\x52", "\x00\x00", "\x34\x53", "\x34\x54",
-  "\x00\x00", "\x34\x55", "\x00\x00", "\x00\x00", "\x34\x56", "\x00\x00",
-  "\x00\x00", "\x34\x57", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x34\x58", "\x34\x59", "\x00\x00", "\x00\x00", "\x34\x5a", "\x34\x5b",
-  "\x00\x00", "\x34\x5c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x34\x5d", "\x00\x00", "\x00\x00", "\x34\x5e", "\x34\x5f", "\x00\x00",
-  "\x34\x60", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x34\x61", "\x34\x62", "\x34\x63", "\x34\x64", "\x34\x65", "\x34\x66",
-  "\x34\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x34\x68", "\x34\x69", "\x00\x00", "\x34\x6a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x34\x6b", "\x00\x00", "\x34\x6c", "\x00\x00",
-  "\x00\x00", "\x34\x6d", "\x34\x6e", "\x34\x6f", "\x34\x70", "\x00\x00",
-  "\x00\x00", "\x34\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x34\x72", "\x00\x00", "\x34\x73", "\x34\x74", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x34\x75", "\x00\x00", "\x34\x76", "\x00\x00",
-  "\x34\x77", "\x34\x78", "\x00\x00", "\x34\x79", "\x00\x00", "\x34\x7a",
-  "\x00\x00", "\x34\x7b", "\x34\x7c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x34\x7d", "\x34\x7e", "\x00\x00", "\x35\x21",
-  "\x00\x00", "\x35\x22", "\x00\x00", "\x35\x23", "\x00\x00", "\x00\x00",
-  "\x35\x24", "\x35\x25", "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x26",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x27", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x35\x28", "\x35\x29", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x35\x2a", "\x00\x00", "\x00\x00", "\x35\x2b",
-  "\x00\x00", "\x35\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x35\x2d", "\x35\x2e", "\x00\x00", "\x35\x2f", "\x35\x30", "\x00\x00",
-  "\x00\x00", "\x35\x31", "\x35\x32", "\x00\x00", "\x00\x00", "\x35\x33",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x34",
-  "\x00\x00", "\x35\x35", "\x35\x36", "\x35\x37", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x35\x38", "\x35\x39", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x35\x3a", "\x00\x00", "\x00\x00", "\x35\x3b", "\x35\x3c", "\x35\x3d",
-  "\x35\x3e", "\x00\x00", "\x35\x3f", "\x00\x00", "\x00\x00", "\x35\x40",
-  "\x35\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x35\x42", "\x00\x00", "\x35\x43", "\x35\x44", "\x35\x45", "\x35\x46",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x47", "\x00\x00", "\x00\x00",
-  "\x35\x48", "\x35\x49", "\x00\x00", "\x00\x00", "\x35\x4a", "\x35\x4b",
-  "\x35\x4c", "\x35\x4d", "\x35\x4e", "\x35\x4f", "\x35\x50", "\x00\x00",
-  "\x00\x00", "\x35\x51", "\x35\x52", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x35\x53", "\x35\x54", "\x35\x55", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x35\x56", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x35\x57", "\x00\x00", "\x35\x58", "\x35\x59", "\x00\x00",
-  "\x00\x00", "\x35\x5a", "\x00\x00", "\x00\x00", "\x35\x5b", "\x35\x5c",
-  "\x35\x5d", "\x00\x00", "\x35\x5e", "\x35\x5f", "\x00\x00", "\x00\x00",
-  "\x35\x60", "\x00\x00", "\x35\x61", "\x35\x62", "\x00\x00", "\x00\x00",
-  "\x35\x63", "\x00\x00", "\x35\x64", "\x35\x65", "\x00\x00", "\x35\x66",
-  "\x35\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x68", "\x00\x00",
-  "\x35\x69", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x35\x6a", "\x35\x6b", "\x00\x00", "\x35\x6c", "\x35\x6d", "\x35\x6e",
-  "\x35\x6f", "\x00\x00", "\x00\x00", "\x35\x70", "\x35\x71", "\x35\x72",
-  "\x35\x73", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x35\x74",
-  "\x35\x75", "\x00\x00", "\x35\x76", "\x00\x00", "\x35\x77", "\x00\x00",
-  "\x00\x00", "\x35\x78", "\x00\x00", "\x00\x00", "\x35\x79", "\x00\x00",
-  "\x35\x7a", "\x35\x7b", "\x00\x00", "\x35\x7c", "\x00\x00", "\x00\x00",
-  "\x35\x7d", "\x35\x7e", "\x36\x21", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x36\x22", "\x36\x23", "\x00\x00", "\x00\x00", "\x36\x24", "\x00\x00",
-  "\x00\x00", "\x36\x25", "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x26",
-  "\x36\x27", "\x36\x28", "\x36\x29", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x36\x2a", "\x00\x00", "\x00\x00", "\x36\x2b",
-  "\x00\x00", "\x36\x2c", "\x00\x00", "\x00\x00", "\x36\x2d", "\x36\x2e",
-  "\x36\x2f", "\x36\x30", "\x36\x31", "\x36\x32", "\x36\x33", "\x36\x34",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x35", "\x00\x00", "\x00\x00",
-  "\x36\x36", "\x00\x00", "\x36\x37", "\x00\x00", "\x36\x38", "\x00\x00",
-  "\x36\x39", "\x00\x00", "\x36\x3a", "\x36\x3b", "\x36\x3c", "\x00\x00",
-  "\x36\x3d", "\x36\x3e", "\x36\x3f", "\x00\x00", "\x36\x40", "\x36\x41",
-  "\x00\x00", "\x36\x42", "\x00\x00", "\x00\x00", "\x36\x43", "\x00\x00",
-  "\x36\x44", "\x00\x00", "\x36\x45", "\x00\x00", "\x36\x46", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x47", "\x36\x48", "\x00\x00",
-  "\x36\x49", "\x36\x4a", "\x36\x4b", "\x36\x4c", "\x00\x00", "\x00\x00",
-  "\x36\x4d", "\x00\x00", "\x00\x00", "\x36\x4e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x36\x4f", "\x00\x00", "\x36\x50", "\x00\x00", "\x36\x51",
-  "\x36\x52", "\x00\x00", "\x00\x00", "\x36\x53", "\x36\x54", "\x36\x55",
-  "\x00\x00", "\x00\x00", "\x36\x56", "\x00\x00", "\x00\x00", "\x36\x57",
-  "\x36\x58", "\x36\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x5a",
-  "\x36\x5b", "\x00\x00", "\x00\x00", "\x36\x5c", "\x36\x5d", "\x36\x5e",
-  "\x36\x5f", "\x36\x60", "\x36\x61", "\x36\x62", "\x00\x00", "\x36\x63",
-  "\x36\x64", "\x36\x65", "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x66",
-  "\x00\x00", "\x36\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x68",
-  "\x36\x69", "\x36\x6a", "\x00\x00", "\x00\x00", "\x00\x00", "\x36\x6b",
-  "\x36\x6c", "\x36\x6d", "\x36\x70", "\x36\x71", "\x00\x00", "\x36\x6e",
-  "\x36\x6f", "\x36\x72", "\x00\x00", "\x00\x00", "\x36\x73", "\x36\x74",
-  "\x00\x00", "\x36\x75", "\x00\x00", "\x36\x76", "\x00\x00", "\x00\x00",
-  "\x36\x77", "\x36\x78", "\x36\x79", "\x36\x7a", "\x36\x7b", "\x00\x00",
-  "\x00\x00", "\x36\x7d", "\x00\x00", "\x36\x7e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x36\x7c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x37\x21", "\x37\x22", "\x37\x23", "\x37\x24", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x37\x25", "\x00\x00", "\x00\x00", "\x37\x26",
-  "\x00\x00", "\x37\x27", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x37\x28", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x29", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x2a", "\x37\x2b", "\x00\x00",
-  "\x37\x2c", "\x00\x00", "\x00\x00", "\x37\x2d", "\x00\x00", "\x37\x2e",
-  "\x37\x2f", "\x37\x30", "\x37\x31", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x37\x32", "\x37\x33", "\x00\x00", "\x37\x34", "\x00\x00", "\x37\x35",
-  "\x37\x36", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x37", "\x37\x38",
-  "\x37\x39", "\x37\x3a", "\x37\x3b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x37\x3c", "\x37\x3d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x3e", "\x37\x3f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x40", "\x37\x41", "\x00\x00",
-  "\x00\x00", "\x37\x42", "\x00\x00", "\x37\x43", "\x37\x44", "\x00\x00",
-  "\x00\x00", "\x37\x45", "\x00\x00", "\x37\x46", "\x37\x47", "\x37\x48",
-  "\x37\x49", "\x37\x4a", "\x00\x00", "\x37\x4b", "\x37\x4c", "\x37\x4d",
-  "\x00\x00", "\x37\x4e", "\x00\x00", "\x37\x4f", "\x37\x50", "\x37\x51",
-  "\x37\x52", "\x00\x00", "\x37\x53", "\x00\x00", "\x00\x00", "\x37\x54",
-  "\x00\x00", "\x37\x55", "\x37\x56", "\x37\x57", "\x37\x60", "\x00\x00",
-  "\x37\x58", "\x00\x00", "\x37\x59", "\x37\x5a", "\x00\x00", "\x37\x5b",
-  "\x37\x5c", "\x37\x5d", "\x37\x5e", "\x00\x00", "\x37\x5f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x61", "\x37\x62",
-  "\x37\x63", "\x00\x00", "\x00\x00", "\x37\x64", "\x37\x65", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x66", "\x37\x67", "\x37\x68",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x69", "\x00\x00", "\x00\x00",
-  "\x37\x6a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x37\x6b", "\x37\x6c", "\x37\x6d", "\x00\x00", "\x00\x00", "\x37\x7e",
-  "\x00\x00", "\x00\x00", "\x37\x6e", "\x00\x00", "\x37\x6f", "\x37\x70",
-  "\x00\x00", "\x37\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x72",
-  "\x00\x00", "\x00\x00", "\x37\x73", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x37\x74", "\x37\x75", "\x00\x00", "\x37\x76", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x77", "\x37\x78", "\x37\x79",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x37\x7a", "\x37\x7b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x37\x7c", "\x37\x7d", "\x00\x00", "\x00\x00",
-  "\x38\x21", "\x38\x22", "\x38\x23", "\x00\x00", "\x00\x00", "\x38\x24",
-  "\x38\x25", "\x38\x26", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x38\x27", "\x38\x28", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x38\x29", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x38\x2a", "\x38\x2b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x38\x2c", "\x38\x2d", "\x00\x00", "\x00\x00",
-  "\x38\x2e", "\x38\x2f", "\x00\x00", "\x38\x30", "\x38\x31", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x32", "\x38\x33", "\x00\x00",
-  "\x38\x34", "\x00\x00", "\x00\x00", "\x38\x35", "\x00\x00", "\x00\x00",
-  "\x38\x36", "\x38\x37", "\x38\x38", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x38\x39", "\x00\x00", "\x00\x00", "\x38\x3a", "\x38\x3b", "\x38\x3c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x3d",
-  "\x38\x3e", "\x38\x3f", "\x38\x40", "\x00\x00", "\x38\x41", "\x38\x42",
-  "\x00\x00", "\x38\x43", "\x38\x44", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x38\x45", "\x00\x00", "\x38\x46", "\x38\x47", "\x00\x00", "\x00\x00",
-  "\x38\x48", "\x38\x49", "\x38\x4a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x38\x4b", "\x00\x00", "\x00\x00", "\x38\x4c", "\x38\x4d", "\x38\x4e",
-  "\x38\x50", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x38\x51", "\x00\x00", "\x38\x4f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x38\x52", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x53",
-  "\x38\x54", "\x00\x00", "\x38\x55", "\x00\x00", "\x38\x56", "\x00\x00",
-  "\x38\x57", "\x00\x00", "\x38\x58", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x38\x59", "\x00\x00", "\x00\x00", "\x38\x5a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x38\x5b", "\x38\x5c", "\x38\x5d", "\x38\x5e", "\x38\x5f",
-  "\x38\x60", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x61",
-  "\x38\x62", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x38\x63", "\x38\x64", "\x38\x65", "\x38\x67", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x38\x68", "\x00\x00", "\x38\x69", "\x38\x6a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x38\x6b", "\x38\x6c", "\x38\x6d", "\x00\x00",
-  "\x00\x00", "\x38\x6e", "\x00\x00", "\x38\x6f", "\x38\x70", "\x38\x71",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x38\x72", "\x00\x00", "\x00\x00",
-  "\x38\x73", "\x38\x74", "\x38\x75", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x38\x76", "\x00\x00", "\x38\x77", "\x00\x00",
-  "\x38\x78", "\x38\x79", "\x38\x7a", "\x00\x00", "\x38\x7b", "\x00\x00",
-  "\x38\x7c", "\x38\x7d", "\x00\x00", "\x38\x7e", "\x00\x00", "\x39\x21",
-  "\x00\x00", "\x00\x00", "\x39\x22", "\x00\x00", "\x00\x00", "\x39\x23",
-  "\x39\x24", "\x00\x00", "\x00\x00", "\x39\x25", "\x00\x00", "\x39\x26",
-  "\x39\x27", "\x39\x28", "\x39\x29", "\x00\x00", "\x39\x2a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x39\x2b", "\x00\x00", "\x00\x00", "\x39\x2c",
-  "\x00\x00", "\x39\x2d", "\x39\x2e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x39\x2f", "\x00\x00", "\x00\x00", "\x39\x30", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x31", "\x39\x32",
-  "\x39\x33", "\x39\x34", "\x00\x00", "\x00\x00", "\x39\x35", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x39\x36", "\x00\x00", "\x00\x00", "\x39\x37",
-  "\x00\x00", "\x39\x38", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x39\x39", "\x00\x00", "\x39\x3a", "\x39\x3b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x39\x3c", "\x00\x00", "\x39\x3d", "\x00\x00", "\x00\x00",
-  "\x39\x3e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x3f",
-  "\x39\x40", "\x39\x41", "\x39\x42", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x39\x43", "\x39\x44", "\x00\x00", "\x00\x00", "\x39\x45", "\x39\x46",
-  "\x39\x47", "\x00\x00", "\x39\x48", "\x39\x49", "\x00\x00", "\x39\x4a",
-  "\x00\x00", "\x00\x00", "\x39\x4b", "\x39\x4c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x39\x4d", "\x39\x4e", "\x39\x4f", "\x39\x50", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x39\x51", "\x39\x52", "\x39\x53", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x54", "\x39\x55", "\x00\x00",
-  "\x00\x00", "\x39\x56", "\x39\x57", "\x00\x00", "\x39\x58", "\x00\x00",
-  "\x00\x00", "\x39\x59", "\x00\x00", "\x00\x00", "\x39\x5a", "\x39\x5b",
-  "\x39\x5c", "\x00\x00", "\x39\x5d", "\x39\x5e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x39\x5f", "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x60",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x61", "\x39\x62",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x63", "\x00\x00",
-  "\x39\x64", "\x00\x00", "\x39\x65", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x39\x66", "\x39\x67", "\x00\x00", "\x00\x00",
-  "\x39\x68", "\x39\x69", "\x00\x00", "\x00\x00", "\x39\x6a", "\x39\x6b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x6c", "\x00\x00",
-  "\x00\x00", "\x39\x6d", "\x00\x00", "\x00\x00", "\x39\x6e", "\x00\x00",
-  "\x00\x00", "\x39\x6f", "\x00\x00", "\x00\x00", "\x39\x70", "\x00\x00",
-  "\x39\x71", "\x39\x72", "\x39\x73", "\x00\x00", "\x39\x74", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x75", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x39\x76", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x39\x77", "\x39\x78", "\x39\x79", "\x00\x00", "\x39\x7a",
-  "\x00\x00", "\x00\x00", "\x39\x7b", "\x00\x00", "\x39\x7c", "\x39\x7d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x39\x7e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3a\x21", "\x00\x00", "\x3a\x22", "\x00\x00",
-  "\x3a\x23", "\x3a\x24", "\x3a\x25", "\x00\x00", "\x3a\x26", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3a\x27", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3a\x28", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3a\x29", "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x2a", "\x3a\x2b",
-  "\x3a\x2c", "\x3a\x2d", "\x00\x00", "\x00\x00", "\x3a\x2e", "\x3a\x2f",
-  "\x3a\x30", "\x3a\x31", "\x00\x00", "\x3a\x33", "\x00\x00", "\x3a\x34",
-  "\x00\x00", "\x3a\x35", "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x36",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x37", "\x3a\x38", "\x3a\x32",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x39", "\x3a\x3a", "\x3a\x3b",
-  "\x3a\x3c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3a\x3d", "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x3e", "\x3a\x3f",
-  "\x3a\x40", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3a\x41", "\x3a\x42", "\x3a\x43", "\x3a\x44", "\x3a\x45", "\x3a\x46",
-  "\x00\x00", "\x3a\x47", "\x00\x00", "\x00\x00", "\x3a\x48", "\x00\x00",
-  "\x3a\x49", "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x4a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3a\x4b", "\x00\x00", "\x3a\x4c", "\x3a\x4d",
-  "\x00\x00", "\x3a\x4e", "\x3a\x4f", "\x00\x00", "\x3a\x50", "\x3a\x51",
-  "\x3a\x52", "\x00\x00", "\x00\x00", "\x3a\x53", "\x3a\x54", "\x00\x00",
-  "\x3a\x55", "\x00\x00", "\x3a\x56", "\x3a\x57", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3a\x58", "\x00\x00", "\x00\x00", "\x3a\x59",
-  "\x00\x00", "\x3a\x5a", "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x5b",
-  "\x3a\x5c", "\x3a\x5d", "\x00\x00", "\x3a\x5e", "\x3a\x5f", "\x3a\x60",
-  "\x3a\x61", "\x3a\x62", "\x3a\x63", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3a\x64", "\x3a\x65", "\x00\x00", "\x3a\x66",
-  "\x00\x00", "\x00\x00", "\x3a\x67", "\x3a\x68", "\x3a\x69", "\x3a\x6a",
-  "\x3a\x6b", "\x3a\x6c", "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x6d",
-  "\x00\x00", "\x00\x00", "\x3a\x6e", "\x00\x00", "\x00\x00", "\x3a\x6f",
-  "\x00\x00", "\x3a\x70", "\x3a\x71", "\x00\x00", "\x3a\x72", "\x00\x00",
-  "\x3a\x73", "\x00\x00", "\x3a\x74", "\x00\x00", "\x00\x00", "\x3a\x75",
-  "\x3a\x76", "\x3a\x77", "\x3a\x78", "\x00\x00", "\x3a\x79", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x7a", "\x3a\x7b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3a\x7c", "\x3a\x7d", "\x3a\x7e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x21", "\x00\x00", "\x00\x00",
-  "\x3b\x22", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x23", "\x3b\x24",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x25", "\x3b\x26",
-  "\x3b\x27", "\x3b\x28", "\x3b\x29", "\x3b\x2a", "\x00\x00", "\x3b\x2b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x2c", "\x00\x00",
-  "\x00\x00", "\x3b\x2d", "\x3b\x2e", "\x00\x00", "\x3b\x2f", "\x3b\x30",
-  "\x00\x00", "\x3b\x31", "\x3b\x32", "\x00\x00", "\x00\x00", "\x3b\x33",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x34", "\x3b\x35", "\x00\x00",
-  "\x3b\x36", "\x3b\x37", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3b\x38", "\x3b\x39", "\x00\x00", "\x3b\x3a", "\x3b\x3b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x3d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x3c", "\x3b\x3e", "\x00\x00",
-  "\x00\x00", "\x3b\x3f", "\x3b\x40", "\x00\x00", "\x3b\x41", "\x3b\x42",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x43", "\x3b\x44",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x45", "\x3b\x47",
-  "\x3b\x48", "\x00\x00", "\x3b\x49", "\x3b\x4a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3b\x46", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3b\x4b", "\x00\x00", "\x00\x00", "\x3b\x4c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x4d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3b\x4e", "\x00\x00", "\x3b\x4f", "\x00\x00", "\x00\x00",
-  "\x3b\x50", "\x3b\x51", "\x00\x00", "\x00\x00", "\x3b\x52", "\x00\x00",
-  "\x3b\x53", "\x00\x00", "\x3b\x57", "\x3b\x55", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3b\x54", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x56",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x58",
-  "\x3b\x59", "\x3b\x5a", "\x3b\x5b", "\x00\x00", "\x3b\x5c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x5d", "\x00\x00",
-  "\x00\x00", "\x3b\x5e", "\x00\x00", "\x00\x00", "\x3b\x5f", "\x3b\x60",
-  "\x3b\x61", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x62", "\x3b\x63",
-  "\x00\x00", "\x3b\x64", "\x00\x00", "\x3b\x65", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3b\x66", "\x00\x00", "\x3b\x67", "\x3b\x68",
-  "\x3b\x69", "\x3b\x6a", "\x3b\x6b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3b\x6c", "\x00\x00", "\x3b\x6d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3b\x6e", "\x3b\x6f", "\x3b\x70", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3b\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x72",
-  "\x00\x00", "\x66\x74", "\x00\x00", "\x3b\x73", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3b\x74", "\x3b\x75", "\x3b\x76", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3b\x77", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x78",
-  "\x00\x00", "\x00\x00", "\x3b\x7a", "\x00\x00", "\x3b\x79", "\x3b\x7b",
-  "\x3b\x7c", "\x3b\x7d", "\x00\x00", "\x00\x00", "\x00\x00", "\x3b\x7e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x21", "\x3c\x22",
-  "\x3c\x23", "\x3c\x24", "\x3c\x25", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3c\x26", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3c\x27", "\x00\x00", "\x3c\x28", "\x3c\x29", "\x00\x00",
-  "\x00\x00", "\x3c\x2a", "\x3c\x2b", "\x3c\x2c", "\x3c\x2e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x2d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3c\x2f", "\x00\x00", "\x00\x00", "\x3c\x30",
-  "\x3c\x31", "\x3c\x34", "\x00\x00", "\x3c\x32", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3c\x33", "\x3c\x35", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3c\x36", "\x00\x00", "\x3c\x37", "\x00\x00",
-  "\x00\x00", "\x3c\x38", "\x3c\x39", "\x00\x00", "\x3c\x3a", "\x3c\x3b",
-  "\x00\x00", "\x3c\x3c", "\x3c\x3d", "\x3c\x3e", "\x3c\x3f", "\x3c\x40",
-  "\x00\x00", "\x3c\x41", "\x3c\x42", "\x3c\x43", "\x00\x00", "\x00\x00",
-  "\x3c\x44", "\x3c\x45", "\x00\x00", "\x3c\x46", "\x3c\x47", "\x00\x00",
-  "\x00\x00", "\x3c\x48", "\x00\x00", "\x3c\x49", "\x00\x00", "\x3c\x4a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x4b", "\x00\x00",
-  "\x3c\x4c", "\x3c\x4d", "\x3c\x4e", "\x3c\x4f", "\x3c\x50", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x52", "\x3c\x51", "\x00\x00",
-  "\x3c\x53", "\x00\x00", "\x00\x00", "\x3c\x54", "\x3c\x55", "\x00\x00",
-  "\x3c\x56", "\x3c\x57", "\x3c\x58", "\x00\x00", "\x3c\x59", "\x3c\x5a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x5b",
-  "\x3c\x5c", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x5d", "\x3c\x5e",
-  "\x3c\x5f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3c\x60", "\x3c\x61", "\x00\x00", "\x00\x00", "\x3c\x62", "\x3c\x63",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x64", "\x3c\x65", "\x3c\x66",
-  "\x3c\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x68", "\x00\x00",
-  "\x00\x00", "\x3c\x69", "\x3c\x6a", "\x00\x00", "\x3c\x6b", "\x00\x00",
-  "\x3c\x6c", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x6d", "\x00\x00",
-  "\x3c\x6e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x6f",
-  "\x00\x00", "\x3c\x70", "\x00\x00", "\x3c\x71", "\x3c\x72", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3c\x73", "\x3c\x74", "\x00\x00", "\x3c\x75",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x76",
-  "\x00\x00", "\x00\x00", "\x3c\x77", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3c\x78", "\x00\x00", "\x00\x00", "\x00\x00", "\x3c\x79", "\x00\x00",
-  "\x00\x00", "\x3c\x7a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3c\x7b", "\x00\x00", "\x00\x00", "\x3c\x7c", "\x3c\x7d", "\x00\x00",
-  "\x00\x00", "\x3c\x7e", "\x3d\x21", "\x00\x00", "\x00\x00", "\x3d\x22",
-  "\x00\x00", "\x3d\x23", "\x3d\x24", "\x00\x00", "\x00\x00", "\x3d\x25",
-  "\x00\x00", "\x3d\x26", "\x00\x00", "\x00\x00", "\x3d\x27", "\x3d\x28",
-  "\x3d\x29", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x2a", "\x00\x00",
-  "\x3d\x2b", "\x3d\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3d\x2d", "\x3d\x2e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3d\x2f", "\x00\x00", "\x3d\x32", "\x00\x00", "\x00\x00",
-  "\x3d\x30", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x31", "\x3d\x33",
-  "\x00\x00", "\x00\x00", "\x3d\x34", "\x3d\x35", "\x3d\x36", "\x3d\x37",
-  "\x3d\x38", "\x00\x00", "\x00\x00", "\x3d\x39", "\x3d\x3a", "\x3d\x3b",
-  "\x00\x00", "\x3d\x3c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3d\x3d", "\x3d\x3e", "\x3d\x3f", "\x3d\x40", "\x3d\x41", "\x3d\x42",
-  "\x00\x00", "\x00\x00", "\x3d\x43", "\x3d\x44", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x45", "\x3d\x46", "\x3d\x47",
-  "\x00\x00", "\x3d\x48", "\x3d\x49", "\x3d\x4a", "\x3d\x4b", "\x00\x00",
-  "\x00\x00", "\x3d\x4c", "\x3d\x4d", "\x00\x00", "\x00\x00", "\x3d\x4e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x4f", "\x00\x00", "\x3d\x50",
-  "\x3d\x51", "\x00\x00", "\x00\x00", "\x3d\x52", "\x00\x00", "\x00\x00",
-  "\x3d\x53", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3d\x54", "\x3d\x55", "\x00\x00", "\x00\x00", "\x3d\x56", "\x3d\x57",
-  "\x00\x00", "\x3d\x58", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3d\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x5a",
-  "\x3d\x5b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3d\x5c", "\x00\x00", "\x3d\x5d", "\x3d\x5e", "\x3d\x5f", "\x3d\x60",
-  "\x3d\x61", "\x00\x00", "\x00\x00", "\x3d\x62", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3d\x63", "\x00\x00", "\x00\x00", "\x3d\x64",
-  "\x00\x00", "\x3d\x65", "\x3d\x66", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3d\x67", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3d\x68", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3d\x69", "\x3d\x6a", "\x3d\x6b", "\x3d\x6c", "\x00\x00", "\x00\x00",
-  "\x3d\x6d", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x6e", "\x00\x00",
-  "\x3d\x6f", "\x00\x00", "\x3d\x70", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3d\x71", "\x00\x00", "\x00\x00", "\x3d\x72", "\x00\x00", "\x3d\x73",
-  "\x00\x00", "\x3d\x74", "\x00\x00", "\x00\x00", "\x3d\x75", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x76", "\x3d\x77", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3d\x78", "\x00\x00", "\x3d\x79", "\x3d\x7a",
-  "\x00\x00", "\x00\x00", "\x3d\x7b", "\x3d\x7c", "\x3d\x7d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3d\x7e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3e\x21", "\x00\x00", "\x00\x00", "\x3e\x22",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x23", "\x00\x00", "\x3e\x24",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x25", "\x3e\x26", "\x3e\x27",
-  "\x3e\x28", "\x00\x00", "\x00\x00", "\x3e\x29", "\x3e\x2a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x2b", "\x3e\x2c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3e\x2d", "\x00\x00", "\x3e\x2e", "\x00\x00",
-  "\x3e\x2f", "\x3e\x30", "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x31",
-  "\x00\x00", "\x00\x00", "\x3e\x32", "\x3e\x33", "\x00\x00", "\x00\x00",
-  "\x3e\x34", "\x00\x00", "\x00\x00", "\x3e\x35", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3e\x36", "\x3e\x37", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3e\x38", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3e\x39", "\x00\x00", "\x00\x00", "\x3e\x3a", "\x00\x00", "\x3e\x3b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x3c", "\x3e\x3d", "\x3e\x3e",
-  "\x3e\x3f", "\x3e\x40", "\x00\x00", "\x3e\x41", "\x3e\x42", "\x00\x00",
-  "\x3e\x43", "\x00\x00", "\x00\x00", "\x3e\x44", "\x00\x00", "\x3e\x45",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x46", "\x3e\x47", "\x3e\x48",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x49", "\x3e\x4a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x4b", "\x3e\x4c", "\x3e\x4d",
-  "\x00\x00", "\x3e\x4e", "\x3e\x4f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3e\x50", "\x3e\x51", "\x00\x00", "\x00\x00", "\x3e\x52", "\x3e\x53",
-  "\x00\x00", "\x3e\x54", "\x3e\x55", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3e\x56", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3e\x57", "\x00\x00", "\x00\x00", "\x3e\x58",
-  "\x3e\x59", "\x00\x00", "\x00\x00", "\x3e\x5a", "\x3e\x5b", "\x3e\x5c",
-  "\x00\x00", "\x3e\x5d", "\x3e\x5e", "\x3e\x5f", "\x00\x00", "\x3e\x60",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x61", "\x3e\x62",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x63", "\x3e\x64", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3e\x65", "\x3e\x66", "\x00\x00", "\x3e\x67",
-  "\x3e\x68", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x69",
-  "\x00\x00", "\x00\x00", "\x3e\x6a", "\x00\x00", "\x3e\x6b", "\x00\x00",
-  "\x00\x00", "\x3e\x6c", "\x3e\x6d", "\x3e\x6e", "\x00\x00", "\x00\x00",
-  "\x3e\x6f", "\x00\x00", "\x00\x00", "\x00\x00", "\x3e\x70", "\x3e\x71",
-  "\x3e\x72", "\x3e\x73", "\x3e\x74", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3e\x75", "\x3e\x76", "\x3e\x77", "\x3e\x78",
-  "\x3e\x79", "\x00\x00", "\x3e\x7a", "\x3e\x7b", "\x00\x00", "\x00\x00",
-  "\x3e\x7e", "\x00\x00", "\x3e\x7c", "\x00\x00", "\x3e\x7d", "\x00\x00",
-  "\x00\x00", "\x3f\x21", "\x3f\x22", "\x00\x00", "\x3f\x23", "\x3f\x24",
-  "\x00\x00", "\x3f\x25", "\x3f\x26", "\x00\x00", "\x00\x00", "\x3f\x27",
-  "\x3f\x28", "\x00\x00", "\x3f\x29", "\x3f\x2a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3f\x2b", "\x00\x00", "\x3f\x2c", "\x3f\x2d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3f\x2e", "\x00\x00", "\x3f\x2f", "\x00\x00",
-  "\x3f\x30", "\x3f\x31", "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x32",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x33", "\x3f\x34",
-  "\x3f\x35", "\x00\x00", "\x3f\x36", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3f\x37", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x3f\x38", "\x3f\x39", "\x3f\x3a", "\x00\x00", "\x3f\x3b", "\x00\x00",
-  "\x3f\x3c", "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x3d", "\x00\x00",
-  "\x3f\x3e", "\x3f\x3f", "\x3f\x40", "\x00\x00", "\x3f\x41", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3f\x42", "\x3f\x43", "\x00\x00", "\x00\x00",
-  "\x3f\x44", "\x3f\x45", "\x3f\x46", "\x3f\x47", "\x3f\x48", "\x3f\x49",
-  "\x00\x00", "\x3f\x4a", "\x3f\x4b", "\x00\x00", "\x00\x00", "\x3f\x4c",
-  "\x3f\x4d", "\x00\x00", "\x00\x00", "\x3f\x4e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3f\x4f", "\x3f\x50", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x3f\x51", "\x3f\x52", "\x3f\x53", "\x3f\x54", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3f\x55", "\x3f\x56", "\x3f\x57", "\x00\x00",
-  "\x3f\x58", "\x3f\x59", "\x3f\x5a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3f\x5b", "\x3f\x5c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x5d", "\x3f\x5e", "\x00\x00",
-  "\x3f\x5f", "\x00\x00", "\x00\x00", "\x3f\x60", "\x00\x00", "\x00\x00",
-  "\x3f\x61", "\x00\x00", "\x00\x00", "\x3f\x62", "\x00\x00", "\x3f\x63",
-  "\x3f\x64", "\x3f\x65", "\x00\x00", "\x00\x00", "\x3f\x66", "\x3f\x67",
-  "\x3f\x68", "\x00\x00", "\x00\x00", "\x3f\x69", "\x00\x00", "\x00\x00",
-  "\x3f\x6a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x6b",
-  "\x3f\x6c", "\x3f\x6d", "\x3f\x6e", "\x00\x00", "\x3f\x6f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3f\x70", "\x3f\x71", "\x00\x00", "\x00\x00",
-  "\x3f\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x73", "\x3f\x74",
-  "\x3f\x75", "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x76", "\x00\x00",
-  "\x00\x00", "\x3f\x77", "\x3f\x78", "\x3f\x79", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x3f\x7a", "\x3f\x7b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x3f\x7c", "\x00\x00", "\x00\x00", "\x3f\x7d",
-  "\x3f\x7e", "\x00\x00", "\x00\x00", "\x40\x21", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x40\x22", "\x40\x23", "\x00\x00", "\x40\x24", "\x00\x00",
-  "\x00\x00", "\x40\x25", "\x00\x00", "\x40\x26", "\x00\x00", "\x00\x00",
-  "\x40\x27", "\x00\x00", "\x00\x00", "\x40\x28", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x29", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x40\x2a", "\x40\x2b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x40\x2c", "\x40\x2d", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x2e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x2f",
-  "\x00\x00", "\x40\x30", "\x40\x31", "\x40\x32", "\x40\x33", "\x40\x34",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x35", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x40\x36", "\x00\x00", "\x00\x00", "\x40\x37", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x38", "\x00\x00",
-  "\x00\x00", "\x40\x39", "\x00\x00", "\x40\x3a", "\x40\x3b", "\x40\x3c",
-  "\x40\x3d", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x3e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x3f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x40\x40", "\x00\x00", "\x40\x41", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x42", "\x40\x43",
-  "\x00\x00", "\x40\x44", "\x00\x00", "\x00\x00", "\x40\x45", "\x40\x46",
-  "\x40\x47", "\x40\x48", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x40\x49", "\x00\x00", "\x40\x4a", "\x00\x00", "\x40\x4b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x4c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x4d", "\x00\x00", "\x40\x4e",
-  "\x00\x00", "\x40\x4f", "\x00\x00", "\x40\x50", "\x40\x51", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x40\x52", "\x40\x53", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x40\x54", "\x40\x55", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x40\x56", "\x40\x57", "\x00\x00", "\x40\x58",
-  "\x40\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x5a", "\x00\x00",
-  "\x40\x5b", "\x40\x5c", "\x40\x5d", "\x40\x5e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x40\x5f", "\x40\x60", "\x40\x61",
-  "\x40\x62", "\x00\x00", "\x40\x63", "\x40\x64", "\x40\x65", "\x00\x00",
-  "\x40\x66", "\x40\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x40\x68", "\x40\x69", "\x40\x6a", "\x00\x00", "\x40\x6b",
-  "\x40\x6c", "\x00\x00", "\x40\x6d", "\x40\x6e", "\x40\x6f", "\x40\x70",
-  "\x40\x71", "\x40\x72", "\x00\x00", "\x40\x73", "\x00\x00", "\x40\x74",
-  "\x00\x00", "\x40\x75", "\x00\x00", "\x40\x76", "\x00\x00", "\x40\x77",
-  "\x00\x00", "\x00\x00", "\x40\x78", "\x00\x00", "\x40\x79", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x40\x7a", "\x40\x7b", "\x40\x7c", "\x40\x7d",
-  "\x40\x7e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x21",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x22", "\x41\x23",
-  "\x41\x24", "\x41\x25", "\x00\x00", "\x41\x26", "\x00\x00", "\x41\x27",
-  "\x41\x28", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x29", "\x00\x00",
-  "\x41\x2a", "\x41\x2b", "\x41\x2c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x41\x2d", "\x41\x2e", "\x00\x00", "\x00\x00", "\x41\x2f", "\x00\x00",
-  "\x00\x00", "\x41\x30", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x41\x31", "\x00\x00", "\x41\x32", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x41\x33", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x34", "\x00\x00",
-  "\x41\x35", "\x00\x00", "\x00\x00", "\x41\x36", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x41\x37", "\x41\x38", "\x41\x39", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x41\x3a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x41\x3b", "\x41\x3c", "\x00\x00", "\x41\x3d", "\x00\x00", "\x00\x00",
-  "\x41\x3e", "\x00\x00", "\x41\x3f", "\x00\x00", "\x00\x00", "\x41\x40",
-  "\x41\x41", "\x00\x00", "\x00\x00", "\x41\x42", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x41\x43", "\x00\x00", "\x00\x00", "\x41\x44", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x45", "\x00\x00", "\x00\x00",
-  "\x41\x46", "\x41\x47", "\x00\x00", "\x41\x48", "\x41\x49", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x4a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x41\x4b", "\x00\x00", "\x41\x4c", "\x41\x4d",
-  "\x00\x00", "\x41\x4e", "\x00\x00", "\x41\x4f", "\x41\x50", "\x41\x51",
-  "\x41\x52", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x53", "\x41\x54",
-  "\x00\x00", "\x00\x00", "\x41\x55", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x41\x56", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x57", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x58", "\x41\x59", "\x00\x00",
-  "\x00\x00", "\x41\x5a", "\x00\x00", "\x00\x00", "\x41\x5b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x5c", "\x00\x00", "\x00\x00",
-  "\x41\x5d", "\x00\x00", "\x00\x00", "\x41\x5e", "\x00\x00", "\x00\x00",
-  "\x41\x5f", "\x41\x60", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x61",
-  "\x41\x62", "\x41\x63", "\x41\x64", "\x00\x00", "\x00\x00", "\x41\x65",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x66",
-  "\x41\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x68",
-  "\x00\x00", "\x41\x69", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x6a",
-  "\x00\x00", "\x41\x6b", "\x00\x00", "\x41\x6c", "\x41\x6d", "\x41\x6e",
-  "\x00\x00", "\x41\x6f", "\x00\x00", "\x41\x70", "\x41\x71", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x41\x72", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x41\x73", "\x41\x74", "\x41\x75", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x41\x76", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x77",
-  "\x41\x78", "\x00\x00", "\x00\x00", "\x00\x00", "\x41\x79", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x41\x7a", "\x41\x7b", "\x00\x00", "\x00\x00",
-  "\x41\x7c", "\x41\x7d", "\x41\x7e", "\x42\x21", "\x00\x00", "\x00\x00",
-  "\x42\x22", "\x42\x23", "\x42\x24", "\x42\x25", "\x00\x00", "\x42\x26",
-  "\x00\x00", "\x00\x00", "\x42\x27", "\x42\x28", "\x42\x29", "\x42\x2a",
-  "\x00\x00", "\x42\x2b", "\x00\x00", "\x42\x2c", "\x42\x2d", "\x00\x00",
-  "\x42\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x30", "\x00\x00",
-  "\x42\x2f", "\x42\x31", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x42\x32", "\x42\x33", "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x34",
-  "\x00\x00", "\x42\x35", "\x00\x00", "\x42\x37", "\x00\x00", "\x00\x00",
-  "\x42\x36", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x42\x38", "\x42\x39", "\x42\x3a", "\x00\x00", "\x42\x3b", "\x42\x3c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x3d", "\x42\x3e", "\x42\x40",
-  "\x42\x41", "\x42\x42", "\x42\x44", "\x00\x00", "\x42\x45", "\x00\x00",
-  "\x42\x47", "\x42\x48", "\x42\x49", "\x00\x00", "\x42\x4a", "\x42\x4c",
-  "\x00\x00", "\x42\x43", "\x42\x46", "\x42\x4b", "\x42\x4d", "\x42\x4e",
-  "\x42\x4f", "\x00\x00", "\x00\x00", "\x42\x50", "\x00\x00", "\x42\x51",
-  "\x42\x52", "\x42\x53", "\x42\x54", "\x42\x55", "\x00\x00", "\x00\x00",
-  "\x42\x56", "\x42\x57", "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x58",
-  "\x42\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x5a", "\x42\x5b",
-  "\x00\x00", "\x00\x00", "\x42\x5c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x42\x5d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x42\x5e", "\x42\x5f", "\x00\x00", "\x42\x60", "\x42\x61", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x62", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x42\x63", "\x00\x00", "\x42\x64", "\x42\x65", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x66", "\x42\x67", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x42\x68", "\x42\x69", "\x00\x00", "\x00\x00",
-  "\x42\x6a", "\x42\x6b", "\x00\x00", "\x42\x6c", "\x42\x6d", "\x42\x3f",
-  "\x42\x6e", "\x00\x00", "\x42\x6f", "\x42\x70", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x42\x71", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x42\x72", "\x00\x00", "\x00\x00", "\x42\x73",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x74", "\x00\x00", "\x42\x75",
-  "\x42\x76", "\x42\x77", "\x42\x78", "\x00\x00", "\x42\x79", "\x42\x7a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x42\x7b", "\x42\x7c", "\x42\x7d",
-  "\x42\x7e", "\x43\x21", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x43\x22", "\x00\x00", "\x43\x23", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x24", "\x00\x00", "\x43\x25",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x26", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x27", "\x00\x00",
-  "\x00\x00", "\x43\x28", "\x43\x29", "\x43\x2a", "\x00\x00", "\x43\x2b",
-  "\x00\x00", "\x43\x2c", "\x00\x00", "\x00\x00", "\x43\x2d", "\x00\x00",
-  "\x43\x2e", "\x43\x2f", "\x00\x00", "\x43\x30", "\x43\x31", "\x43\x32",
-  "\x43\x33", "\x00\x00", "\x00\x00", "\x43\x34", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x35", "\x43\x36", "\x43\x37",
-  "\x00\x00", "\x00\x00", "\x43\x39", "\x00\x00", "\x43\x3a", "\x43\x3b",
-  "\x00\x00", "\x43\x3c", "\x00\x00", "\x00\x00", "\x43\x3d", "\x43\x3e",
-  "\x43\x3f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x40",
-  "\x00\x00", "\x43\x41", "\x00\x00", "\x00\x00", "\x43\x42", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x43", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x43\x44", "\x43\x45", "\x00\x00", "\x43\x46",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x47", "\x43\x48", "\x00\x00",
-  "\x43\x38", "\x43\x4a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x43\x4b", "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x4c", "\x00\x00",
-  "\x43\x4d", "\x43\x4f", "\x43\x4e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x43\x50", "\x43\x51", "\x00\x00", "\x43\x52", "\x43\x53", "\x43\x54",
-  "\x00\x00", "\x43\x55", "\x43\x56", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x43\x57", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x58",
-  "\x43\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x5a",
-  "\x00\x00", "\x43\x5b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x43\x49", "\x00\x00", "\x00\x00", "\x43\x5c", "\x00\x00",
-  "\x43\x5d", "\x43\x5e", "\x00\x00", "\x00\x00", "\x43\x5f", "\x43\x60",
-  "\x00\x00", "\x00\x00", "\x43\x61", "\x43\x62", "\x43\x63", "\x43\x64",
-  "\x43\x65", "\x00\x00", "\x00\x00", "\x43\x66", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x43\x67", "\x43\x68", "\x43\x69", "\x43\x6a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x6b", "\x00\x00",
-  "\x43\x6c", "\x00\x00", "\x43\x6d", "\x00\x00", "\x43\x6e", "\x43\x6f",
-  "\x00\x00", "\x43\x70", "\x00\x00", "\x43\x71", "\x00\x00", "\x43\x72",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x73", "\x00\x00",
-  "\x43\x74", "\x00\x00", "\x43\x75", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x43\x76", "\x43\x77", "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x78",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x43\x79", "\x43\x7a", "\x43\x7b",
-  "\x00\x00", "\x00\x00", "\x43\x7c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x43\x7d", "\x00\x00", "\x00\x00", "\x43\x7e", "\x44\x21", "\x44\x22",
-  "\x00\x00", "\x44\x23", "\x00\x00", "\x00\x00", "\x44\x24", "\x00\x00",
-  "\x00\x00", "\x44\x25", "\x00\x00", "\x00\x00", "\x44\x26", "\x44\x27",
-  "\x44\x28", "\x00\x00", "\x00\x00", "\x44\x29", "\x00\x00", "\x44\x2a",
-  "\x44\x2b", "\x44\x2c", "\x44\x2d", "\x00\x00", "\x00\x00", "\x44\x2e",
-  "\x44\x2f", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x30", "\x44\x31",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x32", "\x44\x33",
-  "\x44\x34", "\x44\x35", "\x00\x00", "\x00\x00", "\x44\x36", "\x44\x37",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x38",
-  "\x44\x39", "\x00\x00", "\x44\x3a", "\x00\x00", "\x00\x00", "\x44\x3b",
-  "\x44\x3c", "\x44\x3d", "\x00\x00", "\x44\x3e", "\x00\x00", "\x44\x3f",
-  "\x00\x00", "\x00\x00", "\x44\x40", "\x00\x00", "\x00\x00", "\x44\x41",
-  "\x44\x42", "\x00\x00", "\x00\x00", "\x44\x43", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x44\x44", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x44\x45", "\x44\x46", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x47",
-  "\x44\x48", "\x44\x49", "\x44\x4a", "\x44\x4b", "\x00\x00", "\x44\x4c",
-  "\x44\x4d", "\x00\x00", "\x00\x00", "\x44\x4e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x44\x4f", "\x44\x50", "\x44\x51", "\x44\x52", "\x44\x53",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x54", "\x44\x55", "\x44\x56",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x57", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x44\x58", "\x00\x00", "\x44\x59", "\x44\x5a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x5b", "\x44\x5c", "\x00\x00",
-  "\x44\x5d", "\x00\x00", "\x00\x00", "\x44\x5e", "\x00\x00", "\x44\x5f",
-  "\x00\x00", "\x44\x60", "\x44\x61", "\x44\x62", "\x00\x00", "\x44\x63",
-  "\x00\x00", "\x44\x64", "\x44\x65", "\x00\x00", "\x00\x00", "\x44\x66",
-  "\x44\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x68",
-  "\x44\x69", "\x44\x6a", "\x00\x00", "\x00\x00", "\x44\x6b", "\x44\x6c",
-  "\x44\x6d", "\x00\x00", "\x44\x6e", "\x00\x00", "\x44\x6f", "\x00\x00",
-  "\x44\x70", "\x44\x71", "\x00\x00", "\x44\x72", "\x44\x73", "\x00\x00",
-  "\x44\x74", "\x44\x75", "\x00\x00", "\x44\x76", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x44\x77", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x44\x78", "\x00\x00", "\x00\x00", "\x44\x79", "\x00\x00", "\x00\x00",
-  "\x44\x7a", "\x00\x00", "\x00\x00", "\x00\x00", "\x44\x7b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x44\x7c", "\x44\x7d", "\x00\x00", "\x44\x7e",
-  "\x00\x00", "\x45\x21", "\x00\x00", "\x00\x00", "\x45\x22", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x45\x23", "\x00\x00", "\x00\x00", "\x45\x24",
-  "\x45\x25", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x45\x26", "\x45\x27", "\x00\x00", "\x00\x00", "\x45\x28", "\x45\x29",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x2a", "\x00\x00", "\x45\x2b",
-  "\x45\x2c", "\x45\x2d", "\x00\x00", "\x00\x00", "\x45\x2e", "\x45\x2f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x30", "\x45\x31",
-  "\x00\x00", "\x00\x00", "\x45\x32", "\x00\x00", "\x00\x00", "\x45\x33",
-  "\x45\x34", "\x00\x00", "\x45\x35", "\x45\x36", "\x00\x00", "\x00\x00",
-  "\x45\x37", "\x00\x00", "\x45\x38", "\x00\x00", "\x00\x00", "\x45\x39",
-  "\x45\x3a", "\x00\x00", "\x45\x3b", "\x00\x00", "\x45\x3c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x3d", "\x45\x3e",
-  "\x00\x00", "\x45\x3f", "\x45\x40", "\x45\x41", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x42", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x43", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x45\x44", "\x45\x45", "\x45\x46", "\x00\x00", "\x00\x00",
-  "\x45\x47", "\x45\x48", "\x45\x49", "\x45\x4a", "\x45\x4b", "\x00\x00",
-  "\x45\x4d", "\x45\x4c", "\x00\x00", "\x00\x00", "\x45\x4e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x45\x4f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x45\x50", "\x45\x51", "\x45\x52", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x45\x53", "\x45\x54", "\x45\x55", "\x00\x00",
-  "\x00\x00", "\x45\x56", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x45\x57", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x58", "\x45\x59",
-  "\x45\x5a", "\x45\x5b", "\x45\x5c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x45\x5d", "\x45\x5e", "\x00\x00", "\x00\x00", "\x45\x5f",
-  "\x45\x60", "\x00\x00", "\x45\x61", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x45\x62", "\x45\x63", "\x45\x64", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x65", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x45\x66", "\x00\x00", "\x00\x00", "\x45\x67",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x68",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x69", "\x00\x00", "\x00\x00",
-  "\x45\x6a", "\x45\x6b", "\x00\x00", "\x00\x00", "\x45\x6c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x6d", "\x45\x6e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x6f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x45\x70", "\x45\x71", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x45\x72", "\x00\x00", "\x00\x00", "\x45\x73", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x74", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x45\x75", "\x00\x00", "\x45\x76", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x45\x77", "\x00\x00", "\x00\x00", "\x45\x78",
-  "\x45\x79", "\x00\x00", "\x00\x00", "\x00\x00", "\x45\x7a", "\x00\x00",
-  "\x00\x00", "\x45\x7b", "\x00\x00", "\x45\x7c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x45\x7d", "\x45\x7e", "\x46\x21", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x46\x22", "\x00\x00", "\x00\x00", "\x46\x23",
-  "\x46\x24", "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x25", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x46\x26", "\x46\x27", "\x00\x00", "\x46\x28",
-  "\x46\x29", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x2a",
-  "\x46\x2b", "\x00\x00", "\x00\x00", "\x46\x2c", "\x46\x2d", "\x46\x2e",
-  "\x00\x00", "\x46\x2f", "\x46\x30", "\x46\x31", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x46\x32", "\x46\x33", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x46\x34", "\x46\x35", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x46\x36", "\x00\x00", "\x00\x00", "\x46\x37", "\x46\x38",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x39", "\x46\x3a", "\x00\x00",
-  "\x46\x3b", "\x00\x00", "\x00\x00", "\x46\x3c", "\x46\x3d", "\x46\x3e",
-  "\x00\x00", "\x00\x00", "\x46\x3f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x46\x40", "\x00\x00", "\x46\x41", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x42", "\x00\x00",
-  "\x00\x00", "\x46\x43", "\x00\x00", "\x46\x44", "\x46\x45", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x46\x46", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x46\x47", "\x46\x48", "\x00\x00", "\x46\x49", "\x00\x00", "\x46\x4a",
-  "\x46\x4b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x46\x4c", "\x46\x4d", "\x46\x4e", "\x46\x4f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x46\x50", "\x00\x00", "\x46\x51", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x46\x52", "\x00\x00", "\x46\x53", "\x46\x54",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x55", "\x46\x56", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x46\x57", "\x46\x58", "\x46\x59", "\x00\x00",
-  "\x46\x5a", "\x00\x00", "\x46\x5b", "\x00\x00", "\x00\x00", "\x46\x5c",
-  "\x00\x00", "\x46\x5d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x46\x5e", "\x00\x00", "\x46\x5f", "\x46\x60", "\x47\x36", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x46\x61", "\x00\x00", "\x46\x62", "\x00\x00",
-  "\x46\x63", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x64",
-  "\x00\x00", "\x46\x65", "\x00\x00", "\x46\x66", "\x46\x67", "\x00\x00",
-  "\x46\x68", "\x46\x69", "\x46\x6a", "\x46\x6b", "\x00\x00", "\x46\x6c",
-  "\x46\x6d", "\x46\x6e", "\x00\x00", "\x46\x6f", "\x46\x70", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x46\x71", "\x00\x00", "\x00\x00", "\x46\x72",
-  "\x46\x73", "\x00\x00", "\x46\x74", "\x00\x00", "\x46\x75", "\x46\x76",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x46\x77", "\x46\x78", "\x00\x00",
-  "\x46\x79", "\x46\x7a", "\x46\x7b", "\x46\x7c", "\x00\x00", "\x46\x7d",
-  "\x00\x00", "\x46\x7e", "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x21",
-  "\x00\x00", "\x47\x22", "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x23",
-  "\x47\x24", "\x00\x00", "\x47\x25", "\x00\x00", "\x47\x26", "\x47\x27",
-  "\x00\x00", "\x47\x28", "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x29",
-  "\x00\x00", "\x47\x2a", "\x47\x2b", "\x00\x00", "\x00\x00", "\x47\x2c",
-  "\x00\x00", "\x00\x00", "\x47\x2d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x47\x2e", "\x47\x2f", "\x00\x00", "\x47\x30", "\x00\x00", "\x47\x31",
-  "\x47\x32", "\x47\x33", "\x47\x34", "\x47\x35", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x37", "\x47\x38", "\x00\x00",
-  "\x47\x39", "\x47\x3a", "\x00\x00", "\x00\x00", "\x47\x3b", "\x00\x00",
-  "\x00\x00", "\x47\x3c", "\x47\x3d", "\x47\x3e", "\x47\x3f", "\x00\x00",
-  "\x47\x40", "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x41", "\x00\x00",
-  "\x47\x42", "\x47\x43", "\x47\x44", "\x47\x45", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x46", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x47\x47", "\x47\x48", "\x47\x49", "\x00\x00",
-  "\x47\x4a", "\x00\x00", "\x47\x4b", "\x47\x4c", "\x47\x4d", "\x47\x4e",
-  "\x00\x00", "\x47\x4f", "\x47\x50", "\x00\x00", "\x00\x00", "\x47\x51",
-  "\x00\x00", "\x47\x52", "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x53",
-  "\x00\x00", "\x47\x54", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x47\x55", "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x56", "\x00\x00",
-  "\x47\x57", "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x58", "\x47\x59",
-  "\x47\x5a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x5b",
-  "\x00\x00", "\x47\x5c", "\x00\x00", "\x47\x5d", "\x47\x5e", "\x00\x00",
-  "\x47\x5f", "\x00\x00", "\x00\x00", "\x47\x60", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x47\x61", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x47\x62", "\x47\x63", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x47\x64", "\x00\x00", "\x47\x65", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x47\x66", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x47\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x68", "\x47\x69",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x47\x6a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x47\x6b", "\x47\x6c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x47\x6d", "\x00\x00", "\x00\x00", "\x47\x6e", "\x00\x00",
-  "\x47\x6f", "\x47\x70", "\x47\x71", "\x47\x72", "\x00\x00", "\x00\x00",
-  "\x47\x73", "\x47\x74", "\x00\x00", "\x47\x75", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x47\x76", "\x00\x00", "\x47\x77", "\x47\x78", "\x47\x79",
-  "\x47\x7a", "\x00\x00", "\x00\x00", "\x47\x7b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x47\x7c", "\x47\x7d", "\x47\x7e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x48\x21", "\x48\x22", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x48\x23", "\x48\x24", "\x48\x25", "\x00\x00",
-  "\x48\x26", "\x48\x27", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x48\x28", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x48\x29", "\x48\x2a", "\x48\x2b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x2c", "\x48\x2d", "\x00\x00",
-  "\x00\x00", "\x48\x2e", "\x00\x00", "\x48\x2f", "\x48\x30", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x48\x31", "\x48\x32", "\x48\x33", "\x00\x00",
-  "\x48\x34", "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x35", "\x48\x36",
-  "\x00\x00", "\x48\x37", "\x00\x00", "\x00\x00", "\x48\x38", "\x48\x39",
-  "\x48\x3a", "\x48\x3b", "\x00\x00", "\x48\x3c", "\x48\x3d", "\x48\x3e",
-  "\x00\x00", "\x48\x3f", "\x00\x00", "\x48\x40", "\x48\x41", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x48\x42", "\x00\x00", "\x48\x43", "\x00\x00",
-  "\x48\x44", "\x48\x45", "\x48\x46", "\x00\x00", "\x48\x47", "\x00\x00",
-  "\x48\x48", "\x48\x49", "\x48\x4a", "\x00\x00", "\x00\x00", "\x48\x4b",
-  "\x48\x4c", "\x00\x00", "\x00\x00", "\x48\x53", "\x00\x00", "\x48\x4d",
-  "\x48\x4e", "\x00\x00", "\x00\x00", "\x48\x4f", "\x00\x00", "\x00\x00",
-  "\x48\x50", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x51",
-  "\x48\x52", "\x48\x54", "\x00\x00", "\x48\x55", "\x48\x56", "\x48\x57",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x58", "\x00\x00", "\x48\x59",
-  "\x48\x5a", "\x00\x00", "\x00\x00", "\x48\x5b", "\x48\x5c", "\x00\x00",
-  "\x00\x00", "\x48\x5d", "\x48\x5e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x48\x5f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x48\x60", "\x48\x61", "\x48\x62", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x48\x63", "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x64",
-  "\x48\x65", "\x00\x00", "\x00\x00", "\x48\x66", "\x48\x67", "\x48\x68",
-  "\x00\x00", "\x00\x00", "\x48\x69", "\x00\x00", "\x48\x6a", "\x48\x6b",
-  "\x48\x6c", "\x00\x00", "\x48\x6d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x48\x6e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x6f",
-  "\x48\x70", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x71",
-  "\x48\x72", "\x48\x73", "\x48\x74", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x48\x75", "\x48\x76", "\x48\x77", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x78", "\x48\x79", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x48\x7a", "\x48\x7b",
-  "\x00\x00", "\x48\x7c", "\x48\x7d", "\x00\x00", "\x48\x7e", "\x49\x21",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x22", "\x49\x23", "\x49\x24",
-  "\x49\x25", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x26",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x27", "\x00\x00", "\x00\x00",
-  "\x49\x28", "\x49\x29", "\x00\x00", "\x00\x00", "\x49\x2a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x2b", "\x49\x2c", "\x49\x2d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x2e",
-  "\x49\x2f", "\x49\x30", "\x00\x00", "\x00\x00", "\x49\x31", "\x49\x32",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x33", "\x00\x00",
-  "\x00\x00", "\x49\x34", "\x00\x00", "\x49\x35", "\x00\x00", "\x00\x00",
-  "\x49\x36", "\x49\x37", "\x49\x38", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x49\x39", "\x49\x3a", "\x49\x3b", "\x49\x3c", "\x00\x00", "\x00\x00",
-  "\x49\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x49\x3d", "\x49\x3e", "\x49\x3f", "\x49\x40", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x42", "\x49\x43", "\x49\x44",
-  "\x00\x00", "\x49\x45", "\x49\x46", "\x49\x47", "\x49\x48", "\x00\x00",
-  "\x00\x00", "\x49\x49", "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x4a",
-  "\x49\x4b", "\x49\x4c", "\x49\x4d", "\x49\x4e", "\x49\x4f", "\x49\x50",
-  "\x00\x00", "\x00\x00", "\x49\x51", "\x49\x52", "\x49\x53", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x54", "\x49\x55", "\x00\x00",
-  "\x00\x00", "\x49\x56", "\x00\x00", "\x00\x00", "\x49\x57", "\x49\x58",
-  "\x49\x59", "\x00\x00", "\x49\x5a", "\x49\x5b", "\x49\x5c", "\x49\x5d",
-  "\x00\x00", "\x49\x5e", "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x5f",
-  "\x49\x60", "\x49\x61", "\x49\x62", "\x49\x63", "\x49\x64", "\x49\x65",
-  "\x49\x66", "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x67", "\x49\x68",
-  "\x00\x00", "\x00\x00", "\x49\x69", "\x49\x6a", "\x00\x00", "\x49\x6b",
-  "\x49\x6c", "\x00\x00", "\x49\x6d", "\x00\x00", "\x49\x6e", "\x49\x6f",
-  "\x49\x70", "\x49\x71", "\x49\x72", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x49\x73", "\x49\x74", "\x49\x75", "\x00\x00", "\x00\x00", "\x49\x76",
-  "\x49\x77", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x49\x78",
-  "\x00\x00", "\x49\x79", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x49\x7a", "\x00\x00", "\x00\x00", "\x49\x7b", "\x00\x00", "\x49\x7c",
-  "\x00\x00", "\x49\x7d", "\x00\x00", "\x49\x7e", "\x4a\x21", "\x4a\x22",
-  "\x4a\x23", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x24",
-  "\x00\x00", "\x4a\x25", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4a\x26", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4a\x27", "\x4a\x28", "\x4a\x29", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4a\x2a", "\x00\x00", "\x4a\x2b", "\x4a\x2c", "\x4a\x2d",
-  "\x00\x00", "\x4a\x2e", "\x4a\x2f", "\x4a\x30", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4a\x31", "\x4a\x32", "\x4a\x33", "\x00\x00",
-  "\x00\x00", "\x4a\x34", "\x4a\x35", "\x4a\x36", "\x4a\x37", "\x00\x00",
-  "\x00\x00", "\x4a\x38", "\x00\x00", "\x00\x00", "\x4a\x39", "\x4a\x3a",
-  "\x00\x00", "\x4a\x3b", "\x4a\x3c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4a\x3d", "\x00\x00", "\x4a\x3e", "\x4a\x3f",
-  "\x4a\x40", "\x4a\x41", "\x4a\x42", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4a\x43", "\x00\x00", "\x00\x00", "\x4a\x44", "\x00\x00", "\x00\x00",
-  "\x4a\x45", "\x00\x00", "\x4a\x46", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4a\x47", "\x4a\x48", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4a\x49", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x4a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x4b", "\x4a\x4c", "\x4a\x4d",
-  "\x4a\x4e", "\x4a\x4f", "\x00\x00", "\x4a\x50", "\x4a\x51", "\x4a\x52",
-  "\x4a\x53", "\x00\x00", "\x00\x00", "\x4a\x54", "\x00\x00", "\x4a\x55",
-  "\x4a\x56", "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x57", "\x00\x00",
-  "\x4a\x58", "\x00\x00", "\x4a\x59", "\x00\x00", "\x4a\x5a", "\x00\x00",
-  "\x00\x00", "\x4a\x5b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4a\x5c", "\x00\x00", "\x00\x00", "\x4a\x5d", "\x00\x00", "\x00\x00",
-  "\x4a\x5e", "\x4a\x5f", "\x00\x00", "\x4a\x60", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x61", "\x4a\x62", "\x00\x00",
-  "\x00\x00", "\x4a\x63", "\x4a\x64", "\x00\x00", "\x00\x00", "\x4a\x65",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x66", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x67", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4a\x68", "\x4a\x69", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4a\x6a", "\x4a\x6b", "\x4a\x6c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4a\x6d", "\x4a\x6e", "\x00\x00", "\x00\x00",
-  "\x4a\x6f", "\x00\x00", "\x00\x00", "\x4a\x70", "\x4a\x71", "\x00\x00",
-  "\x00\x00", "\x4a\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4a\x73", "\x00\x00", "\x4a\x74", "\x00\x00", "\x00\x00",
-  "\x4a\x75", "\x4a\x76", "\x4a\x77", "\x00\x00", "\x4a\x78", "\x4a\x79",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4a\x7a",
-  "\x4a\x7b", "\x4a\x7c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4a\x7d", "\x4a\x7e", "\x00\x00", "\x00\x00", "\x4b\x21",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x22", "\x00\x00", "\x4b\x23",
-  "\x4b\x24", "\x00\x00", "\x4b\x25", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4b\x26", "\x00\x00", "\x4b\x27", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4b\x28", "\x4b\x29", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4b\x2a", "\x4b\x2b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4b\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x2d",
-  "\x00\x00", "\x4b\x2e", "\x00\x00", "\x00\x00", "\x4b\x2f", "\x4b\x30",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x31", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4b\x32", "\x4b\x33", "\x00\x00", "\x00\x00",
-  "\x4b\x34", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x35",
-  "\x4b\x36", "\x00\x00", "\x4b\x37", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4b\x38", "\x4b\x39", "\x00\x00", "\x00\x00",
-  "\x4b\x3a", "\x00\x00", "\x4b\x3b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4b\x3c", "\x00\x00", "\x4b\x3d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4b\x3e", "\x4b\x3f", "\x4b\x40", "\x4b\x41", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x42", "\x4b\x43",
-  "\x00\x00", "\x4b\x44", "\x00\x00", "\x4b\x45", "\x4b\x46", "\x00\x00",
-  "\x4b\x47", "\x4b\x48", "\x00\x00", "\x4b\x49", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x4a", "\x00\x00", "\x4b\x4b",
-  "\x00\x00", "\x00\x00", "\x4b\x4c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4b\x4d", "\x4b\x4e", "\x00\x00", "\x4b\x4f", "\x00\x00", "\x4b\x50",
-  "\x4b\x51", "\x4b\x52", "\x00\x00", "\x4b\x53", "\x00\x00", "\x00\x00",
-  "\x4b\x54", "\x00\x00", "\x4b\x55", "\x00\x00", "\x4b\x56", "\x4b\x57",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x58", "\x00\x00", "\x4b\x59",
-  "\x4b\x5a", "\x4b\x5b", "\x00\x00", "\x4b\x5c", "\x00\x00", "\x00\x00",
-  "\x4b\x5d", "\x4b\x5e", "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x5f",
-  "\x4b\x60", "\x00\x00", "\x4b\x61", "\x4b\x62", "\x00\x00", "\x4b\x63",
-  "\x00\x00", "\x4b\x64", "\x00\x00", "\x00\x00", "\x4b\x65", "\x4b\x66",
-  "\x00\x00", "\x4b\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4b\x68", "\x4b\x69", "\x00\x00", "\x00\x00", "\x4b\x6a",
-  "\x00\x00", "\x4b\x6b", "\x4b\x6c", "\x00\x00", "\x00\x00", "\x4b\x6d",
-  "\x00\x00", "\x00\x00", "\x4b\x6e", "\x4b\x6f", "\x00\x00", "\x00\x00",
-  "\x4b\x70", "\x00\x00", "\x00\x00", "\x4b\x71", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4b\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x4b\x73",
-  "\x00\x00", "\x4b\x74", "\x00\x00", "\x00\x00", "\x4b\x75", "\x4b\x76",
-  "\x00\x00", "\x4b\x77", "\x4b\x78", "\x4b\x79", "\x00\x00", "\x4b\x7a",
-  "\x00\x00", "\x4b\x7b", "\x4b\x7c", "\x4b\x7d", "\x00\x00", "\x4b\x7e",
-  "\x00\x00", "\x4c\x21", "\x4c\x22", "\x4c\x23", "\x00\x00", "\x00\x00",
-  "\x4c\x24", "\x00\x00", "\x00\x00", "\x4c\x25", "\x00\x00", "\x00\x00",
-  "\x4c\x26", "\x4c\x27", "\x4c\x28", "\x4c\x29", "\x4c\x2a", "\x00\x00",
-  "\x4c\x2b", "\x00\x00", "\x4c\x2c", "\x4c\x2d", "\x4c\x2e", "\x4c\x2f",
-  "\x4c\x30", "\x4c\x31", "\x4c\x32", "\x4c\x33", "\x4c\x34", "\x4c\x35",
-  "\x4c\x36", "\x4c\x37", "\x00\x00", "\x00\x00", "\x4c\x38", "\x4c\x39",
-  "\x00\x00", "\x4c\x3a", "\x4c\x3b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4c\x3c", "\x00\x00", "\x4c\x3d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4c\x3e", "\x4c\x3f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4c\x40", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4c\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x42",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x43", "\x4c\x44", "\x4c\x45",
-  "\x00\x00", "\x00\x00", "\x4c\x46", "\x00\x00", "\x4c\x47", "\x4c\x48",
-  "\x00\x00", "\x00\x00", "\x4c\x49", "\x4c\x4a", "\x4c\x4b", "\x4c\x4c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x4d", "\x4c\x4e", "\x4c\x4f",
-  "\x00\x00", "\x4c\x50", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4c\x51", "\x4c\x52", "\x4c\x53", "\x4c\x54", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x55", "\x4c\x56",
-  "\x4c\x57", "\x00\x00", "\x4c\x58", "\x00\x00", "\x00\x00", "\x4c\x59",
-  "\x4c\x5a", "\x4c\x5b", "\x00\x00", "\x4c\x5c", "\x00\x00", "\x00\x00",
-  "\x4c\x5d", "\x00\x00", "\x4c\x5e", "\x4c\x5f", "\x4c\x60", "\x4c\x61",
-  "\x00\x00", "\x00\x00", "\x4c\x62", "\x4c\x63", "\x00\x00", "\x4c\x64",
-  "\x4c\x65", "\x00\x00", "\x00\x00", "\x4c\x66", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4c\x67", "\x00\x00", "\x4c\x68", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4c\x69", "\x4c\x6a", "\x4c\x6b", "\x00\x00", "\x00\x00",
-  "\x4c\x6c", "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x6d", "\x00\x00",
-  "\x00\x00", "\x4c\x6e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4c\x6f", "\x00\x00", "\x4c\x70", "\x4c\x71", "\x00\x00", "\x00\x00",
-  "\x4c\x72", "\x4c\x73", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4c\x74", "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x75", "\x00\x00",
-  "\x4c\x76", "\x4c\x77", "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x78",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x79", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4c\x7a", "\x4c\x7b",
-  "\x4c\x7c", "\x00\x00", "\x00\x00", "\x4c\x7d", "\x4c\x7e", "\x4d\x21",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x22", "\x4d\x23", "\x4d\x24",
-  "\x4d\x25", "\x00\x00", "\x00\x00", "\x4d\x26", "\x00\x00", "\x00\x00",
-  "\x4d\x27", "\x00\x00", "\x4d\x28", "\x4d\x29", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4d\x2a", "\x4d\x2b", "\x00\x00", "\x00\x00",
-  "\x4d\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x2d", "\x4d\x2e",
-  "\x4d\x2f", "\x4d\x30", "\x00\x00", "\x00\x00", "\x4d\x31", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4d\x32", "\x4d\x33", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x34", "\x00\x00", "\x4d\x35",
-  "\x00\x00", "\x4d\x36", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4d\x37", "\x4d\x38", "\x4d\x39", "\x00\x00", "\x4d\x3a", "\x4d\x3b",
-  "\x00\x00", "\x4d\x3c", "\x4d\x3d", "\x4d\x3e", "\x4d\x3f", "\x4d\x40",
-  "\x4d\x41", "\x4d\x42", "\x00\x00", "\x00\x00", "\x4d\x43", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4d\x44", "\x4d\x45", "\x00\x00", "\x4d\x46",
-  "\x4d\x47", "\x00\x00", "\x4d\x48", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4d\x49", "\x00\x00", "\x00\x00", "\x4d\x4a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x4b", "\x00\x00", "\x4d\x4c",
-  "\x4d\x4d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4d\x4e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x4f",
-  "\x4d\x50", "\x4d\x51", "\x00\x00", "\x00\x00", "\x4d\x52", "\x00\x00",
-  "\x4d\x53", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4d\x54", "\x00\x00", "\x4d\x55", "\x4d\x56", "\x4d\x57", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x58", "\x00\x00", "\x00\x00",
-  "\x4d\x59", "\x4d\x5a", "\x4d\x5b", "\x00\x00", "\x00\x00", "\x4d\x5c",
-  "\x00\x00", "\x00\x00", "\x4d\x5d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4d\x5e", "\x00\x00", "\x4d\x5f", "\x4d\x60", "\x00\x00",
-  "\x4d\x61", "\x4d\x62", "\x4d\x63", "\x00\x00", "\x4d\x64", "\x4d\x65",
-  "\x4d\x66", "\x00\x00", "\x00\x00", "\x4d\x67", "\x4d\x68", "\x00\x00",
-  "\x4d\x69", "\x00\x00", "\x4d\x6a", "\x00\x00", "\x00\x00", "\x4d\x6b",
-  "\x00\x00", "\x00\x00", "\x4d\x6c", "\x4d\x6d", "\x00\x00", "\x4d\x6e",
-  "\x4d\x6f", "\x00\x00", "\x00\x00", "\x4d\x70", "\x00\x00", "\x4d\x71",
-  "\x4d\x72", "\x4d\x73", "\x4d\x74", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4d\x75", "\x00\x00", "\x4d\x76", "\x4d\x77", "\x00\x00",
-  "\x00\x00", "\x4d\x78", "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x79",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4d\x7a", "\x4d\x7b",
-  "\x00\x00", "\x4d\x7c", "\x00\x00", "\x00\x00", "\x4d\x7d", "\x4d\x7e",
-  "\x4e\x21", "\x00\x00", "\x4e\x22", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4e\x24", "\x4e\x25", "\x00\x00", "\x4e\x26", "\x4e\x27", "\x4e\x28",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x29", "\x4e\x23", "\x4e\x2a",
-  "\x4e\x2b", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x2c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x2d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x2e", "\x4e\x2f", "\x4e\x30",
-  "\x4e\x31", "\x4e\x32", "\x00\x00", "\x4e\x33", "\x00\x00", "\x00\x00",
-  "\x4e\x34", "\x4e\x35", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x36",
-  "\x4e\x37", "\x4e\x38", "\x4e\x39", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4e\x3a", "\x4e\x3b", "\x4e\x3c", "\x00\x00",
-  "\x4e\x3d", "\x4e\x3e", "\x00\x00", "\x4e\x3f", "\x4e\x40", "\x4e\x41",
-  "\x4e\x42", "\x4e\x43", "\x4e\x44", "\x4e\x45", "\x00\x00", "\x4e\x46",
-  "\x00\x00", "\x00\x00", "\x4e\x47", "\x4e\x48", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4e\x49", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x4a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x4b", "\x00\x00", "\x4e\x4c",
-  "\x4e\x4d", "\x00\x00", "\x4e\x4e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4e\x4f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4e\x50", "\x4e\x51", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4e\x52", "\x00\x00", "\x4e\x53", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4e\x54", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4e\x55", "\x4e\x56", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4e\x57", "\x00\x00", "\x00\x00", "\x4e\x58", "\x00\x00", "\x00\x00",
-  "\x4e\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x5a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x5b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4e\x5c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4e\x5d", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x5e", "\x00\x00",
-  "\x4e\x5f", "\x4e\x60", "\x00\x00", "\x4e\x61", "\x00\x00", "\x4e\x62",
-  "\x4e\x63", "\x00\x00", "\x4e\x64", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4e\x65", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4e\x66", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4e\x67", "\x4e\x68", "\x4e\x69", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4e\x6a", "\x4e\x6b", "\x4e\x6c", "\x00\x00",
-  "\x00\x00", "\x4e\x6d", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x6e",
-  "\x4e\x6f", "\x00\x00", "\x00\x00", "\x00\x00", "\x4e\x70", "\x00\x00",
-  "\x00\x00", "\x4e\x71", "\x4e\x72", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4e\x73", "\x00\x00", "\x00\x00", "\x4e\x74", "\x4e\x75", "\x4e\x76",
-  "\x00\x00", "\x00\x00", "\x4e\x77", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4e\x78", "\x4e\x79", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4e\x7a", "\x00\x00", "\x4e\x7b", "\x4e\x7c", "\x4e\x7d", "\x00\x00",
-  "\x4e\x7e", "\x00\x00", "\x4f\x21", "\x00\x00", "\x00\x00", "\x4f\x22",
-  "\x00\x00", "\x00\x00", "\x4f\x23", "\x00\x00", "\x4f\x24", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4f\x25", "\x00\x00", "\x4f\x26", "\x4f\x27",
-  "\x4f\x28", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4f\x29", "\x00\x00", "\x00\x00", "\x4f\x2a", "\x00\x00", "\x00\x00",
-  "\x4f\x2b", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x2c", "\x4f\x2d",
-  "\x4f\x2e", "\x4f\x2f", "\x4f\x30", "\x4f\x31", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4f\x32", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4f\x33", "\x00\x00", "\x00\x00", "\x4f\x34", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4f\x35", "\x00\x00", "\x00\x00", "\x4f\x36",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x37", "\x4f\x38", "\x00\x00",
-  "\x4f\x39", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x3a", "\x4f\x3b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x3c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x3d", "\x4f\x3e",
-  "\x4f\x3f", "\x00\x00", "\x00\x00", "\x4f\x40", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4f\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4f\x42", "\x4f\x43", "\x4f\x44", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4f\x45", "\x00\x00", "\x4f\x46", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4f\x47", "\x00\x00", "\x4f\x48", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4f\x49", "\x4f\x4a", "\x00\x00", "\x00\x00", "\x4f\x4b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4f\x4c", "\x00\x00", "\x00\x00", "\x4f\x4d",
-  "\x4f\x4e", "\x4f\x4f", "\x00\x00", "\x00\x00", "\x4f\x50", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x4f\x51", "\x4f\x52", "\x00\x00", "\x00\x00",
-  "\x4f\x53", "\x4f\x54", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x55",
-  "\x4f\x56", "\x4f\x57", "\x4f\x58", "\x4f\x59", "\x00\x00", "\x4f\x5a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x5b", "\x00\x00",
-  "\x4f\x5c", "\x4f\x5d", "\x4f\x5e", "\x00\x00", "\x00\x00", "\x4f\x5f",
-  "\x4f\x60", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x61", "\x00\x00",
-  "\x4f\x62", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x63", "\x4f\x64",
-  "\x00\x00", "\x4f\x65", "\x00\x00", "\x4f\x66", "\x4f\x67", "\x00\x00",
-  "\x4f\x68", "\x4f\x69", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x6a",
-  "\x00\x00", "\x4f\x6b", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x6c",
-  "\x4f\x6d", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x6e", "\x4f\x6f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x70", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x71", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x4f\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x4f\x74", "\x4f\x75", "\x4f\x76", "\x00\x00", "\x4f\x73", "\x00\x00",
-  "\x00\x00", "\x4f\x77", "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x78",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x4f\x79", "\x4f\x7a", "\x00\x00",
-  "\x00\x00", "\x4f\x7b", "\x4f\x7c", "\x4f\x7d", "\x4f\x7e", "\x50\x21",
-  "\x00\x00", "\x50\x22", "\x00\x00", "\x50\x23", "\x50\x24", "\x50\x25",
-  "\x50\x26", "\x00\x00", "\x00\x00", "\x50\x27", "\x00\x00", "\x50\x28",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x29", "\x50\x2a", "\x00\x00",
-  "\x50\x2b", "\x50\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x50\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x2f", "\x50\x30",
-  "\x50\x31", "\x00\x00", "\x00\x00", "\x50\x2d", "\x00\x00", "\x50\x32",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x33", "\x50\x34", "\x50\x35",
-  "\x00\x00", "\x00\x00", "\x50\x37", "\x50\x38", "\x00\x00", "\x00\x00",
-  "\x50\x39", "\x50\x3a", "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x3b",
-  "\x50\x36", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x50\x3c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x50\x3d", "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x3e", "\x50\x3f",
-  "\x00\x00", "\x50\x40", "\x00\x00", "\x50\x41", "\x50\x42", "\x50\x43",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x44", "\x00\x00",
-  "\x50\x45", "\x00\x00", "\x50\x46", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x50\x47", "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x48", "\x00\x00",
-  "\x00\x00", "\x50\x49", "\x50\x4a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x50\x4b", "\x00\x00", "\x50\x4c", "\x00\x00",
-  "\x50\x4d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x4e",
-  "\x50\x4f", "\x50\x50", "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x51",
-  "\x50\x52", "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x53", "\x00\x00",
-  "\x50\x54", "\x00\x00", "\x00\x00", "\x50\x55", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x50\x56", "\x00\x00", "\x00\x00", "\x50\x57", "\x50\x58",
-  "\x50\x59", "\x00\x00", "\x50\x5a", "\x00\x00", "\x50\x5b", "\x50\x5c",
-  "\x50\x5d", "\x00\x00", "\x50\x5e", "\x50\x5f", "\x00\x00", "\x50\x60",
-  "\x50\x61", "\x50\x62", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x50\x63", "\x00\x00", "\x50\x64", "\x50\x65", "\x50\x66", "\x50\x67",
-  "\x00\x00", "\x50\x68", "\x00\x00", "\x00\x00", "\x50\x69", "\x50\x6a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x6b", "\x50\x6c",
-  "\x50\x6d", "\x00\x00", "\x50\x6e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x50\x6f", "\x00\x00", "\x50\x70", "\x00\x00", "\x00\x00", "\x50\x71",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x50\x72", "\x00\x00", "\x00\x00",
-  "\x50\x73", "\x50\x74", "\x00\x00", "\x50\x75", "\x00\x00", "\x00\x00",
-  "\x50\x76", "\x50\x77", "\x00\x00", "\x50\x78", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x50\x79", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x50\x7a", "\x00\x00", "\x50\x7b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x50\x7c", "\x00\x00", "\x00\x00", "\x50\x7d", "\x50\x7e",
-  "\x00\x00", "\x51\x21", "\x00\x00", "\x51\x22", "\x00\x00", "\x00\x00",
-  "\x51\x23", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x24",
-  "\x51\x25", "\x00\x00", "\x51\x26", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x51\x27", "\x51\x28", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x29",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x2a",
-  "\x51\x2b", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x2c", "\x00\x00",
-  "\x51\x2d", "\x51\x2e", "\x00\x00", "\x51\x2f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x51\x30", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x51\x31", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x51\x32", "\x00\x00", "\x00\x00", "\x51\x33", "\x00\x00", "\x00\x00",
-  "\x51\x34", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x51\x35", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x36", "\x00\x00",
-  "\x51\x37", "\x00\x00", "\x51\x38", "\x51\x39", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x51\x3a", "\x51\x3b", "\x00\x00", "\x00\x00", "\x51\x3c",
-  "\x51\x3d", "\x51\x3e", "\x51\x3f", "\x51\x40", "\x00\x00", "\x51\x41",
-  "\x51\x42", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x43", "\x51\x44",
-  "\x51\x45", "\x00\x00", "\x00\x00", "\x51\x46", "\x00\x00", "\x00\x00",
-  "\x51\x47", "\x51\x48", "\x00\x00", "\x51\x49", "\x51\x4a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x4b", "\x00\x00", "\x51\x4c",
-  "\x00\x00", "\x00\x00", "\x51\x4d", "\x00\x00", "\x00\x00", "\x51\x4e",
-  "\x51\x4f", "\x00\x00", "\x00\x00", "\x51\x50", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x51", "\x00\x00", "\x51\x52",
-  "\x00\x00", "\x51\x53", "\x00\x00", "\x00\x00", "\x51\x54", "\x51\x55",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x56", "\x51\x57", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x58", "\x51\x59", "\x00\x00",
-  "\x00\x00", "\x51\x5a", "\x51\x5b", "\x00\x00", "\x51\x5c", "\x00\x00",
-  "\x00\x00", "\x51\x5d", "\x51\x5e", "\x51\x5f", "\x00\x00", "\x51\x60",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x61", "\x00\x00", "\x51\x62",
-  "\x51\x63", "\x51\x64", "\x00\x00", "\x00\x00", "\x51\x65", "\x00\x00",
-  "\x00\x00", "\x51\x66", "\x00\x00", "\x51\x67", "\x00\x00", "\x00\x00",
-  "\x51\x68", "\x51\x69", "\x51\x6a", "\x51\x6b", "\x00\x00", "\x51\x6c",
-  "\x51\x6d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x6e",
-  "\x00\x00", "\x00\x00", "\x51\x6f", "\x51\x70", "\x00\x00", "\x51\x71",
-  "\x51\x72", "\x51\x73", "\x51\x74", "\x51\x75", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x51\x76", "\x00\x00", "\x00\x00", "\x00\x00", "\x51\x77",
-  "\x00\x00", "\x51\x78", "\x51\x79", "\x51\x7a", "\x00\x00", "\x51\x7b",
-  "\x51\x7c", "\x51\x7d", "\x51\x7e", "\x52\x21", "\x00\x00", "\x00\x00",
-  "\x52\x22", "\x52\x23", "\x00\x00", "\x52\x24", "\x52\x25", "\x52\x26",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x52\x27",
-  "\x52\x28", "\x52\x29", "\x52\x2a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x52\x2b", "\x00\x00", "\x52\x2c", "\x00\x00", "\x00\x00", "\x52\x2d",
-  "\x52\x2e", "\x00\x00", "\x00\x00", "\x52\x2f", "\x00\x00", "\x52\x30",
-  "\x00\x00", "\x00\x00", "\x52\x31", "\x52\x32", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x52\x33", "\x52\x34", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x52\x35", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x52\x36", "\x00\x00", "\x52\x37", "\x52\x38", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x52\x39", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x52\x3a", "\x00\x00", "\x00\x00", "\x52\x3b", "\x00\x00",
-  "\x52\x3c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x52\x3d",
-  "\x52\x3e", "\x00\x00", "\x00\x00", "\x52\x3f", "\x52\x40", "\x00\x00",
-  "\x52\x41", "\x00\x00", "\x00\x00", "\x52\x42", "\x52\x43", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x52\x44", "\x52\x45", "\x52\x46", "\x52\x47",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x52\x48", "\x00\x00",
-  "\x00\x00", "\x52\x49", "\x00\x00", "\x00\x00", "\x52\x4a", "\x00\x00",
-  "\x52\x4b", "\x52\x4c", "\x00\x00", "\x52\x4d", "\x52\x4e", "\x00\x00",
-  "\x52\x4f", "\x52\x50", "\x52\x51", "\x52\x52", "\x00\x00", "\x52\x53",
-  "\x52\x54", "\x00\x00", "\x52\x55", "\x52\x56", "\x00\x00", "\x00\x00",
-  "\x52\x57", "\x52\x58", "\x52\x59", "\x00\x00", "\x52\x5a", "\x00\x00",
-  "\x52\x5b", "\x00\x00", "\x00\x00", "\x52\x5c", "\x52\x5d", "\x52\x5e",
-  "\x52\x5f", "\x00\x00", "\x52\x60", "\x00\x00", "\x00\x00", "\x52\x61",
-  "\x00\x00", "\x52\x62", "\x52\x63", "\x00\x00", "\x52\x64", "\x52\x65",
-  "\x52\x66", "\x00\x00", "\x52\x67", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x52\x68", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x52\x69", "\x52\x6a", "\x00\x00", "\x52\x6b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x52\x6c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x52\x6d", "\x00\x00", "\x52\x6e", "\x52\x6f", "\x00\x00", "\x52\x70",
-  "\x00\x00", "\x00\x00", "\x52\x71", "\x52\x72", "\x52\x73", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x52\x74", "\x52\x76", "\x52\x77", "\x52\x78",
-  "\x00\x00", "\x52\x75", "\x00\x00", "\x00\x00", "\x00\x00", "\x52\x79",
-  "\x52\x7a", "\x52\x7b", "\x52\x7c", "\x52\x7d", "\x52\x7e", "\x00\x00",
-  "\x00\x00", "\x53\x21", "\x00\x00", "\x53\x22", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x53\x23", "\x00\x00", "\x53\x24", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x53\x25", "\x53\x26", "\x00\x00", "\x53\x27", "\x00\x00",
-  "\x53\x28", "\x53\x29", "\x00\x00", "\x00\x00", "\x53\x2a", "\x53\x2b",
-  "\x53\x2c", "\x53\x2d", "\x53\x2e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x53\x2f", "\x53\x30", "\x00\x00", "\x53\x31", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x32", "\x53\x33",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x34",
-  "\x53\x35", "\x00\x00", "\x00\x00", "\x53\x36", "\x53\x37", "\x53\x38",
-  "\x00\x00", "\x00\x00", "\x53\x39", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x53\x3a", "\x00\x00", "\x00\x00", "\x53\x3b", "\x53\x3c",
-  "\x53\x3d", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x3e", "\x00\x00",
-  "\x53\x3f", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x40", "\x53\x41",
-  "\x53\x42", "\x00\x00", "\x53\x43", "\x00\x00", "\x53\x44", "\x53\x45",
-  "\x00\x00", "\x00\x00", "\x53\x46", "\x53\x47", "\x00\x00", "\x00\x00",
-  "\x53\x48", "\x00\x00", "\x53\x49", "\x53\x4a", "\x53\x4b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x53\x4c", "\x53\x4d", "\x53\x4e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x53\x4f", "\x00\x00",
-  "\x53\x50", "\x53\x51", "\x53\x52", "\x00\x00", "\x00\x00", "\x53\x53",
-  "\x53\x54", "\x53\x55", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x53\x56", "\x00\x00", "\x00\x00", "\x53\x57", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x53\x58", "\x00\x00", "\x00\x00", "\x53\x59", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x53\x5a", "\x53\x5b", "\x53\x5c", "\x53\x5d",
-  "\x00\x00", "\x53\x5e", "\x53\x5f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x53\x60", "\x53\x61", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x53\x62", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x53\x63", "\x00\x00", "\x53\x64", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x53\x65", "\x00\x00", "\x53\x66", "\x53\x67", "\x00\x00", "\x53\x68",
-  "\x53\x69", "\x53\x6a", "\x00\x00", "\x53\x6b", "\x00\x00", "\x00\x00",
-  "\x53\x6c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x53\x6d", "\x53\x6e", "\x00\x00", "\x53\x6f", "\x53\x70", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x53\x71", "\x00\x00", "\x53\x72", "\x53\x73",
-  "\x53\x74", "\x00\x00", "\x53\x75", "\x53\x76", "\x00\x00", "\x53\x77",
-  "\x00\x00", "\x00\x00", "\x53\x78", "\x53\x79", "\x53\x7a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x53\x7b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x53\x7c", "\x53\x7d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x53\x7e", "\x54\x21", "\x54\x22", "\x54\x23",
-  "\x00\x00", "\x00\x00", "\x54\x24", "\x54\x25", "\x00\x00", "\x00\x00",
-  "\x54\x26", "\x54\x27", "\x00\x00", "\x54\x28", "\x54\x29", "\x54\x2a",
-  "\x54\x2b", "\x54\x2c", "\x54\x2d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x54\x2e", "\x54\x2f", "\x54\x30", "\x54\x31",
-  "\x00\x00", "\x54\x32", "\x54\x34", "\x00\x00", "\x00\x00", "\x54\x35",
-  "\x54\x36", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x37", "\x54\x38",
-  "\x00\x00", "\x54\x39", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x3a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x3b", "\x54\x3c", "\x00\x00",
-  "\x00\x00", "\x54\x3d", "\x54\x3e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x54\x33", "\x54\x3f", "\x54\x40", "\x54\x41",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x42", "\x00\x00", "\x54\x43",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x44", "\x54\x45",
-  "\x00\x00", "\x00\x00", "\x54\x46", "\x54\x47", "\x54\x48", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x54\x49", "\x54\x4a", "\x00\x00", "\x54\x4b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x4c", "\x00\x00", "\x00\x00",
-  "\x54\x4d", "\x54\x4e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x54\x4f", "\x54\x50", "\x00\x00", "\x54\x51", "\x54\x52", "\x00\x00",
-  "\x54\x53", "\x00\x00", "\x54\x54", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x54\x55", "\x54\x56", "\x00\x00", "\x54\x57",
-  "\x54\x58", "\x00\x00", "\x00\x00", "\x54\x59", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x5a", "\x00\x00", "\x00\x00",
-  "\x54\x5b", "\x54\x5c", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x5d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x5e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x5f", "\x00\x00",
-  "\x00\x00", "\x54\x60", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x54\x61", "\x54\x62", "\x00\x00", "\x00\x00", "\x54\x63", "\x00\x00",
-  "\x00\x00", "\x54\x64", "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x65",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x66", "\x00\x00", "\x00\x00",
-  "\x54\x67", "\x00\x00", "\x54\x68", "\x00\x00", "\x00\x00", "\x54\x69",
-  "\x54\x6a", "\x54\x6c", "\x54\x6b", "\x54\x6d", "\x54\x6e", "\x54\x6f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x54\x70", "\x54\x71", "\x00\x00",
-  "\x00\x00", "\x54\x72", "\x54\x73", "\x00\x00", "\x00\x00", "\x54\x74",
-  "\x54\x75", "\x54\x76", "\x54\x77", "\x54\x78", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x54\x79", "\x00\x00", "\x54\x7a", "\x54\x7b", "\x54\x7c",
-  "\x54\x7d", "\x54\x7e", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x21",
-  "\x55\x22", "\x55\x23", "\x55\x24", "\x55\x25", "\x55\x26", "\x00\x00",
-  "\x55\x27", "\x00\x00", "\x55\x28", "\x55\x29", "\x55\x2a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x2b", "\x55\x2c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x2d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x55\x2e", "\x55\x2f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x55\x30", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x31",
-  "\x00\x00", "\x00\x00", "\x55\x32", "\x55\x33", "\x55\x34", "\x00\x00",
-  "\x00\x00", "\x55\x35", "\x55\x36", "\x00\x00", "\x00\x00", "\x55\x37",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x38", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x39", "\x55\x3a",
-  "\x55\x3b", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x3c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x55\x3d", "\x00\x00", "\x55\x3e", "\x00\x00",
-  "\x00\x00", "\x55\x3f", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x40",
-  "\x00\x00", "\x55\x41", "\x55\x42", "\x00\x00", "\x00\x00", "\x55\x43",
-  "\x55\x44", "\x00\x00", "\x00\x00", "\x55\x45", "\x55\x46", "\x55\x47",
-  "\x55\x48", "\x55\x49", "\x00\x00", "\x55\x4a", "\x00\x00", "\x00\x00",
-  "\x55\x4b", "\x55\x4c", "\x55\x4d", "\x00\x00", "\x55\x4e", "\x00\x00",
-  "\x55\x4f", "\x55\x50", "\x00\x00", "\x55\x51", "\x55\x52", "\x55\x53",
-  "\x55\x54", "\x55\x55", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x56",
-  "\x00\x00", "\x55\x57", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x55\x58", "\x00\x00", "\x55\x59", "\x00\x00", "\x55\x5a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x5b", "\x55\x5c", "\x00\x00",
-  "\x55\x5d", "\x00\x00", "\x55\x5e", "\x55\x5f", "\x00\x00", "\x55\x60",
-  "\x00\x00", "\x55\x61", "\x00\x00", "\x55\x62", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x55\x63", "\x55\x64", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x55\x65", "\x00\x00", "\x55\x66", "\x55\x67", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x55\x68", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x69",
-  "\x55\x6a", "\x55\x6b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x55\x6c", "\x55\x6d", "\x00\x00", "\x55\x6e", "\x55\x6f",
-  "\x55\x70", "\x00\x00", "\x00\x00", "\x00\x00", "\x55\x71", "\x55\x72",
-  "\x55\x73", "\x55\x74", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x55\x75", "\x00\x00", "\x55\x76", "\x00\x00", "\x00\x00", "\x55\x77",
-  "\x00\x00", "\x55\x78", "\x55\x79", "\x00\x00", "\x55\x7a", "\x55\x7b",
-  "\x55\x7c", "\x55\x7d", "\x55\x7e", "\x00\x00", "\x56\x21", "\x00\x00",
-  "\x56\x22", "\x56\x23", "\x00\x00", "\x00\x00", "\x56\x24", "\x00\x00",
-  "\x00\x00", "\x56\x25", "\x56\x26", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x56\x27", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x28",
-  "\x56\x29", "\x56\x2a", "\x56\x2b", "\x56\x2c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x56\x2d", "\x00\x00", "\x56\x2e", "\x00\x00", "\x56\x2f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x30", "\x00\x00", "\x00\x00",
-  "\x56\x31", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x32",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x33", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x56\x34", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x56\x35", "\x00\x00", "\x56\x36", "\x56\x37", "\x00\x00",
-  "\x56\x38", "\x00\x00", "\x00\x00", "\x56\x39", "\x00\x00", "\x56\x3a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x3b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x3c", "\x56\x3d",
-  "\x56\x3e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x56\x3f", "\x56\x40", "\x56\x41", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x56\x42", "\x00\x00", "\x56\x43", "\x56\x44", "\x56\x45", "\x00\x00",
-  "\x00\x00", "\x56\x47", "\x56\x48", "\x56\x49", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x56\x4a", "\x00\x00", "\x00\x00", "\x56\x4b",
-  "\x00\x00", "\x56\x46", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x56\x4c", "\x00\x00", "\x56\x4d", "\x00\x00", "\x00\x00",
-  "\x56\x4e", "\x00\x00", "\x00\x00", "\x56\x4f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x56\x50", "\x56\x51", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x56\x52", "\x00\x00", "\x56\x53", "\x56\x54", "\x56\x56", "\x00\x00",
-  "\x56\x57", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x58",
-  "\x56\x55", "\x00\x00", "\x00\x00", "\x56\x59", "\x56\x5a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x5b", "\x00\x00",
-  "\x56\x5c", "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x5d", "\x00\x00",
-  "\x56\x5e", "\x56\x5f", "\x00\x00", "\x00\x00", "\x56\x60", "\x00\x00",
-  "\x00\x00", "\x56\x61", "\x56\x62", "\x56\x63", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x56\x64", "\x56\x65", "\x56\x66", "\x00\x00", "\x00\x00",
-  "\x56\x67", "\x56\x68", "\x00\x00", "\x56\x69", "\x56\x6a", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x56\x6b", "\x00\x00", "\x56\x6c", "\x56\x6d",
-  "\x00\x00", "\x00\x00", "\x56\x6e", "\x56\x6f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x56\x70", "\x56\x71", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x56\x72", "\x56\x73", "\x00\x00", "\x00\x00", "\x56\x74",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x75", "\x56\x76", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x56\x77", "\x56\x78",
-  "\x00\x00", "\x56\x79", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x56\x7a", "\x56\x7b", "\x56\x7c", "\x56\x7d", "\x56\x7e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x21", "\x00\x00",
-  "\x00\x00", "\x57\x22", "\x57\x23", "\x00\x00", "\x57\x24", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x25", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x26", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x57\x27", "\x00\x00", "\x00\x00", "\x57\x28", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x57\x29", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x57\x2a", "\x57\x2b", "\x57\x2c", "\x00\x00",
-  "\x57\x2d", "\x00\x00", "\x57\x2e", "\x57\x2f", "\x57\x30", "\x00\x00",
-  "\x57\x31", "\x57\x32", "\x00\x00", "\x00\x00", "\x57\x33", "\x00\x00",
-  "\x57\x34", "\x57\x35", "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x36",
-  "\x00\x00", "\x00\x00", "\x57\x37", "\x00\x00", "\x00\x00", "\x57\x38",
-  "\x00\x00", "\x57\x39", "\x00\x00", "\x57\x3a", "\x00\x00", "\x57\x3b",
-  "\x57\x3c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x3d",
-  "\x57\x3e", "\x00\x00", "\x57\x3f", "\x57\x40", "\x00\x00", "\x00\x00",
-  "\x57\x41", "\x57\x42", "\x57\x43", "\x57\x44", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x57\x45", "\x00\x00", "\x57\x46", "\x00\x00", "\x57\x47",
-  "\x00\x00", "\x57\x48", "\x00\x00", "\x00\x00", "\x57\x49", "\x00\x00",
-  "\x00\x00", "\x57\x4a", "\x00\x00", "\x57\x4b", "\x00\x00", "\x57\x4c",
-  "\x57\x4d", "\x57\x4e", "\x57\x4f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x57\x50", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x57\x51", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x57\x52", "\x00\x00", "\x57\x53", "\x00\x00", "\x57\x54", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x57\x55", "\x00\x00", "\x57\x56", "\x00\x00",
-  "\x00\x00", "\x57\x57", "\x00\x00", "\x57\x58", "\x57\x59", "\x57\x5a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x5b",
-  "\x57\x5c", "\x00\x00", "\x57\x5d", "\x57\x5e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x5f", "\x57\x60", "\x00\x00",
-  "\x57\x61", "\x57\x62", "\x57\x64", "\x00\x00", "\x57\x65", "\x57\x66",
-  "\x57\x67", "\x00\x00", "\x57\x68", "\x57\x69", "\x57\x6a", "\x57\x6b",
-  "\x57\x6c", "\x00\x00", "\x57\x6d", "\x00\x00", "\x00\x00", "\x57\x6e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x57\x6f", "\x00\x00", "\x00\x00",
-  "\x57\x70", "\x00\x00", "\x57\x71", "\x57\x72", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x57\x73", "\x57\x74", "\x57\x75", "\x00\x00",
-  "\x00\x00", "\x57\x76", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x57\x77", "\x57\x78", "\x00\x00", "\x00\x00", "\x57\x79",
-  "\x00\x00", "\x58\x3e", "\x57\x63", "\x57\x7a", "\x57\x7b", "\x57\x7c",
-  "\x57\x7d", "\x57\x7e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x58\x21", "\x00\x00", "\x58\x22", "\x58\x23", "\x00\x00", "\x58\x24",
-  "\x00\x00", "\x58\x25", "\x00\x00", "\x58\x26", "\x58\x27", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x28", "\x00\x00", "\x58\x29",
-  "\x58\x2a", "\x00\x00", "\x00\x00", "\x58\x2b", "\x58\x2c", "\x00\x00",
-  "\x58\x2d", "\x58\x2e", "\x58\x2f", "\x58\x30", "\x58\x31", "\x00\x00",
-  "\x58\x32", "\x00\x00", "\x00\x00", "\x58\x33", "\x58\x4c", "\x58\x34",
-  "\x58\x35", "\x58\x36", "\x58\x37", "\x00\x00", "\x58\x38", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x39", "\x58\x3a",
-  "\x58\x3b", "\x00\x00", "\x00\x00", "\x58\x3c", "\x58\x3d", "\x58\x3f",
-  "\x00\x00", "\x58\x40", "\x58\x41", "\x00\x00", "\x58\x42", "\x58\x43",
-  "\x00\x00", "\x00\x00", "\x58\x44", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x58\x45", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x58\x46", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x47", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x48", "\x00\x00", "\x58\x49",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x4a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x58\x4b", "\x58\x4d", "\x58\x4e", "\x58\x4f", "\x00\x00",
-  "\x58\x50", "\x58\x51", "\x00\x00", "\x58\x52", "\x00\x00", "\x00\x00",
-  "\x58\x53", "\x00\x00", "\x58\x54", "\x00\x00", "\x58\x55", "\x58\x56",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x57", "\x00\x00", "\x58\x58",
-  "\x58\x59", "\x58\x5a", "\x00\x00", "\x58\x5b", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x58\x5c", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x5d",
-  "\x58\x5e", "\x00\x00", "\x58\x5f", "\x00\x00", "\x00\x00", "\x58\x60",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x61",
-  "\x00\x00", "\x00\x00", "\x58\x62", "\x58\x63", "\x00\x00", "\x58\x64",
-  "\x00\x00", "\x58\x65", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x66",
-  "\x58\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x68", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x58\x69", "\x58\x6a", "\x58\x6b", "\x00\x00",
-  "\x58\x6c", "\x58\x6d", "\x58\x6e", "\x00\x00", "\x58\x6f", "\x58\x70",
-  "\x58\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x72",
-  "\x00\x00", "\x58\x73", "\x00\x00", "\x00\x00", "\x58\x74", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x75", "\x00\x00",
-  "\x00\x00", "\x58\x76", "\x58\x77", "\x00\x00", "\x58\x78", "\x00\x00",
-  "\x58\x79", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x7a",
-  "\x58\x7b", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x7c", "\x00\x00",
-  "\x00\x00", "\x58\x7d", "\x00\x00", "\x00\x00", "\x00\x00", "\x58\x7e",
-  "\x59\x21", "\x59\x22", "\x00\x00", "\x00\x00", "\x59\x23", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x24", "\x59\x25", "\x59\x26",
-  "\x59\x27", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x28",
-  "\x00\x00", "\x00\x00", "\x59\x2a", "\x59\x2b", "\x00\x00", "\x59\x2c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x2d", "\x59\x2e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x2f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x59\x30", "\x00\x00", "\x59\x31", "\x00\x00",
-  "\x59\x32", "\x59\x33", "\x00\x00", "\x59\x34", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x59\x35", "\x59\x36", "\x59\x37", "\x59\x38", "\x00\x00",
-  "\x59\x39", "\x00\x00", "\x00\x00", "\x59\x3a", "\x59\x3b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x59\x3c", "\x00\x00", "\x00\x00", "\x59\x29",
-  "\x59\x3d", "\x59\x3e", "\x00\x00", "\x59\x3f", "\x59\x40", "\x59\x41",
-  "\x59\x42", "\x59\x43", "\x59\x44", "\x59\x45", "\x59\x46", "\x00\x00",
-  "\x00\x00", "\x59\x47", "\x00\x00", "\x00\x00", "\x59\x48", "\x00\x00",
-  "\x00\x00", "\x59\x49", "\x59\x4a", "\x59\x4b", "\x59\x4c", "\x59\x4d",
-  "\x59\x4e", "\x59\x4f", "\x00\x00", "\x59\x50", "\x59\x51", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x59\x52", "\x59\x53", "\x59\x54", "\x59\x55",
-  "\x00\x00", "\x59\x56", "\x00\x00", "\x59\x57", "\x00\x00", "\x59\x58",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x59", "\x59\x5a", "\x00\x00",
-  "\x00\x00", "\x59\x5b", "\x00\x00", "\x59\x5c", "\x59\x5d", "\x00\x00",
-  "\x00\x00", "\x59\x5e", "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x5f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x60", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x61", "\x00\x00", "\x59\x62",
-  "\x59\x63", "\x00\x00", "\x59\x64", "\x00\x00", "\x00\x00", "\x59\x65",
-  "\x00\x00", "\x59\x66", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x59\x74", "\x59\x67", "\x00\x00", "\x59\x68", "\x59\x69",
-  "\x59\x6a", "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x6b", "\x59\x6c",
-  "\x59\x6d", "\x59\x6e", "\x00\x00", "\x00\x00", "\x59\x6f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x70", "\x00\x00", "\x00\x00",
-  "\x59\x71", "\x59\x72", "\x00\x00", "\x00\x00", "\x59\x73", "\x59\x75",
-  "\x00\x00", "\x59\x76", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x59\x77", "\x59\x78", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x59\x79", "\x00\x00", "\x59\x7a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x59\x7b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x59\x7c", "\x00\x00", "\x00\x00", "\x59\x7d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x59\x7e",
-  "\x00\x00", "\x00\x00", "\x5a\x21", "\x5a\x22", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5a\x23", "\x5a\x24", "\x5a\x25", "\x5a\x26", "\x00\x00",
-  "\x5a\x27", "\x5a\x28", "\x5a\x29", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5a\x2a", "\x5a\x2b", "\x00\x00", "\x5a\x2c",
-  "\x00\x00", "\x00\x00", "\x5a\x2d", "\x00\x00", "\x00\x00", "\x5a\x2e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x2f",
-  "\x00\x00", "\x5a\x30", "\x5a\x31", "\x00\x00", "\x5a\x32", "\x00\x00",
-  "\x5a\x33", "\x00\x00", "\x5a\x34", "\x5a\x35", "\x00\x00", "\x00\x00",
-  "\x5a\x36", "\x38\x66", "\x5a\x37", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5a\x38", "\x5a\x39", "\x5a\x3a", "\x00\x00", "\x00\x00", "\x5a\x3b",
-  "\x5a\x3c", "\x5a\x3d", "\x5a\x3e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5a\x3f", "\x00\x00", "\x00\x00", "\x5a\x40", "\x5a\x41", "\x5a\x42",
-  "\x5a\x43", "\x5a\x44", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5a\x45", "\x00\x00", "\x00\x00", "\x5a\x46", "\x00\x00", "\x00\x00",
-  "\x5a\x47", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5a\x48", "\x5a\x49", "\x5a\x4a", "\x00\x00", "\x00\x00", "\x5a\x4b",
-  "\x5a\x6d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x4c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x4d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5a\x4e", "\x00\x00", "\x5a\x4f", "\x00\x00",
-  "\x5a\x50", "\x00\x00", "\x5a\x51", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5a\x52", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5a\x53", "\x5a\x54", "\x5a\x55", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5a\x56", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x57",
-  "\x00\x00", "\x5a\x58", "\x5a\x59", "\x5a\x5a", "\x00\x00", "\x5a\x5b",
-  "\x5a\x5c", "\x5a\x5d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5a\x5e", "\x5a\x5f", "\x5a\x60", "\x00\x00", "\x5a\x61",
-  "\x00\x00", "\x5a\x62", "\x5a\x63", "\x5a\x64", "\x00\x00", "\x00\x00",
-  "\x5a\x65", "\x00\x00", "\x5a\x66", "\x00\x00", "\x00\x00", "\x5a\x67",
-  "\x00\x00", "\x5a\x68", "\x00\x00", "\x00\x00", "\x00\x00", "\x5a\x69",
-  "\x00\x00", "\x00\x00", "\x5a\x6a", "\x00\x00", "\x5a\x6b", "\x00\x00",
-  "\x5a\x6c", "\x5a\x6e", "\x00\x00", "\x5a\x6f", "\x5a\x70", "\x5a\x71",
-  "\x5a\x72", "\x00\x00", "\x5a\x73", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5a\x74", "\x00\x00", "\x00\x00", "\x5a\x75", "\x5a\x76", "\x5a\x77",
-  "\x00\x00", "\x00\x00", "\x5a\x78", "\x5a\x79", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5a\x7a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5a\x7b", "\x5a\x7c", "\x00\x00", "\x5a\x7d", "\x00\x00",
-  "\x5a\x7e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x21",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x22",
-  "\x5b\x23", "\x00\x00", "\x5b\x24", "\x5b\x25", "\x5b\x26", "\x5b\x27",
-  "\x00\x00", "\x5b\x28", "\x5b\x29", "\x5b\x2a", "\x00\x00", "\x5b\x2b",
-  "\x00\x00", "\x00\x00", "\x5b\x2c", "\x00\x00", "\x5b\x2d", "\x5b\x2e",
-  "\x5b\x2f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x30",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x31", "\x00\x00", "\x00\x00",
-  "\x5b\x32", "\x5b\x33", "\x5b\x34", "\x00\x00", "\x5b\x35", "\x5b\x36",
-  "\x5b\x37", "\x5b\x38", "\x5b\x39", "\x5b\x3a", "\x5b\x3b", "\x5b\x3c",
-  "\x5b\x3d", "\x5b\x3e", "\x00\x00", "\x5b\x3f", "\x5b\x40", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5b\x41", "\x00\x00", "\x00\x00", "\x5b\x42",
-  "\x00\x00", "\x5b\x43", "\x00\x00", "\x5b\x44", "\x5b\x45", "\x5b\x46",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x47", "\x00\x00",
-  "\x5b\x48", "\x00\x00", "\x00\x00", "\x5b\x49", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5b\x4a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5b\x4b", "\x5b\x4c", "\x5b\x4d", "\x00\x00", "\x00\x00", "\x5b\x4e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x4f", "\x5b\x50", "\x5b\x51",
-  "\x00\x00", "\x5b\x52", "\x5b\x53", "\x5b\x54", "\x5b\x55", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5b\x56", "\x5b\x57", "\x5b\x58", "\x00\x00",
-  "\x00\x00", "\x5b\x59", "\x5b\x5a", "\x00\x00", "\x5b\x5b", "\x00\x00",
-  "\x00\x00", "\x5b\x5c", "\x00\x00", "\x00\x00", "\x5b\x5d", "\x5b\x5e",
-  "\x5b\x5f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5b\x60", "\x5b\x61", "\x00\x00", "\x5b\x62", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5b\x63", "\x00\x00", "\x5b\x64", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5b\x65", "\x00\x00", "\x5b\x66", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x67", "\x00\x00", "\x5b\x68",
-  "\x00\x00", "\x5b\x69", "\x00\x00", "\x00\x00", "\x5b\x6a", "\x00\x00",
-  "\x00\x00", "\x5b\x6b", "\x5b\x6c", "\x5b\x6d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5b\x6e", "\x00\x00", "\x5b\x70", "\x5b\x71",
-  "\x5b\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x73", "\x5b\x6f",
-  "\x5b\x74", "\x5b\x75", "\x5b\x76", "\x00\x00", "\x5b\x77", "\x5b\x78",
-  "\x5b\x79", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5b\x7a",
-  "\x5b\x7b", "\x00\x00", "\x5b\x7c", "\x00\x00", "\x5b\x7d", "\x00\x00",
-  "\x00\x00", "\x5b\x7e", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5c\x21", "\x00\x00", "\x5c\x22", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5c\x23", "\x00\x00", "\x5c\x24", "\x00\x00", "\x5c\x25",
-  "\x00\x00", "\x00\x00", "\x5c\x26", "\x5c\x27", "\x5c\x28", "\x5c\x29",
-  "\x00\x00", "\x00\x00", "\x5c\x2a", "\x00\x00", "\x00\x00", "\x5c\x2b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x2c", "\x5c\x2d", "\x00\x00",
-  "\x5c\x2e", "\x00\x00", "\x5c\x2f", "\x00\x00", "\x5c\x30", "\x00\x00",
-  "\x00\x00", "\x5c\x31", "\x5c\x32", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5c\x33", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x34",
-  "\x5c\x35", "\x5c\x36", "\x00\x00", "\x5c\x37", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5c\x38", "\x5c\x39", "\x00\x00", "\x5c\x3a",
-  "\x5c\x3b", "\x5c\x3c", "\x00\x00", "\x00\x00", "\x5c\x3d", "\x5c\x3e",
-  "\x5c\x3f", "\x00\x00", "\x5c\x40", "\x5c\x41", "\x00\x00", "\x00\x00",
-  "\x5c\x42", "\x5c\x43", "\x00\x00", "\x5c\x44", "\x5c\x45", "\x5c\x46",
-  "\x5c\x47", "\x5c\x48", "\x5c\x49", "\x00\x00", "\x00\x00", "\x5c\x4a",
-  "\x5c\x4b", "\x5c\x4c", "\x5c\x4d", "\x00\x00", "\x00\x00", "\x5c\x4e",
-  "\x5c\x4f", "\x5c\x50", "\x5c\x51", "\x5c\x52", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5c\x53", "\x00\x00", "\x5c\x54", "\x5c\x55", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x56", "\x5c\x57", "\x5c\x58",
-  "\x5c\x59", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5c\x5a", "\x5c\x5b", "\x00\x00", "\x5c\x5c", "\x5c\x5d", "\x5c\x5e",
-  "\x00\x00", "\x5c\x5f", "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x60",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x61",
-  "\x5c\x62", "\x5c\x63", "\x5c\x64", "\x5c\x65", "\x5c\x66", "\x00\x00",
-  "\x00\x00", "\x5c\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x68",
-  "\x5c\x69", "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x6a", "\x00\x00",
-  "\x5c\x6b", "\x00\x00", "\x5c\x6c", "\x00\x00", "\x00\x00", "\x5c\x6d",
-  "\x5c\x6e", "\x00\x00", "\x00\x00", "\x5c\x6f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x70", "\x00\x00", "\x00\x00",
-  "\x5c\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x72",
-  "\x00\x00", "\x00\x00", "\x5c\x73", "\x5c\x74", "\x5c\x75", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x76", "\x5c\x77", "\x5c\x78",
-  "\x5c\x79", "\x00\x00", "\x00\x00", "\x5c\x7a", "\x00\x00", "\x5c\x7b",
-  "\x00\x00", "\x00\x00", "\x5c\x7c", "\x00\x00", "\x5c\x7d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5c\x7e", "\x5d\x21", "\x5d\x22",
-  "\x5d\x23", "\x5d\x24", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x25",
-  "\x00\x00", "\x00\x00", "\x5d\x26", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5d\x27", "\x5d\x28", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5d\x29", "\x5d\x2a", "\x00\x00", "\x00\x00", "\x5d\x2b",
-  "\x5d\x2c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x2d",
-  "\x5d\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x2f", "\x5d\x30",
-  "\x5d\x31", "\x5d\x32", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5d\x33", "\x5d\x34", "\x5d\x35", "\x5d\x36", "\x5d\x37", "\x5d\x38",
-  "\x5d\x39", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x3a", "\x00\x00",
-  "\x5d\x3b", "\x00\x00", "\x5d\x3c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5d\x3d", "\x00\x00", "\x5d\x3e", "\x00\x00", "\x00\x00", "\x5d\x3f",
-  "\x00\x00", "\x00\x00", "\x5d\x40", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5d\x41", "\x00\x00", "\x5d\x42", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5d\x43", "\x5d\x44", "\x00\x00", "\x5d\x45", "\x5d\x46",
-  "\x00\x00", "\x5d\x47", "\x5d\x48", "\x00\x00", "\x5d\x49", "\x5d\x4a",
-  "\x5d\x4b", "\x00\x00", "\x5d\x4c", "\x00\x00", "\x5d\x4d", "\x00\x00",
-  "\x5d\x4e", "\x00\x00", "\x5d\x4f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5d\x50", "\x5d\x51", "\x00\x00", "\x00\x00", "\x5d\x52",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x53",
-  "\x00\x00", "\x5d\x54", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5d\x55", "\x5d\x56", "\x00\x00", "\x5d\x57", "\x00\x00",
-  "\x00\x00", "\x5d\x58", "\x00\x00", "\x5d\x59", "\x00\x00", "\x5d\x5a",
-  "\x00\x00", "\x5d\x5b", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x5c",
-  "\x5d\x5d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x5e",
-  "\x00\x00", "\x00\x00", "\x5d\x5f", "\x5d\x60", "\x5d\x61", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5d\x62", "\x5d\x63", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5d\x64", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x65",
-  "\x00\x00", "\x5d\x66", "\x5d\x67", "\x5d\x68", "\x5d\x69", "\x00\x00",
-  "\x5d\x6a", "\x5d\x6b", "\x5d\x6c", "\x00\x00", "\x00\x00", "\x5d\x6d",
-  "\x5d\x6e", "\x5d\x6f", "\x00\x00", "\x00\x00", "\x5d\x70", "\x00\x00",
-  "\x00\x00", "\x5d\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5d\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x73", "\x5d\x74",
-  "\x00\x00", "\x5d\x75", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x76",
-  "\x5d\x77", "\x00\x00", "\x5d\x78", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5d\x79", "\x5d\x7a", "\x00\x00", "\x5d\x7b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x7c", "\x5d\x7d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5d\x7e", "\x00\x00", "\x00\x00",
-  "\x5e\x21", "\x5e\x22", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x23",
-  "\x00\x00", "\x00\x00", "\x5e\x24", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5e\x25", "\x00\x00", "\x00\x00", "\x5e\x26", "\x00\x00",
-  "\x5e\x27", "\x5e\x28", "\x5e\x29", "\x5e\x2a", "\x00\x00", "\x5e\x2b",
-  "\x5e\x2c", "\x5e\x2d", "\x00\x00", "\x5e\x2e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x2f", "\x00\x00", "\x5e\x30",
-  "\x5e\x31", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x32", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5e\x33", "\x5e\x34", "\x5e\x35", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x36", "\x00\x00",
-  "\x00\x00", "\x5e\x37", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5e\x38", "\x5e\x39", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5e\x3f", "\x5e\x3a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5e\x3b", "\x5e\x3c", "\x00\x00", "\x5e\x3d", "\x5e\x3e",
-  "\x5e\x40", "\x00\x00", "\x00\x00", "\x5e\x41", "\x5e\x42", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x43", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x44", "\x5e\x45", "\x5e\x46",
-  "\x5e\x47", "\x5e\x48", "\x00\x00", "\x5e\x49", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5e\x4e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5e\x4a", "\x5e\x4b", "\x5e\x4c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5e\x4d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5e\x4f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5e\x50", "\x5e\x51", "\x5e\x52", "\x00\x00", "\x5e\x53", "\x5e\x54",
-  "\x00\x00", "\x00\x00", "\x5e\x55", "\x00\x00", "\x5e\x56", "\x00\x00",
-  "\x00\x00", "\x5e\x57", "\x00\x00", "\x00\x00", "\x5e\x58", "\x5e\x59",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x5a",
-  "\x00\x00", "\x5e\x5b", "\x00\x00", "\x5e\x5c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5e\x5d", "\x5e\x5e", "\x5e\x5f", "\x00\x00",
-  "\x5e\x60", "\x5e\x61", "\x5e\x62", "\x5e\x63", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5e\x64", "\x5e\x65", "\x5e\x66", "\x00\x00", "\x5e\x67",
-  "\x00\x00", "\x5e\x68", "\x00\x00", "\x5e\x69", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5e\x6a", "\x00\x00", "\x5e\x6b", "\x00\x00", "\x5e\x6c",
-  "\x5e\x6d", "\x00\x00", "\x00\x00", "\x5e\x6e", "\x5e\x6f", "\x5e\x72",
-  "\x00\x00", "\x5e\x70", "\x00\x00", "\x5e\x71", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x73", "\x5e\x74", "\x00\x00",
-  "\x5e\x75", "\x00\x00", "\x5e\x76", "\x5e\x77", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5e\x78", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5e\x79", "\x00\x00", "\x5e\x7a", "\x5e\x7b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5e\x7c", "\x00\x00", "\x00\x00",
-  "\x5e\x7d", "\x5e\x7e", "\x5f\x21", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5f\x22", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x23",
-  "\x00\x00", "\x5f\x24", "\x5f\x25", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5f\x26", "\x00\x00", "\x5f\x27", "\x5f\x28",
-  "\x5f\x29", "\x5f\x2a", "\x5f\x2b", "\x5f\x2c", "\x5f\x2d", "\x00\x00",
-  "\x00\x00", "\x5f\x2e", "\x00\x00", "\x5f\x2f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5f\x30", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5f\x32", "\x5f\x31", "\x00\x00", "\x00\x00", "\x5f\x33",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x34", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5f\x35", "\x5f\x36", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5f\x37", "\x00\x00", "\x00\x00", "\x5f\x38", "\x5f\x39", "\x00\x00",
-  "\x5f\x3a", "\x00\x00", "\x00\x00", "\x5f\x3b", "\x00\x00", "\x5f\x3c",
-  "\x5f\x3d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5f\x3e", "\x5f\x3f", "\x00\x00", "\x5f\x40", "\x00\x00", "\x5f\x41",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x42",
-  "\x5f\x43", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x44",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x45", "\x5f\x46", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5f\x47", "\x00\x00", "\x00\x00", "\x5f\x48",
-  "\x00\x00", "\x5f\x49", "\x5f\x4a", "\x00\x00", "\x00\x00", "\x5f\x4b",
-  "\x00\x00", "\x5f\x4c", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x4d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x4e", "\x00\x00",
-  "\x00\x00", "\x5f\x4f", "\x5f\x50", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x5f\x51", "\x5f\x52", "\x5f\x53", "\x5f\x54", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x55", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5f\x56", "\x5f\x57", "\x00\x00", "\x00\x00",
-  "\x5f\x58", "\x00\x00", "\x00\x00", "\x5f\x59", "\x00\x00", "\x00\x00",
-  "\x5f\x5a", "\x00\x00", "\x5f\x5b", "\x00\x00", "\x5f\x5c", "\x00\x00",
-  "\x5f\x5d", "\x5f\x6f", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x5e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x5f", "\x5f\x60",
-  "\x5f\x61", "\x5f\x62", "\x00\x00", "\x5f\x63", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5f\x64", "\x00\x00", "\x00\x00", "\x5f\x65", "\x00\x00",
-  "\x00\x00", "\x5f\x66", "\x5f\x67", "\x00\x00", "\x5f\x68", "\x00\x00",
-  "\x5f\x69", "\x5f\x6a", "\x5f\x6b", "\x00\x00", "\x5f\x6c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x6d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x5f\x6e", "\x5f\x70", "\x5f\x71", "\x00\x00", "\x5f\x72",
-  "\x5f\x73", "\x00\x00", "\x00\x00", "\x00\x00", "\x5f\x74", "\x00\x00",
-  "\x00\x00", "\x5f\x75", "\x5f\x76", "\x5f\x77", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5f\x78", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x5f\x79", "\x00\x00", "\x00\x00", "\x5f\x7a",
-  "\x00\x00", "\x5f\x7b", "\x5f\x7c", "\x5f\x7d", "\x5f\x7e", "\x60\x21",
-  "\x00\x00", "\x00\x00", "\x60\x22", "\x60\x23", "\x60\x24", "\x00\x00",
-  "\x60\x25", "\x00\x00", "\x00\x00", "\x60\x26", "\x60\x27", "\x60\x28",
-  "\x60\x29", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x2a", "\x00\x00",
-  "\x00\x00", "\x60\x2b", "\x60\x2c", "\x60\x2d", "\x00\x00", "\x60\x2e",
-  "\x60\x2f", "\x60\x30", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x60\x31", "\x60\x32", "\x60\x33", "\x60\x34", "\x60\x35", "\x00\x00",
-  "\x00\x00", "\x60\x36", "\x60\x37", "\x60\x38", "\x00\x00", "\x00\x00",
-  "\x60\x39", "\x60\x3a", "\x00\x00", "\x60\x3b", "\x60\x3c", "\x60\x3d",
-  "\x60\x3e", "\x60\x3f", "\x60\x40", "\x60\x41", "\x60\x42", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x43", "\x60\x44",
-  "\x00\x00", "\x60\x45", "\x00\x00", "\x00\x00", "\x60\x46", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x47", "\x60\x48", "\x00\x00",
-  "\x60\x49", "\x60\x4a", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x4b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x4c", "\x00\x00",
-  "\x60\x4d", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x4e", "\x60\x4f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x50", "\x00\x00",
-  "\x60\x51", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x52",
-  "\x60\x53", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x54",
-  "\x60\x55", "\x00\x00", "\x60\x56", "\x60\x57", "\x00\x00", "\x00\x00",
-  "\x60\x58", "\x60\x59", "\x00\x00", "\x60\x5a", "\x00\x00", "\x00\x00",
-  "\x60\x5b", "\x60\x5c", "\x60\x5d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x60\x64", "\x60\x5e", "\x00\x00", "\x60\x5f", "\x60\x60",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x61",
-  "\x00\x00", "\x60\x62", "\x60\x63", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x60\x65", "\x00\x00", "\x60\x66", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x67", "\x60\x68", "\x60\x69",
-  "\x60\x6a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x60\x6b", "\x60\x6c", "\x60\x6d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x60\x6e", "\x00\x00", "\x60\x6f", "\x60\x70",
-  "\x00\x00", "\x60\x71", "\x00\x00", "\x60\x72", "\x00\x00", "\x60\x73",
-  "\x60\x74", "\x00\x00", "\x00\x00", "\x00\x00", "\x60\x75", "\x60\x76",
-  "\x60\x77", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x60\x78", "\x60\x79", "\x60\x7a", "\x60\x7b", "\x00\x00", "\x00\x00",
-  "\x60\x7c", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x60\x7d", "\x60\x7e", "\x00\x00", "\x61\x21", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x61\x22", "\x61\x23", "\x00\x00", "\x61\x24", "\x61\x25",
-  "\x61\x26", "\x61\x27", "\x61\x28", "\x00\x00", "\x00\x00", "\x61\x29",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x2a", "\x61\x2b",
-  "\x61\x2c", "\x61\x2d", "\x00\x00", "\x00\x00", "\x61\x2e", "\x61\x2f",
-  "\x00\x00", "\x00\x00", "\x61\x30", "\x61\x31", "\x61\x32", "\x61\x33",
-  "\x61\x34", "\x00\x00", "\x61\x35", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x61\x36", "\x00\x00", "\x61\x37", "\x61\x38",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x39", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x61\x3a", "\x61\x3b", "\x00\x00", "\x61\x3c",
-  "\x00\x00", "\x00\x00", "\x61\x3d", "\x00\x00", "\x61\x3e", "\x61\x3f",
-  "\x00\x00", "\x61\x40", "\x61\x41", "\x00\x00", "\x00\x00", "\x61\x42",
-  "\x61\x43", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x44", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x45", "\x00\x00",
-  "\x00\x00", "\x61\x46", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x47",
-  "\x61\x48", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x49",
-  "\x00\x00", "\x00\x00", "\x61\x4a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x61\x4b", "\x00\x00", "\x61\x4c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x61\x4d", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x4e", "\x61\x4f",
-  "\x00\x00", "\x00\x00", "\x61\x50", "\x61\x51", "\x61\x52", "\x61\x54",
-  "\x00\x00", "\x61\x55", "\x61\x56", "\x00\x00", "\x61\x53", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x61\x57", "\x61\x58", "\x00\x00", "\x00\x00",
-  "\x61\x59", "\x61\x5a", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x5b",
-  "\x61\x5c", "\x61\x5d", "\x61\x5e", "\x00\x00", "\x61\x5f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x60", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x61\x61", "\x61\x62", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x61\x63", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x64",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x65", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x61\x66", "\x61\x67", "\x00\x00", "\x00\x00",
-  "\x61\x68", "\x00\x00", "\x00\x00", "\x61\x69", "\x61\x6a", "\x00\x00",
-  "\x61\x6b", "\x00\x00", "\x61\x6c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x61\x6d", "\x00\x00", "\x61\x6e", "\x61\x6f", "\x61\x70",
-  "\x00\x00", "\x61\x71", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x61\x72", "\x61\x73", "\x61\x74", "\x00\x00", "\x00\x00", "\x61\x75",
-  "\x61\x76", "\x00\x00", "\x61\x77", "\x61\x78", "\x61\x79", "\x00\x00",
-  "\x61\x7a", "\x61\x7b", "\x61\x7d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x61\x7e", "\x62\x21", "\x62\x22", "\x00\x00", "\x62\x23",
-  "\x62\x24", "\x00\x00", "\x00\x00", "\x00\x00", "\x61\x7c", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x2d", "\x00\x00",
-  "\x00\x00", "\x62\x25", "\x00\x00", "\x62\x26", "\x62\x27", "\x62\x28",
-  "\x00\x00", "\x00\x00", "\x62\x29", "\x62\x2a", "\x00\x00", "\x62\x2b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x2c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x2f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x30", "\x62\x31", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x62\x32", "\x00\x00", "\x62\x2e", "\x62\x33",
-  "\x62\x34", "\x62\x35", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x36",
-  "\x62\x37", "\x62\x38", "\x00\x00", "\x62\x39", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x62\x3a", "\x00\x00", "\x00\x00", "\x62\x3b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x3c", "\x00\x00", "\x62\x3d",
-  "\x62\x3e", "\x62\x3f", "\x00\x00", "\x62\x40", "\x00\x00", "\x62\x41",
-  "\x00\x00", "\x62\x42", "\x00\x00", "\x62\x43", "\x00\x00", "\x62\x45",
-  "\x62\x46", "\x00\x00", "\x62\x44", "\x00\x00", "\x62\x47", "\x00\x00",
-  "\x62\x48", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x49",
-  "\x62\x4a", "\x00\x00", "\x62\x4b", "\x00\x00", "\x00\x00", "\x62\x4c",
-  "\x00\x00", "\x62\x4d", "\x62\x4e", "\x00\x00", "\x62\x4f", "\x62\x50",
-  "\x00\x00", "\x62\x51", "\x62\x52", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x62\x53", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x62\x54", "\x62\x55", "\x62\x56", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x62\x57", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x58", "\x00\x00",
-  "\x62\x59", "\x62\x5a", "\x62\x5b", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x62\x5c", "\x00\x00", "\x00\x00", "\x62\x5d",
-  "\x00\x00", "\x00\x00", "\x62\x5e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x62\x5f", "\x62\x60", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x62\x61", "\x62\x62", "\x62\x63", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x64", "\x00\x00",
-  "\x62\x65", "\x00\x00", "\x62\x66", "\x62\x67", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x62\x68", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x69",
-  "\x00\x00", "\x00\x00", "\x62\x6a", "\x00\x00", "\x62\x6b", "\x62\x6c",
-  "\x62\x6d", "\x00\x00", "\x00\x00", "\x62\x6e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x6f", "\x00\x00", "\x00\x00",
-  "\x62\x70", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x71",
-  "\x00\x00", "\x62\x72", "\x00\x00", "\x00\x00", "\x00\x00", "\x62\x73",
-  "\x62\x74", "\x62\x75", "\x00\x00", "\x62\x76", "\x62\x77", "\x62\x78",
-  "\x62\x79", "\x00\x00", "\x00\x00", "\x62\x7a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x62\x7b", "\x62\x7c", "\x62\x7d", "\x00\x00",
-  "\x62\x7e", "\x00\x00", "\x00\x00", "\x63\x21", "\x63\x22", "\x00\x00",
-  "\x63\x23", "\x63\x24", "\x63\x25", "\x00\x00", "\x00\x00", "\x63\x26",
-  "\x00\x00", "\x63\x27", "\x63\x28", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x63\x29", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x63\x2a", "\x63\x2b", "\x00\x00", "\x00\x00", "\x00\x00", "\x63\x2c",
-  "\x63\x2d", "\x00\x00", "\x63\x2e", "\x63\x2f", "\x63\x30", "\x63\x31",
-  "\x63\x32", "\x63\x33", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x63\x34", "\x00\x00", "\x63\x35", "\x00\x00", "\x63\x36",
-  "\x00\x00", "\x63\x37", "\x00\x00", "\x00\x00", "\x63\x38", "\x63\x39",
-  "\x00\x00", "\x00\x00", "\x63\x3a", "\x63\x3b", "\x63\x3c", "\x63\x3d",
-  "\x00\x00", "\x63\x3e", "\x63\x3f", "\x00\x00", "\x63\x40", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x63\x41", "\x00\x00", "\x63\x42", "\x63\x43",
-  "\x00\x00", "\x00\x00", "\x63\x44", "\x00\x00", "\x63\x45", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x63\x46", "\x63\x47", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x63\x48", "\x63\x49", "\x63\x4a",
-  "\x63\x4b", "\x00\x00", "\x63\x4c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x63\x4d", "\x63\x4e", "\x63\x4f", "\x00\x00",
-  "\x00\x00", "\x63\x50", "\x00\x00", "\x63\x51", "\x63\x52", "\x00\x00",
-  "\x63\x53", "\x63\x54", "\x63\x55", "\x00\x00", "\x63\x56", "\x00\x00",
-  "\x63\x57", "\x00\x00", "\x63\x58", "\x00\x00", "\x63\x59", "\x63\x5a",
-  "\x00\x00", "\x00\x00", "\x63\x5b", "\x63\x5c", "\x00\x00", "\x00\x00",
-  "\x63\x5d", "\x00\x00", "\x00\x00", "\x63\x5e", "\x63\x5f", "\x63\x60",
-  "\x00\x00", "\x63\x61", "\x63\x62", "\x63\x63", "\x00\x00", "\x00\x00",
-  "\x63\x64", "\x63\x65", "\x00\x00", "\x00\x00", "\x63\x66", "\x63\x67",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x63\x68", "\x00\x00", "\x63\x69",
-  "\x63\x6a", "\x63\x6b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x63\x6c", "\x63\x6d", "\x63\x6e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x63\x6f", "\x63\x70", "\x63\x71", "\x63\x72", "\x63\x73",
-  "\x00\x00", "\x63\x74", "\x63\x75", "\x63\x76", "\x00\x00", "\x63\x77",
-  "\x63\x78", "\x63\x79", "\x63\x7a", "\x00\x00", "\x00\x00", "\x63\x7b",
-  "\x63\x7c", "\x00\x00", "\x00\x00", "\x00\x00", "\x63\x7d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x63\x7e", "\x00\x00", "\x64\x21",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x22",
-  "\x64\x23", "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x24", "\x64\x25",
-  "\x00\x00", "\x64\x26", "\x64\x27", "\x00\x00", "\x00\x00", "\x64\x28",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x29", "\x00\x00", "\x00\x00",
-  "\x64\x2a", "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x2b", "\x00\x00",
-  "\x64\x2c", "\x00\x00", "\x64\x2d", "\x64\x2e", "\x64\x2f", "\x64\x30",
-  "\x00\x00", "\x64\x31", "\x64\x32", "\x64\x33", "\x64\x34", "\x64\x35",
-  "\x00\x00", "\x64\x36", "\x64\x37", "\x64\x38", "\x64\x39", "\x00\x00",
-  "\x00\x00", "\x64\x3a", "\x64\x3b", "\x64\x3c", "\x64\x3d", "\x00\x00",
-  "\x64\x3e", "\x00\x00", "\x00\x00", "\x64\x3f", "\x00\x00", "\x64\x40",
-  "\x00\x00", "\x64\x41", "\x64\x42", "\x64\x43", "\x00\x00", "\x00\x00",
-  "\x64\x44", "\x64\x45", "\x00\x00", "\x64\x46", "\x64\x47", "\x64\x48",
-  "\x00\x00", "\x64\x49", "\x00\x00", "\x64\x4a", "\x00\x00", "\x64\x4b",
-  "\x64\x4c", "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x4d", "\x00\x00",
-  "\x64\x4e", "\x00\x00", "\x64\x4f", "\x64\x50", "\x00\x00", "\x64\x51",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x52", "\x64\x53", "\x00\x00",
-  "\x64\x54", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x64\x55", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x56",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x57", "\x00\x00", "\x00\x00",
-  "\x64\x58", "\x64\x59", "\x64\x5a", "\x64\x5b", "\x64\x5c", "\x64\x5d",
-  "\x00\x00", "\x64\x5e", "\x00\x00", "\x00\x00", "\x64\x5f", "\x64\x60",
-  "\x00\x00", "\x64\x61", "\x00\x00", "\x64\x62", "\x64\x63", "\x64\x64",
-  "\x64\x65", "\x00\x00", "\x64\x66", "\x64\x67", "\x64\x68", "\x64\x69",
-  "\x64\x6a", "\x64\x6b", "\x64\x6c", "\x64\x6d", "\x00\x00", "\x00\x00",
-  "\x64\x6e", "\x00\x00", "\x64\x6f", "\x64\x70", "\x00\x00", "\x64\x71",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x72", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x64\x73", "\x64\x74", "\x00\x00",
-  "\x64\x75", "\x00\x00", "\x64\x76", "\x64\x77", "\x00\x00", "\x00\x00",
-  "\x64\x78", "\x00\x00", "\x64\x79", "\x64\x7a", "\x64\x7b", "\x00\x00",
-  "\x64\x7c", "\x64\x7d", "\x00\x00", "\x64\x7e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x65\x21", "\x00\x00", "\x00\x00", "\x65\x22", "\x00\x00",
-  "\x65\x23", "\x65\x24", "\x65\x25", "\x65\x26", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x27", "\x00\x00", "\x65\x28",
-  "\x65\x29", "\x00\x00", "\x65\x2a", "\x00\x00", "\x65\x2b", "\x00\x00",
-  "\x00\x00", "\x65\x2c", "\x00\x00", "\x00\x00", "\x65\x2d", "\x00\x00",
-  "\x00\x00", "\x65\x2e", "\x00\x00", "\x00\x00", "\x65\x2f", "\x00\x00",
-  "\x00\x00", "\x65\x30", "\x00\x00", "\x00\x00", "\x65\x31", "\x00\x00",
-  "\x65\x32", "\x65\x33", "\x00\x00", "\x65\x34", "\x00\x00", "\x65\x35",
-  "\x65\x3b", "\x00\x00", "\x65\x36", "\x65\x37", "\x65\x38", "\x65\x39",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x3a", "\x65\x3c", "\x00\x00",
-  "\x00\x00", "\x65\x3d", "\x65\x3e", "\x65\x3f", "\x65\x40", "\x00\x00",
-  "\x65\x41", "\x65\x42", "\x65\x43", "\x65\x44", "\x65\x45", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x46", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x47", "\x00\x00",
-  "\x00\x00", "\x65\x48", "\x00\x00", "\x65\x49", "\x65\x4a", "\x00\x00",
-  "\x00\x00", "\x65\x4b", "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x4c",
-  "\x65\x4d", "\x65\x4f", "\x65\x50", "\x65\x4e", "\x65\x51", "\x65\x52",
-  "\x00\x00", "\x65\x53", "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x54",
-  "\x65\x55", "\x00\x00", "\x65\x56", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x65\x57", "\x65\x58", "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x59",
-  "\x65\x5a", "\x65\x5b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x65\x5c", "\x65\x5d", "\x65\x5e", "\x65\x5f", "\x65\x60",
-  "\x65\x61", "\x00\x00", "\x65\x62", "\x65\x63", "\x65\x64", "\x65\x65",
-  "\x65\x66", "\x00\x00", "\x65\x68", "\x00\x00", "\x65\x67", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x65\x69", "\x00\x00", "\x65\x6a", "\x00\x00",
-  "\x00\x00", "\x65\x6b", "\x00\x00", "\x65\x6c", "\x00\x00", "\x65\x6d",
-  "\x65\x6e", "\x00\x00", "\x00\x00", "\x00\x00", "\x65\x6f", "\x00\x00",
-  "\x00\x00", "\x65\x70", "\x00\x00", "\x00\x00", "\x65\x71", "\x00\x00",
-  "\x65\x72", "\x00\x00", "\x65\x73", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x65\x74", "\x00\x00", "\x00\x00", "\x65\x75", "\x00\x00",
-  "\x65\x76", "\x65\x77", "\x65\x78", "\x00\x00", "\x65\x79", "\x65\x7a",
-  "\x65\x7c", "\x65\x7b", "\x65\x7d", "\x65\x7e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x66\x21", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x66\x22", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x66\x23", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x24", "\x66\x25",
-  "\x66\x26", "\x66\x27", "\x66\x28", "\x66\x29", "\x00\x00", "\x66\x2a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x2b", "\x00\x00",
-  "\x00\x00", "\x66\x2c", "\x00\x00", "\x66\x2d", "\x66\x2e", "\x66\x2f",
-  "\x00\x00", "\x66\x30", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x31",
-  "\x00\x00", "\x00\x00", "\x66\x32", "\x00\x00", "\x66\x33", "\x66\x34",
-  "\x00\x00", "\x66\x35", "\x66\x36", "\x00\x00", "\x66\x37", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x38", "\x66\x39", "\x66\x3a",
-  "\x66\x3b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x66\x3c", "\x66\x3d", "\x00\x00", "\x00\x00", "\x66\x3e", "\x66\x3f",
-  "\x66\x40", "\x66\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x42",
-  "\x00\x00", "\x66\x43", "\x66\x44", "\x66\x45", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x66\x46", "\x00\x00", "\x66\x47", "\x66\x48", "\x66\x49",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x4a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x4b", "\x00\x00",
-  "\x66\x4c", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x4d", "\x66\x4e",
-  "\x66\x4f", "\x66\x50", "\x00\x00", "\x66\x51", "\x66\x52", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x66\x53", "\x66\x54", "\x00\x00", "\x66\x55",
-  "\x00\x00", "\x66\x56", "\x66\x57", "\x66\x58", "\x66\x59", "\x66\x5a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x5b",
-  "\x66\x5c", "\x66\x5d", "\x00\x00", "\x66\x5e", "\x66\x5f", "\x00\x00",
-  "\x66\x60", "\x66\x61", "\x66\x62", "\x66\x63", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x66\x64", "\x66\x65", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x66\x66", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x66\x67", "\x00\x00", "\x00\x00", "\x66\x68", "\x00\x00", "\x66\x69",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x6a", "\x66\x6b",
-  "\x66\x6c", "\x00\x00", "\x00\x00", "\x66\x6d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x66\x6e", "\x66\x6f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x66\x70", "\x66\x71", "\x66\x72", "\x66\x73", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x66\x75", "\x00\x00",
-  "\x66\x76", "\x00\x00", "\x00\x00", "\x66\x77", "\x66\x78", "\x66\x79",
-  "\x66\x7a", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x66\x7b", "\x00\x00", "\x66\x7c", "\x66\x7d", "\x66\x7e", "\x67\x21",
-  "\x00\x00", "\x67\x22", "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x23",
-  "\x67\x24", "\x67\x25", "\x00\x00", "\x67\x26", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x67\x27", "\x67\x28", "\x67\x29", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x67\x2a", "\x67\x2b", "\x00\x00", "\x67\x2c",
-  "\x67\x2d", "\x00\x00", "\x67\x2e", "\x67\x2f", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x67\x30", "\x67\x31", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x67\x32", "\x00\x00", "\x67\x33", "\x67\x34",
-  "\x00\x00", "\x67\x35", "\x67\x36", "\x67\x37", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x67\x38", "\x00\x00", "\x00\x00", "\x67\x39", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x67\x3a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x67\x3b", "\x00\x00", "\x00\x00", "\x67\x3c", "\x67\x3d",
-  "\x67\x3e", "\x00\x00", "\x00\x00", "\x67\x3f", "\x00\x00", "\x67\x40",
-  "\x00\x00", "\x67\x41", "\x67\x42", "\x67\x43", "\x67\x44", "\x67\x45",
-  "\x67\x46", "\x00\x00", "\x67\x47", "\x67\x48", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x67\x49", "\x67\x4a", "\x00\x00", "\x00\x00", "\x67\x4b",
-  "\x67\x4c", "\x00\x00", "\x67\x4d", "\x00\x00", "\x00\x00", "\x67\x4e",
-  "\x67\x4f", "\x00\x00", "\x00\x00", "\x67\x50", "\x67\x51", "\x00\x00",
-  "\x67\x52", "\x67\x53", "\x67\x54", "\x00\x00", "\x67\x55", "\x00\x00",
-  "\x67\x56", "\x67\x57", "\x00\x00", "\x67\x58", "\x00\x00", "\x00\x00",
-  "\x67\x59", "\x67\x5a", "\x00\x00", "\x67\x5b", "\x00\x00", "\x67\x5c",
-  "\x67\x5d", "\x00\x00", "\x67\x5e", "\x67\x5f", "\x67\x60", "\x00\x00",
-  "\x67\x61", "\x67\x62", "\x00\x00", "\x00\x00", "\x67\x63", "\x00\x00",
-  "\x00\x00", "\x67\x64", "\x67\x65", "\x67\x66", "\x00\x00", "\x67\x6a",
-  "\x00\x00", "\x67\x67", "\x67\x68", "\x00\x00", "\x67\x69", "\x67\x6b",
-  "\x00\x00", "\x00\x00", "\x67\x6c", "\x67\x6d", "\x00\x00", "\x67\x6e",
-  "\x00\x00", "\x00\x00", "\x67\x6f", "\x00\x00", "\x00\x00", "\x67\x70",
-  "\x67\x71", "\x00\x00", "\x67\x72", "\x67\x73", "\x00\x00", "\x00\x00",
-  "\x67\x74", "\x00\x00", "\x00\x00", "\x67\x76", "\x67\x77", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x67\x78", "\x00\x00",
-  "\x67\x79", "\x00\x00", "\x00\x00", "\x67\x75", "\x00\x00", "\x00\x00",
-  "\x67\x7a", "\x00\x00", "\x67\x7b", "\x00\x00", "\x67\x7c", "\x00\x00",
-  "\x00\x00", "\x67\x7d", "\x00\x00", "\x68\x28", "\x67\x7e", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x21", "\x00\x00", "\x00\x00",
-  "\x68\x22", "\x68\x23", "\x68\x24", "\x00\x00", "\x68\x25", "\x68\x26",
-  "\x00\x00", "\x68\x27", "\x68\x29", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x68\x2a", "\x00\x00", "\x00\x00", "\x68\x2b",
-  "\x00\x00", "\x00\x00", "\x68\x2c", "\x68\x2d", "\x68\x2e", "\x68\x2f",
-  "\x00\x00", "\x00\x00", "\x68\x30", "\x68\x31", "\x00\x00", "\x68\x32",
-  "\x68\x33", "\x68\x34", "\x68\x35", "\x00\x00", "\x68\x36", "\x68\x37",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x38", "\x00\x00", "\x68\x39",
-  "\x68\x3a", "\x00\x00", "\x68\x3b", "\x68\x3c", "\x00\x00", "\x68\x3d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x3e", "\x00\x00", "\x00\x00",
-  "\x68\x3f", "\x68\x40", "\x00\x00", "\x68\x41", "\x68\x42", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x68\x43", "\x00\x00", "\x00\x00", "\x68\x44",
-  "\x00\x00", "\x00\x00", "\x68\x45", "\x00\x00", "\x00\x00", "\x68\x46",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x47", "\x68\x48", "\x00\x00",
-  "\x68\x49", "\x00\x00", "\x68\x4a", "\x68\x4b", "\x68\x4c", "\x00\x00",
-  "\x00\x00", "\x68\x4d", "\x68\x4e", "\x00\x00", "\x00\x00", "\x68\x4f",
-  "\x68\x50", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x51",
-  "\x68\x52", "\x68\x53", "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x54",
-  "\x68\x55", "\x68\x56", "\x00\x00", "\x00\x00", "\x68\x57", "\x68\x58",
-  "\x68\x59", "\x00\x00", "\x00\x00", "\x68\x5a", "\x00\x00", "\x00\x00",
-  "\x68\x5b", "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x5c", "\x68\x5d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x5e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x5f", "\x68\x60", "\x68\x61",
-  "\x68\x62", "\x68\x63", "\x00\x00", "\x00\x00", "\x00\x00", "\x68\x64",
-  "\x68\x65", "\x68\x66", "\x68\x67", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x68\x68", "\x68\x69", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x68\x6a", "\x68\x6b", "\x68\x6c", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x68\x6d", "\x68\x6e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x68\x6f", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x68\x70", "\x68\x71", "\x00\x00", "\x68\x72", "\x68\x73", "\x00\x00",
-  "\x68\x74", "\x68\x75", "\x68\x76", "\x68\x77", "\x00\x00", "\x68\x78",
-  "\x00\x00", "\x68\x79", "\x68\x7a", "\x68\x7b", "\x68\x7c", "\x68\x7d",
-  "\x00\x00", "\x00\x00", "\x68\x7e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x69\x21", "\x69\x22", "\x00\x00", "\x00\x00", "\x69\x23", "\x00\x00",
-  "\x69\x24", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x25", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x26", "\x69\x27",
-  "\x69\x28", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x29",
-  "\x69\x2a", "\x00\x00", "\x69\x2b", "\x00\x00", "\x69\x2c", "\x69\x2d",
-  "\x00\x00", "\x00\x00", "\x69\x2e", "\x69\x2f", "\x69\x30", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x69\x31", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x69\x32", "\x69\x33", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x34",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x35", "\x69\x36", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x69\x37", "\x69\x38", "\x69\x39", "\x69\x3a",
-  "\x69\x3b", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x3c", "\x69\x3d",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x3e", "\x69\x3f",
-  "\x00\x00", "\x69\x40", "\x00\x00", "\x69\x41", "\x69\x42", "\x69\x43",
-  "\x00\x00", "\x00\x00", "\x69\x44", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x69\x45", "\x69\x46", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x69\x47", "\x00\x00", "\x69\x48", "\x69\x49",
-  "\x00\x00", "\x69\x4a", "\x69\x4c", "\x00\x00", "\x00\x00", "\x69\x4d",
-  "\x00\x00", "\x00\x00", "\x69\x4b", "\x00\x00", "\x00\x00", "\x69\x4e",
-  "\x69\x4f", "\x69\x50", "\x00\x00", "\x69\x51", "\x00\x00", "\x00\x00",
-  "\x69\x52", "\x00\x00", "\x00\x00", "\x69\x53", "\x00\x00", "\x69\x54",
-  "\x69\x55", "\x69\x56", "\x00\x00", "\x69\x57", "\x00\x00", "\x69\x58",
-  "\x69\x59", "\x00\x00", "\x00\x00", "\x69\x5a", "\x00\x00", "\x69\x5b",
-  "\x69\x5c", "\x69\x5d", "\x00\x00", "\x00\x00", "\x69\x5e", "\x00\x00",
-  "\x69\x5f", "\x00\x00", "\x00\x00", "\x69\x60", "\x69\x61", "\x00\x00",
-  "\x69\x62", "\x00\x00", "\x69\x63", "\x00\x00", "\x00\x00", "\x69\x64",
-  "\x00\x00", "\x69\x65", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x69\x66", "\x00\x00", "\x69\x67", "\x00\x00", "\x69\x68",
-  "\x00\x00", "\x00\x00", "\x69\x69", "\x69\x6a", "\x69\x6b", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x69\x6c", "\x69\x6d", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x69\x6e", "\x00\x00", "\x00\x00", "\x00\x00", "\x69\x6f",
-  "\x69\x70", "\x00\x00", "\x69\x71", "\x00\x00", "\x69\x72", "\x00\x00",
-  "\x00\x00", "\x69\x73", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x69\x74", "\x69\x75", "\x00\x00", "\x69\x76", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x69\x77", "\x69\x78", "\x00\x00", "\x00\x00",
-  "\x69\x79", "\x00\x00", "\x69\x7a", "\x69\x7b", "\x69\x7c", "\x69\x7d",
-  "\x69\x7e", "\x6a\x21", "\x6a\x22", "\x00\x00", "\x00\x00", "\x6a\x23",
-  "\x6a\x24", "\x00\x00", "\x6a\x25", "\x6a\x26", "\x6a\x27", "\x6a\x28",
-  "\x00\x00", "\x6a\x29", "\x00\x00", "\x6a\x2a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6a\x2b", "\x00\x00", "\x00\x00", "\x6a\x2c", "\x00\x00",
-  "\x6a\x2d", "\x6a\x2e", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x2f",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x30",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x31", "\x00\x00",
-  "\x6a\x32", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6a\x33", "\x6a\x34", "\x6a\x35", "\x00\x00", "\x6a\x36", "\x00\x00",
-  "\x6a\x37", "\x6a\x38", "\x00\x00", "\x00\x00", "\x6a\x39", "\x6a\x3a",
-  "\x00\x00", "\x00\x00", "\x6a\x3b", "\x6a\x3c", "\x6a\x3d", "\x6a\x3e",
-  "\x6a\x3f", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x40", "\x00\x00",
-  "\x00\x00", "\x6a\x41", "\x00\x00", "\x00\x00", "\x6a\x42", "\x00\x00",
-  "\x6a\x43", "\x00\x00", "\x6a\x44", "\x6a\x45", "\x00\x00", "\x6a\x46",
-  "\x00\x00", "\x6a\x47", "\x6a\x48", "\x6a\x49", "\x6a\x4a", "\x6a\x4b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x4c", "\x00\x00",
-  "\x6a\x4d", "\x00\x00", "\x6a\x4e", "\x6a\x4f", "\x6a\x50", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x51", "\x6a\x52",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x53", "\x6a\x54", "\x6a\x55",
-  "\x6a\x56", "\x00\x00", "\x6a\x57", "\x6a\x58", "\x6a\x59", "\x00\x00",
-  "\x6a\x5a", "\x00\x00", "\x6a\x5b", "\x6a\x5c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6a\x5d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6a\x5e", "\x00\x00", "\x00\x00", "\x6a\x5f", "\x6a\x60",
-  "\x6a\x61", "\x6a\x62", "\x00\x00", "\x6a\x63", "\x00\x00", "\x00\x00",
-  "\x6a\x64", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x65", "\x6a\x66",
-  "\x6a\x67", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x68",
-  "\x6a\x69", "\x00\x00", "\x00\x00", "\x6a\x6a", "\x6a\x6b", "\x00\x00",
-  "\x6a\x6c", "\x6a\x6d", "\x00\x00", "\x6a\x6e", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x6f", "\x6a\x70", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x71", "\x00\x00",
-  "\x6a\x72", "\x6a\x73", "\x6a\x74", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6a\x75", "\x00\x00", "\x6a\x76", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x77", "\x00\x00", "\x6a\x78",
-  "\x00\x00", "\x00\x00", "\x6a\x79", "\x6a\x7a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6a\x7b", "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x7c",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6a\x7d", "\x6a\x7e", "\x6b\x21",
-  "\x6b\x22", "\x00\x00", "\x00\x00", "\x6b\x23", "\x00\x00", "\x6b\x24",
-  "\x6b\x25", "\x00\x00", "\x6b\x26", "\x6b\x27", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6b\x28", "\x00\x00", "\x6b\x29", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6b\x2a", "\x00\x00", "\x6b\x2b", "\x6b\x2c",
-  "\x6b\x2d", "\x00\x00", "\x6b\x2e", "\x00\x00", "\x6b\x2f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6b\x30", "\x6b\x31", "\x00\x00", "\x00\x00",
-  "\x6b\x32", "\x6b\x33", "\x6b\x34", "\x6b\x35", "\x6b\x36", "\x6b\x37",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x38", "\x6b\x39", "\x6b\x3a",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x3b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x3c", "\x00\x00", "\x6b\x3d",
-  "\x6b\x3e", "\x6b\x3f", "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x40",
-  "\x6b\x41", "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x42", "\x6b\x43",
-  "\x6b\x44", "\x00\x00", "\x00\x00", "\x6b\x45", "\x6b\x46", "\x00\x00",
-  "\x6b\x47", "\x00\x00", "\x6b\x48", "\x00\x00", "\x00\x00", "\x6b\x49",
-  "\x6b\x50", "\x6b\x4a", "\x6b\x4b", "\x6b\x4c", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6b\x4d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6b\x52", "\x6b\x4e", "\x6b\x4f", "\x6b\x51", "\x00\x00", "\x00\x00",
-  "\x6b\x53", "\x00\x00", "\x6b\x54", "\x00\x00", "\x6b\x55", "\x00\x00",
-  "\x00\x00", "\x6b\x56", "\x00\x00", "\x6b\x57", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6b\x58", "\x6b\x59", "\x6b\x5a", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6b\x5b", "\x00\x00", "\x6b\x5c", "\x6b\x5e",
-  "\x6b\x5d", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6b\x5f", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6b\x60", "\x6b\x61", "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x62",
-  "\x6b\x63", "\x6b\x64", "\x6b\x65", "\x6b\x66", "\x00\x00", "\x6b\x67",
-  "\x6b\x68", "\x6b\x69", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6b\x6a", "\x00\x00", "\x6b\x6b", "\x6b\x6d", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6b\x6e", "\x6b\x6f", "\x00\x00",
-  "\x6b\x6c", "\x00\x00", "\x6b\x70", "\x00\x00", "\x00\x00", "\x6b\x71",
-  "\x6b\x72", "\x6b\x73", "\x6b\x74", "\x00\x00", "\x00\x00", "\x6b\x76",
-  "\x6b\x75", "\x00\x00", "\x6b\x77", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6b\x78", "\x6b\x79", "\x6b\x7a", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6b\x7b", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6b\x7c", "\x6b\x7d", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6b\x7e", "\x6c\x21", "\x00\x00", "\x6c\x22", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6c\x23", "\x6c\x24", "\x00\x00", "\x6c\x25",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x26", "\x00\x00", "\x00\x00",
-  "\x6c\x27", "\x6c\x28", "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x29",
-  "\x6c\x2a", "\x00\x00", "\x6c\x2b", "\x6c\x2c", "\x6c\x2d", "\x6c\x2e",
-  "\x6c\x2f", "\x6c\x30", "\x00\x00", "\x6c\x31", "\x00\x00", "\x6c\x32",
-  "\x00\x00", "\x00\x00", "\x6c\x33", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6c\x34", "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x35", "\x00\x00",
-  "\x00\x00", "\x6c\x36", "\x00\x00", "\x00\x00", "\x6c\x37", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6c\x38", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6c\x39", "\x00\x00", "\x6c\x3a", "\x6c\x3b", "\x6c\x3c", "\x6c\x3d",
-  "\x6c\x3e", "\x6c\x3f", "\x00\x00", "\x00\x00", "\x6c\x40", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6c\x41", "\x6c\x42", "\x6c\x43", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x44", "\x00\x00", "\x6c\x45",
-  "\x00\x00", "\x6c\x46", "\x00\x00", "\x6c\x47", "\x00\x00", "\x00\x00",
-  "\x6c\x48", "\x00\x00", "\x6c\x49", "\x00\x00", "\x00\x00", "\x6c\x4a",
-  "\x6c\x4b", "\x6c\x4c", "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x4e",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x4f", "\x00\x00",
-  "\x00\x00", "\x6c\x4d", "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x50",
-  "\x00\x00", "\x6c\x51", "\x6c\x52", "\x6c\x53", "\x00\x00", "\x00\x00",
-  "\x6c\x54", "\x6c\x55", "\x00\x00", "\x00\x00", "\x6c\x56", "\x00\x00",
-  "\x00\x00", "\x6c\x57", "\x6c\x58", "\x6c\x59", "\x6c\x5a", "\x6c\x5b",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x5c", "\x00\x00", "\x6c\x5d",
-  "\x6c\x5e", "\x6c\x5f", "\x6c\x60", "\x00\x00", "\x6c\x61", "\x6c\x62",
-  "\x6c\x63", "\x6c\x64", "\x00\x00", "\x6c\x65", "\x00\x00", "\x00\x00",
-  "\x6c\x66", "\x00\x00", "\x00\x00", "\x6c\x67", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x68", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6c\x69", "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x6a",
-  "\x00\x00", "\x6c\x6b", "\x6c\x6c", "\x6c\x6d", "\x00\x00", "\x00\x00",
-  "\x6c\x6e", "\x6c\x6f", "\x6c\x70", "\x6c\x71", "\x00\x00", "\x6c\x72",
-  "\x00\x00", "\x00\x00", "\x6c\x73", "\x6c\x74", "\x6c\x75", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x76", "\x00\x00", "\x00\x00",
-  "\x6c\x77", "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6c\x78",
-  "\x6c\x79", "\x6c\x7a", "\x00\x00", "\x6c\x7b", "\x6c\x7c", "\x6c\x7d",
-  "\x00\x00", "\x00\x00", "\x6c\x7e", "\x00\x00", "\x00\x00", "\x6d\x21",
-  "\x6d\x22", "\x00\x00", "\x00\x00", "\x6d\x23", "\x6d\x24", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6d\x25", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x00\x00", "\x6d\x26", "\x6d\x27",
-  "\x6d\x28", "\x6d\x29", "\x00\x00", "\x6d\x2a", "\x00\x00", "\x6d\x2b",
-  "\x6d\x2c", "\x00\x00", "\x6d\x2d", "\x6d\x2e", "\x6d\x2f", "\x00\x00",
-  "\x00\x00", "\x00\x00", "\x6d\x30", "\x00\x00", "\x00\x00", "\x6d\x31",
-  "\x00\x00", "\x00\x00", "\x00\x00", "\x6d\x32", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6d\x33", "\x6d\x34", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6d\x35", "\x00\x00", "\x6d\x36", "\x6d\x37", "\x00\x00", "\x6d\x38",
-  "\x00\x00", "\x00\x00", "\x6d\x39", "\x00\x00", "\x6d\x3a", "\x6d\x3b",
-  "\x00\x00", "\x6d\x3c", "\x6d\x3d", "\x00\x00", "\x6d\x3e", "\x00\x00",
-  "\x6d\x3f", "\x00\x00", "\x6d\x40", "\x6d\x41", "\x6d\x42", "\x6d\x43",
-  "\x6d\x44", "\x6d\x45", "\x00\x00", "\x6d\x46", "\x6d\x47", "\x6d\x48",
-  "\x6d\x49", "\x00\x00", "\x6d\x4a", "\x00\x00", "\x00\x00", "\x6d\x4b",
-  "\x6d\x4c", "\x6d\x4d", "\x6d\x4e", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x6d\x4f", "\x6d\x50", "\x6d\x51", "\x6d\x52", "\x6d\x53", "\x00\x00",
-  "\x6d\x54", "\x00\x00", "\x6d\x55", "\x00\x00", "\x00\x00", "\x00\x00",
-  "\x00\x00", "\x6d\x56", "\x00\x00", "\x00\x00", "\x6d\x57", "\x6d\x58",
-  "\x6d\x59", "\x6d\x5a", "\x6d\x5b", "\x00\x00", "\x6d\x5c", "\x00\x00",
-  "\x6d\x5d", "\x6d\x5e", "\x6d\x5f", "\x00\x00", "\x00\x00", "\x6d\x60",
-  "\x6d\x61", "\x6d\x62", "\x00\x00", "\x6d\x63", "\x22\x37"
-};
diff --git a/newlib/iconvdata/jis0212.h b/newlib/iconvdata/jis0212.h
deleted file mode 100644
index f57778e..0000000
--- a/newlib/iconvdata/jis0212.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Access functions for JISX0212 conversion.
-   Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _JIS0212_H
-#define _JIS0212_H	1
-
-#include <gconv.h>
-#include <stdint.h>
-
-
-/* Struct for table with indeces in mapping table.  */
-struct jisx0212_idx
-{
-  uint16_t start;
-  uint16_t end;
-  uint16_t idx;
-};
-
-/* Conversion table.  */
-extern const struct jisx0212_idx __jisx0212_to_ucs_idx[];
-extern const uint16_t __jisx0212_to_ucs[];
-
-extern const struct jisx0212_idx __jisx0212_from_ucs_idx[];
-extern const char __jisx0212_from_ucs[][2];
-
-
-static inline uint32_t
-jisx0212_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)
-{
-  const struct jisx0212_idx *rp = __jisx0212_to_ucs_idx;
-  unsigned char ch = *(*s);
-  unsigned char ch2;
-  uint32_t wch = 0;
-  int idx;
-
-  if (ch < offset || (ch - offset) < 0x22 || (ch - offset) > 0x6d)
-    return __UNKNOWN_10646_CHAR;
-
-  if (avail < 2)
-    return 0;
-
-  ch2 = (*s)[1];
-  if (ch2 < offset || (ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f)
-    return __UNKNOWN_10646_CHAR;
-
-  idx = (ch - offset - 0x21) * 94 + (ch2 - offset - 0x21);
-
-  while (idx > rp->end)
-    ++rp;
-  if (idx >= rp->start)
-    wch = __jisx0212_to_ucs[rp->idx + idx - rp->start];
-
-  if (wch != L'\0')
-    (*s) += 2;
-  else
-    wch = __UNKNOWN_10646_CHAR;
-
-  return wch;
-}
-
-
-static inline size_t
-ucs4_to_jisx0212 (uint32_t wch, char *s, size_t avail)
-{
-  const struct jisx0212_idx *rp = __jisx0212_from_ucs_idx;
-  unsigned int ch = (unsigned int) wch;
-  const char *cp;
-
-  if (ch >= 0xffff)
-    return __UNKNOWN_10646_CHAR;
-  while (ch > rp->end)
-    ++rp;
-  if (ch >= rp->start)
-    cp = __jisx0212_from_ucs[rp->idx + ch - rp->start];
-  else
-    return __UNKNOWN_10646_CHAR;
-
-  if (cp[0] == '\0')
-    return __UNKNOWN_10646_CHAR;
-
-  s[0] = cp[0];
-  if (cp[1] != '\0')
-    {
-      if (avail < 2)
-	return 0;
-
-      s[1] = cp[1];
-    }
-
-  return 2;
-}
-
-#endif /* jis0212.h */
diff --git a/newlib/iconvdata/sjis.c b/newlib/iconvdata/sjis.c
deleted file mode 100644
index 3a19642..0000000
--- a/newlib/iconvdata/sjis.c
+++ /dev/null
@@ -1,4512 +0,0 @@
-/* Mapping tables for SJIS handling.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <dlfcn.h>
-#include <stdint.h>
-#include <wchar.h>
-
-static const uint32_t halfkana_to_ucs4[] =
-{
-  0xff61, 0xff62, 0xff63, 0xff64, 0xff65, 0xff66, 0xff67, 0xff68,
-  0xff69, 0xff6a, 0xff6b, 0xff6c, 0xff6d, 0xff6e, 0xff6f, 0xff70,
-  0xff71, 0xff72, 0xff73, 0xff74, 0xff75, 0xff76, 0xff77, 0xff78,
-  0xff79, 0xff7a, 0xff7b, 0xff7c, 0xff7d, 0xff7e, 0xff7f, 0xff80,
-  0xff81, 0xff82, 0xff83, 0xff84, 0xff85, 0xff86, 0xff87, 0xff88,
-  0xff89, 0xff8a, 0xff8b, 0xff8c, 0xff8d, 0xff8e, 0xff8f, 0xff90,
-  0xff91, 0xff92, 0xff93, 0xff94, 0xff95, 0xff96, 0xff97, 0xff98,
-  0xff99, 0xff9a, 0xff9b, 0xff9c, 0xff9d, 0xff9e, 0xff9f
-};
-
-
-/* The following table can be generated from the file
-	unix/mappings/eastasia/jis/shiftjis.txt
-   from the Unicode CD (also available on their FTP server) using
-   the command
-
-	egrep '^0x8[01234][[:xdigit:]][[:xdigit:]]' \
-	  /mnt/cdrom/unix/mappings/eastasia/jis/shiftjis.txt | perl ~/sjis.pl
-
-   where sjis.pl contains:
-
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  while (<>) {
-    local($sjis, $ucs, %rest) = split;
-    $sjis = hex($sjis) - 0x8140;
-    local($sidx) = int($sjis / 256) * 192 + ($sjis % 256);
-    printf "\n " if (($n % 4) == 0);
-    ++$n;
-    printf " [%4d] = %s,", $sidx, $ucs;
-  }
-  print "\n";
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-
-static const uint16_t cjk_block1[703] =
-{
-  [  0] = 0x3000, [  1] = 0x3001, [  2] = 0x3002, [  3] = 0xFF0C,
-  [  4] = 0xFF0E, [  5] = 0x30FB, [  6] = 0xFF1A, [  7] = 0xFF1B,
-  [  8] = 0xFF1F, [  9] = 0xFF01, [ 10] = 0x309B, [ 11] = 0x309C,
-  [ 12] = 0x00B4, [ 13] = 0xFF40, [ 14] = 0x00A8, [ 15] = 0xFF3E,
-  [ 16] = 0xFFE3, [ 17] = 0xFF3F, [ 18] = 0x30FD, [ 19] = 0x30FE,
-  [ 20] = 0x309D, [ 21] = 0x309E, [ 22] = 0x3003, [ 23] = 0x4EDD,
-  [ 24] = 0x3005, [ 25] = 0x3006, [ 26] = 0x3007, [ 27] = 0x30FC,
-  [ 28] = 0x2015, [ 29] = 0x2010, [ 30] = 0xFF0F, [ 31] = 0xFF3C,
-  [ 32] = 0x301C, [ 33] = 0x2016, [ 34] = 0xFF5C, [ 35] = 0x2026,
-  [ 36] = 0x2025, [ 37] = 0x2018, [ 38] = 0x2019, [ 39] = 0x201C,
-  [ 40] = 0x201D, [ 41] = 0xFF08, [ 42] = 0xFF09, [ 43] = 0x3014,
-  [ 44] = 0x3015, [ 45] = 0xFF3B, [ 46] = 0xFF3D, [ 47] = 0xFF5B,
-  [ 48] = 0xFF5D, [ 49] = 0x3008, [ 50] = 0x3009, [ 51] = 0x300A,
-  [ 52] = 0x300B, [ 53] = 0x300C, [ 54] = 0x300D, [ 55] = 0x300E,
-  [ 56] = 0x300F, [ 57] = 0x3010, [ 58] = 0x3011, [ 59] = 0xFF0B,
-  [ 60] = 0x2212, [ 61] = 0x00B1, [ 62] = 0x00D7, [ 64] = 0x00F7,
-  [ 65] = 0xFF1D, [ 66] = 0x2260, [ 67] = 0xFF1C, [ 68] = 0xFF1E,
-  [ 69] = 0x2266, [ 70] = 0x2267, [ 71] = 0x221E, [ 72] = 0x2234,
-  [ 73] = 0x2642, [ 74] = 0x2640, [ 75] = 0x00B0, [ 76] = 0x2032,
-  [ 77] = 0x2033, [ 78] = 0x2103, [ 79] = 0xFFE5, [ 80] = 0xFF04,
-  [ 81] = 0x00A2, [ 82] = 0x00A3, [ 83] = 0xFF05, [ 84] = 0xFF03,
-  [ 85] = 0xFF06, [ 86] = 0xFF0A, [ 87] = 0xFF20, [ 88] = 0x00A7,
-  [ 89] = 0x2606, [ 90] = 0x2605, [ 91] = 0x25CB, [ 92] = 0x25CF,
-  [ 93] = 0x25CE, [ 94] = 0x25C7, [ 95] = 0x25C6, [ 96] = 0x25A1,
-  [ 97] = 0x25A0, [ 98] = 0x25B3, [ 99] = 0x25B2, [100] = 0x25BD,
-  [101] = 0x25BC, [102] = 0x203B, [103] = 0x3012, [104] = 0x2192,
-  [105] = 0x2190, [106] = 0x2191, [107] = 0x2193, [108] = 0x3013,
-  [120] = 0x2208, [121] = 0x220B, [122] = 0x2286, [123] = 0x2287,
-  [124] = 0x2282, [125] = 0x2283, [126] = 0x222A, [127] = 0x2229,
-  [136] = 0x2227, [137] = 0x2228, [138] = 0x00AC, [139] = 0x21D2,
-  [140] = 0x21D4, [141] = 0x2200, [142] = 0x2203, [154] = 0x2220,
-  [155] = 0x22A5, [156] = 0x2312, [157] = 0x2202, [158] = 0x2207,
-  [159] = 0x2261, [160] = 0x2252, [161] = 0x226A, [162] = 0x226B,
-  [163] = 0x221A, [164] = 0x223D, [165] = 0x221D, [166] = 0x2235,
-  [167] = 0x222B, [168] = 0x222C, [176] = 0x212B, [177] = 0x2030,
-  [178] = 0x266F, [179] = 0x266D, [180] = 0x266A, [181] = 0x2020,
-  [182] = 0x2021, [183] = 0x00B6, [188] = 0x25EF, [207] = 0xFF10,
-  [208] = 0xFF11, [209] = 0xFF12, [210] = 0xFF13, [211] = 0xFF14,
-  [212] = 0xFF15, [213] = 0xFF16, [214] = 0xFF17, [215] = 0xFF18,
-  [216] = 0xFF19, [224] = 0xFF21, [225] = 0xFF22, [226] = 0xFF23,
-  [227] = 0xFF24, [228] = 0xFF25, [229] = 0xFF26, [230] = 0xFF27,
-  [231] = 0xFF28, [232] = 0xFF29, [233] = 0xFF2A, [234] = 0xFF2B,
-  [235] = 0xFF2C, [236] = 0xFF2D, [237] = 0xFF2E, [238] = 0xFF2F,
-  [239] = 0xFF30, [240] = 0xFF31, [241] = 0xFF32, [242] = 0xFF33,
-  [243] = 0xFF34, [244] = 0xFF35, [245] = 0xFF36, [246] = 0xFF37,
-  [247] = 0xFF38, [248] = 0xFF39, [249] = 0xFF3A, [257] = 0xFF41,
-  [258] = 0xFF42, [259] = 0xFF43, [260] = 0xFF44, [261] = 0xFF45,
-  [262] = 0xFF46, [263] = 0xFF47, [264] = 0xFF48, [265] = 0xFF49,
-  [266] = 0xFF4A, [267] = 0xFF4B, [268] = 0xFF4C, [269] = 0xFF4D,
-  [270] = 0xFF4E, [271] = 0xFF4F, [272] = 0xFF50, [273] = 0xFF51,
-  [274] = 0xFF52, [275] = 0xFF53, [276] = 0xFF54, [277] = 0xFF55,
-  [278] = 0xFF56, [279] = 0xFF57, [280] = 0xFF58, [281] = 0xFF59,
-  [282] = 0xFF5A, [287] = 0x3041, [288] = 0x3042, [289] = 0x3043,
-  [290] = 0x3044, [291] = 0x3045, [292] = 0x3046, [293] = 0x3047,
-  [294] = 0x3048, [295] = 0x3049, [296] = 0x304A, [297] = 0x304B,
-  [298] = 0x304C, [299] = 0x304D, [300] = 0x304E, [301] = 0x304F,
-  [302] = 0x3050, [303] = 0x3051, [304] = 0x3052, [305] = 0x3053,
-  [306] = 0x3054, [307] = 0x3055, [308] = 0x3056, [309] = 0x3057,
-  [310] = 0x3058, [311] = 0x3059, [312] = 0x305A, [313] = 0x305B,
-  [314] = 0x305C, [315] = 0x305D, [316] = 0x305E, [317] = 0x305F,
-  [318] = 0x3060, [319] = 0x3061, [320] = 0x3062, [321] = 0x3063,
-  [322] = 0x3064, [323] = 0x3065, [324] = 0x3066, [325] = 0x3067,
-  [326] = 0x3068, [327] = 0x3069, [328] = 0x306A, [329] = 0x306B,
-  [330] = 0x306C, [331] = 0x306D, [332] = 0x306E, [333] = 0x306F,
-  [334] = 0x3070, [335] = 0x3071, [336] = 0x3072, [337] = 0x3073,
-  [338] = 0x3074, [339] = 0x3075, [340] = 0x3076, [341] = 0x3077,
-  [342] = 0x3078, [343] = 0x3079, [344] = 0x307A, [345] = 0x307B,
-  [346] = 0x307C, [347] = 0x307D, [348] = 0x307E, [349] = 0x307F,
-  [350] = 0x3080, [351] = 0x3081, [352] = 0x3082, [353] = 0x3083,
-  [354] = 0x3084, [355] = 0x3085, [356] = 0x3086, [357] = 0x3087,
-  [358] = 0x3088, [359] = 0x3089, [360] = 0x308A, [361] = 0x308B,
-  [362] = 0x308C, [363] = 0x308D, [364] = 0x308E, [365] = 0x308F,
-  [366] = 0x3090, [367] = 0x3091, [368] = 0x3092, [369] = 0x3093,
-  [384] = 0x30A1, [385] = 0x30A2, [386] = 0x30A3, [387] = 0x30A4,
-  [388] = 0x30A5, [389] = 0x30A6, [390] = 0x30A7, [391] = 0x30A8,
-  [392] = 0x30A9, [393] = 0x30AA, [394] = 0x30AB, [395] = 0x30AC,
-  [396] = 0x30AD, [397] = 0x30AE, [398] = 0x30AF, [399] = 0x30B0,
-  [400] = 0x30B1, [401] = 0x30B2, [402] = 0x30B3, [403] = 0x30B4,
-  [404] = 0x30B5, [405] = 0x30B6, [406] = 0x30B7, [407] = 0x30B8,
-  [408] = 0x30B9, [409] = 0x30BA, [410] = 0x30BB, [411] = 0x30BC,
-  [412] = 0x30BD, [413] = 0x30BE, [414] = 0x30BF, [415] = 0x30C0,
-  [416] = 0x30C1, [417] = 0x30C2, [418] = 0x30C3, [419] = 0x30C4,
-  [420] = 0x30C5, [421] = 0x30C6, [422] = 0x30C7, [423] = 0x30C8,
-  [424] = 0x30C9, [425] = 0x30CA, [426] = 0x30CB, [427] = 0x30CC,
-  [428] = 0x30CD, [429] = 0x30CE, [430] = 0x30CF, [431] = 0x30D0,
-  [432] = 0x30D1, [433] = 0x30D2, [434] = 0x30D3, [435] = 0x30D4,
-  [436] = 0x30D5, [437] = 0x30D6, [438] = 0x30D7, [439] = 0x30D8,
-  [440] = 0x30D9, [441] = 0x30DA, [442] = 0x30DB, [443] = 0x30DC,
-  [444] = 0x30DD, [445] = 0x30DE, [446] = 0x30DF, [448] = 0x30E0,
-  [449] = 0x30E1, [450] = 0x30E2, [451] = 0x30E3, [452] = 0x30E4,
-  [453] = 0x30E5, [454] = 0x30E6, [455] = 0x30E7, [456] = 0x30E8,
-  [457] = 0x30E9, [458] = 0x30EA, [459] = 0x30EB, [460] = 0x30EC,
-  [461] = 0x30ED, [462] = 0x30EE, [463] = 0x30EF, [464] = 0x30F0,
-  [465] = 0x30F1, [466] = 0x30F2, [467] = 0x30F3, [468] = 0x30F4,
-  [469] = 0x30F5, [470] = 0x30F6, [479] = 0x0391, [480] = 0x0392,
-  [481] = 0x0393, [482] = 0x0394, [483] = 0x0395, [484] = 0x0396,
-  [485] = 0x0397, [486] = 0x0398, [487] = 0x0399, [488] = 0x039A,
-  [489] = 0x039B, [490] = 0x039C, [491] = 0x039D, [492] = 0x039E,
-  [493] = 0x039F, [494] = 0x03A0, [495] = 0x03A1, [496] = 0x03A3,
-  [497] = 0x03A4, [498] = 0x03A5, [499] = 0x03A6, [500] = 0x03A7,
-  [501] = 0x03A8, [502] = 0x03A9, [511] = 0x03B1, [512] = 0x03B2,
-  [513] = 0x03B3, [514] = 0x03B4, [515] = 0x03B5, [516] = 0x03B6,
-  [517] = 0x03B7, [518] = 0x03B8, [519] = 0x03B9, [520] = 0x03BA,
-  [521] = 0x03BB, [522] = 0x03BC, [523] = 0x03BD, [524] = 0x03BE,
-  [525] = 0x03BF, [526] = 0x03C0, [527] = 0x03C1, [528] = 0x03C3,
-  [529] = 0x03C4, [530] = 0x03C5, [531] = 0x03C6, [532] = 0x03C7,
-  [533] = 0x03C8, [534] = 0x03C9, [576] = 0x0410, [577] = 0x0411,
-  [578] = 0x0412, [579] = 0x0413, [580] = 0x0414, [581] = 0x0415,
-  [582] = 0x0401, [583] = 0x0416, [584] = 0x0417, [585] = 0x0418,
-  [586] = 0x0419, [587] = 0x041A, [588] = 0x041B, [589] = 0x041C,
-  [590] = 0x041D, [591] = 0x041E, [592] = 0x041F, [593] = 0x0420,
-  [594] = 0x0421, [595] = 0x0422, [596] = 0x0423, [597] = 0x0424,
-  [598] = 0x0425, [599] = 0x0426, [600] = 0x0427, [601] = 0x0428,
-  [602] = 0x0429, [603] = 0x042A, [604] = 0x042B, [605] = 0x042C,
-  [606] = 0x042D, [607] = 0x042E, [608] = 0x042F, [624] = 0x0430,
-  [625] = 0x0431, [626] = 0x0432, [627] = 0x0433, [628] = 0x0434,
-  [629] = 0x0435, [630] = 0x0451, [631] = 0x0436, [632] = 0x0437,
-  [633] = 0x0438, [634] = 0x0439, [635] = 0x043A, [636] = 0x043B,
-  [637] = 0x043C, [638] = 0x043D, [640] = 0x043E, [641] = 0x043F,
-  [642] = 0x0440, [643] = 0x0441, [644] = 0x0442, [645] = 0x0443,
-  [646] = 0x0444, [647] = 0x0445, [648] = 0x0446, [649] = 0x0447,
-  [650] = 0x0448, [651] = 0x0449, [652] = 0x044A, [653] = 0x044B,
-  [654] = 0x044C, [655] = 0x044D, [656] = 0x044E, [657] = 0x044F,
-  [671] = 0x2500, [672] = 0x2502, [673] = 0x250C, [674] = 0x2510,
-  [675] = 0x2518, [676] = 0x2514, [677] = 0x251C, [678] = 0x252C,
-  [679] = 0x2524, [680] = 0x2534, [681] = 0x253C, [682] = 0x2501,
-  [683] = 0x2503, [684] = 0x250F, [685] = 0x2513, [686] = 0x251B,
-  [687] = 0x2517, [688] = 0x2523, [689] = 0x2533, [690] = 0x252B,
-  [691] = 0x253B, [692] = 0x254B, [693] = 0x2520, [694] = 0x252F,
-  [695] = 0x2528, [696] = 0x2537, [697] = 0x253F, [698] = 0x251D,
-  [699] = 0x2530, [700] = 0x2525, [701] = 0x2538, [702] = 0x2542
-};
-
-
-/* The following table can be generated from the file
-	unix/mappings/eastasia/jis/shiftjis.txt
-   from the Unicode CD (also available on their FTP server) using
-   the command
-
-	egrep '^0x8[89][[:xdigit:]][[:xdigit:]]' \
-	  /mnt/cdrom/unix/mappings/eastasia/jis/shiftjis.txt | perl ~/sjis.pl
-
-   where sjis.pl contains:
-
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  while (<>) {
-    local($sjis, $ucs, %rest) = split;
-    $sjis = hex($sjis) - 0x8840;
-    local($sidx) = int($sjis / 256) * 192 + ($sjis % 256) - 0x5f;
-    printf "\n " if (($n % 4) == 0);
-    ++$n;
-    printf " [%3d] = %s,", $sidx, $ucs;
-  }
-  print "\n";
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-static const uint16_t cjk_block2[94] =
-{
-  [  0] = 0x4E9C, [  1] = 0x5516, [  2] = 0x5A03, [  3] = 0x963F,
-  [  4] = 0x54C0, [  5] = 0x611B, [  6] = 0x6328, [  7] = 0x59F6,
-  [  8] = 0x9022, [  9] = 0x8475, [ 10] = 0x831C, [ 11] = 0x7A50,
-  [ 12] = 0x60AA, [ 13] = 0x63E1, [ 14] = 0x6E25, [ 15] = 0x65ED,
-  [ 16] = 0x8466, [ 17] = 0x82A6, [ 18] = 0x9BF5, [ 19] = 0x6893,
-  [ 20] = 0x5727, [ 21] = 0x65A1, [ 22] = 0x6271, [ 23] = 0x5B9B,
-  [ 24] = 0x59D0, [ 25] = 0x867B, [ 26] = 0x98F4, [ 27] = 0x7D62,
-  [ 28] = 0x7DBE, [ 29] = 0x9B8E, [ 30] = 0x6216, [ 31] = 0x7C9F,
-  [ 32] = 0x88B7, [ 33] = 0x5B89, [ 34] = 0x5EB5, [ 35] = 0x6309,
-  [ 36] = 0x6697, [ 37] = 0x6848, [ 38] = 0x95C7, [ 39] = 0x978D,
-  [ 40] = 0x674F, [ 41] = 0x4EE5, [ 42] = 0x4F0A, [ 43] = 0x4F4D,
-  [ 44] = 0x4F9D, [ 45] = 0x5049, [ 46] = 0x56F2, [ 47] = 0x5937,
-  [ 48] = 0x59D4, [ 49] = 0x5A01, [ 50] = 0x5C09, [ 51] = 0x60DF,
-  [ 52] = 0x610F, [ 53] = 0x6170, [ 54] = 0x6613, [ 55] = 0x6905,
-  [ 56] = 0x70BA, [ 57] = 0x754F, [ 58] = 0x7570, [ 59] = 0x79FB,
-  [ 60] = 0x7DAD, [ 61] = 0x7DEF, [ 62] = 0x80C3, [ 63] = 0x840E,
-  [ 64] = 0x8863, [ 65] = 0x8B02, [ 66] = 0x9055, [ 67] = 0x907A,
-  [ 68] = 0x533B, [ 69] = 0x4E95, [ 70] = 0x4EA5, [ 71] = 0x57DF,
-  [ 72] = 0x80B2, [ 73] = 0x90C1, [ 74] = 0x78EF, [ 75] = 0x4E00,
-  [ 76] = 0x58F1, [ 77] = 0x6EA2, [ 78] = 0x9038, [ 79] = 0x7A32,
-  [ 80] = 0x8328, [ 81] = 0x828B, [ 82] = 0x9C2F, [ 83] = 0x5141,
-  [ 84] = 0x5370, [ 85] = 0x54BD, [ 86] = 0x54E1, [ 87] = 0x56E0,
-  [ 88] = 0x59FB, [ 89] = 0x5F15, [ 90] = 0x98F2, [ 91] = 0x6DEB,
-  [ 92] = 0x80E4, [ 93] = 0x852D
-};
-
-/* The following table can be generated from the file
-	unix/mappings/eastasia/jis/shiftjis.txt
-   from the Unicode CD (also available on their FTP server) using
-   the command
-
-	egrep '^0x(8[9a-fA-F]|9[[:xdigit:]])[[:xdigit:]][[:xdigit:]]' \
-	  /mnt/cdrom/unix/mappings/eastasia/jis/shiftjis.txt | perl ~/sjis.pl
-
-   where sjis.pl contains:
-
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  while (<>) {
-    local($sjis, $ucs, %rest) = split;
-    $sjis = hex($sjis) - 0x8940;
-    local($sidx) = int($sjis / 256) * 192 + ($sjis % 256) - 0x5f;
-    printf "\n " if (($n % 4) == 0);
-    ++$n;
-    printf " [%4d] = %s,", $sidx, $ucs;
-  }
-  print "\n";
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-static const uint16_t cjk_block3[4413] =
-{
-  [   0] = 0x9662, [   1] = 0x9670, [   2] = 0x96A0, [   3] = 0x97FB,
-  [   4] = 0x540B, [   5] = 0x53F3, [   6] = 0x5B87, [   7] = 0x70CF,
-  [   8] = 0x7FBD, [   9] = 0x8FC2, [  10] = 0x96E8, [  11] = 0x536F,
-  [  12] = 0x9D5C, [  13] = 0x7ABA, [  14] = 0x4E11, [  15] = 0x7893,
-  [  16] = 0x81FC, [  17] = 0x6E26, [  18] = 0x5618, [  19] = 0x5504,
-  [  20] = 0x6B1D, [  21] = 0x851A, [  22] = 0x9C3B, [  23] = 0x59E5,
-  [  24] = 0x53A9, [  25] = 0x6D66, [  26] = 0x74DC, [  27] = 0x958F,
-  [  28] = 0x5642, [  29] = 0x4E91, [  30] = 0x904B, [  31] = 0x96F2,
-  [  32] = 0x834F, [  33] = 0x990C, [  34] = 0x53E1, [  35] = 0x55B6,
-  [  36] = 0x5B30, [  37] = 0x5F71, [  38] = 0x6620, [  39] = 0x66F3,
-  [  40] = 0x6804, [  41] = 0x6C38, [  42] = 0x6CF3, [  43] = 0x6D29,
-  [  44] = 0x745B, [  45] = 0x76C8, [  46] = 0x7A4E, [  47] = 0x9834,
-  [  48] = 0x82F1, [  49] = 0x885B, [  50] = 0x8A60, [  51] = 0x92ED,
-  [  52] = 0x6DB2, [  53] = 0x75AB, [  54] = 0x76CA, [  55] = 0x99C5,
-  [  56] = 0x60A6, [  57] = 0x8B01, [  58] = 0x8D8A, [  59] = 0x95B2,
-  [  60] = 0x698E, [  61] = 0x53AD, [  62] = 0x5186, [  64] = 0x5712,
-  [  65] = 0x5830, [  66] = 0x5944, [  67] = 0x5BB4, [  68] = 0x5EF6,
-  [  69] = 0x6028, [  70] = 0x63A9, [  71] = 0x63F4, [  72] = 0x6CBF,
-  [  73] = 0x6F14, [  74] = 0x708E, [  75] = 0x7114, [  76] = 0x7159,
-  [  77] = 0x71D5, [  78] = 0x733F, [  79] = 0x7E01, [  80] = 0x8276,
-  [  81] = 0x82D1, [  82] = 0x8597, [  83] = 0x9060, [  84] = 0x925B,
-  [  85] = 0x9D1B, [  86] = 0x5869, [  87] = 0x65BC, [  88] = 0x6C5A,
-  [  89] = 0x7525, [  90] = 0x51F9, [  91] = 0x592E, [  92] = 0x5965,
-  [  93] = 0x5F80, [  94] = 0x5FDC, [  95] = 0x62BC, [  96] = 0x65FA,
-  [  97] = 0x6A2A, [  98] = 0x6B27, [  99] = 0x6BB4, [ 100] = 0x738B,
-  [ 101] = 0x7FC1, [ 102] = 0x8956, [ 103] = 0x9D2C, [ 104] = 0x9D0E,
-  [ 105] = 0x9EC4, [ 106] = 0x5CA1, [ 107] = 0x6C96, [ 108] = 0x837B,
-  [ 109] = 0x5104, [ 110] = 0x5C4B, [ 111] = 0x61B6, [ 112] = 0x81C6,
-  [ 113] = 0x6876, [ 114] = 0x7261, [ 115] = 0x4E59, [ 116] = 0x4FFA,
-  [ 117] = 0x5378, [ 118] = 0x6069, [ 119] = 0x6E29, [ 120] = 0x7A4F,
-  [ 121] = 0x97F3, [ 122] = 0x4E0B, [ 123] = 0x5316, [ 124] = 0x4EEE,
-  [ 125] = 0x4F55, [ 126] = 0x4F3D, [ 127] = 0x4FA1, [ 128] = 0x4F73,
-  [ 129] = 0x52A0, [ 130] = 0x53EF, [ 131] = 0x5609, [ 132] = 0x590F,
-  [ 133] = 0x5AC1, [ 134] = 0x5BB6, [ 135] = 0x5BE1, [ 136] = 0x79D1,
-  [ 137] = 0x6687, [ 138] = 0x679C, [ 139] = 0x67B6, [ 140] = 0x6B4C,
-  [ 141] = 0x6CB3, [ 142] = 0x706B, [ 143] = 0x73C2, [ 144] = 0x798D,
-  [ 145] = 0x79BE, [ 146] = 0x7A3C, [ 147] = 0x7B87, [ 148] = 0x82B1,
-  [ 149] = 0x82DB, [ 150] = 0x8304, [ 151] = 0x8377, [ 152] = 0x83EF,
-  [ 153] = 0x83D3, [ 154] = 0x8766, [ 155] = 0x8AB2, [ 156] = 0x5629,
-  [ 157] = 0x8CA8, [ 158] = 0x8FE6, [ 159] = 0x904E, [ 160] = 0x971E,
-  [ 161] = 0x868A, [ 162] = 0x4FC4, [ 163] = 0x5CE8, [ 164] = 0x6211,
-  [ 165] = 0x7259, [ 166] = 0x753B, [ 167] = 0x81E5, [ 168] = 0x82BD,
-  [ 169] = 0x86FE, [ 170] = 0x8CC0, [ 171] = 0x96C5, [ 172] = 0x9913,
-  [ 173] = 0x99D5, [ 174] = 0x4ECB, [ 175] = 0x4F1A, [ 176] = 0x89E3,
-  [ 177] = 0x56DE, [ 178] = 0x584A, [ 179] = 0x58CA, [ 180] = 0x5EFB,
-  [ 181] = 0x5FEB, [ 182] = 0x602A, [ 183] = 0x6094, [ 184] = 0x6062,
-  [ 185] = 0x61D0, [ 186] = 0x6212, [ 187] = 0x62D0, [ 188] = 0x6539,
-  [ 192] = 0x9B41, [ 193] = 0x6666, [ 194] = 0x68B0, [ 195] = 0x6D77,
-  [ 196] = 0x7070, [ 197] = 0x754C, [ 198] = 0x7686, [ 199] = 0x7D75,
-  [ 200] = 0x82A5, [ 201] = 0x87F9, [ 202] = 0x958B, [ 203] = 0x968E,
-  [ 204] = 0x8C9D, [ 205] = 0x51F1, [ 206] = 0x52BE, [ 207] = 0x5916,
-  [ 208] = 0x54B3, [ 209] = 0x5BB3, [ 210] = 0x5D16, [ 211] = 0x6168,
-  [ 212] = 0x6982, [ 213] = 0x6DAF, [ 214] = 0x788D, [ 215] = 0x84CB,
-  [ 216] = 0x8857, [ 217] = 0x8A72, [ 218] = 0x93A7, [ 219] = 0x9AB8,
-  [ 220] = 0x6D6C, [ 221] = 0x99A8, [ 222] = 0x86D9, [ 223] = 0x57A3,
-  [ 224] = 0x67FF, [ 225] = 0x86CE, [ 226] = 0x920E, [ 227] = 0x5283,
-  [ 228] = 0x5687, [ 229] = 0x5404, [ 230] = 0x5ED3, [ 231] = 0x62E1,
-  [ 232] = 0x64B9, [ 233] = 0x683C, [ 234] = 0x6838, [ 235] = 0x6BBB,
-  [ 236] = 0x7372, [ 237] = 0x78BA, [ 238] = 0x7A6B, [ 239] = 0x899A,
-  [ 240] = 0x89D2, [ 241] = 0x8D6B, [ 242] = 0x8F03, [ 243] = 0x90ED,
-  [ 244] = 0x95A3, [ 245] = 0x9694, [ 246] = 0x9769, [ 247] = 0x5B66,
-  [ 248] = 0x5CB3, [ 249] = 0x697D, [ 250] = 0x984D, [ 251] = 0x984E,
-  [ 252] = 0x639B, [ 253] = 0x7B20, [ 254] = 0x6A2B, [ 256] = 0x6A7F,
-  [ 257] = 0x68B6, [ 258] = 0x9C0D, [ 259] = 0x6F5F, [ 260] = 0x5272,
-  [ 261] = 0x559D, [ 262] = 0x6070, [ 263] = 0x62EC, [ 264] = 0x6D3B,
-  [ 265] = 0x6E07, [ 266] = 0x6ED1, [ 267] = 0x845B, [ 268] = 0x8910,
-  [ 269] = 0x8F44, [ 270] = 0x4E14, [ 271] = 0x9C39, [ 272] = 0x53F6,
-  [ 273] = 0x691B, [ 274] = 0x6A3A, [ 275] = 0x9784, [ 276] = 0x682A,
-  [ 277] = 0x515C, [ 278] = 0x7AC3, [ 279] = 0x84B2, [ 280] = 0x91DC,
-  [ 281] = 0x938C, [ 282] = 0x565B, [ 283] = 0x9D28, [ 284] = 0x6822,
-  [ 285] = 0x8305, [ 286] = 0x8431, [ 287] = 0x7CA5, [ 288] = 0x5208,
-  [ 289] = 0x82C5, [ 290] = 0x74E6, [ 291] = 0x4E7E, [ 292] = 0x4F83,
-  [ 293] = 0x51A0, [ 294] = 0x5BD2, [ 295] = 0x520A, [ 296] = 0x52D8,
-  [ 297] = 0x52E7, [ 298] = 0x5DFB, [ 299] = 0x559A, [ 300] = 0x582A,
-  [ 301] = 0x59E6, [ 302] = 0x5B8C, [ 303] = 0x5B98, [ 304] = 0x5BDB,
-  [ 305] = 0x5E72, [ 306] = 0x5E79, [ 307] = 0x60A3, [ 308] = 0x611F,
-  [ 309] = 0x6163, [ 310] = 0x61BE, [ 311] = 0x63DB, [ 312] = 0x6562,
-  [ 313] = 0x67D1, [ 314] = 0x6853, [ 315] = 0x68FA, [ 316] = 0x6B3E,
-  [ 317] = 0x6B53, [ 318] = 0x6C57, [ 319] = 0x6F22, [ 320] = 0x6F97,
-  [ 321] = 0x6F45, [ 322] = 0x74B0, [ 323] = 0x7518, [ 324] = 0x76E3,
-  [ 325] = 0x770B, [ 326] = 0x7AFF, [ 327] = 0x7BA1, [ 328] = 0x7C21,
-  [ 329] = 0x7DE9, [ 330] = 0x7F36, [ 331] = 0x7FF0, [ 332] = 0x809D,
-  [ 333] = 0x8266, [ 334] = 0x839E, [ 335] = 0x89B3, [ 336] = 0x8ACC,
-  [ 337] = 0x8CAB, [ 338] = 0x9084, [ 339] = 0x9451, [ 340] = 0x9593,
-  [ 341] = 0x9591, [ 342] = 0x95A2, [ 343] = 0x9665, [ 344] = 0x97D3,
-  [ 345] = 0x9928, [ 346] = 0x8218, [ 347] = 0x4E38, [ 348] = 0x542B,
-  [ 349] = 0x5CB8, [ 350] = 0x5DCC, [ 351] = 0x73A9, [ 352] = 0x764C,
-  [ 353] = 0x773C, [ 354] = 0x5CA9, [ 355] = 0x7FEB, [ 356] = 0x8D0B,
-  [ 357] = 0x96C1, [ 358] = 0x9811, [ 359] = 0x9854, [ 360] = 0x9858,
-  [ 361] = 0x4F01, [ 362] = 0x4F0E, [ 363] = 0x5371, [ 364] = 0x559C,
-  [ 365] = 0x5668, [ 366] = 0x57FA, [ 367] = 0x5947, [ 368] = 0x5B09,
-  [ 369] = 0x5BC4, [ 370] = 0x5C90, [ 371] = 0x5E0C, [ 372] = 0x5E7E,
-  [ 373] = 0x5FCC, [ 374] = 0x63EE, [ 375] = 0x673A, [ 376] = 0x65D7,
-  [ 377] = 0x65E2, [ 378] = 0x671F, [ 379] = 0x68CB, [ 380] = 0x68C4,
-  [ 384] = 0x6A5F, [ 385] = 0x5E30, [ 386] = 0x6BC5, [ 387] = 0x6C17,
-  [ 388] = 0x6C7D, [ 389] = 0x757F, [ 390] = 0x7948, [ 391] = 0x5B63,
-  [ 392] = 0x7A00, [ 393] = 0x7D00, [ 394] = 0x5FBD, [ 395] = 0x898F,
-  [ 396] = 0x8A18, [ 397] = 0x8CB4, [ 398] = 0x8D77, [ 399] = 0x8ECC,
-  [ 400] = 0x8F1D, [ 401] = 0x98E2, [ 402] = 0x9A0E, [ 403] = 0x9B3C,
-  [ 404] = 0x4E80, [ 405] = 0x507D, [ 406] = 0x5100, [ 407] = 0x5993,
-  [ 408] = 0x5B9C, [ 409] = 0x622F, [ 410] = 0x6280, [ 411] = 0x64EC,
-  [ 412] = 0x6B3A, [ 413] = 0x72A0, [ 414] = 0x7591, [ 415] = 0x7947,
-  [ 416] = 0x7FA9, [ 417] = 0x87FB, [ 418] = 0x8ABC, [ 419] = 0x8B70,
-  [ 420] = 0x63AC, [ 421] = 0x83CA, [ 422] = 0x97A0, [ 423] = 0x5409,
-  [ 424] = 0x5403, [ 425] = 0x55AB, [ 426] = 0x6854, [ 427] = 0x6A58,
-  [ 428] = 0x8A70, [ 429] = 0x7827, [ 430] = 0x6775, [ 431] = 0x9ECD,
-  [ 432] = 0x5374, [ 433] = 0x5BA2, [ 434] = 0x811A, [ 435] = 0x8650,
-  [ 436] = 0x9006, [ 437] = 0x4E18, [ 438] = 0x4E45, [ 439] = 0x4EC7,
-  [ 440] = 0x4F11, [ 441] = 0x53CA, [ 442] = 0x5438, [ 443] = 0x5BAE,
-  [ 444] = 0x5F13, [ 445] = 0x6025, [ 446] = 0x6551, [ 448] = 0x673D,
-  [ 449] = 0x6C42, [ 450] = 0x6C72, [ 451] = 0x6CE3, [ 452] = 0x7078,
-  [ 453] = 0x7403, [ 454] = 0x7A76, [ 455] = 0x7AAE, [ 456] = 0x7B08,
-  [ 457] = 0x7D1A, [ 458] = 0x7CFE, [ 459] = 0x7D66, [ 460] = 0x65E7,
-  [ 461] = 0x725B, [ 462] = 0x53BB, [ 463] = 0x5C45, [ 464] = 0x5DE8,
-  [ 465] = 0x62D2, [ 466] = 0x62E0, [ 467] = 0x6319, [ 468] = 0x6E20,
-  [ 469] = 0x865A, [ 470] = 0x8A31, [ 471] = 0x8DDD, [ 472] = 0x92F8,
-  [ 473] = 0x6F01, [ 474] = 0x79A6, [ 475] = 0x9B5A, [ 476] = 0x4EA8,
-  [ 477] = 0x4EAB, [ 478] = 0x4EAC, [ 479] = 0x4F9B, [ 480] = 0x4FA0,
-  [ 481] = 0x50D1, [ 482] = 0x5147, [ 483] = 0x7AF6, [ 484] = 0x5171,
-  [ 485] = 0x51F6, [ 486] = 0x5354, [ 487] = 0x5321, [ 488] = 0x537F,
-  [ 489] = 0x53EB, [ 490] = 0x55AC, [ 491] = 0x5883, [ 492] = 0x5CE1,
-  [ 493] = 0x5F37, [ 494] = 0x5F4A, [ 495] = 0x602F, [ 496] = 0x6050,
-  [ 497] = 0x606D, [ 498] = 0x631F, [ 499] = 0x6559, [ 500] = 0x6A4B,
-  [ 501] = 0x6CC1, [ 502] = 0x72C2, [ 503] = 0x72ED, [ 504] = 0x77EF,
-  [ 505] = 0x80F8, [ 506] = 0x8105, [ 507] = 0x8208, [ 508] = 0x854E,
-  [ 509] = 0x90F7, [ 510] = 0x93E1, [ 511] = 0x97FF, [ 512] = 0x9957,
-  [ 513] = 0x9A5A, [ 514] = 0x4EF0, [ 515] = 0x51DD, [ 516] = 0x5C2D,
-  [ 517] = 0x6681, [ 518] = 0x696D, [ 519] = 0x5C40, [ 520] = 0x66F2,
-  [ 521] = 0x6975, [ 522] = 0x7389, [ 523] = 0x6850, [ 524] = 0x7C81,
-  [ 525] = 0x50C5, [ 526] = 0x52E4, [ 527] = 0x5747, [ 528] = 0x5DFE,
-  [ 529] = 0x9326, [ 530] = 0x65A4, [ 531] = 0x6B23, [ 532] = 0x6B3D,
-  [ 533] = 0x7434, [ 534] = 0x7981, [ 535] = 0x79BD, [ 536] = 0x7B4B,
-  [ 537] = 0x7DCA, [ 538] = 0x82B9, [ 539] = 0x83CC, [ 540] = 0x887F,
-  [ 541] = 0x895F, [ 542] = 0x8B39, [ 543] = 0x8FD1, [ 544] = 0x91D1,
-  [ 545] = 0x541F, [ 546] = 0x9280, [ 547] = 0x4E5D, [ 548] = 0x5036,
-  [ 549] = 0x53E5, [ 550] = 0x533A, [ 551] = 0x72D7, [ 552] = 0x7396,
-  [ 553] = 0x77E9, [ 554] = 0x82E6, [ 555] = 0x8EAF, [ 556] = 0x99C6,
-  [ 557] = 0x99C8, [ 558] = 0x99D2, [ 559] = 0x5177, [ 560] = 0x611A,
-  [ 561] = 0x865E, [ 562] = 0x55B0, [ 563] = 0x7A7A, [ 564] = 0x5076,
-  [ 565] = 0x5BD3, [ 566] = 0x9047, [ 567] = 0x9685, [ 568] = 0x4E32,
-  [ 569] = 0x6ADB, [ 570] = 0x91E7, [ 571] = 0x5C51, [ 572] = 0x5C48,
-  [ 576] = 0x6398, [ 577] = 0x7A9F, [ 578] = 0x6C93, [ 579] = 0x9774,
-  [ 580] = 0x8F61, [ 581] = 0x7AAA, [ 582] = 0x718A, [ 583] = 0x9688,
-  [ 584] = 0x7C82, [ 585] = 0x6817, [ 586] = 0x7E70, [ 587] = 0x6851,
-  [ 588] = 0x936C, [ 589] = 0x52F2, [ 590] = 0x541B, [ 591] = 0x85AB,
-  [ 592] = 0x8A13, [ 593] = 0x7FA4, [ 594] = 0x8ECD, [ 595] = 0x90E1,
-  [ 596] = 0x5366, [ 597] = 0x8888, [ 598] = 0x7941, [ 599] = 0x4FC2,
-  [ 600] = 0x50BE, [ 601] = 0x5211, [ 602] = 0x5144, [ 603] = 0x5553,
-  [ 604] = 0x572D, [ 605] = 0x73EA, [ 606] = 0x578B, [ 607] = 0x5951,
-  [ 608] = 0x5F62, [ 609] = 0x5F84, [ 610] = 0x6075, [ 611] = 0x6176,
-  [ 612] = 0x6167, [ 613] = 0x61A9, [ 614] = 0x63B2, [ 615] = 0x643A,
-  [ 616] = 0x656C, [ 617] = 0x666F, [ 618] = 0x6842, [ 619] = 0x6E13,
-  [ 620] = 0x7566, [ 621] = 0x7A3D, [ 622] = 0x7CFB, [ 623] = 0x7D4C,
-  [ 624] = 0x7D99, [ 625] = 0x7E4B, [ 626] = 0x7F6B, [ 627] = 0x830E,
-  [ 628] = 0x834A, [ 629] = 0x86CD, [ 630] = 0x8A08, [ 631] = 0x8A63,
-  [ 632] = 0x8B66, [ 633] = 0x8EFD, [ 634] = 0x981A, [ 635] = 0x9D8F,
-  [ 636] = 0x82B8, [ 637] = 0x8FCE, [ 638] = 0x9BE8, [ 640] = 0x5287,
-  [ 641] = 0x621F, [ 642] = 0x6483, [ 643] = 0x6FC0, [ 644] = 0x9699,
-  [ 645] = 0x6841, [ 646] = 0x5091, [ 647] = 0x6B20, [ 648] = 0x6C7A,
-  [ 649] = 0x6F54, [ 650] = 0x7A74, [ 651] = 0x7D50, [ 652] = 0x8840,
-  [ 653] = 0x8A23, [ 654] = 0x6708, [ 655] = 0x4EF6, [ 656] = 0x5039,
-  [ 657] = 0x5026, [ 658] = 0x5065, [ 659] = 0x517C, [ 660] = 0x5238,
-  [ 661] = 0x5263, [ 662] = 0x55A7, [ 663] = 0x570F, [ 664] = 0x5805,
-  [ 665] = 0x5ACC, [ 666] = 0x5EFA, [ 667] = 0x61B2, [ 668] = 0x61F8,
-  [ 669] = 0x62F3, [ 670] = 0x6372, [ 671] = 0x691C, [ 672] = 0x6A29,
-  [ 673] = 0x727D, [ 674] = 0x72AC, [ 675] = 0x732E, [ 676] = 0x7814,
-  [ 677] = 0x786F, [ 678] = 0x7D79, [ 679] = 0x770C, [ 680] = 0x80A9,
-  [ 681] = 0x898B, [ 682] = 0x8B19, [ 683] = 0x8CE2, [ 684] = 0x8ED2,
-  [ 685] = 0x9063, [ 686] = 0x9375, [ 687] = 0x967A, [ 688] = 0x9855,
-  [ 689] = 0x9A13, [ 690] = 0x9E78, [ 691] = 0x5143, [ 692] = 0x539F,
-  [ 693] = 0x53B3, [ 694] = 0x5E7B, [ 695] = 0x5F26, [ 696] = 0x6E1B,
-  [ 697] = 0x6E90, [ 698] = 0x7384, [ 699] = 0x73FE, [ 700] = 0x7D43,
-  [ 701] = 0x8237, [ 702] = 0x8A00, [ 703] = 0x8AFA, [ 704] = 0x9650,
-  [ 705] = 0x4E4E, [ 706] = 0x500B, [ 707] = 0x53E4, [ 708] = 0x547C,
-  [ 709] = 0x56FA, [ 710] = 0x59D1, [ 711] = 0x5B64, [ 712] = 0x5DF1,
-  [ 713] = 0x5EAB, [ 714] = 0x5F27, [ 715] = 0x6238, [ 716] = 0x6545,
-  [ 717] = 0x67AF, [ 718] = 0x6E56, [ 719] = 0x72D0, [ 720] = 0x7CCA,
-  [ 721] = 0x88B4, [ 722] = 0x80A1, [ 723] = 0x80E1, [ 724] = 0x83F0,
-  [ 725] = 0x864E, [ 726] = 0x8A87, [ 727] = 0x8DE8, [ 728] = 0x9237,
-  [ 729] = 0x96C7, [ 730] = 0x9867, [ 731] = 0x9F13, [ 732] = 0x4E94,
-  [ 733] = 0x4E92, [ 734] = 0x4F0D, [ 735] = 0x5348, [ 736] = 0x5449,
-  [ 737] = 0x543E, [ 738] = 0x5A2F, [ 739] = 0x5F8C, [ 740] = 0x5FA1,
-  [ 741] = 0x609F, [ 742] = 0x68A7, [ 743] = 0x6A8E, [ 744] = 0x745A,
-  [ 745] = 0x7881, [ 746] = 0x8A9E, [ 747] = 0x8AA4, [ 748] = 0x8B77,
-  [ 749] = 0x9190, [ 750] = 0x4E5E, [ 751] = 0x9BC9, [ 752] = 0x4EA4,
-  [ 753] = 0x4F7C, [ 754] = 0x4FAF, [ 755] = 0x5019, [ 756] = 0x5016,
-  [ 757] = 0x5149, [ 758] = 0x516C, [ 759] = 0x529F, [ 760] = 0x52B9,
-  [ 761] = 0x52FE, [ 762] = 0x539A, [ 763] = 0x53E3, [ 764] = 0x5411,
-  [ 768] = 0x540E, [ 769] = 0x5589, [ 770] = 0x5751, [ 771] = 0x57A2,
-  [ 772] = 0x597D, [ 773] = 0x5B54, [ 774] = 0x5B5D, [ 775] = 0x5B8F,
-  [ 776] = 0x5DE5, [ 777] = 0x5DE7, [ 778] = 0x5DF7, [ 779] = 0x5E78,
-  [ 780] = 0x5E83, [ 781] = 0x5E9A, [ 782] = 0x5EB7, [ 783] = 0x5F18,
-  [ 784] = 0x6052, [ 785] = 0x614C, [ 786] = 0x6297, [ 787] = 0x62D8,
-  [ 788] = 0x63A7, [ 789] = 0x653B, [ 790] = 0x6602, [ 791] = 0x6643,
-  [ 792] = 0x66F4, [ 793] = 0x676D, [ 794] = 0x6821, [ 795] = 0x6897,
-  [ 796] = 0x69CB, [ 797] = 0x6C5F, [ 798] = 0x6D2A, [ 799] = 0x6D69,
-  [ 800] = 0x6E2F, [ 801] = 0x6E9D, [ 802] = 0x7532, [ 803] = 0x7687,
-  [ 804] = 0x786C, [ 805] = 0x7A3F, [ 806] = 0x7CE0, [ 807] = 0x7D05,
-  [ 808] = 0x7D18, [ 809] = 0x7D5E, [ 810] = 0x7DB1, [ 811] = 0x8015,
-  [ 812] = 0x8003, [ 813] = 0x80AF, [ 814] = 0x80B1, [ 815] = 0x8154,
-  [ 816] = 0x818F, [ 817] = 0x822A, [ 818] = 0x8352, [ 819] = 0x884C,
-  [ 820] = 0x8861, [ 821] = 0x8B1B, [ 822] = 0x8CA2, [ 823] = 0x8CFC,
-  [ 824] = 0x90CA, [ 825] = 0x9175, [ 826] = 0x9271, [ 827] = 0x783F,
-  [ 828] = 0x92FC, [ 829] = 0x95A4, [ 830] = 0x964D, [ 832] = 0x9805,
-  [ 833] = 0x9999, [ 834] = 0x9AD8, [ 835] = 0x9D3B, [ 836] = 0x525B,
-  [ 837] = 0x52AB, [ 838] = 0x53F7, [ 839] = 0x5408, [ 840] = 0x58D5,
-  [ 841] = 0x62F7, [ 842] = 0x6FE0, [ 843] = 0x8C6A, [ 844] = 0x8F5F,
-  [ 845] = 0x9EB9, [ 846] = 0x514B, [ 847] = 0x523B, [ 848] = 0x544A,
-  [ 849] = 0x56FD, [ 850] = 0x7A40, [ 851] = 0x9177, [ 852] = 0x9D60,
-  [ 853] = 0x9ED2, [ 854] = 0x7344, [ 855] = 0x6F09, [ 856] = 0x8170,
-  [ 857] = 0x7511, [ 858] = 0x5FFD, [ 859] = 0x60DA, [ 860] = 0x9AA8,
-  [ 861] = 0x72DB, [ 862] = 0x8FBC, [ 863] = 0x6B64, [ 864] = 0x9803,
-  [ 865] = 0x4ECA, [ 866] = 0x56F0, [ 867] = 0x5764, [ 868] = 0x58BE,
-  [ 869] = 0x5A5A, [ 870] = 0x6068, [ 871] = 0x61C7, [ 872] = 0x660F,
-  [ 873] = 0x6606, [ 874] = 0x6839, [ 875] = 0x68B1, [ 876] = 0x6DF7,
-  [ 877] = 0x75D5, [ 878] = 0x7D3A, [ 879] = 0x826E, [ 880] = 0x9B42,
-  [ 881] = 0x4E9B, [ 882] = 0x4F50, [ 883] = 0x53C9, [ 884] = 0x5506,
-  [ 885] = 0x5D6F, [ 886] = 0x5DE6, [ 887] = 0x5DEE, [ 888] = 0x67FB,
-  [ 889] = 0x6C99, [ 890] = 0x7473, [ 891] = 0x7802, [ 892] = 0x8A50,
-  [ 893] = 0x9396, [ 894] = 0x88DF, [ 895] = 0x5750, [ 896] = 0x5EA7,
-  [ 897] = 0x632B, [ 898] = 0x50B5, [ 899] = 0x50AC, [ 900] = 0x518D,
-  [ 901] = 0x6700, [ 902] = 0x54C9, [ 903] = 0x585E, [ 904] = 0x59BB,
-  [ 905] = 0x5BB0, [ 906] = 0x5F69, [ 907] = 0x624D, [ 908] = 0x63A1,
-  [ 909] = 0x683D, [ 910] = 0x6B73, [ 911] = 0x6E08, [ 912] = 0x707D,
-  [ 913] = 0x91C7, [ 914] = 0x7280, [ 915] = 0x7815, [ 916] = 0x7826,
-  [ 917] = 0x796D, [ 918] = 0x658E, [ 919] = 0x7D30, [ 920] = 0x83DC,
-  [ 921] = 0x88C1, [ 922] = 0x8F09, [ 923] = 0x969B, [ 924] = 0x5264,
-  [ 925] = 0x5728, [ 926] = 0x6750, [ 927] = 0x7F6A, [ 928] = 0x8CA1,
-  [ 929] = 0x51B4, [ 930] = 0x5742, [ 931] = 0x962A, [ 932] = 0x583A,
-  [ 933] = 0x698A, [ 934] = 0x80B4, [ 935] = 0x54B2, [ 936] = 0x5D0E,
-  [ 937] = 0x57FC, [ 938] = 0x7895, [ 939] = 0x9DFA, [ 940] = 0x4F5C,
-  [ 941] = 0x524A, [ 942] = 0x548B, [ 943] = 0x643E, [ 944] = 0x6628,
-  [ 945] = 0x6714, [ 946] = 0x67F5, [ 947] = 0x7A84, [ 948] = 0x7B56,
-  [ 949] = 0x7D22, [ 950] = 0x932F, [ 951] = 0x685C, [ 952] = 0x9BAD,
-  [ 953] = 0x7B39, [ 954] = 0x5319, [ 955] = 0x518A, [ 956] = 0x5237,
-  [ 960] = 0x5BDF, [ 961] = 0x62F6, [ 962] = 0x64AE, [ 963] = 0x64E6,
-  [ 964] = 0x672D, [ 965] = 0x6BBA, [ 966] = 0x85A9, [ 967] = 0x96D1,
-  [ 968] = 0x7690, [ 969] = 0x9BD6, [ 970] = 0x634C, [ 971] = 0x9306,
-  [ 972] = 0x9BAB, [ 973] = 0x76BF, [ 974] = 0x6652, [ 975] = 0x4E09,
-  [ 976] = 0x5098, [ 977] = 0x53C2, [ 978] = 0x5C71, [ 979] = 0x60E8,
-  [ 980] = 0x6492, [ 981] = 0x6563, [ 982] = 0x685F, [ 983] = 0x71E6,
-  [ 984] = 0x73CA, [ 985] = 0x7523, [ 986] = 0x7B97, [ 987] = 0x7E82,
-  [ 988] = 0x8695, [ 989] = 0x8B83, [ 990] = 0x8CDB, [ 991] = 0x9178,
-  [ 992] = 0x9910, [ 993] = 0x65AC, [ 994] = 0x66AB, [ 995] = 0x6B8B,
-  [ 996] = 0x4ED5, [ 997] = 0x4ED4, [ 998] = 0x4F3A, [ 999] = 0x4F7F,
-  [1000] = 0x523A, [1001] = 0x53F8, [1002] = 0x53F2, [1003] = 0x55E3,
-  [1004] = 0x56DB, [1005] = 0x58EB, [1006] = 0x59CB, [1007] = 0x59C9,
-  [1008] = 0x59FF, [1009] = 0x5B50, [1010] = 0x5C4D, [1011] = 0x5E02,
-  [1012] = 0x5E2B, [1013] = 0x5FD7, [1014] = 0x601D, [1015] = 0x6307,
-  [1016] = 0x652F, [1017] = 0x5B5C, [1018] = 0x65AF, [1019] = 0x65BD,
-  [1020] = 0x65E8, [1021] = 0x679D, [1022] = 0x6B62, [1024] = 0x6B7B,
-  [1025] = 0x6C0F, [1026] = 0x7345, [1027] = 0x7949, [1028] = 0x79C1,
-  [1029] = 0x7CF8, [1030] = 0x7D19, [1031] = 0x7D2B, [1032] = 0x80A2,
-  [1033] = 0x8102, [1034] = 0x81F3, [1035] = 0x8996, [1036] = 0x8A5E,
-  [1037] = 0x8A69, [1038] = 0x8A66, [1039] = 0x8A8C, [1040] = 0x8AEE,
-  [1041] = 0x8CC7, [1042] = 0x8CDC, [1043] = 0x96CC, [1044] = 0x98FC,
-  [1045] = 0x6B6F, [1046] = 0x4E8B, [1047] = 0x4F3C, [1048] = 0x4F8D,
-  [1049] = 0x5150, [1050] = 0x5B57, [1051] = 0x5BFA, [1052] = 0x6148,
-  [1053] = 0x6301, [1054] = 0x6642, [1055] = 0x6B21, [1056] = 0x6ECB,
-  [1057] = 0x6CBB, [1058] = 0x723E, [1059] = 0x74BD, [1060] = 0x75D4,
-  [1061] = 0x78C1, [1062] = 0x793A, [1063] = 0x800C, [1064] = 0x8033,
-  [1065] = 0x81EA, [1066] = 0x8494, [1067] = 0x8F9E, [1068] = 0x6C50,
-  [1069] = 0x9E7F, [1070] = 0x5F0F, [1071] = 0x8B58, [1072] = 0x9D2B,
-  [1073] = 0x7AFA, [1074] = 0x8EF8, [1075] = 0x5B8D, [1076] = 0x96EB,
-  [1077] = 0x4E03, [1078] = 0x53F1, [1079] = 0x57F7, [1080] = 0x5931,
-  [1081] = 0x5AC9, [1082] = 0x5BA4, [1083] = 0x6089, [1084] = 0x6E7F,
-  [1085] = 0x6F06, [1086] = 0x75BE, [1087] = 0x8CEA, [1088] = 0x5B9F,
-  [1089] = 0x8500, [1090] = 0x7BE0, [1091] = 0x5072, [1092] = 0x67F4,
-  [1093] = 0x829D, [1094] = 0x5C61, [1095] = 0x854A, [1096] = 0x7E1E,
-  [1097] = 0x820E, [1098] = 0x5199, [1099] = 0x5C04, [1100] = 0x6368,
-  [1101] = 0x8D66, [1102] = 0x659C, [1103] = 0x716E, [1104] = 0x793E,
-  [1105] = 0x7D17, [1106] = 0x8005, [1107] = 0x8B1D, [1108] = 0x8ECA,
-  [1109] = 0x906E, [1110] = 0x86C7, [1111] = 0x90AA, [1112] = 0x501F,
-  [1113] = 0x52FA, [1114] = 0x5C3A, [1115] = 0x6753, [1116] = 0x707C,
-  [1117] = 0x7235, [1118] = 0x914C, [1119] = 0x91C8, [1120] = 0x932B,
-  [1121] = 0x82E5, [1122] = 0x5BC2, [1123] = 0x5F31, [1124] = 0x60F9,
-  [1125] = 0x4E3B, [1126] = 0x53D6, [1127] = 0x5B88, [1128] = 0x624B,
-  [1129] = 0x6731, [1130] = 0x6B8A, [1131] = 0x72E9, [1132] = 0x73E0,
-  [1133] = 0x7A2E, [1134] = 0x816B, [1135] = 0x8DA3, [1136] = 0x9152,
-  [1137] = 0x9996, [1138] = 0x5112, [1139] = 0x53D7, [1140] = 0x546A,
-  [1141] = 0x5BFF, [1142] = 0x6388, [1143] = 0x6A39, [1144] = 0x7DAC,
-  [1145] = 0x9700, [1146] = 0x56DA, [1147] = 0x53CE, [1148] = 0x5468,
-  [1152] = 0x5B97, [1153] = 0x5C31, [1154] = 0x5DDE, [1155] = 0x4FEE,
-  [1156] = 0x6101, [1157] = 0x62FE, [1158] = 0x6D32, [1159] = 0x79C0,
-  [1160] = 0x79CB, [1161] = 0x7D42, [1162] = 0x7E4D, [1163] = 0x7FD2,
-  [1164] = 0x81ED, [1165] = 0x821F, [1166] = 0x8490, [1167] = 0x8846,
-  [1168] = 0x8972, [1169] = 0x8B90, [1170] = 0x8E74, [1171] = 0x8F2F,
-  [1172] = 0x9031, [1173] = 0x914B, [1174] = 0x916C, [1175] = 0x96C6,
-  [1176] = 0x919C, [1177] = 0x4EC0, [1178] = 0x4F4F, [1179] = 0x5145,
-  [1180] = 0x5341, [1181] = 0x5F93, [1182] = 0x620E, [1183] = 0x67D4,
-  [1184] = 0x6C41, [1185] = 0x6E0B, [1186] = 0x7363, [1187] = 0x7E26,
-  [1188] = 0x91CD, [1189] = 0x9283, [1190] = 0x53D4, [1191] = 0x5919,
-  [1192] = 0x5BBF, [1193] = 0x6DD1, [1194] = 0x795D, [1195] = 0x7E2E,
-  [1196] = 0x7C9B, [1197] = 0x587E, [1198] = 0x719F, [1199] = 0x51FA,
-  [1200] = 0x8853, [1201] = 0x8FF0, [1202] = 0x4FCA, [1203] = 0x5CFB,
-  [1204] = 0x6625, [1205] = 0x77AC, [1206] = 0x7AE3, [1207] = 0x821C,
-  [1208] = 0x99FF, [1209] = 0x51C6, [1210] = 0x5FAA, [1211] = 0x65EC,
-  [1212] = 0x696F, [1213] = 0x6B89, [1214] = 0x6DF3, [1216] = 0x6E96,
-  [1217] = 0x6F64, [1218] = 0x76FE, [1219] = 0x7D14, [1220] = 0x5DE1,
-  [1221] = 0x9075, [1222] = 0x9187, [1223] = 0x9806, [1224] = 0x51E6,
-  [1225] = 0x521D, [1226] = 0x6240, [1227] = 0x6691, [1228] = 0x66D9,
-  [1229] = 0x6E1A, [1230] = 0x5EB6, [1231] = 0x7DD2, [1232] = 0x7F72,
-  [1233] = 0x66F8, [1234] = 0x85AF, [1235] = 0x85F7, [1236] = 0x8AF8,
-  [1237] = 0x52A9, [1238] = 0x53D9, [1239] = 0x5973, [1240] = 0x5E8F,
-  [1241] = 0x5F90, [1242] = 0x6055, [1243] = 0x92E4, [1244] = 0x9664,
-  [1245] = 0x50B7, [1246] = 0x511F, [1247] = 0x52DD, [1248] = 0x5320,
-  [1249] = 0x5347, [1250] = 0x53EC, [1251] = 0x54E8, [1252] = 0x5546,
-  [1253] = 0x5531, [1254] = 0x5617, [1255] = 0x5968, [1256] = 0x59BE,
-  [1257] = 0x5A3C, [1258] = 0x5BB5, [1259] = 0x5C06, [1260] = 0x5C0F,
-  [1261] = 0x5C11, [1262] = 0x5C1A, [1263] = 0x5E84, [1264] = 0x5E8A,
-  [1265] = 0x5EE0, [1266] = 0x5F70, [1267] = 0x627F, [1268] = 0x6284,
-  [1269] = 0x62DB, [1270] = 0x638C, [1271] = 0x6377, [1272] = 0x6607,
-  [1273] = 0x660C, [1274] = 0x662D, [1275] = 0x6676, [1276] = 0x677E,
-  [1277] = 0x68A2, [1278] = 0x6A1F, [1279] = 0x6A35, [1280] = 0x6CBC,
-  [1281] = 0x6D88, [1282] = 0x6E09, [1283] = 0x6E58, [1284] = 0x713C,
-  [1285] = 0x7126, [1286] = 0x7167, [1287] = 0x75C7, [1288] = 0x7701,
-  [1289] = 0x785D, [1290] = 0x7901, [1291] = 0x7965, [1292] = 0x79F0,
-  [1293] = 0x7AE0, [1294] = 0x7B11, [1295] = 0x7CA7, [1296] = 0x7D39,
-  [1297] = 0x8096, [1298] = 0x83D6, [1299] = 0x848B, [1300] = 0x8549,
-  [1301] = 0x885D, [1302] = 0x88F3, [1303] = 0x8A1F, [1304] = 0x8A3C,
-  [1305] = 0x8A54, [1306] = 0x8A73, [1307] = 0x8C61, [1308] = 0x8CDE,
-  [1309] = 0x91A4, [1310] = 0x9266, [1311] = 0x937E, [1312] = 0x9418,
-  [1313] = 0x969C, [1314] = 0x9798, [1315] = 0x4E0A, [1316] = 0x4E08,
-  [1317] = 0x4E1E, [1318] = 0x4E57, [1319] = 0x5197, [1320] = 0x5270,
-  [1321] = 0x57CE, [1322] = 0x5834, [1323] = 0x58CC, [1324] = 0x5B22,
-  [1325] = 0x5E38, [1326] = 0x60C5, [1327] = 0x64FE, [1328] = 0x6761,
-  [1329] = 0x6756, [1330] = 0x6D44, [1331] = 0x72B6, [1332] = 0x7573,
-  [1333] = 0x7A63, [1334] = 0x84B8, [1335] = 0x8B72, [1336] = 0x91B8,
-  [1337] = 0x9320, [1338] = 0x5631, [1339] = 0x57F4, [1340] = 0x98FE,
-  [1344] = 0x62ED, [1345] = 0x690D, [1346] = 0x6B96, [1347] = 0x71ED,
-  [1348] = 0x7E54, [1349] = 0x8077, [1350] = 0x8272, [1351] = 0x89E6,
-  [1352] = 0x98DF, [1353] = 0x8755, [1354] = 0x8FB1, [1355] = 0x5C3B,
-  [1356] = 0x4F38, [1357] = 0x4FE1, [1358] = 0x4FB5, [1359] = 0x5507,
-  [1360] = 0x5A20, [1361] = 0x5BDD, [1362] = 0x5BE9, [1363] = 0x5FC3,
-  [1364] = 0x614E, [1365] = 0x632F, [1366] = 0x65B0, [1367] = 0x664B,
-  [1368] = 0x68EE, [1369] = 0x699B, [1370] = 0x6D78, [1371] = 0x6DF1,
-  [1372] = 0x7533, [1373] = 0x75B9, [1374] = 0x771F, [1375] = 0x795E,
-  [1376] = 0x79E6, [1377] = 0x7D33, [1378] = 0x81E3, [1379] = 0x82AF,
-  [1380] = 0x85AA, [1381] = 0x89AA, [1382] = 0x8A3A, [1383] = 0x8EAB,
-  [1384] = 0x8F9B, [1385] = 0x9032, [1386] = 0x91DD, [1387] = 0x9707,
-  [1388] = 0x4EBA, [1389] = 0x4EC1, [1390] = 0x5203, [1391] = 0x5875,
-  [1392] = 0x58EC, [1393] = 0x5C0B, [1394] = 0x751A, [1395] = 0x5C3D,
-  [1396] = 0x814E, [1397] = 0x8A0A, [1398] = 0x8FC5, [1399] = 0x9663,
-  [1400] = 0x976D, [1401] = 0x7B25, [1402] = 0x8ACF, [1403] = 0x9808,
-  [1404] = 0x9162, [1405] = 0x56F3, [1406] = 0x53A8, [1408] = 0x9017,
-  [1409] = 0x5439, [1410] = 0x5782, [1411] = 0x5E25, [1412] = 0x63A8,
-  [1413] = 0x6C34, [1414] = 0x708A, [1415] = 0x7761, [1416] = 0x7C8B,
-  [1417] = 0x7FE0, [1418] = 0x8870, [1419] = 0x9042, [1420] = 0x9154,
-  [1421] = 0x9310, [1422] = 0x9318, [1423] = 0x968F, [1424] = 0x745E,
-  [1425] = 0x9AC4, [1426] = 0x5D07, [1427] = 0x5D69, [1428] = 0x6570,
-  [1429] = 0x67A2, [1430] = 0x8DA8, [1431] = 0x96DB, [1432] = 0x636E,
-  [1433] = 0x6749, [1434] = 0x6919, [1435] = 0x83C5, [1436] = 0x9817,
-  [1437] = 0x96C0, [1438] = 0x88FE, [1439] = 0x6F84, [1440] = 0x647A,
-  [1441] = 0x5BF8, [1442] = 0x4E16, [1443] = 0x702C, [1444] = 0x755D,
-  [1445] = 0x662F, [1446] = 0x51C4, [1447] = 0x5236, [1448] = 0x52E2,
-  [1449] = 0x59D3, [1450] = 0x5F81, [1451] = 0x6027, [1452] = 0x6210,
-  [1453] = 0x653F, [1454] = 0x6574, [1455] = 0x661F, [1456] = 0x6674,
-  [1457] = 0x68F2, [1458] = 0x6816, [1459] = 0x6B63, [1460] = 0x6E05,
-  [1461] = 0x7272, [1462] = 0x751F, [1463] = 0x76DB, [1464] = 0x7CBE,
-  [1465] = 0x8056, [1466] = 0x58F0, [1467] = 0x88FD, [1468] = 0x897F,
-  [1469] = 0x8AA0, [1470] = 0x8A93, [1471] = 0x8ACB, [1472] = 0x901D,
-  [1473] = 0x9192, [1474] = 0x9752, [1475] = 0x9759, [1476] = 0x6589,
-  [1477] = 0x7A0E, [1478] = 0x8106, [1479] = 0x96BB, [1480] = 0x5E2D,
-  [1481] = 0x60DC, [1482] = 0x621A, [1483] = 0x65A5, [1484] = 0x6614,
-  [1485] = 0x6790, [1486] = 0x77F3, [1487] = 0x7A4D, [1488] = 0x7C4D,
-  [1489] = 0x7E3E, [1490] = 0x810A, [1491] = 0x8CAC, [1492] = 0x8D64,
-  [1493] = 0x8DE1, [1494] = 0x8E5F, [1495] = 0x78A9, [1496] = 0x5207,
-  [1497] = 0x62D9, [1498] = 0x63A5, [1499] = 0x6442, [1500] = 0x6298,
-  [1501] = 0x8A2D, [1502] = 0x7A83, [1503] = 0x7BC0, [1504] = 0x8AAC,
-  [1505] = 0x96EA, [1506] = 0x7D76, [1507] = 0x820C, [1508] = 0x8749,
-  [1509] = 0x4ED9, [1510] = 0x5148, [1511] = 0x5343, [1512] = 0x5360,
-  [1513] = 0x5BA3, [1514] = 0x5C02, [1515] = 0x5C16, [1516] = 0x5DDD,
-  [1517] = 0x6226, [1518] = 0x6247, [1519] = 0x64B0, [1520] = 0x6813,
-  [1521] = 0x6834, [1522] = 0x6CC9, [1523] = 0x6D45, [1524] = 0x6D17,
-  [1525] = 0x67D3, [1526] = 0x6F5C, [1527] = 0x714E, [1528] = 0x717D,
-  [1529] = 0x65CB, [1530] = 0x7A7F, [1531] = 0x7BAD, [1532] = 0x7DDA,
-  [1536] = 0x7E4A, [1537] = 0x7FA8, [1538] = 0x817A, [1539] = 0x821B,
-  [1540] = 0x8239, [1541] = 0x85A6, [1542] = 0x8A6E, [1543] = 0x8CCE,
-  [1544] = 0x8DF5, [1545] = 0x9078, [1546] = 0x9077, [1547] = 0x92AD,
-  [1548] = 0x9291, [1549] = 0x9583, [1550] = 0x9BAE, [1551] = 0x524D,
-  [1552] = 0x5584, [1553] = 0x6F38, [1554] = 0x7136, [1555] = 0x5168,
-  [1556] = 0x7985, [1557] = 0x7E55, [1558] = 0x81B3, [1559] = 0x7CCE,
-  [1560] = 0x564C, [1561] = 0x5851, [1562] = 0x5CA8, [1563] = 0x63AA,
-  [1564] = 0x66FE, [1565] = 0x66FD, [1566] = 0x695A, [1567] = 0x72D9,
-  [1568] = 0x758F, [1569] = 0x758E, [1570] = 0x790E, [1571] = 0x7956,
-  [1572] = 0x79DF, [1573] = 0x7C97, [1574] = 0x7D20, [1575] = 0x7D44,
-  [1576] = 0x8607, [1577] = 0x8A34, [1578] = 0x963B, [1579] = 0x9061,
-  [1580] = 0x9F20, [1581] = 0x50E7, [1582] = 0x5275, [1583] = 0x53CC,
-  [1584] = 0x53E2, [1585] = 0x5009, [1586] = 0x55AA, [1587] = 0x58EE,
-  [1588] = 0x594F, [1589] = 0x723D, [1590] = 0x5B8B, [1591] = 0x5C64,
-  [1592] = 0x531D, [1593] = 0x60E3, [1594] = 0x60F3, [1595] = 0x635C,
-  [1596] = 0x6383, [1597] = 0x633F, [1598] = 0x63BB, [1600] = 0x64CD,
-  [1601] = 0x65E9, [1602] = 0x66F9, [1603] = 0x5DE3, [1604] = 0x69CD,
-  [1605] = 0x69FD, [1606] = 0x6F15, [1607] = 0x71E5, [1608] = 0x4E89,
-  [1609] = 0x75E9, [1610] = 0x76F8, [1611] = 0x7A93, [1612] = 0x7CDF,
-  [1613] = 0x7DCF, [1614] = 0x7D9C, [1615] = 0x8061, [1616] = 0x8349,
-  [1617] = 0x8358, [1618] = 0x846C, [1619] = 0x84BC, [1620] = 0x85FB,
-  [1621] = 0x88C5, [1622] = 0x8D70, [1623] = 0x9001, [1624] = 0x906D,
-  [1625] = 0x9397, [1626] = 0x971C, [1627] = 0x9A12, [1628] = 0x50CF,
-  [1629] = 0x5897, [1630] = 0x618E, [1631] = 0x81D3, [1632] = 0x8535,
-  [1633] = 0x8D08, [1634] = 0x9020, [1635] = 0x4FC3, [1636] = 0x5074,
-  [1637] = 0x5247, [1638] = 0x5373, [1639] = 0x606F, [1640] = 0x6349,
-  [1641] = 0x675F, [1642] = 0x6E2C, [1643] = 0x8DB3, [1644] = 0x901F,
-  [1645] = 0x4FD7, [1646] = 0x5C5E, [1647] = 0x8CCA, [1648] = 0x65CF,
-  [1649] = 0x7D9A, [1650] = 0x5352, [1651] = 0x8896, [1652] = 0x5176,
-  [1653] = 0x63C3, [1654] = 0x5B58, [1655] = 0x5B6B, [1656] = 0x5C0A,
-  [1657] = 0x640D, [1658] = 0x6751, [1659] = 0x905C, [1660] = 0x4ED6,
-  [1661] = 0x591A, [1662] = 0x592A, [1663] = 0x6C70, [1664] = 0x8A51,
-  [1665] = 0x553E, [1666] = 0x5815, [1667] = 0x59A5, [1668] = 0x60F0,
-  [1669] = 0x6253, [1670] = 0x67C1, [1671] = 0x8235, [1672] = 0x6955,
-  [1673] = 0x9640, [1674] = 0x99C4, [1675] = 0x9A28, [1676] = 0x4F53,
-  [1677] = 0x5806, [1678] = 0x5BFE, [1679] = 0x8010, [1680] = 0x5CB1,
-  [1681] = 0x5E2F, [1682] = 0x5F85, [1683] = 0x6020, [1684] = 0x614B,
-  [1685] = 0x6234, [1686] = 0x66FF, [1687] = 0x6CF0, [1688] = 0x6EDE,
-  [1689] = 0x80CE, [1690] = 0x817F, [1691] = 0x82D4, [1692] = 0x888B,
-  [1693] = 0x8CB8, [1694] = 0x9000, [1695] = 0x902E, [1696] = 0x968A,
-  [1697] = 0x9EDB, [1698] = 0x9BDB, [1699] = 0x4EE3, [1700] = 0x53F0,
-  [1701] = 0x5927, [1702] = 0x7B2C, [1703] = 0x918D, [1704] = 0x984C,
-  [1705] = 0x9DF9, [1706] = 0x6EDD, [1707] = 0x7027, [1708] = 0x5353,
-  [1709] = 0x5544, [1710] = 0x5B85, [1711] = 0x6258, [1712] = 0x629E,
-  [1713] = 0x62D3, [1714] = 0x6CA2, [1715] = 0x6FEF, [1716] = 0x7422,
-  [1717] = 0x8A17, [1718] = 0x9438, [1719] = 0x6FC1, [1720] = 0x8AFE,
-  [1721] = 0x8338, [1722] = 0x51E7, [1723] = 0x86F8, [1724] = 0x53EA,
-  [1728] = 0x53E9, [1729] = 0x4F46, [1730] = 0x9054, [1731] = 0x8FB0,
-  [1732] = 0x596A, [1733] = 0x8131, [1734] = 0x5DFD, [1735] = 0x7AEA,
-  [1736] = 0x8FBF, [1737] = 0x68DA, [1738] = 0x8C37, [1739] = 0x72F8,
-  [1740] = 0x9C48, [1741] = 0x6A3D, [1742] = 0x8AB0, [1743] = 0x4E39,
-  [1744] = 0x5358, [1745] = 0x5606, [1746] = 0x5766, [1747] = 0x62C5,
-  [1748] = 0x63A2, [1749] = 0x65E6, [1750] = 0x6B4E, [1751] = 0x6DE1,
-  [1752] = 0x6E5B, [1753] = 0x70AD, [1754] = 0x77ED, [1755] = 0x7AEF,
-  [1756] = 0x7BAA, [1757] = 0x7DBB, [1758] = 0x803D, [1759] = 0x80C6,
-  [1760] = 0x86CB, [1761] = 0x8A95, [1762] = 0x935B, [1763] = 0x56E3,
-  [1764] = 0x58C7, [1765] = 0x5F3E, [1766] = 0x65AD, [1767] = 0x6696,
-  [1768] = 0x6A80, [1769] = 0x6BB5, [1770] = 0x7537, [1771] = 0x8AC7,
-  [1772] = 0x5024, [1773] = 0x77E5, [1774] = 0x5730, [1775] = 0x5F1B,
-  [1776] = 0x6065, [1777] = 0x667A, [1778] = 0x6C60, [1779] = 0x75F4,
-  [1780] = 0x7A1A, [1781] = 0x7F6E, [1782] = 0x81F4, [1783] = 0x8718,
-  [1784] = 0x9045, [1785] = 0x99B3, [1786] = 0x7BC9, [1787] = 0x755C,
-  [1788] = 0x7AF9, [1789] = 0x7B51, [1790] = 0x84C4, [1792] = 0x9010,
-  [1793] = 0x79E9, [1794] = 0x7A92, [1795] = 0x8336, [1796] = 0x5AE1,
-  [1797] = 0x7740, [1798] = 0x4E2D, [1799] = 0x4EF2, [1800] = 0x5B99,
-  [1801] = 0x5FE0, [1802] = 0x62BD, [1803] = 0x663C, [1804] = 0x67F1,
-  [1805] = 0x6CE8, [1806] = 0x866B, [1807] = 0x8877, [1808] = 0x8A3B,
-  [1809] = 0x914E, [1810] = 0x92F3, [1811] = 0x99D0, [1812] = 0x6A17,
-  [1813] = 0x7026, [1814] = 0x732A, [1815] = 0x82E7, [1816] = 0x8457,
-  [1817] = 0x8CAF, [1818] = 0x4E01, [1819] = 0x5146, [1820] = 0x51CB,
-  [1821] = 0x558B, [1822] = 0x5BF5, [1823] = 0x5E16, [1824] = 0x5E33,
-  [1825] = 0x5E81, [1826] = 0x5F14, [1827] = 0x5F35, [1828] = 0x5F6B,
-  [1829] = 0x5FB4, [1830] = 0x61F2, [1831] = 0x6311, [1832] = 0x66A2,
-  [1833] = 0x671D, [1834] = 0x6F6E, [1835] = 0x7252, [1836] = 0x753A,
-  [1837] = 0x773A, [1838] = 0x8074, [1839] = 0x8139, [1840] = 0x8178,
-  [1841] = 0x8776, [1842] = 0x8ABF, [1843] = 0x8ADC, [1844] = 0x8D85,
-  [1845] = 0x8DF3, [1846] = 0x929A, [1847] = 0x9577, [1848] = 0x9802,
-  [1849] = 0x9CE5, [1850] = 0x52C5, [1851] = 0x6357, [1852] = 0x76F4,
-  [1853] = 0x6715, [1854] = 0x6C88, [1855] = 0x73CD, [1856] = 0x8CC3,
-  [1857] = 0x93AE, [1858] = 0x9673, [1859] = 0x6D25, [1860] = 0x589C,
-  [1861] = 0x690E, [1862] = 0x69CC, [1863] = 0x8FFD, [1864] = 0x939A,
-  [1865] = 0x75DB, [1866] = 0x901A, [1867] = 0x585A, [1868] = 0x6802,
-  [1869] = 0x63B4, [1870] = 0x69FB, [1871] = 0x4F43, [1872] = 0x6F2C,
-  [1873] = 0x67D8, [1874] = 0x8FBB, [1875] = 0x8526, [1876] = 0x7DB4,
-  [1877] = 0x9354, [1878] = 0x693F, [1879] = 0x6F70, [1880] = 0x576A,
-  [1881] = 0x58F7, [1882] = 0x5B2C, [1883] = 0x7D2C, [1884] = 0x722A,
-  [1885] = 0x540A, [1886] = 0x91E3, [1887] = 0x9DB4, [1888] = 0x4EAD,
-  [1889] = 0x4F4E, [1890] = 0x505C, [1891] = 0x5075, [1892] = 0x5243,
-  [1893] = 0x8C9E, [1894] = 0x5448, [1895] = 0x5824, [1896] = 0x5B9A,
-  [1897] = 0x5E1D, [1898] = 0x5E95, [1899] = 0x5EAD, [1900] = 0x5EF7,
-  [1901] = 0x5F1F, [1902] = 0x608C, [1903] = 0x62B5, [1904] = 0x633A,
-  [1905] = 0x63D0, [1906] = 0x68AF, [1907] = 0x6C40, [1908] = 0x7887,
-  [1909] = 0x798E, [1910] = 0x7A0B, [1911] = 0x7DE0, [1912] = 0x8247,
-  [1913] = 0x8A02, [1914] = 0x8AE6, [1915] = 0x8E44, [1916] = 0x9013,
-  [1920] = 0x90B8, [1921] = 0x912D, [1922] = 0x91D8, [1923] = 0x9F0E,
-  [1924] = 0x6CE5, [1925] = 0x6458, [1926] = 0x64E2, [1927] = 0x6575,
-  [1928] = 0x6EF4, [1929] = 0x7684, [1930] = 0x7B1B, [1931] = 0x9069,
-  [1932] = 0x93D1, [1933] = 0x6EBA, [1934] = 0x54F2, [1935] = 0x5FB9,
-  [1936] = 0x64A4, [1937] = 0x8F4D, [1938] = 0x8FED, [1939] = 0x9244,
-  [1940] = 0x5178, [1941] = 0x586B, [1942] = 0x5929, [1943] = 0x5C55,
-  [1944] = 0x5E97, [1945] = 0x6DFB, [1946] = 0x7E8F, [1947] = 0x751C,
-  [1948] = 0x8CBC, [1949] = 0x8EE2, [1950] = 0x985B, [1951] = 0x70B9,
-  [1952] = 0x4F1D, [1953] = 0x6BBF, [1954] = 0x6FB1, [1955] = 0x7530,
-  [1956] = 0x96FB, [1957] = 0x514E, [1958] = 0x5410, [1959] = 0x5835,
-  [1960] = 0x5857, [1961] = 0x59AC, [1962] = 0x5C60, [1963] = 0x5F92,
-  [1964] = 0x6597, [1965] = 0x675C, [1966] = 0x6E21, [1967] = 0x767B,
-  [1968] = 0x83DF, [1969] = 0x8CED, [1970] = 0x9014, [1971] = 0x90FD,
-  [1972] = 0x934D, [1973] = 0x7825, [1974] = 0x783A, [1975] = 0x52AA,
-  [1976] = 0x5EA6, [1977] = 0x571F, [1978] = 0x5974, [1979] = 0x6012,
-  [1980] = 0x5012, [1981] = 0x515A, [1982] = 0x51AC, [1984] = 0x51CD,
-  [1985] = 0x5200, [1986] = 0x5510, [1987] = 0x5854, [1988] = 0x5858,
-  [1989] = 0x5957, [1990] = 0x5B95, [1991] = 0x5CF6, [1992] = 0x5D8B,
-  [1993] = 0x60BC, [1994] = 0x6295, [1995] = 0x642D, [1996] = 0x6771,
-  [1997] = 0x6843, [1998] = 0x68BC, [1999] = 0x68DF, [2000] = 0x76D7,
-  [2001] = 0x6DD8, [2002] = 0x6E6F, [2003] = 0x6D9B, [2004] = 0x706F,
-  [2005] = 0x71C8, [2006] = 0x5F53, [2007] = 0x75D8, [2008] = 0x7977,
-  [2009] = 0x7B49, [2010] = 0x7B54, [2011] = 0x7B52, [2012] = 0x7CD6,
-  [2013] = 0x7D71, [2014] = 0x5230, [2015] = 0x8463, [2016] = 0x8569,
-  [2017] = 0x85E4, [2018] = 0x8A0E, [2019] = 0x8B04, [2020] = 0x8C46,
-  [2021] = 0x8E0F, [2022] = 0x9003, [2023] = 0x900F, [2024] = 0x9419,
-  [2025] = 0x9676, [2026] = 0x982D, [2027] = 0x9A30, [2028] = 0x95D8,
-  [2029] = 0x50CD, [2030] = 0x52D5, [2031] = 0x540C, [2032] = 0x5802,
-  [2033] = 0x5C0E, [2034] = 0x61A7, [2035] = 0x649E, [2036] = 0x6D1E,
-  [2037] = 0x77B3, [2038] = 0x7AE5, [2039] = 0x80F4, [2040] = 0x8404,
-  [2041] = 0x9053, [2042] = 0x9285, [2043] = 0x5CE0, [2044] = 0x9D07,
-  [2045] = 0x533F, [2046] = 0x5F97, [2047] = 0x5FB3, [2048] = 0x6D9C,
-  [2049] = 0x7279, [2050] = 0x7763, [2051] = 0x79BF, [2052] = 0x7BE4,
-  [2053] = 0x6BD2, [2054] = 0x72EC, [2055] = 0x8AAD, [2056] = 0x6803,
-  [2057] = 0x6A61, [2058] = 0x51F8, [2059] = 0x7A81, [2060] = 0x6934,
-  [2061] = 0x5C4A, [2062] = 0x9CF6, [2063] = 0x82EB, [2064] = 0x5BC5,
-  [2065] = 0x9149, [2066] = 0x701E, [2067] = 0x5678, [2068] = 0x5C6F,
-  [2069] = 0x60C7, [2070] = 0x6566, [2071] = 0x6C8C, [2072] = 0x8C5A,
-  [2073] = 0x9041, [2074] = 0x9813, [2075] = 0x5451, [2076] = 0x66C7,
-  [2077] = 0x920D, [2078] = 0x5948, [2079] = 0x90A3, [2080] = 0x5185,
-  [2081] = 0x4E4D, [2082] = 0x51EA, [2083] = 0x8599, [2084] = 0x8B0E,
-  [2085] = 0x7058, [2086] = 0x637A, [2087] = 0x934B, [2088] = 0x6962,
-  [2089] = 0x99B4, [2090] = 0x7E04, [2091] = 0x7577, [2092] = 0x5357,
-  [2093] = 0x6960, [2094] = 0x8EDF, [2095] = 0x96E3, [2096] = 0x6C5D,
-  [2097] = 0x4E8C, [2098] = 0x5C3C, [2099] = 0x5F10, [2100] = 0x8FE9,
-  [2101] = 0x5302, [2102] = 0x8CD1, [2103] = 0x8089, [2104] = 0x8679,
-  [2105] = 0x5EFF, [2106] = 0x65E5, [2107] = 0x4E73, [2108] = 0x5165,
-  [2112] = 0x5982, [2113] = 0x5C3F, [2114] = 0x97EE, [2115] = 0x4EFB,
-  [2116] = 0x598A, [2117] = 0x5FCD, [2118] = 0x8A8D, [2119] = 0x6FE1,
-  [2120] = 0x79B0, [2121] = 0x7962, [2122] = 0x5BE7, [2123] = 0x8471,
-  [2124] = 0x732B, [2125] = 0x71B1, [2126] = 0x5E74, [2127] = 0x5FF5,
-  [2128] = 0x637B, [2129] = 0x649A, [2130] = 0x71C3, [2131] = 0x7C98,
-  [2132] = 0x4E43, [2133] = 0x5EFC, [2134] = 0x4E4B, [2135] = 0x57DC,
-  [2136] = 0x56A2, [2137] = 0x60A9, [2138] = 0x6FC3, [2139] = 0x7D0D,
-  [2140] = 0x80FD, [2141] = 0x8133, [2142] = 0x81BF, [2143] = 0x8FB2,
-  [2144] = 0x8997, [2145] = 0x86A4, [2146] = 0x5DF4, [2147] = 0x628A,
-  [2148] = 0x64AD, [2149] = 0x8987, [2150] = 0x6777, [2151] = 0x6CE2,
-  [2152] = 0x6D3E, [2153] = 0x7436, [2154] = 0x7834, [2155] = 0x5A46,
-  [2156] = 0x7F75, [2157] = 0x82AD, [2158] = 0x99AC, [2159] = 0x4FF3,
-  [2160] = 0x5EC3, [2161] = 0x62DD, [2162] = 0x6392, [2163] = 0x6557,
-  [2164] = 0x676F, [2165] = 0x76C3, [2166] = 0x724C, [2167] = 0x80CC,
-  [2168] = 0x80BA, [2169] = 0x8F29, [2170] = 0x914D, [2171] = 0x500D,
-  [2172] = 0x57F9, [2173] = 0x5A92, [2174] = 0x6885, [2176] = 0x6973,
-  [2177] = 0x7164, [2178] = 0x72FD, [2179] = 0x8CB7, [2180] = 0x58F2,
-  [2181] = 0x8CE0, [2182] = 0x966A, [2183] = 0x9019, [2184] = 0x877F,
-  [2185] = 0x79E4, [2186] = 0x77E7, [2187] = 0x8429, [2188] = 0x4F2F,
-  [2189] = 0x5265, [2190] = 0x535A, [2191] = 0x62CD, [2192] = 0x67CF,
-  [2193] = 0x6CCA, [2194] = 0x767D, [2195] = 0x7B94, [2196] = 0x7C95,
-  [2197] = 0x8236, [2198] = 0x8584, [2199] = 0x8FEB, [2200] = 0x66DD,
-  [2201] = 0x6F20, [2202] = 0x7206, [2203] = 0x7E1B, [2204] = 0x83AB,
-  [2205] = 0x99C1, [2206] = 0x9EA6, [2207] = 0x51FD, [2208] = 0x7BB1,
-  [2209] = 0x7872, [2210] = 0x7BB8, [2211] = 0x8087, [2212] = 0x7B48,
-  [2213] = 0x6AE8, [2214] = 0x5E61, [2215] = 0x808C, [2216] = 0x7551,
-  [2217] = 0x7560, [2218] = 0x516B, [2219] = 0x9262, [2220] = 0x6E8C,
-  [2221] = 0x767A, [2222] = 0x9197, [2223] = 0x9AEA, [2224] = 0x4F10,
-  [2225] = 0x7F70, [2226] = 0x629C, [2227] = 0x7B4F, [2228] = 0x95A5,
-  [2229] = 0x9CE9, [2230] = 0x567A, [2231] = 0x5859, [2232] = 0x86E4,
-  [2233] = 0x96BC, [2234] = 0x4F34, [2235] = 0x5224, [2236] = 0x534A,
-  [2237] = 0x53CD, [2238] = 0x53DB, [2239] = 0x5E06, [2240] = 0x642C,
-  [2241] = 0x6591, [2242] = 0x677F, [2243] = 0x6C3E, [2244] = 0x6C4E,
-  [2245] = 0x7248, [2246] = 0x72AF, [2247] = 0x73ED, [2248] = 0x7554,
-  [2249] = 0x7E41, [2250] = 0x822C, [2251] = 0x85E9, [2252] = 0x8CA9,
-  [2253] = 0x7BC4, [2254] = 0x91C6, [2255] = 0x7169, [2256] = 0x9812,
-  [2257] = 0x98EF, [2258] = 0x633D, [2259] = 0x6669, [2260] = 0x756A,
-  [2261] = 0x76E4, [2262] = 0x78D0, [2263] = 0x8543, [2264] = 0x86EE,
-  [2265] = 0x532A, [2266] = 0x5351, [2267] = 0x5426, [2268] = 0x5983,
-  [2269] = 0x5E87, [2270] = 0x5F7C, [2271] = 0x60B2, [2272] = 0x6249,
-  [2273] = 0x6279, [2274] = 0x62AB, [2275] = 0x6590, [2276] = 0x6BD4,
-  [2277] = 0x6CCC, [2278] = 0x75B2, [2279] = 0x76AE, [2280] = 0x7891,
-  [2281] = 0x79D8, [2282] = 0x7DCB, [2283] = 0x7F77, [2284] = 0x80A5,
-  [2285] = 0x88AB, [2286] = 0x8AB9, [2287] = 0x8CBB, [2288] = 0x907F,
-  [2289] = 0x975E, [2290] = 0x98DB, [2291] = 0x6A0B, [2292] = 0x7C38,
-  [2293] = 0x5099, [2294] = 0x5C3E, [2295] = 0x5FAE, [2296] = 0x6787,
-  [2297] = 0x6BD8, [2298] = 0x7435, [2299] = 0x7709, [2300] = 0x7F8E,
-  [2304] = 0x9F3B, [2305] = 0x67CA, [2306] = 0x7A17, [2307] = 0x5339,
-  [2308] = 0x758B, [2309] = 0x9AED, [2310] = 0x5F66, [2311] = 0x819D,
-  [2312] = 0x83F1, [2313] = 0x8098, [2314] = 0x5F3C, [2315] = 0x5FC5,
-  [2316] = 0x7562, [2317] = 0x7B46, [2318] = 0x903C, [2319] = 0x6867,
-  [2320] = 0x59EB, [2321] = 0x5A9B, [2322] = 0x7D10, [2323] = 0x767E,
-  [2324] = 0x8B2C, [2325] = 0x4FF5, [2326] = 0x5F6A, [2327] = 0x6A19,
-  [2328] = 0x6C37, [2329] = 0x6F02, [2330] = 0x74E2, [2331] = 0x7968,
-  [2332] = 0x8868, [2333] = 0x8A55, [2334] = 0x8C79, [2335] = 0x5EDF,
-  [2336] = 0x63CF, [2337] = 0x75C5, [2338] = 0x79D2, [2339] = 0x82D7,
-  [2340] = 0x9328, [2341] = 0x92F2, [2342] = 0x849C, [2343] = 0x86ED,
-  [2344] = 0x9C2D, [2345] = 0x54C1, [2346] = 0x5F6C, [2347] = 0x658C,
-  [2348] = 0x6D5C, [2349] = 0x7015, [2350] = 0x8CA7, [2351] = 0x8CD3,
-  [2352] = 0x983B, [2353] = 0x654F, [2354] = 0x74F6, [2355] = 0x4E0D,
-  [2356] = 0x4ED8, [2357] = 0x57E0, [2358] = 0x592B, [2359] = 0x5A66,
-  [2360] = 0x5BCC, [2361] = 0x51A8, [2362] = 0x5E03, [2363] = 0x5E9C,
-  [2364] = 0x6016, [2365] = 0x6276, [2366] = 0x6577, [2368] = 0x65A7,
-  [2369] = 0x666E, [2370] = 0x6D6E, [2371] = 0x7236, [2372] = 0x7B26,
-  [2373] = 0x8150, [2374] = 0x819A, [2375] = 0x8299, [2376] = 0x8B5C,
-  [2377] = 0x8CA0, [2378] = 0x8CE6, [2379] = 0x8D74, [2380] = 0x961C,
-  [2381] = 0x9644, [2382] = 0x4FAE, [2383] = 0x64AB, [2384] = 0x6B66,
-  [2385] = 0x821E, [2386] = 0x8461, [2387] = 0x856A, [2388] = 0x90E8,
-  [2389] = 0x5C01, [2390] = 0x6953, [2391] = 0x98A8, [2392] = 0x847A,
-  [2393] = 0x8557, [2394] = 0x4F0F, [2395] = 0x526F, [2396] = 0x5FA9,
-  [2397] = 0x5E45, [2398] = 0x670D, [2399] = 0x798F, [2400] = 0x8179,
-  [2401] = 0x8907, [2402] = 0x8986, [2403] = 0x6DF5, [2404] = 0x5F17,
-  [2405] = 0x6255, [2406] = 0x6CB8, [2407] = 0x4ECF, [2408] = 0x7269,
-  [2409] = 0x9B92, [2410] = 0x5206, [2411] = 0x543B, [2412] = 0x5674,
-  [2413] = 0x58B3, [2414] = 0x61A4, [2415] = 0x626E, [2416] = 0x711A,
-  [2417] = 0x596E, [2418] = 0x7C89, [2419] = 0x7CDE, [2420] = 0x7D1B,
-  [2421] = 0x96F0, [2422] = 0x6587, [2423] = 0x805E, [2424] = 0x4E19,
-  [2425] = 0x4F75, [2426] = 0x5175, [2427] = 0x5840, [2428] = 0x5E63,
-  [2429] = 0x5E73, [2430] = 0x5F0A, [2431] = 0x67C4, [2432] = 0x4E26,
-  [2433] = 0x853D, [2434] = 0x9589, [2435] = 0x965B, [2436] = 0x7C73,
-  [2437] = 0x9801, [2438] = 0x50FB, [2439] = 0x58C1, [2440] = 0x7656,
-  [2441] = 0x78A7, [2442] = 0x5225, [2443] = 0x77A5, [2444] = 0x8511,
-  [2445] = 0x7B86, [2446] = 0x504F, [2447] = 0x5909, [2448] = 0x7247,
-  [2449] = 0x7BC7, [2450] = 0x7DE8, [2451] = 0x8FBA, [2452] = 0x8FD4,
-  [2453] = 0x904D, [2454] = 0x4FBF, [2455] = 0x52C9, [2456] = 0x5A29,
-  [2457] = 0x5F01, [2458] = 0x97AD, [2459] = 0x4FDD, [2460] = 0x8217,
-  [2461] = 0x92EA, [2462] = 0x5703, [2463] = 0x6355, [2464] = 0x6B69,
-  [2465] = 0x752B, [2466] = 0x88DC, [2467] = 0x8F14, [2468] = 0x7A42,
-  [2469] = 0x52DF, [2470] = 0x5893, [2471] = 0x6155, [2472] = 0x620A,
-  [2473] = 0x66AE, [2474] = 0x6BCD, [2475] = 0x7C3F, [2476] = 0x83E9,
-  [2477] = 0x5023, [2478] = 0x4FF8, [2479] = 0x5305, [2480] = 0x5446,
-  [2481] = 0x5831, [2482] = 0x5949, [2483] = 0x5B9D, [2484] = 0x5CF0,
-  [2485] = 0x5CEF, [2486] = 0x5D29, [2487] = 0x5E96, [2488] = 0x62B1,
-  [2489] = 0x6367, [2490] = 0x653E, [2491] = 0x65B9, [2492] = 0x670B,
-  [2496] = 0x6CD5, [2497] = 0x6CE1, [2498] = 0x70F9, [2499] = 0x7832,
-  [2500] = 0x7E2B, [2501] = 0x80DE, [2502] = 0x82B3, [2503] = 0x840C,
-  [2504] = 0x84EC, [2505] = 0x8702, [2506] = 0x8912, [2507] = 0x8A2A,
-  [2508] = 0x8C4A, [2509] = 0x90A6, [2510] = 0x92D2, [2511] = 0x98FD,
-  [2512] = 0x9CF3, [2513] = 0x9D6C, [2514] = 0x4E4F, [2515] = 0x4EA1,
-  [2516] = 0x508D, [2517] = 0x5256, [2518] = 0x574A, [2519] = 0x59A8,
-  [2520] = 0x5E3D, [2521] = 0x5FD8, [2522] = 0x5FD9, [2523] = 0x623F,
-  [2524] = 0x66B4, [2525] = 0x671B, [2526] = 0x67D0, [2527] = 0x68D2,
-  [2528] = 0x5192, [2529] = 0x7D21, [2530] = 0x80AA, [2531] = 0x81A8,
-  [2532] = 0x8B00, [2533] = 0x8C8C, [2534] = 0x8CBF, [2535] = 0x927E,
-  [2536] = 0x9632, [2537] = 0x5420, [2538] = 0x982C, [2539] = 0x5317,
-  [2540] = 0x50D5, [2541] = 0x535C, [2542] = 0x58A8, [2543] = 0x64B2,
-  [2544] = 0x6734, [2545] = 0x7267, [2546] = 0x7766, [2547] = 0x7A46,
-  [2548] = 0x91E6, [2549] = 0x52C3, [2550] = 0x6CA1, [2551] = 0x6B86,
-  [2552] = 0x5800, [2553] = 0x5E4C, [2554] = 0x5954, [2555] = 0x672C,
-  [2556] = 0x7FFB, [2557] = 0x51E1, [2558] = 0x76C6, [2560] = 0x6469,
-  [2561] = 0x78E8, [2562] = 0x9B54, [2563] = 0x9EBB, [2564] = 0x57CB,
-  [2565] = 0x59B9, [2566] = 0x6627, [2567] = 0x679A, [2568] = 0x6BCE,
-  [2569] = 0x54E9, [2570] = 0x69D9, [2571] = 0x5E55, [2572] = 0x819C,
-  [2573] = 0x6795, [2574] = 0x9BAA, [2575] = 0x67FE, [2576] = 0x9C52,
-  [2577] = 0x685D, [2578] = 0x4EA6, [2579] = 0x4FE3, [2580] = 0x53C8,
-  [2581] = 0x62B9, [2582] = 0x672B, [2583] = 0x6CAB, [2584] = 0x8FC4,
-  [2585] = 0x4FAD, [2586] = 0x7E6D, [2587] = 0x9EBF, [2588] = 0x4E07,
-  [2589] = 0x6162, [2590] = 0x6E80, [2591] = 0x6F2B, [2592] = 0x8513,
-  [2593] = 0x5473, [2594] = 0x672A, [2595] = 0x9B45, [2596] = 0x5DF3,
-  [2597] = 0x7B95, [2598] = 0x5CAC, [2599] = 0x5BC6, [2600] = 0x871C,
-  [2601] = 0x6E4A, [2602] = 0x84D1, [2603] = 0x7A14, [2604] = 0x8108,
-  [2605] = 0x5999, [2606] = 0x7C8D, [2607] = 0x6C11, [2608] = 0x7720,
-  [2609] = 0x52D9, [2610] = 0x5922, [2611] = 0x7121, [2612] = 0x725F,
-  [2613] = 0x77DB, [2614] = 0x9727, [2615] = 0x9D61, [2616] = 0x690B,
-  [2617] = 0x5A7F, [2618] = 0x5A18, [2619] = 0x51A5, [2620] = 0x540D,
-  [2621] = 0x547D, [2622] = 0x660E, [2623] = 0x76DF, [2624] = 0x8FF7,
-  [2625] = 0x9298, [2626] = 0x9CF4, [2627] = 0x59EA, [2628] = 0x725D,
-  [2629] = 0x6EC5, [2630] = 0x514D, [2631] = 0x68C9, [2632] = 0x7DBF,
-  [2633] = 0x7DEC, [2634] = 0x9762, [2635] = 0x9EBA, [2636] = 0x6478,
-  [2637] = 0x6A21, [2638] = 0x8302, [2639] = 0x5984, [2640] = 0x5B5F,
-  [2641] = 0x6BDB, [2642] = 0x731B, [2643] = 0x76F2, [2644] = 0x7DB2,
-  [2645] = 0x8017, [2646] = 0x8499, [2647] = 0x5132, [2648] = 0x6728,
-  [2649] = 0x9ED9, [2650] = 0x76EE, [2651] = 0x6762, [2652] = 0x52FF,
-  [2653] = 0x9905, [2654] = 0x5C24, [2655] = 0x623B, [2656] = 0x7C7E,
-  [2657] = 0x8CB0, [2658] = 0x554F, [2659] = 0x60B6, [2660] = 0x7D0B,
-  [2661] = 0x9580, [2662] = 0x5301, [2663] = 0x4E5F, [2664] = 0x51B6,
-  [2665] = 0x591C, [2666] = 0x723A, [2667] = 0x8036, [2668] = 0x91CE,
-  [2669] = 0x5F25, [2670] = 0x77E2, [2671] = 0x5384, [2672] = 0x5F79,
-  [2673] = 0x7D04, [2674] = 0x85AC, [2675] = 0x8A33, [2676] = 0x8E8D,
-  [2677] = 0x9756, [2678] = 0x67F3, [2679] = 0x85AE, [2680] = 0x9453,
-  [2681] = 0x6109, [2682] = 0x6108, [2683] = 0x6CB9, [2684] = 0x7652,
-  [2688] = 0x8AED, [2689] = 0x8F38, [2690] = 0x552F, [2691] = 0x4F51,
-  [2692] = 0x512A, [2693] = 0x52C7, [2694] = 0x53CB, [2695] = 0x5BA5,
-  [2696] = 0x5E7D, [2697] = 0x60A0, [2698] = 0x6182, [2699] = 0x63D6,
-  [2700] = 0x6709, [2701] = 0x67DA, [2702] = 0x6E67, [2703] = 0x6D8C,
-  [2704] = 0x7336, [2705] = 0x7337, [2706] = 0x7531, [2707] = 0x7950,
-  [2708] = 0x88D5, [2709] = 0x8A98, [2710] = 0x904A, [2711] = 0x9091,
-  [2712] = 0x90F5, [2713] = 0x96C4, [2714] = 0x878D, [2715] = 0x5915,
-  [2716] = 0x4E88, [2717] = 0x4F59, [2718] = 0x4E0E, [2719] = 0x8A89,
-  [2720] = 0x8F3F, [2721] = 0x9810, [2722] = 0x50AD, [2723] = 0x5E7C,
-  [2724] = 0x5996, [2725] = 0x5BB9, [2726] = 0x5EB8, [2727] = 0x63DA,
-  [2728] = 0x63FA, [2729] = 0x64C1, [2730] = 0x66DC, [2731] = 0x694A,
-  [2732] = 0x69D8, [2733] = 0x6D0B, [2734] = 0x6EB6, [2735] = 0x7194,
-  [2736] = 0x7528, [2737] = 0x7AAF, [2738] = 0x7F8A, [2739] = 0x8000,
-  [2740] = 0x8449, [2741] = 0x84C9, [2742] = 0x8981, [2743] = 0x8B21,
-  [2744] = 0x8E0A, [2745] = 0x9065, [2746] = 0x967D, [2747] = 0x990A,
-  [2748] = 0x617E, [2749] = 0x6291, [2750] = 0x6B32, [2752] = 0x6C83,
-  [2753] = 0x6D74, [2754] = 0x7FCC, [2755] = 0x7FFC, [2756] = 0x6DC0,
-  [2757] = 0x7F85, [2758] = 0x87BA, [2759] = 0x88F8, [2760] = 0x6765,
-  [2761] = 0x83B1, [2762] = 0x983C, [2763] = 0x96F7, [2764] = 0x6D1B,
-  [2765] = 0x7D61, [2766] = 0x843D, [2767] = 0x916A, [2768] = 0x4E71,
-  [2769] = 0x5375, [2770] = 0x5D50, [2771] = 0x6B04, [2772] = 0x6FEB,
-  [2773] = 0x85CD, [2774] = 0x862D, [2775] = 0x89A7, [2776] = 0x5229,
-  [2777] = 0x540F, [2778] = 0x5C65, [2779] = 0x674E, [2780] = 0x68A8,
-  [2781] = 0x7406, [2782] = 0x7483, [2783] = 0x75E2, [2784] = 0x88CF,
-  [2785] = 0x88E1, [2786] = 0x91CC, [2787] = 0x96E2, [2788] = 0x9678,
-  [2789] = 0x5F8B, [2790] = 0x7387, [2791] = 0x7ACB, [2792] = 0x844E,
-  [2793] = 0x63A0, [2794] = 0x7565, [2795] = 0x5289, [2796] = 0x6D41,
-  [2797] = 0x6E9C, [2798] = 0x7409, [2799] = 0x7559, [2800] = 0x786B,
-  [2801] = 0x7C92, [2802] = 0x9686, [2803] = 0x7ADC, [2804] = 0x9F8D,
-  [2805] = 0x4FB6, [2806] = 0x616E, [2807] = 0x65C5, [2808] = 0x865C,
-  [2809] = 0x4E86, [2810] = 0x4EAE, [2811] = 0x50DA, [2812] = 0x4E21,
-  [2813] = 0x51CC, [2814] = 0x5BEE, [2815] = 0x6599, [2816] = 0x6881,
-  [2817] = 0x6DBC, [2818] = 0x731F, [2819] = 0x7642, [2820] = 0x77AD,
-  [2821] = 0x7A1C, [2822] = 0x7CE7, [2823] = 0x826F, [2824] = 0x8AD2,
-  [2825] = 0x907C, [2826] = 0x91CF, [2827] = 0x9675, [2828] = 0x9818,
-  [2829] = 0x529B, [2830] = 0x7DD1, [2831] = 0x502B, [2832] = 0x5398,
-  [2833] = 0x6797, [2834] = 0x6DCB, [2835] = 0x71D0, [2836] = 0x7433,
-  [2837] = 0x81E8, [2838] = 0x8F2A, [2839] = 0x96A3, [2840] = 0x9C57,
-  [2841] = 0x9E9F, [2842] = 0x7460, [2843] = 0x5841, [2844] = 0x6D99,
-  [2845] = 0x7D2F, [2846] = 0x985E, [2847] = 0x4EE4, [2848] = 0x4F36,
-  [2849] = 0x4F8B, [2850] = 0x51B7, [2851] = 0x52B1, [2852] = 0x5DBA,
-  [2853] = 0x601C, [2854] = 0x73B2, [2855] = 0x793C, [2856] = 0x82D3,
-  [2857] = 0x9234, [2858] = 0x96B7, [2859] = 0x96F6, [2860] = 0x970A,
-  [2861] = 0x9E97, [2862] = 0x9F62, [2863] = 0x66A6, [2864] = 0x6B74,
-  [2865] = 0x5217, [2866] = 0x52A3, [2867] = 0x70C8, [2868] = 0x88C2,
-  [2869] = 0x5EC9, [2870] = 0x604B, [2871] = 0x6190, [2872] = 0x6F23,
-  [2873] = 0x7149, [2874] = 0x7C3E, [2875] = 0x7DF4, [2876] = 0x806F,
-  [2880] = 0x84EE, [2881] = 0x9023, [2882] = 0x932C, [2883] = 0x5442,
-  [2884] = 0x9B6F, [2885] = 0x6AD3, [2886] = 0x7089, [2887] = 0x8CC2,
-  [2888] = 0x8DEF, [2889] = 0x9732, [2890] = 0x52B4, [2891] = 0x5A41,
-  [2892] = 0x5ECA, [2893] = 0x5F04, [2894] = 0x6717, [2895] = 0x697C,
-  [2896] = 0x6994, [2897] = 0x6D6A, [2898] = 0x6F0F, [2899] = 0x7262,
-  [2900] = 0x72FC, [2901] = 0x7BED, [2902] = 0x8001, [2903] = 0x807E,
-  [2904] = 0x874B, [2905] = 0x90CE, [2906] = 0x516D, [2907] = 0x9E93,
-  [2908] = 0x7984, [2909] = 0x808B, [2910] = 0x9332, [2911] = 0x8AD6,
-  [2912] = 0x502D, [2913] = 0x548C, [2914] = 0x8A71, [2915] = 0x6B6A,
-  [2916] = 0x8CC4, [2917] = 0x8107, [2918] = 0x60D1, [2919] = 0x67A0,
-  [2920] = 0x9DF2, [2921] = 0x4E99, [2922] = 0x4E98, [2923] = 0x9C10,
-  [2924] = 0x8A6B, [2925] = 0x85C1, [2926] = 0x8568, [2927] = 0x6900,
-  [2928] = 0x6E7E, [2929] = 0x7897, [2930] = 0x8155, [2975] = 0x5F0C,
-  [2976] = 0x4E10, [2977] = 0x4E15, [2978] = 0x4E2A, [2979] = 0x4E31,
-  [2980] = 0x4E36, [2981] = 0x4E3C, [2982] = 0x4E3F, [2983] = 0x4E42,
-  [2984] = 0x4E56, [2985] = 0x4E58, [2986] = 0x4E82, [2987] = 0x4E85,
-  [2988] = 0x8C6B, [2989] = 0x4E8A, [2990] = 0x8212, [2991] = 0x5F0D,
-  [2992] = 0x4E8E, [2993] = 0x4E9E, [2994] = 0x4E9F, [2995] = 0x4EA0,
-  [2996] = 0x4EA2, [2997] = 0x4EB0, [2998] = 0x4EB3, [2999] = 0x4EB6,
-  [3000] = 0x4ECE, [3001] = 0x4ECD, [3002] = 0x4EC4, [3003] = 0x4EC6,
-  [3004] = 0x4EC2, [3005] = 0x4ED7, [3006] = 0x4EDE, [3007] = 0x4EED,
-  [3008] = 0x4EDF, [3009] = 0x4EF7, [3010] = 0x4F09, [3011] = 0x4F5A,
-  [3012] = 0x4F30, [3013] = 0x4F5B, [3014] = 0x4F5D, [3015] = 0x4F57,
-  [3016] = 0x4F47, [3017] = 0x4F76, [3018] = 0x4F88, [3019] = 0x4F8F,
-  [3020] = 0x4F98, [3021] = 0x4F7B, [3022] = 0x4F69, [3023] = 0x4F70,
-  [3024] = 0x4F91, [3025] = 0x4F6F, [3026] = 0x4F86, [3027] = 0x4F96,
-  [3028] = 0x5118, [3029] = 0x4FD4, [3030] = 0x4FDF, [3031] = 0x4FCE,
-  [3032] = 0x4FD8, [3033] = 0x4FDB, [3034] = 0x4FD1, [3035] = 0x4FDA,
-  [3036] = 0x4FD0, [3037] = 0x4FE4, [3038] = 0x4FE5, [3039] = 0x501A,
-  [3040] = 0x5028, [3041] = 0x5014, [3042] = 0x502A, [3043] = 0x5025,
-  [3044] = 0x5005, [3045] = 0x4F1C, [3046] = 0x4FF6, [3047] = 0x5021,
-  [3048] = 0x5029, [3049] = 0x502C, [3050] = 0x4FFE, [3051] = 0x4FEF,
-  [3052] = 0x5011, [3053] = 0x5006, [3054] = 0x5043, [3055] = 0x5047,
-  [3056] = 0x6703, [3057] = 0x5055, [3058] = 0x5050, [3059] = 0x5048,
-  [3060] = 0x505A, [3061] = 0x5056, [3062] = 0x506C, [3063] = 0x5078,
-  [3064] = 0x5080, [3065] = 0x509A, [3066] = 0x5085, [3067] = 0x50B4,
-  [3068] = 0x50B2, [3072] = 0x50C9, [3073] = 0x50CA, [3074] = 0x50B3,
-  [3075] = 0x50C2, [3076] = 0x50D6, [3077] = 0x50DE, [3078] = 0x50E5,
-  [3079] = 0x50ED, [3080] = 0x50E3, [3081] = 0x50EE, [3082] = 0x50F9,
-  [3083] = 0x50F5, [3084] = 0x5109, [3085] = 0x5101, [3086] = 0x5102,
-  [3087] = 0x5116, [3088] = 0x5115, [3089] = 0x5114, [3090] = 0x511A,
-  [3091] = 0x5121, [3092] = 0x513A, [3093] = 0x5137, [3094] = 0x513C,
-  [3095] = 0x513B, [3096] = 0x513F, [3097] = 0x5140, [3098] = 0x5152,
-  [3099] = 0x514C, [3100] = 0x5154, [3101] = 0x5162, [3102] = 0x7AF8,
-  [3103] = 0x5169, [3104] = 0x516A, [3105] = 0x516E, [3106] = 0x5180,
-  [3107] = 0x5182, [3108] = 0x56D8, [3109] = 0x518C, [3110] = 0x5189,
-  [3111] = 0x518F, [3112] = 0x5191, [3113] = 0x5193, [3114] = 0x5195,
-  [3115] = 0x5196, [3116] = 0x51A4, [3117] = 0x51A6, [3118] = 0x51A2,
-  [3119] = 0x51A9, [3120] = 0x51AA, [3121] = 0x51AB, [3122] = 0x51B3,
-  [3123] = 0x51B1, [3124] = 0x51B2, [3125] = 0x51B0, [3126] = 0x51B5,
-  [3127] = 0x51BD, [3128] = 0x51C5, [3129] = 0x51C9, [3130] = 0x51DB,
-  [3131] = 0x51E0, [3132] = 0x8655, [3133] = 0x51E9, [3134] = 0x51ED,
-  [3136] = 0x51F0, [3137] = 0x51F5, [3138] = 0x51FE, [3139] = 0x5204,
-  [3140] = 0x520B, [3141] = 0x5214, [3142] = 0x520E, [3143] = 0x5227,
-  [3144] = 0x522A, [3145] = 0x522E, [3146] = 0x5233, [3147] = 0x5239,
-  [3148] = 0x524F, [3149] = 0x5244, [3150] = 0x524B, [3151] = 0x524C,
-  [3152] = 0x525E, [3153] = 0x5254, [3154] = 0x526A, [3155] = 0x5274,
-  [3156] = 0x5269, [3157] = 0x5273, [3158] = 0x527F, [3159] = 0x527D,
-  [3160] = 0x528D, [3161] = 0x5294, [3162] = 0x5292, [3163] = 0x5271,
-  [3164] = 0x5288, [3165] = 0x5291, [3166] = 0x8FA8, [3167] = 0x8FA7,
-  [3168] = 0x52AC, [3169] = 0x52AD, [3170] = 0x52BC, [3171] = 0x52B5,
-  [3172] = 0x52C1, [3173] = 0x52CD, [3174] = 0x52D7, [3175] = 0x52DE,
-  [3176] = 0x52E3, [3177] = 0x52E6, [3178] = 0x98ED, [3179] = 0x52E0,
-  [3180] = 0x52F3, [3181] = 0x52F5, [3182] = 0x52F8, [3183] = 0x52F9,
-  [3184] = 0x5306, [3185] = 0x5308, [3186] = 0x7538, [3187] = 0x530D,
-  [3188] = 0x5310, [3189] = 0x530F, [3190] = 0x5315, [3191] = 0x531A,
-  [3192] = 0x5323, [3193] = 0x532F, [3194] = 0x5331, [3195] = 0x5333,
-  [3196] = 0x5338, [3197] = 0x5340, [3198] = 0x5346, [3199] = 0x5345,
-  [3200] = 0x4E17, [3201] = 0x5349, [3202] = 0x534D, [3203] = 0x51D6,
-  [3204] = 0x535E, [3205] = 0x5369, [3206] = 0x536E, [3207] = 0x5918,
-  [3208] = 0x537B, [3209] = 0x5377, [3210] = 0x5382, [3211] = 0x5396,
-  [3212] = 0x53A0, [3213] = 0x53A6, [3214] = 0x53A5, [3215] = 0x53AE,
-  [3216] = 0x53B0, [3217] = 0x53B6, [3218] = 0x53C3, [3219] = 0x7C12,
-  [3220] = 0x96D9, [3221] = 0x53DF, [3222] = 0x66FC, [3223] = 0x71EE,
-  [3224] = 0x53EE, [3225] = 0x53E8, [3226] = 0x53ED, [3227] = 0x53FA,
-  [3228] = 0x5401, [3229] = 0x543D, [3230] = 0x5440, [3231] = 0x542C,
-  [3232] = 0x542D, [3233] = 0x543C, [3234] = 0x542E, [3235] = 0x5436,
-  [3236] = 0x5429, [3237] = 0x541D, [3238] = 0x544E, [3239] = 0x548F,
-  [3240] = 0x5475, [3241] = 0x548E, [3242] = 0x545F, [3243] = 0x5471,
-  [3244] = 0x5477, [3245] = 0x5470, [3246] = 0x5492, [3247] = 0x547B,
-  [3248] = 0x5480, [3249] = 0x5476, [3250] = 0x5484, [3251] = 0x5490,
-  [3252] = 0x5486, [3253] = 0x54C7, [3254] = 0x54A2, [3255] = 0x54B8,
-  [3256] = 0x54A5, [3257] = 0x54AC, [3258] = 0x54C4, [3259] = 0x54C8,
-  [3260] = 0x54A8, [3264] = 0x54AB, [3265] = 0x54C2, [3266] = 0x54A4,
-  [3267] = 0x54BE, [3268] = 0x54BC, [3269] = 0x54D8, [3270] = 0x54E5,
-  [3271] = 0x54E6, [3272] = 0x550F, [3273] = 0x5514, [3274] = 0x54FD,
-  [3275] = 0x54EE, [3276] = 0x54ED, [3277] = 0x54FA, [3278] = 0x54E2,
-  [3279] = 0x5539, [3280] = 0x5540, [3281] = 0x5563, [3282] = 0x554C,
-  [3283] = 0x552E, [3284] = 0x555C, [3285] = 0x5545, [3286] = 0x5556,
-  [3287] = 0x5557, [3288] = 0x5538, [3289] = 0x5533, [3290] = 0x555D,
-  [3291] = 0x5599, [3292] = 0x5580, [3293] = 0x54AF, [3294] = 0x558A,
-  [3295] = 0x559F, [3296] = 0x557B, [3297] = 0x557E, [3298] = 0x5598,
-  [3299] = 0x559E, [3300] = 0x55AE, [3301] = 0x557C, [3302] = 0x5583,
-  [3303] = 0x55A9, [3304] = 0x5587, [3305] = 0x55A8, [3306] = 0x55DA,
-  [3307] = 0x55C5, [3308] = 0x55DF, [3309] = 0x55C4, [3310] = 0x55DC,
-  [3311] = 0x55E4, [3312] = 0x55D4, [3313] = 0x5614, [3314] = 0x55F7,
-  [3315] = 0x5616, [3316] = 0x55FE, [3317] = 0x55FD, [3318] = 0x561B,
-  [3319] = 0x55F9, [3320] = 0x564E, [3321] = 0x5650, [3322] = 0x71DF,
-  [3323] = 0x5634, [3324] = 0x5636, [3325] = 0x5632, [3326] = 0x5638,
-  [3328] = 0x566B, [3329] = 0x5664, [3330] = 0x562F, [3331] = 0x566C,
-  [3332] = 0x566A, [3333] = 0x5686, [3334] = 0x5680, [3335] = 0x568A,
-  [3336] = 0x56A0, [3337] = 0x5694, [3338] = 0x568F, [3339] = 0x56A5,
-  [3340] = 0x56AE, [3341] = 0x56B6, [3342] = 0x56B4, [3343] = 0x56C2,
-  [3344] = 0x56BC, [3345] = 0x56C1, [3346] = 0x56C3, [3347] = 0x56C0,
-  [3348] = 0x56C8, [3349] = 0x56CE, [3350] = 0x56D1, [3351] = 0x56D3,
-  [3352] = 0x56D7, [3353] = 0x56EE, [3354] = 0x56F9, [3355] = 0x5700,
-  [3356] = 0x56FF, [3357] = 0x5704, [3358] = 0x5709, [3359] = 0x5708,
-  [3360] = 0x570B, [3361] = 0x570D, [3362] = 0x5713, [3363] = 0x5718,
-  [3364] = 0x5716, [3365] = 0x55C7, [3366] = 0x571C, [3367] = 0x5726,
-  [3368] = 0x5737, [3369] = 0x5738, [3370] = 0x574E, [3371] = 0x573B,
-  [3372] = 0x5740, [3373] = 0x574F, [3374] = 0x5769, [3375] = 0x57C0,
-  [3376] = 0x5788, [3377] = 0x5761, [3378] = 0x577F, [3379] = 0x5789,
-  [3380] = 0x5793, [3381] = 0x57A0, [3382] = 0x57B3, [3383] = 0x57A4,
-  [3384] = 0x57AA, [3385] = 0x57B0, [3386] = 0x57C3, [3387] = 0x57C6,
-  [3388] = 0x57D4, [3389] = 0x57D2, [3390] = 0x57D3, [3391] = 0x580A,
-  [3392] = 0x57D6, [3393] = 0x57E3, [3394] = 0x580B, [3395] = 0x5819,
-  [3396] = 0x581D, [3397] = 0x5872, [3398] = 0x5821, [3399] = 0x5862,
-  [3400] = 0x584B, [3401] = 0x5870, [3402] = 0x6BC0, [3403] = 0x5852,
-  [3404] = 0x583D, [3405] = 0x5879, [3406] = 0x5885, [3407] = 0x58B9,
-  [3408] = 0x589F, [3409] = 0x58AB, [3410] = 0x58BA, [3411] = 0x58DE,
-  [3412] = 0x58BB, [3413] = 0x58B8, [3414] = 0x58AE, [3415] = 0x58C5,
-  [3416] = 0x58D3, [3417] = 0x58D1, [3418] = 0x58D7, [3419] = 0x58D9,
-  [3420] = 0x58D8, [3421] = 0x58E5, [3422] = 0x58DC, [3423] = 0x58E4,
-  [3424] = 0x58DF, [3425] = 0x58EF, [3426] = 0x58FA, [3427] = 0x58F9,
-  [3428] = 0x58FB, [3429] = 0x58FC, [3430] = 0x58FD, [3431] = 0x5902,
-  [3432] = 0x590A, [3433] = 0x5910, [3434] = 0x591B, [3435] = 0x68A6,
-  [3436] = 0x5925, [3437] = 0x592C, [3438] = 0x592D, [3439] = 0x5932,
-  [3440] = 0x5938, [3441] = 0x593E, [3442] = 0x7AD2, [3443] = 0x5955,
-  [3444] = 0x5950, [3445] = 0x594E, [3446] = 0x595A, [3447] = 0x5958,
-  [3448] = 0x5962, [3449] = 0x5960, [3450] = 0x5967, [3451] = 0x596C,
-  [3452] = 0x5969, [3456] = 0x5978, [3457] = 0x5981, [3458] = 0x599D,
-  [3459] = 0x4F5E, [3460] = 0x4FAB, [3461] = 0x59A3, [3462] = 0x59B2,
-  [3463] = 0x59C6, [3464] = 0x59E8, [3465] = 0x59DC, [3466] = 0x598D,
-  [3467] = 0x59D9, [3468] = 0x59DA, [3469] = 0x5A25, [3470] = 0x5A1F,
-  [3471] = 0x5A11, [3472] = 0x5A1C, [3473] = 0x5A09, [3474] = 0x5A1A,
-  [3475] = 0x5A40, [3476] = 0x5A6C, [3477] = 0x5A49, [3478] = 0x5A35,
-  [3479] = 0x5A36, [3480] = 0x5A62, [3481] = 0x5A6A, [3482] = 0x5A9A,
-  [3483] = 0x5ABC, [3484] = 0x5ABE, [3485] = 0x5ACB, [3486] = 0x5AC2,
-  [3487] = 0x5ABD, [3488] = 0x5AE3, [3489] = 0x5AD7, [3490] = 0x5AE6,
-  [3491] = 0x5AE9, [3492] = 0x5AD6, [3493] = 0x5AFA, [3494] = 0x5AFB,
-  [3495] = 0x5B0C, [3496] = 0x5B0B, [3497] = 0x5B16, [3498] = 0x5B32,
-  [3499] = 0x5AD0, [3500] = 0x5B2A, [3501] = 0x5B36, [3502] = 0x5B3E,
-  [3503] = 0x5B43, [3504] = 0x5B45, [3505] = 0x5B40, [3506] = 0x5B51,
-  [3507] = 0x5B55, [3508] = 0x5B5A, [3509] = 0x5B5B, [3510] = 0x5B65,
-  [3511] = 0x5B69, [3512] = 0x5B70, [3513] = 0x5B73, [3514] = 0x5B75,
-  [3515] = 0x5B78, [3516] = 0x6588, [3517] = 0x5B7A, [3518] = 0x5B80,
-  [3520] = 0x5B83, [3521] = 0x5BA6, [3522] = 0x5BB8, [3523] = 0x5BC3,
-  [3524] = 0x5BC7, [3525] = 0x5BC9, [3526] = 0x5BD4, [3527] = 0x5BD0,
-  [3528] = 0x5BE4, [3529] = 0x5BE6, [3530] = 0x5BE2, [3531] = 0x5BDE,
-  [3532] = 0x5BE5, [3533] = 0x5BEB, [3534] = 0x5BF0, [3535] = 0x5BF6,
-  [3536] = 0x5BF3, [3537] = 0x5C05, [3538] = 0x5C07, [3539] = 0x5C08,
-  [3540] = 0x5C0D, [3541] = 0x5C13, [3542] = 0x5C20, [3543] = 0x5C22,
-  [3544] = 0x5C28, [3545] = 0x5C38, [3546] = 0x5C39, [3547] = 0x5C41,
-  [3548] = 0x5C46, [3549] = 0x5C4E, [3550] = 0x5C53, [3551] = 0x5C50,
-  [3552] = 0x5C4F, [3553] = 0x5B71, [3554] = 0x5C6C, [3555] = 0x5C6E,
-  [3556] = 0x4E62, [3557] = 0x5C76, [3558] = 0x5C79, [3559] = 0x5C8C,
-  [3560] = 0x5C91, [3561] = 0x5C94, [3562] = 0x599B, [3563] = 0x5CAB,
-  [3564] = 0x5CBB, [3565] = 0x5CB6, [3566] = 0x5CBC, [3567] = 0x5CB7,
-  [3568] = 0x5CC5, [3569] = 0x5CBE, [3570] = 0x5CC7, [3571] = 0x5CD9,
-  [3572] = 0x5CE9, [3573] = 0x5CFD, [3574] = 0x5CFA, [3575] = 0x5CED,
-  [3576] = 0x5D8C, [3577] = 0x5CEA, [3578] = 0x5D0B, [3579] = 0x5D15,
-  [3580] = 0x5D17, [3581] = 0x5D5C, [3582] = 0x5D1F, [3583] = 0x5D1B,
-  [3584] = 0x5D11, [3585] = 0x5D14, [3586] = 0x5D22, [3587] = 0x5D1A,
-  [3588] = 0x5D19, [3589] = 0x5D18, [3590] = 0x5D4C, [3591] = 0x5D52,
-  [3592] = 0x5D4E, [3593] = 0x5D4B, [3594] = 0x5D6C, [3595] = 0x5D73,
-  [3596] = 0x5D76, [3597] = 0x5D87, [3598] = 0x5D84, [3599] = 0x5D82,
-  [3600] = 0x5DA2, [3601] = 0x5D9D, [3602] = 0x5DAC, [3603] = 0x5DAE,
-  [3604] = 0x5DBD, [3605] = 0x5D90, [3606] = 0x5DB7, [3607] = 0x5DBC,
-  [3608] = 0x5DC9, [3609] = 0x5DCD, [3610] = 0x5DD3, [3611] = 0x5DD2,
-  [3612] = 0x5DD6, [3613] = 0x5DDB, [3614] = 0x5DEB, [3615] = 0x5DF2,
-  [3616] = 0x5DF5, [3617] = 0x5E0B, [3618] = 0x5E1A, [3619] = 0x5E19,
-  [3620] = 0x5E11, [3621] = 0x5E1B, [3622] = 0x5E36, [3623] = 0x5E37,
-  [3624] = 0x5E44, [3625] = 0x5E43, [3626] = 0x5E40, [3627] = 0x5E4E,
-  [3628] = 0x5E57, [3629] = 0x5E54, [3630] = 0x5E5F, [3631] = 0x5E62,
-  [3632] = 0x5E64, [3633] = 0x5E47, [3634] = 0x5E75, [3635] = 0x5E76,
-  [3636] = 0x5E7A, [3637] = 0x9EBC, [3638] = 0x5E7F, [3639] = 0x5EA0,
-  [3640] = 0x5EC1, [3641] = 0x5EC2, [3642] = 0x5EC8, [3643] = 0x5ED0,
-  [3644] = 0x5ECF, [3648] = 0x5ED6, [3649] = 0x5EE3, [3650] = 0x5EDD,
-  [3651] = 0x5EDA, [3652] = 0x5EDB, [3653] = 0x5EE2, [3654] = 0x5EE1,
-  [3655] = 0x5EE8, [3656] = 0x5EE9, [3657] = 0x5EEC, [3658] = 0x5EF1,
-  [3659] = 0x5EF3, [3660] = 0x5EF0, [3661] = 0x5EF4, [3662] = 0x5EF8,
-  [3663] = 0x5EFE, [3664] = 0x5F03, [3665] = 0x5F09, [3666] = 0x5F5D,
-  [3667] = 0x5F5C, [3668] = 0x5F0B, [3669] = 0x5F11, [3670] = 0x5F16,
-  [3671] = 0x5F29, [3672] = 0x5F2D, [3673] = 0x5F38, [3674] = 0x5F41,
-  [3675] = 0x5F48, [3676] = 0x5F4C, [3677] = 0x5F4E, [3678] = 0x5F2F,
-  [3679] = 0x5F51, [3680] = 0x5F56, [3681] = 0x5F57, [3682] = 0x5F59,
-  [3683] = 0x5F61, [3684] = 0x5F6D, [3685] = 0x5F73, [3686] = 0x5F77,
-  [3687] = 0x5F83, [3688] = 0x5F82, [3689] = 0x5F7F, [3690] = 0x5F8A,
-  [3691] = 0x5F88, [3692] = 0x5F91, [3693] = 0x5F87, [3694] = 0x5F9E,
-  [3695] = 0x5F99, [3696] = 0x5F98, [3697] = 0x5FA0, [3698] = 0x5FA8,
-  [3699] = 0x5FAD, [3700] = 0x5FBC, [3701] = 0x5FD6, [3702] = 0x5FFB,
-  [3703] = 0x5FE4, [3704] = 0x5FF8, [3705] = 0x5FF1, [3706] = 0x5FDD,
-  [3707] = 0x60B3, [3708] = 0x5FFF, [3709] = 0x6021, [3710] = 0x6060,
-  [3712] = 0x6019, [3713] = 0x6010, [3714] = 0x6029, [3715] = 0x600E,
-  [3716] = 0x6031, [3717] = 0x601B, [3718] = 0x6015, [3719] = 0x602B,
-  [3720] = 0x6026, [3721] = 0x600F, [3722] = 0x603A, [3723] = 0x605A,
-  [3724] = 0x6041, [3725] = 0x606A, [3726] = 0x6077, [3727] = 0x605F,
-  [3728] = 0x604A, [3729] = 0x6046, [3730] = 0x604D, [3731] = 0x6063,
-  [3732] = 0x6043, [3733] = 0x6064, [3734] = 0x6042, [3735] = 0x606C,
-  [3736] = 0x606B, [3737] = 0x6059, [3738] = 0x6081, [3739] = 0x608D,
-  [3740] = 0x60E7, [3741] = 0x6083, [3742] = 0x609A, [3743] = 0x6084,
-  [3744] = 0x609B, [3745] = 0x6096, [3746] = 0x6097, [3747] = 0x6092,
-  [3748] = 0x60A7, [3749] = 0x608B, [3750] = 0x60E1, [3751] = 0x60B8,
-  [3752] = 0x60E0, [3753] = 0x60D3, [3754] = 0x60B4, [3755] = 0x5FF0,
-  [3756] = 0x60BD, [3757] = 0x60C6, [3758] = 0x60B5, [3759] = 0x60D8,
-  [3760] = 0x614D, [3761] = 0x6115, [3762] = 0x6106, [3763] = 0x60F6,
-  [3764] = 0x60F7, [3765] = 0x6100, [3766] = 0x60F4, [3767] = 0x60FA,
-  [3768] = 0x6103, [3769] = 0x6121, [3770] = 0x60FB, [3771] = 0x60F1,
-  [3772] = 0x610D, [3773] = 0x610E, [3774] = 0x6147, [3775] = 0x613E,
-  [3776] = 0x6128, [3777] = 0x6127, [3778] = 0x614A, [3779] = 0x613F,
-  [3780] = 0x613C, [3781] = 0x612C, [3782] = 0x6134, [3783] = 0x613D,
-  [3784] = 0x6142, [3785] = 0x6144, [3786] = 0x6173, [3787] = 0x6177,
-  [3788] = 0x6158, [3789] = 0x6159, [3790] = 0x615A, [3791] = 0x616B,
-  [3792] = 0x6174, [3793] = 0x616F, [3794] = 0x6165, [3795] = 0x6171,
-  [3796] = 0x615F, [3797] = 0x615D, [3798] = 0x6153, [3799] = 0x6175,
-  [3800] = 0x6199, [3801] = 0x6196, [3802] = 0x6187, [3803] = 0x61AC,
-  [3804] = 0x6194, [3805] = 0x619A, [3806] = 0x618A, [3807] = 0x6191,
-  [3808] = 0x61AB, [3809] = 0x61AE, [3810] = 0x61CC, [3811] = 0x61CA,
-  [3812] = 0x61C9, [3813] = 0x61F7, [3814] = 0x61C8, [3815] = 0x61C3,
-  [3816] = 0x61C6, [3817] = 0x61BA, [3818] = 0x61CB, [3819] = 0x7F79,
-  [3820] = 0x61CD, [3821] = 0x61E6, [3822] = 0x61E3, [3823] = 0x61F6,
-  [3824] = 0x61FA, [3825] = 0x61F4, [3826] = 0x61FF, [3827] = 0x61FD,
-  [3828] = 0x61FC, [3829] = 0x61FE, [3830] = 0x6200, [3831] = 0x6208,
-  [3832] = 0x6209, [3833] = 0x620D, [3834] = 0x620C, [3835] = 0x6214,
-  [3836] = 0x621B, [3840] = 0x621E, [3841] = 0x6221, [3842] = 0x622A,
-  [3843] = 0x622E, [3844] = 0x6230, [3845] = 0x6232, [3846] = 0x6233,
-  [3847] = 0x6241, [3848] = 0x624E, [3849] = 0x625E, [3850] = 0x6263,
-  [3851] = 0x625B, [3852] = 0x6260, [3853] = 0x6268, [3854] = 0x627C,
-  [3855] = 0x6282, [3856] = 0x6289, [3857] = 0x627E, [3858] = 0x6292,
-  [3859] = 0x6293, [3860] = 0x6296, [3861] = 0x62D4, [3862] = 0x6283,
-  [3863] = 0x6294, [3864] = 0x62D7, [3865] = 0x62D1, [3866] = 0x62BB,
-  [3867] = 0x62CF, [3868] = 0x62FF, [3869] = 0x62C6, [3870] = 0x64D4,
-  [3871] = 0x62C8, [3872] = 0x62DC, [3873] = 0x62CC, [3874] = 0x62CA,
-  [3875] = 0x62C2, [3876] = 0x62C7, [3877] = 0x629B, [3878] = 0x62C9,
-  [3879] = 0x630C, [3880] = 0x62EE, [3881] = 0x62F1, [3882] = 0x6327,
-  [3883] = 0x6302, [3884] = 0x6308, [3885] = 0x62EF, [3886] = 0x62F5,
-  [3887] = 0x6350, [3888] = 0x633E, [3889] = 0x634D, [3890] = 0x641C,
-  [3891] = 0x634F, [3892] = 0x6396, [3893] = 0x638E, [3894] = 0x6380,
-  [3895] = 0x63AB, [3896] = 0x6376, [3897] = 0x63A3, [3898] = 0x638F,
-  [3899] = 0x6389, [3900] = 0x639F, [3901] = 0x63B5, [3902] = 0x636B,
-  [3904] = 0x6369, [3905] = 0x63BE, [3906] = 0x63E9, [3907] = 0x63C0,
-  [3908] = 0x63C6, [3909] = 0x63E3, [3910] = 0x63C9, [3911] = 0x63D2,
-  [3912] = 0x63F6, [3913] = 0x63C4, [3914] = 0x6416, [3915] = 0x6434,
-  [3916] = 0x6406, [3917] = 0x6413, [3918] = 0x6426, [3919] = 0x6436,
-  [3920] = 0x651D, [3921] = 0x6417, [3922] = 0x6428, [3923] = 0x640F,
-  [3924] = 0x6467, [3925] = 0x646F, [3926] = 0x6476, [3927] = 0x644E,
-  [3928] = 0x652A, [3929] = 0x6495, [3930] = 0x6493, [3931] = 0x64A5,
-  [3932] = 0x64A9, [3933] = 0x6488, [3934] = 0x64BC, [3935] = 0x64DA,
-  [3936] = 0x64D2, [3937] = 0x64C5, [3938] = 0x64C7, [3939] = 0x64BB,
-  [3940] = 0x64D8, [3941] = 0x64C2, [3942] = 0x64F1, [3943] = 0x64E7,
-  [3944] = 0x8209, [3945] = 0x64E0, [3946] = 0x64E1, [3947] = 0x62AC,
-  [3948] = 0x64E3, [3949] = 0x64EF, [3950] = 0x652C, [3951] = 0x64F6,
-  [3952] = 0x64F4, [3953] = 0x64F2, [3954] = 0x64FA, [3955] = 0x6500,
-  [3956] = 0x64FD, [3957] = 0x6518, [3958] = 0x651C, [3959] = 0x6505,
-  [3960] = 0x6524, [3961] = 0x6523, [3962] = 0x652B, [3963] = 0x6534,
-  [3964] = 0x6535, [3965] = 0x6537, [3966] = 0x6536, [3967] = 0x6538,
-  [3968] = 0x754B, [3969] = 0x6548, [3970] = 0x6556, [3971] = 0x6555,
-  [3972] = 0x654D, [3973] = 0x6558, [3974] = 0x655E, [3975] = 0x655D,
-  [3976] = 0x6572, [3977] = 0x6578, [3978] = 0x6582, [3979] = 0x6583,
-  [3980] = 0x8B8A, [3981] = 0x659B, [3982] = 0x659F, [3983] = 0x65AB,
-  [3984] = 0x65B7, [3985] = 0x65C3, [3986] = 0x65C6, [3987] = 0x65C1,
-  [3988] = 0x65C4, [3989] = 0x65CC, [3990] = 0x65D2, [3991] = 0x65DB,
-  [3992] = 0x65D9, [3993] = 0x65E0, [3994] = 0x65E1, [3995] = 0x65F1,
-  [3996] = 0x6772, [3997] = 0x660A, [3998] = 0x6603, [3999] = 0x65FB,
-  [4000] = 0x6773, [4001] = 0x6635, [4002] = 0x6636, [4003] = 0x6634,
-  [4004] = 0x661C, [4005] = 0x664F, [4006] = 0x6644, [4007] = 0x6649,
-  [4008] = 0x6641, [4009] = 0x665E, [4010] = 0x665D, [4011] = 0x6664,
-  [4012] = 0x6667, [4013] = 0x6668, [4014] = 0x665F, [4015] = 0x6662,
-  [4016] = 0x6670, [4017] = 0x6683, [4018] = 0x6688, [4019] = 0x668E,
-  [4020] = 0x6689, [4021] = 0x6684, [4022] = 0x6698, [4023] = 0x669D,
-  [4024] = 0x66C1, [4025] = 0x66B9, [4026] = 0x66C9, [4027] = 0x66BE,
-  [4028] = 0x66BC, [4032] = 0x66C4, [4033] = 0x66B8, [4034] = 0x66D6,
-  [4035] = 0x66DA, [4036] = 0x66E0, [4037] = 0x663F, [4038] = 0x66E6,
-  [4039] = 0x66E9, [4040] = 0x66F0, [4041] = 0x66F5, [4042] = 0x66F7,
-  [4043] = 0x670F, [4044] = 0x6716, [4045] = 0x671E, [4046] = 0x6726,
-  [4047] = 0x6727, [4048] = 0x9738, [4049] = 0x672E, [4050] = 0x673F,
-  [4051] = 0x6736, [4052] = 0x6741, [4053] = 0x6738, [4054] = 0x6737,
-  [4055] = 0x6746, [4056] = 0x675E, [4057] = 0x6760, [4058] = 0x6759,
-  [4059] = 0x6763, [4060] = 0x6764, [4061] = 0x6789, [4062] = 0x6770,
-  [4063] = 0x67A9, [4064] = 0x677C, [4065] = 0x676A, [4066] = 0x678C,
-  [4067] = 0x678B, [4068] = 0x67A6, [4069] = 0x67A1, [4070] = 0x6785,
-  [4071] = 0x67B7, [4072] = 0x67EF, [4073] = 0x67B4, [4074] = 0x67EC,
-  [4075] = 0x67B3, [4076] = 0x67E9, [4077] = 0x67B8, [4078] = 0x67E4,
-  [4079] = 0x67DE, [4080] = 0x67DD, [4081] = 0x67E2, [4082] = 0x67EE,
-  [4083] = 0x67B9, [4084] = 0x67CE, [4085] = 0x67C6, [4086] = 0x67E7,
-  [4087] = 0x6A9C, [4088] = 0x681E, [4089] = 0x6846, [4090] = 0x6829,
-  [4091] = 0x6840, [4092] = 0x684D, [4093] = 0x6832, [4094] = 0x684E,
-  [4096] = 0x68B3, [4097] = 0x682B, [4098] = 0x6859, [4099] = 0x6863,
-  [4100] = 0x6877, [4101] = 0x687F, [4102] = 0x689F, [4103] = 0x688F,
-  [4104] = 0x68AD, [4105] = 0x6894, [4106] = 0x689D, [4107] = 0x689B,
-  [4108] = 0x6883, [4109] = 0x6AAE, [4110] = 0x68B9, [4111] = 0x6874,
-  [4112] = 0x68B5, [4113] = 0x68A0, [4114] = 0x68BA, [4115] = 0x690F,
-  [4116] = 0x688D, [4117] = 0x687E, [4118] = 0x6901, [4119] = 0x68CA,
-  [4120] = 0x6908, [4121] = 0x68D8, [4122] = 0x6922, [4123] = 0x6926,
-  [4124] = 0x68E1, [4125] = 0x690C, [4126] = 0x68CD, [4127] = 0x68D4,
-  [4128] = 0x68E7, [4129] = 0x68D5, [4130] = 0x6936, [4131] = 0x6912,
-  [4132] = 0x6904, [4133] = 0x68D7, [4134] = 0x68E3, [4135] = 0x6925,
-  [4136] = 0x68F9, [4137] = 0x68E0, [4138] = 0x68EF, [4139] = 0x6928,
-  [4140] = 0x692A, [4141] = 0x691A, [4142] = 0x6923, [4143] = 0x6921,
-  [4144] = 0x68C6, [4145] = 0x6979, [4146] = 0x6977, [4147] = 0x695C,
-  [4148] = 0x6978, [4149] = 0x696B, [4150] = 0x6954, [4151] = 0x697E,
-  [4152] = 0x696E, [4153] = 0x6939, [4154] = 0x6974, [4155] = 0x693D,
-  [4156] = 0x6959, [4157] = 0x6930, [4158] = 0x6961, [4159] = 0x695E,
-  [4160] = 0x695D, [4161] = 0x6981, [4162] = 0x696A, [4163] = 0x69B2,
-  [4164] = 0x69AE, [4165] = 0x69D0, [4166] = 0x69BF, [4167] = 0x69C1,
-  [4168] = 0x69D3, [4169] = 0x69BE, [4170] = 0x69CE, [4171] = 0x5BE8,
-  [4172] = 0x69CA, [4173] = 0x69DD, [4174] = 0x69BB, [4175] = 0x69C3,
-  [4176] = 0x69A7, [4177] = 0x6A2E, [4178] = 0x6991, [4179] = 0x69A0,
-  [4180] = 0x699C, [4181] = 0x6995, [4182] = 0x69B4, [4183] = 0x69DE,
-  [4184] = 0x69E8, [4185] = 0x6A02, [4186] = 0x6A1B, [4187] = 0x69FF,
-  [4188] = 0x6B0A, [4189] = 0x69F9, [4190] = 0x69F2, [4191] = 0x69E7,
-  [4192] = 0x6A05, [4193] = 0x69B1, [4194] = 0x6A1E, [4195] = 0x69ED,
-  [4196] = 0x6A14, [4197] = 0x69EB, [4198] = 0x6A0A, [4199] = 0x6A12,
-  [4200] = 0x6AC1, [4201] = 0x6A23, [4202] = 0x6A13, [4203] = 0x6A44,
-  [4204] = 0x6A0C, [4205] = 0x6A72, [4206] = 0x6A36, [4207] = 0x6A78,
-  [4208] = 0x6A47, [4209] = 0x6A62, [4210] = 0x6A59, [4211] = 0x6A66,
-  [4212] = 0x6A48, [4213] = 0x6A38, [4214] = 0x6A22, [4215] = 0x6A90,
-  [4216] = 0x6A8D, [4217] = 0x6AA0, [4218] = 0x6A84, [4219] = 0x6AA2,
-  [4220] = 0x6AA3, [4224] = 0x6A97, [4225] = 0x8617, [4226] = 0x6ABB,
-  [4227] = 0x6AC3, [4228] = 0x6AC2, [4229] = 0x6AB8, [4230] = 0x6AB3,
-  [4231] = 0x6AAC, [4232] = 0x6ADE, [4233] = 0x6AD1, [4234] = 0x6ADF,
-  [4235] = 0x6AAA, [4236] = 0x6ADA, [4237] = 0x6AEA, [4238] = 0x6AFB,
-  [4239] = 0x6B05, [4240] = 0x8616, [4241] = 0x6AFA, [4242] = 0x6B12,
-  [4243] = 0x6B16, [4244] = 0x9B31, [4245] = 0x6B1F, [4246] = 0x6B38,
-  [4247] = 0x6B37, [4248] = 0x76DC, [4249] = 0x6B39, [4250] = 0x98EE,
-  [4251] = 0x6B47, [4252] = 0x6B43, [4253] = 0x6B49, [4254] = 0x6B50,
-  [4255] = 0x6B59, [4256] = 0x6B54, [4257] = 0x6B5B, [4258] = 0x6B5F,
-  [4259] = 0x6B61, [4260] = 0x6B78, [4261] = 0x6B79, [4262] = 0x6B7F,
-  [4263] = 0x6B80, [4264] = 0x6B84, [4265] = 0x6B83, [4266] = 0x6B8D,
-  [4267] = 0x6B98, [4268] = 0x6B95, [4269] = 0x6B9E, [4270] = 0x6BA4,
-  [4271] = 0x6BAA, [4272] = 0x6BAB, [4273] = 0x6BAF, [4274] = 0x6BB2,
-  [4275] = 0x6BB1, [4276] = 0x6BB3, [4277] = 0x6BB7, [4278] = 0x6BBC,
-  [4279] = 0x6BC6, [4280] = 0x6BCB, [4281] = 0x6BD3, [4282] = 0x6BDF,
-  [4283] = 0x6BEC, [4284] = 0x6BEB, [4285] = 0x6BF3, [4286] = 0x6BEF,
-  [4288] = 0x9EBE, [4289] = 0x6C08, [4290] = 0x6C13, [4291] = 0x6C14,
-  [4292] = 0x6C1B, [4293] = 0x6C24, [4294] = 0x6C23, [4295] = 0x6C5E,
-  [4296] = 0x6C55, [4297] = 0x6C62, [4298] = 0x6C6A, [4299] = 0x6C82,
-  [4300] = 0x6C8D, [4301] = 0x6C9A, [4302] = 0x6C81, [4303] = 0x6C9B,
-  [4304] = 0x6C7E, [4305] = 0x6C68, [4306] = 0x6C73, [4307] = 0x6C92,
-  [4308] = 0x6C90, [4309] = 0x6CC4, [4310] = 0x6CF1, [4311] = 0x6CD3,
-  [4312] = 0x6CBD, [4313] = 0x6CD7, [4314] = 0x6CC5, [4315] = 0x6CDD,
-  [4316] = 0x6CAE, [4317] = 0x6CB1, [4318] = 0x6CBE, [4319] = 0x6CBA,
-  [4320] = 0x6CDB, [4321] = 0x6CEF, [4322] = 0x6CD9, [4323] = 0x6CEA,
-  [4324] = 0x6D1F, [4325] = 0x884D, [4326] = 0x6D36, [4327] = 0x6D2B,
-  [4328] = 0x6D3D, [4329] = 0x6D38, [4330] = 0x6D19, [4331] = 0x6D35,
-  [4332] = 0x6D33, [4333] = 0x6D12, [4334] = 0x6D0C, [4335] = 0x6D63,
-  [4336] = 0x6D93, [4337] = 0x6D64, [4338] = 0x6D5A, [4339] = 0x6D79,
-  [4340] = 0x6D59, [4341] = 0x6D8E, [4342] = 0x6D95, [4343] = 0x6FE4,
-  [4344] = 0x6D85, [4345] = 0x6DF9, [4346] = 0x6E15, [4347] = 0x6E0A,
-  [4348] = 0x6DB5, [4349] = 0x6DC7, [4350] = 0x6DE6, [4351] = 0x6DB8,
-  [4352] = 0x6DC6, [4353] = 0x6DEC, [4354] = 0x6DDE, [4355] = 0x6DCC,
-  [4356] = 0x6DE8, [4357] = 0x6DD2, [4358] = 0x6DC5, [4359] = 0x6DFA,
-  [4360] = 0x6DD9, [4361] = 0x6DE4, [4362] = 0x6DD5, [4363] = 0x6DEA,
-  [4364] = 0x6DEE, [4365] = 0x6E2D, [4366] = 0x6E6E, [4367] = 0x6E2E,
-  [4368] = 0x6E19, [4369] = 0x6E72, [4370] = 0x6E5F, [4371] = 0x6E3E,
-  [4372] = 0x6E23, [4373] = 0x6E6B, [4374] = 0x6E2B, [4375] = 0x6E76,
-  [4376] = 0x6E4D, [4377] = 0x6E1F, [4378] = 0x6E43, [4379] = 0x6E3A,
-  [4380] = 0x6E4E, [4381] = 0x6E24, [4382] = 0x6EFF, [4383] = 0x6E1D,
-  [4384] = 0x6E38, [4385] = 0x6E82, [4386] = 0x6EAA, [4387] = 0x6E98,
-  [4388] = 0x6EC9, [4389] = 0x6EB7, [4390] = 0x6ED3, [4391] = 0x6EBD,
-  [4392] = 0x6EAF, [4393] = 0x6EC4, [4394] = 0x6EB2, [4395] = 0x6ED4,
-  [4396] = 0x6ED5, [4397] = 0x6E8F, [4398] = 0x6EA5, [4399] = 0x6EC2,
-  [4400] = 0x6E9F, [4401] = 0x6F41, [4402] = 0x6F11, [4403] = 0x704C,
-  [4404] = 0x6EEC, [4405] = 0x6EF8, [4406] = 0x6EFE, [4407] = 0x6F3F,
-  [4408] = 0x6EF2, [4409] = 0x6F31, [4410] = 0x6EEF, [4411] = 0x6F32,
-  [4412] = 0x6ECC
-};
-
-
-/* The following table can be generated from the file
-	unix/mappings/eastasia/jis/shiftjis.txt
-   from the Unicode CD (also available on their FTP server) using
-   the command
-
-	egrep '^0x[eE][[:xdigit:]][[:xdigit:]][[:xdigit:]]' \
-	  /mnt/cdrom/unix/mappings/eastasia/jis/shiftjis.txt | perl ~/sjis.pl
-
-   where sjis.pl contains:
-
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  $n = 0;
-  while (<>) {
-    local($sjis, $ucs, %rest) = split;
-    $sjis = hex($sjis) - 0xe040;
-    local($sidx) = int($sjis / 256) * 192 + ($sjis % 256);
-    printf "\n " if (($n % 4) == 0);
-    ++$n;
-    printf " [%4d] = %s,", $sidx, $ucs;
-  }
-  print "\n";
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-static const uint16_t cjk_block4[2021] =
-{
-  [   0] = 0x6F3E, [   1] = 0x6F13, [   2] = 0x6EF7, [   3] = 0x6F86,
-  [   4] = 0x6F7A, [   5] = 0x6F78, [   6] = 0x6F81, [   7] = 0x6F80,
-  [   8] = 0x6F6F, [   9] = 0x6F5B, [  10] = 0x6FF3, [  11] = 0x6F6D,
-  [  12] = 0x6F82, [  13] = 0x6F7C, [  14] = 0x6F58, [  15] = 0x6F8E,
-  [  16] = 0x6F91, [  17] = 0x6FC2, [  18] = 0x6F66, [  19] = 0x6FB3,
-  [  20] = 0x6FA3, [  21] = 0x6FA1, [  22] = 0x6FA4, [  23] = 0x6FB9,
-  [  24] = 0x6FC6, [  25] = 0x6FAA, [  26] = 0x6FDF, [  27] = 0x6FD5,
-  [  28] = 0x6FEC, [  29] = 0x6FD4, [  30] = 0x6FD8, [  31] = 0x6FF1,
-  [  32] = 0x6FEE, [  33] = 0x6FDB, [  34] = 0x7009, [  35] = 0x700B,
-  [  36] = 0x6FFA, [  37] = 0x7011, [  38] = 0x7001, [  39] = 0x700F,
-  [  40] = 0x6FFE, [  41] = 0x701B, [  42] = 0x701A, [  43] = 0x6F74,
-  [  44] = 0x701D, [  45] = 0x7018, [  46] = 0x701F, [  47] = 0x7030,
-  [  48] = 0x703E, [  49] = 0x7032, [  50] = 0x7051, [  51] = 0x7063,
-  [  52] = 0x7099, [  53] = 0x7092, [  54] = 0x70AF, [  55] = 0x70F1,
-  [  56] = 0x70AC, [  57] = 0x70B8, [  58] = 0x70B3, [  59] = 0x70AE,
-  [  60] = 0x70DF, [  61] = 0x70CB, [  62] = 0x70DD, [  64] = 0x70D9,
-  [  65] = 0x7109, [  66] = 0x70FD, [  67] = 0x711C, [  68] = 0x7119,
-  [  69] = 0x7165, [  70] = 0x7155, [  71] = 0x7188, [  72] = 0x7166,
-  [  73] = 0x7162, [  74] = 0x714C, [  75] = 0x7156, [  76] = 0x716C,
-  [  77] = 0x718F, [  78] = 0x71FB, [  79] = 0x7184, [  80] = 0x7195,
-  [  81] = 0x71A8, [  82] = 0x71AC, [  83] = 0x71D7, [  84] = 0x71B9,
-  [  85] = 0x71BE, [  86] = 0x71D2, [  87] = 0x71C9, [  88] = 0x71D4,
-  [  89] = 0x71CE, [  90] = 0x71E0, [  91] = 0x71EC, [  92] = 0x71E7,
-  [  93] = 0x71F5, [  94] = 0x71FC, [  95] = 0x71F9, [  96] = 0x71FF,
-  [  97] = 0x720D, [  98] = 0x7210, [  99] = 0x721B, [ 100] = 0x7228,
-  [ 101] = 0x722D, [ 102] = 0x722C, [ 103] = 0x7230, [ 104] = 0x7232,
-  [ 105] = 0x723B, [ 106] = 0x723C, [ 107] = 0x723F, [ 108] = 0x7240,
-  [ 109] = 0x7246, [ 110] = 0x724B, [ 111] = 0x7258, [ 112] = 0x7274,
-  [ 113] = 0x727E, [ 114] = 0x7282, [ 115] = 0x7281, [ 116] = 0x7287,
-  [ 117] = 0x7292, [ 118] = 0x7296, [ 119] = 0x72A2, [ 120] = 0x72A7,
-  [ 121] = 0x72B9, [ 122] = 0x72B2, [ 123] = 0x72C3, [ 124] = 0x72C6,
-  [ 125] = 0x72C4, [ 126] = 0x72CE, [ 127] = 0x72D2, [ 128] = 0x72E2,
-  [ 129] = 0x72E0, [ 130] = 0x72E1, [ 131] = 0x72F9, [ 132] = 0x72F7,
-  [ 133] = 0x500F, [ 134] = 0x7317, [ 135] = 0x730A, [ 136] = 0x731C,
-  [ 137] = 0x7316, [ 138] = 0x731D, [ 139] = 0x7334, [ 140] = 0x732F,
-  [ 141] = 0x7329, [ 142] = 0x7325, [ 143] = 0x733E, [ 144] = 0x734E,
-  [ 145] = 0x734F, [ 146] = 0x9ED8, [ 147] = 0x7357, [ 148] = 0x736A,
-  [ 149] = 0x7368, [ 150] = 0x7370, [ 151] = 0x7378, [ 152] = 0x7375,
-  [ 153] = 0x737B, [ 154] = 0x737A, [ 155] = 0x73C8, [ 156] = 0x73B3,
-  [ 157] = 0x73CE, [ 158] = 0x73BB, [ 159] = 0x73C0, [ 160] = 0x73E5,
-  [ 161] = 0x73EE, [ 162] = 0x73DE, [ 163] = 0x74A2, [ 164] = 0x7405,
-  [ 165] = 0x746F, [ 166] = 0x7425, [ 167] = 0x73F8, [ 168] = 0x7432,
-  [ 169] = 0x743A, [ 170] = 0x7455, [ 171] = 0x743F, [ 172] = 0x745F,
-  [ 173] = 0x7459, [ 174] = 0x7441, [ 175] = 0x745C, [ 176] = 0x7469,
-  [ 177] = 0x7470, [ 178] = 0x7463, [ 179] = 0x746A, [ 180] = 0x7476,
-  [ 181] = 0x747E, [ 182] = 0x748B, [ 183] = 0x749E, [ 184] = 0x74A7,
-  [ 185] = 0x74CA, [ 186] = 0x74CF, [ 187] = 0x74D4, [ 188] = 0x73F1,
-  [ 192] = 0x74E0, [ 193] = 0x74E3, [ 194] = 0x74E7, [ 195] = 0x74E9,
-  [ 196] = 0x74EE, [ 197] = 0x74F2, [ 198] = 0x74F0, [ 199] = 0x74F1,
-  [ 200] = 0x74F8, [ 201] = 0x74F7, [ 202] = 0x7504, [ 203] = 0x7503,
-  [ 204] = 0x7505, [ 205] = 0x750C, [ 206] = 0x750E, [ 207] = 0x750D,
-  [ 208] = 0x7515, [ 209] = 0x7513, [ 210] = 0x751E, [ 211] = 0x7526,
-  [ 212] = 0x752C, [ 213] = 0x753C, [ 214] = 0x7544, [ 215] = 0x754D,
-  [ 216] = 0x754A, [ 217] = 0x7549, [ 218] = 0x755B, [ 219] = 0x7546,
-  [ 220] = 0x755A, [ 221] = 0x7569, [ 222] = 0x7564, [ 223] = 0x7567,
-  [ 224] = 0x756B, [ 225] = 0x756D, [ 226] = 0x7578, [ 227] = 0x7576,
-  [ 228] = 0x7586, [ 229] = 0x7587, [ 230] = 0x7574, [ 231] = 0x758A,
-  [ 232] = 0x7589, [ 233] = 0x7582, [ 234] = 0x7594, [ 235] = 0x759A,
-  [ 236] = 0x759D, [ 237] = 0x75A5, [ 238] = 0x75A3, [ 239] = 0x75C2,
-  [ 240] = 0x75B3, [ 241] = 0x75C3, [ 242] = 0x75B5, [ 243] = 0x75BD,
-  [ 244] = 0x75B8, [ 245] = 0x75BC, [ 246] = 0x75B1, [ 247] = 0x75CD,
-  [ 248] = 0x75CA, [ 249] = 0x75D2, [ 250] = 0x75D9, [ 251] = 0x75E3,
-  [ 252] = 0x75DE, [ 253] = 0x75FE, [ 254] = 0x75FF, [ 256] = 0x75FC,
-  [ 257] = 0x7601, [ 258] = 0x75F0, [ 259] = 0x75FA, [ 260] = 0x75F2,
-  [ 261] = 0x75F3, [ 262] = 0x760B, [ 263] = 0x760D, [ 264] = 0x7609,
-  [ 265] = 0x761F, [ 266] = 0x7627, [ 267] = 0x7620, [ 268] = 0x7621,
-  [ 269] = 0x7622, [ 270] = 0x7624, [ 271] = 0x7634, [ 272] = 0x7630,
-  [ 273] = 0x763B, [ 274] = 0x7647, [ 275] = 0x7648, [ 276] = 0x7646,
-  [ 277] = 0x765C, [ 278] = 0x7658, [ 279] = 0x7661, [ 280] = 0x7662,
-  [ 281] = 0x7668, [ 282] = 0x7669, [ 283] = 0x766A, [ 284] = 0x7667,
-  [ 285] = 0x766C, [ 286] = 0x7670, [ 287] = 0x7672, [ 288] = 0x7676,
-  [ 289] = 0x7678, [ 290] = 0x767C, [ 291] = 0x7680, [ 292] = 0x7683,
-  [ 293] = 0x7688, [ 294] = 0x768B, [ 295] = 0x768E, [ 296] = 0x7696,
-  [ 297] = 0x7693, [ 298] = 0x7699, [ 299] = 0x769A, [ 300] = 0x76B0,
-  [ 301] = 0x76B4, [ 302] = 0x76B8, [ 303] = 0x76B9, [ 304] = 0x76BA,
-  [ 305] = 0x76C2, [ 306] = 0x76CD, [ 307] = 0x76D6, [ 308] = 0x76D2,
-  [ 309] = 0x76DE, [ 310] = 0x76E1, [ 311] = 0x76E5, [ 312] = 0x76E7,
-  [ 313] = 0x76EA, [ 314] = 0x862F, [ 315] = 0x76FB, [ 316] = 0x7708,
-  [ 317] = 0x7707, [ 318] = 0x7704, [ 319] = 0x7729, [ 320] = 0x7724,
-  [ 321] = 0x771E, [ 322] = 0x7725, [ 323] = 0x7726, [ 324] = 0x771B,
-  [ 325] = 0x7737, [ 326] = 0x7738, [ 327] = 0x7747, [ 328] = 0x775A,
-  [ 329] = 0x7768, [ 330] = 0x776B, [ 331] = 0x775B, [ 332] = 0x7765,
-  [ 333] = 0x777F, [ 334] = 0x777E, [ 335] = 0x7779, [ 336] = 0x778E,
-  [ 337] = 0x778B, [ 338] = 0x7791, [ 339] = 0x77A0, [ 340] = 0x779E,
-  [ 341] = 0x77B0, [ 342] = 0x77B6, [ 343] = 0x77B9, [ 344] = 0x77BF,
-  [ 345] = 0x77BC, [ 346] = 0x77BD, [ 347] = 0x77BB, [ 348] = 0x77C7,
-  [ 349] = 0x77CD, [ 350] = 0x77D7, [ 351] = 0x77DA, [ 352] = 0x77DC,
-  [ 353] = 0x77E3, [ 354] = 0x77EE, [ 355] = 0x77FC, [ 356] = 0x780C,
-  [ 357] = 0x7812, [ 358] = 0x7926, [ 359] = 0x7820, [ 360] = 0x792A,
-  [ 361] = 0x7845, [ 362] = 0x788E, [ 363] = 0x7874, [ 364] = 0x7886,
-  [ 365] = 0x787C, [ 366] = 0x789A, [ 367] = 0x788C, [ 368] = 0x78A3,
-  [ 369] = 0x78B5, [ 370] = 0x78AA, [ 371] = 0x78AF, [ 372] = 0x78D1,
-  [ 373] = 0x78C6, [ 374] = 0x78CB, [ 375] = 0x78D4, [ 376] = 0x78BE,
-  [ 377] = 0x78BC, [ 378] = 0x78C5, [ 379] = 0x78CA, [ 380] = 0x78EC,
-  [ 384] = 0x78E7, [ 385] = 0x78DA, [ 386] = 0x78FD, [ 387] = 0x78F4,
-  [ 388] = 0x7907, [ 389] = 0x7912, [ 390] = 0x7911, [ 391] = 0x7919,
-  [ 392] = 0x792C, [ 393] = 0x792B, [ 394] = 0x7940, [ 395] = 0x7960,
-  [ 396] = 0x7957, [ 397] = 0x795F, [ 398] = 0x795A, [ 399] = 0x7955,
-  [ 400] = 0x7953, [ 401] = 0x797A, [ 402] = 0x797F, [ 403] = 0x798A,
-  [ 404] = 0x799D, [ 405] = 0x79A7, [ 406] = 0x9F4B, [ 407] = 0x79AA,
-  [ 408] = 0x79AE, [ 409] = 0x79B3, [ 410] = 0x79B9, [ 411] = 0x79BA,
-  [ 412] = 0x79C9, [ 413] = 0x79D5, [ 414] = 0x79E7, [ 415] = 0x79EC,
-  [ 416] = 0x79E1, [ 417] = 0x79E3, [ 418] = 0x7A08, [ 419] = 0x7A0D,
-  [ 420] = 0x7A18, [ 421] = 0x7A19, [ 422] = 0x7A20, [ 423] = 0x7A1F,
-  [ 424] = 0x7980, [ 425] = 0x7A31, [ 426] = 0x7A3B, [ 427] = 0x7A3E,
-  [ 428] = 0x7A37, [ 429] = 0x7A43, [ 430] = 0x7A57, [ 431] = 0x7A49,
-  [ 432] = 0x7A61, [ 433] = 0x7A62, [ 434] = 0x7A69, [ 435] = 0x9F9D,
-  [ 436] = 0x7A70, [ 437] = 0x7A79, [ 438] = 0x7A7D, [ 439] = 0x7A88,
-  [ 440] = 0x7A97, [ 441] = 0x7A95, [ 442] = 0x7A98, [ 443] = 0x7A96,
-  [ 444] = 0x7AA9, [ 445] = 0x7AC8, [ 446] = 0x7AB0, [ 448] = 0x7AB6,
-  [ 449] = 0x7AC5, [ 450] = 0x7AC4, [ 451] = 0x7ABF, [ 452] = 0x9083,
-  [ 453] = 0x7AC7, [ 454] = 0x7ACA, [ 455] = 0x7ACD, [ 456] = 0x7ACF,
-  [ 457] = 0x7AD5, [ 458] = 0x7AD3, [ 459] = 0x7AD9, [ 460] = 0x7ADA,
-  [ 461] = 0x7ADD, [ 462] = 0x7AE1, [ 463] = 0x7AE2, [ 464] = 0x7AE6,
-  [ 465] = 0x7AED, [ 466] = 0x7AF0, [ 467] = 0x7B02, [ 468] = 0x7B0F,
-  [ 469] = 0x7B0A, [ 470] = 0x7B06, [ 471] = 0x7B33, [ 472] = 0x7B18,
-  [ 473] = 0x7B19, [ 474] = 0x7B1E, [ 475] = 0x7B35, [ 476] = 0x7B28,
-  [ 477] = 0x7B36, [ 478] = 0x7B50, [ 479] = 0x7B7A, [ 480] = 0x7B04,
-  [ 481] = 0x7B4D, [ 482] = 0x7B0B, [ 483] = 0x7B4C, [ 484] = 0x7B45,
-  [ 485] = 0x7B75, [ 486] = 0x7B65, [ 487] = 0x7B74, [ 488] = 0x7B67,
-  [ 489] = 0x7B70, [ 490] = 0x7B71, [ 491] = 0x7B6C, [ 492] = 0x7B6E,
-  [ 493] = 0x7B9D, [ 494] = 0x7B98, [ 495] = 0x7B9F, [ 496] = 0x7B8D,
-  [ 497] = 0x7B9C, [ 498] = 0x7B9A, [ 499] = 0x7B8B, [ 500] = 0x7B92,
-  [ 501] = 0x7B8F, [ 502] = 0x7B5D, [ 503] = 0x7B99, [ 504] = 0x7BCB,
-  [ 505] = 0x7BC1, [ 506] = 0x7BCC, [ 507] = 0x7BCF, [ 508] = 0x7BB4,
-  [ 509] = 0x7BC6, [ 510] = 0x7BDD, [ 511] = 0x7BE9, [ 512] = 0x7C11,
-  [ 513] = 0x7C14, [ 514] = 0x7BE6, [ 515] = 0x7BE5, [ 516] = 0x7C60,
-  [ 517] = 0x7C00, [ 518] = 0x7C07, [ 519] = 0x7C13, [ 520] = 0x7BF3,
-  [ 521] = 0x7BF7, [ 522] = 0x7C17, [ 523] = 0x7C0D, [ 524] = 0x7BF6,
-  [ 525] = 0x7C23, [ 526] = 0x7C27, [ 527] = 0x7C2A, [ 528] = 0x7C1F,
-  [ 529] = 0x7C37, [ 530] = 0x7C2B, [ 531] = 0x7C3D, [ 532] = 0x7C4C,
-  [ 533] = 0x7C43, [ 534] = 0x7C54, [ 535] = 0x7C4F, [ 536] = 0x7C40,
-  [ 537] = 0x7C50, [ 538] = 0x7C58, [ 539] = 0x7C5F, [ 540] = 0x7C64,
-  [ 541] = 0x7C56, [ 542] = 0x7C65, [ 543] = 0x7C6C, [ 544] = 0x7C75,
-  [ 545] = 0x7C83, [ 546] = 0x7C90, [ 547] = 0x7CA4, [ 548] = 0x7CAD,
-  [ 549] = 0x7CA2, [ 550] = 0x7CAB, [ 551] = 0x7CA1, [ 552] = 0x7CA8,
-  [ 553] = 0x7CB3, [ 554] = 0x7CB2, [ 555] = 0x7CB1, [ 556] = 0x7CAE,
-  [ 557] = 0x7CB9, [ 558] = 0x7CBD, [ 559] = 0x7CC0, [ 560] = 0x7CC5,
-  [ 561] = 0x7CC2, [ 562] = 0x7CD8, [ 563] = 0x7CD2, [ 564] = 0x7CDC,
-  [ 565] = 0x7CE2, [ 566] = 0x9B3B, [ 567] = 0x7CEF, [ 568] = 0x7CF2,
-  [ 569] = 0x7CF4, [ 570] = 0x7CF6, [ 571] = 0x7CFA, [ 572] = 0x7D06,
-  [ 576] = 0x7D02, [ 577] = 0x7D1C, [ 578] = 0x7D15, [ 579] = 0x7D0A,
-  [ 580] = 0x7D45, [ 581] = 0x7D4B, [ 582] = 0x7D2E, [ 583] = 0x7D32,
-  [ 584] = 0x7D3F, [ 585] = 0x7D35, [ 586] = 0x7D46, [ 587] = 0x7D73,
-  [ 588] = 0x7D56, [ 589] = 0x7D4E, [ 590] = 0x7D72, [ 591] = 0x7D68,
-  [ 592] = 0x7D6E, [ 593] = 0x7D4F, [ 594] = 0x7D63, [ 595] = 0x7D93,
-  [ 596] = 0x7D89, [ 597] = 0x7D5B, [ 598] = 0x7D8F, [ 599] = 0x7D7D,
-  [ 600] = 0x7D9B, [ 601] = 0x7DBA, [ 602] = 0x7DAE, [ 603] = 0x7DA3,
-  [ 604] = 0x7DB5, [ 605] = 0x7DC7, [ 606] = 0x7DBD, [ 607] = 0x7DAB,
-  [ 608] = 0x7E3D, [ 609] = 0x7DA2, [ 610] = 0x7DAF, [ 611] = 0x7DDC,
-  [ 612] = 0x7DB8, [ 613] = 0x7D9F, [ 614] = 0x7DB0, [ 615] = 0x7DD8,
-  [ 616] = 0x7DDD, [ 617] = 0x7DE4, [ 618] = 0x7DDE, [ 619] = 0x7DFB,
-  [ 620] = 0x7DF2, [ 621] = 0x7DE1, [ 622] = 0x7E05, [ 623] = 0x7E0A,
-  [ 624] = 0x7E23, [ 625] = 0x7E21, [ 626] = 0x7E12, [ 627] = 0x7E31,
-  [ 628] = 0x7E1F, [ 629] = 0x7E09, [ 630] = 0x7E0B, [ 631] = 0x7E22,
-  [ 632] = 0x7E46, [ 633] = 0x7E66, [ 634] = 0x7E3B, [ 635] = 0x7E35,
-  [ 636] = 0x7E39, [ 637] = 0x7E43, [ 638] = 0x7E37, [ 640] = 0x7E32,
-  [ 641] = 0x7E3A, [ 642] = 0x7E67, [ 643] = 0x7E5D, [ 644] = 0x7E56,
-  [ 645] = 0x7E5E, [ 646] = 0x7E59, [ 647] = 0x7E5A, [ 648] = 0x7E79,
-  [ 649] = 0x7E6A, [ 650] = 0x7E69, [ 651] = 0x7E7C, [ 652] = 0x7E7B,
-  [ 653] = 0x7E83, [ 654] = 0x7DD5, [ 655] = 0x7E7D, [ 656] = 0x8FAE,
-  [ 657] = 0x7E7F, [ 658] = 0x7E88, [ 659] = 0x7E89, [ 660] = 0x7E8C,
-  [ 661] = 0x7E92, [ 662] = 0x7E90, [ 663] = 0x7E93, [ 664] = 0x7E94,
-  [ 665] = 0x7E96, [ 666] = 0x7E8E, [ 667] = 0x7E9B, [ 668] = 0x7E9C,
-  [ 669] = 0x7F38, [ 670] = 0x7F3A, [ 671] = 0x7F45, [ 672] = 0x7F4C,
-  [ 673] = 0x7F4D, [ 674] = 0x7F4E, [ 675] = 0x7F50, [ 676] = 0x7F51,
-  [ 677] = 0x7F55, [ 678] = 0x7F54, [ 679] = 0x7F58, [ 680] = 0x7F5F,
-  [ 681] = 0x7F60, [ 682] = 0x7F68, [ 683] = 0x7F69, [ 684] = 0x7F67,
-  [ 685] = 0x7F78, [ 686] = 0x7F82, [ 687] = 0x7F86, [ 688] = 0x7F83,
-  [ 689] = 0x7F88, [ 690] = 0x7F87, [ 691] = 0x7F8C, [ 692] = 0x7F94,
-  [ 693] = 0x7F9E, [ 694] = 0x7F9D, [ 695] = 0x7F9A, [ 696] = 0x7FA3,
-  [ 697] = 0x7FAF, [ 698] = 0x7FB2, [ 699] = 0x7FB9, [ 700] = 0x7FAE,
-  [ 701] = 0x7FB6, [ 702] = 0x7FB8, [ 703] = 0x8B71, [ 704] = 0x7FC5,
-  [ 705] = 0x7FC6, [ 706] = 0x7FCA, [ 707] = 0x7FD5, [ 708] = 0x7FD4,
-  [ 709] = 0x7FE1, [ 710] = 0x7FE6, [ 711] = 0x7FE9, [ 712] = 0x7FF3,
-  [ 713] = 0x7FF9, [ 714] = 0x98DC, [ 715] = 0x8006, [ 716] = 0x8004,
-  [ 717] = 0x800B, [ 718] = 0x8012, [ 719] = 0x8018, [ 720] = 0x8019,
-  [ 721] = 0x801C, [ 722] = 0x8021, [ 723] = 0x8028, [ 724] = 0x803F,
-  [ 725] = 0x803B, [ 726] = 0x804A, [ 727] = 0x8046, [ 728] = 0x8052,
-  [ 729] = 0x8058, [ 730] = 0x805A, [ 731] = 0x805F, [ 732] = 0x8062,
-  [ 733] = 0x8068, [ 734] = 0x8073, [ 735] = 0x8072, [ 736] = 0x8070,
-  [ 737] = 0x8076, [ 738] = 0x8079, [ 739] = 0x807D, [ 740] = 0x807F,
-  [ 741] = 0x8084, [ 742] = 0x8086, [ 743] = 0x8085, [ 744] = 0x809B,
-  [ 745] = 0x8093, [ 746] = 0x809A, [ 747] = 0x80AD, [ 748] = 0x5190,
-  [ 749] = 0x80AC, [ 750] = 0x80DB, [ 751] = 0x80E5, [ 752] = 0x80D9,
-  [ 753] = 0x80DD, [ 754] = 0x80C4, [ 755] = 0x80DA, [ 756] = 0x80D6,
-  [ 757] = 0x8109, [ 758] = 0x80EF, [ 759] = 0x80F1, [ 760] = 0x811B,
-  [ 761] = 0x8129, [ 762] = 0x8123, [ 763] = 0x812F, [ 764] = 0x814B,
-  [ 768] = 0x968B, [ 769] = 0x8146, [ 770] = 0x813E, [ 771] = 0x8153,
-  [ 772] = 0x8151, [ 773] = 0x80FC, [ 774] = 0x8171, [ 775] = 0x816E,
-  [ 776] = 0x8165, [ 777] = 0x8166, [ 778] = 0x8174, [ 779] = 0x8183,
-  [ 780] = 0x8188, [ 781] = 0x818A, [ 782] = 0x8180, [ 783] = 0x8182,
-  [ 784] = 0x81A0, [ 785] = 0x8195, [ 786] = 0x81A4, [ 787] = 0x81A3,
-  [ 788] = 0x815F, [ 789] = 0x8193, [ 790] = 0x81A9, [ 791] = 0x81B0,
-  [ 792] = 0x81B5, [ 793] = 0x81BE, [ 794] = 0x81B8, [ 795] = 0x81BD,
-  [ 796] = 0x81C0, [ 797] = 0x81C2, [ 798] = 0x81BA, [ 799] = 0x81C9,
-  [ 800] = 0x81CD, [ 801] = 0x81D1, [ 802] = 0x81D9, [ 803] = 0x81D8,
-  [ 804] = 0x81C8, [ 805] = 0x81DA, [ 806] = 0x81DF, [ 807] = 0x81E0,
-  [ 808] = 0x81E7, [ 809] = 0x81FA, [ 810] = 0x81FB, [ 811] = 0x81FE,
-  [ 812] = 0x8201, [ 813] = 0x8202, [ 814] = 0x8205, [ 815] = 0x8207,
-  [ 816] = 0x820A, [ 817] = 0x820D, [ 818] = 0x8210, [ 819] = 0x8216,
-  [ 820] = 0x8229, [ 821] = 0x822B, [ 822] = 0x8238, [ 823] = 0x8233,
-  [ 824] = 0x8240, [ 825] = 0x8259, [ 826] = 0x8258, [ 827] = 0x825D,
-  [ 828] = 0x825A, [ 829] = 0x825F, [ 830] = 0x8264, [ 832] = 0x8262,
-  [ 833] = 0x8268, [ 834] = 0x826A, [ 835] = 0x826B, [ 836] = 0x822E,
-  [ 837] = 0x8271, [ 838] = 0x8277, [ 839] = 0x8278, [ 840] = 0x827E,
-  [ 841] = 0x828D, [ 842] = 0x8292, [ 843] = 0x82AB, [ 844] = 0x829F,
-  [ 845] = 0x82BB, [ 846] = 0x82AC, [ 847] = 0x82E1, [ 848] = 0x82E3,
-  [ 849] = 0x82DF, [ 850] = 0x82D2, [ 851] = 0x82F4, [ 852] = 0x82F3,
-  [ 853] = 0x82FA, [ 854] = 0x8393, [ 855] = 0x8303, [ 856] = 0x82FB,
-  [ 857] = 0x82F9, [ 858] = 0x82DE, [ 859] = 0x8306, [ 860] = 0x82DC,
-  [ 861] = 0x8309, [ 862] = 0x82D9, [ 863] = 0x8335, [ 864] = 0x8334,
-  [ 865] = 0x8316, [ 866] = 0x8332, [ 867] = 0x8331, [ 868] = 0x8340,
-  [ 869] = 0x8339, [ 870] = 0x8350, [ 871] = 0x8345, [ 872] = 0x832F,
-  [ 873] = 0x832B, [ 874] = 0x8317, [ 875] = 0x8318, [ 876] = 0x8385,
-  [ 877] = 0x839A, [ 878] = 0x83AA, [ 879] = 0x839F, [ 880] = 0x83A2,
-  [ 881] = 0x8396, [ 882] = 0x8323, [ 883] = 0x838E, [ 884] = 0x8387,
-  [ 885] = 0x838A, [ 886] = 0x837C, [ 887] = 0x83B5, [ 888] = 0x8373,
-  [ 889] = 0x8375, [ 890] = 0x83A0, [ 891] = 0x8389, [ 892] = 0x83A8,
-  [ 893] = 0x83F4, [ 894] = 0x8413, [ 895] = 0x83EB, [ 896] = 0x83CE,
-  [ 897] = 0x83FD, [ 898] = 0x8403, [ 899] = 0x83D8, [ 900] = 0x840B,
-  [ 901] = 0x83C1, [ 902] = 0x83F7, [ 903] = 0x8407, [ 904] = 0x83E0,
-  [ 905] = 0x83F2, [ 906] = 0x840D, [ 907] = 0x8422, [ 908] = 0x8420,
-  [ 909] = 0x83BD, [ 910] = 0x8438, [ 911] = 0x8506, [ 912] = 0x83FB,
-  [ 913] = 0x846D, [ 914] = 0x842A, [ 915] = 0x843C, [ 916] = 0x855A,
-  [ 917] = 0x8484, [ 918] = 0x8477, [ 919] = 0x846B, [ 920] = 0x84AD,
-  [ 921] = 0x846E, [ 922] = 0x8482, [ 923] = 0x8469, [ 924] = 0x8446,
-  [ 925] = 0x842C, [ 926] = 0x846F, [ 927] = 0x8479, [ 928] = 0x8435,
-  [ 929] = 0x84CA, [ 930] = 0x8462, [ 931] = 0x84B9, [ 932] = 0x84BF,
-  [ 933] = 0x849F, [ 934] = 0x84D9, [ 935] = 0x84CD, [ 936] = 0x84BB,
-  [ 937] = 0x84DA, [ 938] = 0x84D0, [ 939] = 0x84C1, [ 940] = 0x84C6,
-  [ 941] = 0x84D6, [ 942] = 0x84A1, [ 943] = 0x8521, [ 944] = 0x84FF,
-  [ 945] = 0x84F4, [ 946] = 0x8517, [ 947] = 0x8518, [ 948] = 0x852C,
-  [ 949] = 0x851F, [ 950] = 0x8515, [ 951] = 0x8514, [ 952] = 0x84FC,
-  [ 953] = 0x8540, [ 954] = 0x8563, [ 955] = 0x8558, [ 956] = 0x8548,
-  [ 960] = 0x8541, [ 961] = 0x8602, [ 962] = 0x854B, [ 963] = 0x8555,
-  [ 964] = 0x8580, [ 965] = 0x85A4, [ 966] = 0x8588, [ 967] = 0x8591,
-  [ 968] = 0x858A, [ 969] = 0x85A8, [ 970] = 0x856D, [ 971] = 0x8594,
-  [ 972] = 0x859B, [ 973] = 0x85EA, [ 974] = 0x8587, [ 975] = 0x859C,
-  [ 976] = 0x8577, [ 977] = 0x857E, [ 978] = 0x8590, [ 979] = 0x85C9,
-  [ 980] = 0x85BA, [ 981] = 0x85CF, [ 982] = 0x85B9, [ 983] = 0x85D0,
-  [ 984] = 0x85D5, [ 985] = 0x85DD, [ 986] = 0x85E5, [ 987] = 0x85DC,
-  [ 988] = 0x85F9, [ 989] = 0x860A, [ 990] = 0x8613, [ 991] = 0x860B,
-  [ 992] = 0x85FE, [ 993] = 0x85FA, [ 994] = 0x8606, [ 995] = 0x8622,
-  [ 996] = 0x861A, [ 997] = 0x8630, [ 998] = 0x863F, [ 999] = 0x864D,
-  [1000] = 0x4E55, [1001] = 0x8654, [1002] = 0x865F, [1003] = 0x8667,
-  [1004] = 0x8671, [1005] = 0x8693, [1006] = 0x86A3, [1007] = 0x86A9,
-  [1008] = 0x86AA, [1009] = 0x868B, [1010] = 0x868C, [1011] = 0x86B6,
-  [1012] = 0x86AF, [1013] = 0x86C4, [1014] = 0x86C6, [1015] = 0x86B0,
-  [1016] = 0x86C9, [1017] = 0x8823, [1018] = 0x86AB, [1019] = 0x86D4,
-  [1020] = 0x86DE, [1021] = 0x86E9, [1022] = 0x86EC, [1024] = 0x86DF,
-  [1025] = 0x86DB, [1026] = 0x86EF, [1027] = 0x8712, [1028] = 0x8706,
-  [1029] = 0x8708, [1030] = 0x8700, [1031] = 0x8703, [1032] = 0x86FB,
-  [1033] = 0x8711, [1034] = 0x8709, [1035] = 0x870D, [1036] = 0x86F9,
-  [1037] = 0x870A, [1038] = 0x8734, [1039] = 0x873F, [1040] = 0x8737,
-  [1041] = 0x873B, [1042] = 0x8725, [1043] = 0x8729, [1044] = 0x871A,
-  [1045] = 0x8760, [1046] = 0x875F, [1047] = 0x8778, [1048] = 0x874C,
-  [1049] = 0x874E, [1050] = 0x8774, [1051] = 0x8757, [1052] = 0x8768,
-  [1053] = 0x876E, [1054] = 0x8759, [1055] = 0x8753, [1056] = 0x8763,
-  [1057] = 0x876A, [1058] = 0x8805, [1059] = 0x87A2, [1060] = 0x879F,
-  [1061] = 0x8782, [1062] = 0x87AF, [1063] = 0x87CB, [1064] = 0x87BD,
-  [1065] = 0x87C0, [1066] = 0x87D0, [1067] = 0x96D6, [1068] = 0x87AB,
-  [1069] = 0x87C4, [1070] = 0x87B3, [1071] = 0x87C7, [1072] = 0x87C6,
-  [1073] = 0x87BB, [1074] = 0x87EF, [1075] = 0x87F2, [1076] = 0x87E0,
-  [1077] = 0x880F, [1078] = 0x880D, [1079] = 0x87FE, [1080] = 0x87F6,
-  [1081] = 0x87F7, [1082] = 0x880E, [1083] = 0x87D2, [1084] = 0x8811,
-  [1085] = 0x8816, [1086] = 0x8815, [1087] = 0x8822, [1088] = 0x8821,
-  [1089] = 0x8831, [1090] = 0x8836, [1091] = 0x8839, [1092] = 0x8827,
-  [1093] = 0x883B, [1094] = 0x8844, [1095] = 0x8842, [1096] = 0x8852,
-  [1097] = 0x8859, [1098] = 0x885E, [1099] = 0x8862, [1100] = 0x886B,
-  [1101] = 0x8881, [1102] = 0x887E, [1103] = 0x889E, [1104] = 0x8875,
-  [1105] = 0x887D, [1106] = 0x88B5, [1107] = 0x8872, [1108] = 0x8882,
-  [1109] = 0x8897, [1110] = 0x8892, [1111] = 0x88AE, [1112] = 0x8899,
-  [1113] = 0x88A2, [1114] = 0x888D, [1115] = 0x88A4, [1116] = 0x88B0,
-  [1117] = 0x88BF, [1118] = 0x88B1, [1119] = 0x88C3, [1120] = 0x88C4,
-  [1121] = 0x88D4, [1122] = 0x88D8, [1123] = 0x88D9, [1124] = 0x88DD,
-  [1125] = 0x88F9, [1126] = 0x8902, [1127] = 0x88FC, [1128] = 0x88F4,
-  [1129] = 0x88E8, [1130] = 0x88F2, [1131] = 0x8904, [1132] = 0x890C,
-  [1133] = 0x890A, [1134] = 0x8913, [1135] = 0x8943, [1136] = 0x891E,
-  [1137] = 0x8925, [1138] = 0x892A, [1139] = 0x892B, [1140] = 0x8941,
-  [1141] = 0x8944, [1142] = 0x893B, [1143] = 0x8936, [1144] = 0x8938,
-  [1145] = 0x894C, [1146] = 0x891D, [1147] = 0x8960, [1148] = 0x895E,
-  [1152] = 0x8966, [1153] = 0x8964, [1154] = 0x896D, [1155] = 0x896A,
-  [1156] = 0x896F, [1157] = 0x8974, [1158] = 0x8977, [1159] = 0x897E,
-  [1160] = 0x8983, [1161] = 0x8988, [1162] = 0x898A, [1163] = 0x8993,
-  [1164] = 0x8998, [1165] = 0x89A1, [1166] = 0x89A9, [1167] = 0x89A6,
-  [1168] = 0x89AC, [1169] = 0x89AF, [1170] = 0x89B2, [1171] = 0x89BA,
-  [1172] = 0x89BD, [1173] = 0x89BF, [1174] = 0x89C0, [1175] = 0x89DA,
-  [1176] = 0x89DC, [1177] = 0x89DD, [1178] = 0x89E7, [1179] = 0x89F4,
-  [1180] = 0x89F8, [1181] = 0x8A03, [1182] = 0x8A16, [1183] = 0x8A10,
-  [1184] = 0x8A0C, [1185] = 0x8A1B, [1186] = 0x8A1D, [1187] = 0x8A25,
-  [1188] = 0x8A36, [1189] = 0x8A41, [1190] = 0x8A5B, [1191] = 0x8A52,
-  [1192] = 0x8A46, [1193] = 0x8A48, [1194] = 0x8A7C, [1195] = 0x8A6D,
-  [1196] = 0x8A6C, [1197] = 0x8A62, [1198] = 0x8A85, [1199] = 0x8A82,
-  [1200] = 0x8A84, [1201] = 0x8AA8, [1202] = 0x8AA1, [1203] = 0x8A91,
-  [1204] = 0x8AA5, [1205] = 0x8AA6, [1206] = 0x8A9A, [1207] = 0x8AA3,
-  [1208] = 0x8AC4, [1209] = 0x8ACD, [1210] = 0x8AC2, [1211] = 0x8ADA,
-  [1212] = 0x8AEB, [1213] = 0x8AF3, [1214] = 0x8AE7, [1216] = 0x8AE4,
-  [1217] = 0x8AF1, [1218] = 0x8B14, [1219] = 0x8AE0, [1220] = 0x8AE2,
-  [1221] = 0x8AF7, [1222] = 0x8ADE, [1223] = 0x8ADB, [1224] = 0x8B0C,
-  [1225] = 0x8B07, [1226] = 0x8B1A, [1227] = 0x8AE1, [1228] = 0x8B16,
-  [1229] = 0x8B10, [1230] = 0x8B17, [1231] = 0x8B20, [1232] = 0x8B33,
-  [1233] = 0x97AB, [1234] = 0x8B26, [1235] = 0x8B2B, [1236] = 0x8B3E,
-  [1237] = 0x8B28, [1238] = 0x8B41, [1239] = 0x8B4C, [1240] = 0x8B4F,
-  [1241] = 0x8B4E, [1242] = 0x8B49, [1243] = 0x8B56, [1244] = 0x8B5B,
-  [1245] = 0x8B5A, [1246] = 0x8B6B, [1247] = 0x8B5F, [1248] = 0x8B6C,
-  [1249] = 0x8B6F, [1250] = 0x8B74, [1251] = 0x8B7D, [1252] = 0x8B80,
-  [1253] = 0x8B8C, [1254] = 0x8B8E, [1255] = 0x8B92, [1256] = 0x8B93,
-  [1257] = 0x8B96, [1258] = 0x8B99, [1259] = 0x8B9A, [1260] = 0x8C3A,
-  [1261] = 0x8C41, [1262] = 0x8C3F, [1263] = 0x8C48, [1264] = 0x8C4C,
-  [1265] = 0x8C4E, [1266] = 0x8C50, [1267] = 0x8C55, [1268] = 0x8C62,
-  [1269] = 0x8C6C, [1270] = 0x8C78, [1271] = 0x8C7A, [1272] = 0x8C82,
-  [1273] = 0x8C89, [1274] = 0x8C85, [1275] = 0x8C8A, [1276] = 0x8C8D,
-  [1277] = 0x8C8E, [1278] = 0x8C94, [1279] = 0x8C7C, [1280] = 0x8C98,
-  [1281] = 0x621D, [1282] = 0x8CAD, [1283] = 0x8CAA, [1284] = 0x8CBD,
-  [1285] = 0x8CB2, [1286] = 0x8CB3, [1287] = 0x8CAE, [1288] = 0x8CB6,
-  [1289] = 0x8CC8, [1290] = 0x8CC1, [1291] = 0x8CE4, [1292] = 0x8CE3,
-  [1293] = 0x8CDA, [1294] = 0x8CFD, [1295] = 0x8CFA, [1296] = 0x8CFB,
-  [1297] = 0x8D04, [1298] = 0x8D05, [1299] = 0x8D0A, [1300] = 0x8D07,
-  [1301] = 0x8D0F, [1302] = 0x8D0D, [1303] = 0x8D10, [1304] = 0x9F4E,
-  [1305] = 0x8D13, [1306] = 0x8CCD, [1307] = 0x8D14, [1308] = 0x8D16,
-  [1309] = 0x8D67, [1310] = 0x8D6D, [1311] = 0x8D71, [1312] = 0x8D73,
-  [1313] = 0x8D81, [1314] = 0x8D99, [1315] = 0x8DC2, [1316] = 0x8DBE,
-  [1317] = 0x8DBA, [1318] = 0x8DCF, [1319] = 0x8DDA, [1320] = 0x8DD6,
-  [1321] = 0x8DCC, [1322] = 0x8DDB, [1323] = 0x8DCB, [1324] = 0x8DEA,
-  [1325] = 0x8DEB, [1326] = 0x8DDF, [1327] = 0x8DE3, [1328] = 0x8DFC,
-  [1329] = 0x8E08, [1330] = 0x8E09, [1331] = 0x8DFF, [1332] = 0x8E1D,
-  [1333] = 0x8E1E, [1334] = 0x8E10, [1335] = 0x8E1F, [1336] = 0x8E42,
-  [1337] = 0x8E35, [1338] = 0x8E30, [1339] = 0x8E34, [1340] = 0x8E4A,
-  [1344] = 0x8E47, [1345] = 0x8E49, [1346] = 0x8E4C, [1347] = 0x8E50,
-  [1348] = 0x8E48, [1349] = 0x8E59, [1350] = 0x8E64, [1351] = 0x8E60,
-  [1352] = 0x8E2A, [1353] = 0x8E63, [1354] = 0x8E55, [1355] = 0x8E76,
-  [1356] = 0x8E72, [1357] = 0x8E7C, [1358] = 0x8E81, [1359] = 0x8E87,
-  [1360] = 0x8E85, [1361] = 0x8E84, [1362] = 0x8E8B, [1363] = 0x8E8A,
-  [1364] = 0x8E93, [1365] = 0x8E91, [1366] = 0x8E94, [1367] = 0x8E99,
-  [1368] = 0x8EAA, [1369] = 0x8EA1, [1370] = 0x8EAC, [1371] = 0x8EB0,
-  [1372] = 0x8EC6, [1373] = 0x8EB1, [1374] = 0x8EBE, [1375] = 0x8EC5,
-  [1376] = 0x8EC8, [1377] = 0x8ECB, [1378] = 0x8EDB, [1379] = 0x8EE3,
-  [1380] = 0x8EFC, [1381] = 0x8EFB, [1382] = 0x8EEB, [1383] = 0x8EFE,
-  [1384] = 0x8F0A, [1385] = 0x8F05, [1386] = 0x8F15, [1387] = 0x8F12,
-  [1388] = 0x8F19, [1389] = 0x8F13, [1390] = 0x8F1C, [1391] = 0x8F1F,
-  [1392] = 0x8F1B, [1393] = 0x8F0C, [1394] = 0x8F26, [1395] = 0x8F33,
-  [1396] = 0x8F3B, [1397] = 0x8F39, [1398] = 0x8F45, [1399] = 0x8F42,
-  [1400] = 0x8F3E, [1401] = 0x8F4C, [1402] = 0x8F49, [1403] = 0x8F46,
-  [1404] = 0x8F4E, [1405] = 0x8F57, [1406] = 0x8F5C, [1408] = 0x8F62,
-  [1409] = 0x8F63, [1410] = 0x8F64, [1411] = 0x8F9C, [1412] = 0x8F9F,
-  [1413] = 0x8FA3, [1414] = 0x8FAD, [1415] = 0x8FAF, [1416] = 0x8FB7,
-  [1417] = 0x8FDA, [1418] = 0x8FE5, [1419] = 0x8FE2, [1420] = 0x8FEA,
-  [1421] = 0x8FEF, [1422] = 0x9087, [1423] = 0x8FF4, [1424] = 0x9005,
-  [1425] = 0x8FF9, [1426] = 0x8FFA, [1427] = 0x9011, [1428] = 0x9015,
-  [1429] = 0x9021, [1430] = 0x900D, [1431] = 0x901E, [1432] = 0x9016,
-  [1433] = 0x900B, [1434] = 0x9027, [1435] = 0x9036, [1436] = 0x9035,
-  [1437] = 0x9039, [1438] = 0x8FF8, [1439] = 0x904F, [1440] = 0x9050,
-  [1441] = 0x9051, [1442] = 0x9052, [1443] = 0x900E, [1444] = 0x9049,
-  [1445] = 0x903E, [1446] = 0x9056, [1447] = 0x9058, [1448] = 0x905E,
-  [1449] = 0x9068, [1450] = 0x906F, [1451] = 0x9076, [1452] = 0x96A8,
-  [1453] = 0x9072, [1454] = 0x9082, [1455] = 0x907D, [1456] = 0x9081,
-  [1457] = 0x9080, [1458] = 0x908A, [1459] = 0x9089, [1460] = 0x908F,
-  [1461] = 0x90A8, [1462] = 0x90AF, [1463] = 0x90B1, [1464] = 0x90B5,
-  [1465] = 0x90E2, [1466] = 0x90E4, [1467] = 0x6248, [1468] = 0x90DB,
-  [1469] = 0x9102, [1470] = 0x9112, [1471] = 0x9119, [1472] = 0x9132,
-  [1473] = 0x9130, [1474] = 0x914A, [1475] = 0x9156, [1476] = 0x9158,
-  [1477] = 0x9163, [1478] = 0x9165, [1479] = 0x9169, [1480] = 0x9173,
-  [1481] = 0x9172, [1482] = 0x918B, [1483] = 0x9189, [1484] = 0x9182,
-  [1485] = 0x91A2, [1486] = 0x91AB, [1487] = 0x91AF, [1488] = 0x91AA,
-  [1489] = 0x91B5, [1490] = 0x91B4, [1491] = 0x91BA, [1492] = 0x91C0,
-  [1493] = 0x91C1, [1494] = 0x91C9, [1495] = 0x91CB, [1496] = 0x91D0,
-  [1497] = 0x91D6, [1498] = 0x91DF, [1499] = 0x91E1, [1500] = 0x91DB,
-  [1501] = 0x91FC, [1502] = 0x91F5, [1503] = 0x91F6, [1504] = 0x921E,
-  [1505] = 0x91FF, [1506] = 0x9214, [1507] = 0x922C, [1508] = 0x9215,
-  [1509] = 0x9211, [1510] = 0x925E, [1511] = 0x9257, [1512] = 0x9245,
-  [1513] = 0x9249, [1514] = 0x9264, [1515] = 0x9248, [1516] = 0x9295,
-  [1517] = 0x923F, [1518] = 0x924B, [1519] = 0x9250, [1520] = 0x929C,
-  [1521] = 0x9296, [1522] = 0x9293, [1523] = 0x929B, [1524] = 0x925A,
-  [1525] = 0x92CF, [1526] = 0x92B9, [1527] = 0x92B7, [1528] = 0x92E9,
-  [1529] = 0x930F, [1530] = 0x92FA, [1531] = 0x9344, [1532] = 0x932E,
-  [1536] = 0x9319, [1537] = 0x9322, [1538] = 0x931A, [1539] = 0x9323,
-  [1540] = 0x933A, [1541] = 0x9335, [1542] = 0x933B, [1543] = 0x935C,
-  [1544] = 0x9360, [1545] = 0x937C, [1546] = 0x936E, [1547] = 0x9356,
-  [1548] = 0x93B0, [1549] = 0x93AC, [1550] = 0x93AD, [1551] = 0x9394,
-  [1552] = 0x93B9, [1553] = 0x93D6, [1554] = 0x93D7, [1555] = 0x93E8,
-  [1556] = 0x93E5, [1557] = 0x93D8, [1558] = 0x93C3, [1559] = 0x93DD,
-  [1560] = 0x93D0, [1561] = 0x93C8, [1562] = 0x93E4, [1563] = 0x941A,
-  [1564] = 0x9414, [1565] = 0x9413, [1566] = 0x9403, [1567] = 0x9407,
-  [1568] = 0x9410, [1569] = 0x9436, [1570] = 0x942B, [1571] = 0x9435,
-  [1572] = 0x9421, [1573] = 0x943A, [1574] = 0x9441, [1575] = 0x9452,
-  [1576] = 0x9444, [1577] = 0x945B, [1578] = 0x9460, [1579] = 0x9462,
-  [1580] = 0x945E, [1581] = 0x946A, [1582] = 0x9229, [1583] = 0x9470,
-  [1584] = 0x9475, [1585] = 0x9477, [1586] = 0x947D, [1587] = 0x945A,
-  [1588] = 0x947C, [1589] = 0x947E, [1590] = 0x9481, [1591] = 0x947F,
-  [1592] = 0x9582, [1593] = 0x9587, [1594] = 0x958A, [1595] = 0x9594,
-  [1596] = 0x9596, [1597] = 0x9598, [1598] = 0x9599, [1600] = 0x95A0,
-  [1601] = 0x95A8, [1602] = 0x95A7, [1603] = 0x95AD, [1604] = 0x95BC,
-  [1605] = 0x95BB, [1606] = 0x95B9, [1607] = 0x95BE, [1608] = 0x95CA,
-  [1609] = 0x6FF6, [1610] = 0x95C3, [1611] = 0x95CD, [1612] = 0x95CC,
-  [1613] = 0x95D5, [1614] = 0x95D4, [1615] = 0x95D6, [1616] = 0x95DC,
-  [1617] = 0x95E1, [1618] = 0x95E5, [1619] = 0x95E2, [1620] = 0x9621,
-  [1621] = 0x9628, [1622] = 0x962E, [1623] = 0x962F, [1624] = 0x9642,
-  [1625] = 0x964C, [1626] = 0x964F, [1627] = 0x964B, [1628] = 0x9677,
-  [1629] = 0x965C, [1630] = 0x965E, [1631] = 0x965D, [1632] = 0x965F,
-  [1633] = 0x9666, [1634] = 0x9672, [1635] = 0x966C, [1636] = 0x968D,
-  [1637] = 0x9698, [1638] = 0x9695, [1639] = 0x9697, [1640] = 0x96AA,
-  [1641] = 0x96A7, [1642] = 0x96B1, [1643] = 0x96B2, [1644] = 0x96B0,
-  [1645] = 0x96B4, [1646] = 0x96B6, [1647] = 0x96B8, [1648] = 0x96B9,
-  [1649] = 0x96CE, [1650] = 0x96CB, [1651] = 0x96C9, [1652] = 0x96CD,
-  [1653] = 0x894D, [1654] = 0x96DC, [1655] = 0x970D, [1656] = 0x96D5,
-  [1657] = 0x96F9, [1658] = 0x9704, [1659] = 0x9706, [1660] = 0x9708,
-  [1661] = 0x9713, [1662] = 0x970E, [1663] = 0x9711, [1664] = 0x970F,
-  [1665] = 0x9716, [1666] = 0x9719, [1667] = 0x9724, [1668] = 0x972A,
-  [1669] = 0x9730, [1670] = 0x9739, [1671] = 0x973D, [1672] = 0x973E,
-  [1673] = 0x9744, [1674] = 0x9746, [1675] = 0x9748, [1676] = 0x9742,
-  [1677] = 0x9749, [1678] = 0x975C, [1679] = 0x9760, [1680] = 0x9764,
-  [1681] = 0x9766, [1682] = 0x9768, [1683] = 0x52D2, [1684] = 0x976B,
-  [1685] = 0x9771, [1686] = 0x9779, [1687] = 0x9785, [1688] = 0x977C,
-  [1689] = 0x9781, [1690] = 0x977A, [1691] = 0x9786, [1692] = 0x978B,
-  [1693] = 0x978F, [1694] = 0x9790, [1695] = 0x979C, [1696] = 0x97A8,
-  [1697] = 0x97A6, [1698] = 0x97A3, [1699] = 0x97B3, [1700] = 0x97B4,
-  [1701] = 0x97C3, [1702] = 0x97C6, [1703] = 0x97C8, [1704] = 0x97CB,
-  [1705] = 0x97DC, [1706] = 0x97ED, [1707] = 0x9F4F, [1708] = 0x97F2,
-  [1709] = 0x7ADF, [1710] = 0x97F6, [1711] = 0x97F5, [1712] = 0x980F,
-  [1713] = 0x980C, [1714] = 0x9838, [1715] = 0x9824, [1716] = 0x9821,
-  [1717] = 0x9837, [1718] = 0x983D, [1719] = 0x9846, [1720] = 0x984F,
-  [1721] = 0x984B, [1722] = 0x986B, [1723] = 0x986F, [1724] = 0x9870,
-  [1728] = 0x9871, [1729] = 0x9874, [1730] = 0x9873, [1731] = 0x98AA,
-  [1732] = 0x98AF, [1733] = 0x98B1, [1734] = 0x98B6, [1735] = 0x98C4,
-  [1736] = 0x98C3, [1737] = 0x98C6, [1738] = 0x98E9, [1739] = 0x98EB,
-  [1740] = 0x9903, [1741] = 0x9909, [1742] = 0x9912, [1743] = 0x9914,
-  [1744] = 0x9918, [1745] = 0x9921, [1746] = 0x991D, [1747] = 0x991E,
-  [1748] = 0x9924, [1749] = 0x9920, [1750] = 0x992C, [1751] = 0x992E,
-  [1752] = 0x993D, [1753] = 0x993E, [1754] = 0x9942, [1755] = 0x9949,
-  [1756] = 0x9945, [1757] = 0x9950, [1758] = 0x994B, [1759] = 0x9951,
-  [1760] = 0x9952, [1761] = 0x994C, [1762] = 0x9955, [1763] = 0x9997,
-  [1764] = 0x9998, [1765] = 0x99A5, [1766] = 0x99AD, [1767] = 0x99AE,
-  [1768] = 0x99BC, [1769] = 0x99DF, [1770] = 0x99DB, [1771] = 0x99DD,
-  [1772] = 0x99D8, [1773] = 0x99D1, [1774] = 0x99ED, [1775] = 0x99EE,
-  [1776] = 0x99F1, [1777] = 0x99F2, [1778] = 0x99FB, [1779] = 0x99F8,
-  [1780] = 0x9A01, [1781] = 0x9A0F, [1782] = 0x9A05, [1783] = 0x99E2,
-  [1784] = 0x9A19, [1785] = 0x9A2B, [1786] = 0x9A37, [1787] = 0x9A45,
-  [1788] = 0x9A42, [1789] = 0x9A40, [1790] = 0x9A43, [1792] = 0x9A3E,
-  [1793] = 0x9A55, [1794] = 0x9A4D, [1795] = 0x9A5B, [1796] = 0x9A57,
-  [1797] = 0x9A5F, [1798] = 0x9A62, [1799] = 0x9A65, [1800] = 0x9A64,
-  [1801] = 0x9A69, [1802] = 0x9A6B, [1803] = 0x9A6A, [1804] = 0x9AAD,
-  [1805] = 0x9AB0, [1806] = 0x9ABC, [1807] = 0x9AC0, [1808] = 0x9ACF,
-  [1809] = 0x9AD1, [1810] = 0x9AD3, [1811] = 0x9AD4, [1812] = 0x9ADE,
-  [1813] = 0x9ADF, [1814] = 0x9AE2, [1815] = 0x9AE3, [1816] = 0x9AE6,
-  [1817] = 0x9AEF, [1818] = 0x9AEB, [1819] = 0x9AEE, [1820] = 0x9AF4,
-  [1821] = 0x9AF1, [1822] = 0x9AF7, [1823] = 0x9AFB, [1824] = 0x9B06,
-  [1825] = 0x9B18, [1826] = 0x9B1A, [1827] = 0x9B1F, [1828] = 0x9B22,
-  [1829] = 0x9B23, [1830] = 0x9B25, [1831] = 0x9B27, [1832] = 0x9B28,
-  [1833] = 0x9B29, [1834] = 0x9B2A, [1835] = 0x9B2E, [1836] = 0x9B2F,
-  [1837] = 0x9B32, [1838] = 0x9B44, [1839] = 0x9B43, [1840] = 0x9B4F,
-  [1841] = 0x9B4D, [1842] = 0x9B4E, [1843] = 0x9B51, [1844] = 0x9B58,
-  [1845] = 0x9B74, [1846] = 0x9B93, [1847] = 0x9B83, [1848] = 0x9B91,
-  [1849] = 0x9B96, [1850] = 0x9B97, [1851] = 0x9B9F, [1852] = 0x9BA0,
-  [1853] = 0x9BA8, [1854] = 0x9BB4, [1855] = 0x9BC0, [1856] = 0x9BCA,
-  [1857] = 0x9BB9, [1858] = 0x9BC6, [1859] = 0x9BCF, [1860] = 0x9BD1,
-  [1861] = 0x9BD2, [1862] = 0x9BE3, [1863] = 0x9BE2, [1864] = 0x9BE4,
-  [1865] = 0x9BD4, [1866] = 0x9BE1, [1867] = 0x9C3A, [1868] = 0x9BF2,
-  [1869] = 0x9BF1, [1870] = 0x9BF0, [1871] = 0x9C15, [1872] = 0x9C14,
-  [1873] = 0x9C09, [1874] = 0x9C13, [1875] = 0x9C0C, [1876] = 0x9C06,
-  [1877] = 0x9C08, [1878] = 0x9C12, [1879] = 0x9C0A, [1880] = 0x9C04,
-  [1881] = 0x9C2E, [1882] = 0x9C1B, [1883] = 0x9C25, [1884] = 0x9C24,
-  [1885] = 0x9C21, [1886] = 0x9C30, [1887] = 0x9C47, [1888] = 0x9C32,
-  [1889] = 0x9C46, [1890] = 0x9C3E, [1891] = 0x9C5A, [1892] = 0x9C60,
-  [1893] = 0x9C67, [1894] = 0x9C76, [1895] = 0x9C78, [1896] = 0x9CE7,
-  [1897] = 0x9CEC, [1898] = 0x9CF0, [1899] = 0x9D09, [1900] = 0x9D08,
-  [1901] = 0x9CEB, [1902] = 0x9D03, [1903] = 0x9D06, [1904] = 0x9D2A,
-  [1905] = 0x9D26, [1906] = 0x9DAF, [1907] = 0x9D23, [1908] = 0x9D1F,
-  [1909] = 0x9D44, [1910] = 0x9D15, [1911] = 0x9D12, [1912] = 0x9D41,
-  [1913] = 0x9D3F, [1914] = 0x9D3E, [1915] = 0x9D46, [1916] = 0x9D48,
-  [1920] = 0x9D5D, [1921] = 0x9D5E, [1922] = 0x9D64, [1923] = 0x9D51,
-  [1924] = 0x9D50, [1925] = 0x9D59, [1926] = 0x9D72, [1927] = 0x9D89,
-  [1928] = 0x9D87, [1929] = 0x9DAB, [1930] = 0x9D6F, [1931] = 0x9D7A,
-  [1932] = 0x9D9A, [1933] = 0x9DA4, [1934] = 0x9DA9, [1935] = 0x9DB2,
-  [1936] = 0x9DC4, [1937] = 0x9DC1, [1938] = 0x9DBB, [1939] = 0x9DB8,
-  [1940] = 0x9DBA, [1941] = 0x9DC6, [1942] = 0x9DCF, [1943] = 0x9DC2,
-  [1944] = 0x9DD9, [1945] = 0x9DD3, [1946] = 0x9DF8, [1947] = 0x9DE6,
-  [1948] = 0x9DED, [1949] = 0x9DEF, [1950] = 0x9DFD, [1951] = 0x9E1A,
-  [1952] = 0x9E1B, [1953] = 0x9E1E, [1954] = 0x9E75, [1955] = 0x9E79,
-  [1956] = 0x9E7D, [1957] = 0x9E81, [1958] = 0x9E88, [1959] = 0x9E8B,
-  [1960] = 0x9E8C, [1961] = 0x9E92, [1962] = 0x9E95, [1963] = 0x9E91,
-  [1964] = 0x9E9D, [1965] = 0x9EA5, [1966] = 0x9EA9, [1967] = 0x9EB8,
-  [1968] = 0x9EAA, [1969] = 0x9EAD, [1970] = 0x9761, [1971] = 0x9ECC,
-  [1972] = 0x9ECE, [1973] = 0x9ECF, [1974] = 0x9ED0, [1975] = 0x9ED4,
-  [1976] = 0x9EDC, [1977] = 0x9EDE, [1978] = 0x9EDD, [1979] = 0x9EE0,
-  [1980] = 0x9EE5, [1981] = 0x9EE8, [1982] = 0x9EEF, [1984] = 0x9EF4,
-  [1985] = 0x9EF6, [1986] = 0x9EF7, [1987] = 0x9EF9, [1988] = 0x9EFB,
-  [1989] = 0x9EFC, [1990] = 0x9EFD, [1991] = 0x9F07, [1992] = 0x9F08,
-  [1993] = 0x76B7, [1994] = 0x9F15, [1995] = 0x9F21, [1996] = 0x9F2C,
-  [1997] = 0x9F3E, [1998] = 0x9F4A, [1999] = 0x9F52, [2000] = 0x9F54,
-  [2001] = 0x9F63, [2002] = 0x9F5F, [2003] = 0x9F60, [2004] = 0x9F61,
-  [2005] = 0x9F66, [2006] = 0x9F67, [2007] = 0x9F6C, [2008] = 0x9F6A,
-  [2009] = 0x9F77, [2010] = 0x9F72, [2011] = 0x9F76, [2012] = 0x9F95,
-  [2013] = 0x9F9C, [2014] = 0x9FA0, [2015] = 0x582F, [2016] = 0x69C7,
-  [2017] = 0x9059, [2018] = 0x7464, [2019] = 0x51DC, [2020] = 0x7199
-};
-
-
-
-
-/* The following table can be generated using
-
-   awk '/^0x/ { print $2, $1; }' < .../eastasia/jis/shiftjis.txt |
-   egrep "^0x00[[:xdigit:]][[:xdigit:]]" |
-   sort -u | perl tab.pl
-
-   where tab.pl is
-
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   $n=0;
-   while (<>) {
-     local($ucs4, $sjis, %rest) = split;
-     local($u)=hex($ucs4);
-     local($s)=hex($sjis);
-     printf ("\n ") if ($n % 3 == 0);
-     ++$n;
-     printf (" [0x%04x] = \"\\x%02x\\x%02x\",", $u,
-	     $s < 0x100 ? $s : int($s/256), $s < 0x100 ? 0 : $s&255);
-   }
-   printf ("\n");
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-   The only problem is that the shiftjis.txt file does not contain the
-   mapping for the characters 0x00 to 0x1f.  We add them ourself.
-
-   A much bigger problem is that mapping of the tilde and the backslash
-   character.  There are no such characters in SJIS.  The proposed
-   handling is to simply map the two input values to the corresponding
-   byte values of ASCII.  Things fall more or less in place this way.
-*/
-static const char from_ucs4_lat1[0xf8][2] =
-{
-  [0x0000] = "\x00\x00", [0x0001] = "\x01\x00", [0x0002] = "\x02\x00",
-  [0x0003] = "\x03\x00", [0x0004] = "\x04\x00", [0x0005] = "\x05\x00",
-  [0x0006] = "\x06\x00", [0x0007] = "\x07\x00", [0x0008] = "\x08\x00",
-  [0x0009] = "\x09\x00", [0x000a] = "\x0a\x00", [0x000b] = "\x0b\x00",
-  [0x000c] = "\x0c\x00", [0x000d] = "\x0d\x00", [0x000e] = "\x0e\x00",
-  [0x000f] = "\x0f\x00", [0x0010] = "\x10\x00", [0x0011] = "\x11\x00",
-  [0x0012] = "\x12\x00", [0x0013] = "\x13\x00", [0x0014] = "\x14\x00",
-  [0x0015] = "\x15\x00", [0x0016] = "\x16\x00", [0x0017] = "\x17\x00",
-  [0x0018] = "\x18\x00", [0x0019] = "\x19\x00", [0x001a] = "\x1a\x00",
-  [0x001b] = "\x1b\x00", [0x001c] = "\x1c\x00", [0x001d] = "\x1d\x00",
-  [0x001e] = "\x1e\x00", [0x001f] = "\x1f\x00", [0x0020] = "\x20\x00",
-  [0x0021] = "\x21\x00", [0x0022] = "\x22\x00", [0x0023] = "\x23\x00",
-  [0x0024] = "\x24\x00", [0x0025] = "\x25\x00", [0x0026] = "\x26\x00",
-  [0x0027] = "\x27\x00", [0x0028] = "\x28\x00", [0x0029] = "\x29\x00",
-  [0x002a] = "\x2a\x00", [0x002b] = "\x2b\x00", [0x002c] = "\x2c\x00",
-  [0x002d] = "\x2d\x00", [0x002e] = "\x2e\x00", [0x002f] = "\x2f\x00",
-  [0x0030] = "\x30\x00", [0x0031] = "\x31\x00", [0x0032] = "\x32\x00",
-  [0x0033] = "\x33\x00", [0x0034] = "\x34\x00", [0x0035] = "\x35\x00",
-  [0x0036] = "\x36\x00", [0x0037] = "\x37\x00", [0x0038] = "\x38\x00",
-  [0x0039] = "\x39\x00", [0x003a] = "\x3a\x00", [0x003b] = "\x3b\x00",
-  [0x003c] = "\x3c\x00", [0x003d] = "\x3d\x00", [0x003e] = "\x3e\x00",
-  [0x003f] = "\x3f\x00", [0x0040] = "\x40\x00", [0x0041] = "\x41\x00",
-  [0x0042] = "\x42\x00", [0x0043] = "\x43\x00", [0x0044] = "\x44\x00",
-  [0x0045] = "\x45\x00", [0x0046] = "\x46\x00", [0x0047] = "\x47\x00",
-  [0x0048] = "\x48\x00", [0x0049] = "\x49\x00", [0x004a] = "\x4a\x00",
-  [0x004b] = "\x4b\x00", [0x004c] = "\x4c\x00", [0x004d] = "\x4d\x00",
-  [0x004e] = "\x4e\x00", [0x004f] = "\x4f\x00", [0x0050] = "\x50\x00",
-  [0x0051] = "\x51\x00", [0x0052] = "\x52\x00", [0x0053] = "\x53\x00",
-  [0x0054] = "\x54\x00", [0x0055] = "\x55\x00", [0x0056] = "\x56\x00",
-  [0x0057] = "\x57\x00", [0x0058] = "\x58\x00", [0x0059] = "\x59\x00",
-  [0x005a] = "\x5a\x00", [0x005b] = "\x5b\x00", [0x005c] = "\x5c\x00",
-  [0x005d] = "\x5d\x00", [0x005e] = "\x5e\x00", [0x005f] = "\x5f\x00",
-  [0x0060] = "\x60\x00", [0x0061] = "\x61\x00", [0x0062] = "\x62\x00",
-  [0x0063] = "\x63\x00", [0x0064] = "\x64\x00", [0x0065] = "\x65\x00",
-  [0x0066] = "\x66\x00", [0x0067] = "\x67\x00", [0x0068] = "\x68\x00",
-  [0x0069] = "\x69\x00", [0x006a] = "\x6a\x00", [0x006b] = "\x6b\x00",
-  [0x006c] = "\x6c\x00", [0x006d] = "\x6d\x00", [0x006e] = "\x6e\x00",
-  [0x006f] = "\x6f\x00", [0x0070] = "\x70\x00", [0x0071] = "\x71\x00",
-  [0x0072] = "\x72\x00", [0x0073] = "\x73\x00", [0x0074] = "\x74\x00",
-  [0x0075] = "\x75\x00", [0x0076] = "\x76\x00", [0x0077] = "\x77\x00",
-  [0x0078] = "\x78\x00", [0x0079] = "\x79\x00", [0x007a] = "\x7a\x00",
-  [0x007b] = "\x7b\x00", [0x007c] = "\x7c\x00", [0x007d] = "\x7d\x00",
-  [0x007e] = "\x7e\x00", [0x007f] = "\x7f\x00",
-  [0x00a2] = "\x81\x91", [0x00a3] = "\x81\x92", [0x00a5] = "\x5c\x00",
-  [0x00a7] = "\x81\x98", [0x00a8] = "\x81\x4e", [0x00ac] = "\x81\xca",
-  [0x00b0] = "\x81\x8b", [0x00b1] = "\x81\x7d", [0x00b4] = "\x81\x4c",
-  [0x00b6] = "\x81\xf7", [0x00d7] = "\x81\x7e", [0x00f7] = "\x81\x80"
-};
-
-
-/* The following table can be generated using
-
-   awk '/^0x/ { print $2, $1; }' < .../eastasia/jis/shiftjis.txt |
-   egrep "^0x0[34][[:xdigit:]][[:xdigit:]]" |
-   sort -u | perl tab.pl
-
-   where tab.pl is
-
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   $n=0;
-   while (<>) {
-     local($ucs4, $sjis, %rest) = split;
-     local($u)=hex($ucs4);
-     local($s)=hex($sjis);
-     printf ("\n ") if ($n % 3 == 0);
-     ++$n;
-     printf (" [0x%04x] = \"\\x%02x\\x%02x\",", $u - 0x391,
-	     $s < 0x100 ? $s : int($s/256), $s < 0x100 ? 0 : $s&255);
-   }
-   printf ("\n");
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-static const char from_ucs4_greek[193][2] =
-{
-  [0x0000] = "\x83\x9f", [0x0001] = "\x83\xa0", [0x0002] = "\x83\xa1",
-  [0x0003] = "\x83\xa2", [0x0004] = "\x83\xa3", [0x0005] = "\x83\xa4",
-  [0x0006] = "\x83\xa5", [0x0007] = "\x83\xa6", [0x0008] = "\x83\xa7",
-  [0x0009] = "\x83\xa8", [0x000a] = "\x83\xa9", [0x000b] = "\x83\xaa",
-  [0x000c] = "\x83\xab", [0x000d] = "\x83\xac", [0x000e] = "\x83\xad",
-  [0x000f] = "\x83\xae", [0x0010] = "\x83\xaf", [0x0012] = "\x83\xb0",
-  [0x0013] = "\x83\xb1", [0x0014] = "\x83\xb2", [0x0015] = "\x83\xb3",
-  [0x0016] = "\x83\xb4", [0x0017] = "\x83\xb5", [0x0018] = "\x83\xb6",
-  [0x0020] = "\x83\xbf", [0x0021] = "\x83\xc0", [0x0022] = "\x83\xc1",
-  [0x0023] = "\x83\xc2", [0x0024] = "\x83\xc3", [0x0025] = "\x83\xc4",
-  [0x0026] = "\x83\xc5", [0x0027] = "\x83\xc6", [0x0028] = "\x83\xc7",
-  [0x0029] = "\x83\xc8", [0x002a] = "\x83\xc9", [0x002b] = "\x83\xca",
-  [0x002c] = "\x83\xcb", [0x002d] = "\x83\xcc", [0x002e] = "\x83\xcd",
-  [0x002f] = "\x83\xce", [0x0030] = "\x83\xcf", [0x0032] = "\x83\xd0",
-  [0x0033] = "\x83\xd1", [0x0034] = "\x83\xd2", [0x0035] = "\x83\xd3",
-  [0x0036] = "\x83\xd4", [0x0037] = "\x83\xd5", [0x0038] = "\x83\xd6",
-  [0x0070] = "\x84\x46", [0x007f] = "\x84\x40", [0x0080] = "\x84\x41",
-  [0x0081] = "\x84\x42", [0x0082] = "\x84\x43", [0x0083] = "\x84\x44",
-  [0x0084] = "\x84\x45", [0x0085] = "\x84\x47", [0x0086] = "\x84\x48",
-  [0x0087] = "\x84\x49", [0x0088] = "\x84\x4a", [0x0089] = "\x84\x4b",
-  [0x008a] = "\x84\x4c", [0x008b] = "\x84\x4d", [0x008c] = "\x84\x4e",
-  [0x008d] = "\x84\x4f", [0x008e] = "\x84\x50", [0x008f] = "\x84\x51",
-  [0x0090] = "\x84\x52", [0x0091] = "\x84\x53", [0x0092] = "\x84\x54",
-  [0x0093] = "\x84\x55", [0x0094] = "\x84\x56", [0x0095] = "\x84\x57",
-  [0x0096] = "\x84\x58", [0x0097] = "\x84\x59", [0x0098] = "\x84\x5a",
-  [0x0099] = "\x84\x5b", [0x009a] = "\x84\x5c", [0x009b] = "\x84\x5d",
-  [0x009c] = "\x84\x5e", [0x009d] = "\x84\x5f", [0x009e] = "\x84\x60",
-  [0x009f] = "\x84\x70", [0x00a0] = "\x84\x71", [0x00a1] = "\x84\x72",
-  [0x00a2] = "\x84\x73", [0x00a3] = "\x84\x74", [0x00a4] = "\x84\x75",
-  [0x00a5] = "\x84\x77", [0x00a6] = "\x84\x78", [0x00a7] = "\x84\x79",
-  [0x00a8] = "\x84\x7a", [0x00a9] = "\x84\x7b", [0x00aa] = "\x84\x7c",
-  [0x00ab] = "\x84\x7d", [0x00ac] = "\x84\x7e", [0x00ad] = "\x84\x80",
-  [0x00ae] = "\x84\x81", [0x00af] = "\x84\x82", [0x00b0] = "\x84\x83",
-  [0x00b1] = "\x84\x84", [0x00b2] = "\x84\x85", [0x00b3] = "\x84\x86",
-  [0x00b4] = "\x84\x87", [0x00b5] = "\x84\x88", [0x00b6] = "\x84\x89",
-  [0x00b7] = "\x84\x8a", [0x00b8] = "\x84\x8b", [0x00b9] = "\x84\x8c",
-  [0x00ba] = "\x84\x8d", [0x00bb] = "\x84\x8e", [0x00bc] = "\x84\x8f",
-  [0x00bd] = "\x84\x90", [0x00be] = "\x84\x91", [0x00c0] = "\x84\x76"
-};
-
-
-/* The mapping of the Kanji is horrible.  The glyphs covered by Shift JIS
-   are spreaded all around the Unicode CJK area.  We use one big table
-   since using the gaps will not buy us much.
-
-   The following table can be generated using
-
-   awk '/^0x/ { print $2, $1; }' < ...eastasia/jis/shiftjis.txt |
-   egrep "^0x[2-9][[:xdigit:]][[:xdigit:]][[:xdigit:]]" |
-   sort -u | perl tab.pl
-
-   where tab.pl is
-
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   $n=0;
-   while (<>) {
-     local($ucs4, $sjis, %rest) = split;
-     local($u)=hex($ucs4);
-     local($s)=hex($sjis);
-     printf ("\n ") if ($n % 3 == 0);
-     ++$n;
-     printf (" [0x%04x] = \"\\x%02x\\x%02x\",", $u - 0x2010,
-	     $s < 0x100 ? $s : int($s/256), $s < 0x100 ? 0 : $s&255);
-   }
-   printf ("\n");
-   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
-static const char from_ucs4_cjk[32657][2] =
-{
-  [0x0000] = "\x81\x5d", [0x0005] = "\x81\x5c", [0x0006] = "\x81\x61",
-  [0x0008] = "\x81\x65", [0x0009] = "\x81\x66", [0x000c] = "\x81\x67",
-  [0x000d] = "\x81\x68", [0x0010] = "\x81\xf5", [0x0011] = "\x81\xf6",
-  [0x0015] = "\x81\x64", [0x0016] = "\x81\x63", [0x0020] = "\x81\xf1",
-  [0x0022] = "\x81\x8c", [0x0023] = "\x81\x8d", [0x002b] = "\x81\xa6",
-  [0x002e] = "\x7e\x00", [0x00f3] = "\x81\x8e", [0x011b] = "\x81\xf0",
-  [0x0180] = "\x81\xa9", [0x0181] = "\x81\xaa", [0x0182] = "\x81\xa8",
-  [0x0183] = "\x81\xab", [0x01c2] = "\x81\xcb", [0x01c4] = "\x81\xcc",
-  [0x01f0] = "\x81\xcd", [0x01f2] = "\x81\xdd", [0x01f3] = "\x81\xce",
-  [0x01f7] = "\x81\xde", [0x01f8] = "\x81\xb8", [0x01fb] = "\x81\xb9",
-  [0x0202] = "\x81\x7c", [0x020a] = "\x81\xe3", [0x020d] = "\x81\xe5",
-  [0x020e] = "\x81\x87", [0x0210] = "\x81\xda", [0x0217] = "\x81\xc8",
-  [0x0218] = "\x81\xc9", [0x0219] = "\x81\xbf", [0x021a] = "\x81\xbe",
-  [0x021b] = "\x81\xe7", [0x021c] = "\x81\xe8", [0x0224] = "\x81\x88",
-  [0x0225] = "\x81\xe6", [0x022d] = "\x81\xe4", [0x0242] = "\x81\xe0",
-  [0x0250] = "\x81\x82", [0x0251] = "\x81\xdf", [0x0256] = "\x81\x85",
-  [0x0257] = "\x81\x86", [0x025a] = "\x81\xe1", [0x025b] = "\x81\xe2",
-  [0x0272] = "\x81\xbc", [0x0273] = "\x81\xbd", [0x0276] = "\x81\xba",
-  [0x0277] = "\x81\xbb", [0x0295] = "\x81\xdb", [0x0302] = "\x81\xdc",
-  [0x04f0] = "\x84\x9f", [0x04f1] = "\x84\xaa", [0x04f2] = "\x84\xa0",
-  [0x04f3] = "\x84\xab", [0x04fc] = "\x84\xa1", [0x04ff] = "\x84\xac",
-  [0x0500] = "\x84\xa2", [0x0503] = "\x84\xad", [0x0504] = "\x84\xa4",
-  [0x0507] = "\x84\xaf", [0x0508] = "\x84\xa3", [0x050b] = "\x84\xae",
-  [0x050c] = "\x84\xa5", [0x050d] = "\x84\xba", [0x0510] = "\x84\xb5",
-  [0x0513] = "\x84\xb0", [0x0514] = "\x84\xa7", [0x0515] = "\x84\xbc",
-  [0x0518] = "\x84\xb7", [0x051b] = "\x84\xb2", [0x051c] = "\x84\xa6",
-  [0x051f] = "\x84\xb6", [0x0520] = "\x84\xbb", [0x0523] = "\x84\xb1",
-  [0x0524] = "\x84\xa8", [0x0527] = "\x84\xb8", [0x0528] = "\x84\xbd",
-  [0x052b] = "\x84\xb3", [0x052c] = "\x84\xa9", [0x052f] = "\x84\xb9",
-  [0x0532] = "\x84\xbe", [0x053b] = "\x84\xb4", [0x0590] = "\x81\xa1",
-  [0x0591] = "\x81\xa0", [0x05a2] = "\x81\xa3", [0x05a3] = "\x81\xa2",
-  [0x05ac] = "\x81\xa5", [0x05ad] = "\x81\xa4", [0x05b6] = "\x81\x9f",
-  [0x05b7] = "\x81\x9e", [0x05bb] = "\x81\x9b", [0x05be] = "\x81\x9d",
-  [0x05bf] = "\x81\x9c", [0x05df] = "\x81\xfc", [0x05f5] = "\x81\x9a",
-  [0x05f6] = "\x81\x99", [0x0630] = "\x81\x8a", [0x0632] = "\x81\x89",
-  [0x065a] = "\x81\xf4", [0x065d] = "\x81\xf3", [0x065f] = "\x81\xf2",
-  [0x0ff0] = "\x81\x40", [0x0ff1] = "\x81\x41", [0x0ff2] = "\x81\x42",
-  [0x0ff3] = "\x81\x56", [0x0ff5] = "\x81\x58", [0x0ff6] = "\x81\x59",
-  [0x0ff7] = "\x81\x5a", [0x0ff8] = "\x81\x71", [0x0ff9] = "\x81\x72",
-  [0x0ffa] = "\x81\x73", [0x0ffb] = "\x81\x74", [0x0ffc] = "\x81\x75",
-  [0x0ffd] = "\x81\x76", [0x0ffe] = "\x81\x77", [0x0fff] = "\x81\x78",
-  [0x1000] = "\x81\x79", [0x1001] = "\x81\x7a", [0x1002] = "\x81\xa7",
-  [0x1003] = "\x81\xac", [0x1004] = "\x81\x6b", [0x1005] = "\x81\x6c",
-  [0x100c] = "\x81\x60", [0x1031] = "\x82\x9f", [0x1032] = "\x82\xa0",
-  [0x1033] = "\x82\xa1", [0x1034] = "\x82\xa2", [0x1035] = "\x82\xa3",
-  [0x1036] = "\x82\xa4", [0x1037] = "\x82\xa5", [0x1038] = "\x82\xa6",
-  [0x1039] = "\x82\xa7", [0x103a] = "\x82\xa8", [0x103b] = "\x82\xa9",
-  [0x103c] = "\x82\xaa", [0x103d] = "\x82\xab", [0x103e] = "\x82\xac",
-  [0x103f] = "\x82\xad", [0x1040] = "\x82\xae", [0x1041] = "\x82\xaf",
-  [0x1042] = "\x82\xb0", [0x1043] = "\x82\xb1", [0x1044] = "\x82\xb2",
-  [0x1045] = "\x82\xb3", [0x1046] = "\x82\xb4", [0x1047] = "\x82\xb5",
-  [0x1048] = "\x82\xb6", [0x1049] = "\x82\xb7", [0x104a] = "\x82\xb8",
-  [0x104b] = "\x82\xb9", [0x104c] = "\x82\xba", [0x104d] = "\x82\xbb",
-  [0x104e] = "\x82\xbc", [0x104f] = "\x82\xbd", [0x1050] = "\x82\xbe",
-  [0x1051] = "\x82\xbf", [0x1052] = "\x82\xc0", [0x1053] = "\x82\xc1",
-  [0x1054] = "\x82\xc2", [0x1055] = "\x82\xc3", [0x1056] = "\x82\xc4",
-  [0x1057] = "\x82\xc5", [0x1058] = "\x82\xc6", [0x1059] = "\x82\xc7",
-  [0x105a] = "\x82\xc8", [0x105b] = "\x82\xc9", [0x105c] = "\x82\xca",
-  [0x105d] = "\x82\xcb", [0x105e] = "\x82\xcc", [0x105f] = "\x82\xcd",
-  [0x1060] = "\x82\xce", [0x1061] = "\x82\xcf", [0x1062] = "\x82\xd0",
-  [0x1063] = "\x82\xd1", [0x1064] = "\x82\xd2", [0x1065] = "\x82\xd3",
-  [0x1066] = "\x82\xd4", [0x1067] = "\x82\xd5", [0x1068] = "\x82\xd6",
-  [0x1069] = "\x82\xd7", [0x106a] = "\x82\xd8", [0x106b] = "\x82\xd9",
-  [0x106c] = "\x82\xda", [0x106d] = "\x82\xdb", [0x106e] = "\x82\xdc",
-  [0x106f] = "\x82\xdd", [0x1070] = "\x82\xde", [0x1071] = "\x82\xdf",
-  [0x1072] = "\x82\xe0", [0x1073] = "\x82\xe1", [0x1074] = "\x82\xe2",
-  [0x1075] = "\x82\xe3", [0x1076] = "\x82\xe4", [0x1077] = "\x82\xe5",
-  [0x1078] = "\x82\xe6", [0x1079] = "\x82\xe7", [0x107a] = "\x82\xe8",
-  [0x107b] = "\x82\xe9", [0x107c] = "\x82\xea", [0x107d] = "\x82\xeb",
-  [0x107e] = "\x82\xec", [0x107f] = "\x82\xed", [0x1080] = "\x82\xee",
-  [0x1081] = "\x82\xef", [0x1082] = "\x82\xf0", [0x1083] = "\x82\xf1",
-  [0x108b] = "\x81\x4a", [0x108c] = "\x81\x4b", [0x108d] = "\x81\x54",
-  [0x108e] = "\x81\x55", [0x1091] = "\x83\x40", [0x1092] = "\x83\x41",
-  [0x1093] = "\x83\x42", [0x1094] = "\x83\x43", [0x1095] = "\x83\x44",
-  [0x1096] = "\x83\x45", [0x1097] = "\x83\x46", [0x1098] = "\x83\x47",
-  [0x1099] = "\x83\x48", [0x109a] = "\x83\x49", [0x109b] = "\x83\x4a",
-  [0x109c] = "\x83\x4b", [0x109d] = "\x83\x4c", [0x109e] = "\x83\x4d",
-  [0x109f] = "\x83\x4e", [0x10a0] = "\x83\x4f", [0x10a1] = "\x83\x50",
-  [0x10a2] = "\x83\x51", [0x10a3] = "\x83\x52", [0x10a4] = "\x83\x53",
-  [0x10a5] = "\x83\x54", [0x10a6] = "\x83\x55", [0x10a7] = "\x83\x56",
-  [0x10a8] = "\x83\x57", [0x10a9] = "\x83\x58", [0x10aa] = "\x83\x59",
-  [0x10ab] = "\x83\x5a", [0x10ac] = "\x83\x5b", [0x10ad] = "\x83\x5c",
-  [0x10ae] = "\x83\x5d", [0x10af] = "\x83\x5e", [0x10b0] = "\x83\x5f",
-  [0x10b1] = "\x83\x60", [0x10b2] = "\x83\x61", [0x10b3] = "\x83\x62",
-  [0x10b4] = "\x83\x63", [0x10b5] = "\x83\x64", [0x10b6] = "\x83\x65",
-  [0x10b7] = "\x83\x66", [0x10b8] = "\x83\x67", [0x10b9] = "\x83\x68",
-  [0x10ba] = "\x83\x69", [0x10bb] = "\x83\x6a", [0x10bc] = "\x83\x6b",
-  [0x10bd] = "\x83\x6c", [0x10be] = "\x83\x6d", [0x10bf] = "\x83\x6e",
-  [0x10c0] = "\x83\x6f", [0x10c1] = "\x83\x70", [0x10c2] = "\x83\x71",
-  [0x10c3] = "\x83\x72", [0x10c4] = "\x83\x73", [0x10c5] = "\x83\x74",
-  [0x10c6] = "\x83\x75", [0x10c7] = "\x83\x76", [0x10c8] = "\x83\x77",
-  [0x10c9] = "\x83\x78", [0x10ca] = "\x83\x79", [0x10cb] = "\x83\x7a",
-  [0x10cc] = "\x83\x7b", [0x10cd] = "\x83\x7c", [0x10ce] = "\x83\x7d",
-  [0x10cf] = "\x83\x7e", [0x10d0] = "\x83\x80", [0x10d1] = "\x83\x81",
-  [0x10d2] = "\x83\x82", [0x10d3] = "\x83\x83", [0x10d4] = "\x83\x84",
-  [0x10d5] = "\x83\x85", [0x10d6] = "\x83\x86", [0x10d7] = "\x83\x87",
-  [0x10d8] = "\x83\x88", [0x10d9] = "\x83\x89", [0x10da] = "\x83\x8a",
-  [0x10db] = "\x83\x8b", [0x10dc] = "\x83\x8c", [0x10dd] = "\x83\x8d",
-  [0x10de] = "\x83\x8e", [0x10df] = "\x83\x8f", [0x10e0] = "\x83\x90",
-  [0x10e1] = "\x83\x91", [0x10e2] = "\x83\x92", [0x10e3] = "\x83\x93",
-  [0x10e4] = "\x83\x94", [0x10e5] = "\x83\x95", [0x10e6] = "\x83\x96",
-  [0x10eb] = "\x81\x45", [0x10ec] = "\x81\x5b", [0x10ed] = "\x81\x52",
-  [0x10ee] = "\x81\x53", [0x2df0] = "\x88\xea", [0x2df1] = "\x92\x9a",
-  [0x2df3] = "\x8e\xb5", [0x2df7] = "\x96\x9c", [0x2df8] = "\x8f\xe4",
-  [0x2df9] = "\x8e\x4f", [0x2dfa] = "\x8f\xe3", [0x2dfb] = "\x89\xba",
-  [0x2dfd] = "\x95\x73", [0x2dfe] = "\x97\x5e", [0x2e00] = "\x98\xa0",
-  [0x2e01] = "\x89\x4e", [0x2e04] = "\x8a\x8e", [0x2e05] = "\x98\xa1",
-  [0x2e06] = "\x90\xa2", [0x2e07] = "\x99\xc0", [0x2e08] = "\x8b\x75",
-  [0x2e09] = "\x95\xb8", [0x2e0e] = "\x8f\xe5", [0x2e11] = "\x97\xbc",
-  [0x2e16] = "\x95\xc0", [0x2e1a] = "\x98\xa2", [0x2e1d] = "\x92\x86",
-  [0x2e21] = "\x98\xa3", [0x2e22] = "\x8b\xf8", [0x2e26] = "\x98\xa4",
-  [0x2e28] = "\x8a\xdb", [0x2e29] = "\x92\x4f", [0x2e2b] = "\x8e\xe5",
-  [0x2e2c] = "\x98\xa5", [0x2e2f] = "\x98\xa6", [0x2e32] = "\x98\xa7",
-  [0x2e33] = "\x94\x54", [0x2e35] = "\x8b\x76", [0x2e3b] = "\x94\x56",
-  [0x2e3d] = "\x93\xe1", [0x2e3e] = "\x8c\xc1", [0x2e3f] = "\x96\x52",
-  [0x2e45] = "\xe5\x68", [0x2e46] = "\x98\xa8", [0x2e47] = "\x8f\xe6",
-  [0x2e48] = "\x98\xa9", [0x2e49] = "\x89\xb3", [0x2e4d] = "\x8b\xe3",
-  [0x2e4e] = "\x8c\xee", [0x2e4f] = "\x96\xe7", [0x2e52] = "\x9b\xa4",
-  [0x2e61] = "\x97\x90", [0x2e63] = "\x93\xfb", [0x2e6e] = "\x8a\xa3",
-  [0x2e70] = "\x8b\x54", [0x2e72] = "\x98\xaa", [0x2e75] = "\x98\xab",
-  [0x2e76] = "\x97\xb9", [0x2e78] = "\x97\x5c", [0x2e79] = "\x91\x88",
-  [0x2e7a] = "\x98\xad", [0x2e7b] = "\x8e\x96", [0x2e7c] = "\x93\xf1",
-  [0x2e7e] = "\x98\xb0", [0x2e81] = "\x89\x5d", [0x2e82] = "\x8c\xdd",
-  [0x2e84] = "\x8c\xdc", [0x2e85] = "\x88\xe4", [0x2e88] = "\x98\x6a",
-  [0x2e89] = "\x98\x69", [0x2e8b] = "\x8d\xb1", [0x2e8c] = "\x88\x9f",
-  [0x2e8e] = "\x98\xb1", [0x2e8f] = "\x98\xb2", [0x2e90] = "\x98\xb3",
-  [0x2e91] = "\x96\x53", [0x2e92] = "\x98\xb4", [0x2e94] = "\x8c\xf0",
-  [0x2e95] = "\x88\xe5", [0x2e96] = "\x96\x92", [0x2e98] = "\x8b\x9c",
-  [0x2e9b] = "\x8b\x9d", [0x2e9c] = "\x8b\x9e", [0x2e9d] = "\x92\xe0",
-  [0x2e9e] = "\x97\xba", [0x2ea0] = "\x98\xb5", [0x2ea3] = "\x98\xb6",
-  [0x2ea6] = "\x98\xb7", [0x2eaa] = "\x90\x6c", [0x2eb0] = "\x8f\x59",
-  [0x2eb1] = "\x90\x6d", [0x2eb2] = "\x98\xbc", [0x2eb4] = "\x98\xba",
-  [0x2eb6] = "\x98\xbb", [0x2eb7] = "\x8b\x77", [0x2eba] = "\x8d\xa1",
-  [0x2ebb] = "\x89\xee", [0x2ebd] = "\x98\xb9", [0x2ebe] = "\x98\xb8",
-  [0x2ebf] = "\x95\xa7", [0x2ec4] = "\x8e\x65", [0x2ec5] = "\x8e\x64",
-  [0x2ec6] = "\x91\xbc", [0x2ec7] = "\x98\xbd", [0x2ec8] = "\x95\x74",
-  [0x2ec9] = "\x90\xe5", [0x2ecd] = "\x81\x57", [0x2ece] = "\x98\xbe",
-  [0x2ecf] = "\x98\xc0", [0x2ed3] = "\x91\xe3", [0x2ed4] = "\x97\xdf",
-  [0x2ed5] = "\x88\xc8", [0x2edd] = "\x98\xbf", [0x2ede] = "\x89\xbc",
-  [0x2ee0] = "\x8b\xc2", [0x2ee2] = "\x92\x87", [0x2ee6] = "\x8c\x8f",
-  [0x2ee7] = "\x98\xc1", [0x2eeb] = "\x94\x43", [0x2ef1] = "\x8a\xe9",
-  [0x2ef9] = "\x98\xc2", [0x2efa] = "\x88\xc9", [0x2efd] = "\x8c\xde",
-  [0x2efe] = "\x8a\xea", [0x2eff] = "\x95\x9a", [0x2f00] = "\x94\xb0",
-  [0x2f01] = "\x8b\x78", [0x2f0a] = "\x89\xef", [0x2f0c] = "\x98\xe5",
-  [0x2f0d] = "\x93\x60", [0x2f1f] = "\x94\x8c", [0x2f20] = "\x98\xc4",
-  [0x2f24] = "\x94\xba", [0x2f26] = "\x97\xe0", [0x2f28] = "\x90\x4c",
-  [0x2f2a] = "\x8e\x66", [0x2f2c] = "\x8e\x97", [0x2f2d] = "\x89\xbe",
-  [0x2f33] = "\x92\xcf", [0x2f36] = "\x92\x41", [0x2f37] = "\x98\xc8",
-  [0x2f3d] = "\x88\xca", [0x2f3e] = "\x92\xe1", [0x2f3f] = "\x8f\x5a",
-  [0x2f40] = "\x8d\xb2", [0x2f41] = "\x97\x43", [0x2f43] = "\x91\xcc",
-  [0x2f45] = "\x89\xbd", [0x2f47] = "\x98\xc7", [0x2f49] = "\x97\x5d",
-  [0x2f4a] = "\x98\xc3", [0x2f4b] = "\x98\xc5", [0x2f4c] = "\x8d\xec",
-  [0x2f4d] = "\x98\xc6", [0x2f4e] = "\x9b\x43", [0x2f59] = "\x98\xce",
-  [0x2f5f] = "\x98\xd1", [0x2f60] = "\x98\xcf", [0x2f63] = "\x89\xc0",
-  [0x2f65] = "\x95\xb9", [0x2f66] = "\x98\xc9", [0x2f6b] = "\x98\xcd",
-  [0x2f6c] = "\x8c\xf1", [0x2f6f] = "\x8e\x67", [0x2f73] = "\x8a\xa4",
-  [0x2f76] = "\x98\xd2", [0x2f78] = "\x98\xca", [0x2f7b] = "\x97\xe1",
-  [0x2f7d] = "\x8e\x98", [0x2f7f] = "\x98\xcb", [0x2f81] = "\x98\xd0",
-  [0x2f86] = "\x98\xd3", [0x2f88] = "\x98\xcc", [0x2f8b] = "\x8b\x9f",
-  [0x2f8d] = "\x88\xcb", [0x2f90] = "\x8b\xa0", [0x2f91] = "\x89\xbf",
-  [0x2f9b] = "\x9b\x44", [0x2f9d] = "\x96\x99", [0x2f9e] = "\x95\x8e",
-  [0x2f9f] = "\x8c\xf2", [0x2fa5] = "\x90\x4e", [0x2fa6] = "\x97\xb5",
-  [0x2faf] = "\x95\xd6", [0x2fb2] = "\x8c\x57", [0x2fb3] = "\x91\xa3",
-  [0x2fb4] = "\x89\xe2", [0x2fba] = "\x8f\x72", [0x2fbe] = "\x98\xd7",
-  [0x2fc0] = "\x98\xdc", [0x2fc1] = "\x98\xda", [0x2fc4] = "\x98\xd5",
-  [0x2fc7] = "\x91\xad", [0x2fc8] = "\x98\xd8", [0x2fca] = "\x98\xdb",
-  [0x2fcb] = "\x98\xd9", [0x2fcd] = "\x95\xdb", [0x2fcf] = "\x98\xd6",
-  [0x2fd1] = "\x90\x4d", [0x2fd3] = "\x96\x93", [0x2fd4] = "\x98\xdd",
-  [0x2fd5] = "\x98\xde", [0x2fde] = "\x8f\x43", [0x2fdf] = "\x98\xeb",
-  [0x2fe3] = "\x94\x6f", [0x2fe5] = "\x95\x55", [0x2fe6] = "\x98\xe6",
-  [0x2fe8] = "\x95\xee", [0x2fea] = "\x89\xb4", [0x2fee] = "\x98\xea",
-  [0x2ff5] = "\x98\xe4", [0x2ff6] = "\x98\xed", [0x2ff9] = "\x91\x71",
-  [0x2ffb] = "\x8c\xc2", [0x2ffd] = "\x94\x7b", [0x2fff] = "\xe0\xc5",
-  [0x3001] = "\x98\xec", [0x3002] = "\x93\x7c", [0x3004] = "\x98\xe1",
-  [0x3006] = "\x8c\xf4", [0x3009] = "\x8c\xf3", [0x300a] = "\x98\xdf",
-  [0x300f] = "\x8e\xd8", [0x3011] = "\x98\xe7", [0x3013] = "\x95\xed",
-  [0x3014] = "\x92\x6c", [0x3015] = "\x98\xe3", [0x3016] = "\x8c\x91",
-  [0x3018] = "\x98\xe0", [0x3019] = "\x98\xe8", [0x301a] = "\x98\xe2",
-  [0x301b] = "\x97\xcf", [0x301c] = "\x98\xe9", [0x301d] = "\x98\x60",
-  [0x3026] = "\x8b\xe4", [0x3029] = "\x8c\x90", [0x3033] = "\x98\xee",
-  [0x3037] = "\x98\xef", [0x3038] = "\x98\xf3", [0x3039] = "\x88\xcc",
-  [0x303f] = "\x95\xce", [0x3040] = "\x98\xf2", [0x3045] = "\x98\xf1",
-  [0x3046] = "\x98\xf5", [0x304a] = "\x98\xf4", [0x304c] = "\x92\xe2",
-  [0x3055] = "\x8c\x92", [0x305c] = "\x98\xf6", [0x3062] = "\x8e\xc3",
-  [0x3064] = "\x91\xa4", [0x3065] = "\x92\xe3", [0x3066] = "\x8b\xf4",
-  [0x3068] = "\x98\xf7", [0x306d] = "\x8b\x55", [0x3070] = "\x98\xf8",
-  [0x3075] = "\x98\xfa", [0x307d] = "\x96\x54", [0x3081] = "\x8c\x86",
-  [0x3088] = "\x8e\x50", [0x3089] = "\x94\xf5", [0x308a] = "\x98\xf9",
-  [0x309c] = "\x8d\xc3", [0x309d] = "\x97\x62", [0x30a2] = "\x98\xfc",
-  [0x30a3] = "\x99\x42", [0x30a4] = "\x98\xfb", [0x30a5] = "\x8d\xc2",
-  [0x30a7] = "\x8f\x9d", [0x30ae] = "\x8c\x58", [0x30b2] = "\x99\x43",
-  [0x30b5] = "\x8b\xcd", [0x30b9] = "\x99\x40", [0x30ba] = "\x99\x41",
-  [0x30bd] = "\x93\xad", [0x30bf] = "\x91\x9c", [0x30c1] = "\x8b\xa1",
-  [0x30c5] = "\x96\x6c", [0x30c6] = "\x99\x44", [0x30ca] = "\x97\xbb",
-  [0x30ce] = "\x99\x45", [0x30d3] = "\x99\x48", [0x30d5] = "\x99\x46",
-  [0x30d7] = "\x91\x6d", [0x30dd] = "\x99\x47", [0x30de] = "\x99\x49",
-  [0x30e5] = "\x99\x4b", [0x30e9] = "\x99\x4a", [0x30eb] = "\x95\xc6",
-  [0x30f0] = "\x8b\x56", [0x30f1] = "\x99\x4d", [0x30f2] = "\x99\x4e",
-  [0x30f4] = "\x89\xad", [0x30f9] = "\x99\x4c", [0x3102] = "\x8e\xf2",
-  [0x3104] = "\x99\x51", [0x3105] = "\x99\x50", [0x3106] = "\x99\x4f",
-  [0x3108] = "\x98\xd4", [0x310a] = "\x99\x52", [0x310f] = "\x8f\x9e",
-  [0x3111] = "\x99\x53", [0x311a] = "\x97\x44", [0x3122] = "\x96\xd7",
-  [0x3127] = "\x99\x55", [0x312a] = "\x99\x54", [0x312b] = "\x99\x57",
-  [0x312c] = "\x99\x56", [0x312f] = "\x99\x58", [0x3130] = "\x99\x59",
-  [0x3131] = "\x88\xf2", [0x3133] = "\x8c\xb3", [0x3134] = "\x8c\x5a",
-  [0x3135] = "\x8f\x5b", [0x3136] = "\x92\x9b", [0x3137] = "\x8b\xa2",
-  [0x3138] = "\x90\xe6", [0x3139] = "\x8c\xf5", [0x313b] = "\x8d\x8e",
-  [0x313c] = "\x99\x5b", [0x313d] = "\x96\xc6", [0x313e] = "\x93\x65",
-  [0x3140] = "\x8e\x99", [0x3142] = "\x99\x5a", [0x3144] = "\x99\x5c",
-  [0x314a] = "\x93\x7d", [0x314c] = "\x8a\x95", [0x3152] = "\x99\x5d",
-  [0x3155] = "\x93\xfc", [0x3158] = "\x91\x53", [0x3159] = "\x99\x5f",
-  [0x315a] = "\x99\x60", [0x315b] = "\x94\xaa", [0x315c] = "\x8c\xf6",
-  [0x315d] = "\x98\x5a", [0x315e] = "\x99\x61", [0x3161] = "\x8b\xa4",
-  [0x3165] = "\x95\xba", [0x3166] = "\x91\xb4", [0x3167] = "\x8b\xef",
-  [0x3168] = "\x93\x54", [0x316c] = "\x8c\x93", [0x3170] = "\x99\x62",
-  [0x3172] = "\x99\x63", [0x3175] = "\x93\xe0", [0x3176] = "\x89\x7e",
-  [0x3179] = "\x99\x66", [0x317a] = "\x8d\xfb", [0x317c] = "\x99\x65",
-  [0x317d] = "\x8d\xc4", [0x317f] = "\x99\x67", [0x3180] = "\xe3\xec",
-  [0x3181] = "\x99\x68", [0x3182] = "\x96\x60", [0x3183] = "\x99\x69",
-  [0x3185] = "\x99\x6a", [0x3186] = "\x99\x6b", [0x3187] = "\x8f\xe7",
-  [0x3189] = "\x8e\xca", [0x3190] = "\x8a\xa5", [0x3192] = "\x99\x6e",
-  [0x3194] = "\x99\x6c", [0x3195] = "\x96\xbb", [0x3196] = "\x99\x6d",
-  [0x3198] = "\x95\x79", [0x3199] = "\x99\x6f", [0x319a] = "\x99\x70",
-  [0x319b] = "\x99\x71", [0x319c] = "\x93\x7e", [0x31a0] = "\x99\x75",
-  [0x31a1] = "\x99\x73", [0x31a2] = "\x99\x74", [0x31a3] = "\x99\x72",
-  [0x31a4] = "\x8d\xe1", [0x31a5] = "\x99\x76", [0x31a6] = "\x96\xe8",
-  [0x31a7] = "\x97\xe2", [0x31ad] = "\x99\x77", [0x31b4] = "\x90\xa6",
-  [0x31b5] = "\x99\x78", [0x31b6] = "\x8f\x79", [0x31b9] = "\x99\x79",
-  [0x31bb] = "\x92\x9c", [0x31bc] = "\x97\xbd", [0x31bd] = "\x93\x80",
-  [0x31c6] = "\x99\xc3", [0x31cb] = "\x99\x7a", [0x31cc] = "\xea\xa3",
-  [0x31cd] = "\x8b\xc3", [0x31d0] = "\x99\x7b", [0x31d1] = "\x96\x7d",
-  [0x31d6] = "\x8f\x88", [0x31d7] = "\x91\xfa", [0x31d9] = "\x99\x7d",
-  [0x31da] = "\x93\xe2", [0x31dd] = "\x99\x7e", [0x31e0] = "\x99\x80",
-  [0x31e1] = "\x8a\x4d", [0x31e5] = "\x99\x81", [0x31e6] = "\x8b\xa5",
-  [0x31e8] = "\x93\xca", [0x31e9] = "\x89\x9a", [0x31ea] = "\x8f\x6f",
-  [0x31ed] = "\x94\x9f", [0x31ee] = "\x99\x82", [0x31f0] = "\x93\x81",
-  [0x31f3] = "\x90\x6e", [0x31f4] = "\x99\x83", [0x31f6] = "\x95\xaa",
-  [0x31f7] = "\x90\xd8", [0x31f8] = "\x8a\xa0", [0x31fa] = "\x8a\xa7",
-  [0x31fb] = "\x99\x84", [0x31fe] = "\x99\x86", [0x3201] = "\x8c\x59",
-  [0x3204] = "\x99\x85", [0x3207] = "\x97\xf1", [0x320d] = "\x8f\x89",
-  [0x3214] = "\x94\xbb", [0x3215] = "\x95\xca", [0x3217] = "\x99\x87",
-  [0x3219] = "\x97\x98", [0x321a] = "\x99\x88", [0x321e] = "\x99\x89",
-  [0x3220] = "\x93\x9e", [0x3223] = "\x99\x8a", [0x3226] = "\x90\xa7",
-  [0x3227] = "\x8d\xfc", [0x3228] = "\x8c\x94", [0x3229] = "\x99\x8b",
-  [0x322a] = "\x8e\x68", [0x322b] = "\x8d\x8f", [0x3233] = "\x92\xe4",
-  [0x3234] = "\x99\x8d", [0x3237] = "\x91\xa5", [0x323a] = "\x8d\xed",
-  [0x323b] = "\x99\x8e", [0x323c] = "\x99\x8f", [0x323d] = "\x91\x4f",
-  [0x323f] = "\x99\x8c", [0x3244] = "\x99\x91", [0x3246] = "\x96\x55",
-  [0x324b] = "\x8d\x84", [0x324e] = "\x99\x90", [0x3253] = "\x8c\x95",
-  [0x3254] = "\x8d\xdc", [0x3255] = "\x94\x8d", [0x3259] = "\x99\x94",
-  [0x325a] = "\x99\x92", [0x325f] = "\x95\x9b", [0x3260] = "\x8f\xe8",
-  [0x3261] = "\x99\x9b", [0x3262] = "\x8a\x84", [0x3263] = "\x99\x95",
-  [0x3264] = "\x99\x93", [0x3265] = "\x91\x6e", [0x326d] = "\x99\x97",
-  [0x326f] = "\x99\x96", [0x3273] = "\x8a\x63", [0x3277] = "\x8c\x80",
-  [0x3278] = "\x99\x9c", [0x3279] = "\x97\xab", [0x327d] = "\x99\x98",
-  [0x3281] = "\x99\x9d", [0x3282] = "\x99\x9a", [0x3284] = "\x99\x99",
-  [0x328b] = "\x97\xcd", [0x328f] = "\x8c\xf7", [0x3290] = "\x89\xc1",
-  [0x3293] = "\x97\xf2", [0x3299] = "\x8f\x95", [0x329a] = "\x93\x77",
-  [0x329b] = "\x8d\x85", [0x329c] = "\x99\xa0", [0x329d] = "\x99\xa1",
-  [0x32a1] = "\x97\xe3", [0x32a4] = "\x98\x4a", [0x32a5] = "\x99\xa3",
-  [0x32a9] = "\x8c\xf8", [0x32ac] = "\x99\xa2", [0x32ae] = "\x8a\x4e",
-  [0x32b1] = "\x99\xa4", [0x32b3] = "\x96\x75", [0x32b5] = "\x92\xba",
-  [0x32b7] = "\x97\x45", [0x32b9] = "\x95\xd7", [0x32bd] = "\x99\xa5",
-  [0x32c2] = "\xe8\xd3", [0x32c5] = "\x93\xae", [0x32c7] = "\x99\xa6",
-  [0x32c8] = "\x8a\xa8", [0x32c9] = "\x96\xb1", [0x32cd] = "\x8f\x9f",
-  [0x32ce] = "\x99\xa7", [0x32cf] = "\x95\xe5", [0x32d0] = "\x99\xab",
-  [0x32d2] = "\x90\xa8", [0x32d3] = "\x99\xa8", [0x32d4] = "\x8b\xce",
-  [0x32d6] = "\x99\xa9", [0x32d7] = "\x8a\xa9", [0x32e2] = "\x8c\x4d",
-  [0x32e3] = "\x99\xac", [0x32e5] = "\x99\xad", [0x32e8] = "\x99\xae",
-  [0x32e9] = "\x99\xaf", [0x32ea] = "\x8e\xd9", [0x32ee] = "\x8c\xf9",
-  [0x32ef] = "\x96\xdc", [0x32f1] = "\x96\xe6", [0x32f2] = "\x93\xf5",
-  [0x32f5] = "\x95\xef", [0x32f6] = "\x99\xb0", [0x32f8] = "\x99\xb1",
-  [0x32fd] = "\x99\xb3", [0x32ff] = "\x99\xb5", [0x3300] = "\x99\xb4",
-  [0x3305] = "\x99\xb6", [0x3306] = "\x89\xbb", [0x3307] = "\x96\x6b",
-  [0x3309] = "\x8d\xfa", [0x330a] = "\x99\xb7", [0x330d] = "\x91\x78",
-  [0x3310] = "\x8f\xa0", [0x3311] = "\x8b\xa7", [0x3313] = "\x99\xb8",
-  [0x331a] = "\x94\xd9", [0x331f] = "\x99\xb9", [0x3321] = "\x99\xba",
-  [0x3323] = "\x99\xbb", [0x3328] = "\x99\xbc", [0x3329] = "\x95\x43",
-  [0x332a] = "\x8b\xe6", [0x332b] = "\x88\xe3", [0x332f] = "\x93\xbd",
-  [0x3330] = "\x99\xbd", [0x3331] = "\x8f\x5c", [0x3333] = "\x90\xe7",
-  [0x3335] = "\x99\xbf", [0x3336] = "\x99\xbe", [0x3337] = "\x8f\xa1",
-  [0x3338] = "\x8c\xdf", [0x3339] = "\x99\xc1", [0x333a] = "\x94\xbc",
-  [0x333d] = "\x99\xc2", [0x3341] = "\x94\xda", [0x3342] = "\x91\xb2",
-  [0x3343] = "\x91\xec", [0x3344] = "\x8b\xa6", [0x3347] = "\x93\xec",
-  [0x3348] = "\x92\x50", [0x334a] = "\x94\x8e", [0x334c] = "\x96\x6d",
-  [0x334e] = "\x99\xc4", [0x3350] = "\x90\xe8", [0x3356] = "\x8c\x54",
-  [0x3359] = "\x99\xc5", [0x335e] = "\x99\xc6", [0x335f] = "\x89\x4b",
-  [0x3360] = "\x88\xf3", [0x3361] = "\x8a\xeb", [0x3363] = "\x91\xa6",
-  [0x3364] = "\x8b\x70", [0x3365] = "\x97\x91", [0x3367] = "\x99\xc9",
-  [0x3368] = "\x89\xb5", [0x336b] = "\x99\xc8", [0x336f] = "\x8b\xa8",
-  [0x3372] = "\x99\xca", [0x3374] = "\x96\xef", [0x3386] = "\x99\xcb",
-  [0x3388] = "\x97\xd0", [0x338a] = "\x8c\xfa", [0x338f] = "\x8c\xb4",
-  [0x3390] = "\x99\xcc", [0x3395] = "\x99\xce", [0x3396] = "\x99\xcd",
-  [0x3398] = "\x90\x7e", [0x3399] = "\x89\x58", [0x339d] = "\x89\x7d",
-  [0x339e] = "\x99\xcf", [0x33a0] = "\x99\xd0", [0x33a3] = "\x8c\xb5",
-  [0x33a6] = "\x99\xd1", [0x33ab] = "\x8b\x8e", [0x33b2] = "\x8e\x51",
-  [0x33b3] = "\x99\xd2", [0x33b8] = "\x96\x94", [0x33b9] = "\x8d\xb3",
-  [0x33ba] = "\x8b\x79", [0x33bb] = "\x97\x46", [0x33bc] = "\x91\x6f",
-  [0x33bd] = "\x94\xbd", [0x33be] = "\x8e\xfb", [0x33c4] = "\x8f\x66",
-  [0x33c6] = "\x8e\xe6", [0x33c7] = "\x8e\xf3", [0x33c9] = "\x8f\x96",
-  [0x33cb] = "\x94\xbe", [0x33cf] = "\x99\xd5", [0x33d1] = "\x89\x62",
-  [0x33d2] = "\x91\x70", [0x33d3] = "\x8c\xfb", [0x33d4] = "\x8c\xc3",
-  [0x33d5] = "\x8b\xe5", [0x33d8] = "\x99\xd9", [0x33d9] = "\x92\x40",
-  [0x33da] = "\x91\xfc", [0x33db] = "\x8b\xa9", [0x33dc] = "\x8f\xa2",
-  [0x33dd] = "\x99\xda", [0x33de] = "\x99\xd8", [0x33df] = "\x89\xc2",
-  [0x33e0] = "\x91\xe4", [0x33e1] = "\x8e\xb6", [0x33e2] = "\x8e\x6a",
-  [0x33e3] = "\x89\x45", [0x33e6] = "\x8a\x90", [0x33e7] = "\x8d\x86",
-  [0x33e8] = "\x8e\x69", [0x33ea] = "\x99\xdb", [0x33f1] = "\x99\xdc",
-  [0x33f3] = "\x8b\x68", [0x33f4] = "\x8a\x65", [0x33f8] = "\x8d\x87",
-  [0x33f9] = "\x8b\x67", [0x33fa] = "\x92\xdd", [0x33fb] = "\x89\x44",
-  [0x33fc] = "\x93\xaf", [0x33fd] = "\x96\xbc", [0x33fe] = "\x8d\x40",
-  [0x33ff] = "\x97\x99", [0x3400] = "\x93\x66", [0x3401] = "\x8c\xfc",
-  [0x340b] = "\x8c\x4e", [0x340d] = "\x99\xe5", [0x340f] = "\x8b\xe1",
-  [0x3410] = "\x96\x69", [0x3416] = "\x94\xdb", [0x3419] = "\x99\xe4",
-  [0x341b] = "\x8a\xdc", [0x341c] = "\x99\xdf", [0x341d] = "\x99\xe0",
-  [0x341e] = "\x99\xe2", [0x3426] = "\x99\xe3", [0x3428] = "\x8b\x7a",
-  [0x3429] = "\x90\x81", [0x342b] = "\x95\xab", [0x342c] = "\x99\xe1",
-  [0x342d] = "\x99\xdd", [0x342e] = "\x8c\xe1", [0x3430] = "\x99\xde",
-  [0x3432] = "\x98\x43", [0x3436] = "\x95\xf0", [0x3438] = "\x92\xe6",
-  [0x3439] = "\x8c\xe0", [0x343a] = "\x8d\x90", [0x343e] = "\x99\xe6",
-  [0x3441] = "\x93\xdb", [0x344f] = "\x99\xea", [0x3458] = "\x8e\xfc",
-  [0x345a] = "\x8e\xf4", [0x3460] = "\x99\xed", [0x3461] = "\x99\xeb",
-  [0x3463] = "\x96\xa1", [0x3465] = "\x99\xe8", [0x3466] = "\x99\xf1",
-  [0x3467] = "\x99\xec", [0x346b] = "\x99\xef", [0x346c] = "\x8c\xc4",
-  [0x346d] = "\x96\xbd", [0x3470] = "\x99\xf0", [0x3474] = "\x99\xf2",
-  [0x3476] = "\x99\xf4", [0x347b] = "\x8d\xee", [0x347c] = "\x98\x61",
-  [0x347e] = "\x99\xe9", [0x347f] = "\x99\xe7", [0x3480] = "\x99\xf3",
-  [0x3482] = "\x99\xee", [0x3492] = "\x99\xf6", [0x3494] = "\x9a\x42",
-  [0x3495] = "\x99\xf8", [0x3498] = "\x99\xfc", [0x349b] = "\x9a\x40",
-  [0x349c] = "\x99\xf9", [0x349f] = "\x9a\x5d", [0x34a2] = "\x8d\xe7",
-  [0x34a3] = "\x8a\x50", [0x34a8] = "\x99\xf7", [0x34ac] = "\x9a\x44",
-  [0x34ad] = "\x88\xf4", [0x34ae] = "\x9a\x43", [0x34b0] = "\x88\xa3",
-  [0x34b1] = "\x95\x69", [0x34b2] = "\x9a\x41", [0x34b4] = "\x99\xfa",
-  [0x34b7] = "\x99\xf5", [0x34b8] = "\x99\xfb", [0x34b9] = "\x8d\xc6",
-  [0x34c8] = "\x9a\x45", [0x34d1] = "\x88\xf5", [0x34d2] = "\x9a\x4e",
-  [0x34d5] = "\x9a\x46", [0x34d6] = "\x9a\x47", [0x34d8] = "\x8f\xa3",
-  [0x34d9] = "\x96\x89", [0x34dd] = "\x9a\x4c", [0x34de] = "\x9a\x4b",
-  [0x34e2] = "\x93\x4e", [0x34ea] = "\x9a\x4d", [0x34ed] = "\x9a\x4a",
-  [0x34f4] = "\x89\x53", [0x34f6] = "\x8d\xb4", [0x34f7] = "\x90\x4f",
-  [0x34ff] = "\x9a\x48", [0x3500] = "\x93\x82", [0x3504] = "\x9a\x49",
-  [0x3506] = "\x88\xa0", [0x351e] = "\x9a\x53", [0x351f] = "\x97\x42",
-  [0x3521] = "\x8f\xa5", [0x3523] = "\x9a\x59", [0x3528] = "\x9a\x58",
-  [0x3529] = "\x9a\x4f", [0x352e] = "\x91\xc1", [0x3530] = "\x9a\x50",
-  [0x3534] = "\x91\xed", [0x3535] = "\x9a\x55", [0x3536] = "\x8f\xa4",
-  [0x353c] = "\x9a\x52", [0x353f] = "\x96\xe2", [0x3543] = "\x8c\x5b",
-  [0x3546] = "\x9a\x56", [0x3547] = "\x9a\x57", [0x354c] = "\x9a\x54",
-  [0x354d] = "\x9a\x5a", [0x3553] = "\x9a\x51", [0x356b] = "\x9a\x60",
-  [0x356c] = "\x9a\x65", [0x356e] = "\x9a\x61", [0x3570] = "\x9a\x5c",
-  [0x3573] = "\x9a\x66", [0x3574] = "\x91\x50", [0x3577] = "\x9a\x68",
-  [0x3579] = "\x8d\x41", [0x357a] = "\x9a\x5e", [0x357b] = "\x92\x9d",
-  [0x3588] = "\x9a\x62", [0x3589] = "\x9a\x5b", [0x358a] = "\x8a\xab",
-  [0x358c] = "\x8a\xec", [0x358d] = "\x8a\x85", [0x358e] = "\x9a\x63",
-  [0x358f] = "\x9a\x5f", [0x3597] = "\x8c\x96", [0x3598] = "\x9a\x69",
-  [0x3599] = "\x9a\x67", [0x359a] = "\x91\x72", [0x359b] = "\x8b\x69",
-  [0x359c] = "\x8b\xaa", [0x359e] = "\x9a\x64", [0x35a0] = "\x8b\xf2",
-  [0x35a6] = "\x89\x63", [0x35b4] = "\x9a\x6d", [0x35b5] = "\x9a\x6b",
-  [0x35b7] = "\x9a\xa5", [0x35c4] = "\x9a\x70", [0x35ca] = "\x9a\x6a",
-  [0x35cc] = "\x9a\x6e", [0x35cf] = "\x9a\x6c", [0x35d3] = "\x8e\x6b",
-  [0x35d4] = "\x9a\x6f", [0x35e7] = "\x9a\x72", [0x35e9] = "\x9a\x77",
-  [0x35ed] = "\x9a\x75", [0x35ee] = "\x9a\x74", [0x35f6] = "\x92\x51",
-  [0x35f9] = "\x89\xc3", [0x3604] = "\x9a\x71", [0x3606] = "\x9a\x73",
-  [0x3607] = "\x8f\xa6", [0x3608] = "\x89\x52", [0x360b] = "\x9a\x76",
-  [0x3619] = "\x89\xdc", [0x361f] = "\x9a\x82", [0x3621] = "\x8f\xfa",
-  [0x3622] = "\x9a\x7d", [0x3624] = "\x9a\x7b", [0x3626] = "\x9a\x7c",
-  [0x3628] = "\x9a\x7e", [0x3632] = "\x89\x5c", [0x363c] = "\x91\x58",
-  [0x363e] = "\x9a\x78", [0x3640] = "\x9a\x79", [0x364b] = "\x8a\x9a",
-  [0x3654] = "\x9a\x81", [0x3658] = "\x8a\xed", [0x365a] = "\x9a\x84",
-  [0x365b] = "\x9a\x80", [0x365c] = "\x9a\x83", [0x3664] = "\x95\xac",
-  [0x3668] = "\x93\xd3", [0x366a] = "\x94\xb6", [0x3670] = "\x9a\x86",
-  [0x3676] = "\x9a\x85", [0x3677] = "\x8a\x64", [0x367a] = "\x9a\x87",
-  [0x367f] = "\x9a\x8a", [0x3684] = "\x9a\x89", [0x3690] = "\x9a\x88",
-  [0x3692] = "\x94\x58", [0x3695] = "\x9a\x8b", [0x369e] = "\x9a\x8c",
-  [0x36a4] = "\x9a\x8e", [0x36a6] = "\x9a\x8d", [0x36ac] = "\x9a\x90",
-  [0x36b0] = "\x9a\x93", [0x36b1] = "\x9a\x91", [0x36b2] = "\x9a\x8f",
-  [0x36b3] = "\x9a\x92", [0x36b8] = "\x9a\x94", [0x36be] = "\x9a\x95",
-  [0x36c1] = "\x9a\x96", [0x36c3] = "\x9a\x97", [0x36c7] = "\x9a\x98",
-  [0x36c8] = "\x99\x64", [0x36ca] = "\x8e\xfa", [0x36cb] = "\x8e\x6c",
-  [0x36ce] = "\x89\xf1", [0x36d0] = "\x88\xf6", [0x36d3] = "\x92\x63",
-  [0x36de] = "\x9a\x99", [0x36e0] = "\x8d\xa2", [0x36e2] = "\x88\xcd",
-  [0x36e3] = "\x90\x7d", [0x36e9] = "\x9a\x9a", [0x36ea] = "\x8c\xc5",
-  [0x36ed] = "\x8d\x91", [0x36ef] = "\x9a\x9c", [0x36f0] = "\x9a\x9b",
-  [0x36f3] = "\x95\xde", [0x36f4] = "\x9a\x9d", [0x36f8] = "\x9a\x9f",
-  [0x36f9] = "\x9a\x9e", [0x36fb] = "\x9a\xa0", [0x36fd] = "\x9a\xa1",
-  [0x36ff] = "\x8c\x97", [0x3702] = "\x89\x80", [0x3703] = "\x9a\xa2",
-  [0x3706] = "\x9a\xa4", [0x3708] = "\x9a\xa3", [0x370c] = "\x9a\xa6",
-  [0x370f] = "\x93\x79", [0x3716] = "\x9a\xa7", [0x3717] = "\x88\xb3",
-  [0x3718] = "\x8d\xdd", [0x371d] = "\x8c\x5c", [0x3720] = "\x92\x6e",
-  [0x3727] = "\x9a\xa8", [0x3728] = "\x9a\xa9", [0x372b] = "\x9a\xab",
-  [0x3730] = "\x9a\xac", [0x3732] = "\x8d\xe2", [0x3737] = "\x8b\xcf",
-  [0x373a] = "\x96\x56", [0x373e] = "\x9a\xaa", [0x373f] = "\x9a\xad",
-  [0x3740] = "\x8d\xbf", [0x3741] = "\x8d\x42", [0x3751] = "\x9a\xb1",
-  [0x3754] = "\x8d\xa3", [0x3756] = "\x92\x52", [0x3759] = "\x9a\xae",
-  [0x375a] = "\x92\xd8", [0x376f] = "\x9a\xb2", [0x3772] = "\x90\x82",
-  [0x3778] = "\x9a\xb0", [0x3779] = "\x9a\xb3", [0x377b] = "\x8c\x5e",
-  [0x3783] = "\x9a\xb4", [0x3790] = "\x9a\xb5", [0x3792] = "\x8d\x43",
-  [0x3793] = "\x8a\x5f", [0x3794] = "\x9a\xb7", [0x379a] = "\x9a\xb8",
-  [0x37a0] = "\x9a\xb9", [0x37a3] = "\x9a\xb6", [0x37b0] = "\x9a\xaf",
-  [0x37b3] = "\x9a\xba", [0x37b6] = "\x9a\xbb", [0x37bb] = "\x96\x84",
-  [0x37be] = "\x8f\xe9", [0x37c2] = "\x9a\xbd", [0x37c3] = "\x9a\xbe",
-  [0x37c4] = "\x9a\xbc", [0x37c6] = "\x9a\xc0", [0x37cc] = "\x94\x57",
-  [0x37cf] = "\x88\xe6", [0x37d0] = "\x95\x75", [0x37d3] = "\x9a\xc1",
-  [0x37e4] = "\x8f\xfb", [0x37e7] = "\x8e\xb7", [0x37e9] = "\x94\x7c",
-  [0x37ea] = "\x8a\xee", [0x37ec] = "\x8d\xe9", [0x37f0] = "\x96\x78",
-  [0x37f2] = "\x93\xb0", [0x37f5] = "\x8c\x98", [0x37f6] = "\x91\xcd",
-  [0x37fa] = "\x9a\xbf", [0x37fb] = "\x9a\xc2", [0x3805] = "\x91\xc2",
-  [0x3809] = "\x9a\xc3", [0x380d] = "\x9a\xc4", [0x3811] = "\x9a\xc6",
-  [0x3814] = "\x92\xe7", [0x381a] = "\x8a\xac", [0x381f] = "\xea\x9f",
-  [0x3820] = "\x89\x81", [0x3821] = "\x95\xf1", [0x3824] = "\x8f\xea",
-  [0x3825] = "\x93\x67", [0x382a] = "\x8d\xe4", [0x382d] = "\x9a\xcc",
-  [0x3830] = "\x95\xbb", [0x3831] = "\x97\xdb", [0x383a] = "\x89\xf2",
-  [0x383b] = "\x9a\xc8", [0x3841] = "\x91\x59", [0x3842] = "\x9a\xcb",
-  [0x3844] = "\x93\x83", [0x3847] = "\x93\x68", [0x3848] = "\x93\x84",
-  [0x3849] = "\x94\xb7", [0x384a] = "\x92\xcb", [0x384e] = "\x8d\xc7",
-  [0x3852] = "\x9a\xc7", [0x3859] = "\x89\x96", [0x385b] = "\x93\x55",
-  [0x3860] = "\x9a\xc9", [0x3862] = "\x9a\xc5", [0x3865] = "\x90\x6f",
-  [0x3869] = "\x9a\xcd", [0x386e] = "\x8f\x6d", [0x3873] = "\x8b\xab",
-  [0x3875] = "\x9a\xce", [0x3883] = "\x95\xe6", [0x3887] = "\x91\x9d",
-  [0x388c] = "\x92\xc4", [0x388f] = "\x9a\xd0", [0x3898] = "\x96\x6e",
-  [0x389b] = "\x9a\xd1", [0x389e] = "\x9a\xd6", [0x38a3] = "\x95\xad",
-  [0x38a8] = "\x9a\xd5", [0x38a9] = "\x9a\xcf", [0x38aa] = "\x9a\xd2",
-  [0x38ab] = "\x9a\xd4", [0x38ae] = "\x8d\xa4", [0x38b1] = "\x95\xc7",
-  [0x38b5] = "\x9a\xd7", [0x38b7] = "\x92\x64", [0x38ba] = "\x89\xf3",
-  [0x38bc] = "\x8f\xeb", [0x38c1] = "\x9a\xd9", [0x38c3] = "\x9a\xd8",
-  [0x38c5] = "\x8d\x88", [0x38c7] = "\x9a\xda", [0x38c8] = "\x9a\xdc",
-  [0x38c9] = "\x9a\xdb", [0x38cc] = "\x9a\xde", [0x38ce] = "\x9a\xd3",
-  [0x38cf] = "\x9a\xe0", [0x38d4] = "\x9a\xdf", [0x38d5] = "\x9a\xdd",
-  [0x38db] = "\x8e\x6d", [0x38dc] = "\x90\x70", [0x38de] = "\x91\x73",
-  [0x38df] = "\x9a\xe1", [0x38e0] = "\x90\xba", [0x38e1] = "\x88\xeb",
-  [0x38e2] = "\x94\x84", [0x38e7] = "\x92\xd9", [0x38e9] = "\x9a\xe3",
-  [0x38ea] = "\x9a\xe2", [0x38eb] = "\x9a\xe4", [0x38ec] = "\x9a\xe5",
-  [0x38ed] = "\x9a\xe6", [0x38f2] = "\x9a\xe7", [0x38f9] = "\x95\xcf",
-  [0x38fa] = "\x9a\xe8", [0x38ff] = "\x89\xc4", [0x3900] = "\x9a\xe9",
-  [0x3905] = "\x97\x5b", [0x3906] = "\x8a\x4f", [0x3908] = "\x99\xc7",
-  [0x3909] = "\x8f\x67", [0x390a] = "\x91\xbd", [0x390b] = "\x9a\xea",
-  [0x390c] = "\x96\xe9", [0x3912] = "\x96\xb2", [0x3915] = "\x9a\xec",
-  [0x3917] = "\x91\xe5", [0x3919] = "\x93\x56", [0x391a] = "\x91\xbe",
-  [0x391b] = "\x95\x76", [0x391c] = "\x9a\xed", [0x391d] = "\x9a\xee",
-  [0x391e] = "\x89\x9b", [0x3921] = "\x8e\xb8", [0x3922] = "\x9a\xef",
-  [0x3927] = "\x88\xce", [0x3928] = "\x9a\xf0", [0x392e] = "\x9a\xf1",
-  [0x3934] = "\x89\x82", [0x3937] = "\x8a\xef", [0x3938] = "\x93\xde",
-  [0x3939] = "\x95\xf2", [0x393e] = "\x9a\xf5", [0x393f] = "\x91\x74",
-  [0x3940] = "\x9a\xf4", [0x3941] = "\x8c\x5f", [0x3944] = "\x96\x7a",
-  [0x3945] = "\x9a\xf3", [0x3947] = "\x93\x85", [0x3948] = "\x9a\xf7",
-  [0x394a] = "\x9a\xf6", [0x3950] = "\x9a\xf9", [0x3952] = "\x9a\xf8",
-  [0x3955] = "\x89\x9c", [0x3957] = "\x9a\xfa", [0x3958] = "\x8f\xa7",
-  [0x3959] = "\x9a\xfc", [0x395a] = "\x92\x44", [0x395c] = "\x9a\xfb",
-  [0x395e] = "\x95\xb1", [0x3963] = "\x8f\x97", [0x3964] = "\x93\x7a",
-  [0x3968] = "\x9b\x40", [0x396d] = "\x8d\x44", [0x3971] = "\x9b\x41",
-  [0x3972] = "\x94\x40", [0x3973] = "\x94\xdc", [0x3974] = "\x96\xcf",
-  [0x397a] = "\x94\x44", [0x397d] = "\x9b\x4a", [0x3983] = "\x8b\x57",
-  [0x3986] = "\x97\x64", [0x3989] = "\x96\xad", [0x398b] = "\x9b\xaa",
-  [0x398d] = "\x9b\x42", [0x3993] = "\x9b\x45", [0x3995] = "\x91\xc3",
-  [0x3998] = "\x96\x57", [0x399c] = "\x93\x69", [0x39a2] = "\x9b\x46",
-  [0x39a9] = "\x96\x85", [0x39ab] = "\x8d\xc8", [0x39ae] = "\x8f\xa8",
-  [0x39b6] = "\x9b\x47", [0x39b9] = "\x8e\x6f", [0x39bb] = "\x8e\x6e",
-  [0x39c0] = "\x88\xb7", [0x39c1] = "\x8c\xc6", [0x39c3] = "\x90\xa9",
-  [0x39c4] = "\x88\xcf", [0x39c9] = "\x9b\x4b", [0x39ca] = "\x9b\x4c",
-  [0x39cc] = "\x9b\x49", [0x39d5] = "\x89\x57", [0x39d6] = "\x8a\xad",
-  [0x39d8] = "\x9b\x48", [0x39da] = "\x96\xc3", [0x39db] = "\x95\x50",
-  [0x39e6] = "\x88\xa6", [0x39eb] = "\x88\xf7", [0x39ef] = "\x8e\x70",
-  [0x39f1] = "\x88\xd0", [0x39f3] = "\x88\xa1", [0x39f9] = "\x9b\x51",
-  [0x3a01] = "\x9b\x4f", [0x3a08] = "\x96\xba", [0x3a0a] = "\x9b\x52",
-  [0x3a0c] = "\x9b\x50", [0x3a0f] = "\x9b\x4e", [0x3a10] = "\x90\x50",
-  [0x3a15] = "\x9b\x4d", [0x3a19] = "\x95\xd8", [0x3a1f] = "\x8c\xe2",
-  [0x3a25] = "\x9b\x56", [0x3a26] = "\x9b\x57", [0x3a2c] = "\x8f\xa9",
-  [0x3a30] = "\x9b\x53", [0x3a31] = "\x98\x4b", [0x3a36] = "\x94\x6b",
-  [0x3a39] = "\x9b\x55", [0x3a4a] = "\x8d\xa5", [0x3a52] = "\x9b\x58",
-  [0x3a56] = "\x95\x77", [0x3a5a] = "\x9b\x59", [0x3a5c] = "\x9b\x54",
-  [0x3a6f] = "\x96\xb9", [0x3a82] = "\x94\x7d", [0x3a8a] = "\x9b\x5a",
-  [0x3a8b] = "\x95\x51", [0x3aac] = "\x9b\x5b", [0x3aad] = "\x9b\x5f",
-  [0x3aae] = "\x9b\x5c", [0x3ab1] = "\x89\xc5", [0x3ab2] = "\x9b\x5e",
-  [0x3ab9] = "\x8e\xb9", [0x3abb] = "\x9b\x5d", [0x3abc] = "\x8c\x99",
-  [0x3ac0] = "\x9b\x6b", [0x3ac6] = "\x9b\x64", [0x3ac7] = "\x9b\x61",
-  [0x3ad1] = "\x92\x84", [0x3ad3] = "\x9b\x60", [0x3ad6] = "\x9b\x62",
-  [0x3ad9] = "\x9b\x63", [0x3aea] = "\x9b\x65", [0x3aeb] = "\x9b\x66",
-  [0x3af9] = "\x8a\xf0", [0x3afb] = "\x9b\x68", [0x3afc] = "\x9b\x67",
-  [0x3b06] = "\x9b\x69", [0x3b12] = "\x8f\xec", [0x3b1a] = "\x9b\x6c",
-  [0x3b1c] = "\x92\xda", [0x3b20] = "\x89\x64", [0x3b22] = "\x9b\x6a",
-  [0x3b26] = "\x9b\x6d", [0x3b2e] = "\x9b\x6e", [0x3b30] = "\x9b\x71",
-  [0x3b33] = "\x9b\x6f", [0x3b35] = "\x9b\x70", [0x3b40] = "\x8e\x71",
-  [0x3b41] = "\x9b\x72", [0x3b44] = "\x8d\x45", [0x3b45] = "\x9b\x73",
-  [0x3b47] = "\x8e\x9a", [0x3b48] = "\x91\xb6", [0x3b4a] = "\x9b\x74",
-  [0x3b4b] = "\x9b\x75", [0x3b4c] = "\x8e\x79", [0x3b4d] = "\x8d\x46",
-  [0x3b4f] = "\x96\xd0", [0x3b53] = "\x8b\x47", [0x3b54] = "\x8c\xc7",
-  [0x3b55] = "\x9b\x76", [0x3b56] = "\x8a\x77", [0x3b59] = "\x9b\x77",
-  [0x3b5b] = "\x91\xb7", [0x3b60] = "\x9b\x78", [0x3b61] = "\x9b\xa1",
-  [0x3b63] = "\x9b\x79", [0x3b65] = "\x9b\x7a", [0x3b68] = "\x9b\x7b",
-  [0x3b6a] = "\x9b\x7d", [0x3b70] = "\x9b\x7e", [0x3b73] = "\x9b\x80",
-  [0x3b75] = "\x91\xee", [0x3b77] = "\x89\x46", [0x3b78] = "\x8e\xe7",
-  [0x3b79] = "\x88\xc0", [0x3b7b] = "\x91\x76", [0x3b7c] = "\x8a\xae",
-  [0x3b7d] = "\x8e\xb3", [0x3b7f] = "\x8d\x47", [0x3b85] = "\x93\x86",
-  [0x3b87] = "\x8f\x40", [0x3b88] = "\x8a\xaf", [0x3b89] = "\x92\x88",
-  [0x3b8a] = "\x92\xe8", [0x3b8b] = "\x88\xb6", [0x3b8c] = "\x8b\x58",
-  [0x3b8d] = "\x95\xf3", [0x3b8f] = "\x8e\xc0", [0x3b92] = "\x8b\x71",
-  [0x3b93] = "\x90\xe9", [0x3b94] = "\x8e\xba", [0x3b95] = "\x97\x47",
-  [0x3b96] = "\x9b\x81", [0x3b9e] = "\x8b\x7b", [0x3ba0] = "\x8d\xc9",
-  [0x3ba3] = "\x8a\x51", [0x3ba4] = "\x89\x83", [0x3ba5] = "\x8f\xaa",
-  [0x3ba6] = "\x89\xc6", [0x3ba8] = "\x9b\x82", [0x3ba9] = "\x97\x65",
-  [0x3baf] = "\x8f\x68", [0x3bb2] = "\x8e\xe2", [0x3bb3] = "\x9b\x83",
-  [0x3bb4] = "\x8a\xf1", [0x3bb5] = "\x93\xd0", [0x3bb6] = "\x96\xa7",
-  [0x3bb7] = "\x9b\x84", [0x3bb9] = "\x9b\x85", [0x3bbc] = "\x95\x78",
-  [0x3bc0] = "\x9b\x87", [0x3bc2] = "\x8a\xa6", [0x3bc3] = "\x8b\xf5",
-  [0x3bc4] = "\x9b\x86", [0x3bcb] = "\x8a\xb0", [0x3bcd] = "\x90\x51",
-  [0x3bce] = "\x9b\x8b", [0x3bcf] = "\x8e\x40", [0x3bd1] = "\x89\xc7",
-  [0x3bd2] = "\x9b\x8a", [0x3bd4] = "\x9b\x88", [0x3bd5] = "\x9b\x8c",
-  [0x3bd6] = "\x9b\x89", [0x3bd7] = "\x94\x4a", [0x3bd8] = "\x9e\xcb",
-  [0x3bd9] = "\x90\x52", [0x3bdb] = "\x9b\x8d", [0x3bde] = "\x97\xbe",
-  [0x3be0] = "\x9b\x8e", [0x3be3] = "\x9b\x90", [0x3be5] = "\x92\x9e",
-  [0x3be6] = "\x9b\x8f", [0x3be8] = "\x90\xa1", [0x3bea] = "\x8e\x9b",
-  [0x3bee] = "\x91\xce", [0x3bef] = "\x8e\xf5", [0x3bf1] = "\x95\x95",
-  [0x3bf2] = "\x90\xea", [0x3bf4] = "\x8e\xcb", [0x3bf5] = "\x9b\x91",
-  [0x3bf6] = "\x8f\xab", [0x3bf7] = "\x9b\x92", [0x3bf8] = "\x9b\x93",
-  [0x3bf9] = "\x88\xd1", [0x3bfa] = "\x91\xb8", [0x3bfb] = "\x90\x71",
-  [0x3bfd] = "\x9b\x94", [0x3bfe] = "\x93\xb1", [0x3bff] = "\x8f\xac",
-  [0x3c01] = "\x8f\xad", [0x3c03] = "\x9b\x95", [0x3c06] = "\x90\xeb",
-  [0x3c0a] = "\x8f\xae", [0x3c10] = "\x9b\x96", [0x3c12] = "\x9b\x97",
-  [0x3c14] = "\x96\xde", [0x3c18] = "\x9b\x98", [0x3c1d] = "\x8b\xc4",
-  [0x3c21] = "\x8f\x41", [0x3c28] = "\x9b\x99", [0x3c29] = "\x9b\x9a",
-  [0x3c2a] = "\x8e\xda", [0x3c2b] = "\x90\x4b", [0x3c2c] = "\x93\xf2",
-  [0x3c2d] = "\x90\x73", [0x3c2e] = "\x94\xf6", [0x3c2f] = "\x94\x41",
-  [0x3c30] = "\x8b\xc7", [0x3c31] = "\x9b\x9b", [0x3c35] = "\x8b\x8f",
-  [0x3c36] = "\x9b\x9c", [0x3c38] = "\x8b\xfc", [0x3c3a] = "\x93\xcd",
-  [0x3c3b] = "\x89\xae", [0x3c3d] = "\x8e\x72", [0x3c3e] = "\x9b\x9d",
-  [0x3c3f] = "\x9b\xa0", [0x3c40] = "\x9b\x9f", [0x3c41] = "\x8b\xfb",
-  [0x3c43] = "\x9b\x9e", [0x3c45] = "\x93\x57", [0x3c4e] = "\x91\xae",
-  [0x3c50] = "\x93\x6a", [0x3c51] = "\x8e\xc6", [0x3c54] = "\x91\x77",
-  [0x3c55] = "\x97\x9a", [0x3c5c] = "\x9b\xa2", [0x3c5e] = "\x9b\xa3",
-  [0x3c5f] = "\x93\xd4", [0x3c61] = "\x8e\x52", [0x3c66] = "\x9b\xa5",
-  [0x3c69] = "\x9b\xa6", [0x3c7c] = "\x9b\xa7", [0x3c80] = "\x8a\xf2",
-  [0x3c81] = "\x9b\xa8", [0x3c84] = "\x9b\xa9", [0x3c91] = "\x89\xaa",
-  [0x3c98] = "\x91\x5a", [0x3c99] = "\x8a\xe2", [0x3c9b] = "\x9b\xab",
-  [0x3c9c] = "\x96\xa6", [0x3ca1] = "\x91\xd0", [0x3ca3] = "\x8a\x78",
-  [0x3ca6] = "\x9b\xad", [0x3ca7] = "\x9b\xaf", [0x3ca8] = "\x8a\xdd",
-  [0x3cab] = "\x9b\xac", [0x3cac] = "\x9b\xae", [0x3cae] = "\x9b\xb1",
-  [0x3cb5] = "\x9b\xb0", [0x3cb7] = "\x9b\xb2", [0x3cc9] = "\x9b\xb3",
-  [0x3cd0] = "\x93\xbb", [0x3cd1] = "\x8b\xac", [0x3cd8] = "\x89\xe3",
-  [0x3cd9] = "\x9b\xb4", [0x3cda] = "\x9b\xb9", [0x3cdd] = "\x9b\xb7",
-  [0x3cdf] = "\x95\xf5", [0x3ce0] = "\x95\xf4", [0x3ce6] = "\x93\x87",
-  [0x3cea] = "\x9b\xb6", [0x3ceb] = "\x8f\x73", [0x3ced] = "\x9b\xb5",
-  [0x3cf7] = "\x90\x92", [0x3cfb] = "\x9b\xba", [0x3cfe] = "\x8d\xe8",
-  [0x3d01] = "\x9b\xc0", [0x3d04] = "\x9b\xc1", [0x3d05] = "\x9b\xbb",
-  [0x3d06] = "\x8a\x52", [0x3d07] = "\x9b\xbc", [0x3d08] = "\x9b\xc5",
-  [0x3d09] = "\x9b\xc4", [0x3d0a] = "\x9b\xc3", [0x3d0b] = "\x9b\xbf",
-  [0x3d0f] = "\x9b\xbe", [0x3d12] = "\x9b\xc2", [0x3d19] = "\x95\xf6",
-  [0x3d3b] = "\x9b\xc9", [0x3d3c] = "\x9b\xc6", [0x3d3e] = "\x9b\xc8",
-  [0x3d40] = "\x97\x92", [0x3d42] = "\x9b\xc7", [0x3d4c] = "\x9b\xbd",
-  [0x3d59] = "\x90\x93", [0x3d5c] = "\x9b\xca", [0x3d5f] = "\x8d\xb5",
-  [0x3d63] = "\x9b\xcb", [0x3d66] = "\x9b\xcc", [0x3d72] = "\x9b\xcf",
-  [0x3d74] = "\x9b\xce", [0x3d77] = "\x9b\xcd", [0x3d7b] = "\x93\x88",
-  [0x3d7c] = "\x9b\xb8", [0x3d80] = "\x9b\xd5", [0x3d8d] = "\x9b\xd1",
-  [0x3d92] = "\x9b\xd0", [0x3d9c] = "\x9b\xd2", [0x3d9e] = "\x9b\xd3",
-  [0x3da7] = "\x9b\xd6", [0x3daa] = "\x97\xe4", [0x3dac] = "\x9b\xd7",
-  [0x3dad] = "\x9b\xd4", [0x3db9] = "\x9b\xd8", [0x3dbc] = "\x8a\xde",
-  [0x3dbd] = "\x9b\xd9", [0x3dc2] = "\x9b\xdb", [0x3dc3] = "\x9b\xda",
-  [0x3dc6] = "\x9b\xdc", [0x3dcb] = "\x9b\xdd", [0x3dcd] = "\x90\xec",
-  [0x3dce] = "\x8f\x42", [0x3dd1] = "\x8f\x84", [0x3dd3] = "\x91\x83",
-  [0x3dd5] = "\x8d\x48", [0x3dd6] = "\x8d\xb6", [0x3dd7] = "\x8d\x49",
-  [0x3dd8] = "\x8b\x90", [0x3ddb] = "\x9b\xde", [0x3dde] = "\x8d\xb7",
-  [0x3de1] = "\x8c\xc8", [0x3de2] = "\x9b\xdf", [0x3de3] = "\x96\xa4",
-  [0x3de4] = "\x94\x62", [0x3de5] = "\x9b\xe0", [0x3de7] = "\x8d\x4a",
-  [0x3deb] = "\x8a\xaa", [0x3ded] = "\x92\x46", [0x3dee] = "\x8b\xd0",
-  [0x3df2] = "\x8e\x73", [0x3df3] = "\x95\x7a", [0x3df6] = "\x94\xbf",
-  [0x3dfb] = "\x9b\xe1", [0x3dfc] = "\x8a\xf3", [0x3e01] = "\x9b\xe4",
-  [0x3e06] = "\x92\x9f", [0x3e09] = "\x9b\xe3", [0x3e0a] = "\x9b\xe2",
-  [0x3e0b] = "\x9b\xe5", [0x3e0d] = "\x92\xe9", [0x3e15] = "\x90\x83",
-  [0x3e1b] = "\x8e\x74", [0x3e1d] = "\x90\xc8", [0x3e1f] = "\x91\xd1",
-  [0x3e20] = "\x8b\x41", [0x3e23] = "\x92\xa0", [0x3e26] = "\x9b\xe6",
-  [0x3e27] = "\x9b\xe7", [0x3e28] = "\x8f\xed", [0x3e2d] = "\x96\x58",
-  [0x3e30] = "\x9b\xea", [0x3e33] = "\x9b\xe9", [0x3e34] = "\x9b\xe8",
-  [0x3e35] = "\x95\x9d", [0x3e37] = "\x9b\xf1", [0x3e3c] = "\x96\x79",
-  [0x3e3e] = "\x9b\xeb", [0x3e44] = "\x9b\xed", [0x3e45] = "\x96\x8b",
-  [0x3e47] = "\x9b\xec", [0x3e4f] = "\x9b\xee", [0x3e51] = "\x94\xa6",
-  [0x3e52] = "\x9b\xef", [0x3e53] = "\x95\xbc", [0x3e54] = "\x9b\xf0",
-  [0x3e62] = "\x8a\xb1", [0x3e63] = "\x95\xbd", [0x3e64] = "\x94\x4e",
-  [0x3e65] = "\x9b\xf2", [0x3e66] = "\x9b\xf3", [0x3e68] = "\x8d\x4b",
-  [0x3e69] = "\x8a\xb2", [0x3e6a] = "\x9b\xf4", [0x3e6b] = "\x8c\xb6",
-  [0x3e6c] = "\x97\x63", [0x3e6d] = "\x97\x48", [0x3e6e] = "\x8a\xf4",
-  [0x3e6f] = "\x9b\xf6", [0x3e71] = "\x92\xa1", [0x3e73] = "\x8d\x4c",
-  [0x3e74] = "\x8f\xaf", [0x3e77] = "\x94\xdd", [0x3e7a] = "\x8f\xb0",
-  [0x3e7f] = "\x8f\x98", [0x3e85] = "\x92\xea", [0x3e86] = "\x95\xf7",
-  [0x3e87] = "\x93\x58", [0x3e8a] = "\x8d\x4d", [0x3e8c] = "\x95\x7b",
-  [0x3e90] = "\x9b\xf7", [0x3e96] = "\x93\x78", [0x3e97] = "\x8d\xc0",
-  [0x3e9b] = "\x8c\xc9", [0x3e9d] = "\x92\xeb", [0x3ea5] = "\x88\xc1",
-  [0x3ea6] = "\x8f\x8e", [0x3ea7] = "\x8d\x4e", [0x3ea8] = "\x97\x66",
-  [0x3eb1] = "\x9b\xf8", [0x3eb2] = "\x9b\xf9", [0x3eb3] = "\x94\x70",
-  [0x3eb8] = "\x9b\xfa", [0x3eb9] = "\x97\xf5", [0x3eba] = "\x98\x4c",
-  [0x3ebf] = "\x9b\xfc", [0x3ec0] = "\x9b\xfb", [0x3ec3] = "\x8a\x66",
-  [0x3ec6] = "\x9c\x40", [0x3eca] = "\x9c\x43", [0x3ecb] = "\x9c\x44",
-  [0x3ecd] = "\x9c\x42", [0x3ecf] = "\x95\x5f", [0x3ed0] = "\x8f\xb1",
-  [0x3ed1] = "\x9c\x46", [0x3ed2] = "\x9c\x45", [0x3ed3] = "\x9c\x41",
-  [0x3ed8] = "\x9c\x47", [0x3ed9] = "\x9c\x48", [0x3edc] = "\x9c\x49",
-  [0x3ee0] = "\x9c\x4c", [0x3ee1] = "\x9c\x4a", [0x3ee3] = "\x9c\x4b",
-  [0x3ee4] = "\x9c\x4d", [0x3ee6] = "\x89\x84", [0x3ee7] = "\x92\xec",
-  [0x3ee8] = "\x9c\x4e", [0x3eea] = "\x8c\x9a", [0x3eeb] = "\x89\xf4",
-  [0x3eec] = "\x94\x55", [0x3eee] = "\x9c\x4f", [0x3eef] = "\x93\xf9",
-  [0x3ef1] = "\x95\xd9", [0x3ef3] = "\x9c\x50", [0x3ef4] = "\x98\x4d",
-  [0x3ef9] = "\x9c\x51", [0x3efa] = "\x95\xbe", [0x3efb] = "\x9c\x54",
-  [0x3efc] = "\x98\x9f", [0x3efd] = "\x98\xaf", [0x3eff] = "\x8e\xae",
-  [0x3f00] = "\x93\xf3", [0x3f01] = "\x9c\x55", [0x3f03] = "\x8b\x7c",
-  [0x3f04] = "\x92\xa2", [0x3f05] = "\x88\xf8", [0x3f06] = "\x9c\x56",
-  [0x3f07] = "\x95\xa4", [0x3f08] = "\x8d\x4f", [0x3f0b] = "\x92\x6f",
-  [0x3f0f] = "\x92\xed", [0x3f15] = "\x96\xed", [0x3f16] = "\x8c\xb7",
-  [0x3f17] = "\x8c\xca", [0x3f19] = "\x9c\x57", [0x3f1d] = "\x9c\x58",
-  [0x3f1f] = "\x9c\x5e", [0x3f21] = "\x8e\xe3", [0x3f25] = "\x92\xa3",
-  [0x3f27] = "\x8b\xad", [0x3f28] = "\x9c\x59", [0x3f2c] = "\x95\x4a",
-  [0x3f2e] = "\x92\x65", [0x3f31] = "\x9c\x5a", [0x3f38] = "\x9c\x5b",
-  [0x3f3a] = "\x8b\xae", [0x3f3c] = "\x9c\x5c", [0x3f3e] = "\x9c\x5d",
-  [0x3f41] = "\x9c\x5f", [0x3f43] = "\x93\x96", [0x3f46] = "\x9c\x60",
-  [0x3f47] = "\x9c\x61", [0x3f49] = "\x9c\x62", [0x3f4c] = "\x9c\x53",
-  [0x3f4d] = "\x9c\x52", [0x3f51] = "\x9c\x63", [0x3f52] = "\x8c\x60",
-  [0x3f56] = "\x95\x46", [0x3f59] = "\x8d\xca", [0x3f5a] = "\x95\x56",
-  [0x3f5b] = "\x92\xa4", [0x3f5c] = "\x95\x6a", [0x3f5d] = "\x9c\x64",
-  [0x3f60] = "\x8f\xb2", [0x3f61] = "\x89\x65", [0x3f63] = "\x9c\x65",
-  [0x3f67] = "\x9c\x66", [0x3f69] = "\x96\xf0", [0x3f6c] = "\x94\xde",
-  [0x3f6f] = "\x9c\x69", [0x3f70] = "\x89\x9d", [0x3f71] = "\x90\xaa",
-  [0x3f72] = "\x9c\x68", [0x3f73] = "\x9c\x67", [0x3f74] = "\x8c\x61",
-  [0x3f75] = "\x91\xd2", [0x3f77] = "\x9c\x6d", [0x3f78] = "\x9c\x6b",
-  [0x3f7a] = "\x9c\x6a", [0x3f7b] = "\x97\xa5", [0x3f7c] = "\x8c\xe3",
-  [0x3f80] = "\x8f\x99", [0x3f81] = "\x9c\x6c", [0x3f82] = "\x93\x6b",
-  [0x3f83] = "\x8f\x5d", [0x3f87] = "\x93\xbe", [0x3f88] = "\x9c\x70",
-  [0x3f89] = "\x9c\x6f", [0x3f8e] = "\x9c\x6e", [0x3f90] = "\x9c\x71",
-  [0x3f91] = "\x8c\xe4", [0x3f98] = "\x9c\x72", [0x3f99] = "\x95\x9c",
-  [0x3f9a] = "\x8f\x7a", [0x3f9d] = "\x9c\x73", [0x3f9e] = "\x94\xf7",
-  [0x3fa3] = "\x93\xbf", [0x3fa4] = "\x92\xa5", [0x3fa9] = "\x93\x4f",
-  [0x3fac] = "\x9c\x74", [0x3fad] = "\x8b\x4a", [0x3fb3] = "\x90\x53",
-  [0x3fb5] = "\x95\x4b", [0x3fbc] = "\x8a\xf5", [0x3fbd] = "\x94\x45",
-  [0x3fc6] = "\x9c\x75", [0x3fc7] = "\x8e\x75", [0x3fc8] = "\x96\x59",
-  [0x3fc9] = "\x96\x5a", [0x3fcc] = "\x89\x9e", [0x3fcd] = "\x9c\x7a",
-  [0x3fd0] = "\x92\x89", [0x3fd4] = "\x9c\x77", [0x3fdb] = "\x89\xf5",
-  [0x3fe0] = "\x9c\xab", [0x3fe1] = "\x9c\x79", [0x3fe5] = "\x94\x4f",
-  [0x3fe8] = "\x9c\x78", [0x3feb] = "\x9c\x76", [0x3fed] = "\x8d\x9a",
-  [0x3fef] = "\x9c\x7c", [0x3ffe] = "\x9c\x83", [0x3fff] = "\x9c\x89",
-  [0x4000] = "\x9c\x81", [0x4002] = "\x93\x7b", [0x4005] = "\x9c\x86",
-  [0x4006] = "\x95\x7c", [0x4009] = "\x9c\x80", [0x400b] = "\x9c\x85",
-  [0x400c] = "\x97\xe5", [0x400d] = "\x8e\x76", [0x4010] = "\x91\xd3",
-  [0x4011] = "\x9c\x7d", [0x4015] = "\x8b\x7d", [0x4016] = "\x9c\x88",
-  [0x4017] = "\x90\xab", [0x4018] = "\x89\x85", [0x4019] = "\x9c\x82",
-  [0x401a] = "\x89\xf6", [0x401b] = "\x9c\x87", [0x401f] = "\x8b\xaf",
-  [0x4021] = "\x9c\x84", [0x402a] = "\x9c\x8a", [0x4031] = "\x9c\x8c",
-  [0x4032] = "\x9c\x96", [0x4033] = "\x9c\x94", [0x4036] = "\x9c\x91",
-  [0x403a] = "\x9c\x90", [0x403b] = "\x97\xf6", [0x403d] = "\x9c\x92",
-  [0x4040] = "\x8b\xb0", [0x4042] = "\x8d\x50", [0x4045] = "\x8f\x9a",
-  [0x4049] = "\x9c\x99", [0x404a] = "\x9c\x8b", [0x404f] = "\x9c\x8f",
-  [0x4050] = "\x9c\x7e", [0x4052] = "\x89\xf8", [0x4053] = "\x9c\x93",
-  [0x4054] = "\x9c\x95", [0x4055] = "\x92\x70", [0x4058] = "\x8d\xa6",
-  [0x4059] = "\x89\xb6", [0x405a] = "\x9c\x8d", [0x405b] = "\x9c\x98",
-  [0x405c] = "\x9c\x97", [0x405d] = "\x8b\xb1", [0x405f] = "\x91\xa7",
-  [0x4060] = "\x8a\x86", [0x4065] = "\x8c\x62", [0x4067] = "\x9c\x8e",
-  [0x4071] = "\x9c\x9a", [0x4073] = "\x9c\x9d", [0x4074] = "\x9c\x9f",
-  [0x4079] = "\x8e\xbb", [0x407b] = "\x9c\xa5", [0x407c] = "\x92\xee",
-  [0x407d] = "\x9c\x9b", [0x4082] = "\x9c\xa3", [0x4084] = "\x89\xf7",
-  [0x4086] = "\x9c\xa1", [0x4087] = "\x9c\xa2", [0x408a] = "\x9c\x9e",
-  [0x408b] = "\x9c\xa0", [0x408f] = "\x8c\xe5", [0x4090] = "\x97\x49",
-  [0x4093] = "\x8a\xb3", [0x4096] = "\x89\x78", [0x4097] = "\x9c\xa4",
-  [0x4099] = "\x94\x59", [0x409a] = "\x88\xab", [0x40a2] = "\x94\xdf",
-  [0x40a3] = "\x9c\x7b", [0x40a4] = "\x9c\xaa", [0x40a5] = "\x9c\xae",
-  [0x40a6] = "\x96\xe3", [0x40a8] = "\x9c\xa7", [0x40ac] = "\x93\x89",
-  [0x40ad] = "\x9c\xac", [0x40b5] = "\x8f\xee", [0x40b6] = "\x9c\xad",
-  [0x40b7] = "\x93\xd5", [0x40c1] = "\x98\x66", [0x40c3] = "\x9c\xa9",
-  [0x40c8] = "\x9c\xaf", [0x40ca] = "\x8d\x9b", [0x40cc] = "\x90\xc9",
-  [0x40cf] = "\x88\xd2", [0x40d0] = "\x9c\xa8", [0x40d1] = "\x9c\xa6",
-  [0x40d3] = "\x91\x79", [0x40d7] = "\x9c\x9c", [0x40d8] = "\x8e\x53",
-  [0x40e0] = "\x91\xc4", [0x40e1] = "\x9c\xbb", [0x40e3] = "\x91\x7a",
-  [0x40e4] = "\x9c\xb6", [0x40e6] = "\x9c\xb3", [0x40e7] = "\x9c\xb4",
-  [0x40e9] = "\x8e\xe4", [0x40ea] = "\x9c\xb7", [0x40eb] = "\x9c\xba",
-  [0x40f0] = "\x9c\xb5", [0x40f1] = "\x8f\x44", [0x40f3] = "\x9c\xb8",
-  [0x40f6] = "\x9c\xb2", [0x40f8] = "\x96\xfa", [0x40f9] = "\x96\xf9",
-  [0x40fd] = "\x9c\xbc", [0x40fe] = "\x9c\xbd", [0x40ff] = "\x88\xd3",
-  [0x4105] = "\x9c\xb1", [0x410a] = "\x8b\xf0", [0x410b] = "\x88\xa4",
-  [0x410f] = "\x8a\xb4", [0x4111] = "\x9c\xb9", [0x4117] = "\x9c\xc1",
-  [0x4118] = "\x9c\xc0", [0x411c] = "\x9c\xc5", [0x4124] = "\x9c\xc6",
-  [0x412c] = "\x9c\xc4", [0x412d] = "\x9c\xc7", [0x412e] = "\x9c\xbf",
-  [0x412f] = "\x9c\xc3", [0x4132] = "\x9c\xc8", [0x4134] = "\x9c\xc9",
-  [0x4137] = "\x9c\xbe", [0x4138] = "\x8e\x9c", [0x413a] = "\x9c\xc2",
-  [0x413b] = "\x91\xd4", [0x413c] = "\x8d\x51", [0x413d] = "\x9c\xb0",
-  [0x413e] = "\x90\x54", [0x4143] = "\x9c\xd6", [0x4145] = "\x95\xe7",
-  [0x4148] = "\x9c\xcc", [0x4149] = "\x9c\xcd", [0x414a] = "\x9c\xce",
-  [0x414d] = "\x9c\xd5", [0x414f] = "\x9c\xd4", [0x4152] = "\x96\x9d",
-  [0x4153] = "\x8a\xb5", [0x4155] = "\x9c\xd2", [0x4157] = "\x8c\x64",
-  [0x4158] = "\x8a\x53", [0x415b] = "\x9c\xcf", [0x415e] = "\x97\xb6",
-  [0x415f] = "\x9c\xd1", [0x4160] = "\x88\xd4", [0x4161] = "\x9c\xd3",
-  [0x4163] = "\x9c\xca", [0x4164] = "\x9c\xd0", [0x4165] = "\x9c\xd7",
-  [0x4166] = "\x8c\x63", [0x4167] = "\x9c\xcb", [0x416e] = "\x97\x7c",
-  [0x4172] = "\x97\x4a", [0x4177] = "\x9c\xda", [0x417a] = "\x9c\xde",
-  [0x417e] = "\x91\x9e", [0x4180] = "\x97\xf7", [0x4181] = "\x9c\xdf",
-  [0x4184] = "\x9c\xdc", [0x4186] = "\x9c\xd9", [0x4189] = "\x9c\xd8",
-  [0x418a] = "\x9c\xdd", [0x4194] = "\x95\xae", [0x4197] = "\x93\xb2",
-  [0x4199] = "\x8c\x65", [0x419b] = "\x9c\xe0", [0x419c] = "\x9c\xdb",
-  [0x419e] = "\x9c\xe1", [0x41a2] = "\x8c\x9b", [0x41a6] = "\x89\xaf",
-  [0x41aa] = "\x9c\xe9", [0x41ae] = "\x8a\xb6", [0x41b3] = "\x9c\xe7",
-  [0x41b6] = "\x9c\xe8", [0x41b7] = "\x8d\xa7", [0x41b8] = "\x9c\xe6",
-  [0x41b9] = "\x9c\xe4", [0x41ba] = "\x9c\xe3", [0x41bb] = "\x9c\xea",
-  [0x41bc] = "\x9c\xe2", [0x41bd] = "\x9c\xec", [0x41c0] = "\x89\xf9",
-  [0x41d3] = "\x9c\xee", [0x41d6] = "\x9c\xed", [0x41e2] = "\x92\xa6",
-  [0x41e4] = "\x9c\xf1", [0x41e6] = "\x9c\xef", [0x41e7] = "\x9c\xe5",
-  [0x41e8] = "\x8c\x9c", [0x41ea] = "\x9c\xf0", [0x41ec] = "\x9c\xf4",
-  [0x41ed] = "\x9c\xf3", [0x41ee] = "\x9c\xf5", [0x41ef] = "\x9c\xf2",
-  [0x41f0] = "\x9c\xf6", [0x41f8] = "\x9c\xf7", [0x41f9] = "\x9c\xf8",
-  [0x41fa] = "\x95\xe8", [0x41fc] = "\x9c\xfa", [0x41fd] = "\x9c\xf9",
-  [0x41fe] = "\x8f\x5e", [0x4200] = "\x90\xac", [0x4201] = "\x89\xe4",
-  [0x4202] = "\x89\xfa", [0x4204] = "\x9c\xfb", [0x4206] = "\x88\xbd",
-  [0x420a] = "\x90\xca", [0x420b] = "\x9c\xfc", [0x420d] = "\xe6\xc1",
-  [0x420e] = "\x9d\x40", [0x420f] = "\x8c\x81", [0x4211] = "\x9d\x41",
-  [0x4216] = "\x90\xed", [0x421a] = "\x9d\x42", [0x421e] = "\x9d\x43",
-  [0x421f] = "\x8b\x59", [0x4220] = "\x9d\x44", [0x4222] = "\x9d\x45",
-  [0x4223] = "\x9d\x46", [0x4224] = "\x91\xd5", [0x4228] = "\x8c\xcb",
-  [0x422b] = "\x96\xdf", [0x422f] = "\x96\x5b", [0x4230] = "\x8f\x8a",
-  [0x4231] = "\x9d\x47", [0x4237] = "\x90\xee", [0x4238] = "\xe7\xbb",
-  [0x4239] = "\x94\xe0", [0x423b] = "\x8e\xe8", [0x423d] = "\x8d\xcb",
-  [0x423e] = "\x9d\x48", [0x4243] = "\x91\xc5", [0x4245] = "\x95\xa5",
-  [0x4248] = "\x91\xef", [0x424b] = "\x9d\x4b", [0x424e] = "\x9d\x49",
-  [0x4250] = "\x9d\x4c", [0x4253] = "\x9d\x4a", [0x4258] = "\x9d\x4d",
-  [0x425e] = "\x95\xaf", [0x4261] = "\x88\xb5", [0x4266] = "\x95\x7d",
-  [0x4269] = "\x94\xe1", [0x426c] = "\x9d\x4e", [0x426e] = "\x9d\x51",
-  [0x426f] = "\x8f\xb3", [0x4270] = "\x8b\x5a", [0x4272] = "\x9d\x4f",
-  [0x4273] = "\x9d\x56", [0x4274] = "\x8f\xb4", [0x4279] = "\x9d\x50",
-  [0x427a] = "\x94\x63", [0x4281] = "\x97\x7d", [0x4282] = "\x9d\x52",
-  [0x4283] = "\x9d\x53", [0x4284] = "\x9d\x57", [0x4285] = "\x93\x8a",
-  [0x4286] = "\x9d\x54", [0x4287] = "\x8d\x52", [0x4288] = "\x90\xdc",
-  [0x428b] = "\x9d\x65", [0x428c] = "\x94\xb2", [0x428e] = "\x91\xf0",
-  [0x429b] = "\x94\xe2", [0x429c] = "\x9d\xab", [0x42a1] = "\x95\xf8",
-  [0x42a5] = "\x92\xef", [0x42a9] = "\x96\x95", [0x42ab] = "\x9d\x5a",
-  [0x42ac] = "\x89\x9f", [0x42ad] = "\x92\x8a", [0x42b2] = "\x9d\x63",
-  [0x42b5] = "\x92\x53", [0x42b6] = "\x9d\x5d", [0x42b7] = "\x9d\x64",
-  [0x42b8] = "\x9d\x5f", [0x42b9] = "\x9d\x66", [0x42ba] = "\x9d\x62",
-  [0x42bc] = "\x9d\x61", [0x42bd] = "\x94\x8f", [0x42bf] = "\x9d\x5b",
-  [0x42c0] = "\x89\xfb", [0x42c1] = "\x9d\x59", [0x42c2] = "\x8b\x91",
-  [0x42c3] = "\x91\xf1", [0x42c4] = "\x9d\x55", [0x42c7] = "\x9d\x58",
-  [0x42c8] = "\x8d\x53", [0x42c9] = "\x90\xd9", [0x42cb] = "\x8f\xb5",
-  [0x42cc] = "\x9d\x60", [0x42cd] = "\x94\x71", [0x42d0] = "\x8b\x92",
-  [0x42d1] = "\x8a\x67", [0x42dc] = "\x8a\x87", [0x42dd] = "\x90\x40",
-  [0x42de] = "\x9d\x68", [0x42df] = "\x9d\x6d", [0x42e1] = "\x9d\x69",
-  [0x42e3] = "\x8c\x9d", [0x42e5] = "\x9d\x6e", [0x42e6] = "\x8e\x41",
-  [0x42e7] = "\x8d\x89", [0x42ee] = "\x8f\x45", [0x42ef] = "\x9d\x5c",
-  [0x42f1] = "\x8e\x9d", [0x42f2] = "\x9d\x6b", [0x42f7] = "\x8e\x77",
-  [0x42f8] = "\x9d\x6c", [0x42f9] = "\x88\xc2", [0x42fc] = "\x9d\x67",
-  [0x4301] = "\x92\xa7", [0x4309] = "\x8b\x93", [0x430f] = "\x8b\xb2",
-  [0x4317] = "\x9d\x6a", [0x4318] = "\x88\xa5", [0x431b] = "\x8d\xc1",
-  [0x431f] = "\x90\x55", [0x432a] = "\x92\xf0", [0x432d] = "\x94\xd2",
-  [0x432e] = "\x9d\x70", [0x432f] = "\x91\x7d", [0x4339] = "\x91\xa8",
-  [0x433c] = "\x8e\x4a", [0x433d] = "\x9d\x71", [0x433f] = "\x9d\x73",
-  [0x4340] = "\x9d\x6f", [0x4345] = "\x95\xdf", [0x4347] = "\x92\xbb",
-  [0x434c] = "\x91\x7b", [0x4357] = "\x95\xf9", [0x4358] = "\x8e\xcc",
-  [0x4359] = "\x9d\x80", [0x435b] = "\x9d\x7e", [0x435e] = "\x90\x98",
-  [0x4362] = "\x8c\x9e", [0x4366] = "\x9d\x78", [0x4367] = "\x8f\xb7",
-  [0x436a] = "\x93\xe6", [0x436b] = "\x94\x50", [0x4370] = "\x9d\x76",
-  [0x4373] = "\x91\x7c", [0x4378] = "\x8e\xf6", [0x4379] = "\x9d\x7b",
-  [0x437c] = "\x8f\xb6", [0x437e] = "\x9d\x75", [0x437f] = "\x9d\x7a",
-  [0x4382] = "\x94\x72", [0x4386] = "\x9d\x74", [0x4388] = "\x8c\x40",
-  [0x438b] = "\x8a\x7c", [0x438f] = "\x9d\x7c", [0x4390] = "\x97\xa9",
-  [0x4391] = "\x8d\xcc", [0x4392] = "\x92\x54", [0x4393] = "\x9d\x79",
-  [0x4395] = "\x90\xda", [0x4397] = "\x8d\x54", [0x4398] = "\x90\x84",
-  [0x4399] = "\x89\x86", [0x439a] = "\x91\x5b", [0x439b] = "\x9d\x77",
-  [0x439c] = "\x8b\x64", [0x43a2] = "\x8c\x66", [0x43a4] = "\x92\xcd",
-  [0x43a5] = "\x9d\x7d", [0x43ab] = "\x91\x7e", [0x43ae] = "\x9d\x81",
-  [0x43b0] = "\x9d\x83", [0x43b3] = "\x91\xb5", [0x43b4] = "\x9d\x89",
-  [0x43b6] = "\x9d\x84", [0x43b9] = "\x9d\x86", [0x43bf] = "\x95\x60",
-  [0x43c0] = "\x92\xf1", [0x43c2] = "\x9d\x87", [0x43c6] = "\x97\x4b",
-  [0x43ca] = "\x97\x67", [0x43cb] = "\x8a\xb7", [0x43d1] = "\x88\xac",
-  [0x43d3] = "\x9d\x85", [0x43d9] = "\x9d\x82", [0x43de] = "\x8a\xf6",
-  [0x43e4] = "\x89\x87", [0x43e6] = "\x9d\x88", [0x43ea] = "\x97\x68",
-  [0x43f6] = "\x9d\x8c", [0x43fd] = "\x91\xb9", [0x43ff] = "\x9d\x93",
-  [0x4403] = "\x9d\x8d", [0x4406] = "\x9d\x8a", [0x4407] = "\x9d\x91",
-  [0x440c] = "\x9d\x72", [0x4416] = "\x9d\x8e", [0x4418] = "\x9d\x92",
-  [0x441c] = "\x94\xc0", [0x441d] = "\x93\x8b", [0x4424] = "\x9d\x8b",
-  [0x4426] = "\x9d\x8f", [0x442a] = "\x8c\x67", [0x442e] = "\x8d\xef",
-  [0x4432] = "\x90\xdb", [0x443e] = "\x9d\x97", [0x4448] = "\x93\x45",
-  [0x4457] = "\x9d\x94", [0x4459] = "\x96\x80", [0x445f] = "\x9d\x95",
-  [0x4466] = "\x9d\x96", [0x4468] = "\x96\xcc", [0x446a] = "\x90\xa0",
-  [0x4473] = "\x8c\x82", [0x4478] = "\x9d\x9d", [0x4482] = "\x8e\x54",
-  [0x4483] = "\x9d\x9a", [0x4485] = "\x9d\x99", [0x448a] = "\x94\x51",
-  [0x448e] = "\x93\xb3", [0x4494] = "\x93\x50", [0x4495] = "\x9d\x9b",
-  [0x4499] = "\x9d\x9c", [0x449b] = "\x95\x8f", [0x449d] = "\x94\x64",
-  [0x449e] = "\x8e\x42", [0x44a0] = "\x90\xef", [0x44a2] = "\x96\x6f",
-  [0x44a9] = "\x8a\x68", [0x44ab] = "\x9d\xa3", [0x44ac] = "\x9d\x9e",
-  [0x44b1] = "\x97\x69", [0x44b2] = "\x9d\xa5", [0x44b5] = "\x9d\xa1",
-  [0x44b7] = "\x9d\xa2", [0x44bd] = "\x91\x80", [0x44c2] = "\x9d\xa0",
-  [0x44c4] = "\x9d\x5e", [0x44c8] = "\x9d\xa4", [0x44ca] = "\x9d\x9f",
-  [0x44d0] = "\x9d\xa9", [0x44d1] = "\x9d\xaa", [0x44d2] = "\x93\x46",
-  [0x44d3] = "\x9d\xac", [0x44d6] = "\x8e\x43", [0x44d7] = "\x9d\xa7",
-  [0x44dc] = "\x8b\x5b", [0x44df] = "\x9d\xad", [0x44e1] = "\x9d\xa6",
-  [0x44e2] = "\x9d\xb1", [0x44e4] = "\x9d\xb0", [0x44e6] = "\x9d\xaf",
-  [0x44ea] = "\x9d\xb2", [0x44ed] = "\x9d\xb4", [0x44ee] = "\x8f\xef",
-  [0x44f0] = "\x9d\xb3", [0x44f5] = "\x9d\xb7", [0x4508] = "\x9d\xb5",
-  [0x450c] = "\x9d\xb6", [0x450d] = "\x9d\x90", [0x4513] = "\x9d\xb9",
-  [0x4514] = "\x9d\xb8", [0x451a] = "\x9d\x98", [0x451b] = "\x9d\xba",
-  [0x451c] = "\x9d\xae", [0x451f] = "\x8e\x78", [0x4524] = "\x9d\xbb",
-  [0x4525] = "\x9d\xbc", [0x4526] = "\x9d\xbe", [0x4527] = "\x9d\xbd",
-  [0x4528] = "\x9d\xbf", [0x4529] = "\x89\xfc", [0x452b] = "\x8d\x55",
-  [0x452e] = "\x95\xfa", [0x452f] = "\x90\xad", [0x4535] = "\x8c\xcc",
-  [0x4538] = "\x9d\xc1", [0x453d] = "\x9d\xc4", [0x453f] = "\x95\x71",
-  [0x4541] = "\x8b\x7e", [0x4545] = "\x9d\xc3", [0x4546] = "\x9d\xc2",
-  [0x4547] = "\x94\x73", [0x4548] = "\x9d\xc5", [0x4549] = "\x8b\xb3",
-  [0x454d] = "\x9d\xc7", [0x454e] = "\x9d\xc6", [0x4552] = "\x8a\xb8",
-  [0x4553] = "\x8e\x55", [0x4556] = "\x93\xd6", [0x455c] = "\x8c\x68",
-  [0x4560] = "\x90\x94", [0x4562] = "\x9d\xc8", [0x4564] = "\x90\xae",
-  [0x4565] = "\x93\x47", [0x4567] = "\x95\x7e", [0x4568] = "\x9d\xc9",
-  [0x4572] = "\x9d\xca", [0x4573] = "\x9d\xcb", [0x4577] = "\x95\xb6",
-  [0x4578] = "\x9b\x7c", [0x4579] = "\x90\xc4", [0x457c] = "\x95\x6b",
-  [0x457e] = "\x8d\xd6", [0x4580] = "\x94\xe3", [0x4581] = "\x94\xc1",
-  [0x4587] = "\x93\x6c", [0x4589] = "\x97\xbf", [0x458b] = "\x9d\xcd",
-  [0x458c] = "\x8e\xce", [0x458f] = "\x9d\xce", [0x4591] = "\x88\xb4",
-  [0x4594] = "\x8b\xd2", [0x4595] = "\x90\xcb", [0x4597] = "\x95\x80",
-  [0x459b] = "\x9d\xcf", [0x459c] = "\x8e\x61", [0x459d] = "\x92\x66",
-  [0x459f] = "\x8e\x7a", [0x45a0] = "\x90\x56", [0x45a7] = "\x9d\xd0",
-  [0x45a9] = "\x95\xfb", [0x45ac] = "\x89\x97", [0x45ad] = "\x8e\x7b",
-  [0x45b1] = "\x9d\xd3", [0x45b3] = "\x9d\xd1", [0x45b4] = "\x9d\xd4",
-  [0x45b5] = "\x97\xb7", [0x45b6] = "\x9d\xd2", [0x45bb] = "\x90\xf9",
-  [0x45bc] = "\x9d\xd5", [0x45bf] = "\x91\xb0", [0x45c2] = "\x9d\xd6",
-  [0x45c7] = "\x8a\xf8", [0x45c9] = "\x9d\xd8", [0x45cb] = "\x9d\xd7",
-  [0x45d0] = "\x9d\xd9", [0x45d1] = "\x9d\xda", [0x45d2] = "\x8a\xf9",
-  [0x45d5] = "\x93\xfa", [0x45d6] = "\x92\x55", [0x45d7] = "\x8b\x8c",
-  [0x45d8] = "\x8e\x7c", [0x45d9] = "\x91\x81", [0x45dc] = "\x8f\x7b",
-  [0x45dd] = "\x88\xae", [0x45e1] = "\x9d\xdb", [0x45ea] = "\x89\xa0",
-  [0x45eb] = "\x9d\xdf", [0x45f2] = "\x8d\x56", [0x45f3] = "\x9d\xde",
-  [0x45f6] = "\x8d\xa9", [0x45f7] = "\x8f\xb8", [0x45fa] = "\x9d\xdd",
-  [0x45fc] = "\x8f\xb9", [0x45fe] = "\x96\xbe", [0x45ff] = "\x8d\xa8",
-  [0x4603] = "\x88\xd5", [0x4604] = "\x90\xcc", [0x460c] = "\x9d\xe4",
-  [0x460f] = "\x90\xaf", [0x4610] = "\x89\x66", [0x4615] = "\x8f\x74",
-  [0x4617] = "\x96\x86", [0x4618] = "\x8d\xf0", [0x461d] = "\x8f\xba",
-  [0x461f] = "\x90\xa5", [0x4624] = "\x9d\xe3", [0x4625] = "\x9d\xe1",
-  [0x4626] = "\x9d\xe2", [0x462c] = "\x92\x8b", [0x462f] = "\x9e\x45",
-  [0x4631] = "\x9d\xe8", [0x4632] = "\x8e\x9e", [0x4633] = "\x8d\x57",
-  [0x4634] = "\x9d\xe6", [0x4639] = "\x9d\xe7", [0x463b] = "\x90\x57",
-  [0x463f] = "\x9d\xe5", [0x4642] = "\x8e\x4e", [0x464d] = "\x9d\xea",
-  [0x464e] = "\x9d\xe9", [0x464f] = "\x9d\xee", [0x4652] = "\x9d\xef",
-  [0x4654] = "\x9d\xeb", [0x4656] = "\x8a\x41", [0x4657] = "\x9d\xec",
-  [0x4658] = "\x9d\xed", [0x4659] = "\x94\xd3", [0x465e] = "\x95\x81",
-  [0x465f] = "\x8c\x69", [0x4660] = "\x9d\xf0", [0x4664] = "\x90\xb0",
-  [0x4666] = "\x8f\xbb", [0x466a] = "\x92\x71", [0x4671] = "\x8b\xc5",
-  [0x4673] = "\x9d\xf1", [0x4674] = "\x9d\xf5", [0x4677] = "\x89\xc9",
-  [0x4678] = "\x9d\xf2", [0x4679] = "\x9d\xf4", [0x467e] = "\x9d\xf3",
-  [0x4681] = "\x8f\x8b", [0x4686] = "\x92\x67", [0x4687] = "\x88\xc3",
-  [0x4688] = "\x9d\xf6", [0x468d] = "\x9d\xf7", [0x4692] = "\x92\xa8",
-  [0x4696] = "\x97\xef", [0x469b] = "\x8e\x62", [0x469e] = "\x95\xe9",
-  [0x46a4] = "\x96\x5c", [0x46a8] = "\x9e\x41", [0x46a9] = "\x9d\xf9",
-  [0x46ac] = "\x9d\xfc", [0x46ae] = "\x9d\xfb", [0x46b1] = "\x9d\xf8",
-  [0x46b4] = "\x9e\x40", [0x46b7] = "\x93\xdc", [0x46b9] = "\x9d\xfa",
-  [0x46c6] = "\x9e\x42", [0x46c9] = "\x8f\x8c", [0x46ca] = "\x9e\x43",
-  [0x46cc] = "\x97\x6a", [0x46cd] = "\x94\x98", [0x46d0] = "\x9e\x44",
-  [0x46d6] = "\x9e\x46", [0x46d9] = "\x9e\x47", [0x46e0] = "\x9e\x48",
-  [0x46e2] = "\x8b\xc8", [0x46e3] = "\x89\x67", [0x46e4] = "\x8d\x58",
-  [0x46e5] = "\x9e\x49", [0x46e7] = "\x9e\x4a", [0x46e8] = "\x8f\x91",
-  [0x46e9] = "\x91\x82", [0x46ec] = "\x99\xd6", [0x46ed] = "\x91\x5d",
-  [0x46ee] = "\x91\x5c", [0x46ef] = "\x91\xd6", [0x46f0] = "\x8d\xc5",
-  [0x46f3] = "\x98\xf0", [0x46f8] = "\x8c\x8e", [0x46f9] = "\x97\x4c",
-  [0x46fb] = "\x95\xfc", [0x46fd] = "\x95\x9e", [0x46ff] = "\x9e\x4b",
-  [0x4704] = "\x8d\xf1", [0x4705] = "\x92\xbd", [0x4706] = "\x9e\x4c",
-  [0x4707] = "\x98\x4e", [0x470b] = "\x96\x5d", [0x470d] = "\x92\xa9",
-  [0x470e] = "\x9e\x4d", [0x470f] = "\x8a\xfa", [0x4716] = "\x9e\x4e",
-  [0x4717] = "\x9e\x4f", [0x4718] = "\x96\xd8", [0x471a] = "\x96\xa2",
-  [0x471b] = "\x96\x96", [0x471c] = "\x96\x7b", [0x471d] = "\x8e\x44",
-  [0x471e] = "\x9e\x51", [0x4721] = "\x8e\xe9", [0x4724] = "\x96\x70",
-  [0x4726] = "\x9e\x53", [0x4727] = "\x9e\x56", [0x4728] = "\x9e\x55",
-  [0x472a] = "\x8a\xf7", [0x472d] = "\x8b\x80", [0x472f] = "\x9e\x52",
-  [0x4731] = "\x9e\x54", [0x4736] = "\x9e\x57", [0x4739] = "\x90\x99",
-  [0x473e] = "\x97\x9b", [0x473f] = "\x88\xc7", [0x4740] = "\x8d\xde",
-  [0x4741] = "\x91\xba", [0x4743] = "\x8e\xdb", [0x4746] = "\x8f\xf1",
-  [0x4749] = "\x9e\x5a", [0x474c] = "\x93\x6d", [0x474e] = "\x9e\x58",
-  [0x474f] = "\x91\xa9", [0x4750] = "\x9e\x59", [0x4751] = "\x8f\xf0",
-  [0x4752] = "\x96\xdb", [0x4753] = "\x9e\x5b", [0x4754] = "\x9e\x5c",
-  [0x4755] = "\x97\x88", [0x475a] = "\x9e\x61", [0x475d] = "\x8d\x59",
-  [0x475f] = "\x94\x74", [0x4760] = "\x9e\x5e", [0x4761] = "\x93\x8c",
-  [0x4762] = "\x9d\xdc", [0x4763] = "\x9d\xe0", [0x4765] = "\x8b\x6e",
-  [0x4767] = "\x94\x66", [0x476c] = "\x9e\x60", [0x476e] = "\x8f\xbc",
-  [0x476f] = "\x94\xc2", [0x4775] = "\x9e\x66", [0x4777] = "\x94\xf8",
-  [0x4779] = "\x9e\x5d", [0x477b] = "\x9e\x63", [0x477c] = "\x9e\x62",
-  [0x4780] = "\x90\xcd", [0x4785] = "\x96\x8d", [0x4787] = "\x97\xd1",
-  [0x478a] = "\x96\x87", [0x478c] = "\x89\xca", [0x478d] = "\x8e\x7d",
-  [0x4790] = "\x98\x67", [0x4791] = "\x9e\x65", [0x4792] = "\x90\x95",
-  [0x4796] = "\x9e\x64", [0x4799] = "\x9e\x5f", [0x479f] = "\x8c\xcd",
-  [0x47a3] = "\x9e\x6b", [0x47a4] = "\x9e\x69", [0x47a6] = "\x89\xcb",
-  [0x47a7] = "\x9e\x67", [0x47a8] = "\x9e\x6d", [0x47a9] = "\x9e\x73",
-  [0x47b1] = "\x91\xc6", [0x47b4] = "\x95\xbf", [0x47b6] = "\x9e\x75",
-  [0x47ba] = "\x95\x41", [0x47be] = "\x9e\x74", [0x47bf] = "\x94\x90",
-  [0x47c0] = "\x96\x5e", [0x47c1] = "\x8a\xb9", [0x47c3] = "\x90\xf5",
-  [0x47c4] = "\x8f\x5f", [0x47c8] = "\x92\xd1", [0x47ca] = "\x97\x4d",
-  [0x47cd] = "\x9e\x70", [0x47ce] = "\x9e\x6f", [0x47d2] = "\x9e\x71",
-  [0x47d4] = "\x9e\x6e", [0x47d7] = "\x9e\x76", [0x47d9] = "\x9e\x6c",
-  [0x47dc] = "\x9e\x6a", [0x47de] = "\x9e\x72", [0x47df] = "\x9e\x68",
-  [0x47e1] = "\x92\x8c", [0x47e3] = "\x96\xf6", [0x47e4] = "\x8e\xc4",
-  [0x47e5] = "\x8d\xf2", [0x47eb] = "\x8d\xb8", [0x47ee] = "\x96\x8f",
-  [0x47ef] = "\x8a\x60", [0x47f2] = "\x92\xcc", [0x47f3] = "\x93\xc8",
-  [0x47f4] = "\x89\x68", [0x4803] = "\x90\xf0", [0x4806] = "\x90\xb2",
-  [0x4807] = "\x8c\x49", [0x480e] = "\x9e\x78", [0x4811] = "\x8d\x5a",
-  [0x4812] = "\x8a\x9c", [0x4819] = "\x9e\x7a", [0x481a] = "\x8a\x94",
-  [0x481b] = "\x9e\x81", [0x4822] = "\x9e\x7d", [0x4824] = "\x90\xf1",
-  [0x4828] = "\x8a\x6a", [0x4829] = "\x8d\xaa", [0x482c] = "\x8a\x69",
-  [0x482d] = "\x8d\xcd", [0x4830] = "\x9e\x7b", [0x4831] = "\x8c\x85",
-  [0x4832] = "\x8c\x6a", [0x4833] = "\x93\x8d", [0x4836] = "\x9e\x79",
-  [0x4838] = "\x88\xc4", [0x483d] = "\x9e\x7c", [0x483e] = "\x9e\x7e",
-  [0x4840] = "\x8b\xcb", [0x4841] = "\x8c\x4b", [0x4843] = "\x8a\xba",
-  [0x4844] = "\x8b\x6a", [0x4849] = "\x9e\x82", [0x484c] = "\x8d\xf7",
-  [0x484d] = "\x96\x91", [0x484f] = "\x8e\x56", [0x4853] = "\x9e\x83",
-  [0x4857] = "\x95\x4f", [0x4864] = "\x9e\x8f", [0x4866] = "\x89\xb1",
-  [0x4867] = "\x9e\x84", [0x486e] = "\x9e\x95", [0x486f] = "\x9e\x85",
-  [0x4871] = "\x97\xc0", [0x4873] = "\x9e\x8c", [0x4875] = "\x94\x7e",
-  [0x487d] = "\x9e\x94", [0x487f] = "\x9e\x87", [0x4883] = "\x88\xb2",
-  [0x4884] = "\x9e\x89", [0x4887] = "\x8d\x5b", [0x488b] = "\x9e\x8b",
-  [0x488d] = "\x9e\x8a", [0x488f] = "\x9e\x86", [0x4890] = "\x9e\x91",
-  [0x4892] = "\x8f\xbd", [0x4896] = "\x9a\xeb", [0x4897] = "\x8c\xe6",
-  [0x4898] = "\x97\x9c", [0x489d] = "\x9e\x88", [0x489f] = "\x92\xf2",
-  [0x48a0] = "\x8a\x42", [0x48a1] = "\x8d\xab", [0x48a3] = "\x9e\x80",
-  [0x48a5] = "\x9e\x90", [0x48a6] = "\x8a\x81", [0x48a9] = "\x9e\x8e",
-  [0x48aa] = "\x9e\x92", [0x48ac] = "\x93\x8e", [0x48b4] = "\x8a\xfc",
-  [0x48b6] = "\x9e\xb0", [0x48b9] = "\x96\xc7", [0x48ba] = "\x9e\x97",
-  [0x48bb] = "\x8a\xfb", [0x48bd] = "\x9e\x9e", [0x48c2] = "\x96\x5f",
-  [0x48c4] = "\x9e\x9f", [0x48c5] = "\x9e\xa1", [0x48c7] = "\x9e\xa5",
-  [0x48c8] = "\x9e\x99", [0x48ca] = "\x92\x49", [0x48cf] = "\x93\x8f",
-  [0x48d0] = "\x9e\xa9", [0x48d1] = "\x9e\x9c", [0x48d3] = "\x9e\xa6",
-  [0x48d7] = "\x9e\xa0", [0x48de] = "\x90\x58", [0x48df] = "\x9e\xaa",
-  [0x48e2] = "\x90\xb1", [0x48e9] = "\x9e\xa8", [0x48ea] = "\x8a\xbb",
-  [0x48f0] = "\x98\x6f", [0x48f1] = "\x9e\x96", [0x48f4] = "\x9e\xa4",
-  [0x48f5] = "\x88\xd6", [0x48f8] = "\x9e\x98", [0x48fb] = "\x96\xb8",
-  [0x48fc] = "\x9e\x9d", [0x48fd] = "\x90\x41", [0x48fe] = "\x92\xc5",
-  [0x48ff] = "\x9e\x93", [0x4902] = "\x9e\xa3", [0x4909] = "\x90\x9a",
-  [0x490a] = "\x9e\xad", [0x490b] = "\x8a\x91", [0x490c] = "\x8c\x9f",
-  [0x4911] = "\x9e\xaf", [0x4912] = "\x9e\x9a", [0x4913] = "\x9e\xae",
-  [0x4915] = "\x9e\xa7", [0x4916] = "\x9e\x9b", [0x4918] = "\x9e\xab",
-  [0x491a] = "\x9e\xac", [0x4920] = "\x9e\xbd", [0x4924] = "\x93\xcc",
-  [0x4926] = "\x9e\xa2", [0x4929] = "\x9e\xb9", [0x492d] = "\x9e\xbb",
-  [0x492f] = "\x92\xd6", [0x493a] = "\x97\x6b", [0x4943] = "\x95\x96",
-  [0x4944] = "\x9e\xb6", [0x4945] = "\x91\xc8", [0x4949] = "\x9e\xbc",
-  [0x494a] = "\x91\x5e", [0x494c] = "\x9e\xb3", [0x494d] = "\x9e\xc0",
-  [0x494e] = "\x9e\xbf", [0x4950] = "\x93\xed", [0x4951] = "\x9e\xbe",
-  [0x4952] = "\x93\xe8", [0x495a] = "\x9e\xc2", [0x495b] = "\x9e\xb5",
-  [0x495d] = "\x8b\xc6", [0x495e] = "\x9e\xb8", [0x495f] = "\x8f\x7c",
-  [0x4963] = "\x94\x80", [0x4964] = "\x9e\xba", [0x4965] = "\x8b\xc9",
-  [0x4967] = "\x9e\xb2", [0x4968] = "\x9e\xb4", [0x4969] = "\x9e\xb1",
-  [0x496c] = "\x98\x4f", [0x496d] = "\x8a\x79", [0x496e] = "\x9e\xb7",
-  [0x4971] = "\x9e\xc1", [0x4972] = "\x8a\x54", [0x497a] = "\x8d\xe5",
-  [0x497e] = "\x89\x7c", [0x4981] = "\x9e\xd2", [0x4984] = "\x98\x50",
-  [0x4985] = "\x9e\xd5", [0x498b] = "\x90\x59", [0x498c] = "\x9e\xd4",
-  [0x4990] = "\x9e\xd3", [0x4997] = "\x9e\xd0", [0x499e] = "\x9e\xc4",
-  [0x49a1] = "\x9e\xe1", [0x49a2] = "\x9e\xc3", [0x49a4] = "\x9e\xd6",
-  [0x49ab] = "\x9e\xce", [0x49ae] = "\x9e\xc9", [0x49af] = "\x9e\xc6",
-  [0x49b1] = "\x9e\xc7", [0x49b3] = "\x9e\xcf", [0x49b7] = "\xea\xa0",
-  [0x49ba] = "\x9e\xcc", [0x49bb] = "\x8d\x5c", [0x49bc] = "\x92\xc6",
-  [0x49bd] = "\x91\x84", [0x49be] = "\x9e\xca", [0x49c0] = "\x9e\xc5",
-  [0x49c3] = "\x9e\xc8", [0x49c8] = "\x97\x6c", [0x49c9] = "\x96\x8a",
-  [0x49cd] = "\x9e\xcd", [0x49ce] = "\x9e\xd7", [0x49d7] = "\x9e\xdf",
-  [0x49d8] = "\x9e\xd8", [0x49db] = "\x9e\xe5", [0x49dd] = "\x9e\xe3",
-  [0x49e2] = "\x9e\xde", [0x49e9] = "\x9e\xdd", [0x49eb] = "\x92\xce",
-  [0x49ed] = "\x91\x85", [0x49ef] = "\x9e\xdb", [0x49f2] = "\x9e\xd9",
-  [0x49f5] = "\x9e\xe0", [0x49fa] = "\x9e\xe6", [0x49fb] = "\x94\xf3",
-  [0x49fc] = "\x9e\xec", [0x4a02] = "\x9e\xe7", [0x4a03] = "\x9e\xea",
-  [0x4a04] = "\x9e\xe4", [0x4a07] = "\x92\x94", [0x4a09] = "\x95\x57",
-  [0x4a0b] = "\x9e\xda", [0x4a0e] = "\x9e\xe2", [0x4a0f] = "\x8f\xbe",
-  [0x4a11] = "\x96\xcd", [0x4a12] = "\x9e\xf6", [0x4a13] = "\x9e\xe9",
-  [0x4a19] = "\x8c\xa0", [0x4a1a] = "\x89\xa1", [0x4a1b] = "\x8a\x7e",
-  [0x4a1e] = "\x9e\xd1", [0x4a25] = "\x8f\xbf", [0x4a26] = "\x9e\xee",
-  [0x4a28] = "\x9e\xf5", [0x4a29] = "\x8e\xf7", [0x4a2a] = "\x8a\x92",
-  [0x4a2d] = "\x92\x4d", [0x4a34] = "\x9e\xeb", [0x4a37] = "\x9e\xf0",
-  [0x4a38] = "\x9e\xf4", [0x4a3b] = "\x8b\xb4", [0x4a48] = "\x8b\x6b",
-  [0x4a49] = "\x9e\xf2", [0x4a4f] = "\x8b\x40", [0x4a51] = "\x93\xc9",
-  [0x4a52] = "\x9e\xf1", [0x4a56] = "\x9e\xf3", [0x4a62] = "\x9e\xed",
-  [0x4a68] = "\x9e\xef", [0x4a6f] = "\x8a\x80", [0x4a70] = "\x92\x68",
-  [0x4a74] = "\x9e\xfa", [0x4a7d] = "\x9e\xf8", [0x4a7e] = "\x8c\xe7",
-  [0x4a80] = "\x9e\xf7", [0x4a87] = "\x9f\x40", [0x4a8c] = "\x9e\x77",
-  [0x4a90] = "\x9e\xf9", [0x4a92] = "\x9e\xfb", [0x4a93] = "\x9e\xfc",
-  [0x4a9a] = "\x9f\x4b", [0x4a9c] = "\x9f\x47", [0x4a9e] = "\x9e\x8d",
-  [0x4aa3] = "\x9f\x46", [0x4aa8] = "\x9f\x45", [0x4aab] = "\x9f\x42",
-  [0x4ab1] = "\x9e\xe8", [0x4ab2] = "\x9f\x44", [0x4ab3] = "\x9f\x43",
-  [0x4ac1] = "\x9f\x49", [0x4ac3] = "\x98\x45", [0x4aca] = "\x9f\x4c",
-  [0x4acb] = "\x8b\xf9", [0x4ace] = "\x9f\x48", [0x4acf] = "\x9f\x4a",
-  [0x4ad8] = "\x94\xa5", [0x4ada] = "\x9f\x4d", [0x4aea] = "\x9f\x51",
-  [0x4aeb] = "\x9f\x4e", [0x4af4] = "\x97\x93", [0x4af5] = "\x9f\x4f",
-  [0x4afa] = "\x9e\xdc", [0x4b02] = "\x9f\x52", [0x4b06] = "\x9f\x53",
-  [0x4b0d] = "\x89\x54", [0x4b0f] = "\x9f\x55", [0x4b10] = "\x8c\x87",
-  [0x4b11] = "\x8e\x9f", [0x4b13] = "\x8b\xd3", [0x4b17] = "\x89\xa2",
-  [0x4b22] = "\x97\x7e", [0x4b27] = "\x9f\x57", [0x4b28] = "\x9f\x56",
-  [0x4b29] = "\x9f\x59", [0x4b2a] = "\x8b\x5c", [0x4b2d] = "\x8b\xd4",
-  [0x4b2e] = "\x8a\xbc", [0x4b33] = "\x9f\x5c", [0x4b37] = "\x9f\x5b",
-  [0x4b39] = "\x9f\x5d", [0x4b3c] = "\x89\xcc", [0x4b3e] = "\x92\x56",
-  [0x4b40] = "\x9f\x5e", [0x4b43] = "\x8a\xbd", [0x4b44] = "\x9f\x60",
-  [0x4b49] = "\x9f\x5f", [0x4b4b] = "\x9f\x61", [0x4b4f] = "\x9f\x62",
-  [0x4b51] = "\x9f\x63", [0x4b52] = "\x8e\x7e", [0x4b53] = "\x90\xb3",
-  [0x4b54] = "\x8d\x9f", [0x4b56] = "\x95\x90", [0x4b59] = "\x95\xe0",
-  [0x4b5a] = "\x98\x63", [0x4b5f] = "\x8e\x95", [0x4b63] = "\x8d\xce",
-  [0x4b64] = "\x97\xf0", [0x4b68] = "\x9f\x64", [0x4b69] = "\x9f\x65",
-  [0x4b6b] = "\x8e\x80", [0x4b6f] = "\x9f\x66", [0x4b70] = "\x9f\x67",
-  [0x4b73] = "\x9f\x69", [0x4b74] = "\x9f\x68", [0x4b76] = "\x96\x77",
-  [0x4b79] = "\x8f\x7d", [0x4b7a] = "\x8e\xea", [0x4b7b] = "\x8e\x63",
-  [0x4b7d] = "\x9f\x6a", [0x4b85] = "\x9f\x6c", [0x4b86] = "\x90\x42",
-  [0x4b88] = "\x9f\x6b", [0x4b8e] = "\x9f\x6d", [0x4b94] = "\x9f\x6e",
-  [0x4b9a] = "\x9f\x6f", [0x4b9b] = "\x9f\x70", [0x4b9f] = "\x9f\x71",
-  [0x4ba1] = "\x9f\x73", [0x4ba2] = "\x9f\x72", [0x4ba3] = "\x9f\x74",
-  [0x4ba4] = "\x89\xa3", [0x4ba5] = "\x92\x69", [0x4ba7] = "\x9f\x75",
-  [0x4baa] = "\x8e\x45", [0x4bab] = "\x8a\x6b", [0x4bac] = "\x9f\x76",
-  [0x4baf] = "\x93\x61", [0x4bb0] = "\x9a\xca", [0x4bb5] = "\x8b\x42",
-  [0x4bb6] = "\x9f\x77", [0x4bbb] = "\x9f\x78", [0x4bbd] = "\x95\xea",
-  [0x4bbe] = "\x96\x88", [0x4bc2] = "\x93\xc5", [0x4bc3] = "\x9f\x79",
-  [0x4bc4] = "\x94\xe4", [0x4bc8] = "\x94\xf9", [0x4bcb] = "\x96\xd1",
-  [0x4bcf] = "\x9f\x7a", [0x4bdb] = "\x9f\x7c", [0x4bdc] = "\x9f\x7b",
-  [0x4bdf] = "\x9f\x7e", [0x4be3] = "\x9f\x7d", [0x4bf8] = "\x9f\x81",
-  [0x4bff] = "\x8e\x81", [0x4c01] = "\x96\xaf", [0x4c03] = "\x9f\x82",
-  [0x4c04] = "\x9f\x83", [0x4c07] = "\x8b\x43", [0x4c0b] = "\x9f\x84",
-  [0x4c13] = "\x9f\x86", [0x4c14] = "\x9f\x85", [0x4c24] = "\x90\x85",
-  [0x4c27] = "\x95\x58", [0x4c28] = "\x89\x69", [0x4c2e] = "\x94\xc3",
-  [0x4c30] = "\x92\xf3", [0x4c31] = "\x8f\x60", [0x4c32] = "\x8b\x81",
-  [0x4c3e] = "\x94\xc4", [0x4c40] = "\x8e\xac", [0x4c45] = "\x9f\x88",
-  [0x4c47] = "\x8a\xbe", [0x4c4a] = "\x89\x98", [0x4c4d] = "\x93\xf0",
-  [0x4c4e] = "\x9f\x87", [0x4c4f] = "\x8d\x5d", [0x4c50] = "\x92\x72",
-  [0x4c52] = "\x9f\x89", [0x4c58] = "\x9f\x91", [0x4c5a] = "\x9f\x8a",
-  [0x4c60] = "\x91\xbf", [0x4c62] = "\x8b\x82", [0x4c63] = "\x9f\x92",
-  [0x4c6a] = "\x8c\x88", [0x4c6d] = "\x8b\x44", [0x4c6e] = "\x9f\x90",
-  [0x4c71] = "\x9f\x8e", [0x4c72] = "\x9f\x8b", [0x4c73] = "\x97\x80",
-  [0x4c78] = "\x92\xbe", [0x4c7c] = "\x93\xd7", [0x4c7d] = "\x9f\x8c",
-  [0x4c80] = "\x9f\x94", [0x4c82] = "\x9f\x93", [0x4c83] = "\x8c\x42",
-  [0x4c86] = "\x89\xab", [0x4c89] = "\x8d\xb9", [0x4c8a] = "\x9f\x8d",
-  [0x4c8b] = "\x9f\x8f", [0x4c91] = "\x96\x76", [0x4c92] = "\x91\xf2",
-  [0x4c9b] = "\x96\x97", [0x4c9e] = "\x9f\x9c", [0x4ca1] = "\x9f\x9d",
-  [0x4ca3] = "\x89\xcd", [0x4ca8] = "\x95\xa6", [0x4ca9] = "\x96\xfb",
-  [0x4caa] = "\x9f\x9f", [0x4cab] = "\x8e\xa1", [0x4cac] = "\x8f\xc0",
-  [0x4cad] = "\x9f\x98", [0x4cae] = "\x9f\x9e", [0x4caf] = "\x89\x88",
-  [0x4cb1] = "\x8b\xb5", [0x4cb4] = "\x9f\x95", [0x4cb5] = "\x9f\x9a",
-  [0x4cb9] = "\x90\xf2", [0x4cba] = "\x94\x91", [0x4cbc] = "\x94\xe5",
-  [0x4cc3] = "\x9f\x97", [0x4cc5] = "\x96\x40", [0x4cc7] = "\x9f\x99",
-  [0x4cc9] = "\x9f\xa2", [0x4ccb] = "\x9f\xa0", [0x4ccd] = "\x9f\x9b",
-  [0x4cd1] = "\x96\x41", [0x4cd2] = "\x94\x67", [0x4cd3] = "\x8b\x83",
-  [0x4cd5] = "\x93\x44", [0x4cd8] = "\x92\x8d", [0x4cda] = "\x9f\xa3",
-  [0x4cdf] = "\x9f\xa1", [0x4ce0] = "\x91\xd7", [0x4ce1] = "\x9f\x96",
-  [0x4ce3] = "\x89\x6a", [0x4cfb] = "\x97\x6d", [0x4cfc] = "\x9f\xae",
-  [0x4d02] = "\x9f\xad", [0x4d07] = "\x90\xf4", [0x4d09] = "\x9f\xaa",
-  [0x4d0b] = "\x97\x8c", [0x4d0e] = "\x93\xb4", [0x4d0f] = "\x9f\xa4",
-  [0x4d15] = "\x92\xc3", [0x4d19] = "\x89\x6b", [0x4d1a] = "\x8d\x5e",
-  [0x4d1b] = "\x9f\xa7", [0x4d22] = "\x8f\x46", [0x4d23] = "\x9f\xac",
-  [0x4d25] = "\x9f\xab", [0x4d26] = "\x9f\xa6", [0x4d28] = "\x9f\xa9",
-  [0x4d2b] = "\x8a\x88", [0x4d2d] = "\x9f\xa8", [0x4d2e] = "\x94\x68",
-  [0x4d31] = "\x97\xac", [0x4d34] = "\x8f\xf2", [0x4d35] = "\x90\xf3",
-  [0x4d49] = "\x9f\xb4", [0x4d4a] = "\x9f\xb2", [0x4d4c] = "\x95\x6c",
-  [0x4d53] = "\x9f\xaf", [0x4d54] = "\x9f\xb1", [0x4d56] = "\x89\x59",
-  [0x4d59] = "\x8d\x5f", [0x4d5a] = "\x98\x51", [0x4d5c] = "\x8a\x5c",
-  [0x4d5e] = "\x95\x82", [0x4d64] = "\x97\x81", [0x4d67] = "\x8a\x43",
-  [0x4d68] = "\x90\x5a", [0x4d69] = "\x9f\xb3", [0x4d75] = "\x9f\xb8",
-  [0x4d78] = "\x8f\xc1", [0x4d7c] = "\x97\x4f", [0x4d7e] = "\x9f\xb5",
-  [0x4d83] = "\x9f\xb0", [0x4d85] = "\x9f\xb6", [0x4d89] = "\x97\xdc",
-  [0x4d8b] = "\x93\x93", [0x4d8c] = "\x93\xc0", [0x4d9f] = "\x8a\x55",
-  [0x4da2] = "\x89\x74", [0x4da5] = "\x9f\xbc", [0x4da8] = "\x9f\xbf",
-  [0x4dac] = "\x97\xc1", [0x4db0] = "\x97\x84", [0x4db5] = "\x9f\xc6",
-  [0x4db6] = "\x9f\xc0", [0x4db7] = "\x9f\xbd", [0x4dbb] = "\x97\xd2",
-  [0x4dbc] = "\x9f\xc3", [0x4dc1] = "\x8f\x69", [0x4dc2] = "\x9f\xc5",
-  [0x4dc5] = "\x9f\xca", [0x4dc8] = "\x93\x91", [0x4dc9] = "\x9f\xc8",
-  [0x4dce] = "\x9f\xc2", [0x4dd1] = "\x92\x57", [0x4dd4] = "\x9f\xc9",
-  [0x4dd6] = "\x9f\xbe", [0x4dd8] = "\x9f\xc4", [0x4dda] = "\x9f\xcb",
-  [0x4ddb] = "\x88\xfa", [0x4ddc] = "\x9f\xc1", [0x4dde] = "\x9f\xcc",
-  [0x4de1] = "\x90\x5b", [0x4de3] = "\x8f\x7e", [0x4de5] = "\x95\xa3",
-  [0x4de7] = "\x8d\xac", [0x4de9] = "\x9f\xb9", [0x4dea] = "\x9f\xc7",
-  [0x4deb] = "\x93\x59", [0x4df5] = "\x90\xb4", [0x4df7] = "\x8a\x89",
-  [0x4df8] = "\x8d\xcf", [0x4df9] = "\x8f\xc2", [0x4dfa] = "\x9f\xbb",
-  [0x4dfb] = "\x8f\x61", [0x4e03] = "\x8c\x6b", [0x4e05] = "\x9f\xba",
-  [0x4e09] = "\x9f\xd0", [0x4e0a] = "\x8f\x8d", [0x4e0b] = "\x8c\xb8",
-  [0x4e0d] = "\x9f\xdf", [0x4e0f] = "\x9f\xd9", [0x4e10] = "\x8b\x94",
-  [0x4e11] = "\x93\x6e", [0x4e13] = "\x9f\xd4", [0x4e14] = "\x9f\xdd",
-  [0x4e15] = "\x88\xad", [0x4e16] = "\x89\x51", [0x4e19] = "\x89\xb7",
-  [0x4e1b] = "\x9f\xd6", [0x4e1c] = "\x91\xaa", [0x4e1d] = "\x9f\xcd",
-  [0x4e1e] = "\x9f\xcf", [0x4e1f] = "\x8d\x60", [0x4e28] = "\x9f\xe0",
-  [0x4e2a] = "\x9f\xdb", [0x4e2e] = "\x9f\xd3", [0x4e33] = "\x9f\xda",
-  [0x4e3a] = "\x96\xa9", [0x4e3d] = "\x9f\xd8", [0x4e3e] = "\x9f\xdc",
-  [0x4e46] = "\x8c\xce", [0x4e48] = "\x8f\xc3", [0x4e4b] = "\x92\x58",
-  [0x4e4f] = "\x9f\xd2", [0x4e57] = "\x97\x4e", [0x4e5b] = "\x9f\xd5",
-  [0x4e5e] = "\x9f\xce", [0x4e5f] = "\x93\x92", [0x4e62] = "\x9f\xd1",
-  [0x4e66] = "\x9f\xd7", [0x4e6e] = "\x98\x70", [0x4e6f] = "\x8e\xbc",
-  [0x4e70] = "\x96\x9e", [0x4e72] = "\x9f\xe1", [0x4e7c] = "\x94\xac",
-  [0x4e7f] = "\x9f\xed", [0x4e80] = "\x8c\xb9", [0x4e86] = "\x8f\x80",
-  [0x4e88] = "\x9f\xe3", [0x4e8c] = "\x97\xad", [0x4e8d] = "\x8d\x61",
-  [0x4e8f] = "\x9f\xf0", [0x4e92] = "\x88\xec", [0x4e95] = "\x9f\xee",
-  [0x4e9a] = "\x9f\xe2", [0x4e9f] = "\x9f\xe8", [0x4ea2] = "\x9f\xea",
-  [0x4ea6] = "\x97\x6e", [0x4ea7] = "\x9f\xe5", [0x4eaa] = "\x93\x4d",
-  [0x4ead] = "\x9f\xe7", [0x4eb2] = "\x9f\xef", [0x4eb4] = "\x9f\xe9",
-  [0x4eb5] = "\x96\xc5", [0x4eb9] = "\x9f\xe4", [0x4ebb] = "\x8e\xa0",
-  [0x4ebc] = "\x9f\xfc", [0x4ec1] = "\x8a\x8a", [0x4ec3] = "\x9f\xe6",
-  [0x4ec4] = "\x9f\xeb", [0x4ec5] = "\x9f\xec", [0x4ecd] = "\x91\xea",
-  [0x4ece] = "\x91\xd8", [0x4edc] = "\x9f\xf4", [0x4edf] = "\x9f\xfa",
-  [0x4ee2] = "\x9f\xf8", [0x4ee4] = "\x93\x48", [0x4ee7] = "\xe0\x42",
-  [0x4ee8] = "\x9f\xf5", [0x4eee] = "\x9f\xf6", [0x4eef] = "\x9f\xde",
-  [0x4ef1] = "\x8b\x99", [0x4ef2] = "\x95\x59", [0x4ef6] = "\x8e\xbd",
-  [0x4ef9] = "\x8d\x97", [0x4eff] = "\x98\x52", [0x4f01] = "\x9f\xf2",
-  [0x4f03] = "\xe0\x41", [0x4f04] = "\x89\x89", [0x4f05] = "\x91\x86",
-  [0x4f10] = "\x94\x99", [0x4f12] = "\x8a\xbf", [0x4f13] = "\x97\xf8",
-  [0x4f1b] = "\x96\x9f", [0x4f1c] = "\x92\xd0", [0x4f21] = "\x9f\xf9",
-  [0x4f22] = "\x9f\xfb", [0x4f28] = "\x91\x51", [0x4f2e] = "\xe0\x40",
-  [0x4f2f] = "\x9f\xf7", [0x4f31] = "\x9f\xf1", [0x4f35] = "\x8a\xc1",
-  [0x4f44] = "\x8c\x89", [0x4f48] = "\xe0\x4e", [0x4f4b] = "\xe0\x49",
-  [0x4f4c] = "\x90\xf6", [0x4f4f] = "\x8a\x83", [0x4f54] = "\x8f\x81",
-  [0x4f56] = "\xe0\x52", [0x4f5d] = "\xe0\x4b", [0x4f5e] = "\x92\xaa",
-  [0x4f5f] = "\xe0\x48", [0x4f60] = "\x92\xd7", [0x4f64] = "\xe0\x6b",
-  [0x4f68] = "\xe0\x45", [0x4f6a] = "\xe0\x44", [0x4f6c] = "\xe0\x4d",
-  [0x4f70] = "\xe0\x47", [0x4f71] = "\xe0\x46", [0x4f72] = "\xe0\x4c",
-  [0x4f74] = "\x90\x9f", [0x4f76] = "\xe0\x43", [0x4f7e] = "\xe0\x4f",
-  [0x4f81] = "\xe0\x50", [0x4f87] = "\x8a\xc0", [0x4f91] = "\xe0\x55",
-  [0x4f93] = "\xe0\x54", [0x4f94] = "\xe0\x56", [0x4f9a] = "\xe0\x59",
-  [0x4fa1] = "\x93\x62", [0x4fa3] = "\xe0\x53", [0x4fa9] = "\xe0\x57",
-  [0x4fb0] = "\x8c\x83", [0x4fb1] = "\x91\xf7", [0x4fb2] = "\xe0\x51",
-  [0x4fb3] = "\x94\x5a", [0x4fb6] = "\xe0\x58", [0x4fc4] = "\xe0\x5d",
-  [0x4fc5] = "\xe0\x5b", [0x4fc8] = "\xe0\x5e", [0x4fcb] = "\xe0\x61",
-  [0x4fcf] = "\xe0\x5a", [0x4fd0] = "\x8d\x8a", [0x4fd1] = "\x94\x47",
-  [0x4fd4] = "\x9f\xb7", [0x4fdb] = "\x97\x94", [0x4fdc] = "\xe0\x5c",
-  [0x4fde] = "\xe0\x60", [0x4fdf] = "\x91\xf3", [0x4fe1] = "\xe0\x5f",
-  [0x4fe3] = "\xe0\x4a", [0x4fe6] = "\xe8\x89", [0x4fea] = "\xe0\x64",
-  [0x4fee] = "\xe0\x68", [0x4ff1] = "\xe0\x66", [0x4ff9] = "\xe0\x62",
-  [0x4ffb] = "\xe0\x63", [0x4fff] = "\xe0\x67", [0x5001] = "\xe0\x65",
-  [0x5005] = "\x95\x6d", [0x5008] = "\xe0\x6d", [0x500a] = "\xe0\x6a",
-  [0x500b] = "\xe0\x69", [0x500d] = "\xe0\x6c", [0x500e] = "\x93\xd2",
-  [0x500f] = "\xe0\x6e", [0x5016] = "\x92\x95", [0x5017] = "\x91\xeb",
-  [0x501c] = "\x90\xa3", [0x5020] = "\xe0\x6f", [0x5022] = "\xe0\x71",
-  [0x502e] = "\xe0\x70", [0x503c] = "\x9f\xf3", [0x5041] = "\xe0\x72",
-  [0x5048] = "\x93\xe5", [0x5053] = "\xe0\x73", [0x505b] = "\x89\xce",
-  [0x505f] = "\x93\x94", [0x5060] = "\x8a\x44", [0x5068] = "\x8b\x84",
-  [0x506c] = "\x8e\xdc", [0x506d] = "\x8d\xd0", [0x5079] = "\x98\x46",
-  [0x507a] = "\x90\x86", [0x507e] = "\x89\x8a", [0x5082] = "\xe0\x75",
-  [0x5089] = "\xe0\x74", [0x509c] = "\xe0\x78", [0x509d] = "\x92\x59",
-  [0x509e] = "\xe0\x7b", [0x509f] = "\xe0\x76", [0x50a3] = "\xe0\x7a",
-  [0x50a8] = "\xe0\x79", [0x50a9] = "\x93\x5f", [0x50aa] = "\x88\xd7",
-  [0x50b8] = "\x97\xf3", [0x50bb] = "\xe0\x7d", [0x50bf] = "\x89\x47",
-  [0x50c9] = "\xe0\x80", [0x50cd] = "\xe0\x7e", [0x50cf] = "\xe0\x7c",
-  [0x50e1] = "\xe0\x77", [0x50e9] = "\x96\x42", [0x50ed] = "\xe0\x82",
-  [0x50f9] = "\xe0\x81", [0x5104] = "\x89\x8b", [0x5109] = "\xe0\x84",
-  [0x510a] = "\x95\xb0", [0x510c] = "\xe0\x83", [0x5111] = "\x96\xb3",
-  [0x5116] = "\x8f\xc5", [0x5126] = "\x91\x52", [0x512c] = "\x8f\xc4",
-  [0x5139] = "\x97\xf9", [0x513c] = "\xe0\x8a", [0x513e] = "\x90\xf7",
-  [0x5145] = "\xe0\x86", [0x5146] = "\xe0\x8b", [0x5149] = "\x89\x8c",
-  [0x5152] = "\xe0\x89", [0x5154] = "\x94\x81", [0x5155] = "\xe0\x85",
-  [0x5156] = "\xe0\x88", [0x5157] = "\x8f\xc6", [0x5159] = "\x94\xcf",
-  [0x515c] = "\xe0\x8c", [0x515e] = "\x8e\xcf", [0x516d] = "\x90\xf8",
-  [0x5174] = "\xe0\x8f", [0x5178] = "\xe0\x87", [0x517a] = "\x8c\x46",
-  [0x517f] = "\xe0\x8d", [0x5184] = "\x97\x6f", [0x5185] = "\xe0\x90",
-  [0x5189] = "\xea\xa4", [0x518f] = "\x8f\x6e", [0x5198] = "\xe0\x91",
-  [0x519c] = "\xe0\x92", [0x51a1] = "\x94\x4d", [0x51a9] = "\xe0\x94",
-  [0x51ae] = "\xe0\x95", [0x51b3] = "\x94\x52", [0x51b8] = "\x93\x95",
-  [0x51b9] = "\xe0\x97", [0x51be] = "\xe0\x99", [0x51c0] = "\x97\xd3",
-  [0x51c2] = "\xe0\x96", [0x51c4] = "\xe0\x98", [0x51c5] = "\x89\x8d",
-  [0x51c7] = "\xe0\x93", [0x51cf] = "\x9a\x7a", [0x51d0] = "\xe0\x9a",
-  [0x51d5] = "\x91\x87", [0x51d6] = "\x8e\x57", [0x51d7] = "\xe0\x9c",
-  [0x51dc] = "\xe0\x9b", [0x51dd] = "\x90\x43", [0x51de] = "\x99\xd7",
-  [0x51e5] = "\xe0\x9d", [0x51e9] = "\xe0\x9f", [0x51eb] = "\xe0\x8e",
-  [0x51ec] = "\xe0\x9e", [0x51ef] = "\xe0\xa0", [0x51f6] = "\x94\x9a",
-  [0x51fd] = "\xe0\xa1", [0x5200] = "\xe0\xa2", [0x520b] = "\xe0\xa3",
-  [0x5218] = "\xe0\xa4", [0x521a] = "\x92\xdc", [0x521c] = "\xe0\xa6",
-  [0x521d] = "\xe0\xa5", [0x5220] = "\xe0\xa7", [0x5222] = "\xe0\xa8",
-  [0x5225] = "\x8e\xdd", [0x5226] = "\x95\x83", [0x522a] = "\x96\xea",
-  [0x522b] = "\xe0\xa9", [0x522c] = "\xe0\xaa", [0x522d] = "\x91\x75",
-  [0x522e] = "\x8e\xa2", [0x522f] = "\xe0\xab", [0x5230] = "\xe0\xac",
-  [0x5236] = "\xe0\xad", [0x5237] = "\x95\xd0", [0x5238] = "\x94\xc5",
-  [0x523b] = "\xe0\xae", [0x523c] = "\x94\x76", [0x5242] = "\x92\xab",
-  [0x5248] = "\xe0\xaf", [0x5249] = "\x89\xe5", [0x524b] = "\x8b\x8d",
-  [0x524d] = "\x96\xc4", [0x524f] = "\x96\xb4", [0x5251] = "\x89\xb2",
-  [0x5252] = "\x98\x53", [0x5257] = "\x96\x71", [0x5259] = "\x95\xa8",
-  [0x5262] = "\x90\xb5", [0x5264] = "\xe0\xb0", [0x5269] = "\x93\xc1",
-  [0x526d] = "\x8c\xa1", [0x526e] = "\xe0\xb1", [0x5270] = "\x8d\xd2",
-  [0x5271] = "\xe0\xb3", [0x5272] = "\xe0\xb2", [0x5277] = "\xe0\xb4",
-  [0x5282] = "\xe0\xb5", [0x5286] = "\xe0\xb6", [0x5290] = "\x8b\x5d",
-  [0x5292] = "\xe0\xb7", [0x5297] = "\xe0\xb8", [0x529c] = "\x8c\xa2",
-  [0x529f] = "\x94\xc6", [0x52a2] = "\xe0\xba", [0x52a6] = "\x8f\xf3",
-  [0x52a9] = "\xe0\xb9", [0x52b2] = "\x8b\xb6", [0x52b3] = "\xe0\xbb",
-  [0x52b4] = "\xe0\xbd", [0x52b6] = "\xe0\xbc", [0x52be] = "\xe0\xbe",
-  [0x52c0] = "\x8c\xcf", [0x52c2] = "\xe0\xbf", [0x52c7] = "\x8b\xe7",
-  [0x52c9] = "\x91\x5f", [0x52cb] = "\x8d\x9d", [0x52d0] = "\xe0\xc1",
-  [0x52d1] = "\xe0\xc2", [0x52d2] = "\xe0\xc0", [0x52d9] = "\x8e\xeb",
-  [0x52dc] = "\x93\xc6", [0x52dd] = "\x8b\xb7", [0x52e7] = "\xe0\xc4",
-  [0x52e8] = "\x92\x4b", [0x52e9] = "\xe0\xc3", [0x52ec] = "\x98\x54",
-  [0x52ed] = "\x94\x82", [0x52fa] = "\xe0\xc7", [0x5306] = "\xe0\xc9",
-  [0x5307] = "\xe0\xc6", [0x530b] = "\x96\xd2", [0x530c] = "\xe0\xc8",
-  [0x530d] = "\xe0\xca", [0x530f] = "\x97\xc2", [0x5315] = "\xe0\xce",
-  [0x5319] = "\xe0\xcd", [0x531a] = "\x92\x96", [0x531b] = "\x94\x4c",
-  [0x531e] = "\x8c\xa3", [0x531f] = "\xe0\xcc", [0x5324] = "\xe0\xcb",
-  [0x5326] = "\x97\x50", [0x5327] = "\x97\x51", [0x532e] = "\xe0\xcf",
-  [0x532f] = "\x89\x8e", [0x5334] = "\x8d\x96", [0x5335] = "\x8e\x82",
-  [0x533e] = "\xe0\xd0", [0x533f] = "\xe0\xd1", [0x5347] = "\xe0\xd3",
-  [0x5353] = "\x8f\x62", [0x5358] = "\xe0\xd5", [0x535a] = "\xe0\xd4",
-  [0x5360] = "\xe0\xd6", [0x5362] = "\x8a\x6c", [0x5365] = "\xe0\xd8",
-  [0x5368] = "\xe0\xd7", [0x536a] = "\xe0\xda", [0x536b] = "\xe0\xd9",
-  [0x5374] = "\x8c\xba", [0x5377] = "\x97\xa6", [0x5379] = "\x8b\xca",
-  [0x537b] = "\x89\xa4", [0x5386] = "\x8b\xe8", [0x5399] = "\x8a\xdf",
-  [0x53a2] = "\x97\xe6", [0x53a3] = "\xe0\xdc", [0x53ab] = "\xe0\xde",
-  [0x53b0] = "\xe0\xdf", [0x53b2] = "\x89\xcf", [0x53b8] = "\xe0\xdb",
-  [0x53ba] = "\x8e\x58", [0x53bd] = "\x92\xbf", [0x53be] = "\xe0\xdd",
-  [0x53ce] = "\xe0\xe2", [0x53d0] = "\x8e\xec", [0x53d5] = "\xe0\xe0",
-  [0x53da] = "\x8c\x5d", [0x53dd] = "\x94\xc7", [0x53de] = "\xe0\xe1",
-  [0x53e1] = "\xe0\xfc", [0x53e8] = "\xe0\xe7", [0x53ee] = "\x8c\xbb",
-  [0x53f3] = "\x8b\x85", [0x53f5] = "\xe0\xe4", [0x53f6] = "\x97\x9d",
-  [0x53f9] = "\x97\xae", [0x5412] = "\x91\xf4", [0x5415] = "\xe0\xe6",
-  [0x5422] = "\xe0\xe8", [0x5423] = "\x97\xd4", [0x5424] = "\x8b\xd5",
-  [0x5425] = "\x94\xfa", [0x5426] = "\x94\x69", [0x542a] = "\xe0\xe9",
-  [0x542f] = "\xe0\xeb", [0x5431] = "\xe0\xee", [0x5445] = "\xe0\xea",
-  [0x5449] = "\xe0\xed", [0x544a] = "\x8c\xe8", [0x544b] = "\x89\x6c",
-  [0x544c] = "\xe0\xef", [0x544e] = "\x90\x90", [0x544f] = "\xe0\xec",
-  [0x5450] = "\x97\xda", [0x5453] = "\xe0\xf2", [0x5454] = "\xea\xa2",
-  [0x5459] = "\xe0\xf0", [0x545a] = "\xe0\xf3", [0x545f] = "\xe0\xe5",
-  [0x5460] = "\xe0\xf1", [0x5463] = "\x8d\xba", [0x5466] = "\xe0\xf4",
-  [0x546e] = "\xe0\xf5", [0x5473] = "\x97\x9e", [0x547b] = "\xe0\xf6",
-  [0x548e] = "\xe0\xf7", [0x5492] = "\xe0\xe3", [0x5497] = "\xe0\xf8",
-  [0x54a0] = "\x8a\xc2", [0x54ad] = "\x8e\xa3", [0x54ba] = "\xe0\xf9",
-  [0x54bf] = "\xe0\xfa", [0x54c4] = "\xe0\xfb", [0x54cc] = "\x89\x5a",
-  [0x54d0] = "\xe1\x40", [0x54d2] = "\x95\x5a", [0x54d3] = "\xe1\x41",
-  [0x54d6] = "\x8a\xa2", [0x54d7] = "\xe1\x42", [0x54d9] = "\xe1\x43",
-  [0x54de] = "\xe1\x44", [0x54e0] = "\xe1\x46", [0x54e1] = "\xe1\x47",
-  [0x54e2] = "\xe1\x45", [0x54e6] = "\x95\x72", [0x54e7] = "\xe1\x49",
-  [0x54e8] = "\xe1\x48", [0x54f3] = "\xe1\x4b", [0x54f4] = "\xe1\x4a",
-  [0x54f5] = "\xe1\x4c", [0x54fc] = "\xe1\x4d", [0x54fd] = "\xe1\x4f",
-  [0x54fe] = "\xe1\x4e", [0x5501] = "\x8d\x99", [0x5503] = "\xe1\x51",
-  [0x5505] = "\xe1\x50", [0x5508] = "\x8a\xc3", [0x550a] = "\x90\x72",
-  [0x550c] = "\x93\x5b", [0x550e] = "\xe1\x52", [0x550f] = "\x90\xb6",
-  [0x5513] = "\x8e\x59", [0x5515] = "\x89\x99", [0x5516] = "\xe1\x53",
-  [0x5518] = "\x97\x70", [0x551b] = "\x95\xe1", [0x551c] = "\xe1\x54",
-  [0x5520] = "\x93\x63", [0x5521] = "\x97\x52", [0x5522] = "\x8d\x62",
-  [0x5523] = "\x90\x5c", [0x5527] = "\x92\x6a", [0x5528] = "\x99\xb2",
-  [0x552a] = "\x92\xac", [0x552b] = "\x89\xe6", [0x552c] = "\xe1\x55",
-  [0x5534] = "\xe1\x56", [0x5536] = "\xe1\x5b", [0x5539] = "\xe1\x59",
-  [0x553a] = "\xe1\x58", [0x553b] = "\x9d\xc0", [0x553c] = "\x8a\x45",
-  [0x553d] = "\xe1\x57", [0x553f] = "\x88\xd8", [0x5541] = "\x94\xa8",
-  [0x5544] = "\x94\xc8", [0x5549] = "\x97\xaf", [0x554a] = "\xe1\x5c",
-  [0x554b] = "\xe1\x5a", [0x554c] = "\x92\x7b", [0x554d] = "\x90\xa4",
-  [0x5550] = "\x94\xa9", [0x5552] = "\x95\x4c", [0x5554] = "\xe1\x5e",
-  [0x5555] = "\x97\xaa", [0x5556] = "\x8c\x6c", [0x5557] = "\xe1\x5f",
-  [0x5559] = "\xe1\x5d", [0x555a] = "\x94\xd4", [0x555b] = "\xe1\x60",
-  [0x555d] = "\xe1\x61", [0x5560] = "\x88\xd9", [0x5563] = "\x8f\xf4",
-  [0x5564] = "\xe1\x66", [0x5566] = "\xe1\x63", [0x5567] = "\x93\xeb",
-  [0x5568] = "\xe1\x62", [0x556f] = "\x8b\x45", [0x5572] = "\xe1\x69",
-  [0x5576] = "\xe1\x64", [0x5577] = "\xe1\x65", [0x5579] = "\xe1\x68",
-  [0x557a] = "\xe1\x67", [0x557b] = "\x95\x44", [0x557e] = "\x91\x61",
-  [0x557f] = "\x91\x60", [0x5581] = "\x8b\x5e", [0x5584] = "\xe1\x6a",
-  [0x558a] = "\xe1\x6b", [0x558d] = "\xe1\x6c", [0x5593] = "\xe1\x6e",
-  [0x5595] = "\xe1\x6d", [0x559b] = "\x89\x75", [0x55a1] = "\xe1\x76",
-  [0x55a2] = "\x94\xe6", [0x55a3] = "\xe1\x70", [0x55a5] = "\xe1\x72",
-  [0x55a8] = "\xe1\x74", [0x55a9] = "\x90\x5d", [0x55ac] = "\xe1\x75",
-  [0x55ad] = "\xe1\x73", [0x55ae] = "\x8e\xbe", [0x55b2] = "\xe1\x6f",
-  [0x55b3] = "\xe1\x71", [0x55b5] = "\x95\x61", [0x55b7] = "\x8f\xc7",
-  [0x55ba] = "\xe1\x78", [0x55bd] = "\xe1\x77", [0x55c2] = "\xe1\x79",
-  [0x55c4] = "\x8e\xa4", [0x55c5] = "\x8d\xad", [0x55c8] = "\x93\x97",
-  [0x55c9] = "\xe1\x7a", [0x55cb] = "\x92\xc9", [0x55ce] = "\xe1\x7c",
-  [0x55d2] = "\x97\x9f", [0x55d3] = "\xe1\x7b", [0x55d9] = "\x91\x89",
-  [0x55e0] = "\xe1\x82", [0x55e2] = "\xe1\x84", [0x55e3] = "\xe1\x85",
-  [0x55e4] = "\x92\x73", [0x55ea] = "\xe1\x83", [0x55ec] = "\xe1\x80",
-  [0x55ee] = "\xe1\x7d", [0x55ef] = "\xe1\x7e", [0x55f1] = "\xe1\x81",
-  [0x55f9] = "\xe1\x88", [0x55fb] = "\xe1\x86", [0x55fd] = "\xe1\x87",
-  [0x560f] = "\xe1\x89", [0x5610] = "\xe1\x8b", [0x5611] = "\xe1\x8c",
-  [0x5612] = "\xe1\x8d", [0x5614] = "\xe1\x8e", [0x5617] = "\xe1\x8a",
-  [0x5620] = "\xe1\x90", [0x5624] = "\xe1\x8f", [0x562b] = "\xe1\x91",
-  [0x5632] = "\x97\xc3", [0x5636] = "\xe1\x94", [0x5637] = "\xe1\x92",
-  [0x5638] = "\xe1\x93", [0x563c] = "\x8a\xe0", [0x5642] = "\x96\xfc",
-  [0x5646] = "\x95\xc8", [0x5648] = "\xe1\x96", [0x564c] = "\xe1\x95",
-  [0x5651] = "\xe1\x97", [0x5652] = "\xe1\x98", [0x5657] = "\xe1\x9c",
-  [0x5658] = "\xe1\x99", [0x5659] = "\xe1\x9a", [0x565a] = "\xe1\x9b",
-  [0x565c] = "\xe1\x9d", [0x5660] = "\xe1\x9e", [0x5662] = "\xe1\x9f",
-  [0x5666] = "\xe1\xa0", [0x5668] = "\xe1\xa1", [0x566a] = "\x94\xad",
-  [0x566b] = "\x93\x6f", [0x566c] = "\xe1\xa2", [0x566d] = "\x94\x92",
-  [0x566e] = "\x95\x53", [0x5670] = "\xe1\xa3", [0x5673] = "\xe1\xa4",
-  [0x5674] = "\x93\x49", [0x5676] = "\x8a\x46", [0x5677] = "\x8d\x63",
-  [0x5678] = "\xe1\xa5", [0x567b] = "\xe1\xa6", [0x567e] = "\xe1\xa7",
-  [0x5680] = "\x8e\x48", [0x5683] = "\xe1\xa9", [0x5686] = "\xe1\xa8",
-  [0x5689] = "\xe1\xaa", [0x568a] = "\xe1\xab", [0x569e] = "\x94\xe7",
-  [0x56a0] = "\xe1\xac", [0x56a4] = "\xe1\xad", [0x56a7] = "\xea\x89",
-  [0x56a8] = "\xe1\xae", [0x56a9] = "\xe1\xaf", [0x56aa] = "\xe1\xb0",
-  [0x56af] = "\x8e\x4d", [0x56b2] = "\xe1\xb1", [0x56b3] = "\x94\x75",
-  [0x56b6] = "\x96\x7e", [0x56b8] = "\x89\x6d", [0x56ba] = "\x89\x76",
-  [0x56bd] = "\xe1\xb2", [0x56c2] = "\xe1\xb4", [0x56c6] = "\xe1\xb3",
-  [0x56c7] = "\x93\x90", [0x56cb] = "\x90\xb7", [0x56cc] = "\x9f\x58",
-  [0x56ce] = "\xe1\xb5", [0x56cf] = "\x96\xbf", [0x56d1] = "\xe1\xb6",
-  [0x56d3] = "\x8a\xc4", [0x56d4] = "\x94\xd5", [0x56d5] = "\xe1\xb7",
-  [0x56d7] = "\xe1\xb8", [0x56da] = "\xe1\xb9", [0x56de] = "\x96\xda",
-  [0x56e2] = "\x96\xd3", [0x56e4] = "\x92\xbc", [0x56e8] = "\x91\x8a",
-  [0x56eb] = "\xe1\xbb", [0x56ee] = "\x8f\x82", [0x56f1] = "\x8f\xc8",
-  [0x56f4] = "\xe1\xbe", [0x56f7] = "\xe1\xbd", [0x56f8] = "\xe1\xbc",
-  [0x56f9] = "\x94\xfb", [0x56fb] = "\x8a\xc5", [0x56fc] = "\x8c\xa7",
-  [0x570b] = "\xe1\xc4", [0x570e] = "\xe1\xc1", [0x570f] = "\x90\x5e",
-  [0x5710] = "\x96\xb0", [0x5714] = "\xe1\xc0", [0x5715] = "\xe1\xc2",
-  [0x5716] = "\xe1\xc3", [0x5719] = "\xe1\xbf", [0x5727] = "\xe1\xc5",
-  [0x5728] = "\xe1\xc6", [0x572a] = "\x92\xad", [0x572c] = "\x8a\xe1",
-  [0x5730] = "\x92\x85", [0x5737] = "\xe1\xc7", [0x574a] = "\xe1\xc8",
-  [0x574b] = "\xe1\xcb", [0x5751] = "\x90\x87", [0x5753] = "\x93\xc2",
-  [0x5755] = "\xe1\xcc", [0x5756] = "\x96\x72", [0x5758] = "\xe1\xc9",
-  [0x575b] = "\xe1\xca", [0x5769] = "\xe1\xcf", [0x576e] = "\xe1\xce",
-  [0x576f] = "\xe1\xcd", [0x577b] = "\xe1\xd1", [0x577e] = "\xe1\xd0",
-  [0x5781] = "\xe1\xd2", [0x578e] = "\xe1\xd4", [0x5790] = "\xe1\xd3",
-  [0x5795] = "\x95\xcb", [0x579c] = "\x8f\x75", [0x579d] = "\x97\xc4",
-  [0x57a0] = "\xe1\xd5", [0x57a3] = "\x93\xb5", [0x57a6] = "\xe1\xd6",
-  [0x57a9] = "\xe1\xd7", [0x57ab] = "\xe1\xdb", [0x57ac] = "\xe1\xd9",
-  [0x57ad] = "\xe1\xda", [0x57af] = "\xe1\xd8", [0x57b7] = "\xe1\xdc",
-  [0x57bd] = "\xe1\xdd", [0x57c7] = "\xe1\xde", [0x57ca] = "\xe1\xdf",
-  [0x57cb] = "\x96\xb5", [0x57cc] = "\xe1\xe0", [0x57d2] = "\x96\xee",
-  [0x57d3] = "\xe1\xe1", [0x57d5] = "\x92\x6d", [0x57d7] = "\x94\x8a",
-  [0x57d9] = "\x8b\xe9", [0x57dd] = "\x92\x5a", [0x57de] = "\xe1\xe2",
-  [0x57df] = "\x8b\xb8", [0x57e3] = "\x90\xce", [0x57ec] = "\xe1\xe3",
-  [0x57f2] = "\x8d\xbb", [0x57fc] = "\xe1\xe4", [0x5802] = "\xe1\xe5",
-  [0x5804] = "\x8c\xa4", [0x5805] = "\x8d\xd3", [0x5810] = "\xe1\xe7",
-  [0x5815] = "\x93\x75", [0x5816] = "\x8d\xd4", [0x5817] = "\x8b\x6d",
-  [0x5822] = "\x96\x43", [0x5824] = "\x94\x6a", [0x582a] = "\x93\x76",
-  [0x582f] = "\x8d\x7b", [0x5835] = "\xe1\xe9", [0x584d] = "\x8f\xc9",
-  [0x585b] = "\x97\xb0", [0x585c] = "\x8d\x64", [0x585f] = "\x8c\xa5",
-  [0x5862] = "\x94\xa1", [0x5864] = "\xe1\xeb", [0x586c] = "\xe1\xed",
-  [0x5871] = "\x8c\xe9", [0x5876] = "\xe1\xec", [0x5877] = "\x92\xf4",
-  [0x587c] = "\xe1\xef", [0x587d] = "\x8a\x56", [0x587e] = "\xe1\xea",
-  [0x5881] = "\x94\xe8", [0x5883] = "\x89\x4f", [0x5885] = "\x8d\xea",
-  [0x5887] = "\x98\x71", [0x588a] = "\xe1\xee", [0x5893] = "\xe1\xf0",
-  [0x5897] = "\x95\xc9", [0x5899] = "\x90\xd7", [0x589a] = "\xe1\xf2",
-  [0x589f] = "\xe1\xf3", [0x58a5] = "\xe1\xf1", [0x58aa] = "\x8a\x6d",
-  [0x58ac] = "\xe1\xf9", [0x58ae] = "\xe1\xf8", [0x58b1] = "\x8e\xa5",
-  [0x58b5] = "\xe1\xfa", [0x58b6] = "\xe1\xf5", [0x58ba] = "\xe1\xfb",
-  [0x58bb] = "\xe1\xf6", [0x58c0] = "\x94\xd6", [0x58c1] = "\xe1\xf4",
-  [0x58c4] = "\xe1\xf7", [0x58ca] = "\xe2\x41", [0x58d7] = "\xe2\x40",
-  [0x58d8] = "\x96\x81", [0x58dc] = "\xe1\xfc", [0x58df] = "\x88\xe9",
-  [0x58e4] = "\xe2\x43", [0x58ed] = "\xe2\x42", [0x58f1] = "\x8f\xca",
-  [0x58f7] = "\xe2\x44", [0x58fe] = "\x91\x62", [0x5901] = "\xe2\x46",
-  [0x5902] = "\xe2\x45", [0x5909] = "\xe2\x47", [0x5916] = "\xe1\xe6",
-  [0x591a] = "\xe1\xe8", [0x591b] = "\xe2\x49", [0x591c] = "\xe2\x48",
-  [0x592a] = "\x8e\xa6", [0x592c] = "\x97\xe7", [0x592e] = "\x8e\xd0",
-  [0x5930] = "\xe2\x4a", [0x5931] = "\x8c\x56", [0x5937] = "\x8b\x5f",
-  [0x5938] = "\x8b\x46", [0x5939] = "\x8e\x83", [0x5940] = "\x97\x53",
-  [0x5943] = "\xe2\x50", [0x5945] = "\xe2\x4f", [0x5946] = "\x91\x63",
-  [0x5947] = "\xe2\x4c", [0x594a] = "\xe2\x4e", [0x594d] = "\x8f\x6a",
-  [0x594e] = "\x90\x5f", [0x594f] = "\xe2\x4d", [0x5950] = "\xe2\x4b",
-  [0x5952] = "\x94\x49", [0x5955] = "\x8f\xcb", [0x5958] = "\x95\x5b",
-  [0x595d] = "\x8d\xd5", [0x5967] = "\x93\x98", [0x596a] = "\xe2\x51",
-  [0x596f] = "\xe2\x52", [0x5970] = "\xe2\x68", [0x5971] = "\x8b\xd6",
-  [0x5974] = "\x98\x5c", [0x5975] = "\x91\x54", [0x597a] = "\xe2\x53",
-  [0x597d] = "\x89\xd0", [0x597e] = "\x92\xf5", [0x597f] = "\x95\x9f",
-  [0x598d] = "\xe2\x54", [0x5996] = "\x8b\x9a", [0x5997] = "\xe2\x55",
-  [0x599a] = "\xe2\x57", [0x599e] = "\xe2\x58", [0x59a0] = "\x94\x48",
-  [0x59a3] = "\xe2\x59", [0x59a9] = "\xe2\x5a", [0x59aa] = "\xe2\x5b",
-  [0x59ad] = "\x8b\xd7", [0x59ae] = "\x89\xd1", [0x59af] = "\x93\xc3",
-  [0x59b0] = "\x8f\x47", [0x59b1] = "\x8e\x84", [0x59b9] = "\xe2\x5c",
-  [0x59bb] = "\x8f\x48", [0x59c1] = "\x89\xc8", [0x59c2] = "\x95\x62",
-  [0x59c5] = "\xe2\x5d", [0x59c8] = "\x94\xe9", [0x59cf] = "\x91\x64",
-  [0x59d1] = "\xe2\x60", [0x59d3] = "\xe2\x61", [0x59d4] = "\x94\x89",
-  [0x59d6] = "\x90\x60", [0x59d7] = "\xe2\x5e", [0x59d9] = "\x92\x81",
-  [0x59dc] = "\xe2\x5f", [0x59e0] = "\x8f\xcc", [0x59eb] = "\x88\xda",
-  [0x59f0] = "\x8b\x48", [0x59f8] = "\xe2\x62", [0x59fb] = "\x92\xf6",
-  [0x59fd] = "\xe2\x63", [0x59fe] = "\x90\xc5", [0x5a04] = "\x96\xab",
-  [0x5a07] = "\x95\x42", [0x5a08] = "\xe2\x64", [0x5a09] = "\xe2\x65",
-  [0x5a0a] = "\x92\x74", [0x5a0c] = "\x97\xc5", [0x5a0f] = "\xe2\x67",
-  [0x5a10] = "\xe2\x66", [0x5a1e] = "\x8e\xed", [0x5a21] = "\xe2\x69",
-  [0x5a22] = "\x88\xee", [0x5a27] = "\xe2\x6c", [0x5a2b] = "\xe2\x6a",
-  [0x5a2c] = "\x89\xd2", [0x5a2d] = "\x8c\x6d", [0x5a2e] = "\xe2\x6b",
-  [0x5a2f] = "\x8d\x65", [0x5a30] = "\x8d\x92", [0x5a32] = "\x95\xe4",
-  [0x5a33] = "\xe2\x6d", [0x5a36] = "\x96\x73", [0x5a39] = "\xe2\x6f",
-  [0x5a3d] = "\x90\xcf", [0x5a3e] = "\x89\x6e", [0x5a3f] = "\x89\xb8",
-  [0x5a40] = "\x88\xaa", [0x5a47] = "\xe2\x6e", [0x5a51] = "\xe2\x70",
-  [0x5a52] = "\xe2\x71", [0x5a53] = "\x8f\xf5", [0x5a59] = "\xe2\x72",
-  [0x5a5b] = "\x8a\x6e", [0x5a60] = "\xe2\x74", [0x5a64] = "\x8c\x8a",
-  [0x5a66] = "\x8b\x86", [0x5a69] = "\xe2\x75", [0x5a6a] = "\x8b\xf3",
-  [0x5a6d] = "\xe2\x76", [0x5a6f] = "\x90\xfa", [0x5a71] = "\x93\xcb",
-  [0x5a73] = "\x90\xde", [0x5a74] = "\x8d\xf3", [0x5a78] = "\xe2\x77",
-  [0x5a82] = "\x92\x82", [0x5a83] = "\x91\x8b", [0x5a85] = "\xe2\x79",
-  [0x5a86] = "\xe2\x7b", [0x5a87] = "\xe2\x78", [0x5a88] = "\xe2\x7a",
-  [0x5a8f] = "\x8c\x41", [0x5a99] = "\xe2\x7c", [0x5a9a] = "\x8c\x45",
-  [0x5a9e] = "\x8b\x87", [0x5a9f] = "\x97\x71", [0x5aa0] = "\xe2\x7e",
-  [0x5aa6] = "\xe2\x80", [0x5aaa] = "\x89\x4d", [0x5aaf] = "\xe2\x83",
-  [0x5ab3] = "\x8a\x96", [0x5ab4] = "\xe2\x82", [0x5ab5] = "\xe2\x81",
-  [0x5ab7] = "\xe2\x85", [0x5ab8] = "\xe2\x7d", [0x5aba] = "\xe2\x86",
-  [0x5abb] = "\x97\xa7", [0x5abd] = "\xe2\x87", [0x5abf] = "\xe2\x88",
-  [0x5ac2] = "\x9a\xf2", [0x5ac3] = "\xe2\x8a", [0x5ac5] = "\xe2\x89",
-  [0x5ac9] = "\xe2\x8b", [0x5aca] = "\xe2\x8c", [0x5acc] = "\x97\xb3",
-  [0x5acd] = "\xe2\x8d", [0x5acf] = "\xe8\xed", [0x5ad0] = "\x8f\xcd",
-  [0x5ad1] = "\xe2\x8e", [0x5ad2] = "\xe2\x8f", [0x5ad3] = "\x8f\x76",
-  [0x5ad5] = "\x93\xb6", [0x5ad6] = "\xe2\x90", [0x5ada] = "\x92\x47",
-  [0x5add] = "\xe2\x91", [0x5adf] = "\x92\x5b", [0x5ae0] = "\xe2\x92",
-  [0x5ae6] = "\x8b\xa3", [0x5ae8] = "\x99\x5e", [0x5ae9] = "\x92\x7c",
-  [0x5aea] = "\x8e\xb1", [0x5aef] = "\x8a\xc6", [0x5af2] = "\xe2\x93",
-  [0x5af4] = "\xe2\xa0", [0x5af6] = "\xe2\x96", [0x5af8] = "\x8b\x88",
-  [0x5afa] = "\xe2\x95", [0x5afb] = "\xe2\xa2", [0x5aff] = "\xe2\x94",
-  [0x5b01] = "\x8f\xce", [0x5b08] = "\xe2\x98", [0x5b09] = "\xe2\x99",
-  [0x5b0b] = "\x93\x4a", [0x5b0e] = "\xe2\x9a", [0x5b10] = "\x8a\x7d",
-  [0x5b15] = "\x90\x79", [0x5b16] = "\x95\x84", [0x5b18] = "\xe2\x9c",
-  [0x5b1c] = "\x91\xe6", [0x5b23] = "\xe2\x97", [0x5b25] = "\xe2\x9b",
-  [0x5b26] = "\xe2\x9d", [0x5b29] = "\x8d\xf9", [0x5b35] = "\xe2\xa4",
-  [0x5b36] = "\x95\x4d", [0x5b38] = "\x94\xa4", [0x5b39] = "\x93\x99",
-  [0x5b3b] = "\x8b\xd8", [0x5b3c] = "\xe2\xa3", [0x5b3d] = "\xe2\xa1",
-  [0x5b3f] = "\x94\xb3", [0x5b40] = "\xe2\x9e", [0x5b41] = "\x92\x7d",
-  [0x5b42] = "\x93\x9b", [0x5b44] = "\x93\x9a", [0x5b46] = "\x8d\xf4",
-  [0x5b4d] = "\xe2\xb6", [0x5b55] = "\xe2\xa6", [0x5b57] = "\xe2\xa8",
-  [0x5b5c] = "\xe2\xab", [0x5b5e] = "\xe2\xac", [0x5b60] = "\xe2\xa9",
-  [0x5b61] = "\xe2\xaa", [0x5b64] = "\xe2\xa7", [0x5b65] = "\xe2\xa5",
-  [0x5b6a] = "\xe2\x9f", [0x5b76] = "\x95\xcd", [0x5b77] = "\x89\xd3",
-  [0x5b7b] = "\xe2\xb3", [0x5b7d] = "\xe2\xb0", [0x5b7f] = "\xe2\xb5",
-  [0x5b82] = "\xe2\xb4", [0x5b84] = "\x94\x93", [0x5b85] = "\x96\xa5",
-  [0x5b87] = "\x8e\x5a", [0x5b88] = "\xe2\xae", [0x5b89] = "\xe2\xb7",
-  [0x5b8a] = "\xe2\xb2", [0x5b8c] = "\xe2\xb1", [0x5b8d] = "\xe2\xad",
-  [0x5b8f] = "\xe2\xaf", [0x5b91] = "\x8a\xc7", [0x5b9a] = "\x92\x5c",
-  [0x5b9d] = "\x90\xfb", [0x5ba1] = "\x94\xa0", [0x5ba4] = "\xe2\xbc",
-  [0x5ba8] = "\x94\xa2", [0x5bb0] = "\x90\xdf", [0x5bb1] = "\xe2\xb9",
-  [0x5bb4] = "\x94\xcd", [0x5bb6] = "\xe2\xbd", [0x5bb7] = "\x95\xd1",
-  [0x5bb9] = "\x92\x7a", [0x5bbb] = "\xe2\xb8", [0x5bbc] = "\xe2\xba",
-  [0x5bbf] = "\xe2\xbb", [0x5bcd] = "\xe2\xbe", [0x5bd0] = "\x8e\xc2",
-  [0x5bd4] = "\x93\xc4", [0x5bd5] = "\xe2\xc3", [0x5bd6] = "\xe2\xc2",
-  [0x5bd9] = "\xe2\xbf", [0x5bdd] = "\x98\x55", [0x5be3] = "\xe2\xc8",
-  [0x5be6] = "\xe2\xcc", [0x5be7] = "\xe2\xc9", [0x5bf0] = "\xe2\xc5",
-  [0x5bf7] = "\xe2\xc6", [0x5bfd] = "\xe2\xcb", [0x5c01] = "\xe2\xc0",
-  [0x5c02] = "\x99\xd3", [0x5c03] = "\xe2\xc7", [0x5c04] = "\xe2\xc1",
-  [0x5c07] = "\xe2\xca", [0x5c0f] = "\xe2\xd0", [0x5c11] = "\x8a\xc8",
-  [0x5c13] = "\xe2\xcd", [0x5c17] = "\xe2\xce", [0x5c1a] = "\xe2\xcf",
-  [0x5c1b] = "\xe2\xd2", [0x5c27] = "\xe2\xd1", [0x5c28] = "\x94\xf4",
-  [0x5c2d] = "\xe2\xd3", [0x5c2e] = "\x97\xfa", [0x5c2f] = "\x95\xeb",
-  [0x5c30] = "\xe2\xd8", [0x5c33] = "\xe2\xd5", [0x5c3c] = "\xe2\xd4",
-  [0x5c3d] = "\x90\xd0", [0x5c3f] = "\xe2\xd7", [0x5c40] = "\xe2\xd9",
-  [0x5c44] = "\xe2\xd6", [0x5c46] = "\xe2\xdd", [0x5c48] = "\xe2\xda",
-  [0x5c4f] = "\xe2\xdb", [0x5c50] = "\xe2\xc4", [0x5c54] = "\xe2\xdc",
-  [0x5c55] = "\xe2\xde", [0x5c5c] = "\xe2\xdf", [0x5c63] = "\x95\xc4",
-  [0x5c65] = "\xe2\xe0", [0x5c6e] = "\x96\xe0", [0x5c71] = "\x8b\xcc",
-  [0x5c72] = "\x8c\x48", [0x5c73] = "\xe2\xe1", [0x5c79] = "\x95\xb2",
-  [0x5c7b] = "\x90\x88", [0x5c7d] = "\x96\xae", [0x5c80] = "\xe2\xe2",
-  [0x5c82] = "\x97\xb1", [0x5c85] = "\x94\x94", [0x5c87] = "\x91\x65",
-  [0x5c88] = "\x94\x53", [0x5c8b] = "\x8f\x6c", [0x5c8f] = "\x88\xbe",
-  [0x5c91] = "\xe2\xe7", [0x5c92] = "\xe2\xe5", [0x5c94] = "\xe2\xe3",
-  [0x5c95] = "\x8a\x9f", [0x5c97] = "\x8f\xcf", [0x5c98] = "\xe2\xe8",
-  [0x5c9b] = "\xe2\xe6", [0x5c9d] = "\xe2\xe4", [0x5c9e] = "\xe2\xec",
-  [0x5ca1] = "\xe2\xeb", [0x5ca2] = "\xe2\xea", [0x5ca3] = "\xe2\xe9",
-  [0x5ca9] = "\xe2\xed", [0x5cad] = "\xe2\xee", [0x5cae] = "\x90\xb8",
-  [0x5cb0] = "\xe2\xef", [0x5cb2] = "\xe2\xf1", [0x5cb5] = "\xe2\xf0",
-  [0x5cba] = "\x8c\xd0", [0x5cbe] = "\x91\x57", [0x5cc2] = "\xe2\xf3",
-  [0x5cc6] = "\x93\x9c", [0x5cc8] = "\xe2\xf2", [0x5ccc] = "\xe2\xf4",
-  [0x5cce] = "\x95\xb3", [0x5ccf] = "\x91\x8c", [0x5cd0] = "\x8d\x66",
-  [0x5cd2] = "\xe2\xf5", [0x5cd7] = "\x97\xc6", [0x5cdf] = "\xe2\xf7",
-  [0x5ce2] = "\xe2\xf8", [0x5ce4] = "\xe2\xf9", [0x5ce6] = "\xe2\xfa",
-  [0x5ce8] = "\x8e\x85", [0x5cea] = "\xe2\xfb", [0x5ceb] = "\x8c\x6e",
-  [0x5cee] = "\x8b\x8a", [0x5cf0] = "\x8b\x49", [0x5cf2] = "\xe3\x40",
-  [0x5cf4] = "\x96\xf1", [0x5cf5] = "\x8d\x67", [0x5cf6] = "\xe2\xfc",
-  [0x5cfa] = "\xe3\x43", [0x5cfb] = "\x96\xe4", [0x5cfd] = "\x94\x5b",
-  [0x5d00] = "\x95\x52", [0x5d04] = "\x8f\x83", [0x5d05] = "\xe3\x42",
-  [0x5d07] = "\x8e\xd1", [0x5d08] = "\x8d\x68", [0x5d09] = "\x8e\x86",
-  [0x5d0a] = "\x8b\x89", [0x5d0b] = "\x95\xb4", [0x5d0c] = "\xe3\x41",
-  [0x5d10] = "\x91\x66", [0x5d11] = "\x96\x61", [0x5d12] = "\x8d\xf5",
-  [0x5d1b] = "\x8e\x87", [0x5d1c] = "\x92\xdb", [0x5d1e] = "\xe3\x46",
-  [0x5d1f] = "\x97\xdd", [0x5d20] = "\x8d\xd7", [0x5d22] = "\xe3\x47",
-  [0x5d23] = "\x90\x61", [0x5d25] = "\xe3\x49", [0x5d29] = "\x8f\xd0",
-  [0x5d2a] = "\x8d\xae", [0x5d2f] = "\xe3\x48", [0x5d32] = "\x8f\x49",
-  [0x5d33] = "\x8c\xbc", [0x5d34] = "\x91\x67", [0x5d35] = "\xe3\x44",
-  [0x5d36] = "\xe3\x4a", [0x5d3b] = "\xe3\x45", [0x5d3c] = "\x8c\x6f",
-  [0x5d3e] = "\xe3\x4d", [0x5d3f] = "\xe3\x51", [0x5d40] = "\x8c\x8b",
-  [0x5d46] = "\xe3\x4c", [0x5d4b] = "\xe3\x55", [0x5d4e] = "\x8d\x69",
-  [0x5d51] = "\x97\x8d", [0x5d52] = "\x88\xba", [0x5d53] = "\xe3\x52",
-  [0x5d56] = "\x8b\x8b", [0x5d58] = "\xe3\x4f", [0x5d5e] = "\xe3\x50",
-  [0x5d61] = "\x93\x9d", [0x5d62] = "\xe3\x4e", [0x5d63] = "\xe3\x4b",
-  [0x5d65] = "\x8a\x47", [0x5d66] = "\x90\xe2", [0x5d69] = "\x8c\xa6",
-  [0x5d6d] = "\xe3\x57", [0x5d79] = "\xe3\x54", [0x5d7f] = "\xe3\x56",
-  [0x5d83] = "\xe3\x53", [0x5d89] = "\x8c\x70", [0x5d8a] = "\x91\xb1",
-  [0x5d8b] = "\xe3\x58", [0x5d8c] = "\x91\x8e", [0x5d8f] = "\xe3\x65",
-  [0x5d92] = "\xe3\x61", [0x5d93] = "\xe3\x5b", [0x5d9b] = "\xe3\x5f",
-  [0x5d9c] = "\x8e\xf8", [0x5d9d] = "\x88\xdb", [0x5d9e] = "\xe3\x5a",
-  [0x5d9f] = "\xe3\x62", [0x5da0] = "\xe3\x66", [0x5da1] = "\x8d\x6a",
-  [0x5da2] = "\x96\xd4", [0x5da4] = "\x92\xd4", [0x5da5] = "\xe3\x5c",
-  [0x5da8] = "\xe3\x64", [0x5daa] = "\xe3\x59", [0x5dab] = "\x92\x5d",
-  [0x5dad] = "\xe3\x5e", [0x5dae] = "\x88\xbb", [0x5daf] = "\x96\xc8",
-  [0x5db7] = "\xe3\x5d", [0x5dba] = "\x8b\xd9", [0x5dbb] = "\x94\xea",
-  [0x5dbf] = "\x91\x8d", [0x5dc1] = "\x97\xce", [0x5dc2] = "\x8f\x8f",
-  [0x5dc5] = "\xe3\x8e", [0x5dc8] = "\xe3\x67", [0x5dca] = "\x90\xfc",
-  [0x5dcc] = "\xe3\x63", [0x5dcd] = "\xe3\x68", [0x5dce] = "\xe3\x6a",
-  [0x5dd0] = "\x92\xf7", [0x5dd1] = "\xe3\x6d", [0x5dd4] = "\xe3\x69",
-  [0x5dd8] = "\x95\xd2", [0x5dd9] = "\x8a\xc9", [0x5ddc] = "\x96\xc9",
-  [0x5ddf] = "\x88\xdc", [0x5de2] = "\xe3\x6c", [0x5de4] = "\x97\xfb",
-  [0x5deb] = "\xe3\x6b", [0x5df1] = "\x89\x8f", [0x5df4] = "\x93\xea",
-  [0x5df5] = "\xe3\x6e", [0x5df9] = "\xe3\x75", [0x5dfa] = "\xe3\x6f",
-  [0x5dfb] = "\xe3\x76", [0x5e02] = "\xe3\x72", [0x5e0b] = "\x94\x9b",
-  [0x5e0e] = "\x8e\xc8", [0x5e0f] = "\xe3\x74", [0x5e11] = "\xe3\x71",
-  [0x5e12] = "\xe3\x77", [0x5e13] = "\xe3\x70", [0x5e16] = "\x8f\x63",
-  [0x5e1b] = "\x96\x44", [0x5e1e] = "\x8f\x6b", [0x5e21] = "\xe3\x73",
-  [0x5e22] = "\xe3\x80", [0x5e25] = "\xe3\x7b", [0x5e27] = "\xe3\x7e",
-  [0x5e29] = "\xe3\x7c", [0x5e2a] = "\xe3\x81", [0x5e2b] = "\xe3\x7a",
-  [0x5e2d] = "\xe3\x60", [0x5e2e] = "\x90\xd1", [0x5e31] = "\x94\xc9",
-  [0x5e33] = "\xe3\x7d", [0x5e36] = "\xe3\x78", [0x5e3a] = "\x91\x40",
-  [0x5e3b] = "\x8c\x71", [0x5e3d] = "\x8f\x4a", [0x5e44] = "\x90\x44",
-  [0x5e45] = "\x91\x55", [0x5e46] = "\xe3\x84", [0x5e49] = "\xe3\x86",
-  [0x5e4a] = "\xe3\x87", [0x5e4d] = "\xe3\x83", [0x5e4e] = "\xe3\x85",
-  [0x5e56] = "\xe3\x79", [0x5e57] = "\xe3\x82", [0x5e59] = "\xe3\x8a",
-  [0x5e5a] = "\xe3\x89", [0x5e5d] = "\x96\x9a", [0x5e60] = "\x8c\x4a",
-  [0x5e69] = "\xe3\x88", [0x5e6b] = "\xe3\x8c", [0x5e6c] = "\xe3\x8b",
-  [0x5e6d] = "\xe3\x8f", [0x5e6f] = "\xe3\x91", [0x5e72] = "\x8e\x5b",
-  [0x5e73] = "\xe3\x8d", [0x5e78] = "\xe3\x92", [0x5e79] = "\xe3\x93",
-  [0x5e7c] = "\xe3\x94", [0x5e7e] = "\xe3\x9a", [0x5e7f] = "\x93\x5a",
-  [0x5e80] = "\xe3\x96", [0x5e82] = "\xe3\x95", [0x5e83] = "\xe3\x97",
-  [0x5e84] = "\xe3\x98", [0x5e86] = "\xe3\x99", [0x5e8b] = "\xe3\x9b",
-  [0x5e8c] = "\xe3\x9c", [0x5f26] = "\x8a\xca", [0x5f28] = "\xe3\x9d",
-  [0x5f2a] = "\xe3\x9e", [0x5f35] = "\xe3\x9f", [0x5f3c] = "\xe3\xa0",
-  [0x5f3d] = "\xe3\xa1", [0x5f3e] = "\xe3\xa2", [0x5f40] = "\xe3\xa3",
-  [0x5f41] = "\xe3\xa4", [0x5f44] = "\xe3\xa6", [0x5f45] = "\xe3\xa5",
-  [0x5f48] = "\xe3\xa7", [0x5f4f] = "\xe3\xa8", [0x5f50] = "\xe3\xa9",
-  [0x5f57] = "\xe3\xac", [0x5f58] = "\xe3\xaa", [0x5f59] = "\xe3\xab",
-  [0x5f5a] = "\x8d\xdf", [0x5f5b] = "\x8c\x72", [0x5f5e] = "\x92\x75",
-  [0x5f60] = "\x94\xb1", [0x5f62] = "\x8f\x90", [0x5f65] = "\x94\x6c",
-  [0x5f67] = "\x94\xeb", [0x5f68] = "\xe3\xad", [0x5f69] = "\x9c\xeb",
-  [0x5f72] = "\xe3\xae", [0x5f73] = "\xe3\xb0", [0x5f75] = "\x97\x85",
-  [0x5f76] = "\xe3\xaf", [0x5f77] = "\xe3\xb2", [0x5f78] = "\xe3\xb1",
-  [0x5f7a] = "\x97\x72", [0x5f7c] = "\xe3\xb3", [0x5f7e] = "\x94\xfc",
-  [0x5f84] = "\xe3\xb4", [0x5f8a] = "\xe3\xb7", [0x5f8d] = "\xe3\xb6",
-  [0x5f8e] = "\xe3\xb5", [0x5f93] = "\xe3\xb8", [0x5f94] = "\x8c\x51",
-  [0x5f98] = "\x91\x41", [0x5f99] = "\x8b\x60", [0x5f9e] = "\xe3\xbc",
-  [0x5f9f] = "\xe3\xb9", [0x5fa2] = "\xe3\xba", [0x5fa6] = "\xe3\xbd",
-  [0x5fa8] = "\xe3\xbe", [0x5fa9] = "\xe3\xbb", [0x5fad] = "\x89\x48",
-  [0x5fb1] = "\x89\xa5", [0x5fb5] = "\xe3\xc0", [0x5fb6] = "\xe3\xc1",
-  [0x5fba] = "\xe3\xc2", [0x5fbc] = "\x97\x82", [0x5fc2] = "\x8f\x4b",
-  [0x5fc4] = "\xe3\xc4", [0x5fc5] = "\xe3\xc3", [0x5fd0] = "\x90\x89",
-  [0x5fd1] = "\xe3\xc5", [0x5fd6] = "\xe3\xc6", [0x5fd9] = "\xe3\xc7",
-  [0x5fdb] = "\x8a\xe3", [0x5fe0] = "\x8a\xcb", [0x5fe3] = "\xe3\xc8",
-  [0x5fe9] = "\xe3\xc9", [0x5feb] = "\x96\x7c", [0x5fec] = "\x97\x83",
-  [0x5ff0] = "\x97\x73", [0x5ff1] = "\x98\x56", [0x5ff3] = "\x8d\x6c",
-  [0x5ff4] = "\xe3\xcc", [0x5ff5] = "\x8e\xd2", [0x5ff6] = "\xe3\xcb",
-  [0x5ffb] = "\xe3\xcd", [0x5ffc] = "\x8e\xa7", [0x6000] = "\x91\xcf",
-  [0x6002] = "\xe3\xce", [0x6005] = "\x8d\x6b", [0x6007] = "\x96\xd5",
-  [0x6008] = "\xe3\xcf", [0x6009] = "\xe3\xd0", [0x600c] = "\xe3\xd1",
-  [0x6011] = "\xe3\xd2", [0x6018] = "\xe3\xd3", [0x6023] = "\x8e\xa8",
-  [0x6026] = "\x96\xeb", [0x602b] = "\xe3\xd5", [0x602d] = "\x92\x5e",
-  [0x602f] = "\xe3\xd4", [0x6036] = "\xe3\xd7", [0x603a] = "\xe3\xd6",
-  [0x6042] = "\xe3\xd8", [0x6046] = "\x90\xb9", [0x6048] = "\xe3\xd9",
-  [0x604a] = "\xe3\xda", [0x604e] = "\x95\xb7", [0x604f] = "\xe3\xdb",
-  [0x6051] = "\x91\x8f", [0x6052] = "\xe3\xdc", [0x6058] = "\xe3\xdd",
-  [0x605f] = "\x97\xfc", [0x6060] = "\xe3\xe0", [0x6062] = "\xe3\xdf",
-  [0x6063] = "\xe3\xde", [0x6064] = "\x92\xae", [0x6066] = "\xe3\xe1",
-  [0x6067] = "\x90\x45", [0x6069] = "\xe3\xe2", [0x606d] = "\xe3\xe3",
-  [0x606e] = "\x98\x57", [0x606f] = "\xe3\xe4", [0x6074] = "\xe3\xe5",
-  [0x6075] = "\xe3\xe7", [0x6076] = "\xe3\xe6", [0x6077] = "\x94\xa3",
-  [0x6079] = "\x93\xf7", [0x607b] = "\x98\x5d", [0x607c] = "\x94\xa7",
-  [0x6083] = "\xe3\xe9", [0x6086] = "\x8f\xd1", [0x6088] = "\x95\x49",
-  [0x608a] = "\xe3\xea", [0x608b] = "\xe3\xe8", [0x608d] = "\x8a\xcc",
-  [0x6091] = "\x8c\xd2", [0x6092] = "\x8e\x88", [0x6095] = "\x94\xec",
-  [0x6099] = "\x8c\xa8", [0x609a] = "\x96\x62", [0x609c] = "\xe3\xed",
-  [0x609d] = "\xe3\xeb", [0x609f] = "\x8d\x6d", [0x60a1] = "\x8d\x6e",
-  [0x60a2] = "\x88\xe7", [0x60a4] = "\x8d\xe6", [0x60aa] = "\x94\x78",
-  [0x60b3] = "\x88\xdd", [0x60b4] = "\xe3\xf2", [0x60b6] = "\x92\x5f",
-  [0x60bc] = "\x94\x77", [0x60be] = "\x91\xd9", [0x60c6] = "\xe3\xf4",
-  [0x60c9] = "\xe3\xf0", [0x60ca] = "\xe3\xf3", [0x60cb] = "\xe3\xee",
-  [0x60cd] = "\xe3\xf1", [0x60ce] = "\x96\x45", [0x60d1] = "\x8c\xd3",
-  [0x60d4] = "\x88\xfb", [0x60d5] = "\xe3\xef", [0x60df] = "\xe3\xf6",
-  [0x60e1] = "\xe3\xf7", [0x60e4] = "\x93\xb7", [0x60e8] = "\x8b\xb9",
-  [0x60ec] = "\xe4\x45", [0x60ed] = "\x94\x5c", [0x60f2] = "\x8e\x89",
-  [0x60f5] = "\x8b\xba", [0x60f6] = "\x90\xc6", [0x60f7] = "\x98\x65",
-  [0x60f8] = "\x96\xac", [0x60f9] = "\xe3\xf5", [0x60fa] = "\x90\xd2",
-  [0x610a] = "\x8b\x72", [0x610b] = "\xe3\xf8", [0x6113] = "\xe3\xfa",
-  [0x6119] = "\xe3\xf9", [0x611f] = "\xe3\xfb", [0x6121] = "\x92\x45",
-  [0x6123] = "\x94\x5d", [0x6129] = "\x92\xaf", [0x612e] = "\xe4\x42",
-  [0x6136] = "\xe4\x41", [0x613b] = "\xe3\xfc", [0x613e] = "\x90\x74",
-  [0x6140] = "\x95\x85", [0x6141] = "\xe4\x44", [0x6143] = "\xe4\x43",
-  [0x6144] = "\x8d\x6f", [0x6145] = "\x98\x72", [0x614f] = "\xe4\x54",
-  [0x6155] = "\xe4\x48", [0x6156] = "\xe4\x49", [0x615b] = "\x8e\xee",
-  [0x615e] = "\xe4\x47", [0x6160] = "\x8d\x98", [0x6161] = "\xe4\x46",
-  [0x6164] = "\xe4\x4a", [0x6168] = "\x92\xb0", [0x6169] = "\x95\xa0",
-  [0x616a] = "\x91\x42", [0x616f] = "\x91\xda", [0x6170] = "\xe4\x4e",
-  [0x6172] = "\xe4\x4f", [0x6173] = "\xe4\x4b", [0x6178] = "\xe4\x4c",
-  [0x617a] = "\xe4\x4d", [0x617f] = "\x8d\x70", [0x6183] = "\xe4\x55",
-  [0x6185] = "\xe4\x51", [0x618a] = "\x95\x86", [0x618c] = "\x96\x8c",
-  [0x618d] = "\x95\x47", [0x6190] = "\xe4\x50", [0x6193] = "\xe4\x53",
-  [0x6194] = "\xe4\x52", [0x6198] = "\x96\x63", [0x6199] = "\xe4\x56",
-  [0x61a0] = "\xe4\x57", [0x61a3] = "\x91\x56", [0x61a5] = "\xe4\x58",
-  [0x61a8] = "\xe4\x5a", [0x61aa] = "\xe4\x5e", [0x61ad] = "\xe4\x5b",
-  [0x61ae] = "\xe4\x59", [0x61af] = "\x94\x5e", [0x61b0] = "\xe4\x5c",
-  [0x61b2] = "\xe4\x5d", [0x61b6] = "\x89\xb0", [0x61b8] = "\xe4\x64",
-  [0x61b9] = "\xe4\x5f", [0x61bd] = "\xe4\x60", [0x61c1] = "\xe4\x61",
-  [0x61c3] = "\x91\x9f", [0x61c8] = "\xe4\x63", [0x61c9] = "\xe4\x62",
-  [0x61ca] = "\xe4\x65", [0x61cf] = "\xe4\x66", [0x61d0] = "\xe4\x67",
-  [0x61d3] = "\x90\x62", [0x61d5] = "\x89\xe7", [0x61d7] = "\xe4\x68",
-  [0x61d8] = "\x97\xd5", [0x61da] = "\x8e\xa9", [0x61dd] = "\x8f\x4c",
-  [0x61e3] = "\x8e\x8a", [0x61e4] = "\x92\x76", [0x61ea] = "\xe4\x69",
-  [0x61eb] = "\xe4\x6a", [0x61ec] = "\x89\x50", [0x61ee] = "\xe4\x6b",
-  [0x61f1] = "\xe4\x6c", [0x61f2] = "\xe4\x6d", [0x61f5] = "\xe4\x6e",
-  [0x61f7] = "\xe4\x6f", [0x61f8] = "\x8b\xbb", [0x61f9] = "\x9d\xa8",
-  [0x61fa] = "\xe4\x70", [0x61fc] = "\x90\xe3", [0x61fd] = "\xe4\x71",
-  [0x61fe] = "\x8e\xc9", [0x6200] = "\xe4\x72", [0x6202] = "\x98\xae",
-  [0x6206] = "\xe4\x73", [0x6207] = "\x95\xdc", [0x6208] = "\x8a\xda",
-  [0x620b] = "\x91\x43", [0x620c] = "\x8f\x77", [0x620e] = "\x95\x91",
-  [0x620f] = "\x8f\x4d", [0x6219] = "\xe4\x74", [0x621a] = "\x8d\x71",
-  [0x621b] = "\xe4\x75", [0x621c] = "\x94\xca", [0x621e] = "\xe4\x84",
-  [0x6223] = "\xe4\x77", [0x6225] = "\x91\xc7", [0x6226] = "\x94\x95",
-  [0x6227] = "\x8c\xbd", [0x6228] = "\xe4\x76", [0x6229] = "\x91\x44",
-  [0x6230] = "\xe4\x78", [0x6237] = "\x92\xf8", [0x6248] = "\xe4\x7a",
-  [0x6249] = "\xe4\x79", [0x624a] = "\xe4\x7c", [0x624d] = "\xe4\x7b",
-  [0x624f] = "\xe4\x7d", [0x6252] = "\xe4\x80", [0x6254] = "\xe4\x7e",
-  [0x6256] = "\x8a\xcd", [0x6258] = "\xe4\x81", [0x625a] = "\xe4\x82",
-  [0x625b] = "\xe4\x83", [0x625e] = "\x8d\xaf", [0x625f] = "\x97\xc7",
-  [0x6261] = "\xe4\x85", [0x6262] = "\x90\x46", [0x6266] = "\x89\x90",
-  [0x6267] = "\xe4\x86", [0x6268] = "\xe4\x87", [0x626e] = "\xe4\x88",
-  [0x627b] = "\x88\xf0", [0x627d] = "\xe4\x89", [0x6282] = "\xe4\x8a",
-  [0x6289] = "\x95\x87", [0x628d] = "\x8e\xc5", [0x628f] = "\xe4\x8c",
-  [0x6295] = "\x8a\x48", [0x6296] = "\x88\xb0", [0x629b] = "\xe4\x8b",
-  [0x629c] = "\xe4\x8e", [0x629d] = "\x94\x6d", [0x629f] = "\x90\x63",
-  [0x62a1] = "\x89\xd4", [0x62a3] = "\x96\x46", [0x62a8] = "\x8c\x7c",
-  [0x62a9] = "\x8b\xda", [0x62ab] = "\xe4\x8d", [0x62ad] = "\x89\xe8",
-  [0x62b5] = "\x8a\xa1", [0x62c1] = "\x89\x91", [0x62c2] = "\xe4\x92",
-  [0x62c3] = "\x97\xe8", [0x62c4] = "\x91\xdb", [0x62c7] = "\x95\x63",
-  [0x62c9] = "\xe4\x9e", [0x62cb] = "\x89\xd5", [0x62cc] = "\xe4\x9c",
-  [0x62ce] = "\xe4\x9a", [0x62cf] = "\xe4\x91", [0x62d1] = "\xe4\x8f",
-  [0x62d3] = "\xe4\x90", [0x62d5] = "\x8e\xe1", [0x62d6] = "\x8b\xea",
-  [0x62d7] = "\x92\x97", [0x62db] = "\x93\xcf", [0x62e1] = "\x89\x70",
-  [0x62e3] = "\xe4\x94", [0x62e4] = "\xe4\x93", [0x62e9] = "\xe4\x99",
-  [0x62ea] = "\xe4\x95", [0x62eb] = "\xe4\x98", [0x62f2] = "\x96\xce",
-  [0x62f3] = "\xe4\x97", [0x62f4] = "\x89\xd6", [0x62f5] = "\x8a\x9d",
-  [0x62f6] = "\xe4\x9b", [0x62f9] = "\xe4\x9d", [0x62fe] = "\x8c\x73",
-  [0x6306] = "\xe4\xa1", [0x6307] = "\xe4\xaa", [0x6308] = "\xe4\xab",
-  [0x630c] = "\x88\xa9", [0x6313] = "\xe4\xb2", [0x6318] = "\x88\xef",
-  [0x631b] = "\xe4\xa9", [0x631f] = "\xe4\xa8", [0x6321] = "\xe4\xa3",
-  [0x6322] = "\xe4\xa2", [0x6324] = "\xe4\xa0", [0x6325] = "\xe4\x9f",
-  [0x6326] = "\x92\x83", [0x6328] = "\x91\xf9", [0x6329] = "\xe4\xa5",
-  [0x6330] = "\xe4\xa4", [0x6335] = "\xe4\xa7", [0x6339] = "\x91\x90",
-  [0x633a] = "\x8c\x74", [0x633f] = "\x89\x60", [0x6340] = "\xe4\xa6",
-  [0x6342] = "\x8d\x72", [0x6348] = "\x91\x91", [0x6363] = "\xe4\xb8",
-  [0x6365] = "\xe4\xb9", [0x6367] = "\x89\xd7", [0x636b] = "\x89\xac",
-  [0x636c] = "\xe4\xb6", [0x6375] = "\xe4\xac", [0x6377] = "\xe4\xb4",
-  [0x6379] = "\xe4\xbb", [0x637a] = "\xe4\xb5", [0x637e] = "\xe4\xb3",
-  [0x6383] = "\xe4\x96", [0x6386] = "\xe4\xb1", [0x638a] = "\xe4\xad",
-  [0x638e] = "\x8a\xce", [0x638f] = "\xe4\xaf", [0x6390] = "\xe4\xba",
-  [0x6392] = "\xe4\xb0", [0x6398] = "\xe4\xbc", [0x639a] = "\xe4\xae",
-  [0x639b] = "\x94\x9c", [0x63a1] = "\x97\x89", [0x63a5] = "\xe4\xb7",
-  [0x63ad] = "\xe4\xcd", [0x63b1] = "\xe4\xc5", [0x63b5] = "\x90\x9b",
-  [0x63ba] = "\x8b\x65", [0x63bc] = "\x8b\xdb", [0x63be] = "\xe4\xc0",
-  [0x63c3] = "\x89\xd9", [0x63c6] = "\x8f\xd2", [0x63c8] = "\xe4\xc3",
-  [0x63cc] = "\x8d\xd8", [0x63cf] = "\x93\x70", [0x63d0] = "\xe4\xc8",
-  [0x63d9] = "\x95\xec", [0x63db] = "\xe4\xbf", [0x63df] = "\x89\xd8",
-  [0x63e0] = "\x8c\xd4", [0x63e1] = "\x95\x48", [0x63e2] = "\xe4\xc9",
-  [0x63e4] = "\xe4\xbd", [0x63e7] = "\xe4\xc6", [0x63eb] = "\xe4\xd0",
-  [0x63ed] = "\xe4\xc1", [0x63f3] = "\xe4\xc2", [0x63f4] = "\x93\xb8",
-  [0x63f7] = "\xe4\xc7", [0x63fb] = "\xe4\xc4", [0x63fc] = "\x96\x47",
-  [0x63fd] = "\xe4\xca", [0x63fe] = "\x88\xde", [0x6403] = "\xe4\xbe",
-  [0x6410] = "\xe4\xcc", [0x6412] = "\xe4\xcb", [0x6419] = "\x94\x8b",
-  [0x641a] = "\xe4\xd2", [0x641c] = "\xe4\xdd", [0x6421] = "\x8a\x9e",
-  [0x6425] = "\xe4\xe0", [0x6428] = "\xe4\xce", [0x642c] = "\xe4\xd3",
-  [0x642d] = "\x97\x8e", [0x6436] = "\xe4\xdc", [0x6439] = "\x97\x74",
-  [0x643e] = "\x97\xa8", [0x6447] = "\x92\x98", [0x644b] = "\x8a\x8b",
-  [0x6451] = "\x95\x92", [0x6452] = "\xe4\xe2", [0x6453] = "\x93\x9f",
-  [0x6456] = "\x88\xaf", [0x6459] = "\xe4\xdb", [0x645b] = "\xe4\xd7",
-  [0x645c] = "\x91\x92", [0x645d] = "\xe4\xd1", [0x645e] = "\xe4\xd9",
-  [0x645f] = "\xe4\xde", [0x6461] = "\x94\x4b", [0x6465] = "\x88\xa8",
-  [0x6467] = "\xe4\xd6", [0x6469] = "\xe4\xdf", [0x646a] = "\x95\x98",
-  [0x6472] = "\xe4\xda", [0x6474] = "\xe4\xd5", [0x647b] = "\x8f\xd3",
-  [0x6480] = "\x8f\x4e", [0x6484] = "\x8e\xaa", [0x6489] = "\x96\xd6",
-  [0x648c] = "\x95\x66", [0x648f] = "\xe4\xe5", [0x6491] = "\xe4\xee",
-  [0x649d] = "\xe4\xd8", [0x64a2] = "\x8a\x97", [0x64a8] = "\x8f\xf6",
-  [0x64a9] = "\xe4\xe3", [0x64ab] = "\xe4\xe8", [0x64ac] = "\x91\x93",
-  [0x64af] = "\xe4\xe4", [0x64b1] = "\xe4\xeb", [0x64b4] = "\x92\x7e",
-  [0x64b6] = "\xe4\xec", [0x64b9] = "\x97\x75", [0x64ba] = "\xe4\xe1",
-  [0x64bb] = "\x8a\x57", [0x64bd] = "\xe4\xe7", [0x64c0] = "\xe4\xea",
-  [0x64c1] = "\x96\xaa", [0x64c6] = "\xe4\xed", [0x64c9] = "\xe4\xe6",
-  [0x64ca] = "\xe4\xe9", [0x64dc] = "\x96\x48", [0x64de] = "\x98\x40",
-  [0x64e4] = "\xe4\xf1", [0x64ec] = "\xe4\xf8", [0x64ef] = "\xe4\xf0",
-  [0x64f0] = "\x8e\xc1", [0x64f6] = "\xe4\xcf", [0x6501] = "\x95\xcc",
-  [0x6503] = "\x96\xa0", [0x6504] = "\xe4\xf7", [0x6505] = "\xe4\xf6",
-  [0x6507] = "\xe4\xf2", [0x6508] = "\xe4\xf3", [0x650a] = "\x89\x55",
-  [0x650f] = "\xe4\xf5", [0x6511] = "\xe4\xef", [0x6516] = "\x92\xd3",
-  [0x651c] = "\xe4\xf4", [0x651d] = "\x88\xfc", [0x6525] = "\x91\xa0",
-  [0x652d] = "\x95\xc1", [0x6530] = "\xe4\xf9", [0x6531] = "\xe5\x40",
-  [0x6533] = "\x94\xd7", [0x6538] = "\xe4\xfc", [0x6539] = "\x8f\xd4",
-  [0x653a] = "\x8e\xc7", [0x653b] = "\xe5\x42", [0x653e] = "\x8b\xbc",
-  [0x6545] = "\xe5\x43", [0x6547] = "\x95\x99", [0x6548] = "\xe4\xfb",
-  [0x654a] = "\xe4\xd4", [0x6553] = "\xe4\xfa", [0x6558] = "\x98\x6e",
-  [0x6559] = "\x93\xa0", [0x655a] = "\x95\x93", [0x655d] = "\xe5\x4a",
-  [0x6567] = "\xe5\x50", [0x656e] = "\xe5\x51", [0x6570] = "\xe5\x44",
-  [0x6574] = "\x94\x96", [0x6577] = "\xe5\x4e", [0x6578] = "\xe5\x46",
-  [0x657a] = "\xe5\x48", [0x6580] = "\xe5\x52", [0x6581] = "\xe5\x47",
-  [0x6584] = "\xe5\x4b", [0x6587] = "\x89\x92", [0x6589] = "\x93\xe3",
-  [0x658b] = "\xe5\x4c", [0x658c] = "\xe5\x4f", [0x6594] = "\xe5\x45",
-  [0x6596] = "\x91\x45", [0x6598] = "\xe5\x49", [0x6599] = "\x8e\x46",
-  [0x659a] = "\x90\x64", [0x659b] = "\x8c\x4f", [0x659c] = "\x96\xf2",
-  [0x659e] = "\x96\xf7", [0x659f] = "\x8f\x92", [0x65a9] = "\xe5\x56",
-  [0x65aa] = "\xe5\x54", [0x65b1] = "\x98\x6d", [0x65b9] = "\xe5\x53",
-  [0x65bd] = "\x97\x95", [0x65bf] = "\xe5\x55", [0x65c0] = "\xe5\x57",
-  [0x65c5] = "\xe5\x58", [0x65cc] = "\xe5\x5b", [0x65cd] = "\xe5\x59",
-  [0x65d4] = "\x93\xa1", [0x65d5] = "\xe5\x5a", [0x65d9] = "\x94\xcb",
-  [0x65da] = "\xe5\x4d", [0x65e7] = "\x8f\x93", [0x65e9] = "\xe5\x5c",
-  [0x65ea] = "\xe5\x61", [0x65eb] = "\x91\x94", [0x65ee] = "\xe5\x60",
-  [0x65f2] = "\xe5\x41", [0x65f6] = "\xe5\x62", [0x65f7] = "\x91\x68",
-  [0x65fa] = "\xe5\x5d", [0x65fb] = "\xe5\x5f", [0x6603] = "\xe5\x5e",
-  [0x6606] = "\x9f\x50", [0x6607] = "\x9f\x41", [0x660a] = "\xe5\x64",
-  [0x6612] = "\xe5\x63", [0x661d] = "\x97\x96", [0x661f] = "\xe1\xba",
-  [0x6620] = "\xe5\x65", [0x662f] = "\xe5\x66", [0x663d] = "\xe5\x67",
-  [0x663e] = "\x8c\xd5", [0x6640] = "\x8b\x73", [0x6644] = "\xe5\x69",
-  [0x6645] = "\x99\x7c", [0x664a] = "\x8b\x95", [0x664c] = "\x97\xb8",
-  [0x664e] = "\x8b\xf1", [0x664f] = "\xe5\x6a", [0x6657] = "\xe5\x6b",
-  [0x665b] = "\x92\x8e", [0x6661] = "\xe5\x6c", [0x6669] = "\x93\xf8",
-  [0x666b] = "\x88\xb8", [0x667a] = "\x89\xe1", [0x667b] = "\xe5\x71",
-  [0x667c] = "\xe5\x72", [0x6683] = "\xe5\x6d", [0x6685] = "\x8e\x5c",
-  [0x6693] = "\xe5\x6e", [0x6694] = "\x94\x61", [0x6699] = "\xe5\x6f",
-  [0x669a] = "\xe5\x70", [0x669b] = "\xe5\x7a", [0x669f] = "\xe5\x74",
-  [0x66a0] = "\xe5\x77", [0x66a6] = "\xe5\x73", [0x66b4] = "\xe5\x75",
-  [0x66b6] = "\xe5\x76", [0x66b7] = "\x8e\xd6", [0x66b9] = "\xe5\x78",
-  [0x66bb] = "\x92\x60", [0x66bd] = "\x8c\x75", [0x66be] = "\x8a\x61",
-  [0x66c4] = "\xe5\x7b", [0x66c9] = "\x8a\x5e", [0x66cb] = "\xe5\x81",
-  [0x66ce] = "\xe5\x7c", [0x66cf] = "\xe5\x80", [0x66d4] = "\x94\xb8",
-  [0x66d9] = "\xe5\x7d", [0x66dc] = "\xe5\x7e", [0x66dd] = "\x95\x67",
-  [0x66de] = "\x94\xd8", [0x66df] = "\xe5\x82", [0x66e8] = "\x91\xfb",
-  [0x66e9] = "\xe5\x8c", [0x66eb] = "\xe5\x88", [0x66ee] = "\x89\xe9",
-  [0x66f0] = "\xe5\x86", [0x66f2] = "\x96\x49", [0x66f3] = "\xe5\x87",
-  [0x66f6] = "\xe5\x84", [0x66f8] = "\xe5\x85", [0x66f9] = "\xe5\x8a",
-  [0x66fa] = "\xe5\x8d", [0x66fd] = "\xe5\x8b", [0x6701] = "\xe5\x89",
-  [0x6702] = "\xe5\x83", [0x6708] = "\x92\x77", [0x670a] = "\xe5\x94",
-  [0x670c] = "\x96\xa8", [0x6715] = "\xe5\x92", [0x6719] = "\xe5\x93",
-  [0x6724] = "\xe5\x8e", [0x6727] = "\xe5\x90", [0x672b] = "\xe5\x91",
-  [0x672f] = "\xe5\x8f", [0x6739] = "\x90\xe4", [0x673b] = "\x98\x58",
-  [0x673c] = "\xe5\x98", [0x673e] = "\xe5\x99", [0x6743] = "\xe5\x9f",
-  [0x6745] = "\x90\x49", [0x6747] = "\xe5\x9b", [0x6749] = "\xe5\x9e",
-  [0x674f] = "\xe5\x96", [0x6750] = "\xe5\x95", [0x6753] = "\xe5\xa0",
-  [0x6756] = "\x89\xda", [0x6758] = "\xe5\x9c", [0x675a] = "\xe5\xa1",
-  [0x675e] = "\xe5\x9d", [0x6764] = "\xe5\x9a", [0x6766] = "\x92\xb1",
-  [0x6768] = "\xe5\x97", [0x676f] = "\x94\x88", [0x6772] = "\xe5\xa5",
-  [0x677d] = "\x97\x5a", [0x678f] = "\xe5\xa4", [0x6792] = "\xe5\xa3",
-  [0x679b] = "\xe5\xac", [0x679f] = "\xe5\xa6", [0x67a3] = "\xe5\xae",
-  [0x67aa] = "\x97\x86", [0x67ab] = "\xe5\xb1", [0x67ad] = "\xe5\xa8",
-  [0x67b0] = "\xe5\xa9", [0x67b4] = "\xe5\xad", [0x67b6] = "\xe5\xb0",
-  [0x67b7] = "\xe5\xaf", [0x67bb] = "\xe5\xa7", [0x67c0] = "\xe5\xaa",
-  [0x67c2] = "\xe5\xbb", [0x67d0] = "\xe5\xb4", [0x67df] = "\xe5\xb2",
-  [0x67e2] = "\xe5\xb3", [0x67e6] = "\xe5\xb8", [0x67e7] = "\xe5\xb9",
-  [0x67e9] = "\x8a\x49", [0x67eb] = "\x8b\x61", [0x67ee] = "\xe5\xb7",
-  [0x67f5] = "\xe5\xa2", [0x67fd] = "\xe5\xb6", [0x67fe] = "\xe5\xba",
-  [0x67ff] = "\xe5\xb5", [0x6801] = "\xe5\xbc", [0x6805] = "\xe5\xbe",
-  [0x6806] = "\xe5\xbd", [0x6811] = "\xe5\xc0", [0x6812] = "\xe5\xbf",
-  [0x6813] = "\xe5\x79", [0x6817] = "\xe5\xc4", [0x6821] = "\xe5\xc1",
-  [0x6826] = "\xe5\xc2", [0x6829] = "\xe5\xc3", [0x682b] = "\xe5\xc5",
-  [0x6830] = "\x8c\x8c", [0x6832] = "\xe5\xc7", [0x6834] = "\xe5\xc6",
-  [0x6836] = "\x8f\x4f", [0x683c] = "\x8d\x73", [0x683d] = "\x9f\xa5",
-  [0x6842] = "\xe5\xc8", [0x6843] = "\x8f\x70", [0x6847] = "\x8a\x58",
-  [0x6849] = "\xe5\xc9", [0x684b] = "\x89\x71", [0x684d] = "\x8f\xd5",
-  [0x684e] = "\xe5\xca", [0x6851] = "\x8d\x74", [0x6852] = "\xe5\xcb",
-  [0x6853] = "\x88\xdf", [0x6858] = "\x95\x5c", [0x685b] = "\xe5\xcc",
-  [0x6860] = "\x90\x8a", [0x6862] = "\xe5\xd3", [0x6865] = "\xe5\xd0",
-  [0x6867] = "\x92\x8f", [0x686d] = "\xe5\xd1", [0x686e] = "\xe5\xce",
-  [0x686f] = "\x8b\xdc", [0x6871] = "\xe5\xcd", [0x6872] = "\xe5\xd4",
-  [0x6878] = "\x8c\x55", [0x687b] = "\x91\xdc", [0x687d] = "\xe5\xda",
-  [0x6882] = "\xe5\xd6", [0x6886] = "\x91\xb3", [0x6887] = "\xe5\xd5",
-  [0x6889] = "\xe5\xd8", [0x688e] = "\xe5\xcf", [0x6892] = "\xe5\xd9",
-  [0x6894] = "\xe5\xdb", [0x689b] = "\x94\xed", [0x689e] = "\xe5\xd7",
-  [0x68a0] = "\xe5\xdc", [0x68a1] = "\xe5\xde", [0x68a4] = "\x8c\xd1",
-  [0x68a5] = "\xe5\xd2", [0x68a7] = "\x88\xbf", [0x68af] = "\xe5\xdd",
-  [0x68b1] = "\x8d\xd9", [0x68b2] = "\x97\xf4", [0x68b3] = "\xe5\xdf",
-  [0x68b4] = "\xe5\xe0", [0x68b5] = "\x91\x95", [0x68bf] = "\x97\xa0",
-  [0x68c4] = "\xe5\xe1", [0x68c5] = "\x97\x54", [0x68c8] = "\xe5\xe2",
-  [0x68c9] = "\xe5\xe3", [0x68cc] = "\x95\xe2", [0x68cd] = "\xe5\xe4",
-  [0x68cf] = "\x8d\xbe", [0x68d1] = "\x97\xa1", [0x68d8] = "\xe5\xe9",
-  [0x68e2] = "\xe5\xea", [0x68e3] = "\x8f\xd6", [0x68e4] = "\xe5\xe8",
-  [0x68e8] = "\x97\x87", [0x68e9] = "\xe5\xe5", [0x68ec] = "\xe5\xe7",
-  [0x68ed] = "\x90\xbb", [0x68ee] = "\x90\x9e", [0x68f2] = "\xe5\xe6",
-  [0x68f4] = "\xe5\xeb", [0x68f7] = "\x95\xa1", [0x68fa] = "\xe5\xed",
-  [0x68fc] = "\xe5\xec", [0x6900] = "\x8a\x8c", [0x6902] = "\x96\x4a",
-  [0x6903] = "\xe5\xee", [0x690d] = "\xe5\xfa", [0x690e] = "\xe5\xf0",
-  [0x6915] = "\xe5\xf1", [0x691a] = "\xe5\xf2", [0x691b] = "\xe5\xf3",
-  [0x6926] = "\xe5\xf7", [0x6928] = "\xe5\xf8", [0x692b] = "\xe5\xf6",
-  [0x6931] = "\xe5\xf4", [0x6933] = "\xe5\xef", [0x6934] = "\xe5\xf5",
-  [0x693c] = "\xe5\xf9", [0x693d] = "\xe8\xb5", [0x6946] = "\x89\xa6",
-  [0x694e] = "\xe5\xfc", [0x694f] = "\x8b\xdd", [0x6950] = "\xe5\xfb",
-  [0x6954] = "\xe6\x41", [0x6956] = "\xe6\x40", [0x695a] = "\xe6\x43",
-  [0x695d] = "\xe6\x42", [0x695f] = "\xe6\x44", [0x6962] = "\x8f\x50",
-  [0x6964] = "\xe6\x45", [0x6967] = "\xe6\x46", [0x696e] = "\xe6\x47",
-  [0x696f] = "\x90\xbc", [0x6971] = "\x97\x76", [0x6973] = "\xe6\x48",
-  [0x6976] = "\x95\xa2", [0x6977] = "\x94\x65", [0x6978] = "\xe6\x49",
-  [0x697a] = "\xe6\x4a", [0x697b] = "\x8c\xa9", [0x697f] = "\x8b\x4b",
-  [0x6983] = "\xe6\x4b", [0x6986] = "\x8e\x8b", [0x6987] = "\x94\x60",
-  [0x6988] = "\xe6\x4c", [0x698a] = "\x8a\x6f", [0x6991] = "\xe6\x4d",
-  [0x6996] = "\xe6\x4f", [0x6997] = "\x97\x97", [0x6999] = "\xe6\x4e",
-  [0x699a] = "\x90\x65", [0x699c] = "\xe6\x50", [0x699f] = "\xe6\x51",
-  [0x69a2] = "\xe6\x52", [0x69a3] = "\x8a\xcf", [0x69aa] = "\xe6\x53",
-  [0x69ad] = "\xe6\x54", [0x69af] = "\xe6\x55", [0x69b0] = "\xe6\x56",
-  [0x69c2] = "\x8a\x70", [0x69ca] = "\xe6\x57", [0x69cc] = "\xe6\x58",
-  [0x69cd] = "\xe6\x59", [0x69d3] = "\x89\xf0", [0x69d6] = "\x90\x47",
-  [0x69d7] = "\xe6\x5a", [0x69e4] = "\xe6\x5b", [0x69e8] = "\xe6\x5c",
-  [0x69f0] = "\x8c\xbe", [0x69f2] = "\x92\xf9", [0x69f3] = "\xe6\x5d",
-  [0x69f8] = "\x8c\x76", [0x69fa] = "\x90\x75", [0x69fc] = "\xe6\x60",
-  [0x69fe] = "\x93\xa2", [0x6a00] = "\xe6\x5f", [0x6a03] = "\x8c\x50",
-  [0x6a06] = "\xe6\x5e", [0x6a07] = "\x91\xf5", [0x6a08] = "\x8b\x4c",
-  [0x6a0b] = "\xe6\x61", [0x6a0d] = "\xe6\x62", [0x6a0f] = "\x8f\xd7",
-  [0x6a13] = "\x8c\x8d", [0x6a15] = "\xe6\x63", [0x6a1a] = "\x96\x4b",
-  [0x6a1d] = "\x90\xdd", [0x6a21] = "\x8b\x96", [0x6a23] = "\x96\xf3",
-  [0x6a24] = "\x91\x69", [0x6a26] = "\xe6\x64", [0x6a2a] = "\x90\x66",
-  [0x6a2b] = "\x92\x90", [0x6a2c] = "\x8f\xd8", [0x6a31] = "\xe6\x65",
-  [0x6a36] = "\xe6\x68", [0x6a38] = "\xe6\x69", [0x6a40] = "\x8d\xbc",
-  [0x6a41] = "\x91\xc0", [0x6a42] = "\xe6\x67", [0x6a44] = "\x8f\xd9",
-  [0x6a45] = "\x95\x5d", [0x6a4b] = "\xe6\x66", [0x6a4e] = "\x8e\x8c",
-  [0x6a50] = "\x89\x72", [0x6a52] = "\xe6\x6d", [0x6a53] = "\x8c\x77",
-  [0x6a56] = "\x8e\x8e", [0x6a59] = "\x8e\x8d", [0x6a5b] = "\x98\x6c",
-  [0x6a5c] = "\xe6\x6c", [0x6a5d] = "\xe6\x6b", [0x6a5e] = "\x91\x46",
-  [0x6a60] = "\x8b\x6c", [0x6a61] = "\x98\x62", [0x6a62] = "\x8a\x59",
-  [0x6a63] = "\x8f\xda", [0x6a6c] = "\xe6\x6a", [0x6a72] = "\xe6\x6f",
-  [0x6a74] = "\xe6\x70", [0x6a75] = "\xe6\x6e", [0x6a77] = "\x8c\xd6",
-  [0x6a79] = "\x97\x5f", [0x6a7c] = "\x8e\x8f", [0x6a7d] = "\x94\x46",
-  [0x6a81] = "\xe6\x73", [0x6a83] = "\x90\xbe", [0x6a85] = "\x92\x61",
-  [0x6a88] = "\x97\x55", [0x6a8a] = "\xe6\x76", [0x6a8e] = "\x8c\xea",
-  [0x6a90] = "\x90\xbd", [0x6a91] = "\xe6\x72", [0x6a93] = "\xe6\x77",
-  [0x6a94] = "\x8c\xeb", [0x6a95] = "\xe6\x74", [0x6a96] = "\xe6\x75",
-  [0x6a98] = "\xe6\x71", [0x6a9c] = "\x90\xe0", [0x6a9d] = "\x93\xc7",
-  [0x6aa0] = "\x92\x4e", [0x6aa2] = "\x89\xdb", [0x6aa9] = "\x94\xee",
-  [0x6aac] = "\x8b\x62", [0x6aaf] = "\x92\xb2", [0x6ab2] = "\xe6\x7a",
-  [0x6ab4] = "\xe6\x78", [0x6ab7] = "\x92\x6b", [0x6abb] = "\x90\xbf",
-  [0x6abc] = "\x8a\xd0", [0x6abd] = "\xe6\x79", [0x6abf] = "\x90\x7a",
-  [0x6ac2] = "\x97\xc8", [0x6ac6] = "\x98\x5f", [0x6aca] = "\xe6\x7b",
-  [0x6acb] = "\xe6\x87", [0x6acc] = "\x92\xb3", [0x6ace] = "\xe6\x86",
-  [0x6ad0] = "\xe6\x83", [0x6ad1] = "\xe6\x8b", [0x6ad2] = "\xe6\x84",
-  [0x6ad4] = "\xe6\x80", [0x6ad6] = "\x92\xfa", [0x6ad7] = "\xe6\x7e",
-  [0x6adb] = "\xe6\x7c", [0x6add] = "\x97\x40", [0x6ade] = "\x8e\x90",
-  [0x6ae1] = "\xe6\x81", [0x6ae3] = "\xe6\x7d", [0x6ae7] = "\xe6\x85",
-  [0x6ae8] = "\x8f\x94", [0x6aea] = "\x8c\xbf", [0x6aee] = "\x91\xf8",
-  [0x6af0] = "\x96\x64", [0x6af1] = "\x89\x79", [0x6af2] = "\x88\xe0",
-  [0x6af4] = "\x93\xa3", [0x6af7] = "\xe6\x89", [0x6afc] = "\xe6\x88",
-  [0x6afe] = "\x93\xe4", [0x6b00] = "\xe6\x8d", [0x6b04] = "\xe6\x82",
-  [0x6b06] = "\xe6\x8c", [0x6b07] = "\xe6\x8e", [0x6b09] = "\x8c\xaa",
-  [0x6b0a] = "\xe6\x8a", [0x6b0b] = "\x8d\x75", [0x6b0d] = "\x8e\xd3",
-  [0x6b10] = "\xe6\x8f", [0x6b11] = "\x97\x77", [0x6b16] = "\xe6\x92",
-  [0x6b18] = "\xe6\x95", [0x6b1b] = "\xe6\x93", [0x6b1c] = "\x95\x54",
-  [0x6b23] = "\xe6\x90", [0x6b29] = "\x8b\xde", [0x6b2e] = "\xe6\x94",
-  [0x6b31] = "\xe6\x96", [0x6b39] = "\xe6\x9a", [0x6b3c] = "\xe6\x97",
-  [0x6b3e] = "\xe6\x99", [0x6b3f] = "\xe6\x98", [0x6b46] = "\xe6\x9b",
-  [0x6b48] = "\x8e\xaf", [0x6b4a] = "\xe6\x9d", [0x6b4b] = "\xe6\x9c",
-  [0x6b4c] = "\x95\x88", [0x6b4f] = "\xe6\x9f", [0x6b56] = "\x8c\x78",
-  [0x6b5b] = "\xe6\x9e", [0x6b5c] = "\xe6\xa0", [0x6b5f] = "\xe6\xa1",
-  [0x6b60] = "\x8b\x63", [0x6b61] = "\xe3\xbf", [0x6b62] = "\x8f\xf7",
-  [0x6b64] = "\xe6\xa2", [0x6b67] = "\x8c\xec", [0x6b6d] = "\xe6\xa3",
-  [0x6b70] = "\xe6\xa4", [0x6b73] = "\x8e\x5d", [0x6b7a] = "\x9d\xcc",
-  [0x6b7c] = "\xe6\xa5", [0x6b7e] = "\xe6\xa6", [0x6b80] = "\x8f\x51",
-  [0x6b82] = "\xe6\xa7", [0x6b83] = "\xe6\xa8", [0x6b86] = "\xe6\xa9",
-  [0x6b89] = "\xe6\xaa", [0x6b8a] = "\xe6\xab", [0x6c27] = "\x92\x4a",
-  [0x6c2a] = "\xe6\xac", [0x6c2f] = "\xe6\xae", [0x6c31] = "\xe6\xad",
-  [0x6c36] = "\x93\xa4", [0x6c38] = "\xe6\xaf", [0x6c3a] = "\x96\x4c",
-  [0x6c3c] = "\xe6\xb0", [0x6c3e] = "\xe6\xb1", [0x6c40] = "\xe6\xb2",
-  [0x6c45] = "\xe6\xb3", [0x6c4a] = "\x93\xd8", [0x6c51] = "\x8f\xdb",
-  [0x6c52] = "\xe6\xb4", [0x6c5a] = "\x8d\x8b", [0x6c5b] = "\x98\xac",
-  [0x6c5c] = "\xe6\xb5", [0x6c68] = "\xe6\xb6", [0x6c69] = "\x95\x5e",
-  [0x6c6a] = "\xe6\xb7", [0x6c6c] = "\xe6\xbf", [0x6c72] = "\xe6\xb8",
-  [0x6c75] = "\xe6\xba", [0x6c79] = "\xe6\xb9", [0x6c7a] = "\xe6\xbb",
-  [0x6c7c] = "\x96\x65", [0x6c7d] = "\xe6\xbc", [0x6c7e] = "\xe6\xbd",
-  [0x6c84] = "\xe6\xbe", [0x6c88] = "\xe6\xc0", [0x6c8d] = "\x8a\x4c",
-  [0x6c8e] = "\x92\xe5", [0x6c90] = "\x95\x89", [0x6c91] = "\x8d\xe0",
-  [0x6c92] = "\x8d\x76", [0x6c97] = "\x95\x6e", [0x6c98] = "\x89\xdd",
-  [0x6c99] = "\x94\xcc", [0x6c9a] = "\xe6\xc3", [0x6c9b] = "\x8a\xd1",
-  [0x6c9c] = "\x90\xd3", [0x6c9d] = "\xe6\xc2", [0x6c9e] = "\xe6\xc7",
-  [0x6c9f] = "\x92\x99", [0x6ca0] = "\x96\xe1", [0x6ca2] = "\xe6\xc5",
-  [0x6ca3] = "\xe6\xc6", [0x6ca4] = "\x8b\x4d", [0x6ca6] = "\xe6\xc8",
-  [0x6ca7] = "\x94\x83", [0x6ca8] = "\x91\xdd", [0x6cab] = "\x94\xef",
-  [0x6cac] = "\x93\x5c", [0x6cad] = "\xe6\xc4", [0x6caf] = "\x96\x66",
-  [0x6cb0] = "\x89\xea", [0x6cb1] = "\xe6\xca", [0x6cb2] = "\x98\x47",
-  [0x6cb3] = "\x92\xc0", [0x6cb4] = "\x98\x64", [0x6cb7] = "\x8e\x91",
-  [0x6cb8] = "\xe6\xc9", [0x6cba] = "\x91\xaf", [0x6cbd] = "\xe6\xda",
-  [0x6cbe] = "\x91\x47", [0x6cc1] = "\x93\xf6", [0x6cc3] = "\x95\x6f",
-  [0x6cca] = "\xe6\xcd", [0x6ccb] = "\x8e\x5e", [0x6ccc] = "\x8e\x92",
-  [0x6cce] = "\x8f\xdc", [0x6cd0] = "\x94\x85", [0x6cd2] = "\x8c\xab",
-  [0x6cd3] = "\xe6\xcc", [0x6cd4] = "\xe6\xcb", [0x6cd6] = "\x95\x8a",
-  [0x6cda] = "\x8e\xbf", [0x6cdd] = "\x93\x71", [0x6cea] = "\xe6\xcf",
-  [0x6ceb] = "\xe6\xd0", [0x6cec] = "\x8d\x77", [0x6ced] = "\xe6\xce",
-  [0x6cf4] = "\xe6\xd1", [0x6cf5] = "\xe6\xd2", [0x6cf7] = "\xe6\xd4",
-  [0x6cf8] = "\x91\xa1", [0x6cfa] = "\xe6\xd3", [0x6cfb] = "\x8a\xe4",
-  [0x6cfd] = "\xe6\xd6", [0x6cff] = "\xe6\xd5", [0x6d00] = "\xe6\xd7",
-  [0x6d03] = "\xe6\xd9", [0x6d04] = "\xe6\xdb", [0x6d06] = "\xe6\xdc",
-  [0x6d54] = "\x90\xd4", [0x6d56] = "\x8e\xcd", [0x6d57] = "\xe6\xdd",
-  [0x6d5b] = "\x8a\x71", [0x6d5d] = "\xe6\xde", [0x6d60] = "\x91\x96",
-  [0x6d61] = "\xe6\xdf", [0x6d63] = "\xe6\xe0", [0x6d64] = "\x95\x8b",
-  [0x6d67] = "\x8b\x4e", [0x6d71] = "\xe6\xe1", [0x6d75] = "\x92\xb4",
-  [0x6d7a] = "\x89\x7a", [0x6d89] = "\xe6\xe2", [0x6d93] = "\x8e\xef",
-  [0x6d98] = "\x90\x96", [0x6da3] = "\x91\xab", [0x6daa] = "\xe6\xe5",
-  [0x6dae] = "\xe6\xe4", [0x6db2] = "\xe6\xe3", [0x6dbb] = "\xe6\xeb",
-  [0x6dbc] = "\xe6\xe9", [0x6dbf] = "\xe6\xe6", [0x6dc6] = "\xe6\xe8",
-  [0x6dca] = "\xe6\xe7", [0x6dcb] = "\xe6\xea", [0x6dcd] = "\x8b\x97",
-  [0x6dcf] = "\xe6\xee", [0x6dd1] = "\x90\xd5", [0x6dd3] = "\xe6\xef",
-  [0x6dd8] = "\x8c\xd7", [0x6dda] = "\xe6\xec", [0x6ddb] = "\xe6\xed",
-  [0x6ddf] = "\x98\x48", [0x6de3] = "\x92\xb5", [0x6de5] = "\x91\x48",
-  [0x6dec] = "\xe6\xf0", [0x6def] = "\xe6\xf3", [0x6df8] = "\xe6\xf1",
-  [0x6df9] = "\xe6\xf2", [0x6dfa] = "\x97\x78", [0x6dff] = "\x93\xa5",
-  [0x6e00] = "\xe6\xf6", [0x6e0d] = "\xe6\xf4", [0x6e0e] = "\xe6\xf5",
-  [0x6e0f] = "\xe6\xf7", [0x6e1a] = "\xe7\x48", [0x6e20] = "\xe6\xfa",
-  [0x6e24] = "\xe6\xfb", [0x6e25] = "\xe6\xf9", [0x6e32] = "\xe6\xf8",
-  [0x6e34] = "\x92\xfb", [0x6e37] = "\xe7\x40", [0x6e38] = "\xe7\x44",
-  [0x6e39] = "\xe7\x41", [0x6e3a] = "\xe6\xfc", [0x6e3c] = "\xe7\x42",
-  [0x6e40] = "\xe7\x43", [0x6e45] = "\xe7\x4a", [0x6e49] = "\xe7\x45",
-  [0x6e4f] = "\x90\xd6", [0x6e50] = "\xe7\x47", [0x6e53] = "\xe7\x49",
-  [0x6e54] = "\xe7\x46", [0x6e62] = "\xe7\x4c", [0x6e64] = "\x8f\x52",
-  [0x6e66] = "\xe7\x4b", [0x6e6c] = "\xe7\x4d", [0x6e71] = "\xe7\x4e",
-  [0x6e74] = "\xe7\x51", [0x6e75] = "\xe7\x50", [0x6e77] = "\xe7\x4f",
-  [0x6e7a] = "\xe7\x53", [0x6e7b] = "\xe7\x52", [0x6e7d] = "\x96\xf4",
-  [0x6e81] = "\xe7\x55", [0x6e83] = "\xe7\x54", [0x6e84] = "\xe7\x56",
-  [0x6e89] = "\xe7\x57", [0x6e91] = "\xe7\x59", [0x6e9a] = "\xe7\x58",
-  [0x6e9b] = "\x90\x67", [0x6e9c] = "\xe7\x5a", [0x6e9f] = "\x8b\xeb",
-  [0x6ea0] = "\xe7\x5b", [0x6ea1] = "\xe7\x5d", [0x6eae] = "\xe7\x5e",
-  [0x6eb5] = "\xe7\x5f", [0x6eb6] = "\xe7\x5c", [0x6eb8] = "\xe7\x60",
-  [0x6eba] = "\x8e\xd4", [0x6ebb] = "\xe7\x61", [0x6ebc] = "\x8b\x4f",
-  [0x6ebd] = "\x8c\x52", [0x6ec2] = "\x8c\xac", [0x6ecb] = "\xe7\x62",
-  [0x6ecf] = "\x93\xee", [0x6ed2] = "\x93\x5d", [0x6ed3] = "\xe7\x63",
-  [0x6edb] = "\xe7\x66", [0x6ee8] = "\x8e\xb2", [0x6eeb] = "\xe7\x65",
-  [0x6eec] = "\xe7\x64", [0x6eed] = "\x8c\x79", [0x6eee] = "\xe7\x67",
-  [0x6ef3] = "\x8a\x72", [0x6ef5] = "\xe7\x69", [0x6ef9] = "\x8d\xda",
-  [0x6efa] = "\xe7\x68", [0x6efc] = "\xe7\x71", [0x6f02] = "\xe7\x6b",
-  [0x6f03] = "\xe7\x6d", [0x6f04] = "\x95\xe3", [0x6f05] = "\xe7\x6a",
-  [0x6f09] = "\xe7\x6c", [0x6f0b] = "\xe7\x70", [0x6f0c] = "\xe7\x6e",
-  [0x6f0d] = "\x8b\x50", [0x6f0f] = "\xe7\x6f", [0x6f16] = "\xe7\x72",
-  [0x6f19] = "\x94\x79", [0x6f1a] = "\x97\xd6", [0x6f1f] = "\x8f\x53",
-  [0x6f23] = "\xe7\x73", [0x6f28] = "\x97\x41", [0x6f29] = "\xe7\x75",
-  [0x6f2b] = "\xe7\x74", [0x6f2e] = "\xe7\x78", [0x6f2f] = "\x97\x60",
-  [0x6f32] = "\xe7\x77", [0x6f34] = "\x8a\x8d", [0x6f35] = "\xe7\x76",
-  [0x6f36] = "\xe7\x7b", [0x6f39] = "\xe7\x7a", [0x6f3c] = "\xe7\x79",
-  [0x6f3d] = "\x93\x51", [0x6f3e] = "\xe7\x7c", [0x6f47] = "\xe7\x7d",
-  [0x6f4c] = "\xe7\x7e", [0x6f4f] = "\x8d\x8c", [0x6f51] = "\x8c\x44",
-  [0x6f52] = "\xe7\x80", [0x6f53] = "\xe7\x81", [0x6f54] = "\xe7\x82",
-  [0x6f8b] = "\x90\x68", [0x6f8c] = "\xe7\x83", [0x6f8e] = "\x8e\xab",
-  [0x6f8f] = "\xe7\x84", [0x6f93] = "\xe7\x85", [0x6f97] = "\x99\x9f",
-  [0x6f98] = "\x99\x9e", [0x6f9d] = "\xe7\x86", [0x6f9e] = "\xe3\x90",
-  [0x6f9f] = "\xe7\x87", [0x6fa0] = "\x92\x43", [0x6fa1] = "\x90\x4a",
-  [0x6fa2] = "\x94\x5f", [0x6fa7] = "\xe7\x88", [0x6faa] = "\x95\xd3",
-  [0x6fab] = "\x92\xd2", [0x6fac] = "\x8d\x9e", [0x6faf] = "\x92\x48",
-  [0x6fb2] = "\x89\x49", [0x6fb4] = "\x96\x98", [0x6fb5] = "\x90\x76",
-  [0x6fbe] = "\x8c\x7d", [0x6fc1] = "\x8b\xdf", [0x6fc4] = "\x95\xd4",
-  [0x6fca] = "\xe7\x89", [0x6fd2] = "\xe7\x8b", [0x6fd5] = "\xe7\x8a",
-  [0x6fd6] = "\x89\xde", [0x6fd9] = "\x93\xf4", [0x6fda] = "\xe7\x8c",
-  [0x6fdb] = "\x94\x97", [0x6fdd] = "\x93\x52", [0x6fdf] = "\xe7\x8d",
-  [0x6fe0] = "\x8f\x71", [0x6fe4] = "\xe7\x8f", [0x6fe7] = "\x96\xc0",
-  [0x6fe8] = "\xe7\x9e", [0x6fe9] = "\xe7\x91", [0x6fea] = "\xe7\x92",
-  [0x6fed] = "\x92\xc7", [0x6ff0] = "\x91\xde", [0x6ff1] = "\x91\x97",
-  [0x6ff3] = "\x93\xa6", [0x6ff5] = "\xe7\x90", [0x6ff6] = "\x8b\x74",
-  [0x6ffb] = "\xe7\x99", [0x6ffd] = "\xe7\x96", [0x6ffe] = "\xe7\xa3",
-  [0x6fff] = "\x93\xa7", [0x7000] = "\x92\x80", [0x7001] = "\xe7\x93",
-  [0x7003] = "\x92\xfc", [0x7004] = "\x93\x72", [0x7005] = "\xe7\x94",
-  [0x7006] = "\xe7\x98", [0x7007] = "\x90\x80", [0x7009] = "\x94\x87",
-  [0x700a] = "\x92\xca", [0x700d] = "\x90\xc0", [0x700e] = "\xe7\x97",
-  [0x700f] = "\x91\xac", [0x7010] = "\x91\xa2", [0x7011] = "\xe7\x95",
-  [0x7012] = "\x88\xa7", [0x7013] = "\x98\x41", [0x7017] = "\xe7\x9a",
-  [0x701e] = "\x91\xdf", [0x7021] = "\x8f\x54", [0x7022] = "\x90\x69",
-  [0x7025] = "\xe7\x9c", [0x7026] = "\xe7\x9b", [0x7028] = "\x88\xed",
-  [0x7029] = "\xe7\x9d", [0x702c] = "\x95\x4e", [0x702e] = "\xe7\xa5",
-  [0x7031] = "\x93\xd9", [0x7032] = "\x90\x8b", [0x7035] = "\x92\x78",
-  [0x7037] = "\x8b\xf6", [0x7039] = "\xe7\xa4", [0x703a] = "\x97\x56",
-  [0x703b] = "\x89\x5e", [0x703d] = "\x95\xd5", [0x703e] = "\x89\xdf",
-  [0x703f] = "\xe7\x9f", [0x7040] = "\xe7\xa0", [0x7041] = "\xe7\xa1",
-  [0x7042] = "\xe7\xa2", [0x7043] = "\x93\xb9", [0x7044] = "\x92\x42",
-  [0x7045] = "\x88\xe1", [0x7046] = "\xe7\xa6", [0x7048] = "\xe7\xa7",
-  [0x7049] = "\xea\xa1", [0x704c] = "\x91\xbb", [0x704e] = "\xe7\xa8",
-  [0x7050] = "\x89\x93", [0x7051] = "\x91\x6b", [0x7053] = "\x8c\xad",
-  [0x7055] = "\x97\x79", [0x7058] = "\xe7\xa9", [0x7059] = "\x93\x4b",
-  [0x705d] = "\x91\x98", [0x705e] = "\x8e\xd5", [0x705f] = "\xe7\xaa",
-  [0x7062] = "\xe7\xad", [0x7065] = "\x8f\x85", [0x7066] = "\xe7\xab",
-  [0x7067] = "\x91\x4a", [0x7068] = "\x91\x49", [0x706a] = "\x88\xe2",
-  [0x706c] = "\x97\xc9", [0x706d] = "\xe7\xaf", [0x706f] = "\x94\xf0",
-  [0x7070] = "\xe7\xb1", [0x7071] = "\xe7\xb0", [0x7072] = "\xe7\xae",
-  [0x7073] = "\xe2\x84", [0x7074] = "\x8a\xd2", [0x7077] = "\xe7\x8e",
-  [0x7079] = "\xe7\xb3", [0x707a] = "\xe7\xb2", [0x707f] = "\xe7\xb4",
-  [0x7081] = "\x97\x57", [0x7093] = "\x93\xdf", [0x7096] = "\x96\x4d",
-  [0x7098] = "\xe7\xb5", [0x709a] = "\x8e\xd7", [0x709f] = "\xe7\xb6",
-  [0x70a1] = "\xe7\xb7", [0x70a5] = "\xe7\xb8", [0x70a8] = "\x93\x40",
-  [0x70b1] = "\x88\xe8", [0x70ba] = "\x8d\x78", [0x70be] = "\x98\x59",
-  [0x70cb] = "\xe7\xbc", [0x70d1] = "\x8c\x53", [0x70d2] = "\xe7\xb9",
-  [0x70d4] = "\xe7\xba", [0x70d8] = "\x95\x94", [0x70dd] = "\x8a\x73",
-  [0x70e5] = "\x97\x58", [0x70e7] = "\x8b\xbd", [0x70ed] = "\x93\x73",
-  [0x70f2] = "\xe7\xbd", [0x7102] = "\xe7\xbe", [0x7109] = "\xe7\xbf",
-  [0x711d] = "\x93\x41", [0x7120] = "\xe7\xc1", [0x7122] = "\xe7\xc0",
-  [0x7139] = "\x93\xd1", [0x713a] = "\xe7\xc2", [0x713b] = "\x8f\x55",
-  [0x713c] = "\x8e\xde", [0x713d] = "\x94\x7a", [0x713e] = "\x92\x91",
-  [0x7142] = "\x8e\xf0", [0x7144] = "\x90\x8c", [0x7146] = "\xe7\xc3",
-  [0x7148] = "\xe7\xc4", [0x7152] = "\x90\x7c", [0x7153] = "\xe7\xc5",
-  [0x7155] = "\xe7\xc6", [0x7159] = "\xe7\xc7", [0x715a] = "\x97\x8f",
-  [0x715c] = "\x8f\x56", [0x7162] = "\xe7\xc9", [0x7163] = "\xe7\xc8",
-  [0x7165] = "\x8d\x79", [0x7167] = "\x8d\x93", [0x7168] = "\x8e\x5f",
-  [0x7172] = "\xe7\xcc", [0x7177] = "\x8f\x86", [0x7179] = "\xe7\xcb",
-  [0x717b] = "\xe7\xca", [0x717d] = "\x91\xe7", [0x7180] = "\x8c\xed",
-  [0x7182] = "\x90\xc1", [0x7187] = "\x94\xae", [0x718c] = "\x8f\x58",
-  [0x7192] = "\xe7\xcd", [0x7194] = "\x8f\xdd", [0x719a] = "\xe7\xd0",
-  [0x719b] = "\xe7\xce", [0x719f] = "\xe7\xcf", [0x71a4] = "\xe7\xd2",
-  [0x71a5] = "\xe7\xd1", [0x71a8] = "\x8f\xf8", [0x71aa] = "\xe7\xd3",
-  [0x71b0] = "\xe7\xd4", [0x71b1] = "\xe7\xd5", [0x71b6] = "\x94\xce",
-  [0x71b7] = "\x8d\xd1", [0x71b8] = "\x8e\xdf", [0x71b9] = "\xe7\xd6",
-  [0x71bb] = "\xe7\xd7", [0x71bc] = "\x97\xa2", [0x71bd] = "\x8f\x64",
-  [0x71be] = "\x96\xec", [0x71bf] = "\x97\xca", [0x71c0] = "\xe7\xd8",
-  [0x71c1] = "\x8b\xe0", [0x71c6] = "\xe7\xd9", [0x71c8] = "\x93\x42",
-  [0x71cb] = "\xe7\xdc", [0x71cc] = "\x8a\x98", [0x71cd] = "\x90\x6a",
-  [0x71cf] = "\xe7\xda", [0x71d1] = "\xe7\xdb", [0x71d3] = "\x92\xde",
-  [0x71d6] = "\x96\x74", [0x71d7] = "\x8b\xfa", [0x71e5] = "\xe7\xde",
-  [0x71e6] = "\xe7\xdf", [0x71ec] = "\xe7\xdd", [0x71ef] = "\xe7\xe1",
-  [0x71fd] = "\x93\xdd", [0x71fe] = "\x8a\x62", [0x7201] = "\xe7\xe5",
-  [0x7204] = "\xe7\xe2", [0x7205] = "\xe7\xe4", [0x720e] = "\xe7\xe0",
-  [0x7219] = "\xe8\x6e", [0x721c] = "\xe7\xe3", [0x7224] = "\x97\xe9",
-  [0x7227] = "\x8c\xd8", [0x722f] = "\xe7\xed", [0x7234] = "\x93\x53",
-  [0x7235] = "\xe7\xe8", [0x7238] = "\xe7\xeb", [0x7239] = "\xe7\xe9",
-  [0x723b] = "\xe7\xee", [0x7240] = "\xe7\xef", [0x7247] = "\xe7\xe7",
-  [0x724a] = "\xe7\xf4", [0x724b] = "\x89\x94", [0x724e] = "\xe7\xe6",
-  [0x7252] = "\x94\xab", [0x7254] = "\xe7\xea", [0x7256] = "\x8f\xde",
-  [0x7261] = "\x8d\x7a", [0x726e] = "\x96\x67", [0x7270] = "\x8b\xe2",
-  [0x7273] = "\x8f\x65", [0x7275] = "\x93\xba", [0x7281] = "\x91\x4c",
-  [0x7283] = "\xe7\xf2", [0x7285] = "\xe7\xec", [0x7286] = "\xe7\xf1",
-  [0x7288] = "\x96\xc1", [0x728a] = "\x92\xb6", [0x728b] = "\xe7\xf3",
-  [0x728c] = "\xe7\xf0", [0x729d] = "\x91\x4b", [0x72a7] = "\xe7\xf7",
-  [0x72a9] = "\xe7\xf6", [0x72bf] = "\xe7\xf5", [0x72c2] = "\x96\x4e",
-  [0x72d4] = "\x8f\x9b", [0x72d9] = "\xe7\xf8", [0x72da] = "\x95\xdd",
-  [0x72dd] = "\x89\x73", [0x72e2] = "\x95\x65", [0x72e3] = "\x92\x92",
-  [0x72e8] = "\x8b\x98", [0x72ea] = "\xe7\xfa", [0x72ec] = "\x8d\x7c",
-  [0x72f6] = "\x8e\x4b", [0x72ff] = "\xe7\xf9", [0x7300] = "\x90\x8d",
-  [0x7308] = "\x90\x8e", [0x7309] = "\xe8\x40", [0x730a] = "\xe8\x42",
-  [0x7310] = "\x8f\xf9", [0x7312] = "\xe8\x41", [0x7313] = "\xe8\x43",
-  [0x7316] = "\x8b\xd1", [0x7318] = "\x95\x64", [0x731b] = "\x8e\xe0",
-  [0x731c] = "\x98\x42", [0x731e] = "\xe7\xfc", [0x731f] = "\x8d\xf6",
-  [0x7322] = "\x98\x5e", [0x7325] = "\xe8\x45", [0x732a] = "\xe8\x44",
-  [0x732b] = "\xe8\x46", [0x7334] = "\xe7\xfb", [0x733b] = "\x93\xe7",
-  [0x733d] = "\x93\x74", [0x7344] = "\x92\xd5", [0x7346] = "\xe8\x4b",
-  [0x734b] = "\x92\x62", [0x734c] = "\xe8\x47", [0x7350] = "\xe8\x48",
-  [0x735c] = "\x8c\x4c", [0x735e] = "\xe8\x4a", [0x7365] = "\x8c\xae",
-  [0x736c] = "\xe8\x49", [0x736e] = "\x8f\xdf", [0x737c] = "\x8a\x99",
-  [0x7384] = "\xe8\x4f", [0x7386] = "\x8d\xbd", [0x7387] = "\x91\x99",
-  [0x738a] = "\x92\xc8", [0x7397] = "\x8a\x5a", [0x739c] = "\xe8\x4d",
-  [0x739d] = "\xe8\x4e", [0x739e] = "\x92\xc1", [0x73a0] = "\xe8\x4c",
-  [0x73a9] = "\xe8\x50", [0x73b3] = "\xe8\x56", [0x73b8] = "\xe8\x59",
-  [0x73c0] = "\xe8\x58", [0x73c1] = "\x93\x4c", [0x73c6] = "\xe8\x51",
-  [0x73c7] = "\xe8\x52", [0x73c8] = "\xe8\x55", [0x73cd] = "\xe8\x57",
-  [0x73d1] = "\x8b\xbe", [0x73d4] = "\xe8\x5a", [0x73d5] = "\xe8\x54",
-  [0x73d8] = "\xe8\x53", [0x73f3] = "\xe8\x5e", [0x73f7] = "\xe8\x5f",
-  [0x7400] = "\xe8\x60", [0x7403] = "\xe8\x5d", [0x7404] = "\xe8\x5c",
-  [0x7408] = "\x8f\xe0", [0x7409] = "\x93\xa8", [0x740a] = "\xe8\x5b",
-  [0x7411] = "\xe8\x64", [0x741b] = "\xe8\x62", [0x7425] = "\xe8\x63",
-  [0x7426] = "\xe8\x61", [0x7428] = "\x91\xf6", [0x742a] = "\xe8\x65",
-  [0x7431] = "\xe8\x66", [0x7434] = "\xe8\x68", [0x7441] = "\x8a\xd3",
-  [0x7442] = "\xe8\x67", [0x7443] = "\x96\xf8", [0x744a] = "\xe8\x73",
-  [0x744b] = "\xe8\x69", [0x744e] = "\xe8\x6c", [0x7450] = "\xe8\x6a",
-  [0x7452] = "\xe8\x6b", [0x745a] = "\xe8\x6d", [0x7460] = "\xe8\x6f",
-  [0x7465] = "\xe8\x70", [0x7467] = "\xe8\x71", [0x746c] = "\xe8\x74",
-  [0x746d] = "\xe8\x72", [0x746e] = "\xe8\x75", [0x746f] = "\xe8\x77",
-  [0x7471] = "\xe8\x76", [0x7567] = "\x92\xb7", [0x7570] = "\x96\xe5",
-  [0x7572] = "\xe8\x78", [0x7573] = "\x91\x4d", [0x7577] = "\xe8\x79",
-  [0x7579] = "\x95\xc2", [0x757a] = "\xe8\x7a", [0x757b] = "\x8a\x4a",
-  [0x757f] = "\x89\x5b", [0x7581] = "\x8a\xd5", [0x7583] = "\x8a\xd4",
-  [0x7584] = "\xe8\x7b", [0x7586] = "\xe8\x7c", [0x7588] = "\xe8\x7d",
-  [0x7589] = "\xe8\x7e", [0x7590] = "\xe8\x80", [0x7592] = "\x8a\xd6",
-  [0x7593] = "\x8a\x74", [0x7594] = "\x8d\x7d", [0x7595] = "\x94\xb4",
-  [0x7597] = "\xe8\x82", [0x7598] = "\xe8\x81", [0x759d] = "\xe8\x83",
-  [0x75a2] = "\x89\x7b", [0x75a9] = "\xe8\x86", [0x75ab] = "\xe8\x85",
-  [0x75ac] = "\xe8\x84", [0x75ae] = "\xe8\x87", [0x75b3] = "\xe8\x8a",
-  [0x75b7] = "\x88\xc5", [0x75ba] = "\xe8\x88", [0x75bc] = "\xe8\x8c",
-  [0x75bd] = "\xe8\x8b", [0x75c4] = "\xe8\x8e", [0x75c5] = "\xe8\x8d",
-  [0x75c6] = "\xe8\x8f", [0x75c8] = "\x93\xac", [0x75cc] = "\xe8\x90",
-  [0x75d1] = "\xe8\x91", [0x75d2] = "\xe8\x93", [0x75d5] = "\xe8\x92",
-  [0x760c] = "\x95\x8c", [0x7611] = "\xe8\x94", [0x7618] = "\xe8\x95",
-  [0x761a] = "\x8d\xe3", [0x761e] = "\xe8\x96", [0x761f] = "\xe8\x97",
-  [0x7622] = "\x96\x68", [0x762b] = "\x91\x6a", [0x762f] = "\x88\xa2",
-  [0x7630] = "\x91\xc9", [0x7632] = "\xe8\x98", [0x7634] = "\x95\x8d",
-  [0x763b] = "\xe8\x9b", [0x763c] = "\xe8\x99", [0x763d] = "\x8d\x7e",
-  [0x763f] = "\xe8\x9a", [0x7640] = "\x8c\xc0", [0x764b] = "\x95\xc3",
-  [0x764c] = "\xe8\x9d", [0x764d] = "\xe8\x9f", [0x764e] = "\xe8\x9e",
-  [0x764f] = "\xe8\xa0", [0x7652] = "\x89\x40", [0x7653] = "\x90\x77",
-  [0x7654] = "\x8f\x9c", [0x7655] = "\x8a\xd7", [0x7656] = "\xe8\xa1",
-  [0x765a] = "\x94\x86", [0x765c] = "\xe8\xa3", [0x7660] = "\x89\x41",
-  [0x7662] = "\xe8\xa2", [0x7663] = "\x92\xc2", [0x7665] = "\x97\xcb",
-  [0x7666] = "\x93\xa9", [0x7667] = "\xe8\x9c", [0x7668] = "\x97\xa4",
-  [0x766a] = "\x8c\xaf", [0x766d] = "\x97\x7a", [0x7675] = "\x8b\xf7",
-  [0x7676] = "\x97\xb2", [0x7678] = "\x8c\x47", [0x767a] = "\x91\xe0",
-  [0x767b] = "\xe4\x40", [0x767d] = "\xe8\xa4", [0x767e] = "\x8a\x4b",
-  [0x767f] = "\x90\x8f", [0x7684] = "\x8a\x75", [0x7685] = "\xe8\xa6",
-  [0x7687] = "\xe8\xa7", [0x7688] = "\xe8\xa5", [0x7689] = "\x8c\x84",
-  [0x768b] = "\x8d\xdb", [0x768c] = "\x8f\xe1", [0x7690] = "\x89\x42",
-  [0x7693] = "\x97\xd7", [0x7697] = "\xe8\xa9", [0x7698] = "\xe7\xac",
-  [0x769a] = "\xe8\xa8", [0x76a0] = "\xe8\xac", [0x76a1] = "\xe8\xaa",
-  [0x76a2] = "\xe8\xab", [0x76a4] = "\xe8\xad", [0x76a6] = "\xe8\xae",
-  [0x76a7] = "\x97\xea", [0x76a8] = "\xe8\xaf", [0x76a9] = "\xe8\xb0",
-  [0x76ab] = "\x90\xc7", [0x76ac] = "\x94\xb9", [0x76b0] = "\x90\x9d",
-  [0x76b1] = "\x8a\xe5", [0x76b4] = "\x97\x59", [0x76b5] = "\x89\xeb",
-  [0x76b6] = "\x8f\x57", [0x76b7] = "\x8c\xd9", [0x76b9] = "\xe8\xb3",
-  [0x76bb] = "\xe8\xb2", [0x76bc] = "\x8e\x93", [0x76bd] = "\xe8\xb4",
-  [0x76be] = "\xe8\xb1", [0x76c1] = "\x8e\x47", [0x76c5] = "\xe8\xb8",
-  [0x76c6] = "\xe5\xab", [0x76c9] = "\x99\xd4", [0x76cb] = "\x90\x97",
-  [0x76cc] = "\xe8\xb6", [0x76d2] = "\x97\xa3", [0x76d3] = "\x93\xef",
-  [0x76d8] = "\x89\x4a", [0x76da] = "\x90\xe1", [0x76db] = "\x8e\xb4",
-  [0x76e0] = "\x95\xb5", [0x76e2] = "\x89\x5f", [0x76e6] = "\x97\xeb",
-  [0x76e7] = "\x97\x8b", [0x76e9] = "\xe8\xb9", [0x76eb] = "\x93\x64",
-  [0x76f0] = "\x8e\xf9", [0x76f4] = "\xe8\xba", [0x76f6] = "\xe8\xbb",
-  [0x76f7] = "\x90\x6b", [0x76f8] = "\xe8\xbc", [0x76fa] = "\x97\xec",
-  [0x76fd] = "\xe8\xb7", [0x76fe] = "\xe8\xbe", [0x76ff] = "\xe8\xc0",
-  [0x7701] = "\xe8\xbf", [0x7703] = "\xe8\xbd", [0x7706] = "\xe8\xc1",
-  [0x7709] = "\xe8\xc2", [0x770c] = "\x91\x9a", [0x770e] = "\x89\xe0",
-  [0x7714] = "\xe8\xc3", [0x7717] = "\x96\xb6", [0x771a] = "\xe8\xc4",
-  [0x7720] = "\xe8\xc5", [0x7722] = "\x98\x49", [0x7728] = "\x9e\x50",
-  [0x7729] = "\xe8\xc6", [0x772d] = "\xe8\xc7", [0x772e] = "\xe8\xc8",
-  [0x7732] = "\xe8\xcc", [0x7734] = "\xe8\xc9", [0x7736] = "\xe8\xca",
-  [0x7738] = "\xe8\xcb", [0x7739] = "\xe8\xcd", [0x7742] = "\x90\xc2",
-  [0x7746] = "\x96\xf5", [0x7749] = "\x90\xc3", [0x774c] = "\xe8\xce",
-  [0x774e] = "\x94\xf1", [0x7750] = "\xe8\xcf", [0x7751] = "\xea\x72",
-  [0x7752] = "\x96\xca", [0x7754] = "\xe8\xd0", [0x7756] = "\xe8\xd1",
-  [0x7758] = "\xe8\xd2", [0x7759] = "\x8a\x76", [0x775b] = "\xe8\xd4",
-  [0x775d] = "\x90\x78", [0x7761] = "\xe8\xd5", [0x7764] = "\x8c\x43",
-  [0x7769] = "\xe8\xd6", [0x776a] = "\xe8\xda", [0x776c] = "\xe8\xd8",
-  [0x7771] = "\xe8\xd9", [0x7774] = "\x8a\x93", [0x7775] = "\xe8\xd7",
-  [0x7776] = "\xe8\xdb", [0x777b] = "\xe8\xdc", [0x777d] = "\x88\xc6",
-  [0x777f] = "\xe8\xdd", [0x7780] = "\xe8\xde", [0x7788] = "\x8f\xe2",
-  [0x778c] = "\xe8\xdf", [0x7790] = "\x8b\x66", [0x7793] = "\xe8\xe2",
-  [0x7796] = "\xe8\xe1", [0x7798] = "\xe8\xe0", [0x779b] = "\xe6\x91",
-  [0x779d] = "\x95\xda", [0x77a3] = "\xe8\xe3", [0x77a4] = "\xe8\xe4",
-  [0x77b3] = "\xe8\xe5", [0x77b6] = "\xe8\xe6", [0x77b8] = "\xe8\xe7",
-  [0x77bb] = "\xe8\xe8", [0x77c3] = "\x8a\xd8", [0x77cc] = "\xe8\xe9",
-  [0x77dd] = "\xe8\xea", [0x77de] = "\x94\x42", [0x77e2] = "\xe8\xec",
-  [0x77e3] = "\x89\xb9", [0x77e5] = "\xe8\xef", [0x77e6] = "\xe8\xee",
-  [0x77eb] = "\x89\x43", [0x77ef] = "\x8b\xbf", [0x77f1] = "\x95\xc5",
-  [0x77f2] = "\x92\xb8", [0x77f3] = "\x8d\xa0", [0x77f5] = "\x8d\x80",
-  [0x77f6] = "\x8f\x87", [0x77f8] = "\x90\x7b", [0x77fc] = "\xe8\xf1",
-  [0x77ff] = "\xe8\xf0", [0x7800] = "\x97\x61", [0x7801] = "\x8a\xe6",
-  [0x7802] = "\x94\xd0", [0x7803] = "\x93\xda", [0x7807] = "\x90\x9c",
-  [0x7808] = "\x97\xcc", [0x780a] = "\x8c\x7a", [0x7811] = "\xe8\xf4",
-  [0x7814] = "\xe8\xf3", [0x781c] = "\x96\x6a", [0x781d] = "\x93\xaa",
-  [0x7824] = "\x89\x6f", [0x7827] = "\xe8\xf5", [0x7828] = "\xe8\xf2",
-  [0x782b] = "\x95\x70", [0x782c] = "\x97\x8a", [0x782d] = "\xe8\xf6",
-  [0x7836] = "\xe8\xf7", [0x783b] = "\xe8\xf9", [0x783c] = "\x91\xe8",
-  [0x783d] = "\x8a\x7a", [0x783e] = "\x8a\x7b", [0x783f] = "\xe8\xf8",
-  [0x7844] = "\x8a\xe7", [0x7845] = "\x8c\xb0", [0x7848] = "\x8a\xe8",
-  [0x784b] = "\x93\x5e", [0x784e] = "\x97\xde", [0x7857] = "\x8c\xda",
-  [0x785b] = "\xe8\xfa", [0x785f] = "\xe8\xfb", [0x7860] = "\xe8\xfc",
-  [0x7861] = "\xe9\x40", [0x7863] = "\xe9\x42", [0x7864] = "\xe9\x41",
-  [0x7898] = "\x95\x97", [0x789a] = "\xe9\x43", [0x789f] = "\xe9\x44",
-  [0x78a1] = "\xe9\x45", [0x78a6] = "\xe9\x46", [0x78b3] = "\xe9\x48",
-  [0x78b4] = "\xe9\x47", [0x78b6] = "\xe9\x49", [0x78cb] = "\x94\xf2",
-  [0x78cc] = "\xe3\xca", [0x78cf] = "\x90\x48", [0x78d2] = "\x8b\x51",
-  [0x78d9] = "\xe9\x4a", [0x78db] = "\xe9\x4b", [0x78dd] = "\x99\xaa",
-  [0x78de] = "\x9f\x5a", [0x78df] = "\x94\xd1", [0x78e2] = "\x88\xf9",
-  [0x78e4] = "\x88\xb9", [0x78ec] = "\x8e\x94", [0x78ed] = "\x96\x4f",
-  [0x78ee] = "\x8f\xfc", [0x78f3] = "\xe9\x4c", [0x78f5] = "\x96\xdd",
-  [0x78f9] = "\xe9\x4d", [0x78fa] = "\x97\x7b", [0x78fc] = "\x89\x61",
-  [0x7900] = "\x8e\x60", [0x7902] = "\xe9\x4e", [0x7903] = "\x89\xec",
-  [0x7904] = "\xe9\x4f", [0x7908] = "\xe9\x50", [0x790d] = "\xe9\x52",
-  [0x790e] = "\xe9\x53", [0x7910] = "\xe9\x55", [0x7911] = "\xe9\x51",
-  [0x7914] = "\xe9\x54", [0x7918] = "\x8a\xd9", [0x791c] = "\xe9\x56",
-  [0x791e] = "\xe9\x57", [0x792d] = "\xe9\x58", [0x792e] = "\xe9\x59",
-  [0x7932] = "\xe9\x5a", [0x7935] = "\xe9\x5c", [0x7939] = "\xe9\x5b",
-  [0x793b] = "\xe9\x5e", [0x793c] = "\xe9\x61", [0x7940] = "\xe9\x5d",
-  [0x7941] = "\xe9\x5f", [0x7942] = "\xe9\x60", [0x7945] = "\xe9\x62",
-  [0x7947] = "\x8b\xc0", [0x7986] = "\x8e\xf1", [0x7987] = "\xe9\x63",
-  [0x7988] = "\xe9\x64", [0x7989] = "\x8d\x81", [0x7995] = "\xe9\x65",
-  [0x7998] = "\x8a\x5d", [0x799c] = "\x94\x6e", [0x799d] = "\xe9\x66",
-  [0x799e] = "\xe9\x67", [0x79a3] = "\x92\x79", [0x79a4] = "\x93\xe9",
-  [0x79ac] = "\xe9\x68", [0x79b1] = "\x94\x9d", [0x79b4] = "\x91\xca",
-  [0x79b5] = "\x89\x77", [0x79b6] = "\x8b\xec", [0x79b8] = "\x8b\xed",
-  [0x79c0] = "\x92\x93", [0x79c1] = "\xe9\x6d", [0x79c2] = "\x8b\xee",
-  [0x79c5] = "\x89\xed", [0x79c8] = "\xe9\x6c", [0x79cb] = "\xe9\x6a",
-  [0x79cd] = "\xe9\x6b", [0x79cf] = "\xe9\x69", [0x79d2] = "\xe9\x77",
-  [0x79dd] = "\xe9\x6e", [0x79de] = "\xe9\x6f", [0x79e1] = "\xe9\x70",
-  [0x79e2] = "\xe9\x71", [0x79e8] = "\xe9\x73", [0x79eb] = "\xe9\x72",
-  [0x79ef] = "\x8f\x78", [0x79f1] = "\xe9\x74", [0x79f5] = "\xe9\x76",
-  [0x79fe] = "\x8b\x52", [0x79ff] = "\xe9\x75", [0x7a02] = "\x91\x9b",
-  [0x7a03] = "\x8c\xb1", [0x7a09] = "\xe9\x78", [0x7a18] = "\x91\xcb",
-  [0x7a1b] = "\xe9\x79", [0x7a20] = "\x93\xab", [0x7a27] = "\xe9\x7a",
-  [0x7a2e] = "\xe9\x80", [0x7a30] = "\xe9\x7d", [0x7a32] = "\xe9\x7c",
-  [0x7a33] = "\xe9\x7e", [0x7a35] = "\xe9\x7b", [0x7a3d] = "\xe9\x82",
-  [0x7a45] = "\xe9\x81", [0x7a47] = "\xe9\x84", [0x7a4a] = "\x8b\xc1",
-  [0x7a4b] = "\xe9\x83", [0x7a4f] = "\xe9\x85", [0x7a52] = "\xe9\x86",
-  [0x7a54] = "\xe9\x88", [0x7a55] = "\xe9\x87", [0x7a59] = "\xe9\x89",
-  [0x7a5a] = "\xe9\x8b", [0x7a5b] = "\xe9\x8a", [0x7a98] = "\x8d\x9c",
-  [0x7a9d] = "\xe9\x8c", [0x7aa0] = "\xe9\x8d", [0x7aa8] = "\x8a\x5b",
-  [0x7aac] = "\xe9\x8e", [0x7ab0] = "\xe9\x8f", [0x7ab4] = "\x90\x91",
-  [0x7abf] = "\xe9\x90", [0x7ac1] = "\xe9\x91", [0x7ac3] = "\xe9\x92",
-  [0x7ac4] = "\xe9\x93", [0x7ac8] = "\x8d\x82", [0x7ace] = "\xe9\x94",
-  [0x7acf] = "\xe9\x95", [0x7ad2] = "\xe9\x96", [0x7ad3] = "\xe9\x97",
-  [0x7ad6] = "\xe9\x98", [0x7ada] = "\x94\xaf", [0x7adb] = "\xe9\x9a",
-  [0x7add] = "\x95\x45", [0x7ade] = "\xe9\x9b", [0x7adf] = "\xe9\x99",
-  [0x7ae1] = "\xe9\x9d", [0x7ae4] = "\xe9\x9c", [0x7ae7] = "\xe9\x9e",
-  [0x7aeb] = "\xe9\x9f", [0x7af6] = "\xe9\xa0", [0x7b08] = "\xe9\xa1",
-  [0x7b0a] = "\xe9\xa2", [0x7b0f] = "\xe9\xa3", [0x7b12] = "\xe9\xa4",
-  [0x7b13] = "\xe9\xa5", [0x7b15] = "\xe9\xa6", [0x7b17] = "\xe9\xa7",
-  [0x7b18] = "\xe9\xa8", [0x7b19] = "\xe9\xa9", [0x7b1a] = "\xe9\xaa",
-  [0x7b1e] = "\xe9\xab", [0x7b1f] = "\xe9\xac", [0x7b21] = "\x9f\x54",
-  [0x7b22] = "\xe9\xad", [0x7b2b] = "\xe2\xf6", [0x7b2c] = "\x8b\x53",
-  [0x7b31] = "\x8a\x40", [0x7b32] = "\x8d\xb0", [0x7b33] = "\xe9\xaf",
-  [0x7b34] = "\xe9\xae", [0x7b35] = "\x96\xa3", [0x7b3d] = "\xe9\xb1",
-  [0x7b3e] = "\xe9\xb2", [0x7b3f] = "\xe9\xb0", [0x7b41] = "\xe9\xb3",
-  [0x7b44] = "\x96\x82", [0x7b48] = "\xe9\xb4", [0x7b4a] = "\x8b\x9b",
-  [0x7b5f] = "\x98\x44", [0x7b64] = "\xe9\xb5", [0x7b73] = "\xe9\xb7",
-  [0x7b7e] = "\x88\xbc", [0x7b81] = "\xe9\xb8", [0x7b82] = "\x95\xa9",
-  [0x7b83] = "\xe9\xb6", [0x7b86] = "\xe9\xb9", [0x7b87] = "\xe9\xba",
-  [0x7b8f] = "\xe9\xbb", [0x7b90] = "\xe9\xbc", [0x7b98] = "\xe9\xbd",
-  [0x7b9a] = "\x96\x8e", [0x7b9b] = "\x8e\x4c", [0x7b9d] = "\x8d\xf8",
-  [0x7b9e] = "\x91\x4e", [0x7ba4] = "\xe9\xbe", [0x7ba9] = "\xe9\xc1",
-  [0x7bb0] = "\xe9\xbf", [0x7bb6] = "\xe9\xc2", [0x7bb9] = "\x8c\xef",
-  [0x7bba] = "\xe9\xc0", [0x7bbf] = "\xe9\xc3", [0x7bc1] = "\xe9\xc4",
-  [0x7bc2] = "\xe9\xc5", [0x7bc4] = "\xe9\xc9", [0x7bc6] = "\x8e\x49",
-  [0x7bcb] = "\x91\xe2", [0x7bd1] = "\xe9\xca", [0x7bd2] = "\xe9\xc7",
-  [0x7bd3] = "\xe9\xc6", [0x7bd4] = "\xe9\xc8", [0x7bd8] = "\x8c\x7e",
-  [0x7be0] = "\xe9\xce", [0x7be1] = "\xe9\xcd", [0x7be2] = "\xe9\xcc",
-  [0x7be5] = "\x88\xb1", [0x7bf4] = "\xe9\xd8", [0x7bf6] = "\xe9\xd4",
-  [0x7bf8] = "\xe9\xd5", [0x7bf9] = "\xe9\xd1", [0x7bfa] = "\xe9\xd7",
-  [0x7bfc] = "\xe9\xd3", [0x7bfd] = "\x8a\x82", [0x7c00] = "\x98\x6b",
-  [0x7c02] = "\xe9\xd6", [0x7c03] = "\xe9\xd2", [0x7c04] = "\xe9\xd0",
-  [0x7c05] = "\xe9\xcf", [0x7c0b] = "\xe9\xda", [0x7c11] = "\xe9\xdd",
-  [0x7c14] = "\xe9\xdc", [0x7c15] = "\xe9\xdb", [0x7c1d] = "\x95\x68",
-  [0x7c1e] = "\xe9\xd9", [0x7c1f] = "\x88\xf1", [0x7c20] = "\xe9\xde",
-  [0x7c22] = "\xe9\xe0", [0x7c29] = "\x8a\x8f", [0x7c2a] = "\xe9\xcb",
-  [0x7c2b] = "\x89\x56", [0x7c2e] = "\xe9\xe2", [0x7c36] = "\xe9\xe1",
-  [0x7c37] = "\xe9\xdf", [0x7c38] = "\x92\x4c", [0x7c42] = "\x96\x90",
-  [0x7c47] = "\x97\xd8", [0x7c4a] = "\xe9\xe3", [0x7c50] = "\xe9\xe4",
-  [0x7c57] = "\xe9\xe5", [0x7c66] = "\xe9\xe6", [0x7c68] = "\xe9\xe7",
-  [0x7cd5] = "\x92\xb9", [0x7cd7] = "\xe9\xe8", [0x7cd9] = "\x94\xb5",
-  [0x7cdb] = "\xe9\xed", [0x7cdc] = "\xe9\xe9", [0x7ce0] = "\xe9\xea",
-  [0x7ce3] = "\x96\x50", [0x7ce4] = "\x96\xc2", [0x7ce6] = "\x93\xce",
-  [0x7cf3] = "\xe9\xee", [0x7cf6] = "\xe9\xef", [0x7cf7] = "\x93\xbc",
-  [0x7cf8] = "\xe9\xec", [0x7cf9] = "\xe9\xeb", [0x7cfe] = "\x89\xa8",
-  [0x7d02] = "\xe9\xf7", [0x7d05] = "\xe9\xf6", [0x7d0b] = "\x89\x95",
-  [0x7d0f] = "\xe9\xf4", [0x7d13] = "\xe9\xf3", [0x7d16] = "\xe9\xf1",
-  [0x7d18] = "\x8a\x9b", [0x7d1a] = "\xe9\xf0", [0x7d1b] = "\x8e\xb0",
-  [0x7d1c] = "\x89\xa7", [0x7d2b] = "\x8d\x83", [0x7d2e] = "\xe9\xfa",
-  [0x7d2f] = "\xe9\xf9", [0x7d31] = "\xe9\xf8", [0x7d34] = "\xe9\xf5",
-  [0x7d36] = "\xe9\xfb", [0x7d38] = "\xe9\xfc", [0x7d40] = "\xea\x44",
-  [0x7d41] = "\xea\x43", [0x7d49] = "\xea\x45", [0x7d4c] = "\x89\x4c",
-  [0x7d4d] = "\xea\x40", [0x7d4e] = "\xea\x41", [0x7d50] = "\x8d\x94",
-  [0x7d51] = "\x96\xb7", [0x7d54] = "\xea\x42", [0x7d5c] = "\x96\x51",
-  [0x7d5f] = "\xea\x4a", [0x7d62] = "\xea\x46", [0x7d6a] = "\xea\x4b",
-  [0x7d77] = "\xea\x48", [0x7d79] = "\xea\x47", [0x7d7f] = "\x8c\x7b",
-  [0x7d8a] = "\xea\x4c", [0x7d94] = "\xea\x4d", [0x7d99] = "\xea\x4e",
-  [0x7d9b] = "\xea\x49", [0x7d9f] = "\xe9\xf2", [0x7da2] = "\xea\x4f",
-  [0x7da4] = "\x92\xdf", [0x7da8] = "\xea\x53", [0x7daa] = "\xea\x54",
-  [0x7dab] = "\xea\x52", [0x7db1] = "\xea\x51", [0x7db2] = "\xea\x57",
-  [0x7db4] = "\xea\x50", [0x7db6] = "\xea\x55", [0x7dbf] = "\xea\x56",
-  [0x7dc3] = "\xea\x59", [0x7dc9] = "\xea\x58", [0x7dd6] = "\xea\x5b",
-  [0x7ddd] = "\xea\x5c", [0x7ddf] = "\xea\x5d", [0x7de2] = "\x98\x68",
-  [0x7de8] = "\xea\x5a", [0x7de9] = "\x91\xe9", [0x7dea] = "\x8d\xeb",
-  [0x7ded] = "\xea\x5e", [0x7e0a] = "\xea\x5f", [0x7e0b] = "\xea\x60",
-  [0x7e0e] = "\xea\x61", [0x7e65] = "\xea\x62", [0x7e68] = "\x8c\xb2",
-  [0x7e69] = "\xea\x63", [0x7e6d] = "\xea\x64", [0x7e6f] = "\x8e\xad",
-  [0x7e71] = "\xea\x65", [0x7e78] = "\xea\x66", [0x7e7b] = "\xea\x67",
-  [0x7e7c] = "\xea\x68", [0x7e81] = "\xea\x6b", [0x7e82] = "\xea\x69",
-  [0x7e83] = "\x98\x5b", [0x7e85] = "\xea\x6a", [0x7e87] = "\x97\xed",
-  [0x7e8d] = "\xea\x6c", [0x7e8f] = "\x97\xd9", [0x7e95] = "\xea\x6d",
-  [0x7e96] = "\x94\x9e", [0x7e99] = "\xea\x6e", [0x7e9a] = "\xea\x70",
-  [0x7e9d] = "\xea\x71", [0x7ea8] = "\xea\x6f", [0x7ea9] = "\x8d\x8d",
-  [0x7eaa] = "\x96\xcb", [0x7eab] = "\x96\x83", [0x7eac] = "\x9b\xf5",
-  [0x7eae] = "\x9f\x80", [0x7eaf] = "\x96\x9b", [0x7eb4] = "\x89\xa9",
-  [0x7ebc] = "\xea\x73", [0x7ebd] = "\x8b\x6f", [0x7ebe] = "\xea\x74",
-  [0x7ebf] = "\xea\x75", [0x7ec0] = "\xea\x76", [0x7ec2] = "\x8d\x95",
-  [0x7ec4] = "\xea\x77", [0x7ec8] = "\xe0\xd2", [0x7ec9] = "\x96\xd9",
-  [0x7ecb] = "\x91\xe1", [0x7ecc] = "\xea\x78", [0x7ecd] = "\xea\x7a",
-  [0x7ece] = "\xea\x79", [0x7ed0] = "\xea\x7b", [0x7ed5] = "\xea\x7c",
-  [0x7ed8] = "\xea\x7d", [0x7edf] = "\xea\x7e", [0x7ee4] = "\xea\x80",
-  [0x7ee6] = "\xea\x81", [0x7ee7] = "\xea\x82", [0x7ee9] = "\xea\x83",
-  [0x7eeb] = "\xea\x84", [0x7eec] = "\xea\x85", [0x7eed] = "\xea\x86",
-  [0x7ef7] = "\xea\x87", [0x7ef8] = "\xea\x88", [0x7efe] = "\x93\x43",
-  [0x7f03] = "\x8c\xdb", [0x7f05] = "\xea\x8a", [0x7f10] = "\x91\x6c",
-  [0x7f11] = "\xea\x8b", [0x7f1c] = "\xea\x8c", [0x7f2b] = "\x95\x40",
-  [0x7f2e] = "\xea\x8d", [0x7f3a] = "\xea\x8e", [0x7f3b] = "\xe2\x56",
-  [0x7f3e] = "\xe6\xd8", [0x7f3f] = "\xe8\xeb", [0x7f42] = "\xea\x8f",
-  [0x7f44] = "\xea\x90", [0x7f4f] = "\xea\x92", [0x7f50] = "\xea\x93",
-  [0x7f51] = "\xea\x94", [0x7f52] = "\x97\xee", [0x7f53] = "\xea\x91",
-  [0x7f56] = "\xea\x95", [0x7f57] = "\xea\x96", [0x7f5a] = "\xea\x98",
-  [0x7f5c] = "\xea\x97", [0x7f62] = "\xea\x9a", [0x7f66] = "\xea\x9b",
-  [0x7f67] = "\xea\x99", [0x7f7d] = "\x97\xb4", [0x7f85] = "\xea\x9c",
-  [0x7f8c] = "\xea\x9d", [0x7f8d] = "\xe2\x73", [0x7f90] = "\xea\x9e"
-};
-
-static const char from_ucs4_extra[0x100][2] =
-{
-  [0x0001] = "\x81\x49", [0x0003] = "\x81\x94", [0x0004] = "\x81\x90",
-  [0x0005] = "\x81\x93", [0x0006] = "\x81\x95", [0x0008] = "\x81\x69",
-  [0x0009] = "\x81\x6a", [0x000a] = "\x81\x96", [0x000b] = "\x81\x7b",
-  [0x000c] = "\x81\x43", [0x000e] = "\x81\x44", [0x000f] = "\x81\x5e",
-  [0x0010] = "\x82\x4f", [0x0011] = "\x82\x50", [0x0012] = "\x82\x51",
-  [0x0013] = "\x82\x52", [0x0014] = "\x82\x53", [0x0015] = "\x82\x54",
-  [0x0016] = "\x82\x55", [0x0017] = "\x82\x56", [0x0018] = "\x82\x57",
-  [0x0019] = "\x82\x58", [0x001a] = "\x81\x46", [0x001b] = "\x81\x47",
-  [0x001c] = "\x81\x83", [0x001d] = "\x81\x81", [0x001e] = "\x81\x84",
-  [0x001f] = "\x81\x48", [0x0020] = "\x81\x97", [0x0021] = "\x82\x60",
-  [0x0022] = "\x82\x61", [0x0023] = "\x82\x62", [0x0024] = "\x82\x63",
-  [0x0025] = "\x82\x64", [0x0026] = "\x82\x65", [0x0027] = "\x82\x66",
-  [0x0028] = "\x82\x67", [0x0029] = "\x82\x68", [0x002a] = "\x82\x69",
-  [0x002b] = "\x82\x6a", [0x002c] = "\x82\x6b", [0x002d] = "\x82\x6c",
-  [0x002e] = "\x82\x6d", [0x002f] = "\x82\x6e", [0x0030] = "\x82\x6f",
-  [0x0031] = "\x82\x70", [0x0032] = "\x82\x71", [0x0033] = "\x82\x72",
-  [0x0034] = "\x82\x73", [0x0035] = "\x82\x74", [0x0036] = "\x82\x75",
-  [0x0037] = "\x82\x76", [0x0038] = "\x82\x77", [0x0039] = "\x82\x78",
-  [0x003a] = "\x82\x79", [0x003b] = "\x81\x6d", [0x003c] = "\x81\x5f",
-  [0x003d] = "\x81\x6e", [0x003e] = "\x81\x4f", [0x003f] = "\x81\x51",
-  [0x0040] = "\x81\x4d", [0x0041] = "\x82\x81", [0x0042] = "\x82\x82",
-  [0x0043] = "\x82\x83", [0x0044] = "\x82\x84", [0x0045] = "\x82\x85",
-  [0x0046] = "\x82\x86", [0x0047] = "\x82\x87", [0x0048] = "\x82\x88",
-  [0x0049] = "\x82\x89", [0x004a] = "\x82\x8a", [0x004b] = "\x82\x8b",
-  [0x004c] = "\x82\x8c", [0x004d] = "\x82\x8d", [0x004e] = "\x82\x8e",
-  [0x004f] = "\x82\x8f", [0x0050] = "\x82\x90", [0x0051] = "\x82\x91",
-  [0x0052] = "\x82\x92", [0x0053] = "\x82\x93", [0x0054] = "\x82\x94",
-  [0x0055] = "\x82\x95", [0x0056] = "\x82\x96", [0x0057] = "\x82\x97",
-  [0x0058] = "\x82\x98", [0x0059] = "\x82\x99", [0x005a] = "\x82\x9a",
-  [0x005b] = "\x81\x6f", [0x005c] = "\x81\x62", [0x005d] = "\x81\x70",
-  [0x005e] = "\x00\x00", [0x005f] = "\x00\x00",
-  [0x0060] = "\x00\x00", [0x0061] = "\xa1\x00", [0x0062] = "\xa2\x00",
-  [0x0063] = "\xa3\x00", [0x0064] = "\xa4\x00", [0x0065] = "\xa5\x00",
-  [0x0066] = "\xa6\x00", [0x0067] = "\xa7\x00", [0x0068] = "\xa8\x00",
-  [0x0069] = "\xa9\x00", [0x006a] = "\xaa\x00", [0x006b] = "\xab\x00",
-  [0x006c] = "\xac\x00", [0x006d] = "\xad\x00", [0x006e] = "\xae\x00",
-  [0x006f] = "\xaf\x00", [0x0070] = "\xb0\x00", [0x0071] = "\xb1\x00",
-  [0x0072] = "\xb2\x00", [0x0073] = "\xb3\x00", [0x0074] = "\xb4\x00",
-  [0x0075] = "\xb5\x00", [0x0076] = "\xb6\x00", [0x0077] = "\xb7\x00",
-  [0x0078] = "\xb8\x00", [0x0079] = "\xb9\x00", [0x007a] = "\xba\x00",
-  [0x007b] = "\xbb\x00", [0x007c] = "\xbc\x00", [0x007d] = "\xbd\x00",
-  [0x007e] = "\xbe\x00", [0x007f] = "\xbf\x00", [0x0080] = "\xc0\x00",
-  [0x0081] = "\xc1\x00", [0x0082] = "\xc2\x00", [0x0083] = "\xc3\x00",
-  [0x0084] = "\xc4\x00", [0x0085] = "\xc5\x00", [0x0086] = "\xc6\x00",
-  [0x0087] = "\xc7\x00", [0x0088] = "\xc8\x00", [0x0089] = "\xc9\x00",
-  [0x008a] = "\xca\x00", [0x008b] = "\xcb\x00", [0x008c] = "\xcc\x00",
-  [0x008d] = "\xcd\x00", [0x008e] = "\xce\x00", [0x008f] = "\xcf\x00",
-  [0x0090] = "\xd0\x00", [0x0091] = "\xd1\x00", [0x0092] = "\xd2\x00",
-  [0x0093] = "\xd3\x00", [0x0094] = "\xd4\x00", [0x0095] = "\xd5\x00",
-  [0x0096] = "\xd6\x00", [0x0097] = "\xd7\x00", [0x0098] = "\xd8\x00",
-  [0x0099] = "\xd9\x00", [0x009a] = "\xda\x00", [0x009b] = "\xdb\x00",
-  [0x009c] = "\xdc\x00", [0x009d] = "\xdd\x00", [0x009e] = "\xde\x00",
-  [0x009f] = "\xdf\x00",
-  [0x00e0] = "\x81\x91", [0x00e1] = "\x81\x92", [0x00e2] = "\x81\xCA",
-  [0x00e3] = "\x81\x50", [0x00e5] = "\x81\x8f"
-};
-
-/* Definitions used in the body of the `gconv' function.  */
-#define CHARSET_NAME		"SJIS//"
-#define FROM_LOOP		from_sjis
-#define TO_LOOP			to_sjis
-#define DEFINE_INIT		1
-#define DEFINE_FINI		1
-#define MIN_NEEDED_FROM		1
-#define MAX_NEEDED_FROM		2
-#define MIN_NEEDED_TO		4
-
-/* First define the conversion function from SJIS to UCS4.  */
-#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
-#define MAX_NEEDED_INPUT	MAX_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
-#define LOOPFCT			FROM_LOOP
-#define BODY \
-  {									      \
-    uint32_t ch = *inptr;						      \
-									      \
-    if (__builtin_expect (ch, 0) == 0x5c)				      \
-      {									      \
-	ch = 0xa5;							      \
-	++inptr;							      \
-      }									      \
-    else if (__builtin_expect (ch, 0) == 0x7e)				      \
-      {									      \
-	ch = 0x203e;							      \
-	++inptr;							      \
-      }									      \
-    else if (ch < 0x80)							      \
-      ++inptr;								      \
-    else if (ch >= 0xa1 && ch <= 0xdf)					      \
-      {									      \
-	ch = halfkana_to_ucs4[ch - 0xa1];				      \
-	++inptr;							      \
-      }									      \
-    else if (__builtin_expect (ch > 0xea, 0)				      \
-	     || __builtin_expect (ch, 0) == 0xa0			      \
-	     || __builtin_expect (ch <= 0x80, 0))			      \
-      {									      \
-	/* These are illegal.  */					      \
-	if (! ignore_errors_p ())					      \
-	  {								      \
-	    /* This is an illegal character.  */			      \
-	    result = __GCONV_ILLEGAL_INPUT;				      \
-	    break;							      \
-	  }								      \
-									      \
-	++inptr;							      \
-	++*irreversible;						      \
-	continue;							      \
-      }									      \
-    else								      \
-      {									      \
-	/* Two-byte character.  First test whether the next character	      \
-	   is also available.  */					      \
-	uint32_t ch2;							      \
-	uint_fast32_t idx;						      \
-									      \
-	if (__builtin_expect (inptr + 1 >= inend, 0))			      \
-	  {								      \
-	    /* The second character is not available.  Store		      \
-	       the intermediate result.  */				      \
-	    result = __GCONV_INCOMPLETE_INPUT;				      \
-	    break;							      \
-	  }								      \
-									      \
-	ch2 = inptr[1];							      \
-	idx = ch * 256 + ch2;						      \
-	if (__builtin_expect (ch2 < 0x40, 0)				      \
-	    || (__builtin_expect (idx > 0x84be, 0) && idx < 0x889f)      \
-	    || (__builtin_expect (idx > 0x88fc, 0) && idx < 0x8940)      \
-	    || (__builtin_expect (idx > 0x9ffc, 0) && idx < 0xe040)      \
-	    || __builtin_expect (idx > 0xeaa4, 0))			      \
-	  {								      \
-	    /* This is illegal.  */					      \
-	    if (! ignore_errors_p ())					      \
-	      {								      \
-	        /* This is an illegal character.  */			      \
-	        result = __GCONV_ILLEGAL_INPUT;				      \
-	        break;							      \
-	      }								      \
-									      \
-	    ++inptr;							      \
-	    ++*irreversible;						      \
-	    continue;							      \
-	  }								      \
-	else								      \
-	  {								      \
-	    /* We could pack the data a bit more dense.  The second	      \
-	       byte will never be 0x7f and it will also be never	      \
-	       >0xfc.  But this would mean yet more `if's.  */		      \
-	    if (idx <= 0x84be)						      \
-	      ch = cjk_block1[(ch - 0x81) * 192 + ch2 - 0x40];		      \
-	    else if (idx <= 0x88fc)					      \
-	      ch = cjk_block2[(ch - 0x88) * 192 + ch2 - 0x9f];		      \
-	    else if (idx <= 0x9ffc)					      \
-	      ch = cjk_block3[(ch - 0x89) * 192 + ch2 - 0x40];		      \
-	    else							      \
-	      ch = cjk_block4[(ch - 0xe0) * 192 + ch2 - 0x40];		      \
-									      \
-	    inptr += 2;							      \
-	  }								      \
-									      \
-	if (__builtin_expect (ch, 1) == 0)				      \
-	  {								      \
-	    /* This is an illegal character.  */			      \
-	    if (! ignore_errors_p ())					      \
-	      {								      \
-	        /* This is an illegal character.  */			      \
-	        result = __GCONV_ILLEGAL_INPUT;				      \
-	        break;							      \
-	      }								      \
-									      \
-	    inptr += 2;							      \
-	    ++*irreversible;						      \
-	    continue;							      \
-	  }								      \
-      }									      \
-									      \
-    put32 (outptr, ch);							      \
-    outptr += 4;							      \
-  }
-#define LOOP_NEED_FLAGS
-#include <iconv/loop.c>
-
-
-/* Next, define the other direction.  */
-#define MIN_NEEDED_INPUT	MIN_NEEDED_TO
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_FROM
-#define MAX_NEEDED_OUTPUT	MAX_NEEDED_FROM
-#define LOOPFCT			TO_LOOP
-#define BODY \
-  {									      \
-    uint32_t ch = get32 (inptr);					      \
-    const char *cp;							      \
-									      \
-    if (ch >= (sizeof (from_ucs4_lat1) / sizeof (from_ucs4_lat1[0])))	      \
-      {									      \
-	if (ch >= 0x0391 && ch <= 0x0451)				      \
-	  cp = from_ucs4_greek[ch - 0x391];				      \
-	else if (ch >= 0x2010 && ch <= 0x9fa0)				      \
-	  cp = from_ucs4_cjk[ch - 0x02010];				      \
-	else if (__builtin_expect (ch >= 0xff01, 1)			      \
-		 && __builtin_expect (ch <= 0xffef, 1))			      \
-	  cp = from_ucs4_extra[ch - 0xff00];				      \
-	else								      \
-	  {								      \
-	    UNICODE_TAG_HANDLER (ch, 4);				      \
-	    /* Illegal character.  */					      \
-	    cp = "";							      \
-	  }								      \
-      }									      \
-    else								      \
-      cp = from_ucs4_lat1[ch];						      \
-									      \
-    if (__builtin_expect (cp[0], '\1') == '\0' && ch != 0)		      \
-      {									      \
-	/* Illegal character.  */					      \
-	STANDARD_ERR_HANDLER (4);					      \
-      }									      \
-    else								      \
-      {									      \
-	*outptr = cp[0];						      \
-	/* Now test for a possible second byte and write this if possible.  */\
-	if (cp[1] != '\0')						      \
-	  {								      \
-	    if (__builtin_expect (outptr + 1 >= outend, 0))		      \
-	      {								      \
-		/* The result does not fit into the buffer.  */		      \
-		result = __GCONV_FULL_OUTPUT;				      \
-		break;							      \
-	      }								      \
-	    *++outptr = cp[1];						      \
-	  }								      \
-	++outptr;							      \
-      }									      \
-									      \
-    inptr += 4;								      \
-  }
-#define LOOP_NEED_FLAGS
-#include <iconv/loop.c>
-
-
-/* Now define the toplevel functions.  */
-#include <iconv/skeleton.c>
diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am
index feba1b1..0937818 100644
--- a/newlib/libc/Makefile.am
+++ b/newlib/libc/Makefile.am
@@ -18,70 +18,49 @@ if HAVE_UNIX_DIR
 UNIX_SUBDIR = unix
 endif
 
-if HAVE_STDIO64_DIR
-STDIO64_SUBDIR = stdio64
-endif
-
-if ENABLE_NEWLIB_ICONV
-NEWLIB_ICONV_DIRS = iconv
-NEWLIB_ICONV_LIBS = iconv/ces/lib.$(aext) iconv/ccs/lib.$(aext) iconv/lib/lib.$(aext)
-else
-NEWLIB_ICONV_DIRS =
-NEWLIB_ICONV_LIBS =
-endif
-
 # The order of SUBDIRS is important for the integrated documentation.
 # Do not change the order without considering the doc impact.
-SUBDIRS = argz stdlib ctype search stdio $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale sys reent \
-	$(extra_dir) errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) .
+SUBDIRS = stdlib ctype stdio string $(SIGNAL_SUBDIR) time locale sys reent \
+	errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) .
 
 noinst_DATA = $(CRT0)
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libc.la
 SUBLIBS = \
-	argz/libargz.$(aext) \
 	stdlib/libstdlib.$(aext) \
 	ctype/libctype.$(aext) \
-	search/libsearch.$(aext) \
 	stdio/libstdio.$(aext) \
-	$(LIBC_STDIO64_LIB) \
 	string/libstring.$(aext) \
 	$(LIBC_SIGNAL_LIB) \
 	time/libtime.$(aext) \
 	locale/liblocale.$(aext) \
+	$(LIBC_SYS_LIB) \
 	reent/libreent.$(aext) \
-	$(LIBC_EXTRA_LIB) \
 	errno/liberrno.$(aext) \
 	misc/libmisc.$(aext) \
+	$(LIBC_MACHINE_LIB) \
 	$(LIBC_UNIX_LIB) \
 	$(LIBC_POSIX_LIB) \
-	$(LIBC_SYSCALL_LIB) \
-	$(LIBC_MACHINE_LIB) \
-	$(LIBC_SYS_LIB)
+	$(LIBC_SYSCALL_LIB)
 else
 noinst_LIBRARIES = libc.a
 SUBLIBS = \
-	argz/lib.$(aext) \
 	stdlib/lib.$(aext) \
 	ctype/lib.$(aext) \
-	search/lib.$(aext) \
 	stdio/lib.$(aext) \
-	$(LIBC_STDIO64_LIB) \
 	string/lib.$(aext) \
 	$(LIBC_SIGNAL_LIB) \
 	time/lib.$(aext) \
 	locale/lib.$(aext) \
+	$(LIBC_SYS_LIB) \
 	reent/lib.$(aext) \
-	$(LIBC_EXTRA_LIB) \
 	errno/lib.$(aext) \
 	misc/lib.$(aext) \
+	$(LIBC_MACHINE_LIB) \
 	$(LIBC_UNIX_LIB) \
 	$(LIBC_POSIX_LIB) \
-	$(LIBC_SYSCALL_LIB) \
-        $(NEWLIB_ICONV_LIBS) \
-	$(LIBC_MACHINE_LIB) \
-	$(LIBC_SYS_LIB)
+	$(LIBC_SYSCALL_LIB)
 endif
 
 libc_la_LDFLAGS = -Xcompiler -nostdlib
@@ -89,7 +68,6 @@ libc_la_LDFLAGS = -Xcompiler -nostdlib
 if USE_LIBTOOL
 libc_la_SOURCES =
 libc_la_LIBADD = $(SUBLIBS)
-libc_la_DEPENDENCIES = $(SUBLIBS)
 else
 libc.a: $(SUBLIBS)
 	rm -f $@
@@ -122,20 +100,14 @@ SUBDEFS = \
 	stdlib/stmp-def \
 	ctype/stmp-def \
 	stdio/stmp-def \
-	$(LIBC_STDIO64_DEF) \
 	string/stmp-def \
 	$(LIBC_SIGNAL_DEF) \
 	time/stmp-def \
 	locale/stmp-def \
 	reent/stmp-def \
-	$(LIBC_EXTRA_DEF) \
 	misc/stmp-def
 
-libc.info: sigset.texi extra.texi stdio64.texi iconvset.texi \
-	targetdep.tex $(SUBDEFS)
-
-libc.dvi: sigset.texi extra.texi stdio64.texi iconvset.texi \
-	targetdep.tex $(SUBDEFS)
+libc.info: sigset.texi targetdep.tex $(SUBDEFS)
 
 stmp-sigset: config.status
 	if test -n "$(LIBC_SIGNAL_LIB)"; then \
@@ -148,39 +120,6 @@ stmp-sigset: config.status
 
 sigset.texi: stmp-sigset ; @true
 
-stmp-iconvset: config.status
-	if test -n "$(NEWLIB_ICONV_LIBS)"; then \
-	  echo "@set ICONV" >tmp.texi; \
-	else \
-	  echo "@clear ICONV" >tmp.texi; \
-	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp.texi iconvset.texi
-	touch $@
-
-iconvset.texi: stmp-iconvset ; @true
-
-stmp-extra: config.status
-	if test -n "$(LIBC_EXTRA_LIB)"; then \
-	  echo "@set EXTRA" >tmp.texi; \
-	else \
-	  echo "@clear EXTRA" >tmp.texi; \
-	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp.texi extra.texi
-	touch $@
-
-extra.texi: stmp-extra ; @true
-
-stmp-stdio64: config.status
-	if test -n "$(LIBC_STDIO64_LIB)"; then \
-	  echo "@set STDIO64" >tmp.texi; \
-	else \
-	  echo "@clear STDIO64" >tmp.texi; \
-	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp.texi stdio64.texi
-	touch $@
-
-stdio64.texi: stmp-stdio64 ; @true
-
 stmp-targetdep: force
 	rm -f tmp.texi
 	targetdoc=`pwd`/tmp.texi; \
@@ -201,8 +140,7 @@ $(SUBDEFS): stmp-targetdep ; @true
 force:
 
 CLEANFILES = $(CRT0) \
-	sigset.texi stmp-sigset extra.texi stmp-extra \
-	stdio64.texi stmp-stdio64 tmp.texi targetdep.tex stmp-targetdep
+	sigset.texi stmp-sigset tmp.texi targetdep.tex stmp-targetdep
 
 ACLOCAL_AMFLAGS = -I ..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in
index f94585c..52c512f 100644
--- a/newlib/libc/Makefile.in
+++ b/newlib/libc/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,32 +57,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -92,13 +80,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -107,37 +92,61 @@ sys_dir = @sys_dir@
 
 AUTOMAKE_OPTIONS = cygnus
 
-@HAVE_POSIX_DIR_TRUE@POSIX_SUBDIR = posix
+@HAVE_POSIX_DIR_TRUE@POSIX_SUBDIR = @HAVE_POSIX_DIR_TRUE@posix
 
-@HAVE_SIGNAL_DIR_TRUE@SIGNAL_SUBDIR = signal
+@HAVE_SIGNAL_DIR_TRUE@SIGNAL_SUBDIR = @HAVE_SIGNAL_DIR_TRUE@signal
 
-@HAVE_SYSCALL_DIR_TRUE@SYSCALLS_SUBDIR = syscalls
+@HAVE_SYSCALL_DIR_TRUE@SYSCALLS_SUBDIR = @HAVE_SYSCALL_DIR_TRUE@syscalls
 
-@HAVE_UNIX_DIR_TRUE@UNIX_SUBDIR = unix
-
-@HAVE_STDIO64_DIR_TRUE@STDIO64_SUBDIR = stdio64
-@ENABLE_NEWLIB_ICONV_TRUE@NEWLIB_ICONV_DIRS = iconv
-@ENABLE_NEWLIB_ICONV_FALSE@NEWLIB_ICONV_DIRS = 
-@ENABLE_NEWLIB_ICONV_TRUE@NEWLIB_ICONV_LIBS = iconv/ces/lib.$(aext) iconv/ccs/lib.$(aext) iconv/lib/lib.$(aext)
-@ENABLE_NEWLIB_ICONV_FALSE@NEWLIB_ICONV_LIBS = 
+@HAVE_UNIX_DIR_TRUE@UNIX_SUBDIR = @HAVE_UNIX_DIR_TRUE@unix
 
 # The order of SUBDIRS is important for the integrated documentation.
 # Do not change the order without considering the doc impact.
-SUBDIRS = argz stdlib ctype search stdio $(STDIO64_SUBDIR) string $(SIGNAL_SUBDIR) time locale sys reent 	$(extra_dir) errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) $(NEWLIB_ICONV_DIRS) .
+SUBDIRS = stdlib ctype stdio string $(SIGNAL_SUBDIR) time locale sys reent \
+	errno misc machine $(UNIX_SUBDIR) $(POSIX_SUBDIR) $(SYSCALLS_SUBDIR) .
 
 
 noinst_DATA = $(CRT0)
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libc.la
-@USE_LIBTOOL_TRUE@SUBLIBS = 	argz/libargz.$(aext) 	stdlib/libstdlib.$(aext) 	ctype/libctype.$(aext) 	search/libsearch.$(aext) 	stdio/libstdio.$(aext) 	$(LIBC_STDIO64_LIB) 	string/libstring.$(aext) 	$(LIBC_SIGNAL_LIB) 	time/libtime.$(aext) 	locale/liblocale.$(aext) 	reent/libreent.$(aext) 	$(LIBC_EXTRA_LIB) 	errno/liberrno.$(aext) 	misc/libmisc.$(aext) 	$(LIBC_UNIX_LIB) 	$(LIBC_POSIX_LIB) 	$(LIBC_SYSCALL_LIB) 	$(LIBC_MACHINE_LIB) 	$(LIBC_SYS_LIB)
-@USE_LIBTOOL_FALSE@SUBLIBS = 	argz/lib.$(aext) 	stdlib/lib.$(aext) 	ctype/lib.$(aext) 	search/lib.$(aext) 	stdio/lib.$(aext) 	$(LIBC_STDIO64_LIB) 	string/lib.$(aext) 	$(LIBC_SIGNAL_LIB) 	time/lib.$(aext) 	locale/lib.$(aext) 	reent/lib.$(aext) 	$(LIBC_EXTRA_LIB) 	errno/lib.$(aext) 	misc/lib.$(aext) 	$(LIBC_UNIX_LIB) 	$(LIBC_POSIX_LIB) 	$(LIBC_SYSCALL_LIB)         $(NEWLIB_ICONV_LIBS) 	$(LIBC_MACHINE_LIB) 	$(LIBC_SYS_LIB)
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = libc.a
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libc.la
+@USE_LIBTOOL_TRUE@SUBLIBS = @USE_LIBTOOL_TRUE@\
+@USE_LIBTOOL_TRUE@	stdlib/libstdlib.$(aext) \
+@USE_LIBTOOL_TRUE@	ctype/libctype.$(aext) \
+@USE_LIBTOOL_TRUE@	stdio/libstdio.$(aext) \
+@USE_LIBTOOL_TRUE@	string/libstring.$(aext) \
+@USE_LIBTOOL_TRUE@	$(LIBC_SIGNAL_LIB) \
+@USE_LIBTOOL_TRUE@	time/libtime.$(aext) \
+@USE_LIBTOOL_TRUE@	locale/liblocale.$(aext) \
+@USE_LIBTOOL_TRUE@	$(LIBC_SYS_LIB) \
+@USE_LIBTOOL_TRUE@	reent/libreent.$(aext) \
+@USE_LIBTOOL_TRUE@	errno/liberrno.$(aext) \
+@USE_LIBTOOL_TRUE@	misc/libmisc.$(aext) \
+@USE_LIBTOOL_TRUE@	$(LIBC_MACHINE_LIB) \
+@USE_LIBTOOL_TRUE@	$(LIBC_UNIX_LIB) \
+@USE_LIBTOOL_TRUE@	$(LIBC_POSIX_LIB) \
+@USE_LIBTOOL_TRUE@	$(LIBC_SYSCALL_LIB)
+@USE_LIBTOOL_FALSE@SUBLIBS = @USE_LIBTOOL_FALSE@\
+@USE_LIBTOOL_FALSE@	stdlib/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	ctype/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	stdio/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	string/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	$(LIBC_SIGNAL_LIB) \
+@USE_LIBTOOL_FALSE@	time/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	locale/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	$(LIBC_SYS_LIB) \
+@USE_LIBTOOL_FALSE@	reent/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	errno/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	misc/lib.$(aext) \
+@USE_LIBTOOL_FALSE@	$(LIBC_MACHINE_LIB) \
+@USE_LIBTOOL_FALSE@	$(LIBC_UNIX_LIB) \
+@USE_LIBTOOL_FALSE@	$(LIBC_POSIX_LIB) \
+@USE_LIBTOOL_FALSE@	$(LIBC_SYSCALL_LIB)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@libc.a
 
 libc_la_LDFLAGS = -Xcompiler -nostdlib
 
 @USE_LIBTOOL_TRUE@libc_la_SOURCES = 
-@USE_LIBTOOL_TRUE@libc_la_LIBADD = $(SUBLIBS)
-@USE_LIBTOOL_TRUE@libc_la_DEPENDENCIES = $(SUBLIBS)
+@USE_LIBTOOL_TRUE@libc_la_LIBADD = @USE_LIBTOOL_TRUE@$(SUBLIBS)
 
 info_TEXINFOS = libc.texinfo
 
@@ -145,10 +154,20 @@ info_TEXINFOS = libc.texinfo
 # builds .def files.  We don't list subdirectories which don't build
 # .def files; if the list of subdirectories changes, we must change
 # this as well.
-SUBDEFS =  	stdlib/stmp-def 	ctype/stmp-def 	stdio/stmp-def 	$(LIBC_STDIO64_DEF) 	string/stmp-def 	$(LIBC_SIGNAL_DEF) 	time/stmp-def 	locale/stmp-def 	reent/stmp-def 	$(LIBC_EXTRA_DEF) 	misc/stmp-def
+SUBDEFS = \
+	stdlib/stmp-def \
+	ctype/stmp-def \
+	stdio/stmp-def \
+	string/stmp-def \
+	$(LIBC_SIGNAL_DEF) \
+	time/stmp-def \
+	locale/stmp-def \
+	reent/stmp-def \
+	misc/stmp-def
 
 
-CLEANFILES = $(CRT0) 	sigset.texi stmp-sigset extra.texi stmp-extra 	stdio64.texi stmp-stdio64 tmp.texi targetdep.tex stmp-targetdep
+CLEANFILES = $(CRT0) \
+	sigset.texi stmp-sigset tmp.texi targetdep.tex stmp-targetdep
 
 
 ACLOCAL_AMFLAGS = -I ..
@@ -164,9 +183,14 @@ CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 libc_a_LIBADD = 
 libc_a_SOURCES = libc.a.c
-libc_a_OBJECTS =  libc.a.$(OBJEXT)
+libc_a_OBJECTS =  libc.a.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
+@USE_LIBTOOL_TRUE@libc_la_DEPENDENCIES =  stdlib/libstdlib.$(aext) \
+@USE_LIBTOOL_TRUE@ctype/libctype.$(aext) stdio/libstdio.$(aext) \
+@USE_LIBTOOL_TRUE@string/libstring.$(aext) time/libtime.$(aext) \
+@USE_LIBTOOL_TRUE@locale/liblocale.$(aext) reent/libreent.$(aext) \
+@USE_LIBTOOL_TRUE@errno/liberrno.$(aext) misc/libmisc.$(aext)
 @USE_LIBTOOL_TRUE@libc_la_OBJECTS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -187,15 +211,14 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
-DIST_SUBDIRS =  argz stdlib ctype search stdio stdio64 string signal \
-time locale sys reent @extra_dir@ errno misc machine unix posix \
-syscalls iconv .
+DIST_SUBDIRS =  stdlib ctype stdio string signal time locale sys reent \
+errno misc machine unix posix syscalls .
 SOURCES = libc.a.c $(libc_la_SOURCES)
-OBJECTS = libc.a.$(OBJEXT) $(libc_la_OBJECTS)
+OBJECTS = libc.a.o $(libc_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .dvi .info .lo .o .obj .ps .s .texi .texinfo .txi
+.SUFFIXES: .S .c .dvi .info .lo .o .ps .s .texi .texinfo .txi
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
 
@@ -204,7 +227,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  ../acinclude.m4 \
-		../aclocal.m4 ../libtool.m4
+		../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -224,11 +247,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -237,7 +255,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -350,7 +367,7 @@ uninstall-info:
 	else ii=; fi; \
 	list='$(INFO_DEPS)'; \
 	for file in $$list; do \
-	  test -z "$$ii" \
+	  test -z "$ii" \
 	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
 	done
 	@$(NORMAL_UNINSTALL)
@@ -424,7 +441,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
+	  test "$$subdir" = "." && dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -649,11 +666,7 @@ crt0.o: sys/crt0.o
 
 sys/crt0.o: ; @true
 
-libc.info: sigset.texi extra.texi stdio64.texi iconvset.texi \
-	targetdep.tex $(SUBDEFS)
-
-libc.dvi: sigset.texi extra.texi stdio64.texi iconvset.texi \
-	targetdep.tex $(SUBDEFS)
+libc.info: sigset.texi targetdep.tex $(SUBDEFS)
 
 stmp-sigset: config.status
 	if test -n "$(LIBC_SIGNAL_LIB)"; then \
@@ -666,39 +679,6 @@ stmp-sigset: config.status
 
 sigset.texi: stmp-sigset ; @true
 
-stmp-iconvset: config.status
-	if test -n "$(NEWLIB_ICONV_LIBS)"; then \
-	  echo "@set ICONV" >tmp.texi; \
-	else \
-	  echo "@clear ICONV" >tmp.texi; \
-	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp.texi iconvset.texi
-	touch $@
-
-iconvset.texi: stmp-iconvset ; @true
-
-stmp-extra: config.status
-	if test -n "$(LIBC_EXTRA_LIB)"; then \
-	  echo "@set EXTRA" >tmp.texi; \
-	else \
-	  echo "@clear EXTRA" >tmp.texi; \
-	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp.texi extra.texi
-	touch $@
-
-extra.texi: stmp-extra ; @true
-
-stmp-stdio64: config.status
-	if test -n "$(LIBC_STDIO64_LIB)"; then \
-	  echo "@set STDIO64" >tmp.texi; \
-	else \
-	  echo "@clear STDIO64" >tmp.texi; \
-	fi
-	$(SHELL) $(newlib_basedir)/../move-if-change tmp.texi stdio64.texi
-	touch $@
-
-stdio64.texi: stmp-stdio64 ; @true
-
 stmp-targetdep: force
 	rm -f tmp.texi
 	targetdoc=`pwd`/tmp.texi; \
diff --git a/newlib/libc/aclocal.m4 b/newlib/libc/aclocal.m4
index 35519ac..a5208f1 100644
--- a/newlib/libc/aclocal.m4
+++ b/newlib/libc/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,60 +284,41 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
 
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
+
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
 # Save cache, so that ltconfig can load it
 AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
 AC_CACHE_LOAD
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -431,43 +329,27 @@ AC_SUBST(LIBTOOL)dnl
 exec 5>>./config.log
 ])
 
-AC_DEFUN([AC_LIBTOOL_SETUP],
+AC_DEFUN(AC_LIBTOOL_SETUP,
 [AC_PREREQ(2.13)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 AC_REQUIRE([AC_PROG_NM])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
 [libtool_flags="$libtool_flags --enable-dlopen"])
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
@@ -477,20 +359,14 @@ AC_ARG_ENABLE(libtool-lock,
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -505,31 +381,12 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -537,56 +394,33 @@ ia64-*-hpux*)
   ;;
 
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+[*-*-cygwin* | *-*-mingw*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  ])
+])
 esac
 ])
 
 # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
 
 # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
 
 # AC_ENABLE_SHARED - implement the --enable-shared flag
 # Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
 <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -605,21 +439,21 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
 # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)])
 
 # AC_ENABLE_STATIC - implement the --enable-static flag
 # Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
 <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -638,8 +472,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])
 
 # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_STATIC(no)])
 
 
@@ -647,14 +480,14 @@ AC_ENABLE_STATIC(no)])
 # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(fast-install,
 changequote(<<, >>)dnl
 <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -672,98 +505,12 @@ esac],
 enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_FAST_INSTALL(no)])
 
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
 # AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -771,20 +518,16 @@ AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
+changequote(,)dnl
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
@@ -806,17 +549,17 @@ elif test "$with_gnu_ld" = yes; then
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL(lt_cv_path_LD,
+AC_CACHE_VAL(ac_cv_path_LD,
 [if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -825,9 +568,9 @@ AC_CACHE_VAL(lt_cv_path_LD,
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -837,240 +580,56 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_PROG_LD_GNU
 ])
 
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
 ])
 
-
 # AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
+AC_CACHE_VAL(ac_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi])
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
 ])
 
 # AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
+AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
+case "$host" in
+*-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
@@ -1084,39 +643,33 @@ esac
 ])
 
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case "$enable_ltdl_convenience" in
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   AC_CHECK_LIB(ltdl, main,
   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
   [if test x"$enable_ltdl_install" = xno; then
@@ -1127,8 +680,8 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
@@ -1136,91 +689,15 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   fi
 ])
 
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
 dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
 
 dnl This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])dnl
 
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libc/argz/Makefile.am b/newlib/libc/argz/Makefile.am
deleted file mode 100644
index bbc82fc..0000000
--- a/newlib/libc/argz/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-## All functions in this directory are EL/IX level 2 and above
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-LIB_OBJS = \
-	argz_add.$(oext) \
-	argz_add_sep.$(oext) \
-	argz_append.$(oext) \
-	argz_count.$(oext) \
-	argz_create.$(oext) \
-	argz_create_sep.$(oext) \
-	argz_delete.$(oext) \
-	argz_extract.$(oext) \
-	argz_insert.$(oext) \
-	argz_next.$(oext) \
-	argz_replace.$(oext) \
-	argz_stringify.$(oext) \
-	buf_findstr.$(oext) \
-	envz_entry.$(oext) \
-	envz_get.$(oext) \
-	envz_add.$(oext) \
-	envz_remove.$(oext) \
-	envz_merge.$(oext) \
-	envz_strip.$(oext)
-endif
-
-libargz_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libargz.la
-libargz_la_SOURCES = dummy.c
-libargz_la_LIBADD = $(LIB_OBJS)
-libargz_la_DEPENDENCIES = $(LIB_OBJS)
-noinst_DATA = objectlist.awk.in
-else
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = dummy.c
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-SUFFIXES = .def
-
-CHEWOUT_FILES =
-
-CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
-
-.c.def:
-	$(CHEW) < $< > $*.def 2> $*.ref
-	touch stmp-def
-
-TARGETDOC = ../tmp.texi
-
-doc: $(CHEWOUT_FILES)
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/argz/Makefile.in b/newlib/libc/argz/Makefile.in
deleted file mode 100644
index 719da53..0000000
--- a/newlib/libc/argz/Makefile.in
+++ /dev/null
@@ -1,388 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
-LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
-LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
-LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
-LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
-LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
-LIBC_SYS_LIB = @LIBC_SYS_LIB@
-LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-extra_dir = @extra_dir@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = 	argz_add.$(oext) 	argz_add_sep.$(oext) 	argz_append.$(oext) 	argz_count.$(oext) 	argz_create.$(oext) 	argz_create_sep.$(oext) 	argz_delete.$(oext) 	argz_extract.$(oext) 	argz_insert.$(oext) 	argz_next.$(oext) 	argz_replace.$(oext) 	argz_stringify.$(oext) 	buf_findstr.$(oext) 	envz_entry.$(oext) 	envz_get.$(oext) 	envz_add.$(oext) 	envz_remove.$(oext) 	envz_merge.$(oext) 	envz_strip.$(oext)
-
-libargz_la_LDFLAGS = -Xcompiler -nostdlib
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libargz.la
-@USE_LIBTOOL_TRUE@libargz_la_SOURCES = dummy.c
-@USE_LIBTOOL_TRUE@libargz_la_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@libargz_la_DEPENDENCIES = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = dummy.c
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS)
-
-SUFFIXES = .def
-
-CHEWOUT_FILES = 
-
-CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
-
-TARGETDOC = ../tmp.texi
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  dummy.$(OBJEXT)
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-@USE_LIBTOOL_TRUE@libargz_la_OBJECTS =  dummy.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(libargz_la_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(libargz_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus argz/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-libargz.la: $(libargz_la_OBJECTS) $(libargz_la_DEPENDENCIES)
-	$(LINK)  $(libargz_la_LDFLAGS) $(libargz_la_OBJECTS) $(libargz_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = argz
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-noinstLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
-distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-.c.def:
-	$(CHEW) < $< > $*.def 2> $*.ref
-	touch stmp-def
-
-doc: $(CHEWOUT_FILES)
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/argz/argz_add.c b/newlib/libc/argz/argz_add.c
deleted file mode 100644
index 46e71ca..0000000
--- a/newlib/libc/argz/argz_add.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-
-error_t
-_DEFUN (argz_add, (argz, argz_len, str),
-       char **argz _AND
-       size_t *argz_len _AND
-       const char *str)
-{
-  int len_to_add = 0;
-  size_t last = *argz_len;
-
-  if (str == NULL)
-    return 0;
-
-  len_to_add = strlen(str) + 1;
-  *argz_len += len_to_add;
-
-  if(!(*argz = (char *)realloc(*argz, *argz_len)))
-    return ENOMEM;
-
-  memcpy(*argz + last, str, len_to_add);
-  return 0;
-}
diff --git a/newlib/libc/argz/argz_add_sep.c b/newlib/libc/argz/argz_add_sep.c
deleted file mode 100644
index 5a56ec9..0000000
--- a/newlib/libc/argz/argz_add_sep.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-#include <argz.h>
-
-error_t
-_DEFUN (argz_add_sep, (argz, argz_len, str, sep),
-       char **argz _AND
-       size_t *argz_len _AND
-       const char *str _AND
-       int sep)
-{
-  char *str_argz = 0;
-  size_t str_argz_len = 0;
-  size_t last = *argz_len;
-
-  argz_create_sep (str, sep, &str_argz, &str_argz_len);
-
-  *argz_len += str_argz_len;
-
-  if(!(*argz = (char *)realloc(*argz, *argz_len)))
-    return ENOMEM;
-
-  memcpy(*argz + last, str_argz, str_argz_len);
-  return 0;
-}
diff --git a/newlib/libc/argz/argz_append.c b/newlib/libc/argz/argz_append.c
deleted file mode 100644
index 7519e16..0000000
--- a/newlib/libc/argz/argz_append.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-
-error_t
-_DEFUN (argz_append, (argz, argz_len, buf, buf_len),
-       char **argz _AND
-       size_t *argz_len _AND
-       const char *buf _AND
-       size_t buf_len)
-{
-  size_t last = *argz_len;
-
-  *argz_len += buf_len;
-
-  if(!(*argz = (char *)realloc(*argz, *argz_len)))
-    return ENOMEM;
-
-  memcpy(*argz + last, buf, buf_len);
-  return 0;
-}
diff --git a/newlib/libc/argz/argz_count.c b/newlib/libc/argz/argz_count.c
deleted file mode 100644
index 0c8a816..0000000
--- a/newlib/libc/argz/argz_count.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <_ansi.h>
-#include <sys/types.h>
-
-size_t
-_DEFUN (argz_count, (argz, argz_len), 
-       const char *argz _AND
-       size_t argz_len)
-{
-  int i;
-  size_t count = 0;
-
-  for (i = 0; i < argz_len; i++)
-    {
-      if (argz[i] == '\0')
-        count++;
-    }
-  return count;
-}
diff --git a/newlib/libc/argz/argz_create.c b/newlib/libc/argz/argz_create.c
deleted file mode 100644
index f5651c6..0000000
--- a/newlib/libc/argz/argz_create.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-
-error_t
-_DEFUN (argz_create, (argv, argz, argz_len),
-       char *const argv[] _AND
-       char **argz _AND
-       size_t *argz_len)
-{
-  int argc = 0;
-  int i = 0;
-  int len = 0;
-  char *iter;
-
-  *argz_len = 0;
-
-  if (*argv == NULL)
-    {
-      *argz = NULL;
-      return 0;
-    }
-
-  while (argv[argc])
-    {
-      *argz_len += (strlen(argv[argc]) + 1);
-      argc++;
-    }
-
-  /* There are argc strings to copy into argz. */
-  if(!(*argz = (char *)malloc(*argz_len)))
-    return ENOMEM;
-
-  iter = *argz;
-  for(i = 0; i < argc; i++)
-    {
-      len = strlen(argv[i]) + 1;
-      memcpy(iter, argv[i], len);
-      iter += len;
-    }
-  return 0;
-}
diff --git a/newlib/libc/argz/argz_create_sep.c b/newlib/libc/argz/argz_create_sep.c
deleted file mode 100644
index bf0670b..0000000
--- a/newlib/libc/argz/argz_create_sep.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-
-error_t
-_DEFUN (argz_create_sep, (string, sep, argz, argz_len),
-       const char *string _AND
-       int sep _AND
-       char **argz _AND
-       size_t *argz_len)
-{
-  int len = 0;
-  int i = 0;
-  int num_strings = 0;
-  char delim[2];
-  char *running = 0;
-  char *old_running = 0;
-  char *token = 0;
-  char *iter = 0;
-
-  delim[0] = sep;
-  delim[1] = '\0';
-
-  running = strdup(string);
-  old_running = running;
-
-  while ((token = strsep(&running, delim)))
-    {
-      len = strlen(token);
-      *argz_len += (len + 1);
-      num_strings++;
-    }
-
-  if(!(*argz = (char *)malloc(*argz_len)))
-    return ENOMEM;
-
-  free(old_running);
-
-  running = strdup(string);
-  old_running = running;
-
-  iter = *argz;
-  for (i = 0; i < num_strings; i++)
-    {
-      token = strsep(&running, delim);
-      len = strlen(token) + 1;
-      memcpy(iter, token, len);
-      iter += len;
-    }
-
-  free(old_running);
-  return 0;
-}
diff --git a/newlib/libc/argz/argz_delete.c b/newlib/libc/argz/argz_delete.c
deleted file mode 100644
index 237128c..0000000
--- a/newlib/libc/argz/argz_delete.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-
-error_t
-_DEFUN (argz_delete, (argz, argz_len, entry),
-       char **argz _AND
-       size_t *argz_len _AND
-       char *entry)
-{
-  int len = 0;
-  char *moveto = entry;
-
-  if (entry)
-    {
-      len = strlen(entry) + 1;
-      entry += len;
-      
-      memmove(moveto, entry, *argz + *argz_len - entry);
-
-      *argz_len -= len;
-
-      if(!(*argz = (char *)realloc(*argz, *argz_len)))
-        return ENOMEM;
-
-      if (*argz_len <= 0)
-        {
-          free(*argz);
-          *argz = NULL;
-        }
-    }
-  return 0;
-}
diff --git a/newlib/libc/argz/argz_extract.c b/newlib/libc/argz/argz_extract.c
deleted file mode 100644
index 289c6e1..0000000
--- a/newlib/libc/argz/argz_extract.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <argz.h>
-#include <sys/types.h>
-
-void
-_DEFUN (argz_extract, (argz, argz_len, argv),
-       char *argz _AND
-       size_t argz_len _AND
-       char **argv)
-{
-  size_t i = 0;
-  int j = 0;
-  const size_t count = argz_count(argz, argz_len);
-
-  for (i = argz_len - 2; i > 0; i--)
-    {
-      if (argz[i] == '\0')
-        {
-          j++;
-          argv[count - j] = &argz[i + 1];
-        }
-    }
-  argv[0] = &argz[0];
-  argv[count] = NULL;
-}
diff --git a/newlib/libc/argz/argz_insert.c b/newlib/libc/argz/argz_insert.c
deleted file mode 100644
index 8a9fb19..0000000
--- a/newlib/libc/argz/argz_insert.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (C) 2002, 2005 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <argz.h>
-
-error_t
-_DEFUN (argz_insert, (argz, argz_len, before, entry),
-       char **argz _AND
-       size_t *argz_len _AND
-       char *before _AND
-       const char *entry)
-{
-  int len = 0;
-
-  if (before == NULL)
-    return argz_add(argz, argz_len, entry);
-
-  if (before < *argz || before >= *argz + *argz_len)
-    return EINVAL;
-
-  while (before != *argz && before[-1])
-    before--;
-
-  len = strlen(entry) + 1;
-
-  if(!(*argz = (char *)realloc(*argz, *argz_len + len)))
-    return ENOMEM;
-  
-  memmove(before + len, before, *argz + *argz_len - before);
-  memcpy(before, entry, len);
-
-  *argz_len += len;
-
-  return 0;
-}
diff --git a/newlib/libc/argz/argz_next.c b/newlib/libc/argz/argz_next.c
deleted file mode 100644
index e9dbe06..0000000
--- a/newlib/libc/argz/argz_next.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-
-char *
-_DEFUN (argz_next, (argz, argz_len, entry),
-       char *argz _AND
-       size_t argz_len _AND
-       const char *entry)
-{
-  if (entry)
-    {
-      while(*entry != '\0')
-        entry++;
-      entry++;
-
-      if (entry >= argz + argz_len)
-        return NULL;
-      else
-        return (char *) entry;
-    }
-  else
-    {
-      if (argz_len > 0)
-        return (char *) argz;
-      else
-        return NULL;
-    }
-}
diff --git a/newlib/libc/argz/argz_replace.c b/newlib/libc/argz/argz_replace.c
deleted file mode 100644
index cb01eae..0000000
--- a/newlib/libc/argz/argz_replace.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <argz.h>
-
-#include "buf_findstr.h"
-
-error_t
-_DEFUN (argz_replace, (argz, argz_len, str, with, replace_count),
-       char **argz _AND
-       size_t *argz_len _AND
-       const char *str _AND
-       const char *with _AND
-       unsigned *replace_count)
-{
-  const int str_len = strlen(str);
-  const int with_len = strlen(with);
-  const int len_diff = with_len - str_len;
-
-  char *buf_iter = *argz;
-  size_t buf_len = *argz_len;
-  char *last_iter = NULL;
-  char *new_argz = NULL;
-  size_t new_argz_len = 0;
-  char *new_argz_iter = NULL;
-
-  *replace_count = 0;
-  new_argz_len = *argz_len;
-
-  while(buf_len)
-    {
-      if(_buf_findstr(str, &buf_iter, &buf_len))
-        {
-          *replace_count += 1;
-          new_argz_len += len_diff;
-        }
-    }
-
-  if (*replace_count)
-    {
-      new_argz = (char *)malloc(new_argz_len);
-      
-      buf_iter = *argz;
-      buf_len = *argz_len;
-      last_iter = buf_iter;
-      new_argz_iter = new_argz;
-      
-      while(buf_len)
-        {
-          if (_buf_findstr(str, &buf_iter, &buf_len))
-            {
-              /* copy everything up to, but not including str, from old argz to
-                 new argz. */
-              memcpy(new_argz_iter, last_iter, buf_iter - last_iter - str_len);
-              new_argz_iter += (buf_iter - last_iter - str_len);
-              /* copy replacement string. */
-              memcpy(new_argz_iter, with, with_len);
-              new_argz_iter += with_len;
-              last_iter = buf_iter;
-            }
-        }
-      /* copy everything after last occurrence of str. */
-      memcpy(new_argz_iter, last_iter, *argz + *argz_len - last_iter);
-
-      /* reallocate argz, and copy over the new value. */
-      if(!(*argz = (char *)realloc(*argz, new_argz_len)))
-        return ENOMEM;
-
-      memcpy(*argz, new_argz, new_argz_len);
-      *argz_len = new_argz_len;
-
-      if (*argz_len == 0)
-        {
-          free(*argz);
-          *argz = NULL;
-        }
-      free(new_argz);
-    }
-
-  return 0;
-}
diff --git a/newlib/libc/argz/argz_stringify.c b/newlib/libc/argz/argz_stringify.c
deleted file mode 100644
index 6ff5dd0..0000000
--- a/newlib/libc/argz/argz_stringify.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <_ansi.h>
-#include <sys/types.h>
-
-void
-_DEFUN (argz_stringify, (argz, argz_len, sep),
-       char *argz _AND
-       size_t argz_len _AND
-       int sep)
-{
-  size_t i;
-
-  /* len includes trailing \0, which we don't want to replace. */
-  for (i = 0; i < argz_len - 1; i++)
-    {
-      if (argz[i] == '\0')
-        argz[i] = sep;
-    }
-}
diff --git a/newlib/libc/argz/buf_findstr.c b/newlib/libc/argz/buf_findstr.c
deleted file mode 100644
index aeb32a9..0000000
--- a/newlib/libc/argz/buf_findstr.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "buf_findstr.h"
-
-/* Find string str in buffer buf of length buf_len.  Point buf to character after string,
-   or set it to NULL if end of buffer is reached.  Return 1 if found, 0 if not. */
-int
-_buf_findstr(const char *str, char **buf, size_t *buf_len)
-{
-  int i = 0;
-  int j = 0;
-
-  for (i = 0; i < *buf_len; i++)
-    {
-      if (str[0] == (*buf)[i])
-        {
-          j = i;
-          while (str[j - i] && (str[j - i] == (*buf)[j])) j++;
-          if(str[j - i] == '\0')
-            {
-              *buf += j;
-              *buf_len -= j;
-              return 1;
-            }
-        }
-    }
-
-  if (i == *buf_len)
-    {
-      *buf += *buf_len;
-      *buf_len = 0;
-    }
-
-  return 0;
-}
diff --git a/newlib/libc/argz/buf_findstr.h b/newlib/libc/argz/buf_findstr.h
deleted file mode 100644
index d6cef7c..0000000
--- a/newlib/libc/argz/buf_findstr.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <sys/types.h>
-
-/* Find string str in buffer buf of length buf_len.  Point buf to
-   character after string, or set it to NULL if end of buffer is
-   reached.  Return 1 if found, 0 if not. */
-int _buf_findstr(const char *str, char **buf, size_t *buf_len);
diff --git a/newlib/libc/argz/dummy.c b/newlib/libc/argz/dummy.c
deleted file mode 100644
index 895395e..0000000
--- a/newlib/libc/argz/dummy.c
+++ /dev/null
@@ -1 +0,0 @@
-/* empty stub to allow objectlist.awk.in to be created */
diff --git a/newlib/libc/argz/envz_add.c b/newlib/libc/argz/envz_add.c
deleted file mode 100644
index 3e91a58..0000000
--- a/newlib/libc/argz/envz_add.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <argz.h>
-#include <envz.h>
-
-error_t
-_DEFUN (envz_add, (envz, envz_len, name, value),
-       char **envz _AND 
-       size_t *envz_len _AND 
-       const char *name _AND
-       const char *value)
-{
-  char *concat = NULL;
-  int name_len = 0;
-  int val_len = 0;
-  int retval = 0;
-
-  envz_remove(envz, envz_len, name);
-
-  if (value)
-    {
-      name_len = strlen(name);
-      val_len = strlen(value);
-      if(!(concat = (char *) malloc(name_len + val_len + 2)))
-        return ENOMEM;
-
-      memcpy(concat, name, name_len);
-      concat[name_len] = '=';
-      memcpy(concat + name_len + 1, value, val_len + 1);
-
-      retval = argz_add(envz, envz_len, concat);
-      free(concat);
-    }
-  else
-    {
-      retval = argz_add(envz, envz_len, name);
-    }
-  return retval;
-}
diff --git a/newlib/libc/argz/envz_entry.c b/newlib/libc/argz/envz_entry.c
deleted file mode 100644
index 3d1986b..0000000
--- a/newlib/libc/argz/envz_entry.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <envz.h>
-
-#include "buf_findstr.h"
-
-char *
-_DEFUN (envz_entry, (envz, envz_len, name),
-       const char *envz _AND
-       size_t envz_len _AND
-       const char *name)
-{
-  char *buf_ptr = (char *)envz;
-  size_t buf_len = envz_len;
-
-  while(buf_len)
-    {
-      if (_buf_findstr(name, &buf_ptr, &buf_len))
-        {
-          if (buf_ptr)
-            {
-              if (*buf_ptr == '=' || *buf_ptr == '\0')
-                {
-                  buf_ptr--;
-
-                  /* Move buf_ptr back to start of entry. */
-                  while(*buf_ptr != '\0' && buf_ptr != envz) buf_ptr--;
-                  
-                  if(*buf_ptr == '\0')
-                    buf_ptr++;
-
-                  return (char *)buf_ptr;
-                }
-            }
-        }
-    }
-  return 0;
-}
diff --git a/newlib/libc/argz/envz_get.c b/newlib/libc/argz/envz_get.c
deleted file mode 100644
index b4f7c28..0000000
--- a/newlib/libc/argz/envz_get.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <envz.h>
-
-#include "buf_findstr.h"
-
-char *
-_DEFUN (envz_get, (envz, envz_len, name),
-       const char *envz _AND 
-       size_t envz_len _AND
-       const char *name)
-{
-  char *buf_ptr = (char *)envz;
-  size_t buf_len = envz_len;
-
-  while(buf_len)
-    {
-      if (_buf_findstr(name, &buf_ptr, &buf_len))
-        {
-          if (*buf_ptr == '=')
-            {
-              buf_ptr++;
-              return (char *)buf_ptr;
-            }
-          else
-            {
-              if (*buf_ptr == '\0')
-                /* NULL entry. */
-                return NULL;
-            }
-        }
-    }
-  /* No matching entries found. */
-  return NULL;
-}
diff --git a/newlib/libc/argz/envz_merge.c b/newlib/libc/argz/envz_merge.c
deleted file mode 100644
index 4683220..0000000
--- a/newlib/libc/argz/envz_merge.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <argz.h>
-#include <envz.h>
-
-error_t
-_DEFUN (envz_merge, (envz, envz_len, envz2, envz2_len, override),
-       char **envz _AND
-       size_t *envz_len _AND
-       const char *envz2 _AND
-       size_t envz2_len _AND
-       int override)
-{
-  char *entry = NULL;
-  char *name_str = NULL;
-  char *val_str = NULL;
-  char *name_iter = NULL;
-  int retval = 0;
-
-  while((entry = argz_next((char *)envz2, envz2_len, entry)) && !retval)
-    {
-      if (!override)
-        {
-          name_str = strdup (entry);
-          name_iter = strchr(name_str, '=');
-          if(name_iter)
-            *name_iter = '\0';
-
-          if(!envz_entry(*envz, *envz_len, name_str))
-            {
-              retval = argz_add(envz, envz_len, entry);
-            }
-          free(name_str);
-        }
-      else
-        {
-          name_str = strdup (entry);
-          name_iter = strchr(name_str, '=');
-          if(name_iter)
-            {
-              *name_iter = '\0';
-              val_str = name_iter + 1;
-            }
-          else
-            {
-              val_str = NULL;
-            }
-
-          retval = envz_add(envz, envz_len, name_str, val_str);
-        }
-    }
-  return retval;
-}
diff --git a/newlib/libc/argz/envz_remove.c b/newlib/libc/argz/envz_remove.c
deleted file mode 100644
index 1882297..0000000
--- a/newlib/libc/argz/envz_remove.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <argz.h>
-#include <envz.h>
-
-void
-_DEFUN (envz_remove, (envz, envz_len, name),
-       char **envz _AND
-       size_t *envz_len _AND
-       const char *name)
-{
-  char *entry = NULL;
-  int len = 0;
-  entry = envz_entry (*envz, *envz_len, name);
-
-  if (entry)
-    {
-      len = strlen(entry) + 1;
-
-      /* Not the last entry. */
-      if (*envz + *envz_len != entry + len - 1)
-        {
-          memmove(entry, entry + len, *envz + *envz_len - entry - len);
-        }
-
-      *envz = (char *)realloc(*envz, *envz_len - len);
-      *envz_len -= len;
-    }
-}
diff --git a/newlib/libc/argz/envz_strip.c b/newlib/libc/argz/envz_strip.c
deleted file mode 100644
index e1c4610..0000000
--- a/newlib/libc/argz/envz_strip.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <argz.h>
-#include <envz.h>
-
-void
-_DEFUN (envz_strip, (envz, envz_len),
-       char **envz _AND
-       size_t *envz_len)
-{
-  char *entry = 0;
-  int len = 0;
-  int null_found = 0;
-
-  while((entry = argz_next(*envz, *envz_len, entry)))
-    {
-      if(!strchr(entry, '='))
-        {
-          null_found = 1;
-          len = strlen(entry) + 1;
-          /* Make sure this is not the last entry in envz. If it is, it
-           will be chopped off by the realloc anyway.*/
-          if(*envz + *envz_len != entry + len - 1)
-            {
-              memmove(entry, entry + len, *envz + *envz_len - entry - len);
-            }
-          *envz_len -= len;
-        }
-    }
-  if(null_found)
-    {
-      *envz = (char *)realloc(*envz, *envz_len);
-    }
-}
diff --git a/newlib/libc/configure b/newlib/libc/configure
index ac29def..61d317c 100755
--- a/newlib/libc/configure
+++ b/newlib/libc/configure
@@ -12,23 +12,13 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --enable-newlib-io-pos-args enable printf-family positional arg support"
-ac_help="$ac_help
   --enable-multilib         build many library versions (default)"
 ac_help="$ac_help
   --enable-target-optspace  optimize for space"
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -42,8 +32,6 @@ ac_help="$ac_help
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -61,6 +49,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -175,6 +164,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -345,6 +335,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -510,12 +505,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -575,19 +574,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-# Check whether --enable-newlib-io-pos-args or --disable-newlib-io-pos-args was given.
-if test "${enable_newlib_io_pos_args+set}" = set; then
-  enableval="$enable_newlib_io_pos_args"
-  case "${enableval}" in
-  yes) newlib_io_pos_args=yes ;;
-  no)  newlib_io_pos_args=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-pos-args option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_pos_args=no
-fi
-
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -600,7 +586,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:604: checking for a BSD compatible install" >&5
+echo "configure:590: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -653,7 +639,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:657: checking whether build environment is sane" >&5
+echo "configure:643: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -710,7 +696,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:714: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:700: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -743,12 +729,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:747: checking for Cygwin environment" >&5
+echo "configure:733: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 752 "configure"
+#line 738 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -759,7 +745,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -776,19 +762,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:780: checking for mingw32 environment" >&5
+echo "configure:766: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 785 "configure"
+#line 771 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -841,79 +827,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -931,34 +854,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:962: checking host system type" >&5
+echo "configure:864: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -978,52 +880,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:983: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1001: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1039,21 +900,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:905: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoconf" >&5
+echo "configure:918: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1065,21 +926,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1070: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:931: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1083: checking for working autoheader" >&5
+echo "configure:944: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1092,7 +953,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1096: checking for working makeinfo" >&5
+echo "configure:957: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1117,7 +978,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1121: checking for $ac_word" >&5
+echo "configure:982: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1147,7 +1008,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1151: checking for $ac_word" >&5
+echo "configure:1012: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1196,7 +1057,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1200: checking whether we are using GNU C" >&5
+echo "configure:1061: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1205,7 +1066,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1220,7 +1081,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1224: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1085: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1248,10 +1109,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1118: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1255: checking for $ac_word" >&5
+echo "configure:1139: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1283,7 +1167,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1287: checking for $ac_word" >&5
+echo "configure:1171: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1315,7 +1199,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1319: checking for $ac_word" >&5
+echo "configure:1203: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1347,7 +1231,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1351: checking for $ac_word" >&5
+echo "configure:1235: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1392,7 +1276,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1396: checking for a BSD compatible install" >&5
+echo "configure:1280: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1445,11 +1329,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1453: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1334: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1483,7 +1364,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1487: checking for executable suffix" >&5
+echo "configure:1368: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1493,10 +1374,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1517,6 +1398,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1527,52 +1420,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1581,12 +1428,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1601,7 +1442,7 @@ if test "${use_libtool}" = "yes"; then
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -1624,7 +1465,7 @@ fi
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -1647,7 +1488,7 @@ fi
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -1666,10 +1507,40 @@ else
   enable_fast_install=yes
 fi
 
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1514: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1673: checking for $ac_word" >&5
+echo "configure:1544: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1699,7 +1570,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1703: checking for $ac_word" >&5
+echo "configure:1574: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1750,7 +1621,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1754: checking for $ac_word" >&5
+echo "configure:1625: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1782,7 +1653,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1786: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1657: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1793,12 +1664,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1797 "configure"
+#line 1668 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1824,12 +1695,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1828: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1833: checking whether we are using GNU C" >&5
+echo "configure:1704: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1838,7 +1709,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1857,7 +1728,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1861: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1732: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1897,18 +1768,12 @@ else
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1904: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+echo "configure:1775: checking for ld used by GCC" >&5
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
@@ -1930,12 +1795,12 @@ echo "configure:1904: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1934: checking for GNU ld" >&5
+echo "configure:1799: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1937: checking for non-GNU ld" >&5
+echo "configure:1802: checking for non-GNU ld" >&5
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -z "$LD"; then
@@ -1943,11 +1808,11 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -1956,11 +1821,11 @@ else
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   echo "$ac_t""$LD" 1>&6
 else
@@ -1968,74 +1833,59 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1972: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
+echo "configure:1837: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi
 fi
 
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
+echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
 
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1989: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:2001: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
+echo "configure:1853: checking for BSD-compatible nm" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi
 fi
 
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2039: checking whether ln -s works" >&5
+echo "configure:1889: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2055,482 +1905,14 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2060: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2233: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2263: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2325: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2396: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2428: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2463: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2495: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
 
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 
 libtool_flags="$libtool_flags --enable-win32-dll"
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
@@ -2542,25 +1924,14 @@ fi
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2562 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
+  echo '#line 1933 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -2575,48 +1946,24 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2600: checking whether the C compiler needs -belf" >&5
+echo "configure:1955: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2613 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1960 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2626,13 +1973,6 @@ else
   lt_cv_cc_needs_belf=no
 fi
 rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
 fi
 
 echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
@@ -2642,11 +1982,11 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   fi
   ;;
 
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+*-*-cygwin* | *-*-mingw*)
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2650: checking for $ac_word" >&5
+echo "configure:1990: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2678,7 +2018,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2682: checking for $ac_word" >&5
+echo "configure:2022: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2713,7 +2053,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2717: checking for $ac_word" >&5
+echo "configure:2057: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2745,7 +2085,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2749: checking for $ac_word" >&5
+echo "configure:2089: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2780,7 +2120,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2784: checking for $ac_word" >&5
+echo "configure:2124: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2812,7 +2152,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2816: checking for $ac_word" >&5
+echo "configure:2156: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2844,77 +2184,8 @@ else
 fi
 fi
 
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2852: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2857 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2886: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2891 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  
+
 esac
 
 
@@ -2968,14 +2239,12 @@ rm -f confcache
 
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -2989,7 +2258,7 @@ fi
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -2998,18 +2267,13 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 # clobbered by the next message.
 exec 5>>./config.log
 
-  
-
-  
-	 
-	 
 fi
 
 subdirs="machine sys"
 
 
 CRT0=
-if test "x${have_crt0}" = "xyes"; then
+if test -n "${sys_dir}"; then
   CRT0=crt0.o
 fi
 
@@ -3056,28 +2320,6 @@ else
   HAVE_SIGNAL_DIR_FALSE=
 fi
 
-LIBC_STDIO64_LIB=
-LIBC_STDIO64_DEF=
-if test -n "${stdio64_dir}"; then
-  if test "${use_libtool}" = "yes"; then
-    LIBC_STDIO64_LIB=${stdio64_dir}/lib${stdio64_dir}.${aext}
-  else
-    LIBC_STDIO64_LIB=${stdio64_dir}/lib.${aext}
-  fi
-  LIBC_STDIO64_DEF=${stdio64_dir}/stmp-def
-fi
-
-
-
-
-if test x${stdio64_dir} != x; then
-  HAVE_STDIO64_DIR_TRUE=
-  HAVE_STDIO64_DIR_FALSE='#'
-else
-  HAVE_STDIO64_DIR_TRUE='#'
-  HAVE_STDIO64_DIR_FALSE=
-fi
-
 LIBC_SYSCALL_LIB=
 if test -n "${syscall_dir}"; then
   if test "${use_libtool}" = "yes"; then
@@ -3116,14 +2358,6 @@ else
   HAVE_UNIX_DIR_FALSE=
 fi
 
-LIBC_EXTRA_LIB=
-LIBC_EXTRA_DEF=
-extra_dir=
-
-
-
-
-
 
 LIBC_SYS_LIB=
 if test -n "${sys_dir}"; then
@@ -3136,16 +2370,7 @@ fi
 
 
 
-
-
-if test x${newlib_iconv} != x; then
-  ENABLE_NEWLIB_ICONV_TRUE=
-  ENABLE_NEWLIB_ICONV_FALSE='#'
-else
-  ENABLE_NEWLIB_ICONV_TRUE='#'
-  ENABLE_NEWLIB_ICONV_FALSE=
-fi
-
+LIBC_MACHINE_LIB=
 if test -n "${machine_dir}"; then
   if test "${use_libtool}" = "yes"; then
     LIBC_MACHINE_LIB=machine/${machine_dir}/lib${machine_dir}.${aext}
@@ -3269,7 +2494,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile argz/Makefile ctype/Makefile errno/Makefile locale/Makefile misc/Makefile reent/Makefile search/Makefile stdio/Makefile stdio64/Makefile stdlib/Makefile string/Makefile time/Makefile posix/Makefile signal/Makefile syscalls/Makefile unix/Makefile iconv/Makefile iconv/ces/Makefile iconv/ccs/Makefile iconv/ccs/binary/Makefile iconv/lib/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile ctype/Makefile errno/Makefile locale/Makefile misc/Makefile reent/Makefile stdio/Makefile stdlib/Makefile string/Makefile time/Makefile posix/Makefile signal/Makefile syscalls/Makefile unix/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -3301,24 +2526,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -3331,6 +2544,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -3339,26 +2557,14 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
 s%@machine_dir@%$machine_dir%g
 s%@sys_dir@%$sys_dir%g
 s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@OBJDUMP@%$OBJDUMP%g
 s%@LIBTOOL@%$LIBTOOL%g
@@ -3371,22 +2577,13 @@ s%@LIBC_SIGNAL_LIB@%$LIBC_SIGNAL_LIB%g
 s%@LIBC_SIGNAL_DEF@%$LIBC_SIGNAL_DEF%g
 s%@HAVE_SIGNAL_DIR_TRUE@%$HAVE_SIGNAL_DIR_TRUE%g
 s%@HAVE_SIGNAL_DIR_FALSE@%$HAVE_SIGNAL_DIR_FALSE%g
-s%@LIBC_STDIO64_LIB@%$LIBC_STDIO64_LIB%g
-s%@LIBC_STDIO64_DEF@%$LIBC_STDIO64_DEF%g
-s%@HAVE_STDIO64_DIR_TRUE@%$HAVE_STDIO64_DIR_TRUE%g
-s%@HAVE_STDIO64_DIR_FALSE@%$HAVE_STDIO64_DIR_FALSE%g
 s%@LIBC_SYSCALL_LIB@%$LIBC_SYSCALL_LIB%g
 s%@HAVE_SYSCALL_DIR_TRUE@%$HAVE_SYSCALL_DIR_TRUE%g
 s%@HAVE_SYSCALL_DIR_FALSE@%$HAVE_SYSCALL_DIR_FALSE%g
 s%@LIBC_UNIX_LIB@%$LIBC_UNIX_LIB%g
 s%@HAVE_UNIX_DIR_TRUE@%$HAVE_UNIX_DIR_TRUE%g
 s%@HAVE_UNIX_DIR_FALSE@%$HAVE_UNIX_DIR_FALSE%g
-s%@LIBC_EXTRA_LIB@%$LIBC_EXTRA_LIB%g
-s%@LIBC_EXTRA_DEF@%$LIBC_EXTRA_DEF%g
-s%@extra_dir@%$extra_dir%g
 s%@LIBC_SYS_LIB@%$LIBC_SYS_LIB%g
-s%@ENABLE_NEWLIB_ICONV_TRUE@%$ENABLE_NEWLIB_ICONV_TRUE%g
-s%@ENABLE_NEWLIB_ICONV_FALSE@%$ENABLE_NEWLIB_ICONV_FALSE%g
 s%@LIBC_MACHINE_LIB@%$LIBC_MACHINE_LIB%g
 
 CEOF
@@ -3396,7 +2593,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
@@ -3429,7 +2626,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile argz/Makefile ctype/Makefile errno/Makefile locale/Makefile misc/Makefile reent/Makefile search/Makefile stdio/Makefile stdio64/Makefile stdlib/Makefile string/Makefile time/Makefile posix/Makefile signal/Makefile syscalls/Makefile unix/Makefile iconv/Makefile iconv/ces/Makefile iconv/ccs/Makefile iconv/ccs/binary/Makefile iconv/lib/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile ctype/Makefile errno/Makefile locale/Makefile misc/Makefile reent/Makefile stdio/Makefile stdlib/Makefile string/Makefile time/Makefile posix/Makefile signal/Makefile syscalls/Makefile unix/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/newlib/libc/configure.in b/newlib/libc/configure.in
index d114eb5..eeb5286 100644
--- a/newlib/libc/configure.in
+++ b/newlib/libc/configure.in
@@ -7,15 +7,6 @@ AC_INIT(sys.tex)
 dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
 AC_CONFIG_AUX_DIR(../..)
 
-dnl Support --enable-newlib-io-pos-args used by libc/stdio
-AC_ARG_ENABLE(newlib-io-pos-args,
-[  --enable-newlib-io-pos-args enable printf-family positional arg support],
-[case "${enableval}" in
-  yes) newlib_io_pos_args=yes ;;
-  no)  newlib_io_pos_args=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-pos-args option) ;;
- esac], [newlib_io_pos_args=no])dnl
-
 NEWLIB_CONFIGURE(..)
 
 dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
@@ -30,7 +21,7 @@ fi
 AC_CONFIG_SUBDIRS(machine sys)
 
 CRT0=
-if test "x${have_crt0}" = "xyes"; then
+if test -n "${sys_dir}"; then
   CRT0=crt0.o
 fi
 AC_SUBST(CRT0)
@@ -64,20 +55,6 @@ AC_SUBST(LIBC_SIGNAL_LIB)
 AC_SUBST(LIBC_SIGNAL_DEF)
 AM_CONDITIONAL(HAVE_SIGNAL_DIR, test x${signal_dir} != x)
 
-LIBC_STDIO64_LIB=
-LIBC_STDIO64_DEF=
-if test -n "${stdio64_dir}"; then
-  if test "${use_libtool}" = "yes"; then
-    LIBC_STDIO64_LIB=${stdio64_dir}/lib${stdio64_dir}.${aext}
-  else
-    LIBC_STDIO64_LIB=${stdio64_dir}/lib.${aext}
-  fi
-  LIBC_STDIO64_DEF=${stdio64_dir}/stmp-def
-fi
-AC_SUBST(LIBC_STDIO64_LIB)
-AC_SUBST(LIBC_STDIO64_DEF)
-AM_CONDITIONAL(HAVE_STDIO64_DIR, test x${stdio64_dir} != x)
-
 LIBC_SYSCALL_LIB=
 if test -n "${syscall_dir}"; then
   if test "${use_libtool}" = "yes"; then
@@ -100,14 +77,6 @@ fi
 AC_SUBST(LIBC_UNIX_LIB)
 AM_CONDITIONAL(HAVE_UNIX_DIR, test x${unix_dir} != x)
 
-LIBC_EXTRA_LIB=
-LIBC_EXTRA_DEF=
-extra_dir=
-
-AC_SUBST(LIBC_EXTRA_LIB)
-AC_SUBST(LIBC_EXTRA_DEF)
-AC_SUBST(extra_dir)
-
 dnl We always recur into sys and machine, and let them decide what to
 dnl do.  However, we do need to know whether they will produce a library.
 
@@ -122,9 +91,7 @@ fi
 AC_SUBST(LIBC_SYS_LIB)
 AC_SUBST(sys_dir)
 
-dnl iconv library will be compiled if --enable-newlib-iconv option is enabled
-AM_CONDITIONAL(ENABLE_NEWLIB_ICONV, test x${newlib_iconv} != x)
-
+LIBC_MACHINE_LIB=
 if test -n "${machine_dir}"; then
   if test "${use_libtool}" = "yes"; then
     LIBC_MACHINE_LIB=machine/${machine_dir}/lib${machine_dir}.${aext}
@@ -135,4 +102,4 @@ fi
 AC_SUBST(LIBC_MACHINE_LIB)
 AC_SUBST(machine_dir)
 
-AC_OUTPUT(Makefile argz/Makefile ctype/Makefile errno/Makefile locale/Makefile misc/Makefile reent/Makefile search/Makefile stdio/Makefile stdio64/Makefile stdlib/Makefile string/Makefile time/Makefile posix/Makefile signal/Makefile syscalls/Makefile unix/Makefile iconv/Makefile iconv/ces/Makefile iconv/ccs/Makefile iconv/ccs/binary/Makefile iconv/lib/Makefile)
+AC_OUTPUT(Makefile ctype/Makefile errno/Makefile locale/Makefile misc/Makefile reent/Makefile stdio/Makefile stdlib/Makefile string/Makefile time/Makefile posix/Makefile signal/Makefile syscalls/Makefile unix/Makefile)
diff --git a/newlib/libc/ctype/Makefile.am b/newlib/libc/ctype/Makefile.am
index 4a85b72..477a14d 100644
--- a/newlib/libc/ctype/Makefile.am
+++ b/newlib/libc/ctype/Makefile.am
@@ -4,10 +4,11 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES = \
+LIB_SOURCES = \
 	ctype_.c \
 	isalnum.c \
 	isalpha.c \
+	isascii.c \
 	iscntrl.c \
 	isdigit.c \
 	islower.c \
@@ -16,53 +17,21 @@ GENERAL_SOURCES = \
 	ispunct.c \
 	isspace.c \
 	isxdigit.c \
+	toascii.c \
 	tolower.c \
-	toupper.c
-
-## The following handles EL/IX level 2 functions
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-LIB_OBJS = \
-	isascii.$(oext) \
-	isblank.$(oext) \
-	iswalnum.$(oext) \
-	iswalpha.$(oext) \
-	iswblank.$(oext) \
-	iswcntrl.$(oext) \
-	iswctype.$(oext) \
-	iswdigit.$(oext) \
-	iswgraph.$(oext) \
-	iswlower.$(oext) \
-	iswprint.$(oext) \
-	iswpunct.$(oext) \
-	iswspace.$(oext) \
-	iswupper.$(oext) \
-	iswxdigit.$(oext) \
-	jp2uc.$(oext) \
-	toascii.$(oext) \
-	_tolower.$(oext) \
-	_toupper.$(oext) \
-	towctrans.$(oext) \
-	towlower.$(oext) \
-	towupper.$(oext) \
-	wctrans.$(oext)	\
-	wctype.$(oext)
-endif
+	toupper.c \
+	_tolower.c \
+	_toupper.c
 
 libctype_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libctype.la
-libctype_la_SOURCES = $(GENERAL_SOURCES)
-libctype_la_LIBADD = $(LIB_OBJS)
-libctype_la_DEPENDENCIES = $(LIB_OBJS)
+libctype_la_SOURCES = $(LIB_SOURCES)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
+lib_a_SOURCES = $(LIB_SOURCES)
 noinst_DATA =
 endif # USE_LIBTOOL
 
@@ -79,28 +48,10 @@ CHEWOUT_FILES= \
 	ispunct.def	\
 	isspace.def	\
 	isupper.def	\
-	iswalnum.def	\
-	iswalpha.def	\
-	iswblank.def 	\
-	iswcntrl.def 	\
-	iswctype.def 	\
-	iswdigit.def 	\
-	iswgraph.def 	\
-	iswlower.def 	\
-	iswprint.def 	\
-	iswpunct.def 	\
-	iswspace.def 	\
-	iswupper.def 	\
-	iswxdigit.def 	\
 	isxdigit.def	\
 	toascii.def	\
 	tolower.def	\
-	toupper.def	\
-	towctrans.def	\
-	towlower.def	\
-	towupper.def	\
-	wctrans.def	\
-	wctype.def	
+	toupper.def	
 
 SUFFIXES = .def
 
diff --git a/newlib/libc/ctype/Makefile.in b/newlib/libc/ctype/Makefile.in
index 6f27e61..e3a123e 100644
--- a/newlib/libc/ctype/Makefile.in
+++ b/newlib/libc/ctype/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -110,25 +95,50 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES =  	ctype_.c 	isalnum.c 	isalpha.c 	iscntrl.c 	isdigit.c 	islower.c 	isupper.c 	isprint.c 	ispunct.c 	isspace.c 	isxdigit.c 	tolower.c 	toupper.c
+LIB_SOURCES = \
+	ctype_.c \
+	isalnum.c \
+	isalpha.c \
+	isascii.c \
+	iscntrl.c \
+	isdigit.c \
+	islower.c \
+	isupper.c \
+	isprint.c \
+	ispunct.c \
+	isspace.c \
+	isxdigit.c \
+	toascii.c \
+	tolower.c \
+	toupper.c \
+	_tolower.c \
+	_toupper.c
 
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = 	isascii.$(oext) 	isblank.$(oext) 	iswalnum.$(oext) 	iswalpha.$(oext) 	iswblank.$(oext) 	iswcntrl.$(oext) 	iswctype.$(oext) 	iswdigit.$(oext) 	iswgraph.$(oext) 	iswlower.$(oext) 	iswprint.$(oext) 	iswpunct.$(oext) 	iswspace.$(oext) 	iswupper.$(oext) 	iswxdigit.$(oext) 	jp2uc.$(oext) 	toascii.$(oext) 	_tolower.$(oext) 	_toupper.$(oext) 	towctrans.$(oext) 	towlower.$(oext) 	towupper.$(oext) 	wctrans.$(oext)		wctype.$(oext)
 
 libctype_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libctype.la
-@USE_LIBTOOL_TRUE@libctype_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@libctype_la_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@libctype_la_DEPENDENCIES = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libctype.la
+@USE_LIBTOOL_TRUE@libctype_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS)
-
-CHEWOUT_FILES =  	isalnum.def		isalpha.def		isascii.def		iscntrl.def		isdigit.def		islower.def		isprint.def		ispunct.def		isspace.def		isupper.def		iswalnum.def		iswalpha.def		iswblank.def 		iswcntrl.def 		iswctype.def 		iswdigit.def 		iswgraph.def 		iswlower.def 		iswprint.def 		iswpunct.def 		iswspace.def 		iswupper.def 		iswxdigit.def 		isxdigit.def		toascii.def		tolower.def		toupper.def		towctrans.def		towlower.def		towupper.def		wctrans.def		wctype.def	
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
+
+CHEWOUT_FILES = \
+	isalnum.def	\
+	isalpha.def	\
+	isascii.def	\
+	iscntrl.def	\
+	isdigit.def	\
+	islower.def	\
+	isprint.def	\
+	ispunct.def	\
+	isspace.def	\
+	isupper.def	\
+	isxdigit.def	\
+	toascii.def	\
+	tolower.def	\
+	toupper.def	
 
 
 SUFFIXES = .def
@@ -146,19 +156,19 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  ctype_.$(OBJEXT) isalnum.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@isalpha.$(OBJEXT) iscntrl.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@isdigit.$(OBJEXT) islower.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@isupper.$(OBJEXT) isprint.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ispunct.$(OBJEXT) isspace.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@isxdigit.$(OBJEXT) tolower.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@toupper.$(OBJEXT)
+lib_a_LIBADD = 
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  ctype_.o isalnum.o isalpha.o \
+@USE_LIBTOOL_FALSE@isascii.o iscntrl.o isdigit.o islower.o isupper.o \
+@USE_LIBTOOL_FALSE@isprint.o ispunct.o isspace.o isxdigit.o toascii.o \
+@USE_LIBTOOL_FALSE@tolower.o toupper.o _tolower.o _toupper.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
+libctype_la_LIBADD = 
 @USE_LIBTOOL_TRUE@libctype_la_OBJECTS =  ctype_.lo isalnum.lo isalpha.lo \
-@USE_LIBTOOL_TRUE@iscntrl.lo isdigit.lo islower.lo isupper.lo \
-@USE_LIBTOOL_TRUE@isprint.lo ispunct.lo isspace.lo isxdigit.lo \
-@USE_LIBTOOL_TRUE@tolower.lo toupper.lo
+@USE_LIBTOOL_TRUE@isascii.lo iscntrl.lo isdigit.lo islower.lo \
+@USE_LIBTOOL_TRUE@isupper.lo isprint.lo ispunct.lo isspace.lo \
+@USE_LIBTOOL_TRUE@isxdigit.lo toascii.lo tolower.lo toupper.lo \
+@USE_LIBTOOL_TRUE@_tolower.lo _toupper.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -178,7 +188,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libctype_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus ctype/Makefile
 
@@ -199,11 +209,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -212,7 +217,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libc/ctype/ctype.tex b/newlib/libc/ctype/ctype.tex
index d15e86b..a0971d8 100644
--- a/newlib/libc/ctype/ctype.tex
+++ b/newlib/libc/ctype/ctype.tex
@@ -12,33 +12,15 @@ The header file @file{ctype.h} defines the macros.
 * isascii::   ASCII character predicate
 * iscntrl::   Control character predicate
 * isdigit::   Decimal digit predicate
-* islower::   Lowercase character predicate
+* islower::   Lower-case character predicate
 * isprint::   Printable character predicates (isprint, isgraph)
 * ispunct::   Punctuation character predicate
 * isspace::   Whitespace character predicate
 * isupper::   Uppercase character predicate
 * isxdigit::  Hexadecimal digit predicate
 * toascii::   Force integers to ASCII range
-* tolower::   Translate characters to lowercase
-* toupper::   Translate characters to uppercase
-* iswalnum::  Alphanumeric wide character predicate
-* iswalpha::  Alphabetic wide character predicate
-* iswblank::  Blank wide character predicate
-* iswcntrl::  Control wide character predicate
-* iswdigit::  Decimal digit wide character predicate
-* iswgraph::  Graphic wide character predicate
-* iswlower::  Lowercase wide character predicate
-* iswprint::  Printable wide character predicate
-* iswpunct::  Punctuation wide character predicate
-* iswspace::  Whitespace wide character predicate
-* iswupper::  Uppercase wide character predicate
-* iswxdigit:: Hexadecimal digit wide character predicate
-* iswctype::  Extensible wide-character test
-* wctype::    Compute wide-character test type
-* towlower::  Translate wide characters to lowercase
-* towupper::  Translate wide characters to uppercase
-* towctrans:: Extensible wide-character translation
-* wctrans::   Compute wide-character translation type
+* tolower::   Translate characters to lower case
+* toupper::   Translate characters to upper case
 @end menu
 
 @page
@@ -83,58 +65,4 @@ The header file @file{ctype.h} defines the macros.
 @page
 @include ctype/toupper.def
 
-@page
-@include ctype/iswalnum.def
-
-@page
-@include ctype/iswalpha.def
-
-@page
-@include ctype/iswcntrl.def
-
-@page
-@include ctype/iswblank.def
-
-@page
-@include ctype/iswdigit.def
-
-@page
-@include ctype/iswgraph.def
-
-@page
-@include ctype/iswlower.def
-
-@page
-@include ctype/iswprint.def
-
-@page
-@include ctype/iswpunct.def
-
-@page
-@include ctype/iswspace.def
-
-@page
-@include ctype/iswupper.def
-
-@page
-@include ctype/iswxdigit.def
-
-@page
-@include ctype/iswctype.def
-
-@page
-@include ctype/wctype.def
-
-@page
-@include ctype/towlower.def
-
-@page
-@include ctype/towupper.def
-
-@page
-@include ctype/towctrans.def
-
-@page
-@include ctype/wctrans.def
-
 
diff --git a/newlib/libc/ctype/ctype_.c b/newlib/libc/ctype/ctype_.c
index 5551dbd..90a1694 100644
--- a/newlib/libc/ctype/ctype_.c
+++ b/newlib/libc/ctype/ctype_.c
@@ -84,40 +84,21 @@ static _CONST char _ctype_b[128 + 256] = {
 	_CTYPE_DATA_128_256
 };
 
-#  if defined(__CYGWIN__)
-_CONST char __declspec(dllexport) *__ctype_ptr = _ctype_b + 128;
-#  else
-_CONST char *__ctype_ptr = _ctype_b + 128;
-#  endif
-
-#  if defined(_HAVE_ARRAY_ALIASING)
-
-#    if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined(__CYGWIN32__)
 extern _CONST char __declspec(dllexport) _ctype_[1 + 256] __attribute__ ((alias ("_ctype_b+127")));
-#    else
+_CONST char __declspec(dllexport) *__ctype_ptr = _ctype_b + 128;
+#else
 extern _CONST char _ctype_[1 + 256] __attribute__ ((alias ("_ctype_b+127")));
-#    endif
-
-#  else /* !_HAVE_ARRAY_ALIASING */
-
-#    if defined(__CYGWIN__)
-_CONST char __declspec(dllexport) _ctype_[1 + 256] = {
-#    else
-_CONST char _ctype_[1 + 256] = {
-#    endif
-	0,
-	_CTYPE_DATA_0_127,
-	_CTYPE_DATA_128_256
-};
-#  endif /* !_HAVE_ARRAY_ALIASING */
+_CONST char *__ctype_ptr = _ctype_b + 128;
+#endif
 
 #else	/* !defined(ALLOW_NEGATIVE_CTYPE_INDEX) */
 
-# if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined(__CYGWIN32__)
 _CONST char __declspec(dllexport) _ctype_[1 + 256] = {
-# else
+#else
 _CONST char _ctype_[1 + 256] = {
-# endif
+#endif
 	0,
 	_CTYPE_DATA_0_127,
 	_CTYPE_DATA_128_256
diff --git a/newlib/libc/ctype/isblank.c b/newlib/libc/ctype/isblank.c
deleted file mode 100644
index c75d8ab..0000000
--- a/newlib/libc/ctype/isblank.c
+++ /dev/null
@@ -1,40 +0,0 @@
-
-/*
-FUNCTION
-	<<isblank>>---blank character predicate
-
-INDEX
-	isblank
-
-ANSI_SYNOPSIS
-	#include <ctype.h>
-	int isblank(int <[c]>);
-
-TRAD_SYNOPSIS
-	#include <ctype.h>
-	int isblank(<[c]>);
-
-DESCRIPTION
-<<isblank>> is a macro which classifies ASCII integer values by table
-lookup.  It is a predicate returning non-zero for blank characters, and 0 
-for other characters.
-
-You can use a compiled subroutine instead of the macro definition by
-undefining the macro using `<<#undef isblank>>'.
-
-RETURNS
-<<isblank>> returns non-zero if <[c]> is a blank character.
-
-*/
-
-#include <_ansi.h>
-#include <ctype.h>
-
-
-
-#undef isblank
-int
-_DEFUN(isblank,(c),int c)
-{
-	return (c == ' ' || c == '\t');
-}
diff --git a/newlib/libc/ctype/islower.c b/newlib/libc/ctype/islower.c
index cda4843..81ad0bb 100644
--- a/newlib/libc/ctype/islower.c
+++ b/newlib/libc/ctype/islower.c
@@ -1,7 +1,7 @@
 
 /*
 FUNCTION
-<<islower>>---lowercase character predicate
+<<islower>>---lower-case character predicate
 
 INDEX
 islower
@@ -17,14 +17,14 @@ int islower(<[c]>);
 DESCRIPTION
 <<islower>> is a macro which classifies ASCII integer values by table
 lookup.  It is a predicate returning non-zero for minuscules
-(lowercase alphabetic characters), and 0 for other characters.
+(lower-case alphabetic characters), and 0 for other characters.
 It is defined only when <<isascii>>(<[c]>) is true or <[c]> is EOF.
 
 You can use a compiled subroutine instead of the macro definition by
 undefining the macro using `<<#undef islower>>'.
 
 RETURNS
-<<islower>> returns non-zero if <[c]> is a lowercase letter (<<a>>--<<z>>).
+<<islower>> returns non-zero if <[c]> is a lower case letter (<<a>>--<<z>>).
 
 PORTABILITY
 <<islower>> is ANSI C.
diff --git a/newlib/libc/ctype/isupper.c b/newlib/libc/ctype/isupper.c
index 4cf9e9a..8127e25 100644
--- a/newlib/libc/ctype/isupper.c
+++ b/newlib/libc/ctype/isupper.c
@@ -16,7 +16,7 @@ int isupper(<[c]>);
 
 DESCRIPTION
 <<isupper>> is a macro which classifies ASCII integer values by table
-lookup.  It is a predicate returning non-zero for uppercase letters
+lookup.  It is a predicate returning non-zero for upper-case letters
 (<<A>>--<<Z>>), and 0 for other characters.  It is defined only when
 <<isascii>>(<[c]>) is true or <[c]> is EOF.
 
@@ -24,7 +24,7 @@ You can use a compiled subroutine instead of the macro definition by
 undefining the macro using `<<#undef isupper>>'.
 
 RETURNS
-<<isupper>> returns non-zero if <[c]> is a uppercase letter (A-Z).
+<<isupper>> returns non-zero if <[c]> is a upper case letter (A-Z).
 
 PORTABILITY
 <<isupper>> is ANSI C.
diff --git a/newlib/libc/ctype/iswalnum.c b/newlib/libc/ctype/iswalnum.c
deleted file mode 100644
index c417cb3..0000000
--- a/newlib/libc/ctype/iswalnum.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-FUNCTION
-	<<iswalnum>>---alphanumeric wide character test
-
-INDEX
-	iswalnum
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswalnum(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswalnum(<[c]>)
-	wint_t <[c]>;
-
-DESCRIPTION
-<<iswalnum>> is a function which classifies wide-character values that
-are alphanumeric.
-
-RETURNS
-<<iswalnum>> returns non-zero if <[c]> is a alphanumeric wide character.
-
-PORTABILITY
-<<iswalnum>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <wctype.h>
-
-int
-_DEFUN(iswalnum,(c),wint_t c)
-{
-  return (iswalpha (c) || iswdigit (c));
-}
-
diff --git a/newlib/libc/ctype/iswalpha.c b/newlib/libc/ctype/iswalpha.c
deleted file mode 100644
index 7f8de8e..0000000
--- a/newlib/libc/ctype/iswalpha.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-FUNCTION
-	<<iswalpha>>---alphabetic wide character test
-
-INDEX
-	iswalpha
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswalpha(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswalpha(<[c]>)
-	wint_t <[c]>;
-
-DESCRIPTION
-<<iswalpha>> is a function which classifies wide-character values that
-are alphabetic.
-
-RETURNS
-<<iswalpha>> returns non-zero if <[c]> is an alphabetic wide character.
-
-PORTABILITY
-<<iswalpha>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <newlib.h>
-#include <wctype.h>
-#include <string.h>
-#include <ctype.h>
-#include "local.h"
-
-#ifdef _MB_CAPABLE
-#include "utf8alpha.h"
-#endif /* _MB_CAPABLE */
-
-int
-_DEFUN(iswalpha,(c), wint_t c)
-{
-  int unicode = 0;
-  if (__lc_ctype[0] == 'C' && __lc_ctype[1] == '\0')
-    {
-      unicode = 0;
-      /* fall-through */ 
-    }
-#ifdef _MB_CAPABLE
-  else if (!strcmp (__lc_ctype, "C-JIS"))
-    {
-      c = __jp2uc (c, JP_JIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-SJIS"))
-    {
-      c = __jp2uc (c, JP_SJIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-EUCJP"))
-    {
-      c = __jp2uc (c, JP_EUCJP);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-UTF-8"))
-    {
-      unicode = 1;
-    }
-
-  if (unicode)
-    {
-      unsigned const char *table;
-      unsigned char *ptr;
-      unsigned char ctmp;
-      int size;
-      wint_t x = (c >> 8);
-      
-      /* for some large sections, all characters are alphabetic so handle them here */
-      if ((x >= 0x34 && x <= 0x4c) ||
-	  (x >= 0x4e && x <= 0x9e) ||
-	  (x >= 0xac && x <= 0xd6) ||
-	  (x >= 0x200 && x <= 0x2a5))
-	return 1;
-      
-      switch (x)
-	{
-	case 0x00:
-	  table = u0;
-	  size = sizeof(u0);
-	  break;
-	case 0x01:
-	case 0x15:
-	case 0xa0:
-	case 0xa1:
-	case 0xa2:
-	case 0xa3:
-	case 0xf9:
-	case 0xfc:
-	case 0x2f8:
-	case 0x2f9:
-	  return 1;
-	case 0x02:
-	  table = u2;
-	  size = sizeof(u2);
-	  break;
-	case 0x03:
-	  table = u3;
-	  size = sizeof(u3);
-	  break;
-	case 0x04:
-	  table = u4;
-	  size = sizeof(u4);
-	  break;
-	case 0x05:
-	  table = u5;
-	  size = sizeof(u5);
-	  break;
-	case 0x06:
-	  table = u6;
-	  size = sizeof(u6);
-	  break;
-	case 0x07:
-	  table = u7;
-	  size = sizeof(u7);
-	  break;
-	case 0x09:
-	  table = u9;
-	  size = sizeof(u9);
-	  break;
-	case 0x0a:
-	  table = ua;
-	  size = sizeof(ua);
-	  break;
-	case 0x0b:
-	  table = ub;
-	  size = sizeof(ub);
-	  break;
-	case 0x0c:
-	  table = uc;
-	  size = sizeof(uc);
-	  break;
-	case 0x0d:
-	  table = ud;
-	  size = sizeof(ud);
-	  break;
-	case 0x0e:
-	  table = ue;
-	  size = sizeof(ue);
-	  break;
-	case 0x0f:
-	  table = uf;
-	  size = sizeof(uf);
-	  break;
-	case 0x10:
-	  table = u10;
-	  size = sizeof(u10);
-	  break;
-	case 0x11:
-	  table = u11;
-	  size = sizeof(u11);
-	  break;
-	case 0x12:
-	  table = u12;
-	  size = sizeof(u12);
-	  break;
-	case 0x13:
-	  table = u13;
-	  size = sizeof(u13);
-	  break;
-	case 0x14:
-	  table = u14;
-	  size = sizeof(u14);
-	  break;
-	case 0x16:
-	  table = u16;
-	  size = sizeof(u16);
-	  break;
-	case 0x17:
-	  table = u17;
-	  size = sizeof(u17);
-	  break;
-	case 0x18:
-	  table = u18;
-	  size = sizeof(u18);
-	  break;
-	case 0x1e:
-	  table = u1e;
-	  size = sizeof(u1e);
-	  break;
-	case 0x1f:
-	  table = u1f;
-	  size = sizeof(u1f);
-	  break;
-	case 0x20:
-	  table = u20;
-	  size = sizeof(u20);
-	  break;
-	case 0x21:
-	  table = u21;
-	  size = sizeof(u21);
-	  break;
-	case 0x24:
-	  table = u24;
-	  size = sizeof(u24);
-	  break;
-	case 0x30:
-	  table = u30;
-	  size = sizeof(u30);
-	  break;
-	case 0x31:
-	  table = u31;
-	  size = sizeof(u31);
-	  break;
-	case 0x4d:
-	  table = u4d;
-	  size = sizeof(u4d);
-	  break;
-	case 0x9f:
-	  table = u9f;
-	  size = sizeof(u9f);
-	  break;
-	case 0xa4:
-	  table = ua4;
-	  size = sizeof(ua4);
-	  break;
-	case 0xd7:
-	  table = ud7;
-	  size = sizeof(ud7);
-	  break;
-	case 0xfa:
-	  table = ufa;
-	  size = sizeof(ufa);
-	  break;
-	case 0xfb:
-	  table = ufb;
-	  size = sizeof(ufb);
-	  break;
-	case 0xfd:
-	  table = ufd;
-	  size = sizeof(ufd);
-	  break;
-	case 0xfe:
-	  table = ufe;
-	  size = sizeof(ufe);
-	  break;
-	case 0xff:
-	  table = uff;
-	  size = sizeof(uff);
-	  break;
-	case 0x103:
-	  table = u103;
-	  size = sizeof(u103);
-	  break;
-	case 0x104:
-	  table = u104;
-	  size = sizeof(u104);
-	  break;
-	case 0x1d4:
-	  table = u1d4;
-	  size = sizeof(u1d4);
-	  break;
-	case 0x1d5:
-	  table = u1d5;
-	  size = sizeof(u1d5);
-	  break;
-	case 0x1d6:
-	  table = u1d6;
-	  size = sizeof(u1d6);
-	  break;
-	case 0x1d7:
-	  table = u1d7;
-	  size = sizeof(u1d7);
-	  break;
-	case 0x2a6:
-	  table = u2a6;
-	  size = sizeof(u2a6);
-	  break;
-	case 0x2fa:
-	  table = u2fa;
-	  size = sizeof(u2fa);
-	  break;
-	default:
-	  return 0;
-	}
-      /* we have narrowed down to a section of 256 characters to check */
-      /* now check if c matches the alphabetic wide-chars within that section */
-      ptr = (unsigned char *)table;
-      ctmp = (unsigned char)c;
-      while (ptr < table + size)
-	{
-	  if (ctmp == *ptr)
-	    return 1;
-	  if (ctmp < *ptr)
-	    return 0;
-	  /* otherwise c > *ptr */
-	  /* look for 0x0 as next element which indicates a range */
-	  ++ptr;
-	  if (*ptr == 0x0)
-	    {
-	      /* we have a range..see if c falls within range */
-	      ++ptr;
-	      if (ctmp <= *ptr)
-		return 1;
-	      ++ptr;
-	    }
-	}
-      /* not in table */
-      return 0;
-    }
-#endif /* _MB_CAPABLE */
-
-  return (c < (wint_t)0x100 ? isalpha (c) : 0);
-}
-
diff --git a/newlib/libc/ctype/iswblank.c b/newlib/libc/ctype/iswblank.c
deleted file mode 100644
index 48205bb..0000000
--- a/newlib/libc/ctype/iswblank.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-FUNCTION
-	<<iswblank>>---blank wide character test
-
-INDEX
-	iswblank
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswblank(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswblank(<[c]>)
-	wint_t <[c]>;
-
-DESCRIPTION
-<<iswblank>> is a function which classifies wide-character values that
-are categorized as blank.
-
-RETURNS
-<<iswblank>> returns non-zero if <[c]> is a blank wide character.
-
-PORTABILITY
-<<iswblank>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <newlib.h>
-#include <wctype.h>
-#include <ctype.h>
-#include <string.h>
-#include "local.h"
-
-int
-_DEFUN(iswblank,(c), wint_t c)
-{
-  int unicode = 0;
-  if (__lc_ctype[0] == 'C' && __lc_ctype[1] == '\0')
-    {
-      unicode = 0;
-      /* fall-through */ 
-    }
-#ifdef _MB_CAPABLE
-  else if (!strcmp (__lc_ctype, "C-JIS"))
-    {
-      c = __jp2uc (c, JP_JIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-SJIS"))
-    {
-      c = __jp2uc (c, JP_SJIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-EUCJP"))
-    {
-      c = __jp2uc (c, JP_EUCJP);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-UTF-8"))
-    {
-      unicode = 1;
-    }
-
-  if (unicode)
-    {
-      return (c == 0x0009 || c == 0x0020 || c == 0x1680 ||
-              (c >= 0x2000 && c <= 0x2006) ||
-              (c >= 0x2008 && c <= 0x200b) ||
-              c == 0x205f || c == 0x3000);
-    }
-#endif /* _MB_CAPABLE */
-
-  return (c < 0x100 ? isblank (c) : 0);
-}
-
diff --git a/newlib/libc/ctype/iswcntrl.c b/newlib/libc/ctype/iswcntrl.c
deleted file mode 100644
index 15ff1fa..0000000
--- a/newlib/libc/ctype/iswcntrl.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-FUNCTION
-	<<iswcntrl>>---control wide character test
-
-INDEX
-	iswcntrl
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswcntrl(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswcntrl(<[c]>)
-	wint_t <[c]>;
-
-DESCRIPTION
-<<iswcntrl>> is a function which classifies wide-character values that
-are categorized as control characters.
-
-RETURNS
-<<iswcntrl>> returns non-zero if <[c]> is a control wide character.
-
-PORTABILITY
-<<iswcntrl>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <newlib.h>
-#include <wctype.h>
-#include <ctype.h>
-#include <string.h>
-#include "local.h"
-
-int
-_DEFUN(iswcntrl,(c), wint_t c)
-{
-  int unicode = 0;
-  if (__lc_ctype[0] == 'C' && __lc_ctype[1] == '\0')
-    {
-      unicode = 0;
-      /* fall-through */ 
-    }
-#ifdef _MB_CAPABLE
-  else if (!strcmp (__lc_ctype, "C-JIS"))
-    {
-      c = __jp2uc (c, JP_JIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-SJIS"))
-    {
-      c = __jp2uc (c, JP_SJIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-EUCJP"))
-    {
-      c = __jp2uc (c, JP_EUCJP);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-UTF-8"))
-    {
-      unicode = 1;
-    }
-
-  if (unicode)
-    {
-      return ((c >= 0x0000 && c <= 0x001f) || 
-              (c >= 0x007f && c <= 0x009f) ||
-              c == 0x2028 || c == 0x2029);
-    }
-#endif /* _MB_CAPABLE */
-
-  return (c < 0x100 ? iscntrl (c) : 0);
-}
-
diff --git a/newlib/libc/ctype/iswctype.c b/newlib/libc/ctype/iswctype.c
deleted file mode 100644
index 3f3eadf..0000000
--- a/newlib/libc/ctype/iswctype.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-FUNCTION
-	<<iswctype>>---extensible wide-character test
-
-INDEX
-	iswctype
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswctype(wint_t <[c]>, wctype_t <[desc]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswctype(<[c]>, <[desc]>)
-	wint_t <[c]>;
-	wctype_t <[desc]>;
-
-DESCRIPTION
-<<iswctype>> is a function which classifies wide-character values using the
-wide-character test specified by <[desc]>.
-
-RETURNS
-<<iswctype>> returns non-zero if and only if <[c]> matches the test specified by <[desc]>.
-If <[desc]> is unknown, zero is returned.
-
-PORTABILITY
-<<iswctype>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <wctype.h>
-#include "local.h"
-
-int
-_DEFUN(iswctype,(c, desc), wint_t c _AND wctype_t desc)
-{
-  switch (desc)
-    {
-    case WC_ALNUM:
-      return iswalnum (c);
-    case WC_ALPHA:
-      return iswalpha (c);
-    case WC_BLANK:
-      return iswblank (c);
-    case WC_CNTRL:
-      return iswcntrl (c);
-    case WC_DIGIT:
-      return iswdigit (c);
-    case WC_GRAPH:
-      return iswgraph (c);
-    case WC_LOWER:
-      return iswlower (c);
-    case WC_PRINT:
-      return iswprint (c);
-    case WC_PUNCT:
-      return iswpunct (c);
-    case WC_SPACE:
-      return iswspace (c);
-    case WC_UPPER:
-      return iswupper (c);
-    case WC_XDIGIT:
-      return iswxdigit (c);
-    default:
-      return 0; /* eliminate warning */
-    }
-
-  /* otherwise unknown */
-  return 0;
-}
-
diff --git a/newlib/libc/ctype/iswdigit.c b/newlib/libc/ctype/iswdigit.c
deleted file mode 100644
index 8ba5d5f..0000000
--- a/newlib/libc/ctype/iswdigit.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-FUNCTION
-	<<iswdigit>>---decimal digit wide character test
-
-INDEX
-	iswdigit
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswdigit(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswdigit(<[c]>)
-	wint_t <[c]>;
-
-DESCRIPTION
-<<iswdigit>> is a function which classifies wide-character values that
-are decimal digits.
-
-RETURNS
-<<iswdigit>> returns non-zero if <[c]> is a decimal digit wide character.
-
-PORTABILITY
-<<iswdigit>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <wctype.h>
-
-int
-_DEFUN(iswdigit,(c), wint_t c)
-{
-  return (c >= (wint_t)'0' && c <= (wint_t)'9');
-}
-
diff --git a/newlib/libc/ctype/iswgraph.c b/newlib/libc/ctype/iswgraph.c
deleted file mode 100644
index bb1e519..0000000
--- a/newlib/libc/ctype/iswgraph.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-FUNCTION
-	<<iswgraph>>---graphic wide character test
-
-INDEX
-	iswgraph
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswgraph(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswgraph(<[c]>)
-	wint_t <[c]>;
-
-DESCRIPTION
-<<iswgraph>> is a function which classifies wide-character values that
-are graphic.
-
-RETURNS
-<<iswgraph>> returns non-zero if <[c]> is a graphic wide character.
-
-PORTABILITY
-<<iswgraph>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <wctype.h>
-
-int
-_DEFUN(iswgraph,(c),wint_t c)
-{
-  return (iswprint (c) && !iswspace (c));
-}
-
diff --git a/newlib/libc/ctype/iswlower.c b/newlib/libc/ctype/iswlower.c
deleted file mode 100644
index 683a9cb..0000000
--- a/newlib/libc/ctype/iswlower.c
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/*
-FUNCTION
-	<<iswlower>>---lowercase wide character test
-
-INDEX
-	iswlower
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswlower(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswlower(<[c]>)
-	wint_t <[c]>;
-
-DESCRIPTION
-<<iswlower>> is a function which classifies wide-character values that
-have uppercase translations.
-
-RETURNS
-<<iswlower>> returns non-zero if <[c]> is a lowercase wide character.
-
-PORTABILITY
-<<iswlower>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <wctype.h>
-
-int
-_DEFUN(iswlower,(c),wint_t c)
-{
-	return (towupper (c) != c);
-}
-
diff --git a/newlib/libc/ctype/iswprint.c b/newlib/libc/ctype/iswprint.c
deleted file mode 100644
index 6c0cc55..0000000
--- a/newlib/libc/ctype/iswprint.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-FUNCTION
-	<<iswprint>>---printable wide character test
-
-INDEX
-	iswprint
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswprint(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswprint(<[c]>)
-	wint_t <[c]>;
-
-DESCRIPTION
-<<iswprint>> is a function which classifies wide-character values that
-are printable.
-
-RETURNS
-<<iswprint>> returns non-zero if <[c]> is a printable wide character.
-
-PORTABILITY
-<<iswprint>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <newlib.h>
-#include <wctype.h>
-#include <string.h>
-#include <ctype.h>
-#include "local.h"
-
-#ifdef _MB_CAPABLE
-#include "utf8print.h"
-#endif /* _MB_CAPABLE */
-
-int
-_DEFUN(iswprint,(c), wint_t c)
-{
-  int unicode = 0;
-  if (__lc_ctype[0] == 'C' && __lc_ctype[1] == '\0')
-    {
-      unicode = 0;
-      /* fall-through */ 
-    }
-#ifdef _MB_CAPABLE
-  else if (!strcmp (__lc_ctype, "C-JIS"))
-    {
-      c = __jp2uc (c, JP_JIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-SJIS"))
-    {
-      c = __jp2uc (c, JP_SJIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-EUCJP"))
-    {
-      c = __jp2uc (c, JP_EUCJP);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-UTF-8"))
-    {
-      unicode = 1;
-    }
-
-  if (unicode)
-    {
-      unsigned const char *table;
-      unsigned char *ptr;
-      unsigned char ctmp;
-      int size;
-      wint_t x = (c >> 8);
-      
-      /* for some large sections, all characters are printuation so handle them here */
-      if ((x >= 0x34 && x <= 0x4c) ||
-	  (x >= 0x4e && x <= 0x9e) ||
-	  (x >= 0xac && x <= 0xd6) ||
-	  (x >= 0xe0 && x <= 0xf9) ||
-	  (x >= 0x200 && x <= 0x2a5) ||
-	  (x >= 0xf00 && x <= 0xffe) ||
-	  (x >= 0x1000 && x <= 0x10fe))
-	return 1;
-      
-      switch (x)
-	{
-	case 0x01:
-	case 0x15:
-	case 0x22:
-	case 0x25:
-	case 0x28:
-	case 0x29:
-	case 0x2a:
-	case 0xa0:
-	case 0xa1:
-	case 0xa2:
-	case 0xa3:
-	case 0xfc:
-	case 0x2f8:
-	case 0x2f9:
-	  return 1;
-	case 0x00:
-	  table = u0;
-	  size = sizeof(u0);
-	  break;
-	case 0x02:
-	  table = u2;
-	  size = sizeof(u2);
-	  break;
-	case 0x03:
-	  table = u3;
-	  size = sizeof(u3);
-	  break;
-	case 0x04:
-	  table = u4;
-	  size = sizeof(u4);
-	  break;
-	case 0x05:
-	  table = u5;
-	  size = sizeof(u5);
-	  break;
-	case 0x06:
-	  table = u6;
-	  size = sizeof(u6);
-	  break;
-	case 0x07:
-	  table = u7;
-	  size = sizeof(u7);
-	  break;
-	case 0x09:
-	  table = u9;
-	  size = sizeof(u9);
-	  break;
-	case 0x0a:
-	  table = ua;
-	  size = sizeof(ua);
-	  break;
-	case 0x0b:
-	  table = ub;
-	  size = sizeof(ub);
-	  break;
-	case 0x0c:
-	  table = uc;
-	  size = sizeof(uc);
-	  break;
-	case 0x0d:
-	  table = ud;
-	  size = sizeof(ud);
-	  break;
-	case 0x0e:
-	  table = ue;
-	  size = sizeof(ue);
-	  break;
-	case 0x0f:
-	  table = uf;
-	  size = sizeof(uf);
-	  break;
-	case 0x10:
-	  table = u10;
-	  size = sizeof(u10);
-	  break;
-	case 0x11:
-	  table = u11;
-	  size = sizeof(u11);
-	  break;
-	case 0x12:
-	  table = u12;
-	  size = sizeof(u12);
-	  break;
-	case 0x13:
-	  table = u13;
-	  size = sizeof(u13);
-	  break;
-	case 0x14:
-	  table = u14;
-	  size = sizeof(u14);
-	  break;
-	case 0x16:
-	  table = u16;
-	  size = sizeof(u16);
-	  break;
-	case 0x17:
-	  table = u17;
-	  size = sizeof(u17);
-	  break;
-	case 0x18:
-	  table = u18;
-	  size = sizeof(u18);
-	  break;
-	case 0x1e:
-	  table = u1e;
-	  size = sizeof(u1e);
-	  break;
-	case 0x1f:
-	  table = u1f;
-	  size = sizeof(u1f);
-	  break;
-	case 0x20:
-	  table = u20;
-	  size = sizeof(u20);
-	  break;
-	case 0x21:
-	  table = u21;
-	  size = sizeof(u21);
-	  break;
-	case 0x23:
-	  table = u23;
-	  size = sizeof(u23);
-	  break;
-	case 0x24:
-	  table = u24;
-	  size = sizeof(u24);
-	  break;
-	case 0x26:
-	  table = u26;
-	  size = sizeof(u26);
-	  break;
-	case 0x27:
-	  table = u27;
-	  size = sizeof(u27);
-	  break;
-	case 0x2e:
-	  table = u2e;
-	  size = sizeof(u2e);
-	  break;
-	case 0x2f:
-	  table = u2f;
-	  size = sizeof(u2f);
-	  break;
-	case 0x30:
-	  table = u30;
-	  size = sizeof(u30);
-	  break;
-	case 0x31:
-	  table = u31;
-	  size = sizeof(u31);
-	  break;
-	case 0x32:
-	  table = u32;
-	  size = sizeof(u32);
-	  break;
-	case 0x33:
-	  table = u33;
-	  size = sizeof(u33);
-	  break;
-	case 0x4d:
-	  table = u4d;
-	  size = sizeof(u4d);
-	  break;
-	case 0x9f:
-	  table = u9f;
-	  size = sizeof(u9f);
-	  break;
-	case 0xa4:
-	  table = ua4;
-	  size = sizeof(ua4);
-	  break;
-	case 0xd7:
-	  table = ud7;
-	  size = sizeof(ud7);
-	  break;
-	case 0xfa:
-	  table = ufa;
-	  size = sizeof(ufa);
-	  break;
-	case 0xfb:
-	  table = ufb;
-	  size = sizeof(ufb);
-	  break;
-	case 0xfd:
-	  table = ufd;
-	  size = sizeof(ufd);
-	  break;
-	case 0xfe:
-	  table = ufe;
-	  size = sizeof(ufe);
-	  break;
-	case 0xff:
-	  table = uff;
-	  size = sizeof(uff);
-	  break;
-	case 0x103:
-	  table = u103;
-	  size = sizeof(u103);
-	  break;
-	case 0x104:
-	  table = u104;
-	  size = sizeof(u104);
-	  break;
-	case 0x1d0:
-	  table = u1d0;
-	  size = sizeof(u1d0);
-	  break;
-	case 0x1d1:
-	  table = u1d1;
-	  size = sizeof(u1d1);
-	  break;
-	case 0x1d4:
-	  table = u1d4;
-	  size = sizeof(u1d4);
-	  break;
-	case 0x1d5:
-	  table = u1d5;
-	  size = sizeof(u1d5);
-	  break;
-	case 0x1d6:
-	  table = u1d6;
-	  size = sizeof(u1d6);
-	  break;
-	case 0x1d7:
-	  table = u1d7;
-	  size = sizeof(u1d7);
-	  break;
-	case 0x2a6:
-	  table = u2a6;
-	  size = sizeof(u2a6);
-	  break;
-	case 0x2fa:
-	  table = u2fa;
-	  size = sizeof(u2fa);
-	  break;
-	case 0xe00:
-	  table = ue00;
-	  size = sizeof(ue00);
-	  break;
-	case 0xfff:
-	  table = ufff;
-	  size = sizeof(ufff);
-	  break;
-	case 0x10ff:
-	  table = u10ff;
-	  size = sizeof(u10ff);
-	  break;
-	default:
-	  return 0;
-	}
-      /* we have narrowed down to a section of 256 characters to check */
-      /* now check if c matches the printuation wide-chars within that section */
-      ptr = (unsigned char *)table;
-      ctmp = (unsigned char)c;
-      while (ptr < table + size)
-	{
-	  if (ctmp == *ptr)
-	    return 1;
-	  if (ctmp < *ptr)
-	    return 0;
-	  /* otherwise c > *ptr */
-	  /* look for 0x0 as next element which indicates a range */
-	  ++ptr;
-	  if (*ptr == 0x0)
-	    {
-	      /* we have a range..see if c falls within range */
-	      ++ptr;
-	      if (ctmp <= *ptr)
-		return 1;
-	      ++ptr;
-	    }
-	}
-      /* not in table */
-      return 0;
-    }
-#endif /* _MB_CAPABLE */
-
-  return (c < (wint_t)0x100 ? isprint (c) : 0);
-}
-
diff --git a/newlib/libc/ctype/iswpunct.c b/newlib/libc/ctype/iswpunct.c
deleted file mode 100644
index c6a4eda..0000000
--- a/newlib/libc/ctype/iswpunct.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-FUNCTION
-	<<iswpunct>>---punctuation wide character test
-
-INDEX
-	iswpunct
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswpunct(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswpunct(<[c]>)
-	wint_t <[c]>;
-
-DESCRIPTION
-<<iswpunct>> is a function which classifies wide-character values that
-are punctuation.
-
-RETURNS
-<<iswpunct>> returns non-zero if <[c]> is a punctuation wide character.
-
-PORTABILITY
-<<iswpunct>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <newlib.h>
-#include <wctype.h>
-#include <string.h>
-#include <ctype.h>
-#include "local.h"
-
-#ifdef _MB_CAPABLE
-#include "utf8punct.h"
-#endif /* _MB_CAPABLE */
-
-int
-_DEFUN(iswpunct,(c), wint_t c)
-{
-  int unicode = 0;
-  if (__lc_ctype[0] == 'C' && __lc_ctype[1] == '\0')
-    {
-      unicode = 0;
-      /* fall-through */ 
-    }
-#ifdef _MB_CAPABLE
-  else if (!strcmp (__lc_ctype, "C-JIS"))
-    {
-      c = __jp2uc (c, JP_JIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-SJIS"))
-    {
-      c = __jp2uc (c, JP_SJIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-EUCJP"))
-    {
-      c = __jp2uc (c, JP_EUCJP);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-UTF-8"))
-    {
-      unicode = 1;
-    }
-
-  if (unicode)
-    {
-      unsigned const char *table;
-      unsigned char *ptr;
-      unsigned char ctmp;
-      int size;
-      wint_t x = (c >> 8);
-      
-      /* for some large sections, all characters are punctuation so handle them here */
-      if ((x >= 0xe0 && x <= 0xf8) ||
-	  (x >= 0xf00 && x <= 0xffe) ||
-	  (x >= 0x1000 && x <= 0x10fe))
-	return 1;
-      
-      switch (x)
-	{
-	case 0x22:
-	case 0x25:
-	case 0x28:
-	case 0x29:
-	case 0x2a:
-	  return 1;
-	case 0x00:
-	  table = u0;
-	  size = sizeof(u0);
-	  break;
-	case 0x02:
-	  table = u2;
-	  size = sizeof(u2);
-	  break;
-	case 0x03:
-	  table = u3;
-	  size = sizeof(u3);
-	  break;
-	case 0x04:
-	  table = u4;
-	  size = sizeof(u4);
-	  break;
-	case 0x05:
-	  table = u5;
-	  size = sizeof(u5);
-	  break;
-	case 0x06:
-	  table = u6;
-	  size = sizeof(u6);
-	  break;
-	case 0x07:
-	  table = u7;
-	  size = sizeof(u7);
-	  break;
-	case 0x09:
-	  table = u9;
-	  size = sizeof(u9);
-	  break;
-	case 0x0a:
-	  table = ua;
-	  size = sizeof(ua);
-	  break;
-	case 0x0b:
-	  table = ub;
-	  size = sizeof(ub);
-	  break;
-	case 0x0c:
-	  table = uc;
-	  size = sizeof(uc);
-	  break;
-	case 0x0d:
-	  table = ud;
-	  size = sizeof(ud);
-	  break;
-	case 0x0e:
-	  table = ue;
-	  size = sizeof(ue);
-	  break;
-	case 0x0f:
-	  table = uf;
-	  size = sizeof(uf);
-	  break;
-	case 0x10:
-	  table = u10;
-	  size = sizeof(u10);
-	  break;
-	case 0x13:
-	  table = u13;
-	  size = sizeof(u13);
-	  break;
-	case 0x16:
-	  table = u16;
-	  size = sizeof(u16);
-	  break;
-	case 0x17:
-	  table = u17;
-	  size = sizeof(u17);
-	  break;
-	case 0x18:
-	  table = u18;
-	  size = sizeof(u18);
-	  break;
-	case 0x1f:
-	  table = u1f;
-	  size = sizeof(u1f);
-	  break;
-	case 0x20:
-	  table = u20;
-	  size = sizeof(u20);
-	  break;
-	case 0x21:
-	  table = u21;
-	  size = sizeof(u21);
-	  break;
-	case 0x23:
-	  table = u23;
-	  size = sizeof(u23);
-	  break;
-	case 0x24:
-	  table = u24;
-	  size = sizeof(u24);
-	  break;
-	case 0x26:
-	  table = u26;
-	  size = sizeof(u26);
-	  break;
-	case 0x27:
-	  table = u27;
-	  size = sizeof(u27);
-	  break;
-	case 0x2e:
-	  table = u2e;
-	  size = sizeof(u2e);
-	  break;
-	case 0x2f:
-	  table = u2f;
-	  size = sizeof(u2f);
-	  break;
-	case 0x30:
-	  table = u30;
-	  size = sizeof(u30);
-	  break;
-	case 0x31:
-	  table = u31;
-	  size = sizeof(u31);
-	  break;
-	case 0x32:
-	  table = u32;
-	  size = sizeof(u32);
-	  break;
-	case 0x33:
-	  table = u33;
-	  size = sizeof(u33);
-	  break;
-	case 0xa4:
-	  table = ua4;
-	  size = sizeof(ua4);
-	  break;
-	case 0xfb:
-	  table = ufb;
-	  size = sizeof(ufb);
-	  break;
-	case 0xfd:
-	  table = ufd;
-	  size = sizeof(ufd);
-	  break;
-	case 0xfe:
-	  table = ufe;
-	  size = sizeof(ufe);
-	  break;
-	case 0xff:
-	  table = uff;
-	  size = sizeof(uff);
-	  break;
-	case 0x103:
-	  table = u103;
-	  size = sizeof(u103);
-	  break;
-	case 0x1d0:
-	  table = u1d0;
-	  size = sizeof(u1d0);
-	  break;
-	case 0x1d1:
-	  table = u1d1;
-	  size = sizeof(u1d1);
-	  break;
-	case 0x1d6:
-	  table = u1d6;
-	  size = sizeof(u1d6);
-	  break;
-	case 0x1d7:
-	  table = u1d7;
-	  size = sizeof(u1d7);
-	  break;
-	case 0xe00:
-	  table = ue00;
-	  size = sizeof(ue00);
-	  break;
-	case 0xfff:
-	  table = ufff;
-	  size = sizeof(ufff);
-	  break;
-	case 0x10ff:
-	  table = u10ff;
-	  size = sizeof(u10ff);
-	  break;
-	default:
-	  return 0;
-	}
-      /* we have narrowed down to a section of 256 characters to check */
-      /* now check if c matches the punctuation wide-chars within that section */
-      ptr = (unsigned char *)table;
-      ctmp = (unsigned char)c;
-      while (ptr < table + size)
-	{
-	  if (ctmp == *ptr)
-	    return 1;
-	  if (ctmp < *ptr)
-	    return 0;
-	  /* otherwise c > *ptr */
-	  /* look for 0x0 as next element which indicates a range */
-	  ++ptr;
-	  if (*ptr == 0x0)
-	    {
-	      /* we have a range..see if c falls within range */
-	      ++ptr;
-	      if (ctmp <= *ptr)
-		return 1;
-	      ++ptr;
-	    }
-	}
-      /* not in table */
-      return 0;
-    }
-#endif /* _MB_CAPABLE */
-
-  return (c < (wint_t)0x100 ? ispunct (c) : 0);
-}
-
diff --git a/newlib/libc/ctype/iswspace.c b/newlib/libc/ctype/iswspace.c
deleted file mode 100644
index e10a35d..0000000
--- a/newlib/libc/ctype/iswspace.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-FUNCTION
-	<<iswspace>>---whitespace wide character test
-
-INDEX
-	iswspace
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswspace(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswspace(<[c]>)
-	wint_t <[c]>;
-
-DESCRIPTION
-<<iswspace>> is a function which classifies wide-character values that
-are categorized as whitespace.
-
-RETURNS
-<<iswspace>> returns non-zero if <[c]> is a whitespace wide character.
-
-PORTABILITY
-<<iswspace>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <newlib.h>
-#include <wctype.h>
-#include <ctype.h>
-#include <string.h>
-#include "local.h"
-
-int
-_DEFUN(iswspace,(c), wint_t c)
-{
-  int unicode = 0;
-  if (__lc_ctype[0] == 'C' && __lc_ctype[1] == '\0')
-    {
-      unicode = 0;
-      /* fall-through */ 
-    }
-#ifdef _MB_CAPABLE
-  else if (!strcmp (__lc_ctype, "C-JIS"))
-    {
-      c = __jp2uc (c, JP_JIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-SJIS"))
-    {
-      c = __jp2uc (c, JP_SJIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-EUCJP"))
-    {
-      c = __jp2uc (c, JP_EUCJP);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-UTF-8"))
-    {
-      unicode = 1;
-    }
-
-  if (unicode)
-    {
-      return ((c >= 0x0009 && c <= 0x000d) || c == 0x0020 || c == 0x1680 ||
-              (c >= 0x2000 && c <= 0x2006) ||
-              (c >= 0x2008 && c <= 0x200b) ||
-              c == 0x2028 || c == 0x2029 ||
-              c == 0x205f || c == 0x3000);
-    }
-#endif /* _MB_CAPABLE */
-
-  return (c < 0x100 ? isspace (c) : 0);
-}
-
diff --git a/newlib/libc/ctype/iswupper.c b/newlib/libc/ctype/iswupper.c
deleted file mode 100644
index 424d652..0000000
--- a/newlib/libc/ctype/iswupper.c
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/*
-FUNCTION
-	<<iswupper>>---uppercase wide character test
-
-INDEX
-	iswupper
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswupper(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswupper(<[c]>)
-	wint_t <[c]>;
-
-DESCRIPTION
-<<iswupper>> is a function which classifies wide-character values that
-have uppercase translations.
-
-RETURNS
-<<iswupper>> returns non-zero if <[c]> is a uppercase wide character.
-
-PORTABILITY
-<<iswupper>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <wctype.h>
-
-int
-_DEFUN(iswupper,(c),wint_t c)
-{
-  return (towlower (c) != c);
-}
-
diff --git a/newlib/libc/ctype/iswxdigit.c b/newlib/libc/ctype/iswxdigit.c
deleted file mode 100644
index 4cf76fa..0000000
--- a/newlib/libc/ctype/iswxdigit.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-FUNCTION
-	<<iswxdigit>>---hexadecimal digit wide character test
-
-INDEX
-	iswxdigit
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	int iswxdigit(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	int iswxdigit(<[c]>)
-	wint_t <[c]>;
-
-DESCRIPTION
-<<iswxdigit>> is a function which classifies wide character values that
-are hexadecimal digits.
-
-RETURNS
-<<iswxdigit>> returns non-zero if <[c]> is a hexadecimal digit wide character.
-
-PORTABILITY
-<<iswxdigit>> is C99.
-
-No supporting OS subroutines are required.
-*/
-#include <_ansi.h>
-#include <wctype.h>
-
-int
-_DEFUN(iswxdigit,(c), wint_t c)
-{
-  return ((c >= (wint_t)'0' && c <= (wint_t)'9') ||
-	  (c >= (wint_t)'a' && c <= (wint_t)'f') ||
-	  (c >= (wint_t)'A' && c <= (wint_t)'F'));
-}
-
diff --git a/newlib/libc/ctype/jp2uc.c b/newlib/libc/ctype/jp2uc.c
deleted file mode 100644
index 9d26a7a..0000000
--- a/newlib/libc/ctype/jp2uc.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* Routine to translate from Japanese characters to Unicode */
-
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <newlib.h>
-
-#ifdef _MB_CAPABLE
-
-#include <_ansi.h>
-#include <wctype.h>
-#include "local.h"
-#include "jp2uc.h"
-
-wint_t
-_DEFUN (__jp2uc, (c, type), wint_t c _AND int type)
-{
-  int index, adj;
-  unsigned char byte1, byte2;
-  wint_t ret;
-
-  /* we actually use tables of EUCJP to Unicode.  For JIS, we simply
-     note that EUCJP is essentially JIS with the top bits on in each
-     byte and translate to EUCJP.  For SJIS, we do a translation to EUCJP before
-     accessing the tables. */
-  switch (type)
-    {
-    case JP_JIS:
-      byte1 = (c >> 8) + 0x80;
-      byte2 = (c & 0xff) + 0x80;
-      break;
-    case JP_EUCJP:
-      byte1 = (c >> 8);
-      byte2 = (c & 0xff);
-      break;
-    case JP_SJIS:
-      byte1 = c >> 8;
-      byte2 = c & 0xff;
-      if (byte2 <= 0x9e)
-        {
-          adj = 0xa1 - 0x22;
-          byte2 = (byte2 - 31) + 0xa1;
-        }
-      else
-        {
-          adj = 0xa1 - 0x21;
-          byte2 = (byte2 - 126) + 0xa1;
-        }
-      if (byte1 <= 0x9f)
-        byte1 = ((byte1 - 112) << 1) + adj;
-      else
-        byte1 = ((byte1 - 176) << 1) + adj;
-      break;
-    default:
-      return WEOF;
-    }
-
-  /* find conversion in jp2uc arrays */
-
-  /* handle larger ranges first */
-  if (byte1 >= 0xb0 && byte1 <= 0xcf && c <= 0xcfd3)
-    {
-      index = (byte1 - 0xb0) * 0xfe + (byte2 - 0xa1);
-      return b02cf[index];
-    }
-  else if (byte1 >= 0xd0 && byte1 <= 0xf4 && c <= 0xf4a6)
-    {
-      index = (byte1 - 0xd0) * 0xfe + (byte2 - 0xa1);
-      return d02f4[index];
-    }
-
-  /* handle smaller ranges here */    
-  switch (byte1)
-    {
-    case 0xA1:
-      return (wint_t)a1[byte2 - 0xa1];
-    case 0xA2:
-      ret = a2[byte2 - 0xa1];
-      if (ret != 0)
-	return (wint_t)ret;
-      break;
-    case 0xA3:
-      if (a3[byte2 - 0xa1])
-	return (wint_t)(0xff00 + (byte2 - 0xa0));
-      break;
-    case 0xA4:
-      if (byte2 <= 0xf3)
-	return (wint_t)(0x3000 + (byte2 - 0x60));
-      break;
-    case 0xA5:
-      if (byte2 <= 0xf6)
-	return (wint_t)(0x3000 + byte2);
-      break;
-    case 0xA6:
-      ret = 0;
-      if (byte2 <= 0xd8)
-	ret = (wint_t)a6[byte2 - 0xa1];
-      if (ret != 0)
-	return ret;
-      break;
-    case 0xA7:
-      ret = 0;
-      if (byte2 <= 0xf1)
-	ret = (wint_t)a7[byte2 - 0xa1];
-      if (ret != 0)
-	return ret;
-      break;
-    case 0xA8:
-      if (byte2 <= 0xc0)
-	return (wint_t)a8[byte2 - 0xa1];
-      break;
-    default:
-      return WEOF;
-    }
-
-  return WEOF; 
-}
-
-#endif /* _MB_CAPABLE */
diff --git a/newlib/libc/ctype/jp2uc.h b/newlib/libc/ctype/jp2uc.h
deleted file mode 100644
index 04eb67d..0000000
--- a/newlib/libc/ctype/jp2uc.h
+++ /dev/null
@@ -1,6849 +0,0 @@
-/* based on eucjp-208A.txt */
-
-/* a1 is contiguous from a1a1 to a1fe */
-static unsigned short a1[] = {
-  0x3000,
-  0x3001,
-  0x3002,
-  0xFF0C,
-  0xFF0E,
-  0x30FB,
-  0xFF1A,
-  0xFF1B,
-  0xFF1F,
-  0xFF01,
-  0x309B,
-  0x309C,
-  0x00B4,
-  0xFF40,
-  0x00A8,
-  0xFF3E,
-  0x203E,
-  0xFF3F,
-  0x30FD,
-  0x30FE,
-  0x309D,
-  0x309E,
-  0x3003,
-  0x4EDD,
-  0x3005,
-  0x3006,
-  0x3007,
-  0x30FC,
-  0x2014,
-  0x2010,
-  0xFF0F,
-  0xFF3C,
-  0x301C,
-  0x2016,
-  0xFF5C,
-  0x2026,
-  0x2025,
-  0x2018,
-  0x2019,
-  0x201C,
-  0x201D,
-  0xFF08,
-  0xFF09,
-  0x3014,
-  0x3015,
-  0xFF3B,
-  0xFF3D,
-  0xFF5B,
-  0xFF5D,
-  0x3008,
-  0x3009,
-  0x300A,
-  0x300B,
-  0x300C,
-  0x300D,
-  0x300E,
-  0x300F,
-  0x3010,
-  0x3011,
-  0xFF0B,
-  0x2212,
-  0x00B1,
-  0x00D7,
-  0x00F7,
-  0xFF1D,
-  0x2260,
-  0xFF1C,
-  0xFF1E,
-  0x2266,
-  0x2267,
-  0x221E,
-  0x2234,
-  0x2642,
-  0x2640,
-  0x00B0,
-  0x2032,
-  0x2033,
-  0x2103,
-  0x00A5,
-  0xFF04,
-  0x00A2,
-  0x00A3,
-  0xFF05,
-  0xFF03,
-  0xFF06,
-  0xFF0A,
-  0xFF20,
-  0x00A7,
-  0x2606,
-  0x2605,
-  0x25CB,
-  0x25CF,
-  0x25CE,
-  0x25C7
-};
-
-/* a2 has a number of holes between a2a1 and a2fe which we fill with 0x0000 */
-static unsigned short a2[] = {
-  0x25C6,
-  0x25A1,
-  0x25A0,
-  0x25B3,
-  0x25B2,
-  0x25BD,
-  0x25BC,
-  0x203B,
-  0x3012,
-  0x2192,
-  0x2190,
-  0x2191,
-  0x2193,
-  0x3013,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x2208,
-  0x220B,
-  0x2286,
-  0x2287,
-  0x2282,
-  0x2283,
-  0x222A,
-  0x2229,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x2227,
-  0x2228,
-  0x00AC,
-  0x21D2,
-  0x21D4,
-  0x2200,
-  0x2203,
-  0x2229,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x2220,
-  0x22A5,
-  0x2312,
-  0x2202,
-  0x2207,
-  0x2261,
-  0x2252,
-  0x226A,
-  0x226B,
-  0x221A,
-  0x223D,
-  0x221D,
-  0x2235,
-  0x222B,
-  0x222C,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x212B,
-  0x2030,
-  0x266F,
-  0x266D,
-  0x266A,
-  0x2020,
-  0x2021,
-  0x00B6,
-  0x222C,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x25EF
-};
-
-
-/* a3a1 to a3fe is mostly contiguous.  Conversion output values are
-   of the form 0xFFxx where xx is (yy - 0xA0) where the input is 0xA3yy */
-static unsigned char a3[] = {
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  0,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1,
-  1
-};
-
-/* a4 is contiguous from a4a1 to a4f3 */
-/* transform = 0x30xx where xx = last byte - 0x60 */
-
-/* a5 is contiguous from a5a1 to a5f6 */
-/* transform = 0x30xx where xx = last byte */
-
-/* a6 is mostly contiguous from a6a1 to a6d8 */
-static unsigned short a6[] = {
-  0x0391,
-  0x0392,
-  0x0393,
-  0x0394,
-  0x0395,
-  0x0396,
-  0x0397,
-  0x0398,
-  0x0399,
-  0x039A,
-  0x039B,
-  0x039C,
-  0x039D,
-  0x039E,
-  0x039F,
-  0x03A0,
-  0x03A1,
-  0x03A3,
-  0x03A4,
-  0x03A5,
-  0x03A6,
-  0x03A7,
-  0x03A8,
-  0x03A9,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x03B1,
-  0x03B2,
-  0x03B3,
-  0x03B4,
-  0x03B5,
-  0x03B6,
-  0x03B7,
-  0x03B8,
-  0x03B9,
-  0x03BA,
-  0x03BB,
-  0x03BC,
-  0x03BD,
-  0x03BE,
-  0x03BF,
-  0x03C0,
-  0x03C1,
-  0x03C3,
-  0x03C4,
-  0x03C5,
-  0x03C6,
-  0x03C7,
-  0x03C8,
-  0x03C9
-};
-
-/* a7 is mostly contiguous from a7a1 to a7f1 */
-static unsigned short a7[] = {
-  0x0410,
-  0x0411,
-  0x0412,
-  0x0413,
-  0x0414,
-  0x0415,
-  0x0401,
-  0x0416,
-  0x0417,
-  0x0418,
-  0x0419,
-  0x041A,
-  0x041B,
-  0x041C,
-  0x041D,
-  0x041E,
-  0x041F,
-  0x0420,
-  0x0421,
-  0x0422,
-  0x0423,
-  0x0424,
-  0x0425,
-  0x0426,
-  0x0427,
-  0x0428,
-  0x0429,
-  0x042A,
-  0x042B,
-  0x042C,
-  0x042D,
-  0x042E,
-  0x042F,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0000,
-  0x0430,
-  0x0431,
-  0x0432,
-  0x0433,
-  0x0434,
-  0x0435,
-  0x0451,
-  0x0436,
-  0x0437,
-  0x0438,
-  0x0439,
-  0x043A,
-  0x043B,
-  0x043C,
-  0x043D,
-  0x043E,
-  0x043F,
-  0x0440,
-  0x0441,
-  0x0442,
-  0x0443,
-  0x0444,
-  0x0445,
-  0x0446,
-  0x0447,
-  0x0448,
-  0x0449,
-  0x044A,
-  0x044B,
-  0x044C,
-  0x044D,
-  0x044E,
-  0x044F
-};
-
-/* a8 is contiguous from a8a1 to a8c0 */
-static unsigned short a8[] = {
-  0x2500,
-  0x2502,
-  0x250C,
-  0x2510,
-  0x2518,
-  0x2514,
-  0x251C,
-  0x252C,
-  0x2524,
-  0x2534,
-  0x253C,
-  0x2501,
-  0x2503,
-  0x250F,
-  0x2513,
-  0x251B,
-  0x2517,
-  0x2523,
-  0x2533,
-  0x252B,
-  0x253B,
-  0x254B,
-  0x2520,
-  0x252F,
-  0x2528,
-  0x2537,
-  0x253F,
-  0x251D,
-  0x2530,
-  0x2525,
-  0x2538,
-  0x2542
-};
-
-/* no conversion a9 to af */
-
-/* b0a1 to cfd3 is contiguous except for illegal sequences with 0xfe */
-static unsigned short b02cf[] = {
-  0x4E9C,
-  0x5516,
-  0x5A03,
-  0x963F,
-  0x54C0,
-  0x611B,
-  0x6328,
-  0x59F6,
-  0x9022,
-  0x8475,
-  0x831C,
-  0x7A50,
-  0x60AA,
-  0x63E1,
-  0x6E25,
-  0x65ED,
-  0x8466,
-  0x82A6,
-  0x9BF5,
-  0x6893,
-  0x5727,
-  0x65A1,
-  0x6271,
-  0x5B9B,
-  0x59D0,
-  0x867B,
-  0x98F4,
-  0x7D62,
-  0x7DBE,
-  0x9B8E,
-  0x6216,
-  0x7C9F,
-  0x88B7,
-  0x5B89,
-  0x5EB5,
-  0x6309,
-  0x6697,
-  0x6848,
-  0x95C7,
-  0x978D,
-  0x674F,
-  0x4EE5,
-  0x4F0A,
-  0x4F4D,
-  0x4F9D,
-  0x5049,
-  0x56F2,
-  0x5937,
-  0x59D4,
-  0x5A01,
-  0x5C09,
-  0x60DF,
-  0x610F,
-  0x6170,
-  0x6613,
-  0x6905,
-  0x70BA,
-  0x754F,
-  0x7570,
-  0x79FB,
-  0x7DAD,
-  0x7DEF,
-  0x80C3,
-  0x840E,
-  0x8863,
-  0x8B02,
-  0x9055,
-  0x907A,
-  0x533B,
-  0x4E95,
-  0x4EA5,
-  0x57DF,
-  0x80B2,
-  0x90C1,
-  0x78EF,
-  0x4E00,
-  0x58F1,
-  0x6EA2,
-  0x9038,
-  0x7A32,
-  0x8328,
-  0x828B,
-  0x9C2F,
-  0x5141,
-  0x5370,
-  0x54BD,
-  0x54E1,
-  0x56E0,
-  0x59FB,
-  0x5F15,
-  0x98F2,
-  0x6DEB,
-  0x80E4,
-  0x852D,
-  0x9662,
-  0x9670,
-  0x96A0,
-  0x97FB,
-  0x540B,
-  0x53F3,
-  0x5B87,
-  0x70CF,
-  0x7FBD,
-  0x8FC2,
-  0x96E8,
-  0x536F,
-  0x9D5C,
-  0x7ABA,
-  0x4E11,
-  0x7893,
-  0x81FC,
-  0x6E26,
-  0x5618,
-  0x5504,
-  0x6B1D,
-  0x851A,
-  0x9C3B,
-  0x59E5,
-  0x53A9,
-  0x6D66,
-  0x74DC,
-  0x958F,
-  0x5642,
-  0x4E91,
-  0x904B,
-  0x96F2,
-  0x834F,
-  0x990C,
-  0x53E1,
-  0x55B6,
-  0x5B30,
-  0x5F71,
-  0x6620,
-  0x66F3,
-  0x6804,
-  0x6C38,
-  0x6CF3,
-  0x6D29,
-  0x745B,
-  0x76C8,
-  0x7A4E,
-  0x9834,
-  0x82F1,
-  0x885B,
-  0x8A60,
-  0x92ED,
-  0x6DB2,
-  0x75AB,
-  0x76CA,
-  0x99C5,
-  0x60A6,
-  0x8B01,
-  0x8D8A,
-  0x95B2,
-  0x698E,
-  0x53AD,
-  0x5186,
-  0x5712,
-  0x5830,
-  0x5944,
-  0x5BB4,
-  0x5EF6,
-  0x6028,
-  0x63A9,
-  0x63F4,
-  0x6CBF,
-  0x6F14,
-  0x708E,
-  0x7114,
-  0x7159,
-  0x71D5,
-  0x733F,
-  0x7E01,
-  0x8276,
-  0x82D1,
-  0x8597,
-  0x9060,
-  0x925B,
-  0x9D1B,
-  0x5869,
-  0x65BC,
-  0x6C5A,
-  0x7525,
-  0x51F9,
-  0x592E,
-  0x5965,
-  0x5F80,
-  0x5FDC,
-  0x62BC,
-  0x65FA,
-  0x6A2A,
-  0x6B27,
-  0x6BB4,
-  0x738B,
-  0x7FC1,
-  0x8956,
-  0x9D2C,
-  0x9D0E,
-  0x9EC4,
-  0x5CA1,
-  0x6C96,
-  0x837B,
-  0x5104,
-  0x5C4B,
-  0x61B6,
-  0x81C6,
-  0x6876,
-  0x7261,
-  0x4E59,
-  0x4FFA,
-  0x5378,
-  0x6069,
-  0x6E29,
-  0x7A4F,
-  0x97F3,
-  0x4E0B,
-  0x5316,
-  0x4EEE,
-  0x4F55,
-  0x4F3D,
-  0x4FA1,
-  0x4F73,
-  0x52A0,
-  0x53EF,
-  0x5609,
-  0x590F,
-  0x5AC1,
-  0x5BB6,
-  0x5BE1,
-  0x79D1,
-  0x6687,
-  0x679C,
-  0x67B6,
-  0x6B4C,
-  0x6CB3,
-  0x706B,
-  0x73C2,
-  0x798D,
-  0x79BE,
-  0x7A3C,
-  0x7B87,
-  0x82B1,
-  0x82DB,
-  0x8304,
-  0x8377,
-  0x83EF,
-  0x83D3,
-  0x8766,
-  0x8AB2,
-  0x5629,
-  0x8CA8,
-  0x8FE6,
-  0x904E,
-  0x971E,
-  0x868A,
-  0x4FC4,
-  0x5CE8,
-  0x6211,
-  0x7259,
-  0x753B,
-  0x81E5,
-  0x82BD,
-  0x86FE,
-  0x8CC0,
-  0x96C5,
-  0x9913,
-  0x99D5,
-  0x4ECB,
-  0x4F1A,
-  0x89E3,
-  0x56DE,
-  0x584A,
-  0x58CA,
-  0x5EFB,
-  0x5FEB,
-  0x602A,
-  0x6094,
-  0x6062,
-  0x61D0,
-  0x6212,
-  0x62D0,
-  0x6539,
-  0x9B41,
-  0x6666,
-  0x68B0,
-  0x6D77,
-  0x7070,
-  0x754C,
-  0x7686,
-  0x7D75,
-  0x82A5,
-  0x87F9,
-  0x958B,
-  0x968E,
-  0x8C9D,
-  0x51F1,
-  0x52BE,
-  0x5916,
-  0x54B3,
-  0x5BB3,
-  0x5D16,
-  0x6168,
-  0x6982,
-  0x6DAF,
-  0x788D,
-  0x84CB,
-  0x8857,
-  0x8A72,
-  0x93A7,
-  0x9AB8,
-  0x6D6C,
-  0x99A8,
-  0x86D9,
-  0x57A3,
-  0x67FF,
-  0x86CE,
-  0x920E,
-  0x5283,
-  0x5687,
-  0x5404,
-  0x5ED3,
-  0x62E1,
-  0x64B9,
-  0x683C,
-  0x6838,
-  0x6BBB,
-  0x7372,
-  0x78BA,
-  0x7A6B,
-  0x899A,
-  0x89D2,
-  0x8D6B,
-  0x8F03,
-  0x90ED,
-  0x95A3,
-  0x9694,
-  0x9769,
-  0x5B66,
-  0x5CB3,
-  0x697D,
-  0x984D,
-  0x984E,
-  0x639B,
-  0x7B20,
-  0x6A2B,
-  0x6A7F,
-  0x68B6,
-  0x9C0D,
-  0x6F5F,
-  0x5272,
-  0x559D,
-  0x6070,
-  0x62EC,
-  0x6D3B,
-  0x6E07,
-  0x6ED1,
-  0x845B,
-  0x8910,
-  0x8F44,
-  0x4E14,
-  0x9C39,
-  0x53F6,
-  0x691B,
-  0x6A3A,
-  0x9784,
-  0x682A,
-  0x515C,
-  0x7AC3,
-  0x84B2,
-  0x91DC,
-  0x938C,
-  0x565B,
-  0x9D28,
-  0x6822,
-  0x8305,
-  0x8431,
-  0x7CA5,
-  0x5208,
-  0x82C5,
-  0x74E6,
-  0x4E7E,
-  0x4F83,
-  0x51A0,
-  0x5BD2,
-  0x520A,
-  0x52D8,
-  0x52E7,
-  0x5DFB,
-  0x559A,
-  0x582A,
-  0x59E6,
-  0x5B8C,
-  0x5B98,
-  0x5BDB,
-  0x5E72,
-  0x5E79,
-  0x60A3,
-  0x611F,
-  0x6163,
-  0x61BE,
-  0x63DB,
-  0x6562,
-  0x67D1,
-  0x6853,
-  0x68FA,
-  0x6B3E,
-  0x6B53,
-  0x6C57,
-  0x6F22,
-  0x6F97,
-  0x6F45,
-  0x74B0,
-  0x7518,
-  0x76E3,
-  0x770B,
-  0x7AFF,
-  0x7BA1,
-  0x7C21,
-  0x7DE9,
-  0x7F36,
-  0x7FF0,
-  0x809D,
-  0x8266,
-  0x839E,
-  0x89B3,
-  0x8ACC,
-  0x8CAB,
-  0x9084,
-  0x9451,
-  0x9593,
-  0x9591,
-  0x95A2,
-  0x9665,
-  0x97D3,
-  0x9928,
-  0x8218,
-  0x4E38,
-  0x542B,
-  0x5CB8,
-  0x5DCC,
-  0x73A9,
-  0x764C,
-  0x773C,
-  0x5CA9,
-  0x7FEB,
-  0x8D0B,
-  0x96C1,
-  0x9811,
-  0x9854,
-  0x9858,
-  0x4F01,
-  0x4F0E,
-  0x5371,
-  0x559C,
-  0x5668,
-  0x57FA,
-  0x5947,
-  0x5B09,
-  0x5BC4,
-  0x5C90,
-  0x5E0C,
-  0x5E7E,
-  0x5FCC,
-  0x63EE,
-  0x673A,
-  0x65D7,
-  0x65E2,
-  0x671F,
-  0x68CB,
-  0x68C4,
-  0x6A5F,
-  0x5E30,
-  0x6BC5,
-  0x6C17,
-  0x6C7D,
-  0x757F,
-  0x7948,
-  0x5B63,
-  0x7A00,
-  0x7D00,
-  0x5FBD,
-  0x898F,
-  0x8A18,
-  0x8CB4,
-  0x8D77,
-  0x8ECC,
-  0x8F1D,
-  0x98E2,
-  0x9A0E,
-  0x9B3C,
-  0x4E80,
-  0x507D,
-  0x5100,
-  0x5993,
-  0x5B9C,
-  0x622F,
-  0x6280,
-  0x64EC,
-  0x6B3A,
-  0x72A0,
-  0x7591,
-  0x7947,
-  0x7FA9,
-  0x87FB,
-  0x8ABC,
-  0x8B70,
-  0x63AC,
-  0x83CA,
-  0x97A0,
-  0x5409,
-  0x5403,
-  0x55AB,
-  0x6854,
-  0x6A58,
-  0x8A70,
-  0x7827,
-  0x6775,
-  0x9ECD,
-  0x5374,
-  0x5BA2,
-  0x811A,
-  0x8650,
-  0x9006,
-  0x4E18,
-  0x4E45,
-  0x4EC7,
-  0x4F11,
-  0x53CA,
-  0x5438,
-  0x5BAE,
-  0x5F13,
-  0x6025,
-  0x6551,
-  0x673D,
-  0x6C42,
-  0x6C72,
-  0x6CE3,
-  0x7078,
-  0x7403,
-  0x7A76,
-  0x7AAE,
-  0x7B08,
-  0x7D1A,
-  0x7CFE,
-  0x7D66,
-  0x65E7,
-  0x725B,
-  0x53BB,
-  0x5C45,
-  0x5DE8,
-  0x62D2,
-  0x62E0,
-  0x6319,
-  0x6E20,
-  0x865A,
-  0x8A31,
-  0x8DDD,
-  0x92F8,
-  0x6F01,
-  0x79A6,
-  0x9B5A,
-  0x4EA8,
-  0x4EAB,
-  0x4EAC,
-  0x4F9B,
-  0x4FA0,
-  0x50D1,
-  0x5147,
-  0x7AF6,
-  0x5171,
-  0x51F6,
-  0x5354,
-  0x5321,
-  0x537F,
-  0x53EB,
-  0x55AC,
-  0x5883,
-  0x5CE1,
-  0x5F37,
-  0x5F4A,
-  0x602F,
-  0x6050,
-  0x606D,
-  0x631F,
-  0x6559,
-  0x6A4B,
-  0x6CC1,
-  0x72C2,
-  0x72ED,
-  0x77EF,
-  0x80F8,
-  0x8105,
-  0x8208,
-  0x854E,
-  0x90F7,
-  0x93E1,
-  0x97FF,
-  0x9957,
-  0x9A5A,
-  0x4EF0,
-  0x51DD,
-  0x5C2D,
-  0x6681,
-  0x696D,
-  0x5C40,
-  0x66F2,
-  0x6975,
-  0x7389,
-  0x6850,
-  0x7C81,
-  0x50C5,
-  0x52E4,
-  0x5747,
-  0x5DFE,
-  0x9326,
-  0x65A4,
-  0x6B23,
-  0x6B3D,
-  0x7434,
-  0x7981,
-  0x79BD,
-  0x7B4B,
-  0x7DCA,
-  0x82B9,
-  0x83CC,
-  0x887F,
-  0x895F,
-  0x8B39,
-  0x8FD1,
-  0x91D1,
-  0x541F,
-  0x9280,
-  0x4E5D,
-  0x5036,
-  0x53E5,
-  0x533A,
-  0x72D7,
-  0x7396,
-  0x77E9,
-  0x82E6,
-  0x8EAF,
-  0x99C6,
-  0x99C8,
-  0x99D2,
-  0x5177,
-  0x611A,
-  0x865E,
-  0x55B0,
-  0x7A7A,
-  0x5076,
-  0x5BD3,
-  0x9047,
-  0x9685,
-  0x4E32,
-  0x6ADB,
-  0x91E7,
-  0x5C51,
-  0x5C48,
-  0x6398,
-  0x7A9F,
-  0x6C93,
-  0x9774,
-  0x8F61,
-  0x7AAA,
-  0x718A,
-  0x9688,
-  0x7C82,
-  0x6817,
-  0x7E70,
-  0x6851,
-  0x936C,
-  0x52F2,
-  0x541B,
-  0x85AB,
-  0x8A13,
-  0x7FA4,
-  0x8ECD,
-  0x90E1,
-  0x5366,
-  0x8888,
-  0x7941,
-  0x4FC2,
-  0x50BE,
-  0x5211,
-  0x5144,
-  0x5553,
-  0x572D,
-  0x73EA,
-  0x578B,
-  0x5951,
-  0x5F62,
-  0x5F84,
-  0x6075,
-  0x6176,
-  0x6167,
-  0x61A9,
-  0x63B2,
-  0x643A,
-  0x656C,
-  0x666F,
-  0x6842,
-  0x6E13,
-  0x7566,
-  0x7A3D,
-  0x7CFB,
-  0x7D4C,
-  0x7D99,
-  0x7E4B,
-  0x7F6B,
-  0x830E,
-  0x834A,
-  0x86CD,
-  0x8A08,
-  0x8A63,
-  0x8B66,
-  0x8EFD,
-  0x981A,
-  0x9D8F,
-  0x82B8,
-  0x8FCE,
-  0x9BE8,
-  0x5287,
-  0x621F,
-  0x6483,
-  0x6FC0,
-  0x9699,
-  0x6841,
-  0x5091,
-  0x6B20,
-  0x6C7A,
-  0x6F54,
-  0x7A74,
-  0x7D50,
-  0x8840,
-  0x8A23,
-  0x6708,
-  0x4EF6,
-  0x5039,
-  0x5026,
-  0x5065,
-  0x517C,
-  0x5238,
-  0x5263,
-  0x55A7,
-  0x570F,
-  0x5805,
-  0x5ACC,
-  0x5EFA,
-  0x61B2,
-  0x61F8,
-  0x62F3,
-  0x6372,
-  0x691C,
-  0x6A29,
-  0x727D,
-  0x72AC,
-  0x732E,
-  0x7814,
-  0x786F,
-  0x7D79,
-  0x770C,
-  0x80A9,
-  0x898B,
-  0x8B19,
-  0x8CE2,
-  0x8ED2,
-  0x9063,
-  0x9375,
-  0x967A,
-  0x9855,
-  0x9A13,
-  0x9E78,
-  0x5143,
-  0x539F,
-  0x53B3,
-  0x5E7B,
-  0x5F26,
-  0x6E1B,
-  0x6E90,
-  0x7384,
-  0x73FE,
-  0x7D43,
-  0x8237,
-  0x8A00,
-  0x8AFA,
-  0x9650,
-  0x4E4E,
-  0x500B,
-  0x53E4,
-  0x547C,
-  0x56FA,
-  0x59D1,
-  0x5B64,
-  0x5DF1,
-  0x5EAB,
-  0x5F27,
-  0x6238,
-  0x6545,
-  0x67AF,
-  0x6E56,
-  0x72D0,
-  0x7CCA,
-  0x88B4,
-  0x80A1,
-  0x80E1,
-  0x83F0,
-  0x864E,
-  0x8A87,
-  0x8DE8,
-  0x9237,
-  0x96C7,
-  0x9867,
-  0x9F13,
-  0x4E94,
-  0x4E92,
-  0x4F0D,
-  0x5348,
-  0x5449,
-  0x543E,
-  0x5A2F,
-  0x5F8C,
-  0x5FA1,
-  0x609F,
-  0x68A7,
-  0x6A8E,
-  0x745A,
-  0x7881,
-  0x8A9E,
-  0x8AA4,
-  0x8B77,
-  0x9190,
-  0x4E5E,
-  0x9BC9,
-  0x4EA4,
-  0x4F7C,
-  0x4FAF,
-  0x5019,
-  0x5016,
-  0x5149,
-  0x516C,
-  0x529F,
-  0x52B9,
-  0x52FE,
-  0x539A,
-  0x53E3,
-  0x5411,
-  0x540E,
-  0x5589,
-  0x5751,
-  0x57A2,
-  0x597D,
-  0x5B54,
-  0x5B5D,
-  0x5B8F,
-  0x5DE5,
-  0x5DE7,
-  0x5DF7,
-  0x5E78,
-  0x5E83,
-  0x5E9A,
-  0x5EB7,
-  0x5F18,
-  0x6052,
-  0x614C,
-  0x6297,
-  0x62D8,
-  0x63A7,
-  0x653B,
-  0x6602,
-  0x6643,
-  0x66F4,
-  0x676D,
-  0x6821,
-  0x6897,
-  0x69CB,
-  0x6C5F,
-  0x6D2A,
-  0x6D69,
-  0x6E2F,
-  0x6E9D,
-  0x7532,
-  0x7687,
-  0x786C,
-  0x7A3F,
-  0x7CE0,
-  0x7D05,
-  0x7D18,
-  0x7D5E,
-  0x7DB1,
-  0x8015,
-  0x8003,
-  0x80AF,
-  0x80B1,
-  0x8154,
-  0x818F,
-  0x822A,
-  0x8352,
-  0x884C,
-  0x8861,
-  0x8B1B,
-  0x8CA2,
-  0x8CFC,
-  0x90CA,
-  0x9175,
-  0x9271,
-  0x783F,
-  0x92FC,
-  0x95A4,
-  0x964D,
-  0x9805,
-  0x9999,
-  0x9AD8,
-  0x9D3B,
-  0x525B,
-  0x52AB,
-  0x53F7,
-  0x5408,
-  0x58D5,
-  0x62F7,
-  0x6FE0,
-  0x8C6A,
-  0x8F5F,
-  0x9EB9,
-  0x514B,
-  0x523B,
-  0x544A,
-  0x56FD,
-  0x7A40,
-  0x9177,
-  0x9D60,
-  0x9ED2,
-  0x7344,
-  0x6F09,
-  0x8170,
-  0x7511,
-  0x5FFD,
-  0x60DA,
-  0x9AA8,
-  0x72DB,
-  0x8FBC,
-  0x6B64,
-  0x9803,
-  0x4ECA,
-  0x56F0,
-  0x5764,
-  0x58BE,
-  0x5A5A,
-  0x6068,
-  0x61C7,
-  0x660F,
-  0x6606,
-  0x6839,
-  0x68B1,
-  0x6DF7,
-  0x75D5,
-  0x7D3A,
-  0x826E,
-  0x9B42,
-  0x4E9B,
-  0x4F50,
-  0x53C9,
-  0x5506,
-  0x5D6F,
-  0x5DE6,
-  0x5DEE,
-  0x67FB,
-  0x6C99,
-  0x7473,
-  0x7802,
-  0x8A50,
-  0x9396,
-  0x88DF,
-  0x5750,
-  0x5EA7,
-  0x632B,
-  0x50B5,
-  0x50AC,
-  0x518D,
-  0x6700,
-  0x54C9,
-  0x585E,
-  0x59BB,
-  0x5BB0,
-  0x5F69,
-  0x624D,
-  0x63A1,
-  0x683D,
-  0x6B73,
-  0x6E08,
-  0x707D,
-  0x91C7,
-  0x7280,
-  0x7815,
-  0x7826,
-  0x796D,
-  0x658E,
-  0x7D30,
-  0x83DC,
-  0x88C1,
-  0x8F09,
-  0x969B,
-  0x5264,
-  0x5728,
-  0x6750,
-  0x7F6A,
-  0x8CA1,
-  0x51B4,
-  0x5742,
-  0x962A,
-  0x583A,
-  0x698A,
-  0x80B4,
-  0x54B2,
-  0x5D0E,
-  0x57FC,
-  0x7895,
-  0x9DFA,
-  0x4F5C,
-  0x524A,
-  0x548B,
-  0x643E,
-  0x6628,
-  0x6714,
-  0x67F5,
-  0x7A84,
-  0x7B56,
-  0x7D22,
-  0x932F,
-  0x685C,
-  0x9BAD,
-  0x7B39,
-  0x5319,
-  0x518A,
-  0x5237,
-  0x5BDF,
-  0x62F6,
-  0x64AE,
-  0x64E6,
-  0x672D,
-  0x6BBA,
-  0x85A9,
-  0x96D1,
-  0x7690,
-  0x9BD6,
-  0x634C,
-  0x9306,
-  0x9BAB,
-  0x76BF,
-  0x6652,
-  0x4E09,
-  0x5098,
-  0x53C2,
-  0x5C71,
-  0x60E8,
-  0x6492,
-  0x6563,
-  0x685F,
-  0x71E6,
-  0x73CA,
-  0x7523,
-  0x7B97,
-  0x7E82,
-  0x8695,
-  0x8B83,
-  0x8CDB,
-  0x9178,
-  0x9910,
-  0x65AC,
-  0x66AB,
-  0x6B8B,
-  0x4ED5,
-  0x4ED4,
-  0x4F3A,
-  0x4F7F,
-  0x523A,
-  0x53F8,
-  0x53F2,
-  0x55E3,
-  0x56DB,
-  0x58EB,
-  0x59CB,
-  0x59C9,
-  0x59FF,
-  0x5B50,
-  0x5C4D,
-  0x5E02,
-  0x5E2B,
-  0x5FD7,
-  0x601D,
-  0x6307,
-  0x652F,
-  0x5B5C,
-  0x65AF,
-  0x65BD,
-  0x65E8,
-  0x679D,
-  0x6B62,
-  0x6B7B,
-  0x6C0F,
-  0x7345,
-  0x7949,
-  0x79C1,
-  0x7CF8,
-  0x7D19,
-  0x7D2B,
-  0x80A2,
-  0x8102,
-  0x81F3,
-  0x8996,
-  0x8A5E,
-  0x8A69,
-  0x8A66,
-  0x8A8C,
-  0x8AEE,
-  0x8CC7,
-  0x8CDC,
-  0x96CC,
-  0x98FC,
-  0x6B6F,
-  0x4E8B,
-  0x4F3C,
-  0x4F8D,
-  0x5150,
-  0x5B57,
-  0x5BFA,
-  0x6148,
-  0x6301,
-  0x6642,
-  0x6B21,
-  0x6ECB,
-  0x6CBB,
-  0x723E,
-  0x74BD,
-  0x75D4,
-  0x78C1,
-  0x793A,
-  0x800C,
-  0x8033,
-  0x81EA,
-  0x8494,
-  0x8F9E,
-  0x6C50,
-  0x9E7F,
-  0x5F0F,
-  0x8B58,
-  0x9D2B,
-  0x7AFA,
-  0x8EF8,
-  0x5B8D,
-  0x96EB,
-  0x4E03,
-  0x53F1,
-  0x57F7,
-  0x5931,
-  0x5AC9,
-  0x5BA4,
-  0x6089,
-  0x6E7F,
-  0x6F06,
-  0x75BE,
-  0x8CEA,
-  0x5B9F,
-  0x8500,
-  0x7BE0,
-  0x5072,
-  0x67F4,
-  0x829D,
-  0x5C61,
-  0x854A,
-  0x7E1E,
-  0x820E,
-  0x5199,
-  0x5C04,
-  0x6368,
-  0x8D66,
-  0x659C,
-  0x716E,
-  0x793E,
-  0x7D17,
-  0x8005,
-  0x8B1D,
-  0x8ECA,
-  0x906E,
-  0x86C7,
-  0x90AA,
-  0x501F,
-  0x52FA,
-  0x5C3A,
-  0x6753,
-  0x707C,
-  0x7235,
-  0x914C,
-  0x91C8,
-  0x932B,
-  0x82E5,
-  0x5BC2,
-  0x5F31,
-  0x60F9,
-  0x4E3B,
-  0x53D6,
-  0x5B88,
-  0x624B,
-  0x6731,
-  0x6B8A,
-  0x72E9,
-  0x73E0,
-  0x7A2E,
-  0x816B,
-  0x8DA3,
-  0x9152,
-  0x9996,
-  0x5112,
-  0x53D7,
-  0x546A,
-  0x5BFF,
-  0x6388,
-  0x6A39,
-  0x7DAC,
-  0x9700,
-  0x56DA,
-  0x53CE,
-  0x5468,
-  0x5B97,
-  0x5C31,
-  0x5DDE,
-  0x4FEE,
-  0x6101,
-  0x62FE,
-  0x6D32,
-  0x79C0,
-  0x79CB,
-  0x7D42,
-  0x7E4D,
-  0x7FD2,
-  0x81ED,
-  0x821F,
-  0x8490,
-  0x8846,
-  0x8972,
-  0x8B90,
-  0x8E74,
-  0x8F2F,
-  0x9031,
-  0x914B,
-  0x916C,
-  0x96C6,
-  0x919C,
-  0x4EC0,
-  0x4F4F,
-  0x5145,
-  0x5341,
-  0x5F93,
-  0x620E,
-  0x67D4,
-  0x6C41,
-  0x6E0B,
-  0x7363,
-  0x7E26,
-  0x91CD,
-  0x9283,
-  0x53D4,
-  0x5919,
-  0x5BBF,
-  0x6DD1,
-  0x795D,
-  0x7E2E,
-  0x7C9B,
-  0x587E,
-  0x719F,
-  0x51FA,
-  0x8853,
-  0x8FF0,
-  0x4FCA,
-  0x5CFB,
-  0x6625,
-  0x77AC,
-  0x7AE3,
-  0x821C,
-  0x99FF,
-  0x51C6,
-  0x5FAA,
-  0x65EC,
-  0x696F,
-  0x6B89,
-  0x6DF3,
-  0x6E96,
-  0x6F64,
-  0x76FE,
-  0x7D14,
-  0x5DE1,
-  0x9075,
-  0x9187,
-  0x9806,
-  0x51E6,
-  0x521D,
-  0x6240,
-  0x6691,
-  0x66D9,
-  0x6E1A,
-  0x5EB6,
-  0x7DD2,
-  0x7F72,
-  0x66F8,
-  0x85AF,
-  0x85F7,
-  0x8AF8,
-  0x52A9,
-  0x53D9,
-  0x5973,
-  0x5E8F,
-  0x5F90,
-  0x6055,
-  0x92E4,
-  0x9664,
-  0x50B7,
-  0x511F,
-  0x52DD,
-  0x5320,
-  0x5347,
-  0x53EC,
-  0x54E8,
-  0x5546,
-  0x5531,
-  0x5617,
-  0x5968,
-  0x59BE,
-  0x5A3C,
-  0x5BB5,
-  0x5C06,
-  0x5C0F,
-  0x5C11,
-  0x5C1A,
-  0x5E84,
-  0x5E8A,
-  0x5EE0,
-  0x5F70,
-  0x627F,
-  0x6284,
-  0x62DB,
-  0x638C,
-  0x6377,
-  0x6607,
-  0x660C,
-  0x662D,
-  0x6676,
-  0x677E,
-  0x68A2,
-  0x6A1F,
-  0x6A35,
-  0x6CBC,
-  0x6D88,
-  0x6E09,
-  0x6E58,
-  0x713C,
-  0x7126,
-  0x7167,
-  0x75C7,
-  0x7701,
-  0x785D,
-  0x7901,
-  0x7965,
-  0x79F0,
-  0x7AE0,
-  0x7B11,
-  0x7CA7,
-  0x7D39,
-  0x8096,
-  0x83D6,
-  0x848B,
-  0x8549,
-  0x885D,
-  0x88F3,
-  0x8A1F,
-  0x8A3C,
-  0x8A54,
-  0x8A73,
-  0x8C61,
-  0x8CDE,
-  0x91A4,
-  0x9266,
-  0x937E,
-  0x9418,
-  0x969C,
-  0x9798,
-  0x4E0A,
-  0x4E08,
-  0x4E1E,
-  0x4E57,
-  0x5197,
-  0x5270,
-  0x57CE,
-  0x5834,
-  0x58CC,
-  0x5B22,
-  0x5E38,
-  0x60C5,
-  0x64FE,
-  0x6761,
-  0x6756,
-  0x6D44,
-  0x72B6,
-  0x7573,
-  0x7A63,
-  0x84B8,
-  0x8B72,
-  0x91B8,
-  0x9320,
-  0x5631,
-  0x57F4,
-  0x98FE,
-  0x62ED,
-  0x690D,
-  0x6B96,
-  0x71ED,
-  0x7E54,
-  0x8077,
-  0x8272,
-  0x89E6,
-  0x98DF,
-  0x8755,
-  0x8FB1,
-  0x5C3B,
-  0x4F38,
-  0x4FE1,
-  0x4FB5,
-  0x5507,
-  0x5A20,
-  0x5BDD,
-  0x5BE9,
-  0x5FC3,
-  0x614E,
-  0x632F,
-  0x65B0,
-  0x664B,
-  0x68EE,
-  0x699B,
-  0x6D78,
-  0x6DF1,
-  0x7533,
-  0x75B9,
-  0x771F,
-  0x795E,
-  0x79E6,
-  0x7D33,
-  0x81E3,
-  0x82AF,
-  0x85AA,
-  0x89AA,
-  0x8A3A,
-  0x8EAB,
-  0x8F9B,
-  0x9032,
-  0x91DD,
-  0x9707,
-  0x4EBA,
-  0x4EC1,
-  0x5203,
-  0x5875,
-  0x58EC,
-  0x5C0B,
-  0x751A,
-  0x5C3D,
-  0x814E,
-  0x8A0A,
-  0x8FC5,
-  0x9663,
-  0x976D,
-  0x7B25,
-  0x8ACF,
-  0x9808,
-  0x9162,
-  0x56F3,
-  0x53A8,
-  0x9017,
-  0x5439,
-  0x5782,
-  0x5E25,
-  0x63A8,
-  0x6C34,
-  0x708A,
-  0x7761,
-  0x7C8B,
-  0x7FE0,
-  0x8870,
-  0x9042,
-  0x9154,
-  0x9310,
-  0x9318,
-  0x968F,
-  0x745E,
-  0x9AC4,
-  0x5D07,
-  0x5D69,
-  0x6570,
-  0x67A2,
-  0x8DA8,
-  0x96DB,
-  0x636E,
-  0x6749,
-  0x6919,
-  0x83C5,
-  0x9817,
-  0x96C0,
-  0x88FE,
-  0x6F84,
-  0x647A,
-  0x5BF8,
-  0x4E16,
-  0x702C,
-  0x755D,
-  0x662F,
-  0x51C4,
-  0x5236,
-  0x52E2,
-  0x59D3,
-  0x5F81,
-  0x6027,
-  0x6210,
-  0x653F,
-  0x6574,
-  0x661F,
-  0x6674,
-  0x68F2,
-  0x6816,
-  0x6B63,
-  0x6E05,
-  0x7272,
-  0x751F,
-  0x76DB,
-  0x7CBE,
-  0x8056,
-  0x58F0,
-  0x88FD,
-  0x897F,
-  0x8AA0,
-  0x8A93,
-  0x8ACB,
-  0x901D,
-  0x9192,
-  0x9752,
-  0x9759,
-  0x6589,
-  0x7A0E,
-  0x8106,
-  0x96BB,
-  0x5E2D,
-  0x60DC,
-  0x621A,
-  0x65A5,
-  0x6614,
-  0x6790,
-  0x77F3,
-  0x7A4D,
-  0x7C4D,
-  0x7E3E,
-  0x810A,
-  0x8CAC,
-  0x8D64,
-  0x8DE1,
-  0x8E5F,
-  0x78A9,
-  0x5207,
-  0x62D9,
-  0x63A5,
-  0x6442,
-  0x6298,
-  0x8A2D,
-  0x7A83,
-  0x7BC0,
-  0x8AAC,
-  0x96EA,
-  0x7D76,
-  0x820C,
-  0x8749,
-  0x4ED9,
-  0x5148,
-  0x5343,
-  0x5360,
-  0x5BA3,
-  0x5C02,
-  0x5C16,
-  0x5DDD,
-  0x6226,
-  0x6247,
-  0x64B0,
-  0x6813,
-  0x6834,
-  0x6CC9,
-  0x6D45,
-  0x6D17,
-  0x67D3,
-  0x6F5C,
-  0x714E,
-  0x717D,
-  0x65CB,
-  0x7A7F,
-  0x7BAD,
-  0x7DDA,
-  0x7E4A,
-  0x7FA8,
-  0x817A,
-  0x821B,
-  0x8239,
-  0x85A6,
-  0x8A6E,
-  0x8CCE,
-  0x8DF5,
-  0x9078,
-  0x9077,
-  0x92AD,
-  0x9291,
-  0x9583,
-  0x9BAE,
-  0x524D,
-  0x5584,
-  0x6F38,
-  0x7136,
-  0x5168,
-  0x7985,
-  0x7E55,
-  0x81B3,
-  0x7CCE,
-  0x564C,
-  0x5851,
-  0x5CA8,
-  0x63AA,
-  0x66FE,
-  0x66FD,
-  0x695A,
-  0x72D9,
-  0x758F,
-  0x758E,
-  0x790E,
-  0x7956,
-  0x79DF,
-  0x7C97,
-  0x7D20,
-  0x7D44,
-  0x8607,
-  0x8A34,
-  0x963B,
-  0x9061,
-  0x9F20,
-  0x50E7,
-  0x5275,
-  0x53CC,
-  0x53E2,
-  0x5009,
-  0x55AA,
-  0x58EE,
-  0x594F,
-  0x723D,
-  0x5B8B,
-  0x5C64,
-  0x531D,
-  0x60E3,
-  0x60F3,
-  0x635C,
-  0x6383,
-  0x633F,
-  0x63BB,
-  0x64CD,
-  0x65E9,
-  0x66F9,
-  0x5DE3,
-  0x69CD,
-  0x69FD,
-  0x6F15,
-  0x71E5,
-  0x4E89,
-  0x75E9,
-  0x76F8,
-  0x7A93,
-  0x7CDF,
-  0x7DCF,
-  0x7D9C,
-  0x8061,
-  0x8349,
-  0x8358,
-  0x846C,
-  0x84BC,
-  0x85FB,
-  0x88C5,
-  0x8D70,
-  0x9001,
-  0x906D,
-  0x9397,
-  0x971C,
-  0x9A12,
-  0x50CF,
-  0x5897,
-  0x618E,
-  0x81D3,
-  0x8535,
-  0x8D08,
-  0x9020,
-  0x4FC3,
-  0x5074,
-  0x5247,
-  0x5373,
-  0x606F,
-  0x6349,
-  0x675F,
-  0x6E2C,
-  0x8DB3,
-  0x901F,
-  0x4FD7,
-  0x5C5E,
-  0x8CCA,
-  0x65CF,
-  0x7D9A,
-  0x5352,
-  0x8896,
-  0x5176,
-  0x63C3,
-  0x5B58,
-  0x5B6B,
-  0x5C0A,
-  0x640D,
-  0x6751,
-  0x905C,
-  0x4ED6,
-  0x591A,
-  0x592A,
-  0x6C70,
-  0x8A51,
-  0x553E,
-  0x5815,
-  0x59A5,
-  0x60F0,
-  0x6253,
-  0x67C1,
-  0x8235,
-  0x6955,
-  0x9640,
-  0x99C4,
-  0x9A28,
-  0x4F53,
-  0x5806,
-  0x5BFE,
-  0x8010,
-  0x5CB1,
-  0x5E2F,
-  0x5F85,
-  0x6020,
-  0x614B,
-  0x6234,
-  0x66FF,
-  0x6CF0,
-  0x6EDE,
-  0x80CE,
-  0x817F,
-  0x82D4,
-  0x888B,
-  0x8CB8,
-  0x9000,
-  0x902E,
-  0x968A,
-  0x9EDB,
-  0x9BDB,
-  0x4EE3,
-  0x53F0,
-  0x5927,
-  0x7B2C,
-  0x918D,
-  0x984C,
-  0x9DF9,
-  0x6EDD,
-  0x7027,
-  0x5353,
-  0x5544,
-  0x5B85,
-  0x6258,
-  0x629E,
-  0x62D3,
-  0x6CA2,
-  0x6FEF,
-  0x7422,
-  0x8A17,
-  0x9438,
-  0x6FC1,
-  0x8AFE,
-  0x8338,
-  0x51E7,
-  0x86F8,
-  0x53EA,
-  0x53E9,
-  0x4F46,
-  0x9054,
-  0x8FB0,
-  0x596A,
-  0x8131,
-  0x5DFD,
-  0x7AEA,
-  0x8FBF,
-  0x68DA,
-  0x8C37,
-  0x72F8,
-  0x9C48,
-  0x6A3D,
-  0x8AB0,
-  0x4E39,
-  0x5358,
-  0x5606,
-  0x5766,
-  0x62C5,
-  0x63A2,
-  0x65E6,
-  0x6B4E,
-  0x6DE1,
-  0x6E5B,
-  0x70AD,
-  0x77ED,
-  0x7AEF,
-  0x7BAA,
-  0x7DBB,
-  0x803D,
-  0x80C6,
-  0x86CB,
-  0x8A95,
-  0x935B,
-  0x56E3,
-  0x58C7,
-  0x5F3E,
-  0x65AD,
-  0x6696,
-  0x6A80,
-  0x6BB5,
-  0x7537,
-  0x8AC7,
-  0x5024,
-  0x77E5,
-  0x5730,
-  0x5F1B,
-  0x6065,
-  0x667A,
-  0x6C60,
-  0x75F4,
-  0x7A1A,
-  0x7F6E,
-  0x81F4,
-  0x8718,
-  0x9045,
-  0x99B3,
-  0x7BC9,
-  0x755C,
-  0x7AF9,
-  0x7B51,
-  0x84C4,
-  0x9010,
-  0x79E9,
-  0x7A92,
-  0x8336,
-  0x5AE1,
-  0x7740,
-  0x4E2D,
-  0x4EF2,
-  0x5B99,
-  0x5FE0,
-  0x62BD,
-  0x663C,
-  0x67F1,
-  0x6CE8,
-  0x866B,
-  0x8877,
-  0x8A3B,
-  0x914E,
-  0x92F3,
-  0x99D0,
-  0x6A17,
-  0x7026,
-  0x732A,
-  0x82E7,
-  0x8457,
-  0x8CAF,
-  0x4E01,
-  0x5146,
-  0x51CB,
-  0x558B,
-  0x5BF5,
-  0x5E16,
-  0x5E33,
-  0x5E81,
-  0x5F14,
-  0x5F35,
-  0x5F6B,
-  0x5FB4,
-  0x61F2,
-  0x6311,
-  0x66A2,
-  0x671D,
-  0x6F6E,
-  0x7252,
-  0x753A,
-  0x773A,
-  0x8074,
-  0x8139,
-  0x8178,
-  0x8776,
-  0x8ABF,
-  0x8ADC,
-  0x8D85,
-  0x8DF3,
-  0x929A,
-  0x9577,
-  0x9802,
-  0x9CE5,
-  0x52C5,
-  0x6357,
-  0x76F4,
-  0x6715,
-  0x6C88,
-  0x73CD,
-  0x8CC3,
-  0x93AE,
-  0x9673,
-  0x6D25,
-  0x589C,
-  0x690E,
-  0x69CC,
-  0x8FFD,
-  0x939A,
-  0x75DB,
-  0x901A,
-  0x585A,
-  0x6802,
-  0x63B4,
-  0x69FB,
-  0x4F43,
-  0x6F2C,
-  0x67D8,
-  0x8FBB,
-  0x8526,
-  0x7DB4,
-  0x9354,
-  0x693F,
-  0x6F70,
-  0x576A,
-  0x58F7,
-  0x5B2C,
-  0x7D2C,
-  0x722A,
-  0x540A,
-  0x91E3,
-  0x9DB4,
-  0x4EAD,
-  0x4F4E,
-  0x505C,
-  0x5075,
-  0x5243,
-  0x8C9E,
-  0x5448,
-  0x5824,
-  0x5B9A,
-  0x5E1D,
-  0x5E95,
-  0x5EAD,
-  0x5EF7,
-  0x5F1F,
-  0x608C,
-  0x62B5,
-  0x633A,
-  0x63D0,
-  0x68AF,
-  0x6C40,
-  0x7887,
-  0x798E,
-  0x7A0B,
-  0x7DE0,
-  0x8247,
-  0x8A02,
-  0x8AE6,
-  0x8E44,
-  0x9013,
-  0x90B8,
-  0x912D,
-  0x91D8,
-  0x9F0E,
-  0x6CE5,
-  0x6458,
-  0x64E2,
-  0x6575,
-  0x6EF4,
-  0x7684,
-  0x7B1B,
-  0x9069,
-  0x93D1,
-  0x6EBA,
-  0x54F2,
-  0x5FB9,
-  0x64A4,
-  0x8F4D,
-  0x8FED,
-  0x9244,
-  0x5178,
-  0x586B,
-  0x5929,
-  0x5C55,
-  0x5E97,
-  0x6DFB,
-  0x7E8F,
-  0x751C,
-  0x8CBC,
-  0x8EE2,
-  0x985B,
-  0x70B9,
-  0x4F1D,
-  0x6BBF,
-  0x6FB1,
-  0x7530,
-  0x96FB,
-  0x514E,
-  0x5410,
-  0x5835,
-  0x5857,
-  0x59AC,
-  0x5C60,
-  0x5F92,
-  0x6597,
-  0x675C,
-  0x6E21,
-  0x767B,
-  0x83DF,
-  0x8CED,
-  0x9014,
-  0x90FD,
-  0x934D,
-  0x7825,
-  0x783A,
-  0x52AA,
-  0x5EA6,
-  0x571F,
-  0x5974,
-  0x6012,
-  0x5012,
-  0x515A,
-  0x51AC,
-  0x51CD,
-  0x5200,
-  0x5510,
-  0x5854,
-  0x5858,
-  0x5957,
-  0x5B95,
-  0x5CF6,
-  0x5D8B,
-  0x60BC,
-  0x6295,
-  0x642D,
-  0x6771,
-  0x6843,
-  0x68BC,
-  0x68DF,
-  0x76D7,
-  0x6DD8,
-  0x6E6F,
-  0x6D9B,
-  0x706F,
-  0x71C8,
-  0x5F53,
-  0x75D8,
-  0x7977,
-  0x7B49,
-  0x7B54,
-  0x7B52,
-  0x7CD6,
-  0x7D71,
-  0x5230,
-  0x8463,
-  0x8569,
-  0x85E4,
-  0x8A0E,
-  0x8B04,
-  0x8C46,
-  0x8E0F,
-  0x9003,
-  0x900F,
-  0x9419,
-  0x9676,
-  0x982D,
-  0x9A30,
-  0x95D8,
-  0x50CD,
-  0x52D5,
-  0x540C,
-  0x5802,
-  0x5C0E,
-  0x61A7,
-  0x649E,
-  0x6D1E,
-  0x77B3,
-  0x7AE5,
-  0x80F4,
-  0x8404,
-  0x9053,
-  0x9285,
-  0x5CE0,
-  0x9D07,
-  0x533F,
-  0x5F97,
-  0x5FB3,
-  0x6D9C,
-  0x7279,
-  0x7763,
-  0x79BF,
-  0x7BE4,
-  0x6BD2,
-  0x72EC,
-  0x8AAD,
-  0x6803,
-  0x6A61,
-  0x51F8,
-  0x7A81,
-  0x6934,
-  0x5C4A,
-  0x9CF6,
-  0x82EB,
-  0x5BC5,
-  0x9149,
-  0x701E,
-  0x5678,
-  0x5C6F,
-  0x60C7,
-  0x6566,
-  0x6C8C,
-  0x8C5A,
-  0x9041,
-  0x9813,
-  0x5451,
-  0x66C7,
-  0x920D,
-  0x5948,
-  0x90A3,
-  0x5185,
-  0x4E4D,
-  0x51EA,
-  0x8599,
-  0x8B0E,
-  0x7058,
-  0x637A,
-  0x934B,
-  0x6962,
-  0x99B4,
-  0x7E04,
-  0x7577,
-  0x5357,
-  0x6960,
-  0x8EDF,
-  0x96E3,
-  0x6C5D,
-  0x4E8C,
-  0x5C3C,
-  0x5F10,
-  0x8FE9,
-  0x5302,
-  0x8CD1,
-  0x8089,
-  0x8679,
-  0x5EFF,
-  0x65E5,
-  0x4E73,
-  0x5165,
-  0x5982,
-  0x5C3F,
-  0x97EE,
-  0x4EFB,
-  0x598A,
-  0x5FCD,
-  0x8A8D,
-  0x6FE1,
-  0x79B0,
-  0x7962,
-  0x5BE7,
-  0x8471,
-  0x732B,
-  0x71B1,
-  0x5E74,
-  0x5FF5,
-  0x637B,
-  0x649A,
-  0x71C3,
-  0x7C98,
-  0x4E43,
-  0x5EFC,
-  0x4E4B,
-  0x57DC,
-  0x56A2,
-  0x60A9,
-  0x6FC3,
-  0x7D0D,
-  0x80FD,
-  0x8133,
-  0x81BF,
-  0x8FB2,
-  0x8997,
-  0x86A4,
-  0x5DF4,
-  0x628A,
-  0x64AD,
-  0x8987,
-  0x6777,
-  0x6CE2,
-  0x6D3E,
-  0x7436,
-  0x7834,
-  0x5A46,
-  0x7F75,
-  0x82AD,
-  0x99AC,
-  0x4FF3,
-  0x5EC3,
-  0x62DD,
-  0x6392,
-  0x6557,
-  0x676F,
-  0x76C3,
-  0x724C,
-  0x80CC,
-  0x80BA,
-  0x8F29,
-  0x914D,
-  0x500D,
-  0x57F9,
-  0x5A92,
-  0x6885,
-  0x6973,
-  0x7164,
-  0x72FD,
-  0x8CB7,
-  0x58F2,
-  0x8CE0,
-  0x966A,
-  0x9019,
-  0x877F,
-  0x79E4,
-  0x77E7,
-  0x8429,
-  0x4F2F,
-  0x5265,
-  0x535A,
-  0x62CD,
-  0x67CF,
-  0x6CCA,
-  0x767D,
-  0x7B94,
-  0x7C95,
-  0x8236,
-  0x8584,
-  0x8FEB,
-  0x66DD,
-  0x6F20,
-  0x7206,
-  0x7E1B,
-  0x83AB,
-  0x99C1,
-  0x9EA6,
-  0x51FD,
-  0x7BB1,
-  0x7872,
-  0x7BB8,
-  0x8087,
-  0x7B48,
-  0x6AE8,
-  0x5E61,
-  0x808C,
-  0x7551,
-  0x7560,
-  0x516B,
-  0x9262,
-  0x6E8C,
-  0x767A,
-  0x9197,
-  0x9AEA,
-  0x4F10,
-  0x7F70,
-  0x629C,
-  0x7B4F,
-  0x95A5,
-  0x9CE9,
-  0x567A,
-  0x5859,
-  0x86E4,
-  0x96BC,
-  0x4F34,
-  0x5224,
-  0x534A,
-  0x53CD,
-  0x53DB,
-  0x5E06,
-  0x642C,
-  0x6591,
-  0x677F,
-  0x6C3E,
-  0x6C4E,
-  0x7248,
-  0x72AF,
-  0x73ED,
-  0x7554,
-  0x7E41,
-  0x822C,
-  0x85E9,
-  0x8CA9,
-  0x7BC4,
-  0x91C6,
-  0x7169,
-  0x9812,
-  0x98EF,
-  0x633D,
-  0x6669,
-  0x756A,
-  0x76E4,
-  0x78D0,
-  0x8543,
-  0x86EE,
-  0x532A,
-  0x5351,
-  0x5426,
-  0x5983,
-  0x5E87,
-  0x5F7C,
-  0x60B2,
-  0x6249,
-  0x6279,
-  0x62AB,
-  0x6590,
-  0x6BD4,
-  0x6CCC,
-  0x75B2,
-  0x76AE,
-  0x7891,
-  0x79D8,
-  0x7DCB,
-  0x7F77,
-  0x80A5,
-  0x88AB,
-  0x8AB9,
-  0x8CBB,
-  0x907F,
-  0x975E,
-  0x98DB,
-  0x6A0B,
-  0x7C38,
-  0x5099,
-  0x5C3E,
-  0x5FAE,
-  0x6787,
-  0x6BD8,
-  0x7435,
-  0x7709,
-  0x7F8E,
-  0x9F3B,
-  0x67CA,
-  0x7A17,
-  0x5339,
-  0x758B,
-  0x9AED,
-  0x5F66,
-  0x819D,
-  0x83F1,
-  0x8098,
-  0x5F3C,
-  0x5FC5,
-  0x7562,
-  0x7B46,
-  0x903C,
-  0x6867,
-  0x59EB,
-  0x5A9B,
-  0x7D10,
-  0x767E,
-  0x8B2C,
-  0x4FF5,
-  0x5F6A,
-  0x6A19,
-  0x6C37,
-  0x6F02,
-  0x74E2,
-  0x7968,
-  0x8868,
-  0x8A55,
-  0x8C79,
-  0x5EDF,
-  0x63CF,
-  0x75C5,
-  0x79D2,
-  0x82D7,
-  0x9328,
-  0x92F2,
-  0x849C,
-  0x86ED,
-  0x9C2D,
-  0x54C1,
-  0x5F6C,
-  0x658C,
-  0x6D5C,
-  0x7015,
-  0x8CA7,
-  0x8CD3,
-  0x983B,
-  0x654F,
-  0x74F6,
-  0x4E0D,
-  0x4ED8,
-  0x57E0,
-  0x592B,
-  0x5A66,
-  0x5BCC,
-  0x51A8,
-  0x5E03,
-  0x5E9C,
-  0x6016,
-  0x6276,
-  0x6577,
-  0x65A7,
-  0x666E,
-  0x6D6E,
-  0x7236,
-  0x7B26,
-  0x8150,
-  0x819A,
-  0x8299,
-  0x8B5C,
-  0x8CA0,
-  0x8CE6,
-  0x8D74,
-  0x961C,
-  0x9644,
-  0x4FAE,
-  0x64AB,
-  0x6B66,
-  0x821E,
-  0x8461,
-  0x856A,
-  0x90E8,
-  0x5C01,
-  0x6953,
-  0x98A8,
-  0x847A,
-  0x8557,
-  0x4F0F,
-  0x526F,
-  0x5FA9,
-  0x5E45,
-  0x670D,
-  0x798F,
-  0x8179,
-  0x8907,
-  0x8986,
-  0x6DF5,
-  0x5F17,
-  0x6255,
-  0x6CB8,
-  0x4ECF,
-  0x7269,
-  0x9B92,
-  0x5206,
-  0x543B,
-  0x5674,
-  0x58B3,
-  0x61A4,
-  0x626E,
-  0x711A,
-  0x596E,
-  0x7C89,
-  0x7CDE,
-  0x7D1B,
-  0x96F0,
-  0x6587,
-  0x805E,
-  0x4E19,
-  0x4F75,
-  0x5175,
-  0x5840,
-  0x5E63,
-  0x5E73,
-  0x5F0A,
-  0x67C4,
-  0x4E26,
-  0x853D,
-  0x9589,
-  0x965B,
-  0x7C73,
-  0x9801,
-  0x50FB,
-  0x58C1,
-  0x7656,
-  0x78A7,
-  0x5225,
-  0x77A5,
-  0x8511,
-  0x7B86,
-  0x504F,
-  0x5909,
-  0x7247,
-  0x7BC7,
-  0x7DE8,
-  0x8FBA,
-  0x8FD4,
-  0x904D,
-  0x4FBF,
-  0x52C9,
-  0x5A29,
-  0x5F01,
-  0x97AD,
-  0x4FDD,
-  0x8217,
-  0x92EA,
-  0x5703,
-  0x6355,
-  0x6B69,
-  0x752B,
-  0x88DC,
-  0x8F14,
-  0x7A42,
-  0x52DF,
-  0x5893,
-  0x6155,
-  0x620A,
-  0x66AE,
-  0x6BCD,
-  0x7C3F,
-  0x83E9,
-  0x5023,
-  0x4FF8,
-  0x5305,
-  0x5446,
-  0x5831,
-  0x5949,
-  0x5B9D,
-  0x5CF0,
-  0x5CEF,
-  0x5D29,
-  0x5E96,
-  0x62B1,
-  0x6367,
-  0x653E,
-  0x65B9,
-  0x670B,
-  0x6CD5,
-  0x6CE1,
-  0x70F9,
-  0x7832,
-  0x7E2B,
-  0x80DE,
-  0x82B3,
-  0x840C,
-  0x84EC,
-  0x8702,
-  0x8912,
-  0x8A2A,
-  0x8C4A,
-  0x90A6,
-  0x92D2,
-  0x98FD,
-  0x9CF3,
-  0x9D6C,
-  0x4E4F,
-  0x4EA1,
-  0x508D,
-  0x5256,
-  0x574A,
-  0x59A8,
-  0x5E3D,
-  0x5FD8,
-  0x5FD9,
-  0x623F,
-  0x66B4,
-  0x671B,
-  0x67D0,
-  0x68D2,
-  0x5192,
-  0x7D21,
-  0x80AA,
-  0x81A8,
-  0x8B00,
-  0x8C8C,
-  0x8CBF,
-  0x927E,
-  0x9632,
-  0x5420,
-  0x982C,
-  0x5317,
-  0x50D5,
-  0x535C,
-  0x58A8,
-  0x64B2,
-  0x6734,
-  0x7267,
-  0x7766,
-  0x7A46,
-  0x91E6,
-  0x52C3,
-  0x6CA1,
-  0x6B86,
-  0x5800,
-  0x5E4C,
-  0x5954,
-  0x672C,
-  0x7FFB,
-  0x51E1,
-  0x76C6,
-  0x6469,
-  0x78E8,
-  0x9B54,
-  0x9EBB,
-  0x57CB,
-  0x59B9,
-  0x6627,
-  0x679A,
-  0x6BCE,
-  0x54E9,
-  0x69D9,
-  0x5E55,
-  0x819C,
-  0x6795,
-  0x9BAA,
-  0x67FE,
-  0x9C52,
-  0x685D,
-  0x4EA6,
-  0x4FE3,
-  0x53C8,
-  0x62B9,
-  0x672B,
-  0x6CAB,
-  0x8FC4,
-  0x4FAD,
-  0x7E6D,
-  0x9EBF,
-  0x4E07,
-  0x6162,
-  0x6E80,
-  0x6F2B,
-  0x8513,
-  0x5473,
-  0x672A,
-  0x9B45,
-  0x5DF3,
-  0x7B95,
-  0x5CAC,
-  0x5BC6,
-  0x871C,
-  0x6E4A,
-  0x84D1,
-  0x7A14,
-  0x8108,
-  0x5999,
-  0x7C8D,
-  0x6C11,
-  0x7720,
-  0x52D9,
-  0x5922,
-  0x7121,
-  0x725F,
-  0x77DB,
-  0x9727,
-  0x9D61,
-  0x690B,
-  0x5A7F,
-  0x5A18,
-  0x51A5,
-  0x540D,
-  0x547D,
-  0x660E,
-  0x76DF,
-  0x8FF7,
-  0x9298,
-  0x9CF4,
-  0x59EA,
-  0x725D,
-  0x6EC5,
-  0x514D,
-  0x68C9,
-  0x7DBF,
-  0x7DEC,
-  0x9762,
-  0x9EBA,
-  0x6478,
-  0x6A21,
-  0x8302,
-  0x5984,
-  0x5B5F,
-  0x6BDB,
-  0x731B,
-  0x76F2,
-  0x7DB2,
-  0x8017,
-  0x8499,
-  0x5132,
-  0x6728,
-  0x9ED9,
-  0x76EE,
-  0x6762,
-  0x52FF,
-  0x9905,
-  0x5C24,
-  0x623B,
-  0x7C7E,
-  0x8CB0,
-  0x554F,
-  0x60B6,
-  0x7D0B,
-  0x9580,
-  0x5301,
-  0x4E5F,
-  0x51B6,
-  0x591C,
-  0x723A,
-  0x8036,
-  0x91CE,
-  0x5F25,
-  0x77E2,
-  0x5384,
-  0x5F79,
-  0x7D04,
-  0x85AC,
-  0x8A33,
-  0x8E8D,
-  0x9756,
-  0x67F3,
-  0x85AE,
-  0x9453,
-  0x6109,
-  0x6108,
-  0x6CB9,
-  0x7652,
-  0x8AED,
-  0x8F38,
-  0x552F,
-  0x4F51,
-  0x512A,
-  0x52C7,
-  0x53CB,
-  0x5BA5,
-  0x5E7D,
-  0x60A0,
-  0x6182,
-  0x63D6,
-  0x6709,
-  0x67DA,
-  0x6E67,
-  0x6D8C,
-  0x7336,
-  0x7337,
-  0x7531,
-  0x7950,
-  0x88D5,
-  0x8A98,
-  0x904A,
-  0x9091,
-  0x90F5,
-  0x96C4,
-  0x878D,
-  0x5915,
-  0x4E88,
-  0x4F59,
-  0x4E0E,
-  0x8A89,
-  0x8F3F,
-  0x9810,
-  0x50AD,
-  0x5E7C,
-  0x5996,
-  0x5BB9,
-  0x5EB8,
-  0x63DA,
-  0x63FA,
-  0x64C1,
-  0x66DC,
-  0x694A,
-  0x69D8,
-  0x6D0B,
-  0x6EB6,
-  0x7194,
-  0x7528,
-  0x7AAF,
-  0x7F8A,
-  0x8000,
-  0x8449,
-  0x84C9,
-  0x8981,
-  0x8B21,
-  0x8E0A,
-  0x9065,
-  0x967D,
-  0x990A,
-  0x617E,
-  0x6291,
-  0x6B32,
-  0x6C83,
-  0x6D74,
-  0x7FCC,
-  0x7FFC,
-  0x6DC0,
-  0x7F85,
-  0x87BA,
-  0x88F8,
-  0x6765,
-  0x83B1,
-  0x983C,
-  0x96F7,
-  0x6D1B,
-  0x7D61,
-  0x843D,
-  0x916A,
-  0x4E71,
-  0x5375,
-  0x5D50,
-  0x6B04,
-  0x6FEB,
-  0x85CD,
-  0x862D,
-  0x89A7,
-  0x5229,
-  0x540F,
-  0x5C65,
-  0x674E,
-  0x68A8,
-  0x7406,
-  0x7483,
-  0x75E2,
-  0x88CF,
-  0x88E1,
-  0x91CC,
-  0x96E2,
-  0x9678,
-  0x5F8B,
-  0x7387,
-  0x7ACB,
-  0x844E,
-  0x63A0,
-  0x7565,
-  0x5289,
-  0x6D41,
-  0x6E9C,
-  0x7409,
-  0x7559,
-  0x786B,
-  0x7C92,
-  0x9686,
-  0x7ADC,
-  0x9F8D,
-  0x4FB6,
-  0x616E,
-  0x65C5,
-  0x865C,
-  0x4E86,
-  0x4EAE,
-  0x50DA,
-  0x4E21,
-  0x51CC,
-  0x5BEE,
-  0x6599,
-  0x6881,
-  0x6DBC,
-  0x731F,
-  0x7642,
-  0x77AD,
-  0x7A1C,
-  0x7CE7,
-  0x826F,
-  0x8AD2,
-  0x907C,
-  0x91CF,
-  0x9675,
-  0x9818,
-  0x529B,
-  0x7DD1,
-  0x502B,
-  0x5398,
-  0x6797,
-  0x6DCB,
-  0x71D0,
-  0x7433,
-  0x81E8,
-  0x8F2A,
-  0x96A3,
-  0x9C57,
-  0x9E9F,
-  0x7460,
-  0x5841,
-  0x6D99,
-  0x7D2F,
-  0x985E,
-  0x4EE4,
-  0x4F36,
-  0x4F8B,
-  0x51B7,
-  0x52B1,
-  0x5DBA,
-  0x601C,
-  0x73B2,
-  0x793C,
-  0x82D3,
-  0x9234,
-  0x96B7,
-  0x96F6,
-  0x970A,
-  0x9E97,
-  0x9F62,
-  0x66A6,
-  0x6B74,
-  0x5217,
-  0x52A3,
-  0x70C8,
-  0x88C2,
-  0x5EC9,
-  0x604B,
-  0x6190,
-  0x6F23,
-  0x7149,
-  0x7C3E,
-  0x7DF4,
-  0x806F,
-  0x84EE,
-  0x9023,
-  0x932C,
-  0x5442,
-  0x9B6F,
-  0x6AD3,
-  0x7089,
-  0x8CC2,
-  0x8DEF,
-  0x9732,
-  0x52B4,
-  0x5A41,
-  0x5ECA,
-  0x5F04,
-  0x6717,
-  0x697C,
-  0x6994,
-  0x6D6A,
-  0x6F0F,
-  0x7262,
-  0x72FC,
-  0x7BED,
-  0x8001,
-  0x807E,
-  0x874B,
-  0x90CE,
-  0x516D,
-  0x9E93,
-  0x7984,
-  0x808B,
-  0x9332,
-  0x8AD6,
-  0x502D,
-  0x548C,
-  0x8A71,
-  0x6B6A,
-  0x8CC4,
-  0x8107,
-  0x60D1,
-  0x67A0,
-  0x9DF2,
-  0x4E99,
-  0x4E98,
-  0x9C10,
-  0x8A6B,
-  0x85C1,
-  0x8568,
-  0x6900,
-  0x6E7E,
-  0x7897,
-  0x8155
-};
-
-/* d0a1 to f4a6 is contiguous */
-
-static unsigned short d02f4[] = {
-  0x5F0C,
-  0x4E10,
-  0x4E15,
-  0x4E2A,
-  0x4E31,
-  0x4E36,
-  0x4E3C,
-  0x4E3F,
-  0x4E42,
-  0x4E56,
-  0x4E58,
-  0x4E82,
-  0x4E85,
-  0x8C6B,
-  0x4E8A,
-  0x8212,
-  0x5F0D,
-  0x4E8E,
-  0x4E9E,
-  0x4E9F,
-  0x4EA0,
-  0x4EA2,
-  0x4EB0,
-  0x4EB3,
-  0x4EB6,
-  0x4ECE,
-  0x4ECD,
-  0x4EC4,
-  0x4EC6,
-  0x4EC2,
-  0x4ED7,
-  0x4EDE,
-  0x4EED,
-  0x4EDF,
-  0x4EF7,
-  0x4F09,
-  0x4F5A,
-  0x4F30,
-  0x4F5B,
-  0x4F5D,
-  0x4F57,
-  0x4F47,
-  0x4F76,
-  0x4F88,
-  0x4F8F,
-  0x4F98,
-  0x4F7B,
-  0x4F69,
-  0x4F70,
-  0x4F91,
-  0x4F6F,
-  0x4F86,
-  0x4F96,
-  0x5118,
-  0x4FD4,
-  0x4FDF,
-  0x4FCE,
-  0x4FD8,
-  0x4FDB,
-  0x4FD1,
-  0x4FDA,
-  0x4FD0,
-  0x4FE4,
-  0x4FE5,
-  0x501A,
-  0x5028,
-  0x5014,
-  0x502A,
-  0x5025,
-  0x5005,
-  0x4F1C,
-  0x4FF6,
-  0x5021,
-  0x5029,
-  0x502C,
-  0x4FFE,
-  0x4FEF,
-  0x5011,
-  0x5006,
-  0x5043,
-  0x5047,
-  0x6703,
-  0x5055,
-  0x5050,
-  0x5048,
-  0x505A,
-  0x5056,
-  0x506C,
-  0x5078,
-  0x5080,
-  0x509A,
-  0x5085,
-  0x50B4,
-  0x50B2,
-  0x50C9,
-  0x50CA,
-  0x50B3,
-  0x50C2,
-  0x50D6,
-  0x50DE,
-  0x50E5,
-  0x50ED,
-  0x50E3,
-  0x50EE,
-  0x50F9,
-  0x50F5,
-  0x5109,
-  0x5101,
-  0x5102,
-  0x5116,
-  0x5115,
-  0x5114,
-  0x511A,
-  0x5121,
-  0x513A,
-  0x5137,
-  0x513C,
-  0x513B,
-  0x513F,
-  0x5140,
-  0x5152,
-  0x514C,
-  0x5154,
-  0x5162,
-  0x7AF8,
-  0x5169,
-  0x516A,
-  0x516E,
-  0x5180,
-  0x5182,
-  0x56D8,
-  0x518C,
-  0x5189,
-  0x518F,
-  0x5191,
-  0x5193,
-  0x5195,
-  0x5196,
-  0x51A4,
-  0x51A6,
-  0x51A2,
-  0x51A9,
-  0x51AA,
-  0x51AB,
-  0x51B3,
-  0x51B1,
-  0x51B2,
-  0x51B0,
-  0x51B5,
-  0x51BD,
-  0x51C5,
-  0x51C9,
-  0x51DB,
-  0x51E0,
-  0x8655,
-  0x51E9,
-  0x51ED,
-  0x51F0,
-  0x51F5,
-  0x51FE,
-  0x5204,
-  0x520B,
-  0x5214,
-  0x520E,
-  0x5227,
-  0x522A,
-  0x522E,
-  0x5233,
-  0x5239,
-  0x524F,
-  0x5244,
-  0x524B,
-  0x524C,
-  0x525E,
-  0x5254,
-  0x526A,
-  0x5274,
-  0x5269,
-  0x5273,
-  0x527F,
-  0x527D,
-  0x528D,
-  0x5294,
-  0x5292,
-  0x5271,
-  0x5288,
-  0x5291,
-  0x8FA8,
-  0x8FA7,
-  0x52AC,
-  0x52AD,
-  0x52BC,
-  0x52B5,
-  0x52C1,
-  0x52CD,
-  0x52D7,
-  0x52DE,
-  0x52E3,
-  0x52E6,
-  0x98ED,
-  0x52E0,
-  0x52F3,
-  0x52F5,
-  0x52F8,
-  0x52F9,
-  0x5306,
-  0x5308,
-  0x7538,
-  0x530D,
-  0x5310,
-  0x530F,
-  0x5315,
-  0x531A,
-  0x5323,
-  0x532F,
-  0x5331,
-  0x5333,
-  0x5338,
-  0x5340,
-  0x5346,
-  0x5345,
-  0x4E17,
-  0x5349,
-  0x534D,
-  0x51D6,
-  0x535E,
-  0x5369,
-  0x536E,
-  0x5918,
-  0x537B,
-  0x5377,
-  0x5382,
-  0x5396,
-  0x53A0,
-  0x53A6,
-  0x53A5,
-  0x53AE,
-  0x53B0,
-  0x53B6,
-  0x53C3,
-  0x7C12,
-  0x96D9,
-  0x53DF,
-  0x66FC,
-  0x71EE,
-  0x53EE,
-  0x53E8,
-  0x53ED,
-  0x53FA,
-  0x5401,
-  0x543D,
-  0x5440,
-  0x542C,
-  0x542D,
-  0x543C,
-  0x542E,
-  0x5436,
-  0x5429,
-  0x541D,
-  0x544E,
-  0x548F,
-  0x5475,
-  0x548E,
-  0x545F,
-  0x5471,
-  0x5477,
-  0x5470,
-  0x5492,
-  0x547B,
-  0x5480,
-  0x5476,
-  0x5484,
-  0x5490,
-  0x5486,
-  0x54C7,
-  0x54A2,
-  0x54B8,
-  0x54A5,
-  0x54AC,
-  0x54C4,
-  0x54C8,
-  0x54A8,
-  0x54AB,
-  0x54C2,
-  0x54A4,
-  0x54BE,
-  0x54BC,
-  0x54D8,
-  0x54E5,
-  0x54E6,
-  0x550F,
-  0x5514,
-  0x54FD,
-  0x54EE,
-  0x54ED,
-  0x54FA,
-  0x54E2,
-  0x5539,
-  0x5540,
-  0x5563,
-  0x554C,
-  0x552E,
-  0x555C,
-  0x5545,
-  0x5556,
-  0x5557,
-  0x5538,
-  0x5533,
-  0x555D,
-  0x5599,
-  0x5580,
-  0x54AF,
-  0x558A,
-  0x559F,
-  0x557B,
-  0x557E,
-  0x5598,
-  0x559E,
-  0x55AE,
-  0x557C,
-  0x5583,
-  0x55A9,
-  0x5587,
-  0x55A8,
-  0x55DA,
-  0x55C5,
-  0x55DF,
-  0x55C4,
-  0x55DC,
-  0x55E4,
-  0x55D4,
-  0x5614,
-  0x55F7,
-  0x5616,
-  0x55FE,
-  0x55FD,
-  0x561B,
-  0x55F9,
-  0x564E,
-  0x5650,
-  0x71DF,
-  0x5634,
-  0x5636,
-  0x5632,
-  0x5638,
-  0x566B,
-  0x5664,
-  0x562F,
-  0x566C,
-  0x566A,
-  0x5686,
-  0x5680,
-  0x568A,
-  0x56A0,
-  0x5694,
-  0x568F,
-  0x56A5,
-  0x56AE,
-  0x56B6,
-  0x56B4,
-  0x56C2,
-  0x56BC,
-  0x56C1,
-  0x56C3,
-  0x56C0,
-  0x56C8,
-  0x56CE,
-  0x56D1,
-  0x56D3,
-  0x56D7,
-  0x56EE,
-  0x56F9,
-  0x5700,
-  0x56FF,
-  0x5704,
-  0x5709,
-  0x5708,
-  0x570B,
-  0x570D,
-  0x5713,
-  0x5718,
-  0x5716,
-  0x55C7,
-  0x571C,
-  0x5726,
-  0x5737,
-  0x5738,
-  0x574E,
-  0x573B,
-  0x5740,
-  0x574F,
-  0x5769,
-  0x57C0,
-  0x5788,
-  0x5761,
-  0x577F,
-  0x5789,
-  0x5793,
-  0x57A0,
-  0x57B3,
-  0x57A4,
-  0x57AA,
-  0x57B0,
-  0x57C3,
-  0x57C6,
-  0x57D4,
-  0x57D2,
-  0x57D3,
-  0x580A,
-  0x57D6,
-  0x57E3,
-  0x580B,
-  0x5819,
-  0x581D,
-  0x5872,
-  0x5821,
-  0x5862,
-  0x584B,
-  0x5870,
-  0x6BC0,
-  0x5852,
-  0x583D,
-  0x5879,
-  0x5885,
-  0x58B9,
-  0x589F,
-  0x58AB,
-  0x58BA,
-  0x58DE,
-  0x58BB,
-  0x58B8,
-  0x58AE,
-  0x58C5,
-  0x58D3,
-  0x58D1,
-  0x58D7,
-  0x58D9,
-  0x58D8,
-  0x58E5,
-  0x58DC,
-  0x58E4,
-  0x58DF,
-  0x58EF,
-  0x58FA,
-  0x58F9,
-  0x58FB,
-  0x58FC,
-  0x58FD,
-  0x5902,
-  0x590A,
-  0x5910,
-  0x591B,
-  0x68A6,
-  0x5925,
-  0x592C,
-  0x592D,
-  0x5932,
-  0x5938,
-  0x593E,
-  0x7AD2,
-  0x5955,
-  0x5950,
-  0x594E,
-  0x595A,
-  0x5958,
-  0x5962,
-  0x5960,
-  0x5967,
-  0x596C,
-  0x5969,
-  0x5978,
-  0x5981,
-  0x599D,
-  0x4F5E,
-  0x4FAB,
-  0x59A3,
-  0x59B2,
-  0x59C6,
-  0x59E8,
-  0x59DC,
-  0x598D,
-  0x59D9,
-  0x59DA,
-  0x5A25,
-  0x5A1F,
-  0x5A11,
-  0x5A1C,
-  0x5A09,
-  0x5A1A,
-  0x5A40,
-  0x5A6C,
-  0x5A49,
-  0x5A35,
-  0x5A36,
-  0x5A62,
-  0x5A6A,
-  0x5A9A,
-  0x5ABC,
-  0x5ABE,
-  0x5ACB,
-  0x5AC2,
-  0x5ABD,
-  0x5AE3,
-  0x5AD7,
-  0x5AE6,
-  0x5AE9,
-  0x5AD6,
-  0x5AFA,
-  0x5AFB,
-  0x5B0C,
-  0x5B0B,
-  0x5B16,
-  0x5B32,
-  0x5AD0,
-  0x5B2A,
-  0x5B36,
-  0x5B3E,
-  0x5B43,
-  0x5B45,
-  0x5B40,
-  0x5B51,
-  0x5B55,
-  0x5B5A,
-  0x5B5B,
-  0x5B65,
-  0x5B69,
-  0x5B70,
-  0x5B73,
-  0x5B75,
-  0x5B78,
-  0x6588,
-  0x5B7A,
-  0x5B80,
-  0x5B83,
-  0x5BA6,
-  0x5BB8,
-  0x5BC3,
-  0x5BC7,
-  0x5BC9,
-  0x5BD4,
-  0x5BD0,
-  0x5BE4,
-  0x5BE6,
-  0x5BE2,
-  0x5BDE,
-  0x5BE5,
-  0x5BEB,
-  0x5BF0,
-  0x5BF6,
-  0x5BF3,
-  0x5C05,
-  0x5C07,
-  0x5C08,
-  0x5C0D,
-  0x5C13,
-  0x5C20,
-  0x5C22,
-  0x5C28,
-  0x5C38,
-  0x5C39,
-  0x5C41,
-  0x5C46,
-  0x5C4E,
-  0x5C53,
-  0x5C50,
-  0x5C4F,
-  0x5B71,
-  0x5C6C,
-  0x5C6E,
-  0x4E62,
-  0x5C76,
-  0x5C79,
-  0x5C8C,
-  0x5C91,
-  0x5C94,
-  0x599B,
-  0x5CAB,
-  0x5CBB,
-  0x5CB6,
-  0x5CBC,
-  0x5CB7,
-  0x5CC5,
-  0x5CBE,
-  0x5CC7,
-  0x5CD9,
-  0x5CE9,
-  0x5CFD,
-  0x5CFA,
-  0x5CED,
-  0x5D8C,
-  0x5CEA,
-  0x5D0B,
-  0x5D15,
-  0x5D17,
-  0x5D5C,
-  0x5D1F,
-  0x5D1B,
-  0x5D11,
-  0x5D14,
-  0x5D22,
-  0x5D1A,
-  0x5D19,
-  0x5D18,
-  0x5D4C,
-  0x5D52,
-  0x5D4E,
-  0x5D4B,
-  0x5D6C,
-  0x5D73,
-  0x5D76,
-  0x5D87,
-  0x5D84,
-  0x5D82,
-  0x5DA2,
-  0x5D9D,
-  0x5DAC,
-  0x5DAE,
-  0x5DBD,
-  0x5D90,
-  0x5DB7,
-  0x5DBC,
-  0x5DC9,
-  0x5DCD,
-  0x5DD3,
-  0x5DD2,
-  0x5DD6,
-  0x5DDB,
-  0x5DEB,
-  0x5DF2,
-  0x5DF5,
-  0x5E0B,
-  0x5E1A,
-  0x5E19,
-  0x5E11,
-  0x5E1B,
-  0x5E36,
-  0x5E37,
-  0x5E44,
-  0x5E43,
-  0x5E40,
-  0x5E4E,
-  0x5E57,
-  0x5E54,
-  0x5E5F,
-  0x5E62,
-  0x5E64,
-  0x5E47,
-  0x5E75,
-  0x5E76,
-  0x5E7A,
-  0x9EBC,
-  0x5E7F,
-  0x5EA0,
-  0x5EC1,
-  0x5EC2,
-  0x5EC8,
-  0x5ED0,
-  0x5ECF,
-  0x5ED6,
-  0x5EE3,
-  0x5EDD,
-  0x5EDA,
-  0x5EDB,
-  0x5EE2,
-  0x5EE1,
-  0x5EE8,
-  0x5EE9,
-  0x5EEC,
-  0x5EF1,
-  0x5EF3,
-  0x5EF0,
-  0x5EF4,
-  0x5EF8,
-  0x5EFE,
-  0x5F03,
-  0x5F09,
-  0x5F5D,
-  0x5F5C,
-  0x5F0B,
-  0x5F11,
-  0x5F16,
-  0x5F29,
-  0x5F2D,
-  0x5F38,
-  0x5F41,
-  0x5F48,
-  0x5F4C,
-  0x5F4E,
-  0x5F2F,
-  0x5F51,
-  0x5F56,
-  0x5F57,
-  0x5F59,
-  0x5F61,
-  0x5F6D,
-  0x5F73,
-  0x5F77,
-  0x5F83,
-  0x5F82,
-  0x5F7F,
-  0x5F8A,
-  0x5F88,
-  0x5F91,
-  0x5F87,
-  0x5F9E,
-  0x5F99,
-  0x5F98,
-  0x5FA0,
-  0x5FA8,
-  0x5FAD,
-  0x5FBC,
-  0x5FD6,
-  0x5FFB,
-  0x5FE4,
-  0x5FF8,
-  0x5FF1,
-  0x5FDD,
-  0x60B3,
-  0x5FFF,
-  0x6021,
-  0x6060,
-  0x6019,
-  0x6010,
-  0x6029,
-  0x600E,
-  0x6031,
-  0x601B,
-  0x6015,
-  0x602B,
-  0x6026,
-  0x600F,
-  0x603A,
-  0x605A,
-  0x6041,
-  0x606A,
-  0x6077,
-  0x605F,
-  0x604A,
-  0x6046,
-  0x604D,
-  0x6063,
-  0x6043,
-  0x6064,
-  0x6042,
-  0x606C,
-  0x606B,
-  0x6059,
-  0x6081,
-  0x608D,
-  0x60E7,
-  0x6083,
-  0x609A,
-  0x6084,
-  0x609B,
-  0x6096,
-  0x6097,
-  0x6092,
-  0x60A7,
-  0x608B,
-  0x60E1,
-  0x60B8,
-  0x60E0,
-  0x60D3,
-  0x60B4,
-  0x5FF0,
-  0x60BD,
-  0x60C6,
-  0x60B5,
-  0x60D8,
-  0x614D,
-  0x6115,
-  0x6106,
-  0x60F6,
-  0x60F7,
-  0x6100,
-  0x60F4,
-  0x60FA,
-  0x6103,
-  0x6121,
-  0x60FB,
-  0x60F1,
-  0x610D,
-  0x610E,
-  0x6147,
-  0x613E,
-  0x6128,
-  0x6127,
-  0x614A,
-  0x613F,
-  0x613C,
-  0x612C,
-  0x6134,
-  0x613D,
-  0x6142,
-  0x6144,
-  0x6173,
-  0x6177,
-  0x6158,
-  0x6159,
-  0x615A,
-  0x616B,
-  0x6174,
-  0x616F,
-  0x6165,
-  0x6171,
-  0x615F,
-  0x615D,
-  0x6153,
-  0x6175,
-  0x6199,
-  0x6196,
-  0x6187,
-  0x61AC,
-  0x6194,
-  0x619A,
-  0x618A,
-  0x6191,
-  0x61AB,
-  0x61AE,
-  0x61CC,
-  0x61CA,
-  0x61C9,
-  0x61F7,
-  0x61C8,
-  0x61C3,
-  0x61C6,
-  0x61BA,
-  0x61CB,
-  0x7F79,
-  0x61CD,
-  0x61E6,
-  0x61E3,
-  0x61F6,
-  0x61FA,
-  0x61F4,
-  0x61FF,
-  0x61FD,
-  0x61FC,
-  0x61FE,
-  0x6200,
-  0x6208,
-  0x6209,
-  0x620D,
-  0x620C,
-  0x6214,
-  0x621B,
-  0x621E,
-  0x6221,
-  0x622A,
-  0x622E,
-  0x6230,
-  0x6232,
-  0x6233,
-  0x6241,
-  0x624E,
-  0x625E,
-  0x6263,
-  0x625B,
-  0x6260,
-  0x6268,
-  0x627C,
-  0x6282,
-  0x6289,
-  0x627E,
-  0x6292,
-  0x6293,
-  0x6296,
-  0x62D4,
-  0x6283,
-  0x6294,
-  0x62D7,
-  0x62D1,
-  0x62BB,
-  0x62CF,
-  0x62FF,
-  0x62C6,
-  0x64D4,
-  0x62C8,
-  0x62DC,
-  0x62CC,
-  0x62CA,
-  0x62C2,
-  0x62C7,
-  0x629B,
-  0x62C9,
-  0x630C,
-  0x62EE,
-  0x62F1,
-  0x6327,
-  0x6302,
-  0x6308,
-  0x62EF,
-  0x62F5,
-  0x6350,
-  0x633E,
-  0x634D,
-  0x641C,
-  0x634F,
-  0x6396,
-  0x638E,
-  0x6380,
-  0x63AB,
-  0x6376,
-  0x63A3,
-  0x638F,
-  0x6389,
-  0x639F,
-  0x63B5,
-  0x636B,
-  0x6369,
-  0x63BE,
-  0x63E9,
-  0x63C0,
-  0x63C6,
-  0x63E3,
-  0x63C9,
-  0x63D2,
-  0x63F6,
-  0x63C4,
-  0x6416,
-  0x6434,
-  0x6406,
-  0x6413,
-  0x6426,
-  0x6436,
-  0x651D,
-  0x6417,
-  0x6428,
-  0x640F,
-  0x6467,
-  0x646F,
-  0x6476,
-  0x644E,
-  0x652A,
-  0x6495,
-  0x6493,
-  0x64A5,
-  0x64A9,
-  0x6488,
-  0x64BC,
-  0x64DA,
-  0x64D2,
-  0x64C5,
-  0x64C7,
-  0x64BB,
-  0x64D8,
-  0x64C2,
-  0x64F1,
-  0x64E7,
-  0x8209,
-  0x64E0,
-  0x64E1,
-  0x62AC,
-  0x64E3,
-  0x64EF,
-  0x652C,
-  0x64F6,
-  0x64F4,
-  0x64F2,
-  0x64FA,
-  0x6500,
-  0x64FD,
-  0x6518,
-  0x651C,
-  0x6505,
-  0x6524,
-  0x6523,
-  0x652B,
-  0x6534,
-  0x6535,
-  0x6537,
-  0x6536,
-  0x6538,
-  0x754B,
-  0x6548,
-  0x6556,
-  0x6555,
-  0x654D,
-  0x6558,
-  0x655E,
-  0x655D,
-  0x6572,
-  0x6578,
-  0x6582,
-  0x6583,
-  0x8B8A,
-  0x659B,
-  0x659F,
-  0x65AB,
-  0x65B7,
-  0x65C3,
-  0x65C6,
-  0x65C1,
-  0x65C4,
-  0x65CC,
-  0x65D2,
-  0x65DB,
-  0x65D9,
-  0x65E0,
-  0x65E1,
-  0x65F1,
-  0x6772,
-  0x660A,
-  0x6603,
-  0x65FB,
-  0x6773,
-  0x6635,
-  0x6636,
-  0x6634,
-  0x661C,
-  0x664F,
-  0x6644,
-  0x6649,
-  0x6641,
-  0x665E,
-  0x665D,
-  0x6664,
-  0x6667,
-  0x6668,
-  0x665F,
-  0x6662,
-  0x6670,
-  0x6683,
-  0x6688,
-  0x668E,
-  0x6689,
-  0x6684,
-  0x6698,
-  0x669D,
-  0x66C1,
-  0x66B9,
-  0x66C9,
-  0x66BE,
-  0x66BC,
-  0x66C4,
-  0x66B8,
-  0x66D6,
-  0x66DA,
-  0x66E0,
-  0x663F,
-  0x66E6,
-  0x66E9,
-  0x66F0,
-  0x66F5,
-  0x66F7,
-  0x670F,
-  0x6716,
-  0x671E,
-  0x6726,
-  0x6727,
-  0x9738,
-  0x672E,
-  0x673F,
-  0x6736,
-  0x6741,
-  0x6738,
-  0x6737,
-  0x6746,
-  0x675E,
-  0x6760,
-  0x6759,
-  0x6763,
-  0x6764,
-  0x6789,
-  0x6770,
-  0x67A9,
-  0x677C,
-  0x676A,
-  0x678C,
-  0x678B,
-  0x67A6,
-  0x67A1,
-  0x6785,
-  0x67B7,
-  0x67EF,
-  0x67B4,
-  0x67EC,
-  0x67B3,
-  0x67E9,
-  0x67B8,
-  0x67E4,
-  0x67DE,
-  0x67DD,
-  0x67E2,
-  0x67EE,
-  0x67B9,
-  0x67CE,
-  0x67C6,
-  0x67E7,
-  0x6A9C,
-  0x681E,
-  0x6846,
-  0x6829,
-  0x6840,
-  0x684D,
-  0x6832,
-  0x684E,
-  0x68B3,
-  0x682B,
-  0x6859,
-  0x6863,
-  0x6877,
-  0x687F,
-  0x689F,
-  0x688F,
-  0x68AD,
-  0x6894,
-  0x689D,
-  0x689B,
-  0x6883,
-  0x6AAE,
-  0x68B9,
-  0x6874,
-  0x68B5,
-  0x68A0,
-  0x68BA,
-  0x690F,
-  0x688D,
-  0x687E,
-  0x6901,
-  0x68CA,
-  0x6908,
-  0x68D8,
-  0x6922,
-  0x6926,
-  0x68E1,
-  0x690C,
-  0x68CD,
-  0x68D4,
-  0x68E7,
-  0x68D5,
-  0x6936,
-  0x6912,
-  0x6904,
-  0x68D7,
-  0x68E3,
-  0x6925,
-  0x68F9,
-  0x68E0,
-  0x68EF,
-  0x6928,
-  0x692A,
-  0x691A,
-  0x6923,
-  0x6921,
-  0x68C6,
-  0x6979,
-  0x6977,
-  0x695C,
-  0x6978,
-  0x696B,
-  0x6954,
-  0x697E,
-  0x696E,
-  0x6939,
-  0x6974,
-  0x693D,
-  0x6959,
-  0x6930,
-  0x6961,
-  0x695E,
-  0x695D,
-  0x6981,
-  0x696A,
-  0x69B2,
-  0x69AE,
-  0x69D0,
-  0x69BF,
-  0x69C1,
-  0x69D3,
-  0x69BE,
-  0x69CE,
-  0x5BE8,
-  0x69CA,
-  0x69DD,
-  0x69BB,
-  0x69C3,
-  0x69A7,
-  0x6A2E,
-  0x6991,
-  0x69A0,
-  0x699C,
-  0x6995,
-  0x69B4,
-  0x69DE,
-  0x69E8,
-  0x6A02,
-  0x6A1B,
-  0x69FF,
-  0x6B0A,
-  0x69F9,
-  0x69F2,
-  0x69E7,
-  0x6A05,
-  0x69B1,
-  0x6A1E,
-  0x69ED,
-  0x6A14,
-  0x69EB,
-  0x6A0A,
-  0x6A12,
-  0x6AC1,
-  0x6A23,
-  0x6A13,
-  0x6A44,
-  0x6A0C,
-  0x6A72,
-  0x6A36,
-  0x6A78,
-  0x6A47,
-  0x6A62,
-  0x6A59,
-  0x6A66,
-  0x6A48,
-  0x6A38,
-  0x6A22,
-  0x6A90,
-  0x6A8D,
-  0x6AA0,
-  0x6A84,
-  0x6AA2,
-  0x6AA3,
-  0x6A97,
-  0x8617,
-  0x6ABB,
-  0x6AC3,
-  0x6AC2,
-  0x6AB8,
-  0x6AB3,
-  0x6AAC,
-  0x6ADE,
-  0x6AD1,
-  0x6ADF,
-  0x6AAA,
-  0x6ADA,
-  0x6AEA,
-  0x6AFB,
-  0x6B05,
-  0x8616,
-  0x6AFA,
-  0x6B12,
-  0x6B16,
-  0x9B31,
-  0x6B1F,
-  0x6B38,
-  0x6B37,
-  0x76DC,
-  0x6B39,
-  0x98EE,
-  0x6B47,
-  0x6B43,
-  0x6B49,
-  0x6B50,
-  0x6B59,
-  0x6B54,
-  0x6B5B,
-  0x6B5F,
-  0x6B61,
-  0x6B78,
-  0x6B79,
-  0x6B7F,
-  0x6B80,
-  0x6B84,
-  0x6B83,
-  0x6B8D,
-  0x6B98,
-  0x6B95,
-  0x6B9E,
-  0x6BA4,
-  0x6BAA,
-  0x6BAB,
-  0x6BAF,
-  0x6BB2,
-  0x6BB1,
-  0x6BB3,
-  0x6BB7,
-  0x6BBC,
-  0x6BC6,
-  0x6BCB,
-  0x6BD3,
-  0x6BDF,
-  0x6BEC,
-  0x6BEB,
-  0x6BF3,
-  0x6BEF,
-  0x9EBE,
-  0x6C08,
-  0x6C13,
-  0x6C14,
-  0x6C1B,
-  0x6C24,
-  0x6C23,
-  0x6C5E,
-  0x6C55,
-  0x6C62,
-  0x6C6A,
-  0x6C82,
-  0x6C8D,
-  0x6C9A,
-  0x6C81,
-  0x6C9B,
-  0x6C7E,
-  0x6C68,
-  0x6C73,
-  0x6C92,
-  0x6C90,
-  0x6CC4,
-  0x6CF1,
-  0x6CD3,
-  0x6CBD,
-  0x6CD7,
-  0x6CC5,
-  0x6CDD,
-  0x6CAE,
-  0x6CB1,
-  0x6CBE,
-  0x6CBA,
-  0x6CDB,
-  0x6CEF,
-  0x6CD9,
-  0x6CEA,
-  0x6D1F,
-  0x884D,
-  0x6D36,
-  0x6D2B,
-  0x6D3D,
-  0x6D38,
-  0x6D19,
-  0x6D35,
-  0x6D33,
-  0x6D12,
-  0x6D0C,
-  0x6D63,
-  0x6D93,
-  0x6D64,
-  0x6D5A,
-  0x6D79,
-  0x6D59,
-  0x6D8E,
-  0x6D95,
-  0x6FE4,
-  0x6D85,
-  0x6DF9,
-  0x6E15,
-  0x6E0A,
-  0x6DB5,
-  0x6DC7,
-  0x6DE6,
-  0x6DB8,
-  0x6DC6,
-  0x6DEC,
-  0x6DDE,
-  0x6DCC,
-  0x6DE8,
-  0x6DD2,
-  0x6DC5,
-  0x6DFA,
-  0x6DD9,
-  0x6DE4,
-  0x6DD5,
-  0x6DEA,
-  0x6DEE,
-  0x6E2D,
-  0x6E6E,
-  0x6E2E,
-  0x6E19,
-  0x6E72,
-  0x6E5F,
-  0x6E3E,
-  0x6E23,
-  0x6E6B,
-  0x6E2B,
-  0x6E76,
-  0x6E4D,
-  0x6E1F,
-  0x6E43,
-  0x6E3A,
-  0x6E4E,
-  0x6E24,
-  0x6EFF,
-  0x6E1D,
-  0x6E38,
-  0x6E82,
-  0x6EAA,
-  0x6E98,
-  0x6EC9,
-  0x6EB7,
-  0x6ED3,
-  0x6EBD,
-  0x6EAF,
-  0x6EC4,
-  0x6EB2,
-  0x6ED4,
-  0x6ED5,
-  0x6E8F,
-  0x6EA5,
-  0x6EC2,
-  0x6E9F,
-  0x6F41,
-  0x6F11,
-  0x704C,
-  0x6EEC,
-  0x6EF8,
-  0x6EFE,
-  0x6F3F,
-  0x6EF2,
-  0x6F31,
-  0x6EEF,
-  0x6F32,
-  0x6ECC,
-  0x6F3E,
-  0x6F13,
-  0x6EF7,
-  0x6F86,
-  0x6F7A,
-  0x6F78,
-  0x6F81,
-  0x6F80,
-  0x6F6F,
-  0x6F5B,
-  0x6FF3,
-  0x6F6D,
-  0x6F82,
-  0x6F7C,
-  0x6F58,
-  0x6F8E,
-  0x6F91,
-  0x6FC2,
-  0x6F66,
-  0x6FB3,
-  0x6FA3,
-  0x6FA1,
-  0x6FA4,
-  0x6FB9,
-  0x6FC6,
-  0x6FAA,
-  0x6FDF,
-  0x6FD5,
-  0x6FEC,
-  0x6FD4,
-  0x6FD8,
-  0x6FF1,
-  0x6FEE,
-  0x6FDB,
-  0x7009,
-  0x700B,
-  0x6FFA,
-  0x7011,
-  0x7001,
-  0x700F,
-  0x6FFE,
-  0x701B,
-  0x701A,
-  0x6F74,
-  0x701D,
-  0x7018,
-  0x701F,
-  0x7030,
-  0x703E,
-  0x7032,
-  0x7051,
-  0x7063,
-  0x7099,
-  0x7092,
-  0x70AF,
-  0x70F1,
-  0x70AC,
-  0x70B8,
-  0x70B3,
-  0x70AE,
-  0x70DF,
-  0x70CB,
-  0x70DD,
-  0x70D9,
-  0x7109,
-  0x70FD,
-  0x711C,
-  0x7119,
-  0x7165,
-  0x7155,
-  0x7188,
-  0x7166,
-  0x7162,
-  0x714C,
-  0x7156,
-  0x716C,
-  0x718F,
-  0x71FB,
-  0x7184,
-  0x7195,
-  0x71A8,
-  0x71AC,
-  0x71D7,
-  0x71B9,
-  0x71BE,
-  0x71D2,
-  0x71C9,
-  0x71D4,
-  0x71CE,
-  0x71E0,
-  0x71EC,
-  0x71E7,
-  0x71F5,
-  0x71FC,
-  0x71F9,
-  0x71FF,
-  0x720D,
-  0x7210,
-  0x721B,
-  0x7228,
-  0x722D,
-  0x722C,
-  0x7230,
-  0x7232,
-  0x723B,
-  0x723C,
-  0x723F,
-  0x7240,
-  0x7246,
-  0x724B,
-  0x7258,
-  0x7274,
-  0x727E,
-  0x7282,
-  0x7281,
-  0x7287,
-  0x7292,
-  0x7296,
-  0x72A2,
-  0x72A7,
-  0x72B9,
-  0x72B2,
-  0x72C3,
-  0x72C6,
-  0x72C4,
-  0x72CE,
-  0x72D2,
-  0x72E2,
-  0x72E0,
-  0x72E1,
-  0x72F9,
-  0x72F7,
-  0x500F,
-  0x7317,
-  0x730A,
-  0x731C,
-  0x7316,
-  0x731D,
-  0x7334,
-  0x732F,
-  0x7329,
-  0x7325,
-  0x733E,
-  0x734E,
-  0x734F,
-  0x9ED8,
-  0x7357,
-  0x736A,
-  0x7368,
-  0x7370,
-  0x7378,
-  0x7375,
-  0x737B,
-  0x737A,
-  0x73C8,
-  0x73B3,
-  0x73CE,
-  0x73BB,
-  0x73C0,
-  0x73E5,
-  0x73EE,
-  0x73DE,
-  0x74A2,
-  0x7405,
-  0x746F,
-  0x7425,
-  0x73F8,
-  0x7432,
-  0x743A,
-  0x7455,
-  0x743F,
-  0x745F,
-  0x7459,
-  0x7441,
-  0x745C,
-  0x7469,
-  0x7470,
-  0x7463,
-  0x746A,
-  0x7476,
-  0x747E,
-  0x748B,
-  0x749E,
-  0x74A7,
-  0x74CA,
-  0x74CF,
-  0x74D4,
-  0x73F1,
-  0x74E0,
-  0x74E3,
-  0x74E7,
-  0x74E9,
-  0x74EE,
-  0x74F2,
-  0x74F0,
-  0x74F1,
-  0x74F8,
-  0x74F7,
-  0x7504,
-  0x7503,
-  0x7505,
-  0x750C,
-  0x750E,
-  0x750D,
-  0x7515,
-  0x7513,
-  0x751E,
-  0x7526,
-  0x752C,
-  0x753C,
-  0x7544,
-  0x754D,
-  0x754A,
-  0x7549,
-  0x755B,
-  0x7546,
-  0x755A,
-  0x7569,
-  0x7564,
-  0x7567,
-  0x756B,
-  0x756D,
-  0x7578,
-  0x7576,
-  0x7586,
-  0x7587,
-  0x7574,
-  0x758A,
-  0x7589,
-  0x7582,
-  0x7594,
-  0x759A,
-  0x759D,
-  0x75A5,
-  0x75A3,
-  0x75C2,
-  0x75B3,
-  0x75C3,
-  0x75B5,
-  0x75BD,
-  0x75B8,
-  0x75BC,
-  0x75B1,
-  0x75CD,
-  0x75CA,
-  0x75D2,
-  0x75D9,
-  0x75E3,
-  0x75DE,
-  0x75FE,
-  0x75FF,
-  0x75FC,
-  0x7601,
-  0x75F0,
-  0x75FA,
-  0x75F2,
-  0x75F3,
-  0x760B,
-  0x760D,
-  0x7609,
-  0x761F,
-  0x7627,
-  0x7620,
-  0x7621,
-  0x7622,
-  0x7624,
-  0x7634,
-  0x7630,
-  0x763B,
-  0x7647,
-  0x7648,
-  0x7646,
-  0x765C,
-  0x7658,
-  0x7661,
-  0x7662,
-  0x7668,
-  0x7669,
-  0x766A,
-  0x7667,
-  0x766C,
-  0x7670,
-  0x7672,
-  0x7676,
-  0x7678,
-  0x767C,
-  0x7680,
-  0x7683,
-  0x7688,
-  0x768B,
-  0x768E,
-  0x7696,
-  0x7693,
-  0x7699,
-  0x769A,
-  0x76B0,
-  0x76B4,
-  0x76B8,
-  0x76B9,
-  0x76BA,
-  0x76C2,
-  0x76CD,
-  0x76D6,
-  0x76D2,
-  0x76DE,
-  0x76E1,
-  0x76E5,
-  0x76E7,
-  0x76EA,
-  0x862F,
-  0x76FB,
-  0x7708,
-  0x7707,
-  0x7704,
-  0x7729,
-  0x7724,
-  0x771E,
-  0x7725,
-  0x7726,
-  0x771B,
-  0x7737,
-  0x7738,
-  0x7747,
-  0x775A,
-  0x7768,
-  0x776B,
-  0x775B,
-  0x7765,
-  0x777F,
-  0x777E,
-  0x7779,
-  0x778E,
-  0x778B,
-  0x7791,
-  0x77A0,
-  0x779E,
-  0x77B0,
-  0x77B6,
-  0x77B9,
-  0x77BF,
-  0x77BC,
-  0x77BD,
-  0x77BB,
-  0x77C7,
-  0x77CD,
-  0x77D7,
-  0x77DA,
-  0x77DC,
-  0x77E3,
-  0x77EE,
-  0x77FC,
-  0x780C,
-  0x7812,
-  0x7926,
-  0x7820,
-  0x792A,
-  0x7845,
-  0x788E,
-  0x7874,
-  0x7886,
-  0x787C,
-  0x789A,
-  0x788C,
-  0x78A3,
-  0x78B5,
-  0x78AA,
-  0x78AF,
-  0x78D1,
-  0x78C6,
-  0x78CB,
-  0x78D4,
-  0x78BE,
-  0x78BC,
-  0x78C5,
-  0x78CA,
-  0x78EC,
-  0x78E7,
-  0x78DA,
-  0x78FD,
-  0x78F4,
-  0x7907,
-  0x7912,
-  0x7911,
-  0x7919,
-  0x792C,
-  0x792B,
-  0x7940,
-  0x7960,
-  0x7957,
-  0x795F,
-  0x795A,
-  0x7955,
-  0x7953,
-  0x797A,
-  0x797F,
-  0x798A,
-  0x799D,
-  0x79A7,
-  0x9F4B,
-  0x79AA,
-  0x79AE,
-  0x79B3,
-  0x79B9,
-  0x79BA,
-  0x79C9,
-  0x79D5,
-  0x79E7,
-  0x79EC,
-  0x79E1,
-  0x79E3,
-  0x7A08,
-  0x7A0D,
-  0x7A18,
-  0x7A19,
-  0x7A20,
-  0x7A1F,
-  0x7980,
-  0x7A31,
-  0x7A3B,
-  0x7A3E,
-  0x7A37,
-  0x7A43,
-  0x7A57,
-  0x7A49,
-  0x7A61,
-  0x7A62,
-  0x7A69,
-  0x9F9D,
-  0x7A70,
-  0x7A79,
-  0x7A7D,
-  0x7A88,
-  0x7A97,
-  0x7A95,
-  0x7A98,
-  0x7A96,
-  0x7AA9,
-  0x7AC8,
-  0x7AB0,
-  0x7AB6,
-  0x7AC5,
-  0x7AC4,
-  0x7ABF,
-  0x9083,
-  0x7AC7,
-  0x7ACA,
-  0x7ACD,
-  0x7ACF,
-  0x7AD5,
-  0x7AD3,
-  0x7AD9,
-  0x7ADA,
-  0x7ADD,
-  0x7AE1,
-  0x7AE2,
-  0x7AE6,
-  0x7AED,
-  0x7AF0,
-  0x7B02,
-  0x7B0F,
-  0x7B0A,
-  0x7B06,
-  0x7B33,
-  0x7B18,
-  0x7B19,
-  0x7B1E,
-  0x7B35,
-  0x7B28,
-  0x7B36,
-  0x7B50,
-  0x7B7A,
-  0x7B04,
-  0x7B4D,
-  0x7B0B,
-  0x7B4C,
-  0x7B45,
-  0x7B75,
-  0x7B65,
-  0x7B74,
-  0x7B67,
-  0x7B70,
-  0x7B71,
-  0x7B6C,
-  0x7B6E,
-  0x7B9D,
-  0x7B98,
-  0x7B9F,
-  0x7B8D,
-  0x7B9C,
-  0x7B9A,
-  0x7B8B,
-  0x7B92,
-  0x7B8F,
-  0x7B5D,
-  0x7B99,
-  0x7BCB,
-  0x7BC1,
-  0x7BCC,
-  0x7BCF,
-  0x7BB4,
-  0x7BC6,
-  0x7BDD,
-  0x7BE9,
-  0x7C11,
-  0x7C14,
-  0x7BE6,
-  0x7BE5,
-  0x7C60,
-  0x7C00,
-  0x7C07,
-  0x7C13,
-  0x7BF3,
-  0x7BF7,
-  0x7C17,
-  0x7C0D,
-  0x7BF6,
-  0x7C23,
-  0x7C27,
-  0x7C2A,
-  0x7C1F,
-  0x7C37,
-  0x7C2B,
-  0x7C3D,
-  0x7C4C,
-  0x7C43,
-  0x7C54,
-  0x7C4F,
-  0x7C40,
-  0x7C50,
-  0x7C58,
-  0x7C5F,
-  0x7C64,
-  0x7C56,
-  0x7C65,
-  0x7C6C,
-  0x7C75,
-  0x7C83,
-  0x7C90,
-  0x7CA4,
-  0x7CAD,
-  0x7CA2,
-  0x7CAB,
-  0x7CA1,
-  0x7CA8,
-  0x7CB3,
-  0x7CB2,
-  0x7CB1,
-  0x7CAE,
-  0x7CB9,
-  0x7CBD,
-  0x7CC0,
-  0x7CC5,
-  0x7CC2,
-  0x7CD8,
-  0x7CD2,
-  0x7CDC,
-  0x7CE2,
-  0x9B3B,
-  0x7CEF,
-  0x7CF2,
-  0x7CF4,
-  0x7CF6,
-  0x7CFA,
-  0x7D06,
-  0x7D02,
-  0x7D1C,
-  0x7D15,
-  0x7D0A,
-  0x7D45,
-  0x7D4B,
-  0x7D2E,
-  0x7D32,
-  0x7D3F,
-  0x7D35,
-  0x7D46,
-  0x7D73,
-  0x7D56,
-  0x7D4E,
-  0x7D72,
-  0x7D68,
-  0x7D6E,
-  0x7D4F,
-  0x7D63,
-  0x7D93,
-  0x7D89,
-  0x7D5B,
-  0x7D8F,
-  0x7D7D,
-  0x7D9B,
-  0x7DBA,
-  0x7DAE,
-  0x7DA3,
-  0x7DB5,
-  0x7DC7,
-  0x7DBD,
-  0x7DAB,
-  0x7E3D,
-  0x7DA2,
-  0x7DAF,
-  0x7DDC,
-  0x7DB8,
-  0x7D9F,
-  0x7DB0,
-  0x7DD8,
-  0x7DDD,
-  0x7DE4,
-  0x7DDE,
-  0x7DFB,
-  0x7DF2,
-  0x7DE1,
-  0x7E05,
-  0x7E0A,
-  0x7E23,
-  0x7E21,
-  0x7E12,
-  0x7E31,
-  0x7E1F,
-  0x7E09,
-  0x7E0B,
-  0x7E22,
-  0x7E46,
-  0x7E66,
-  0x7E3B,
-  0x7E35,
-  0x7E39,
-  0x7E43,
-  0x7E37,
-  0x7E32,
-  0x7E3A,
-  0x7E67,
-  0x7E5D,
-  0x7E56,
-  0x7E5E,
-  0x7E59,
-  0x7E5A,
-  0x7E79,
-  0x7E6A,
-  0x7E69,
-  0x7E7C,
-  0x7E7B,
-  0x7E83,
-  0x7DD5,
-  0x7E7D,
-  0x8FAE,
-  0x7E7F,
-  0x7E88,
-  0x7E89,
-  0x7E8C,
-  0x7E92,
-  0x7E90,
-  0x7E93,
-  0x7E94,
-  0x7E96,
-  0x7E8E,
-  0x7E9B,
-  0x7E9C,
-  0x7F38,
-  0x7F3A,
-  0x7F45,
-  0x7F4C,
-  0x7F4D,
-  0x7F4E,
-  0x7F50,
-  0x7F51,
-  0x7F55,
-  0x7F54,
-  0x7F58,
-  0x7F5F,
-  0x7F60,
-  0x7F68,
-  0x7F69,
-  0x7F67,
-  0x7F78,
-  0x7F82,
-  0x7F86,
-  0x7F83,
-  0x7F88,
-  0x7F87,
-  0x7F8C,
-  0x7F94,
-  0x7F9E,
-  0x7F9D,
-  0x7F9A,
-  0x7FA3,
-  0x7FAF,
-  0x7FB2,
-  0x7FB9,
-  0x7FAE,
-  0x7FB6,
-  0x7FB8,
-  0x8B71,
-  0x7FC5,
-  0x7FC6,
-  0x7FCA,
-  0x7FD5,
-  0x7FD4,
-  0x7FE1,
-  0x7FE6,
-  0x7FE9,
-  0x7FF3,
-  0x7FF9,
-  0x98DC,
-  0x8006,
-  0x8004,
-  0x800B,
-  0x8012,
-  0x8018,
-  0x8019,
-  0x801C,
-  0x8021,
-  0x8028,
-  0x803F,
-  0x803B,
-  0x804A,
-  0x8046,
-  0x8052,
-  0x8058,
-  0x805A,
-  0x805F,
-  0x8062,
-  0x8068,
-  0x8073,
-  0x8072,
-  0x8070,
-  0x8076,
-  0x8079,
-  0x807D,
-  0x807F,
-  0x8084,
-  0x8086,
-  0x8085,
-  0x809B,
-  0x8093,
-  0x809A,
-  0x80AD,
-  0x5190,
-  0x80AC,
-  0x80DB,
-  0x80E5,
-  0x80D9,
-  0x80DD,
-  0x80C4,
-  0x80DA,
-  0x80D6,
-  0x8109,
-  0x80EF,
-  0x80F1,
-  0x811B,
-  0x8129,
-  0x8123,
-  0x812F,
-  0x814B,
-  0x968B,
-  0x8146,
-  0x813E,
-  0x8153,
-  0x8151,
-  0x80FC,
-  0x8171,
-  0x816E,
-  0x8165,
-  0x8166,
-  0x8174,
-  0x8183,
-  0x8188,
-  0x818A,
-  0x8180,
-  0x8182,
-  0x81A0,
-  0x8195,
-  0x81A4,
-  0x81A3,
-  0x815F,
-  0x8193,
-  0x81A9,
-  0x81B0,
-  0x81B5,
-  0x81BE,
-  0x81B8,
-  0x81BD,
-  0x81C0,
-  0x81C2,
-  0x81BA,
-  0x81C9,
-  0x81CD,
-  0x81D1,
-  0x81D9,
-  0x81D8,
-  0x81C8,
-  0x81DA,
-  0x81DF,
-  0x81E0,
-  0x81E7,
-  0x81FA,
-  0x81FB,
-  0x81FE,
-  0x8201,
-  0x8202,
-  0x8205,
-  0x8207,
-  0x820A,
-  0x820D,
-  0x8210,
-  0x8216,
-  0x8229,
-  0x822B,
-  0x8238,
-  0x8233,
-  0x8240,
-  0x8259,
-  0x8258,
-  0x825D,
-  0x825A,
-  0x825F,
-  0x8264,
-  0x8262,
-  0x8268,
-  0x826A,
-  0x826B,
-  0x822E,
-  0x8271,
-  0x8277,
-  0x8278,
-  0x827E,
-  0x828D,
-  0x8292,
-  0x82AB,
-  0x829F,
-  0x82BB,
-  0x82AC,
-  0x82E1,
-  0x82E3,
-  0x82DF,
-  0x82D2,
-  0x82F4,
-  0x82F3,
-  0x82FA,
-  0x8393,
-  0x8303,
-  0x82FB,
-  0x82F9,
-  0x82DE,
-  0x8306,
-  0x82DC,
-  0x8309,
-  0x82D9,
-  0x8335,
-  0x8334,
-  0x8316,
-  0x8332,
-  0x8331,
-  0x8340,
-  0x8339,
-  0x8350,
-  0x8345,
-  0x832F,
-  0x832B,
-  0x8317,
-  0x8318,
-  0x8385,
-  0x839A,
-  0x83AA,
-  0x839F,
-  0x83A2,
-  0x8396,
-  0x8323,
-  0x838E,
-  0x8387,
-  0x838A,
-  0x837C,
-  0x83B5,
-  0x8373,
-  0x8375,
-  0x83A0,
-  0x8389,
-  0x83A8,
-  0x83F4,
-  0x8413,
-  0x83EB,
-  0x83CE,
-  0x83FD,
-  0x8403,
-  0x83D8,
-  0x840B,
-  0x83C1,
-  0x83F7,
-  0x8407,
-  0x83E0,
-  0x83F2,
-  0x840D,
-  0x8422,
-  0x8420,
-  0x83BD,
-  0x8438,
-  0x8506,
-  0x83FB,
-  0x846D,
-  0x842A,
-  0x843C,
-  0x855A,
-  0x8484,
-  0x8477,
-  0x846B,
-  0x84AD,
-  0x846E,
-  0x8482,
-  0x8469,
-  0x8446,
-  0x842C,
-  0x846F,
-  0x8479,
-  0x8435,
-  0x84CA,
-  0x8462,
-  0x84B9,
-  0x84BF,
-  0x849F,
-  0x84D9,
-  0x84CD,
-  0x84BB,
-  0x84DA,
-  0x84D0,
-  0x84C1,
-  0x84C6,
-  0x84D6,
-  0x84A1,
-  0x8521,
-  0x84FF,
-  0x84F4,
-  0x8517,
-  0x8518,
-  0x852C,
-  0x851F,
-  0x8515,
-  0x8514,
-  0x84FC,
-  0x8540,
-  0x8563,
-  0x8558,
-  0x8548,
-  0x8541,
-  0x8602,
-  0x854B,
-  0x8555,
-  0x8580,
-  0x85A4,
-  0x8588,
-  0x8591,
-  0x858A,
-  0x85A8,
-  0x856D,
-  0x8594,
-  0x859B,
-  0x85EA,
-  0x8587,
-  0x859C,
-  0x8577,
-  0x857E,
-  0x8590,
-  0x85C9,
-  0x85BA,
-  0x85CF,
-  0x85B9,
-  0x85D0,
-  0x85D5,
-  0x85DD,
-  0x85E5,
-  0x85DC,
-  0x85F9,
-  0x860A,
-  0x8613,
-  0x860B,
-  0x85FE,
-  0x85FA,
-  0x8606,
-  0x8622,
-  0x861A,
-  0x8630,
-  0x863F,
-  0x864D,
-  0x4E55,
-  0x8654,
-  0x865F,
-  0x8667,
-  0x8671,
-  0x8693,
-  0x86A3,
-  0x86A9,
-  0x86AA,
-  0x868B,
-  0x868C,
-  0x86B6,
-  0x86AF,
-  0x86C4,
-  0x86C6,
-  0x86B0,
-  0x86C9,
-  0x8823,
-  0x86AB,
-  0x86D4,
-  0x86DE,
-  0x86E9,
-  0x86EC,
-  0x86DF,
-  0x86DB,
-  0x86EF,
-  0x8712,
-  0x8706,
-  0x8708,
-  0x8700,
-  0x8703,
-  0x86FB,
-  0x8711,
-  0x8709,
-  0x870D,
-  0x86F9,
-  0x870A,
-  0x8734,
-  0x873F,
-  0x8737,
-  0x873B,
-  0x8725,
-  0x8729,
-  0x871A,
-  0x8760,
-  0x875F,
-  0x8778,
-  0x874C,
-  0x874E,
-  0x8774,
-  0x8757,
-  0x8768,
-  0x876E,
-  0x8759,
-  0x8753,
-  0x8763,
-  0x876A,
-  0x8805,
-  0x87A2,
-  0x879F,
-  0x8782,
-  0x87AF,
-  0x87CB,
-  0x87BD,
-  0x87C0,
-  0x87D0,
-  0x96D6,
-  0x87AB,
-  0x87C4,
-  0x87B3,
-  0x87C7,
-  0x87C6,
-  0x87BB,
-  0x87EF,
-  0x87F2,
-  0x87E0,
-  0x880F,
-  0x880D,
-  0x87FE,
-  0x87F6,
-  0x87F7,
-  0x880E,
-  0x87D2,
-  0x8811,
-  0x8816,
-  0x8815,
-  0x8822,
-  0x8821,
-  0x8831,
-  0x8836,
-  0x8839,
-  0x8827,
-  0x883B,
-  0x8844,
-  0x8842,
-  0x8852,
-  0x8859,
-  0x885E,
-  0x8862,
-  0x886B,
-  0x8881,
-  0x887E,
-  0x889E,
-  0x8875,
-  0x887D,
-  0x88B5,
-  0x8872,
-  0x8882,
-  0x8897,
-  0x8892,
-  0x88AE,
-  0x8899,
-  0x88A2,
-  0x888D,
-  0x88A4,
-  0x88B0,
-  0x88BF,
-  0x88B1,
-  0x88C3,
-  0x88C4,
-  0x88D4,
-  0x88D8,
-  0x88D9,
-  0x88DD,
-  0x88F9,
-  0x8902,
-  0x88FC,
-  0x88F4,
-  0x88E8,
-  0x88F2,
-  0x8904,
-  0x890C,
-  0x890A,
-  0x8913,
-  0x8943,
-  0x891E,
-  0x8925,
-  0x892A,
-  0x892B,
-  0x8941,
-  0x8944,
-  0x893B,
-  0x8936,
-  0x8938,
-  0x894C,
-  0x891D,
-  0x8960,
-  0x895E,
-  0x8966,
-  0x8964,
-  0x896D,
-  0x896A,
-  0x896F,
-  0x8974,
-  0x8977,
-  0x897E,
-  0x8983,
-  0x8988,
-  0x898A,
-  0x8993,
-  0x8998,
-  0x89A1,
-  0x89A9,
-  0x89A6,
-  0x89AC,
-  0x89AF,
-  0x89B2,
-  0x89BA,
-  0x89BD,
-  0x89BF,
-  0x89C0,
-  0x89DA,
-  0x89DC,
-  0x89DD,
-  0x89E7,
-  0x89F4,
-  0x89F8,
-  0x8A03,
-  0x8A16,
-  0x8A10,
-  0x8A0C,
-  0x8A1B,
-  0x8A1D,
-  0x8A25,
-  0x8A36,
-  0x8A41,
-  0x8A5B,
-  0x8A52,
-  0x8A46,
-  0x8A48,
-  0x8A7C,
-  0x8A6D,
-  0x8A6C,
-  0x8A62,
-  0x8A85,
-  0x8A82,
-  0x8A84,
-  0x8AA8,
-  0x8AA1,
-  0x8A91,
-  0x8AA5,
-  0x8AA6,
-  0x8A9A,
-  0x8AA3,
-  0x8AC4,
-  0x8ACD,
-  0x8AC2,
-  0x8ADA,
-  0x8AEB,
-  0x8AF3,
-  0x8AE7,
-  0x8AE4,
-  0x8AF1,
-  0x8B14,
-  0x8AE0,
-  0x8AE2,
-  0x8AF7,
-  0x8ADE,
-  0x8ADB,
-  0x8B0C,
-  0x8B07,
-  0x8B1A,
-  0x8AE1,
-  0x8B16,
-  0x8B10,
-  0x8B17,
-  0x8B20,
-  0x8B33,
-  0x97AB,
-  0x8B26,
-  0x8B2B,
-  0x8B3E,
-  0x8B28,
-  0x8B41,
-  0x8B4C,
-  0x8B4F,
-  0x8B4E,
-  0x8B49,
-  0x8B56,
-  0x8B5B,
-  0x8B5A,
-  0x8B6B,
-  0x8B5F,
-  0x8B6C,
-  0x8B6F,
-  0x8B74,
-  0x8B7D,
-  0x8B80,
-  0x8B8C,
-  0x8B8E,
-  0x8B92,
-  0x8B93,
-  0x8B96,
-  0x8B99,
-  0x8B9A,
-  0x8C3A,
-  0x8C41,
-  0x8C3F,
-  0x8C48,
-  0x8C4C,
-  0x8C4E,
-  0x8C50,
-  0x8C55,
-  0x8C62,
-  0x8C6C,
-  0x8C78,
-  0x8C7A,
-  0x8C82,
-  0x8C89,
-  0x8C85,
-  0x8C8A,
-  0x8C8D,
-  0x8C8E,
-  0x8C94,
-  0x8C7C,
-  0x8C98,
-  0x621D,
-  0x8CAD,
-  0x8CAA,
-  0x8CBD,
-  0x8CB2,
-  0x8CB3,
-  0x8CAE,
-  0x8CB6,
-  0x8CC8,
-  0x8CC1,
-  0x8CE4,
-  0x8CE3,
-  0x8CDA,
-  0x8CFD,
-  0x8CFA,
-  0x8CFB,
-  0x8D04,
-  0x8D05,
-  0x8D0A,
-  0x8D07,
-  0x8D0F,
-  0x8D0D,
-  0x8D10,
-  0x9F4E,
-  0x8D13,
-  0x8CCD,
-  0x8D14,
-  0x8D16,
-  0x8D67,
-  0x8D6D,
-  0x8D71,
-  0x8D73,
-  0x8D81,
-  0x8D99,
-  0x8DC2,
-  0x8DBE,
-  0x8DBA,
-  0x8DCF,
-  0x8DDA,
-  0x8DD6,
-  0x8DCC,
-  0x8DDB,
-  0x8DCB,
-  0x8DEA,
-  0x8DEB,
-  0x8DDF,
-  0x8DE3,
-  0x8DFC,
-  0x8E08,
-  0x8E09,
-  0x8DFF,
-  0x8E1D,
-  0x8E1E,
-  0x8E10,
-  0x8E1F,
-  0x8E42,
-  0x8E35,
-  0x8E30,
-  0x8E34,
-  0x8E4A,
-  0x8E47,
-  0x8E49,
-  0x8E4C,
-  0x8E50,
-  0x8E48,
-  0x8E59,
-  0x8E64,
-  0x8E60,
-  0x8E2A,
-  0x8E63,
-  0x8E55,
-  0x8E76,
-  0x8E72,
-  0x8E7C,
-  0x8E81,
-  0x8E87,
-  0x8E85,
-  0x8E84,
-  0x8E8B,
-  0x8E8A,
-  0x8E93,
-  0x8E91,
-  0x8E94,
-  0x8E99,
-  0x8EAA,
-  0x8EA1,
-  0x8EAC,
-  0x8EB0,
-  0x8EC6,
-  0x8EB1,
-  0x8EBE,
-  0x8EC5,
-  0x8EC8,
-  0x8ECB,
-  0x8EDB,
-  0x8EE3,
-  0x8EFC,
-  0x8EFB,
-  0x8EEB,
-  0x8EFE,
-  0x8F0A,
-  0x8F05,
-  0x8F15,
-  0x8F12,
-  0x8F19,
-  0x8F13,
-  0x8F1C,
-  0x8F1F,
-  0x8F1B,
-  0x8F0C,
-  0x8F26,
-  0x8F33,
-  0x8F3B,
-  0x8F39,
-  0x8F45,
-  0x8F42,
-  0x8F3E,
-  0x8F4C,
-  0x8F49,
-  0x8F46,
-  0x8F4E,
-  0x8F57,
-  0x8F5C,
-  0x8F62,
-  0x8F63,
-  0x8F64,
-  0x8F9C,
-  0x8F9F,
-  0x8FA3,
-  0x8FAD,
-  0x8FAF,
-  0x8FB7,
-  0x8FDA,
-  0x8FE5,
-  0x8FE2,
-  0x8FEA,
-  0x8FEF,
-  0x9087,
-  0x8FF4,
-  0x9005,
-  0x8FF9,
-  0x8FFA,
-  0x9011,
-  0x9015,
-  0x9021,
-  0x900D,
-  0x901E,
-  0x9016,
-  0x900B,
-  0x9027,
-  0x9036,
-  0x9035,
-  0x9039,
-  0x8FF8,
-  0x904F,
-  0x9050,
-  0x9051,
-  0x9052,
-  0x900E,
-  0x9049,
-  0x903E,
-  0x9056,
-  0x9058,
-  0x905E,
-  0x9068,
-  0x906F,
-  0x9076,
-  0x96A8,
-  0x9072,
-  0x9082,
-  0x907D,
-  0x9081,
-  0x9080,
-  0x908A,
-  0x9089,
-  0x908F,
-  0x90A8,
-  0x90AF,
-  0x90B1,
-  0x90B5,
-  0x90E2,
-  0x90E4,
-  0x6248,
-  0x90DB,
-  0x9102,
-  0x9112,
-  0x9119,
-  0x9132,
-  0x9130,
-  0x914A,
-  0x9156,
-  0x9158,
-  0x9163,
-  0x9165,
-  0x9169,
-  0x9173,
-  0x9172,
-  0x918B,
-  0x9189,
-  0x9182,
-  0x91A2,
-  0x91AB,
-  0x91AF,
-  0x91AA,
-  0x91B5,
-  0x91B4,
-  0x91BA,
-  0x91C0,
-  0x91C1,
-  0x91C9,
-  0x91CB,
-  0x91D0,
-  0x91D6,
-  0x91DF,
-  0x91E1,
-  0x91DB,
-  0x91FC,
-  0x91F5,
-  0x91F6,
-  0x921E,
-  0x91FF,
-  0x9214,
-  0x922C,
-  0x9215,
-  0x9211,
-  0x925E,
-  0x9257,
-  0x9245,
-  0x9249,
-  0x9264,
-  0x9248,
-  0x9295,
-  0x923F,
-  0x924B,
-  0x9250,
-  0x929C,
-  0x9296,
-  0x9293,
-  0x929B,
-  0x925A,
-  0x92CF,
-  0x92B9,
-  0x92B7,
-  0x92E9,
-  0x930F,
-  0x92FA,
-  0x9344,
-  0x932E,
-  0x9319,
-  0x9322,
-  0x931A,
-  0x9323,
-  0x933A,
-  0x9335,
-  0x933B,
-  0x935C,
-  0x9360,
-  0x937C,
-  0x936E,
-  0x9356,
-  0x93B0,
-  0x93AC,
-  0x93AD,
-  0x9394,
-  0x93B9,
-  0x93D6,
-  0x93D7,
-  0x93E8,
-  0x93E5,
-  0x93D8,
-  0x93C3,
-  0x93DD,
-  0x93D0,
-  0x93C8,
-  0x93E4,
-  0x941A,
-  0x9414,
-  0x9413,
-  0x9403,
-  0x9407,
-  0x9410,
-  0x9436,
-  0x942B,
-  0x9435,
-  0x9421,
-  0x943A,
-  0x9441,
-  0x9452,
-  0x9444,
-  0x945B,
-  0x9460,
-  0x9462,
-  0x945E,
-  0x946A,
-  0x9229,
-  0x9470,
-  0x9475,
-  0x9477,
-  0x947D,
-  0x945A,
-  0x947C,
-  0x947E,
-  0x9481,
-  0x947F,
-  0x9582,
-  0x9587,
-  0x958A,
-  0x9594,
-  0x9596,
-  0x9598,
-  0x9599,
-  0x95A0,
-  0x95A8,
-  0x95A7,
-  0x95AD,
-  0x95BC,
-  0x95BB,
-  0x95B9,
-  0x95BE,
-  0x95CA,
-  0x6FF6,
-  0x95C3,
-  0x95CD,
-  0x95CC,
-  0x95D5,
-  0x95D4,
-  0x95D6,
-  0x95DC,
-  0x95E1,
-  0x95E5,
-  0x95E2,
-  0x9621,
-  0x9628,
-  0x962E,
-  0x962F,
-  0x9642,
-  0x964C,
-  0x964F,
-  0x964B,
-  0x9677,
-  0x965C,
-  0x965E,
-  0x965D,
-  0x965F,
-  0x9666,
-  0x9672,
-  0x966C,
-  0x968D,
-  0x9698,
-  0x9695,
-  0x9697,
-  0x96AA,
-  0x96A7,
-  0x96B1,
-  0x96B2,
-  0x96B0,
-  0x96B4,
-  0x96B6,
-  0x96B8,
-  0x96B9,
-  0x96CE,
-  0x96CB,
-  0x96C9,
-  0x96CD,
-  0x894D,
-  0x96DC,
-  0x970D,
-  0x96D5,
-  0x96F9,
-  0x9704,
-  0x9706,
-  0x9708,
-  0x9713,
-  0x970E,
-  0x9711,
-  0x970F,
-  0x9716,
-  0x9719,
-  0x9724,
-  0x972A,
-  0x9730,
-  0x9739,
-  0x973D,
-  0x973E,
-  0x9744,
-  0x9746,
-  0x9748,
-  0x9742,
-  0x9749,
-  0x975C,
-  0x9760,
-  0x9764,
-  0x9766,
-  0x9768,
-  0x52D2,
-  0x976B,
-  0x9771,
-  0x9779,
-  0x9785,
-  0x977C,
-  0x9781,
-  0x977A,
-  0x9786,
-  0x978B,
-  0x978F,
-  0x9790,
-  0x979C,
-  0x97A8,
-  0x97A6,
-  0x97A3,
-  0x97B3,
-  0x97B4,
-  0x97C3,
-  0x97C6,
-  0x97C8,
-  0x97CB,
-  0x97DC,
-  0x97ED,
-  0x9F4F,
-  0x97F2,
-  0x7ADF,
-  0x97F6,
-  0x97F5,
-  0x980F,
-  0x980C,
-  0x9838,
-  0x9824,
-  0x9821,
-  0x9837,
-  0x983D,
-  0x9846,
-  0x984F,
-  0x984B,
-  0x986B,
-  0x986F,
-  0x9870,
-  0x9871,
-  0x9874,
-  0x9873,
-  0x98AA,
-  0x98AF,
-  0x98B1,
-  0x98B6,
-  0x98C4,
-  0x98C3,
-  0x98C6,
-  0x98E9,
-  0x98EB,
-  0x9903,
-  0x9909,
-  0x9912,
-  0x9914,
-  0x9918,
-  0x9921,
-  0x991D,
-  0x991E,
-  0x9924,
-  0x9920,
-  0x992C,
-  0x992E,
-  0x993D,
-  0x993E,
-  0x9942,
-  0x9949,
-  0x9945,
-  0x9950,
-  0x994B,
-  0x9951,
-  0x9952,
-  0x994C,
-  0x9955,
-  0x9997,
-  0x9998,
-  0x99A5,
-  0x99AD,
-  0x99AE,
-  0x99BC,
-  0x99DF,
-  0x99DB,
-  0x99DD,
-  0x99D8,
-  0x99D1,
-  0x99ED,
-  0x99EE,
-  0x99F1,
-  0x99F2,
-  0x99FB,
-  0x99F8,
-  0x9A01,
-  0x9A0F,
-  0x9A05,
-  0x99E2,
-  0x9A19,
-  0x9A2B,
-  0x9A37,
-  0x9A45,
-  0x9A42,
-  0x9A40,
-  0x9A43,
-  0x9A3E,
-  0x9A55,
-  0x9A4D,
-  0x9A5B,
-  0x9A57,
-  0x9A5F,
-  0x9A62,
-  0x9A65,
-  0x9A64,
-  0x9A69,
-  0x9A6B,
-  0x9A6A,
-  0x9AAD,
-  0x9AB0,
-  0x9ABC,
-  0x9AC0,
-  0x9ACF,
-  0x9AD1,
-  0x9AD3,
-  0x9AD4,
-  0x9ADE,
-  0x9ADF,
-  0x9AE2,
-  0x9AE3,
-  0x9AE6,
-  0x9AEF,
-  0x9AEB,
-  0x9AEE,
-  0x9AF4,
-  0x9AF1,
-  0x9AF7,
-  0x9AFB,
-  0x9B06,
-  0x9B18,
-  0x9B1A,
-  0x9B1F,
-  0x9B22,
-  0x9B23,
-  0x9B25,
-  0x9B27,
-  0x9B28,
-  0x9B29,
-  0x9B2A,
-  0x9B2E,
-  0x9B2F,
-  0x9B32,
-  0x9B44,
-  0x9B43,
-  0x9B4F,
-  0x9B4D,
-  0x9B4E,
-  0x9B51,
-  0x9B58,
-  0x9B74,
-  0x9B93,
-  0x9B83,
-  0x9B91,
-  0x9B96,
-  0x9B97,
-  0x9B9F,
-  0x9BA0,
-  0x9BA8,
-  0x9BB4,
-  0x9BC0,
-  0x9BCA,
-  0x9BB9,
-  0x9BC6,
-  0x9BCF,
-  0x9BD1,
-  0x9BD2,
-  0x9BE3,
-  0x9BE2,
-  0x9BE4,
-  0x9BD4,
-  0x9BE1,
-  0x9C3A,
-  0x9BF2,
-  0x9BF1,
-  0x9BF0,
-  0x9C15,
-  0x9C14,
-  0x9C09,
-  0x9C13,
-  0x9C0C,
-  0x9C06,
-  0x9C08,
-  0x9C12,
-  0x9C0A,
-  0x9C04,
-  0x9C2E,
-  0x9C1B,
-  0x9C25,
-  0x9C24,
-  0x9C21,
-  0x9C30,
-  0x9C47,
-  0x9C32,
-  0x9C46,
-  0x9C3E,
-  0x9C5A,
-  0x9C60,
-  0x9C67,
-  0x9C76,
-  0x9C78,
-  0x9CE7,
-  0x9CEC,
-  0x9CF0,
-  0x9D09,
-  0x9D08,
-  0x9CEB,
-  0x9D03,
-  0x9D06,
-  0x9D2A,
-  0x9D26,
-  0x9DAF,
-  0x9D23,
-  0x9D1F,
-  0x9D44,
-  0x9D15,
-  0x9D12,
-  0x9D41,
-  0x9D3F,
-  0x9D3E,
-  0x9D46,
-  0x9D48,
-  0x9D5D,
-  0x9D5E,
-  0x9D64,
-  0x9D51,
-  0x9D50,
-  0x9D59,
-  0x9D72,
-  0x9D89,
-  0x9D87,
-  0x9DAB,
-  0x9D6F,
-  0x9D7A,
-  0x9D9A,
-  0x9DA4,
-  0x9DA9,
-  0x9DB2,
-  0x9DC4,
-  0x9DC1,
-  0x9DBB,
-  0x9DB8,
-  0x9DBA,
-  0x9DC6,
-  0x9DCF,
-  0x9DC2,
-  0x9DD9,
-  0x9DD3,
-  0x9DF8,
-  0x9DE6,
-  0x9DED,
-  0x9DEF,
-  0x9DFD,
-  0x9E1A,
-  0x9E1B,
-  0x9E1E,
-  0x9E75,
-  0x9E79,
-  0x9E7D,
-  0x9E81,
-  0x9E88,
-  0x9E8B,
-  0x9E8C,
-  0x9E92,
-  0x9E95,
-  0x9E91,
-  0x9E9D,
-  0x9EA5,
-  0x9EA9,
-  0x9EB8,
-  0x9EAA,
-  0x9EAD,
-  0x9761,
-  0x9ECC,
-  0x9ECE,
-  0x9ECF,
-  0x9ED0,
-  0x9ED4,
-  0x9EDC,
-  0x9EDE,
-  0x9EDD,
-  0x9EE0,
-  0x9EE5,
-  0x9EE8,
-  0x9EEF,
-  0x9EF4,
-  0x9EF6,
-  0x9EF7,
-  0x9EF9,
-  0x9EFB,
-  0x9EFC,
-  0x9EFD,
-  0x9F07,
-  0x9F08,
-  0x76B7,
-  0x9F15,
-  0x9F21,
-  0x9F2C,
-  0x9F3E,
-  0x9F4A,
-  0x9F52,
-  0x9F54,
-  0x9F63,
-  0x9F5F,
-  0x9F60,
-  0x9F61,
-  0x9F66,
-  0x9F67,
-  0x9F6C,
-  0x9F6A,
-  0x9F77,
-  0x9F72,
-  0x9F76,
-  0x9F95,
-  0x9F9C,
-  0x9FA0,
-  0x582F,
-  0x69C7,
-  0x9059,
-  0x7464,
-  0x51DC,
-  0x7199
-};
-
-/* f5 to fe is non-existent */
diff --git a/newlib/libc/ctype/local.h b/newlib/libc/ctype/local.h
deleted file mode 100644
index b1eca42..0000000
--- a/newlib/libc/ctype/local.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* wctrans constants */
-
-#include <_ansi.h>
-
-/* valid values for wctrans_t */
-#define WCT_TOLOWER 1
-#define WCT_TOUPPER 2
-
-/* valid values for wctype_t */
-#define WC_ALNUM	1
-#define WC_ALPHA	2
-#define WC_BLANK	3
-#define WC_CNTRL	4
-#define WC_DIGIT	5
-#define WC_GRAPH	6
-#define WC_LOWER	7
-#define WC_PRINT	8
-#define WC_PUNCT	9
-#define WC_SPACE	10
-#define WC_UPPER	11
-#define WC_XDIGIT	12
-
-extern char __lc_ctype[12];
-
-/* Japanese encoding types supported */
-#define JP_JIS		1
-#define JP_SJIS		2
-#define JP_EUCJP	3
-
-/* internal function to translate JP to Unicode */
-wint_t _EXFUN (__jp2uc, (wint_t, int));
-
diff --git a/newlib/libc/ctype/tolower.c b/newlib/libc/ctype/tolower.c
index bdd22bf..e43fa6c 100644
--- a/newlib/libc/ctype/tolower.c
+++ b/newlib/libc/ctype/tolower.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<tolower>>---translate characters to lowercase
+	<<tolower>>---translate characters to lower case
 
 INDEX
 	tolower
@@ -19,8 +19,8 @@ TRAD_SYNOPSIS
 
 
 DESCRIPTION
-<<tolower>> is a macro which converts uppercase characters to lowercase,
-leaving all other characters unchanged.  It is only defined when
+<<tolower>> is a macro which converts upper-case characters to lower
+case, leaving all other characters unchanged.  It is only defined when
 <[c]> is an integer in the range <<EOF>> to <<255>>.
 
 You can use a compiled subroutine instead of the macro definition by
@@ -30,10 +30,10 @@ undefining this macro using `<<#undef tolower>>'.
 only be used when <[c]> is known to be an uppercase character (<<A>>--<<Z>>).
 
 RETURNS
-<<tolower>> returns the lowercase equivalent of <[c]> when it is a
+<<tolower>> returns the lower-case equivalent of <[c]> when it is a
 character between <<A>> and <<Z>>, and <[c]> otherwise.
 
-<<_tolower>> returns the lowercase equivalent of <[c]> when it is a
+<<_tolower>> returns the lower-case equivalent of <[c]> when it is a
 character between <<A>> and <<Z>>.  If <[c]> is not one of these
 characters, the behaviour of <<_tolower>> is undefined.
 
diff --git a/newlib/libc/ctype/toupper.c b/newlib/libc/ctype/toupper.c
index 26f64b6..7977beb 100644
--- a/newlib/libc/ctype/toupper.c
+++ b/newlib/libc/ctype/toupper.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<toupper>>---translate characters to uppercase
+	<<toupper>>---translate characters to upper case
 
 INDEX
 	toupper
@@ -19,8 +19,8 @@ TRAD_SYNOPSIS
 
 
 DESCRIPTION
-<<toupper>> is a macro which converts lowercase characters to uppercase,
-leaving all other characters unchanged.  It is only defined when
+<<toupper>> is a macro which converts lower-case characters to upper
+case, leaving all other characters unchanged.  It is only defined when
 <[c]> is an integer in the range <<EOF>> to <<255>>.
 
 You can use a compiled subroutine instead of the macro definition by
@@ -30,10 +30,10 @@ undefining this macro using `<<#undef toupper>>'.
 only be used when <[c]> is known to be a lowercase character (<<a>>--<<z>>).
 
 RETURNS
-<<toupper>> returns the uppercase equivalent of <[c]> when it is a
+<<toupper>> returns the upper-case equivalent of <[c]> when it is a
 character between <<a>> and <<z>>, and <[c]> otherwise.
 
-<<_toupper>> returns the uppercase equivalent of <[c]> when it is a
+<<_toupper>> returns the upper-case equivalent of <[c]> when it is a
 character between <<a>> and <<z>>.  If <[c]> is not one of these
 characters, the behaviour of <<_toupper>> is undefined.
 
diff --git a/newlib/libc/ctype/towctrans.c b/newlib/libc/ctype/towctrans.c
deleted file mode 100644
index 416a491..0000000
--- a/newlib/libc/ctype/towctrans.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-FUNCTION
-	<<towctrans>>---extensible wide-character translation
-
-INDEX
-	towctrans
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	wint_t towctrans(wint_t <[c]>, wctrans_t <[w]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	wint_t towctrans(<[c]>, <[w]>)
-	wint_t <[c]>;
-	wctrans_t <[w]>;
-
-
-DESCRIPTION
-<<towctrans>> is a function which converts wide characters based on
-a specified translation type <[w]>.  If the translation type is
-invalid or cannot be applied to the current character, no change
-to the character is made.
-
-RETURNS
-<<towctrans>> returns the translated equivalent of <[c]> when it is a
-valid for the given translation, otherwise, it returns the input character.
-When the translation type is invalid, <<errno>> is set <<EINVAL>>.
-
-PORTABILITY
-<<towctrans>> is C99.
-
-No supporting OS subroutines are required.
-*/
-
-#include <_ansi.h>
-#include <string.h>
-#include <reent.h>
-#include <wctype.h>
-#include <errno.h>
-#include "local.h"
-
-wint_t
-_DEFUN (_towctrans_r, (r, c, w), 
-	struct _reent *r _AND
-	wint_t c _AND 
-	wctrans_t w)
-{
-  if (w == WCT_TOLOWER)
-    return towlower (c);
-  else if (w == WCT_TOUPPER)
-    return towupper (c);
-  else
-    {
-      r->_errno = EINVAL;
-      return c;
-    }
-}
-
-#ifndef _REENT_ONLY
-wint_t
-_DEFUN (towctrans, (c, w),
-	wint_t c _AND
-        wctrans_t w)
-{
-  return _towctrans_r (_REENT, c, w);
-}
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/ctype/towlower.c b/newlib/libc/ctype/towlower.c
deleted file mode 100644
index 89873c2..0000000
--- a/newlib/libc/ctype/towlower.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-FUNCTION
-	<<towlower>>---translate wide characters to lowercase
-
-INDEX
-	towlower
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	wint_t towlower(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	wint_t towlower(<[c]>)
-	wint_t <[c]>;
-
-
-DESCRIPTION
-<<towlower>> is a function which converts uppercase wide characters to
-lowercase, leaving all other characters unchanged.
-
-RETURNS
-<<towlower>> returns the lowercase equivalent of <[c]> when it is a
-uppercase wide character; otherwise, it returns the input character.
-
-PORTABILITY
-<<towlower>> is C99.
-
-No supporting OS subroutines are required.
-*/
-
-#include <_ansi.h>
-#include <newlib.h>
-#include <string.h>
-#include <reent.h>
-#include <ctype.h>
-#include <wctype.h>
-#include "local.h"
-
-wint_t
-_DEFUN(towlower,(c), wint_t c)
-{
-  int unicode = 0;
-
-  if (__lc_ctype[0] == 'C' && __lc_ctype[1] == '\0')
-    {
-      unicode = 0;
-      /* fall-through */ 
-    }
-#ifdef _MB_CAPABLE
-  else if (!strcmp (__lc_ctype, "C-JIS"))
-    {
-      c = __jp2uc (c, JP_JIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-SJIS"))
-    {
-      c = __jp2uc (c, JP_SJIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-EUCJP"))
-    {
-      c = __jp2uc (c, JP_EUCJP);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-UTF-8"))
-    {
-      unicode = 1;
-    }
-
-  if (unicode)
-    {
-      if (c < 0x100)
-	{
-	  if ((c >= 0x0041 && c <= 0x005a) ||
-	      (c >= 0x00c0 && c <= 0x00de))
-	    return (c + 0x20);
-
-	  if (c == 0x00b5)
-	    return 0x03bc;
-	  
-	  return c;
-	}
-      else if (c < 0x300)
-	{
-	  if ((c >= 0x0100 && c <= 0x012e) ||
-	      (c >= 0x0132 && c <= 0x0136) ||
-	      (c >= 0x014a && c <= 0x0176) ||
-	      (c >= 0x01de && c <= 0x01ee) ||
-	      (c >= 0x01f8 && c <= 0x021e) ||
-	      (c >= 0x0222 && c <= 0x0232))
-	    {
-	      if (!(c & 0x01))
-		return (c + 1);
-	      return c;
-	    }
-
-	  if ((c >= 0x0139 && c <= 0x0147) ||
-	      (c >= 0x01cd && c <= 0x91db))
-	    {
-	      if (c & 0x01)
-		return (c + 1);
-	      return c;
-	    }
-	  
-	  if (c >= 0x178 && c <= 0x01f7)
-	    {
-	      wint_t k;
-	      switch (c)
-		{
-		case 0x0178:
-		  k = 0x00ff;
-		  break;
-		case 0x0179:
-		case 0x017b:
-		case 0x017d:
-		case 0x0182:
-		case 0x0184:
-		case 0x0187:
-		case 0x018b:
-		case 0x0191:
-		case 0x0198:
-		case 0x01a0:
-		case 0x01a2:
-		case 0x01a4:
-		case 0x01a7:
-		case 0x01ac:
-		case 0x01af:
-		case 0x01b3:
-		case 0x01b5:
-		case 0x01b8:
-		case 0x01bc:
-		case 0x01c5:
-		case 0x01c8:
-		case 0x01cb:
-		case 0x01cd:
-		case 0x01cf:
-		case 0x01d1:
-		case 0x01d3:
-		case 0x01d5:
-		case 0x01d7:
-		case 0x01d9:
-		case 0x01db:
-		case 0x01f2:
-		case 0x01f4:
-		  k = c + 1;
-		  break;
-		case 0x017f:
-		  k = 0x0073;
-		  break;
-		case 0x0181:
-		  k = 0x0253;
-		  break;
-		case 0x0186:
-		  k = 0x0254;
-		  break;
-		case 0x0189:
-		  k = 0x0256;
-		  break;
-		case 0x018a:
-		  k = 0x0257;
-		  break;
-		case 0x018e:
-		  k = 0x01dd;
-		  break;
-		case 0x018f:
-		  k = 0x0259;
-		  break;
-		case 0x0190:
-		  k = 0x025b;
-		  break;
-		case 0x0193:
-		  k = 0x0260;
-		  break;
-		case 0x0194:
-		  k = 0x0263;
-		  break;
-		case 0x0196:
-		  k = 0x0269;
-		  break;
-		case 0x0197:
-		  k = 0x0268;
-		  break;
-		case 0x019c:
-		  k = 0x026f;
-		  break;
-		case 0x019d:
-		  k = 0x0272;
-		  break;
-		case 0x019f:
-		  k = 0x0275;
-		  break;
-		case 0x01a6:
-		  k = 0x0280;
-		  break;
-		case 0x01a9:
-		  k = 0x0283;
-		  break;
-		case 0x01ae:
-		  k = 0x0288;
-		  break;
-		case 0x01b1:
-		  k = 0x028a;
-		  break;
-		case 0x01b2:
-		  k = 0x028b;
-		  break;
-		case 0x01b7:
-		  k = 0x0292;
-		  break;
-		case 0x01c4:
-		case 0x01c7:
-		case 0x01ca:
-		case 0x01f1:
-		  k = c + 2;
-		  break;
-		case 0x01f6:
-		  k = 0x0195;
-		  break;
-		case 0x01f7:
-		  k = 0x01bf;
-		  break;
-		default:
-		  k = 0;
-		}
-	      if (k != 0)
-		return k;
-	    }
-
-	  if (c == 0x0220)
-	    return 0x019e;
-	}
-      else if (c < 0x0400)
-	{
-	  if (c >= 0x0391 && c <= 0x03ab && c != 0x03a2)
-	    return (c + 0x20);
-	  if (c >= 0x03d8 && c <= 0x03ee && !(c & 0x01))
-	    return (c + 1);
-	  if (c >= 0x0386 && c <= 0x03f5)
-	    {
-	      wint_t k;
-	      switch (c)
-		{
-		case 0x0386:
-		  k = 0x03ac;
-		  break;
-		case 0x0388:
-		  k = 0x03ad;
-		  break;
-		case 0x0389:
-		  k = 0x03ae;
-		  break;
-		case 0x038a:
-		  k = 0x03af;
-		  break;
-		case 0x038c:
-		  k = 0x03cc;
-		  break;
-		case 0x038e:
-		  k = 0x03cd;
-		  break;
-		case 0x038f:
-		  k = 0x038f;
-		  break;
-		case 0x03c2:
-		  k = 0x03c3;
-		  break;
-		case 0x03d0:
-		  k = 0x03b2;
-		  break;
-		case 0x03d1:
-		  k = 0x03b8;
-		  break;
-		case 0x03d5:
-		  k = 0x03c6;
-		  break;
-		case 0x03d6:
-		  k = 0x03c0;
-		  break;
-		case 0x03f0:
-		  k = 0x03ba;
-		  break;
-		case 0x03f1:
-		  k = 0x03c1;
-		  break;
-		case 0x03f2:
-		  k = 0x03c3;
-		  break;
-		case 0x03f4:
-		  k = 0x03b8;
-		  break;
-		case 0x03f5:
-		  k = 0x03b5;
-		  break;
-		default:
-		  k = 0;
-		}
-	      if (k != 0)
-		return k;
-	    }
-
-	  if (c == 0x0345)
-	    return 0x03b9;
-	}
-      else if (c < 0x500)
-	{
-	  if (c >= 0x0400 && c <= 0x040f)
-	    return (c + 0x50);
-	  
-	  if (c >= 0x0410 && c <= 0x042f)
-	    return (c + 0x20);
-	  
-	  if ((c >= 0x0460 && c <= 0x0480) ||
-	      (c >= 0x048a && c <= 0x04be) ||
-	      (c >= 0x04d0 && c <= 0x04f4) ||
-	      (c == 0x04f8))
-	    {
-	      if (!(c & 0x01))
-		return (c + 1);
-	      return c;
-	    }
-	  
-	  if (c >= 0x04c1 && c <= 0x04cd)
-	    {
-	      if (c & 0x01)
-		return (c + 1);
-	      return c;
-	    }
-	}
-      else if (c < 0x1f00)
-	{
-	  if ((c >= 0x0500 && c <= 0x050e) ||
-	      (c >= 0x1e00 && c <= 0x1e94) ||
-	      (c >= 0x1ea0 && c <= 0x1ef8))
-	    {
-	      if (!(c & 0x01))
-		return (c + 1);
-	      return c;
-	    }
-	  
-	  if (c >= 0x0531 && c <= 0x0556)
-	    return (c + 0x30);
-
-	  if (c == 0x1e9b)
-	    return 0x1e61;
-	}
-      else if (c < 0x2000)
-	{
-	  if ((c >= 0x1f08 && c <= 0x1f0f) ||
-	      (c >= 0x1f18 && c <= 0x1f1d) ||
-	      (c >= 0x1f28 && c <= 0x1f2f) ||
-	      (c >= 0x1f38 && c <= 0x1f3f) ||
-	      (c >= 0x1f48 && c <= 0x1f4d) ||
-	      (c >= 0x1f68 && c <= 0x1f6f) ||
-	      (c >= 0x1f88 && c <= 0x1f8f) ||
-	      (c >= 0x1f98 && c <= 0x1f9f) ||
-	      (c >= 0x1fa8 && c <= 0x1faf))
-	    return (c - 0x08);
-
-	  if (c >= 0x1f59 && c <= 0x1f5f)
-	    {
-	      if (c & 0x01)
-		return (c - 0x08);
-	      return c;
-	    }
-	
-	  if (c >= 0x1fb8 && c <= 0x1ffc)
-	    {
-	      wint_t k;
-	      switch (c)
-		{
-		case 0x1fb8:
-		case 0x1fb9:
-		case 0x1fd8:
-		case 0x1fd9:
-		case 0x1fe8:
-		case 0x1fe9:
-		  k = c - 0x08;
-		  break;
-		case 0x1fba:
-		case 0x1fbb:
-		  k = c - 0x4a;
-		  break;
-		case 0x1fbc:
-		  k = 0x1fb3;
-		  break;
-		case 0x1fbe:
-		  k = 0x03b9;
-		  break;
-		case 0x1fc8:
-		case 0x1fc9:
-		case 0x1fca:
-		case 0x1fcb:
-		  k = c - 0x56;
-		  break;
-		case 0x1fcc:
-		  k = 0x1fc3;
-		  break;
-		case 0x1fda:
-		case 0x1fdb:
-		  k = c - 0x64;
-		  break;
-		case 0x1fea:
-		case 0x1feb:
-		  k = c - 0x70;
-		  break;
-		case 0x1fec:
-		  k = 0x1fe5;
-		  break;
-		case 0x1ffa:
-		case 0x1ffb:
-		  k = c - 0x7e;
-		  break;
-		case 0x1ffc:
-		  k = 0x1ff3;
-		  break;
-		default:
-		  k = 0;
-		}
-	      if (k != 0)
-		return k;
-	    }
-	}
-      else 
-	{
-	  if (c >= 0x2160 && c <= 0x216f)
-	    return (c + 0x10);
-	  
-	  if (c >= 0x24b6 && c <= 0x24cf)
-	    return (c + 0x1a);
-	  
-	  if (c >= 0xff21 && c <= 0xff3a)
-	    return (c + 0x20);
-	  
-	  if (c >= 0x10400 && c <= 0x10425)
-	    return (c + 0x28);
-
-	  if (c == 0x2126)
-	    return 0x03c9;
-	  if (c == 0x212a)
-	    return 0x006b;
-	  if (c == 0x212b)
-	    return 0x00e5;
-	}
-    }     
-#endif /* _MB_CAPABLE */
-  
-  return (c < 0x00ff ? (wint_t)(tolower ((int)c)) : c);
-}
-
diff --git a/newlib/libc/ctype/towupper.c b/newlib/libc/ctype/towupper.c
deleted file mode 100644
index ec6c4ff..0000000
--- a/newlib/libc/ctype/towupper.c
+++ /dev/null
@@ -1,506 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-FUNCTION
-	<<towupper>>---translate wide characters to uppercase
-
-INDEX
-	towupper
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	wint_t towupper(wint_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	wint_t towupper(<[c]>)
-	wint_t <[c]>;
-
-
-DESCRIPTION
-<<towupper>> is a function which converts lowercase wide characters to
-uppercase, leaving all other characters unchanged.
-
-RETURNS
-<<towupper>> returns the uppercase equivalent of <[c]> when it is a
-lowercase wide character, otherwise, it returns the input character.
-
-PORTABILITY
-<<towupper>> is C99.
-
-No supporting OS subroutines are required.
-*/
-
-#include <_ansi.h>
-#include <newlib.h>
-#include <string.h>
-#include <reent.h>
-#include <ctype.h>
-#include <wctype.h>
-#include "local.h"
-
-wint_t
-_DEFUN(towupper,(c), wint_t c)
-{
-  int unicode = 0;
-
-  if (__lc_ctype[0] == 'C' && __lc_ctype[1] == '\0')
-    {
-      unicode = 0;
-      /* fall-through */ 
-    }
-#ifdef _MB_CAPABLE
-  else if (!strcmp (__lc_ctype, "C-JIS"))
-    {
-      c = __jp2uc (c, JP_JIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-SJIS"))
-    {
-      c = __jp2uc (c, JP_SJIS);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-EUCJP"))
-    {
-      c = __jp2uc (c, JP_EUCJP);
-      unicode = 1;
-    }
-  else if (!strcmp (__lc_ctype, "C-UTF-8"))
-    {
-      unicode = 1;
-    }
-
-  if (unicode)
-    {
-      if (c < 0x100)
-	{
-	  if (c == 0x00b5)
-	    return 0x039c;
-	  
-	  if ((c >= 0x00e0 && c <= 0x00fe) ||
-	      (c >= 0x0061 && c <= 0x007a))
-	    return (c - 0x20);
-	  
-	  if (c == 0xff)
-	    return 0x0178;
-	  
-	  return c;
-	}
-      else if (c < 0x300)
-	{
-	  if ((c >= 0x0101 && c <= 0x012f) ||
-	      (c >= 0x0133 && c <= 0x0137) ||
-	      (c >= 0x014b && c <= 0x0177) ||
-	      (c >= 0x01df && c <= 0x01ef) ||
-	      (c >= 0x01f9 && c <= 0x021f) ||
-	      (c >= 0x0223 && c <= 0x0233))
-	    {
-	      if (c & 0x01)
-		return (c - 1);
-	      return c;
-	    }
-
-	  if ((c >= 0x013a && c <= 0x0148) ||
-	      (c >= 0x01ce && c <= 0x1dc))
-	    {
-	      if (!(c & 0x01))
-		return (c - 1);
-	      return c;
-	    }
-	  
-	  if (c == 0x0131)
-	    return 0x0049;
-	  
-	  if (c == 0x017a || c == 0x017c || c == 0x017e)
-	    return (c - 1);
-	  
-	  if (c >= 0x017f && c <= 0x0292)
-	    {
-	      wint_t k;
-	      switch (c)
-		{
-		case 0x017f:
-		  k = 0x0053;
-		  break;
-		case 0x0183:
-		  k = 0x0182;
-		  break;
-		case 0x0185:
-		  k = 0x0184;
-		  break;
-		case 0x0188:
-		  k = 0x0187;
-		  break;
-		case 0x018c:
-		  k = 0x018b;
-		  break;
-		case 0x0192:
-		  k = 0x0191;
-		  break;
-		case 0x0195:
-		  k = 0x01f6;
-		  break;
-		case 0x0199:
-		  k = 0x0198;
-		  break;
-		case 0x019e:
-		  k = 0x0220;
-		  break;
-		case 0x01a1:
-		case 0x01a3:
-		case 0x01a5:
-		case 0x01a8:
-		case 0x01ad:
-		case 0x01b0:
-		case 0x01b4:
-		case 0x01b6:
-		case 0x01b9:
-		case 0x01bd:
-		case 0x01c5:
-		case 0x01c8:
-		case 0x01cb:
-		case 0x01f2:
-		case 0x01f5:
-		  k = c - 1;
-		  break;
-		case 0x01bf:
-		  k = 0x01f7;
-		  break;
-		case 0x01c6:
-		case 0x01c9:
-		case 0x01cc:
-		  k = c - 2;
-		  break;
-		case 0x01dd:
-		  k = 0x018e;
-		  break;
-		case 0x01f3:
-		  k = 0x01f1;
-		  break;
-		case 0x0253:
-		  k = 0x0181;
-		  break;
-		case 0x0254:
-		  k = 0x0186;
-		  break;
-		case 0x0256:
-		  k = 0x0189;
-		  break;
-		case 0x0257:
-		  k = 0x018a;
-		  break;
-		case 0x0259:
-		  k = 0x018f;
-		  break;
-		case 0x025b:
-		  k = 0x0190;
-		  break;
-		case 0x0260:
-		  k = 0x0193;
-		  break;
-		case 0x0263:
-		  k = 0x0194;
-		  break;
-		case 0x0268:
-		  k = 0x0197;
-		  break;
-		case 0x0269:
-		  k = 0x0196;
-		  break;
-		case 0x026f:
-		  k = 0x019c;
-		  break;
-		case 0x0272:
-		  k = 0x019d;
-		  break;
-		case 0x0275:
-		  k = 0x019f;
-		  break;
-		case 0x0280:
-		  k = 0x01a6;
-		  break;
-		case 0x0283:
-		  k = 0x01a9;
-		  break;
-		case 0x0288:
-		  k = 0x01ae;
-		  break;
-		case 0x028a:
-		  k = 0x01b1;
-		  break;
-		case 0x028b:
-		  k = 0x01b2;
-		  break;
-		case 0x0292:
-		  k = 0x01b7;
-		  break;
-		default:
-		  k = 0;
-		}
-	      if (k != 0)
-		return k;
-	    }
-	}
-      else if (c < 0x0400)
-	{
-	  if (c == 0x03ac)
-	    return 0x0386;
-	  
-	  if ((c & 0xfff0) == 0x03a0 && c >= 0x03ad)
-	    return (c - 0x15);
-	  
-	  if (c >= 0x03b1 && c <= 0x03cb && c != 0x03c2)
-	    return (c - 0x20);
-	  
-	  if (c == 0x03c2)
-	    return 0x03a3;
-	  
-	  if (c >= 0x03cc && c <= 0x03f5)
-	    {
-	      wint_t k;
-	      switch (c)
-		{
-		case 0x03cc:
-		  k = 0x038c;
-		  break;
-		case 0x03cd:
-		case 0x03ce:
-		  k = c - 0x3f;
-		  break;
-		case 0x03d0:
-		  k = 0x0392;
-		  break;
-		case 0x03d1:
-		  k = 0x0398;
-		  break;
-		case 0x03d5:
-		  k = 0x03a6;
-		  break;
-		case 0x03d6:
-		  k = 0x03a0;
-		  break;
-		case 0x03d9:
-		case 0x03db:
-		case 0x03dd:
-		case 0x03df:
-		case 0x03e1:
-		case 0x03e3:
-		case 0x03e5:
-		case 0x03e7:
-		case 0x03e9:
-		case 0x03eb:
-		case 0x03ed:
-		case 0x03ef:
-		  k = c - 1;
-		  break;
-		case 0x03f0:
-		  k = 0x039a;
-		  break;
-		case 0x03f1:
-		  k = 0x03a1;
-		  break;
-		case 0x03f2:
-		  k = 0x03a3;
-		  break;
-		case 0x03f5:
-		  k = 0x0395;
-		  break;
-		default:
-		  k = 0;
-		}
-	      if (k != 0)
-		return k;
-	    }
-	}
-      else if (c < 0x500)
-	{
-	  if (c >= 0x0450 && c <= 0x045f)
-	    return (c - 0x50);
-	  
-	  if (c >= 0x0430 && c <= 0x044f)
-	    return (c - 0x20);
-	  
-	  if ((c >= 0x0461 && c <= 0x0481) ||
-	      (c >= 0x048b && c <= 0x04bf) ||
-	      (c >= 0x04d1 && c <= 0x04f5))
-	    {
-	      if (c & 0x01)
-		return (c - 1);
-	      return c;
-	    }
-	  
-	  if (c >= 0x04c2 && c <= 0x04ce)
-	    {
-	      if (!(c & 0x01))
-		return (c - 1);
-	      return c;
-	    }
-	  
-	  if (c == 0x04f9)
-	    return 0x04f8;
-	}
-      else if (c < 0x1f00)
-	{
-	  if ((c >= 0x0501 && c <= 0x050f) ||
-	      (c >= 0x1e01 && c <= 0x1e95) ||
-	      (c >= 0x1ea1 && c <= 0x1ef9))
-	    {
-	      if (c & 0x01)
-		return (c - 1);
-	      return c;
-	    }
-	  
-	  if (c >= 0x0561 && c <= 0x0586)
-	    return (c - 0x30);
-
-	  if (c == 0x1e9b)
-	    return 0x1e60;
-	}
-      else if (c < 0x2000)
-	{
-	  
-	  if ((c >= 0x1f00 && c <= 0x1f07) ||
-	      (c >= 0x1f10 && c <= 0x1f15) ||
-	      (c >= 0x1f20 && c <= 0x1f27) ||
-	      (c >= 0x1f30 && c <= 0x1f37) ||
-	      (c >= 0x1f40 && c <= 0x1f45) ||
-	      (c >= 0x1f60 && c <= 0x1f67) ||
-	      (c >= 0x1f80 && c <= 0x1f87) ||
-	      (c >= 0x1f90 && c <= 0x1f97) ||
-	      (c >= 0x1fa0 && c <= 0x1fa7))
-	    return (c + 0x08);
- 
-	  if (c >= 0x1f51 && c <= 0x1f57 && (c & 0x01))
-	    return (c + 0x08);
-	  
-	  if (c >= 0x1f70 && c <= 0x1ff3)
-	    {
-	      wint_t k;
-	      switch (c)
-		{
-		case 0x1fb0:
-		  k = 0x1fb8;
-		  break;
-		case 0x1fb1:
-		  k = 0x1fb9;
-		  break;
-		case 0x1f70:
-		  k = 0x1fba;
-		  break;
-		case 0x1f71:
-		  k = 0x1fbb;
-		  break;
-		case 0x1fb3:
-		  k = 0x1fbc;
-		  break;
-		case 0x1fbe:
-		  k = 0x0399;
-		  break;
-		case 0x1f72:
-		  k = 0x1fc8;
-		  break;
-		case 0x1f73:
-		  k = 0x1fc9;
-		  break;
-		case 0x1f74:
-		  k = 0x1fca;
-		  break;
-		case 0x1f75:
-		  k = 0x1fcb;
-		  break;
-		case 0x1fd0:
-		  k = 0x1fd8;
-		  break;
-		case 0x1fd1:
-		  k = 0x1fd9;
-		  break;
-		case 0x1f76:
-		  k = 0x1fda;
-		  break;
-		case 0x1f77:
-		  k = 0x1fdb;
-		  break;
-		case 0x1fe0:
-		  k = 0x1fe8;
-		  break;
-		case 0x1fe1:
-		  k = 0x1fe9;
-		  break;
-		case 0x1f7a:
-		  k = 0x1fea;
-		  break;
-		case 0x1f7b:
-		  k = 0x1feb;
-		  break;
-		case 0x1fe5:
-		  k = 0x1fec;
-		  break;
-		case 0x1f78:
-		  k = 0x1ff8;
-		  break;
-		case 0x1f79:
-		  k = 0x1ff9;
-		  break;
-		case 0x1f7c:
-		  k = 0x1ffa;
-		  break;
-		case 0x1f7d:
-		  k = 0x1ffb;
-		  break;
-		case 0x1ff3:
-		  k = 0x1ffc;
-		  break;
-		default:
-		  k = 0;
-		}
-	      if (k != 0)
-		return k;
-	    }
-	}
-      else 
-	{
-	  if (c >= 0x2170 && c <= 0x217f)
-	    return (c - 0x10);
-	  
-	  if (c >= 0x24d0 && c <= 0x24e9)
-	    return (c - 0x1a);
-	  
-	  if (c >= 0xff41 && c <= 0xff5a)
-	    return (c - 0x20);
-	  
-	  if (c >= 0x10428 && c <= 0x1044d)
-	    return (c - 0x28);
-	}
-    }     
-#endif /* _MB_CAPABLE */
-  
-  return (c < 0x00ff ? (wint_t)(toupper ((int)c)) : c);
-}
-
diff --git a/newlib/libc/ctype/utf8alpha.h b/newlib/libc/ctype/utf8alpha.h
deleted file mode 100644
index c7ee160..0000000
--- a/newlib/libc/ctype/utf8alpha.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* Generated using unicode.txt 3.2 */
-
-static const unsigned char u0[] = {
-  0x41, 0x0, 0x5a, 0x61, 0x0, 0x7a, 0xaa, 0xb5, 
-  0xba, 0xc0, 0x0, 0xd6, 0xd8, 0x0, 0xf6, 0xf8, 
-  0x0, 0xff };
-/* u1 all alphabetic */
-static const unsigned char u2[] = {
-  0x00, 0x0, 0x20, 0x22, 0x0, 0x33, 0x50, 0x0, 0xad, 
-  0xb0, 0x0, 0xb8, 0xbb, 0x0, 0xc1, 0xd0, 0x0, 
-  0xd1, 0xe0, 0x0, 0xe4, 0xee };
-static const unsigned char u3[] = {
-  0x45, 0x7a, 0x86, 
-  0x88, 0x0, 0x8a, 0x8c, 0x8e, 0x0, 0xa1, 0xa3, 
-  0x0, 0xce, 0xd0, 0x0, 0xf5 };
-static const unsigned char u4[] = { 
-  0x00, 0x0, 0x81, 
-  0x8a, 0x0, 0xce, 0xd0, 0x0, 0xf5, 0xf8, 0x0, 
-  0xf9 };
-static const unsigned char u5[] = { 
-  0x00, 0x0, 0x0f, 0x31, 0x0, 0x56, 0x59, 
-  0x61, 0x0, 0x87, 0xd0, 0x0, 0xea, 0xf0, 0x0, 
-  0xf2 };
-static const unsigned char u6[] = { 
-  0x21, 0x0, 0x3a, 
-  0x40, 0x0, 0x4a, 0x60, 
-  0x0, 0x69, 0x6e, 0x0, 0x6f, 0x71, 0x0, 0xd3, 
-  0xd5, 0xe5, 0x0, 0xe6, 0xf0, 0x0, 0xfc };
-static const unsigned char u7[] = { 
-  0x10, 
-  0x12, 0x0, 0x2c, 0x80, 0x0, 0xa5, 0xb1 };
-static const unsigned char u9[] = { 
-  0x05, 
-  0x0, 0x39, 0x3d, 0x50, 0x58, 0x0, 0x61, 0x66, 
-  0x0, 0x6f, 0x85, 0x0, 0x8c, 0x8f, 0x0, 0x90, 
-  0x93, 0x0, 0xa8, 0xaa, 0x0, 0xb0, 0xb2, 0xb6, 
-  0x0, 0xb9, 0xdc, 0x0, 0xdd, 0xdf, 0x0, 0xe1, 
-  0xe6, 0x0, 0xf1 };
-static const unsigned char ua[] = { 
-  0x05, 0x0, 0x0a, 0x0f, 0x0, 
-  0x10, 0x13, 0x0, 0x28, 0x2a, 0x0, 0x30, 0x32, 
-  0x0, 0x33, 0x35, 0x0, 0x36, 0x38, 0x0, 0x39, 
-  0x59, 0x0, 0x5c, 0x5e, 0x66, 0x0, 0x6f, 0x72, 
-  0x0, 0x74, 0x85, 0x0, 0x8b, 0x8d, 0x8f, 0x0, 
-  0x91, 0x93, 0x0, 0xa8, 0xaa, 0x0, 0xb0, 0xb2, 
-  0x0, 0xb3, 0xb5, 0x0, 0xb9, 0xbd, 0xd0, 0xe0, 
-  0xe6, 0x0, 0xef };
-static const unsigned char ub[] = { 
-  0x05, 0x0, 0x0c, 0x0f, 0x0, 
-  0x10, 0x13, 0x0, 0x28, 0x2a, 0x0, 0x30, 0x32, 
-  0x0, 0x33, 0x36, 0x0, 0x39, 0x3d, 0x5c, 0x0, 
-  0x5d, 0x5f, 0x0, 0x61, 0x66, 0x0, 0x6f, 0x83, 
-  0x85, 0x0, 0x8a, 0x8e, 0x0, 0x90, 0x92, 0x0, 
-  0x95, 0x99, 0x0, 0x9a, 0x9c, 0x9e, 0x0, 0x9f, 
-  0xa3, 0x0, 0xa4, 0xa8, 0x0, 0xaa, 0xae, 0x0, 
-  0xb5, 0xb7, 0x0, 0xb9, 0xe7, 0x0, 0xef };
-static const unsigned char uc[] = { 
-  0x05, 
-  0x0, 0x0c, 0x0e, 0x0, 0x10, 0x12, 0x0, 0x28, 
-  0x2a, 0x0, 0x33, 0x35, 0x0, 0x39, 0x60, 0x0, 
-  0x61, 0x66, 0x0, 0x6f, 0x85, 0x0, 0x8c, 0x8e, 
-  0x0, 0x90, 0x92, 0x0, 0xa8, 0xaa, 0x0, 0xb3, 
-  0xb5, 0x0, 0xb9, 0xde, 0xe0, 0x0, 0xe1, 0xe6, 
-  0x0, 0xef };
-static const unsigned char ud[] = { 
-  0x05, 0x0, 0x0c, 0x0e, 0x0, 0x10, 
-  0x12, 0x0, 0x28, 0x2a, 0x0, 0x39, 0x60, 0x0, 
-  0x61, 0x66, 0x0, 0x6f, 0x85, 0x0, 0x96, 0x9a, 
-  0x0, 0xb1, 0xb3, 0x0, 0xbb, 0xbd, 0xc0, 0x0, 
-  0xc6 };
-static const unsigned char ue[] = { 
-  0x01, 0x0, 0x2e, 0x30, 0x0, 0x3a, 0x40, 
-  0x0, 0x45, 0x47, 0x0, 0x4e, 0x50, 0x0, 0x59, 
-  0x81, 0x0, 0x82, 0x84, 0x87, 0x0, 0x88, 0x8a, 
-  0x8d, 0x94, 0x0, 0x97, 0x99, 0x0, 0x9f, 0xa1, 
-  0x0, 0xa3, 0xa5, 0xa7, 0xaa, 0x0, 0xab, 0xad, 
-  0x0, 0xb0, 0xb2, 0x0, 0xb3, 0xbd, 0xc0, 0x0, 
-  0xc4, 0xc6, 0xd0, 0x0, 0xd9, 0xdc, 0x0, 0xdd }; 
-static const unsigned char uf[] = {
-  0x00, 0x20, 0x0, 0x29, 0x40, 0x0, 0x47, 0x49, 
-  0x0, 0x6a, 0x88, 0x0, 0x8b };
-static const unsigned char u10[] = { 
-  0x00, 0x0, 0x21, 
-  0x23, 0x0, 0x27, 0x29, 0x0, 0x2a, 0x40, 0x0, 
-  0x49, 0x50, 0x0, 0x55, 0xa0, 0x0, 0xc5, 0xd0, 
-  0x0, 0xf8 };
-static const unsigned char u11[] = { 
-  0x00, 0x0, 0x59, 0x5f, 0x0, 0xa2, 
-  0xa8, 0x0, 0xf9 };
-static const unsigned char u12[] = { 
-  0x00, 0x0, 0x06, 0x08, 0x0, 
-  0x46, 0x48, 0x4a, 0x0, 0x4d, 0x50, 0x0, 0x56, 
-  0x58, 0x5a, 0x0, 0x5d, 0x60, 0x0, 0x86, 0x88, 
-  0x8a, 0x0, 0x8d, 0x90, 0x0, 0xae, 0xb0, 0xb2, 
-  0x0, 0xb5, 0xb8, 0x0, 0xbe, 0xc0, 0xc2, 0x0, 
-  0xc5, 0xc8, 0x0, 0xce, 0xd0, 0x0, 0xd6, 0xd8, 
-  0x0, 0xee, 0xf0, 0x0, 0xff };
-static const unsigned char u13[] = { 
-  0x00, 0x0, 0x0e, 0x10, 0x12, 0x0, 
-  0x15, 0x18, 0x0, 0x1e, 0x20, 0x0, 0x46, 0x48, 
-  0x0, 0x5a, 0x69, 0x0, 0x71, 0xa0, 0x0, 0xf4 };
-static const unsigned char u14[] = { 
-  0x01, 0x0, 0xff };
-/* u15 all alphabetic */
-static const unsigned char u16[] = { 
-  0x00, 0x0, 0x6c, 0x6f, 0x0, 0x76, 
-  0x81, 0x0, 0x9a, 0xa0, 0x0, 0xea, 0xee, 0x0, 0xf0 };
-static const unsigned char u17[] = { 
-  0x00, 
-  0x0, 0x0c, 0x0e, 0x0, 0x11, 0x20, 0x0, 0x31, 
-  0x40, 0x0, 0x51, 0x60, 0x0, 0x6c, 0x6e, 0x0, 
-  0x70, 0x80, 0x0, 0xb3, 0xd7, 0xdc, 0xe0, 0x0, 
-  0xe9 };
-static const unsigned char u18[] = { 
-  0x10, 0x0, 0x19, 0x20, 0x0, 0x77, 0x80, 
-  0x0, 0xa8 };
-static const unsigned char u1e[] = { 
-  0x00, 0x0, 0x9b, 0xa0, 0x0, 0xf9 }; 
-static const unsigned char u1f[] = { 
-  0x00, 0x0, 0x15, 0x18, 0x0, 0x1d, 
-  0x20, 0x0, 0x45, 0x48, 0x0, 0x4d, 0x50, 0x0, 0x57, 0x59, 
-  0x5b, 0x5d, 0x5f, 0x0, 0x7d, 0x80, 0x0, 0xb4, 
-  0xb6, 0x0, 0xbc, 0xbe, 0xc2, 0x0, 0xc4, 0xc6, 
-  0x0, 0xcc, 0xd0, 0x0, 0xd3, 0xd6, 0x0, 0xdb, 
-  0xe0, 0x0, 0xec, 0xf2, 0x0, 0xf4, 0xf6, 0x0, 
-  0xfc };
-static const unsigned char u20[] = { 
-  0x71, 0x7f };
-static const unsigned char u21[] = { 
-  0x02, 0x07, 0x0a, 0x0, 0x13, 
-  0x15, 0x19, 0x0, 0x1d, 0x24, 0x26, 0x28, 0x0, 
-  0x2d, 0x2f, 0x0, 0x31, 0x33, 0x0, 0x39, 0x3d, 
-  0x0, 0x3f, 0x45, 0x0, 0x49, 0x60, 0x0, 0x83 }; 
-static const unsigned char u24[] = { 
-  0x9c, 0x0, 0xe9 };
-static const unsigned char u30[] = { 
-  0x05, 0x0, 0x07, 0x21, 0x0, 
-  0x29, 0x31, 0x0, 0x35, 0x38, 0x0, 0x3c, 0x41, 
-  0x0, 0x96, 0x9d, 0x0, 0x9f, 0xa1, 0x0, 0xfa, 
-  0xfc, 0x0, 0xff };
-static const unsigned char u31[] = { 
-  0x05, 0x0, 0x2c, 0x31, 0x0, 
-  0x8e, 0xa0, 0x0, 0xb7, 0xf0, 0x0, 0xff };
-/* u34 to u4c all alphabetic */
-static const unsigned char u4d[] = { 
-  0x00, 0x0, 0xb5 };
-/* u4e to u9e all alphabetic */
-static const unsigned char u9f[] = { 
-  0x00, 0x0, 0xa5 };
-/* ua0 to ua3 all alphabetic */
-static const unsigned char ua4[] = { 
-  0x00, 0x0, 0x8c }; 
-/* uac to ud6 all alphabetic */
-static const unsigned char ud7[] = { 
-  0xa3 };
-/* uf9 all alphabetic */
-static const unsigned char ufa[] = { 
-  0x00, 0x0, 0x2d, 0x30, 0x0, 0x6a };
-static const unsigned char ufb[] = { 
-  0x00, 0x0, 0x06, 0x13, 0x0, 0x17, 0x1d, 
-  0x1f, 0x0, 0x28, 0x2a, 0x0, 0x36, 0x38, 0x0, 
-  0x3c, 0x3e, 0x40, 0x0, 0x41, 0x43, 0x0, 0x44, 
-  0x46, 0x0, 0xb1, 0xd3, 0x0, 0xff };
-/* ufc all alphabetic */
-static const unsigned char ufd[] = { 
-  0x00, 0x0, 0x3d, 0x50, 0x0, 
-  0x8f, 0x92, 0x0, 0xc7, 0xf0, 0x0, 0xfb };
-static const unsigned char ufe[] = { 
-  0x70, 
-  0x0, 0x74, 0x76, 0x0, 0xfc };
-static const unsigned char uff[] = { 
-  0x10, 0x0, 0x19, 
-  0x21, 0x0, 0x3a, 0x41, 0x0, 0x5a, 0x66, 0x0, 
-  0xbe, 0xc2, 0x0, 0xc7, 0xca, 0x0, 0xcf, 0xd2, 
-  0x0, 0xd7, 0xda, 0x0, 0xdc };
-static const unsigned char u103[] = { 
-  0x00, 0x0, 0x1e, 
-  0x30, 0x0, 0x4a };
-static const unsigned char u104[] = { 
-  0x00, 0x0, 0x25, 0x28, 0x0, 
-  0x4d };
-static const unsigned char u1d4[] = { 
-  0x00, 0x0, 0x54, 0x56, 0x0, 0x9c, 0x9e, 
-  0x0, 0x9f, 0xa2, 0xa5, 0x0, 0xa6, 0xa9, 0x0, 
-  0xac, 0xae, 0x0, 0xb9, 0xbb, 0xbd, 0x0, 0xc0, 
-  0xc2, 0x0, 0xc3, 0xc5, 0x0, 0xff };
-static const unsigned char u1d5[] = { 
-  0x00, 0x0, 0x05, 0x07, 0x0, 
-  0x0a, 0x0d, 0x0, 0x14, 0x16, 0x0, 0x1c, 0x1e, 
-  0x0, 0x39, 0x3b, 0x0, 0x3e, 0x40, 0x0, 0x44, 
-  0x46, 0x4a, 0x0, 0x50, 0x52, 0x0, 0xff }; 
-static const unsigned char u1d6[] = { 
-  0x00, 0x0, 0xa3, 0xa8, 
-  0x0, 0xc0, 0xc2, 0x0, 0xda, 0xdc, 0x0, 0xfa, 
-  0xfc, 0x0, 0xff };
-static const unsigned char u1d7[] = { 
-  0x00, 0x0, 0x14, 0x16, 0x0, 
-  0x34, 0x36, 0x0, 0x4e, 0x50, 0x0, 0x6e, 
-  0x70, 0x0, 0x88, 0x8a, 0x0, 0xa8, 0xaa, 0x0, 0xc2, 
-  0xc4, 0x0, 0xc9, 0xce, 0x0, 0xff };
-/* u200 to u2a5 all alphabetic */
-static const unsigned char u2a6[] = { 
-  0x00, 0x0, 0xd6 };
-/* u2f8 to u2f9 all alphabetic */
-static const unsigned char u2fa[] = { 
-  0x00, 0x0, 0x1d };
diff --git a/newlib/libc/ctype/utf8print.h b/newlib/libc/ctype/utf8print.h
deleted file mode 100644
index c895a3c..0000000
--- a/newlib/libc/ctype/utf8print.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* Generated using unicode.txt 3.2 */
-
-static const unsigned char u0[] = {
-  0x20, 0x0, 0x7e, 0xa0, 0x0, 0xff };
-/* u1 is all-print */
-static const unsigned char u2[] = {
-  0x00, 0x0, 0x20, 0x22, 0x0, 
-  0x33, 0x50, 0x0, 0xad, 0xb0, 0x0, 0xee };
-static const unsigned char u3[] = { 
-  0x00, 0x0, 0x4f, 0x60, 0x0, 0x6f, 0x74, 0x0, 0x75, 
-  0x7a, 0x7e, 0x84, 0x0, 0x8a, 0x8c, 0x8e, 0x0, 
-  0xa1, 0xa3, 0x0, 0xce, 0xd0, 0x0, 0xf6 };
-static const unsigned char u4[] = {
-  0x00, 0x0, 0x86, 0x88, 0x0, 0xce, 0xd0, 0x0, 0xf5, 
-  0xf8, 0x0, 0xf9 };
-static const unsigned char u5[] = {
-  0x00, 0x0, 0x0f, 0x31, 0x0, 
-  0x56, 0x59, 0x0, 0x5f, 0x61, 0x0, 0x87, 0x89, 
-  0x0, 0x8a, 0x91, 0x0, 0xa1, 0xa3, 0x0, 0xb9, 
-  0xbb, 0x0, 0xc4, 0xd0, 0x0, 0xea, 0xf0, 0x0, 
-  0xf4 };
-static const unsigned char u6[] = {
-  0x0c, 0x1b, 0x1f, 0x21, 0x0, 0x3a, 0x40, 
-  0x0, 0x55, 0x60, 0x0, 0xed, 0xf0, 0x0, 0xfe };
-static const unsigned char u7[] = { 
-  0x00, 0x0, 0x0d, 0x0f, 0x0, 0x2c, 0x30, 0x0, 
-  0x4a, 0x80, 0x0, 0xb1 };
-static const unsigned char u9[] = {
-  0x01, 0x0, 0x03, 0x05, 
-  0x0, 0x39, 0x3c, 0x0, 0x4d, 0x50, 0x0, 0x54, 
-  0x58, 0x0, 0x70, 0x81, 0x0, 0x83, 0x85, 0x0, 
-  0x8c, 0x8f, 0x0, 0x90, 0x93, 0x0, 0xa8, 0xaa, 
-  0x0, 0xb0, 0xb2, 0xb6, 0x0, 0xb9, 0xbc, 0xbe, 
-  0x0, 0xc4, 0xc7, 0x0, 0xc8, 0xcb, 0x0, 0xcd, 
-  0xd7, 0xdc, 0x0, 0xdd, 0xdf, 0x0, 0xe3, 0xe6, 
-  0x0, 0xfa };
-static const unsigned char ua[] = { 
-  0x02, 0x05, 0x0, 0x0a, 0x0f, 0x0, 
-  0x10, 0x13, 0x0, 0x28, 0x2a, 0x0, 0x30, 0x32, 
-  0x0, 0x33, 0x35, 0x0, 0x36, 0x38, 0x0, 0x39, 
-  0x3c, 0x3e, 0x0, 0x42, 0x47, 0x0, 0x48, 0x4b, 
-  0x0, 0x4d, 0x59, 0x0, 0x5c, 0x5e, 0x66, 0x0, 
-  0x74, 0x81, 0x0, 0x83, 0x85, 0x0, 0x8b, 0x8d, 
-  0x8f, 0x0, 0x91, 0x93, 0x0, 0xa8, 0xaa, 0x0, 
-  0xb0, 0xb2, 0x0, 0xb3, 0xb5, 0x0, 0xb9, 0xbc, 
-  0x0, 0xc5, 0xc7, 0x0, 0xc9, 0xcb, 0x0, 0xcd, 
-  0xd0, 0xe0, 0xe6, 0x0, 0xef };
-static const unsigned char ub[] = {
-  0x01, 0x0, 0x03, 
-  0x05, 0x0, 0x0c, 0x0f, 0x0, 0x10, 0x13, 0x0, 
-  0x28, 0x2a, 0x0, 0x30, 0x32, 0x0, 0x33, 0x36, 
-  0x0, 0x39, 0x3c, 0x0, 0x43, 0x47, 0x0, 0x48, 
-  0x4b, 0x0, 0x4d, 0x56, 0x0, 0x57, 0x5c, 0x0, 
-  0x5d, 0x5f, 0x0, 0x61, 0x66, 0x0, 0x70, 0x82, 
-  0x0, 0x83, 0x85, 0x0, 0x8a, 0x8e, 0x0, 0x90, 
-  0x92, 0x0, 0x95, 0x99, 0x0, 0x9a, 0x9c, 0x9e, 
-  0x0, 0x9f, 0xa3, 0x0, 0xa4, 0xa8, 0x0, 0xaa, 
-  0xae, 0x0, 0xb5, 0xb7, 0x0, 0xb9, 0xbe, 0x0, 
-  0xc2, 0xc6, 0x0, 0xc8, 0xca, 0x0, 0xcd, 0xd7, 
-  0xe7, 0x0, 0xf2 };
-static const unsigned char uc[] = {
-  0x01, 0x0, 0x03, 0x05, 0x0, 
-  0x0c, 0x0e, 0x0, 0x10, 0x12, 0x0, 0x28, 0x2a, 
-  0x0, 0x33, 0x35, 0x0, 0x39, 0x3e, 0x0, 0x44, 
-  0x46, 0x0, 0x48, 0x4a, 0x0, 0x4d, 0x55, 0x0, 
-  0x56, 0x60, 0x0, 0x61, 0x66, 0x0, 0x6f, 0x82, 
-  0x0, 0x83, 0x85, 0x0, 0x8c, 0x8e, 0x0, 0x90, 
-  0x92, 0x0, 0xa8, 0xaa, 0x0, 0xb3, 0xb5, 0x0, 
-  0xb9, 0xbe, 0x0, 0xc4, 0xc6, 0x0, 0xc8, 0xca, 
-  0x0, 0xcd, 0xd5, 0x0, 0xd6, 0xde, 0xe0, 0x0, 
-  0xe1, 0xe6, 0x0, 0xef };
-static const unsigned char ud[] = {
-  0x02, 0x0, 0x03, 0x05, 
-  0x0, 0x0c, 0x0e, 0x0, 0x10, 0x12, 0x0, 0x28, 
-  0x2a, 0x0, 0x39, 0x3e, 0x0, 0x43, 0x46, 0x0, 
-  0x48, 0x4a, 0x0, 0x4d, 0x57, 0x60, 0x0, 0x61, 
-  0x66, 0x0, 0x6f, 0x82, 0x0, 0x83, 0x85, 0x0, 
-  0x96, 0x9a, 0x0, 0xb1, 0xb3, 0x0, 0xbb, 0xbd, 
-  0xc0, 0x0, 0xc6, 0xca, 0xcf, 0x0, 0xd4, 0xd6, 
-  0xd8, 0x0, 0xdf, 0xf2, 0x0, 0xf4 };
-static const unsigned char ue[] = {
-  0x01, 0x0, 
-  0x3a, 0x3f, 0x0, 0x5b, 0x81, 0x0, 0x82, 0x84, 
-  0x87, 0x0, 0x88, 0x8a, 0x8d, 0x94, 0x0, 0x97, 
-  0x99, 0x0, 0x9f, 0xa1, 0x0, 0xa3, 0xa5, 0xa7, 
-  0xaa, 0x0, 0xab, 0xad, 0x0, 0xb9, 0xbb, 0x0, 
-  0xbd, 0xc0, 0x0, 0xc4, 0xc6, 0xc8, 0x0, 0xcd, 
-  0xd0, 0x0, 0xd9, 0xdc, 0x0, 0xdd };
-static const unsigned char uf[] = {
-  0x00, 0x0, 
-  0x47, 0x49, 0x0, 0x6a, 0x71, 0x0, 0x8b, 0x90, 
-  0x0, 0x97, 0x99, 0x0, 0xbc, 0xbe, 0x0, 0xcc, 
-  0xcf };
-static const unsigned char u10[] = {
-  0x00, 0x0, 0x21, 0x23, 0x0, 0x27, 0x29, 
-  0x0, 0x2a, 0x2c, 0x0, 0x32, 0x36, 0x0, 0x39, 
-  0x40, 0x0, 0x59, 0xa0, 0x0, 0xc5, 0xd0, 0x0, 
-  0xf8, 0xfb };
-static const unsigned char u11[] = {
-  0x00, 0x0, 0x59, 0x5f, 0x0, 0xa2, 
-  0xa8, 0x0, 0xf9 };
-static const unsigned char u12[] = {
-  0x00, 0x0, 0x06, 0x08, 0x0, 
-  0x46, 0x48, 0x4a, 0x0, 0x4d, 0x50, 0x0, 0x56, 
-  0x58, 0x5a, 0x0, 0x5d, 0x60, 0x0, 0x86, 0x88, 
-  0x8a, 0x0, 0x8d, 0x90, 0x0, 0xae, 0xb0, 0xb2, 
-  0x0, 0xb5, 0xb8, 0x0, 0xbe, 0xc0, 0xc2, 0x0, 
-  0xc5, 0xc8, 0x0, 0xce, 0xd0, 0x0, 0xd6, 0xd8, 
-  0x0, 0xee, 0xf0, 0x0, 0xff };
-static const unsigned char u13[] = {
-  0x00, 0x0, 0x0e, 0x10, 0x12, 0x0, 
-  0x15, 0x18, 0x0, 0x1e, 0x20, 0x0, 0x46, 0x48, 
-  0x0, 0x5a, 0x61, 0x0, 0x7c, 0xa0, 0x0, 0xf4 };
-static const unsigned char u14[] = { 
-  0x01, 0x0, 0xff };
-/* u15 is all-print */
-static const unsigned char u16[] = {
-  0x00, 0x0, 0x76, 0x80, 0x0, 0x9c, 0xa0, 0x0, 
-  0xf0 };
-static const unsigned char u17[] = {
-  0x00, 0x0, 0x0c, 0x0e, 0x0, 0x14, 0x20, 
-  0x0, 0x36, 0x40, 0x0, 0x53, 0x60, 0x0, 0x6c, 
-  0x6e, 0x0, 0x70, 0x72, 0x0, 0x73, 0x80, 0x0, 
-  0xdc, 0xe0, 0x0, 0xe9 };
-static const unsigned char u18[] = {
-  0x00, 0x0, 0x0e, 0x10, 
-  0x0, 0x19, 0x20, 0x0, 0x77, 0x80, 0x0, 0xa9 };
-static const unsigned char u1e[] = { 
-  0x00, 0x0, 0x9b, 0xa0, 0x0, 0xf9 };
-static const unsigned char u1f[] = {
-  0x00, 0x0, 
-  0x15, 0x18, 0x0, 0x1d, 0x20, 0x0, 0x45, 0x48, 
-  0x0, 0x4d, 0x50, 0x0, 0x57, 0x59, 0x5b, 0x5d, 
-  0x5f, 0x0, 0x7d, 0x80, 0x0, 0xb4, 0xb6, 0x0, 
-  0xc4, 0xc6, 0x0, 0xd3, 0xd6, 0x0, 0xdb, 0xdd, 
-  0x0, 0xef, 0xf2, 0x0, 0xf4, 0xf6, 0x0, 0xfe };
-static const unsigned char u20[] = { 
-  0x00, 0x0, 0x27, 0x2a, 0x0, 0x52, 0x57, 0x5f, 
-  0x0, 0x63, 0x6a, 0x0, 0x71, 0x74, 0x0, 0x8e, 
-  0xa0, 0x0, 0xb1, 0xd0, 0x0, 0xea };
-static const unsigned char u21[] = {
-  0x00, 0x0, 
-  0x3a, 0x3d, 0x0, 0x4b, 0x53, 0x0, 0x83, 0x90, 
-  0x0, 0xff };
-/* u22 is all-print */
-static const unsigned char u23[] = {
-  0x00, 0x0, 0xce };
-static const unsigned char u24[] = {
-  0x00, 0x0, 0x26, 0x40, 0x0, 0x4a, 
-  0x60, 0x0, 0xfe };
-/* u25 is all-print */
-static const unsigned char u26[] = {
-  0x00, 0x0, 0x13, 0x16, 0x0, 
-  0x17, 0x19, 0x0, 0x7d, 0x80, 0x0, 0x89 };
-static const unsigned char u27[] = {
-  0x01, 
-  0x0, 0x04, 0x06, 0x0, 0x09, 0x0c, 0x0, 0x27, 
-  0x29, 0x0, 0x4b, 0x4d, 0x4f, 0x0, 0x52, 0x56, 
-  0x58, 0x0, 0x5e, 0x61, 0x0, 0x94, 0x98, 0x0, 
-  0xaf, 0xb1, 0x0, 0xbe, 0xd0, 0x0, 0xeb, 0xf0, 
-  0x0, 0xff };
-/* u28 to u2a are all-print */
-static const unsigned char u2e[] = {
-  0x80, 0x0, 0x99, 0x9b, 0x0, 0xf3 };
-static const unsigned char u2f[] = { 
-  0x00, 0x0, 0xd5, 0xf0, 0x0, 0xfb };
-static const unsigned char u30[] = {
-  0x00, 0x0, 
-  0x3f, 0x41, 0x0, 0x96, 0x99, 0x0, 0xff };
-static const unsigned char u31[] = {
-  0x05, 
-  0x0, 0x2c, 0x31, 0x0, 0x8e, 0x90, 0x0, 0xb7, 
-  0xf0, 0x0, 0xff };
-static const unsigned char u32[] = {
-  0x00, 0x0, 0x1c, 0x20, 0x0, 0x43, 0x51, 0x0, 
-  0x7b, 0x7f, 0x0, 0xcb, 0xd0, 0x0, 0xfe };
-static const unsigned char u33[] = {
-  0x00, 
-  0x0, 0x76, 0x7b, 0x0, 0xdd, 0xe0, 0x0, 0xfe };
-/* u34 to u4c is all-print */
-static const unsigned char u4d[] = { 
-  0x00, 0x0, 0xb5 };
-/* u4e to u9e is all-print */
-static const unsigned char u9f[] = {
-  0x00, 0x0, 0xa5 };
-/* ua0 to ua3 is all-print */
-static const unsigned char ua4[] = {
-  0x00, 0x0, 
-  0x8c, 0x90, 0x0, 0xc6 };
-/* uac to ud6 is all-print */
-static const unsigned char ud7[] = {
-  0x00, 0x0, 0xa3 };
-/* ue0 to uf9 is all-print */
-static const unsigned char ufa[] = {
-  0x00, 0x0, 0x2d, 0x30, 0x0, 0x6a };
-static const unsigned char ufb[] = {
-  0x00, 0x0, 0x06, 
-  0x13, 0x0, 0x17, 0x1d, 0x0, 0x36, 0x38, 0x0, 
-  0x3c, 0x3e, 0x40, 0x0, 0x41, 0x43, 0x0, 0x44, 
-  0x46, 0x0, 0xb1, 0xd3, 0x0, 0xff };
-/* ufc is all-print */
-static const unsigned char ufd[] = {
-  0x00, 0x0, 0x3f, 0x50, 0x0, 
-  0x8f, 0x92, 0x0, 0xc7, 0xf0, 0x0, 0xfc };
-static const unsigned char ufe[] = {
-  0x00, 
-  0x0, 0x0f, 0x20, 0x0, 0x23, 0x30, 0x0, 0x46, 
-  0x49, 0x0, 0x52, 0x54, 0x0, 0x66, 0x68, 0x0, 
-  0x6b, 0x70, 0x0, 0x74, 0x76, 0x0, 0xfc, 0xff };
-static const unsigned char uff[] = {
-  0x01, 0x0, 0xbe, 0xc2, 0x0, 0xc7, 0xca, 0x0, 
-  0xcf, 0xd2, 0x0, 0xd7, 0xda, 0x0, 0xdc, 0xe0, 
-  0x0, 0xe6, 0xe8, 0x0, 0xee, 0xf9, 0x0, 0xfd }; 
-static const unsigned char u103[] = {
-  0x00, 0x0, 0x1e, 0x20, 0x0, 0x23, 0x30, 0x0, 
-  0x4a };
-static const unsigned char u104[] = {
-  0x00, 0x0, 0x25, 0x28, 0x0, 0x4d };
-static const unsigned char u1d0[] = {
-  0x00, 
-  0x0, 0xf5 };
-static const unsigned char u1d1[] = {
-  0x00, 0x0, 0x26, 0x2a, 0x0, 0xdd };
-static const unsigned char u1d4[] = { 
-  0x00, 0x0, 0x54, 0x56, 0x0, 0x9c, 0x9e, 0x0, 
-  0x9f, 0xa2, 0xa5, 0x0, 0xa6, 0xa9, 0x0, 0xac, 
-  0xae, 0x0, 0xb9, 0xbb, 0xbd, 0x0, 0xc0, 0xc2, 
-  0x0, 0xc3, 0xc5, 0x0, 0xff };
-static const unsigned char u1d5[] = {
-  0x00, 0x0, 0x05, 0x07, 0x0, 0x0a, 
-  0x0d, 0x0, 0x14, 0x16, 0x0, 0x1c, 0x1e, 0x0, 
-  0x39, 0x3b, 0x0, 0x3e, 0x40, 0x0, 0x44, 0x46, 
-  0x4a, 0x0, 0x50, 0x52, 0x0, 0xff };
-static const unsigned char u1d6[] = {
-  0x00, 0x0, 0xa3, 0xa8, 0x0, 0xff };
-static const unsigned char u1d7[] = {
-  0x00, 0x0, 0xc9, 0xce, 0x0, 0xff };
-/* u200 to u2a5 is all-print */
-static const unsigned char u2a6[] = {
-  0x00, 0x0, 0xd6 };
-/* u2f8 to u2f9 is all-print */
-static const unsigned char u2fa[] = {
-  0x00, 
-  0x0, 0x1d };
-static const unsigned char ue00[] = {
-  0x01, 0x20, 0x0, 0x7f };
-/* uf00 to uffe is all-print */
-static const unsigned char ufff[] = {
-  0x00, 0x0, 
-  0xfd };
-/* u1000 to u10fe is all-print */
-static const unsigned char u10ff[] = {
-  0x00, 0x0, 0xfd };
diff --git a/newlib/libc/ctype/utf8punct.h b/newlib/libc/ctype/utf8punct.h
deleted file mode 100644
index 55c31f9..0000000
--- a/newlib/libc/ctype/utf8punct.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* Generated using unicode.txt 3.2 */
-
-static const unsigned char u0[] = {
-  0x21, 0x0, 0x2f, 0x3a, 0x0, 0x40, 0x5b, 0x0, 
-  0x60, 0x7b, 0x0, 0x7e, 0xa0, 0x0, 0xa9, 0xab, 
-  0x0, 0xb4, 0xb6, 0x0, 0xb9, 0xbb, 0x0, 0xbf, 
-  0xd7, 0xf7 };
-static const unsigned char u2[] = {
-  0xb9, 0x0, 0xba, 0xc2, 0x0, 0xcf, 
-  0xd2, 0x0, 0xdf, 0xe5, 0x0, 0xed };
-static const unsigned char u3[] = { 
-  0x00, 0x0, 
-  0x44, 0x46, 0x0, 0x4f, 0x60, 0x0, 0x6f, 0x74, 
-  0x0, 0x75, 0x7e, 0x84, 0x0, 0x85, 0x87, 0xf6 };
-static const unsigned char u4[] = {
-  0x82, 0x0, 0x86, 0x88, 0x0, 0x89 };
-static const unsigned char u5[] = { 
-  0x5a, 0x0, 
-  0x5f, 0x89, 0x0, 0x8a, 0x91, 0x0, 0xa1, 0xa3, 
-  0x0, 0xb9, 0xbb, 0x0, 0xc4, 0xf3, 0x0, 0xf4 };
-static const unsigned char u6[] = { 
-  0x0c, 0x1b, 0x1f, 0x4b, 0x0, 0x55, 0x6a, 0x0, 
-  0x6d, 0x70, 0xd4, 0xd6, 0x0, 0xe4, 0xe7, 0x0, 
-  0xed, 0xfd, 0x0, 0xfe };
-static const unsigned char u7[] =  { 
-  0x00, 0x0, 0x0d, 0x0f, 
-  0x11, 0x30, 0x0, 0x4a, 0xa6, 0x0, 0xb0 };
-static const unsigned char u9[] = { 
-  0x01, 
-  0x0, 0x03, 0x3c, 0x3e, 0x0, 0x4d, 0x51, 0x0, 
-  0x54, 0x62, 0x0, 0x65, 0x70, 0x81, 0x0, 0x83, 
-  0xbc, 0xbe, 0x0, 0xc4, 0xc7, 0x0, 0xc8, 0xcb, 
-  0x0, 0xcd, 0xd7, 0xe2, 0x0, 0xe3, 0xf2, 0x0, 
-  0xfa };
-static const unsigned char ua[] = {
-  0x02, 0x3c, 0x3e, 0x0, 0x42, 0x47, 0x0, 
-  0x48, 0x4b, 0x0, 0x4d, 0x70, 0x0, 0x71, 0x81, 
-  0x0, 0x83, 0xbc, 0xbe, 0x0, 0xc5, 0xc7, 0x0, 
-  0xc9, 0xcb, 0x0, 0xcd };
-static const unsigned char ub[] = { 
-  0x01, 0x0, 0x03, 0x3c, 
-  0x3e, 0x0, 0x43, 0x47, 0x0, 0x48, 0x4b, 0x0, 
-  0x4d, 0x56, 0x0, 0x57, 0x70, 0x82, 0xbe, 0x0, 
-  0xc2, 0xc6, 0x0, 0xc8, 0xca, 0x0, 0xcd, 0xd7, 
-  0xf0, 0x0, 0xf2 };
-static const unsigned char uc[] = { 
-  0x01, 0x0, 0x03, 0x3e, 0x0, 
-  0x44, 0x46, 0x0, 0x48, 0x4a, 0x0, 0x4d, 0x55, 
-  0x0, 0x56, 0x82, 0x0, 0x83, 0xbe, 0x0, 0xc4, 
-  0xc6, 0x0, 0xc8, 0xca, 0x0, 0xcd, 0xd5, 0x0, 
-  0xd6 };
-static const unsigned char ud[] = { 
-  0x02, 0x0, 0x03, 
-  0x3e, 0x0, 0x43, 0x46, 
-  0x0, 0x48, 0x4a, 0x0, 0x4d, 0x57, 0x82, 0x0, 
-  0x83, 0xca, 0xcf, 0x0, 0xd4, 0xd6, 0xd8, 0x0, 
-  0xdf, 0xf2, 0x0, 0xf4 };
-static const unsigned char ue[] = { 
-  0x2f, 0x3f, 0x46, 0x4f, 
-  0x5a, 0x0, 0x5b, 0xb1, 0xb4, 0x0, 0xb9, 0xbb, 
-  0x0, 0xbc, 0xc8, 0x0, 0xcd };
-static const unsigned char uf[] = { 
-  0x01, 0x0, 0x1f, 
-  0x2a, 0x0, 0x3f, 0x71, 0x0, 0x87, 0x90, 0x0, 
-  0x97, 0x99, 0x0, 0xbc, 0xbe, 0x0, 0xcc, 0xcf };
-static const unsigned char u10[] = { 
-  0x2c, 0x0, 0x32, 0x36, 0x0, 0x39, 0x4a, 0x0, 
-  0x4f, 0x56, 0x0, 0x59, 0xfb };
-static const unsigned char u13[] = { 
-  0x61, 0x0, 0x68, 
-  0x72, 0x0, 0x7c };
-static const unsigned char u16[] = { 
-  0x6d, 0x0, 0x6e, 0x9b, 0x0, 
-  0x9c, 0xeb, 0x0, 0xed };
-static const unsigned char u17[] = { 
-  0x12, 0x0, 0x14, 0x32, 
-  0x0, 0x36, 0x52, 0x0, 0x53, 0x72, 0x0, 0x73, 
-  0xb4, 0x0, 0xd6, 0xd8, 0x0, 0xdb };
-static const unsigned char u18[] = { 
-  0x00, 0x0, 
-  0x0e, 0xa9 };
-static const unsigned char u1f[] = { 
-  0xbd, 0xbf, 0x0, 0xc1, 
-  0xcd, 0x0, 0xcf, 0xdd, 0x0, 0xdf, 0xed, 0x0, 0xef, 0xfd, 
-  0x0, 0xfe };
-static const unsigned char u20[] = { 
-  0x07, 0x0c, 0x0, 0x27, 0x2a, 0x0, 
-  0x52, 0x57, 0x60, 0x0, 0x63, 0x6a, 0x0, 0x70, 
-  0x74, 0x0, 0x7e, 0x80, 0x0, 0x8e, 0xa0, 0x0, 
-  0xb1, 0xd0, 0x0, 0xea };
-static const unsigned char u21[] = { 
-  0x00, 0x0, 0x01, 0x03, 
-  0x0, 0x06, 0x08, 0x0, 0x09, 0x14, 0x16, 0x0, 
-  0x18, 0x1e, 0x0, 0x23, 0x25, 0x27, 0x2e, 0x32, 
-  0x3a, 0x40, 0x0, 0x44, 0x4a, 0x0, 0x4b, 0x53, 
-  0x0, 0x5f, 0x90, 0x0, 0xff };
-/* u22 is all-punctuation */
-static const unsigned char u23[] = { 
-  0x00, 0x0, 0xce };
-static const unsigned char u24[] = { 
-  0x00, 0x0, 0x26, 
-  0x40, 0x0, 0x4a, 0x60, 0x0, 0x9b, 0xea, 0x0, 
-  0xfe };
-/* u25 is all-punctuation */
-static const unsigned char u26[] = { 
-  0x00, 0x0, 0x13, 
-  0x16, 0x0, 0x17, 0x19, 
-  0x0, 0x7d, 0x80, 0x0, 0x89 };
-static const unsigned char u27[] = { 
-  0x01, 0x0, 0x04, 
-  0x06, 0x0, 0x09, 0x0c, 0x0, 0x27, 0x29, 0x0, 
-  0x4b, 0x4d, 0x4f, 0x0, 0x52, 0x56, 0x58, 0x0, 
-  0x5e, 0x61, 0x0, 0x94, 0x98, 0x0, 0xaf, 0xb1, 
-  0x0, 0xbe, 0xd0, 0x0, 0xeb, 0xf0, 0x0, 0xff };
-/* u28 to u2a is all-punctuation */ 
-static const unsigned char u2e[] = { 
-  0x80, 0x0, 0x99, 
-  0x9b, 0x0, 0xf3 };
-static const unsigned char u2f[] = { 
-  0x00, 0x0, 
-  0xd5, 0xf0, 0x0, 0xfb };
-static const unsigned char u30[] = { 
-  0x01, 0x0, 0x04, 0x08, 
-  0x0, 0x20, 0x2a, 0x0, 0x30, 0x36, 0x0, 0x37, 
-  0x3d, 0x0, 0x3f, 0x99, 0x0, 0x9c, 0xa0, 0xfb };
-static const unsigned char u31[] = { 
-  0x90, 0x0, 0x9f };
-static const unsigned char u32[] = { 
-  0x00, 0x0, 0x1c, 0x20, 0x0, 
-  0x43, 0x51, 0x0, 0x7b, 0x7f, 0x0, 0xcb, 0xd0, 
-  0x0, 0xfe };
-static const unsigned char u33[] = { 
-  0x00, 0x0, 0x76, 0x7b, 0x0, 0xdd, 
-  0xe0, 0x0, 0xfe };
-static const unsigned char ua4[] = { 
-  0x90, 0x0, 0xc6 };
-/* ue0 to uf8 are all-punctuation */
-static const unsigned char ufb[] = { 
-  0x1e, 0x29 };
-static const unsigned char ufd[] = { 
-  0x3e, 0x0, 0x3f, 0xfc };
-static const unsigned char ufe[] = { 
-  0x00, 
-  0x0, 0x0f, 0x20, 0x0, 0x23, 0x30, 0x0, 0x46, 
-  0x49, 0x0, 0x52, 0x54, 0x0, 0x66, 0x68, 0x0, 
-  0x6b, 0xff };
-static const unsigned char uff[] = { 
-  0x01, 0x0, 0x0f, 0x1a, 0x0, 0x20, 
-  0x3b, 0x0, 0x40, 0x5b, 0x0, 0x65, 0xe0, 0x0, 
-  0xe6, 0xe8, 0x0, 0xee, 0xf9, 0x0, 0xfd };
-static const unsigned char u103[] = { 
-  0x20, 
-  0x0, 0x23 };
-static const unsigned char u1d0[] = { 
-  0x00, 0x0, 0xf5 }; 
-static const unsigned char u1d1[] = { 
-  0x00, 0x0, 0x26, 
-  0x2a, 0x0, 0xdd };
-static const unsigned char u1d6[] = { 
-  0xc1, 0xdb, 0xfb };
-static const unsigned char u1d7[] = { 
-  0x15, 0x35, 
-  0x4f, 0x6f, 0x89, 0xa9, 0xc3 };
-static const unsigned char ue00[] = { 
-  0x01, 0x20, 0x0, 
-  0x7f };
-/* uf00 to uffe are all punctuation */
-static const unsigned char ufff[] = { 
-  0x00, 0x0, 0xfd };
-/* u1000 to u10fe are all punctuation */
-static const unsigned char u10ff[] = { 
-  0x00, 0x0, 0xfd };
diff --git a/newlib/libc/ctype/wctrans.c b/newlib/libc/ctype/wctrans.c
deleted file mode 100644
index 7506983..0000000
--- a/newlib/libc/ctype/wctrans.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-FUNCTION
-	<<wctrans>>---get wide-character translation type
-
-INDEX
-	wctrans
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	wctrans_t wctrans(const char *<[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	wctrans_t wctrans(<[c]>)
-	const char * <[c]>;
-
-
-DESCRIPTION
-<<wctrans>> is a function which takes a string <[c]> and gives back
-the appropriate wctrans_t type value associated with the string,
-if one exists.  The following values are guaranteed to be recognized:
-"tolower" and "toupper".
-
-RETURNS
-<<wctrans>> returns 0 and sets <<errno>> to <<EINVAL>> if the
-given name is invalid.  Otherwise, it returns a valid non-zero wctrans_t
-value.
-
-PORTABILITY
-<<wctrans>> is C99.
-
-No supporting OS subroutines are required.
-*/
-
-#include <_ansi.h>
-#include <string.h>
-#include <reent.h>
-#include <wctype.h>
-#include <errno.h>
-#include "local.h"
-
-wctrans_t
-_DEFUN (_wctrans_r, (r, c), 
-	struct _reent *r _AND
-	const char *c)
-{
-  if (!strcmp (c, "tolower"))
-    return WCT_TOLOWER;
-  else if (!strcmp (c, "toupper"))
-    return WCT_TOUPPER;
-  else
-    {
-      r->_errno = EINVAL;
-      return 0;
-    }
-}
-
-#ifndef _REENT_ONLY
-wctrans_t
-_DEFUN (wctrans, (c),
-	const char *c)
-{
-  return _wctrans_r (_REENT, c);
-}
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/ctype/wctype.c b/newlib/libc/ctype/wctype.c
deleted file mode 100644
index dc400c4..0000000
--- a/newlib/libc/ctype/wctype.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-     Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-     Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-     The name of Red Hat Incorporated may not be used to endorse
-     or promote products derived from this software without specific
-     prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS   
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
-FUNCTION
-	<<wctype>>---get wide-character classification type
-
-INDEX
-	wctype
-
-ANSI_SYNOPSIS
-	#include <wctype.h>
-	wctype_t wctype(const char *<[c]>);
-
-TRAD_SYNOPSIS
-	#include <wctype.h>
-	wctype_t wctype(<[c]>)
-	const char * <[c]>;
-
-
-DESCRIPTION
-<<wctype>> is a function which takes a string <[c]> and gives back
-the appropriate wctype_t type value associated with the string,
-if one exists.  The following values are guaranteed to be recognized:
-"alnum", "alpha", "blank", "cntrl", "digit", "graph", "lower", "print",
-"punct", "space", "upper", and "xdigit".
-
-RETURNS
-<<wctype>> returns 0 and sets <<errno>> to <<EINVAL>> if the
-given name is invalid.  Otherwise, it returns a valid non-zero wctype_t
-value.
-
-PORTABILITY
-<<wctype>> is C99.
-
-No supporting OS subroutines are required.
-*/
-
-#include <_ansi.h>
-#include <string.h>
-#include <reent.h>
-#include <wctype.h>
-#include <errno.h>
-#include "local.h"
-
-wctype_t
-_DEFUN (_wctype_r, (r, c), 
-	struct _reent *r _AND
-	const char *c)
-{
-  switch (*c)
-    {
-    case 'a':
-      if (!strcmp (c, "alnum"))
-        return WC_ALNUM; 
-      else if (!strcmp (c, "alpha"))
-        return WC_ALPHA;
-      break;
-    case 'b':
-      if (!strcmp (c, "blank"))
-        return WC_BLANK;
-      break;
-    case 'c':
-      if (!strcmp (c, "cntrl"))
-        return WC_CNTRL;
-      break;
-    case 'd':
-      if (!strcmp (c, "digit"))
-        return WC_DIGIT;
-      break;
-    case 'g':
-      if (!strcmp (c, "graph"))
-        return WC_GRAPH;
-      break;
-    case 'l':
-      if (!strcmp (c, "lower"))
-        return WC_LOWER;
-      break;
-    case 'p':
-      if (!strcmp (c, "print"))
-        return WC_PRINT;
-      else if (!strcmp (c, "punct"))
-        return WC_PUNCT;
-      break;
-    case 's':
-      if (!strcmp (c, "space"))
-        return WC_SPACE;
-      break;
-    case 'u':
-      if (!strcmp (c, "upper"))
-        return WC_UPPER;
-      break;
-    case 'x':
-      if (!strcmp (c, "xdigit"))
-        return WC_XDIGIT;
-      break;
-    }
-
-  /* otherwise invalid */
-  r->_errno = EINVAL;
-  return 0;
-}
-
-#ifndef _REENT_ONLY
-wctype_t
-_DEFUN (wctype, (c),
-	const char *c)
-{
-  return _wctype_r (_REENT, c);
-}
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/errno/Makefile.in b/newlib/libc/errno/Makefile.in
index a6514ef..6ce18c5 100644
--- a/newlib/libc/errno/Makefile.in
+++ b/newlib/libc/errno/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -114,12 +99,12 @@ LIB_SOURCES = errno.c
 
 liberrno_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = liberrno.la
-@USE_LIBTOOL_TRUE@liberrno_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@liberrno.la
+@USE_LIBTOOL_TRUE@liberrno_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
 
 CHEWOUT_FILES = 
 
@@ -139,7 +124,7 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  errno.$(OBJEXT)
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  errno.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 liberrno_la_LIBADD = 
@@ -163,7 +148,7 @@ OBJECTS = $(lib_a_OBJECTS) $(liberrno_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus errno/Makefile
 
@@ -184,11 +169,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -197,7 +177,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libc/iconv/Makefile.am b/newlib/libc/iconv/Makefile.am
deleted file mode 100644
index a545687..0000000
--- a/newlib/libc/iconv/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS = cygnus
-
-SUBDIRS = ces ccs lib .
-
-cctdir=$(datadir)/iconv_data
-cct_DATA=encoding.aliases
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-SUBDEFS = lib/stmp-def
-
-include $(srcdir)/../../Makefile.shared
-
-CHEWOUT_FILES = iconv.def
-
-iconv.def: lib/iconv.def
-	cp lib/iconv.def iconv.def
-
-stmp-def: force
-	(cd lib && make doc)
-	touch $@
-
-.PHONY: force
-force:
-
-$(SUBDEFS): stmp-def
-
-lib/iconv.def: $(SUBDEFS); @true
-
-lib/stmp-def: ; @true
-
-TARGETDOC = ../tmp.texi
-
-doc: $(CHEWOUT_FILES)
-	cat $(srcdir)/iconv.tex >> $(TARGETDOC)
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-
diff --git a/newlib/libc/iconv/Makefile.in b/newlib/libc/iconv/Makefile.in
deleted file mode 100644
index 24d3b21..0000000
--- a/newlib/libc/iconv/Makefile.in
+++ /dev/null
@@ -1,382 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
-LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
-LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
-LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
-LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
-LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
-LIBC_SYS_LIB = @LIBC_SYS_LIB@
-LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-extra_dir = @extra_dir@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-SUBDIRS = ces ccs lib .
-
-cctdir = $(datadir)/iconv_data
-cct_DATA = encoding.aliases
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-SUBDEFS = lib/stmp-def
-
-CHEWOUT_FILES = iconv.def
-
-TARGETDOC = ../tmp.texi
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DATA =  $(cct_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus iconv/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-install-cctDATA: $(cct_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(cctdir)
-	@list='$(cct_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(cctdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(cctdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(cctdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(cctdir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-cctDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(cct_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(cctdir)/$$p; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = iconv
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am:
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-info-am: 
-install-info: install-info-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am: install-cctDATA
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-cctDATA
-uninstall: uninstall-recursive
-all-am: Makefile $(DATA)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(cctdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: uninstall-cctDATA install-cctDATA install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs-am installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-iconv.def: lib/iconv.def
-	cp lib/iconv.def iconv.def
-
-stmp-def: force
-	(cd lib && make doc)
-	touch $@
-
-.PHONY: force
-force:
-
-$(SUBDEFS): stmp-def
-
-lib/iconv.def: $(SUBDEFS); @true
-
-lib/stmp-def: ; @true
-
-doc: $(CHEWOUT_FILES)
-	cat $(srcdir)/iconv.tex >> $(TARGETDOC)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/iconv/ccs/Makefile.am b/newlib/libc/iconv/ccs/Makefile.am
deleted file mode 100644
index 70b8d04..0000000
--- a/newlib/libc/iconv/ccs/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-GENERAL_SOURCES = ccsbi.c \
-iso_8859_10.c iso_8859_13.c iso_8859_14.c iso_8859_15.c \
-iso_8859_1.c iso_8859_2.c iso_8859_3.c iso_8859_4.c \
-iso_8859_5.c iso_8859_6.c iso_8859_7.c iso_8859_8.c \
-iso_8859_9.c iso_8859_11.c \
-win_1250.c win_1252.c win_1254.c \
-win_1256.c win_1258.c win_1251.c \
-win_1253.c win_1255.c win_1257.c \
-koi8_r.c koi8_u.c koi8_ru.c koi8_uni.c \
-iso_ir_111.c \
-big5.c \
-cp775.c cp850.c cp852.c cp855.c cp866.c \
-jis_x0212_1990.c jis_x0201_1976.c jis_x0208_1990.c ksx1001.c \
-cns11643_plane1.c cns11643_plane2.c cns11643_plane14.c
-
-## The following interfaces are EL/IX level 2
-if ELIX_LEVEL_1
-LIB_OBJS = ccsbi.$(oext) \
-iso_8859_10.$(oext) iso_8859_13.$(oext) iso_8859_14.$(oext) iso_8859_15.$(oext) \
-iso_8859_1.$(oext) iso_8859_2.$(oext) iso_8859_3.$(oext) iso_8859_4.$(oext) \
-iso_8859_5.$(oext) iso_8859_6.$(oext) iso_8859_7.$(oext) iso_8859_8.$(oext) \
-iso_8859_9.$(oext) iso_8859_11.$(oext) \
-win_1250.$(oext) win_1252.$(oext) win_1254.$(oext) \
-win_1256.$(oext) win_1258.$(oext) win_1251.$(oext) \
-win_1253.$(oext) win_1255.$(oext) win_1257.$(oext) \
-koi8_r.$(oext) koi8_u.$(oext) koi8_ru.$(oext) koi8_uni.$(oext)
-iso_ir_111.$(oext) \
-big5.$(oext) \
-cp775.$(oext) cp850.$(oext) cp852.$(oext) cp855.$(oext) cp866.$(oext) \
-jis_x0212_1990.$(oext) jis_x0201_1976.$(oext) jis_x0208_1990.$(oext) ksx1001.$(oext) \
-cns11643_plane1.$(oext) cns11643_plane2.$(oext) cns11643_plane14.$(oext)
-
-else
-LIB_OBJS =
-endif
-
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
-noinst_DATA =
-
-SUBDIRS=binary
-
-CHEWOUT_FILES = ccs.def
-
-SUFFIXES = .def
-
-CHEW = ../../../doc/makedoc -f $(srcdir)/../../../doc/doc.str
-
-.c.def:
-	$(CHEW) < $< > $*.def 2> $*.ref
-	touch stmp-def
-
-TARGETDOC = ../tmp.texi
-
-doc: $(CHEWOUT_FILES)
-	cat $(srcdir)/ccs.tex >> $(TARGETDOC)
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-
-include $(srcdir)/../../../Makefile.shared
diff --git a/newlib/libc/iconv/ccs/Makefile.in b/newlib/libc/iconv/ccs/Makefile.in
deleted file mode 100644
index e3c30c7..0000000
--- a/newlib/libc/iconv/ccs/Makefile.in
+++ /dev/null
@@ -1,464 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
-LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
-LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
-LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
-LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
-LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
-LIBC_SYS_LIB = @LIBC_SYS_LIB@
-LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-extra_dir = @extra_dir@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-GENERAL_SOURCES = ccsbi.c iso_8859_10.c iso_8859_13.c iso_8859_14.c iso_8859_15.c iso_8859_1.c iso_8859_2.c iso_8859_3.c iso_8859_4.c iso_8859_5.c iso_8859_6.c iso_8859_7.c iso_8859_8.c iso_8859_9.c iso_8859_11.c win_1250.c win_1252.c win_1254.c win_1256.c win_1258.c win_1251.c win_1253.c win_1255.c win_1257.c koi8_r.c koi8_u.c koi8_ru.c koi8_uni.c iso_ir_111.c big5.c cp775.c cp850.c cp852.c cp855.c cp866.c jis_x0212_1990.c jis_x0201_1976.c jis_x0208_1990.c ksx1001.c cns11643_plane1.c cns11643_plane2.c cns11643_plane14.c
-
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = ccsbi.$(oext) iso_8859_10.$(oext) iso_8859_13.$(oext) iso_8859_14.$(oext) iso_8859_15.$(oext) iso_8859_1.$(oext) iso_8859_2.$(oext) iso_8859_3.$(oext) iso_8859_4.$(oext) iso_8859_5.$(oext) iso_8859_6.$(oext) iso_8859_7.$(oext) iso_8859_8.$(oext) iso_8859_9.$(oext) iso_8859_11.$(oext) win_1250.$(oext) win_1252.$(oext) win_1254.$(oext) win_1256.$(oext) win_1258.$(oext) win_1251.$(oext) win_1253.$(oext) win_1255.$(oext) win_1257.$(oext) koi8_r.$(oext) koi8_u.$(oext) koi8_ru.$(oext) koi8_uni.$(oext)
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = 
-
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
-noinst_DATA = 
-
-SUBDIRS = binary
-
-CHEWOUT_FILES = ccs.def
-
-SUFFIXES = .def
-
-CHEW = ../../../doc/makedoc -f $(srcdir)/../../../doc/doc.str
-
-TARGETDOC = ../tmp.texi
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_OBJECTS =  ccsbi.$(OBJEXT) iso_8859_10.$(OBJEXT) \
-iso_8859_13.$(OBJEXT) iso_8859_14.$(OBJEXT) iso_8859_15.$(OBJEXT) \
-iso_8859_1.$(OBJEXT) iso_8859_2.$(OBJEXT) iso_8859_3.$(OBJEXT) \
-iso_8859_4.$(OBJEXT) iso_8859_5.$(OBJEXT) iso_8859_6.$(OBJEXT) \
-iso_8859_7.$(OBJEXT) iso_8859_8.$(OBJEXT) iso_8859_9.$(OBJEXT) \
-iso_8859_11.$(OBJEXT) win_1250.$(OBJEXT) win_1252.$(OBJEXT) \
-win_1254.$(OBJEXT) win_1256.$(OBJEXT) win_1258.$(OBJEXT) \
-win_1251.$(OBJEXT) win_1253.$(OBJEXT) win_1255.$(OBJEXT) \
-win_1257.$(OBJEXT) koi8_r.$(OBJEXT) koi8_u.$(OBJEXT) koi8_ru.$(OBJEXT) \
-koi8_uni.$(OBJEXT) iso_ir_111.$(OBJEXT) big5.$(OBJEXT) cp775.$(OBJEXT) \
-cp850.$(OBJEXT) cp852.$(OBJEXT) cp855.$(OBJEXT) cp866.$(OBJEXT) \
-jis_x0212_1990.$(OBJEXT) jis_x0201_1976.$(OBJEXT) \
-jis_x0208_1990.$(OBJEXT) ksx1001.$(OBJEXT) cns11643_plane1.$(OBJEXT) \
-cns11643_plane2.$(OBJEXT) cns11643_plane14.$(OBJEXT)
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus iconv/ccs/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = iconv/ccs
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am:
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-info-am: 
-install-info: install-info-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile $(LIBRARIES) $(DATA)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs-am installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
-
-@ELIX_LEVEL_1_TRUE@iso_ir_111.$(oext) \
-@ELIX_LEVEL_1_TRUE@big5.$(oext) \
-@ELIX_LEVEL_1_TRUE@cp775.$(oext) cp850.$(oext) cp852.$(oext) cp855.$(oext) cp866.$(oext) \
-@ELIX_LEVEL_1_TRUE@jis_x0212_1990.$(oext) jis_x0201_1976.$(oext) jis_x0208_1990.$(oext) ksx1001.$(oext) \
-@ELIX_LEVEL_1_TRUE@cns11643_plane1.$(oext) cns11643_plane2.$(oext) cns11643_plane14.$(oext)
-
-.c.def:
-	$(CHEW) < $< > $*.def 2> $*.ref
-	touch stmp-def
-
-doc: $(CHEWOUT_FILES)
-	cat $(srcdir)/ccs.tex >> $(TARGETDOC)
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/iconv/ccs/big5.c b/newlib/libc/iconv/ccs/big5.c
deleted file mode 100644
index 45ea59b..0000000
--- a/newlib/libc/iconv/ccs/big5.c
+++ /dev/null
@@ -1,12615 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for big5 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_BIG5) \
- || defined (ICONV_FROM_UCS_CCS_BIG5)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-/*
- * 16-bit big5 -> UCS speed-optimized table (45568 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_BIG5) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_speed_big5[] =
-{
-	/* Heading Block */
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,0x0100,0x0200,0x0300,0x0400,0x0500,0x0600,0x0700,
-	0x0800,0x0900,0x0A00,0x0B00,0x0C00,0x0D00,0x0E00,0x0F00,
-	0x1000,0x1100,0x1200,0x1300,0x1400,0x1500,0x1600,0x1700,
-	0x1800,0x1900,0x1A00,0x1B00,0x1C00,0x1D00,0x1E00,0x1F00,
-	0x2000,0x2100,0x2200,0x2300,0x2400,0x2500,0x2600,0x2700,
-	INVBLK,0x2800,0x2900,0x2A00,0x2B00,0x2C00,0x2D00,0x2E00,
-	0x2F00,0x3000,0x3100,0x3200,0x3300,0x3400,0x3500,0x3600,
-	0x3700,0x3800,0x3900,0x3A00,0x3B00,0x3C00,0x3D00,0x3E00,
-	0x3F00,0x4000,0x4100,0x4200,0x4300,0x4400,0x4500,0x4600,
-	0x4700,0x4800,0x4900,0x4A00,0x4B00,0x4C00,0x4D00,0x4E00,
-	0x4F00,0x5000,0x5100,0x5200,0x5300,0x5400,0x5500,0x5600,
-	0x5700,0x5800,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	/* Block 162, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3000,0xFF0C,0x3001,0x3002,0xFF0E,0x2022,0xFF1B,0xFF1A,
-	0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFF64,0xFE52,
-	0x00B7,0xFE54,0xFE55,0xFE56,0xFE57,0xFF5C,0x2013,0xFE31,
-	0x2014,0xFE33,0xFFFD,0xFE34,0xFE4F,0xFF08,0xFF09,0xFE35,
-	0xFE36,0xFF5B,0xFF5D,0xFE37,0xFE38,0x3014,0x3015,0xFE39,
-	0xFE3A,0x3010,0x3011,0xFE3B,0xFE3C,0x300A,0x300B,0xFE3D,
-	0xFE3E,0x3008,0x3009,0xFE3F,0xFE40,0x300C,0x300D,0xFE41,
-	0xFE42,0x300E,0x300F,0xFE43,0xFE44,0xFE59,0xFE5A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xFE5B,0xFE5C,0xFE5D,0xFE5E,0x2018,0x2019,0x201C,
-	0x201D,0x301D,0x301E,0x2035,0x2032,0xFF03,0xFF06,0xFF0A,
-	0x203B,0x00A7,0x3003,0x25CB,0x25CF,0x25B3,0x25B2,0x25CE,
-	0x2606,0x2605,0x25C7,0x25C6,0x25A1,0x25A0,0x25BD,0x25BC,
-	0x32A3,0x2105,0x203E,0xFFFD,0xFF3F,0xFFFD,0xFE49,0xFE4A,
-	0xFE4D,0xFE4E,0xFE4B,0xFE4C,0xFE5F,0xFE60,0xFE61,0xFF0B,
-	0xFF0D,0x00D7,0x00F7,0x00B1,0x221A,0xFF1C,0xFF1E,0xFF1D,
-	0x2266,0x2267,0x2260,0x221E,0x2252,0x2261,0xFE62,0xFE63,
-	0xFE64,0xFE65,0xFE66,0x223C,0x2229,0x222A,0x22A5,0x2220,
-	0x221F,0x22BF,0x33D2,0x33D1,0x222B,0x222E,0x2235,0x2234,
-	0x2640,0x2642,0x2641,0x2609,0x2191,0x2193,0x2190,0x2192,
-	0x2196,0x2197,0x2199,0x2198,0x2225,0x2223,0xFFFD,INVALC,
-	/* Block 163, Array index 0x0200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xFFFD,0xFF0F,0xFF3C,0xFF04,0x00A5,0x3012,0x00A2,0x00A3,
-	0xFF05,0xFF20,0x2103,0x2109,0xFE69,0xFE6A,0xFE6B,0x33D5,
-	0x339C,0x339D,0x339E,0x33CE,0x33A1,0x338E,0x338F,0x33C4,
-	0x00B0,0x5159,0x515B,0x515E,0x515D,0x5161,0x5163,0x55E7,
-	0x74E9,0x7CCE,0x2581,0x2582,0x2583,0x2584,0x2585,0x2586,
-	0x2587,0x2588,0x258F,0x258E,0x258D,0x258C,0x258B,0x258A,
-	0x2589,0x253C,0x2534,0x252C,0x2524,0x251C,0x2594,0x2500,
-	0x2502,0x2595,0x250C,0x2510,0x2514,0x2518,0x256D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x256E,0x2570,0x256F,0x2550,0x255E,0x256A,0x2561,
-	0x25E2,0x25E3,0x25E5,0x25E4,0x2571,0x2572,0x2573,0xFF10,
-	0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17,0xFF18,
-	0xFF19,0x2160,0x2161,0x2162,0x2163,0x2164,0x2165,0x2166,
-	0x2167,0x2168,0x2169,0x3021,0x3022,0x3023,0x3024,0x3025,
-	0x3026,0x3027,0x3028,0x3029,0xFFFD,0x5344,0xFFFD,0xFF21,
-	0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27,0xFF28,0xFF29,
-	0xFF2A,0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,0xFF30,0xFF31,
-	0xFF32,0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,0xFF38,0xFF39,
-	0xFF3A,0xFF41,0xFF42,0xFF43,0xFF44,0xFF45,0xFF46,0xFF47,
-	0xFF48,0xFF49,0xFF4A,0xFF4B,0xFF4C,0xFF4D,0xFF4E,0xFF4F,
-	0xFF50,0xFF51,0xFF52,0xFF53,0xFF54,0xFF55,0xFF56,INVALC,
-	/* Block 164, Array index 0x0300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xFF57,0xFF58,0xFF59,0xFF5A,0x0391,0x0392,0x0393,0x0394,
-	0x0395,0x0396,0x0397,0x0398,0x0399,0x039A,0x039B,0x039C,
-	0x039D,0x039E,0x039F,0x03A0,0x03A1,0x03A3,0x03A4,0x03A5,
-	0x03A6,0x03A7,0x03A8,0x03A9,0x03B1,0x03B2,0x03B3,0x03B4,
-	0x03B5,0x03B6,0x03B7,0x03B8,0x03B9,0x03BA,0x03BB,0x03BC,
-	0x03BD,0x03BE,0x03BF,0x03C0,0x03C1,0x03C3,0x03C4,0x03C5,
-	0x03C6,0x03C7,0x03C8,0x03C9,0x3105,0x3106,0x3107,0x3108,
-	0x3109,0x310A,0x310B,0x310C,0x310D,0x310E,0x310F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3110,0x3111,0x3112,0x3113,0x3114,0x3115,0x3116,
-	0x3117,0x3118,0x3119,0x311A,0x311B,0x311C,0x311D,0x311E,
-	0x311F,0x3120,0x3121,0x3122,0x3123,0x3124,0x3125,0x3126,
-	0x3127,0x3128,0x3129,0x02D9,0x02C9,0x02CA,0x02C7,0x02CB,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 165, Array index 0x0400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4E00,0x4E59,0x4E01,0x4E03,0x4E43,0x4E5D,0x4E86,0x4E8C,
-	0x4EBA,0x513F,0x5165,0x516B,0x51E0,0x5200,0x5201,0x529B,
-	0x5315,0x5341,0x535C,0x53C8,0x4E09,0x4E0B,0x4E08,0x4E0A,
-	0x4E2B,0x4E38,0x51E1,0x4E45,0x4E48,0x4E5F,0x4E5E,0x4E8E,
-	0x4EA1,0x5140,0x5203,0x52FA,0x5343,0x53C9,0x53E3,0x571F,
-	0x58EB,0x5915,0x5927,0x5973,0x5B50,0x5B51,0x5B53,0x5BF8,
-	0x5C0F,0x5C22,0x5C38,0x5C71,0x5DDD,0x5DE5,0x5DF1,0x5DF2,
-	0x5DF3,0x5DFE,0x5E72,0x5EFE,0x5F0B,0x5F13,0x624D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E11,0x4E10,0x4E0D,0x4E2D,0x4E30,0x4E39,0x4E4B,
-	0x5C39,0x4E88,0x4E91,0x4E95,0x4E92,0x4E94,0x4EA2,0x4EC1,
-	0x4EC0,0x4EC3,0x4EC6,0x4EC7,0x4ECD,0x4ECA,0x4ECB,0x4EC4,
-	0x5143,0x5141,0x5167,0x516D,0x516E,0x516C,0x5197,0x51F6,
-	0x5206,0x5207,0x5208,0x52FB,0x52FE,0x52FF,0x5316,0x5339,
-	0x5348,0x5347,0x5345,0x535E,0x5384,0x53CB,0x53CA,0x53CD,
-	0x58EC,0x5929,0x592B,0x592A,0x592D,0x5B54,0x5C11,0x5C24,
-	0x5C3A,0x5C6F,0x5DF4,0x5E7B,0x5EFF,0x5F14,0x5F15,0x5FC3,
-	0x6208,0x6236,0x624B,0x624E,0x652F,0x6587,0x6597,0x65A4,
-	0x65B9,0x65E5,0x66F0,0x6708,0x6728,0x6B20,0x6B62,0x6B79,
-	0x6BCB,0x6BD4,0x6BDB,0x6C0F,0x6C34,0x706B,0x722A,0x7236,
-	0x723B,0x7247,0x7259,0x725B,0x72AC,0x738B,0x4E19,INVALC,
-	/* Block 166, Array index 0x0500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4E16,0x4E15,0x4E14,0x4E18,0x4E3B,0x4E4D,0x4E4F,0x4E4E,
-	0x4EE5,0x4ED8,0x4ED4,0x4ED5,0x4ED6,0x4ED7,0x4EE3,0x4EE4,
-	0x4ED9,0x4EDE,0x5145,0x5144,0x5189,0x518A,0x51AC,0x51F9,
-	0x51FA,0x51F8,0x520A,0x52A0,0x529F,0x5305,0x5306,0x5317,
-	0x531D,0x4EDF,0x534A,0x5349,0x5361,0x5360,0x536F,0x536E,
-	0x53BB,0x53EF,0x53E4,0x53F3,0x53EC,0x53EE,0x53E9,0x53E8,
-	0x53FC,0x53F8,0x53F5,0x53EB,0x53E6,0x53EA,0x53F2,0x53F1,
-	0x53F0,0x53E5,0x53ED,0x53FB,0x56DB,0x56DA,0x5916,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x592E,0x5931,0x5974,0x5976,0x5B55,0x5B83,0x5C3C,
-	0x5DE8,0x5DE7,0x5DE6,0x5E02,0x5E03,0x5E73,0x5E7C,0x5F01,
-	0x5F18,0x5F17,0x5FC5,0x620A,0x6253,0x6254,0x6252,0x6251,
-	0x65A5,0x65E6,0x672E,0x672C,0x672A,0x672B,0x672D,0x6B63,
-	0x6BCD,0x6C11,0x6C10,0x6C38,0x6C41,0x6C40,0x6C3E,0x72AF,
-	0x7384,0x7389,0x74DC,0x74E6,0x7518,0x751F,0x7528,0x7529,
-	0x7530,0x7531,0x7532,0x7533,0x758B,0x767D,0x76AE,0x76BF,
-	0x76EE,0x77DB,0x77E2,0x77F3,0x793A,0x79BE,0x7A74,0x7ACB,
-	0x4E1E,0x4E1F,0x4E52,0x4E53,0x4E69,0x4E99,0x4EA4,0x4EA6,
-	0x4EA5,0x4EFF,0x4F09,0x4F19,0x4F0A,0x4F15,0x4F0D,0x4F10,
-	0x4F11,0x4F0F,0x4EF2,0x4EF6,0x4EFB,0x4EF0,0x4EF3,0x4EFD,
-	0x4F01,0x4F0B,0x5149,0x5147,0x5146,0x5148,0x5168,INVALC,
-	/* Block 167, Array index 0x0600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5171,0x518D,0x51B0,0x5217,0x5211,0x5212,0x520E,0x5216,
-	0x52A3,0x5308,0x5321,0x5320,0x5370,0x5371,0x5409,0x540F,
-	0x540C,0x540A,0x5410,0x5401,0x540B,0x5404,0x5411,0x540D,
-	0x5408,0x5403,0x540E,0x5406,0x5412,0x56E0,0x56DE,0x56DD,
-	0x5733,0x5730,0x5728,0x572D,0x572C,0x572F,0x5729,0x5919,
-	0x591A,0x5937,0x5938,0x5984,0x5978,0x5983,0x597D,0x5979,
-	0x5982,0x5981,0x5B57,0x5B58,0x5B87,0x5B88,0x5B85,0x5B89,
-	0x5BFA,0x5C16,0x5C79,0x5DDE,0x5E06,0x5E76,0x5E74,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F0F,0x5F1B,0x5FD9,0x5FD6,0x620E,0x620C,0x620D,
-	0x6210,0x6263,0x625B,0x6258,0x6536,0x65E9,0x65E8,0x65EC,
-	0x65ED,0x66F2,0x66F3,0x6709,0x673D,0x6734,0x6731,0x6735,
-	0x6B21,0x6B64,0x6B7B,0x6C16,0x6C5D,0x6C57,0x6C59,0x6C5F,
-	0x6C60,0x6C50,0x6C55,0x6C61,0x6C5B,0x6C4D,0x6C4E,0x7070,
-	0x725F,0x725D,0x767E,0x7AF9,0x7C73,0x7CF8,0x7F36,0x7F8A,
-	0x7FBD,0x8001,0x8003,0x800C,0x8012,0x8033,0x807F,0x8089,
-	0x808B,0x808C,0x81E3,0x81EA,0x81F3,0x81FC,0x820C,0x821B,
-	0x821F,0x826E,0x8272,0x827E,0x866B,0x8840,0x884C,0x8863,
-	0x897F,0x9621,0x4E32,0x4EA8,0x4F4D,0x4F4F,0x4F47,0x4F57,
-	0x4F5E,0x4F34,0x4F5B,0x4F55,0x4F30,0x4F50,0x4F51,0x4F3D,
-	0x4F3A,0x4F38,0x4F43,0x4F54,0x4F3C,0x4F46,0x4F63,INVALC,
-	/* Block 168, Array index 0x0700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F5C,0x4F60,0x4F2F,0x4F4E,0x4F36,0x4F59,0x4F5D,0x4F48,
-	0x4F5A,0x514C,0x514B,0x514D,0x5175,0x51B6,0x51B7,0x5225,
-	0x5224,0x5229,0x522A,0x5228,0x52AB,0x52A9,0x52AA,0x52AC,
-	0x5323,0x5373,0x5375,0x541D,0x542D,0x541E,0x543E,0x5426,
-	0x544E,0x5427,0x5446,0x5443,0x5433,0x5448,0x5442,0x541B,
-	0x5429,0x544A,0x5439,0x543B,0x5438,0x542E,0x5435,0x5436,
-	0x5420,0x543C,0x5440,0x5431,0x542B,0x541F,0x542C,0x56EA,
-	0x56F0,0x56E4,0x56EB,0x574A,0x5751,0x5740,0x574D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5747,0x574E,0x573E,0x5750,0x574F,0x573B,0x58EF,
-	0x593E,0x599D,0x5992,0x59A8,0x599E,0x59A3,0x5999,0x5996,
-	0x598D,0x59A4,0x5993,0x598A,0x59A5,0x5B5D,0x5B5C,0x5B5A,
-	0x5B5B,0x5B8C,0x5B8B,0x5B8F,0x5C2C,0x5C40,0x5C41,0x5C3F,
-	0x5C3E,0x5C90,0x5C91,0x5C94,0x5C8C,0x5DEB,0x5E0C,0x5E8F,
-	0x5E87,0x5E8A,0x5EF7,0x5F04,0x5F1F,0x5F64,0x5F62,0x5F77,
-	0x5F79,0x5FD8,0x5FCC,0x5FD7,0x5FCD,0x5FF1,0x5FEB,0x5FF8,
-	0x5FEA,0x6212,0x6211,0x6284,0x6297,0x6296,0x6280,0x6276,
-	0x6289,0x626D,0x628A,0x627C,0x627E,0x6279,0x6273,0x6292,
-	0x626F,0x6298,0x626E,0x6295,0x6293,0x6291,0x6286,0x6539,
-	0x653B,0x6538,0x65F1,0x66F4,0x675F,0x674E,0x674F,0x6750,
-	0x6751,0x675C,0x6756,0x675E,0x6749,0x6746,0x6760,INVALC,
-	/* Block 169, Array index 0x0800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6753,0x6757,0x6B65,0x6BCF,0x6C42,0x6C5E,0x6C99,0x6C81,
-	0x6C88,0x6C89,0x6C85,0x6C9B,0x6C6A,0x6C7A,0x6C90,0x6C70,
-	0x6C8C,0x6C68,0x6C96,0x6C92,0x6C7D,0x6C83,0x6C72,0x6C7E,
-	0x6C74,0x6C86,0x6C76,0x6C8D,0x6C94,0x6C98,0x6C82,0x7076,
-	0x707C,0x707D,0x7078,0x7262,0x7261,0x7260,0x72C4,0x72C2,
-	0x7396,0x752C,0x752B,0x7537,0x7538,0x7682,0x76EF,0x77E3,
-	0x79C1,0x79C0,0x79BF,0x7A76,0x7CFB,0x7F55,0x8096,0x8093,
-	0x809D,0x8098,0x809B,0x809A,0x80B2,0x826F,0x8292,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x828B,0x828D,0x898B,0x89D2,0x8A00,0x8C37,0x8C46,
-	0x8C55,0x8C9D,0x8D64,0x8D70,0x8DB3,0x8EAB,0x8ECA,0x8F9B,
-	0x8FB0,0x8FC2,0x8FC6,0x8FC5,0x8FC4,0x5DE1,0x9091,0x90A2,
-	0x90AA,0x90A6,0x90A3,0x9149,0x91C6,0x91CC,0x9632,0x962E,
-	0x9631,0x962A,0x962C,0x4E26,0x4E56,0x4E73,0x4E8B,0x4E9B,
-	0x4E9E,0x4EAB,0x4EAC,0x4F6F,0x4F9D,0x4F8D,0x4F73,0x4F7F,
-	0x4F6C,0x4F9B,0x4F8B,0x4F86,0x4F83,0x4F70,0x4F75,0x4F88,
-	0x4F69,0x4F7B,0x4F96,0x4F7E,0x4F8F,0x4F91,0x4F7A,0x5154,
-	0x5152,0x5155,0x5169,0x5177,0x5176,0x5178,0x51BD,0x51FD,
-	0x523B,0x5238,0x5237,0x523A,0x5230,0x522E,0x5236,0x5241,
-	0x52BE,0x52BB,0x5352,0x5354,0x5353,0x5351,0x5366,0x5377,
-	0x5378,0x5379,0x53D6,0x53D4,0x53D7,0x5473,0x5475,INVALC,
-	/* Block 170, Array index 0x0900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5496,0x5478,0x5495,0x5480,0x547B,0x5477,0x5484,0x5492,
-	0x5486,0x547C,0x5490,0x5471,0x5476,0x548C,0x549A,0x5462,
-	0x5468,0x548B,0x547D,0x548E,0x56FA,0x5783,0x5777,0x576A,
-	0x5769,0x5761,0x5766,0x5764,0x577C,0x591C,0x5949,0x5947,
-	0x5948,0x5944,0x5954,0x59BE,0x59BB,0x59D4,0x59B9,0x59AE,
-	0x59D1,0x59C6,0x59D0,0x59CD,0x59CB,0x59D3,0x59CA,0x59AF,
-	0x59B3,0x59D2,0x59C5,0x5B5F,0x5B64,0x5B63,0x5B97,0x5B9A,
-	0x5B98,0x5B9C,0x5B99,0x5B9B,0x5C1A,0x5C48,0x5C45,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C46,0x5CB7,0x5CA1,0x5CB8,0x5CA9,0x5CAB,0x5CB1,
-	0x5CB3,0x5E18,0x5E1A,0x5E16,0x5E15,0x5E1B,0x5E11,0x5E78,
-	0x5E9A,0x5E97,0x5E9C,0x5E95,0x5E96,0x5EF6,0x5F26,0x5F27,
-	0x5F29,0x5F80,0x5F81,0x5F7F,0x5F7C,0x5FDD,0x5FE0,0x5FFD,
-	0x5FF5,0x5FFF,0x600F,0x6014,0x602F,0x6035,0x6016,0x602A,
-	0x6015,0x6021,0x6027,0x6029,0x602B,0x601B,0x6216,0x6215,
-	0x623F,0x623E,0x6240,0x627F,0x62C9,0x62CC,0x62C4,0x62BF,
-	0x62C2,0x62B9,0x62D2,0x62DB,0x62AB,0x62D3,0x62D4,0x62CB,
-	0x62C8,0x62A8,0x62BD,0x62BC,0x62D0,0x62D9,0x62C7,0x62CD,
-	0x62B5,0x62DA,0x62B1,0x62D8,0x62D6,0x62D7,0x62C6,0x62AC,
-	0x62CE,0x653E,0x65A7,0x65BC,0x65FA,0x6614,0x6613,0x660C,
-	0x6606,0x6602,0x660E,0x6600,0x660F,0x6615,0x660A,INVALC,
-	/* Block 171, Array index 0x0A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6607,0x670D,0x670B,0x676D,0x678B,0x6795,0x6771,0x679C,
-	0x6773,0x6777,0x6787,0x679D,0x6797,0x676F,0x6770,0x677F,
-	0x6789,0x677E,0x6790,0x6775,0x679A,0x6793,0x677C,0x676A,
-	0x6772,0x6B23,0x6B66,0x6B67,0x6B7F,0x6C13,0x6C1B,0x6CE3,
-	0x6CE8,0x6CF3,0x6CB1,0x6CCC,0x6CE5,0x6CB3,0x6CBD,0x6CBE,
-	0x6CBC,0x6CE2,0x6CAB,0x6CD5,0x6CD3,0x6CB8,0x6CC4,0x6CB9,
-	0x6CC1,0x6CAE,0x6CD7,0x6CC5,0x6CF1,0x6CBF,0x6CBB,0x6CE1,
-	0x6CDB,0x6CCA,0x6CAC,0x6CEF,0x6CDC,0x6CD6,0x6CE0,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7095,0x708E,0x7092,0x708A,0x7099,0x722C,0x722D,
-	0x7238,0x7248,0x7267,0x7269,0x72C0,0x72CE,0x72D9,0x72D7,
-	0x72D0,0x73A9,0x73A8,0x739F,0x73AB,0x73A5,0x753D,0x759D,
-	0x7599,0x759A,0x7684,0x76C2,0x76F2,0x76F4,0x77E5,0x77FD,
-	0x793E,0x7940,0x7941,0x79C9,0x79C8,0x7A7A,0x7A79,0x7AFA,
-	0x7CFE,0x7F54,0x7F8C,0x7F8B,0x8005,0x80BA,0x80A5,0x80A2,
-	0x80B1,0x80A1,0x80AB,0x80A9,0x80B4,0x80AA,0x80AF,0x81E5,
-	0x81FE,0x820D,0x82B3,0x829D,0x8299,0x82AD,0x82BD,0x829F,
-	0x82B9,0x82B1,0x82AC,0x82A5,0x82AF,0x82B8,0x82A3,0x82B0,
-	0x82BE,0x82B7,0x864E,0x8671,0x521D,0x8868,0x8ECB,0x8FCE,
-	0x8FD4,0x8FD1,0x90B5,0x90B8,0x90B1,0x90B6,0x91C7,0x91D1,
-	0x9577,0x9580,0x961C,0x9640,0x963F,0x963B,0x9644,INVALC,
-	/* Block 172, Array index 0x0B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x9642,0x96B9,0x96E8,0x9752,0x975E,0x4E9F,0x4EAD,0x4EAE,
-	0x4FE1,0x4FB5,0x4FAF,0x4FBF,0x4FE0,0x4FD1,0x4FCF,0x4FDD,
-	0x4FC3,0x4FB6,0x4FD8,0x4FDF,0x4FCA,0x4FD7,0x4FAE,0x4FD0,
-	0x4FC4,0x4FC2,0x4FDA,0x4FCE,0x4FDE,0x4FB7,0x5157,0x5192,
-	0x5191,0x51A0,0x524E,0x5243,0x524A,0x524D,0x524C,0x524B,
-	0x5247,0x52C7,0x52C9,0x52C3,0x52C1,0x530D,0x5357,0x537B,
-	0x539A,0x53DB,0x54AC,0x54C0,0x54A8,0x54CE,0x54C9,0x54B8,
-	0x54A6,0x54B3,0x54C7,0x54C2,0x54BD,0x54AA,0x54C1,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x54C4,0x54C8,0x54AF,0x54AB,0x54B1,0x54BB,0x54A9,
-	0x54A7,0x54BF,0x56FF,0x5782,0x578B,0x57A0,0x57A3,0x57A2,
-	0x57CE,0x57AE,0x5793,0x5955,0x5951,0x594F,0x594E,0x5950,
-	0x59DC,0x59D8,0x59FF,0x59E3,0x59E8,0x5A03,0x59E5,0x59EA,
-	0x59DA,0x59E6,0x5A01,0x59FB,0x5B69,0x5BA3,0x5BA6,0x5BA4,
-	0x5BA2,0x5BA5,0x5C01,0x5C4E,0x5C4F,0x5C4D,0x5C4B,0x5CD9,
-	0x5CD2,0x5DF7,0x5E1D,0x5E25,0x5E1F,0x5E7D,0x5EA0,0x5EA6,
-	0x5EFA,0x5F08,0x5F2D,0x5F65,0x5F88,0x5F85,0x5F8A,0x5F8B,
-	0x5F87,0x5F8C,0x5F89,0x6012,0x601D,0x6020,0x6025,0x600E,
-	0x6028,0x604D,0x6070,0x6068,0x6062,0x6046,0x6043,0x606C,
-	0x606B,0x606A,0x6064,0x6241,0x62DC,0x6316,0x6309,0x62FC,
-	0x62ED,0x6301,0x62EE,0x62FD,0x6307,0x62F1,0x62F7,INVALC,
-	/* Block 173, Array index 0x0C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x62EF,0x62EC,0x62FE,0x62F4,0x6311,0x6302,0x653F,0x6545,
-	0x65AB,0x65BD,0x65E2,0x6625,0x662D,0x6620,0x6627,0x662F,
-	0x661F,0x6628,0x6631,0x6624,0x66F7,0x67FF,0x67D3,0x67F1,
-	0x67D4,0x67D0,0x67EC,0x67B6,0x67AF,0x67F5,0x67E9,0x67EF,
-	0x67C4,0x67D1,0x67B4,0x67DA,0x67E5,0x67B8,0x67CF,0x67DE,
-	0x67F3,0x67B0,0x67D9,0x67E2,0x67DD,0x67D2,0x6B6A,0x6B83,
-	0x6B86,0x6BB5,0x6BD2,0x6BD7,0x6C1F,0x6CC9,0x6D0B,0x6D32,
-	0x6D2A,0x6D41,0x6D25,0x6D0C,0x6D31,0x6D1E,0x6D17,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6D3B,0x6D3D,0x6D3E,0x6D36,0x6D1B,0x6CF5,0x6D39,
-	0x6D27,0x6D38,0x6D29,0x6D2E,0x6D35,0x6D0E,0x6D2B,0x70AB,
-	0x70BA,0x70B3,0x70AC,0x70AF,0x70AD,0x70B8,0x70AE,0x70A4,
-	0x7230,0x7272,0x726F,0x7274,0x72E9,0x72E0,0x72E1,0x73B7,
-	0x73CA,0x73BB,0x73B2,0x73CD,0x73C0,0x73B3,0x751A,0x752D,
-	0x754F,0x754C,0x754E,0x754B,0x75AB,0x75A4,0x75A5,0x75A2,
-	0x75A3,0x7678,0x7686,0x7687,0x7688,0x76C8,0x76C6,0x76C3,
-	0x76C5,0x7701,0x76F9,0x76F8,0x7709,0x770B,0x76FE,0x76FC,
-	0x7707,0x77DC,0x7802,0x7814,0x780C,0x780D,0x7946,0x7949,
-	0x7948,0x7947,0x79B9,0x79BA,0x79D1,0x79D2,0x79CB,0x7A7F,
-	0x7A81,0x7AFF,0x7AFD,0x7C7D,0x7D02,0x7D05,0x7D00,0x7D09,
-	0x7D07,0x7D04,0x7D06,0x7F38,0x7F8E,0x7FBF,0x8004,INVALC,
-	/* Block 174, Array index 0x0D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8010,0x800D,0x8011,0x8036,0x80D6,0x80E5,0x80DA,0x80C3,
-	0x80C4,0x80CC,0x80E1,0x80DB,0x80CE,0x80DE,0x80E4,0x80DD,
-	0x81F4,0x8222,0x82E7,0x8303,0x8305,0x82E3,0x82DB,0x82E6,
-	0x8304,0x82E5,0x8302,0x8309,0x82D2,0x82D7,0x82F1,0x8301,
-	0x82DC,0x82D4,0x82D1,0x82DE,0x82D3,0x82DF,0x82EF,0x8306,
-	0x8650,0x8679,0x867B,0x867A,0x884D,0x886B,0x8981,0x89D4,
-	0x8A08,0x8A02,0x8A03,0x8C9E,0x8CA0,0x8D74,0x8D73,0x8DB4,
-	0x8ECD,0x8ECC,0x8FF0,0x8FE6,0x8FE2,0x8FEA,0x8FE5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8FED,0x8FEB,0x8FE4,0x8FE8,0x90CA,0x90CE,0x90C1,
-	0x90C3,0x914B,0x914A,0x91CD,0x9582,0x9650,0x964B,0x964C,
-	0x964D,0x9762,0x9769,0x97CB,0x97ED,0x97F3,0x9801,0x98A8,
-	0x98DB,0x98DF,0x9996,0x9999,0x4E58,0x4EB3,0x500C,0x500D,
-	0x5023,0x4FEF,0x5026,0x5025,0x4FF8,0x5029,0x5016,0x5006,
-	0x503C,0x501F,0x501A,0x5012,0x5011,0x4FFA,0x5000,0x5014,
-	0x5028,0x4FF1,0x5021,0x500B,0x5019,0x5018,0x4FF3,0x4FEE,
-	0x502D,0x502A,0x4FFE,0x502B,0x5009,0x517C,0x51A4,0x51A5,
-	0x51A2,0x51CD,0x51CC,0x51C6,0x51CB,0x5256,0x525C,0x5254,
-	0x525B,0x525D,0x532A,0x537F,0x539F,0x539D,0x53DF,0x54E8,
-	0x5510,0x5501,0x5537,0x54FC,0x54E5,0x54F2,0x5506,0x54FA,
-	0x5514,0x54E9,0x54ED,0x54E1,0x5509,0x54EE,0x54EA,INVALC,
-	/* Block 175, Array index 0x0E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x54E6,0x5527,0x5507,0x54FD,0x550F,0x5703,0x5704,0x57C2,
-	0x57D4,0x57CB,0x57C3,0x5809,0x590F,0x5957,0x5958,0x595A,
-	0x5A11,0x5A18,0x5A1C,0x5A1F,0x5A1B,0x5A13,0x59EC,0x5A20,
-	0x5A23,0x5A29,0x5A25,0x5A0C,0x5A09,0x5B6B,0x5C58,0x5BB0,
-	0x5BB3,0x5BB6,0x5BB4,0x5BAE,0x5BB5,0x5BB9,0x5BB8,0x5C04,
-	0x5C51,0x5C55,0x5C50,0x5CED,0x5CFD,0x5CFB,0x5CEA,0x5CE8,
-	0x5CF0,0x5CF6,0x5D01,0x5CF4,0x5DEE,0x5E2D,0x5E2B,0x5EAB,
-	0x5EAD,0x5EA7,0x5F31,0x5F92,0x5F91,0x5F90,0x6059,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6063,0x6065,0x6050,0x6055,0x606D,0x6069,0x606F,
-	0x6084,0x609F,0x609A,0x608D,0x6094,0x608C,0x6085,0x6096,
-	0x6247,0x62F3,0x6308,0x62FF,0x634E,0x633E,0x632F,0x6355,
-	0x6342,0x6346,0x634F,0x6349,0x633A,0x6350,0x633D,0x632A,
-	0x632B,0x6328,0x634D,0x634C,0x6548,0x6549,0x6599,0x65C1,
-	0x65C5,0x6642,0x6649,0x664F,0x6643,0x6652,0x664C,0x6645,
-	0x6641,0x66F8,0x6714,0x6715,0x6717,0x6821,0x6838,0x6848,
-	0x6846,0x6853,0x6839,0x6842,0x6854,0x6829,0x68B3,0x6817,
-	0x684C,0x6851,0x683D,0x67F4,0x6850,0x6840,0x683C,0x6843,
-	0x682A,0x6845,0x6813,0x6818,0x6841,0x6B8A,0x6B89,0x6BB7,
-	0x6C23,0x6C27,0x6C28,0x6C26,0x6C24,0x6CF0,0x6D6A,0x6D95,
-	0x6D88,0x6D87,0x6D66,0x6D78,0x6D77,0x6D59,0x6D93,INVALC,
-	/* Block 176, Array index 0x0F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6D6C,0x6D89,0x6D6E,0x6D5A,0x6D74,0x6D69,0x6D8C,0x6D8A,
-	0x6D79,0x6D85,0x6D65,0x6D94,0x70CA,0x70D8,0x70E4,0x70D9,
-	0x70C8,0x70CF,0x7239,0x7279,0x72FC,0x72F9,0x72FD,0x72F8,
-	0x72F7,0x7386,0x73ED,0x7409,0x73EE,0x73E0,0x73EA,0x73DE,
-	0x7554,0x755D,0x755C,0x755A,0x7559,0x75BE,0x75C5,0x75C7,
-	0x75B2,0x75B3,0x75BD,0x75BC,0x75B9,0x75C2,0x75B8,0x768B,
-	0x76B0,0x76CA,0x76CD,0x76CE,0x7729,0x771F,0x7720,0x7728,
-	0x77E9,0x7830,0x7827,0x7838,0x781D,0x7834,0x7837,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7825,0x782D,0x7820,0x781F,0x7832,0x7955,0x7950,
-	0x7960,0x795F,0x7956,0x795E,0x795D,0x7957,0x795A,0x79E4,
-	0x79E3,0x79E7,0x79DF,0x79E6,0x79E9,0x79D8,0x7A84,0x7A88,
-	0x7AD9,0x7B06,0x7B11,0x7C89,0x7D21,0x7D17,0x7D0B,0x7D0A,
-	0x7D20,0x7D22,0x7D14,0x7D10,0x7D15,0x7D1A,0x7D1C,0x7D0D,
-	0x7D19,0x7D1B,0x7F3A,0x7F5F,0x7F94,0x7FC5,0x7FC1,0x8006,
-	0x8018,0x8015,0x8019,0x8017,0x803D,0x803F,0x80F1,0x8102,
-	0x80F0,0x8105,0x80ED,0x80F4,0x8106,0x80F8,0x80F3,0x8108,
-	0x80FD,0x810A,0x80FC,0x80EF,0x81ED,0x81EC,0x8200,0x8210,
-	0x822A,0x822B,0x8228,0x822C,0x82BB,0x832B,0x8352,0x8354,
-	0x834A,0x8338,0x8350,0x8349,0x8335,0x8334,0x834F,0x8332,
-	0x8339,0x8336,0x8317,0x8340,0x8331,0x8328,0x8343,INVALC,
-	/* Block 177, Array index 0x1000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8654,0x868A,0x86AA,0x8693,0x86A4,0x86A9,0x868C,0x86A3,
-	0x869C,0x8870,0x8877,0x8881,0x8882,0x887D,0x8879,0x8A18,
-	0x8A10,0x8A0E,0x8A0C,0x8A15,0x8A0A,0x8A17,0x8A13,0x8A16,
-	0x8A0F,0x8A11,0x8C48,0x8C7A,0x8C79,0x8CA1,0x8CA2,0x8D77,
-	0x8EAC,0x8ED2,0x8ED4,0x8ECF,0x8FB1,0x9001,0x9006,0x8FF7,
-	0x9000,0x8FFA,0x8FF4,0x9003,0x8FFD,0x9005,0x8FF8,0x9095,
-	0x90E1,0x90DD,0x90E2,0x9152,0x914D,0x914C,0x91D8,0x91DD,
-	0x91D7,0x91DC,0x91D9,0x9583,0x9662,0x9663,0x9661,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x965B,0x965D,0x9664,0x9658,0x965E,0x96BB,0x98E2,
-	0x99AC,0x9AA8,0x9AD8,0x9B25,0x9B32,0x9B3C,0x4E7E,0x507A,
-	0x507D,0x505C,0x5047,0x5043,0x504C,0x505A,0x5049,0x5065,
-	0x5076,0x504E,0x5055,0x5075,0x5074,0x5077,0x504F,0x500F,
-	0x506F,0x506D,0x515C,0x5195,0x51F0,0x526A,0x526F,0x52D2,
-	0x52D9,0x52D8,0x52D5,0x5310,0x530F,0x5319,0x533F,0x5340,
-	0x533E,0x53C3,0x66FC,0x5546,0x556A,0x5566,0x5544,0x555E,
-	0x5561,0x5543,0x554A,0x5531,0x5556,0x554F,0x5555,0x552F,
-	0x5564,0x5538,0x552E,0x555C,0x552C,0x5563,0x5533,0x5541,
-	0x5557,0x5708,0x570B,0x5709,0x57DF,0x5805,0x580A,0x5806,
-	0x57E0,0x57E4,0x57FA,0x5802,0x5835,0x57F7,0x57F9,0x5920,
-	0x5962,0x5A36,0x5A41,0x5A49,0x5A66,0x5A6A,0x5A40,INVALC,
-	/* Block 178, Array index 0x1100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5A3C,0x5A62,0x5A5A,0x5A46,0x5A4A,0x5B70,0x5BC7,0x5BC5,
-	0x5BC4,0x5BC2,0x5BBF,0x5BC6,0x5C09,0x5C08,0x5C07,0x5C60,
-	0x5C5C,0x5C5D,0x5D07,0x5D06,0x5D0E,0x5D1B,0x5D16,0x5D22,
-	0x5D11,0x5D29,0x5D14,0x5D19,0x5D24,0x5D27,0x5D17,0x5DE2,
-	0x5E38,0x5E36,0x5E33,0x5E37,0x5EB7,0x5EB8,0x5EB6,0x5EB5,
-	0x5EBE,0x5F35,0x5F37,0x5F57,0x5F6C,0x5F69,0x5F6B,0x5F97,
-	0x5F99,0x5F9E,0x5F98,0x5FA1,0x5FA0,0x5F9C,0x607F,0x60A3,
-	0x6089,0x60A0,0x60A8,0x60CB,0x60B4,0x60E6,0x60BD,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x60C5,0x60BB,0x60B5,0x60DC,0x60BC,0x60D8,0x60D5,
-	0x60C6,0x60DF,0x60B8,0x60DA,0x60C7,0x621A,0x621B,0x6248,
-	0x63A0,0x63A7,0x6372,0x6396,0x63A2,0x63A5,0x6377,0x6367,
-	0x6398,0x63AA,0x6371,0x63A9,0x6389,0x6383,0x639B,0x636B,
-	0x63A8,0x6384,0x6388,0x6399,0x63A1,0x63AC,0x6392,0x638F,
-	0x6380,0x637B,0x6369,0x6368,0x637A,0x655D,0x6556,0x6551,
-	0x6559,0x6557,0x555F,0x654F,0x6558,0x6555,0x6554,0x659C,
-	0x659B,0x65AC,0x65CF,0x65CB,0x65CC,0x65CE,0x665D,0x665A,
-	0x6664,0x6668,0x6666,0x665E,0x66F9,0x52D7,0x671B,0x6881,
-	0x68AF,0x68A2,0x6893,0x68B5,0x687F,0x6876,0x68B1,0x68A7,
-	0x6897,0x68B0,0x6883,0x68C4,0x68AD,0x6886,0x6885,0x6894,
-	0x689D,0x68A8,0x689F,0x68A1,0x6882,0x6B32,0x6BBA,INVALC,
-	/* Block 179, Array index 0x1200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6BEB,0x6BEC,0x6C2B,0x6D8E,0x6DBC,0x6DF3,0x6DD9,0x6DB2,
-	0x6DE1,0x6DCC,0x6DE4,0x6DFB,0x6DFA,0x6E05,0x6DC7,0x6DCB,
-	0x6DAF,0x6DD1,0x6DAE,0x6DDE,0x6DF9,0x6DB8,0x6DF7,0x6DF5,
-	0x6DC5,0x6DD2,0x6E1A,0x6DB5,0x6DDA,0x6DEB,0x6DD8,0x6DEA,
-	0x6DF1,0x6DEE,0x6DE8,0x6DC6,0x6DC4,0x6DAA,0x6DEC,0x6DBF,
-	0x6DE6,0x70F9,0x7109,0x710A,0x70FD,0x70EF,0x723D,0x727D,
-	0x7281,0x731C,0x731B,0x7316,0x7313,0x7319,0x7387,0x7405,
-	0x740A,0x7403,0x7406,0x73FE,0x740D,0x74E0,0x74F6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x74F7,0x751C,0x7522,0x7565,0x7566,0x7562,0x7570,
-	0x758F,0x75D4,0x75D5,0x75B5,0x75CA,0x75CD,0x768E,0x76D4,
-	0x76D2,0x76DB,0x7737,0x773E,0x773C,0x7736,0x7738,0x773A,
-	0x786B,0x7843,0x784E,0x7965,0x7968,0x796D,0x79FB,0x7A92,
-	0x7A95,0x7B20,0x7B28,0x7B1B,0x7B2C,0x7B26,0x7B19,0x7B1E,
-	0x7B2E,0x7C92,0x7C97,0x7C95,0x7D46,0x7D43,0x7D71,0x7D2E,
-	0x7D39,0x7D3C,0x7D40,0x7D30,0x7D33,0x7D44,0x7D2F,0x7D42,
-	0x7D32,0x7D31,0x7F3D,0x7F9E,0x7F9A,0x7FCC,0x7FCE,0x7FD2,
-	0x801C,0x804A,0x8046,0x812F,0x8116,0x8123,0x812B,0x8129,
-	0x8130,0x8124,0x8202,0x8235,0x8237,0x8236,0x8239,0x838E,
-	0x839E,0x8398,0x8378,0x83A2,0x8396,0x83BD,0x83AB,0x8392,
-	0x838A,0x8393,0x8389,0x83A0,0x8377,0x837B,0x837C,INVALC,
-	/* Block 180, Array index 0x1300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8386,0x83A7,0x8655,0x5F6A,0x86C7,0x86C0,0x86B6,0x86C4,
-	0x86B5,0x86C6,0x86CB,0x86B1,0x86AF,0x86C9,0x8853,0x889E,
-	0x8888,0x88AB,0x8892,0x8896,0x888D,0x888B,0x8993,0x898F,
-	0x8A2A,0x8A1D,0x8A23,0x8A25,0x8A31,0x8A2D,0x8A1F,0x8A1B,
-	0x8A22,0x8C49,0x8C5A,0x8CA9,0x8CAC,0x8CAB,0x8CA8,0x8CAA,
-	0x8CA7,0x8D67,0x8D66,0x8DBE,0x8DBA,0x8EDB,0x8EDF,0x9019,
-	0x900D,0x901A,0x9017,0x9023,0x901F,0x901D,0x9010,0x9015,
-	0x901E,0x9020,0x900F,0x9022,0x9016,0x901B,0x9014,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x90E8,0x90ED,0x90FD,0x9157,0x91CE,0x91F5,0x91E6,
-	0x91E3,0x91E7,0x91ED,0x91E9,0x9589,0x966A,0x9675,0x9673,
-	0x9678,0x9670,0x9674,0x9676,0x9677,0x966C,0x96C0,0x96EA,
-	0x96E9,0x7AE0,0x7ADF,0x9802,0x9803,0x9B5A,0x9CE5,0x9E75,
-	0x9E7F,0x9EA5,0x9EBB,0x50A2,0x508D,0x5085,0x5099,0x5091,
-	0x5080,0x5096,0x5098,0x509A,0x6700,0x51F1,0x5272,0x5274,
-	0x5275,0x5269,0x52DE,0x52DD,0x52DB,0x535A,0x53A5,0x557B,
-	0x5580,0x55A7,0x557C,0x558A,0x559D,0x5598,0x5582,0x559C,
-	0x55AA,0x5594,0x5587,0x558B,0x5583,0x55B3,0x55AE,0x559F,
-	0x553E,0x55B2,0x559A,0x55BB,0x55AC,0x55B1,0x557E,0x5589,
-	0x55AB,0x5599,0x570D,0x582F,0x582A,0x5834,0x5824,0x5830,
-	0x5831,0x5821,0x581D,0x5820,0x58F9,0x58FA,0x5960,INVALC,
-	/* Block 181, Array index 0x1400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5A77,0x5A9A,0x5A7F,0x5A92,0x5A9B,0x5AA7,0x5B73,0x5B71,
-	0x5BD2,0x5BCC,0x5BD3,0x5BD0,0x5C0A,0x5C0B,0x5C31,0x5D4C,
-	0x5D50,0x5D34,0x5D47,0x5DFD,0x5E45,0x5E3D,0x5E40,0x5E43,
-	0x5E7E,0x5ECA,0x5EC1,0x5EC2,0x5EC4,0x5F3C,0x5F6D,0x5FA9,
-	0x5FAA,0x5FA8,0x60D1,0x60E1,0x60B2,0x60B6,0x60E0,0x611C,
-	0x6123,0x60FA,0x6115,0x60F0,0x60FB,0x60F4,0x6168,0x60F1,
-	0x610E,0x60F6,0x6109,0x6100,0x6112,0x621F,0x6249,0x63A3,
-	0x638C,0x63CF,0x63C0,0x63E9,0x63C9,0x63C6,0x63CD,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x63D2,0x63E3,0x63D0,0x63E1,0x63D6,0x63ED,0x63EE,
-	0x6376,0x63F4,0x63EA,0x63DB,0x6452,0x63DA,0x63F9,0x655E,
-	0x6566,0x6562,0x6563,0x6591,0x6590,0x65AF,0x666E,0x6670,
-	0x6674,0x6676,0x666F,0x6691,0x667A,0x667E,0x6677,0x66FE,
-	0x66FF,0x671F,0x671D,0x68FA,0x68D5,0x68E0,0x68D8,0x68D7,
-	0x6905,0x68DF,0x68F5,0x68EE,0x68E7,0x68F9,0x68D2,0x68F2,
-	0x68E3,0x68CB,0x68CD,0x690D,0x6912,0x690E,0x68C9,0x68DA,
-	0x696E,0x68FB,0x6B3E,0x6B3A,0x6B3D,0x6B98,0x6B96,0x6BBC,
-	0x6BEF,0x6C2E,0x6C2F,0x6C2C,0x6E2F,0x6E38,0x6E54,0x6E21,
-	0x6E32,0x6E67,0x6E4A,0x6E20,0x6E25,0x6E23,0x6E1B,0x6E5B,
-	0x6E58,0x6E24,0x6E56,0x6E6E,0x6E2D,0x6E26,0x6E6F,0x6E34,
-	0x6E4D,0x6E3A,0x6E2C,0x6E43,0x6E1D,0x6E3E,0x6ECB,INVALC,
-	/* Block 182, Array index 0x1500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6E89,0x6E19,0x6E4E,0x6E63,0x6E44,0x6E72,0x6E69,0x6E5F,
-	0x7119,0x711A,0x7126,0x7130,0x7121,0x7136,0x716E,0x711C,
-	0x724C,0x7284,0x7280,0x7336,0x7325,0x7334,0x7329,0x743A,
-	0x742A,0x7433,0x7422,0x7425,0x7435,0x7436,0x7434,0x742F,
-	0x741B,0x7426,0x7428,0x7525,0x7526,0x756B,0x756A,0x75E2,
-	0x75DB,0x75E3,0x75D9,0x75D8,0x75DE,0x75E0,0x767B,0x767C,
-	0x7696,0x7693,0x76B4,0x76DC,0x774F,0x77ED,0x785D,0x786C,
-	0x786F,0x7A0D,0x7A08,0x7A0B,0x7A05,0x7A00,0x7A98,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7A97,0x7A96,0x7AE5,0x7AE3,0x7B49,0x7B56,0x7B46,
-	0x7B50,0x7B52,0x7B54,0x7B4D,0x7B4B,0x7B4F,0x7B51,0x7C9F,
-	0x7CA5,0x7D5E,0x7D50,0x7D68,0x7D55,0x7D2B,0x7D6E,0x7D72,
-	0x7D61,0x7D66,0x7D62,0x7D70,0x7D73,0x5584,0x7FD4,0x7FD5,
-	0x800B,0x8052,0x8085,0x8155,0x8154,0x814B,0x8151,0x814E,
-	0x8139,0x8146,0x813E,0x814C,0x8153,0x8174,0x8212,0x821C,
-	0x83E9,0x8403,0x83F8,0x840D,0x83E0,0x83C5,0x840B,0x83C1,
-	0x83EF,0x83F1,0x83F4,0x8457,0x840A,0x83F0,0x840C,0x83CC,
-	0x83FD,0x83F2,0x83CA,0x8438,0x840E,0x8404,0x83DC,0x8407,
-	0x83D4,0x83DF,0x865B,0x86DF,0x86D9,0x86ED,0x86D4,0x86DB,
-	0x86E4,0x86D0,0x86DE,0x8857,0x88C1,0x88C2,0x88B1,0x8983,
-	0x8996,0x8A3B,0x8A60,0x8A55,0x8A5E,0x8A3C,0x8A41,INVALC,
-	/* Block 183, Array index 0x1600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8A54,0x8A5B,0x8A50,0x8A46,0x8A34,0x8A3A,0x8A36,0x8A56,
-	0x8C61,0x8C82,0x8CAF,0x8CBC,0x8CB3,0x8CBD,0x8CC1,0x8CBB,
-	0x8CC0,0x8CB4,0x8CB7,0x8CB6,0x8CBF,0x8CB8,0x8D8A,0x8D85,
-	0x8D81,0x8DCE,0x8DDD,0x8DCB,0x8DDA,0x8DD1,0x8DCC,0x8DDB,
-	0x8DC6,0x8EFB,0x8EF8,0x8EFC,0x8F9C,0x902E,0x9035,0x9031,
-	0x9038,0x9032,0x9036,0x9102,0x90F5,0x9109,0x90FE,0x9163,
-	0x9165,0x91CF,0x9214,0x9215,0x9223,0x9209,0x921E,0x920D,
-	0x9210,0x9207,0x9211,0x9594,0x958F,0x958B,0x9591,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9593,0x9592,0x958E,0x968A,0x968E,0x968B,0x967D,
-	0x9685,0x9686,0x968D,0x9672,0x9684,0x96C1,0x96C5,0x96C4,
-	0x96C6,0x96C7,0x96EF,0x96F2,0x97CC,0x9805,0x9806,0x9808,
-	0x98E7,0x98EA,0x98EF,0x98E9,0x98F2,0x98ED,0x99AE,0x99AD,
-	0x9EC3,0x9ECD,0x9ED1,0x4E82,0x50AD,0x50B5,0x50B2,0x50B3,
-	0x50C5,0x50BE,0x50AC,0x50B7,0x50BB,0x50AF,0x50C7,0x527F,
-	0x5277,0x527D,0x52DF,0x52E6,0x52E4,0x52E2,0x52E3,0x532F,
-	0x55DF,0x55E8,0x55D3,0x55E6,0x55CE,0x55DC,0x55C7,0x55D1,
-	0x55E3,0x55E4,0x55EF,0x55DA,0x55E1,0x55C5,0x55C6,0x55E5,
-	0x55C9,0x5712,0x5713,0x585E,0x5851,0x5858,0x5857,0x585A,
-	0x5854,0x586B,0x584C,0x586D,0x584A,0x5862,0x5852,0x584B,
-	0x5967,0x5AC1,0x5AC9,0x5ACC,0x5ABE,0x5ABD,0x5ABC,INVALC,
-	/* Block 184, Array index 0x1700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5AB3,0x5AC2,0x5AB2,0x5D69,0x5D6F,0x5E4C,0x5E79,0x5EC9,
-	0x5EC8,0x5F12,0x5F59,0x5FAC,0x5FAE,0x611A,0x610F,0x6148,
-	0x611F,0x60F3,0x611B,0x60F9,0x6101,0x6108,0x614E,0x614C,
-	0x6144,0x614D,0x613E,0x6134,0x6127,0x610D,0x6106,0x6137,
-	0x6221,0x6222,0x6413,0x643E,0x641E,0x642A,0x642D,0x643D,
-	0x642C,0x640F,0x641C,0x6414,0x640D,0x6436,0x6416,0x6417,
-	0x6406,0x656C,0x659F,0x65B0,0x6697,0x6689,0x6687,0x6688,
-	0x6696,0x6684,0x6698,0x668D,0x6703,0x6994,0x696D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x695A,0x6977,0x6960,0x6954,0x6975,0x6930,0x6982,
-	0x694A,0x6968,0x696B,0x695E,0x6953,0x6979,0x6986,0x695D,
-	0x6963,0x695B,0x6B47,0x6B72,0x6BC0,0x6BBF,0x6BD3,0x6BFD,
-	0x6EA2,0x6EAF,0x6ED3,0x6EB6,0x6EC2,0x6E90,0x6E9D,0x6EC7,
-	0x6EC5,0x6EA5,0x6E98,0x6EBC,0x6EBA,0x6EAB,0x6ED1,0x6E96,
-	0x6E9C,0x6EC4,0x6ED4,0x6EAA,0x6EA7,0x6EB4,0x714E,0x7159,
-	0x7169,0x7164,0x7149,0x7167,0x715C,0x716C,0x7166,0x714C,
-	0x7165,0x715E,0x7146,0x7168,0x7156,0x723A,0x7252,0x7337,
-	0x7345,0x733F,0x733E,0x746F,0x745A,0x7455,0x745F,0x745E,
-	0x7441,0x743F,0x7459,0x745B,0x745C,0x7576,0x7578,0x7600,
-	0x75F0,0x7601,0x75F2,0x75F1,0x75FA,0x75FF,0x75F4,0x75F3,
-	0x76DE,0x76DF,0x775B,0x776B,0x7766,0x775E,0x7763,INVALC,
-	/* Block 185, Array index 0x1800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7779,0x776A,0x776C,0x775C,0x7765,0x7768,0x7762,0x77EE,
-	0x788E,0x78B0,0x7897,0x7898,0x788C,0x7889,0x787C,0x7891,
-	0x7893,0x787F,0x797A,0x797F,0x7981,0x842C,0x79BD,0x7A1C,
-	0x7A1A,0x7A20,0x7A14,0x7A1F,0x7A1E,0x7A9F,0x7AA0,0x7B77,
-	0x7BC0,0x7B60,0x7B6E,0x7B67,0x7CB1,0x7CB3,0x7CB5,0x7D93,
-	0x7D79,0x7D91,0x7D81,0x7D8F,0x7D5B,0x7F6E,0x7F69,0x7F6A,
-	0x7F72,0x7FA9,0x7FA8,0x7FA4,0x8056,0x8058,0x8086,0x8084,
-	0x8171,0x8170,0x8178,0x8165,0x816E,0x8173,0x816B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8179,0x817A,0x8166,0x8205,0x8247,0x8482,0x8477,
-	0x843D,0x8431,0x8475,0x8466,0x846B,0x8449,0x846C,0x845B,
-	0x843C,0x8435,0x8461,0x8463,0x8469,0x846D,0x8446,0x865E,
-	0x865C,0x865F,0x86F9,0x8713,0x8708,0x8707,0x8700,0x86FE,
-	0x86FB,0x8702,0x8703,0x8706,0x870A,0x8859,0x88DF,0x88D4,
-	0x88D9,0x88DC,0x88D8,0x88DD,0x88E1,0x88CA,0x88D5,0x88D2,
-	0x899C,0x89E3,0x8A6B,0x8A72,0x8A73,0x8A66,0x8A69,0x8A70,
-	0x8A87,0x8A7C,0x8A63,0x8AA0,0x8A71,0x8A85,0x8A6D,0x8A62,
-	0x8A6E,0x8A6C,0x8A79,0x8A7B,0x8A3E,0x8A68,0x8C62,0x8C8A,
-	0x8C89,0x8CCA,0x8CC7,0x8CC8,0x8CC4,0x8CB2,0x8CC3,0x8CC2,
-	0x8CC5,0x8DE1,0x8DDF,0x8DE8,0x8DEF,0x8DF3,0x8DFA,0x8DEA,
-	0x8DE4,0x8DE6,0x8EB2,0x8F03,0x8F09,0x8EFE,0x8F0A,INVALC,
-	/* Block 186, Array index 0x1900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8F9F,0x8FB2,0x904B,0x904A,0x9053,0x9042,0x9054,0x903C,
-	0x9055,0x9050,0x9047,0x904F,0x904E,0x904D,0x9051,0x903E,
-	0x9041,0x9112,0x9117,0x916C,0x916A,0x9169,0x91C9,0x9237,
-	0x9257,0x9238,0x923D,0x9240,0x923E,0x925B,0x924B,0x9264,
-	0x9251,0x9234,0x9249,0x924D,0x9245,0x9239,0x923F,0x925A,
-	0x9598,0x9698,0x9694,0x9695,0x96CD,0x96CB,0x96C9,0x96CA,
-	0x96F7,0x96FB,0x96F9,0x96F6,0x9756,0x9774,0x9776,0x9810,
-	0x9811,0x9813,0x980A,0x9812,0x980C,0x98FC,0x98F4,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x98FD,0x98FE,0x99B3,0x99B1,0x99B4,0x9AE1,0x9CE9,
-	0x9E82,0x9F0E,0x9F13,0x9F20,0x50E7,0x50EE,0x50E5,0x50D6,
-	0x50ED,0x50DA,0x50D5,0x50CF,0x50D1,0x50F1,0x50CE,0x50E9,
-	0x5162,0x51F3,0x5283,0x5282,0x5331,0x53AD,0x55FE,0x5600,
-	0x561B,0x5617,0x55FD,0x5614,0x5606,0x5609,0x560D,0x560E,
-	0x55F7,0x5616,0x561F,0x5608,0x5610,0x55F6,0x5718,0x5716,
-	0x5875,0x587E,0x5883,0x5893,0x588A,0x5879,0x5885,0x587D,
-	0x58FD,0x5925,0x5922,0x5924,0x596A,0x5969,0x5AE1,0x5AE6,
-	0x5AE9,0x5AD7,0x5AD6,0x5AD8,0x5AE3,0x5B75,0x5BDE,0x5BE7,
-	0x5BE1,0x5BE5,0x5BE6,0x5BE8,0x5BE2,0x5BE4,0x5BDF,0x5C0D,
-	0x5C62,0x5D84,0x5D87,0x5E5B,0x5E63,0x5E55,0x5E57,0x5E54,
-	0x5ED3,0x5ED6,0x5F0A,0x5F46,0x5F70,0x5FB9,0x6147,INVALC,
-	/* Block 187, Array index 0x1A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x613F,0x614B,0x6177,0x6162,0x6163,0x615F,0x615A,0x6158,
-	0x6175,0x622A,0x6487,0x6458,0x6454,0x64A4,0x6478,0x645F,
-	0x647A,0x6451,0x6467,0x6434,0x646D,0x647B,0x6572,0x65A1,
-	0x65D7,0x65D6,0x66A2,0x66A8,0x669D,0x699C,0x69A8,0x6995,
-	0x69C1,0x69AE,0x69D3,0x69CB,0x699B,0x69B7,0x69BB,0x69AB,
-	0x69B4,0x69D0,0x69CD,0x69AD,0x69CC,0x69A6,0x69C3,0x69A3,
-	0x6B49,0x6B4C,0x6C33,0x6F33,0x6F14,0x6EFE,0x6F13,0x6EF4,
-	0x6F29,0x6F3E,0x6F20,0x6F2C,0x6F0F,0x6F02,0x6F22,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6EFF,0x6EEF,0x6F06,0x6F31,0x6F38,0x6F32,0x6F23,
-	0x6F15,0x6F2B,0x6F2F,0x6F88,0x6F2A,0x6EEC,0x6F01,0x6EF2,
-	0x6ECC,0x6EF7,0x7194,0x7199,0x717D,0x718A,0x7184,0x7192,
-	0x723E,0x7292,0x7296,0x7344,0x7350,0x7464,0x7463,0x746A,
-	0x7470,0x746D,0x7504,0x7591,0x7627,0x760D,0x760B,0x7609,
-	0x7613,0x76E1,0x76E3,0x7784,0x777D,0x777F,0x7761,0x78C1,
-	0x789F,0x78A7,0x78B3,0x78A9,0x78A3,0x798E,0x798F,0x798D,
-	0x7A2E,0x7A31,0x7AAA,0x7AA9,0x7AED,0x7AEF,0x7BA1,0x7B95,
-	0x7B8B,0x7B75,0x7B97,0x7B9D,0x7B94,0x7B8F,0x7BB8,0x7B87,
-	0x7B84,0x7CB9,0x7CBD,0x7CBE,0x7DBB,0x7DB0,0x7D9C,0x7DBD,
-	0x7DBE,0x7DA0,0x7DCA,0x7DB4,0x7DB2,0x7DB1,0x7DBA,0x7DA2,
-	0x7DBF,0x7DB5,0x7DB8,0x7DAD,0x7DD2,0x7DC7,0x7DAC,INVALC,
-	/* Block 188, Array index 0x1B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7F70,0x7FE0,0x7FE1,0x7FDF,0x805E,0x805A,0x8087,0x8150,
-	0x8180,0x818F,0x8188,0x818A,0x817F,0x8182,0x81E7,0x81FA,
-	0x8207,0x8214,0x821E,0x824B,0x84C9,0x84BF,0x84C6,0x84C4,
-	0x8499,0x849E,0x84B2,0x849C,0x84CB,0x84B8,0x84C0,0x84D3,
-	0x8490,0x84BC,0x84D1,0x84CA,0x873F,0x871C,0x873B,0x8722,
-	0x8725,0x8734,0x8718,0x8755,0x8737,0x8729,0x88F3,0x8902,
-	0x88F4,0x88F9,0x88F8,0x88FD,0x88E8,0x891A,0x88EF,0x8AA6,
-	0x8A8C,0x8A9E,0x8AA3,0x8A8D,0x8AA1,0x8A93,0x8AA4,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8AAA,0x8AA5,0x8AA8,0x8A98,0x8A91,0x8A9A,0x8AA7,
-	0x8C6A,0x8C8D,0x8C8C,0x8CD3,0x8CD1,0x8CD2,0x8D6B,0x8D99,
-	0x8D95,0x8DFC,0x8F14,0x8F12,0x8F15,0x8F13,0x8FA3,0x9060,
-	0x9058,0x905C,0x9063,0x9059,0x905E,0x9062,0x905D,0x905B,
-	0x9119,0x9118,0x911E,0x9175,0x9178,0x9177,0x9174,0x9278,
-	0x9280,0x9285,0x9298,0x9296,0x927B,0x9293,0x929C,0x92A8,
-	0x927C,0x9291,0x95A1,0x95A8,0x95A9,0x95A3,0x95A5,0x95A4,
-	0x9699,0x969C,0x969B,0x96CC,0x96D2,0x9700,0x977C,0x9785,
-	0x97F6,0x9817,0x9818,0x98AF,0x98B1,0x9903,0x9905,0x990C,
-	0x9909,0x99C1,0x9AAF,0x9AB0,0x9AE6,0x9B41,0x9B42,0x9CF4,
-	0x9CF6,0x9CF3,0x9EBC,0x9F3B,0x9F4A,0x5104,0x5100,0x50FB,
-	0x50F5,0x50F9,0x5102,0x5108,0x5109,0x5105,0x51DC,INVALC,
-	/* Block 189, Array index 0x1C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5287,0x5288,0x5289,0x528D,0x528A,0x52F0,0x53B2,0x562E,
-	0x563B,0x5639,0x5632,0x563F,0x5634,0x5629,0x5653,0x564E,
-	0x5657,0x5674,0x5636,0x562F,0x5630,0x5880,0x589F,0x589E,
-	0x58B3,0x589C,0x58AE,0x58A9,0x58A6,0x596D,0x5B09,0x5AFB,
-	0x5B0B,0x5AF5,0x5B0C,0x5B08,0x5BEE,0x5BEC,0x5BE9,0x5BEB,
-	0x5C64,0x5C65,0x5D9D,0x5D94,0x5E62,0x5E5F,0x5E61,0x5EE2,
-	0x5EDA,0x5EDF,0x5EDD,0x5EE3,0x5EE0,0x5F48,0x5F71,0x5FB7,
-	0x5FB5,0x6176,0x6167,0x616E,0x615D,0x6155,0x6182,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x617C,0x6170,0x616B,0x617E,0x61A7,0x6190,0x61AB,
-	0x618E,0x61AC,0x619A,0x61A4,0x6194,0x61AE,0x622E,0x6469,
-	0x646F,0x6479,0x649E,0x64B2,0x6488,0x6490,0x64B0,0x64A5,
-	0x6493,0x6495,0x64A9,0x6492,0x64AE,0x64AD,0x64AB,0x649A,
-	0x64AC,0x6499,0x64A2,0x64B3,0x6575,0x6577,0x6578,0x66AE,
-	0x66AB,0x66B4,0x66B1,0x6A23,0x6A1F,0x69E8,0x6A01,0x6A1E,
-	0x6A19,0x69FD,0x6A21,0x6A13,0x6A0A,0x69F3,0x6A02,0x6A05,
-	0x69ED,0x6A11,0x6B50,0x6B4E,0x6BA4,0x6BC5,0x6BC6,0x6F3F,
-	0x6F7C,0x6F84,0x6F51,0x6F66,0x6F54,0x6F86,0x6F6D,0x6F5B,
-	0x6F78,0x6F6E,0x6F8E,0x6F7A,0x6F70,0x6F64,0x6F97,0x6F58,
-	0x6ED5,0x6F6F,0x6F60,0x6F5F,0x719F,0x71AC,0x71B1,0x71A8,
-	0x7256,0x729B,0x734E,0x7357,0x7469,0x748B,0x7483,INVALC,
-	/* Block 190, Array index 0x1D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x747E,0x7480,0x757F,0x7620,0x7629,0x761F,0x7624,0x7626,
-	0x7621,0x7622,0x769A,0x76BA,0x76E4,0x778E,0x7787,0x778C,
-	0x7791,0x778B,0x78CB,0x78C5,0x78BA,0x78CA,0x78BE,0x78D5,
-	0x78BC,0x78D0,0x7A3F,0x7A3C,0x7A40,0x7A3D,0x7A37,0x7A3B,
-	0x7AAF,0x7AAE,0x7BAD,0x7BB1,0x7BC4,0x7BB4,0x7BC6,0x7BC7,
-	0x7BC1,0x7BA0,0x7BCC,0x7CCA,0x7DE0,0x7DF4,0x7DEF,0x7DFB,
-	0x7DD8,0x7DEC,0x7DDD,0x7DE8,0x7DE3,0x7DDA,0x7DDE,0x7DE9,
-	0x7D9E,0x7DD9,0x7DF2,0x7DF9,0x7F75,0x7F77,0x7FAF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7FE9,0x8026,0x819B,0x819C,0x819D,0x81A0,0x819A,
-	0x8198,0x8517,0x853D,0x851A,0x84EE,0x852C,0x852D,0x8513,
-	0x8511,0x8523,0x8521,0x8514,0x84EC,0x8525,0x84FF,0x8506,
-	0x8782,0x8774,0x8776,0x8760,0x8766,0x8778,0x8768,0x8759,
-	0x8757,0x874C,0x8753,0x885B,0x885D,0x8910,0x8907,0x8912,
-	0x8913,0x8915,0x890A,0x8ABC,0x8AD2,0x8AC7,0x8AC4,0x8A95,
-	0x8ACB,0x8AF8,0x8AB2,0x8AC9,0x8AC2,0x8ABF,0x8AB0,0x8AD6,
-	0x8ACD,0x8AB6,0x8AB9,0x8ADB,0x8C4C,0x8C4E,0x8C6C,0x8CE0,
-	0x8CDE,0x8CE6,0x8CE4,0x8CEC,0x8CED,0x8CE2,0x8CE3,0x8CDC,
-	0x8CEA,0x8CE1,0x8D6D,0x8D9F,0x8DA3,0x8E2B,0x8E10,0x8E1D,
-	0x8E22,0x8E0F,0x8E29,0x8E1F,0x8E21,0x8E1E,0x8EBA,0x8F1D,
-	0x8F1B,0x8F1F,0x8F29,0x8F26,0x8F2A,0x8F1C,0x8F1E,INVALC,
-	/* Block 191, Array index 0x1E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8F25,0x9069,0x906E,0x9068,0x906D,0x9077,0x9130,0x912D,
-	0x9127,0x9131,0x9187,0x9189,0x918B,0x9183,0x92C5,0x92BB,
-	0x92B7,0x92EA,0x92AC,0x92E4,0x92C1,0x92B3,0x92BC,0x92D2,
-	0x92C7,0x92F0,0x92B2,0x95AD,0x95B1,0x9704,0x9706,0x9707,
-	0x9709,0x9760,0x978D,0x978B,0x978F,0x9821,0x982B,0x981C,
-	0x98B3,0x990A,0x9913,0x9912,0x9918,0x99DD,0x99D0,0x99DF,
-	0x99DB,0x99D1,0x99D5,0x99D2,0x99D9,0x9AB7,0x9AEE,0x9AEF,
-	0x9B27,0x9B45,0x9B44,0x9B77,0x9B6F,0x9D06,0x9D09,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9D03,0x9EA9,0x9EBE,0x9ECE,0x58A8,0x9F52,0x5112,
-	0x5118,0x5114,0x5110,0x5115,0x5180,0x51AA,0x51DD,0x5291,
-	0x5293,0x52F3,0x5659,0x566B,0x5679,0x5669,0x5664,0x5678,
-	0x566A,0x5668,0x5665,0x5671,0x566F,0x566C,0x5662,0x5676,
-	0x58C1,0x58BE,0x58C7,0x58C5,0x596E,0x5B1D,0x5B34,0x5B78,
-	0x5BF0,0x5C0E,0x5F4A,0x61B2,0x6191,0x61A9,0x618A,0x61CD,
-	0x61B6,0x61BE,0x61CA,0x61C8,0x6230,0x64C5,0x64C1,0x64CB,
-	0x64BB,0x64BC,0x64DA,0x64C4,0x64C7,0x64C2,0x64CD,0x64BF,
-	0x64D2,0x64D4,0x64BE,0x6574,0x66C6,0x66C9,0x66B9,0x66C4,
-	0x66C7,0x66B8,0x6A3D,0x6A38,0x6A3A,0x6A59,0x6A6B,0x6A58,
-	0x6A39,0x6A44,0x6A62,0x6A61,0x6A4B,0x6A47,0x6A35,0x6A5F,
-	0x6A48,0x6B59,0x6B77,0x6C05,0x6FC2,0x6FB1,0x6FA1,INVALC,
-	/* Block 192, Array index 0x1F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6FC3,0x6FA4,0x6FC1,0x6FA7,0x6FB3,0x6FC0,0x6FB9,0x6FB6,
-	0x6FA6,0x6FA0,0x6FB4,0x71BE,0x71C9,0x71D0,0x71D2,0x71C8,
-	0x71D5,0x71B9,0x71CE,0x71D9,0x71DC,0x71C3,0x71C4,0x7368,
-	0x749C,0x74A3,0x7498,0x749F,0x749E,0x74E2,0x750C,0x750D,
-	0x7634,0x7638,0x763A,0x76E7,0x76E5,0x77A0,0x779E,0x779F,
-	0x77A5,0x78E8,0x78DA,0x78EC,0x78E7,0x79A6,0x7A4D,0x7A4E,
-	0x7A46,0x7A4C,0x7A4B,0x7ABA,0x7BD9,0x7C11,0x7BC9,0x7BE4,
-	0x7BDB,0x7BE1,0x7BE9,0x7BE6,0x7CD5,0x7CD6,0x7E0A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7E11,0x7E08,0x7E1B,0x7E23,0x7E1E,0x7E1D,0x7E09,
-	0x7E10,0x7F79,0x7FB2,0x7FF0,0x7FF1,0x7FEE,0x8028,0x81B3,
-	0x81A9,0x81A8,0x81FB,0x8208,0x8258,0x8259,0x854A,0x8559,
-	0x8548,0x8568,0x8569,0x8543,0x8549,0x856D,0x856A,0x855E,
-	0x8783,0x879F,0x879E,0x87A2,0x878D,0x8861,0x892A,0x8932,
-	0x8925,0x892B,0x8921,0x89AA,0x89A6,0x8AE6,0x8AFA,0x8AEB,
-	0x8AF1,0x8B00,0x8ADC,0x8AE7,0x8AEE,0x8AFE,0x8B01,0x8B02,
-	0x8AF7,0x8AED,0x8AF3,0x8AF6,0x8AFC,0x8C6B,0x8C6D,0x8C93,
-	0x8CF4,0x8E44,0x8E31,0x8E34,0x8E42,0x8E39,0x8E35,0x8F3B,
-	0x8F2F,0x8F38,0x8F33,0x8FA8,0x8FA6,0x9075,0x9074,0x9078,
-	0x9072,0x907C,0x907A,0x9134,0x9192,0x9320,0x9336,0x92F8,
-	0x9333,0x932F,0x9322,0x92FC,0x932B,0x9304,0x931A,INVALC,
-	/* Block 193, Array index 0x2000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x9310,0x9326,0x9321,0x9315,0x932E,0x9319,0x95BB,0x96A7,
-	0x96A8,0x96AA,0x96D5,0x970E,0x9711,0x9716,0x970D,0x9713,
-	0x970F,0x975B,0x975C,0x9766,0x9798,0x9830,0x9838,0x983B,
-	0x9837,0x982D,0x9839,0x9824,0x9910,0x9928,0x991E,0x991B,
-	0x9921,0x991A,0x99ED,0x99E2,0x99F1,0x9AB8,0x9ABC,0x9AFB,
-	0x9AED,0x9B28,0x9B91,0x9D15,0x9D23,0x9D26,0x9D28,0x9D12,
-	0x9D1B,0x9ED8,0x9ED4,0x9F8D,0x9F9C,0x512A,0x511F,0x5121,
-	0x5132,0x52F5,0x568E,0x5680,0x5690,0x5685,0x5687,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x568F,0x58D5,0x58D3,0x58D1,0x58CE,0x5B30,0x5B2A,
-	0x5B24,0x5B7A,0x5C37,0x5C68,0x5DBC,0x5DBA,0x5DBD,0x5DB8,
-	0x5E6B,0x5F4C,0x5FBD,0x61C9,0x61C2,0x61C7,0x61E6,0x61CB,
-	0x6232,0x6234,0x64CE,0x64CA,0x64D8,0x64E0,0x64F0,0x64E6,
-	0x64EC,0x64F1,0x64E2,0x64ED,0x6582,0x6583,0x66D9,0x66D6,
-	0x6A80,0x6A94,0x6A84,0x6AA2,0x6A9C,0x6ADB,0x6AA3,0x6A7E,
-	0x6A97,0x6A90,0x6AA0,0x6B5C,0x6BAE,0x6BDA,0x6C08,0x6FD8,
-	0x6FF1,0x6FDF,0x6FE0,0x6FDB,0x6FE4,0x6FEB,0x6FEF,0x6F80,
-	0x6FEC,0x6FE1,0x6FE9,0x6FD5,0x6FEE,0x6FF0,0x71E7,0x71DF,
-	0x71EE,0x71E6,0x71E5,0x71ED,0x71EC,0x71F4,0x71E0,0x7235,
-	0x7246,0x7370,0x7372,0x74A9,0x74B0,0x74A6,0x74A8,0x7646,
-	0x7642,0x764C,0x76EA,0x77B3,0x77AA,0x77B0,0x77AC,INVALC,
-	/* Block 194, Array index 0x2100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x77A7,0x77AD,0x77EF,0x78F7,0x78FA,0x78F4,0x78EF,0x7901,
-	0x79A7,0x79AA,0x7A57,0x7ABF,0x7C07,0x7C0D,0x7BFE,0x7BF7,
-	0x7C0C,0x7BE0,0x7CE0,0x7CDC,0x7CDE,0x7CE2,0x7CDF,0x7CD9,
-	0x7CDD,0x7E2E,0x7E3E,0x7E46,0x7E37,0x7E32,0x7E43,0x7E2B,
-	0x7E3D,0x7E31,0x7E45,0x7E41,0x7E34,0x7E39,0x7E48,0x7E35,
-	0x7E3F,0x7E2F,0x7F44,0x7FF3,0x7FFC,0x8071,0x8072,0x8070,
-	0x806F,0x8073,0x81C6,0x81C3,0x81BA,0x81C2,0x81C0,0x81BF,
-	0x81BD,0x81C9,0x81BE,0x81E8,0x8209,0x8271,0x85AA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8584,0x857E,0x859C,0x8591,0x8594,0x85AF,0x859B,
-	0x8587,0x85A8,0x858A,0x8667,0x87C0,0x87D1,0x87B3,0x87D2,
-	0x87C6,0x87AB,0x87BB,0x87BA,0x87C8,0x87CB,0x893B,0x8936,
-	0x8944,0x8938,0x893D,0x89AC,0x8B0E,0x8B17,0x8B19,0x8B1B,
-	0x8B0A,0x8B20,0x8B1D,0x8B04,0x8B10,0x8C41,0x8C3F,0x8C73,
-	0x8CFA,0x8CFD,0x8CFC,0x8CF8,0x8CFB,0x8DA8,0x8E49,0x8E4B,
-	0x8E48,0x8E4A,0x8F44,0x8F3E,0x8F42,0x8F45,0x8F3F,0x907F,
-	0x907D,0x9084,0x9081,0x9082,0x9080,0x9139,0x91A3,0x919E,
-	0x919C,0x934D,0x9382,0x9328,0x9375,0x934A,0x9365,0x934B,
-	0x9318,0x937E,0x936C,0x935B,0x9370,0x935A,0x9354,0x95CA,
-	0x95CB,0x95CC,0x95C8,0x95C6,0x96B1,0x96B8,0x96D6,0x971C,
-	0x971E,0x97A0,0x97D3,0x9846,0x98B6,0x9935,0x9A01,INVALC,
-	/* Block 195, Array index 0x2200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x99FF,0x9BAE,0x9BAB,0x9BAA,0x9BAD,0x9D3B,0x9D3F,0x9E8B,
-	0x9ECF,0x9EDE,0x9EDC,0x9EDD,0x9EDB,0x9F3E,0x9F4B,0x53E2,
-	0x5695,0x56AE,0x58D9,0x58D8,0x5B38,0x5F5D,0x61E3,0x6233,
-	0x64F4,0x64F2,0x64FE,0x6506,0x64FA,0x64FB,0x64F7,0x65B7,
-	0x66DC,0x6726,0x6AB3,0x6AAC,0x6AC3,0x6ABB,0x6AB8,0x6AC2,
-	0x6AAE,0x6AAF,0x6B5F,0x6B78,0x6BAF,0x7009,0x700B,0x6FFE,
-	0x7006,0x6FFA,0x7011,0x700F,0x71FB,0x71FC,0x71FE,0x71F8,
-	0x7377,0x7375,0x74A7,0x74BF,0x7515,0x7656,0x7658,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7652,0x77BD,0x77BF,0x77BB,0x77BC,0x790E,0x79AE,
-	0x7A61,0x7A62,0x7A60,0x7AC4,0x7AC5,0x7C2B,0x7C27,0x7C2A,
-	0x7C1E,0x7C23,0x7C21,0x7CE7,0x7E54,0x7E55,0x7E5E,0x7E5A,
-	0x7E61,0x7E52,0x7E59,0x7F48,0x7FF9,0x7FFB,0x8077,0x8076,
-	0x81CD,0x81CF,0x820A,0x85CF,0x85A9,0x85CD,0x85D0,0x85C9,
-	0x85B0,0x85BA,0x85B9,0x85A6,0x87EF,0x87EC,0x87F2,0x87E0,
-	0x8986,0x89B2,0x89F4,0x8B28,0x8B39,0x8B2C,0x8B2B,0x8C50,
-	0x8D05,0x8E59,0x8E63,0x8E66,0x8E64,0x8E5F,0x8E55,0x8EC0,
-	0x8F49,0x8F4D,0x9087,0x9083,0x9088,0x91AB,0x91AC,0x91D0,
-	0x9394,0x938A,0x9396,0x93A2,0x93B3,0x93AE,0x93AC,0x93B0,
-	0x9398,0x939A,0x9397,0x95D4,0x95D6,0x95D0,0x95D5,0x96E2,
-	0x96DC,0x96D9,0x96DB,0x96DE,0x9724,0x97A3,0x97A6,INVALC,
-	/* Block 196, Array index 0x2300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x97AD,0x97F9,0x984D,0x984F,0x984C,0x984E,0x9853,0x98BA,
-	0x993E,0x993F,0x993D,0x992E,0x99A5,0x9A0E,0x9AC1,0x9B03,
-	0x9B06,0x9B4F,0x9B4E,0x9B4D,0x9BCA,0x9BC9,0x9BFD,0x9BC8,
-	0x9BC0,0x9D51,0x9D5D,0x9D60,0x9EE0,0x9F15,0x9F2C,0x5133,
-	0x56A5,0x58DE,0x58DF,0x58E2,0x5BF5,0x9F90,0x5EEC,0x61F2,
-	0x61F7,0x61F6,0x61F5,0x6500,0x650F,0x66E0,0x66DD,0x6AE5,
-	0x6ADD,0x6ADA,0x6AD3,0x701B,0x701F,0x7028,0x701A,0x701D,
-	0x7015,0x7018,0x7206,0x720D,0x7258,0x72A2,0x7378,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x737A,0x74BD,0x74CA,0x74E3,0x7587,0x7586,0x765F,
-	0x7661,0x77C7,0x7919,0x79B1,0x7A6B,0x7A69,0x7C3E,0x7C3F,
-	0x7C38,0x7C3D,0x7C37,0x7C40,0x7E6B,0x7E6D,0x7E79,0x7E69,
-	0x7E6A,0x7F85,0x7E73,0x7FB6,0x7FB9,0x7FB8,0x81D8,0x85E9,
-	0x85DD,0x85EA,0x85D5,0x85E4,0x85E5,0x85F7,0x87FB,0x8805,
-	0x880D,0x87F9,0x87FE,0x8960,0x895F,0x8956,0x895E,0x8B41,
-	0x8B5C,0x8B58,0x8B49,0x8B5A,0x8B4E,0x8B4F,0x8B46,0x8B59,
-	0x8D08,0x8D0A,0x8E7C,0x8E72,0x8E87,0x8E76,0x8E6C,0x8E7A,
-	0x8E74,0x8F54,0x8F4E,0x8FAD,0x908A,0x908B,0x91B1,0x91AE,
-	0x93E1,0x93D1,0x93DF,0x93C3,0x93C8,0x93DC,0x93DD,0x93D6,
-	0x93E2,0x93CD,0x93D8,0x93E4,0x93D7,0x93E8,0x95DC,0x96B4,
-	0x96E3,0x972A,0x9727,0x9761,0x97DC,0x97FB,0x985E,INVALC,
-	/* Block 197, Array index 0x2400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x9858,0x985B,0x98BC,0x9945,0x9949,0x9A16,0x9A19,0x9B0D,
-	0x9BE8,0x9BE7,0x9BD6,0x9BDB,0x9D89,0x9D61,0x9D72,0x9D6A,
-	0x9D6C,0x9E92,0x9E97,0x9E93,0x9EB4,0x52F8,0x56A8,0x56B7,
-	0x56B6,0x56B4,0x56BC,0x58E4,0x5B40,0x5B43,0x5B7D,0x5BF6,
-	0x5DC9,0x61F8,0x61FA,0x6518,0x6514,0x6519,0x66E6,0x6727,
-	0x6AEC,0x703E,0x7030,0x7032,0x7210,0x737B,0x74CF,0x7662,
-	0x7665,0x7926,0x792A,0x792C,0x792B,0x7AC7,0x7AF6,0x7C4C,
-	0x7C43,0x7C4D,0x7CEF,0x7CF0,0x8FAE,0x7E7D,0x7E7C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7E82,0x7F4C,0x8000,0x81DA,0x8266,0x85FB,0x85F9,
-	0x8611,0x85FA,0x8606,0x860B,0x8607,0x860A,0x8814,0x8815,
-	0x8964,0x89BA,0x89F8,0x8B70,0x8B6C,0x8B66,0x8B6F,0x8B5F,
-	0x8B6B,0x8D0F,0x8D0D,0x8E89,0x8E81,0x8E85,0x8E82,0x91B4,
-	0x91CB,0x9418,0x9403,0x93FD,0x95E1,0x9730,0x98C4,0x9952,
-	0x9951,0x99A8,0x9A2B,0x9A30,0x9A37,0x9A35,0x9C13,0x9C0D,
-	0x9E79,0x9EB5,0x9EE8,0x9F2F,0x9F5F,0x9F63,0x9F61,0x5137,
-	0x5138,0x56C1,0x56C0,0x56C2,0x5914,0x5C6C,0x5DCD,0x61FC,
-	0x61FE,0x651D,0x651C,0x6595,0x66E9,0x6AFB,0x6B04,0x6AFA,
-	0x6BB2,0x704C,0x721B,0x72A7,0x74D6,0x74D4,0x7669,0x77D3,
-	0x7C50,0x7E8F,0x7E8C,0x7FBC,0x8617,0x862D,0x861A,0x8823,
-	0x8822,0x8821,0x881F,0x896A,0x896C,0x89BD,0x8B74,INVALC,
-	/* Block 198, Array index 0x2500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8B77,0x8B7D,0x8D13,0x8E8A,0x8E8D,0x8E8B,0x8F5F,0x8FAF,
-	0x91BA,0x942E,0x9433,0x9435,0x943A,0x9438,0x9432,0x942B,
-	0x95E2,0x9738,0x9739,0x9732,0x97FF,0x9867,0x9865,0x9957,
-	0x9A45,0x9A43,0x9A40,0x9A3E,0x9ACF,0x9B54,0x9B51,0x9C2D,
-	0x9C25,0x9DAF,0x9DB4,0x9DC2,0x9DB8,0x9E9D,0x9EEF,0x9F19,
-	0x9F5C,0x9F66,0x9F67,0x513C,0x513B,0x56C8,0x56CA,0x56C9,
-	0x5B7F,0x5DD4,0x5DD2,0x5F4E,0x61FF,0x6524,0x6B0A,0x6B61,
-	0x7051,0x7058,0x7380,0x74E4,0x758A,0x766E,0x766C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x79B3,0x7C60,0x7C5F,0x807E,0x807D,0x81DF,0x8972,
-	0x896F,0x89FC,0x8B80,0x8D16,0x8D17,0x8E91,0x8E93,0x8F61,
-	0x9148,0x9444,0x9451,0x9452,0x973D,0x973E,0x97C3,0x97C1,
-	0x986B,0x9955,0x9A55,0x9A4D,0x9AD2,0x9B1A,0x9C49,0x9C31,
-	0x9C3E,0x9C3B,0x9DD3,0x9DD7,0x9F34,0x9F6C,0x9F6A,0x9F94,
-	0x56CC,0x5DD6,0x6200,0x6523,0x652B,0x652A,0x66EC,0x6B10,
-	0x74DA,0x7ACA,0x7C64,0x7C63,0x7C65,0x7E93,0x7E96,0x7E94,
-	0x81E2,0x8638,0x863F,0x8831,0x8B8A,0x9090,0x908F,0x9463,
-	0x9460,0x9464,0x9768,0x986F,0x995C,0x9A5A,0x9A5B,0x9A57,
-	0x9AD3,0x9AD4,0x9AD1,0x9C54,0x9C57,0x9C56,0x9DE5,0x9E9F,
-	0x9EF4,0x56D1,0x58E9,0x652C,0x705E,0x7671,0x7672,0x77D7,
-	0x7F50,0x7F88,0x8836,0x8839,0x8862,0x8B93,0x8B92,INVALC,
-	/* Block 199, Array index 0x2600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8B96,0x8277,0x8D1B,0x91C0,0x946A,0x9742,0x9748,0x9744,
-	0x97C6,0x9870,0x9A5F,0x9B22,0x9B58,0x9C5F,0x9DF9,0x9DFA,
-	0x9E7C,0x9E7D,0x9F07,0x9F77,0x9F72,0x5EF3,0x6B16,0x7063,
-	0x7C6C,0x7C6E,0x883B,0x89C0,0x8EA1,0x91C1,0x9472,0x9470,
-	0x9871,0x995E,0x9AD6,0x9B23,0x9ECC,0x7064,0x77DA,0x8B9A,
-	0x9477,0x97C9,0x9A62,0x9A65,0x7E9C,0x8B9C,0x8EAA,0x91C5,
-	0x947D,0x947E,0x947C,0x9C77,0x9C78,0x9EF7,0x8C54,0x947F,
-	0x9E1A,0x7228,0x9A6A,0x9B31,0x9E1B,0x9E1E,0x7C72,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x30FE,0x309D,0x309E,0x3005,0x3041,0x3042,0x3043,
-	0x3044,0x3045,0x3046,0x3047,0x3048,0x3049,0x304A,0x304B,
-	0x304C,0x304D,0x304E,0x304F,0x3050,0x3051,0x3052,0x3053,
-	0x3054,0x3055,0x3056,0x3057,0x3058,0x3059,0x305A,0x305B,
-	0x305C,0x305D,0x305E,0x305F,0x3060,0x3061,0x3062,0x3063,
-	0x3064,0x3065,0x3066,0x3067,0x3068,0x3069,0x306A,0x306B,
-	0x306C,0x306D,0x306E,0x306F,0x3070,0x3071,0x3072,0x3073,
-	0x3074,0x3075,0x3076,0x3077,0x3078,0x3079,0x307A,0x307B,
-	0x307C,0x307D,0x307E,0x307F,0x3080,0x3081,0x3082,0x3083,
-	0x3084,0x3085,0x3086,0x3087,0x3088,0x3089,0x308A,0x308B,
-	0x308C,0x308D,0x308E,0x308F,0x3090,0x3091,0x3092,0x3093,
-	0x30A1,0x30A2,0x30A3,0x30A4,0x30A5,0x30A6,0x30A7,INVALC,
-	/* Block 200, Array index 0x2700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x30A8,0x30A9,0x30AA,0x30AB,0x30AC,0x30AD,0x30AE,0x30AF,
-	0x30B0,0x30B1,0x30B2,0x30B3,0x30B4,0x30B5,0x30B6,0x30B7,
-	0x30B8,0x30B9,0x30BA,0x30BB,0x30BC,0x30BD,0x30BE,0x30BF,
-	0x30C0,0x30C1,0x30C2,0x30C3,0x30C4,0x30C5,0x30C6,0x30C7,
-	0x30C8,0x30C9,0x30CA,0x30CB,0x30CC,0x30CD,0x30CE,0x30CF,
-	0x30D0,0x30D1,0x30D2,0x30D3,0x30D4,0x30D5,0x30D6,0x30D7,
-	0x30D8,0x30D9,0x30DA,0x30DB,0x30DC,0x30DD,0x30DE,0x30DF,
-	0x30E0,0x30E1,0x30E2,0x30E3,0x30E4,0x30E5,0x30E6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x30E7,0x30E8,0x30E9,0x30EA,0x30EB,0x30EC,0x30ED,
-	0x30EE,0x30EF,0x30F0,0x30F1,0x30F2,0x30F3,0x30F4,0x30F5,
-	0x30F6,0x0414,0x0415,0x0401,0x0416,0x0417,0x0418,0x0419,
-	0x041A,0x041B,0x041C,0x0423,0x0424,0x0425,0x0426,0x0427,
-	0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,
-	0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0451,0x0436,
-	0x0437,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,
-	0x043F,0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,
-	0x0447,0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,
-	0x044F,0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,
-	0x2467,0x2468,0x2469,0x2474,0x2475,0x2476,0x2477,0x2478,
-	0x2479,0x247A,0x247B,0x247C,0x247D,INVALC,INVALC,INVALC,
-	/* Block 202, Array index 0x2800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4E42,0x4E5C,0x51F5,0x531A,0x5382,0x4E07,0x4E0C,0x4E47,
-	0x4E8D,0x56D7,0xFA0C,0x5C6E,0x5F73,0x4E0F,0x5187,0x4E0E,
-	0x4E2E,0x4E93,0x4EC2,0x4EC9,0x4EC8,0x5198,0x52FC,0x536C,
-	0x53B9,0x5720,0x5903,0x592C,0x5C10,0x5DFF,0x65E1,0x6BB3,
-	0x6BCC,0x6C14,0x723F,0x4E31,0x4E3C,0x4EE8,0x4EDC,0x4EE9,
-	0x4EE1,0x4EDD,0x4EDA,0x520C,0x531C,0x534C,0x5722,0x5723,
-	0x5917,0x592F,0x5B81,0x5B84,0x5C12,0x5C3B,0x5C74,0x5C73,
-	0x5E04,0x5E80,0x5E82,0x5FC9,0x6209,0x6250,0x6C15,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6C36,0x6C43,0x6C3F,0x6C3B,0x72AE,0x72B0,0x738A,
-	0x79B8,0x808A,0x961E,0x4F0E,0x4F18,0x4F2C,0x4EF5,0x4F14,
-	0x4EF1,0x4F00,0x4EF7,0x4F08,0x4F1D,0x4F02,0x4F05,0x4F22,
-	0x4F13,0x4F04,0x4EF4,0x4F12,0x51B1,0x5213,0x5209,0x5210,
-	0x52A6,0x5322,0x531F,0x534D,0x538A,0x5407,0x56E1,0x56DF,
-	0x572E,0x572A,0x5734,0x593C,0x5980,0x597C,0x5985,0x597B,
-	0x597E,0x5977,0x597F,0x5B56,0x5C15,0x5C25,0x5C7C,0x5C7A,
-	0x5C7B,0x5C7E,0x5DDF,0x5E75,0x5E84,0x5F02,0x5F1A,0x5F74,
-	0x5FD5,0x5FD4,0x5FCF,0x625C,0x625E,0x6264,0x6261,0x6266,
-	0x6262,0x6259,0x6260,0x625A,0x6265,0x65EF,0x65EE,0x673E,
-	0x6739,0x6738,0x673B,0x673A,0x673F,0x673C,0x6733,0x6C18,
-	0x6C46,0x6C52,0x6C5C,0x6C4F,0x6C4A,0x6C54,0x6C4B,INVALC,
-	/* Block 203, Array index 0x2900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6C4C,0x7071,0x725E,0x72B4,0x72B5,0x738E,0x752A,0x767F,
-	0x7A75,0x7F51,0x8278,0x827C,0x8280,0x827D,0x827F,0x864D,
-	0x897E,0x9099,0x9097,0x9098,0x909B,0x9094,0x9622,0x9624,
-	0x9620,0x9623,0x4F56,0x4F3B,0x4F62,0x4F49,0x4F53,0x4F64,
-	0x4F3E,0x4F67,0x4F52,0x4F5F,0x4F41,0x4F58,0x4F2D,0x4F33,
-	0x4F3F,0x4F61,0x518F,0x51B9,0x521C,0x521E,0x5221,0x52AD,
-	0x52AE,0x5309,0x5363,0x5372,0x538E,0x538F,0x5430,0x5437,
-	0x542A,0x5454,0x5445,0x5419,0x541C,0x5425,0x5418,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x543D,0x544F,0x5441,0x5428,0x5424,0x5447,0x56EE,
-	0x56E7,0x56E5,0x5741,0x5745,0x574C,0x5749,0x574B,0x5752,
-	0x5906,0x5940,0x59A6,0x5998,0x59A0,0x5997,0x598E,0x59A2,
-	0x5990,0x598F,0x59A7,0x59A1,0x5B8E,0x5B92,0x5C28,0x5C2A,
-	0x5C8D,0x5C8F,0x5C88,0x5C8B,0x5C89,0x5C92,0x5C8A,0x5C86,
-	0x5C93,0x5C95,0x5DE0,0x5E0A,0x5E0E,0x5E8B,0x5E89,0x5E8C,
-	0x5E88,0x5E8D,0x5F05,0x5F1D,0x5F78,0x5F76,0x5FD2,0x5FD1,
-	0x5FD0,0x5FED,0x5FE8,0x5FEE,0x5FF3,0x5FE1,0x5FE4,0x5FE3,
-	0x5FFA,0x5FEF,0x5FF7,0x5FFB,0x6000,0x5FF4,0x623A,0x6283,
-	0x628C,0x628E,0x628F,0x6294,0x6287,0x6271,0x627B,0x627A,
-	0x6270,0x6281,0x6288,0x6277,0x627D,0x6272,0x6274,0x6537,
-	0x65F0,0x65F4,0x65F3,0x65F2,0x65F5,0x6745,0x6747,INVALC,
-	/* Block 204, Array index 0x2A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6759,0x6755,0x674C,0x6748,0x675D,0x674D,0x675A,0x674B,
-	0x6BD0,0x6C19,0x6C1A,0x6C78,0x6C67,0x6C6B,0x6C84,0x6C8B,
-	0x6C8F,0x6C71,0x6C6F,0x6C69,0x6C9A,0x6C6D,0x6C87,0x6C95,
-	0x6C9C,0x6C66,0x6C73,0x6C65,0x6C7B,0x6C8E,0x7074,0x707A,
-	0x7263,0x72BF,0x72BD,0x72C3,0x72C6,0x72C1,0x72BA,0x72C5,
-	0x7395,0x7397,0x7393,0x7394,0x7392,0x753A,0x7539,0x7594,
-	0x7595,0x7681,0x793D,0x8034,0x8095,0x8099,0x8090,0x8092,
-	0x809C,0x8290,0x828F,0x8285,0x828E,0x8291,0x8293,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x828A,0x8283,0x8284,0x8C78,0x8FC9,0x8FBF,0x909F,
-	0x90A1,0x90A5,0x909E,0x90A7,0x90A0,0x9630,0x9628,0x962F,
-	0x962D,0x4E33,0x4F98,0x4F7C,0x4F85,0x4F7D,0x4F80,0x4F87,
-	0x4F76,0x4F74,0x4F89,0x4F84,0x4F77,0x4F4C,0x4F97,0x4F6A,
-	0x4F9A,0x4F79,0x4F81,0x4F78,0x4F90,0x4F9C,0x4F94,0x4F9E,
-	0x4F92,0x4F82,0x4F95,0x4F6B,0x4F6E,0x519E,0x51BC,0x51BE,
-	0x5235,0x5232,0x5233,0x5246,0x5231,0x52BC,0x530A,0x530B,
-	0x533C,0x5392,0x5394,0x5487,0x547F,0x5481,0x5491,0x5482,
-	0x5488,0x546B,0x547A,0x547E,0x5465,0x546C,0x5474,0x5466,
-	0x548D,0x546F,0x5461,0x5460,0x5498,0x5463,0x5467,0x5464,
-	0x56F7,0x56F9,0x576F,0x5772,0x576D,0x576B,0x5771,0x5770,
-	0x5776,0x5780,0x5775,0x577B,0x5773,0x5774,0x5762,INVALC,
-	/* Block 205, Array index 0x2B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5768,0x577D,0x590C,0x5945,0x59B5,0x59BA,0x59CF,0x59CE,
-	0x59B2,0x59CC,0x59C1,0x59B6,0x59BC,0x59C3,0x59D6,0x59B1,
-	0x59BD,0x59C0,0x59C8,0x59B4,0x59C7,0x5B62,0x5B65,0x5B93,
-	0x5B95,0x5C44,0x5C47,0x5CAE,0x5CA4,0x5CA0,0x5CB5,0x5CAF,
-	0x5CA8,0x5CAC,0x5C9F,0x5CA3,0x5CAD,0x5CA2,0x5CAA,0x5CA7,
-	0x5C9D,0x5CA5,0x5CB6,0x5CB0,0x5CA6,0x5E17,0x5E14,0x5E19,
-	0x5F28,0x5F22,0x5F23,0x5F24,0x5F54,0x5F82,0x5F7E,0x5F7D,
-	0x5FDE,0x5FE5,0x602D,0x6026,0x6019,0x6032,0x600B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6034,0x600A,0x6017,0x6033,0x601A,0x601E,0x602C,
-	0x6022,0x600D,0x6010,0x602E,0x6013,0x6011,0x600C,0x6009,
-	0x601C,0x6214,0x623D,0x62AD,0x62B4,0x62D1,0x62BE,0x62AA,
-	0x62B6,0x62CA,0x62AE,0x62B3,0x62AF,0x62BB,0x62A9,0x62B0,
-	0x62B8,0x653D,0x65A8,0x65BB,0x6609,0x65FC,0x6604,0x6612,
-	0x6608,0x65FB,0x6603,0x660B,0x660D,0x6605,0x65FD,0x6611,
-	0x6610,0x66F6,0x670A,0x6785,0x676C,0x678E,0x6792,0x6776,
-	0x677B,0x6798,0x6786,0x6784,0x6774,0x678D,0x678C,0x677A,
-	0x679F,0x6791,0x6799,0x6783,0x677D,0x6781,0x6778,0x6779,
-	0x6794,0x6B25,0x6B80,0x6B7E,0x6BDE,0x6C1D,0x6C93,0x6CEC,
-	0x6CEB,0x6CEE,0x6CD9,0x6CB6,0x6CD4,0x6CAD,0x6CE7,0x6CB7,
-	0x6CD0,0x6CC2,0x6CBA,0x6CC3,0x6CC6,0x6CED,0x6CF2,INVALC,
-	/* Block 206, Array index 0x2C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6CD2,0x6CDD,0x6CB4,0x6C8A,0x6C9D,0x6C80,0x6CDE,0x6CC0,
-	0x6D30,0x6CCD,0x6CC7,0x6CB0,0x6CF9,0x6CCF,0x6CE9,0x6CD1,
-	0x7094,0x7098,0x7085,0x7093,0x7086,0x7084,0x7091,0x7096,
-	0x7082,0x709A,0x7083,0x726A,0x72D6,0x72CB,0x72D8,0x72C9,
-	0x72DC,0x72D2,0x72D4,0x72DA,0x72CC,0x72D1,0x73A4,0x73A1,
-	0x73AD,0x73A6,0x73A2,0x73A0,0x73AC,0x739D,0x74DD,0x74E8,
-	0x753F,0x7540,0x753E,0x758C,0x7598,0x76AF,0x76F3,0x76F1,
-	0x76F0,0x76F5,0x77F8,0x77FC,0x77F9,0x77FB,0x77FA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x77F7,0x7942,0x793F,0x79C5,0x7A78,0x7A7B,0x7AFB,
-	0x7C75,0x7CFD,0x8035,0x808F,0x80AE,0x80A3,0x80B8,0x80B5,
-	0x80AD,0x8220,0x82A0,0x82C0,0x82AB,0x829A,0x8298,0x829B,
-	0x82B5,0x82A7,0x82AE,0x82BC,0x829E,0x82BA,0x82B4,0x82A8,
-	0x82A1,0x82A9,0x82C2,0x82A4,0x82C3,0x82B6,0x82A2,0x8670,
-	0x866F,0x866D,0x866E,0x8C56,0x8FD2,0x8FCB,0x8FD3,0x8FCD,
-	0x8FD6,0x8FD5,0x8FD7,0x90B2,0x90B4,0x90AF,0x90B3,0x90B0,
-	0x9639,0x963D,0x963C,0x963A,0x9643,0x4FCD,0x4FC5,0x4FD3,
-	0x4FB2,0x4FC9,0x4FCB,0x4FC1,0x4FD4,0x4FDC,0x4FD9,0x4FBB,
-	0x4FB3,0x4FDB,0x4FC7,0x4FD6,0x4FBA,0x4FC0,0x4FB9,0x4FEC,
-	0x5244,0x5249,0x52C0,0x52C2,0x533D,0x537C,0x5397,0x5396,
-	0x5399,0x5398,0x54BA,0x54A1,0x54AD,0x54A5,0x54CF,INVALC,
-	/* Block 207, Array index 0x2D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x54C3,0x830D,0x54B7,0x54AE,0x54D6,0x54B6,0x54C5,0x54C6,
-	0x54A0,0x5470,0x54BC,0x54A2,0x54BE,0x5472,0x54DE,0x54B0,
-	0x57B5,0x579E,0x579F,0x57A4,0x578C,0x5797,0x579D,0x579B,
-	0x5794,0x5798,0x578F,0x5799,0x57A5,0x579A,0x5795,0x58F4,
-	0x590D,0x5953,0x59E1,0x59DE,0x59EE,0x5A00,0x59F1,0x59DD,
-	0x59FA,0x59FD,0x59FC,0x59F6,0x59E4,0x59F2,0x59F7,0x59DB,
-	0x59E9,0x59F3,0x59F5,0x59E0,0x59FE,0x59F4,0x59ED,0x5BA8,
-	0x5C4C,0x5CD0,0x5CD8,0x5CCC,0x5CD7,0x5CCB,0x5CDB,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5CDE,0x5CDA,0x5CC9,0x5CC7,0x5CCA,0x5CD6,0x5CD3,
-	0x5CD4,0x5CCF,0x5CC8,0x5CC6,0x5CCE,0x5CDF,0x5CF8,0x5DF9,
-	0x5E21,0x5E22,0x5E23,0x5E20,0x5E24,0x5EB0,0x5EA4,0x5EA2,
-	0x5E9B,0x5EA3,0x5EA5,0x5F07,0x5F2E,0x5F56,0x5F86,0x6037,
-	0x6039,0x6054,0x6072,0x605E,0x6045,0x6053,0x6047,0x6049,
-	0x605B,0x604C,0x6040,0x6042,0x605F,0x6024,0x6044,0x6058,
-	0x6066,0x606E,0x6242,0x6243,0x62CF,0x630D,0x630B,0x62F5,
-	0x630E,0x6303,0x62EB,0x62F9,0x630F,0x630C,0x62F8,0x62F6,
-	0x6300,0x6313,0x6314,0x62FA,0x6315,0x62FB,0x62F0,0x6541,
-	0x6543,0x65AA,0x65BF,0x6636,0x6621,0x6632,0x6635,0x661C,
-	0x6626,0x6622,0x6633,0x662B,0x663A,0x661D,0x6634,0x6639,
-	0x662E,0x670F,0x6710,0x67C1,0x67F2,0x67C8,0x67BA,INVALC,
-	/* Block 208, Array index 0x2E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x67DC,0x67BB,0x67F8,0x67D8,0x67C0,0x67B7,0x67C5,0x67EB,
-	0x67E4,0x67DF,0x67B5,0x67CD,0x67B3,0x67F7,0x67F6,0x67EE,
-	0x67E3,0x67C2,0x67B9,0x67CE,0x67E7,0x67F0,0x67B2,0x67FC,
-	0x67C6,0x67ED,0x67CC,0x67AE,0x67E6,0x67DB,0x67FA,0x67C9,
-	0x67CA,0x67C3,0x67EA,0x67CB,0x6B28,0x6B82,0x6B84,0x6BB6,
-	0x6BD6,0x6BD8,0x6BE0,0x6C20,0x6C21,0x6D28,0x6D34,0x6D2D,
-	0x6D1F,0x6D3C,0x6D3F,0x6D12,0x6D0A,0x6CDA,0x6D33,0x6D04,
-	0x6D19,0x6D3A,0x6D1A,0x6D11,0x6D00,0x6D1D,0x6D42,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6D01,0x6D18,0x6D37,0x6D03,0x6D0F,0x6D40,0x6D07,
-	0x6D20,0x6D2C,0x6D08,0x6D22,0x6D09,0x6D10,0x70B7,0x709F,
-	0x70BE,0x70B1,0x70B0,0x70A1,0x70B4,0x70B5,0x70A9,0x7241,
-	0x7249,0x724A,0x726C,0x7270,0x7273,0x726E,0x72CA,0x72E4,
-	0x72E8,0x72EB,0x72DF,0x72EA,0x72E6,0x72E3,0x7385,0x73CC,
-	0x73C2,0x73C8,0x73C5,0x73B9,0x73B6,0x73B5,0x73B4,0x73EB,
-	0x73BF,0x73C7,0x73BE,0x73C3,0x73C6,0x73B8,0x73CB,0x74EC,
-	0x74EE,0x752E,0x7547,0x7548,0x75A7,0x75AA,0x7679,0x76C4,
-	0x7708,0x7703,0x7704,0x7705,0x770A,0x76F7,0x76FB,0x76FA,
-	0x77E7,0x77E8,0x7806,0x7811,0x7812,0x7805,0x7810,0x780F,
-	0x780E,0x7809,0x7803,0x7813,0x794A,0x794C,0x794B,0x7945,
-	0x7944,0x79D5,0x79CD,0x79CF,0x79D6,0x79CE,0x7A80,INVALC,
-	/* Block 209, Array index 0x2F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7A7E,0x7AD1,0x7B00,0x7B01,0x7C7A,0x7C78,0x7C79,0x7C7F,
-	0x7C80,0x7C81,0x7D03,0x7D08,0x7D01,0x7F58,0x7F91,0x7F8D,
-	0x7FBE,0x8007,0x800E,0x800F,0x8014,0x8037,0x80D8,0x80C7,
-	0x80E0,0x80D1,0x80C8,0x80C2,0x80D0,0x80C5,0x80E3,0x80D9,
-	0x80DC,0x80CA,0x80D5,0x80C9,0x80CF,0x80D7,0x80E6,0x80CD,
-	0x81FF,0x8221,0x8294,0x82D9,0x82FE,0x82F9,0x8307,0x82E8,
-	0x8300,0x82D5,0x833A,0x82EB,0x82D6,0x82F4,0x82EC,0x82E1,
-	0x82F2,0x82F5,0x830C,0x82FB,0x82F6,0x82F0,0x82EA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x82E4,0x82E0,0x82FA,0x82F3,0x82ED,0x8677,0x8674,
-	0x867C,0x8673,0x8841,0x884E,0x8867,0x886A,0x8869,0x89D3,
-	0x8A04,0x8A07,0x8D72,0x8FE3,0x8FE1,0x8FEE,0x8FE0,0x90F1,
-	0x90BD,0x90BF,0x90D5,0x90C5,0x90BE,0x90C7,0x90CB,0x90C8,
-	0x91D4,0x91D3,0x9654,0x964F,0x9651,0x9653,0x964A,0x964E,
-	0x501E,0x5005,0x5007,0x5013,0x5022,0x5030,0x501B,0x4FF5,
-	0x4FF4,0x5033,0x5037,0x502C,0x4FF6,0x4FF7,0x5017,0x501C,
-	0x5020,0x5027,0x5035,0x502F,0x5031,0x500E,0x515A,0x5194,
-	0x5193,0x51CA,0x51C4,0x51C5,0x51C8,0x51CE,0x5261,0x525A,
-	0x5252,0x525E,0x525F,0x5255,0x5262,0x52CD,0x530E,0x539E,
-	0x5526,0x54E2,0x5517,0x5512,0x54E7,0x54F3,0x54E4,0x551A,
-	0x54FF,0x5504,0x5508,0x54EB,0x5511,0x5505,0x54F1,INVALC,
-	/* Block 210, Array index 0x3000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x550A,0x54FB,0x54F7,0x54F8,0x54E0,0x550E,0x5503,0x550B,
-	0x5701,0x5702,0x57CC,0x5832,0x57D5,0x57D2,0x57BA,0x57C6,
-	0x57BD,0x57BC,0x57B8,0x57B6,0x57BF,0x57C7,0x57D0,0x57B9,
-	0x57C1,0x590E,0x594A,0x5A19,0x5A16,0x5A2D,0x5A2E,0x5A15,
-	0x5A0F,0x5A17,0x5A0A,0x5A1E,0x5A33,0x5B6C,0x5BA7,0x5BAD,
-	0x5BAC,0x5C03,0x5C56,0x5C54,0x5CEC,0x5CFF,0x5CEE,0x5CF1,
-	0x5CF7,0x5D00,0x5CF9,0x5E29,0x5E28,0x5EA8,0x5EAE,0x5EAA,
-	0x5EAC,0x5F33,0x5F30,0x5F67,0x605D,0x605A,0x6067,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6041,0x60A2,0x6088,0x6080,0x6092,0x6081,0x609D,
-	0x6083,0x6095,0x609B,0x6097,0x6087,0x609C,0x608E,0x6219,
-	0x6246,0x62F2,0x6310,0x6356,0x632C,0x6344,0x6345,0x6336,
-	0x6343,0x63E4,0x6339,0x634B,0x634A,0x633C,0x6329,0x6341,
-	0x6334,0x6358,0x6354,0x6359,0x632D,0x6347,0x6333,0x635A,
-	0x6351,0x6338,0x6357,0x6340,0x6348,0x654A,0x6546,0x65C6,
-	0x65C3,0x65C4,0x65C2,0x664A,0x665F,0x6647,0x6651,0x6712,
-	0x6713,0x681F,0x681A,0x6849,0x6832,0x6833,0x683B,0x684B,
-	0x684F,0x6816,0x6831,0x681C,0x6835,0x682B,0x682D,0x682F,
-	0x684E,0x6844,0x6834,0x681D,0x6812,0x6814,0x6826,0x6828,
-	0x682E,0x684D,0x683A,0x6825,0x6820,0x6B2C,0x6B2F,0x6B2D,
-	0x6B31,0x6B34,0x6B6D,0x8082,0x6B88,0x6BE6,0x6BE4,INVALC,
-	/* Block 211, Array index 0x3100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6BE8,0x6BE3,0x6BE2,0x6BE7,0x6C25,0x6D7A,0x6D63,0x6D64,
-	0x6D76,0x6D0D,0x6D61,0x6D92,0x6D58,0x6D62,0x6D6D,0x6D6F,
-	0x6D91,0x6D8D,0x6DEF,0x6D7F,0x6D86,0x6D5E,0x6D67,0x6D60,
-	0x6D97,0x6D70,0x6D7C,0x6D5F,0x6D82,0x6D98,0x6D2F,0x6D68,
-	0x6D8B,0x6D7E,0x6D80,0x6D84,0x6D16,0x6D83,0x6D7B,0x6D7D,
-	0x6D75,0x6D90,0x70DC,0x70D3,0x70D1,0x70DD,0x70CB,0x7F39,
-	0x70E2,0x70D7,0x70D2,0x70DE,0x70E0,0x70D4,0x70CD,0x70C5,
-	0x70C6,0x70C7,0x70DA,0x70CE,0x70E1,0x7242,0x7278,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7277,0x7276,0x7300,0x72FA,0x72F4,0x72FE,0x72F6,
-	0x72F3,0x72FB,0x7301,0x73D3,0x73D9,0x73E5,0x73D6,0x73BC,
-	0x73E7,0x73E3,0x73E9,0x73DC,0x73D2,0x73DB,0x73D4,0x73DD,
-	0x73DA,0x73D7,0x73D8,0x73E8,0x74DE,0x74DF,0x74F4,0x74F5,
-	0x7521,0x755B,0x755F,0x75B0,0x75C1,0x75BB,0x75C4,0x75C0,
-	0x75BF,0x75B6,0x75BA,0x768A,0x76C9,0x771D,0x771B,0x7710,
-	0x7713,0x7712,0x7723,0x7711,0x7715,0x7719,0x771A,0x7722,
-	0x7727,0x7823,0x782C,0x7822,0x7835,0x782F,0x7828,0x782E,
-	0x782B,0x7821,0x7829,0x7833,0x782A,0x7831,0x7954,0x795B,
-	0x794F,0x795C,0x7953,0x7952,0x7951,0x79EB,0x79EC,0x79E0,
-	0x79EE,0x79ED,0x79EA,0x79DC,0x79DE,0x79DD,0x7A86,0x7A89,
-	0x7A85,0x7A8B,0x7A8C,0x7A8A,0x7A87,0x7AD8,0x7B10,INVALC,
-	/* Block 212, Array index 0x3200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7B04,0x7B13,0x7B05,0x7B0F,0x7B08,0x7B0A,0x7B0E,0x7B09,
-	0x7B12,0x7C84,0x7C91,0x7C8A,0x7C8C,0x7C88,0x7C8D,0x7C85,
-	0x7D1E,0x7D1D,0x7D11,0x7D0E,0x7D18,0x7D16,0x7D13,0x7D1F,
-	0x7D12,0x7D0F,0x7D0C,0x7F5C,0x7F61,0x7F5E,0x7F60,0x7F5D,
-	0x7F5B,0x7F96,0x7F92,0x7FC3,0x7FC2,0x7FC0,0x8016,0x803E,
-	0x8039,0x80FA,0x80F2,0x80F9,0x80F5,0x8101,0x80FB,0x8100,
-	0x8201,0x822F,0x8225,0x8333,0x832D,0x8344,0x8319,0x8351,
-	0x8325,0x8356,0x833F,0x8341,0x8326,0x831C,0x8322,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8342,0x834E,0x831B,0x832A,0x8308,0x833C,0x834D,
-	0x8316,0x8324,0x8320,0x8337,0x832F,0x8329,0x8347,0x8345,
-	0x834C,0x8353,0x831E,0x832C,0x834B,0x8327,0x8348,0x8653,
-	0x8652,0x86A2,0x86A8,0x8696,0x868D,0x8691,0x869E,0x8687,
-	0x8697,0x8686,0x868B,0x869A,0x8685,0x86A5,0x8699,0x86A1,
-	0x86A7,0x8695,0x8698,0x868E,0x869D,0x8690,0x8694,0x8843,
-	0x8844,0x886D,0x8875,0x8876,0x8872,0x8880,0x8871,0x887F,
-	0x886F,0x8883,0x887E,0x8874,0x887C,0x8A12,0x8C47,0x8C57,
-	0x8C7B,0x8CA4,0x8CA3,0x8D76,0x8D78,0x8DB5,0x8DB7,0x8DB6,
-	0x8ED1,0x8ED3,0x8FFE,0x8FF5,0x9002,0x8FFF,0x8FFB,0x9004,
-	0x8FFC,0x8FF6,0x90D6,0x90E0,0x90D9,0x90DA,0x90E3,0x90DF,
-	0x90E5,0x90D8,0x90DB,0x90D7,0x90DC,0x90E4,0x9150,INVALC,
-	/* Block 213, Array index 0x3300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x914E,0x914F,0x91D5,0x91E2,0x91DA,0x965C,0x965F,0x96BC,
-	0x98E3,0x9ADF,0x9B2F,0x4E7F,0x5070,0x506A,0x5061,0x505E,
-	0x5060,0x5053,0x504B,0x505D,0x5072,0x5048,0x504D,0x5041,
-	0x505B,0x504A,0x5062,0x5015,0x5045,0x505F,0x5069,0x506B,
-	0x5063,0x5064,0x5046,0x5040,0x506E,0x5073,0x5057,0x5051,
-	0x51D0,0x526B,0x526D,0x526C,0x526E,0x52D6,0x52D3,0x532D,
-	0x539C,0x5575,0x5576,0x553C,0x554D,0x5550,0x5534,0x552A,
-	0x5551,0x5562,0x5536,0x5535,0x5530,0x5552,0x5545,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x550C,0x5532,0x5565,0x554E,0x5539,0x5548,0x552D,
-	0x553B,0x5540,0x554B,0x570A,0x5707,0x57FB,0x5814,0x57E2,
-	0x57F6,0x57DC,0x57F4,0x5800,0x57ED,0x57FD,0x5808,0x57F8,
-	0x580B,0x57F3,0x57CF,0x5807,0x57EE,0x57E3,0x57F2,0x57E5,
-	0x57EC,0x57E1,0x580E,0x57FC,0x5810,0x57E7,0x5801,0x580C,
-	0x57F1,0x57E9,0x57F0,0x580D,0x5804,0x595C,0x5A60,0x5A58,
-	0x5A55,0x5A67,0x5A5E,0x5A38,0x5A35,0x5A6D,0x5A50,0x5A5F,
-	0x5A65,0x5A6C,0x5A53,0x5A64,0x5A57,0x5A43,0x5A5D,0x5A52,
-	0x5A44,0x5A5B,0x5A48,0x5A8E,0x5A3E,0x5A4D,0x5A39,0x5A4C,
-	0x5A70,0x5A69,0x5A47,0x5A51,0x5A56,0x5A42,0x5A5C,0x5B72,
-	0x5B6E,0x5BC1,0x5BC0,0x5C59,0x5D1E,0x5D0B,0x5D1D,0x5D1A,
-	0x5D20,0x5D0C,0x5D28,0x5D0D,0x5D26,0x5D25,0x5D0F,INVALC,
-	/* Block 214, Array index 0x3400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D30,0x5D12,0x5D23,0x5D1F,0x5D2E,0x5E3E,0x5E34,0x5EB1,
-	0x5EB4,0x5EB9,0x5EB2,0x5EB3,0x5F36,0x5F38,0x5F9B,0x5F96,
-	0x5F9F,0x608A,0x6090,0x6086,0x60BE,0x60B0,0x60BA,0x60D3,
-	0x60D4,0x60CF,0x60E4,0x60D9,0x60DD,0x60C8,0x60B1,0x60DB,
-	0x60B7,0x60CA,0x60BF,0x60C3,0x60CD,0x60C0,0x6332,0x6365,
-	0x638A,0x6382,0x637D,0x63BD,0x639E,0x63AD,0x639D,0x6397,
-	0x63AB,0x638E,0x636F,0x6387,0x6390,0x636E,0x63AF,0x6375,
-	0x639C,0x636D,0x63AE,0x637C,0x63A4,0x633B,0x639F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6378,0x6385,0x6381,0x6391,0x638D,0x6370,0x6553,
-	0x65CD,0x6665,0x6661,0x665B,0x6659,0x665C,0x6662,0x6718,
-	0x6879,0x6887,0x6890,0x689C,0x686D,0x686E,0x68AE,0x68AB,
-	0x6956,0x686F,0x68A3,0x68AC,0x68A9,0x6875,0x6874,0x68B2,
-	0x688F,0x6877,0x6892,0x687C,0x686B,0x6872,0x68AA,0x6880,
-	0x6871,0x687E,0x689B,0x6896,0x688B,0x68A0,0x6889,0x68A4,
-	0x6878,0x687B,0x6891,0x688C,0x688A,0x687D,0x6B36,0x6B33,
-	0x6B37,0x6B38,0x6B91,0x6B8F,0x6B8D,0x6B8E,0x6B8C,0x6C2A,
-	0x6DC0,0x6DAB,0x6DB4,0x6DB3,0x6E74,0x6DAC,0x6DE9,0x6DE2,
-	0x6DB7,0x6DF6,0x6DD4,0x6E00,0x6DC8,0x6DE0,0x6DDF,0x6DD6,
-	0x6DBE,0x6DE5,0x6DDC,0x6DDD,0x6DDB,0x6DF4,0x6DCA,0x6DBD,
-	0x6DED,0x6DF0,0x6DBA,0x6DD5,0x6DC2,0x6DCF,0x6DC9,INVALC,
-	/* Block 215, Array index 0x3500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6DD0,0x6DF2,0x6DD3,0x6DFD,0x6DD7,0x6DCD,0x6DE3,0x6DBB,
-	0x70FA,0x710D,0x70F7,0x7117,0x70F4,0x710C,0x70F0,0x7104,
-	0x70F3,0x7110,0x70FC,0x70FF,0x7106,0x7113,0x7100,0x70F8,
-	0x70F6,0x710B,0x7102,0x710E,0x727E,0x727B,0x727C,0x727F,
-	0x731D,0x7317,0x7307,0x7311,0x7318,0x730A,0x7308,0x72FF,
-	0x730F,0x731E,0x7388,0x73F6,0x73F8,0x73F5,0x7404,0x7401,
-	0x73FD,0x7407,0x7400,0x73FA,0x73FC,0x73FF,0x740C,0x740B,
-	0x73F4,0x7408,0x7564,0x7563,0x75CE,0x75D2,0x75CF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x75CB,0x75CC,0x75D1,0x75D0,0x768F,0x7689,0x76D3,
-	0x7739,0x772F,0x772D,0x7731,0x7732,0x7734,0x7733,0x773D,
-	0x7725,0x773B,0x7735,0x7848,0x7852,0x7849,0x784D,0x784A,
-	0x784C,0x7826,0x7845,0x7850,0x7964,0x7967,0x7969,0x796A,
-	0x7963,0x796B,0x7961,0x79BB,0x79FA,0x79F8,0x79F6,0x79F7,
-	0x7A8F,0x7A94,0x7A90,0x7B35,0x7B47,0x7B34,0x7B25,0x7B30,
-	0x7B22,0x7B24,0x7B33,0x7B18,0x7B2A,0x7B1D,0x7B31,0x7B2B,
-	0x7B2D,0x7B2F,0x7B32,0x7B38,0x7B1A,0x7B23,0x7C94,0x7C98,
-	0x7C96,0x7CA3,0x7D35,0x7D3D,0x7D38,0x7D36,0x7D3A,0x7D45,
-	0x7D2C,0x7D29,0x7D41,0x7D47,0x7D3E,0x7D3F,0x7D4A,0x7D3B,
-	0x7D28,0x7F63,0x7F95,0x7F9C,0x7F9D,0x7F9B,0x7FCA,0x7FCB,
-	0x7FCD,0x7FD0,0x7FD1,0x7FC7,0x7FCF,0x7FC9,0x801F,INVALC,
-	/* Block 216, Array index 0x3600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x801E,0x801B,0x8047,0x8043,0x8048,0x8118,0x8125,0x8119,
-	0x811B,0x812D,0x811F,0x812C,0x811E,0x8121,0x8115,0x8127,
-	0x811D,0x8122,0x8211,0x8238,0x8233,0x823A,0x8234,0x8232,
-	0x8274,0x8390,0x83A3,0x83A8,0x838D,0x837A,0x8373,0x83A4,
-	0x8374,0x838F,0x8381,0x8395,0x8399,0x8375,0x8394,0x83A9,
-	0x837D,0x8383,0x838C,0x839D,0x839B,0x83AA,0x838B,0x837E,
-	0x83A5,0x83AF,0x8388,0x8397,0x83B0,0x837F,0x83A6,0x8387,
-	0x83AE,0x8376,0x839A,0x8659,0x8656,0x86BF,0x86B7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x86C2,0x86C1,0x86C5,0x86BA,0x86B0,0x86C8,0x86B9,
-	0x86B3,0x86B8,0x86CC,0x86B4,0x86BB,0x86BC,0x86C3,0x86BD,
-	0x86BE,0x8852,0x8889,0x8895,0x88A8,0x88A2,0x88AA,0x889A,
-	0x8891,0x88A1,0x889F,0x8898,0x88A7,0x8899,0x889B,0x8897,
-	0x88A4,0x88AC,0x888C,0x8893,0x888E,0x8982,0x89D6,0x89D9,
-	0x89D5,0x8A30,0x8A27,0x8A2C,0x8A1E,0x8C39,0x8C3B,0x8C5C,
-	0x8C5D,0x8C7D,0x8CA5,0x8D7D,0x8D7B,0x8D79,0x8DBC,0x8DC2,
-	0x8DB9,0x8DBF,0x8DC1,0x8ED8,0x8EDE,0x8EDD,0x8EDC,0x8ED7,
-	0x8EE0,0x8EE1,0x9024,0x900B,0x9011,0x901C,0x900C,0x9021,
-	0x90EF,0x90EA,0x90F0,0x90F4,0x90F2,0x90F3,0x90D4,0x90EB,
-	0x90EC,0x90E9,0x9156,0x9158,0x915A,0x9153,0x9155,0x91EC,
-	0x91F4,0x91F1,0x91F3,0x91F8,0x91E4,0x91F9,0x91EA,INVALC,
-	/* Block 217, Array index 0x3700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x91EB,0x91F7,0x91E8,0x91EE,0x957A,0x9586,0x9588,0x967C,
-	0x966D,0x966B,0x9671,0x966F,0x96BF,0x976A,0x9804,0x98E5,
-	0x9997,0x509B,0x5095,0x5094,0x509E,0x508B,0x50A3,0x5083,
-	0x508C,0x508E,0x509D,0x5068,0x509C,0x5092,0x5082,0x5087,
-	0x515F,0x51D4,0x5312,0x5311,0x53A4,0x53A7,0x5591,0x55A8,
-	0x55A5,0x55AD,0x5577,0x5645,0x55A2,0x5593,0x5588,0x558F,
-	0x55B5,0x5581,0x55A3,0x5592,0x55A4,0x557D,0x558C,0x55A6,
-	0x557F,0x5595,0x55A1,0x558E,0x570C,0x5829,0x5837,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5819,0x581E,0x5827,0x5823,0x5828,0x57F5,0x5848,
-	0x5825,0x581C,0x581B,0x5833,0x583F,0x5836,0x582E,0x5839,
-	0x5838,0x582D,0x582C,0x583B,0x5961,0x5AAF,0x5A94,0x5A9F,
-	0x5A7A,0x5AA2,0x5A9E,0x5A78,0x5AA6,0x5A7C,0x5AA5,0x5AAC,
-	0x5A95,0x5AAE,0x5A37,0x5A84,0x5A8A,0x5A97,0x5A83,0x5A8B,
-	0x5AA9,0x5A7B,0x5A7D,0x5A8C,0x5A9C,0x5A8F,0x5A93,0x5A9D,
-	0x5BEA,0x5BCD,0x5BCB,0x5BD4,0x5BD1,0x5BCA,0x5BCE,0x5C0C,
-	0x5C30,0x5D37,0x5D43,0x5D6B,0x5D41,0x5D4B,0x5D3F,0x5D35,
-	0x5D51,0x5D4E,0x5D55,0x5D33,0x5D3A,0x5D52,0x5D3D,0x5D31,
-	0x5D59,0x5D42,0x5D39,0x5D49,0x5D38,0x5D3C,0x5D32,0x5D36,
-	0x5D40,0x5D45,0x5E44,0x5E41,0x5F58,0x5FA6,0x5FA5,0x5FAB,
-	0x60C9,0x60B9,0x60CC,0x60E2,0x60CE,0x60C4,0x6114,INVALC,
-	/* Block 218, Array index 0x3800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x60F2,0x610A,0x6116,0x6105,0x60F5,0x6113,0x60F8,0x60FC,
-	0x60FE,0x60C1,0x6103,0x6118,0x611D,0x6110,0x60FF,0x6104,
-	0x610B,0x624A,0x6394,0x63B1,0x63B0,0x63CE,0x63E5,0x63E8,
-	0x63EF,0x63C3,0x649D,0x63F3,0x63CA,0x63E0,0x63F6,0x63D5,
-	0x63F2,0x63F5,0x6461,0x63DF,0x63BE,0x63DD,0x63DC,0x63C4,
-	0x63D8,0x63D3,0x63C2,0x63C7,0x63CC,0x63CB,0x63C8,0x63F0,
-	0x63D7,0x63D9,0x6532,0x6567,0x656A,0x6564,0x655C,0x6568,
-	0x6565,0x658C,0x659D,0x659E,0x65AE,0x65D0,0x65D2,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x667C,0x666C,0x667B,0x6680,0x6671,0x6679,0x666A,
-	0x6672,0x6701,0x690C,0x68D3,0x6904,0x68DC,0x692A,0x68EC,
-	0x68EA,0x68F1,0x690F,0x68D6,0x68F7,0x68EB,0x68E4,0x68F6,
-	0x6913,0x6910,0x68F3,0x68E1,0x6907,0x68CC,0x6908,0x6970,
-	0x68B4,0x6911,0x68EF,0x68C6,0x6914,0x68F8,0x68D0,0x68FD,
-	0x68FC,0x68E8,0x690B,0x690A,0x6917,0x68CE,0x68C8,0x68DD,
-	0x68DE,0x68E6,0x68F4,0x68D1,0x6906,0x68D4,0x68E9,0x6915,
-	0x6925,0x68C7,0x6B39,0x6B3B,0x6B3F,0x6B3C,0x6B94,0x6B97,
-	0x6B99,0x6B95,0x6BBD,0x6BF0,0x6BF2,0x6BF3,0x6C30,0x6DFC,
-	0x6E46,0x6E47,0x6E1F,0x6E49,0x6E88,0x6E3C,0x6E3D,0x6E45,
-	0x6E62,0x6E2B,0x6E3F,0x6E41,0x6E5D,0x6E73,0x6E1C,0x6E33,
-	0x6E4B,0x6E40,0x6E51,0x6E3B,0x6E03,0x6E2E,0x6E5E,INVALC,
-	/* Block 219, Array index 0x3900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6E68,0x6E5C,0x6E61,0x6E31,0x6E28,0x6E60,0x6E71,0x6E6B,
-	0x6E39,0x6E22,0x6E30,0x6E53,0x6E65,0x6E27,0x6E78,0x6E64,
-	0x6E77,0x6E55,0x6E79,0x6E52,0x6E66,0x6E35,0x6E36,0x6E5A,
-	0x7120,0x711E,0x712F,0x70FB,0x712E,0x7131,0x7123,0x7125,
-	0x7122,0x7132,0x711F,0x7128,0x713A,0x711B,0x724B,0x725A,
-	0x7288,0x7289,0x7286,0x7285,0x728B,0x7312,0x730B,0x7330,
-	0x7322,0x7331,0x7333,0x7327,0x7332,0x732D,0x7326,0x7323,
-	0x7335,0x730C,0x742E,0x742C,0x7430,0x742B,0x7416,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x741A,0x7421,0x742D,0x7431,0x7424,0x7423,0x741D,
-	0x7429,0x7420,0x7432,0x74FB,0x752F,0x756F,0x756C,0x75E7,
-	0x75DA,0x75E1,0x75E6,0x75DD,0x75DF,0x75E4,0x75D7,0x7695,
-	0x7692,0x76DA,0x7746,0x7747,0x7744,0x774D,0x7745,0x774A,
-	0x774E,0x774B,0x774C,0x77DE,0x77EC,0x7860,0x7864,0x7865,
-	0x785C,0x786D,0x7871,0x786A,0x786E,0x7870,0x7869,0x7868,
-	0x785E,0x7862,0x7974,0x7973,0x7972,0x7970,0x7A02,0x7A0A,
-	0x7A03,0x7A0C,0x7A04,0x7A99,0x7AE6,0x7AE4,0x7B4A,0x7B3B,
-	0x7B44,0x7B48,0x7B4C,0x7B4E,0x7B40,0x7B58,0x7B45,0x7CA2,
-	0x7C9E,0x7CA8,0x7CA1,0x7D58,0x7D6F,0x7D63,0x7D53,0x7D56,
-	0x7D67,0x7D6A,0x7D4F,0x7D6D,0x7D5C,0x7D6B,0x7D52,0x7D54,
-	0x7D69,0x7D51,0x7D5F,0x7D4E,0x7F3E,0x7F3F,0x7F65,INVALC,
-	/* Block 220, Array index 0x3A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7F66,0x7FA2,0x7FA0,0x7FA1,0x7FD7,0x8051,0x804F,0x8050,
-	0x80FE,0x80D4,0x8143,0x814A,0x8152,0x814F,0x8147,0x813D,
-	0x814D,0x813A,0x81E6,0x81EE,0x81F7,0x81F8,0x81F9,0x8204,
-	0x823C,0x823D,0x823F,0x8275,0x833B,0x83CF,0x83F9,0x8423,
-	0x83C0,0x83E8,0x8412,0x83E7,0x83E4,0x83FC,0x83F6,0x8410,
-	0x83C6,0x83C8,0x83EB,0x83E3,0x83BF,0x8401,0x83DD,0x83E5,
-	0x83D8,0x83FF,0x83E1,0x83CB,0x83CE,0x83D6,0x83F5,0x83C9,
-	0x8409,0x840F,0x83DE,0x8411,0x8406,0x83C2,0x83F3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x83D5,0x83FA,0x83C7,0x83D1,0x83EA,0x8413,0x83C3,
-	0x83EC,0x83EE,0x83C4,0x83FB,0x83D7,0x83E2,0x841B,0x83DB,
-	0x83FE,0x86D8,0x86E2,0x86E6,0x86D3,0x86E3,0x86DA,0x86EA,
-	0x86DD,0x86EB,0x86DC,0x86EC,0x86E9,0x86D7,0x86E8,0x86D1,
-	0x8848,0x8856,0x8855,0x88BA,0x88D7,0x88B9,0x88B8,0x88C0,
-	0x88BE,0x88B6,0x88BC,0x88B7,0x88BD,0x88B2,0x8901,0x88C9,
-	0x8995,0x8998,0x8997,0x89DD,0x89DA,0x89DB,0x8A4E,0x8A4D,
-	0x8A39,0x8A59,0x8A40,0x8A57,0x8A58,0x8A44,0x8A45,0x8A52,
-	0x8A48,0x8A51,0x8A4A,0x8A4C,0x8A4F,0x8C5F,0x8C81,0x8C80,
-	0x8CBA,0x8CBE,0x8CB0,0x8CB9,0x8CB5,0x8D84,0x8D80,0x8D89,
-	0x8DD8,0x8DD3,0x8DCD,0x8DC7,0x8DD6,0x8DDC,0x8DCF,0x8DD5,
-	0x8DD9,0x8DC8,0x8DD7,0x8DC5,0x8EEF,0x8EF7,0x8EFA,INVALC,
-	/* Block 221, Array index 0x3B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8EF9,0x8EE6,0x8EEE,0x8EE5,0x8EF5,0x8EE7,0x8EE8,0x8EF6,
-	0x8EEB,0x8EF1,0x8EEC,0x8EF4,0x8EE9,0x902D,0x9034,0x902F,
-	0x9106,0x912C,0x9104,0x90FF,0x90FC,0x9108,0x90F9,0x90FB,
-	0x9101,0x9100,0x9107,0x9105,0x9103,0x9161,0x9164,0x915F,
-	0x9162,0x9160,0x9201,0x920A,0x9225,0x9203,0x921A,0x9226,
-	0x920F,0x920C,0x9200,0x9212,0x91FF,0x91FD,0x9206,0x9204,
-	0x9227,0x9202,0x921C,0x9224,0x9219,0x9217,0x9205,0x9216,
-	0x957B,0x958D,0x958C,0x9590,0x9687,0x967E,0x9688,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9689,0x9683,0x9680,0x96C2,0x96C8,0x96C3,0x96F1,
-	0x96F0,0x976C,0x9770,0x976E,0x9807,0x98A9,0x98EB,0x9CE6,
-	0x9EF9,0x4E83,0x4E84,0x4EB6,0x50BD,0x50BF,0x50C6,0x50AE,
-	0x50C4,0x50CA,0x50B4,0x50C8,0x50C2,0x50B0,0x50C1,0x50BA,
-	0x50B1,0x50CB,0x50C9,0x50B6,0x50B8,0x51D7,0x527A,0x5278,
-	0x527B,0x527C,0x55C3,0x55DB,0x55CC,0x55D0,0x55CB,0x55CA,
-	0x55DD,0x55C0,0x55D4,0x55C4,0x55E9,0x55BF,0x55D2,0x558D,
-	0x55CF,0x55D5,0x55E2,0x55D6,0x55C8,0x55F2,0x55CD,0x55D9,
-	0x55C2,0x5714,0x5853,0x5868,0x5864,0x584F,0x584D,0x5849,
-	0x586F,0x5855,0x584E,0x585D,0x5859,0x5865,0x585B,0x583D,
-	0x5863,0x5871,0x58FC,0x5AC7,0x5AC4,0x5ACB,0x5ABA,0x5AB8,
-	0x5AB1,0x5AB5,0x5AB0,0x5ABF,0x5AC8,0x5ABB,0x5AC6,INVALC,
-	/* Block 222, Array index 0x3C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5AB7,0x5AC0,0x5ACA,0x5AB4,0x5AB6,0x5ACD,0x5AB9,0x5A90,
-	0x5BD6,0x5BD8,0x5BD9,0x5C1F,0x5C33,0x5D71,0x5D63,0x5D4A,
-	0x5D65,0x5D72,0x5D6C,0x5D5E,0x5D68,0x5D67,0x5D62,0x5DF0,
-	0x5E4F,0x5E4E,0x5E4A,0x5E4D,0x5E4B,0x5EC5,0x5ECC,0x5EC6,
-	0x5ECB,0x5EC7,0x5F40,0x5FAF,0x5FAD,0x60F7,0x6149,0x614A,
-	0x612B,0x6145,0x6136,0x6132,0x612E,0x6146,0x612F,0x614F,
-	0x6129,0x6140,0x6220,0x9168,0x6223,0x6225,0x6224,0x63C5,
-	0x63F1,0x63EB,0x6410,0x6412,0x6409,0x6420,0x6424,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6433,0x6443,0x641F,0x6415,0x6418,0x6439,0x6437,
-	0x6422,0x6423,0x640C,0x6426,0x6430,0x6428,0x6441,0x6435,
-	0x642F,0x640A,0x641A,0x6440,0x6425,0x6427,0x640B,0x63E7,
-	0x641B,0x642E,0x6421,0x640E,0x656F,0x6592,0x65D3,0x6686,
-	0x668C,0x6695,0x6690,0x668B,0x668A,0x6699,0x6694,0x6678,
-	0x6720,0x6966,0x695F,0x6938,0x694E,0x6962,0x6971,0x693F,
-	0x6945,0x696A,0x6939,0x6942,0x6957,0x6959,0x697A,0x6948,
-	0x6949,0x6935,0x696C,0x6933,0x693D,0x6965,0x68F0,0x6978,
-	0x6934,0x6969,0x6940,0x696F,0x6944,0x6976,0x6958,0x6941,
-	0x6974,0x694C,0x693B,0x694B,0x6937,0x695C,0x694F,0x6951,
-	0x6932,0x6952,0x692F,0x697B,0x693C,0x6B46,0x6B45,0x6B43,
-	0x6B42,0x6B48,0x6B41,0x6B9B,0xFA0D,0x6BFB,0x6BFC,INVALC,
-	/* Block 223, Array index 0x3D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6BF9,0x6BF7,0x6BF8,0x6E9B,0x6ED6,0x6EC8,0x6E8F,0x6EC0,
-	0x6E9F,0x6E93,0x6E94,0x6EA0,0x6EB1,0x6EB9,0x6EC6,0x6ED2,
-	0x6EBD,0x6EC1,0x6E9E,0x6EC9,0x6EB7,0x6EB0,0x6ECD,0x6EA6,
-	0x6ECF,0x6EB2,0x6EBE,0x6EC3,0x6EDC,0x6ED8,0x6E99,0x6E92,
-	0x6E8E,0x6E8D,0x6EA4,0x6EA1,0x6EBF,0x6EB3,0x6ED0,0x6ECA,
-	0x6E97,0x6EAE,0x6EA3,0x7147,0x7154,0x7152,0x7163,0x7160,
-	0x7141,0x715D,0x7162,0x7172,0x7178,0x716A,0x7161,0x7142,
-	0x7158,0x7143,0x714B,0x7170,0x715F,0x7150,0x7153,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7144,0x714D,0x715A,0x724F,0x728D,0x728C,0x7291,
-	0x7290,0x728E,0x733C,0x7342,0x733B,0x733A,0x7340,0x734A,
-	0x7349,0x7444,0x744A,0x744B,0x7452,0x7451,0x7457,0x7440,
-	0x744F,0x7450,0x744E,0x7442,0x7446,0x744D,0x7454,0x74E1,
-	0x74FF,0x74FE,0x74FD,0x751D,0x7579,0x7577,0x6983,0x75EF,
-	0x760F,0x7603,0x75F7,0x75FE,0x75FC,0x75F9,0x75F8,0x7610,
-	0x75FB,0x75F6,0x75ED,0x75F5,0x75FD,0x7699,0x76B5,0x76DD,
-	0x7755,0x775F,0x7760,0x7752,0x7756,0x775A,0x7769,0x7767,
-	0x7754,0x7759,0x776D,0x77E0,0x7887,0x789A,0x7894,0x788F,
-	0x7884,0x7895,0x7885,0x7886,0x78A1,0x7883,0x7879,0x7899,
-	0x7880,0x7896,0x787B,0x797C,0x7982,0x797D,0x7979,0x7A11,
-	0x7A18,0x7A19,0x7A12,0x7A17,0x7A15,0x7A22,0x7A13,INVALC,
-	/* Block 224, Array index 0x3E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7A1B,0x7A10,0x7AA3,0x7AA2,0x7A9E,0x7AEB,0x7B66,0x7B64,
-	0x7B6D,0x7B74,0x7B69,0x7B72,0x7B65,0x7B73,0x7B71,0x7B70,
-	0x7B61,0x7B78,0x7B76,0x7B63,0x7CB2,0x7CB4,0x7CAF,0x7D88,
-	0x7D86,0x7D80,0x7D8D,0x7D7F,0x7D85,0x7D7A,0x7D8E,0x7D7B,
-	0x7D83,0x7D7C,0x7D8C,0x7D94,0x7D84,0x7D7D,0x7D92,0x7F6D,
-	0x7F6B,0x7F67,0x7F68,0x7F6C,0x7FA6,0x7FA5,0x7FA7,0x7FDB,
-	0x7FDC,0x8021,0x8164,0x8160,0x8177,0x815C,0x8169,0x815B,
-	0x8162,0x8172,0x6721,0x815E,0x8176,0x8167,0x816F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8144,0x8161,0x821D,0x8249,0x8244,0x8240,0x8242,
-	0x8245,0x84F1,0x843F,0x8456,0x8476,0x8479,0x848F,0x848D,
-	0x8465,0x8451,0x8440,0x8486,0x8467,0x8430,0x844D,0x847D,
-	0x845A,0x8459,0x8474,0x8473,0x845D,0x8507,0x845E,0x8437,
-	0x843A,0x8434,0x847A,0x8443,0x8478,0x8432,0x8445,0x8429,
-	0x83D9,0x844B,0x842F,0x8442,0x842D,0x845F,0x8470,0x8439,
-	0x844E,0x844C,0x8452,0x846F,0x84C5,0x848E,0x843B,0x8447,
-	0x8436,0x8433,0x8468,0x847E,0x8444,0x842B,0x8460,0x8454,
-	0x846E,0x8450,0x870B,0x8704,0x86F7,0x870C,0x86FA,0x86D6,
-	0x86F5,0x874D,0x86F8,0x870E,0x8709,0x8701,0x86F6,0x870D,
-	0x8705,0x88D6,0x88CB,0x88CD,0x88CE,0x88DE,0x88DB,0x88DA,
-	0x88CC,0x88D0,0x8985,0x899B,0x89DF,0x89E5,0x89E4,INVALC,
-	/* Block 225, Array index 0x3F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x89E1,0x89E0,0x89E2,0x89DC,0x89E6,0x8A76,0x8A86,0x8A7F,
-	0x8A61,0x8A3F,0x8A77,0x8A82,0x8A84,0x8A75,0x8A83,0x8A81,
-	0x8A74,0x8A7A,0x8C3C,0x8C4B,0x8C4A,0x8C65,0x8C64,0x8C66,
-	0x8C86,0x8C84,0x8C85,0x8CCC,0x8D68,0x8D69,0x8D91,0x8D8C,
-	0x8D8E,0x8D8F,0x8D8D,0x8D93,0x8D94,0x8D90,0x8D92,0x8DF0,
-	0x8DE0,0x8DEC,0x8DF1,0x8DEE,0x8DD0,0x8DE9,0x8DE3,0x8DE2,
-	0x8DE7,0x8DF2,0x8DEB,0x8DF4,0x8F06,0x8EFF,0x8F01,0x8F00,
-	0x8F05,0x8F07,0x8F08,0x8F02,0x8F0B,0x9052,0x903F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9044,0x9049,0x903D,0x9110,0x910D,0x910F,0x9111,
-	0x9116,0x9114,0x910B,0x910E,0x916E,0x916F,0x9248,0x9252,
-	0x9230,0x923A,0x9266,0x9233,0x9265,0x925E,0x9283,0x922E,
-	0x924A,0x9246,0x926D,0x926C,0x924F,0x9260,0x9267,0x926F,
-	0x9236,0x9261,0x9270,0x9231,0x9254,0x9263,0x9250,0x9272,
-	0x924E,0x9253,0x924C,0x9256,0x9232,0x959F,0x959C,0x959E,
-	0x959B,0x9692,0x9693,0x9691,0x9697,0x96CE,0x96FA,0x96FD,
-	0x96F8,0x96F5,0x9773,0x9777,0x9778,0x9772,0x980F,0x980D,
-	0x980E,0x98AC,0x98F6,0x98F9,0x99AF,0x99B2,0x99B0,0x99B5,
-	0x9AAD,0x9AAB,0x9B5B,0x9CEA,0x9CED,0x9CE7,0x9E80,0x9EFD,
-	0x50E6,0x50D4,0x50D7,0x50E8,0x50F3,0x50DB,0x50EA,0x50DD,
-	0x50E4,0x50D3,0x50EC,0x50F0,0x50EF,0x50E3,0x50E0,INVALC,
-	/* Block 226, Array index 0x4000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x51D8,0x5280,0x5281,0x52E9,0x52EB,0x5330,0x53AC,0x5627,
-	0x5615,0x560C,0x5612,0x55FC,0x560F,0x561C,0x5601,0x5613,
-	0x5602,0x55FA,0x561D,0x5604,0x55FF,0x55F9,0x5889,0x587C,
-	0x5890,0x5898,0x5886,0x5881,0x587F,0x5874,0x588B,0x587A,
-	0x5887,0x5891,0x588E,0x5876,0x5882,0x5888,0x587B,0x5894,
-	0x588F,0x58FE,0x596B,0x5ADC,0x5AEE,0x5AE5,0x5AD5,0x5AEA,
-	0x5ADA,0x5AED,0x5AEB,0x5AF3,0x5AE2,0x5AE0,0x5ADB,0x5AEC,
-	0x5ADE,0x5ADD,0x5AD9,0x5AE8,0x5ADF,0x5B77,0x5BE0,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5BE3,0x5C63,0x5D82,0x5D80,0x5D7D,0x5D86,0x5D7A,
-	0x5D81,0x5D77,0x5D8A,0x5D89,0x5D88,0x5D7E,0x5D7C,0x5D8D,
-	0x5D79,0x5D7F,0x5E58,0x5E59,0x5E53,0x5ED8,0x5ED1,0x5ED7,
-	0x5ECE,0x5EDC,0x5ED5,0x5ED9,0x5ED2,0x5ED4,0x5F44,0x5F43,
-	0x5F6F,0x5FB6,0x612C,0x6128,0x6141,0x615E,0x6171,0x6173,
-	0x6152,0x6153,0x6172,0x616C,0x6180,0x6174,0x6154,0x617A,
-	0x615B,0x6165,0x613B,0x616A,0x6161,0x6156,0x6229,0x6227,
-	0x622B,0x642B,0x644D,0x645B,0x645D,0x6474,0x6476,0x6472,
-	0x6473,0x647D,0x6475,0x6466,0x64A6,0x644E,0x6482,0x645E,
-	0x645C,0x644B,0x6453,0x6460,0x6450,0x647F,0x643F,0x646C,
-	0x646B,0x6459,0x6465,0x6477,0x6573,0x65A0,0x66A1,0x66A0,
-	0x669F,0x6705,0x6704,0x6722,0x69B1,0x69B6,0x69C9,INVALC,
-	/* Block 227, Array index 0x4100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x69A0,0x69CE,0x6996,0x69B0,0x69AC,0x69BC,0x6991,0x6999,
-	0x698E,0x69A7,0x698D,0x69A9,0x69BE,0x69AF,0x69BF,0x69C4,
-	0x69BD,0x69A4,0x69D4,0x69B9,0x69CA,0x699A,0x69CF,0x69B3,
-	0x6993,0x69AA,0x69A1,0x699E,0x69D9,0x6997,0x6990,0x69C2,
-	0x69B5,0x69A5,0x69C6,0x6B4A,0x6B4D,0x6B4B,0x6B9E,0x6B9F,
-	0x6BA0,0x6BC3,0x6BC4,0x6BFE,0x6ECE,0x6EF5,0x6EF1,0x6F03,
-	0x6F25,0x6EF8,0x6F37,0x6EFB,0x6F2E,0x6F09,0x6F4E,0x6F19,
-	0x6F1A,0x6F27,0x6F18,0x6F3B,0x6F12,0x6EED,0x6F0A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F36,0x6F73,0x6EF9,0x6EEE,0x6F2D,0x6F40,0x6F30,
-	0x6F3C,0x6F35,0x6EEB,0x6F07,0x6F0E,0x6F43,0x6F05,0x6EFD,
-	0x6EF6,0x6F39,0x6F1C,0x6EFC,0x6F3A,0x6F1F,0x6F0D,0x6F1E,
-	0x6F08,0x6F21,0x7187,0x7190,0x7189,0x7180,0x7185,0x7182,
-	0x718F,0x717B,0x7186,0x7181,0x7197,0x7244,0x7253,0x7297,
-	0x7295,0x7293,0x7343,0x734D,0x7351,0x734C,0x7462,0x7473,
-	0x7471,0x7475,0x7472,0x7467,0x746E,0x7500,0x7502,0x7503,
-	0x757D,0x7590,0x7616,0x7608,0x760C,0x7615,0x7611,0x760A,
-	0x7614,0x76B8,0x7781,0x777C,0x7785,0x7782,0x776E,0x7780,
-	0x776F,0x777E,0x7783,0x78B2,0x78AA,0x78B4,0x78AD,0x78A8,
-	0x787E,0x78AB,0x789E,0x78A5,0x78A0,0x78AC,0x78A2,0x78A4,
-	0x7998,0x798A,0x798B,0x7996,0x7995,0x7994,0x7993,INVALC,
-	/* Block 228, Array index 0x4200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7997,0x7988,0x7992,0x7990,0x7A2B,0x7A4A,0x7A30,0x7A2F,
-	0x7A28,0x7A26,0x7AA8,0x7AAB,0x7AAC,0x7AEE,0x7B88,0x7B9C,
-	0x7B8A,0x7B91,0x7B90,0x7B96,0x7B8D,0x7B8C,0x7B9B,0x7B8E,
-	0x7B85,0x7B98,0x5284,0x7B99,0x7BA4,0x7B82,0x7CBB,0x7CBF,
-	0x7CBC,0x7CBA,0x7DA7,0x7DB7,0x7DC2,0x7DA3,0x7DAA,0x7DC1,
-	0x7DC0,0x7DC5,0x7D9D,0x7DCE,0x7DC4,0x7DC6,0x7DCB,0x7DCC,
-	0x7DAF,0x7DB9,0x7D96,0x7DBC,0x7D9F,0x7DA6,0x7DAE,0x7DA9,
-	0x7DA1,0x7DC9,0x7F73,0x7FE2,0x7FE3,0x7FE5,0x7FDE,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8024,0x805D,0x805C,0x8189,0x8186,0x8183,0x8187,
-	0x818D,0x818C,0x818B,0x8215,0x8497,0x84A4,0x84A1,0x849F,
-	0x84BA,0x84CE,0x84C2,0x84AC,0x84AE,0x84AB,0x84B9,0x84B4,
-	0x84C1,0x84CD,0x84AA,0x849A,0x84B1,0x84D0,0x849D,0x84A7,
-	0x84BB,0x84A2,0x8494,0x84C7,0x84CC,0x849B,0x84A9,0x84AF,
-	0x84A8,0x84D6,0x8498,0x84B6,0x84CF,0x84A0,0x84D7,0x84D4,
-	0x84D2,0x84DB,0x84B0,0x8491,0x8661,0x8733,0x8723,0x8728,
-	0x876B,0x8740,0x872E,0x871E,0x8721,0x8719,0x871B,0x8743,
-	0x872C,0x8741,0x873E,0x8746,0x8720,0x8732,0x872A,0x872D,
-	0x873C,0x8712,0x873A,0x8731,0x8735,0x8742,0x8726,0x8727,
-	0x8738,0x8724,0x871A,0x8730,0x8711,0x88F7,0x88E7,0x88F1,
-	0x88F2,0x88FA,0x88FE,0x88EE,0x88FC,0x88F6,0x88FB,INVALC,
-	/* Block 229, Array index 0x4300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x88F0,0x88EC,0x88EB,0x899D,0x89A1,0x899F,0x899E,0x89E9,
-	0x89EB,0x89E8,0x8AAB,0x8A99,0x8A8B,0x8A92,0x8A8F,0x8A96,
-	0x8C3D,0x8C68,0x8C69,0x8CD5,0x8CCF,0x8CD7,0x8D96,0x8E09,
-	0x8E02,0x8DFF,0x8E0D,0x8DFD,0x8E0A,0x8E03,0x8E07,0x8E06,
-	0x8E05,0x8DFE,0x8E00,0x8E04,0x8F10,0x8F11,0x8F0E,0x8F0D,
-	0x9123,0x911C,0x9120,0x9122,0x911F,0x911D,0x911A,0x9124,
-	0x9121,0x911B,0x917A,0x9172,0x9179,0x9173,0x92A5,0x92A4,
-	0x9276,0x929B,0x927A,0x92A0,0x9294,0x92AA,0x928D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x92A6,0x929A,0x92AB,0x9279,0x9297,0x927F,0x92A3,
-	0x92EE,0x928E,0x9282,0x9295,0x92A2,0x927D,0x9288,0x92A1,
-	0x928A,0x9286,0x928C,0x9299,0x92A7,0x927E,0x9287,0x92A9,
-	0x929D,0x928B,0x922D,0x969E,0x96A1,0x96FF,0x9758,0x977D,
-	0x977A,0x977E,0x9783,0x9780,0x9782,0x977B,0x9784,0x9781,
-	0x977F,0x97CE,0x97CD,0x9816,0x98AD,0x98AE,0x9902,0x9900,
-	0x9907,0x999D,0x999C,0x99C3,0x99B9,0x99BB,0x99BA,0x99C2,
-	0x99BD,0x99C7,0x9AB1,0x9AE3,0x9AE7,0x9B3E,0x9B3F,0x9B60,
-	0x9B61,0x9B5F,0x9CF1,0x9CF2,0x9CF5,0x9EA7,0x50FF,0x5103,
-	0x5130,0x50F8,0x5106,0x5107,0x50F6,0x50FE,0x510B,0x510C,
-	0x50FD,0x510A,0x528B,0x528C,0x52F1,0x52EF,0x5648,0x5642,
-	0x564C,0x5635,0x5641,0x564A,0x5649,0x5646,0x5658,INVALC,
-	/* Block 230, Array index 0x4400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x565A,0x5640,0x5633,0x563D,0x562C,0x563E,0x5638,0x562A,
-	0x563A,0x571A,0x58AB,0x589D,0x58B1,0x58A0,0x58A3,0x58AF,
-	0x58AC,0x58A5,0x58A1,0x58FF,0x5AFF,0x5AF4,0x5AFD,0x5AF7,
-	0x5AF6,0x5B03,0x5AF8,0x5B02,0x5AF9,0x5B01,0x5B07,0x5B05,
-	0x5B0F,0x5C67,0x5D99,0x5D97,0x5D9F,0x5D92,0x5DA2,0x5D93,
-	0x5D95,0x5DA0,0x5D9C,0x5DA1,0x5D9A,0x5D9E,0x5E69,0x5E5D,
-	0x5E60,0x5E5C,0x7DF3,0x5EDB,0x5EDE,0x5EE1,0x5F49,0x5FB2,
-	0x618B,0x6183,0x6179,0x61B1,0x61B0,0x61A2,0x6189,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x619B,0x6193,0x61AF,0x61AD,0x619F,0x6192,0x61AA,
-	0x61A1,0x618D,0x6166,0x61B3,0x622D,0x646E,0x6470,0x6496,
-	0x64A0,0x6485,0x6497,0x649C,0x648F,0x648B,0x648A,0x648C,
-	0x64A3,0x649F,0x6468,0x64B1,0x6498,0x6576,0x657A,0x6579,
-	0x657B,0x65B2,0x65B3,0x66B5,0x66B0,0x66A9,0x66B2,0x66B7,
-	0x66AA,0x66AF,0x6A00,0x6A06,0x6A17,0x69E5,0x69F8,0x6A15,
-	0x69F1,0x69E4,0x6A20,0x69FF,0x69EC,0x69E2,0x6A1B,0x6A1D,
-	0x69FE,0x6A27,0x69F2,0x69EE,0x6A14,0x69F7,0x69E7,0x6A40,
-	0x6A08,0x69E6,0x69FB,0x6A0D,0x69FC,0x69EB,0x6A09,0x6A04,
-	0x6A18,0x6A25,0x6A0F,0x69F6,0x6A26,0x6A07,0x69F4,0x6A16,
-	0x6B51,0x6BA5,0x6BA3,0x6BA2,0x6BA6,0x6C01,0x6C00,0x6BFF,
-	0x6C02,0x6F41,0x6F26,0x6F7E,0x6F87,0x6FC6,0x6F92,INVALC,
-	/* Block 231, Array index 0x4500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F8D,0x6F89,0x6F8C,0x6F62,0x6F4F,0x6F85,0x6F5A,0x6F96,
-	0x6F76,0x6F6C,0x6F82,0x6F55,0x6F72,0x6F52,0x6F50,0x6F57,
-	0x6F94,0x6F93,0x6F5D,0x6F00,0x6F61,0x6F6B,0x6F7D,0x6F67,
-	0x6F90,0x6F53,0x6F8B,0x6F69,0x6F7F,0x6F95,0x6F63,0x6F77,
-	0x6F6A,0x6F7B,0x71B2,0x71AF,0x719B,0x71B0,0x71A0,0x719A,
-	0x71A9,0x71B5,0x719D,0x71A5,0x719E,0x71A4,0x71A1,0x71AA,
-	0x719C,0x71A7,0x71B3,0x7298,0x729A,0x7358,0x7352,0x735E,
-	0x735F,0x7360,0x735D,0x735B,0x7361,0x735A,0x7359,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7362,0x7487,0x7489,0x748A,0x7486,0x7481,0x747D,
-	0x7485,0x7488,0x747C,0x7479,0x7508,0x7507,0x757E,0x7625,
-	0x761E,0x7619,0x761D,0x761C,0x7623,0x761A,0x7628,0x761B,
-	0x769C,0x769D,0x769E,0x769B,0x778D,0x778F,0x7789,0x7788,
-	0x78CD,0x78BB,0x78CF,0x78CC,0x78D1,0x78CE,0x78D4,0x78C8,
-	0x78C3,0x78C4,0x78C9,0x799A,0x79A1,0x79A0,0x799C,0x79A2,
-	0x799B,0x6B76,0x7A39,0x7AB2,0x7AB4,0x7AB3,0x7BB7,0x7BCB,
-	0x7BBE,0x7BAC,0x7BCE,0x7BAF,0x7BB9,0x7BCA,0x7BB5,0x7CC5,
-	0x7CC8,0x7CCC,0x7CCB,0x7DF7,0x7DDB,0x7DEA,0x7DE7,0x7DD7,
-	0x7DE1,0x7E03,0x7DFA,0x7DE6,0x7DF6,0x7DF1,0x7DF0,0x7DEE,
-	0x7DDF,0x7F76,0x7FAC,0x7FB0,0x7FAD,0x7FED,0x7FEB,0x7FEA,
-	0x7FEC,0x7FE6,0x7FE8,0x8064,0x8067,0x81A3,0x819F,INVALC,
-	/* Block 232, Array index 0x4600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x819E,0x8195,0x81A2,0x8199,0x8197,0x8216,0x824F,0x8253,
-	0x8252,0x8250,0x824E,0x8251,0x8524,0x853B,0x850F,0x8500,
-	0x8529,0x850E,0x8509,0x850D,0x851F,0x850A,0x8527,0x851C,
-	0x84FB,0x852B,0x84FA,0x8508,0x850C,0x84F4,0x852A,0x84F2,
-	0x8515,0x84F7,0x84EB,0x84F3,0x84FC,0x8512,0x84EA,0x84E9,
-	0x8516,0x84FE,0x8528,0x851D,0x852E,0x8502,0x84FD,0x851E,
-	0x84F6,0x8531,0x8526,0x84E7,0x84E8,0x84F0,0x84EF,0x84F9,
-	0x8518,0x8520,0x8530,0x850B,0x8519,0x852F,0x8662,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8756,0x8763,0x8764,0x8777,0x87E1,0x8773,0x8758,
-	0x8754,0x875B,0x8752,0x8761,0x875A,0x8751,0x875E,0x876D,
-	0x876A,0x8750,0x874E,0x875F,0x875D,0x876F,0x876C,0x877A,
-	0x876E,0x875C,0x8765,0x874F,0x877B,0x8775,0x8762,0x8767,
-	0x8769,0x885A,0x8905,0x890C,0x8914,0x890B,0x8917,0x8918,
-	0x8919,0x8906,0x8916,0x8911,0x890E,0x8909,0x89A2,0x89A4,
-	0x89A3,0x89ED,0x89F0,0x89EC,0x8ACF,0x8AC6,0x8AB8,0x8AD3,
-	0x8AD1,0x8AD4,0x8AD5,0x8ABB,0x8AD7,0x8ABE,0x8AC0,0x8AC5,
-	0x8AD8,0x8AC3,0x8ABA,0x8ABD,0x8AD9,0x8C3E,0x8C4D,0x8C8F,
-	0x8CE5,0x8CDF,0x8CD9,0x8CE8,0x8CDA,0x8CDD,0x8CE7,0x8DA0,
-	0x8D9C,0x8DA1,0x8D9B,0x8E20,0x8E23,0x8E25,0x8E24,0x8E2E,
-	0x8E15,0x8E1B,0x8E16,0x8E11,0x8E19,0x8E26,0x8E27,INVALC,
-	/* Block 233, Array index 0x4700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8E14,0x8E12,0x8E18,0x8E13,0x8E1C,0x8E17,0x8E1A,0x8F2C,
-	0x8F24,0x8F18,0x8F1A,0x8F20,0x8F23,0x8F16,0x8F17,0x9073,
-	0x9070,0x906F,0x9067,0x906B,0x912F,0x912B,0x9129,0x912A,
-	0x9132,0x9126,0x912E,0x9185,0x9186,0x918A,0x9181,0x9182,
-	0x9184,0x9180,0x92D0,0x92C3,0x92C4,0x92C0,0x92D9,0x92B6,
-	0x92CF,0x92F1,0x92DF,0x92D8,0x92E9,0x92D7,0x92DD,0x92CC,
-	0x92EF,0x92C2,0x92E8,0x92CA,0x92C8,0x92CE,0x92E6,0x92CD,
-	0x92D5,0x92C9,0x92E0,0x92DE,0x92E7,0x92D1,0x92D3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x92B5,0x92E1,0x92C6,0x92B4,0x957C,0x95AC,0x95AB,
-	0x95AE,0x95B0,0x96A4,0x96A2,0x96D3,0x9705,0x9708,0x9702,
-	0x975A,0x978A,0x978E,0x9788,0x97D0,0x97CF,0x981E,0x981D,
-	0x9826,0x9829,0x9828,0x9820,0x981B,0x9827,0x98B2,0x9908,
-	0x98FA,0x9911,0x9914,0x9916,0x9917,0x9915,0x99DC,0x99CD,
-	0x99CF,0x99D3,0x99D4,0x99CE,0x99C9,0x99D6,0x99D8,0x99CB,
-	0x99D7,0x99CC,0x9AB3,0x9AEC,0x9AEB,0x9AF3,0x9AF2,0x9AF1,
-	0x9B46,0x9B43,0x9B67,0x9B74,0x9B71,0x9B66,0x9B76,0x9B75,
-	0x9B70,0x9B68,0x9B64,0x9B6C,0x9CFC,0x9CFA,0x9CFD,0x9CFF,
-	0x9CF7,0x9D07,0x9D00,0x9CF9,0x9CFB,0x9D08,0x9D05,0x9D04,
-	0x9E83,0x9ED3,0x9F0F,0x9F10,0x511C,0x5113,0x5117,0x511A,
-	0x5111,0x51DE,0x5334,0x53E1,0x5670,0x5660,0x566E,INVALC,
-	/* Block 234, Array index 0x4800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5673,0x5666,0x5663,0x566D,0x5672,0x565E,0x5677,0x571C,
-	0x571B,0x58C8,0x58BD,0x58C9,0x58BF,0x58BA,0x58C2,0x58BC,
-	0x58C6,0x5B17,0x5B19,0x5B1B,0x5B21,0x5B14,0x5B13,0x5B10,
-	0x5B16,0x5B28,0x5B1A,0x5B20,0x5B1E,0x5BEF,0x5DAC,0x5DB1,
-	0x5DA9,0x5DA7,0x5DB5,0x5DB0,0x5DAE,0x5DAA,0x5DA8,0x5DB2,
-	0x5DAD,0x5DAF,0x5DB4,0x5E67,0x5E68,0x5E66,0x5E6F,0x5EE9,
-	0x5EE7,0x5EE6,0x5EE8,0x5EE5,0x5F4B,0x5FBC,0x619D,0x61A8,
-	0x6196,0x61C5,0x61B4,0x61C6,0x61C1,0x61CC,0x61BA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x61BF,0x61B8,0x618C,0x64D7,0x64D6,0x64D0,0x64CF,
-	0x64C9,0x64BD,0x6489,0x64C3,0x64DB,0x64F3,0x64D9,0x6533,
-	0x657F,0x657C,0x65A2,0x66C8,0x66BE,0x66C0,0x66CA,0x66CB,
-	0x66CF,0x66BD,0x66BB,0x66BA,0x66CC,0x6723,0x6A34,0x6A66,
-	0x6A49,0x6A67,0x6A32,0x6A68,0x6A3E,0x6A5D,0x6A6D,0x6A76,
-	0x6A5B,0x6A51,0x6A28,0x6A5A,0x6A3B,0x6A3F,0x6A41,0x6A6A,
-	0x6A64,0x6A50,0x6A4F,0x6A54,0x6A6F,0x6A69,0x6A60,0x6A3C,
-	0x6A5E,0x6A56,0x6A55,0x6A4D,0x6A4E,0x6A46,0x6B55,0x6B54,
-	0x6B56,0x6BA7,0x6BAA,0x6BAB,0x6BC8,0x6BC7,0x6C04,0x6C03,
-	0x6C06,0x6FAD,0x6FCB,0x6FA3,0x6FC7,0x6FBC,0x6FCE,0x6FC8,
-	0x6F5E,0x6FC4,0x6FBD,0x6F9E,0x6FCA,0x6FA8,0x7004,0x6FA5,
-	0x6FAE,0x6FBA,0x6FAC,0x6FAA,0x6FCF,0x6FBF,0x6FB8,INVALC,
-	/* Block 235, Array index 0x4900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6FA2,0x6FC9,0x6FAB,0x6FCD,0x6FAF,0x6FB2,0x6FB0,0x71C5,
-	0x71C2,0x71BF,0x71B8,0x71D6,0x71C0,0x71C1,0x71CB,0x71D4,
-	0x71CA,0x71C7,0x71CF,0x71BD,0x71D8,0x71BC,0x71C6,0x71DA,
-	0x71DB,0x729D,0x729E,0x7369,0x7366,0x7367,0x736C,0x7365,
-	0x736B,0x736A,0x747F,0x749A,0x74A0,0x7494,0x7492,0x7495,
-	0x74A1,0x750B,0x7580,0x762F,0x762D,0x7631,0x763D,0x7633,
-	0x763C,0x7635,0x7632,0x7630,0x76BB,0x76E6,0x779A,0x779D,
-	0x77A1,0x779C,0x779B,0x77A2,0x77A3,0x7795,0x7799,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7797,0x78DD,0x78E9,0x78E5,0x78EA,0x78DE,0x78E3,
-	0x78DB,0x78E1,0x78E2,0x78ED,0x78DF,0x78E0,0x79A4,0x7A44,
-	0x7A48,0x7A47,0x7AB6,0x7AB8,0x7AB5,0x7AB1,0x7AB7,0x7BDE,
-	0x7BE3,0x7BE7,0x7BDD,0x7BD5,0x7BE5,0x7BDA,0x7BE8,0x7BF9,
-	0x7BD4,0x7BEA,0x7BE2,0x7BDC,0x7BEB,0x7BD8,0x7BDF,0x7CD2,
-	0x7CD4,0x7CD7,0x7CD0,0x7CD1,0x7E12,0x7E21,0x7E17,0x7E0C,
-	0x7E1F,0x7E20,0x7E13,0x7E0E,0x7E1C,0x7E15,0x7E1A,0x7E22,
-	0x7E0B,0x7E0F,0x7E16,0x7E0D,0x7E14,0x7E25,0x7E24,0x7F43,
-	0x7F7B,0x7F7C,0x7F7A,0x7FB1,0x7FEF,0x802A,0x8029,0x806C,
-	0x81B1,0x81A6,0x81AE,0x81B9,0x81B5,0x81AB,0x81B0,0x81AC,
-	0x81B4,0x81B2,0x81B7,0x81A7,0x81F2,0x8255,0x8256,0x8257,
-	0x8556,0x8545,0x856B,0x854D,0x8553,0x8561,0x8558,INVALC,
-	/* Block 236, Array index 0x4A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8540,0x8546,0x8564,0x8541,0x8562,0x8544,0x8551,0x8547,
-	0x8563,0x853E,0x855B,0x8571,0x854E,0x856E,0x8575,0x8555,
-	0x8567,0x8560,0x858C,0x8566,0x855D,0x8554,0x8565,0x856C,
-	0x8663,0x8665,0x8664,0x879B,0x878F,0x8797,0x8793,0x8792,
-	0x8788,0x8781,0x8796,0x8798,0x8779,0x8787,0x87A3,0x8785,
-	0x8790,0x8791,0x879D,0x8784,0x8794,0x879C,0x879A,0x8789,
-	0x891E,0x8926,0x8930,0x892D,0x892E,0x8927,0x8931,0x8922,
-	0x8929,0x8923,0x892F,0x892C,0x891F,0x89F1,0x8AE0,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8AE2,0x8AF2,0x8AF4,0x8AF5,0x8ADD,0x8B14,0x8AE4,
-	0x8ADF,0x8AF0,0x8AC8,0x8ADE,0x8AE1,0x8AE8,0x8AFF,0x8AEF,
-	0x8AFB,0x8C91,0x8C92,0x8C90,0x8CF5,0x8CEE,0x8CF1,0x8CF0,
-	0x8CF3,0x8D6C,0x8D6E,0x8DA5,0x8DA7,0x8E33,0x8E3E,0x8E38,
-	0x8E40,0x8E45,0x8E36,0x8E3C,0x8E3D,0x8E41,0x8E30,0x8E3F,
-	0x8EBD,0x8F36,0x8F2E,0x8F35,0x8F32,0x8F39,0x8F37,0x8F34,
-	0x9076,0x9079,0x907B,0x9086,0x90FA,0x9133,0x9135,0x9136,
-	0x9193,0x9190,0x9191,0x918D,0x918F,0x9327,0x931E,0x9308,
-	0x931F,0x9306,0x930F,0x937A,0x9338,0x933C,0x931B,0x9323,
-	0x9312,0x9301,0x9346,0x932D,0x930E,0x930D,0x92CB,0x931D,
-	0x92FA,0x9325,0x9313,0x92F9,0x92F7,0x9334,0x9302,0x9324,
-	0x92FF,0x9329,0x9339,0x9335,0x932A,0x9314,0x930C,INVALC,
-	/* Block 237, Array index 0x4B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x930B,0x92FE,0x9309,0x9300,0x92FB,0x9316,0x95BC,0x95CD,
-	0x95BE,0x95B9,0x95BA,0x95B6,0x95BF,0x95B5,0x95BD,0x96A9,
-	0x96D4,0x970B,0x9712,0x9710,0x9799,0x9797,0x9794,0x97F0,
-	0x97F8,0x9835,0x982F,0x9832,0x9924,0x991F,0x9927,0x9929,
-	0x999E,0x99EE,0x99EC,0x99E5,0x99E4,0x99F0,0x99E3,0x99EA,
-	0x99E9,0x99E7,0x9AB9,0x9ABF,0x9AB4,0x9ABB,0x9AF6,0x9AFA,
-	0x9AF9,0x9AF7,0x9B33,0x9B80,0x9B85,0x9B87,0x9B7C,0x9B7E,
-	0x9B7B,0x9B82,0x9B93,0x9B92,0x9B90,0x9B7A,0x9B95,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9B7D,0x9B88,0x9D25,0x9D17,0x9D20,0x9D1E,0x9D14,
-	0x9D29,0x9D1D,0x9D18,0x9D22,0x9D10,0x9D19,0x9D1F,0x9E88,
-	0x9E86,0x9E87,0x9EAE,0x9EAD,0x9ED5,0x9ED6,0x9EFA,0x9F12,
-	0x9F3D,0x5126,0x5125,0x5122,0x5124,0x5120,0x5129,0x52F4,
-	0x5693,0x568C,0x568D,0x5686,0x5684,0x5683,0x567E,0x5682,
-	0x567F,0x5681,0x58D6,0x58D4,0x58CF,0x58D2,0x5B2D,0x5B25,
-	0x5B32,0x5B23,0x5B2C,0x5B27,0x5B26,0x5B2F,0x5B2E,0x5B7B,
-	0x5BF1,0x5BF2,0x5DB7,0x5E6C,0x5E6A,0x5FBE,0x5FBB,0x61C3,
-	0x61B5,0x61BC,0x61E7,0x61E0,0x61E5,0x61E4,0x61E8,0x61DE,
-	0x64EF,0x64E9,0x64E3,0x64EB,0x64E4,0x64E8,0x6581,0x6580,
-	0x65B6,0x65DA,0x66D2,0x6A8D,0x6A96,0x6A81,0x6AA5,0x6A89,
-	0x6A9F,0x6A9B,0x6AA1,0x6A9E,0x6A87,0x6A93,0x6A8E,INVALC,
-	/* Block 238, Array index 0x4C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6A95,0x6A83,0x6AA8,0x6AA4,0x6A91,0x6A7F,0x6AA6,0x6A9A,
-	0x6A85,0x6A8C,0x6A92,0x6B5B,0x6BAD,0x6C09,0x6FCC,0x6FA9,
-	0x6FF4,0x6FD4,0x6FE3,0x6FDC,0x6FED,0x6FE7,0x6FE6,0x6FDE,
-	0x6FF2,0x6FDD,0x6FE2,0x6FE8,0x71E1,0x71F1,0x71E8,0x71F2,
-	0x71E4,0x71F0,0x71E2,0x7373,0x736E,0x736F,0x7497,0x74B2,
-	0x74AB,0x7490,0x74AA,0x74AD,0x74B1,0x74A5,0x74AF,0x7510,
-	0x7511,0x7512,0x750F,0x7584,0x7643,0x7648,0x7649,0x7647,
-	0x76A4,0x76E9,0x77B5,0x77AB,0x77B2,0x77B7,0x77B6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x77B4,0x77B1,0x77A8,0x77F0,0x78F3,0x78FD,0x7902,
-	0x78FB,0x78FC,0x78F2,0x7905,0x78F9,0x78FE,0x7904,0x79AB,
-	0x79A8,0x7A5C,0x7A5B,0x7A56,0x7A58,0x7A54,0x7A5A,0x7ABE,
-	0x7AC0,0x7AC1,0x7C05,0x7C0F,0x7BF2,0x7C00,0x7BFF,0x7BFB,
-	0x7C0E,0x7BF4,0x7C0B,0x7BF3,0x7C02,0x7C09,0x7C03,0x7C01,
-	0x7BF8,0x7BFD,0x7C06,0x7BF0,0x7BF1,0x7C10,0x7C0A,0x7CE8,
-	0x7E2D,0x7E3C,0x7E42,0x7E33,0x9848,0x7E38,0x7E2A,0x7E49,
-	0x7E40,0x7E47,0x7E29,0x7E4C,0x7E30,0x7E3B,0x7E36,0x7E44,
-	0x7E3A,0x7F45,0x7F7F,0x7F7E,0x7F7D,0x7FF4,0x7FF2,0x802C,
-	0x81BB,0x81C4,0x81CC,0x81CA,0x81C5,0x81C7,0x81BC,0x81E9,
-	0x825B,0x825A,0x825C,0x8583,0x8580,0x858F,0x85A7,0x8595,
-	0x85A0,0x858B,0x85A3,0x857B,0x85A4,0x859A,0x859E,INVALC,
-	/* Block 239, Array index 0x4D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8577,0x857C,0x8589,0x85A1,0x857A,0x8578,0x8557,0x858E,
-	0x8596,0x8586,0x858D,0x8599,0x859D,0x8581,0x85A2,0x8582,
-	0x8588,0x8585,0x8579,0x8576,0x8598,0x8590,0x859F,0x8668,
-	0x87BE,0x87AA,0x87AD,0x87C5,0x87B0,0x87AC,0x87B9,0x87B5,
-	0x87BC,0x87AE,0x87C9,0x87C3,0x87C2,0x87CC,0x87B7,0x87AF,
-	0x87C4,0x87CA,0x87B4,0x87B6,0x87BF,0x87B8,0x87BD,0x87DE,
-	0x87B2,0x8935,0x8933,0x893C,0x893E,0x8941,0x8952,0x8937,
-	0x8942,0x89AD,0x89AF,0x89AE,0x89F2,0x89F3,0x8B1E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8B18,0x8B16,0x8B11,0x8B05,0x8B0B,0x8B22,0x8B0F,
-	0x8B12,0x8B15,0x8B07,0x8B0D,0x8B08,0x8B06,0x8B1C,0x8B13,
-	0x8B1A,0x8C4F,0x8C70,0x8C72,0x8C71,0x8C6F,0x8C95,0x8C94,
-	0x8CF9,0x8D6F,0x8E4E,0x8E4D,0x8E53,0x8E50,0x8E4C,0x8E47,
-	0x8F43,0x8F40,0x9085,0x907E,0x9138,0x919A,0x91A2,0x919B,
-	0x9199,0x919F,0x91A1,0x919D,0x91A0,0x93A1,0x9383,0x93AF,
-	0x9364,0x9356,0x9347,0x937C,0x9358,0x935C,0x9376,0x9349,
-	0x9350,0x9351,0x9360,0x936D,0x938F,0x934C,0x936A,0x9379,
-	0x9357,0x9355,0x9352,0x934F,0x9371,0x9377,0x937B,0x9361,
-	0x935E,0x9363,0x9367,0x9380,0x934E,0x9359,0x95C7,0x95C0,
-	0x95C9,0x95C3,0x95C5,0x95B7,0x96AE,0x96B0,0x96AC,0x9720,
-	0x971F,0x9718,0x971D,0x9719,0x979A,0x97A1,0x979C,INVALC,
-	/* Block 240, Array index 0x4E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x979E,0x979D,0x97D5,0x97D4,0x97F1,0x9841,0x9844,0x984A,
-	0x9849,0x9845,0x9843,0x9925,0x992B,0x992C,0x992A,0x9933,
-	0x9932,0x992F,0x992D,0x9931,0x9930,0x9998,0x99A3,0x99A1,
-	0x9A02,0x99FA,0x99F4,0x99F7,0x99F9,0x99F8,0x99F6,0x99FB,
-	0x99FD,0x99FE,0x99FC,0x9A03,0x9ABE,0x9AFE,0x9AFD,0x9B01,
-	0x9AFC,0x9B48,0x9B9A,0x9BA8,0x9B9E,0x9B9B,0x9BA6,0x9BA1,
-	0x9BA5,0x9BA4,0x9B86,0x9BA2,0x9BA0,0x9BAF,0x9D33,0x9D41,
-	0x9D67,0x9D36,0x9D2E,0x9D2F,0x9D31,0x9D38,0x9D30,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9D45,0x9D42,0x9D43,0x9D3E,0x9D37,0x9D40,0x9D3D,
-	0x7FF5,0x9D2D,0x9E8A,0x9E89,0x9E8D,0x9EB0,0x9EC8,0x9EDA,
-	0x9EFB,0x9EFF,0x9F24,0x9F23,0x9F22,0x9F54,0x9FA0,0x5131,
-	0x512D,0x512E,0x5698,0x569C,0x5697,0x569A,0x569D,0x5699,
-	0x5970,0x5B3C,0x5C69,0x5C6A,0x5DC0,0x5E6D,0x5E6E,0x61D8,
-	0x61DF,0x61ED,0x61EE,0x61F1,0x61EA,0x61F0,0x61EB,0x61D6,
-	0x61E9,0x64FF,0x6504,0x64FD,0x64F8,0x6501,0x6503,0x64FC,
-	0x6594,0x65DB,0x66DA,0x66DB,0x66D8,0x6AC5,0x6AB9,0x6ABD,
-	0x6AE1,0x6AC6,0x6ABA,0x6AB6,0x6AB7,0x6AC7,0x6AB4,0x6AAD,
-	0x6B5E,0x6BC9,0x6C0B,0x7007,0x700C,0x700D,0x7001,0x7005,
-	0x7014,0x700E,0x6FFF,0x7000,0x6FFB,0x7026,0x6FFC,0x6FF7,
-	0x700A,0x7201,0x71FF,0x71F9,0x7203,0x71FD,0x7376,INVALC,
-	/* Block 241, Array index 0x4F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x74B8,0x74C0,0x74B5,0x74C1,0x74BE,0x74B6,0x74BB,0x74C2,
-	0x7514,0x7513,0x765C,0x7664,0x7659,0x7650,0x7653,0x7657,
-	0x765A,0x76A6,0x76BD,0x76EC,0x77C2,0x77BA,0x78FF,0x790C,
-	0x7913,0x7914,0x7909,0x7910,0x7912,0x7911,0x79AD,0x79AC,
-	0x7A5F,0x7C1C,0x7C29,0x7C19,0x7C20,0x7C1F,0x7C2D,0x7C1D,
-	0x7C26,0x7C28,0x7C22,0x7C25,0x7C30,0x7E5C,0x7E50,0x7E56,
-	0x7E63,0x7E58,0x7E62,0x7E5F,0x7E51,0x7E60,0x7E57,0x7E53,
-	0x7FB5,0x7FB3,0x7FF7,0x7FF8,0x8075,0x81D1,0x81D2,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x81D0,0x825F,0x825E,0x85B4,0x85C6,0x85C0,0x85C3,
-	0x85C2,0x85B3,0x85B5,0x85BD,0x85C7,0x85C4,0x85BF,0x85CB,
-	0x85CE,0x85C8,0x85C5,0x85B1,0x85B6,0x85D2,0x8624,0x85B8,
-	0x85B7,0x85BE,0x8669,0x87E7,0x87E6,0x87E2,0x87DB,0x87EB,
-	0x87EA,0x87E5,0x87DF,0x87F3,0x87E4,0x87D4,0x87DC,0x87D3,
-	0x87ED,0x87D8,0x87E3,0x87A4,0x87D7,0x87D9,0x8801,0x87F4,
-	0x87E8,0x87DD,0x8953,0x894B,0x894F,0x894C,0x8946,0x8950,
-	0x8951,0x8949,0x8B2A,0x8B27,0x8B23,0x8B33,0x8B30,0x8B35,
-	0x8B47,0x8B2F,0x8B3C,0x8B3E,0x8B31,0x8B25,0x8B37,0x8B26,
-	0x8B36,0x8B2E,0x8B24,0x8B3B,0x8B3D,0x8B3A,0x8C42,0x8C75,
-	0x8C99,0x8C98,0x8C97,0x8CFE,0x8D04,0x8D02,0x8D00,0x8E5C,
-	0x8E62,0x8E60,0x8E57,0x8E56,0x8E5E,0x8E65,0x8E67,INVALC,
-	/* Block 242, Array index 0x5000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8E5B,0x8E5A,0x8E61,0x8E5D,0x8E69,0x8E54,0x8F46,0x8F47,
-	0x8F48,0x8F4B,0x9128,0x913A,0x913B,0x913E,0x91A8,0x91A5,
-	0x91A7,0x91AF,0x91AA,0x93B5,0x938C,0x9392,0x93B7,0x939B,
-	0x939D,0x9389,0x93A7,0x938E,0x93AA,0x939E,0x93A6,0x9395,
-	0x9388,0x9399,0x939F,0x938D,0x93B1,0x9391,0x93B2,0x93A4,
-	0x93A8,0x93B4,0x93A3,0x93A5,0x95D2,0x95D3,0x95D1,0x96B3,
-	0x96D7,0x96DA,0x5DC2,0x96DF,0x96D8,0x96DD,0x9723,0x9722,
-	0x9725,0x97AC,0x97AE,0x97A8,0x97AB,0x97A4,0x97AA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x97A2,0x97A5,0x97D7,0x97D9,0x97D6,0x97D8,0x97FA,
-	0x9850,0x9851,0x9852,0x98B8,0x9941,0x993C,0x993A,0x9A0F,
-	0x9A0B,0x9A09,0x9A0D,0x9A04,0x9A11,0x9A0A,0x9A05,0x9A07,
-	0x9A06,0x9AC0,0x9ADC,0x9B08,0x9B04,0x9B05,0x9B29,0x9B35,
-	0x9B4A,0x9B4C,0x9B4B,0x9BC7,0x9BC6,0x9BC3,0x9BBF,0x9BC1,
-	0x9BB5,0x9BB8,0x9BD3,0x9BB6,0x9BC4,0x9BB9,0x9BBD,0x9D5C,
-	0x9D53,0x9D4F,0x9D4A,0x9D5B,0x9D4B,0x9D59,0x9D56,0x9D4C,
-	0x9D57,0x9D52,0x9D54,0x9D5F,0x9D58,0x9D5A,0x9E8E,0x9E8C,
-	0x9EDF,0x9F01,0x9F00,0x9F16,0x9F25,0x9F2B,0x9F2A,0x9F29,
-	0x9F28,0x9F4C,0x9F55,0x5134,0x5135,0x5296,0x52F7,0x53B4,
-	0x56AB,0x56AD,0x56A6,0x56A7,0x56AA,0x56AC,0x58DA,0x58DD,
-	0x58DB,0x5912,0x5B3D,0x5B3E,0x5B3F,0x5DC3,0x5E70,INVALC,
-	/* Block 243, Array index 0x5100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5FBF,0x61FB,0x6507,0x6510,0x650D,0x6509,0x650C,0x650E,
-	0x6584,0x65DE,0x65DD,0x66DE,0x6AE7,0x6AE0,0x6ACC,0x6AD1,
-	0x6AD9,0x6ACB,0x6ADF,0x6ADC,0x6AD0,0x6AEB,0x6ACF,0x6ACD,
-	0x6ADE,0x6B60,0x6BB0,0x6C0C,0x7019,0x7027,0x7020,0x7016,
-	0x702B,0x7021,0x7022,0x7023,0x7029,0x7017,0x7024,0x701C,
-	0x702A,0x720C,0x720A,0x7207,0x7202,0x7205,0x72A5,0x72A6,
-	0x72A4,0x72A3,0x72A1,0x74CB,0x74C5,0x74B7,0x74C3,0x7516,
-	0x7660,0x77C9,0x77CA,0x77C4,0x77F1,0x791D,0x791B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7921,0x791C,0x7917,0x791E,0x79B0,0x7A67,0x7A68,
-	0x7C33,0x7C3C,0x7C39,0x7C2C,0x7C3B,0x7CEC,0x7CEA,0x7E76,
-	0x7E75,0x7E78,0x7E70,0x7E77,0x7E6F,0x7E7A,0x7E72,0x7E74,
-	0x7E68,0x7F4B,0x7F4A,0x7F83,0x7F86,0x7FB7,0x7FFD,0x7FFE,
-	0x8078,0x81D7,0x81D5,0x8264,0x8261,0x8263,0x85EB,0x85F1,
-	0x85ED,0x85D9,0x85E1,0x85E8,0x85DA,0x85D7,0x85EC,0x85F2,
-	0x85F8,0x85D8,0x85DF,0x85E3,0x85DC,0x85D1,0x85F0,0x85E6,
-	0x85EF,0x85DE,0x85E2,0x8800,0x87FA,0x8803,0x87F6,0x87F7,
-	0x8809,0x880C,0x880B,0x8806,0x87FC,0x8808,0x87FF,0x880A,
-	0x8802,0x8962,0x895A,0x895B,0x8957,0x8961,0x895C,0x8958,
-	0x895D,0x8959,0x8988,0x89B7,0x89B6,0x89F6,0x8B50,0x8B48,
-	0x8B4A,0x8B40,0x8B53,0x8B56,0x8B54,0x8B4B,0x8B55,INVALC,
-	/* Block 244, Array index 0x5200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8B51,0x8B42,0x8B52,0x8B57,0x8C43,0x8C77,0x8C76,0x8C9A,
-	0x8D06,0x8D07,0x8D09,0x8DAC,0x8DAA,0x8DAD,0x8DAB,0x8E6D,
-	0x8E78,0x8E73,0x8E6A,0x8E6F,0x8E7B,0x8EC2,0x8F52,0x8F51,
-	0x8F4F,0x8F50,0x8F53,0x8FB4,0x9140,0x913F,0x91B0,0x91AD,
-	0x93DE,0x93C7,0x93CF,0x93C2,0x93DA,0x93D0,0x93F9,0x93EC,
-	0x93CC,0x93D9,0x93A9,0x93E6,0x93CA,0x93D4,0x93EE,0x93E3,
-	0x93D5,0x93C4,0x93CE,0x93C0,0x93D2,0x93E7,0x957D,0x95DA,
-	0x95DB,0x96E1,0x9729,0x972B,0x972C,0x9728,0x9726,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x97B3,0x97B7,0x97B6,0x97DD,0x97DE,0x97DF,0x985C,
-	0x9859,0x985D,0x9857,0x98BF,0x98BD,0x98BB,0x98BE,0x9948,
-	0x9947,0x9943,0x99A6,0x99A7,0x9A1A,0x9A15,0x9A25,0x9A1D,
-	0x9A24,0x9A1B,0x9A22,0x9A20,0x9A27,0x9A23,0x9A1E,0x9A1C,
-	0x9A14,0x9AC2,0x9B0B,0x9B0A,0x9B0E,0x9B0C,0x9B37,0x9BEA,
-	0x9BEB,0x9BE0,0x9BDE,0x9BE4,0x9BE6,0x9BE2,0x9BF0,0x9BD4,
-	0x9BD7,0x9BEC,0x9BDC,0x9BD9,0x9BE5,0x9BD5,0x9BE1,0x9BDA,
-	0x9D77,0x9D81,0x9D8A,0x9D84,0x9D88,0x9D71,0x9D80,0x9D78,
-	0x9D86,0x9D8B,0x9D8C,0x9D7D,0x9D6B,0x9D74,0x9D75,0x9D70,
-	0x9D69,0x9D85,0x9D73,0x9D7B,0x9D82,0x9D6F,0x9D79,0x9D7F,
-	0x9D87,0x9D68,0x9E94,0x9E91,0x9EC0,0x9EFC,0x9F2D,0x9F40,
-	0x9F41,0x9F4D,0x9F56,0x9F57,0x9F58,0x5337,0x56B2,INVALC,
-	/* Block 245, Array index 0x5300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x56B5,0x56B3,0x58E3,0x5B45,0x5DC6,0x5DC7,0x5EEE,0x5EEF,
-	0x5FC0,0x5FC1,0x61F9,0x6517,0x6516,0x6515,0x6513,0x65DF,
-	0x66E8,0x66E3,0x66E4,0x6AF3,0x6AF0,0x6AEA,0x6AE8,0x6AF9,
-	0x6AF1,0x6AEE,0x6AEF,0x703C,0x7035,0x702F,0x7037,0x7034,
-	0x7031,0x7042,0x7038,0x703F,0x703A,0x7039,0x7040,0x703B,
-	0x7033,0x7041,0x7213,0x7214,0x72A8,0x737D,0x737C,0x74BA,
-	0x76AB,0x76AA,0x76BE,0x76ED,0x77CC,0x77CE,0x77CF,0x77CD,
-	0x77F2,0x7925,0x7923,0x7927,0x7928,0x7924,0x7929,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x79B2,0x7A6E,0x7A6C,0x7A6D,0x7AF7,0x7C49,0x7C48,
-	0x7C4A,0x7C47,0x7C45,0x7CEE,0x7E7B,0x7E7E,0x7E81,0x7E80,
-	0x7FBA,0x7FFF,0x8079,0x81DB,0x81D9,0x820B,0x8268,0x8269,
-	0x8622,0x85FF,0x8601,0x85FE,0x861B,0x8600,0x85F6,0x8604,
-	0x8609,0x8605,0x860C,0x85FD,0x8819,0x8810,0x8811,0x8817,
-	0x8813,0x8816,0x8963,0x8966,0x89B9,0x89F7,0x8B60,0x8B6A,
-	0x8B5D,0x8B68,0x8B63,0x8B65,0x8B67,0x8B6D,0x8DAE,0x8E86,
-	0x8E88,0x8E84,0x8F59,0x8F56,0x8F57,0x8F55,0x8F58,0x8F5A,
-	0x908D,0x9143,0x9141,0x91B7,0x91B5,0x91B2,0x91B3,0x940B,
-	0x9413,0x93FB,0x9420,0x940F,0x9414,0x93FE,0x9415,0x9410,
-	0x9428,0x9419,0x940D,0x93F5,0x9400,0x93F7,0x9407,0x940E,
-	0x9416,0x9412,0x93FA,0x9409,0x93F8,0x940A,0x93FF,INVALC,
-	/* Block 246, Array index 0x5400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x93FC,0x940C,0x93F6,0x9411,0x9406,0x95DE,0x95E0,0x95DF,
-	0x972E,0x972F,0x97B9,0x97BB,0x97FD,0x97FE,0x9860,0x9862,
-	0x9863,0x985F,0x98C1,0x98C2,0x9950,0x994E,0x9959,0x994C,
-	0x994B,0x9953,0x9A32,0x9A34,0x9A31,0x9A2C,0x9A2A,0x9A36,
-	0x9A29,0x9A2E,0x9A38,0x9A2D,0x9AC7,0x9ACA,0x9AC6,0x9B10,
-	0x9B12,0x9B11,0x9C0B,0x9C08,0x9BF7,0x9C05,0x9C12,0x9BF8,
-	0x9C40,0x9C07,0x9C0E,0x9C06,0x9C17,0x9C14,0x9C09,0x9D9F,
-	0x9D99,0x9DA4,0x9D9D,0x9D92,0x9D98,0x9D90,0x9D9B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9DA0,0x9D94,0x9D9C,0x9DAA,0x9D97,0x9DA1,0x9D9A,
-	0x9DA2,0x9DA8,0x9D9E,0x9DA3,0x9DBF,0x9DA9,0x9D96,0x9DA6,
-	0x9DA7,0x9E99,0x9E9B,0x9E9A,0x9EE5,0x9EE4,0x9EE7,0x9EE6,
-	0x9F30,0x9F2E,0x9F5B,0x9F60,0x9F5E,0x9F5D,0x9F59,0x9F91,
-	0x513A,0x5139,0x5298,0x5297,0x56C3,0x56BD,0x56BE,0x5B48,
-	0x5B47,0x5DCB,0x5DCF,0x5EF1,0x61FD,0x651B,0x6B02,0x6AFC,
-	0x6B03,0x6AF8,0x6B00,0x7043,0x7044,0x704A,0x7048,0x7049,
-	0x7045,0x7046,0x721D,0x721A,0x7219,0x737E,0x7517,0x766A,
-	0x77D0,0x792D,0x7931,0x792F,0x7C54,0x7C53,0x7CF2,0x7E8A,
-	0x7E87,0x7E88,0x7E8B,0x7E86,0x7E8D,0x7F4D,0x7FBB,0x8030,
-	0x81DD,0x8618,0x862A,0x8626,0x861F,0x8623,0x861C,0x8619,
-	0x8627,0x862E,0x8621,0x8620,0x8629,0x861E,0x8625,INVALC,
-	/* Block 247, Array index 0x5500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8829,0x881D,0x881B,0x8820,0x8824,0x881C,0x882B,0x884A,
-	0x896D,0x8969,0x896E,0x896B,0x89FA,0x8B79,0x8B78,0x8B45,
-	0x8B7A,0x8B7B,0x8D10,0x8D14,0x8DAF,0x8E8E,0x8E8C,0x8F5E,
-	0x8F5B,0x8F5D,0x9146,0x9144,0x9145,0x91B9,0x943F,0x943B,
-	0x9436,0x9429,0x943D,0x943C,0x9430,0x9439,0x942A,0x9437,
-	0x942C,0x9440,0x9431,0x95E5,0x95E4,0x95E3,0x9735,0x973A,
-	0x97BF,0x97E1,0x9864,0x98C9,0x98C6,0x98C0,0x9958,0x9956,
-	0x9A39,0x9A3D,0x9A46,0x9A44,0x9A42,0x9A41,0x9A3A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9A3F,0x9ACD,0x9B15,0x9B17,0x9B18,0x9B16,0x9B3A,
-	0x9B52,0x9C2B,0x9C1D,0x9C1C,0x9C2C,0x9C23,0x9C28,0x9C29,
-	0x9C24,0x9C21,0x9DB7,0x9DB6,0x9DBC,0x9DC1,0x9DC7,0x9DCA,
-	0x9DCF,0x9DBE,0x9DC5,0x9DC3,0x9DBB,0x9DB5,0x9DCE,0x9DB9,
-	0x9DBA,0x9DAC,0x9DC8,0x9DB1,0x9DAD,0x9DCC,0x9DB3,0x9DCD,
-	0x9DB2,0x9E7A,0x9E9C,0x9EEB,0x9EEE,0x9EED,0x9F1B,0x9F18,
-	0x9F1A,0x9F31,0x9F4E,0x9F65,0x9F64,0x9F92,0x4EB9,0x56C6,
-	0x56C5,0x56CB,0x5971,0x5B4B,0x5B4C,0x5DD5,0x5DD1,0x5EF2,
-	0x6521,0x6520,0x6526,0x6522,0x6B0B,0x6B08,0x6B09,0x6C0D,
-	0x7055,0x7056,0x7057,0x7052,0x721E,0x721F,0x72A9,0x737F,
-	0x74D8,0x74D5,0x74D9,0x74D7,0x766D,0x76AD,0x7935,0x79B4,
-	0x7A70,0x7A71,0x7C57,0x7C5C,0x7C59,0x7C5B,0x7C5A,INVALC,
-	/* Block 248, Array index 0x5600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7CF4,0x7CF1,0x7E91,0x7F4F,0x7F87,0x81DE,0x826B,0x8634,
-	0x8635,0x8633,0x862C,0x8632,0x8636,0x882C,0x8828,0x8826,
-	0x882A,0x8825,0x8971,0x89BF,0x89BE,0x89FB,0x8B7E,0x8B84,
-	0x8B82,0x8B86,0x8B85,0x8B7F,0x8D15,0x8E95,0x8E94,0x8E9A,
-	0x8E92,0x8E90,0x8E96,0x8E97,0x8F60,0x8F62,0x9147,0x944C,
-	0x9450,0x944A,0x944B,0x944F,0x9447,0x9445,0x9448,0x9449,
-	0x9446,0x973F,0x97E3,0x986A,0x9869,0x98CB,0x9954,0x995B,
-	0x9A4E,0x9A53,0x9A54,0x9A4C,0x9A4F,0x9A48,0x9A4A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9A49,0x9A52,0x9A50,0x9AD0,0x9B19,0x9B2B,0x9B3B,
-	0x9B56,0x9B55,0x9C46,0x9C48,0x9C3F,0x9C44,0x9C39,0x9C33,
-	0x9C41,0x9C3C,0x9C37,0x9C34,0x9C32,0x9C3D,0x9C36,0x9DDB,
-	0x9DD2,0x9DDE,0x9DDA,0x9DCB,0x9DD0,0x9DDC,0x9DD1,0x9DDF,
-	0x9DE9,0x9DD9,0x9DD8,0x9DD6,0x9DF5,0x9DD5,0x9DDD,0x9EB6,
-	0x9EF0,0x9F35,0x9F33,0x9F32,0x9F42,0x9F6B,0x9F95,0x9FA2,
-	0x513D,0x5299,0x58E8,0x58E7,0x5972,0x5B4D,0x5DD8,0x882F,
-	0x5F4F,0x6201,0x6203,0x6204,0x6529,0x6525,0x6596,0x66EB,
-	0x6B11,0x6B12,0x6B0F,0x6BCA,0x705B,0x705A,0x7222,0x7382,
-	0x7381,0x7383,0x7670,0x77D4,0x7C67,0x7C66,0x7E95,0x826C,
-	0x863A,0x8640,0x8639,0x863C,0x8631,0x863B,0x863E,0x8830,
-	0x8832,0x882E,0x8833,0x8976,0x8974,0x8973,0x89FE,INVALC,
-	/* Block 249, Array index 0x5700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8B8C,0x8B8E,0x8B8B,0x8B88,0x8C45,0x8D19,0x8E98,0x8F64,
-	0x8F63,0x91BC,0x9462,0x9455,0x945D,0x9457,0x945E,0x97C4,
-	0x97C5,0x9800,0x9A56,0x9A59,0x9B1E,0x9B1F,0x9B20,0x9C52,
-	0x9C58,0x9C50,0x9C4A,0x9C4D,0x9C4B,0x9C55,0x9C59,0x9C4C,
-	0x9C4E,0x9DFB,0x9DF7,0x9DEF,0x9DE3,0x9DEB,0x9DF8,0x9DE4,
-	0x9DF6,0x9DE1,0x9DEE,0x9DE6,0x9DF2,0x9DF0,0x9DE2,0x9DEC,
-	0x9DF4,0x9DF3,0x9DE8,0x9DED,0x9EC2,0x9ED0,0x9EF2,0x9EF3,
-	0x9F06,0x9F1C,0x9F38,0x9F37,0x9F36,0x9F43,0x9F4F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9F71,0x9F70,0x9F6E,0x9F6F,0x56D3,0x56CD,0x5B4E,
-	0x5C6D,0x652D,0x66ED,0x66EE,0x6B13,0x705F,0x7061,0x705D,
-	0x7060,0x7223,0x74DB,0x74E5,0x77D5,0x7938,0x79B7,0x79B6,
-	0x7C6A,0x7E97,0x7F89,0x826D,0x8643,0x8838,0x8837,0x8835,
-	0x884B,0x8B94,0x8B95,0x8E9E,0x8E9F,0x8EA0,0x8E9D,0x91BE,
-	0x91BD,0x91C2,0x946B,0x9468,0x9469,0x96E5,0x9746,0x9743,
-	0x9747,0x97C7,0x97E5,0x9A5E,0x9AD5,0x9B59,0x9C63,0x9C67,
-	0x9C66,0x9C62,0x9C5E,0x9C60,0x9E02,0x9DFE,0x9E07,0x9E03,
-	0x9E06,0x9E05,0x9E00,0x9E01,0x9E09,0x9DFF,0x9DFD,0x9E04,
-	0x9EA0,0x9F1E,0x9F46,0x9F74,0x9F75,0x9F76,0x56D4,0x652E,
-	0x65B8,0x6B18,0x6B19,0x6B17,0x6B1A,0x7062,0x7226,0x72AA,
-	0x77D8,0x77D9,0x7939,0x7C69,0x7C6B,0x7CF6,0x7E9A,INVALC,
-	/* Block 250, Array index 0x5800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7E98,0x7E9B,0x7E99,0x81E0,0x81E1,0x8646,0x8647,0x8648,
-	0x8979,0x897A,0x897C,0x897B,0x89FF,0x8B98,0x8B99,0x8EA5,
-	0x8EA4,0x8EA3,0x946E,0x946D,0x946F,0x9471,0x9473,0x9749,
-	0x9872,0x995F,0x9C68,0x9C6E,0x9C6D,0x9E0B,0x9E0D,0x9E10,
-	0x9E0F,0x9E12,0x9E11,0x9EA1,0x9EF5,0x9F09,0x9F47,0x9F78,
-	0x9F7B,0x9F7A,0x9F79,0x571E,0x7066,0x7C6F,0x883C,0x8DB2,
-	0x8EA6,0x91C3,0x9474,0x9478,0x9476,0x9475,0x9A60,0x9C74,
-	0x9C73,0x9C71,0x9C75,0x9E14,0x9E13,0x9EF6,0x9F0A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9FA4,0x7068,0x7065,0x7CF7,0x866A,0x883E,0x883D,
-	0x883F,0x8B9E,0x8C9C,0x8EA9,0x8EC9,0x974B,0x9873,0x9874,
-	0x98CC,0x9961,0x99AB,0x9A64,0x9A66,0x9A67,0x9B24,0x9E15,
-	0x9E17,0x9F48,0x6207,0x6B1E,0x7227,0x864C,0x8EA8,0x9482,
-	0x9480,0x9481,0x9A69,0x9A68,0x9B2E,0x9E19,0x7229,0x864B,
-	0x8B9F,0x9483,0x9C79,0x9EB7,0x7675,0x9A6B,0x9C7A,0x9E1D,
-	0x7069,0x706A,0x9EA4,0x9F7E,0x9F49,0x9F98,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_TO_UCS_CCS_BIG5 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit big5 -> UCS size-optimized table (28482 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_BIG5) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_size_big5[] =
-{
-	0x00B0, /* Ranges number */
-	0x0000, /* Unranged codes number */
-	0x37A1, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0xA140, 0xA17E, 0x0213,
-	/* Array index: 0x0006 */ 0xA1A1, 0xA1FE, 0x0252,
-	/* Array index: 0x0009 */ 0xA240, 0xA27E, 0x02B0,
-	/* Array index: 0x000C */ 0xA2A1, 0xA2FE, 0x02EF,
-	/* Array index: 0x000F */ 0xA340, 0xA37E, 0x034D,
-	/* Array index: 0x0012 */ 0xA3A1, 0xA3BF, 0x038C,
-	/* Array index: 0x0015 */ 0xA440, 0xA47E, 0x03AB,
-	/* Array index: 0x0018 */ 0xA4A1, 0xA4FE, 0x03EA,
-	/* Array index: 0x001B */ 0xA540, 0xA57E, 0x0448,
-	/* Array index: 0x001E */ 0xA5A1, 0xA5FE, 0x0487,
-	/* Array index: 0x0021 */ 0xA640, 0xA67E, 0x04E5,
-	/* Array index: 0x0024 */ 0xA6A1, 0xA6FE, 0x0524,
-	/* Array index: 0x0027 */ 0xA740, 0xA77E, 0x0582,
-	/* Array index: 0x002A */ 0xA7A1, 0xA7FE, 0x05C1,
-	/* Array index: 0x002D */ 0xA840, 0xA87E, 0x061F,
-	/* Array index: 0x0030 */ 0xA8A1, 0xA8FE, 0x065E,
-	/* Array index: 0x0033 */ 0xA940, 0xA97E, 0x06BC,
-	/* Array index: 0x0036 */ 0xA9A1, 0xA9FE, 0x06FB,
-	/* Array index: 0x0039 */ 0xAA40, 0xAA7E, 0x0759,
-	/* Array index: 0x003C */ 0xAAA1, 0xAAFE, 0x0798,
-	/* Array index: 0x003F */ 0xAB40, 0xAB7E, 0x07F6,
-	/* Array index: 0x0042 */ 0xABA1, 0xABFE, 0x0835,
-	/* Array index: 0x0045 */ 0xAC40, 0xAC7E, 0x0893,
-	/* Array index: 0x0048 */ 0xACA1, 0xACFE, 0x08D2,
-	/* Array index: 0x004B */ 0xAD40, 0xAD7E, 0x0930,
-	/* Array index: 0x004E */ 0xADA1, 0xADFE, 0x096F,
-	/* Array index: 0x0051 */ 0xAE40, 0xAE7E, 0x09CD,
-	/* Array index: 0x0054 */ 0xAEA1, 0xAEFE, 0x0A0C,
-	/* Array index: 0x0057 */ 0xAF40, 0xAF7E, 0x0A6A,
-	/* Array index: 0x005A */ 0xAFA1, 0xAFFE, 0x0AA9,
-	/* Array index: 0x005D */ 0xB040, 0xB07E, 0x0B07,
-	/* Array index: 0x0060 */ 0xB0A1, 0xB0FE, 0x0B46,
-	/* Array index: 0x0063 */ 0xB140, 0xB17E, 0x0BA4,
-	/* Array index: 0x0066 */ 0xB1A1, 0xB1FE, 0x0BE3,
-	/* Array index: 0x0069 */ 0xB240, 0xB27E, 0x0C41,
-	/* Array index: 0x006C */ 0xB2A1, 0xB2FE, 0x0C80,
-	/* Array index: 0x006F */ 0xB340, 0xB37E, 0x0CDE,
-	/* Array index: 0x0072 */ 0xB3A1, 0xB3FE, 0x0D1D,
-	/* Array index: 0x0075 */ 0xB440, 0xB47E, 0x0D7B,
-	/* Array index: 0x0078 */ 0xB4A1, 0xB4FE, 0x0DBA,
-	/* Array index: 0x007B */ 0xB540, 0xB57E, 0x0E18,
-	/* Array index: 0x007E */ 0xB5A1, 0xB5FE, 0x0E57,
-	/* Array index: 0x0081 */ 0xB640, 0xB67E, 0x0EB5,
-	/* Array index: 0x0084 */ 0xB6A1, 0xB6FE, 0x0EF4,
-	/* Array index: 0x0087 */ 0xB740, 0xB77E, 0x0F52,
-	/* Array index: 0x008A */ 0xB7A1, 0xB7FE, 0x0F91,
-	/* Array index: 0x008D */ 0xB840, 0xB87E, 0x0FEF,
-	/* Array index: 0x0090 */ 0xB8A1, 0xB8FE, 0x102E,
-	/* Array index: 0x0093 */ 0xB940, 0xB97E, 0x108C,
-	/* Array index: 0x0096 */ 0xB9A1, 0xB9FE, 0x10CB,
-	/* Array index: 0x0099 */ 0xBA40, 0xBA7E, 0x1129,
-	/* Array index: 0x009C */ 0xBAA1, 0xBAFE, 0x1168,
-	/* Array index: 0x009F */ 0xBB40, 0xBB7E, 0x11C6,
-	/* Array index: 0x00A2 */ 0xBBA1, 0xBBFE, 0x1205,
-	/* Array index: 0x00A5 */ 0xBC40, 0xBC7E, 0x1263,
-	/* Array index: 0x00A8 */ 0xBCA1, 0xBCFE, 0x12A2,
-	/* Array index: 0x00AB */ 0xBD40, 0xBD7E, 0x1300,
-	/* Array index: 0x00AE */ 0xBDA1, 0xBDFE, 0x133F,
-	/* Array index: 0x00B1 */ 0xBE40, 0xBE7E, 0x139D,
-	/* Array index: 0x00B4 */ 0xBEA1, 0xBEFE, 0x13DC,
-	/* Array index: 0x00B7 */ 0xBF40, 0xBF7E, 0x143A,
-	/* Array index: 0x00BA */ 0xBFA1, 0xBFFE, 0x1479,
-	/* Array index: 0x00BD */ 0xC040, 0xC07E, 0x14D7,
-	/* Array index: 0x00C0 */ 0xC0A1, 0xC0FE, 0x1516,
-	/* Array index: 0x00C3 */ 0xC140, 0xC17E, 0x1574,
-	/* Array index: 0x00C6 */ 0xC1A1, 0xC1FE, 0x15B3,
-	/* Array index: 0x00C9 */ 0xC240, 0xC27E, 0x1611,
-	/* Array index: 0x00CC */ 0xC2A1, 0xC2FE, 0x1650,
-	/* Array index: 0x00CF */ 0xC340, 0xC37E, 0x16AE,
-	/* Array index: 0x00D2 */ 0xC3A1, 0xC3FE, 0x16ED,
-	/* Array index: 0x00D5 */ 0xC440, 0xC47E, 0x174B,
-	/* Array index: 0x00D8 */ 0xC4A1, 0xC4FE, 0x178A,
-	/* Array index: 0x00DB */ 0xC540, 0xC57E, 0x17E8,
-	/* Array index: 0x00DE */ 0xC5A1, 0xC5FE, 0x1827,
-	/* Array index: 0x00E1 */ 0xC640, 0xC67E, 0x1885,
-	/* Array index: 0x00E4 */ 0xC6A1, 0xC6FE, 0x18C4,
-	/* Array index: 0x00E7 */ 0xC740, 0xC77E, 0x1922,
-	/* Array index: 0x00EA */ 0xC7A1, 0xC7FC, 0x1961,
-	/* Array index: 0x00ED */ 0xC940, 0xC97E, 0x19BD,
-	/* Array index: 0x00F0 */ 0xC9A1, 0xC9FE, 0x19FC,
-	/* Array index: 0x00F3 */ 0xCA40, 0xCA7E, 0x1A5A,
-	/* Array index: 0x00F6 */ 0xCAA1, 0xCAFE, 0x1A99,
-	/* Array index: 0x00F9 */ 0xCB40, 0xCB7E, 0x1AF7,
-	/* Array index: 0x00FC */ 0xCBA1, 0xCBFE, 0x1B36,
-	/* Array index: 0x00FF */ 0xCC40, 0xCC7E, 0x1B94,
-	/* Array index: 0x0102 */ 0xCCA1, 0xCCFE, 0x1BD3,
-	/* Array index: 0x0105 */ 0xCD40, 0xCD7E, 0x1C31,
-	/* Array index: 0x0108 */ 0xCDA1, 0xCDFE, 0x1C70,
-	/* Array index: 0x010B */ 0xCE40, 0xCE7E, 0x1CCE,
-	/* Array index: 0x010E */ 0xCEA1, 0xCEFE, 0x1D0D,
-	/* Array index: 0x0111 */ 0xCF40, 0xCF7E, 0x1D6B,
-	/* Array index: 0x0114 */ 0xCFA1, 0xCFFE, 0x1DAA,
-	/* Array index: 0x0117 */ 0xD040, 0xD07E, 0x1E08,
-	/* Array index: 0x011A */ 0xD0A1, 0xD0FE, 0x1E47,
-	/* Array index: 0x011D */ 0xD140, 0xD17E, 0x1EA5,
-	/* Array index: 0x0120 */ 0xD1A1, 0xD1FE, 0x1EE4,
-	/* Array index: 0x0123 */ 0xD240, 0xD27E, 0x1F42,
-	/* Array index: 0x0126 */ 0xD2A1, 0xD2FE, 0x1F81,
-	/* Array index: 0x0129 */ 0xD340, 0xD37E, 0x1FDF,
-	/* Array index: 0x012C */ 0xD3A1, 0xD3FE, 0x201E,
-	/* Array index: 0x012F */ 0xD440, 0xD47E, 0x207C,
-	/* Array index: 0x0132 */ 0xD4A1, 0xD4FE, 0x20BB,
-	/* Array index: 0x0135 */ 0xD540, 0xD57E, 0x2119,
-	/* Array index: 0x0138 */ 0xD5A1, 0xD5FE, 0x2158,
-	/* Array index: 0x013B */ 0xD640, 0xD67E, 0x21B6,
-	/* Array index: 0x013E */ 0xD6A1, 0xD6FE, 0x21F5,
-	/* Array index: 0x0141 */ 0xD740, 0xD77E, 0x2253,
-	/* Array index: 0x0144 */ 0xD7A1, 0xD7FE, 0x2292,
-	/* Array index: 0x0147 */ 0xD840, 0xD87E, 0x22F0,
-	/* Array index: 0x014A */ 0xD8A1, 0xD8FE, 0x232F,
-	/* Array index: 0x014D */ 0xD940, 0xD97E, 0x238D,
-	/* Array index: 0x0150 */ 0xD9A1, 0xD9FE, 0x23CC,
-	/* Array index: 0x0153 */ 0xDA40, 0xDA7E, 0x242A,
-	/* Array index: 0x0156 */ 0xDAA1, 0xDAFE, 0x2469,
-	/* Array index: 0x0159 */ 0xDB40, 0xDB7E, 0x24C7,
-	/* Array index: 0x015C */ 0xDBA1, 0xDBFE, 0x2506,
-	/* Array index: 0x015F */ 0xDC40, 0xDC7E, 0x2564,
-	/* Array index: 0x0162 */ 0xDCA1, 0xDCFE, 0x25A3,
-	/* Array index: 0x0165 */ 0xDD40, 0xDD7E, 0x2601,
-	/* Array index: 0x0168 */ 0xDDA1, 0xDDFE, 0x2640,
-	/* Array index: 0x016B */ 0xDE40, 0xDE7E, 0x269E,
-	/* Array index: 0x016E */ 0xDEA1, 0xDEFE, 0x26DD,
-	/* Array index: 0x0171 */ 0xDF40, 0xDF7E, 0x273B,
-	/* Array index: 0x0174 */ 0xDFA1, 0xDFFE, 0x277A,
-	/* Array index: 0x0177 */ 0xE040, 0xE07E, 0x27D8,
-	/* Array index: 0x017A */ 0xE0A1, 0xE0FE, 0x2817,
-	/* Array index: 0x017D */ 0xE140, 0xE17E, 0x2875,
-	/* Array index: 0x0180 */ 0xE1A1, 0xE1FE, 0x28B4,
-	/* Array index: 0x0183 */ 0xE240, 0xE27E, 0x2912,
-	/* Array index: 0x0186 */ 0xE2A1, 0xE2FE, 0x2951,
-	/* Array index: 0x0189 */ 0xE340, 0xE37E, 0x29AF,
-	/* Array index: 0x018C */ 0xE3A1, 0xE3FE, 0x29EE,
-	/* Array index: 0x018F */ 0xE440, 0xE47E, 0x2A4C,
-	/* Array index: 0x0192 */ 0xE4A1, 0xE4FE, 0x2A8B,
-	/* Array index: 0x0195 */ 0xE540, 0xE57E, 0x2AE9,
-	/* Array index: 0x0198 */ 0xE5A1, 0xE5FE, 0x2B28,
-	/* Array index: 0x019B */ 0xE640, 0xE67E, 0x2B86,
-	/* Array index: 0x019E */ 0xE6A1, 0xE6FE, 0x2BC5,
-	/* Array index: 0x01A1 */ 0xE740, 0xE77E, 0x2C23,
-	/* Array index: 0x01A4 */ 0xE7A1, 0xE7FE, 0x2C62,
-	/* Array index: 0x01A7 */ 0xE840, 0xE87E, 0x2CC0,
-	/* Array index: 0x01AA */ 0xE8A1, 0xE8FE, 0x2CFF,
-	/* Array index: 0x01AD */ 0xE940, 0xE97E, 0x2D5D,
-	/* Array index: 0x01B0 */ 0xE9A1, 0xE9FE, 0x2D9C,
-	/* Array index: 0x01B3 */ 0xEA40, 0xEA7E, 0x2DFA,
-	/* Array index: 0x01B6 */ 0xEAA1, 0xEAFE, 0x2E39,
-	/* Array index: 0x01B9 */ 0xEB40, 0xEB7E, 0x2E97,
-	/* Array index: 0x01BC */ 0xEBA1, 0xEBFE, 0x2ED6,
-	/* Array index: 0x01BF */ 0xEC40, 0xEC7E, 0x2F34,
-	/* Array index: 0x01C2 */ 0xECA1, 0xECFE, 0x2F73,
-	/* Array index: 0x01C5 */ 0xED40, 0xED7E, 0x2FD1,
-	/* Array index: 0x01C8 */ 0xEDA1, 0xEDFE, 0x3010,
-	/* Array index: 0x01CB */ 0xEE40, 0xEE7E, 0x306E,
-	/* Array index: 0x01CE */ 0xEEA1, 0xEEFE, 0x30AD,
-	/* Array index: 0x01D1 */ 0xEF40, 0xEF7E, 0x310B,
-	/* Array index: 0x01D4 */ 0xEFA1, 0xEFFE, 0x314A,
-	/* Array index: 0x01D7 */ 0xF040, 0xF07E, 0x31A8,
-	/* Array index: 0x01DA */ 0xF0A1, 0xF0FE, 0x31E7,
-	/* Array index: 0x01DD */ 0xF140, 0xF17E, 0x3245,
-	/* Array index: 0x01E0 */ 0xF1A1, 0xF1FE, 0x3284,
-	/* Array index: 0x01E3 */ 0xF240, 0xF27E, 0x32E2,
-	/* Array index: 0x01E6 */ 0xF2A1, 0xF2FE, 0x3321,
-	/* Array index: 0x01E9 */ 0xF340, 0xF37E, 0x337F,
-	/* Array index: 0x01EC */ 0xF3A1, 0xF3FE, 0x33BE,
-	/* Array index: 0x01EF */ 0xF440, 0xF47E, 0x341C,
-	/* Array index: 0x01F2 */ 0xF4A1, 0xF4FE, 0x345B,
-	/* Array index: 0x01F5 */ 0xF540, 0xF57E, 0x34B9,
-	/* Array index: 0x01F8 */ 0xF5A1, 0xF5FE, 0x34F8,
-	/* Array index: 0x01FB */ 0xF640, 0xF67E, 0x3556,
-	/* Array index: 0x01FE */ 0xF6A1, 0xF6FE, 0x3595,
-	/* Array index: 0x0201 */ 0xF740, 0xF77E, 0x35F3,
-	/* Array index: 0x0204 */ 0xF7A1, 0xF7FE, 0x3632,
-	/* Array index: 0x0207 */ 0xF840, 0xF87E, 0x3690,
-	/* Array index: 0x020A */ 0xF8A1, 0xF8FE, 0x36CF,
-	/* Array index: 0x020D */ 0xF940, 0xF97E, 0x372D,
-	/* Array index: 0x0210 */ 0xF9A1, 0xF9D5, 0x376C,
-	/* Ranges content */
-	/* Range 0xA140 - 0xA17E, array index: 0x0213 */
-	0x3000,0xFF0C,0x3001,0x3002,0xFF0E,0x2022,0xFF1B,0xFF1A,
-	0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFF64,0xFE52,
-	0x00B7,0xFE54,0xFE55,0xFE56,0xFE57,0xFF5C,0x2013,0xFE31,
-	0x2014,0xFE33,0xFFFD,0xFE34,0xFE4F,0xFF08,0xFF09,0xFE35,
-	0xFE36,0xFF5B,0xFF5D,0xFE37,0xFE38,0x3014,0x3015,0xFE39,
-	0xFE3A,0x3010,0x3011,0xFE3B,0xFE3C,0x300A,0x300B,0xFE3D,
-	0xFE3E,0x3008,0x3009,0xFE3F,0xFE40,0x300C,0x300D,0xFE41,
-	0xFE42,0x300E,0x300F,0xFE43,0xFE44,0xFE59,0xFE5A,
-	/* Range 0xA1A1 - 0xA1FE, array index: 0x0252 */
-	0xFE5B,0xFE5C,0xFE5D,0xFE5E,0x2018,0x2019,0x201C,0x201D,
-	0x301D,0x301E,0x2035,0x2032,0xFF03,0xFF06,0xFF0A,0x203B,
-	0x00A7,0x3003,0x25CB,0x25CF,0x25B3,0x25B2,0x25CE,0x2606,
-	0x2605,0x25C7,0x25C6,0x25A1,0x25A0,0x25BD,0x25BC,0x32A3,
-	0x2105,0x203E,0xFFFD,0xFF3F,0xFFFD,0xFE49,0xFE4A,0xFE4D,
-	0xFE4E,0xFE4B,0xFE4C,0xFE5F,0xFE60,0xFE61,0xFF0B,0xFF0D,
-	0x00D7,0x00F7,0x00B1,0x221A,0xFF1C,0xFF1E,0xFF1D,0x2266,
-	0x2267,0x2260,0x221E,0x2252,0x2261,0xFE62,0xFE63,0xFE64,
-	0xFE65,0xFE66,0x223C,0x2229,0x222A,0x22A5,0x2220,0x221F,
-	0x22BF,0x33D2,0x33D1,0x222B,0x222E,0x2235,0x2234,0x2640,
-	0x2642,0x2641,0x2609,0x2191,0x2193,0x2190,0x2192,0x2196,
-	0x2197,0x2199,0x2198,0x2225,0x2223,0xFFFD,
-	/* Range 0xA240 - 0xA27E, array index: 0x02B0 */
-	0xFFFD,0xFF0F,0xFF3C,0xFF04,0x00A5,0x3012,0x00A2,0x00A3,
-	0xFF05,0xFF20,0x2103,0x2109,0xFE69,0xFE6A,0xFE6B,0x33D5,
-	0x339C,0x339D,0x339E,0x33CE,0x33A1,0x338E,0x338F,0x33C4,
-	0x00B0,0x5159,0x515B,0x515E,0x515D,0x5161,0x5163,0x55E7,
-	0x74E9,0x7CCE,0x2581,0x2582,0x2583,0x2584,0x2585,0x2586,
-	0x2587,0x2588,0x258F,0x258E,0x258D,0x258C,0x258B,0x258A,
-	0x2589,0x253C,0x2534,0x252C,0x2524,0x251C,0x2594,0x2500,
-	0x2502,0x2595,0x250C,0x2510,0x2514,0x2518,0x256D,
-	/* Range 0xA2A1 - 0xA2FE, array index: 0x02EF */
-	0x256E,0x2570,0x256F,0x2550,0x255E,0x256A,0x2561,0x25E2,
-	0x25E3,0x25E5,0x25E4,0x2571,0x2572,0x2573,0xFF10,0xFF11,
-	0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17,0xFF18,0xFF19,
-	0x2160,0x2161,0x2162,0x2163,0x2164,0x2165,0x2166,0x2167,
-	0x2168,0x2169,0x3021,0x3022,0x3023,0x3024,0x3025,0x3026,
-	0x3027,0x3028,0x3029,0xFFFD,0x5344,0xFFFD,0xFF21,0xFF22,
-	0xFF23,0xFF24,0xFF25,0xFF26,0xFF27,0xFF28,0xFF29,0xFF2A,
-	0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,0xFF30,0xFF31,0xFF32,
-	0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,0xFF38,0xFF39,0xFF3A,
-	0xFF41,0xFF42,0xFF43,0xFF44,0xFF45,0xFF46,0xFF47,0xFF48,
-	0xFF49,0xFF4A,0xFF4B,0xFF4C,0xFF4D,0xFF4E,0xFF4F,0xFF50,
-	0xFF51,0xFF52,0xFF53,0xFF54,0xFF55,0xFF56,
-	/* Range 0xA340 - 0xA37E, array index: 0x034D */
-	0xFF57,0xFF58,0xFF59,0xFF5A,0x0391,0x0392,0x0393,0x0394,
-	0x0395,0x0396,0x0397,0x0398,0x0399,0x039A,0x039B,0x039C,
-	0x039D,0x039E,0x039F,0x03A0,0x03A1,0x03A3,0x03A4,0x03A5,
-	0x03A6,0x03A7,0x03A8,0x03A9,0x03B1,0x03B2,0x03B3,0x03B4,
-	0x03B5,0x03B6,0x03B7,0x03B8,0x03B9,0x03BA,0x03BB,0x03BC,
-	0x03BD,0x03BE,0x03BF,0x03C0,0x03C1,0x03C3,0x03C4,0x03C5,
-	0x03C6,0x03C7,0x03C8,0x03C9,0x3105,0x3106,0x3107,0x3108,
-	0x3109,0x310A,0x310B,0x310C,0x310D,0x310E,0x310F,
-	/* Range 0xA3A1 - 0xA3BF, array index: 0x038C */
-	0x3110,0x3111,0x3112,0x3113,0x3114,0x3115,0x3116,0x3117,
-	0x3118,0x3119,0x311A,0x311B,0x311C,0x311D,0x311E,0x311F,
-	0x3120,0x3121,0x3122,0x3123,0x3124,0x3125,0x3126,0x3127,
-	0x3128,0x3129,0x02D9,0x02C9,0x02CA,0x02C7,0x02CB,
-	/* Range 0xA440 - 0xA47E, array index: 0x03AB */
-	0x4E00,0x4E59,0x4E01,0x4E03,0x4E43,0x4E5D,0x4E86,0x4E8C,
-	0x4EBA,0x513F,0x5165,0x516B,0x51E0,0x5200,0x5201,0x529B,
-	0x5315,0x5341,0x535C,0x53C8,0x4E09,0x4E0B,0x4E08,0x4E0A,
-	0x4E2B,0x4E38,0x51E1,0x4E45,0x4E48,0x4E5F,0x4E5E,0x4E8E,
-	0x4EA1,0x5140,0x5203,0x52FA,0x5343,0x53C9,0x53E3,0x571F,
-	0x58EB,0x5915,0x5927,0x5973,0x5B50,0x5B51,0x5B53,0x5BF8,
-	0x5C0F,0x5C22,0x5C38,0x5C71,0x5DDD,0x5DE5,0x5DF1,0x5DF2,
-	0x5DF3,0x5DFE,0x5E72,0x5EFE,0x5F0B,0x5F13,0x624D,
-	/* Range 0xA4A1 - 0xA4FE, array index: 0x03EA */
-	0x4E11,0x4E10,0x4E0D,0x4E2D,0x4E30,0x4E39,0x4E4B,0x5C39,
-	0x4E88,0x4E91,0x4E95,0x4E92,0x4E94,0x4EA2,0x4EC1,0x4EC0,
-	0x4EC3,0x4EC6,0x4EC7,0x4ECD,0x4ECA,0x4ECB,0x4EC4,0x5143,
-	0x5141,0x5167,0x516D,0x516E,0x516C,0x5197,0x51F6,0x5206,
-	0x5207,0x5208,0x52FB,0x52FE,0x52FF,0x5316,0x5339,0x5348,
-	0x5347,0x5345,0x535E,0x5384,0x53CB,0x53CA,0x53CD,0x58EC,
-	0x5929,0x592B,0x592A,0x592D,0x5B54,0x5C11,0x5C24,0x5C3A,
-	0x5C6F,0x5DF4,0x5E7B,0x5EFF,0x5F14,0x5F15,0x5FC3,0x6208,
-	0x6236,0x624B,0x624E,0x652F,0x6587,0x6597,0x65A4,0x65B9,
-	0x65E5,0x66F0,0x6708,0x6728,0x6B20,0x6B62,0x6B79,0x6BCB,
-	0x6BD4,0x6BDB,0x6C0F,0x6C34,0x706B,0x722A,0x7236,0x723B,
-	0x7247,0x7259,0x725B,0x72AC,0x738B,0x4E19,
-	/* Range 0xA540 - 0xA57E, array index: 0x0448 */
-	0x4E16,0x4E15,0x4E14,0x4E18,0x4E3B,0x4E4D,0x4E4F,0x4E4E,
-	0x4EE5,0x4ED8,0x4ED4,0x4ED5,0x4ED6,0x4ED7,0x4EE3,0x4EE4,
-	0x4ED9,0x4EDE,0x5145,0x5144,0x5189,0x518A,0x51AC,0x51F9,
-	0x51FA,0x51F8,0x520A,0x52A0,0x529F,0x5305,0x5306,0x5317,
-	0x531D,0x4EDF,0x534A,0x5349,0x5361,0x5360,0x536F,0x536E,
-	0x53BB,0x53EF,0x53E4,0x53F3,0x53EC,0x53EE,0x53E9,0x53E8,
-	0x53FC,0x53F8,0x53F5,0x53EB,0x53E6,0x53EA,0x53F2,0x53F1,
-	0x53F0,0x53E5,0x53ED,0x53FB,0x56DB,0x56DA,0x5916,
-	/* Range 0xA5A1 - 0xA5FE, array index: 0x0487 */
-	0x592E,0x5931,0x5974,0x5976,0x5B55,0x5B83,0x5C3C,0x5DE8,
-	0x5DE7,0x5DE6,0x5E02,0x5E03,0x5E73,0x5E7C,0x5F01,0x5F18,
-	0x5F17,0x5FC5,0x620A,0x6253,0x6254,0x6252,0x6251,0x65A5,
-	0x65E6,0x672E,0x672C,0x672A,0x672B,0x672D,0x6B63,0x6BCD,
-	0x6C11,0x6C10,0x6C38,0x6C41,0x6C40,0x6C3E,0x72AF,0x7384,
-	0x7389,0x74DC,0x74E6,0x7518,0x751F,0x7528,0x7529,0x7530,
-	0x7531,0x7532,0x7533,0x758B,0x767D,0x76AE,0x76BF,0x76EE,
-	0x77DB,0x77E2,0x77F3,0x793A,0x79BE,0x7A74,0x7ACB,0x4E1E,
-	0x4E1F,0x4E52,0x4E53,0x4E69,0x4E99,0x4EA4,0x4EA6,0x4EA5,
-	0x4EFF,0x4F09,0x4F19,0x4F0A,0x4F15,0x4F0D,0x4F10,0x4F11,
-	0x4F0F,0x4EF2,0x4EF6,0x4EFB,0x4EF0,0x4EF3,0x4EFD,0x4F01,
-	0x4F0B,0x5149,0x5147,0x5146,0x5148,0x5168,
-	/* Range 0xA640 - 0xA67E, array index: 0x04E5 */
-	0x5171,0x518D,0x51B0,0x5217,0x5211,0x5212,0x520E,0x5216,
-	0x52A3,0x5308,0x5321,0x5320,0x5370,0x5371,0x5409,0x540F,
-	0x540C,0x540A,0x5410,0x5401,0x540B,0x5404,0x5411,0x540D,
-	0x5408,0x5403,0x540E,0x5406,0x5412,0x56E0,0x56DE,0x56DD,
-	0x5733,0x5730,0x5728,0x572D,0x572C,0x572F,0x5729,0x5919,
-	0x591A,0x5937,0x5938,0x5984,0x5978,0x5983,0x597D,0x5979,
-	0x5982,0x5981,0x5B57,0x5B58,0x5B87,0x5B88,0x5B85,0x5B89,
-	0x5BFA,0x5C16,0x5C79,0x5DDE,0x5E06,0x5E76,0x5E74,
-	/* Range 0xA6A1 - 0xA6FE, array index: 0x0524 */
-	0x5F0F,0x5F1B,0x5FD9,0x5FD6,0x620E,0x620C,0x620D,0x6210,
-	0x6263,0x625B,0x6258,0x6536,0x65E9,0x65E8,0x65EC,0x65ED,
-	0x66F2,0x66F3,0x6709,0x673D,0x6734,0x6731,0x6735,0x6B21,
-	0x6B64,0x6B7B,0x6C16,0x6C5D,0x6C57,0x6C59,0x6C5F,0x6C60,
-	0x6C50,0x6C55,0x6C61,0x6C5B,0x6C4D,0x6C4E,0x7070,0x725F,
-	0x725D,0x767E,0x7AF9,0x7C73,0x7CF8,0x7F36,0x7F8A,0x7FBD,
-	0x8001,0x8003,0x800C,0x8012,0x8033,0x807F,0x8089,0x808B,
-	0x808C,0x81E3,0x81EA,0x81F3,0x81FC,0x820C,0x821B,0x821F,
-	0x826E,0x8272,0x827E,0x866B,0x8840,0x884C,0x8863,0x897F,
-	0x9621,0x4E32,0x4EA8,0x4F4D,0x4F4F,0x4F47,0x4F57,0x4F5E,
-	0x4F34,0x4F5B,0x4F55,0x4F30,0x4F50,0x4F51,0x4F3D,0x4F3A,
-	0x4F38,0x4F43,0x4F54,0x4F3C,0x4F46,0x4F63,
-	/* Range 0xA740 - 0xA77E, array index: 0x0582 */
-	0x4F5C,0x4F60,0x4F2F,0x4F4E,0x4F36,0x4F59,0x4F5D,0x4F48,
-	0x4F5A,0x514C,0x514B,0x514D,0x5175,0x51B6,0x51B7,0x5225,
-	0x5224,0x5229,0x522A,0x5228,0x52AB,0x52A9,0x52AA,0x52AC,
-	0x5323,0x5373,0x5375,0x541D,0x542D,0x541E,0x543E,0x5426,
-	0x544E,0x5427,0x5446,0x5443,0x5433,0x5448,0x5442,0x541B,
-	0x5429,0x544A,0x5439,0x543B,0x5438,0x542E,0x5435,0x5436,
-	0x5420,0x543C,0x5440,0x5431,0x542B,0x541F,0x542C,0x56EA,
-	0x56F0,0x56E4,0x56EB,0x574A,0x5751,0x5740,0x574D,
-	/* Range 0xA7A1 - 0xA7FE, array index: 0x05C1 */
-	0x5747,0x574E,0x573E,0x5750,0x574F,0x573B,0x58EF,0x593E,
-	0x599D,0x5992,0x59A8,0x599E,0x59A3,0x5999,0x5996,0x598D,
-	0x59A4,0x5993,0x598A,0x59A5,0x5B5D,0x5B5C,0x5B5A,0x5B5B,
-	0x5B8C,0x5B8B,0x5B8F,0x5C2C,0x5C40,0x5C41,0x5C3F,0x5C3E,
-	0x5C90,0x5C91,0x5C94,0x5C8C,0x5DEB,0x5E0C,0x5E8F,0x5E87,
-	0x5E8A,0x5EF7,0x5F04,0x5F1F,0x5F64,0x5F62,0x5F77,0x5F79,
-	0x5FD8,0x5FCC,0x5FD7,0x5FCD,0x5FF1,0x5FEB,0x5FF8,0x5FEA,
-	0x6212,0x6211,0x6284,0x6297,0x6296,0x6280,0x6276,0x6289,
-	0x626D,0x628A,0x627C,0x627E,0x6279,0x6273,0x6292,0x626F,
-	0x6298,0x626E,0x6295,0x6293,0x6291,0x6286,0x6539,0x653B,
-	0x6538,0x65F1,0x66F4,0x675F,0x674E,0x674F,0x6750,0x6751,
-	0x675C,0x6756,0x675E,0x6749,0x6746,0x6760,
-	/* Range 0xA840 - 0xA87E, array index: 0x061F */
-	0x6753,0x6757,0x6B65,0x6BCF,0x6C42,0x6C5E,0x6C99,0x6C81,
-	0x6C88,0x6C89,0x6C85,0x6C9B,0x6C6A,0x6C7A,0x6C90,0x6C70,
-	0x6C8C,0x6C68,0x6C96,0x6C92,0x6C7D,0x6C83,0x6C72,0x6C7E,
-	0x6C74,0x6C86,0x6C76,0x6C8D,0x6C94,0x6C98,0x6C82,0x7076,
-	0x707C,0x707D,0x7078,0x7262,0x7261,0x7260,0x72C4,0x72C2,
-	0x7396,0x752C,0x752B,0x7537,0x7538,0x7682,0x76EF,0x77E3,
-	0x79C1,0x79C0,0x79BF,0x7A76,0x7CFB,0x7F55,0x8096,0x8093,
-	0x809D,0x8098,0x809B,0x809A,0x80B2,0x826F,0x8292,
-	/* Range 0xA8A1 - 0xA8FE, array index: 0x065E */
-	0x828B,0x828D,0x898B,0x89D2,0x8A00,0x8C37,0x8C46,0x8C55,
-	0x8C9D,0x8D64,0x8D70,0x8DB3,0x8EAB,0x8ECA,0x8F9B,0x8FB0,
-	0x8FC2,0x8FC6,0x8FC5,0x8FC4,0x5DE1,0x9091,0x90A2,0x90AA,
-	0x90A6,0x90A3,0x9149,0x91C6,0x91CC,0x9632,0x962E,0x9631,
-	0x962A,0x962C,0x4E26,0x4E56,0x4E73,0x4E8B,0x4E9B,0x4E9E,
-	0x4EAB,0x4EAC,0x4F6F,0x4F9D,0x4F8D,0x4F73,0x4F7F,0x4F6C,
-	0x4F9B,0x4F8B,0x4F86,0x4F83,0x4F70,0x4F75,0x4F88,0x4F69,
-	0x4F7B,0x4F96,0x4F7E,0x4F8F,0x4F91,0x4F7A,0x5154,0x5152,
-	0x5155,0x5169,0x5177,0x5176,0x5178,0x51BD,0x51FD,0x523B,
-	0x5238,0x5237,0x523A,0x5230,0x522E,0x5236,0x5241,0x52BE,
-	0x52BB,0x5352,0x5354,0x5353,0x5351,0x5366,0x5377,0x5378,
-	0x5379,0x53D6,0x53D4,0x53D7,0x5473,0x5475,
-	/* Range 0xA940 - 0xA97E, array index: 0x06BC */
-	0x5496,0x5478,0x5495,0x5480,0x547B,0x5477,0x5484,0x5492,
-	0x5486,0x547C,0x5490,0x5471,0x5476,0x548C,0x549A,0x5462,
-	0x5468,0x548B,0x547D,0x548E,0x56FA,0x5783,0x5777,0x576A,
-	0x5769,0x5761,0x5766,0x5764,0x577C,0x591C,0x5949,0x5947,
-	0x5948,0x5944,0x5954,0x59BE,0x59BB,0x59D4,0x59B9,0x59AE,
-	0x59D1,0x59C6,0x59D0,0x59CD,0x59CB,0x59D3,0x59CA,0x59AF,
-	0x59B3,0x59D2,0x59C5,0x5B5F,0x5B64,0x5B63,0x5B97,0x5B9A,
-	0x5B98,0x5B9C,0x5B99,0x5B9B,0x5C1A,0x5C48,0x5C45,
-	/* Range 0xA9A1 - 0xA9FE, array index: 0x06FB */
-	0x5C46,0x5CB7,0x5CA1,0x5CB8,0x5CA9,0x5CAB,0x5CB1,0x5CB3,
-	0x5E18,0x5E1A,0x5E16,0x5E15,0x5E1B,0x5E11,0x5E78,0x5E9A,
-	0x5E97,0x5E9C,0x5E95,0x5E96,0x5EF6,0x5F26,0x5F27,0x5F29,
-	0x5F80,0x5F81,0x5F7F,0x5F7C,0x5FDD,0x5FE0,0x5FFD,0x5FF5,
-	0x5FFF,0x600F,0x6014,0x602F,0x6035,0x6016,0x602A,0x6015,
-	0x6021,0x6027,0x6029,0x602B,0x601B,0x6216,0x6215,0x623F,
-	0x623E,0x6240,0x627F,0x62C9,0x62CC,0x62C4,0x62BF,0x62C2,
-	0x62B9,0x62D2,0x62DB,0x62AB,0x62D3,0x62D4,0x62CB,0x62C8,
-	0x62A8,0x62BD,0x62BC,0x62D0,0x62D9,0x62C7,0x62CD,0x62B5,
-	0x62DA,0x62B1,0x62D8,0x62D6,0x62D7,0x62C6,0x62AC,0x62CE,
-	0x653E,0x65A7,0x65BC,0x65FA,0x6614,0x6613,0x660C,0x6606,
-	0x6602,0x660E,0x6600,0x660F,0x6615,0x660A,
-	/* Range 0xAA40 - 0xAA7E, array index: 0x0759 */
-	0x6607,0x670D,0x670B,0x676D,0x678B,0x6795,0x6771,0x679C,
-	0x6773,0x6777,0x6787,0x679D,0x6797,0x676F,0x6770,0x677F,
-	0x6789,0x677E,0x6790,0x6775,0x679A,0x6793,0x677C,0x676A,
-	0x6772,0x6B23,0x6B66,0x6B67,0x6B7F,0x6C13,0x6C1B,0x6CE3,
-	0x6CE8,0x6CF3,0x6CB1,0x6CCC,0x6CE5,0x6CB3,0x6CBD,0x6CBE,
-	0x6CBC,0x6CE2,0x6CAB,0x6CD5,0x6CD3,0x6CB8,0x6CC4,0x6CB9,
-	0x6CC1,0x6CAE,0x6CD7,0x6CC5,0x6CF1,0x6CBF,0x6CBB,0x6CE1,
-	0x6CDB,0x6CCA,0x6CAC,0x6CEF,0x6CDC,0x6CD6,0x6CE0,
-	/* Range 0xAAA1 - 0xAAFE, array index: 0x0798 */
-	0x7095,0x708E,0x7092,0x708A,0x7099,0x722C,0x722D,0x7238,
-	0x7248,0x7267,0x7269,0x72C0,0x72CE,0x72D9,0x72D7,0x72D0,
-	0x73A9,0x73A8,0x739F,0x73AB,0x73A5,0x753D,0x759D,0x7599,
-	0x759A,0x7684,0x76C2,0x76F2,0x76F4,0x77E5,0x77FD,0x793E,
-	0x7940,0x7941,0x79C9,0x79C8,0x7A7A,0x7A79,0x7AFA,0x7CFE,
-	0x7F54,0x7F8C,0x7F8B,0x8005,0x80BA,0x80A5,0x80A2,0x80B1,
-	0x80A1,0x80AB,0x80A9,0x80B4,0x80AA,0x80AF,0x81E5,0x81FE,
-	0x820D,0x82B3,0x829D,0x8299,0x82AD,0x82BD,0x829F,0x82B9,
-	0x82B1,0x82AC,0x82A5,0x82AF,0x82B8,0x82A3,0x82B0,0x82BE,
-	0x82B7,0x864E,0x8671,0x521D,0x8868,0x8ECB,0x8FCE,0x8FD4,
-	0x8FD1,0x90B5,0x90B8,0x90B1,0x90B6,0x91C7,0x91D1,0x9577,
-	0x9580,0x961C,0x9640,0x963F,0x963B,0x9644,
-	/* Range 0xAB40 - 0xAB7E, array index: 0x07F6 */
-	0x9642,0x96B9,0x96E8,0x9752,0x975E,0x4E9F,0x4EAD,0x4EAE,
-	0x4FE1,0x4FB5,0x4FAF,0x4FBF,0x4FE0,0x4FD1,0x4FCF,0x4FDD,
-	0x4FC3,0x4FB6,0x4FD8,0x4FDF,0x4FCA,0x4FD7,0x4FAE,0x4FD0,
-	0x4FC4,0x4FC2,0x4FDA,0x4FCE,0x4FDE,0x4FB7,0x5157,0x5192,
-	0x5191,0x51A0,0x524E,0x5243,0x524A,0x524D,0x524C,0x524B,
-	0x5247,0x52C7,0x52C9,0x52C3,0x52C1,0x530D,0x5357,0x537B,
-	0x539A,0x53DB,0x54AC,0x54C0,0x54A8,0x54CE,0x54C9,0x54B8,
-	0x54A6,0x54B3,0x54C7,0x54C2,0x54BD,0x54AA,0x54C1,
-	/* Range 0xABA1 - 0xABFE, array index: 0x0835 */
-	0x54C4,0x54C8,0x54AF,0x54AB,0x54B1,0x54BB,0x54A9,0x54A7,
-	0x54BF,0x56FF,0x5782,0x578B,0x57A0,0x57A3,0x57A2,0x57CE,
-	0x57AE,0x5793,0x5955,0x5951,0x594F,0x594E,0x5950,0x59DC,
-	0x59D8,0x59FF,0x59E3,0x59E8,0x5A03,0x59E5,0x59EA,0x59DA,
-	0x59E6,0x5A01,0x59FB,0x5B69,0x5BA3,0x5BA6,0x5BA4,0x5BA2,
-	0x5BA5,0x5C01,0x5C4E,0x5C4F,0x5C4D,0x5C4B,0x5CD9,0x5CD2,
-	0x5DF7,0x5E1D,0x5E25,0x5E1F,0x5E7D,0x5EA0,0x5EA6,0x5EFA,
-	0x5F08,0x5F2D,0x5F65,0x5F88,0x5F85,0x5F8A,0x5F8B,0x5F87,
-	0x5F8C,0x5F89,0x6012,0x601D,0x6020,0x6025,0x600E,0x6028,
-	0x604D,0x6070,0x6068,0x6062,0x6046,0x6043,0x606C,0x606B,
-	0x606A,0x6064,0x6241,0x62DC,0x6316,0x6309,0x62FC,0x62ED,
-	0x6301,0x62EE,0x62FD,0x6307,0x62F1,0x62F7,
-	/* Range 0xAC40 - 0xAC7E, array index: 0x0893 */
-	0x62EF,0x62EC,0x62FE,0x62F4,0x6311,0x6302,0x653F,0x6545,
-	0x65AB,0x65BD,0x65E2,0x6625,0x662D,0x6620,0x6627,0x662F,
-	0x661F,0x6628,0x6631,0x6624,0x66F7,0x67FF,0x67D3,0x67F1,
-	0x67D4,0x67D0,0x67EC,0x67B6,0x67AF,0x67F5,0x67E9,0x67EF,
-	0x67C4,0x67D1,0x67B4,0x67DA,0x67E5,0x67B8,0x67CF,0x67DE,
-	0x67F3,0x67B0,0x67D9,0x67E2,0x67DD,0x67D2,0x6B6A,0x6B83,
-	0x6B86,0x6BB5,0x6BD2,0x6BD7,0x6C1F,0x6CC9,0x6D0B,0x6D32,
-	0x6D2A,0x6D41,0x6D25,0x6D0C,0x6D31,0x6D1E,0x6D17,
-	/* Range 0xACA1 - 0xACFE, array index: 0x08D2 */
-	0x6D3B,0x6D3D,0x6D3E,0x6D36,0x6D1B,0x6CF5,0x6D39,0x6D27,
-	0x6D38,0x6D29,0x6D2E,0x6D35,0x6D0E,0x6D2B,0x70AB,0x70BA,
-	0x70B3,0x70AC,0x70AF,0x70AD,0x70B8,0x70AE,0x70A4,0x7230,
-	0x7272,0x726F,0x7274,0x72E9,0x72E0,0x72E1,0x73B7,0x73CA,
-	0x73BB,0x73B2,0x73CD,0x73C0,0x73B3,0x751A,0x752D,0x754F,
-	0x754C,0x754E,0x754B,0x75AB,0x75A4,0x75A5,0x75A2,0x75A3,
-	0x7678,0x7686,0x7687,0x7688,0x76C8,0x76C6,0x76C3,0x76C5,
-	0x7701,0x76F9,0x76F8,0x7709,0x770B,0x76FE,0x76FC,0x7707,
-	0x77DC,0x7802,0x7814,0x780C,0x780D,0x7946,0x7949,0x7948,
-	0x7947,0x79B9,0x79BA,0x79D1,0x79D2,0x79CB,0x7A7F,0x7A81,
-	0x7AFF,0x7AFD,0x7C7D,0x7D02,0x7D05,0x7D00,0x7D09,0x7D07,
-	0x7D04,0x7D06,0x7F38,0x7F8E,0x7FBF,0x8004,
-	/* Range 0xAD40 - 0xAD7E, array index: 0x0930 */
-	0x8010,0x800D,0x8011,0x8036,0x80D6,0x80E5,0x80DA,0x80C3,
-	0x80C4,0x80CC,0x80E1,0x80DB,0x80CE,0x80DE,0x80E4,0x80DD,
-	0x81F4,0x8222,0x82E7,0x8303,0x8305,0x82E3,0x82DB,0x82E6,
-	0x8304,0x82E5,0x8302,0x8309,0x82D2,0x82D7,0x82F1,0x8301,
-	0x82DC,0x82D4,0x82D1,0x82DE,0x82D3,0x82DF,0x82EF,0x8306,
-	0x8650,0x8679,0x867B,0x867A,0x884D,0x886B,0x8981,0x89D4,
-	0x8A08,0x8A02,0x8A03,0x8C9E,0x8CA0,0x8D74,0x8D73,0x8DB4,
-	0x8ECD,0x8ECC,0x8FF0,0x8FE6,0x8FE2,0x8FEA,0x8FE5,
-	/* Range 0xADA1 - 0xADFE, array index: 0x096F */
-	0x8FED,0x8FEB,0x8FE4,0x8FE8,0x90CA,0x90CE,0x90C1,0x90C3,
-	0x914B,0x914A,0x91CD,0x9582,0x9650,0x964B,0x964C,0x964D,
-	0x9762,0x9769,0x97CB,0x97ED,0x97F3,0x9801,0x98A8,0x98DB,
-	0x98DF,0x9996,0x9999,0x4E58,0x4EB3,0x500C,0x500D,0x5023,
-	0x4FEF,0x5026,0x5025,0x4FF8,0x5029,0x5016,0x5006,0x503C,
-	0x501F,0x501A,0x5012,0x5011,0x4FFA,0x5000,0x5014,0x5028,
-	0x4FF1,0x5021,0x500B,0x5019,0x5018,0x4FF3,0x4FEE,0x502D,
-	0x502A,0x4FFE,0x502B,0x5009,0x517C,0x51A4,0x51A5,0x51A2,
-	0x51CD,0x51CC,0x51C6,0x51CB,0x5256,0x525C,0x5254,0x525B,
-	0x525D,0x532A,0x537F,0x539F,0x539D,0x53DF,0x54E8,0x5510,
-	0x5501,0x5537,0x54FC,0x54E5,0x54F2,0x5506,0x54FA,0x5514,
-	0x54E9,0x54ED,0x54E1,0x5509,0x54EE,0x54EA,
-	/* Range 0xAE40 - 0xAE7E, array index: 0x09CD */
-	0x54E6,0x5527,0x5507,0x54FD,0x550F,0x5703,0x5704,0x57C2,
-	0x57D4,0x57CB,0x57C3,0x5809,0x590F,0x5957,0x5958,0x595A,
-	0x5A11,0x5A18,0x5A1C,0x5A1F,0x5A1B,0x5A13,0x59EC,0x5A20,
-	0x5A23,0x5A29,0x5A25,0x5A0C,0x5A09,0x5B6B,0x5C58,0x5BB0,
-	0x5BB3,0x5BB6,0x5BB4,0x5BAE,0x5BB5,0x5BB9,0x5BB8,0x5C04,
-	0x5C51,0x5C55,0x5C50,0x5CED,0x5CFD,0x5CFB,0x5CEA,0x5CE8,
-	0x5CF0,0x5CF6,0x5D01,0x5CF4,0x5DEE,0x5E2D,0x5E2B,0x5EAB,
-	0x5EAD,0x5EA7,0x5F31,0x5F92,0x5F91,0x5F90,0x6059,
-	/* Range 0xAEA1 - 0xAEFE, array index: 0x0A0C */
-	0x6063,0x6065,0x6050,0x6055,0x606D,0x6069,0x606F,0x6084,
-	0x609F,0x609A,0x608D,0x6094,0x608C,0x6085,0x6096,0x6247,
-	0x62F3,0x6308,0x62FF,0x634E,0x633E,0x632F,0x6355,0x6342,
-	0x6346,0x634F,0x6349,0x633A,0x6350,0x633D,0x632A,0x632B,
-	0x6328,0x634D,0x634C,0x6548,0x6549,0x6599,0x65C1,0x65C5,
-	0x6642,0x6649,0x664F,0x6643,0x6652,0x664C,0x6645,0x6641,
-	0x66F8,0x6714,0x6715,0x6717,0x6821,0x6838,0x6848,0x6846,
-	0x6853,0x6839,0x6842,0x6854,0x6829,0x68B3,0x6817,0x684C,
-	0x6851,0x683D,0x67F4,0x6850,0x6840,0x683C,0x6843,0x682A,
-	0x6845,0x6813,0x6818,0x6841,0x6B8A,0x6B89,0x6BB7,0x6C23,
-	0x6C27,0x6C28,0x6C26,0x6C24,0x6CF0,0x6D6A,0x6D95,0x6D88,
-	0x6D87,0x6D66,0x6D78,0x6D77,0x6D59,0x6D93,
-	/* Range 0xAF40 - 0xAF7E, array index: 0x0A6A */
-	0x6D6C,0x6D89,0x6D6E,0x6D5A,0x6D74,0x6D69,0x6D8C,0x6D8A,
-	0x6D79,0x6D85,0x6D65,0x6D94,0x70CA,0x70D8,0x70E4,0x70D9,
-	0x70C8,0x70CF,0x7239,0x7279,0x72FC,0x72F9,0x72FD,0x72F8,
-	0x72F7,0x7386,0x73ED,0x7409,0x73EE,0x73E0,0x73EA,0x73DE,
-	0x7554,0x755D,0x755C,0x755A,0x7559,0x75BE,0x75C5,0x75C7,
-	0x75B2,0x75B3,0x75BD,0x75BC,0x75B9,0x75C2,0x75B8,0x768B,
-	0x76B0,0x76CA,0x76CD,0x76CE,0x7729,0x771F,0x7720,0x7728,
-	0x77E9,0x7830,0x7827,0x7838,0x781D,0x7834,0x7837,
-	/* Range 0xAFA1 - 0xAFFE, array index: 0x0AA9 */
-	0x7825,0x782D,0x7820,0x781F,0x7832,0x7955,0x7950,0x7960,
-	0x795F,0x7956,0x795E,0x795D,0x7957,0x795A,0x79E4,0x79E3,
-	0x79E7,0x79DF,0x79E6,0x79E9,0x79D8,0x7A84,0x7A88,0x7AD9,
-	0x7B06,0x7B11,0x7C89,0x7D21,0x7D17,0x7D0B,0x7D0A,0x7D20,
-	0x7D22,0x7D14,0x7D10,0x7D15,0x7D1A,0x7D1C,0x7D0D,0x7D19,
-	0x7D1B,0x7F3A,0x7F5F,0x7F94,0x7FC5,0x7FC1,0x8006,0x8018,
-	0x8015,0x8019,0x8017,0x803D,0x803F,0x80F1,0x8102,0x80F0,
-	0x8105,0x80ED,0x80F4,0x8106,0x80F8,0x80F3,0x8108,0x80FD,
-	0x810A,0x80FC,0x80EF,0x81ED,0x81EC,0x8200,0x8210,0x822A,
-	0x822B,0x8228,0x822C,0x82BB,0x832B,0x8352,0x8354,0x834A,
-	0x8338,0x8350,0x8349,0x8335,0x8334,0x834F,0x8332,0x8339,
-	0x8336,0x8317,0x8340,0x8331,0x8328,0x8343,
-	/* Range 0xB040 - 0xB07E, array index: 0x0B07 */
-	0x8654,0x868A,0x86AA,0x8693,0x86A4,0x86A9,0x868C,0x86A3,
-	0x869C,0x8870,0x8877,0x8881,0x8882,0x887D,0x8879,0x8A18,
-	0x8A10,0x8A0E,0x8A0C,0x8A15,0x8A0A,0x8A17,0x8A13,0x8A16,
-	0x8A0F,0x8A11,0x8C48,0x8C7A,0x8C79,0x8CA1,0x8CA2,0x8D77,
-	0x8EAC,0x8ED2,0x8ED4,0x8ECF,0x8FB1,0x9001,0x9006,0x8FF7,
-	0x9000,0x8FFA,0x8FF4,0x9003,0x8FFD,0x9005,0x8FF8,0x9095,
-	0x90E1,0x90DD,0x90E2,0x9152,0x914D,0x914C,0x91D8,0x91DD,
-	0x91D7,0x91DC,0x91D9,0x9583,0x9662,0x9663,0x9661,
-	/* Range 0xB0A1 - 0xB0FE, array index: 0x0B46 */
-	0x965B,0x965D,0x9664,0x9658,0x965E,0x96BB,0x98E2,0x99AC,
-	0x9AA8,0x9AD8,0x9B25,0x9B32,0x9B3C,0x4E7E,0x507A,0x507D,
-	0x505C,0x5047,0x5043,0x504C,0x505A,0x5049,0x5065,0x5076,
-	0x504E,0x5055,0x5075,0x5074,0x5077,0x504F,0x500F,0x506F,
-	0x506D,0x515C,0x5195,0x51F0,0x526A,0x526F,0x52D2,0x52D9,
-	0x52D8,0x52D5,0x5310,0x530F,0x5319,0x533F,0x5340,0x533E,
-	0x53C3,0x66FC,0x5546,0x556A,0x5566,0x5544,0x555E,0x5561,
-	0x5543,0x554A,0x5531,0x5556,0x554F,0x5555,0x552F,0x5564,
-	0x5538,0x552E,0x555C,0x552C,0x5563,0x5533,0x5541,0x5557,
-	0x5708,0x570B,0x5709,0x57DF,0x5805,0x580A,0x5806,0x57E0,
-	0x57E4,0x57FA,0x5802,0x5835,0x57F7,0x57F9,0x5920,0x5962,
-	0x5A36,0x5A41,0x5A49,0x5A66,0x5A6A,0x5A40,
-	/* Range 0xB140 - 0xB17E, array index: 0x0BA4 */
-	0x5A3C,0x5A62,0x5A5A,0x5A46,0x5A4A,0x5B70,0x5BC7,0x5BC5,
-	0x5BC4,0x5BC2,0x5BBF,0x5BC6,0x5C09,0x5C08,0x5C07,0x5C60,
-	0x5C5C,0x5C5D,0x5D07,0x5D06,0x5D0E,0x5D1B,0x5D16,0x5D22,
-	0x5D11,0x5D29,0x5D14,0x5D19,0x5D24,0x5D27,0x5D17,0x5DE2,
-	0x5E38,0x5E36,0x5E33,0x5E37,0x5EB7,0x5EB8,0x5EB6,0x5EB5,
-	0x5EBE,0x5F35,0x5F37,0x5F57,0x5F6C,0x5F69,0x5F6B,0x5F97,
-	0x5F99,0x5F9E,0x5F98,0x5FA1,0x5FA0,0x5F9C,0x607F,0x60A3,
-	0x6089,0x60A0,0x60A8,0x60CB,0x60B4,0x60E6,0x60BD,
-	/* Range 0xB1A1 - 0xB1FE, array index: 0x0BE3 */
-	0x60C5,0x60BB,0x60B5,0x60DC,0x60BC,0x60D8,0x60D5,0x60C6,
-	0x60DF,0x60B8,0x60DA,0x60C7,0x621A,0x621B,0x6248,0x63A0,
-	0x63A7,0x6372,0x6396,0x63A2,0x63A5,0x6377,0x6367,0x6398,
-	0x63AA,0x6371,0x63A9,0x6389,0x6383,0x639B,0x636B,0x63A8,
-	0x6384,0x6388,0x6399,0x63A1,0x63AC,0x6392,0x638F,0x6380,
-	0x637B,0x6369,0x6368,0x637A,0x655D,0x6556,0x6551,0x6559,
-	0x6557,0x555F,0x654F,0x6558,0x6555,0x6554,0x659C,0x659B,
-	0x65AC,0x65CF,0x65CB,0x65CC,0x65CE,0x665D,0x665A,0x6664,
-	0x6668,0x6666,0x665E,0x66F9,0x52D7,0x671B,0x6881,0x68AF,
-	0x68A2,0x6893,0x68B5,0x687F,0x6876,0x68B1,0x68A7,0x6897,
-	0x68B0,0x6883,0x68C4,0x68AD,0x6886,0x6885,0x6894,0x689D,
-	0x68A8,0x689F,0x68A1,0x6882,0x6B32,0x6BBA,
-	/* Range 0xB240 - 0xB27E, array index: 0x0C41 */
-	0x6BEB,0x6BEC,0x6C2B,0x6D8E,0x6DBC,0x6DF3,0x6DD9,0x6DB2,
-	0x6DE1,0x6DCC,0x6DE4,0x6DFB,0x6DFA,0x6E05,0x6DC7,0x6DCB,
-	0x6DAF,0x6DD1,0x6DAE,0x6DDE,0x6DF9,0x6DB8,0x6DF7,0x6DF5,
-	0x6DC5,0x6DD2,0x6E1A,0x6DB5,0x6DDA,0x6DEB,0x6DD8,0x6DEA,
-	0x6DF1,0x6DEE,0x6DE8,0x6DC6,0x6DC4,0x6DAA,0x6DEC,0x6DBF,
-	0x6DE6,0x70F9,0x7109,0x710A,0x70FD,0x70EF,0x723D,0x727D,
-	0x7281,0x731C,0x731B,0x7316,0x7313,0x7319,0x7387,0x7405,
-	0x740A,0x7403,0x7406,0x73FE,0x740D,0x74E0,0x74F6,
-	/* Range 0xB2A1 - 0xB2FE, array index: 0x0C80 */
-	0x74F7,0x751C,0x7522,0x7565,0x7566,0x7562,0x7570,0x758F,
-	0x75D4,0x75D5,0x75B5,0x75CA,0x75CD,0x768E,0x76D4,0x76D2,
-	0x76DB,0x7737,0x773E,0x773C,0x7736,0x7738,0x773A,0x786B,
-	0x7843,0x784E,0x7965,0x7968,0x796D,0x79FB,0x7A92,0x7A95,
-	0x7B20,0x7B28,0x7B1B,0x7B2C,0x7B26,0x7B19,0x7B1E,0x7B2E,
-	0x7C92,0x7C97,0x7C95,0x7D46,0x7D43,0x7D71,0x7D2E,0x7D39,
-	0x7D3C,0x7D40,0x7D30,0x7D33,0x7D44,0x7D2F,0x7D42,0x7D32,
-	0x7D31,0x7F3D,0x7F9E,0x7F9A,0x7FCC,0x7FCE,0x7FD2,0x801C,
-	0x804A,0x8046,0x812F,0x8116,0x8123,0x812B,0x8129,0x8130,
-	0x8124,0x8202,0x8235,0x8237,0x8236,0x8239,0x838E,0x839E,
-	0x8398,0x8378,0x83A2,0x8396,0x83BD,0x83AB,0x8392,0x838A,
-	0x8393,0x8389,0x83A0,0x8377,0x837B,0x837C,
-	/* Range 0xB340 - 0xB37E, array index: 0x0CDE */
-	0x8386,0x83A7,0x8655,0x5F6A,0x86C7,0x86C0,0x86B6,0x86C4,
-	0x86B5,0x86C6,0x86CB,0x86B1,0x86AF,0x86C9,0x8853,0x889E,
-	0x8888,0x88AB,0x8892,0x8896,0x888D,0x888B,0x8993,0x898F,
-	0x8A2A,0x8A1D,0x8A23,0x8A25,0x8A31,0x8A2D,0x8A1F,0x8A1B,
-	0x8A22,0x8C49,0x8C5A,0x8CA9,0x8CAC,0x8CAB,0x8CA8,0x8CAA,
-	0x8CA7,0x8D67,0x8D66,0x8DBE,0x8DBA,0x8EDB,0x8EDF,0x9019,
-	0x900D,0x901A,0x9017,0x9023,0x901F,0x901D,0x9010,0x9015,
-	0x901E,0x9020,0x900F,0x9022,0x9016,0x901B,0x9014,
-	/* Range 0xB3A1 - 0xB3FE, array index: 0x0D1D */
-	0x90E8,0x90ED,0x90FD,0x9157,0x91CE,0x91F5,0x91E6,0x91E3,
-	0x91E7,0x91ED,0x91E9,0x9589,0x966A,0x9675,0x9673,0x9678,
-	0x9670,0x9674,0x9676,0x9677,0x966C,0x96C0,0x96EA,0x96E9,
-	0x7AE0,0x7ADF,0x9802,0x9803,0x9B5A,0x9CE5,0x9E75,0x9E7F,
-	0x9EA5,0x9EBB,0x50A2,0x508D,0x5085,0x5099,0x5091,0x5080,
-	0x5096,0x5098,0x509A,0x6700,0x51F1,0x5272,0x5274,0x5275,
-	0x5269,0x52DE,0x52DD,0x52DB,0x535A,0x53A5,0x557B,0x5580,
-	0x55A7,0x557C,0x558A,0x559D,0x5598,0x5582,0x559C,0x55AA,
-	0x5594,0x5587,0x558B,0x5583,0x55B3,0x55AE,0x559F,0x553E,
-	0x55B2,0x559A,0x55BB,0x55AC,0x55B1,0x557E,0x5589,0x55AB,
-	0x5599,0x570D,0x582F,0x582A,0x5834,0x5824,0x5830,0x5831,
-	0x5821,0x581D,0x5820,0x58F9,0x58FA,0x5960,
-	/* Range 0xB440 - 0xB47E, array index: 0x0D7B */
-	0x5A77,0x5A9A,0x5A7F,0x5A92,0x5A9B,0x5AA7,0x5B73,0x5B71,
-	0x5BD2,0x5BCC,0x5BD3,0x5BD0,0x5C0A,0x5C0B,0x5C31,0x5D4C,
-	0x5D50,0x5D34,0x5D47,0x5DFD,0x5E45,0x5E3D,0x5E40,0x5E43,
-	0x5E7E,0x5ECA,0x5EC1,0x5EC2,0x5EC4,0x5F3C,0x5F6D,0x5FA9,
-	0x5FAA,0x5FA8,0x60D1,0x60E1,0x60B2,0x60B6,0x60E0,0x611C,
-	0x6123,0x60FA,0x6115,0x60F0,0x60FB,0x60F4,0x6168,0x60F1,
-	0x610E,0x60F6,0x6109,0x6100,0x6112,0x621F,0x6249,0x63A3,
-	0x638C,0x63CF,0x63C0,0x63E9,0x63C9,0x63C6,0x63CD,
-	/* Range 0xB4A1 - 0xB4FE, array index: 0x0DBA */
-	0x63D2,0x63E3,0x63D0,0x63E1,0x63D6,0x63ED,0x63EE,0x6376,
-	0x63F4,0x63EA,0x63DB,0x6452,0x63DA,0x63F9,0x655E,0x6566,
-	0x6562,0x6563,0x6591,0x6590,0x65AF,0x666E,0x6670,0x6674,
-	0x6676,0x666F,0x6691,0x667A,0x667E,0x6677,0x66FE,0x66FF,
-	0x671F,0x671D,0x68FA,0x68D5,0x68E0,0x68D8,0x68D7,0x6905,
-	0x68DF,0x68F5,0x68EE,0x68E7,0x68F9,0x68D2,0x68F2,0x68E3,
-	0x68CB,0x68CD,0x690D,0x6912,0x690E,0x68C9,0x68DA,0x696E,
-	0x68FB,0x6B3E,0x6B3A,0x6B3D,0x6B98,0x6B96,0x6BBC,0x6BEF,
-	0x6C2E,0x6C2F,0x6C2C,0x6E2F,0x6E38,0x6E54,0x6E21,0x6E32,
-	0x6E67,0x6E4A,0x6E20,0x6E25,0x6E23,0x6E1B,0x6E5B,0x6E58,
-	0x6E24,0x6E56,0x6E6E,0x6E2D,0x6E26,0x6E6F,0x6E34,0x6E4D,
-	0x6E3A,0x6E2C,0x6E43,0x6E1D,0x6E3E,0x6ECB,
-	/* Range 0xB540 - 0xB57E, array index: 0x0E18 */
-	0x6E89,0x6E19,0x6E4E,0x6E63,0x6E44,0x6E72,0x6E69,0x6E5F,
-	0x7119,0x711A,0x7126,0x7130,0x7121,0x7136,0x716E,0x711C,
-	0x724C,0x7284,0x7280,0x7336,0x7325,0x7334,0x7329,0x743A,
-	0x742A,0x7433,0x7422,0x7425,0x7435,0x7436,0x7434,0x742F,
-	0x741B,0x7426,0x7428,0x7525,0x7526,0x756B,0x756A,0x75E2,
-	0x75DB,0x75E3,0x75D9,0x75D8,0x75DE,0x75E0,0x767B,0x767C,
-	0x7696,0x7693,0x76B4,0x76DC,0x774F,0x77ED,0x785D,0x786C,
-	0x786F,0x7A0D,0x7A08,0x7A0B,0x7A05,0x7A00,0x7A98,
-	/* Range 0xB5A1 - 0xB5FE, array index: 0x0E57 */
-	0x7A97,0x7A96,0x7AE5,0x7AE3,0x7B49,0x7B56,0x7B46,0x7B50,
-	0x7B52,0x7B54,0x7B4D,0x7B4B,0x7B4F,0x7B51,0x7C9F,0x7CA5,
-	0x7D5E,0x7D50,0x7D68,0x7D55,0x7D2B,0x7D6E,0x7D72,0x7D61,
-	0x7D66,0x7D62,0x7D70,0x7D73,0x5584,0x7FD4,0x7FD5,0x800B,
-	0x8052,0x8085,0x8155,0x8154,0x814B,0x8151,0x814E,0x8139,
-	0x8146,0x813E,0x814C,0x8153,0x8174,0x8212,0x821C,0x83E9,
-	0x8403,0x83F8,0x840D,0x83E0,0x83C5,0x840B,0x83C1,0x83EF,
-	0x83F1,0x83F4,0x8457,0x840A,0x83F0,0x840C,0x83CC,0x83FD,
-	0x83F2,0x83CA,0x8438,0x840E,0x8404,0x83DC,0x8407,0x83D4,
-	0x83DF,0x865B,0x86DF,0x86D9,0x86ED,0x86D4,0x86DB,0x86E4,
-	0x86D0,0x86DE,0x8857,0x88C1,0x88C2,0x88B1,0x8983,0x8996,
-	0x8A3B,0x8A60,0x8A55,0x8A5E,0x8A3C,0x8A41,
-	/* Range 0xB640 - 0xB67E, array index: 0x0EB5 */
-	0x8A54,0x8A5B,0x8A50,0x8A46,0x8A34,0x8A3A,0x8A36,0x8A56,
-	0x8C61,0x8C82,0x8CAF,0x8CBC,0x8CB3,0x8CBD,0x8CC1,0x8CBB,
-	0x8CC0,0x8CB4,0x8CB7,0x8CB6,0x8CBF,0x8CB8,0x8D8A,0x8D85,
-	0x8D81,0x8DCE,0x8DDD,0x8DCB,0x8DDA,0x8DD1,0x8DCC,0x8DDB,
-	0x8DC6,0x8EFB,0x8EF8,0x8EFC,0x8F9C,0x902E,0x9035,0x9031,
-	0x9038,0x9032,0x9036,0x9102,0x90F5,0x9109,0x90FE,0x9163,
-	0x9165,0x91CF,0x9214,0x9215,0x9223,0x9209,0x921E,0x920D,
-	0x9210,0x9207,0x9211,0x9594,0x958F,0x958B,0x9591,
-	/* Range 0xB6A1 - 0xB6FE, array index: 0x0EF4 */
-	0x9593,0x9592,0x958E,0x968A,0x968E,0x968B,0x967D,0x9685,
-	0x9686,0x968D,0x9672,0x9684,0x96C1,0x96C5,0x96C4,0x96C6,
-	0x96C7,0x96EF,0x96F2,0x97CC,0x9805,0x9806,0x9808,0x98E7,
-	0x98EA,0x98EF,0x98E9,0x98F2,0x98ED,0x99AE,0x99AD,0x9EC3,
-	0x9ECD,0x9ED1,0x4E82,0x50AD,0x50B5,0x50B2,0x50B3,0x50C5,
-	0x50BE,0x50AC,0x50B7,0x50BB,0x50AF,0x50C7,0x527F,0x5277,
-	0x527D,0x52DF,0x52E6,0x52E4,0x52E2,0x52E3,0x532F,0x55DF,
-	0x55E8,0x55D3,0x55E6,0x55CE,0x55DC,0x55C7,0x55D1,0x55E3,
-	0x55E4,0x55EF,0x55DA,0x55E1,0x55C5,0x55C6,0x55E5,0x55C9,
-	0x5712,0x5713,0x585E,0x5851,0x5858,0x5857,0x585A,0x5854,
-	0x586B,0x584C,0x586D,0x584A,0x5862,0x5852,0x584B,0x5967,
-	0x5AC1,0x5AC9,0x5ACC,0x5ABE,0x5ABD,0x5ABC,
-	/* Range 0xB740 - 0xB77E, array index: 0x0F52 */
-	0x5AB3,0x5AC2,0x5AB2,0x5D69,0x5D6F,0x5E4C,0x5E79,0x5EC9,
-	0x5EC8,0x5F12,0x5F59,0x5FAC,0x5FAE,0x611A,0x610F,0x6148,
-	0x611F,0x60F3,0x611B,0x60F9,0x6101,0x6108,0x614E,0x614C,
-	0x6144,0x614D,0x613E,0x6134,0x6127,0x610D,0x6106,0x6137,
-	0x6221,0x6222,0x6413,0x643E,0x641E,0x642A,0x642D,0x643D,
-	0x642C,0x640F,0x641C,0x6414,0x640D,0x6436,0x6416,0x6417,
-	0x6406,0x656C,0x659F,0x65B0,0x6697,0x6689,0x6687,0x6688,
-	0x6696,0x6684,0x6698,0x668D,0x6703,0x6994,0x696D,
-	/* Range 0xB7A1 - 0xB7FE, array index: 0x0F91 */
-	0x695A,0x6977,0x6960,0x6954,0x6975,0x6930,0x6982,0x694A,
-	0x6968,0x696B,0x695E,0x6953,0x6979,0x6986,0x695D,0x6963,
-	0x695B,0x6B47,0x6B72,0x6BC0,0x6BBF,0x6BD3,0x6BFD,0x6EA2,
-	0x6EAF,0x6ED3,0x6EB6,0x6EC2,0x6E90,0x6E9D,0x6EC7,0x6EC5,
-	0x6EA5,0x6E98,0x6EBC,0x6EBA,0x6EAB,0x6ED1,0x6E96,0x6E9C,
-	0x6EC4,0x6ED4,0x6EAA,0x6EA7,0x6EB4,0x714E,0x7159,0x7169,
-	0x7164,0x7149,0x7167,0x715C,0x716C,0x7166,0x714C,0x7165,
-	0x715E,0x7146,0x7168,0x7156,0x723A,0x7252,0x7337,0x7345,
-	0x733F,0x733E,0x746F,0x745A,0x7455,0x745F,0x745E,0x7441,
-	0x743F,0x7459,0x745B,0x745C,0x7576,0x7578,0x7600,0x75F0,
-	0x7601,0x75F2,0x75F1,0x75FA,0x75FF,0x75F4,0x75F3,0x76DE,
-	0x76DF,0x775B,0x776B,0x7766,0x775E,0x7763,
-	/* Range 0xB840 - 0xB87E, array index: 0x0FEF */
-	0x7779,0x776A,0x776C,0x775C,0x7765,0x7768,0x7762,0x77EE,
-	0x788E,0x78B0,0x7897,0x7898,0x788C,0x7889,0x787C,0x7891,
-	0x7893,0x787F,0x797A,0x797F,0x7981,0x842C,0x79BD,0x7A1C,
-	0x7A1A,0x7A20,0x7A14,0x7A1F,0x7A1E,0x7A9F,0x7AA0,0x7B77,
-	0x7BC0,0x7B60,0x7B6E,0x7B67,0x7CB1,0x7CB3,0x7CB5,0x7D93,
-	0x7D79,0x7D91,0x7D81,0x7D8F,0x7D5B,0x7F6E,0x7F69,0x7F6A,
-	0x7F72,0x7FA9,0x7FA8,0x7FA4,0x8056,0x8058,0x8086,0x8084,
-	0x8171,0x8170,0x8178,0x8165,0x816E,0x8173,0x816B,
-	/* Range 0xB8A1 - 0xB8FE, array index: 0x102E */
-	0x8179,0x817A,0x8166,0x8205,0x8247,0x8482,0x8477,0x843D,
-	0x8431,0x8475,0x8466,0x846B,0x8449,0x846C,0x845B,0x843C,
-	0x8435,0x8461,0x8463,0x8469,0x846D,0x8446,0x865E,0x865C,
-	0x865F,0x86F9,0x8713,0x8708,0x8707,0x8700,0x86FE,0x86FB,
-	0x8702,0x8703,0x8706,0x870A,0x8859,0x88DF,0x88D4,0x88D9,
-	0x88DC,0x88D8,0x88DD,0x88E1,0x88CA,0x88D5,0x88D2,0x899C,
-	0x89E3,0x8A6B,0x8A72,0x8A73,0x8A66,0x8A69,0x8A70,0x8A87,
-	0x8A7C,0x8A63,0x8AA0,0x8A71,0x8A85,0x8A6D,0x8A62,0x8A6E,
-	0x8A6C,0x8A79,0x8A7B,0x8A3E,0x8A68,0x8C62,0x8C8A,0x8C89,
-	0x8CCA,0x8CC7,0x8CC8,0x8CC4,0x8CB2,0x8CC3,0x8CC2,0x8CC5,
-	0x8DE1,0x8DDF,0x8DE8,0x8DEF,0x8DF3,0x8DFA,0x8DEA,0x8DE4,
-	0x8DE6,0x8EB2,0x8F03,0x8F09,0x8EFE,0x8F0A,
-	/* Range 0xB940 - 0xB97E, array index: 0x108C */
-	0x8F9F,0x8FB2,0x904B,0x904A,0x9053,0x9042,0x9054,0x903C,
-	0x9055,0x9050,0x9047,0x904F,0x904E,0x904D,0x9051,0x903E,
-	0x9041,0x9112,0x9117,0x916C,0x916A,0x9169,0x91C9,0x9237,
-	0x9257,0x9238,0x923D,0x9240,0x923E,0x925B,0x924B,0x9264,
-	0x9251,0x9234,0x9249,0x924D,0x9245,0x9239,0x923F,0x925A,
-	0x9598,0x9698,0x9694,0x9695,0x96CD,0x96CB,0x96C9,0x96CA,
-	0x96F7,0x96FB,0x96F9,0x96F6,0x9756,0x9774,0x9776,0x9810,
-	0x9811,0x9813,0x980A,0x9812,0x980C,0x98FC,0x98F4,
-	/* Range 0xB9A1 - 0xB9FE, array index: 0x10CB */
-	0x98FD,0x98FE,0x99B3,0x99B1,0x99B4,0x9AE1,0x9CE9,0x9E82,
-	0x9F0E,0x9F13,0x9F20,0x50E7,0x50EE,0x50E5,0x50D6,0x50ED,
-	0x50DA,0x50D5,0x50CF,0x50D1,0x50F1,0x50CE,0x50E9,0x5162,
-	0x51F3,0x5283,0x5282,0x5331,0x53AD,0x55FE,0x5600,0x561B,
-	0x5617,0x55FD,0x5614,0x5606,0x5609,0x560D,0x560E,0x55F7,
-	0x5616,0x561F,0x5608,0x5610,0x55F6,0x5718,0x5716,0x5875,
-	0x587E,0x5883,0x5893,0x588A,0x5879,0x5885,0x587D,0x58FD,
-	0x5925,0x5922,0x5924,0x596A,0x5969,0x5AE1,0x5AE6,0x5AE9,
-	0x5AD7,0x5AD6,0x5AD8,0x5AE3,0x5B75,0x5BDE,0x5BE7,0x5BE1,
-	0x5BE5,0x5BE6,0x5BE8,0x5BE2,0x5BE4,0x5BDF,0x5C0D,0x5C62,
-	0x5D84,0x5D87,0x5E5B,0x5E63,0x5E55,0x5E57,0x5E54,0x5ED3,
-	0x5ED6,0x5F0A,0x5F46,0x5F70,0x5FB9,0x6147,
-	/* Range 0xBA40 - 0xBA7E, array index: 0x1129 */
-	0x613F,0x614B,0x6177,0x6162,0x6163,0x615F,0x615A,0x6158,
-	0x6175,0x622A,0x6487,0x6458,0x6454,0x64A4,0x6478,0x645F,
-	0x647A,0x6451,0x6467,0x6434,0x646D,0x647B,0x6572,0x65A1,
-	0x65D7,0x65D6,0x66A2,0x66A8,0x669D,0x699C,0x69A8,0x6995,
-	0x69C1,0x69AE,0x69D3,0x69CB,0x699B,0x69B7,0x69BB,0x69AB,
-	0x69B4,0x69D0,0x69CD,0x69AD,0x69CC,0x69A6,0x69C3,0x69A3,
-	0x6B49,0x6B4C,0x6C33,0x6F33,0x6F14,0x6EFE,0x6F13,0x6EF4,
-	0x6F29,0x6F3E,0x6F20,0x6F2C,0x6F0F,0x6F02,0x6F22,
-	/* Range 0xBAA1 - 0xBAFE, array index: 0x1168 */
-	0x6EFF,0x6EEF,0x6F06,0x6F31,0x6F38,0x6F32,0x6F23,0x6F15,
-	0x6F2B,0x6F2F,0x6F88,0x6F2A,0x6EEC,0x6F01,0x6EF2,0x6ECC,
-	0x6EF7,0x7194,0x7199,0x717D,0x718A,0x7184,0x7192,0x723E,
-	0x7292,0x7296,0x7344,0x7350,0x7464,0x7463,0x746A,0x7470,
-	0x746D,0x7504,0x7591,0x7627,0x760D,0x760B,0x7609,0x7613,
-	0x76E1,0x76E3,0x7784,0x777D,0x777F,0x7761,0x78C1,0x789F,
-	0x78A7,0x78B3,0x78A9,0x78A3,0x798E,0x798F,0x798D,0x7A2E,
-	0x7A31,0x7AAA,0x7AA9,0x7AED,0x7AEF,0x7BA1,0x7B95,0x7B8B,
-	0x7B75,0x7B97,0x7B9D,0x7B94,0x7B8F,0x7BB8,0x7B87,0x7B84,
-	0x7CB9,0x7CBD,0x7CBE,0x7DBB,0x7DB0,0x7D9C,0x7DBD,0x7DBE,
-	0x7DA0,0x7DCA,0x7DB4,0x7DB2,0x7DB1,0x7DBA,0x7DA2,0x7DBF,
-	0x7DB5,0x7DB8,0x7DAD,0x7DD2,0x7DC7,0x7DAC,
-	/* Range 0xBB40 - 0xBB7E, array index: 0x11C6 */
-	0x7F70,0x7FE0,0x7FE1,0x7FDF,0x805E,0x805A,0x8087,0x8150,
-	0x8180,0x818F,0x8188,0x818A,0x817F,0x8182,0x81E7,0x81FA,
-	0x8207,0x8214,0x821E,0x824B,0x84C9,0x84BF,0x84C6,0x84C4,
-	0x8499,0x849E,0x84B2,0x849C,0x84CB,0x84B8,0x84C0,0x84D3,
-	0x8490,0x84BC,0x84D1,0x84CA,0x873F,0x871C,0x873B,0x8722,
-	0x8725,0x8734,0x8718,0x8755,0x8737,0x8729,0x88F3,0x8902,
-	0x88F4,0x88F9,0x88F8,0x88FD,0x88E8,0x891A,0x88EF,0x8AA6,
-	0x8A8C,0x8A9E,0x8AA3,0x8A8D,0x8AA1,0x8A93,0x8AA4,
-	/* Range 0xBBA1 - 0xBBFE, array index: 0x1205 */
-	0x8AAA,0x8AA5,0x8AA8,0x8A98,0x8A91,0x8A9A,0x8AA7,0x8C6A,
-	0x8C8D,0x8C8C,0x8CD3,0x8CD1,0x8CD2,0x8D6B,0x8D99,0x8D95,
-	0x8DFC,0x8F14,0x8F12,0x8F15,0x8F13,0x8FA3,0x9060,0x9058,
-	0x905C,0x9063,0x9059,0x905E,0x9062,0x905D,0x905B,0x9119,
-	0x9118,0x911E,0x9175,0x9178,0x9177,0x9174,0x9278,0x9280,
-	0x9285,0x9298,0x9296,0x927B,0x9293,0x929C,0x92A8,0x927C,
-	0x9291,0x95A1,0x95A8,0x95A9,0x95A3,0x95A5,0x95A4,0x9699,
-	0x969C,0x969B,0x96CC,0x96D2,0x9700,0x977C,0x9785,0x97F6,
-	0x9817,0x9818,0x98AF,0x98B1,0x9903,0x9905,0x990C,0x9909,
-	0x99C1,0x9AAF,0x9AB0,0x9AE6,0x9B41,0x9B42,0x9CF4,0x9CF6,
-	0x9CF3,0x9EBC,0x9F3B,0x9F4A,0x5104,0x5100,0x50FB,0x50F5,
-	0x50F9,0x5102,0x5108,0x5109,0x5105,0x51DC,
-	/* Range 0xBC40 - 0xBC7E, array index: 0x1263 */
-	0x5287,0x5288,0x5289,0x528D,0x528A,0x52F0,0x53B2,0x562E,
-	0x563B,0x5639,0x5632,0x563F,0x5634,0x5629,0x5653,0x564E,
-	0x5657,0x5674,0x5636,0x562F,0x5630,0x5880,0x589F,0x589E,
-	0x58B3,0x589C,0x58AE,0x58A9,0x58A6,0x596D,0x5B09,0x5AFB,
-	0x5B0B,0x5AF5,0x5B0C,0x5B08,0x5BEE,0x5BEC,0x5BE9,0x5BEB,
-	0x5C64,0x5C65,0x5D9D,0x5D94,0x5E62,0x5E5F,0x5E61,0x5EE2,
-	0x5EDA,0x5EDF,0x5EDD,0x5EE3,0x5EE0,0x5F48,0x5F71,0x5FB7,
-	0x5FB5,0x6176,0x6167,0x616E,0x615D,0x6155,0x6182,
-	/* Range 0xBCA1 - 0xBCFE, array index: 0x12A2 */
-	0x617C,0x6170,0x616B,0x617E,0x61A7,0x6190,0x61AB,0x618E,
-	0x61AC,0x619A,0x61A4,0x6194,0x61AE,0x622E,0x6469,0x646F,
-	0x6479,0x649E,0x64B2,0x6488,0x6490,0x64B0,0x64A5,0x6493,
-	0x6495,0x64A9,0x6492,0x64AE,0x64AD,0x64AB,0x649A,0x64AC,
-	0x6499,0x64A2,0x64B3,0x6575,0x6577,0x6578,0x66AE,0x66AB,
-	0x66B4,0x66B1,0x6A23,0x6A1F,0x69E8,0x6A01,0x6A1E,0x6A19,
-	0x69FD,0x6A21,0x6A13,0x6A0A,0x69F3,0x6A02,0x6A05,0x69ED,
-	0x6A11,0x6B50,0x6B4E,0x6BA4,0x6BC5,0x6BC6,0x6F3F,0x6F7C,
-	0x6F84,0x6F51,0x6F66,0x6F54,0x6F86,0x6F6D,0x6F5B,0x6F78,
-	0x6F6E,0x6F8E,0x6F7A,0x6F70,0x6F64,0x6F97,0x6F58,0x6ED5,
-	0x6F6F,0x6F60,0x6F5F,0x719F,0x71AC,0x71B1,0x71A8,0x7256,
-	0x729B,0x734E,0x7357,0x7469,0x748B,0x7483,
-	/* Range 0xBD40 - 0xBD7E, array index: 0x1300 */
-	0x747E,0x7480,0x757F,0x7620,0x7629,0x761F,0x7624,0x7626,
-	0x7621,0x7622,0x769A,0x76BA,0x76E4,0x778E,0x7787,0x778C,
-	0x7791,0x778B,0x78CB,0x78C5,0x78BA,0x78CA,0x78BE,0x78D5,
-	0x78BC,0x78D0,0x7A3F,0x7A3C,0x7A40,0x7A3D,0x7A37,0x7A3B,
-	0x7AAF,0x7AAE,0x7BAD,0x7BB1,0x7BC4,0x7BB4,0x7BC6,0x7BC7,
-	0x7BC1,0x7BA0,0x7BCC,0x7CCA,0x7DE0,0x7DF4,0x7DEF,0x7DFB,
-	0x7DD8,0x7DEC,0x7DDD,0x7DE8,0x7DE3,0x7DDA,0x7DDE,0x7DE9,
-	0x7D9E,0x7DD9,0x7DF2,0x7DF9,0x7F75,0x7F77,0x7FAF,
-	/* Range 0xBDA1 - 0xBDFE, array index: 0x133F */
-	0x7FE9,0x8026,0x819B,0x819C,0x819D,0x81A0,0x819A,0x8198,
-	0x8517,0x853D,0x851A,0x84EE,0x852C,0x852D,0x8513,0x8511,
-	0x8523,0x8521,0x8514,0x84EC,0x8525,0x84FF,0x8506,0x8782,
-	0x8774,0x8776,0x8760,0x8766,0x8778,0x8768,0x8759,0x8757,
-	0x874C,0x8753,0x885B,0x885D,0x8910,0x8907,0x8912,0x8913,
-	0x8915,0x890A,0x8ABC,0x8AD2,0x8AC7,0x8AC4,0x8A95,0x8ACB,
-	0x8AF8,0x8AB2,0x8AC9,0x8AC2,0x8ABF,0x8AB0,0x8AD6,0x8ACD,
-	0x8AB6,0x8AB9,0x8ADB,0x8C4C,0x8C4E,0x8C6C,0x8CE0,0x8CDE,
-	0x8CE6,0x8CE4,0x8CEC,0x8CED,0x8CE2,0x8CE3,0x8CDC,0x8CEA,
-	0x8CE1,0x8D6D,0x8D9F,0x8DA3,0x8E2B,0x8E10,0x8E1D,0x8E22,
-	0x8E0F,0x8E29,0x8E1F,0x8E21,0x8E1E,0x8EBA,0x8F1D,0x8F1B,
-	0x8F1F,0x8F29,0x8F26,0x8F2A,0x8F1C,0x8F1E,
-	/* Range 0xBE40 - 0xBE7E, array index: 0x139D */
-	0x8F25,0x9069,0x906E,0x9068,0x906D,0x9077,0x9130,0x912D,
-	0x9127,0x9131,0x9187,0x9189,0x918B,0x9183,0x92C5,0x92BB,
-	0x92B7,0x92EA,0x92AC,0x92E4,0x92C1,0x92B3,0x92BC,0x92D2,
-	0x92C7,0x92F0,0x92B2,0x95AD,0x95B1,0x9704,0x9706,0x9707,
-	0x9709,0x9760,0x978D,0x978B,0x978F,0x9821,0x982B,0x981C,
-	0x98B3,0x990A,0x9913,0x9912,0x9918,0x99DD,0x99D0,0x99DF,
-	0x99DB,0x99D1,0x99D5,0x99D2,0x99D9,0x9AB7,0x9AEE,0x9AEF,
-	0x9B27,0x9B45,0x9B44,0x9B77,0x9B6F,0x9D06,0x9D09,
-	/* Range 0xBEA1 - 0xBEFE, array index: 0x13DC */
-	0x9D03,0x9EA9,0x9EBE,0x9ECE,0x58A8,0x9F52,0x5112,0x5118,
-	0x5114,0x5110,0x5115,0x5180,0x51AA,0x51DD,0x5291,0x5293,
-	0x52F3,0x5659,0x566B,0x5679,0x5669,0x5664,0x5678,0x566A,
-	0x5668,0x5665,0x5671,0x566F,0x566C,0x5662,0x5676,0x58C1,
-	0x58BE,0x58C7,0x58C5,0x596E,0x5B1D,0x5B34,0x5B78,0x5BF0,
-	0x5C0E,0x5F4A,0x61B2,0x6191,0x61A9,0x618A,0x61CD,0x61B6,
-	0x61BE,0x61CA,0x61C8,0x6230,0x64C5,0x64C1,0x64CB,0x64BB,
-	0x64BC,0x64DA,0x64C4,0x64C7,0x64C2,0x64CD,0x64BF,0x64D2,
-	0x64D4,0x64BE,0x6574,0x66C6,0x66C9,0x66B9,0x66C4,0x66C7,
-	0x66B8,0x6A3D,0x6A38,0x6A3A,0x6A59,0x6A6B,0x6A58,0x6A39,
-	0x6A44,0x6A62,0x6A61,0x6A4B,0x6A47,0x6A35,0x6A5F,0x6A48,
-	0x6B59,0x6B77,0x6C05,0x6FC2,0x6FB1,0x6FA1,
-	/* Range 0xBF40 - 0xBF7E, array index: 0x143A */
-	0x6FC3,0x6FA4,0x6FC1,0x6FA7,0x6FB3,0x6FC0,0x6FB9,0x6FB6,
-	0x6FA6,0x6FA0,0x6FB4,0x71BE,0x71C9,0x71D0,0x71D2,0x71C8,
-	0x71D5,0x71B9,0x71CE,0x71D9,0x71DC,0x71C3,0x71C4,0x7368,
-	0x749C,0x74A3,0x7498,0x749F,0x749E,0x74E2,0x750C,0x750D,
-	0x7634,0x7638,0x763A,0x76E7,0x76E5,0x77A0,0x779E,0x779F,
-	0x77A5,0x78E8,0x78DA,0x78EC,0x78E7,0x79A6,0x7A4D,0x7A4E,
-	0x7A46,0x7A4C,0x7A4B,0x7ABA,0x7BD9,0x7C11,0x7BC9,0x7BE4,
-	0x7BDB,0x7BE1,0x7BE9,0x7BE6,0x7CD5,0x7CD6,0x7E0A,
-	/* Range 0xBFA1 - 0xBFFE, array index: 0x1479 */
-	0x7E11,0x7E08,0x7E1B,0x7E23,0x7E1E,0x7E1D,0x7E09,0x7E10,
-	0x7F79,0x7FB2,0x7FF0,0x7FF1,0x7FEE,0x8028,0x81B3,0x81A9,
-	0x81A8,0x81FB,0x8208,0x8258,0x8259,0x854A,0x8559,0x8548,
-	0x8568,0x8569,0x8543,0x8549,0x856D,0x856A,0x855E,0x8783,
-	0x879F,0x879E,0x87A2,0x878D,0x8861,0x892A,0x8932,0x8925,
-	0x892B,0x8921,0x89AA,0x89A6,0x8AE6,0x8AFA,0x8AEB,0x8AF1,
-	0x8B00,0x8ADC,0x8AE7,0x8AEE,0x8AFE,0x8B01,0x8B02,0x8AF7,
-	0x8AED,0x8AF3,0x8AF6,0x8AFC,0x8C6B,0x8C6D,0x8C93,0x8CF4,
-	0x8E44,0x8E31,0x8E34,0x8E42,0x8E39,0x8E35,0x8F3B,0x8F2F,
-	0x8F38,0x8F33,0x8FA8,0x8FA6,0x9075,0x9074,0x9078,0x9072,
-	0x907C,0x907A,0x9134,0x9192,0x9320,0x9336,0x92F8,0x9333,
-	0x932F,0x9322,0x92FC,0x932B,0x9304,0x931A,
-	/* Range 0xC040 - 0xC07E, array index: 0x14D7 */
-	0x9310,0x9326,0x9321,0x9315,0x932E,0x9319,0x95BB,0x96A7,
-	0x96A8,0x96AA,0x96D5,0x970E,0x9711,0x9716,0x970D,0x9713,
-	0x970F,0x975B,0x975C,0x9766,0x9798,0x9830,0x9838,0x983B,
-	0x9837,0x982D,0x9839,0x9824,0x9910,0x9928,0x991E,0x991B,
-	0x9921,0x991A,0x99ED,0x99E2,0x99F1,0x9AB8,0x9ABC,0x9AFB,
-	0x9AED,0x9B28,0x9B91,0x9D15,0x9D23,0x9D26,0x9D28,0x9D12,
-	0x9D1B,0x9ED8,0x9ED4,0x9F8D,0x9F9C,0x512A,0x511F,0x5121,
-	0x5132,0x52F5,0x568E,0x5680,0x5690,0x5685,0x5687,
-	/* Range 0xC0A1 - 0xC0FE, array index: 0x1516 */
-	0x568F,0x58D5,0x58D3,0x58D1,0x58CE,0x5B30,0x5B2A,0x5B24,
-	0x5B7A,0x5C37,0x5C68,0x5DBC,0x5DBA,0x5DBD,0x5DB8,0x5E6B,
-	0x5F4C,0x5FBD,0x61C9,0x61C2,0x61C7,0x61E6,0x61CB,0x6232,
-	0x6234,0x64CE,0x64CA,0x64D8,0x64E0,0x64F0,0x64E6,0x64EC,
-	0x64F1,0x64E2,0x64ED,0x6582,0x6583,0x66D9,0x66D6,0x6A80,
-	0x6A94,0x6A84,0x6AA2,0x6A9C,0x6ADB,0x6AA3,0x6A7E,0x6A97,
-	0x6A90,0x6AA0,0x6B5C,0x6BAE,0x6BDA,0x6C08,0x6FD8,0x6FF1,
-	0x6FDF,0x6FE0,0x6FDB,0x6FE4,0x6FEB,0x6FEF,0x6F80,0x6FEC,
-	0x6FE1,0x6FE9,0x6FD5,0x6FEE,0x6FF0,0x71E7,0x71DF,0x71EE,
-	0x71E6,0x71E5,0x71ED,0x71EC,0x71F4,0x71E0,0x7235,0x7246,
-	0x7370,0x7372,0x74A9,0x74B0,0x74A6,0x74A8,0x7646,0x7642,
-	0x764C,0x76EA,0x77B3,0x77AA,0x77B0,0x77AC,
-	/* Range 0xC140 - 0xC17E, array index: 0x1574 */
-	0x77A7,0x77AD,0x77EF,0x78F7,0x78FA,0x78F4,0x78EF,0x7901,
-	0x79A7,0x79AA,0x7A57,0x7ABF,0x7C07,0x7C0D,0x7BFE,0x7BF7,
-	0x7C0C,0x7BE0,0x7CE0,0x7CDC,0x7CDE,0x7CE2,0x7CDF,0x7CD9,
-	0x7CDD,0x7E2E,0x7E3E,0x7E46,0x7E37,0x7E32,0x7E43,0x7E2B,
-	0x7E3D,0x7E31,0x7E45,0x7E41,0x7E34,0x7E39,0x7E48,0x7E35,
-	0x7E3F,0x7E2F,0x7F44,0x7FF3,0x7FFC,0x8071,0x8072,0x8070,
-	0x806F,0x8073,0x81C6,0x81C3,0x81BA,0x81C2,0x81C0,0x81BF,
-	0x81BD,0x81C9,0x81BE,0x81E8,0x8209,0x8271,0x85AA,
-	/* Range 0xC1A1 - 0xC1FE, array index: 0x15B3 */
-	0x8584,0x857E,0x859C,0x8591,0x8594,0x85AF,0x859B,0x8587,
-	0x85A8,0x858A,0x8667,0x87C0,0x87D1,0x87B3,0x87D2,0x87C6,
-	0x87AB,0x87BB,0x87BA,0x87C8,0x87CB,0x893B,0x8936,0x8944,
-	0x8938,0x893D,0x89AC,0x8B0E,0x8B17,0x8B19,0x8B1B,0x8B0A,
-	0x8B20,0x8B1D,0x8B04,0x8B10,0x8C41,0x8C3F,0x8C73,0x8CFA,
-	0x8CFD,0x8CFC,0x8CF8,0x8CFB,0x8DA8,0x8E49,0x8E4B,0x8E48,
-	0x8E4A,0x8F44,0x8F3E,0x8F42,0x8F45,0x8F3F,0x907F,0x907D,
-	0x9084,0x9081,0x9082,0x9080,0x9139,0x91A3,0x919E,0x919C,
-	0x934D,0x9382,0x9328,0x9375,0x934A,0x9365,0x934B,0x9318,
-	0x937E,0x936C,0x935B,0x9370,0x935A,0x9354,0x95CA,0x95CB,
-	0x95CC,0x95C8,0x95C6,0x96B1,0x96B8,0x96D6,0x971C,0x971E,
-	0x97A0,0x97D3,0x9846,0x98B6,0x9935,0x9A01,
-	/* Range 0xC240 - 0xC27E, array index: 0x1611 */
-	0x99FF,0x9BAE,0x9BAB,0x9BAA,0x9BAD,0x9D3B,0x9D3F,0x9E8B,
-	0x9ECF,0x9EDE,0x9EDC,0x9EDD,0x9EDB,0x9F3E,0x9F4B,0x53E2,
-	0x5695,0x56AE,0x58D9,0x58D8,0x5B38,0x5F5D,0x61E3,0x6233,
-	0x64F4,0x64F2,0x64FE,0x6506,0x64FA,0x64FB,0x64F7,0x65B7,
-	0x66DC,0x6726,0x6AB3,0x6AAC,0x6AC3,0x6ABB,0x6AB8,0x6AC2,
-	0x6AAE,0x6AAF,0x6B5F,0x6B78,0x6BAF,0x7009,0x700B,0x6FFE,
-	0x7006,0x6FFA,0x7011,0x700F,0x71FB,0x71FC,0x71FE,0x71F8,
-	0x7377,0x7375,0x74A7,0x74BF,0x7515,0x7656,0x7658,
-	/* Range 0xC2A1 - 0xC2FE, array index: 0x1650 */
-	0x7652,0x77BD,0x77BF,0x77BB,0x77BC,0x790E,0x79AE,0x7A61,
-	0x7A62,0x7A60,0x7AC4,0x7AC5,0x7C2B,0x7C27,0x7C2A,0x7C1E,
-	0x7C23,0x7C21,0x7CE7,0x7E54,0x7E55,0x7E5E,0x7E5A,0x7E61,
-	0x7E52,0x7E59,0x7F48,0x7FF9,0x7FFB,0x8077,0x8076,0x81CD,
-	0x81CF,0x820A,0x85CF,0x85A9,0x85CD,0x85D0,0x85C9,0x85B0,
-	0x85BA,0x85B9,0x85A6,0x87EF,0x87EC,0x87F2,0x87E0,0x8986,
-	0x89B2,0x89F4,0x8B28,0x8B39,0x8B2C,0x8B2B,0x8C50,0x8D05,
-	0x8E59,0x8E63,0x8E66,0x8E64,0x8E5F,0x8E55,0x8EC0,0x8F49,
-	0x8F4D,0x9087,0x9083,0x9088,0x91AB,0x91AC,0x91D0,0x9394,
-	0x938A,0x9396,0x93A2,0x93B3,0x93AE,0x93AC,0x93B0,0x9398,
-	0x939A,0x9397,0x95D4,0x95D6,0x95D0,0x95D5,0x96E2,0x96DC,
-	0x96D9,0x96DB,0x96DE,0x9724,0x97A3,0x97A6,
-	/* Range 0xC340 - 0xC37E, array index: 0x16AE */
-	0x97AD,0x97F9,0x984D,0x984F,0x984C,0x984E,0x9853,0x98BA,
-	0x993E,0x993F,0x993D,0x992E,0x99A5,0x9A0E,0x9AC1,0x9B03,
-	0x9B06,0x9B4F,0x9B4E,0x9B4D,0x9BCA,0x9BC9,0x9BFD,0x9BC8,
-	0x9BC0,0x9D51,0x9D5D,0x9D60,0x9EE0,0x9F15,0x9F2C,0x5133,
-	0x56A5,0x58DE,0x58DF,0x58E2,0x5BF5,0x9F90,0x5EEC,0x61F2,
-	0x61F7,0x61F6,0x61F5,0x6500,0x650F,0x66E0,0x66DD,0x6AE5,
-	0x6ADD,0x6ADA,0x6AD3,0x701B,0x701F,0x7028,0x701A,0x701D,
-	0x7015,0x7018,0x7206,0x720D,0x7258,0x72A2,0x7378,
-	/* Range 0xC3A1 - 0xC3FE, array index: 0x16ED */
-	0x737A,0x74BD,0x74CA,0x74E3,0x7587,0x7586,0x765F,0x7661,
-	0x77C7,0x7919,0x79B1,0x7A6B,0x7A69,0x7C3E,0x7C3F,0x7C38,
-	0x7C3D,0x7C37,0x7C40,0x7E6B,0x7E6D,0x7E79,0x7E69,0x7E6A,
-	0x7F85,0x7E73,0x7FB6,0x7FB9,0x7FB8,0x81D8,0x85E9,0x85DD,
-	0x85EA,0x85D5,0x85E4,0x85E5,0x85F7,0x87FB,0x8805,0x880D,
-	0x87F9,0x87FE,0x8960,0x895F,0x8956,0x895E,0x8B41,0x8B5C,
-	0x8B58,0x8B49,0x8B5A,0x8B4E,0x8B4F,0x8B46,0x8B59,0x8D08,
-	0x8D0A,0x8E7C,0x8E72,0x8E87,0x8E76,0x8E6C,0x8E7A,0x8E74,
-	0x8F54,0x8F4E,0x8FAD,0x908A,0x908B,0x91B1,0x91AE,0x93E1,
-	0x93D1,0x93DF,0x93C3,0x93C8,0x93DC,0x93DD,0x93D6,0x93E2,
-	0x93CD,0x93D8,0x93E4,0x93D7,0x93E8,0x95DC,0x96B4,0x96E3,
-	0x972A,0x9727,0x9761,0x97DC,0x97FB,0x985E,
-	/* Range 0xC440 - 0xC47E, array index: 0x174B */
-	0x9858,0x985B,0x98BC,0x9945,0x9949,0x9A16,0x9A19,0x9B0D,
-	0x9BE8,0x9BE7,0x9BD6,0x9BDB,0x9D89,0x9D61,0x9D72,0x9D6A,
-	0x9D6C,0x9E92,0x9E97,0x9E93,0x9EB4,0x52F8,0x56A8,0x56B7,
-	0x56B6,0x56B4,0x56BC,0x58E4,0x5B40,0x5B43,0x5B7D,0x5BF6,
-	0x5DC9,0x61F8,0x61FA,0x6518,0x6514,0x6519,0x66E6,0x6727,
-	0x6AEC,0x703E,0x7030,0x7032,0x7210,0x737B,0x74CF,0x7662,
-	0x7665,0x7926,0x792A,0x792C,0x792B,0x7AC7,0x7AF6,0x7C4C,
-	0x7C43,0x7C4D,0x7CEF,0x7CF0,0x8FAE,0x7E7D,0x7E7C,
-	/* Range 0xC4A1 - 0xC4FE, array index: 0x178A */
-	0x7E82,0x7F4C,0x8000,0x81DA,0x8266,0x85FB,0x85F9,0x8611,
-	0x85FA,0x8606,0x860B,0x8607,0x860A,0x8814,0x8815,0x8964,
-	0x89BA,0x89F8,0x8B70,0x8B6C,0x8B66,0x8B6F,0x8B5F,0x8B6B,
-	0x8D0F,0x8D0D,0x8E89,0x8E81,0x8E85,0x8E82,0x91B4,0x91CB,
-	0x9418,0x9403,0x93FD,0x95E1,0x9730,0x98C4,0x9952,0x9951,
-	0x99A8,0x9A2B,0x9A30,0x9A37,0x9A35,0x9C13,0x9C0D,0x9E79,
-	0x9EB5,0x9EE8,0x9F2F,0x9F5F,0x9F63,0x9F61,0x5137,0x5138,
-	0x56C1,0x56C0,0x56C2,0x5914,0x5C6C,0x5DCD,0x61FC,0x61FE,
-	0x651D,0x651C,0x6595,0x66E9,0x6AFB,0x6B04,0x6AFA,0x6BB2,
-	0x704C,0x721B,0x72A7,0x74D6,0x74D4,0x7669,0x77D3,0x7C50,
-	0x7E8F,0x7E8C,0x7FBC,0x8617,0x862D,0x861A,0x8823,0x8822,
-	0x8821,0x881F,0x896A,0x896C,0x89BD,0x8B74,
-	/* Range 0xC540 - 0xC57E, array index: 0x17E8 */
-	0x8B77,0x8B7D,0x8D13,0x8E8A,0x8E8D,0x8E8B,0x8F5F,0x8FAF,
-	0x91BA,0x942E,0x9433,0x9435,0x943A,0x9438,0x9432,0x942B,
-	0x95E2,0x9738,0x9739,0x9732,0x97FF,0x9867,0x9865,0x9957,
-	0x9A45,0x9A43,0x9A40,0x9A3E,0x9ACF,0x9B54,0x9B51,0x9C2D,
-	0x9C25,0x9DAF,0x9DB4,0x9DC2,0x9DB8,0x9E9D,0x9EEF,0x9F19,
-	0x9F5C,0x9F66,0x9F67,0x513C,0x513B,0x56C8,0x56CA,0x56C9,
-	0x5B7F,0x5DD4,0x5DD2,0x5F4E,0x61FF,0x6524,0x6B0A,0x6B61,
-	0x7051,0x7058,0x7380,0x74E4,0x758A,0x766E,0x766C,
-	/* Range 0xC5A1 - 0xC5FE, array index: 0x1827 */
-	0x79B3,0x7C60,0x7C5F,0x807E,0x807D,0x81DF,0x8972,0x896F,
-	0x89FC,0x8B80,0x8D16,0x8D17,0x8E91,0x8E93,0x8F61,0x9148,
-	0x9444,0x9451,0x9452,0x973D,0x973E,0x97C3,0x97C1,0x986B,
-	0x9955,0x9A55,0x9A4D,0x9AD2,0x9B1A,0x9C49,0x9C31,0x9C3E,
-	0x9C3B,0x9DD3,0x9DD7,0x9F34,0x9F6C,0x9F6A,0x9F94,0x56CC,
-	0x5DD6,0x6200,0x6523,0x652B,0x652A,0x66EC,0x6B10,0x74DA,
-	0x7ACA,0x7C64,0x7C63,0x7C65,0x7E93,0x7E96,0x7E94,0x81E2,
-	0x8638,0x863F,0x8831,0x8B8A,0x9090,0x908F,0x9463,0x9460,
-	0x9464,0x9768,0x986F,0x995C,0x9A5A,0x9A5B,0x9A57,0x9AD3,
-	0x9AD4,0x9AD1,0x9C54,0x9C57,0x9C56,0x9DE5,0x9E9F,0x9EF4,
-	0x56D1,0x58E9,0x652C,0x705E,0x7671,0x7672,0x77D7,0x7F50,
-	0x7F88,0x8836,0x8839,0x8862,0x8B93,0x8B92,
-	/* Range 0xC640 - 0xC67E, array index: 0x1885 */
-	0x8B96,0x8277,0x8D1B,0x91C0,0x946A,0x9742,0x9748,0x9744,
-	0x97C6,0x9870,0x9A5F,0x9B22,0x9B58,0x9C5F,0x9DF9,0x9DFA,
-	0x9E7C,0x9E7D,0x9F07,0x9F77,0x9F72,0x5EF3,0x6B16,0x7063,
-	0x7C6C,0x7C6E,0x883B,0x89C0,0x8EA1,0x91C1,0x9472,0x9470,
-	0x9871,0x995E,0x9AD6,0x9B23,0x9ECC,0x7064,0x77DA,0x8B9A,
-	0x9477,0x97C9,0x9A62,0x9A65,0x7E9C,0x8B9C,0x8EAA,0x91C5,
-	0x947D,0x947E,0x947C,0x9C77,0x9C78,0x9EF7,0x8C54,0x947F,
-	0x9E1A,0x7228,0x9A6A,0x9B31,0x9E1B,0x9E1E,0x7C72,
-	/* Range 0xC6A1 - 0xC6FE, array index: 0x18C4 */
-	0x30FE,0x309D,0x309E,0x3005,0x3041,0x3042,0x3043,0x3044,
-	0x3045,0x3046,0x3047,0x3048,0x3049,0x304A,0x304B,0x304C,
-	0x304D,0x304E,0x304F,0x3050,0x3051,0x3052,0x3053,0x3054,
-	0x3055,0x3056,0x3057,0x3058,0x3059,0x305A,0x305B,0x305C,
-	0x305D,0x305E,0x305F,0x3060,0x3061,0x3062,0x3063,0x3064,
-	0x3065,0x3066,0x3067,0x3068,0x3069,0x306A,0x306B,0x306C,
-	0x306D,0x306E,0x306F,0x3070,0x3071,0x3072,0x3073,0x3074,
-	0x3075,0x3076,0x3077,0x3078,0x3079,0x307A,0x307B,0x307C,
-	0x307D,0x307E,0x307F,0x3080,0x3081,0x3082,0x3083,0x3084,
-	0x3085,0x3086,0x3087,0x3088,0x3089,0x308A,0x308B,0x308C,
-	0x308D,0x308E,0x308F,0x3090,0x3091,0x3092,0x3093,0x30A1,
-	0x30A2,0x30A3,0x30A4,0x30A5,0x30A6,0x30A7,
-	/* Range 0xC740 - 0xC77E, array index: 0x1922 */
-	0x30A8,0x30A9,0x30AA,0x30AB,0x30AC,0x30AD,0x30AE,0x30AF,
-	0x30B0,0x30B1,0x30B2,0x30B3,0x30B4,0x30B5,0x30B6,0x30B7,
-	0x30B8,0x30B9,0x30BA,0x30BB,0x30BC,0x30BD,0x30BE,0x30BF,
-	0x30C0,0x30C1,0x30C2,0x30C3,0x30C4,0x30C5,0x30C6,0x30C7,
-	0x30C8,0x30C9,0x30CA,0x30CB,0x30CC,0x30CD,0x30CE,0x30CF,
-	0x30D0,0x30D1,0x30D2,0x30D3,0x30D4,0x30D5,0x30D6,0x30D7,
-	0x30D8,0x30D9,0x30DA,0x30DB,0x30DC,0x30DD,0x30DE,0x30DF,
-	0x30E0,0x30E1,0x30E2,0x30E3,0x30E4,0x30E5,0x30E6,
-	/* Range 0xC7A1 - 0xC7FC, array index: 0x1961 */
-	0x30E7,0x30E8,0x30E9,0x30EA,0x30EB,0x30EC,0x30ED,0x30EE,
-	0x30EF,0x30F0,0x30F1,0x30F2,0x30F3,0x30F4,0x30F5,0x30F6,
-	0x0414,0x0415,0x0401,0x0416,0x0417,0x0418,0x0419,0x041A,
-	0x041B,0x041C,0x0423,0x0424,0x0425,0x0426,0x0427,0x0428,
-	0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,0x0430,
-	0x0431,0x0432,0x0433,0x0434,0x0435,0x0451,0x0436,0x0437,
-	0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,
-	0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,
-	0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F,
-	0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467,
-	0x2468,0x2469,0x2474,0x2475,0x2476,0x2477,0x2478,0x2479,
-	0x247A,0x247B,0x247C,0x247D,
-	/* Range 0xC940 - 0xC97E, array index: 0x19BD */
-	0x4E42,0x4E5C,0x51F5,0x531A,0x5382,0x4E07,0x4E0C,0x4E47,
-	0x4E8D,0x56D7,0xFA0C,0x5C6E,0x5F73,0x4E0F,0x5187,0x4E0E,
-	0x4E2E,0x4E93,0x4EC2,0x4EC9,0x4EC8,0x5198,0x52FC,0x536C,
-	0x53B9,0x5720,0x5903,0x592C,0x5C10,0x5DFF,0x65E1,0x6BB3,
-	0x6BCC,0x6C14,0x723F,0x4E31,0x4E3C,0x4EE8,0x4EDC,0x4EE9,
-	0x4EE1,0x4EDD,0x4EDA,0x520C,0x531C,0x534C,0x5722,0x5723,
-	0x5917,0x592F,0x5B81,0x5B84,0x5C12,0x5C3B,0x5C74,0x5C73,
-	0x5E04,0x5E80,0x5E82,0x5FC9,0x6209,0x6250,0x6C15,
-	/* Range 0xC9A1 - 0xC9FE, array index: 0x19FC */
-	0x6C36,0x6C43,0x6C3F,0x6C3B,0x72AE,0x72B0,0x738A,0x79B8,
-	0x808A,0x961E,0x4F0E,0x4F18,0x4F2C,0x4EF5,0x4F14,0x4EF1,
-	0x4F00,0x4EF7,0x4F08,0x4F1D,0x4F02,0x4F05,0x4F22,0x4F13,
-	0x4F04,0x4EF4,0x4F12,0x51B1,0x5213,0x5209,0x5210,0x52A6,
-	0x5322,0x531F,0x534D,0x538A,0x5407,0x56E1,0x56DF,0x572E,
-	0x572A,0x5734,0x593C,0x5980,0x597C,0x5985,0x597B,0x597E,
-	0x5977,0x597F,0x5B56,0x5C15,0x5C25,0x5C7C,0x5C7A,0x5C7B,
-	0x5C7E,0x5DDF,0x5E75,0x5E84,0x5F02,0x5F1A,0x5F74,0x5FD5,
-	0x5FD4,0x5FCF,0x625C,0x625E,0x6264,0x6261,0x6266,0x6262,
-	0x6259,0x6260,0x625A,0x6265,0x65EF,0x65EE,0x673E,0x6739,
-	0x6738,0x673B,0x673A,0x673F,0x673C,0x6733,0x6C18,0x6C46,
-	0x6C52,0x6C5C,0x6C4F,0x6C4A,0x6C54,0x6C4B,
-	/* Range 0xCA40 - 0xCA7E, array index: 0x1A5A */
-	0x6C4C,0x7071,0x725E,0x72B4,0x72B5,0x738E,0x752A,0x767F,
-	0x7A75,0x7F51,0x8278,0x827C,0x8280,0x827D,0x827F,0x864D,
-	0x897E,0x9099,0x9097,0x9098,0x909B,0x9094,0x9622,0x9624,
-	0x9620,0x9623,0x4F56,0x4F3B,0x4F62,0x4F49,0x4F53,0x4F64,
-	0x4F3E,0x4F67,0x4F52,0x4F5F,0x4F41,0x4F58,0x4F2D,0x4F33,
-	0x4F3F,0x4F61,0x518F,0x51B9,0x521C,0x521E,0x5221,0x52AD,
-	0x52AE,0x5309,0x5363,0x5372,0x538E,0x538F,0x5430,0x5437,
-	0x542A,0x5454,0x5445,0x5419,0x541C,0x5425,0x5418,
-	/* Range 0xCAA1 - 0xCAFE, array index: 0x1A99 */
-	0x543D,0x544F,0x5441,0x5428,0x5424,0x5447,0x56EE,0x56E7,
-	0x56E5,0x5741,0x5745,0x574C,0x5749,0x574B,0x5752,0x5906,
-	0x5940,0x59A6,0x5998,0x59A0,0x5997,0x598E,0x59A2,0x5990,
-	0x598F,0x59A7,0x59A1,0x5B8E,0x5B92,0x5C28,0x5C2A,0x5C8D,
-	0x5C8F,0x5C88,0x5C8B,0x5C89,0x5C92,0x5C8A,0x5C86,0x5C93,
-	0x5C95,0x5DE0,0x5E0A,0x5E0E,0x5E8B,0x5E89,0x5E8C,0x5E88,
-	0x5E8D,0x5F05,0x5F1D,0x5F78,0x5F76,0x5FD2,0x5FD1,0x5FD0,
-	0x5FED,0x5FE8,0x5FEE,0x5FF3,0x5FE1,0x5FE4,0x5FE3,0x5FFA,
-	0x5FEF,0x5FF7,0x5FFB,0x6000,0x5FF4,0x623A,0x6283,0x628C,
-	0x628E,0x628F,0x6294,0x6287,0x6271,0x627B,0x627A,0x6270,
-	0x6281,0x6288,0x6277,0x627D,0x6272,0x6274,0x6537,0x65F0,
-	0x65F4,0x65F3,0x65F2,0x65F5,0x6745,0x6747,
-	/* Range 0xCB40 - 0xCB7E, array index: 0x1AF7 */
-	0x6759,0x6755,0x674C,0x6748,0x675D,0x674D,0x675A,0x674B,
-	0x6BD0,0x6C19,0x6C1A,0x6C78,0x6C67,0x6C6B,0x6C84,0x6C8B,
-	0x6C8F,0x6C71,0x6C6F,0x6C69,0x6C9A,0x6C6D,0x6C87,0x6C95,
-	0x6C9C,0x6C66,0x6C73,0x6C65,0x6C7B,0x6C8E,0x7074,0x707A,
-	0x7263,0x72BF,0x72BD,0x72C3,0x72C6,0x72C1,0x72BA,0x72C5,
-	0x7395,0x7397,0x7393,0x7394,0x7392,0x753A,0x7539,0x7594,
-	0x7595,0x7681,0x793D,0x8034,0x8095,0x8099,0x8090,0x8092,
-	0x809C,0x8290,0x828F,0x8285,0x828E,0x8291,0x8293,
-	/* Range 0xCBA1 - 0xCBFE, array index: 0x1B36 */
-	0x828A,0x8283,0x8284,0x8C78,0x8FC9,0x8FBF,0x909F,0x90A1,
-	0x90A5,0x909E,0x90A7,0x90A0,0x9630,0x9628,0x962F,0x962D,
-	0x4E33,0x4F98,0x4F7C,0x4F85,0x4F7D,0x4F80,0x4F87,0x4F76,
-	0x4F74,0x4F89,0x4F84,0x4F77,0x4F4C,0x4F97,0x4F6A,0x4F9A,
-	0x4F79,0x4F81,0x4F78,0x4F90,0x4F9C,0x4F94,0x4F9E,0x4F92,
-	0x4F82,0x4F95,0x4F6B,0x4F6E,0x519E,0x51BC,0x51BE,0x5235,
-	0x5232,0x5233,0x5246,0x5231,0x52BC,0x530A,0x530B,0x533C,
-	0x5392,0x5394,0x5487,0x547F,0x5481,0x5491,0x5482,0x5488,
-	0x546B,0x547A,0x547E,0x5465,0x546C,0x5474,0x5466,0x548D,
-	0x546F,0x5461,0x5460,0x5498,0x5463,0x5467,0x5464,0x56F7,
-	0x56F9,0x576F,0x5772,0x576D,0x576B,0x5771,0x5770,0x5776,
-	0x5780,0x5775,0x577B,0x5773,0x5774,0x5762,
-	/* Range 0xCC40 - 0xCC7E, array index: 0x1B94 */
-	0x5768,0x577D,0x590C,0x5945,0x59B5,0x59BA,0x59CF,0x59CE,
-	0x59B2,0x59CC,0x59C1,0x59B6,0x59BC,0x59C3,0x59D6,0x59B1,
-	0x59BD,0x59C0,0x59C8,0x59B4,0x59C7,0x5B62,0x5B65,0x5B93,
-	0x5B95,0x5C44,0x5C47,0x5CAE,0x5CA4,0x5CA0,0x5CB5,0x5CAF,
-	0x5CA8,0x5CAC,0x5C9F,0x5CA3,0x5CAD,0x5CA2,0x5CAA,0x5CA7,
-	0x5C9D,0x5CA5,0x5CB6,0x5CB0,0x5CA6,0x5E17,0x5E14,0x5E19,
-	0x5F28,0x5F22,0x5F23,0x5F24,0x5F54,0x5F82,0x5F7E,0x5F7D,
-	0x5FDE,0x5FE5,0x602D,0x6026,0x6019,0x6032,0x600B,
-	/* Range 0xCCA1 - 0xCCFE, array index: 0x1BD3 */
-	0x6034,0x600A,0x6017,0x6033,0x601A,0x601E,0x602C,0x6022,
-	0x600D,0x6010,0x602E,0x6013,0x6011,0x600C,0x6009,0x601C,
-	0x6214,0x623D,0x62AD,0x62B4,0x62D1,0x62BE,0x62AA,0x62B6,
-	0x62CA,0x62AE,0x62B3,0x62AF,0x62BB,0x62A9,0x62B0,0x62B8,
-	0x653D,0x65A8,0x65BB,0x6609,0x65FC,0x6604,0x6612,0x6608,
-	0x65FB,0x6603,0x660B,0x660D,0x6605,0x65FD,0x6611,0x6610,
-	0x66F6,0x670A,0x6785,0x676C,0x678E,0x6792,0x6776,0x677B,
-	0x6798,0x6786,0x6784,0x6774,0x678D,0x678C,0x677A,0x679F,
-	0x6791,0x6799,0x6783,0x677D,0x6781,0x6778,0x6779,0x6794,
-	0x6B25,0x6B80,0x6B7E,0x6BDE,0x6C1D,0x6C93,0x6CEC,0x6CEB,
-	0x6CEE,0x6CD9,0x6CB6,0x6CD4,0x6CAD,0x6CE7,0x6CB7,0x6CD0,
-	0x6CC2,0x6CBA,0x6CC3,0x6CC6,0x6CED,0x6CF2,
-	/* Range 0xCD40 - 0xCD7E, array index: 0x1C31 */
-	0x6CD2,0x6CDD,0x6CB4,0x6C8A,0x6C9D,0x6C80,0x6CDE,0x6CC0,
-	0x6D30,0x6CCD,0x6CC7,0x6CB0,0x6CF9,0x6CCF,0x6CE9,0x6CD1,
-	0x7094,0x7098,0x7085,0x7093,0x7086,0x7084,0x7091,0x7096,
-	0x7082,0x709A,0x7083,0x726A,0x72D6,0x72CB,0x72D8,0x72C9,
-	0x72DC,0x72D2,0x72D4,0x72DA,0x72CC,0x72D1,0x73A4,0x73A1,
-	0x73AD,0x73A6,0x73A2,0x73A0,0x73AC,0x739D,0x74DD,0x74E8,
-	0x753F,0x7540,0x753E,0x758C,0x7598,0x76AF,0x76F3,0x76F1,
-	0x76F0,0x76F5,0x77F8,0x77FC,0x77F9,0x77FB,0x77FA,
-	/* Range 0xCDA1 - 0xCDFE, array index: 0x1C70 */
-	0x77F7,0x7942,0x793F,0x79C5,0x7A78,0x7A7B,0x7AFB,0x7C75,
-	0x7CFD,0x8035,0x808F,0x80AE,0x80A3,0x80B8,0x80B5,0x80AD,
-	0x8220,0x82A0,0x82C0,0x82AB,0x829A,0x8298,0x829B,0x82B5,
-	0x82A7,0x82AE,0x82BC,0x829E,0x82BA,0x82B4,0x82A8,0x82A1,
-	0x82A9,0x82C2,0x82A4,0x82C3,0x82B6,0x82A2,0x8670,0x866F,
-	0x866D,0x866E,0x8C56,0x8FD2,0x8FCB,0x8FD3,0x8FCD,0x8FD6,
-	0x8FD5,0x8FD7,0x90B2,0x90B4,0x90AF,0x90B3,0x90B0,0x9639,
-	0x963D,0x963C,0x963A,0x9643,0x4FCD,0x4FC5,0x4FD3,0x4FB2,
-	0x4FC9,0x4FCB,0x4FC1,0x4FD4,0x4FDC,0x4FD9,0x4FBB,0x4FB3,
-	0x4FDB,0x4FC7,0x4FD6,0x4FBA,0x4FC0,0x4FB9,0x4FEC,0x5244,
-	0x5249,0x52C0,0x52C2,0x533D,0x537C,0x5397,0x5396,0x5399,
-	0x5398,0x54BA,0x54A1,0x54AD,0x54A5,0x54CF,
-	/* Range 0xCE40 - 0xCE7E, array index: 0x1CCE */
-	0x54C3,0x830D,0x54B7,0x54AE,0x54D6,0x54B6,0x54C5,0x54C6,
-	0x54A0,0x5470,0x54BC,0x54A2,0x54BE,0x5472,0x54DE,0x54B0,
-	0x57B5,0x579E,0x579F,0x57A4,0x578C,0x5797,0x579D,0x579B,
-	0x5794,0x5798,0x578F,0x5799,0x57A5,0x579A,0x5795,0x58F4,
-	0x590D,0x5953,0x59E1,0x59DE,0x59EE,0x5A00,0x59F1,0x59DD,
-	0x59FA,0x59FD,0x59FC,0x59F6,0x59E4,0x59F2,0x59F7,0x59DB,
-	0x59E9,0x59F3,0x59F5,0x59E0,0x59FE,0x59F4,0x59ED,0x5BA8,
-	0x5C4C,0x5CD0,0x5CD8,0x5CCC,0x5CD7,0x5CCB,0x5CDB,
-	/* Range 0xCEA1 - 0xCEFE, array index: 0x1D0D */
-	0x5CDE,0x5CDA,0x5CC9,0x5CC7,0x5CCA,0x5CD6,0x5CD3,0x5CD4,
-	0x5CCF,0x5CC8,0x5CC6,0x5CCE,0x5CDF,0x5CF8,0x5DF9,0x5E21,
-	0x5E22,0x5E23,0x5E20,0x5E24,0x5EB0,0x5EA4,0x5EA2,0x5E9B,
-	0x5EA3,0x5EA5,0x5F07,0x5F2E,0x5F56,0x5F86,0x6037,0x6039,
-	0x6054,0x6072,0x605E,0x6045,0x6053,0x6047,0x6049,0x605B,
-	0x604C,0x6040,0x6042,0x605F,0x6024,0x6044,0x6058,0x6066,
-	0x606E,0x6242,0x6243,0x62CF,0x630D,0x630B,0x62F5,0x630E,
-	0x6303,0x62EB,0x62F9,0x630F,0x630C,0x62F8,0x62F6,0x6300,
-	0x6313,0x6314,0x62FA,0x6315,0x62FB,0x62F0,0x6541,0x6543,
-	0x65AA,0x65BF,0x6636,0x6621,0x6632,0x6635,0x661C,0x6626,
-	0x6622,0x6633,0x662B,0x663A,0x661D,0x6634,0x6639,0x662E,
-	0x670F,0x6710,0x67C1,0x67F2,0x67C8,0x67BA,
-	/* Range 0xCF40 - 0xCF7E, array index: 0x1D6B */
-	0x67DC,0x67BB,0x67F8,0x67D8,0x67C0,0x67B7,0x67C5,0x67EB,
-	0x67E4,0x67DF,0x67B5,0x67CD,0x67B3,0x67F7,0x67F6,0x67EE,
-	0x67E3,0x67C2,0x67B9,0x67CE,0x67E7,0x67F0,0x67B2,0x67FC,
-	0x67C6,0x67ED,0x67CC,0x67AE,0x67E6,0x67DB,0x67FA,0x67C9,
-	0x67CA,0x67C3,0x67EA,0x67CB,0x6B28,0x6B82,0x6B84,0x6BB6,
-	0x6BD6,0x6BD8,0x6BE0,0x6C20,0x6C21,0x6D28,0x6D34,0x6D2D,
-	0x6D1F,0x6D3C,0x6D3F,0x6D12,0x6D0A,0x6CDA,0x6D33,0x6D04,
-	0x6D19,0x6D3A,0x6D1A,0x6D11,0x6D00,0x6D1D,0x6D42,
-	/* Range 0xCFA1 - 0xCFFE, array index: 0x1DAA */
-	0x6D01,0x6D18,0x6D37,0x6D03,0x6D0F,0x6D40,0x6D07,0x6D20,
-	0x6D2C,0x6D08,0x6D22,0x6D09,0x6D10,0x70B7,0x709F,0x70BE,
-	0x70B1,0x70B0,0x70A1,0x70B4,0x70B5,0x70A9,0x7241,0x7249,
-	0x724A,0x726C,0x7270,0x7273,0x726E,0x72CA,0x72E4,0x72E8,
-	0x72EB,0x72DF,0x72EA,0x72E6,0x72E3,0x7385,0x73CC,0x73C2,
-	0x73C8,0x73C5,0x73B9,0x73B6,0x73B5,0x73B4,0x73EB,0x73BF,
-	0x73C7,0x73BE,0x73C3,0x73C6,0x73B8,0x73CB,0x74EC,0x74EE,
-	0x752E,0x7547,0x7548,0x75A7,0x75AA,0x7679,0x76C4,0x7708,
-	0x7703,0x7704,0x7705,0x770A,0x76F7,0x76FB,0x76FA,0x77E7,
-	0x77E8,0x7806,0x7811,0x7812,0x7805,0x7810,0x780F,0x780E,
-	0x7809,0x7803,0x7813,0x794A,0x794C,0x794B,0x7945,0x7944,
-	0x79D5,0x79CD,0x79CF,0x79D6,0x79CE,0x7A80,
-	/* Range 0xD040 - 0xD07E, array index: 0x1E08 */
-	0x7A7E,0x7AD1,0x7B00,0x7B01,0x7C7A,0x7C78,0x7C79,0x7C7F,
-	0x7C80,0x7C81,0x7D03,0x7D08,0x7D01,0x7F58,0x7F91,0x7F8D,
-	0x7FBE,0x8007,0x800E,0x800F,0x8014,0x8037,0x80D8,0x80C7,
-	0x80E0,0x80D1,0x80C8,0x80C2,0x80D0,0x80C5,0x80E3,0x80D9,
-	0x80DC,0x80CA,0x80D5,0x80C9,0x80CF,0x80D7,0x80E6,0x80CD,
-	0x81FF,0x8221,0x8294,0x82D9,0x82FE,0x82F9,0x8307,0x82E8,
-	0x8300,0x82D5,0x833A,0x82EB,0x82D6,0x82F4,0x82EC,0x82E1,
-	0x82F2,0x82F5,0x830C,0x82FB,0x82F6,0x82F0,0x82EA,
-	/* Range 0xD0A1 - 0xD0FE, array index: 0x1E47 */
-	0x82E4,0x82E0,0x82FA,0x82F3,0x82ED,0x8677,0x8674,0x867C,
-	0x8673,0x8841,0x884E,0x8867,0x886A,0x8869,0x89D3,0x8A04,
-	0x8A07,0x8D72,0x8FE3,0x8FE1,0x8FEE,0x8FE0,0x90F1,0x90BD,
-	0x90BF,0x90D5,0x90C5,0x90BE,0x90C7,0x90CB,0x90C8,0x91D4,
-	0x91D3,0x9654,0x964F,0x9651,0x9653,0x964A,0x964E,0x501E,
-	0x5005,0x5007,0x5013,0x5022,0x5030,0x501B,0x4FF5,0x4FF4,
-	0x5033,0x5037,0x502C,0x4FF6,0x4FF7,0x5017,0x501C,0x5020,
-	0x5027,0x5035,0x502F,0x5031,0x500E,0x515A,0x5194,0x5193,
-	0x51CA,0x51C4,0x51C5,0x51C8,0x51CE,0x5261,0x525A,0x5252,
-	0x525E,0x525F,0x5255,0x5262,0x52CD,0x530E,0x539E,0x5526,
-	0x54E2,0x5517,0x5512,0x54E7,0x54F3,0x54E4,0x551A,0x54FF,
-	0x5504,0x5508,0x54EB,0x5511,0x5505,0x54F1,
-	/* Range 0xD140 - 0xD17E, array index: 0x1EA5 */
-	0x550A,0x54FB,0x54F7,0x54F8,0x54E0,0x550E,0x5503,0x550B,
-	0x5701,0x5702,0x57CC,0x5832,0x57D5,0x57D2,0x57BA,0x57C6,
-	0x57BD,0x57BC,0x57B8,0x57B6,0x57BF,0x57C7,0x57D0,0x57B9,
-	0x57C1,0x590E,0x594A,0x5A19,0x5A16,0x5A2D,0x5A2E,0x5A15,
-	0x5A0F,0x5A17,0x5A0A,0x5A1E,0x5A33,0x5B6C,0x5BA7,0x5BAD,
-	0x5BAC,0x5C03,0x5C56,0x5C54,0x5CEC,0x5CFF,0x5CEE,0x5CF1,
-	0x5CF7,0x5D00,0x5CF9,0x5E29,0x5E28,0x5EA8,0x5EAE,0x5EAA,
-	0x5EAC,0x5F33,0x5F30,0x5F67,0x605D,0x605A,0x6067,
-	/* Range 0xD1A1 - 0xD1FE, array index: 0x1EE4 */
-	0x6041,0x60A2,0x6088,0x6080,0x6092,0x6081,0x609D,0x6083,
-	0x6095,0x609B,0x6097,0x6087,0x609C,0x608E,0x6219,0x6246,
-	0x62F2,0x6310,0x6356,0x632C,0x6344,0x6345,0x6336,0x6343,
-	0x63E4,0x6339,0x634B,0x634A,0x633C,0x6329,0x6341,0x6334,
-	0x6358,0x6354,0x6359,0x632D,0x6347,0x6333,0x635A,0x6351,
-	0x6338,0x6357,0x6340,0x6348,0x654A,0x6546,0x65C6,0x65C3,
-	0x65C4,0x65C2,0x664A,0x665F,0x6647,0x6651,0x6712,0x6713,
-	0x681F,0x681A,0x6849,0x6832,0x6833,0x683B,0x684B,0x684F,
-	0x6816,0x6831,0x681C,0x6835,0x682B,0x682D,0x682F,0x684E,
-	0x6844,0x6834,0x681D,0x6812,0x6814,0x6826,0x6828,0x682E,
-	0x684D,0x683A,0x6825,0x6820,0x6B2C,0x6B2F,0x6B2D,0x6B31,
-	0x6B34,0x6B6D,0x8082,0x6B88,0x6BE6,0x6BE4,
-	/* Range 0xD240 - 0xD27E, array index: 0x1F42 */
-	0x6BE8,0x6BE3,0x6BE2,0x6BE7,0x6C25,0x6D7A,0x6D63,0x6D64,
-	0x6D76,0x6D0D,0x6D61,0x6D92,0x6D58,0x6D62,0x6D6D,0x6D6F,
-	0x6D91,0x6D8D,0x6DEF,0x6D7F,0x6D86,0x6D5E,0x6D67,0x6D60,
-	0x6D97,0x6D70,0x6D7C,0x6D5F,0x6D82,0x6D98,0x6D2F,0x6D68,
-	0x6D8B,0x6D7E,0x6D80,0x6D84,0x6D16,0x6D83,0x6D7B,0x6D7D,
-	0x6D75,0x6D90,0x70DC,0x70D3,0x70D1,0x70DD,0x70CB,0x7F39,
-	0x70E2,0x70D7,0x70D2,0x70DE,0x70E0,0x70D4,0x70CD,0x70C5,
-	0x70C6,0x70C7,0x70DA,0x70CE,0x70E1,0x7242,0x7278,
-	/* Range 0xD2A1 - 0xD2FE, array index: 0x1F81 */
-	0x7277,0x7276,0x7300,0x72FA,0x72F4,0x72FE,0x72F6,0x72F3,
-	0x72FB,0x7301,0x73D3,0x73D9,0x73E5,0x73D6,0x73BC,0x73E7,
-	0x73E3,0x73E9,0x73DC,0x73D2,0x73DB,0x73D4,0x73DD,0x73DA,
-	0x73D7,0x73D8,0x73E8,0x74DE,0x74DF,0x74F4,0x74F5,0x7521,
-	0x755B,0x755F,0x75B0,0x75C1,0x75BB,0x75C4,0x75C0,0x75BF,
-	0x75B6,0x75BA,0x768A,0x76C9,0x771D,0x771B,0x7710,0x7713,
-	0x7712,0x7723,0x7711,0x7715,0x7719,0x771A,0x7722,0x7727,
-	0x7823,0x782C,0x7822,0x7835,0x782F,0x7828,0x782E,0x782B,
-	0x7821,0x7829,0x7833,0x782A,0x7831,0x7954,0x795B,0x794F,
-	0x795C,0x7953,0x7952,0x7951,0x79EB,0x79EC,0x79E0,0x79EE,
-	0x79ED,0x79EA,0x79DC,0x79DE,0x79DD,0x7A86,0x7A89,0x7A85,
-	0x7A8B,0x7A8C,0x7A8A,0x7A87,0x7AD8,0x7B10,
-	/* Range 0xD340 - 0xD37E, array index: 0x1FDF */
-	0x7B04,0x7B13,0x7B05,0x7B0F,0x7B08,0x7B0A,0x7B0E,0x7B09,
-	0x7B12,0x7C84,0x7C91,0x7C8A,0x7C8C,0x7C88,0x7C8D,0x7C85,
-	0x7D1E,0x7D1D,0x7D11,0x7D0E,0x7D18,0x7D16,0x7D13,0x7D1F,
-	0x7D12,0x7D0F,0x7D0C,0x7F5C,0x7F61,0x7F5E,0x7F60,0x7F5D,
-	0x7F5B,0x7F96,0x7F92,0x7FC3,0x7FC2,0x7FC0,0x8016,0x803E,
-	0x8039,0x80FA,0x80F2,0x80F9,0x80F5,0x8101,0x80FB,0x8100,
-	0x8201,0x822F,0x8225,0x8333,0x832D,0x8344,0x8319,0x8351,
-	0x8325,0x8356,0x833F,0x8341,0x8326,0x831C,0x8322,
-	/* Range 0xD3A1 - 0xD3FE, array index: 0x201E */
-	0x8342,0x834E,0x831B,0x832A,0x8308,0x833C,0x834D,0x8316,
-	0x8324,0x8320,0x8337,0x832F,0x8329,0x8347,0x8345,0x834C,
-	0x8353,0x831E,0x832C,0x834B,0x8327,0x8348,0x8653,0x8652,
-	0x86A2,0x86A8,0x8696,0x868D,0x8691,0x869E,0x8687,0x8697,
-	0x8686,0x868B,0x869A,0x8685,0x86A5,0x8699,0x86A1,0x86A7,
-	0x8695,0x8698,0x868E,0x869D,0x8690,0x8694,0x8843,0x8844,
-	0x886D,0x8875,0x8876,0x8872,0x8880,0x8871,0x887F,0x886F,
-	0x8883,0x887E,0x8874,0x887C,0x8A12,0x8C47,0x8C57,0x8C7B,
-	0x8CA4,0x8CA3,0x8D76,0x8D78,0x8DB5,0x8DB7,0x8DB6,0x8ED1,
-	0x8ED3,0x8FFE,0x8FF5,0x9002,0x8FFF,0x8FFB,0x9004,0x8FFC,
-	0x8FF6,0x90D6,0x90E0,0x90D9,0x90DA,0x90E3,0x90DF,0x90E5,
-	0x90D8,0x90DB,0x90D7,0x90DC,0x90E4,0x9150,
-	/* Range 0xD440 - 0xD47E, array index: 0x207C */
-	0x914E,0x914F,0x91D5,0x91E2,0x91DA,0x965C,0x965F,0x96BC,
-	0x98E3,0x9ADF,0x9B2F,0x4E7F,0x5070,0x506A,0x5061,0x505E,
-	0x5060,0x5053,0x504B,0x505D,0x5072,0x5048,0x504D,0x5041,
-	0x505B,0x504A,0x5062,0x5015,0x5045,0x505F,0x5069,0x506B,
-	0x5063,0x5064,0x5046,0x5040,0x506E,0x5073,0x5057,0x5051,
-	0x51D0,0x526B,0x526D,0x526C,0x526E,0x52D6,0x52D3,0x532D,
-	0x539C,0x5575,0x5576,0x553C,0x554D,0x5550,0x5534,0x552A,
-	0x5551,0x5562,0x5536,0x5535,0x5530,0x5552,0x5545,
-	/* Range 0xD4A1 - 0xD4FE, array index: 0x20BB */
-	0x550C,0x5532,0x5565,0x554E,0x5539,0x5548,0x552D,0x553B,
-	0x5540,0x554B,0x570A,0x5707,0x57FB,0x5814,0x57E2,0x57F6,
-	0x57DC,0x57F4,0x5800,0x57ED,0x57FD,0x5808,0x57F8,0x580B,
-	0x57F3,0x57CF,0x5807,0x57EE,0x57E3,0x57F2,0x57E5,0x57EC,
-	0x57E1,0x580E,0x57FC,0x5810,0x57E7,0x5801,0x580C,0x57F1,
-	0x57E9,0x57F0,0x580D,0x5804,0x595C,0x5A60,0x5A58,0x5A55,
-	0x5A67,0x5A5E,0x5A38,0x5A35,0x5A6D,0x5A50,0x5A5F,0x5A65,
-	0x5A6C,0x5A53,0x5A64,0x5A57,0x5A43,0x5A5D,0x5A52,0x5A44,
-	0x5A5B,0x5A48,0x5A8E,0x5A3E,0x5A4D,0x5A39,0x5A4C,0x5A70,
-	0x5A69,0x5A47,0x5A51,0x5A56,0x5A42,0x5A5C,0x5B72,0x5B6E,
-	0x5BC1,0x5BC0,0x5C59,0x5D1E,0x5D0B,0x5D1D,0x5D1A,0x5D20,
-	0x5D0C,0x5D28,0x5D0D,0x5D26,0x5D25,0x5D0F,
-	/* Range 0xD540 - 0xD57E, array index: 0x2119 */
-	0x5D30,0x5D12,0x5D23,0x5D1F,0x5D2E,0x5E3E,0x5E34,0x5EB1,
-	0x5EB4,0x5EB9,0x5EB2,0x5EB3,0x5F36,0x5F38,0x5F9B,0x5F96,
-	0x5F9F,0x608A,0x6090,0x6086,0x60BE,0x60B0,0x60BA,0x60D3,
-	0x60D4,0x60CF,0x60E4,0x60D9,0x60DD,0x60C8,0x60B1,0x60DB,
-	0x60B7,0x60CA,0x60BF,0x60C3,0x60CD,0x60C0,0x6332,0x6365,
-	0x638A,0x6382,0x637D,0x63BD,0x639E,0x63AD,0x639D,0x6397,
-	0x63AB,0x638E,0x636F,0x6387,0x6390,0x636E,0x63AF,0x6375,
-	0x639C,0x636D,0x63AE,0x637C,0x63A4,0x633B,0x639F,
-	/* Range 0xD5A1 - 0xD5FE, array index: 0x2158 */
-	0x6378,0x6385,0x6381,0x6391,0x638D,0x6370,0x6553,0x65CD,
-	0x6665,0x6661,0x665B,0x6659,0x665C,0x6662,0x6718,0x6879,
-	0x6887,0x6890,0x689C,0x686D,0x686E,0x68AE,0x68AB,0x6956,
-	0x686F,0x68A3,0x68AC,0x68A9,0x6875,0x6874,0x68B2,0x688F,
-	0x6877,0x6892,0x687C,0x686B,0x6872,0x68AA,0x6880,0x6871,
-	0x687E,0x689B,0x6896,0x688B,0x68A0,0x6889,0x68A4,0x6878,
-	0x687B,0x6891,0x688C,0x688A,0x687D,0x6B36,0x6B33,0x6B37,
-	0x6B38,0x6B91,0x6B8F,0x6B8D,0x6B8E,0x6B8C,0x6C2A,0x6DC0,
-	0x6DAB,0x6DB4,0x6DB3,0x6E74,0x6DAC,0x6DE9,0x6DE2,0x6DB7,
-	0x6DF6,0x6DD4,0x6E00,0x6DC8,0x6DE0,0x6DDF,0x6DD6,0x6DBE,
-	0x6DE5,0x6DDC,0x6DDD,0x6DDB,0x6DF4,0x6DCA,0x6DBD,0x6DED,
-	0x6DF0,0x6DBA,0x6DD5,0x6DC2,0x6DCF,0x6DC9,
-	/* Range 0xD640 - 0xD67E, array index: 0x21B6 */
-	0x6DD0,0x6DF2,0x6DD3,0x6DFD,0x6DD7,0x6DCD,0x6DE3,0x6DBB,
-	0x70FA,0x710D,0x70F7,0x7117,0x70F4,0x710C,0x70F0,0x7104,
-	0x70F3,0x7110,0x70FC,0x70FF,0x7106,0x7113,0x7100,0x70F8,
-	0x70F6,0x710B,0x7102,0x710E,0x727E,0x727B,0x727C,0x727F,
-	0x731D,0x7317,0x7307,0x7311,0x7318,0x730A,0x7308,0x72FF,
-	0x730F,0x731E,0x7388,0x73F6,0x73F8,0x73F5,0x7404,0x7401,
-	0x73FD,0x7407,0x7400,0x73FA,0x73FC,0x73FF,0x740C,0x740B,
-	0x73F4,0x7408,0x7564,0x7563,0x75CE,0x75D2,0x75CF,
-	/* Range 0xD6A1 - 0xD6FE, array index: 0x21F5 */
-	0x75CB,0x75CC,0x75D1,0x75D0,0x768F,0x7689,0x76D3,0x7739,
-	0x772F,0x772D,0x7731,0x7732,0x7734,0x7733,0x773D,0x7725,
-	0x773B,0x7735,0x7848,0x7852,0x7849,0x784D,0x784A,0x784C,
-	0x7826,0x7845,0x7850,0x7964,0x7967,0x7969,0x796A,0x7963,
-	0x796B,0x7961,0x79BB,0x79FA,0x79F8,0x79F6,0x79F7,0x7A8F,
-	0x7A94,0x7A90,0x7B35,0x7B47,0x7B34,0x7B25,0x7B30,0x7B22,
-	0x7B24,0x7B33,0x7B18,0x7B2A,0x7B1D,0x7B31,0x7B2B,0x7B2D,
-	0x7B2F,0x7B32,0x7B38,0x7B1A,0x7B23,0x7C94,0x7C98,0x7C96,
-	0x7CA3,0x7D35,0x7D3D,0x7D38,0x7D36,0x7D3A,0x7D45,0x7D2C,
-	0x7D29,0x7D41,0x7D47,0x7D3E,0x7D3F,0x7D4A,0x7D3B,0x7D28,
-	0x7F63,0x7F95,0x7F9C,0x7F9D,0x7F9B,0x7FCA,0x7FCB,0x7FCD,
-	0x7FD0,0x7FD1,0x7FC7,0x7FCF,0x7FC9,0x801F,
-	/* Range 0xD740 - 0xD77E, array index: 0x2253 */
-	0x801E,0x801B,0x8047,0x8043,0x8048,0x8118,0x8125,0x8119,
-	0x811B,0x812D,0x811F,0x812C,0x811E,0x8121,0x8115,0x8127,
-	0x811D,0x8122,0x8211,0x8238,0x8233,0x823A,0x8234,0x8232,
-	0x8274,0x8390,0x83A3,0x83A8,0x838D,0x837A,0x8373,0x83A4,
-	0x8374,0x838F,0x8381,0x8395,0x8399,0x8375,0x8394,0x83A9,
-	0x837D,0x8383,0x838C,0x839D,0x839B,0x83AA,0x838B,0x837E,
-	0x83A5,0x83AF,0x8388,0x8397,0x83B0,0x837F,0x83A6,0x8387,
-	0x83AE,0x8376,0x839A,0x8659,0x8656,0x86BF,0x86B7,
-	/* Range 0xD7A1 - 0xD7FE, array index: 0x2292 */
-	0x86C2,0x86C1,0x86C5,0x86BA,0x86B0,0x86C8,0x86B9,0x86B3,
-	0x86B8,0x86CC,0x86B4,0x86BB,0x86BC,0x86C3,0x86BD,0x86BE,
-	0x8852,0x8889,0x8895,0x88A8,0x88A2,0x88AA,0x889A,0x8891,
-	0x88A1,0x889F,0x8898,0x88A7,0x8899,0x889B,0x8897,0x88A4,
-	0x88AC,0x888C,0x8893,0x888E,0x8982,0x89D6,0x89D9,0x89D5,
-	0x8A30,0x8A27,0x8A2C,0x8A1E,0x8C39,0x8C3B,0x8C5C,0x8C5D,
-	0x8C7D,0x8CA5,0x8D7D,0x8D7B,0x8D79,0x8DBC,0x8DC2,0x8DB9,
-	0x8DBF,0x8DC1,0x8ED8,0x8EDE,0x8EDD,0x8EDC,0x8ED7,0x8EE0,
-	0x8EE1,0x9024,0x900B,0x9011,0x901C,0x900C,0x9021,0x90EF,
-	0x90EA,0x90F0,0x90F4,0x90F2,0x90F3,0x90D4,0x90EB,0x90EC,
-	0x90E9,0x9156,0x9158,0x915A,0x9153,0x9155,0x91EC,0x91F4,
-	0x91F1,0x91F3,0x91F8,0x91E4,0x91F9,0x91EA,
-	/* Range 0xD840 - 0xD87E, array index: 0x22F0 */
-	0x91EB,0x91F7,0x91E8,0x91EE,0x957A,0x9586,0x9588,0x967C,
-	0x966D,0x966B,0x9671,0x966F,0x96BF,0x976A,0x9804,0x98E5,
-	0x9997,0x509B,0x5095,0x5094,0x509E,0x508B,0x50A3,0x5083,
-	0x508C,0x508E,0x509D,0x5068,0x509C,0x5092,0x5082,0x5087,
-	0x515F,0x51D4,0x5312,0x5311,0x53A4,0x53A7,0x5591,0x55A8,
-	0x55A5,0x55AD,0x5577,0x5645,0x55A2,0x5593,0x5588,0x558F,
-	0x55B5,0x5581,0x55A3,0x5592,0x55A4,0x557D,0x558C,0x55A6,
-	0x557F,0x5595,0x55A1,0x558E,0x570C,0x5829,0x5837,
-	/* Range 0xD8A1 - 0xD8FE, array index: 0x232F */
-	0x5819,0x581E,0x5827,0x5823,0x5828,0x57F5,0x5848,0x5825,
-	0x581C,0x581B,0x5833,0x583F,0x5836,0x582E,0x5839,0x5838,
-	0x582D,0x582C,0x583B,0x5961,0x5AAF,0x5A94,0x5A9F,0x5A7A,
-	0x5AA2,0x5A9E,0x5A78,0x5AA6,0x5A7C,0x5AA5,0x5AAC,0x5A95,
-	0x5AAE,0x5A37,0x5A84,0x5A8A,0x5A97,0x5A83,0x5A8B,0x5AA9,
-	0x5A7B,0x5A7D,0x5A8C,0x5A9C,0x5A8F,0x5A93,0x5A9D,0x5BEA,
-	0x5BCD,0x5BCB,0x5BD4,0x5BD1,0x5BCA,0x5BCE,0x5C0C,0x5C30,
-	0x5D37,0x5D43,0x5D6B,0x5D41,0x5D4B,0x5D3F,0x5D35,0x5D51,
-	0x5D4E,0x5D55,0x5D33,0x5D3A,0x5D52,0x5D3D,0x5D31,0x5D59,
-	0x5D42,0x5D39,0x5D49,0x5D38,0x5D3C,0x5D32,0x5D36,0x5D40,
-	0x5D45,0x5E44,0x5E41,0x5F58,0x5FA6,0x5FA5,0x5FAB,0x60C9,
-	0x60B9,0x60CC,0x60E2,0x60CE,0x60C4,0x6114,
-	/* Range 0xD940 - 0xD97E, array index: 0x238D */
-	0x60F2,0x610A,0x6116,0x6105,0x60F5,0x6113,0x60F8,0x60FC,
-	0x60FE,0x60C1,0x6103,0x6118,0x611D,0x6110,0x60FF,0x6104,
-	0x610B,0x624A,0x6394,0x63B1,0x63B0,0x63CE,0x63E5,0x63E8,
-	0x63EF,0x63C3,0x649D,0x63F3,0x63CA,0x63E0,0x63F6,0x63D5,
-	0x63F2,0x63F5,0x6461,0x63DF,0x63BE,0x63DD,0x63DC,0x63C4,
-	0x63D8,0x63D3,0x63C2,0x63C7,0x63CC,0x63CB,0x63C8,0x63F0,
-	0x63D7,0x63D9,0x6532,0x6567,0x656A,0x6564,0x655C,0x6568,
-	0x6565,0x658C,0x659D,0x659E,0x65AE,0x65D0,0x65D2,
-	/* Range 0xD9A1 - 0xD9FE, array index: 0x23CC */
-	0x667C,0x666C,0x667B,0x6680,0x6671,0x6679,0x666A,0x6672,
-	0x6701,0x690C,0x68D3,0x6904,0x68DC,0x692A,0x68EC,0x68EA,
-	0x68F1,0x690F,0x68D6,0x68F7,0x68EB,0x68E4,0x68F6,0x6913,
-	0x6910,0x68F3,0x68E1,0x6907,0x68CC,0x6908,0x6970,0x68B4,
-	0x6911,0x68EF,0x68C6,0x6914,0x68F8,0x68D0,0x68FD,0x68FC,
-	0x68E8,0x690B,0x690A,0x6917,0x68CE,0x68C8,0x68DD,0x68DE,
-	0x68E6,0x68F4,0x68D1,0x6906,0x68D4,0x68E9,0x6915,0x6925,
-	0x68C7,0x6B39,0x6B3B,0x6B3F,0x6B3C,0x6B94,0x6B97,0x6B99,
-	0x6B95,0x6BBD,0x6BF0,0x6BF2,0x6BF3,0x6C30,0x6DFC,0x6E46,
-	0x6E47,0x6E1F,0x6E49,0x6E88,0x6E3C,0x6E3D,0x6E45,0x6E62,
-	0x6E2B,0x6E3F,0x6E41,0x6E5D,0x6E73,0x6E1C,0x6E33,0x6E4B,
-	0x6E40,0x6E51,0x6E3B,0x6E03,0x6E2E,0x6E5E,
-	/* Range 0xDA40 - 0xDA7E, array index: 0x242A */
-	0x6E68,0x6E5C,0x6E61,0x6E31,0x6E28,0x6E60,0x6E71,0x6E6B,
-	0x6E39,0x6E22,0x6E30,0x6E53,0x6E65,0x6E27,0x6E78,0x6E64,
-	0x6E77,0x6E55,0x6E79,0x6E52,0x6E66,0x6E35,0x6E36,0x6E5A,
-	0x7120,0x711E,0x712F,0x70FB,0x712E,0x7131,0x7123,0x7125,
-	0x7122,0x7132,0x711F,0x7128,0x713A,0x711B,0x724B,0x725A,
-	0x7288,0x7289,0x7286,0x7285,0x728B,0x7312,0x730B,0x7330,
-	0x7322,0x7331,0x7333,0x7327,0x7332,0x732D,0x7326,0x7323,
-	0x7335,0x730C,0x742E,0x742C,0x7430,0x742B,0x7416,
-	/* Range 0xDAA1 - 0xDAFE, array index: 0x2469 */
-	0x741A,0x7421,0x742D,0x7431,0x7424,0x7423,0x741D,0x7429,
-	0x7420,0x7432,0x74FB,0x752F,0x756F,0x756C,0x75E7,0x75DA,
-	0x75E1,0x75E6,0x75DD,0x75DF,0x75E4,0x75D7,0x7695,0x7692,
-	0x76DA,0x7746,0x7747,0x7744,0x774D,0x7745,0x774A,0x774E,
-	0x774B,0x774C,0x77DE,0x77EC,0x7860,0x7864,0x7865,0x785C,
-	0x786D,0x7871,0x786A,0x786E,0x7870,0x7869,0x7868,0x785E,
-	0x7862,0x7974,0x7973,0x7972,0x7970,0x7A02,0x7A0A,0x7A03,
-	0x7A0C,0x7A04,0x7A99,0x7AE6,0x7AE4,0x7B4A,0x7B3B,0x7B44,
-	0x7B48,0x7B4C,0x7B4E,0x7B40,0x7B58,0x7B45,0x7CA2,0x7C9E,
-	0x7CA8,0x7CA1,0x7D58,0x7D6F,0x7D63,0x7D53,0x7D56,0x7D67,
-	0x7D6A,0x7D4F,0x7D6D,0x7D5C,0x7D6B,0x7D52,0x7D54,0x7D69,
-	0x7D51,0x7D5F,0x7D4E,0x7F3E,0x7F3F,0x7F65,
-	/* Range 0xDB40 - 0xDB7E, array index: 0x24C7 */
-	0x7F66,0x7FA2,0x7FA0,0x7FA1,0x7FD7,0x8051,0x804F,0x8050,
-	0x80FE,0x80D4,0x8143,0x814A,0x8152,0x814F,0x8147,0x813D,
-	0x814D,0x813A,0x81E6,0x81EE,0x81F7,0x81F8,0x81F9,0x8204,
-	0x823C,0x823D,0x823F,0x8275,0x833B,0x83CF,0x83F9,0x8423,
-	0x83C0,0x83E8,0x8412,0x83E7,0x83E4,0x83FC,0x83F6,0x8410,
-	0x83C6,0x83C8,0x83EB,0x83E3,0x83BF,0x8401,0x83DD,0x83E5,
-	0x83D8,0x83FF,0x83E1,0x83CB,0x83CE,0x83D6,0x83F5,0x83C9,
-	0x8409,0x840F,0x83DE,0x8411,0x8406,0x83C2,0x83F3,
-	/* Range 0xDBA1 - 0xDBFE, array index: 0x2506 */
-	0x83D5,0x83FA,0x83C7,0x83D1,0x83EA,0x8413,0x83C3,0x83EC,
-	0x83EE,0x83C4,0x83FB,0x83D7,0x83E2,0x841B,0x83DB,0x83FE,
-	0x86D8,0x86E2,0x86E6,0x86D3,0x86E3,0x86DA,0x86EA,0x86DD,
-	0x86EB,0x86DC,0x86EC,0x86E9,0x86D7,0x86E8,0x86D1,0x8848,
-	0x8856,0x8855,0x88BA,0x88D7,0x88B9,0x88B8,0x88C0,0x88BE,
-	0x88B6,0x88BC,0x88B7,0x88BD,0x88B2,0x8901,0x88C9,0x8995,
-	0x8998,0x8997,0x89DD,0x89DA,0x89DB,0x8A4E,0x8A4D,0x8A39,
-	0x8A59,0x8A40,0x8A57,0x8A58,0x8A44,0x8A45,0x8A52,0x8A48,
-	0x8A51,0x8A4A,0x8A4C,0x8A4F,0x8C5F,0x8C81,0x8C80,0x8CBA,
-	0x8CBE,0x8CB0,0x8CB9,0x8CB5,0x8D84,0x8D80,0x8D89,0x8DD8,
-	0x8DD3,0x8DCD,0x8DC7,0x8DD6,0x8DDC,0x8DCF,0x8DD5,0x8DD9,
-	0x8DC8,0x8DD7,0x8DC5,0x8EEF,0x8EF7,0x8EFA,
-	/* Range 0xDC40 - 0xDC7E, array index: 0x2564 */
-	0x8EF9,0x8EE6,0x8EEE,0x8EE5,0x8EF5,0x8EE7,0x8EE8,0x8EF6,
-	0x8EEB,0x8EF1,0x8EEC,0x8EF4,0x8EE9,0x902D,0x9034,0x902F,
-	0x9106,0x912C,0x9104,0x90FF,0x90FC,0x9108,0x90F9,0x90FB,
-	0x9101,0x9100,0x9107,0x9105,0x9103,0x9161,0x9164,0x915F,
-	0x9162,0x9160,0x9201,0x920A,0x9225,0x9203,0x921A,0x9226,
-	0x920F,0x920C,0x9200,0x9212,0x91FF,0x91FD,0x9206,0x9204,
-	0x9227,0x9202,0x921C,0x9224,0x9219,0x9217,0x9205,0x9216,
-	0x957B,0x958D,0x958C,0x9590,0x9687,0x967E,0x9688,
-	/* Range 0xDCA1 - 0xDCFE, array index: 0x25A3 */
-	0x9689,0x9683,0x9680,0x96C2,0x96C8,0x96C3,0x96F1,0x96F0,
-	0x976C,0x9770,0x976E,0x9807,0x98A9,0x98EB,0x9CE6,0x9EF9,
-	0x4E83,0x4E84,0x4EB6,0x50BD,0x50BF,0x50C6,0x50AE,0x50C4,
-	0x50CA,0x50B4,0x50C8,0x50C2,0x50B0,0x50C1,0x50BA,0x50B1,
-	0x50CB,0x50C9,0x50B6,0x50B8,0x51D7,0x527A,0x5278,0x527B,
-	0x527C,0x55C3,0x55DB,0x55CC,0x55D0,0x55CB,0x55CA,0x55DD,
-	0x55C0,0x55D4,0x55C4,0x55E9,0x55BF,0x55D2,0x558D,0x55CF,
-	0x55D5,0x55E2,0x55D6,0x55C8,0x55F2,0x55CD,0x55D9,0x55C2,
-	0x5714,0x5853,0x5868,0x5864,0x584F,0x584D,0x5849,0x586F,
-	0x5855,0x584E,0x585D,0x5859,0x5865,0x585B,0x583D,0x5863,
-	0x5871,0x58FC,0x5AC7,0x5AC4,0x5ACB,0x5ABA,0x5AB8,0x5AB1,
-	0x5AB5,0x5AB0,0x5ABF,0x5AC8,0x5ABB,0x5AC6,
-	/* Range 0xDD40 - 0xDD7E, array index: 0x2601 */
-	0x5AB7,0x5AC0,0x5ACA,0x5AB4,0x5AB6,0x5ACD,0x5AB9,0x5A90,
-	0x5BD6,0x5BD8,0x5BD9,0x5C1F,0x5C33,0x5D71,0x5D63,0x5D4A,
-	0x5D65,0x5D72,0x5D6C,0x5D5E,0x5D68,0x5D67,0x5D62,0x5DF0,
-	0x5E4F,0x5E4E,0x5E4A,0x5E4D,0x5E4B,0x5EC5,0x5ECC,0x5EC6,
-	0x5ECB,0x5EC7,0x5F40,0x5FAF,0x5FAD,0x60F7,0x6149,0x614A,
-	0x612B,0x6145,0x6136,0x6132,0x612E,0x6146,0x612F,0x614F,
-	0x6129,0x6140,0x6220,0x9168,0x6223,0x6225,0x6224,0x63C5,
-	0x63F1,0x63EB,0x6410,0x6412,0x6409,0x6420,0x6424,
-	/* Range 0xDDA1 - 0xDDFE, array index: 0x2640 */
-	0x6433,0x6443,0x641F,0x6415,0x6418,0x6439,0x6437,0x6422,
-	0x6423,0x640C,0x6426,0x6430,0x6428,0x6441,0x6435,0x642F,
-	0x640A,0x641A,0x6440,0x6425,0x6427,0x640B,0x63E7,0x641B,
-	0x642E,0x6421,0x640E,0x656F,0x6592,0x65D3,0x6686,0x668C,
-	0x6695,0x6690,0x668B,0x668A,0x6699,0x6694,0x6678,0x6720,
-	0x6966,0x695F,0x6938,0x694E,0x6962,0x6971,0x693F,0x6945,
-	0x696A,0x6939,0x6942,0x6957,0x6959,0x697A,0x6948,0x6949,
-	0x6935,0x696C,0x6933,0x693D,0x6965,0x68F0,0x6978,0x6934,
-	0x6969,0x6940,0x696F,0x6944,0x6976,0x6958,0x6941,0x6974,
-	0x694C,0x693B,0x694B,0x6937,0x695C,0x694F,0x6951,0x6932,
-	0x6952,0x692F,0x697B,0x693C,0x6B46,0x6B45,0x6B43,0x6B42,
-	0x6B48,0x6B41,0x6B9B,0xFA0D,0x6BFB,0x6BFC,
-	/* Range 0xDE40 - 0xDE7E, array index: 0x269E */
-	0x6BF9,0x6BF7,0x6BF8,0x6E9B,0x6ED6,0x6EC8,0x6E8F,0x6EC0,
-	0x6E9F,0x6E93,0x6E94,0x6EA0,0x6EB1,0x6EB9,0x6EC6,0x6ED2,
-	0x6EBD,0x6EC1,0x6E9E,0x6EC9,0x6EB7,0x6EB0,0x6ECD,0x6EA6,
-	0x6ECF,0x6EB2,0x6EBE,0x6EC3,0x6EDC,0x6ED8,0x6E99,0x6E92,
-	0x6E8E,0x6E8D,0x6EA4,0x6EA1,0x6EBF,0x6EB3,0x6ED0,0x6ECA,
-	0x6E97,0x6EAE,0x6EA3,0x7147,0x7154,0x7152,0x7163,0x7160,
-	0x7141,0x715D,0x7162,0x7172,0x7178,0x716A,0x7161,0x7142,
-	0x7158,0x7143,0x714B,0x7170,0x715F,0x7150,0x7153,
-	/* Range 0xDEA1 - 0xDEFE, array index: 0x26DD */
-	0x7144,0x714D,0x715A,0x724F,0x728D,0x728C,0x7291,0x7290,
-	0x728E,0x733C,0x7342,0x733B,0x733A,0x7340,0x734A,0x7349,
-	0x7444,0x744A,0x744B,0x7452,0x7451,0x7457,0x7440,0x744F,
-	0x7450,0x744E,0x7442,0x7446,0x744D,0x7454,0x74E1,0x74FF,
-	0x74FE,0x74FD,0x751D,0x7579,0x7577,0x6983,0x75EF,0x760F,
-	0x7603,0x75F7,0x75FE,0x75FC,0x75F9,0x75F8,0x7610,0x75FB,
-	0x75F6,0x75ED,0x75F5,0x75FD,0x7699,0x76B5,0x76DD,0x7755,
-	0x775F,0x7760,0x7752,0x7756,0x775A,0x7769,0x7767,0x7754,
-	0x7759,0x776D,0x77E0,0x7887,0x789A,0x7894,0x788F,0x7884,
-	0x7895,0x7885,0x7886,0x78A1,0x7883,0x7879,0x7899,0x7880,
-	0x7896,0x787B,0x797C,0x7982,0x797D,0x7979,0x7A11,0x7A18,
-	0x7A19,0x7A12,0x7A17,0x7A15,0x7A22,0x7A13,
-	/* Range 0xDF40 - 0xDF7E, array index: 0x273B */
-	0x7A1B,0x7A10,0x7AA3,0x7AA2,0x7A9E,0x7AEB,0x7B66,0x7B64,
-	0x7B6D,0x7B74,0x7B69,0x7B72,0x7B65,0x7B73,0x7B71,0x7B70,
-	0x7B61,0x7B78,0x7B76,0x7B63,0x7CB2,0x7CB4,0x7CAF,0x7D88,
-	0x7D86,0x7D80,0x7D8D,0x7D7F,0x7D85,0x7D7A,0x7D8E,0x7D7B,
-	0x7D83,0x7D7C,0x7D8C,0x7D94,0x7D84,0x7D7D,0x7D92,0x7F6D,
-	0x7F6B,0x7F67,0x7F68,0x7F6C,0x7FA6,0x7FA5,0x7FA7,0x7FDB,
-	0x7FDC,0x8021,0x8164,0x8160,0x8177,0x815C,0x8169,0x815B,
-	0x8162,0x8172,0x6721,0x815E,0x8176,0x8167,0x816F,
-	/* Range 0xDFA1 - 0xDFFE, array index: 0x277A */
-	0x8144,0x8161,0x821D,0x8249,0x8244,0x8240,0x8242,0x8245,
-	0x84F1,0x843F,0x8456,0x8476,0x8479,0x848F,0x848D,0x8465,
-	0x8451,0x8440,0x8486,0x8467,0x8430,0x844D,0x847D,0x845A,
-	0x8459,0x8474,0x8473,0x845D,0x8507,0x845E,0x8437,0x843A,
-	0x8434,0x847A,0x8443,0x8478,0x8432,0x8445,0x8429,0x83D9,
-	0x844B,0x842F,0x8442,0x842D,0x845F,0x8470,0x8439,0x844E,
-	0x844C,0x8452,0x846F,0x84C5,0x848E,0x843B,0x8447,0x8436,
-	0x8433,0x8468,0x847E,0x8444,0x842B,0x8460,0x8454,0x846E,
-	0x8450,0x870B,0x8704,0x86F7,0x870C,0x86FA,0x86D6,0x86F5,
-	0x874D,0x86F8,0x870E,0x8709,0x8701,0x86F6,0x870D,0x8705,
-	0x88D6,0x88CB,0x88CD,0x88CE,0x88DE,0x88DB,0x88DA,0x88CC,
-	0x88D0,0x8985,0x899B,0x89DF,0x89E5,0x89E4,
-	/* Range 0xE040 - 0xE07E, array index: 0x27D8 */
-	0x89E1,0x89E0,0x89E2,0x89DC,0x89E6,0x8A76,0x8A86,0x8A7F,
-	0x8A61,0x8A3F,0x8A77,0x8A82,0x8A84,0x8A75,0x8A83,0x8A81,
-	0x8A74,0x8A7A,0x8C3C,0x8C4B,0x8C4A,0x8C65,0x8C64,0x8C66,
-	0x8C86,0x8C84,0x8C85,0x8CCC,0x8D68,0x8D69,0x8D91,0x8D8C,
-	0x8D8E,0x8D8F,0x8D8D,0x8D93,0x8D94,0x8D90,0x8D92,0x8DF0,
-	0x8DE0,0x8DEC,0x8DF1,0x8DEE,0x8DD0,0x8DE9,0x8DE3,0x8DE2,
-	0x8DE7,0x8DF2,0x8DEB,0x8DF4,0x8F06,0x8EFF,0x8F01,0x8F00,
-	0x8F05,0x8F07,0x8F08,0x8F02,0x8F0B,0x9052,0x903F,
-	/* Range 0xE0A1 - 0xE0FE, array index: 0x2817 */
-	0x9044,0x9049,0x903D,0x9110,0x910D,0x910F,0x9111,0x9116,
-	0x9114,0x910B,0x910E,0x916E,0x916F,0x9248,0x9252,0x9230,
-	0x923A,0x9266,0x9233,0x9265,0x925E,0x9283,0x922E,0x924A,
-	0x9246,0x926D,0x926C,0x924F,0x9260,0x9267,0x926F,0x9236,
-	0x9261,0x9270,0x9231,0x9254,0x9263,0x9250,0x9272,0x924E,
-	0x9253,0x924C,0x9256,0x9232,0x959F,0x959C,0x959E,0x959B,
-	0x9692,0x9693,0x9691,0x9697,0x96CE,0x96FA,0x96FD,0x96F8,
-	0x96F5,0x9773,0x9777,0x9778,0x9772,0x980F,0x980D,0x980E,
-	0x98AC,0x98F6,0x98F9,0x99AF,0x99B2,0x99B0,0x99B5,0x9AAD,
-	0x9AAB,0x9B5B,0x9CEA,0x9CED,0x9CE7,0x9E80,0x9EFD,0x50E6,
-	0x50D4,0x50D7,0x50E8,0x50F3,0x50DB,0x50EA,0x50DD,0x50E4,
-	0x50D3,0x50EC,0x50F0,0x50EF,0x50E3,0x50E0,
-	/* Range 0xE140 - 0xE17E, array index: 0x2875 */
-	0x51D8,0x5280,0x5281,0x52E9,0x52EB,0x5330,0x53AC,0x5627,
-	0x5615,0x560C,0x5612,0x55FC,0x560F,0x561C,0x5601,0x5613,
-	0x5602,0x55FA,0x561D,0x5604,0x55FF,0x55F9,0x5889,0x587C,
-	0x5890,0x5898,0x5886,0x5881,0x587F,0x5874,0x588B,0x587A,
-	0x5887,0x5891,0x588E,0x5876,0x5882,0x5888,0x587B,0x5894,
-	0x588F,0x58FE,0x596B,0x5ADC,0x5AEE,0x5AE5,0x5AD5,0x5AEA,
-	0x5ADA,0x5AED,0x5AEB,0x5AF3,0x5AE2,0x5AE0,0x5ADB,0x5AEC,
-	0x5ADE,0x5ADD,0x5AD9,0x5AE8,0x5ADF,0x5B77,0x5BE0,
-	/* Range 0xE1A1 - 0xE1FE, array index: 0x28B4 */
-	0x5BE3,0x5C63,0x5D82,0x5D80,0x5D7D,0x5D86,0x5D7A,0x5D81,
-	0x5D77,0x5D8A,0x5D89,0x5D88,0x5D7E,0x5D7C,0x5D8D,0x5D79,
-	0x5D7F,0x5E58,0x5E59,0x5E53,0x5ED8,0x5ED1,0x5ED7,0x5ECE,
-	0x5EDC,0x5ED5,0x5ED9,0x5ED2,0x5ED4,0x5F44,0x5F43,0x5F6F,
-	0x5FB6,0x612C,0x6128,0x6141,0x615E,0x6171,0x6173,0x6152,
-	0x6153,0x6172,0x616C,0x6180,0x6174,0x6154,0x617A,0x615B,
-	0x6165,0x613B,0x616A,0x6161,0x6156,0x6229,0x6227,0x622B,
-	0x642B,0x644D,0x645B,0x645D,0x6474,0x6476,0x6472,0x6473,
-	0x647D,0x6475,0x6466,0x64A6,0x644E,0x6482,0x645E,0x645C,
-	0x644B,0x6453,0x6460,0x6450,0x647F,0x643F,0x646C,0x646B,
-	0x6459,0x6465,0x6477,0x6573,0x65A0,0x66A1,0x66A0,0x669F,
-	0x6705,0x6704,0x6722,0x69B1,0x69B6,0x69C9,
-	/* Range 0xE240 - 0xE27E, array index: 0x2912 */
-	0x69A0,0x69CE,0x6996,0x69B0,0x69AC,0x69BC,0x6991,0x6999,
-	0x698E,0x69A7,0x698D,0x69A9,0x69BE,0x69AF,0x69BF,0x69C4,
-	0x69BD,0x69A4,0x69D4,0x69B9,0x69CA,0x699A,0x69CF,0x69B3,
-	0x6993,0x69AA,0x69A1,0x699E,0x69D9,0x6997,0x6990,0x69C2,
-	0x69B5,0x69A5,0x69C6,0x6B4A,0x6B4D,0x6B4B,0x6B9E,0x6B9F,
-	0x6BA0,0x6BC3,0x6BC4,0x6BFE,0x6ECE,0x6EF5,0x6EF1,0x6F03,
-	0x6F25,0x6EF8,0x6F37,0x6EFB,0x6F2E,0x6F09,0x6F4E,0x6F19,
-	0x6F1A,0x6F27,0x6F18,0x6F3B,0x6F12,0x6EED,0x6F0A,
-	/* Range 0xE2A1 - 0xE2FE, array index: 0x2951 */
-	0x6F36,0x6F73,0x6EF9,0x6EEE,0x6F2D,0x6F40,0x6F30,0x6F3C,
-	0x6F35,0x6EEB,0x6F07,0x6F0E,0x6F43,0x6F05,0x6EFD,0x6EF6,
-	0x6F39,0x6F1C,0x6EFC,0x6F3A,0x6F1F,0x6F0D,0x6F1E,0x6F08,
-	0x6F21,0x7187,0x7190,0x7189,0x7180,0x7185,0x7182,0x718F,
-	0x717B,0x7186,0x7181,0x7197,0x7244,0x7253,0x7297,0x7295,
-	0x7293,0x7343,0x734D,0x7351,0x734C,0x7462,0x7473,0x7471,
-	0x7475,0x7472,0x7467,0x746E,0x7500,0x7502,0x7503,0x757D,
-	0x7590,0x7616,0x7608,0x760C,0x7615,0x7611,0x760A,0x7614,
-	0x76B8,0x7781,0x777C,0x7785,0x7782,0x776E,0x7780,0x776F,
-	0x777E,0x7783,0x78B2,0x78AA,0x78B4,0x78AD,0x78A8,0x787E,
-	0x78AB,0x789E,0x78A5,0x78A0,0x78AC,0x78A2,0x78A4,0x7998,
-	0x798A,0x798B,0x7996,0x7995,0x7994,0x7993,
-	/* Range 0xE340 - 0xE37E, array index: 0x29AF */
-	0x7997,0x7988,0x7992,0x7990,0x7A2B,0x7A4A,0x7A30,0x7A2F,
-	0x7A28,0x7A26,0x7AA8,0x7AAB,0x7AAC,0x7AEE,0x7B88,0x7B9C,
-	0x7B8A,0x7B91,0x7B90,0x7B96,0x7B8D,0x7B8C,0x7B9B,0x7B8E,
-	0x7B85,0x7B98,0x5284,0x7B99,0x7BA4,0x7B82,0x7CBB,0x7CBF,
-	0x7CBC,0x7CBA,0x7DA7,0x7DB7,0x7DC2,0x7DA3,0x7DAA,0x7DC1,
-	0x7DC0,0x7DC5,0x7D9D,0x7DCE,0x7DC4,0x7DC6,0x7DCB,0x7DCC,
-	0x7DAF,0x7DB9,0x7D96,0x7DBC,0x7D9F,0x7DA6,0x7DAE,0x7DA9,
-	0x7DA1,0x7DC9,0x7F73,0x7FE2,0x7FE3,0x7FE5,0x7FDE,
-	/* Range 0xE3A1 - 0xE3FE, array index: 0x29EE */
-	0x8024,0x805D,0x805C,0x8189,0x8186,0x8183,0x8187,0x818D,
-	0x818C,0x818B,0x8215,0x8497,0x84A4,0x84A1,0x849F,0x84BA,
-	0x84CE,0x84C2,0x84AC,0x84AE,0x84AB,0x84B9,0x84B4,0x84C1,
-	0x84CD,0x84AA,0x849A,0x84B1,0x84D0,0x849D,0x84A7,0x84BB,
-	0x84A2,0x8494,0x84C7,0x84CC,0x849B,0x84A9,0x84AF,0x84A8,
-	0x84D6,0x8498,0x84B6,0x84CF,0x84A0,0x84D7,0x84D4,0x84D2,
-	0x84DB,0x84B0,0x8491,0x8661,0x8733,0x8723,0x8728,0x876B,
-	0x8740,0x872E,0x871E,0x8721,0x8719,0x871B,0x8743,0x872C,
-	0x8741,0x873E,0x8746,0x8720,0x8732,0x872A,0x872D,0x873C,
-	0x8712,0x873A,0x8731,0x8735,0x8742,0x8726,0x8727,0x8738,
-	0x8724,0x871A,0x8730,0x8711,0x88F7,0x88E7,0x88F1,0x88F2,
-	0x88FA,0x88FE,0x88EE,0x88FC,0x88F6,0x88FB,
-	/* Range 0xE440 - 0xE47E, array index: 0x2A4C */
-	0x88F0,0x88EC,0x88EB,0x899D,0x89A1,0x899F,0x899E,0x89E9,
-	0x89EB,0x89E8,0x8AAB,0x8A99,0x8A8B,0x8A92,0x8A8F,0x8A96,
-	0x8C3D,0x8C68,0x8C69,0x8CD5,0x8CCF,0x8CD7,0x8D96,0x8E09,
-	0x8E02,0x8DFF,0x8E0D,0x8DFD,0x8E0A,0x8E03,0x8E07,0x8E06,
-	0x8E05,0x8DFE,0x8E00,0x8E04,0x8F10,0x8F11,0x8F0E,0x8F0D,
-	0x9123,0x911C,0x9120,0x9122,0x911F,0x911D,0x911A,0x9124,
-	0x9121,0x911B,0x917A,0x9172,0x9179,0x9173,0x92A5,0x92A4,
-	0x9276,0x929B,0x927A,0x92A0,0x9294,0x92AA,0x928D,
-	/* Range 0xE4A1 - 0xE4FE, array index: 0x2A8B */
-	0x92A6,0x929A,0x92AB,0x9279,0x9297,0x927F,0x92A3,0x92EE,
-	0x928E,0x9282,0x9295,0x92A2,0x927D,0x9288,0x92A1,0x928A,
-	0x9286,0x928C,0x9299,0x92A7,0x927E,0x9287,0x92A9,0x929D,
-	0x928B,0x922D,0x969E,0x96A1,0x96FF,0x9758,0x977D,0x977A,
-	0x977E,0x9783,0x9780,0x9782,0x977B,0x9784,0x9781,0x977F,
-	0x97CE,0x97CD,0x9816,0x98AD,0x98AE,0x9902,0x9900,0x9907,
-	0x999D,0x999C,0x99C3,0x99B9,0x99BB,0x99BA,0x99C2,0x99BD,
-	0x99C7,0x9AB1,0x9AE3,0x9AE7,0x9B3E,0x9B3F,0x9B60,0x9B61,
-	0x9B5F,0x9CF1,0x9CF2,0x9CF5,0x9EA7,0x50FF,0x5103,0x5130,
-	0x50F8,0x5106,0x5107,0x50F6,0x50FE,0x510B,0x510C,0x50FD,
-	0x510A,0x528B,0x528C,0x52F1,0x52EF,0x5648,0x5642,0x564C,
-	0x5635,0x5641,0x564A,0x5649,0x5646,0x5658,
-	/* Range 0xE540 - 0xE57E, array index: 0x2AE9 */
-	0x565A,0x5640,0x5633,0x563D,0x562C,0x563E,0x5638,0x562A,
-	0x563A,0x571A,0x58AB,0x589D,0x58B1,0x58A0,0x58A3,0x58AF,
-	0x58AC,0x58A5,0x58A1,0x58FF,0x5AFF,0x5AF4,0x5AFD,0x5AF7,
-	0x5AF6,0x5B03,0x5AF8,0x5B02,0x5AF9,0x5B01,0x5B07,0x5B05,
-	0x5B0F,0x5C67,0x5D99,0x5D97,0x5D9F,0x5D92,0x5DA2,0x5D93,
-	0x5D95,0x5DA0,0x5D9C,0x5DA1,0x5D9A,0x5D9E,0x5E69,0x5E5D,
-	0x5E60,0x5E5C,0x7DF3,0x5EDB,0x5EDE,0x5EE1,0x5F49,0x5FB2,
-	0x618B,0x6183,0x6179,0x61B1,0x61B0,0x61A2,0x6189,
-	/* Range 0xE5A1 - 0xE5FE, array index: 0x2B28 */
-	0x619B,0x6193,0x61AF,0x61AD,0x619F,0x6192,0x61AA,0x61A1,
-	0x618D,0x6166,0x61B3,0x622D,0x646E,0x6470,0x6496,0x64A0,
-	0x6485,0x6497,0x649C,0x648F,0x648B,0x648A,0x648C,0x64A3,
-	0x649F,0x6468,0x64B1,0x6498,0x6576,0x657A,0x6579,0x657B,
-	0x65B2,0x65B3,0x66B5,0x66B0,0x66A9,0x66B2,0x66B7,0x66AA,
-	0x66AF,0x6A00,0x6A06,0x6A17,0x69E5,0x69F8,0x6A15,0x69F1,
-	0x69E4,0x6A20,0x69FF,0x69EC,0x69E2,0x6A1B,0x6A1D,0x69FE,
-	0x6A27,0x69F2,0x69EE,0x6A14,0x69F7,0x69E7,0x6A40,0x6A08,
-	0x69E6,0x69FB,0x6A0D,0x69FC,0x69EB,0x6A09,0x6A04,0x6A18,
-	0x6A25,0x6A0F,0x69F6,0x6A26,0x6A07,0x69F4,0x6A16,0x6B51,
-	0x6BA5,0x6BA3,0x6BA2,0x6BA6,0x6C01,0x6C00,0x6BFF,0x6C02,
-	0x6F41,0x6F26,0x6F7E,0x6F87,0x6FC6,0x6F92,
-	/* Range 0xE640 - 0xE67E, array index: 0x2B86 */
-	0x6F8D,0x6F89,0x6F8C,0x6F62,0x6F4F,0x6F85,0x6F5A,0x6F96,
-	0x6F76,0x6F6C,0x6F82,0x6F55,0x6F72,0x6F52,0x6F50,0x6F57,
-	0x6F94,0x6F93,0x6F5D,0x6F00,0x6F61,0x6F6B,0x6F7D,0x6F67,
-	0x6F90,0x6F53,0x6F8B,0x6F69,0x6F7F,0x6F95,0x6F63,0x6F77,
-	0x6F6A,0x6F7B,0x71B2,0x71AF,0x719B,0x71B0,0x71A0,0x719A,
-	0x71A9,0x71B5,0x719D,0x71A5,0x719E,0x71A4,0x71A1,0x71AA,
-	0x719C,0x71A7,0x71B3,0x7298,0x729A,0x7358,0x7352,0x735E,
-	0x735F,0x7360,0x735D,0x735B,0x7361,0x735A,0x7359,
-	/* Range 0xE6A1 - 0xE6FE, array index: 0x2BC5 */
-	0x7362,0x7487,0x7489,0x748A,0x7486,0x7481,0x747D,0x7485,
-	0x7488,0x747C,0x7479,0x7508,0x7507,0x757E,0x7625,0x761E,
-	0x7619,0x761D,0x761C,0x7623,0x761A,0x7628,0x761B,0x769C,
-	0x769D,0x769E,0x769B,0x778D,0x778F,0x7789,0x7788,0x78CD,
-	0x78BB,0x78CF,0x78CC,0x78D1,0x78CE,0x78D4,0x78C8,0x78C3,
-	0x78C4,0x78C9,0x799A,0x79A1,0x79A0,0x799C,0x79A2,0x799B,
-	0x6B76,0x7A39,0x7AB2,0x7AB4,0x7AB3,0x7BB7,0x7BCB,0x7BBE,
-	0x7BAC,0x7BCE,0x7BAF,0x7BB9,0x7BCA,0x7BB5,0x7CC5,0x7CC8,
-	0x7CCC,0x7CCB,0x7DF7,0x7DDB,0x7DEA,0x7DE7,0x7DD7,0x7DE1,
-	0x7E03,0x7DFA,0x7DE6,0x7DF6,0x7DF1,0x7DF0,0x7DEE,0x7DDF,
-	0x7F76,0x7FAC,0x7FB0,0x7FAD,0x7FED,0x7FEB,0x7FEA,0x7FEC,
-	0x7FE6,0x7FE8,0x8064,0x8067,0x81A3,0x819F,
-	/* Range 0xE740 - 0xE77E, array index: 0x2C23 */
-	0x819E,0x8195,0x81A2,0x8199,0x8197,0x8216,0x824F,0x8253,
-	0x8252,0x8250,0x824E,0x8251,0x8524,0x853B,0x850F,0x8500,
-	0x8529,0x850E,0x8509,0x850D,0x851F,0x850A,0x8527,0x851C,
-	0x84FB,0x852B,0x84FA,0x8508,0x850C,0x84F4,0x852A,0x84F2,
-	0x8515,0x84F7,0x84EB,0x84F3,0x84FC,0x8512,0x84EA,0x84E9,
-	0x8516,0x84FE,0x8528,0x851D,0x852E,0x8502,0x84FD,0x851E,
-	0x84F6,0x8531,0x8526,0x84E7,0x84E8,0x84F0,0x84EF,0x84F9,
-	0x8518,0x8520,0x8530,0x850B,0x8519,0x852F,0x8662,
-	/* Range 0xE7A1 - 0xE7FE, array index: 0x2C62 */
-	0x8756,0x8763,0x8764,0x8777,0x87E1,0x8773,0x8758,0x8754,
-	0x875B,0x8752,0x8761,0x875A,0x8751,0x875E,0x876D,0x876A,
-	0x8750,0x874E,0x875F,0x875D,0x876F,0x876C,0x877A,0x876E,
-	0x875C,0x8765,0x874F,0x877B,0x8775,0x8762,0x8767,0x8769,
-	0x885A,0x8905,0x890C,0x8914,0x890B,0x8917,0x8918,0x8919,
-	0x8906,0x8916,0x8911,0x890E,0x8909,0x89A2,0x89A4,0x89A3,
-	0x89ED,0x89F0,0x89EC,0x8ACF,0x8AC6,0x8AB8,0x8AD3,0x8AD1,
-	0x8AD4,0x8AD5,0x8ABB,0x8AD7,0x8ABE,0x8AC0,0x8AC5,0x8AD8,
-	0x8AC3,0x8ABA,0x8ABD,0x8AD9,0x8C3E,0x8C4D,0x8C8F,0x8CE5,
-	0x8CDF,0x8CD9,0x8CE8,0x8CDA,0x8CDD,0x8CE7,0x8DA0,0x8D9C,
-	0x8DA1,0x8D9B,0x8E20,0x8E23,0x8E25,0x8E24,0x8E2E,0x8E15,
-	0x8E1B,0x8E16,0x8E11,0x8E19,0x8E26,0x8E27,
-	/* Range 0xE840 - 0xE87E, array index: 0x2CC0 */
-	0x8E14,0x8E12,0x8E18,0x8E13,0x8E1C,0x8E17,0x8E1A,0x8F2C,
-	0x8F24,0x8F18,0x8F1A,0x8F20,0x8F23,0x8F16,0x8F17,0x9073,
-	0x9070,0x906F,0x9067,0x906B,0x912F,0x912B,0x9129,0x912A,
-	0x9132,0x9126,0x912E,0x9185,0x9186,0x918A,0x9181,0x9182,
-	0x9184,0x9180,0x92D0,0x92C3,0x92C4,0x92C0,0x92D9,0x92B6,
-	0x92CF,0x92F1,0x92DF,0x92D8,0x92E9,0x92D7,0x92DD,0x92CC,
-	0x92EF,0x92C2,0x92E8,0x92CA,0x92C8,0x92CE,0x92E6,0x92CD,
-	0x92D5,0x92C9,0x92E0,0x92DE,0x92E7,0x92D1,0x92D3,
-	/* Range 0xE8A1 - 0xE8FE, array index: 0x2CFF */
-	0x92B5,0x92E1,0x92C6,0x92B4,0x957C,0x95AC,0x95AB,0x95AE,
-	0x95B0,0x96A4,0x96A2,0x96D3,0x9705,0x9708,0x9702,0x975A,
-	0x978A,0x978E,0x9788,0x97D0,0x97CF,0x981E,0x981D,0x9826,
-	0x9829,0x9828,0x9820,0x981B,0x9827,0x98B2,0x9908,0x98FA,
-	0x9911,0x9914,0x9916,0x9917,0x9915,0x99DC,0x99CD,0x99CF,
-	0x99D3,0x99D4,0x99CE,0x99C9,0x99D6,0x99D8,0x99CB,0x99D7,
-	0x99CC,0x9AB3,0x9AEC,0x9AEB,0x9AF3,0x9AF2,0x9AF1,0x9B46,
-	0x9B43,0x9B67,0x9B74,0x9B71,0x9B66,0x9B76,0x9B75,0x9B70,
-	0x9B68,0x9B64,0x9B6C,0x9CFC,0x9CFA,0x9CFD,0x9CFF,0x9CF7,
-	0x9D07,0x9D00,0x9CF9,0x9CFB,0x9D08,0x9D05,0x9D04,0x9E83,
-	0x9ED3,0x9F0F,0x9F10,0x511C,0x5113,0x5117,0x511A,0x5111,
-	0x51DE,0x5334,0x53E1,0x5670,0x5660,0x566E,
-	/* Range 0xE940 - 0xE97E, array index: 0x2D5D */
-	0x5673,0x5666,0x5663,0x566D,0x5672,0x565E,0x5677,0x571C,
-	0x571B,0x58C8,0x58BD,0x58C9,0x58BF,0x58BA,0x58C2,0x58BC,
-	0x58C6,0x5B17,0x5B19,0x5B1B,0x5B21,0x5B14,0x5B13,0x5B10,
-	0x5B16,0x5B28,0x5B1A,0x5B20,0x5B1E,0x5BEF,0x5DAC,0x5DB1,
-	0x5DA9,0x5DA7,0x5DB5,0x5DB0,0x5DAE,0x5DAA,0x5DA8,0x5DB2,
-	0x5DAD,0x5DAF,0x5DB4,0x5E67,0x5E68,0x5E66,0x5E6F,0x5EE9,
-	0x5EE7,0x5EE6,0x5EE8,0x5EE5,0x5F4B,0x5FBC,0x619D,0x61A8,
-	0x6196,0x61C5,0x61B4,0x61C6,0x61C1,0x61CC,0x61BA,
-	/* Range 0xE9A1 - 0xE9FE, array index: 0x2D9C */
-	0x61BF,0x61B8,0x618C,0x64D7,0x64D6,0x64D0,0x64CF,0x64C9,
-	0x64BD,0x6489,0x64C3,0x64DB,0x64F3,0x64D9,0x6533,0x657F,
-	0x657C,0x65A2,0x66C8,0x66BE,0x66C0,0x66CA,0x66CB,0x66CF,
-	0x66BD,0x66BB,0x66BA,0x66CC,0x6723,0x6A34,0x6A66,0x6A49,
-	0x6A67,0x6A32,0x6A68,0x6A3E,0x6A5D,0x6A6D,0x6A76,0x6A5B,
-	0x6A51,0x6A28,0x6A5A,0x6A3B,0x6A3F,0x6A41,0x6A6A,0x6A64,
-	0x6A50,0x6A4F,0x6A54,0x6A6F,0x6A69,0x6A60,0x6A3C,0x6A5E,
-	0x6A56,0x6A55,0x6A4D,0x6A4E,0x6A46,0x6B55,0x6B54,0x6B56,
-	0x6BA7,0x6BAA,0x6BAB,0x6BC8,0x6BC7,0x6C04,0x6C03,0x6C06,
-	0x6FAD,0x6FCB,0x6FA3,0x6FC7,0x6FBC,0x6FCE,0x6FC8,0x6F5E,
-	0x6FC4,0x6FBD,0x6F9E,0x6FCA,0x6FA8,0x7004,0x6FA5,0x6FAE,
-	0x6FBA,0x6FAC,0x6FAA,0x6FCF,0x6FBF,0x6FB8,
-	/* Range 0xEA40 - 0xEA7E, array index: 0x2DFA */
-	0x6FA2,0x6FC9,0x6FAB,0x6FCD,0x6FAF,0x6FB2,0x6FB0,0x71C5,
-	0x71C2,0x71BF,0x71B8,0x71D6,0x71C0,0x71C1,0x71CB,0x71D4,
-	0x71CA,0x71C7,0x71CF,0x71BD,0x71D8,0x71BC,0x71C6,0x71DA,
-	0x71DB,0x729D,0x729E,0x7369,0x7366,0x7367,0x736C,0x7365,
-	0x736B,0x736A,0x747F,0x749A,0x74A0,0x7494,0x7492,0x7495,
-	0x74A1,0x750B,0x7580,0x762F,0x762D,0x7631,0x763D,0x7633,
-	0x763C,0x7635,0x7632,0x7630,0x76BB,0x76E6,0x779A,0x779D,
-	0x77A1,0x779C,0x779B,0x77A2,0x77A3,0x7795,0x7799,
-	/* Range 0xEAA1 - 0xEAFE, array index: 0x2E39 */
-	0x7797,0x78DD,0x78E9,0x78E5,0x78EA,0x78DE,0x78E3,0x78DB,
-	0x78E1,0x78E2,0x78ED,0x78DF,0x78E0,0x79A4,0x7A44,0x7A48,
-	0x7A47,0x7AB6,0x7AB8,0x7AB5,0x7AB1,0x7AB7,0x7BDE,0x7BE3,
-	0x7BE7,0x7BDD,0x7BD5,0x7BE5,0x7BDA,0x7BE8,0x7BF9,0x7BD4,
-	0x7BEA,0x7BE2,0x7BDC,0x7BEB,0x7BD8,0x7BDF,0x7CD2,0x7CD4,
-	0x7CD7,0x7CD0,0x7CD1,0x7E12,0x7E21,0x7E17,0x7E0C,0x7E1F,
-	0x7E20,0x7E13,0x7E0E,0x7E1C,0x7E15,0x7E1A,0x7E22,0x7E0B,
-	0x7E0F,0x7E16,0x7E0D,0x7E14,0x7E25,0x7E24,0x7F43,0x7F7B,
-	0x7F7C,0x7F7A,0x7FB1,0x7FEF,0x802A,0x8029,0x806C,0x81B1,
-	0x81A6,0x81AE,0x81B9,0x81B5,0x81AB,0x81B0,0x81AC,0x81B4,
-	0x81B2,0x81B7,0x81A7,0x81F2,0x8255,0x8256,0x8257,0x8556,
-	0x8545,0x856B,0x854D,0x8553,0x8561,0x8558,
-	/* Range 0xEB40 - 0xEB7E, array index: 0x2E97 */
-	0x8540,0x8546,0x8564,0x8541,0x8562,0x8544,0x8551,0x8547,
-	0x8563,0x853E,0x855B,0x8571,0x854E,0x856E,0x8575,0x8555,
-	0x8567,0x8560,0x858C,0x8566,0x855D,0x8554,0x8565,0x856C,
-	0x8663,0x8665,0x8664,0x879B,0x878F,0x8797,0x8793,0x8792,
-	0x8788,0x8781,0x8796,0x8798,0x8779,0x8787,0x87A3,0x8785,
-	0x8790,0x8791,0x879D,0x8784,0x8794,0x879C,0x879A,0x8789,
-	0x891E,0x8926,0x8930,0x892D,0x892E,0x8927,0x8931,0x8922,
-	0x8929,0x8923,0x892F,0x892C,0x891F,0x89F1,0x8AE0,
-	/* Range 0xEBA1 - 0xEBFE, array index: 0x2ED6 */
-	0x8AE2,0x8AF2,0x8AF4,0x8AF5,0x8ADD,0x8B14,0x8AE4,0x8ADF,
-	0x8AF0,0x8AC8,0x8ADE,0x8AE1,0x8AE8,0x8AFF,0x8AEF,0x8AFB,
-	0x8C91,0x8C92,0x8C90,0x8CF5,0x8CEE,0x8CF1,0x8CF0,0x8CF3,
-	0x8D6C,0x8D6E,0x8DA5,0x8DA7,0x8E33,0x8E3E,0x8E38,0x8E40,
-	0x8E45,0x8E36,0x8E3C,0x8E3D,0x8E41,0x8E30,0x8E3F,0x8EBD,
-	0x8F36,0x8F2E,0x8F35,0x8F32,0x8F39,0x8F37,0x8F34,0x9076,
-	0x9079,0x907B,0x9086,0x90FA,0x9133,0x9135,0x9136,0x9193,
-	0x9190,0x9191,0x918D,0x918F,0x9327,0x931E,0x9308,0x931F,
-	0x9306,0x930F,0x937A,0x9338,0x933C,0x931B,0x9323,0x9312,
-	0x9301,0x9346,0x932D,0x930E,0x930D,0x92CB,0x931D,0x92FA,
-	0x9325,0x9313,0x92F9,0x92F7,0x9334,0x9302,0x9324,0x92FF,
-	0x9329,0x9339,0x9335,0x932A,0x9314,0x930C,
-	/* Range 0xEC40 - 0xEC7E, array index: 0x2F34 */
-	0x930B,0x92FE,0x9309,0x9300,0x92FB,0x9316,0x95BC,0x95CD,
-	0x95BE,0x95B9,0x95BA,0x95B6,0x95BF,0x95B5,0x95BD,0x96A9,
-	0x96D4,0x970B,0x9712,0x9710,0x9799,0x9797,0x9794,0x97F0,
-	0x97F8,0x9835,0x982F,0x9832,0x9924,0x991F,0x9927,0x9929,
-	0x999E,0x99EE,0x99EC,0x99E5,0x99E4,0x99F0,0x99E3,0x99EA,
-	0x99E9,0x99E7,0x9AB9,0x9ABF,0x9AB4,0x9ABB,0x9AF6,0x9AFA,
-	0x9AF9,0x9AF7,0x9B33,0x9B80,0x9B85,0x9B87,0x9B7C,0x9B7E,
-	0x9B7B,0x9B82,0x9B93,0x9B92,0x9B90,0x9B7A,0x9B95,
-	/* Range 0xECA1 - 0xECFE, array index: 0x2F73 */
-	0x9B7D,0x9B88,0x9D25,0x9D17,0x9D20,0x9D1E,0x9D14,0x9D29,
-	0x9D1D,0x9D18,0x9D22,0x9D10,0x9D19,0x9D1F,0x9E88,0x9E86,
-	0x9E87,0x9EAE,0x9EAD,0x9ED5,0x9ED6,0x9EFA,0x9F12,0x9F3D,
-	0x5126,0x5125,0x5122,0x5124,0x5120,0x5129,0x52F4,0x5693,
-	0x568C,0x568D,0x5686,0x5684,0x5683,0x567E,0x5682,0x567F,
-	0x5681,0x58D6,0x58D4,0x58CF,0x58D2,0x5B2D,0x5B25,0x5B32,
-	0x5B23,0x5B2C,0x5B27,0x5B26,0x5B2F,0x5B2E,0x5B7B,0x5BF1,
-	0x5BF2,0x5DB7,0x5E6C,0x5E6A,0x5FBE,0x5FBB,0x61C3,0x61B5,
-	0x61BC,0x61E7,0x61E0,0x61E5,0x61E4,0x61E8,0x61DE,0x64EF,
-	0x64E9,0x64E3,0x64EB,0x64E4,0x64E8,0x6581,0x6580,0x65B6,
-	0x65DA,0x66D2,0x6A8D,0x6A96,0x6A81,0x6AA5,0x6A89,0x6A9F,
-	0x6A9B,0x6AA1,0x6A9E,0x6A87,0x6A93,0x6A8E,
-	/* Range 0xED40 - 0xED7E, array index: 0x2FD1 */
-	0x6A95,0x6A83,0x6AA8,0x6AA4,0x6A91,0x6A7F,0x6AA6,0x6A9A,
-	0x6A85,0x6A8C,0x6A92,0x6B5B,0x6BAD,0x6C09,0x6FCC,0x6FA9,
-	0x6FF4,0x6FD4,0x6FE3,0x6FDC,0x6FED,0x6FE7,0x6FE6,0x6FDE,
-	0x6FF2,0x6FDD,0x6FE2,0x6FE8,0x71E1,0x71F1,0x71E8,0x71F2,
-	0x71E4,0x71F0,0x71E2,0x7373,0x736E,0x736F,0x7497,0x74B2,
-	0x74AB,0x7490,0x74AA,0x74AD,0x74B1,0x74A5,0x74AF,0x7510,
-	0x7511,0x7512,0x750F,0x7584,0x7643,0x7648,0x7649,0x7647,
-	0x76A4,0x76E9,0x77B5,0x77AB,0x77B2,0x77B7,0x77B6,
-	/* Range 0xEDA1 - 0xEDFE, array index: 0x3010 */
-	0x77B4,0x77B1,0x77A8,0x77F0,0x78F3,0x78FD,0x7902,0x78FB,
-	0x78FC,0x78F2,0x7905,0x78F9,0x78FE,0x7904,0x79AB,0x79A8,
-	0x7A5C,0x7A5B,0x7A56,0x7A58,0x7A54,0x7A5A,0x7ABE,0x7AC0,
-	0x7AC1,0x7C05,0x7C0F,0x7BF2,0x7C00,0x7BFF,0x7BFB,0x7C0E,
-	0x7BF4,0x7C0B,0x7BF3,0x7C02,0x7C09,0x7C03,0x7C01,0x7BF8,
-	0x7BFD,0x7C06,0x7BF0,0x7BF1,0x7C10,0x7C0A,0x7CE8,0x7E2D,
-	0x7E3C,0x7E42,0x7E33,0x9848,0x7E38,0x7E2A,0x7E49,0x7E40,
-	0x7E47,0x7E29,0x7E4C,0x7E30,0x7E3B,0x7E36,0x7E44,0x7E3A,
-	0x7F45,0x7F7F,0x7F7E,0x7F7D,0x7FF4,0x7FF2,0x802C,0x81BB,
-	0x81C4,0x81CC,0x81CA,0x81C5,0x81C7,0x81BC,0x81E9,0x825B,
-	0x825A,0x825C,0x8583,0x8580,0x858F,0x85A7,0x8595,0x85A0,
-	0x858B,0x85A3,0x857B,0x85A4,0x859A,0x859E,
-	/* Range 0xEE40 - 0xEE7E, array index: 0x306E */
-	0x8577,0x857C,0x8589,0x85A1,0x857A,0x8578,0x8557,0x858E,
-	0x8596,0x8586,0x858D,0x8599,0x859D,0x8581,0x85A2,0x8582,
-	0x8588,0x8585,0x8579,0x8576,0x8598,0x8590,0x859F,0x8668,
-	0x87BE,0x87AA,0x87AD,0x87C5,0x87B0,0x87AC,0x87B9,0x87B5,
-	0x87BC,0x87AE,0x87C9,0x87C3,0x87C2,0x87CC,0x87B7,0x87AF,
-	0x87C4,0x87CA,0x87B4,0x87B6,0x87BF,0x87B8,0x87BD,0x87DE,
-	0x87B2,0x8935,0x8933,0x893C,0x893E,0x8941,0x8952,0x8937,
-	0x8942,0x89AD,0x89AF,0x89AE,0x89F2,0x89F3,0x8B1E,
-	/* Range 0xEEA1 - 0xEEFE, array index: 0x30AD */
-	0x8B18,0x8B16,0x8B11,0x8B05,0x8B0B,0x8B22,0x8B0F,0x8B12,
-	0x8B15,0x8B07,0x8B0D,0x8B08,0x8B06,0x8B1C,0x8B13,0x8B1A,
-	0x8C4F,0x8C70,0x8C72,0x8C71,0x8C6F,0x8C95,0x8C94,0x8CF9,
-	0x8D6F,0x8E4E,0x8E4D,0x8E53,0x8E50,0x8E4C,0x8E47,0x8F43,
-	0x8F40,0x9085,0x907E,0x9138,0x919A,0x91A2,0x919B,0x9199,
-	0x919F,0x91A1,0x919D,0x91A0,0x93A1,0x9383,0x93AF,0x9364,
-	0x9356,0x9347,0x937C,0x9358,0x935C,0x9376,0x9349,0x9350,
-	0x9351,0x9360,0x936D,0x938F,0x934C,0x936A,0x9379,0x9357,
-	0x9355,0x9352,0x934F,0x9371,0x9377,0x937B,0x9361,0x935E,
-	0x9363,0x9367,0x9380,0x934E,0x9359,0x95C7,0x95C0,0x95C9,
-	0x95C3,0x95C5,0x95B7,0x96AE,0x96B0,0x96AC,0x9720,0x971F,
-	0x9718,0x971D,0x9719,0x979A,0x97A1,0x979C,
-	/* Range 0xEF40 - 0xEF7E, array index: 0x310B */
-	0x979E,0x979D,0x97D5,0x97D4,0x97F1,0x9841,0x9844,0x984A,
-	0x9849,0x9845,0x9843,0x9925,0x992B,0x992C,0x992A,0x9933,
-	0x9932,0x992F,0x992D,0x9931,0x9930,0x9998,0x99A3,0x99A1,
-	0x9A02,0x99FA,0x99F4,0x99F7,0x99F9,0x99F8,0x99F6,0x99FB,
-	0x99FD,0x99FE,0x99FC,0x9A03,0x9ABE,0x9AFE,0x9AFD,0x9B01,
-	0x9AFC,0x9B48,0x9B9A,0x9BA8,0x9B9E,0x9B9B,0x9BA6,0x9BA1,
-	0x9BA5,0x9BA4,0x9B86,0x9BA2,0x9BA0,0x9BAF,0x9D33,0x9D41,
-	0x9D67,0x9D36,0x9D2E,0x9D2F,0x9D31,0x9D38,0x9D30,
-	/* Range 0xEFA1 - 0xEFFE, array index: 0x314A */
-	0x9D45,0x9D42,0x9D43,0x9D3E,0x9D37,0x9D40,0x9D3D,0x7FF5,
-	0x9D2D,0x9E8A,0x9E89,0x9E8D,0x9EB0,0x9EC8,0x9EDA,0x9EFB,
-	0x9EFF,0x9F24,0x9F23,0x9F22,0x9F54,0x9FA0,0x5131,0x512D,
-	0x512E,0x5698,0x569C,0x5697,0x569A,0x569D,0x5699,0x5970,
-	0x5B3C,0x5C69,0x5C6A,0x5DC0,0x5E6D,0x5E6E,0x61D8,0x61DF,
-	0x61ED,0x61EE,0x61F1,0x61EA,0x61F0,0x61EB,0x61D6,0x61E9,
-	0x64FF,0x6504,0x64FD,0x64F8,0x6501,0x6503,0x64FC,0x6594,
-	0x65DB,0x66DA,0x66DB,0x66D8,0x6AC5,0x6AB9,0x6ABD,0x6AE1,
-	0x6AC6,0x6ABA,0x6AB6,0x6AB7,0x6AC7,0x6AB4,0x6AAD,0x6B5E,
-	0x6BC9,0x6C0B,0x7007,0x700C,0x700D,0x7001,0x7005,0x7014,
-	0x700E,0x6FFF,0x7000,0x6FFB,0x7026,0x6FFC,0x6FF7,0x700A,
-	0x7201,0x71FF,0x71F9,0x7203,0x71FD,0x7376,
-	/* Range 0xF040 - 0xF07E, array index: 0x31A8 */
-	0x74B8,0x74C0,0x74B5,0x74C1,0x74BE,0x74B6,0x74BB,0x74C2,
-	0x7514,0x7513,0x765C,0x7664,0x7659,0x7650,0x7653,0x7657,
-	0x765A,0x76A6,0x76BD,0x76EC,0x77C2,0x77BA,0x78FF,0x790C,
-	0x7913,0x7914,0x7909,0x7910,0x7912,0x7911,0x79AD,0x79AC,
-	0x7A5F,0x7C1C,0x7C29,0x7C19,0x7C20,0x7C1F,0x7C2D,0x7C1D,
-	0x7C26,0x7C28,0x7C22,0x7C25,0x7C30,0x7E5C,0x7E50,0x7E56,
-	0x7E63,0x7E58,0x7E62,0x7E5F,0x7E51,0x7E60,0x7E57,0x7E53,
-	0x7FB5,0x7FB3,0x7FF7,0x7FF8,0x8075,0x81D1,0x81D2,
-	/* Range 0xF0A1 - 0xF0FE, array index: 0x31E7 */
-	0x81D0,0x825F,0x825E,0x85B4,0x85C6,0x85C0,0x85C3,0x85C2,
-	0x85B3,0x85B5,0x85BD,0x85C7,0x85C4,0x85BF,0x85CB,0x85CE,
-	0x85C8,0x85C5,0x85B1,0x85B6,0x85D2,0x8624,0x85B8,0x85B7,
-	0x85BE,0x8669,0x87E7,0x87E6,0x87E2,0x87DB,0x87EB,0x87EA,
-	0x87E5,0x87DF,0x87F3,0x87E4,0x87D4,0x87DC,0x87D3,0x87ED,
-	0x87D8,0x87E3,0x87A4,0x87D7,0x87D9,0x8801,0x87F4,0x87E8,
-	0x87DD,0x8953,0x894B,0x894F,0x894C,0x8946,0x8950,0x8951,
-	0x8949,0x8B2A,0x8B27,0x8B23,0x8B33,0x8B30,0x8B35,0x8B47,
-	0x8B2F,0x8B3C,0x8B3E,0x8B31,0x8B25,0x8B37,0x8B26,0x8B36,
-	0x8B2E,0x8B24,0x8B3B,0x8B3D,0x8B3A,0x8C42,0x8C75,0x8C99,
-	0x8C98,0x8C97,0x8CFE,0x8D04,0x8D02,0x8D00,0x8E5C,0x8E62,
-	0x8E60,0x8E57,0x8E56,0x8E5E,0x8E65,0x8E67,
-	/* Range 0xF140 - 0xF17E, array index: 0x3245 */
-	0x8E5B,0x8E5A,0x8E61,0x8E5D,0x8E69,0x8E54,0x8F46,0x8F47,
-	0x8F48,0x8F4B,0x9128,0x913A,0x913B,0x913E,0x91A8,0x91A5,
-	0x91A7,0x91AF,0x91AA,0x93B5,0x938C,0x9392,0x93B7,0x939B,
-	0x939D,0x9389,0x93A7,0x938E,0x93AA,0x939E,0x93A6,0x9395,
-	0x9388,0x9399,0x939F,0x938D,0x93B1,0x9391,0x93B2,0x93A4,
-	0x93A8,0x93B4,0x93A3,0x93A5,0x95D2,0x95D3,0x95D1,0x96B3,
-	0x96D7,0x96DA,0x5DC2,0x96DF,0x96D8,0x96DD,0x9723,0x9722,
-	0x9725,0x97AC,0x97AE,0x97A8,0x97AB,0x97A4,0x97AA,
-	/* Range 0xF1A1 - 0xF1FE, array index: 0x3284 */
-	0x97A2,0x97A5,0x97D7,0x97D9,0x97D6,0x97D8,0x97FA,0x9850,
-	0x9851,0x9852,0x98B8,0x9941,0x993C,0x993A,0x9A0F,0x9A0B,
-	0x9A09,0x9A0D,0x9A04,0x9A11,0x9A0A,0x9A05,0x9A07,0x9A06,
-	0x9AC0,0x9ADC,0x9B08,0x9B04,0x9B05,0x9B29,0x9B35,0x9B4A,
-	0x9B4C,0x9B4B,0x9BC7,0x9BC6,0x9BC3,0x9BBF,0x9BC1,0x9BB5,
-	0x9BB8,0x9BD3,0x9BB6,0x9BC4,0x9BB9,0x9BBD,0x9D5C,0x9D53,
-	0x9D4F,0x9D4A,0x9D5B,0x9D4B,0x9D59,0x9D56,0x9D4C,0x9D57,
-	0x9D52,0x9D54,0x9D5F,0x9D58,0x9D5A,0x9E8E,0x9E8C,0x9EDF,
-	0x9F01,0x9F00,0x9F16,0x9F25,0x9F2B,0x9F2A,0x9F29,0x9F28,
-	0x9F4C,0x9F55,0x5134,0x5135,0x5296,0x52F7,0x53B4,0x56AB,
-	0x56AD,0x56A6,0x56A7,0x56AA,0x56AC,0x58DA,0x58DD,0x58DB,
-	0x5912,0x5B3D,0x5B3E,0x5B3F,0x5DC3,0x5E70,
-	/* Range 0xF240 - 0xF27E, array index: 0x32E2 */
-	0x5FBF,0x61FB,0x6507,0x6510,0x650D,0x6509,0x650C,0x650E,
-	0x6584,0x65DE,0x65DD,0x66DE,0x6AE7,0x6AE0,0x6ACC,0x6AD1,
-	0x6AD9,0x6ACB,0x6ADF,0x6ADC,0x6AD0,0x6AEB,0x6ACF,0x6ACD,
-	0x6ADE,0x6B60,0x6BB0,0x6C0C,0x7019,0x7027,0x7020,0x7016,
-	0x702B,0x7021,0x7022,0x7023,0x7029,0x7017,0x7024,0x701C,
-	0x702A,0x720C,0x720A,0x7207,0x7202,0x7205,0x72A5,0x72A6,
-	0x72A4,0x72A3,0x72A1,0x74CB,0x74C5,0x74B7,0x74C3,0x7516,
-	0x7660,0x77C9,0x77CA,0x77C4,0x77F1,0x791D,0x791B,
-	/* Range 0xF2A1 - 0xF2FE, array index: 0x3321 */
-	0x7921,0x791C,0x7917,0x791E,0x79B0,0x7A67,0x7A68,0x7C33,
-	0x7C3C,0x7C39,0x7C2C,0x7C3B,0x7CEC,0x7CEA,0x7E76,0x7E75,
-	0x7E78,0x7E70,0x7E77,0x7E6F,0x7E7A,0x7E72,0x7E74,0x7E68,
-	0x7F4B,0x7F4A,0x7F83,0x7F86,0x7FB7,0x7FFD,0x7FFE,0x8078,
-	0x81D7,0x81D5,0x8264,0x8261,0x8263,0x85EB,0x85F1,0x85ED,
-	0x85D9,0x85E1,0x85E8,0x85DA,0x85D7,0x85EC,0x85F2,0x85F8,
-	0x85D8,0x85DF,0x85E3,0x85DC,0x85D1,0x85F0,0x85E6,0x85EF,
-	0x85DE,0x85E2,0x8800,0x87FA,0x8803,0x87F6,0x87F7,0x8809,
-	0x880C,0x880B,0x8806,0x87FC,0x8808,0x87FF,0x880A,0x8802,
-	0x8962,0x895A,0x895B,0x8957,0x8961,0x895C,0x8958,0x895D,
-	0x8959,0x8988,0x89B7,0x89B6,0x89F6,0x8B50,0x8B48,0x8B4A,
-	0x8B40,0x8B53,0x8B56,0x8B54,0x8B4B,0x8B55,
-	/* Range 0xF340 - 0xF37E, array index: 0x337F */
-	0x8B51,0x8B42,0x8B52,0x8B57,0x8C43,0x8C77,0x8C76,0x8C9A,
-	0x8D06,0x8D07,0x8D09,0x8DAC,0x8DAA,0x8DAD,0x8DAB,0x8E6D,
-	0x8E78,0x8E73,0x8E6A,0x8E6F,0x8E7B,0x8EC2,0x8F52,0x8F51,
-	0x8F4F,0x8F50,0x8F53,0x8FB4,0x9140,0x913F,0x91B0,0x91AD,
-	0x93DE,0x93C7,0x93CF,0x93C2,0x93DA,0x93D0,0x93F9,0x93EC,
-	0x93CC,0x93D9,0x93A9,0x93E6,0x93CA,0x93D4,0x93EE,0x93E3,
-	0x93D5,0x93C4,0x93CE,0x93C0,0x93D2,0x93E7,0x957D,0x95DA,
-	0x95DB,0x96E1,0x9729,0x972B,0x972C,0x9728,0x9726,
-	/* Range 0xF3A1 - 0xF3FE, array index: 0x33BE */
-	0x97B3,0x97B7,0x97B6,0x97DD,0x97DE,0x97DF,0x985C,0x9859,
-	0x985D,0x9857,0x98BF,0x98BD,0x98BB,0x98BE,0x9948,0x9947,
-	0x9943,0x99A6,0x99A7,0x9A1A,0x9A15,0x9A25,0x9A1D,0x9A24,
-	0x9A1B,0x9A22,0x9A20,0x9A27,0x9A23,0x9A1E,0x9A1C,0x9A14,
-	0x9AC2,0x9B0B,0x9B0A,0x9B0E,0x9B0C,0x9B37,0x9BEA,0x9BEB,
-	0x9BE0,0x9BDE,0x9BE4,0x9BE6,0x9BE2,0x9BF0,0x9BD4,0x9BD7,
-	0x9BEC,0x9BDC,0x9BD9,0x9BE5,0x9BD5,0x9BE1,0x9BDA,0x9D77,
-	0x9D81,0x9D8A,0x9D84,0x9D88,0x9D71,0x9D80,0x9D78,0x9D86,
-	0x9D8B,0x9D8C,0x9D7D,0x9D6B,0x9D74,0x9D75,0x9D70,0x9D69,
-	0x9D85,0x9D73,0x9D7B,0x9D82,0x9D6F,0x9D79,0x9D7F,0x9D87,
-	0x9D68,0x9E94,0x9E91,0x9EC0,0x9EFC,0x9F2D,0x9F40,0x9F41,
-	0x9F4D,0x9F56,0x9F57,0x9F58,0x5337,0x56B2,
-	/* Range 0xF440 - 0xF47E, array index: 0x341C */
-	0x56B5,0x56B3,0x58E3,0x5B45,0x5DC6,0x5DC7,0x5EEE,0x5EEF,
-	0x5FC0,0x5FC1,0x61F9,0x6517,0x6516,0x6515,0x6513,0x65DF,
-	0x66E8,0x66E3,0x66E4,0x6AF3,0x6AF0,0x6AEA,0x6AE8,0x6AF9,
-	0x6AF1,0x6AEE,0x6AEF,0x703C,0x7035,0x702F,0x7037,0x7034,
-	0x7031,0x7042,0x7038,0x703F,0x703A,0x7039,0x7040,0x703B,
-	0x7033,0x7041,0x7213,0x7214,0x72A8,0x737D,0x737C,0x74BA,
-	0x76AB,0x76AA,0x76BE,0x76ED,0x77CC,0x77CE,0x77CF,0x77CD,
-	0x77F2,0x7925,0x7923,0x7927,0x7928,0x7924,0x7929,
-	/* Range 0xF4A1 - 0xF4FE, array index: 0x345B */
-	0x79B2,0x7A6E,0x7A6C,0x7A6D,0x7AF7,0x7C49,0x7C48,0x7C4A,
-	0x7C47,0x7C45,0x7CEE,0x7E7B,0x7E7E,0x7E81,0x7E80,0x7FBA,
-	0x7FFF,0x8079,0x81DB,0x81D9,0x820B,0x8268,0x8269,0x8622,
-	0x85FF,0x8601,0x85FE,0x861B,0x8600,0x85F6,0x8604,0x8609,
-	0x8605,0x860C,0x85FD,0x8819,0x8810,0x8811,0x8817,0x8813,
-	0x8816,0x8963,0x8966,0x89B9,0x89F7,0x8B60,0x8B6A,0x8B5D,
-	0x8B68,0x8B63,0x8B65,0x8B67,0x8B6D,0x8DAE,0x8E86,0x8E88,
-	0x8E84,0x8F59,0x8F56,0x8F57,0x8F55,0x8F58,0x8F5A,0x908D,
-	0x9143,0x9141,0x91B7,0x91B5,0x91B2,0x91B3,0x940B,0x9413,
-	0x93FB,0x9420,0x940F,0x9414,0x93FE,0x9415,0x9410,0x9428,
-	0x9419,0x940D,0x93F5,0x9400,0x93F7,0x9407,0x940E,0x9416,
-	0x9412,0x93FA,0x9409,0x93F8,0x940A,0x93FF,
-	/* Range 0xF540 - 0xF57E, array index: 0x34B9 */
-	0x93FC,0x940C,0x93F6,0x9411,0x9406,0x95DE,0x95E0,0x95DF,
-	0x972E,0x972F,0x97B9,0x97BB,0x97FD,0x97FE,0x9860,0x9862,
-	0x9863,0x985F,0x98C1,0x98C2,0x9950,0x994E,0x9959,0x994C,
-	0x994B,0x9953,0x9A32,0x9A34,0x9A31,0x9A2C,0x9A2A,0x9A36,
-	0x9A29,0x9A2E,0x9A38,0x9A2D,0x9AC7,0x9ACA,0x9AC6,0x9B10,
-	0x9B12,0x9B11,0x9C0B,0x9C08,0x9BF7,0x9C05,0x9C12,0x9BF8,
-	0x9C40,0x9C07,0x9C0E,0x9C06,0x9C17,0x9C14,0x9C09,0x9D9F,
-	0x9D99,0x9DA4,0x9D9D,0x9D92,0x9D98,0x9D90,0x9D9B,
-	/* Range 0xF5A1 - 0xF5FE, array index: 0x34F8 */
-	0x9DA0,0x9D94,0x9D9C,0x9DAA,0x9D97,0x9DA1,0x9D9A,0x9DA2,
-	0x9DA8,0x9D9E,0x9DA3,0x9DBF,0x9DA9,0x9D96,0x9DA6,0x9DA7,
-	0x9E99,0x9E9B,0x9E9A,0x9EE5,0x9EE4,0x9EE7,0x9EE6,0x9F30,
-	0x9F2E,0x9F5B,0x9F60,0x9F5E,0x9F5D,0x9F59,0x9F91,0x513A,
-	0x5139,0x5298,0x5297,0x56C3,0x56BD,0x56BE,0x5B48,0x5B47,
-	0x5DCB,0x5DCF,0x5EF1,0x61FD,0x651B,0x6B02,0x6AFC,0x6B03,
-	0x6AF8,0x6B00,0x7043,0x7044,0x704A,0x7048,0x7049,0x7045,
-	0x7046,0x721D,0x721A,0x7219,0x737E,0x7517,0x766A,0x77D0,
-	0x792D,0x7931,0x792F,0x7C54,0x7C53,0x7CF2,0x7E8A,0x7E87,
-	0x7E88,0x7E8B,0x7E86,0x7E8D,0x7F4D,0x7FBB,0x8030,0x81DD,
-	0x8618,0x862A,0x8626,0x861F,0x8623,0x861C,0x8619,0x8627,
-	0x862E,0x8621,0x8620,0x8629,0x861E,0x8625,
-	/* Range 0xF640 - 0xF67E, array index: 0x3556 */
-	0x8829,0x881D,0x881B,0x8820,0x8824,0x881C,0x882B,0x884A,
-	0x896D,0x8969,0x896E,0x896B,0x89FA,0x8B79,0x8B78,0x8B45,
-	0x8B7A,0x8B7B,0x8D10,0x8D14,0x8DAF,0x8E8E,0x8E8C,0x8F5E,
-	0x8F5B,0x8F5D,0x9146,0x9144,0x9145,0x91B9,0x943F,0x943B,
-	0x9436,0x9429,0x943D,0x943C,0x9430,0x9439,0x942A,0x9437,
-	0x942C,0x9440,0x9431,0x95E5,0x95E4,0x95E3,0x9735,0x973A,
-	0x97BF,0x97E1,0x9864,0x98C9,0x98C6,0x98C0,0x9958,0x9956,
-	0x9A39,0x9A3D,0x9A46,0x9A44,0x9A42,0x9A41,0x9A3A,
-	/* Range 0xF6A1 - 0xF6FE, array index: 0x3595 */
-	0x9A3F,0x9ACD,0x9B15,0x9B17,0x9B18,0x9B16,0x9B3A,0x9B52,
-	0x9C2B,0x9C1D,0x9C1C,0x9C2C,0x9C23,0x9C28,0x9C29,0x9C24,
-	0x9C21,0x9DB7,0x9DB6,0x9DBC,0x9DC1,0x9DC7,0x9DCA,0x9DCF,
-	0x9DBE,0x9DC5,0x9DC3,0x9DBB,0x9DB5,0x9DCE,0x9DB9,0x9DBA,
-	0x9DAC,0x9DC8,0x9DB1,0x9DAD,0x9DCC,0x9DB3,0x9DCD,0x9DB2,
-	0x9E7A,0x9E9C,0x9EEB,0x9EEE,0x9EED,0x9F1B,0x9F18,0x9F1A,
-	0x9F31,0x9F4E,0x9F65,0x9F64,0x9F92,0x4EB9,0x56C6,0x56C5,
-	0x56CB,0x5971,0x5B4B,0x5B4C,0x5DD5,0x5DD1,0x5EF2,0x6521,
-	0x6520,0x6526,0x6522,0x6B0B,0x6B08,0x6B09,0x6C0D,0x7055,
-	0x7056,0x7057,0x7052,0x721E,0x721F,0x72A9,0x737F,0x74D8,
-	0x74D5,0x74D9,0x74D7,0x766D,0x76AD,0x7935,0x79B4,0x7A70,
-	0x7A71,0x7C57,0x7C5C,0x7C59,0x7C5B,0x7C5A,
-	/* Range 0xF740 - 0xF77E, array index: 0x35F3 */
-	0x7CF4,0x7CF1,0x7E91,0x7F4F,0x7F87,0x81DE,0x826B,0x8634,
-	0x8635,0x8633,0x862C,0x8632,0x8636,0x882C,0x8828,0x8826,
-	0x882A,0x8825,0x8971,0x89BF,0x89BE,0x89FB,0x8B7E,0x8B84,
-	0x8B82,0x8B86,0x8B85,0x8B7F,0x8D15,0x8E95,0x8E94,0x8E9A,
-	0x8E92,0x8E90,0x8E96,0x8E97,0x8F60,0x8F62,0x9147,0x944C,
-	0x9450,0x944A,0x944B,0x944F,0x9447,0x9445,0x9448,0x9449,
-	0x9446,0x973F,0x97E3,0x986A,0x9869,0x98CB,0x9954,0x995B,
-	0x9A4E,0x9A53,0x9A54,0x9A4C,0x9A4F,0x9A48,0x9A4A,
-	/* Range 0xF7A1 - 0xF7FE, array index: 0x3632 */
-	0x9A49,0x9A52,0x9A50,0x9AD0,0x9B19,0x9B2B,0x9B3B,0x9B56,
-	0x9B55,0x9C46,0x9C48,0x9C3F,0x9C44,0x9C39,0x9C33,0x9C41,
-	0x9C3C,0x9C37,0x9C34,0x9C32,0x9C3D,0x9C36,0x9DDB,0x9DD2,
-	0x9DDE,0x9DDA,0x9DCB,0x9DD0,0x9DDC,0x9DD1,0x9DDF,0x9DE9,
-	0x9DD9,0x9DD8,0x9DD6,0x9DF5,0x9DD5,0x9DDD,0x9EB6,0x9EF0,
-	0x9F35,0x9F33,0x9F32,0x9F42,0x9F6B,0x9F95,0x9FA2,0x513D,
-	0x5299,0x58E8,0x58E7,0x5972,0x5B4D,0x5DD8,0x882F,0x5F4F,
-	0x6201,0x6203,0x6204,0x6529,0x6525,0x6596,0x66EB,0x6B11,
-	0x6B12,0x6B0F,0x6BCA,0x705B,0x705A,0x7222,0x7382,0x7381,
-	0x7383,0x7670,0x77D4,0x7C67,0x7C66,0x7E95,0x826C,0x863A,
-	0x8640,0x8639,0x863C,0x8631,0x863B,0x863E,0x8830,0x8832,
-	0x882E,0x8833,0x8976,0x8974,0x8973,0x89FE,
-	/* Range 0xF840 - 0xF87E, array index: 0x3690 */
-	0x8B8C,0x8B8E,0x8B8B,0x8B88,0x8C45,0x8D19,0x8E98,0x8F64,
-	0x8F63,0x91BC,0x9462,0x9455,0x945D,0x9457,0x945E,0x97C4,
-	0x97C5,0x9800,0x9A56,0x9A59,0x9B1E,0x9B1F,0x9B20,0x9C52,
-	0x9C58,0x9C50,0x9C4A,0x9C4D,0x9C4B,0x9C55,0x9C59,0x9C4C,
-	0x9C4E,0x9DFB,0x9DF7,0x9DEF,0x9DE3,0x9DEB,0x9DF8,0x9DE4,
-	0x9DF6,0x9DE1,0x9DEE,0x9DE6,0x9DF2,0x9DF0,0x9DE2,0x9DEC,
-	0x9DF4,0x9DF3,0x9DE8,0x9DED,0x9EC2,0x9ED0,0x9EF2,0x9EF3,
-	0x9F06,0x9F1C,0x9F38,0x9F37,0x9F36,0x9F43,0x9F4F,
-	/* Range 0xF8A1 - 0xF8FE, array index: 0x36CF */
-	0x9F71,0x9F70,0x9F6E,0x9F6F,0x56D3,0x56CD,0x5B4E,0x5C6D,
-	0x652D,0x66ED,0x66EE,0x6B13,0x705F,0x7061,0x705D,0x7060,
-	0x7223,0x74DB,0x74E5,0x77D5,0x7938,0x79B7,0x79B6,0x7C6A,
-	0x7E97,0x7F89,0x826D,0x8643,0x8838,0x8837,0x8835,0x884B,
-	0x8B94,0x8B95,0x8E9E,0x8E9F,0x8EA0,0x8E9D,0x91BE,0x91BD,
-	0x91C2,0x946B,0x9468,0x9469,0x96E5,0x9746,0x9743,0x9747,
-	0x97C7,0x97E5,0x9A5E,0x9AD5,0x9B59,0x9C63,0x9C67,0x9C66,
-	0x9C62,0x9C5E,0x9C60,0x9E02,0x9DFE,0x9E07,0x9E03,0x9E06,
-	0x9E05,0x9E00,0x9E01,0x9E09,0x9DFF,0x9DFD,0x9E04,0x9EA0,
-	0x9F1E,0x9F46,0x9F74,0x9F75,0x9F76,0x56D4,0x652E,0x65B8,
-	0x6B18,0x6B19,0x6B17,0x6B1A,0x7062,0x7226,0x72AA,0x77D8,
-	0x77D9,0x7939,0x7C69,0x7C6B,0x7CF6,0x7E9A,
-	/* Range 0xF940 - 0xF97E, array index: 0x372D */
-	0x7E98,0x7E9B,0x7E99,0x81E0,0x81E1,0x8646,0x8647,0x8648,
-	0x8979,0x897A,0x897C,0x897B,0x89FF,0x8B98,0x8B99,0x8EA5,
-	0x8EA4,0x8EA3,0x946E,0x946D,0x946F,0x9471,0x9473,0x9749,
-	0x9872,0x995F,0x9C68,0x9C6E,0x9C6D,0x9E0B,0x9E0D,0x9E10,
-	0x9E0F,0x9E12,0x9E11,0x9EA1,0x9EF5,0x9F09,0x9F47,0x9F78,
-	0x9F7B,0x9F7A,0x9F79,0x571E,0x7066,0x7C6F,0x883C,0x8DB2,
-	0x8EA6,0x91C3,0x9474,0x9478,0x9476,0x9475,0x9A60,0x9C74,
-	0x9C73,0x9C71,0x9C75,0x9E14,0x9E13,0x9EF6,0x9F0A,
-	/* Range 0xF9A1 - 0xF9D5, array index: 0x376C */
-	0x9FA4,0x7068,0x7065,0x7CF7,0x866A,0x883E,0x883D,0x883F,
-	0x8B9E,0x8C9C,0x8EA9,0x8EC9,0x974B,0x9873,0x9874,0x98CC,
-	0x9961,0x99AB,0x9A64,0x9A66,0x9A67,0x9B24,0x9E15,0x9E17,
-	0x9F48,0x6207,0x6B1E,0x7227,0x864C,0x8EA8,0x9482,0x9480,
-	0x9481,0x9A69,0x9A68,0x9B2E,0x9E19,0x7229,0x864B,0x8B9F,
-	0x9483,0x9C79,0x9EB7,0x7675,0x9A6B,0x9C7A,0x9E1D,0x7069,
-	0x706A,0x9EA4,0x9F7E,0x9F49,0x9F98,
-	/* Unranged codes (176 codes) */
-};
-
-#endif /* ICONV_TO_UCS_CCS_BIG5 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> big5 speed-optimized table (51200 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_BIG5) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_speed_big5[] =
-{
-	/* Heading Block */
-	0x0100,INVBLK,0x0200,0x0300,0x0400,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	0x0500,0x0600,0x0700,INVBLK,0x0800,0x0900,0x0A00,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	0x0B00,0x0C00,0x0D00,0x0E00,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,0x0F00,0x1000,
-	0x1100,0x1200,0x1300,0x1400,0x1500,0x1600,0x1700,0x1800,
-	0x1900,0x1A00,0x1B00,0x1C00,0x1D00,0x1E00,0x1F00,0x2000,
-	0x2100,0x2200,0x2300,0x2400,0x2500,0x2600,0x2700,0x2800,
-	0x2900,0x2A00,0x2B00,0x2C00,0x2D00,0x2E00,0x2F00,0x3000,
-	0x3100,0x3200,0x3300,0x3400,0x3500,0x3600,0x3700,0x3800,
-	0x3900,0x3A00,0x3B00,0x3C00,0x3D00,0x3E00,0x3F00,0x4000,
-	0x4100,0x4200,0x4300,0x4400,0x4500,0x4600,0x4700,0x4800,
-	0x4900,0x4A00,0x4B00,0x4C00,0x4D00,0x4E00,0x4F00,0x5000,
-	0x5100,0x5200,0x5300,0x5400,0x5500,0x5600,0x5700,0x5800,
-	0x5900,0x5A00,0x5B00,0x5C00,0x5D00,0x5E00,0x5F00,0x6000,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,0x6100,INVBLK,INVBLK,INVBLK,0x6200,0x6300,
-	/* Block 1, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xA246,0xA247,INVALC,0xA244,INVALC,0xA1B1,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xA258,0xA1D3,INVALC,INVALC,INVALC,INVALC,INVALC,0xA150,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xA1D1,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xA1D2,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 3, Array index 0x0200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xA3BE,
-	INVALC,0xA3BC,0xA3BD,0xA3BF,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xA3BB,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 4, Array index 0x0300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xA344,0xA345,0xA346,0xA347,0xA348,0xA349,0xA34A,
-	0xA34B,0xA34C,0xA34D,0xA34E,0xA34F,0xA350,0xA351,0xA352,
-	0xA353,0xA354,INVALC,0xA355,0xA356,0xA357,0xA358,0xA359,
-	0xA35A,0xA35B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xA35C,0xA35D,0xA35E,0xA35F,0xA360,0xA361,0xA362,
-	0xA363,0xA364,0xA365,0xA366,0xA367,0xA368,0xA369,0xA36A,
-	0xA36B,0xA36C,INVALC,0xA36D,0xA36E,0xA36F,0xA370,0xA371,
-	0xA372,0xA373,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 5, Array index 0x0400 */
-	INVALC,0xC7B3,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xC7B1,0xC7B2,0xC7B4,0xC7B5,
-	0xC7B6,0xC7B7,0xC7B8,0xC7B9,0xC7BA,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xC7BB,0xC7BC,0xC7BD,0xC7BE,0xC7BF,
-	0xC7C0,0xC7C1,0xC7C2,0xC7C3,0xC7C4,0xC7C5,0xC7C6,0xC7C7,
-	0xC7C8,0xC7C9,0xC7CA,0xC7CB,0xC7CC,0xC7CD,0xC7CF,0xC7D0,
-	0xC7D1,0xC7D2,0xC7D3,0xC7D4,0xC7D5,0xC7D6,0xC7D7,0xC7D8,
-	0xC7D9,0xC7DA,0xC7DB,0xC7DC,0xC7DD,0xC7DE,0xC7DF,0xC7E0,
-	0xC7E1,0xC7E2,0xC7E3,0xC7E4,0xC7E5,0xC7E6,0xC7E7,0xC7E8,
-	INVALC,0xC7CE,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 33, Array index 0x0500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xA156,0xA158,INVALC,INVALC,INVALC,
-	0xA1A5,0xA1A6,INVALC,INVALC,0xA1A7,0xA1A8,INVALC,INVALC,
-	INVALC,INVALC,0xA145,INVALC,INVALC,0xA14C,0xA14B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xA1AC,INVALC,INVALC,0xA1AB,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xA1B0,INVALC,INVALC,0xA1C2,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 34, Array index 0x0600 */
-	INVALC,INVALC,INVALC,0xA24A,INVALC,0xA1C1,INVALC,INVALC,
-	INVALC,0xA24B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xA2B9,0xA2BA,0xA2BB,0xA2BC,0xA2BD,0xA2BE,0xA2BF,0xA2C0,
-	0xA2C1,0xA2C2,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xA1F6,0xA1F4,0xA1F7,0xA1F5,INVALC,INVALC,0xA1F8,0xA1F9,
-	0xA1FB,0xA1FA,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 35, Array index 0x0700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xA1D4,INVALC,INVALC,INVALC,0xA1DB,0xA1E8,
-	0xA1E7,INVALC,INVALC,0xA1FD,INVALC,0xA1FC,INVALC,INVALC,
-	INVALC,0xA1E4,0xA1E5,0xA1EC,INVALC,INVALC,0xA1ED,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA1EF,0xA1EE,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA1E3,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xA1DC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xA1DA,0xA1DD,INVALC,INVALC,INVALC,INVALC,0xA1D8,0xA1D9,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xA1E6,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xA1E9,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 37, Array index 0x0800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xC7E9,0xC7EA,0xC7EB,0xC7EC,0xC7ED,0xC7EE,0xC7EF,0xC7F0,
-	0xC7F1,0xC7F2,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xC7F3,0xC7F4,0xC7F5,0xC7F6,
-	0xC7F7,0xC7F8,0xC7F9,0xC7FA,0xC7FB,0xC7FC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 38, Array index 0x0900 */
-	0xA277,INVALC,0xA278,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA27A,INVALC,INVALC,INVALC,
-	0xA27B,INVALC,INVALC,INVALC,0xA27C,INVALC,INVALC,INVALC,
-	0xA27D,INVALC,INVALC,INVALC,0xA275,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA274,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA273,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA272,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA271,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xA2A4,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xA2A5,INVALC,
-	INVALC,0xA2A7,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xA2A6,INVALC,INVALC,0xA27E,0xA2A1,0xA2A3,
-	0xA2A2,0xA2AC,0xA2AD,0xA2AE,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xA262,0xA263,0xA264,0xA265,0xA266,0xA267,0xA268,
-	0xA269,0xA270,0xA26F,0xA26E,0xA26D,0xA26C,0xA26B,0xA26A,
-	INVALC,INVALC,INVALC,INVALC,0xA276,0xA279,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xA1BD,0xA1BC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xA1B6,0xA1B5,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA1BF,0xA1BE,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xA1BB,0xA1BA,
-	INVALC,INVALC,INVALC,0xA1B3,INVALC,INVALC,0xA1B7,0xA1B4,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xA2A8,0xA2A9,0xA2AB,0xA2AA,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 39, Array index 0x0A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xA1B9,0xA1B8,INVALC,
-	INVALC,0xA1F3,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xA1F0,0xA1F2,0xA1F1,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 49, Array index 0x0B00 */
-	0xA140,0xA142,0xA143,0xA1B2,INVALC,0xC6A4,INVALC,INVALC,
-	0xA171,0xA172,0xA16D,0xA16E,0xA175,0xA176,0xA179,0xA17A,
-	0xA169,0xA16A,0xA245,INVALC,0xA165,0xA166,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xA1A9,0xA1AA,INVALC,
-	INVALC,0xA2C3,0xA2C4,0xA2C5,0xA2C6,0xA2C7,0xA2C8,0xA2C9,
-	0xA2CA,0xA2CB,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xC6A5,0xC6A6,0xC6A7,0xC6A8,0xC6A9,0xC6AA,0xC6AB,
-	0xC6AC,0xC6AD,0xC6AE,0xC6AF,0xC6B0,0xC6B1,0xC6B2,0xC6B3,
-	0xC6B4,0xC6B5,0xC6B6,0xC6B7,0xC6B8,0xC6B9,0xC6BA,0xC6BB,
-	0xC6BC,0xC6BD,0xC6BE,0xC6BF,0xC6C0,0xC6C1,0xC6C2,0xC6C3,
-	0xC6C4,0xC6C5,0xC6C6,0xC6C7,0xC6C8,0xC6C9,0xC6CA,0xC6CB,
-	0xC6CC,0xC6CD,0xC6CE,0xC6CF,0xC6D0,0xC6D1,0xC6D2,0xC6D3,
-	0xC6D4,0xC6D5,0xC6D6,0xC6D7,0xC6D8,0xC6D9,0xC6DA,0xC6DB,
-	0xC6DC,0xC6DD,0xC6DE,0xC6DF,0xC6E0,0xC6E1,0xC6E2,0xC6E3,
-	0xC6E4,0xC6E5,0xC6E6,0xC6E7,0xC6E8,0xC6E9,0xC6EA,0xC6EB,
-	0xC6EC,0xC6ED,0xC6EE,0xC6EF,0xC6F0,0xC6F1,0xC6F2,0xC6F3,
-	0xC6F4,0xC6F5,0xC6F6,0xC6F7,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xC6A2,0xC6A3,INVALC,
-	INVALC,0xC6F8,0xC6F9,0xC6FA,0xC6FB,0xC6FC,0xC6FD,0xC6FE,
-	0xC740,0xC741,0xC742,0xC743,0xC744,0xC745,0xC746,0xC747,
-	0xC748,0xC749,0xC74A,0xC74B,0xC74C,0xC74D,0xC74E,0xC74F,
-	0xC750,0xC751,0xC752,0xC753,0xC754,0xC755,0xC756,0xC757,
-	0xC758,0xC759,0xC75A,0xC75B,0xC75C,0xC75D,0xC75E,0xC75F,
-	0xC760,0xC761,0xC762,0xC763,0xC764,0xC765,0xC766,0xC767,
-	0xC768,0xC769,0xC76A,0xC76B,0xC76C,0xC76D,0xC76E,0xC76F,
-	0xC770,0xC771,0xC772,0xC773,0xC774,0xC775,0xC776,0xC777,
-	0xC778,0xC779,0xC77A,0xC77B,0xC77C,0xC77D,0xC77E,0xC7A1,
-	0xC7A2,0xC7A3,0xC7A4,0xC7A5,0xC7A6,0xC7A7,0xC7A8,0xC7A9,
-	0xC7AA,0xC7AB,0xC7AC,0xC7AD,0xC7AE,0xC7AF,0xC7B0,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xC6A1,INVALC,
-	/* Block 50, Array index 0x0C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xA374,0xA375,0xA376,
-	0xA377,0xA378,0xA379,0xA37A,0xA37B,0xA37C,0xA37D,0xA37E,
-	0xA3A1,0xA3A2,0xA3A3,0xA3A4,0xA3A5,0xA3A6,0xA3A7,0xA3A8,
-	0xA3A9,0xA3AA,0xA3AB,0xA3AC,0xA3AD,0xA3AE,0xA3AF,0xA3B0,
-	0xA3B1,0xA3B2,0xA3B3,0xA3B4,0xA3B5,0xA3B6,0xA3B7,0xA3B8,
-	0xA3B9,0xA3BA,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 51, Array index 0x0D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xA1C0,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 52, Array index 0x0E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xA255,0xA256,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA250,0xA251,0xA252,INVALC,
-	INVALC,0xA254,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA257,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xA253,INVALC,
-	INVALC,0xA1EB,0xA1EA,INVALC,INVALC,0xA24F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 79, Array index 0x0F00 */
-	0xA440,0xA442,INVALC,0xA443,INVALC,INVALC,INVALC,0xC945,
-	0xA456,0xA454,0xA457,0xA455,0xC946,0xA4A3,0xC94F,0xC94D,
-	0xA4A2,0xA4A1,INVALC,INVALC,0xA542,0xA541,0xA540,INVALC,
-	0xA543,0xA4FE,INVALC,INVALC,INVALC,INVALC,0xA5E0,0xA5E1,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xA8C3,INVALC,
-	INVALC,INVALC,INVALC,0xA458,INVALC,0xA4A4,0xC950,INVALC,
-	0xA4A5,0xC963,0xA6EA,0xCBB1,INVALC,INVALC,INVALC,INVALC,
-	0xA459,0xA4A6,INVALC,0xA544,0xC964,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xC940,0xA444,INVALC,0xA45B,INVALC,0xC947,
-	0xA45C,INVALC,INVALC,0xA4A7,INVALC,0xA545,0xA547,0xA546,
-	INVALC,INVALC,0xA5E2,0xA5E3,INVALC,INVALC,0xA8C4,INVALC,
-	0xADBC,0xA441,INVALC,INVALC,0xC941,0xA445,0xA45E,0xA45D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xA5E4,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xA8C5,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xB0AE,0xD44B,
-	INVALC,INVALC,0xB6C3,0xDCB1,0xDCB2,INVALC,0xA446,INVALC,
-	0xA4A9,INVALC,INVALC,0xA8C6,0xA447,0xC948,0xA45F,INVALC,
-	INVALC,0xA4AA,0xA4AC,0xC951,0xA4AD,0xA4AB,INVALC,INVALC,
-	INVALC,0xA5E5,INVALC,0xA8C7,INVALC,INVALC,0xA8C8,0xAB45,
-	INVALC,0xA460,0xA4AE,INVALC,0xA5E6,0xA5E8,0xA5E7,INVALC,
-	0xA6EB,INVALC,INVALC,0xA8C9,0xA8CA,0xAB46,0xAB47,INVALC,
-	INVALC,INVALC,INVALC,0xADBD,INVALC,INVALC,0xDCB3,INVALC,
-	INVALC,0xF6D6,0xA448,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xA4B0,0xA4AF,0xC952,0xA4B1,0xA4B7,INVALC,0xA4B2,0xA4B3,
-	0xC954,0xC953,0xA4B5,0xA4B6,INVALC,0xA4B4,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA54A,0xA54B,0xA54C,0xA54D,
-	0xA549,0xA550,0xC96A,INVALC,0xC966,0xC969,0xA551,0xA561,
-	INVALC,0xC968,INVALC,0xA54E,0xA54F,0xA548,INVALC,INVALC,
-	0xC965,0xC967,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xA5F5,0xC9B0,0xA5F2,0xA5F6,0xC9BA,0xC9AE,0xA5F3,0xC9B2,
-	INVALC,INVALC,INVALC,0xA5F4,INVALC,0xA5F7,INVALC,0xA5E9,
-	/* Block 80, Array index 0x1000 */
-	0xC9B1,0xA5F8,0xC9B5,INVALC,0xC9B9,0xC9B6,INVALC,INVALC,
-	0xC9B3,0xA5EA,0xA5EC,0xA5F9,INVALC,0xA5EE,0xC9AB,0xA5F1,
-	0xA5EF,0xA5F0,0xC9BB,0xC9B8,0xC9AF,0xA5ED,INVALC,INVALC,
-	0xC9AC,0xA5EB,INVALC,INVALC,INVALC,0xC9B4,INVALC,INVALC,
-	INVALC,INVALC,0xC9B7,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xC9AD,0xCA66,INVALC,0xA742,
-	0xA6F4,INVALC,INVALC,0xCA67,0xA6F1,INVALC,0xA744,INVALC,
-	0xA6F9,INVALC,0xA6F8,0xCA5B,0xA6FC,0xA6F7,0xCA60,0xCA68,
-	INVALC,0xCA64,INVALC,0xA6FA,INVALC,INVALC,0xA6FD,0xA6EE,
-	0xA747,0xCA5D,INVALC,INVALC,0xCBBD,0xA6EC,0xA743,0xA6ED,
-	0xA6F5,0xA6F6,0xCA62,0xCA5E,0xA6FB,0xA6F3,0xCA5A,0xA6EF,
-	0xCA65,0xA745,0xA748,0xA6F2,0xA740,0xA746,0xA6F0,0xCA63,
-	0xA741,0xCA69,0xCA5C,0xA6FE,0xCA5F,INVALC,INVALC,0xCA61,
-	INVALC,0xA8D8,0xCBBF,0xCBCB,0xA8D0,INVALC,0xCBCC,0xA8CB,
-	0xA8D5,INVALC,INVALC,0xA8CE,0xCBB9,0xA8D6,0xCBB8,0xCBBC,
-	0xCBC3,0xCBC1,0xA8DE,0xA8D9,0xCBB3,0xCBB5,0xA8DB,0xA8CF,
-	0xCBB6,0xCBC2,0xCBC9,0xA8D4,0xCBBB,0xCBB4,0xA8D3,0xCBB7,
-	0xA8D7,0xCBBA,INVALC,0xA8D2,INVALC,0xA8CD,INVALC,0xA8DC,
-	0xCBC4,0xA8DD,0xCBC8,INVALC,0xCBC6,0xCBCA,0xA8DA,0xCBBE,
-	0xCBB2,INVALC,0xCBC0,0xA8D1,0xCBC5,0xA8CC,0xCBC7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xAB56,0xAB4A,
-	INVALC,INVALC,0xCDE0,0xCDE8,INVALC,0xAB49,0xAB51,0xAB5D,
-	INVALC,0xCDEE,0xCDEC,0xCDE7,INVALC,INVALC,INVALC,0xAB4B,
-	0xCDED,0xCDE3,0xAB59,0xAB50,0xAB58,0xCDDE,INVALC,0xCDEA,
-	INVALC,0xCDE1,0xAB54,0xCDE2,INVALC,0xCDDD,0xAB5B,0xAB4E,
-	0xAB57,0xAB4D,INVALC,0xCDDF,0xCDE4,INVALC,0xCDEB,0xAB55,
-	0xAB52,0xCDE6,0xAB5A,0xCDE9,0xCDE5,0xAB4F,0xAB5C,0xAB53,
-	0xAB4C,0xAB48,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xCDEF,INVALC,0xADD7,0xADC1,
-	INVALC,0xADD1,INVALC,0xADD6,0xD0D0,0xD0CF,0xD0D4,0xD0D5,
-	0xADC4,INVALC,0xADCD,INVALC,INVALC,INVALC,0xADDA,INVALC,
-	/* Block 81, Array index 0x1100 */
-	0xADCE,INVALC,INVALC,INVALC,INVALC,0xD0C9,0xADC7,0xD0CA,
-	INVALC,0xADDC,INVALC,0xADD3,0xADBE,0xADBF,0xD0DD,0xB0BF,
-	INVALC,0xADCC,0xADCB,0xD0CB,0xADCF,0xD45B,0xADC6,0xD0D6,
-	0xADD5,0xADD4,0xADCA,0xD0CE,0xD0D7,INVALC,0xD0C8,0xADC9,
-	0xD0D8,0xADD2,0xD0CC,0xADC0,INVALC,0xADC3,0xADC2,0xD0D9,
-	0xADD0,0xADC5,0xADD9,0xADDB,0xD0D3,0xADD8,INVALC,0xD0DB,
-	0xD0CD,0xD0DC,INVALC,0xD0D1,INVALC,0xD0DA,INVALC,0xD0D2,
-	INVALC,INVALC,INVALC,INVALC,0xADC8,INVALC,INVALC,INVALC,
-	0xD463,0xD457,INVALC,0xB0B3,INVALC,0xD45C,0xD462,0xB0B2,
-	0xD455,0xB0B6,0xD459,0xD452,0xB0B4,0xD456,0xB0B9,0xB0BE,
-	INVALC,0xD467,INVALC,0xD451,INVALC,0xB0BA,INVALC,0xD466,
-	INVALC,INVALC,0xB0B5,0xD458,0xB0B1,0xD453,0xD44F,0xD45D,
-	0xD450,0xD44E,0xD45A,0xD460,0xD461,0xB0B7,INVALC,INVALC,
-	0xD85B,0xD45E,0xD44D,0xD45F,INVALC,0xB0C1,0xD464,0xB0C0,
-	0xD44C,INVALC,0xD454,0xD465,0xB0BC,0xB0BB,0xB0B8,0xB0BD,
-	INVALC,INVALC,0xB0AF,INVALC,INVALC,0xB0B0,INVALC,INVALC,
-	0xB3C8,INVALC,0xD85E,0xD857,INVALC,0xB3C5,INVALC,0xD85F,
-	INVALC,INVALC,INVALC,0xD855,0xD858,0xB3C4,0xD859,INVALC,
-	INVALC,0xB3C7,0xD85D,INVALC,0xD853,0xD852,0xB3C9,INVALC,
-	0xB3CA,0xB3C6,0xB3CB,0xD851,0xD85C,0xD85A,0xD854,INVALC,
-	INVALC,INVALC,0xB3C3,0xD856,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xB6CA,0xB6C4,0xDCB7,0xB6CD,
-	0xDCBD,0xDCC0,0xB6C6,0xB6C7,0xDCBA,0xB6C5,0xDCC3,0xB6CB,
-	0xDCC4,INVALC,0xDCBF,0xB6CC,INVALC,0xDCB4,0xB6C9,0xDCB5,
-	INVALC,0xDCBE,0xDCBC,INVALC,0xDCB8,0xB6C8,0xDCB6,0xB6CE,
-	0xDCBB,0xDCC2,0xDCB9,0xDCC1,INVALC,INVALC,0xB9B6,0xB9B3,
-	INVALC,0xB9B4,INVALC,0xE0F9,0xE0F1,0xB9B2,0xB9AF,0xE0F2,
-	INVALC,INVALC,0xB9B1,0xE0F5,INVALC,0xE0F7,INVALC,INVALC,
-	0xE0FE,INVALC,INVALC,0xE0FD,0xE0F8,0xB9AE,0xE0F0,0xB9AC,
-	0xE0F3,0xB9B7,0xE0F6,INVALC,0xE0FA,0xB9B0,0xB9AD,0xE0FC,
-	0xE0FB,0xB9B5,INVALC,0xE0F4,INVALC,0xBBF8,0xE4EC,INVALC,
-	0xE4E9,0xBBF9,INVALC,0xBBF7,INVALC,0xE4F0,0xE4ED,0xE4E6,
-	/* Block 82, Array index 0x1200 */
-	0xBBF6,INVALC,0xBBFA,0xE4E7,0xBBF5,0xBBFD,0xE4EA,0xE4EB,
-	0xBBFB,0xBBFC,0xE4F1,0xE4EE,0xE4EF,INVALC,INVALC,INVALC,
-	0xBEAA,0xE8F8,0xBEA7,0xE8F5,0xBEA9,0xBEAB,INVALC,0xE8F6,
-	0xBEA8,INVALC,0xE8F7,INVALC,0xE8F4,INVALC,INVALC,0xC076,
-	0xECBD,0xC077,0xECBB,INVALC,0xECBC,0xECBA,0xECB9,INVALC,
-	INVALC,0xECBE,0xC075,INVALC,INVALC,0xEFB8,0xEFB9,INVALC,
-	0xE4E8,0xEFB7,0xC078,0xC35F,0xF1EB,0xF1EC,INVALC,0xC4D7,
-	0xC4D8,0xF5C1,0xF5C0,0xC56C,0xC56B,0xF7D0,INVALC,0xA449,
-	0xA461,0xA4B9,INVALC,0xA4B8,0xA553,0xA552,0xA5FC,0xA5FB,
-	0xA5FD,0xA5FA,INVALC,0xA74A,0xA749,0xA74B,INVALC,INVALC,
-	INVALC,INVALC,0xA8E0,INVALC,0xA8DF,0xA8E1,INVALC,0xAB5E,
-	INVALC,0xA259,0xD0DE,0xA25A,0xB0C2,0xA25C,0xA25B,0xD860,
-	INVALC,0xA25D,0xB9B8,0xA25E,INVALC,0xA44A,INVALC,0xA4BA,
-	0xA5FE,0xA8E2,INVALC,0xA44B,0xA4BD,0xA4BB,0xA4BC,INVALC,
-	INVALC,0xA640,INVALC,INVALC,INVALC,0xA74C,0xA8E4,0xA8E3,
-	0xA8E5,INVALC,INVALC,INVALC,0xADDD,INVALC,INVALC,INVALC,
-	0xBEAC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xC94E,
-	INVALC,0xA554,0xA555,INVALC,INVALC,0xA641,INVALC,0xCA6A,
-	INVALC,0xAB60,0xAB5F,0xD0E0,0xD0DF,0xB0C3,INVALC,0xA4BE,
-	0xC955,INVALC,INVALC,INVALC,INVALC,INVALC,0xCBCD,INVALC,
-	0xAB61,INVALC,0xADE0,INVALC,0xADDE,0xADDF,INVALC,INVALC,
-	INVALC,INVALC,0xBEAD,INVALC,0xA556,INVALC,INVALC,INVALC,
-	0xA642,0xC9BC,INVALC,INVALC,INVALC,INVALC,0xA74D,0xA74E,
-	INVALC,0xCA6B,INVALC,INVALC,0xCBCE,0xA8E6,0xCBCF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xD0E2,0xD0E3,0xADE3,INVALC,
-	0xD0E4,INVALC,0xD0E1,0xADE4,0xADE2,0xADE1,0xD0E5,INVALC,
-	0xD468,INVALC,INVALC,INVALC,0xD861,INVALC,INVALC,0xDCC5,
-	0xE140,INVALC,INVALC,INVALC,0xBBFE,0xBEAE,0xE8F9,INVALC,
-	0xA44C,0xA45A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xB0C4,0xB3CD,INVALC,0xB9B9,INVALC,0xC942,0xA4BF,INVALC,
-	0xA559,0xA557,0xA558,INVALC,INVALC,0xA8E7,INVALC,INVALC,
-	/* Block 83, Array index 0x1300 */
-	0xA44D,0xA44E,INVALC,0xA462,INVALC,INVALC,0xA4C0,0xA4C1,
-	0xA4C2,0xC9BE,0xA55A,INVALC,0xC96B,INVALC,0xA646,INVALC,
-	0xC9BF,0xA644,0xA645,0xC9BD,INVALC,INVALC,0xA647,0xA643,
-	INVALC,INVALC,INVALC,INVALC,0xCA6C,0xAAEC,0xCA6D,INVALC,
-	INVALC,0xCA6E,INVALC,INVALC,0xA750,0xA74F,INVALC,INVALC,
-	0xA753,0xA751,0xA752,INVALC,INVALC,INVALC,0xA8ED,INVALC,
-	0xA8EC,0xCBD4,0xCBD1,0xCBD2,INVALC,0xCBD0,0xA8EE,0xA8EA,
-	0xA8E9,INVALC,0xA8EB,0xA8E8,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xA8EF,INVALC,0xAB63,0xCDF0,INVALC,0xCBD3,0xAB68,
-	INVALC,0xCDF1,0xAB64,0xAB67,0xAB66,0xAB65,0xAB62,INVALC,
-	INVALC,INVALC,0xD0E8,INVALC,0xADE7,0xD0EB,0xADE5,INVALC,
-	INVALC,INVALC,0xD0E7,0xADE8,0xADE6,0xADE9,0xD0E9,0xD0EA,
-	INVALC,0xD0E6,0xD0EC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xB3D1,0xB0C5,0xD469,0xD46B,0xD46A,0xD46C,0xB0C6,
-	INVALC,INVALC,0xB3CE,INVALC,0xB3CF,0xB3D0,INVALC,0xB6D0,
-	0xDCC7,INVALC,0xDCC6,0xDCC8,0xDCC9,0xB6D1,INVALC,0xB6CF,
-	0xE141,0xE142,0xB9BB,0xB9BA,0xE35A,INVALC,INVALC,0xBC40,
-	0xBC41,0xBC42,0xBC44,0xE4F2,0xE4F3,0xBC43,INVALC,INVALC,
-	INVALC,0xBEAF,INVALC,0xBEB0,INVALC,INVALC,0xF1ED,0xF5C3,
-	0xF5C2,0xF7D1,INVALC,0xA44F,INVALC,INVALC,INVALC,0xA55C,
-	0xA55B,INVALC,INVALC,0xA648,INVALC,INVALC,0xC9C0,INVALC,
-	INVALC,0xA755,0xA756,0xA754,0xA757,0xCA6F,0xCA70,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xA8F1,0xCBD5,INVALC,0xA8F0,INVALC,
-	0xCDF2,0xAB6C,0xCDF3,0xAB6B,INVALC,INVALC,INVALC,0xAB69,
-	INVALC,0xAB6A,INVALC,INVALC,INVALC,0xD0ED,INVALC,INVALC,
-	INVALC,INVALC,0xB0C7,0xD46E,INVALC,0xB0CA,0xD46D,0xB1E5,
-	0xB0C9,0xB0C8,INVALC,0xB3D4,INVALC,0xB3D3,0xB3D2,0xB6D2,
-	INVALC,INVALC,0xB6D5,0xB6D6,0xB6D4,INVALC,0xB6D3,INVALC,
-	INVALC,0xE143,INVALC,0xE144,INVALC,INVALC,INVALC,0xE4F5,
-	0xBC45,0xE4F4,INVALC,0xBEB1,0xECBF,0xC079,INVALC,0xF1EE,
-	0xC455,INVALC,0xA463,0xA4C3,0xC956,INVALC,0xA4C4,0xA4C5,
-	/* Block 84, Array index 0x1400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xA55D,0xA55E,INVALC,
-	0xA649,0xCA71,0xCBD6,0xCBD7,INVALC,0xAB6D,0xD0EE,0xB0CC,
-	0xB0CB,0xD863,0xD862,INVALC,INVALC,0xA450,0xA4C6,0xA55F,
-	INVALC,0xB0CD,0xC943,INVALC,0xC96C,0xA560,INVALC,0xC9C2,
-	0xA64B,0xA64A,0xC9C1,0xA758,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xADEA,INVALC,INVALC,0xD46F,INVALC,0xB6D7,
-	0xE145,0xB9BC,INVALC,INVALC,0xE8FA,INVALC,INVALC,0xF3FD,
-	INVALC,0xA4C7,INVALC,INVALC,0xCBD8,0xCDF4,0xB0D0,0xB0CE,
-	0xB0CF,0xA451,INVALC,0xA464,0xA2CD,0xA4CA,INVALC,0xA4C9,
-	0xA4C8,0xA563,0xA562,INVALC,0xC96D,0xC9C3,INVALC,INVALC,
-	INVALC,0xA8F5,0xA8F2,0xA8F4,0xA8F3,INVALC,INVALC,0xAB6E,
-	INVALC,INVALC,0xB3D5,INVALC,0xA452,INVALC,0xA4CB,INVALC,
-	0xA565,0xA564,INVALC,0xCA72,INVALC,INVALC,0xA8F6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xC957,INVALC,0xA567,0xA566,
-	0xA64C,0xA64D,0xCA73,0xA759,INVALC,0xA75A,INVALC,0xA8F7,
-	0xA8F8,0xA8F9,INVALC,0xAB6F,0xCDF5,INVALC,INVALC,0xADEB,
-	INVALC,INVALC,0xC944,INVALC,0xA4CC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xC9C4,INVALC,INVALC,INVALC,0xCA74,0xCA75,
-	INVALC,INVALC,0xCBD9,INVALC,0xCBDA,INVALC,0xCDF7,0xCDF6,
-	0xCDF9,0xCDF8,0xAB70,INVALC,0xD470,0xADED,0xD0EF,0xADEC,
-	INVALC,INVALC,INVALC,INVALC,0xD864,0xB3D6,INVALC,0xD865,
-	INVALC,INVALC,INVALC,INVALC,0xE146,0xB9BD,INVALC,INVALC,
-	INVALC,INVALC,0xBC46,INVALC,0xF1EF,INVALC,INVALC,INVALC,
-	INVALC,0xC958,INVALC,0xA568,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xB0D1,INVALC,INVALC,INVALC,INVALC,
-	0xA453,0xA465,0xA4CE,0xA4CD,INVALC,0xA4CF,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA8FB,INVALC,0xA8FA,0xA8FC,
-	INVALC,INVALC,INVALC,0xAB71,INVALC,INVALC,INVALC,0xADEE,
-	INVALC,0xE8FB,0xC24F,0xA466,0xA56A,0xA579,0xA574,INVALC,
-	0xA56F,0xA56E,0xA575,0xA573,0xA56C,0xA57A,0xA56D,0xA569,
-	0xA578,0xA577,0xA576,0xA56B,INVALC,0xA572,INVALC,INVALC,
-	0xA571,INVALC,INVALC,0xA57B,0xA570,INVALC,INVALC,INVALC,
-	/* Block 85, Array index 0x1500 */
-	INVALC,0xA653,INVALC,0xA659,0xA655,INVALC,0xA65B,0xC9C5,
-	0xA658,0xA64E,0xA651,0xA654,0xA650,0xA657,0xA65A,0xA64F,
-	0xA652,0xA656,0xA65C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xCA7E,0xCA7B,INVALC,0xA767,0xCA7C,0xA75B,0xA75D,0xA775,
-	0xA770,INVALC,INVALC,INVALC,0xCAA5,0xCA7D,0xA75F,0xA761,
-	0xCAA4,0xA768,0xCA78,0xA774,0xA776,0xA75C,0xA76D,INVALC,
-	0xCA76,0xA773,INVALC,0xA764,INVALC,0xA76E,0xA76F,0xCA77,
-	0xA76C,0xA76A,INVALC,0xA76B,0xA771,0xCAA1,0xA75E,INVALC,
-	0xA772,0xCAA3,0xA766,0xA763,INVALC,0xCA7A,0xA762,0xCAA6,
-	0xA765,INVALC,0xA769,INVALC,INVALC,INVALC,0xA760,0xCAA2,
-	INVALC,INVALC,INVALC,INVALC,0xCA79,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xCBEB,0xCBEA,0xA94F,0xCBED,0xCBEF,0xCBE4,0xCBE7,0xCBEE,
-	0xA950,INVALC,INVALC,0xCBE1,0xCBE5,INVALC,INVALC,0xCBE9,
-	0xCE49,0xA94B,0xCE4D,0xA8FD,0xCBE6,0xA8FE,0xA94C,0xA945,
-	0xA941,INVALC,0xCBE2,0xA944,0xA949,0xA952,0xCBE3,0xCBDC,
-	0xA943,0xCBDD,0xCBDF,INVALC,0xA946,INVALC,0xA948,0xCBDB,
-	0xCBE0,INVALC,INVALC,0xA951,0xA94D,0xCBE8,0xA953,INVALC,
-	0xA94A,0xCBDE,0xA947,INVALC,INVALC,0xA942,0xA940,INVALC,
-	0xCBEC,INVALC,0xA94E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xCE48,0xCDFB,0xCE4B,INVALC,INVALC,0xCDFD,0xAB78,0xABA8,
-	0xAB74,0xABA7,0xAB7D,0xABA4,0xAB72,0xCDFC,0xCE43,0xABA3,
-	0xCE4F,0xABA5,INVALC,0xAB79,INVALC,INVALC,0xCE45,0xCE42,
-	0xAB77,INVALC,0xCDFA,0xABA6,0xCE4A,0xAB7C,0xCE4C,0xABA9,
-	0xAB73,0xAB7E,0xAB7B,0xCE40,0xABA1,0xCE46,0xCE47,0xAB7A,
-	0xABA2,0xAB76,INVALC,INVALC,INVALC,INVALC,0xAB75,0xCDFE,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xCE44,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xCE4E,INVALC,
-	0xD144,0xADFB,0xD0F1,INVALC,0xD0F6,0xADF4,0xAE40,0xD0F4,
-	0xADEF,0xADF9,0xADFE,0xD0FB,INVALC,0xADFA,0xADFD,INVALC,
-	INVALC,0xD0FE,0xADF5,0xD0F5,INVALC,INVALC,INVALC,0xD142,
-	0xD143,INVALC,0xADF7,0xD141,0xADF3,0xAE43,INVALC,0xD0F8,
-	/* Block 86, Array index 0x1600 */
-	INVALC,0xADF1,INVALC,0xD146,0xD0F9,0xD0FD,0xADF6,0xAE42,
-	0xD0FA,0xADFC,0xD140,0xD147,0xD4A1,INVALC,0xD145,0xAE44,
-	0xADF0,0xD0FC,0xD0F3,INVALC,0xADF8,INVALC,INVALC,0xD0F2,
-	INVALC,INVALC,0xD0F7,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xD0F0,0xAE41,
-	INVALC,INVALC,0xD477,INVALC,0xB0E4,0xD4A7,0xB0E2,0xB0DF,
-	0xD47C,0xB0DB,0xD4A2,0xB0E6,0xD476,0xD47B,0xD47A,0xADF2,
-	0xB0E1,0xD4A5,INVALC,0xD4A8,0xD473,INVALC,0xB3E8,INVALC,
-	0xD4A9,0xB0E7,INVALC,0xB0D9,0xB0D6,0xD47E,0xB0D3,INVALC,
-	0xD4A6,INVALC,0xB0DA,0xD4AA,INVALC,0xD474,0xD4A4,0xB0DD,
-	0xD475,0xD478,0xD47D,INVALC,INVALC,0xB0DE,0xB0DC,0xB0E8,
-	INVALC,INVALC,INVALC,INVALC,0xB0E3,INVALC,0xB0D7,0xB1D2,
-	INVALC,0xB0D8,0xD479,0xB0E5,0xB0E0,0xD4A3,0xB0D5,INVALC,
-	INVALC,INVALC,0xB0D4,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xD471,0xD472,0xD86A,
-	INVALC,INVALC,INVALC,0xB3D7,0xB3DA,0xD875,0xB3EE,0xD878,
-	0xB3D8,0xD871,0xB3DE,0xB3E4,0xB5BD,INVALC,INVALC,0xB3E2,
-	0xD86E,0xB3EF,0xB3DB,0xB3E3,0xD876,0xDCD7,0xD87B,0xD86F,
-	INVALC,0xD866,0xD873,0xD86D,0xB3E1,0xD879,INVALC,INVALC,
-	0xB3DD,0xB3F1,0xB3EA,INVALC,0xB3DF,0xB3DC,INVALC,0xB3E7,
-	INVALC,0xD87A,0xD86C,0xD872,0xD874,0xD868,0xD877,0xB3D9,
-	0xD867,INVALC,0xB3E0,0xB3F0,0xB3EC,0xD869,0xB3E6,INVALC,
-	INVALC,0xB3ED,0xB3E9,0xB3E5,INVALC,0xD870,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xB3EB,INVALC,INVALC,INVALC,0xDCD5,
-	0xDCD1,INVALC,0xDCE0,0xDCCA,0xDCD3,0xB6E5,0xB6E6,0xB6DE,
-	0xDCDC,0xB6E8,0xDCCF,0xDCCE,0xDCCC,0xDCDE,0xB6DC,0xDCD8,
-	0xDCCD,0xB6DF,0xDCD6,0xB6DA,0xDCD2,0xDCD9,0xDCDB,INVALC,
-	INVALC,0xDCDF,0xB6E3,0xDCCB,0xB6DD,0xDCD0,INVALC,0xB6D8,
-	INVALC,0xB6E4,0xDCDA,0xB6E0,0xB6E1,0xB6E7,0xB6DB,0xA25F,
-	0xB6D9,0xDCD4,INVALC,INVALC,INVALC,INVALC,INVALC,0xB6E2,
-	INVALC,INVALC,0xDCDD,INVALC,INVALC,INVALC,0xB9CD,0xB9C8,
-	INVALC,0xE155,0xE151,INVALC,0xE14B,0xB9C2,0xB9BE,0xE154,
-	/* Block 87, Array index 0x1700 */
-	0xB9BF,0xE14E,0xE150,INVALC,0xE153,INVALC,0xB9C4,INVALC,
-	0xB9CB,0xB9C5,INVALC,INVALC,0xE149,0xB9C6,0xB9C7,0xE14C,
-	0xB9CC,INVALC,0xE14A,0xE14F,0xB9C3,0xE148,0xB9C9,0xB9C1,
-	INVALC,INVALC,INVALC,0xB9C0,0xE14D,0xE152,INVALC,0xB9CA,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xE147,
-	INVALC,0xBC4D,0xE547,INVALC,0xE544,INVALC,0xBC47,0xBC53,
-	0xBC54,INVALC,0xBC4A,0xE542,0xBC4C,0xE4F9,0xBC52,INVALC,
-	0xE546,0xBC49,0xE548,0xBC48,INVALC,0xE543,0xE545,0xBC4B,
-	0xE541,0xE4FA,0xE4F7,INVALC,INVALC,0xD86B,0xE4FD,INVALC,
-	0xE4F6,0xE4FC,0xE4FB,INVALC,0xE4F8,INVALC,0xBC4F,INVALC,
-	INVALC,INVALC,INVALC,0xBC4E,INVALC,INVALC,INVALC,0xBC50,
-	0xE4FE,0xBEB2,0xE540,INVALC,INVALC,INVALC,0xE945,INVALC,
-	0xE8FD,INVALC,0xBEBE,0xE942,0xBEB6,0xBEBA,0xE941,INVALC,
-	0xBEB9,0xBEB5,0xBEB8,0xBEB3,0xBEBD,0xE943,0xE8FE,0xBEBC,
-	0xE8FC,0xBEBB,0xE944,0xE940,0xBC51,INVALC,0xBEBF,0xE946,
-	0xBEB7,0xBEB4,INVALC,INVALC,INVALC,INVALC,0xECC6,0xECC8,
-	0xC07B,0xECC9,0xECC7,0xECC5,0xECC4,0xC07D,0xECC3,0xC07E,
-	INVALC,INVALC,INVALC,INVALC,0xECC1,0xECC2,0xC07A,0xC0A1,
-	0xC07C,INVALC,INVALC,0xECC0,INVALC,0xC250,INVALC,0xEFBC,
-	0xEFBA,0xEFBF,0xEFBD,INVALC,0xEFBB,0xEFBE,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xC360,0xF1F2,0xF1F3,
-	0xC456,INVALC,0xF1F4,0xF1F0,0xF1F5,0xF1F1,0xC251,INVALC,
-	INVALC,INVALC,0xF3FE,0xF441,0xC459,0xF440,0xC458,0xC457,
-	INVALC,INVALC,INVALC,INVALC,0xC45A,0xF5C5,0xF5C6,INVALC,
-	0xC4DA,0xC4D9,0xC4DB,0xF5C4,INVALC,0xF6D8,0xF6D7,INVALC,
-	0xC56D,0xC56F,0xC56E,0xF6D9,0xC5C8,0xF8A6,INVALC,INVALC,
-	INVALC,0xC5F1,INVALC,0xF8A5,0xF8EE,INVALC,INVALC,0xC949,
-	INVALC,INVALC,0xA57D,0xA57C,INVALC,0xA65F,0xA65E,0xC9C7,
-	0xA65D,0xC9C6,INVALC,INVALC,0xA779,0xCAA9,INVALC,0xCAA8,
-	INVALC,INVALC,0xA777,0xA77A,INVALC,INVALC,0xCAA7,INVALC,
-	0xA778,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xCBF0,
-	INVALC,0xCBF1,0xA954,INVALC,INVALC,INVALC,INVALC,0xABAA,
-	/* Block 88, Array index 0x1800 */
-	INVALC,0xD148,0xD149,0xAE45,0xAE46,INVALC,INVALC,0xD4AC,
-	0xB0E9,0xB0EB,0xD4AB,0xB0EA,0xD87C,0xB3F2,INVALC,INVALC,
-	INVALC,INVALC,0xB6E9,0xB6EA,0xDCE1,INVALC,0xB9CF,INVALC,
-	0xB9CE,INVALC,0xE549,0xE948,0xE947,INVALC,0xF96B,0xA467,
-	0xC959,INVALC,0xC96E,0xC96F,INVALC,INVALC,INVALC,INVALC,
-	0xA662,0xA666,0xC9C9,INVALC,0xA664,0xA663,0xC9C8,0xA665,
-	0xA661,INVALC,INVALC,0xA660,0xC9CA,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xA7A6,INVALC,INVALC,0xA7A3,INVALC,
-	0xA77D,0xCAAA,INVALC,INVALC,INVALC,0xCAAB,INVALC,0xA7A1,
-	INVALC,0xCAAD,0xA77B,0xCAAE,0xCAAC,0xA77E,0xA7A2,0xA7A5,
-	0xA7A4,0xA77C,0xCAAF,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xA959,0xCBFE,INVALC,0xA95B,INVALC,0xA95A,INVALC,
-	0xCC40,0xA958,0xA957,0xCBF5,INVALC,0xCBF4,INVALC,0xCBF2,
-	0xCBF7,0xCBF6,0xCBF3,0xCBFC,0xCBFD,0xCBFA,0xCBF8,0xA956,
-	INVALC,INVALC,INVALC,0xCBFB,0xA95C,0xCC41,INVALC,INVALC,
-	0xCBF9,INVALC,0xABAB,0xA955,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xABAC,0xCE54,INVALC,INVALC,0xCE5A,
-	INVALC,INVALC,INVALC,0xABB2,0xCE58,0xCE5E,INVALC,0xCE55,
-	0xCE59,0xCE5B,0xCE5D,0xCE57,INVALC,0xCE56,0xCE51,0xCE52,
-	0xABAD,INVALC,0xABAF,0xABAE,0xCE53,0xCE5C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xABB1,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xCE50,0xD153,INVALC,
-	0xD152,0xD157,0xD14E,INVALC,0xD151,0xD150,INVALC,0xD154,
-	INVALC,0xD158,0xAE47,0xAE4A,INVALC,INVALC,0xD14F,0xD155,
-	INVALC,INVALC,INVALC,0xAE49,0xD14A,INVALC,0xABB0,0xD4BA,
-	0xD156,INVALC,0xD14D,INVALC,0xAE48,0xD14C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xD4B1,INVALC,INVALC,0xB0EC,
-	0xB0F0,0xD4C1,0xD4AF,0xD4BD,0xB0F1,0xD4BF,INVALC,0xD4C5,
-	INVALC,0xD4C9,INVALC,INVALC,0xD4C0,0xD4B4,0xD4BC,INVALC,
-	0xD4CA,0xD4C8,0xD4BE,0xD4B9,0xD4B2,0xD8A6,0xD4B0,0xB0F5,
-	0xD4B7,0xB0F6,0xB0F2,0xD4AD,0xD4C3,0xD4B5,INVALC,INVALC,
-	/* Block 89, Array index 0x1900 */
-	0xD4B3,0xD4C6,0xB0F3,INVALC,0xD4CC,0xB0ED,0xB0EF,0xD4BB,
-	0xD4B6,0xAE4B,0xB0EE,0xD4B8,0xD4C7,0xD4CB,0xD4C2,INVALC,
-	0xD4C4,INVALC,INVALC,INVALC,0xD4AE,INVALC,INVALC,INVALC,
-	INVALC,0xD8A1,INVALC,0xD8AA,0xD8A9,0xB3FA,0xD8A2,INVALC,
-	0xB3FB,0xB3F9,INVALC,0xD8A4,0xB3F6,0xD8A8,INVALC,0xD8A3,
-	0xD8A5,0xD87D,0xB3F4,INVALC,0xD8B2,0xD8B1,0xD8AE,0xB3F3,
-	0xB3F7,0xB3F8,0xD14B,0xD8AB,0xB3F5,0xB0F4,0xD8AD,0xD87E,
-	0xD8B0,0xD8AF,INVALC,0xD8B3,INVALC,0xDCEF,INVALC,0xD8AC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xD8A7,0xDCE7,0xB6F4,0xB6F7,0xB6F2,0xDCE6,0xDCEA,0xDCE5,
-	INVALC,0xB6EC,0xB6F6,0xDCE2,0xB6F0,0xDCE9,INVALC,0xB6EE,
-	0xB6ED,0xDCEC,0xB6EF,0xDCEE,INVALC,0xDCEB,0xB6EB,INVALC,
-	INVALC,INVALC,0xB6F5,0xDCF0,0xDCE4,0xDCED,INVALC,INVALC,
-	0xDCE3,INVALC,INVALC,0xB6F1,INVALC,0xB6F3,INVALC,0xDCE8,
-	INVALC,0xDCF1,INVALC,INVALC,0xE15D,0xB9D0,0xE163,INVALC,
-	INVALC,0xB9D5,0xE15F,0xE166,0xE157,0xB9D7,0xB9D1,0xE15C,
-	0xBC55,0xE15B,0xE164,0xB9D2,INVALC,0xB9D6,0xE15A,0xE160,
-	0xE165,0xE156,0xB9D4,0xE15E,INVALC,INVALC,0xE162,0xE168,
-	0xE158,0xE161,INVALC,0xB9D3,0xE167,INVALC,INVALC,INVALC,
-	0xE159,INVALC,INVALC,INVALC,0xBC59,0xE54B,0xBC57,0xBC56,
-	0xE54D,0xE552,INVALC,0xE54E,INVALC,0xE551,0xBC5C,INVALC,
-	0xBEA5,0xBC5B,INVALC,0xE54A,0xE550,INVALC,0xBC5A,0xE54F,
-	INVALC,0xE54C,INVALC,0xBC58,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xE94D,INVALC,0xE94F,0xE94A,0xBEC1,0xE94C,
-	INVALC,0xBEC0,0xE94E,INVALC,INVALC,0xBEC3,0xE950,0xBEC2,
-	0xE949,0xE94B,INVALC,INVALC,INVALC,INVALC,0xC0A5,0xECCC,
-	INVALC,0xC0A4,0xECCD,0xC0A3,0xECCB,0xC0A2,0xECCA,INVALC,
-	0xC253,0xC252,0xF1F6,0xF1F8,INVALC,0xF1F7,0xC361,0xC362,
-	INVALC,INVALC,0xC363,0xF442,0xC45B,INVALC,INVALC,0xF7D3,
-	0xF7D2,0xC5F2,INVALC,0xA468,0xA4D0,INVALC,INVALC,0xA7A7,
-	INVALC,INVALC,INVALC,INVALC,0xCE5F,INVALC,INVALC,INVALC,
-	INVALC,0xB3FC,0xB3FD,INVALC,0xDCF2,0xB9D8,0xE169,0xE553,
-	/* Block 90, Array index 0x1A00 */
-	INVALC,INVALC,INVALC,0xC95A,INVALC,INVALC,0xCAB0,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xCC42,0xCE60,0xD159,0xAE4C,
-	INVALC,INVALC,0xF1F9,INVALC,0xC4DC,0xA469,0xA57E,0xC970,
-	INVALC,0xA667,0xA668,INVALC,0xA95D,INVALC,INVALC,INVALC,
-	0xB0F7,INVALC,0xB9DA,INVALC,0xB9DB,0xB9D9,INVALC,0xA46A,
-	INVALC,0xA4D1,0xA4D3,0xA4D2,0xC95B,0xA4D4,0xA5A1,0xC971,
-	INVALC,0xA5A2,INVALC,INVALC,INVALC,INVALC,INVALC,0xA669,
-	0xA66A,INVALC,INVALC,INVALC,0xC9CB,INVALC,0xA7A8,INVALC,
-	0xCAB1,INVALC,INVALC,INVALC,0xA961,0xCC43,INVALC,0xA95F,
-	0xA960,0xA95E,0xD15A,INVALC,INVALC,INVALC,0xABB6,0xABB5,
-	0xABB7,0xABB4,INVALC,0xCE61,0xA962,0xABB3,INVALC,0xAE4D,
-	0xAE4E,INVALC,0xAE4F,INVALC,0xD4CD,INVALC,INVALC,INVALC,
-	0xB3FE,0xD8B4,0xB0F8,INVALC,INVALC,INVALC,INVALC,0xB6F8,
-	INVALC,0xB9DD,0xB9DC,0xE16A,INVALC,0xBC5D,0xBEC4,INVALC,
-	0xEFC0,0xF6DA,0xF7D4,0xA46B,0xA5A3,INVALC,0xA5A4,0xC9D1,
-	0xA66C,0xA66F,INVALC,0xC9CF,0xC9CD,0xA66E,0xC9D0,0xC9D2,
-	0xC9CC,0xA671,0xA670,0xA66D,0xA66B,0xC9CE,INVALC,INVALC,
-	INVALC,INVALC,0xA7B3,INVALC,INVALC,0xA7B0,0xCAB6,0xCAB9,
-	0xCAB8,INVALC,0xA7AA,0xA7B2,INVALC,INVALC,0xA7AF,0xCAB5,
-	0xCAB3,0xA7AE,INVALC,INVALC,INVALC,0xA7A9,0xA7AC,INVALC,
-	0xCAB4,0xCABB,0xCAB7,0xA7AD,0xA7B1,0xA7B4,0xCAB2,0xCABA,
-	0xA7AB,INVALC,INVALC,INVALC,INVALC,INVALC,0xA967,0xA96F,
-	INVALC,0xCC4F,0xCC48,0xA970,0xCC53,0xCC44,0xCC4B,INVALC,
-	INVALC,0xA966,0xCC45,0xA964,0xCC4C,0xCC50,0xA963,INVALC,
-	0xCC51,0xCC4A,INVALC,0xCC4D,INVALC,0xA972,0xA969,0xCC54,
-	0xCC52,INVALC,0xA96E,0xA96C,0xCC49,0xA96B,0xCC47,0xCC46,
-	0xA96A,0xA968,0xA971,0xA96D,0xA965,INVALC,0xCC4E,INVALC,
-	0xABB9,INVALC,0xABC0,0xCE6F,0xABB8,0xCE67,0xCE63,INVALC,
-	0xCE73,0xCE62,INVALC,0xABBB,0xCE6C,0xABBE,0xABC1,INVALC,
-	0xABBC,0xCE70,0xABBF,INVALC,0xAE56,0xCE76,0xCE64,INVALC,
-	INVALC,0xCE66,0xCE6D,0xCE71,0xCE75,0xCE72,0xCE6B,0xCE6E,
-	INVALC,INVALC,0xCE68,0xABC3,0xCE6A,0xCE69,0xCE74,0xABBA,
-	/* Block 91, Array index 0x1B00 */
-	0xCE65,0xABC2,INVALC,0xABBD,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xAE5C,0xD162,INVALC,0xAE5B,INVALC,INVALC,0xD160,
-	INVALC,0xAE50,INVALC,0xAE55,INVALC,0xD15F,0xD15C,0xD161,
-	0xAE51,0xD15B,INVALC,0xAE54,0xAE52,INVALC,0xD163,0xAE53,
-	0xAE57,INVALC,INVALC,0xAE58,INVALC,0xAE5A,INVALC,INVALC,
-	INVALC,0xAE59,INVALC,INVALC,INVALC,0xD15D,0xD15E,INVALC,
-	INVALC,INVALC,INVALC,0xD164,INVALC,0xD4D4,0xB0F9,0xD8C2,
-	0xD4D3,0xD4E6,INVALC,INVALC,0xB140,INVALC,0xD4E4,INVALC,
-	0xB0FE,0xB0FA,0xD4ED,0xD4DD,0xD4E0,INVALC,0xB143,0xD4EA,
-	0xD4E2,0xB0FB,0xB144,INVALC,0xD4E7,0xD4E5,INVALC,INVALC,
-	0xD4D6,0xD4EB,0xD4DF,0xD4DA,INVALC,0xD4D0,0xD4EC,0xD4DC,
-	0xD4CF,INVALC,0xB142,0xD4E1,0xD4EE,0xD4DE,0xD4D2,0xD4D7,
-	0xD4CE,INVALC,0xB141,INVALC,0xD4DB,0xD4D8,0xB0FC,0xD4D1,
-	INVALC,0xD4E9,0xB0FD,INVALC,0xD4D9,0xD4D5,INVALC,INVALC,
-	0xD4E8,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xB440,
-	0xD8BB,INVALC,0xD8B8,0xD8C9,0xD8BD,0xD8CA,INVALC,0xB442,
-	INVALC,INVALC,INVALC,0xD8C6,0xD8C3,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xD8C4,0xD8C7,0xD8CB,INVALC,0xD4E3,0xD8CD,
-	0xDD47,INVALC,0xB443,0xD8CE,0xD8B6,0xD8C0,INVALC,0xD8C5,
-	INVALC,INVALC,0xB441,0xB444,0xD8CC,0xD8CF,0xD8BA,0xD8B7,
-	INVALC,INVALC,0xD8B9,INVALC,INVALC,0xD8BE,0xD8BC,0xB445,
-	INVALC,0xD8C8,INVALC,INVALC,0xD8BF,INVALC,0xD8C1,0xD8B5,
-	0xDCFA,0xDCF8,0xB742,0xB740,0xDD43,0xDCF9,0xDD44,0xDD40,
-	0xDCF7,0xDD46,0xDCF6,0xDCFD,0xB6FE,0xB6FD,0xB6FC,0xDCFB,
-	0xDD41,0xB6F9,0xB741,INVALC,0xDCF4,INVALC,0xDCFE,0xDCF3,
-	0xDCFC,0xB6FA,0xDD42,0xDCF5,0xB6FB,0xDD45,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xE16E,0xB9E2,0xB9E1,
-	0xB9E3,0xE17A,0xE170,0xE176,0xE16B,0xE179,0xE178,0xE17C,
-	0xE175,0xB9DE,0xE174,0xB9E4,INVALC,0xE16D,0xB9DF,INVALC,
-	0xE17B,0xB9E0,0xE16F,0xE172,0xE177,0xE171,0xE16C,INVALC,
-	INVALC,INVALC,INVALC,0xE173,0xE555,0xBC61,0xE558,0xE557,
-	0xE55A,0xE55C,INVALC,0xBC5F,INVALC,0xE556,INVALC,0xE554,
-	/* Block 92, Array index 0x1C00 */
-	INVALC,0xE55D,0xE55B,0xE559,INVALC,0xE55F,INVALC,0xE55E,
-	0xBC63,0xBC5E,INVALC,0xBC60,0xBC62,INVALC,INVALC,0xE560,
-	0xE957,INVALC,INVALC,0xE956,0xE955,INVALC,0xE958,0xE951,
-	INVALC,0xE952,0xE95A,0xE953,INVALC,0xBEC5,0xE95C,INVALC,
-	0xE95B,0xE954,INVALC,0xECD1,0xC0A8,0xECCF,0xECD4,0xECD3,
-	0xE959,INVALC,0xC0A7,INVALC,0xECD2,0xECCE,0xECD6,0xECD5,
-	0xC0A6,INVALC,0xECD0,INVALC,0xBEC6,INVALC,INVALC,INVALC,
-	0xC254,INVALC,INVALC,INVALC,0xEFC1,0xF1FA,0xF1FB,0xF1FC,
-	0xC45C,INVALC,INVALC,0xC45D,INVALC,0xF443,INVALC,0xF5C8,
-	0xF5C7,INVALC,INVALC,0xF6DB,0xF6DC,0xF7D5,0xF8A7,INVALC,
-	0xA46C,0xA46D,INVALC,0xA46E,0xA4D5,0xA5A5,0xC9D3,0xA672,
-	0xA673,INVALC,0xA7B7,0xA7B8,0xA7B6,0xA7B5,INVALC,0xA973,
-	INVALC,INVALC,0xCC55,0xA975,0xA974,0xCC56,INVALC,INVALC,
-	INVALC,0xABC4,INVALC,0xAE5D,0xD165,INVALC,0xD4F0,INVALC,
-	0xB145,0xB447,0xD4EF,0xB446,INVALC,0xB9E5,INVALC,0xE17D,
-	0xBEC7,INVALC,0xC0A9,0xECD7,INVALC,0xC45E,INVALC,0xC570,
-	INVALC,0xC972,INVALC,0xA5A6,0xC973,0xA676,INVALC,0xA674,
-	0xA675,0xA677,INVALC,0xA7BA,0xA7B9,INVALC,0xCABC,0xA7BB,
-	INVALC,INVALC,0xCABD,0xCC57,INVALC,0xCC58,INVALC,0xA976,
-	0xA978,0xA97A,0xA977,0xA97B,0xA979,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xABC8,0xABC5,0xABC7,0xABC9,0xABC6,0xD166,
-	0xCE77,INVALC,INVALC,INVALC,0xD168,0xD167,0xAE63,INVALC,
-	0xAE5F,INVALC,INVALC,0xAE60,0xAE62,0xAE64,0xAE61,INVALC,
-	0xAE66,0xAE65,INVALC,INVALC,INVALC,INVALC,INVALC,0xB14A,
-	0xD4F2,0xD4F1,0xB149,INVALC,0xB148,0xB147,0xB14B,0xB146,
-	INVALC,INVALC,0xD8D5,0xD8D2,0xB449,0xD8D1,0xD8D6,INVALC,
-	0xB44B,0xD8D4,0xB448,0xB44A,0xD8D3,INVALC,0xDD48,INVALC,
-	0xDD49,0xDD4A,INVALC,INVALC,INVALC,INVALC,0xB9E6,0xB9EE,
-	0xE17E,0xB9E8,0xB9EC,0xE1A1,0xB9ED,0xB9E9,0xB9EA,0xB9E7,
-	0xB9EB,0xBC66,0xD8D0,0xBC67,0xBC65,INVALC,0xBC64,0xE95D,
-	0xBEC8,0xECD8,0xECD9,INVALC,INVALC,0xC364,0xC45F,INVALC,
-	0xA46F,INVALC,0xA678,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 93, Array index 0x1D00 */
-	INVALC,0xABCA,INVALC,0xD169,0xAE67,INVALC,INVALC,0xB14E,
-	0xB14D,0xB14C,0xB44C,0xB44D,0xD8D7,0xB9EF,0xBEC9,0xA470,
-	0xC95C,0xA4D6,0xC974,INVALC,INVALC,0xC9D4,0xA679,INVALC,
-	INVALC,INVALC,0xA97C,INVALC,INVALC,INVALC,INVALC,0xDD4B,
-	INVALC,INVALC,0xA471,INVALC,0xA4D7,0xC9D5,INVALC,INVALC,
-	0xCABE,INVALC,0xCABF,INVALC,0xA7BC,INVALC,INVALC,INVALC,
-	0xD8D8,0xB44E,INVALC,0xDD4C,INVALC,INVALC,INVALC,0xC0AA,
-	0xA472,0xA4A8,0xA4D8,0xC975,0xA5A7,INVALC,0xA7C0,0xA7BF,
-	0xA7BD,0xA7BE,INVALC,INVALC,0xCC59,0xA97E,0xA9A1,0xCC5A,
-	0xA97D,INVALC,INVALC,0xABCE,0xCE78,0xABCD,0xABCB,0xABCC,
-	0xAE6A,0xAE68,INVALC,INVALC,0xD16B,0xAE69,0xD16A,INVALC,
-	0xAE5E,0xD4F3,INVALC,INVALC,0xB150,0xB151,INVALC,INVALC,
-	0xB14F,INVALC,0xB9F0,0xE1A2,0xBC68,0xBC69,INVALC,0xE561,
-	0xC0AB,0xEFC2,0xEFC3,INVALC,0xC4DD,0xF8A8,0xC94B,0xA4D9,
-	INVALC,0xA473,INVALC,0xC977,0xC976,INVALC,INVALC,INVALC,
-	INVALC,0xA67A,0xC9D7,0xC9D8,0xC9D6,INVALC,0xC9D9,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xCAC7,INVALC,
-	0xCAC2,0xCAC4,0xCAC6,0xCAC3,0xA7C4,0xCAC0,INVALC,0xCAC1,
-	0xA7C1,0xA7C2,0xCAC5,0xCAC8,0xA7C3,0xCAC9,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xCC68,INVALC,0xCC62,
-	0xCC5D,0xA9A3,0xCC65,0xCC63,0xCC5C,0xCC69,0xCC6C,0xCC67,
-	0xCC60,0xA9A5,0xCC66,0xA9A6,0xCC61,0xCC64,0xCC5B,0xCC5F,
-	0xCC6B,0xA9A7,INVALC,0xA9A8,INVALC,0xCC5E,0xCC6A,0xA9A2,
-	0xA9A4,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xCEAB,0xCEA4,
-	0xCEAA,0xCEA3,0xCEA5,0xCE7D,0xCE7B,INVALC,0xCEAC,0xCEA9,
-	0xCE79,INVALC,0xABD0,0xCEA7,0xCEA8,INVALC,0xCEA6,0xCE7C,
-	0xCE7A,0xABCF,0xCEA2,0xCE7E,INVALC,INVALC,0xCEA1,0xCEAD,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xAE6F,INVALC,0xAE6E,INVALC,0xD16C,0xAE6B,0xD16E,INVALC,
-	0xAE70,0xD16F,INVALC,INVALC,0xAE73,INVALC,0xAE71,0xD170,
-	0xCEAE,0xD172,INVALC,0xAE6D,INVALC,0xAE6C,INVALC,0xD16D,
-	/* Block 94, Array index 0x1E00 */
-	0xD171,0xAE72,INVALC,INVALC,INVALC,INVALC,0xB153,0xB152,
-	INVALC,INVALC,INVALC,0xD4F5,0xD4F9,0xD4FB,0xB154,0xD4FE,
-	INVALC,0xB158,0xD541,INVALC,0xB15A,INVALC,0xB156,0xB15E,
-	INVALC,0xB15B,0xD4F7,0xB155,INVALC,0xD4F6,0xD4F4,0xD543,
-	0xD4F8,INVALC,0xB157,0xD542,0xB15C,0xD4FD,0xD4FC,0xB15D,
-	0xD4FA,0xB159,INVALC,INVALC,INVALC,INVALC,0xD544,INVALC,
-	0xD540,0xD8E7,0xD8EE,0xD8E3,0xB451,0xD8DF,0xD8EF,0xD8D9,
-	0xD8EC,0xD8EA,0xD8E4,INVALC,0xD8ED,0xD8E6,INVALC,0xD8DE,
-	0xD8F0,0xD8DC,0xD8E9,0xD8DA,INVALC,0xD8F1,INVALC,0xB452,
-	INVALC,0xD8EB,0xDD4F,0xD8DD,0xB44F,INVALC,0xD8E1,INVALC,
-	0xB450,0xD8E0,0xD8E5,INVALC,INVALC,0xD8E2,INVALC,INVALC,
-	INVALC,0xD8E8,INVALC,INVALC,INVALC,INVALC,0xDD53,INVALC,
-	INVALC,INVALC,0xDD56,0xDD4E,INVALC,0xDD50,INVALC,0xDD55,
-	0xDD54,0xB743,INVALC,0xD8DB,0xDD52,INVALC,INVALC,0xB744,
-	INVALC,0xDD4D,0xDD51,INVALC,INVALC,INVALC,INVALC,0xE1A9,
-	INVALC,0xE1B0,0xE1A7,INVALC,0xE1AE,0xE1A5,0xE1AD,0xE1B1,
-	0xE1A4,0xE1A8,0xE1A3,INVALC,0xB9F1,INVALC,0xE1A6,0xB9F2,
-	0xE1AC,0xE1AB,0xE1AA,INVALC,INVALC,0xE1AF,INVALC,INVALC,
-	INVALC,INVALC,0xE565,0xE567,0xBC6B,0xE568,INVALC,0xE563,
-	INVALC,0xE562,0xE56C,INVALC,0xE56A,0xBC6A,0xE56D,0xE564,
-	0xE569,0xE56B,0xE566,INVALC,INVALC,INVALC,INVALC,0xE961,
-	0xE966,0xE960,0xE965,INVALC,0xE95E,0xE968,0xE964,0xE969,
-	0xE963,0xE95F,0xE967,INVALC,0xE96A,0xE962,INVALC,0xECDA,
-	0xC0AF,INVALC,0xC0AD,INVALC,0xC0AC,0xC0AE,INVALC,INVALC,
-	0xEFC4,INVALC,0xF172,0xF1FD,INVALC,INVALC,0xF444,0xF445,
-	INVALC,0xC460,INVALC,0xF5C9,INVALC,0xC4DE,INVALC,0xF5CA,
-	INVALC,0xF6DE,0xC572,INVALC,0xC571,0xF6DD,0xC5C9,INVALC,
-	0xF7D6,INVALC,INVALC,INVALC,INVALC,0xA474,0xA67B,0xC9DA,
-	0xCACA,0xA8B5,0xB15F,INVALC,INVALC,0xA475,0xA5AA,0xA5A9,
-	0xA5A8,INVALC,INVALC,0xA7C5,INVALC,INVALC,0xAE74,INVALC,
-	0xDD57,0xA476,0xA477,0xA478,0xA4DA,INVALC,INVALC,0xABD1,
-	INVALC,0xCEAF,INVALC,INVALC,INVALC,0xB453,0xA479,0xC95D,
-	/* Block 95, Array index 0x1F00 */
-	INVALC,INVALC,0xA5AB,0xA5AC,0xC978,INVALC,0xA67C,INVALC,
-	INVALC,INVALC,0xCACB,INVALC,0xA7C6,INVALC,0xCACC,INVALC,
-	INVALC,0xA9AE,INVALC,INVALC,0xCC6E,0xA9AC,0xA9AB,0xCC6D,
-	0xA9A9,0xCC6F,0xA9AA,0xA9AD,INVALC,0xABD2,INVALC,0xABD4,
-	0xCEB3,0xCEB0,0xCEB1,0xCEB2,0xCEB4,0xABD3,INVALC,INVALC,
-	0xD174,0xD173,INVALC,0xAE76,INVALC,0xAE75,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xB162,0xD546,INVALC,0xB161,0xB163,
-	0xB160,INVALC,INVALC,INVALC,INVALC,0xB455,0xD545,INVALC,
-	0xB456,0xD8F3,INVALC,0xB457,0xD8F2,0xB454,INVALC,INVALC,
-	INVALC,INVALC,0xDD5A,0xDD5C,0xB745,0xDD5B,0xDD59,0xDD58,
-	INVALC,INVALC,INVALC,0xE1B4,0xB9F7,0xB9F5,INVALC,0xB9F6,
-	0xE1B2,0xE1B3,INVALC,0xB9F3,0xE571,0xE56F,INVALC,0xBC6D,
-	0xE570,0xBC6E,0xBC6C,0xB9F4,INVALC,INVALC,0xE96D,0xE96B,
-	0xE96C,0xE56E,0xECDC,0xC0B0,0xECDB,0xEFC5,0xEFC6,0xE96E,
-	0xF1FE,INVALC,0xA47A,0xA5AD,0xA67E,0xC9DB,0xA67D,INVALC,
-	0xA9AF,0xB746,INVALC,0xA4DB,0xA5AE,0xABD5,0xB458,INVALC,
-	0xC979,INVALC,0xC97A,INVALC,0xC9DC,INVALC,INVALC,0xA7C8,
-	0xCAD0,0xCACE,0xA7C9,0xCACD,0xCACF,0xCAD1,INVALC,0xA7C7,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xA9B3,0xA9B4,0xA9B1,
-	INVALC,INVALC,0xA9B0,0xCEB8,0xA9B2,INVALC,INVALC,INVALC,
-	0xABD6,INVALC,0xCEB7,0xCEB9,0xCEB6,0xCEBA,0xABD7,0xAE79,
-	0xD175,INVALC,0xD177,0xAE77,0xD178,0xAE78,0xD176,INVALC,
-	0xCEB5,0xD547,0xD54A,0xD54B,0xD548,0xB167,0xB166,0xB164,
-	0xB165,0xD549,INVALC,INVALC,INVALC,INVALC,0xB168,INVALC,
-	INVALC,0xB45A,0xB45B,INVALC,0xB45C,0xDD5D,0xDD5F,0xDD61,
-	0xB748,0xB747,0xB459,0xDD60,0xDD5E,INVALC,0xE1B8,INVALC,
-	INVALC,0xE1B6,0xE1BC,0xB9F8,0xE1BD,0xE1BA,0xB9F9,0xE1B7,
-	0xE1B5,0xE1BB,0xBC70,0xE573,0xE1B9,0xBC72,0xE574,0xBC71,
-	0xBC74,0xE575,0xBC6F,0xBC73,INVALC,0xE973,0xE971,0xE970,
-	0xE972,0xE96F,INVALC,INVALC,0xC366,INVALC,0xF446,0xF447,
-	INVALC,0xF5CB,0xF6DF,0xC655,INVALC,INVALC,0xA9B5,0xA7CA,
-	INVALC,INVALC,0xABD8,INVALC,INVALC,INVALC,0xA47B,0xA4DC,
-	/* Block 96, Array index 0x2000 */
-	INVALC,0xA5AF,0xC9DD,INVALC,0xA7CB,0xCAD2,INVALC,0xCEBB,
-	0xABD9,INVALC,0xB9FA,0xA47C,INVALC,INVALC,INVALC,0xA6A1,
-	INVALC,INVALC,0xB749,0xA47D,0xA4DD,0xA4DE,INVALC,0xA5B1,
-	0xA5B0,INVALC,0xC9DE,0xA6A2,INVALC,0xCAD3,INVALC,0xA7CC,
-	INVALC,INVALC,0xCC71,0xCC72,0xCC73,INVALC,0xA9B6,0xA9B7,
-	0xCC70,0xA9B8,INVALC,INVALC,INVALC,0xABDA,0xCEBC,INVALC,
-	0xD17A,0xAE7A,INVALC,0xD179,INVALC,0xB169,0xD54C,0xB16A,
-	0xD54D,INVALC,INVALC,INVALC,0xB45D,INVALC,INVALC,INVALC,
-	0xDD62,INVALC,INVALC,0xE1BF,0xE1BE,INVALC,0xB9FB,INVALC,
-	0xBC75,0xE576,0xBECA,0xE974,0xC0B1,INVALC,0xC573,0xF7D8,
-	INVALC,INVALC,INVALC,INVALC,0xCC74,INVALC,0xCEBD,0xB16B,
-	0xD8F4,0xB74A,INVALC,INVALC,INVALC,0xC255,INVALC,INVALC,
-	INVALC,INVALC,0xA7CE,INVALC,0xA7CD,0xABDB,INVALC,0xD17B,
-	INVALC,0xB16D,0xB343,0xB16E,0xB16C,0xB45E,INVALC,0xE1C0,
-	0xB9FC,0xBC76,INVALC,0xC94C,0xC9DF,INVALC,0xCAD5,0xA7CF,
-	0xCAD4,0xA7D0,INVALC,INVALC,0xA9BC,0xCC77,0xCC76,0xA9BB,
-	0xA9B9,0xA9BA,0xCC75,INVALC,INVALC,0xABDD,0xCEBE,0xABE0,
-	0xABDC,0xABE2,0xABDE,0xABDF,0xABE1,INVALC,INVALC,INVALC,
-	0xAE7D,0xAE7C,0xAE7B,INVALC,INVALC,INVALC,0xD54F,0xB16F,
-	0xB172,0xB170,INVALC,0xD54E,0xB175,INVALC,0xB171,0xD550,
-	0xB174,0xB173,INVALC,INVALC,INVALC,0xD8F6,0xD8F5,INVALC,
-	0xB461,0xB45F,0xB460,0xD8F7,0xB74B,0xDD64,0xB74C,0xDD63,
-	INVALC,INVALC,0xE577,INVALC,INVALC,0xBC78,0xE1C1,0xBC77,
-	INVALC,0xB9FD,INVALC,0xECDE,0xE975,0xC0B2,0xECDD,0xF240,
-	0xF448,0xF449,INVALC,0xA4DF,INVALC,0xA5B2,INVALC,INVALC,
-	INVALC,0xC97B,INVALC,INVALC,0xA7D2,0xA7D4,INVALC,0xC9E2,
-	0xCAD8,0xCAD7,0xCAD6,INVALC,0xC9E1,0xC9E0,0xA6A4,0xA7D3,
-	0xA7D1,0xA6A3,INVALC,INVALC,INVALC,0xA9BD,0xCC78,INVALC,
-	0xA9BE,0xCADD,INVALC,0xCADF,0xCADE,0xCC79,INVALC,INVALC,
-	0xCADA,INVALC,0xA7D8,0xA7D6,INVALC,0xCAD9,0xCADB,0xCAE1,
-	INVALC,0xA7D5,INVALC,0xCADC,0xCAE5,0xA9C0,INVALC,0xCAE2,
-	0xA7D7,INVALC,0xCAE0,0xCAE3,INVALC,0xA9BF,INVALC,0xA9C1,
-	/* Block 97, Array index 0x2100 */
-	0xCAE4,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xCCAF,0xCCA2,0xCC7E,0xCCAE,0xCCA9,0xABE7,0xA9C2,
-	0xCCAA,0xCCAD,0xABE3,0xCCAC,0xA9C3,0xA9C8,0xA9C6,0xCCA3,
-	INVALC,0xCC7C,0xCCA5,0xA9CD,0xCCB0,0xABE4,0xCCA6,INVALC,
-	0xABE5,0xA9C9,0xCCA8,INVALC,0xCECD,0xABE6,0xCC7B,0xA9CA,
-	0xABE8,0xA9CB,0xA9C7,0xA9CC,0xCCA7,0xCC7A,0xCCAB,0xA9C4,
-	INVALC,INVALC,0xCC7D,0xCCA4,0xCCA1,0xA9C5,INVALC,0xCEBF,
-	INVALC,0xCEC0,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xCECA,0xD1A1,0xCECB,0xABEE,0xCECE,0xCEC4,0xABED,0xCEC6,
-	INVALC,0xCEC7,INVALC,INVALC,0xCEC9,0xABE9,INVALC,INVALC,
-	0xAEA3,INVALC,INVALC,0xCEC5,0xCEC1,0xAEA4,INVALC,INVALC,
-	0xCECF,0xAE7E,0xD17D,0xCEC8,INVALC,0xD17C,0xCEC3,0xCECC,
-	INVALC,INVALC,0xABEC,0xAEA1,0xABF2,0xAEA2,0xCED0,0xD17E,
-	0xABEB,0xAEA6,0xABF1,0xABF0,0xABEF,0xAEA5,0xCED1,0xAEA7,
-	0xABEA,INVALC,0xCEC2,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xB176,
-	0xD1A4,0xD1A6,INVALC,0xD1A8,0xAEA8,0xAEAE,0xD553,0xD1AC,
-	0xD1A3,0xB178,0xD551,INVALC,0xAEAD,0xAEAB,0xD1AE,INVALC,
-	0xD552,INVALC,0xD1A5,INVALC,0xAEAC,0xD1A9,0xAEAF,0xD1AB,
-	INVALC,INVALC,0xAEAA,0xD1AA,0xD1AD,0xD1A7,INVALC,0xAEA9,
-	0xB179,INVALC,0xD1A2,0xB177,INVALC,INVALC,INVALC,INVALC,
-	0xB17A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xD555,0xD55E,0xB464,INVALC,0xB17C,0xB1A3,0xB465,0xD560,
-	0xB1AA,0xD8F9,0xD556,0xB1A2,0xB1A5,0xB17E,0xD554,0xD562,
-	0xD565,0xD949,INVALC,0xD563,0xD8FD,0xB1A1,0xB1A8,0xB1AC,
-	0xD55D,0xD8F8,0xD561,0xB17B,0xD8FA,0xD564,0xD8FC,0xD559,
-	INVALC,0xB462,INVALC,0xD557,0xD558,0xB1A7,INVALC,INVALC,
-	0xB1A6,0xD55B,0xB1AB,0xD55F,0xB1A4,0xD55C,INVALC,0xB1A9,
-	0xB466,0xB463,0xD8FB,INVALC,0xD55A,INVALC,0xB17D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xB46B,0xB46F,0xD940,0xB751,0xB46D,0xD944,0xB471,0xDD65,
-	0xD946,0xB753,0xB469,0xB46C,0xD947,INVALC,0xD948,0xD94E,
-	/* Block 98, Array index 0x2200 */
-	0xB473,0xB754,INVALC,0xD94A,0xD94F,0xD943,0xB75E,INVALC,
-	0xB755,0xB472,0xD941,0xD950,INVALC,0xB75D,0xB470,0xB74E,
-	0xD94D,INVALC,0xB474,0xD945,0xD8FE,0xB46A,0xD942,INVALC,
-	0xD94B,INVALC,0xB74D,0xB752,0xB467,0xD94C,INVALC,0xB750,
-	INVALC,INVALC,INVALC,0xB468,INVALC,INVALC,INVALC,0xB75C,
-	0xE1C3,0xDD70,INVALC,0xDD68,0xE1C2,INVALC,0xDD6C,0xDD6E,
-	INVALC,INVALC,0xDD6B,INVALC,0xB75B,INVALC,0xDD6A,0xB75F,
-	INVALC,INVALC,INVALC,0xE1D2,INVALC,INVALC,0xB75A,0xBA40,
-	0xDD71,0xE1C4,INVALC,INVALC,0xB758,0xDD69,0xDD6D,0xB9FE,
-	0xB74F,0xDD66,0xDD67,0xBA41,0xB757,0xB759,0xB756,0xDD6F,
-	INVALC,INVALC,0xE1C8,0xE1C9,0xE1CE,0xBC7D,0xE1D5,INVALC,
-	0xBA47,INVALC,0xBA46,0xE1D0,INVALC,0xBC7C,0xE1C5,0xBA45,
-	INVALC,0xE1D4,0xBA43,0xBA44,INVALC,0xE1D1,0xE5AA,0xBC7A,
-	0xB46E,INVALC,0xE1D3,0xBCA3,0xE1CB,INVALC,0xBC7B,INVALC,
-	0xBCA2,0xE1C6,0xE1CA,0xE1C7,0xE1CD,0xBA48,0xBC79,0xBA42,
-	INVALC,0xE57A,0xE1CF,INVALC,0xBCA1,INVALC,0xBCA4,INVALC,
-	0xE1CC,INVALC,0xBC7E,0xE579,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xE57E,0xBECE,0xE578,0xE9A3,0xE5A9,0xBCA8,INVALC,
-	0xBCA6,0xBECC,0xE5A6,0xE5A2,0xBCAC,INVALC,0xE978,INVALC,
-	INVALC,INVALC,0xBCAA,0xE5A1,INVALC,0xE976,INVALC,0xE5A5,
-	INVALC,0xE5A8,0xE57D,INVALC,0xBCAB,INVALC,INVALC,0xBCA5,
-	0xE977,0xBECD,0xE5A7,0xBCA7,0xBCA9,0xE5A4,0xBCAD,0xE5A3,
-	0xE57C,0xE57B,0xBECB,0xE5AB,0xE97A,0xECE0,0xBED0,INVALC,
-	0xE9A2,INVALC,0xE97E,INVALC,0xECE1,INVALC,0xBED1,0xE9A1,
-	INVALC,0xE97C,0xC0B4,0xECDF,INVALC,0xE979,0xE97B,0xC0B5,
-	0xBED3,0xC0B3,0xBED2,0xC0B7,0xE97D,0xBECF,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xEFCF,INVALC,
-	0xEFC7,INVALC,INVALC,INVALC,INVALC,INVALC,0xECE7,0xEFC8,
-	0xECE3,INVALC,INVALC,0xC256,0xECE5,0xECE4,0xC0B6,0xECE2,
-	0xECE6,0xEFD0,0xEFCC,0xEFCE,INVALC,0xEFC9,0xEFCA,INVALC,
-	0xEFCD,0xEFCB,0xC367,INVALC,INVALC,0xC36A,0xC369,0xC368,
-	0xC461,0xF44A,0xC462,0xF241,0xC4DF,0xF5CC,0xC4E0,0xC574,
-	/* Block 99, Array index 0x2300 */
-	0xC5CA,0xF7D9,INVALC,0xF7DA,0xF7DB,INVALC,INVALC,0xF9BA,
-	0xA4E0,0xC97C,0xA5B3,INVALC,0xA6A6,0xA6A7,0xA6A5,INVALC,
-	0xA6A8,0xA7DA,0xA7D9,INVALC,0xCCB1,0xA9CF,0xA9CE,INVALC,
-	INVALC,0xD1AF,0xB1AD,0xB1AE,INVALC,INVALC,INVALC,0xB475,
-	0xDD72,0xB760,0xB761,0xDD74,0xDD76,0xDD75,INVALC,0xE1D7,
-	INVALC,0xE1D6,0xBA49,0xE1D8,INVALC,0xE5AC,0xBCAE,INVALC,
-	0xBED4,INVALC,0xC0B8,0xC257,0xC0B9,INVALC,0xA4E1,INVALC,
-	INVALC,INVALC,0xCAE6,INVALC,INVALC,0xCCB2,0xA9D1,0xA9D0,
-	0xA9D2,0xABF3,0xCED2,0xCED3,INVALC,INVALC,0xD1B0,0xAEB0,
-	0xB1AF,0xB476,0xD951,0xA4E2,INVALC,0xA47E,0xA4E3,INVALC,
-	0xC97D,0xA5B7,0xA5B6,0xA5B4,0xA5B5,INVALC,INVALC,INVALC,
-	0xA6AB,0xC9E9,0xC9EB,0xA6AA,0xC9E3,INVALC,0xC9E4,INVALC,
-	0xC9EA,0xC9E6,0xC9E8,0xA6A9,0xC9E5,0xC9EC,0xC9E7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xA7E1,0xA7EA,0xA7E8,
-	0xCAF0,0xCAED,0xCAF5,0xA7E6,0xCAF6,INVALC,0xA7DF,0xCAF3,
-	INVALC,0xA7E5,0xCAEF,0xCAEE,0xA7E3,0xCAF4,0xA7E4,0xA9D3,
-	0xA7DE,0xCAF1,INVALC,0xCAE7,0xA7DB,INVALC,0xA7EE,0xCAEC,
-	0xCAF2,0xA7E0,0xA7E2,INVALC,0xCAE8,INVALC,0xCAE9,0xCAEA,
-	INVALC,0xA7ED,0xA7E7,0xA7EC,0xCAEB,0xA7EB,0xA7DD,0xA7DC,
-	0xA7E9,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xA9E1,0xCCBE,0xCCB7,0xA9DC,0xA9EF,0xCCB3,0xCCBA,0xCCBC,
-	0xCCBF,0xA9EA,INVALC,0xCCBB,0xCCB4,0xA9E8,0xCCB8,INVALC,
-	0xCCC0,0xA9D9,INVALC,0xCCBD,0xA9E3,0xA9E2,0xCCB6,0xA9D7,
-	INVALC,INVALC,0xA9D8,INVALC,0xA9D6,INVALC,0xA9EE,0xA9E6,
-	0xA9E0,0xA9D4,0xCCB9,0xA9DF,0xA9D5,0xA9E7,0xA9F0,0xCED4,
-	0xA9E4,0xCCB5,0xA9DA,0xA9DD,0xA9DE,INVALC,0xA9EC,0xA9ED,
-	0xA9EB,0xA9E5,0xA9E9,0xA9DB,0xABF4,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xCEDA,0xAC41,0xABF8,0xABFA,0xAC40,
-	0xCEE6,0xABFD,0xD1B1,0xAEB1,0xAC43,0xCED7,0xCEDF,0xABFE,
-	0xCEDE,0xCEDB,0xCEE3,0xCEE5,0xABF7,0xABFB,0xAC42,0xAEB3,
-	/* Block 100, Array index 0x2400 */
-	0xCEE0,0xABF9,0xAC45,0xCED9,INVALC,INVALC,INVALC,0xABFC,
-	0xAEB2,0xABF6,INVALC,0xCED6,0xCEDD,0xCED5,0xCED8,0xCEDC,
-	0xD1B2,0xAC44,INVALC,0xCEE1,0xCEE2,0xCEE4,0xABF5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xAEC1,0xD1BE,0xAEBF,0xAEC0,0xD1B4,0xD1C4,INVALC,0xAEB6,
-	INVALC,INVALC,0xD566,0xD1C6,0xD1C0,INVALC,0xD1B7,INVALC,
-	0xD1C9,0xD1BA,0xAEBC,0xD57D,0xD1BD,0xAEBE,0xAEB5,INVALC,
-	0xD1CB,0xD1BF,0xAEB8,0xD1B8,0xD1B5,0xD1B6,0xAEB9,0xD1C5,
-	0xD1CC,0xAEBB,0xD1BC,0xD1BB,0xAEC3,0xAEC2,0xAEB4,0xAEBA,
-	0xAEBD,0xD1C8,INVALC,INVALC,0xD1C2,0xAEB7,0xD1B3,0xD1CA,
-	0xD1C1,0xD1C3,0xD1C7,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xD567,INVALC,0xB1B7,
-	0xB1CB,0xB1CA,INVALC,0xB1BF,INVALC,0xD579,0xD575,0xD572,
-	0xD5A6,0xB1BA,0xB1B2,INVALC,INVALC,0xD577,0xB4A8,0xB1B6,
-	0xD5A1,INVALC,0xB1CC,0xB1C9,0xD57B,0xD56A,INVALC,INVALC,
-	0xB1C8,0xD5A3,0xD569,0xB1BD,0xB1C1,0xD5A2,INVALC,0xD573,
-	0xB1C2,0xB1BC,0xD568,INVALC,0xB478,0xD5A5,0xD571,0xB1C7,
-	0xD574,0xD5A4,0xB1C6,INVALC,0xD952,INVALC,0xB1B3,0xD56F,
-	0xB1B8,0xB1C3,INVALC,0xB1BE,0xD578,0xD56E,0xD56C,0xD57E,
-	0xB1B0,0xB1C4,0xB1B4,0xB477,0xD57C,0xB1B5,INVALC,0xB1B1,
-	0xB1C0,0xB1BB,0xB1B9,0xD570,0xB1C5,0xD56D,0xD57A,0xD576,
-	0xD954,0xD953,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xD56B,0xD964,INVALC,
-	0xB47A,INVALC,0xD96A,0xD959,0xD967,0xDD77,0xB47D,0xD96B,
-	0xD96E,0xB47C,0xD95C,0xD96D,0xD96C,0xB47E,0xD955,0xB479,
-	0xB4A3,INVALC,0xB4A1,0xD969,INVALC,0xD95F,0xB4A5,0xD970,
-	0xD968,0xD971,0xB4AD,0xB4AB,0xD966,0xD965,INVALC,0xD963,
-	0xD95D,0xB4A4,INVALC,0xB4A2,0xD1B9,0xD956,INVALC,0xDDB7,
-	0xD957,0xB47B,0xB4AA,0xDD79,INVALC,0xB4A6,0xB4A7,0xD958,
-	0xD96F,0xDD78,0xD960,0xD95B,0xB4A9,0xD961,0xD95E,INVALC,
-	INVALC,0xB4AE,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 101, Array index 0x2500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xB770,INVALC,
-	INVALC,0xDD7C,0xDDB1,0xDDB6,0xDDAA,0xB76C,0xDDBB,0xB769,
-	0xDD7A,INVALC,0xDD7B,0xB762,0xB76B,0xDDA4,0xB76E,0xB76F,
-	0xDDA5,INVALC,0xDDB2,0xDDB8,0xB76A,INVALC,0xB764,0xDDA3,
-	0xDD7D,0xDDBA,0xDDA8,0xDDA9,0xDD7E,0xDDB4,0xDDAB,0xDDB5,
-	0xDDAD,INVALC,0xB765,0xE1D9,0xB768,0xB766,0xDDB9,0xDDB0,
-	0xDDAC,INVALC,INVALC,0xDDA1,0xBA53,0xDDAF,0xB76D,0xDDA7,
-	INVALC,0xDDA6,INVALC,INVALC,INVALC,0xB767,0xB763,0xE1EE,
-	0xDDB3,0xDDAE,INVALC,0xDDA2,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xE1E9,INVALC,0xE1DA,0xE1E5,INVALC,
-	0xE1EC,0xBA51,0xB4AC,0xE1EA,0xBA4C,INVALC,INVALC,INVALC,
-	0xBA4B,0xE1F1,INVALC,0xE1DB,0xE1E8,0xE1DC,0xE1E7,0xBA4F,
-	0xE1EB,0xD962,INVALC,INVALC,INVALC,0xE1F2,0xE1E3,0xBA52,
-	0xE5BA,0xBCAF,INVALC,0xE1F0,0xE1EF,0xBA54,0xE5AD,0xBCB0,
-	0xE5AE,INVALC,0xE1DF,0xE1E0,0xE1DD,0xE1E2,0xE1DE,0xE1F3,
-	0xBA4E,0xBCB1,0xBA50,0xBA55,INVALC,0xE1E1,INVALC,0xE1ED,
-	INVALC,INVALC,0xE1E6,INVALC,INVALC,0xE5B1,INVALC,0xBA4A,
-	0xBCB4,0xE9AA,0xE5B6,0xE5B5,0xE5B7,INVALC,INVALC,0xE5B4,
-	0xBCB5,INVALC,0xBCBB,0xBCB8,INVALC,0xBCB9,0xE5AF,0xE5B2,
-	0xE5BC,0xBCC1,0xBCBF,INVALC,0xE5B3,0xD95A,0xBCB2,0xE5B9,
-	0xE5B0,INVALC,0xBCC2,0xE5B8,0xBA4D,0xBCB7,0xE1E4,INVALC,
-	INVALC,0xBCBA,INVALC,0xBCBE,0xBCC0,0xBCBD,0xBCBC,INVALC,
-	0xBCB6,0xE5BB,0xBCB3,0xBCC3,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xBED8,0xBED9,0xE9A9,0xBEE2,0xBEDF,
-	INVALC,0xBED6,0xBEDD,0xE9AB,0xBEDB,0xBED5,INVALC,0xBEDC,
-	INVALC,0xE9A8,0xC0BB,0xBED7,INVALC,0xBEDE,0xC0BA,0xE9A7,
-	0xE9A6,INVALC,0xBEE0,INVALC,0xBEE1,INVALC,0xE9A5,0xE9A4,
-	0xC0BC,0xE9AE,0xBEDA,0xE9AC,INVALC,INVALC,INVALC,INVALC,
-	0xC0BD,INVALC,0xC0C2,0xECEA,0xECEC,INVALC,0xC0BF,INVALC,
-	0xECED,0xECE9,INVALC,0xECEB,0xC0C0,0xC0C3,INVALC,0xECE8,
-	0xC0BE,0xC0C1,0xC259,0xE9AD,0xC258,INVALC,INVALC,0xC25E,
-	0xEFD4,INVALC,0xC25C,0xC25D,0xEFD7,0xEFD3,0xC25A,0xEFD1,
-	/* Block 102, Array index 0x2600 */
-	0xC36B,0xEFD5,INVALC,0xEFD6,0xEFD2,INVALC,0xC25B,0xF242,
-	INVALC,0xF245,INVALC,INVALC,0xF246,0xF244,0xF247,0xC36C,
-	0xF243,INVALC,INVALC,0xF44E,0xC464,0xF44D,0xF44C,0xF44B,
-	0xC463,0xC465,INVALC,0xF5CD,0xC4E2,0xC4E1,INVALC,INVALC,
-	0xF6E1,0xF6E0,0xF6E3,0xC5CB,0xC575,0xF7DD,0xF6E2,INVALC,
-	INVALC,0xF7DC,0xC5CD,0xC5CC,0xC5F3,0xF8A9,0xF8EF,0xA4E4,
-	INVALC,INVALC,0xD972,0xE9AF,INVALC,INVALC,0xA6AC,0xCAF7,
-	0xA7F1,0xA7EF,INVALC,0xA7F0,INVALC,0xCCC1,0xA9F1,0xAC46,
-	INVALC,0xCEE7,INVALC,0xCEE8,INVALC,0xAC47,0xD1CE,INVALC,
-	0xAEC4,0xAEC5,0xD1CD,INVALC,INVALC,INVALC,INVALC,0xB1D3,
-	INVALC,0xB1CF,INVALC,0xD5A7,0xB1D6,0xB1D5,0xB1CE,0xB1D1,
-	0xB1D4,0xB1D0,INVALC,INVALC,0xD976,0xB1CD,0xB4AF,INVALC,
-	INVALC,INVALC,0xB4B1,0xB4B2,0xD975,0xD978,0xB4B0,0xD973,
-	0xD977,INVALC,0xD974,INVALC,0xB771,INVALC,INVALC,0xDDBC,
-	INVALC,INVALC,0xBA56,0xE1F4,0xBEE3,0xBCC4,0xE5BD,0xBCC5,
-	0xBCC6,0xE5BF,0xE5BE,0xE5C0,0xE9B1,INVALC,INVALC,0xE9B0,
-	0xECEF,0xECEE,0xC0C4,0xC0C5,0xF248,INVALC,INVALC,0xA4E5,
-	INVALC,INVALC,INVALC,INVALC,0xD979,INVALC,INVALC,INVALC,
-	0xB4B4,0xB4B3,0xDDBD,INVALC,0xEFD8,0xC4E3,0xF7DE,0xA4E6,
-	INVALC,0xAEC6,INVALC,0xB1D8,0xB1D7,0xD97A,0xD97B,0xB772,
-	0xE1F5,0xBA57,0xE9B2,INVALC,0xA4E7,0xA5B8,INVALC,0xA9F2,
-	0xCCC2,INVALC,0xCEE9,0xAC48,0xB1D9,INVALC,0xD97C,0xB4B5,
-	0xB773,INVALC,0xE5C1,0xE5C2,INVALC,INVALC,0xECF0,0xC25F,
-	0xF8F0,0xA4E8,INVALC,0xCCC3,0xA9F3,0xAC49,INVALC,0xCEEA,
-	INVALC,0xAEC7,0xD1D2,0xD1D0,0xD1D1,0xAEC8,0xD1CF,INVALC,
-	INVALC,INVALC,INVALC,0xB1DB,0xB1DC,0xD5A8,0xB1DD,0xB1DA,
-	0xD97D,INVALC,0xD97E,0xDDBE,INVALC,INVALC,0xBA59,0xBA58,
-	INVALC,INVALC,0xECF1,0xEFD9,INVALC,0xF24A,0xF249,0xF44F,
-	INVALC,0xC95E,0xAC4A,INVALC,INVALC,0xA4E9,0xA5B9,INVALC,
-	0xA6AE,0xA6AD,INVALC,INVALC,0xA6AF,0xA6B0,0xC9EE,0xC9ED,
-	0xCAF8,0xA7F2,0xCAFB,0xCAFA,0xCAF9,0xCAFC,INVALC,INVALC,
-	INVALC,INVALC,0xA9F4,0xCCC9,0xCCC5,0xCCCE,INVALC,INVALC,
-	/* Block 103, Array index 0x2700 */
-	0xA9FB,INVALC,0xA9F9,0xCCCA,0xCCC6,0xCCCD,0xA9F8,0xAA40,
-	0xCCC8,0xCCC4,0xA9FE,0xCCCB,0xA9F7,0xCCCC,0xA9FA,0xA9FC,
-	0xCCD0,0xCCCF,0xCCC7,0xA9F6,0xA9F5,0xA9FD,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xCEEF,0xCEF5,INVALC,0xAC50,
-	0xAC4D,0xCEEC,0xCEF1,INVALC,0xAC53,0xAC4B,0xCEF0,0xAC4E,
-	0xAC51,INVALC,INVALC,0xCEF3,INVALC,0xAC4C,0xCEF8,0xAC4F,
-	INVALC,0xAC52,0xCEED,0xCEF2,0xCEF6,0xCEEE,0xCEEB,INVALC,
-	INVALC,0xCEF7,0xCEF4,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xAED0,0xAEC9,0xAECC,INVALC,0xAECF,INVALC,0xD1D5,
-	INVALC,0xAECA,0xD1D3,INVALC,0xAECE,INVALC,INVALC,0xAECB,
-	INVALC,0xD1D6,0xAECD,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xD5AC,0xB1DF,0xD5AB,0xD5AD,0xB1DE,0xB1E3,0xD1D4,
-	INVALC,0xD5AA,0xD5AE,INVALC,0xB1E0,0xD5A9,0xB1E2,INVALC,
-	0xB1E1,INVALC,0xD9A7,INVALC,0xD9A2,INVALC,0xB4B6,0xB4BA,
-	0xB4B7,0xD9A5,0xD9A8,INVALC,0xB4B8,INVALC,0xB4B9,0xB4BE,
-	0xDDC7,0xD9A6,0xB4BC,0xD9A3,0xD9A1,INVALC,0xB4BD,INVALC,
-	0xD9A4,INVALC,INVALC,INVALC,0xB779,INVALC,0xDDBF,0xB776,
-	0xB777,0xB775,0xDDC4,0xDDC3,0xDDC0,0xB77B,INVALC,INVALC,
-	0xDDC2,0xB4BB,INVALC,INVALC,0xDDC6,0xDDC1,0xB778,0xB774,
-	0xB77A,0xDDC5,INVALC,INVALC,INVALC,0xBA5C,INVALC,0xE1F8,
-	0xE1F7,0xE1F6,0xBA5A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xBA5B,0xE5C5,0xE5C8,0xBCC8,INVALC,INVALC,0xBCC7,0xE5C9,
-	0xE5C4,0xBCCA,0xE5C6,INVALC,0xBCC9,0xE5C3,INVALC,0xE5C7,
-	0xBEE9,0xBEE6,0xE9BB,0xE9BA,INVALC,0xE9B9,0xE9B4,INVALC,
-	0xE9B5,INVALC,INVALC,INVALC,0xBEE7,INVALC,0xBEE4,0xBEE8,
-	0xE9B3,0xBEE5,0xE9B6,0xE9B7,0xE9BC,INVALC,INVALC,0xE9B8,
-	INVALC,INVALC,0xECF2,INVALC,INVALC,INVALC,0xC0C7,INVALC,
-	0xEFDC,0xC0C6,0xEFDA,0xEFDB,0xC260,0xC36E,0xF24B,INVALC,
-	0xC36D,INVALC,INVALC,0xF451,0xF452,INVALC,0xC466,INVALC,
-	0xF450,0xC4E4,INVALC,0xF7DF,0xC5CE,0xF8AA,0xF8AB,INVALC,
-	0xA4EA,INVALC,0xA6B1,0xA6B2,0xA7F3,INVALC,0xCCD1,0xAC54,
-	0xAED1,0xB1E4,INVALC,INVALC,0xB0D2,INVALC,0xB4BF,0xB4C0,
-	/* Block 104, Array index 0x2800 */
-	0xB3CC,0xD9A9,INVALC,0xB77C,0xE1FA,0xE1F9,INVALC,INVALC,
-	0xA4EB,0xA6B3,0xCCD2,0xAA42,INVALC,0xAA41,INVALC,0xCEF9,
-	0xCEFA,INVALC,0xD1D7,0xD1D8,0xAED2,0xAED3,INVALC,0xAED4,
-	0xD5AF,INVALC,INVALC,0xB1E6,INVALC,0xB4C2,INVALC,0xB4C1,
-	0xDDC8,0xDF7A,0xE1FB,0xE9BD,INVALC,INVALC,0xC261,0xC467,
-	0xA4EC,INVALC,0xA5BC,0xA5BD,0xA5BB,0xA5BE,0xA5BA,INVALC,
-	INVALC,0xA6B6,INVALC,0xC9F6,0xA6B5,0xA6B7,INVALC,INVALC,
-	0xC9F1,0xC9F0,0xC9F3,0xC9F2,0xC9F5,0xA6B4,0xC9EF,0xC9F4,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xCAFD,0xA7FD,0xCAFE,
-	0xCB43,0xA7FC,INVALC,0xCB47,0xCB42,0xCB45,0xA7F5,0xA7F6,
-	0xA7F7,0xA7F8,INVALC,0xA840,INVALC,0xCB41,0xA7FA,0xA841,
-	INVALC,0xCB40,0xCB46,INVALC,0xA7F9,0xCB44,0xA7FB,0xA7F4,
-	0xA7FE,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xAA57,INVALC,0xCCD4,0xAA43,INVALC,0xAA4D,
-	0xAA4E,0xAA46,0xAA58,0xAA48,0xCCDC,0xAA53,0xCCD7,0xAA49,
-	0xCCE6,0xCCE7,0xCCDF,0xCCD8,0xAA56,0xCCE4,0xAA51,0xAA4F,
-	INVALC,0xCCE5,INVALC,0xCCE3,0xCCDB,0xCCD3,0xCCDA,0xAA4A,
-	INVALC,0xAA50,INVALC,0xAA44,0xCCDE,0xCCDD,0xCCD5,INVALC,
-	0xAA52,0xCCE1,0xCCD6,0xAA55,0xCCE8,0xAA45,INVALC,0xAA4C,
-	0xCCD9,0xCCE2,0xAA54,INVALC,0xAA47,0xAA4B,INVALC,0xCCE0,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xCF5B,0xAC5C,
-	0xAC69,INVALC,0xCF56,0xCF4C,0xAC62,0xCF4A,0xAC5B,0xCF45,
-	0xAC65,0xCF52,0xCEFE,0xCF41,INVALC,INVALC,INVALC,INVALC,
-	0xCF44,0xCEFB,0xCF51,0xCF61,0xAC60,0xCF46,0xCF58,INVALC,
-	0xCEFD,0xCF5F,0xCF60,0xCF63,0xCF5A,0xCF4B,0xCF53,0xAC66,
-	0xAC59,0xAC61,0xAC6D,0xAC56,0xAC58,INVALC,INVALC,INVALC,
-	0xCF43,0xAC6A,0xAC63,0xCF5D,0xCF40,0xAC6C,0xAC67,0xCF49,
-	INVALC,INVALC,0xAC6B,0xCF50,0xCF48,0xAC64,0xCF5C,0xCF54,
-	INVALC,0xAC5E,0xCF62,0xCF47,0xAC5A,0xCF59,0xCF4F,0xAC5F,
-	0xCF55,0xAC57,0xCEFC,0xAC68,0xAEE3,0xAC5D,0xCF4E,0xCF4D,
-	0xCF42,INVALC,0xCF5E,INVALC,0xCF57,INVALC,INVALC,0xAC55,
-	/* Block 105, Array index 0x2900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xD1EC,0xAEEA,0xD1ED,INVALC,0xD1E1,0xAEDF,
-	0xAEEB,INVALC,0xD1DA,INVALC,0xD1E3,0xD1EB,INVALC,0xD1D9,
-	0xD1F4,0xAED5,INVALC,INVALC,INVALC,0xD1F3,0xD1EE,INVALC,
-	0xD1EF,0xAEDD,0xAEE8,0xD1E5,INVALC,0xD1E6,0xD1F0,0xD1E7,
-	INVALC,0xD1E2,0xD1DC,0xD1DD,0xD1EA,0xD1E4,INVALC,INVALC,
-	0xAED6,0xAEDA,0xD1F2,0xD1DE,0xAEE6,0xAEE2,INVALC,INVALC,
-	0xAEE5,0xAEEC,0xAEDB,0xAEE7,0xD1E9,0xAEE9,0xAED8,INVALC,
-	0xAED7,0xD1DB,INVALC,0xD1DF,0xAEE0,0xD1F1,0xD1E8,0xD1E0,
-	0xAEE4,0xAEE1,INVALC,0xAED9,0xAEDC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xD5C4,INVALC,0xD5B4,0xD5B5,0xD5B9,
-	INVALC,0xD5C8,0xD5C5,INVALC,0xD5BE,0xD5BD,0xB1ED,0xD5C1,
-	0xD5D0,0xD5B0,INVALC,0xD5D1,0xD5C3,0xD5D5,0xD5C9,0xB1EC,
-	0xD5C7,0xB1E7,0xB1FC,0xB1F2,INVALC,0xB1F6,0xB1F5,0xD5B1,
-	INVALC,0xD5CE,0xD5D4,0xD5CC,0xD5D3,INVALC,INVALC,0xD5C0,
-	0xD5B2,0xD5D2,0xD5C2,0xB1EA,0xB1F7,INVALC,0xD5CB,0xB1F0,
-	INVALC,INVALC,INVALC,0xD5CA,0xD5B3,0xB1F8,INVALC,0xB1FA,
-	0xD5CD,0xB1FB,0xB1E9,0xD5BA,0xD5CF,INVALC,INVALC,0xB1EF,
-	0xB1F9,0xD5BC,0xD5C6,0xD5B7,0xD5BB,0xB1F4,0xD5B6,0xB1E8,
-	0xB1F1,0xB1EE,0xD5BF,0xAEDE,0xD9C0,0xB1EB,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xB1F3,INVALC,0xD9C3,0xD9D9,
-	0xD9CE,0xB4D6,INVALC,0xB4D1,0xD9BD,0xB4D2,0xD9CD,INVALC,
-	0xD9C6,0xD9D3,0xB4CE,0xD9AB,0xD9D5,0xB4C4,0xD9B3,0xB4C7,
-	0xB4C6,INVALC,0xB4D7,INVALC,0xD9AD,0xD9CF,0xD9D0,0xB4C9,
-	0xB4C5,0xD9BB,INVALC,0xB4D0,0xD9B6,INVALC,0xD9D1,0xB4CC,
-	0xD9C9,0xD9D6,0xD9B0,0xD9B5,0xD9AF,INVALC,0xB4CB,0xD9C2,
-	0xDDDE,0xD9B1,0xB4CF,0xD9BA,0xD9D2,0xB4CA,0xD9B7,0xD9B4,
-	0xD9C5,0xB4CD,0xB4C3,0xB4D9,0xD9C8,0xD9C7,INVALC,INVALC,
-	/* Block 106, Array index 0x2A00 */
-	INVALC,INVALC,INVALC,INVALC,0xD9AC,0xB4C8,0xD9D4,0xD9BC,
-	0xD9BE,INVALC,0xD9CB,0xD9CA,0xD9AA,0xB4D3,0xB4D5,0xD9B2,
-	0xD9B9,0xD9C1,0xB4D4,0xD9B8,0xD9C4,0xD9D7,INVALC,0xD9CC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xD9D8,INVALC,INVALC,
-	INVALC,INVALC,0xD9AE,INVALC,INVALC,INVALC,INVALC,0xDDF2,
-	0xB7A6,INVALC,0xDDF0,0xDDDB,0xDDE0,0xDDD9,INVALC,0xDDEC,
-	0xDDCB,0xDDD2,INVALC,0xDDEA,0xDDF4,0xDDDC,INVALC,0xDDCF,
-	0xDDE2,0xDDE7,0xDDD3,INVALC,0xDDE4,0xDDD0,INVALC,INVALC,
-	0xDDD7,0xDDD8,0xB7A8,0xDDEB,0xDDE9,INVALC,0xDDCC,0xDDEE,
-	INVALC,0xDDEF,0xDDF1,0xB7AC,0xB7A4,INVALC,0xD5B8,0xDDD4,
-	0xDDE6,0xDDD5,0xB7A1,0xB7B1,0xDDED,0xB7AF,0xB7AB,0xDDCA,
-	0xB7A3,INVALC,0xDDCD,0xB7B0,INVALC,0xDDDD,0xDDC9,INVALC,
-	0xB7A9,0xDDE1,0xDDD1,0xB7AA,0xDDDA,0xB77E,0xB4D8,0xDDE3,
-	0xD9BF,0xDDCE,INVALC,INVALC,0xDDE8,0xB7A5,0xDDE5,0xB7A2,
-	0xDDDF,0xB7AD,0xDDD6,0xDDF3,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xB7A7,0xDEC6,INVALC,INVALC,0xB7AE,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xE24A,0xE248,INVALC,
-	0xE25E,0xE246,INVALC,0xE258,0xB77D,0xBA5F,0xE242,0xE25D,
-	INVALC,0xE247,0xE255,0xBA64,0xBA5D,INVALC,0xE25B,INVALC,
-	0xE240,0xE25A,INVALC,0xBA6F,0xE251,0xE261,0xBA6D,0xE249,
-	0xBA5E,0xE24B,0xE259,0xBA67,0xE244,0xBA6B,0xBA61,0xE24D,
-	0xE243,0xE1FC,INVALC,0xE257,0xBA68,0xE260,0xE1FD,0xBA65,
-	INVALC,0xE253,INVALC,0xBA66,0xE245,0xE250,0xE24C,0xE24E,
-	INVALC,0xBA60,0xE25F,0xBA6E,0xE24F,INVALC,0xE262,INVALC,
-	INVALC,0xE1FE,0xE254,0xBA63,0xBA6C,0xBA6A,0xE241,0xE256,
-	0xBA69,INVALC,INVALC,0xBA62,0xE252,INVALC,INVALC,INVALC,
-	INVALC,0xE25C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xE5D5,INVALC,0xE5D1,0xE5CD,0xE5E1,0xE5DE,
-	0xBCCD,INVALC,INVALC,0xE5E5,0xE5D4,0xBCD8,0xE5DB,INVALC,
-	INVALC,0xE5D0,0xE5DA,0xBCD5,0xE5EE,INVALC,0xE5EB,0xE5DD,
-	0xE5CE,INVALC,INVALC,0xE5E2,0xE5E4,0xBCD1,0xE5D8,0xE5D3,
-	/* Block 107, Array index 0x2B00 */
-	0xE5CA,0xBCCE,0xBCD6,INVALC,0xE5E7,0xBCD7,0xE5CB,0xE5ED,
-	0xE5E0,0xE5E6,0xBCD4,INVALC,INVALC,0xE5E3,INVALC,0xE5EA,
-	INVALC,0xBCD9,INVALC,0xBCD3,0xE5DC,0xE5CF,0xE5EF,0xE5CC,
-	0xE5E8,0xBCD0,INVALC,0xE5D6,INVALC,0xE5D7,0xBCCF,0xBCCC,
-	0xE5D2,0xBCD2,INVALC,0xBCCB,INVALC,0xE5E9,0xE5EC,0xE5D9,
-	0xE9CA,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xE9C2,INVALC,0xE9BE,0xBEF6,INVALC,INVALC,
-	0xBEEB,0xBEF0,0xBEEC,0xE9CC,0xE9D7,0xBEEA,0xE9C4,0xE9CD,
-	0xE5DF,0xE9CE,INVALC,INVALC,0xBEF1,INVALC,0xE9DD,0xBEF5,
-	0xBEF8,0xE9C0,INVALC,0xBEF4,INVALC,0xE9DB,0xE9DC,0xE9D2,
-	0xE9D1,0xE9C9,INVALC,INVALC,0xE9D3,0xE9DA,0xE9D9,INVALC,
-	0xBEEF,0xBEED,0xE9CB,0xE9C8,INVALC,0xE9C5,0xE9D8,0xBEF7,
-	0xE9D6,0xBEF3,0xBEF2,INVALC,0xE9D0,INVALC,0xE9BF,0xE9C1,
-	0xE9C3,0xE9D5,0xE9CF,0xBEEE,INVALC,0xE9C6,INVALC,0xE9D4,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xE9C7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xC0CF,0xED45,
-	0xC0C8,0xECF5,INVALC,0xED41,0xC0CA,0xED48,INVALC,0xECFC,
-	INVALC,0xECF7,INVALC,INVALC,0xED49,0xECF3,0xECFE,INVALC,
-	0xC0D1,0xED44,0xED4A,0xECFD,0xC0C9,0xED40,0xECF4,0xC0D0,
-	INVALC,INVALC,0xED47,0xECF9,0xC0CC,INVALC,0xECFB,0xECF8,
-	0xC0D2,0xECFA,0xC0CB,0xC0CE,0xED43,0xECF6,0xED46,INVALC,
-	0xED42,INVALC,INVALC,INVALC,0xC263,0xEFE7,0xC268,0xC269,
-	INVALC,INVALC,INVALC,0xC262,0xEFE6,INVALC,0xEFE3,0xEFE4,
-	0xC266,0xEFDE,0xEFE2,0xC265,INVALC,0xEFDF,INVALC,INVALC,
-	INVALC,INVALC,0xC267,0xC264,INVALC,0xEFDD,0xEFE1,0xEFE5,
-	INVALC,INVALC,INVALC,0xF251,0xF24E,0xF257,INVALC,0xF256,
-	0xF254,0xF24F,INVALC,0xC372,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xF250,0xC371,0xC0CD,0xF253,0xC370,0xF258,0xF252,
-	0xF24D,0xEFE0,INVALC,INVALC,INVALC,0xC36F,INVALC,0xF24C,
-	0xF456,INVALC,0xF455,0xF255,0xC468,INVALC,0xF459,0xF45A,
-	0xF454,0xF458,INVALC,0xF453,INVALC,INVALC,INVALC,INVALC,
-	0xF5D1,0xF457,0xC4E7,0xC4E5,0xF5CF,INVALC,INVALC,INVALC,
-	/* Block 108, Array index 0x2C00 */
-	0xF5D2,INVALC,0xF5CE,0xF5D0,0xC4E6,INVALC,INVALC,INVALC,
-	0xF6E5,0xF6E6,0xC576,0xF6E4,INVALC,INVALC,INVALC,0xF7E2,
-	0xC5CF,0xF7E0,0xF7E1,0xF8AC,INVALC,INVALC,0xC656,0xF8F3,
-	0xF8F1,0xF8F2,0xF8F4,INVALC,INVALC,INVALC,0xF9BB,INVALC,
-	0xA4ED,0xA6B8,INVALC,0xAA59,INVALC,0xCCE9,INVALC,INVALC,
-	0xCF64,INVALC,INVALC,INVALC,0xD1F5,0xD1F7,INVALC,0xD1F6,
-	INVALC,0xD1F8,0xB1FD,0xD5D7,0xD1F9,INVALC,0xD5D6,0xD5D8,
-	0xD5D9,0xD9DA,0xB4DB,0xD9DB,0xD9DD,0xB4DC,0xB4DA,0xD9DC,
-	INVALC,0xDDFA,0xDDF8,0xDDF7,INVALC,0xDDF6,0xDDF5,0xB7B2,
-	0xDDF9,0xBA70,0xE263,0xE265,0xBA71,0xE264,0xBCDB,INVALC,
-	0xBCDA,0xE5F0,INVALC,INVALC,0xE9DF,0xE9DE,0xE9E0,INVALC,
-	INVALC,0xBEF9,INVALC,0xED4B,0xC0D3,INVALC,0xEFE8,0xC26A,
-	0xF259,0xC577,0xA4EE,0xA5BF,0xA6B9,0xA842,0xAA5A,0xAA5B,
-	INVALC,INVALC,0xAC6E,INVALC,INVALC,0xD1FA,INVALC,INVALC,
-	INVALC,INVALC,0xB7B3,INVALC,INVALC,INVALC,0xE6D1,0xBEFA,
-	0xC26B,0xA4EF,INVALC,0xA6BA,INVALC,INVALC,0xCCEB,0xAA5C,
-	0xCCEA,INVALC,0xCF65,0xAC6F,0xCF66,INVALC,0xAC70,INVALC,
-	0xD1FC,0xAEEE,0xAEED,INVALC,0xD5DE,0xD5DC,0xD5DD,0xD5DB,
-	INVALC,0xD5DA,INVALC,INVALC,0xD9DE,0xD9E1,0xB4DE,0xD9DF,
-	0xB4DD,0xD9E0,INVALC,0xDDFB,INVALC,INVALC,0xE266,0xE267,
-	0xE268,INVALC,0xE5F3,0xE5F2,0xBCDC,0xE5F1,0xE5F4,0xE9E1,
-	INVALC,INVALC,0xE9E2,0xE9E3,INVALC,0xED4C,0xC0D4,0xC26C,
-	0xF25A,INVALC,0xC4E8,0xC95F,INVALC,0xAC71,0xCF67,0xAEEF,
-	INVALC,INVALC,0xB1FE,INVALC,0xB4DF,0xD9E2,INVALC,0xB7B5,
-	0xB7B4,INVALC,INVALC,0xE269,0xE26A,0xBCDD,0xBCDE,0xE9E5,
-	0xE9E4,0xEFE9,0xF7E3,0xA4F0,0xC960,0xA5C0,INVALC,0xA843,
-	0xCB48,INVALC,0xAC72,0xB7B6,0xA4F1,INVALC,0xCF68,0xAC73,
-	0xCF69,INVALC,0xC0D5,0xA4F2,INVALC,INVALC,0xCCEC,INVALC,
-	0xCF6A,INVALC,0xD242,0xD241,0xD1FE,INVALC,0xD1FD,0xD243,
-	0xD240,INVALC,INVALC,0xB240,0xB241,INVALC,INVALC,0xB4E0,
-	0xD9E3,INVALC,0xD9E4,0xD9E5,INVALC,INVALC,INVALC,0xDE41,
-	0xDE42,0xDE40,INVALC,0xDDFD,0xDDFE,0xB7B7,0xE26B,0xE5F7,
-	/* Block 109, Array index 0x2D00 */
-	0xE5F6,0xE5F5,0xE5F8,0xE9E7,0xE9E6,0xBEFB,0xE9E8,INVALC,
-	0xC0D6,0xED4D,INVALC,0xEFEA,0xF25B,0xF6E7,INVALC,0xA4F3,
-	0xA5C2,0xA5C1,INVALC,0xAA5D,0xC961,0xC97E,0xA6BB,INVALC,
-	0xC9F7,0xCB49,0xCB4A,0xAA5E,INVALC,0xCCED,INVALC,0xAC74,
-	0xCF6B,0xCF6C,INVALC,0xAEF0,0xAEF4,0xD244,0xAEF3,0xAEF1,
-	0xAEF2,INVALC,0xD5DF,0xB242,0xB4E3,INVALC,0xB4E1,0xB4E2,
-	0xD9E6,INVALC,INVALC,0xBA72,0xA4F4,INVALC,0xC9A1,INVALC,
-	0xA5C3,INVALC,INVALC,0xC9A4,INVALC,INVALC,0xA5C6,0xC9A3,
-	0xA5C5,0xA5C4,0xA844,0xC9A2,INVALC,INVALC,0xC9F8,INVALC,
-	INVALC,INVALC,0xC9FC,0xC9FE,0xCA40,0xA6C5,0xA6C6,0xC9FB,
-	0xA6C1,INVALC,0xC9F9,INVALC,0xC9FD,0xA6C2,INVALC,0xA6BD,
-	INVALC,0xA6BE,INVALC,0xA6C4,0xC9FA,0xA6BC,0xA845,0xA6BF,
-	0xA6C0,0xA6C3,INVALC,INVALC,INVALC,0xCB5B,0xCB59,0xCB4C,
-	0xA851,0xCB53,0xA84C,0xCB4D,INVALC,0xCB55,INVALC,0xCB52,
-	0xA84F,0xCB51,0xA856,0xCB5A,0xA858,INVALC,0xA85A,INVALC,
-	0xCB4B,INVALC,0xA84D,0xCB5C,INVALC,0xA854,0xA857,INVALC,
-	0xCD45,0xA847,0xA85E,0xA855,0xCB4E,0xA84A,0xA859,0xCB56,
-	0xA848,0xA849,0xCD43,0xCB4F,0xA850,0xA85B,0xCB5D,0xCB50,
-	0xA84E,INVALC,0xA853,0xCCEE,0xA85C,0xCB57,0xA852,INVALC,
-	0xA85D,0xA846,0xCB54,0xA84B,0xCB58,0xCD44,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xAA6A,0xAA7A,0xCCF5,0xAA71,INVALC,
-	0xCD4B,0xAA62,INVALC,0xAA65,0xCD42,INVALC,0xCCF3,0xCCF7,
-	0xAA6D,0xAA6F,0xCCFA,0xAA76,0xAA68,0xAA66,0xAA67,0xAA75,
-	0xCD47,0xAA70,0xCCF9,0xCCFB,0xAA6E,0xAA73,0xCCFC,0xCD4A,
-	INVALC,0xAC75,0xAA79,INVALC,0xAA63,0xCD49,INVALC,0xCD4D,
-	0xCCF8,0xCD4F,0xCD40,0xAA6C,0xCCF4,0xAA6B,0xAA7D,0xAA72,
-	INVALC,0xCCF2,0xCF75,0xAA78,0xAA7C,0xCD41,0xCD46,INVALC,
-	0xAA7E,0xAA77,0xAA69,0xAA5F,INVALC,0xAA64,INVALC,0xCCF6,
-	0xAA60,0xCD4E,INVALC,0xCCF0,0xCCEF,0xCCFD,0xCCF1,0xAA7B,
-	0xAEF5,0xAA74,0xCCFE,0xAA61,INVALC,0xACA6,INVALC,INVALC,
-	INVALC,0xCD4C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 110, Array index 0x2E00 */
-	0xCF7C,0xCFA1,INVALC,0xCFA4,0xCF77,INVALC,INVALC,0xCFA7,
-	0xCFAA,0xCFAC,0xCF74,0xAC76,0xAC7B,0xD249,0xACAD,0xCFA5,
-	0xCFAD,0xCF7B,0xCF73,INVALC,INVALC,INVALC,0xD264,0xAC7E,
-	0xCFA2,0xCF78,0xCF7A,0xACA5,INVALC,0xCF7D,0xAC7D,0xCF70,
-	0xCFA8,INVALC,0xCFAB,INVALC,INVALC,0xAC7A,INVALC,0xACA8,
-	0xCF6D,0xACAA,0xAC78,0xACAE,0xCFA9,0xCF6F,0xACAB,0xD25E,
-	0xCD48,0xAC7C,0xAC77,0xCF76,0xCF6E,0xACAC,0xACA4,0xCFA3,
-	0xACA9,0xACA7,0xCF79,0xACA1,0xCF71,0xACA2,0xACA3,0xCF72,
-	0xCFA6,0xAC79,0xCF7E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xD24C,0xAEFD,0xAF43,INVALC,INVALC,INVALC,0xD255,0xD25B,
-	0xD257,0xD24A,0xD24D,0xD246,0xD247,0xAF4A,0xAEFA,0xD256,
-	0xD25F,0xAF45,0xAEF6,INVALC,0xAF40,0xD24E,0xAF42,0xD24F,
-	0xD259,INVALC,INVALC,INVALC,0xAF44,0xD268,0xD248,0xAEFC,
-	0xAEFB,0xAF48,0xD245,0xD266,0xD25A,0xD267,0xD261,0xD253,
-	0xD262,INVALC,0xD25C,0xD265,0xD263,0xAF49,0xD254,0xAEF9,
-	0xAEF8,0xAF41,0xAF47,0xD260,0xAF46,0xD251,0xB243,INVALC,
-	0xD269,0xD250,0xD24B,0xAEFE,0xAF4B,0xAEF7,INVALC,0xD258,
-	0xD25D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xB265,0xD5E1,0xD5E5,INVALC,0xB252,0xB250,
-	INVALC,INVALC,0xB247,0xD5E3,0xD5E2,0xB25B,INVALC,0xD5E8,
-	0xB255,INVALC,0xD5FA,0xD647,0xB244,0xD5F7,0xD5F0,0xB267,
-	0xD5E0,INVALC,0xD5FC,INVALC,0xB264,0xB258,0xB263,0xB24E,
-	0xD5EC,0xD5FE,0xD5F6,0xB24F,0xB249,0xD645,INVALC,0xD5FD,
-	0xD640,0xB251,0xB259,0xD642,0xD5EA,0xD5FB,0xD5EF,0xD644,
-	0xB25E,0xB246,0xB25C,0xD5F4,0xD5F2,0xD5F3,0xB253,0xD5EE,
-	0xD5ED,0xB248,0xD5E7,0xD646,0xB24A,0xD5F1,0xB268,INVALC,
-	0xB262,0xD5E6,0xB25F,0xB25D,0xB266,0xD5F8,0xB261,0xD252,
-	0xD5F9,0xB260,0xD641,0xB245,0xD5F5,0xB257,0xD5E9,0xB256,
-	INVALC,0xB254,0xB24C,0xB24B,0xD9E7,0xD643,INVALC,INVALC,
-	/* Block 111, Array index 0x2F00 */
-	0xD5EB,INVALC,INVALC,0xD9FC,INVALC,0xB24D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xB541,0xB25A,0xB4EE,0xD9F6,0xB4FC,INVALC,0xD9EA,
-	0xB4EB,0xB4E7,0xDA49,0xB4ED,0xB4F1,0xB4EC,0xB4F5,0xDA4D,
-	0xDA44,INVALC,INVALC,0xD9F1,0xB4FA,0xB4F4,0xD9FD,0xB4E4,
-	0xDA4A,0xDA43,0xB4E8,0xD9F7,0xB4F7,0xDA55,0xDA56,INVALC,
-	0xB4E5,0xDA48,0xB4F9,0xD9FB,0xD9ED,0xD9EE,0xB4FD,0xD9F2,
-	0xD9F9,0xD9F3,INVALC,0xB4FB,0xB544,0xD9EF,0xD9E8,0xD9E9,
-	INVALC,0xD9EB,0xB4EA,0xD9F8,INVALC,0xB4F8,0xB542,INVALC,
-	INVALC,0xD9FA,0xDA53,0xDA4B,0xB4E6,0xDA51,0xB4F2,INVALC,
-	0xB4F0,INVALC,0xDA57,0xB4EF,0xDA41,0xD9F4,0xD9FE,0xB547,
-	0xDA45,0xDA42,0xD9F0,0xB543,0xDA4F,0xDA4C,0xDA54,0xB4E9,
-	0xDA40,0xB546,INVALC,0xDA47,INVALC,INVALC,0xB4F3,0xB4F6,
-	INVALC,0xDA46,0xB545,0xD9F5,0xD5E4,INVALC,INVALC,0xDA50,
-	0xDA4E,0xDA52,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xD9EC,0xB540,INVALC,INVALC,INVALC,0xDE61,0xDE60,0xDE46,
-	0xB7BD,INVALC,0xDE5F,0xDE49,0xDE4A,INVALC,0xB7C7,0xDE68,
-	0xB7C2,0xDE5E,INVALC,0xDE43,0xB7C8,0xB7BE,0xDE52,0xDE48,
-	0xDE4B,0xDE63,0xB7B8,0xDE6A,0xDE62,0xB7C1,0xDE57,0xB7CC,
-	INVALC,INVALC,0xB7CB,0xB7C5,INVALC,INVALC,0xDE69,0xB7B9,
-	0xDE55,0xDE4C,0xDE59,0xDE65,0xB7CD,INVALC,0xB7BB,0xDE54,
-	INVALC,0xDE4D,0xB7C4,INVALC,0xB7C3,0xDE50,0xDE5A,0xDE64,
-	0xDE47,0xDE51,0xB7BC,0xDE5B,0xB7C9,0xB7C0,0xDE4E,0xB7BF,
-	0xDE45,0xDE53,0xDE67,0xB4FE,0xBAB0,0xDE56,0xE26C,0xDE58,
-	0xDE66,0xB7C6,0xDE4F,0xB7BA,0xB7CA,0xBCF0,0xDE44,INVALC,
-	0xDE5D,INVALC,INVALC,INVALC,0xDE5C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xE2AA,0xBAAD,0xE27D,0xE2A4,0xBAA2,
-	INVALC,0xE26E,0xBAAF,INVALC,0xBA77,0xE26D,0xE2B0,0xBAB1,
-	0xE271,0xE2A3,INVALC,0xE273,0xE2B3,0xE2AF,0xBA75,0xBAA1,
-	/* Block 112, Array index 0x3000 */
-	0xE653,0xBAAE,0xBA7D,0xE26F,INVALC,0xE2AE,0xBAA3,0xE2AB,
-	0xE2B8,0xE275,0xE27E,INVALC,INVALC,0xE2B6,0xE2AC,0xBA7C,
-	INVALC,INVALC,0xE27C,0xBA76,0xBA74,0xBAA8,INVALC,INVALC,
-	0xE27A,0xE277,0xE278,INVALC,0xE2B2,INVALC,0xE2B7,0xE2B5,
-	0xBA7A,0xE2B9,0xBA7E,0xBAA7,INVALC,0xE270,0xE5FA,0xE279,
-	INVALC,0xBA78,0xBAAC,0xBAA9,0xBA7B,0xE2A5,0xE274,0xBAAA,
-	0xE2A7,0xBAA4,0xBAA6,0xBA73,INVALC,0xE2A9,0xE2A1,0xE272,
-	0xBAA5,0xE2B1,0xE2B4,0xE27B,0xE2A8,INVALC,0xBA79,0xBCDF,
-	0xE2A6,0xE5F9,INVALC,0xE2AD,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xE276,0xE644,
-	0xE64E,0xBCE2,0xE64D,0xE659,0xBCE4,0xE64B,INVALC,0xE64F,
-	0xBCEF,INVALC,0xE646,0xBCE7,INVALC,0xE652,0xE9F0,0xBCF3,
-	0xBCF2,0xE654,0xE643,0xE65E,0xBCED,INVALC,0xBCE3,0xE657,
-	INVALC,0xE65B,0xE660,0xE655,0xE649,0xBCE6,0xBCE9,0xBCF1,
-	0xBCEC,INVALC,0xE64C,0xE2A2,INVALC,INVALC,0xE648,0xE65F,
-	0xBCE8,INVALC,0xBCEB,0xE661,0xBCE0,0xE656,0xE5FB,0xE65C,
-	0xC0DF,INVALC,0xE64A,INVALC,0xBCE1,0xE645,0xBCE5,0xE5FC,
-	0xBAAB,0xE641,INVALC,0xE65A,0xE642,0xE640,0xBCEA,INVALC,
-	0xE658,INVALC,0xE5FE,0xE651,0xE650,0xE65D,0xE647,0xBCEE,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xE9F3,INVALC,
-	0xBF49,0xBEFE,0xEA40,0xE9EB,0xBF41,0xE9F7,0xBF48,0xBF43,
-	0xE9F5,0xED4F,0xE9FB,0xEA42,0xE9FA,0xE9E9,0xE9F8,0xEA44,
-	0xEA46,0xBEFD,0xEA45,0xBF44,0xBF4A,INVALC,0xBF47,INVALC,
-	0xE9FE,0xBF46,0xE9F9,INVALC,0xE9ED,0xE9F2,INVALC,0xE9FD,
-	0xBF45,0xBF42,0xBEFC,0xBF40,0xE9F1,INVALC,0xE5FD,0xE9EC,
-	0xE9EF,0xEA41,0xE9F4,0xE9EA,0xED4E,0xEA43,0xE9EE,0xE9FC,
-	INVALC,INVALC,INVALC,INVALC,0xED51,0xC0E3,INVALC,INVALC,
-	0xC0D7,INVALC,INVALC,0xC0DB,0xED53,0xED59,0xED57,0xC0D9,
-	0xC0DA,0xC0E1,0xED5A,0xED52,0xC0DC,INVALC,0xED56,0xED55,
-	0xED5B,0xC0E2,INVALC,0xC0DD,0xC0E0,0xED54,0xC0E4,0xC0DE,
-	0xC0E5,0xC0D8,0xED58,INVALC,0xED50,INVALC,INVALC,0xEFF7,
-	INVALC,INVALC,0xC271,0xEFF4,0xEFF6,INVALC,0xC26F,0xEFF2,
-	/* Block 113, Array index 0x3100 */
-	0xEFF3,0xEFEE,INVALC,INVALC,0xE9F6,0xEFEF,0xC270,0xEFEB,
-	INVALC,0xC26D,0xEFF8,0xC26E,0xEFEC,0xEFED,0xEFF1,0xC273,
-	INVALC,0xC272,INVALC,INVALC,0xEFF0,0xC378,0xF25F,0xF265,
-	0xC379,0xF25C,0xC376,0xC373,0xF267,0xC377,INVALC,0xC374,
-	0xF25E,0xF261,0xF262,0xF263,0xF266,INVALC,0xEFF5,0xF25D,
-	0xC375,0xF264,0xF268,0xF260,INVALC,INVALC,INVALC,0xF45D,
-	0xC46A,0xF460,0xC46B,0xF468,0xF45F,0xF45C,INVALC,0xF45E,
-	0xF462,0xF465,0xF464,0xF467,0xF45B,INVALC,0xC469,0xF463,
-	0xF466,0xF469,0xF461,0xF5D3,0xF5D4,0xF5D8,0xF5D9,INVALC,
-	0xF5D6,0xF5D7,0xF5D5,INVALC,0xC4E9,INVALC,INVALC,INVALC,
-	INVALC,0xC578,0xF6EB,INVALC,INVALC,0xF6E8,0xF6E9,0xF6EA,
-	0xC579,INVALC,0xF7E5,0xF7E4,INVALC,0xF8AF,0xC5F4,0xF8AD,
-	0xF8B0,0xF8AE,0xF8F5,0xC657,0xC665,0xF9A3,0xF96C,INVALC,
-	0xF9A2,0xF9D0,0xF9D1,0xA4F5,INVALC,INVALC,INVALC,INVALC,
-	0xA6C7,0xCA41,INVALC,INVALC,0xCB5E,INVALC,0xA85F,INVALC,
-	0xA862,INVALC,0xCB5F,INVALC,0xA860,0xA861,INVALC,INVALC,
-	INVALC,INVALC,0xCD58,0xCD5A,0xCD55,0xCD52,0xCD54,INVALC,
-	INVALC,INVALC,0xAAA4,INVALC,INVALC,INVALC,0xAAA2,INVALC,
-	INVALC,0xCD56,0xAAA3,0xCD53,0xCD50,0xAAA1,0xCD57,INVALC,
-	0xCD51,0xAAA5,0xCD59,INVALC,INVALC,INVALC,INVALC,0xCFAF,
-	INVALC,0xCFB3,INVALC,INVALC,0xACB7,INVALC,INVALC,INVALC,
-	INVALC,0xCFB6,INVALC,0xACAF,0xACB2,0xACB4,0xACB6,0xACB3,
-	0xCFB2,0xCFB1,INVALC,0xACB1,0xCFB4,0xCFB5,INVALC,0xCFAE,
-	0xACB5,INVALC,0xACB0,INVALC,INVALC,INVALC,0xCFB0,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xD277,0xD278,0xD279,
-	0xAF50,INVALC,0xAF4C,0xD26E,INVALC,0xD276,0xD27B,0xAF51,
-	INVALC,0xD26C,0xD272,0xD26B,0xD275,INVALC,INVALC,0xD271,
-	0xAF4D,0xAF4F,0xD27A,INVALC,0xD26A,0xD26D,0xD273,INVALC,
-	0xD274,0xD27C,0xD270,INVALC,0xAF4E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xB26D,
-	0xD64E,INVALC,INVALC,0xD650,0xD64C,INVALC,0xD658,0xD64A,
-	0xD657,0xB269,0xD648,0xDA5B,0xD652,0xB26C,INVALC,0xD653,
-	/* Block 114, Array index 0x3200 */
-	0xD656,INVALC,0xD65A,INVALC,0xD64F,INVALC,0xD654,INVALC,
-	INVALC,0xB26A,0xB26B,0xD659,0xD64D,0xD649,0xD65B,INVALC,
-	0xD651,INVALC,INVALC,0xD655,INVALC,INVALC,INVALC,0xD64B,
-	INVALC,0xB548,0xB549,0xDA65,0xB54F,INVALC,0xDA59,0xDA62,
-	0xDA58,0xB54C,0xDA60,0xDA5E,INVALC,0xDA5F,0xB54A,INVALC,
-	0xDA63,INVALC,INVALC,INVALC,INVALC,INVALC,0xDA5C,0xDA5A,
-	0xB54B,0xDA5D,0xDA61,INVALC,INVALC,INVALC,0xB54D,INVALC,
-	INVALC,INVALC,0xDA64,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xDE70,0xDE77,0xDE79,0xDEA1,INVALC,0xB7DA,0xDE6B,
-	INVALC,0xB7D2,INVALC,0xDE7A,0xB7D7,0xDEA2,0xB7CE,INVALC,
-	0xDE7D,INVALC,0xDE6D,0xDE7E,0xDE6C,INVALC,0xB7DC,INVALC,
-	0xDE78,0xB7CF,0xDEA3,INVALC,0xB7D4,0xDE71,0xB7D9,0xDE7C,
-	0xDE6F,0xDE76,0xDE72,0xDE6E,0xB7D1,0xB7D8,0xB7D6,0xB7D3,
-	0xB7DB,0xB7D0,0xDE75,INVALC,0xB7D5,INVALC,0xB54E,INVALC,
-	0xDE7B,INVALC,0xDE73,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xDE74,INVALC,INVALC,0xE2C1,INVALC,0xBAB4,INVALC,INVALC,
-	0xE2BD,0xE2C3,0xE2BF,INVALC,0xBAB6,0xE2BE,0xE2C2,0xE2BA,
-	INVALC,0xE2BC,0xBAB5,INVALC,INVALC,INVALC,INVALC,0xE2C0,
-	0xE2BB,INVALC,0xBAB7,INVALC,0xBAB2,INVALC,INVALC,0xE2C4,
-	INVALC,0xBAB3,0xE667,0xE664,0xE670,0xE66A,0xE66C,0xBCF4,
-	0xE666,0xE66E,INVALC,INVALC,0xE66D,0xE66B,INVALC,0xE671,
-	0xBCF7,0xE668,0xE66F,INVALC,0xBCF5,INVALC,INVALC,0xE663,
-	0xE665,0xBCF6,0xE662,0xE672,INVALC,0xE669,INVALC,INVALC,
-	0xEA4A,0xBF51,INVALC,INVALC,0xEA55,0xEA53,0xBF4B,0xEA49,
-	0xEA4C,0xEA4D,0xEA48,0xBF55,0xBF56,0xEA47,0xEA56,0xEA51,
-	0xBF4F,0xBF4C,0xEA50,0xEA4E,INVALC,INVALC,0xBF52,0xEA52,
-	0xBF4D,INVALC,0xBF4E,INVALC,0xEA4F,0xBF50,0xEA4B,INVALC,
-	0xEA54,0xBF53,0xEA57,0xEA58,0xBF54,INVALC,INVALC,0xC0E7,
-	0xC0EE,0xED5C,0xED62,INVALC,0xED60,0xC0EA,0xC0E9,0xC0E6,
-	0xED5E,INVALC,INVALC,INVALC,0xC0EC,0xC0EB,0xC0E8,INVALC,
-	0xED61,0xED5D,0xED5F,INVALC,0xC0ED,INVALC,INVALC,INVALC,
-	0xC277,0xEFFB,INVALC,0xC274,0xC275,0xEFFD,0xC276,0xEFFA,
-	/* Block 115, Array index 0x3300 */
-	INVALC,0xEFF9,0xF26C,0xEFFC,INVALC,0xF26D,0xC37A,0xF26B,
-	INVALC,INVALC,0xF26A,INVALC,0xF269,0xC37B,INVALC,INVALC,
-	0xC46C,INVALC,INVALC,0xF46A,0xF46B,INVALC,INVALC,INVALC,
-	INVALC,0xF5DC,0xF5DB,0xC4EA,INVALC,0xF5DA,0xF6EC,0xF6ED,
-	INVALC,INVALC,0xF7E6,0xF8B1,INVALC,INVALC,0xF8F6,0xF9BC,
-	0xC679,0xF9C6,0xA4F6,INVALC,0xAAA6,0xAAA7,INVALC,INVALC,
-	0xACB8,INVALC,INVALC,INVALC,INVALC,0xC0EF,0xA4F7,INVALC,
-	0xAAA8,0xAF52,0xB7DD,0xA4F8,INVALC,0xB26E,0xBAB8,0xC962,
-	INVALC,0xCFB7,0xD27D,INVALC,0xE2C5,INVALC,0xC0F0,0xA4F9,
-	0xAAA9,0xCFB8,0xCFB9,0xDA66,0xB550,INVALC,INVALC,0xDEA4,
-	INVALC,INVALC,0xB7DE,0xE2C6,INVALC,INVALC,0xBCF8,INVALC,
-	0xC37C,0xA4FA,0xDA67,0xA4FB,INVALC,0xA6C9,0xCA42,0xA6C8,
-	0xA865,0xA864,0xA863,0xCB60,INVALC,INVALC,INVALC,0xAAAA,
-	INVALC,0xAAAB,0xCD5B,INVALC,0xCFBA,INVALC,0xCFBD,0xACBA,
-	0xCFBB,INVALC,0xACB9,0xCFBC,0xACBB,INVALC,0xD2A2,0xD2A1,
-	0xD27E,0xAF53,INVALC,0xD65D,0xD65E,0xB26F,0xD65C,0xD65F,
-	0xB552,0xB270,INVALC,INVALC,0xB551,0xDA6B,0xDA6A,INVALC,
-	0xDA68,0xDA69,INVALC,0xDA6C,0xDEA6,0xDEA5,0xDEA9,INVALC,
-	0xDEA8,0xDEA7,0xBAB9,0xE2C9,INVALC,0xE2C8,0xBABA,0xE2C7,
-	0xE673,INVALC,0xE674,0xBCF9,INVALC,0xEA59,0xEA5A,INVALC,
-	INVALC,0xF272,0xC37D,0xF271,0xF270,0xF26E,0xF26F,0xC4EB,
-	0xF46C,0xF6EE,0xF8F7,INVALC,0xA4FC,INVALC,0xC9A5,0xA5C7,
-	0xC9A6,INVALC,INVALC,INVALC,0xCA43,0xCA44,INVALC,INVALC,
-	INVALC,INVALC,0xCB66,INVALC,INVALC,0xCB62,INVALC,0xCB61,
-	0xAAAC,0xCB65,0xA867,0xCB63,0xA866,0xCB67,0xCB64,INVALC,
-	INVALC,0xCD5F,0xCFBE,0xCD5D,0xCD64,INVALC,0xAAAD,INVALC,
-	0xAAB0,0xCD65,0xCD61,INVALC,0xCD62,INVALC,0xCD5C,0xAAAF,
-	0xCD5E,0xAAAE,0xCD63,INVALC,0xCD60,INVALC,INVALC,0xCFC2,
-	0xACBD,0xACBE,INVALC,0xCFC5,0xCFBF,INVALC,0xCFC4,INVALC,
-	0xCFC0,0xACBC,0xCFC3,0xCFC1,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xD2A8,0xD2A5,INVALC,0xD2A7,0xAF58,
-	0xAF57,0xAF55,0xD2A4,0xD2A9,0xAF54,0xAF56,0xD2A6,0xD667,
-	/* Block 116, Array index 0x3400 */
-	0xD2A3,0xD2AA,INVALC,INVALC,INVALC,INVALC,INVALC,0xD662,
-	0xD666,INVALC,0xD665,0xDA6E,0xDA79,INVALC,INVALC,0xD668,
-	INVALC,0xD663,0xDA6D,0xB274,INVALC,INVALC,0xB273,0xD661,
-	0xD664,0xB275,INVALC,0xB272,0xB271,0xD660,0xD669,INVALC,
-	INVALC,INVALC,0xDA70,0xDA77,INVALC,0xB554,0xDA76,0xDA73,
-	INVALC,0xB556,INVALC,INVALC,INVALC,0xDA75,INVALC,INVALC,
-	0xDA6F,0xDA71,0xDA74,0xDA72,0xB555,0xDA78,0xB553,0xB7DF,
-	INVALC,INVALC,0xDEAD,0xDEAC,0xDEAA,INVALC,0xB7E2,0xB7E1,
-	0xDEAE,INVALC,0xDEAB,0xE2CA,0xBABB,0xB7E0,INVALC,INVALC,
-	INVALC,0xDEB0,0xDEAF,INVALC,0xE2CD,0xE2CB,0xBCFA,INVALC,
-	0xBABC,0xE2CC,0xE676,INVALC,INVALC,INVALC,INVALC,0xBCFB,
-	0xE675,0xE67E,0xE67D,0xE67B,INVALC,0xE67A,0xE677,0xE678,
-	0xE679,0xE67C,0xE6A1,INVALC,INVALC,0xEA5F,0xEA5C,0xEA5D,
-	0xBF57,0xEA5B,0xEA61,0xEA60,0xEA5E,INVALC,0xED64,0xED65,
-	0xC0F1,INVALC,0xC0F2,0xED63,INVALC,0xC279,0xEFFE,0xC278,
-	0xC37E,INVALC,0xC3A1,0xC46D,0xF46E,0xF46D,0xF5DD,0xF6EF,
-	0xC57A,0xF7E8,0xF7E7,0xF7E9,0xA5C8,0xCFC6,0xAF59,0xB276,
-	0xD66A,0xA5C9,0xC9A7,0xA4FD,INVALC,INVALC,0xCA45,INVALC,
-	INVALC,INVALC,0xCB6C,0xCB6A,0xCB6B,0xCB68,0xA868,0xCB69,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xCD6D,INVALC,0xAAB3,
-	0xCD6B,0xCD67,0xCD6A,INVALC,0xCD66,0xAAB5,0xCD69,INVALC,
-	0xAAB2,0xAAB1,INVALC,0xAAB4,0xCD6C,0xCD68,INVALC,INVALC,
-	INVALC,INVALC,0xACC2,0xACC5,0xCFCE,0xCFCD,0xCFCC,0xACBF,
-	0xCFD5,0xCFCB,INVALC,0xACC1,0xD2AF,INVALC,0xCFD2,0xCFD0,
-	0xACC4,INVALC,0xCFC8,0xCFD3,INVALC,0xCFCA,0xCFD4,0xCFD1,
-	0xCFC9,INVALC,0xACC0,0xCFD6,0xCFC7,0xACC3,INVALC,INVALC,
-	INVALC,INVALC,0xD2B4,0xD2AB,0xD2B6,INVALC,0xD2AE,0xD2B9,
-	0xD2BA,0xD2AC,0xD2B8,0xD2B5,0xD2B3,0xD2B7,0xAF5F,INVALC,
-	0xAF5D,INVALC,INVALC,0xD2B1,INVALC,0xD2AD,INVALC,0xD2B0,
-	0xD2BB,0xD2B2,0xAF5E,0xCFCF,INVALC,0xAF5A,0xAF5C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xD678,0xD66D,0xD66B,INVALC,
-	0xD66C,INVALC,0xD673,INVALC,0xD674,0xD670,0xB27B,0xD675,
-	/* Block 117, Array index 0x3500 */
-	0xD672,0xD66F,INVALC,0xB279,0xD66E,0xB277,0xB27A,0xD671,
-	0xD679,0xAF5B,0xB278,0xD677,0xD676,0xB27C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xDA7E,INVALC,
-	INVALC,INVALC,0xDAA1,0xB560,INVALC,0xDAA7,INVALC,INVALC,
-	0xDAA9,0xDAA2,0xB55A,0xDAA6,0xDAA5,0xB55B,0xB561,INVALC,
-	0xB562,0xDAA8,0xB558,0xDA7D,0xDA7B,0xDAA3,0xDA7A,0xB55F,
-	0xDA7C,0xDAA4,0xDAAA,0xB559,0xB55E,0xB55C,0xB55D,INVALC,
-	INVALC,INVALC,0xB557,INVALC,INVALC,INVALC,INVALC,0xB7E9,
-	0xDEB7,0xB7E8,0xDEBB,INVALC,0xDEB1,INVALC,0xDEBC,INVALC,
-	INVALC,INVALC,0xDEB2,0xDEB3,INVALC,0xDEBD,0xDEBA,0xDEB8,
-	0xDEB9,0xDEB5,0xDEB4,INVALC,0xDEBE,0xB7E5,INVALC,0xDEB6,
-	INVALC,0xB7EA,0xB7E4,0xB7EB,0xB7EC,INVALC,0xB7E7,0xB7E6,
-	INVALC,INVALC,0xE2CE,0xBABE,0xBABD,INVALC,INVALC,0xE2D3,
-	INVALC,0xBCFC,0xBABF,INVALC,INVALC,0xBAC1,0xE2D4,0xB7E3,
-	0xBAC0,0xE2D0,0xE2D2,0xE2CF,INVALC,0xE2D1,INVALC,INVALC,
-	INVALC,0xE6AB,INVALC,INVALC,0xE6AA,0xE6A7,0xBD40,0xEA62,
-	0xBD41,0xE6A6,INVALC,0xBCFE,INVALC,0xE6A8,0xE6A5,0xE6A2,
-	0xE6A9,0xE6A3,0xE6A4,0xBCFD,INVALC,INVALC,INVALC,INVALC,
-	0xED69,INVALC,0xEA66,INVALC,0xEA65,0xEA67,INVALC,0xED66,
-	0xBF5A,INVALC,0xEA63,INVALC,0xBF58,INVALC,0xBF5C,0xBF5B,
-	0xEA64,0xEA68,INVALC,0xBF59,INVALC,0xED6D,0xC0F5,0xC27A,
-	0xC0F6,0xC0F3,0xED6A,0xED68,INVALC,0xED6B,INVALC,0xED6E,
-	0xC0F4,0xED6C,0xED67,INVALC,INVALC,0xF042,0xF045,0xF275,
-	0xF040,INVALC,0xF46F,0xF046,INVALC,0xC3A2,0xF044,0xC27B,
-	0xF041,0xF043,0xF047,0xF276,INVALC,0xF274,INVALC,INVALC,
-	INVALC,INVALC,0xC3A3,0xF273,INVALC,INVALC,INVALC,0xC46E,
-	INVALC,INVALC,INVALC,INVALC,0xC4ED,0xF6F1,0xC4EC,0xF6F3,
-	0xF6F0,0xF6F2,0xC5D0,0xF8B2,0xA5CA,0xCD6E,0xD2BC,0xD2BD,
-	0xB27D,0xDEBF,0xBF5D,0xC3A4,0xC57B,0xF8B3,0xA5CB,INVALC,
-	0xCD6F,0xA260,INVALC,INVALC,0xCFD7,INVALC,0xCFD8,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xD2BE,0xD2BF,0xB27E,0xB2A1,
-	INVALC,INVALC,INVALC,0xDAAB,INVALC,0xDEC2,0xDEC1,0xDEC0,
-	/* Block 118, Array index 0x3600 */
-	0xE2D5,INVALC,0xE2D6,0xE2D7,0xBAC2,INVALC,INVALC,0xE6AD,
-	0xE6AC,INVALC,INVALC,0xEA69,0xBF5E,0xBF5F,INVALC,0xED72,
-	0xED6F,0xED70,0xED71,0xF049,0xF048,0xC27C,0xF277,0xF5DE,
-	0xA5CC,INVALC,0xACC6,INVALC,0xB2A2,0xDEC3,INVALC,0xA5CD,
-	INVALC,0xD2C0,0xB2A3,INVALC,INVALC,0xB563,0xB564,INVALC,
-	0xA5CE,0xA5CF,0xCA46,0xA86A,0xA869,0xACC7,0xCFD9,0xDAAC,
-	0xA5D0,0xA5D1,0xA5D2,0xA5D3,INVALC,INVALC,INVALC,0xA86B,
-	0xA86C,0xCB6E,0xCB6D,INVALC,INVALC,0xAAB6,0xCD72,0xCD70,
-	0xCD71,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xCFDA,
-	0xCFDB,INVALC,INVALC,0xACCB,0xACC9,INVALC,0xACCA,0xACC8,
-	INVALC,INVALC,INVALC,INVALC,0xAF60,INVALC,INVALC,INVALC,
-	INVALC,0xAF64,0xAF63,0xD2C1,0xAF62,0xAF61,INVALC,0xD2C2,
-	INVALC,INVALC,0xB2A6,0xD67B,0xD67A,0xB2A4,0xB2A5,INVALC,
-	INVALC,INVALC,0xB566,0xB565,0xDAAE,INVALC,INVALC,0xDAAD,
-	0xB2A7,INVALC,INVALC,INVALC,INVALC,INVALC,0xB7ED,0xDEC5,
-	0xB7EE,0xDEC4,INVALC,INVALC,INVALC,0xE2D8,0xE6AE,0xBD42,
-	0xEA6A,INVALC,INVALC,INVALC,0xED73,INVALC,0xC3A6,0xC3A5,
-	INVALC,INVALC,0xC57C,0xA5D4,0xCD73,INVALC,INVALC,0xB2A8,
-	0xE2D9,0xBAC3,INVALC,INVALC,0xCB6F,0xCB70,INVALC,INVALC,
-	0xCD74,0xAAB8,0xAAB9,INVALC,INVALC,0xAAB7,INVALC,INVALC,
-	INVALC,INVALC,0xACCF,0xACD0,0xACCD,0xACCE,INVALC,0xCFDC,
-	INVALC,INVALC,0xCFDD,0xACCC,INVALC,INVALC,INVALC,INVALC,
-	0xD2C3,INVALC,0xAF68,0xAF69,INVALC,0xB2AB,0xD2C9,INVALC,
-	0xAF6E,0xAF6C,0xD2CA,0xD2C5,0xAF6B,0xAF6A,0xAF65,0xD2C8,
-	0xD2C7,0xD2C4,0xAF6D,INVALC,0xD2C6,0xAF66,INVALC,0xAF67,
-	INVALC,INVALC,0xB2AC,0xD6A1,0xD6A2,0xB2AD,0xD67C,0xD67E,
-	0xD6A4,0xD6A3,0xD67D,INVALC,0xB2A9,0xB2AA,INVALC,0xDAB6,
-	0xB56B,0xB56A,0xDAB0,0xB568,INVALC,0xDAB3,0xB56C,0xDAB4,
-	0xB56D,0xDAB1,0xB567,0xB569,0xDAB5,INVALC,0xDAB2,0xDAAF,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xDED2,INVALC,0xDEC7,
-	0xB7F0,0xB7F3,0xB7F2,0xB7F7,0xB7F6,0xDED3,0xDED1,0xDECA,
-	0xDECE,0xDECD,0xB7F4,0xDED0,0xDECC,0xDED4,0xDECB,0xB7F5,
-	/* Block 119, Array index 0x3700 */
-	0xB7EF,0xB7F1,INVALC,0xDEC9,INVALC,INVALC,INVALC,INVALC,
-	0xE2DB,0xBAC7,0xE2DF,0xBAC6,0xE2DC,0xBAC5,INVALC,0xDEC8,
-	0xDECF,0xE2DE,INVALC,0xBAC8,0xE2E0,0xE2DD,0xE2DA,INVALC,
-	INVALC,0xE6B1,0xE6B5,0xE6B7,0xE6B3,0xE6B2,0xE6B0,0xBD45,
-	0xBD43,0xBD48,0xBD49,0xE6B4,0xBD46,0xE6AF,0xBD47,0xBAC4,
-	0xE6B6,0xBD44,INVALC,INVALC,INVALC,0xEA6C,INVALC,0xEA6B,
-	0xEA73,0xEA6D,0xEA72,0xEA6F,0xBF60,0xEA71,INVALC,INVALC,
-	0xBF61,INVALC,0xBF62,INVALC,0xEA70,0xEA6E,INVALC,INVALC,
-	INVALC,INVALC,0xC0F8,0xED74,INVALC,INVALC,0xC0F7,0xED77,
-	0xED75,0xED76,INVALC,INVALC,0xC0F9,INVALC,INVALC,INVALC,
-	0xF04D,INVALC,0xC2A1,0xF04E,INVALC,INVALC,0xC27D,0xF04F,
-	0xC27E,0xF04C,0xF050,INVALC,0xF04A,INVALC,INVALC,0xC3A7,
-	0xF278,0xC3A8,0xC46F,INVALC,0xF04B,0xC470,INVALC,INVALC,
-	INVALC,0xC4EE,0xF5DF,INVALC,0xC57E,0xF6F4,0xC57D,INVALC,
-	0xF7EA,0xC5F5,0xC5F6,INVALC,INVALC,0xF9CC,INVALC,INVALC,
-	0xACD1,0xCFDE,INVALC,0xB56E,0xB56F,0xA5D5,0xA6CA,0xCA47,
-	INVALC,0xCB71,0xA86D,INVALC,0xAABA,INVALC,0xACD2,0xACD3,
-	0xACD4,0xD6A6,0xD2CB,0xAF6F,INVALC,INVALC,0xB2AE,0xD6A5,
-	INVALC,INVALC,0xDAB8,0xB571,INVALC,0xDAB7,0xB570,INVALC,
-	INVALC,0xDED5,0xBD4A,0xE6BB,0xE6B8,0xE6B9,0xE6BA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xED78,INVALC,0xF051,INVALC,
-	INVALC,INVALC,0xF471,0xF470,INVALC,0xF6F5,0xA5D6,0xCD75,
-	0xAF70,INVALC,INVALC,INVALC,0xB572,0xDED6,INVALC,INVALC,
-	0xE2E1,INVALC,0xBD4B,0xEA74,INVALC,0xF052,0xF472,0xA5D7,
-	INVALC,INVALC,0xAABB,0xACD7,0xCFDF,0xACD8,0xACD6,INVALC,
-	0xACD5,0xD2CC,0xAF71,INVALC,INVALC,0xAF72,0xAF73,INVALC,
-	INVALC,INVALC,0xB2B0,0xD6A7,0xB2AF,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xDAB9,0xB2B1,0xB573,0xDED7,0xB7F8,0xB7F9,
-	INVALC,0xBAC9,INVALC,0xBACA,0xBD4C,0xBF64,0xEA75,0xBF63,
-	INVALC,0xED79,0xC0FA,INVALC,0xF053,0xF473,0xA5D8,0xA86E,
-	0xCD78,0xCD77,0xAABC,0xCD76,0xAABD,0xCD79,INVALC,0xCFE5,
-	0xACDB,0xACDA,0xCFE7,0xCFE6,0xACDF,INVALC,0xACDE,INVALC,
-	/* Block 120, Array index 0x3800 */
-	INVALC,0xACD9,INVALC,0xCFE1,0xCFE2,0xCFE3,INVALC,0xACE0,
-	0xCFE0,0xACDC,0xCFE4,0xACDD,INVALC,INVALC,INVALC,INVALC,
-	0xD2CF,0xD2D3,0xD2D1,0xD2D0,INVALC,0xD2D4,INVALC,INVALC,
-	INVALC,0xD2D5,0xD2D6,0xD2CE,INVALC,0xD2CD,INVALC,0xAF75,
-	0xAF76,INVALC,0xD2D7,0xD2D2,INVALC,0xD6B0,INVALC,0xD2D8,
-	0xAF77,0xAF74,INVALC,INVALC,INVALC,0xD6AA,INVALC,0xD6A9,
-	INVALC,0xD6AB,0xD6AC,0xD6AE,0xD6AD,0xD6B2,0xB2B5,0xB2B2,
-	0xB2B6,0xD6A8,0xB2B7,0xD6B1,0xB2B4,0xD6AF,0xB2B3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xDABC,0xDABE,0xDABA,0xDABB,
-	INVALC,INVALC,0xDABF,0xDAC1,0xDAC2,0xDABD,0xDAC0,0xB574,
-	INVALC,INVALC,0xDEDB,INVALC,0xDEE0,0xDED8,0xDEDC,INVALC,
-	INVALC,0xDEE1,0xDEDD,0xB7FA,0xB843,INVALC,0xB7FD,0xDED9,
-	0xDEDA,0xBACE,0xB846,0xB7FE,INVALC,0xB844,0xB7FC,0xDEDF,
-	0xB845,0xDEDE,0xB841,0xB7FB,0xB842,0xDEE2,0xE2E6,0xE2E8,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xB840,INVALC,INVALC,0xE2E3,0xBACC,0xE2E9,0xBACD,
-	0xE2E7,0xE2E2,0xE2E5,0xE2EA,0xBACB,0xE2E4,INVALC,0xBD4E,
-	0xE6BF,0xE6BE,INVALC,0xBD51,0xBD4F,0xE6BC,0xBD4D,0xE6BD,
-	INVALC,0xBD50,INVALC,INVALC,INVALC,0xEA7D,INVALC,0xEAA1,
-	INVALC,0xEA7E,0xEA76,0xEA7A,0xEA79,0xEA77,0xBF66,0xBF67,
-	0xBF65,0xEA78,0xEA7B,0xEA7C,INVALC,0xBF68,INVALC,0xC140,
-	0xEDA3,INVALC,0xC0FC,0xED7B,0xC0FE,0xC141,INVALC,INVALC,
-	0xC0FD,0xEDA2,0xED7C,0xC0FB,0xEDA1,0xED7A,0xED7E,0xED7D,
-	INVALC,INVALC,0xF055,0xC2A4,0xC2A5,0xC2A2,INVALC,0xC2A3,
-	INVALC,INVALC,0xF054,INVALC,0xF27B,INVALC,INVALC,0xC3A9,
-	INVALC,0xF279,0xF27A,INVALC,0xF474,0xF477,0xF475,0xF476,
-	0xF5E0,INVALC,INVALC,0xC4EF,0xF7EB,0xF8B4,INVALC,0xC5F7,
-	0xF8F8,0xF8F9,0xC666,0xA5D9,0xACE1,INVALC,0xDAC3,INVALC,
-	0xDEE3,INVALC,0xA5DA,0xA86F,INVALC,0xAABE,INVALC,0xCFE8,
-	0xCFE9,0xAF78,INVALC,INVALC,0xDAC4,0xB575,0xB847,0xC142,
-	0xEDA4,0xF27C,0xF478,0xA5DB,INVALC,INVALC,INVALC,0xCDA1,
-	0xCD7A,0xCD7C,0xCD7E,0xCD7D,0xCD7B,0xAABF,INVALC,INVALC,
-	/* Block 121, Array index 0x3900 */
-	INVALC,INVALC,0xACE2,0xCFF2,INVALC,0xCFED,0xCFEA,INVALC,
-	INVALC,0xCFF1,INVALC,INVALC,0xACE4,0xACE5,0xCFF0,0xCFEF,
-	0xCFEE,0xCFEB,0xCFEC,0xCFF3,0xACE3,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xAF7C,INVALC,0xAFA4,
-	0xAFA3,0xD2E1,0xD2DB,0xD2D9,INVALC,0xAFA1,0xD6B9,0xAF7A,
-	0xD2DE,0xD2E2,0xD2E4,0xD2E0,0xD2DA,0xAFA2,0xD2DF,0xD2DD,
-	0xAF79,0xD2E5,0xAFA5,0xD2E3,0xAF7D,0xD2DC,INVALC,0xAF7E,
-	0xAF7B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xB2B9,INVALC,0xD6BA,INVALC,INVALC,
-	0xD6B3,0xD6B5,0xD6B7,INVALC,0xD6B8,0xD6B6,0xB2BA,INVALC,
-	0xD6BB,INVALC,0xD6B4,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xDAC8,0xB576,0xDAD0,INVALC,
-	0xDAC5,INVALC,0xDAD1,INVALC,0xDAC6,0xDAC7,INVALC,INVALC,
-	0xDACF,0xDACE,0xDACB,0xB2B8,0xB577,0xDAC9,0xDACC,0xB578,
-	0xDACD,0xDACA,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xDEEE,INVALC,0xDEF2,0xB84E,INVALC,0xE2F0,0xB851,
-	0xDEF0,INVALC,INVALC,0xDEED,0xDEE8,0xDEEA,0xDEEB,0xDEE4,
-	INVALC,0xB84D,INVALC,INVALC,0xB84C,INVALC,0xB848,0xDEE7,
-	INVALC,0xB84F,INVALC,0xB850,0xDEE6,0xDEE9,0xDEF1,0xB84A,
-	0xB84B,0xDEEF,0xDEE5,INVALC,INVALC,INVALC,0xE2F2,0xBAD0,
-	0xE2F4,0xDEEC,0xE2F6,0xBAD4,0xE2F7,0xE2F3,INVALC,0xBAD1,
-	0xE2EF,0xBAD3,0xE2EC,0xE2F1,0xE2F5,0xE2EE,INVALC,INVALC,
-	0xB849,INVALC,0xE2EB,0xBAD2,0xE2ED,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xBD54,0xE6C1,0xBD58,INVALC,0xBD56,INVALC,
-	INVALC,0xBACF,INVALC,0xE6C8,0xE6C9,0xBD53,INVALC,INVALC,
-	0xE6C7,0xE6CA,0xBD55,0xBD52,0xE6C3,0xE6C0,0xE6C5,0xE6C2,
-	0xBD59,0xE6C4,INVALC,INVALC,0xE6C6,0xBD57,INVALC,INVALC,
-	INVALC,INVALC,0xBF6A,0xEAA8,INVALC,0xEAA2,0xEAA6,0xEAAC,
-	0xEAAD,0xEAA9,0xEAAA,0xEAA7,INVALC,0xEAA4,INVALC,0xBF6C,
-	0xBF69,0xEAA3,0xEAA5,INVALC,0xBF6B,0xEAAB,INVALC,0xC146,
-	INVALC,INVALC,0xEDAA,0xEDA5,0xC145,INVALC,INVALC,0xC143,
-	INVALC,0xEDAC,0xC144,0xEDA8,0xEDA9,0xEDA6,0xEDAD,0xF056,
-	/* Block 122, Array index 0x3A00 */
-	INVALC,0xC147,0xEDA7,INVALC,0xEDAE,0xEDAB,INVALC,INVALC,
-	INVALC,0xF05A,INVALC,INVALC,0xF057,INVALC,0xC2A6,INVALC,
-	0xF05B,0xF05D,0xF05C,0xF058,0xF059,INVALC,INVALC,0xF2A3,
-	INVALC,0xC3AA,INVALC,0xF27E,0xF2A2,0xF27D,0xF2A4,INVALC,
-	INVALC,0xF2A1,INVALC,0xF47A,0xF47D,0xF479,0xC471,0xF47B,
-	0xF47C,0xF47E,0xC472,0xC474,0xC473,0xF5E1,INVALC,0xF5E3,
-	INVALC,0xF5E2,INVALC,INVALC,INVALC,0xF6F6,INVALC,INVALC,
-	0xF8B5,0xF8FA,0xA5DC,INVALC,INVALC,0xCB72,0xAAC0,0xCDA3,
-	0xAAC1,0xAAC2,0xCDA2,INVALC,0xCFF8,0xCFF7,0xACE6,0xACE9,
-	0xACE8,0xACE7,0xCFF4,0xCFF6,0xCFF5,INVALC,INVALC,0xD2E8,
-	0xAFA7,0xD2EC,0xD2EB,0xD2EA,0xD2E6,0xAFA6,0xAFAA,0xAFAD,
-	INVALC,INVALC,0xAFAE,0xD2E7,0xD2E9,0xAFAC,0xAFAB,0xAFA9,
-	0xAFA8,0xD6C2,INVALC,0xD6C0,0xD6BC,0xB2BB,INVALC,0xD6BD,
-	0xB2BC,0xD6BE,0xD6BF,0xD6C1,INVALC,0xB2BD,INVALC,INVALC,
-	0xDAD5,INVALC,0xDAD4,0xDAD3,0xDAD2,INVALC,INVALC,INVALC,
-	INVALC,0xDEF6,0xB852,INVALC,0xDEF3,0xDEF5,INVALC,0xB853,
-	INVALC,0xB854,0xDEF4,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xE341,INVALC,0xE2F9,0xE2FA,INVALC,0xBAD7,0xBAD5,0xBAD6,
-	0xE343,INVALC,0xE342,0xE2FE,0xE2FD,0xE2FC,0xE2FB,0xE340,
-	0xE2F8,INVALC,0xE6CB,0xE6D0,0xE6CE,INVALC,INVALC,INVALC,
-	0xE6CD,0xE6CC,0xE6CF,INVALC,0xEAAE,INVALC,0xBF6D,0xC148,
-	0xEDB0,INVALC,0xC149,0xEDAF,0xF05F,0xF05E,0xC2A7,INVALC,
-	0xF2A5,0xC3AB,0xF4A1,0xC5A1,0xF6F7,INVALC,0xF8B7,0xF8B6,
-	0xC9A8,0xACEA,0xACEB,0xD6C3,INVALC,0xB856,0xA5DD,0xA872,
-	0xA871,0xA870,INVALC,INVALC,INVALC,0xCDA4,INVALC,INVALC,
-	0xAAC4,0xAAC3,INVALC,0xACEE,INVALC,0xCFFA,0xCFFD,0xCFFB,
-	INVALC,0xACEC,0xACED,INVALC,INVALC,0xCFF9,0xCFFC,INVALC,
-	0xAFB5,INVALC,INVALC,INVALC,0xD2F3,0xD2F5,0xD2F4,0xAFB2,
-	0xD2EF,INVALC,INVALC,0xAFB0,0xAFAF,INVALC,0xAFB3,0xAFB1,
-	INVALC,0xAFB4,0xD2F2,0xD2ED,0xD2EE,0xD2F1,0xD2F0,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xD6C6,0xD6C7,
-	0xD6C5,INVALC,0xD6C4,0xB2BE,INVALC,INVALC,INVALC,INVALC,
-	/* Block 123, Array index 0x3B00 */
-	0xB57D,INVALC,0xDAD6,0xDAD8,0xDADA,0xB57C,INVALC,INVALC,
-	0xB57A,INVALC,0xDAD7,0xB57B,0xDAD9,0xB579,INVALC,INVALC,
-	0xDF41,0xDEF7,0xDEFA,0xDEFE,0xB85A,0xDEFC,INVALC,0xDEFB,
-	0xDEF8,0xDEF9,0xB858,0xDF40,0xB857,INVALC,0xB85C,0xB85B,
-	0xB859,INVALC,0xDEFD,INVALC,INVALC,INVALC,0xE349,INVALC,
-	0xE348,INVALC,INVALC,0xE344,INVALC,INVALC,0xBAD8,0xE347,
-	0xE346,0xBAD9,INVALC,INVALC,INVALC,INVALC,INVALC,0xBD5E,
-	INVALC,0xE6D2,INVALC,0xBD5F,0xBD5B,0xBD5D,INVALC,0xBD5A,
-	0xBD5C,INVALC,INVALC,INVALC,0xEAAF,INVALC,0xBF70,0xEAB1,
-	0xEAB0,INVALC,0xE345,0xBF72,0xBF71,0xBF6E,0xBF6F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xEDB5,INVALC,0xEDB3,0xC14A,
-	0xEDB4,INVALC,0xEDB6,0xEDB2,0xEDB1,INVALC,INVALC,0xF060,
-	0xC2AA,0xC2A8,0xC2A9,INVALC,INVALC,INVALC,INVALC,0xF2A6,
-	0xF2A7,0xC3AD,INVALC,0xC3AC,0xF4A3,0xF4A4,0xF4A2,INVALC,
-	0xF6F8,0xF6F9,INVALC,INVALC,0xA5DE,0xCA48,0xA873,INVALC,
-	0xCDA5,0xAAC6,0xAAC5,0xCDA6,INVALC,INVALC,0xD040,0xACEF,
-	0xCFFE,0xACF0,INVALC,INVALC,0xAFB6,0xD2F8,0xD2F6,0xD2FC,
-	0xAFB7,0xD2F7,0xD2FB,0xD2F9,0xD2FA,INVALC,INVALC,0xD6C8,
-	0xD6CA,INVALC,0xB2BF,INVALC,0xD6C9,0xB2C0,0xB5A2,0xB5A1,
-	0xB57E,0xDADB,INVALC,INVALC,INVALC,INVALC,0xDF44,0xB85D,
-	0xB85E,INVALC,0xDF43,0xDF42,INVALC,INVALC,INVALC,INVALC,
-	0xE34A,0xBADB,0xBADA,0xE34B,0xE34C,INVALC,0xBD61,0xBD60,
-	INVALC,0xEAB5,0xE6D3,0xE6D5,0xE6D4,0xEAB4,0xEAB2,0xEAB6,
-	0xEAB3,INVALC,0xBF73,INVALC,INVALC,INVALC,0xEDB7,0xC14B,
-	0xEDB8,0xEDB9,INVALC,INVALC,0xC2AB,0xC2AC,INVALC,0xC475,
-	INVALC,INVALC,0xC5D1,0xA5DF,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xD041,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xD2FD,0xAFB8,INVALC,INVALC,INVALC,INVALC,INVALC,0xB3BA,
-	0xB3B9,INVALC,INVALC,0xB5A4,0xDADD,0xB5A3,0xDADC,INVALC,
-	INVALC,INVALC,INVALC,0xDF45,INVALC,0xBADC,0xE34D,0xBADD,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xC476,0xF4A5,
-	INVALC,0xA6CB,0xAAC7,0xCDA7,INVALC,0xACF2,INVALC,0xACF1,
-	/* Block 124, Array index 0x3C00 */
-	0xD042,0xD043,INVALC,INVALC,0xD340,0xD342,0xAFB9,INVALC,
-	0xD344,0xD347,0xD345,INVALC,INVALC,INVALC,0xD346,0xD343,
-	0xD2FE,0xAFBA,0xD348,0xD341,INVALC,INVALC,INVALC,INVALC,
-	0xD6D3,0xB2C6,0xD6DC,0xB2C3,INVALC,0xD6D5,0xB2C7,INVALC,
-	0xB2C1,INVALC,0xD6D0,0xD6DD,0xD6D1,0xD6CE,0xB2C5,INVALC,
-	0xB2C2,INVALC,0xD6D4,0xD6D7,0xB2C4,0xD6D8,0xB2C8,0xD6D9,
-	0xD6CF,0xD6D6,0xD6DA,0xD6D2,0xD6CD,0xD6CB,INVALC,INVALC,
-	0xD6DB,INVALC,INVALC,0xDADF,INVALC,INVALC,INVALC,INVALC,
-	0xDAE4,INVALC,INVALC,INVALC,0xDAE0,0xDAE6,0xB5A7,0xD6CC,
-	0xDAE1,0xB5A5,0xDADE,0xB5AC,0xDAE2,0xB5AB,0xDAE3,0xB5AD,
-	0xB5A8,0xB5AE,0xB5A9,INVALC,0xB5AA,INVALC,0xB5A6,INVALC,
-	0xDAE5,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xB861,0xDF50,INVALC,0xDF53,0xDF47,0xDF4C,0xDF46,0xB863,
-	INVALC,0xDF4A,INVALC,INVALC,INVALC,0xDF48,0xB862,INVALC,
-	0xDF4F,0xDF4E,0xDF4B,0xDF4D,0xDF49,0xBAE1,0xDF52,0xB85F,
-	0xDF51,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xE35D,INVALC,0xBAE8,0xE358,INVALC,0xBAE7,
-	0xE34E,INVALC,0xE350,0xBAE0,0xE355,0xE354,0xE357,0xBAE5,
-	0xE352,0xE351,INVALC,INVALC,0xBAE4,0xBADF,0xE353,0xBAE2,
-	0xE359,0xE35B,INVALC,0xE356,0xE34F,0xBAE3,INVALC,INVALC,
-	0xBD69,0xBADE,INVALC,INVALC,0xE35C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xE6D9,0xBD62,INVALC,0xE6DB,
-	INVALC,0xBD63,INVALC,INVALC,0xBD65,0xE6DE,INVALC,0xE6D6,
-	0xBAE6,0xE6DC,INVALC,INVALC,INVALC,INVALC,0xE6D8,INVALC,
-	0xB860,0xBD68,INVALC,INVALC,0xBD64,INVALC,0xBD66,0xBD67,
-	INVALC,0xBF76,0xE6DD,0xE6D7,0xBD6A,INVALC,0xE6DA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xEAC0,0xEABB,INVALC,INVALC,
-	0xEAC5,0xBF74,0xEABD,0xBF78,0xEAC3,0xEABA,0xEAB7,0xEAC6,
-	0xC151,0xBF79,0xEAC2,0xEAB8,0xBF77,0xEABC,0xBF7B,0xEAB9,
-	0xEABE,0xBF7A,0xEAC1,0xEAC4,INVALC,INVALC,INVALC,INVALC,
-	0xEDCB,0xEDCC,0xEDBC,0xEDC3,0xEDC1,INVALC,INVALC,0xC14F,
-	0xEDC8,0xEABF,INVALC,0xEDBF,INVALC,0xEDC9,0xC14E,0xEDBE,
-	/* Block 125, Array index 0x3D00 */
-	0xEDBD,0xEDC7,0xEDC4,0xEDC6,INVALC,0xEDBA,0xEDCA,0xC14C,
-	INVALC,0xEDC5,0xEDCE,0xEDC2,0xC150,0xC14D,0xEDC0,0xEDBB,
-	0xEDCD,0xBF75,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xF063,INVALC,INVALC,0xF061,0xF067,0xC2B0,0xF065,
-	0xF064,0xC2B2,0xF06A,0xC2B1,INVALC,0xF06B,0xF068,0xC2AE,
-	0xF069,0xF062,0xC2AF,0xC2AD,0xF2AB,0xF066,INVALC,INVALC,
-	0xF06C,INVALC,INVALC,0xF2A8,INVALC,INVALC,INVALC,0xC3B2,
-	0xC3B0,0xF2AA,INVALC,0xF2AC,0xF2A9,0xC3B1,0xC3AE,0xC3AF,
-	0xC3B3,INVALC,INVALC,0xC478,INVALC,0xF4AA,INVALC,0xF4A9,
-	0xF4A7,0xF4A6,0xF4A8,INVALC,0xC477,0xC479,INVALC,INVALC,
-	0xC4F0,INVALC,INVALC,0xF5E5,0xF5E4,INVALC,INVALC,0xF6FA,
-	INVALC,0xF6FC,0xF6FE,0xF6FD,0xF6FB,INVALC,INVALC,0xC5A3,
-	0xC5A2,INVALC,INVALC,0xC5D3,0xC5D2,0xC5D4,0xF7ED,0xF7EC,
-	INVALC,0xF8FB,0xF8B8,0xF8FC,0xC658,INVALC,0xC659,0xF96D,
-	INVALC,INVALC,0xC67E,0xA6CC,INVALC,0xCDA8,INVALC,INVALC,
-	0xD045,0xD046,0xD044,INVALC,INVALC,0xACF3,INVALC,0xD047,
-	0xD048,0xD049,INVALC,INVALC,0xD349,0xD34F,INVALC,INVALC,
-	0xD34D,0xAFBB,0xD34B,INVALC,0xD34C,0xD34E,INVALC,INVALC,
-	INVALC,0xD34A,0xB2C9,INVALC,0xD6DE,0xB2CB,0xD6E0,0xB2CA,
-	0xD6DF,INVALC,INVALC,INVALC,INVALC,INVALC,0xDAE8,0xB5AF,
-	INVALC,0xDAEA,0xDAE7,0xD6E1,INVALC,0xB5B0,INVALC,INVALC,
-	0xDAE9,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xDF56,
-	INVALC,0xB864,0xDF54,0xB865,0xDF55,0xB866,INVALC,INVALC,
-	INVALC,0xBAE9,0xE361,0xE35E,0xE360,0xBAEA,0xBAEB,0xE35F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xE6DF,INVALC,INVALC,
-	0xE6E0,INVALC,0xBD6B,0xE6E2,0xE6E1,INVALC,0xA261,INVALC,
-	0xEACA,0xEACB,0xEAC7,INVALC,0xEAC8,0xBF7C,0xBF7D,0xEAC9,
-	INVALC,0xC157,INVALC,INVALC,0xC153,0xC158,0xC154,0xC156,
-	0xC152,INVALC,0xC155,INVALC,INVALC,INVALC,INVALC,0xC2B3,
-	0xEDCF,INVALC,0xF2AE,INVALC,0xF2AD,INVALC,0xF4AB,0xC47A,
-	0xC47B,0xF741,0xF5E6,INVALC,0xF740,INVALC,0xF8FD,0xF9A4,
-	0xA6CD,INVALC,INVALC,0xA874,INVALC,0xCDA9,0xAAC8,INVALC,
-	/* Block 126, Array index 0x3E00 */
-	0xACF6,0xD04C,0xACF4,0xD04A,0xACF9,0xACF5,0xACFA,0xACF8,
-	0xD04B,0xACF7,0xAFBF,0xAFBE,0xD35A,0xAFC7,0xD353,0xD359,
-	0xAFC3,0xD352,0xD358,0xD356,0xAFC2,0xAFC4,0xD355,0xAFBD,
-	0xD354,0xAFC8,0xAFC5,0xAFC9,0xAFC6,0xD351,0xD350,0xD357,
-	0xAFC0,0xAFBC,0xAFC1,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xD6F0,0xD6E9,INVALC,0xB5B5,0xD6E8,INVALC,0xB2CF,0xB2D6,
-	0xB2D3,0xB2D9,0xB2D8,0xB2D4,INVALC,0xD6E2,0xD6E5,INVALC,
-	0xD6E4,0xB2D0,0xD6E6,0xD6EF,0xB2D1,0xD6E3,0xD6EC,0xD6ED,
-	0xB2D2,0xD6EA,0xB2D7,0xB2CD,0xB2D5,0xD6E7,0xB2CC,0xD6EB,
-	INVALC,INVALC,0xD6EE,INVALC,INVALC,INVALC,0xDAFB,0xDAF2,
-	0xB5B2,0xDAF9,0xDAF6,0xDAEE,0xDAF7,0xB5B4,0xDAEF,INVALC,
-	0xDAEB,INVALC,INVALC,0xB86C,0xDAF4,INVALC,0xB5B1,0xDAFA,
-	INVALC,0xB5B8,0xB5BA,0xDAED,INVALC,INVALC,0xB5B9,0xDAF0,
-	0xB5B3,0xDAF8,0xDAF1,0xDAF5,INVALC,0xDAF3,0xB5B6,0xDAEC,
-	0xB5BB,0xB2CE,0xB5B7,0xB5BC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xB868,0xDF5D,0xDF5F,0xDF61,0xDF65,INVALC,0xDF5B,
-	0xDF59,0xB86A,INVALC,0xDF60,0xDF64,0xDF5C,0xDF58,INVALC,
-	0xDF57,INVALC,INVALC,INVALC,0xDF62,0xDF5A,0xDF5E,0xB86B,
-	INVALC,0xB869,0xDF66,0xB867,0xDF63,INVALC,0xE372,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xBAEE,0xE36A,0xBD78,0xE374,
-	0xBAF1,0xE378,0xBAF7,0xE365,INVALC,INVALC,0xE375,0xE362,
-	INVALC,0xE377,0xE366,INVALC,0xBAFE,0xBAFB,0xE376,0xE370,
-	0xBAED,0xBAF5,0xBAF4,INVALC,0xBAF3,0xBAF9,INVALC,0xE363,
-	0xBAFA,0xE371,0xBAF6,0xBAEC,0xE373,0xBAEF,0xBAF0,0xBAF8,
-	0xE368,0xE367,0xE364,INVALC,0xE36C,0xE369,0xE36D,0xBAFD,
-	INVALC,0xE379,0xBAF2,0xE36E,0xE36F,INVALC,0xE36B,INVALC,
-	INVALC,INVALC,0xBAFC,INVALC,INVALC,INVALC,INVALC,0xE6E7,
-	0xBD70,0xBD79,0xBD75,0xE6E4,INVALC,0xBD72,0xBD76,0xE6F0,
-	0xBD6C,0xE6E8,INVALC,0xBD74,INVALC,INVALC,0xE6EB,0xE6E6,
-	0xBD73,0xBD77,0xE6E5,INVALC,0xBD71,INVALC,0xE6EF,0xBD6E,
-	0xE6EE,0xE6ED,0xBD7A,0xE572,0xBD6D,INVALC,0xE6EC,0xE6E3,
-	INVALC,0xBD7B,0xE6EA,0xBD6F,INVALC,INVALC,INVALC,INVALC,
-	/* Block 127, Array index 0x3F00 */
-	INVALC,INVALC,INVALC,0xE6E9,INVALC,INVALC,INVALC,INVALC,
-	0xBFA2,0xBFA7,0xBF7E,0xEAD8,0xEACF,0xEADB,0xEAD3,0xEAD9,
-	0xBFA8,0xBFA1,0xEACC,0xEAD2,0xEADC,0xEAD5,0xEADA,0xEACE,
-	INVALC,INVALC,0xEAD6,0xBFA3,0xEAD4,0xBFA6,0xBFA5,0xEAD0,
-	0xEAD1,0xEACD,0xEAD7,0xBFA4,0xEADE,0xEADD,INVALC,INVALC,
-	INVALC,0xEDDA,0xEDD6,0xC15F,INVALC,0xEDD0,0xC159,0xC169,
-	0xEDDC,0xC161,0xC15D,0xEDD3,0xC164,0xC167,0xEDDE,0xC15C,
-	0xEDD5,0xC165,0xEDE0,0xEDDD,0xEDD1,0xC160,0xC15A,0xC168,
-	0xEDD8,0xC163,0xEDD2,0xC15E,0xEDDF,0xC162,0xC15B,0xEDD9,
-	0xC166,0xEDD7,INVALC,INVALC,0xEDDB,INVALC,INVALC,INVALC,
-	0xF06E,0xF074,0xC2B9,0xF077,0xC2B4,0xC2B5,0xF06F,0xF076,
-	0xF071,0xC2BA,0xC2B7,INVALC,0xF06D,INVALC,0xC2B6,0xF073,
-	0xF075,0xC2B8,0xF072,0xF070,INVALC,INVALC,INVALC,INVALC,
-	0xF2B8,0xC3B7,0xC3B8,0xC3B4,INVALC,0xC3B5,INVALC,0xF2B4,
-	0xF2B2,INVALC,0xF2B6,0xC3BA,0xF2B7,0xF2B0,0xF2AF,0xF2B3,
-	0xF2B1,0xC3B6,0xF2B5,0xF4AC,0xC47E,0xC47D,0xF4AD,INVALC,
-	0xF4AF,0xF4AE,0xC4A1,INVALC,INVALC,INVALC,0xF5EB,0xF5E8,
-	0xF5E9,INVALC,0xF5E7,0xF5EA,0xC4F2,0xF5EC,INVALC,0xC4F1,
-	INVALC,0xF742,INVALC,0xC5D5,0xC5D7,0xF7EE,0xC5D6,0xF8B9,
-	0xF940,0xF942,0xF8FE,0xF941,0xC66C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 128, Array index 0x4000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xA6CE,INVALC,
-	0xACFB,0xD26F,0xAFCA,INVALC,INVALC,0xB2DA,0xDAFC,0xDAFD,
-	INVALC,INVALC,INVALC,0xEADF,0xC16A,0xEDE1,INVALC,INVALC,
-	0xC2BB,INVALC,0xF2BA,0xF2B9,0xC4A2,0xF5ED,INVALC,0xF743,
-	0xC5F8,0xCA49,INVALC,INVALC,0xAAC9,0xA875,INVALC,INVALC,
-	0xD04D,INVALC,INVALC,0xD360,0xD35B,0xD35F,0xD35D,0xAFCB,
-	0xD35E,0xD35C,INVALC,0xD6F1,INVALC,0xDAFE,0xDB40,0xDF69,
-	0xDF6A,0xB86E,0xB86F,0xDF68,0xDF6B,0xDF67,0xB86D,INVALC,
-	0xBB40,INVALC,0xB870,0xE37A,INVALC,0xBD7C,0xE6F1,0xBD7D,
-	INVALC,0xBFA9,0xEAE2,0xEAE0,0xEAE1,0xEDE4,0xEDE3,0xEDE2,
-	INVALC,INVALC,INVALC,0xF2BB,INVALC,0xC3B9,0xF2BC,0xF744,
-	0xC5F9,0xF8BA,0xA6CF,0xAACB,0xAACA,0xD04F,0xACFC,INVALC,
-	INVALC,0xD04E,0xD362,INVALC,0xAFCC,0xD6F2,0xD361,INVALC,
-	INVALC,INVALC,0xB2DC,0xD6F5,0xD6F3,0xD6F4,0xB2DB,INVALC,
-	0xDB42,0xDB43,0xDB41,INVALC,0xB873,0xDF6D,0xDF6C,0xDF6E,
-	0xB872,0xB871,INVALC,INVALC,0xE6F2,0xE6F4,INVALC,0xBD7E,
-	0xE6F3,0xEAE3,0xBFAA,0xF079,INVALC,0xF078,0xC3BB,0xF2BD,
-	0xC3BD,0xC3BC,0xF4B0,0xF5EE,0xC4F3,0xA6D0,0xD050,0xACFD,
-	0xD365,0xAFCE,0xD364,0xD363,INVALC,0xAFCD,INVALC,0xD6FB,
-	INVALC,0xD6FD,0xD6F6,0xD6F7,0xB2DD,0xD6F8,0xB2DE,0xD6FC,
-	0xD6F9,0xD6FA,0xB2DF,INVALC,0xB5BE,0xB5BF,INVALC,0xDB44,
-	INVALC,INVALC,INVALC,0xDF6F,0xDF70,INVALC,0xE37E,0xBB43,
-	0xBB41,0xBB42,0xE37B,0xE37C,INVALC,0xE37D,0xE6F9,INVALC,
-	0xE6FA,0xBDA1,0xE6F7,0xE6F6,0xE6F8,0xE6F5,0xBFAD,0xEAE4,
-	0xBFAB,0xBFAC,0xEDE6,0xC16B,0xEDE5,0xEFA8,INVALC,0xF07A,
-	0xF07B,0xC2BC,INVALC,0xC2BD,0xC16C,0xF2BE,0xF2BF,0xF4B1,
-	/* Block 129, Array index 0x4100 */
-	0xC4A3,0xA6D1,INVALC,0xA6D2,0xACFE,0xAACC,0xAFCF,0xD051,
-	INVALC,INVALC,INVALC,0xB5C0,0xA6D3,0xAD41,0xD052,0xD053,
-	0xAD40,0xAD42,0xA6D4,INVALC,0xD054,0xAFD1,0xD366,0xAFD3,
-	0xAFD0,0xAFD2,INVALC,0xD741,0xB2E0,INVALC,0xD740,0xD6FE,
-	INVALC,0xDF71,INVALC,INVALC,0xE3A1,INVALC,0xBDA2,INVALC,
-	0xBFAE,0xEAE6,0xEAE5,INVALC,0xEDE7,INVALC,INVALC,INVALC,
-	0xF5EF,INVALC,INVALC,0xA6D5,0xCB73,0xCDAA,0xAD43,0xD055,
-	INVALC,0xD368,INVALC,INVALC,INVALC,0xAFD4,0xD367,0xAFD5,
-	INVALC,INVALC,INVALC,0xD743,INVALC,INVALC,0xB2E2,0xD742,
-	0xD744,INVALC,0xB2E1,INVALC,INVALC,INVALC,INVALC,0xDB46,
-	0xDB47,0xDB45,0xB5C1,INVALC,INVALC,INVALC,0xB874,INVALC,
-	0xB875,INVALC,0xBB45,INVALC,0xE3A3,0xE3A2,0xBB44,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xE6FB,INVALC,INVALC,0xE6FC,
-	INVALC,INVALC,INVALC,INVALC,0xEAE7,INVALC,INVALC,0xC170,
-	0xC16F,0xC16D,0xC16E,0xC171,INVALC,0xF07C,0xC2BF,0xC2BE,
-	0xF2C0,0xF4B2,INVALC,INVALC,INVALC,0xC5A5,0xC5A4,0xA6D6,
-	INVALC,INVALC,0xD1FB,INVALC,0xB877,0xB5C2,0xB876,0xBB46,
-	INVALC,0xA6D7,0xC9A9,0xA6D8,0xA6D9,INVALC,INVALC,0xCDAB,
-	0xCB76,INVALC,0xCB77,0xA877,INVALC,0xCB74,0xA876,INVALC,
-	0xA879,0xCB75,0xA87B,0xA87A,0xCB78,0xA878,INVALC,INVALC,
-	INVALC,0xAAD1,0xAACF,0xCDAD,INVALC,0xAACE,INVALC,INVALC,
-	INVALC,0xAAD3,0xAAD5,0xAAD2,INVALC,0xCDB0,0xCDAC,0xAAD6,
-	INVALC,0xAAD0,0xA87C,INVALC,0xAAD4,0xCDAF,INVALC,INVALC,
-	0xCDAE,INVALC,0xAACD,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xD05B,0xAD47,0xAD48,0xD05D,INVALC,0xD057,
-	0xD05A,0xD063,0xD061,INVALC,0xAD49,0xD067,0xAD4C,0xD064,
-	0xD05C,0xD059,INVALC,INVALC,0xDB49,0xD062,0xAD44,0xD065,
-	0xD056,0xD05F,0xAD46,0xAD4B,0xD060,0xAD4F,0xAD4D,INVALC,
-	0xD058,0xAD4A,INVALC,0xD05E,0xAD4E,0xAD45,0xD066,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xAFDA,INVALC,0xAFE3,
-	0xAFD8,0xAFD6,0xD36A,0xAFDE,0xAFDB,0xD36C,INVALC,INVALC,
-	0xAFDD,0xD36B,0xD369,0xD36E,0xAFE2,0xAFE0,0xDB48,INVALC,
-	/* Block 130, Array index 0x4200 */
-	0xD36F,0xD36D,0xAFD7,INVALC,INVALC,0xAFD9,0xAFDC,INVALC,
-	0xAFDF,INVALC,0xAFE1,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xD74E,0xB2E4,INVALC,
-	0xD745,0xD747,INVALC,0xD748,INVALC,0xD750,0xD74C,0xD74A,
-	INVALC,0xD74D,0xD751,0xB2E5,0xB2E9,0xD746,INVALC,0xD74F,
-	INVALC,0xB2E7,INVALC,0xB2E6,0xD74B,0xD749,INVALC,0xB2E3,
-	0xB2E8,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xB5C8,0xDB51,INVALC,INVALC,0xDB4F,0xB5CA,INVALC,
-	INVALC,INVALC,INVALC,0xDB4A,0xDFA1,INVALC,0xB5C9,0xDB4E,
-	INVALC,INVALC,0xDB4B,0xB5C5,0xB5CB,0xDB50,0xB5C7,0xDB4D,
-	0xBB47,0xB5C6,0xDB4C,0xB5CC,0xB5C4,0xB5C3,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xDF77,0xDF75,INVALC,0xDF7B,INVALC,
-	0xDF73,0xDFA2,0xDF78,INVALC,0xDF72,0xB87B,0xB8A3,0xDF7D,
-	INVALC,0xDF76,INVALC,0xB87E,INVALC,INVALC,0xB87C,0xDF7E,
-	0xB879,0xB878,0xDF79,0xB87D,0xB5CD,INVALC,0xDF7C,0xDF74,
-	0xB87A,0xB8A1,0xB8A2,INVALC,INVALC,INVALC,INVALC,0xBB4C,
-	0xBB48,INVALC,0xBB4D,0xE3A6,INVALC,INVALC,0xE3A5,0xE3A7,
-	0xBB4A,0xE3A4,0xBB4B,0xE3AA,0xE3A9,0xE3A8,INVALC,0xBB49,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xE741,INVALC,0xE744,
-	0xBDA8,0xE743,0xBDA7,0xBDA3,0xBDA4,0xBDA5,0xE740,0xE6FE,
-	0xBDA6,INVALC,0xE742,0xE6FD,INVALC,INVALC,0xEAE9,0xEAF3,
-	0xBFB1,0xBFB0,INVALC,0xEAED,0xEAEF,INVALC,0xEAEA,INVALC,
-	0xEAEE,0xEAE8,0xEAF1,0xBFAF,0xEAF0,0xEAEC,INVALC,0xEAF2,
-	INVALC,0xEAEB,0xC174,0xEDE8,0xEDEE,0xC178,0xC17A,0xC177,
-	0xC176,INVALC,0xC175,0xC173,0xEDE9,0xEDEC,0xC172,0xEDED,
-	INVALC,0xC179,0xEDEB,INVALC,0xEDEA,0xC2C0,INVALC,0xC2C1,
-	0xF0A1,0xF07D,0xF07E,INVALC,INVALC,0xF2C2,INVALC,0xF2C1,
-	0xC3BE,0xF4B4,0xC4A4,0xF4B3,INVALC,0xF5F0,0xF745,0xC5A6,
-	0xF943,0xF944,0xC5D8,0xA6DA,INVALC,0xAAD7,0xDB52,0xBB4E,
-	0xC17B,0xEDEF,0xA6DB,INVALC,0xAFE5,0xAFE4,0xDB53,INVALC,
-	INVALC,INVALC,0xEAF4,0xA6DC,0xAD50,INVALC,INVALC,0xDB54,
-	0xDB55,0xDB56,0xBB4F,0xBFB2,0xA6DD,INVALC,0xAAD8,0xD068,
-	/* Block 131, Array index 0x4300 */
-	0xAFE6,0xD370,0xB2EA,INVALC,0xDB57,0xB8A4,INVALC,0xBB50,
-	0xBFB3,0xC17C,0xC2C2,0xF4B5,0xA6DE,0xAAD9,INVALC,INVALC,
-	0xAFE7,0xD752,0xB5CE,INVALC,0xBB51,0xE3AB,0xE745,INVALC,
-	INVALC,INVALC,INVALC,0xA6DF,0xB5CF,0xDFA3,0xBB52,0xA6E0,
-	0xCDB1,0xD069,0xAD51,INVALC,INVALC,0xD372,INVALC,INVALC,
-	0xAFEA,INVALC,0xAFE8,0xAFE9,0xAFEB,INVALC,INVALC,0xD371,
-	INVALC,INVALC,0xD757,0xD754,0xD756,0xB2EB,0xB2ED,0xB2EC,
-	0xD753,0xB2EE,0xD755,INVALC,0xDB58,0xDB59,INVALC,0xDB5A,
-	0xDFA6,INVALC,0xDFA7,INVALC,0xDFA5,0xDFA8,INVALC,0xB8A5,
-	INVALC,0xDFA4,INVALC,0xBB53,INVALC,INVALC,0xE74A,0xE746,
-	0xE749,0xE74B,0xE748,0xE747,INVALC,0xEAF5,0xEAF6,0xEAF7,
-	0xBFB4,0xBFB5,0xEDF1,0xEDF0,0xEDF2,INVALC,0xF0A3,0xF0A2,
-	INVALC,0xF2C4,INVALC,0xF2C5,0xF2C3,INVALC,0xC4A5,INVALC,
-	0xF4B6,0xF4B7,INVALC,0xF746,0xF7EF,0xF8BB,0xA6E1,0xA87D,
-	INVALC,0xC17D,0xA6E2,INVALC,0xD758,0xDB5B,INVALC,0xC641,
-	0xCA4A,INVALC,INVALC,INVALC,0xCA4B,0xCA4D,0xA6E3,0xCA4E,
-	0xCA4C,INVALC,INVALC,0xCBA2,0xCBA3,0xCB7B,INVALC,INVALC,
-	INVALC,INVALC,0xCBA1,0xA8A1,INVALC,0xA8A2,0xCB7C,0xCB7A,
-	0xCB79,0xCB7D,0xA87E,0xCB7E,0xD06A,INVALC,INVALC,INVALC,
-	0xCDB6,0xAADC,0xCDB5,0xCDB7,INVALC,0xAADB,0xCDBC,0xAADF,
-	0xCDB2,0xCDC0,0xCDC6,0xAAE6,0xCDC3,0xAAE3,INVALC,0xCDB9,
-	0xCDBF,0xCDC1,INVALC,0xCDB4,0xAAE2,0xAADD,0xCDBA,0xAAE4,
-	0xAAE7,0xAAE1,INVALC,0xAADA,0xCDBE,0xCDB8,0xCDC5,0xAAE9,
-	0xAAE5,0xAAE0,0xCDBD,0xAFEC,0xCDBB,0xAADE,0xAAE8,INVALC,
-	0xCDB3,INVALC,0xCDC2,0xCDC4,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xAD62,0xAD5C,0xAD64,0xAD61,0xD071,0xD074,0xAD5D,
-	INVALC,0xD06B,INVALC,0xAD56,0xAD60,INVALC,0xAD63,0xAD65,
-	0xD0A2,0xD077,INVALC,0xAD55,0xD0A1,0xAD59,0xAD57,0xAD52,
-	0xD06F,INVALC,0xD07E,0xD073,0xD076,0xD0A5,INVALC,0xAD66,
-	0xD07D,0xAD5E,0xD078,0xD0A4,0xD075,0xD079,0xD07C,INVALC,
-	INVALC,0xD06D,0xD0A3,0xD07B,INVALC,INVALC,0xD06C,INVALC,
-	/* Block 132, Array index 0x4400 */
-	0xD070,0xAD5F,0xAD5A,0xAD53,0xAD58,0xAD54,0xAD67,0xD06E,
-	0xD3A5,0xAD5B,INVALC,INVALC,0xD07A,0xCE41,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xD3A8,0xAFFA,
-	INVALC,0xD376,INVALC,0xD3A3,0xD37D,INVALC,0xD3B2,INVALC,
-	0xD3AA,INVALC,0xD37E,INVALC,0xD3A9,0xD378,0xD37C,0xD3B5,
-	0xAFFD,0xD3AD,0xD3A4,0xAFED,0xD3B3,0xD374,INVALC,0xD3AC,
-	INVALC,0xAFFC,0xAFF7,0xD373,0xAFF5,0xAFF4,0xAFF9,0xD3AB,
-	0xAFF1,0xAFF8,0xD072,0xDB5C,0xD3A6,INVALC,INVALC,0xD37A,
-	0xAFFB,0xD37B,0xD3A1,0xAFFE,0xD375,0xD3AF,INVALC,0xD3AE,
-	0xD3B6,0xAFF3,0xAFF0,0xD3B4,0xD3B0,0xD3A7,0xD3A2,0xAFF6,
-	0xAFF2,0xD377,0xAFEE,0xD3B1,0xAFEF,INVALC,0xD379,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xD75E,0xD760,0xD765,0xD779,0xB2FC,
-	0xB2F2,INVALC,0xD75D,0xB2FD,0xB2FE,0xD768,0xD76F,0xD775,
-	INVALC,0xD762,INVALC,0xD769,INVALC,INVALC,0xB340,0xD777,
-	0xD772,0xB2FA,0xB2F8,0xD76E,0xD76A,0xD75C,0xB2EF,0xD761,
-	0xD759,INVALC,0xB2F7,0xB2F9,0xD766,0xD763,0xB2F4,0xD773,
-	0xB2F1,0xD764,0xD77A,0xD76C,INVALC,0xD76B,0xB2F0,INVALC,
-	0xB2FB,INVALC,0xB2F3,0xD75A,0xD75F,0xD770,0xD776,0xB341,
-	0xD75B,0xD767,0xD76D,0xB2F6,INVALC,INVALC,0xD778,0xD771,
-	0xD774,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xB2F5,INVALC,0xDB6C,
-	0xDB60,0xB5D7,0xDB7D,0xDBA7,0xDBAA,0xB5D5,0xDB68,0xDBA3,
-	0xDB69,0xDB77,0xB5E2,0xDB73,0xB5DF,INVALC,0xDB74,0xDB5D,
-	INVALC,0xDBA4,INVALC,INVALC,0xB5E8,0xDBA1,0xDB75,0xDBAC,
-	0xDB70,0xDFC8,INVALC,0xDBAF,0xB5E6,0xDB6E,0xDB7A,0xB5E9,
-	0xB5D4,0xDB72,0xDBAD,0xDB6B,0xDB64,0xDB6F,INVALC,0xDB63,
-	0xDB61,0xB5D0,0xDBA5,0xDB6A,0xDBA8,INVALC,0xDBA9,0xB5D8,
-	0xB5DD,0xB5D9,0xB5E1,0xDB7E,0xB5DA,0xDB76,0xDB66,INVALC,
-	0xB5D2,0xDB5E,0xDBA2,0xDBAB,0xDB65,0xB5E0,0xDBB0,0xDB71,
-	/* Block 133, Array index 0x4500 */
-	INVALC,0xDB6D,INVALC,0xB5D1,0xB5E5,INVALC,0xDB7C,0xB5E7,
-	INVALC,0xDB78,0xB5DC,0xB5D6,0xB5DE,0xB5D3,0xB5E4,0xDB79,
-	0xDB67,0xDB7B,0xDB62,0xDBA6,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xDBAE,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xDB5F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xDFC7,INVALC,0xDFDD,0xB855,0xDFCC,INVALC,0xDFCA,
-	0xDFB5,0xB8A9,0xDFC5,0xDFD9,0xDFC1,0xB8B1,0xDFD8,0xDFBF,
-	0xB5E3,0xDFCF,0xDFC0,0xDFD6,0xB8B0,0xB8A8,INVALC,0xDFAA,
-	0xDFB2,INVALC,0xDFCB,0xDFC3,0xDFDC,0xDFC6,0xB8B6,0xDFD7,
-	INVALC,0xB8AD,INVALC,0xDFC9,0xDFD1,0xDFB6,0xDFD0,INVALC,
-	0xDFE1,0xDFB1,0xDFD2,INVALC,0xDFDF,INVALC,0xDFAB,0xB5DB,
-	INVALC,0xDFB9,0xDFB8,0xB8AF,INVALC,0xDFBC,0xDFBE,0xDFCD,
-	0xDFDE,0xB8B2,INVALC,0xB8B3,INVALC,0xDFB0,0xB8AB,0xDFB4,
-	0xDFDA,0xB8B4,INVALC,0xB8AC,0xB8AE,0xB8B5,0xDFE0,0xDFD3,
-	0xDFCE,INVALC,INVALC,0xDFBB,0xDFBA,0xB8AA,0xDFAC,0xB8A7,
-	0xDFC4,0xDFAD,0xDFC2,INVALC,INVALC,0xDFB7,0xDFDB,INVALC,
-	INVALC,INVALC,0xB8A6,INVALC,INVALC,INVALC,0xDFB3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xDFAF,0xDFD5,0xDFAE,
-	0xBB60,0xE3D3,INVALC,INVALC,0xE3C2,INVALC,INVALC,0xE3AC,
-	0xE3CA,0xBB58,0xE3BB,0xE3C5,0xBB5B,0xE3BE,0xBB59,0xE3AF,
-	0xE3CD,0xE3AE,0xE3C1,INVALC,0xE3AD,INVALC,INVALC,0xE3BF,
-	0xE3C8,0xE3C6,0xE3BA,0xE3B5,0xE3B3,INVALC,0xE3B4,0xE3C7,
-	0xE3D2,0xE3BC,0xBB5A,INVALC,0xE3B7,INVALC,0xE3CB,INVALC,
-	0xBB5D,0xE3B6,0xE3B0,0xE3C0,0xBB61,INVALC,INVALC,0xBB55,
-	0xBB5E,0xE3B8,0xE3B2,INVALC,0xBB57,0xDFD4,0xBB56,0xE3C3,
-	INVALC,0xBB54,0xBB63,0xBB5C,0xE3C4,0xE3B9,0xE3B1,0xE3CC,
-	0xE3BD,0xBB62,0xE3D0,0xBB5F,0xE3CF,INVALC,0xE3C9,0xE3CE,
-	INVALC,INVALC,INVALC,0xE3D1,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xE773,
-	0xE774,0xE767,0xE766,0xE762,0xBDB4,INVALC,0xBDAC,0xE776,
-	0xE775,0xDFA9,0xE75F,0xE763,0xE75D,INVALC,0xE770,0xE761,
-	INVALC,0xE777,0xE75A,0xE758,0xE764,0xE76E,0xE769,0xBDB6,
-	/* Block 134, Array index 0x4600 */
-	0xE74F,INVALC,0xE76D,INVALC,INVALC,INVALC,0xBDB7,0xDFBD,
-	0xE75B,0xE752,0xE755,0xE77B,0xE75C,0xE753,0xE751,0xE74E,
-	INVALC,0xBDB0,0xE765,0xBDAF,0xBDB3,0xE760,0xE768,0xBDA9,
-	0xE778,0xE77C,0xBDAB,INVALC,0xE757,0xE76B,0xE76F,0xE754,
-	0xE779,0xBDB2,INVALC,0xBDB1,0xE74C,0xBDB5,0xE772,0xE756,
-	0xE76A,0xE750,0xE75E,0xE759,0xBDAD,0xBDAE,0xE76C,0xE77D,
-	0xE77A,0xE771,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xE74D,INVALC,0xBDAA,0xEB49,INVALC,
-	0xEB40,0xEB43,INVALC,0xBFBB,0xEB45,0xEAF9,0xEB41,0xEB47,
-	0xBFB8,0xBFBC,0xBFB6,INVALC,INVALC,0xEAFB,0xEB4C,INVALC,
-	INVALC,0xEB46,INVALC,0xEAFC,0xEB55,0xEB4F,0xEAF8,0xEE46,
-	0xEAFE,0xBFB7,INVALC,0xEB4A,INVALC,0xEB54,0xBFBF,INVALC,
-	0xEB51,0xEAFD,0xEB44,0xEB48,0xEB42,0xEB56,0xEB53,0xEB50,
-	0xBFB9,0xBFBA,0xBFBE,0xEAFA,0xEB57,0xBFBD,0xEB4D,INVALC,
-	INVALC,0xEB4B,INVALC,INVALC,INVALC,0xEB4E,0xEE53,0xEE40,
-	0xEE45,0xEE52,0xEE44,0xEDFB,0xEE41,INVALC,0xC1A2,INVALC,
-	0xEDF4,0xEE4D,0xEE4F,0xEDF3,0xC1A1,0xEE51,0xEE49,0xC1A8,
-	0xEE50,0xEE42,0xC1AA,0xEDF9,0xEB52,0xEE4A,0xEE47,0xEDF5,
-	0xEE55,0xC1A4,INVALC,INVALC,0xC1A5,0xEDF7,0xEE48,INVALC,
-	0xEE54,0xEE4B,0xEDFD,0xC1A7,0xC1A3,0xEE4C,0xEDFE,0xEE56,
-	0xEDF8,0xEE43,0xEE4E,0xEDFA,0xEDFC,INVALC,0xC2CB,0xEDF6,
-	0xC1A9,0xC2C4,0xC17E,INVALC,INVALC,INVALC,INVALC,0xC1A6,
-	0xC2C8,0xF0B3,INVALC,0xF0A9,0xF0A4,0xF0AA,0xF0B4,0xF0B8,
-	0xF0B7,0xC2CA,0xC2C9,INVALC,INVALC,0xF0AB,0xF0B9,0xF0AE,
-	0xF0A6,INVALC,0xF0A8,0xF0A7,0xF0AD,0xF0B2,0xF0A5,0xF0AC,
-	0xF0B1,0xC2C7,INVALC,0xF0AF,INVALC,0xC2C5,0xF0B0,0xC2C3,
-	0xC2C6,0xF2D5,0xF0B5,INVALC,INVALC,0xC3C2,INVALC,0xF2CD,
-	0xF2D1,0xF2C9,0xF2CC,INVALC,0xF2D4,0xC3C0,0xF2D9,0xF2D2,
-	INVALC,0xF2CA,0xF2DA,0xF2D3,0xC3C3,0xC3C4,0xF2D7,INVALC,
-	0xF2CB,0xC3BF,0xC3C1,0xF2C6,0xF2CE,0xF2C8,INVALC,0xF2D8,
-	0xF2D6,0xF2C7,0xF2CF,INVALC,INVALC,INVALC,0xF4BE,0xC3C5,
-	0xF2D0,0xC4A7,0xC4A9,0xC4A6,INVALC,0xF4C3,0xF4BB,0xF4B9,
-	/* Block 135, Array index 0x4700 */
-	0xF4BD,0xF4BA,INVALC,INVALC,0xF4BF,0xF4C1,0xC4AA,0xC4AC,
-	INVALC,0xF4C0,0xC4AD,0xC4AB,0xF4C2,INVALC,INVALC,INVALC,
-	INVALC,0xC4A8,INVALC,INVALC,INVALC,INVALC,INVALC,0xC4F4,
-	0xF5F1,0xF5F7,0xC4F6,0xF4BC,0xF5F6,INVALC,0xF5FD,0xF5F4,
-	0xF5FB,0xF5FA,0xF4B8,0xF5F5,0xF0B6,0xF5FE,0xF5F3,0xF5F8,
-	INVALC,0xF5FC,0xF5F2,INVALC,0xF74A,0xC4F5,0xF5F9,INVALC,
-	INVALC,0xF7F4,0xF74B,0xF749,0xF747,0xF748,0xF74C,INVALC,
-	0xC5D9,0xF7F2,0xF7F0,0xF7F5,0xF7F3,INVALC,0xF7F6,0xC5DA,
-	0xF7F1,INVALC,INVALC,0xF8BC,INVALC,INVALC,0xF945,0xF946,
-	0xF947,INVALC,INVALC,0xF9C7,0xF9BD,0xCA4F,0xAAEA,INVALC,
-	0xAD68,INVALC,0xD3B8,0xD3B7,0xB040,0xB342,0xD77C,INVALC,
-	INVALC,0xD77B,INVALC,0xB5EA,0xB8B8,INVALC,0xB8B7,0xB8B9,
-	INVALC,0xE3D4,0xE77E,0xEB58,0xEB5A,0xEB59,INVALC,0xC1AB,
-	0xEE57,0xF0BA,0xF9A5,0xA6E4,INVALC,0xCDC9,0xCDCA,0xCDC8,
-	0xCDC7,0xAAEB,INVALC,0xD0A9,0xD0A7,INVALC,INVALC,0xD0A6,
-	INVALC,0xAD69,0xAD6B,0xAD6A,0xD0A8,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xD3C4,0xD3C1,0xD3BF,
-	INVALC,INVALC,0xB041,0xD3C2,0xB046,0xD3BC,0xD3CB,INVALC,
-	0xD3CD,0xD3BD,INVALC,0xB043,0xD3CE,0xD3C9,0xD3BB,0xD3C0,
-	0xD3CA,0xD3C6,0xD3C3,INVALC,0xB048,0xD3CC,0xD3BE,INVALC,
-	INVALC,0xD3C7,0xD3B9,0xB047,0xB044,0xD3C5,INVALC,0xD3C8,
-	0xD3BA,0xB045,0xB042,INVALC,INVALC,INVALC,INVALC,0xB34C,
-	0xD7A5,0xB34B,INVALC,0xD7A8,0xD7AB,0xB348,0xB346,0xD77E,
-	0xD7A9,0xD7A7,0xD7A4,0xD7AC,0xD7AD,0xD7AF,0xD7B0,0xD77D,
-	0xB345,0xD7A2,0xD7A1,0xD7AE,0xB347,0xD7A3,0xB349,0xB344,
-	0xD7A6,0xB34D,INVALC,0xB34A,0xD7AA,INVALC,INVALC,INVALC,
-	0xB5F1,0xDBBF,INVALC,0xDBB4,0xB5EE,INVALC,0xDFE7,0xDBBD,
-	0xDBB1,0xB5EC,0xDBB6,0xB5EF,0xDBBA,0xDBB8,0xB5F2,0xB5EB,
-	INVALC,INVALC,0xDBB2,0xDBB5,0xB5F0,INVALC,0xDBB3,INVALC,
-	0xDBBE,0xDBBC,0xDBB7,0xDBB9,0xDBBB,0xB5ED,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xDFE8,0xDFEE,0xDFE4,
-	0xDFEA,0xB8BA,0xDFE6,0xB8C0,INVALC,INVALC,0xB8BF,INVALC,
-	/* Block 136, Array index 0x4800 */
-	0xB8BE,0xDFED,0xB8C1,0xB8C2,0xDFE3,0xDFF0,0xB8C3,0xB8BD,
-	0xB8BC,0xDFEC,0xB8C4,0xDFE2,0xDFE5,0xDFEF,0xDFEB,INVALC,
-	INVALC,0xE3F4,0xE3E9,0xB8BB,INVALC,INVALC,INVALC,INVALC,
-	0xBB6A,0xE3DD,0xE3F2,0xE3DE,0xBB65,INVALC,0xE3DB,INVALC,
-	0xE3E4,0xE3DC,0xBB67,0xE3D6,0xE3F1,0xBB68,0xE3EE,0xE3EF,
-	0xE3D7,0xBB6D,0xE3E6,INVALC,0xE3E0,0xE3E7,0xE3DA,INVALC,
-	0xE3F3,0xE3EB,0xE3E5,0xE3D5,0xBB69,0xE3EC,INVALC,0xBB6C,
-	0xE3F0,INVALC,0xE3EA,0xBB66,0xE3E8,INVALC,0xE3E2,0xBB64,
-	0xE3D9,0xE3E1,0xE3ED,0xE3DF,INVALC,INVALC,0xE3E3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xBDC1,0xDFE9,0xE7B2,0xE7BB,
-	0xE7B1,0xE7AD,0xE7AA,0xBDC2,0xE7A8,0xBB6B,0xE7A1,0xBDC0,
-	0xE7A7,0xBDBF,0xE7AC,0xE7A9,0xE7B9,0xE7B4,0xE7AE,0xE7B3,
-	0xBDBB,0xE7AB,0xE7BE,0xE7A2,0xE7A3,0xE7BA,0xBDBC,0xE7BF,
-	0xBDBE,0xE7C0,0xE7B0,0xE3D8,0xE7B6,0xE7AF,0xE7B8,0xE7B5,
-	INVALC,INVALC,INVALC,0xE7A6,0xBDB9,0xE7BD,0xBDBA,0xE7A4,
-	0xBDBD,0xEB64,0xE7B7,0xE7BC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xEB61,0xBDB8,0xBFC0,0xEB6B,0xEB67,INVALC,0xEB65,
-	0xEB60,0xEB6F,INVALC,INVALC,INVALC,0xBFC4,INVALC,0xEB5C,
-	0xEB68,0xEB69,0xEB5F,0xEB5E,0xEB6C,INVALC,0xEB62,0xEB5D,
-	0xEB63,INVALC,0xEB6E,0xEB5B,0xEB6D,0xEB6A,0xBFC2,0xBFC1,
-	INVALC,INVALC,0xBFC3,0xEB66,0xF0CB,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xEE59,0xC1B1,0xEE5D,0xEE5A,0xEE61,0xEE67,
-	0xEE5C,INVALC,0xEE70,0xC1AE,0xEE6A,0xEE5F,0xEE6B,0xEE66,
-	0xEE6D,0xEE5E,0xC1B3,0xC1B2,0xEE60,0xEE6E,0xEE58,0xEE6C,
-	0xC1AC,INVALC,0xEE64,0xEE63,0xEE68,0xEE5B,0xC1B0,INVALC,
-	0xC1B4,0xEE62,0xEE69,0xC1B5,0xEE65,INVALC,INVALC,INVALC,
-	INVALC,0xC1AD,0xC1AF,0xF0C7,0xF0C5,INVALC,INVALC,0xF0CC,
-	0xF0C9,0xF0CD,INVALC,0xF0BE,0xF0C6,0xF0D1,0xEE6F,0xF0C2,
-	0xC2CF,0xE7A5,0xF0BD,0xF0CA,0xF0C4,0xF0C1,0xF0BC,0xF0BB,
-	0xF0D0,INVALC,0xF0C0,0xF0BF,0xC2CD,0xF0C8,INVALC,0xC2CC,
-	INVALC,INVALC,0xC2CE,0xF0C3,0xF0CF,INVALC,0xF2DE,0xF2DF,
-	INVALC,0xC3C9,0xF2DC,0xC3C6,0xF2E4,INVALC,0xC3CA,0xF2E6,
-	/* Block 137, Array index 0x4900 */
-	0xF2DB,0xF0CE,0xF2E8,0xF2DD,INVALC,0xC3C7,0xF2E3,INVALC,
-	0xF2E5,0xF2E0,0xF2E7,0xF2E2,0xF2E1,0xC3C8,INVALC,INVALC,
-	0xF4C5,0xF4C6,INVALC,0xF4C8,0xC4AE,0xC4AF,0xF4C9,0xF4C7,
-	INVALC,0xF4C4,INVALC,0xF642,0xF645,0xF641,INVALC,0xC4FA,
-	0xF643,0xC4F9,0xC4F8,0xC4F7,0xF644,0xF751,0xF74F,INVALC,
-	0xF74E,0xF640,0xF750,0xF646,0xF74D,INVALC,0xF7F9,0xF7D7,
-	0xF7F7,0xC5DB,0xF7F8,0xF7FA,INVALC,0xF8BF,0xC5FA,0xF8BE,
-	0xF8BD,0xC5FB,INVALC,0xC65A,0xF96E,0xF9A7,0xF9A6,0xF9A8,
-	0xA6E5,0xD0AA,INVALC,0xD3CF,0xD3D0,INVALC,INVALC,INVALC,
-	0xDBC0,INVALC,0xF647,0xF8C0,0xA6E6,0xAD6C,0xD0AB,INVALC,
-	INVALC,INVALC,0xD7B1,0xB34E,INVALC,0xDBC2,0xDBC1,0xB5F3,
-	INVALC,0xB8C5,0xE7C1,0xBDC3,INVALC,0xBDC4,INVALC,INVALC,
-	INVALC,0xBFC5,0xC5FC,0xA6E7,INVALC,INVALC,INVALC,0xD0AC,
-	0xAAED,0xD0AE,0xD0AD,0xAD6D,INVALC,0xD3D1,INVALC,0xD3D8,
-	0xB049,0xD3D6,0xD3D4,INVALC,0xD3DB,0xD3D2,0xD3D3,0xB04A,
-	INVALC,0xB04E,INVALC,INVALC,0xD3DC,0xB04D,0xD3DA,0xD3D7,
-	0xD3D5,0xB04B,0xB04C,0xD3D9,INVALC,INVALC,INVALC,INVALC,
-	0xB350,0xD7B2,INVALC,0xB355,0xD7C2,0xB354,0xD7C4,INVALC,
-	INVALC,0xD7B8,0xB352,0xD7C3,INVALC,0xD7B3,0xB353,0xD7BF,
-	0xD7BB,0xD7BD,0xD7B7,0xD7BE,INVALC,INVALC,0xB34F,0xD7BA,
-	INVALC,0xD7B9,0xD7B5,INVALC,0xD7C0,INVALC,INVALC,0xD7BC,
-	0xD7B4,INVALC,0xD7B6,0xB351,0xD7C1,INVALC,INVALC,INVALC,
-	INVALC,0xB5F6,0xDBCD,INVALC,INVALC,INVALC,0xDBC9,0xDBCB,
-	0xDBC6,0xDBC5,0xDBC3,INVALC,0xDBCA,0xDBCC,0xDBC8,INVALC,
-	0xDBC7,0xB5F4,0xB5F5,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xDBCF,0xB8CD,0xDFF2,0xDFF8,0xDFF3,0xDFF4,INVALC,
-	0xDFF9,INVALC,0xB8CF,INVALC,0xB8C7,0xB8CE,0xDFF1,0xDBC4,
-	0xB8CA,0xB8C8,0xDFF7,0xDFF6,0xB8C9,0xB8CB,0xDFF5,0xB8C6,
-	INVALC,0xB8CC,INVALC,INVALC,INVALC,INVALC,INVALC,0xE3F6,
-	0xBB74,INVALC,INVALC,0xE442,0xE441,INVALC,0xE3FB,0xBB76,
-	0xE440,0xE3F7,0xE3F8,0xBB6E,0xBB70,INVALC,0xE3FD,0xE3F5,
-	0xBB72,0xBB71,0xE3F9,0xE3FE,0xE3FC,0xBB73,0xE3FA,INVALC,
-	/* Block 138, Array index 0x4A00 */
-	INVALC,0xDBCE,0xBB6F,INVALC,INVALC,0xE7C2,0xE7C9,0xBDC6,
-	INVALC,0xE7CD,0xBDCA,0xE7C5,0xE7C3,INVALC,0xE7CC,INVALC,
-	0xBDC5,0xE7CB,0xBDC7,0xBDC8,0xE7C4,0xBDC9,0xE7CA,0xE7C6,
-	0xE7C7,0xE7C8,0xBB75,INVALC,INVALC,INVALC,0xEB70,0xEB7C,
-	INVALC,0xBFCA,0xEB77,0xEB79,INVALC,0xBFC8,0xEB71,0xEB75,
-	INVALC,0xEB78,0xBFC6,0xBFC9,0xEB7B,0xEB73,0xEB74,0xEB7A,
-	0xEB72,0xEB76,0xBFC7,0xEE72,INVALC,0xEE71,0xC1B7,0xEE77,
-	0xC1B9,INVALC,INVALC,0xC1B6,0xEE73,0xC1BA,0xEE74,INVALC,
-	INVALC,0xEE75,0xEE78,INVALC,0xC1B8,INVALC,0xF0D6,INVALC,
-	INVALC,0xF0D9,INVALC,0xF0D3,0xF0D5,INVALC,INVALC,0xF0D4,
-	0xF0D7,0xF0D8,0xEE76,0xF0D2,INVALC,INVALC,0xC3CD,0xF2EC,
-	0xF2EF,0xF2F1,0xF2EA,0xF2EB,0xF2EE,0xF2F0,0xC3CE,0xC3CC,
-	0xC3CB,0xF2ED,0xF2E9,0xF4CA,0xC4B0,INVALC,0xF4CB,INVALC,
-	INVALC,0xF649,0xC4FB,0xF64B,0xC4FC,0xF648,0xF64A,0xC5A8,
-	INVALC,0xF752,0xC5A7,0xF7FD,0xF7FC,INVALC,0xF7FB,INVALC,
-	INVALC,0xF948,0xF949,0xF94B,0xF94A,INVALC,0xCA50,0xA6E8,
-	INVALC,0xAD6E,0xD7C5,0xB5F7,INVALC,0xDFFA,0xC2D0,INVALC,
-	0xF2F2,INVALC,INVALC,0xA8A3,INVALC,INVALC,INVALC,0xB357,
-	INVALC,INVALC,INVALC,0xB356,INVALC,0xDBD0,0xB5F8,0xDBD2,
-	0xDBD1,INVALC,INVALC,0xDFFB,0xB8D0,0xE443,0xE446,0xE445,
-	INVALC,0xE444,0xE7CE,0xE7D0,0xE7CF,INVALC,0xBFCC,INVALC,
-	INVALC,INVALC,0xBFCB,INVALC,0xC1BB,0xEE79,0xEE7B,0xEE7A,
-	INVALC,INVALC,0xC2D1,INVALC,INVALC,INVALC,0xF2F4,0xF2F3,
-	INVALC,0xF4CC,0xC4B1,INVALC,INVALC,0xC4FD,0xF754,0xF753,
-	0xC65B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xA8A4,0xD0AF,0xAD6F,0xD7C8,0xD7C6,INVALC,
-	INVALC,0xD7C7,0xDBD4,0xDBD5,0xE043,0xDBD3,INVALC,0xDFFC,
-	0xE041,0xE040,0xE042,0xB8D1,0xDFFE,0xDFFD,0xE044,INVALC,
-	0xE449,0xE447,INVALC,0xE448,0xE7D3,0xE7D1,INVALC,INVALC,
-	0xE7D2,0xEB7D,0xEE7C,0xEE7D,0xC2D2,INVALC,0xF2F5,0xF4CD,
-	0xC4B2,INVALC,0xF64C,0xF755,0xC5A9,INVALC,0xF7FE,0xF94C,
-	/* Block 139, Array index 0x4B00 */
-	0xA8A5,INVALC,0xAD71,0xAD72,0xD0B0,INVALC,INVALC,0xD0B1,
-	0xAD70,INVALC,0xB054,INVALC,0xB052,INVALC,0xB051,0xB058,
-	0xB050,0xB059,0xD3DD,0xB056,INVALC,0xB053,0xB057,0xB055,
-	0xB04F,INVALC,INVALC,0xB35F,INVALC,0xB359,0xD7CC,0xB35E,
-	INVALC,INVALC,0xB360,0xB35A,INVALC,0xB35B,INVALC,0xD7CA,
-	INVALC,INVALC,0xB358,INVALC,0xD7CB,0xB35D,INVALC,INVALC,
-	0xD7C9,0xB35C,INVALC,INVALC,0xB644,INVALC,0xB646,INVALC,
-	INVALC,0xDBD8,0xB645,0xB5F9,0xB5FD,INVALC,0xB8E4,0xE049,
-	0xDBDA,0xB5FE,INVALC,INVALC,0xDBDD,0xDBDE,0xB643,INVALC,
-	0xDBE0,INVALC,0xDBE2,INVALC,0xDBE3,0xDBD7,0xDBD6,0xDBE4,
-	0xB642,0xDBE1,0xDBDF,INVALC,0xB640,0xB5FB,0xB647,0xDBDB,
-	0xDBDC,0xDBD9,INVALC,0xB641,INVALC,INVALC,0xB5FC,INVALC,
-	0xB5FA,0xE048,0xB8DF,0xB8DA,INVALC,INVALC,0xB8D5,INVALC,
-	0xB8E5,0xB8D6,INVALC,0xB8D2,0xB8E1,0xB8DE,0xB8E0,INVALC,
-	0xB8D7,0xB8DC,0xB8D3,0xB8D4,0xE050,0xE04D,0xE045,0xE04A,
-	INVALC,0xB8E2,0xE051,0xB8E3,0xB8D9,INVALC,INVALC,0xE047,
-	INVALC,0xE04F,0xE04B,0xE04E,0xE04C,0xB8DD,0xE046,0xB8D8,
-	INVALC,INVALC,INVALC,0xE44C,0xBB78,0xBB7B,INVALC,0xE44E,
-	INVALC,0xBBA5,0xE44D,0xBB7D,INVALC,0xBDCF,0xE44F,INVALC,
-	0xBBA4,0xE44B,0xBBA6,INVALC,INVALC,INVALC,0xBB79,INVALC,
-	0xB8DB,0xBB7C,INVALC,0xBB7A,0xBB7E,0xBBA2,0xBB77,0xBBA7,
-	0xBBA3,INVALC,0xBBA1,0xE44A,INVALC,INVALC,INVALC,INVALC,
-	0xBDD6,INVALC,0xBDD2,INVALC,INVALC,INVALC,0xBDD9,INVALC,
-	0xE7D6,0xBDDA,0xE7E2,0xE7DB,0xBDCB,0xE7E3,0xE7DD,0xBDD5,
-	0xE7DE,INVALC,0xBDD4,0xE7E1,0xBDCE,0xE7DF,0xE7D5,0xBDCD,
-	0xEBAA,0xBDD3,INVALC,0xBDD0,INVALC,0xBDD8,INVALC,0xE7D4,
-	INVALC,0xE7D8,0xBDCC,0xE7D7,0xE7D9,0xE7DA,0xBDD7,0xE7DC,
-	0xE7E0,0xE7E4,INVALC,0xBDDB,0xBFD2,0xEBA5,0xEBAB,0xEBA8,
-	0xEB7E,0xEBAC,0xEBA1,INVALC,0xEBA7,INVALC,0xBFCD,0xBFD3,
-	0xEBAD,INVALC,INVALC,0xBFCF,INVALC,0xBFD9,0xBFD4,0xEBAF,
-	0xEBA9,0xBFD0,0xEBA2,0xBFDA,0xEBA3,0xEBA4,0xBFDB,0xBFD8,
-	0xBDD1,INVALC,0xBFCE,0xEBB0,0xBFDC,INVALC,0xBFD5,0xEBAE,
-	/* Block 140, Array index 0x4C00 */
-	0xBFD1,0xBFD6,0xBFD7,INVALC,0xC1C3,0xEEA4,0xEEAD,0xEEAA,
-	0xEEAC,INVALC,0xC1C0,0xEEA5,INVALC,0xEEAB,0xC1BC,0xEEA7,
-	0xC1C4,0xEEA3,0xEEA8,0xEEAF,0xEBA6,0xEEA9,0xEEA2,0xC1BD,
-	0xEEA1,0xC1BE,0xEEB0,0xC1BF,0xEEAE,0xC1C2,0xEE7E,INVALC,
-	0xC1C1,INVALC,0xEEA6,0xF0DC,0xF0EA,0xF0E5,0xF0E7,0xF0DB,
-	0xC2D3,INVALC,0xF0DA,0xC2D6,0xC2D5,INVALC,0xF0E9,0xF0E1,
-	0xF0DE,0xF0E4,INVALC,0xF0DD,INVALC,0xF0DF,0xF0E8,0xF0E6,
-	INVALC,0xC2D4,0xF0ED,0xF0EB,0xF0E2,0xF0EC,0xF0E3,INVALC,
-	0xF2F9,0xC3CF,0xF341,INVALC,INVALC,0xF64F,0xC3D6,0xF0E0,
-	0xF2F7,0xC3D2,0xF2F8,0xF2FD,INVALC,INVALC,0xC3D4,0xC3D5,
-	0xF2F6,0xF340,0xF342,0xF2FA,0xF2FC,0xF2FE,0xF2FB,0xF343,
-	0xC3D1,0xC3D7,0xC3D3,INVALC,0xC3D0,0xF4D0,INVALC,0xC4B7,
-	0xF4CE,INVALC,INVALC,0xF4D2,INVALC,0xF4D3,0xC4B5,0xF4D4,
-	0xF4D1,INVALC,0xF4CF,0xC4B8,0xC4B4,0xF4D5,INVALC,0xC4B6,
-	0xC4B3,INVALC,INVALC,INVALC,0xC4FE,INVALC,INVALC,0xC540,
-	0xF64E,0xF64D,0xF650,0xF651,INVALC,0xC541,0xF756,0xF75B,
-	0xC5AA,INVALC,0xF758,INVALC,0xF757,0xF75A,0xF759,INVALC,
-	0xF843,INVALC,0xC5DC,0xF842,0xF840,INVALC,0xF841,INVALC,
-	INVALC,INVALC,0xC5FE,0xC5FD,0xF8C1,0xF8C2,0xC640,INVALC,
-	0xF94D,0xF94E,0xC667,INVALC,0xC66D,INVALC,0xF9A9,0xF9C8,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 141, Array index 0x4D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xA8A6,
-	INVALC,0xD7CD,INVALC,0xD7CE,0xE052,0xE450,0xE7E5,0xC1C6,
-	INVALC,0xC1C5,0xF0EE,0xF344,INVALC,0xF844,0xA8A7,0xD3DE,
-	0xB05A,0xB361,0xE054,0xE053,0xBDDC,0xE7E6,0xBDDD,0xEEB1,
-	0xC2D7,INVALC,INVALC,INVALC,0xC676,0xA8A8,0xCDCB,0xD3DF,
-	INVALC,INVALC,0xB362,INVALC,0xD7CF,0xD7D0,INVALC,0xDBE5,
-	INVALC,0xB648,0xB8E6,INVALC,0xE056,0xE055,0xE057,INVALC,
-	0xE451,0xE452,0xBBA8,0xBFDD,0xBDDE,0xBFDE,INVALC,0xEEB5,
-	0xEEB2,0xEEB4,0xEEB3,0xC1C7,INVALC,0xF0EF,0xF346,0xF345,
-	0xCBA4,0xB05C,0xB05B,0xD3E0,INVALC,0xD7D1,INVALC,INVALC,
-	0xDBE7,0xDBE6,0xB649,INVALC,0xE059,0xE05A,0xE058,INVALC,
-	INVALC,0xB8E8,0xB8E7,INVALC,0xBBAA,0xBBA9,INVALC,0xE7E7,
-	0xEBB3,0xEBB1,0xEBB2,0xBFDF,0xEEB7,0xEEB6,INVALC,0xF0F2,
-	0xF0F1,0xF0F0,0xF347,INVALC,0xF9AA,0xA8A9,0xAD73,INVALC,
-	0xAD74,0xB05D,0xB05E,0xD3E2,0xD3E1,0xD7D2,INVALC,0xB368,
-	0xB366,0xB363,0xB367,0xB365,0xB364,INVALC,INVALC,0xB64A,
-	0xDBEA,INVALC,0xB8ED,0xB64C,0xB651,0xDBEC,0xB653,0xB652,
-	0xB655,0xDBEB,0xDBE8,0xB64F,0xB64B,0xB64D,0xDBE9,0xB654,
-	0xB650,0xB64E,0xB8EF,0xB8EE,0xB8EC,0xB8F0,INVALC,0xB8EA,
-	0xB8EB,INVALC,0xB8E9,INVALC,0xE05B,INVALC,INVALC,0xE454,
-	INVALC,0xBBAC,0xBBAD,0xBBAB,INVALC,0xE453,INVALC,0xE455,
-	INVALC,0xE7EA,0xE7EC,INVALC,0xBDE7,0xE7ED,0xBDE0,0xE7E9,
-	0xBDDF,0xBDE9,0xBDE5,0xBDE6,0xBDE2,0xE7E8,0xBDE1,0xE7EE,
-	0xE7EB,INVALC,0xBDE8,INVALC,0xBDE3,0xBDE4,0xEBB5,INVALC,
-	0xEBB7,0xEBB6,INVALC,0xEBB8,0xBFE0,0xEBB4,INVALC,INVALC,
-	0xC1CB,0xEEB8,0xC1C8,0xC1CC,0xC1CA,0xC1C9,0xF0F3,INVALC,
-	/* Block 142, Array index 0x4E00 */
-	0xF0F6,INVALC,0xF0F5,INVALC,0xF0F4,0xC2D8,0xF348,0xF349,
-	0xC3D8,0xF34A,0xC3D9,INVALC,INVALC,0xC4BA,INVALC,0xC4B9,
-	0xF652,INVALC,INVALC,0xC542,0xF653,0xF75C,0xC5AB,0xC5AC,
-	INVALC,0xF845,INVALC,0xC642,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA8AA,INVALC,0xB36A,0xB369,
-	0xE05C,0xE05D,INVALC,0xBBAE,0xEBB9,0xBDEA,0xEBBA,0xEEB9,
-	0xA8AB,INVALC,0xD0B2,0xAD76,0xAD75,INVALC,0xD3E3,0xB05F,
-	0xD3E4,0xD7D5,INVALC,0xD7D4,INVALC,0xD7D3,INVALC,INVALC,
-	0xDBEE,0xB658,INVALC,INVALC,0xDBED,0xB657,INVALC,INVALC,
-	INVALC,0xDBEF,0xB656,INVALC,0xE05F,0xE062,0xE060,0xE061,
-	0xE065,0xE05E,0xE066,0xE063,0xE064,0xBBB0,0xE456,INVALC,
-	INVALC,0xBBAF,INVALC,0xE7F2,0xE7F0,INVALC,INVALC,0xBDEB,
-	0xE7EF,0xE7F1,INVALC,0xBDEC,INVALC,0xEBBB,INVALC,0xEBBC,
-	0xC1CD,INVALC,0xF34C,0xF34E,0xF34B,0xF34D,0xF4D6,0xF654,
-	INVALC,INVALC,0xF96F,0xA8AC,0xAD77,0xD3E5,0xD3E7,0xD3E6,
-	INVALC,0xD7D8,0xB36C,INVALC,0xD7D6,INVALC,0xB36B,0xD7D9,
-	INVALC,0xD7DA,0xD7D7,INVALC,INVALC,0xDBFB,0xB660,0xDBF3,
-	0xDBF9,INVALC,INVALC,0xB65B,0xB65E,0xDBF2,0xB659,0xDBF6,
-	0xE06C,0xB65D,INVALC,0xDBF1,INVALC,0xDBF7,0xDBF4,0xDBFA,
-	0xDBF0,0xDBF8,0xB65C,0xB65F,0xDBF5,0xB65A,INVALC,0xB8F2,
-	0xE068,0xB8F1,0xE06F,0xE06E,0xB8F8,INVALC,0xB8F9,0xE070,
-	0xB8F3,0xE06D,0xB8F7,0xE072,0xE069,INVALC,0xE06B,0xB8F4,
-	0xE067,0xE06A,0xE071,0xB8F5,0xE073,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xB8F6,INVALC,0xBBB1,0xE45B,0xE461,0xE459,
-	/* Block 143, Array index 0x4F00 */
-	0xE462,INVALC,0xE458,0xE45D,0xE463,0xE460,0xE45F,0xE45E,
-	INVALC,0xE457,0xE45C,INVALC,INVALC,0xE45A,INVALC,0xBDF1,
-	0xBDEE,0xE7FB,0xE841,0xE843,0xE840,0xE7F8,0xE7FA,0xE845,
-	0xE842,0xE7FC,0xE846,0xE7F9,0xE844,0xBDEF,0xBDF5,0xBDF3,
-	0xE7F3,0xBDF4,0xBDF0,0xE7F4,0xE7F6,0xE7F5,0xE7FD,0xE7FE,
-	INVALC,0xBDF2,INVALC,0xBDED,INVALC,INVALC,0xE7F7,INVALC,
-	0xEBC6,0xBFE2,INVALC,0xEBBD,0xBFE3,0xBFE6,0xEBC2,INVALC,
-	0xEBBF,0xBFE5,INVALC,INVALC,0xEBC3,0xEBC4,0xEBBE,0xEBC7,
-	0xEBC0,0xEBC5,0xBFE4,INVALC,0xBFE1,0xEBC1,INVALC,0xEEBF,
-	0xC1D0,0xC1CE,0xC1D1,0xC1CF,0xEEBE,0xEEBB,0xEEBA,INVALC,
-	0xEEBD,INVALC,INVALC,0xEEBC,0xF145,0xC2DE,0xF0FB,0xF0FA,
-	INVALC,0xC2D9,0xF141,0xF140,0xF0F7,0xF143,0xF0FC,0xC2DD,
-	0xF0F9,0xF142,0xF0F8,0xC2DA,0xC2DC,0xF0FD,0xC2DB,0xF0FE,
-	INVALC,0xF144,0xF352,INVALC,0xC3DE,0xF34F,INVALC,0xF353,
-	INVALC,INVALC,0xC3DB,0xF351,0xC3E0,INVALC,0xC3DD,INVALC,
-	0xF350,INVALC,0xC3DF,0xF354,0xC3DA,INVALC,INVALC,INVALC,
-	INVALC,0xC4BC,0xC4BE,INVALC,0xF4D9,0xC4BD,0xF4D7,0xC3DC,
-	0xF4D8,0xC4BB,0xC543,0xC545,0xF656,0xC544,0xF655,INVALC,
-	0xF761,0xC5AD,0xF760,0xC5AE,0xF75E,0xF75D,0xF762,0xF763,
-	0xF846,INVALC,0xF75F,INVALC,INVALC,0xF8C6,0xF8C3,0xF8C4,
-	0xF8C5,0xC65C,INVALC,0xF951,0xF950,0xF94F,0xF970,INVALC,
-	0xF9BE,0xF9AB,0xC66E,0xA8AD,0xB060,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xB8FA,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xBDF6,INVALC,INVALC,0xEBC8,INVALC,INVALC,
-	0xC2DF,INVALC,0xF355,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xF9AC,0xA8AE,0xAAEE,0xAD79,0xAD78,INVALC,0xB063,
-	INVALC,0xD3E8,0xB061,0xD3E9,0xB062,INVALC,INVALC,0xD7DF,
-	0xD7DB,INVALC,INVALC,0xB36D,0xD7DE,0xD7DD,0xD7DC,0xB36E,
-	0xD7E0,0xD7E1,INVALC,INVALC,INVALC,0xDC43,0xDC41,0xDC45,
-	0xDC46,0xDC4C,INVALC,0xDC48,0xDC4A,INVALC,0xDC42,0xDBFC,
-	INVALC,0xDC49,INVALC,INVALC,0xDC4B,0xDC44,0xDC47,0xDBFD,
-	0xB662,0xDC40,0xDBFE,0xB661,0xB663,INVALC,0xB8FD,0xE075,
-	/* Block 144, Array index 0x5000 */
-	0xE077,0xE076,0xE07B,0xB8FB,INVALC,0xE078,0xE074,0xE079,
-	0xE07A,0xB8FC,0xB8FE,0xE07C,INVALC,0xE467,0xE466,INVALC,
-	0xE464,0xE465,0xBBB3,0xBBB5,0xBBB2,0xBBB4,0xE84D,0xE84E,
-	0xE849,INVALC,0xE84A,0xBDF8,0xBDFD,0xBDF7,0xBDFE,0xBDF9,
-	0xE84B,INVALC,INVALC,0xE84C,0xE848,0xBE40,0xBDFB,INVALC,
-	INVALC,0xBDFA,0xBDFC,INVALC,0xE847,INVALC,0xEBCA,0xBFE8,
-	INVALC,INVALC,0xEBCC,0xBFEA,0xEBCF,0xEBCB,0xEBC9,0xEBCE,
-	0xBFE9,0xEBCD,INVALC,0xBFE7,INVALC,INVALC,0xC1D3,0xC1D6,
-	0xEEC1,INVALC,0xC1D4,0xEEC0,0xC1D2,0xC1D5,0xF146,0xF147,
-	0xF148,0xC2E0,INVALC,0xF149,INVALC,0xC2E1,0xC3E2,0xF358,
-	0xF359,0xF357,0xF356,0xF35A,0xC3E1,0xF4DD,0xF4DB,0xF4DC,
-	0xF4DE,0xF4DA,0xF4DF,0xF658,INVALC,0xF659,0xF657,0xC546,
-	0xF764,0xC5AF,0xF765,0xF848,0xF847,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xA8AF,0xB664,INVALC,INVALC,0xB940,
-	INVALC,INVALC,INVALC,0xBBB6,INVALC,INVALC,0xBFEC,INVALC,
-	0xBFEB,INVALC,INVALC,INVALC,INVALC,0xC3E3,0xC47C,0xC547,
-	0xA8B0,0xB064,0xB941,INVALC,0xF35B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xCBA6,
-	INVALC,INVALC,0xA8B1,INVALC,0xA8B4,0xA8B3,0xA8B2,INVALC,
-	INVALC,0xCBA5,INVALC,0xCDCD,INVALC,0xCDCF,0xAAEF,INVALC,
-	INVALC,0xAAF1,0xCDCC,0xCDCE,0xAAF0,0xCDD1,0xCDD0,0xCDD2,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xD0B6,0xD0B4,0xAD7C,0xD0B3,0xADA3,0xAD7E,0xAD7B,INVALC,
-	0xADA4,INVALC,0xAD7D,0xADA2,INVALC,0xADA1,0xD0B5,INVALC,
-	0xAD7A,INVALC,INVALC,INVALC,0xB06A,0xD3EB,0xD3F1,0xB067,
-	0xB06E,INVALC,0xB069,0xD3EE,0xD3F0,0xB06C,0xD3EA,0xD3ED,
-	/* Block 145, Array index 0x5100 */
-	0xB068,0xB065,0xD3EC,0xB06B,0xD3EF,0xB06D,0xB066,INVALC,
-	INVALC,INVALC,INVALC,0xD7E3,0xD7E6,0xB370,INVALC,0xB37A,
-	0xB376,0xD7E4,INVALC,INVALC,0xB37E,0xB377,0xB37C,0xB372,
-	INVALC,0xB36F,0xB371,0xB37D,0xD7E5,0xB375,0xB378,0xB374,
-	0xB379,0xD7E7,0xB37B,0xB373,0xD7E2,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xDC4D,0xB665,0xDC4F,
-	INVALC,0xB667,0xB669,INVALC,0xDC4E,0xB666,0xB66A,INVALC,
-	0xB668,INVALC,INVALC,INVALC,0xB947,0xE0A3,0xB94F,0xE07E,
-	INVALC,0xB950,0xB945,INVALC,0xE0A1,INVALC,INVALC,0xB94A,
-	INVALC,0xE0A2,0xB943,0xB942,INVALC,0xB94D,0xB94C,0xB94B,
-	0xB949,0xB94E,0xE07D,0xB944,0xB946,0xB948,INVALC,INVALC,
-	0xBBB8,0xBBBB,INVALC,0xBBBF,0xBBB9,0xBBBE,0xBBBC,INVALC,
-	0xBBB7,INVALC,0xBBBD,0xBBBA,INVALC,INVALC,INVALC,0xE852,
-	0xBE43,0xBE41,INVALC,0xE853,INVALC,0xBE44,0xBE42,0xE851,
-	0xE850,INVALC,0xBFF0,0xE84F,0xBFEE,0xBFED,0xEBD0,0xBE45,
-	0xBFEF,0xEBD1,0xBFF2,0xEBD2,0xBFF1,0xC1D8,0xEEC3,0xC1D7,
-	0xC1DC,0xC1DA,0xC1DB,0xC2E3,0xC1D9,0xEEC2,0xEBD3,0xC2E2,
-	0xC2E4,INVALC,0xC3E4,0xC3E5,INVALC,0xF4E0,INVALC,0xC5DE,
-	0xC5DD,0xA8B6,INVALC,INVALC,0xCA55,0xB06F,INVALC,0xCA52,
-	0xCA53,0xCA51,INVALC,0xCA54,INVALC,INVALC,0xCBAA,0xCBA7,
-	0xCBAC,0xCBA8,0xA8B7,0xA8BA,INVALC,0xCBA9,0xA8B9,0xCBAB,
-	INVALC,INVALC,0xA8B8,INVALC,INVALC,INVALC,INVALC,0xCDD5,
-	0xCDD7,0xAAF4,0xCDD3,0xCDD6,0xCDD4,0xAAF2,0xAAF5,INVALC,
-	0xAAF3,INVALC,INVALC,INVALC,INVALC,0xD0B8,0xD0BC,0xD0B9,
-	INVALC,0xADA7,INVALC,0xADA8,INVALC,0xD0BB,INVALC,0xD0BD,
-	0xD0BF,INVALC,0xADA5,0xD0BE,INVALC,INVALC,0xADA6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xD7EE,0xD0BA,0xD3F2,0xD3FB,
-	0xD3F9,0xD3F4,0xD3F5,0xD3FA,0xD3FC,0xB071,INVALC,0xD3F7,
-	0xD3F3,0xB070,0xB072,0xD3F6,0xD3FD,0xD3F8,INVALC,INVALC,
-	0xB3A1,0xD7F1,0xD7E9,0xD7EF,0xD7F0,0xB3A2,INVALC,0xD7E8,
-	0xD7EA,0xD0B7,0xD7EC,0xD7ED,0xD7EB,0xB66C,INVALC,INVALC,
-	INVALC,0xDC56,0xEBD4,0xDC57,0xDC54,0xB3A3,0xB66E,0xDC53,
-	/* Block 146, Array index 0x5200 */
-	0xDC59,0xDC58,0xB66B,0xDC5C,0xDC52,0xDC5B,0xDC50,0xDC5A,
-	0xDC55,0xB66D,INVALC,0xE0AA,INVALC,0xE0A5,0xE0AB,0xE0A6,
-	0xE0A4,0xE0A7,0xB951,INVALC,0xE0A9,INVALC,0xE0A8,0xB952,
-	0xBBC1,0xBBC0,0xE46E,0xE471,0xE469,0xE46D,0xBBC2,0xE46C,
-	0xE46A,0xE470,0xE46B,0xE468,0xE46F,INVALC,0xE859,0xBE48,
-	0xF14A,0xE856,0xE857,0xE855,0xDC51,0xBE47,0xE85A,0xE854,
-	0xBE46,0xBE49,0xE858,0xEBD5,0xBFF3,0xEBD6,0xEBD7,INVALC,
-	0xEEC4,0xC1DD,0xF14B,0xF14C,INVALC,INVALC,0xF14D,0xF35D,
-	0xF35C,0xF4E2,INVALC,0xF4E1,0xF65B,0xF65C,0xF65A,0xF766,
-	0xC5B0,0xA8BB,0xADAA,0xADA9,0xB075,0xB074,0xD440,0xD441,
-	0xD3FE,INVALC,0xB073,0xD7F5,INVALC,0xD7F6,0xD7F2,0xB3A4,
-	0xD7F3,INVALC,0xD7F4,INVALC,INVALC,INVALC,INVALC,0xDC5F,
-	0xDC61,0xDC5D,0xDC60,0xB66F,0xDC5E,0xB670,INVALC,INVALC,
-	0xDD73,0xB955,0xB954,INVALC,0xB953,INVALC,0xE0AC,0xE0AD,
-	INVALC,INVALC,0xE473,0xE475,0xBBC6,0xBBC3,INVALC,0xBBC5,
-	0xBBC4,0xE474,0xE472,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xE861,0xE85E,0xE85F,0xBE4D,0xE860,0xE85B,0xE85C,0xBE4A,
-	INVALC,0xBE4B,0xE85D,0xBE4C,INVALC,0xEBDB,INVALC,0xEBDC,
-	0xEBD9,0xEBDA,0xBFF4,0xEBD8,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xEEC8,0xEEC5,0xEEC7,0xC1E0,0xEECB,0xC1DF,0xEEC9,
-	0xEECC,0xEECA,0xEEC6,0xC1DE,INVALC,0xF14F,INVALC,0xF150,
-	0xF14E,INVALC,0xF152,0xC2E5,0xC2E6,0xF35F,0xC3E7,0xF151,
-	0xF35E,0xC3E6,0xF4E5,0xF4E6,0xC4BF,0xF4E4,INVALC,0xF4E3,
-	INVALC,0xF65D,0xC548,INVALC,0xF849,0xF8C8,0xF8C7,INVALC,
-	0xC643,0xC65D,0xF8C9,0xF971,INVALC,0xC66F,0xA8BC,0xAAF6,
-	INVALC,0xB956,INVALC,0xC4C0,0xA8BD,0xADAB,0xB3A5,0xB671,
-	0xC2E7,0xAAF7,INVALC,0xD0C1,0xD0C0,0xD442,INVALC,0xB078,
-	0xB076,0xB07A,0xD444,INVALC,0xB079,0xB077,INVALC,INVALC,
-	INVALC,INVALC,0xD443,0xB3A8,0xD7FC,INVALC,0xB3A7,0xB3A9,
-	0xD842,0xB3AB,0xD7FE,0xD840,0xD7F7,0xB3AA,0xD843,INVALC,
-	INVALC,0xD7F9,INVALC,0xD7FA,0xD7F8,0xB3A6,INVALC,0xD841,
-	0xD7FB,0xD7FD,INVALC,INVALC,INVALC,0xDC6D,INVALC,0xDC6C,
-	/* Block 147, Array index 0x5300 */
-	0xDC6A,0xDC62,0xDC71,0xDC65,0xDC6F,0xDC76,0xDC6E,0xB679,
-	INVALC,0xB675,0xDC63,INVALC,0xDC69,0xB677,INVALC,0xDC68,
-	0xB678,0xB67A,0xDC6B,INVALC,0xB672,0xB673,0xDC77,0xDC75,
-	INVALC,0xDC74,0xDC66,INVALC,0xDC72,INVALC,0xB676,INVALC,
-	INVALC,INVALC,INVALC,0xB674,0xDC73,0xDC64,0xDC67,0xDC70,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xE4BA,0xE0B7,INVALC,
-	0xE0B0,0xE0C3,0xE0CC,0xE0B3,0xB961,INVALC,0xE0C0,0xB957,
-	0xB959,0xB965,0xE0B1,INVALC,INVALC,0xB95A,0xB95C,0xB966,
-	0xB95B,INVALC,INVALC,INVALC,INVALC,0xB964,0xE0B9,INVALC,
-	0xE0AE,0xB962,0xE0B8,0xB95E,0xE0CA,0xB963,0xE0C8,0xE0BC,
-	0xE0C6,0xB960,0xE0AF,0xE0C9,0xE0C4,INVALC,0xE0CB,0xB958,
-	INVALC,INVALC,0xB967,0xB95D,INVALC,INVALC,0xE0B5,INVALC,
-	0xE0BD,0xE0C1,INVALC,0xE0C5,0xB95F,0xE0B4,0xE0B2,0xE0BE,
-	INVALC,INVALC,INVALC,INVALC,0xE0BB,0xE0BA,INVALC,0xE0BF,
-	0xE0C2,INVALC,0xE0C7,INVALC,INVALC,INVALC,0xE478,INVALC,
-	0xBBC7,0xE4A4,0xE47A,0xBBCC,0xBBD0,0xE4AD,0xE4B5,0xE4A6,
-	0xBBC8,INVALC,0xE4AA,0xE0B6,INVALC,0xBBC9,0xE4B1,0xE4B6,
-	0xE4AE,INVALC,0xE4B0,0xE4B9,0xE4B2,0xE47E,0xE4A9,INVALC,
-	INVALC,0xBBD1,INVALC,0xBBCD,0xE47C,0xE4AB,0xBBCB,0xE4A5,
-	0xBBCA,0xE4B3,0xE4A2,0xE479,0xBBCE,0xE4B8,INVALC,INVALC,
-	0xE47B,0xE4AF,0xE4AC,0xE4A7,0xE477,0xE476,0xE4A1,0xE4B4,
-	0xBBCF,0xE4B7,0xE47D,0xE4A3,0xBE52,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xBE5A,0xBE55,0xE8A4,0xE8A1,0xE867,0xBE50,
-	INVALC,INVALC,INVALC,0xBE4F,0xBE56,INVALC,INVALC,INVALC,
-	0xE865,0xBE54,0xE871,0xE863,0xE864,0xBE4E,0xE8A3,0xBE58,
-	0xE874,0xE879,0xE873,0xEBEE,0xE86F,0xE877,0xE875,0xE868,
-	0xE862,0xE87D,0xBE57,0xE87E,INVALC,0xE878,INVALC,0xE86D,
-	0xE86B,0xE866,INVALC,INVALC,INVALC,0xE86E,0xE87B,0xE86A,
-	0xE87A,0xE8A2,INVALC,INVALC,0xBE53,INVALC,0xE876,0xE87C,
-	0xE872,0xE86C,0xBE51,INVALC,INVALC,INVALC,0xE4A8,0xE870,
-	0xBE59,0xE869,INVALC,INVALC,INVALC,INVALC,INVALC,0xEBF4,
-	0xBFF7,0xEBF3,0xEBF0,0xEC44,0xBFFB,INVALC,0xEC41,0xEBF8,
-	/* Block 148, Array index 0x5400 */
-	0xEC43,0xEBE9,0xEBF6,INVALC,0xBFFD,INVALC,0xEBE1,INVALC,
-	0xEBDF,0xEC42,INVALC,0xEC40,0xEBFE,0xEBED,0xEBEC,0xEBE2,
-	0xC040,INVALC,0xEBE8,0xEBF2,0xEBFD,0xC043,0xEC45,INVALC,
-	0xC1E8,0xC045,0xBFFE,0xEBE6,INVALC,0xEBEF,0xEBDE,0xEBE0,
-	0xBFF5,0xC042,0xBFFA,0xEBE7,0xEBF7,0xEBF1,0xC041,0xEBDD,
-	0xC1E3,0xEBF9,0xEBFC,0xBFFC,INVALC,0xEBEB,0xC044,0xBFF9,
-	INVALC,INVALC,INVALC,0xBFF8,0xEBF5,0xEBFB,0xBFF6,INVALC,
-	0xEBE4,0xEBFA,INVALC,INVALC,0xEBE5,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xEBEA,0xEED2,
-	INVALC,0xEED7,0xC1E5,0xC1E7,0xEEDD,0xC1E1,0xEEEC,0xEEE3,
-	0xEED8,0xEED9,0xEEE2,INVALC,0xC1EE,0xEEE1,0xEED1,0xEEE0,
-	0xEED4,0xEEED,0xC1ED,0xC1EB,0xEED5,INVALC,0xEEE8,INVALC,
-	0xEEDA,0xEEE7,INVALC,0xEEE9,0xEED0,0xC1E6,INVALC,0xEEEA,
-	INVALC,INVALC,0xEEDE,INVALC,0xC1EA,0xEEDB,INVALC,INVALC,
-	0xC1EC,0xEEE4,INVALC,INVALC,INVALC,0xC1E4,0xEED6,0xEEE5,
-	INVALC,0xEEDF,0xEBE3,0xEEE6,0xEED3,INVALC,0xC1E9,INVALC,
-	0xEEEB,INVALC,0xC1E2,0xEECE,INVALC,INVALC,INVALC,INVALC,
-	0xF160,0xF159,0xC2E9,INVALC,0xF154,0xF163,0xF15B,0xEEDC,
-	INVALC,0xF165,0xF155,INVALC,0xC2E8,0xF15F,0xC2EA,0xC2F2,
-	0xC2F0,0xF161,0xC2F1,0xF157,INVALC,0xF158,0xF15D,0xF162,
-	INVALC,0xEECD,0xC2EB,0xF16A,0xF167,0xF16B,0xF15E,0xF15A,
-	0xF168,0xF36A,0xF15C,INVALC,0xC2EE,INVALC,0xC2ED,0xEECF,
-	0xC2EF,0xF164,0xF166,0xC2EC,0xF169,0xF153,INVALC,0xF156,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xF373,INVALC,0xF363,0xC3EB,0xF371,INVALC,INVALC,0xF361,
-	0xC3EC,INVALC,0xF36C,INVALC,0xF368,0xC3F1,0xF372,0xF362,
-	0xF365,0xC3E9,0xF374,INVALC,0xF36D,0xF370,0xC3EF,0xC3F4,
-	0xC3F2,0xF369,0xF364,INVALC,0xC3ED,0xC3EE,0xF360,0xC3EA,
-	INVALC,0xC3E8,0xC3F0,0xF36F,0xC3F3,INVALC,0xF36B,0xF375,
-	0xC3F5,INVALC,INVALC,INVALC,0xF367,INVALC,0xF36E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xF4F3,0xF542,0xF4F5,
-	0xF4FC,0xF366,0xF4FA,0xF4E9,0xF540,0xC4C3,0xF4ED,0xF4FE,
-	/* Block 149, Array index 0x5500 */
-	0xF4F4,INVALC,INVALC,0xC4C2,INVALC,INVALC,0xF544,0xF4F6,
-	INVALC,0xF4FB,0xF4FD,0xF4E7,0xF541,0xF4F2,0xF4F7,0xF4EB,
-	0xF4EF,0xF543,0xF4F9,0xF4E8,0xF4EC,0xF4EE,0xF4F8,INVALC,
-	0xC4C1,0xF4F1,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xF4EA,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xF4F0,0xF661,0xF666,0xC54F,0xF668,INVALC,0xC549,INVALC,
-	0xF664,0xF66A,0xC54E,0xC54A,INVALC,0xC54B,0xF660,0xF667,
-	0xC54D,0xF665,0xC54C,0xF65F,0xF663,0xF662,INVALC,0xF65E,
-	0xF669,INVALC,INVALC,INVALC,0xC5B1,0xF76D,0xF770,0xF76C,
-	0xF76E,0xF76F,0xF769,0xF76A,0xF767,INVALC,INVALC,0xF76B,
-	0xF768,0xC5B2,0xC5B3,INVALC,INVALC,0xF84B,INVALC,0xF84D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xF84C,0xF84E,INVALC,
-	0xC5E0,INVALC,0xF84A,0xC5DF,0xC5E1,INVALC,INVALC,INVALC,
-	0xF8CB,0xF8CC,0xC644,0xF8CA,INVALC,0xF953,0xF952,0xF954,
-	0xC65F,0xF955,0xC65E,0xF956,0xF972,0xF975,0xF974,0xC668,
-	0xF973,INVALC,INVALC,INVALC,0xC672,0xC670,0xC671,0xC677,
-	0xF9C0,0xF9C1,0xF9BF,0xF9C9,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 150, Array index 0x5600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xAAF8,
-	INVALC,INVALC,0xD844,0xDC78,0xE8A5,0xF376,INVALC,INVALC,
-	0xAAF9,INVALC,0xADAC,0xB07B,INVALC,INVALC,0xD845,INVALC,
-	0xD846,0xB3AC,INVALC,0xB67D,0xDC7A,0xDC79,0xB6A3,0xB67C,
-	0xDC7B,0xB67E,0xB6A2,0xB6A1,0xB67B,INVALC,INVALC,INVALC,
-	0xB968,INVALC,INVALC,0xE0D0,0xE0CE,INVALC,0xE0CF,0xE0CD,
-	INVALC,0xBBD2,INVALC,0xBBD5,0xBBD7,0xBBD6,INVALC,INVALC,
-	0xBBD3,0xBBD4,INVALC,0xE8A7,0xE8A6,0xBE5B,0xE8A8,INVALC,
-	0xE8A9,0xBE5C,INVALC,INVALC,INVALC,0xEC4D,0xEC4B,0xEEF3,
-	INVALC,0xEC49,0xEC4A,0xC046,0xEC46,0xEC4E,0xEC48,0xEC4C,
-	0xEEEF,INVALC,INVALC,0xEEF1,INVALC,0xEEF2,0xC1F3,0xEEEE,
-	0xC1F2,0xEEF0,0xC1EF,0xC1F0,0xC1F1,0xEC47,INVALC,INVALC,
-	0xC2F5,0xF16E,0xF16C,0xF16D,0xC2F3,0xC2F6,0xC2F4,INVALC,
-	INVALC,INVALC,0xF377,0xF378,0xC3F6,INVALC,0xF545,0xF547,
-	0xF546,0xC4C4,0xC550,0xF66D,0xF66C,0xF66B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 151, Array index 0x5700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xAAFA,INVALC,0xC9AA,INVALC,
-	0xCA58,0xA6E9,0xCA56,0xCA59,0xCA57,INVALC,INVALC,INVALC,
-	0xCBAE,INVALC,0xA8C1,INVALC,0xA8C2,0xCBB0,0xA8BF,0xCBAF,
-	0xCBAD,0xA8C0,0xA8BE,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xCDD8,0xCDDB,0xAAFD,0xCDDA,0xCDD9,INVALC,0xAAFC,
-	0xAAFB,INVALC,0xAB40,0xCDDC,0xAAFE,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xD0C6,0xADAE,0xADAF,0xADB0,0xD0C7,0xD0C3,
-	0xADAD,0xD0C4,INVALC,0xD0C5,0xD0C2,INVALC,INVALC,INVALC,
-	0xB0A4,INVALC,INVALC,0xB0A1,0xD445,0xB0A2,0xB0A5,0xD446,
-	INVALC,0xB07E,0xB07C,0xB07D,0xB0A3,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xB3AD,0xD849,0xB3B5,0xD848,INVALC,0xD84B,
-	0xB3B1,0xD84A,0xB6AB,0xB3AF,0xB3B2,0xB3AE,0xB3B3,0xB3B4,
-	0xB3B0,INVALC,INVALC,INVALC,0xD847,0xB6A7,0xDC7D,INVALC,
-	0xDCA3,INVALC,INVALC,0xDCA2,0xB6AC,0xB6A8,0xB6A9,0xDC7C,
-	0xDC7E,0xDCA1,0xB6A4,0xB6A6,INVALC,0xB6AA,0xB6A5,INVALC,
-	INVALC,0xE0D3,0xE0D1,0xE0D2,0xB96A,0xB96B,INVALC,0xE0D4,
-	0xB969,0xBBD8,INVALC,0xBBDA,0xBBD9,INVALC,0xE4BB,INVALC,
-	INVALC,0xE4BC,0xE8AB,INVALC,0xE8AA,INVALC,INVALC,0xC047,
-	0xC048,0xEC4F,0xC049,INVALC,0xEEF6,INVALC,0xEEF4,INVALC,
-	0xEEF5,0xC1F4,INVALC,0xF16F,0xC3F7,INVALC,INVALC,INVALC,
-	0xC1F5,0xAB41,INVALC,0xB0A6,0xD447,INVALC,INVALC,0xD84C,
-	0xB3B6,0xB6AD,0xDCA4,0xDCA6,0xB6AF,0xB6AE,0xB6B0,0xB6B1,
-	0xDCA5,0xB96E,0xB96F,0xB96D,0xBBDB,0xB96C,0xE0D5,INVALC,
-	INVALC,INVALC,0xBBDC,0xE8AC,0xEC50,0xC04A,0xC1F6,0xF170,
-	0xF174,0xC2F9,0xF171,0xC2FA,0xC2F8,0xF175,0xC2FB,0xF173,
-	INVALC,0xF379,0xC2F7,0xC3F8,INVALC,0xF8CD,INVALC,INVALC,
-	0xAB42,0xB3B8,0xB3B7,INVALC,INVALC,INVALC,INVALC,0xB6B2,
-	0xDCA8,0xDCA7,0xB6B3,INVALC,INVALC,0xE0D9,0xB973,0xB970,
-	0xE0D8,0xB972,0xE0D6,0xB971,INVALC,0xE0D7,INVALC,0xE4BD,
-	/* Block 152, Array index 0x5800 */
-	0xBBDD,INVALC,0xE8AF,INVALC,0xBE5D,0xE8AD,0xBE5E,0xBE5F,
-	0xE8AE,0xBE60,INVALC,0xEC51,INVALC,0xC04E,0xC04B,0xC050,
-	0xEC53,0xC04C,0xEC52,0xC04F,INVALC,INVALC,0xC04D,INVALC,
-	0xEEF9,0xEEFB,INVALC,INVALC,0xC1F7,0xEEFA,0xC1F8,0xEEF8,
-	0xEEF7,INVALC,0xF177,0xF176,0xC2FC,0xF178,0xF37E,0xC3FA,
-	0xF37D,0xF37A,0xC3F9,0xF37B,0xF37C,INVALC,0xF548,0xF549,
-	0xC4C5,INVALC,0xC553,INVALC,INVALC,0xF66E,INVALC,INVALC,
-	0xC551,0xC552,0xF66F,INVALC,INVALC,0xC5B4,0xC5B5,0xF771,
-	INVALC,INVALC,0xC645,0xF8CF,0xC647,INVALC,0xF8CE,0xF8D0,
-	0xC646,0xF957,INVALC,0xF9AD,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0xAB43,INVALC,INVALC,INVALC,0xB974,INVALC,
-	0xE4BE,INVALC,0xE8B0,0xC051,0xC052,INVALC,0xAB44,INVALC,
-	0xBE61,0xC3FB,0xADB1,INVALC,INVALC,INVALC,0xC053,INVALC,
-	0xC5E2,0xADB2,0xD84D,INVALC,0xDCA9,INVALC,0xDCAB,INVALC,
-	0xDCAA,INVALC,0xE0DD,0xE0DA,0xB975,INVALC,0xB976,0xE0DB,
-	0xE0DC,INVALC,0xE4C0,0xE4C5,0xBBDE,0xE4BF,0xE4C1,0xE4C8,
-	0xE4C3,0xE4C7,0xE4C4,0xE4C2,0xE4C6,0xBBDF,INVALC,INVALC,
-	0xE8B3,INVALC,0xE8B1,0xBE63,INVALC,0xBE62,0xE8B2,0xBE64,
-	INVALC,INVALC,INVALC,INVALC,0xEC56,INVALC,INVALC,0xEC55,
-	0xC054,0xEC54,0xEEFC,INVALC,0xEEFE,0xEF41,0xEF40,INVALC,
-	0xC1F9,0xEEFD,0xF1A1,0xC2FD,0xF17D,0xF1A2,0xC2FE,INVALC,
-	0xF17B,INVALC,0xF17E,0xF17C,0xF179,0xC340,0xF17A,INVALC,
-	INVALC,INVALC,INVALC,0xF3A1,INVALC,INVALC,0xF3A3,0xF3A2,
-	INVALC,0xF54A,INVALC,0xF54B,INVALC,INVALC,INVALC,0xF670,
-	INVALC,0xC5B7,INVALC,0xC5B6,0xF84F,0xF850,0xC648,0xF8D1,
-	INVALC,0xC669,INVALC,0xADB3,0xB6B4,0xE4CA,0xE4C9,0xE8B5,
-	0xE8B4,INVALC,INVALC,0xC1FA,0xEF43,0xEF42,0xF1A5,0xF1A3,
-	0xF1A6,0xF1A4,INVALC,INVALC,0xC3FC,0xF3A4,0xF3A5,0xF3A6,
-	INVALC,0xF671,INVALC,0xF772,INVALC,0xF8D2,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xADB4,INVALC,INVALC,
-	0xEC57,0xEF44,INVALC,0xADB5,INVALC,INVALC,0xBBE0,INVALC,
-	0xEC58,0xC341,0xF1A7,0xC3FD,INVALC,0xF54C,0xF54D,0xC554,
-	/* Block 153, Array index 0x5900 */
-	0xF851,0xADB6,0xB3BB,0xB3BC,0xD84E,0xB6B5,0xB6B6,0xDCAC,
-	0xB6B7,INVALC,0xB97A,INVALC,0xB97C,0xE0DF,0xE0E0,0xE0DE,
-	0xB977,0xB978,0xB97B,0xB979,INVALC,INVALC,0xE4CB,0xBBE1,
-	0xBBE2,INVALC,INVALC,0xE8BC,0xBE67,0xE8B7,0xE8B6,INVALC,
-	0xE8BB,0xBE65,INVALC,INVALC,0xC05B,INVALC,0xE8B8,0xE8BD,
-	0xE8BA,0xE8B9,INVALC,0xBE66,INVALC,0xC059,INVALC,0xEC5A,
-	0xC055,INVALC,0xEC5B,INVALC,INVALC,0xEC59,INVALC,0xC058,
-	0xC056,0xC05A,INVALC,0xC057,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xEF45,INVALC,0xEF4A,0xEF46,0xEF49,0xC1FB,INVALC,
-	0xEDD4,0xEF48,0xEF47,INVALC,0xC344,0xC342,0xC345,0xC343,
-	0xF1A8,0xF1A9,0xF1AA,0xC346,INVALC,INVALC,INVALC,0xF3AA,
-	0xC440,0xF3A8,INVALC,0xC441,0xF3A7,0xF3A9,0xC3FE,0xF551,
-	0xF54E,INVALC,0xF54F,0xF550,0xF672,0xC556,INVALC,0xC555,
-	INVALC,0xF774,0xF773,0xC5B8,INVALC,INVALC,INVALC,0xC5E3,
-	0xC649,0xC660,0xF958,0xF9AE,0xF9AF,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xADB7,0xDCAD,INVALC,INVALC,0xE0E1,0xE4CC,0xE4CD,0xBBE3,
-	INVALC,0xBBE4,0xE8BE,0xBE68,INVALC,INVALC,0xC1FC,INVALC,
-	0xF1AB,INVALC,0xC347,0xF3AD,0xC442,0xF3AC,0xF3AE,0xF3AB,
-	0xF675,0xF552,0xF553,INVALC,0xC4C6,INVALC,0xF674,INVALC,
-	INVALC,0xF673,INVALC,0xF775,0xF9B0,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xADB8,INVALC,INVALC,INVALC,0xADB9,
-	INVALC,INVALC,0xB0A7,0xD448,INVALC,0xD84F,INVALC,0xB6B8,
-	INVALC,0xB6BB,0xB6B9,0xDCAE,INVALC,0xB6BD,INVALC,0xB6BA,
-	INVALC,INVALC,0xB6BC,INVALC,0xB97E,INVALC,0xE0E2,INVALC,
-	INVALC,0xE0E3,0xE8C0,INVALC,0xB97D,0xB9A1,0xB9A2,INVALC,
-	/* Block 154, Array index 0x5A00 */
-	0xE4CF,INVALC,0xE4CE,0xBBE5,INVALC,0xBBE6,INVALC,0xE4D0,
-	0xE8BF,0xBBE8,0xBE69,INVALC,0xBBE7,INVALC,INVALC,INVALC,
-	0xC05C,0xE8C1,0xBE6B,0xBE6A,0xE8C2,0xE8C5,0xE8C3,0xE8C4,
-	0xBE6C,INVALC,0xC061,0xC05F,INVALC,INVALC,0xC05E,0xEC5D,
-	INVALC,0xC060,INVALC,INVALC,0xEC5C,0xEF4B,INVALC,0xEC5E,
-	0xC05D,0xEC5F,0xEF4E,0xEF4C,0xEF4D,0xEF52,0xC34B,0xEF51,
-	0xEF54,0xEF53,0xEF50,0xEF4F,INVALC,0xC1FD,INVALC,INVALC,
-	INVALC,INVALC,0xF1AE,INVALC,0xF1AD,0xC34A,0xC348,0xC349,
-	INVALC,0xF1AC,INVALC,0xF3B1,INVALC,0xC443,INVALC,0xF3B0,
-	0xF3AF,0xC444,INVALC,0xF558,0xF557,INVALC,0xF555,INVALC,
-	0xF554,0xC4C8,0xC4C7,0xF559,0xF776,0xC5B9,0xF677,0xC557,
-	0xF676,0xF556,INVALC,0xF777,0xC5E4,INVALC,0xC661,0xF959,
-	INVALC,0xF9B1,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xADBA,0xD850,
-	0xEF55,0xADBB,INVALC,INVALC,0xE4D2,0xE4D1,0xEC60,INVALC,
-	INVALC,0xEF57,INVALC,0xEF56,INVALC,0xC34C,0xF3B2,0xF3B3,
-	0xC4C9,INVALC,INVALC,0xF9B2,0xB0A8,0xB6BF,0xB6BE,0xE0E4,
-	0xE0E6,0xB9A4,0xE0E5,0xB9A3,0xB9A5,0xE0E7,INVALC,INVALC,
-	INVALC,0xE4D4,0xE4D6,0xE4D5,INVALC,0xE4D8,INVALC,INVALC,
-	INVALC,0xBBE9,0xE4D7,0xE4D3,INVALC,INVALC,INVALC,0xE4D9,
-	INVALC,0xE8CC,INVALC,0xE8CF,0xE8D1,0xE8C7,0xE8CB,0xE8C8,
-	0xBE6E,0xBE71,0xBE73,0xE8C9,0xE8CA,0xBE72,0xE8CD,0xE8D0,
-	0xE8CE,0xBE74,INVALC,0xBE70,0xE8C6,0xBE6D,INVALC,0xBE6F,
-	INVALC,INVALC,0xC063,0xEC66,0xEC64,0xEC63,INVALC,0xEC69,
-	INVALC,0xEC68,0xEC67,INVALC,0xEC62,0xC062,0xEC61,INVALC,
-	0xEC65,0xC064,INVALC,INVALC,0xEF5A,INVALC,0xEF5E,0xEF5B,
-	0xEF5D,0xEF5C,0xEF59,0xEF5F,0xEF62,0xEF60,0xEF61,0xC240,
-	/* Block 155, Array index 0x5B00 */
-	INVALC,0xC1FE,0xEF58,0xEF63,0xF1B3,0xF1B6,0xF1B8,0xF1B7,
-	INVALC,0xF1B1,0xF1B5,0xF1B0,INVALC,0xF1B2,0xC34D,0xF1AF,
-	INVALC,0xF1B4,INVALC,INVALC,0xF3C0,0xF3B5,0xC445,INVALC,
-	INVALC,0xC446,0xF3B4,0xF3B9,0xF3BF,0xF3B7,0xF3BE,INVALC,
-	0xF3BB,INVALC,0xF3BA,0xF3BD,0xF3B8,0xF3B6,INVALC,0xF3BC,
-	INVALC,0xF560,0xF55E,0xC4CA,0xF55D,0xF563,0xF561,INVALC,
-	0xC4CB,0xF55C,0xF55A,INVALC,0xF55B,0xC4CD,0xF55F,0xC4CC,
-	0xF562,0xF678,0xF67E,INVALC,INVALC,0xF679,0xC55B,0xF6A1,
-	0xC55A,0xF67D,0xF67C,0xC559,0xF67B,0xC558,0xF67A,INVALC,
-	0xF77D,0xF7A1,0xF77E,INVALC,0xF77B,0xC5BB,0xF778,0xF77C,
-	0xF7A3,INVALC,0xF7A2,0xF779,0xF77A,0xC5BA,0xF852,0xC5E7,
-	INVALC,0xF853,0xC5E5,0xC5E6,INVALC,INVALC,0xF8D3,0xC64A,
-	0xF976,INVALC,0xC66A,INVALC,0xF9B3,0xC66B,0xF9B4,0xF9B5,
-	0xF9C3,0xF9C2,0xC67A,0xF9CD,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xB0A9,INVALC,INVALC,0xE0E9,INVALC,0xE0E8,INVALC,0xBBEA,
-	0xBBEB,0xE4DA,INVALC,0xE8D2,0xEC6C,INVALC,INVALC,0xBE75,
-	0xC065,0xEC6A,INVALC,0xEC6D,0xC066,INVALC,0xEF64,0xEC6B,
-	0xF1B9,0xC34E,0xF3C1,INVALC,INVALC,INVALC,0xF566,0xF564,
-	INVALC,INVALC,0xF565,INVALC,INVALC,0xF6A2,INVALC,0xC55C,
-	0xF7A4,0xC5EA,0xC5BC,0xC5E8,0xC5E9,0xF8D4,0xC662,INVALC,
-	0xB0AA,INVALC,INVALC,INVALC,0xF1BA,INVALC,INVALC,0xD449,
-	INVALC,0xB9A6,INVALC,0xE4DB,INVALC,INVALC,0xBBEC,0xE4DC,
-	INVALC,INVALC,INVALC,0xE8D4,0xE8D3,0xC068,0xBE76,0xBE77,
-	INVALC,0xE8D7,0xE8D6,0xE8D5,INVALC,INVALC,0xEC6E,0xEC71,
-	INVALC,0xEC70,0xEC6F,0xC067,0xEF68,0xEF66,0xEF65,INVALC,
-	/* Block 156, Array index 0x5C00 */
-	INVALC,0xEF67,INVALC,0xC34F,0xF1BC,0xF1BD,0xC350,INVALC,
-	0xF1BB,INVALC,0xF3C3,0xF3C2,0xF3C5,0xC447,0xF3C4,INVALC,
-	0xF567,0xF569,0xF568,INVALC,INVALC,0xF6A3,0xF6A6,0xF6A4,
-	0xF6A5,0xF7A5,0xC5BD,INVALC,INVALC,INVALC,0xF854,0xF855,
-	0xF856,INVALC,0xC64B,0xC663,0xF9B6,0xB0AB,INVALC,0xBE78,
-	0xC069,0xF1BE,INVALC,0xF7A6,INVALC,INVALC,0xF9C4,0xD44A,
-	INVALC,0xC67B,0xB0AC,0xEC72,INVALC,0xF1BF,INVALC,0xF3C6,
-	INVALC,INVALC,0xF6A7,0xF7A7,0xB0AD,INVALC,0xE4DD,0xE4DE,
-	INVALC,0xBBED,0xBBEE,0xE8D9,0xBE7A,0xBE79,0xE8D8,INVALC,
-	0xEF69,INVALC,0xF1C0,0xF1C2,0xF1C1,0xC353,0xC352,0xC351,
-	INVALC,0xC55E,0xF6A8,INVALC,0xC55D,0xF7A9,0xF7A8,INVALC,
-	0xC64C,0xF8D5,0xB3BD,0xE0EA,INVALC,INVALC,INVALC,0xE4E1,
-	0xE4DF,0xE4E0,INVALC,INVALC,0xE8E2,INVALC,0xE8DD,0xE8DA,
-	0xE8E1,INVALC,INVALC,INVALC,0xE8E3,INVALC,INVALC,0xBE7C,
-	0xE8E0,0xE8DC,INVALC,INVALC,0xE8DB,0xE8DF,0xE8DE,0xBE7B,
-	INVALC,INVALC,0xEC7D,0xEC78,0xEC76,0xECA1,0xEC77,INVALC,
-	0xEC73,INVALC,0xEC79,INVALC,INVALC,0xEC74,0xEF72,0xEC75,
-	0xECA2,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xEC7C,0xC06A,0xEC7B,0xEC7A,INVALC,0xEC7E,INVALC,INVALC,
-	INVALC,INVALC,0xEF6A,0xEF6D,INVALC,INVALC,0xEF6C,INVALC,
-	0xEF74,0xEF6F,0xEF73,INVALC,0xEF71,0xEF70,0xEF6E,INVALC,
-	0xEF6B,INVALC,0xC243,0xC242,INVALC,0xC244,0xC241,0xEF75,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xF1C8,0xF1CB,INVALC,
-	0xF1C9,0xF1CD,INVALC,INVALC,INVALC,0xF1CE,INVALC,0xF1C6,
-	0xC358,0xF1C7,INVALC,0xF1C5,0xF1CC,INVALC,0xF1C4,0xF1C3,
-	0xC357,0xC355,0xC354,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0xF1CA,0xF3CF,0xF3D5,0xC44A,0xF3D0,
-	INVALC,0xF3D3,0xF3D7,0xC44B,0xF3D2,INVALC,0xF3CA,INVALC,
-	0xF3C9,0xF3D6,0xF3CD,INVALC,0xF3CB,0xF3D4,0xF3CC,0xC449,
-	0xC448,INVALC,0xF3C7,0xF3C8,0xF3D1,INVALC,INVALC,INVALC,
-	0xF3CE,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0xF56C,
-	0xF56F,INVALC,INVALC,INVALC,INVALC,0xC356,INVALC,INVALC,
-	/* Block 157, Array index 0x5D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xF56D,0xF573,0xF571,
-	0xF56B,0xF576,INVALC,0xF56A,INVALC,0xC4CF,0xF572,INVALC,
-	INVALC,INVALC,0xF56E,0xC4CE,0xF575,INVALC,INVALC,0xF574,
-	INVALC,INVALC,INVALC,INVALC,0xF6AB,0xF6AA,INVALC,INVALC,
-	INVALC,0xF6B1,INVALC,0xF6AD,0xF6B0,0xC560,INVALC,INVALC,
-	0xF6AE,0xF6AF,INVALC,0xF6A9,0xF6AC,0xC55F,INVALC,INVALC,
-	INVALC,0xC5BF,0xF7B4,0xF7AF,0xF7B3,INVALC,0xF7B6,0xF7B2,
-	INVALC,0xF7AE,INVALC,0xC5C1,0xF7B1,0xF7B5,0xC5C0,0xF7AC,
-	0xF570,0xF7B0,INVALC,INVALC,0xF7AD,INVALC,0xF7AA,INVALC,
-	0xF7AB,0xC5BE,0xF85A,0xF85C,0xF85F,0xF85B,0xF860,INVALC,
-	0xF859,INVALC,0xF857,INVALC,0xC5EB,0xF85D,0xC5ED,0xC5EC,
-	0xF858,0xF85E,INVALC,INVALC,INVALC,INVALC,0xF8DA,0xC64D,
-	0xF8DB,INVALC,0xF8D9,0xF8D6,INVALC,INVALC,0xF8D8,0xF8D7,
-	0xF95A,INVALC,INVALC,INVALC,INVALC,0xF95C,0xF95B,INVALC,
-	INVALC,0xF979,INVALC,0xF978,0xF977,0xF97A,INVALC,0xC673,
-	0xC674,0xF9CA,0xF9CE,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xB3BE,0xDCAF,0xE0ED,
-	INVALC,0xB9A7,0xE0EB,INVALC,INVALC,0xE0EC,INVALC,INVALC,
-	INVALC,0xE4E2,0xE4E3,0xBBF1,0xBBEF,0xE4E4,0xBBF0,0xE8E8,
-	INVALC,0xE8EB,0xE8E5,0xE8EC,0xE8E4,0xE8E6,INVALC,0xE8E7,
-	/* Block 158, Array index 0x5E00 */
-	0xE8EA,INVALC,INVALC,0xBEA1,0xE8EF,0xE8EE,0xBE7D,0xE8E9,
-	0xE8ED,0xBE7E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xECAC,INVALC,0xC06F,INVALC,0xECA7,0xC06B,INVALC,0xECA4,
-	0xECAA,0xECAD,INVALC,0xC070,INVALC,0xECA9,0xECA6,0xECAE,
-	0xECA5,INVALC,0xECAB,0xC06C,INVALC,0xECA3,0xC06D,INVALC,
-	0xC06E,0xECA8,INVALC,INVALC,INVALC,0xEFA9,0xEF7A,0xEF7B,
-	0xEF7E,0xEF7C,INVALC,0xEF76,INVALC,INVALC,0xEF79,0xEFA5,
-	0xEF7D,INVALC,INVALC,0xC245,INVALC,0xEFA7,0xEFA4,0xC246,
-	0xEFA6,0xEF77,0xEFA2,0xEFA3,INVALC,0xEFA1,INVALC,INVALC,
-	INVALC,INVALC,0xF1D2,0xF1D4,0xF1D7,INVALC,INVALC,0xF1D1,
-	INVALC,0xC359,0xF1D9,0xF1D0,0xF1DA,INVALC,0xF1D6,0xF1D8,
-	0xF1DC,0xF1D5,0xF1DD,0xF1D3,0xF1CF,0xC35A,INVALC,0xF1DB,
-	0xC35B,0xC44D,INVALC,INVALC,INVALC,INVALC,INVALC,0xEF78,
-	0xF3F1,0xF3E8,0xC44F,0xF3E4,0xC450,INVALC,INVALC,0xF3ED,
-	0xF3E7,0xF3DD,0xC44E,0xF3EA,0xF3E5,0xF3E6,INVALC,0xF3D8,
-	0xF3DF,0xF3EE,INVALC,0xF3EB,INVALC,0xF3E3,INVALC,0xF3EF,
-	0xF3DE,0xF3D9,0xF3EC,INVALC,0xF3DB,0xF3E9,0xF3E0,0xF3F0,
-	0xF3DC,0xC44C,0xF3DA,0xF3E1,0xF3E2,INVALC,INVALC,INVALC,
-	0xF57D,INVALC,0xF57B,INVALC,0xF5A2,INVALC,0xF5AE,0xF5A5,
-	0xF57C,0xF578,0xF5A7,0xF57E,0xF5A3,0xF57A,0xF5AA,0xF577,
-	0xF5A1,0xF5A6,0xF5A8,0xF5AB,0xF579,INVALC,0xF5AF,0xF5B0,
-	0xF5A9,0xF5AD,0xF5A4,INVALC,0xF6C1,0xF6C4,INVALC,0xC561,
-	INVALC,0xF6C3,0xF6C8,0xF6C6,0xC562,0xF6BD,0xF6B3,0xF6B2,
-	0xC564,0xF6BF,0xF6C0,0xF6BC,0xF6B4,INVALC,0xF6B9,0xF5AC,
-	INVALC,0xF6B5,0xC563,0xF6BB,INVALC,0xF6BA,INVALC,0xF6B6,
-	0xF6C2,INVALC,0xF6B7,0xF7BB,0xF6C5,0xF6C7,0xF6BE,0xF6B8,
-	0xF7BC,0xF7BE,0xF7B8,0xC5C2,INVALC,0xF7C5,0xF7C3,0xC5C3,
-	0xF7C2,0xF7C1,0xF7BA,0xF7B7,0xF7BD,0xF7C6,0xF7B9,0xF7BF,
-	INVALC,0xF869,0xF86E,0xF864,0xF867,0xC5EE,0xF86B,INVALC,
-	0xF872,0xF7C0,INVALC,0xF865,0xF86F,0xF873,0xF86A,0xF863,
-	0xF86D,INVALC,0xF86C,0xF871,0xF870,0xF7C4,0xF868,0xF862,
-	0xF866,0xC64E,0xC64F,0xF861,INVALC,0xF8E6,0xF8DD,0xF8E5,
-	/* Block 159, Array index 0x5F00 */
-	0xF8E2,0xF8E3,0xF8DC,0xF8DF,0xF8E7,0xF8E1,0xF8E0,0xF8DE,
-	INVALC,0xF8E4,INVALC,0xF95D,INVALC,0xF95E,INVALC,0xF960,
-	0xF95F,0xF962,0xF961,0xF97C,0xF97B,0xF9B7,INVALC,0xF9B8,
-	INVALC,0xF9C5,0xC678,0xC67C,INVALC,0xF9CF,0xC67D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xB3BF,INVALC,INVALC,
-	INVALC,0xC4D0,0xF6C9,INVALC,0xC650,0xC651,INVALC,0xB3C0,
-	0xE0EE,INVALC,0xB9A8,0xE8F0,INVALC,INVALC,0xECB0,0xECB1,
-	0xECAF,0xEFAB,0xEFAA,0xC247,0xF1DF,0xEFAC,0xF1DE,INVALC,
-	INVALC,0xF3F3,0xC451,0xC453,0xF3F2,INVALC,INVALC,0xC452,
-	INVALC,0xF5B1,0xF5B3,0xF5B2,0xF6CA,0xC565,INVALC,0xC5EF,
-	0xF8E8,0xF963,INVALC,INVALC,0xF9D2,0xB3C1,INVALC,0xE4E5,
-	INVALC,0xBEA2,INVALC,INVALC,INVALC,0xECB3,0xECB2,INVALC,
-	0xEFAD,INVALC,INVALC,INVALC,0xC454,0xC4D1,0xF7C7,0xF9CB,
-	INVALC,INVALC,INVALC,0xB3C2,0xBBF2,INVALC,0xBEA3,INVALC,
-	0xF3F4,INVALC,0xF874,0xB6C0,INVALC,INVALC,INVALC,INVALC,
-	0xEFAE,INVALC,INVALC,INVALC,0xC664,0xB6C1,0xBEA4,0xC248,
-	0xF875,0xB6C2,INVALC,0xE8F1,0xC072,0xECB4,0xECB5,INVALC,
-	0xC071,INVALC,0xEFAF,0xC24C,0xC24A,0xC24B,0xC249,0xF1E0,
-	0xC35C,INVALC,INVALC,INVALC,0xF5B5,0xF5B4,0xF5B7,0xF5B6,
-	0xC4D2,INVALC,INVALC,0xF6CB,INVALC,0xF6CD,0xF6CC,0xC566,
-	0xF7C8,INVALC,0xF876,0xF877,0xC5F0,0xF964,0xF97D,0xC675,
-	INVALC,0xDCB0,0xECB6,0xEFB0,0xF3F5,0xE0EF,INVALC,0xEFB1,
-	/* Block 160, Array index 0x6000 */
-	0xF1E2,0xF1E1,INVALC,INVALC,INVALC,INVALC,0xF878,0xC652,
-	INVALC,0xF965,0xF97E,INVALC,INVALC,INVALC,0xB9A9,0xE8F2,
-	0xE8F3,INVALC,0xECB7,0xB9AA,INVALC,0xC35D,0xF1E3,INVALC,
-	0xF6CF,0xC567,0xF6D0,0xF6CE,0xF879,INVALC,0xF8E9,INVALC,
-	0xB9AB,INVALC,0xEFB4,0xEFB3,0xEFB2,0xF1E4,INVALC,INVALC,
-	0xF1E8,0xF1E7,0xF1E6,0xF1E5,0xC35E,0xF3F6,0xF5B9,0xC4D3,
-	0xF5B8,0xF6D1,0xF7CB,0xF7CA,0xC5C4,0xF7C9,0xF87C,0xF87B,
-	0xF87A,INVALC,INVALC,0xBBF3,INVALC,0xECB8,0xC24D,INVALC,
-	0xF3F7,0xF3F8,0xF7CC,0xF87D,INVALC,INVALC,0xF8EA,0xF966,
-	0xF9B9,0xF9D4,0xBBF4,0xC24E,0xF1E9,0xF3F9,0xF6D2,0xF87E,
-	INVALC,INVALC,0xBEA6,INVALC,0xEFB5,0xF1EA,0xF3FA,0xF3FB,
-	0xF3FC,0xF5BE,INVALC,0xF5BA,0xC568,0xF5BD,0xF5BC,0xC4D4,
-	0xF5BB,0xC4D6,INVALC,0xC4D5,0xF6D4,0xF6D3,0xC569,0xC56A,
-	INVALC,INVALC,0xC5C6,0xF7CD,0xC5C5,INVALC,0xF8A3,0xF8A4,
-	0xF8A2,0xF8A1,0xC654,INVALC,0xF8EB,0xF8EC,0xF8ED,0xC653,
-	0xF967,0xF96A,0xF969,0xF968,INVALC,INVALC,0xF9D3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xC073,INVALC,INVALC,
-	0xC365,0xF5BF,0xF6D5,INVALC,0xC5C7,0xF7CE,INVALC,INVALC,
-	0xF9D5,INVALC,INVALC,INVALC,0xC074,INVALC,INVALC,INVALC,
-	0xEFB6,INVALC,0xF7CF,INVALC,0xF9A1,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 251, Array index 0x6100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xC94A,0xDDFC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 255, Array index 0x6200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xA14A,0xA157,INVALC,0xA159,0xA15B,0xA15F,0xA160,0xA163,
-	0xA164,0xA167,0xA168,0xA16B,0xA16C,0xA16F,0xA170,0xA173,
-	0xA174,0xA177,0xA178,0xA17B,0xA17C,INVALC,INVALC,INVALC,
-	INVALC,0xA1C6,0xA1C7,0xA1CA,0xA1CB,0xA1C8,0xA1C9,0xA15C,
-	0xA14D,INVALC,0xA14F,INVALC,0xA151,0xA152,0xA153,0xA154,
-	INVALC,0xA17D,0xA17E,0xA1A1,0xA1A2,0xA1A3,0xA1A4,0xA1CC,
-	0xA1CD,0xA1CE,0xA1DE,0xA1DF,0xA1E0,0xA1E1,0xA1E2,INVALC,
-	INVALC,0xA24C,0xA24D,0xA24E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 256, Array index 0x6300 */
-	INVALC,0xA149,INVALC,0xA1AD,0xA243,0xA248,0xA1AE,INVALC,
-	0xA15D,0xA15E,0xA1AF,0xA1CF,0xA141,0xA1D0,0xA144,0xA241,
-	0xA2AF,0xA2B0,0xA2B1,0xA2B2,0xA2B3,0xA2B4,0xA2B5,0xA2B6,
-	0xA2B7,0xA2B8,0xA147,0xA146,0xA1D5,0xA1D7,0xA1D6,0xA148,
-	0xA249,0xA2CF,0xA2D0,0xA2D1,0xA2D2,0xA2D3,0xA2D4,0xA2D5,
-	0xA2D6,0xA2D7,0xA2D8,0xA2D9,0xA2DA,0xA2DB,0xA2DC,0xA2DD,
-	0xA2DE,0xA2DF,0xA2E0,0xA2E1,0xA2E2,0xA2E3,0xA2E4,0xA2E5,
-	0xA2E6,0xA2E7,0xA2E8,INVALC,0xA242,INVALC,INVALC,0xA1C4,
-	INVALC,0xA2E9,0xA2EA,0xA2EB,0xA2EC,0xA2ED,0xA2EE,0xA2EF,
-	0xA2F0,0xA2F1,0xA2F2,0xA2F3,0xA2F4,0xA2F5,0xA2F6,0xA2F7,
-	0xA2F8,0xA2F9,0xA2FA,0xA2FB,0xA2FC,0xA2FD,0xA2FE,0xA340,
-	0xA341,0xA342,0xA343,0xA161,0xA155,0xA162,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0xA14E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0xA15A,INVALC,INVALC,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_BIG5 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> big5 size-optimized table (38748 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_BIG5) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_size_big5[] =
-{
-	0x0235, /* Ranges number */
-	0x02F3, /* Unranged codes number */
-	0x45C8, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x02C7, 0x02CB, 0x06A2,
-	/* Array index: 0x0006 */ 0x0391, 0x03A9, 0x06A7,
-	/* Array index: 0x0009 */ 0x03B1, 0x03C9, 0x06C0,
-	/* Array index: 0x000C */ 0x0414, 0x041C, 0x06D9,
-	/* Array index: 0x000F */ 0x0423, 0x0451, 0x06E2,
-	/* Array index: 0x0012 */ 0x2160, 0x2169, 0x0711,
-	/* Array index: 0x0015 */ 0x2190, 0x2199, 0x071B,
-	/* Array index: 0x0018 */ 0x221E, 0x2220, 0x0725,
-	/* Array index: 0x001B */ 0x2229, 0x222B, 0x0728,
-	/* Array index: 0x001E */ 0x2460, 0x2469, 0x072B,
-	/* Array index: 0x0021 */ 0x2474, 0x247D, 0x0735,
-	/* Array index: 0x0024 */ 0x256D, 0x2573, 0x073F,
-	/* Array index: 0x0027 */ 0x2581, 0x258F, 0x0746,
-	/* Array index: 0x002A */ 0x25E2, 0x25E5, 0x0755,
-	/* Array index: 0x002D */ 0x2640, 0x2642, 0x0759,
-	/* Array index: 0x0030 */ 0x3000, 0x3015, 0x075C,
-	/* Array index: 0x0033 */ 0x301D, 0x3029, 0x0772,
-	/* Array index: 0x0036 */ 0x3041, 0x3093, 0x077F,
-	/* Array index: 0x0039 */ 0x309D, 0x30F6, 0x07D2,
-	/* Array index: 0x003C */ 0x3105, 0x3129, 0x082C,
-	/* Array index: 0x003F */ 0x339C, 0x339E, 0x0851,
-	/* Array index: 0x0042 */ 0x4E07, 0x4E19, 0x0854,
-	/* Array index: 0x0045 */ 0x4E2D, 0x4E33, 0x0867,
-	/* Array index: 0x0048 */ 0x4E38, 0x4E3C, 0x086E,
-	/* Array index: 0x004B */ 0x4E4B, 0x4E53, 0x0873,
-	/* Array index: 0x004E */ 0x4E58, 0x4E5F, 0x087C,
-	/* Array index: 0x0051 */ 0x4E7E, 0x4E95, 0x0884,
-	/* Array index: 0x0054 */ 0x4E9E, 0x4EAE, 0x089C,
-	/* Array index: 0x0057 */ 0x4EC0, 0x4ECD, 0x08AD,
-	/* Array index: 0x005A */ 0x4ED4, 0x4EE9, 0x08BB,
-	/* Array index: 0x005D */ 0x4EF0, 0x4EF7, 0x08D1,
-	/* Array index: 0x0060 */ 0x4EFD, 0x4F19, 0x08D9,
-	/* Array index: 0x0063 */ 0x4F2C, 0x4F64, 0x08F6,
-	/* Array index: 0x0066 */ 0x4F67, 0x4F9E, 0x092F,
-	/* Array index: 0x0069 */ 0x4FB2, 0x4FE1, 0x0967,
-	/* Array index: 0x006C */ 0x4FF1, 0x4FFA, 0x0997,
-	/* Array index: 0x006F */ 0x5005, 0x5037, 0x09A1,
-	/* Array index: 0x0072 */ 0x5043, 0x5077, 0x09D4,
-	/* Array index: 0x0075 */ 0x508B, 0x509E, 0x0A09,
-	/* Array index: 0x0078 */ 0x50AC, 0x50DD, 0x0A1D,
-	/* Array index: 0x007B */ 0x50E3, 0x514D, 0x0A4F,
-	/* Array index: 0x007E */ 0x5157, 0x516E, 0x0ABA,
-	/* Array index: 0x0081 */ 0x5175, 0x5178, 0x0AD2,
-	/* Array index: 0x0084 */ 0x518F, 0x5198, 0x0AD6,
-	/* Array index: 0x0087 */ 0x51BC, 0x51BE, 0x0AE0,
-	/* Array index: 0x008A */ 0x51C4, 0x51D0, 0x0AE3,
-	/* Array index: 0x008D */ 0x51DC, 0x51E1, 0x0AF0,
-	/* Array index: 0x0090 */ 0x51F5, 0x51FA, 0x0AF6,
-	/* Array index: 0x0093 */ 0x5206, 0x5217, 0x0AFC,
-	/* Array index: 0x0096 */ 0x521C, 0x521E, 0x0B0E,
-	/* Array index: 0x0099 */ 0x5224, 0x522A, 0x0B11,
-	/* Array index: 0x009C */ 0x522E, 0x523B, 0x0B18,
-	/* Array index: 0x009F */ 0x5243, 0x524E, 0x0B26,
-	/* Array index: 0x00A2 */ 0x5252, 0x5262, 0x0B32,
-	/* Array index: 0x00A5 */ 0x5269, 0x526F, 0x0B43,
-	/* Array index: 0x00A8 */ 0x5274, 0x528D, 0x0B4A,
-	/* Array index: 0x00AB */ 0x5296, 0x529B, 0x0B64,
-	/* Array index: 0x00AE */ 0x52A9, 0x52AE, 0x0B6A,
-	/* Array index: 0x00B1 */ 0x52BE, 0x52C3, 0x0B70,
-	/* Array index: 0x00B4 */ 0x52D2, 0x52E6, 0x0B76,
-	/* Array index: 0x00B7 */ 0x52EF, 0x52FF, 0x0B8B,
-	/* Array index: 0x00BA */ 0x5305, 0x5323, 0x0B9C,
-	/* Array index: 0x00BD */ 0x532D, 0x5331, 0x0BBB,
-	/* Array index: 0x00C0 */ 0x533C, 0x5354, 0x0BC0,
-	/* Array index: 0x00C3 */ 0x536C, 0x537C, 0x0BD9,
-	/* Array index: 0x00C6 */ 0x5394, 0x539F, 0x0BEA,
-	/* Array index: 0x00C9 */ 0x53C8, 0x53CD, 0x0BF6,
-	/* Array index: 0x00CC */ 0x53DF, 0x53F5, 0x0BFC,
-	/* Array index: 0x00CF */ 0x5403, 0x5412, 0x0C13,
-	/* Array index: 0x00D2 */ 0x5418, 0x544A, 0x0C23,
-	/* Array index: 0x00D5 */ 0x5460, 0x549A, 0x0C56,
-	/* Array index: 0x00D8 */ 0x54A0, 0x54C9, 0x0C91,
-	/* Array index: 0x00DB */ 0x54DE, 0x54F3, 0x0CBB,
-	/* Array index: 0x00DE */ 0x54F7, 0x5514, 0x0CD1,
-	/* Array index: 0x00E1 */ 0x552A, 0x5557, 0x0CEF,
-	/* Array index: 0x00E4 */ 0x555E, 0x5566, 0x0D1D,
-	/* Array index: 0x00E7 */ 0x5575, 0x55B5, 0x0D26,
-	/* Array index: 0x00EA */ 0x55BF, 0x55E9, 0x0D67,
-	/* Array index: 0x00ED */ 0x55F6, 0x561F, 0x0D92,
-	/* Array index: 0x00F0 */ 0x562C, 0x564E, 0x0DBC,
-	/* Array index: 0x00F3 */ 0x5657, 0x565A, 0x0DDF,
-	/* Array index: 0x00F6 */ 0x5660, 0x5679, 0x0DE3,
-	/* Array index: 0x00F9 */ 0x567E, 0x5687, 0x0DFD,
-	/* Array index: 0x00FC */ 0x568C, 0x5690, 0x0E07,
-	/* Array index: 0x00FF */ 0x5695, 0x569D, 0x0E0C,
-	/* Array index: 0x0102 */ 0x56A5, 0x56B7, 0x0E15,
-	/* Array index: 0x0105 */ 0x56BC, 0x56CD, 0x0E28,
-	/* Array index: 0x0108 */ 0x56DA, 0x56EB, 0x0E3A,
-	/* Array index: 0x010B */ 0x56FF, 0x570D, 0x0E4C,
-	/* Array index: 0x010E */ 0x5712, 0x5723, 0x0E5B,
-	/* Array index: 0x0111 */ 0x5728, 0x5734, 0x0E6D,
-	/* Array index: 0x0114 */ 0x5747, 0x5752, 0x0E7A,
-	/* Array index: 0x0117 */ 0x5766, 0x577D, 0x0E86,
-	/* Array index: 0x011A */ 0x5793, 0x57A5, 0x0E9E,
-	/* Array index: 0x011D */ 0x57B5, 0x57C7, 0x0EB1,
-	/* Array index: 0x0120 */ 0x57CB, 0x57D5, 0x0EC4,
-	/* Array index: 0x0123 */ 0x57DF, 0x5810, 0x0ECF,
-	/* Array index: 0x0126 */ 0x5819, 0x583F, 0x0F01,
-	/* Array index: 0x0129 */ 0x5848, 0x5865, 0x0F28,
-	/* Array index: 0x012C */ 0x5874, 0x5894, 0x0F46,
-	/* Array index: 0x012F */ 0x589C, 0x58B3, 0x0F67,
-	/* Array index: 0x0132 */ 0x58BA, 0x58C9, 0x0F7F,
-	/* Array index: 0x0135 */ 0x58CE, 0x58EC, 0x0F8F,
-	/* Array index: 0x0138 */ 0x58F9, 0x58FF, 0x0FAE,
-	/* Array index: 0x013B */ 0x590C, 0x590F, 0x0FB5,
-	/* Array index: 0x013E */ 0x5912, 0x591C, 0x0FB9,
-	/* Array index: 0x0141 */ 0x5927, 0x5931, 0x0FC4,
-	/* Array index: 0x0144 */ 0x5944, 0x5962, 0x0FCF,
-	/* Array index: 0x0147 */ 0x5967, 0x5985, 0x0FEE,
-	/* Array index: 0x014A */ 0x598D, 0x5999, 0x100D,
-	/* Array index: 0x014D */ 0x599D, 0x59A8, 0x101A,
-	/* Array index: 0x0150 */ 0x59AE, 0x5A03, 0x1026,
-	/* Array index: 0x0153 */ 0x5A13, 0x5A20, 0x107C,
-	/* Array index: 0x0156 */ 0x5A33, 0x5A39, 0x108A,
-	/* Array index: 0x0159 */ 0x5A3E, 0x5A6D, 0x1091,
-	/* Array index: 0x015C */ 0x5A77, 0x5A7F, 0x10C1,
-	/* Array index: 0x015F */ 0x5A8A, 0x5A9F, 0x10CA,
-	/* Array index: 0x0162 */ 0x5AA5, 0x5AA9, 0x10E0,
-	/* Array index: 0x0165 */ 0x5AAC, 0x5ACD, 0x10E5,
-	/* Array index: 0x0168 */ 0x5AD5, 0x5AEE, 0x1107,
-	/* Array index: 0x016B */ 0x5AF3, 0x5B34, 0x1121,
-	/* Array index: 0x016E */ 0x5B3C, 0x5B40, 0x1163,
-	/* Array index: 0x0171 */ 0x5B47, 0x5B65, 0x1168,
-	/* Array index: 0x0174 */ 0x5B6E, 0x5B9C, 0x1187,
-	/* Array index: 0x0177 */ 0x5BA2, 0x5BB9, 0x11B6,
-	/* Array index: 0x017A */ 0x5BBF, 0x5BD9, 0x11CE,
-	/* Array index: 0x017D */ 0x5BDE, 0x5BFA, 0x11E9,
-	/* Array index: 0x0180 */ 0x5C03, 0x5C16, 0x1206,
-	/* Array index: 0x0183 */ 0x5C37, 0x5C5D, 0x121A,
-	/* Array index: 0x0186 */ 0x5C60, 0x5C74, 0x1241,
-	/* Array index: 0x0189 */ 0x5C79, 0x5C7E, 0x1256,
-	/* Array index: 0x018C */ 0x5C86, 0x5C95, 0x125C,
-	/* Array index: 0x018F */ 0x5C9D, 0x5CB8, 0x126C,
-	/* Array index: 0x0192 */ 0x5CC6, 0x5CDF, 0x1288,
-	/* Array index: 0x0195 */ 0x5CEA, 0x5CF1, 0x12A2,
-	/* Array index: 0x0198 */ 0x5CF4, 0x5D01, 0x12AA,
-	/* Array index: 0x019B */ 0x5D0B, 0x5D29, 0x12B8,
-	/* Array index: 0x019E */ 0x5D2E, 0x5D52, 0x12D7,
-	/* Array index: 0x01A1 */ 0x5D65, 0x5D6C, 0x12FC,
-	/* Array index: 0x01A4 */ 0x5D79, 0x5D8A, 0x1304,
-	/* Array index: 0x01A7 */ 0x5D92, 0x5DA2, 0x1316,
-	/* Array index: 0x01AA */ 0x5DA7, 0x5DBD, 0x1327,
-	/* Array index: 0x01AD */ 0x5DD1, 0x5DD8, 0x133E,
-	/* Array index: 0x01B0 */ 0x5DDD, 0x5DE8, 0x1346,
-	/* Array index: 0x01B3 */ 0x5DEE, 0x5DF4, 0x1352,
-	/* Array index: 0x01B6 */ 0x5DFD, 0x5E06, 0x1359,
-	/* Array index: 0x01B9 */ 0x5E14, 0x5E2D, 0x1363,
-	/* Array index: 0x01BC */ 0x5E33, 0x5E38, 0x137D,
-	/* Array index: 0x01BF */ 0x5E3D, 0x5E45, 0x1383,
-	/* Array index: 0x01C2 */ 0x5E4A, 0x5E8F, 0x138C,
-	/* Array index: 0x01C5 */ 0x5E95, 0x5E9C, 0x13D2,
-	/* Array index: 0x01C8 */ 0x5EA0, 0x5EB9, 0x13DA,
-	/* Array index: 0x01CB */ 0x5EC1, 0x5EE9, 0x13F4,
-	/* Array index: 0x01CE */ 0x5EEE, 0x5EF7, 0x141D,
-	/* Array index: 0x01D1 */ 0x5EFE, 0x5F0B, 0x1427,
-	/* Array index: 0x01D4 */ 0x5F12, 0x5F29, 0x1435,
-	/* Array index: 0x01D7 */ 0x5F2D, 0x5F38, 0x144D,
-	/* Array index: 0x01DA */ 0x5F46, 0x5F4F, 0x1459,
-	/* Array index: 0x01DD */ 0x5F54, 0x5F59, 0x1463,
-	/* Array index: 0x01E0 */ 0x5F67, 0x5FA1, 0x1469,
-	/* Array index: 0x01E3 */ 0x5FA5, 0x5FAF, 0x14A4,
-	/* Array index: 0x01E6 */ 0x5FB5, 0x5FC5, 0x14AF,
-	/* Array index: 0x01E9 */ 0x5FCC, 0x5FD9, 0x14C0,
-	/* Array index: 0x01EC */ 0x5FDD, 0x5FE5, 0x14CE,
-	/* Array index: 0x01EF */ 0x5FEA, 0x6000, 0x14D7,
-	/* Array index: 0x01F2 */ 0x6009, 0x6039, 0x14EE,
-	/* Array index: 0x01F5 */ 0x6040, 0x604D, 0x151F,
-	/* Array index: 0x01F8 */ 0x6053, 0x6072, 0x152D,
-	/* Array index: 0x01FB */ 0x607F, 0x60A3, 0x154D,
-	/* Array index: 0x01FE */ 0x60B0, 0x60E6, 0x1572,
-	/* Array index: 0x0201 */ 0x60F0, 0x611F, 0x15A9,
-	/* Array index: 0x0204 */ 0x6127, 0x612F, 0x15D9,
-	/* Array index: 0x0207 */ 0x613E, 0x6183, 0x15E2,
-	/* Array index: 0x020A */ 0x6189, 0x6196, 0x1628,
-	/* Array index: 0x020D */ 0x61A7, 0x61CD, 0x1636,
-	/* Array index: 0x0210 */ 0x61DE, 0x6236, 0x165D,
-	/* Array index: 0x0213 */ 0x623D, 0x6266, 0x16B6,
-	/* Array index: 0x0216 */ 0x626D, 0x6298, 0x16E0,
-	/* Array index: 0x0219 */ 0x62A8, 0x62BF, 0x170C,
-	/* Array index: 0x021C */ 0x62C4, 0x62DC, 0x1724,
-	/* Array index: 0x021F */ 0x62EB, 0x6316, 0x173D,
-	/* Array index: 0x0222 */ 0x6328, 0x635A, 0x1769,
-	/* Array index: 0x0225 */ 0x6365, 0x63B1, 0x179C,
-	/* Array index: 0x0228 */ 0x63C0, 0x63F6, 0x17E9,
-	/* Array index: 0x022B */ 0x6409, 0x6443, 0x1820,
-	/* Array index: 0x022E */ 0x644D, 0x6454, 0x185B,
-	/* Array index: 0x0231 */ 0x6458, 0x647F, 0x1863,
-	/* Array index: 0x0234 */ 0x6485, 0x64A6, 0x188B,
-	/* Array index: 0x0237 */ 0x64A9, 0x64B3, 0x18AD,
-	/* Array index: 0x023A */ 0x64BB, 0x64DB, 0x18B8,
-	/* Array index: 0x023D */ 0x64E0, 0x654A, 0x18D9,
-	/* Array index: 0x0240 */ 0x6551, 0x656C, 0x1944,
-	/* Array index: 0x0243 */ 0x6572, 0x6584, 0x1960,
-	/* Array index: 0x0246 */ 0x6590, 0x65C6, 0x1973,
-	/* Array index: 0x0249 */ 0x65CB, 0x65F5, 0x19AA,
-	/* Array index: 0x024C */ 0x65FA, 0x65FD, 0x19D5,
-	/* Array index: 0x024F */ 0x6600, 0x6615, 0x19D9,
-	/* Array index: 0x0252 */ 0x661C, 0x6628, 0x19EF,
-	/* Array index: 0x0255 */ 0x662B, 0x663A, 0x19FC,
-	/* Array index: 0x0258 */ 0x6641, 0x664C, 0x1A0C,
-	/* Array index: 0x025B */ 0x6659, 0x6680, 0x1A18,
-	/* Array index: 0x025E */ 0x6684, 0x6699, 0x1A40,
-	/* Array index: 0x0261 */ 0x669D, 0x66A2, 0x1A56,
-	/* Array index: 0x0264 */ 0x66A8, 0x66C0, 0x1A5C,
-	/* Array index: 0x0267 */ 0x66C4, 0x66CC, 0x1A75,
-	/* Array index: 0x026A */ 0x66D6, 0x66F9, 0x1A7E,
-	/* Array index: 0x026D */ 0x66FC, 0x6718, 0x1AA2,
-	/* Array index: 0x0270 */ 0x671D, 0x672E, 0x1ABF,
-	/* Array index: 0x0273 */ 0x6731, 0x673F, 0x1AD1,
-	/* Array index: 0x0276 */ 0x6745, 0x6760, 0x1AE0,
-	/* Array index: 0x0279 */ 0x676C, 0x679F, 0x1AFC,
-	/* Array index: 0x027C */ 0x67AE, 0x67BB, 0x1B30,
-	/* Array index: 0x027F */ 0x67C0, 0x67FC, 0x1B3E,
-	/* Array index: 0x0282 */ 0x6812, 0x6821, 0x1B7B,
-	/* Array index: 0x0285 */ 0x6825, 0x6854, 0x1B8B,
-	/* Array index: 0x0288 */ 0x686B, 0x68B5, 0x1BBB,
-	/* Array index: 0x028B */ 0x68C4, 0x68FD, 0x1C06,
-	/* Array index: 0x028E */ 0x6904, 0x6917, 0x1C40,
-	/* Array index: 0x0291 */ 0x692F, 0x697B, 0x1C54,
-	/* Array index: 0x0294 */ 0x698D, 0x69D4, 0x1CA1,
-	/* Array index: 0x0297 */ 0x69E2, 0x6A0A, 0x1CE9,
-	/* Array index: 0x029A */ 0x6A11, 0x6A28, 0x1D12,
-	/* Array index: 0x029D */ 0x6A34, 0x6A41, 0x1D2A,
-	/* Array index: 0x02A0 */ 0x6A44, 0x6A6F, 0x1D38,
-	/* Array index: 0x02A3 */ 0x6A7E, 0x6AAF, 0x1D64,
-	/* Array index: 0x02A6 */ 0x6AB3, 0x6ABD, 0x1D96,
-	/* Array index: 0x02A9 */ 0x6AC2, 0x6AD3, 0x1DA1,
-	/* Array index: 0x02AC */ 0x6AD9, 0x6AE1, 0x1DB3,
-	/* Array index: 0x02AF */ 0x6AE7, 0x6AF3, 0x1DBC,
-	/* Array index: 0x02B2 */ 0x6AF8, 0x6AFC, 0x1DC9,
-	/* Array index: 0x02B5 */ 0x6B00, 0x6B1A, 0x1DCE,
-	/* Array index: 0x02B8 */ 0x6B2F, 0x6B56, 0x1DE9,
-	/* Array index: 0x02BB */ 0x6B5B, 0x6B67, 0x1E11,
-	/* Array index: 0x02BE */ 0x6B76, 0x6BB7, 0x1E1E,
-	/* Array index: 0x02C1 */ 0x6BBC, 0x6BDB, 0x1E60,
-	/* Array index: 0x02C4 */ 0x6BE0, 0x6C38, 0x1E80,
-	/* Array index: 0x02C7 */ 0x6C3E, 0x6C43, 0x1ED9,
-	/* Array index: 0x02CA */ 0x6C4A, 0x6C9D, 0x1EDF,
-	/* Array index: 0x02CD */ 0x6CAB, 0x6CF5, 0x1F33,
-	/* Array index: 0x02D0 */ 0x6D00, 0x6D22, 0x1F7E,
-	/* Array index: 0x02D3 */ 0x6D25, 0x6D42, 0x1FA1,
-	/* Array index: 0x02D6 */ 0x6D58, 0x6D98, 0x1FBF,
-	/* Array index: 0x02D9 */ 0x6DAA, 0x6DFD, 0x2000,
-	/* Array index: 0x02DC */ 0x6E19, 0x6E79, 0x2054,
-	/* Array index: 0x02DF */ 0x6E8D, 0x6ED8, 0x20B5,
-	/* Array index: 0x02E2 */ 0x6EEB, 0x6F43, 0x2101,
-	/* Array index: 0x02E5 */ 0x6F4E, 0x6F97, 0x215A,
-	/* Array index: 0x02E8 */ 0x6F9E, 0x6FCF, 0x21A4,
-	/* Array index: 0x02EB */ 0x6FDB, 0x6FF4, 0x21D6,
-	/* Array index: 0x02EE */ 0x6FFA, 0x704C, 0x21F0,
-	/* Array index: 0x02F1 */ 0x7051, 0x706B, 0x2243,
-	/* Array index: 0x02F4 */ 0x7082, 0x7086, 0x225E,
-	/* Array index: 0x02F7 */ 0x7091, 0x709A, 0x2263,
-	/* Array index: 0x02FA */ 0x70A9, 0x70BA, 0x226D,
-	/* Array index: 0x02FD */ 0x70C5, 0x70E4, 0x227F,
-	/* Array index: 0x0300 */ 0x70F3, 0x7110, 0x229F,
-	/* Array index: 0x0303 */ 0x7117, 0x7128, 0x22BD,
-	/* Array index: 0x0306 */ 0x712E, 0x7132, 0x22CF,
-	/* Array index: 0x0309 */ 0x7141, 0x7172, 0x22D4,
-	/* Array index: 0x030C */ 0x7180, 0x718A, 0x2306,
-	/* Array index: 0x030F */ 0x7197, 0x71F4, 0x2311,
-	/* Array index: 0x0312 */ 0x71F8, 0x7207, 0x236F,
-	/* Array index: 0x0315 */ 0x7219, 0x722D, 0x237F,
-	/* Array index: 0x0318 */ 0x7235, 0x724C, 0x2394,
-	/* Array index: 0x031B */ 0x7256, 0x7263, 0x23AC,
-	/* Array index: 0x031E */ 0x726C, 0x72B0, 0x23BA,
-	/* Array index: 0x0321 */ 0x72BD, 0x72EB, 0x23FF,
-	/* Array index: 0x0324 */ 0x72F3, 0x7301, 0x242E,
-	/* Array index: 0x0327 */ 0x7307, 0x730C, 0x243D,
-	/* Array index: 0x032A */ 0x730F, 0x731E, 0x2443,
-	/* Array index: 0x032D */ 0x7322, 0x7329, 0x2453,
-	/* Array index: 0x0330 */ 0x7330, 0x7345, 0x245B,
-	/* Array index: 0x0333 */ 0x7349, 0x7352, 0x2471,
-	/* Array index: 0x0336 */ 0x7357, 0x738B, 0x247B,
-	/* Array index: 0x0339 */ 0x7392, 0x7397, 0x24B0,
-	/* Array index: 0x033C */ 0x739D, 0x73AD, 0x24B6,
-	/* Array index: 0x033F */ 0x73B2, 0x73CD, 0x24C7,
-	/* Array index: 0x0342 */ 0x73D2, 0x73E0, 0x24E3,
-	/* Array index: 0x0345 */ 0x73E5, 0x73EE, 0x24F2,
-	/* Array index: 0x0348 */ 0x73F4, 0x740D, 0x24FC,
-	/* Array index: 0x034B */ 0x7420, 0x7436, 0x2516,
-	/* Array index: 0x034E */ 0x743F, 0x7446, 0x252D,
-	/* Array index: 0x0351 */ 0x744A, 0x7464, 0x2535,
-	/* Array index: 0x0354 */ 0x7469, 0x7475, 0x2550,
-	/* Array index: 0x0357 */ 0x747C, 0x748B, 0x255D,
-	/* Array index: 0x035A */ 0x7494, 0x74C5, 0x256D,
-	/* Array index: 0x035D */ 0x74D4, 0x74E9, 0x259F,
-	/* Array index: 0x0360 */ 0x74F4, 0x74F7, 0x25B5,
-	/* Array index: 0x0363 */ 0x74FB, 0x7540, 0x25B9,
-	/* Array index: 0x0366 */ 0x754B, 0x754F, 0x25FF,
-	/* Array index: 0x0369 */ 0x7559, 0x7570, 0x2604,
-	/* Array index: 0x036C */ 0x7576, 0x7580, 0x261C,
-	/* Array index: 0x036F */ 0x7586, 0x759A, 0x2627,
-	/* Array index: 0x0372 */ 0x75A2, 0x75AB, 0x263C,
-	/* Array index: 0x0375 */ 0x75B2, 0x75E7, 0x2646,
-	/* Array index: 0x0378 */ 0x75ED, 0x7603, 0x267C,
-	/* Array index: 0x037B */ 0x7608, 0x7629, 0x2693,
-	/* Array index: 0x037E */ 0x762D, 0x7635, 0x26B5,
-	/* Array index: 0x0381 */ 0x7642, 0x7649, 0x26BE,
-	/* Array index: 0x0384 */ 0x7652, 0x7665, 0x26C6,
-	/* Array index: 0x0387 */ 0x7669, 0x7672, 0x26DA,
-	/* Array index: 0x038A */ 0x7678, 0x769E, 0x26E4,
-	/* Array index: 0x038D */ 0x76AA, 0x76B0, 0x270B,
-	/* Array index: 0x0390 */ 0x76BA, 0x76D4, 0x2712,
-	/* Array index: 0x0393 */ 0x76DA, 0x76FE, 0x272D,
-	/* Array index: 0x0396 */ 0x7701, 0x770B, 0x2752,
-	/* Array index: 0x0399 */ 0x7710, 0x7729, 0x275D,
-	/* Array index: 0x039C */ 0x772F, 0x773E, 0x2777,
-	/* Array index: 0x039F */ 0x7744, 0x774F, 0x2787,
-	/* Array index: 0x03A2 */ 0x7752, 0x776F, 0x2793,
-	/* Array index: 0x03A5 */ 0x777C, 0x7791, 0x27B1,
-	/* Array index: 0x03A8 */ 0x7797, 0x77BF, 0x27C7,
-	/* Array index: 0x03AB */ 0x77C9, 0x77FD, 0x27F0,
-	/* Array index: 0x03AE */ 0x7802, 0x7806, 0x2825,
-	/* Array index: 0x03B1 */ 0x780C, 0x7814, 0x282A,
-	/* Array index: 0x03B4 */ 0x781D, 0x7838, 0x2833,
-	/* Array index: 0x03B7 */ 0x7848, 0x7852, 0x284F,
-	/* Array index: 0x03BA */ 0x785C, 0x7871, 0x285A,
-	/* Array index: 0x03BD */ 0x787B, 0x7889, 0x2870,
-	/* Array index: 0x03C0 */ 0x7891, 0x78AD, 0x287F,
-	/* Array index: 0x03C3 */ 0x78B0, 0x78B4, 0x289C,
-	/* Array index: 0x03C6 */ 0x78BA, 0x78BE, 0x28A1,
-	/* Array index: 0x03C9 */ 0x78C1, 0x78D5, 0x28A6,
-	/* Array index: 0x03CC */ 0x78DA, 0x78F4, 0x28BB,
-	/* Array index: 0x03CF */ 0x78F7, 0x7905, 0x28D6,
-	/* Array index: 0x03D2 */ 0x790E, 0x7914, 0x28E5,
-	/* Array index: 0x03D5 */ 0x7919, 0x791E, 0x28EC,
-	/* Array index: 0x03D8 */ 0x7921, 0x7931, 0x28F2,
-	/* Array index: 0x03DB */ 0x7938, 0x796D, 0x2903,
-	/* Array index: 0x03DE */ 0x7970, 0x7974, 0x2939,
-	/* Array index: 0x03E1 */ 0x7979, 0x7982, 0x293E,
-	/* Array index: 0x03E4 */ 0x798A, 0x79C1, 0x2948,
-	/* Array index: 0x03E7 */ 0x79CB, 0x79EE, 0x2980,
-	/* Array index: 0x03EA */ 0x79F6, 0x79FB, 0x29A4,
-	/* Array index: 0x03ED */ 0x7A00, 0x7A05, 0x29AA,
-	/* Array index: 0x03F0 */ 0x7A08, 0x7A22, 0x29B0,
-	/* Array index: 0x03F3 */ 0x7A2E, 0x7A31, 0x29CB,
-	/* Array index: 0x03F6 */ 0x7A39, 0x7A40, 0x29CF,
-	/* Array index: 0x03F9 */ 0x7A44, 0x7A4E, 0x29D7,
-	/* Array index: 0x03FC */ 0x7A54, 0x7A62, 0x29E2,
-	/* Array index: 0x03FF */ 0x7A67, 0x7A99, 0x29F1,
-	/* Array index: 0x0402 */ 0x7A9E, 0x7AA3, 0x2A24,
-	/* Array index: 0x0405 */ 0x7AA8, 0x7ACB, 0x2A2A,
-	/* Array index: 0x0408 */ 0x7ADF, 0x7AE6, 0x2A4E,
-	/* Array index: 0x040B */ 0x7AEB, 0x7AEF, 0x2A56,
-	/* Array index: 0x040E */ 0x7AF6, 0x7B13, 0x2A5B,
-	/* Array index: 0x0411 */ 0x7B18, 0x7B35, 0x2A79,
-	/* Array index: 0x0414 */ 0x7B44, 0x7B58, 0x2A97,
-	/* Array index: 0x0417 */ 0x7B60, 0x7B69, 0x2AAC,
-	/* Array index: 0x041A */ 0x7B6D, 0x7B78, 0x2AB6,
-	/* Array index: 0x041D */ 0x7B84, 0x7BA1, 0x2AC2,
-	/* Array index: 0x0420 */ 0x7BB4, 0x7BB9, 0x2AE0,
-	/* Array index: 0x0423 */ 0x7BC6, 0x7BCE, 0x2AE6,
-	/* Array index: 0x0426 */ 0x7BD4, 0x7BEB, 0x2AEF,
-	/* Array index: 0x0429 */ 0x7BF0, 0x7C11, 0x2B07,
-	/* Array index: 0x042C */ 0x7C1C, 0x7C2D, 0x2B29,
-	/* Array index: 0x042F */ 0x7C37, 0x7C40, 0x2B3B,
-	/* Array index: 0x0432 */ 0x7C45, 0x7C4D, 0x2B45,
-	/* Array index: 0x0435 */ 0x7C57, 0x7C7A, 0x2B4E,
-	/* Array index: 0x0438 */ 0x7C7D, 0x7C8D, 0x2B72,
-	/* Array index: 0x043B */ 0x7C91, 0x7C98, 0x2B83,
-	/* Array index: 0x043E */ 0x7C9E, 0x7CA5, 0x2B8B,
-	/* Array index: 0x0441 */ 0x7CAF, 0x7CBF, 0x2B93,
-	/* Array index: 0x0444 */ 0x7CC8, 0x7CE2, 0x2BA4,
-	/* Array index: 0x0447 */ 0x7CEC, 0x7CF8, 0x2BBF,
-	/* Array index: 0x044A */ 0x7CFD, 0x7D22, 0x2BCC,
-	/* Array index: 0x044D */ 0x7D28, 0x7D47, 0x2BF2,
-	/* Array index: 0x0450 */ 0x7D4E, 0x7D73, 0x2C12,
-	/* Array index: 0x0453 */ 0x7D79, 0x7D96, 0x2C38,
-	/* Array index: 0x0456 */ 0x7D9C, 0x7DCE, 0x2C56,
-	/* Array index: 0x0459 */ 0x7DD7, 0x7DFB, 0x2C89,
-	/* Array index: 0x045C */ 0x7E08, 0x7E49, 0x2CAE,
-	/* Array index: 0x045F */ 0x7E50, 0x7E63, 0x2CF0,
-	/* Array index: 0x0462 */ 0x7E68, 0x7E9C, 0x2D04,
-	/* Array index: 0x0465 */ 0x7F36, 0x7F45, 0x2D39,
-	/* Array index: 0x0468 */ 0x7F48, 0x7F55, 0x2D49,
-	/* Array index: 0x046B */ 0x7F5B, 0x7F7F, 0x2D57,
-	/* Array index: 0x046E */ 0x7F83, 0x7FD7, 0x2D7C,
-	/* Array index: 0x0471 */ 0x7FDB, 0x8021, 0x2DD1,
-	/* Array index: 0x0474 */ 0x8026, 0x802C, 0x2E18,
-	/* Array index: 0x0477 */ 0x8033, 0x803F, 0x2E1F,
-	/* Array index: 0x047A */ 0x8046, 0x804A, 0x2E2C,
-	/* Array index: 0x047D */ 0x804F, 0x8052, 0x2E31,
-	/* Array index: 0x0480 */ 0x805A, 0x805E, 0x2E35,
-	/* Array index: 0x0483 */ 0x806F, 0x807F, 0x2E3A,
-	/* Array index: 0x0486 */ 0x8082, 0x80B5, 0x2E4B,
-	/* Array index: 0x0489 */ 0x80C2, 0x80E6, 0x2E7F,
-	/* Array index: 0x048C */ 0x80ED, 0x810A, 0x2EA4,
-	/* Array index: 0x048F */ 0x8115, 0x8130, 0x2EC2,
-	/* Array index: 0x0492 */ 0x8143, 0x8155, 0x2EDE,
-	/* Array index: 0x0495 */ 0x815E, 0x817A, 0x2EF1,
-	/* Array index: 0x0498 */ 0x817F, 0x818F, 0x2F0E,
-	/* Array index: 0x049B */ 0x8195, 0x81D2, 0x2F1F,
-	/* Array index: 0x049E */ 0x81D5, 0x8216, 0x2F5D,
-	/* Array index: 0x04A1 */ 0x821B, 0x8222, 0x2F9F,
-	/* Array index: 0x04A4 */ 0x8228, 0x822C, 0x2FA7,
-	/* Array index: 0x04A7 */ 0x8232, 0x8285, 0x2FAC,
-	/* Array index: 0x04AA */ 0x828A, 0x82C3, 0x3000,
-	/* Array index: 0x04AD */ 0x82D1, 0x82FB, 0x303A,
-	/* Array index: 0x04B0 */ 0x82FE, 0x830D, 0x3065,
-	/* Array index: 0x04B3 */ 0x8322, 0x8356, 0x3075,
-	/* Array index: 0x04B6 */ 0x8373, 0x83B0, 0x30AA,
-	/* Array index: 0x04B9 */ 0x83BD, 0x8413, 0x30E8,
-	/* Array index: 0x04BC */ 0x8429, 0x847E, 0x313F,
-	/* Array index: 0x04BF */ 0x848D, 0x8491, 0x3195,
-	/* Array index: 0x04C2 */ 0x8497, 0x84D7, 0x319A,
-	/* Array index: 0x04C5 */ 0x84E7, 0x8531, 0x31DB,
-	/* Array index: 0x04C8 */ 0x853D, 0x854E, 0x3226,
-	/* Array index: 0x04CB */ 0x8551, 0x856E, 0x3238,
-	/* Array index: 0x04CE */ 0x8575, 0x85AA, 0x3256,
-	/* Array index: 0x04D1 */ 0x85AF, 0x85D2, 0x328C,
-	/* Array index: 0x04D4 */ 0x85D5, 0x860C, 0x32B0,
-	/* Array index: 0x04D7 */ 0x8617, 0x8640, 0x32E8,
-	/* Array index: 0x04DA */ 0x8646, 0x8656, 0x3312,
-	/* Array index: 0x04DD */ 0x865B, 0x8674, 0x3323,
-	/* Array index: 0x04E0 */ 0x8677, 0x867C, 0x333D,
-	/* Array index: 0x04E3 */ 0x8685, 0x86AA, 0x3343,
-	/* Array index: 0x04E6 */ 0x86AF, 0x86CC, 0x3369,
-	/* Array index: 0x04E9 */ 0x86D0, 0x86ED, 0x3387,
-	/* Array index: 0x04EC */ 0x86F5, 0x86FB, 0x33A5,
-	/* Array index: 0x04EF */ 0x86FE, 0x8713, 0x33AC,
-	/* Array index: 0x04F2 */ 0x8718, 0x8743, 0x33C2,
-	/* Array index: 0x04F5 */ 0x874C, 0x877B, 0x33EE,
-	/* Array index: 0x04F8 */ 0x8781, 0x8789, 0x341E,
-	/* Array index: 0x04FB */ 0x878D, 0x87A4, 0x3427,
-	/* Array index: 0x04FE */ 0x87AA, 0x87CC, 0x343F,
-	/* Array index: 0x0501 */ 0x87D1, 0x8844, 0x3462,
-	/* Array index: 0x0504 */ 0x8848, 0x884E, 0x34D6,
-	/* Array index: 0x0507 */ 0x8852, 0x8883, 0x34DD,
-	/* Array index: 0x050A */ 0x8888, 0x88AC, 0x350F,
-	/* Array index: 0x050D */ 0x88B6, 0x88C2, 0x3534,
-	/* Array index: 0x0510 */ 0x88C9, 0x88E1, 0x3541,
-	/* Array index: 0x0513 */ 0x88EB, 0x891A, 0x355A,
-	/* Array index: 0x0516 */ 0x891E, 0x8946, 0x358A,
-	/* Array index: 0x0519 */ 0x894B, 0x8988, 0x35B3,
-	/* Array index: 0x051C */ 0x8993, 0x89A6, 0x35F1,
-	/* Array index: 0x051F */ 0x89AA, 0x89AF, 0x3605,
-	/* Array index: 0x0522 */ 0x89B6, 0x89C0, 0x360B,
-	/* Array index: 0x0525 */ 0x89D2, 0x8A18, 0x3616,
-	/* Array index: 0x0528 */ 0x8A1B, 0x8A27, 0x365D,
-	/* Array index: 0x052B */ 0x8A39, 0x8A5B, 0x366A,
-	/* Array index: 0x052E */ 0x8A5E, 0x8A63, 0x368D,
-	/* Array index: 0x0531 */ 0x8A68, 0x8A7C, 0x3693,
-	/* Array index: 0x0534 */ 0x8A7F, 0x8A9A, 0x36A8,
-	/* Array index: 0x0537 */ 0x8AA0, 0x8AAB, 0x36C4,
-	/* Array index: 0x053A */ 0x8AB6, 0x8AE8, 0x36D0,
-	/* Array index: 0x053D */ 0x8AEB, 0x8B60, 0x3703,
-	/* Array index: 0x0540 */ 0x8B63, 0x8B70, 0x3779,
-	/* Array index: 0x0543 */ 0x8B77, 0x8B9F, 0x3787,
-	/* Array index: 0x0546 */ 0x8C39, 0x8C57, 0x37B0,
-	/* Array index: 0x0549 */ 0x8C61, 0x8CCC, 0x37CF,
-	/* Array index: 0x054C */ 0x8CCF, 0x8D0A, 0x383B,
-	/* Array index: 0x054F */ 0x8D0F, 0x8D1B, 0x3877,
-	/* Array index: 0x0552 */ 0x8D64, 0x8D85, 0x3884,
-	/* Array index: 0x0555 */ 0x8D89, 0x8D96, 0x38A6,
-	/* Array index: 0x0558 */ 0x8D9B, 0x8DF4, 0x38B4,
-	/* Array index: 0x055B */ 0x8DFA, 0x8E0A, 0x390E,
-	/* Array index: 0x055E */ 0x8E0D, 0x8E2B, 0x391F,
-	/* Array index: 0x0561 */ 0x8E30, 0x8E7C, 0x393E,
-	/* Array index: 0x0564 */ 0x8E81, 0x8EAC, 0x398B,
-	/* Array index: 0x0567 */ 0x8EC9, 0x8F64, 0x39B7,
-	/* Array index: 0x056A */ 0x8FAD, 0x8FB4, 0x3A53,
-	/* Array index: 0x056D */ 0x8FC2, 0x8FC6, 0x3A5B,
-	/* Array index: 0x0570 */ 0x8FCD, 0x8FD7, 0x3A60,
-	/* Array index: 0x0573 */ 0x8FE0, 0x9006, 0x3A6B,
-	/* Array index: 0x0576 */ 0x900B, 0x9024, 0x3A92,
-	/* Array index: 0x0579 */ 0x902D, 0x9044, 0x3AAC,
-	/* Array index: 0x057C */ 0x9047, 0x90A7, 0x3AC4,
-	/* Array index: 0x057F */ 0x90AF, 0x90B8, 0x3B25,
-	/* Array index: 0x0582 */ 0x90BD, 0x90CB, 0x3B2F,
-	/* Array index: 0x0585 */ 0x90D4, 0x915A, 0x3B3E,
-	/* Array index: 0x0588 */ 0x915F, 0x917A, 0x3BC5,
-	/* Array index: 0x058B */ 0x9180, 0x9193, 0x3BE1,
-	/* Array index: 0x058E */ 0x9199, 0x91DD, 0x3BF5,
-	/* Array index: 0x0591 */ 0x91E2, 0x91EE, 0x3C3A,
-	/* Array index: 0x0594 */ 0x91F1, 0x91F9, 0x3C47,
-	/* Array index: 0x0597 */ 0x91FD, 0x921E, 0x3C50,
-	/* Array index: 0x059A */ 0x9223, 0x9227, 0x3C72,
-	/* Array index: 0x059D */ 0x922D, 0x9240, 0x3C77,
-	/* Array index: 0x05A0 */ 0x9245, 0x925B, 0x3C8B,
-	/* Array index: 0x05A3 */ 0x9260, 0x9267, 0x3CA2,
-	/* Array index: 0x05A6 */ 0x926C, 0x9272, 0x3CAA,
-	/* Array index: 0x05A9 */ 0x9276, 0x928E, 0x3CB1,
-	/* Array index: 0x05AC */ 0x9291, 0x92AC, 0x3CCA,
-	/* Array index: 0x05AF */ 0x92B2, 0x92B7, 0x3CE6,
-	/* Array index: 0x05B2 */ 0x92C0, 0x92E1, 0x3CEC,
-	/* Array index: 0x05B5 */ 0x92E4, 0x92F1, 0x3D0E,
-	/* Array index: 0x05B8 */ 0x92F7, 0x9339, 0x3D1C,
-	/* Array index: 0x05BB */ 0x9346, 0x9367, 0x3D5F,
-	/* Array index: 0x05BE */ 0x9375, 0x9383, 0x3D81,
-	/* Array index: 0x05C1 */ 0x9388, 0x93B7, 0x3D90,
-	/* Array index: 0x05C4 */ 0x93C0, 0x93E8, 0x3DC0,
-	/* Array index: 0x05C7 */ 0x93F5, 0x9400, 0x3DE9,
-	/* Array index: 0x05CA */ 0x9406, 0x9419, 0x3DF5,
-	/* Array index: 0x05CD */ 0x9428, 0x9452, 0x3E09,
-	/* Array index: 0x05D0 */ 0x9460, 0x9483, 0x3E34,
-	/* Array index: 0x05D3 */ 0x957A, 0x957D, 0x3E58,
-	/* Array index: 0x05D6 */ 0x9588, 0x9594, 0x3E5C,
-	/* Array index: 0x05D9 */ 0x959B, 0x95C0, 0x3E69,
-	/* Array index: 0x05DC */ 0x95C3, 0x95E5, 0x3E8F,
-	/* Array index: 0x05DF */ 0x961E, 0x9624, 0x3EB2,
-	/* Array index: 0x05E2 */ 0x962A, 0x9632, 0x3EB9,
-	/* Array index: 0x05E5 */ 0x9639, 0x9644, 0x3EC2,
-	/* Array index: 0x05E8 */ 0x964A, 0x9654, 0x3ECE,
-	/* Array index: 0x05EB */ 0x965B, 0x9664, 0x3ED9,
-	/* Array index: 0x05EE */ 0x966A, 0x96B4, 0x3EE3,
-	/* Array index: 0x05F1 */ 0x96B8, 0x96EA, 0x3F2E,
-	/* Array index: 0x05F4 */ 0x96EF, 0x9713, 0x3F61,
-	/* Array index: 0x05F7 */ 0x9718, 0x9732, 0x3F86,
-	/* Array index: 0x05FA */ 0x9738, 0x974B, 0x3FA1,
-	/* Array index: 0x05FD */ 0x9758, 0x9762, 0x3FB5,
-	/* Array index: 0x0600 */ 0x9766, 0x9785, 0x3FC0,
-	/* Array index: 0x0603 */ 0x978A, 0x978F, 0x3FE0,
-	/* Array index: 0x0606 */ 0x9797, 0x97AE, 0x3FE6,
-	/* Array index: 0x0609 */ 0x97C1, 0x97E5, 0x3FFE,
-	/* Array index: 0x060C */ 0x97F6, 0x9821, 0x4023,
-	/* Array index: 0x060F */ 0x9824, 0x9832, 0x404F,
-	/* Array index: 0x0612 */ 0x9835, 0x983B, 0x405E,
-	/* Array index: 0x0615 */ 0x9841, 0x9874, 0x4065,
-	/* Array index: 0x0618 */ 0x98A8, 0x98B3, 0x4099,
-	/* Array index: 0x061B */ 0x98B8, 0x98C6, 0x40A5,
-	/* Array index: 0x061E */ 0x98E7, 0x98EF, 0x40B4,
-	/* Array index: 0x0621 */ 0x98F9, 0x9935, 0x40BD,
-	/* Array index: 0x0624 */ 0x993A, 0x9961, 0x40FA,
-	/* Array index: 0x0627 */ 0x9996, 0x999E, 0x4122,
-	/* Array index: 0x062A */ 0x99A3, 0x99C3, 0x412B,
-	/* Array index: 0x062D */ 0x99C9, 0x99F1, 0x414C,
-	/* Array index: 0x0630 */ 0x99F4, 0x9A6B, 0x4175,
-	/* Array index: 0x0633 */ 0x9AAD, 0x9AC2, 0x41ED,
-	/* Array index: 0x0636 */ 0x9ACD, 0x9AD8, 0x4203,
-	/* Array index: 0x0639 */ 0x9AEB, 0x9AFE, 0x420F,
-	/* Array index: 0x063C */ 0x9B01, 0x9B61, 0x4223,
-	/* Array index: 0x063F */ 0x9B64, 0x9B68, 0x4284,
-	/* Array index: 0x0642 */ 0x9B6F, 0x9B88, 0x4289,
-	/* Array index: 0x0645 */ 0x9B90, 0x9B95, 0x42A3,
-	/* Array index: 0x0648 */ 0x9B9E, 0x9BAF, 0x42A9,
-	/* Array index: 0x064B */ 0x9BB5, 0x9BB9, 0x42BB,
-	/* Array index: 0x064E */ 0x9BBD, 0x9BCA, 0x42C0,
-	/* Array index: 0x0651 */ 0x9BD3, 0x9BEC, 0x42CE,
-	/* Array index: 0x0654 */ 0x9C05, 0x9C14, 0x42E8,
-	/* Array index: 0x0657 */ 0x9C21, 0x9C41, 0x42F8,
-	/* Array index: 0x065A */ 0x9C46, 0x9C59, 0x4319,
-	/* Array index: 0x065D */ 0x9C5E, 0x9C68, 0x432D,
-	/* Array index: 0x0660 */ 0x9C71, 0x9C7A, 0x4338,
-	/* Array index: 0x0663 */ 0x9CE5, 0x9CEA, 0x4342,
-	/* Array index: 0x0666 */ 0x9CF1, 0x9D09, 0x4348,
-	/* Array index: 0x0669 */ 0x9D14, 0x9D38, 0x4361,
-	/* Array index: 0x066C */ 0x9D3B, 0x9D45, 0x4386,
-	/* Array index: 0x066F */ 0x9D4A, 0x9D4C, 0x4391,
-	/* Array index: 0x0672 */ 0x9D4F, 0x9D61, 0x4394,
-	/* Array index: 0x0675 */ 0x9D67, 0x9D8C, 0x43A7,
-	/* Array index: 0x0678 */ 0x9D94, 0x9E1E, 0x43CD,
-	/* Array index: 0x067B */ 0x9E79, 0x9E94, 0x4458,
-	/* Array index: 0x067E */ 0x9E97, 0x9EA9, 0x4474,
-	/* Array index: 0x0681 */ 0x9EB4, 0x9EB7, 0x4487,
-	/* Array index: 0x0684 */ 0x9ECC, 0x9EE8, 0x448B,
-	/* Array index: 0x0687 */ 0x9EEB, 0x9F01, 0x44A8,
-	/* Array index: 0x068A */ 0x9F06, 0x9F38, 0x44BF,
-	/* Array index: 0x068D */ 0x9F3D, 0x9F4F, 0x44F2,
-	/* Array index: 0x0690 */ 0x9F52, 0x9F7B, 0x4505,
-	/* Array index: 0x0693 */ 0x9F90, 0x9F95, 0x452F,
-	/* Array index: 0x0696 */ 0xFE30, 0xFE44, 0x4535,
-	/* Array index: 0x0699 */ 0xFE49, 0xFE6B, 0x454A,
-	/* Array index: 0x069C */ 0xFF01, 0xFF3C, 0x456D,
-	/* Array index: 0x069F */ 0xFF3F, 0xFF5D, 0x45A9,
-	/* Ranges content */
-	/* Range 0x02C7 - 0x02CB, array index: 0x06A2 */
-	0xA3BE,INVALC,0xA3BC,0xA3BD,0xA3BF,
-	/* Range 0x0391 - 0x03A9, array index: 0x06A7 */
-	0xA344,0xA345,0xA346,0xA347,0xA348,0xA349,0xA34A,0xA34B,
-	0xA34C,0xA34D,0xA34E,0xA34F,0xA350,0xA351,0xA352,0xA353,
-	0xA354,INVALC,0xA355,0xA356,0xA357,0xA358,0xA359,0xA35A,
-	0xA35B,
-	/* Range 0x03B1 - 0x03C9, array index: 0x06C0 */
-	0xA35C,0xA35D,0xA35E,0xA35F,0xA360,0xA361,0xA362,0xA363,
-	0xA364,0xA365,0xA366,0xA367,0xA368,0xA369,0xA36A,0xA36B,
-	0xA36C,INVALC,0xA36D,0xA36E,0xA36F,0xA370,0xA371,0xA372,
-	0xA373,
-	/* Range 0x0414 - 0x041C, array index: 0x06D9 */
-	0xC7B1,0xC7B2,0xC7B4,0xC7B5,0xC7B6,0xC7B7,0xC7B8,0xC7B9,
-	0xC7BA,
-	/* Range 0x0423 - 0x0451, array index: 0x06E2 */
-	0xC7BB,0xC7BC,0xC7BD,0xC7BE,0xC7BF,0xC7C0,0xC7C1,0xC7C2,
-	0xC7C3,0xC7C4,0xC7C5,0xC7C6,0xC7C7,0xC7C8,0xC7C9,0xC7CA,
-	0xC7CB,0xC7CC,0xC7CD,0xC7CF,0xC7D0,0xC7D1,0xC7D2,0xC7D3,
-	0xC7D4,0xC7D5,0xC7D6,0xC7D7,0xC7D8,0xC7D9,0xC7DA,0xC7DB,
-	0xC7DC,0xC7DD,0xC7DE,0xC7DF,0xC7E0,0xC7E1,0xC7E2,0xC7E3,
-	0xC7E4,0xC7E5,0xC7E6,0xC7E7,0xC7E8,INVALC,0xC7CE,
-	/* Range 0x2160 - 0x2169, array index: 0x0711 */
-	0xA2B9,0xA2BA,0xA2BB,0xA2BC,0xA2BD,0xA2BE,0xA2BF,0xA2C0,
-	0xA2C1,0xA2C2,
-	/* Range 0x2190 - 0x2199, array index: 0x071B */
-	0xA1F6,0xA1F4,0xA1F7,0xA1F5,INVALC,INVALC,0xA1F8,0xA1F9,
-	0xA1FB,0xA1FA,
-	/* Range 0x221E - 0x2220, array index: 0x0725 */
-	0xA1DB,0xA1E8,0xA1E7,
-	/* Range 0x2229 - 0x222B, array index: 0x0728 */
-	0xA1E4,0xA1E5,0xA1EC,
-	/* Range 0x2460 - 0x2469, array index: 0x072B */
-	0xC7E9,0xC7EA,0xC7EB,0xC7EC,0xC7ED,0xC7EE,0xC7EF,0xC7F0,
-	0xC7F1,0xC7F2,
-	/* Range 0x2474 - 0x247D, array index: 0x0735 */
-	0xC7F3,0xC7F4,0xC7F5,0xC7F6,0xC7F7,0xC7F8,0xC7F9,0xC7FA,
-	0xC7FB,0xC7FC,
-	/* Range 0x256D - 0x2573, array index: 0x073F */
-	0xA27E,0xA2A1,0xA2A3,0xA2A2,0xA2AC,0xA2AD,0xA2AE,
-	/* Range 0x2581 - 0x258F, array index: 0x0746 */
-	0xA262,0xA263,0xA264,0xA265,0xA266,0xA267,0xA268,0xA269,
-	0xA270,0xA26F,0xA26E,0xA26D,0xA26C,0xA26B,0xA26A,
-	/* Range 0x25E2 - 0x25E5, array index: 0x0755 */
-	0xA2A8,0xA2A9,0xA2AB,0xA2AA,
-	/* Range 0x2640 - 0x2642, array index: 0x0759 */
-	0xA1F0,0xA1F2,0xA1F1,
-	/* Range 0x3000 - 0x3015, array index: 0x075C */
-	0xA140,0xA142,0xA143,0xA1B2,INVALC,0xC6A4,INVALC,INVALC,
-	0xA171,0xA172,0xA16D,0xA16E,0xA175,0xA176,0xA179,0xA17A,
-	0xA169,0xA16A,0xA245,INVALC,0xA165,0xA166,
-	/* Range 0x301D - 0x3029, array index: 0x0772 */
-	0xA1A9,0xA1AA,INVALC,INVALC,0xA2C3,0xA2C4,0xA2C5,0xA2C6,
-	0xA2C7,0xA2C8,0xA2C9,0xA2CA,0xA2CB,
-	/* Range 0x3041 - 0x3093, array index: 0x077F */
-	0xC6A5,0xC6A6,0xC6A7,0xC6A8,0xC6A9,0xC6AA,0xC6AB,0xC6AC,
-	0xC6AD,0xC6AE,0xC6AF,0xC6B0,0xC6B1,0xC6B2,0xC6B3,0xC6B4,
-	0xC6B5,0xC6B6,0xC6B7,0xC6B8,0xC6B9,0xC6BA,0xC6BB,0xC6BC,
-	0xC6BD,0xC6BE,0xC6BF,0xC6C0,0xC6C1,0xC6C2,0xC6C3,0xC6C4,
-	0xC6C5,0xC6C6,0xC6C7,0xC6C8,0xC6C9,0xC6CA,0xC6CB,0xC6CC,
-	0xC6CD,0xC6CE,0xC6CF,0xC6D0,0xC6D1,0xC6D2,0xC6D3,0xC6D4,
-	0xC6D5,0xC6D6,0xC6D7,0xC6D8,0xC6D9,0xC6DA,0xC6DB,0xC6DC,
-	0xC6DD,0xC6DE,0xC6DF,0xC6E0,0xC6E1,0xC6E2,0xC6E3,0xC6E4,
-	0xC6E5,0xC6E6,0xC6E7,0xC6E8,0xC6E9,0xC6EA,0xC6EB,0xC6EC,
-	0xC6ED,0xC6EE,0xC6EF,0xC6F0,0xC6F1,0xC6F2,0xC6F3,0xC6F4,
-	0xC6F5,0xC6F6,0xC6F7,
-	/* Range 0x309D - 0x30F6, array index: 0x07D2 */
-	0xC6A2,0xC6A3,INVALC,INVALC,0xC6F8,0xC6F9,0xC6FA,0xC6FB,
-	0xC6FC,0xC6FD,0xC6FE,0xC740,0xC741,0xC742,0xC743,0xC744,
-	0xC745,0xC746,0xC747,0xC748,0xC749,0xC74A,0xC74B,0xC74C,
-	0xC74D,0xC74E,0xC74F,0xC750,0xC751,0xC752,0xC753,0xC754,
-	0xC755,0xC756,0xC757,0xC758,0xC759,0xC75A,0xC75B,0xC75C,
-	0xC75D,0xC75E,0xC75F,0xC760,0xC761,0xC762,0xC763,0xC764,
-	0xC765,0xC766,0xC767,0xC768,0xC769,0xC76A,0xC76B,0xC76C,
-	0xC76D,0xC76E,0xC76F,0xC770,0xC771,0xC772,0xC773,0xC774,
-	0xC775,0xC776,0xC777,0xC778,0xC779,0xC77A,0xC77B,0xC77C,
-	0xC77D,0xC77E,0xC7A1,0xC7A2,0xC7A3,0xC7A4,0xC7A5,0xC7A6,
-	0xC7A7,0xC7A8,0xC7A9,0xC7AA,0xC7AB,0xC7AC,0xC7AD,0xC7AE,
-	0xC7AF,0xC7B0,
-	/* Range 0x3105 - 0x3129, array index: 0x082C */
-	0xA374,0xA375,0xA376,0xA377,0xA378,0xA379,0xA37A,0xA37B,
-	0xA37C,0xA37D,0xA37E,0xA3A1,0xA3A2,0xA3A3,0xA3A4,0xA3A5,
-	0xA3A6,0xA3A7,0xA3A8,0xA3A9,0xA3AA,0xA3AB,0xA3AC,0xA3AD,
-	0xA3AE,0xA3AF,0xA3B0,0xA3B1,0xA3B2,0xA3B3,0xA3B4,0xA3B5,
-	0xA3B6,0xA3B7,0xA3B8,0xA3B9,0xA3BA,
-	/* Range 0x339C - 0x339E, array index: 0x0851 */
-	0xA250,0xA251,0xA252,
-	/* Range 0x4E07 - 0x4E19, array index: 0x0854 */
-	0xC945,0xA456,0xA454,0xA457,0xA455,0xC946,0xA4A3,0xC94F,
-	0xC94D,0xA4A2,0xA4A1,INVALC,INVALC,0xA542,0xA541,0xA540,
-	INVALC,0xA543,0xA4FE,
-	/* Range 0x4E2D - 0x4E33, array index: 0x0867 */
-	0xA4A4,0xC950,INVALC,0xA4A5,0xC963,0xA6EA,0xCBB1,
-	/* Range 0x4E38 - 0x4E3C, array index: 0x086E */
-	0xA459,0xA4A6,INVALC,0xA544,0xC964,
-	/* Range 0x4E4B - 0x4E53, array index: 0x0873 */
-	0xA4A7,INVALC,0xA545,0xA547,0xA546,INVALC,INVALC,0xA5E2,
-	0xA5E3,
-	/* Range 0x4E58 - 0x4E5F, array index: 0x087C */
-	0xADBC,0xA441,INVALC,INVALC,0xC941,0xA445,0xA45E,0xA45D,
-	/* Range 0x4E7E - 0x4E95, array index: 0x0884 */
-	0xB0AE,0xD44B,INVALC,INVALC,0xB6C3,0xDCB1,0xDCB2,INVALC,
-	0xA446,INVALC,0xA4A9,INVALC,INVALC,0xA8C6,0xA447,0xC948,
-	0xA45F,INVALC,INVALC,0xA4AA,0xA4AC,0xC951,0xA4AD,0xA4AB,
-	/* Range 0x4E9E - 0x4EAE, array index: 0x089C */
-	0xA8C8,0xAB45,INVALC,0xA460,0xA4AE,INVALC,0xA5E6,0xA5E8,
-	0xA5E7,INVALC,0xA6EB,INVALC,INVALC,0xA8C9,0xA8CA,0xAB46,
-	0xAB47,
-	/* Range 0x4EC0 - 0x4ECD, array index: 0x08AD */
-	0xA4B0,0xA4AF,0xC952,0xA4B1,0xA4B7,INVALC,0xA4B2,0xA4B3,
-	0xC954,0xC953,0xA4B5,0xA4B6,INVALC,0xA4B4,
-	/* Range 0x4ED4 - 0x4EE9, array index: 0x08BB */
-	0xA54A,0xA54B,0xA54C,0xA54D,0xA549,0xA550,0xC96A,INVALC,
-	0xC966,0xC969,0xA551,0xA561,INVALC,0xC968,INVALC,0xA54E,
-	0xA54F,0xA548,INVALC,INVALC,0xC965,0xC967,
-	/* Range 0x4EF0 - 0x4EF7, array index: 0x08D1 */
-	0xA5F5,0xC9B0,0xA5F2,0xA5F6,0xC9BA,0xC9AE,0xA5F3,0xC9B2,
-	/* Range 0x4EFD - 0x4F19, array index: 0x08D9 */
-	0xA5F7,INVALC,0xA5E9,0xC9B1,0xA5F8,0xC9B5,INVALC,0xC9B9,
-	0xC9B6,INVALC,INVALC,0xC9B3,0xA5EA,0xA5EC,0xA5F9,INVALC,
-	0xA5EE,0xC9AB,0xA5F1,0xA5EF,0xA5F0,0xC9BB,0xC9B8,0xC9AF,
-	0xA5ED,INVALC,INVALC,0xC9AC,0xA5EB,
-	/* Range 0x4F2C - 0x4F64, array index: 0x08F6 */
-	0xC9AD,0xCA66,INVALC,0xA742,0xA6F4,INVALC,INVALC,0xCA67,
-	0xA6F1,INVALC,0xA744,INVALC,0xA6F9,INVALC,0xA6F8,0xCA5B,
-	0xA6FC,0xA6F7,0xCA60,0xCA68,INVALC,0xCA64,INVALC,0xA6FA,
-	INVALC,INVALC,0xA6FD,0xA6EE,0xA747,0xCA5D,INVALC,INVALC,
-	0xCBBD,0xA6EC,0xA743,0xA6ED,0xA6F5,0xA6F6,0xCA62,0xCA5E,
-	0xA6FB,0xA6F3,0xCA5A,0xA6EF,0xCA65,0xA745,0xA748,0xA6F2,
-	0xA740,0xA746,0xA6F0,0xCA63,0xA741,0xCA69,0xCA5C,0xA6FE,
-	0xCA5F,
-	/* Range 0x4F67 - 0x4F9E, array index: 0x092F */
-	0xCA61,INVALC,0xA8D8,0xCBBF,0xCBCB,0xA8D0,INVALC,0xCBCC,
-	0xA8CB,0xA8D5,INVALC,INVALC,0xA8CE,0xCBB9,0xA8D6,0xCBB8,
-	0xCBBC,0xCBC3,0xCBC1,0xA8DE,0xA8D9,0xCBB3,0xCBB5,0xA8DB,
-	0xA8CF,0xCBB6,0xCBC2,0xCBC9,0xA8D4,0xCBBB,0xCBB4,0xA8D3,
-	0xCBB7,0xA8D7,0xCBBA,INVALC,0xA8D2,INVALC,0xA8CD,INVALC,
-	0xA8DC,0xCBC4,0xA8DD,0xCBC8,INVALC,0xCBC6,0xCBCA,0xA8DA,
-	0xCBBE,0xCBB2,INVALC,0xCBC0,0xA8D1,0xCBC5,0xA8CC,0xCBC7,
-	/* Range 0x4FB2 - 0x4FE1, array index: 0x0967 */
-	0xCDE0,0xCDE8,INVALC,0xAB49,0xAB51,0xAB5D,INVALC,0xCDEE,
-	0xCDEC,0xCDE7,INVALC,INVALC,INVALC,0xAB4B,0xCDED,0xCDE3,
-	0xAB59,0xAB50,0xAB58,0xCDDE,INVALC,0xCDEA,INVALC,0xCDE1,
-	0xAB54,0xCDE2,INVALC,0xCDDD,0xAB5B,0xAB4E,0xAB57,0xAB4D,
-	INVALC,0xCDDF,0xCDE4,INVALC,0xCDEB,0xAB55,0xAB52,0xCDE6,
-	0xAB5A,0xCDE9,0xCDE5,0xAB4F,0xAB5C,0xAB53,0xAB4C,0xAB48,
-	/* Range 0x4FF1 - 0x4FFA, array index: 0x0997 */
-	0xADD1,INVALC,0xADD6,0xD0D0,0xD0CF,0xD0D4,0xD0D5,0xADC4,
-	INVALC,0xADCD,
-	/* Range 0x5005 - 0x5037, array index: 0x09A1 */
-	0xD0C9,0xADC7,0xD0CA,INVALC,0xADDC,INVALC,0xADD3,0xADBE,
-	0xADBF,0xD0DD,0xB0BF,INVALC,0xADCC,0xADCB,0xD0CB,0xADCF,
-	0xD45B,0xADC6,0xD0D6,0xADD5,0xADD4,0xADCA,0xD0CE,0xD0D7,
-	INVALC,0xD0C8,0xADC9,0xD0D8,0xADD2,0xD0CC,0xADC0,INVALC,
-	0xADC3,0xADC2,0xD0D9,0xADD0,0xADC5,0xADD9,0xADDB,0xD0D3,
-	0xADD8,INVALC,0xD0DB,0xD0CD,0xD0DC,INVALC,0xD0D1,INVALC,
-	0xD0DA,INVALC,0xD0D2,
-	/* Range 0x5043 - 0x5077, array index: 0x09D4 */
-	0xB0B3,INVALC,0xD45C,0xD462,0xB0B2,0xD455,0xB0B6,0xD459,
-	0xD452,0xB0B4,0xD456,0xB0B9,0xB0BE,INVALC,0xD467,INVALC,
-	0xD451,INVALC,0xB0BA,INVALC,0xD466,INVALC,INVALC,0xB0B5,
-	0xD458,0xB0B1,0xD453,0xD44F,0xD45D,0xD450,0xD44E,0xD45A,
-	0xD460,0xD461,0xB0B7,INVALC,INVALC,0xD85B,0xD45E,0xD44D,
-	0xD45F,INVALC,0xB0C1,0xD464,0xB0C0,0xD44C,INVALC,0xD454,
-	0xD465,0xB0BC,0xB0BB,0xB0B8,0xB0BD,
-	/* Range 0x508B - 0x509E, array index: 0x0A09 */
-	0xD855,0xD858,0xB3C4,0xD859,INVALC,INVALC,0xB3C7,0xD85D,
-	INVALC,0xD853,0xD852,0xB3C9,INVALC,0xB3CA,0xB3C6,0xB3CB,
-	0xD851,0xD85C,0xD85A,0xD854,
-	/* Range 0x50AC - 0x50DD, array index: 0x0A1D */
-	0xB6CA,0xB6C4,0xDCB7,0xB6CD,0xDCBD,0xDCC0,0xB6C6,0xB6C7,
-	0xDCBA,0xB6C5,0xDCC3,0xB6CB,0xDCC4,INVALC,0xDCBF,0xB6CC,
-	INVALC,0xDCB4,0xB6C9,0xDCB5,INVALC,0xDCBE,0xDCBC,INVALC,
-	0xDCB8,0xB6C8,0xDCB6,0xB6CE,0xDCBB,0xDCC2,0xDCB9,0xDCC1,
-	INVALC,INVALC,0xB9B6,0xB9B3,INVALC,0xB9B4,INVALC,0xE0F9,
-	0xE0F1,0xB9B2,0xB9AF,0xE0F2,INVALC,INVALC,0xB9B1,0xE0F5,
-	INVALC,0xE0F7,
-	/* Range 0x50E3 - 0x514D, array index: 0x0A4F */
-	0xE0FD,0xE0F8,0xB9AE,0xE0F0,0xB9AC,0xE0F3,0xB9B7,0xE0F6,
-	INVALC,0xE0FA,0xB9B0,0xB9AD,0xE0FC,0xE0FB,0xB9B5,INVALC,
-	0xE0F4,INVALC,0xBBF8,0xE4EC,INVALC,0xE4E9,0xBBF9,INVALC,
-	0xBBF7,INVALC,0xE4F0,0xE4ED,0xE4E6,0xBBF6,INVALC,0xBBFA,
-	0xE4E7,0xBBF5,0xBBFD,0xE4EA,0xE4EB,0xBBFB,0xBBFC,0xE4F1,
-	0xE4EE,0xE4EF,INVALC,INVALC,INVALC,0xBEAA,0xE8F8,0xBEA7,
-	0xE8F5,0xBEA9,0xBEAB,INVALC,0xE8F6,0xBEA8,INVALC,0xE8F7,
-	INVALC,0xE8F4,INVALC,INVALC,0xC076,0xECBD,0xC077,0xECBB,
-	INVALC,0xECBC,0xECBA,0xECB9,INVALC,INVALC,0xECBE,0xC075,
-	INVALC,INVALC,0xEFB8,0xEFB9,INVALC,0xE4E8,0xEFB7,0xC078,
-	0xC35F,0xF1EB,0xF1EC,INVALC,0xC4D7,0xC4D8,0xF5C1,0xF5C0,
-	0xC56C,0xC56B,0xF7D0,INVALC,0xA449,0xA461,0xA4B9,INVALC,
-	0xA4B8,0xA553,0xA552,0xA5FC,0xA5FB,0xA5FD,0xA5FA,INVALC,
-	0xA74A,0xA749,0xA74B,
-	/* Range 0x5157 - 0x516E, array index: 0x0ABA */
-	0xAB5E,INVALC,0xA259,0xD0DE,0xA25A,0xB0C2,0xA25C,0xA25B,
-	0xD860,INVALC,0xA25D,0xB9B8,0xA25E,INVALC,0xA44A,INVALC,
-	0xA4BA,0xA5FE,0xA8E2,INVALC,0xA44B,0xA4BD,0xA4BB,0xA4BC,
-	/* Range 0x5175 - 0x5178, array index: 0x0AD2 */
-	0xA74C,0xA8E4,0xA8E3,0xA8E5,
-	/* Range 0x518F - 0x5198, array index: 0x0AD6 */
-	0xCA6A,INVALC,0xAB60,0xAB5F,0xD0E0,0xD0DF,0xB0C3,INVALC,
-	0xA4BE,0xC955,
-	/* Range 0x51BC - 0x51BE, array index: 0x0AE0 */
-	0xCBCE,0xA8E6,0xCBCF,
-	/* Range 0x51C4 - 0x51D0, array index: 0x0AE3 */
-	0xD0E2,0xD0E3,0xADE3,INVALC,0xD0E4,INVALC,0xD0E1,0xADE4,
-	0xADE2,0xADE1,0xD0E5,INVALC,0xD468,
-	/* Range 0x51DC - 0x51E1, array index: 0x0AF0 */
-	0xBBFE,0xBEAE,0xE8F9,INVALC,0xA44C,0xA45A,
-	/* Range 0x51F5 - 0x51FA, array index: 0x0AF6 */
-	0xC942,0xA4BF,INVALC,0xA559,0xA557,0xA558,
-	/* Range 0x5206 - 0x5217, array index: 0x0AFC */
-	0xA4C0,0xA4C1,0xA4C2,0xC9BE,0xA55A,INVALC,0xC96B,INVALC,
-	0xA646,INVALC,0xC9BF,0xA644,0xA645,0xC9BD,INVALC,INVALC,
-	0xA647,0xA643,
-	/* Range 0x521C - 0x521E, array index: 0x0B0E */
-	0xCA6C,0xAAEC,0xCA6D,
-	/* Range 0x5224 - 0x522A, array index: 0x0B11 */
-	0xA750,0xA74F,INVALC,INVALC,0xA753,0xA751,0xA752,
-	/* Range 0x522E - 0x523B, array index: 0x0B18 */
-	0xA8ED,INVALC,0xA8EC,0xCBD4,0xCBD1,0xCBD2,INVALC,0xCBD0,
-	0xA8EE,0xA8EA,0xA8E9,INVALC,0xA8EB,0xA8E8,
-	/* Range 0x5243 - 0x524E, array index: 0x0B26 */
-	0xAB63,0xCDF0,INVALC,0xCBD3,0xAB68,INVALC,0xCDF1,0xAB64,
-	0xAB67,0xAB66,0xAB65,0xAB62,
-	/* Range 0x5252 - 0x5262, array index: 0x0B32 */
-	0xD0E8,INVALC,0xADE7,0xD0EB,0xADE5,INVALC,INVALC,INVALC,
-	0xD0E7,0xADE8,0xADE6,0xADE9,0xD0E9,0xD0EA,INVALC,0xD0E6,
-	0xD0EC,
-	/* Range 0x5269 - 0x526F, array index: 0x0B43 */
-	0xB3D1,0xB0C5,0xD469,0xD46B,0xD46A,0xD46C,0xB0C6,
-	/* Range 0x5274 - 0x528D, array index: 0x0B4A */
-	0xB3CF,0xB3D0,INVALC,0xB6D0,0xDCC7,INVALC,0xDCC6,0xDCC8,
-	0xDCC9,0xB6D1,INVALC,0xB6CF,0xE141,0xE142,0xB9BB,0xB9BA,
-	0xE35A,INVALC,INVALC,0xBC40,0xBC41,0xBC42,0xBC44,0xE4F2,
-	0xE4F3,0xBC43,
-	/* Range 0x5296 - 0x529B, array index: 0x0B64 */
-	0xF1ED,0xF5C3,0xF5C2,0xF7D1,INVALC,0xA44F,
-	/* Range 0x52A9 - 0x52AE, array index: 0x0B6A */
-	0xA755,0xA756,0xA754,0xA757,0xCA6F,0xCA70,
-	/* Range 0x52BE - 0x52C3, array index: 0x0B70 */
-	0xA8F0,INVALC,0xCDF2,0xAB6C,0xCDF3,0xAB6B,
-	/* Range 0x52D2 - 0x52E6, array index: 0x0B76 */
-	0xB0C7,0xD46E,INVALC,0xB0CA,0xD46D,0xB1E5,0xB0C9,0xB0C8,
-	INVALC,0xB3D4,INVALC,0xB3D3,0xB3D2,0xB6D2,INVALC,INVALC,
-	0xB6D5,0xB6D6,0xB6D4,INVALC,0xB6D3,
-	/* Range 0x52EF - 0x52FF, array index: 0x0B8B */
-	0xE4F5,0xBC45,0xE4F4,INVALC,0xBEB1,0xECBF,0xC079,INVALC,
-	0xF1EE,0xC455,INVALC,0xA463,0xA4C3,0xC956,INVALC,0xA4C4,
-	0xA4C5,
-	/* Range 0x5305 - 0x5323, array index: 0x0B9C */
-	0xA55D,0xA55E,INVALC,0xA649,0xCA71,0xCBD6,0xCBD7,INVALC,
-	0xAB6D,0xD0EE,0xB0CC,0xB0CB,0xD863,0xD862,INVALC,INVALC,
-	0xA450,0xA4C6,0xA55F,INVALC,0xB0CD,0xC943,INVALC,0xC96C,
-	0xA560,INVALC,0xC9C2,0xA64B,0xA64A,0xC9C1,0xA758,
-	/* Range 0x532D - 0x5331, array index: 0x0BBB */
-	0xD46F,INVALC,0xB6D7,0xE145,0xB9BC,
-	/* Range 0x533C - 0x5354, array index: 0x0BC0 */
-	0xCBD8,0xCDF4,0xB0D0,0xB0CE,0xB0CF,0xA451,INVALC,0xA464,
-	0xA2CD,0xA4CA,INVALC,0xA4C9,0xA4C8,0xA563,0xA562,INVALC,
-	0xC96D,0xC9C3,INVALC,INVALC,INVALC,0xA8F5,0xA8F2,0xA8F4,
-	0xA8F3,
-	/* Range 0x536C - 0x537C, array index: 0x0BD9 */
-	0xC957,INVALC,0xA567,0xA566,0xA64C,0xA64D,0xCA73,0xA759,
-	INVALC,0xA75A,INVALC,0xA8F7,0xA8F8,0xA8F9,INVALC,0xAB6F,
-	0xCDF5,
-	/* Range 0x5394 - 0x539F, array index: 0x0BEA */
-	0xCBDA,INVALC,0xCDF7,0xCDF6,0xCDF9,0xCDF8,0xAB70,INVALC,
-	0xD470,0xADED,0xD0EF,0xADEC,
-	/* Range 0x53C8 - 0x53CD, array index: 0x0BF6 */
-	0xA453,0xA465,0xA4CE,0xA4CD,INVALC,0xA4CF,
-	/* Range 0x53DF - 0x53F5, array index: 0x0BFC */
-	0xADEE,INVALC,0xE8FB,0xC24F,0xA466,0xA56A,0xA579,0xA574,
-	INVALC,0xA56F,0xA56E,0xA575,0xA573,0xA56C,0xA57A,0xA56D,
-	0xA569,0xA578,0xA577,0xA576,0xA56B,INVALC,0xA572,
-	/* Range 0x5403 - 0x5412, array index: 0x0C13 */
-	0xA659,0xA655,INVALC,0xA65B,0xC9C5,0xA658,0xA64E,0xA651,
-	0xA654,0xA650,0xA657,0xA65A,0xA64F,0xA652,0xA656,0xA65C,
-	/* Range 0x5418 - 0x544A, array index: 0x0C23 */
-	0xCA7E,0xCA7B,INVALC,0xA767,0xCA7C,0xA75B,0xA75D,0xA775,
-	0xA770,INVALC,INVALC,INVALC,0xCAA5,0xCA7D,0xA75F,0xA761,
-	0xCAA4,0xA768,0xCA78,0xA774,0xA776,0xA75C,0xA76D,INVALC,
-	0xCA76,0xA773,INVALC,0xA764,INVALC,0xA76E,0xA76F,0xCA77,
-	0xA76C,0xA76A,INVALC,0xA76B,0xA771,0xCAA1,0xA75E,INVALC,
-	0xA772,0xCAA3,0xA766,0xA763,INVALC,0xCA7A,0xA762,0xCAA6,
-	0xA765,INVALC,0xA769,
-	/* Range 0x5460 - 0x549A, array index: 0x0C56 */
-	0xCBEB,0xCBEA,0xA94F,0xCBED,0xCBEF,0xCBE4,0xCBE7,0xCBEE,
-	0xA950,INVALC,INVALC,0xCBE1,0xCBE5,INVALC,INVALC,0xCBE9,
-	0xCE49,0xA94B,0xCE4D,0xA8FD,0xCBE6,0xA8FE,0xA94C,0xA945,
-	0xA941,INVALC,0xCBE2,0xA944,0xA949,0xA952,0xCBE3,0xCBDC,
-	0xA943,0xCBDD,0xCBDF,INVALC,0xA946,INVALC,0xA948,0xCBDB,
-	0xCBE0,INVALC,INVALC,0xA951,0xA94D,0xCBE8,0xA953,INVALC,
-	0xA94A,0xCBDE,0xA947,INVALC,INVALC,0xA942,0xA940,INVALC,
-	0xCBEC,INVALC,0xA94E,
-	/* Range 0x54A0 - 0x54C9, array index: 0x0C91 */
-	0xCE48,0xCDFB,0xCE4B,INVALC,INVALC,0xCDFD,0xAB78,0xABA8,
-	0xAB74,0xABA7,0xAB7D,0xABA4,0xAB72,0xCDFC,0xCE43,0xABA3,
-	0xCE4F,0xABA5,INVALC,0xAB79,INVALC,INVALC,0xCE45,0xCE42,
-	0xAB77,INVALC,0xCDFA,0xABA6,0xCE4A,0xAB7C,0xCE4C,0xABA9,
-	0xAB73,0xAB7E,0xAB7B,0xCE40,0xABA1,0xCE46,0xCE47,0xAB7A,
-	0xABA2,0xAB76,
-	/* Range 0x54DE - 0x54F3, array index: 0x0CBB */
-	0xCE4E,INVALC,0xD144,0xADFB,0xD0F1,INVALC,0xD0F6,0xADF4,
-	0xAE40,0xD0F4,0xADEF,0xADF9,0xADFE,0xD0FB,INVALC,0xADFA,
-	0xADFD,INVALC,INVALC,0xD0FE,0xADF5,0xD0F5,
-	/* Range 0x54F7 - 0x5514, array index: 0x0CD1 */
-	0xD142,0xD143,INVALC,0xADF7,0xD141,0xADF3,0xAE43,INVALC,
-	0xD0F8,INVALC,0xADF1,INVALC,0xD146,0xD0F9,0xD0FD,0xADF6,
-	0xAE42,0xD0FA,0xADFC,0xD140,0xD147,0xD4A1,INVALC,0xD145,
-	0xAE44,0xADF0,0xD0FC,0xD0F3,INVALC,0xADF8,
-	/* Range 0x552A - 0x5557, array index: 0x0CEF */
-	0xD477,INVALC,0xB0E4,0xD4A7,0xB0E2,0xB0DF,0xD47C,0xB0DB,
-	0xD4A2,0xB0E6,0xD476,0xD47B,0xD47A,0xADF2,0xB0E1,0xD4A5,
-	INVALC,0xD4A8,0xD473,INVALC,0xB3E8,INVALC,0xD4A9,0xB0E7,
-	INVALC,0xB0D9,0xB0D6,0xD47E,0xB0D3,INVALC,0xD4A6,INVALC,
-	0xB0DA,0xD4AA,INVALC,0xD474,0xD4A4,0xB0DD,0xD475,0xD478,
-	0xD47D,INVALC,INVALC,0xB0DE,0xB0DC,0xB0E8,
-	/* Range 0x555E - 0x5566, array index: 0x0D1D */
-	0xB0D7,0xB1D2,INVALC,0xB0D8,0xD479,0xB0E5,0xB0E0,0xD4A3,
-	0xB0D5,
-	/* Range 0x5575 - 0x55B5, array index: 0x0D26 */
-	0xD471,0xD472,0xD86A,INVALC,INVALC,INVALC,0xB3D7,0xB3DA,
-	0xD875,0xB3EE,0xD878,0xB3D8,0xD871,0xB3DE,0xB3E4,0xB5BD,
-	INVALC,INVALC,0xB3E2,0xD86E,0xB3EF,0xB3DB,0xB3E3,0xD876,
-	0xDCD7,0xD87B,0xD86F,INVALC,0xD866,0xD873,0xD86D,0xB3E1,
-	0xD879,INVALC,INVALC,0xB3DD,0xB3F1,0xB3EA,INVALC,0xB3DF,
-	0xB3DC,INVALC,0xB3E7,INVALC,0xD87A,0xD86C,0xD872,0xD874,
-	0xD868,0xD877,0xB3D9,0xD867,INVALC,0xB3E0,0xB3F0,0xB3EC,
-	0xD869,0xB3E6,INVALC,INVALC,0xB3ED,0xB3E9,0xB3E5,INVALC,
-	0xD870,
-	/* Range 0x55BF - 0x55E9, array index: 0x0D67 */
-	0xDCD5,0xDCD1,INVALC,0xDCE0,0xDCCA,0xDCD3,0xB6E5,0xB6E6,
-	0xB6DE,0xDCDC,0xB6E8,0xDCCF,0xDCCE,0xDCCC,0xDCDE,0xB6DC,
-	0xDCD8,0xDCCD,0xB6DF,0xDCD6,0xB6DA,0xDCD2,0xDCD9,0xDCDB,
-	INVALC,INVALC,0xDCDF,0xB6E3,0xDCCB,0xB6DD,0xDCD0,INVALC,
-	0xB6D8,INVALC,0xB6E4,0xDCDA,0xB6E0,0xB6E1,0xB6E7,0xB6DB,
-	0xA25F,0xB6D9,0xDCD4,
-	/* Range 0x55F6 - 0x561F, array index: 0x0D92 */
-	0xB9CD,0xB9C8,INVALC,0xE155,0xE151,INVALC,0xE14B,0xB9C2,
-	0xB9BE,0xE154,0xB9BF,0xE14E,0xE150,INVALC,0xE153,INVALC,
-	0xB9C4,INVALC,0xB9CB,0xB9C5,INVALC,INVALC,0xE149,0xB9C6,
-	0xB9C7,0xE14C,0xB9CC,INVALC,0xE14A,0xE14F,0xB9C3,0xE148,
-	0xB9C9,0xB9C1,INVALC,INVALC,INVALC,0xB9C0,0xE14D,0xE152,
-	INVALC,0xB9CA,
-	/* Range 0x562C - 0x564E, array index: 0x0DBC */
-	0xE544,INVALC,0xBC47,0xBC53,0xBC54,INVALC,0xBC4A,0xE542,
-	0xBC4C,0xE4F9,0xBC52,INVALC,0xE546,0xBC49,0xE548,0xBC48,
-	INVALC,0xE543,0xE545,0xBC4B,0xE541,0xE4FA,0xE4F7,INVALC,
-	INVALC,0xD86B,0xE4FD,INVALC,0xE4F6,0xE4FC,0xE4FB,INVALC,
-	0xE4F8,INVALC,0xBC4F,
-	/* Range 0x5657 - 0x565A, array index: 0x0DDF */
-	0xBC50,0xE4FE,0xBEB2,0xE540,
-	/* Range 0x5660 - 0x5679, array index: 0x0DE3 */
-	0xE8FD,INVALC,0xBEBE,0xE942,0xBEB6,0xBEBA,0xE941,INVALC,
-	0xBEB9,0xBEB5,0xBEB8,0xBEB3,0xBEBD,0xE943,0xE8FE,0xBEBC,
-	0xE8FC,0xBEBB,0xE944,0xE940,0xBC51,INVALC,0xBEBF,0xE946,
-	0xBEB7,0xBEB4,
-	/* Range 0x567E - 0x5687, array index: 0x0DFD */
-	0xECC6,0xECC8,0xC07B,0xECC9,0xECC7,0xECC5,0xECC4,0xC07D,
-	0xECC3,0xC07E,
-	/* Range 0x568C - 0x5690, array index: 0x0E07 */
-	0xECC1,0xECC2,0xC07A,0xC0A1,0xC07C,
-	/* Range 0x5695 - 0x569D, array index: 0x0E0C */
-	0xC250,INVALC,0xEFBC,0xEFBA,0xEFBF,0xEFBD,INVALC,0xEFBB,
-	0xEFBE,
-	/* Range 0x56A5 - 0x56B7, array index: 0x0E15 */
-	0xC360,0xF1F2,0xF1F3,0xC456,INVALC,0xF1F4,0xF1F0,0xF1F5,
-	0xF1F1,0xC251,INVALC,INVALC,INVALC,0xF3FE,0xF441,0xC459,
-	0xF440,0xC458,0xC457,
-	/* Range 0x56BC - 0x56CD, array index: 0x0E28 */
-	0xC45A,0xF5C5,0xF5C6,INVALC,0xC4DA,0xC4D9,0xC4DB,0xF5C4,
-	INVALC,0xF6D8,0xF6D7,INVALC,0xC56D,0xC56F,0xC56E,0xF6D9,
-	0xC5C8,0xF8A6,
-	/* Range 0x56DA - 0x56EB, array index: 0x0E3A */
-	0xA57D,0xA57C,INVALC,0xA65F,0xA65E,0xC9C7,0xA65D,0xC9C6,
-	INVALC,INVALC,0xA779,0xCAA9,INVALC,0xCAA8,INVALC,INVALC,
-	0xA777,0xA77A,
-	/* Range 0x56FF - 0x570D, array index: 0x0E4C */
-	0xABAA,INVALC,0xD148,0xD149,0xAE45,0xAE46,INVALC,INVALC,
-	0xD4AC,0xB0E9,0xB0EB,0xD4AB,0xB0EA,0xD87C,0xB3F2,
-	/* Range 0x5712 - 0x5723, array index: 0x0E5B */
-	0xB6E9,0xB6EA,0xDCE1,INVALC,0xB9CF,INVALC,0xB9CE,INVALC,
-	0xE549,0xE948,0xE947,INVALC,0xF96B,0xA467,0xC959,INVALC,
-	0xC96E,0xC96F,
-	/* Range 0x5728 - 0x5734, array index: 0x0E6D */
-	0xA662,0xA666,0xC9C9,INVALC,0xA664,0xA663,0xC9C8,0xA665,
-	0xA661,INVALC,INVALC,0xA660,0xC9CA,
-	/* Range 0x5747 - 0x5752, array index: 0x0E7A */
-	0xA7A1,INVALC,0xCAAD,0xA77B,0xCAAE,0xCAAC,0xA77E,0xA7A2,
-	0xA7A5,0xA7A4,0xA77C,0xCAAF,
-	/* Range 0x5766 - 0x577D, array index: 0x0E86 */
-	0xA95A,INVALC,0xCC40,0xA958,0xA957,0xCBF5,INVALC,0xCBF4,
-	INVALC,0xCBF2,0xCBF7,0xCBF6,0xCBF3,0xCBFC,0xCBFD,0xCBFA,
-	0xCBF8,0xA956,INVALC,INVALC,INVALC,0xCBFB,0xA95C,0xCC41,
-	/* Range 0x5793 - 0x57A5, array index: 0x0E9E */
-	0xABB2,0xCE58,0xCE5E,INVALC,0xCE55,0xCE59,0xCE5B,0xCE5D,
-	0xCE57,INVALC,0xCE56,0xCE51,0xCE52,0xABAD,INVALC,0xABAF,
-	0xABAE,0xCE53,0xCE5C,
-	/* Range 0x57B5 - 0x57C7, array index: 0x0EB1 */
-	0xCE50,0xD153,INVALC,0xD152,0xD157,0xD14E,INVALC,0xD151,
-	0xD150,INVALC,0xD154,INVALC,0xD158,0xAE47,0xAE4A,INVALC,
-	INVALC,0xD14F,0xD155,
-	/* Range 0x57CB - 0x57D5, array index: 0x0EC4 */
-	0xAE49,0xD14A,INVALC,0xABB0,0xD4BA,0xD156,INVALC,0xD14D,
-	INVALC,0xAE48,0xD14C,
-	/* Range 0x57DF - 0x5810, array index: 0x0ECF */
-	0xB0EC,0xB0F0,0xD4C1,0xD4AF,0xD4BD,0xB0F1,0xD4BF,INVALC,
-	0xD4C5,INVALC,0xD4C9,INVALC,INVALC,0xD4C0,0xD4B4,0xD4BC,
-	INVALC,0xD4CA,0xD4C8,0xD4BE,0xD4B9,0xD4B2,0xD8A6,0xD4B0,
-	0xB0F5,0xD4B7,0xB0F6,0xB0F2,0xD4AD,0xD4C3,0xD4B5,INVALC,
-	INVALC,0xD4B3,0xD4C6,0xB0F3,INVALC,0xD4CC,0xB0ED,0xB0EF,
-	0xD4BB,0xD4B6,0xAE4B,0xB0EE,0xD4B8,0xD4C7,0xD4CB,0xD4C2,
-	INVALC,0xD4C4,
-	/* Range 0x5819 - 0x583F, array index: 0x0F01 */
-	0xD8A1,INVALC,0xD8AA,0xD8A9,0xB3FA,0xD8A2,INVALC,0xB3FB,
-	0xB3F9,INVALC,0xD8A4,0xB3F6,0xD8A8,INVALC,0xD8A3,0xD8A5,
-	0xD87D,0xB3F4,INVALC,0xD8B2,0xD8B1,0xD8AE,0xB3F3,0xB3F7,
-	0xB3F8,0xD14B,0xD8AB,0xB3F5,0xB0F4,0xD8AD,0xD87E,0xD8B0,
-	0xD8AF,INVALC,0xD8B3,INVALC,0xDCEF,INVALC,0xD8AC,
-	/* Range 0x5848 - 0x5865, array index: 0x0F28 */
-	0xD8A7,0xDCE7,0xB6F4,0xB6F7,0xB6F2,0xDCE6,0xDCEA,0xDCE5,
-	INVALC,0xB6EC,0xB6F6,0xDCE2,0xB6F0,0xDCE9,INVALC,0xB6EE,
-	0xB6ED,0xDCEC,0xB6EF,0xDCEE,INVALC,0xDCEB,0xB6EB,INVALC,
-	INVALC,INVALC,0xB6F5,0xDCF0,0xDCE4,0xDCED,
-	/* Range 0x5874 - 0x5894, array index: 0x0F46 */
-	0xE15D,0xB9D0,0xE163,INVALC,INVALC,0xB9D5,0xE15F,0xE166,
-	0xE157,0xB9D7,0xB9D1,0xE15C,0xBC55,0xE15B,0xE164,0xB9D2,
-	INVALC,0xB9D6,0xE15A,0xE160,0xE165,0xE156,0xB9D4,0xE15E,
-	INVALC,INVALC,0xE162,0xE168,0xE158,0xE161,INVALC,0xB9D3,
-	0xE167,
-	/* Range 0x589C - 0x58B3, array index: 0x0F67 */
-	0xBC59,0xE54B,0xBC57,0xBC56,0xE54D,0xE552,INVALC,0xE54E,
-	INVALC,0xE551,0xBC5C,INVALC,0xBEA5,0xBC5B,INVALC,0xE54A,
-	0xE550,INVALC,0xBC5A,0xE54F,INVALC,0xE54C,INVALC,0xBC58,
-	/* Range 0x58BA - 0x58C9, array index: 0x0F7F */
-	0xE94D,INVALC,0xE94F,0xE94A,0xBEC1,0xE94C,INVALC,0xBEC0,
-	0xE94E,INVALC,INVALC,0xBEC3,0xE950,0xBEC2,0xE949,0xE94B,
-	/* Range 0x58CE - 0x58EC, array index: 0x0F8F */
-	0xC0A5,0xECCC,INVALC,0xC0A4,0xECCD,0xC0A3,0xECCB,0xC0A2,
-	0xECCA,INVALC,0xC253,0xC252,0xF1F6,0xF1F8,INVALC,0xF1F7,
-	0xC361,0xC362,INVALC,INVALC,0xC363,0xF442,0xC45B,INVALC,
-	INVALC,0xF7D3,0xF7D2,0xC5F2,INVALC,0xA468,0xA4D0,
-	/* Range 0x58F9 - 0x58FF, array index: 0x0FAE */
-	0xB3FC,0xB3FD,INVALC,0xDCF2,0xB9D8,0xE169,0xE553,
-	/* Range 0x590C - 0x590F, array index: 0x0FB5 */
-	0xCC42,0xCE60,0xD159,0xAE4C,
-	/* Range 0x5912 - 0x591C, array index: 0x0FB9 */
-	0xF1F9,INVALC,0xC4DC,0xA469,0xA57E,0xC970,INVALC,0xA667,
-	0xA668,INVALC,0xA95D,
-	/* Range 0x5927 - 0x5931, array index: 0x0FC4 */
-	0xA46A,INVALC,0xA4D1,0xA4D3,0xA4D2,0xC95B,0xA4D4,0xA5A1,
-	0xC971,INVALC,0xA5A2,
-	/* Range 0x5944 - 0x5962, array index: 0x0FCF */
-	0xA961,0xCC43,INVALC,0xA95F,0xA960,0xA95E,0xD15A,INVALC,
-	INVALC,INVALC,0xABB6,0xABB5,0xABB7,0xABB4,INVALC,0xCE61,
-	0xA962,0xABB3,INVALC,0xAE4D,0xAE4E,INVALC,0xAE4F,INVALC,
-	0xD4CD,INVALC,INVALC,INVALC,0xB3FE,0xD8B4,0xB0F8,
-	/* Range 0x5967 - 0x5985, array index: 0x0FEE */
-	0xB6F8,INVALC,0xB9DD,0xB9DC,0xE16A,INVALC,0xBC5D,0xBEC4,
-	INVALC,0xEFC0,0xF6DA,0xF7D4,0xA46B,0xA5A3,INVALC,0xA5A4,
-	0xC9D1,0xA66C,0xA66F,INVALC,0xC9CF,0xC9CD,0xA66E,0xC9D0,
-	0xC9D2,0xC9CC,0xA671,0xA670,0xA66D,0xA66B,0xC9CE,
-	/* Range 0x598D - 0x5999, array index: 0x100D */
-	0xA7B0,0xCAB6,0xCAB9,0xCAB8,INVALC,0xA7AA,0xA7B2,INVALC,
-	INVALC,0xA7AF,0xCAB5,0xCAB3,0xA7AE,
-	/* Range 0x599D - 0x59A8, array index: 0x101A */
-	0xA7A9,0xA7AC,INVALC,0xCAB4,0xCABB,0xCAB7,0xA7AD,0xA7B1,
-	0xA7B4,0xCAB2,0xCABA,0xA7AB,
-	/* Range 0x59AE - 0x5A03, array index: 0x1026 */
-	0xA967,0xA96F,INVALC,0xCC4F,0xCC48,0xA970,0xCC53,0xCC44,
-	0xCC4B,INVALC,INVALC,0xA966,0xCC45,0xA964,0xCC4C,0xCC50,
-	0xA963,INVALC,0xCC51,0xCC4A,INVALC,0xCC4D,INVALC,0xA972,
-	0xA969,0xCC54,0xCC52,INVALC,0xA96E,0xA96C,0xCC49,0xA96B,
-	0xCC47,0xCC46,0xA96A,0xA968,0xA971,0xA96D,0xA965,INVALC,
-	0xCC4E,INVALC,0xABB9,INVALC,0xABC0,0xCE6F,0xABB8,0xCE67,
-	0xCE63,INVALC,0xCE73,0xCE62,INVALC,0xABBB,0xCE6C,0xABBE,
-	0xABC1,INVALC,0xABBC,0xCE70,0xABBF,INVALC,0xAE56,0xCE76,
-	0xCE64,INVALC,INVALC,0xCE66,0xCE6D,0xCE71,0xCE75,0xCE72,
-	0xCE6B,0xCE6E,INVALC,INVALC,0xCE68,0xABC3,0xCE6A,0xCE69,
-	0xCE74,0xABBA,0xCE65,0xABC2,INVALC,0xABBD,
-	/* Range 0x5A13 - 0x5A20, array index: 0x107C */
-	0xAE55,INVALC,0xD15F,0xD15C,0xD161,0xAE51,0xD15B,INVALC,
-	0xAE54,0xAE52,INVALC,0xD163,0xAE53,0xAE57,
-	/* Range 0x5A33 - 0x5A39, array index: 0x108A */
-	0xD164,INVALC,0xD4D4,0xB0F9,0xD8C2,0xD4D3,0xD4E6,
-	/* Range 0x5A3E - 0x5A6D, array index: 0x1091 */
-	0xD4E4,INVALC,0xB0FE,0xB0FA,0xD4ED,0xD4DD,0xD4E0,INVALC,
-	0xB143,0xD4EA,0xD4E2,0xB0FB,0xB144,INVALC,0xD4E7,0xD4E5,
-	INVALC,INVALC,0xD4D6,0xD4EB,0xD4DF,0xD4DA,INVALC,0xD4D0,
-	0xD4EC,0xD4DC,0xD4CF,INVALC,0xB142,0xD4E1,0xD4EE,0xD4DE,
-	0xD4D2,0xD4D7,0xD4CE,INVALC,0xB141,INVALC,0xD4DB,0xD4D8,
-	0xB0FC,0xD4D1,INVALC,0xD4E9,0xB0FD,INVALC,0xD4D9,0xD4D5,
-	/* Range 0x5A77 - 0x5A7F, array index: 0x10C1 */
-	0xB440,0xD8BB,INVALC,0xD8B8,0xD8C9,0xD8BD,0xD8CA,INVALC,
-	0xB442,
-	/* Range 0x5A8A - 0x5A9F, array index: 0x10CA */
-	0xD8C4,0xD8C7,0xD8CB,INVALC,0xD4E3,0xD8CD,0xDD47,INVALC,
-	0xB443,0xD8CE,0xD8B6,0xD8C0,INVALC,0xD8C5,INVALC,INVALC,
-	0xB441,0xB444,0xD8CC,0xD8CF,0xD8BA,0xD8B7,
-	/* Range 0x5AA5 - 0x5AA9, array index: 0x10E0 */
-	0xD8BE,0xD8BC,0xB445,INVALC,0xD8C8,
-	/* Range 0x5AAC - 0x5ACD, array index: 0x10E5 */
-	0xD8BF,INVALC,0xD8C1,0xD8B5,0xDCFA,0xDCF8,0xB742,0xB740,
-	0xDD43,0xDCF9,0xDD44,0xDD40,0xDCF7,0xDD46,0xDCF6,0xDCFD,
-	0xB6FE,0xB6FD,0xB6FC,0xDCFB,0xDD41,0xB6F9,0xB741,INVALC,
-	0xDCF4,INVALC,0xDCFE,0xDCF3,0xDCFC,0xB6FA,0xDD42,0xDCF5,
-	0xB6FB,0xDD45,
-	/* Range 0x5AD5 - 0x5AEE, array index: 0x1107 */
-	0xE16E,0xB9E2,0xB9E1,0xB9E3,0xE17A,0xE170,0xE176,0xE16B,
-	0xE179,0xE178,0xE17C,0xE175,0xB9DE,0xE174,0xB9E4,INVALC,
-	0xE16D,0xB9DF,INVALC,0xE17B,0xB9E0,0xE16F,0xE172,0xE177,
-	0xE171,0xE16C,
-	/* Range 0x5AF3 - 0x5B34, array index: 0x1121 */
-	0xE173,0xE555,0xBC61,0xE558,0xE557,0xE55A,0xE55C,INVALC,
-	0xBC5F,INVALC,0xE556,INVALC,0xE554,INVALC,0xE55D,0xE55B,
-	0xE559,INVALC,0xE55F,INVALC,0xE55E,0xBC63,0xBC5E,INVALC,
-	0xBC60,0xBC62,INVALC,INVALC,0xE560,0xE957,INVALC,INVALC,
-	0xE956,0xE955,INVALC,0xE958,0xE951,INVALC,0xE952,0xE95A,
-	0xE953,INVALC,0xBEC5,0xE95C,INVALC,0xE95B,0xE954,INVALC,
-	0xECD1,0xC0A8,0xECCF,0xECD4,0xECD3,0xE959,INVALC,0xC0A7,
-	INVALC,0xECD2,0xECCE,0xECD6,0xECD5,0xC0A6,INVALC,0xECD0,
-	INVALC,0xBEC6,
-	/* Range 0x5B3C - 0x5B40, array index: 0x1163 */
-	0xEFC1,0xF1FA,0xF1FB,0xF1FC,0xC45C,
-	/* Range 0x5B47 - 0x5B65, array index: 0x1168 */
-	0xF5C8,0xF5C7,INVALC,INVALC,0xF6DB,0xF6DC,0xF7D5,0xF8A7,
-	INVALC,0xA46C,0xA46D,INVALC,0xA46E,0xA4D5,0xA5A5,0xC9D3,
-	0xA672,0xA673,INVALC,0xA7B7,0xA7B8,0xA7B6,0xA7B5,INVALC,
-	0xA973,INVALC,INVALC,0xCC55,0xA975,0xA974,0xCC56,
-	/* Range 0x5B6E - 0x5B9C, array index: 0x1187 */
-	0xD4F0,INVALC,0xB145,0xB447,0xD4EF,0xB446,INVALC,0xB9E5,
-	INVALC,0xE17D,0xBEC7,INVALC,0xC0A9,0xECD7,INVALC,0xC45E,
-	INVALC,0xC570,INVALC,0xC972,INVALC,0xA5A6,0xC973,0xA676,
-	INVALC,0xA674,0xA675,0xA677,INVALC,0xA7BA,0xA7B9,INVALC,
-	0xCABC,0xA7BB,INVALC,INVALC,0xCABD,0xCC57,INVALC,0xCC58,
-	INVALC,0xA976,0xA978,0xA97A,0xA977,0xA97B,0xA979,
-	/* Range 0x5BA2 - 0x5BB9, array index: 0x11B6 */
-	0xABC8,0xABC5,0xABC7,0xABC9,0xABC6,0xD166,0xCE77,INVALC,
-	INVALC,INVALC,0xD168,0xD167,0xAE63,INVALC,0xAE5F,INVALC,
-	INVALC,0xAE60,0xAE62,0xAE64,0xAE61,INVALC,0xAE66,0xAE65,
-	/* Range 0x5BBF - 0x5BD9, array index: 0x11CE */
-	0xB14A,0xD4F2,0xD4F1,0xB149,INVALC,0xB148,0xB147,0xB14B,
-	0xB146,INVALC,INVALC,0xD8D5,0xD8D2,0xB449,0xD8D1,0xD8D6,
-	INVALC,0xB44B,0xD8D4,0xB448,0xB44A,0xD8D3,INVALC,0xDD48,
-	INVALC,0xDD49,0xDD4A,
-	/* Range 0x5BDE - 0x5BFA, array index: 0x11E9 */
-	0xB9E6,0xB9EE,0xE17E,0xB9E8,0xB9EC,0xE1A1,0xB9ED,0xB9E9,
-	0xB9EA,0xB9E7,0xB9EB,0xBC66,0xD8D0,0xBC67,0xBC65,INVALC,
-	0xBC64,0xE95D,0xBEC8,0xECD8,0xECD9,INVALC,INVALC,0xC364,
-	0xC45F,INVALC,0xA46F,INVALC,0xA678,
-	/* Range 0x5C03 - 0x5C16, array index: 0x1206 */
-	0xD169,0xAE67,INVALC,INVALC,0xB14E,0xB14D,0xB14C,0xB44C,
-	0xB44D,0xD8D7,0xB9EF,0xBEC9,0xA470,0xC95C,0xA4D6,0xC974,
-	INVALC,INVALC,0xC9D4,0xA679,
-	/* Range 0x5C37 - 0x5C5D, array index: 0x121A */
-	0xC0AA,0xA472,0xA4A8,0xA4D8,0xC975,0xA5A7,INVALC,0xA7C0,
-	0xA7BF,0xA7BD,0xA7BE,INVALC,INVALC,0xCC59,0xA97E,0xA9A1,
-	0xCC5A,0xA97D,INVALC,INVALC,0xABCE,0xCE78,0xABCD,0xABCB,
-	0xABCC,0xAE6A,0xAE68,INVALC,INVALC,0xD16B,0xAE69,0xD16A,
-	INVALC,0xAE5E,0xD4F3,INVALC,INVALC,0xB150,0xB151,
-	/* Range 0x5C60 - 0x5C74, array index: 0x1241 */
-	0xB14F,INVALC,0xB9F0,0xE1A2,0xBC68,0xBC69,INVALC,0xE561,
-	0xC0AB,0xEFC2,0xEFC3,INVALC,0xC4DD,0xF8A8,0xC94B,0xA4D9,
-	INVALC,0xA473,INVALC,0xC977,0xC976,
-	/* Range 0x5C79 - 0x5C7E, array index: 0x1256 */
-	0xA67A,0xC9D7,0xC9D8,0xC9D6,INVALC,0xC9D9,
-	/* Range 0x5C86 - 0x5C95, array index: 0x125C */
-	0xCAC7,INVALC,0xCAC2,0xCAC4,0xCAC6,0xCAC3,0xA7C4,0xCAC0,
-	INVALC,0xCAC1,0xA7C1,0xA7C2,0xCAC5,0xCAC8,0xA7C3,0xCAC9,
-	/* Range 0x5C9D - 0x5CB8, array index: 0x126C */
-	0xCC68,INVALC,0xCC62,0xCC5D,0xA9A3,0xCC65,0xCC63,0xCC5C,
-	0xCC69,0xCC6C,0xCC67,0xCC60,0xA9A5,0xCC66,0xA9A6,0xCC61,
-	0xCC64,0xCC5B,0xCC5F,0xCC6B,0xA9A7,INVALC,0xA9A8,INVALC,
-	0xCC5E,0xCC6A,0xA9A2,0xA9A4,
-	/* Range 0x5CC6 - 0x5CDF, array index: 0x1288 */
-	0xCEAB,0xCEA4,0xCEAA,0xCEA3,0xCEA5,0xCE7D,0xCE7B,INVALC,
-	0xCEAC,0xCEA9,0xCE79,INVALC,0xABD0,0xCEA7,0xCEA8,INVALC,
-	0xCEA6,0xCE7C,0xCE7A,0xABCF,0xCEA2,0xCE7E,INVALC,INVALC,
-	0xCEA1,0xCEAD,
-	/* Range 0x5CEA - 0x5CF1, array index: 0x12A2 */
-	0xAE6E,INVALC,0xD16C,0xAE6B,0xD16E,INVALC,0xAE70,0xD16F,
-	/* Range 0x5CF4 - 0x5D01, array index: 0x12AA */
-	0xAE73,INVALC,0xAE71,0xD170,0xCEAE,0xD172,INVALC,0xAE6D,
-	INVALC,0xAE6C,INVALC,0xD16D,0xD171,0xAE72,
-	/* Range 0x5D0B - 0x5D29, array index: 0x12B8 */
-	0xD4F5,0xD4F9,0xD4FB,0xB154,0xD4FE,INVALC,0xB158,0xD541,
-	INVALC,0xB15A,INVALC,0xB156,0xB15E,INVALC,0xB15B,0xD4F7,
-	0xB155,INVALC,0xD4F6,0xD4F4,0xD543,0xD4F8,INVALC,0xB157,
-	0xD542,0xB15C,0xD4FD,0xD4FC,0xB15D,0xD4FA,0xB159,
-	/* Range 0x5D2E - 0x5D52, array index: 0x12D7 */
-	0xD544,INVALC,0xD540,0xD8E7,0xD8EE,0xD8E3,0xB451,0xD8DF,
-	0xD8EF,0xD8D9,0xD8EC,0xD8EA,0xD8E4,INVALC,0xD8ED,0xD8E6,
-	INVALC,0xD8DE,0xD8F0,0xD8DC,0xD8E9,0xD8DA,INVALC,0xD8F1,
-	INVALC,0xB452,INVALC,0xD8EB,0xDD4F,0xD8DD,0xB44F,INVALC,
-	0xD8E1,INVALC,0xB450,0xD8E0,0xD8E5,
-	/* Range 0x5D65 - 0x5D6C, array index: 0x12FC */
-	0xDD50,INVALC,0xDD55,0xDD54,0xB743,INVALC,0xD8DB,0xDD52,
-	/* Range 0x5D79 - 0x5D8A, array index: 0x1304 */
-	0xE1B0,0xE1A7,INVALC,0xE1AE,0xE1A5,0xE1AD,0xE1B1,0xE1A4,
-	0xE1A8,0xE1A3,INVALC,0xB9F1,INVALC,0xE1A6,0xB9F2,0xE1AC,
-	0xE1AB,0xE1AA,
-	/* Range 0x5D92 - 0x5DA2, array index: 0x1316 */
-	0xE565,0xE567,0xBC6B,0xE568,INVALC,0xE563,INVALC,0xE562,
-	0xE56C,INVALC,0xE56A,0xBC6A,0xE56D,0xE564,0xE569,0xE56B,
-	0xE566,
-	/* Range 0x5DA7 - 0x5DBD, array index: 0x1327 */
-	0xE961,0xE966,0xE960,0xE965,INVALC,0xE95E,0xE968,0xE964,
-	0xE969,0xE963,0xE95F,0xE967,INVALC,0xE96A,0xE962,INVALC,
-	0xECDA,0xC0AF,INVALC,0xC0AD,INVALC,0xC0AC,0xC0AE,
-	/* Range 0x5DD1 - 0x5DD8, array index: 0x133E */
-	0xF6DE,0xC572,INVALC,0xC571,0xF6DD,0xC5C9,INVALC,0xF7D6,
-	/* Range 0x5DDD - 0x5DE8, array index: 0x1346 */
-	0xA474,0xA67B,0xC9DA,0xCACA,0xA8B5,0xB15F,INVALC,INVALC,
-	0xA475,0xA5AA,0xA5A9,0xA5A8,
-	/* Range 0x5DEE - 0x5DF4, array index: 0x1352 */
-	0xAE74,INVALC,0xDD57,0xA476,0xA477,0xA478,0xA4DA,
-	/* Range 0x5DFD - 0x5E06, array index: 0x1359 */
-	0xB453,0xA479,0xC95D,INVALC,INVALC,0xA5AB,0xA5AC,0xC978,
-	INVALC,0xA67C,
-	/* Range 0x5E14 - 0x5E2D, array index: 0x1363 */
-	0xCC6E,0xA9AC,0xA9AB,0xCC6D,0xA9A9,0xCC6F,0xA9AA,0xA9AD,
-	INVALC,0xABD2,INVALC,0xABD4,0xCEB3,0xCEB0,0xCEB1,0xCEB2,
-	0xCEB4,0xABD3,INVALC,INVALC,0xD174,0xD173,INVALC,0xAE76,
-	INVALC,0xAE75,
-	/* Range 0x5E33 - 0x5E38, array index: 0x137D */
-	0xB162,0xD546,INVALC,0xB161,0xB163,0xB160,
-	/* Range 0x5E3D - 0x5E45, array index: 0x1383 */
-	0xB455,0xD545,INVALC,0xB456,0xD8F3,INVALC,0xB457,0xD8F2,
-	0xB454,
-	/* Range 0x5E4A - 0x5E8F, array index: 0x138C */
-	0xDD5A,0xDD5C,0xB745,0xDD5B,0xDD59,0xDD58,INVALC,INVALC,
-	INVALC,0xE1B4,0xB9F7,0xB9F5,INVALC,0xB9F6,0xE1B2,0xE1B3,
-	INVALC,0xB9F3,0xE571,0xE56F,INVALC,0xBC6D,0xE570,0xBC6E,
-	0xBC6C,0xB9F4,INVALC,INVALC,0xE96D,0xE96B,0xE96C,0xE56E,
-	0xECDC,0xC0B0,0xECDB,0xEFC5,0xEFC6,0xE96E,0xF1FE,INVALC,
-	0xA47A,0xA5AD,0xA67E,0xC9DB,0xA67D,INVALC,0xA9AF,0xB746,
-	INVALC,0xA4DB,0xA5AE,0xABD5,0xB458,INVALC,0xC979,INVALC,
-	0xC97A,INVALC,0xC9DC,INVALC,INVALC,0xA7C8,0xCAD0,0xCACE,
-	0xA7C9,0xCACD,0xCACF,0xCAD1,INVALC,0xA7C7,
-	/* Range 0x5E95 - 0x5E9C, array index: 0x13D2 */
-	0xA9B3,0xA9B4,0xA9B1,INVALC,INVALC,0xA9B0,0xCEB8,0xA9B2,
-	/* Range 0x5EA0 - 0x5EB9, array index: 0x13DA */
-	0xABD6,INVALC,0xCEB7,0xCEB9,0xCEB6,0xCEBA,0xABD7,0xAE79,
-	0xD175,INVALC,0xD177,0xAE77,0xD178,0xAE78,0xD176,INVALC,
-	0xCEB5,0xD547,0xD54A,0xD54B,0xD548,0xB167,0xB166,0xB164,
-	0xB165,0xD549,
-	/* Range 0x5EC1 - 0x5EE9, array index: 0x13F4 */
-	0xB45A,0xB45B,INVALC,0xB45C,0xDD5D,0xDD5F,0xDD61,0xB748,
-	0xB747,0xB459,0xDD60,0xDD5E,INVALC,0xE1B8,INVALC,INVALC,
-	0xE1B6,0xE1BC,0xB9F8,0xE1BD,0xE1BA,0xB9F9,0xE1B7,0xE1B5,
-	0xE1BB,0xBC70,0xE573,0xE1B9,0xBC72,0xE574,0xBC71,0xBC74,
-	0xE575,0xBC6F,0xBC73,INVALC,0xE973,0xE971,0xE970,0xE972,
-	0xE96F,
-	/* Range 0x5EEE - 0x5EF7, array index: 0x141D */
-	0xF446,0xF447,INVALC,0xF5CB,0xF6DF,0xC655,INVALC,INVALC,
-	0xA9B5,0xA7CA,
-	/* Range 0x5EFE - 0x5F0B, array index: 0x1427 */
-	0xA47B,0xA4DC,INVALC,0xA5AF,0xC9DD,INVALC,0xA7CB,0xCAD2,
-	INVALC,0xCEBB,0xABD9,INVALC,0xB9FA,0xA47C,
-	/* Range 0x5F12 - 0x5F29, array index: 0x1435 */
-	0xB749,0xA47D,0xA4DD,0xA4DE,INVALC,0xA5B1,0xA5B0,INVALC,
-	0xC9DE,0xA6A2,INVALC,0xCAD3,INVALC,0xA7CC,INVALC,INVALC,
-	0xCC71,0xCC72,0xCC73,INVALC,0xA9B6,0xA9B7,0xCC70,0xA9B8,
-	/* Range 0x5F2D - 0x5F38, array index: 0x144D */
-	0xABDA,0xCEBC,INVALC,0xD17A,0xAE7A,INVALC,0xD179,INVALC,
-	0xB169,0xD54C,0xB16A,0xD54D,
-	/* Range 0x5F46 - 0x5F4F, array index: 0x1459 */
-	0xB9FB,INVALC,0xBC75,0xE576,0xBECA,0xE974,0xC0B1,INVALC,
-	0xC573,0xF7D8,
-	/* Range 0x5F54 - 0x5F59, array index: 0x1463 */
-	0xCC74,INVALC,0xCEBD,0xB16B,0xD8F4,0xB74A,
-	/* Range 0x5F67 - 0x5FA1, array index: 0x1469 */
-	0xD17B,INVALC,0xB16D,0xB343,0xB16E,0xB16C,0xB45E,INVALC,
-	0xE1C0,0xB9FC,0xBC76,INVALC,0xC94C,0xC9DF,INVALC,0xCAD5,
-	0xA7CF,0xCAD4,0xA7D0,INVALC,INVALC,0xA9BC,0xCC77,0xCC76,
-	0xA9BB,0xA9B9,0xA9BA,0xCC75,INVALC,INVALC,0xABDD,0xCEBE,
-	0xABE0,0xABDC,0xABE2,0xABDE,0xABDF,0xABE1,INVALC,INVALC,
-	INVALC,0xAE7D,0xAE7C,0xAE7B,INVALC,INVALC,INVALC,0xD54F,
-	0xB16F,0xB172,0xB170,INVALC,0xD54E,0xB175,INVALC,0xB171,
-	0xD550,0xB174,0xB173,
-	/* Range 0x5FA5 - 0x5FAF, array index: 0x14A4 */
-	0xD8F6,0xD8F5,INVALC,0xB461,0xB45F,0xB460,0xD8F7,0xB74B,
-	0xDD64,0xB74C,0xDD63,
-	/* Range 0x5FB5 - 0x5FC5, array index: 0x14AF */
-	0xBC78,0xE1C1,0xBC77,INVALC,0xB9FD,INVALC,0xECDE,0xE975,
-	0xC0B2,0xECDD,0xF240,0xF448,0xF449,INVALC,0xA4DF,INVALC,
-	0xA5B2,
-	/* Range 0x5FCC - 0x5FD9, array index: 0x14C0 */
-	0xA7D2,0xA7D4,INVALC,0xC9E2,0xCAD8,0xCAD7,0xCAD6,INVALC,
-	0xC9E1,0xC9E0,0xA6A4,0xA7D3,0xA7D1,0xA6A3,
-	/* Range 0x5FDD - 0x5FE5, array index: 0x14CE */
-	0xA9BD,0xCC78,INVALC,0xA9BE,0xCADD,INVALC,0xCADF,0xCADE,
-	0xCC79,
-	/* Range 0x5FEA - 0x6000, array index: 0x14D7 */
-	0xA7D8,0xA7D6,INVALC,0xCAD9,0xCADB,0xCAE1,INVALC,0xA7D5,
-	INVALC,0xCADC,0xCAE5,0xA9C0,INVALC,0xCAE2,0xA7D7,INVALC,
-	0xCAE0,0xCAE3,INVALC,0xA9BF,INVALC,0xA9C1,0xCAE4,
-	/* Range 0x6009 - 0x6039, array index: 0x14EE */
-	0xCCAF,0xCCA2,0xCC7E,0xCCAE,0xCCA9,0xABE7,0xA9C2,0xCCAA,
-	0xCCAD,0xABE3,0xCCAC,0xA9C3,0xA9C8,0xA9C6,0xCCA3,INVALC,
-	0xCC7C,0xCCA5,0xA9CD,0xCCB0,0xABE4,0xCCA6,INVALC,0xABE5,
-	0xA9C9,0xCCA8,INVALC,0xCECD,0xABE6,0xCC7B,0xA9CA,0xABE8,
-	0xA9CB,0xA9C7,0xA9CC,0xCCA7,0xCC7A,0xCCAB,0xA9C4,INVALC,
-	INVALC,0xCC7D,0xCCA4,0xCCA1,0xA9C5,INVALC,0xCEBF,INVALC,
-	0xCEC0,
-	/* Range 0x6040 - 0x604D, array index: 0x151F */
-	0xCECA,0xD1A1,0xCECB,0xABEE,0xCECE,0xCEC4,0xABED,0xCEC6,
-	INVALC,0xCEC7,INVALC,INVALC,0xCEC9,0xABE9,
-	/* Range 0x6053 - 0x6072, array index: 0x152D */
-	0xCEC5,0xCEC1,0xAEA4,INVALC,INVALC,0xCECF,0xAE7E,0xD17D,
-	0xCEC8,INVALC,0xD17C,0xCEC3,0xCECC,INVALC,INVALC,0xABEC,
-	0xAEA1,0xABF2,0xAEA2,0xCED0,0xD17E,0xABEB,0xAEA6,0xABF1,
-	0xABF0,0xABEF,0xAEA5,0xCED1,0xAEA7,0xABEA,INVALC,0xCEC2,
-	/* Range 0x607F - 0x60A3, array index: 0x154D */
-	0xB176,0xD1A4,0xD1A6,INVALC,0xD1A8,0xAEA8,0xAEAE,0xD553,
-	0xD1AC,0xD1A3,0xB178,0xD551,INVALC,0xAEAD,0xAEAB,0xD1AE,
-	INVALC,0xD552,INVALC,0xD1A5,INVALC,0xAEAC,0xD1A9,0xAEAF,
-	0xD1AB,INVALC,INVALC,0xAEAA,0xD1AA,0xD1AD,0xD1A7,INVALC,
-	0xAEA9,0xB179,INVALC,0xD1A2,0xB177,
-	/* Range 0x60B0 - 0x60E6, array index: 0x1572 */
-	0xD555,0xD55E,0xB464,INVALC,0xB17C,0xB1A3,0xB465,0xD560,
-	0xB1AA,0xD8F9,0xD556,0xB1A2,0xB1A5,0xB17E,0xD554,0xD562,
-	0xD565,0xD949,INVALC,0xD563,0xD8FD,0xB1A1,0xB1A8,0xB1AC,
-	0xD55D,0xD8F8,0xD561,0xB17B,0xD8FA,0xD564,0xD8FC,0xD559,
-	INVALC,0xB462,INVALC,0xD557,0xD558,0xB1A7,INVALC,INVALC,
-	0xB1A6,0xD55B,0xB1AB,0xD55F,0xB1A4,0xD55C,INVALC,0xB1A9,
-	0xB466,0xB463,0xD8FB,INVALC,0xD55A,INVALC,0xB17D,
-	/* Range 0x60F0 - 0x611F, array index: 0x15A9 */
-	0xB46B,0xB46F,0xD940,0xB751,0xB46D,0xD944,0xB471,0xDD65,
-	0xD946,0xB753,0xB469,0xB46C,0xD947,INVALC,0xD948,0xD94E,
-	0xB473,0xB754,INVALC,0xD94A,0xD94F,0xD943,0xB75E,INVALC,
-	0xB755,0xB472,0xD941,0xD950,INVALC,0xB75D,0xB470,0xB74E,
-	0xD94D,INVALC,0xB474,0xD945,0xD8FE,0xB46A,0xD942,INVALC,
-	0xD94B,INVALC,0xB74D,0xB752,0xB467,0xD94C,INVALC,0xB750,
-	/* Range 0x6127 - 0x612F, array index: 0x15D9 */
-	0xB75C,0xE1C3,0xDD70,INVALC,0xDD68,0xE1C2,INVALC,0xDD6C,
-	0xDD6E,
-	/* Range 0x613E - 0x6183, array index: 0x15E2 */
-	0xB75A,0xBA40,0xDD71,0xE1C4,INVALC,INVALC,0xB758,0xDD69,
-	0xDD6D,0xB9FE,0xB74F,0xDD66,0xDD67,0xBA41,0xB757,0xB759,
-	0xB756,0xDD6F,INVALC,INVALC,0xE1C8,0xE1C9,0xE1CE,0xBC7D,
-	0xE1D5,INVALC,0xBA47,INVALC,0xBA46,0xE1D0,INVALC,0xBC7C,
-	0xE1C5,0xBA45,INVALC,0xE1D4,0xBA43,0xBA44,INVALC,0xE1D1,
-	0xE5AA,0xBC7A,0xB46E,INVALC,0xE1D3,0xBCA3,0xE1CB,INVALC,
-	0xBC7B,INVALC,0xBCA2,0xE1C6,0xE1CA,0xE1C7,0xE1CD,0xBA48,
-	0xBC79,0xBA42,INVALC,0xE57A,0xE1CF,INVALC,0xBCA1,INVALC,
-	0xBCA4,INVALC,0xE1CC,INVALC,0xBC7E,0xE579,
-	/* Range 0x6189 - 0x6196, array index: 0x1628 */
-	0xE57E,0xBECE,0xE578,0xE9A3,0xE5A9,0xBCA8,INVALC,0xBCA6,
-	0xBECC,0xE5A6,0xE5A2,0xBCAC,INVALC,0xE978,
-	/* Range 0x61A7 - 0x61CD, array index: 0x1636 */
-	0xBCA5,0xE977,0xBECD,0xE5A7,0xBCA7,0xBCA9,0xE5A4,0xBCAD,
-	0xE5A3,0xE57C,0xE57B,0xBECB,0xE5AB,0xE97A,0xECE0,0xBED0,
-	INVALC,0xE9A2,INVALC,0xE97E,INVALC,0xECE1,INVALC,0xBED1,
-	0xE9A1,INVALC,0xE97C,0xC0B4,0xECDF,INVALC,0xE979,0xE97B,
-	0xC0B5,0xBED3,0xC0B3,0xBED2,0xC0B7,0xE97D,0xBECF,
-	/* Range 0x61DE - 0x6236, array index: 0x165D */
-	0xECE7,0xEFC8,0xECE3,INVALC,INVALC,0xC256,0xECE5,0xECE4,
-	0xC0B6,0xECE2,0xECE6,0xEFD0,0xEFCC,0xEFCE,INVALC,0xEFC9,
-	0xEFCA,INVALC,0xEFCD,0xEFCB,0xC367,INVALC,INVALC,0xC36A,
-	0xC369,0xC368,0xC461,0xF44A,0xC462,0xF241,0xC4DF,0xF5CC,
-	0xC4E0,0xC574,0xC5CA,0xF7D9,INVALC,0xF7DA,0xF7DB,INVALC,
-	INVALC,0xF9BA,0xA4E0,0xC97C,0xA5B3,INVALC,0xA6A6,0xA6A7,
-	0xA6A5,INVALC,0xA6A8,0xA7DA,0xA7D9,INVALC,0xCCB1,0xA9CF,
-	0xA9CE,INVALC,INVALC,0xD1AF,0xB1AD,0xB1AE,INVALC,INVALC,
-	INVALC,0xB475,0xDD72,0xB760,0xB761,0xDD74,0xDD76,0xDD75,
-	INVALC,0xE1D7,INVALC,0xE1D6,0xBA49,0xE1D8,INVALC,0xE5AC,
-	0xBCAE,INVALC,0xBED4,INVALC,0xC0B8,0xC257,0xC0B9,INVALC,
-	0xA4E1,
-	/* Range 0x623D - 0x6266, array index: 0x16B6 */
-	0xCCB2,0xA9D1,0xA9D0,0xA9D2,0xABF3,0xCED2,0xCED3,INVALC,
-	INVALC,0xD1B0,0xAEB0,0xB1AF,0xB476,0xD951,0xA4E2,INVALC,
-	0xA47E,0xA4E3,INVALC,0xC97D,0xA5B7,0xA5B6,0xA5B4,0xA5B5,
-	INVALC,INVALC,INVALC,0xA6AB,0xC9E9,0xC9EB,0xA6AA,0xC9E3,
-	INVALC,0xC9E4,INVALC,0xC9EA,0xC9E6,0xC9E8,0xA6A9,0xC9E5,
-	0xC9EC,0xC9E7,
-	/* Range 0x626D - 0x6298, array index: 0x16E0 */
-	0xA7E1,0xA7EA,0xA7E8,0xCAF0,0xCAED,0xCAF5,0xA7E6,0xCAF6,
-	INVALC,0xA7DF,0xCAF3,INVALC,0xA7E5,0xCAEF,0xCAEE,0xA7E3,
-	0xCAF4,0xA7E4,0xA9D3,0xA7DE,0xCAF1,INVALC,0xCAE7,0xA7DB,
-	INVALC,0xA7EE,0xCAEC,0xCAF2,0xA7E0,0xA7E2,INVALC,0xCAE8,
-	INVALC,0xCAE9,0xCAEA,INVALC,0xA7ED,0xA7E7,0xA7EC,0xCAEB,
-	0xA7EB,0xA7DD,0xA7DC,0xA7E9,
-	/* Range 0x62A8 - 0x62BF, array index: 0x170C */
-	0xA9E1,0xCCBE,0xCCB7,0xA9DC,0xA9EF,0xCCB3,0xCCBA,0xCCBC,
-	0xCCBF,0xA9EA,INVALC,0xCCBB,0xCCB4,0xA9E8,0xCCB8,INVALC,
-	0xCCC0,0xA9D9,INVALC,0xCCBD,0xA9E3,0xA9E2,0xCCB6,0xA9D7,
-	/* Range 0x62C4 - 0x62DC, array index: 0x1724 */
-	0xA9D6,INVALC,0xA9EE,0xA9E6,0xA9E0,0xA9D4,0xCCB9,0xA9DF,
-	0xA9D5,0xA9E7,0xA9F0,0xCED4,0xA9E4,0xCCB5,0xA9DA,0xA9DD,
-	0xA9DE,INVALC,0xA9EC,0xA9ED,0xA9EB,0xA9E5,0xA9E9,0xA9DB,
-	0xABF4,
-	/* Range 0x62EB - 0x6316, array index: 0x173D */
-	0xCEDA,0xAC41,0xABF8,0xABFA,0xAC40,0xCEE6,0xABFD,0xD1B1,
-	0xAEB1,0xAC43,0xCED7,0xCEDF,0xABFE,0xCEDE,0xCEDB,0xCEE3,
-	0xCEE5,0xABF7,0xABFB,0xAC42,0xAEB3,0xCEE0,0xABF9,0xAC45,
-	0xCED9,INVALC,INVALC,INVALC,0xABFC,0xAEB2,0xABF6,INVALC,
-	0xCED6,0xCEDD,0xCED5,0xCED8,0xCEDC,0xD1B2,0xAC44,INVALC,
-	0xCEE1,0xCEE2,0xCEE4,0xABF5,
-	/* Range 0x6328 - 0x635A, array index: 0x1769 */
-	0xAEC1,0xD1BE,0xAEBF,0xAEC0,0xD1B4,0xD1C4,INVALC,0xAEB6,
-	INVALC,INVALC,0xD566,0xD1C6,0xD1C0,INVALC,0xD1B7,INVALC,
-	0xD1C9,0xD1BA,0xAEBC,0xD57D,0xD1BD,0xAEBE,0xAEB5,INVALC,
-	0xD1CB,0xD1BF,0xAEB8,0xD1B8,0xD1B5,0xD1B6,0xAEB9,0xD1C5,
-	0xD1CC,0xAEBB,0xD1BC,0xD1BB,0xAEC3,0xAEC2,0xAEB4,0xAEBA,
-	0xAEBD,0xD1C8,INVALC,INVALC,0xD1C2,0xAEB7,0xD1B3,0xD1CA,
-	0xD1C1,0xD1C3,0xD1C7,
-	/* Range 0x6365 - 0x63B1, array index: 0x179C */
-	0xD567,INVALC,0xB1B7,0xB1CB,0xB1CA,INVALC,0xB1BF,INVALC,
-	0xD579,0xD575,0xD572,0xD5A6,0xB1BA,0xB1B2,INVALC,INVALC,
-	0xD577,0xB4A8,0xB1B6,0xD5A1,INVALC,0xB1CC,0xB1C9,0xD57B,
-	0xD56A,INVALC,INVALC,0xB1C8,0xD5A3,0xD569,0xB1BD,0xB1C1,
-	0xD5A2,INVALC,0xD573,0xB1C2,0xB1BC,0xD568,INVALC,0xB478,
-	0xD5A5,0xD571,0xB1C7,0xD574,0xD5A4,0xB1C6,INVALC,0xD952,
-	INVALC,0xB1B3,0xD56F,0xB1B8,0xB1C3,INVALC,0xB1BE,0xD578,
-	0xD56E,0xD56C,0xD57E,0xB1B0,0xB1C4,0xB1B4,0xB477,0xD57C,
-	0xB1B5,INVALC,0xB1B1,0xB1C0,0xB1BB,0xB1B9,0xD570,0xB1C5,
-	0xD56D,0xD57A,0xD576,0xD954,0xD953,
-	/* Range 0x63C0 - 0x63F6, array index: 0x17E9 */
-	0xB47A,INVALC,0xD96A,0xD959,0xD967,0xDD77,0xB47D,0xD96B,
-	0xD96E,0xB47C,0xD95C,0xD96D,0xD96C,0xB47E,0xD955,0xB479,
-	0xB4A3,INVALC,0xB4A1,0xD969,INVALC,0xD95F,0xB4A5,0xD970,
-	0xD968,0xD971,0xB4AD,0xB4AB,0xD966,0xD965,INVALC,0xD963,
-	0xD95D,0xB4A4,INVALC,0xB4A2,0xD1B9,0xD956,INVALC,0xDDB7,
-	0xD957,0xB47B,0xB4AA,0xDD79,INVALC,0xB4A6,0xB4A7,0xD958,
-	0xD96F,0xDD78,0xD960,0xD95B,0xB4A9,0xD961,0xD95E,
-	/* Range 0x6409 - 0x6443, array index: 0x1820 */
-	0xDD7C,0xDDB1,0xDDB6,0xDDAA,0xB76C,0xDDBB,0xB769,0xDD7A,
-	INVALC,0xDD7B,0xB762,0xB76B,0xDDA4,0xB76E,0xB76F,0xDDA5,
-	INVALC,0xDDB2,0xDDB8,0xB76A,INVALC,0xB764,0xDDA3,0xDD7D,
-	0xDDBA,0xDDA8,0xDDA9,0xDD7E,0xDDB4,0xDDAB,0xDDB5,0xDDAD,
-	INVALC,0xB765,0xE1D9,0xB768,0xB766,0xDDB9,0xDDB0,0xDDAC,
-	INVALC,INVALC,0xDDA1,0xBA53,0xDDAF,0xB76D,0xDDA7,INVALC,
-	0xDDA6,INVALC,INVALC,INVALC,0xB767,0xB763,0xE1EE,0xDDB3,
-	0xDDAE,INVALC,0xDDA2,
-	/* Range 0x644D - 0x6454, array index: 0x185B */
-	0xE1DA,0xE1E5,INVALC,0xE1EC,0xBA51,0xB4AC,0xE1EA,0xBA4C,
-	/* Range 0x6458 - 0x647F, array index: 0x1863 */
-	0xBA4B,0xE1F1,INVALC,0xE1DB,0xE1E8,0xE1DC,0xE1E7,0xBA4F,
-	0xE1EB,0xD962,INVALC,INVALC,INVALC,0xE1F2,0xE1E3,0xBA52,
-	0xE5BA,0xBCAF,INVALC,0xE1F0,0xE1EF,0xBA54,0xE5AD,0xBCB0,
-	0xE5AE,INVALC,0xE1DF,0xE1E0,0xE1DD,0xE1E2,0xE1DE,0xE1F3,
-	0xBA4E,0xBCB1,0xBA50,0xBA55,INVALC,0xE1E1,INVALC,0xE1ED,
-	/* Range 0x6485 - 0x64A6, array index: 0x188B */
-	0xE5B1,INVALC,0xBA4A,0xBCB4,0xE9AA,0xE5B6,0xE5B5,0xE5B7,
-	INVALC,INVALC,0xE5B4,0xBCB5,INVALC,0xBCBB,0xBCB8,INVALC,
-	0xBCB9,0xE5AF,0xE5B2,0xE5BC,0xBCC1,0xBCBF,INVALC,0xE5B3,
-	0xD95A,0xBCB2,0xE5B9,0xE5B0,INVALC,0xBCC2,0xE5B8,0xBA4D,
-	0xBCB7,0xE1E4,
-	/* Range 0x64A9 - 0x64B3, array index: 0x18AD */
-	0xBCBA,INVALC,0xBCBE,0xBCC0,0xBCBD,0xBCBC,INVALC,0xBCB6,
-	0xE5BB,0xBCB3,0xBCC3,
-	/* Range 0x64BB - 0x64DB, array index: 0x18B8 */
-	0xBED8,0xBED9,0xE9A9,0xBEE2,0xBEDF,INVALC,0xBED6,0xBEDD,
-	0xE9AB,0xBEDB,0xBED5,INVALC,0xBEDC,INVALC,0xE9A8,0xC0BB,
-	0xBED7,INVALC,0xBEDE,0xC0BA,0xE9A7,0xE9A6,INVALC,0xBEE0,
-	INVALC,0xBEE1,INVALC,0xE9A5,0xE9A4,0xC0BC,0xE9AE,0xBEDA,
-	0xE9AC,
-	/* Range 0x64E0 - 0x654A, array index: 0x18D9 */
-	0xC0BD,INVALC,0xC0C2,0xECEA,0xECEC,INVALC,0xC0BF,INVALC,
-	0xECED,0xECE9,INVALC,0xECEB,0xC0C0,0xC0C3,INVALC,0xECE8,
-	0xC0BE,0xC0C1,0xC259,0xE9AD,0xC258,INVALC,INVALC,0xC25E,
-	0xEFD4,INVALC,0xC25C,0xC25D,0xEFD7,0xEFD3,0xC25A,0xEFD1,
-	0xC36B,0xEFD5,INVALC,0xEFD6,0xEFD2,INVALC,0xC25B,0xF242,
-	INVALC,0xF245,INVALC,INVALC,0xF246,0xF244,0xF247,0xC36C,
-	0xF243,INVALC,INVALC,0xF44E,0xC464,0xF44D,0xF44C,0xF44B,
-	0xC463,0xC465,INVALC,0xF5CD,0xC4E2,0xC4E1,INVALC,INVALC,
-	0xF6E1,0xF6E0,0xF6E3,0xC5CB,0xC575,0xF7DD,0xF6E2,INVALC,
-	INVALC,0xF7DC,0xC5CD,0xC5CC,0xC5F3,0xF8A9,0xF8EF,0xA4E4,
-	INVALC,INVALC,0xD972,0xE9AF,INVALC,INVALC,0xA6AC,0xCAF7,
-	0xA7F1,0xA7EF,INVALC,0xA7F0,INVALC,0xCCC1,0xA9F1,0xAC46,
-	INVALC,0xCEE7,INVALC,0xCEE8,INVALC,0xAC47,0xD1CE,INVALC,
-	0xAEC4,0xAEC5,0xD1CD,
-	/* Range 0x6551 - 0x656C, array index: 0x1944 */
-	0xB1CF,INVALC,0xD5A7,0xB1D6,0xB1D5,0xB1CE,0xB1D1,0xB1D4,
-	0xB1D0,INVALC,INVALC,0xD976,0xB1CD,0xB4AF,INVALC,INVALC,
-	INVALC,0xB4B1,0xB4B2,0xD975,0xD978,0xB4B0,0xD973,0xD977,
-	INVALC,0xD974,INVALC,0xB771,
-	/* Range 0x6572 - 0x6584, array index: 0x1960 */
-	0xBA56,0xE1F4,0xBEE3,0xBCC4,0xE5BD,0xBCC5,0xBCC6,0xE5BF,
-	0xE5BE,0xE5C0,0xE9B1,INVALC,INVALC,0xE9B0,0xECEF,0xECEE,
-	0xC0C4,0xC0C5,0xF248,
-	/* Range 0x6590 - 0x65C6, array index: 0x1973 */
-	0xB4B4,0xB4B3,0xDDBD,INVALC,0xEFD8,0xC4E3,0xF7DE,0xA4E6,
-	INVALC,0xAEC6,INVALC,0xB1D8,0xB1D7,0xD97A,0xD97B,0xB772,
-	0xE1F5,0xBA57,0xE9B2,INVALC,0xA4E7,0xA5B8,INVALC,0xA9F2,
-	0xCCC2,INVALC,0xCEE9,0xAC48,0xB1D9,INVALC,0xD97C,0xB4B5,
-	0xB773,INVALC,0xE5C1,0xE5C2,INVALC,INVALC,0xECF0,0xC25F,
-	0xF8F0,0xA4E8,INVALC,0xCCC3,0xA9F3,0xAC49,INVALC,0xCEEA,
-	INVALC,0xAEC7,0xD1D2,0xD1D0,0xD1D1,0xAEC8,0xD1CF,
-	/* Range 0x65CB - 0x65F5, array index: 0x19AA */
-	0xB1DB,0xB1DC,0xD5A8,0xB1DD,0xB1DA,0xD97D,INVALC,0xD97E,
-	0xDDBE,INVALC,INVALC,0xBA59,0xBA58,INVALC,INVALC,0xECF1,
-	0xEFD9,INVALC,0xF24A,0xF249,0xF44F,INVALC,0xC95E,0xAC4A,
-	INVALC,INVALC,0xA4E9,0xA5B9,INVALC,0xA6AE,0xA6AD,INVALC,
-	INVALC,0xA6AF,0xA6B0,0xC9EE,0xC9ED,0xCAF8,0xA7F2,0xCAFB,
-	0xCAFA,0xCAF9,0xCAFC,
-	/* Range 0x65FA - 0x65FD, array index: 0x19D5 */
-	0xA9F4,0xCCC9,0xCCC5,0xCCCE,
-	/* Range 0x6600 - 0x6615, array index: 0x19D9 */
-	0xA9FB,INVALC,0xA9F9,0xCCCA,0xCCC6,0xCCCD,0xA9F8,0xAA40,
-	0xCCC8,0xCCC4,0xA9FE,0xCCCB,0xA9F7,0xCCCC,0xA9FA,0xA9FC,
-	0xCCD0,0xCCCF,0xCCC7,0xA9F6,0xA9F5,0xA9FD,
-	/* Range 0x661C - 0x6628, array index: 0x19EF */
-	0xCEEF,0xCEF5,INVALC,0xAC50,0xAC4D,0xCEEC,0xCEF1,INVALC,
-	0xAC53,0xAC4B,0xCEF0,0xAC4E,0xAC51,
-	/* Range 0x662B - 0x663A, array index: 0x19FC */
-	0xCEF3,INVALC,0xAC4C,0xCEF8,0xAC4F,INVALC,0xAC52,0xCEED,
-	0xCEF2,0xCEF6,0xCEEE,0xCEEB,INVALC,INVALC,0xCEF7,0xCEF4,
-	/* Range 0x6641 - 0x664C, array index: 0x1A0C */
-	0xAED0,0xAEC9,0xAECC,INVALC,0xAECF,INVALC,0xD1D5,INVALC,
-	0xAECA,0xD1D3,INVALC,0xAECE,
-	/* Range 0x6659 - 0x6680, array index: 0x1A18 */
-	0xD5AC,0xB1DF,0xD5AB,0xD5AD,0xB1DE,0xB1E3,0xD1D4,INVALC,
-	0xD5AA,0xD5AE,INVALC,0xB1E0,0xD5A9,0xB1E2,INVALC,0xB1E1,
-	INVALC,0xD9A7,INVALC,0xD9A2,INVALC,0xB4B6,0xB4BA,0xB4B7,
-	0xD9A5,0xD9A8,INVALC,0xB4B8,INVALC,0xB4B9,0xB4BE,0xDDC7,
-	0xD9A6,0xB4BC,0xD9A3,0xD9A1,INVALC,0xB4BD,INVALC,0xD9A4,
-	/* Range 0x6684 - 0x6699, array index: 0x1A40 */
-	0xB779,INVALC,0xDDBF,0xB776,0xB777,0xB775,0xDDC4,0xDDC3,
-	0xDDC0,0xB77B,INVALC,INVALC,0xDDC2,0xB4BB,INVALC,INVALC,
-	0xDDC6,0xDDC1,0xB778,0xB774,0xB77A,0xDDC5,
-	/* Range 0x669D - 0x66A2, array index: 0x1A56 */
-	0xBA5C,INVALC,0xE1F8,0xE1F7,0xE1F6,0xBA5A,
-	/* Range 0x66A8 - 0x66C0, array index: 0x1A5C */
-	0xBA5B,0xE5C5,0xE5C8,0xBCC8,INVALC,INVALC,0xBCC7,0xE5C9,
-	0xE5C4,0xBCCA,0xE5C6,INVALC,0xBCC9,0xE5C3,INVALC,0xE5C7,
-	0xBEE9,0xBEE6,0xE9BB,0xE9BA,INVALC,0xE9B9,0xE9B4,INVALC,
-	0xE9B5,
-	/* Range 0x66C4 - 0x66CC, array index: 0x1A75 */
-	0xBEE7,INVALC,0xBEE4,0xBEE8,0xE9B3,0xBEE5,0xE9B6,0xE9B7,
-	0xE9BC,
-	/* Range 0x66D6 - 0x66F9, array index: 0x1A7E */
-	0xC0C7,INVALC,0xEFDC,0xC0C6,0xEFDA,0xEFDB,0xC260,0xC36E,
-	0xF24B,INVALC,0xC36D,INVALC,INVALC,0xF451,0xF452,INVALC,
-	0xC466,INVALC,0xF450,0xC4E4,INVALC,0xF7DF,0xC5CE,0xF8AA,
-	0xF8AB,INVALC,0xA4EA,INVALC,0xA6B1,0xA6B2,0xA7F3,INVALC,
-	0xCCD1,0xAC54,0xAED1,0xB1E4,
-	/* Range 0x66FC - 0x6718, array index: 0x1AA2 */
-	0xB0D2,INVALC,0xB4BF,0xB4C0,0xB3CC,0xD9A9,INVALC,0xB77C,
-	0xE1FA,0xE1F9,INVALC,INVALC,0xA4EB,0xA6B3,0xCCD2,0xAA42,
-	INVALC,0xAA41,INVALC,0xCEF9,0xCEFA,INVALC,0xD1D7,0xD1D8,
-	0xAED2,0xAED3,INVALC,0xAED4,0xD5AF,
-	/* Range 0x671D - 0x672E, array index: 0x1ABF */
-	0xB4C2,INVALC,0xB4C1,0xDDC8,0xDF7A,0xE1FB,0xE9BD,INVALC,
-	INVALC,0xC261,0xC467,0xA4EC,INVALC,0xA5BC,0xA5BD,0xA5BB,
-	0xA5BE,0xA5BA,
-	/* Range 0x6731 - 0x673F, array index: 0x1AD1 */
-	0xA6B6,INVALC,0xC9F6,0xA6B5,0xA6B7,INVALC,INVALC,0xC9F1,
-	0xC9F0,0xC9F3,0xC9F2,0xC9F5,0xA6B4,0xC9EF,0xC9F4,
-	/* Range 0x6745 - 0x6760, array index: 0x1AE0 */
-	0xCAFD,0xA7FD,0xCAFE,0xCB43,0xA7FC,INVALC,0xCB47,0xCB42,
-	0xCB45,0xA7F5,0xA7F6,0xA7F7,0xA7F8,INVALC,0xA840,INVALC,
-	0xCB41,0xA7FA,0xA841,INVALC,0xCB40,0xCB46,INVALC,0xA7F9,
-	0xCB44,0xA7FB,0xA7F4,0xA7FE,
-	/* Range 0x676C - 0x679F, array index: 0x1AFC */
-	0xCCD4,0xAA43,INVALC,0xAA4D,0xAA4E,0xAA46,0xAA58,0xAA48,
-	0xCCDC,0xAA53,0xCCD7,0xAA49,0xCCE6,0xCCE7,0xCCDF,0xCCD8,
-	0xAA56,0xCCE4,0xAA51,0xAA4F,INVALC,0xCCE5,INVALC,0xCCE3,
-	0xCCDB,0xCCD3,0xCCDA,0xAA4A,INVALC,0xAA50,INVALC,0xAA44,
-	0xCCDE,0xCCDD,0xCCD5,INVALC,0xAA52,0xCCE1,0xCCD6,0xAA55,
-	0xCCE8,0xAA45,INVALC,0xAA4C,0xCCD9,0xCCE2,0xAA54,INVALC,
-	0xAA47,0xAA4B,INVALC,0xCCE0,
-	/* Range 0x67AE - 0x67BB, array index: 0x1B30 */
-	0xCF5B,0xAC5C,0xAC69,INVALC,0xCF56,0xCF4C,0xAC62,0xCF4A,
-	0xAC5B,0xCF45,0xAC65,0xCF52,0xCEFE,0xCF41,
-	/* Range 0x67C0 - 0x67FC, array index: 0x1B3E */
-	0xCF44,0xCEFB,0xCF51,0xCF61,0xAC60,0xCF46,0xCF58,INVALC,
-	0xCEFD,0xCF5F,0xCF60,0xCF63,0xCF5A,0xCF4B,0xCF53,0xAC66,
-	0xAC59,0xAC61,0xAC6D,0xAC56,0xAC58,INVALC,INVALC,INVALC,
-	0xCF43,0xAC6A,0xAC63,0xCF5D,0xCF40,0xAC6C,0xAC67,0xCF49,
-	INVALC,INVALC,0xAC6B,0xCF50,0xCF48,0xAC64,0xCF5C,0xCF54,
-	INVALC,0xAC5E,0xCF62,0xCF47,0xAC5A,0xCF59,0xCF4F,0xAC5F,
-	0xCF55,0xAC57,0xCEFC,0xAC68,0xAEE3,0xAC5D,0xCF4E,0xCF4D,
-	0xCF42,INVALC,0xCF5E,INVALC,0xCF57,
-	/* Range 0x6812 - 0x6821, array index: 0x1B7B */
-	0xD1EC,0xAEEA,0xD1ED,INVALC,0xD1E1,0xAEDF,0xAEEB,INVALC,
-	0xD1DA,INVALC,0xD1E3,0xD1EB,INVALC,0xD1D9,0xD1F4,0xAED5,
-	/* Range 0x6825 - 0x6854, array index: 0x1B8B */
-	0xD1F3,0xD1EE,INVALC,0xD1EF,0xAEDD,0xAEE8,0xD1E5,INVALC,
-	0xD1E6,0xD1F0,0xD1E7,INVALC,0xD1E2,0xD1DC,0xD1DD,0xD1EA,
-	0xD1E4,INVALC,INVALC,0xAED6,0xAEDA,0xD1F2,0xD1DE,0xAEE6,
-	0xAEE2,INVALC,INVALC,0xAEE5,0xAEEC,0xAEDB,0xAEE7,0xD1E9,
-	0xAEE9,0xAED8,INVALC,0xAED7,0xD1DB,INVALC,0xD1DF,0xAEE0,
-	0xD1F1,0xD1E8,0xD1E0,0xAEE4,0xAEE1,INVALC,0xAED9,0xAEDC,
-	/* Range 0x686B - 0x68B5, array index: 0x1BBB */
-	0xD5C4,INVALC,0xD5B4,0xD5B5,0xD5B9,INVALC,0xD5C8,0xD5C5,
-	INVALC,0xD5BE,0xD5BD,0xB1ED,0xD5C1,0xD5D0,0xD5B0,INVALC,
-	0xD5D1,0xD5C3,0xD5D5,0xD5C9,0xB1EC,0xD5C7,0xB1E7,0xB1FC,
-	0xB1F2,INVALC,0xB1F6,0xB1F5,0xD5B1,INVALC,0xD5CE,0xD5D4,
-	0xD5CC,0xD5D3,INVALC,INVALC,0xD5C0,0xD5B2,0xD5D2,0xD5C2,
-	0xB1EA,0xB1F7,INVALC,0xD5CB,0xB1F0,INVALC,INVALC,INVALC,
-	0xD5CA,0xD5B3,0xB1F8,INVALC,0xB1FA,0xD5CD,0xB1FB,0xB1E9,
-	0xD5BA,0xD5CF,INVALC,INVALC,0xB1EF,0xB1F9,0xD5BC,0xD5C6,
-	0xD5B7,0xD5BB,0xB1F4,0xD5B6,0xB1E8,0xB1F1,0xB1EE,0xD5BF,
-	0xAEDE,0xD9C0,0xB1EB,
-	/* Range 0x68C4 - 0x68FD, array index: 0x1C06 */
-	0xB1F3,INVALC,0xD9C3,0xD9D9,0xD9CE,0xB4D6,INVALC,0xB4D1,
-	0xD9BD,0xB4D2,0xD9CD,INVALC,0xD9C6,0xD9D3,0xB4CE,0xD9AB,
-	0xD9D5,0xB4C4,0xD9B3,0xB4C7,0xB4C6,INVALC,0xB4D7,INVALC,
-	0xD9AD,0xD9CF,0xD9D0,0xB4C9,0xB4C5,0xD9BB,INVALC,0xB4D0,
-	0xD9B6,INVALC,0xD9D1,0xB4CC,0xD9C9,0xD9D6,0xD9B0,0xD9B5,
-	0xD9AF,INVALC,0xB4CB,0xD9C2,0xDDDE,0xD9B1,0xB4CF,0xD9BA,
-	0xD9D2,0xB4CA,0xD9B7,0xD9B4,0xD9C5,0xB4CD,0xB4C3,0xB4D9,
-	0xD9C8,0xD9C7,
-	/* Range 0x6904 - 0x6917, array index: 0x1C40 */
-	0xD9AC,0xB4C8,0xD9D4,0xD9BC,0xD9BE,INVALC,0xD9CB,0xD9CA,
-	0xD9AA,0xB4D3,0xB4D5,0xD9B2,0xD9B9,0xD9C1,0xB4D4,0xD9B8,
-	0xD9C4,0xD9D7,INVALC,0xD9CC,
-	/* Range 0x692F - 0x697B, array index: 0x1C54 */
-	0xDDF2,0xB7A6,INVALC,0xDDF0,0xDDDB,0xDDE0,0xDDD9,INVALC,
-	0xDDEC,0xDDCB,0xDDD2,INVALC,0xDDEA,0xDDF4,0xDDDC,INVALC,
-	0xDDCF,0xDDE2,0xDDE7,0xDDD3,INVALC,0xDDE4,0xDDD0,INVALC,
-	INVALC,0xDDD7,0xDDD8,0xB7A8,0xDDEB,0xDDE9,INVALC,0xDDCC,
-	0xDDEE,INVALC,0xDDEF,0xDDF1,0xB7AC,0xB7A4,INVALC,0xD5B8,
-	0xDDD4,0xDDE6,0xDDD5,0xB7A1,0xB7B1,0xDDED,0xB7AF,0xB7AB,
-	0xDDCA,0xB7A3,INVALC,0xDDCD,0xB7B0,INVALC,0xDDDD,0xDDC9,
-	INVALC,0xB7A9,0xDDE1,0xDDD1,0xB7AA,0xDDDA,0xB77E,0xB4D8,
-	0xDDE3,0xD9BF,0xDDCE,INVALC,INVALC,0xDDE8,0xB7A5,0xDDE5,
-	0xB7A2,0xDDDF,0xB7AD,0xDDD6,0xDDF3,
-	/* Range 0x698D - 0x69D4, array index: 0x1CA1 */
-	0xE24A,0xE248,INVALC,0xE25E,0xE246,INVALC,0xE258,0xB77D,
-	0xBA5F,0xE242,0xE25D,INVALC,0xE247,0xE255,0xBA64,0xBA5D,
-	INVALC,0xE25B,INVALC,0xE240,0xE25A,INVALC,0xBA6F,0xE251,
-	0xE261,0xBA6D,0xE249,0xBA5E,0xE24B,0xE259,0xBA67,0xE244,
-	0xBA6B,0xBA61,0xE24D,0xE243,0xE1FC,INVALC,0xE257,0xBA68,
-	0xE260,0xE1FD,0xBA65,INVALC,0xE253,INVALC,0xBA66,0xE245,
-	0xE250,0xE24C,0xE24E,INVALC,0xBA60,0xE25F,0xBA6E,0xE24F,
-	INVALC,0xE262,INVALC,INVALC,0xE1FE,0xE254,0xBA63,0xBA6C,
-	0xBA6A,0xE241,0xE256,0xBA69,INVALC,INVALC,0xBA62,0xE252,
-	/* Range 0x69E2 - 0x6A0A, array index: 0x1CE9 */
-	0xE5D5,INVALC,0xE5D1,0xE5CD,0xE5E1,0xE5DE,0xBCCD,INVALC,
-	INVALC,0xE5E5,0xE5D4,0xBCD8,0xE5DB,INVALC,INVALC,0xE5D0,
-	0xE5DA,0xBCD5,0xE5EE,INVALC,0xE5EB,0xE5DD,0xE5CE,INVALC,
-	INVALC,0xE5E2,0xE5E4,0xBCD1,0xE5D8,0xE5D3,0xE5CA,0xBCCE,
-	0xBCD6,INVALC,0xE5E7,0xBCD7,0xE5CB,0xE5ED,0xE5E0,0xE5E6,
-	0xBCD4,
-	/* Range 0x6A11 - 0x6A28, array index: 0x1D12 */
-	0xBCD9,INVALC,0xBCD3,0xE5DC,0xE5CF,0xE5EF,0xE5CC,0xE5E8,
-	0xBCD0,INVALC,0xE5D6,INVALC,0xE5D7,0xBCCF,0xBCCC,0xE5D2,
-	0xBCD2,INVALC,0xBCCB,INVALC,0xE5E9,0xE5EC,0xE5D9,0xE9CA,
-	/* Range 0x6A34 - 0x6A41, array index: 0x1D2A */
-	0xE9BE,0xBEF6,INVALC,INVALC,0xBEEB,0xBEF0,0xBEEC,0xE9CC,
-	0xE9D7,0xBEEA,0xE9C4,0xE9CD,0xE5DF,0xE9CE,
-	/* Range 0x6A44 - 0x6A6F, array index: 0x1D38 */
-	0xBEF1,INVALC,0xE9DD,0xBEF5,0xBEF8,0xE9C0,INVALC,0xBEF4,
-	INVALC,0xE9DB,0xE9DC,0xE9D2,0xE9D1,0xE9C9,INVALC,INVALC,
-	0xE9D3,0xE9DA,0xE9D9,INVALC,0xBEEF,0xBEED,0xE9CB,0xE9C8,
-	INVALC,0xE9C5,0xE9D8,0xBEF7,0xE9D6,0xBEF3,0xBEF2,INVALC,
-	0xE9D0,INVALC,0xE9BF,0xE9C1,0xE9C3,0xE9D5,0xE9CF,0xBEEE,
-	INVALC,0xE9C6,INVALC,0xE9D4,
-	/* Range 0x6A7E - 0x6AAF, array index: 0x1D64 */
-	0xC0CF,0xED45,0xC0C8,0xECF5,INVALC,0xED41,0xC0CA,0xED48,
-	INVALC,0xECFC,INVALC,0xECF7,INVALC,INVALC,0xED49,0xECF3,
-	0xECFE,INVALC,0xC0D1,0xED44,0xED4A,0xECFD,0xC0C9,0xED40,
-	0xECF4,0xC0D0,INVALC,INVALC,0xED47,0xECF9,0xC0CC,INVALC,
-	0xECFB,0xECF8,0xC0D2,0xECFA,0xC0CB,0xC0CE,0xED43,0xECF6,
-	0xED46,INVALC,0xED42,INVALC,INVALC,INVALC,0xC263,0xEFE7,
-	0xC268,0xC269,
-	/* Range 0x6AB3 - 0x6ABD, array index: 0x1D96 */
-	0xC262,0xEFE6,INVALC,0xEFE3,0xEFE4,0xC266,0xEFDE,0xEFE2,
-	0xC265,INVALC,0xEFDF,
-	/* Range 0x6AC2 - 0x6AD3, array index: 0x1DA1 */
-	0xC267,0xC264,INVALC,0xEFDD,0xEFE1,0xEFE5,INVALC,INVALC,
-	INVALC,0xF251,0xF24E,0xF257,INVALC,0xF256,0xF254,0xF24F,
-	INVALC,0xC372,
-	/* Range 0x6AD9 - 0x6AE1, array index: 0x1DB3 */
-	0xF250,0xC371,0xC0CD,0xF253,0xC370,0xF258,0xF252,0xF24D,
-	0xEFE0,
-	/* Range 0x6AE7 - 0x6AF3, array index: 0x1DBC */
-	0xF24C,0xF456,INVALC,0xF455,0xF255,0xC468,INVALC,0xF459,
-	0xF45A,0xF454,0xF458,INVALC,0xF453,
-	/* Range 0x6AF8 - 0x6AFC, array index: 0x1DC9 */
-	0xF5D1,0xF457,0xC4E7,0xC4E5,0xF5CF,
-	/* Range 0x6B00 - 0x6B1A, array index: 0x1DCE */
-	0xF5D2,INVALC,0xF5CE,0xF5D0,0xC4E6,INVALC,INVALC,INVALC,
-	0xF6E5,0xF6E6,0xC576,0xF6E4,INVALC,INVALC,INVALC,0xF7E2,
-	0xC5CF,0xF7E0,0xF7E1,0xF8AC,INVALC,INVALC,0xC656,0xF8F3,
-	0xF8F1,0xF8F2,0xF8F4,
-	/* Range 0x6B2F - 0x6B56, array index: 0x1DE9 */
-	0xD1F6,INVALC,0xD1F8,0xB1FD,0xD5D7,0xD1F9,INVALC,0xD5D6,
-	0xD5D8,0xD5D9,0xD9DA,0xB4DB,0xD9DB,0xD9DD,0xB4DC,0xB4DA,
-	0xD9DC,INVALC,0xDDFA,0xDDF8,0xDDF7,INVALC,0xDDF6,0xDDF5,
-	0xB7B2,0xDDF9,0xBA70,0xE263,0xE265,0xBA71,0xE264,0xBCDB,
-	INVALC,0xBCDA,0xE5F0,INVALC,INVALC,0xE9DF,0xE9DE,0xE9E0,
-	/* Range 0x6B5B - 0x6B67, array index: 0x1E11 */
-	0xED4B,0xC0D3,INVALC,0xEFE8,0xC26A,0xF259,0xC577,0xA4EE,
-	0xA5BF,0xA6B9,0xA842,0xAA5A,0xAA5B,
-	/* Range 0x6B76 - 0x6BB7, array index: 0x1E1E */
-	0xE6D1,0xBEFA,0xC26B,0xA4EF,INVALC,0xA6BA,INVALC,INVALC,
-	0xCCEB,0xAA5C,0xCCEA,INVALC,0xCF65,0xAC6F,0xCF66,INVALC,
-	0xAC70,INVALC,0xD1FC,0xAEEE,0xAEED,INVALC,0xD5DE,0xD5DC,
-	0xD5DD,0xD5DB,INVALC,0xD5DA,INVALC,INVALC,0xD9DE,0xD9E1,
-	0xB4DE,0xD9DF,0xB4DD,0xD9E0,INVALC,0xDDFB,INVALC,INVALC,
-	0xE266,0xE267,0xE268,INVALC,0xE5F3,0xE5F2,0xBCDC,0xE5F1,
-	0xE5F4,0xE9E1,INVALC,INVALC,0xE9E2,0xE9E3,INVALC,0xED4C,
-	0xC0D4,0xC26C,0xF25A,INVALC,0xC4E8,0xC95F,INVALC,0xAC71,
-	0xCF67,0xAEEF,
-	/* Range 0x6BBC - 0x6BDB, array index: 0x1E60 */
-	0xB4DF,0xD9E2,INVALC,0xB7B5,0xB7B4,INVALC,INVALC,0xE269,
-	0xE26A,0xBCDD,0xBCDE,0xE9E5,0xE9E4,0xEFE9,0xF7E3,0xA4F0,
-	0xC960,0xA5C0,INVALC,0xA843,0xCB48,INVALC,0xAC72,0xB7B6,
-	0xA4F1,INVALC,0xCF68,0xAC73,0xCF69,INVALC,0xC0D5,0xA4F2,
-	/* Range 0x6BE0 - 0x6C38, array index: 0x1E80 */
-	0xCF6A,INVALC,0xD242,0xD241,0xD1FE,INVALC,0xD1FD,0xD243,
-	0xD240,INVALC,INVALC,0xB240,0xB241,INVALC,INVALC,0xB4E0,
-	0xD9E3,INVALC,0xD9E4,0xD9E5,INVALC,INVALC,INVALC,0xDE41,
-	0xDE42,0xDE40,INVALC,0xDDFD,0xDDFE,0xB7B7,0xE26B,0xE5F7,
-	0xE5F6,0xE5F5,0xE5F8,0xE9E7,0xE9E6,0xBEFB,0xE9E8,INVALC,
-	0xC0D6,0xED4D,INVALC,0xEFEA,0xF25B,0xF6E7,INVALC,0xA4F3,
-	0xA5C2,0xA5C1,INVALC,0xAA5D,0xC961,0xC97E,0xA6BB,INVALC,
-	0xC9F7,0xCB49,0xCB4A,0xAA5E,INVALC,0xCCED,INVALC,0xAC74,
-	0xCF6B,0xCF6C,INVALC,0xAEF0,0xAEF4,0xD244,0xAEF3,0xAEF1,
-	0xAEF2,INVALC,0xD5DF,0xB242,0xB4E3,INVALC,0xB4E1,0xB4E2,
-	0xD9E6,INVALC,INVALC,0xBA72,0xA4F4,INVALC,0xC9A1,INVALC,
-	0xA5C3,
-	/* Range 0x6C3E - 0x6C43, array index: 0x1ED9 */
-	0xA5C6,0xC9A3,0xA5C5,0xA5C4,0xA844,0xC9A2,
-	/* Range 0x6C4A - 0x6C9D, array index: 0x1EDF */
-	0xC9FC,0xC9FE,0xCA40,0xA6C5,0xA6C6,0xC9FB,0xA6C1,INVALC,
-	0xC9F9,INVALC,0xC9FD,0xA6C2,INVALC,0xA6BD,INVALC,0xA6BE,
-	INVALC,0xA6C4,0xC9FA,0xA6BC,0xA845,0xA6BF,0xA6C0,0xA6C3,
-	INVALC,INVALC,INVALC,0xCB5B,0xCB59,0xCB4C,0xA851,0xCB53,
-	0xA84C,0xCB4D,INVALC,0xCB55,INVALC,0xCB52,0xA84F,0xCB51,
-	0xA856,0xCB5A,0xA858,INVALC,0xA85A,INVALC,0xCB4B,INVALC,
-	0xA84D,0xCB5C,INVALC,0xA854,0xA857,INVALC,0xCD45,0xA847,
-	0xA85E,0xA855,0xCB4E,0xA84A,0xA859,0xCB56,0xA848,0xA849,
-	0xCD43,0xCB4F,0xA850,0xA85B,0xCB5D,0xCB50,0xA84E,INVALC,
-	0xA853,0xCCEE,0xA85C,0xCB57,0xA852,INVALC,0xA85D,0xA846,
-	0xCB54,0xA84B,0xCB58,0xCD44,
-	/* Range 0x6CAB - 0x6CF5, array index: 0x1F33 */
-	0xAA6A,0xAA7A,0xCCF5,0xAA71,INVALC,0xCD4B,0xAA62,INVALC,
-	0xAA65,0xCD42,INVALC,0xCCF3,0xCCF7,0xAA6D,0xAA6F,0xCCFA,
-	0xAA76,0xAA68,0xAA66,0xAA67,0xAA75,0xCD47,0xAA70,0xCCF9,
-	0xCCFB,0xAA6E,0xAA73,0xCCFC,0xCD4A,INVALC,0xAC75,0xAA79,
-	INVALC,0xAA63,0xCD49,INVALC,0xCD4D,0xCCF8,0xCD4F,0xCD40,
-	0xAA6C,0xCCF4,0xAA6B,0xAA7D,0xAA72,INVALC,0xCCF2,0xCF75,
-	0xAA78,0xAA7C,0xCD41,0xCD46,INVALC,0xAA7E,0xAA77,0xAA69,
-	0xAA5F,INVALC,0xAA64,INVALC,0xCCF6,0xAA60,0xCD4E,INVALC,
-	0xCCF0,0xCCEF,0xCCFD,0xCCF1,0xAA7B,0xAEF5,0xAA74,0xCCFE,
-	0xAA61,INVALC,0xACA6,
-	/* Range 0x6D00 - 0x6D22, array index: 0x1F7E */
-	0xCF7C,0xCFA1,INVALC,0xCFA4,0xCF77,INVALC,INVALC,0xCFA7,
-	0xCFAA,0xCFAC,0xCF74,0xAC76,0xAC7B,0xD249,0xACAD,0xCFA5,
-	0xCFAD,0xCF7B,0xCF73,INVALC,INVALC,INVALC,0xD264,0xAC7E,
-	0xCFA2,0xCF78,0xCF7A,0xACA5,INVALC,0xCF7D,0xAC7D,0xCF70,
-	0xCFA8,INVALC,0xCFAB,
-	/* Range 0x6D25 - 0x6D42, array index: 0x1FA1 */
-	0xAC7A,INVALC,0xACA8,0xCF6D,0xACAA,0xAC78,0xACAE,0xCFA9,
-	0xCF6F,0xACAB,0xD25E,0xCD48,0xAC7C,0xAC77,0xCF76,0xCF6E,
-	0xACAC,0xACA4,0xCFA3,0xACA9,0xACA7,0xCF79,0xACA1,0xCF71,
-	0xACA2,0xACA3,0xCF72,0xCFA6,0xAC79,0xCF7E,
-	/* Range 0x6D58 - 0x6D98, array index: 0x1FBF */
-	0xD24C,0xAEFD,0xAF43,INVALC,INVALC,INVALC,0xD255,0xD25B,
-	0xD257,0xD24A,0xD24D,0xD246,0xD247,0xAF4A,0xAEFA,0xD256,
-	0xD25F,0xAF45,0xAEF6,INVALC,0xAF40,0xD24E,0xAF42,0xD24F,
-	0xD259,INVALC,INVALC,INVALC,0xAF44,0xD268,0xD248,0xAEFC,
-	0xAEFB,0xAF48,0xD245,0xD266,0xD25A,0xD267,0xD261,0xD253,
-	0xD262,INVALC,0xD25C,0xD265,0xD263,0xAF49,0xD254,0xAEF9,
-	0xAEF8,0xAF41,0xAF47,0xD260,0xAF46,0xD251,0xB243,INVALC,
-	0xD269,0xD250,0xD24B,0xAEFE,0xAF4B,0xAEF7,INVALC,0xD258,
-	0xD25D,
-	/* Range 0x6DAA - 0x6DFD, array index: 0x2000 */
-	0xB265,0xD5E1,0xD5E5,INVALC,0xB252,0xB250,INVALC,INVALC,
-	0xB247,0xD5E3,0xD5E2,0xB25B,INVALC,0xD5E8,0xB255,INVALC,
-	0xD5FA,0xD647,0xB244,0xD5F7,0xD5F0,0xB267,0xD5E0,INVALC,
-	0xD5FC,INVALC,0xB264,0xB258,0xB263,0xB24E,0xD5EC,0xD5FE,
-	0xD5F6,0xB24F,0xB249,0xD645,INVALC,0xD5FD,0xD640,0xB251,
-	0xB259,0xD642,0xD5EA,0xD5FB,0xD5EF,0xD644,0xB25E,0xB246,
-	0xB25C,0xD5F4,0xD5F2,0xD5F3,0xB253,0xD5EE,0xD5ED,0xB248,
-	0xD5E7,0xD646,0xB24A,0xD5F1,0xB268,INVALC,0xB262,0xD5E6,
-	0xB25F,0xB25D,0xB266,0xD5F8,0xB261,0xD252,0xD5F9,0xB260,
-	0xD641,0xB245,0xD5F5,0xB257,0xD5E9,0xB256,INVALC,0xB254,
-	0xB24C,0xB24B,0xD9E7,0xD643,
-	/* Range 0x6E19 - 0x6E79, array index: 0x2054 */
-	0xB541,0xB25A,0xB4EE,0xD9F6,0xB4FC,INVALC,0xD9EA,0xB4EB,
-	0xB4E7,0xDA49,0xB4ED,0xB4F1,0xB4EC,0xB4F5,0xDA4D,0xDA44,
-	INVALC,INVALC,0xD9F1,0xB4FA,0xB4F4,0xD9FD,0xB4E4,0xDA4A,
-	0xDA43,0xB4E8,0xD9F7,0xB4F7,0xDA55,0xDA56,INVALC,0xB4E5,
-	0xDA48,0xB4F9,0xD9FB,0xD9ED,0xD9EE,0xB4FD,0xD9F2,0xD9F9,
-	0xD9F3,INVALC,0xB4FB,0xB544,0xD9EF,0xD9E8,0xD9E9,INVALC,
-	0xD9EB,0xB4EA,0xD9F8,INVALC,0xB4F8,0xB542,INVALC,INVALC,
-	0xD9FA,0xDA53,0xDA4B,0xB4E6,0xDA51,0xB4F2,INVALC,0xB4F0,
-	INVALC,0xDA57,0xB4EF,0xDA41,0xD9F4,0xD9FE,0xB547,0xDA45,
-	0xDA42,0xD9F0,0xB543,0xDA4F,0xDA4C,0xDA54,0xB4E9,0xDA40,
-	0xB546,INVALC,0xDA47,INVALC,INVALC,0xB4F3,0xB4F6,INVALC,
-	0xDA46,0xB545,0xD9F5,0xD5E4,INVALC,INVALC,0xDA50,0xDA4E,
-	0xDA52,
-	/* Range 0x6E8D - 0x6ED8, array index: 0x20B5 */
-	0xDE61,0xDE60,0xDE46,0xB7BD,INVALC,0xDE5F,0xDE49,0xDE4A,
-	INVALC,0xB7C7,0xDE68,0xB7C2,0xDE5E,INVALC,0xDE43,0xB7C8,
-	0xB7BE,0xDE52,0xDE48,0xDE4B,0xDE63,0xB7B8,0xDE6A,0xDE62,
-	0xB7C1,0xDE57,0xB7CC,INVALC,INVALC,0xB7CB,0xB7C5,INVALC,
-	INVALC,0xDE69,0xB7B9,0xDE55,0xDE4C,0xDE59,0xDE65,0xB7CD,
-	INVALC,0xB7BB,0xDE54,INVALC,0xDE4D,0xB7C4,INVALC,0xB7C3,
-	0xDE50,0xDE5A,0xDE64,0xDE47,0xDE51,0xB7BC,0xDE5B,0xB7C9,
-	0xB7C0,0xDE4E,0xB7BF,0xDE45,0xDE53,0xDE67,0xB4FE,0xBAB0,
-	0xDE56,0xE26C,0xDE58,0xDE66,0xB7C6,0xDE4F,0xB7BA,0xB7CA,
-	0xBCF0,0xDE44,INVALC,0xDE5D,
-	/* Range 0x6EEB - 0x6F43, array index: 0x2101 */
-	0xE2AA,0xBAAD,0xE27D,0xE2A4,0xBAA2,INVALC,0xE26E,0xBAAF,
-	INVALC,0xBA77,0xE26D,0xE2B0,0xBAB1,0xE271,0xE2A3,INVALC,
-	0xE273,0xE2B3,0xE2AF,0xBA75,0xBAA1,0xE653,0xBAAE,0xBA7D,
-	0xE26F,INVALC,0xE2AE,0xBAA3,0xE2AB,0xE2B8,0xE275,0xE27E,
-	INVALC,INVALC,0xE2B6,0xE2AC,0xBA7C,INVALC,INVALC,0xE27C,
-	0xBA76,0xBA74,0xBAA8,INVALC,INVALC,0xE27A,0xE277,0xE278,
-	INVALC,0xE2B2,INVALC,0xE2B7,0xE2B5,0xBA7A,0xE2B9,0xBA7E,
-	0xBAA7,INVALC,0xE270,0xE5FA,0xE279,INVALC,0xBA78,0xBAAC,
-	0xBAA9,0xBA7B,0xE2A5,0xE274,0xBAAA,0xE2A7,0xBAA4,0xBAA6,
-	0xBA73,INVALC,0xE2A9,0xE2A1,0xE272,0xBAA5,0xE2B1,0xE2B4,
-	0xE27B,0xE2A8,INVALC,0xBA79,0xBCDF,0xE2A6,0xE5F9,INVALC,
-	0xE2AD,
-	/* Range 0x6F4E - 0x6F97, array index: 0x215A */
-	0xE276,0xE644,0xE64E,0xBCE2,0xE64D,0xE659,0xBCE4,0xE64B,
-	INVALC,0xE64F,0xBCEF,INVALC,0xE646,0xBCE7,INVALC,0xE652,
-	0xE9F0,0xBCF3,0xBCF2,0xE654,0xE643,0xE65E,0xBCED,INVALC,
-	0xBCE3,0xE657,INVALC,0xE65B,0xE660,0xE655,0xE649,0xBCE6,
-	0xBCE9,0xBCF1,0xBCEC,INVALC,0xE64C,0xE2A2,INVALC,INVALC,
-	0xE648,0xE65F,0xBCE8,INVALC,0xBCEB,0xE661,0xBCE0,0xE656,
-	0xE5FB,0xE65C,0xC0DF,INVALC,0xE64A,INVALC,0xBCE1,0xE645,
-	0xBCE5,0xE5FC,0xBAAB,0xE641,INVALC,0xE65A,0xE642,0xE640,
-	0xBCEA,INVALC,0xE658,INVALC,0xE5FE,0xE651,0xE650,0xE65D,
-	0xE647,0xBCEE,
-	/* Range 0x6F9E - 0x6FCF, array index: 0x21A4 */
-	0xE9F3,INVALC,0xBF49,0xBEFE,0xEA40,0xE9EB,0xBF41,0xE9F7,
-	0xBF48,0xBF43,0xE9F5,0xED4F,0xE9FB,0xEA42,0xE9FA,0xE9E9,
-	0xE9F8,0xEA44,0xEA46,0xBEFD,0xEA45,0xBF44,0xBF4A,INVALC,
-	0xBF47,INVALC,0xE9FE,0xBF46,0xE9F9,INVALC,0xE9ED,0xE9F2,
-	INVALC,0xE9FD,0xBF45,0xBF42,0xBEFC,0xBF40,0xE9F1,INVALC,
-	0xE5FD,0xE9EC,0xE9EF,0xEA41,0xE9F4,0xE9EA,0xED4E,0xEA43,
-	0xE9EE,0xE9FC,
-	/* Range 0x6FDB - 0x6FF4, array index: 0x21D6 */
-	0xC0DB,0xED53,0xED59,0xED57,0xC0D9,0xC0DA,0xC0E1,0xED5A,
-	0xED52,0xC0DC,INVALC,0xED56,0xED55,0xED5B,0xC0E2,INVALC,
-	0xC0DD,0xC0E0,0xED54,0xC0E4,0xC0DE,0xC0E5,0xC0D8,0xED58,
-	INVALC,0xED50,
-	/* Range 0x6FFA - 0x704C, array index: 0x21F0 */
-	0xC271,0xEFF4,0xEFF6,INVALC,0xC26F,0xEFF2,0xEFF3,0xEFEE,
-	INVALC,INVALC,0xE9F6,0xEFEF,0xC270,0xEFEB,INVALC,0xC26D,
-	0xEFF8,0xC26E,0xEFEC,0xEFED,0xEFF1,0xC273,INVALC,0xC272,
-	INVALC,INVALC,0xEFF0,0xC378,0xF25F,0xF265,0xC379,0xF25C,
-	0xC376,0xC373,0xF267,0xC377,INVALC,0xC374,0xF25E,0xF261,
-	0xF262,0xF263,0xF266,INVALC,0xEFF5,0xF25D,0xC375,0xF264,
-	0xF268,0xF260,INVALC,INVALC,INVALC,0xF45D,0xC46A,0xF460,
-	0xC46B,0xF468,0xF45F,0xF45C,INVALC,0xF45E,0xF462,0xF465,
-	0xF464,0xF467,0xF45B,INVALC,0xC469,0xF463,0xF466,0xF469,
-	0xF461,0xF5D3,0xF5D4,0xF5D8,0xF5D9,INVALC,0xF5D6,0xF5D7,
-	0xF5D5,INVALC,0xC4E9,
-	/* Range 0x7051 - 0x706B, array index: 0x2243 */
-	0xC578,0xF6EB,INVALC,INVALC,0xF6E8,0xF6E9,0xF6EA,0xC579,
-	INVALC,0xF7E5,0xF7E4,INVALC,0xF8AF,0xC5F4,0xF8AD,0xF8B0,
-	0xF8AE,0xF8F5,0xC657,0xC665,0xF9A3,0xF96C,INVALC,0xF9A2,
-	0xF9D0,0xF9D1,0xA4F5,
-	/* Range 0x7082 - 0x7086, array index: 0x225E */
-	0xCD58,0xCD5A,0xCD55,0xCD52,0xCD54,
-	/* Range 0x7091 - 0x709A, array index: 0x2263 */
-	0xCD56,0xAAA3,0xCD53,0xCD50,0xAAA1,0xCD57,INVALC,0xCD51,
-	0xAAA5,0xCD59,
-	/* Range 0x70A9 - 0x70BA, array index: 0x226D */
-	0xCFB6,INVALC,0xACAF,0xACB2,0xACB4,0xACB6,0xACB3,0xCFB2,
-	0xCFB1,INVALC,0xACB1,0xCFB4,0xCFB5,INVALC,0xCFAE,0xACB5,
-	INVALC,0xACB0,
-	/* Range 0x70C5 - 0x70E4, array index: 0x227F */
-	0xD277,0xD278,0xD279,0xAF50,INVALC,0xAF4C,0xD26E,INVALC,
-	0xD276,0xD27B,0xAF51,INVALC,0xD26C,0xD272,0xD26B,0xD275,
-	INVALC,INVALC,0xD271,0xAF4D,0xAF4F,0xD27A,INVALC,0xD26A,
-	0xD26D,0xD273,INVALC,0xD274,0xD27C,0xD270,INVALC,0xAF4E,
-	/* Range 0x70F3 - 0x7110, array index: 0x229F */
-	0xD650,0xD64C,INVALC,0xD658,0xD64A,0xD657,0xB269,0xD648,
-	0xDA5B,0xD652,0xB26C,INVALC,0xD653,0xD656,INVALC,0xD65A,
-	INVALC,0xD64F,INVALC,0xD654,INVALC,INVALC,0xB26A,0xB26B,
-	0xD659,0xD64D,0xD649,0xD65B,INVALC,0xD651,
-	/* Range 0x7117 - 0x7128, array index: 0x22BD */
-	0xD64B,INVALC,0xB548,0xB549,0xDA65,0xB54F,INVALC,0xDA59,
-	0xDA62,0xDA58,0xB54C,0xDA60,0xDA5E,INVALC,0xDA5F,0xB54A,
-	INVALC,0xDA63,
-	/* Range 0x712E - 0x7132, array index: 0x22CF */
-	0xDA5C,0xDA5A,0xB54B,0xDA5D,0xDA61,
-	/* Range 0x7141 - 0x7172, array index: 0x22D4 */
-	0xDE70,0xDE77,0xDE79,0xDEA1,INVALC,0xB7DA,0xDE6B,INVALC,
-	0xB7D2,INVALC,0xDE7A,0xB7D7,0xDEA2,0xB7CE,INVALC,0xDE7D,
-	INVALC,0xDE6D,0xDE7E,0xDE6C,INVALC,0xB7DC,INVALC,0xDE78,
-	0xB7CF,0xDEA3,INVALC,0xB7D4,0xDE71,0xB7D9,0xDE7C,0xDE6F,
-	0xDE76,0xDE72,0xDE6E,0xB7D1,0xB7D8,0xB7D6,0xB7D3,0xB7DB,
-	0xB7D0,0xDE75,INVALC,0xB7D5,INVALC,0xB54E,INVALC,0xDE7B,
-	INVALC,0xDE73,
-	/* Range 0x7180 - 0x718A, array index: 0x2306 */
-	0xE2BD,0xE2C3,0xE2BF,INVALC,0xBAB6,0xE2BE,0xE2C2,0xE2BA,
-	INVALC,0xE2BC,0xBAB5,
-	/* Range 0x7197 - 0x71F4, array index: 0x2311 */
-	0xE2C4,INVALC,0xBAB3,0xE667,0xE664,0xE670,0xE66A,0xE66C,
-	0xBCF4,0xE666,0xE66E,INVALC,INVALC,0xE66D,0xE66B,INVALC,
-	0xE671,0xBCF7,0xE668,0xE66F,INVALC,0xBCF5,INVALC,INVALC,
-	0xE663,0xE665,0xBCF6,0xE662,0xE672,INVALC,0xE669,INVALC,
-	INVALC,0xEA4A,0xBF51,INVALC,INVALC,0xEA55,0xEA53,0xBF4B,
-	0xEA49,0xEA4C,0xEA4D,0xEA48,0xBF55,0xBF56,0xEA47,0xEA56,
-	0xEA51,0xBF4F,0xBF4C,0xEA50,0xEA4E,INVALC,INVALC,0xBF52,
-	0xEA52,0xBF4D,INVALC,0xBF4E,INVALC,0xEA4F,0xBF50,0xEA4B,
-	INVALC,0xEA54,0xBF53,0xEA57,0xEA58,0xBF54,INVALC,INVALC,
-	0xC0E7,0xC0EE,0xED5C,0xED62,INVALC,0xED60,0xC0EA,0xC0E9,
-	0xC0E6,0xED5E,INVALC,INVALC,INVALC,0xC0EC,0xC0EB,0xC0E8,
-	INVALC,0xED61,0xED5D,0xED5F,INVALC,0xC0ED,
-	/* Range 0x71F8 - 0x7207, array index: 0x236F */
-	0xC277,0xEFFB,INVALC,0xC274,0xC275,0xEFFD,0xC276,0xEFFA,
-	INVALC,0xEFF9,0xF26C,0xEFFC,INVALC,0xF26D,0xC37A,0xF26B,
-	/* Range 0x7219 - 0x722D, array index: 0x237F */
-	0xF5DC,0xF5DB,0xC4EA,INVALC,0xF5DA,0xF6EC,0xF6ED,INVALC,
-	INVALC,0xF7E6,0xF8B1,INVALC,INVALC,0xF8F6,0xF9BC,0xC679,
-	0xF9C6,0xA4F6,INVALC,0xAAA6,0xAAA7,
-	/* Range 0x7235 - 0x724C, array index: 0x2394 */
-	0xC0EF,0xA4F7,INVALC,0xAAA8,0xAF52,0xB7DD,0xA4F8,INVALC,
-	0xB26E,0xBAB8,0xC962,INVALC,0xCFB7,0xD27D,INVALC,0xE2C5,
-	INVALC,0xC0F0,0xA4F9,0xAAA9,0xCFB8,0xCFB9,0xDA66,0xB550,
-	/* Range 0x7256 - 0x7263, array index: 0x23AC */
-	0xBCF8,INVALC,0xC37C,0xA4FA,0xDA67,0xA4FB,INVALC,0xA6C9,
-	0xCA42,0xA6C8,0xA865,0xA864,0xA863,0xCB60,
-	/* Range 0x726C - 0x72B0, array index: 0x23BA */
-	0xCFBA,INVALC,0xCFBD,0xACBA,0xCFBB,INVALC,0xACB9,0xCFBC,
-	0xACBB,INVALC,0xD2A2,0xD2A1,0xD27E,0xAF53,INVALC,0xD65D,
-	0xD65E,0xB26F,0xD65C,0xD65F,0xB552,0xB270,INVALC,INVALC,
-	0xB551,0xDA6B,0xDA6A,INVALC,0xDA68,0xDA69,INVALC,0xDA6C,
-	0xDEA6,0xDEA5,0xDEA9,INVALC,0xDEA8,0xDEA7,0xBAB9,0xE2C9,
-	INVALC,0xE2C8,0xBABA,0xE2C7,0xE673,INVALC,0xE674,0xBCF9,
-	INVALC,0xEA59,0xEA5A,INVALC,INVALC,0xF272,0xC37D,0xF271,
-	0xF270,0xF26E,0xF26F,0xC4EB,0xF46C,0xF6EE,0xF8F7,INVALC,
-	0xA4FC,INVALC,0xC9A5,0xA5C7,0xC9A6,
-	/* Range 0x72BD - 0x72EB, array index: 0x23FF */
-	0xCB62,INVALC,0xCB61,0xAAAC,0xCB65,0xA867,0xCB63,0xA866,
-	0xCB67,0xCB64,INVALC,INVALC,0xCD5F,0xCFBE,0xCD5D,0xCD64,
-	INVALC,0xAAAD,INVALC,0xAAB0,0xCD65,0xCD61,INVALC,0xCD62,
-	INVALC,0xCD5C,0xAAAF,0xCD5E,0xAAAE,0xCD63,INVALC,0xCD60,
-	INVALC,INVALC,0xCFC2,0xACBD,0xACBE,INVALC,0xCFC5,0xCFBF,
-	INVALC,0xCFC4,INVALC,0xCFC0,0xACBC,0xCFC3,0xCFC1,
-	/* Range 0x72F3 - 0x7301, array index: 0x242E */
-	0xD2A8,0xD2A5,INVALC,0xD2A7,0xAF58,0xAF57,0xAF55,0xD2A4,
-	0xD2A9,0xAF54,0xAF56,0xD2A6,0xD667,0xD2A3,0xD2AA,
-	/* Range 0x7307 - 0x730C, array index: 0x243D */
-	0xD662,0xD666,INVALC,0xD665,0xDA6E,0xDA79,
-	/* Range 0x730F - 0x731E, array index: 0x2443 */
-	0xD668,INVALC,0xD663,0xDA6D,0xB274,INVALC,INVALC,0xB273,
-	0xD661,0xD664,0xB275,INVALC,0xB272,0xB271,0xD660,0xD669,
-	/* Range 0x7322 - 0x7329, array index: 0x2453 */
-	0xDA70,0xDA77,INVALC,0xB554,0xDA76,0xDA73,INVALC,0xB556,
-	/* Range 0x7330 - 0x7345, array index: 0x245B */
-	0xDA6F,0xDA71,0xDA74,0xDA72,0xB555,0xDA78,0xB553,0xB7DF,
-	INVALC,INVALC,0xDEAD,0xDEAC,0xDEAA,INVALC,0xB7E2,0xB7E1,
-	0xDEAE,INVALC,0xDEAB,0xE2CA,0xBABB,0xB7E0,
-	/* Range 0x7349 - 0x7352, array index: 0x2471 */
-	0xDEB0,0xDEAF,INVALC,0xE2CD,0xE2CB,0xBCFA,INVALC,0xBABC,
-	0xE2CC,0xE676,
-	/* Range 0x7357 - 0x738B, array index: 0x247B */
-	0xBCFB,0xE675,0xE67E,0xE67D,0xE67B,INVALC,0xE67A,0xE677,
-	0xE678,0xE679,0xE67C,0xE6A1,INVALC,INVALC,0xEA5F,0xEA5C,
-	0xEA5D,0xBF57,0xEA5B,0xEA61,0xEA60,0xEA5E,INVALC,0xED64,
-	0xED65,0xC0F1,INVALC,0xC0F2,0xED63,INVALC,0xC279,0xEFFE,
-	0xC278,0xC37E,INVALC,0xC3A1,0xC46D,0xF46E,0xF46D,0xF5DD,
-	0xF6EF,0xC57A,0xF7E8,0xF7E7,0xF7E9,0xA5C8,0xCFC6,0xAF59,
-	0xB276,0xD66A,0xA5C9,0xC9A7,0xA4FD,
-	/* Range 0x7392 - 0x7397, array index: 0x24B0 */
-	0xCB6C,0xCB6A,0xCB6B,0xCB68,0xA868,0xCB69,
-	/* Range 0x739D - 0x73AD, array index: 0x24B6 */
-	0xCD6D,INVALC,0xAAB3,0xCD6B,0xCD67,0xCD6A,INVALC,0xCD66,
-	0xAAB5,0xCD69,INVALC,0xAAB2,0xAAB1,INVALC,0xAAB4,0xCD6C,
-	0xCD68,
-	/* Range 0x73B2 - 0x73CD, array index: 0x24C7 */
-	0xACC2,0xACC5,0xCFCE,0xCFCD,0xCFCC,0xACBF,0xCFD5,0xCFCB,
-	INVALC,0xACC1,0xD2AF,INVALC,0xCFD2,0xCFD0,0xACC4,INVALC,
-	0xCFC8,0xCFD3,INVALC,0xCFCA,0xCFD4,0xCFD1,0xCFC9,INVALC,
-	0xACC0,0xCFD6,0xCFC7,0xACC3,
-	/* Range 0x73D2 - 0x73E0, array index: 0x24E3 */
-	0xD2B4,0xD2AB,0xD2B6,INVALC,0xD2AE,0xD2B9,0xD2BA,0xD2AC,
-	0xD2B8,0xD2B5,0xD2B3,0xD2B7,0xAF5F,INVALC,0xAF5D,
-	/* Range 0x73E5 - 0x73EE, array index: 0x24F2 */
-	0xD2AD,INVALC,0xD2B0,0xD2BB,0xD2B2,0xAF5E,0xCFCF,INVALC,
-	0xAF5A,0xAF5C,
-	/* Range 0x73F4 - 0x740D, array index: 0x24FC */
-	0xD678,0xD66D,0xD66B,INVALC,0xD66C,INVALC,0xD673,INVALC,
-	0xD674,0xD670,0xB27B,0xD675,0xD672,0xD66F,INVALC,0xB279,
-	0xD66E,0xB277,0xB27A,0xD671,0xD679,0xAF5B,0xB278,0xD677,
-	0xD676,0xB27C,
-	/* Range 0x7420 - 0x7436, array index: 0x2516 */
-	0xDAA9,0xDAA2,0xB55A,0xDAA6,0xDAA5,0xB55B,0xB561,INVALC,
-	0xB562,0xDAA8,0xB558,0xDA7D,0xDA7B,0xDAA3,0xDA7A,0xB55F,
-	0xDA7C,0xDAA4,0xDAAA,0xB559,0xB55E,0xB55C,0xB55D,
-	/* Range 0x743F - 0x7446, array index: 0x252D */
-	0xB7E9,0xDEB7,0xB7E8,0xDEBB,INVALC,0xDEB1,INVALC,0xDEBC,
-	/* Range 0x744A - 0x7464, array index: 0x2535 */
-	0xDEB2,0xDEB3,INVALC,0xDEBD,0xDEBA,0xDEB8,0xDEB9,0xDEB5,
-	0xDEB4,INVALC,0xDEBE,0xB7E5,INVALC,0xDEB6,INVALC,0xB7EA,
-	0xB7E4,0xB7EB,0xB7EC,INVALC,0xB7E7,0xB7E6,INVALC,INVALC,
-	0xE2CE,0xBABE,0xBABD,
-	/* Range 0x7469 - 0x7475, array index: 0x2550 */
-	0xBCFC,0xBABF,INVALC,INVALC,0xBAC1,0xE2D4,0xB7E3,0xBAC0,
-	0xE2D0,0xE2D2,0xE2CF,INVALC,0xE2D1,
-	/* Range 0x747C - 0x748B, array index: 0x255D */
-	0xE6AA,0xE6A7,0xBD40,0xEA62,0xBD41,0xE6A6,INVALC,0xBCFE,
-	INVALC,0xE6A8,0xE6A5,0xE6A2,0xE6A9,0xE6A3,0xE6A4,0xBCFD,
-	/* Range 0x7494 - 0x74C5, array index: 0x256D */
-	0xEA65,0xEA67,INVALC,0xED66,0xBF5A,INVALC,0xEA63,INVALC,
-	0xBF58,INVALC,0xBF5C,0xBF5B,0xEA64,0xEA68,INVALC,0xBF59,
-	INVALC,0xED6D,0xC0F5,0xC27A,0xC0F6,0xC0F3,0xED6A,0xED68,
-	INVALC,0xED6B,INVALC,0xED6E,0xC0F4,0xED6C,0xED67,INVALC,
-	INVALC,0xF042,0xF045,0xF275,0xF040,INVALC,0xF46F,0xF046,
-	INVALC,0xC3A2,0xF044,0xC27B,0xF041,0xF043,0xF047,0xF276,
-	INVALC,0xF274,
-	/* Range 0x74D4 - 0x74E9, array index: 0x259F */
-	0xC4ED,0xF6F1,0xC4EC,0xF6F3,0xF6F0,0xF6F2,0xC5D0,0xF8B2,
-	0xA5CA,0xCD6E,0xD2BC,0xD2BD,0xB27D,0xDEBF,0xBF5D,0xC3A4,
-	0xC57B,0xF8B3,0xA5CB,INVALC,0xCD6F,0xA260,
-	/* Range 0x74F4 - 0x74F7, array index: 0x25B5 */
-	0xD2BE,0xD2BF,0xB27E,0xB2A1,
-	/* Range 0x74FB - 0x7540, array index: 0x25B9 */
-	0xDAAB,INVALC,0xDEC2,0xDEC1,0xDEC0,0xE2D5,INVALC,0xE2D6,
-	0xE2D7,0xBAC2,INVALC,INVALC,0xE6AD,0xE6AC,INVALC,INVALC,
-	0xEA69,0xBF5E,0xBF5F,INVALC,0xED72,0xED6F,0xED70,0xED71,
-	0xF049,0xF048,0xC27C,0xF277,0xF5DE,0xA5CC,INVALC,0xACC6,
-	INVALC,0xB2A2,0xDEC3,INVALC,0xA5CD,INVALC,0xD2C0,0xB2A3,
-	INVALC,INVALC,0xB563,0xB564,INVALC,0xA5CE,0xA5CF,0xCA46,
-	0xA86A,0xA869,0xACC7,0xCFD9,0xDAAC,0xA5D0,0xA5D1,0xA5D2,
-	0xA5D3,INVALC,INVALC,INVALC,0xA86B,0xA86C,0xCB6E,0xCB6D,
-	INVALC,INVALC,0xAAB6,0xCD72,0xCD70,0xCD71,
-	/* Range 0x754B - 0x754F, array index: 0x25FF */
-	0xACCB,0xACC9,INVALC,0xACCA,0xACC8,
-	/* Range 0x7559 - 0x7570, array index: 0x2604 */
-	0xAF64,0xAF63,0xD2C1,0xAF62,0xAF61,INVALC,0xD2C2,INVALC,
-	INVALC,0xB2A6,0xD67B,0xD67A,0xB2A4,0xB2A5,INVALC,INVALC,
-	INVALC,0xB566,0xB565,0xDAAE,INVALC,INVALC,0xDAAD,0xB2A7,
-	/* Range 0x7576 - 0x7580, array index: 0x261C */
-	0xB7ED,0xDEC5,0xB7EE,0xDEC4,INVALC,INVALC,INVALC,0xE2D8,
-	0xE6AE,0xBD42,0xEA6A,
-	/* Range 0x7586 - 0x759A, array index: 0x2627 */
-	0xC3A6,0xC3A5,INVALC,INVALC,0xC57C,0xA5D4,0xCD73,INVALC,
-	INVALC,0xB2A8,0xE2D9,0xBAC3,INVALC,INVALC,0xCB6F,0xCB70,
-	INVALC,INVALC,0xCD74,0xAAB8,0xAAB9,
-	/* Range 0x75A2 - 0x75AB, array index: 0x263C */
-	0xACCF,0xACD0,0xACCD,0xACCE,INVALC,0xCFDC,INVALC,INVALC,
-	0xCFDD,0xACCC,
-	/* Range 0x75B2 - 0x75E7, array index: 0x2646 */
-	0xAF68,0xAF69,INVALC,0xB2AB,0xD2C9,INVALC,0xAF6E,0xAF6C,
-	0xD2CA,0xD2C5,0xAF6B,0xAF6A,0xAF65,0xD2C8,0xD2C7,0xD2C4,
-	0xAF6D,INVALC,0xD2C6,0xAF66,INVALC,0xAF67,INVALC,INVALC,
-	0xB2AC,0xD6A1,0xD6A2,0xB2AD,0xD67C,0xD67E,0xD6A4,0xD6A3,
-	0xD67D,INVALC,0xB2A9,0xB2AA,INVALC,0xDAB6,0xB56B,0xB56A,
-	0xDAB0,0xB568,INVALC,0xDAB3,0xB56C,0xDAB4,0xB56D,0xDAB1,
-	0xB567,0xB569,0xDAB5,INVALC,0xDAB2,0xDAAF,
-	/* Range 0x75ED - 0x7603, array index: 0x267C */
-	0xDED2,INVALC,0xDEC7,0xB7F0,0xB7F3,0xB7F2,0xB7F7,0xB7F6,
-	0xDED3,0xDED1,0xDECA,0xDECE,0xDECD,0xB7F4,0xDED0,0xDECC,
-	0xDED4,0xDECB,0xB7F5,0xB7EF,0xB7F1,INVALC,0xDEC9,
-	/* Range 0x7608 - 0x7629, array index: 0x2693 */
-	0xE2DB,0xBAC7,0xE2DF,0xBAC6,0xE2DC,0xBAC5,INVALC,0xDEC8,
-	0xDECF,0xE2DE,INVALC,0xBAC8,0xE2E0,0xE2DD,0xE2DA,INVALC,
-	INVALC,0xE6B1,0xE6B5,0xE6B7,0xE6B3,0xE6B2,0xE6B0,0xBD45,
-	0xBD43,0xBD48,0xBD49,0xE6B4,0xBD46,0xE6AF,0xBD47,0xBAC4,
-	0xE6B6,0xBD44,
-	/* Range 0x762D - 0x7635, array index: 0x26B5 */
-	0xEA6C,INVALC,0xEA6B,0xEA73,0xEA6D,0xEA72,0xEA6F,0xBF60,
-	0xEA71,
-	/* Range 0x7642 - 0x7649, array index: 0x26BE */
-	0xC0F8,0xED74,INVALC,INVALC,0xC0F7,0xED77,0xED75,0xED76,
-	/* Range 0x7652 - 0x7665, array index: 0x26C6 */
-	0xC2A1,0xF04E,INVALC,INVALC,0xC27D,0xF04F,0xC27E,0xF04C,
-	0xF050,INVALC,0xF04A,INVALC,INVALC,0xC3A7,0xF278,0xC3A8,
-	0xC46F,INVALC,0xF04B,0xC470,
-	/* Range 0x7669 - 0x7672, array index: 0x26DA */
-	0xC4EE,0xF5DF,INVALC,0xC57E,0xF6F4,0xC57D,INVALC,0xF7EA,
-	0xC5F5,0xC5F6,
-	/* Range 0x7678 - 0x769E, array index: 0x26E4 */
-	0xACD1,0xCFDE,INVALC,0xB56E,0xB56F,0xA5D5,0xA6CA,0xCA47,
-	INVALC,0xCB71,0xA86D,INVALC,0xAABA,INVALC,0xACD2,0xACD3,
-	0xACD4,0xD6A6,0xD2CB,0xAF6F,INVALC,INVALC,0xB2AE,0xD6A5,
-	INVALC,INVALC,0xDAB8,0xB571,INVALC,0xDAB7,0xB570,INVALC,
-	INVALC,0xDED5,0xBD4A,0xE6BB,0xE6B8,0xE6B9,0xE6BA,
-	/* Range 0x76AA - 0x76B0, array index: 0x270B */
-	0xF471,0xF470,INVALC,0xF6F5,0xA5D6,0xCD75,0xAF70,
-	/* Range 0x76BA - 0x76D4, array index: 0x2712 */
-	0xBD4B,0xEA74,INVALC,0xF052,0xF472,0xA5D7,INVALC,INVALC,
-	0xAABB,0xACD7,0xCFDF,0xACD8,0xACD6,INVALC,0xACD5,0xD2CC,
-	0xAF71,INVALC,INVALC,0xAF72,0xAF73,INVALC,INVALC,INVALC,
-	0xB2B0,0xD6A7,0xB2AF,
-	/* Range 0x76DA - 0x76FE, array index: 0x272D */
-	0xDAB9,0xB2B1,0xB573,0xDED7,0xB7F8,0xB7F9,INVALC,0xBAC9,
-	INVALC,0xBACA,0xBD4C,0xBF64,0xEA75,0xBF63,INVALC,0xED79,
-	0xC0FA,INVALC,0xF053,0xF473,0xA5D8,0xA86E,0xCD78,0xCD77,
-	0xAABC,0xCD76,0xAABD,0xCD79,INVALC,0xCFE5,0xACDB,0xACDA,
-	0xCFE7,0xCFE6,0xACDF,INVALC,0xACDE,
-	/* Range 0x7701 - 0x770B, array index: 0x2752 */
-	0xACD9,INVALC,0xCFE1,0xCFE2,0xCFE3,INVALC,0xACE0,0xCFE0,
-	0xACDC,0xCFE4,0xACDD,
-	/* Range 0x7710 - 0x7729, array index: 0x275D */
-	0xD2CF,0xD2D3,0xD2D1,0xD2D0,INVALC,0xD2D4,INVALC,INVALC,
-	INVALC,0xD2D5,0xD2D6,0xD2CE,INVALC,0xD2CD,INVALC,0xAF75,
-	0xAF76,INVALC,0xD2D7,0xD2D2,INVALC,0xD6B0,INVALC,0xD2D8,
-	0xAF77,0xAF74,
-	/* Range 0x772F - 0x773E, array index: 0x2777 */
-	0xD6A9,INVALC,0xD6AB,0xD6AC,0xD6AE,0xD6AD,0xD6B2,0xB2B5,
-	0xB2B2,0xB2B6,0xD6A8,0xB2B7,0xD6B1,0xB2B4,0xD6AF,0xB2B3,
-	/* Range 0x7744 - 0x774F, array index: 0x2787 */
-	0xDABC,0xDABE,0xDABA,0xDABB,INVALC,INVALC,0xDABF,0xDAC1,
-	0xDAC2,0xDABD,0xDAC0,0xB574,
-	/* Range 0x7752 - 0x776F, array index: 0x2793 */
-	0xDEDB,INVALC,0xDEE0,0xDED8,0xDEDC,INVALC,INVALC,0xDEE1,
-	0xDEDD,0xB7FA,0xB843,INVALC,0xB7FD,0xDED9,0xDEDA,0xBACE,
-	0xB846,0xB7FE,INVALC,0xB844,0xB7FC,0xDEDF,0xB845,0xDEDE,
-	0xB841,0xB7FB,0xB842,0xDEE2,0xE2E6,0xE2E8,
-	/* Range 0x777C - 0x7791, array index: 0x27B1 */
-	0xE2E3,0xBACC,0xE2E9,0xBACD,0xE2E7,0xE2E2,0xE2E5,0xE2EA,
-	0xBACB,0xE2E4,INVALC,0xBD4E,0xE6BF,0xE6BE,INVALC,0xBD51,
-	0xBD4F,0xE6BC,0xBD4D,0xE6BD,INVALC,0xBD50,
-	/* Range 0x7797 - 0x77BF, array index: 0x27C7 */
-	0xEAA1,INVALC,0xEA7E,0xEA76,0xEA7A,0xEA79,0xEA77,0xBF66,
-	0xBF67,0xBF65,0xEA78,0xEA7B,0xEA7C,INVALC,0xBF68,INVALC,
-	0xC140,0xEDA3,INVALC,0xC0FC,0xED7B,0xC0FE,0xC141,INVALC,
-	INVALC,0xC0FD,0xEDA2,0xED7C,0xC0FB,0xEDA1,0xED7A,0xED7E,
-	0xED7D,INVALC,INVALC,0xF055,0xC2A4,0xC2A5,0xC2A2,INVALC,
-	0xC2A3,
-	/* Range 0x77C9 - 0x77FD, array index: 0x27F0 */
-	0xF279,0xF27A,INVALC,0xF474,0xF477,0xF475,0xF476,0xF5E0,
-	INVALC,INVALC,0xC4EF,0xF7EB,0xF8B4,INVALC,0xC5F7,0xF8F8,
-	0xF8F9,0xC666,0xA5D9,0xACE1,INVALC,0xDAC3,INVALC,0xDEE3,
-	INVALC,0xA5DA,0xA86F,INVALC,0xAABE,INVALC,0xCFE8,0xCFE9,
-	0xAF78,INVALC,INVALC,0xDAC4,0xB575,0xB847,0xC142,0xEDA4,
-	0xF27C,0xF478,0xA5DB,INVALC,INVALC,INVALC,0xCDA1,0xCD7A,
-	0xCD7C,0xCD7E,0xCD7D,0xCD7B,0xAABF,
-	/* Range 0x7802 - 0x7806, array index: 0x2825 */
-	0xACE2,0xCFF2,INVALC,0xCFED,0xCFEA,
-	/* Range 0x780C - 0x7814, array index: 0x282A */
-	0xACE4,0xACE5,0xCFF0,0xCFEF,0xCFEE,0xCFEB,0xCFEC,0xCFF3,
-	0xACE3,
-	/* Range 0x781D - 0x7838, array index: 0x2833 */
-	0xAF7C,INVALC,0xAFA4,0xAFA3,0xD2E1,0xD2DB,0xD2D9,INVALC,
-	0xAFA1,0xD6B9,0xAF7A,0xD2DE,0xD2E2,0xD2E4,0xD2E0,0xD2DA,
-	0xAFA2,0xD2DF,0xD2DD,0xAF79,0xD2E5,0xAFA5,0xD2E3,0xAF7D,
-	0xD2DC,INVALC,0xAF7E,0xAF7B,
-	/* Range 0x7848 - 0x7852, array index: 0x284F */
-	0xD6B3,0xD6B5,0xD6B7,INVALC,0xD6B8,0xD6B6,0xB2BA,INVALC,
-	0xD6BB,INVALC,0xD6B4,
-	/* Range 0x785C - 0x7871, array index: 0x285A */
-	0xDAC8,0xB576,0xDAD0,INVALC,0xDAC5,INVALC,0xDAD1,INVALC,
-	0xDAC6,0xDAC7,INVALC,INVALC,0xDACF,0xDACE,0xDACB,0xB2B8,
-	0xB577,0xDAC9,0xDACC,0xB578,0xDACD,0xDACA,
-	/* Range 0x787B - 0x7889, array index: 0x2870 */
-	0xDEF2,0xB84E,INVALC,0xE2F0,0xB851,0xDEF0,INVALC,INVALC,
-	0xDEED,0xDEE8,0xDEEA,0xDEEB,0xDEE4,INVALC,0xB84D,
-	/* Range 0x7891 - 0x78AD, array index: 0x287F */
-	0xB84F,INVALC,0xB850,0xDEE6,0xDEE9,0xDEF1,0xB84A,0xB84B,
-	0xDEEF,0xDEE5,INVALC,INVALC,INVALC,0xE2F2,0xBAD0,0xE2F4,
-	0xDEEC,0xE2F6,0xBAD4,0xE2F7,0xE2F3,INVALC,0xBAD1,0xE2EF,
-	0xBAD3,0xE2EC,0xE2F1,0xE2F5,0xE2EE,
-	/* Range 0x78B0 - 0x78B4, array index: 0x289C */
-	0xB849,INVALC,0xE2EB,0xBAD2,0xE2ED,
-	/* Range 0x78BA - 0x78BE, array index: 0x28A1 */
-	0xBD54,0xE6C1,0xBD58,INVALC,0xBD56,
-	/* Range 0x78C1 - 0x78D5, array index: 0x28A6 */
-	0xBACF,INVALC,0xE6C8,0xE6C9,0xBD53,INVALC,INVALC,0xE6C7,
-	0xE6CA,0xBD55,0xBD52,0xE6C3,0xE6C0,0xE6C5,0xE6C2,0xBD59,
-	0xE6C4,INVALC,INVALC,0xE6C6,0xBD57,
-	/* Range 0x78DA - 0x78F4, array index: 0x28BB */
-	0xBF6A,0xEAA8,INVALC,0xEAA2,0xEAA6,0xEAAC,0xEAAD,0xEAA9,
-	0xEAAA,0xEAA7,INVALC,0xEAA4,INVALC,0xBF6C,0xBF69,0xEAA3,
-	0xEAA5,INVALC,0xBF6B,0xEAAB,INVALC,0xC146,INVALC,INVALC,
-	0xEDAA,0xEDA5,0xC145,
-	/* Range 0x78F7 - 0x7905, array index: 0x28D6 */
-	0xC143,INVALC,0xEDAC,0xC144,0xEDA8,0xEDA9,0xEDA6,0xEDAD,
-	0xF056,INVALC,0xC147,0xEDA7,INVALC,0xEDAE,0xEDAB,
-	/* Range 0x790E - 0x7914, array index: 0x28E5 */
-	0xC2A6,INVALC,0xF05B,0xF05D,0xF05C,0xF058,0xF059,
-	/* Range 0x7919 - 0x791E, array index: 0x28EC */
-	0xC3AA,INVALC,0xF27E,0xF2A2,0xF27D,0xF2A4,
-	/* Range 0x7921 - 0x7931, array index: 0x28F2 */
-	0xF2A1,INVALC,0xF47A,0xF47D,0xF479,0xC471,0xF47B,0xF47C,
-	0xF47E,0xC472,0xC474,0xC473,0xF5E1,INVALC,0xF5E3,INVALC,
-	0xF5E2,
-	/* Range 0x7938 - 0x796D, array index: 0x2903 */
-	0xF8B5,0xF8FA,0xA5DC,INVALC,INVALC,0xCB72,0xAAC0,0xCDA3,
-	0xAAC1,0xAAC2,0xCDA2,INVALC,0xCFF8,0xCFF7,0xACE6,0xACE9,
-	0xACE8,0xACE7,0xCFF4,0xCFF6,0xCFF5,INVALC,INVALC,0xD2E8,
-	0xAFA7,0xD2EC,0xD2EB,0xD2EA,0xD2E6,0xAFA6,0xAFAA,0xAFAD,
-	INVALC,INVALC,0xAFAE,0xD2E7,0xD2E9,0xAFAC,0xAFAB,0xAFA9,
-	0xAFA8,0xD6C2,INVALC,0xD6C0,0xD6BC,0xB2BB,INVALC,0xD6BD,
-	0xB2BC,0xD6BE,0xD6BF,0xD6C1,INVALC,0xB2BD,
-	/* Range 0x7970 - 0x7974, array index: 0x2939 */
-	0xDAD5,INVALC,0xDAD4,0xDAD3,0xDAD2,
-	/* Range 0x7979 - 0x7982, array index: 0x293E */
-	0xDEF6,0xB852,INVALC,0xDEF3,0xDEF5,INVALC,0xB853,INVALC,
-	0xB854,0xDEF4,
-	/* Range 0x798A - 0x79C1, array index: 0x2948 */
-	0xE2F9,0xE2FA,INVALC,0xBAD7,0xBAD5,0xBAD6,0xE343,INVALC,
-	0xE342,0xE2FE,0xE2FD,0xE2FC,0xE2FB,0xE340,0xE2F8,INVALC,
-	0xE6CB,0xE6D0,0xE6CE,INVALC,INVALC,INVALC,0xE6CD,0xE6CC,
-	0xE6CF,INVALC,0xEAAE,INVALC,0xBF6D,0xC148,0xEDB0,INVALC,
-	0xC149,0xEDAF,0xF05F,0xF05E,0xC2A7,INVALC,0xF2A5,0xC3AB,
-	0xF4A1,0xC5A1,0xF6F7,INVALC,0xF8B7,0xF8B6,0xC9A8,0xACEA,
-	0xACEB,0xD6C3,INVALC,0xB856,0xA5DD,0xA872,0xA871,0xA870,
-	/* Range 0x79CB - 0x79EE, array index: 0x2980 */
-	0xACEE,INVALC,0xCFFA,0xCFFD,0xCFFB,INVALC,0xACEC,0xACED,
-	INVALC,INVALC,0xCFF9,0xCFFC,INVALC,0xAFB5,INVALC,INVALC,
-	INVALC,0xD2F3,0xD2F5,0xD2F4,0xAFB2,0xD2EF,INVALC,INVALC,
-	0xAFB0,0xAFAF,INVALC,0xAFB3,0xAFB1,INVALC,0xAFB4,0xD2F2,
-	0xD2ED,0xD2EE,0xD2F1,0xD2F0,
-	/* Range 0x79F6 - 0x79FB, array index: 0x29A4 */
-	0xD6C6,0xD6C7,0xD6C5,INVALC,0xD6C4,0xB2BE,
-	/* Range 0x7A00 - 0x7A05, array index: 0x29AA */
-	0xB57D,INVALC,0xDAD6,0xDAD8,0xDADA,0xB57C,
-	/* Range 0x7A08 - 0x7A22, array index: 0x29B0 */
-	0xB57A,INVALC,0xDAD7,0xB57B,0xDAD9,0xB579,INVALC,INVALC,
-	0xDF41,0xDEF7,0xDEFA,0xDEFE,0xB85A,0xDEFC,INVALC,0xDEFB,
-	0xDEF8,0xDEF9,0xB858,0xDF40,0xB857,INVALC,0xB85C,0xB85B,
-	0xB859,INVALC,0xDEFD,
-	/* Range 0x7A2E - 0x7A31, array index: 0x29CB */
-	0xBAD8,0xE347,0xE346,0xBAD9,
-	/* Range 0x7A39 - 0x7A40, array index: 0x29CF */
-	0xE6D2,INVALC,0xBD5F,0xBD5B,0xBD5D,INVALC,0xBD5A,0xBD5C,
-	/* Range 0x7A44 - 0x7A4E, array index: 0x29D7 */
-	0xEAAF,INVALC,0xBF70,0xEAB1,0xEAB0,INVALC,0xE345,0xBF72,
-	0xBF71,0xBF6E,0xBF6F,
-	/* Range 0x7A54 - 0x7A62, array index: 0x29E2 */
-	0xEDB5,INVALC,0xEDB3,0xC14A,0xEDB4,INVALC,0xEDB6,0xEDB2,
-	0xEDB1,INVALC,INVALC,0xF060,0xC2AA,0xC2A8,0xC2A9,
-	/* Range 0x7A67 - 0x7A99, array index: 0x29F1 */
-	0xF2A6,0xF2A7,0xC3AD,INVALC,0xC3AC,0xF4A3,0xF4A4,0xF4A2,
-	INVALC,0xF6F8,0xF6F9,INVALC,INVALC,0xA5DE,0xCA48,0xA873,
-	INVALC,0xCDA5,0xAAC6,0xAAC5,0xCDA6,INVALC,INVALC,0xD040,
-	0xACEF,0xCFFE,0xACF0,INVALC,INVALC,0xAFB6,0xD2F8,0xD2F6,
-	0xD2FC,0xAFB7,0xD2F7,0xD2FB,0xD2F9,0xD2FA,INVALC,INVALC,
-	0xD6C8,0xD6CA,INVALC,0xB2BF,INVALC,0xD6C9,0xB2C0,0xB5A2,
-	0xB5A1,0xB57E,0xDADB,
-	/* Range 0x7A9E - 0x7AA3, array index: 0x2A24 */
-	0xDF44,0xB85D,0xB85E,INVALC,0xDF43,0xDF42,
-	/* Range 0x7AA8 - 0x7ACB, array index: 0x2A2A */
-	0xE34A,0xBADB,0xBADA,0xE34B,0xE34C,INVALC,0xBD61,0xBD60,
-	INVALC,0xEAB5,0xE6D3,0xE6D5,0xE6D4,0xEAB4,0xEAB2,0xEAB6,
-	0xEAB3,INVALC,0xBF73,INVALC,INVALC,INVALC,0xEDB7,0xC14B,
-	0xEDB8,0xEDB9,INVALC,INVALC,0xC2AB,0xC2AC,INVALC,0xC475,
-	INVALC,INVALC,0xC5D1,0xA5DF,
-	/* Range 0x7ADF - 0x7AE6, array index: 0x2A4E */
-	0xB3BA,0xB3B9,INVALC,INVALC,0xB5A4,0xDADD,0xB5A3,0xDADC,
-	/* Range 0x7AEB - 0x7AEF, array index: 0x2A56 */
-	0xDF45,INVALC,0xBADC,0xE34D,0xBADD,
-	/* Range 0x7AF6 - 0x7B13, array index: 0x2A5B */
-	0xC476,0xF4A5,INVALC,0xA6CB,0xAAC7,0xCDA7,INVALC,0xACF2,
-	INVALC,0xACF1,0xD042,0xD043,INVALC,INVALC,0xD340,0xD342,
-	0xAFB9,INVALC,0xD344,0xD347,0xD345,INVALC,INVALC,INVALC,
-	0xD346,0xD343,0xD2FE,0xAFBA,0xD348,0xD341,
-	/* Range 0x7B18 - 0x7B35, array index: 0x2A79 */
-	0xD6D3,0xB2C6,0xD6DC,0xB2C3,INVALC,0xD6D5,0xB2C7,INVALC,
-	0xB2C1,INVALC,0xD6D0,0xD6DD,0xD6D1,0xD6CE,0xB2C5,INVALC,
-	0xB2C2,INVALC,0xD6D4,0xD6D7,0xB2C4,0xD6D8,0xB2C8,0xD6D9,
-	0xD6CF,0xD6D6,0xD6DA,0xD6D2,0xD6CD,0xD6CB,
-	/* Range 0x7B44 - 0x7B58, array index: 0x2A97 */
-	0xDAE0,0xDAE6,0xB5A7,0xD6CC,0xDAE1,0xB5A5,0xDADE,0xB5AC,
-	0xDAE2,0xB5AB,0xDAE3,0xB5AD,0xB5A8,0xB5AE,0xB5A9,INVALC,
-	0xB5AA,INVALC,0xB5A6,INVALC,0xDAE5,
-	/* Range 0x7B60 - 0x7B69, array index: 0x2AAC */
-	0xB861,0xDF50,INVALC,0xDF53,0xDF47,0xDF4C,0xDF46,0xB863,
-	INVALC,0xDF4A,
-	/* Range 0x7B6D - 0x7B78, array index: 0x2AB6 */
-	0xDF48,0xB862,INVALC,0xDF4F,0xDF4E,0xDF4B,0xDF4D,0xDF49,
-	0xBAE1,0xDF52,0xB85F,0xDF51,
-	/* Range 0x7B84 - 0x7BA1, array index: 0x2AC2 */
-	0xBAE8,0xE358,INVALC,0xBAE7,0xE34E,INVALC,0xE350,0xBAE0,
-	0xE355,0xE354,0xE357,0xBAE5,0xE352,0xE351,INVALC,INVALC,
-	0xBAE4,0xBADF,0xE353,0xBAE2,0xE359,0xE35B,INVALC,0xE356,
-	0xE34F,0xBAE3,INVALC,INVALC,0xBD69,0xBADE,
-	/* Range 0x7BB4 - 0x7BB9, array index: 0x2AE0 */
-	0xBD65,0xE6DE,INVALC,0xE6D6,0xBAE6,0xE6DC,
-	/* Range 0x7BC6 - 0x7BCE, array index: 0x2AE6 */
-	0xBD66,0xBD67,INVALC,0xBF76,0xE6DD,0xE6D7,0xBD6A,INVALC,
-	0xE6DA,
-	/* Range 0x7BD4 - 0x7BEB, array index: 0x2AEF */
-	0xEAC0,0xEABB,INVALC,INVALC,0xEAC5,0xBF74,0xEABD,0xBF78,
-	0xEAC3,0xEABA,0xEAB7,0xEAC6,0xC151,0xBF79,0xEAC2,0xEAB8,
-	0xBF77,0xEABC,0xBF7B,0xEAB9,0xEABE,0xBF7A,0xEAC1,0xEAC4,
-	/* Range 0x7BF0 - 0x7C11, array index: 0x2B07 */
-	0xEDCB,0xEDCC,0xEDBC,0xEDC3,0xEDC1,INVALC,INVALC,0xC14F,
-	0xEDC8,0xEABF,INVALC,0xEDBF,INVALC,0xEDC9,0xC14E,0xEDBE,
-	0xEDBD,0xEDC7,0xEDC4,0xEDC6,INVALC,0xEDBA,0xEDCA,0xC14C,
-	INVALC,0xEDC5,0xEDCE,0xEDC2,0xC150,0xC14D,0xEDC0,0xEDBB,
-	0xEDCD,0xBF75,
-	/* Range 0x7C1C - 0x7C2D, array index: 0x2B29 */
-	0xF061,0xF067,0xC2B0,0xF065,0xF064,0xC2B2,0xF06A,0xC2B1,
-	INVALC,0xF06B,0xF068,0xC2AE,0xF069,0xF062,0xC2AF,0xC2AD,
-	0xF2AB,0xF066,
-	/* Range 0x7C37 - 0x7C40, array index: 0x2B3B */
-	0xC3B2,0xC3B0,0xF2AA,INVALC,0xF2AC,0xF2A9,0xC3B1,0xC3AE,
-	0xC3AF,0xC3B3,
-	/* Range 0x7C45 - 0x7C4D, array index: 0x2B45 */
-	0xF4AA,INVALC,0xF4A9,0xF4A7,0xF4A6,0xF4A8,INVALC,0xC477,
-	0xC479,
-	/* Range 0x7C57 - 0x7C7A, array index: 0x2B4E */
-	0xF6FA,INVALC,0xF6FC,0xF6FE,0xF6FD,0xF6FB,INVALC,INVALC,
-	0xC5A3,0xC5A2,INVALC,INVALC,0xC5D3,0xC5D2,0xC5D4,0xF7ED,
-	0xF7EC,INVALC,0xF8FB,0xF8B8,0xF8FC,0xC658,INVALC,0xC659,
-	0xF96D,INVALC,INVALC,0xC67E,0xA6CC,INVALC,0xCDA8,INVALC,
-	INVALC,0xD045,0xD046,0xD044,
-	/* Range 0x7C7D - 0x7C8D, array index: 0x2B72 */
-	0xACF3,INVALC,0xD047,0xD048,0xD049,INVALC,INVALC,0xD349,
-	0xD34F,INVALC,INVALC,0xD34D,0xAFBB,0xD34B,INVALC,0xD34C,
-	0xD34E,
-	/* Range 0x7C91 - 0x7C98, array index: 0x2B83 */
-	0xD34A,0xB2C9,INVALC,0xD6DE,0xB2CB,0xD6E0,0xB2CA,0xD6DF,
-	/* Range 0x7C9E - 0x7CA5, array index: 0x2B8B */
-	0xDAE8,0xB5AF,INVALC,0xDAEA,0xDAE7,0xD6E1,INVALC,0xB5B0,
-	/* Range 0x7CAF - 0x7CBF, array index: 0x2B93 */
-	0xDF56,INVALC,0xB864,0xDF54,0xB865,0xDF55,0xB866,INVALC,
-	INVALC,INVALC,0xBAE9,0xE361,0xE35E,0xE360,0xBAEA,0xBAEB,
-	0xE35F,
-	/* Range 0x7CC8 - 0x7CE2, array index: 0x2BA4 */
-	0xE6E0,INVALC,0xBD6B,0xE6E2,0xE6E1,INVALC,0xA261,INVALC,
-	0xEACA,0xEACB,0xEAC7,INVALC,0xEAC8,0xBF7C,0xBF7D,0xEAC9,
-	INVALC,0xC157,INVALC,INVALC,0xC153,0xC158,0xC154,0xC156,
-	0xC152,INVALC,0xC155,
-	/* Range 0x7CEC - 0x7CF8, array index: 0x2BBF */
-	0xF2AD,INVALC,0xF4AB,0xC47A,0xC47B,0xF741,0xF5E6,INVALC,
-	0xF740,INVALC,0xF8FD,0xF9A4,0xA6CD,
-	/* Range 0x7CFD - 0x7D22, array index: 0x2BCC */
-	0xCDA9,0xAAC8,INVALC,0xACF6,0xD04C,0xACF4,0xD04A,0xACF9,
-	0xACF5,0xACFA,0xACF8,0xD04B,0xACF7,0xAFBF,0xAFBE,0xD35A,
-	0xAFC7,0xD353,0xD359,0xAFC3,0xD352,0xD358,0xD356,0xAFC2,
-	0xAFC4,0xD355,0xAFBD,0xD354,0xAFC8,0xAFC5,0xAFC9,0xAFC6,
-	0xD351,0xD350,0xD357,0xAFC0,0xAFBC,0xAFC1,
-	/* Range 0x7D28 - 0x7D47, array index: 0x2BF2 */
-	0xD6F0,0xD6E9,INVALC,0xB5B5,0xD6E8,INVALC,0xB2CF,0xB2D6,
-	0xB2D3,0xB2D9,0xB2D8,0xB2D4,INVALC,0xD6E2,0xD6E5,INVALC,
-	0xD6E4,0xB2D0,0xD6E6,0xD6EF,0xB2D1,0xD6E3,0xD6EC,0xD6ED,
-	0xB2D2,0xD6EA,0xB2D7,0xB2CD,0xB2D5,0xD6E7,0xB2CC,0xD6EB,
-	/* Range 0x7D4E - 0x7D73, array index: 0x2C12 */
-	0xDAFB,0xDAF2,0xB5B2,0xDAF9,0xDAF6,0xDAEE,0xDAF7,0xB5B4,
-	0xDAEF,INVALC,0xDAEB,INVALC,INVALC,0xB86C,0xDAF4,INVALC,
-	0xB5B1,0xDAFA,INVALC,0xB5B8,0xB5BA,0xDAED,INVALC,INVALC,
-	0xB5B9,0xDAF0,0xB5B3,0xDAF8,0xDAF1,0xDAF5,INVALC,0xDAF3,
-	0xB5B6,0xDAEC,0xB5BB,0xB2CE,0xB5B7,0xB5BC,
-	/* Range 0x7D79 - 0x7D96, array index: 0x2C38 */
-	0xB868,0xDF5D,0xDF5F,0xDF61,0xDF65,INVALC,0xDF5B,0xDF59,
-	0xB86A,INVALC,0xDF60,0xDF64,0xDF5C,0xDF58,INVALC,0xDF57,
-	INVALC,INVALC,INVALC,0xDF62,0xDF5A,0xDF5E,0xB86B,INVALC,
-	0xB869,0xDF66,0xB867,0xDF63,INVALC,0xE372,
-	/* Range 0x7D9C - 0x7DCE, array index: 0x2C56 */
-	0xBAEE,0xE36A,0xBD78,0xE374,0xBAF1,0xE378,0xBAF7,0xE365,
-	INVALC,INVALC,0xE375,0xE362,INVALC,0xE377,0xE366,INVALC,
-	0xBAFE,0xBAFB,0xE376,0xE370,0xBAED,0xBAF5,0xBAF4,INVALC,
-	0xBAF3,0xBAF9,INVALC,0xE363,0xBAFA,0xE371,0xBAF6,0xBAEC,
-	0xE373,0xBAEF,0xBAF0,0xBAF8,0xE368,0xE367,0xE364,INVALC,
-	0xE36C,0xE369,0xE36D,0xBAFD,INVALC,0xE379,0xBAF2,0xE36E,
-	0xE36F,INVALC,0xE36B,
-	/* Range 0x7DD7 - 0x7DFB, array index: 0x2C89 */
-	0xE6E7,0xBD70,0xBD79,0xBD75,0xE6E4,INVALC,0xBD72,0xBD76,
-	0xE6F0,0xBD6C,0xE6E8,INVALC,0xBD74,INVALC,INVALC,0xE6EB,
-	0xE6E6,0xBD73,0xBD77,0xE6E5,INVALC,0xBD71,INVALC,0xE6EF,
-	0xBD6E,0xE6EE,0xE6ED,0xBD7A,0xE572,0xBD6D,INVALC,0xE6EC,
-	0xE6E3,INVALC,0xBD7B,0xE6EA,0xBD6F,
-	/* Range 0x7E08 - 0x7E49, array index: 0x2CAE */
-	0xBFA2,0xBFA7,0xBF7E,0xEAD8,0xEACF,0xEADB,0xEAD3,0xEAD9,
-	0xBFA8,0xBFA1,0xEACC,0xEAD2,0xEADC,0xEAD5,0xEADA,0xEACE,
-	INVALC,INVALC,0xEAD6,0xBFA3,0xEAD4,0xBFA6,0xBFA5,0xEAD0,
-	0xEAD1,0xEACD,0xEAD7,0xBFA4,0xEADE,0xEADD,INVALC,INVALC,
-	INVALC,0xEDDA,0xEDD6,0xC15F,INVALC,0xEDD0,0xC159,0xC169,
-	0xEDDC,0xC161,0xC15D,0xEDD3,0xC164,0xC167,0xEDDE,0xC15C,
-	0xEDD5,0xC165,0xEDE0,0xEDDD,0xEDD1,0xC160,0xC15A,0xC168,
-	0xEDD8,0xC163,0xEDD2,0xC15E,0xEDDF,0xC162,0xC15B,0xEDD9,
-	0xC166,0xEDD7,
-	/* Range 0x7E50 - 0x7E63, array index: 0x2CF0 */
-	0xF06E,0xF074,0xC2B9,0xF077,0xC2B4,0xC2B5,0xF06F,0xF076,
-	0xF071,0xC2BA,0xC2B7,INVALC,0xF06D,INVALC,0xC2B6,0xF073,
-	0xF075,0xC2B8,0xF072,0xF070,
-	/* Range 0x7E68 - 0x7E9C, array index: 0x2D04 */
-	0xF2B8,0xC3B7,0xC3B8,0xC3B4,INVALC,0xC3B5,INVALC,0xF2B4,
-	0xF2B2,INVALC,0xF2B6,0xC3BA,0xF2B7,0xF2B0,0xF2AF,0xF2B3,
-	0xF2B1,0xC3B6,0xF2B5,0xF4AC,0xC47E,0xC47D,0xF4AD,INVALC,
-	0xF4AF,0xF4AE,0xC4A1,INVALC,INVALC,INVALC,0xF5EB,0xF5E8,
-	0xF5E9,INVALC,0xF5E7,0xF5EA,0xC4F2,0xF5EC,INVALC,0xC4F1,
-	INVALC,0xF742,INVALC,0xC5D5,0xC5D7,0xF7EE,0xC5D6,0xF8B9,
-	0xF940,0xF942,0xF8FE,0xF941,0xC66C,
-	/* Range 0x7F36 - 0x7F45, array index: 0x2D39 */
-	0xA6CE,INVALC,0xACFB,0xD26F,0xAFCA,INVALC,INVALC,0xB2DA,
-	0xDAFC,0xDAFD,INVALC,INVALC,INVALC,0xEADF,0xC16A,0xEDE1,
-	/* Range 0x7F48 - 0x7F55, array index: 0x2D49 */
-	0xC2BB,INVALC,0xF2BA,0xF2B9,0xC4A2,0xF5ED,INVALC,0xF743,
-	0xC5F8,0xCA49,INVALC,INVALC,0xAAC9,0xA875,
-	/* Range 0x7F5B - 0x7F7F, array index: 0x2D57 */
-	0xD360,0xD35B,0xD35F,0xD35D,0xAFCB,0xD35E,0xD35C,INVALC,
-	0xD6F1,INVALC,0xDAFE,0xDB40,0xDF69,0xDF6A,0xB86E,0xB86F,
-	0xDF68,0xDF6B,0xDF67,0xB86D,INVALC,0xBB40,INVALC,0xB870,
-	0xE37A,INVALC,0xBD7C,0xE6F1,0xBD7D,INVALC,0xBFA9,0xEAE2,
-	0xEAE0,0xEAE1,0xEDE4,0xEDE3,0xEDE2,
-	/* Range 0x7F83 - 0x7FD7, array index: 0x2D7C */
-	0xF2BB,INVALC,0xC3B9,0xF2BC,0xF744,0xC5F9,0xF8BA,0xA6CF,
-	0xAACB,0xAACA,0xD04F,0xACFC,INVALC,INVALC,0xD04E,0xD362,
-	INVALC,0xAFCC,0xD6F2,0xD361,INVALC,INVALC,INVALC,0xB2DC,
-	0xD6F5,0xD6F3,0xD6F4,0xB2DB,INVALC,0xDB42,0xDB43,0xDB41,
-	INVALC,0xB873,0xDF6D,0xDF6C,0xDF6E,0xB872,0xB871,INVALC,
-	INVALC,0xE6F2,0xE6F4,INVALC,0xBD7E,0xE6F3,0xEAE3,0xBFAA,
-	0xF079,INVALC,0xF078,0xC3BB,0xF2BD,0xC3BD,0xC3BC,0xF4B0,
-	0xF5EE,0xC4F3,0xA6D0,0xD050,0xACFD,0xD365,0xAFCE,0xD364,
-	0xD363,INVALC,0xAFCD,INVALC,0xD6FB,INVALC,0xD6FD,0xD6F6,
-	0xD6F7,0xB2DD,0xD6F8,0xB2DE,0xD6FC,0xD6F9,0xD6FA,0xB2DF,
-	INVALC,0xB5BE,0xB5BF,INVALC,0xDB44,
-	/* Range 0x7FDB - 0x8021, array index: 0x2DD1 */
-	0xDF6F,0xDF70,INVALC,0xE37E,0xBB43,0xBB41,0xBB42,0xE37B,
-	0xE37C,INVALC,0xE37D,0xE6F9,INVALC,0xE6FA,0xBDA1,0xE6F7,
-	0xE6F6,0xE6F8,0xE6F5,0xBFAD,0xEAE4,0xBFAB,0xBFAC,0xEDE6,
-	0xC16B,0xEDE5,0xEFA8,INVALC,0xF07A,0xF07B,0xC2BC,INVALC,
-	0xC2BD,0xC16C,0xF2BE,0xF2BF,0xF4B1,0xC4A3,0xA6D1,INVALC,
-	0xA6D2,0xACFE,0xAACC,0xAFCF,0xD051,INVALC,INVALC,INVALC,
-	0xB5C0,0xA6D3,0xAD41,0xD052,0xD053,0xAD40,0xAD42,0xA6D4,
-	INVALC,0xD054,0xAFD1,0xD366,0xAFD3,0xAFD0,0xAFD2,INVALC,
-	0xD741,0xB2E0,INVALC,0xD740,0xD6FE,INVALC,0xDF71,
-	/* Range 0x8026 - 0x802C, array index: 0x2E18 */
-	0xBDA2,INVALC,0xBFAE,0xEAE6,0xEAE5,INVALC,0xEDE7,
-	/* Range 0x8033 - 0x803F, array index: 0x2E1F */
-	0xA6D5,0xCB73,0xCDAA,0xAD43,0xD055,INVALC,0xD368,INVALC,
-	INVALC,INVALC,0xAFD4,0xD367,0xAFD5,
-	/* Range 0x8046 - 0x804A, array index: 0x2E2C */
-	0xB2E2,0xD742,0xD744,INVALC,0xB2E1,
-	/* Range 0x804F - 0x8052, array index: 0x2E31 */
-	0xDB46,0xDB47,0xDB45,0xB5C1,
-	/* Range 0x805A - 0x805E, array index: 0x2E35 */
-	0xBB45,INVALC,0xE3A3,0xE3A2,0xBB44,
-	/* Range 0x806F - 0x807F, array index: 0x2E3A */
-	0xC170,0xC16F,0xC16D,0xC16E,0xC171,INVALC,0xF07C,0xC2BF,
-	0xC2BE,0xF2C0,0xF4B2,INVALC,INVALC,INVALC,0xC5A5,0xC5A4,
-	0xA6D6,
-	/* Range 0x8082 - 0x80B5, array index: 0x2E4B */
-	0xD1FB,INVALC,0xB877,0xB5C2,0xB876,0xBB46,INVALC,0xA6D7,
-	0xC9A9,0xA6D8,0xA6D9,INVALC,INVALC,0xCDAB,0xCB76,INVALC,
-	0xCB77,0xA877,INVALC,0xCB74,0xA876,INVALC,0xA879,0xCB75,
-	0xA87B,0xA87A,0xCB78,0xA878,INVALC,INVALC,INVALC,0xAAD1,
-	0xAACF,0xCDAD,INVALC,0xAACE,INVALC,INVALC,INVALC,0xAAD3,
-	0xAAD5,0xAAD2,INVALC,0xCDB0,0xCDAC,0xAAD6,INVALC,0xAAD0,
-	0xA87C,INVALC,0xAAD4,0xCDAF,
-	/* Range 0x80C2 - 0x80E6, array index: 0x2E7F */
-	0xD05B,0xAD47,0xAD48,0xD05D,INVALC,0xD057,0xD05A,0xD063,
-	0xD061,INVALC,0xAD49,0xD067,0xAD4C,0xD064,0xD05C,0xD059,
-	INVALC,INVALC,0xDB49,0xD062,0xAD44,0xD065,0xD056,0xD05F,
-	0xAD46,0xAD4B,0xD060,0xAD4F,0xAD4D,INVALC,0xD058,0xAD4A,
-	INVALC,0xD05E,0xAD4E,0xAD45,0xD066,
-	/* Range 0x80ED - 0x810A, array index: 0x2EA4 */
-	0xAFDA,INVALC,0xAFE3,0xAFD8,0xAFD6,0xD36A,0xAFDE,0xAFDB,
-	0xD36C,INVALC,INVALC,0xAFDD,0xD36B,0xD369,0xD36E,0xAFE2,
-	0xAFE0,0xDB48,INVALC,0xD36F,0xD36D,0xAFD7,INVALC,INVALC,
-	0xAFD9,0xAFDC,INVALC,0xAFDF,INVALC,0xAFE1,
-	/* Range 0x8115 - 0x8130, array index: 0x2EC2 */
-	0xD74E,0xB2E4,INVALC,0xD745,0xD747,INVALC,0xD748,INVALC,
-	0xD750,0xD74C,0xD74A,INVALC,0xD74D,0xD751,0xB2E5,0xB2E9,
-	0xD746,INVALC,0xD74F,INVALC,0xB2E7,INVALC,0xB2E6,0xD74B,
-	0xD749,INVALC,0xB2E3,0xB2E8,
-	/* Range 0x8143 - 0x8155, array index: 0x2EDE */
-	0xDB4A,0xDFA1,INVALC,0xB5C9,0xDB4E,INVALC,INVALC,0xDB4B,
-	0xB5C5,0xB5CB,0xDB50,0xB5C7,0xDB4D,0xBB47,0xB5C6,0xDB4C,
-	0xB5CC,0xB5C4,0xB5C3,
-	/* Range 0x815E - 0x817A, array index: 0x2EF1 */
-	0xDF7B,INVALC,0xDF73,0xDFA2,0xDF78,INVALC,0xDF72,0xB87B,
-	0xB8A3,0xDF7D,INVALC,0xDF76,INVALC,0xB87E,INVALC,INVALC,
-	0xB87C,0xDF7E,0xB879,0xB878,0xDF79,0xB87D,0xB5CD,INVALC,
-	0xDF7C,0xDF74,0xB87A,0xB8A1,0xB8A2,
-	/* Range 0x817F - 0x818F, array index: 0x2F0E */
-	0xBB4C,0xBB48,INVALC,0xBB4D,0xE3A6,INVALC,INVALC,0xE3A5,
-	0xE3A7,0xBB4A,0xE3A4,0xBB4B,0xE3AA,0xE3A9,0xE3A8,INVALC,
-	0xBB49,
-	/* Range 0x8195 - 0x81D2, array index: 0x2F1F */
-	0xE741,INVALC,0xE744,0xBDA8,0xE743,0xBDA7,0xBDA3,0xBDA4,
-	0xBDA5,0xE740,0xE6FE,0xBDA6,INVALC,0xE742,0xE6FD,INVALC,
-	INVALC,0xEAE9,0xEAF3,0xBFB1,0xBFB0,INVALC,0xEAED,0xEAEF,
-	INVALC,0xEAEA,INVALC,0xEAEE,0xEAE8,0xEAF1,0xBFAF,0xEAF0,
-	0xEAEC,INVALC,0xEAF2,INVALC,0xEAEB,0xC174,0xEDE8,0xEDEE,
-	0xC178,0xC17A,0xC177,0xC176,INVALC,0xC175,0xC173,0xEDE9,
-	0xEDEC,0xC172,0xEDED,INVALC,0xC179,0xEDEB,INVALC,0xEDEA,
-	0xC2C0,INVALC,0xC2C1,0xF0A1,0xF07D,0xF07E,
-	/* Range 0x81D5 - 0x8216, array index: 0x2F5D */
-	0xF2C2,INVALC,0xF2C1,0xC3BE,0xF4B4,0xC4A4,0xF4B3,INVALC,
-	0xF5F0,0xF745,0xC5A6,0xF943,0xF944,0xC5D8,0xA6DA,INVALC,
-	0xAAD7,0xDB52,0xBB4E,0xC17B,0xEDEF,0xA6DB,INVALC,0xAFE5,
-	0xAFE4,0xDB53,INVALC,INVALC,INVALC,0xEAF4,0xA6DC,0xAD50,
-	INVALC,INVALC,0xDB54,0xDB55,0xDB56,0xBB4F,0xBFB2,0xA6DD,
-	INVALC,0xAAD8,0xD068,0xAFE6,0xD370,0xB2EA,INVALC,0xDB57,
-	0xB8A4,INVALC,0xBB50,0xBFB3,0xC17C,0xC2C2,0xF4B5,0xA6DE,
-	0xAAD9,INVALC,INVALC,0xAFE7,0xD752,0xB5CE,INVALC,0xBB51,
-	0xE3AB,0xE745,
-	/* Range 0x821B - 0x8222, array index: 0x2F9F */
-	0xA6DF,0xB5CF,0xDFA3,0xBB52,0xA6E0,0xCDB1,0xD069,0xAD51,
-	/* Range 0x8228 - 0x822C, array index: 0x2FA7 */
-	0xAFEA,INVALC,0xAFE8,0xAFE9,0xAFEB,
-	/* Range 0x8232 - 0x8285, array index: 0x2FAC */
-	0xD757,0xD754,0xD756,0xB2EB,0xB2ED,0xB2EC,0xD753,0xB2EE,
-	0xD755,INVALC,0xDB58,0xDB59,INVALC,0xDB5A,0xDFA6,INVALC,
-	0xDFA7,INVALC,0xDFA5,0xDFA8,INVALC,0xB8A5,INVALC,0xDFA4,
-	INVALC,0xBB53,INVALC,INVALC,0xE74A,0xE746,0xE749,0xE74B,
-	0xE748,0xE747,INVALC,0xEAF5,0xEAF6,0xEAF7,0xBFB4,0xBFB5,
-	0xEDF1,0xEDF0,0xEDF2,INVALC,0xF0A3,0xF0A2,INVALC,0xF2C4,
-	INVALC,0xF2C5,0xF2C3,INVALC,0xC4A5,INVALC,0xF4B6,0xF4B7,
-	INVALC,0xF746,0xF7EF,0xF8BB,0xA6E1,0xA87D,INVALC,0xC17D,
-	0xA6E2,INVALC,0xD758,0xDB5B,INVALC,0xC641,0xCA4A,INVALC,
-	INVALC,INVALC,0xCA4B,0xCA4D,0xA6E3,0xCA4E,0xCA4C,INVALC,
-	INVALC,0xCBA2,0xCBA3,0xCB7B,
-	/* Range 0x828A - 0x82C3, array index: 0x3000 */
-	0xCBA1,0xA8A1,INVALC,0xA8A2,0xCB7C,0xCB7A,0xCB79,0xCB7D,
-	0xA87E,0xCB7E,0xD06A,INVALC,INVALC,INVALC,0xCDB6,0xAADC,
-	0xCDB5,0xCDB7,INVALC,0xAADB,0xCDBC,0xAADF,0xCDB2,0xCDC0,
-	0xCDC6,0xAAE6,0xCDC3,0xAAE3,INVALC,0xCDB9,0xCDBF,0xCDC1,
-	INVALC,0xCDB4,0xAAE2,0xAADD,0xCDBA,0xAAE4,0xAAE7,0xAAE1,
-	INVALC,0xAADA,0xCDBE,0xCDB8,0xCDC5,0xAAE9,0xAAE5,0xAAE0,
-	0xCDBD,0xAFEC,0xCDBB,0xAADE,0xAAE8,INVALC,0xCDB3,INVALC,
-	0xCDC2,0xCDC4,
-	/* Range 0x82D1 - 0x82FB, array index: 0x303A */
-	0xAD62,0xAD5C,0xAD64,0xAD61,0xD071,0xD074,0xAD5D,INVALC,
-	0xD06B,INVALC,0xAD56,0xAD60,INVALC,0xAD63,0xAD65,0xD0A2,
-	0xD077,INVALC,0xAD55,0xD0A1,0xAD59,0xAD57,0xAD52,0xD06F,
-	INVALC,0xD07E,0xD073,0xD076,0xD0A5,INVALC,0xAD66,0xD07D,
-	0xAD5E,0xD078,0xD0A4,0xD075,0xD079,0xD07C,INVALC,INVALC,
-	0xD06D,0xD0A3,0xD07B,
-	/* Range 0x82FE - 0x830D, array index: 0x3065 */
-	0xD06C,INVALC,0xD070,0xAD5F,0xAD5A,0xAD53,0xAD58,0xAD54,
-	0xAD67,0xD06E,0xD3A5,0xAD5B,INVALC,INVALC,0xD07A,0xCE41,
-	/* Range 0x8322 - 0x8356, array index: 0x3075 */
-	0xD37E,INVALC,0xD3A9,0xD378,0xD37C,0xD3B5,0xAFFD,0xD3AD,
-	0xD3A4,0xAFED,0xD3B3,0xD374,INVALC,0xD3AC,INVALC,0xAFFC,
-	0xAFF7,0xD373,0xAFF5,0xAFF4,0xAFF9,0xD3AB,0xAFF1,0xAFF8,
-	0xD072,0xDB5C,0xD3A6,INVALC,INVALC,0xD37A,0xAFFB,0xD37B,
-	0xD3A1,0xAFFE,0xD375,0xD3AF,INVALC,0xD3AE,0xD3B6,0xAFF3,
-	0xAFF0,0xD3B4,0xD3B0,0xD3A7,0xD3A2,0xAFF6,0xAFF2,0xD377,
-	0xAFEE,0xD3B1,0xAFEF,INVALC,0xD379,
-	/* Range 0x8373 - 0x83B0, array index: 0x30AA */
-	0xD75E,0xD760,0xD765,0xD779,0xB2FC,0xB2F2,INVALC,0xD75D,
-	0xB2FD,0xB2FE,0xD768,0xD76F,0xD775,INVALC,0xD762,INVALC,
-	0xD769,INVALC,INVALC,0xB340,0xD777,0xD772,0xB2FA,0xB2F8,
-	0xD76E,0xD76A,0xD75C,0xB2EF,0xD761,0xD759,INVALC,0xB2F7,
-	0xB2F9,0xD766,0xD763,0xB2F4,0xD773,0xB2F1,0xD764,0xD77A,
-	0xD76C,INVALC,0xD76B,0xB2F0,INVALC,0xB2FB,INVALC,0xB2F3,
-	0xD75A,0xD75F,0xD770,0xD776,0xB341,0xD75B,0xD767,0xD76D,
-	0xB2F6,INVALC,INVALC,0xD778,0xD771,0xD774,
-	/* Range 0x83BD - 0x8413, array index: 0x30E8 */
-	0xB2F5,INVALC,0xDB6C,0xDB60,0xB5D7,0xDB7D,0xDBA7,0xDBAA,
-	0xB5D5,0xDB68,0xDBA3,0xDB69,0xDB77,0xB5E2,0xDB73,0xB5DF,
-	INVALC,0xDB74,0xDB5D,INVALC,0xDBA4,INVALC,INVALC,0xB5E8,
-	0xDBA1,0xDB75,0xDBAC,0xDB70,0xDFC8,INVALC,0xDBAF,0xB5E6,
-	0xDB6E,0xDB7A,0xB5E9,0xB5D4,0xDB72,0xDBAD,0xDB6B,0xDB64,
-	0xDB6F,INVALC,0xDB63,0xDB61,0xB5D0,0xDBA5,0xDB6A,0xDBA8,
-	INVALC,0xDBA9,0xB5D8,0xB5DD,0xB5D9,0xB5E1,0xDB7E,0xB5DA,
-	0xDB76,0xDB66,INVALC,0xB5D2,0xDB5E,0xDBA2,0xDBAB,0xDB65,
-	0xB5E0,0xDBB0,0xDB71,INVALC,0xDB6D,INVALC,0xB5D1,0xB5E5,
-	INVALC,0xDB7C,0xB5E7,INVALC,0xDB78,0xB5DC,0xB5D6,0xB5DE,
-	0xB5D3,0xB5E4,0xDB79,0xDB67,0xDB7B,0xDB62,0xDBA6,
-	/* Range 0x8429 - 0x847E, array index: 0x313F */
-	0xDFC7,INVALC,0xDFDD,0xB855,0xDFCC,INVALC,0xDFCA,0xDFB5,
-	0xB8A9,0xDFC5,0xDFD9,0xDFC1,0xB8B1,0xDFD8,0xDFBF,0xB5E3,
-	0xDFCF,0xDFC0,0xDFD6,0xB8B0,0xB8A8,INVALC,0xDFAA,0xDFB2,
-	INVALC,0xDFCB,0xDFC3,0xDFDC,0xDFC6,0xB8B6,0xDFD7,INVALC,
-	0xB8AD,INVALC,0xDFC9,0xDFD1,0xDFB6,0xDFD0,INVALC,0xDFE1,
-	0xDFB1,0xDFD2,INVALC,0xDFDF,INVALC,0xDFAB,0xB5DB,INVALC,
-	0xDFB9,0xDFB8,0xB8AF,INVALC,0xDFBC,0xDFBE,0xDFCD,0xDFDE,
-	0xB8B2,INVALC,0xB8B3,INVALC,0xDFB0,0xB8AB,0xDFB4,0xDFDA,
-	0xB8B4,INVALC,0xB8AC,0xB8AE,0xB8B5,0xDFE0,0xDFD3,0xDFCE,
-	INVALC,INVALC,0xDFBB,0xDFBA,0xB8AA,0xDFAC,0xB8A7,0xDFC4,
-	0xDFAD,0xDFC2,INVALC,INVALC,0xDFB7,0xDFDB,
-	/* Range 0x848D - 0x8491, array index: 0x3195 */
-	0xDFAF,0xDFD5,0xDFAE,0xBB60,0xE3D3,
-	/* Range 0x8497 - 0x84D7, array index: 0x319A */
-	0xE3AC,0xE3CA,0xBB58,0xE3BB,0xE3C5,0xBB5B,0xE3BE,0xBB59,
-	0xE3AF,0xE3CD,0xE3AE,0xE3C1,INVALC,0xE3AD,INVALC,INVALC,
-	0xE3BF,0xE3C8,0xE3C6,0xE3BA,0xE3B5,0xE3B3,INVALC,0xE3B4,
-	0xE3C7,0xE3D2,0xE3BC,0xBB5A,INVALC,0xE3B7,INVALC,0xE3CB,
-	INVALC,0xBB5D,0xE3B6,0xE3B0,0xE3C0,0xBB61,INVALC,INVALC,
-	0xBB55,0xBB5E,0xE3B8,0xE3B2,INVALC,0xBB57,0xDFD4,0xBB56,
-	0xE3C3,INVALC,0xBB54,0xBB63,0xBB5C,0xE3C4,0xE3B9,0xE3B1,
-	0xE3CC,0xE3BD,0xBB62,0xE3D0,0xBB5F,0xE3CF,INVALC,0xE3C9,
-	0xE3CE,
-	/* Range 0x84E7 - 0x8531, array index: 0x31DB */
-	0xE773,0xE774,0xE767,0xE766,0xE762,0xBDB4,INVALC,0xBDAC,
-	0xE776,0xE775,0xDFA9,0xE75F,0xE763,0xE75D,INVALC,0xE770,
-	0xE761,INVALC,0xE777,0xE75A,0xE758,0xE764,0xE76E,0xE769,
-	0xBDB6,0xE74F,INVALC,0xE76D,INVALC,INVALC,INVALC,0xBDB7,
-	0xDFBD,0xE75B,0xE752,0xE755,0xE77B,0xE75C,0xE753,0xE751,
-	0xE74E,INVALC,0xBDB0,0xE765,0xBDAF,0xBDB3,0xE760,0xE768,
-	0xBDA9,0xE778,0xE77C,0xBDAB,INVALC,0xE757,0xE76B,0xE76F,
-	0xE754,0xE779,0xBDB2,INVALC,0xBDB1,0xE74C,0xBDB5,0xE772,
-	0xE756,0xE76A,0xE750,0xE75E,0xE759,0xBDAD,0xBDAE,0xE76C,
-	0xE77D,0xE77A,0xE771,
-	/* Range 0x853D - 0x854E, array index: 0x3226 */
-	0xBDAA,0xEB49,INVALC,0xEB40,0xEB43,INVALC,0xBFBB,0xEB45,
-	0xEAF9,0xEB41,0xEB47,0xBFB8,0xBFBC,0xBFB6,INVALC,INVALC,
-	0xEAFB,0xEB4C,
-	/* Range 0x8551 - 0x856E, array index: 0x3238 */
-	0xEB46,INVALC,0xEAFC,0xEB55,0xEB4F,0xEAF8,0xEE46,0xEAFE,
-	0xBFB7,INVALC,0xEB4A,INVALC,0xEB54,0xBFBF,INVALC,0xEB51,
-	0xEAFD,0xEB44,0xEB48,0xEB42,0xEB56,0xEB53,0xEB50,0xBFB9,
-	0xBFBA,0xBFBE,0xEAFA,0xEB57,0xBFBD,0xEB4D,
-	/* Range 0x8575 - 0x85AA, array index: 0x3256 */
-	0xEB4E,0xEE53,0xEE40,0xEE45,0xEE52,0xEE44,0xEDFB,0xEE41,
-	INVALC,0xC1A2,INVALC,0xEDF4,0xEE4D,0xEE4F,0xEDF3,0xC1A1,
-	0xEE51,0xEE49,0xC1A8,0xEE50,0xEE42,0xC1AA,0xEDF9,0xEB52,
-	0xEE4A,0xEE47,0xEDF5,0xEE55,0xC1A4,INVALC,INVALC,0xC1A5,
-	0xEDF7,0xEE48,INVALC,0xEE54,0xEE4B,0xEDFD,0xC1A7,0xC1A3,
-	0xEE4C,0xEDFE,0xEE56,0xEDF8,0xEE43,0xEE4E,0xEDFA,0xEDFC,
-	INVALC,0xC2CB,0xEDF6,0xC1A9,0xC2C4,0xC17E,
-	/* Range 0x85AF - 0x85D2, array index: 0x328C */
-	0xC1A6,0xC2C8,0xF0B3,INVALC,0xF0A9,0xF0A4,0xF0AA,0xF0B4,
-	0xF0B8,0xF0B7,0xC2CA,0xC2C9,INVALC,INVALC,0xF0AB,0xF0B9,
-	0xF0AE,0xF0A6,INVALC,0xF0A8,0xF0A7,0xF0AD,0xF0B2,0xF0A5,
-	0xF0AC,0xF0B1,0xC2C7,INVALC,0xF0AF,INVALC,0xC2C5,0xF0B0,
-	0xC2C3,0xC2C6,0xF2D5,0xF0B5,
-	/* Range 0x85D5 - 0x860C, array index: 0x32B0 */
-	0xC3C2,INVALC,0xF2CD,0xF2D1,0xF2C9,0xF2CC,INVALC,0xF2D4,
-	0xC3C0,0xF2D9,0xF2D2,INVALC,0xF2CA,0xF2DA,0xF2D3,0xC3C3,
-	0xC3C4,0xF2D7,INVALC,0xF2CB,0xC3BF,0xC3C1,0xF2C6,0xF2CE,
-	0xF2C8,INVALC,0xF2D8,0xF2D6,0xF2C7,0xF2CF,INVALC,INVALC,
-	INVALC,0xF4BE,0xC3C5,0xF2D0,0xC4A7,0xC4A9,0xC4A6,INVALC,
-	0xF4C3,0xF4BB,0xF4B9,0xF4BD,0xF4BA,INVALC,INVALC,0xF4BF,
-	0xF4C1,0xC4AA,0xC4AC,INVALC,0xF4C0,0xC4AD,0xC4AB,0xF4C2,
-	/* Range 0x8617 - 0x8640, array index: 0x32E8 */
-	0xC4F4,0xF5F1,0xF5F7,0xC4F6,0xF4BC,0xF5F6,INVALC,0xF5FD,
-	0xF5F4,0xF5FB,0xF5FA,0xF4B8,0xF5F5,0xF0B6,0xF5FE,0xF5F3,
-	0xF5F8,INVALC,0xF5FC,0xF5F2,INVALC,0xF74A,0xC4F5,0xF5F9,
-	INVALC,INVALC,0xF7F4,0xF74B,0xF749,0xF747,0xF748,0xF74C,
-	INVALC,0xC5D9,0xF7F2,0xF7F0,0xF7F5,0xF7F3,INVALC,0xF7F6,
-	0xC5DA,0xF7F1,
-	/* Range 0x8646 - 0x8656, array index: 0x3312 */
-	0xF945,0xF946,0xF947,INVALC,INVALC,0xF9C7,0xF9BD,0xCA4F,
-	0xAAEA,INVALC,0xAD68,INVALC,0xD3B8,0xD3B7,0xB040,0xB342,
-	0xD77C,
-	/* Range 0x865B - 0x8674, array index: 0x3323 */
-	0xB5EA,0xB8B8,INVALC,0xB8B7,0xB8B9,INVALC,0xE3D4,0xE77E,
-	0xEB58,0xEB5A,0xEB59,INVALC,0xC1AB,0xEE57,0xF0BA,0xF9A5,
-	0xA6E4,INVALC,0xCDC9,0xCDCA,0xCDC8,0xCDC7,0xAAEB,INVALC,
-	0xD0A9,0xD0A7,
-	/* Range 0x8677 - 0x867C, array index: 0x333D */
-	0xD0A6,INVALC,0xAD69,0xAD6B,0xAD6A,0xD0A8,
-	/* Range 0x8685 - 0x86AA, array index: 0x3343 */
-	0xD3C4,0xD3C1,0xD3BF,INVALC,INVALC,0xB041,0xD3C2,0xB046,
-	0xD3BC,0xD3CB,INVALC,0xD3CD,0xD3BD,INVALC,0xB043,0xD3CE,
-	0xD3C9,0xD3BB,0xD3C0,0xD3CA,0xD3C6,0xD3C3,INVALC,0xB048,
-	0xD3CC,0xD3BE,INVALC,INVALC,0xD3C7,0xD3B9,0xB047,0xB044,
-	0xD3C5,INVALC,0xD3C8,0xD3BA,0xB045,0xB042,
-	/* Range 0x86AF - 0x86CC, array index: 0x3369 */
-	0xB34C,0xD7A5,0xB34B,INVALC,0xD7A8,0xD7AB,0xB348,0xB346,
-	0xD77E,0xD7A9,0xD7A7,0xD7A4,0xD7AC,0xD7AD,0xD7AF,0xD7B0,
-	0xD77D,0xB345,0xD7A2,0xD7A1,0xD7AE,0xB347,0xD7A3,0xB349,
-	0xB344,0xD7A6,0xB34D,INVALC,0xB34A,0xD7AA,
-	/* Range 0x86D0 - 0x86ED, array index: 0x3387 */
-	0xB5F1,0xDBBF,INVALC,0xDBB4,0xB5EE,INVALC,0xDFE7,0xDBBD,
-	0xDBB1,0xB5EC,0xDBB6,0xB5EF,0xDBBA,0xDBB8,0xB5F2,0xB5EB,
-	INVALC,INVALC,0xDBB2,0xDBB5,0xB5F0,INVALC,0xDBB3,INVALC,
-	0xDBBE,0xDBBC,0xDBB7,0xDBB9,0xDBBB,0xB5ED,
-	/* Range 0x86F5 - 0x86FB, array index: 0x33A5 */
-	0xDFE8,0xDFEE,0xDFE4,0xDFEA,0xB8BA,0xDFE6,0xB8C0,
-	/* Range 0x86FE - 0x8713, array index: 0x33AC */
-	0xB8BF,INVALC,0xB8BE,0xDFED,0xB8C1,0xB8C2,0xDFE3,0xDFF0,
-	0xB8C3,0xB8BD,0xB8BC,0xDFEC,0xB8C4,0xDFE2,0xDFE5,0xDFEF,
-	0xDFEB,INVALC,INVALC,0xE3F4,0xE3E9,0xB8BB,
-	/* Range 0x8718 - 0x8743, array index: 0x33C2 */
-	0xBB6A,0xE3DD,0xE3F2,0xE3DE,0xBB65,INVALC,0xE3DB,INVALC,
-	0xE3E4,0xE3DC,0xBB67,0xE3D6,0xE3F1,0xBB68,0xE3EE,0xE3EF,
-	0xE3D7,0xBB6D,0xE3E6,INVALC,0xE3E0,0xE3E7,0xE3DA,INVALC,
-	0xE3F3,0xE3EB,0xE3E5,0xE3D5,0xBB69,0xE3EC,INVALC,0xBB6C,
-	0xE3F0,INVALC,0xE3EA,0xBB66,0xE3E8,INVALC,0xE3E2,0xBB64,
-	0xE3D9,0xE3E1,0xE3ED,0xE3DF,
-	/* Range 0x874C - 0x877B, array index: 0x33EE */
-	0xBDC1,0xDFE9,0xE7B2,0xE7BB,0xE7B1,0xE7AD,0xE7AA,0xBDC2,
-	0xE7A8,0xBB6B,0xE7A1,0xBDC0,0xE7A7,0xBDBF,0xE7AC,0xE7A9,
-	0xE7B9,0xE7B4,0xE7AE,0xE7B3,0xBDBB,0xE7AB,0xE7BE,0xE7A2,
-	0xE7A3,0xE7BA,0xBDBC,0xE7BF,0xBDBE,0xE7C0,0xE7B0,0xE3D8,
-	0xE7B6,0xE7AF,0xE7B8,0xE7B5,INVALC,INVALC,INVALC,0xE7A6,
-	0xBDB9,0xE7BD,0xBDBA,0xE7A4,0xBDBD,0xEB64,0xE7B7,0xE7BC,
-	/* Range 0x8781 - 0x8789, array index: 0x341E */
-	0xEB61,0xBDB8,0xBFC0,0xEB6B,0xEB67,INVALC,0xEB65,0xEB60,
-	0xEB6F,
-	/* Range 0x878D - 0x87A4, array index: 0x3427 */
-	0xBFC4,INVALC,0xEB5C,0xEB68,0xEB69,0xEB5F,0xEB5E,0xEB6C,
-	INVALC,0xEB62,0xEB5D,0xEB63,INVALC,0xEB6E,0xEB5B,0xEB6D,
-	0xEB6A,0xBFC2,0xBFC1,INVALC,INVALC,0xBFC3,0xEB66,0xF0CB,
-	/* Range 0x87AA - 0x87CC, array index: 0x343F */
-	0xEE59,0xC1B1,0xEE5D,0xEE5A,0xEE61,0xEE67,0xEE5C,INVALC,
-	0xEE70,0xC1AE,0xEE6A,0xEE5F,0xEE6B,0xEE66,0xEE6D,0xEE5E,
-	0xC1B3,0xC1B2,0xEE60,0xEE6E,0xEE58,0xEE6C,0xC1AC,INVALC,
-	0xEE64,0xEE63,0xEE68,0xEE5B,0xC1B0,INVALC,0xC1B4,0xEE62,
-	0xEE69,0xC1B5,0xEE65,
-	/* Range 0x87D1 - 0x8844, array index: 0x3462 */
-	0xC1AD,0xC1AF,0xF0C7,0xF0C5,INVALC,INVALC,0xF0CC,0xF0C9,
-	0xF0CD,INVALC,0xF0BE,0xF0C6,0xF0D1,0xEE6F,0xF0C2,0xC2CF,
-	0xE7A5,0xF0BD,0xF0CA,0xF0C4,0xF0C1,0xF0BC,0xF0BB,0xF0D0,
-	INVALC,0xF0C0,0xF0BF,0xC2CD,0xF0C8,INVALC,0xC2CC,INVALC,
-	INVALC,0xC2CE,0xF0C3,0xF0CF,INVALC,0xF2DE,0xF2DF,INVALC,
-	0xC3C9,0xF2DC,0xC3C6,0xF2E4,INVALC,0xC3CA,0xF2E6,0xF2DB,
-	0xF0CE,0xF2E8,0xF2DD,INVALC,0xC3C7,0xF2E3,INVALC,0xF2E5,
-	0xF2E0,0xF2E7,0xF2E2,0xF2E1,0xC3C8,INVALC,INVALC,0xF4C5,
-	0xF4C6,INVALC,0xF4C8,0xC4AE,0xC4AF,0xF4C9,0xF4C7,INVALC,
-	0xF4C4,INVALC,0xF642,0xF645,0xF641,INVALC,0xC4FA,0xF643,
-	0xC4F9,0xC4F8,0xC4F7,0xF644,0xF751,0xF74F,INVALC,0xF74E,
-	0xF640,0xF750,0xF646,0xF74D,INVALC,0xF7F9,0xF7D7,0xF7F7,
-	0xC5DB,0xF7F8,0xF7FA,INVALC,0xF8BF,0xC5FA,0xF8BE,0xF8BD,
-	0xC5FB,INVALC,0xC65A,0xF96E,0xF9A7,0xF9A6,0xF9A8,0xA6E5,
-	0xD0AA,INVALC,0xD3CF,0xD3D0,
-	/* Range 0x8848 - 0x884E, array index: 0x34D6 */
-	0xDBC0,INVALC,0xF647,0xF8C0,0xA6E6,0xAD6C,0xD0AB,
-	/* Range 0x8852 - 0x8883, array index: 0x34DD */
-	0xD7B1,0xB34E,INVALC,0xDBC2,0xDBC1,0xB5F3,INVALC,0xB8C5,
-	0xE7C1,0xBDC3,INVALC,0xBDC4,INVALC,INVALC,INVALC,0xBFC5,
-	0xC5FC,0xA6E7,INVALC,INVALC,INVALC,0xD0AC,0xAAED,0xD0AE,
-	0xD0AD,0xAD6D,INVALC,0xD3D1,INVALC,0xD3D8,0xB049,0xD3D6,
-	0xD3D4,INVALC,0xD3DB,0xD3D2,0xD3D3,0xB04A,INVALC,0xB04E,
-	INVALC,INVALC,0xD3DC,0xB04D,0xD3DA,0xD3D7,0xD3D5,0xB04B,
-	0xB04C,0xD3D9,
-	/* Range 0x8888 - 0x88AC, array index: 0x350F */
-	0xB350,0xD7B2,INVALC,0xB355,0xD7C2,0xB354,0xD7C4,INVALC,
-	INVALC,0xD7B8,0xB352,0xD7C3,INVALC,0xD7B3,0xB353,0xD7BF,
-	0xD7BB,0xD7BD,0xD7B7,0xD7BE,INVALC,INVALC,0xB34F,0xD7BA,
-	INVALC,0xD7B9,0xD7B5,INVALC,0xD7C0,INVALC,INVALC,0xD7BC,
-	0xD7B4,INVALC,0xD7B6,0xB351,0xD7C1,
-	/* Range 0x88B6 - 0x88C2, array index: 0x3534 */
-	0xDBC9,0xDBCB,0xDBC6,0xDBC5,0xDBC3,INVALC,0xDBCA,0xDBCC,
-	0xDBC8,INVALC,0xDBC7,0xB5F4,0xB5F5,
-	/* Range 0x88C9 - 0x88E1, array index: 0x3541 */
-	0xDBCF,0xB8CD,0xDFF2,0xDFF8,0xDFF3,0xDFF4,INVALC,0xDFF9,
-	INVALC,0xB8CF,INVALC,0xB8C7,0xB8CE,0xDFF1,0xDBC4,0xB8CA,
-	0xB8C8,0xDFF7,0xDFF6,0xB8C9,0xB8CB,0xDFF5,0xB8C6,INVALC,
-	0xB8CC,
-	/* Range 0x88EB - 0x891A, array index: 0x355A */
-	0xE442,0xE441,INVALC,0xE3FB,0xBB76,0xE440,0xE3F7,0xE3F8,
-	0xBB6E,0xBB70,INVALC,0xE3FD,0xE3F5,0xBB72,0xBB71,0xE3F9,
-	0xE3FE,0xE3FC,0xBB73,0xE3FA,INVALC,INVALC,0xDBCE,0xBB6F,
-	INVALC,INVALC,0xE7C2,0xE7C9,0xBDC6,INVALC,0xE7CD,0xBDCA,
-	0xE7C5,0xE7C3,INVALC,0xE7CC,INVALC,0xBDC5,0xE7CB,0xBDC7,
-	0xBDC8,0xE7C4,0xBDC9,0xE7CA,0xE7C6,0xE7C7,0xE7C8,0xBB75,
-	/* Range 0x891E - 0x8946, array index: 0x358A */
-	0xEB70,0xEB7C,INVALC,0xBFCA,0xEB77,0xEB79,INVALC,0xBFC8,
-	0xEB71,0xEB75,INVALC,0xEB78,0xBFC6,0xBFC9,0xEB7B,0xEB73,
-	0xEB74,0xEB7A,0xEB72,0xEB76,0xBFC7,0xEE72,INVALC,0xEE71,
-	0xC1B7,0xEE77,0xC1B9,INVALC,INVALC,0xC1B6,0xEE73,0xC1BA,
-	0xEE74,INVALC,INVALC,0xEE75,0xEE78,INVALC,0xC1B8,INVALC,
-	0xF0D6,
-	/* Range 0x894B - 0x8988, array index: 0x35B3 */
-	0xF0D3,0xF0D5,INVALC,INVALC,0xF0D4,0xF0D7,0xF0D8,0xEE76,
-	0xF0D2,INVALC,INVALC,0xC3CD,0xF2EC,0xF2EF,0xF2F1,0xF2EA,
-	0xF2EB,0xF2EE,0xF2F0,0xC3CE,0xC3CC,0xC3CB,0xF2ED,0xF2E9,
-	0xF4CA,0xC4B0,INVALC,0xF4CB,INVALC,INVALC,0xF649,0xC4FB,
-	0xF64B,0xC4FC,0xF648,0xF64A,0xC5A8,INVALC,0xF752,0xC5A7,
-	0xF7FD,0xF7FC,INVALC,0xF7FB,INVALC,INVALC,0xF948,0xF949,
-	0xF94B,0xF94A,INVALC,0xCA50,0xA6E8,INVALC,0xAD6E,0xD7C5,
-	0xB5F7,INVALC,0xDFFA,0xC2D0,INVALC,0xF2F2,
-	/* Range 0x8993 - 0x89A6, array index: 0x35F1 */
-	0xB356,INVALC,0xDBD0,0xB5F8,0xDBD2,0xDBD1,INVALC,INVALC,
-	0xDFFB,0xB8D0,0xE443,0xE446,0xE445,INVALC,0xE444,0xE7CE,
-	0xE7D0,0xE7CF,INVALC,0xBFCC,
-	/* Range 0x89AA - 0x89AF, array index: 0x3605 */
-	0xBFCB,INVALC,0xC1BB,0xEE79,0xEE7B,0xEE7A,
-	/* Range 0x89B6 - 0x89C0, array index: 0x360B */
-	0xF2F4,0xF2F3,INVALC,0xF4CC,0xC4B1,INVALC,INVALC,0xC4FD,
-	0xF754,0xF753,0xC65B,
-	/* Range 0x89D2 - 0x8A18, array index: 0x3616 */
-	0xA8A4,0xD0AF,0xAD6F,0xD7C8,0xD7C6,INVALC,INVALC,0xD7C7,
-	0xDBD4,0xDBD5,0xE043,0xDBD3,INVALC,0xDFFC,0xE041,0xE040,
-	0xE042,0xB8D1,0xDFFE,0xDFFD,0xE044,INVALC,0xE449,0xE447,
-	INVALC,0xE448,0xE7D3,0xE7D1,INVALC,INVALC,0xE7D2,0xEB7D,
-	0xEE7C,0xEE7D,0xC2D2,INVALC,0xF2F5,0xF4CD,0xC4B2,INVALC,
-	0xF64C,0xF755,0xC5A9,INVALC,0xF7FE,0xF94C,0xA8A5,INVALC,
-	0xAD71,0xAD72,0xD0B0,INVALC,INVALC,0xD0B1,0xAD70,INVALC,
-	0xB054,INVALC,0xB052,INVALC,0xB051,0xB058,0xB050,0xB059,
-	0xD3DD,0xB056,INVALC,0xB053,0xB057,0xB055,0xB04F,
-	/* Range 0x8A1B - 0x8A27, array index: 0x365D */
-	0xB35F,INVALC,0xB359,0xD7CC,0xB35E,INVALC,INVALC,0xB360,
-	0xB35A,INVALC,0xB35B,INVALC,0xD7CA,
-	/* Range 0x8A39 - 0x8A5B, array index: 0x366A */
-	0xDBD8,0xB645,0xB5F9,0xB5FD,INVALC,0xB8E4,0xE049,0xDBDA,
-	0xB5FE,INVALC,INVALC,0xDBDD,0xDBDE,0xB643,INVALC,0xDBE0,
-	INVALC,0xDBE2,INVALC,0xDBE3,0xDBD7,0xDBD6,0xDBE4,0xB642,
-	0xDBE1,0xDBDF,INVALC,0xB640,0xB5FB,0xB647,0xDBDB,0xDBDC,
-	0xDBD9,INVALC,0xB641,
-	/* Range 0x8A5E - 0x8A63, array index: 0x368D */
-	0xB5FC,INVALC,0xB5FA,0xE048,0xB8DF,0xB8DA,
-	/* Range 0x8A68 - 0x8A7C, array index: 0x3693 */
-	0xB8E5,0xB8D6,INVALC,0xB8D2,0xB8E1,0xB8DE,0xB8E0,INVALC,
-	0xB8D7,0xB8DC,0xB8D3,0xB8D4,0xE050,0xE04D,0xE045,0xE04A,
-	INVALC,0xB8E2,0xE051,0xB8E3,0xB8D9,
-	/* Range 0x8A7F - 0x8A9A, array index: 0x36A8 */
-	0xE047,INVALC,0xE04F,0xE04B,0xE04E,0xE04C,0xB8DD,0xE046,
-	0xB8D8,INVALC,INVALC,INVALC,0xE44C,0xBB78,0xBB7B,INVALC,
-	0xE44E,INVALC,0xBBA5,0xE44D,0xBB7D,INVALC,0xBDCF,0xE44F,
-	INVALC,0xBBA4,0xE44B,0xBBA6,
-	/* Range 0x8AA0 - 0x8AAB, array index: 0x36C4 */
-	0xB8DB,0xBB7C,INVALC,0xBB7A,0xBB7E,0xBBA2,0xBB77,0xBBA7,
-	0xBBA3,INVALC,0xBBA1,0xE44A,
-	/* Range 0x8AB6 - 0x8AE8, array index: 0x36D0 */
-	0xBDD9,INVALC,0xE7D6,0xBDDA,0xE7E2,0xE7DB,0xBDCB,0xE7E3,
-	0xE7DD,0xBDD5,0xE7DE,INVALC,0xBDD4,0xE7E1,0xBDCE,0xE7DF,
-	0xE7D5,0xBDCD,0xEBAA,0xBDD3,INVALC,0xBDD0,INVALC,0xBDD8,
-	INVALC,0xE7D4,INVALC,0xE7D8,0xBDCC,0xE7D7,0xE7D9,0xE7DA,
-	0xBDD7,0xE7DC,0xE7E0,0xE7E4,INVALC,0xBDDB,0xBFD2,0xEBA5,
-	0xEBAB,0xEBA8,0xEB7E,0xEBAC,0xEBA1,INVALC,0xEBA7,INVALC,
-	0xBFCD,0xBFD3,0xEBAD,
-	/* Range 0x8AEB - 0x8B60, array index: 0x3703 */
-	0xBFCF,INVALC,0xBFD9,0xBFD4,0xEBAF,0xEBA9,0xBFD0,0xEBA2,
-	0xBFDA,0xEBA3,0xEBA4,0xBFDB,0xBFD8,0xBDD1,INVALC,0xBFCE,
-	0xEBB0,0xBFDC,INVALC,0xBFD5,0xEBAE,0xBFD1,0xBFD6,0xBFD7,
-	INVALC,0xC1C3,0xEEA4,0xEEAD,0xEEAA,0xEEAC,INVALC,0xC1C0,
-	0xEEA5,INVALC,0xEEAB,0xC1BC,0xEEA7,0xC1C4,0xEEA3,0xEEA8,
-	0xEEAF,0xEBA6,0xEEA9,0xEEA2,0xC1BD,0xEEA1,0xC1BE,0xEEB0,
-	0xC1BF,0xEEAE,0xC1C2,0xEE7E,INVALC,0xC1C1,INVALC,0xEEA6,
-	0xF0DC,0xF0EA,0xF0E5,0xF0E7,0xF0DB,0xC2D3,INVALC,0xF0DA,
-	0xC2D6,0xC2D5,INVALC,0xF0E9,0xF0E1,0xF0DE,0xF0E4,INVALC,
-	0xF0DD,INVALC,0xF0DF,0xF0E8,0xF0E6,INVALC,0xC2D4,0xF0ED,
-	0xF0EB,0xF0E2,0xF0EC,0xF0E3,INVALC,0xF2F9,0xC3CF,0xF341,
-	INVALC,INVALC,0xF64F,0xC3D6,0xF0E0,0xF2F7,0xC3D2,0xF2F8,
-	0xF2FD,INVALC,INVALC,0xC3D4,0xC3D5,0xF2F6,0xF340,0xF342,
-	0xF2FA,0xF2FC,0xF2FE,0xF2FB,0xF343,0xC3D1,0xC3D7,0xC3D3,
-	INVALC,0xC3D0,0xF4D0,INVALC,0xC4B7,0xF4CE,
-	/* Range 0x8B63 - 0x8B70, array index: 0x3779 */
-	0xF4D2,INVALC,0xF4D3,0xC4B5,0xF4D4,0xF4D1,INVALC,0xF4CF,
-	0xC4B8,0xC4B4,0xF4D5,INVALC,0xC4B6,0xC4B3,
-	/* Range 0x8B77 - 0x8B9F, array index: 0x3787 */
-	0xC540,0xF64E,0xF64D,0xF650,0xF651,INVALC,0xC541,0xF756,
-	0xF75B,0xC5AA,INVALC,0xF758,INVALC,0xF757,0xF75A,0xF759,
-	INVALC,0xF843,INVALC,0xC5DC,0xF842,0xF840,INVALC,0xF841,
-	INVALC,INVALC,INVALC,0xC5FE,0xC5FD,0xF8C1,0xF8C2,0xC640,
-	INVALC,0xF94D,0xF94E,0xC667,INVALC,0xC66D,INVALC,0xF9A9,
-	0xF9C8,
-	/* Range 0x8C39 - 0x8C57, array index: 0x37B0 */
-	0xD7CD,INVALC,0xD7CE,0xE052,0xE450,0xE7E5,0xC1C6,INVALC,
-	0xC1C5,0xF0EE,0xF344,INVALC,0xF844,0xA8A7,0xD3DE,0xB05A,
-	0xB361,0xE054,0xE053,0xBDDC,0xE7E6,0xBDDD,0xEEB1,0xC2D7,
-	INVALC,INVALC,INVALC,0xC676,0xA8A8,0xCDCB,0xD3DF,
-	/* Range 0x8C61 - 0x8CCC, array index: 0x37CF */
-	0xB648,0xB8E6,INVALC,0xE056,0xE055,0xE057,INVALC,0xE451,
-	0xE452,0xBBA8,0xBFDD,0xBDDE,0xBFDE,INVALC,0xEEB5,0xEEB2,
-	0xEEB4,0xEEB3,0xC1C7,INVALC,0xF0EF,0xF346,0xF345,0xCBA4,
-	0xB05C,0xB05B,0xD3E0,INVALC,0xD7D1,INVALC,INVALC,0xDBE7,
-	0xDBE6,0xB649,INVALC,0xE059,0xE05A,0xE058,INVALC,INVALC,
-	0xB8E8,0xB8E7,INVALC,0xBBAA,0xBBA9,INVALC,0xE7E7,0xEBB3,
-	0xEBB1,0xEBB2,0xBFDF,0xEEB7,0xEEB6,INVALC,0xF0F2,0xF0F1,
-	0xF0F0,0xF347,INVALC,0xF9AA,0xA8A9,0xAD73,INVALC,0xAD74,
-	0xB05D,0xB05E,0xD3E2,0xD3E1,0xD7D2,INVALC,0xB368,0xB366,
-	0xB363,0xB367,0xB365,0xB364,INVALC,INVALC,0xB64A,0xDBEA,
-	INVALC,0xB8ED,0xB64C,0xB651,0xDBEC,0xB653,0xB652,0xB655,
-	0xDBEB,0xDBE8,0xB64F,0xB64B,0xB64D,0xDBE9,0xB654,0xB650,
-	0xB64E,0xB8EF,0xB8EE,0xB8EC,0xB8F0,INVALC,0xB8EA,0xB8EB,
-	INVALC,0xB8E9,INVALC,0xE05B,
-	/* Range 0x8CCF - 0x8D0A, array index: 0x383B */
-	0xE454,INVALC,0xBBAC,0xBBAD,0xBBAB,INVALC,0xE453,INVALC,
-	0xE455,INVALC,0xE7EA,0xE7EC,INVALC,0xBDE7,0xE7ED,0xBDE0,
-	0xE7E9,0xBDDF,0xBDE9,0xBDE5,0xBDE6,0xBDE2,0xE7E8,0xBDE1,
-	0xE7EE,0xE7EB,INVALC,0xBDE8,INVALC,0xBDE3,0xBDE4,0xEBB5,
-	INVALC,0xEBB7,0xEBB6,INVALC,0xEBB8,0xBFE0,0xEBB4,INVALC,
-	INVALC,0xC1CB,0xEEB8,0xC1C8,0xC1CC,0xC1CA,0xC1C9,0xF0F3,
-	INVALC,0xF0F6,INVALC,0xF0F5,INVALC,0xF0F4,0xC2D8,0xF348,
-	0xF349,0xC3D8,0xF34A,0xC3D9,
-	/* Range 0x8D0F - 0x8D1B, array index: 0x3877 */
-	0xC4B9,0xF652,INVALC,INVALC,0xC542,0xF653,0xF75C,0xC5AB,
-	0xC5AC,INVALC,0xF845,INVALC,0xC642,
-	/* Range 0x8D64 - 0x8D85, array index: 0x3884 */
-	0xA8AA,INVALC,0xB36A,0xB369,0xE05C,0xE05D,INVALC,0xBBAE,
-	0xEBB9,0xBDEA,0xEBBA,0xEEB9,0xA8AB,INVALC,0xD0B2,0xAD76,
-	0xAD75,INVALC,0xD3E3,0xB05F,0xD3E4,0xD7D5,INVALC,0xD7D4,
-	INVALC,0xD7D3,INVALC,INVALC,0xDBEE,0xB658,INVALC,INVALC,
-	0xDBED,0xB657,
-	/* Range 0x8D89 - 0x8D96, array index: 0x38A6 */
-	0xDBEF,0xB656,INVALC,0xE05F,0xE062,0xE060,0xE061,0xE065,
-	0xE05E,0xE066,0xE063,0xE064,0xBBB0,0xE456,
-	/* Range 0x8D9B - 0x8DF4, array index: 0x38B4 */
-	0xE7F2,0xE7F0,INVALC,INVALC,0xBDEB,0xE7EF,0xE7F1,INVALC,
-	0xBDEC,INVALC,0xEBBB,INVALC,0xEBBC,0xC1CD,INVALC,0xF34C,
-	0xF34E,0xF34B,0xF34D,0xF4D6,0xF654,INVALC,INVALC,0xF96F,
-	0xA8AC,0xAD77,0xD3E5,0xD3E7,0xD3E6,INVALC,0xD7D8,0xB36C,
-	INVALC,0xD7D6,INVALC,0xB36B,0xD7D9,INVALC,0xD7DA,0xD7D7,
-	INVALC,INVALC,0xDBFB,0xB660,0xDBF3,0xDBF9,INVALC,INVALC,
-	0xB65B,0xB65E,0xDBF2,0xB659,0xDBF6,0xE06C,0xB65D,INVALC,
-	0xDBF1,INVALC,0xDBF7,0xDBF4,0xDBFA,0xDBF0,0xDBF8,0xB65C,
-	0xB65F,0xDBF5,0xB65A,INVALC,0xB8F2,0xE068,0xB8F1,0xE06F,
-	0xE06E,0xB8F8,INVALC,0xB8F9,0xE070,0xB8F3,0xE06D,0xB8F7,
-	0xE072,0xE069,INVALC,0xE06B,0xB8F4,0xE067,0xE06A,0xE071,
-	0xB8F5,0xE073,
-	/* Range 0x8DFA - 0x8E0A, array index: 0x390E */
-	0xB8F6,INVALC,0xBBB1,0xE45B,0xE461,0xE459,0xE462,INVALC,
-	0xE458,0xE45D,0xE463,0xE460,0xE45F,0xE45E,INVALC,0xE457,
-	0xE45C,
-	/* Range 0x8E0D - 0x8E2B, array index: 0x391F */
-	0xE45A,INVALC,0xBDF1,0xBDEE,0xE7FB,0xE841,0xE843,0xE840,
-	0xE7F8,0xE7FA,0xE845,0xE842,0xE7FC,0xE846,0xE7F9,0xE844,
-	0xBDEF,0xBDF5,0xBDF3,0xE7F3,0xBDF4,0xBDF0,0xE7F4,0xE7F6,
-	0xE7F5,0xE7FD,0xE7FE,INVALC,0xBDF2,INVALC,0xBDED,
-	/* Range 0x8E30 - 0x8E7C, array index: 0x393E */
-	0xEBC6,0xBFE2,INVALC,0xEBBD,0xBFE3,0xBFE6,0xEBC2,INVALC,
-	0xEBBF,0xBFE5,INVALC,INVALC,0xEBC3,0xEBC4,0xEBBE,0xEBC7,
-	0xEBC0,0xEBC5,0xBFE4,INVALC,0xBFE1,0xEBC1,INVALC,0xEEBF,
-	0xC1D0,0xC1CE,0xC1D1,0xC1CF,0xEEBE,0xEEBB,0xEEBA,INVALC,
-	0xEEBD,INVALC,INVALC,0xEEBC,0xF145,0xC2DE,0xF0FB,0xF0FA,
-	INVALC,0xC2D9,0xF141,0xF140,0xF0F7,0xF143,0xF0FC,0xC2DD,
-	0xF0F9,0xF142,0xF0F8,0xC2DA,0xC2DC,0xF0FD,0xC2DB,0xF0FE,
-	INVALC,0xF144,0xF352,INVALC,0xC3DE,0xF34F,INVALC,0xF353,
-	INVALC,INVALC,0xC3DB,0xF351,0xC3E0,INVALC,0xC3DD,INVALC,
-	0xF350,INVALC,0xC3DF,0xF354,0xC3DA,
-	/* Range 0x8E81 - 0x8EAC, array index: 0x398B */
-	0xC4BC,0xC4BE,INVALC,0xF4D9,0xC4BD,0xF4D7,0xC3DC,0xF4D8,
-	0xC4BB,0xC543,0xC545,0xF656,0xC544,0xF655,INVALC,0xF761,
-	0xC5AD,0xF760,0xC5AE,0xF75E,0xF75D,0xF762,0xF763,0xF846,
-	INVALC,0xF75F,INVALC,INVALC,0xF8C6,0xF8C3,0xF8C4,0xF8C5,
-	0xC65C,INVALC,0xF951,0xF950,0xF94F,0xF970,INVALC,0xF9BE,
-	0xF9AB,0xC66E,0xA8AD,0xB060,
-	/* Range 0x8EC9 - 0x8F64, array index: 0x39B7 */
-	0xF9AC,0xA8AE,0xAAEE,0xAD79,0xAD78,INVALC,0xB063,INVALC,
-	0xD3E8,0xB061,0xD3E9,0xB062,INVALC,INVALC,0xD7DF,0xD7DB,
-	INVALC,INVALC,0xB36D,0xD7DE,0xD7DD,0xD7DC,0xB36E,0xD7E0,
-	0xD7E1,INVALC,INVALC,INVALC,0xDC43,0xDC41,0xDC45,0xDC46,
-	0xDC4C,INVALC,0xDC48,0xDC4A,INVALC,0xDC42,0xDBFC,INVALC,
-	0xDC49,INVALC,INVALC,0xDC4B,0xDC44,0xDC47,0xDBFD,0xB662,
-	0xDC40,0xDBFE,0xB661,0xB663,INVALC,0xB8FD,0xE075,0xE077,
-	0xE076,0xE07B,0xB8FB,INVALC,0xE078,0xE074,0xE079,0xE07A,
-	0xB8FC,0xB8FE,0xE07C,INVALC,0xE467,0xE466,INVALC,0xE464,
-	0xE465,0xBBB3,0xBBB5,0xBBB2,0xBBB4,0xE84D,0xE84E,0xE849,
-	INVALC,0xE84A,0xBDF8,0xBDFD,0xBDF7,0xBDFE,0xBDF9,0xE84B,
-	INVALC,INVALC,0xE84C,0xE848,0xBE40,0xBDFB,INVALC,INVALC,
-	0xBDFA,0xBDFC,INVALC,0xE847,INVALC,0xEBCA,0xBFE8,INVALC,
-	INVALC,0xEBCC,0xBFEA,0xEBCF,0xEBCB,0xEBC9,0xEBCE,0xBFE9,
-	0xEBCD,INVALC,0xBFE7,INVALC,INVALC,0xC1D3,0xC1D6,0xEEC1,
-	INVALC,0xC1D4,0xEEC0,0xC1D2,0xC1D5,0xF146,0xF147,0xF148,
-	0xC2E0,INVALC,0xF149,INVALC,0xC2E1,0xC3E2,0xF358,0xF359,
-	0xF357,0xF356,0xF35A,0xC3E1,0xF4DD,0xF4DB,0xF4DC,0xF4DE,
-	0xF4DA,0xF4DF,0xF658,INVALC,0xF659,0xF657,0xC546,0xF764,
-	0xC5AF,0xF765,0xF848,0xF847,
-	/* Range 0x8FAD - 0x8FB4, array index: 0x3A53 */
-	0xC3E3,0xC47C,0xC547,0xA8B0,0xB064,0xB941,INVALC,0xF35B,
-	/* Range 0x8FC2 - 0x8FC6, array index: 0x3A5B */
-	0xA8B1,INVALC,0xA8B4,0xA8B3,0xA8B2,
-	/* Range 0x8FCD - 0x8FD7, array index: 0x3A60 */
-	0xCDCF,0xAAEF,INVALC,INVALC,0xAAF1,0xCDCC,0xCDCE,0xAAF0,
-	0xCDD1,0xCDD0,0xCDD2,
-	/* Range 0x8FE0 - 0x9006, array index: 0x3A6B */
-	0xD0B6,0xD0B4,0xAD7C,0xD0B3,0xADA3,0xAD7E,0xAD7B,INVALC,
-	0xADA4,INVALC,0xAD7D,0xADA2,INVALC,0xADA1,0xD0B5,INVALC,
-	0xAD7A,INVALC,INVALC,INVALC,0xB06A,0xD3EB,0xD3F1,0xB067,
-	0xB06E,INVALC,0xB069,0xD3EE,0xD3F0,0xB06C,0xD3EA,0xD3ED,
-	0xB068,0xB065,0xD3EC,0xB06B,0xD3EF,0xB06D,0xB066,
-	/* Range 0x900B - 0x9024, array index: 0x3A92 */
-	0xD7E3,0xD7E6,0xB370,INVALC,0xB37A,0xB376,0xD7E4,INVALC,
-	INVALC,0xB37E,0xB377,0xB37C,0xB372,INVALC,0xB36F,0xB371,
-	0xB37D,0xD7E5,0xB375,0xB378,0xB374,0xB379,0xD7E7,0xB37B,
-	0xB373,0xD7E2,
-	/* Range 0x902D - 0x9044, array index: 0x3AAC */
-	0xDC4D,0xB665,0xDC4F,INVALC,0xB667,0xB669,INVALC,0xDC4E,
-	0xB666,0xB66A,INVALC,0xB668,INVALC,INVALC,INVALC,0xB947,
-	0xE0A3,0xB94F,0xE07E,INVALC,0xB950,0xB945,INVALC,0xE0A1,
-	/* Range 0x9047 - 0x90A7, array index: 0x3AC4 */
-	0xB94A,INVALC,0xE0A2,0xB943,0xB942,INVALC,0xB94D,0xB94C,
-	0xB94B,0xB949,0xB94E,0xE07D,0xB944,0xB946,0xB948,INVALC,
-	INVALC,0xBBB8,0xBBBB,INVALC,0xBBBF,0xBBB9,0xBBBE,0xBBBC,
-	INVALC,0xBBB7,INVALC,0xBBBD,0xBBBA,INVALC,INVALC,INVALC,
-	0xE852,0xBE43,0xBE41,INVALC,0xE853,INVALC,0xBE44,0xBE42,
-	0xE851,0xE850,INVALC,0xBFF0,0xE84F,0xBFEE,0xBFED,0xEBD0,
-	0xBE45,0xBFEF,0xEBD1,0xBFF2,0xEBD2,0xBFF1,0xC1D8,0xEEC3,
-	0xC1D7,0xC1DC,0xC1DA,0xC1DB,0xC2E3,0xC1D9,0xEEC2,0xEBD3,
-	0xC2E2,0xC2E4,INVALC,0xC3E4,0xC3E5,INVALC,0xF4E0,INVALC,
-	0xC5DE,0xC5DD,0xA8B6,INVALC,INVALC,0xCA55,0xB06F,INVALC,
-	0xCA52,0xCA53,0xCA51,INVALC,0xCA54,INVALC,INVALC,0xCBAA,
-	0xCBA7,0xCBAC,0xCBA8,0xA8B7,0xA8BA,INVALC,0xCBA9,0xA8B9,
-	0xCBAB,
-	/* Range 0x90AF - 0x90B8, array index: 0x3B25 */
-	0xCDD5,0xCDD7,0xAAF4,0xCDD3,0xCDD6,0xCDD4,0xAAF2,0xAAF5,
-	INVALC,0xAAF3,
-	/* Range 0x90BD - 0x90CB, array index: 0x3B2F */
-	0xD0B8,0xD0BC,0xD0B9,INVALC,0xADA7,INVALC,0xADA8,INVALC,
-	0xD0BB,INVALC,0xD0BD,0xD0BF,INVALC,0xADA5,0xD0BE,
-	/* Range 0x90D4 - 0x915A, array index: 0x3B3E */
-	0xD7EE,0xD0BA,0xD3F2,0xD3FB,0xD3F9,0xD3F4,0xD3F5,0xD3FA,
-	0xD3FC,0xB071,INVALC,0xD3F7,0xD3F3,0xB070,0xB072,0xD3F6,
-	0xD3FD,0xD3F8,INVALC,INVALC,0xB3A1,0xD7F1,0xD7E9,0xD7EF,
-	0xD7F0,0xB3A2,INVALC,0xD7E8,0xD7EA,0xD0B7,0xD7EC,0xD7ED,
-	0xD7EB,0xB66C,INVALC,INVALC,INVALC,0xDC56,0xEBD4,0xDC57,
-	0xDC54,0xB3A3,0xB66E,0xDC53,0xDC59,0xDC58,0xB66B,0xDC5C,
-	0xDC52,0xDC5B,0xDC50,0xDC5A,0xDC55,0xB66D,INVALC,0xE0AA,
-	INVALC,0xE0A5,0xE0AB,0xE0A6,0xE0A4,0xE0A7,0xB951,INVALC,
-	0xE0A9,INVALC,0xE0A8,0xB952,0xBBC1,0xBBC0,0xE46E,0xE471,
-	0xE469,0xE46D,0xBBC2,0xE46C,0xE46A,0xE470,0xE46B,0xE468,
-	0xE46F,INVALC,0xE859,0xBE48,0xF14A,0xE856,0xE857,0xE855,
-	0xDC51,0xBE47,0xE85A,0xE854,0xBE46,0xBE49,0xE858,0xEBD5,
-	0xBFF3,0xEBD6,0xEBD7,INVALC,0xEEC4,0xC1DD,0xF14B,0xF14C,
-	INVALC,INVALC,0xF14D,0xF35D,0xF35C,0xF4E2,INVALC,0xF4E1,
-	0xF65B,0xF65C,0xF65A,0xF766,0xC5B0,0xA8BB,0xADAA,0xADA9,
-	0xB075,0xB074,0xD440,0xD441,0xD3FE,INVALC,0xB073,0xD7F5,
-	INVALC,0xD7F6,0xD7F2,0xB3A4,0xD7F3,INVALC,0xD7F4,
-	/* Range 0x915F - 0x917A, array index: 0x3BC5 */
-	0xDC5F,0xDC61,0xDC5D,0xDC60,0xB66F,0xDC5E,0xB670,INVALC,
-	INVALC,0xDD73,0xB955,0xB954,INVALC,0xB953,INVALC,0xE0AC,
-	0xE0AD,INVALC,INVALC,0xE473,0xE475,0xBBC6,0xBBC3,INVALC,
-	0xBBC5,0xBBC4,0xE474,0xE472,
-	/* Range 0x9180 - 0x9193, array index: 0x3BE1 */
-	0xE861,0xE85E,0xE85F,0xBE4D,0xE860,0xE85B,0xE85C,0xBE4A,
-	INVALC,0xBE4B,0xE85D,0xBE4C,INVALC,0xEBDB,INVALC,0xEBDC,
-	0xEBD9,0xEBDA,0xBFF4,0xEBD8,
-	/* Range 0x9199 - 0x91DD, array index: 0x3BF5 */
-	0xEEC8,0xEEC5,0xEEC7,0xC1E0,0xEECB,0xC1DF,0xEEC9,0xEECC,
-	0xEECA,0xEEC6,0xC1DE,INVALC,0xF14F,INVALC,0xF150,0xF14E,
-	INVALC,0xF152,0xC2E5,0xC2E6,0xF35F,0xC3E7,0xF151,0xF35E,
-	0xC3E6,0xF4E5,0xF4E6,0xC4BF,0xF4E4,INVALC,0xF4E3,INVALC,
-	0xF65D,0xC548,INVALC,0xF849,0xF8C8,0xF8C7,INVALC,0xC643,
-	0xC65D,0xF8C9,0xF971,INVALC,0xC66F,0xA8BC,0xAAF6,INVALC,
-	0xB956,INVALC,0xC4C0,0xA8BD,0xADAB,0xB3A5,0xB671,0xC2E7,
-	0xAAF7,INVALC,0xD0C1,0xD0C0,0xD442,INVALC,0xB078,0xB076,
-	0xB07A,0xD444,INVALC,0xB079,0xB077,
-	/* Range 0x91E2 - 0x91EE, array index: 0x3C3A */
-	0xD443,0xB3A8,0xD7FC,INVALC,0xB3A7,0xB3A9,0xD842,0xB3AB,
-	0xD7FE,0xD840,0xD7F7,0xB3AA,0xD843,
-	/* Range 0x91F1 - 0x91F9, array index: 0x3C47 */
-	0xD7F9,INVALC,0xD7FA,0xD7F8,0xB3A6,INVALC,0xD841,0xD7FB,
-	0xD7FD,
-	/* Range 0x91FD - 0x921E, array index: 0x3C50 */
-	0xDC6D,INVALC,0xDC6C,0xDC6A,0xDC62,0xDC71,0xDC65,0xDC6F,
-	0xDC76,0xDC6E,0xB679,INVALC,0xB675,0xDC63,INVALC,0xDC69,
-	0xB677,INVALC,0xDC68,0xB678,0xB67A,0xDC6B,INVALC,0xB672,
-	0xB673,0xDC77,0xDC75,INVALC,0xDC74,0xDC66,INVALC,0xDC72,
-	INVALC,0xB676,
-	/* Range 0x9223 - 0x9227, array index: 0x3C72 */
-	0xB674,0xDC73,0xDC64,0xDC67,0xDC70,
-	/* Range 0x922D - 0x9240, array index: 0x3C77 */
-	0xE4BA,0xE0B7,INVALC,0xE0B0,0xE0C3,0xE0CC,0xE0B3,0xB961,
-	INVALC,0xE0C0,0xB957,0xB959,0xB965,0xE0B1,INVALC,INVALC,
-	0xB95A,0xB95C,0xB966,0xB95B,
-	/* Range 0x9245 - 0x925B, array index: 0x3C8B */
-	0xB964,0xE0B9,INVALC,0xE0AE,0xB962,0xE0B8,0xB95E,0xE0CA,
-	0xB963,0xE0C8,0xE0BC,0xE0C6,0xB960,0xE0AF,0xE0C9,0xE0C4,
-	INVALC,0xE0CB,0xB958,INVALC,INVALC,0xB967,0xB95D,
-	/* Range 0x9260 - 0x9267, array index: 0x3CA2 */
-	0xE0BD,0xE0C1,INVALC,0xE0C5,0xB95F,0xE0B4,0xE0B2,0xE0BE,
-	/* Range 0x926C - 0x9272, array index: 0x3CAA */
-	0xE0BB,0xE0BA,INVALC,0xE0BF,0xE0C2,INVALC,0xE0C7,
-	/* Range 0x9276 - 0x928E, array index: 0x3CB1 */
-	0xE478,INVALC,0xBBC7,0xE4A4,0xE47A,0xBBCC,0xBBD0,0xE4AD,
-	0xE4B5,0xE4A6,0xBBC8,INVALC,0xE4AA,0xE0B6,INVALC,0xBBC9,
-	0xE4B1,0xE4B6,0xE4AE,INVALC,0xE4B0,0xE4B9,0xE4B2,0xE47E,
-	0xE4A9,
-	/* Range 0x9291 - 0x92AC, array index: 0x3CCA */
-	0xBBD1,INVALC,0xBBCD,0xE47C,0xE4AB,0xBBCB,0xE4A5,0xBBCA,
-	0xE4B3,0xE4A2,0xE479,0xBBCE,0xE4B8,INVALC,INVALC,0xE47B,
-	0xE4AF,0xE4AC,0xE4A7,0xE477,0xE476,0xE4A1,0xE4B4,0xBBCF,
-	0xE4B7,0xE47D,0xE4A3,0xBE52,
-	/* Range 0x92B2 - 0x92B7, array index: 0x3CE6 */
-	0xBE5A,0xBE55,0xE8A4,0xE8A1,0xE867,0xBE50,
-	/* Range 0x92C0 - 0x92E1, array index: 0x3CEC */
-	0xE865,0xBE54,0xE871,0xE863,0xE864,0xBE4E,0xE8A3,0xBE58,
-	0xE874,0xE879,0xE873,0xEBEE,0xE86F,0xE877,0xE875,0xE868,
-	0xE862,0xE87D,0xBE57,0xE87E,INVALC,0xE878,INVALC,0xE86D,
-	0xE86B,0xE866,INVALC,INVALC,INVALC,0xE86E,0xE87B,0xE86A,
-	0xE87A,0xE8A2,
-	/* Range 0x92E4 - 0x92F1, array index: 0x3D0E */
-	0xBE53,INVALC,0xE876,0xE87C,0xE872,0xE86C,0xBE51,INVALC,
-	INVALC,INVALC,0xE4A8,0xE870,0xBE59,0xE869,
-	/* Range 0x92F7 - 0x9339, array index: 0x3D1C */
-	0xEBF4,0xBFF7,0xEBF3,0xEBF0,0xEC44,0xBFFB,INVALC,0xEC41,
-	0xEBF8,0xEC43,0xEBE9,0xEBF6,INVALC,0xBFFD,INVALC,0xEBE1,
-	INVALC,0xEBDF,0xEC42,INVALC,0xEC40,0xEBFE,0xEBED,0xEBEC,
-	0xEBE2,0xC040,INVALC,0xEBE8,0xEBF2,0xEBFD,0xC043,0xEC45,
-	INVALC,0xC1E8,0xC045,0xBFFE,0xEBE6,INVALC,0xEBEF,0xEBDE,
-	0xEBE0,0xBFF5,0xC042,0xBFFA,0xEBE7,0xEBF7,0xEBF1,0xC041,
-	0xEBDD,0xC1E3,0xEBF9,0xEBFC,0xBFFC,INVALC,0xEBEB,0xC044,
-	0xBFF9,INVALC,INVALC,INVALC,0xBFF8,0xEBF5,0xEBFB,0xBFF6,
-	INVALC,0xEBE4,0xEBFA,
-	/* Range 0x9346 - 0x9367, array index: 0x3D5F */
-	0xEBEA,0xEED2,INVALC,0xEED7,0xC1E5,0xC1E7,0xEEDD,0xC1E1,
-	0xEEEC,0xEEE3,0xEED8,0xEED9,0xEEE2,INVALC,0xC1EE,0xEEE1,
-	0xEED1,0xEEE0,0xEED4,0xEEED,0xC1ED,0xC1EB,0xEED5,INVALC,
-	0xEEE8,INVALC,0xEEDA,0xEEE7,INVALC,0xEEE9,0xEED0,0xC1E6,
-	INVALC,0xEEEA,
-	/* Range 0x9375 - 0x9383, array index: 0x3D81 */
-	0xC1E4,0xEED6,0xEEE5,INVALC,0xEEDF,0xEBE3,0xEEE6,0xEED3,
-	INVALC,0xC1E9,INVALC,0xEEEB,INVALC,0xC1E2,0xEECE,
-	/* Range 0x9388 - 0x93B7, array index: 0x3D90 */
-	0xF160,0xF159,0xC2E9,INVALC,0xF154,0xF163,0xF15B,0xEEDC,
-	INVALC,0xF165,0xF155,INVALC,0xC2E8,0xF15F,0xC2EA,0xC2F2,
-	0xC2F0,0xF161,0xC2F1,0xF157,INVALC,0xF158,0xF15D,0xF162,
-	INVALC,0xEECD,0xC2EB,0xF16A,0xF167,0xF16B,0xF15E,0xF15A,
-	0xF168,0xF36A,0xF15C,INVALC,0xC2EE,INVALC,0xC2ED,0xEECF,
-	0xC2EF,0xF164,0xF166,0xC2EC,0xF169,0xF153,INVALC,0xF156,
-	/* Range 0x93C0 - 0x93E8, array index: 0x3DC0 */
-	0xF373,INVALC,0xF363,0xC3EB,0xF371,INVALC,INVALC,0xF361,
-	0xC3EC,INVALC,0xF36C,INVALC,0xF368,0xC3F1,0xF372,0xF362,
-	0xF365,0xC3E9,0xF374,INVALC,0xF36D,0xF370,0xC3EF,0xC3F4,
-	0xC3F2,0xF369,0xF364,INVALC,0xC3ED,0xC3EE,0xF360,0xC3EA,
-	INVALC,0xC3E8,0xC3F0,0xF36F,0xC3F3,INVALC,0xF36B,0xF375,
-	0xC3F5,
-	/* Range 0x93F5 - 0x9400, array index: 0x3DE9 */
-	0xF4F3,0xF542,0xF4F5,0xF4FC,0xF366,0xF4FA,0xF4E9,0xF540,
-	0xC4C3,0xF4ED,0xF4FE,0xF4F4,
-	/* Range 0x9406 - 0x9419, array index: 0x3DF5 */
-	0xF544,0xF4F6,INVALC,0xF4FB,0xF4FD,0xF4E7,0xF541,0xF4F2,
-	0xF4F7,0xF4EB,0xF4EF,0xF543,0xF4F9,0xF4E8,0xF4EC,0xF4EE,
-	0xF4F8,INVALC,0xC4C1,0xF4F1,
-	/* Range 0x9428 - 0x9452, array index: 0x3E09 */
-	0xF4F0,0xF661,0xF666,0xC54F,0xF668,INVALC,0xC549,INVALC,
-	0xF664,0xF66A,0xC54E,0xC54A,INVALC,0xC54B,0xF660,0xF667,
-	0xC54D,0xF665,0xC54C,0xF65F,0xF663,0xF662,INVALC,0xF65E,
-	0xF669,INVALC,INVALC,INVALC,0xC5B1,0xF76D,0xF770,0xF76C,
-	0xF76E,0xF76F,0xF769,0xF76A,0xF767,INVALC,INVALC,0xF76B,
-	0xF768,0xC5B2,0xC5B3,
-	/* Range 0x9460 - 0x9483, array index: 0x3E34 */
-	0xC5E0,INVALC,0xF84A,0xC5DF,0xC5E1,INVALC,INVALC,INVALC,
-	0xF8CB,0xF8CC,0xC644,0xF8CA,INVALC,0xF953,0xF952,0xF954,
-	0xC65F,0xF955,0xC65E,0xF956,0xF972,0xF975,0xF974,0xC668,
-	0xF973,INVALC,INVALC,INVALC,0xC672,0xC670,0xC671,0xC677,
-	0xF9C0,0xF9C1,0xF9BF,0xF9C9,
-	/* Range 0x957A - 0x957D, array index: 0x3E58 */
-	0xD844,0xDC78,0xE8A5,0xF376,
-	/* Range 0x9588 - 0x9594, array index: 0x3E5C */
-	0xD846,0xB3AC,INVALC,0xB67D,0xDC7A,0xDC79,0xB6A3,0xB67C,
-	0xDC7B,0xB67E,0xB6A2,0xB6A1,0xB67B,
-	/* Range 0x959B - 0x95C0, array index: 0x3E69 */
-	0xE0D0,0xE0CE,INVALC,0xE0CF,0xE0CD,INVALC,0xBBD2,INVALC,
-	0xBBD5,0xBBD7,0xBBD6,INVALC,INVALC,0xBBD3,0xBBD4,INVALC,
-	0xE8A7,0xE8A6,0xBE5B,0xE8A8,INVALC,0xE8A9,0xBE5C,INVALC,
-	INVALC,INVALC,0xEC4D,0xEC4B,0xEEF3,INVALC,0xEC49,0xEC4A,
-	0xC046,0xEC46,0xEC4E,0xEC48,0xEC4C,0xEEEF,
-	/* Range 0x95C3 - 0x95E5, array index: 0x3E8F */
-	0xEEF1,INVALC,0xEEF2,0xC1F3,0xEEEE,0xC1F2,0xEEF0,0xC1EF,
-	0xC1F0,0xC1F1,0xEC47,INVALC,INVALC,0xC2F5,0xF16E,0xF16C,
-	0xF16D,0xC2F3,0xC2F6,0xC2F4,INVALC,INVALC,INVALC,0xF377,
-	0xF378,0xC3F6,INVALC,0xF545,0xF547,0xF546,0xC4C4,0xC550,
-	0xF66D,0xF66C,0xF66B,
-	/* Range 0x961E - 0x9624, array index: 0x3EB2 */
-	0xC9AA,INVALC,0xCA58,0xA6E9,0xCA56,0xCA59,0xCA57,
-	/* Range 0x962A - 0x9632, array index: 0x3EB9 */
-	0xA8C1,INVALC,0xA8C2,0xCBB0,0xA8BF,0xCBAF,0xCBAD,0xA8C0,
-	0xA8BE,
-	/* Range 0x9639 - 0x9644, array index: 0x3EC2 */
-	0xCDD8,0xCDDB,0xAAFD,0xCDDA,0xCDD9,INVALC,0xAAFC,0xAAFB,
-	INVALC,0xAB40,0xCDDC,0xAAFE,
-	/* Range 0x964A - 0x9654, array index: 0x3ECE */
-	0xD0C6,0xADAE,0xADAF,0xADB0,0xD0C7,0xD0C3,0xADAD,0xD0C4,
-	INVALC,0xD0C5,0xD0C2,
-	/* Range 0x965B - 0x9664, array index: 0x3ED9 */
-	0xB0A1,0xD445,0xB0A2,0xB0A5,0xD446,INVALC,0xB07E,0xB07C,
-	0xB07D,0xB0A3,
-	/* Range 0x966A - 0x96B4, array index: 0x3EE3 */
-	0xB3AD,0xD849,0xB3B5,0xD848,INVALC,0xD84B,0xB3B1,0xD84A,
-	0xB6AB,0xB3AF,0xB3B2,0xB3AE,0xB3B3,0xB3B4,0xB3B0,INVALC,
-	INVALC,INVALC,0xD847,0xB6A7,0xDC7D,INVALC,0xDCA3,INVALC,
-	INVALC,0xDCA2,0xB6AC,0xB6A8,0xB6A9,0xDC7C,0xDC7E,0xDCA1,
-	0xB6A4,0xB6A6,INVALC,0xB6AA,0xB6A5,INVALC,INVALC,0xE0D3,
-	0xE0D1,0xE0D2,0xB96A,0xB96B,INVALC,0xE0D4,0xB969,0xBBD8,
-	INVALC,0xBBDA,0xBBD9,INVALC,0xE4BB,INVALC,INVALC,0xE4BC,
-	0xE8AB,INVALC,0xE8AA,INVALC,INVALC,0xC047,0xC048,0xEC4F,
-	0xC049,INVALC,0xEEF6,INVALC,0xEEF4,INVALC,0xEEF5,0xC1F4,
-	INVALC,0xF16F,0xC3F7,
-	/* Range 0x96B8 - 0x96EA, array index: 0x3F2E */
-	0xC1F5,0xAB41,INVALC,0xB0A6,0xD447,INVALC,INVALC,0xD84C,
-	0xB3B6,0xB6AD,0xDCA4,0xDCA6,0xB6AF,0xB6AE,0xB6B0,0xB6B1,
-	0xDCA5,0xB96E,0xB96F,0xB96D,0xBBDB,0xB96C,0xE0D5,INVALC,
-	INVALC,INVALC,0xBBDC,0xE8AC,0xEC50,0xC04A,0xC1F6,0xF170,
-	0xF174,0xC2F9,0xF171,0xC2FA,0xC2F8,0xF175,0xC2FB,0xF173,
-	INVALC,0xF379,0xC2F7,0xC3F8,INVALC,0xF8CD,INVALC,INVALC,
-	0xAB42,0xB3B8,0xB3B7,
-	/* Range 0x96EF - 0x9713, array index: 0x3F61 */
-	0xB6B2,0xDCA8,0xDCA7,0xB6B3,INVALC,INVALC,0xE0D9,0xB973,
-	0xB970,0xE0D8,0xB972,0xE0D6,0xB971,INVALC,0xE0D7,INVALC,
-	0xE4BD,0xBBDD,INVALC,0xE8AF,INVALC,0xBE5D,0xE8AD,0xBE5E,
-	0xBE5F,0xE8AE,0xBE60,INVALC,0xEC51,INVALC,0xC04E,0xC04B,
-	0xC050,0xEC53,0xC04C,0xEC52,0xC04F,
-	/* Range 0x9718 - 0x9732, array index: 0x3F86 */
-	0xEEF9,0xEEFB,INVALC,INVALC,0xC1F7,0xEEFA,0xC1F8,0xEEF8,
-	0xEEF7,INVALC,0xF177,0xF176,0xC2FC,0xF178,0xF37E,0xC3FA,
-	0xF37D,0xF37A,0xC3F9,0xF37B,0xF37C,INVALC,0xF548,0xF549,
-	0xC4C5,INVALC,0xC553,
-	/* Range 0x9738 - 0x974B, array index: 0x3FA1 */
-	0xC551,0xC552,0xF66F,INVALC,INVALC,0xC5B4,0xC5B5,0xF771,
-	INVALC,INVALC,0xC645,0xF8CF,0xC647,INVALC,0xF8CE,0xF8D0,
-	0xC646,0xF957,INVALC,0xF9AD,
-	/* Range 0x9758 - 0x9762, array index: 0x3FB5 */
-	0xE4BE,INVALC,0xE8B0,0xC051,0xC052,INVALC,0xAB44,INVALC,
-	0xBE61,0xC3FB,0xADB1,
-	/* Range 0x9766 - 0x9785, array index: 0x3FC0 */
-	0xC053,INVALC,0xC5E2,0xADB2,0xD84D,INVALC,0xDCA9,INVALC,
-	0xDCAB,INVALC,0xDCAA,INVALC,0xE0DD,0xE0DA,0xB975,INVALC,
-	0xB976,0xE0DB,0xE0DC,INVALC,0xE4C0,0xE4C5,0xBBDE,0xE4BF,
-	0xE4C1,0xE4C8,0xE4C3,0xE4C7,0xE4C4,0xE4C2,0xE4C6,0xBBDF,
-	/* Range 0x978A - 0x978F, array index: 0x3FE0 */
-	0xE8B1,0xBE63,INVALC,0xBE62,0xE8B2,0xBE64,
-	/* Range 0x9797 - 0x97AE, array index: 0x3FE6 */
-	0xEC55,0xC054,0xEC54,0xEEFC,INVALC,0xEEFE,0xEF41,0xEF40,
-	INVALC,0xC1F9,0xEEFD,0xF1A1,0xC2FD,0xF17D,0xF1A2,0xC2FE,
-	INVALC,0xF17B,INVALC,0xF17E,0xF17C,0xF179,0xC340,0xF17A,
-	/* Range 0x97C1 - 0x97E5, array index: 0x3FFE */
-	0xC5B7,INVALC,0xC5B6,0xF84F,0xF850,0xC648,0xF8D1,INVALC,
-	0xC669,INVALC,0xADB3,0xB6B4,0xE4CA,0xE4C9,0xE8B5,0xE8B4,
-	INVALC,INVALC,0xC1FA,0xEF43,0xEF42,0xF1A5,0xF1A3,0xF1A6,
-	0xF1A4,INVALC,INVALC,0xC3FC,0xF3A4,0xF3A5,0xF3A6,INVALC,
-	0xF671,INVALC,0xF772,INVALC,0xF8D2,
-	/* Range 0x97F6 - 0x9821, array index: 0x4023 */
-	0xBBE0,INVALC,0xEC58,0xC341,0xF1A7,0xC3FD,INVALC,0xF54C,
-	0xF54D,0xC554,0xF851,0xADB6,0xB3BB,0xB3BC,0xD84E,0xB6B5,
-	0xB6B6,0xDCAC,0xB6B7,INVALC,0xB97A,INVALC,0xB97C,0xE0DF,
-	0xE0E0,0xE0DE,0xB977,0xB978,0xB97B,0xB979,INVALC,INVALC,
-	0xE4CB,0xBBE1,0xBBE2,INVALC,INVALC,0xE8BC,0xBE67,0xE8B7,
-	0xE8B6,INVALC,0xE8BB,0xBE65,
-	/* Range 0x9824 - 0x9832, array index: 0x404F */
-	0xC05B,INVALC,0xE8B8,0xE8BD,0xE8BA,0xE8B9,INVALC,0xBE66,
-	INVALC,0xC059,INVALC,0xEC5A,0xC055,INVALC,0xEC5B,
-	/* Range 0x9835 - 0x983B, array index: 0x405E */
-	0xEC59,INVALC,0xC058,0xC056,0xC05A,INVALC,0xC057,
-	/* Range 0x9841 - 0x9874, array index: 0x4065 */
-	0xEF45,INVALC,0xEF4A,0xEF46,0xEF49,0xC1FB,INVALC,0xEDD4,
-	0xEF48,0xEF47,INVALC,0xC344,0xC342,0xC345,0xC343,0xF1A8,
-	0xF1A9,0xF1AA,0xC346,INVALC,INVALC,INVALC,0xF3AA,0xC440,
-	0xF3A8,INVALC,0xC441,0xF3A7,0xF3A9,0xC3FE,0xF551,0xF54E,
-	INVALC,0xF54F,0xF550,0xF672,0xC556,INVALC,0xC555,INVALC,
-	0xF774,0xF773,0xC5B8,INVALC,INVALC,INVALC,0xC5E3,0xC649,
-	0xC660,0xF958,0xF9AE,0xF9AF,
-	/* Range 0x98A8 - 0x98B3, array index: 0x4099 */
-	0xADB7,0xDCAD,INVALC,INVALC,0xE0E1,0xE4CC,0xE4CD,0xBBE3,
-	INVALC,0xBBE4,0xE8BE,0xBE68,
-	/* Range 0x98B8 - 0x98C6, array index: 0x40A5 */
-	0xF1AB,INVALC,0xC347,0xF3AD,0xC442,0xF3AC,0xF3AE,0xF3AB,
-	0xF675,0xF552,0xF553,INVALC,0xC4C6,INVALC,0xF674,
-	/* Range 0x98E7 - 0x98EF, array index: 0x40B4 */
-	0xB6B8,INVALC,0xB6BB,0xB6B9,0xDCAE,INVALC,0xB6BD,INVALC,
-	0xB6BA,
-	/* Range 0x98F9 - 0x9935, array index: 0x40BD */
-	0xE0E3,0xE8C0,INVALC,0xB97D,0xB9A1,0xB9A2,INVALC,0xE4CF,
-	INVALC,0xE4CE,0xBBE5,INVALC,0xBBE6,INVALC,0xE4D0,0xE8BF,
-	0xBBE8,0xBE69,INVALC,0xBBE7,INVALC,INVALC,INVALC,0xC05C,
-	0xE8C1,0xBE6B,0xBE6A,0xE8C2,0xE8C5,0xE8C3,0xE8C4,0xBE6C,
-	INVALC,0xC061,0xC05F,INVALC,INVALC,0xC05E,0xEC5D,INVALC,
-	0xC060,INVALC,INVALC,0xEC5C,0xEF4B,INVALC,0xEC5E,0xC05D,
-	0xEC5F,0xEF4E,0xEF4C,0xEF4D,0xEF52,0xC34B,0xEF51,0xEF54,
-	0xEF53,0xEF50,0xEF4F,INVALC,0xC1FD,
-	/* Range 0x993A - 0x9961, array index: 0x40FA */
-	0xF1AE,INVALC,0xF1AD,0xC34A,0xC348,0xC349,INVALC,0xF1AC,
-	INVALC,0xF3B1,INVALC,0xC443,INVALC,0xF3B0,0xF3AF,0xC444,
-	INVALC,0xF558,0xF557,INVALC,0xF555,INVALC,0xF554,0xC4C8,
-	0xC4C7,0xF559,0xF776,0xC5B9,0xF677,0xC557,0xF676,0xF556,
-	INVALC,0xF777,0xC5E4,INVALC,0xC661,0xF959,INVALC,0xF9B1,
-	/* Range 0x9996 - 0x999E, array index: 0x4122 */
-	0xADBA,0xD850,0xEF55,0xADBB,INVALC,INVALC,0xE4D2,0xE4D1,
-	0xEC60,
-	/* Range 0x99A3 - 0x99C3, array index: 0x412B */
-	0xEF56,INVALC,0xC34C,0xF3B2,0xF3B3,0xC4C9,INVALC,INVALC,
-	0xF9B2,0xB0A8,0xB6BF,0xB6BE,0xE0E4,0xE0E6,0xB9A4,0xE0E5,
-	0xB9A3,0xB9A5,0xE0E7,INVALC,INVALC,INVALC,0xE4D4,0xE4D6,
-	0xE4D5,INVALC,0xE4D8,INVALC,INVALC,INVALC,0xBBE9,0xE4D7,
-	0xE4D3,
-	/* Range 0x99C9 - 0x99F1, array index: 0x414C */
-	0xE8CC,INVALC,0xE8CF,0xE8D1,0xE8C7,0xE8CB,0xE8C8,0xBE6E,
-	0xBE71,0xBE73,0xE8C9,0xE8CA,0xBE72,0xE8CD,0xE8D0,0xE8CE,
-	0xBE74,INVALC,0xBE70,0xE8C6,0xBE6D,INVALC,0xBE6F,INVALC,
-	INVALC,0xC063,0xEC66,0xEC64,0xEC63,INVALC,0xEC69,INVALC,
-	0xEC68,0xEC67,INVALC,0xEC62,0xC062,0xEC61,INVALC,0xEC65,
-	0xC064,
-	/* Range 0x99F4 - 0x9A6B, array index: 0x4175 */
-	0xEF5A,INVALC,0xEF5E,0xEF5B,0xEF5D,0xEF5C,0xEF59,0xEF5F,
-	0xEF62,0xEF60,0xEF61,0xC240,INVALC,0xC1FE,0xEF58,0xEF63,
-	0xF1B3,0xF1B6,0xF1B8,0xF1B7,INVALC,0xF1B1,0xF1B5,0xF1B0,
-	INVALC,0xF1B2,0xC34D,0xF1AF,INVALC,0xF1B4,INVALC,INVALC,
-	0xF3C0,0xF3B5,0xC445,INVALC,INVALC,0xC446,0xF3B4,0xF3B9,
-	0xF3BF,0xF3B7,0xF3BE,INVALC,0xF3BB,INVALC,0xF3BA,0xF3BD,
-	0xF3B8,0xF3B6,INVALC,0xF3BC,INVALC,0xF560,0xF55E,0xC4CA,
-	0xF55D,0xF563,0xF561,INVALC,0xC4CB,0xF55C,0xF55A,INVALC,
-	0xF55B,0xC4CD,0xF55F,0xC4CC,0xF562,0xF678,0xF67E,INVALC,
-	INVALC,0xF679,0xC55B,0xF6A1,0xC55A,0xF67D,0xF67C,0xC559,
-	0xF67B,0xC558,0xF67A,INVALC,0xF77D,0xF7A1,0xF77E,INVALC,
-	0xF77B,0xC5BB,0xF778,0xF77C,0xF7A3,INVALC,0xF7A2,0xF779,
-	0xF77A,0xC5BA,0xF852,0xC5E7,INVALC,0xF853,0xC5E5,0xC5E6,
-	INVALC,INVALC,0xF8D3,0xC64A,0xF976,INVALC,0xC66A,INVALC,
-	0xF9B3,0xC66B,0xF9B4,0xF9B5,0xF9C3,0xF9C2,0xC67A,0xF9CD,
-	/* Range 0x9AAD - 0x9AC2, array index: 0x41ED */
-	0xE0E8,INVALC,0xBBEA,0xBBEB,0xE4DA,INVALC,0xE8D2,0xEC6C,
-	INVALC,INVALC,0xBE75,0xC065,0xEC6A,INVALC,0xEC6D,0xC066,
-	INVALC,0xEF64,0xEC6B,0xF1B9,0xC34E,0xF3C1,
-	/* Range 0x9ACD - 0x9AD8, array index: 0x4203 */
-	0xF6A2,INVALC,0xC55C,0xF7A4,0xC5EA,0xC5BC,0xC5E8,0xC5E9,
-	0xF8D4,0xC662,INVALC,0xB0AA,
-	/* Range 0x9AEB - 0x9AFE, array index: 0x420F */
-	0xE8D4,0xE8D3,0xC068,0xBE76,0xBE77,INVALC,0xE8D7,0xE8D6,
-	0xE8D5,INVALC,INVALC,0xEC6E,0xEC71,INVALC,0xEC70,0xEC6F,
-	0xC067,0xEF68,0xEF66,0xEF65,
-	/* Range 0x9B01 - 0x9B61, array index: 0x4223 */
-	0xEF67,INVALC,0xC34F,0xF1BC,0xF1BD,0xC350,INVALC,0xF1BB,
-	INVALC,0xF3C3,0xF3C2,0xF3C5,0xC447,0xF3C4,INVALC,0xF567,
-	0xF569,0xF568,INVALC,INVALC,0xF6A3,0xF6A6,0xF6A4,0xF6A5,
-	0xF7A5,0xC5BD,INVALC,INVALC,INVALC,0xF854,0xF855,0xF856,
-	INVALC,0xC64B,0xC663,0xF9B6,0xB0AB,INVALC,0xBE78,0xC069,
-	0xF1BE,INVALC,0xF7A6,INVALC,INVALC,0xF9C4,0xD44A,INVALC,
-	0xC67B,0xB0AC,0xEC72,INVALC,0xF1BF,INVALC,0xF3C6,INVALC,
-	INVALC,0xF6A7,0xF7A7,0xB0AD,INVALC,0xE4DD,0xE4DE,INVALC,
-	0xBBED,0xBBEE,0xE8D9,0xBE7A,0xBE79,0xE8D8,INVALC,0xEF69,
-	INVALC,0xF1C0,0xF1C2,0xF1C1,0xC353,0xC352,0xC351,INVALC,
-	0xC55E,0xF6A8,INVALC,0xC55D,0xF7A9,0xF7A8,INVALC,0xC64C,
-	0xF8D5,0xB3BD,0xE0EA,INVALC,INVALC,INVALC,0xE4E1,0xE4DF,
-	0xE4E0,
-	/* Range 0x9B64 - 0x9B68, array index: 0x4284 */
-	0xE8E2,INVALC,0xE8DD,0xE8DA,0xE8E1,
-	/* Range 0x9B6F - 0x9B88, array index: 0x4289 */
-	0xBE7C,0xE8E0,0xE8DC,INVALC,INVALC,0xE8DB,0xE8DF,0xE8DE,
-	0xBE7B,INVALC,INVALC,0xEC7D,0xEC78,0xEC76,0xECA1,0xEC77,
-	INVALC,0xEC73,INVALC,0xEC79,INVALC,INVALC,0xEC74,0xEF72,
-	0xEC75,0xECA2,
-	/* Range 0x9B90 - 0x9B95, array index: 0x42A3 */
-	0xEC7C,0xC06A,0xEC7B,0xEC7A,INVALC,0xEC7E,
-	/* Range 0x9B9E - 0x9BAF, array index: 0x42A9 */
-	0xEF6C,INVALC,0xEF74,0xEF6F,0xEF73,INVALC,0xEF71,0xEF70,
-	0xEF6E,INVALC,0xEF6B,INVALC,0xC243,0xC242,INVALC,0xC244,
-	0xC241,0xEF75,
-	/* Range 0x9BB5 - 0x9BB9, array index: 0x42BB */
-	0xF1C8,0xF1CB,INVALC,0xF1C9,0xF1CD,
-	/* Range 0x9BBD - 0x9BCA, array index: 0x42C0 */
-	0xF1CE,INVALC,0xF1C6,0xC358,0xF1C7,INVALC,0xF1C5,0xF1CC,
-	INVALC,0xF1C4,0xF1C3,0xC357,0xC355,0xC354,
-	/* Range 0x9BD3 - 0x9BEC, array index: 0x42CE */
-	0xF1CA,0xF3CF,0xF3D5,0xC44A,0xF3D0,INVALC,0xF3D3,0xF3D7,
-	0xC44B,0xF3D2,INVALC,0xF3CA,INVALC,0xF3C9,0xF3D6,0xF3CD,
-	INVALC,0xF3CB,0xF3D4,0xF3CC,0xC449,0xC448,INVALC,0xF3C7,
-	0xF3C8,0xF3D1,
-	/* Range 0x9C05 - 0x9C14, array index: 0x42E8 */
-	0xF56D,0xF573,0xF571,0xF56B,0xF576,INVALC,0xF56A,INVALC,
-	0xC4CF,0xF572,INVALC,INVALC,INVALC,0xF56E,0xC4CE,0xF575,
-	/* Range 0x9C21 - 0x9C41, array index: 0x42F8 */
-	0xF6B1,INVALC,0xF6AD,0xF6B0,0xC560,INVALC,INVALC,0xF6AE,
-	0xF6AF,INVALC,0xF6A9,0xF6AC,0xC55F,INVALC,INVALC,INVALC,
-	0xC5BF,0xF7B4,0xF7AF,0xF7B3,INVALC,0xF7B6,0xF7B2,INVALC,
-	0xF7AE,INVALC,0xC5C1,0xF7B1,0xF7B5,0xC5C0,0xF7AC,0xF570,
-	0xF7B0,
-	/* Range 0x9C46 - 0x9C59, array index: 0x4319 */
-	0xF7AA,INVALC,0xF7AB,0xC5BE,0xF85A,0xF85C,0xF85F,0xF85B,
-	0xF860,INVALC,0xF859,INVALC,0xF857,INVALC,0xC5EB,0xF85D,
-	0xC5ED,0xC5EC,0xF858,0xF85E,
-	/* Range 0x9C5E - 0x9C68, array index: 0x432D */
-	0xF8DA,0xC64D,0xF8DB,INVALC,0xF8D9,0xF8D6,INVALC,INVALC,
-	0xF8D8,0xF8D7,0xF95A,
-	/* Range 0x9C71 - 0x9C7A, array index: 0x4338 */
-	0xF979,INVALC,0xF978,0xF977,0xF97A,INVALC,0xC673,0xC674,
-	0xF9CA,0xF9CE,
-	/* Range 0x9CE5 - 0x9CEA, array index: 0x4342 */
-	0xB3BE,0xDCAF,0xE0ED,INVALC,0xB9A7,0xE0EB,
-	/* Range 0x9CF1 - 0x9D09, array index: 0x4348 */
-	0xE4E2,0xE4E3,0xBBF1,0xBBEF,0xE4E4,0xBBF0,0xE8E8,INVALC,
-	0xE8EB,0xE8E5,0xE8EC,0xE8E4,0xE8E6,INVALC,0xE8E7,0xE8EA,
-	INVALC,INVALC,0xBEA1,0xE8EF,0xE8EE,0xBE7D,0xE8E9,0xE8ED,
-	0xBE7E,
-	/* Range 0x9D14 - 0x9D38, array index: 0x4361 */
-	0xECA7,0xC06B,INVALC,0xECA4,0xECAA,0xECAD,INVALC,0xC070,
-	INVALC,0xECA9,0xECA6,0xECAE,0xECA5,INVALC,0xECAB,0xC06C,
-	INVALC,0xECA3,0xC06D,INVALC,0xC06E,0xECA8,INVALC,INVALC,
-	INVALC,0xEFA9,0xEF7A,0xEF7B,0xEF7E,0xEF7C,INVALC,0xEF76,
-	INVALC,INVALC,0xEF79,0xEFA5,0xEF7D,
-	/* Range 0x9D3B - 0x9D45, array index: 0x4386 */
-	0xC245,INVALC,0xEFA7,0xEFA4,0xC246,0xEFA6,0xEF77,0xEFA2,
-	0xEFA3,INVALC,0xEFA1,
-	/* Range 0x9D4A - 0x9D4C, array index: 0x4391 */
-	0xF1D2,0xF1D4,0xF1D7,
-	/* Range 0x9D4F - 0x9D61, array index: 0x4394 */
-	0xF1D1,INVALC,0xC359,0xF1D9,0xF1D0,0xF1DA,INVALC,0xF1D6,
-	0xF1D8,0xF1DC,0xF1D5,0xF1DD,0xF1D3,0xF1CF,0xC35A,INVALC,
-	0xF1DB,0xC35B,0xC44D,
-	/* Range 0x9D67 - 0x9D8C, array index: 0x43A7 */
-	0xEF78,0xF3F1,0xF3E8,0xC44F,0xF3E4,0xC450,INVALC,INVALC,
-	0xF3ED,0xF3E7,0xF3DD,0xC44E,0xF3EA,0xF3E5,0xF3E6,INVALC,
-	0xF3D8,0xF3DF,0xF3EE,INVALC,0xF3EB,INVALC,0xF3E3,INVALC,
-	0xF3EF,0xF3DE,0xF3D9,0xF3EC,INVALC,0xF3DB,0xF3E9,0xF3E0,
-	0xF3F0,0xF3DC,0xC44C,0xF3DA,0xF3E1,0xF3E2,
-	/* Range 0x9D94 - 0x9E1E, array index: 0x43CD */
-	0xF5A2,INVALC,0xF5AE,0xF5A5,0xF57C,0xF578,0xF5A7,0xF57E,
-	0xF5A3,0xF57A,0xF5AA,0xF577,0xF5A1,0xF5A6,0xF5A8,0xF5AB,
-	0xF579,INVALC,0xF5AF,0xF5B0,0xF5A9,0xF5AD,0xF5A4,INVALC,
-	0xF6C1,0xF6C4,INVALC,0xC561,INVALC,0xF6C3,0xF6C8,0xF6C6,
-	0xC562,0xF6BD,0xF6B3,0xF6B2,0xC564,0xF6BF,0xF6C0,0xF6BC,
-	0xF6B4,INVALC,0xF6B9,0xF5AC,INVALC,0xF6B5,0xC563,0xF6BB,
-	INVALC,0xF6BA,INVALC,0xF6B6,0xF6C2,INVALC,0xF6B7,0xF7BB,
-	0xF6C5,0xF6C7,0xF6BE,0xF6B8,0xF7BC,0xF7BE,0xF7B8,0xC5C2,
-	INVALC,0xF7C5,0xF7C3,0xC5C3,0xF7C2,0xF7C1,0xF7BA,0xF7B7,
-	0xF7BD,0xF7C6,0xF7B9,0xF7BF,INVALC,0xF869,0xF86E,0xF864,
-	0xF867,0xC5EE,0xF86B,INVALC,0xF872,0xF7C0,INVALC,0xF865,
-	0xF86F,0xF873,0xF86A,0xF863,0xF86D,INVALC,0xF86C,0xF871,
-	0xF870,0xF7C4,0xF868,0xF862,0xF866,0xC64E,0xC64F,0xF861,
-	INVALC,0xF8E6,0xF8DD,0xF8E5,0xF8E2,0xF8E3,0xF8DC,0xF8DF,
-	0xF8E7,0xF8E1,0xF8E0,0xF8DE,INVALC,0xF8E4,INVALC,0xF95D,
-	INVALC,0xF95E,INVALC,0xF960,0xF95F,0xF962,0xF961,0xF97C,
-	0xF97B,0xF9B7,INVALC,0xF9B8,INVALC,0xF9C5,0xC678,0xC67C,
-	INVALC,0xF9CF,0xC67D,
-	/* Range 0x9E79 - 0x9E94, array index: 0x4458 */
-	0xC4D0,0xF6C9,INVALC,0xC650,0xC651,INVALC,0xB3C0,0xE0EE,
-	INVALC,0xB9A8,0xE8F0,INVALC,INVALC,0xECB0,0xECB1,0xECAF,
-	0xEFAB,0xEFAA,0xC247,0xF1DF,0xEFAC,0xF1DE,INVALC,INVALC,
-	0xF3F3,0xC451,0xC453,0xF3F2,
-	/* Range 0x9E97 - 0x9EA9, array index: 0x4474 */
-	0xC452,INVALC,0xF5B1,0xF5B3,0xF5B2,0xF6CA,0xC565,INVALC,
-	0xC5EF,0xF8E8,0xF963,INVALC,INVALC,0xF9D2,0xB3C1,INVALC,
-	0xE4E5,INVALC,0xBEA2,
-	/* Range 0x9EB4 - 0x9EB7, array index: 0x4487 */
-	0xC454,0xC4D1,0xF7C7,0xF9CB,
-	/* Range 0x9ECC - 0x9EE8, array index: 0x448B */
-	0xC664,0xB6C1,0xBEA4,0xC248,0xF875,0xB6C2,INVALC,0xE8F1,
-	0xC072,0xECB4,0xECB5,INVALC,0xC071,INVALC,0xEFAF,0xC24C,
-	0xC24A,0xC24B,0xC249,0xF1E0,0xC35C,INVALC,INVALC,INVALC,
-	0xF5B5,0xF5B4,0xF5B7,0xF5B6,0xC4D2,
-	/* Range 0x9EEB - 0x9F01, array index: 0x44A8 */
-	0xF6CB,INVALC,0xF6CD,0xF6CC,0xC566,0xF7C8,INVALC,0xF876,
-	0xF877,0xC5F0,0xF964,0xF97D,0xC675,INVALC,0xDCB0,0xECB6,
-	0xEFB0,0xF3F5,0xE0EF,INVALC,0xEFB1,0xF1E2,0xF1E1,
-	/* Range 0x9F06 - 0x9F38, array index: 0x44BF */
-	0xF878,0xC652,INVALC,0xF965,0xF97E,INVALC,INVALC,INVALC,
-	0xB9A9,0xE8F2,0xE8F3,INVALC,0xECB7,0xB9AA,INVALC,0xC35D,
-	0xF1E3,INVALC,0xF6CF,0xC567,0xF6D0,0xF6CE,0xF879,INVALC,
-	0xF8E9,INVALC,0xB9AB,INVALC,0xEFB4,0xEFB3,0xEFB2,0xF1E4,
-	INVALC,INVALC,0xF1E8,0xF1E7,0xF1E6,0xF1E5,0xC35E,0xF3F6,
-	0xF5B9,0xC4D3,0xF5B8,0xF6D1,0xF7CB,0xF7CA,0xC5C4,0xF7C9,
-	0xF87C,0xF87B,0xF87A,
-	/* Range 0x9F3D - 0x9F4F, array index: 0x44F2 */
-	0xECB8,0xC24D,INVALC,0xF3F7,0xF3F8,0xF7CC,0xF87D,INVALC,
-	INVALC,0xF8EA,0xF966,0xF9B9,0xF9D4,0xBBF4,0xC24E,0xF1E9,
-	0xF3F9,0xF6D2,0xF87E,
-	/* Range 0x9F52 - 0x9F7B, array index: 0x4505 */
-	0xBEA6,INVALC,0xEFB5,0xF1EA,0xF3FA,0xF3FB,0xF3FC,0xF5BE,
-	INVALC,0xF5BA,0xC568,0xF5BD,0xF5BC,0xC4D4,0xF5BB,0xC4D6,
-	INVALC,0xC4D5,0xF6D4,0xF6D3,0xC569,0xC56A,INVALC,INVALC,
-	0xC5C6,0xF7CD,0xC5C5,INVALC,0xF8A3,0xF8A4,0xF8A2,0xF8A1,
-	0xC654,INVALC,0xF8EB,0xF8EC,0xF8ED,0xC653,0xF967,0xF96A,
-	0xF969,0xF968,
-	/* Range 0x9F90 - 0x9F95, array index: 0x452F */
-	0xC365,0xF5BF,0xF6D5,INVALC,0xC5C7,0xF7CE,
-	/* Range 0xFE30 - 0xFE44, array index: 0x4535 */
-	0xA14A,0xA157,INVALC,0xA159,0xA15B,0xA15F,0xA160,0xA163,
-	0xA164,0xA167,0xA168,0xA16B,0xA16C,0xA16F,0xA170,0xA173,
-	0xA174,0xA177,0xA178,0xA17B,0xA17C,
-	/* Range 0xFE49 - 0xFE6B, array index: 0x454A */
-	0xA1C6,0xA1C7,0xA1CA,0xA1CB,0xA1C8,0xA1C9,0xA15C,0xA14D,
-	INVALC,0xA14F,INVALC,0xA151,0xA152,0xA153,0xA154,INVALC,
-	0xA17D,0xA17E,0xA1A1,0xA1A2,0xA1A3,0xA1A4,0xA1CC,0xA1CD,
-	0xA1CE,0xA1DE,0xA1DF,0xA1E0,0xA1E1,0xA1E2,INVALC,INVALC,
-	0xA24C,0xA24D,0xA24E,
-	/* Range 0xFF01 - 0xFF3C, array index: 0x456D */
-	0xA149,INVALC,0xA1AD,0xA243,0xA248,0xA1AE,INVALC,0xA15D,
-	0xA15E,0xA1AF,0xA1CF,0xA141,0xA1D0,0xA144,0xA241,0xA2AF,
-	0xA2B0,0xA2B1,0xA2B2,0xA2B3,0xA2B4,0xA2B5,0xA2B6,0xA2B7,
-	0xA2B8,0xA147,0xA146,0xA1D5,0xA1D7,0xA1D6,0xA148,0xA249,
-	0xA2CF,0xA2D0,0xA2D1,0xA2D2,0xA2D3,0xA2D4,0xA2D5,0xA2D6,
-	0xA2D7,0xA2D8,0xA2D9,0xA2DA,0xA2DB,0xA2DC,0xA2DD,0xA2DE,
-	0xA2DF,0xA2E0,0xA2E1,0xA2E2,0xA2E3,0xA2E4,0xA2E5,0xA2E6,
-	0xA2E7,0xA2E8,INVALC,0xA242,
-	/* Range 0xFF3F - 0xFF5D, array index: 0x45A9 */
-	0xA1C4,INVALC,0xA2E9,0xA2EA,0xA2EB,0xA2EC,0xA2ED,0xA2EE,
-	0xA2EF,0xA2F0,0xA2F1,0xA2F2,0xA2F3,0xA2F4,0xA2F5,0xA2F6,
-	0xA2F7,0xA2F8,0xA2F9,0xA2FA,0xA2FB,0xA2FC,0xA2FD,0xA2FE,
-	0xA340,0xA341,0xA342,0xA343,0xA161,0xA155,0xA162,
-	/* Unranged codes (565 codes) */
-	/* Array index: 0x45C8 */ 0x00A2,0xA246,
-	/* Array index: 0x45C8 */ 0x00A3,0xA247,
-	/* Array index: 0x45C8 */ 0x00A5,0xA244,
-	/* Array index: 0x45C8 */ 0x00A7,0xA1B1,
-	/* Array index: 0x45C8 */ 0x00B0,0xA258,
-	/* Array index: 0x45C8 */ 0x00B1,0xA1D3,
-	/* Array index: 0x45C8 */ 0x00B7,0xA150,
-	/* Array index: 0x45C8 */ 0x00D7,0xA1D1,
-	/* Array index: 0x45C8 */ 0x00F7,0xA1D2,
-	/* Array index: 0x45C8 */ 0x02D9,0xA3BB,
-	/* Array index: 0x45C8 */ 0x0401,0xC7B3,
-	/* Array index: 0x45C8 */ 0x2013,0xA156,
-	/* Array index: 0x45C8 */ 0x2014,0xA158,
-	/* Array index: 0x45C8 */ 0x2018,0xA1A5,
-	/* Array index: 0x45C8 */ 0x2019,0xA1A6,
-	/* Array index: 0x45C8 */ 0x201C,0xA1A7,
-	/* Array index: 0x45C8 */ 0x201D,0xA1A8,
-	/* Array index: 0x45C8 */ 0x2022,0xA145,
-	/* Array index: 0x45C8 */ 0x2025,0xA14C,
-	/* Array index: 0x45C8 */ 0x2026,0xA14B,
-	/* Array index: 0x45C8 */ 0x2032,0xA1AC,
-	/* Array index: 0x45C8 */ 0x2035,0xA1AB,
-	/* Array index: 0x45C8 */ 0x203B,0xA1B0,
-	/* Array index: 0x45C8 */ 0x203E,0xA1C2,
-	/* Array index: 0x45C8 */ 0x2103,0xA24A,
-	/* Array index: 0x45C8 */ 0x2105,0xA1C1,
-	/* Array index: 0x45C8 */ 0x2109,0xA24B,
-	/* Array index: 0x45C8 */ 0x221A,0xA1D4,
-	/* Array index: 0x45C8 */ 0x2223,0xA1FD,
-	/* Array index: 0x45C8 */ 0x2225,0xA1FC,
-	/* Array index: 0x45C8 */ 0x222E,0xA1ED,
-	/* Array index: 0x45C8 */ 0x2234,0xA1EF,
-	/* Array index: 0x45C8 */ 0x2235,0xA1EE,
-	/* Array index: 0x45C8 */ 0x223C,0xA1E3,
-	/* Array index: 0x45C8 */ 0x2252,0xA1DC,
-	/* Array index: 0x45C8 */ 0x2260,0xA1DA,
-	/* Array index: 0x45C8 */ 0x2261,0xA1DD,
-	/* Array index: 0x45C8 */ 0x2266,0xA1D8,
-	/* Array index: 0x45C8 */ 0x2267,0xA1D9,
-	/* Array index: 0x45C8 */ 0x22A5,0xA1E6,
-	/* Array index: 0x45C8 */ 0x22BF,0xA1E9,
-	/* Array index: 0x45C8 */ 0x2500,0xA277,
-	/* Array index: 0x45C8 */ 0x2502,0xA278,
-	/* Array index: 0x45C8 */ 0x250C,0xA27A,
-	/* Array index: 0x45C8 */ 0x2510,0xA27B,
-	/* Array index: 0x45C8 */ 0x2514,0xA27C,
-	/* Array index: 0x45C8 */ 0x2518,0xA27D,
-	/* Array index: 0x45C8 */ 0x251C,0xA275,
-	/* Array index: 0x45C8 */ 0x2524,0xA274,
-	/* Array index: 0x45C8 */ 0x252C,0xA273,
-	/* Array index: 0x45C8 */ 0x2534,0xA272,
-	/* Array index: 0x45C8 */ 0x253C,0xA271,
-	/* Array index: 0x45C8 */ 0x2550,0xA2A4,
-	/* Array index: 0x45C8 */ 0x255E,0xA2A5,
-	/* Array index: 0x45C8 */ 0x2561,0xA2A7,
-	/* Array index: 0x45C8 */ 0x256A,0xA2A6,
-	/* Array index: 0x45C8 */ 0x2594,0xA276,
-	/* Array index: 0x45C8 */ 0x2595,0xA279,
-	/* Array index: 0x45C8 */ 0x25A0,0xA1BD,
-	/* Array index: 0x45C8 */ 0x25A1,0xA1BC,
-	/* Array index: 0x45C8 */ 0x25B2,0xA1B6,
-	/* Array index: 0x45C8 */ 0x25B3,0xA1B5,
-	/* Array index: 0x45C8 */ 0x25BC,0xA1BF,
-	/* Array index: 0x45C8 */ 0x25BD,0xA1BE,
-	/* Array index: 0x45C8 */ 0x25C6,0xA1BB,
-	/* Array index: 0x45C8 */ 0x25C7,0xA1BA,
-	/* Array index: 0x45C8 */ 0x25CB,0xA1B3,
-	/* Array index: 0x45C8 */ 0x25CE,0xA1B7,
-	/* Array index: 0x45C8 */ 0x25CF,0xA1B4,
-	/* Array index: 0x45C8 */ 0x2605,0xA1B9,
-	/* Array index: 0x45C8 */ 0x2606,0xA1B8,
-	/* Array index: 0x45C8 */ 0x2609,0xA1F3,
-	/* Array index: 0x45C8 */ 0x30FE,0xC6A1,
-	/* Array index: 0x45C8 */ 0x32A3,0xA1C0,
-	/* Array index: 0x45C8 */ 0x338E,0xA255,
-	/* Array index: 0x45C8 */ 0x338F,0xA256,
-	/* Array index: 0x45C8 */ 0x33A1,0xA254,
-	/* Array index: 0x45C8 */ 0x33C4,0xA257,
-	/* Array index: 0x45C8 */ 0x33CE,0xA253,
-	/* Array index: 0x45C8 */ 0x33D1,0xA1EB,
-	/* Array index: 0x45C8 */ 0x33D2,0xA1EA,
-	/* Array index: 0x45C8 */ 0x33D5,0xA24F,
-	/* Array index: 0x45C8 */ 0x4E00,0xA440,
-	/* Array index: 0x45C8 */ 0x4E01,0xA442,
-	/* Array index: 0x45C8 */ 0x4E03,0xA443,
-	/* Array index: 0x45C8 */ 0x4E1E,0xA5E0,
-	/* Array index: 0x45C8 */ 0x4E1F,0xA5E1,
-	/* Array index: 0x45C8 */ 0x4E26,0xA8C3,
-	/* Array index: 0x45C8 */ 0x4E2B,0xA458,
-	/* Array index: 0x45C8 */ 0x4E42,0xC940,
-	/* Array index: 0x45C8 */ 0x4E43,0xA444,
-	/* Array index: 0x45C8 */ 0x4E45,0xA45B,
-	/* Array index: 0x45C8 */ 0x4E47,0xC947,
-	/* Array index: 0x45C8 */ 0x4E48,0xA45C,
-	/* Array index: 0x45C8 */ 0x4E56,0xA8C4,
-	/* Array index: 0x45C8 */ 0x4E69,0xA5E4,
-	/* Array index: 0x45C8 */ 0x4E73,0xA8C5,
-	/* Array index: 0x45C8 */ 0x4E99,0xA5E5,
-	/* Array index: 0x45C8 */ 0x4E9B,0xA8C7,
-	/* Array index: 0x45C8 */ 0x4EB3,0xADBD,
-	/* Array index: 0x45C8 */ 0x4EB6,0xDCB3,
-	/* Array index: 0x45C8 */ 0x4EB9,0xF6D6,
-	/* Array index: 0x45C8 */ 0x4EBA,0xA448,
-	/* Array index: 0x45C8 */ 0x4EFB,0xA5F4,
-	/* Array index: 0x45C8 */ 0x4F1D,0xC9B4,
-	/* Array index: 0x45C8 */ 0x4F22,0xC9B7,
-	/* Array index: 0x45C8 */ 0x4FAE,0xAB56,
-	/* Array index: 0x45C8 */ 0x4FAF,0xAB4A,
-	/* Array index: 0x45C8 */ 0x4FEC,0xCDEF,
-	/* Array index: 0x45C8 */ 0x4FEE,0xADD7,
-	/* Array index: 0x45C8 */ 0x4FEF,0xADC1,
-	/* Array index: 0x45C8 */ 0x4FFE,0xADDA,
-	/* Array index: 0x45C8 */ 0x5000,0xADCE,
-	/* Array index: 0x45C8 */ 0x503C,0xADC8,
-	/* Array index: 0x45C8 */ 0x5040,0xD463,
-	/* Array index: 0x45C8 */ 0x5041,0xD457,
-	/* Array index: 0x45C8 */ 0x507A,0xB0AF,
-	/* Array index: 0x45C8 */ 0x507D,0xB0B0,
-	/* Array index: 0x45C8 */ 0x5080,0xB3C8,
-	/* Array index: 0x45C8 */ 0x5082,0xD85E,
-	/* Array index: 0x45C8 */ 0x5083,0xD857,
-	/* Array index: 0x45C8 */ 0x5085,0xB3C5,
-	/* Array index: 0x45C8 */ 0x5087,0xD85F,
-	/* Array index: 0x45C8 */ 0x50A2,0xB3C3,
-	/* Array index: 0x45C8 */ 0x50A3,0xD856,
-	/* Array index: 0x45C8 */ 0x50E0,0xE0FE,
-	/* Array index: 0x45C8 */ 0x5152,0xA8E0,
-	/* Array index: 0x45C8 */ 0x5154,0xA8DF,
-	/* Array index: 0x45C8 */ 0x5155,0xA8E1,
-	/* Array index: 0x45C8 */ 0x5171,0xA640,
-	/* Array index: 0x45C8 */ 0x517C,0xADDD,
-	/* Array index: 0x45C8 */ 0x5180,0xBEAC,
-	/* Array index: 0x45C8 */ 0x5187,0xC94E,
-	/* Array index: 0x45C8 */ 0x5189,0xA554,
-	/* Array index: 0x45C8 */ 0x518A,0xA555,
-	/* Array index: 0x45C8 */ 0x518D,0xA641,
-	/* Array index: 0x45C8 */ 0x519E,0xCBCD,
-	/* Array index: 0x45C8 */ 0x51A0,0xAB61,
-	/* Array index: 0x45C8 */ 0x51A2,0xADE0,
-	/* Array index: 0x45C8 */ 0x51A4,0xADDE,
-	/* Array index: 0x45C8 */ 0x51A5,0xADDF,
-	/* Array index: 0x45C8 */ 0x51AA,0xBEAD,
-	/* Array index: 0x45C8 */ 0x51AC,0xA556,
-	/* Array index: 0x45C8 */ 0x51B0,0xA642,
-	/* Array index: 0x45C8 */ 0x51B1,0xC9BC,
-	/* Array index: 0x45C8 */ 0x51B6,0xA74D,
-	/* Array index: 0x45C8 */ 0x51B7,0xA74E,
-	/* Array index: 0x45C8 */ 0x51B9,0xCA6B,
-	/* Array index: 0x45C8 */ 0x51D4,0xD861,
-	/* Array index: 0x45C8 */ 0x51D7,0xDCC5,
-	/* Array index: 0x45C8 */ 0x51D8,0xE140,
-	/* Array index: 0x45C8 */ 0x51F0,0xB0C4,
-	/* Array index: 0x45C8 */ 0x51F1,0xB3CD,
-	/* Array index: 0x45C8 */ 0x51F3,0xB9B9,
-	/* Array index: 0x45C8 */ 0x51FD,0xA8E7,
-	/* Array index: 0x45C8 */ 0x5200,0xA44D,
-	/* Array index: 0x45C8 */ 0x5201,0xA44E,
-	/* Array index: 0x45C8 */ 0x5203,0xA462,
-	/* Array index: 0x45C8 */ 0x5221,0xCA6E,
-	/* Array index: 0x45C8 */ 0x5241,0xA8EF,
-	/* Array index: 0x45C8 */ 0x5272,0xB3CE,
-	/* Array index: 0x45C8 */ 0x5291,0xBEAF,
-	/* Array index: 0x45C8 */ 0x5293,0xBEB0,
-	/* Array index: 0x45C8 */ 0x529F,0xA55C,
-	/* Array index: 0x45C8 */ 0x52A0,0xA55B,
-	/* Array index: 0x45C8 */ 0x52A3,0xA648,
-	/* Array index: 0x45C8 */ 0x52A6,0xC9C0,
-	/* Array index: 0x45C8 */ 0x52BB,0xA8F1,
-	/* Array index: 0x45C8 */ 0x52BC,0xCBD5,
-	/* Array index: 0x45C8 */ 0x52C7,0xAB69,
-	/* Array index: 0x45C8 */ 0x52C9,0xAB6A,
-	/* Array index: 0x45C8 */ 0x52CD,0xD0ED,
-	/* Array index: 0x45C8 */ 0x52E9,0xE143,
-	/* Array index: 0x45C8 */ 0x52EB,0xE144,
-	/* Array index: 0x45C8 */ 0x532A,0xADEA,
-	/* Array index: 0x45C8 */ 0x5334,0xE8FA,
-	/* Array index: 0x45C8 */ 0x5337,0xF3FD,
-	/* Array index: 0x45C8 */ 0x5339,0xA4C7,
-	/* Array index: 0x45C8 */ 0x5357,0xAB6E,
-	/* Array index: 0x45C8 */ 0x535A,0xB3D5,
-	/* Array index: 0x45C8 */ 0x535C,0xA452,
-	/* Array index: 0x45C8 */ 0x535E,0xA4CB,
-	/* Array index: 0x45C8 */ 0x5360,0xA565,
-	/* Array index: 0x45C8 */ 0x5361,0xA564,
-	/* Array index: 0x45C8 */ 0x5363,0xCA72,
-	/* Array index: 0x45C8 */ 0x5366,0xA8F6,
-	/* Array index: 0x45C8 */ 0x537F,0xADEB,
-	/* Array index: 0x45C8 */ 0x5382,0xC944,
-	/* Array index: 0x45C8 */ 0x5384,0xA4CC,
-	/* Array index: 0x45C8 */ 0x538A,0xC9C4,
-	/* Array index: 0x45C8 */ 0x538E,0xCA74,
-	/* Array index: 0x45C8 */ 0x538F,0xCA75,
-	/* Array index: 0x45C8 */ 0x5392,0xCBD9,
-	/* Array index: 0x45C8 */ 0x53A4,0xD864,
-	/* Array index: 0x45C8 */ 0x53A5,0xB3D6,
-	/* Array index: 0x45C8 */ 0x53A7,0xD865,
-	/* Array index: 0x45C8 */ 0x53AC,0xE146,
-	/* Array index: 0x45C8 */ 0x53AD,0xB9BD,
-	/* Array index: 0x45C8 */ 0x53B2,0xBC46,
-	/* Array index: 0x45C8 */ 0x53B4,0xF1EF,
-	/* Array index: 0x45C8 */ 0x53B9,0xC958,
-	/* Array index: 0x45C8 */ 0x53BB,0xA568,
-	/* Array index: 0x45C8 */ 0x53C3,0xB0D1,
-	/* Array index: 0x45C8 */ 0x53D4,0xA8FB,
-	/* Array index: 0x45C8 */ 0x53D6,0xA8FA,
-	/* Array index: 0x45C8 */ 0x53D7,0xA8FC,
-	/* Array index: 0x45C8 */ 0x53DB,0xAB71,
-	/* Array index: 0x45C8 */ 0x53F8,0xA571,
-	/* Array index: 0x45C8 */ 0x53FB,0xA57B,
-	/* Array index: 0x45C8 */ 0x53FC,0xA570,
-	/* Array index: 0x45C8 */ 0x5401,0xA653,
-	/* Array index: 0x45C8 */ 0x544E,0xA760,
-	/* Array index: 0x45C8 */ 0x544F,0xCAA2,
-	/* Array index: 0x45C8 */ 0x5454,0xCA79,
-	/* Array index: 0x45C8 */ 0x54CE,0xAB75,
-	/* Array index: 0x45C8 */ 0x54CF,0xCDFE,
-	/* Array index: 0x45C8 */ 0x54D6,0xCE44,
-	/* Array index: 0x45C8 */ 0x5517,0xD0F2,
-	/* Array index: 0x45C8 */ 0x551A,0xD0F7,
-	/* Array index: 0x45C8 */ 0x5526,0xD0F0,
-	/* Array index: 0x45C8 */ 0x5527,0xAE41,
-	/* Array index: 0x45C8 */ 0x555C,0xB0E3,
-	/* Array index: 0x45C8 */ 0x556A,0xB0D4,
-	/* Array index: 0x45C8 */ 0x55BB,0xB3EB,
-	/* Array index: 0x45C8 */ 0x55EF,0xB6E2,
-	/* Array index: 0x45C8 */ 0x55F2,0xDCDD,
-	/* Array index: 0x45C8 */ 0x5627,0xE147,
-	/* Array index: 0x45C8 */ 0x5629,0xBC4D,
-	/* Array index: 0x45C8 */ 0x562A,0xE547,
-	/* Array index: 0x45C8 */ 0x5653,0xBC4E,
-	/* Array index: 0x45C8 */ 0x565E,0xE945,
-	/* Array index: 0x45C8 */ 0x5693,0xECC0,
-	/* Array index: 0x45C8 */ 0x56D1,0xC5F1,
-	/* Array index: 0x45C8 */ 0x56D3,0xF8A5,
-	/* Array index: 0x45C8 */ 0x56D4,0xF8EE,
-	/* Array index: 0x45C8 */ 0x56D7,0xC949,
-	/* Array index: 0x45C8 */ 0x56EE,0xCAA7,
-	/* Array index: 0x45C8 */ 0x56F0,0xA778,
-	/* Array index: 0x45C8 */ 0x56F7,0xCBF0,
-	/* Array index: 0x45C8 */ 0x56F9,0xCBF1,
-	/* Array index: 0x45C8 */ 0x56FA,0xA954,
-	/* Array index: 0x45C8 */ 0x573B,0xA7A6,
-	/* Array index: 0x45C8 */ 0x573E,0xA7A3,
-	/* Array index: 0x45C8 */ 0x5740,0xA77D,
-	/* Array index: 0x45C8 */ 0x5741,0xCAAA,
-	/* Array index: 0x45C8 */ 0x5745,0xCAAB,
-	/* Array index: 0x45C8 */ 0x5761,0xA959,
-	/* Array index: 0x45C8 */ 0x5762,0xCBFE,
-	/* Array index: 0x45C8 */ 0x5764,0xA95B,
-	/* Array index: 0x45C8 */ 0x5780,0xCBF9,
-	/* Array index: 0x45C8 */ 0x5782,0xABAB,
-	/* Array index: 0x45C8 */ 0x5783,0xA955,
-	/* Array index: 0x45C8 */ 0x578B,0xABAC,
-	/* Array index: 0x45C8 */ 0x578C,0xCE54,
-	/* Array index: 0x45C8 */ 0x578F,0xCE5A,
-	/* Array index: 0x45C8 */ 0x57AE,0xABB1,
-	/* Array index: 0x45C8 */ 0x57DC,0xD4B1,
-	/* Array index: 0x45C8 */ 0x5814,0xD4AE,
-	/* Array index: 0x45C8 */ 0x5868,0xDCE3,
-	/* Array index: 0x45C8 */ 0x586B,0xB6F1,
-	/* Array index: 0x45C8 */ 0x586D,0xB6F3,
-	/* Array index: 0x45C8 */ 0x586F,0xDCE8,
-	/* Array index: 0x45C8 */ 0x5871,0xDCF1,
-	/* Array index: 0x45C8 */ 0x5898,0xE159,
-	/* Array index: 0x45C8 */ 0x58EF,0xA7A7,
-	/* Array index: 0x45C8 */ 0x58F4,0xCE5F,
-	/* Array index: 0x45C8 */ 0x5903,0xC95A,
-	/* Array index: 0x45C8 */ 0x5906,0xCAB0,
-	/* Array index: 0x45C8 */ 0x5920,0xB0F7,
-	/* Array index: 0x45C8 */ 0x5922,0xB9DA,
-	/* Array index: 0x45C8 */ 0x5924,0xB9DB,
-	/* Array index: 0x45C8 */ 0x5925,0xB9D9,
-	/* Array index: 0x45C8 */ 0x5937,0xA669,
-	/* Array index: 0x45C8 */ 0x5938,0xA66A,
-	/* Array index: 0x45C8 */ 0x593C,0xC9CB,
-	/* Array index: 0x45C8 */ 0x593E,0xA7A8,
-	/* Array index: 0x45C8 */ 0x5940,0xCAB1,
-	/* Array index: 0x45C8 */ 0x598A,0xA7B3,
-	/* Array index: 0x45C8 */ 0x5A09,0xAE5C,
-	/* Array index: 0x45C8 */ 0x5A0A,0xD162,
-	/* Array index: 0x45C8 */ 0x5A0C,0xAE5B,
-	/* Array index: 0x45C8 */ 0x5A0F,0xD160,
-	/* Array index: 0x45C8 */ 0x5A11,0xAE50,
-	/* Array index: 0x45C8 */ 0x5A23,0xAE58,
-	/* Array index: 0x45C8 */ 0x5A25,0xAE5A,
-	/* Array index: 0x45C8 */ 0x5A29,0xAE59,
-	/* Array index: 0x45C8 */ 0x5A2D,0xD15D,
-	/* Array index: 0x45C8 */ 0x5A2E,0xD15E,
-	/* Array index: 0x45C8 */ 0x5A3C,0xB140,
-	/* Array index: 0x45C8 */ 0x5A70,0xD4E8,
-	/* Array index: 0x45C8 */ 0x5A83,0xD8C6,
-	/* Array index: 0x45C8 */ 0x5A84,0xD8C3,
-	/* Array index: 0x45C8 */ 0x5AA2,0xD8B9,
-	/* Array index: 0x45C8 */ 0x5B38,0xC254,
-	/* Array index: 0x45C8 */ 0x5B43,0xC45D,
-	/* Array index: 0x45C8 */ 0x5B45,0xF443,
-	/* Array index: 0x45C8 */ 0x5B69,0xABC4,
-	/* Array index: 0x45C8 */ 0x5B6B,0xAE5D,
-	/* Array index: 0x45C8 */ 0x5B6C,0xD165,
-	/* Array index: 0x45C8 */ 0x5C01,0xABCA,
-	/* Array index: 0x45C8 */ 0x5C1A,0xA97C,
-	/* Array index: 0x45C8 */ 0x5C1F,0xDD4B,
-	/* Array index: 0x45C8 */ 0x5C22,0xA471,
-	/* Array index: 0x45C8 */ 0x5C24,0xA4D7,
-	/* Array index: 0x45C8 */ 0x5C25,0xC9D5,
-	/* Array index: 0x45C8 */ 0x5C28,0xCABE,
-	/* Array index: 0x45C8 */ 0x5C2A,0xCABF,
-	/* Array index: 0x45C8 */ 0x5C2C,0xA7BC,
-	/* Array index: 0x45C8 */ 0x5C30,0xD8D8,
-	/* Array index: 0x45C8 */ 0x5C31,0xB44E,
-	/* Array index: 0x45C8 */ 0x5C33,0xDD4C,
-	/* Array index: 0x45C8 */ 0x5CE8,0xAE6F,
-	/* Array index: 0x45C8 */ 0x5D06,0xB153,
-	/* Array index: 0x45C8 */ 0x5D07,0xB152,
-	/* Array index: 0x45C8 */ 0x5D55,0xD8E2,
-	/* Array index: 0x45C8 */ 0x5D59,0xD8E8,
-	/* Array index: 0x45C8 */ 0x5D5E,0xDD53,
-	/* Array index: 0x45C8 */ 0x5D62,0xDD56,
-	/* Array index: 0x45C8 */ 0x5D63,0xDD4E,
-	/* Array index: 0x45C8 */ 0x5D6F,0xB744,
-	/* Array index: 0x45C8 */ 0x5D71,0xDD4D,
-	/* Array index: 0x45C8 */ 0x5D72,0xDD51,
-	/* Array index: 0x45C8 */ 0x5D77,0xE1A9,
-	/* Array index: 0x45C8 */ 0x5D8D,0xE1AF,
-	/* Array index: 0x45C8 */ 0x5DC0,0xEFC4,
-	/* Array index: 0x45C8 */ 0x5DC2,0xF172,
-	/* Array index: 0x45C8 */ 0x5DC3,0xF1FD,
-	/* Array index: 0x45C8 */ 0x5DC6,0xF444,
-	/* Array index: 0x45C8 */ 0x5DC7,0xF445,
-	/* Array index: 0x45C8 */ 0x5DC9,0xC460,
-	/* Array index: 0x45C8 */ 0x5DCB,0xF5C9,
-	/* Array index: 0x45C8 */ 0x5DCD,0xC4DE,
-	/* Array index: 0x45C8 */ 0x5DCF,0xF5CA,
-	/* Array index: 0x45C8 */ 0x5DEB,0xA7C5,
-	/* Array index: 0x45C8 */ 0x5DF7,0xABD1,
-	/* Array index: 0x45C8 */ 0x5DF9,0xCEAF,
-	/* Array index: 0x45C8 */ 0x5E0A,0xCACB,
-	/* Array index: 0x45C8 */ 0x5E0C,0xA7C6,
-	/* Array index: 0x45C8 */ 0x5E0E,0xCACC,
-	/* Array index: 0x45C8 */ 0x5E11,0xA9AE,
-	/* Array index: 0x45C8 */ 0x5EBE,0xB168,
-	/* Array index: 0x45C8 */ 0x5EEC,0xC366,
-	/* Array index: 0x45C8 */ 0x5EFA,0xABD8,
-	/* Array index: 0x45C8 */ 0x5F0F,0xA6A1,
-	/* Array index: 0x45C8 */ 0x5F3C,0xB45D,
-	/* Array index: 0x45C8 */ 0x5F40,0xDD62,
-	/* Array index: 0x45C8 */ 0x5F43,0xE1BF,
-	/* Array index: 0x45C8 */ 0x5F44,0xE1BE,
-	/* Array index: 0x45C8 */ 0x5F5D,0xC255,
-	/* Array index: 0x45C8 */ 0x5F62,0xA7CE,
-	/* Array index: 0x45C8 */ 0x5F64,0xA7CD,
-	/* Array index: 0x45C8 */ 0x5F65,0xABDB,
-	/* Array index: 0x45C8 */ 0x5FB2,0xE577,
-	/* Array index: 0x45C8 */ 0x5FC9,0xC97B,
-	/* Array index: 0x45C8 */ 0x5FE8,0xCADA,
-	/* Array index: 0x45C8 */ 0x6050,0xAEA3,
-	/* Array index: 0x45C8 */ 0x60A8,0xB17A,
-	/* Array index: 0x45C8 */ 0x6123,0xB468,
-	/* Array index: 0x45C8 */ 0x6132,0xDD6B,
-	/* Array index: 0x45C8 */ 0x6134,0xB75B,
-	/* Array index: 0x45C8 */ 0x6136,0xDD6A,
-	/* Array index: 0x45C8 */ 0x6137,0xB75F,
-	/* Array index: 0x45C8 */ 0x613B,0xE1D2,
-	/* Array index: 0x45C8 */ 0x619A,0xBCAA,
-	/* Array index: 0x45C8 */ 0x619B,0xE5A1,
-	/* Array index: 0x45C8 */ 0x619D,0xE976,
-	/* Array index: 0x45C8 */ 0x619F,0xE5A5,
-	/* Array index: 0x45C8 */ 0x61A1,0xE5A8,
-	/* Array index: 0x45C8 */ 0x61A2,0xE57D,
-	/* Array index: 0x45C8 */ 0x61A4,0xBCAB,
-	/* Array index: 0x45C8 */ 0x61D6,0xEFCF,
-	/* Array index: 0x45C8 */ 0x61D8,0xEFC7,
-	/* Array index: 0x45C8 */ 0x623A,0xCAE6,
-	/* Array index: 0x45C8 */ 0x62C2,0xA9D8,
-	/* Array index: 0x45C8 */ 0x63BD,0xD56B,
-	/* Array index: 0x45C8 */ 0x63BE,0xD964,
-	/* Array index: 0x45C8 */ 0x63F9,0xB4AE,
-	/* Array index: 0x45C8 */ 0x6406,0xB770,
-	/* Array index: 0x45C8 */ 0x644B,0xE1E9,
-	/* Array index: 0x45C8 */ 0x6482,0xE1E6,
-	/* Array index: 0x45C8 */ 0x654F,0xB1D3,
-	/* Array index: 0x45C8 */ 0x656F,0xDDBC,
-	/* Array index: 0x45C8 */ 0x6587,0xA4E5,
-	/* Array index: 0x45C8 */ 0x658C,0xD979,
-	/* Array index: 0x45C8 */ 0x664F,0xAECB,
-	/* Array index: 0x45C8 */ 0x6651,0xD1D6,
-	/* Array index: 0x45C8 */ 0x6652,0xAECD,
-	/* Array index: 0x45C8 */ 0x66CF,0xE9B8,
-	/* Array index: 0x45C8 */ 0x66D2,0xECF2,
-	/* Array index: 0x45C8 */ 0x671B,0xB1E6,
-	/* Array index: 0x45C8 */ 0x676A,0xAA57,
-	/* Array index: 0x45C8 */ 0x67FF,0xAC55,
-	/* Array index: 0x45C8 */ 0x6925,0xD9D8,
-	/* Array index: 0x45C8 */ 0x692A,0xD9AE,
-	/* Array index: 0x45C8 */ 0x6982,0xB7A7,
-	/* Array index: 0x45C8 */ 0x6983,0xDEC6,
-	/* Array index: 0x45C8 */ 0x6986,0xB7AE,
-	/* Array index: 0x45C8 */ 0x69D9,0xE25C,
-	/* Array index: 0x45C8 */ 0x6A0D,0xE5E3,
-	/* Array index: 0x45C8 */ 0x6A0F,0xE5EA,
-	/* Array index: 0x45C8 */ 0x6A32,0xE9C2,
-	/* Array index: 0x45C8 */ 0x6A76,0xE9C7,
-	/* Array index: 0x45C8 */ 0x6AE5,0xC36F,
-	/* Array index: 0x45C8 */ 0x6B1E,0xF9BB,
-	/* Array index: 0x45C8 */ 0x6B20,0xA4ED,
-	/* Array index: 0x45C8 */ 0x6B21,0xA6B8,
-	/* Array index: 0x45C8 */ 0x6B23,0xAA59,
-	/* Array index: 0x45C8 */ 0x6B25,0xCCE9,
-	/* Array index: 0x45C8 */ 0x6B28,0xCF64,
-	/* Array index: 0x45C8 */ 0x6B2C,0xD1F5,
-	/* Array index: 0x45C8 */ 0x6B2D,0xD1F7,
-	/* Array index: 0x45C8 */ 0x6B59,0xBEF9,
-	/* Array index: 0x45C8 */ 0x6B6A,0xAC6E,
-	/* Array index: 0x45C8 */ 0x6B6D,0xD1FA,
-	/* Array index: 0x45C8 */ 0x6B72,0xB7B3,
-	/* Array index: 0x45C8 */ 0x6BBA,0xB1FE,
-	/* Array index: 0x45C8 */ 0x6BDE,0xCCEC,
-	/* Array index: 0x45C8 */ 0x6C3B,0xC9A4,
-	/* Array index: 0x45C8 */ 0x6C46,0xC9F8,
-	/* Array index: 0x45C8 */ 0x6CF9,0xCD4C,
-	/* Array index: 0x45C8 */ 0x6E00,0xD5EB,
-	/* Array index: 0x45C8 */ 0x6E03,0xD9FC,
-	/* Array index: 0x45C8 */ 0x6E05,0xB24D,
-	/* Array index: 0x45C8 */ 0x6E88,0xD9EC,
-	/* Array index: 0x45C8 */ 0x6E89,0xB540,
-	/* Array index: 0x45C8 */ 0x6EDC,0xDE5C,
-	/* Array index: 0x45C8 */ 0x6FD4,0xED51,
-	/* Array index: 0x45C8 */ 0x6FD5,0xC0E3,
-	/* Array index: 0x45C8 */ 0x6FD8,0xC0D7,
-	/* Array index: 0x45C8 */ 0x6FF7,0xEFF7,
-	/* Array index: 0x45C8 */ 0x7070,0xA6C7,
-	/* Array index: 0x45C8 */ 0x7071,0xCA41,
-	/* Array index: 0x45C8 */ 0x7074,0xCB5E,
-	/* Array index: 0x45C8 */ 0x7076,0xA85F,
-	/* Array index: 0x45C8 */ 0x7078,0xA862,
-	/* Array index: 0x45C8 */ 0x707A,0xCB5F,
-	/* Array index: 0x45C8 */ 0x707C,0xA860,
-	/* Array index: 0x45C8 */ 0x707D,0xA861,
-	/* Array index: 0x45C8 */ 0x708A,0xAAA4,
-	/* Array index: 0x45C8 */ 0x708E,0xAAA2,
-	/* Array index: 0x45C8 */ 0x709F,0xCFAF,
-	/* Array index: 0x45C8 */ 0x70A1,0xCFB3,
-	/* Array index: 0x45C8 */ 0x70A4,0xACB7,
-	/* Array index: 0x45C8 */ 0x70BE,0xCFB0,
-	/* Array index: 0x45C8 */ 0x70EF,0xB26D,
-	/* Array index: 0x45C8 */ 0x70F0,0xD64E,
-	/* Array index: 0x45C8 */ 0x7113,0xD655,
-	/* Array index: 0x45C8 */ 0x7136,0xB54D,
-	/* Array index: 0x45C8 */ 0x713A,0xDA64,
-	/* Array index: 0x45C8 */ 0x7178,0xDE74,
-	/* Array index: 0x45C8 */ 0x717B,0xE2C1,
-	/* Array index: 0x45C8 */ 0x717D,0xBAB4,
-	/* Array index: 0x45C8 */ 0x718F,0xE2C0,
-	/* Array index: 0x45C8 */ 0x7190,0xE2BB,
-	/* Array index: 0x45C8 */ 0x7192,0xBAB7,
-	/* Array index: 0x45C8 */ 0x7194,0xBAB2,
-	/* Array index: 0x45C8 */ 0x720A,0xF26A,
-	/* Array index: 0x45C8 */ 0x720C,0xF269,
-	/* Array index: 0x45C8 */ 0x720D,0xC37B,
-	/* Array index: 0x45C8 */ 0x7210,0xC46C,
-	/* Array index: 0x45C8 */ 0x7213,0xF46A,
-	/* Array index: 0x45C8 */ 0x7214,0xF46B,
-	/* Array index: 0x45C8 */ 0x7230,0xACB8,
-	/* Array index: 0x45C8 */ 0x724F,0xDEA4,
-	/* Array index: 0x45C8 */ 0x7252,0xB7DE,
-	/* Array index: 0x45C8 */ 0x7253,0xE2C6,
-	/* Array index: 0x45C8 */ 0x7267,0xAAAA,
-	/* Array index: 0x45C8 */ 0x7269,0xAAAB,
-	/* Array index: 0x45C8 */ 0x726A,0xCD5B,
-	/* Array index: 0x45C8 */ 0x72B4,0xCA43,
-	/* Array index: 0x45C8 */ 0x72B5,0xCA44,
-	/* Array index: 0x45C8 */ 0x72BA,0xCB66,
-	/* Array index: 0x45C8 */ 0x732D,0xDA75,
-	/* Array index: 0x45C8 */ 0x738E,0xCA45,
-	/* Array index: 0x45C8 */ 0x73E3,0xD2B1,
-	/* Array index: 0x45C8 */ 0x7416,0xDA7E,
-	/* Array index: 0x45C8 */ 0x741A,0xDAA1,
-	/* Array index: 0x45C8 */ 0x741B,0xB560,
-	/* Array index: 0x45C8 */ 0x741D,0xDAA7,
-	/* Array index: 0x45C8 */ 0x743A,0xB557,
-	/* Array index: 0x45C8 */ 0x7467,0xE2D3,
-	/* Array index: 0x45C8 */ 0x7479,0xE6AB,
-	/* Array index: 0x45C8 */ 0x7490,0xED69,
-	/* Array index: 0x45C8 */ 0x7492,0xEA66,
-	/* Array index: 0x45C8 */ 0x74CA,0xC3A3,
-	/* Array index: 0x45C8 */ 0x74CB,0xF273,
-	/* Array index: 0x45C8 */ 0x74CF,0xC46E,
-	/* Array index: 0x45C8 */ 0x74EC,0xCFD7,
-	/* Array index: 0x45C8 */ 0x74EE,0xCFD8,
-	/* Array index: 0x45C8 */ 0x7547,0xCFDA,
-	/* Array index: 0x45C8 */ 0x7548,0xCFDB,
-	/* Array index: 0x45C8 */ 0x7554,0xAF60,
-	/* Array index: 0x45C8 */ 0x7584,0xED73,
-	/* Array index: 0x45C8 */ 0x759D,0xAAB7,
-	/* Array index: 0x45C8 */ 0x75B0,0xD2C3,
-	/* Array index: 0x45C8 */ 0x7638,0xBF61,
-	/* Array index: 0x45C8 */ 0x763A,0xBF62,
-	/* Array index: 0x45C8 */ 0x763C,0xEA70,
-	/* Array index: 0x45C8 */ 0x763D,0xEA6E,
-	/* Array index: 0x45C8 */ 0x764C,0xC0F9,
-	/* Array index: 0x45C8 */ 0x7650,0xF04D,
-	/* Array index: 0x45C8 */ 0x7675,0xF9CC,
-	/* Array index: 0x45C8 */ 0x76A4,0xED78,
-	/* Array index: 0x45C8 */ 0x76A6,0xF051,
-	/* Array index: 0x45C8 */ 0x76B4,0xB572,
-	/* Array index: 0x45C8 */ 0x76B5,0xDED6,
-	/* Array index: 0x45C8 */ 0x76B8,0xE2E1,
-	/* Array index: 0x45C8 */ 0x772D,0xD6AA,
-	/* Array index: 0x45C8 */ 0x7779,0xB840,
-	/* Array index: 0x45C8 */ 0x7795,0xEA7D,
-	/* Array index: 0x45C8 */ 0x77C2,0xF054,
-	/* Array index: 0x45C8 */ 0x77C4,0xF27B,
-	/* Array index: 0x45C8 */ 0x77C7,0xC3A9,
-	/* Array index: 0x45C8 */ 0x7809,0xCFF1,
-	/* Array index: 0x45C8 */ 0x7843,0xB2B9,
-	/* Array index: 0x45C8 */ 0x7845,0xD6BA,
-	/* Array index: 0x45C8 */ 0x7879,0xDEEE,
-	/* Array index: 0x45C8 */ 0x788C,0xB84C,
-	/* Array index: 0x45C8 */ 0x788E,0xB848,
-	/* Array index: 0x45C8 */ 0x788F,0xDEE7,
-	/* Array index: 0x45C8 */ 0x7909,0xF05A,
-	/* Array index: 0x45C8 */ 0x790C,0xF057,
-	/* Array index: 0x45C8 */ 0x7917,0xF2A3,
-	/* Array index: 0x45C8 */ 0x7935,0xF6F6,
-	/* Array index: 0x45C8 */ 0x7988,0xE341,
-	/* Array index: 0x45C8 */ 0x79C5,0xCDA4,
-	/* Array index: 0x45C8 */ 0x79C8,0xAAC4,
-	/* Array index: 0x45C8 */ 0x79C9,0xAAC3,
-	/* Array index: 0x45C8 */ 0x7A26,0xE349,
-	/* Array index: 0x45C8 */ 0x7A28,0xE348,
-	/* Array index: 0x45C8 */ 0x7A2B,0xE344,
-	/* Array index: 0x45C8 */ 0x7A37,0xBD5E,
-	/* Array index: 0x45C8 */ 0x7AD1,0xD041,
-	/* Array index: 0x45C8 */ 0x7AD8,0xD2FD,
-	/* Array index: 0x45C8 */ 0x7AD9,0xAFB8,
-	/* Array index: 0x45C8 */ 0x7B38,0xD6DB,
-	/* Array index: 0x45C8 */ 0x7B3B,0xDADF,
-	/* Array index: 0x45C8 */ 0x7B40,0xDAE4,
-	/* Array index: 0x45C8 */ 0x7B82,0xE35D,
-	/* Array index: 0x45C8 */ 0x7BA4,0xE35C,
-	/* Array index: 0x45C8 */ 0x7BAC,0xE6D9,
-	/* Array index: 0x45C8 */ 0x7BAD,0xBD62,
-	/* Array index: 0x45C8 */ 0x7BAF,0xE6DB,
-	/* Array index: 0x45C8 */ 0x7BB1,0xBD63,
-	/* Array index: 0x45C8 */ 0x7BBE,0xE6D8,
-	/* Array index: 0x45C8 */ 0x7BC0,0xB860,
-	/* Array index: 0x45C8 */ 0x7BC1,0xBD68,
-	/* Array index: 0x45C8 */ 0x7BC4,0xBD64,
-	/* Array index: 0x45C8 */ 0x7C19,0xF063,
-	/* Array index: 0x45C8 */ 0x7C30,0xF06C,
-	/* Array index: 0x45C8 */ 0x7C33,0xF2A8,
-	/* Array index: 0x45C8 */ 0x7C43,0xC478,
-	/* Array index: 0x45C8 */ 0x7C50,0xC4F0,
-	/* Array index: 0x45C8 */ 0x7C53,0xF5E5,
-	/* Array index: 0x45C8 */ 0x7C54,0xF5E4,
-	/* Array index: 0x45C8 */ 0x7CA8,0xDAE9,
-	/* Array index: 0x45C8 */ 0x7CC5,0xE6DF,
-	/* Array index: 0x45C8 */ 0x7CE7,0xC2B3,
-	/* Array index: 0x45C8 */ 0x7CE8,0xEDCF,
-	/* Array index: 0x45C8 */ 0x7CEA,0xF2AE,
-	/* Array index: 0x45C8 */ 0x7CFB,0xA874,
-	/* Array index: 0x45C8 */ 0x7D4A,0xD6EE,
-	/* Array index: 0x45C8 */ 0x7DD2,0xBAFC,
-	/* Array index: 0x45C8 */ 0x7E03,0xE6E9,
-	/* Array index: 0x45C8 */ 0x7E4C,0xEDDB,
-	/* Array index: 0x45C8 */ 0x7F58,0xD04D,
-	/* Array index: 0x45C8 */ 0x8024,0xE3A1,
-	/* Array index: 0x45C8 */ 0x8030,0xF5EF,
-	/* Array index: 0x45C8 */ 0x8043,0xD743,
-	/* Array index: 0x45C8 */ 0x8056,0xB874,
-	/* Array index: 0x45C8 */ 0x8058,0xB875,
-	/* Array index: 0x45C8 */ 0x8064,0xE6FB,
-	/* Array index: 0x45C8 */ 0x8067,0xE6FC,
-	/* Array index: 0x45C8 */ 0x806C,0xEAE7,
-	/* Array index: 0x45C8 */ 0x80B8,0xCDAE,
-	/* Array index: 0x45C8 */ 0x80BA,0xAACD,
-	/* Array index: 0x45C8 */ 0x8139,0xB5C8,
-	/* Array index: 0x45C8 */ 0x813A,0xDB51,
-	/* Array index: 0x45C8 */ 0x813D,0xDB4F,
-	/* Array index: 0x45C8 */ 0x813E,0xB5CA,
-	/* Array index: 0x45C8 */ 0x815B,0xDF77,
-	/* Array index: 0x45C8 */ 0x815C,0xDF75,
-	/* Array index: 0x45C8 */ 0x8225,0xD372,
-	/* Array index: 0x45C8 */ 0x822F,0xD371,
-	/* Array index: 0x45C8 */ 0x8316,0xD3A8,
-	/* Array index: 0x45C8 */ 0x8317,0xAFFA,
-	/* Array index: 0x45C8 */ 0x8319,0xD376,
-	/* Array index: 0x45C8 */ 0x831B,0xD3A3,
-	/* Array index: 0x45C8 */ 0x831C,0xD37D,
-	/* Array index: 0x45C8 */ 0x831E,0xD3B2,
-	/* Array index: 0x45C8 */ 0x8320,0xD3AA,
-	/* Array index: 0x45C8 */ 0x841B,0xDBAE,
-	/* Array index: 0x45C8 */ 0x8423,0xDB5F,
-	/* Array index: 0x45C8 */ 0x8482,0xB8A6,
-	/* Array index: 0x45C8 */ 0x8486,0xDFB3,
-	/* Array index: 0x45C8 */ 0x8494,0xE3C2,
-	/* Array index: 0x45C8 */ 0x84DB,0xE3D1,
-	/* Array index: 0x45C8 */ 0x853B,0xE74D,
-	/* Array index: 0x45C8 */ 0x8571,0xEB4B,
-	/* Array index: 0x45C8 */ 0x8611,0xC4A8,
-	/* Array index: 0x45C8 */ 0x8643,0xF8BC,
-	/* Array index: 0x45C8 */ 0x8659,0xD77B,
-	/* Array index: 0x45C8 */ 0x8746,0xE3E3,
-	/* Array index: 0x45C8 */ 0x88B1,0xB5F6,
-	/* Array index: 0x45C8 */ 0x88B2,0xDBCD,
-	/* Array index: 0x45C8 */ 0x88E7,0xE3F6,
-	/* Array index: 0x45C8 */ 0x88E8,0xBB74,
-	/* Array index: 0x45C8 */ 0x8949,0xF0D9,
-	/* Array index: 0x45C8 */ 0x898B,0xA8A3,
-	/* Array index: 0x45C8 */ 0x898F,0xB357,
-	/* Array index: 0x45C8 */ 0x89B2,0xC2D1,
-	/* Array index: 0x45C8 */ 0x8A2A,0xB358,
-	/* Array index: 0x45C8 */ 0x8A2C,0xD7CB,
-	/* Array index: 0x45C8 */ 0x8A2D,0xB35D,
-	/* Array index: 0x45C8 */ 0x8A30,0xD7C9,
-	/* Array index: 0x45C8 */ 0x8A31,0xB35C,
-	/* Array index: 0x45C8 */ 0x8A34,0xB644,
-	/* Array index: 0x45C8 */ 0x8A36,0xB646,
-	/* Array index: 0x45C8 */ 0x8A66,0xB8D5,
-	/* Array index: 0x45C8 */ 0x8A9E,0xBB79,
-	/* Array index: 0x45C8 */ 0x8AB0,0xBDD6,
-	/* Array index: 0x45C8 */ 0x8AB2,0xBDD2,
-	/* Array index: 0x45C8 */ 0x8B74,0xC4FE,
-	/* Array index: 0x45C8 */ 0x8C37,0xA8A6,
-	/* Array index: 0x45C8 */ 0x8C5A,0xB362,
-	/* Array index: 0x45C8 */ 0x8C5C,0xD7CF,
-	/* Array index: 0x45C8 */ 0x8C5D,0xD7D0,
-	/* Array index: 0x45C8 */ 0x8C5F,0xDBE5,
-	/* Array index: 0x45C8 */ 0x8D0D,0xC4BA,
-	/* Array index: 0x45C8 */ 0x8D99,0xBBAF,
-	/* Array index: 0x45C8 */ 0x8E2E,0xE7F7,
-	/* Array index: 0x45C8 */ 0x8EB2,0xB8FA,
-	/* Array index: 0x45C8 */ 0x8EBA,0xBDF6,
-	/* Array index: 0x45C8 */ 0x8EBD,0xEBC8,
-	/* Array index: 0x45C8 */ 0x8EC0,0xC2DF,
-	/* Array index: 0x45C8 */ 0x8EC2,0xF355,
-	/* Array index: 0x45C8 */ 0x8F9B,0xA8AF,
-	/* Array index: 0x45C8 */ 0x8F9C,0xB664,
-	/* Array index: 0x45C8 */ 0x8F9F,0xB940,
-	/* Array index: 0x45C8 */ 0x8FA3,0xBBB6,
-	/* Array index: 0x45C8 */ 0x8FA6,0xBFEC,
-	/* Array index: 0x45C8 */ 0x8FA8,0xBFEB,
-	/* Array index: 0x45C8 */ 0x8FBF,0xCBA6,
-	/* Array index: 0x45C8 */ 0x8FC9,0xCBA5,
-	/* Array index: 0x45C8 */ 0x8FCB,0xCDCD,
-	/* Array index: 0x45C8 */ 0x90AA,0xA8B8,
-	/* Array index: 0x45C8 */ 0x90CE,0xADA6,
-	/* Array index: 0x45C8 */ 0x925E,0xE0B5,
-	/* Array index: 0x45C8 */ 0x92BB,0xBE4F,
-	/* Array index: 0x45C8 */ 0x92BC,0xBE56,
-	/* Array index: 0x45C8 */ 0x933C,0xEBE5,
-	/* Array index: 0x45C8 */ 0x936A,0xEEDE,
-	/* Array index: 0x45C8 */ 0x936C,0xC1EA,
-	/* Array index: 0x45C8 */ 0x936D,0xEEDB,
-	/* Array index: 0x45C8 */ 0x9370,0xC1EC,
-	/* Array index: 0x45C8 */ 0x9371,0xEEE4,
-	/* Array index: 0x45C8 */ 0x93EC,0xF367,
-	/* Array index: 0x45C8 */ 0x93EE,0xF36E,
-	/* Array index: 0x45C8 */ 0x9403,0xC4C2,
-	/* Array index: 0x45C8 */ 0x9420,0xF4EA,
-	/* Array index: 0x45C8 */ 0x9455,0xF84B,
-	/* Array index: 0x45C8 */ 0x9457,0xF84D,
-	/* Array index: 0x45C8 */ 0x945D,0xF84C,
-	/* Array index: 0x45C8 */ 0x945E,0xF84E,
-	/* Array index: 0x45C8 */ 0x9577,0xAAF8,
-	/* Array index: 0x45C8 */ 0x9580,0xAAF9,
-	/* Array index: 0x45C8 */ 0x9582,0xADAC,
-	/* Array index: 0x45C8 */ 0x9583,0xB07B,
-	/* Array index: 0x45C8 */ 0x9586,0xD845,
-	/* Array index: 0x45C8 */ 0x9598,0xB968,
-	/* Array index: 0x45C8 */ 0x961C,0xAAFA,
-	/* Array index: 0x45C8 */ 0x9628,0xCBAE,
-	/* Array index: 0x45C8 */ 0x9658,0xB0A4,
-	/* Array index: 0x45C8 */ 0x9716,0xC04D,
-	/* Array index: 0x45C8 */ 0x9735,0xF66E,
-	/* Array index: 0x45C8 */ 0x9752,0xAB43,
-	/* Array index: 0x45C8 */ 0x9756,0xB974,
-	/* Array index: 0x45C8 */ 0x9788,0xE8B3,
-	/* Array index: 0x45C8 */ 0x9794,0xEC56,
-	/* Array index: 0x45C8 */ 0x97B3,0xF3A1,
-	/* Array index: 0x45C8 */ 0x97B6,0xF3A3,
-	/* Array index: 0x45C8 */ 0x97B7,0xF3A2,
-	/* Array index: 0x45C8 */ 0x97B9,0xF54A,
-	/* Array index: 0x45C8 */ 0x97BB,0xF54B,
-	/* Array index: 0x45C8 */ 0x97BF,0xF670,
-	/* Array index: 0x45C8 */ 0x97ED,0xADB4,
-	/* Array index: 0x45C8 */ 0x97F0,0xEC57,
-	/* Array index: 0x45C8 */ 0x97F1,0xEF44,
-	/* Array index: 0x45C8 */ 0x97F3,0xADB5,
-	/* Array index: 0x45C8 */ 0x98B6,0xC1FC,
-	/* Array index: 0x45C8 */ 0x98C9,0xF673,
-	/* Array index: 0x45C8 */ 0x98CB,0xF775,
-	/* Array index: 0x45C8 */ 0x98CC,0xF9B0,
-	/* Array index: 0x45C8 */ 0x98DB,0xADB8,
-	/* Array index: 0x45C8 */ 0x98DF,0xADB9,
-	/* Array index: 0x45C8 */ 0x98E2,0xB0A7,
-	/* Array index: 0x45C8 */ 0x98E3,0xD448,
-	/* Array index: 0x45C8 */ 0x98E5,0xD84F,
-	/* Array index: 0x45C8 */ 0x98F2,0xB6BC,
-	/* Array index: 0x45C8 */ 0x98F4,0xB97E,
-	/* Array index: 0x45C8 */ 0x98F6,0xE0E2,
-	/* Array index: 0x45C8 */ 0x99A1,0xEF57,
-	/* Array index: 0x45C8 */ 0x99C7,0xE4D9,
-	/* Array index: 0x45C8 */ 0x9AA8,0xB0A9,
-	/* Array index: 0x45C8 */ 0x9AAB,0xE0E9,
-	/* Array index: 0x45C8 */ 0x9AC6,0xF566,
-	/* Array index: 0x45C8 */ 0x9AC7,0xF564,
-	/* Array index: 0x45C8 */ 0x9ACA,0xF565,
-	/* Array index: 0x45C8 */ 0x9ADC,0xF1BA,
-	/* Array index: 0x45C8 */ 0x9ADF,0xD449,
-	/* Array index: 0x45C8 */ 0x9AE1,0xB9A6,
-	/* Array index: 0x45C8 */ 0x9AE3,0xE4DB,
-	/* Array index: 0x45C8 */ 0x9AE6,0xBBEC,
-	/* Array index: 0x45C8 */ 0x9AE7,0xE4DC,
-	/* Array index: 0x45C8 */ 0x9B6C,0xE8E3,
-	/* Array index: 0x45C8 */ 0x9B9A,0xEF6A,
-	/* Array index: 0x45C8 */ 0x9B9B,0xEF6D,
-	/* Array index: 0x45C8 */ 0x9BF0,0xF3CE,
-	/* Array index: 0x45C8 */ 0x9BF7,0xF56C,
-	/* Array index: 0x45C8 */ 0x9BF8,0xF56F,
-	/* Array index: 0x45C8 */ 0x9BFD,0xC356,
-	/* Array index: 0x45C8 */ 0x9C17,0xF574,
-	/* Array index: 0x45C8 */ 0x9C1C,0xF6AB,
-	/* Array index: 0x45C8 */ 0x9C1D,0xF6AA,
-	/* Array index: 0x45C8 */ 0x9C44,0xF7AD,
-	/* Array index: 0x45C8 */ 0x9C6D,0xF95C,
-	/* Array index: 0x45C8 */ 0x9C6E,0xF95B,
-	/* Array index: 0x45C8 */ 0x9CED,0xE0EC,
-	/* Array index: 0x45C8 */ 0x9D10,0xECAC,
-	/* Array index: 0x45C8 */ 0x9D12,0xC06F,
-	/* Array index: 0x45C8 */ 0x9D90,0xF57D,
-	/* Array index: 0x45C8 */ 0x9D92,0xF57B,
-	/* Array index: 0x45C8 */ 0x9E75,0xB3BF,
-	/* Array index: 0x45C8 */ 0x9EAD,0xECB3,
-	/* Array index: 0x45C8 */ 0x9EAE,0xECB2,
-	/* Array index: 0x45C8 */ 0x9EB0,0xEFAD,
-	/* Array index: 0x45C8 */ 0x9EBB,0xB3C2,
-	/* Array index: 0x45C8 */ 0x9EBC,0xBBF2,
-	/* Array index: 0x45C8 */ 0x9EBE,0xBEA3,
-	/* Array index: 0x45C8 */ 0x9EC0,0xF3F4,
-	/* Array index: 0x45C8 */ 0x9EC2,0xF874,
-	/* Array index: 0x45C8 */ 0x9EC3,0xB6C0,
-	/* Array index: 0x45C8 */ 0x9EC8,0xEFAE,
-	/* Array index: 0x45C8 */ 0x9F3B,0xBBF3,
-	/* Array index: 0x45C8 */ 0x9F7E,0xF9D3,
-	/* Array index: 0x45C8 */ 0x9F8D,0xC073,
-	/* Array index: 0x45C8 */ 0x9F98,0xF9D5,
-	/* Array index: 0x45C8 */ 0x9F9C,0xC074,
-	/* Array index: 0x45C8 */ 0x9FA0,0xEFB6,
-	/* Array index: 0x45C8 */ 0x9FA2,0xF7CF,
-	/* Array index: 0x45C8 */ 0x9FA4,0xF9A1,
-	/* Array index: 0x45C8 */ 0xFA0C,0xC94A,
-	/* Array index: 0x45C8 */ 0xFA0D,0xDDFC,
-	/* Array index: 0x45C8 */ 0xFF64,0xA14E,
-	/* Array index: 0x45C8 */ 0xFFFD,0xA15A,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_BIG5 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * big5 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_big5 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_BIG5, /* CCS name */
-	TABLE_16BIT, /* Table bits */
-#if defined (ICONV_FROM_UCS_CCS_BIG5) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&from_ucs_size_big5, /* UCS -> big5 table size-optimized table */
-#elif defined (ICONV_FROM_UCS_CCS_BIG5) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&from_ucs_speed_big5, /* UCS -> big5 table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-#if defined (ICONV_TO_UCS_CCS_BIG5) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&to_ucs_size_big5 /* big5 -> UCS table speed-optimized table */
-#elif defined (ICONV_TO_UCS_CCS_BIG5) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&to_ucs_speed_big5 /* big5 -> UCS table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_BIG5) || ... */
-
diff --git a/newlib/libc/iconv/ccs/binary/Makefile.am b/newlib/libc/iconv/ccs/binary/Makefile.am
deleted file mode 100644
index 5584ef2..0000000
--- a/newlib/libc/iconv/ccs/binary/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-cctdir=$(datadir)/iconv_data
-
-cct_DATA= \
-iso_8859_10.cct iso_8859_13.cct iso_8859_14.cct iso_8859_15.cct \
-iso_8859_1.cct iso_8859_2.cct iso_8859_3.cct iso_8859_4.cct \
-iso_8859_5.cct iso_8859_6.cct iso_8859_7.cct iso_8859_8.cct \
-iso_8859_9.cct iso_8859_11.cct \
-win_1250.cct win_1252.cct win_1254.cct \
-win_1256.cct win_1258.cct win_1251.cct \
-win_1253.cct win_1255.cct win_1257.cct \
-koi8_r.cct koi8_u.cct koi8_ru.cct koi8_uni.cct \
-iso_ir_111.cct \
-big5.cct \
-cp775.cct cp850.cct cp852.cct cp855.cct cp866.cct \
-jis_x0212_1990.cct jis_x0201_1976.cct jis_x0208_1990.cct ksx1001.cct \
-cns11643_plane1.cct cns11643_plane2.cct cns11643_plane14.cct
-
-include $(srcdir)/../../../../Makefile.shared
-
-info:
diff --git a/newlib/libc/iconv/ccs/binary/Makefile.in b/newlib/libc/iconv/ccs/binary/Makefile.in
deleted file mode 100644
index 2f9f616..0000000
--- a/newlib/libc/iconv/ccs/binary/Makefile.in
+++ /dev/null
@@ -1,249 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
-LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
-LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
-LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
-LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
-LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
-LIBC_SYS_LIB = @LIBC_SYS_LIB@
-LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-extra_dir = @extra_dir@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-cctdir = $(datadir)/iconv_data
-
-cct_DATA =  iso_8859_10.cct iso_8859_13.cct iso_8859_14.cct iso_8859_15.cct iso_8859_1.cct iso_8859_2.cct iso_8859_3.cct iso_8859_4.cct iso_8859_5.cct iso_8859_6.cct iso_8859_7.cct iso_8859_8.cct iso_8859_9.cct iso_8859_11.cct win_1250.cct win_1252.cct win_1254.cct win_1256.cct win_1258.cct win_1251.cct win_1253.cct win_1255.cct win_1257.cct koi8_r.cct koi8_u.cct koi8_ru.cct koi8_uni.cct iso_ir_111.cct big5.cct cp775.cct cp850.cct cp852.cct cp855.cct cp866.cct jis_x0212_1990.cct jis_x0201_1976.cct jis_x0208_1990.cct ksx1001.cct cns11643_plane1.cct cns11643_plane2.cct cns11643_plane14.cct
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DATA =  $(cct_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus iconv/ccs/binary/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-install-cctDATA: $(cct_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(cctdir)
-	@list='$(cct_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(cctdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(cctdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(cctdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(cctdir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-cctDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(cct_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(cctdir)/$$p; \
-	done
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = iconv/ccs/binary
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-cctDATA
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-cctDATA
-uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(cctdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: uninstall-cctDATA install-cctDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-info:
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/iconv/ccs/binary/big5.cct b/newlib/libc/iconv/ccs/binary/big5.cct
deleted file mode 100644
index b033093..0000000
--- a/newlib/libc/iconv/ccs/binary/big5.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/cns11643_plane1.cct b/newlib/libc/iconv/ccs/binary/cns11643_plane1.cct
deleted file mode 100644
index 509604b..0000000
--- a/newlib/libc/iconv/ccs/binary/cns11643_plane1.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/cns11643_plane14.cct b/newlib/libc/iconv/ccs/binary/cns11643_plane14.cct
deleted file mode 100644
index bdd01f4..0000000
--- a/newlib/libc/iconv/ccs/binary/cns11643_plane14.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/cns11643_plane2.cct b/newlib/libc/iconv/ccs/binary/cns11643_plane2.cct
deleted file mode 100644
index 29cedd4..0000000
--- a/newlib/libc/iconv/ccs/binary/cns11643_plane2.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/cp775.cct b/newlib/libc/iconv/ccs/binary/cp775.cct
deleted file mode 100644
index 88c7755..0000000
--- a/newlib/libc/iconv/ccs/binary/cp775.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/cp850.cct b/newlib/libc/iconv/ccs/binary/cp850.cct
deleted file mode 100644
index 527e0f7..0000000
--- a/newlib/libc/iconv/ccs/binary/cp850.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/cp852.cct b/newlib/libc/iconv/ccs/binary/cp852.cct
deleted file mode 100644
index a30201c..0000000
--- a/newlib/libc/iconv/ccs/binary/cp852.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/cp855.cct b/newlib/libc/iconv/ccs/binary/cp855.cct
deleted file mode 100644
index b49c83d..0000000
--- a/newlib/libc/iconv/ccs/binary/cp855.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/cp866.cct b/newlib/libc/iconv/ccs/binary/cp866.cct
deleted file mode 100644
index 0fb184f..0000000
--- a/newlib/libc/iconv/ccs/binary/cp866.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_1.cct b/newlib/libc/iconv/ccs/binary/iso_8859_1.cct
deleted file mode 100644
index a1030d6..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_1.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_10.cct b/newlib/libc/iconv/ccs/binary/iso_8859_10.cct
deleted file mode 100644
index c6ef964..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_10.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_11.cct b/newlib/libc/iconv/ccs/binary/iso_8859_11.cct
deleted file mode 100644
index a88fb21..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_11.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_13.cct b/newlib/libc/iconv/ccs/binary/iso_8859_13.cct
deleted file mode 100644
index b2b8d21..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_13.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_14.cct b/newlib/libc/iconv/ccs/binary/iso_8859_14.cct
deleted file mode 100644
index 844576c..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_14.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_15.cct b/newlib/libc/iconv/ccs/binary/iso_8859_15.cct
deleted file mode 100644
index 9a7df7e..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_15.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_2.cct b/newlib/libc/iconv/ccs/binary/iso_8859_2.cct
deleted file mode 100644
index 5224213..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_2.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_3.cct b/newlib/libc/iconv/ccs/binary/iso_8859_3.cct
deleted file mode 100644
index c6b6a8f..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_3.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_4.cct b/newlib/libc/iconv/ccs/binary/iso_8859_4.cct
deleted file mode 100644
index 521765f..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_4.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_5.cct b/newlib/libc/iconv/ccs/binary/iso_8859_5.cct
deleted file mode 100644
index 8901b5f..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_5.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_6.cct b/newlib/libc/iconv/ccs/binary/iso_8859_6.cct
deleted file mode 100644
index 07dcd9c..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_6.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_7.cct b/newlib/libc/iconv/ccs/binary/iso_8859_7.cct
deleted file mode 100644
index c668611..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_7.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_8.cct b/newlib/libc/iconv/ccs/binary/iso_8859_8.cct
deleted file mode 100644
index 57c46c4..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_8.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_8859_9.cct b/newlib/libc/iconv/ccs/binary/iso_8859_9.cct
deleted file mode 100644
index a5e095c..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_8859_9.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/iso_ir_111.cct b/newlib/libc/iconv/ccs/binary/iso_ir_111.cct
deleted file mode 100644
index 56bd3f9..0000000
--- a/newlib/libc/iconv/ccs/binary/iso_ir_111.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/jis_x0201_1976.cct b/newlib/libc/iconv/ccs/binary/jis_x0201_1976.cct
deleted file mode 100644
index 29fbcb3..0000000
--- a/newlib/libc/iconv/ccs/binary/jis_x0201_1976.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/jis_x0208_1990.cct b/newlib/libc/iconv/ccs/binary/jis_x0208_1990.cct
deleted file mode 100644
index 11d3bb4..0000000
--- a/newlib/libc/iconv/ccs/binary/jis_x0208_1990.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/jis_x0212_1990.cct b/newlib/libc/iconv/ccs/binary/jis_x0212_1990.cct
deleted file mode 100644
index 06eb9b8..0000000
--- a/newlib/libc/iconv/ccs/binary/jis_x0212_1990.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/koi8_r.cct b/newlib/libc/iconv/ccs/binary/koi8_r.cct
deleted file mode 100644
index 103272d..0000000
--- a/newlib/libc/iconv/ccs/binary/koi8_r.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/koi8_ru.cct b/newlib/libc/iconv/ccs/binary/koi8_ru.cct
deleted file mode 100644
index 01a9abd..0000000
--- a/newlib/libc/iconv/ccs/binary/koi8_ru.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/koi8_u.cct b/newlib/libc/iconv/ccs/binary/koi8_u.cct
deleted file mode 100644
index 2c8c2a4..0000000
--- a/newlib/libc/iconv/ccs/binary/koi8_u.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/koi8_uni.cct b/newlib/libc/iconv/ccs/binary/koi8_uni.cct
deleted file mode 100644
index 8744449..0000000
--- a/newlib/libc/iconv/ccs/binary/koi8_uni.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/ksx1001.cct b/newlib/libc/iconv/ccs/binary/ksx1001.cct
deleted file mode 100644
index 2bfef00..0000000
--- a/newlib/libc/iconv/ccs/binary/ksx1001.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/win_1250.cct b/newlib/libc/iconv/ccs/binary/win_1250.cct
deleted file mode 100644
index 5a4b4af..0000000
--- a/newlib/libc/iconv/ccs/binary/win_1250.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/win_1251.cct b/newlib/libc/iconv/ccs/binary/win_1251.cct
deleted file mode 100644
index 37e64b4..0000000
--- a/newlib/libc/iconv/ccs/binary/win_1251.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/win_1252.cct b/newlib/libc/iconv/ccs/binary/win_1252.cct
deleted file mode 100644
index 1375127..0000000
--- a/newlib/libc/iconv/ccs/binary/win_1252.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/win_1253.cct b/newlib/libc/iconv/ccs/binary/win_1253.cct
deleted file mode 100644
index 303dd4c..0000000
--- a/newlib/libc/iconv/ccs/binary/win_1253.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/win_1254.cct b/newlib/libc/iconv/ccs/binary/win_1254.cct
deleted file mode 100644
index e866480..0000000
--- a/newlib/libc/iconv/ccs/binary/win_1254.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/win_1255.cct b/newlib/libc/iconv/ccs/binary/win_1255.cct
deleted file mode 100644
index 092c358..0000000
--- a/newlib/libc/iconv/ccs/binary/win_1255.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/win_1256.cct b/newlib/libc/iconv/ccs/binary/win_1256.cct
deleted file mode 100644
index 6a458d3..0000000
--- a/newlib/libc/iconv/ccs/binary/win_1256.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/win_1257.cct b/newlib/libc/iconv/ccs/binary/win_1257.cct
deleted file mode 100644
index c5fcabc..0000000
--- a/newlib/libc/iconv/ccs/binary/win_1257.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/binary/win_1258.cct b/newlib/libc/iconv/ccs/binary/win_1258.cct
deleted file mode 100644
index 3de80ba..0000000
--- a/newlib/libc/iconv/ccs/binary/win_1258.cct
+++ /dev/null
diff --git a/newlib/libc/iconv/ccs/ccs.h b/newlib/libc/iconv/ccs/ccs.h
deleted file mode 100644
index d17f4ab..0000000
--- a/newlib/libc/iconv/ccs/ccs.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef __CCS_H__
-#define __CCS_H__
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-
-/*
- * Size-optimized tables will be linked instead of speed-optimized if
- * TABLE_USE_SIZE_OPTIMISATION macro is defined.
- */
-#if defined (PREFER_SIZE_OVER_SPEED) || defined (__OPTIMIZE_SIZE__)
-#  define TABLE_USE_SIZE_OPTIMIZATION
-#endif
-
-/* Invalid code marker */
-#define INVALC  0xFFFF
-/* Invalid block marker - marks empty blocks in speed-optimized tables */
-#define INVBLK  0xFFFF
-/* Lost code marker - marks codes that was lost during CCS->UCS mapping */
-#define LOST_C DEFAULT_CHARACTER
-
-/*
- * Table parameters values.
- */
-/* Table version 1.0 identifier */
-#define TABLE_VERSION_1 1
-/* 8 and 16 bit tables identifiers */
-#define TABLE_8BIT  8
-#define TABLE_16BIT 16
-/* Size-optimized and speed-optimized tables identifiers */
-#define TABLE_SIZE_OPTIMIZED  1
-#define TABLE_SPEED_OPTIMIZED 2
-/* Built-in/external tables identifiers */
-#define TABLE_BUILTIN  1
-#define TABLE_EXTERNAL 2
-
-/*
- * Binary table fields.
- */
-/* "No table" marker */
-#define EXTTABLE_NO_TABLE 0
-/* Version offset (2 bytes) */
-#define EXTTABLE_VERSION_OFF 0
-/* Bits number offset (2 bytes) */
-#define EXTTABLE_BITS_OFF 2
-/* CCS name length offset (2 bytes) */
-#define EXTTABLE_CCSNAME_LEN_OFF 4
-/* CCS name offset (expanded to even bytes number)*/
-#define EXTTABLE_CCSNAME_OFF 8
-/* Header length (minus CCS name) */
-#define EXTTABLE_HEADER_LEN (EXTTABLE_CCSNAME_OFF + 16*4)
-/* Tables and lengths offsets minus CCS name length (4 bytes) */
-#define EXTTABLE_FROM_SPEED_BE_OFF     (EXTTABLE_CCSNAME_OFF + 0)
-#define EXTTABLE_FROM_SPEED_BE_LEN_OFF (EXTTABLE_CCSNAME_OFF + 4)
-#define EXTTABLE_FROM_SPEED_LE_OFF     (EXTTABLE_CCSNAME_OFF + 8)
-#define EXTTABLE_FROM_SPEED_LE_LEN_OFF (EXTTABLE_CCSNAME_OFF + 12)
-#define EXTTABLE_FROM_SIZE_BE_OFF      (EXTTABLE_CCSNAME_OFF + 16)
-#define EXTTABLE_FROM_SIZE_BE_LEN_OFF  (EXTTABLE_CCSNAME_OFF + 20)
-#define EXTTABLE_FROM_SIZE_LE_OFF      (EXTTABLE_CCSNAME_OFF + 24)
-#define EXTTABLE_FROM_SIZE_LE_LEN_OFF  (EXTTABLE_CCSNAME_OFF + 28)
-#define EXTTABLE_TO_SPEED_BE_OFF       (EXTTABLE_CCSNAME_OFF + 32)
-#define EXTTABLE_TO_SPEED_BE_LEN_OFF   (EXTTABLE_CCSNAME_OFF + 36)
-#define EXTTABLE_TO_SPEED_LE_OFF       (EXTTABLE_CCSNAME_OFF + 40)
-#define EXTTABLE_TO_SPEED_LE_LEN_OFF   (EXTTABLE_CCSNAME_OFF + 44)
-#define EXTTABLE_TO_SIZE_BE_OFF        (EXTTABLE_CCSNAME_OFF + 48)
-#define EXTTABLE_TO_SIZE_BE_LEN_OFF    (EXTTABLE_CCSNAME_OFF + 52)
-#define EXTTABLE_TO_SIZE_LE_OFF        (EXTTABLE_CCSNAME_OFF + 56)
-#define EXTTABLE_TO_SIZE_LE_LEN_OFF    (EXTTABLE_CCSNAME_OFF + 60)
-/* Endian-independent offsets */
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define EXTTABLE_FROM_SPEED_OFF     EXTTABLE_FROM_SPEED_LE_OFF
-#  define EXTTABLE_FROM_SIZE_OFF      EXTTABLE_FROM_SIZE_LE_OFF
-#  define EXTTABLE_TO_SPEED_OFF       EXTTABLE_TO_SPEED_LE_OFF
-#  define EXTTABLE_TO_SIZE_OFF        EXTTABLE_TO_SIZE_LE_OFF
-#  define EXTTABLE_FROM_SPEED_LEN_OFF EXTTABLE_FROM_SPEED_LE_LEN_OFF
-#  define EXTTABLE_FROM_SIZE_LEN_OFF  EXTTABLE_FROM_SIZE_LE_LEN_OFF
-#  define EXTTABLE_TO_SPEED_LEN_OFF   EXTTABLE_TO_SPEED_LE_LEN_OFF
-#  define EXTTABLE_TO_SIZE_LEN_OFF    EXTTABLE_TO_SIZE_LE_LEN_OFF
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define EXTTABLE_FROM_SPEED_OFF     EXTTABLE_FROM_SPEED_BE_OFF
-#  define EXTTABLE_FROM_SIZE_OFF      EXTTABLE_FROM_SIZE_BE_OFF
-#  define EXTTABLE_TO_SPEED_OFF       EXTTABLE_TO_SPEED_BE_OFF
-#  define EXTTABLE_TO_SIZE_OFF        EXTTABLE_TO_SIZE_BE_OFF
-#  define EXTTABLE_FROM_SPEED_LEN_OFF EXTTABLE_FROM_SPEED_BE_LEN_OFF
-#  define EXTTABLE_FROM_SIZE_LEN_OFF  EXTTABLE_FROM_SIZE_BE_LEN_OFF
-#  define EXTTABLE_TO_SPEED_LEN_OFF   EXTTABLE_TO_SPEED_BE_LEN_OFF
-#  define EXTTABLE_TO_SIZE_LEN_OFF    EXTTABLE_TO_SIZE_BE_LEN_OFF
-#endif
-
-/*
- * Size-optimized suitable fields indexes.
- */
-/* Ranges number array index */
-#define RANGES_NUM_INDEX    0
-/* Un-ranged codes number array index */
-#define UNRANGED_NUM_INDEX  1
-/* First un-ranged pair index array index */
-#define FIRST_UNRANGED_INDEX_INDEX 2
-/* First range array index */
-#define FIRST_RANGE_INDEX   3
-
-
-/*
- * Builtin CCS table description structure.
- */
-typedef struct
-{
-  __uint16_t ver;               /* Table version */
-  _CONST char *name;            /* CCS name */
-  __uint16_t bits;              /* CCS's bits number */
-  int from_ucs_type;            /* UCS -> CCS table optimization type */
-  _CONST __uint16_t *from_ucs;  /* UCS -> CCS table */
-  int to_ucs_type;              /* CCS -> UCS table optimization type */
-  _CONST __uint16_t *to_ucs;    /* CCS -> UCS table */
-} iconv_ccs_t;
-
-/*
- * CCS table descriptor.
- */
-typedef struct
-{
-  int bits;               /* CCS's bits number */
-  int type;               /* Table type (builtin/external) */
-  int optimization;       /* Table optimization type (speed/size) */ 
-  _CONST __uint16_t *tbl; /* Table's data */
-} iconv_ccs_desc_t;
-
-/* Array containing all built-in CCS tables */
-extern _CONST iconv_ccs_t *
-_iconv_ccs[];
-
-#endif /* __CCS_H__ */
-
diff --git a/newlib/libc/iconv/ccs/ccsbi.c b/newlib/libc/iconv/ccs/ccsbi.c
deleted file mode 100644
index d79a2ce..0000000
--- a/newlib/libc/iconv/ccs/ccsbi.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * This file was automatically generated mkdeps.pl script. Don't edit.
- */
-
-#include <_ansi.h>
-#include "ccsbi.h"
-
-/*
- * The following array contains the list of built-in CCS tables.
- */
-_CONST iconv_ccs_t *
-_iconv_ccs[] =
-{
-#if defined (ICONV_TO_UCS_CCS_CP775) \
- || defined (ICONV_FROM_UCS_CCS_CP775)
-  &_iconv_ccs_cp775,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_IR_111) \
- || defined (ICONV_FROM_UCS_CCS_ISO_IR_111)
-  &_iconv_ccs_iso_ir_111,
-#endif
-#if defined (ICONV_TO_UCS_CCS_CP866) \
- || defined (ICONV_FROM_UCS_CCS_CP866)
-  &_iconv_ccs_cp866,
-#endif
-#if defined (ICONV_TO_UCS_CCS_KOI8_UNI) \
- || defined (ICONV_FROM_UCS_CCS_KOI8_UNI)
-  &_iconv_ccs_koi8_uni,
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1250) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1250)
-  &_iconv_ccs_win_1250,
-#endif
-#if defined (ICONV_TO_UCS_CCS_JIS_X0201_1976) \
- || defined (ICONV_FROM_UCS_CCS_JIS_X0201_1976)
-  &_iconv_ccs_jis_x0201_1976,
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1251) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1251)
-  &_iconv_ccs_win_1251,
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1252) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1252)
-  &_iconv_ccs_win_1252,
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1253) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1253)
-  &_iconv_ccs_win_1253,
-#endif
-#if defined (ICONV_TO_UCS_CCS_BIG5) \
- || defined (ICONV_FROM_UCS_CCS_BIG5)
-  &_iconv_ccs_big5,
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1254) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1254)
-  &_iconv_ccs_win_1254,
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1255) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1255)
-  &_iconv_ccs_win_1255,
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1256) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1256)
-  &_iconv_ccs_win_1256,
-#endif
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
- || defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14)
-  &_iconv_ccs_cns11643_plane14,
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1257) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1257)
-  &_iconv_ccs_win_1257,
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1258) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1258)
-  &_iconv_ccs_win_1258,
-#endif
-#if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
- || defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990)
-  &_iconv_ccs_jis_x0208_1990,
-#endif
-#if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
- || defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990)
-  &_iconv_ccs_jis_x0212_1990,
-#endif
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
- || defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1)
-  &_iconv_ccs_cns11643_plane1,
-#endif
-#if defined (ICONV_TO_UCS_CCS_CP850) \
- || defined (ICONV_FROM_UCS_CCS_CP850)
-  &_iconv_ccs_cp850,
-#endif
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
- || defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2)
-  &_iconv_ccs_cns11643_plane2,
-#endif
-#if defined (ICONV_TO_UCS_CCS_CP852) \
- || defined (ICONV_FROM_UCS_CCS_CP852)
-  &_iconv_ccs_cp852,
-#endif
-#if defined (ICONV_TO_UCS_CCS_KOI8_RU) \
- || defined (ICONV_FROM_UCS_CCS_KOI8_RU)
-  &_iconv_ccs_koi8_ru,
-#endif
-#if defined (ICONV_TO_UCS_CCS_CP855) \
- || defined (ICONV_FROM_UCS_CCS_CP855)
-  &_iconv_ccs_cp855,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_1) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_1)
-  &_iconv_ccs_iso_8859_1,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_2) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_2)
-  &_iconv_ccs_iso_8859_2,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_3) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_3)
-  &_iconv_ccs_iso_8859_3,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_4) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_4)
-  &_iconv_ccs_iso_8859_4,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_5) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_5)
-  &_iconv_ccs_iso_8859_5,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_6) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_6)
-  &_iconv_ccs_iso_8859_6,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_7) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_7)
-  &_iconv_ccs_iso_8859_7,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_8) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_8)
-  &_iconv_ccs_iso_8859_8,
-#endif
-#if defined (ICONV_TO_UCS_CCS_KSX1001) \
- || defined (ICONV_FROM_UCS_CCS_KSX1001)
-  &_iconv_ccs_ksx1001,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_9) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_9)
-  &_iconv_ccs_iso_8859_9,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_10) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_10)
-  &_iconv_ccs_iso_8859_10,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_11) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_11)
-  &_iconv_ccs_iso_8859_11,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_13) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_13)
-  &_iconv_ccs_iso_8859_13,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_14) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_14)
-  &_iconv_ccs_iso_8859_14,
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_15) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_15)
-  &_iconv_ccs_iso_8859_15,
-#endif
-#if defined (ICONV_TO_UCS_CCS_KOI8_R) \
- || defined (ICONV_FROM_UCS_CCS_KOI8_R)
-  &_iconv_ccs_koi8_r,
-#endif
-#if defined (ICONV_TO_UCS_CCS_KOI8_U) \
- || defined (ICONV_FROM_UCS_CCS_KOI8_U)
-  &_iconv_ccs_koi8_u,
-#endif
-  NULL
-};
diff --git a/newlib/libc/iconv/ccs/ccsbi.h b/newlib/libc/iconv/ccs/ccsbi.h
deleted file mode 100644
index 268cac3..0000000
--- a/newlib/libc/iconv/ccs/ccsbi.h
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
- * This file was automatically generated mkdeps.pl script. Don't edit.
- */
-
-#ifndef __CCSBI_H__
-#define __CCSBI_H__
-
-#include <newlib.h>
-#include <_ansi.h>
-#include "ccs.h"
-
-/*
- * Enable CCS tables if encoding needs them.
- * Defining ICONV_TO_UCS_CCS_XXX macro or ICONV_FROM_UCS_CCS_XXX
- * macro is needed to enable "XXX encoding -> UCS" or "UCS -> XXX encoding"
- * part of CCS table.
- * CCS tables aren't linked if Newlib was configuted to use external CCS tables.
- */
-#ifndef _ICONV_ENABLE_EXTERNAL_CCS
-
-#if defined (_ICONV_FROM_ENCODING_BIG5)
-#  define ICONV_TO_UCS_CCS_BIG5
-#endif
-#if defined (_ICONV_TO_ENCODING_BIG5)
-#  define ICONV_FROM_UCS_CCS_BIG5
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_EUC_TW)
-#  define ICONV_TO_UCS_CCS_CNS11643_PLANE1
-#endif
-#if defined (_ICONV_TO_ENCODING_EUC_TW)
-#  define ICONV_FROM_UCS_CCS_CNS11643_PLANE1
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_EUC_TW)
-#  define ICONV_TO_UCS_CCS_CNS11643_PLANE14
-#endif
-#if defined (_ICONV_TO_ENCODING_EUC_TW)
-#  define ICONV_FROM_UCS_CCS_CNS11643_PLANE14
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_EUC_TW)
-#  define ICONV_TO_UCS_CCS_CNS11643_PLANE2
-#endif
-#if defined (_ICONV_TO_ENCODING_EUC_TW)
-#  define ICONV_FROM_UCS_CCS_CNS11643_PLANE2
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_CP775)
-#  define ICONV_TO_UCS_CCS_CP775
-#endif
-#if defined (_ICONV_TO_ENCODING_CP775)
-#  define ICONV_FROM_UCS_CCS_CP775
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_CP850)
-#  define ICONV_TO_UCS_CCS_CP850
-#endif
-#if defined (_ICONV_TO_ENCODING_CP850)
-#  define ICONV_FROM_UCS_CCS_CP850
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_CP852)
-#  define ICONV_TO_UCS_CCS_CP852
-#endif
-#if defined (_ICONV_TO_ENCODING_CP852)
-#  define ICONV_FROM_UCS_CCS_CP852
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_CP855)
-#  define ICONV_TO_UCS_CCS_CP855
-#endif
-#if defined (_ICONV_TO_ENCODING_CP855)
-#  define ICONV_FROM_UCS_CCS_CP855
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_CP866)
-#  define ICONV_TO_UCS_CCS_CP866
-#endif
-#if defined (_ICONV_TO_ENCODING_CP866)
-#  define ICONV_FROM_UCS_CCS_CP866
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_1)
-#  define ICONV_TO_UCS_CCS_ISO_8859_1
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_1)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_1
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_10)
-#  define ICONV_TO_UCS_CCS_ISO_8859_10
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_10)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_10
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_11)
-#  define ICONV_TO_UCS_CCS_ISO_8859_11
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_11)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_11
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_13)
-#  define ICONV_TO_UCS_CCS_ISO_8859_13
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_13)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_13
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_14)
-#  define ICONV_TO_UCS_CCS_ISO_8859_14
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_14)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_14
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_15)
-#  define ICONV_TO_UCS_CCS_ISO_8859_15
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_15)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_15
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_2)
-#  define ICONV_TO_UCS_CCS_ISO_8859_2
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_2)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_2
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_3)
-#  define ICONV_TO_UCS_CCS_ISO_8859_3
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_3)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_3
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_4)
-#  define ICONV_TO_UCS_CCS_ISO_8859_4
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_4)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_4
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_5)
-#  define ICONV_TO_UCS_CCS_ISO_8859_5
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_5)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_5
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_6)
-#  define ICONV_TO_UCS_CCS_ISO_8859_6
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_6)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_6
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_7)
-#  define ICONV_TO_UCS_CCS_ISO_8859_7
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_7)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_7
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_8)
-#  define ICONV_TO_UCS_CCS_ISO_8859_8
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_8)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_8
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_9)
-#  define ICONV_TO_UCS_CCS_ISO_8859_9
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_8859_9)
-#  define ICONV_FROM_UCS_CCS_ISO_8859_9
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_ISO_IR_111)
-#  define ICONV_TO_UCS_CCS_ISO_IR_111
-#endif
-#if defined (_ICONV_TO_ENCODING_ISO_IR_111)
-#  define ICONV_FROM_UCS_CCS_ISO_IR_111
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_EUC_JP)
-#  define ICONV_TO_UCS_CCS_JIS_X0201_1976
-#endif
-#if defined (_ICONV_TO_ENCODING_EUC_JP)
-#  define ICONV_FROM_UCS_CCS_JIS_X0201_1976
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_EUC_JP)
-#  define ICONV_TO_UCS_CCS_JIS_X0208_1990
-#endif
-#if defined (_ICONV_TO_ENCODING_EUC_JP)
-#  define ICONV_FROM_UCS_CCS_JIS_X0208_1990
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_EUC_JP)
-#  define ICONV_TO_UCS_CCS_JIS_X0212_1990
-#endif
-#if defined (_ICONV_TO_ENCODING_EUC_JP)
-#  define ICONV_FROM_UCS_CCS_JIS_X0212_1990
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_KOI8_R)
-#  define ICONV_TO_UCS_CCS_KOI8_R
-#endif
-#if defined (_ICONV_TO_ENCODING_KOI8_R)
-#  define ICONV_FROM_UCS_CCS_KOI8_R
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_KOI8_RU)
-#  define ICONV_TO_UCS_CCS_KOI8_RU
-#endif
-#if defined (_ICONV_TO_ENCODING_KOI8_RU)
-#  define ICONV_FROM_UCS_CCS_KOI8_RU
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_KOI8_U)
-#  define ICONV_TO_UCS_CCS_KOI8_U
-#endif
-#if defined (_ICONV_TO_ENCODING_KOI8_U)
-#  define ICONV_FROM_UCS_CCS_KOI8_U
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_KOI8_UNI)
-#  define ICONV_TO_UCS_CCS_KOI8_UNI
-#endif
-#if defined (_ICONV_TO_ENCODING_KOI8_UNI)
-#  define ICONV_FROM_UCS_CCS_KOI8_UNI
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_EUC_KR)
-#  define ICONV_TO_UCS_CCS_KSX1001
-#endif
-#if defined (_ICONV_TO_ENCODING_EUC_KR)
-#  define ICONV_FROM_UCS_CCS_KSX1001
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_WIN_1250)
-#  define ICONV_TO_UCS_CCS_WIN_1250
-#endif
-#if defined (_ICONV_TO_ENCODING_WIN_1250)
-#  define ICONV_FROM_UCS_CCS_WIN_1250
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_WIN_1251)
-#  define ICONV_TO_UCS_CCS_WIN_1251
-#endif
-#if defined (_ICONV_TO_ENCODING_WIN_1251)
-#  define ICONV_FROM_UCS_CCS_WIN_1251
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_WIN_1252)
-#  define ICONV_TO_UCS_CCS_WIN_1252
-#endif
-#if defined (_ICONV_TO_ENCODING_WIN_1252)
-#  define ICONV_FROM_UCS_CCS_WIN_1252
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_WIN_1253)
-#  define ICONV_TO_UCS_CCS_WIN_1253
-#endif
-#if defined (_ICONV_TO_ENCODING_WIN_1253)
-#  define ICONV_FROM_UCS_CCS_WIN_1253
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_WIN_1254)
-#  define ICONV_TO_UCS_CCS_WIN_1254
-#endif
-#if defined (_ICONV_TO_ENCODING_WIN_1254)
-#  define ICONV_FROM_UCS_CCS_WIN_1254
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_WIN_1255)
-#  define ICONV_TO_UCS_CCS_WIN_1255
-#endif
-#if defined (_ICONV_TO_ENCODING_WIN_1255)
-#  define ICONV_FROM_UCS_CCS_WIN_1255
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_WIN_1256)
-#  define ICONV_TO_UCS_CCS_WIN_1256
-#endif
-#if defined (_ICONV_TO_ENCODING_WIN_1256)
-#  define ICONV_FROM_UCS_CCS_WIN_1256
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_WIN_1257)
-#  define ICONV_TO_UCS_CCS_WIN_1257
-#endif
-#if defined (_ICONV_TO_ENCODING_WIN_1257)
-#  define ICONV_FROM_UCS_CCS_WIN_1257
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_WIN_1258)
-#  define ICONV_TO_UCS_CCS_WIN_1258
-#endif
-#if defined (_ICONV_TO_ENCODING_WIN_1258)
-#  define ICONV_FROM_UCS_CCS_WIN_1258
-#endif
-
-/*
- * CCS table description structures forward declarations.
- */
-#if defined (ICONV_TO_UCS_CCS_BIG5) \
- || defined (ICONV_FROM_UCS_CCS_BIG5)
-extern _CONST iconv_ccs_t
-_iconv_ccs_big5;
-#endif
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
- || defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1)
-extern _CONST iconv_ccs_t
-_iconv_ccs_cns11643_plane1;
-#endif
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
- || defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14)
-extern _CONST iconv_ccs_t
-_iconv_ccs_cns11643_plane14;
-#endif
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
- || defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2)
-extern _CONST iconv_ccs_t
-_iconv_ccs_cns11643_plane2;
-#endif
-#if defined (ICONV_TO_UCS_CCS_CP775) \
- || defined (ICONV_FROM_UCS_CCS_CP775)
-extern _CONST iconv_ccs_t
-_iconv_ccs_cp775;
-#endif
-#if defined (ICONV_TO_UCS_CCS_CP850) \
- || defined (ICONV_FROM_UCS_CCS_CP850)
-extern _CONST iconv_ccs_t
-_iconv_ccs_cp850;
-#endif
-#if defined (ICONV_TO_UCS_CCS_CP852) \
- || defined (ICONV_FROM_UCS_CCS_CP852)
-extern _CONST iconv_ccs_t
-_iconv_ccs_cp852;
-#endif
-#if defined (ICONV_TO_UCS_CCS_CP855) \
- || defined (ICONV_FROM_UCS_CCS_CP855)
-extern _CONST iconv_ccs_t
-_iconv_ccs_cp855;
-#endif
-#if defined (ICONV_TO_UCS_CCS_CP866) \
- || defined (ICONV_FROM_UCS_CCS_CP866)
-extern _CONST iconv_ccs_t
-_iconv_ccs_cp866;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_1) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_1)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_1;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_10) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_10)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_10;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_11) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_11)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_11;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_13) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_13)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_13;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_14) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_14)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_14;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_15) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_15)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_15;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_2) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_2)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_2;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_3) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_3)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_3;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_4) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_4)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_4;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_5) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_5)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_5;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_6) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_6)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_6;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_7) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_7)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_7;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_8) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_8)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_8;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_9) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_9)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_8859_9;
-#endif
-#if defined (ICONV_TO_UCS_CCS_ISO_IR_111) \
- || defined (ICONV_FROM_UCS_CCS_ISO_IR_111)
-extern _CONST iconv_ccs_t
-_iconv_ccs_iso_ir_111;
-#endif
-#if defined (ICONV_TO_UCS_CCS_JIS_X0201_1976) \
- || defined (ICONV_FROM_UCS_CCS_JIS_X0201_1976)
-extern _CONST iconv_ccs_t
-_iconv_ccs_jis_x0201_1976;
-#endif
-#if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
- || defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990)
-extern _CONST iconv_ccs_t
-_iconv_ccs_jis_x0208_1990;
-#endif
-#if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
- || defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990)
-extern _CONST iconv_ccs_t
-_iconv_ccs_jis_x0212_1990;
-#endif
-#if defined (ICONV_TO_UCS_CCS_KOI8_R) \
- || defined (ICONV_FROM_UCS_CCS_KOI8_R)
-extern _CONST iconv_ccs_t
-_iconv_ccs_koi8_r;
-#endif
-#if defined (ICONV_TO_UCS_CCS_KOI8_RU) \
- || defined (ICONV_FROM_UCS_CCS_KOI8_RU)
-extern _CONST iconv_ccs_t
-_iconv_ccs_koi8_ru;
-#endif
-#if defined (ICONV_TO_UCS_CCS_KOI8_U) \
- || defined (ICONV_FROM_UCS_CCS_KOI8_U)
-extern _CONST iconv_ccs_t
-_iconv_ccs_koi8_u;
-#endif
-#if defined (ICONV_TO_UCS_CCS_KOI8_UNI) \
- || defined (ICONV_FROM_UCS_CCS_KOI8_UNI)
-extern _CONST iconv_ccs_t
-_iconv_ccs_koi8_uni;
-#endif
-#if defined (ICONV_TO_UCS_CCS_KSX1001) \
- || defined (ICONV_FROM_UCS_CCS_KSX1001)
-extern _CONST iconv_ccs_t
-_iconv_ccs_ksx1001;
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1250) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1250)
-extern _CONST iconv_ccs_t
-_iconv_ccs_win_1250;
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1251) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1251)
-extern _CONST iconv_ccs_t
-_iconv_ccs_win_1251;
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1252) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1252)
-extern _CONST iconv_ccs_t
-_iconv_ccs_win_1252;
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1253) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1253)
-extern _CONST iconv_ccs_t
-_iconv_ccs_win_1253;
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1254) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1254)
-extern _CONST iconv_ccs_t
-_iconv_ccs_win_1254;
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1255) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1255)
-extern _CONST iconv_ccs_t
-_iconv_ccs_win_1255;
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1256) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1256)
-extern _CONST iconv_ccs_t
-_iconv_ccs_win_1256;
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1257) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1257)
-extern _CONST iconv_ccs_t
-_iconv_ccs_win_1257;
-#endif
-#if defined (ICONV_TO_UCS_CCS_WIN_1258) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1258)
-extern _CONST iconv_ccs_t
-_iconv_ccs_win_1258;
-#endif
-
-#endif /* !_ICONV_ENABLE_EXTERNAL_CCS */
-
-
-#endif /* __CCSBI_H__ */
-
diff --git a/newlib/libc/iconv/ccs/ccsnames.h b/newlib/libc/iconv/ccs/ccsnames.h
deleted file mode 100644
index 24bfafc..0000000
--- a/newlib/libc/iconv/ccs/ccsnames.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * This file was automatically generated mkdeps.pl script. Don't edit.
- */
-
-#ifndef __CCSNAMES_H__
-#define __CCSNAMES_H__
-
-#include "../lib/encnames.h"
-
-/*
- * CCS tables names macros.
- */
-#define ICONV_CCS_BIG5 ICONV_ENCODING_BIG5
-#define ICONV_CCS_CNS11643_PLANE1 "cns11643_plane1"
-#define ICONV_CCS_CNS11643_PLANE14 "cns11643_plane14"
-#define ICONV_CCS_CNS11643_PLANE2 "cns11643_plane2"
-#define ICONV_CCS_CP775 ICONV_ENCODING_CP775
-#define ICONV_CCS_CP850 ICONV_ENCODING_CP850
-#define ICONV_CCS_CP852 ICONV_ENCODING_CP852
-#define ICONV_CCS_CP855 ICONV_ENCODING_CP855
-#define ICONV_CCS_CP866 ICONV_ENCODING_CP866
-#define ICONV_CCS_ISO_8859_1 ICONV_ENCODING_ISO_8859_1
-#define ICONV_CCS_ISO_8859_10 ICONV_ENCODING_ISO_8859_10
-#define ICONV_CCS_ISO_8859_11 ICONV_ENCODING_ISO_8859_11
-#define ICONV_CCS_ISO_8859_13 ICONV_ENCODING_ISO_8859_13
-#define ICONV_CCS_ISO_8859_14 ICONV_ENCODING_ISO_8859_14
-#define ICONV_CCS_ISO_8859_15 ICONV_ENCODING_ISO_8859_15
-#define ICONV_CCS_ISO_8859_2 ICONV_ENCODING_ISO_8859_2
-#define ICONV_CCS_ISO_8859_3 ICONV_ENCODING_ISO_8859_3
-#define ICONV_CCS_ISO_8859_4 ICONV_ENCODING_ISO_8859_4
-#define ICONV_CCS_ISO_8859_5 ICONV_ENCODING_ISO_8859_5
-#define ICONV_CCS_ISO_8859_6 ICONV_ENCODING_ISO_8859_6
-#define ICONV_CCS_ISO_8859_7 ICONV_ENCODING_ISO_8859_7
-#define ICONV_CCS_ISO_8859_8 ICONV_ENCODING_ISO_8859_8
-#define ICONV_CCS_ISO_8859_9 ICONV_ENCODING_ISO_8859_9
-#define ICONV_CCS_ISO_IR_111 ICONV_ENCODING_ISO_IR_111
-#define ICONV_CCS_JIS_X0201_1976 "jis_x0201_1976"
-#define ICONV_CCS_JIS_X0208_1990 "jis_x0208_1990"
-#define ICONV_CCS_JIS_X0212_1990 "jis_x0212_1990"
-#define ICONV_CCS_KOI8_R ICONV_ENCODING_KOI8_R
-#define ICONV_CCS_KOI8_RU ICONV_ENCODING_KOI8_RU
-#define ICONV_CCS_KOI8_U ICONV_ENCODING_KOI8_U
-#define ICONV_CCS_KOI8_UNI ICONV_ENCODING_KOI8_UNI
-#define ICONV_CCS_KSX1001 "ksx1001"
-#define ICONV_CCS_WIN_1250 ICONV_ENCODING_WIN_1250
-#define ICONV_CCS_WIN_1251 ICONV_ENCODING_WIN_1251
-#define ICONV_CCS_WIN_1252 ICONV_ENCODING_WIN_1252
-#define ICONV_CCS_WIN_1253 ICONV_ENCODING_WIN_1253
-#define ICONV_CCS_WIN_1254 ICONV_ENCODING_WIN_1254
-#define ICONV_CCS_WIN_1255 ICONV_ENCODING_WIN_1255
-#define ICONV_CCS_WIN_1256 ICONV_ENCODING_WIN_1256
-#define ICONV_CCS_WIN_1257 ICONV_ENCODING_WIN_1257
-#define ICONV_CCS_WIN_1258 ICONV_ENCODING_WIN_1258
-
-#endif /* !__CCSNAMES_H__ */
-
diff --git a/newlib/libc/iconv/ccs/cns11643_plane1.c b/newlib/libc/iconv/ccs/cns11643_plane1.c
deleted file mode 100644
index 37e31a9..0000000
--- a/newlib/libc/iconv/ccs/cns11643_plane1.c
+++ /dev/null
@@ -1,11211 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for cns11643_plane1 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
- || defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-/*
- * 16-bit cns11643_plane1 -> UCS speed-optimized table (33792 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_speed_cns11643_plane1[] =
-{
-	/* Heading Block */
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,0x0100,0x0200,0x0300,0x0400,0x0500,0x0600,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,0x0700,INVBLK,0x0800,0x0900,0x0A00,0x0B00,
-	0x0C00,0x0D00,0x0E00,0x0F00,0x1000,0x1100,0x1200,0x1300,
-	0x1400,0x1500,0x1600,0x1700,0x1800,0x1900,0x1A00,0x1B00,
-	0x1C00,0x1D00,0x1E00,0x1F00,0x2000,0x2100,0x2200,0x2300,
-	0x2400,0x2500,0x2600,0x2700,0x2800,0x2900,0x2A00,0x2B00,
-	0x2C00,0x2D00,0x2E00,0x2F00,0x3000,0x3100,0x3200,0x3300,
-	0x3400,0x3500,0x3600,0x3700,0x3800,0x3900,0x3A00,0x3B00,
-	0x3C00,0x3D00,0x3E00,0x3F00,0x4000,0x4100,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	/* Block 34, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3000,0xFF0C,0x3001,0x3002,0xFF0E,0x30FB,0xFF1B,
-	0xFF1A,0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFE51,
-	0xFE52,0x00B7,0xFE54,0xFE55,0xFE56,0xFE57,0xFE31,0x2014,
-	0xFE32,0x2013,INVALC,INVALC,INVALC,INVALC,0xFF08,0xFF09,
-	0xFE35,0xFE36,0xFF5B,0xFF5D,0xFE37,0xFE38,0x3014,0x3015,
-	0xFE39,0xFE3A,0x3010,0x3011,0xFE3B,0xFE3C,0x300A,0x300B,
-	0xFE3D,0xFE3E,0x3008,0x3009,0xFE3F,0xFE40,0x300C,0x300D,
-	0xFE41,0xFE42,0x300E,0x300F,0xFE43,0xFE44,0xFE59,0xFE5A,
-	0xFE5B,0xFE5C,0xFE5D,0xFE5E,0x2018,0x2019,0x201C,0x201D,
-	0x301D,0x301E,0x2032,0x2035,0xFF03,0xFF06,0xFF0A,0x203B,
-	0x00A7,0x3003,0x25CB,0x25CF,0x25B3,0x25B2,0x25CE,0x2606,
-	0x2605,0x25C7,0x25C6,0x25A1,0x25A0,0x25BD,0x25BC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 35, Array index 0x0200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x32A3,0x2105,0x203E,INVALC,0xFF3F,INVALC,0xFE49,
-	0xFE4A,0xFE4D,0xFE4E,0xFE4B,0xFE4C,0xFE5F,0xFE60,0xFE61,
-	0xFF0B,0xFF0D,0x00D7,0x00F7,0x00B1,0x221A,0xFF1C,0xFF1E,
-	0xFF1D,0x2266,0x2267,0x2260,0x221E,0x2252,0x2261,0xFE62,
-	0xFE63,0xFE64,0xFE66,0xFE65,0x223C,0x2229,0x222A,0x22A5,
-	0x2220,0x221F,0x22BF,0x33D2,0x33D1,0x222B,0x222E,0x2235,
-	0x2234,0x2640,0x2642,0x2641,0x2609,0x2191,0x2193,0x2192,
-	0x2190,0x2196,0x2197,0x2199,0x2198,0x2016,0xFF5C,0xFF0F,
-	0xFF3C,0x2215,0xFE68,0xFF04,0xFFE5,0x3012,0xFFE0,0xFFE1,
-	0xFF05,0xFF20,0x2103,0x2109,0xFE69,0xFE6A,0xFE6B,0x33D5,
-	0x339C,0x339D,0x339E,0x33CE,0x33A1,0x338E,0x338F,0x33C4,
-	0x00B0,0x5159,0x515B,0x515E,0x515D,0x5161,0x5163,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 36, Array index 0x0300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x55E7,0x74E9,0x7CCE,0x2581,0x2582,0x2583,0x2584,
-	0x2585,0x2586,0x2587,0x2588,0x258F,0x258E,0x258D,0x258C,
-	0x258B,0x258A,0x2589,0x253C,0x2534,0x252C,0x2524,0x251C,
-	0x2594,0x2500,0x2502,0x2595,0x250C,0x2510,0x2514,0x2518,
-	0x256D,0x256E,0x2570,0x256F,0x2550,0x255E,0x256A,0x2561,
-	0x25E2,0x25E3,0x25E5,0x25E4,0x2571,0x2572,0x2573,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 37, Array index 0x0400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xFF10,0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,
-	0xFF17,0xFF18,0xFF19,0x2160,0x2161,0x2162,0x2163,0x2164,
-	0x2165,0x2166,0x2167,0x2168,0x2169,0x3021,0x3022,0x3023,
-	0x3024,0x3025,0x3026,0x3027,0x3028,0x3029,INVALC,0x5344,
-	INVALC,0xFF21,0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27,
-	0xFF28,0xFF29,0xFF2A,0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,
-	0xFF30,0xFF31,0xFF32,0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,
-	0xFF38,0xFF39,0xFF3A,0xFF41,0xFF42,0xFF43,0xFF44,0xFF45,
-	0xFF46,0xFF47,0xFF48,0xFF49,0xFF4A,0xFF4B,0xFF4C,0xFF4D,
-	0xFF4E,0xFF4F,0xFF50,0xFF51,0xFF52,0xFF53,0xFF54,0xFF55,
-	0xFF56,0xFF57,0xFF58,0xFF59,0xFF5A,0x0391,0x0392,0x0393,
-	0x0394,0x0395,0x0396,0x0397,0x0398,0x0399,0x039A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 38, Array index 0x0500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x039B,0x039C,0x039D,0x039E,0x039F,0x03A0,0x03A1,
-	0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,0x03A9,0x03B1,
-	0x03B2,0x03B3,0x03B4,0x03B5,0x03B6,0x03B7,0x03B8,0x03B9,
-	0x03BA,0x03BB,0x03BC,0x03BD,0x03BE,0x03BF,0x03C0,0x03C1,
-	0x03C3,0x03C4,0x03C5,0x03C6,0x03C7,0x03C8,0x03C9,0x3105,
-	0x3106,0x3107,0x3108,0x3109,0x310A,0x310B,0x310C,0x310D,
-	0x310E,0x310F,0x3110,0x3111,0x3112,0x3113,0x3114,0x3115,
-	0x3116,0x3117,0x3118,0x3119,0x311A,0x311B,0x311C,0x311D,
-	0x311E,0x311F,0x3120,0x3121,0x3122,0x3123,0x3124,0x3125,
-	0x3126,0x3127,0x3128,0x3129,0x02D9,0x02C9,0x02CA,0x02C7,
-	0x02CB,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 39, Array index 0x0600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,
-	0x2467,0x2468,0x2469,0x2474,0x2475,0x2476,0x2477,0x2478,
-	0x2479,0x247A,0x247B,0x247C,0x247D,0x2170,0x2171,0x2172,
-	0x2173,0x2174,0x2175,0x2176,0x2177,0x2178,0x2179,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 67, Array index 0x0700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2400,0x2401,0x2402,0x2403,0x2404,0x2405,0x2406,
-	0x2407,0x2408,0x2409,0x240A,0x240B,0x240C,0x240D,0x240E,
-	0x240F,0x2410,0x2411,0x2412,0x2413,0x2414,0x2415,0x2416,
-	0x2417,0x2418,0x2419,0x241A,0x241B,0x241C,0x241D,0x241E,
-	0x241F,0x2421,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 69, Array index 0x0800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E00,0x4E59,0x4E01,0x4E03,0x4E43,0x4E5D,0x4E86,
-	0x4E8C,0x4EBA,0x513F,0x5165,0x516B,0x51E0,0x5200,0x5201,
-	0x529B,0x5315,0x5341,0x535C,0x53C8,0x4E09,0x4E0B,0x4E08,
-	0x4E0A,0x4E2B,0x4E38,0x51E1,0x4E45,0x4E48,0x4E5F,0x4E5E,
-	0x4E8E,0x4EA1,0x5140,0x5203,0x52FA,0x5343,0x53C9,0x53E3,
-	0x571F,0x58EB,0x5915,0x5927,0x5973,0x5B50,0x5B51,0x5B53,
-	0x5BF8,0x5C0F,0x5C22,0x5C38,0x5C71,0x5DDD,0x5DE5,0x5DF1,
-	0x5DF2,0x5DF3,0x5DFE,0x5E72,0x5EFE,0x5F0B,0x5F13,0x624D,
-	0x4E11,0x4E10,0x4E0D,0x4E2D,0x4E30,0x4E39,0x4E4B,0x5C39,
-	0x4E88,0x4E91,0x4E95,0x4E92,0x4E94,0x4EA2,0x4EC1,0x4EC0,
-	0x4EC3,0x4EC6,0x4EC7,0x4ECD,0x4ECA,0x4ECB,0x4EC4,0x5143,
-	0x5141,0x5167,0x516D,0x516E,0x516C,0x5197,0x51F6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 70, Array index 0x0900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5206,0x5207,0x5208,0x52FB,0x52FE,0x52FF,0x5316,
-	0x5339,0x5348,0x5347,0x5345,0x535E,0x5384,0x53CB,0x53CA,
-	0x53CD,0x58EC,0x5929,0x592B,0x592A,0x592D,0x5B54,0x5C11,
-	0x5C24,0x5C3A,0x5C6F,0x5DF4,0x5E7B,0x5EFF,0x5F14,0x5F15,
-	0x5FC3,0x6208,0x6236,0x624B,0x624E,0x652F,0x6587,0x6597,
-	0x65A4,0x65B9,0x65E5,0x66F0,0x6708,0x6728,0x6B20,0x6B62,
-	0x6B79,0x6BCB,0x6BD4,0x6BDB,0x6C0F,0x6C34,0x706B,0x722A,
-	0x7236,0x723B,0x7247,0x7259,0x725B,0x72AC,0x738B,0x4E19,
-	0x4E16,0x4E15,0x4E14,0x4E18,0x4E3B,0x4E4D,0x4E4F,0x4E4E,
-	0x4EE5,0x4ED8,0x4ED4,0x4ED5,0x4ED6,0x4ED7,0x4EE3,0x4EE4,
-	0x4ED9,0x4EDE,0x5145,0x5144,0x5189,0x518A,0x51AC,0x51F9,
-	0x51FA,0x51F8,0x520A,0x52A0,0x529F,0x5305,0x5306,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 71, Array index 0x0A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5317,0x531D,0x4EDF,0x534A,0x5349,0x5361,0x5360,
-	0x536F,0x536E,0x53BB,0x53EF,0x53E4,0x53F3,0x53EC,0x53EE,
-	0x53E9,0x53E8,0x53FC,0x53F8,0x53F5,0x53EB,0x53E6,0x53EA,
-	0x53F2,0x53F1,0x53F0,0x53E5,0x53ED,0x53FB,0x56DB,0x56DA,
-	0x5916,0x592E,0x5931,0x5974,0x5976,0x5B55,0x5B83,0x5C3C,
-	0x5DE8,0x5DE7,0x5DE6,0x5E02,0x5E03,0x5E73,0x5E7C,0x5F01,
-	0x5F18,0x5F17,0x5FC5,0x620A,0x6253,0x6254,0x6252,0x6251,
-	0x65A5,0x65E6,0x672E,0x672C,0x672A,0x672B,0x672D,0x6B63,
-	0x6BCD,0x6C11,0x6C10,0x6C38,0x6C41,0x6C40,0x6C3E,0x72AF,
-	0x7384,0x7389,0x74DC,0x74E6,0x7518,0x751F,0x7528,0x7529,
-	0x7530,0x7531,0x7532,0x7533,0x758B,0x767D,0x76AE,0x76BF,
-	0x76EE,0x77DB,0x77E2,0x77F3,0x793A,0x79BE,0x7A74,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 72, Array index 0x0B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7ACB,0x4E1E,0x4E1F,0x4E52,0x4E53,0x4E69,0x4E99,
-	0x4EA4,0x4EA6,0x4EA5,0x4EFF,0x4F09,0x4F19,0x4F0A,0x4F15,
-	0x4F0D,0x4F10,0x4F11,0x4F0F,0x4EF2,0x4EF6,0x4EFB,0x4EF0,
-	0x4EF3,0x4EFD,0x4F01,0x4F0B,0x5149,0x5147,0x5146,0x5148,
-	0x5168,0x5171,0x518D,0x51B0,0x5217,0x5211,0x5212,0x520E,
-	0x5216,0x52A3,0x5308,0x5321,0x5320,0x5370,0x5371,0x5409,
-	0x540F,0x540C,0x540A,0x5410,0x5401,0x540B,0x5404,0x5411,
-	0x540D,0x5408,0x5403,0x540E,0x5406,0x5412,0x56E0,0x56DE,
-	0x56DD,0x5733,0x5730,0x5728,0x572D,0x572C,0x572F,0x5729,
-	0x5919,0x591A,0x5937,0x5938,0x5984,0x5978,0x5983,0x597D,
-	0x5979,0x5982,0x5981,0x5B57,0x5B58,0x5B87,0x5B88,0x5B85,
-	0x5B89,0x5BFA,0x5C16,0x5C79,0x5DDE,0x5E06,0x5E76,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 73, Array index 0x0C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5E74,0x5F0F,0x5F1B,0x5FD9,0x5FD6,0x620E,0x620C,
-	0x620D,0x6210,0x6263,0x625B,0x6258,0x6536,0x65E9,0x65E8,
-	0x65EC,0x65ED,0x66F2,0x66F3,0x6709,0x673D,0x6734,0x6731,
-	0x6735,0x6B21,0x6B64,0x6B7B,0x6C16,0x6C5D,0x6C57,0x6C59,
-	0x6C5F,0x6C60,0x6C50,0x6C55,0x6C61,0x6C5B,0x6C4D,0x6C4E,
-	0x7070,0x725F,0x725D,0x767E,0x7AF9,0x7C73,0x7CF8,0x7F36,
-	0x7F8A,0x7FBD,0x8001,0x8003,0x800C,0x8012,0x8033,0x807F,
-	0x8089,0x808B,0x808C,0x81E3,0x81EA,0x81F3,0x81FC,0x820C,
-	0x821B,0x821F,0x826E,0x8272,0x827E,0x866B,0x8840,0x884C,
-	0x8863,0x897F,0x9621,0x4E32,0x4EA8,0x4F4D,0x4F4F,0x4F47,
-	0x4F57,0x4F5E,0x4F34,0x4F5B,0x4F55,0x4F30,0x4F50,0x4F51,
-	0x4F3D,0x4F3A,0x4F38,0x4F43,0x4F54,0x4F3C,0x4F46,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 74, Array index 0x0D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F63,0x4F5C,0x4F60,0x4F2F,0x4F4E,0x4F36,0x4F59,
-	0x4F5D,0x4F48,0x4F5A,0x514C,0x514B,0x514D,0x5175,0x51B6,
-	0x51B7,0x5225,0x5224,0x5229,0x522A,0x5228,0x52AB,0x52A9,
-	0x52AA,0x52AC,0x5323,0x5373,0x5375,0x541D,0x542D,0x541E,
-	0x543E,0x5426,0x544E,0x5427,0x5446,0x5443,0x5433,0x5448,
-	0x5442,0x541B,0x5429,0x544A,0x5439,0x543B,0x5438,0x542E,
-	0x5435,0x5436,0x5420,0x543C,0x5440,0x5431,0x542B,0x541F,
-	0x542C,0x56EA,0x56F0,0x56E4,0x56EB,0x574A,0x5751,0x5740,
-	0x574D,0x5747,0x574E,0x573E,0x5750,0x574F,0x573B,0x58EF,
-	0x593E,0x599D,0x5992,0x59A8,0x599E,0x59A3,0x5999,0x5996,
-	0x598D,0x59A4,0x5993,0x598A,0x59A5,0x5B5D,0x5B5C,0x5B5A,
-	0x5B5B,0x5B8C,0x5B8B,0x5B8F,0x5C2C,0x5C40,0x5C41,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 75, Array index 0x0E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C3F,0x5C3E,0x5C90,0x5C91,0x5C94,0x5C8C,0x5DEB,
-	0x5E0C,0x5E8F,0x5E87,0x5E8A,0x5EF7,0x5F04,0x5F1F,0x5F64,
-	0x5F62,0x5F77,0x5F79,0x5FD8,0x5FCC,0x5FD7,0x5FCD,0x5FF1,
-	0x5FEB,0x5FF8,0x5FEA,0x6212,0x6211,0x6284,0x6297,0x6296,
-	0x6280,0x6276,0x6289,0x626D,0x628A,0x627C,0x627E,0x6279,
-	0x6273,0x6292,0x626F,0x6298,0x626E,0x6295,0x6293,0x6291,
-	0x6286,0x6539,0x653B,0x6538,0x65F1,0x66F4,0x675F,0x674E,
-	0x674F,0x6750,0x6751,0x675C,0x6756,0x675E,0x6749,0x6746,
-	0x6760,0x6753,0x6757,0x6B65,0x6BCF,0x6C42,0x6C5E,0x6C99,
-	0x6C81,0x6C88,0x6C89,0x6C85,0x6C9B,0x6C6A,0x6C7A,0x6C90,
-	0x6C70,0x6C8C,0x6C68,0x6C96,0x6C92,0x6C7D,0x6C83,0x6C72,
-	0x6C7E,0x6C74,0x6C86,0x6C76,0x6C8D,0x6C94,0x6C98,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 76, Array index 0x0F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6C82,0x7076,0x707C,0x707D,0x7078,0x7262,0x7261,
-	0x7260,0x72C4,0x72C2,0x7396,0x752C,0x752B,0x7537,0x7538,
-	0x7682,0x76EF,0x77E3,0x79C1,0x79C0,0x79BF,0x7A76,0x7CFB,
-	0x7F55,0x8096,0x8093,0x809D,0x8098,0x809B,0x809A,0x80B2,
-	0x826F,0x8292,0x828B,0x828D,0x898B,0x89D2,0x8A00,0x8C37,
-	0x8C46,0x8C55,0x8C9D,0x8D64,0x8D70,0x8DB3,0x8EAB,0x8ECA,
-	0x8F9B,0x8FB0,0x8FC2,0x8FC6,0x8FC5,0x8FC4,0x5DE1,0x9091,
-	0x90A2,0x90AA,0x90A6,0x90A3,0x9149,0x91C6,0x91CC,0x9632,
-	0x962E,0x9631,0x962A,0x962C,0x4E26,0x4E56,0x4E73,0x4E8B,
-	0x4E9B,0x4E9E,0x4EAB,0x4EAC,0x4F6F,0x4F9D,0x4F8D,0x4F73,
-	0x4F7F,0x4F6C,0x4F9B,0x4F8B,0x4F86,0x4F83,0x4F70,0x4F75,
-	0x4F88,0x4F69,0x4F7B,0x4F96,0x4F7E,0x4F8F,0x4F91,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 77, Array index 0x1000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F7A,0x5154,0x5152,0x5155,0x5169,0x5177,0x5176,
-	0x5178,0x51BD,0x51FD,0x523B,0x5238,0x5237,0x523A,0x5230,
-	0x522E,0x5236,0x5241,0x52BE,0x52BB,0x5352,0x5354,0x5353,
-	0x5351,0x5366,0x5377,0x5378,0x5379,0x53D6,0x53D4,0x53D7,
-	0x5473,0x5475,0x5496,0x5478,0x5495,0x5480,0x547B,0x5477,
-	0x5484,0x5492,0x5486,0x547C,0x5490,0x5471,0x5476,0x548C,
-	0x549A,0x5462,0x5468,0x548B,0x547D,0x548E,0x56FA,0x5783,
-	0x5777,0x576A,0x5769,0x5761,0x5766,0x5764,0x577C,0x591C,
-	0x5949,0x5947,0x5948,0x5944,0x5954,0x59BE,0x59BB,0x59D4,
-	0x59B9,0x59AE,0x59D1,0x59C6,0x59D0,0x59CD,0x59CB,0x59D3,
-	0x59CA,0x59AF,0x59B3,0x59D2,0x59C5,0x5B5F,0x5B64,0x5B63,
-	0x5B97,0x5B9A,0x5B98,0x5B9C,0x5B99,0x5B9B,0x5C1A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 78, Array index 0x1100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C48,0x5C45,0x5C46,0x5CB7,0x5CA1,0x5CB8,0x5CA9,
-	0x5CAB,0x5CB1,0x5CB3,0x5E18,0x5E1A,0x5E16,0x5E15,0x5E1B,
-	0x5E11,0x5E78,0x5E9A,0x5E97,0x5E9C,0x5E95,0x5E96,0x5EF6,
-	0x5F26,0x5F27,0x5F29,0x5F80,0x5F81,0x5F7F,0x5F7C,0x5FDD,
-	0x5FE0,0x5FFD,0x5FF5,0x5FFF,0x600F,0x6014,0x602F,0x6035,
-	0x6016,0x602A,0x6015,0x6021,0x6027,0x6029,0x602B,0x601B,
-	0x6216,0x6215,0x623F,0x623E,0x6240,0x627F,0x62C9,0x62CC,
-	0x62C4,0x62BF,0x62C2,0x62B9,0x62D2,0x62DB,0x62AB,0x62D3,
-	0x62D4,0x62CB,0x62C8,0x62A8,0x62BD,0x62BC,0x62D0,0x62D9,
-	0x62C7,0x62CD,0x62B5,0x62DA,0x62B1,0x62D8,0x62D6,0x62D7,
-	0x62C6,0x62AC,0x62CE,0x653E,0x65A7,0x65BC,0x65FA,0x6614,
-	0x6613,0x660C,0x6606,0x6602,0x660E,0x6600,0x660F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 79, Array index 0x1200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6615,0x660A,0x6607,0x670D,0x670B,0x676D,0x678B,
-	0x6795,0x6771,0x679C,0x6773,0x6777,0x6787,0x679D,0x6797,
-	0x676F,0x6770,0x677F,0x6789,0x677E,0x6790,0x6775,0x679A,
-	0x6793,0x677C,0x676A,0x6772,0x6B23,0x6B66,0x6B67,0x6B7F,
-	0x6C13,0x6C1B,0x6CE3,0x6CE8,0x6CF3,0x6CB1,0x6CCC,0x6CE5,
-	0x6CB3,0x6CBD,0x6CBE,0x6CBC,0x6CE2,0x6CAB,0x6CD5,0x6CD3,
-	0x6CB8,0x6CC4,0x6CB9,0x6CC1,0x6CAE,0x6CD7,0x6CC5,0x6CF1,
-	0x6CBF,0x6CBB,0x6CE1,0x6CDB,0x6CCA,0x6CAC,0x6CEF,0x6CDC,
-	0x6CD6,0x6CE0,0x7095,0x708E,0x7092,0x708A,0x7099,0x722C,
-	0x722D,0x7238,0x7248,0x7267,0x7269,0x72C0,0x72CE,0x72D9,
-	0x72D7,0x72D0,0x73A9,0x73A8,0x739F,0x73AB,0x73A5,0x753D,
-	0x759D,0x7599,0x759A,0x7684,0x76C2,0x76F2,0x76F4,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 80, Array index 0x1300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x77E5,0x77FD,0x793E,0x7940,0x7941,0x79C9,0x79C8,
-	0x7A7A,0x7A79,0x7AFA,0x7CFE,0x7F54,0x7F8C,0x7F8B,0x8005,
-	0x80BA,0x80A5,0x80A2,0x80B1,0x80A1,0x80AB,0x80A9,0x80B4,
-	0x80AA,0x80AF,0x81E5,0x81FE,0x820D,0x82B3,0x829D,0x8299,
-	0x82AD,0x82BD,0x829F,0x82B9,0x82B1,0x82AC,0x82A5,0x82AF,
-	0x82B8,0x82A3,0x82B0,0x82BE,0x82B7,0x864E,0x8671,0x521D,
-	0x8868,0x8ECB,0x8FCE,0x8FD4,0x8FD1,0x90B5,0x90B8,0x90B1,
-	0x90B6,0x91C7,0x91D1,0x9577,0x9580,0x961C,0x9640,0x963F,
-	0x963B,0x9644,0x9642,0x96B9,0x96E8,0x9752,0x975E,0x4E9F,
-	0x4EAD,0x4EAE,0x4FE1,0x4FB5,0x4FAF,0x4FBF,0x4FE0,0x4FD1,
-	0x4FCF,0x4FDD,0x4FC3,0x4FB6,0x4FD8,0x4FDF,0x4FCA,0x4FD7,
-	0x4FAE,0x4FD0,0x4FC4,0x4FC2,0x4FDA,0x4FCE,0x4FDE,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 81, Array index 0x1400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4FB7,0x5157,0x5192,0x5191,0x51A0,0x524E,0x5243,
-	0x524A,0x524D,0x524C,0x524B,0x5247,0x52C7,0x52C9,0x52C3,
-	0x52C1,0x530D,0x5357,0x537B,0x539A,0x53DB,0x54AC,0x54C0,
-	0x54A8,0x54CE,0x54C9,0x54B8,0x54A6,0x54B3,0x54C7,0x54C2,
-	0x54BD,0x54AA,0x54C1,0x54C4,0x54C8,0x54AF,0x54AB,0x54B1,
-	0x54BB,0x54A9,0x54A7,0x54BF,0x56FF,0x5782,0x578B,0x57A0,
-	0x57A3,0x57A2,0x57CE,0x57AE,0x5793,0x5955,0x5951,0x594F,
-	0x594E,0x5950,0x59DC,0x59D8,0x59FF,0x59E3,0x59E8,0x5A03,
-	0x59E5,0x59EA,0x59DA,0x59E6,0x5A01,0x59FB,0x5B69,0x5BA3,
-	0x5BA6,0x5BA4,0x5BA2,0x5BA5,0x5C01,0x5C4E,0x5C4F,0x5C4D,
-	0x5C4B,0x5CD9,0x5CD2,0x5DF7,0x5E1D,0x5E25,0x5E1F,0x5E7D,
-	0x5EA0,0x5EA6,0x5EFA,0x5F08,0x5F2D,0x5F65,0x5F88,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 82, Array index 0x1500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F85,0x5F8A,0x5F8B,0x5F87,0x5F8C,0x5F89,0x6012,
-	0x601D,0x6020,0x6025,0x600E,0x6028,0x604D,0x6070,0x6068,
-	0x6062,0x6046,0x6043,0x606C,0x606B,0x606A,0x6064,0x6241,
-	0x62DC,0x6316,0x6309,0x62FC,0x62ED,0x6301,0x62EE,0x62FD,
-	0x6307,0x62F1,0x62F7,0x62EF,0x62EC,0x62FE,0x62F4,0x6311,
-	0x6302,0x653F,0x6545,0x65AB,0x65BD,0x65E2,0x6625,0x662D,
-	0x6620,0x6627,0x662F,0x661F,0x6628,0x6631,0x6624,0x66F7,
-	0x67FF,0x67D3,0x67F1,0x67D4,0x67D0,0x67EC,0x67B6,0x67AF,
-	0x67F5,0x67E9,0x67EF,0x67C4,0x67D1,0x67B4,0x67DA,0x67E5,
-	0x67B8,0x67CF,0x67DE,0x67F3,0x67B0,0x67D9,0x67E2,0x67DD,
-	0x67D2,0x6B6A,0x6B83,0x6B86,0x6BB5,0x6BD2,0x6BD7,0x6C1F,
-	0x6CC9,0x6D0B,0x6D32,0x6D2A,0x6D41,0x6D25,0x6D0C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 83, Array index 0x1600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6D31,0x6D1E,0x6D17,0x6D3B,0x6D3D,0x6D3E,0x6D36,
-	0x6D1B,0x6CF5,0x6D39,0x6D27,0x6D38,0x6D29,0x6D2E,0x6D35,
-	0x6D0E,0x6D2B,0x70AB,0x70BA,0x70B3,0x70AC,0x70AF,0x70AD,
-	0x70B8,0x70AE,0x70A4,0x7230,0x7272,0x726F,0x7274,0x72E9,
-	0x72E0,0x72E1,0x73B7,0x73CA,0x73BB,0x73B2,0x73CD,0x73C0,
-	0x73B3,0x751A,0x752D,0x754F,0x754C,0x754E,0x754B,0x75AB,
-	0x75A4,0x75A5,0x75A2,0x75A3,0x7678,0x7686,0x7687,0x7688,
-	0x76C8,0x76C6,0x76C3,0x76C5,0x7701,0x76F9,0x76F8,0x7709,
-	0x770B,0x76FE,0x76FC,0x7707,0x77DC,0x7802,0x7814,0x780C,
-	0x780D,0x7946,0x7949,0x7948,0x7947,0x79B9,0x79BA,0x79D1,
-	0x79D2,0x79CB,0x7A7F,0x7A81,0x7AFF,0x7AFD,0x7C7D,0x7D02,
-	0x7D05,0x7D00,0x7D09,0x7D07,0x7D04,0x7D06,0x7F38,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 84, Array index 0x1700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7F8E,0x7FBF,0x8010,0x800D,0x8011,0x8036,0x80D6,
-	0x80E5,0x80DA,0x80C3,0x80C4,0x80CC,0x80E1,0x80DB,0x80CE,
-	0x80DE,0x80E4,0x80DD,0x81F4,0x8222,0x82E7,0x8303,0x8305,
-	0x82E3,0x82DB,0x82E6,0x8304,0x82E5,0x8302,0x8309,0x82D2,
-	0x82D7,0x82F1,0x8301,0x82DC,0x82D4,0x82D1,0x82DE,0x82D3,
-	0x82DF,0x82EF,0x8306,0x8650,0x8679,0x867B,0x867A,0x884D,
-	0x886B,0x8981,0x89D4,0x8A08,0x8A02,0x8A03,0x8C9E,0x8CA0,
-	0x8D74,0x8D73,0x8DB4,0x8ECD,0x8ECC,0x8FF0,0x8FE6,0x8FE2,
-	0x8FEA,0x8FE5,0x8FED,0x8FEB,0x8FE4,0x8FE8,0x90CA,0x90CE,
-	0x90C1,0x90C3,0x914B,0x914A,0x91CD,0x9582,0x9650,0x964B,
-	0x964C,0x964D,0x9762,0x9769,0x97CB,0x97ED,0x97F3,0x9801,
-	0x98A8,0x98DB,0x98DF,0x9996,0x9999,0x4E58,0x4EB3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 85, Array index 0x1800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x500C,0x500D,0x5023,0x4FEF,0x5026,0x5025,0x4FF8,
-	0x5029,0x5016,0x5006,0x503C,0x501F,0x501A,0x5012,0x5011,
-	0x4FFA,0x5000,0x5014,0x5028,0x4FF1,0x5021,0x500B,0x5019,
-	0x5018,0x4FF3,0x4FEE,0x502D,0x502A,0x4FFE,0x502B,0x5009,
-	0x517C,0x51A4,0x51A5,0x51A2,0x51CD,0x51CC,0x51C6,0x51CB,
-	0x5256,0x525C,0x5254,0x525B,0x525D,0x532A,0x537F,0x539F,
-	0x539D,0x53DF,0x54E8,0x5510,0x5501,0x5537,0x54FC,0x54E5,
-	0x54F2,0x5506,0x54FA,0x5514,0x54E9,0x54ED,0x54E1,0x5509,
-	0x54EE,0x54EA,0x54E6,0x5527,0x5507,0x54FD,0x550F,0x5703,
-	0x5704,0x57C2,0x57D4,0x57CB,0x57C3,0x5809,0x590F,0x5957,
-	0x5958,0x595A,0x5A11,0x5A18,0x5A1C,0x5A1F,0x5A1B,0x5A13,
-	0x59EC,0x5A20,0x5A23,0x5A29,0x5A25,0x5A0C,0x5A09,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 86, Array index 0x1900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5B6B,0x5C58,0x5BB0,0x5BB3,0x5BB6,0x5BB4,0x5BAE,
-	0x5BB5,0x5BB9,0x5BB8,0x5C04,0x5C51,0x5C55,0x5C50,0x5CED,
-	0x5CFD,0x5CFB,0x5CEA,0x5CE8,0x5CF0,0x5CF6,0x5D01,0x5CF4,
-	0x5DEE,0x5E2D,0x5E2B,0x5EAB,0x5EAD,0x5EA7,0x5F31,0x5F92,
-	0x5F91,0x5F90,0x6059,0x6063,0x6065,0x6050,0x6055,0x606D,
-	0x6069,0x606F,0x6084,0x609F,0x609A,0x608D,0x6094,0x608C,
-	0x6085,0x6096,0x6247,0x62F3,0x6308,0x62FF,0x634E,0x633E,
-	0x632F,0x6355,0x6342,0x6346,0x634F,0x6349,0x633A,0x6350,
-	0x633D,0x632A,0x632B,0x6328,0x634D,0x634C,0x6548,0x6549,
-	0x6599,0x65C1,0x65C5,0x6642,0x6649,0x664F,0x6643,0x6652,
-	0x664C,0x6645,0x6641,0x66F8,0x6714,0x6715,0x6717,0x6821,
-	0x6838,0x6848,0x6846,0x6853,0x6839,0x6842,0x6854,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 87, Array index 0x1A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6829,0x68B3,0x6817,0x684C,0x6851,0x683D,0x67F4,
-	0x6850,0x6840,0x683C,0x6843,0x682A,0x6845,0x6813,0x6818,
-	0x6841,0x6B8A,0x6B89,0x6BB7,0x6C23,0x6C27,0x6C28,0x6C26,
-	0x6C24,0x6CF0,0x6D6A,0x6D95,0x6D88,0x6D87,0x6D66,0x6D78,
-	0x6D77,0x6D59,0x6D93,0x6D6C,0x6D89,0x6D6E,0x6D5A,0x6D74,
-	0x6D69,0x6D8C,0x6D8A,0x6D79,0x6D85,0x6D65,0x6D94,0x70CA,
-	0x70D8,0x70E4,0x70D9,0x70C8,0x70CF,0x7239,0x7279,0x72FC,
-	0x72F9,0x72FD,0x72F8,0x72F7,0x7386,0x73ED,0x7409,0x73EE,
-	0x73E0,0x73EA,0x73DE,0x7554,0x755D,0x755C,0x755A,0x7559,
-	0x75BE,0x75C5,0x75C7,0x75B2,0x75B3,0x75BD,0x75BC,0x75B9,
-	0x75C2,0x75B8,0x768B,0x76B0,0x76CA,0x76CD,0x76CE,0x7729,
-	0x771F,0x7720,0x7728,0x77E9,0x7830,0x7827,0x7838,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 88, Array index 0x1B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x781D,0x7834,0x7837,0x7825,0x782D,0x7820,0x781F,
-	0x7832,0x7955,0x7950,0x7960,0x795F,0x7956,0x795E,0x795D,
-	0x7957,0x795A,0x79E4,0x79E3,0x79E7,0x79DF,0x79E6,0x79E9,
-	0x79D8,0x7A84,0x7A88,0x7AD9,0x7B06,0x7B11,0x7C89,0x7D21,
-	0x7D17,0x7D0B,0x7D0A,0x7D20,0x7D22,0x7D14,0x7D10,0x7D15,
-	0x7D1A,0x7D1C,0x7D0D,0x7D19,0x7D1B,0x7F3A,0x7F5F,0x7F94,
-	0x7FC5,0x7FC1,0x8006,0x8004,0x8018,0x8015,0x8019,0x8017,
-	0x803D,0x803F,0x80F1,0x8102,0x80F0,0x8105,0x80ED,0x80F4,
-	0x8106,0x80F8,0x80F3,0x8108,0x80FD,0x810A,0x80FC,0x80EF,
-	0x81ED,0x81EC,0x8200,0x8210,0x822A,0x822B,0x8228,0x822C,
-	0x82BB,0x832B,0x8352,0x8354,0x834A,0x8338,0x8350,0x8349,
-	0x8335,0x8334,0x834F,0x8332,0x8339,0x8336,0x8317,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 89, Array index 0x1C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8340,0x8331,0x8328,0x8343,0x8654,0x868A,0x86AA,
-	0x8693,0x86A4,0x86A9,0x868C,0x86A3,0x869C,0x8870,0x8877,
-	0x8881,0x8882,0x887D,0x8879,0x8A18,0x8A10,0x8A0E,0x8A0C,
-	0x8A15,0x8A0A,0x8A17,0x8A13,0x8A16,0x8A0F,0x8A11,0x8C48,
-	0x8C7A,0x8C79,0x8CA1,0x8CA2,0x8D77,0x8EAC,0x8ED2,0x8ED4,
-	0x8ECF,0x8FB1,0x9001,0x9006,0x8FF7,0x9000,0x8FFA,0x8FF4,
-	0x9003,0x8FFD,0x9005,0x8FF8,0x9095,0x90E1,0x90DD,0x90E2,
-	0x9152,0x914D,0x914C,0x91D8,0x91DD,0x91D7,0x91DC,0x91D9,
-	0x9583,0x9662,0x9663,0x9661,0x965B,0x965D,0x9664,0x9658,
-	0x965E,0x96BB,0x98E2,0x99AC,0x9AA8,0x9AD8,0x9B25,0x9B32,
-	0x9B3C,0x4E7E,0x507A,0x507D,0x505C,0x5047,0x5043,0x504C,
-	0x505A,0x5049,0x5065,0x5076,0x504E,0x5055,0x5075,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 90, Array index 0x1D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5074,0x5077,0x504F,0x500F,0x506F,0x506D,0x515C,
-	0x5195,0x51F0,0x526A,0x526F,0x52D2,0x52D9,0x52D8,0x52D5,
-	0x5310,0x530F,0x5319,0x533F,0x5340,0x533E,0x53C3,0x66FC,
-	0x5546,0x556A,0x5566,0x5544,0x555E,0x5561,0x5543,0x554A,
-	0x5531,0x5556,0x554F,0x5555,0x552F,0x5564,0x5538,0x552E,
-	0x555C,0x552C,0x5563,0x5533,0x5541,0x5557,0x5708,0x570B,
-	0x5709,0x57DF,0x5805,0x580A,0x5806,0x57E0,0x57E4,0x57FA,
-	0x5802,0x5835,0x57F7,0x57F9,0x5920,0x5962,0x5A36,0x5A41,
-	0x5A49,0x5A66,0x5A6A,0x5A40,0x5A3C,0x5A62,0x5A5A,0x5A46,
-	0x5A4A,0x5B70,0x5BC7,0x5BC5,0x5BC4,0x5BC2,0x5BBF,0x5BC6,
-	0x5C09,0x5C08,0x5C07,0x5C60,0x5C5C,0x5C5D,0x5D07,0x5D06,
-	0x5D0E,0x5D1B,0x5D16,0x5D22,0x5D11,0x5D29,0x5D14,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 91, Array index 0x1E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D19,0x5D24,0x5D27,0x5D17,0x5DE2,0x5E38,0x5E36,
-	0x5E33,0x5E37,0x5EB7,0x5EB8,0x5EB6,0x5EB5,0x5EBE,0x5F35,
-	0x5F37,0x5F57,0x5F6C,0x5F69,0x5F6B,0x5F97,0x5F99,0x5F9E,
-	0x5F98,0x5FA1,0x5FA0,0x5F9C,0x607F,0x60A3,0x6089,0x60A0,
-	0x60A8,0x60CB,0x60B4,0x60E6,0x60BD,0x60C5,0x60BB,0x60B5,
-	0x60DC,0x60BC,0x60D8,0x60D5,0x60C6,0x60DF,0x60B8,0x60DA,
-	0x60C7,0x621A,0x621B,0x6248,0x63A0,0x63A7,0x6372,0x6396,
-	0x63A2,0x63A5,0x6377,0x6367,0x6398,0x63AA,0x6371,0x63A9,
-	0x6389,0x6383,0x639B,0x636B,0x63A8,0x6384,0x6388,0x6399,
-	0x63A1,0x63AC,0x6392,0x638F,0x6380,0x637B,0x6369,0x6368,
-	0x637A,0x655D,0x6556,0x6551,0x6559,0x6557,0x555F,0x654F,
-	0x6558,0x6555,0x6554,0x659C,0x659B,0x65AC,0x65CF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 92, Array index 0x1F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x65CB,0x65CC,0x65CE,0x665D,0x665A,0x6664,0x6668,
-	0x6666,0x665E,0x66F9,0x52D7,0x671B,0x6881,0x68AF,0x68A2,
-	0x6893,0x68B5,0x687F,0x6876,0x68B1,0x68A7,0x6897,0x68B0,
-	0x6883,0x68C4,0x68AD,0x6886,0x6885,0x6894,0x689D,0x68A8,
-	0x689F,0x68A1,0x6882,0x6B32,0x6BBA,0x6BEB,0x6BEC,0x6C2B,
-	0x6D8E,0x6DBC,0x6DF3,0x6DD9,0x6DB2,0x6DE1,0x6DCC,0x6DE4,
-	0x6DFB,0x6DFA,0x6E05,0x6DC7,0x6DCB,0x6DAF,0x6DD1,0x6DAE,
-	0x6DDE,0x6DF9,0x6DB8,0x6DF7,0x6DF5,0x6DC5,0x6DD2,0x6E1A,
-	0x6DB5,0x6DDA,0x6DEB,0x6DD8,0x6DEA,0x6DF1,0x6DEE,0x6DE8,
-	0x6DC6,0x6DC4,0x6DAA,0x6DEC,0x6DBF,0x6DE6,0x70F9,0x7109,
-	0x710A,0x70FD,0x70EF,0x723D,0x727D,0x7281,0x731C,0x731B,
-	0x7316,0x7313,0x7319,0x7387,0x7405,0x740A,0x7403,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 93, Array index 0x2000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7406,0x73FE,0x740D,0x74E0,0x74F6,0x74F7,0x751C,
-	0x7522,0x7565,0x7566,0x7562,0x7570,0x758F,0x75D4,0x75D5,
-	0x75B5,0x75CA,0x75CD,0x768E,0x76D4,0x76D2,0x76DB,0x7737,
-	0x773E,0x773C,0x7736,0x7738,0x773A,0x786B,0x7843,0x784E,
-	0x7965,0x7968,0x796D,0x79FB,0x7A92,0x7A95,0x7B20,0x7B28,
-	0x7B1B,0x7B2C,0x7B26,0x7B19,0x7B1E,0x7B2E,0x7C92,0x7C97,
-	0x7C95,0x7D46,0x7D43,0x7D71,0x7D2E,0x7D39,0x7D3C,0x7D40,
-	0x7D30,0x7D33,0x7D44,0x7D2F,0x7D42,0x7D32,0x7D31,0x7F3D,
-	0x7F9E,0x7F9A,0x7FCC,0x7FCE,0x7FD2,0x801C,0x804A,0x8046,
-	0x812F,0x8116,0x8123,0x812B,0x8129,0x8130,0x8124,0x8202,
-	0x8235,0x8237,0x8236,0x8239,0x838E,0x839E,0x8398,0x8378,
-	0x83A2,0x8396,0x83BD,0x83AB,0x8392,0x838A,0x8393,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 94, Array index 0x2100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8389,0x83A0,0x8377,0x837B,0x837C,0x8386,0x83A7,
-	0x8655,0x5F6A,0x86C7,0x86C0,0x86B6,0x86C4,0x86B5,0x86C6,
-	0x86CB,0x86B1,0x86AF,0x86C9,0x8853,0x889E,0x8888,0x88AB,
-	0x8892,0x8896,0x888D,0x888B,0x8993,0x898F,0x8A2A,0x8A1D,
-	0x8A23,0x8A25,0x8A31,0x8A2D,0x8A1F,0x8A1B,0x8A22,0x8C49,
-	0x8C5A,0x8CA9,0x8CAC,0x8CAB,0x8CA8,0x8CAA,0x8CA7,0x8D67,
-	0x8D66,0x8DBE,0x8DBA,0x8EDB,0x8EDF,0x9019,0x900D,0x901A,
-	0x9017,0x9023,0x901F,0x901D,0x9010,0x9015,0x901E,0x9020,
-	0x900F,0x9022,0x9016,0x901B,0x9014,0x90E8,0x90ED,0x90FD,
-	0x9157,0x91CE,0x91F5,0x91E6,0x91E3,0x91E7,0x91ED,0x91E9,
-	0x9589,0x966A,0x9675,0x9673,0x9678,0x9670,0x9674,0x9676,
-	0x9677,0x966C,0x96C0,0x96EA,0x96E9,0x7AE0,0x7ADF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 95, Array index 0x2200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9802,0x9803,0x9B5A,0x9CE5,0x9E75,0x9E7F,0x9EA5,
-	0x9EBB,0x50A2,0x508D,0x5085,0x5099,0x5091,0x5080,0x5096,
-	0x5098,0x509A,0x6700,0x51F1,0x5272,0x5274,0x5275,0x5269,
-	0x52DE,0x52DD,0x52DB,0x535A,0x53A5,0x557B,0x5580,0x55A7,
-	0x557C,0x558A,0x559D,0x5598,0x5582,0x559C,0x55AA,0x5594,
-	0x5587,0x558B,0x5583,0x55B3,0x55AE,0x559F,0x553E,0x55B2,
-	0x559A,0x55BB,0x55AC,0x55B1,0x557E,0x5589,0x55AB,0x5599,
-	0x570D,0x582F,0x582A,0x5834,0x5824,0x5830,0x5831,0x5821,
-	0x581D,0x5820,0x58F9,0x58FA,0x5960,0x5A77,0x5A9A,0x5A7F,
-	0x5A92,0x5A9B,0x5AA7,0x5B73,0x5B71,0x5BD2,0x5BCC,0x5BD3,
-	0x5BD0,0x5C0A,0x5C0B,0x5C31,0x5D4C,0x5D50,0x5D34,0x5D47,
-	0x5DFD,0x5E45,0x5E3D,0x5E40,0x5E43,0x5E7E,0x5ECA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 96, Array index 0x2300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5EC1,0x5EC2,0x5EC4,0x5F3C,0x5F6D,0x5FA9,0x5FAA,
-	0x5FA8,0x60D1,0x60E1,0x60B2,0x60B6,0x60E0,0x611C,0x6123,
-	0x60FA,0x6115,0x60F0,0x60FB,0x60F4,0x6168,0x60F1,0x610E,
-	0x60F6,0x6109,0x6100,0x6112,0x621F,0x6249,0x63A3,0x638C,
-	0x63CF,0x63C0,0x63E9,0x63C9,0x63C6,0x63CD,0x63D2,0x63E3,
-	0x63D0,0x63E1,0x63D6,0x63ED,0x63EE,0x6376,0x63F4,0x63EA,
-	0x63DB,0x6452,0x63DA,0x63F9,0x655E,0x6566,0x6562,0x6563,
-	0x6591,0x6590,0x65AF,0x666E,0x6670,0x6674,0x6676,0x666F,
-	0x6691,0x667A,0x667E,0x6677,0x66FE,0x66FF,0x671F,0x671D,
-	0x68FA,0x68D5,0x68E0,0x68D8,0x68D7,0x6905,0x68DF,0x68F5,
-	0x68EE,0x68E7,0x68F9,0x68D2,0x68F2,0x68E3,0x68CB,0x68CD,
-	0x690D,0x6912,0x690E,0x68C9,0x68DA,0x696E,0x68FB,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 97, Array index 0x2400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B3E,0x6B3A,0x6B3D,0x6B98,0x6B96,0x6BBC,0x6BEF,
-	0x6C2E,0x6C2F,0x6C2C,0x6E2F,0x6E38,0x6E54,0x6E21,0x6E32,
-	0x6E67,0x6E4A,0x6E20,0x6E25,0x6E23,0x6E1B,0x6E5B,0x6E58,
-	0x6E24,0x6E56,0x6E6E,0x6E2D,0x6E26,0x6E6F,0x6E34,0x6E4D,
-	0x6E3A,0x6E2C,0x6E43,0x6E1D,0x6E3E,0x6ECB,0x6E89,0x6E19,
-	0x6E4E,0x6E63,0x6E44,0x6E72,0x6E69,0x6E5F,0x7119,0x711A,
-	0x7126,0x7130,0x7121,0x7136,0x716E,0x711C,0x724C,0x7284,
-	0x7280,0x7336,0x7325,0x7334,0x7329,0x743A,0x742A,0x7433,
-	0x7422,0x7425,0x7435,0x7436,0x7434,0x742F,0x741B,0x7426,
-	0x7428,0x7525,0x7526,0x756B,0x756A,0x75E2,0x75DB,0x75E3,
-	0x75D9,0x75D8,0x75DE,0x75E0,0x767B,0x767C,0x7696,0x7693,
-	0x76B4,0x76DC,0x774F,0x77ED,0x785D,0x786C,0x786F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 98, Array index 0x2500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7A0D,0x7A08,0x7A0B,0x7A05,0x7A00,0x7A98,0x7A97,
-	0x7A96,0x7AE5,0x7AE3,0x7B49,0x7B56,0x7B46,0x7B50,0x7B52,
-	0x7B54,0x7B4D,0x7B4B,0x7B4F,0x7B51,0x7C9F,0x7CA5,0x7D5E,
-	0x7D50,0x7D68,0x7D55,0x7D2B,0x7D6E,0x7D72,0x7D61,0x7D66,
-	0x7D62,0x7D70,0x7D73,0x5584,0x7FD4,0x7FD5,0x800B,0x8052,
-	0x8085,0x8155,0x8154,0x814B,0x8151,0x814E,0x8139,0x8146,
-	0x813E,0x814C,0x8153,0x8174,0x8212,0x821C,0x83E9,0x8403,
-	0x83F8,0x840D,0x83E0,0x83C5,0x840B,0x83C1,0x83EF,0x83F1,
-	0x83F4,0x8457,0x840A,0x83F0,0x840C,0x83CC,0x83FD,0x83F2,
-	0x83CA,0x8438,0x840E,0x8404,0x83DC,0x8407,0x83D4,0x83DF,
-	0x865B,0x86DF,0x86D9,0x86ED,0x86D4,0x86DB,0x86E4,0x86D0,
-	0x86DE,0x8857,0x88C1,0x88C2,0x88B1,0x8983,0x8996,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 99, Array index 0x2600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8A3B,0x8A60,0x8A55,0x8A5E,0x8A3C,0x8A41,0x8A54,
-	0x8A5B,0x8A50,0x8A46,0x8A34,0x8A3A,0x8A36,0x8A56,0x8C61,
-	0x8C82,0x8CAF,0x8CBC,0x8CB3,0x8CBD,0x8CC1,0x8CBB,0x8CC0,
-	0x8CB4,0x8CB7,0x8CB6,0x8CBF,0x8CB8,0x8D8A,0x8D85,0x8D81,
-	0x8DCE,0x8DDD,0x8DCB,0x8DDA,0x8DD1,0x8DCC,0x8DDB,0x8DC6,
-	0x8EFB,0x8EF8,0x8EFC,0x8F9C,0x902E,0x9035,0x9031,0x9038,
-	0x9032,0x9036,0x9102,0x90F5,0x9109,0x90FE,0x9163,0x9165,
-	0x91CF,0x9214,0x9215,0x9223,0x9209,0x921E,0x920D,0x9210,
-	0x9207,0x9211,0x9594,0x958F,0x958B,0x9591,0x9593,0x9592,
-	0x958E,0x968A,0x968E,0x968B,0x967D,0x9685,0x9686,0x968D,
-	0x9672,0x9684,0x96C1,0x96C5,0x96C4,0x96C6,0x96C7,0x96EF,
-	0x96F2,0x97CC,0x9805,0x9806,0x9808,0x98E7,0x98EA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 100, Array index 0x2700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x98EF,0x98E9,0x98F2,0x98ED,0x99AE,0x99AD,0x9EC3,
-	0x9ECD,0x9ED1,0x4E82,0x50AD,0x50B5,0x50B2,0x50B3,0x50C5,
-	0x50BE,0x50AC,0x50B7,0x50BB,0x50AF,0x50C7,0x527F,0x5277,
-	0x527D,0x52DF,0x52E6,0x52E4,0x52E2,0x52E3,0x532F,0x55DF,
-	0x55E8,0x55D3,0x55E6,0x55CE,0x55DC,0x55C7,0x55D1,0x55E3,
-	0x55E4,0x55EF,0x55DA,0x55E1,0x55C5,0x55C6,0x55E5,0x55C9,
-	0x5712,0x5713,0x585E,0x5851,0x5858,0x5857,0x585A,0x5854,
-	0x586B,0x584C,0x586D,0x584A,0x5862,0x5852,0x584B,0x5967,
-	0x5AC1,0x5AC9,0x5ACC,0x5ABE,0x5ABD,0x5ABC,0x5AB3,0x5AC2,
-	0x5AB2,0x5D69,0x5D6F,0x5E4C,0x5E79,0x5EC9,0x5EC8,0x5F12,
-	0x5F59,0x5FAC,0x5FAE,0x611A,0x610F,0x6148,0x611F,0x60F3,
-	0x611B,0x60F9,0x6101,0x6108,0x614E,0x614C,0x6144,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 101, Array index 0x2800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x614D,0x613E,0x6134,0x6127,0x610D,0x6106,0x6137,
-	0x6221,0x6222,0x6413,0x643E,0x641E,0x642A,0x642D,0x643D,
-	0x642C,0x640F,0x641C,0x6414,0x640D,0x6436,0x6416,0x6417,
-	0x6406,0x656C,0x659F,0x65B0,0x6697,0x6689,0x6687,0x6688,
-	0x6696,0x6684,0x6698,0x668D,0x6703,0x6994,0x696D,0x695A,
-	0x6977,0x6960,0x6954,0x6975,0x6930,0x6982,0x694A,0x6968,
-	0x696B,0x695E,0x6953,0x6979,0x6986,0x695D,0x6963,0x695B,
-	0x6B47,0x6B72,0x6BC0,0x6BBF,0x6BD3,0x6BFD,0x6EA2,0x6EAF,
-	0x6ED3,0x6EB6,0x6EC2,0x6E90,0x6E9D,0x6EC7,0x6EC5,0x6EA5,
-	0x6E98,0x6EBC,0x6EBA,0x6EAB,0x6ED1,0x6E96,0x6E9C,0x6EC4,
-	0x6ED4,0x6EAA,0x6EA7,0x6EB4,0x714E,0x7159,0x7169,0x7164,
-	0x7149,0x7167,0x715C,0x716C,0x7166,0x714C,0x7165,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 102, Array index 0x2900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x715E,0x7146,0x7168,0x7156,0x723A,0x7252,0x7337,
-	0x7345,0x733F,0x733E,0x746F,0x745A,0x7455,0x745F,0x745E,
-	0x7441,0x743F,0x7459,0x745B,0x745C,0x7576,0x7578,0x7600,
-	0x75F0,0x7601,0x75F2,0x75F1,0x75FA,0x75FF,0x75F4,0x75F3,
-	0x76DE,0x76DF,0x775B,0x776B,0x7766,0x775E,0x7763,0x7779,
-	0x776A,0x776C,0x775C,0x7765,0x7768,0x7762,0x77EE,0x788E,
-	0x78B0,0x7897,0x7898,0x788C,0x7889,0x787C,0x7891,0x7893,
-	0x787F,0x797A,0x797F,0x7981,0x842C,0x79BD,0x7A1C,0x7A1A,
-	0x7A20,0x7A14,0x7A1F,0x7A1E,0x7A9F,0x7AA0,0x7B77,0x7BC0,
-	0x7B60,0x7B6E,0x7B67,0x7CB1,0x7CB3,0x7CB5,0x7D93,0x7D79,
-	0x7D91,0x7D81,0x7D8F,0x7D5B,0x7F6E,0x7F69,0x7F6A,0x7F72,
-	0x7FA9,0x7FA8,0x7FA4,0x8056,0x8058,0x8086,0x8084,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 103, Array index 0x2A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8171,0x8170,0x8178,0x8165,0x816E,0x8173,0x816B,
-	0x8179,0x817A,0x8166,0x8205,0x8247,0x8482,0x8477,0x843D,
-	0x8431,0x8475,0x8466,0x846B,0x8449,0x846C,0x845B,0x843C,
-	0x8435,0x8461,0x8463,0x8469,0x846D,0x8446,0x865E,0x865C,
-	0x865F,0x86F9,0x8713,0x8708,0x8707,0x8700,0x86FE,0x86FB,
-	0x8702,0x8703,0x8706,0x870A,0x8859,0x88DF,0x88D4,0x88D9,
-	0x88DC,0x88D8,0x88DD,0x88E1,0x88CA,0x88D5,0x88D2,0x899C,
-	0x89E3,0x8A6B,0x8A72,0x8A73,0x8A66,0x8A69,0x8A70,0x8A87,
-	0x8A7C,0x8A63,0x8AA0,0x8A71,0x8A85,0x8A6D,0x8A62,0x8A6E,
-	0x8A6C,0x8A79,0x8A7B,0x8A3E,0x8A68,0x8C62,0x8C8A,0x8C89,
-	0x8CCA,0x8CC7,0x8CC8,0x8CC4,0x8CB2,0x8CC3,0x8CC2,0x8CC5,
-	0x8DE1,0x8DDF,0x8DE8,0x8DEF,0x8DF3,0x8DFA,0x8DEA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 104, Array index 0x2B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8DE4,0x8DE6,0x8EB2,0x8F03,0x8F09,0x8EFE,0x8F0A,
-	0x8F9F,0x8FB2,0x904B,0x904A,0x9053,0x9042,0x9054,0x903C,
-	0x9055,0x9050,0x9047,0x904F,0x904E,0x904D,0x9051,0x903E,
-	0x9041,0x9112,0x9117,0x916C,0x916A,0x9169,0x91C9,0x9237,
-	0x9257,0x9238,0x923D,0x9240,0x923E,0x925B,0x924B,0x9264,
-	0x9251,0x9234,0x9249,0x924D,0x9245,0x9239,0x923F,0x925A,
-	0x9598,0x9698,0x9694,0x9695,0x96CD,0x96CB,0x96C9,0x96CA,
-	0x96F7,0x96FB,0x96F9,0x96F6,0x9756,0x9774,0x9776,0x9810,
-	0x9811,0x9813,0x980A,0x9812,0x980C,0x98FC,0x98F4,0x98FD,
-	0x98FE,0x99B3,0x99B1,0x99B4,0x9AE1,0x9CE9,0x9E82,0x9F0E,
-	0x9F13,0x9F20,0x50E7,0x50EE,0x50E5,0x50D6,0x50ED,0x50DA,
-	0x50D5,0x50CF,0x50D1,0x50F1,0x50CE,0x50E9,0x5162,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 105, Array index 0x2C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x51F3,0x5283,0x5282,0x5331,0x53AD,0x55FE,0x5600,
-	0x561B,0x5617,0x55FD,0x5614,0x5606,0x5609,0x560D,0x560E,
-	0x55F7,0x5616,0x561F,0x5608,0x5610,0x55F6,0x5718,0x5716,
-	0x5875,0x587E,0x5883,0x5893,0x588A,0x5879,0x5885,0x587D,
-	0x58FD,0x5925,0x5922,0x5924,0x596A,0x5969,0x5AE1,0x5AE6,
-	0x5AE9,0x5AD7,0x5AD6,0x5AD8,0x5AE3,0x5B75,0x5BDE,0x5BE7,
-	0x5BE1,0x5BE5,0x5BE6,0x5BE8,0x5BE2,0x5BE4,0x5BDF,0x5C0D,
-	0x5C62,0x5D84,0x5D87,0x5E5B,0x5E63,0x5E55,0x5E57,0x5E54,
-	0x5ED3,0x5ED6,0x5F0A,0x5F46,0x5F70,0x5FB9,0x6147,0x613F,
-	0x614B,0x6177,0x6162,0x6163,0x615F,0x615A,0x6158,0x6175,
-	0x622A,0x6487,0x6458,0x6454,0x64A4,0x6478,0x645F,0x647A,
-	0x6451,0x6467,0x6434,0x646D,0x647B,0x6572,0x65A1,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 106, Array index 0x2D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x65D7,0x65D6,0x66A2,0x66A8,0x669D,0x699C,0x69A8,
-	0x6995,0x69C1,0x69AE,0x69D3,0x69CB,0x699B,0x69B7,0x69BB,
-	0x69AB,0x69B4,0x69D0,0x69CD,0x69AD,0x69CC,0x69A6,0x69C3,
-	0x69A3,0x6B49,0x6B4C,0x6C33,0x6F33,0x6F14,0x6EFE,0x6F13,
-	0x6EF4,0x6F29,0x6F3E,0x6F20,0x6F2C,0x6F0F,0x6F02,0x6F22,
-	0x6EFF,0x6EEF,0x6F06,0x6F31,0x6F38,0x6F32,0x6F23,0x6F15,
-	0x6F2B,0x6F2F,0x6F88,0x6F2A,0x6EEC,0x6F01,0x6EF2,0x6ECC,
-	0x6EF7,0x7194,0x7199,0x717D,0x718A,0x7184,0x7192,0x723E,
-	0x7292,0x7296,0x7344,0x7350,0x7464,0x7463,0x746A,0x7470,
-	0x746D,0x7504,0x7591,0x7627,0x760D,0x760B,0x7609,0x7613,
-	0x76E1,0x76E3,0x7784,0x777D,0x777F,0x7761,0x78C1,0x789F,
-	0x78A7,0x78B3,0x78A9,0x78A3,0x798E,0x798F,0x798D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 107, Array index 0x2E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7A2E,0x7A31,0x7AAA,0x7AA9,0x7AED,0x7AEF,0x7BA1,
-	0x7B95,0x7B8B,0x7B75,0x7B97,0x7B9D,0x7B94,0x7B8F,0x7BB8,
-	0x7B87,0x7B84,0x7CB9,0x7CBD,0x7CBE,0x7DBB,0x7DB0,0x7D9C,
-	0x7DBD,0x7DBE,0x7DA0,0x7DCA,0x7DB4,0x7DB2,0x7DB1,0x7DBA,
-	0x7DA2,0x7DBF,0x7DB5,0x7DB8,0x7DAD,0x7DD2,0x7DC7,0x7DAC,
-	0x7F70,0x7FE0,0x7FE1,0x7FDF,0x805E,0x805A,0x8087,0x8150,
-	0x8180,0x818F,0x8188,0x818A,0x817F,0x8182,0x81E7,0x81FA,
-	0x8207,0x8214,0x821E,0x824B,0x84C9,0x84BF,0x84C6,0x84C4,
-	0x8499,0x849E,0x84B2,0x849C,0x84CB,0x84B8,0x84C0,0x84D3,
-	0x8490,0x84BC,0x84D1,0x84CA,0x873F,0x871C,0x873B,0x8722,
-	0x8725,0x8734,0x8718,0x8755,0x8737,0x8729,0x88F3,0x8902,
-	0x88F4,0x88F9,0x88F8,0x88FD,0x88E8,0x891A,0x88EF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 108, Array index 0x2F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8AA6,0x8A8C,0x8A9E,0x8AA3,0x8A8D,0x8AA1,0x8A93,
-	0x8AA4,0x8AAA,0x8AA5,0x8AA8,0x8A98,0x8A91,0x8A9A,0x8AA7,
-	0x8C6A,0x8C8D,0x8C8C,0x8CD3,0x8CD1,0x8CD2,0x8D6B,0x8D99,
-	0x8D95,0x8DFC,0x8F14,0x8F12,0x8F15,0x8F13,0x8FA3,0x9060,
-	0x9058,0x905C,0x9063,0x9059,0x905E,0x9062,0x905D,0x905B,
-	0x9119,0x9118,0x911E,0x9175,0x9178,0x9177,0x9174,0x9278,
-	0x92AC,0x9280,0x9285,0x9298,0x9296,0x927B,0x9293,0x929C,
-	0x92A8,0x927C,0x9291,0x95A1,0x95A8,0x95A9,0x95A3,0x95A5,
-	0x95A4,0x9699,0x969C,0x969B,0x96CC,0x96D2,0x9700,0x977C,
-	0x9785,0x97F6,0x9817,0x9818,0x98AF,0x98B1,0x9903,0x9905,
-	0x990C,0x9909,0x99C1,0x9AAF,0x9AB0,0x9AE6,0x9B41,0x9B42,
-	0x9CF4,0x9CF6,0x9CF3,0x9EBC,0x9F3B,0x9F4A,0x5104,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 109, Array index 0x3000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5100,0x50FB,0x50F5,0x50F9,0x5102,0x5108,0x5109,
-	0x5105,0x51DC,0x5287,0x5288,0x5289,0x528D,0x528A,0x52F0,
-	0x53B2,0x562E,0x563B,0x5639,0x5632,0x563F,0x5634,0x5629,
-	0x5653,0x564E,0x5657,0x5674,0x5636,0x562F,0x5630,0x5880,
-	0x589F,0x589E,0x58B3,0x589C,0x58AE,0x58A9,0x58A6,0x596D,
-	0x5B09,0x5AFB,0x5B0B,0x5AF5,0x5B0C,0x5B08,0x5BEE,0x5BEC,
-	0x5BE9,0x5BEB,0x5C64,0x5C65,0x5D9D,0x5D94,0x5E62,0x5E5F,
-	0x5E61,0x5EE2,0x5EDA,0x5EDF,0x5EDD,0x5EE3,0x5EE0,0x5F48,
-	0x5F71,0x5FB7,0x5FB5,0x6176,0x6167,0x616E,0x615D,0x6155,
-	0x6182,0x617C,0x6170,0x616B,0x617E,0x61A7,0x6190,0x61AB,
-	0x618E,0x61AC,0x619A,0x61A4,0x6194,0x61AE,0x622E,0x6469,
-	0x646F,0x6479,0x649E,0x64B2,0x6488,0x6490,0x64B0,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 110, Array index 0x3100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x64A5,0x6493,0x6495,0x64A9,0x6492,0x64AE,0x64AD,
-	0x64AB,0x649A,0x64AC,0x6499,0x64A2,0x64B3,0x6575,0x6577,
-	0x6578,0x66AE,0x66AB,0x66B4,0x66B1,0x6A23,0x6A1F,0x69E8,
-	0x6A01,0x6A1E,0x6A19,0x69FD,0x6A21,0x6A13,0x6A0A,0x69F3,
-	0x6A02,0x6A05,0x69ED,0x6A11,0x6B50,0x6B4E,0x6BA4,0x6BC5,
-	0x6BC6,0x6F3F,0x6F7C,0x6F84,0x6F51,0x6F66,0x6F54,0x6F86,
-	0x6F6D,0x6F5B,0x6F78,0x6F6E,0x6F8E,0x6F7A,0x6F70,0x6F64,
-	0x6F97,0x6F58,0x6ED5,0x6F6F,0x6F60,0x6F5F,0x719F,0x71AC,
-	0x71B1,0x71A8,0x7256,0x729B,0x734E,0x7357,0x7469,0x748B,
-	0x7483,0x747E,0x7480,0x757F,0x7620,0x7629,0x761F,0x7624,
-	0x7626,0x7621,0x7622,0x769A,0x76BA,0x76E4,0x778E,0x7787,
-	0x778C,0x7791,0x778B,0x78CB,0x78C5,0x78BA,0x78CA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 111, Array index 0x3200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x78BE,0x78D5,0x78BC,0x78D0,0x7A3F,0x7A3C,0x7A40,
-	0x7A3D,0x7A37,0x7A3B,0x7AAF,0x7AAE,0x7BAD,0x7BB1,0x7BC4,
-	0x7BB4,0x7BC6,0x7BC7,0x7BC1,0x7BA0,0x7BCC,0x7CCA,0x7DE0,
-	0x7DF4,0x7DEF,0x7DFB,0x7DD8,0x7DEC,0x7DDD,0x7DE8,0x7DE3,
-	0x7DDA,0x7DDE,0x7DE9,0x7D9E,0x7DD9,0x7DF2,0x7DF9,0x7F75,
-	0x7F77,0x7FAF,0x7FE9,0x8026,0x819B,0x819C,0x819D,0x81A0,
-	0x819A,0x8198,0x8517,0x853D,0x851A,0x84EE,0x852C,0x852D,
-	0x8513,0x8511,0x8523,0x8521,0x8514,0x84EC,0x8525,0x84FF,
-	0x8506,0x8782,0x8774,0x8776,0x8760,0x8766,0x8778,0x8768,
-	0x8759,0x8757,0x874C,0x8753,0x885B,0x885D,0x8910,0x8907,
-	0x8912,0x8913,0x8915,0x890A,0x8ABC,0x8AD2,0x8AC7,0x8AC4,
-	0x8A95,0x8ACB,0x8AF8,0x8AB2,0x8AC9,0x8AC2,0x8ABF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 112, Array index 0x3300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8AB0,0x8AD6,0x8ACD,0x8AB6,0x8AB9,0x8ADB,0x8C4C,
-	0x8C4E,0x8C6C,0x8CE0,0x8CDE,0x8CE6,0x8CE4,0x8CEC,0x8CED,
-	0x8CE2,0x8CE3,0x8CDC,0x8CEA,0x8CE1,0x8D6D,0x8D9F,0x8DA3,
-	0x8E2B,0x8E10,0x8E1D,0x8E22,0x8E0F,0x8E29,0x8E1F,0x8E21,
-	0x8E1E,0x8EBA,0x8F1D,0x8F1B,0x8F1F,0x8F29,0x8F26,0x8F2A,
-	0x8F1C,0x8F1E,0x8F25,0x9069,0x906E,0x9068,0x906D,0x9077,
-	0x9130,0x912D,0x9127,0x9131,0x9187,0x9189,0x918B,0x9183,
-	0x92C5,0x92BB,0x92B7,0x92EA,0x92E4,0x92C1,0x92B3,0x92BC,
-	0x92D2,0x92C7,0x92F0,0x92B2,0x95AD,0x95B1,0x9704,0x9706,
-	0x9707,0x9709,0x9760,0x978D,0x978B,0x978F,0x9821,0x982B,
-	0x981C,0x98B3,0x990A,0x9913,0x9912,0x9918,0x99DD,0x99D0,
-	0x99DF,0x99DB,0x99D1,0x99D5,0x99D2,0x99D9,0x9AB7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 113, Array index 0x3400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9AEE,0x9AEF,0x9B27,0x9B45,0x9B44,0x9B77,0x9B6F,
-	0x9D06,0x9D09,0x9D03,0x9EA9,0x9EBE,0x9ECE,0x58A8,0x9F52,
-	0x5112,0x5118,0x5114,0x5110,0x5115,0x5180,0x51AA,0x51DD,
-	0x5291,0x5293,0x52F3,0x5659,0x566B,0x5679,0x5669,0x5664,
-	0x5678,0x566A,0x5668,0x5665,0x5671,0x566F,0x566C,0x5662,
-	0x5676,0x58C1,0x58BE,0x58C7,0x58C5,0x596E,0x5B1D,0x5B34,
-	0x5B78,0x5BF0,0x5C0E,0x5F4A,0x61B2,0x6191,0x61A9,0x618A,
-	0x61CD,0x61B6,0x61BE,0x61CA,0x61C8,0x6230,0x64C5,0x64C1,
-	0x64CB,0x64BB,0x64BC,0x64DA,0x64C4,0x64C7,0x64C2,0x64CD,
-	0x64BF,0x64D2,0x64D4,0x64BE,0x6574,0x66C6,0x66C9,0x66B9,
-	0x66C4,0x66C7,0x66B8,0x6A3D,0x6A38,0x6A3A,0x6A59,0x6A6B,
-	0x6A58,0x6A39,0x6A44,0x6A62,0x6A61,0x6A4B,0x6A47,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 114, Array index 0x3500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A35,0x6A5F,0x6A48,0x6B59,0x6B77,0x6C05,0x6FC2,
-	0x6FB1,0x6FA1,0x6FC3,0x6FA4,0x6FC1,0x6FA7,0x6FB3,0x6FC0,
-	0x6FB9,0x6FB6,0x6FA6,0x6FA0,0x6FB4,0x71BE,0x71C9,0x71D0,
-	0x71D2,0x71C8,0x71D5,0x71B9,0x71CE,0x71D9,0x71DC,0x71C3,
-	0x71C4,0x7368,0x749C,0x74A3,0x7498,0x749F,0x749E,0x74E2,
-	0x750C,0x750D,0x7634,0x7638,0x763A,0x76E7,0x76E5,0x77A0,
-	0x779E,0x779F,0x77A5,0x78E8,0x78DA,0x78EC,0x78E7,0x79A6,
-	0x7A4D,0x7A4E,0x7A46,0x7A4C,0x7A4B,0x7ABA,0x7BD9,0x7C11,
-	0x7BC9,0x7BE4,0x7BDB,0x7BE1,0x7BE9,0x7BE6,0x7CD5,0x7CD6,
-	0x7E0A,0x7E11,0x7E08,0x7E1B,0x7E23,0x7E1E,0x7E1D,0x7E09,
-	0x7E10,0x7F79,0x7FB2,0x7FF0,0x7FF1,0x7FEE,0x8028,0x81B3,
-	0x81A9,0x81A8,0x81FB,0x8208,0x8258,0x8259,0x854A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 115, Array index 0x3600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8559,0x8548,0x8568,0x8569,0x8543,0x8549,0x856D,
-	0x856A,0x855E,0x8783,0x879F,0x879E,0x87A2,0x878D,0x8861,
-	0x892A,0x8932,0x8925,0x892B,0x8921,0x89AA,0x89A6,0x8AE6,
-	0x8AFA,0x8AEB,0x8AF1,0x8B00,0x8ADC,0x8AE7,0x8AEE,0x8AFE,
-	0x8B01,0x8B02,0x8AF7,0x8AED,0x8AF3,0x8AF6,0x8AFC,0x8C6B,
-	0x8C6D,0x8C93,0x8CF4,0x8E44,0x8E31,0x8E34,0x8E42,0x8E39,
-	0x8E35,0x8F3B,0x8F2F,0x8F38,0x8F33,0x8FA8,0x8FA6,0x9075,
-	0x9074,0x9078,0x9072,0x907C,0x907A,0x9134,0x9192,0x9320,
-	0x9336,0x92F8,0x9333,0x932F,0x9322,0x92FC,0x932B,0x9304,
-	0x931A,0x9310,0x9326,0x9321,0x9315,0x932E,0x9319,0x95BB,
-	0x96A7,0x96A8,0x96AA,0x96D5,0x970E,0x9711,0x9716,0x970D,
-	0x9713,0x970F,0x975B,0x975C,0x9766,0x9798,0x9830,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 116, Array index 0x3700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9838,0x983B,0x9837,0x982D,0x9839,0x9824,0x9910,
-	0x9928,0x991E,0x991B,0x9921,0x991A,0x99ED,0x99E2,0x99F1,
-	0x9AB8,0x9ABC,0x9AFB,0x9AED,0x9B28,0x9B91,0x9D15,0x9D23,
-	0x9D26,0x9D28,0x9D12,0x9D1B,0x9ED8,0x9ED4,0x9F8D,0x9F9C,
-	0x512A,0x511F,0x5121,0x5132,0x52F5,0x568E,0x5680,0x5690,
-	0x5685,0x5687,0x568F,0x58D5,0x58D3,0x58D1,0x58CE,0x5B30,
-	0x5B2A,0x5B24,0x5B7A,0x5C37,0x5C68,0x5DBC,0x5DBA,0x5DBD,
-	0x5DB8,0x5E6B,0x5F4C,0x5FBD,0x61C9,0x61C2,0x61C7,0x61E6,
-	0x61CB,0x6232,0x6234,0x64CE,0x64CA,0x64D8,0x64E0,0x64F0,
-	0x64E6,0x64EC,0x64F1,0x64E2,0x64ED,0x6582,0x6583,0x66D9,
-	0x66D6,0x6A80,0x6A94,0x6A84,0x6AA2,0x6A9C,0x6ADB,0x6AA3,
-	0x6A7E,0x6A97,0x6A90,0x6AA0,0x6B5C,0x6BAE,0x6BDA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 117, Array index 0x3800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6C08,0x6FD8,0x6FF1,0x6FDF,0x6FE0,0x6FDB,0x6FE4,
-	0x6FEB,0x6FEF,0x6F80,0x6FEC,0x6FE1,0x6FE9,0x6FD5,0x6FEE,
-	0x6FF0,0x71E7,0x71DF,0x71EE,0x71E6,0x71E5,0x71ED,0x71EC,
-	0x71F4,0x71E0,0x7235,0x7246,0x7370,0x7372,0x74A9,0x74B0,
-	0x74A6,0x74A8,0x7646,0x7642,0x764C,0x76EA,0x77B3,0x77AA,
-	0x77B0,0x77AC,0x77A7,0x77AD,0x77EF,0x78F7,0x78FA,0x78F4,
-	0x78EF,0x7901,0x79A7,0x79AA,0x7A57,0x7ABF,0x7C07,0x7C0D,
-	0x7BFE,0x7BF7,0x7C0C,0x7BE0,0x7CE0,0x7CDC,0x7CDE,0x7CE2,
-	0x7CDF,0x7CD9,0x7CDD,0x7E2E,0x7E3E,0x7E46,0x7E37,0x7E32,
-	0x7E43,0x7E2B,0x7E3D,0x7E31,0x7E45,0x7E41,0x7E34,0x7E39,
-	0x7E48,0x7E35,0x7E3F,0x7E2F,0x7F44,0x7FF3,0x7FFC,0x8071,
-	0x8072,0x8070,0x806F,0x8073,0x81C6,0x81C3,0x81BA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 118, Array index 0x3900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x81C2,0x81C0,0x81BF,0x81BD,0x81C9,0x81BE,0x81E8,
-	0x8209,0x8271,0x85AA,0x8584,0x857E,0x859C,0x8591,0x8594,
-	0x85AF,0x859B,0x8587,0x85A8,0x858A,0x85A6,0x8667,0x87C0,
-	0x87D1,0x87B3,0x87D2,0x87C6,0x87AB,0x87BB,0x87BA,0x87C8,
-	0x87CB,0x893B,0x8936,0x8944,0x8938,0x893D,0x89AC,0x8B0E,
-	0x8B17,0x8B19,0x8B1B,0x8B0A,0x8B20,0x8B1D,0x8B04,0x8B10,
-	0x8C41,0x8C3F,0x8C73,0x8CFA,0x8CFD,0x8CFC,0x8CF8,0x8CFB,
-	0x8DA8,0x8E49,0x8E4B,0x8E48,0x8E4A,0x8F44,0x8F3E,0x8F42,
-	0x8F45,0x8F3F,0x907F,0x907D,0x9084,0x9081,0x9082,0x9080,
-	0x9139,0x91A3,0x919E,0x919C,0x934D,0x9382,0x9328,0x9375,
-	0x934A,0x9365,0x934B,0x9318,0x937E,0x936C,0x935B,0x9370,
-	0x935A,0x9354,0x95CA,0x95CB,0x95CC,0x95C8,0x95C6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 119, Array index 0x3A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x96B1,0x96B8,0x96D6,0x971C,0x971E,0x97A0,0x97D3,
-	0x9846,0x98B6,0x9935,0x9A01,0x99FF,0x9BAE,0x9BAB,0x9BAA,
-	0x9BAD,0x9D3B,0x9D3F,0x9E8B,0x9ECF,0x9EDE,0x9EDC,0x9EDD,
-	0x9EDB,0x9F3E,0x9F4B,0x53E2,0x5695,0x56AE,0x58D9,0x58D8,
-	0x5B38,0x5F5E,0x61E3,0x6233,0x64F4,0x64F2,0x64FE,0x6506,
-	0x64FA,0x64FB,0x64F7,0x65B7,0x66DC,0x6726,0x6AB3,0x6AAC,
-	0x6AC3,0x6ABB,0x6AB8,0x6AC2,0x6AAE,0x6AAF,0x6B5F,0x6B78,
-	0x6BAF,0x7009,0x700B,0x6FFE,0x7006,0x6FFA,0x7011,0x700F,
-	0x71FB,0x71FC,0x71FE,0x71F8,0x7377,0x7375,0x74A7,0x74BF,
-	0x7515,0x7656,0x7658,0x7652,0x77BD,0x77BF,0x77BB,0x77BC,
-	0x790E,0x79AE,0x7A61,0x7A62,0x7A60,0x7AC4,0x7AC5,0x7C2B,
-	0x7C27,0x7C2A,0x7C1E,0x7C23,0x7C21,0x7CE7,0x7E54,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 120, Array index 0x3B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7E55,0x7E5E,0x7E5A,0x7E61,0x7E52,0x7E59,0x7F48,
-	0x7FF9,0x7FFB,0x8077,0x8076,0x81CD,0x81CF,0x820A,0x85CF,
-	0x85A9,0x85CD,0x85D0,0x85C9,0x85B0,0x85BA,0x85B9,0x87EF,
-	0x87EC,0x87F2,0x87E0,0x8986,0x89B2,0x89F4,0x8B28,0x8B39,
-	0x8B2C,0x8B2B,0x8C50,0x8D05,0x8E59,0x8E63,0x8E66,0x8E64,
-	0x8E5F,0x8E55,0x8EC0,0x8F49,0x8F4D,0x9087,0x9083,0x9088,
-	0x91AB,0x91AC,0x91D0,0x9394,0x938A,0x9396,0x93A2,0x93B3,
-	0x93AE,0x93AC,0x93B0,0x9398,0x939A,0x9397,0x95D4,0x95D6,
-	0x95D0,0x95D5,0x96E2,0x96DC,0x96D9,0x96DB,0x96DE,0x9724,
-	0x97A3,0x97A6,0x97AD,0x97F9,0x984D,0x984F,0x984C,0x984E,
-	0x9853,0x98BA,0x993E,0x993F,0x993D,0x992E,0x99A5,0x9A0E,
-	0x9AC1,0x9B03,0x9B06,0x9B4F,0x9B4E,0x9B4D,0x9BCA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 121, Array index 0x3C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9BC9,0x9BFD,0x9BC8,0x9BC0,0x9D51,0x9D5D,0x9D60,
-	0x9EE0,0x9F15,0x9F2C,0x5133,0x56A5,0x56A8,0x58DE,0x58DF,
-	0x58E2,0x5BF5,0x9F90,0x5EEC,0x61F2,0x61F7,0x61F6,0x61F5,
-	0x6500,0x650F,0x66E0,0x66DD,0x6AE5,0x6ADD,0x6ADA,0x6AD3,
-	0x701B,0x701F,0x7028,0x701A,0x701D,0x7015,0x7018,0x7206,
-	0x720D,0x7258,0x72A2,0x7378,0x737A,0x74BD,0x74CA,0x74E3,
-	0x7587,0x7586,0x765F,0x7661,0x77C7,0x7919,0x79B1,0x7A6B,
-	0x7A69,0x7C3E,0x7C3F,0x7C38,0x7C3D,0x7C37,0x7C40,0x7E6B,
-	0x7E6D,0x7E79,0x7E69,0x7E6A,0x7E73,0x7F85,0x7FB6,0x7FB9,
-	0x7FB8,0x81D8,0x85E9,0x85DD,0x85EA,0x85D5,0x85E4,0x85E5,
-	0x85F7,0x87FB,0x8805,0x880D,0x87F9,0x87FE,0x8960,0x895F,
-	0x8956,0x895E,0x8B41,0x8B5C,0x8B58,0x8B49,0x8B5A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 122, Array index 0x3D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8B4E,0x8B4F,0x8B46,0x8B59,0x8D08,0x8D0A,0x8E7C,
-	0x8E72,0x8E87,0x8E76,0x8E6C,0x8E7A,0x8E74,0x8F54,0x8F4E,
-	0x8FAD,0x908A,0x908B,0x91B1,0x91AE,0x93E1,0x93D1,0x93DF,
-	0x93C3,0x93C8,0x93DC,0x93DD,0x93D6,0x93E2,0x93CD,0x93D8,
-	0x93E4,0x93D7,0x93E8,0x95DC,0x96B4,0x96E3,0x972A,0x9727,
-	0x9761,0x97DC,0x97FB,0x985E,0x9858,0x985B,0x98BC,0x9945,
-	0x9949,0x9A16,0x9A19,0x9B0D,0x9BE8,0x9BE7,0x9BD6,0x9BDB,
-	0x9D89,0x9D61,0x9D72,0x9D6A,0x9D6C,0x9E92,0x9E97,0x9E93,
-	0x9EB4,0x52F8,0x56B7,0x56B6,0x56B4,0x56BC,0x58E4,0x5B40,
-	0x5B43,0x5B7D,0x5BF6,0x5DC9,0x61F8,0x61FA,0x6518,0x6514,
-	0x6519,0x66E6,0x6727,0x6AEC,0x703E,0x7030,0x7032,0x7210,
-	0x737B,0x74CF,0x7662,0x7665,0x7926,0x792A,0x792C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 123, Array index 0x3E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x792B,0x7AC7,0x7AF6,0x7C4C,0x7C43,0x7C4D,0x7CEF,
-	0x7CF0,0x8FAE,0x7E7D,0x7E7C,0x7E82,0x7F4C,0x8000,0x81DA,
-	0x8266,0x85FB,0x85F9,0x8611,0x85FA,0x8606,0x860B,0x8607,
-	0x860A,0x8814,0x8815,0x8964,0x89BA,0x89F8,0x8B70,0x8B6C,
-	0x8B66,0x8B6F,0x8B5F,0x8B6B,0x8D0F,0x8D0D,0x8E89,0x8E81,
-	0x8E85,0x8E82,0x91B4,0x91CB,0x9418,0x9403,0x93FD,0x95E1,
-	0x9730,0x98C4,0x9952,0x9951,0x99A8,0x9A2B,0x9A30,0x9A37,
-	0x9A35,0x9C13,0x9C0D,0x9E79,0x9EB5,0x9EE8,0x9F2F,0x9F5F,
-	0x9F63,0x9F61,0x5137,0x5138,0x56C1,0x56C0,0x56C2,0x5914,
-	0x5C6C,0x5DCD,0x61FC,0x61FE,0x651D,0x651C,0x6595,0x66E9,
-	0x6AFB,0x6B04,0x6AFA,0x6BB2,0x704C,0x721B,0x72A7,0x74D6,
-	0x74D4,0x7669,0x77D3,0x7C50,0x7E8F,0x7E8C,0x7FBC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 124, Array index 0x3F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8617,0x862D,0x861A,0x8823,0x8822,0x8821,0x881F,
-	0x896A,0x896C,0x89BD,0x8B74,0x8B77,0x8B7D,0x8D13,0x8E8A,
-	0x8E8D,0x8E8B,0x8F5F,0x8FAF,0x91BA,0x942E,0x9433,0x9435,
-	0x943A,0x9438,0x9432,0x942B,0x95E2,0x9738,0x9739,0x9732,
-	0x97FF,0x9867,0x9865,0x9957,0x9A45,0x9A43,0x9A40,0x9A3E,
-	0x9ACF,0x9B54,0x9B51,0x9C2D,0x9C25,0x9DAF,0x9DB4,0x9DC2,
-	0x9DB8,0x9E9D,0x9EEF,0x9F19,0x9F5C,0x9F66,0x9F67,0x513C,
-	0x513B,0x56C8,0x56CA,0x56C9,0x5B7F,0x5DD4,0x5DD2,0x5F4E,
-	0x61FF,0x6524,0x6B0A,0x6B61,0x7051,0x7058,0x7380,0x74E4,
-	0x758A,0x766E,0x766C,0x79B3,0x7C60,0x7C5F,0x807E,0x807D,
-	0x81DF,0x8972,0x896F,0x89FC,0x8B80,0x8D16,0x8D17,0x8E91,
-	0x8E93,0x8F61,0x9148,0x9444,0x9451,0x9452,0x973D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 125, Array index 0x4000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x973E,0x97C3,0x97C1,0x986B,0x9955,0x9A55,0x9A4D,
-	0x9AD2,0x9B1A,0x9C49,0x9C31,0x9C3E,0x9C3B,0x9DD3,0x9DD7,
-	0x9F34,0x9F6C,0x9F6A,0x9F94,0x56CC,0x5DD6,0x6200,0x6523,
-	0x652B,0x652A,0x66EC,0x6B10,0x74DA,0x7ACA,0x7C64,0x7C63,
-	0x7C65,0x7E93,0x7E96,0x7E94,0x81E2,0x8638,0x863F,0x8831,
-	0x8B8A,0x9090,0x908F,0x9463,0x9460,0x9464,0x9768,0x986F,
-	0x995C,0x9A5A,0x9A5B,0x9A57,0x9AD3,0x9AD4,0x9AD1,0x9C54,
-	0x9C57,0x9C56,0x9DE5,0x9E9F,0x9EF4,0x56D1,0x58E9,0x652C,
-	0x705E,0x7671,0x7672,0x77D7,0x7F50,0x7F88,0x8836,0x8839,
-	0x8862,0x8B93,0x8B92,0x8B96,0x8277,0x8D1B,0x91C0,0x946A,
-	0x9742,0x9748,0x9744,0x97C6,0x9870,0x9A5F,0x9B22,0x9B58,
-	0x9C5F,0x9DF9,0x9DFA,0x9E7C,0x9E7D,0x9F07,0x9F77,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 126, Array index 0x4100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9F72,0x5EF3,0x6B16,0x7063,0x7C6C,0x7C6E,0x883B,
-	0x89C0,0x8EA1,0x91C1,0x9472,0x9470,0x9871,0x995E,0x9AD6,
-	0x9B23,0x9ECC,0x7064,0x77DA,0x8B9A,0x9477,0x97C9,0x9A62,
-	0x9A65,0x7E9C,0x8B9C,0x8EAA,0x91C5,0x947D,0x947E,0x947C,
-	0x9C77,0x9C78,0x9EF7,0x8C54,0x947F,0x9E1A,0x7228,0x9A6A,
-	0x9B31,0x9E1B,0x9E1E,0x7C72,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_TO_UCS_CCS_CNS11643_PLANE1 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit cns11643_plane1 -> UCS size-optimized table (12138 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_size_cns11643_plane1[] =
-{
-	0x0042, /* Ranges number */
-	0x0000, /* Unranged codes number */
-	0x17B5, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x2121, 0x2139, 0x00C9,
-	/* Array index: 0x0006 */ 0x213E, 0x217E, 0x00E2,
-	/* Array index: 0x0009 */ 0x2221, 0x227E, 0x0123,
-	/* Array index: 0x000C */ 0x2321, 0x234E, 0x0181,
-	/* Array index: 0x000F */ 0x2421, 0x247E, 0x01AF,
-	/* Array index: 0x0012 */ 0x2521, 0x2570, 0x020D,
-	/* Array index: 0x0015 */ 0x2621, 0x263E, 0x025D,
-	/* Array index: 0x0018 */ 0x4221, 0x4241, 0x027B,
-	/* Array index: 0x001B */ 0x4421, 0x447E, 0x029C,
-	/* Array index: 0x001E */ 0x4521, 0x457E, 0x02FA,
-	/* Array index: 0x0021 */ 0x4621, 0x467E, 0x0358,
-	/* Array index: 0x0024 */ 0x4721, 0x477E, 0x03B6,
-	/* Array index: 0x0027 */ 0x4821, 0x487E, 0x0414,
-	/* Array index: 0x002A */ 0x4921, 0x497E, 0x0472,
-	/* Array index: 0x002D */ 0x4A21, 0x4A7E, 0x04D0,
-	/* Array index: 0x0030 */ 0x4B21, 0x4B7E, 0x052E,
-	/* Array index: 0x0033 */ 0x4C21, 0x4C7E, 0x058C,
-	/* Array index: 0x0036 */ 0x4D21, 0x4D7E, 0x05EA,
-	/* Array index: 0x0039 */ 0x4E21, 0x4E7E, 0x0648,
-	/* Array index: 0x003C */ 0x4F21, 0x4F7E, 0x06A6,
-	/* Array index: 0x003F */ 0x5021, 0x507E, 0x0704,
-	/* Array index: 0x0042 */ 0x5121, 0x517E, 0x0762,
-	/* Array index: 0x0045 */ 0x5221, 0x527E, 0x07C0,
-	/* Array index: 0x0048 */ 0x5321, 0x537E, 0x081E,
-	/* Array index: 0x004B */ 0x5421, 0x547E, 0x087C,
-	/* Array index: 0x004E */ 0x5521, 0x557E, 0x08DA,
-	/* Array index: 0x0051 */ 0x5621, 0x567E, 0x0938,
-	/* Array index: 0x0054 */ 0x5721, 0x577E, 0x0996,
-	/* Array index: 0x0057 */ 0x5821, 0x587E, 0x09F4,
-	/* Array index: 0x005A */ 0x5921, 0x597E, 0x0A52,
-	/* Array index: 0x005D */ 0x5A21, 0x5A7E, 0x0AB0,
-	/* Array index: 0x0060 */ 0x5B21, 0x5B7E, 0x0B0E,
-	/* Array index: 0x0063 */ 0x5C21, 0x5C7E, 0x0B6C,
-	/* Array index: 0x0066 */ 0x5D21, 0x5D7E, 0x0BCA,
-	/* Array index: 0x0069 */ 0x5E21, 0x5E7E, 0x0C28,
-	/* Array index: 0x006C */ 0x5F21, 0x5F7E, 0x0C86,
-	/* Array index: 0x006F */ 0x6021, 0x607E, 0x0CE4,
-	/* Array index: 0x0072 */ 0x6121, 0x617E, 0x0D42,
-	/* Array index: 0x0075 */ 0x6221, 0x627E, 0x0DA0,
-	/* Array index: 0x0078 */ 0x6321, 0x637E, 0x0DFE,
-	/* Array index: 0x007B */ 0x6421, 0x647E, 0x0E5C,
-	/* Array index: 0x007E */ 0x6521, 0x657E, 0x0EBA,
-	/* Array index: 0x0081 */ 0x6621, 0x667E, 0x0F18,
-	/* Array index: 0x0084 */ 0x6721, 0x677E, 0x0F76,
-	/* Array index: 0x0087 */ 0x6821, 0x687E, 0x0FD4,
-	/* Array index: 0x008A */ 0x6921, 0x697E, 0x1032,
-	/* Array index: 0x008D */ 0x6A21, 0x6A7E, 0x1090,
-	/* Array index: 0x0090 */ 0x6B21, 0x6B7E, 0x10EE,
-	/* Array index: 0x0093 */ 0x6C21, 0x6C7E, 0x114C,
-	/* Array index: 0x0096 */ 0x6D21, 0x6D7E, 0x11AA,
-	/* Array index: 0x0099 */ 0x6E21, 0x6E7E, 0x1208,
-	/* Array index: 0x009C */ 0x6F21, 0x6F7E, 0x1266,
-	/* Array index: 0x009F */ 0x7021, 0x707E, 0x12C4,
-	/* Array index: 0x00A2 */ 0x7121, 0x717E, 0x1322,
-	/* Array index: 0x00A5 */ 0x7221, 0x727E, 0x1380,
-	/* Array index: 0x00A8 */ 0x7321, 0x737E, 0x13DE,
-	/* Array index: 0x00AB */ 0x7421, 0x747E, 0x143C,
-	/* Array index: 0x00AE */ 0x7521, 0x757E, 0x149A,
-	/* Array index: 0x00B1 */ 0x7621, 0x767E, 0x14F8,
-	/* Array index: 0x00B4 */ 0x7721, 0x777E, 0x1556,
-	/* Array index: 0x00B7 */ 0x7821, 0x787E, 0x15B4,
-	/* Array index: 0x00BA */ 0x7921, 0x797E, 0x1612,
-	/* Array index: 0x00BD */ 0x7A21, 0x7A7E, 0x1670,
-	/* Array index: 0x00C0 */ 0x7B21, 0x7B7E, 0x16CE,
-	/* Array index: 0x00C3 */ 0x7C21, 0x7C7E, 0x172C,
-	/* Array index: 0x00C6 */ 0x7D21, 0x7D4B, 0x178A,
-	/* Ranges content */
-	/* Range 0x2121 - 0x2139, array index: 0x00C9 */
-	0x3000,0xFF0C,0x3001,0x3002,0xFF0E,0x30FB,0xFF1B,0xFF1A,
-	0xFF1F,0xFF01,0xFE30,0x2026,0x2025,0xFE50,0xFE51,0xFE52,
-	0x00B7,0xFE54,0xFE55,0xFE56,0xFE57,0xFE31,0x2014,0xFE32,
-	0x2013,
-	/* Range 0x213E - 0x217E, array index: 0x00E2 */
-	0xFF08,0xFF09,0xFE35,0xFE36,0xFF5B,0xFF5D,0xFE37,0xFE38,
-	0x3014,0x3015,0xFE39,0xFE3A,0x3010,0x3011,0xFE3B,0xFE3C,
-	0x300A,0x300B,0xFE3D,0xFE3E,0x3008,0x3009,0xFE3F,0xFE40,
-	0x300C,0x300D,0xFE41,0xFE42,0x300E,0x300F,0xFE43,0xFE44,
-	0xFE59,0xFE5A,0xFE5B,0xFE5C,0xFE5D,0xFE5E,0x2018,0x2019,
-	0x201C,0x201D,0x301D,0x301E,0x2032,0x2035,0xFF03,0xFF06,
-	0xFF0A,0x203B,0x00A7,0x3003,0x25CB,0x25CF,0x25B3,0x25B2,
-	0x25CE,0x2606,0x2605,0x25C7,0x25C6,0x25A1,0x25A0,0x25BD,
-	0x25BC,
-	/* Range 0x2221 - 0x227E, array index: 0x0123 */
-	0x32A3,0x2105,0x203E,INVALC,0xFF3F,INVALC,0xFE49,0xFE4A,
-	0xFE4D,0xFE4E,0xFE4B,0xFE4C,0xFE5F,0xFE60,0xFE61,0xFF0B,
-	0xFF0D,0x00D7,0x00F7,0x00B1,0x221A,0xFF1C,0xFF1E,0xFF1D,
-	0x2266,0x2267,0x2260,0x221E,0x2252,0x2261,0xFE62,0xFE63,
-	0xFE64,0xFE66,0xFE65,0x223C,0x2229,0x222A,0x22A5,0x2220,
-	0x221F,0x22BF,0x33D2,0x33D1,0x222B,0x222E,0x2235,0x2234,
-	0x2640,0x2642,0x2641,0x2609,0x2191,0x2193,0x2192,0x2190,
-	0x2196,0x2197,0x2199,0x2198,0x2016,0xFF5C,0xFF0F,0xFF3C,
-	0x2215,0xFE68,0xFF04,0xFFE5,0x3012,0xFFE0,0xFFE1,0xFF05,
-	0xFF20,0x2103,0x2109,0xFE69,0xFE6A,0xFE6B,0x33D5,0x339C,
-	0x339D,0x339E,0x33CE,0x33A1,0x338E,0x338F,0x33C4,0x00B0,
-	0x5159,0x515B,0x515E,0x515D,0x5161,0x5163,
-	/* Range 0x2321 - 0x234E, array index: 0x0181 */
-	0x55E7,0x74E9,0x7CCE,0x2581,0x2582,0x2583,0x2584,0x2585,
-	0x2586,0x2587,0x2588,0x258F,0x258E,0x258D,0x258C,0x258B,
-	0x258A,0x2589,0x253C,0x2534,0x252C,0x2524,0x251C,0x2594,
-	0x2500,0x2502,0x2595,0x250C,0x2510,0x2514,0x2518,0x256D,
-	0x256E,0x2570,0x256F,0x2550,0x255E,0x256A,0x2561,0x25E2,
-	0x25E3,0x25E5,0x25E4,0x2571,0x2572,0x2573,
-	/* Range 0x2421 - 0x247E, array index: 0x01AF */
-	0xFF10,0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17,
-	0xFF18,0xFF19,0x2160,0x2161,0x2162,0x2163,0x2164,0x2165,
-	0x2166,0x2167,0x2168,0x2169,0x3021,0x3022,0x3023,0x3024,
-	0x3025,0x3026,0x3027,0x3028,0x3029,INVALC,0x5344,INVALC,
-	0xFF21,0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27,0xFF28,
-	0xFF29,0xFF2A,0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,0xFF30,
-	0xFF31,0xFF32,0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,0xFF38,
-	0xFF39,0xFF3A,0xFF41,0xFF42,0xFF43,0xFF44,0xFF45,0xFF46,
-	0xFF47,0xFF48,0xFF49,0xFF4A,0xFF4B,0xFF4C,0xFF4D,0xFF4E,
-	0xFF4F,0xFF50,0xFF51,0xFF52,0xFF53,0xFF54,0xFF55,0xFF56,
-	0xFF57,0xFF58,0xFF59,0xFF5A,0x0391,0x0392,0x0393,0x0394,
-	0x0395,0x0396,0x0397,0x0398,0x0399,0x039A,
-	/* Range 0x2521 - 0x2570, array index: 0x020D */
-	0x039B,0x039C,0x039D,0x039E,0x039F,0x03A0,0x03A1,0x03A3,
-	0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,0x03A9,0x03B1,0x03B2,
-	0x03B3,0x03B4,0x03B5,0x03B6,0x03B7,0x03B8,0x03B9,0x03BA,
-	0x03BB,0x03BC,0x03BD,0x03BE,0x03BF,0x03C0,0x03C1,0x03C3,
-	0x03C4,0x03C5,0x03C6,0x03C7,0x03C8,0x03C9,0x3105,0x3106,
-	0x3107,0x3108,0x3109,0x310A,0x310B,0x310C,0x310D,0x310E,
-	0x310F,0x3110,0x3111,0x3112,0x3113,0x3114,0x3115,0x3116,
-	0x3117,0x3118,0x3119,0x311A,0x311B,0x311C,0x311D,0x311E,
-	0x311F,0x3120,0x3121,0x3122,0x3123,0x3124,0x3125,0x3126,
-	0x3127,0x3128,0x3129,0x02D9,0x02C9,0x02CA,0x02C7,0x02CB,
-	/* Range 0x2621 - 0x263E, array index: 0x025D */
-	0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467,
-	0x2468,0x2469,0x2474,0x2475,0x2476,0x2477,0x2478,0x2479,
-	0x247A,0x247B,0x247C,0x247D,0x2170,0x2171,0x2172,0x2173,
-	0x2174,0x2175,0x2176,0x2177,0x2178,0x2179,
-	/* Range 0x4221 - 0x4241, array index: 0x027B */
-	0x2400,0x2401,0x2402,0x2403,0x2404,0x2405,0x2406,0x2407,
-	0x2408,0x2409,0x240A,0x240B,0x240C,0x240D,0x240E,0x240F,
-	0x2410,0x2411,0x2412,0x2413,0x2414,0x2415,0x2416,0x2417,
-	0x2418,0x2419,0x241A,0x241B,0x241C,0x241D,0x241E,0x241F,
-	0x2421,
-	/* Range 0x4421 - 0x447E, array index: 0x029C */
-	0x4E00,0x4E59,0x4E01,0x4E03,0x4E43,0x4E5D,0x4E86,0x4E8C,
-	0x4EBA,0x513F,0x5165,0x516B,0x51E0,0x5200,0x5201,0x529B,
-	0x5315,0x5341,0x535C,0x53C8,0x4E09,0x4E0B,0x4E08,0x4E0A,
-	0x4E2B,0x4E38,0x51E1,0x4E45,0x4E48,0x4E5F,0x4E5E,0x4E8E,
-	0x4EA1,0x5140,0x5203,0x52FA,0x5343,0x53C9,0x53E3,0x571F,
-	0x58EB,0x5915,0x5927,0x5973,0x5B50,0x5B51,0x5B53,0x5BF8,
-	0x5C0F,0x5C22,0x5C38,0x5C71,0x5DDD,0x5DE5,0x5DF1,0x5DF2,
-	0x5DF3,0x5DFE,0x5E72,0x5EFE,0x5F0B,0x5F13,0x624D,0x4E11,
-	0x4E10,0x4E0D,0x4E2D,0x4E30,0x4E39,0x4E4B,0x5C39,0x4E88,
-	0x4E91,0x4E95,0x4E92,0x4E94,0x4EA2,0x4EC1,0x4EC0,0x4EC3,
-	0x4EC6,0x4EC7,0x4ECD,0x4ECA,0x4ECB,0x4EC4,0x5143,0x5141,
-	0x5167,0x516D,0x516E,0x516C,0x5197,0x51F6,
-	/* Range 0x4521 - 0x457E, array index: 0x02FA */
-	0x5206,0x5207,0x5208,0x52FB,0x52FE,0x52FF,0x5316,0x5339,
-	0x5348,0x5347,0x5345,0x535E,0x5384,0x53CB,0x53CA,0x53CD,
-	0x58EC,0x5929,0x592B,0x592A,0x592D,0x5B54,0x5C11,0x5C24,
-	0x5C3A,0x5C6F,0x5DF4,0x5E7B,0x5EFF,0x5F14,0x5F15,0x5FC3,
-	0x6208,0x6236,0x624B,0x624E,0x652F,0x6587,0x6597,0x65A4,
-	0x65B9,0x65E5,0x66F0,0x6708,0x6728,0x6B20,0x6B62,0x6B79,
-	0x6BCB,0x6BD4,0x6BDB,0x6C0F,0x6C34,0x706B,0x722A,0x7236,
-	0x723B,0x7247,0x7259,0x725B,0x72AC,0x738B,0x4E19,0x4E16,
-	0x4E15,0x4E14,0x4E18,0x4E3B,0x4E4D,0x4E4F,0x4E4E,0x4EE5,
-	0x4ED8,0x4ED4,0x4ED5,0x4ED6,0x4ED7,0x4EE3,0x4EE4,0x4ED9,
-	0x4EDE,0x5145,0x5144,0x5189,0x518A,0x51AC,0x51F9,0x51FA,
-	0x51F8,0x520A,0x52A0,0x529F,0x5305,0x5306,
-	/* Range 0x4621 - 0x467E, array index: 0x0358 */
-	0x5317,0x531D,0x4EDF,0x534A,0x5349,0x5361,0x5360,0x536F,
-	0x536E,0x53BB,0x53EF,0x53E4,0x53F3,0x53EC,0x53EE,0x53E9,
-	0x53E8,0x53FC,0x53F8,0x53F5,0x53EB,0x53E6,0x53EA,0x53F2,
-	0x53F1,0x53F0,0x53E5,0x53ED,0x53FB,0x56DB,0x56DA,0x5916,
-	0x592E,0x5931,0x5974,0x5976,0x5B55,0x5B83,0x5C3C,0x5DE8,
-	0x5DE7,0x5DE6,0x5E02,0x5E03,0x5E73,0x5E7C,0x5F01,0x5F18,
-	0x5F17,0x5FC5,0x620A,0x6253,0x6254,0x6252,0x6251,0x65A5,
-	0x65E6,0x672E,0x672C,0x672A,0x672B,0x672D,0x6B63,0x6BCD,
-	0x6C11,0x6C10,0x6C38,0x6C41,0x6C40,0x6C3E,0x72AF,0x7384,
-	0x7389,0x74DC,0x74E6,0x7518,0x751F,0x7528,0x7529,0x7530,
-	0x7531,0x7532,0x7533,0x758B,0x767D,0x76AE,0x76BF,0x76EE,
-	0x77DB,0x77E2,0x77F3,0x793A,0x79BE,0x7A74,
-	/* Range 0x4721 - 0x477E, array index: 0x03B6 */
-	0x7ACB,0x4E1E,0x4E1F,0x4E52,0x4E53,0x4E69,0x4E99,0x4EA4,
-	0x4EA6,0x4EA5,0x4EFF,0x4F09,0x4F19,0x4F0A,0x4F15,0x4F0D,
-	0x4F10,0x4F11,0x4F0F,0x4EF2,0x4EF6,0x4EFB,0x4EF0,0x4EF3,
-	0x4EFD,0x4F01,0x4F0B,0x5149,0x5147,0x5146,0x5148,0x5168,
-	0x5171,0x518D,0x51B0,0x5217,0x5211,0x5212,0x520E,0x5216,
-	0x52A3,0x5308,0x5321,0x5320,0x5370,0x5371,0x5409,0x540F,
-	0x540C,0x540A,0x5410,0x5401,0x540B,0x5404,0x5411,0x540D,
-	0x5408,0x5403,0x540E,0x5406,0x5412,0x56E0,0x56DE,0x56DD,
-	0x5733,0x5730,0x5728,0x572D,0x572C,0x572F,0x5729,0x5919,
-	0x591A,0x5937,0x5938,0x5984,0x5978,0x5983,0x597D,0x5979,
-	0x5982,0x5981,0x5B57,0x5B58,0x5B87,0x5B88,0x5B85,0x5B89,
-	0x5BFA,0x5C16,0x5C79,0x5DDE,0x5E06,0x5E76,
-	/* Range 0x4821 - 0x487E, array index: 0x0414 */
-	0x5E74,0x5F0F,0x5F1B,0x5FD9,0x5FD6,0x620E,0x620C,0x620D,
-	0x6210,0x6263,0x625B,0x6258,0x6536,0x65E9,0x65E8,0x65EC,
-	0x65ED,0x66F2,0x66F3,0x6709,0x673D,0x6734,0x6731,0x6735,
-	0x6B21,0x6B64,0x6B7B,0x6C16,0x6C5D,0x6C57,0x6C59,0x6C5F,
-	0x6C60,0x6C50,0x6C55,0x6C61,0x6C5B,0x6C4D,0x6C4E,0x7070,
-	0x725F,0x725D,0x767E,0x7AF9,0x7C73,0x7CF8,0x7F36,0x7F8A,
-	0x7FBD,0x8001,0x8003,0x800C,0x8012,0x8033,0x807F,0x8089,
-	0x808B,0x808C,0x81E3,0x81EA,0x81F3,0x81FC,0x820C,0x821B,
-	0x821F,0x826E,0x8272,0x827E,0x866B,0x8840,0x884C,0x8863,
-	0x897F,0x9621,0x4E32,0x4EA8,0x4F4D,0x4F4F,0x4F47,0x4F57,
-	0x4F5E,0x4F34,0x4F5B,0x4F55,0x4F30,0x4F50,0x4F51,0x4F3D,
-	0x4F3A,0x4F38,0x4F43,0x4F54,0x4F3C,0x4F46,
-	/* Range 0x4921 - 0x497E, array index: 0x0472 */
-	0x4F63,0x4F5C,0x4F60,0x4F2F,0x4F4E,0x4F36,0x4F59,0x4F5D,
-	0x4F48,0x4F5A,0x514C,0x514B,0x514D,0x5175,0x51B6,0x51B7,
-	0x5225,0x5224,0x5229,0x522A,0x5228,0x52AB,0x52A9,0x52AA,
-	0x52AC,0x5323,0x5373,0x5375,0x541D,0x542D,0x541E,0x543E,
-	0x5426,0x544E,0x5427,0x5446,0x5443,0x5433,0x5448,0x5442,
-	0x541B,0x5429,0x544A,0x5439,0x543B,0x5438,0x542E,0x5435,
-	0x5436,0x5420,0x543C,0x5440,0x5431,0x542B,0x541F,0x542C,
-	0x56EA,0x56F0,0x56E4,0x56EB,0x574A,0x5751,0x5740,0x574D,
-	0x5747,0x574E,0x573E,0x5750,0x574F,0x573B,0x58EF,0x593E,
-	0x599D,0x5992,0x59A8,0x599E,0x59A3,0x5999,0x5996,0x598D,
-	0x59A4,0x5993,0x598A,0x59A5,0x5B5D,0x5B5C,0x5B5A,0x5B5B,
-	0x5B8C,0x5B8B,0x5B8F,0x5C2C,0x5C40,0x5C41,
-	/* Range 0x4A21 - 0x4A7E, array index: 0x04D0 */
-	0x5C3F,0x5C3E,0x5C90,0x5C91,0x5C94,0x5C8C,0x5DEB,0x5E0C,
-	0x5E8F,0x5E87,0x5E8A,0x5EF7,0x5F04,0x5F1F,0x5F64,0x5F62,
-	0x5F77,0x5F79,0x5FD8,0x5FCC,0x5FD7,0x5FCD,0x5FF1,0x5FEB,
-	0x5FF8,0x5FEA,0x6212,0x6211,0x6284,0x6297,0x6296,0x6280,
-	0x6276,0x6289,0x626D,0x628A,0x627C,0x627E,0x6279,0x6273,
-	0x6292,0x626F,0x6298,0x626E,0x6295,0x6293,0x6291,0x6286,
-	0x6539,0x653B,0x6538,0x65F1,0x66F4,0x675F,0x674E,0x674F,
-	0x6750,0x6751,0x675C,0x6756,0x675E,0x6749,0x6746,0x6760,
-	0x6753,0x6757,0x6B65,0x6BCF,0x6C42,0x6C5E,0x6C99,0x6C81,
-	0x6C88,0x6C89,0x6C85,0x6C9B,0x6C6A,0x6C7A,0x6C90,0x6C70,
-	0x6C8C,0x6C68,0x6C96,0x6C92,0x6C7D,0x6C83,0x6C72,0x6C7E,
-	0x6C74,0x6C86,0x6C76,0x6C8D,0x6C94,0x6C98,
-	/* Range 0x4B21 - 0x4B7E, array index: 0x052E */
-	0x6C82,0x7076,0x707C,0x707D,0x7078,0x7262,0x7261,0x7260,
-	0x72C4,0x72C2,0x7396,0x752C,0x752B,0x7537,0x7538,0x7682,
-	0x76EF,0x77E3,0x79C1,0x79C0,0x79BF,0x7A76,0x7CFB,0x7F55,
-	0x8096,0x8093,0x809D,0x8098,0x809B,0x809A,0x80B2,0x826F,
-	0x8292,0x828B,0x828D,0x898B,0x89D2,0x8A00,0x8C37,0x8C46,
-	0x8C55,0x8C9D,0x8D64,0x8D70,0x8DB3,0x8EAB,0x8ECA,0x8F9B,
-	0x8FB0,0x8FC2,0x8FC6,0x8FC5,0x8FC4,0x5DE1,0x9091,0x90A2,
-	0x90AA,0x90A6,0x90A3,0x9149,0x91C6,0x91CC,0x9632,0x962E,
-	0x9631,0x962A,0x962C,0x4E26,0x4E56,0x4E73,0x4E8B,0x4E9B,
-	0x4E9E,0x4EAB,0x4EAC,0x4F6F,0x4F9D,0x4F8D,0x4F73,0x4F7F,
-	0x4F6C,0x4F9B,0x4F8B,0x4F86,0x4F83,0x4F70,0x4F75,0x4F88,
-	0x4F69,0x4F7B,0x4F96,0x4F7E,0x4F8F,0x4F91,
-	/* Range 0x4C21 - 0x4C7E, array index: 0x058C */
-	0x4F7A,0x5154,0x5152,0x5155,0x5169,0x5177,0x5176,0x5178,
-	0x51BD,0x51FD,0x523B,0x5238,0x5237,0x523A,0x5230,0x522E,
-	0x5236,0x5241,0x52BE,0x52BB,0x5352,0x5354,0x5353,0x5351,
-	0x5366,0x5377,0x5378,0x5379,0x53D6,0x53D4,0x53D7,0x5473,
-	0x5475,0x5496,0x5478,0x5495,0x5480,0x547B,0x5477,0x5484,
-	0x5492,0x5486,0x547C,0x5490,0x5471,0x5476,0x548C,0x549A,
-	0x5462,0x5468,0x548B,0x547D,0x548E,0x56FA,0x5783,0x5777,
-	0x576A,0x5769,0x5761,0x5766,0x5764,0x577C,0x591C,0x5949,
-	0x5947,0x5948,0x5944,0x5954,0x59BE,0x59BB,0x59D4,0x59B9,
-	0x59AE,0x59D1,0x59C6,0x59D0,0x59CD,0x59CB,0x59D3,0x59CA,
-	0x59AF,0x59B3,0x59D2,0x59C5,0x5B5F,0x5B64,0x5B63,0x5B97,
-	0x5B9A,0x5B98,0x5B9C,0x5B99,0x5B9B,0x5C1A,
-	/* Range 0x4D21 - 0x4D7E, array index: 0x05EA */
-	0x5C48,0x5C45,0x5C46,0x5CB7,0x5CA1,0x5CB8,0x5CA9,0x5CAB,
-	0x5CB1,0x5CB3,0x5E18,0x5E1A,0x5E16,0x5E15,0x5E1B,0x5E11,
-	0x5E78,0x5E9A,0x5E97,0x5E9C,0x5E95,0x5E96,0x5EF6,0x5F26,
-	0x5F27,0x5F29,0x5F80,0x5F81,0x5F7F,0x5F7C,0x5FDD,0x5FE0,
-	0x5FFD,0x5FF5,0x5FFF,0x600F,0x6014,0x602F,0x6035,0x6016,
-	0x602A,0x6015,0x6021,0x6027,0x6029,0x602B,0x601B,0x6216,
-	0x6215,0x623F,0x623E,0x6240,0x627F,0x62C9,0x62CC,0x62C4,
-	0x62BF,0x62C2,0x62B9,0x62D2,0x62DB,0x62AB,0x62D3,0x62D4,
-	0x62CB,0x62C8,0x62A8,0x62BD,0x62BC,0x62D0,0x62D9,0x62C7,
-	0x62CD,0x62B5,0x62DA,0x62B1,0x62D8,0x62D6,0x62D7,0x62C6,
-	0x62AC,0x62CE,0x653E,0x65A7,0x65BC,0x65FA,0x6614,0x6613,
-	0x660C,0x6606,0x6602,0x660E,0x6600,0x660F,
-	/* Range 0x4E21 - 0x4E7E, array index: 0x0648 */
-	0x6615,0x660A,0x6607,0x670D,0x670B,0x676D,0x678B,0x6795,
-	0x6771,0x679C,0x6773,0x6777,0x6787,0x679D,0x6797,0x676F,
-	0x6770,0x677F,0x6789,0x677E,0x6790,0x6775,0x679A,0x6793,
-	0x677C,0x676A,0x6772,0x6B23,0x6B66,0x6B67,0x6B7F,0x6C13,
-	0x6C1B,0x6CE3,0x6CE8,0x6CF3,0x6CB1,0x6CCC,0x6CE5,0x6CB3,
-	0x6CBD,0x6CBE,0x6CBC,0x6CE2,0x6CAB,0x6CD5,0x6CD3,0x6CB8,
-	0x6CC4,0x6CB9,0x6CC1,0x6CAE,0x6CD7,0x6CC5,0x6CF1,0x6CBF,
-	0x6CBB,0x6CE1,0x6CDB,0x6CCA,0x6CAC,0x6CEF,0x6CDC,0x6CD6,
-	0x6CE0,0x7095,0x708E,0x7092,0x708A,0x7099,0x722C,0x722D,
-	0x7238,0x7248,0x7267,0x7269,0x72C0,0x72CE,0x72D9,0x72D7,
-	0x72D0,0x73A9,0x73A8,0x739F,0x73AB,0x73A5,0x753D,0x759D,
-	0x7599,0x759A,0x7684,0x76C2,0x76F2,0x76F4,
-	/* Range 0x4F21 - 0x4F7E, array index: 0x06A6 */
-	0x77E5,0x77FD,0x793E,0x7940,0x7941,0x79C9,0x79C8,0x7A7A,
-	0x7A79,0x7AFA,0x7CFE,0x7F54,0x7F8C,0x7F8B,0x8005,0x80BA,
-	0x80A5,0x80A2,0x80B1,0x80A1,0x80AB,0x80A9,0x80B4,0x80AA,
-	0x80AF,0x81E5,0x81FE,0x820D,0x82B3,0x829D,0x8299,0x82AD,
-	0x82BD,0x829F,0x82B9,0x82B1,0x82AC,0x82A5,0x82AF,0x82B8,
-	0x82A3,0x82B0,0x82BE,0x82B7,0x864E,0x8671,0x521D,0x8868,
-	0x8ECB,0x8FCE,0x8FD4,0x8FD1,0x90B5,0x90B8,0x90B1,0x90B6,
-	0x91C7,0x91D1,0x9577,0x9580,0x961C,0x9640,0x963F,0x963B,
-	0x9644,0x9642,0x96B9,0x96E8,0x9752,0x975E,0x4E9F,0x4EAD,
-	0x4EAE,0x4FE1,0x4FB5,0x4FAF,0x4FBF,0x4FE0,0x4FD1,0x4FCF,
-	0x4FDD,0x4FC3,0x4FB6,0x4FD8,0x4FDF,0x4FCA,0x4FD7,0x4FAE,
-	0x4FD0,0x4FC4,0x4FC2,0x4FDA,0x4FCE,0x4FDE,
-	/* Range 0x5021 - 0x507E, array index: 0x0704 */
-	0x4FB7,0x5157,0x5192,0x5191,0x51A0,0x524E,0x5243,0x524A,
-	0x524D,0x524C,0x524B,0x5247,0x52C7,0x52C9,0x52C3,0x52C1,
-	0x530D,0x5357,0x537B,0x539A,0x53DB,0x54AC,0x54C0,0x54A8,
-	0x54CE,0x54C9,0x54B8,0x54A6,0x54B3,0x54C7,0x54C2,0x54BD,
-	0x54AA,0x54C1,0x54C4,0x54C8,0x54AF,0x54AB,0x54B1,0x54BB,
-	0x54A9,0x54A7,0x54BF,0x56FF,0x5782,0x578B,0x57A0,0x57A3,
-	0x57A2,0x57CE,0x57AE,0x5793,0x5955,0x5951,0x594F,0x594E,
-	0x5950,0x59DC,0x59D8,0x59FF,0x59E3,0x59E8,0x5A03,0x59E5,
-	0x59EA,0x59DA,0x59E6,0x5A01,0x59FB,0x5B69,0x5BA3,0x5BA6,
-	0x5BA4,0x5BA2,0x5BA5,0x5C01,0x5C4E,0x5C4F,0x5C4D,0x5C4B,
-	0x5CD9,0x5CD2,0x5DF7,0x5E1D,0x5E25,0x5E1F,0x5E7D,0x5EA0,
-	0x5EA6,0x5EFA,0x5F08,0x5F2D,0x5F65,0x5F88,
-	/* Range 0x5121 - 0x517E, array index: 0x0762 */
-	0x5F85,0x5F8A,0x5F8B,0x5F87,0x5F8C,0x5F89,0x6012,0x601D,
-	0x6020,0x6025,0x600E,0x6028,0x604D,0x6070,0x6068,0x6062,
-	0x6046,0x6043,0x606C,0x606B,0x606A,0x6064,0x6241,0x62DC,
-	0x6316,0x6309,0x62FC,0x62ED,0x6301,0x62EE,0x62FD,0x6307,
-	0x62F1,0x62F7,0x62EF,0x62EC,0x62FE,0x62F4,0x6311,0x6302,
-	0x653F,0x6545,0x65AB,0x65BD,0x65E2,0x6625,0x662D,0x6620,
-	0x6627,0x662F,0x661F,0x6628,0x6631,0x6624,0x66F7,0x67FF,
-	0x67D3,0x67F1,0x67D4,0x67D0,0x67EC,0x67B6,0x67AF,0x67F5,
-	0x67E9,0x67EF,0x67C4,0x67D1,0x67B4,0x67DA,0x67E5,0x67B8,
-	0x67CF,0x67DE,0x67F3,0x67B0,0x67D9,0x67E2,0x67DD,0x67D2,
-	0x6B6A,0x6B83,0x6B86,0x6BB5,0x6BD2,0x6BD7,0x6C1F,0x6CC9,
-	0x6D0B,0x6D32,0x6D2A,0x6D41,0x6D25,0x6D0C,
-	/* Range 0x5221 - 0x527E, array index: 0x07C0 */
-	0x6D31,0x6D1E,0x6D17,0x6D3B,0x6D3D,0x6D3E,0x6D36,0x6D1B,
-	0x6CF5,0x6D39,0x6D27,0x6D38,0x6D29,0x6D2E,0x6D35,0x6D0E,
-	0x6D2B,0x70AB,0x70BA,0x70B3,0x70AC,0x70AF,0x70AD,0x70B8,
-	0x70AE,0x70A4,0x7230,0x7272,0x726F,0x7274,0x72E9,0x72E0,
-	0x72E1,0x73B7,0x73CA,0x73BB,0x73B2,0x73CD,0x73C0,0x73B3,
-	0x751A,0x752D,0x754F,0x754C,0x754E,0x754B,0x75AB,0x75A4,
-	0x75A5,0x75A2,0x75A3,0x7678,0x7686,0x7687,0x7688,0x76C8,
-	0x76C6,0x76C3,0x76C5,0x7701,0x76F9,0x76F8,0x7709,0x770B,
-	0x76FE,0x76FC,0x7707,0x77DC,0x7802,0x7814,0x780C,0x780D,
-	0x7946,0x7949,0x7948,0x7947,0x79B9,0x79BA,0x79D1,0x79D2,
-	0x79CB,0x7A7F,0x7A81,0x7AFF,0x7AFD,0x7C7D,0x7D02,0x7D05,
-	0x7D00,0x7D09,0x7D07,0x7D04,0x7D06,0x7F38,
-	/* Range 0x5321 - 0x537E, array index: 0x081E */
-	0x7F8E,0x7FBF,0x8010,0x800D,0x8011,0x8036,0x80D6,0x80E5,
-	0x80DA,0x80C3,0x80C4,0x80CC,0x80E1,0x80DB,0x80CE,0x80DE,
-	0x80E4,0x80DD,0x81F4,0x8222,0x82E7,0x8303,0x8305,0x82E3,
-	0x82DB,0x82E6,0x8304,0x82E5,0x8302,0x8309,0x82D2,0x82D7,
-	0x82F1,0x8301,0x82DC,0x82D4,0x82D1,0x82DE,0x82D3,0x82DF,
-	0x82EF,0x8306,0x8650,0x8679,0x867B,0x867A,0x884D,0x886B,
-	0x8981,0x89D4,0x8A08,0x8A02,0x8A03,0x8C9E,0x8CA0,0x8D74,
-	0x8D73,0x8DB4,0x8ECD,0x8ECC,0x8FF0,0x8FE6,0x8FE2,0x8FEA,
-	0x8FE5,0x8FED,0x8FEB,0x8FE4,0x8FE8,0x90CA,0x90CE,0x90C1,
-	0x90C3,0x914B,0x914A,0x91CD,0x9582,0x9650,0x964B,0x964C,
-	0x964D,0x9762,0x9769,0x97CB,0x97ED,0x97F3,0x9801,0x98A8,
-	0x98DB,0x98DF,0x9996,0x9999,0x4E58,0x4EB3,
-	/* Range 0x5421 - 0x547E, array index: 0x087C */
-	0x500C,0x500D,0x5023,0x4FEF,0x5026,0x5025,0x4FF8,0x5029,
-	0x5016,0x5006,0x503C,0x501F,0x501A,0x5012,0x5011,0x4FFA,
-	0x5000,0x5014,0x5028,0x4FF1,0x5021,0x500B,0x5019,0x5018,
-	0x4FF3,0x4FEE,0x502D,0x502A,0x4FFE,0x502B,0x5009,0x517C,
-	0x51A4,0x51A5,0x51A2,0x51CD,0x51CC,0x51C6,0x51CB,0x5256,
-	0x525C,0x5254,0x525B,0x525D,0x532A,0x537F,0x539F,0x539D,
-	0x53DF,0x54E8,0x5510,0x5501,0x5537,0x54FC,0x54E5,0x54F2,
-	0x5506,0x54FA,0x5514,0x54E9,0x54ED,0x54E1,0x5509,0x54EE,
-	0x54EA,0x54E6,0x5527,0x5507,0x54FD,0x550F,0x5703,0x5704,
-	0x57C2,0x57D4,0x57CB,0x57C3,0x5809,0x590F,0x5957,0x5958,
-	0x595A,0x5A11,0x5A18,0x5A1C,0x5A1F,0x5A1B,0x5A13,0x59EC,
-	0x5A20,0x5A23,0x5A29,0x5A25,0x5A0C,0x5A09,
-	/* Range 0x5521 - 0x557E, array index: 0x08DA */
-	0x5B6B,0x5C58,0x5BB0,0x5BB3,0x5BB6,0x5BB4,0x5BAE,0x5BB5,
-	0x5BB9,0x5BB8,0x5C04,0x5C51,0x5C55,0x5C50,0x5CED,0x5CFD,
-	0x5CFB,0x5CEA,0x5CE8,0x5CF0,0x5CF6,0x5D01,0x5CF4,0x5DEE,
-	0x5E2D,0x5E2B,0x5EAB,0x5EAD,0x5EA7,0x5F31,0x5F92,0x5F91,
-	0x5F90,0x6059,0x6063,0x6065,0x6050,0x6055,0x606D,0x6069,
-	0x606F,0x6084,0x609F,0x609A,0x608D,0x6094,0x608C,0x6085,
-	0x6096,0x6247,0x62F3,0x6308,0x62FF,0x634E,0x633E,0x632F,
-	0x6355,0x6342,0x6346,0x634F,0x6349,0x633A,0x6350,0x633D,
-	0x632A,0x632B,0x6328,0x634D,0x634C,0x6548,0x6549,0x6599,
-	0x65C1,0x65C5,0x6642,0x6649,0x664F,0x6643,0x6652,0x664C,
-	0x6645,0x6641,0x66F8,0x6714,0x6715,0x6717,0x6821,0x6838,
-	0x6848,0x6846,0x6853,0x6839,0x6842,0x6854,
-	/* Range 0x5621 - 0x567E, array index: 0x0938 */
-	0x6829,0x68B3,0x6817,0x684C,0x6851,0x683D,0x67F4,0x6850,
-	0x6840,0x683C,0x6843,0x682A,0x6845,0x6813,0x6818,0x6841,
-	0x6B8A,0x6B89,0x6BB7,0x6C23,0x6C27,0x6C28,0x6C26,0x6C24,
-	0x6CF0,0x6D6A,0x6D95,0x6D88,0x6D87,0x6D66,0x6D78,0x6D77,
-	0x6D59,0x6D93,0x6D6C,0x6D89,0x6D6E,0x6D5A,0x6D74,0x6D69,
-	0x6D8C,0x6D8A,0x6D79,0x6D85,0x6D65,0x6D94,0x70CA,0x70D8,
-	0x70E4,0x70D9,0x70C8,0x70CF,0x7239,0x7279,0x72FC,0x72F9,
-	0x72FD,0x72F8,0x72F7,0x7386,0x73ED,0x7409,0x73EE,0x73E0,
-	0x73EA,0x73DE,0x7554,0x755D,0x755C,0x755A,0x7559,0x75BE,
-	0x75C5,0x75C7,0x75B2,0x75B3,0x75BD,0x75BC,0x75B9,0x75C2,
-	0x75B8,0x768B,0x76B0,0x76CA,0x76CD,0x76CE,0x7729,0x771F,
-	0x7720,0x7728,0x77E9,0x7830,0x7827,0x7838,
-	/* Range 0x5721 - 0x577E, array index: 0x0996 */
-	0x781D,0x7834,0x7837,0x7825,0x782D,0x7820,0x781F,0x7832,
-	0x7955,0x7950,0x7960,0x795F,0x7956,0x795E,0x795D,0x7957,
-	0x795A,0x79E4,0x79E3,0x79E7,0x79DF,0x79E6,0x79E9,0x79D8,
-	0x7A84,0x7A88,0x7AD9,0x7B06,0x7B11,0x7C89,0x7D21,0x7D17,
-	0x7D0B,0x7D0A,0x7D20,0x7D22,0x7D14,0x7D10,0x7D15,0x7D1A,
-	0x7D1C,0x7D0D,0x7D19,0x7D1B,0x7F3A,0x7F5F,0x7F94,0x7FC5,
-	0x7FC1,0x8006,0x8004,0x8018,0x8015,0x8019,0x8017,0x803D,
-	0x803F,0x80F1,0x8102,0x80F0,0x8105,0x80ED,0x80F4,0x8106,
-	0x80F8,0x80F3,0x8108,0x80FD,0x810A,0x80FC,0x80EF,0x81ED,
-	0x81EC,0x8200,0x8210,0x822A,0x822B,0x8228,0x822C,0x82BB,
-	0x832B,0x8352,0x8354,0x834A,0x8338,0x8350,0x8349,0x8335,
-	0x8334,0x834F,0x8332,0x8339,0x8336,0x8317,
-	/* Range 0x5821 - 0x587E, array index: 0x09F4 */
-	0x8340,0x8331,0x8328,0x8343,0x8654,0x868A,0x86AA,0x8693,
-	0x86A4,0x86A9,0x868C,0x86A3,0x869C,0x8870,0x8877,0x8881,
-	0x8882,0x887D,0x8879,0x8A18,0x8A10,0x8A0E,0x8A0C,0x8A15,
-	0x8A0A,0x8A17,0x8A13,0x8A16,0x8A0F,0x8A11,0x8C48,0x8C7A,
-	0x8C79,0x8CA1,0x8CA2,0x8D77,0x8EAC,0x8ED2,0x8ED4,0x8ECF,
-	0x8FB1,0x9001,0x9006,0x8FF7,0x9000,0x8FFA,0x8FF4,0x9003,
-	0x8FFD,0x9005,0x8FF8,0x9095,0x90E1,0x90DD,0x90E2,0x9152,
-	0x914D,0x914C,0x91D8,0x91DD,0x91D7,0x91DC,0x91D9,0x9583,
-	0x9662,0x9663,0x9661,0x965B,0x965D,0x9664,0x9658,0x965E,
-	0x96BB,0x98E2,0x99AC,0x9AA8,0x9AD8,0x9B25,0x9B32,0x9B3C,
-	0x4E7E,0x507A,0x507D,0x505C,0x5047,0x5043,0x504C,0x505A,
-	0x5049,0x5065,0x5076,0x504E,0x5055,0x5075,
-	/* Range 0x5921 - 0x597E, array index: 0x0A52 */
-	0x5074,0x5077,0x504F,0x500F,0x506F,0x506D,0x515C,0x5195,
-	0x51F0,0x526A,0x526F,0x52D2,0x52D9,0x52D8,0x52D5,0x5310,
-	0x530F,0x5319,0x533F,0x5340,0x533E,0x53C3,0x66FC,0x5546,
-	0x556A,0x5566,0x5544,0x555E,0x5561,0x5543,0x554A,0x5531,
-	0x5556,0x554F,0x5555,0x552F,0x5564,0x5538,0x552E,0x555C,
-	0x552C,0x5563,0x5533,0x5541,0x5557,0x5708,0x570B,0x5709,
-	0x57DF,0x5805,0x580A,0x5806,0x57E0,0x57E4,0x57FA,0x5802,
-	0x5835,0x57F7,0x57F9,0x5920,0x5962,0x5A36,0x5A41,0x5A49,
-	0x5A66,0x5A6A,0x5A40,0x5A3C,0x5A62,0x5A5A,0x5A46,0x5A4A,
-	0x5B70,0x5BC7,0x5BC5,0x5BC4,0x5BC2,0x5BBF,0x5BC6,0x5C09,
-	0x5C08,0x5C07,0x5C60,0x5C5C,0x5C5D,0x5D07,0x5D06,0x5D0E,
-	0x5D1B,0x5D16,0x5D22,0x5D11,0x5D29,0x5D14,
-	/* Range 0x5A21 - 0x5A7E, array index: 0x0AB0 */
-	0x5D19,0x5D24,0x5D27,0x5D17,0x5DE2,0x5E38,0x5E36,0x5E33,
-	0x5E37,0x5EB7,0x5EB8,0x5EB6,0x5EB5,0x5EBE,0x5F35,0x5F37,
-	0x5F57,0x5F6C,0x5F69,0x5F6B,0x5F97,0x5F99,0x5F9E,0x5F98,
-	0x5FA1,0x5FA0,0x5F9C,0x607F,0x60A3,0x6089,0x60A0,0x60A8,
-	0x60CB,0x60B4,0x60E6,0x60BD,0x60C5,0x60BB,0x60B5,0x60DC,
-	0x60BC,0x60D8,0x60D5,0x60C6,0x60DF,0x60B8,0x60DA,0x60C7,
-	0x621A,0x621B,0x6248,0x63A0,0x63A7,0x6372,0x6396,0x63A2,
-	0x63A5,0x6377,0x6367,0x6398,0x63AA,0x6371,0x63A9,0x6389,
-	0x6383,0x639B,0x636B,0x63A8,0x6384,0x6388,0x6399,0x63A1,
-	0x63AC,0x6392,0x638F,0x6380,0x637B,0x6369,0x6368,0x637A,
-	0x655D,0x6556,0x6551,0x6559,0x6557,0x555F,0x654F,0x6558,
-	0x6555,0x6554,0x659C,0x659B,0x65AC,0x65CF,
-	/* Range 0x5B21 - 0x5B7E, array index: 0x0B0E */
-	0x65CB,0x65CC,0x65CE,0x665D,0x665A,0x6664,0x6668,0x6666,
-	0x665E,0x66F9,0x52D7,0x671B,0x6881,0x68AF,0x68A2,0x6893,
-	0x68B5,0x687F,0x6876,0x68B1,0x68A7,0x6897,0x68B0,0x6883,
-	0x68C4,0x68AD,0x6886,0x6885,0x6894,0x689D,0x68A8,0x689F,
-	0x68A1,0x6882,0x6B32,0x6BBA,0x6BEB,0x6BEC,0x6C2B,0x6D8E,
-	0x6DBC,0x6DF3,0x6DD9,0x6DB2,0x6DE1,0x6DCC,0x6DE4,0x6DFB,
-	0x6DFA,0x6E05,0x6DC7,0x6DCB,0x6DAF,0x6DD1,0x6DAE,0x6DDE,
-	0x6DF9,0x6DB8,0x6DF7,0x6DF5,0x6DC5,0x6DD2,0x6E1A,0x6DB5,
-	0x6DDA,0x6DEB,0x6DD8,0x6DEA,0x6DF1,0x6DEE,0x6DE8,0x6DC6,
-	0x6DC4,0x6DAA,0x6DEC,0x6DBF,0x6DE6,0x70F9,0x7109,0x710A,
-	0x70FD,0x70EF,0x723D,0x727D,0x7281,0x731C,0x731B,0x7316,
-	0x7313,0x7319,0x7387,0x7405,0x740A,0x7403,
-	/* Range 0x5C21 - 0x5C7E, array index: 0x0B6C */
-	0x7406,0x73FE,0x740D,0x74E0,0x74F6,0x74F7,0x751C,0x7522,
-	0x7565,0x7566,0x7562,0x7570,0x758F,0x75D4,0x75D5,0x75B5,
-	0x75CA,0x75CD,0x768E,0x76D4,0x76D2,0x76DB,0x7737,0x773E,
-	0x773C,0x7736,0x7738,0x773A,0x786B,0x7843,0x784E,0x7965,
-	0x7968,0x796D,0x79FB,0x7A92,0x7A95,0x7B20,0x7B28,0x7B1B,
-	0x7B2C,0x7B26,0x7B19,0x7B1E,0x7B2E,0x7C92,0x7C97,0x7C95,
-	0x7D46,0x7D43,0x7D71,0x7D2E,0x7D39,0x7D3C,0x7D40,0x7D30,
-	0x7D33,0x7D44,0x7D2F,0x7D42,0x7D32,0x7D31,0x7F3D,0x7F9E,
-	0x7F9A,0x7FCC,0x7FCE,0x7FD2,0x801C,0x804A,0x8046,0x812F,
-	0x8116,0x8123,0x812B,0x8129,0x8130,0x8124,0x8202,0x8235,
-	0x8237,0x8236,0x8239,0x838E,0x839E,0x8398,0x8378,0x83A2,
-	0x8396,0x83BD,0x83AB,0x8392,0x838A,0x8393,
-	/* Range 0x5D21 - 0x5D7E, array index: 0x0BCA */
-	0x8389,0x83A0,0x8377,0x837B,0x837C,0x8386,0x83A7,0x8655,
-	0x5F6A,0x86C7,0x86C0,0x86B6,0x86C4,0x86B5,0x86C6,0x86CB,
-	0x86B1,0x86AF,0x86C9,0x8853,0x889E,0x8888,0x88AB,0x8892,
-	0x8896,0x888D,0x888B,0x8993,0x898F,0x8A2A,0x8A1D,0x8A23,
-	0x8A25,0x8A31,0x8A2D,0x8A1F,0x8A1B,0x8A22,0x8C49,0x8C5A,
-	0x8CA9,0x8CAC,0x8CAB,0x8CA8,0x8CAA,0x8CA7,0x8D67,0x8D66,
-	0x8DBE,0x8DBA,0x8EDB,0x8EDF,0x9019,0x900D,0x901A,0x9017,
-	0x9023,0x901F,0x901D,0x9010,0x9015,0x901E,0x9020,0x900F,
-	0x9022,0x9016,0x901B,0x9014,0x90E8,0x90ED,0x90FD,0x9157,
-	0x91CE,0x91F5,0x91E6,0x91E3,0x91E7,0x91ED,0x91E9,0x9589,
-	0x966A,0x9675,0x9673,0x9678,0x9670,0x9674,0x9676,0x9677,
-	0x966C,0x96C0,0x96EA,0x96E9,0x7AE0,0x7ADF,
-	/* Range 0x5E21 - 0x5E7E, array index: 0x0C28 */
-	0x9802,0x9803,0x9B5A,0x9CE5,0x9E75,0x9E7F,0x9EA5,0x9EBB,
-	0x50A2,0x508D,0x5085,0x5099,0x5091,0x5080,0x5096,0x5098,
-	0x509A,0x6700,0x51F1,0x5272,0x5274,0x5275,0x5269,0x52DE,
-	0x52DD,0x52DB,0x535A,0x53A5,0x557B,0x5580,0x55A7,0x557C,
-	0x558A,0x559D,0x5598,0x5582,0x559C,0x55AA,0x5594,0x5587,
-	0x558B,0x5583,0x55B3,0x55AE,0x559F,0x553E,0x55B2,0x559A,
-	0x55BB,0x55AC,0x55B1,0x557E,0x5589,0x55AB,0x5599,0x570D,
-	0x582F,0x582A,0x5834,0x5824,0x5830,0x5831,0x5821,0x581D,
-	0x5820,0x58F9,0x58FA,0x5960,0x5A77,0x5A9A,0x5A7F,0x5A92,
-	0x5A9B,0x5AA7,0x5B73,0x5B71,0x5BD2,0x5BCC,0x5BD3,0x5BD0,
-	0x5C0A,0x5C0B,0x5C31,0x5D4C,0x5D50,0x5D34,0x5D47,0x5DFD,
-	0x5E45,0x5E3D,0x5E40,0x5E43,0x5E7E,0x5ECA,
-	/* Range 0x5F21 - 0x5F7E, array index: 0x0C86 */
-	0x5EC1,0x5EC2,0x5EC4,0x5F3C,0x5F6D,0x5FA9,0x5FAA,0x5FA8,
-	0x60D1,0x60E1,0x60B2,0x60B6,0x60E0,0x611C,0x6123,0x60FA,
-	0x6115,0x60F0,0x60FB,0x60F4,0x6168,0x60F1,0x610E,0x60F6,
-	0x6109,0x6100,0x6112,0x621F,0x6249,0x63A3,0x638C,0x63CF,
-	0x63C0,0x63E9,0x63C9,0x63C6,0x63CD,0x63D2,0x63E3,0x63D0,
-	0x63E1,0x63D6,0x63ED,0x63EE,0x6376,0x63F4,0x63EA,0x63DB,
-	0x6452,0x63DA,0x63F9,0x655E,0x6566,0x6562,0x6563,0x6591,
-	0x6590,0x65AF,0x666E,0x6670,0x6674,0x6676,0x666F,0x6691,
-	0x667A,0x667E,0x6677,0x66FE,0x66FF,0x671F,0x671D,0x68FA,
-	0x68D5,0x68E0,0x68D8,0x68D7,0x6905,0x68DF,0x68F5,0x68EE,
-	0x68E7,0x68F9,0x68D2,0x68F2,0x68E3,0x68CB,0x68CD,0x690D,
-	0x6912,0x690E,0x68C9,0x68DA,0x696E,0x68FB,
-	/* Range 0x6021 - 0x607E, array index: 0x0CE4 */
-	0x6B3E,0x6B3A,0x6B3D,0x6B98,0x6B96,0x6BBC,0x6BEF,0x6C2E,
-	0x6C2F,0x6C2C,0x6E2F,0x6E38,0x6E54,0x6E21,0x6E32,0x6E67,
-	0x6E4A,0x6E20,0x6E25,0x6E23,0x6E1B,0x6E5B,0x6E58,0x6E24,
-	0x6E56,0x6E6E,0x6E2D,0x6E26,0x6E6F,0x6E34,0x6E4D,0x6E3A,
-	0x6E2C,0x6E43,0x6E1D,0x6E3E,0x6ECB,0x6E89,0x6E19,0x6E4E,
-	0x6E63,0x6E44,0x6E72,0x6E69,0x6E5F,0x7119,0x711A,0x7126,
-	0x7130,0x7121,0x7136,0x716E,0x711C,0x724C,0x7284,0x7280,
-	0x7336,0x7325,0x7334,0x7329,0x743A,0x742A,0x7433,0x7422,
-	0x7425,0x7435,0x7436,0x7434,0x742F,0x741B,0x7426,0x7428,
-	0x7525,0x7526,0x756B,0x756A,0x75E2,0x75DB,0x75E3,0x75D9,
-	0x75D8,0x75DE,0x75E0,0x767B,0x767C,0x7696,0x7693,0x76B4,
-	0x76DC,0x774F,0x77ED,0x785D,0x786C,0x786F,
-	/* Range 0x6121 - 0x617E, array index: 0x0D42 */
-	0x7A0D,0x7A08,0x7A0B,0x7A05,0x7A00,0x7A98,0x7A97,0x7A96,
-	0x7AE5,0x7AE3,0x7B49,0x7B56,0x7B46,0x7B50,0x7B52,0x7B54,
-	0x7B4D,0x7B4B,0x7B4F,0x7B51,0x7C9F,0x7CA5,0x7D5E,0x7D50,
-	0x7D68,0x7D55,0x7D2B,0x7D6E,0x7D72,0x7D61,0x7D66,0x7D62,
-	0x7D70,0x7D73,0x5584,0x7FD4,0x7FD5,0x800B,0x8052,0x8085,
-	0x8155,0x8154,0x814B,0x8151,0x814E,0x8139,0x8146,0x813E,
-	0x814C,0x8153,0x8174,0x8212,0x821C,0x83E9,0x8403,0x83F8,
-	0x840D,0x83E0,0x83C5,0x840B,0x83C1,0x83EF,0x83F1,0x83F4,
-	0x8457,0x840A,0x83F0,0x840C,0x83CC,0x83FD,0x83F2,0x83CA,
-	0x8438,0x840E,0x8404,0x83DC,0x8407,0x83D4,0x83DF,0x865B,
-	0x86DF,0x86D9,0x86ED,0x86D4,0x86DB,0x86E4,0x86D0,0x86DE,
-	0x8857,0x88C1,0x88C2,0x88B1,0x8983,0x8996,
-	/* Range 0x6221 - 0x627E, array index: 0x0DA0 */
-	0x8A3B,0x8A60,0x8A55,0x8A5E,0x8A3C,0x8A41,0x8A54,0x8A5B,
-	0x8A50,0x8A46,0x8A34,0x8A3A,0x8A36,0x8A56,0x8C61,0x8C82,
-	0x8CAF,0x8CBC,0x8CB3,0x8CBD,0x8CC1,0x8CBB,0x8CC0,0x8CB4,
-	0x8CB7,0x8CB6,0x8CBF,0x8CB8,0x8D8A,0x8D85,0x8D81,0x8DCE,
-	0x8DDD,0x8DCB,0x8DDA,0x8DD1,0x8DCC,0x8DDB,0x8DC6,0x8EFB,
-	0x8EF8,0x8EFC,0x8F9C,0x902E,0x9035,0x9031,0x9038,0x9032,
-	0x9036,0x9102,0x90F5,0x9109,0x90FE,0x9163,0x9165,0x91CF,
-	0x9214,0x9215,0x9223,0x9209,0x921E,0x920D,0x9210,0x9207,
-	0x9211,0x9594,0x958F,0x958B,0x9591,0x9593,0x9592,0x958E,
-	0x968A,0x968E,0x968B,0x967D,0x9685,0x9686,0x968D,0x9672,
-	0x9684,0x96C1,0x96C5,0x96C4,0x96C6,0x96C7,0x96EF,0x96F2,
-	0x97CC,0x9805,0x9806,0x9808,0x98E7,0x98EA,
-	/* Range 0x6321 - 0x637E, array index: 0x0DFE */
-	0x98EF,0x98E9,0x98F2,0x98ED,0x99AE,0x99AD,0x9EC3,0x9ECD,
-	0x9ED1,0x4E82,0x50AD,0x50B5,0x50B2,0x50B3,0x50C5,0x50BE,
-	0x50AC,0x50B7,0x50BB,0x50AF,0x50C7,0x527F,0x5277,0x527D,
-	0x52DF,0x52E6,0x52E4,0x52E2,0x52E3,0x532F,0x55DF,0x55E8,
-	0x55D3,0x55E6,0x55CE,0x55DC,0x55C7,0x55D1,0x55E3,0x55E4,
-	0x55EF,0x55DA,0x55E1,0x55C5,0x55C6,0x55E5,0x55C9,0x5712,
-	0x5713,0x585E,0x5851,0x5858,0x5857,0x585A,0x5854,0x586B,
-	0x584C,0x586D,0x584A,0x5862,0x5852,0x584B,0x5967,0x5AC1,
-	0x5AC9,0x5ACC,0x5ABE,0x5ABD,0x5ABC,0x5AB3,0x5AC2,0x5AB2,
-	0x5D69,0x5D6F,0x5E4C,0x5E79,0x5EC9,0x5EC8,0x5F12,0x5F59,
-	0x5FAC,0x5FAE,0x611A,0x610F,0x6148,0x611F,0x60F3,0x611B,
-	0x60F9,0x6101,0x6108,0x614E,0x614C,0x6144,
-	/* Range 0x6421 - 0x647E, array index: 0x0E5C */
-	0x614D,0x613E,0x6134,0x6127,0x610D,0x6106,0x6137,0x6221,
-	0x6222,0x6413,0x643E,0x641E,0x642A,0x642D,0x643D,0x642C,
-	0x640F,0x641C,0x6414,0x640D,0x6436,0x6416,0x6417,0x6406,
-	0x656C,0x659F,0x65B0,0x6697,0x6689,0x6687,0x6688,0x6696,
-	0x6684,0x6698,0x668D,0x6703,0x6994,0x696D,0x695A,0x6977,
-	0x6960,0x6954,0x6975,0x6930,0x6982,0x694A,0x6968,0x696B,
-	0x695E,0x6953,0x6979,0x6986,0x695D,0x6963,0x695B,0x6B47,
-	0x6B72,0x6BC0,0x6BBF,0x6BD3,0x6BFD,0x6EA2,0x6EAF,0x6ED3,
-	0x6EB6,0x6EC2,0x6E90,0x6E9D,0x6EC7,0x6EC5,0x6EA5,0x6E98,
-	0x6EBC,0x6EBA,0x6EAB,0x6ED1,0x6E96,0x6E9C,0x6EC4,0x6ED4,
-	0x6EAA,0x6EA7,0x6EB4,0x714E,0x7159,0x7169,0x7164,0x7149,
-	0x7167,0x715C,0x716C,0x7166,0x714C,0x7165,
-	/* Range 0x6521 - 0x657E, array index: 0x0EBA */
-	0x715E,0x7146,0x7168,0x7156,0x723A,0x7252,0x7337,0x7345,
-	0x733F,0x733E,0x746F,0x745A,0x7455,0x745F,0x745E,0x7441,
-	0x743F,0x7459,0x745B,0x745C,0x7576,0x7578,0x7600,0x75F0,
-	0x7601,0x75F2,0x75F1,0x75FA,0x75FF,0x75F4,0x75F3,0x76DE,
-	0x76DF,0x775B,0x776B,0x7766,0x775E,0x7763,0x7779,0x776A,
-	0x776C,0x775C,0x7765,0x7768,0x7762,0x77EE,0x788E,0x78B0,
-	0x7897,0x7898,0x788C,0x7889,0x787C,0x7891,0x7893,0x787F,
-	0x797A,0x797F,0x7981,0x842C,0x79BD,0x7A1C,0x7A1A,0x7A20,
-	0x7A14,0x7A1F,0x7A1E,0x7A9F,0x7AA0,0x7B77,0x7BC0,0x7B60,
-	0x7B6E,0x7B67,0x7CB1,0x7CB3,0x7CB5,0x7D93,0x7D79,0x7D91,
-	0x7D81,0x7D8F,0x7D5B,0x7F6E,0x7F69,0x7F6A,0x7F72,0x7FA9,
-	0x7FA8,0x7FA4,0x8056,0x8058,0x8086,0x8084,
-	/* Range 0x6621 - 0x667E, array index: 0x0F18 */
-	0x8171,0x8170,0x8178,0x8165,0x816E,0x8173,0x816B,0x8179,
-	0x817A,0x8166,0x8205,0x8247,0x8482,0x8477,0x843D,0x8431,
-	0x8475,0x8466,0x846B,0x8449,0x846C,0x845B,0x843C,0x8435,
-	0x8461,0x8463,0x8469,0x846D,0x8446,0x865E,0x865C,0x865F,
-	0x86F9,0x8713,0x8708,0x8707,0x8700,0x86FE,0x86FB,0x8702,
-	0x8703,0x8706,0x870A,0x8859,0x88DF,0x88D4,0x88D9,0x88DC,
-	0x88D8,0x88DD,0x88E1,0x88CA,0x88D5,0x88D2,0x899C,0x89E3,
-	0x8A6B,0x8A72,0x8A73,0x8A66,0x8A69,0x8A70,0x8A87,0x8A7C,
-	0x8A63,0x8AA0,0x8A71,0x8A85,0x8A6D,0x8A62,0x8A6E,0x8A6C,
-	0x8A79,0x8A7B,0x8A3E,0x8A68,0x8C62,0x8C8A,0x8C89,0x8CCA,
-	0x8CC7,0x8CC8,0x8CC4,0x8CB2,0x8CC3,0x8CC2,0x8CC5,0x8DE1,
-	0x8DDF,0x8DE8,0x8DEF,0x8DF3,0x8DFA,0x8DEA,
-	/* Range 0x6721 - 0x677E, array index: 0x0F76 */
-	0x8DE4,0x8DE6,0x8EB2,0x8F03,0x8F09,0x8EFE,0x8F0A,0x8F9F,
-	0x8FB2,0x904B,0x904A,0x9053,0x9042,0x9054,0x903C,0x9055,
-	0x9050,0x9047,0x904F,0x904E,0x904D,0x9051,0x903E,0x9041,
-	0x9112,0x9117,0x916C,0x916A,0x9169,0x91C9,0x9237,0x9257,
-	0x9238,0x923D,0x9240,0x923E,0x925B,0x924B,0x9264,0x9251,
-	0x9234,0x9249,0x924D,0x9245,0x9239,0x923F,0x925A,0x9598,
-	0x9698,0x9694,0x9695,0x96CD,0x96CB,0x96C9,0x96CA,0x96F7,
-	0x96FB,0x96F9,0x96F6,0x9756,0x9774,0x9776,0x9810,0x9811,
-	0x9813,0x980A,0x9812,0x980C,0x98FC,0x98F4,0x98FD,0x98FE,
-	0x99B3,0x99B1,0x99B4,0x9AE1,0x9CE9,0x9E82,0x9F0E,0x9F13,
-	0x9F20,0x50E7,0x50EE,0x50E5,0x50D6,0x50ED,0x50DA,0x50D5,
-	0x50CF,0x50D1,0x50F1,0x50CE,0x50E9,0x5162,
-	/* Range 0x6821 - 0x687E, array index: 0x0FD4 */
-	0x51F3,0x5283,0x5282,0x5331,0x53AD,0x55FE,0x5600,0x561B,
-	0x5617,0x55FD,0x5614,0x5606,0x5609,0x560D,0x560E,0x55F7,
-	0x5616,0x561F,0x5608,0x5610,0x55F6,0x5718,0x5716,0x5875,
-	0x587E,0x5883,0x5893,0x588A,0x5879,0x5885,0x587D,0x58FD,
-	0x5925,0x5922,0x5924,0x596A,0x5969,0x5AE1,0x5AE6,0x5AE9,
-	0x5AD7,0x5AD6,0x5AD8,0x5AE3,0x5B75,0x5BDE,0x5BE7,0x5BE1,
-	0x5BE5,0x5BE6,0x5BE8,0x5BE2,0x5BE4,0x5BDF,0x5C0D,0x5C62,
-	0x5D84,0x5D87,0x5E5B,0x5E63,0x5E55,0x5E57,0x5E54,0x5ED3,
-	0x5ED6,0x5F0A,0x5F46,0x5F70,0x5FB9,0x6147,0x613F,0x614B,
-	0x6177,0x6162,0x6163,0x615F,0x615A,0x6158,0x6175,0x622A,
-	0x6487,0x6458,0x6454,0x64A4,0x6478,0x645F,0x647A,0x6451,
-	0x6467,0x6434,0x646D,0x647B,0x6572,0x65A1,
-	/* Range 0x6921 - 0x697E, array index: 0x1032 */
-	0x65D7,0x65D6,0x66A2,0x66A8,0x669D,0x699C,0x69A8,0x6995,
-	0x69C1,0x69AE,0x69D3,0x69CB,0x699B,0x69B7,0x69BB,0x69AB,
-	0x69B4,0x69D0,0x69CD,0x69AD,0x69CC,0x69A6,0x69C3,0x69A3,
-	0x6B49,0x6B4C,0x6C33,0x6F33,0x6F14,0x6EFE,0x6F13,0x6EF4,
-	0x6F29,0x6F3E,0x6F20,0x6F2C,0x6F0F,0x6F02,0x6F22,0x6EFF,
-	0x6EEF,0x6F06,0x6F31,0x6F38,0x6F32,0x6F23,0x6F15,0x6F2B,
-	0x6F2F,0x6F88,0x6F2A,0x6EEC,0x6F01,0x6EF2,0x6ECC,0x6EF7,
-	0x7194,0x7199,0x717D,0x718A,0x7184,0x7192,0x723E,0x7292,
-	0x7296,0x7344,0x7350,0x7464,0x7463,0x746A,0x7470,0x746D,
-	0x7504,0x7591,0x7627,0x760D,0x760B,0x7609,0x7613,0x76E1,
-	0x76E3,0x7784,0x777D,0x777F,0x7761,0x78C1,0x789F,0x78A7,
-	0x78B3,0x78A9,0x78A3,0x798E,0x798F,0x798D,
-	/* Range 0x6A21 - 0x6A7E, array index: 0x1090 */
-	0x7A2E,0x7A31,0x7AAA,0x7AA9,0x7AED,0x7AEF,0x7BA1,0x7B95,
-	0x7B8B,0x7B75,0x7B97,0x7B9D,0x7B94,0x7B8F,0x7BB8,0x7B87,
-	0x7B84,0x7CB9,0x7CBD,0x7CBE,0x7DBB,0x7DB0,0x7D9C,0x7DBD,
-	0x7DBE,0x7DA0,0x7DCA,0x7DB4,0x7DB2,0x7DB1,0x7DBA,0x7DA2,
-	0x7DBF,0x7DB5,0x7DB8,0x7DAD,0x7DD2,0x7DC7,0x7DAC,0x7F70,
-	0x7FE0,0x7FE1,0x7FDF,0x805E,0x805A,0x8087,0x8150,0x8180,
-	0x818F,0x8188,0x818A,0x817F,0x8182,0x81E7,0x81FA,0x8207,
-	0x8214,0x821E,0x824B,0x84C9,0x84BF,0x84C6,0x84C4,0x8499,
-	0x849E,0x84B2,0x849C,0x84CB,0x84B8,0x84C0,0x84D3,0x8490,
-	0x84BC,0x84D1,0x84CA,0x873F,0x871C,0x873B,0x8722,0x8725,
-	0x8734,0x8718,0x8755,0x8737,0x8729,0x88F3,0x8902,0x88F4,
-	0x88F9,0x88F8,0x88FD,0x88E8,0x891A,0x88EF,
-	/* Range 0x6B21 - 0x6B7E, array index: 0x10EE */
-	0x8AA6,0x8A8C,0x8A9E,0x8AA3,0x8A8D,0x8AA1,0x8A93,0x8AA4,
-	0x8AAA,0x8AA5,0x8AA8,0x8A98,0x8A91,0x8A9A,0x8AA7,0x8C6A,
-	0x8C8D,0x8C8C,0x8CD3,0x8CD1,0x8CD2,0x8D6B,0x8D99,0x8D95,
-	0x8DFC,0x8F14,0x8F12,0x8F15,0x8F13,0x8FA3,0x9060,0x9058,
-	0x905C,0x9063,0x9059,0x905E,0x9062,0x905D,0x905B,0x9119,
-	0x9118,0x911E,0x9175,0x9178,0x9177,0x9174,0x9278,0x92AC,
-	0x9280,0x9285,0x9298,0x9296,0x927B,0x9293,0x929C,0x92A8,
-	0x927C,0x9291,0x95A1,0x95A8,0x95A9,0x95A3,0x95A5,0x95A4,
-	0x9699,0x969C,0x969B,0x96CC,0x96D2,0x9700,0x977C,0x9785,
-	0x97F6,0x9817,0x9818,0x98AF,0x98B1,0x9903,0x9905,0x990C,
-	0x9909,0x99C1,0x9AAF,0x9AB0,0x9AE6,0x9B41,0x9B42,0x9CF4,
-	0x9CF6,0x9CF3,0x9EBC,0x9F3B,0x9F4A,0x5104,
-	/* Range 0x6C21 - 0x6C7E, array index: 0x114C */
-	0x5100,0x50FB,0x50F5,0x50F9,0x5102,0x5108,0x5109,0x5105,
-	0x51DC,0x5287,0x5288,0x5289,0x528D,0x528A,0x52F0,0x53B2,
-	0x562E,0x563B,0x5639,0x5632,0x563F,0x5634,0x5629,0x5653,
-	0x564E,0x5657,0x5674,0x5636,0x562F,0x5630,0x5880,0x589F,
-	0x589E,0x58B3,0x589C,0x58AE,0x58A9,0x58A6,0x596D,0x5B09,
-	0x5AFB,0x5B0B,0x5AF5,0x5B0C,0x5B08,0x5BEE,0x5BEC,0x5BE9,
-	0x5BEB,0x5C64,0x5C65,0x5D9D,0x5D94,0x5E62,0x5E5F,0x5E61,
-	0x5EE2,0x5EDA,0x5EDF,0x5EDD,0x5EE3,0x5EE0,0x5F48,0x5F71,
-	0x5FB7,0x5FB5,0x6176,0x6167,0x616E,0x615D,0x6155,0x6182,
-	0x617C,0x6170,0x616B,0x617E,0x61A7,0x6190,0x61AB,0x618E,
-	0x61AC,0x619A,0x61A4,0x6194,0x61AE,0x622E,0x6469,0x646F,
-	0x6479,0x649E,0x64B2,0x6488,0x6490,0x64B0,
-	/* Range 0x6D21 - 0x6D7E, array index: 0x11AA */
-	0x64A5,0x6493,0x6495,0x64A9,0x6492,0x64AE,0x64AD,0x64AB,
-	0x649A,0x64AC,0x6499,0x64A2,0x64B3,0x6575,0x6577,0x6578,
-	0x66AE,0x66AB,0x66B4,0x66B1,0x6A23,0x6A1F,0x69E8,0x6A01,
-	0x6A1E,0x6A19,0x69FD,0x6A21,0x6A13,0x6A0A,0x69F3,0x6A02,
-	0x6A05,0x69ED,0x6A11,0x6B50,0x6B4E,0x6BA4,0x6BC5,0x6BC6,
-	0x6F3F,0x6F7C,0x6F84,0x6F51,0x6F66,0x6F54,0x6F86,0x6F6D,
-	0x6F5B,0x6F78,0x6F6E,0x6F8E,0x6F7A,0x6F70,0x6F64,0x6F97,
-	0x6F58,0x6ED5,0x6F6F,0x6F60,0x6F5F,0x719F,0x71AC,0x71B1,
-	0x71A8,0x7256,0x729B,0x734E,0x7357,0x7469,0x748B,0x7483,
-	0x747E,0x7480,0x757F,0x7620,0x7629,0x761F,0x7624,0x7626,
-	0x7621,0x7622,0x769A,0x76BA,0x76E4,0x778E,0x7787,0x778C,
-	0x7791,0x778B,0x78CB,0x78C5,0x78BA,0x78CA,
-	/* Range 0x6E21 - 0x6E7E, array index: 0x1208 */
-	0x78BE,0x78D5,0x78BC,0x78D0,0x7A3F,0x7A3C,0x7A40,0x7A3D,
-	0x7A37,0x7A3B,0x7AAF,0x7AAE,0x7BAD,0x7BB1,0x7BC4,0x7BB4,
-	0x7BC6,0x7BC7,0x7BC1,0x7BA0,0x7BCC,0x7CCA,0x7DE0,0x7DF4,
-	0x7DEF,0x7DFB,0x7DD8,0x7DEC,0x7DDD,0x7DE8,0x7DE3,0x7DDA,
-	0x7DDE,0x7DE9,0x7D9E,0x7DD9,0x7DF2,0x7DF9,0x7F75,0x7F77,
-	0x7FAF,0x7FE9,0x8026,0x819B,0x819C,0x819D,0x81A0,0x819A,
-	0x8198,0x8517,0x853D,0x851A,0x84EE,0x852C,0x852D,0x8513,
-	0x8511,0x8523,0x8521,0x8514,0x84EC,0x8525,0x84FF,0x8506,
-	0x8782,0x8774,0x8776,0x8760,0x8766,0x8778,0x8768,0x8759,
-	0x8757,0x874C,0x8753,0x885B,0x885D,0x8910,0x8907,0x8912,
-	0x8913,0x8915,0x890A,0x8ABC,0x8AD2,0x8AC7,0x8AC4,0x8A95,
-	0x8ACB,0x8AF8,0x8AB2,0x8AC9,0x8AC2,0x8ABF,
-	/* Range 0x6F21 - 0x6F7E, array index: 0x1266 */
-	0x8AB0,0x8AD6,0x8ACD,0x8AB6,0x8AB9,0x8ADB,0x8C4C,0x8C4E,
-	0x8C6C,0x8CE0,0x8CDE,0x8CE6,0x8CE4,0x8CEC,0x8CED,0x8CE2,
-	0x8CE3,0x8CDC,0x8CEA,0x8CE1,0x8D6D,0x8D9F,0x8DA3,0x8E2B,
-	0x8E10,0x8E1D,0x8E22,0x8E0F,0x8E29,0x8E1F,0x8E21,0x8E1E,
-	0x8EBA,0x8F1D,0x8F1B,0x8F1F,0x8F29,0x8F26,0x8F2A,0x8F1C,
-	0x8F1E,0x8F25,0x9069,0x906E,0x9068,0x906D,0x9077,0x9130,
-	0x912D,0x9127,0x9131,0x9187,0x9189,0x918B,0x9183,0x92C5,
-	0x92BB,0x92B7,0x92EA,0x92E4,0x92C1,0x92B3,0x92BC,0x92D2,
-	0x92C7,0x92F0,0x92B2,0x95AD,0x95B1,0x9704,0x9706,0x9707,
-	0x9709,0x9760,0x978D,0x978B,0x978F,0x9821,0x982B,0x981C,
-	0x98B3,0x990A,0x9913,0x9912,0x9918,0x99DD,0x99D0,0x99DF,
-	0x99DB,0x99D1,0x99D5,0x99D2,0x99D9,0x9AB7,
-	/* Range 0x7021 - 0x707E, array index: 0x12C4 */
-	0x9AEE,0x9AEF,0x9B27,0x9B45,0x9B44,0x9B77,0x9B6F,0x9D06,
-	0x9D09,0x9D03,0x9EA9,0x9EBE,0x9ECE,0x58A8,0x9F52,0x5112,
-	0x5118,0x5114,0x5110,0x5115,0x5180,0x51AA,0x51DD,0x5291,
-	0x5293,0x52F3,0x5659,0x566B,0x5679,0x5669,0x5664,0x5678,
-	0x566A,0x5668,0x5665,0x5671,0x566F,0x566C,0x5662,0x5676,
-	0x58C1,0x58BE,0x58C7,0x58C5,0x596E,0x5B1D,0x5B34,0x5B78,
-	0x5BF0,0x5C0E,0x5F4A,0x61B2,0x6191,0x61A9,0x618A,0x61CD,
-	0x61B6,0x61BE,0x61CA,0x61C8,0x6230,0x64C5,0x64C1,0x64CB,
-	0x64BB,0x64BC,0x64DA,0x64C4,0x64C7,0x64C2,0x64CD,0x64BF,
-	0x64D2,0x64D4,0x64BE,0x6574,0x66C6,0x66C9,0x66B9,0x66C4,
-	0x66C7,0x66B8,0x6A3D,0x6A38,0x6A3A,0x6A59,0x6A6B,0x6A58,
-	0x6A39,0x6A44,0x6A62,0x6A61,0x6A4B,0x6A47,
-	/* Range 0x7121 - 0x717E, array index: 0x1322 */
-	0x6A35,0x6A5F,0x6A48,0x6B59,0x6B77,0x6C05,0x6FC2,0x6FB1,
-	0x6FA1,0x6FC3,0x6FA4,0x6FC1,0x6FA7,0x6FB3,0x6FC0,0x6FB9,
-	0x6FB6,0x6FA6,0x6FA0,0x6FB4,0x71BE,0x71C9,0x71D0,0x71D2,
-	0x71C8,0x71D5,0x71B9,0x71CE,0x71D9,0x71DC,0x71C3,0x71C4,
-	0x7368,0x749C,0x74A3,0x7498,0x749F,0x749E,0x74E2,0x750C,
-	0x750D,0x7634,0x7638,0x763A,0x76E7,0x76E5,0x77A0,0x779E,
-	0x779F,0x77A5,0x78E8,0x78DA,0x78EC,0x78E7,0x79A6,0x7A4D,
-	0x7A4E,0x7A46,0x7A4C,0x7A4B,0x7ABA,0x7BD9,0x7C11,0x7BC9,
-	0x7BE4,0x7BDB,0x7BE1,0x7BE9,0x7BE6,0x7CD5,0x7CD6,0x7E0A,
-	0x7E11,0x7E08,0x7E1B,0x7E23,0x7E1E,0x7E1D,0x7E09,0x7E10,
-	0x7F79,0x7FB2,0x7FF0,0x7FF1,0x7FEE,0x8028,0x81B3,0x81A9,
-	0x81A8,0x81FB,0x8208,0x8258,0x8259,0x854A,
-	/* Range 0x7221 - 0x727E, array index: 0x1380 */
-	0x8559,0x8548,0x8568,0x8569,0x8543,0x8549,0x856D,0x856A,
-	0x855E,0x8783,0x879F,0x879E,0x87A2,0x878D,0x8861,0x892A,
-	0x8932,0x8925,0x892B,0x8921,0x89AA,0x89A6,0x8AE6,0x8AFA,
-	0x8AEB,0x8AF1,0x8B00,0x8ADC,0x8AE7,0x8AEE,0x8AFE,0x8B01,
-	0x8B02,0x8AF7,0x8AED,0x8AF3,0x8AF6,0x8AFC,0x8C6B,0x8C6D,
-	0x8C93,0x8CF4,0x8E44,0x8E31,0x8E34,0x8E42,0x8E39,0x8E35,
-	0x8F3B,0x8F2F,0x8F38,0x8F33,0x8FA8,0x8FA6,0x9075,0x9074,
-	0x9078,0x9072,0x907C,0x907A,0x9134,0x9192,0x9320,0x9336,
-	0x92F8,0x9333,0x932F,0x9322,0x92FC,0x932B,0x9304,0x931A,
-	0x9310,0x9326,0x9321,0x9315,0x932E,0x9319,0x95BB,0x96A7,
-	0x96A8,0x96AA,0x96D5,0x970E,0x9711,0x9716,0x970D,0x9713,
-	0x970F,0x975B,0x975C,0x9766,0x9798,0x9830,
-	/* Range 0x7321 - 0x737E, array index: 0x13DE */
-	0x9838,0x983B,0x9837,0x982D,0x9839,0x9824,0x9910,0x9928,
-	0x991E,0x991B,0x9921,0x991A,0x99ED,0x99E2,0x99F1,0x9AB8,
-	0x9ABC,0x9AFB,0x9AED,0x9B28,0x9B91,0x9D15,0x9D23,0x9D26,
-	0x9D28,0x9D12,0x9D1B,0x9ED8,0x9ED4,0x9F8D,0x9F9C,0x512A,
-	0x511F,0x5121,0x5132,0x52F5,0x568E,0x5680,0x5690,0x5685,
-	0x5687,0x568F,0x58D5,0x58D3,0x58D1,0x58CE,0x5B30,0x5B2A,
-	0x5B24,0x5B7A,0x5C37,0x5C68,0x5DBC,0x5DBA,0x5DBD,0x5DB8,
-	0x5E6B,0x5F4C,0x5FBD,0x61C9,0x61C2,0x61C7,0x61E6,0x61CB,
-	0x6232,0x6234,0x64CE,0x64CA,0x64D8,0x64E0,0x64F0,0x64E6,
-	0x64EC,0x64F1,0x64E2,0x64ED,0x6582,0x6583,0x66D9,0x66D6,
-	0x6A80,0x6A94,0x6A84,0x6AA2,0x6A9C,0x6ADB,0x6AA3,0x6A7E,
-	0x6A97,0x6A90,0x6AA0,0x6B5C,0x6BAE,0x6BDA,
-	/* Range 0x7421 - 0x747E, array index: 0x143C */
-	0x6C08,0x6FD8,0x6FF1,0x6FDF,0x6FE0,0x6FDB,0x6FE4,0x6FEB,
-	0x6FEF,0x6F80,0x6FEC,0x6FE1,0x6FE9,0x6FD5,0x6FEE,0x6FF0,
-	0x71E7,0x71DF,0x71EE,0x71E6,0x71E5,0x71ED,0x71EC,0x71F4,
-	0x71E0,0x7235,0x7246,0x7370,0x7372,0x74A9,0x74B0,0x74A6,
-	0x74A8,0x7646,0x7642,0x764C,0x76EA,0x77B3,0x77AA,0x77B0,
-	0x77AC,0x77A7,0x77AD,0x77EF,0x78F7,0x78FA,0x78F4,0x78EF,
-	0x7901,0x79A7,0x79AA,0x7A57,0x7ABF,0x7C07,0x7C0D,0x7BFE,
-	0x7BF7,0x7C0C,0x7BE0,0x7CE0,0x7CDC,0x7CDE,0x7CE2,0x7CDF,
-	0x7CD9,0x7CDD,0x7E2E,0x7E3E,0x7E46,0x7E37,0x7E32,0x7E43,
-	0x7E2B,0x7E3D,0x7E31,0x7E45,0x7E41,0x7E34,0x7E39,0x7E48,
-	0x7E35,0x7E3F,0x7E2F,0x7F44,0x7FF3,0x7FFC,0x8071,0x8072,
-	0x8070,0x806F,0x8073,0x81C6,0x81C3,0x81BA,
-	/* Range 0x7521 - 0x757E, array index: 0x149A */
-	0x81C2,0x81C0,0x81BF,0x81BD,0x81C9,0x81BE,0x81E8,0x8209,
-	0x8271,0x85AA,0x8584,0x857E,0x859C,0x8591,0x8594,0x85AF,
-	0x859B,0x8587,0x85A8,0x858A,0x85A6,0x8667,0x87C0,0x87D1,
-	0x87B3,0x87D2,0x87C6,0x87AB,0x87BB,0x87BA,0x87C8,0x87CB,
-	0x893B,0x8936,0x8944,0x8938,0x893D,0x89AC,0x8B0E,0x8B17,
-	0x8B19,0x8B1B,0x8B0A,0x8B20,0x8B1D,0x8B04,0x8B10,0x8C41,
-	0x8C3F,0x8C73,0x8CFA,0x8CFD,0x8CFC,0x8CF8,0x8CFB,0x8DA8,
-	0x8E49,0x8E4B,0x8E48,0x8E4A,0x8F44,0x8F3E,0x8F42,0x8F45,
-	0x8F3F,0x907F,0x907D,0x9084,0x9081,0x9082,0x9080,0x9139,
-	0x91A3,0x919E,0x919C,0x934D,0x9382,0x9328,0x9375,0x934A,
-	0x9365,0x934B,0x9318,0x937E,0x936C,0x935B,0x9370,0x935A,
-	0x9354,0x95CA,0x95CB,0x95CC,0x95C8,0x95C6,
-	/* Range 0x7621 - 0x767E, array index: 0x14F8 */
-	0x96B1,0x96B8,0x96D6,0x971C,0x971E,0x97A0,0x97D3,0x9846,
-	0x98B6,0x9935,0x9A01,0x99FF,0x9BAE,0x9BAB,0x9BAA,0x9BAD,
-	0x9D3B,0x9D3F,0x9E8B,0x9ECF,0x9EDE,0x9EDC,0x9EDD,0x9EDB,
-	0x9F3E,0x9F4B,0x53E2,0x5695,0x56AE,0x58D9,0x58D8,0x5B38,
-	0x5F5E,0x61E3,0x6233,0x64F4,0x64F2,0x64FE,0x6506,0x64FA,
-	0x64FB,0x64F7,0x65B7,0x66DC,0x6726,0x6AB3,0x6AAC,0x6AC3,
-	0x6ABB,0x6AB8,0x6AC2,0x6AAE,0x6AAF,0x6B5F,0x6B78,0x6BAF,
-	0x7009,0x700B,0x6FFE,0x7006,0x6FFA,0x7011,0x700F,0x71FB,
-	0x71FC,0x71FE,0x71F8,0x7377,0x7375,0x74A7,0x74BF,0x7515,
-	0x7656,0x7658,0x7652,0x77BD,0x77BF,0x77BB,0x77BC,0x790E,
-	0x79AE,0x7A61,0x7A62,0x7A60,0x7AC4,0x7AC5,0x7C2B,0x7C27,
-	0x7C2A,0x7C1E,0x7C23,0x7C21,0x7CE7,0x7E54,
-	/* Range 0x7721 - 0x777E, array index: 0x1556 */
-	0x7E55,0x7E5E,0x7E5A,0x7E61,0x7E52,0x7E59,0x7F48,0x7FF9,
-	0x7FFB,0x8077,0x8076,0x81CD,0x81CF,0x820A,0x85CF,0x85A9,
-	0x85CD,0x85D0,0x85C9,0x85B0,0x85BA,0x85B9,0x87EF,0x87EC,
-	0x87F2,0x87E0,0x8986,0x89B2,0x89F4,0x8B28,0x8B39,0x8B2C,
-	0x8B2B,0x8C50,0x8D05,0x8E59,0x8E63,0x8E66,0x8E64,0x8E5F,
-	0x8E55,0x8EC0,0x8F49,0x8F4D,0x9087,0x9083,0x9088,0x91AB,
-	0x91AC,0x91D0,0x9394,0x938A,0x9396,0x93A2,0x93B3,0x93AE,
-	0x93AC,0x93B0,0x9398,0x939A,0x9397,0x95D4,0x95D6,0x95D0,
-	0x95D5,0x96E2,0x96DC,0x96D9,0x96DB,0x96DE,0x9724,0x97A3,
-	0x97A6,0x97AD,0x97F9,0x984D,0x984F,0x984C,0x984E,0x9853,
-	0x98BA,0x993E,0x993F,0x993D,0x992E,0x99A5,0x9A0E,0x9AC1,
-	0x9B03,0x9B06,0x9B4F,0x9B4E,0x9B4D,0x9BCA,
-	/* Range 0x7821 - 0x787E, array index: 0x15B4 */
-	0x9BC9,0x9BFD,0x9BC8,0x9BC0,0x9D51,0x9D5D,0x9D60,0x9EE0,
-	0x9F15,0x9F2C,0x5133,0x56A5,0x56A8,0x58DE,0x58DF,0x58E2,
-	0x5BF5,0x9F90,0x5EEC,0x61F2,0x61F7,0x61F6,0x61F5,0x6500,
-	0x650F,0x66E0,0x66DD,0x6AE5,0x6ADD,0x6ADA,0x6AD3,0x701B,
-	0x701F,0x7028,0x701A,0x701D,0x7015,0x7018,0x7206,0x720D,
-	0x7258,0x72A2,0x7378,0x737A,0x74BD,0x74CA,0x74E3,0x7587,
-	0x7586,0x765F,0x7661,0x77C7,0x7919,0x79B1,0x7A6B,0x7A69,
-	0x7C3E,0x7C3F,0x7C38,0x7C3D,0x7C37,0x7C40,0x7E6B,0x7E6D,
-	0x7E79,0x7E69,0x7E6A,0x7E73,0x7F85,0x7FB6,0x7FB9,0x7FB8,
-	0x81D8,0x85E9,0x85DD,0x85EA,0x85D5,0x85E4,0x85E5,0x85F7,
-	0x87FB,0x8805,0x880D,0x87F9,0x87FE,0x8960,0x895F,0x8956,
-	0x895E,0x8B41,0x8B5C,0x8B58,0x8B49,0x8B5A,
-	/* Range 0x7921 - 0x797E, array index: 0x1612 */
-	0x8B4E,0x8B4F,0x8B46,0x8B59,0x8D08,0x8D0A,0x8E7C,0x8E72,
-	0x8E87,0x8E76,0x8E6C,0x8E7A,0x8E74,0x8F54,0x8F4E,0x8FAD,
-	0x908A,0x908B,0x91B1,0x91AE,0x93E1,0x93D1,0x93DF,0x93C3,
-	0x93C8,0x93DC,0x93DD,0x93D6,0x93E2,0x93CD,0x93D8,0x93E4,
-	0x93D7,0x93E8,0x95DC,0x96B4,0x96E3,0x972A,0x9727,0x9761,
-	0x97DC,0x97FB,0x985E,0x9858,0x985B,0x98BC,0x9945,0x9949,
-	0x9A16,0x9A19,0x9B0D,0x9BE8,0x9BE7,0x9BD6,0x9BDB,0x9D89,
-	0x9D61,0x9D72,0x9D6A,0x9D6C,0x9E92,0x9E97,0x9E93,0x9EB4,
-	0x52F8,0x56B7,0x56B6,0x56B4,0x56BC,0x58E4,0x5B40,0x5B43,
-	0x5B7D,0x5BF6,0x5DC9,0x61F8,0x61FA,0x6518,0x6514,0x6519,
-	0x66E6,0x6727,0x6AEC,0x703E,0x7030,0x7032,0x7210,0x737B,
-	0x74CF,0x7662,0x7665,0x7926,0x792A,0x792C,
-	/* Range 0x7A21 - 0x7A7E, array index: 0x1670 */
-	0x792B,0x7AC7,0x7AF6,0x7C4C,0x7C43,0x7C4D,0x7CEF,0x7CF0,
-	0x8FAE,0x7E7D,0x7E7C,0x7E82,0x7F4C,0x8000,0x81DA,0x8266,
-	0x85FB,0x85F9,0x8611,0x85FA,0x8606,0x860B,0x8607,0x860A,
-	0x8814,0x8815,0x8964,0x89BA,0x89F8,0x8B70,0x8B6C,0x8B66,
-	0x8B6F,0x8B5F,0x8B6B,0x8D0F,0x8D0D,0x8E89,0x8E81,0x8E85,
-	0x8E82,0x91B4,0x91CB,0x9418,0x9403,0x93FD,0x95E1,0x9730,
-	0x98C4,0x9952,0x9951,0x99A8,0x9A2B,0x9A30,0x9A37,0x9A35,
-	0x9C13,0x9C0D,0x9E79,0x9EB5,0x9EE8,0x9F2F,0x9F5F,0x9F63,
-	0x9F61,0x5137,0x5138,0x56C1,0x56C0,0x56C2,0x5914,0x5C6C,
-	0x5DCD,0x61FC,0x61FE,0x651D,0x651C,0x6595,0x66E9,0x6AFB,
-	0x6B04,0x6AFA,0x6BB2,0x704C,0x721B,0x72A7,0x74D6,0x74D4,
-	0x7669,0x77D3,0x7C50,0x7E8F,0x7E8C,0x7FBC,
-	/* Range 0x7B21 - 0x7B7E, array index: 0x16CE */
-	0x8617,0x862D,0x861A,0x8823,0x8822,0x8821,0x881F,0x896A,
-	0x896C,0x89BD,0x8B74,0x8B77,0x8B7D,0x8D13,0x8E8A,0x8E8D,
-	0x8E8B,0x8F5F,0x8FAF,0x91BA,0x942E,0x9433,0x9435,0x943A,
-	0x9438,0x9432,0x942B,0x95E2,0x9738,0x9739,0x9732,0x97FF,
-	0x9867,0x9865,0x9957,0x9A45,0x9A43,0x9A40,0x9A3E,0x9ACF,
-	0x9B54,0x9B51,0x9C2D,0x9C25,0x9DAF,0x9DB4,0x9DC2,0x9DB8,
-	0x9E9D,0x9EEF,0x9F19,0x9F5C,0x9F66,0x9F67,0x513C,0x513B,
-	0x56C8,0x56CA,0x56C9,0x5B7F,0x5DD4,0x5DD2,0x5F4E,0x61FF,
-	0x6524,0x6B0A,0x6B61,0x7051,0x7058,0x7380,0x74E4,0x758A,
-	0x766E,0x766C,0x79B3,0x7C60,0x7C5F,0x807E,0x807D,0x81DF,
-	0x8972,0x896F,0x89FC,0x8B80,0x8D16,0x8D17,0x8E91,0x8E93,
-	0x8F61,0x9148,0x9444,0x9451,0x9452,0x973D,
-	/* Range 0x7C21 - 0x7C7E, array index: 0x172C */
-	0x973E,0x97C3,0x97C1,0x986B,0x9955,0x9A55,0x9A4D,0x9AD2,
-	0x9B1A,0x9C49,0x9C31,0x9C3E,0x9C3B,0x9DD3,0x9DD7,0x9F34,
-	0x9F6C,0x9F6A,0x9F94,0x56CC,0x5DD6,0x6200,0x6523,0x652B,
-	0x652A,0x66EC,0x6B10,0x74DA,0x7ACA,0x7C64,0x7C63,0x7C65,
-	0x7E93,0x7E96,0x7E94,0x81E2,0x8638,0x863F,0x8831,0x8B8A,
-	0x9090,0x908F,0x9463,0x9460,0x9464,0x9768,0x986F,0x995C,
-	0x9A5A,0x9A5B,0x9A57,0x9AD3,0x9AD4,0x9AD1,0x9C54,0x9C57,
-	0x9C56,0x9DE5,0x9E9F,0x9EF4,0x56D1,0x58E9,0x652C,0x705E,
-	0x7671,0x7672,0x77D7,0x7F50,0x7F88,0x8836,0x8839,0x8862,
-	0x8B93,0x8B92,0x8B96,0x8277,0x8D1B,0x91C0,0x946A,0x9742,
-	0x9748,0x9744,0x97C6,0x9870,0x9A5F,0x9B22,0x9B58,0x9C5F,
-	0x9DF9,0x9DFA,0x9E7C,0x9E7D,0x9F07,0x9F77,
-	/* Range 0x7D21 - 0x7D4B, array index: 0x178A */
-	0x9F72,0x5EF3,0x6B16,0x7063,0x7C6C,0x7C6E,0x883B,0x89C0,
-	0x8EA1,0x91C1,0x9472,0x9470,0x9871,0x995E,0x9AD6,0x9B23,
-	0x9ECC,0x7064,0x77DA,0x8B9A,0x9477,0x97C9,0x9A62,0x9A65,
-	0x7E9C,0x8B9C,0x8EAA,0x91C5,0x947D,0x947E,0x947C,0x9C77,
-	0x9C78,0x9EF7,0x8C54,0x947F,0x9E1A,0x7228,0x9A6A,0x9B31,
-	0x9E1B,0x9E1E,0x7C72,
-	/* Unranged codes (66 codes) */
-};
-
-#endif /* ICONV_TO_UCS_CCS_CNS11643_PLANE1 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> cns11643_plane1 speed-optimized table (50176 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_speed_cns11643_plane1[] =
-{
-	/* Heading Block */
-	0x0100,INVBLK,0x0200,0x0300,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	0x0400,0x0500,0x0600,INVBLK,0x0700,0x0800,0x0900,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	0x0A00,0x0B00,0x0C00,0x0D00,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,0x0E00,0x0F00,
-	0x1000,0x1100,0x1200,0x1300,0x1400,0x1500,0x1600,0x1700,
-	0x1800,0x1900,0x1A00,0x1B00,0x1C00,0x1D00,0x1E00,0x1F00,
-	0x2000,0x2100,0x2200,0x2300,0x2400,0x2500,0x2600,0x2700,
-	0x2800,0x2900,0x2A00,0x2B00,0x2C00,0x2D00,0x2E00,0x2F00,
-	0x3000,0x3100,0x3200,0x3300,0x3400,0x3500,0x3600,0x3700,
-	0x3800,0x3900,0x3A00,0x3B00,0x3C00,0x3D00,0x3E00,0x3F00,
-	0x4000,0x4100,0x4200,0x4300,0x4400,0x4500,0x4600,0x4700,
-	0x4800,0x4900,0x4A00,0x4B00,0x4C00,0x4D00,0x4E00,0x4F00,
-	0x5000,0x5100,0x5200,0x5300,0x5400,0x5500,0x5600,0x5700,
-	0x5800,0x5900,0x5A00,0x5B00,0x5C00,0x5D00,0x5E00,0x5F00,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,0x6000,0x6100,
-	/* Block 1, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2170,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2278,0x2234,INVALC,INVALC,INVALC,INVALC,INVALC,0x2131,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2232,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2233,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 3, Array index 0x0200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x256F,
-	INVALC,0x256D,0x256E,0x2570,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x256C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 4, Array index 0x0300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2475,0x2476,0x2477,0x2478,0x2479,0x247A,0x247B,
-	0x247C,0x247D,0x247E,0x2521,0x2522,0x2523,0x2524,0x2525,
-	0x2526,0x2527,INVALC,0x2528,0x2529,0x252A,0x252B,0x252C,
-	0x252D,0x252E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x252F,0x2530,0x2531,0x2532,0x2533,0x2534,0x2535,
-	0x2536,0x2537,0x2538,0x2539,0x253A,0x253B,0x253C,0x253D,
-	0x253E,0x253F,INVALC,0x2540,0x2541,0x2542,0x2543,0x2544,
-	0x2545,0x2546,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 33, Array index 0x0400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2139,0x2137,INVALC,0x225D,INVALC,
-	0x2164,0x2165,INVALC,INVALC,0x2166,0x2167,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x212D,0x212C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x216A,INVALC,INVALC,0x216B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x216F,INVALC,INVALC,0x2223,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 34, Array index 0x0500 */
-	INVALC,INVALC,INVALC,0x226A,INVALC,0x2222,INVALC,INVALC,
-	INVALC,0x226B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x242B,0x242C,0x242D,0x242E,0x242F,0x2430,0x2431,0x2432,
-	0x2433,0x2434,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2635,0x2636,0x2637,0x2638,0x2639,0x263A,0x263B,0x263C,
-	0x263D,0x263E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2258,0x2255,0x2257,0x2256,INVALC,INVALC,0x2259,0x225A,
-	0x225C,0x225B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 35, Array index 0x0600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2261,INVALC,INVALC,
-	INVALC,INVALC,0x2235,INVALC,INVALC,INVALC,0x223C,0x2249,
-	0x2248,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2245,0x2246,0x224D,INVALC,INVALC,0x224E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2250,0x224F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2244,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x223D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x223B,0x223E,INVALC,INVALC,INVALC,INVALC,0x2239,0x223A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2247,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x224A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 37, Array index 0x0700 */
-	0x4221,0x4222,0x4223,0x4224,0x4225,0x4226,0x4227,0x4228,
-	0x4229,0x422A,0x422B,0x422C,0x422D,0x422E,0x422F,0x4230,
-	0x4231,0x4232,0x4233,0x4234,0x4235,0x4236,0x4237,0x4238,
-	0x4239,0x423A,0x423B,0x423C,0x423D,0x423E,0x423F,0x4240,
-	INVALC,0x4241,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2621,0x2622,0x2623,0x2624,0x2625,0x2626,0x2627,0x2628,
-	0x2629,0x262A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x262B,0x262C,0x262D,0x262E,
-	0x262F,0x2630,0x2631,0x2632,0x2633,0x2634,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 38, Array index 0x0800 */
-	0x2339,INVALC,0x233A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x233C,INVALC,INVALC,INVALC,
-	0x233D,INVALC,INVALC,INVALC,0x233E,INVALC,INVALC,INVALC,
-	0x233F,INVALC,INVALC,INVALC,0x2337,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2336,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2335,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2334,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2333,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2344,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2345,INVALC,
-	INVALC,0x2347,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2346,INVALC,INVALC,0x2340,0x2341,0x2343,
-	0x2342,0x234C,0x234D,0x234E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2324,0x2325,0x2326,0x2327,0x2328,0x2329,0x232A,
-	0x232B,0x2332,0x2331,0x2330,0x232F,0x232E,0x232D,0x232C,
-	INVALC,INVALC,INVALC,INVALC,0x2338,0x233B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x217C,0x217B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2175,0x2174,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x217E,0x217D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x217A,0x2179,
-	INVALC,INVALC,INVALC,0x2172,INVALC,INVALC,0x2176,0x2173,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2348,0x2349,0x234B,0x234A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 39, Array index 0x0900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2178,0x2177,INVALC,
-	INVALC,0x2254,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2251,0x2253,0x2252,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 49, Array index 0x0A00 */
-	0x2121,0x2123,0x2124,0x2171,INVALC,INVALC,INVALC,INVALC,
-	0x2152,0x2153,0x214E,0x214F,0x2156,0x2157,0x215A,0x215B,
-	0x214A,0x214B,0x2265,INVALC,0x2146,0x2147,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2168,0x2169,INVALC,
-	INVALC,0x2435,0x2436,0x2437,0x2438,0x2439,0x243A,0x243B,
-	0x243C,0x243D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2126,INVALC,INVALC,INVALC,INVALC,
-	/* Block 50, Array index 0x0B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2547,0x2548,0x2549,
-	0x254A,0x254B,0x254C,0x254D,0x254E,0x254F,0x2550,0x2551,
-	0x2552,0x2553,0x2554,0x2555,0x2556,0x2557,0x2558,0x2559,
-	0x255A,0x255B,0x255C,0x255D,0x255E,0x255F,0x2560,0x2561,
-	0x2562,0x2563,0x2564,0x2565,0x2566,0x2567,0x2568,0x2569,
-	0x256A,0x256B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 51, Array index 0x0C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2221,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 52, Array index 0x0D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2275,0x2276,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2270,0x2271,0x2272,INVALC,
-	INVALC,0x2274,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2277,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2273,INVALC,
-	INVALC,0x224C,0x224B,INVALC,INVALC,0x226F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 79, Array index 0x0E00 */
-	0x4421,0x4423,INVALC,0x4424,INVALC,INVALC,INVALC,INVALC,
-	0x4437,0x4435,0x4438,0x4436,INVALC,0x4462,INVALC,INVALC,
-	0x4461,0x4460,INVALC,INVALC,0x4562,0x4561,0x4560,INVALC,
-	0x4563,0x455F,INVALC,INVALC,INVALC,INVALC,0x4722,0x4723,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B64,INVALC,
-	INVALC,INVALC,INVALC,0x4439,INVALC,0x4463,INVALC,INVALC,
-	0x4464,INVALC,0x486B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x443A,0x4465,INVALC,0x4564,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4425,INVALC,0x443C,INVALC,INVALC,
-	0x443D,INVALC,INVALC,0x4466,INVALC,0x4565,0x4567,0x4566,
-	INVALC,INVALC,0x4724,0x4725,INVALC,INVALC,0x4B65,INVALC,
-	0x537D,0x4422,INVALC,INVALC,INVALC,0x4426,0x443F,0x443E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4726,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4B66,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5871,INVALC,
-	INVALC,INVALC,0x632A,INVALC,INVALC,INVALC,0x4427,INVALC,
-	0x4468,INVALC,INVALC,0x4B67,0x4428,INVALC,0x4440,INVALC,
-	INVALC,0x4469,0x446B,INVALC,0x446C,0x446A,INVALC,INVALC,
-	INVALC,0x4727,INVALC,0x4B68,INVALC,INVALC,0x4B69,0x4F67,
-	INVALC,0x4441,0x446D,INVALC,0x4728,0x472A,0x4729,INVALC,
-	0x486C,INVALC,INVALC,0x4B6A,0x4B6B,0x4F68,0x4F69,INVALC,
-	INVALC,INVALC,INVALC,0x537E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4429,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x446F,0x446E,INVALC,0x4470,0x4476,INVALC,0x4471,0x4472,
-	INVALC,INVALC,0x4474,0x4475,INVALC,0x4473,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x456A,0x456B,0x456C,0x456D,
-	0x4569,0x4570,INVALC,INVALC,INVALC,INVALC,0x4571,0x4623,
-	INVALC,INVALC,INVALC,0x456E,0x456F,0x4568,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4737,INVALC,0x4734,0x4738,INVALC,INVALC,0x4735,INVALC,
-	INVALC,INVALC,INVALC,0x4736,INVALC,0x4739,INVALC,0x472B,
-	/* Block 80, Array index 0x0F00 */
-	INVALC,0x473A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x472C,0x472E,0x473B,INVALC,0x4730,INVALC,0x4733,
-	0x4731,0x4732,INVALC,INVALC,INVALC,0x472F,INVALC,INVALC,
-	INVALC,0x472D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4924,
-	0x4875,INVALC,INVALC,INVALC,0x4872,INVALC,0x4926,INVALC,
-	0x487A,INVALC,0x4879,INVALC,0x487D,0x4878,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x487B,INVALC,INVALC,0x487E,0x486F,
-	0x4929,INVALC,INVALC,INVALC,INVALC,0x486D,0x4925,0x486E,
-	0x4876,0x4877,INVALC,INVALC,0x487C,0x4874,INVALC,0x4870,
-	INVALC,0x4927,0x492A,0x4873,0x4922,0x4928,0x4871,INVALC,
-	0x4923,INVALC,INVALC,0x4921,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4B79,INVALC,INVALC,0x4B71,INVALC,INVALC,0x4B6C,
-	0x4B76,INVALC,INVALC,0x4B6F,INVALC,0x4B77,INVALC,INVALC,
-	INVALC,INVALC,0x4C21,0x4B7A,INVALC,INVALC,0x4B7C,0x4B70,
-	INVALC,INVALC,INVALC,0x4B75,INVALC,INVALC,0x4B74,INVALC,
-	0x4B78,INVALC,INVALC,0x4B73,INVALC,0x4B6E,INVALC,0x4B7D,
-	INVALC,0x4B7E,INVALC,INVALC,INVALC,INVALC,0x4B7B,INVALC,
-	INVALC,INVALC,INVALC,0x4B72,INVALC,0x4B6D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F78,0x4F6C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4F6B,0x4F73,0x5021,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F6D,
-	INVALC,INVALC,0x4F7B,0x4F72,0x4F7A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F76,INVALC,INVALC,INVALC,0x4F7D,0x4F70,
-	0x4F79,0x4F6F,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F77,
-	0x4F74,INVALC,0x4F7C,INVALC,INVALC,0x4F71,0x4F7E,0x4F75,
-	0x4F6E,0x4F6A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x543A,0x5424,
-	INVALC,0x5434,INVALC,0x5439,INVALC,INVALC,INVALC,INVALC,
-	0x5427,INVALC,0x5430,INVALC,INVALC,INVALC,0x543D,INVALC,
-	/* Block 81, Array index 0x1000 */
-	0x5431,INVALC,INVALC,INVALC,INVALC,INVALC,0x542A,INVALC,
-	INVALC,0x543F,INVALC,0x5436,0x5421,0x5422,INVALC,0x5924,
-	INVALC,0x542F,0x542E,INVALC,0x5432,INVALC,0x5429,INVALC,
-	0x5438,0x5437,0x542D,INVALC,INVALC,INVALC,INVALC,0x542C,
-	INVALC,0x5435,INVALC,0x5423,INVALC,0x5426,0x5425,INVALC,
-	0x5433,0x5428,0x543C,0x543E,INVALC,0x543B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x542B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5876,INVALC,INVALC,INVALC,0x5875,
-	INVALC,0x5879,INVALC,INVALC,0x5877,INVALC,0x587C,0x5923,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x587D,INVALC,INVALC,
-	INVALC,INVALC,0x5878,INVALC,0x5874,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x587A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5926,INVALC,0x5925,
-	INVALC,INVALC,INVALC,INVALC,0x5921,0x587E,0x587B,0x5922,
-	INVALC,INVALC,0x5872,INVALC,INVALC,0x5873,INVALC,INVALC,
-	0x5E2E,INVALC,INVALC,INVALC,INVALC,0x5E2B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E2A,INVALC,INVALC,
-	INVALC,0x5E2D,INVALC,INVALC,INVALC,INVALC,0x5E2F,INVALC,
-	0x5E30,0x5E2C,0x5E31,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5E29,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6331,0x632B,INVALC,0x6334,
-	INVALC,INVALC,0x632D,0x632E,INVALC,0x632C,INVALC,0x6332,
-	INVALC,INVALC,INVALC,0x6333,INVALC,INVALC,0x6330,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x632F,INVALC,0x6335,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x677C,0x6779,
-	INVALC,0x677A,INVALC,INVALC,INVALC,0x6778,0x6775,INVALC,
-	INVALC,INVALC,0x6777,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6774,INVALC,0x6772,
-	INVALC,0x677D,INVALC,INVALC,INVALC,0x6776,0x6773,INVALC,
-	INVALC,0x677B,INVALC,INVALC,INVALC,0x6C23,INVALC,INVALC,
-	INVALC,0x6C24,INVALC,0x6C22,INVALC,INVALC,INVALC,INVALC,
-	/* Block 82, Array index 0x1100 */
-	0x6C21,INVALC,0x6C25,INVALC,0x6B7E,0x6C28,INVALC,INVALC,
-	0x6C26,0x6C27,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7033,INVALC,0x7030,INVALC,0x7032,0x7034,INVALC,INVALC,
-	0x7031,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7341,
-	INVALC,0x7342,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7340,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7343,0x782B,INVALC,INVALC,INVALC,0x7A62,
-	0x7A63,INVALC,INVALC,0x7B58,0x7B57,INVALC,INVALC,0x442A,
-	0x4442,0x4478,INVALC,0x4477,0x4573,0x4572,0x473E,0x473D,
-	0x473F,0x473C,INVALC,0x492C,0x492B,0x492D,INVALC,INVALC,
-	INVALC,INVALC,0x4C23,INVALC,0x4C22,0x4C24,INVALC,0x5022,
-	INVALC,0x2279,INVALC,0x227A,0x5927,0x227C,0x227B,INVALC,
-	INVALC,0x227D,0x677E,0x227E,INVALC,0x442B,INVALC,0x4479,
-	0x4740,0x4C25,INVALC,0x442C,0x447C,0x447A,0x447B,INVALC,
-	INVALC,0x4741,INVALC,INVALC,INVALC,0x492E,0x4C27,0x4C26,
-	0x4C28,INVALC,INVALC,INVALC,0x5440,INVALC,INVALC,INVALC,
-	0x7035,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4574,0x4575,INVALC,INVALC,0x4742,INVALC,INVALC,
-	INVALC,0x5024,0x5023,INVALC,INVALC,0x5928,INVALC,0x447D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5025,INVALC,0x5443,INVALC,0x5441,0x5442,INVALC,INVALC,
-	INVALC,INVALC,0x7036,INVALC,0x4576,INVALC,INVALC,INVALC,
-	0x4743,INVALC,INVALC,INVALC,INVALC,INVALC,0x492F,0x4930,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4C29,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5446,INVALC,
-	INVALC,INVALC,INVALC,0x5447,0x5445,0x5444,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6C29,0x7037,INVALC,INVALC,
-	0x442D,0x443B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5929,0x5E33,INVALC,0x6821,INVALC,INVALC,0x447E,INVALC,
-	0x4579,0x4577,0x4578,INVALC,INVALC,0x4C2A,INVALC,INVALC,
-	/* Block 83, Array index 0x1200 */
-	0x442E,0x442F,INVALC,0x4443,INVALC,INVALC,0x4521,0x4522,
-	0x4523,INVALC,0x457A,INVALC,INVALC,INVALC,0x4747,INVALC,
-	INVALC,0x4745,0x4746,INVALC,INVALC,INVALC,0x4748,0x4744,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4F4F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4932,0x4931,INVALC,INVALC,
-	0x4935,0x4933,0x4934,INVALC,INVALC,INVALC,0x4C30,INVALC,
-	0x4C2F,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C31,0x4C2D,
-	0x4C2C,INVALC,0x4C2E,0x4C2B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C32,INVALC,0x5027,INVALC,INVALC,INVALC,0x502C,
-	INVALC,INVALC,0x5028,0x502B,0x502A,0x5029,0x5026,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x544A,INVALC,0x5448,INVALC,
-	INVALC,INVALC,INVALC,0x544B,0x5449,0x544C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5E37,0x592A,INVALC,INVALC,INVALC,INVALC,0x592B,
-	INVALC,INVALC,0x5E34,INVALC,0x5E35,0x5E36,INVALC,0x6337,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6338,INVALC,0x6336,
-	INVALC,INVALC,0x6823,0x6822,INVALC,INVALC,INVALC,0x6C2A,
-	0x6C2B,0x6C2C,0x6C2E,INVALC,INVALC,0x6C2D,INVALC,INVALC,
-	INVALC,0x7038,INVALC,0x7039,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4430,INVALC,INVALC,INVALC,0x457C,
-	0x457B,INVALC,INVALC,0x4749,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4937,0x4938,0x4936,0x4939,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4C34,INVALC,INVALC,0x4C33,INVALC,
-	INVALC,0x5030,INVALC,0x502F,INVALC,INVALC,INVALC,0x502D,
-	INVALC,0x502E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x592C,INVALC,INVALC,0x592F,INVALC,0x5B2B,
-	0x592E,0x592D,INVALC,0x5E3A,INVALC,0x5E39,0x5E38,0x6339,
-	INVALC,INVALC,0x633C,0x633D,0x633B,INVALC,0x633A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6C2F,INVALC,INVALC,0x703A,INVALC,0x7344,INVALC,INVALC,
-	0x7961,INVALC,0x4444,0x4524,INVALC,INVALC,0x4525,0x4526,
-	/* Block 84, Array index 0x1300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x457D,0x457E,INVALC,
-	0x474A,INVALC,INVALC,INVALC,INVALC,0x5031,INVALC,0x5931,
-	0x5930,INVALC,INVALC,INVALC,INVALC,0x4431,0x4527,0x4621,
-	INVALC,0x5932,INVALC,INVALC,INVALC,0x4622,INVALC,INVALC,
-	0x474C,0x474B,INVALC,0x493A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x544D,INVALC,INVALC,INVALC,INVALC,0x633E,
-	INVALC,0x6824,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4528,INVALC,INVALC,INVALC,INVALC,0x5935,0x5933,
-	0x5934,0x4432,INVALC,0x4445,0x243F,0x452B,INVALC,0x452A,
-	0x4529,0x4625,0x4624,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C38,0x4C35,0x4C37,0x4C36,INVALC,INVALC,0x5032,
-	INVALC,INVALC,0x5E3B,INVALC,0x4433,INVALC,0x452C,INVALC,
-	0x4627,0x4626,INVALC,INVALC,INVALC,INVALC,0x4C39,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4629,0x4628,
-	0x474D,0x474E,INVALC,0x493B,INVALC,0x493C,INVALC,0x4C3A,
-	0x4C3B,0x4C3C,INVALC,0x5033,INVALC,INVALC,INVALC,0x544E,
-	INVALC,INVALC,INVALC,INVALC,0x452D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5034,INVALC,INVALC,0x5450,INVALC,0x544F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E3C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6825,INVALC,INVALC,
-	INVALC,INVALC,0x6C30,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x462A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5936,INVALC,INVALC,INVALC,INVALC,
-	0x4434,0x4446,0x452F,0x452E,INVALC,0x4530,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4C3E,INVALC,0x4C3D,0x4C3F,
-	INVALC,INVALC,INVALC,0x5035,INVALC,INVALC,INVALC,0x5451,
-	INVALC,INVALC,0x763B,0x4447,0x462C,0x463B,0x4636,INVALC,
-	0x4631,0x4630,0x4637,0x4635,0x462E,0x463C,0x462F,0x462B,
-	0x463A,0x4639,0x4638,0x462D,INVALC,0x4634,INVALC,INVALC,
-	0x4633,INVALC,INVALC,0x463D,0x4632,INVALC,INVALC,INVALC,
-	/* Block 85, Array index 0x1400 */
-	INVALC,0x4754,INVALC,0x475A,0x4756,INVALC,0x475C,INVALC,
-	0x4759,0x474F,0x4752,0x4755,0x4751,0x4758,0x475B,0x4750,
-	0x4753,0x4757,0x475D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4949,INVALC,0x493D,0x493F,0x4957,
-	0x4952,INVALC,INVALC,INVALC,INVALC,INVALC,0x4941,0x4943,
-	INVALC,0x494A,INVALC,0x4956,0x4958,0x493E,0x494F,INVALC,
-	INVALC,0x4955,INVALC,0x4946,INVALC,0x4950,0x4951,INVALC,
-	0x494E,0x494C,INVALC,0x494D,0x4953,INVALC,0x4940,INVALC,
-	0x4954,INVALC,0x4948,0x4945,INVALC,INVALC,0x4944,INVALC,
-	0x4947,INVALC,0x494B,INVALC,INVALC,INVALC,0x4942,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C51,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C52,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C4D,INVALC,0x4C40,INVALC,0x4C41,0x4C4E,0x4C47,
-	0x4C43,INVALC,INVALC,0x4C46,0x4C4B,0x4C54,INVALC,INVALC,
-	0x4C45,INVALC,INVALC,INVALC,0x4C48,INVALC,0x4C4A,INVALC,
-	INVALC,INVALC,INVALC,0x4C53,0x4C4F,INVALC,0x4C55,INVALC,
-	0x4C4C,INVALC,0x4C49,INVALC,INVALC,0x4C44,0x4C42,INVALC,
-	INVALC,INVALC,0x4C50,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x503C,0x504A,
-	0x5038,0x5049,0x5041,0x5046,0x5036,INVALC,INVALC,0x5045,
-	INVALC,0x5047,INVALC,0x503D,INVALC,INVALC,INVALC,INVALC,
-	0x503B,INVALC,INVALC,0x5048,INVALC,0x5040,INVALC,0x504B,
-	0x5037,0x5042,0x503F,INVALC,0x5043,INVALC,INVALC,0x503E,
-	0x5044,0x503A,INVALC,INVALC,INVALC,INVALC,0x5039,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x545E,INVALC,INVALC,INVALC,0x5457,0x5462,INVALC,
-	0x5452,0x545C,0x5461,INVALC,INVALC,0x545D,0x5460,INVALC,
-	INVALC,INVALC,0x5458,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x545A,INVALC,0x5456,0x5465,INVALC,INVALC,
-	/* Block 86, Array index 0x1500 */
-	INVALC,0x5454,INVALC,INVALC,INVALC,INVALC,0x5459,0x5464,
-	INVALC,0x545F,INVALC,INVALC,INVALC,INVALC,INVALC,0x5466,
-	0x5453,INVALC,INVALC,INVALC,0x545B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5463,
-	INVALC,INVALC,INVALC,INVALC,0x5949,INVALC,0x5947,0x5944,
-	INVALC,0x5940,INVALC,0x594B,INVALC,INVALC,INVALC,0x5455,
-	0x5946,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E4E,INVALC,
-	INVALC,0x594C,INVALC,0x593E,0x593B,INVALC,0x5938,INVALC,
-	INVALC,INVALC,0x593F,INVALC,INVALC,INVALC,INVALC,0x5942,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5943,0x5941,0x594D,
-	INVALC,INVALC,INVALC,INVALC,0x5948,INVALC,0x593C,0x5A76,
-	INVALC,0x593D,INVALC,0x594A,0x5945,INVALC,0x593A,INVALC,
-	INVALC,INVALC,0x5939,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E3D,0x5E40,INVALC,0x5E54,INVALC,
-	0x5E3E,INVALC,0x5E44,0x5E4A,0x6143,INVALC,INVALC,0x5E48,
-	INVALC,0x5E55,0x5E41,0x5E49,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E47,INVALC,INVALC,INVALC,
-	0x5E43,0x5E57,0x5E50,INVALC,0x5E45,0x5E42,INVALC,0x5E4D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E3F,
-	INVALC,INVALC,0x5E46,0x5E56,0x5E52,INVALC,0x5E4C,INVALC,
-	INVALC,0x5E53,0x5E4F,0x5E4B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E51,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x634C,0x634D,0x6345,
-	INVALC,0x634F,INVALC,INVALC,INVALC,INVALC,0x6343,INVALC,
-	INVALC,0x6346,INVALC,0x6341,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x634A,INVALC,0x6344,INVALC,INVALC,0x633F,
-	INVALC,0x634B,INVALC,0x6347,0x6348,0x634E,0x6342,0x2321,
-	0x6340,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6349,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6835,0x6830,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x682A,0x6826,INVALC,
-	/* Block 87, Array index 0x1600 */
-	0x6827,INVALC,INVALC,INVALC,INVALC,INVALC,0x682C,INVALC,
-	0x6833,0x682D,INVALC,INVALC,INVALC,0x682E,0x682F,INVALC,
-	0x6834,INVALC,INVALC,INVALC,0x682B,INVALC,0x6831,0x6829,
-	INVALC,INVALC,INVALC,0x6828,INVALC,INVALC,INVALC,0x6832,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6C37,INVALC,INVALC,INVALC,INVALC,0x6C31,0x6C3D,
-	0x6C3E,INVALC,0x6C34,INVALC,0x6C36,INVALC,0x6C3C,INVALC,
-	INVALC,0x6C33,INVALC,0x6C32,INVALC,INVALC,INVALC,0x6C35,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6C39,INVALC,
-	INVALC,INVALC,INVALC,0x6C38,INVALC,INVALC,INVALC,0x6C3A,
-	INVALC,0x703B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7047,INVALC,0x703F,0x7043,INVALC,INVALC,
-	0x7042,0x703E,0x7041,0x703C,0x7046,INVALC,INVALC,0x7045,
-	INVALC,0x7044,INVALC,INVALC,0x6C3B,INVALC,0x7048,INVALC,
-	0x7040,0x703D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7346,INVALC,INVALC,INVALC,INVALC,0x7348,INVALC,0x7349,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7345,0x734A,
-	0x7347,INVALC,INVALC,INVALC,INVALC,0x763C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x782C,INVALC,INVALC,
-	0x782D,INVALC,INVALC,INVALC,INVALC,INVALC,0x763D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7964,INVALC,0x7963,0x7962,
-	INVALC,INVALC,INVALC,INVALC,0x7965,INVALC,INVALC,INVALC,
-	0x7A65,0x7A64,0x7A66,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7B59,0x7B5B,0x7B5A,INVALC,0x7C34,INVALC,INVALC,INVALC,
-	INVALC,0x7C5D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x463F,0x463E,INVALC,0x4760,0x475F,INVALC,
-	0x475E,INVALC,INVALC,INVALC,0x495B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4959,0x495C,INVALC,INVALC,INVALC,INVALC,
-	0x495A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C56,INVALC,INVALC,INVALC,INVALC,0x504C,
-	/* Block 88, Array index 0x1700 */
-	INVALC,INVALC,INVALC,0x5467,0x5468,INVALC,INVALC,INVALC,
-	0x594E,0x5950,INVALC,0x594F,INVALC,0x5E58,INVALC,INVALC,
-	INVALC,INVALC,0x6350,0x6351,INVALC,INVALC,0x6837,INVALC,
-	0x6836,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4448,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4763,0x4767,INVALC,INVALC,0x4765,0x4764,INVALC,0x4766,
-	0x4762,INVALC,INVALC,0x4761,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4966,INVALC,INVALC,0x4963,INVALC,
-	0x495F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4961,
-	INVALC,INVALC,0x495D,INVALC,INVALC,0x4960,0x4962,0x4965,
-	0x4964,0x495E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C5B,INVALC,INVALC,0x4C5D,INVALC,0x4C5C,INVALC,
-	INVALC,0x4C5A,0x4C59,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C58,
-	INVALC,INVALC,INVALC,INVALC,0x4C5E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x504D,0x4C57,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x504E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5054,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x504F,INVALC,0x5051,0x5050,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5053,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5469,0x546C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x546B,INVALC,INVALC,0x5052,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x546A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5951,
-	0x5955,INVALC,INVALC,INVALC,0x5956,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x595A,
-	INVALC,0x595B,0x5957,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 89, Array index 0x1800 */
-	INVALC,INVALC,0x5958,INVALC,INVALC,0x5952,0x5954,INVALC,
-	INVALC,0x546D,0x5953,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E60,INVALC,INVALC,
-	0x5E61,0x5E5F,INVALC,INVALC,0x5E5C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5E5A,INVALC,INVALC,INVALC,INVALC,0x5E59,
-	0x5E5D,0x5E5E,INVALC,INVALC,0x5E5B,0x5959,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x635B,0x635E,0x6359,INVALC,INVALC,INVALC,
-	INVALC,0x6353,0x635D,INVALC,0x6357,INVALC,INVALC,0x6355,
-	0x6354,INVALC,0x6356,INVALC,INVALC,INVALC,0x6352,INVALC,
-	INVALC,INVALC,0x635C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6358,INVALC,0x635A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6838,INVALC,INVALC,
-	INVALC,0x683D,INVALC,INVALC,INVALC,0x683F,0x6839,INVALC,
-	0x6C3F,INVALC,INVALC,0x683A,INVALC,0x683E,INVALC,INVALC,
-	INVALC,INVALC,0x683C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x683B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6C43,INVALC,0x6C41,0x6C40,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6C46,INVALC,
-	0x702E,0x6C45,INVALC,INVALC,INVALC,INVALC,0x6C44,INVALC,
-	INVALC,INVALC,INVALC,0x6C42,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x704A,INVALC,
-	INVALC,0x7049,INVALC,INVALC,INVALC,0x704C,INVALC,0x704B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x734E,INVALC,
-	INVALC,0x734D,INVALC,0x734C,INVALC,0x734B,INVALC,INVALC,
-	0x763F,0x763E,INVALC,INVALC,INVALC,INVALC,0x782E,0x782F,
-	INVALC,INVALC,0x7830,INVALC,0x7966,INVALC,INVALC,INVALC,
-	INVALC,0x7C5E,INVALC,0x4449,0x4531,INVALC,INVALC,0x4967,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5E62,0x5E63,INVALC,INVALC,0x6840,INVALC,INVALC,
-	/* Block 90, Array index 0x1900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x546E,
-	INVALC,INVALC,INVALC,INVALC,0x7A67,0x444A,0x4640,INVALC,
-	INVALC,0x4768,0x4769,INVALC,0x4C5F,INVALC,INVALC,INVALC,
-	0x595C,INVALC,0x6842,INVALC,0x6843,0x6841,INVALC,0x444B,
-	INVALC,0x4532,0x4534,0x4533,INVALC,0x4535,0x4641,INVALC,
-	INVALC,0x4642,INVALC,INVALC,INVALC,INVALC,INVALC,0x476A,
-	0x476B,INVALC,INVALC,INVALC,INVALC,INVALC,0x4968,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4C63,INVALC,INVALC,0x4C61,
-	0x4C62,0x4C60,INVALC,INVALC,INVALC,INVALC,0x5058,0x5057,
-	0x5059,0x5056,INVALC,INVALC,0x4C64,0x5055,INVALC,0x546F,
-	0x5470,INVALC,0x5471,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5E64,INVALC,0x595D,INVALC,INVALC,INVALC,INVALC,0x635F,
-	INVALC,0x6845,0x6844,INVALC,INVALC,0x6C47,0x704D,INVALC,
-	INVALC,INVALC,INVALC,0x444C,0x4643,INVALC,0x4644,INVALC,
-	0x476D,0x4770,INVALC,INVALC,INVALC,0x476F,INVALC,INVALC,
-	INVALC,0x4772,0x4771,0x476E,0x476C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4973,INVALC,INVALC,0x4970,INVALC,INVALC,
-	INVALC,INVALC,0x496A,0x4972,INVALC,INVALC,0x496F,INVALC,
-	INVALC,0x496E,INVALC,INVALC,INVALC,0x4969,0x496C,INVALC,
-	INVALC,INVALC,INVALC,0x496D,0x4971,0x4974,INVALC,INVALC,
-	0x496B,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C69,0x4C71,
-	INVALC,INVALC,INVALC,0x4C72,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C68,INVALC,0x4C66,INVALC,INVALC,0x4C65,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4C74,0x4C6B,INVALC,
-	INVALC,INVALC,0x4C70,0x4C6E,INVALC,0x4C6D,INVALC,INVALC,
-	0x4C6C,0x4C6A,0x4C73,0x4C6F,0x4C67,INVALC,INVALC,INVALC,
-	0x505B,INVALC,0x5062,INVALC,0x505A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x505D,INVALC,0x5060,0x5063,INVALC,
-	0x505E,INVALC,0x5061,INVALC,0x5478,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5065,INVALC,INVALC,INVALC,0x505C,
-	/* Block 91, Array index 0x1A00 */
-	INVALC,0x5064,INVALC,0x505F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x547E,INVALC,INVALC,0x547D,INVALC,INVALC,INVALC,
-	INVALC,0x5472,INVALC,0x5477,INVALC,INVALC,INVALC,INVALC,
-	0x5473,INVALC,INVALC,0x5476,0x5474,INVALC,INVALC,0x5475,
-	0x5479,INVALC,INVALC,0x547A,INVALC,0x547C,INVALC,INVALC,
-	INVALC,0x547B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x595E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5964,INVALC,INVALC,INVALC,
-	0x5963,0x595F,INVALC,INVALC,INVALC,INVALC,0x5967,INVALC,
-	INVALC,0x5960,0x5968,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5966,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5965,INVALC,INVALC,INVALC,0x5961,INVALC,
-	INVALC,INVALC,0x5962,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E65,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E67,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5E68,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5E66,0x5E69,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E6A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6368,0x6366,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6365,0x6364,0x6363,INVALC,
-	INVALC,0x6360,0x6367,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6361,INVALC,INVALC,0x6362,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x684A,0x6849,
-	0x684B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6846,INVALC,0x684C,INVALC,INVALC,0x6847,INVALC,
-	INVALC,0x6848,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6C4B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6C49,INVALC,INVALC,INVALC,INVALC,
-	/* Block 92, Array index 0x1B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6C4D,0x6C48,INVALC,0x6C4A,0x6C4C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x704E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7351,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7350,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x734F,INVALC,INVALC,INVALC,0x704F,INVALC,INVALC,INVALC,
-	0x7640,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7967,INVALC,INVALC,0x7968,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x444D,0x444E,INVALC,0x444F,0x4536,0x4645,INVALC,0x4773,
-	0x4774,INVALC,0x4977,0x4978,0x4976,0x4975,INVALC,0x4C75,
-	INVALC,INVALC,INVALC,0x4C77,0x4C76,INVALC,INVALC,INVALC,
-	INVALC,0x5066,INVALC,0x5521,INVALC,INVALC,INVALC,INVALC,
-	0x5969,0x5E6C,INVALC,0x5E6B,INVALC,0x684D,INVALC,INVALC,
-	0x7050,INVALC,0x7352,INVALC,INVALC,0x7969,INVALC,0x7B5C,
-	INVALC,INVALC,INVALC,0x4646,INVALC,0x4777,INVALC,0x4775,
-	0x4776,0x4778,INVALC,0x497A,0x4979,INVALC,INVALC,0x497B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C78,
-	0x4C7A,0x4C7C,0x4C79,0x4C7D,0x4C7B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x506A,0x5067,0x5069,0x506B,0x5068,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5527,INVALC,
-	0x5523,INVALC,INVALC,0x5524,0x5526,0x5528,0x5525,INVALC,
-	0x552A,0x5529,INVALC,INVALC,INVALC,INVALC,INVALC,0x596E,
-	INVALC,INVALC,0x596D,INVALC,0x596C,0x596B,0x596F,0x596A,
-	INVALC,INVALC,INVALC,INVALC,0x5E6E,INVALC,INVALC,INVALC,
-	0x5E70,INVALC,0x5E6D,0x5E6F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x684E,0x6856,
-	INVALC,0x6850,0x6854,INVALC,0x6855,0x6851,0x6852,0x684F,
-	0x6853,0x6C50,INVALC,0x6C51,0x6C4F,INVALC,0x6C4E,INVALC,
-	0x7051,INVALC,INVALC,INVALC,INVALC,0x7831,0x796A,INVALC,
-	0x4450,INVALC,0x4779,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 93, Array index 0x1C00 */
-	INVALC,0x506C,INVALC,INVALC,0x552B,INVALC,INVALC,0x5972,
-	0x5971,0x5970,0x5E71,0x5E72,INVALC,0x6857,0x7052,0x4451,
-	INVALC,0x4537,INVALC,INVALC,INVALC,INVALC,0x477A,INVALC,
-	INVALC,INVALC,0x4C7E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4452,INVALC,0x4538,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x497C,INVALC,INVALC,INVALC,
-	INVALC,0x5E73,INVALC,INVALC,INVALC,INVALC,INVALC,0x7353,
-	0x4453,0x4467,0x4539,INVALC,0x4647,INVALC,0x4A22,0x4A21,
-	0x497D,0x497E,INVALC,INVALC,INVALC,0x4D22,0x4D23,INVALC,
-	0x4D21,INVALC,INVALC,0x5070,INVALC,0x506F,0x506D,0x506E,
-	0x552E,0x552C,INVALC,INVALC,INVALC,0x552D,INVALC,INVALC,
-	0x5522,INVALC,INVALC,INVALC,0x5974,0x5975,INVALC,INVALC,
-	0x5973,INVALC,0x6858,INVALC,0x6C52,0x6C53,INVALC,INVALC,
-	0x7354,INVALC,INVALC,INVALC,0x7A68,INVALC,INVALC,0x453A,
-	INVALC,0x4454,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x477B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4A26,INVALC,INVALC,INVALC,
-	0x4A23,0x4A24,INVALC,INVALC,0x4A25,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D25,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D27,INVALC,0x4D28,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D29,INVALC,0x4D2A,INVALC,INVALC,INVALC,0x4D24,
-	0x4D26,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5072,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5071,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5533,INVALC,0x5532,INVALC,INVALC,0x552F,INVALC,INVALC,
-	0x5534,INVALC,INVALC,INVALC,0x5537,INVALC,0x5535,INVALC,
-	INVALC,INVALC,INVALC,0x5531,INVALC,0x5530,INVALC,INVALC,
-	/* Block 94, Array index 0x1D00 */
-	INVALC,0x5536,INVALC,INVALC,INVALC,INVALC,0x5977,0x5976,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5978,INVALC,
-	INVALC,0x597C,INVALC,INVALC,0x597E,INVALC,0x597A,0x5A24,
-	INVALC,0x5A21,INVALC,0x5979,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x597B,INVALC,0x5A22,INVALC,INVALC,0x5A23,
-	INVALC,0x597D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E76,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E77,
-	INVALC,INVALC,INVALC,INVALC,0x5E74,INVALC,INVALC,INVALC,
-	0x5E75,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6369,INVALC,INVALC,INVALC,INVALC,INVALC,0x636A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6859,INVALC,INVALC,0x685A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6C55,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6C54,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7358,INVALC,0x7356,INVALC,0x7355,0x7357,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x796B,INVALC,INVALC,INVALC,0x7A69,INVALC,INVALC,
-	INVALC,INVALC,0x7B5E,INVALC,0x7B5D,INVALC,0x7C35,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4455,0x477C,INVALC,
-	INVALC,0x4B56,0x5A25,INVALC,INVALC,0x4456,0x464A,0x4649,
-	0x4648,INVALC,INVALC,0x4A27,INVALC,INVALC,0x5538,INVALC,
-	INVALC,0x4457,0x4458,0x4459,0x453B,INVALC,INVALC,0x5073,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E78,0x445A,INVALC,
-	/* Block 95, Array index 0x1E00 */
-	INVALC,INVALC,0x464B,0x464C,INVALC,INVALC,0x477D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4A28,INVALC,INVALC,INVALC,
-	INVALC,0x4D30,INVALC,INVALC,INVALC,0x4D2E,0x4D2D,INVALC,
-	0x4D2B,INVALC,0x4D2C,0x4D2F,INVALC,0x5074,INVALC,0x5076,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5075,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x553A,INVALC,0x5539,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5A28,INVALC,INVALC,0x5A27,0x5A29,
-	0x5A26,INVALC,INVALC,INVALC,INVALC,0x5E7A,INVALC,INVALC,
-	0x5E7B,INVALC,INVALC,0x5E7C,INVALC,0x5E79,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x636B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x685F,0x685D,INVALC,0x685E,
-	INVALC,INVALC,INVALC,0x685B,INVALC,INVALC,INVALC,0x6C57,
-	INVALC,0x6C58,0x6C56,0x685C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7359,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x445B,0x464D,0x4821,INVALC,0x477E,INVALC,
-	0x4D31,0x636C,INVALC,0x453C,0x464E,0x5077,0x5E7D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A2A,
-	INVALC,INVALC,0x4A2B,INVALC,INVALC,INVALC,INVALC,0x4A29,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4D35,0x4D36,0x4D33,
-	INVALC,INVALC,0x4D32,INVALC,0x4D34,INVALC,INVALC,INVALC,
-	0x5078,INVALC,INVALC,INVALC,INVALC,INVALC,0x5079,0x553D,
-	INVALC,INVALC,INVALC,0x553B,INVALC,0x553C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5A2D,0x5A2C,0x5A2A,
-	0x5A2B,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A2E,INVALC,
-	INVALC,0x5F21,0x5F22,INVALC,0x5F23,INVALC,INVALC,INVALC,
-	0x636E,0x636D,0x5E7E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6860,INVALC,INVALC,0x6861,INVALC,
-	INVALC,INVALC,0x6C5A,INVALC,INVALC,0x6C5C,INVALC,0x6C5B,
-	0x6C5E,INVALC,0x6C59,0x6C5D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7833,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7D22,INVALC,INVALC,0x4D37,0x4A2C,
-	INVALC,INVALC,0x507A,INVALC,INVALC,INVALC,0x445C,0x453D,
-	/* Block 96, Array index 0x1F00 */
-	INVALC,0x464F,INVALC,INVALC,0x4A2D,INVALC,INVALC,INVALC,
-	0x507B,INVALC,0x6862,0x445D,INVALC,INVALC,INVALC,0x4822,
-	INVALC,INVALC,0x636F,0x445E,0x453E,0x453F,INVALC,0x4651,
-	0x4650,INVALC,INVALC,0x4823,INVALC,INVALC,INVALC,0x4A2E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D38,0x4D39,
-	INVALC,0x4D3A,INVALC,INVALC,INVALC,0x507C,INVALC,INVALC,
-	INVALC,0x553E,INVALC,INVALC,INVALC,0x5A2F,INVALC,0x5A30,
-	INVALC,INVALC,INVALC,INVALC,0x5F24,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6863,INVALC,
-	0x6C5F,INVALC,0x7053,INVALC,0x735A,INVALC,0x7B5F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A31,
-	INVALC,0x6370,INVALC,INVALC,INVALC,INVALC,0x7641,INVALC,
-	INVALC,INVALC,0x4A30,INVALC,0x4A2F,0x507D,INVALC,INVALC,
-	INVALC,0x5A33,0x5D29,0x5A34,0x5A32,0x5F25,INVALC,INVALC,
-	0x6864,0x6C60,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A31,
-	INVALC,0x4A32,INVALC,INVALC,0x4D3E,INVALC,INVALC,0x4D3D,
-	0x4D3B,0x4D3C,INVALC,INVALC,INVALC,0x5121,INVALC,0x5124,
-	0x507E,0x5126,0x5122,0x5123,0x5125,INVALC,INVALC,INVALC,
-	0x5541,0x5540,0x553F,INVALC,INVALC,INVALC,INVALC,0x5A35,
-	0x5A38,0x5A36,INVALC,INVALC,0x5A3B,INVALC,0x5A37,INVALC,
-	0x5A3A,0x5A39,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F28,0x5F26,0x5F27,INVALC,0x6371,INVALC,0x6372,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6C62,INVALC,0x6C61,
-	INVALC,0x6865,INVALC,INVALC,INVALC,0x735B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4540,INVALC,0x4652,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4A34,0x4A36,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4825,0x4A35,
-	0x4A33,0x4824,INVALC,INVALC,INVALC,0x4D3F,INVALC,INVALC,
-	0x4D40,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4A3A,0x4A38,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A37,INVALC,INVALC,INVALC,0x4D42,INVALC,INVALC,
-	0x4A39,INVALC,INVALC,INVALC,INVALC,0x4D41,INVALC,0x4D43,
-	/* Block 97, Array index 0x2000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x512B,0x4D44,
-	INVALC,INVALC,0x5127,INVALC,0x4D45,0x4D4A,0x4D48,INVALC,
-	INVALC,INVALC,INVALC,0x4D4F,INVALC,0x5128,INVALC,INVALC,
-	0x5129,0x4D4B,INVALC,INVALC,INVALC,0x512A,INVALC,0x4D4C,
-	0x512C,0x4D4D,0x4D49,0x4D4E,INVALC,INVALC,INVALC,0x4D46,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4D47,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5132,INVALC,INVALC,0x5131,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x512D,INVALC,INVALC,
-	0x5545,INVALC,INVALC,INVALC,INVALC,0x5546,INVALC,INVALC,
-	INVALC,0x5542,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5130,0x5543,0x5136,0x5544,INVALC,INVALC,
-	0x512F,0x5548,0x5135,0x5134,0x5133,0x5547,INVALC,0x5549,
-	0x512E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A3C,
-	INVALC,INVALC,INVALC,INVALC,0x554A,0x5550,INVALC,INVALC,
-	INVALC,0x5A3E,INVALC,INVALC,0x554F,0x554D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x554E,INVALC,0x5551,INVALC,
-	INVALC,INVALC,0x554C,INVALC,INVALC,INVALC,INVALC,0x554B,
-	0x5A3F,INVALC,INVALC,0x5A3D,INVALC,INVALC,INVALC,INVALC,
-	0x5A40,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5F2B,INVALC,0x5A42,0x5A47,0x5F2C,INVALC,
-	0x5A4E,INVALC,INVALC,0x5A46,0x5A49,0x5A44,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5A45,0x5A4C,0x5A50,
-	INVALC,INVALC,INVALC,0x5A41,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F29,INVALC,INVALC,INVALC,0x5A4B,INVALC,INVALC,
-	0x5A4A,INVALC,0x5A4F,INVALC,0x5A48,INVALC,INVALC,0x5A4D,
-	0x5F2D,0x5F2A,INVALC,INVALC,INVALC,INVALC,0x5A43,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F32,0x5F36,INVALC,0x6377,0x5F34,INVALC,0x5F38,INVALC,
-	INVALC,0x6379,0x5F30,0x5F33,INVALC,INVALC,INVALC,INVALC,
-	/* Block 98, Array index 0x2100 */
-	0x5F3A,0x637A,INVALC,INVALC,INVALC,INVALC,0x6426,INVALC,
-	0x637B,0x5F39,INVALC,INVALC,INVALC,0x6425,0x5F37,0x6374,
-	INVALC,INVALC,0x5F3B,INVALC,INVALC,0x5F31,INVALC,INVALC,
-	INVALC,INVALC,0x6373,0x6378,0x5F2E,INVALC,INVALC,0x6376,
-	INVALC,INVALC,INVALC,0x5F2F,INVALC,INVALC,INVALC,0x6424,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6423,INVALC,INVALC,0x6427,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6422,0x6867,
-	INVALC,INVALC,INVALC,INVALC,0x637E,INVALC,INVALC,0x6866,
-	0x6375,INVALC,INVALC,0x6868,0x637D,0x6421,0x637C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6C67,INVALC,INVALC,
-	0x686E,INVALC,0x686D,INVALC,INVALC,0x6C66,INVALC,0x686C,
-	INVALC,INVALC,0x686A,0x686B,INVALC,INVALC,INVALC,0x6C64,
-	0x5F35,INVALC,INVALC,0x6C6B,INVALC,INVALC,0x6C65,INVALC,
-	0x6C6A,INVALC,INVALC,INVALC,INVALC,0x686F,0x6C63,0x6869,
-	INVALC,INVALC,INVALC,INVALC,0x6C69,INVALC,0x6C6C,INVALC,
-	INVALC,INVALC,0x6C68,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7057,INVALC,INVALC,INVALC,0x6C70,INVALC,
-	0x6C6E,0x7055,INVALC,INVALC,0x6C74,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6C72,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6C73,INVALC,INVALC,0x6C6D,
-	INVALC,0x7056,INVALC,0x6C6F,0x6C71,INVALC,0x6C75,INVALC,
-	INVALC,INVALC,0x7054,INVALC,INVALC,INVALC,0x7059,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x705A,INVALC,
-	INVALC,INVALC,0x735D,INVALC,INVALC,INVALC,INVALC,0x735E,
-	0x705C,0x735C,0x705B,0x7360,INVALC,0x7058,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7642,INVALC,INVALC,0x735F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7834,INVALC,INVALC,0x7837,0x7836,0x7835,
-	0x796C,INVALC,0x796D,INVALC,0x7A6A,INVALC,0x7A6B,0x7B60,
-	/* Block 99, Array index 0x2200 */
-	0x7C36,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4541,INVALC,0x4653,INVALC,0x4827,0x4828,0x4826,INVALC,
-	0x4829,0x4A3C,0x4A3B,INVALC,INVALC,0x4D51,0x4D50,INVALC,
-	INVALC,INVALC,0x5A51,0x5A52,INVALC,INVALC,INVALC,0x5F3C,
-	INVALC,0x6428,0x6429,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6870,INVALC,INVALC,INVALC,0x6C76,INVALC,
-	0x705D,INVALC,0x7361,0x7643,0x7362,INVALC,0x4542,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D53,0x4D52,
-	0x4D54,0x5137,INVALC,INVALC,INVALC,INVALC,INVALC,0x5552,
-	0x5A53,0x5F3D,INVALC,0x4543,INVALC,0x445F,0x4544,INVALC,
-	INVALC,0x4657,0x4656,0x4654,0x4655,INVALC,INVALC,INVALC,
-	0x482C,INVALC,INVALC,0x482B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x482A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4A43,0x4A4C,0x4A4A,
-	INVALC,INVALC,INVALC,0x4A48,INVALC,INVALC,0x4A41,INVALC,
-	INVALC,0x4A47,INVALC,INVALC,0x4A45,INVALC,0x4A46,0x4D55,
-	0x4A40,INVALC,INVALC,INVALC,0x4A3D,INVALC,0x4A50,INVALC,
-	INVALC,0x4A42,0x4A44,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A4F,0x4A49,0x4A4E,INVALC,0x4A4D,0x4A3F,0x4A3E,
-	0x4A4B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4D63,INVALC,INVALC,0x4D5E,0x4D71,INVALC,INVALC,INVALC,
-	INVALC,0x4D6C,INVALC,INVALC,INVALC,0x4D6A,INVALC,INVALC,
-	INVALC,0x4D5B,INVALC,INVALC,0x4D65,0x4D64,INVALC,0x4D59,
-	INVALC,INVALC,0x4D5A,INVALC,0x4D58,INVALC,0x4D70,0x4D68,
-	0x4D62,0x4D56,INVALC,0x4D61,0x4D57,0x4D69,0x4D72,INVALC,
-	0x4D66,INVALC,0x4D5C,0x4D5F,0x4D60,INVALC,0x4D6E,0x4D6F,
-	0x4D6D,0x4D67,0x4D6B,0x4D5D,0x5138,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5144,0x513C,0x513E,0x5143,
-	INVALC,0x5141,INVALC,0x5553,0x5146,INVALC,INVALC,0x5142,
-	INVALC,INVALC,INVALC,INVALC,0x513B,0x513F,0x5145,0x5555,
-	/* Block 100, Array index 0x2300 */
-	INVALC,0x513D,0x5148,INVALC,INVALC,INVALC,INVALC,0x5140,
-	0x5554,0x513A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5147,INVALC,INVALC,INVALC,INVALC,0x5139,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5563,INVALC,0x5561,0x5562,INVALC,INVALC,INVALC,0x5558,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x555E,INVALC,INVALC,0x5560,0x5557,INVALC,
-	INVALC,INVALC,0x555A,INVALC,INVALC,INVALC,0x555B,INVALC,
-	INVALC,0x555D,INVALC,INVALC,0x5565,0x5564,0x5556,0x555C,
-	0x555F,INVALC,INVALC,INVALC,INVALC,0x5559,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A5B,
-	0x5A6F,0x5A6E,INVALC,0x5A63,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5A5E,0x5A56,INVALC,INVALC,INVALC,0x5F4D,0x5A5A,
-	INVALC,INVALC,0x5A70,0x5A6D,INVALC,INVALC,INVALC,INVALC,
-	0x5A6C,INVALC,INVALC,0x5A61,0x5A65,INVALC,INVALC,INVALC,
-	0x5A66,0x5A60,INVALC,INVALC,0x5F3F,INVALC,INVALC,0x5A6B,
-	INVALC,INVALC,0x5A6A,INVALC,INVALC,INVALC,0x5A57,INVALC,
-	0x5A5C,0x5A67,INVALC,0x5A62,INVALC,INVALC,INVALC,INVALC,
-	0x5A54,0x5A68,0x5A58,0x5F3E,INVALC,0x5A59,INVALC,0x5A55,
-	0x5A64,0x5A5F,0x5A5D,INVALC,0x5A69,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F41,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F44,INVALC,
-	INVALC,0x5F43,INVALC,INVALC,INVALC,0x5F45,INVALC,0x5F40,
-	0x5F48,INVALC,0x5F46,INVALC,INVALC,INVALC,0x5F4A,INVALC,
-	INVALC,INVALC,0x5F52,0x5F50,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F49,INVALC,0x5F47,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F42,0x5F4F,INVALC,INVALC,0x5F4B,0x5F4C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5F4E,INVALC,INVALC,INVALC,
-	INVALC,0x5F53,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 101, Array index 0x2400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6438,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6434,INVALC,0x6431,
-	INVALC,INVALC,INVALC,0x642A,0x6433,INVALC,0x6436,0x6437,
-	INVALC,INVALC,INVALC,INVALC,0x6432,INVALC,0x642C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x642D,INVALC,0x6430,0x642E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x687A,INVALC,0x6435,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x642F,0x642B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6878,0x5F51,INVALC,0x6873,INVALC,INVALC,INVALC,
-	0x6872,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6876,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6879,
-	INVALC,0x6C77,INVALC,INVALC,INVALC,0x687B,INVALC,0x6C78,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6875,0x6C79,0x6877,0x687C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6871,
-	0x6C7C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6C7D,INVALC,0x6D25,0x6D22,INVALC,0x6D23,INVALC,INVALC,
-	INVALC,0x6D2B,0x6D29,INVALC,INVALC,INVALC,0x6C7A,INVALC,
-	INVALC,INVALC,0x6D2C,INVALC,0x6874,0x6D21,INVALC,INVALC,
-	INVALC,0x6D24,INVALC,0x6D28,0x6D2A,0x6D27,0x6D26,INVALC,
-	0x6C7E,INVALC,0x6C7B,0x6D2D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7061,0x7062,INVALC,0x706B,0x7068,
-	INVALC,0x705F,0x7066,INVALC,0x7064,0x705E,INVALC,0x7065,
-	INVALC,INVALC,0x7364,0x7060,INVALC,0x7067,0x7363,INVALC,
-	INVALC,INVALC,0x7069,INVALC,0x706A,INVALC,INVALC,INVALC,
-	0x7365,INVALC,0x7063,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7366,INVALC,0x736B,INVALC,INVALC,INVALC,0x7368,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7369,0x736C,INVALC,INVALC,
-	0x7367,0x736A,0x7645,INVALC,0x7644,INVALC,INVALC,0x764A,
-	INVALC,INVALC,0x7648,0x7649,INVALC,INVALC,0x7646,INVALC,
-	/* Block 102, Array index 0x2500 */
-	0x7838,INVALC,INVALC,INVALC,INVALC,INVALC,0x7647,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7839,
-	INVALC,INVALC,INVALC,INVALC,0x796F,INVALC,INVALC,INVALC,
-	0x796E,0x7970,INVALC,INVALC,0x7A6D,0x7A6C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7C37,0x7B61,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7C39,0x7C38,0x7C5F,INVALC,INVALC,0x4545,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x482D,INVALC,
-	0x4A53,0x4A51,INVALC,0x4A52,INVALC,INVALC,0x4D73,0x5149,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x514A,INVALC,INVALC,
-	0x5566,0x5567,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A77,
-	INVALC,0x5A73,INVALC,INVALC,0x5A7A,0x5A79,0x5A72,0x5A75,
-	0x5A78,0x5A74,INVALC,INVALC,INVALC,0x5A71,0x5F54,INVALC,
-	INVALC,INVALC,0x5F56,0x5F57,INVALC,INVALC,0x5F55,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6439,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x687D,INVALC,0x706C,0x6D2E,INVALC,0x6D2F,
-	0x6D30,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x736D,0x736E,INVALC,INVALC,INVALC,0x4546,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F59,0x5F58,INVALC,INVALC,INVALC,0x7A6E,INVALC,0x4547,
-	INVALC,0x5568,INVALC,0x5A7C,0x5A7B,INVALC,INVALC,0x643A,
-	INVALC,0x687E,INVALC,INVALC,0x4548,0x4658,INVALC,0x4D74,
-	INVALC,INVALC,INVALC,0x514B,0x5A7D,INVALC,INVALC,0x5F5A,
-	0x643B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x764B,
-	INVALC,0x4549,INVALC,INVALC,0x4D75,0x514C,INVALC,INVALC,
-	INVALC,0x5569,INVALC,INVALC,INVALC,0x556A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5B21,0x5B22,INVALC,0x5B23,0x5A7E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6922,0x6921,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x514D,INVALC,INVALC,0x454A,0x4659,INVALC,
-	0x482F,0x482E,INVALC,INVALC,0x4830,0x4831,INVALC,INVALC,
-	INVALC,0x4A54,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D76,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 103, Array index 0x2600 */
-	0x4D7D,INVALC,0x4D7B,INVALC,INVALC,INVALC,0x4D7A,0x4E23,
-	INVALC,INVALC,0x4E22,INVALC,0x4D79,INVALC,0x4D7C,0x4D7E,
-	INVALC,INVALC,INVALC,0x4D78,0x4D77,0x4E21,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5153,
-	0x5150,INVALC,INVALC,INVALC,0x5156,0x514E,INVALC,0x5151,
-	0x5154,INVALC,INVALC,INVALC,INVALC,0x514F,INVALC,0x5152,
-	INVALC,0x5155,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5572,0x556B,0x556E,INVALC,0x5571,INVALC,INVALC,
-	INVALC,0x556C,INVALC,INVALC,0x5570,INVALC,INVALC,0x556D,
-	INVALC,INVALC,0x556F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5B25,INVALC,INVALC,0x5B24,0x5B29,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5B26,INVALC,0x5B28,INVALC,
-	0x5B27,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F5B,0x5F5F,
-	0x5F5C,INVALC,INVALC,INVALC,0x5F5D,INVALC,0x5F5E,0x5F63,
-	INVALC,INVALC,0x5F61,INVALC,INVALC,INVALC,0x5F62,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6441,INVALC,INVALC,0x643E,
-	0x643F,0x643D,INVALC,INVALC,INVALC,0x6443,INVALC,INVALC,
-	INVALC,0x5F60,INVALC,INVALC,INVALC,INVALC,0x6440,0x643C,
-	0x6442,INVALC,INVALC,INVALC,INVALC,0x6925,INVALC,INVALC,
-	INVALC,INVALC,0x6923,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6924,INVALC,INVALC,0x6D32,INVALC,INVALC,0x6D31,INVALC,
-	INVALC,0x6D34,INVALC,INVALC,0x6D33,INVALC,INVALC,INVALC,
-	0x7072,0x706F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7070,INVALC,0x706D,0x7071,
-	INVALC,0x706E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7370,INVALC,
-	INVALC,0x736F,INVALC,INVALC,0x764C,0x783B,INVALC,INVALC,
-	0x783A,INVALC,INVALC,INVALC,INVALC,INVALC,0x7971,INVALC,
-	INVALC,0x7A6F,INVALC,INVALC,0x7C3A,INVALC,INVALC,INVALC,
-	0x454B,INVALC,0x4832,0x4833,0x4A55,INVALC,INVALC,0x5157,
-	0x5573,0x5B2A,INVALC,INVALC,0x5937,INVALC,0x5F64,0x5F65,
-	/* Block 104, Array index 0x2700 */
-	0x5E32,INVALC,INVALC,0x6444,INVALC,INVALC,INVALC,INVALC,
-	0x454C,0x4834,INVALC,0x4E25,INVALC,0x4E24,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5574,0x5575,INVALC,0x5576,
-	INVALC,INVALC,INVALC,0x5B2C,INVALC,0x5F67,INVALC,0x5F66,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x764D,0x7972,
-	0x454D,INVALC,0x465C,0x465D,0x465B,0x465E,0x465A,INVALC,
-	INVALC,0x4837,INVALC,INVALC,0x4836,0x4838,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4835,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A5F,INVALC,
-	INVALC,0x4A5E,INVALC,INVALC,INVALC,INVALC,0x4A57,0x4A58,
-	0x4A59,0x4A5A,INVALC,0x4A61,INVALC,INVALC,0x4A5C,0x4A62,
-	INVALC,INVALC,INVALC,INVALC,0x4A5B,INVALC,0x4A5D,0x4A56,
-	0x4A60,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4E3A,INVALC,INVALC,0x4E26,INVALC,0x4E30,
-	0x4E31,0x4E29,0x4E3B,0x4E2B,INVALC,0x4E36,INVALC,0x4E2C,
-	INVALC,INVALC,INVALC,INVALC,0x4E39,INVALC,0x4E34,0x4E32,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E2D,
-	INVALC,0x4E33,INVALC,0x4E27,INVALC,INVALC,INVALC,INVALC,
-	0x4E35,INVALC,INVALC,0x4E38,INVALC,0x4E28,INVALC,0x4E2F,
-	INVALC,INVALC,0x4E37,INVALC,0x4E2A,0x4E2E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x515F,
-	0x516C,INVALC,INVALC,INVALC,0x5165,INVALC,0x515E,INVALC,
-	0x5168,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5163,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5169,
-	0x515C,0x5164,0x5170,0x5159,0x515B,INVALC,INVALC,INVALC,
-	INVALC,0x516D,0x5166,INVALC,INVALC,0x516F,0x516A,INVALC,
-	INVALC,INVALC,0x516E,INVALC,INVALC,0x5167,INVALC,INVALC,
-	INVALC,0x5161,INVALC,INVALC,0x515D,INVALC,INVALC,0x5162,
-	INVALC,0x515A,INVALC,0x516B,0x5627,0x5160,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5158,
-	/* Block 105, Array index 0x2800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x562E,INVALC,INVALC,INVALC,0x5623,
-	0x562F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5577,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5621,0x562C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5578,0x557C,INVALC,INVALC,0x562A,0x5626,INVALC,INVALC,
-	0x5629,0x5630,0x557D,0x562B,INVALC,0x562D,0x557A,INVALC,
-	0x5579,INVALC,INVALC,INVALC,0x5624,INVALC,INVALC,INVALC,
-	0x5628,0x5625,INVALC,0x557B,0x557E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B33,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B32,
-	INVALC,0x5B2D,0x5B42,0x5B38,INVALC,0x5B3C,0x5B3B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5B30,0x5B3D,INVALC,INVALC,0x5B36,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5B3E,INVALC,0x5B40,
-	INVALC,0x5B41,0x5B2F,INVALC,INVALC,INVALC,INVALC,0x5B35,
-	0x5B3F,INVALC,INVALC,INVALC,INVALC,0x5B3A,INVALC,0x5B2E,
-	0x5B37,0x5B34,INVALC,0x5622,INVALC,0x5B31,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5B39,INVALC,INVALC,INVALC,
-	INVALC,0x5F7B,INVALC,0x5F76,INVALC,0x5F77,INVALC,INVALC,
-	INVALC,INVALC,0x5F73,INVALC,INVALC,0x5F69,INVALC,0x5F6C,
-	0x5F6B,INVALC,0x5F7C,INVALC,INVALC,INVALC,INVALC,0x5F6E,
-	0x5F6A,INVALC,INVALC,0x5F75,INVALC,INVALC,INVALC,0x5F71,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F70,INVALC,
-	INVALC,INVALC,0x5F74,INVALC,INVALC,0x5F6F,INVALC,INVALC,
-	INVALC,0x5F72,0x5F68,0x5F7E,INVALC,INVALC,INVALC,INVALC,
-	/* Block 106, Array index 0x2900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F6D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F78,0x5F7A,INVALC,
-	INVALC,INVALC,0x5F79,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x644C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x644E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6452,0x644A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6447,0x6457,INVALC,0x6455,0x6451,INVALC,
-	0x6449,INVALC,INVALC,0x6456,INVALC,INVALC,INVALC,INVALC,
-	0x644F,INVALC,INVALC,0x6450,INVALC,0x6446,0x5F7D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x644B,INVALC,0x6448,
-	INVALC,0x6453,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x644D,INVALC,INVALC,INVALC,0x6454,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6445,0x6928,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x692D,0x6926,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6938,INVALC,INVALC,0x6936,INVALC,
-	0x6927,INVALC,INVALC,0x6930,INVALC,0x6934,0x692A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6931,INVALC,INVALC,0x692E,
-	INVALC,INVALC,INVALC,0x692F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6929,INVALC,0x6937,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x692C,0x6935,0x6933,INVALC,INVALC,
-	0x6932,INVALC,INVALC,0x692B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6D37,INVALC,INVALC,INVALC,INVALC,0x6D42,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6D3F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6D3B,INVALC,INVALC,
-	/* Block 107, Array index 0x2A00 */
-	INVALC,0x6D38,0x6D40,INVALC,INVALC,0x6D41,INVALC,INVALC,
-	INVALC,INVALC,0x6D3E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6D43,INVALC,0x6D3D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6D3A,INVALC,INVALC,INVALC,INVALC,0x6D39,0x6D36,
-	INVALC,0x6D3C,INVALC,0x6D35,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7121,INVALC,INVALC,
-	0x7074,0x7079,0x7075,INVALC,INVALC,0x7073,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x707A,INVALC,INVALC,0x707E,
-	0x7123,INVALC,INVALC,0x707D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7078,0x7076,INVALC,INVALC,INVALC,INVALC,INVALC,0x7122,
-	INVALC,0x707C,0x707B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7077,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7378,INVALC,
-	0x7371,INVALC,INVALC,INVALC,0x7373,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x737A,INVALC,INVALC,INVALC,0x7372,INVALC,INVALC,0x7379,
-	INVALC,INVALC,INVALC,INVALC,0x7375,INVALC,INVALC,INVALC,
-	0x737B,INVALC,0x7374,0x7377,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x764F,INVALC,0x7654,0x7655,
-	INVALC,INVALC,INVALC,0x764E,INVALC,INVALC,INVALC,INVALC,
-	0x7652,INVALC,INVALC,0x7651,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7653,0x7650,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x783F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x783E,0x7376,INVALC,0x783D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x783C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7973,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7A72,0x7A70,INVALC,INVALC,INVALC,INVALC,
-	/* Block 108, Array index 0x2B00 */
-	INVALC,INVALC,INVALC,INVALC,0x7A71,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7B62,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7C3B,INVALC,INVALC,INVALC,INVALC,INVALC,0x7D23,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x454E,0x4839,INVALC,0x4E3C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5B43,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6022,INVALC,INVALC,0x6023,0x6021,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6458,
-	INVALC,0x6939,INVALC,INVALC,0x693A,INVALC,0x6D45,INVALC,
-	0x6D44,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7124,INVALC,INVALC,0x737C,INVALC,INVALC,0x7656,
-	INVALC,0x7B63,0x454F,0x465F,0x483A,0x4A63,0x4E3D,0x4E3E,
-	INVALC,INVALC,0x5171,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6459,INVALC,INVALC,INVALC,INVALC,0x7125,
-	0x7657,0x4550,INVALC,0x483B,INVALC,INVALC,INVALC,0x4E3F,
-	INVALC,INVALC,INVALC,0x5172,INVALC,INVALC,0x5173,INVALC,
-	INVALC,0x5632,0x5631,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6025,INVALC,
-	0x6024,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6D46,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x737D,0x7658,
-	INVALC,INVALC,0x7A73,INVALC,INVALC,0x5174,INVALC,0x5633,
-	INVALC,INVALC,0x5B44,INVALC,0x6026,INVALC,INVALC,0x645B,
-	0x645A,INVALC,INVALC,INVALC,INVALC,0x6D47,0x6D48,INVALC,
-	INVALC,INVALC,INVALC,0x4551,INVALC,0x4660,INVALC,0x4A64,
-	INVALC,INVALC,0x5175,0x645C,0x4552,INVALC,INVALC,0x5176,
-	INVALC,INVALC,0x737E,0x4553,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5B45,0x5B46,INVALC,INVALC,0x6027,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x645D,INVALC,INVALC,
-	/* Block 109, Array index 0x2C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7126,INVALC,INVALC,
-	0x7421,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4554,
-	0x4662,0x4661,INVALC,0x4E40,INVALC,INVALC,0x483C,INVALC,
-	INVALC,INVALC,INVALC,0x4E41,INVALC,INVALC,INVALC,0x5177,
-	INVALC,INVALC,INVALC,0x5634,0x5638,INVALC,0x5637,0x5635,
-	0x5636,INVALC,INVALC,0x5B47,0x602A,INVALC,0x6028,0x6029,
-	INVALC,INVALC,INVALC,0x693B,0x4555,INVALC,INVALC,INVALC,
-	0x4663,INVALC,INVALC,INVALC,INVALC,INVALC,0x4666,INVALC,
-	0x4665,0x4664,0x4A65,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4846,0x4847,INVALC,
-	0x4842,INVALC,INVALC,INVALC,INVALC,0x4843,INVALC,0x483E,
-	INVALC,0x483F,INVALC,0x4845,INVALC,0x483D,0x4A66,0x4840,
-	0x4841,0x4844,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A72,INVALC,0x4A6D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A70,INVALC,0x4A77,INVALC,0x4A79,INVALC,0x4A7B,INVALC,
-	INVALC,INVALC,0x4A6E,INVALC,INVALC,0x4A75,0x4A78,INVALC,
-	INVALC,0x4A68,0x4B21,0x4A76,INVALC,0x4A6B,0x4A7A,INVALC,
-	0x4A69,0x4A6A,INVALC,INVALC,0x4A71,0x4A7C,INVALC,INVALC,
-	0x4A6F,INVALC,0x4A74,INVALC,0x4A7D,INVALC,0x4A73,INVALC,
-	0x4A7E,0x4A67,INVALC,0x4A6C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E4D,0x4E5D,INVALC,0x4E54,INVALC,
-	INVALC,0x4E45,INVALC,0x4E48,INVALC,INVALC,INVALC,INVALC,
-	0x4E50,0x4E52,INVALC,0x4E59,0x4E4B,0x4E49,0x4E4A,0x4E58,
-	INVALC,0x4E53,INVALC,INVALC,0x4E51,0x4E56,INVALC,INVALC,
-	INVALC,0x5178,0x4E5C,INVALC,0x4E46,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E4F,INVALC,0x4E4E,0x4E60,0x4E55,
-	INVALC,INVALC,INVALC,0x4E5B,0x4E5F,INVALC,INVALC,INVALC,
-	0x4E61,0x4E5A,0x4E4C,0x4E42,INVALC,0x4E47,INVALC,INVALC,
-	0x4E43,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E5E,
-	0x5639,0x4E57,INVALC,0x4E44,INVALC,0x5229,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 110, Array index 0x2D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5179,0x517E,INVALC,0x5230,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5223,
-	INVALC,INVALC,INVALC,0x5228,INVALC,INVALC,0x5222,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x517D,INVALC,0x522B,
-	INVALC,0x522D,0x517B,0x5231,INVALC,INVALC,0x522E,INVALC,
-	INVALC,0x5221,0x517A,INVALC,INVALC,0x522F,0x5227,INVALC,
-	0x522C,0x522A,INVALC,0x5224,INVALC,0x5225,0x5226,INVALC,
-	INVALC,0x517C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5641,0x5646,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x564D,0x563E,INVALC,
-	INVALC,0x5648,0x563A,INVALC,0x5643,INVALC,0x5645,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5647,INVALC,INVALC,0x5640,
-	0x563F,0x564B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x564C,INVALC,0x563D,
-	0x563C,0x5644,0x564A,INVALC,0x5649,INVALC,0x5B48,INVALC,
-	INVALC,INVALC,INVALC,0x5642,0x564E,0x563B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5B6A,INVALC,INVALC,INVALC,0x5B57,0x5B55,
-	INVALC,INVALC,0x5B4C,INVALC,INVALC,0x5B60,INVALC,INVALC,
-	0x5B5A,INVALC,INVALC,INVALC,0x5B49,INVALC,INVALC,0x5B6C,
-	INVALC,INVALC,INVALC,INVALC,0x5B69,0x5B5D,0x5B68,0x5B53,
-	INVALC,INVALC,INVALC,0x5B54,0x5B4E,INVALC,INVALC,INVALC,
-	INVALC,0x5B56,0x5B5E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5B63,0x5B4B,0x5B61,INVALC,INVALC,INVALC,0x5B58,INVALC,
-	INVALC,0x5B4D,INVALC,INVALC,0x5B4F,INVALC,0x5B6D,INVALC,
-	0x5B67,INVALC,0x5B64,0x5B62,0x5B6B,INVALC,0x5B66,INVALC,
-	INVALC,0x5B65,INVALC,0x5B4A,INVALC,0x5B5C,INVALC,0x5B5B,
-	INVALC,0x5B59,0x5B51,0x5B50,INVALC,INVALC,INVALC,INVALC,
-	/* Block 111, Array index 0x2E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5B52,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6047,0x5B5F,0x6035,INVALC,0x6043,INVALC,INVALC,
-	0x6032,0x602E,INVALC,0x6034,0x6038,0x6033,0x603C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6041,0x603B,INVALC,0x602B,
-	INVALC,INVALC,0x602F,INVALC,0x603E,INVALC,INVALC,INVALC,
-	0x602C,INVALC,0x6040,INVALC,INVALC,INVALC,0x6044,INVALC,
-	INVALC,INVALC,INVALC,0x6042,0x604A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6031,INVALC,INVALC,0x603F,0x6048,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x602D,INVALC,0x6039,INVALC,
-	0x6037,INVALC,INVALC,0x6036,INVALC,INVALC,INVALC,0x604D,
-	INVALC,INVALC,INVALC,0x6049,INVALC,INVALC,INVALC,0x6030,
-	INVALC,0x604C,INVALC,INVALC,INVALC,INVALC,0x603A,0x603D,
-	INVALC,INVALC,0x604B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6046,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6463,INVALC,INVALC,INVALC,INVALC,INVALC,0x646D,INVALC,
-	0x6468,INVALC,INVALC,INVALC,0x646E,0x6464,INVALC,INVALC,
-	INVALC,INVALC,0x645E,INVALC,INVALC,0x6467,INVALC,0x6472,
-	INVALC,INVALC,0x6471,0x646B,INVALC,INVALC,INVALC,0x645F,
-	INVALC,INVALC,INVALC,INVALC,0x6473,INVALC,0x6461,INVALC,
-	INVALC,INVALC,0x646A,INVALC,0x6469,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6462,INVALC,0x646F,0x6466,INVALC,0x6465,
-	INVALC,INVALC,INVALC,0x6045,0x6957,INVALC,INVALC,INVALC,
-	INVALC,0x646C,INVALC,0x6460,0x6470,0x6D5A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6954,INVALC,INVALC,0x6949,
-	INVALC,INVALC,0x6956,INVALC,0x6940,INVALC,INVALC,0x6958,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x693E,0x6948,
-	/* Block 112, Array index 0x2F00 */
-	INVALC,0x6955,0x6946,INVALC,INVALC,INVALC,0x694A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6945,
-	INVALC,INVALC,INVALC,0x693F,0x693D,0x694F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6943,INVALC,0x6947,0x694E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6941,0x6953,0x6950,0x6944,INVALC,INVALC,0x6951,
-	INVALC,0x694B,0x694D,0x693C,INVALC,INVALC,INVALC,INVALC,
-	0x694C,INVALC,INVALC,INVALC,INVALC,INVALC,0x6942,0x6D49,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6D4C,INVALC,INVALC,0x6D4E,INVALC,INVALC,INVALC,
-	0x6D59,INVALC,INVALC,0x6D51,INVALC,INVALC,INVALC,0x6D5D,
-	0x6D5C,INVALC,INVALC,INVALC,0x6D57,INVALC,0x6D4D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6D50,0x6D53,0x6D5B,
-	0x6D56,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6D52,INVALC,0x6D55,INVALC,0x6D4A,INVALC,INVALC,INVALC,
-	0x742A,INVALC,INVALC,INVALC,0x6D4B,INVALC,0x6D4F,INVALC,
-	0x6952,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D54,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D58,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7133,0x7129,INVALC,INVALC,0x712B,INVALC,0x7132,0x712D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7128,INVALC,0x712E,0x7134,INVALC,0x7131,INVALC,
-	INVALC,0x7130,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x712F,0x712C,0x7127,0x712A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x742E,INVALC,INVALC,
-	0x7422,INVALC,INVALC,0x7426,INVALC,INVALC,INVALC,0x7424,
-	0x7425,0x742C,INVALC,INVALC,0x7427,INVALC,INVALC,INVALC,
-	INVALC,0x742D,INVALC,0x7428,0x742B,INVALC,0x742F,0x7429,
-	0x7430,0x7423,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x765D,INVALC,INVALC,INVALC,0x765B,INVALC,
-	/* Block 113, Array index 0x3000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x765C,INVALC,
-	INVALC,0x7659,INVALC,0x765A,INVALC,INVALC,INVALC,0x765F,
-	INVALC,0x765E,INVALC,INVALC,INVALC,0x7845,INVALC,INVALC,
-	0x7846,INVALC,0x7843,0x7840,INVALC,0x7844,INVALC,0x7841,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7842,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7975,INVALC,0x7976,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7974,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7A74,INVALC,INVALC,INVALC,
-	INVALC,0x7B64,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7B65,INVALC,INVALC,INVALC,INVALC,INVALC,0x7C60,INVALC,
-	INVALC,INVALC,INVALC,0x7D24,0x7D32,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4556,INVALC,INVALC,INVALC,INVALC,
-	0x4848,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B22,INVALC,
-	0x4B25,INVALC,INVALC,INVALC,0x4B23,0x4B24,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4E65,INVALC,INVALC,INVALC,0x4E63,INVALC,
-	INVALC,INVALC,0x4E64,INVALC,INVALC,0x4E62,INVALC,INVALC,
-	INVALC,0x4E66,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x523A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5232,0x5235,0x5237,0x5239,0x5236,
-	INVALC,INVALC,INVALC,0x5234,INVALC,INVALC,INVALC,INVALC,
-	0x5238,INVALC,0x5233,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5653,INVALC,0x564F,INVALC,INVALC,INVALC,INVALC,0x5654,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5650,0x5652,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5651,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B72,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5B6E,INVALC,INVALC,INVALC,0x5B71,INVALC,INVALC,
-	/* Block 114, Array index 0x3100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5B6F,0x5B70,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x604E,0x604F,INVALC,0x6055,INVALC,INVALC,INVALC,
-	INVALC,0x6052,INVALC,INVALC,INVALC,INVALC,0x6050,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6051,INVALC,INVALC,INVALC,INVALC,INVALC,0x6053,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6522,INVALC,
-	INVALC,0x6478,INVALC,INVALC,0x647D,INVALC,0x6474,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6524,INVALC,
-	INVALC,0x6475,INVALC,INVALC,0x647A,INVALC,0x6521,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6477,0x647E,0x647C,0x6479,
-	0x6523,0x6476,INVALC,INVALC,0x647B,INVALC,0x6054,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x695B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x695D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x695C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x695E,INVALC,0x6959,INVALC,INVALC,INVALC,
-	INVALC,0x695A,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D5E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6D61,INVALC,INVALC,INVALC,0x6D5F,INVALC,INVALC,INVALC,
-	INVALC,0x6D60,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x713B,INVALC,INVALC,INVALC,INVALC,0x7135,INVALC,
-	INVALC,INVALC,INVALC,0x713F,0x7140,INVALC,INVALC,INVALC,
-	0x7139,0x7136,INVALC,INVALC,INVALC,INVALC,0x713C,INVALC,
-	0x7137,INVALC,0x7138,INVALC,INVALC,0x713A,INVALC,INVALC,
-	INVALC,0x713D,INVALC,INVALC,0x713E,INVALC,INVALC,0x7432,
-	0x7439,INVALC,INVALC,INVALC,INVALC,0x7435,0x7434,0x7431,
-	INVALC,INVALC,INVALC,INVALC,0x7437,0x7436,0x7433,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7438,INVALC,INVALC,INVALC,
-	0x7663,INVALC,INVALC,0x7660,0x7661,INVALC,0x7662,INVALC,
-	/* Block 115, Array index 0x3200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7847,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7848,INVALC,INVALC,
-	0x7977,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7A75,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7D46,INVALC,0x4557,INVALC,0x4E67,0x4E68,INVALC,INVALC,
-	0x523B,INVALC,INVALC,INVALC,INVALC,0x743A,0x4558,INVALC,
-	0x4E69,0x5655,0x6525,0x4559,INVALC,0x5B73,0x695F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x743B,0x455A,
-	0x4E6A,INVALC,INVALC,INVALC,0x6056,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6526,INVALC,INVALC,INVALC,0x6D62,INVALC,
-	0x7849,0x455B,INVALC,0x455C,INVALC,0x484A,INVALC,0x4849,
-	0x4B28,0x4B27,0x4B26,INVALC,INVALC,INVALC,INVALC,0x4E6B,
-	INVALC,0x4E6C,INVALC,INVALC,INVALC,INVALC,INVALC,0x523D,
-	INVALC,INVALC,0x523C,INVALC,0x523E,INVALC,INVALC,INVALC,
-	INVALC,0x5656,INVALC,INVALC,INVALC,0x5B74,INVALC,INVALC,
-	0x6058,0x5B75,INVALC,INVALC,0x6057,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6960,INVALC,INVALC,INVALC,0x6961,INVALC,
-	INVALC,INVALC,INVALC,0x6D63,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x784A,INVALC,INVALC,INVALC,INVALC,0x7A76,
-	INVALC,INVALC,INVALC,INVALC,0x455D,INVALC,INVALC,0x4667,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4E6D,INVALC,0x4B2A,INVALC,0x4B29,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E6E,INVALC,
-	0x4E71,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E70,
-	INVALC,0x4E6F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5240,0x5241,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x523F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x565B,
-	0x565A,0x5658,INVALC,INVALC,0x5657,0x5659,INVALC,INVALC,
-	/* Block 116, Array index 0x3300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5B79,INVALC,INVALC,0x5B78,INVALC,
-	INVALC,0x5B7A,INVALC,0x5B77,0x5B76,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x605A,INVALC,INVALC,
-	INVALC,0x605C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x605B,INVALC,0x6059,0x6527,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x652A,0x6529,
-	INVALC,INVALC,INVALC,INVALC,0x6962,0x6528,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D64,INVALC,
-	0x6963,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D65,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7141,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x743C,INVALC,0x743D,INVALC,INVALC,0x7665,INVALC,0x7664,
-	0x784B,INVALC,0x784C,0x7978,INVALC,INVALC,INVALC,INVALC,
-	0x7B66,INVALC,INVALC,INVALC,0x4668,INVALC,0x565C,0x5B7B,
-	INVALC,0x4669,INVALC,0x455E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B2B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E74,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E76,INVALC,INVALC,
-	0x4E73,0x4E72,INVALC,0x4E75,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5245,0x5248,INVALC,INVALC,INVALC,0x5242,
-	INVALC,INVALC,INVALC,0x5244,INVALC,INVALC,INVALC,INVALC,
-	0x5247,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5243,INVALC,INVALC,0x5246,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5662,INVALC,
-	0x5660,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5661,INVALC,INVALC,0x565D,0x565F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C22,INVALC,
-	/* Block 117, Array index 0x3400 */
-	INVALC,INVALC,INVALC,0x5B7E,INVALC,0x5B7C,0x5C21,INVALC,
-	INVALC,0x565E,0x5B7D,INVALC,INVALC,0x5C23,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6066,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6060,INVALC,INVALC,0x6061,0x6067,INVALC,
-	0x6068,INVALC,0x605E,INVALC,INVALC,INVALC,INVALC,0x6065,
-	INVALC,INVALC,INVALC,0x605F,0x6064,0x6062,0x6063,INVALC,
-	INVALC,INVALC,0x605D,INVALC,INVALC,INVALC,INVALC,0x6531,
-	INVALC,0x6530,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x652D,INVALC,INVALC,
-	INVALC,0x6532,0x652C,0x6533,0x6534,INVALC,0x652F,0x652E,
-	INVALC,INVALC,INVALC,0x6965,0x6964,INVALC,INVALC,INVALC,
-	INVALC,0x6D66,0x6966,INVALC,INVALC,0x6968,INVALC,0x652B,
-	0x6967,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D69,INVALC,
-	0x6D6A,INVALC,INVALC,0x6D68,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6D67,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7144,INVALC,INVALC,INVALC,0x7142,INVALC,0x7146,0x7145,
-	INVALC,INVALC,INVALC,0x7143,INVALC,INVALC,0x7440,0x7666,
-	0x7441,0x743E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x743F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x784D,INVALC,0x7667,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x784E,INVALC,INVALC,INVALC,INVALC,0x7979,
-	INVALC,INVALC,INVALC,INVALC,0x7A78,INVALC,0x7A77,INVALC,
-	INVALC,INVALC,0x7C3C,INVALC,0x466A,INVALC,INVALC,INVALC,
-	0x5C24,INVALC,0x7147,0x784F,0x7B67,INVALC,0x466B,INVALC,
-	INVALC,0x2322,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C25,0x5C26,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 118, Array index 0x3500 */
-	INVALC,INVALC,INVALC,INVALC,0x6969,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7148,0x7149,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7668,INVALC,INVALC,
-	0x466C,INVALC,0x5249,INVALC,0x5C27,INVALC,INVALC,0x466D,
-	INVALC,INVALC,0x5C28,INVALC,INVALC,0x6069,0x606A,INVALC,
-	0x466E,0x466F,INVALC,0x4B2D,0x4B2C,0x524A,INVALC,INVALC,
-	0x4670,0x4671,0x4672,0x4673,INVALC,INVALC,INVALC,0x4B2E,
-	0x4B2F,INVALC,INVALC,INVALC,INVALC,0x4E77,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x524E,0x524C,INVALC,0x524D,0x524B,
-	INVALC,INVALC,INVALC,INVALC,0x5663,INVALC,INVALC,INVALC,
-	INVALC,0x5667,0x5666,INVALC,0x5665,0x5664,INVALC,INVALC,
-	INVALC,INVALC,0x5C2B,INVALC,INVALC,0x5C29,0x5C2A,INVALC,
-	INVALC,INVALC,0x606C,0x606B,INVALC,INVALC,INVALC,INVALC,
-	0x5C2C,INVALC,INVALC,INVALC,INVALC,INVALC,0x6535,INVALC,
-	0x6536,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D6B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7851,0x7850,
-	INVALC,INVALC,0x7B68,0x4674,INVALC,INVALC,INVALC,0x5C2D,
-	INVALC,0x696A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E79,0x4E7A,INVALC,INVALC,0x4E78,INVALC,INVALC,
-	INVALC,INVALC,0x5252,0x5253,0x5250,0x5251,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x524F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x566B,0x566C,INVALC,0x5C30,INVALC,INVALC,
-	0x5671,0x566F,INVALC,INVALC,0x566E,0x566D,0x5668,INVALC,
-	INVALC,INVALC,0x5670,INVALC,INVALC,0x5669,INVALC,0x566A,
-	INVALC,INVALC,0x5C31,INVALC,INVALC,0x5C32,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5C2E,0x5C2F,INVALC,INVALC,
-	0x6071,0x6070,INVALC,0x606E,INVALC,INVALC,0x6072,INVALC,
-	0x6073,INVALC,0x606D,0x606F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6538,0x653B,0x653A,0x653F,0x653E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x653C,INVALC,INVALC,INVALC,INVALC,0x653D,
-	/* Block 119, Array index 0x3600 */
-	0x6537,0x6539,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x696E,INVALC,0x696D,INVALC,0x696C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x696F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D6E,
-	0x6D6C,0x6D71,0x6D72,INVALC,0x6D6F,INVALC,0x6D70,0x696B,
-	INVALC,0x6D6D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x714A,INVALC,INVALC,INVALC,
-	0x714B,INVALC,0x714C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7443,INVALC,INVALC,INVALC,0x7442,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7444,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x766B,INVALC,INVALC,INVALC,0x7669,INVALC,
-	0x766A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7852,
-	INVALC,0x7853,0x797A,INVALC,INVALC,0x797B,INVALC,INVALC,
-	INVALC,0x7A79,INVALC,INVALC,0x7B6A,INVALC,0x7B69,INVALC,
-	INVALC,0x7C61,0x7C62,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5254,INVALC,INVALC,0x6074,0x6075,0x4675,0x484B,INVALC,
-	INVALC,INVALC,0x4B30,INVALC,0x4E7B,INVALC,0x5255,0x5256,
-	0x5257,INVALC,INVALC,0x5672,INVALC,INVALC,0x5C33,INVALC,
-	INVALC,INVALC,INVALC,0x6077,INVALC,INVALC,0x6076,INVALC,
-	INVALC,INVALC,0x6D73,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4676,INVALC,
-	0x5673,INVALC,INVALC,INVALC,0x6078,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6D74,INVALC,INVALC,INVALC,INVALC,0x4677,
-	INVALC,INVALC,0x4E7C,0x525A,INVALC,0x525B,0x5259,INVALC,
-	0x5258,INVALC,0x5674,INVALC,INVALC,0x5675,0x5676,INVALC,
-	INVALC,INVALC,0x5C35,INVALC,0x5C34,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C36,0x6079,INVALC,0x6540,0x6541,
-	INVALC,0x6970,INVALC,0x6971,0x6D75,0x714E,INVALC,0x714D,
-	INVALC,INVALC,0x7445,INVALC,INVALC,INVALC,0x4678,0x4B31,
-	INVALC,INVALC,0x4E7D,INVALC,0x4E7E,INVALC,INVALC,INVALC,
-	0x525E,0x525D,INVALC,INVALC,0x5262,INVALC,0x5261,INVALC,
-	/* Block 120, Array index 0x3700 */
-	INVALC,0x525C,INVALC,INVALC,INVALC,INVALC,INVALC,0x5263,
-	INVALC,0x525F,INVALC,0x5260,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5678,
-	0x5679,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x567A,0x5677,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C3A,0x5C37,
-	0x5C3B,INVALC,0x5C3C,INVALC,0x5C39,INVALC,0x5C38,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x607A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6542,0x654A,INVALC,0x6545,INVALC,
-	INVALC,0x6975,0x654D,0x6546,INVALC,0x654B,0x6544,INVALC,
-	0x654C,INVALC,0x6548,0x6543,0x6549,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6547,INVALC,INVALC,INVALC,0x6973,INVALC,0x6974,
-	INVALC,INVALC,INVALC,INVALC,0x6972,INVALC,INVALC,0x6D77,
-	INVALC,INVALC,INVALC,0x6D7A,0x6D78,INVALC,0x6D76,INVALC,
-	INVALC,0x6D79,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7150,0x7151,
-	0x714F,INVALC,INVALC,INVALC,INVALC,0x7152,INVALC,0x744A,
-	INVALC,INVALC,0x7447,INVALC,0x7449,0x744B,INVALC,INVALC,
-	0x7448,INVALC,INVALC,0x7446,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x766E,0x766F,0x766C,INVALC,0x766D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7854,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7A7A,INVALC,INVALC,INVALC,0x7C63,
-	INVALC,INVALC,0x7D33,0x4679,0x5264,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x467A,0x4B32,INVALC,0x4F21,INVALC,INVALC,
-	INVALC,0x567B,INVALC,INVALC,INVALC,0x607B,0x654E,0x744C,
-	INVALC,INVALC,INVALC,0x467B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4F22,INVALC,INVALC,
-	/* Block 121, Array index 0x3800 */
-	INVALC,INVALC,0x5265,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5267,0x5268,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5266,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5721,INVALC,0x5727,
-	0x5726,INVALC,INVALC,INVALC,INVALC,0x5724,INVALC,0x567D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5725,INVALC,INVALC,
-	0x567C,INVALC,0x5728,INVALC,0x5722,INVALC,INVALC,0x5723,
-	0x567E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C3E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C3F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x607C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C3D,0x607D,INVALC,INVALC,0x607E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6555,INVALC,INVALC,0x6558,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6554,INVALC,INVALC,0x6553,INVALC,0x654F,INVALC,
-	INVALC,0x6556,INVALC,0x6557,INVALC,INVALC,INVALC,0x6551,
-	0x6552,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6977,
-	INVALC,INVALC,INVALC,0x697B,INVALC,INVALC,INVALC,0x6978,
-	INVALC,0x697A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6550,INVALC,INVALC,0x6979,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6D7D,INVALC,0x6E23,INVALC,0x6E21,INVALC,
-	INVALC,0x6976,INVALC,INVALC,INVALC,0x6D7C,INVALC,INVALC,
-	INVALC,INVALC,0x6D7E,0x6D7B,INVALC,INVALC,INVALC,INVALC,
-	0x6E24,INVALC,INVALC,INVALC,INVALC,0x6E22,INVALC,INVALC,
-	INVALC,INVALC,0x7154,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7156,
-	0x7153,INVALC,INVALC,INVALC,0x7155,INVALC,INVALC,0x7450,
-	INVALC,INVALC,INVALC,INVALC,0x744F,INVALC,INVALC,0x744D,
-	INVALC,INVALC,0x744E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 122, Array index 0x3900 */
-	INVALC,0x7451,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7670,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7855,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x797C,INVALC,
-	INVALC,INVALC,0x797D,0x7A21,0x797E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x467C,INVALC,INVALC,INVALC,0x4F23,INVALC,
-	0x4F24,0x4F25,INVALC,INVALC,INVALC,INVALC,0x5269,0x526C,
-	0x526B,0x526A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x572A,INVALC,INVALC,INVALC,INVALC,0x5729,0x572D,0x5730,
-	INVALC,INVALC,0x5731,INVALC,INVALC,0x572F,0x572E,0x572C,
-	0x572B,INVALC,INVALC,INVALC,INVALC,0x5C40,INVALC,INVALC,
-	0x5C41,INVALC,INVALC,INVALC,INVALC,0x5C42,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6559,INVALC,INVALC,INVALC,INVALC,0x655A,
-	INVALC,0x655B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x697E,0x697C,0x697D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7157,0x7452,
-	INVALC,INVALC,0x7453,INVALC,INVALC,INVALC,0x7671,INVALC,
-	INVALC,0x7856,INVALC,0x7B6B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x526D,0x526E,INVALC,INVALC,0x655D,0x467D,0x4B35,
-	0x4B34,0x4B33,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F27,0x4F26,INVALC,0x5271,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x526F,0x5270,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5738,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5735,
-	INVALC,INVALC,INVALC,0x5733,0x5732,INVALC,0x5736,0x5734,
-	INVALC,0x5737,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C43,INVALC,INVALC,INVALC,INVALC,
-	/* Block 123, Array index 0x3A00 */
-	0x6125,INVALC,INVALC,INVALC,INVALC,0x6124,INVALC,INVALC,
-	0x6122,INVALC,INVALC,0x6123,INVALC,0x6121,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6561,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x655F,INVALC,0x655E,INVALC,0x6563,0x6562,
-	0x6560,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A21,INVALC,
-	INVALC,0x6A22,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E29,
-	INVALC,INVALC,INVALC,0x6E2A,0x6E26,0x6E28,INVALC,0x6E25,
-	0x6E27,INVALC,INVALC,INVALC,INVALC,INVALC,0x715A,INVALC,
-	INVALC,INVALC,INVALC,0x715C,0x715B,0x7158,0x7159,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7454,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7674,0x7672,0x7673,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7858,INVALC,0x7857,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x467E,INVALC,0x4B36,INVALC,
-	INVALC,0x4F29,0x4F28,INVALC,INVALC,INVALC,INVALC,0x5272,
-	INVALC,0x5273,INVALC,INVALC,0x5739,INVALC,INVALC,INVALC,
-	0x573A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C44,INVALC,INVALC,0x5C45,0x6128,0x6127,
-	0x6126,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6564,
-	0x6565,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A24,0x6A23,INVALC,INVALC,INVALC,0x6E2C,0x6E2B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x715D,INVALC,INVALC,INVALC,INVALC,0x7455,
-	INVALC,INVALC,INVALC,INVALC,0x7675,0x7676,INVALC,0x7A22,
-	INVALC,INVALC,0x7C3D,0x4721,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x573B,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D7E,
-	0x5D7D,INVALC,INVALC,0x612A,INVALC,0x6129,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A25,INVALC,0x6A26,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7A23,INVALC,
-	INVALC,0x484C,0x4F2A,INVALC,INVALC,0x5275,INVALC,0x5274,
-	/* Block 124, Array index 0x3B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x573C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x573D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C4B,INVALC,0x5C48,INVALC,INVALC,0x5C4C,INVALC,
-	0x5C46,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C4A,INVALC,
-	0x5C47,INVALC,INVALC,INVALC,0x5C49,INVALC,0x5C4D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x612D,INVALC,
-	INVALC,0x612B,INVALC,0x6132,INVALC,0x6131,INVALC,0x6133,
-	0x612E,0x6134,0x612F,INVALC,0x6130,INVALC,0x612C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6568,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x656A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6569,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A2A,INVALC,0x6566,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6A31,INVALC,INVALC,0x6A30,
-	INVALC,INVALC,INVALC,0x6A29,INVALC,INVALC,INVALC,0x6A2E,
-	INVALC,INVALC,INVALC,INVALC,0x6A2D,0x6A28,INVALC,0x6A2B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A2C,INVALC,INVALC,
-	0x6E34,0x6A27,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6E2D,INVALC,INVALC,
-	INVALC,0x6E2E,INVALC,INVALC,0x6E30,INVALC,INVALC,INVALC,
-	0x6A2F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6567,0x6E33,INVALC,INVALC,0x6E2F,INVALC,0x6E31,0x6E32,
-	INVALC,0x7160,INVALC,INVALC,0x6E35,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x715E,INVALC,0x7162,INVALC,INVALC,INVALC,INVALC,
-	0x745B,0x7163,INVALC,INVALC,0x7161,INVALC,0x7165,INVALC,
-	INVALC,0x7164,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7459,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7458,INVALC,
-	/* Block 125, Array index 0x3C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7456,
-	INVALC,INVALC,INVALC,INVALC,0x745A,0x7457,INVALC,INVALC,
-	INVALC,0x715F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x767A,INVALC,
-	INVALC,0x767C,INVALC,0x767B,INVALC,INVALC,INVALC,0x7678,
-	INVALC,INVALC,0x7679,0x7677,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x785D,
-	0x785B,INVALC,INVALC,INVALC,INVALC,0x785C,0x7859,0x785A,
-	0x785E,INVALC,INVALC,0x7A25,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7A24,0x7A26,INVALC,INVALC,
-	0x7A7B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7B6D,
-	0x7B6C,INVALC,INVALC,0x7C3F,0x7C3E,0x7C40,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7D25,INVALC,0x7D26,INVALC,
-	INVALC,INVALC,0x7D4B,0x484D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5276,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x573E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C4E,INVALC,INVALC,0x5C50,INVALC,0x5C4F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6135,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6136,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x656B,INVALC,0x656C,INVALC,0x656D,INVALC,INVALC,
-	INVALC,0x6A32,INVALC,INVALC,INVALC,0x6A33,0x6A34,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6E36,INVALC,INVALC,INVALC,0x2323,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7166,0x7167,INVALC,
-	INVALC,0x7461,INVALC,INVALC,0x745D,0x7462,0x745E,0x7460,
-	0x745C,INVALC,0x745F,INVALC,INVALC,INVALC,INVALC,0x767D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7A27,
-	0x7A28,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x484E,INVALC,INVALC,0x4B37,INVALC,INVALC,0x4F2B,INVALC,
-	/* Block 126, Array index 0x3D00 */
-	0x5279,INVALC,0x5277,INVALC,0x527C,0x5278,0x527D,0x527B,
-	INVALC,0x527A,0x5742,0x5741,INVALC,0x574A,INVALC,INVALC,
-	0x5746,INVALC,INVALC,INVALC,0x5745,0x5747,INVALC,0x5740,
-	INVALC,0x574B,0x5748,0x574C,0x5749,INVALC,INVALC,INVALC,
-	0x5743,0x573F,0x5744,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x613B,INVALC,INVALC,0x5C54,0x5C5B,
-	0x5C58,0x5C5E,0x5C5D,0x5C59,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C55,INVALC,INVALC,0x5C56,INVALC,INVALC,INVALC,
-	0x5C57,INVALC,0x5C5C,0x5C52,0x5C5A,INVALC,0x5C51,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6138,INVALC,INVALC,INVALC,INVALC,0x613A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6573,INVALC,INVALC,0x6137,INVALC,
-	INVALC,0x613E,0x6140,INVALC,INVALC,INVALC,0x613F,INVALC,
-	0x6139,INVALC,INVALC,INVALC,INVALC,INVALC,0x613C,INVALC,
-	0x6141,0x5C53,0x613D,0x6142,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x656F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6571,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6572,
-	INVALC,0x6570,INVALC,0x656E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6A37,INVALC,0x6E43,INVALC,
-	0x6A3A,INVALC,0x6A40,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6A47,0x6A44,INVALC,INVALC,
-	0x6A36,0x6A3E,0x6A3D,INVALC,0x6A3C,0x6A42,INVALC,INVALC,
-	0x6A43,INVALC,0x6A3F,0x6A35,INVALC,0x6A38,0x6A39,0x6A41,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A46,
-	INVALC,INVALC,0x6A3B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6A45,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6E3B,0x6E44,0x6E40,INVALC,INVALC,0x6E3D,0x6E41,INVALC,
-	0x6E37,INVALC,INVALC,0x6E3F,INVALC,INVALC,INVALC,INVALC,
-	0x6E3E,0x6E42,INVALC,INVALC,0x6E3C,INVALC,INVALC,0x6E39,
-	INVALC,INVALC,0x6E45,INVALC,0x6E38,INVALC,INVALC,INVALC,
-	INVALC,0x6E46,INVALC,0x6E3A,INVALC,INVALC,INVALC,INVALC,
-	/* Block 127, Array index 0x3E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x716A,0x716F,0x7168,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7170,0x7169,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x716B,INVALC,0x716E,0x716D,INVALC,
-	INVALC,INVALC,INVALC,0x716C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7469,INVALC,INVALC,0x7463,0x7473,
-	INVALC,0x746B,0x7467,INVALC,0x746E,0x7471,INVALC,0x7466,
-	INVALC,0x746F,INVALC,INVALC,INVALC,0x746A,0x7464,0x7472,
-	INVALC,0x746D,INVALC,0x7468,INVALC,0x746C,0x7465,INVALC,
-	0x7470,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7725,INVALC,0x767E,0x7721,INVALC,INVALC,
-	INVALC,0x7726,0x7723,INVALC,INVALC,INVALC,0x7722,INVALC,
-	INVALC,0x7724,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7862,0x7863,0x785F,INVALC,0x7860,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7864,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7861,INVALC,INVALC,0x7A2B,0x7A2A,INVALC,INVALC,
-	INVALC,INVALC,0x7A2C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7A7D,INVALC,INVALC,0x7A7C,
-	INVALC,INVALC,INVALC,0x7C41,0x7C43,INVALC,0x7C42,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7D39,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 128, Array index 0x3F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x484F,INVALC,
-	0x527E,INVALC,0x574D,INVALC,INVALC,0x5C5F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7474,INVALC,INVALC,INVALC,
-	0x7727,INVALC,INVALC,INVALC,0x7A2D,INVALC,INVALC,INVALC,
-	0x7C64,INVALC,INVALC,INVALC,0x4F2C,0x4B38,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x574E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6575,0x6576,INVALC,INVALC,INVALC,0x6574,INVALC,
-	0x6A48,INVALC,0x6577,INVALC,INVALC,0x6E47,INVALC,0x6E48,
-	INVALC,0x7171,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7865,INVALC,INVALC,
-	0x7C65,INVALC,0x4850,0x4F2E,0x4F2D,INVALC,0x5321,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x574F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C61,INVALC,INVALC,INVALC,0x5C60,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x657A,INVALC,INVALC,INVALC,
-	0x6579,0x6578,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E49,
-	INVALC,INVALC,0x7172,INVALC,INVALC,INVALC,0x7866,INVALC,
-	0x7868,0x7867,INVALC,INVALC,0x7A7E,0x4851,INVALC,0x5322,
-	INVALC,0x5751,INVALC,INVALC,INVALC,0x5750,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5C62,INVALC,0x5C63,INVALC,
-	INVALC,INVALC,0x5C64,INVALC,0x6144,0x6145,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A4B,
-	0x6A49,0x6A4A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6E4A,INVALC,INVALC,INVALC,INVALC,0x7175,INVALC,
-	0x7173,0x7174,INVALC,0x7475,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7728,INVALC,0x7729,0x7476,INVALC,INVALC,INVALC,
-	/* Block 129, Array index 0x4000 */
-	0x7A2E,0x4852,INVALC,0x4853,0x5753,0x4F2F,0x5752,INVALC,
-	INVALC,INVALC,INVALC,0x6146,0x4854,0x5324,INVALC,INVALC,
-	0x5323,0x5325,0x4855,INVALC,INVALC,0x5755,INVALC,0x5757,
-	0x5754,0x5756,INVALC,INVALC,0x5C65,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E4B,INVALC,
-	0x7176,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4856,INVALC,INVALC,0x5326,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5758,INVALC,0x5759,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C67,INVALC,
-	INVALC,INVALC,0x5C66,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6147,INVALC,INVALC,INVALC,0x657B,INVALC,
-	0x657C,INVALC,0x6A4D,INVALC,INVALC,INVALC,0x6A4C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x747A,
-	0x7479,0x7477,0x7478,0x747B,INVALC,INVALC,0x772B,0x772A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7B6F,0x7B6E,0x4857,
-	INVALC,INVALC,INVALC,INVALC,0x657E,0x6148,0x657D,0x6A4E,
-	INVALC,0x4858,INVALC,0x4859,0x485A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4B3A,INVALC,INVALC,0x4B39,INVALC,
-	0x4B3C,INVALC,0x4B3E,0x4B3D,INVALC,0x4B3B,INVALC,INVALC,
-	INVALC,0x4F34,0x4F32,INVALC,INVALC,0x4F31,INVALC,INVALC,
-	INVALC,0x4F36,0x4F38,0x4F35,INVALC,INVALC,INVALC,0x4F39,
-	INVALC,0x4F33,0x4B3F,INVALC,0x4F37,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F30,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x532A,0x532B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x532C,INVALC,0x532F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5327,INVALC,
-	INVALC,INVALC,0x5329,0x532E,INVALC,0x5332,0x5330,INVALC,
-	INVALC,0x532D,INVALC,INVALC,0x5331,0x5328,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x575E,INVALC,0x5767,
-	0x575C,0x575A,INVALC,0x5762,0x575F,INVALC,INVALC,INVALC,
-	0x5761,INVALC,INVALC,INVALC,0x5766,0x5764,INVALC,INVALC,
-	/* Block 130, Array index 0x4100 */
-	INVALC,INVALC,0x575B,INVALC,INVALC,0x575D,0x5760,INVALC,
-	0x5763,INVALC,0x5765,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C69,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C6A,0x5C6E,INVALC,INVALC,INVALC,
-	INVALC,0x5C6C,INVALC,0x5C6B,INVALC,INVALC,INVALC,0x5C68,
-	0x5C6D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x614E,INVALC,INVALC,INVALC,INVALC,0x6150,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x614F,INVALC,
-	INVALC,INVALC,INVALC,0x614B,0x6151,INVALC,0x614D,INVALC,
-	0x6A4F,0x614C,INVALC,0x6152,0x614A,0x6149,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6624,0x662A,INVALC,
-	INVALC,INVALC,INVALC,0x6627,INVALC,INVALC,0x6625,INVALC,
-	0x6622,0x6621,INVALC,0x6626,0x6153,INVALC,INVALC,INVALC,
-	0x6623,0x6628,0x6629,INVALC,INVALC,INVALC,INVALC,0x6A54,
-	0x6A50,INVALC,0x6A55,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6A52,INVALC,0x6A53,INVALC,INVALC,INVALC,INVALC,0x6A51,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6E51,INVALC,0x6E50,0x6E4C,0x6E4D,0x6E4E,INVALC,INVALC,
-	0x6E4F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7179,0x7178,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7177,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x747E,INVALC,INVALC,0x7524,0x7526,0x7523,
-	0x7522,INVALC,0x7521,0x747D,INVALC,INVALC,0x747C,INVALC,
-	INVALC,0x7525,INVALC,INVALC,INVALC,0x772C,INVALC,0x772D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7869,INVALC,0x7A2F,INVALC,INVALC,INVALC,INVALC,0x7B70,
-	INVALC,INVALC,0x7C44,0x485B,INVALC,0x4F3A,INVALC,0x6A56,
-	0x7527,INVALC,0x485C,INVALC,0x5769,0x5768,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x485D,0x5333,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6A57,0x717A,0x485E,INVALC,0x4F3B,INVALC,
-	/* Block 131, Array index 0x4200 */
-	0x576A,INVALC,0x5C6F,INVALC,INVALC,0x662B,INVALC,0x6A58,
-	0x717B,0x7528,0x772E,INVALC,0x485F,0x4F3C,INVALC,INVALC,
-	0x576B,INVALC,0x6154,INVALC,0x6A59,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4860,0x6155,INVALC,0x6A5A,0x4861,
-	INVALC,INVALC,0x5334,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x576E,INVALC,0x576C,0x576D,0x576F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5C70,0x5C72,0x5C71,
-	INVALC,0x5C73,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x662C,
-	INVALC,INVALC,INVALC,0x6A5B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x717C,0x717D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7A30,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4862,0x4B40,
-	INVALC,0x7529,0x4863,INVALC,INVALC,INVALC,INVALC,0x7C6C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4864,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4B42,INVALC,0x4B43,INVALC,INVALC,
-	INVALC,INVALC,0x4B41,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F3F,INVALC,INVALC,INVALC,0x4F3E,INVALC,0x4F42,
-	INVALC,INVALC,INVALC,0x4F49,INVALC,0x4F46,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4F45,0x4F40,INVALC,0x4F47,
-	0x4F4A,0x4F44,INVALC,0x4F3D,INVALC,INVALC,INVALC,0x4F4C,
-	0x4F48,0x4F43,INVALC,0x5770,INVALC,0x4F41,0x4F4B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5345,0x533F,0x5347,0x5344,INVALC,INVALC,0x5340,
-	INVALC,INVALC,INVALC,0x5339,0x5343,INVALC,0x5346,0x5348,
-	INVALC,INVALC,INVALC,0x5338,INVALC,0x533C,0x533A,0x5335,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5349,
-	INVALC,0x5341,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 132, Array index 0x4300 */
-	INVALC,0x5342,0x533D,0x5336,0x533B,0x5337,0x534A,INVALC,
-	INVALC,0x533E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x577E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5823,INVALC,INVALC,0x5771,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5822,0x577B,INVALC,0x5779,0x5778,0x577D,INVALC,
-	0x5775,0x577C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5821,INVALC,INVALC,0x5824,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5777,0x5774,INVALC,INVALC,INVALC,INVALC,0x577A,
-	0x5776,INVALC,0x5772,INVALC,0x5773,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D23,
-	0x5C77,INVALC,INVALC,0x5D24,0x5D25,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D26,INVALC,
-	INVALC,0x5D21,0x5C7D,INVALC,INVALC,INVALC,0x5C74,INVALC,
-	INVALC,INVALC,0x5C7C,0x5C7E,INVALC,INVALC,0x5C79,INVALC,
-	0x5C76,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C75,INVALC,
-	0x5D22,INVALC,0x5C78,INVALC,INVALC,INVALC,INVALC,0x5D27,
-	INVALC,INVALC,INVALC,0x5C7B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5C7A,INVALC,INVALC,
-	INVALC,0x615D,INVALC,INVALC,INVALC,0x615B,INVALC,INVALC,
-	INVALC,INVALC,0x6168,INVALC,0x6165,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x616E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x616C,INVALC,INVALC,0x616F,
-	0x615A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6156,INVALC,INVALC,INVALC,INVALC,INVALC,0x615E,
-	0x6163,0x615F,0x6167,INVALC,0x6160,INVALC,INVALC,INVALC,
-	0x6158,INVALC,INVALC,INVALC,INVALC,0x6166,INVALC,INVALC,
-	/* Block 133, Array index 0x4400 */
-	INVALC,INVALC,INVALC,0x6157,0x616B,INVALC,INVALC,0x616D,
-	INVALC,INVALC,0x6162,0x615C,0x6164,0x6159,0x616A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x655C,INVALC,INVALC,INVALC,
-	INVALC,0x6630,INVALC,INVALC,INVALC,0x6638,INVALC,INVALC,
-	0x6169,INVALC,INVALC,INVALC,0x6637,0x662F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x663D,INVALC,
-	INVALC,0x6634,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6161,
-	INVALC,INVALC,INVALC,0x6636,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6639,INVALC,0x663A,INVALC,INVALC,0x6632,INVALC,
-	INVALC,0x663B,INVALC,0x6633,0x6635,0x663C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6631,INVALC,0x662E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x662D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6A68,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A60,INVALC,INVALC,0x6A63,INVALC,0x6A61,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6A62,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6A65,INVALC,INVALC,INVALC,0x6A69,INVALC,INVALC,0x6A5D,
-	0x6A66,INVALC,INVALC,INVALC,0x6A5F,INVALC,0x6A5E,INVALC,
-	INVALC,0x6A5C,0x6A6B,0x6A64,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A6A,INVALC,0x6A67,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6E5D,INVALC,0x6E55,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E5F,
-	/* Block 134, Array index 0x4500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E60,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6E59,INVALC,0x6E58,0x6E5C,INVALC,INVALC,0x6E52,
-	INVALC,INVALC,0x6E54,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6E5B,INVALC,0x6E5A,INVALC,0x6E5E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6E56,0x6E57,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6E53,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7225,INVALC,INVALC,INVALC,INVALC,
-	0x7222,0x7226,0x717E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7221,INVALC,INVALC,INVALC,INVALC,0x7229,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7223,0x7224,0x7228,INVALC,INVALC,0x7227,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x752C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x752B,INVALC,INVALC,0x7532,
-	INVALC,INVALC,0x7534,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x752E,INVALC,INVALC,0x752F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7531,0x752D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7535,INVALC,
-	0x7533,0x7730,0x752A,INVALC,INVALC,INVALC,INVALC,0x7530,
-	0x7734,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7736,0x7735,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7733,INVALC,INVALC,INVALC,0x7731,INVALC,0x772F,
-	0x7732,INVALC,INVALC,INVALC,INVALC,0x786D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x786B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x786E,0x786F,INVALC,INVALC,
-	INVALC,0x786A,0x786C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7870,
-	INVALC,0x7A32,0x7A34,0x7A31,INVALC,INVALC,INVALC,INVALC,
-	/* Block 135, Array index 0x4600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7A35,0x7A37,
-	INVALC,INVALC,0x7A38,0x7A36,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7A33,INVALC,INVALC,INVALC,INVALC,INVALC,0x7B21,
-	INVALC,INVALC,0x7B23,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7B22,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7C45,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7C46,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F4D,INVALC,
-	0x534B,INVALC,INVALC,INVALC,0x5825,0x5D28,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6170,0x663F,INVALC,0x663E,0x6640,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7536,
-	INVALC,INVALC,INVALC,0x4865,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F4E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x534C,0x534E,0x534D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5826,INVALC,0x582B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5828,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x582D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x582C,0x5829,INVALC,INVALC,INVALC,
-	INVALC,0x582A,0x5827,INVALC,INVALC,INVALC,INVALC,0x5D32,
-	INVALC,0x5D31,INVALC,INVALC,INVALC,0x5D2E,0x5D2C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D2B,INVALC,INVALC,INVALC,0x5D2D,INVALC,0x5D2F,0x5D2A,
-	INVALC,0x5D33,INVALC,0x5D30,INVALC,INVALC,INVALC,INVALC,
-	0x6177,INVALC,INVALC,INVALC,0x6174,INVALC,INVALC,INVALC,
-	INVALC,0x6172,INVALC,0x6175,INVALC,INVALC,0x6178,0x6171,
-	INVALC,INVALC,INVALC,INVALC,0x6176,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6173,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6641,INVALC,0x6647,INVALC,INVALC,0x6646,INVALC,
-	/* Block 136, Array index 0x4700 */
-	0x6645,INVALC,0x6648,0x6649,INVALC,INVALC,0x664A,0x6644,
-	0x6643,INVALC,0x664B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6642,INVALC,INVALC,INVALC,INVALC,
-	0x6A72,INVALC,INVALC,INVALC,0x6A6D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6A6F,INVALC,INVALC,0x6A70,INVALC,INVALC,
-	INVALC,0x6A75,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6A71,INVALC,INVALC,0x6A74,
-	INVALC,INVALC,INVALC,0x6A6E,INVALC,INVALC,INVALC,0x6A6C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6E6A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6E6B,INVALC,0x6A73,INVALC,0x6E69,
-	INVALC,0x6E68,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6E64,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E65,INVALC,
-	0x6E67,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6E62,INVALC,0x6E63,INVALC,
-	0x6E66,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6E61,0x722A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x722E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x722C,0x722B,
-	INVALC,INVALC,0x722D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x753C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7539,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x753E,0x753D,INVALC,INVALC,INVALC,INVALC,
-	0x7537,INVALC,INVALC,INVALC,INVALC,INVALC,0x753B,INVALC,
-	0x753F,INVALC,INVALC,0x7540,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7538,0x753A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x773A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7738,INVALC,INVALC,0x7737,
-	INVALC,INVALC,0x7739,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7874,INVALC,0x7871,INVALC,INVALC,0x7875,INVALC,
-	/* Block 137, Array index 0x4800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7872,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7873,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7A39,0x7A3A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7B27,
-	INVALC,0x7B26,0x7B25,0x7B24,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7C47,INVALC,INVALC,INVALC,INVALC,0x7C66,INVALC,
-	INVALC,0x7C67,INVALC,0x7D27,INVALC,INVALC,INVALC,INVALC,
-	0x4866,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4867,0x534F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D34,INVALC,INVALC,INVALC,0x6179,
-	INVALC,0x664C,INVALC,0x6E6C,INVALC,0x6E6D,INVALC,INVALC,
-	INVALC,0x722F,0x7C68,0x4868,INVALC,INVALC,INVALC,INVALC,
-	0x4F50,INVALC,INVALC,0x5350,INVALC,INVALC,INVALC,INVALC,
-	0x582E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x582F,
-	INVALC,0x5833,INVALC,INVALC,INVALC,0x5832,INVALC,INVALC,
-	INVALC,0x5830,0x5831,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D36,INVALC,INVALC,0x5D3B,INVALC,0x5D3A,INVALC,INVALC,
-	INVALC,INVALC,0x5D38,INVALC,INVALC,INVALC,0x5D39,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D35,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D37,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x617C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x617A,0x617B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6654,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6656,INVALC,0x664E,0x6655,INVALC,INVALC,
-	0x6651,0x664F,INVALC,INVALC,0x6650,0x6652,INVALC,0x664D,
-	INVALC,0x6653,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6A7C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A7E,
-	INVALC,INVALC,INVALC,0x6A76,0x6A78,INVALC,INVALC,INVALC,
-	0x6A7A,0x6A79,INVALC,INVALC,INVALC,0x6A7B,INVALC,INVALC,
-	/* Block 138, Array index 0x4900 */
-	INVALC,INVALC,0x6A77,INVALC,INVALC,INVALC,INVALC,0x6E6F,
-	INVALC,INVALC,0x6E73,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6E6E,INVALC,0x6E70,0x6E71,INVALC,0x6E72,INVALC,INVALC,
-	INVALC,INVALC,0x6A7D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7234,INVALC,INVALC,INVALC,0x7232,INVALC,INVALC,
-	INVALC,INVALC,0x7230,0x7233,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7231,INVALC,INVALC,INVALC,0x7542,INVALC,
-	0x7544,INVALC,INVALC,0x7541,INVALC,0x7545,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7543,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7878,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7879,0x7877,
-	0x7876,INVALC,INVALC,INVALC,0x7A3B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7B28,INVALC,0x7B29,INVALC,INVALC,0x7B72,
-	INVALC,INVALC,0x7B71,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4869,
-	INVALC,0x5351,INVALC,0x617D,INVALC,INVALC,0x773B,INVALC,
-	INVALC,INVALC,INVALC,0x4B44,INVALC,INVALC,INVALC,0x5D3D,
-	INVALC,INVALC,INVALC,0x5D3C,INVALC,INVALC,0x617E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6657,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7236,INVALC,
-	INVALC,INVALC,0x7235,INVALC,0x7546,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x773C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7A3C,INVALC,INVALC,0x7B2A,INVALC,INVALC,
-	0x7D28,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B45,INVALC,0x5352,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6658,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x773D,INVALC,INVALC,INVALC,
-	0x7A3D,INVALC,INVALC,INVALC,0x7B73,INVALC,INVALC,INVALC,
-	/* Block 139, Array index 0x4A00 */
-	0x4B46,INVALC,0x5354,0x5355,INVALC,INVALC,INVALC,INVALC,
-	0x5353,INVALC,0x5839,INVALC,0x5837,INVALC,0x5836,0x583D,
-	0x5835,0x583E,INVALC,0x583B,INVALC,0x5838,0x583C,0x583A,
-	0x5834,INVALC,INVALC,0x5D45,INVALC,0x5D3F,INVALC,0x5D44,
-	INVALC,INVALC,0x5D46,0x5D40,INVALC,0x5D41,INVALC,INVALC,
-	INVALC,INVALC,0x5D3E,INVALC,INVALC,0x5D43,INVALC,INVALC,
-	INVALC,0x5D42,INVALC,INVALC,0x622B,INVALC,0x622D,INVALC,
-	INVALC,INVALC,0x622C,0x6221,0x6225,INVALC,0x666B,INVALC,
-	INVALC,0x6226,INVALC,INVALC,INVALC,INVALC,0x622A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6229,INVALC,INVALC,INVALC,0x6227,0x6223,0x622E,INVALC,
-	INVALC,INVALC,INVALC,0x6228,INVALC,INVALC,0x6224,INVALC,
-	0x6222,INVALC,0x6666,0x6661,INVALC,INVALC,0x665C,INVALC,
-	0x666C,0x665D,INVALC,0x6659,0x6668,0x6665,0x6667,INVALC,
-	0x665E,0x6663,0x665A,0x665B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6669,INVALC,0x666A,0x6660,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6664,INVALC,0x665F,
-	INVALC,INVALC,INVALC,INVALC,0x6B22,0x6B25,INVALC,INVALC,
-	INVALC,0x6B2D,INVALC,0x6B27,INVALC,0x6E78,INVALC,INVALC,
-	0x6B2C,INVALC,0x6B2E,INVALC,INVALC,INVALC,0x6B23,INVALC,
-	0x6662,0x6B26,INVALC,0x6B24,0x6B28,0x6B2A,0x6B21,0x6B2F,
-	0x6B2B,INVALC,0x6B29,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F21,INVALC,0x6E7B,INVALC,INVALC,INVALC,0x6F24,INVALC,
-	INVALC,0x6F25,INVALC,INVALC,0x6E74,INVALC,INVALC,0x6E7E,
-	INVALC,INVALC,0x6E7D,INVALC,0x6E77,INVALC,INVALC,0x6E76,
-	INVALC,0x6E7C,INVALC,0x6E79,INVALC,0x6F23,INVALC,INVALC,
-	INVALC,INVALC,0x6E75,INVALC,INVALC,INVALC,0x6F22,INVALC,
-	INVALC,INVALC,INVALC,0x6F26,0x723C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7237,0x723D,
-	INVALC,INVALC,INVALC,0x7239,INVALC,0x7243,0x723E,INVALC,
-	INVALC,0x723A,INVALC,0x7244,INVALC,INVALC,0x7245,0x7242,
-	0x6E7A,INVALC,0x7238,INVALC,0x7246,INVALC,0x723F,INVALC,
-	/* Block 140, Array index 0x4B00 */
-	0x723B,0x7240,0x7241,INVALC,0x754E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x754B,INVALC,INVALC,INVALC,0x7547,INVALC,
-	0x754F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7548,
-	INVALC,0x7549,INVALC,0x754A,INVALC,0x754D,INVALC,INVALC,
-	0x754C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x773E,INVALC,INVALC,0x7741,0x7740,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x773F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x787A,INVALC,INVALC,INVALC,INVALC,0x7923,INVALC,
-	INVALC,0x787D,INVALC,INVALC,INVALC,INVALC,0x7921,0x7922,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x787C,0x7924,0x787E,INVALC,0x787B,INVALC,INVALC,0x7A42,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7A40,INVALC,
-	INVALC,INVALC,INVALC,0x7A43,0x7A3F,INVALC,INVALC,0x7A41,
-	0x7A3E,INVALC,INVALC,INVALC,0x7B2B,INVALC,INVALC,0x7B2C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7B2D,INVALC,INVALC,
-	0x7B74,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7C48,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7C6A,0x7C69,INVALC,INVALC,0x7C6B,INVALC,
-	INVALC,INVALC,0x7D34,INVALC,0x7D3A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 141, Array index 0x4C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B47,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7551,
-	INVALC,0x7550,INVALC,INVALC,INVALC,INVALC,0x4B48,INVALC,
-	0x583F,0x5D47,INVALC,INVALC,0x6F27,INVALC,0x6F28,INVALC,
-	0x7742,INVALC,INVALC,INVALC,0x7D43,0x4B49,INVALC,INVALC,
-	INVALC,INVALC,0x5D48,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x622F,0x666D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6B30,0x7247,0x6F29,0x7248,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7552,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5841,0x5840,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6230,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x666F,0x666E,INVALC,0x6B32,0x6B31,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7249,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B4A,0x5356,INVALC,
-	0x5357,0x5842,0x5843,INVALC,INVALC,INVALC,INVALC,0x5D4E,
-	0x5D4C,0x5D49,0x5D4D,0x5D4B,0x5D4A,INVALC,INVALC,0x6231,
-	INVALC,INVALC,0x6674,0x6233,0x6238,INVALC,0x623A,0x6239,
-	0x623C,INVALC,INVALC,0x6236,0x6232,0x6234,INVALC,0x623B,
-	0x6237,0x6235,0x6676,0x6675,0x6673,0x6677,INVALC,0x6671,
-	0x6672,INVALC,0x6670,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B34,0x6B35,0x6B33,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6F32,INVALC,0x6F2B,INVALC,
-	0x6F2A,0x6F34,0x6F30,0x6F31,0x6F2D,INVALC,0x6F2C,INVALC,
-	INVALC,INVALC,0x6F33,INVALC,0x6F2E,0x6F2F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x724A,INVALC,INVALC,INVALC,
-	0x7556,INVALC,0x7553,0x7557,0x7555,0x7554,INVALC,INVALC,
-	/* Block 142, Array index 0x4D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7743,INVALC,INVALC,
-	0x7925,INVALC,0x7926,INVALC,INVALC,0x7A45,INVALC,0x7A44,
-	INVALC,INVALC,INVALC,0x7B2E,INVALC,INVALC,0x7B75,0x7B76,
-	INVALC,INVALC,INVALC,0x7C6D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4B4B,INVALC,0x5D50,0x5D4F,
-	INVALC,INVALC,INVALC,0x6B36,INVALC,0x6F35,INVALC,INVALC,
-	0x4B4C,INVALC,INVALC,0x5359,0x5358,INVALC,INVALC,0x5844,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x623F,INVALC,INVALC,INVALC,0x623E,INVALC,INVALC,
-	INVALC,INVALC,0x623D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6B38,INVALC,INVALC,
-	INVALC,0x6B37,INVALC,INVALC,INVALC,INVALC,INVALC,0x6F36,
-	INVALC,INVALC,INVALC,0x6F37,INVALC,INVALC,INVALC,INVALC,
-	0x7558,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4B4D,0x535A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D52,INVALC,INVALC,INVALC,0x5D51,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6247,INVALC,
-	INVALC,INVALC,INVALC,0x6242,0x6245,INVALC,0x6240,INVALC,
-	INVALC,0x6244,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6243,0x6246,INVALC,0x6241,INVALC,0x6679,
-	INVALC,0x6678,INVALC,INVALC,0x6721,INVALC,0x6722,INVALC,
-	0x667A,INVALC,0x667E,INVALC,INVALC,INVALC,INVALC,0x667B,
-	INVALC,INVALC,INVALC,0x667C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x667D,INVALC,0x6B39,INVALC,INVALC,INVALC,
-	/* Block 143, Array index 0x4E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6F3C,
-	0x6F39,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6F3A,0x6F40,0x6F3E,
-	INVALC,0x6F3F,0x6F3B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F3D,INVALC,0x6F38,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x724C,INVALC,INVALC,0x724D,0x7250,INVALC,INVALC,
-	INVALC,0x724F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x724E,INVALC,0x724B,INVALC,INVALC,INVALC,
-	0x755B,0x7559,0x755C,0x755A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7749,INVALC,INVALC,
-	INVALC,0x7744,INVALC,INVALC,INVALC,INVALC,INVALC,0x7748,
-	INVALC,INVALC,INVALC,0x7745,0x7747,INVALC,0x7746,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x792B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7928,INVALC,0x792D,INVALC,0x792A,INVALC,
-	INVALC,INVALC,0x792C,INVALC,0x7927,INVALC,INVALC,INVALC,
-	INVALC,0x7A47,0x7A49,INVALC,INVALC,0x7A48,INVALC,0x7929,
-	INVALC,0x7A46,0x7B2F,0x7B31,INVALC,0x7B30,INVALC,INVALC,
-	INVALC,0x7B77,INVALC,0x7B78,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7D29,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7D3B,0x4B4E,0x5845,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6723,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6F41,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x774A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B4F,0x4F51,0x535C,0x535B,INVALC,0x5848,
-	INVALC,INVALC,0x5846,INVALC,0x5847,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D53,INVALC,INVALC,INVALC,0x5D54,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6249,INVALC,INVALC,0x6248,0x624A,INVALC,0x6726,INVALC,
-	/* Block 144, Array index 0x4F00 */
-	INVALC,INVALC,INVALC,0x6724,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6725,0x6727,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6B3B,0x6B3D,0x6B3A,0x6B3C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6F43,0x6F48,0x6F42,0x6F49,0x6F44,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6F4A,0x6F46,INVALC,
-	INVALC,0x6F45,0x6F47,INVALC,INVALC,INVALC,INVALC,0x7252,
-	INVALC,INVALC,INVALC,0x7254,INVALC,INVALC,INVALC,INVALC,
-	0x7253,INVALC,INVALC,0x7251,INVALC,INVALC,0x755E,0x7561,
-	INVALC,INVALC,0x755F,INVALC,0x755D,0x7560,INVALC,INVALC,
-	INVALC,0x774B,INVALC,INVALC,INVALC,0x774C,0x792F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x792E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7B32,
-	INVALC,0x7B79,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4B50,0x624B,INVALC,INVALC,0x6728,
-	INVALC,INVALC,INVALC,0x6B3E,INVALC,INVALC,0x7256,INVALC,
-	0x7255,INVALC,INVALC,INVALC,INVALC,0x7930,0x7A29,0x7B33,
-	0x4B51,0x5849,0x6729,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B52,INVALC,0x4B55,0x4B54,0x4B53,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F52,INVALC,
-	INVALC,0x4F54,INVALC,INVALC,0x4F53,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x535F,INVALC,0x5364,0x5361,0x535E,INVALC,
-	0x5365,INVALC,0x5360,0x5363,INVALC,0x5362,INVALC,INVALC,
-	0x535D,INVALC,INVALC,INVALC,0x584F,INVALC,INVALC,0x584C,
-	0x5853,INVALC,0x584E,INVALC,INVALC,0x5851,INVALC,INVALC,
-	/* Block 145, Array index 0x5000 */
-	0x584D,0x584A,INVALC,0x5850,INVALC,0x5852,0x584B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5D56,INVALC,0x5D60,
-	0x5D5C,INVALC,INVALC,INVALC,0x5D64,0x5D5D,0x5D62,0x5D58,
-	INVALC,0x5D55,0x5D57,0x5D63,INVALC,0x5D5B,0x5D5E,0x5D5A,
-	0x5D5F,INVALC,0x5D61,0x5D59,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x624C,INVALC,
-	INVALC,0x624E,0x6250,INVALC,INVALC,0x624D,0x6251,INVALC,
-	0x624F,INVALC,INVALC,INVALC,0x672F,INVALC,0x6737,INVALC,
-	INVALC,0x6738,0x672D,INVALC,INVALC,INVALC,INVALC,0x6732,
-	INVALC,INVALC,0x672B,0x672A,INVALC,0x6735,0x6734,0x6733,
-	0x6731,0x6736,INVALC,0x672C,0x672E,0x6730,INVALC,INVALC,
-	0x6B40,0x6B43,INVALC,0x6B47,0x6B41,0x6B46,0x6B44,INVALC,
-	0x6B3F,INVALC,0x6B45,0x6B42,INVALC,INVALC,INVALC,INVALC,
-	0x6F4D,0x6F4B,INVALC,INVALC,INVALC,0x6F4E,0x6F4C,INVALC,
-	INVALC,INVALC,0x725A,INVALC,0x7258,0x7257,INVALC,0x6F4F,
-	0x7259,INVALC,0x725C,INVALC,0x725B,0x7563,INVALC,0x7562,
-	0x7567,0x7565,0x7566,0x774E,0x7564,INVALC,INVALC,0x774D,
-	0x774F,INVALC,0x7931,0x7932,INVALC,INVALC,INVALC,0x7C4A,
-	0x7C49,0x4B57,INVALC,INVALC,INVALC,0x5854,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B58,0x4B5B,INVALC,INVALC,0x4B5A,INVALC,
-	INVALC,INVALC,0x4B59,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F57,INVALC,INVALC,INVALC,0x4F55,0x4F58,INVALC,
-	0x4F56,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5368,INVALC,0x5369,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5366,INVALC,INVALC,INVALC,0x5367,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5856,INVALC,INVALC,
-	INVALC,0x5855,0x5857,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D65,INVALC,INVALC,INVALC,INVALC,0x5D66,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6253,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5D67,0x6255,INVALC,
-	/* Block 146, Array index 0x5100 */
-	INVALC,INVALC,0x6252,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6254,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6739,INVALC,INVALC,INVALC,INVALC,0x673A,
-	0x6B49,0x6B48,INVALC,INVALC,INVALC,INVALC,0x6B4A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6F52,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6F51,INVALC,INVALC,
-	0x6F50,0x6F53,INVALC,INVALC,0x725D,INVALC,INVALC,INVALC,
-	INVALC,0x7568,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7B7A,0x4B5C,0x536B,0x536A,0x585A,0x5859,INVALC,INVALC,
-	INVALC,INVALC,0x5858,INVALC,INVALC,INVALC,INVALC,0x5D68,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6256,INVALC,0x6257,INVALC,INVALC,
-	INVALC,0x673D,0x673C,INVALC,0x673B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6B4E,0x6B4B,INVALC,0x6B4D,
-	0x6B4C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6F57,INVALC,INVALC,INVALC,0x6F54,
-	INVALC,0x6F55,INVALC,0x6F56,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x725E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x756B,INVALC,0x756A,INVALC,
-	INVALC,INVALC,INVALC,0x7569,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7750,0x7751,INVALC,0x7934,INVALC,
-	INVALC,0x7933,INVALC,INVALC,0x7A4A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7B34,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7C6E,0x7D2A,INVALC,INVALC,INVALC,0x7D3C,0x4B5D,0x4F59,
-	INVALC,0x673E,INVALC,0x7A4B,0x4B5E,0x536C,0x5D69,0x6258,
-	0x7752,0x4F5A,INVALC,INVALC,INVALC,INVALC,INVALC,0x585D,
-	0x585B,0x585F,INVALC,INVALC,0x585E,0x585C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D6C,INVALC,INVALC,0x5D6B,0x5D6D,
-	INVALC,0x5D6F,INVALC,INVALC,INVALC,0x5D6E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5D6A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 147, Array index 0x5200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6260,
-	INVALC,0x625C,INVALC,INVALC,INVALC,0x625E,INVALC,INVALC,
-	0x625F,0x6261,INVALC,INVALC,0x6259,0x625A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x625D,INVALC,
-	INVALC,INVALC,INVALC,0x625B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6749,INVALC,INVALC,0x673F,
-	0x6741,0x674D,INVALC,INVALC,INVALC,0x6742,0x6744,0x674E,
-	0x6743,INVALC,INVALC,INVALC,INVALC,0x674C,INVALC,INVALC,
-	INVALC,0x674A,INVALC,0x6746,INVALC,0x674B,INVALC,INVALC,
-	INVALC,0x6748,INVALC,INVALC,INVALC,INVALC,INVALC,0x6740,
-	INVALC,INVALC,0x674F,0x6745,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6747,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6B4F,INVALC,INVALC,0x6B55,0x6B59,INVALC,INVALC,INVALC,
-	0x6B51,INVALC,INVALC,INVALC,INVALC,0x6B52,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B5A,INVALC,0x6B56,INVALC,INVALC,0x6B54,INVALC,
-	0x6B53,INVALC,INVALC,INVALC,0x6B57,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6B58,INVALC,INVALC,INVALC,0x6B50,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6F63,0x6F5E,INVALC,INVALC,INVALC,0x6F5A,
-	INVALC,INVALC,INVALC,0x6F59,0x6F5F,INVALC,INVALC,INVALC,
-	INVALC,0x6F5D,INVALC,INVALC,INVALC,0x6F58,INVALC,0x6F61,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6F60,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6F5C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6F5B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F62,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7261,INVALC,INVALC,INVALC,0x7265,INVALC,INVALC,INVALC,
-	/* Block 148, Array index 0x5300 */
-	INVALC,INVALC,INVALC,INVALC,0x7267,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7269,INVALC,INVALC,INVALC,INVALC,0x726C,INVALC,INVALC,
-	0x7573,0x726E,0x7268,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x725F,0x726B,0x7264,INVALC,INVALC,INVALC,0x726A,INVALC,
-	0x756E,INVALC,INVALC,0x7266,INVALC,INVALC,0x726D,0x7263,
-	INVALC,INVALC,INVALC,0x7262,INVALC,INVALC,0x7260,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7570,0x7572,INVALC,0x756C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7579,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7578,0x7576,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7571,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7575,INVALC,INVALC,INVALC,
-	0x7577,INVALC,INVALC,INVALC,INVALC,0x756F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7574,INVALC,
-	INVALC,INVALC,0x756D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7754,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7753,INVALC,0x7755,0x775D,
-	0x775B,INVALC,0x775C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7756,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7759,INVALC,0x7758,INVALC,
-	0x775A,INVALC,INVALC,0x7757,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7938,INVALC,INVALC,INVALC,INVALC,
-	0x7939,INVALC,INVALC,INVALC,INVALC,0x793E,INVALC,INVALC,
-	INVALC,0x7936,INVALC,INVALC,INVALC,INVALC,0x793C,0x7941,
-	0x793F,INVALC,INVALC,INVALC,0x793A,0x793B,INVALC,0x7937,
-	INVALC,0x7935,0x793D,INVALC,0x7940,INVALC,INVALC,INVALC,
-	0x7942,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7A4E,INVALC,INVALC,
-	/* Block 149, Array index 0x5400 */
-	INVALC,INVALC,INVALC,0x7A4D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7A4C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7B3B,INVALC,INVALC,0x7B35,INVALC,
-	INVALC,INVALC,0x7B3A,0x7B36,INVALC,0x7B37,INVALC,INVALC,
-	0x7B39,INVALC,0x7B38,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7B7B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7B7C,0x7B7D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7C4C,INVALC,INVALC,0x7C4B,0x7C4D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7C6F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7D2C,INVALC,0x7D2B,INVALC,INVALC,INVALC,INVALC,0x7D35,
-	INVALC,INVALC,INVALC,INVALC,0x7D3F,0x7D3D,0x7D3E,0x7D44,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 150, Array index 0x5500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F5B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F5C,INVALC,0x536D,0x5860,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D70,INVALC,0x6264,INVALC,INVALC,0x6268,0x6263,
-	INVALC,0x6265,0x6267,0x6266,0x6262,INVALC,INVALC,INVALC,
-	0x6750,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B5B,INVALC,0x6B5E,0x6B60,0x6B5F,INVALC,INVALC,
-	0x6B5C,0x6B5D,INVALC,INVALC,INVALC,0x6F64,INVALC,INVALC,
-	INVALC,0x6F65,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x726F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x757E,INVALC,
-	0x757D,INVALC,0x757A,0x757B,0x757C,INVALC,INVALC,INVALC,
-	0x7760,INVALC,INVALC,INVALC,0x775E,0x7761,0x775F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7943,INVALC,INVALC,INVALC,
-	INVALC,0x7A4F,0x7B3C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 151, Array index 0x5600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4F5D,INVALC,INVALC,INVALC,
-	INVALC,0x486A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B62,INVALC,0x4B63,INVALC,0x4B60,INVALC,
-	INVALC,0x4B61,0x4B5F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4F60,INVALC,INVALC,INVALC,0x4F5F,
-	0x4F5E,INVALC,0x4F62,INVALC,0x4F61,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x536F,0x5370,0x5371,INVALC,INVALC,
-	0x536E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5867,INVALC,INVALC,0x5864,INVALC,0x5865,0x5868,INVALC,
-	INVALC,0x5863,0x5861,0x5862,0x5866,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D71,INVALC,0x5D79,INVALC,INVALC,INVALC,
-	0x5D75,INVALC,0x6270,0x5D73,0x5D76,0x5D72,0x5D77,0x5D78,
-	0x5D74,INVALC,INVALC,INVALC,INVALC,0x626C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6271,0x626D,0x626E,INVALC,
-	INVALC,INVALC,0x6269,0x626B,INVALC,0x626F,0x626A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6752,0x6753,INVALC,INVALC,
-	0x6751,0x6B61,INVALC,0x6B63,0x6B62,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7270,
-	0x7271,INVALC,0x7272,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7621,INVALC,INVALC,0x7944,INVALC,INVALC,INVALC,
-	0x7622,0x4F63,INVALC,0x5869,INVALC,INVALC,INVALC,INVALC,
-	0x5D7A,0x6272,INVALC,INVALC,0x6274,0x6273,0x6275,0x6276,
-	INVALC,0x6756,0x6757,0x6755,0x6B64,0x6754,INVALC,INVALC,
-	INVALC,INVALC,0x6B65,INVALC,INVALC,0x7273,0x7623,INVALC,
-	INVALC,0x7764,INVALC,0x7765,0x7763,INVALC,0x7766,INVALC,
-	INVALC,INVALC,0x7762,0x7945,INVALC,INVALC,INVALC,INVALC,
-	0x4F64,0x5D7C,0x5D7B,INVALC,INVALC,INVALC,INVALC,0x6277,
-	INVALC,INVALC,0x6278,INVALC,INVALC,INVALC,0x675B,0x6758,
-	INVALC,0x675A,INVALC,0x6759,INVALC,INVALC,INVALC,INVALC,
-	/* Block 152, Array index 0x5700 */
-	0x6B66,INVALC,INVALC,INVALC,0x6F66,INVALC,0x6F67,0x6F68,
-	INVALC,0x6F69,INVALC,INVALC,INVALC,0x7277,0x7274,0x7279,
-	INVALC,0x7275,INVALC,0x7278,INVALC,INVALC,0x7276,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7624,INVALC,0x7625,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7767,INVALC,INVALC,0x7947,
-	INVALC,INVALC,0x7946,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7A50,INVALC,0x7B3F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7B3D,0x7B3E,INVALC,INVALC,INVALC,0x7B7E,0x7C21,INVALC,
-	INVALC,INVALC,0x7C70,INVALC,0x7C72,INVALC,INVALC,INVALC,
-	0x7C71,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F65,INVALC,INVALC,INVALC,0x675C,INVALC,
-	INVALC,INVALC,INVALC,0x727A,0x727B,INVALC,0x4F66,INVALC,
-	0x6F6A,0x7948,0x5372,INVALC,INVALC,INVALC,0x727C,INVALC,
-	0x7C4E,0x5373,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x675D,INVALC,0x675E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6B67,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6B68,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6F6C,INVALC,0x6F6B,INVALC,0x6F6D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x727D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7626,INVALC,INVALC,0x7768,INVALC,INVALC,0x7769,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x776A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7C23,INVALC,0x7C22,INVALC,INVALC,0x7C73,INVALC,
-	INVALC,0x7D36,INVALC,0x5374,0x6279,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7627,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7949,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5375,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5376,INVALC,INVALC,0x6B69,INVALC,
-	INVALC,0x776B,INVALC,0x794A,INVALC,INVALC,INVALC,0x7B40,
-	/* Block 153, Array index 0x5800 */
-	INVALC,0x5377,0x5E21,0x5E22,INVALC,0x627A,0x627B,INVALC,
-	0x627C,INVALC,0x6762,INVALC,0x6764,INVALC,INVALC,INVALC,
-	0x675F,0x6760,0x6763,0x6761,INVALC,INVALC,INVALC,0x6B6A,
-	0x6B6B,INVALC,INVALC,INVALC,0x6F70,INVALC,INVALC,INVALC,
-	INVALC,0x6F6E,INVALC,INVALC,0x7326,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6F6F,INVALC,0x7324,INVALC,INVALC,
-	0x727E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7323,
-	0x7321,0x7325,INVALC,0x7322,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7628,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x776E,0x776C,0x776F,0x776D,
-	INVALC,INVALC,INVALC,0x7770,INVALC,INVALC,INVALC,INVALC,
-	0x794C,INVALC,INVALC,0x794D,INVALC,INVALC,0x794B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7B42,INVALC,0x7B41,
-	INVALC,INVALC,INVALC,0x7C24,INVALC,INVALC,INVALC,0x7C4F,
-	0x7C74,0x7D2D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5378,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B6C,
-	INVALC,0x6B6D,INVALC,0x6F71,INVALC,INVALC,0x7629,INVALC,
-	INVALC,INVALC,0x7771,INVALC,0x794E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7A51,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5379,INVALC,INVALC,INVALC,0x537A,
-	INVALC,INVALC,0x586A,INVALC,INVALC,INVALC,INVALC,0x627D,
-	INVALC,0x6322,0x627E,INVALC,INVALC,0x6324,INVALC,0x6321,
-	INVALC,INVALC,0x6323,INVALC,0x6766,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6765,0x6767,0x6768,INVALC,
-	/* Block 154, Array index 0x5900 */
-	INVALC,INVALC,INVALC,0x6B6E,INVALC,0x6B6F,INVALC,INVALC,
-	INVALC,0x6B71,0x6F72,INVALC,0x6B70,INVALC,INVALC,INVALC,
-	0x7327,INVALC,0x6F74,0x6F73,INVALC,INVALC,INVALC,INVALC,
-	0x6F75,INVALC,0x732C,0x732A,INVALC,INVALC,0x7329,INVALC,
-	INVALC,0x732B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7328,INVALC,INVALC,INVALC,INVALC,INVALC,0x7775,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x762A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7774,0x7772,0x7773,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x794F,INVALC,INVALC,
-	INVALC,0x7950,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7A53,0x7A52,INVALC,INVALC,0x7C25,INVALC,0x7B43,
-	INVALC,INVALC,INVALC,INVALC,0x7C50,INVALC,0x7D2E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x537B,INVALC,
-	INVALC,0x537C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7776,INVALC,INVALC,
-	0x7A54,INVALC,INVALC,INVALC,0x586B,0x6326,0x6325,INVALC,
-	INVALC,0x676A,INVALC,0x6769,0x676B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B72,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F77,0x6F7A,0x6F7C,INVALC,INVALC,0x6F7B,INVALC,INVALC,
-	INVALC,0x6F7D,INVALC,0x6F79,INVALC,0x6F76,INVALC,0x6F78,
-	INVALC,INVALC,0x732E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x732D,INVALC,INVALC,
-	INVALC,0x732F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x762C,
-	/* Block 155, Array index 0x5A00 */
-	INVALC,0x762B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7777,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7951,INVALC,
-	INVALC,0x7952,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7A55,INVALC,INVALC,INVALC,INVALC,
-	0x7A56,INVALC,INVALC,INVALC,INVALC,0x7A58,INVALC,0x7A57,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7B47,INVALC,
-	0x7B46,INVALC,INVALC,0x7B45,INVALC,0x7B44,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7C27,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7C26,INVALC,0x7C53,
-	INVALC,INVALC,0x7C51,0x7C52,INVALC,INVALC,INVALC,0x7C75,
-	INVALC,INVALC,0x7D37,INVALC,INVALC,0x7D38,INVALC,INVALC,
-	INVALC,INVALC,0x7D47,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x586C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B73,
-	0x6B74,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6F7E,
-	0x7330,INVALC,INVALC,INVALC,0x7331,INVALC,INVALC,INVALC,
-	INVALC,0x7778,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7B48,
-	INVALC,0x7C56,0x7C28,0x7C54,0x7C55,INVALC,0x7D2F,INVALC,
-	0x586D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x676C,INVALC,INVALC,INVALC,INVALC,0x6B75,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7333,0x7021,0x7022,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7332,INVALC,INVALC,INVALC,INVALC,
-	/* Block 156, Array index 0x5B00 */
-	INVALC,INVALC,INVALC,0x7779,INVALC,INVALC,0x777A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7953,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7C29,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7C76,0x7D30,INVALC,0x586E,INVALC,0x7023,
-	0x7334,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7D48,0x586F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5870,INVALC,INVALC,INVALC,
-	INVALC,0x6B76,0x6B77,INVALC,0x7025,0x7024,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x777D,0x777C,0x777B,
-	INVALC,0x7B4A,INVALC,INVALC,0x7B49,INVALC,INVALC,INVALC,
-	0x7C77,INVALC,0x5E23,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7027,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7026,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7335,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x762F,0x762E,INVALC,0x7630,0x762D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7824,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7823,0x7821,0x777E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7956,INVALC,
-	INVALC,INVALC,INVALC,0x7957,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7955,
-	0x7954,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7822,INVALC,INVALC,
-	/* Block 157, Array index 0x5C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7A5A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7A59,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7B4C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7B4B,INVALC,INVALC,
-	INVALC,0x7C2B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7C2D,INVALC,INVALC,0x7C2C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7C2A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7C57,INVALC,0x7C59,0x7C58,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7C78,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7D40,
-	0x7D41,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E24,INVALC,INVALC,
-	INVALC,0x676D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6B7A,0x6B78,INVALC,0x6B79,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 158, Array index 0x5D00 */
-	INVALC,INVALC,INVALC,0x702A,INVALC,INVALC,0x7028,INVALC,
-	INVALC,0x7029,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x733A,INVALC,INVALC,0x7336,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x733B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7337,INVALC,INVALC,0x7338,INVALC,
-	0x7339,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7631,INVALC,INVALC,INVALC,0x7632,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7825,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7826,INVALC,INVALC,
-	0x7827,0x7959,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x795B,INVALC,0x795C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x795A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7958,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7B4D,
-	INVALC,INVALC,INVALC,INVALC,0x7B4E,INVALC,INVALC,INVALC,
-	0x7B50,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7B4F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7C2E,INVALC,INVALC,INVALC,0x7C2F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7C5A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7C79,0x7C7A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 159, Array index 0x5E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7D45,0x7D49,INVALC,INVALC,0x7D4A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E25,INVALC,INVALC,
-	INVALC,0x7A5B,INVALC,INVALC,0x7C7B,0x7C7C,INVALC,0x5E26,
-	INVALC,INVALC,0x676E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7633,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x795D,0x795F,INVALC,INVALC,INVALC,0x795E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7B51,INVALC,0x7C5B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E27,INVALC,INVALC,
-	INVALC,0x702B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7960,0x7A5C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E28,0x6B7B,INVALC,0x702C,INVALC,
-	INVALC,INVALC,INVALC,0x6327,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7D31,0x6328,0x702D,0x7634,
-	INVALC,0x6329,INVALC,INVALC,0x733D,INVALC,INVALC,INVALC,
-	0x733C,INVALC,INVALC,0x7638,0x7636,0x7637,0x7635,INVALC,
-	0x7828,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7A5D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7B52,
-	INVALC,INVALC,INVALC,INVALC,0x7C5C,INVALC,INVALC,0x7D42,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 160, Array index 0x5F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7C7D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x676F,INVALC,
-	INVALC,INVALC,INVALC,0x6770,INVALC,0x7829,INVALC,INVALC,
-	INVALC,0x7B53,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6771,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x782A,INVALC,INVALC,0x7A5E,
-	INVALC,INVALC,INVALC,INVALC,0x7C30,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6B7C,INVALC,INVALC,0x7639,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6B7D,0x763A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x702F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7B54,INVALC,INVALC,0x7A5F,
-	INVALC,0x7A61,INVALC,0x7A60,INVALC,INVALC,0x7B55,0x7B56,
-	INVALC,INVALC,0x7C32,INVALC,0x7C31,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7D21,INVALC,INVALC,INVALC,INVALC,0x7C7E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x733E,INVALC,INVALC,
-	0x7832,INVALC,INVALC,INVALC,0x7C33,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x733F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 255, Array index 0x6000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x212B,0x2136,0x2138,INVALC,INVALC,0x2140,0x2141,0x2144,
-	0x2145,0x2148,0x2149,0x214C,0x214D,0x2150,0x2151,0x2154,
-	0x2155,0x2158,0x2159,0x215C,0x215D,INVALC,INVALC,INVALC,
-	INVALC,0x2227,0x2228,0x222B,0x222C,0x2229,0x222A,INVALC,
-	0x212E,0x212F,0x2130,INVALC,0x2132,0x2133,0x2134,0x2135,
-	INVALC,0x215E,0x215F,0x2160,0x2161,0x2162,0x2163,0x222D,
-	0x222E,0x222F,0x223F,0x2240,0x2241,0x2243,0x2242,INVALC,
-	0x2262,0x226C,0x226D,0x226E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 256, Array index 0x6100 */
-	INVALC,0x212A,INVALC,0x216C,0x2263,0x2268,0x216D,INVALC,
-	0x213E,0x213F,0x216E,0x2230,0x2122,0x2231,0x2125,0x225F,
-	0x2421,0x2422,0x2423,0x2424,0x2425,0x2426,0x2427,0x2428,
-	0x2429,0x242A,0x2128,0x2127,0x2236,0x2238,0x2237,0x2129,
-	0x2269,0x2441,0x2442,0x2443,0x2444,0x2445,0x2446,0x2447,
-	0x2448,0x2449,0x244A,0x244B,0x244C,0x244D,0x244E,0x244F,
-	0x2450,0x2451,0x2452,0x2453,0x2454,0x2455,0x2456,0x2457,
-	0x2458,0x2459,0x245A,INVALC,0x2260,INVALC,INVALC,0x2225,
-	INVALC,0x245B,0x245C,0x245D,0x245E,0x245F,0x2460,0x2461,
-	0x2462,0x2463,0x2464,0x2465,0x2466,0x2467,0x2468,0x2469,
-	0x246A,0x246B,0x246C,0x246D,0x246E,0x246F,0x2470,0x2471,
-	0x2472,0x2473,0x2474,0x2142,0x225E,0x2143,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2266,0x2267,INVALC,INVALC,INVALC,0x2264,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_CNS11643_PLANE1 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> cns11643_plane1 size-optimized table (22050 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_size_cns11643_plane1[] =
-{
-	0x017D, /* Ranges number */
-	0x0DA3, /* Unranged codes number */
-	0x0FCB, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x02C7, 0x02CB, 0x047A,
-	/* Array index: 0x0006 */ 0x0391, 0x03A9, 0x047F,
-	/* Array index: 0x0009 */ 0x03B1, 0x03C9, 0x0498,
-	/* Array index: 0x000C */ 0x2160, 0x2169, 0x04B1,
-	/* Array index: 0x000F */ 0x2170, 0x2179, 0x04BB,
-	/* Array index: 0x0012 */ 0x2190, 0x2199, 0x04C5,
-	/* Array index: 0x0015 */ 0x221E, 0x2220, 0x04CF,
-	/* Array index: 0x0018 */ 0x2229, 0x222B, 0x04D2,
-	/* Array index: 0x001B */ 0x2400, 0x2421, 0x04D5,
-	/* Array index: 0x001E */ 0x2460, 0x2469, 0x04F7,
-	/* Array index: 0x0021 */ 0x2474, 0x247D, 0x0501,
-	/* Array index: 0x0024 */ 0x256D, 0x2573, 0x050B,
-	/* Array index: 0x0027 */ 0x2581, 0x258F, 0x0512,
-	/* Array index: 0x002A */ 0x25E2, 0x25E5, 0x0521,
-	/* Array index: 0x002D */ 0x2640, 0x2642, 0x0525,
-	/* Array index: 0x0030 */ 0x3000, 0x3003, 0x0528,
-	/* Array index: 0x0033 */ 0x3008, 0x3015, 0x052C,
-	/* Array index: 0x0036 */ 0x301D, 0x3029, 0x053A,
-	/* Array index: 0x0039 */ 0x3105, 0x3129, 0x0547,
-	/* Array index: 0x003C */ 0x339C, 0x339E, 0x056C,
-	/* Array index: 0x003F */ 0x4E08, 0x4E19, 0x056F,
-	/* Array index: 0x0042 */ 0x4E4B, 0x4E53, 0x0581,
-	/* Array index: 0x0045 */ 0x4E5D, 0x4E5F, 0x058A,
-	/* Array index: 0x0048 */ 0x4E91, 0x4E95, 0x058D,
-	/* Array index: 0x004B */ 0x4E9E, 0x4EAE, 0x0592,
-	/* Array index: 0x004E */ 0x4EC0, 0x4ECD, 0x05A3,
-	/* Array index: 0x0051 */ 0x4ED4, 0x4ED9, 0x05B1,
-	/* Array index: 0x0054 */ 0x4EE3, 0x4EE5, 0x05B7,
-	/* Array index: 0x0057 */ 0x4F09, 0x4F11, 0x05BA,
-	/* Array index: 0x005A */ 0x4F46, 0x4F48, 0x05C3,
-	/* Array index: 0x005D */ 0x4F4D, 0x4F60, 0x05C6,
-	/* Array index: 0x0060 */ 0x4FB5, 0x4FB7, 0x05DA,
-	/* Array index: 0x0063 */ 0x4FC2, 0x4FC4, 0x05DD,
-	/* Array index: 0x0066 */ 0x4FCE, 0x4FD1, 0x05E0,
-	/* Array index: 0x0069 */ 0x4FDD, 0x4FE1, 0x05E4,
-	/* Array index: 0x006C */ 0x5009, 0x501A, 0x05E9,
-	/* Array index: 0x006F */ 0x5025, 0x502D, 0x05FB,
-	/* Array index: 0x0072 */ 0x5074, 0x5077, 0x0604,
-	/* Array index: 0x0075 */ 0x5096, 0x509A, 0x0608,
-	/* Array index: 0x0078 */ 0x513B, 0x514D, 0x060D,
-	/* Array index: 0x007B */ 0x5159, 0x516E, 0x0620,
-	/* Array index: 0x007E */ 0x5175, 0x5178, 0x0636,
-	/* Array index: 0x0081 */ 0x51CB, 0x51CD, 0x063A,
-	/* Array index: 0x0084 */ 0x51F6, 0x51FA, 0x063D,
-	/* Array index: 0x0087 */ 0x5206, 0x520A, 0x0642,
-	/* Array index: 0x008A */ 0x5224, 0x522A, 0x0647,
-	/* Array index: 0x008D */ 0x5236, 0x523B, 0x064E,
-	/* Array index: 0x0090 */ 0x524A, 0x524E, 0x0654,
-	/* Array index: 0x0093 */ 0x525B, 0x525D, 0x0659,
-	/* Array index: 0x0096 */ 0x5287, 0x528A, 0x065C,
-	/* Array index: 0x0099 */ 0x52A9, 0x52AC, 0x0660,
-	/* Array index: 0x009C */ 0x52D5, 0x52E6, 0x0664,
-	/* Array index: 0x009F */ 0x5315, 0x5319, 0x0676,
-	/* Array index: 0x00A2 */ 0x533E, 0x534A, 0x067B,
-	/* Array index: 0x00A5 */ 0x5351, 0x5354, 0x0688,
-	/* Array index: 0x00A8 */ 0x536E, 0x537B, 0x068C,
-	/* Array index: 0x00AB */ 0x53C8, 0x53CD, 0x069A,
-	/* Array index: 0x00AE */ 0x53E2, 0x53F5, 0x06A0,
-	/* Array index: 0x00B1 */ 0x5406, 0x5412, 0x06B4,
-	/* Array index: 0x00B4 */ 0x541B, 0x5420, 0x06C1,
-	/* Array index: 0x00B7 */ 0x5429, 0x542E, 0x06C7,
-	/* Array index: 0x00BA */ 0x5435, 0x5443, 0x06CD,
-	/* Array index: 0x00BD */ 0x5473, 0x547D, 0x06DC,
-	/* Array index: 0x00C0 */ 0x54A6, 0x54AC, 0x06E7,
-	/* Array index: 0x00C3 */ 0x54BD, 0x54C9, 0x06EE,
-	/* Array index: 0x00C6 */ 0x54E5, 0x54EE, 0x06FB,
-	/* Array index: 0x00C9 */ 0x5555, 0x5557, 0x0705,
-	/* Array index: 0x00CC */ 0x5580, 0x5584, 0x0708,
-	/* Array index: 0x00CF */ 0x5587, 0x558B, 0x070D,
-	/* Array index: 0x00D2 */ 0x5598, 0x559F, 0x0712,
-	/* Array index: 0x00D5 */ 0x55AA, 0x55B3, 0x071A,
-	/* Array index: 0x00D8 */ 0x55C5, 0x55C9, 0x0724,
-	/* Array index: 0x00DB */ 0x55E1, 0x55E8, 0x0729,
-	/* Array index: 0x00DE */ 0x562E, 0x5636, 0x0731,
-	/* Array index: 0x00E1 */ 0x5664, 0x566C, 0x073A,
-	/* Array index: 0x00E4 */ 0x568E, 0x5690, 0x0743,
-	/* Array index: 0x00E7 */ 0x56C0, 0x56C2, 0x0746,
-	/* Array index: 0x00EA */ 0x56C8, 0x56CC, 0x0749,
-	/* Array index: 0x00ED */ 0x56DA, 0x56E0, 0x074E,
-	/* Array index: 0x00F0 */ 0x572C, 0x5730, 0x0755,
-	/* Array index: 0x00F3 */ 0x574D, 0x5751, 0x075A,
-	/* Array index: 0x00F6 */ 0x582F, 0x5835, 0x075F,
-	/* Array index: 0x00F9 */ 0x584A, 0x584C, 0x0766,
-	/* Array index: 0x00FC */ 0x5914, 0x591C, 0x0769,
-	/* Array index: 0x00FF */ 0x5927, 0x592E, 0x0772,
-	/* Array index: 0x0102 */ 0x5947, 0x5949, 0x077A,
-	/* Array index: 0x0105 */ 0x594E, 0x595A, 0x077D,
-	/* Array index: 0x0108 */ 0x5981, 0x5984, 0x078A,
-	/* Array index: 0x010B */ 0x59A3, 0x59A5, 0x078E,
-	/* Array index: 0x010E */ 0x59D0, 0x59D4, 0x0791,
-	/* Array index: 0x0111 */ 0x5ABC, 0x5AC2, 0x0796,
-	/* Array index: 0x0114 */ 0x5AD6, 0x5AD8, 0x079D,
-	/* Array index: 0x0117 */ 0x5B08, 0x5B0C, 0x07A0,
-	/* Array index: 0x011A */ 0x5B50, 0x5B5F, 0x07A5,
-	/* Array index: 0x011D */ 0x5B85, 0x5B8C, 0x07B5,
-	/* Array index: 0x0120 */ 0x5B97, 0x5B9C, 0x07BD,
-	/* Array index: 0x0123 */ 0x5BA2, 0x5BA6, 0x07C3,
-	/* Array index: 0x0126 */ 0x5BB3, 0x5BB9, 0x07C8,
-	/* Array index: 0x0129 */ 0x5BC2, 0x5BC7, 0x07CF,
-	/* Array index: 0x012C */ 0x5BDE, 0x5BF0, 0x07D5,
-	/* Array index: 0x012F */ 0x5C07, 0x5C11, 0x07E8,
-	/* Array index: 0x0132 */ 0x5C37, 0x5C41, 0x07F3,
-	/* Array index: 0x0135 */ 0x5C4B, 0x5C51, 0x07FE,
-	/* Array index: 0x0138 */ 0x5DE1, 0x5DE8, 0x0805,
-	/* Array index: 0x013B */ 0x5DF1, 0x5DF4, 0x080D,
-	/* Array index: 0x013E */ 0x5E36, 0x5E38, 0x0811,
-	/* Array index: 0x0141 */ 0x5E5F, 0x5E63, 0x0814,
-	/* Array index: 0x0144 */ 0x5E72, 0x5E7E, 0x0819,
-	/* Array index: 0x0147 */ 0x5E95, 0x5E97, 0x0826,
-	/* Array index: 0x014A */ 0x5EB5, 0x5EB8, 0x0829,
-	/* Array index: 0x014D */ 0x5EC8, 0x5ECA, 0x082D,
-	/* Array index: 0x0150 */ 0x5EDF, 0x5EE3, 0x0830,
-	/* Array index: 0x0153 */ 0x5F12, 0x5F18, 0x0835,
-	/* Array index: 0x0156 */ 0x5F69, 0x5F71, 0x083C,
-	/* Array index: 0x0159 */ 0x5F7F, 0x5F81, 0x0845,
-	/* Array index: 0x015C */ 0x5F85, 0x5F92, 0x0848,
-	/* Array index: 0x015F */ 0x5F97, 0x5F99, 0x0856,
-	/* Array index: 0x0162 */ 0x5FA8, 0x5FAE, 0x0859,
-	/* Array index: 0x0165 */ 0x5FD6, 0x5FD9, 0x0860,
-	/* Array index: 0x0168 */ 0x6012, 0x6016, 0x0864,
-	/* Array index: 0x016B */ 0x6025, 0x602B, 0x0869,
-	/* Array index: 0x016E */ 0x6062, 0x6070, 0x0870,
-	/* Array index: 0x0171 */ 0x60B2, 0x60BD, 0x087F,
-	/* Array index: 0x0174 */ 0x60C5, 0x60C7, 0x088B,
-	/* Array index: 0x0177 */ 0x60DF, 0x60E1, 0x088E,
-	/* Array index: 0x017A */ 0x60F0, 0x60FB, 0x0891,
-	/* Array index: 0x017D */ 0x610D, 0x610F, 0x089D,
-	/* Array index: 0x0180 */ 0x611A, 0x611C, 0x08A0,
-	/* Array index: 0x0183 */ 0x6147, 0x614E, 0x08A3,
-	/* Array index: 0x0186 */ 0x6175, 0x6177, 0x08AB,
-	/* Array index: 0x0189 */ 0x61C7, 0x61CD, 0x08AE,
-	/* Array index: 0x018C */ 0x61F5, 0x6200, 0x08B5,
-	/* Array index: 0x018F */ 0x620A, 0x6216, 0x08C1,
-	/* Array index: 0x0192 */ 0x6230, 0x6236, 0x08CE,
-	/* Array index: 0x0195 */ 0x623E, 0x6241, 0x08D5,
-	/* Array index: 0x0198 */ 0x6247, 0x6254, 0x08D9,
-	/* Array index: 0x019B */ 0x626D, 0x626F, 0x08E7,
-	/* Array index: 0x019E */ 0x627C, 0x6280, 0x08EA,
-	/* Array index: 0x01A1 */ 0x6291, 0x6298, 0x08EF,
-	/* Array index: 0x01A4 */ 0x62C4, 0x62DC, 0x08F7,
-	/* Array index: 0x01A7 */ 0x62EC, 0x62F4, 0x0910,
-	/* Array index: 0x01AA */ 0x62FC, 0x6302, 0x0919,
-	/* Array index: 0x01AD */ 0x6307, 0x6309, 0x0920,
-	/* Array index: 0x01B0 */ 0x634C, 0x6350, 0x0923,
-	/* Array index: 0x01B3 */ 0x6367, 0x636B, 0x0928,
-	/* Array index: 0x01B6 */ 0x63A0, 0x63AC, 0x092D,
-	/* Array index: 0x01B9 */ 0x6413, 0x6417, 0x093A,
-	/* Array index: 0x01BC */ 0x6478, 0x647B, 0x093F,
-	/* Array index: 0x01BF */ 0x64A9, 0x64B3, 0x0943,
-	/* Array index: 0x01C2 */ 0x64BB, 0x64CE, 0x094E,
-	/* Array index: 0x01C5 */ 0x64EC, 0x64F4, 0x0962,
-	/* Array index: 0x01C8 */ 0x652A, 0x652C, 0x096B,
-	/* Array index: 0x01CB */ 0x6554, 0x6559, 0x096E,
-	/* Array index: 0x01CE */ 0x6574, 0x6578, 0x0974,
-	/* Array index: 0x01D1 */ 0x65CB, 0x65CF, 0x0979,
-	/* Array index: 0x01D4 */ 0x65E5, 0x65ED, 0x097E,
-	/* Array index: 0x01D7 */ 0x6613, 0x6615, 0x0987,
-	/* Array index: 0x01DA */ 0x6624, 0x6628, 0x098A,
-	/* Array index: 0x01DD */ 0x6641, 0x6645, 0x098F,
-	/* Array index: 0x01E0 */ 0x666E, 0x6670, 0x0994,
-	/* Array index: 0x01E3 */ 0x6687, 0x6689, 0x0997,
-	/* Array index: 0x01E6 */ 0x6696, 0x6698, 0x099A,
-	/* Array index: 0x01E9 */ 0x66F0, 0x66F9, 0x099D,
-	/* Array index: 0x01EC */ 0x66FC, 0x6700, 0x09A7,
-	/* Array index: 0x01EF */ 0x6726, 0x672E, 0x09AC,
-	/* Array index: 0x01F2 */ 0x674E, 0x6757, 0x09B5,
-	/* Array index: 0x01F5 */ 0x675C, 0x6760, 0x09BF,
-	/* Array index: 0x01F8 */ 0x676D, 0x6777, 0x09C4,
-	/* Array index: 0x01FB */ 0x67CF, 0x67D4, 0x09CF,
-	/* Array index: 0x01FE */ 0x67F1, 0x67F5, 0x09D5,
-	/* Array index: 0x0201 */ 0x683C, 0x6848, 0x09DA,
-	/* Array index: 0x0204 */ 0x6850, 0x6854, 0x09E7,
-	/* Array index: 0x0207 */ 0x687F, 0x6886, 0x09EC,
-	/* Array index: 0x020A */ 0x68AD, 0x68B5, 0x09F4,
-	/* Array index: 0x020D */ 0x68F9, 0x68FB, 0x09FD,
-	/* Array index: 0x0210 */ 0x695A, 0x6960, 0x0A00,
-	/* Array index: 0x0213 */ 0x69CB, 0x69CD, 0x0A07,
-	/* Array index: 0x0216 */ 0x6A38, 0x6A3A, 0x0A0A,
-	/* Array index: 0x0219 */ 0x6B5F, 0x6B67, 0x0A0D,
-	/* Array index: 0x021C */ 0x6B77, 0x6B7B, 0x0A16,
-	/* Array index: 0x021F */ 0x6BD2, 0x6BD4, 0x0A1B,
-	/* Array index: 0x0222 */ 0x6C0F, 0x6C13, 0x0A1E,
-	/* Array index: 0x0225 */ 0x6C23, 0x6C2F, 0x0A23,
-	/* Array index: 0x0228 */ 0x6C3E, 0x6C42, 0x0A30,
-	/* Array index: 0x022B */ 0x6C5B, 0x6C61, 0x0A35,
-	/* Array index: 0x022E */ 0x6C7D, 0x6C8D, 0x0A3C,
-	/* Array index: 0x0231 */ 0x6CB8, 0x6CC5, 0x0A4D,
-	/* Array index: 0x0234 */ 0x6CD3, 0x6CD7, 0x0A5B,
-	/* Array index: 0x0237 */ 0x6CE0, 0x6CE5, 0x0A60,
-	/* Array index: 0x023A */ 0x6CEF, 0x6CF5, 0x0A66,
-	/* Array index: 0x023D */ 0x6D27, 0x6D2B, 0x0A6D,
-	/* Array index: 0x0240 */ 0x6D35, 0x6D3E, 0x0A72,
-	/* Array index: 0x0243 */ 0x6D77, 0x6D79, 0x0A7C,
-	/* Array index: 0x0246 */ 0x6D85, 0x6D8E, 0x0A7F,
-	/* Array index: 0x0249 */ 0x6D93, 0x6D95, 0x0A89,
-	/* Array index: 0x024C */ 0x6DC4, 0x6DC7, 0x0A8C,
-	/* Array index: 0x024F */ 0x6DD8, 0x6DDA, 0x0A90,
-	/* Array index: 0x0252 */ 0x6DE8, 0x6DEE, 0x0A93,
-	/* Array index: 0x0255 */ 0x6DF7, 0x6DFB, 0x0A9A,
-	/* Array index: 0x0258 */ 0x6E19, 0x6E26, 0x0A9F,
-	/* Array index: 0x025B */ 0x6ED1, 0x6ED5, 0x0AAD,
-	/* Array index: 0x025E */ 0x6EFE, 0x6F02, 0x0AB2,
-	/* Array index: 0x0261 */ 0x6F13, 0x6F15, 0x0AB7,
-	/* Array index: 0x0264 */ 0x6F29, 0x6F2C, 0x0ABA,
-	/* Array index: 0x0267 */ 0x6F2F, 0x6F33, 0x0ABE,
-	/* Array index: 0x026A */ 0x6F6D, 0x6F70, 0x0AC3,
-	/* Array index: 0x026D */ 0x6FC0, 0x6FC3, 0x0AC7,
-	/* Array index: 0x0270 */ 0x6FDF, 0x6FE1, 0x0ACB,
-	/* Array index: 0x0273 */ 0x6FEB, 0x6FF1, 0x0ACE,
-	/* Array index: 0x0276 */ 0x70AB, 0x70AF, 0x0AD5,
-	/* Array index: 0x0279 */ 0x7164, 0x7169, 0x0ADA,
-	/* Array index: 0x027C */ 0x71E5, 0x71E7, 0x0AE0,
-	/* Array index: 0x027F */ 0x71EC, 0x71EE, 0x0AE3,
-	/* Array index: 0x0282 */ 0x7235, 0x723E, 0x0AE6,
-	/* Array index: 0x0285 */ 0x7246, 0x7248, 0x0AF0,
-	/* Array index: 0x0288 */ 0x725D, 0x7262, 0x0AF3,
-	/* Array index: 0x028B */ 0x72F7, 0x72FD, 0x0AF9,
-	/* Array index: 0x028E */ 0x7377, 0x737B, 0x0B00,
-	/* Array index: 0x0291 */ 0x7433, 0x7436, 0x0B05,
-	/* Array index: 0x0294 */ 0x7459, 0x745F, 0x0B09,
-	/* Array index: 0x0297 */ 0x74A6, 0x74A9, 0x0B10,
-	/* Array index: 0x029A */ 0x74E0, 0x74E6, 0x0B14,
-	/* Array index: 0x029D */ 0x7525, 0x7533, 0x0B1B,
-	/* Array index: 0x02A0 */ 0x754B, 0x754F, 0x0B2A,
-	/* Array index: 0x02A3 */ 0x7559, 0x755D, 0x0B2F,
-	/* Array index: 0x02A6 */ 0x75A2, 0x75A5, 0x0B34,
-	/* Array index: 0x02A9 */ 0x75B8, 0x75BE, 0x0B38,
-	/* Array index: 0x02AC */ 0x75F0, 0x75F4, 0x0B3F,
-	/* Array index: 0x02AF */ 0x75FF, 0x7601, 0x0B44,
-	/* Array index: 0x02B2 */ 0x761F, 0x7629, 0x0B47,
-	/* Array index: 0x02B5 */ 0x767B, 0x767E, 0x0B52,
-	/* Array index: 0x02B8 */ 0x7684, 0x7688, 0x0B56,
-	/* Array index: 0x02BB */ 0x76C2, 0x76CE, 0x0B5B,
-	/* Array index: 0x02BE */ 0x76DB, 0x76E7, 0x0B68,
-	/* Array index: 0x02C1 */ 0x7736, 0x773E, 0x0B75,
-	/* Array index: 0x02C4 */ 0x7761, 0x776C, 0x0B7E,
-	/* Array index: 0x02C7 */ 0x779E, 0x77A0, 0x0B8A,
-	/* Array index: 0x02CA */ 0x77BB, 0x77BF, 0x0B8D,
-	/* Array index: 0x02CD */ 0x77DA, 0x77DC, 0x0B92,
-	/* Array index: 0x02D0 */ 0x77ED, 0x77EF, 0x0B95,
-	/* Array index: 0x02D3 */ 0x792A, 0x792C, 0x0B98,
-	/* Array index: 0x02D6 */ 0x7946, 0x7949, 0x0B9B,
-	/* Array index: 0x02D9 */ 0x7955, 0x7957, 0x0B9F,
-	/* Array index: 0x02DC */ 0x795D, 0x7960, 0x0BA2,
-	/* Array index: 0x02DF */ 0x798D, 0x798F, 0x0BA6,
-	/* Array index: 0x02E2 */ 0x79B9, 0x79C1, 0x0BA9,
-	/* Array index: 0x02E5 */ 0x79E3, 0x79E9, 0x0BB2,
-	/* Array index: 0x02E8 */ 0x7A1C, 0x7A20, 0x0BB9,
-	/* Array index: 0x02EB */ 0x7A3B, 0x7A40, 0x0BBE,
-	/* Array index: 0x02EE */ 0x7A4B, 0x7A4E, 0x0BC4,
-	/* Array index: 0x02F1 */ 0x7A60, 0x7A62, 0x0BC8,
-	/* Array index: 0x02F4 */ 0x7A95, 0x7A98, 0x0BCB,
-	/* Array index: 0x02F7 */ 0x7B4D, 0x7B56, 0x0BCF,
-	/* Array index: 0x02FA */ 0x7C3D, 0x7C40, 0x0BD9,
-	/* Array index: 0x02FD */ 0x7C5F, 0x7C65, 0x0BDD,
-	/* Array index: 0x0300 */ 0x7CDC, 0x7CE2, 0x0BE4,
-	/* Array index: 0x0303 */ 0x7D02, 0x7D0D, 0x0BEB,
-	/* Array index: 0x0306 */ 0x7D17, 0x7D22, 0x0BF7,
-	/* Array index: 0x0309 */ 0x7D2E, 0x7D33, 0x0C03,
-	/* Array index: 0x030C */ 0x7D40, 0x7D46, 0x0C09,
-	/* Array index: 0x030F */ 0x7D6E, 0x7D73, 0x0C10,
-	/* Array index: 0x0312 */ 0x7DAC, 0x7DB5, 0x0C16,
-	/* Array index: 0x0315 */ 0x7DBA, 0x7DBF, 0x0C20,
-	/* Array index: 0x0318 */ 0x7DD8, 0x7DE0, 0x0C26,
-	/* Array index: 0x031B */ 0x7E08, 0x7E0A, 0x0C2F,
-	/* Array index: 0x031E */ 0x7E2E, 0x7E48, 0x0C32,
-	/* Array index: 0x0321 */ 0x7E69, 0x7E6D, 0x0C4D,
-	/* Array index: 0x0324 */ 0x7F88, 0x7F8E, 0x0C52,
-	/* Array index: 0x0327 */ 0x7FDF, 0x7FE1, 0x0C59,
-	/* Array index: 0x032A */ 0x8000, 0x8006, 0x0C5C,
-	/* Array index: 0x032D */ 0x800B, 0x8012, 0x0C63,
-	/* Array index: 0x0330 */ 0x8015, 0x8019, 0x0C6B,
-	/* Array index: 0x0333 */ 0x806F, 0x8077, 0x0C70,
-	/* Array index: 0x0336 */ 0x807D, 0x807F, 0x0C79,
-	/* Array index: 0x0339 */ 0x8084, 0x808C, 0x0C7C,
-	/* Array index: 0x033C */ 0x80A9, 0x80AB, 0x0C85,
-	/* Array index: 0x033F */ 0x80DA, 0x80DE, 0x0C88,
-	/* Array index: 0x0342 */ 0x80ED, 0x80F4, 0x0C8D,
-	/* Array index: 0x0345 */ 0x8150, 0x8155, 0x0C95,
-	/* Array index: 0x0348 */ 0x8170, 0x817A, 0x0C9B,
-	/* Array index: 0x034B */ 0x8198, 0x819D, 0x0CA6,
-	/* Array index: 0x034E */ 0x81BD, 0x81C3, 0x0CAC,
-	/* Array index: 0x0351 */ 0x81FA, 0x8202, 0x0CB3,
-	/* Array index: 0x0354 */ 0x8205, 0x820D, 0x0CBC,
-	/* Array index: 0x0357 */ 0x821B, 0x821F, 0x0CC5,
-	/* Array index: 0x035A */ 0x8228, 0x822C, 0x0CCA,
-	/* Array index: 0x035D */ 0x8235, 0x8239, 0x0CCF,
-	/* Array index: 0x0360 */ 0x826E, 0x8272, 0x0CD4,
-	/* Array index: 0x0363 */ 0x82AC, 0x82BE, 0x0CD9,
-	/* Array index: 0x0366 */ 0x82D1, 0x82D4, 0x0CEC,
-	/* Array index: 0x0369 */ 0x82DB, 0x82DF, 0x0CF0,
-	/* Array index: 0x036C */ 0x82E3, 0x82E7, 0x0CF5,
-	/* Array index: 0x036F */ 0x8301, 0x8306, 0x0CFA,
-	/* Array index: 0x0372 */ 0x8331, 0x8339, 0x0D00,
-	/* Array index: 0x0375 */ 0x83EF, 0x83F4, 0x0D09,
-	/* Array index: 0x0378 */ 0x840A, 0x840E, 0x0D0F,
-	/* Array index: 0x037B */ 0x8469, 0x846D, 0x0D14,
-	/* Array index: 0x037E */ 0x84C9, 0x84CB, 0x0D19,
-	/* Array index: 0x0381 */ 0x8548, 0x854A, 0x0D1C,
-	/* Array index: 0x0384 */ 0x8568, 0x856A, 0x0D1F,
-	/* Array index: 0x0387 */ 0x85A6, 0x85AA, 0x0D22,
-	/* Array index: 0x038A */ 0x85F7, 0x85FB, 0x0D27,
-	/* Array index: 0x038D */ 0x865B, 0x865F, 0x0D2C,
-	/* Array index: 0x0390 */ 0x8679, 0x867B, 0x0D31,
-	/* Array index: 0x0393 */ 0x8702, 0x870A, 0x0D34,
-	/* Array index: 0x0396 */ 0x881F, 0x8823, 0x0D3D,
-	/* Array index: 0x0399 */ 0x8861, 0x8863, 0x0D42,
-	/* Array index: 0x039C */ 0x895E, 0x8960, 0x0D45,
-	/* Array index: 0x039F */ 0x8A0C, 0x8A18, 0x0D48,
-	/* Array index: 0x03A2 */ 0x8A3A, 0x8A3E, 0x0D55,
-	/* Array index: 0x03A5 */ 0x8A54, 0x8A56, 0x0D5A,
-	/* Array index: 0x03A8 */ 0x8A68, 0x8A73, 0x0D5D,
-	/* Array index: 0x03AB */ 0x8AA0, 0x8AAA, 0x0D69,
-	/* Array index: 0x03AE */ 0x8AF6, 0x8B04, 0x0D74,
-	/* Array index: 0x03B1 */ 0x8B58, 0x8B5C, 0x0D83,
-	/* Array index: 0x03B4 */ 0x8C6A, 0x8C6D, 0x0D88,
-	/* Array index: 0x03B7 */ 0x8C89, 0x8C8D, 0x0D8C,
-	/* Array index: 0x03BA */ 0x8C9D, 0x8CA2, 0x0D91,
-	/* Array index: 0x03BD */ 0x8CA7, 0x8CAC, 0x0D97,
-	/* Array index: 0x03C0 */ 0x8CB2, 0x8CCA, 0x0D9D,
-	/* Array index: 0x03C3 */ 0x8CD1, 0x8CD3, 0x0DB6,
-	/* Array index: 0x03C6 */ 0x8CDE, 0x8CE6, 0x0DB9,
-	/* Array index: 0x03C9 */ 0x8CF8, 0x8CFD, 0x0DC2,
-	/* Array index: 0x03CC */ 0x8E1D, 0x8E22, 0x0DC8,
-	/* Array index: 0x03CF */ 0x8E48, 0x8E4B, 0x0DCE,
-	/* Array index: 0x03D2 */ 0x8E87, 0x8E8D, 0x0DD2,
-	/* Array index: 0x03D5 */ 0x8EAA, 0x8EAC, 0x0DD9,
-	/* Array index: 0x03D8 */ 0x8ECA, 0x8ECF, 0x0DDC,
-	/* Array index: 0x03DB */ 0x8F12, 0x8F15, 0x0DE2,
-	/* Array index: 0x03DE */ 0x8F1B, 0x8F1F, 0x0DE6,
-	/* Array index: 0x03E1 */ 0x8FAD, 0x8FB2, 0x0DEB,
-	/* Array index: 0x03E4 */ 0x8FC2, 0x8FC6, 0x0DF1,
-	/* Array index: 0x03E7 */ 0x8FE2, 0x8FED, 0x0DF6,
-	/* Array index: 0x03EA */ 0x9014, 0x9023, 0x0E02,
-	/* Array index: 0x03ED */ 0x904A, 0x9063, 0x0E12,
-	/* Array index: 0x03F0 */ 0x9074, 0x9091, 0x0E2C,
-	/* Array index: 0x03F3 */ 0x9117, 0x9119, 0x0E4A,
-	/* Array index: 0x03F6 */ 0x9148, 0x914D, 0x0E4D,
-	/* Array index: 0x03F9 */ 0x9174, 0x9178, 0x0E53,
-	/* Array index: 0x03FC */ 0x91C5, 0x91D1, 0x0E58,
-	/* Array index: 0x03FF */ 0x91D7, 0x91DD, 0x0E65,
-	/* Array index: 0x0402 */ 0x9237, 0x9240, 0x0E6C,
-	/* Array index: 0x0405 */ 0x9318, 0x931A, 0x0E76,
-	/* Array index: 0x0408 */ 0x9320, 0x9322, 0x0E79,
-	/* Array index: 0x040B */ 0x9394, 0x939A, 0x0E7C,
-	/* Array index: 0x040E */ 0x93D6, 0x93D8, 0x0E83,
-	/* Array index: 0x0411 */ 0x947C, 0x947F, 0x0E86,
-	/* Array index: 0x0414 */ 0x958E, 0x9594, 0x0E8A,
-	/* Array index: 0x0417 */ 0x95A1, 0x95A9, 0x0E91,
-	/* Array index: 0x041A */ 0x95C8, 0x95CC, 0x0E9A,
-	/* Array index: 0x041D */ 0x95D4, 0x95D6, 0x0E9F,
-	/* Array index: 0x0420 */ 0x964B, 0x964D, 0x0EA2,
-	/* Array index: 0x0423 */ 0x965D, 0x9664, 0x0EA5,
-	/* Array index: 0x0426 */ 0x9670, 0x9678, 0x0EAD,
-	/* Array index: 0x0429 */ 0x9684, 0x9686, 0x0EB6,
-	/* Array index: 0x042C */ 0x968A, 0x968E, 0x0EB9,
-	/* Array index: 0x042F */ 0x9698, 0x969C, 0x0EBE,
-	/* Array index: 0x0432 */ 0x96C0, 0x96CD, 0x0EC3,
-	/* Array index: 0x0435 */ 0x96E8, 0x96EA, 0x0ED1,
-	/* Array index: 0x0438 */ 0x970D, 0x9713, 0x0ED4,
-	/* Array index: 0x043B */ 0x975E, 0x9762, 0x0EDB,
-	/* Array index: 0x043E */ 0x97FF, 0x9813, 0x0EE0,
-	/* Array index: 0x0441 */ 0x9837, 0x983B, 0x0EF5,
-	/* Array index: 0x0444 */ 0x984C, 0x984F, 0x0EFA,
-	/* Array index: 0x0447 */ 0x986F, 0x9871, 0x0EFE,
-	/* Array index: 0x044A */ 0x98FC, 0x98FE, 0x0F01,
-	/* Array index: 0x044D */ 0x993D, 0x993F, 0x0F04,
-	/* Array index: 0x0450 */ 0x99AC, 0x99AE, 0x0F07,
-	/* Array index: 0x0453 */ 0x99D0, 0x99D2, 0x0F0A,
-	/* Array index: 0x0456 */ 0x9ACF, 0x9AD8, 0x0F0D,
-	/* Array index: 0x0459 */ 0x9AED, 0x9AEF, 0x0F17,
-	/* Array index: 0x045C */ 0x9B41, 0x9B45, 0x0F1A,
-	/* Array index: 0x045F */ 0x9B4D, 0x9B51, 0x0F1F,
-	/* Array index: 0x0462 */ 0x9BAA, 0x9BAE, 0x0F24,
-	/* Array index: 0x0465 */ 0x9BC8, 0x9BCA, 0x0F29,
-	/* Array index: 0x0468 */ 0x9ECC, 0x9ED1, 0x0F2C,
-	/* Array index: 0x046B */ 0x9EDB, 0x9EE0, 0x0F32,
-	/* Array index: 0x046E */ 0xFE30, 0xFE44, 0x0F38,
-	/* Array index: 0x0471 */ 0xFE49, 0xFE6B, 0x0F4D,
-	/* Array index: 0x0474 */ 0xFF01, 0xFF3C, 0x0F70,
-	/* Array index: 0x0477 */ 0xFF3F, 0xFF5D, 0x0FAC,
-	/* Ranges content */
-	/* Range 0x02C7 - 0x02CB, array index: 0x047A */
-	0x256F,INVALC,0x256D,0x256E,0x2570,
-	/* Range 0x0391 - 0x03A9, array index: 0x047F */
-	0x2475,0x2476,0x2477,0x2478,0x2479,0x247A,0x247B,0x247C,
-	0x247D,0x247E,0x2521,0x2522,0x2523,0x2524,0x2525,0x2526,
-	0x2527,INVALC,0x2528,0x2529,0x252A,0x252B,0x252C,0x252D,
-	0x252E,
-	/* Range 0x03B1 - 0x03C9, array index: 0x0498 */
-	0x252F,0x2530,0x2531,0x2532,0x2533,0x2534,0x2535,0x2536,
-	0x2537,0x2538,0x2539,0x253A,0x253B,0x253C,0x253D,0x253E,
-	0x253F,INVALC,0x2540,0x2541,0x2542,0x2543,0x2544,0x2545,
-	0x2546,
-	/* Range 0x2160 - 0x2169, array index: 0x04B1 */
-	0x242B,0x242C,0x242D,0x242E,0x242F,0x2430,0x2431,0x2432,
-	0x2433,0x2434,
-	/* Range 0x2170 - 0x2179, array index: 0x04BB */
-	0x2635,0x2636,0x2637,0x2638,0x2639,0x263A,0x263B,0x263C,
-	0x263D,0x263E,
-	/* Range 0x2190 - 0x2199, array index: 0x04C5 */
-	0x2258,0x2255,0x2257,0x2256,INVALC,INVALC,0x2259,0x225A,
-	0x225C,0x225B,
-	/* Range 0x221E - 0x2220, array index: 0x04CF */
-	0x223C,0x2249,0x2248,
-	/* Range 0x2229 - 0x222B, array index: 0x04D2 */
-	0x2245,0x2246,0x224D,
-	/* Range 0x2400 - 0x2421, array index: 0x04D5 */
-	0x4221,0x4222,0x4223,0x4224,0x4225,0x4226,0x4227,0x4228,
-	0x4229,0x422A,0x422B,0x422C,0x422D,0x422E,0x422F,0x4230,
-	0x4231,0x4232,0x4233,0x4234,0x4235,0x4236,0x4237,0x4238,
-	0x4239,0x423A,0x423B,0x423C,0x423D,0x423E,0x423F,0x4240,
-	INVALC,0x4241,
-	/* Range 0x2460 - 0x2469, array index: 0x04F7 */
-	0x2621,0x2622,0x2623,0x2624,0x2625,0x2626,0x2627,0x2628,
-	0x2629,0x262A,
-	/* Range 0x2474 - 0x247D, array index: 0x0501 */
-	0x262B,0x262C,0x262D,0x262E,0x262F,0x2630,0x2631,0x2632,
-	0x2633,0x2634,
-	/* Range 0x256D - 0x2573, array index: 0x050B */
-	0x2340,0x2341,0x2343,0x2342,0x234C,0x234D,0x234E,
-	/* Range 0x2581 - 0x258F, array index: 0x0512 */
-	0x2324,0x2325,0x2326,0x2327,0x2328,0x2329,0x232A,0x232B,
-	0x2332,0x2331,0x2330,0x232F,0x232E,0x232D,0x232C,
-	/* Range 0x25E2 - 0x25E5, array index: 0x0521 */
-	0x2348,0x2349,0x234B,0x234A,
-	/* Range 0x2640 - 0x2642, array index: 0x0525 */
-	0x2251,0x2253,0x2252,
-	/* Range 0x3000 - 0x3003, array index: 0x0528 */
-	0x2121,0x2123,0x2124,0x2171,
-	/* Range 0x3008 - 0x3015, array index: 0x052C */
-	0x2152,0x2153,0x214E,0x214F,0x2156,0x2157,0x215A,0x215B,
-	0x214A,0x214B,0x2265,INVALC,0x2146,0x2147,
-	/* Range 0x301D - 0x3029, array index: 0x053A */
-	0x2168,0x2169,INVALC,INVALC,0x2435,0x2436,0x2437,0x2438,
-	0x2439,0x243A,0x243B,0x243C,0x243D,
-	/* Range 0x3105 - 0x3129, array index: 0x0547 */
-	0x2547,0x2548,0x2549,0x254A,0x254B,0x254C,0x254D,0x254E,
-	0x254F,0x2550,0x2551,0x2552,0x2553,0x2554,0x2555,0x2556,
-	0x2557,0x2558,0x2559,0x255A,0x255B,0x255C,0x255D,0x255E,
-	0x255F,0x2560,0x2561,0x2562,0x2563,0x2564,0x2565,0x2566,
-	0x2567,0x2568,0x2569,0x256A,0x256B,
-	/* Range 0x339C - 0x339E, array index: 0x056C */
-	0x2270,0x2271,0x2272,
-	/* Range 0x4E08 - 0x4E19, array index: 0x056F */
-	0x4437,0x4435,0x4438,0x4436,INVALC,0x4462,INVALC,INVALC,
-	0x4461,0x4460,INVALC,INVALC,0x4562,0x4561,0x4560,INVALC,
-	0x4563,0x455F,
-	/* Range 0x4E4B - 0x4E53, array index: 0x0581 */
-	0x4466,INVALC,0x4565,0x4567,0x4566,INVALC,INVALC,0x4724,
-	0x4725,
-	/* Range 0x4E5D - 0x4E5F, array index: 0x058A */
-	0x4426,0x443F,0x443E,
-	/* Range 0x4E91 - 0x4E95, array index: 0x058D */
-	0x4469,0x446B,INVALC,0x446C,0x446A,
-	/* Range 0x4E9E - 0x4EAE, array index: 0x0592 */
-	0x4B69,0x4F67,INVALC,0x4441,0x446D,INVALC,0x4728,0x472A,
-	0x4729,INVALC,0x486C,INVALC,INVALC,0x4B6A,0x4B6B,0x4F68,
-	0x4F69,
-	/* Range 0x4EC0 - 0x4ECD, array index: 0x05A3 */
-	0x446F,0x446E,INVALC,0x4470,0x4476,INVALC,0x4471,0x4472,
-	INVALC,INVALC,0x4474,0x4475,INVALC,0x4473,
-	/* Range 0x4ED4 - 0x4ED9, array index: 0x05B1 */
-	0x456A,0x456B,0x456C,0x456D,0x4569,0x4570,
-	/* Range 0x4EE3 - 0x4EE5, array index: 0x05B7 */
-	0x456E,0x456F,0x4568,
-	/* Range 0x4F09 - 0x4F11, array index: 0x05BA */
-	0x472C,0x472E,0x473B,INVALC,0x4730,INVALC,0x4733,0x4731,
-	0x4732,
-	/* Range 0x4F46 - 0x4F48, array index: 0x05C3 */
-	0x487E,0x486F,0x4929,
-	/* Range 0x4F4D - 0x4F60, array index: 0x05C6 */
-	0x486D,0x4925,0x486E,0x4876,0x4877,INVALC,INVALC,0x487C,
-	0x4874,INVALC,0x4870,INVALC,0x4927,0x492A,0x4873,0x4922,
-	0x4928,0x4871,INVALC,0x4923,
-	/* Range 0x4FB5 - 0x4FB7, array index: 0x05DA */
-	0x4F6B,0x4F73,0x5021,
-	/* Range 0x4FC2 - 0x4FC4, array index: 0x05DD */
-	0x4F7B,0x4F72,0x4F7A,
-	/* Range 0x4FCE - 0x4FD1, array index: 0x05E0 */
-	0x4F7D,0x4F70,0x4F79,0x4F6F,
-	/* Range 0x4FDD - 0x4FE1, array index: 0x05E4 */
-	0x4F71,0x4F7E,0x4F75,0x4F6E,0x4F6A,
-	/* Range 0x5009 - 0x501A, array index: 0x05E9 */
-	0x543F,INVALC,0x5436,0x5421,0x5422,INVALC,0x5924,INVALC,
-	0x542F,0x542E,INVALC,0x5432,INVALC,0x5429,INVALC,0x5438,
-	0x5437,0x542D,
-	/* Range 0x5025 - 0x502D, array index: 0x05FB */
-	0x5426,0x5425,INVALC,0x5433,0x5428,0x543C,0x543E,INVALC,
-	0x543B,
-	/* Range 0x5074 - 0x5077, array index: 0x0604 */
-	0x5921,0x587E,0x587B,0x5922,
-	/* Range 0x5096 - 0x509A, array index: 0x0608 */
-	0x5E2F,INVALC,0x5E30,0x5E2C,0x5E31,
-	/* Range 0x513B - 0x514D, array index: 0x060D */
-	0x7B58,0x7B57,INVALC,INVALC,0x442A,0x4442,0x4478,INVALC,
-	0x4477,0x4573,0x4572,0x473E,0x473D,0x473F,0x473C,INVALC,
-	0x492C,0x492B,0x492D,
-	/* Range 0x5159 - 0x516E, array index: 0x0620 */
-	0x2279,INVALC,0x227A,0x5927,0x227C,0x227B,INVALC,INVALC,
-	0x227D,0x677E,0x227E,INVALC,0x442B,INVALC,0x4479,0x4740,
-	0x4C25,INVALC,0x442C,0x447C,0x447A,0x447B,
-	/* Range 0x5175 - 0x5178, array index: 0x0636 */
-	0x492E,0x4C27,0x4C26,0x4C28,
-	/* Range 0x51CB - 0x51CD, array index: 0x063A */
-	0x5447,0x5445,0x5444,
-	/* Range 0x51F6 - 0x51FA, array index: 0x063D */
-	0x447E,INVALC,0x4579,0x4577,0x4578,
-	/* Range 0x5206 - 0x520A, array index: 0x0642 */
-	0x4521,0x4522,0x4523,INVALC,0x457A,
-	/* Range 0x5224 - 0x522A, array index: 0x0647 */
-	0x4932,0x4931,INVALC,INVALC,0x4935,0x4933,0x4934,
-	/* Range 0x5236 - 0x523B, array index: 0x064E */
-	0x4C31,0x4C2D,0x4C2C,INVALC,0x4C2E,0x4C2B,
-	/* Range 0x524A - 0x524E, array index: 0x0654 */
-	0x5028,0x502B,0x502A,0x5029,0x5026,
-	/* Range 0x525B - 0x525D, array index: 0x0659 */
-	0x544B,0x5449,0x544C,
-	/* Range 0x5287 - 0x528A, array index: 0x065C */
-	0x6C2A,0x6C2B,0x6C2C,0x6C2E,
-	/* Range 0x52A9 - 0x52AC, array index: 0x0660 */
-	0x4937,0x4938,0x4936,0x4939,
-	/* Range 0x52D5 - 0x52E6, array index: 0x0664 */
-	0x592F,INVALC,0x5B2B,0x592E,0x592D,INVALC,0x5E3A,INVALC,
-	0x5E39,0x5E38,0x6339,INVALC,INVALC,0x633C,0x633D,0x633B,
-	INVALC,0x633A,
-	/* Range 0x5315 - 0x5319, array index: 0x0676 */
-	0x4431,0x4527,0x4621,INVALC,0x5932,
-	/* Range 0x533E - 0x534A, array index: 0x067B */
-	0x5935,0x5933,0x5934,0x4432,INVALC,0x4445,0x243F,0x452B,
-	INVALC,0x452A,0x4529,0x4625,0x4624,
-	/* Range 0x5351 - 0x5354, array index: 0x0688 */
-	0x4C38,0x4C35,0x4C37,0x4C36,
-	/* Range 0x536E - 0x537B, array index: 0x068C */
-	0x4629,0x4628,0x474D,0x474E,INVALC,0x493B,INVALC,0x493C,
-	INVALC,0x4C3A,0x4C3B,0x4C3C,INVALC,0x5033,
-	/* Range 0x53C8 - 0x53CD, array index: 0x069A */
-	0x4434,0x4446,0x452F,0x452E,INVALC,0x4530,
-	/* Range 0x53E2 - 0x53F5, array index: 0x06A0 */
-	0x763B,0x4447,0x462C,0x463B,0x4636,INVALC,0x4631,0x4630,
-	0x4637,0x4635,0x462E,0x463C,0x462F,0x462B,0x463A,0x4639,
-	0x4638,0x462D,INVALC,0x4634,
-	/* Range 0x5406 - 0x5412, array index: 0x06B4 */
-	0x475C,INVALC,0x4759,0x474F,0x4752,0x4755,0x4751,0x4758,
-	0x475B,0x4750,0x4753,0x4757,0x475D,
-	/* Range 0x541B - 0x5420, array index: 0x06C1 */
-	0x4949,INVALC,0x493D,0x493F,0x4957,0x4952,
-	/* Range 0x5429 - 0x542E, array index: 0x06C7 */
-	0x494A,INVALC,0x4956,0x4958,0x493E,0x494F,
-	/* Range 0x5435 - 0x5443, array index: 0x06CD */
-	0x4950,0x4951,INVALC,0x494E,0x494C,INVALC,0x494D,0x4953,
-	INVALC,0x4940,INVALC,0x4954,INVALC,0x4948,0x4945,
-	/* Range 0x5473 - 0x547D, array index: 0x06DC */
-	0x4C40,INVALC,0x4C41,0x4C4E,0x4C47,0x4C43,INVALC,INVALC,
-	0x4C46,0x4C4B,0x4C54,
-	/* Range 0x54A6 - 0x54AC, array index: 0x06E7 */
-	0x503C,0x504A,0x5038,0x5049,0x5041,0x5046,0x5036,
-	/* Range 0x54BD - 0x54C9, array index: 0x06EE */
-	0x5040,INVALC,0x504B,0x5037,0x5042,0x503F,INVALC,0x5043,
-	INVALC,INVALC,0x503E,0x5044,0x503A,
-	/* Range 0x54E5 - 0x54EE, array index: 0x06FB */
-	0x5457,0x5462,INVALC,0x5452,0x545C,0x5461,INVALC,INVALC,
-	0x545D,0x5460,
-	/* Range 0x5555 - 0x5557, array index: 0x0705 */
-	0x5943,0x5941,0x594D,
-	/* Range 0x5580 - 0x5584, array index: 0x0708 */
-	0x5E3E,INVALC,0x5E44,0x5E4A,0x6143,
-	/* Range 0x5587 - 0x558B, array index: 0x070D */
-	0x5E48,INVALC,0x5E55,0x5E41,0x5E49,
-	/* Range 0x5598 - 0x559F, array index: 0x0712 */
-	0x5E43,0x5E57,0x5E50,INVALC,0x5E45,0x5E42,INVALC,0x5E4D,
-	/* Range 0x55AA - 0x55B3, array index: 0x071A */
-	0x5E46,0x5E56,0x5E52,INVALC,0x5E4C,INVALC,INVALC,0x5E53,
-	0x5E4F,0x5E4B,
-	/* Range 0x55C5 - 0x55C9, array index: 0x0724 */
-	0x634C,0x634D,0x6345,INVALC,0x634F,
-	/* Range 0x55E1 - 0x55E8, array index: 0x0729 */
-	0x634B,INVALC,0x6347,0x6348,0x634E,0x6342,0x2321,0x6340,
-	/* Range 0x562E - 0x5636, array index: 0x0731 */
-	0x6C31,0x6C3D,0x6C3E,INVALC,0x6C34,INVALC,0x6C36,INVALC,
-	0x6C3C,
-	/* Range 0x5664 - 0x566C, array index: 0x073A */
-	0x703F,0x7043,INVALC,INVALC,0x7042,0x703E,0x7041,0x703C,
-	0x7046,
-	/* Range 0x568E - 0x5690, array index: 0x0743 */
-	0x7345,0x734A,0x7347,
-	/* Range 0x56C0 - 0x56C2, array index: 0x0746 */
-	0x7A65,0x7A64,0x7A66,
-	/* Range 0x56C8 - 0x56CC, array index: 0x0749 */
-	0x7B59,0x7B5B,0x7B5A,INVALC,0x7C34,
-	/* Range 0x56DA - 0x56E0, array index: 0x074E */
-	0x463F,0x463E,INVALC,0x4760,0x475F,INVALC,0x475E,
-	/* Range 0x572C - 0x5730, array index: 0x0755 */
-	0x4765,0x4764,INVALC,0x4766,0x4762,
-	/* Range 0x574D - 0x5751, array index: 0x075A */
-	0x4960,0x4962,0x4965,0x4964,0x495E,
-	/* Range 0x582F - 0x5835, array index: 0x075F */
-	0x5E59,0x5E5D,0x5E5E,INVALC,INVALC,0x5E5B,0x5959,
-	/* Range 0x584A - 0x584C, array index: 0x0766 */
-	0x635B,0x635E,0x6359,
-	/* Range 0x5914 - 0x591C, array index: 0x0769 */
-	0x7A67,0x444A,0x4640,INVALC,INVALC,0x4768,0x4769,INVALC,
-	0x4C5F,
-	/* Range 0x5927 - 0x592E, array index: 0x0772 */
-	0x444B,INVALC,0x4532,0x4534,0x4533,INVALC,0x4535,0x4641,
-	/* Range 0x5947 - 0x5949, array index: 0x077A */
-	0x4C61,0x4C62,0x4C60,
-	/* Range 0x594E - 0x595A, array index: 0x077D */
-	0x5058,0x5057,0x5059,0x5056,INVALC,INVALC,0x4C64,0x5055,
-	INVALC,0x546F,0x5470,INVALC,0x5471,
-	/* Range 0x5981 - 0x5984, array index: 0x078A */
-	0x4772,0x4771,0x476E,0x476C,
-	/* Range 0x59A3 - 0x59A5, array index: 0x078E */
-	0x496D,0x4971,0x4974,
-	/* Range 0x59D0 - 0x59D4, array index: 0x0791 */
-	0x4C6C,0x4C6A,0x4C73,0x4C6F,0x4C67,
-	/* Range 0x5ABC - 0x5AC2, array index: 0x0796 */
-	0x6365,0x6364,0x6363,INVALC,INVALC,0x6360,0x6367,
-	/* Range 0x5AD6 - 0x5AD8, array index: 0x079D */
-	0x684A,0x6849,0x684B,
-	/* Range 0x5B08 - 0x5B0C, array index: 0x07A0 */
-	0x6C4D,0x6C48,INVALC,0x6C4A,0x6C4C,
-	/* Range 0x5B50 - 0x5B5F, array index: 0x07A5 */
-	0x444D,0x444E,INVALC,0x444F,0x4536,0x4645,INVALC,0x4773,
-	0x4774,INVALC,0x4977,0x4978,0x4976,0x4975,INVALC,0x4C75,
-	/* Range 0x5B85 - 0x5B8C, array index: 0x07B5 */
-	0x4777,INVALC,0x4775,0x4776,0x4778,INVALC,0x497A,0x4979,
-	/* Range 0x5B97 - 0x5B9C, array index: 0x07BD */
-	0x4C78,0x4C7A,0x4C7C,0x4C79,0x4C7D,0x4C7B,
-	/* Range 0x5BA2 - 0x5BA6, array index: 0x07C3 */
-	0x506A,0x5067,0x5069,0x506B,0x5068,
-	/* Range 0x5BB3 - 0x5BB9, array index: 0x07C8 */
-	0x5524,0x5526,0x5528,0x5525,INVALC,0x552A,0x5529,
-	/* Range 0x5BC2 - 0x5BC7, array index: 0x07CF */
-	0x596D,INVALC,0x596C,0x596B,0x596F,0x596A,
-	/* Range 0x5BDE - 0x5BF0, array index: 0x07D5 */
-	0x684E,0x6856,INVALC,0x6850,0x6854,INVALC,0x6855,0x6851,
-	0x6852,0x684F,0x6853,0x6C50,INVALC,0x6C51,0x6C4F,INVALC,
-	0x6C4E,INVALC,0x7051,
-	/* Range 0x5C07 - 0x5C11, array index: 0x07E8 */
-	0x5972,0x5971,0x5970,0x5E71,0x5E72,INVALC,0x6857,0x7052,
-	0x4451,INVALC,0x4537,
-	/* Range 0x5C37 - 0x5C41, array index: 0x07F3 */
-	0x7353,0x4453,0x4467,0x4539,INVALC,0x4647,INVALC,0x4A22,
-	0x4A21,0x497D,0x497E,
-	/* Range 0x5C4B - 0x5C51, array index: 0x07FE */
-	0x5070,INVALC,0x506F,0x506D,0x506E,0x552E,0x552C,
-	/* Range 0x5DE1 - 0x5DE8, array index: 0x0805 */
-	0x4B56,0x5A25,INVALC,INVALC,0x4456,0x464A,0x4649,0x4648,
-	/* Range 0x5DF1 - 0x5DF4, array index: 0x080D */
-	0x4457,0x4458,0x4459,0x453B,
-	/* Range 0x5E36 - 0x5E38, array index: 0x0811 */
-	0x5A27,0x5A29,0x5A26,
-	/* Range 0x5E5F - 0x5E63, array index: 0x0814 */
-	0x6C57,INVALC,0x6C58,0x6C56,0x685C,
-	/* Range 0x5E72 - 0x5E7E, array index: 0x0819 */
-	0x445B,0x464D,0x4821,INVALC,0x477E,INVALC,0x4D31,0x636C,
-	INVALC,0x453C,0x464E,0x5077,0x5E7D,
-	/* Range 0x5E95 - 0x5E97, array index: 0x0826 */
-	0x4D35,0x4D36,0x4D33,
-	/* Range 0x5EB5 - 0x5EB8, array index: 0x0829 */
-	0x5A2D,0x5A2C,0x5A2A,0x5A2B,
-	/* Range 0x5EC8 - 0x5ECA, array index: 0x082D */
-	0x636E,0x636D,0x5E7E,
-	/* Range 0x5EDF - 0x5EE3, array index: 0x0830 */
-	0x6C5B,0x6C5E,INVALC,0x6C59,0x6C5D,
-	/* Range 0x5F12 - 0x5F18, array index: 0x0835 */
-	0x636F,0x445E,0x453E,0x453F,INVALC,0x4651,0x4650,
-	/* Range 0x5F69 - 0x5F71, array index: 0x083C */
-	0x5A33,0x5D29,0x5A34,0x5A32,0x5F25,INVALC,INVALC,0x6864,
-	0x6C60,
-	/* Range 0x5F7F - 0x5F81, array index: 0x0845 */
-	0x4D3D,0x4D3B,0x4D3C,
-	/* Range 0x5F85 - 0x5F92, array index: 0x0848 */
-	0x5121,INVALC,0x5124,0x507E,0x5126,0x5122,0x5123,0x5125,
-	INVALC,INVALC,INVALC,0x5541,0x5540,0x553F,
-	/* Range 0x5F97 - 0x5F99, array index: 0x0856 */
-	0x5A35,0x5A38,0x5A36,
-	/* Range 0x5FA8 - 0x5FAE, array index: 0x0859 */
-	0x5F28,0x5F26,0x5F27,INVALC,0x6371,INVALC,0x6372,
-	/* Range 0x5FD6 - 0x5FD9, array index: 0x0860 */
-	0x4825,0x4A35,0x4A33,0x4824,
-	/* Range 0x6012 - 0x6016, array index: 0x0864 */
-	0x5127,INVALC,0x4D45,0x4D4A,0x4D48,
-	/* Range 0x6025 - 0x602B, array index: 0x0869 */
-	0x512A,INVALC,0x4D4C,0x512C,0x4D4D,0x4D49,0x4D4E,
-	/* Range 0x6062 - 0x6070, array index: 0x0870 */
-	0x5130,0x5543,0x5136,0x5544,INVALC,INVALC,0x512F,0x5548,
-	0x5135,0x5134,0x5133,0x5547,INVALC,0x5549,0x512E,
-	/* Range 0x60B2 - 0x60BD, array index: 0x087F */
-	0x5F2B,INVALC,0x5A42,0x5A47,0x5F2C,INVALC,0x5A4E,INVALC,
-	INVALC,0x5A46,0x5A49,0x5A44,
-	/* Range 0x60C5 - 0x60C7, array index: 0x088B */
-	0x5A45,0x5A4C,0x5A50,
-	/* Range 0x60DF - 0x60E1, array index: 0x088E */
-	0x5A4D,0x5F2D,0x5F2A,
-	/* Range 0x60F0 - 0x60FB, array index: 0x0891 */
-	0x5F32,0x5F36,INVALC,0x6377,0x5F34,INVALC,0x5F38,INVALC,
-	INVALC,0x6379,0x5F30,0x5F33,
-	/* Range 0x610D - 0x610F, array index: 0x089D */
-	0x6425,0x5F37,0x6374,
-	/* Range 0x611A - 0x611C, array index: 0x08A0 */
-	0x6373,0x6378,0x5F2E,
-	/* Range 0x6147 - 0x614E, array index: 0x08A3 */
-	0x6866,0x6375,INVALC,INVALC,0x6868,0x637D,0x6421,0x637C,
-	/* Range 0x6175 - 0x6177, array index: 0x08AB */
-	0x686F,0x6C63,0x6869,
-	/* Range 0x61C7 - 0x61CD, array index: 0x08AE */
-	0x735E,0x705C,0x735C,0x705B,0x7360,INVALC,0x7058,
-	/* Range 0x61F5 - 0x6200, array index: 0x08B5 */
-	0x7837,0x7836,0x7835,0x796C,INVALC,0x796D,INVALC,0x7A6A,
-	INVALC,0x7A6B,0x7B60,0x7C36,
-	/* Range 0x620A - 0x6216, array index: 0x08C1 */
-	0x4653,INVALC,0x4827,0x4828,0x4826,INVALC,0x4829,0x4A3C,
-	0x4A3B,INVALC,INVALC,0x4D51,0x4D50,
-	/* Range 0x6230 - 0x6236, array index: 0x08CE */
-	0x705D,INVALC,0x7361,0x7643,0x7362,INVALC,0x4542,
-	/* Range 0x623E - 0x6241, array index: 0x08D5 */
-	0x4D53,0x4D52,0x4D54,0x5137,
-	/* Range 0x6247 - 0x6254, array index: 0x08D9 */
-	0x5552,0x5A53,0x5F3D,INVALC,0x4543,INVALC,0x445F,0x4544,
-	INVALC,INVALC,0x4657,0x4656,0x4654,0x4655,
-	/* Range 0x626D - 0x626F, array index: 0x08E7 */
-	0x4A43,0x4A4C,0x4A4A,
-	/* Range 0x627C - 0x6280, array index: 0x08EA */
-	0x4A45,INVALC,0x4A46,0x4D55,0x4A40,
-	/* Range 0x6291 - 0x6298, array index: 0x08EF */
-	0x4A4F,0x4A49,0x4A4E,INVALC,0x4A4D,0x4A3F,0x4A3E,0x4A4B,
-	/* Range 0x62C4 - 0x62DC, array index: 0x08F7 */
-	0x4D58,INVALC,0x4D70,0x4D68,0x4D62,0x4D56,INVALC,0x4D61,
-	0x4D57,0x4D69,0x4D72,INVALC,0x4D66,INVALC,0x4D5C,0x4D5F,
-	0x4D60,INVALC,0x4D6E,0x4D6F,0x4D6D,0x4D67,0x4D6B,0x4D5D,
-	0x5138,
-	/* Range 0x62EC - 0x62F4, array index: 0x0910 */
-	0x5144,0x513C,0x513E,0x5143,INVALC,0x5141,INVALC,0x5553,
-	0x5146,
-	/* Range 0x62FC - 0x6302, array index: 0x0919 */
-	0x513B,0x513F,0x5145,0x5555,INVALC,0x513D,0x5148,
-	/* Range 0x6307 - 0x6309, array index: 0x0920 */
-	0x5140,0x5554,0x513A,
-	/* Range 0x634C - 0x6350, array index: 0x0923 */
-	0x5565,0x5564,0x5556,0x555C,0x555F,
-	/* Range 0x6367 - 0x636B, array index: 0x0928 */
-	0x5A5B,0x5A6F,0x5A6E,INVALC,0x5A63,
-	/* Range 0x63A0 - 0x63AC, array index: 0x092D */
-	0x5A54,0x5A68,0x5A58,0x5F3E,INVALC,0x5A59,INVALC,0x5A55,
-	0x5A64,0x5A5F,0x5A5D,INVALC,0x5A69,
-	/* Range 0x6413 - 0x6417, array index: 0x093A */
-	0x642A,0x6433,INVALC,0x6436,0x6437,
-	/* Range 0x6478 - 0x647B, array index: 0x093F */
-	0x6875,0x6C79,0x6877,0x687C,
-	/* Range 0x64A9 - 0x64B3, array index: 0x0943 */
-	0x6D24,INVALC,0x6D28,0x6D2A,0x6D27,0x6D26,INVALC,0x6C7E,
-	INVALC,0x6C7B,0x6D2D,
-	/* Range 0x64BB - 0x64CE, array index: 0x094E */
-	0x7061,0x7062,INVALC,0x706B,0x7068,INVALC,0x705F,0x7066,
-	INVALC,0x7064,0x705E,INVALC,0x7065,INVALC,INVALC,0x7364,
-	0x7060,INVALC,0x7067,0x7363,
-	/* Range 0x64EC - 0x64F4, array index: 0x0962 */
-	0x7369,0x736C,INVALC,INVALC,0x7367,0x736A,0x7645,INVALC,
-	0x7644,
-	/* Range 0x652A - 0x652C, array index: 0x096B */
-	0x7C39,0x7C38,0x7C5F,
-	/* Range 0x6554 - 0x6559, array index: 0x096E */
-	0x5A7A,0x5A79,0x5A72,0x5A75,0x5A78,0x5A74,
-	/* Range 0x6574 - 0x6578, array index: 0x0974 */
-	0x706C,0x6D2E,INVALC,0x6D2F,0x6D30,
-	/* Range 0x65CB - 0x65CF, array index: 0x0979 */
-	0x5B21,0x5B22,INVALC,0x5B23,0x5A7E,
-	/* Range 0x65E5 - 0x65ED, array index: 0x097E */
-	0x454A,0x4659,INVALC,0x482F,0x482E,INVALC,INVALC,0x4830,
-	0x4831,
-	/* Range 0x6613 - 0x6615, array index: 0x0987 */
-	0x4D78,0x4D77,0x4E21,
-	/* Range 0x6624 - 0x6628, array index: 0x098A */
-	0x5156,0x514E,INVALC,0x5151,0x5154,
-	/* Range 0x6641 - 0x6645, array index: 0x098F */
-	0x5572,0x556B,0x556E,INVALC,0x5571,
-	/* Range 0x666E - 0x6670, array index: 0x0994 */
-	0x5F5B,0x5F5F,0x5F5C,
-	/* Range 0x6687 - 0x6689, array index: 0x0997 */
-	0x643E,0x643F,0x643D,
-	/* Range 0x6696 - 0x6698, array index: 0x099A */
-	0x6440,0x643C,0x6442,
-	/* Range 0x66F0 - 0x66F9, array index: 0x099D */
-	0x454B,INVALC,0x4832,0x4833,0x4A55,INVALC,INVALC,0x5157,
-	0x5573,0x5B2A,
-	/* Range 0x66FC - 0x6700, array index: 0x09A7 */
-	0x5937,INVALC,0x5F64,0x5F65,0x5E32,
-	/* Range 0x6726 - 0x672E, array index: 0x09AC */
-	0x764D,0x7972,0x454D,INVALC,0x465C,0x465D,0x465B,0x465E,
-	0x465A,
-	/* Range 0x674E - 0x6757, array index: 0x09B5 */
-	0x4A57,0x4A58,0x4A59,0x4A5A,INVALC,0x4A61,INVALC,INVALC,
-	0x4A5C,0x4A62,
-	/* Range 0x675C - 0x6760, array index: 0x09BF */
-	0x4A5B,INVALC,0x4A5D,0x4A56,0x4A60,
-	/* Range 0x676D - 0x6777, array index: 0x09C4 */
-	0x4E26,INVALC,0x4E30,0x4E31,0x4E29,0x4E3B,0x4E2B,INVALC,
-	0x4E36,INVALC,0x4E2C,
-	/* Range 0x67CF - 0x67D4, array index: 0x09CF */
-	0x5169,0x515C,0x5164,0x5170,0x5159,0x515B,
-	/* Range 0x67F1 - 0x67F5, array index: 0x09D5 */
-	0x515A,INVALC,0x516B,0x5627,0x5160,
-	/* Range 0x683C - 0x6848, array index: 0x09DA */
-	0x562A,0x5626,INVALC,INVALC,0x5629,0x5630,0x557D,0x562B,
-	INVALC,0x562D,0x557A,INVALC,0x5579,
-	/* Range 0x6850 - 0x6854, array index: 0x09E7 */
-	0x5628,0x5625,INVALC,0x557B,0x557E,
-	/* Range 0x687F - 0x6886, array index: 0x09EC */
-	0x5B32,INVALC,0x5B2D,0x5B42,0x5B38,INVALC,0x5B3C,0x5B3B,
-	/* Range 0x68AD - 0x68B5, array index: 0x09F4 */
-	0x5B3A,INVALC,0x5B2E,0x5B37,0x5B34,INVALC,0x5622,INVALC,
-	0x5B31,
-	/* Range 0x68F9 - 0x68FB, array index: 0x09FD */
-	0x5F72,0x5F68,0x5F7E,
-	/* Range 0x695A - 0x6960, array index: 0x0A00 */
-	0x6447,0x6457,INVALC,0x6455,0x6451,INVALC,0x6449,
-	/* Range 0x69CB - 0x69CD, array index: 0x0A07 */
-	0x692C,0x6935,0x6933,
-	/* Range 0x6A38 - 0x6A3A, array index: 0x0A0A */
-	0x7074,0x7079,0x7075,
-	/* Range 0x6B5F - 0x6B67, array index: 0x0A0D */
-	0x7656,INVALC,0x7B63,0x454F,0x465F,0x483A,0x4A63,0x4E3D,
-	0x4E3E,
-	/* Range 0x6B77 - 0x6B7B, array index: 0x0A16 */
-	0x7125,0x7657,0x4550,INVALC,0x483B,
-	/* Range 0x6BD2 - 0x6BD4, array index: 0x0A1B */
-	0x5175,0x645C,0x4552,
-	/* Range 0x6C0F - 0x6C13, array index: 0x0A1E */
-	0x4554,0x4662,0x4661,INVALC,0x4E40,
-	/* Range 0x6C23 - 0x6C2F, array index: 0x0A23 */
-	0x5634,0x5638,INVALC,0x5637,0x5635,0x5636,INVALC,INVALC,
-	0x5B47,0x602A,INVALC,0x6028,0x6029,
-	/* Range 0x6C3E - 0x6C42, array index: 0x0A30 */
-	0x4666,INVALC,0x4665,0x4664,0x4A65,
-	/* Range 0x6C5B - 0x6C61, array index: 0x0A35 */
-	0x4845,INVALC,0x483D,0x4A66,0x4840,0x4841,0x4844,
-	/* Range 0x6C7D - 0x6C8D, array index: 0x0A3C */
-	0x4A75,0x4A78,INVALC,INVALC,0x4A68,0x4B21,0x4A76,INVALC,
-	0x4A6B,0x4A7A,INVALC,0x4A69,0x4A6A,INVALC,INVALC,0x4A71,
-	0x4A7C,
-	/* Range 0x6CB8 - 0x6CC5, array index: 0x0A4D */
-	0x4E50,0x4E52,INVALC,0x4E59,0x4E4B,0x4E49,0x4E4A,0x4E58,
-	INVALC,0x4E53,INVALC,INVALC,0x4E51,0x4E56,
-	/* Range 0x6CD3 - 0x6CD7, array index: 0x0A5B */
-	0x4E4F,INVALC,0x4E4E,0x4E60,0x4E55,
-	/* Range 0x6CE0 - 0x6CE5, array index: 0x0A60 */
-	0x4E61,0x4E5A,0x4E4C,0x4E42,INVALC,0x4E47,
-	/* Range 0x6CEF - 0x6CF5, array index: 0x0A66 */
-	0x4E5E,0x5639,0x4E57,INVALC,0x4E44,INVALC,0x5229,
-	/* Range 0x6D27 - 0x6D2B, array index: 0x0A6D */
-	0x522B,INVALC,0x522D,0x517B,0x5231,
-	/* Range 0x6D35 - 0x6D3E, array index: 0x0A72 */
-	0x522F,0x5227,INVALC,0x522C,0x522A,INVALC,0x5224,INVALC,
-	0x5225,0x5226,
-	/* Range 0x6D77 - 0x6D79, array index: 0x0A7C */
-	0x5640,0x563F,0x564B,
-	/* Range 0x6D85 - 0x6D8E, array index: 0x0A7F */
-	0x564C,INVALC,0x563D,0x563C,0x5644,0x564A,INVALC,0x5649,
-	INVALC,0x5B48,
-	/* Range 0x6D93 - 0x6D95, array index: 0x0A89 */
-	0x5642,0x564E,0x563B,
-	/* Range 0x6DC4 - 0x6DC7, array index: 0x0A8C */
-	0x5B69,0x5B5D,0x5B68,0x5B53,
-	/* Range 0x6DD8 - 0x6DDA, array index: 0x0A90 */
-	0x5B63,0x5B4B,0x5B61,
-	/* Range 0x6DE8 - 0x6DEE, array index: 0x0A93 */
-	0x5B67,INVALC,0x5B64,0x5B62,0x5B6B,INVALC,0x5B66,
-	/* Range 0x6DF7 - 0x6DFB, array index: 0x0A9A */
-	0x5B5B,INVALC,0x5B59,0x5B51,0x5B50,
-	/* Range 0x6E19 - 0x6E26, array index: 0x0A9F */
-	0x6047,0x5B5F,0x6035,INVALC,0x6043,INVALC,INVALC,0x6032,
-	0x602E,INVALC,0x6034,0x6038,0x6033,0x603C,
-	/* Range 0x6ED1 - 0x6ED5, array index: 0x0AAD */
-	0x646C,INVALC,0x6460,0x6470,0x6D5A,
-	/* Range 0x6EFE - 0x6F02, array index: 0x0AB2 */
-	0x693E,0x6948,INVALC,0x6955,0x6946,
-	/* Range 0x6F13 - 0x6F15, array index: 0x0AB7 */
-	0x693F,0x693D,0x694F,
-	/* Range 0x6F29 - 0x6F2C, array index: 0x0ABA */
-	0x6941,0x6953,0x6950,0x6944,
-	/* Range 0x6F2F - 0x6F33, array index: 0x0ABE */
-	0x6951,INVALC,0x694B,0x694D,0x693C,
-	/* Range 0x6F6D - 0x6F70, array index: 0x0AC3 */
-	0x6D50,0x6D53,0x6D5B,0x6D56,
-	/* Range 0x6FC0 - 0x6FC3, array index: 0x0AC7 */
-	0x712F,0x712C,0x7127,0x712A,
-	/* Range 0x6FDF - 0x6FE1, array index: 0x0ACB */
-	0x7424,0x7425,0x742C,
-	/* Range 0x6FEB - 0x6FF1, array index: 0x0ACE */
-	0x7428,0x742B,INVALC,0x742F,0x7429,0x7430,0x7423,
-	/* Range 0x70AB - 0x70AF, array index: 0x0AD5 */
-	0x5232,0x5235,0x5237,0x5239,0x5236,
-	/* Range 0x7164 - 0x7169, array index: 0x0ADA */
-	0x6477,0x647E,0x647C,0x6479,0x6523,0x6476,
-	/* Range 0x71E5 - 0x71E7, array index: 0x0AE0 */
-	0x7435,0x7434,0x7431,
-	/* Range 0x71EC - 0x71EE, array index: 0x0AE3 */
-	0x7437,0x7436,0x7433,
-	/* Range 0x7235 - 0x723E, array index: 0x0AE6 */
-	0x743A,0x4558,INVALC,0x4E69,0x5655,0x6525,0x4559,INVALC,
-	0x5B73,0x695F,
-	/* Range 0x7246 - 0x7248, array index: 0x0AF0 */
-	0x743B,0x455A,0x4E6A,
-	/* Range 0x725D - 0x7262, array index: 0x0AF3 */
-	0x484A,INVALC,0x4849,0x4B28,0x4B27,0x4B26,
-	/* Range 0x72F7 - 0x72FD, array index: 0x0AF9 */
-	0x565B,0x565A,0x5658,INVALC,INVALC,0x5657,0x5659,
-	/* Range 0x7377 - 0x737B, array index: 0x0B00 */
-	0x7664,0x784B,INVALC,0x784C,0x7978,
-	/* Range 0x7433 - 0x7436, array index: 0x0B05 */
-	0x605F,0x6064,0x6062,0x6063,
-	/* Range 0x7459 - 0x745F, array index: 0x0B09 */
-	0x6532,0x652C,0x6533,0x6534,INVALC,0x652F,0x652E,
-	/* Range 0x74A6 - 0x74A9, array index: 0x0B10 */
-	0x7440,0x7666,0x7441,0x743E,
-	/* Range 0x74E0 - 0x74E6, array index: 0x0B14 */
-	0x5C24,INVALC,0x7147,0x784F,0x7B67,INVALC,0x466B,
-	/* Range 0x7525 - 0x7533, array index: 0x0B1B */
-	0x6069,0x606A,INVALC,0x466E,0x466F,INVALC,0x4B2D,0x4B2C,
-	0x524A,INVALC,INVALC,0x4670,0x4671,0x4672,0x4673,
-	/* Range 0x754B - 0x754F, array index: 0x0B2A */
-	0x524E,0x524C,INVALC,0x524D,0x524B,
-	/* Range 0x7559 - 0x755D, array index: 0x0B2F */
-	0x5667,0x5666,INVALC,0x5665,0x5664,
-	/* Range 0x75A2 - 0x75A5, array index: 0x0B34 */
-	0x5252,0x5253,0x5250,0x5251,
-	/* Range 0x75B8 - 0x75BE, array index: 0x0B38 */
-	0x5671,0x566F,INVALC,INVALC,0x566E,0x566D,0x5668,
-	/* Range 0x75F0 - 0x75F4, array index: 0x0B3F */
-	0x6538,0x653B,0x653A,0x653F,0x653E,
-	/* Range 0x75FF - 0x7601, array index: 0x0B44 */
-	0x653D,0x6537,0x6539,
-	/* Range 0x761F - 0x7629, array index: 0x0B47 */
-	0x6D6E,0x6D6C,0x6D71,0x6D72,INVALC,0x6D6F,INVALC,0x6D70,
-	0x696B,INVALC,0x6D6D,
-	/* Range 0x767B - 0x767E, array index: 0x0B52 */
-	0x6074,0x6075,0x4675,0x484B,
-	/* Range 0x7684 - 0x7688, array index: 0x0B56 */
-	0x4E7B,INVALC,0x5255,0x5256,0x5257,
-	/* Range 0x76C2 - 0x76CE, array index: 0x0B5B */
-	0x4E7C,0x525A,INVALC,0x525B,0x5259,INVALC,0x5258,INVALC,
-	0x5674,INVALC,INVALC,0x5675,0x5676,
-	/* Range 0x76DB - 0x76E7, array index: 0x0B68 */
-	0x5C36,0x6079,INVALC,0x6540,0x6541,INVALC,0x6970,INVALC,
-	0x6971,0x6D75,0x714E,INVALC,0x714D,
-	/* Range 0x7736 - 0x773E, array index: 0x0B75 */
-	0x5C3A,0x5C37,0x5C3B,INVALC,0x5C3C,INVALC,0x5C39,INVALC,
-	0x5C38,
-	/* Range 0x7761 - 0x776C, array index: 0x0B7E */
-	0x6975,0x654D,0x6546,INVALC,0x654B,0x6544,INVALC,0x654C,
-	INVALC,0x6548,0x6543,0x6549,
-	/* Range 0x779E - 0x77A0, array index: 0x0B8A */
-	0x7150,0x7151,0x714F,
-	/* Range 0x77BB - 0x77BF, array index: 0x0B8D */
-	0x766E,0x766F,0x766C,INVALC,0x766D,
-	/* Range 0x77DA - 0x77DC, array index: 0x0B92 */
-	0x7D33,0x4679,0x5264,
-	/* Range 0x77ED - 0x77EF, array index: 0x0B95 */
-	0x607B,0x654E,0x744C,
-	/* Range 0x792A - 0x792C, array index: 0x0B98 */
-	0x797D,0x7A21,0x797E,
-	/* Range 0x7946 - 0x7949, array index: 0x0B9B */
-	0x5269,0x526C,0x526B,0x526A,
-	/* Range 0x7955 - 0x7957, array index: 0x0B9F */
-	0x5729,0x572D,0x5730,
-	/* Range 0x795D - 0x7960, array index: 0x0BA2 */
-	0x572F,0x572E,0x572C,0x572B,
-	/* Range 0x798D - 0x798F, array index: 0x0BA6 */
-	0x697E,0x697C,0x697D,
-	/* Range 0x79B9 - 0x79C1, array index: 0x0BA9 */
-	0x526D,0x526E,INVALC,INVALC,0x655D,0x467D,0x4B35,0x4B34,
-	0x4B33,
-	/* Range 0x79E3 - 0x79E9, array index: 0x0BB2 */
-	0x5733,0x5732,INVALC,0x5736,0x5734,INVALC,0x5737,
-	/* Range 0x7A1C - 0x7A20, array index: 0x0BB9 */
-	0x655E,INVALC,0x6563,0x6562,0x6560,
-	/* Range 0x7A3B - 0x7A40, array index: 0x0BBE */
-	0x6E2A,0x6E26,0x6E28,INVALC,0x6E25,0x6E27,
-	/* Range 0x7A4B - 0x7A4E, array index: 0x0BC4 */
-	0x715C,0x715B,0x7158,0x7159,
-	/* Range 0x7A60 - 0x7A62, array index: 0x0BC8 */
-	0x7674,0x7672,0x7673,
-	/* Range 0x7A95 - 0x7A98, array index: 0x0BCB */
-	0x5C45,0x6128,0x6127,0x6126,
-	/* Range 0x7B4D - 0x7B56, array index: 0x0BCF */
-	0x6131,INVALC,0x6133,0x612E,0x6134,0x612F,INVALC,0x6130,
-	INVALC,0x612C,
-	/* Range 0x7C3D - 0x7C40, array index: 0x0BD9 */
-	0x785C,0x7859,0x785A,0x785E,
-	/* Range 0x7C5F - 0x7C65, array index: 0x0BDD */
-	0x7B6D,0x7B6C,INVALC,INVALC,0x7C3F,0x7C3E,0x7C40,
-	/* Range 0x7CDC - 0x7CE2, array index: 0x0BE4 */
-	0x745D,0x7462,0x745E,0x7460,0x745C,INVALC,0x745F,
-	/* Range 0x7D02 - 0x7D0D, array index: 0x0BEB */
-	0x5277,INVALC,0x527C,0x5278,0x527D,0x527B,INVALC,0x527A,
-	0x5742,0x5741,INVALC,0x574A,
-	/* Range 0x7D17 - 0x7D22, array index: 0x0BF7 */
-	0x5740,INVALC,0x574B,0x5748,0x574C,0x5749,INVALC,INVALC,
-	INVALC,0x5743,0x573F,0x5744,
-	/* Range 0x7D2E - 0x7D33, array index: 0x0C03 */
-	0x5C54,0x5C5B,0x5C58,0x5C5E,0x5C5D,0x5C59,
-	/* Range 0x7D40 - 0x7D46, array index: 0x0C09 */
-	0x5C57,INVALC,0x5C5C,0x5C52,0x5C5A,INVALC,0x5C51,
-	/* Range 0x7D6E - 0x7D73, array index: 0x0C10 */
-	0x613C,INVALC,0x6141,0x5C53,0x613D,0x6142,
-	/* Range 0x7DAC - 0x7DB5, array index: 0x0C16 */
-	0x6A47,0x6A44,INVALC,INVALC,0x6A36,0x6A3E,0x6A3D,INVALC,
-	0x6A3C,0x6A42,
-	/* Range 0x7DBA - 0x7DBF, array index: 0x0C20 */
-	0x6A3F,0x6A35,INVALC,0x6A38,0x6A39,0x6A41,
-	/* Range 0x7DD8 - 0x7DE0, array index: 0x0C26 */
-	0x6E3B,0x6E44,0x6E40,INVALC,INVALC,0x6E3D,0x6E41,INVALC,
-	0x6E37,
-	/* Range 0x7E08 - 0x7E0A, array index: 0x0C2F */
-	0x716A,0x716F,0x7168,
-	/* Range 0x7E2E - 0x7E48, array index: 0x0C32 */
-	0x7463,0x7473,INVALC,0x746B,0x7467,INVALC,0x746E,0x7471,
-	INVALC,0x7466,INVALC,0x746F,INVALC,INVALC,INVALC,0x746A,
-	0x7464,0x7472,INVALC,0x746D,INVALC,0x7468,INVALC,0x746C,
-	0x7465,INVALC,0x7470,
-	/* Range 0x7E69 - 0x7E6D, array index: 0x0C4D */
-	0x7862,0x7863,0x785F,INVALC,0x7860,
-	/* Range 0x7F88 - 0x7F8E, array index: 0x0C52 */
-	0x7C65,INVALC,0x4850,0x4F2E,0x4F2D,INVALC,0x5321,
-	/* Range 0x7FDF - 0x7FE1, array index: 0x0C59 */
-	0x6A4B,0x6A49,0x6A4A,
-	/* Range 0x8000 - 0x8006, array index: 0x0C5C */
-	0x7A2E,0x4852,INVALC,0x4853,0x5753,0x4F2F,0x5752,
-	/* Range 0x800B - 0x8012, array index: 0x0C63 */
-	0x6146,0x4854,0x5324,INVALC,INVALC,0x5323,0x5325,0x4855,
-	/* Range 0x8015 - 0x8019, array index: 0x0C6B */
-	0x5755,INVALC,0x5757,0x5754,0x5756,
-	/* Range 0x806F - 0x8077, array index: 0x0C70 */
-	0x747A,0x7479,0x7477,0x7478,0x747B,INVALC,INVALC,0x772B,
-	0x772A,
-	/* Range 0x807D - 0x807F, array index: 0x0C79 */
-	0x7B6F,0x7B6E,0x4857,
-	/* Range 0x8084 - 0x808C, array index: 0x0C7C */
-	0x657E,0x6148,0x657D,0x6A4E,INVALC,0x4858,INVALC,0x4859,
-	0x485A,
-	/* Range 0x80A9 - 0x80AB, array index: 0x0C85 */
-	0x4F36,0x4F38,0x4F35,
-	/* Range 0x80DA - 0x80DE, array index: 0x0C88 */
-	0x5329,0x532E,INVALC,0x5332,0x5330,
-	/* Range 0x80ED - 0x80F4, array index: 0x0C8D */
-	0x575E,INVALC,0x5767,0x575C,0x575A,INVALC,0x5762,0x575F,
-	/* Range 0x8150 - 0x8155, array index: 0x0C95 */
-	0x6A4F,0x614C,INVALC,0x6152,0x614A,0x6149,
-	/* Range 0x8170 - 0x817A, array index: 0x0C9B */
-	0x6622,0x6621,INVALC,0x6626,0x6153,INVALC,INVALC,INVALC,
-	0x6623,0x6628,0x6629,
-	/* Range 0x8198 - 0x819D, array index: 0x0CA6 */
-	0x6E51,INVALC,0x6E50,0x6E4C,0x6E4D,0x6E4E,
-	/* Range 0x81BD - 0x81C3, array index: 0x0CAC */
-	0x7524,0x7526,0x7523,0x7522,INVALC,0x7521,0x747D,
-	/* Range 0x81FA - 0x8202, array index: 0x0CB3 */
-	0x6A57,0x717A,0x485E,INVALC,0x4F3B,INVALC,0x576A,INVALC,
-	0x5C6F,
-	/* Range 0x8205 - 0x820D, array index: 0x0CBC */
-	0x662B,INVALC,0x6A58,0x717B,0x7528,0x772E,INVALC,0x485F,
-	0x4F3C,
-	/* Range 0x821B - 0x821F, array index: 0x0CC5 */
-	0x4860,0x6155,INVALC,0x6A5A,0x4861,
-	/* Range 0x8228 - 0x822C, array index: 0x0CCA */
-	0x576E,INVALC,0x576C,0x576D,0x576F,
-	/* Range 0x8235 - 0x8239, array index: 0x0CCF */
-	0x5C70,0x5C72,0x5C71,INVALC,0x5C73,
-	/* Range 0x826E - 0x8272, array index: 0x0CD4 */
-	0x4862,0x4B40,INVALC,0x7529,0x4863,
-	/* Range 0x82AC - 0x82BE, array index: 0x0CD9 */
-	0x4F45,0x4F40,INVALC,0x4F47,0x4F4A,0x4F44,INVALC,0x4F3D,
-	INVALC,INVALC,INVALC,0x4F4C,0x4F48,0x4F43,INVALC,0x5770,
-	INVALC,0x4F41,0x4F4B,
-	/* Range 0x82D1 - 0x82D4, array index: 0x0CEC */
-	0x5345,0x533F,0x5347,0x5344,
-	/* Range 0x82DB - 0x82DF, array index: 0x0CF0 */
-	0x5339,0x5343,INVALC,0x5346,0x5348,
-	/* Range 0x82E3 - 0x82E7, array index: 0x0CF5 */
-	0x5338,INVALC,0x533C,0x533A,0x5335,
-	/* Range 0x8301 - 0x8306, array index: 0x0CFA */
-	0x5342,0x533D,0x5336,0x533B,0x5337,0x534A,
-	/* Range 0x8331 - 0x8339, array index: 0x0D00 */
-	0x5822,0x577B,INVALC,0x5779,0x5778,0x577D,INVALC,0x5775,
-	0x577C,
-	/* Range 0x83EF - 0x83F4, array index: 0x0D09 */
-	0x615E,0x6163,0x615F,0x6167,INVALC,0x6160,
-	/* Range 0x840A - 0x840E, array index: 0x0D0F */
-	0x6162,0x615C,0x6164,0x6159,0x616A,
-	/* Range 0x8469 - 0x846D, array index: 0x0D14 */
-	0x663B,INVALC,0x6633,0x6635,0x663C,
-	/* Range 0x84C9 - 0x84CB, array index: 0x0D19 */
-	0x6A5C,0x6A6B,0x6A64,
-	/* Range 0x8548 - 0x854A, array index: 0x0D1C */
-	0x7222,0x7226,0x717E,
-	/* Range 0x8568 - 0x856A, array index: 0x0D1F */
-	0x7223,0x7224,0x7228,
-	/* Range 0x85A6 - 0x85AA, array index: 0x0D22 */
-	0x7535,INVALC,0x7533,0x7730,0x752A,
-	/* Range 0x85F7 - 0x85FB, array index: 0x0D27 */
-	0x7870,INVALC,0x7A32,0x7A34,0x7A31,
-	/* Range 0x865B - 0x865F, array index: 0x0D2C */
-	0x6170,0x663F,INVALC,0x663E,0x6640,
-	/* Range 0x8679 - 0x867B, array index: 0x0D31 */
-	0x534C,0x534E,0x534D,
-	/* Range 0x8702 - 0x870A, array index: 0x0D34 */
-	0x6648,0x6649,INVALC,INVALC,0x664A,0x6644,0x6643,INVALC,
-	0x664B,
-	/* Range 0x881F - 0x8823, array index: 0x0D3D */
-	0x7B27,INVALC,0x7B26,0x7B25,0x7B24,
-	/* Range 0x8861 - 0x8863, array index: 0x0D42 */
-	0x722F,0x7C68,0x4868,
-	/* Range 0x895E - 0x8960, array index: 0x0D45 */
-	0x7879,0x7877,0x7876,
-	/* Range 0x8A0C - 0x8A18, array index: 0x0D48 */
-	0x5837,INVALC,0x5836,0x583D,0x5835,0x583E,INVALC,0x583B,
-	INVALC,0x5838,0x583C,0x583A,0x5834,
-	/* Range 0x8A3A - 0x8A3E, array index: 0x0D55 */
-	0x622C,0x6221,0x6225,INVALC,0x666B,
-	/* Range 0x8A54 - 0x8A56, array index: 0x0D5A */
-	0x6227,0x6223,0x622E,
-	/* Range 0x8A68 - 0x8A73, array index: 0x0D5D */
-	0x666C,0x665D,INVALC,0x6659,0x6668,0x6665,0x6667,INVALC,
-	0x665E,0x6663,0x665A,0x665B,
-	/* Range 0x8AA0 - 0x8AAA, array index: 0x0D69 */
-	0x6662,0x6B26,INVALC,0x6B24,0x6B28,0x6B2A,0x6B21,0x6B2F,
-	0x6B2B,INVALC,0x6B29,
-	/* Range 0x8AF6 - 0x8B04, array index: 0x0D74 */
-	0x7245,0x7242,0x6E7A,INVALC,0x7238,INVALC,0x7246,INVALC,
-	0x723F,INVALC,0x723B,0x7240,0x7241,INVALC,0x754E,
-	/* Range 0x8B58 - 0x8B5C, array index: 0x0D83 */
-	0x787C,0x7924,0x787E,INVALC,0x787B,
-	/* Range 0x8C6A - 0x8C6D, array index: 0x0D88 */
-	0x6B30,0x7247,0x6F29,0x7248,
-	/* Range 0x8C89 - 0x8C8D, array index: 0x0D8C */
-	0x666F,0x666E,INVALC,0x6B32,0x6B31,
-	/* Range 0x8C9D - 0x8CA2, array index: 0x0D91 */
-	0x4B4A,0x5356,INVALC,0x5357,0x5842,0x5843,
-	/* Range 0x8CA7 - 0x8CAC, array index: 0x0D97 */
-	0x5D4E,0x5D4C,0x5D49,0x5D4D,0x5D4B,0x5D4A,
-	/* Range 0x8CB2 - 0x8CCA, array index: 0x0D9D */
-	0x6674,0x6233,0x6238,INVALC,0x623A,0x6239,0x623C,INVALC,
-	INVALC,0x6236,0x6232,0x6234,INVALC,0x623B,0x6237,0x6235,
-	0x6676,0x6675,0x6673,0x6677,INVALC,0x6671,0x6672,INVALC,
-	0x6670,
-	/* Range 0x8CD1 - 0x8CD3, array index: 0x0DB6 */
-	0x6B34,0x6B35,0x6B33,
-	/* Range 0x8CDE - 0x8CE6, array index: 0x0DB9 */
-	0x6F2B,INVALC,0x6F2A,0x6F34,0x6F30,0x6F31,0x6F2D,INVALC,
-	0x6F2C,
-	/* Range 0x8CF8 - 0x8CFD, array index: 0x0DC2 */
-	0x7556,INVALC,0x7553,0x7557,0x7555,0x7554,
-	/* Range 0x8E1D - 0x8E22, array index: 0x0DC8 */
-	0x6F3A,0x6F40,0x6F3E,INVALC,0x6F3F,0x6F3B,
-	/* Range 0x8E48 - 0x8E4B, array index: 0x0DCE */
-	0x755B,0x7559,0x755C,0x755A,
-	/* Range 0x8E87 - 0x8E8D, array index: 0x0DD2 */
-	0x7929,INVALC,0x7A46,0x7B2F,0x7B31,INVALC,0x7B30,
-	/* Range 0x8EAA - 0x8EAC, array index: 0x0DD9 */
-	0x7D3B,0x4B4E,0x5845,
-	/* Range 0x8ECA - 0x8ECF, array index: 0x0DDC */
-	0x4B4F,0x4F51,0x535C,0x535B,INVALC,0x5848,
-	/* Range 0x8F12 - 0x8F15, array index: 0x0DE2 */
-	0x6B3B,0x6B3D,0x6B3A,0x6B3C,
-	/* Range 0x8F1B - 0x8F1F, array index: 0x0DE6 */
-	0x6F43,0x6F48,0x6F42,0x6F49,0x6F44,
-	/* Range 0x8FAD - 0x8FB2, array index: 0x0DEB */
-	0x7930,0x7A29,0x7B33,0x4B51,0x5849,0x6729,
-	/* Range 0x8FC2 - 0x8FC6, array index: 0x0DF1 */
-	0x4B52,INVALC,0x4B55,0x4B54,0x4B53,
-	/* Range 0x8FE2 - 0x8FED, array index: 0x0DF6 */
-	0x535F,INVALC,0x5364,0x5361,0x535E,INVALC,0x5365,INVALC,
-	0x5360,0x5363,INVALC,0x5362,
-	/* Range 0x9014 - 0x9023, array index: 0x0E02 */
-	0x5D64,0x5D5D,0x5D62,0x5D58,INVALC,0x5D55,0x5D57,0x5D63,
-	INVALC,0x5D5B,0x5D5E,0x5D5A,0x5D5F,INVALC,0x5D61,0x5D59,
-	/* Range 0x904A - 0x9063, array index: 0x0E12 */
-	0x672B,0x672A,INVALC,0x6735,0x6734,0x6733,0x6731,0x6736,
-	INVALC,0x672C,0x672E,0x6730,INVALC,INVALC,0x6B40,0x6B43,
-	INVALC,0x6B47,0x6B41,0x6B46,0x6B44,INVALC,0x6B3F,INVALC,
-	0x6B45,0x6B42,
-	/* Range 0x9074 - 0x9091, array index: 0x0E2C */
-	0x7258,0x7257,INVALC,0x6F4F,0x7259,INVALC,0x725C,INVALC,
-	0x725B,0x7563,INVALC,0x7562,0x7567,0x7565,0x7566,0x774E,
-	0x7564,INVALC,INVALC,0x774D,0x774F,INVALC,0x7931,0x7932,
-	INVALC,INVALC,INVALC,0x7C4A,0x7C49,0x4B57,
-	/* Range 0x9117 - 0x9119, array index: 0x0E4A */
-	0x673A,0x6B49,0x6B48,
-	/* Range 0x9148 - 0x914D, array index: 0x0E4D */
-	0x7B7A,0x4B5C,0x536B,0x536A,0x585A,0x5859,
-	/* Range 0x9174 - 0x9178, array index: 0x0E53 */
-	0x6B4E,0x6B4B,INVALC,0x6B4D,0x6B4C,
-	/* Range 0x91C5 - 0x91D1, array index: 0x0E58 */
-	0x7D3C,0x4B5D,0x4F59,INVALC,0x673E,INVALC,0x7A4B,0x4B5E,
-	0x536C,0x5D69,0x6258,0x7752,0x4F5A,
-	/* Range 0x91D7 - 0x91DD, array index: 0x0E65 */
-	0x585D,0x585B,0x585F,INVALC,INVALC,0x585E,0x585C,
-	/* Range 0x9237 - 0x9240, array index: 0x0E6C */
-	0x673F,0x6741,0x674D,INVALC,INVALC,INVALC,0x6742,0x6744,
-	0x674E,0x6743,
-	/* Range 0x9318 - 0x931A, array index: 0x0E76 */
-	0x7573,0x726E,0x7268,
-	/* Range 0x9320 - 0x9322, array index: 0x0E79 */
-	0x725F,0x726B,0x7264,
-	/* Range 0x9394 - 0x939A, array index: 0x0E7C */
-	0x7753,INVALC,0x7755,0x775D,0x775B,INVALC,0x775C,
-	/* Range 0x93D6 - 0x93D8, array index: 0x0E83 */
-	0x793C,0x7941,0x793F,
-	/* Range 0x947C - 0x947F, array index: 0x0E86 */
-	0x7D3F,0x7D3D,0x7D3E,0x7D44,
-	/* Range 0x958E - 0x9594, array index: 0x0E8A */
-	0x6268,0x6263,INVALC,0x6265,0x6267,0x6266,0x6262,
-	/* Range 0x95A1 - 0x95A9, array index: 0x0E91 */
-	0x6B5B,INVALC,0x6B5E,0x6B60,0x6B5F,INVALC,INVALC,0x6B5C,
-	0x6B5D,
-	/* Range 0x95C8 - 0x95CC, array index: 0x0E9A */
-	0x757D,INVALC,0x757A,0x757B,0x757C,
-	/* Range 0x95D4 - 0x95D6, array index: 0x0E9F */
-	0x775E,0x7761,0x775F,
-	/* Range 0x964B - 0x964D, array index: 0x0EA2 */
-	0x536F,0x5370,0x5371,
-	/* Range 0x965D - 0x9664, array index: 0x0EA5 */
-	0x5865,0x5868,INVALC,INVALC,0x5863,0x5861,0x5862,0x5866,
-	/* Range 0x9670 - 0x9678, array index: 0x0EAD */
-	0x5D75,INVALC,0x6270,0x5D73,0x5D76,0x5D72,0x5D77,0x5D78,
-	0x5D74,
-	/* Range 0x9684 - 0x9686, array index: 0x0EB6 */
-	0x6271,0x626D,0x626E,
-	/* Range 0x968A - 0x968E, array index: 0x0EB9 */
-	0x6269,0x626B,INVALC,0x626F,0x626A,
-	/* Range 0x9698 - 0x969C, array index: 0x0EBE */
-	0x6751,0x6B61,INVALC,0x6B63,0x6B62,
-	/* Range 0x96C0 - 0x96CD, array index: 0x0EC3 */
-	0x5D7A,0x6272,INVALC,INVALC,0x6274,0x6273,0x6275,0x6276,
-	INVALC,0x6756,0x6757,0x6755,0x6B64,0x6754,
-	/* Range 0x96E8 - 0x96EA, array index: 0x0ED1 */
-	0x4F64,0x5D7C,0x5D7B,
-	/* Range 0x970D - 0x9713, array index: 0x0ED4 */
-	0x7277,0x7274,0x7279,INVALC,0x7275,INVALC,0x7278,
-	/* Range 0x975E - 0x9762, array index: 0x0EDB */
-	0x4F66,INVALC,0x6F6A,0x7948,0x5372,
-	/* Range 0x97FF - 0x9813, array index: 0x0EE0 */
-	0x7B40,INVALC,0x5377,0x5E21,0x5E22,INVALC,0x627A,0x627B,
-	INVALC,0x627C,INVALC,0x6762,INVALC,0x6764,INVALC,INVALC,
-	INVALC,0x675F,0x6760,0x6763,0x6761,
-	/* Range 0x9837 - 0x983B, array index: 0x0EF5 */
-	0x7323,0x7321,0x7325,INVALC,0x7322,
-	/* Range 0x984C - 0x984F, array index: 0x0EFA */
-	0x776E,0x776C,0x776F,0x776D,
-	/* Range 0x986F - 0x9871, array index: 0x0EFE */
-	0x7C4F,0x7C74,0x7D2D,
-	/* Range 0x98FC - 0x98FE, array index: 0x0F01 */
-	0x6765,0x6767,0x6768,
-	/* Range 0x993D - 0x993F, array index: 0x0F04 */
-	0x7774,0x7772,0x7773,
-	/* Range 0x99AC - 0x99AE, array index: 0x0F07 */
-	0x586B,0x6326,0x6325,
-	/* Range 0x99D0 - 0x99D2, array index: 0x0F0A */
-	0x6F77,0x6F7A,0x6F7C,
-	/* Range 0x9ACF - 0x9AD8, array index: 0x0F0D */
-	0x7B48,INVALC,0x7C56,0x7C28,0x7C54,0x7C55,INVALC,0x7D2F,
-	INVALC,0x586D,
-	/* Range 0x9AED - 0x9AEF, array index: 0x0F17 */
-	0x7333,0x7021,0x7022,
-	/* Range 0x9B41 - 0x9B45, array index: 0x0F1A */
-	0x6B76,0x6B77,INVALC,0x7025,0x7024,
-	/* Range 0x9B4D - 0x9B51, array index: 0x0F1F */
-	0x777D,0x777C,0x777B,INVALC,0x7B4A,
-	/* Range 0x9BAA - 0x9BAE, array index: 0x0F24 */
-	0x762F,0x762E,INVALC,0x7630,0x762D,
-	/* Range 0x9BC8 - 0x9BCA, array index: 0x0F29 */
-	0x7823,0x7821,0x777E,
-	/* Range 0x9ECC - 0x9ED1, array index: 0x0F2C */
-	0x7D31,0x6328,0x702D,0x7634,INVALC,0x6329,
-	/* Range 0x9EDB - 0x9EE0, array index: 0x0F32 */
-	0x7638,0x7636,0x7637,0x7635,INVALC,0x7828,
-	/* Range 0xFE30 - 0xFE44, array index: 0x0F38 */
-	0x212B,0x2136,0x2138,INVALC,INVALC,0x2140,0x2141,0x2144,
-	0x2145,0x2148,0x2149,0x214C,0x214D,0x2150,0x2151,0x2154,
-	0x2155,0x2158,0x2159,0x215C,0x215D,
-	/* Range 0xFE49 - 0xFE6B, array index: 0x0F4D */
-	0x2227,0x2228,0x222B,0x222C,0x2229,0x222A,INVALC,0x212E,
-	0x212F,0x2130,INVALC,0x2132,0x2133,0x2134,0x2135,INVALC,
-	0x215E,0x215F,0x2160,0x2161,0x2162,0x2163,0x222D,0x222E,
-	0x222F,0x223F,0x2240,0x2241,0x2243,0x2242,INVALC,0x2262,
-	0x226C,0x226D,0x226E,
-	/* Range 0xFF01 - 0xFF3C, array index: 0x0F70 */
-	0x212A,INVALC,0x216C,0x2263,0x2268,0x216D,INVALC,0x213E,
-	0x213F,0x216E,0x2230,0x2122,0x2231,0x2125,0x225F,0x2421,
-	0x2422,0x2423,0x2424,0x2425,0x2426,0x2427,0x2428,0x2429,
-	0x242A,0x2128,0x2127,0x2236,0x2238,0x2237,0x2129,0x2269,
-	0x2441,0x2442,0x2443,0x2444,0x2445,0x2446,0x2447,0x2448,
-	0x2449,0x244A,0x244B,0x244C,0x244D,0x244E,0x244F,0x2450,
-	0x2451,0x2452,0x2453,0x2454,0x2455,0x2456,0x2457,0x2458,
-	0x2459,0x245A,INVALC,0x2260,
-	/* Range 0xFF3F - 0xFF5D, array index: 0x0FAC */
-	0x2225,INVALC,0x245B,0x245C,0x245D,0x245E,0x245F,0x2460,
-	0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467,0x2468,
-	0x2469,0x246A,0x246B,0x246C,0x246D,0x246E,0x246F,0x2470,
-	0x2471,0x2472,0x2473,0x2474,0x2142,0x225E,0x2143,
-	/* Unranged codes (381 codes) */
-	/* Array index: 0x0FCB */ 0x00A7,0x2170,
-	/* Array index: 0x0FCB */ 0x00B0,0x2278,
-	/* Array index: 0x0FCB */ 0x00B1,0x2234,
-	/* Array index: 0x0FCB */ 0x00B7,0x2131,
-	/* Array index: 0x0FCB */ 0x00D7,0x2232,
-	/* Array index: 0x0FCB */ 0x00F7,0x2233,
-	/* Array index: 0x0FCB */ 0x02D9,0x256C,
-	/* Array index: 0x0FCB */ 0x2013,0x2139,
-	/* Array index: 0x0FCB */ 0x2014,0x2137,
-	/* Array index: 0x0FCB */ 0x2016,0x225D,
-	/* Array index: 0x0FCB */ 0x2018,0x2164,
-	/* Array index: 0x0FCB */ 0x2019,0x2165,
-	/* Array index: 0x0FCB */ 0x201C,0x2166,
-	/* Array index: 0x0FCB */ 0x201D,0x2167,
-	/* Array index: 0x0FCB */ 0x2025,0x212D,
-	/* Array index: 0x0FCB */ 0x2026,0x212C,
-	/* Array index: 0x0FCB */ 0x2032,0x216A,
-	/* Array index: 0x0FCB */ 0x2035,0x216B,
-	/* Array index: 0x0FCB */ 0x203B,0x216F,
-	/* Array index: 0x0FCB */ 0x203E,0x2223,
-	/* Array index: 0x0FCB */ 0x2103,0x226A,
-	/* Array index: 0x0FCB */ 0x2105,0x2222,
-	/* Array index: 0x0FCB */ 0x2109,0x226B,
-	/* Array index: 0x0FCB */ 0x2215,0x2261,
-	/* Array index: 0x0FCB */ 0x221A,0x2235,
-	/* Array index: 0x0FCB */ 0x222E,0x224E,
-	/* Array index: 0x0FCB */ 0x2234,0x2250,
-	/* Array index: 0x0FCB */ 0x2235,0x224F,
-	/* Array index: 0x0FCB */ 0x223C,0x2244,
-	/* Array index: 0x0FCB */ 0x2252,0x223D,
-	/* Array index: 0x0FCB */ 0x2260,0x223B,
-	/* Array index: 0x0FCB */ 0x2261,0x223E,
-	/* Array index: 0x0FCB */ 0x2266,0x2239,
-	/* Array index: 0x0FCB */ 0x2267,0x223A,
-	/* Array index: 0x0FCB */ 0x22A5,0x2247,
-	/* Array index: 0x0FCB */ 0x22BF,0x224A,
-	/* Array index: 0x0FCB */ 0x2500,0x2339,
-	/* Array index: 0x0FCB */ 0x2502,0x233A,
-	/* Array index: 0x0FCB */ 0x250C,0x233C,
-	/* Array index: 0x0FCB */ 0x2510,0x233D,
-	/* Array index: 0x0FCB */ 0x2514,0x233E,
-	/* Array index: 0x0FCB */ 0x2518,0x233F,
-	/* Array index: 0x0FCB */ 0x251C,0x2337,
-	/* Array index: 0x0FCB */ 0x2524,0x2336,
-	/* Array index: 0x0FCB */ 0x252C,0x2335,
-	/* Array index: 0x0FCB */ 0x2534,0x2334,
-	/* Array index: 0x0FCB */ 0x253C,0x2333,
-	/* Array index: 0x0FCB */ 0x2550,0x2344,
-	/* Array index: 0x0FCB */ 0x255E,0x2345,
-	/* Array index: 0x0FCB */ 0x2561,0x2347,
-	/* Array index: 0x0FCB */ 0x256A,0x2346,
-	/* Array index: 0x0FCB */ 0x2594,0x2338,
-	/* Array index: 0x0FCB */ 0x2595,0x233B,
-	/* Array index: 0x0FCB */ 0x25A0,0x217C,
-	/* Array index: 0x0FCB */ 0x25A1,0x217B,
-	/* Array index: 0x0FCB */ 0x25B2,0x2175,
-	/* Array index: 0x0FCB */ 0x25B3,0x2174,
-	/* Array index: 0x0FCB */ 0x25BC,0x217E,
-	/* Array index: 0x0FCB */ 0x25BD,0x217D,
-	/* Array index: 0x0FCB */ 0x25C6,0x217A,
-	/* Array index: 0x0FCB */ 0x25C7,0x2179,
-	/* Array index: 0x0FCB */ 0x25CB,0x2172,
-	/* Array index: 0x0FCB */ 0x25CE,0x2176,
-	/* Array index: 0x0FCB */ 0x25CF,0x2173,
-	/* Array index: 0x0FCB */ 0x2605,0x2178,
-	/* Array index: 0x0FCB */ 0x2606,0x2177,
-	/* Array index: 0x0FCB */ 0x2609,0x2254,
-	/* Array index: 0x0FCB */ 0x30FB,0x2126,
-	/* Array index: 0x0FCB */ 0x32A3,0x2221,
-	/* Array index: 0x0FCB */ 0x338E,0x2275,
-	/* Array index: 0x0FCB */ 0x338F,0x2276,
-	/* Array index: 0x0FCB */ 0x33A1,0x2274,
-	/* Array index: 0x0FCB */ 0x33C4,0x2277,
-	/* Array index: 0x0FCB */ 0x33CE,0x2273,
-	/* Array index: 0x0FCB */ 0x33D1,0x224C,
-	/* Array index: 0x0FCB */ 0x33D2,0x224B,
-	/* Array index: 0x0FCB */ 0x33D5,0x226F,
-	/* Array index: 0x0FCB */ 0x4E00,0x4421,
-	/* Array index: 0x0FCB */ 0x4E01,0x4423,
-	/* Array index: 0x0FCB */ 0x4E03,0x4424,
-	/* Array index: 0x0FCB */ 0x4E1E,0x4722,
-	/* Array index: 0x0FCB */ 0x4E1F,0x4723,
-	/* Array index: 0x0FCB */ 0x4E26,0x4B64,
-	/* Array index: 0x0FCB */ 0x4E2B,0x4439,
-	/* Array index: 0x0FCB */ 0x4E2D,0x4463,
-	/* Array index: 0x0FCB */ 0x4E30,0x4464,
-	/* Array index: 0x0FCB */ 0x4E32,0x486B,
-	/* Array index: 0x0FCB */ 0x4E38,0x443A,
-	/* Array index: 0x0FCB */ 0x4E39,0x4465,
-	/* Array index: 0x0FCB */ 0x4E3B,0x4564,
-	/* Array index: 0x0FCB */ 0x4E43,0x4425,
-	/* Array index: 0x0FCB */ 0x4E45,0x443C,
-	/* Array index: 0x0FCB */ 0x4E48,0x443D,
-	/* Array index: 0x0FCB */ 0x4E56,0x4B65,
-	/* Array index: 0x0FCB */ 0x4E58,0x537D,
-	/* Array index: 0x0FCB */ 0x4E59,0x4422,
-	/* Array index: 0x0FCB */ 0x4E69,0x4726,
-	/* Array index: 0x0FCB */ 0x4E73,0x4B66,
-	/* Array index: 0x0FCB */ 0x4E7E,0x5871,
-	/* Array index: 0x0FCB */ 0x4E82,0x632A,
-	/* Array index: 0x0FCB */ 0x4E86,0x4427,
-	/* Array index: 0x0FCB */ 0x4E88,0x4468,
-	/* Array index: 0x0FCB */ 0x4E8B,0x4B67,
-	/* Array index: 0x0FCB */ 0x4E8C,0x4428,
-	/* Array index: 0x0FCB */ 0x4E8E,0x4440,
-	/* Array index: 0x0FCB */ 0x4E99,0x4727,
-	/* Array index: 0x0FCB */ 0x4E9B,0x4B68,
-	/* Array index: 0x0FCB */ 0x4EB3,0x537E,
-	/* Array index: 0x0FCB */ 0x4EBA,0x4429,
-	/* Array index: 0x0FCB */ 0x4EDE,0x4571,
-	/* Array index: 0x0FCB */ 0x4EDF,0x4623,
-	/* Array index: 0x0FCB */ 0x4EF0,0x4737,
-	/* Array index: 0x0FCB */ 0x4EF2,0x4734,
-	/* Array index: 0x0FCB */ 0x4EF3,0x4738,
-	/* Array index: 0x0FCB */ 0x4EF6,0x4735,
-	/* Array index: 0x0FCB */ 0x4EFB,0x4736,
-	/* Array index: 0x0FCB */ 0x4EFD,0x4739,
-	/* Array index: 0x0FCB */ 0x4EFF,0x472B,
-	/* Array index: 0x0FCB */ 0x4F01,0x473A,
-	/* Array index: 0x0FCB */ 0x4F15,0x472F,
-	/* Array index: 0x0FCB */ 0x4F19,0x472D,
-	/* Array index: 0x0FCB */ 0x4F2F,0x4924,
-	/* Array index: 0x0FCB */ 0x4F30,0x4875,
-	/* Array index: 0x0FCB */ 0x4F34,0x4872,
-	/* Array index: 0x0FCB */ 0x4F36,0x4926,
-	/* Array index: 0x0FCB */ 0x4F38,0x487A,
-	/* Array index: 0x0FCB */ 0x4F3A,0x4879,
-	/* Array index: 0x0FCB */ 0x4F3C,0x487D,
-	/* Array index: 0x0FCB */ 0x4F3D,0x4878,
-	/* Array index: 0x0FCB */ 0x4F43,0x487B,
-	/* Array index: 0x0FCB */ 0x4F63,0x4921,
-	/* Array index: 0x0FCB */ 0x4F69,0x4B79,
-	/* Array index: 0x0FCB */ 0x4F6C,0x4B71,
-	/* Array index: 0x0FCB */ 0x4F6F,0x4B6C,
-	/* Array index: 0x0FCB */ 0x4F70,0x4B76,
-	/* Array index: 0x0FCB */ 0x4F73,0x4B6F,
-	/* Array index: 0x0FCB */ 0x4F75,0x4B77,
-	/* Array index: 0x0FCB */ 0x4F7A,0x4C21,
-	/* Array index: 0x0FCB */ 0x4F7B,0x4B7A,
-	/* Array index: 0x0FCB */ 0x4F7E,0x4B7C,
-	/* Array index: 0x0FCB */ 0x4F7F,0x4B70,
-	/* Array index: 0x0FCB */ 0x4F83,0x4B75,
-	/* Array index: 0x0FCB */ 0x4F86,0x4B74,
-	/* Array index: 0x0FCB */ 0x4F88,0x4B78,
-	/* Array index: 0x0FCB */ 0x4F8B,0x4B73,
-	/* Array index: 0x0FCB */ 0x4F8D,0x4B6E,
-	/* Array index: 0x0FCB */ 0x4F8F,0x4B7D,
-	/* Array index: 0x0FCB */ 0x4F91,0x4B7E,
-	/* Array index: 0x0FCB */ 0x4F96,0x4B7B,
-	/* Array index: 0x0FCB */ 0x4F9B,0x4B72,
-	/* Array index: 0x0FCB */ 0x4F9D,0x4B6D,
-	/* Array index: 0x0FCB */ 0x4FAE,0x4F78,
-	/* Array index: 0x0FCB */ 0x4FAF,0x4F6C,
-	/* Array index: 0x0FCB */ 0x4FBF,0x4F6D,
-	/* Array index: 0x0FCB */ 0x4FCA,0x4F76,
-	/* Array index: 0x0FCB */ 0x4FD7,0x4F77,
-	/* Array index: 0x0FCB */ 0x4FD8,0x4F74,
-	/* Array index: 0x0FCB */ 0x4FDA,0x4F7C,
-	/* Array index: 0x0FCB */ 0x4FEE,0x543A,
-	/* Array index: 0x0FCB */ 0x4FEF,0x5424,
-	/* Array index: 0x0FCB */ 0x4FF1,0x5434,
-	/* Array index: 0x0FCB */ 0x4FF3,0x5439,
-	/* Array index: 0x0FCB */ 0x4FF8,0x5427,
-	/* Array index: 0x0FCB */ 0x4FFA,0x5430,
-	/* Array index: 0x0FCB */ 0x4FFE,0x543D,
-	/* Array index: 0x0FCB */ 0x5000,0x5431,
-	/* Array index: 0x0FCB */ 0x5006,0x542A,
-	/* Array index: 0x0FCB */ 0x501F,0x542C,
-	/* Array index: 0x0FCB */ 0x5021,0x5435,
-	/* Array index: 0x0FCB */ 0x5023,0x5423,
-	/* Array index: 0x0FCB */ 0x503C,0x542B,
-	/* Array index: 0x0FCB */ 0x5043,0x5876,
-	/* Array index: 0x0FCB */ 0x5047,0x5875,
-	/* Array index: 0x0FCB */ 0x5049,0x5879,
-	/* Array index: 0x0FCB */ 0x504C,0x5877,
-	/* Array index: 0x0FCB */ 0x504E,0x587C,
-	/* Array index: 0x0FCB */ 0x504F,0x5923,
-	/* Array index: 0x0FCB */ 0x5055,0x587D,
-	/* Array index: 0x0FCB */ 0x505A,0x5878,
-	/* Array index: 0x0FCB */ 0x505C,0x5874,
-	/* Array index: 0x0FCB */ 0x5065,0x587A,
-	/* Array index: 0x0FCB */ 0x506D,0x5926,
-	/* Array index: 0x0FCB */ 0x506F,0x5925,
-	/* Array index: 0x0FCB */ 0x507A,0x5872,
-	/* Array index: 0x0FCB */ 0x507D,0x5873,
-	/* Array index: 0x0FCB */ 0x5080,0x5E2E,
-	/* Array index: 0x0FCB */ 0x5085,0x5E2B,
-	/* Array index: 0x0FCB */ 0x508D,0x5E2A,
-	/* Array index: 0x0FCB */ 0x5091,0x5E2D,
-	/* Array index: 0x0FCB */ 0x50A2,0x5E29,
-	/* Array index: 0x0FCB */ 0x50AC,0x6331,
-	/* Array index: 0x0FCB */ 0x50AD,0x632B,
-	/* Array index: 0x0FCB */ 0x50AF,0x6334,
-	/* Array index: 0x0FCB */ 0x50B2,0x632D,
-	/* Array index: 0x0FCB */ 0x50B3,0x632E,
-	/* Array index: 0x0FCB */ 0x50B5,0x632C,
-	/* Array index: 0x0FCB */ 0x50B7,0x6332,
-	/* Array index: 0x0FCB */ 0x50BB,0x6333,
-	/* Array index: 0x0FCB */ 0x50BE,0x6330,
-	/* Array index: 0x0FCB */ 0x50C5,0x632F,
-	/* Array index: 0x0FCB */ 0x50C7,0x6335,
-	/* Array index: 0x0FCB */ 0x50CE,0x677C,
-	/* Array index: 0x0FCB */ 0x50CF,0x6779,
-	/* Array index: 0x0FCB */ 0x50D1,0x677A,
-	/* Array index: 0x0FCB */ 0x50D5,0x6778,
-	/* Array index: 0x0FCB */ 0x50D6,0x6775,
-	/* Array index: 0x0FCB */ 0x50DA,0x6777,
-	/* Array index: 0x0FCB */ 0x50E5,0x6774,
-	/* Array index: 0x0FCB */ 0x50E7,0x6772,
-	/* Array index: 0x0FCB */ 0x50E9,0x677D,
-	/* Array index: 0x0FCB */ 0x50ED,0x6776,
-	/* Array index: 0x0FCB */ 0x50EE,0x6773,
-	/* Array index: 0x0FCB */ 0x50F1,0x677B,
-	/* Array index: 0x0FCB */ 0x50F5,0x6C23,
-	/* Array index: 0x0FCB */ 0x50F9,0x6C24,
-	/* Array index: 0x0FCB */ 0x50FB,0x6C22,
-	/* Array index: 0x0FCB */ 0x5100,0x6C21,
-	/* Array index: 0x0FCB */ 0x5102,0x6C25,
-	/* Array index: 0x0FCB */ 0x5104,0x6B7E,
-	/* Array index: 0x0FCB */ 0x5105,0x6C28,
-	/* Array index: 0x0FCB */ 0x5108,0x6C26,
-	/* Array index: 0x0FCB */ 0x5109,0x6C27,
-	/* Array index: 0x0FCB */ 0x5110,0x7033,
-	/* Array index: 0x0FCB */ 0x5112,0x7030,
-	/* Array index: 0x0FCB */ 0x5114,0x7032,
-	/* Array index: 0x0FCB */ 0x5115,0x7034,
-	/* Array index: 0x0FCB */ 0x5118,0x7031,
-	/* Array index: 0x0FCB */ 0x511F,0x7341,
-	/* Array index: 0x0FCB */ 0x5121,0x7342,
-	/* Array index: 0x0FCB */ 0x512A,0x7340,
-	/* Array index: 0x0FCB */ 0x5132,0x7343,
-	/* Array index: 0x0FCB */ 0x5133,0x782B,
-	/* Array index: 0x0FCB */ 0x5137,0x7A62,
-	/* Array index: 0x0FCB */ 0x5138,0x7A63,
-	/* Array index: 0x0FCB */ 0x5152,0x4C23,
-	/* Array index: 0x0FCB */ 0x5154,0x4C22,
-	/* Array index: 0x0FCB */ 0x5155,0x4C24,
-	/* Array index: 0x0FCB */ 0x5157,0x5022,
-	/* Array index: 0x0FCB */ 0x5171,0x4741,
-	/* Array index: 0x0FCB */ 0x517C,0x5440,
-	/* Array index: 0x0FCB */ 0x5180,0x7035,
-	/* Array index: 0x0FCB */ 0x5189,0x4574,
-	/* Array index: 0x0FCB */ 0x518A,0x4575,
-	/* Array index: 0x0FCB */ 0x518D,0x4742,
-	/* Array index: 0x0FCB */ 0x5191,0x5024,
-	/* Array index: 0x0FCB */ 0x5192,0x5023,
-	/* Array index: 0x0FCB */ 0x5195,0x5928,
-	/* Array index: 0x0FCB */ 0x5197,0x447D,
-	/* Array index: 0x0FCB */ 0x51A0,0x5025,
-	/* Array index: 0x0FCB */ 0x51A2,0x5443,
-	/* Array index: 0x0FCB */ 0x51A4,0x5441,
-	/* Array index: 0x0FCB */ 0x51A5,0x5442,
-	/* Array index: 0x0FCB */ 0x51AA,0x7036,
-	/* Array index: 0x0FCB */ 0x51AC,0x4576,
-	/* Array index: 0x0FCB */ 0x51B0,0x4743,
-	/* Array index: 0x0FCB */ 0x51B6,0x492F,
-	/* Array index: 0x0FCB */ 0x51B7,0x4930,
-	/* Array index: 0x0FCB */ 0x51BD,0x4C29,
-	/* Array index: 0x0FCB */ 0x51C6,0x5446,
-	/* Array index: 0x0FCB */ 0x51DC,0x6C29,
-	/* Array index: 0x0FCB */ 0x51DD,0x7037,
-	/* Array index: 0x0FCB */ 0x51E0,0x442D,
-	/* Array index: 0x0FCB */ 0x51E1,0x443B,
-	/* Array index: 0x0FCB */ 0x51F0,0x5929,
-	/* Array index: 0x0FCB */ 0x51F1,0x5E33,
-	/* Array index: 0x0FCB */ 0x51F3,0x6821,
-	/* Array index: 0x0FCB */ 0x51FD,0x4C2A,
-	/* Array index: 0x0FCB */ 0x5200,0x442E,
-	/* Array index: 0x0FCB */ 0x5201,0x442F,
-	/* Array index: 0x0FCB */ 0x5203,0x4443,
-	/* Array index: 0x0FCB */ 0x520E,0x4747,
-	/* Array index: 0x0FCB */ 0x5211,0x4745,
-	/* Array index: 0x0FCB */ 0x5212,0x4746,
-	/* Array index: 0x0FCB */ 0x5216,0x4748,
-	/* Array index: 0x0FCB */ 0x5217,0x4744,
-	/* Array index: 0x0FCB */ 0x521D,0x4F4F,
-	/* Array index: 0x0FCB */ 0x522E,0x4C30,
-	/* Array index: 0x0FCB */ 0x5230,0x4C2F,
-	/* Array index: 0x0FCB */ 0x5241,0x4C32,
-	/* Array index: 0x0FCB */ 0x5243,0x5027,
-	/* Array index: 0x0FCB */ 0x5247,0x502C,
-	/* Array index: 0x0FCB */ 0x5254,0x544A,
-	/* Array index: 0x0FCB */ 0x5256,0x5448,
-	/* Array index: 0x0FCB */ 0x5269,0x5E37,
-	/* Array index: 0x0FCB */ 0x526A,0x592A,
-	/* Array index: 0x0FCB */ 0x526F,0x592B,
-	/* Array index: 0x0FCB */ 0x5272,0x5E34,
-	/* Array index: 0x0FCB */ 0x5274,0x5E35,
-	/* Array index: 0x0FCB */ 0x5275,0x5E36,
-	/* Array index: 0x0FCB */ 0x5277,0x6337,
-	/* Array index: 0x0FCB */ 0x527D,0x6338,
-	/* Array index: 0x0FCB */ 0x527F,0x6336,
-	/* Array index: 0x0FCB */ 0x5282,0x6823,
-	/* Array index: 0x0FCB */ 0x5283,0x6822,
-	/* Array index: 0x0FCB */ 0x528D,0x6C2D,
-	/* Array index: 0x0FCB */ 0x5291,0x7038,
-	/* Array index: 0x0FCB */ 0x5293,0x7039,
-	/* Array index: 0x0FCB */ 0x529B,0x4430,
-	/* Array index: 0x0FCB */ 0x529F,0x457C,
-	/* Array index: 0x0FCB */ 0x52A0,0x457B,
-	/* Array index: 0x0FCB */ 0x52A3,0x4749,
-	/* Array index: 0x0FCB */ 0x52BB,0x4C34,
-	/* Array index: 0x0FCB */ 0x52BE,0x4C33,
-	/* Array index: 0x0FCB */ 0x52C1,0x5030,
-	/* Array index: 0x0FCB */ 0x52C3,0x502F,
-	/* Array index: 0x0FCB */ 0x52C7,0x502D,
-	/* Array index: 0x0FCB */ 0x52C9,0x502E,
-	/* Array index: 0x0FCB */ 0x52D2,0x592C,
-	/* Array index: 0x0FCB */ 0x52F0,0x6C2F,
-	/* Array index: 0x0FCB */ 0x52F3,0x703A,
-	/* Array index: 0x0FCB */ 0x52F5,0x7344,
-	/* Array index: 0x0FCB */ 0x52F8,0x7961,
-	/* Array index: 0x0FCB */ 0x52FA,0x4444,
-	/* Array index: 0x0FCB */ 0x52FB,0x4524,
-	/* Array index: 0x0FCB */ 0x52FE,0x4525,
-	/* Array index: 0x0FCB */ 0x52FF,0x4526,
-	/* Array index: 0x0FCB */ 0x5305,0x457D,
-	/* Array index: 0x0FCB */ 0x5306,0x457E,
-	/* Array index: 0x0FCB */ 0x5308,0x474A,
-	/* Array index: 0x0FCB */ 0x530D,0x5031,
-	/* Array index: 0x0FCB */ 0x530F,0x5931,
-	/* Array index: 0x0FCB */ 0x5310,0x5930,
-	/* Array index: 0x0FCB */ 0x531D,0x4622,
-	/* Array index: 0x0FCB */ 0x5320,0x474C,
-	/* Array index: 0x0FCB */ 0x5321,0x474B,
-	/* Array index: 0x0FCB */ 0x5323,0x493A,
-	/* Array index: 0x0FCB */ 0x532A,0x544D,
-	/* Array index: 0x0FCB */ 0x532F,0x633E,
-	/* Array index: 0x0FCB */ 0x5331,0x6824,
-	/* Array index: 0x0FCB */ 0x5339,0x4528,
-	/* Array index: 0x0FCB */ 0x5357,0x5032,
-	/* Array index: 0x0FCB */ 0x535A,0x5E3B,
-	/* Array index: 0x0FCB */ 0x535C,0x4433,
-	/* Array index: 0x0FCB */ 0x535E,0x452C,
-	/* Array index: 0x0FCB */ 0x5360,0x4627,
-	/* Array index: 0x0FCB */ 0x5361,0x4626,
-	/* Array index: 0x0FCB */ 0x5366,0x4C39,
-	/* Array index: 0x0FCB */ 0x537F,0x544E,
-	/* Array index: 0x0FCB */ 0x5384,0x452D,
-	/* Array index: 0x0FCB */ 0x539A,0x5034,
-	/* Array index: 0x0FCB */ 0x539D,0x5450,
-	/* Array index: 0x0FCB */ 0x539F,0x544F,
-	/* Array index: 0x0FCB */ 0x53A5,0x5E3C,
-	/* Array index: 0x0FCB */ 0x53AD,0x6825,
-	/* Array index: 0x0FCB */ 0x53B2,0x6C30,
-	/* Array index: 0x0FCB */ 0x53BB,0x462A,
-	/* Array index: 0x0FCB */ 0x53C3,0x5936,
-	/* Array index: 0x0FCB */ 0x53D4,0x4C3E,
-	/* Array index: 0x0FCB */ 0x53D6,0x4C3D,
-	/* Array index: 0x0FCB */ 0x53D7,0x4C3F,
-	/* Array index: 0x0FCB */ 0x53DB,0x5035,
-	/* Array index: 0x0FCB */ 0x53DF,0x5451,
-	/* Array index: 0x0FCB */ 0x53F8,0x4633,
-	/* Array index: 0x0FCB */ 0x53FB,0x463D,
-	/* Array index: 0x0FCB */ 0x53FC,0x4632,
-	/* Array index: 0x0FCB */ 0x5401,0x4754,
-	/* Array index: 0x0FCB */ 0x5403,0x475A,
-	/* Array index: 0x0FCB */ 0x5404,0x4756,
-	/* Array index: 0x0FCB */ 0x5426,0x4941,
-	/* Array index: 0x0FCB */ 0x5427,0x4943,
-	/* Array index: 0x0FCB */ 0x5431,0x4955,
-	/* Array index: 0x0FCB */ 0x5433,0x4946,
-	/* Array index: 0x0FCB */ 0x5446,0x4944,
-	/* Array index: 0x0FCB */ 0x5448,0x4947,
-	/* Array index: 0x0FCB */ 0x544A,0x494B,
-	/* Array index: 0x0FCB */ 0x544E,0x4942,
-	/* Array index: 0x0FCB */ 0x5462,0x4C51,
-	/* Array index: 0x0FCB */ 0x5468,0x4C52,
-	/* Array index: 0x0FCB */ 0x5471,0x4C4D,
-	/* Array index: 0x0FCB */ 0x5480,0x4C45,
-	/* Array index: 0x0FCB */ 0x5484,0x4C48,
-	/* Array index: 0x0FCB */ 0x5486,0x4C4A,
-	/* Array index: 0x0FCB */ 0x548B,0x4C53,
-	/* Array index: 0x0FCB */ 0x548C,0x4C4F,
-	/* Array index: 0x0FCB */ 0x548E,0x4C55,
-	/* Array index: 0x0FCB */ 0x5490,0x4C4C,
-	/* Array index: 0x0FCB */ 0x5492,0x4C49,
-	/* Array index: 0x0FCB */ 0x5495,0x4C44,
-	/* Array index: 0x0FCB */ 0x5496,0x4C42,
-	/* Array index: 0x0FCB */ 0x549A,0x4C50,
-	/* Array index: 0x0FCB */ 0x54AF,0x5045,
-	/* Array index: 0x0FCB */ 0x54B1,0x5047,
-	/* Array index: 0x0FCB */ 0x54B3,0x503D,
-	/* Array index: 0x0FCB */ 0x54B8,0x503B,
-	/* Array index: 0x0FCB */ 0x54BB,0x5048,
-	/* Array index: 0x0FCB */ 0x54CE,0x5039,
-	/* Array index: 0x0FCB */ 0x54E1,0x545E,
-	/* Array index: 0x0FCB */ 0x54F2,0x5458,
-	/* Array index: 0x0FCB */ 0x54FA,0x545A,
-	/* Array index: 0x0FCB */ 0x54FC,0x5456,
-	/* Array index: 0x0FCB */ 0x54FD,0x5465,
-	/* Array index: 0x0FCB */ 0x5501,0x5454,
-	/* Array index: 0x0FCB */ 0x5506,0x5459,
-	/* Array index: 0x0FCB */ 0x5507,0x5464,
-	/* Array index: 0x0FCB */ 0x5509,0x545F,
-	/* Array index: 0x0FCB */ 0x550F,0x5466,
-	/* Array index: 0x0FCB */ 0x5510,0x5453,
-	/* Array index: 0x0FCB */ 0x5514,0x545B,
-	/* Array index: 0x0FCB */ 0x5527,0x5463,
-	/* Array index: 0x0FCB */ 0x552C,0x5949,
-	/* Array index: 0x0FCB */ 0x552E,0x5947,
-	/* Array index: 0x0FCB */ 0x552F,0x5944,
-	/* Array index: 0x0FCB */ 0x5531,0x5940,
-	/* Array index: 0x0FCB */ 0x5533,0x594B,
-	/* Array index: 0x0FCB */ 0x5537,0x5455,
-	/* Array index: 0x0FCB */ 0x5538,0x5946,
-	/* Array index: 0x0FCB */ 0x553E,0x5E4E,
-	/* Array index: 0x0FCB */ 0x5541,0x594C,
-	/* Array index: 0x0FCB */ 0x5543,0x593E,
-	/* Array index: 0x0FCB */ 0x5544,0x593B,
-	/* Array index: 0x0FCB */ 0x5546,0x5938,
-	/* Array index: 0x0FCB */ 0x554A,0x593F,
-	/* Array index: 0x0FCB */ 0x554F,0x5942,
-	/* Array index: 0x0FCB */ 0x555C,0x5948,
-	/* Array index: 0x0FCB */ 0x555E,0x593C,
-	/* Array index: 0x0FCB */ 0x555F,0x5A76,
-	/* Array index: 0x0FCB */ 0x5561,0x593D,
-	/* Array index: 0x0FCB */ 0x5563,0x594A,
-	/* Array index: 0x0FCB */ 0x5564,0x5945,
-	/* Array index: 0x0FCB */ 0x5566,0x593A,
-	/* Array index: 0x0FCB */ 0x556A,0x5939,
-	/* Array index: 0x0FCB */ 0x557B,0x5E3D,
-	/* Array index: 0x0FCB */ 0x557C,0x5E40,
-	/* Array index: 0x0FCB */ 0x557E,0x5E54,
-	/* Array index: 0x0FCB */ 0x5594,0x5E47,
-	/* Array index: 0x0FCB */ 0x55A7,0x5E3F,
-	/* Array index: 0x0FCB */ 0x55BB,0x5E51,
-	/* Array index: 0x0FCB */ 0x55CE,0x6343,
-	/* Array index: 0x0FCB */ 0x55D1,0x6346,
-	/* Array index: 0x0FCB */ 0x55D3,0x6341,
-	/* Array index: 0x0FCB */ 0x55DA,0x634A,
-	/* Array index: 0x0FCB */ 0x55DC,0x6344,
-	/* Array index: 0x0FCB */ 0x55DF,0x633F,
-	/* Array index: 0x0FCB */ 0x55EF,0x6349,
-	/* Array index: 0x0FCB */ 0x55F6,0x6835,
-	/* Array index: 0x0FCB */ 0x55F7,0x6830,
-	/* Array index: 0x0FCB */ 0x55FD,0x682A,
-	/* Array index: 0x0FCB */ 0x55FE,0x6826,
-	/* Array index: 0x0FCB */ 0x5600,0x6827,
-	/* Array index: 0x0FCB */ 0x5606,0x682C,
-	/* Array index: 0x0FCB */ 0x5608,0x6833,
-	/* Array index: 0x0FCB */ 0x5609,0x682D,
-	/* Array index: 0x0FCB */ 0x560D,0x682E,
-	/* Array index: 0x0FCB */ 0x560E,0x682F,
-	/* Array index: 0x0FCB */ 0x5610,0x6834,
-	/* Array index: 0x0FCB */ 0x5614,0x682B,
-	/* Array index: 0x0FCB */ 0x5616,0x6831,
-	/* Array index: 0x0FCB */ 0x5617,0x6829,
-	/* Array index: 0x0FCB */ 0x561B,0x6828,
-	/* Array index: 0x0FCB */ 0x561F,0x6832,
-	/* Array index: 0x0FCB */ 0x5629,0x6C37,
-	/* Array index: 0x0FCB */ 0x5639,0x6C33,
-	/* Array index: 0x0FCB */ 0x563B,0x6C32,
-	/* Array index: 0x0FCB */ 0x563F,0x6C35,
-	/* Array index: 0x0FCB */ 0x564E,0x6C39,
-	/* Array index: 0x0FCB */ 0x5653,0x6C38,
-	/* Array index: 0x0FCB */ 0x5657,0x6C3A,
-	/* Array index: 0x0FCB */ 0x5659,0x703B,
-	/* Array index: 0x0FCB */ 0x5662,0x7047,
-	/* Array index: 0x0FCB */ 0x566F,0x7045,
-	/* Array index: 0x0FCB */ 0x5671,0x7044,
-	/* Array index: 0x0FCB */ 0x5674,0x6C3B,
-	/* Array index: 0x0FCB */ 0x5676,0x7048,
-	/* Array index: 0x0FCB */ 0x5678,0x7040,
-	/* Array index: 0x0FCB */ 0x5679,0x703D,
-	/* Array index: 0x0FCB */ 0x5680,0x7346,
-	/* Array index: 0x0FCB */ 0x5685,0x7348,
-	/* Array index: 0x0FCB */ 0x5687,0x7349,
-	/* Array index: 0x0FCB */ 0x5695,0x763C,
-	/* Array index: 0x0FCB */ 0x56A5,0x782C,
-	/* Array index: 0x0FCB */ 0x56A8,0x782D,
-	/* Array index: 0x0FCB */ 0x56AE,0x763D,
-	/* Array index: 0x0FCB */ 0x56B4,0x7964,
-	/* Array index: 0x0FCB */ 0x56B6,0x7963,
-	/* Array index: 0x0FCB */ 0x56B7,0x7962,
-	/* Array index: 0x0FCB */ 0x56BC,0x7965,
-	/* Array index: 0x0FCB */ 0x56D1,0x7C5D,
-	/* Array index: 0x0FCB */ 0x56E4,0x495B,
-	/* Array index: 0x0FCB */ 0x56EA,0x4959,
-	/* Array index: 0x0FCB */ 0x56EB,0x495C,
-	/* Array index: 0x0FCB */ 0x56F0,0x495A,
-	/* Array index: 0x0FCB */ 0x56FA,0x4C56,
-	/* Array index: 0x0FCB */ 0x56FF,0x504C,
-	/* Array index: 0x0FCB */ 0x5703,0x5467,
-	/* Array index: 0x0FCB */ 0x5704,0x5468,
-	/* Array index: 0x0FCB */ 0x5708,0x594E,
-	/* Array index: 0x0FCB */ 0x5709,0x5950,
-	/* Array index: 0x0FCB */ 0x570B,0x594F,
-	/* Array index: 0x0FCB */ 0x570D,0x5E58,
-	/* Array index: 0x0FCB */ 0x5712,0x6350,
-	/* Array index: 0x0FCB */ 0x5713,0x6351,
-	/* Array index: 0x0FCB */ 0x5716,0x6837,
-	/* Array index: 0x0FCB */ 0x5718,0x6836,
-	/* Array index: 0x0FCB */ 0x571F,0x4448,
-	/* Array index: 0x0FCB */ 0x5728,0x4763,
-	/* Array index: 0x0FCB */ 0x5729,0x4767,
-	/* Array index: 0x0FCB */ 0x5733,0x4761,
-	/* Array index: 0x0FCB */ 0x573B,0x4966,
-	/* Array index: 0x0FCB */ 0x573E,0x4963,
-	/* Array index: 0x0FCB */ 0x5740,0x495F,
-	/* Array index: 0x0FCB */ 0x5747,0x4961,
-	/* Array index: 0x0FCB */ 0x574A,0x495D,
-	/* Array index: 0x0FCB */ 0x5761,0x4C5B,
-	/* Array index: 0x0FCB */ 0x5764,0x4C5D,
-	/* Array index: 0x0FCB */ 0x5766,0x4C5C,
-	/* Array index: 0x0FCB */ 0x5769,0x4C5A,
-	/* Array index: 0x0FCB */ 0x576A,0x4C59,
-	/* Array index: 0x0FCB */ 0x5777,0x4C58,
-	/* Array index: 0x0FCB */ 0x577C,0x4C5E,
-	/* Array index: 0x0FCB */ 0x5782,0x504D,
-	/* Array index: 0x0FCB */ 0x5783,0x4C57,
-	/* Array index: 0x0FCB */ 0x578B,0x504E,
-	/* Array index: 0x0FCB */ 0x5793,0x5054,
-	/* Array index: 0x0FCB */ 0x57A0,0x504F,
-	/* Array index: 0x0FCB */ 0x57A2,0x5051,
-	/* Array index: 0x0FCB */ 0x57A3,0x5050,
-	/* Array index: 0x0FCB */ 0x57AE,0x5053,
-	/* Array index: 0x0FCB */ 0x57C2,0x5469,
-	/* Array index: 0x0FCB */ 0x57C3,0x546C,
-	/* Array index: 0x0FCB */ 0x57CB,0x546B,
-	/* Array index: 0x0FCB */ 0x57CE,0x5052,
-	/* Array index: 0x0FCB */ 0x57D4,0x546A,
-	/* Array index: 0x0FCB */ 0x57DF,0x5951,
-	/* Array index: 0x0FCB */ 0x57E0,0x5955,
-	/* Array index: 0x0FCB */ 0x57E4,0x5956,
-	/* Array index: 0x0FCB */ 0x57F7,0x595A,
-	/* Array index: 0x0FCB */ 0x57F9,0x595B,
-	/* Array index: 0x0FCB */ 0x57FA,0x5957,
-	/* Array index: 0x0FCB */ 0x5802,0x5958,
-	/* Array index: 0x0FCB */ 0x5805,0x5952,
-	/* Array index: 0x0FCB */ 0x5806,0x5954,
-	/* Array index: 0x0FCB */ 0x5809,0x546D,
-	/* Array index: 0x0FCB */ 0x580A,0x5953,
-	/* Array index: 0x0FCB */ 0x581D,0x5E60,
-	/* Array index: 0x0FCB */ 0x5820,0x5E61,
-	/* Array index: 0x0FCB */ 0x5821,0x5E5F,
-	/* Array index: 0x0FCB */ 0x5824,0x5E5C,
-	/* Array index: 0x0FCB */ 0x582A,0x5E5A,
-	/* Array index: 0x0FCB */ 0x5851,0x6353,
-	/* Array index: 0x0FCB */ 0x5852,0x635D,
-	/* Array index: 0x0FCB */ 0x5854,0x6357,
-	/* Array index: 0x0FCB */ 0x5857,0x6355,
-	/* Array index: 0x0FCB */ 0x5858,0x6354,
-	/* Array index: 0x0FCB */ 0x585A,0x6356,
-	/* Array index: 0x0FCB */ 0x585E,0x6352,
-	/* Array index: 0x0FCB */ 0x5862,0x635C,
-	/* Array index: 0x0FCB */ 0x586B,0x6358,
-	/* Array index: 0x0FCB */ 0x586D,0x635A,
-	/* Array index: 0x0FCB */ 0x5875,0x6838,
-	/* Array index: 0x0FCB */ 0x5879,0x683D,
-	/* Array index: 0x0FCB */ 0x587D,0x683F,
-	/* Array index: 0x0FCB */ 0x587E,0x6839,
-	/* Array index: 0x0FCB */ 0x5880,0x6C3F,
-	/* Array index: 0x0FCB */ 0x5883,0x683A,
-	/* Array index: 0x0FCB */ 0x5885,0x683E,
-	/* Array index: 0x0FCB */ 0x588A,0x683C,
-	/* Array index: 0x0FCB */ 0x5893,0x683B,
-	/* Array index: 0x0FCB */ 0x589C,0x6C43,
-	/* Array index: 0x0FCB */ 0x589E,0x6C41,
-	/* Array index: 0x0FCB */ 0x589F,0x6C40,
-	/* Array index: 0x0FCB */ 0x58A6,0x6C46,
-	/* Array index: 0x0FCB */ 0x58A8,0x702E,
-	/* Array index: 0x0FCB */ 0x58A9,0x6C45,
-	/* Array index: 0x0FCB */ 0x58AE,0x6C44,
-	/* Array index: 0x0FCB */ 0x58B3,0x6C42,
-	/* Array index: 0x0FCB */ 0x58BE,0x704A,
-	/* Array index: 0x0FCB */ 0x58C1,0x7049,
-	/* Array index: 0x0FCB */ 0x58C5,0x704C,
-	/* Array index: 0x0FCB */ 0x58C7,0x704B,
-	/* Array index: 0x0FCB */ 0x58CE,0x734E,
-	/* Array index: 0x0FCB */ 0x58D1,0x734D,
-	/* Array index: 0x0FCB */ 0x58D3,0x734C,
-	/* Array index: 0x0FCB */ 0x58D5,0x734B,
-	/* Array index: 0x0FCB */ 0x58D8,0x763F,
-	/* Array index: 0x0FCB */ 0x58D9,0x763E,
-	/* Array index: 0x0FCB */ 0x58DE,0x782E,
-	/* Array index: 0x0FCB */ 0x58DF,0x782F,
-	/* Array index: 0x0FCB */ 0x58E2,0x7830,
-	/* Array index: 0x0FCB */ 0x58E4,0x7966,
-	/* Array index: 0x0FCB */ 0x58E9,0x7C5E,
-	/* Array index: 0x0FCB */ 0x58EB,0x4449,
-	/* Array index: 0x0FCB */ 0x58EC,0x4531,
-	/* Array index: 0x0FCB */ 0x58EF,0x4967,
-	/* Array index: 0x0FCB */ 0x58F9,0x5E62,
-	/* Array index: 0x0FCB */ 0x58FA,0x5E63,
-	/* Array index: 0x0FCB */ 0x58FD,0x6840,
-	/* Array index: 0x0FCB */ 0x590F,0x546E,
-	/* Array index: 0x0FCB */ 0x5920,0x595C,
-	/* Array index: 0x0FCB */ 0x5922,0x6842,
-	/* Array index: 0x0FCB */ 0x5924,0x6843,
-	/* Array index: 0x0FCB */ 0x5925,0x6841,
-	/* Array index: 0x0FCB */ 0x5931,0x4642,
-	/* Array index: 0x0FCB */ 0x5937,0x476A,
-	/* Array index: 0x0FCB */ 0x5938,0x476B,
-	/* Array index: 0x0FCB */ 0x593E,0x4968,
-	/* Array index: 0x0FCB */ 0x5944,0x4C63,
-	/* Array index: 0x0FCB */ 0x5960,0x5E64,
-	/* Array index: 0x0FCB */ 0x5962,0x595D,
-	/* Array index: 0x0FCB */ 0x5967,0x635F,
-	/* Array index: 0x0FCB */ 0x5969,0x6845,
-	/* Array index: 0x0FCB */ 0x596A,0x6844,
-	/* Array index: 0x0FCB */ 0x596D,0x6C47,
-	/* Array index: 0x0FCB */ 0x596E,0x704D,
-	/* Array index: 0x0FCB */ 0x5973,0x444C,
-	/* Array index: 0x0FCB */ 0x5974,0x4643,
-	/* Array index: 0x0FCB */ 0x5976,0x4644,
-	/* Array index: 0x0FCB */ 0x5978,0x476D,
-	/* Array index: 0x0FCB */ 0x5979,0x4770,
-	/* Array index: 0x0FCB */ 0x597D,0x476F,
-	/* Array index: 0x0FCB */ 0x598A,0x4973,
-	/* Array index: 0x0FCB */ 0x598D,0x4970,
-	/* Array index: 0x0FCB */ 0x5992,0x496A,
-	/* Array index: 0x0FCB */ 0x5993,0x4972,
-	/* Array index: 0x0FCB */ 0x5996,0x496F,
-	/* Array index: 0x0FCB */ 0x5999,0x496E,
-	/* Array index: 0x0FCB */ 0x599D,0x4969,
-	/* Array index: 0x0FCB */ 0x599E,0x496C,
-	/* Array index: 0x0FCB */ 0x59A8,0x496B,
-	/* Array index: 0x0FCB */ 0x59AE,0x4C69,
-	/* Array index: 0x0FCB */ 0x59AF,0x4C71,
-	/* Array index: 0x0FCB */ 0x59B3,0x4C72,
-	/* Array index: 0x0FCB */ 0x59B9,0x4C68,
-	/* Array index: 0x0FCB */ 0x59BB,0x4C66,
-	/* Array index: 0x0FCB */ 0x59BE,0x4C65,
-	/* Array index: 0x0FCB */ 0x59C5,0x4C74,
-	/* Array index: 0x0FCB */ 0x59C6,0x4C6B,
-	/* Array index: 0x0FCB */ 0x59CA,0x4C70,
-	/* Array index: 0x0FCB */ 0x59CB,0x4C6E,
-	/* Array index: 0x0FCB */ 0x59CD,0x4C6D,
-	/* Array index: 0x0FCB */ 0x59D8,0x505B,
-	/* Array index: 0x0FCB */ 0x59DA,0x5062,
-	/* Array index: 0x0FCB */ 0x59DC,0x505A,
-	/* Array index: 0x0FCB */ 0x59E3,0x505D,
-	/* Array index: 0x0FCB */ 0x59E5,0x5060,
-	/* Array index: 0x0FCB */ 0x59E6,0x5063,
-	/* Array index: 0x0FCB */ 0x59E8,0x505E,
-	/* Array index: 0x0FCB */ 0x59EA,0x5061,
-	/* Array index: 0x0FCB */ 0x59EC,0x5478,
-	/* Array index: 0x0FCB */ 0x59FB,0x5065,
-	/* Array index: 0x0FCB */ 0x59FF,0x505C,
-	/* Array index: 0x0FCB */ 0x5A01,0x5064,
-	/* Array index: 0x0FCB */ 0x5A03,0x505F,
-	/* Array index: 0x0FCB */ 0x5A09,0x547E,
-	/* Array index: 0x0FCB */ 0x5A0C,0x547D,
-	/* Array index: 0x0FCB */ 0x5A11,0x5472,
-	/* Array index: 0x0FCB */ 0x5A13,0x5477,
-	/* Array index: 0x0FCB */ 0x5A18,0x5473,
-	/* Array index: 0x0FCB */ 0x5A1B,0x5476,
-	/* Array index: 0x0FCB */ 0x5A1C,0x5474,
-	/* Array index: 0x0FCB */ 0x5A1F,0x5475,
-	/* Array index: 0x0FCB */ 0x5A20,0x5479,
-	/* Array index: 0x0FCB */ 0x5A23,0x547A,
-	/* Array index: 0x0FCB */ 0x5A25,0x547C,
-	/* Array index: 0x0FCB */ 0x5A29,0x547B,
-	/* Array index: 0x0FCB */ 0x5A36,0x595E,
-	/* Array index: 0x0FCB */ 0x5A3C,0x5964,
-	/* Array index: 0x0FCB */ 0x5A40,0x5963,
-	/* Array index: 0x0FCB */ 0x5A41,0x595F,
-	/* Array index: 0x0FCB */ 0x5A46,0x5967,
-	/* Array index: 0x0FCB */ 0x5A49,0x5960,
-	/* Array index: 0x0FCB */ 0x5A4A,0x5968,
-	/* Array index: 0x0FCB */ 0x5A5A,0x5966,
-	/* Array index: 0x0FCB */ 0x5A62,0x5965,
-	/* Array index: 0x0FCB */ 0x5A66,0x5961,
-	/* Array index: 0x0FCB */ 0x5A6A,0x5962,
-	/* Array index: 0x0FCB */ 0x5A77,0x5E65,
-	/* Array index: 0x0FCB */ 0x5A7F,0x5E67,
-	/* Array index: 0x0FCB */ 0x5A92,0x5E68,
-	/* Array index: 0x0FCB */ 0x5A9A,0x5E66,
-	/* Array index: 0x0FCB */ 0x5A9B,0x5E69,
-	/* Array index: 0x0FCB */ 0x5AA7,0x5E6A,
-	/* Array index: 0x0FCB */ 0x5AB2,0x6368,
-	/* Array index: 0x0FCB */ 0x5AB3,0x6366,
-	/* Array index: 0x0FCB */ 0x5AC9,0x6361,
-	/* Array index: 0x0FCB */ 0x5ACC,0x6362,
-	/* Array index: 0x0FCB */ 0x5AE1,0x6846,
-	/* Array index: 0x0FCB */ 0x5AE3,0x684C,
-	/* Array index: 0x0FCB */ 0x5AE6,0x6847,
-	/* Array index: 0x0FCB */ 0x5AE9,0x6848,
-	/* Array index: 0x0FCB */ 0x5AF5,0x6C4B,
-	/* Array index: 0x0FCB */ 0x5AFB,0x6C49,
-	/* Array index: 0x0FCB */ 0x5B1D,0x704E,
-	/* Array index: 0x0FCB */ 0x5B24,0x7351,
-	/* Array index: 0x0FCB */ 0x5B2A,0x7350,
-	/* Array index: 0x0FCB */ 0x5B30,0x734F,
-	/* Array index: 0x0FCB */ 0x5B34,0x704F,
-	/* Array index: 0x0FCB */ 0x5B38,0x7640,
-	/* Array index: 0x0FCB */ 0x5B40,0x7967,
-	/* Array index: 0x0FCB */ 0x5B43,0x7968,
-	/* Array index: 0x0FCB */ 0x5B63,0x4C77,
-	/* Array index: 0x0FCB */ 0x5B64,0x4C76,
-	/* Array index: 0x0FCB */ 0x5B69,0x5066,
-	/* Array index: 0x0FCB */ 0x5B6B,0x5521,
-	/* Array index: 0x0FCB */ 0x5B70,0x5969,
-	/* Array index: 0x0FCB */ 0x5B71,0x5E6C,
-	/* Array index: 0x0FCB */ 0x5B73,0x5E6B,
-	/* Array index: 0x0FCB */ 0x5B75,0x684D,
-	/* Array index: 0x0FCB */ 0x5B78,0x7050,
-	/* Array index: 0x0FCB */ 0x5B7A,0x7352,
-	/* Array index: 0x0FCB */ 0x5B7D,0x7969,
-	/* Array index: 0x0FCB */ 0x5B7F,0x7B5C,
-	/* Array index: 0x0FCB */ 0x5B83,0x4646,
-	/* Array index: 0x0FCB */ 0x5B8F,0x497B,
-	/* Array index: 0x0FCB */ 0x5BAE,0x5527,
-	/* Array index: 0x0FCB */ 0x5BB0,0x5523,
-	/* Array index: 0x0FCB */ 0x5BBF,0x596E,
-	/* Array index: 0x0FCB */ 0x5BCC,0x5E6E,
-	/* Array index: 0x0FCB */ 0x5BD0,0x5E70,
-	/* Array index: 0x0FCB */ 0x5BD2,0x5E6D,
-	/* Array index: 0x0FCB */ 0x5BD3,0x5E6F,
-	/* Array index: 0x0FCB */ 0x5BF5,0x7831,
-	/* Array index: 0x0FCB */ 0x5BF6,0x796A,
-	/* Array index: 0x0FCB */ 0x5BF8,0x4450,
-	/* Array index: 0x0FCB */ 0x5BFA,0x4779,
-	/* Array index: 0x0FCB */ 0x5C01,0x506C,
-	/* Array index: 0x0FCB */ 0x5C04,0x552B,
-	/* Array index: 0x0FCB */ 0x5C16,0x477A,
-	/* Array index: 0x0FCB */ 0x5C1A,0x4C7E,
-	/* Array index: 0x0FCB */ 0x5C22,0x4452,
-	/* Array index: 0x0FCB */ 0x5C24,0x4538,
-	/* Array index: 0x0FCB */ 0x5C2C,0x497C,
-	/* Array index: 0x0FCB */ 0x5C31,0x5E73,
-	/* Array index: 0x0FCB */ 0x5C45,0x4D22,
-	/* Array index: 0x0FCB */ 0x5C46,0x4D23,
-	/* Array index: 0x0FCB */ 0x5C48,0x4D21,
-	/* Array index: 0x0FCB */ 0x5C55,0x552D,
-	/* Array index: 0x0FCB */ 0x5C58,0x5522,
-	/* Array index: 0x0FCB */ 0x5C5C,0x5974,
-	/* Array index: 0x0FCB */ 0x5C5D,0x5975,
-	/* Array index: 0x0FCB */ 0x5C60,0x5973,
-	/* Array index: 0x0FCB */ 0x5C62,0x6858,
-	/* Array index: 0x0FCB */ 0x5C64,0x6C52,
-	/* Array index: 0x0FCB */ 0x5C65,0x6C53,
-	/* Array index: 0x0FCB */ 0x5C68,0x7354,
-	/* Array index: 0x0FCB */ 0x5C6C,0x7A68,
-	/* Array index: 0x0FCB */ 0x5C6F,0x453A,
-	/* Array index: 0x0FCB */ 0x5C71,0x4454,
-	/* Array index: 0x0FCB */ 0x5C79,0x477B,
-	/* Array index: 0x0FCB */ 0x5C8C,0x4A26,
-	/* Array index: 0x0FCB */ 0x5C90,0x4A23,
-	/* Array index: 0x0FCB */ 0x5C91,0x4A24,
-	/* Array index: 0x0FCB */ 0x5C94,0x4A25,
-	/* Array index: 0x0FCB */ 0x5CA1,0x4D25,
-	/* Array index: 0x0FCB */ 0x5CA9,0x4D27,
-	/* Array index: 0x0FCB */ 0x5CAB,0x4D28,
-	/* Array index: 0x0FCB */ 0x5CB1,0x4D29,
-	/* Array index: 0x0FCB */ 0x5CB3,0x4D2A,
-	/* Array index: 0x0FCB */ 0x5CB7,0x4D24,
-	/* Array index: 0x0FCB */ 0x5CB8,0x4D26,
-	/* Array index: 0x0FCB */ 0x5CD2,0x5072,
-	/* Array index: 0x0FCB */ 0x5CD9,0x5071,
-	/* Array index: 0x0FCB */ 0x5CE8,0x5533,
-	/* Array index: 0x0FCB */ 0x5CEA,0x5532,
-	/* Array index: 0x0FCB */ 0x5CED,0x552F,
-	/* Array index: 0x0FCB */ 0x5CF0,0x5534,
-	/* Array index: 0x0FCB */ 0x5CF4,0x5537,
-	/* Array index: 0x0FCB */ 0x5CF6,0x5535,
-	/* Array index: 0x0FCB */ 0x5CFB,0x5531,
-	/* Array index: 0x0FCB */ 0x5CFD,0x5530,
-	/* Array index: 0x0FCB */ 0x5D01,0x5536,
-	/* Array index: 0x0FCB */ 0x5D06,0x5977,
-	/* Array index: 0x0FCB */ 0x5D07,0x5976,
-	/* Array index: 0x0FCB */ 0x5D0E,0x5978,
-	/* Array index: 0x0FCB */ 0x5D11,0x597C,
-	/* Array index: 0x0FCB */ 0x5D14,0x597E,
-	/* Array index: 0x0FCB */ 0x5D16,0x597A,
-	/* Array index: 0x0FCB */ 0x5D17,0x5A24,
-	/* Array index: 0x0FCB */ 0x5D19,0x5A21,
-	/* Array index: 0x0FCB */ 0x5D1B,0x5979,
-	/* Array index: 0x0FCB */ 0x5D22,0x597B,
-	/* Array index: 0x0FCB */ 0x5D24,0x5A22,
-	/* Array index: 0x0FCB */ 0x5D27,0x5A23,
-	/* Array index: 0x0FCB */ 0x5D29,0x597D,
-	/* Array index: 0x0FCB */ 0x5D34,0x5E76,
-	/* Array index: 0x0FCB */ 0x5D47,0x5E77,
-	/* Array index: 0x0FCB */ 0x5D4C,0x5E74,
-	/* Array index: 0x0FCB */ 0x5D50,0x5E75,
-	/* Array index: 0x0FCB */ 0x5D69,0x6369,
-	/* Array index: 0x0FCB */ 0x5D6F,0x636A,
-	/* Array index: 0x0FCB */ 0x5D84,0x6859,
-	/* Array index: 0x0FCB */ 0x5D87,0x685A,
-	/* Array index: 0x0FCB */ 0x5D94,0x6C55,
-	/* Array index: 0x0FCB */ 0x5D9D,0x6C54,
-	/* Array index: 0x0FCB */ 0x5DB8,0x7358,
-	/* Array index: 0x0FCB */ 0x5DBA,0x7356,
-	/* Array index: 0x0FCB */ 0x5DBC,0x7355,
-	/* Array index: 0x0FCB */ 0x5DBD,0x7357,
-	/* Array index: 0x0FCB */ 0x5DC9,0x796B,
-	/* Array index: 0x0FCB */ 0x5DCD,0x7A69,
-	/* Array index: 0x0FCB */ 0x5DD2,0x7B5E,
-	/* Array index: 0x0FCB */ 0x5DD4,0x7B5D,
-	/* Array index: 0x0FCB */ 0x5DD6,0x7C35,
-	/* Array index: 0x0FCB */ 0x5DDD,0x4455,
-	/* Array index: 0x0FCB */ 0x5DDE,0x477C,
-	/* Array index: 0x0FCB */ 0x5DEB,0x4A27,
-	/* Array index: 0x0FCB */ 0x5DEE,0x5538,
-	/* Array index: 0x0FCB */ 0x5DF7,0x5073,
-	/* Array index: 0x0FCB */ 0x5DFD,0x5E78,
-	/* Array index: 0x0FCB */ 0x5DFE,0x445A,
-	/* Array index: 0x0FCB */ 0x5E02,0x464B,
-	/* Array index: 0x0FCB */ 0x5E03,0x464C,
-	/* Array index: 0x0FCB */ 0x5E06,0x477D,
-	/* Array index: 0x0FCB */ 0x5E0C,0x4A28,
-	/* Array index: 0x0FCB */ 0x5E11,0x4D30,
-	/* Array index: 0x0FCB */ 0x5E15,0x4D2E,
-	/* Array index: 0x0FCB */ 0x5E16,0x4D2D,
-	/* Array index: 0x0FCB */ 0x5E18,0x4D2B,
-	/* Array index: 0x0FCB */ 0x5E1A,0x4D2C,
-	/* Array index: 0x0FCB */ 0x5E1B,0x4D2F,
-	/* Array index: 0x0FCB */ 0x5E1D,0x5074,
-	/* Array index: 0x0FCB */ 0x5E1F,0x5076,
-	/* Array index: 0x0FCB */ 0x5E25,0x5075,
-	/* Array index: 0x0FCB */ 0x5E2B,0x553A,
-	/* Array index: 0x0FCB */ 0x5E2D,0x5539,
-	/* Array index: 0x0FCB */ 0x5E33,0x5A28,
-	/* Array index: 0x0FCB */ 0x5E3D,0x5E7A,
-	/* Array index: 0x0FCB */ 0x5E40,0x5E7B,
-	/* Array index: 0x0FCB */ 0x5E43,0x5E7C,
-	/* Array index: 0x0FCB */ 0x5E45,0x5E79,
-	/* Array index: 0x0FCB */ 0x5E4C,0x636B,
-	/* Array index: 0x0FCB */ 0x5E54,0x685F,
-	/* Array index: 0x0FCB */ 0x5E55,0x685D,
-	/* Array index: 0x0FCB */ 0x5E57,0x685E,
-	/* Array index: 0x0FCB */ 0x5E5B,0x685B,
-	/* Array index: 0x0FCB */ 0x5E6B,0x7359,
-	/* Array index: 0x0FCB */ 0x5E87,0x4A2A,
-	/* Array index: 0x0FCB */ 0x5E8A,0x4A2B,
-	/* Array index: 0x0FCB */ 0x5E8F,0x4A29,
-	/* Array index: 0x0FCB */ 0x5E9A,0x4D32,
-	/* Array index: 0x0FCB */ 0x5E9C,0x4D34,
-	/* Array index: 0x0FCB */ 0x5EA0,0x5078,
-	/* Array index: 0x0FCB */ 0x5EA6,0x5079,
-	/* Array index: 0x0FCB */ 0x5EA7,0x553D,
-	/* Array index: 0x0FCB */ 0x5EAB,0x553B,
-	/* Array index: 0x0FCB */ 0x5EAD,0x553C,
-	/* Array index: 0x0FCB */ 0x5EBE,0x5A2E,
-	/* Array index: 0x0FCB */ 0x5EC1,0x5F21,
-	/* Array index: 0x0FCB */ 0x5EC2,0x5F22,
-	/* Array index: 0x0FCB */ 0x5EC4,0x5F23,
-	/* Array index: 0x0FCB */ 0x5ED3,0x6860,
-	/* Array index: 0x0FCB */ 0x5ED6,0x6861,
-	/* Array index: 0x0FCB */ 0x5EDA,0x6C5A,
-	/* Array index: 0x0FCB */ 0x5EDD,0x6C5C,
-	/* Array index: 0x0FCB */ 0x5EEC,0x7833,
-	/* Array index: 0x0FCB */ 0x5EF3,0x7D22,
-	/* Array index: 0x0FCB */ 0x5EF6,0x4D37,
-	/* Array index: 0x0FCB */ 0x5EF7,0x4A2C,
-	/* Array index: 0x0FCB */ 0x5EFA,0x507A,
-	/* Array index: 0x0FCB */ 0x5EFE,0x445C,
-	/* Array index: 0x0FCB */ 0x5EFF,0x453D,
-	/* Array index: 0x0FCB */ 0x5F01,0x464F,
-	/* Array index: 0x0FCB */ 0x5F04,0x4A2D,
-	/* Array index: 0x0FCB */ 0x5F08,0x507B,
-	/* Array index: 0x0FCB */ 0x5F0A,0x6862,
-	/* Array index: 0x0FCB */ 0x5F0B,0x445D,
-	/* Array index: 0x0FCB */ 0x5F0F,0x4822,
-	/* Array index: 0x0FCB */ 0x5F1B,0x4823,
-	/* Array index: 0x0FCB */ 0x5F1F,0x4A2E,
-	/* Array index: 0x0FCB */ 0x5F26,0x4D38,
-	/* Array index: 0x0FCB */ 0x5F27,0x4D39,
-	/* Array index: 0x0FCB */ 0x5F29,0x4D3A,
-	/* Array index: 0x0FCB */ 0x5F2D,0x507C,
-	/* Array index: 0x0FCB */ 0x5F31,0x553E,
-	/* Array index: 0x0FCB */ 0x5F35,0x5A2F,
-	/* Array index: 0x0FCB */ 0x5F37,0x5A30,
-	/* Array index: 0x0FCB */ 0x5F3C,0x5F24,
-	/* Array index: 0x0FCB */ 0x5F46,0x6863,
-	/* Array index: 0x0FCB */ 0x5F48,0x6C5F,
-	/* Array index: 0x0FCB */ 0x5F4A,0x7053,
-	/* Array index: 0x0FCB */ 0x5F4C,0x735A,
-	/* Array index: 0x0FCB */ 0x5F4E,0x7B5F,
-	/* Array index: 0x0FCB */ 0x5F57,0x5A31,
-	/* Array index: 0x0FCB */ 0x5F59,0x6370,
-	/* Array index: 0x0FCB */ 0x5F5E,0x7641,
-	/* Array index: 0x0FCB */ 0x5F62,0x4A30,
-	/* Array index: 0x0FCB */ 0x5F64,0x4A2F,
-	/* Array index: 0x0FCB */ 0x5F65,0x507D,
-	/* Array index: 0x0FCB */ 0x5F77,0x4A31,
-	/* Array index: 0x0FCB */ 0x5F79,0x4A32,
-	/* Array index: 0x0FCB */ 0x5F7C,0x4D3E,
-	/* Array index: 0x0FCB */ 0x5F9C,0x5A3B,
-	/* Array index: 0x0FCB */ 0x5F9E,0x5A37,
-	/* Array index: 0x0FCB */ 0x5FA0,0x5A3A,
-	/* Array index: 0x0FCB */ 0x5FA1,0x5A39,
-	/* Array index: 0x0FCB */ 0x5FB5,0x6C62,
-	/* Array index: 0x0FCB */ 0x5FB7,0x6C61,
-	/* Array index: 0x0FCB */ 0x5FB9,0x6865,
-	/* Array index: 0x0FCB */ 0x5FBD,0x735B,
-	/* Array index: 0x0FCB */ 0x5FC3,0x4540,
-	/* Array index: 0x0FCB */ 0x5FC5,0x4652,
-	/* Array index: 0x0FCB */ 0x5FCC,0x4A34,
-	/* Array index: 0x0FCB */ 0x5FCD,0x4A36,
-	/* Array index: 0x0FCB */ 0x5FDD,0x4D3F,
-	/* Array index: 0x0FCB */ 0x5FE0,0x4D40,
-	/* Array index: 0x0FCB */ 0x5FEA,0x4A3A,
-	/* Array index: 0x0FCB */ 0x5FEB,0x4A38,
-	/* Array index: 0x0FCB */ 0x5FF1,0x4A37,
-	/* Array index: 0x0FCB */ 0x5FF5,0x4D42,
-	/* Array index: 0x0FCB */ 0x5FF8,0x4A39,
-	/* Array index: 0x0FCB */ 0x5FFD,0x4D41,
-	/* Array index: 0x0FCB */ 0x5FFF,0x4D43,
-	/* Array index: 0x0FCB */ 0x600E,0x512B,
-	/* Array index: 0x0FCB */ 0x600F,0x4D44,
-	/* Array index: 0x0FCB */ 0x601B,0x4D4F,
-	/* Array index: 0x0FCB */ 0x601D,0x5128,
-	/* Array index: 0x0FCB */ 0x6020,0x5129,
-	/* Array index: 0x0FCB */ 0x6021,0x4D4B,
-	/* Array index: 0x0FCB */ 0x602F,0x4D46,
-	/* Array index: 0x0FCB */ 0x6035,0x4D47,
-	/* Array index: 0x0FCB */ 0x6043,0x5132,
-	/* Array index: 0x0FCB */ 0x6046,0x5131,
-	/* Array index: 0x0FCB */ 0x604D,0x512D,
-	/* Array index: 0x0FCB */ 0x6050,0x5545,
-	/* Array index: 0x0FCB */ 0x6055,0x5546,
-	/* Array index: 0x0FCB */ 0x6059,0x5542,
-	/* Array index: 0x0FCB */ 0x607F,0x5A3C,
-	/* Array index: 0x0FCB */ 0x6084,0x554A,
-	/* Array index: 0x0FCB */ 0x6085,0x5550,
-	/* Array index: 0x0FCB */ 0x6089,0x5A3E,
-	/* Array index: 0x0FCB */ 0x608C,0x554F,
-	/* Array index: 0x0FCB */ 0x608D,0x554D,
-	/* Array index: 0x0FCB */ 0x6094,0x554E,
-	/* Array index: 0x0FCB */ 0x6096,0x5551,
-	/* Array index: 0x0FCB */ 0x609A,0x554C,
-	/* Array index: 0x0FCB */ 0x609F,0x554B,
-	/* Array index: 0x0FCB */ 0x60A0,0x5A3F,
-	/* Array index: 0x0FCB */ 0x60A3,0x5A3D,
-	/* Array index: 0x0FCB */ 0x60A8,0x5A40,
-	/* Array index: 0x0FCB */ 0x60CB,0x5A41,
-	/* Array index: 0x0FCB */ 0x60D1,0x5F29,
-	/* Array index: 0x0FCB */ 0x60D5,0x5A4B,
-	/* Array index: 0x0FCB */ 0x60D8,0x5A4A,
-	/* Array index: 0x0FCB */ 0x60DA,0x5A4F,
-	/* Array index: 0x0FCB */ 0x60DC,0x5A48,
-	/* Array index: 0x0FCB */ 0x60E6,0x5A43,
-	/* Array index: 0x0FCB */ 0x6100,0x5F3A,
-	/* Array index: 0x0FCB */ 0x6101,0x637A,
-	/* Array index: 0x0FCB */ 0x6106,0x6426,
-	/* Array index: 0x0FCB */ 0x6108,0x637B,
-	/* Array index: 0x0FCB */ 0x6109,0x5F39,
-	/* Array index: 0x0FCB */ 0x6112,0x5F3B,
-	/* Array index: 0x0FCB */ 0x6115,0x5F31,
-	/* Array index: 0x0FCB */ 0x611F,0x6376,
-	/* Array index: 0x0FCB */ 0x6123,0x5F2F,
-	/* Array index: 0x0FCB */ 0x6127,0x6424,
-	/* Array index: 0x0FCB */ 0x6134,0x6423,
-	/* Array index: 0x0FCB */ 0x6137,0x6427,
-	/* Array index: 0x0FCB */ 0x613E,0x6422,
-	/* Array index: 0x0FCB */ 0x613F,0x6867,
-	/* Array index: 0x0FCB */ 0x6144,0x637E,
-	/* Array index: 0x0FCB */ 0x6155,0x6C67,
-	/* Array index: 0x0FCB */ 0x6158,0x686E,
-	/* Array index: 0x0FCB */ 0x615A,0x686D,
-	/* Array index: 0x0FCB */ 0x615D,0x6C66,
-	/* Array index: 0x0FCB */ 0x615F,0x686C,
-	/* Array index: 0x0FCB */ 0x6162,0x686A,
-	/* Array index: 0x0FCB */ 0x6163,0x686B,
-	/* Array index: 0x0FCB */ 0x6167,0x6C64,
-	/* Array index: 0x0FCB */ 0x6168,0x5F35,
-	/* Array index: 0x0FCB */ 0x616B,0x6C6B,
-	/* Array index: 0x0FCB */ 0x616E,0x6C65,
-	/* Array index: 0x0FCB */ 0x6170,0x6C6A,
-	/* Array index: 0x0FCB */ 0x617C,0x6C69,
-	/* Array index: 0x0FCB */ 0x617E,0x6C6C,
-	/* Array index: 0x0FCB */ 0x6182,0x6C68,
-	/* Array index: 0x0FCB */ 0x618A,0x7057,
-	/* Array index: 0x0FCB */ 0x618E,0x6C70,
-	/* Array index: 0x0FCB */ 0x6190,0x6C6E,
-	/* Array index: 0x0FCB */ 0x6191,0x7055,
-	/* Array index: 0x0FCB */ 0x6194,0x6C74,
-	/* Array index: 0x0FCB */ 0x619A,0x6C72,
-	/* Array index: 0x0FCB */ 0x61A4,0x6C73,
-	/* Array index: 0x0FCB */ 0x61A7,0x6C6D,
-	/* Array index: 0x0FCB */ 0x61A9,0x7056,
-	/* Array index: 0x0FCB */ 0x61AB,0x6C6F,
-	/* Array index: 0x0FCB */ 0x61AC,0x6C71,
-	/* Array index: 0x0FCB */ 0x61AE,0x6C75,
-	/* Array index: 0x0FCB */ 0x61B2,0x7054,
-	/* Array index: 0x0FCB */ 0x61B6,0x7059,
-	/* Array index: 0x0FCB */ 0x61BE,0x705A,
-	/* Array index: 0x0FCB */ 0x61C2,0x735D,
-	/* Array index: 0x0FCB */ 0x61E3,0x7642,
-	/* Array index: 0x0FCB */ 0x61E6,0x735F,
-	/* Array index: 0x0FCB */ 0x61F2,0x7834,
-	/* Array index: 0x0FCB */ 0x6208,0x4541,
-	/* Array index: 0x0FCB */ 0x621A,0x5A51,
-	/* Array index: 0x0FCB */ 0x621B,0x5A52,
-	/* Array index: 0x0FCB */ 0x621F,0x5F3C,
-	/* Array index: 0x0FCB */ 0x6221,0x6428,
-	/* Array index: 0x0FCB */ 0x6222,0x6429,
-	/* Array index: 0x0FCB */ 0x622A,0x6870,
-	/* Array index: 0x0FCB */ 0x622E,0x6C76,
-	/* Array index: 0x0FCB */ 0x6258,0x482C,
-	/* Array index: 0x0FCB */ 0x625B,0x482B,
-	/* Array index: 0x0FCB */ 0x6263,0x482A,
-	/* Array index: 0x0FCB */ 0x6273,0x4A48,
-	/* Array index: 0x0FCB */ 0x6276,0x4A41,
-	/* Array index: 0x0FCB */ 0x6279,0x4A47,
-	/* Array index: 0x0FCB */ 0x6284,0x4A3D,
-	/* Array index: 0x0FCB */ 0x6286,0x4A50,
-	/* Array index: 0x0FCB */ 0x6289,0x4A42,
-	/* Array index: 0x0FCB */ 0x628A,0x4A44,
-	/* Array index: 0x0FCB */ 0x62A8,0x4D63,
-	/* Array index: 0x0FCB */ 0x62AB,0x4D5E,
-	/* Array index: 0x0FCB */ 0x62AC,0x4D71,
-	/* Array index: 0x0FCB */ 0x62B1,0x4D6C,
-	/* Array index: 0x0FCB */ 0x62B5,0x4D6A,
-	/* Array index: 0x0FCB */ 0x62B9,0x4D5B,
-	/* Array index: 0x0FCB */ 0x62BC,0x4D65,
-	/* Array index: 0x0FCB */ 0x62BD,0x4D64,
-	/* Array index: 0x0FCB */ 0x62BF,0x4D59,
-	/* Array index: 0x0FCB */ 0x62C2,0x4D5A,
-	/* Array index: 0x0FCB */ 0x62F7,0x5142,
-	/* Array index: 0x0FCB */ 0x6311,0x5147,
-	/* Array index: 0x0FCB */ 0x6316,0x5139,
-	/* Array index: 0x0FCB */ 0x6328,0x5563,
-	/* Array index: 0x0FCB */ 0x632A,0x5561,
-	/* Array index: 0x0FCB */ 0x632B,0x5562,
-	/* Array index: 0x0FCB */ 0x632F,0x5558,
-	/* Array index: 0x0FCB */ 0x633A,0x555E,
-	/* Array index: 0x0FCB */ 0x633D,0x5560,
-	/* Array index: 0x0FCB */ 0x633E,0x5557,
-	/* Array index: 0x0FCB */ 0x6342,0x555A,
-	/* Array index: 0x0FCB */ 0x6346,0x555B,
-	/* Array index: 0x0FCB */ 0x6349,0x555D,
-	/* Array index: 0x0FCB */ 0x6355,0x5559,
-	/* Array index: 0x0FCB */ 0x6371,0x5A5E,
-	/* Array index: 0x0FCB */ 0x6372,0x5A56,
-	/* Array index: 0x0FCB */ 0x6376,0x5F4D,
-	/* Array index: 0x0FCB */ 0x6377,0x5A5A,
-	/* Array index: 0x0FCB */ 0x637A,0x5A70,
-	/* Array index: 0x0FCB */ 0x637B,0x5A6D,
-	/* Array index: 0x0FCB */ 0x6380,0x5A6C,
-	/* Array index: 0x0FCB */ 0x6383,0x5A61,
-	/* Array index: 0x0FCB */ 0x6384,0x5A65,
-	/* Array index: 0x0FCB */ 0x6388,0x5A66,
-	/* Array index: 0x0FCB */ 0x6389,0x5A60,
-	/* Array index: 0x0FCB */ 0x638C,0x5F3F,
-	/* Array index: 0x0FCB */ 0x638F,0x5A6B,
-	/* Array index: 0x0FCB */ 0x6392,0x5A6A,
-	/* Array index: 0x0FCB */ 0x6396,0x5A57,
-	/* Array index: 0x0FCB */ 0x6398,0x5A5C,
-	/* Array index: 0x0FCB */ 0x6399,0x5A67,
-	/* Array index: 0x0FCB */ 0x639B,0x5A62,
-	/* Array index: 0x0FCB */ 0x63C0,0x5F41,
-	/* Array index: 0x0FCB */ 0x63C6,0x5F44,
-	/* Array index: 0x0FCB */ 0x63C9,0x5F43,
-	/* Array index: 0x0FCB */ 0x63CD,0x5F45,
-	/* Array index: 0x0FCB */ 0x63CF,0x5F40,
-	/* Array index: 0x0FCB */ 0x63D0,0x5F48,
-	/* Array index: 0x0FCB */ 0x63D2,0x5F46,
-	/* Array index: 0x0FCB */ 0x63D6,0x5F4A,
-	/* Array index: 0x0FCB */ 0x63DA,0x5F52,
-	/* Array index: 0x0FCB */ 0x63DB,0x5F50,
-	/* Array index: 0x0FCB */ 0x63E1,0x5F49,
-	/* Array index: 0x0FCB */ 0x63E3,0x5F47,
-	/* Array index: 0x0FCB */ 0x63E9,0x5F42,
-	/* Array index: 0x0FCB */ 0x63EA,0x5F4F,
-	/* Array index: 0x0FCB */ 0x63ED,0x5F4B,
-	/* Array index: 0x0FCB */ 0x63EE,0x5F4C,
-	/* Array index: 0x0FCB */ 0x63F4,0x5F4E,
-	/* Array index: 0x0FCB */ 0x63F9,0x5F53,
-	/* Array index: 0x0FCB */ 0x6406,0x6438,
-	/* Array index: 0x0FCB */ 0x640D,0x6434,
-	/* Array index: 0x0FCB */ 0x640F,0x6431,
-	/* Array index: 0x0FCB */ 0x641C,0x6432,
-	/* Array index: 0x0FCB */ 0x641E,0x642C,
-	/* Array index: 0x0FCB */ 0x642A,0x642D,
-	/* Array index: 0x0FCB */ 0x642C,0x6430,
-	/* Array index: 0x0FCB */ 0x642D,0x642E,
-	/* Array index: 0x0FCB */ 0x6434,0x687A,
-	/* Array index: 0x0FCB */ 0x6436,0x6435,
-	/* Array index: 0x0FCB */ 0x643D,0x642F,
-	/* Array index: 0x0FCB */ 0x643E,0x642B,
-	/* Array index: 0x0FCB */ 0x6451,0x6878,
-	/* Array index: 0x0FCB */ 0x6452,0x5F51,
-	/* Array index: 0x0FCB */ 0x6454,0x6873,
-	/* Array index: 0x0FCB */ 0x6458,0x6872,
-	/* Array index: 0x0FCB */ 0x645F,0x6876,
-	/* Array index: 0x0FCB */ 0x6467,0x6879,
-	/* Array index: 0x0FCB */ 0x6469,0x6C77,
-	/* Array index: 0x0FCB */ 0x646D,0x687B,
-	/* Array index: 0x0FCB */ 0x646F,0x6C78,
-	/* Array index: 0x0FCB */ 0x6487,0x6871,
-	/* Array index: 0x0FCB */ 0x6488,0x6C7C,
-	/* Array index: 0x0FCB */ 0x6490,0x6C7D,
-	/* Array index: 0x0FCB */ 0x6492,0x6D25,
-	/* Array index: 0x0FCB */ 0x6493,0x6D22,
-	/* Array index: 0x0FCB */ 0x6495,0x6D23,
-	/* Array index: 0x0FCB */ 0x6499,0x6D2B,
-	/* Array index: 0x0FCB */ 0x649A,0x6D29,
-	/* Array index: 0x0FCB */ 0x649E,0x6C7A,
-	/* Array index: 0x0FCB */ 0x64A2,0x6D2C,
-	/* Array index: 0x0FCB */ 0x64A4,0x6874,
-	/* Array index: 0x0FCB */ 0x64A5,0x6D21,
-	/* Array index: 0x0FCB */ 0x64D2,0x7069,
-	/* Array index: 0x0FCB */ 0x64D4,0x706A,
-	/* Array index: 0x0FCB */ 0x64D8,0x7365,
-	/* Array index: 0x0FCB */ 0x64DA,0x7063,
-	/* Array index: 0x0FCB */ 0x64E0,0x7366,
-	/* Array index: 0x0FCB */ 0x64E2,0x736B,
-	/* Array index: 0x0FCB */ 0x64E6,0x7368,
-	/* Array index: 0x0FCB */ 0x64F7,0x764A,
-	/* Array index: 0x0FCB */ 0x64FA,0x7648,
-	/* Array index: 0x0FCB */ 0x64FB,0x7649,
-	/* Array index: 0x0FCB */ 0x64FE,0x7646,
-	/* Array index: 0x0FCB */ 0x6500,0x7838,
-	/* Array index: 0x0FCB */ 0x6506,0x7647,
-	/* Array index: 0x0FCB */ 0x650F,0x7839,
-	/* Array index: 0x0FCB */ 0x6514,0x796F,
-	/* Array index: 0x0FCB */ 0x6518,0x796E,
-	/* Array index: 0x0FCB */ 0x6519,0x7970,
-	/* Array index: 0x0FCB */ 0x651C,0x7A6D,
-	/* Array index: 0x0FCB */ 0x651D,0x7A6C,
-	/* Array index: 0x0FCB */ 0x6523,0x7C37,
-	/* Array index: 0x0FCB */ 0x6524,0x7B61,
-	/* Array index: 0x0FCB */ 0x652F,0x4545,
-	/* Array index: 0x0FCB */ 0x6536,0x482D,
-	/* Array index: 0x0FCB */ 0x6538,0x4A53,
-	/* Array index: 0x0FCB */ 0x6539,0x4A51,
-	/* Array index: 0x0FCB */ 0x653B,0x4A52,
-	/* Array index: 0x0FCB */ 0x653E,0x4D73,
-	/* Array index: 0x0FCB */ 0x653F,0x5149,
-	/* Array index: 0x0FCB */ 0x6545,0x514A,
-	/* Array index: 0x0FCB */ 0x6548,0x5566,
-	/* Array index: 0x0FCB */ 0x6549,0x5567,
-	/* Array index: 0x0FCB */ 0x654F,0x5A77,
-	/* Array index: 0x0FCB */ 0x6551,0x5A73,
-	/* Array index: 0x0FCB */ 0x655D,0x5A71,
-	/* Array index: 0x0FCB */ 0x655E,0x5F54,
-	/* Array index: 0x0FCB */ 0x6562,0x5F56,
-	/* Array index: 0x0FCB */ 0x6563,0x5F57,
-	/* Array index: 0x0FCB */ 0x6566,0x5F55,
-	/* Array index: 0x0FCB */ 0x656C,0x6439,
-	/* Array index: 0x0FCB */ 0x6572,0x687D,
-	/* Array index: 0x0FCB */ 0x6582,0x736D,
-	/* Array index: 0x0FCB */ 0x6583,0x736E,
-	/* Array index: 0x0FCB */ 0x6587,0x4546,
-	/* Array index: 0x0FCB */ 0x6590,0x5F59,
-	/* Array index: 0x0FCB */ 0x6591,0x5F58,
-	/* Array index: 0x0FCB */ 0x6595,0x7A6E,
-	/* Array index: 0x0FCB */ 0x6597,0x4547,
-	/* Array index: 0x0FCB */ 0x6599,0x5568,
-	/* Array index: 0x0FCB */ 0x659B,0x5A7C,
-	/* Array index: 0x0FCB */ 0x659C,0x5A7B,
-	/* Array index: 0x0FCB */ 0x659F,0x643A,
-	/* Array index: 0x0FCB */ 0x65A1,0x687E,
-	/* Array index: 0x0FCB */ 0x65A4,0x4548,
-	/* Array index: 0x0FCB */ 0x65A5,0x4658,
-	/* Array index: 0x0FCB */ 0x65A7,0x4D74,
-	/* Array index: 0x0FCB */ 0x65AB,0x514B,
-	/* Array index: 0x0FCB */ 0x65AC,0x5A7D,
-	/* Array index: 0x0FCB */ 0x65AF,0x5F5A,
-	/* Array index: 0x0FCB */ 0x65B0,0x643B,
-	/* Array index: 0x0FCB */ 0x65B7,0x764B,
-	/* Array index: 0x0FCB */ 0x65B9,0x4549,
-	/* Array index: 0x0FCB */ 0x65BC,0x4D75,
-	/* Array index: 0x0FCB */ 0x65BD,0x514C,
-	/* Array index: 0x0FCB */ 0x65C1,0x5569,
-	/* Array index: 0x0FCB */ 0x65C5,0x556A,
-	/* Array index: 0x0FCB */ 0x65D6,0x6922,
-	/* Array index: 0x0FCB */ 0x65D7,0x6921,
-	/* Array index: 0x0FCB */ 0x65E2,0x514D,
-	/* Array index: 0x0FCB */ 0x65F1,0x4A54,
-	/* Array index: 0x0FCB */ 0x65FA,0x4D76,
-	/* Array index: 0x0FCB */ 0x6600,0x4D7D,
-	/* Array index: 0x0FCB */ 0x6602,0x4D7B,
-	/* Array index: 0x0FCB */ 0x6606,0x4D7A,
-	/* Array index: 0x0FCB */ 0x6607,0x4E23,
-	/* Array index: 0x0FCB */ 0x660A,0x4E22,
-	/* Array index: 0x0FCB */ 0x660C,0x4D79,
-	/* Array index: 0x0FCB */ 0x660E,0x4D7C,
-	/* Array index: 0x0FCB */ 0x660F,0x4D7E,
-	/* Array index: 0x0FCB */ 0x661F,0x5153,
-	/* Array index: 0x0FCB */ 0x6620,0x5150,
-	/* Array index: 0x0FCB */ 0x662D,0x514F,
-	/* Array index: 0x0FCB */ 0x662F,0x5152,
-	/* Array index: 0x0FCB */ 0x6631,0x5155,
-	/* Array index: 0x0FCB */ 0x6649,0x556C,
-	/* Array index: 0x0FCB */ 0x664C,0x5570,
-	/* Array index: 0x0FCB */ 0x664F,0x556D,
-	/* Array index: 0x0FCB */ 0x6652,0x556F,
-	/* Array index: 0x0FCB */ 0x665A,0x5B25,
-	/* Array index: 0x0FCB */ 0x665D,0x5B24,
-	/* Array index: 0x0FCB */ 0x665E,0x5B29,
-	/* Array index: 0x0FCB */ 0x6664,0x5B26,
-	/* Array index: 0x0FCB */ 0x6666,0x5B28,
-	/* Array index: 0x0FCB */ 0x6668,0x5B27,
-	/* Array index: 0x0FCB */ 0x6674,0x5F5D,
-	/* Array index: 0x0FCB */ 0x6676,0x5F5E,
-	/* Array index: 0x0FCB */ 0x6677,0x5F63,
-	/* Array index: 0x0FCB */ 0x667A,0x5F61,
-	/* Array index: 0x0FCB */ 0x667E,0x5F62,
-	/* Array index: 0x0FCB */ 0x6684,0x6441,
-	/* Array index: 0x0FCB */ 0x668D,0x6443,
-	/* Array index: 0x0FCB */ 0x6691,0x5F60,
-	/* Array index: 0x0FCB */ 0x669D,0x6925,
-	/* Array index: 0x0FCB */ 0x66A2,0x6923,
-	/* Array index: 0x0FCB */ 0x66A8,0x6924,
-	/* Array index: 0x0FCB */ 0x66AB,0x6D32,
-	/* Array index: 0x0FCB */ 0x66AE,0x6D31,
-	/* Array index: 0x0FCB */ 0x66B1,0x6D34,
-	/* Array index: 0x0FCB */ 0x66B4,0x6D33,
-	/* Array index: 0x0FCB */ 0x66B8,0x7072,
-	/* Array index: 0x0FCB */ 0x66B9,0x706F,
-	/* Array index: 0x0FCB */ 0x66C4,0x7070,
-	/* Array index: 0x0FCB */ 0x66C6,0x706D,
-	/* Array index: 0x0FCB */ 0x66C7,0x7071,
-	/* Array index: 0x0FCB */ 0x66C9,0x706E,
-	/* Array index: 0x0FCB */ 0x66D6,0x7370,
-	/* Array index: 0x0FCB */ 0x66D9,0x736F,
-	/* Array index: 0x0FCB */ 0x66DC,0x764C,
-	/* Array index: 0x0FCB */ 0x66DD,0x783B,
-	/* Array index: 0x0FCB */ 0x66E0,0x783A,
-	/* Array index: 0x0FCB */ 0x66E6,0x7971,
-	/* Array index: 0x0FCB */ 0x66E9,0x7A6F,
-	/* Array index: 0x0FCB */ 0x66EC,0x7C3A,
-	/* Array index: 0x0FCB */ 0x6703,0x6444,
-	/* Array index: 0x0FCB */ 0x6708,0x454C,
-	/* Array index: 0x0FCB */ 0x6709,0x4834,
-	/* Array index: 0x0FCB */ 0x670B,0x4E25,
-	/* Array index: 0x0FCB */ 0x670D,0x4E24,
-	/* Array index: 0x0FCB */ 0x6714,0x5574,
-	/* Array index: 0x0FCB */ 0x6715,0x5575,
-	/* Array index: 0x0FCB */ 0x6717,0x5576,
-	/* Array index: 0x0FCB */ 0x671B,0x5B2C,
-	/* Array index: 0x0FCB */ 0x671D,0x5F67,
-	/* Array index: 0x0FCB */ 0x671F,0x5F66,
-	/* Array index: 0x0FCB */ 0x6731,0x4837,
-	/* Array index: 0x0FCB */ 0x6734,0x4836,
-	/* Array index: 0x0FCB */ 0x6735,0x4838,
-	/* Array index: 0x0FCB */ 0x673D,0x4835,
-	/* Array index: 0x0FCB */ 0x6746,0x4A5F,
-	/* Array index: 0x0FCB */ 0x6749,0x4A5E,
-	/* Array index: 0x0FCB */ 0x676A,0x4E3A,
-	/* Array index: 0x0FCB */ 0x677C,0x4E39,
-	/* Array index: 0x0FCB */ 0x677E,0x4E34,
-	/* Array index: 0x0FCB */ 0x677F,0x4E32,
-	/* Array index: 0x0FCB */ 0x6787,0x4E2D,
-	/* Array index: 0x0FCB */ 0x6789,0x4E33,
-	/* Array index: 0x0FCB */ 0x678B,0x4E27,
-	/* Array index: 0x0FCB */ 0x6790,0x4E35,
-	/* Array index: 0x0FCB */ 0x6793,0x4E38,
-	/* Array index: 0x0FCB */ 0x6795,0x4E28,
-	/* Array index: 0x0FCB */ 0x6797,0x4E2F,
-	/* Array index: 0x0FCB */ 0x679A,0x4E37,
-	/* Array index: 0x0FCB */ 0x679C,0x4E2A,
-	/* Array index: 0x0FCB */ 0x679D,0x4E2E,
-	/* Array index: 0x0FCB */ 0x67AF,0x515F,
-	/* Array index: 0x0FCB */ 0x67B0,0x516C,
-	/* Array index: 0x0FCB */ 0x67B4,0x5165,
-	/* Array index: 0x0FCB */ 0x67B6,0x515E,
-	/* Array index: 0x0FCB */ 0x67B8,0x5168,
-	/* Array index: 0x0FCB */ 0x67C4,0x5163,
-	/* Array index: 0x0FCB */ 0x67D9,0x516D,
-	/* Array index: 0x0FCB */ 0x67DA,0x5166,
-	/* Array index: 0x0FCB */ 0x67DD,0x516F,
-	/* Array index: 0x0FCB */ 0x67DE,0x516A,
-	/* Array index: 0x0FCB */ 0x67E2,0x516E,
-	/* Array index: 0x0FCB */ 0x67E5,0x5167,
-	/* Array index: 0x0FCB */ 0x67E9,0x5161,
-	/* Array index: 0x0FCB */ 0x67EC,0x515D,
-	/* Array index: 0x0FCB */ 0x67EF,0x5162,
-	/* Array index: 0x0FCB */ 0x67FF,0x5158,
-	/* Array index: 0x0FCB */ 0x6813,0x562E,
-	/* Array index: 0x0FCB */ 0x6817,0x5623,
-	/* Array index: 0x0FCB */ 0x6818,0x562F,
-	/* Array index: 0x0FCB */ 0x6821,0x5577,
-	/* Array index: 0x0FCB */ 0x6829,0x5621,
-	/* Array index: 0x0FCB */ 0x682A,0x562C,
-	/* Array index: 0x0FCB */ 0x6838,0x5578,
-	/* Array index: 0x0FCB */ 0x6839,0x557C,
-	/* Array index: 0x0FCB */ 0x684C,0x5624,
-	/* Array index: 0x0FCB */ 0x6876,0x5B33,
-	/* Array index: 0x0FCB */ 0x6893,0x5B30,
-	/* Array index: 0x0FCB */ 0x6894,0x5B3D,
-	/* Array index: 0x0FCB */ 0x6897,0x5B36,
-	/* Array index: 0x0FCB */ 0x689D,0x5B3E,
-	/* Array index: 0x0FCB */ 0x689F,0x5B40,
-	/* Array index: 0x0FCB */ 0x68A1,0x5B41,
-	/* Array index: 0x0FCB */ 0x68A2,0x5B2F,
-	/* Array index: 0x0FCB */ 0x68A7,0x5B35,
-	/* Array index: 0x0FCB */ 0x68A8,0x5B3F,
-	/* Array index: 0x0FCB */ 0x68C4,0x5B39,
-	/* Array index: 0x0FCB */ 0x68C9,0x5F7B,
-	/* Array index: 0x0FCB */ 0x68CB,0x5F76,
-	/* Array index: 0x0FCB */ 0x68CD,0x5F77,
-	/* Array index: 0x0FCB */ 0x68D2,0x5F73,
-	/* Array index: 0x0FCB */ 0x68D5,0x5F69,
-	/* Array index: 0x0FCB */ 0x68D7,0x5F6C,
-	/* Array index: 0x0FCB */ 0x68D8,0x5F6B,
-	/* Array index: 0x0FCB */ 0x68DA,0x5F7C,
-	/* Array index: 0x0FCB */ 0x68DF,0x5F6E,
-	/* Array index: 0x0FCB */ 0x68E0,0x5F6A,
-	/* Array index: 0x0FCB */ 0x68E3,0x5F75,
-	/* Array index: 0x0FCB */ 0x68E7,0x5F71,
-	/* Array index: 0x0FCB */ 0x68EE,0x5F70,
-	/* Array index: 0x0FCB */ 0x68F2,0x5F74,
-	/* Array index: 0x0FCB */ 0x68F5,0x5F6F,
-	/* Array index: 0x0FCB */ 0x6905,0x5F6D,
-	/* Array index: 0x0FCB */ 0x690D,0x5F78,
-	/* Array index: 0x0FCB */ 0x690E,0x5F7A,
-	/* Array index: 0x0FCB */ 0x6912,0x5F79,
-	/* Array index: 0x0FCB */ 0x6930,0x644C,
-	/* Array index: 0x0FCB */ 0x694A,0x644E,
-	/* Array index: 0x0FCB */ 0x6953,0x6452,
-	/* Array index: 0x0FCB */ 0x6954,0x644A,
-	/* Array index: 0x0FCB */ 0x6963,0x6456,
-	/* Array index: 0x0FCB */ 0x6968,0x644F,
-	/* Array index: 0x0FCB */ 0x696B,0x6450,
-	/* Array index: 0x0FCB */ 0x696D,0x6446,
-	/* Array index: 0x0FCB */ 0x696E,0x5F7D,
-	/* Array index: 0x0FCB */ 0x6975,0x644B,
-	/* Array index: 0x0FCB */ 0x6977,0x6448,
-	/* Array index: 0x0FCB */ 0x6979,0x6453,
-	/* Array index: 0x0FCB */ 0x6982,0x644D,
-	/* Array index: 0x0FCB */ 0x6986,0x6454,
-	/* Array index: 0x0FCB */ 0x6994,0x6445,
-	/* Array index: 0x0FCB */ 0x6995,0x6928,
-	/* Array index: 0x0FCB */ 0x699B,0x692D,
-	/* Array index: 0x0FCB */ 0x699C,0x6926,
-	/* Array index: 0x0FCB */ 0x69A3,0x6938,
-	/* Array index: 0x0FCB */ 0x69A6,0x6936,
-	/* Array index: 0x0FCB */ 0x69A8,0x6927,
-	/* Array index: 0x0FCB */ 0x69AB,0x6930,
-	/* Array index: 0x0FCB */ 0x69AD,0x6934,
-	/* Array index: 0x0FCB */ 0x69AE,0x692A,
-	/* Array index: 0x0FCB */ 0x69B4,0x6931,
-	/* Array index: 0x0FCB */ 0x69B7,0x692E,
-	/* Array index: 0x0FCB */ 0x69BB,0x692F,
-	/* Array index: 0x0FCB */ 0x69C1,0x6929,
-	/* Array index: 0x0FCB */ 0x69C3,0x6937,
-	/* Array index: 0x0FCB */ 0x69D0,0x6932,
-	/* Array index: 0x0FCB */ 0x69D3,0x692B,
-	/* Array index: 0x0FCB */ 0x69E8,0x6D37,
-	/* Array index: 0x0FCB */ 0x69ED,0x6D42,
-	/* Array index: 0x0FCB */ 0x69F3,0x6D3F,
-	/* Array index: 0x0FCB */ 0x69FD,0x6D3B,
-	/* Array index: 0x0FCB */ 0x6A01,0x6D38,
-	/* Array index: 0x0FCB */ 0x6A02,0x6D40,
-	/* Array index: 0x0FCB */ 0x6A05,0x6D41,
-	/* Array index: 0x0FCB */ 0x6A0A,0x6D3E,
-	/* Array index: 0x0FCB */ 0x6A11,0x6D43,
-	/* Array index: 0x0FCB */ 0x6A13,0x6D3D,
-	/* Array index: 0x0FCB */ 0x6A19,0x6D3A,
-	/* Array index: 0x0FCB */ 0x6A1E,0x6D39,
-	/* Array index: 0x0FCB */ 0x6A1F,0x6D36,
-	/* Array index: 0x0FCB */ 0x6A21,0x6D3C,
-	/* Array index: 0x0FCB */ 0x6A23,0x6D35,
-	/* Array index: 0x0FCB */ 0x6A35,0x7121,
-	/* Array index: 0x0FCB */ 0x6A3D,0x7073,
-	/* Array index: 0x0FCB */ 0x6A44,0x707A,
-	/* Array index: 0x0FCB */ 0x6A47,0x707E,
-	/* Array index: 0x0FCB */ 0x6A48,0x7123,
-	/* Array index: 0x0FCB */ 0x6A4B,0x707D,
-	/* Array index: 0x0FCB */ 0x6A58,0x7078,
-	/* Array index: 0x0FCB */ 0x6A59,0x7076,
-	/* Array index: 0x0FCB */ 0x6A5F,0x7122,
-	/* Array index: 0x0FCB */ 0x6A61,0x707C,
-	/* Array index: 0x0FCB */ 0x6A62,0x707B,
-	/* Array index: 0x0FCB */ 0x6A6B,0x7077,
-	/* Array index: 0x0FCB */ 0x6A7E,0x7378,
-	/* Array index: 0x0FCB */ 0x6A80,0x7371,
-	/* Array index: 0x0FCB */ 0x6A84,0x7373,
-	/* Array index: 0x0FCB */ 0x6A90,0x737A,
-	/* Array index: 0x0FCB */ 0x6A94,0x7372,
-	/* Array index: 0x0FCB */ 0x6A97,0x7379,
-	/* Array index: 0x0FCB */ 0x6A9C,0x7375,
-	/* Array index: 0x0FCB */ 0x6AA0,0x737B,
-	/* Array index: 0x0FCB */ 0x6AA2,0x7374,
-	/* Array index: 0x0FCB */ 0x6AA3,0x7377,
-	/* Array index: 0x0FCB */ 0x6AAC,0x764F,
-	/* Array index: 0x0FCB */ 0x6AAE,0x7654,
-	/* Array index: 0x0FCB */ 0x6AAF,0x7655,
-	/* Array index: 0x0FCB */ 0x6AB3,0x764E,
-	/* Array index: 0x0FCB */ 0x6AB8,0x7652,
-	/* Array index: 0x0FCB */ 0x6ABB,0x7651,
-	/* Array index: 0x0FCB */ 0x6AC2,0x7653,
-	/* Array index: 0x0FCB */ 0x6AC3,0x7650,
-	/* Array index: 0x0FCB */ 0x6AD3,0x783F,
-	/* Array index: 0x0FCB */ 0x6ADA,0x783E,
-	/* Array index: 0x0FCB */ 0x6ADB,0x7376,
-	/* Array index: 0x0FCB */ 0x6ADD,0x783D,
-	/* Array index: 0x0FCB */ 0x6AE5,0x783C,
-	/* Array index: 0x0FCB */ 0x6AEC,0x7973,
-	/* Array index: 0x0FCB */ 0x6AFA,0x7A72,
-	/* Array index: 0x0FCB */ 0x6AFB,0x7A70,
-	/* Array index: 0x0FCB */ 0x6B04,0x7A71,
-	/* Array index: 0x0FCB */ 0x6B0A,0x7B62,
-	/* Array index: 0x0FCB */ 0x6B10,0x7C3B,
-	/* Array index: 0x0FCB */ 0x6B16,0x7D23,
-	/* Array index: 0x0FCB */ 0x6B20,0x454E,
-	/* Array index: 0x0FCB */ 0x6B21,0x4839,
-	/* Array index: 0x0FCB */ 0x6B23,0x4E3C,
-	/* Array index: 0x0FCB */ 0x6B32,0x5B43,
-	/* Array index: 0x0FCB */ 0x6B3A,0x6022,
-	/* Array index: 0x0FCB */ 0x6B3D,0x6023,
-	/* Array index: 0x0FCB */ 0x6B3E,0x6021,
-	/* Array index: 0x0FCB */ 0x6B47,0x6458,
-	/* Array index: 0x0FCB */ 0x6B49,0x6939,
-	/* Array index: 0x0FCB */ 0x6B4C,0x693A,
-	/* Array index: 0x0FCB */ 0x6B4E,0x6D45,
-	/* Array index: 0x0FCB */ 0x6B50,0x6D44,
-	/* Array index: 0x0FCB */ 0x6B59,0x7124,
-	/* Array index: 0x0FCB */ 0x6B5C,0x737C,
-	/* Array index: 0x0FCB */ 0x6B6A,0x5171,
-	/* Array index: 0x0FCB */ 0x6B72,0x6459,
-	/* Array index: 0x0FCB */ 0x6B7F,0x4E3F,
-	/* Array index: 0x0FCB */ 0x6B83,0x5172,
-	/* Array index: 0x0FCB */ 0x6B86,0x5173,
-	/* Array index: 0x0FCB */ 0x6B89,0x5632,
-	/* Array index: 0x0FCB */ 0x6B8A,0x5631,
-	/* Array index: 0x0FCB */ 0x6B96,0x6025,
-	/* Array index: 0x0FCB */ 0x6B98,0x6024,
-	/* Array index: 0x0FCB */ 0x6BA4,0x6D46,
-	/* Array index: 0x0FCB */ 0x6BAE,0x737D,
-	/* Array index: 0x0FCB */ 0x6BAF,0x7658,
-	/* Array index: 0x0FCB */ 0x6BB2,0x7A73,
-	/* Array index: 0x0FCB */ 0x6BB5,0x5174,
-	/* Array index: 0x0FCB */ 0x6BB7,0x5633,
-	/* Array index: 0x0FCB */ 0x6BBA,0x5B44,
-	/* Array index: 0x0FCB */ 0x6BBC,0x6026,
-	/* Array index: 0x0FCB */ 0x6BBF,0x645B,
-	/* Array index: 0x0FCB */ 0x6BC0,0x645A,
-	/* Array index: 0x0FCB */ 0x6BC5,0x6D47,
-	/* Array index: 0x0FCB */ 0x6BC6,0x6D48,
-	/* Array index: 0x0FCB */ 0x6BCB,0x4551,
-	/* Array index: 0x0FCB */ 0x6BCD,0x4660,
-	/* Array index: 0x0FCB */ 0x6BCF,0x4A64,
-	/* Array index: 0x0FCB */ 0x6BD7,0x5176,
-	/* Array index: 0x0FCB */ 0x6BDA,0x737E,
-	/* Array index: 0x0FCB */ 0x6BDB,0x4553,
-	/* Array index: 0x0FCB */ 0x6BEB,0x5B45,
-	/* Array index: 0x0FCB */ 0x6BEC,0x5B46,
-	/* Array index: 0x0FCB */ 0x6BEF,0x6027,
-	/* Array index: 0x0FCB */ 0x6BFD,0x645D,
-	/* Array index: 0x0FCB */ 0x6C05,0x7126,
-	/* Array index: 0x0FCB */ 0x6C08,0x7421,
-	/* Array index: 0x0FCB */ 0x6C16,0x483C,
-	/* Array index: 0x0FCB */ 0x6C1B,0x4E41,
-	/* Array index: 0x0FCB */ 0x6C1F,0x5177,
-	/* Array index: 0x0FCB */ 0x6C33,0x693B,
-	/* Array index: 0x0FCB */ 0x6C34,0x4555,
-	/* Array index: 0x0FCB */ 0x6C38,0x4663,
-	/* Array index: 0x0FCB */ 0x6C4D,0x4846,
-	/* Array index: 0x0FCB */ 0x6C4E,0x4847,
-	/* Array index: 0x0FCB */ 0x6C50,0x4842,
-	/* Array index: 0x0FCB */ 0x6C55,0x4843,
-	/* Array index: 0x0FCB */ 0x6C57,0x483E,
-	/* Array index: 0x0FCB */ 0x6C59,0x483F,
-	/* Array index: 0x0FCB */ 0x6C68,0x4A72,
-	/* Array index: 0x0FCB */ 0x6C6A,0x4A6D,
-	/* Array index: 0x0FCB */ 0x6C70,0x4A70,
-	/* Array index: 0x0FCB */ 0x6C72,0x4A77,
-	/* Array index: 0x0FCB */ 0x6C74,0x4A79,
-	/* Array index: 0x0FCB */ 0x6C76,0x4A7B,
-	/* Array index: 0x0FCB */ 0x6C7A,0x4A6E,
-	/* Array index: 0x0FCB */ 0x6C90,0x4A6F,
-	/* Array index: 0x0FCB */ 0x6C92,0x4A74,
-	/* Array index: 0x0FCB */ 0x6C94,0x4A7D,
-	/* Array index: 0x0FCB */ 0x6C96,0x4A73,
-	/* Array index: 0x0FCB */ 0x6C98,0x4A7E,
-	/* Array index: 0x0FCB */ 0x6C99,0x4A67,
-	/* Array index: 0x0FCB */ 0x6C9B,0x4A6C,
-	/* Array index: 0x0FCB */ 0x6CAB,0x4E4D,
-	/* Array index: 0x0FCB */ 0x6CAC,0x4E5D,
-	/* Array index: 0x0FCB */ 0x6CAE,0x4E54,
-	/* Array index: 0x0FCB */ 0x6CB1,0x4E45,
-	/* Array index: 0x0FCB */ 0x6CB3,0x4E48,
-	/* Array index: 0x0FCB */ 0x6CC9,0x5178,
-	/* Array index: 0x0FCB */ 0x6CCA,0x4E5C,
-	/* Array index: 0x0FCB */ 0x6CCC,0x4E46,
-	/* Array index: 0x0FCB */ 0x6CDB,0x4E5B,
-	/* Array index: 0x0FCB */ 0x6CDC,0x4E5F,
-	/* Array index: 0x0FCB */ 0x6CE8,0x4E43,
-	/* Array index: 0x0FCB */ 0x6D0B,0x5179,
-	/* Array index: 0x0FCB */ 0x6D0C,0x517E,
-	/* Array index: 0x0FCB */ 0x6D0E,0x5230,
-	/* Array index: 0x0FCB */ 0x6D17,0x5223,
-	/* Array index: 0x0FCB */ 0x6D1B,0x5228,
-	/* Array index: 0x0FCB */ 0x6D1E,0x5222,
-	/* Array index: 0x0FCB */ 0x6D25,0x517D,
-	/* Array index: 0x0FCB */ 0x6D2E,0x522E,
-	/* Array index: 0x0FCB */ 0x6D31,0x5221,
-	/* Array index: 0x0FCB */ 0x6D32,0x517A,
-	/* Array index: 0x0FCB */ 0x6D41,0x517C,
-	/* Array index: 0x0FCB */ 0x6D59,0x5641,
-	/* Array index: 0x0FCB */ 0x6D5A,0x5646,
-	/* Array index: 0x0FCB */ 0x6D65,0x564D,
-	/* Array index: 0x0FCB */ 0x6D66,0x563E,
-	/* Array index: 0x0FCB */ 0x6D69,0x5648,
-	/* Array index: 0x0FCB */ 0x6D6A,0x563A,
-	/* Array index: 0x0FCB */ 0x6D6C,0x5643,
-	/* Array index: 0x0FCB */ 0x6D6E,0x5645,
-	/* Array index: 0x0FCB */ 0x6D74,0x5647,
-	/* Array index: 0x0FCB */ 0x6DAA,0x5B6A,
-	/* Array index: 0x0FCB */ 0x6DAE,0x5B57,
-	/* Array index: 0x0FCB */ 0x6DAF,0x5B55,
-	/* Array index: 0x0FCB */ 0x6DB2,0x5B4C,
-	/* Array index: 0x0FCB */ 0x6DB5,0x5B60,
-	/* Array index: 0x0FCB */ 0x6DB8,0x5B5A,
-	/* Array index: 0x0FCB */ 0x6DBC,0x5B49,
-	/* Array index: 0x0FCB */ 0x6DBF,0x5B6C,
-	/* Array index: 0x0FCB */ 0x6DCB,0x5B54,
-	/* Array index: 0x0FCB */ 0x6DCC,0x5B4E,
-	/* Array index: 0x0FCB */ 0x6DD1,0x5B56,
-	/* Array index: 0x0FCB */ 0x6DD2,0x5B5E,
-	/* Array index: 0x0FCB */ 0x6DDE,0x5B58,
-	/* Array index: 0x0FCB */ 0x6DE1,0x5B4D,
-	/* Array index: 0x0FCB */ 0x6DE4,0x5B4F,
-	/* Array index: 0x0FCB */ 0x6DE6,0x5B6D,
-	/* Array index: 0x0FCB */ 0x6DF1,0x5B65,
-	/* Array index: 0x0FCB */ 0x6DF3,0x5B4A,
-	/* Array index: 0x0FCB */ 0x6DF5,0x5B5C,
-	/* Array index: 0x0FCB */ 0x6E05,0x5B52,
-	/* Array index: 0x0FCB */ 0x6E2C,0x6041,
-	/* Array index: 0x0FCB */ 0x6E2D,0x603B,
-	/* Array index: 0x0FCB */ 0x6E2F,0x602B,
-	/* Array index: 0x0FCB */ 0x6E32,0x602F,
-	/* Array index: 0x0FCB */ 0x6E34,0x603E,
-	/* Array index: 0x0FCB */ 0x6E38,0x602C,
-	/* Array index: 0x0FCB */ 0x6E3A,0x6040,
-	/* Array index: 0x0FCB */ 0x6E3E,0x6044,
-	/* Array index: 0x0FCB */ 0x6E43,0x6042,
-	/* Array index: 0x0FCB */ 0x6E44,0x604A,
-	/* Array index: 0x0FCB */ 0x6E4A,0x6031,
-	/* Array index: 0x0FCB */ 0x6E4D,0x603F,
-	/* Array index: 0x0FCB */ 0x6E4E,0x6048,
-	/* Array index: 0x0FCB */ 0x6E54,0x602D,
-	/* Array index: 0x0FCB */ 0x6E56,0x6039,
-	/* Array index: 0x0FCB */ 0x6E58,0x6037,
-	/* Array index: 0x0FCB */ 0x6E5B,0x6036,
-	/* Array index: 0x0FCB */ 0x6E5F,0x604D,
-	/* Array index: 0x0FCB */ 0x6E63,0x6049,
-	/* Array index: 0x0FCB */ 0x6E67,0x6030,
-	/* Array index: 0x0FCB */ 0x6E69,0x604C,
-	/* Array index: 0x0FCB */ 0x6E6E,0x603A,
-	/* Array index: 0x0FCB */ 0x6E6F,0x603D,
-	/* Array index: 0x0FCB */ 0x6E72,0x604B,
-	/* Array index: 0x0FCB */ 0x6E89,0x6046,
-	/* Array index: 0x0FCB */ 0x6E90,0x6463,
-	/* Array index: 0x0FCB */ 0x6E96,0x646D,
-	/* Array index: 0x0FCB */ 0x6E98,0x6468,
-	/* Array index: 0x0FCB */ 0x6E9C,0x646E,
-	/* Array index: 0x0FCB */ 0x6E9D,0x6464,
-	/* Array index: 0x0FCB */ 0x6EA2,0x645E,
-	/* Array index: 0x0FCB */ 0x6EA5,0x6467,
-	/* Array index: 0x0FCB */ 0x6EA7,0x6472,
-	/* Array index: 0x0FCB */ 0x6EAA,0x6471,
-	/* Array index: 0x0FCB */ 0x6EAB,0x646B,
-	/* Array index: 0x0FCB */ 0x6EAF,0x645F,
-	/* Array index: 0x0FCB */ 0x6EB4,0x6473,
-	/* Array index: 0x0FCB */ 0x6EB6,0x6461,
-	/* Array index: 0x0FCB */ 0x6EBA,0x646A,
-	/* Array index: 0x0FCB */ 0x6EBC,0x6469,
-	/* Array index: 0x0FCB */ 0x6EC2,0x6462,
-	/* Array index: 0x0FCB */ 0x6EC4,0x646F,
-	/* Array index: 0x0FCB */ 0x6EC5,0x6466,
-	/* Array index: 0x0FCB */ 0x6EC7,0x6465,
-	/* Array index: 0x0FCB */ 0x6ECB,0x6045,
-	/* Array index: 0x0FCB */ 0x6ECC,0x6957,
-	/* Array index: 0x0FCB */ 0x6EEC,0x6954,
-	/* Array index: 0x0FCB */ 0x6EEF,0x6949,
-	/* Array index: 0x0FCB */ 0x6EF2,0x6956,
-	/* Array index: 0x0FCB */ 0x6EF4,0x6940,
-	/* Array index: 0x0FCB */ 0x6EF7,0x6958,
-	/* Array index: 0x0FCB */ 0x6F06,0x694A,
-	/* Array index: 0x0FCB */ 0x6F0F,0x6945,
-	/* Array index: 0x0FCB */ 0x6F20,0x6943,
-	/* Array index: 0x0FCB */ 0x6F22,0x6947,
-	/* Array index: 0x0FCB */ 0x6F23,0x694E,
-	/* Array index: 0x0FCB */ 0x6F38,0x694C,
-	/* Array index: 0x0FCB */ 0x6F3E,0x6942,
-	/* Array index: 0x0FCB */ 0x6F3F,0x6D49,
-	/* Array index: 0x0FCB */ 0x6F51,0x6D4C,
-	/* Array index: 0x0FCB */ 0x6F54,0x6D4E,
-	/* Array index: 0x0FCB */ 0x6F58,0x6D59,
-	/* Array index: 0x0FCB */ 0x6F5B,0x6D51,
-	/* Array index: 0x0FCB */ 0x6F5F,0x6D5D,
-	/* Array index: 0x0FCB */ 0x6F60,0x6D5C,
-	/* Array index: 0x0FCB */ 0x6F64,0x6D57,
-	/* Array index: 0x0FCB */ 0x6F66,0x6D4D,
-	/* Array index: 0x0FCB */ 0x6F78,0x6D52,
-	/* Array index: 0x0FCB */ 0x6F7A,0x6D55,
-	/* Array index: 0x0FCB */ 0x6F7C,0x6D4A,
-	/* Array index: 0x0FCB */ 0x6F80,0x742A,
-	/* Array index: 0x0FCB */ 0x6F84,0x6D4B,
-	/* Array index: 0x0FCB */ 0x6F86,0x6D4F,
-	/* Array index: 0x0FCB */ 0x6F88,0x6952,
-	/* Array index: 0x0FCB */ 0x6F8E,0x6D54,
-	/* Array index: 0x0FCB */ 0x6F97,0x6D58,
-	/* Array index: 0x0FCB */ 0x6FA0,0x7133,
-	/* Array index: 0x0FCB */ 0x6FA1,0x7129,
-	/* Array index: 0x0FCB */ 0x6FA4,0x712B,
-	/* Array index: 0x0FCB */ 0x6FA6,0x7132,
-	/* Array index: 0x0FCB */ 0x6FA7,0x712D,
-	/* Array index: 0x0FCB */ 0x6FB1,0x7128,
-	/* Array index: 0x0FCB */ 0x6FB3,0x712E,
-	/* Array index: 0x0FCB */ 0x6FB4,0x7134,
-	/* Array index: 0x0FCB */ 0x6FB6,0x7131,
-	/* Array index: 0x0FCB */ 0x6FB9,0x7130,
-	/* Array index: 0x0FCB */ 0x6FD5,0x742E,
-	/* Array index: 0x0FCB */ 0x6FD8,0x7422,
-	/* Array index: 0x0FCB */ 0x6FDB,0x7426,
-	/* Array index: 0x0FCB */ 0x6FE4,0x7427,
-	/* Array index: 0x0FCB */ 0x6FE9,0x742D,
-	/* Array index: 0x0FCB */ 0x6FFA,0x765D,
-	/* Array index: 0x0FCB */ 0x6FFE,0x765B,
-	/* Array index: 0x0FCB */ 0x7006,0x765C,
-	/* Array index: 0x0FCB */ 0x7009,0x7659,
-	/* Array index: 0x0FCB */ 0x700B,0x765A,
-	/* Array index: 0x0FCB */ 0x700F,0x765F,
-	/* Array index: 0x0FCB */ 0x7011,0x765E,
-	/* Array index: 0x0FCB */ 0x7015,0x7845,
-	/* Array index: 0x0FCB */ 0x7018,0x7846,
-	/* Array index: 0x0FCB */ 0x701A,0x7843,
-	/* Array index: 0x0FCB */ 0x701B,0x7840,
-	/* Array index: 0x0FCB */ 0x701D,0x7844,
-	/* Array index: 0x0FCB */ 0x701F,0x7841,
-	/* Array index: 0x0FCB */ 0x7028,0x7842,
-	/* Array index: 0x0FCB */ 0x7030,0x7975,
-	/* Array index: 0x0FCB */ 0x7032,0x7976,
-	/* Array index: 0x0FCB */ 0x703E,0x7974,
-	/* Array index: 0x0FCB */ 0x704C,0x7A74,
-	/* Array index: 0x0FCB */ 0x7051,0x7B64,
-	/* Array index: 0x0FCB */ 0x7058,0x7B65,
-	/* Array index: 0x0FCB */ 0x705E,0x7C60,
-	/* Array index: 0x0FCB */ 0x7063,0x7D24,
-	/* Array index: 0x0FCB */ 0x7064,0x7D32,
-	/* Array index: 0x0FCB */ 0x706B,0x4556,
-	/* Array index: 0x0FCB */ 0x7070,0x4848,
-	/* Array index: 0x0FCB */ 0x7076,0x4B22,
-	/* Array index: 0x0FCB */ 0x7078,0x4B25,
-	/* Array index: 0x0FCB */ 0x707C,0x4B23,
-	/* Array index: 0x0FCB */ 0x707D,0x4B24,
-	/* Array index: 0x0FCB */ 0x708A,0x4E65,
-	/* Array index: 0x0FCB */ 0x708E,0x4E63,
-	/* Array index: 0x0FCB */ 0x7092,0x4E64,
-	/* Array index: 0x0FCB */ 0x7095,0x4E62,
-	/* Array index: 0x0FCB */ 0x7099,0x4E66,
-	/* Array index: 0x0FCB */ 0x70A4,0x523A,
-	/* Array index: 0x0FCB */ 0x70B3,0x5234,
-	/* Array index: 0x0FCB */ 0x70B8,0x5238,
-	/* Array index: 0x0FCB */ 0x70BA,0x5233,
-	/* Array index: 0x0FCB */ 0x70C8,0x5653,
-	/* Array index: 0x0FCB */ 0x70CA,0x564F,
-	/* Array index: 0x0FCB */ 0x70CF,0x5654,
-	/* Array index: 0x0FCB */ 0x70D8,0x5650,
-	/* Array index: 0x0FCB */ 0x70D9,0x5652,
-	/* Array index: 0x0FCB */ 0x70E4,0x5651,
-	/* Array index: 0x0FCB */ 0x70EF,0x5B72,
-	/* Array index: 0x0FCB */ 0x70F9,0x5B6E,
-	/* Array index: 0x0FCB */ 0x70FD,0x5B71,
-	/* Array index: 0x0FCB */ 0x7109,0x5B6F,
-	/* Array index: 0x0FCB */ 0x710A,0x5B70,
-	/* Array index: 0x0FCB */ 0x7119,0x604E,
-	/* Array index: 0x0FCB */ 0x711A,0x604F,
-	/* Array index: 0x0FCB */ 0x711C,0x6055,
-	/* Array index: 0x0FCB */ 0x7121,0x6052,
-	/* Array index: 0x0FCB */ 0x7126,0x6050,
-	/* Array index: 0x0FCB */ 0x7130,0x6051,
-	/* Array index: 0x0FCB */ 0x7136,0x6053,
-	/* Array index: 0x0FCB */ 0x7146,0x6522,
-	/* Array index: 0x0FCB */ 0x7149,0x6478,
-	/* Array index: 0x0FCB */ 0x714C,0x647D,
-	/* Array index: 0x0FCB */ 0x714E,0x6474,
-	/* Array index: 0x0FCB */ 0x7156,0x6524,
-	/* Array index: 0x0FCB */ 0x7159,0x6475,
-	/* Array index: 0x0FCB */ 0x715C,0x647A,
-	/* Array index: 0x0FCB */ 0x715E,0x6521,
-	/* Array index: 0x0FCB */ 0x716C,0x647B,
-	/* Array index: 0x0FCB */ 0x716E,0x6054,
-	/* Array index: 0x0FCB */ 0x717D,0x695B,
-	/* Array index: 0x0FCB */ 0x7184,0x695D,
-	/* Array index: 0x0FCB */ 0x718A,0x695C,
-	/* Array index: 0x0FCB */ 0x7192,0x695E,
-	/* Array index: 0x0FCB */ 0x7194,0x6959,
-	/* Array index: 0x0FCB */ 0x7199,0x695A,
-	/* Array index: 0x0FCB */ 0x719F,0x6D5E,
-	/* Array index: 0x0FCB */ 0x71A8,0x6D61,
-	/* Array index: 0x0FCB */ 0x71AC,0x6D5F,
-	/* Array index: 0x0FCB */ 0x71B1,0x6D60,
-	/* Array index: 0x0FCB */ 0x71B9,0x713B,
-	/* Array index: 0x0FCB */ 0x71BE,0x7135,
-	/* Array index: 0x0FCB */ 0x71C3,0x713F,
-	/* Array index: 0x0FCB */ 0x71C4,0x7140,
-	/* Array index: 0x0FCB */ 0x71C8,0x7139,
-	/* Array index: 0x0FCB */ 0x71C9,0x7136,
-	/* Array index: 0x0FCB */ 0x71CE,0x713C,
-	/* Array index: 0x0FCB */ 0x71D0,0x7137,
-	/* Array index: 0x0FCB */ 0x71D2,0x7138,
-	/* Array index: 0x0FCB */ 0x71D5,0x713A,
-	/* Array index: 0x0FCB */ 0x71D9,0x713D,
-	/* Array index: 0x0FCB */ 0x71DC,0x713E,
-	/* Array index: 0x0FCB */ 0x71DF,0x7432,
-	/* Array index: 0x0FCB */ 0x71E0,0x7439,
-	/* Array index: 0x0FCB */ 0x71F4,0x7438,
-	/* Array index: 0x0FCB */ 0x71F8,0x7663,
-	/* Array index: 0x0FCB */ 0x71FB,0x7660,
-	/* Array index: 0x0FCB */ 0x71FC,0x7661,
-	/* Array index: 0x0FCB */ 0x71FE,0x7662,
-	/* Array index: 0x0FCB */ 0x7206,0x7847,
-	/* Array index: 0x0FCB */ 0x720D,0x7848,
-	/* Array index: 0x0FCB */ 0x7210,0x7977,
-	/* Array index: 0x0FCB */ 0x721B,0x7A75,
-	/* Array index: 0x0FCB */ 0x7228,0x7D46,
-	/* Array index: 0x0FCB */ 0x722A,0x4557,
-	/* Array index: 0x0FCB */ 0x722C,0x4E67,
-	/* Array index: 0x0FCB */ 0x722D,0x4E68,
-	/* Array index: 0x0FCB */ 0x7230,0x523B,
-	/* Array index: 0x0FCB */ 0x724C,0x6056,
-	/* Array index: 0x0FCB */ 0x7252,0x6526,
-	/* Array index: 0x0FCB */ 0x7256,0x6D62,
-	/* Array index: 0x0FCB */ 0x7258,0x7849,
-	/* Array index: 0x0FCB */ 0x7259,0x455B,
-	/* Array index: 0x0FCB */ 0x725B,0x455C,
-	/* Array index: 0x0FCB */ 0x7267,0x4E6B,
-	/* Array index: 0x0FCB */ 0x7269,0x4E6C,
-	/* Array index: 0x0FCB */ 0x726F,0x523D,
-	/* Array index: 0x0FCB */ 0x7272,0x523C,
-	/* Array index: 0x0FCB */ 0x7274,0x523E,
-	/* Array index: 0x0FCB */ 0x7279,0x5656,
-	/* Array index: 0x0FCB */ 0x727D,0x5B74,
-	/* Array index: 0x0FCB */ 0x7280,0x6058,
-	/* Array index: 0x0FCB */ 0x7281,0x5B75,
-	/* Array index: 0x0FCB */ 0x7284,0x6057,
-	/* Array index: 0x0FCB */ 0x7292,0x6960,
-	/* Array index: 0x0FCB */ 0x7296,0x6961,
-	/* Array index: 0x0FCB */ 0x729B,0x6D63,
-	/* Array index: 0x0FCB */ 0x72A2,0x784A,
-	/* Array index: 0x0FCB */ 0x72A7,0x7A76,
-	/* Array index: 0x0FCB */ 0x72AC,0x455D,
-	/* Array index: 0x0FCB */ 0x72AF,0x4667,
-	/* Array index: 0x0FCB */ 0x72C0,0x4E6D,
-	/* Array index: 0x0FCB */ 0x72C2,0x4B2A,
-	/* Array index: 0x0FCB */ 0x72C4,0x4B29,
-	/* Array index: 0x0FCB */ 0x72CE,0x4E6E,
-	/* Array index: 0x0FCB */ 0x72D0,0x4E71,
-	/* Array index: 0x0FCB */ 0x72D7,0x4E70,
-	/* Array index: 0x0FCB */ 0x72D9,0x4E6F,
-	/* Array index: 0x0FCB */ 0x72E0,0x5240,
-	/* Array index: 0x0FCB */ 0x72E1,0x5241,
-	/* Array index: 0x0FCB */ 0x72E9,0x523F,
-	/* Array index: 0x0FCB */ 0x7313,0x5B79,
-	/* Array index: 0x0FCB */ 0x7316,0x5B78,
-	/* Array index: 0x0FCB */ 0x7319,0x5B7A,
-	/* Array index: 0x0FCB */ 0x731B,0x5B77,
-	/* Array index: 0x0FCB */ 0x731C,0x5B76,
-	/* Array index: 0x0FCB */ 0x7325,0x605A,
-	/* Array index: 0x0FCB */ 0x7329,0x605C,
-	/* Array index: 0x0FCB */ 0x7334,0x605B,
-	/* Array index: 0x0FCB */ 0x7336,0x6059,
-	/* Array index: 0x0FCB */ 0x7337,0x6527,
-	/* Array index: 0x0FCB */ 0x733E,0x652A,
-	/* Array index: 0x0FCB */ 0x733F,0x6529,
-	/* Array index: 0x0FCB */ 0x7344,0x6962,
-	/* Array index: 0x0FCB */ 0x7345,0x6528,
-	/* Array index: 0x0FCB */ 0x734E,0x6D64,
-	/* Array index: 0x0FCB */ 0x7350,0x6963,
-	/* Array index: 0x0FCB */ 0x7357,0x6D65,
-	/* Array index: 0x0FCB */ 0x7368,0x7141,
-	/* Array index: 0x0FCB */ 0x7370,0x743C,
-	/* Array index: 0x0FCB */ 0x7372,0x743D,
-	/* Array index: 0x0FCB */ 0x7375,0x7665,
-	/* Array index: 0x0FCB */ 0x7380,0x7B66,
-	/* Array index: 0x0FCB */ 0x7384,0x4668,
-	/* Array index: 0x0FCB */ 0x7386,0x565C,
-	/* Array index: 0x0FCB */ 0x7387,0x5B7B,
-	/* Array index: 0x0FCB */ 0x7389,0x4669,
-	/* Array index: 0x0FCB */ 0x738B,0x455E,
-	/* Array index: 0x0FCB */ 0x7396,0x4B2B,
-	/* Array index: 0x0FCB */ 0x739F,0x4E74,
-	/* Array index: 0x0FCB */ 0x73A5,0x4E76,
-	/* Array index: 0x0FCB */ 0x73A8,0x4E73,
-	/* Array index: 0x0FCB */ 0x73A9,0x4E72,
-	/* Array index: 0x0FCB */ 0x73AB,0x4E75,
-	/* Array index: 0x0FCB */ 0x73B2,0x5245,
-	/* Array index: 0x0FCB */ 0x73B3,0x5248,
-	/* Array index: 0x0FCB */ 0x73B7,0x5242,
-	/* Array index: 0x0FCB */ 0x73BB,0x5244,
-	/* Array index: 0x0FCB */ 0x73C0,0x5247,
-	/* Array index: 0x0FCB */ 0x73CA,0x5243,
-	/* Array index: 0x0FCB */ 0x73CD,0x5246,
-	/* Array index: 0x0FCB */ 0x73DE,0x5662,
-	/* Array index: 0x0FCB */ 0x73E0,0x5660,
-	/* Array index: 0x0FCB */ 0x73EA,0x5661,
-	/* Array index: 0x0FCB */ 0x73ED,0x565D,
-	/* Array index: 0x0FCB */ 0x73EE,0x565F,
-	/* Array index: 0x0FCB */ 0x73FE,0x5C22,
-	/* Array index: 0x0FCB */ 0x7403,0x5B7E,
-	/* Array index: 0x0FCB */ 0x7405,0x5B7C,
-	/* Array index: 0x0FCB */ 0x7406,0x5C21,
-	/* Array index: 0x0FCB */ 0x7409,0x565E,
-	/* Array index: 0x0FCB */ 0x740A,0x5B7D,
-	/* Array index: 0x0FCB */ 0x740D,0x5C23,
-	/* Array index: 0x0FCB */ 0x741B,0x6066,
-	/* Array index: 0x0FCB */ 0x7422,0x6060,
-	/* Array index: 0x0FCB */ 0x7425,0x6061,
-	/* Array index: 0x0FCB */ 0x7426,0x6067,
-	/* Array index: 0x0FCB */ 0x7428,0x6068,
-	/* Array index: 0x0FCB */ 0x742A,0x605E,
-	/* Array index: 0x0FCB */ 0x742F,0x6065,
-	/* Array index: 0x0FCB */ 0x743A,0x605D,
-	/* Array index: 0x0FCB */ 0x743F,0x6531,
-	/* Array index: 0x0FCB */ 0x7441,0x6530,
-	/* Array index: 0x0FCB */ 0x7455,0x652D,
-	/* Array index: 0x0FCB */ 0x7463,0x6965,
-	/* Array index: 0x0FCB */ 0x7464,0x6964,
-	/* Array index: 0x0FCB */ 0x7469,0x6D66,
-	/* Array index: 0x0FCB */ 0x746A,0x6966,
-	/* Array index: 0x0FCB */ 0x746D,0x6968,
-	/* Array index: 0x0FCB */ 0x746F,0x652B,
-	/* Array index: 0x0FCB */ 0x7470,0x6967,
-	/* Array index: 0x0FCB */ 0x747E,0x6D69,
-	/* Array index: 0x0FCB */ 0x7480,0x6D6A,
-	/* Array index: 0x0FCB */ 0x7483,0x6D68,
-	/* Array index: 0x0FCB */ 0x748B,0x6D67,
-	/* Array index: 0x0FCB */ 0x7498,0x7144,
-	/* Array index: 0x0FCB */ 0x749C,0x7142,
-	/* Array index: 0x0FCB */ 0x749E,0x7146,
-	/* Array index: 0x0FCB */ 0x749F,0x7145,
-	/* Array index: 0x0FCB */ 0x74A3,0x7143,
-	/* Array index: 0x0FCB */ 0x74B0,0x743F,
-	/* Array index: 0x0FCB */ 0x74BD,0x784D,
-	/* Array index: 0x0FCB */ 0x74BF,0x7667,
-	/* Array index: 0x0FCB */ 0x74CA,0x784E,
-	/* Array index: 0x0FCB */ 0x74CF,0x7979,
-	/* Array index: 0x0FCB */ 0x74D4,0x7A78,
-	/* Array index: 0x0FCB */ 0x74D6,0x7A77,
-	/* Array index: 0x0FCB */ 0x74DA,0x7C3C,
-	/* Array index: 0x0FCB */ 0x74DC,0x466A,
-	/* Array index: 0x0FCB */ 0x74E9,0x2322,
-	/* Array index: 0x0FCB */ 0x74F6,0x5C25,
-	/* Array index: 0x0FCB */ 0x74F7,0x5C26,
-	/* Array index: 0x0FCB */ 0x7504,0x6969,
-	/* Array index: 0x0FCB */ 0x750C,0x7148,
-	/* Array index: 0x0FCB */ 0x750D,0x7149,
-	/* Array index: 0x0FCB */ 0x7515,0x7668,
-	/* Array index: 0x0FCB */ 0x7518,0x466C,
-	/* Array index: 0x0FCB */ 0x751A,0x5249,
-	/* Array index: 0x0FCB */ 0x751C,0x5C27,
-	/* Array index: 0x0FCB */ 0x751F,0x466D,
-	/* Array index: 0x0FCB */ 0x7522,0x5C28,
-	/* Array index: 0x0FCB */ 0x7537,0x4B2E,
-	/* Array index: 0x0FCB */ 0x7538,0x4B2F,
-	/* Array index: 0x0FCB */ 0x753D,0x4E77,
-	/* Array index: 0x0FCB */ 0x7554,0x5663,
-	/* Array index: 0x0FCB */ 0x7562,0x5C2B,
-	/* Array index: 0x0FCB */ 0x7565,0x5C29,
-	/* Array index: 0x0FCB */ 0x7566,0x5C2A,
-	/* Array index: 0x0FCB */ 0x756A,0x606C,
-	/* Array index: 0x0FCB */ 0x756B,0x606B,
-	/* Array index: 0x0FCB */ 0x7570,0x5C2C,
-	/* Array index: 0x0FCB */ 0x7576,0x6535,
-	/* Array index: 0x0FCB */ 0x7578,0x6536,
-	/* Array index: 0x0FCB */ 0x757F,0x6D6B,
-	/* Array index: 0x0FCB */ 0x7586,0x7851,
-	/* Array index: 0x0FCB */ 0x7587,0x7850,
-	/* Array index: 0x0FCB */ 0x758A,0x7B68,
-	/* Array index: 0x0FCB */ 0x758B,0x4674,
-	/* Array index: 0x0FCB */ 0x758F,0x5C2D,
-	/* Array index: 0x0FCB */ 0x7591,0x696A,
-	/* Array index: 0x0FCB */ 0x7599,0x4E79,
-	/* Array index: 0x0FCB */ 0x759A,0x4E7A,
-	/* Array index: 0x0FCB */ 0x759D,0x4E78,
-	/* Array index: 0x0FCB */ 0x75AB,0x524F,
-	/* Array index: 0x0FCB */ 0x75B2,0x566B,
-	/* Array index: 0x0FCB */ 0x75B3,0x566C,
-	/* Array index: 0x0FCB */ 0x75B5,0x5C30,
-	/* Array index: 0x0FCB */ 0x75C2,0x5670,
-	/* Array index: 0x0FCB */ 0x75C5,0x5669,
-	/* Array index: 0x0FCB */ 0x75C7,0x566A,
-	/* Array index: 0x0FCB */ 0x75CA,0x5C31,
-	/* Array index: 0x0FCB */ 0x75CD,0x5C32,
-	/* Array index: 0x0FCB */ 0x75D4,0x5C2E,
-	/* Array index: 0x0FCB */ 0x75D5,0x5C2F,
-	/* Array index: 0x0FCB */ 0x75D8,0x6071,
-	/* Array index: 0x0FCB */ 0x75D9,0x6070,
-	/* Array index: 0x0FCB */ 0x75DB,0x606E,
-	/* Array index: 0x0FCB */ 0x75DE,0x6072,
-	/* Array index: 0x0FCB */ 0x75E0,0x6073,
-	/* Array index: 0x0FCB */ 0x75E2,0x606D,
-	/* Array index: 0x0FCB */ 0x75E3,0x606F,
-	/* Array index: 0x0FCB */ 0x75FA,0x653C,
-	/* Array index: 0x0FCB */ 0x7609,0x696E,
-	/* Array index: 0x0FCB */ 0x760B,0x696D,
-	/* Array index: 0x0FCB */ 0x760D,0x696C,
-	/* Array index: 0x0FCB */ 0x7613,0x696F,
-	/* Array index: 0x0FCB */ 0x7634,0x714A,
-	/* Array index: 0x0FCB */ 0x7638,0x714B,
-	/* Array index: 0x0FCB */ 0x763A,0x714C,
-	/* Array index: 0x0FCB */ 0x7642,0x7443,
-	/* Array index: 0x0FCB */ 0x7646,0x7442,
-	/* Array index: 0x0FCB */ 0x764C,0x7444,
-	/* Array index: 0x0FCB */ 0x7652,0x766B,
-	/* Array index: 0x0FCB */ 0x7656,0x7669,
-	/* Array index: 0x0FCB */ 0x7658,0x766A,
-	/* Array index: 0x0FCB */ 0x765F,0x7852,
-	/* Array index: 0x0FCB */ 0x7661,0x7853,
-	/* Array index: 0x0FCB */ 0x7662,0x797A,
-	/* Array index: 0x0FCB */ 0x7665,0x797B,
-	/* Array index: 0x0FCB */ 0x7669,0x7A79,
-	/* Array index: 0x0FCB */ 0x766C,0x7B6A,
-	/* Array index: 0x0FCB */ 0x766E,0x7B69,
-	/* Array index: 0x0FCB */ 0x7671,0x7C61,
-	/* Array index: 0x0FCB */ 0x7672,0x7C62,
-	/* Array index: 0x0FCB */ 0x7678,0x5254,
-	/* Array index: 0x0FCB */ 0x7682,0x4B30,
-	/* Array index: 0x0FCB */ 0x768B,0x5672,
-	/* Array index: 0x0FCB */ 0x768E,0x5C33,
-	/* Array index: 0x0FCB */ 0x7693,0x6077,
-	/* Array index: 0x0FCB */ 0x7696,0x6076,
-	/* Array index: 0x0FCB */ 0x769A,0x6D73,
-	/* Array index: 0x0FCB */ 0x76AE,0x4676,
-	/* Array index: 0x0FCB */ 0x76B0,0x5673,
-	/* Array index: 0x0FCB */ 0x76B4,0x6078,
-	/* Array index: 0x0FCB */ 0x76BA,0x6D74,
-	/* Array index: 0x0FCB */ 0x76BF,0x4677,
-	/* Array index: 0x0FCB */ 0x76D2,0x5C35,
-	/* Array index: 0x0FCB */ 0x76D4,0x5C34,
-	/* Array index: 0x0FCB */ 0x76EA,0x7445,
-	/* Array index: 0x0FCB */ 0x76EE,0x4678,
-	/* Array index: 0x0FCB */ 0x76EF,0x4B31,
-	/* Array index: 0x0FCB */ 0x76F2,0x4E7D,
-	/* Array index: 0x0FCB */ 0x76F4,0x4E7E,
-	/* Array index: 0x0FCB */ 0x76F8,0x525E,
-	/* Array index: 0x0FCB */ 0x76F9,0x525D,
-	/* Array index: 0x0FCB */ 0x76FC,0x5262,
-	/* Array index: 0x0FCB */ 0x76FE,0x5261,
-	/* Array index: 0x0FCB */ 0x7701,0x525C,
-	/* Array index: 0x0FCB */ 0x7707,0x5263,
-	/* Array index: 0x0FCB */ 0x7709,0x525F,
-	/* Array index: 0x0FCB */ 0x770B,0x5260,
-	/* Array index: 0x0FCB */ 0x771F,0x5678,
-	/* Array index: 0x0FCB */ 0x7720,0x5679,
-	/* Array index: 0x0FCB */ 0x7728,0x567A,
-	/* Array index: 0x0FCB */ 0x7729,0x5677,
-	/* Array index: 0x0FCB */ 0x774F,0x607A,
-	/* Array index: 0x0FCB */ 0x775B,0x6542,
-	/* Array index: 0x0FCB */ 0x775C,0x654A,
-	/* Array index: 0x0FCB */ 0x775E,0x6545,
-	/* Array index: 0x0FCB */ 0x7779,0x6547,
-	/* Array index: 0x0FCB */ 0x777D,0x6973,
-	/* Array index: 0x0FCB */ 0x777F,0x6974,
-	/* Array index: 0x0FCB */ 0x7784,0x6972,
-	/* Array index: 0x0FCB */ 0x7787,0x6D77,
-	/* Array index: 0x0FCB */ 0x778B,0x6D7A,
-	/* Array index: 0x0FCB */ 0x778C,0x6D78,
-	/* Array index: 0x0FCB */ 0x778E,0x6D76,
-	/* Array index: 0x0FCB */ 0x7791,0x6D79,
-	/* Array index: 0x0FCB */ 0x77A5,0x7152,
-	/* Array index: 0x0FCB */ 0x77A7,0x744A,
-	/* Array index: 0x0FCB */ 0x77AA,0x7447,
-	/* Array index: 0x0FCB */ 0x77AC,0x7449,
-	/* Array index: 0x0FCB */ 0x77AD,0x744B,
-	/* Array index: 0x0FCB */ 0x77B0,0x7448,
-	/* Array index: 0x0FCB */ 0x77B3,0x7446,
-	/* Array index: 0x0FCB */ 0x77C7,0x7854,
-	/* Array index: 0x0FCB */ 0x77D3,0x7A7A,
-	/* Array index: 0x0FCB */ 0x77D7,0x7C63,
-	/* Array index: 0x0FCB */ 0x77E2,0x467A,
-	/* Array index: 0x0FCB */ 0x77E3,0x4B32,
-	/* Array index: 0x0FCB */ 0x77E5,0x4F21,
-	/* Array index: 0x0FCB */ 0x77E9,0x567B,
-	/* Array index: 0x0FCB */ 0x77F3,0x467B,
-	/* Array index: 0x0FCB */ 0x77FD,0x4F22,
-	/* Array index: 0x0FCB */ 0x7802,0x5265,
-	/* Array index: 0x0FCB */ 0x780C,0x5267,
-	/* Array index: 0x0FCB */ 0x780D,0x5268,
-	/* Array index: 0x0FCB */ 0x7814,0x5266,
-	/* Array index: 0x0FCB */ 0x781D,0x5721,
-	/* Array index: 0x0FCB */ 0x781F,0x5727,
-	/* Array index: 0x0FCB */ 0x7820,0x5726,
-	/* Array index: 0x0FCB */ 0x7825,0x5724,
-	/* Array index: 0x0FCB */ 0x7827,0x567D,
-	/* Array index: 0x0FCB */ 0x782D,0x5725,
-	/* Array index: 0x0FCB */ 0x7830,0x567C,
-	/* Array index: 0x0FCB */ 0x7832,0x5728,
-	/* Array index: 0x0FCB */ 0x7834,0x5722,
-	/* Array index: 0x0FCB */ 0x7837,0x5723,
-	/* Array index: 0x0FCB */ 0x7838,0x567E,
-	/* Array index: 0x0FCB */ 0x7843,0x5C3E,
-	/* Array index: 0x0FCB */ 0x784E,0x5C3F,
-	/* Array index: 0x0FCB */ 0x785D,0x607C,
-	/* Array index: 0x0FCB */ 0x786B,0x5C3D,
-	/* Array index: 0x0FCB */ 0x786C,0x607D,
-	/* Array index: 0x0FCB */ 0x786F,0x607E,
-	/* Array index: 0x0FCB */ 0x787C,0x6555,
-	/* Array index: 0x0FCB */ 0x787F,0x6558,
-	/* Array index: 0x0FCB */ 0x7889,0x6554,
-	/* Array index: 0x0FCB */ 0x788C,0x6553,
-	/* Array index: 0x0FCB */ 0x788E,0x654F,
-	/* Array index: 0x0FCB */ 0x7891,0x6556,
-	/* Array index: 0x0FCB */ 0x7893,0x6557,
-	/* Array index: 0x0FCB */ 0x7897,0x6551,
-	/* Array index: 0x0FCB */ 0x7898,0x6552,
-	/* Array index: 0x0FCB */ 0x789F,0x6977,
-	/* Array index: 0x0FCB */ 0x78A3,0x697B,
-	/* Array index: 0x0FCB */ 0x78A7,0x6978,
-	/* Array index: 0x0FCB */ 0x78A9,0x697A,
-	/* Array index: 0x0FCB */ 0x78B0,0x6550,
-	/* Array index: 0x0FCB */ 0x78B3,0x6979,
-	/* Array index: 0x0FCB */ 0x78BA,0x6D7D,
-	/* Array index: 0x0FCB */ 0x78BC,0x6E23,
-	/* Array index: 0x0FCB */ 0x78BE,0x6E21,
-	/* Array index: 0x0FCB */ 0x78C1,0x6976,
-	/* Array index: 0x0FCB */ 0x78C5,0x6D7C,
-	/* Array index: 0x0FCB */ 0x78CA,0x6D7E,
-	/* Array index: 0x0FCB */ 0x78CB,0x6D7B,
-	/* Array index: 0x0FCB */ 0x78D0,0x6E24,
-	/* Array index: 0x0FCB */ 0x78D5,0x6E22,
-	/* Array index: 0x0FCB */ 0x78DA,0x7154,
-	/* Array index: 0x0FCB */ 0x78E7,0x7156,
-	/* Array index: 0x0FCB */ 0x78E8,0x7153,
-	/* Array index: 0x0FCB */ 0x78EC,0x7155,
-	/* Array index: 0x0FCB */ 0x78EF,0x7450,
-	/* Array index: 0x0FCB */ 0x78F4,0x744F,
-	/* Array index: 0x0FCB */ 0x78F7,0x744D,
-	/* Array index: 0x0FCB */ 0x78FA,0x744E,
-	/* Array index: 0x0FCB */ 0x7901,0x7451,
-	/* Array index: 0x0FCB */ 0x790E,0x7670,
-	/* Array index: 0x0FCB */ 0x7919,0x7855,
-	/* Array index: 0x0FCB */ 0x7926,0x797C,
-	/* Array index: 0x0FCB */ 0x793A,0x467C,
-	/* Array index: 0x0FCB */ 0x793E,0x4F23,
-	/* Array index: 0x0FCB */ 0x7940,0x4F24,
-	/* Array index: 0x0FCB */ 0x7941,0x4F25,
-	/* Array index: 0x0FCB */ 0x7950,0x572A,
-	/* Array index: 0x0FCB */ 0x795A,0x5731,
-	/* Array index: 0x0FCB */ 0x7965,0x5C40,
-	/* Array index: 0x0FCB */ 0x7968,0x5C41,
-	/* Array index: 0x0FCB */ 0x796D,0x5C42,
-	/* Array index: 0x0FCB */ 0x797A,0x6559,
-	/* Array index: 0x0FCB */ 0x797F,0x655A,
-	/* Array index: 0x0FCB */ 0x7981,0x655B,
-	/* Array index: 0x0FCB */ 0x79A6,0x7157,
-	/* Array index: 0x0FCB */ 0x79A7,0x7452,
-	/* Array index: 0x0FCB */ 0x79AA,0x7453,
-	/* Array index: 0x0FCB */ 0x79AE,0x7671,
-	/* Array index: 0x0FCB */ 0x79B1,0x7856,
-	/* Array index: 0x0FCB */ 0x79B3,0x7B6B,
-	/* Array index: 0x0FCB */ 0x79C8,0x4F27,
-	/* Array index: 0x0FCB */ 0x79C9,0x4F26,
-	/* Array index: 0x0FCB */ 0x79CB,0x5271,
-	/* Array index: 0x0FCB */ 0x79D1,0x526F,
-	/* Array index: 0x0FCB */ 0x79D2,0x5270,
-	/* Array index: 0x0FCB */ 0x79D8,0x5738,
-	/* Array index: 0x0FCB */ 0x79DF,0x5735,
-	/* Array index: 0x0FCB */ 0x79FB,0x5C43,
-	/* Array index: 0x0FCB */ 0x7A00,0x6125,
-	/* Array index: 0x0FCB */ 0x7A05,0x6124,
-	/* Array index: 0x0FCB */ 0x7A08,0x6122,
-	/* Array index: 0x0FCB */ 0x7A0B,0x6123,
-	/* Array index: 0x0FCB */ 0x7A0D,0x6121,
-	/* Array index: 0x0FCB */ 0x7A14,0x6561,
-	/* Array index: 0x0FCB */ 0x7A1A,0x655F,
-	/* Array index: 0x0FCB */ 0x7A2E,0x6A21,
-	/* Array index: 0x0FCB */ 0x7A31,0x6A22,
-	/* Array index: 0x0FCB */ 0x7A37,0x6E29,
-	/* Array index: 0x0FCB */ 0x7A46,0x715A,
-	/* Array index: 0x0FCB */ 0x7A57,0x7454,
-	/* Array index: 0x0FCB */ 0x7A69,0x7858,
-	/* Array index: 0x0FCB */ 0x7A6B,0x7857,
-	/* Array index: 0x0FCB */ 0x7A74,0x467E,
-	/* Array index: 0x0FCB */ 0x7A76,0x4B36,
-	/* Array index: 0x0FCB */ 0x7A79,0x4F29,
-	/* Array index: 0x0FCB */ 0x7A7A,0x4F28,
-	/* Array index: 0x0FCB */ 0x7A7F,0x5272,
-	/* Array index: 0x0FCB */ 0x7A81,0x5273,
-	/* Array index: 0x0FCB */ 0x7A84,0x5739,
-	/* Array index: 0x0FCB */ 0x7A88,0x573A,
-	/* Array index: 0x0FCB */ 0x7A92,0x5C44,
-	/* Array index: 0x0FCB */ 0x7A9F,0x6564,
-	/* Array index: 0x0FCB */ 0x7AA0,0x6565,
-	/* Array index: 0x0FCB */ 0x7AA9,0x6A24,
-	/* Array index: 0x0FCB */ 0x7AAA,0x6A23,
-	/* Array index: 0x0FCB */ 0x7AAE,0x6E2C,
-	/* Array index: 0x0FCB */ 0x7AAF,0x6E2B,
-	/* Array index: 0x0FCB */ 0x7ABA,0x715D,
-	/* Array index: 0x0FCB */ 0x7ABF,0x7455,
-	/* Array index: 0x0FCB */ 0x7AC4,0x7675,
-	/* Array index: 0x0FCB */ 0x7AC5,0x7676,
-	/* Array index: 0x0FCB */ 0x7AC7,0x7A22,
-	/* Array index: 0x0FCB */ 0x7ACA,0x7C3D,
-	/* Array index: 0x0FCB */ 0x7ACB,0x4721,
-	/* Array index: 0x0FCB */ 0x7AD9,0x573B,
-	/* Array index: 0x0FCB */ 0x7ADF,0x5D7E,
-	/* Array index: 0x0FCB */ 0x7AE0,0x5D7D,
-	/* Array index: 0x0FCB */ 0x7AE3,0x612A,
-	/* Array index: 0x0FCB */ 0x7AE5,0x6129,
-	/* Array index: 0x0FCB */ 0x7AED,0x6A25,
-	/* Array index: 0x0FCB */ 0x7AEF,0x6A26,
-	/* Array index: 0x0FCB */ 0x7AF6,0x7A23,
-	/* Array index: 0x0FCB */ 0x7AF9,0x484C,
-	/* Array index: 0x0FCB */ 0x7AFA,0x4F2A,
-	/* Array index: 0x0FCB */ 0x7AFD,0x5275,
-	/* Array index: 0x0FCB */ 0x7AFF,0x5274,
-	/* Array index: 0x0FCB */ 0x7B06,0x573C,
-	/* Array index: 0x0FCB */ 0x7B11,0x573D,
-	/* Array index: 0x0FCB */ 0x7B19,0x5C4B,
-	/* Array index: 0x0FCB */ 0x7B1B,0x5C48,
-	/* Array index: 0x0FCB */ 0x7B1E,0x5C4C,
-	/* Array index: 0x0FCB */ 0x7B20,0x5C46,
-	/* Array index: 0x0FCB */ 0x7B26,0x5C4A,
-	/* Array index: 0x0FCB */ 0x7B28,0x5C47,
-	/* Array index: 0x0FCB */ 0x7B2C,0x5C49,
-	/* Array index: 0x0FCB */ 0x7B2E,0x5C4D,
-	/* Array index: 0x0FCB */ 0x7B46,0x612D,
-	/* Array index: 0x0FCB */ 0x7B49,0x612B,
-	/* Array index: 0x0FCB */ 0x7B4B,0x6132,
-	/* Array index: 0x0FCB */ 0x7B60,0x6568,
-	/* Array index: 0x0FCB */ 0x7B67,0x656A,
-	/* Array index: 0x0FCB */ 0x7B6E,0x6569,
-	/* Array index: 0x0FCB */ 0x7B75,0x6A2A,
-	/* Array index: 0x0FCB */ 0x7B77,0x6566,
-	/* Array index: 0x0FCB */ 0x7B84,0x6A31,
-	/* Array index: 0x0FCB */ 0x7B87,0x6A30,
-	/* Array index: 0x0FCB */ 0x7B8B,0x6A29,
-	/* Array index: 0x0FCB */ 0x7B8F,0x6A2E,
-	/* Array index: 0x0FCB */ 0x7B94,0x6A2D,
-	/* Array index: 0x0FCB */ 0x7B95,0x6A28,
-	/* Array index: 0x0FCB */ 0x7B97,0x6A2B,
-	/* Array index: 0x0FCB */ 0x7B9D,0x6A2C,
-	/* Array index: 0x0FCB */ 0x7BA0,0x6E34,
-	/* Array index: 0x0FCB */ 0x7BA1,0x6A27,
-	/* Array index: 0x0FCB */ 0x7BAD,0x6E2D,
-	/* Array index: 0x0FCB */ 0x7BB1,0x6E2E,
-	/* Array index: 0x0FCB */ 0x7BB4,0x6E30,
-	/* Array index: 0x0FCB */ 0x7BB8,0x6A2F,
-	/* Array index: 0x0FCB */ 0x7BC0,0x6567,
-	/* Array index: 0x0FCB */ 0x7BC1,0x6E33,
-	/* Array index: 0x0FCB */ 0x7BC4,0x6E2F,
-	/* Array index: 0x0FCB */ 0x7BC6,0x6E31,
-	/* Array index: 0x0FCB */ 0x7BC7,0x6E32,
-	/* Array index: 0x0FCB */ 0x7BC9,0x7160,
-	/* Array index: 0x0FCB */ 0x7BCC,0x6E35,
-	/* Array index: 0x0FCB */ 0x7BD9,0x715E,
-	/* Array index: 0x0FCB */ 0x7BDB,0x7162,
-	/* Array index: 0x0FCB */ 0x7BE0,0x745B,
-	/* Array index: 0x0FCB */ 0x7BE1,0x7163,
-	/* Array index: 0x0FCB */ 0x7BE4,0x7161,
-	/* Array index: 0x0FCB */ 0x7BE6,0x7165,
-	/* Array index: 0x0FCB */ 0x7BE9,0x7164,
-	/* Array index: 0x0FCB */ 0x7BF7,0x7459,
-	/* Array index: 0x0FCB */ 0x7BFE,0x7458,
-	/* Array index: 0x0FCB */ 0x7C07,0x7456,
-	/* Array index: 0x0FCB */ 0x7C0C,0x745A,
-	/* Array index: 0x0FCB */ 0x7C0D,0x7457,
-	/* Array index: 0x0FCB */ 0x7C11,0x715F,
-	/* Array index: 0x0FCB */ 0x7C1E,0x767A,
-	/* Array index: 0x0FCB */ 0x7C21,0x767C,
-	/* Array index: 0x0FCB */ 0x7C23,0x767B,
-	/* Array index: 0x0FCB */ 0x7C27,0x7678,
-	/* Array index: 0x0FCB */ 0x7C2A,0x7679,
-	/* Array index: 0x0FCB */ 0x7C2B,0x7677,
-	/* Array index: 0x0FCB */ 0x7C37,0x785D,
-	/* Array index: 0x0FCB */ 0x7C38,0x785B,
-	/* Array index: 0x0FCB */ 0x7C43,0x7A25,
-	/* Array index: 0x0FCB */ 0x7C4C,0x7A24,
-	/* Array index: 0x0FCB */ 0x7C4D,0x7A26,
-	/* Array index: 0x0FCB */ 0x7C50,0x7A7B,
-	/* Array index: 0x0FCB */ 0x7C6C,0x7D25,
-	/* Array index: 0x0FCB */ 0x7C6E,0x7D26,
-	/* Array index: 0x0FCB */ 0x7C72,0x7D4B,
-	/* Array index: 0x0FCB */ 0x7C73,0x484D,
-	/* Array index: 0x0FCB */ 0x7C7D,0x5276,
-	/* Array index: 0x0FCB */ 0x7C89,0x573E,
-	/* Array index: 0x0FCB */ 0x7C92,0x5C4E,
-	/* Array index: 0x0FCB */ 0x7C95,0x5C50,
-	/* Array index: 0x0FCB */ 0x7C97,0x5C4F,
-	/* Array index: 0x0FCB */ 0x7C9F,0x6135,
-	/* Array index: 0x0FCB */ 0x7CA5,0x6136,
-	/* Array index: 0x0FCB */ 0x7CB1,0x656B,
-	/* Array index: 0x0FCB */ 0x7CB3,0x656C,
-	/* Array index: 0x0FCB */ 0x7CB5,0x656D,
-	/* Array index: 0x0FCB */ 0x7CB9,0x6A32,
-	/* Array index: 0x0FCB */ 0x7CBD,0x6A33,
-	/* Array index: 0x0FCB */ 0x7CBE,0x6A34,
-	/* Array index: 0x0FCB */ 0x7CCA,0x6E36,
-	/* Array index: 0x0FCB */ 0x7CCE,0x2323,
-	/* Array index: 0x0FCB */ 0x7CD5,0x7166,
-	/* Array index: 0x0FCB */ 0x7CD6,0x7167,
-	/* Array index: 0x0FCB */ 0x7CD9,0x7461,
-	/* Array index: 0x0FCB */ 0x7CE7,0x767D,
-	/* Array index: 0x0FCB */ 0x7CEF,0x7A27,
-	/* Array index: 0x0FCB */ 0x7CF0,0x7A28,
-	/* Array index: 0x0FCB */ 0x7CF8,0x484E,
-	/* Array index: 0x0FCB */ 0x7CFB,0x4B37,
-	/* Array index: 0x0FCB */ 0x7CFE,0x4F2B,
-	/* Array index: 0x0FCB */ 0x7D00,0x5279,
-	/* Array index: 0x0FCB */ 0x7D10,0x5746,
-	/* Array index: 0x0FCB */ 0x7D14,0x5745,
-	/* Array index: 0x0FCB */ 0x7D15,0x5747,
-	/* Array index: 0x0FCB */ 0x7D2B,0x613B,
-	/* Array index: 0x0FCB */ 0x7D39,0x5C55,
-	/* Array index: 0x0FCB */ 0x7D3C,0x5C56,
-	/* Array index: 0x0FCB */ 0x7D50,0x6138,
-	/* Array index: 0x0FCB */ 0x7D55,0x613A,
-	/* Array index: 0x0FCB */ 0x7D5B,0x6573,
-	/* Array index: 0x0FCB */ 0x7D5E,0x6137,
-	/* Array index: 0x0FCB */ 0x7D61,0x613E,
-	/* Array index: 0x0FCB */ 0x7D62,0x6140,
-	/* Array index: 0x0FCB */ 0x7D66,0x613F,
-	/* Array index: 0x0FCB */ 0x7D68,0x6139,
-	/* Array index: 0x0FCB */ 0x7D79,0x656F,
-	/* Array index: 0x0FCB */ 0x7D81,0x6571,
-	/* Array index: 0x0FCB */ 0x7D8F,0x6572,
-	/* Array index: 0x0FCB */ 0x7D91,0x6570,
-	/* Array index: 0x0FCB */ 0x7D93,0x656E,
-	/* Array index: 0x0FCB */ 0x7D9C,0x6A37,
-	/* Array index: 0x0FCB */ 0x7D9E,0x6E43,
-	/* Array index: 0x0FCB */ 0x7DA0,0x6A3A,
-	/* Array index: 0x0FCB */ 0x7DA2,0x6A40,
-	/* Array index: 0x0FCB */ 0x7DB8,0x6A43,
-	/* Array index: 0x0FCB */ 0x7DC7,0x6A46,
-	/* Array index: 0x0FCB */ 0x7DCA,0x6A3B,
-	/* Array index: 0x0FCB */ 0x7DD2,0x6A45,
-	/* Array index: 0x0FCB */ 0x7DE3,0x6E3F,
-	/* Array index: 0x0FCB */ 0x7DE8,0x6E3E,
-	/* Array index: 0x0FCB */ 0x7DE9,0x6E42,
-	/* Array index: 0x0FCB */ 0x7DEC,0x6E3C,
-	/* Array index: 0x0FCB */ 0x7DEF,0x6E39,
-	/* Array index: 0x0FCB */ 0x7DF2,0x6E45,
-	/* Array index: 0x0FCB */ 0x7DF4,0x6E38,
-	/* Array index: 0x0FCB */ 0x7DF9,0x6E46,
-	/* Array index: 0x0FCB */ 0x7DFB,0x6E3A,
-	/* Array index: 0x0FCB */ 0x7E10,0x7170,
-	/* Array index: 0x0FCB */ 0x7E11,0x7169,
-	/* Array index: 0x0FCB */ 0x7E1B,0x716B,
-	/* Array index: 0x0FCB */ 0x7E1D,0x716E,
-	/* Array index: 0x0FCB */ 0x7E1E,0x716D,
-	/* Array index: 0x0FCB */ 0x7E23,0x716C,
-	/* Array index: 0x0FCB */ 0x7E2B,0x7469,
-	/* Array index: 0x0FCB */ 0x7E52,0x7725,
-	/* Array index: 0x0FCB */ 0x7E54,0x767E,
-	/* Array index: 0x0FCB */ 0x7E55,0x7721,
-	/* Array index: 0x0FCB */ 0x7E59,0x7726,
-	/* Array index: 0x0FCB */ 0x7E5A,0x7723,
-	/* Array index: 0x0FCB */ 0x7E5E,0x7722,
-	/* Array index: 0x0FCB */ 0x7E61,0x7724,
-	/* Array index: 0x0FCB */ 0x7E73,0x7864,
-	/* Array index: 0x0FCB */ 0x7E79,0x7861,
-	/* Array index: 0x0FCB */ 0x7E7C,0x7A2B,
-	/* Array index: 0x0FCB */ 0x7E7D,0x7A2A,
-	/* Array index: 0x0FCB */ 0x7E82,0x7A2C,
-	/* Array index: 0x0FCB */ 0x7E8C,0x7A7D,
-	/* Array index: 0x0FCB */ 0x7E8F,0x7A7C,
-	/* Array index: 0x0FCB */ 0x7E93,0x7C41,
-	/* Array index: 0x0FCB */ 0x7E94,0x7C43,
-	/* Array index: 0x0FCB */ 0x7E96,0x7C42,
-	/* Array index: 0x0FCB */ 0x7E9C,0x7D39,
-	/* Array index: 0x0FCB */ 0x7F36,0x484F,
-	/* Array index: 0x0FCB */ 0x7F38,0x527E,
-	/* Array index: 0x0FCB */ 0x7F3A,0x574D,
-	/* Array index: 0x0FCB */ 0x7F3D,0x5C5F,
-	/* Array index: 0x0FCB */ 0x7F44,0x7474,
-	/* Array index: 0x0FCB */ 0x7F48,0x7727,
-	/* Array index: 0x0FCB */ 0x7F4C,0x7A2D,
-	/* Array index: 0x0FCB */ 0x7F50,0x7C64,
-	/* Array index: 0x0FCB */ 0x7F54,0x4F2C,
-	/* Array index: 0x0FCB */ 0x7F55,0x4B38,
-	/* Array index: 0x0FCB */ 0x7F5F,0x574E,
-	/* Array index: 0x0FCB */ 0x7F69,0x6575,
-	/* Array index: 0x0FCB */ 0x7F6A,0x6576,
-	/* Array index: 0x0FCB */ 0x7F6E,0x6574,
-	/* Array index: 0x0FCB */ 0x7F70,0x6A48,
-	/* Array index: 0x0FCB */ 0x7F72,0x6577,
-	/* Array index: 0x0FCB */ 0x7F75,0x6E47,
-	/* Array index: 0x0FCB */ 0x7F77,0x6E48,
-	/* Array index: 0x0FCB */ 0x7F79,0x7171,
-	/* Array index: 0x0FCB */ 0x7F85,0x7865,
-	/* Array index: 0x0FCB */ 0x7F94,0x574F,
-	/* Array index: 0x0FCB */ 0x7F9A,0x5C61,
-	/* Array index: 0x0FCB */ 0x7F9E,0x5C60,
-	/* Array index: 0x0FCB */ 0x7FA4,0x657A,
-	/* Array index: 0x0FCB */ 0x7FA8,0x6579,
-	/* Array index: 0x0FCB */ 0x7FA9,0x6578,
-	/* Array index: 0x0FCB */ 0x7FAF,0x6E49,
-	/* Array index: 0x0FCB */ 0x7FB2,0x7172,
-	/* Array index: 0x0FCB */ 0x7FB6,0x7866,
-	/* Array index: 0x0FCB */ 0x7FB8,0x7868,
-	/* Array index: 0x0FCB */ 0x7FB9,0x7867,
-	/* Array index: 0x0FCB */ 0x7FBC,0x7A7E,
-	/* Array index: 0x0FCB */ 0x7FBD,0x4851,
-	/* Array index: 0x0FCB */ 0x7FBF,0x5322,
-	/* Array index: 0x0FCB */ 0x7FC1,0x5751,
-	/* Array index: 0x0FCB */ 0x7FC5,0x5750,
-	/* Array index: 0x0FCB */ 0x7FCC,0x5C62,
-	/* Array index: 0x0FCB */ 0x7FCE,0x5C63,
-	/* Array index: 0x0FCB */ 0x7FD2,0x5C64,
-	/* Array index: 0x0FCB */ 0x7FD4,0x6144,
-	/* Array index: 0x0FCB */ 0x7FD5,0x6145,
-	/* Array index: 0x0FCB */ 0x7FE9,0x6E4A,
-	/* Array index: 0x0FCB */ 0x7FEE,0x7175,
-	/* Array index: 0x0FCB */ 0x7FF0,0x7173,
-	/* Array index: 0x0FCB */ 0x7FF1,0x7174,
-	/* Array index: 0x0FCB */ 0x7FF3,0x7475,
-	/* Array index: 0x0FCB */ 0x7FF9,0x7728,
-	/* Array index: 0x0FCB */ 0x7FFB,0x7729,
-	/* Array index: 0x0FCB */ 0x7FFC,0x7476,
-	/* Array index: 0x0FCB */ 0x801C,0x5C65,
-	/* Array index: 0x0FCB */ 0x8026,0x6E4B,
-	/* Array index: 0x0FCB */ 0x8028,0x7176,
-	/* Array index: 0x0FCB */ 0x8033,0x4856,
-	/* Array index: 0x0FCB */ 0x8036,0x5326,
-	/* Array index: 0x0FCB */ 0x803D,0x5758,
-	/* Array index: 0x0FCB */ 0x803F,0x5759,
-	/* Array index: 0x0FCB */ 0x8046,0x5C67,
-	/* Array index: 0x0FCB */ 0x804A,0x5C66,
-	/* Array index: 0x0FCB */ 0x8052,0x6147,
-	/* Array index: 0x0FCB */ 0x8056,0x657B,
-	/* Array index: 0x0FCB */ 0x8058,0x657C,
-	/* Array index: 0x0FCB */ 0x805A,0x6A4D,
-	/* Array index: 0x0FCB */ 0x805E,0x6A4C,
-	/* Array index: 0x0FCB */ 0x8093,0x4B3A,
-	/* Array index: 0x0FCB */ 0x8096,0x4B39,
-	/* Array index: 0x0FCB */ 0x8098,0x4B3C,
-	/* Array index: 0x0FCB */ 0x809A,0x4B3E,
-	/* Array index: 0x0FCB */ 0x809B,0x4B3D,
-	/* Array index: 0x0FCB */ 0x809D,0x4B3B,
-	/* Array index: 0x0FCB */ 0x80A1,0x4F34,
-	/* Array index: 0x0FCB */ 0x80A2,0x4F32,
-	/* Array index: 0x0FCB */ 0x80A5,0x4F31,
-	/* Array index: 0x0FCB */ 0x80AF,0x4F39,
-	/* Array index: 0x0FCB */ 0x80B1,0x4F33,
-	/* Array index: 0x0FCB */ 0x80B2,0x4B3F,
-	/* Array index: 0x0FCB */ 0x80B4,0x4F37,
-	/* Array index: 0x0FCB */ 0x80BA,0x4F30,
-	/* Array index: 0x0FCB */ 0x80C3,0x532A,
-	/* Array index: 0x0FCB */ 0x80C4,0x532B,
-	/* Array index: 0x0FCB */ 0x80CC,0x532C,
-	/* Array index: 0x0FCB */ 0x80CE,0x532F,
-	/* Array index: 0x0FCB */ 0x80D6,0x5327,
-	/* Array index: 0x0FCB */ 0x80E1,0x532D,
-	/* Array index: 0x0FCB */ 0x80E4,0x5331,
-	/* Array index: 0x0FCB */ 0x80E5,0x5328,
-	/* Array index: 0x0FCB */ 0x80F8,0x5761,
-	/* Array index: 0x0FCB */ 0x80FC,0x5766,
-	/* Array index: 0x0FCB */ 0x80FD,0x5764,
-	/* Array index: 0x0FCB */ 0x8102,0x575B,
-	/* Array index: 0x0FCB */ 0x8105,0x575D,
-	/* Array index: 0x0FCB */ 0x8106,0x5760,
-	/* Array index: 0x0FCB */ 0x8108,0x5763,
-	/* Array index: 0x0FCB */ 0x810A,0x5765,
-	/* Array index: 0x0FCB */ 0x8116,0x5C69,
-	/* Array index: 0x0FCB */ 0x8123,0x5C6A,
-	/* Array index: 0x0FCB */ 0x8124,0x5C6E,
-	/* Array index: 0x0FCB */ 0x8129,0x5C6C,
-	/* Array index: 0x0FCB */ 0x812B,0x5C6B,
-	/* Array index: 0x0FCB */ 0x812F,0x5C68,
-	/* Array index: 0x0FCB */ 0x8130,0x5C6D,
-	/* Array index: 0x0FCB */ 0x8139,0x614E,
-	/* Array index: 0x0FCB */ 0x813E,0x6150,
-	/* Array index: 0x0FCB */ 0x8146,0x614F,
-	/* Array index: 0x0FCB */ 0x814B,0x614B,
-	/* Array index: 0x0FCB */ 0x814C,0x6151,
-	/* Array index: 0x0FCB */ 0x814E,0x614D,
-	/* Array index: 0x0FCB */ 0x8165,0x6624,
-	/* Array index: 0x0FCB */ 0x8166,0x662A,
-	/* Array index: 0x0FCB */ 0x816B,0x6627,
-	/* Array index: 0x0FCB */ 0x816E,0x6625,
-	/* Array index: 0x0FCB */ 0x817F,0x6A54,
-	/* Array index: 0x0FCB */ 0x8180,0x6A50,
-	/* Array index: 0x0FCB */ 0x8182,0x6A55,
-	/* Array index: 0x0FCB */ 0x8188,0x6A52,
-	/* Array index: 0x0FCB */ 0x818A,0x6A53,
-	/* Array index: 0x0FCB */ 0x818F,0x6A51,
-	/* Array index: 0x0FCB */ 0x81A0,0x6E4F,
-	/* Array index: 0x0FCB */ 0x81A8,0x7179,
-	/* Array index: 0x0FCB */ 0x81A9,0x7178,
-	/* Array index: 0x0FCB */ 0x81B3,0x7177,
-	/* Array index: 0x0FCB */ 0x81BA,0x747E,
-	/* Array index: 0x0FCB */ 0x81C6,0x747C,
-	/* Array index: 0x0FCB */ 0x81C9,0x7525,
-	/* Array index: 0x0FCB */ 0x81CD,0x772C,
-	/* Array index: 0x0FCB */ 0x81CF,0x772D,
-	/* Array index: 0x0FCB */ 0x81D8,0x7869,
-	/* Array index: 0x0FCB */ 0x81DA,0x7A2F,
-	/* Array index: 0x0FCB */ 0x81DF,0x7B70,
-	/* Array index: 0x0FCB */ 0x81E2,0x7C44,
-	/* Array index: 0x0FCB */ 0x81E3,0x485B,
-	/* Array index: 0x0FCB */ 0x81E5,0x4F3A,
-	/* Array index: 0x0FCB */ 0x81E7,0x6A56,
-	/* Array index: 0x0FCB */ 0x81E8,0x7527,
-	/* Array index: 0x0FCB */ 0x81EA,0x485C,
-	/* Array index: 0x0FCB */ 0x81EC,0x5769,
-	/* Array index: 0x0FCB */ 0x81ED,0x5768,
-	/* Array index: 0x0FCB */ 0x81F3,0x485D,
-	/* Array index: 0x0FCB */ 0x81F4,0x5333,
-	/* Array index: 0x0FCB */ 0x8210,0x576B,
-	/* Array index: 0x0FCB */ 0x8212,0x6154,
-	/* Array index: 0x0FCB */ 0x8214,0x6A59,
-	/* Array index: 0x0FCB */ 0x8222,0x5334,
-	/* Array index: 0x0FCB */ 0x8247,0x662C,
-	/* Array index: 0x0FCB */ 0x824B,0x6A5B,
-	/* Array index: 0x0FCB */ 0x8258,0x717C,
-	/* Array index: 0x0FCB */ 0x8259,0x717D,
-	/* Array index: 0x0FCB */ 0x8266,0x7A30,
-	/* Array index: 0x0FCB */ 0x8277,0x7C6C,
-	/* Array index: 0x0FCB */ 0x827E,0x4864,
-	/* Array index: 0x0FCB */ 0x828B,0x4B42,
-	/* Array index: 0x0FCB */ 0x828D,0x4B43,
-	/* Array index: 0x0FCB */ 0x8292,0x4B41,
-	/* Array index: 0x0FCB */ 0x8299,0x4F3F,
-	/* Array index: 0x0FCB */ 0x829D,0x4F3E,
-	/* Array index: 0x0FCB */ 0x829F,0x4F42,
-	/* Array index: 0x0FCB */ 0x82A3,0x4F49,
-	/* Array index: 0x0FCB */ 0x82A5,0x4F46,
-	/* Array index: 0x0FCB */ 0x82D7,0x5340,
-	/* Array index: 0x0FCB */ 0x82EF,0x5349,
-	/* Array index: 0x0FCB */ 0x82F1,0x5341,
-	/* Array index: 0x0FCB */ 0x8309,0x533E,
-	/* Array index: 0x0FCB */ 0x8317,0x577E,
-	/* Array index: 0x0FCB */ 0x8328,0x5823,
-	/* Array index: 0x0FCB */ 0x832B,0x5771,
-	/* Array index: 0x0FCB */ 0x8340,0x5821,
-	/* Array index: 0x0FCB */ 0x8343,0x5824,
-	/* Array index: 0x0FCB */ 0x8349,0x5777,
-	/* Array index: 0x0FCB */ 0x834A,0x5774,
-	/* Array index: 0x0FCB */ 0x834F,0x577A,
-	/* Array index: 0x0FCB */ 0x8350,0x5776,
-	/* Array index: 0x0FCB */ 0x8352,0x5772,
-	/* Array index: 0x0FCB */ 0x8354,0x5773,
-	/* Array index: 0x0FCB */ 0x8377,0x5D23,
-	/* Array index: 0x0FCB */ 0x8378,0x5C77,
-	/* Array index: 0x0FCB */ 0x837B,0x5D24,
-	/* Array index: 0x0FCB */ 0x837C,0x5D25,
-	/* Array index: 0x0FCB */ 0x8386,0x5D26,
-	/* Array index: 0x0FCB */ 0x8389,0x5D21,
-	/* Array index: 0x0FCB */ 0x838A,0x5C7D,
-	/* Array index: 0x0FCB */ 0x838E,0x5C74,
-	/* Array index: 0x0FCB */ 0x8392,0x5C7C,
-	/* Array index: 0x0FCB */ 0x8393,0x5C7E,
-	/* Array index: 0x0FCB */ 0x8396,0x5C79,
-	/* Array index: 0x0FCB */ 0x8398,0x5C76,
-	/* Array index: 0x0FCB */ 0x839E,0x5C75,
-	/* Array index: 0x0FCB */ 0x83A0,0x5D22,
-	/* Array index: 0x0FCB */ 0x83A2,0x5C78,
-	/* Array index: 0x0FCB */ 0x83A7,0x5D27,
-	/* Array index: 0x0FCB */ 0x83AB,0x5C7B,
-	/* Array index: 0x0FCB */ 0x83BD,0x5C7A,
-	/* Array index: 0x0FCB */ 0x83C1,0x615D,
-	/* Array index: 0x0FCB */ 0x83C5,0x615B,
-	/* Array index: 0x0FCB */ 0x83CA,0x6168,
-	/* Array index: 0x0FCB */ 0x83CC,0x6165,
-	/* Array index: 0x0FCB */ 0x83D4,0x616E,
-	/* Array index: 0x0FCB */ 0x83DC,0x616C,
-	/* Array index: 0x0FCB */ 0x83DF,0x616F,
-	/* Array index: 0x0FCB */ 0x83E0,0x615A,
-	/* Array index: 0x0FCB */ 0x83E9,0x6156,
-	/* Array index: 0x0FCB */ 0x83F8,0x6158,
-	/* Array index: 0x0FCB */ 0x83FD,0x6166,
-	/* Array index: 0x0FCB */ 0x8403,0x6157,
-	/* Array index: 0x0FCB */ 0x8404,0x616B,
-	/* Array index: 0x0FCB */ 0x8407,0x616D,
-	/* Array index: 0x0FCB */ 0x842C,0x655C,
-	/* Array index: 0x0FCB */ 0x8431,0x6630,
-	/* Array index: 0x0FCB */ 0x8435,0x6638,
-	/* Array index: 0x0FCB */ 0x8438,0x6169,
-	/* Array index: 0x0FCB */ 0x843C,0x6637,
-	/* Array index: 0x0FCB */ 0x843D,0x662F,
-	/* Array index: 0x0FCB */ 0x8446,0x663D,
-	/* Array index: 0x0FCB */ 0x8449,0x6634,
-	/* Array index: 0x0FCB */ 0x8457,0x6161,
-	/* Array index: 0x0FCB */ 0x845B,0x6636,
-	/* Array index: 0x0FCB */ 0x8461,0x6639,
-	/* Array index: 0x0FCB */ 0x8463,0x663A,
-	/* Array index: 0x0FCB */ 0x8466,0x6632,
-	/* Array index: 0x0FCB */ 0x8475,0x6631,
-	/* Array index: 0x0FCB */ 0x8477,0x662E,
-	/* Array index: 0x0FCB */ 0x8482,0x662D,
-	/* Array index: 0x0FCB */ 0x8490,0x6A68,
-	/* Array index: 0x0FCB */ 0x8499,0x6A60,
-	/* Array index: 0x0FCB */ 0x849C,0x6A63,
-	/* Array index: 0x0FCB */ 0x849E,0x6A61,
-	/* Array index: 0x0FCB */ 0x84B2,0x6A62,
-	/* Array index: 0x0FCB */ 0x84B8,0x6A65,
-	/* Array index: 0x0FCB */ 0x84BC,0x6A69,
-	/* Array index: 0x0FCB */ 0x84BF,0x6A5D,
-	/* Array index: 0x0FCB */ 0x84C0,0x6A66,
-	/* Array index: 0x0FCB */ 0x84C4,0x6A5F,
-	/* Array index: 0x0FCB */ 0x84C6,0x6A5E,
-	/* Array index: 0x0FCB */ 0x84D1,0x6A6A,
-	/* Array index: 0x0FCB */ 0x84D3,0x6A67,
-	/* Array index: 0x0FCB */ 0x84EC,0x6E5D,
-	/* Array index: 0x0FCB */ 0x84EE,0x6E55,
-	/* Array index: 0x0FCB */ 0x84FF,0x6E5F,
-	/* Array index: 0x0FCB */ 0x8506,0x6E60,
-	/* Array index: 0x0FCB */ 0x8511,0x6E59,
-	/* Array index: 0x0FCB */ 0x8513,0x6E58,
-	/* Array index: 0x0FCB */ 0x8514,0x6E5C,
-	/* Array index: 0x0FCB */ 0x8517,0x6E52,
-	/* Array index: 0x0FCB */ 0x851A,0x6E54,
-	/* Array index: 0x0FCB */ 0x8521,0x6E5B,
-	/* Array index: 0x0FCB */ 0x8523,0x6E5A,
-	/* Array index: 0x0FCB */ 0x8525,0x6E5E,
-	/* Array index: 0x0FCB */ 0x852C,0x6E56,
-	/* Array index: 0x0FCB */ 0x852D,0x6E57,
-	/* Array index: 0x0FCB */ 0x853D,0x6E53,
-	/* Array index: 0x0FCB */ 0x8543,0x7225,
-	/* Array index: 0x0FCB */ 0x8559,0x7221,
-	/* Array index: 0x0FCB */ 0x855E,0x7229,
-	/* Array index: 0x0FCB */ 0x856D,0x7227,
-	/* Array index: 0x0FCB */ 0x857E,0x752C,
-	/* Array index: 0x0FCB */ 0x8584,0x752B,
-	/* Array index: 0x0FCB */ 0x8587,0x7532,
-	/* Array index: 0x0FCB */ 0x858A,0x7534,
-	/* Array index: 0x0FCB */ 0x8591,0x752E,
-	/* Array index: 0x0FCB */ 0x8594,0x752F,
-	/* Array index: 0x0FCB */ 0x859B,0x7531,
-	/* Array index: 0x0FCB */ 0x859C,0x752D,
-	/* Array index: 0x0FCB */ 0x85AF,0x7530,
-	/* Array index: 0x0FCB */ 0x85B0,0x7734,
-	/* Array index: 0x0FCB */ 0x85B9,0x7736,
-	/* Array index: 0x0FCB */ 0x85BA,0x7735,
-	/* Array index: 0x0FCB */ 0x85C9,0x7733,
-	/* Array index: 0x0FCB */ 0x85CD,0x7731,
-	/* Array index: 0x0FCB */ 0x85CF,0x772F,
-	/* Array index: 0x0FCB */ 0x85D0,0x7732,
-	/* Array index: 0x0FCB */ 0x85D5,0x786D,
-	/* Array index: 0x0FCB */ 0x85DD,0x786B,
-	/* Array index: 0x0FCB */ 0x85E4,0x786E,
-	/* Array index: 0x0FCB */ 0x85E5,0x786F,
-	/* Array index: 0x0FCB */ 0x85E9,0x786A,
-	/* Array index: 0x0FCB */ 0x85EA,0x786C,
-	/* Array index: 0x0FCB */ 0x8606,0x7A35,
-	/* Array index: 0x0FCB */ 0x8607,0x7A37,
-	/* Array index: 0x0FCB */ 0x860A,0x7A38,
-	/* Array index: 0x0FCB */ 0x860B,0x7A36,
-	/* Array index: 0x0FCB */ 0x8611,0x7A33,
-	/* Array index: 0x0FCB */ 0x8617,0x7B21,
-	/* Array index: 0x0FCB */ 0x861A,0x7B23,
-	/* Array index: 0x0FCB */ 0x862D,0x7B22,
-	/* Array index: 0x0FCB */ 0x8638,0x7C45,
-	/* Array index: 0x0FCB */ 0x863F,0x7C46,
-	/* Array index: 0x0FCB */ 0x864E,0x4F4D,
-	/* Array index: 0x0FCB */ 0x8650,0x534B,
-	/* Array index: 0x0FCB */ 0x8654,0x5825,
-	/* Array index: 0x0FCB */ 0x8655,0x5D28,
-	/* Array index: 0x0FCB */ 0x8667,0x7536,
-	/* Array index: 0x0FCB */ 0x866B,0x4865,
-	/* Array index: 0x0FCB */ 0x8671,0x4F4E,
-	/* Array index: 0x0FCB */ 0x868A,0x5826,
-	/* Array index: 0x0FCB */ 0x868C,0x582B,
-	/* Array index: 0x0FCB */ 0x8693,0x5828,
-	/* Array index: 0x0FCB */ 0x869C,0x582D,
-	/* Array index: 0x0FCB */ 0x86A3,0x582C,
-	/* Array index: 0x0FCB */ 0x86A4,0x5829,
-	/* Array index: 0x0FCB */ 0x86A9,0x582A,
-	/* Array index: 0x0FCB */ 0x86AA,0x5827,
-	/* Array index: 0x0FCB */ 0x86AF,0x5D32,
-	/* Array index: 0x0FCB */ 0x86B1,0x5D31,
-	/* Array index: 0x0FCB */ 0x86B5,0x5D2E,
-	/* Array index: 0x0FCB */ 0x86B6,0x5D2C,
-	/* Array index: 0x0FCB */ 0x86C0,0x5D2B,
-	/* Array index: 0x0FCB */ 0x86C4,0x5D2D,
-	/* Array index: 0x0FCB */ 0x86C6,0x5D2F,
-	/* Array index: 0x0FCB */ 0x86C7,0x5D2A,
-	/* Array index: 0x0FCB */ 0x86C9,0x5D33,
-	/* Array index: 0x0FCB */ 0x86CB,0x5D30,
-	/* Array index: 0x0FCB */ 0x86D0,0x6177,
-	/* Array index: 0x0FCB */ 0x86D4,0x6174,
-	/* Array index: 0x0FCB */ 0x86D9,0x6172,
-	/* Array index: 0x0FCB */ 0x86DB,0x6175,
-	/* Array index: 0x0FCB */ 0x86DE,0x6178,
-	/* Array index: 0x0FCB */ 0x86DF,0x6171,
-	/* Array index: 0x0FCB */ 0x86E4,0x6176,
-	/* Array index: 0x0FCB */ 0x86ED,0x6173,
-	/* Array index: 0x0FCB */ 0x86F9,0x6641,
-	/* Array index: 0x0FCB */ 0x86FB,0x6647,
-	/* Array index: 0x0FCB */ 0x86FE,0x6646,
-	/* Array index: 0x0FCB */ 0x8700,0x6645,
-	/* Array index: 0x0FCB */ 0x8713,0x6642,
-	/* Array index: 0x0FCB */ 0x8718,0x6A72,
-	/* Array index: 0x0FCB */ 0x871C,0x6A6D,
-	/* Array index: 0x0FCB */ 0x8722,0x6A6F,
-	/* Array index: 0x0FCB */ 0x8725,0x6A70,
-	/* Array index: 0x0FCB */ 0x8729,0x6A75,
-	/* Array index: 0x0FCB */ 0x8734,0x6A71,
-	/* Array index: 0x0FCB */ 0x8737,0x6A74,
-	/* Array index: 0x0FCB */ 0x873B,0x6A6E,
-	/* Array index: 0x0FCB */ 0x873F,0x6A6C,
-	/* Array index: 0x0FCB */ 0x874C,0x6E6A,
-	/* Array index: 0x0FCB */ 0x8753,0x6E6B,
-	/* Array index: 0x0FCB */ 0x8755,0x6A73,
-	/* Array index: 0x0FCB */ 0x8757,0x6E69,
-	/* Array index: 0x0FCB */ 0x8759,0x6E68,
-	/* Array index: 0x0FCB */ 0x8760,0x6E64,
-	/* Array index: 0x0FCB */ 0x8766,0x6E65,
-	/* Array index: 0x0FCB */ 0x8768,0x6E67,
-	/* Array index: 0x0FCB */ 0x8774,0x6E62,
-	/* Array index: 0x0FCB */ 0x8776,0x6E63,
-	/* Array index: 0x0FCB */ 0x8778,0x6E66,
-	/* Array index: 0x0FCB */ 0x8782,0x6E61,
-	/* Array index: 0x0FCB */ 0x8783,0x722A,
-	/* Array index: 0x0FCB */ 0x878D,0x722E,
-	/* Array index: 0x0FCB */ 0x879E,0x722C,
-	/* Array index: 0x0FCB */ 0x879F,0x722B,
-	/* Array index: 0x0FCB */ 0x87A2,0x722D,
-	/* Array index: 0x0FCB */ 0x87AB,0x753C,
-	/* Array index: 0x0FCB */ 0x87B3,0x7539,
-	/* Array index: 0x0FCB */ 0x87BA,0x753E,
-	/* Array index: 0x0FCB */ 0x87BB,0x753D,
-	/* Array index: 0x0FCB */ 0x87C0,0x7537,
-	/* Array index: 0x0FCB */ 0x87C6,0x753B,
-	/* Array index: 0x0FCB */ 0x87C8,0x753F,
-	/* Array index: 0x0FCB */ 0x87CB,0x7540,
-	/* Array index: 0x0FCB */ 0x87D1,0x7538,
-	/* Array index: 0x0FCB */ 0x87D2,0x753A,
-	/* Array index: 0x0FCB */ 0x87E0,0x773A,
-	/* Array index: 0x0FCB */ 0x87EC,0x7738,
-	/* Array index: 0x0FCB */ 0x87EF,0x7737,
-	/* Array index: 0x0FCB */ 0x87F2,0x7739,
-	/* Array index: 0x0FCB */ 0x87F9,0x7874,
-	/* Array index: 0x0FCB */ 0x87FB,0x7871,
-	/* Array index: 0x0FCB */ 0x87FE,0x7875,
-	/* Array index: 0x0FCB */ 0x8805,0x7872,
-	/* Array index: 0x0FCB */ 0x880D,0x7873,
-	/* Array index: 0x0FCB */ 0x8814,0x7A39,
-	/* Array index: 0x0FCB */ 0x8815,0x7A3A,
-	/* Array index: 0x0FCB */ 0x8831,0x7C47,
-	/* Array index: 0x0FCB */ 0x8836,0x7C66,
-	/* Array index: 0x0FCB */ 0x8839,0x7C67,
-	/* Array index: 0x0FCB */ 0x883B,0x7D27,
-	/* Array index: 0x0FCB */ 0x8840,0x4866,
-	/* Array index: 0x0FCB */ 0x884C,0x4867,
-	/* Array index: 0x0FCB */ 0x884D,0x534F,
-	/* Array index: 0x0FCB */ 0x8853,0x5D34,
-	/* Array index: 0x0FCB */ 0x8857,0x6179,
-	/* Array index: 0x0FCB */ 0x8859,0x664C,
-	/* Array index: 0x0FCB */ 0x885B,0x6E6C,
-	/* Array index: 0x0FCB */ 0x885D,0x6E6D,
-	/* Array index: 0x0FCB */ 0x8868,0x4F50,
-	/* Array index: 0x0FCB */ 0x886B,0x5350,
-	/* Array index: 0x0FCB */ 0x8870,0x582E,
-	/* Array index: 0x0FCB */ 0x8877,0x582F,
-	/* Array index: 0x0FCB */ 0x8879,0x5833,
-	/* Array index: 0x0FCB */ 0x887D,0x5832,
-	/* Array index: 0x0FCB */ 0x8881,0x5830,
-	/* Array index: 0x0FCB */ 0x8882,0x5831,
-	/* Array index: 0x0FCB */ 0x8888,0x5D36,
-	/* Array index: 0x0FCB */ 0x888B,0x5D3B,
-	/* Array index: 0x0FCB */ 0x888D,0x5D3A,
-	/* Array index: 0x0FCB */ 0x8892,0x5D38,
-	/* Array index: 0x0FCB */ 0x8896,0x5D39,
-	/* Array index: 0x0FCB */ 0x889E,0x5D35,
-	/* Array index: 0x0FCB */ 0x88AB,0x5D37,
-	/* Array index: 0x0FCB */ 0x88B1,0x617C,
-	/* Array index: 0x0FCB */ 0x88C1,0x617A,
-	/* Array index: 0x0FCB */ 0x88C2,0x617B,
-	/* Array index: 0x0FCB */ 0x88CA,0x6654,
-	/* Array index: 0x0FCB */ 0x88D2,0x6656,
-	/* Array index: 0x0FCB */ 0x88D4,0x664E,
-	/* Array index: 0x0FCB */ 0x88D5,0x6655,
-	/* Array index: 0x0FCB */ 0x88D8,0x6651,
-	/* Array index: 0x0FCB */ 0x88D9,0x664F,
-	/* Array index: 0x0FCB */ 0x88DC,0x6650,
-	/* Array index: 0x0FCB */ 0x88DD,0x6652,
-	/* Array index: 0x0FCB */ 0x88DF,0x664D,
-	/* Array index: 0x0FCB */ 0x88E1,0x6653,
-	/* Array index: 0x0FCB */ 0x88E8,0x6A7C,
-	/* Array index: 0x0FCB */ 0x88EF,0x6A7E,
-	/* Array index: 0x0FCB */ 0x88F3,0x6A76,
-	/* Array index: 0x0FCB */ 0x88F4,0x6A78,
-	/* Array index: 0x0FCB */ 0x88F8,0x6A7A,
-	/* Array index: 0x0FCB */ 0x88F9,0x6A79,
-	/* Array index: 0x0FCB */ 0x88FD,0x6A7B,
-	/* Array index: 0x0FCB */ 0x8902,0x6A77,
-	/* Array index: 0x0FCB */ 0x8907,0x6E6F,
-	/* Array index: 0x0FCB */ 0x890A,0x6E73,
-	/* Array index: 0x0FCB */ 0x8910,0x6E6E,
-	/* Array index: 0x0FCB */ 0x8912,0x6E70,
-	/* Array index: 0x0FCB */ 0x8913,0x6E71,
-	/* Array index: 0x0FCB */ 0x8915,0x6E72,
-	/* Array index: 0x0FCB */ 0x891A,0x6A7D,
-	/* Array index: 0x0FCB */ 0x8921,0x7234,
-	/* Array index: 0x0FCB */ 0x8925,0x7232,
-	/* Array index: 0x0FCB */ 0x892A,0x7230,
-	/* Array index: 0x0FCB */ 0x892B,0x7233,
-	/* Array index: 0x0FCB */ 0x8932,0x7231,
-	/* Array index: 0x0FCB */ 0x8936,0x7542,
-	/* Array index: 0x0FCB */ 0x8938,0x7544,
-	/* Array index: 0x0FCB */ 0x893B,0x7541,
-	/* Array index: 0x0FCB */ 0x893D,0x7545,
-	/* Array index: 0x0FCB */ 0x8944,0x7543,
-	/* Array index: 0x0FCB */ 0x8956,0x7878,
-	/* Array index: 0x0FCB */ 0x8964,0x7A3B,
-	/* Array index: 0x0FCB */ 0x896A,0x7B28,
-	/* Array index: 0x0FCB */ 0x896C,0x7B29,
-	/* Array index: 0x0FCB */ 0x896F,0x7B72,
-	/* Array index: 0x0FCB */ 0x8972,0x7B71,
-	/* Array index: 0x0FCB */ 0x897F,0x4869,
-	/* Array index: 0x0FCB */ 0x8981,0x5351,
-	/* Array index: 0x0FCB */ 0x8983,0x617D,
-	/* Array index: 0x0FCB */ 0x8986,0x773B,
-	/* Array index: 0x0FCB */ 0x898B,0x4B44,
-	/* Array index: 0x0FCB */ 0x898F,0x5D3D,
-	/* Array index: 0x0FCB */ 0x8993,0x5D3C,
-	/* Array index: 0x0FCB */ 0x8996,0x617E,
-	/* Array index: 0x0FCB */ 0x899C,0x6657,
-	/* Array index: 0x0FCB */ 0x89A6,0x7236,
-	/* Array index: 0x0FCB */ 0x89AA,0x7235,
-	/* Array index: 0x0FCB */ 0x89AC,0x7546,
-	/* Array index: 0x0FCB */ 0x89B2,0x773C,
-	/* Array index: 0x0FCB */ 0x89BA,0x7A3C,
-	/* Array index: 0x0FCB */ 0x89BD,0x7B2A,
-	/* Array index: 0x0FCB */ 0x89C0,0x7D28,
-	/* Array index: 0x0FCB */ 0x89D2,0x4B45,
-	/* Array index: 0x0FCB */ 0x89D4,0x5352,
-	/* Array index: 0x0FCB */ 0x89E3,0x6658,
-	/* Array index: 0x0FCB */ 0x89F4,0x773D,
-	/* Array index: 0x0FCB */ 0x89F8,0x7A3D,
-	/* Array index: 0x0FCB */ 0x89FC,0x7B73,
-	/* Array index: 0x0FCB */ 0x8A00,0x4B46,
-	/* Array index: 0x0FCB */ 0x8A02,0x5354,
-	/* Array index: 0x0FCB */ 0x8A03,0x5355,
-	/* Array index: 0x0FCB */ 0x8A08,0x5353,
-	/* Array index: 0x0FCB */ 0x8A0A,0x5839,
-	/* Array index: 0x0FCB */ 0x8A1B,0x5D45,
-	/* Array index: 0x0FCB */ 0x8A1D,0x5D3F,
-	/* Array index: 0x0FCB */ 0x8A1F,0x5D44,
-	/* Array index: 0x0FCB */ 0x8A22,0x5D46,
-	/* Array index: 0x0FCB */ 0x8A23,0x5D40,
-	/* Array index: 0x0FCB */ 0x8A25,0x5D41,
-	/* Array index: 0x0FCB */ 0x8A2A,0x5D3E,
-	/* Array index: 0x0FCB */ 0x8A2D,0x5D43,
-	/* Array index: 0x0FCB */ 0x8A31,0x5D42,
-	/* Array index: 0x0FCB */ 0x8A34,0x622B,
-	/* Array index: 0x0FCB */ 0x8A36,0x622D,
-	/* Array index: 0x0FCB */ 0x8A41,0x6226,
-	/* Array index: 0x0FCB */ 0x8A46,0x622A,
-	/* Array index: 0x0FCB */ 0x8A50,0x6229,
-	/* Array index: 0x0FCB */ 0x8A5B,0x6228,
-	/* Array index: 0x0FCB */ 0x8A5E,0x6224,
-	/* Array index: 0x0FCB */ 0x8A60,0x6222,
-	/* Array index: 0x0FCB */ 0x8A62,0x6666,
-	/* Array index: 0x0FCB */ 0x8A63,0x6661,
-	/* Array index: 0x0FCB */ 0x8A66,0x665C,
-	/* Array index: 0x0FCB */ 0x8A79,0x6669,
-	/* Array index: 0x0FCB */ 0x8A7B,0x666A,
-	/* Array index: 0x0FCB */ 0x8A7C,0x6660,
-	/* Array index: 0x0FCB */ 0x8A85,0x6664,
-	/* Array index: 0x0FCB */ 0x8A87,0x665F,
-	/* Array index: 0x0FCB */ 0x8A8C,0x6B22,
-	/* Array index: 0x0FCB */ 0x8A8D,0x6B25,
-	/* Array index: 0x0FCB */ 0x8A91,0x6B2D,
-	/* Array index: 0x0FCB */ 0x8A93,0x6B27,
-	/* Array index: 0x0FCB */ 0x8A95,0x6E78,
-	/* Array index: 0x0FCB */ 0x8A98,0x6B2C,
-	/* Array index: 0x0FCB */ 0x8A9A,0x6B2E,
-	/* Array index: 0x0FCB */ 0x8A9E,0x6B23,
-	/* Array index: 0x0FCB */ 0x8AB0,0x6F21,
-	/* Array index: 0x0FCB */ 0x8AB2,0x6E7B,
-	/* Array index: 0x0FCB */ 0x8AB6,0x6F24,
-	/* Array index: 0x0FCB */ 0x8AB9,0x6F25,
-	/* Array index: 0x0FCB */ 0x8ABC,0x6E74,
-	/* Array index: 0x0FCB */ 0x8ABF,0x6E7E,
-	/* Array index: 0x0FCB */ 0x8AC2,0x6E7D,
-	/* Array index: 0x0FCB */ 0x8AC4,0x6E77,
-	/* Array index: 0x0FCB */ 0x8AC7,0x6E76,
-	/* Array index: 0x0FCB */ 0x8AC9,0x6E7C,
-	/* Array index: 0x0FCB */ 0x8ACB,0x6E79,
-	/* Array index: 0x0FCB */ 0x8ACD,0x6F23,
-	/* Array index: 0x0FCB */ 0x8AD2,0x6E75,
-	/* Array index: 0x0FCB */ 0x8AD6,0x6F22,
-	/* Array index: 0x0FCB */ 0x8ADB,0x6F26,
-	/* Array index: 0x0FCB */ 0x8ADC,0x723C,
-	/* Array index: 0x0FCB */ 0x8AE6,0x7237,
-	/* Array index: 0x0FCB */ 0x8AE7,0x723D,
-	/* Array index: 0x0FCB */ 0x8AEB,0x7239,
-	/* Array index: 0x0FCB */ 0x8AED,0x7243,
-	/* Array index: 0x0FCB */ 0x8AEE,0x723E,
-	/* Array index: 0x0FCB */ 0x8AF1,0x723A,
-	/* Array index: 0x0FCB */ 0x8AF3,0x7244,
-	/* Array index: 0x0FCB */ 0x8B0A,0x754B,
-	/* Array index: 0x0FCB */ 0x8B0E,0x7547,
-	/* Array index: 0x0FCB */ 0x8B10,0x754F,
-	/* Array index: 0x0FCB */ 0x8B17,0x7548,
-	/* Array index: 0x0FCB */ 0x8B19,0x7549,
-	/* Array index: 0x0FCB */ 0x8B1B,0x754A,
-	/* Array index: 0x0FCB */ 0x8B1D,0x754D,
-	/* Array index: 0x0FCB */ 0x8B20,0x754C,
-	/* Array index: 0x0FCB */ 0x8B28,0x773E,
-	/* Array index: 0x0FCB */ 0x8B2B,0x7741,
-	/* Array index: 0x0FCB */ 0x8B2C,0x7740,
-	/* Array index: 0x0FCB */ 0x8B39,0x773F,
-	/* Array index: 0x0FCB */ 0x8B41,0x787A,
-	/* Array index: 0x0FCB */ 0x8B46,0x7923,
-	/* Array index: 0x0FCB */ 0x8B49,0x787D,
-	/* Array index: 0x0FCB */ 0x8B4E,0x7921,
-	/* Array index: 0x0FCB */ 0x8B4F,0x7922,
-	/* Array index: 0x0FCB */ 0x8B5F,0x7A42,
-	/* Array index: 0x0FCB */ 0x8B66,0x7A40,
-	/* Array index: 0x0FCB */ 0x8B6B,0x7A43,
-	/* Array index: 0x0FCB */ 0x8B6C,0x7A3F,
-	/* Array index: 0x0FCB */ 0x8B6F,0x7A41,
-	/* Array index: 0x0FCB */ 0x8B70,0x7A3E,
-	/* Array index: 0x0FCB */ 0x8B74,0x7B2B,
-	/* Array index: 0x0FCB */ 0x8B77,0x7B2C,
-	/* Array index: 0x0FCB */ 0x8B7D,0x7B2D,
-	/* Array index: 0x0FCB */ 0x8B80,0x7B74,
-	/* Array index: 0x0FCB */ 0x8B8A,0x7C48,
-	/* Array index: 0x0FCB */ 0x8B92,0x7C6A,
-	/* Array index: 0x0FCB */ 0x8B93,0x7C69,
-	/* Array index: 0x0FCB */ 0x8B96,0x7C6B,
-	/* Array index: 0x0FCB */ 0x8B9A,0x7D34,
-	/* Array index: 0x0FCB */ 0x8B9C,0x7D3A,
-	/* Array index: 0x0FCB */ 0x8C37,0x4B47,
-	/* Array index: 0x0FCB */ 0x8C3F,0x7551,
-	/* Array index: 0x0FCB */ 0x8C41,0x7550,
-	/* Array index: 0x0FCB */ 0x8C46,0x4B48,
-	/* Array index: 0x0FCB */ 0x8C48,0x583F,
-	/* Array index: 0x0FCB */ 0x8C49,0x5D47,
-	/* Array index: 0x0FCB */ 0x8C4C,0x6F27,
-	/* Array index: 0x0FCB */ 0x8C4E,0x6F28,
-	/* Array index: 0x0FCB */ 0x8C50,0x7742,
-	/* Array index: 0x0FCB */ 0x8C54,0x7D43,
-	/* Array index: 0x0FCB */ 0x8C55,0x4B49,
-	/* Array index: 0x0FCB */ 0x8C5A,0x5D48,
-	/* Array index: 0x0FCB */ 0x8C61,0x622F,
-	/* Array index: 0x0FCB */ 0x8C62,0x666D,
-	/* Array index: 0x0FCB */ 0x8C73,0x7552,
-	/* Array index: 0x0FCB */ 0x8C79,0x5841,
-	/* Array index: 0x0FCB */ 0x8C7A,0x5840,
-	/* Array index: 0x0FCB */ 0x8C82,0x6230,
-	/* Array index: 0x0FCB */ 0x8C93,0x7249,
-	/* Array index: 0x0FCB */ 0x8CAF,0x6231,
-	/* Array index: 0x0FCB */ 0x8CDC,0x6F32,
-	/* Array index: 0x0FCB */ 0x8CEA,0x6F33,
-	/* Array index: 0x0FCB */ 0x8CEC,0x6F2E,
-	/* Array index: 0x0FCB */ 0x8CED,0x6F2F,
-	/* Array index: 0x0FCB */ 0x8CF4,0x724A,
-	/* Array index: 0x0FCB */ 0x8D05,0x7743,
-	/* Array index: 0x0FCB */ 0x8D08,0x7925,
-	/* Array index: 0x0FCB */ 0x8D0A,0x7926,
-	/* Array index: 0x0FCB */ 0x8D0D,0x7A45,
-	/* Array index: 0x0FCB */ 0x8D0F,0x7A44,
-	/* Array index: 0x0FCB */ 0x8D13,0x7B2E,
-	/* Array index: 0x0FCB */ 0x8D16,0x7B75,
-	/* Array index: 0x0FCB */ 0x8D17,0x7B76,
-	/* Array index: 0x0FCB */ 0x8D1B,0x7C6D,
-	/* Array index: 0x0FCB */ 0x8D64,0x4B4B,
-	/* Array index: 0x0FCB */ 0x8D66,0x5D50,
-	/* Array index: 0x0FCB */ 0x8D67,0x5D4F,
-	/* Array index: 0x0FCB */ 0x8D6B,0x6B36,
-	/* Array index: 0x0FCB */ 0x8D6D,0x6F35,
-	/* Array index: 0x0FCB */ 0x8D70,0x4B4C,
-	/* Array index: 0x0FCB */ 0x8D73,0x5359,
-	/* Array index: 0x0FCB */ 0x8D74,0x5358,
-	/* Array index: 0x0FCB */ 0x8D77,0x5844,
-	/* Array index: 0x0FCB */ 0x8D81,0x623F,
-	/* Array index: 0x0FCB */ 0x8D85,0x623E,
-	/* Array index: 0x0FCB */ 0x8D8A,0x623D,
-	/* Array index: 0x0FCB */ 0x8D95,0x6B38,
-	/* Array index: 0x0FCB */ 0x8D99,0x6B37,
-	/* Array index: 0x0FCB */ 0x8D9F,0x6F36,
-	/* Array index: 0x0FCB */ 0x8DA3,0x6F37,
-	/* Array index: 0x0FCB */ 0x8DA8,0x7558,
-	/* Array index: 0x0FCB */ 0x8DB3,0x4B4D,
-	/* Array index: 0x0FCB */ 0x8DB4,0x535A,
-	/* Array index: 0x0FCB */ 0x8DBA,0x5D52,
-	/* Array index: 0x0FCB */ 0x8DBE,0x5D51,
-	/* Array index: 0x0FCB */ 0x8DC6,0x6247,
-	/* Array index: 0x0FCB */ 0x8DCB,0x6242,
-	/* Array index: 0x0FCB */ 0x8DCC,0x6245,
-	/* Array index: 0x0FCB */ 0x8DCE,0x6240,
-	/* Array index: 0x0FCB */ 0x8DD1,0x6244,
-	/* Array index: 0x0FCB */ 0x8DDA,0x6243,
-	/* Array index: 0x0FCB */ 0x8DDB,0x6246,
-	/* Array index: 0x0FCB */ 0x8DDD,0x6241,
-	/* Array index: 0x0FCB */ 0x8DDF,0x6679,
-	/* Array index: 0x0FCB */ 0x8DE1,0x6678,
-	/* Array index: 0x0FCB */ 0x8DE4,0x6721,
-	/* Array index: 0x0FCB */ 0x8DE6,0x6722,
-	/* Array index: 0x0FCB */ 0x8DE8,0x667A,
-	/* Array index: 0x0FCB */ 0x8DEA,0x667E,
-	/* Array index: 0x0FCB */ 0x8DEF,0x667B,
-	/* Array index: 0x0FCB */ 0x8DF3,0x667C,
-	/* Array index: 0x0FCB */ 0x8DFA,0x667D,
-	/* Array index: 0x0FCB */ 0x8DFC,0x6B39,
-	/* Array index: 0x0FCB */ 0x8E0F,0x6F3C,
-	/* Array index: 0x0FCB */ 0x8E10,0x6F39,
-	/* Array index: 0x0FCB */ 0x8E29,0x6F3D,
-	/* Array index: 0x0FCB */ 0x8E2B,0x6F38,
-	/* Array index: 0x0FCB */ 0x8E31,0x724C,
-	/* Array index: 0x0FCB */ 0x8E34,0x724D,
-	/* Array index: 0x0FCB */ 0x8E35,0x7250,
-	/* Array index: 0x0FCB */ 0x8E39,0x724F,
-	/* Array index: 0x0FCB */ 0x8E42,0x724E,
-	/* Array index: 0x0FCB */ 0x8E44,0x724B,
-	/* Array index: 0x0FCB */ 0x8E55,0x7749,
-	/* Array index: 0x0FCB */ 0x8E59,0x7744,
-	/* Array index: 0x0FCB */ 0x8E5F,0x7748,
-	/* Array index: 0x0FCB */ 0x8E63,0x7745,
-	/* Array index: 0x0FCB */ 0x8E64,0x7747,
-	/* Array index: 0x0FCB */ 0x8E66,0x7746,
-	/* Array index: 0x0FCB */ 0x8E6C,0x792B,
-	/* Array index: 0x0FCB */ 0x8E72,0x7928,
-	/* Array index: 0x0FCB */ 0x8E74,0x792D,
-	/* Array index: 0x0FCB */ 0x8E76,0x792A,
-	/* Array index: 0x0FCB */ 0x8E7A,0x792C,
-	/* Array index: 0x0FCB */ 0x8E7C,0x7927,
-	/* Array index: 0x0FCB */ 0x8E81,0x7A47,
-	/* Array index: 0x0FCB */ 0x8E82,0x7A49,
-	/* Array index: 0x0FCB */ 0x8E85,0x7A48,
-	/* Array index: 0x0FCB */ 0x8E91,0x7B77,
-	/* Array index: 0x0FCB */ 0x8E93,0x7B78,
-	/* Array index: 0x0FCB */ 0x8EA1,0x7D29,
-	/* Array index: 0x0FCB */ 0x8EB2,0x6723,
-	/* Array index: 0x0FCB */ 0x8EBA,0x6F41,
-	/* Array index: 0x0FCB */ 0x8EC0,0x774A,
-	/* Array index: 0x0FCB */ 0x8ED2,0x5846,
-	/* Array index: 0x0FCB */ 0x8ED4,0x5847,
-	/* Array index: 0x0FCB */ 0x8EDB,0x5D53,
-	/* Array index: 0x0FCB */ 0x8EDF,0x5D54,
-	/* Array index: 0x0FCB */ 0x8EF8,0x6249,
-	/* Array index: 0x0FCB */ 0x8EFB,0x6248,
-	/* Array index: 0x0FCB */ 0x8EFC,0x624A,
-	/* Array index: 0x0FCB */ 0x8EFE,0x6726,
-	/* Array index: 0x0FCB */ 0x8F03,0x6724,
-	/* Array index: 0x0FCB */ 0x8F09,0x6725,
-	/* Array index: 0x0FCB */ 0x8F0A,0x6727,
-	/* Array index: 0x0FCB */ 0x8F25,0x6F4A,
-	/* Array index: 0x0FCB */ 0x8F26,0x6F46,
-	/* Array index: 0x0FCB */ 0x8F29,0x6F45,
-	/* Array index: 0x0FCB */ 0x8F2A,0x6F47,
-	/* Array index: 0x0FCB */ 0x8F2F,0x7252,
-	/* Array index: 0x0FCB */ 0x8F33,0x7254,
-	/* Array index: 0x0FCB */ 0x8F38,0x7253,
-	/* Array index: 0x0FCB */ 0x8F3B,0x7251,
-	/* Array index: 0x0FCB */ 0x8F3E,0x755E,
-	/* Array index: 0x0FCB */ 0x8F3F,0x7561,
-	/* Array index: 0x0FCB */ 0x8F42,0x755F,
-	/* Array index: 0x0FCB */ 0x8F44,0x755D,
-	/* Array index: 0x0FCB */ 0x8F45,0x7560,
-	/* Array index: 0x0FCB */ 0x8F49,0x774B,
-	/* Array index: 0x0FCB */ 0x8F4D,0x774C,
-	/* Array index: 0x0FCB */ 0x8F4E,0x792F,
-	/* Array index: 0x0FCB */ 0x8F54,0x792E,
-	/* Array index: 0x0FCB */ 0x8F5F,0x7B32,
-	/* Array index: 0x0FCB */ 0x8F61,0x7B79,
-	/* Array index: 0x0FCB */ 0x8F9B,0x4B50,
-	/* Array index: 0x0FCB */ 0x8F9C,0x624B,
-	/* Array index: 0x0FCB */ 0x8F9F,0x6728,
-	/* Array index: 0x0FCB */ 0x8FA3,0x6B3E,
-	/* Array index: 0x0FCB */ 0x8FA6,0x7256,
-	/* Array index: 0x0FCB */ 0x8FA8,0x7255,
-	/* Array index: 0x0FCB */ 0x8FCE,0x4F52,
-	/* Array index: 0x0FCB */ 0x8FD1,0x4F54,
-	/* Array index: 0x0FCB */ 0x8FD4,0x4F53,
-	/* Array index: 0x0FCB */ 0x8FF0,0x535D,
-	/* Array index: 0x0FCB */ 0x8FF4,0x584F,
-	/* Array index: 0x0FCB */ 0x8FF7,0x584C,
-	/* Array index: 0x0FCB */ 0x8FF8,0x5853,
-	/* Array index: 0x0FCB */ 0x8FFA,0x584E,
-	/* Array index: 0x0FCB */ 0x8FFD,0x5851,
-	/* Array index: 0x0FCB */ 0x9000,0x584D,
-	/* Array index: 0x0FCB */ 0x9001,0x584A,
-	/* Array index: 0x0FCB */ 0x9003,0x5850,
-	/* Array index: 0x0FCB */ 0x9005,0x5852,
-	/* Array index: 0x0FCB */ 0x9006,0x584B,
-	/* Array index: 0x0FCB */ 0x900D,0x5D56,
-	/* Array index: 0x0FCB */ 0x900F,0x5D60,
-	/* Array index: 0x0FCB */ 0x9010,0x5D5C,
-	/* Array index: 0x0FCB */ 0x902E,0x624C,
-	/* Array index: 0x0FCB */ 0x9031,0x624E,
-	/* Array index: 0x0FCB */ 0x9032,0x6250,
-	/* Array index: 0x0FCB */ 0x9035,0x624D,
-	/* Array index: 0x0FCB */ 0x9036,0x6251,
-	/* Array index: 0x0FCB */ 0x9038,0x624F,
-	/* Array index: 0x0FCB */ 0x903C,0x672F,
-	/* Array index: 0x0FCB */ 0x903E,0x6737,
-	/* Array index: 0x0FCB */ 0x9041,0x6738,
-	/* Array index: 0x0FCB */ 0x9042,0x672D,
-	/* Array index: 0x0FCB */ 0x9047,0x6732,
-	/* Array index: 0x0FCB */ 0x9068,0x6F4D,
-	/* Array index: 0x0FCB */ 0x9069,0x6F4B,
-	/* Array index: 0x0FCB */ 0x906D,0x6F4E,
-	/* Array index: 0x0FCB */ 0x906E,0x6F4C,
-	/* Array index: 0x0FCB */ 0x9072,0x725A,
-	/* Array index: 0x0FCB */ 0x9095,0x5854,
-	/* Array index: 0x0FCB */ 0x90A2,0x4B58,
-	/* Array index: 0x0FCB */ 0x90A3,0x4B5B,
-	/* Array index: 0x0FCB */ 0x90A6,0x4B5A,
-	/* Array index: 0x0FCB */ 0x90AA,0x4B59,
-	/* Array index: 0x0FCB */ 0x90B1,0x4F57,
-	/* Array index: 0x0FCB */ 0x90B5,0x4F55,
-	/* Array index: 0x0FCB */ 0x90B6,0x4F58,
-	/* Array index: 0x0FCB */ 0x90B8,0x4F56,
-	/* Array index: 0x0FCB */ 0x90C1,0x5368,
-	/* Array index: 0x0FCB */ 0x90C3,0x5369,
-	/* Array index: 0x0FCB */ 0x90CA,0x5366,
-	/* Array index: 0x0FCB */ 0x90CE,0x5367,
-	/* Array index: 0x0FCB */ 0x90DD,0x5856,
-	/* Array index: 0x0FCB */ 0x90E1,0x5855,
-	/* Array index: 0x0FCB */ 0x90E2,0x5857,
-	/* Array index: 0x0FCB */ 0x90E8,0x5D65,
-	/* Array index: 0x0FCB */ 0x90ED,0x5D66,
-	/* Array index: 0x0FCB */ 0x90F5,0x6253,
-	/* Array index: 0x0FCB */ 0x90FD,0x5D67,
-	/* Array index: 0x0FCB */ 0x90FE,0x6255,
-	/* Array index: 0x0FCB */ 0x9102,0x6252,
-	/* Array index: 0x0FCB */ 0x9109,0x6254,
-	/* Array index: 0x0FCB */ 0x9112,0x6739,
-	/* Array index: 0x0FCB */ 0x911E,0x6B4A,
-	/* Array index: 0x0FCB */ 0x9127,0x6F52,
-	/* Array index: 0x0FCB */ 0x912D,0x6F51,
-	/* Array index: 0x0FCB */ 0x9130,0x6F50,
-	/* Array index: 0x0FCB */ 0x9131,0x6F53,
-	/* Array index: 0x0FCB */ 0x9134,0x725D,
-	/* Array index: 0x0FCB */ 0x9139,0x7568,
-	/* Array index: 0x0FCB */ 0x9152,0x5858,
-	/* Array index: 0x0FCB */ 0x9157,0x5D68,
-	/* Array index: 0x0FCB */ 0x9163,0x6256,
-	/* Array index: 0x0FCB */ 0x9165,0x6257,
-	/* Array index: 0x0FCB */ 0x9169,0x673D,
-	/* Array index: 0x0FCB */ 0x916A,0x673C,
-	/* Array index: 0x0FCB */ 0x916C,0x673B,
-	/* Array index: 0x0FCB */ 0x9183,0x6F57,
-	/* Array index: 0x0FCB */ 0x9187,0x6F54,
-	/* Array index: 0x0FCB */ 0x9189,0x6F55,
-	/* Array index: 0x0FCB */ 0x918B,0x6F56,
-	/* Array index: 0x0FCB */ 0x9192,0x725E,
-	/* Array index: 0x0FCB */ 0x919C,0x756B,
-	/* Array index: 0x0FCB */ 0x919E,0x756A,
-	/* Array index: 0x0FCB */ 0x91A3,0x7569,
-	/* Array index: 0x0FCB */ 0x91AB,0x7750,
-	/* Array index: 0x0FCB */ 0x91AC,0x7751,
-	/* Array index: 0x0FCB */ 0x91AE,0x7934,
-	/* Array index: 0x0FCB */ 0x91B1,0x7933,
-	/* Array index: 0x0FCB */ 0x91B4,0x7A4A,
-	/* Array index: 0x0FCB */ 0x91BA,0x7B34,
-	/* Array index: 0x0FCB */ 0x91C0,0x7C6E,
-	/* Array index: 0x0FCB */ 0x91C1,0x7D2A,
-	/* Array index: 0x0FCB */ 0x91E3,0x5D6C,
-	/* Array index: 0x0FCB */ 0x91E6,0x5D6B,
-	/* Array index: 0x0FCB */ 0x91E7,0x5D6D,
-	/* Array index: 0x0FCB */ 0x91E9,0x5D6F,
-	/* Array index: 0x0FCB */ 0x91ED,0x5D6E,
-	/* Array index: 0x0FCB */ 0x91F5,0x5D6A,
-	/* Array index: 0x0FCB */ 0x9207,0x6260,
-	/* Array index: 0x0FCB */ 0x9209,0x625C,
-	/* Array index: 0x0FCB */ 0x920D,0x625E,
-	/* Array index: 0x0FCB */ 0x9210,0x625F,
-	/* Array index: 0x0FCB */ 0x9211,0x6261,
-	/* Array index: 0x0FCB */ 0x9214,0x6259,
-	/* Array index: 0x0FCB */ 0x9215,0x625A,
-	/* Array index: 0x0FCB */ 0x921E,0x625D,
-	/* Array index: 0x0FCB */ 0x9223,0x625B,
-	/* Array index: 0x0FCB */ 0x9234,0x6749,
-	/* Array index: 0x0FCB */ 0x9245,0x674C,
-	/* Array index: 0x0FCB */ 0x9249,0x674A,
-	/* Array index: 0x0FCB */ 0x924B,0x6746,
-	/* Array index: 0x0FCB */ 0x924D,0x674B,
-	/* Array index: 0x0FCB */ 0x9251,0x6748,
-	/* Array index: 0x0FCB */ 0x9257,0x6740,
-	/* Array index: 0x0FCB */ 0x925A,0x674F,
-	/* Array index: 0x0FCB */ 0x925B,0x6745,
-	/* Array index: 0x0FCB */ 0x9264,0x6747,
-	/* Array index: 0x0FCB */ 0x9278,0x6B4F,
-	/* Array index: 0x0FCB */ 0x927B,0x6B55,
-	/* Array index: 0x0FCB */ 0x927C,0x6B59,
-	/* Array index: 0x0FCB */ 0x9280,0x6B51,
-	/* Array index: 0x0FCB */ 0x9285,0x6B52,
-	/* Array index: 0x0FCB */ 0x9291,0x6B5A,
-	/* Array index: 0x0FCB */ 0x9293,0x6B56,
-	/* Array index: 0x0FCB */ 0x9296,0x6B54,
-	/* Array index: 0x0FCB */ 0x9298,0x6B53,
-	/* Array index: 0x0FCB */ 0x929C,0x6B57,
-	/* Array index: 0x0FCB */ 0x92A8,0x6B58,
-	/* Array index: 0x0FCB */ 0x92AC,0x6B50,
-	/* Array index: 0x0FCB */ 0x92B2,0x6F63,
-	/* Array index: 0x0FCB */ 0x92B3,0x6F5E,
-	/* Array index: 0x0FCB */ 0x92B7,0x6F5A,
-	/* Array index: 0x0FCB */ 0x92BB,0x6F59,
-	/* Array index: 0x0FCB */ 0x92BC,0x6F5F,
-	/* Array index: 0x0FCB */ 0x92C1,0x6F5D,
-	/* Array index: 0x0FCB */ 0x92C5,0x6F58,
-	/* Array index: 0x0FCB */ 0x92C7,0x6F61,
-	/* Array index: 0x0FCB */ 0x92D2,0x6F60,
-	/* Array index: 0x0FCB */ 0x92E4,0x6F5C,
-	/* Array index: 0x0FCB */ 0x92EA,0x6F5B,
-	/* Array index: 0x0FCB */ 0x92F0,0x6F62,
-	/* Array index: 0x0FCB */ 0x92F8,0x7261,
-	/* Array index: 0x0FCB */ 0x92FC,0x7265,
-	/* Array index: 0x0FCB */ 0x9304,0x7267,
-	/* Array index: 0x0FCB */ 0x9310,0x7269,
-	/* Array index: 0x0FCB */ 0x9315,0x726C,
-	/* Array index: 0x0FCB */ 0x9326,0x726A,
-	/* Array index: 0x0FCB */ 0x9328,0x756E,
-	/* Array index: 0x0FCB */ 0x932B,0x7266,
-	/* Array index: 0x0FCB */ 0x932E,0x726D,
-	/* Array index: 0x0FCB */ 0x932F,0x7263,
-	/* Array index: 0x0FCB */ 0x9333,0x7262,
-	/* Array index: 0x0FCB */ 0x9336,0x7260,
-	/* Array index: 0x0FCB */ 0x934A,0x7570,
-	/* Array index: 0x0FCB */ 0x934B,0x7572,
-	/* Array index: 0x0FCB */ 0x934D,0x756C,
-	/* Array index: 0x0FCB */ 0x9354,0x7579,
-	/* Array index: 0x0FCB */ 0x935A,0x7578,
-	/* Array index: 0x0FCB */ 0x935B,0x7576,
-	/* Array index: 0x0FCB */ 0x9365,0x7571,
-	/* Array index: 0x0FCB */ 0x936C,0x7575,
-	/* Array index: 0x0FCB */ 0x9370,0x7577,
-	/* Array index: 0x0FCB */ 0x9375,0x756F,
-	/* Array index: 0x0FCB */ 0x937E,0x7574,
-	/* Array index: 0x0FCB */ 0x9382,0x756D,
-	/* Array index: 0x0FCB */ 0x938A,0x7754,
-	/* Array index: 0x0FCB */ 0x93A2,0x7756,
-	/* Array index: 0x0FCB */ 0x93AC,0x7759,
-	/* Array index: 0x0FCB */ 0x93AE,0x7758,
-	/* Array index: 0x0FCB */ 0x93B0,0x775A,
-	/* Array index: 0x0FCB */ 0x93B3,0x7757,
-	/* Array index: 0x0FCB */ 0x93C3,0x7938,
-	/* Array index: 0x0FCB */ 0x93C8,0x7939,
-	/* Array index: 0x0FCB */ 0x93CD,0x793E,
-	/* Array index: 0x0FCB */ 0x93D1,0x7936,
-	/* Array index: 0x0FCB */ 0x93DC,0x793A,
-	/* Array index: 0x0FCB */ 0x93DD,0x793B,
-	/* Array index: 0x0FCB */ 0x93DF,0x7937,
-	/* Array index: 0x0FCB */ 0x93E1,0x7935,
-	/* Array index: 0x0FCB */ 0x93E2,0x793D,
-	/* Array index: 0x0FCB */ 0x93E4,0x7940,
-	/* Array index: 0x0FCB */ 0x93E8,0x7942,
-	/* Array index: 0x0FCB */ 0x93FD,0x7A4E,
-	/* Array index: 0x0FCB */ 0x9403,0x7A4D,
-	/* Array index: 0x0FCB */ 0x9418,0x7A4C,
-	/* Array index: 0x0FCB */ 0x942B,0x7B3B,
-	/* Array index: 0x0FCB */ 0x942E,0x7B35,
-	/* Array index: 0x0FCB */ 0x9432,0x7B3A,
-	/* Array index: 0x0FCB */ 0x9433,0x7B36,
-	/* Array index: 0x0FCB */ 0x9435,0x7B37,
-	/* Array index: 0x0FCB */ 0x9438,0x7B39,
-	/* Array index: 0x0FCB */ 0x943A,0x7B38,
-	/* Array index: 0x0FCB */ 0x9444,0x7B7B,
-	/* Array index: 0x0FCB */ 0x9451,0x7B7C,
-	/* Array index: 0x0FCB */ 0x9452,0x7B7D,
-	/* Array index: 0x0FCB */ 0x9460,0x7C4C,
-	/* Array index: 0x0FCB */ 0x9463,0x7C4B,
-	/* Array index: 0x0FCB */ 0x9464,0x7C4D,
-	/* Array index: 0x0FCB */ 0x946A,0x7C6F,
-	/* Array index: 0x0FCB */ 0x9470,0x7D2C,
-	/* Array index: 0x0FCB */ 0x9472,0x7D2B,
-	/* Array index: 0x0FCB */ 0x9477,0x7D35,
-	/* Array index: 0x0FCB */ 0x9577,0x4F5B,
-	/* Array index: 0x0FCB */ 0x9580,0x4F5C,
-	/* Array index: 0x0FCB */ 0x9582,0x536D,
-	/* Array index: 0x0FCB */ 0x9583,0x5860,
-	/* Array index: 0x0FCB */ 0x9589,0x5D70,
-	/* Array index: 0x0FCB */ 0x958B,0x6264,
-	/* Array index: 0x0FCB */ 0x9598,0x6750,
-	/* Array index: 0x0FCB */ 0x95AD,0x6F64,
-	/* Array index: 0x0FCB */ 0x95B1,0x6F65,
-	/* Array index: 0x0FCB */ 0x95BB,0x726F,
-	/* Array index: 0x0FCB */ 0x95C6,0x757E,
-	/* Array index: 0x0FCB */ 0x95D0,0x7760,
-	/* Array index: 0x0FCB */ 0x95DC,0x7943,
-	/* Array index: 0x0FCB */ 0x95E1,0x7A4F,
-	/* Array index: 0x0FCB */ 0x95E2,0x7B3C,
-	/* Array index: 0x0FCB */ 0x961C,0x4F5D,
-	/* Array index: 0x0FCB */ 0x9621,0x486A,
-	/* Array index: 0x0FCB */ 0x962A,0x4B62,
-	/* Array index: 0x0FCB */ 0x962C,0x4B63,
-	/* Array index: 0x0FCB */ 0x962E,0x4B60,
-	/* Array index: 0x0FCB */ 0x9631,0x4B61,
-	/* Array index: 0x0FCB */ 0x9632,0x4B5F,
-	/* Array index: 0x0FCB */ 0x963B,0x4F60,
-	/* Array index: 0x0FCB */ 0x963F,0x4F5F,
-	/* Array index: 0x0FCB */ 0x9640,0x4F5E,
-	/* Array index: 0x0FCB */ 0x9642,0x4F62,
-	/* Array index: 0x0FCB */ 0x9644,0x4F61,
-	/* Array index: 0x0FCB */ 0x9650,0x536E,
-	/* Array index: 0x0FCB */ 0x9658,0x5867,
-	/* Array index: 0x0FCB */ 0x965B,0x5864,
-	/* Array index: 0x0FCB */ 0x966A,0x5D71,
-	/* Array index: 0x0FCB */ 0x966C,0x5D79,
-	/* Array index: 0x0FCB */ 0x967D,0x626C,
-	/* Array index: 0x0FCB */ 0x9694,0x6752,
-	/* Array index: 0x0FCB */ 0x9695,0x6753,
-	/* Array index: 0x0FCB */ 0x96A7,0x7270,
-	/* Array index: 0x0FCB */ 0x96A8,0x7271,
-	/* Array index: 0x0FCB */ 0x96AA,0x7272,
-	/* Array index: 0x0FCB */ 0x96B1,0x7621,
-	/* Array index: 0x0FCB */ 0x96B4,0x7944,
-	/* Array index: 0x0FCB */ 0x96B8,0x7622,
-	/* Array index: 0x0FCB */ 0x96B9,0x4F63,
-	/* Array index: 0x0FCB */ 0x96BB,0x5869,
-	/* Array index: 0x0FCB */ 0x96D2,0x6B65,
-	/* Array index: 0x0FCB */ 0x96D5,0x7273,
-	/* Array index: 0x0FCB */ 0x96D6,0x7623,
-	/* Array index: 0x0FCB */ 0x96D9,0x7764,
-	/* Array index: 0x0FCB */ 0x96DB,0x7765,
-	/* Array index: 0x0FCB */ 0x96DC,0x7763,
-	/* Array index: 0x0FCB */ 0x96DE,0x7766,
-	/* Array index: 0x0FCB */ 0x96E2,0x7762,
-	/* Array index: 0x0FCB */ 0x96E3,0x7945,
-	/* Array index: 0x0FCB */ 0x96EF,0x6277,
-	/* Array index: 0x0FCB */ 0x96F2,0x6278,
-	/* Array index: 0x0FCB */ 0x96F6,0x675B,
-	/* Array index: 0x0FCB */ 0x96F7,0x6758,
-	/* Array index: 0x0FCB */ 0x96F9,0x675A,
-	/* Array index: 0x0FCB */ 0x96FB,0x6759,
-	/* Array index: 0x0FCB */ 0x9700,0x6B66,
-	/* Array index: 0x0FCB */ 0x9704,0x6F66,
-	/* Array index: 0x0FCB */ 0x9706,0x6F67,
-	/* Array index: 0x0FCB */ 0x9707,0x6F68,
-	/* Array index: 0x0FCB */ 0x9709,0x6F69,
-	/* Array index: 0x0FCB */ 0x9716,0x7276,
-	/* Array index: 0x0FCB */ 0x971C,0x7624,
-	/* Array index: 0x0FCB */ 0x971E,0x7625,
-	/* Array index: 0x0FCB */ 0x9724,0x7767,
-	/* Array index: 0x0FCB */ 0x9727,0x7947,
-	/* Array index: 0x0FCB */ 0x972A,0x7946,
-	/* Array index: 0x0FCB */ 0x9730,0x7A50,
-	/* Array index: 0x0FCB */ 0x9732,0x7B3F,
-	/* Array index: 0x0FCB */ 0x9738,0x7B3D,
-	/* Array index: 0x0FCB */ 0x9739,0x7B3E,
-	/* Array index: 0x0FCB */ 0x973D,0x7B7E,
-	/* Array index: 0x0FCB */ 0x973E,0x7C21,
-	/* Array index: 0x0FCB */ 0x9742,0x7C70,
-	/* Array index: 0x0FCB */ 0x9744,0x7C72,
-	/* Array index: 0x0FCB */ 0x9748,0x7C71,
-	/* Array index: 0x0FCB */ 0x9752,0x4F65,
-	/* Array index: 0x0FCB */ 0x9756,0x675C,
-	/* Array index: 0x0FCB */ 0x975B,0x727A,
-	/* Array index: 0x0FCB */ 0x975C,0x727B,
-	/* Array index: 0x0FCB */ 0x9766,0x727C,
-	/* Array index: 0x0FCB */ 0x9768,0x7C4E,
-	/* Array index: 0x0FCB */ 0x9769,0x5373,
-	/* Array index: 0x0FCB */ 0x9774,0x675D,
-	/* Array index: 0x0FCB */ 0x9776,0x675E,
-	/* Array index: 0x0FCB */ 0x977C,0x6B67,
-	/* Array index: 0x0FCB */ 0x9785,0x6B68,
-	/* Array index: 0x0FCB */ 0x978B,0x6F6C,
-	/* Array index: 0x0FCB */ 0x978D,0x6F6B,
-	/* Array index: 0x0FCB */ 0x978F,0x6F6D,
-	/* Array index: 0x0FCB */ 0x9798,0x727D,
-	/* Array index: 0x0FCB */ 0x97A0,0x7626,
-	/* Array index: 0x0FCB */ 0x97A3,0x7768,
-	/* Array index: 0x0FCB */ 0x97A6,0x7769,
-	/* Array index: 0x0FCB */ 0x97AD,0x776A,
-	/* Array index: 0x0FCB */ 0x97C1,0x7C23,
-	/* Array index: 0x0FCB */ 0x97C3,0x7C22,
-	/* Array index: 0x0FCB */ 0x97C6,0x7C73,
-	/* Array index: 0x0FCB */ 0x97C9,0x7D36,
-	/* Array index: 0x0FCB */ 0x97CB,0x5374,
-	/* Array index: 0x0FCB */ 0x97CC,0x6279,
-	/* Array index: 0x0FCB */ 0x97D3,0x7627,
-	/* Array index: 0x0FCB */ 0x97DC,0x7949,
-	/* Array index: 0x0FCB */ 0x97ED,0x5375,
-	/* Array index: 0x0FCB */ 0x97F3,0x5376,
-	/* Array index: 0x0FCB */ 0x97F6,0x6B69,
-	/* Array index: 0x0FCB */ 0x97F9,0x776B,
-	/* Array index: 0x0FCB */ 0x97FB,0x794A,
-	/* Array index: 0x0FCB */ 0x9817,0x6B6A,
-	/* Array index: 0x0FCB */ 0x9818,0x6B6B,
-	/* Array index: 0x0FCB */ 0x981C,0x6F70,
-	/* Array index: 0x0FCB */ 0x9821,0x6F6E,
-	/* Array index: 0x0FCB */ 0x9824,0x7326,
-	/* Array index: 0x0FCB */ 0x982B,0x6F6F,
-	/* Array index: 0x0FCB */ 0x982D,0x7324,
-	/* Array index: 0x0FCB */ 0x9830,0x727E,
-	/* Array index: 0x0FCB */ 0x9846,0x7628,
-	/* Array index: 0x0FCB */ 0x9853,0x7770,
-	/* Array index: 0x0FCB */ 0x9858,0x794C,
-	/* Array index: 0x0FCB */ 0x985B,0x794D,
-	/* Array index: 0x0FCB */ 0x985E,0x794B,
-	/* Array index: 0x0FCB */ 0x9865,0x7B42,
-	/* Array index: 0x0FCB */ 0x9867,0x7B41,
-	/* Array index: 0x0FCB */ 0x986B,0x7C24,
-	/* Array index: 0x0FCB */ 0x98A8,0x5378,
-	/* Array index: 0x0FCB */ 0x98AF,0x6B6C,
-	/* Array index: 0x0FCB */ 0x98B1,0x6B6D,
-	/* Array index: 0x0FCB */ 0x98B3,0x6F71,
-	/* Array index: 0x0FCB */ 0x98B6,0x7629,
-	/* Array index: 0x0FCB */ 0x98BA,0x7771,
-	/* Array index: 0x0FCB */ 0x98BC,0x794E,
-	/* Array index: 0x0FCB */ 0x98C4,0x7A51,
-	/* Array index: 0x0FCB */ 0x98DB,0x5379,
-	/* Array index: 0x0FCB */ 0x98DF,0x537A,
-	/* Array index: 0x0FCB */ 0x98E2,0x586A,
-	/* Array index: 0x0FCB */ 0x98E7,0x627D,
-	/* Array index: 0x0FCB */ 0x98E9,0x6322,
-	/* Array index: 0x0FCB */ 0x98EA,0x627E,
-	/* Array index: 0x0FCB */ 0x98ED,0x6324,
-	/* Array index: 0x0FCB */ 0x98EF,0x6321,
-	/* Array index: 0x0FCB */ 0x98F2,0x6323,
-	/* Array index: 0x0FCB */ 0x98F4,0x6766,
-	/* Array index: 0x0FCB */ 0x9903,0x6B6E,
-	/* Array index: 0x0FCB */ 0x9905,0x6B6F,
-	/* Array index: 0x0FCB */ 0x9909,0x6B71,
-	/* Array index: 0x0FCB */ 0x990A,0x6F72,
-	/* Array index: 0x0FCB */ 0x990C,0x6B70,
-	/* Array index: 0x0FCB */ 0x9910,0x7327,
-	/* Array index: 0x0FCB */ 0x9912,0x6F74,
-	/* Array index: 0x0FCB */ 0x9913,0x6F73,
-	/* Array index: 0x0FCB */ 0x9918,0x6F75,
-	/* Array index: 0x0FCB */ 0x991A,0x732C,
-	/* Array index: 0x0FCB */ 0x991B,0x732A,
-	/* Array index: 0x0FCB */ 0x991E,0x7329,
-	/* Array index: 0x0FCB */ 0x9921,0x732B,
-	/* Array index: 0x0FCB */ 0x9928,0x7328,
-	/* Array index: 0x0FCB */ 0x992E,0x7775,
-	/* Array index: 0x0FCB */ 0x9935,0x762A,
-	/* Array index: 0x0FCB */ 0x9945,0x794F,
-	/* Array index: 0x0FCB */ 0x9949,0x7950,
-	/* Array index: 0x0FCB */ 0x9951,0x7A53,
-	/* Array index: 0x0FCB */ 0x9952,0x7A52,
-	/* Array index: 0x0FCB */ 0x9955,0x7C25,
-	/* Array index: 0x0FCB */ 0x9957,0x7B43,
-	/* Array index: 0x0FCB */ 0x995C,0x7C50,
-	/* Array index: 0x0FCB */ 0x995E,0x7D2E,
-	/* Array index: 0x0FCB */ 0x9996,0x537B,
-	/* Array index: 0x0FCB */ 0x9999,0x537C,
-	/* Array index: 0x0FCB */ 0x99A5,0x7776,
-	/* Array index: 0x0FCB */ 0x99A8,0x7A54,
-	/* Array index: 0x0FCB */ 0x99B1,0x676A,
-	/* Array index: 0x0FCB */ 0x99B3,0x6769,
-	/* Array index: 0x0FCB */ 0x99B4,0x676B,
-	/* Array index: 0x0FCB */ 0x99C1,0x6B72,
-	/* Array index: 0x0FCB */ 0x99D5,0x6F7B,
-	/* Array index: 0x0FCB */ 0x99D9,0x6F7D,
-	/* Array index: 0x0FCB */ 0x99DB,0x6F79,
-	/* Array index: 0x0FCB */ 0x99DD,0x6F76,
-	/* Array index: 0x0FCB */ 0x99DF,0x6F78,
-	/* Array index: 0x0FCB */ 0x99E2,0x732E,
-	/* Array index: 0x0FCB */ 0x99ED,0x732D,
-	/* Array index: 0x0FCB */ 0x99F1,0x732F,
-	/* Array index: 0x0FCB */ 0x99FF,0x762C,
-	/* Array index: 0x0FCB */ 0x9A01,0x762B,
-	/* Array index: 0x0FCB */ 0x9A0E,0x7777,
-	/* Array index: 0x0FCB */ 0x9A16,0x7951,
-	/* Array index: 0x0FCB */ 0x9A19,0x7952,
-	/* Array index: 0x0FCB */ 0x9A2B,0x7A55,
-	/* Array index: 0x0FCB */ 0x9A30,0x7A56,
-	/* Array index: 0x0FCB */ 0x9A35,0x7A58,
-	/* Array index: 0x0FCB */ 0x9A37,0x7A57,
-	/* Array index: 0x0FCB */ 0x9A3E,0x7B47,
-	/* Array index: 0x0FCB */ 0x9A40,0x7B46,
-	/* Array index: 0x0FCB */ 0x9A43,0x7B45,
-	/* Array index: 0x0FCB */ 0x9A45,0x7B44,
-	/* Array index: 0x0FCB */ 0x9A4D,0x7C27,
-	/* Array index: 0x0FCB */ 0x9A55,0x7C26,
-	/* Array index: 0x0FCB */ 0x9A57,0x7C53,
-	/* Array index: 0x0FCB */ 0x9A5A,0x7C51,
-	/* Array index: 0x0FCB */ 0x9A5B,0x7C52,
-	/* Array index: 0x0FCB */ 0x9A5F,0x7C75,
-	/* Array index: 0x0FCB */ 0x9A62,0x7D37,
-	/* Array index: 0x0FCB */ 0x9A65,0x7D38,
-	/* Array index: 0x0FCB */ 0x9A6A,0x7D47,
-	/* Array index: 0x0FCB */ 0x9AA8,0x586C,
-	/* Array index: 0x0FCB */ 0x9AAF,0x6B73,
-	/* Array index: 0x0FCB */ 0x9AB0,0x6B74,
-	/* Array index: 0x0FCB */ 0x9AB7,0x6F7E,
-	/* Array index: 0x0FCB */ 0x9AB8,0x7330,
-	/* Array index: 0x0FCB */ 0x9ABC,0x7331,
-	/* Array index: 0x0FCB */ 0x9AC1,0x7778,
-	/* Array index: 0x0FCB */ 0x9AE1,0x676C,
-	/* Array index: 0x0FCB */ 0x9AE6,0x6B75,
-	/* Array index: 0x0FCB */ 0x9AFB,0x7332,
-	/* Array index: 0x0FCB */ 0x9B03,0x7779,
-	/* Array index: 0x0FCB */ 0x9B06,0x777A,
-	/* Array index: 0x0FCB */ 0x9B0D,0x7953,
-	/* Array index: 0x0FCB */ 0x9B1A,0x7C29,
-	/* Array index: 0x0FCB */ 0x9B22,0x7C76,
-	/* Array index: 0x0FCB */ 0x9B23,0x7D30,
-	/* Array index: 0x0FCB */ 0x9B25,0x586E,
-	/* Array index: 0x0FCB */ 0x9B27,0x7023,
-	/* Array index: 0x0FCB */ 0x9B28,0x7334,
-	/* Array index: 0x0FCB */ 0x9B31,0x7D48,
-	/* Array index: 0x0FCB */ 0x9B32,0x586F,
-	/* Array index: 0x0FCB */ 0x9B3C,0x5870,
-	/* Array index: 0x0FCB */ 0x9B54,0x7B49,
-	/* Array index: 0x0FCB */ 0x9B58,0x7C77,
-	/* Array index: 0x0FCB */ 0x9B5A,0x5E23,
-	/* Array index: 0x0FCB */ 0x9B6F,0x7027,
-	/* Array index: 0x0FCB */ 0x9B77,0x7026,
-	/* Array index: 0x0FCB */ 0x9B91,0x7335,
-	/* Array index: 0x0FCB */ 0x9BC0,0x7824,
-	/* Array index: 0x0FCB */ 0x9BD6,0x7956,
-	/* Array index: 0x0FCB */ 0x9BDB,0x7957,
-	/* Array index: 0x0FCB */ 0x9BE7,0x7955,
-	/* Array index: 0x0FCB */ 0x9BE8,0x7954,
-	/* Array index: 0x0FCB */ 0x9BFD,0x7822,
-	/* Array index: 0x0FCB */ 0x9C0D,0x7A5A,
-	/* Array index: 0x0FCB */ 0x9C13,0x7A59,
-	/* Array index: 0x0FCB */ 0x9C25,0x7B4C,
-	/* Array index: 0x0FCB */ 0x9C2D,0x7B4B,
-	/* Array index: 0x0FCB */ 0x9C31,0x7C2B,
-	/* Array index: 0x0FCB */ 0x9C3B,0x7C2D,
-	/* Array index: 0x0FCB */ 0x9C3E,0x7C2C,
-	/* Array index: 0x0FCB */ 0x9C49,0x7C2A,
-	/* Array index: 0x0FCB */ 0x9C54,0x7C57,
-	/* Array index: 0x0FCB */ 0x9C56,0x7C59,
-	/* Array index: 0x0FCB */ 0x9C57,0x7C58,
-	/* Array index: 0x0FCB */ 0x9C5F,0x7C78,
-	/* Array index: 0x0FCB */ 0x9C77,0x7D40,
-	/* Array index: 0x0FCB */ 0x9C78,0x7D41,
-	/* Array index: 0x0FCB */ 0x9CE5,0x5E24,
-	/* Array index: 0x0FCB */ 0x9CE9,0x676D,
-	/* Array index: 0x0FCB */ 0x9CF3,0x6B7A,
-	/* Array index: 0x0FCB */ 0x9CF4,0x6B78,
-	/* Array index: 0x0FCB */ 0x9CF6,0x6B79,
-	/* Array index: 0x0FCB */ 0x9D03,0x702A,
-	/* Array index: 0x0FCB */ 0x9D06,0x7028,
-	/* Array index: 0x0FCB */ 0x9D09,0x7029,
-	/* Array index: 0x0FCB */ 0x9D12,0x733A,
-	/* Array index: 0x0FCB */ 0x9D15,0x7336,
-	/* Array index: 0x0FCB */ 0x9D1B,0x733B,
-	/* Array index: 0x0FCB */ 0x9D23,0x7337,
-	/* Array index: 0x0FCB */ 0x9D26,0x7338,
-	/* Array index: 0x0FCB */ 0x9D28,0x7339,
-	/* Array index: 0x0FCB */ 0x9D3B,0x7631,
-	/* Array index: 0x0FCB */ 0x9D3F,0x7632,
-	/* Array index: 0x0FCB */ 0x9D51,0x7825,
-	/* Array index: 0x0FCB */ 0x9D5D,0x7826,
-	/* Array index: 0x0FCB */ 0x9D60,0x7827,
-	/* Array index: 0x0FCB */ 0x9D61,0x7959,
-	/* Array index: 0x0FCB */ 0x9D6A,0x795B,
-	/* Array index: 0x0FCB */ 0x9D6C,0x795C,
-	/* Array index: 0x0FCB */ 0x9D72,0x795A,
-	/* Array index: 0x0FCB */ 0x9D89,0x7958,
-	/* Array index: 0x0FCB */ 0x9DAF,0x7B4D,
-	/* Array index: 0x0FCB */ 0x9DB4,0x7B4E,
-	/* Array index: 0x0FCB */ 0x9DB8,0x7B50,
-	/* Array index: 0x0FCB */ 0x9DC2,0x7B4F,
-	/* Array index: 0x0FCB */ 0x9DD3,0x7C2E,
-	/* Array index: 0x0FCB */ 0x9DD7,0x7C2F,
-	/* Array index: 0x0FCB */ 0x9DE5,0x7C5A,
-	/* Array index: 0x0FCB */ 0x9DF9,0x7C79,
-	/* Array index: 0x0FCB */ 0x9DFA,0x7C7A,
-	/* Array index: 0x0FCB */ 0x9E1A,0x7D45,
-	/* Array index: 0x0FCB */ 0x9E1B,0x7D49,
-	/* Array index: 0x0FCB */ 0x9E1E,0x7D4A,
-	/* Array index: 0x0FCB */ 0x9E75,0x5E25,
-	/* Array index: 0x0FCB */ 0x9E79,0x7A5B,
-	/* Array index: 0x0FCB */ 0x9E7C,0x7C7B,
-	/* Array index: 0x0FCB */ 0x9E7D,0x7C7C,
-	/* Array index: 0x0FCB */ 0x9E7F,0x5E26,
-	/* Array index: 0x0FCB */ 0x9E82,0x676E,
-	/* Array index: 0x0FCB */ 0x9E8B,0x7633,
-	/* Array index: 0x0FCB */ 0x9E92,0x795D,
-	/* Array index: 0x0FCB */ 0x9E93,0x795F,
-	/* Array index: 0x0FCB */ 0x9E97,0x795E,
-	/* Array index: 0x0FCB */ 0x9E9D,0x7B51,
-	/* Array index: 0x0FCB */ 0x9E9F,0x7C5B,
-	/* Array index: 0x0FCB */ 0x9EA5,0x5E27,
-	/* Array index: 0x0FCB */ 0x9EA9,0x702B,
-	/* Array index: 0x0FCB */ 0x9EB4,0x7960,
-	/* Array index: 0x0FCB */ 0x9EB5,0x7A5C,
-	/* Array index: 0x0FCB */ 0x9EBB,0x5E28,
-	/* Array index: 0x0FCB */ 0x9EBC,0x6B7B,
-	/* Array index: 0x0FCB */ 0x9EBE,0x702C,
-	/* Array index: 0x0FCB */ 0x9EC3,0x6327,
-	/* Array index: 0x0FCB */ 0x9ED4,0x733D,
-	/* Array index: 0x0FCB */ 0x9ED8,0x733C,
-	/* Array index: 0x0FCB */ 0x9EE8,0x7A5D,
-	/* Array index: 0x0FCB */ 0x9EEF,0x7B52,
-	/* Array index: 0x0FCB */ 0x9EF4,0x7C5C,
-	/* Array index: 0x0FCB */ 0x9EF7,0x7D42,
-	/* Array index: 0x0FCB */ 0x9F07,0x7C7D,
-	/* Array index: 0x0FCB */ 0x9F0E,0x676F,
-	/* Array index: 0x0FCB */ 0x9F13,0x6770,
-	/* Array index: 0x0FCB */ 0x9F15,0x7829,
-	/* Array index: 0x0FCB */ 0x9F19,0x7B53,
-	/* Array index: 0x0FCB */ 0x9F20,0x6771,
-	/* Array index: 0x0FCB */ 0x9F2C,0x782A,
-	/* Array index: 0x0FCB */ 0x9F2F,0x7A5E,
-	/* Array index: 0x0FCB */ 0x9F34,0x7C30,
-	/* Array index: 0x0FCB */ 0x9F3B,0x6B7C,
-	/* Array index: 0x0FCB */ 0x9F3E,0x7639,
-	/* Array index: 0x0FCB */ 0x9F4A,0x6B7D,
-	/* Array index: 0x0FCB */ 0x9F4B,0x763A,
-	/* Array index: 0x0FCB */ 0x9F52,0x702F,
-	/* Array index: 0x0FCB */ 0x9F5C,0x7B54,
-	/* Array index: 0x0FCB */ 0x9F5F,0x7A5F,
-	/* Array index: 0x0FCB */ 0x9F61,0x7A61,
-	/* Array index: 0x0FCB */ 0x9F63,0x7A60,
-	/* Array index: 0x0FCB */ 0x9F66,0x7B55,
-	/* Array index: 0x0FCB */ 0x9F67,0x7B56,
-	/* Array index: 0x0FCB */ 0x9F6A,0x7C32,
-	/* Array index: 0x0FCB */ 0x9F6C,0x7C31,
-	/* Array index: 0x0FCB */ 0x9F72,0x7D21,
-	/* Array index: 0x0FCB */ 0x9F77,0x7C7E,
-	/* Array index: 0x0FCB */ 0x9F8D,0x733E,
-	/* Array index: 0x0FCB */ 0x9F90,0x7832,
-	/* Array index: 0x0FCB */ 0x9F94,0x7C33,
-	/* Array index: 0x0FCB */ 0x9F9C,0x733F,
-	/* Array index: 0x0FCB */ 0xFFE0,0x2266,
-	/* Array index: 0x0FCB */ 0xFFE1,0x2267,
-	/* Array index: 0x0FCB */ 0xFFE5,0x2264,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_CNS11643_PLANE1 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * cns11643_plane1 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_cns11643_plane1 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_CNS11643_PLANE1, /* CCS name */
-	TABLE_16BIT, /* Table bits */
-#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&from_ucs_size_cns11643_plane1, /* UCS -> cns11643_plane1 table size-optimized table */
-#elif defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&from_ucs_speed_cns11643_plane1, /* UCS -> cns11643_plane1 table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&to_ucs_size_cns11643_plane1 /* cns11643_plane1 -> UCS table speed-optimized table */
-#elif defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&to_ucs_speed_cns11643_plane1 /* cns11643_plane1 -> UCS table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_CNS11643_PLANE1) || ... */
-
diff --git a/newlib/libc/iconv/ccs/cns11643_plane14.c b/newlib/libc/iconv/ccs/cns11643_plane14.c
deleted file mode 100644
index 18230d5..0000000
--- a/newlib/libc/iconv/ccs/cns11643_plane14.c
+++ /dev/null
@@ -1,10763 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for cns11643_plane14 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
- || defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-/*
- * 16-bit cns11643_plane14 -> UCS speed-optimized table (36864 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_speed_cns11643_plane14[] =
-{
-	/* Heading Block */
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,0x0100,0x0200,0x0300,0x0400,0x0500,0x0600,0x0700,
-	0x0800,0x0900,0x0A00,0x0B00,0x0C00,0x0D00,0x0E00,0x0F00,
-	0x1000,0x1100,0x1200,0x1300,0x1400,0x1500,0x1600,0x1700,
-	0x1800,0x1900,0x1A00,0x1B00,0x1C00,0x1D00,0x1E00,0x1F00,
-	0x2000,0x2100,0x2200,0x2300,0x2400,0x2500,0x2600,0x2700,
-	0x2800,0x2900,0x2A00,0x2B00,0x2C00,0x2D00,0x2E00,0x2F00,
-	0x3000,0x3100,0x3200,0x3300,0x3400,0x3500,0x3600,0x3700,
-	0x3800,0x3900,0x3A00,0x3B00,0x3C00,0x3D00,0x3E00,0x3F00,
-	0x4000,0x4100,0x4200,0x4300,0x4400,0x4500,0x4600,0x4700,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	/* Block 34, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E28,0x4E36,0x4E3F,0x4E85,0x4E05,0x4E04,0x5182,
-	0x5196,0x5338,0x5369,0x53B6,0x4E2A,0x4E87,0x4E49,0x51E2,
-	0x4E46,0x4E8F,0x4EBC,0x4EBE,0x5166,0x51E3,0x5204,0x529C,
-	INVALC,0x5902,0x590A,0x5B80,0x5DDB,0x5E7A,0x5E7F,0x5EF4,
-	0x5F50,0x5F51,0x5F61,0x961D,INVALC,0x4E63,0x4E62,0x4EA3,
-	0x5185,0x4EC5,0x4ECF,0x4ECE,0x4ECC,0x5184,0x5186,INVALC,
-	INVALC,0x51E4,0x5205,0x529E,0x529D,0x52FD,0x5300,0x533A,
-	INVALC,0x5346,0x535D,0x5386,0x53B7,INVALC,0x53CC,INVALC,
-	0x53CE,0x5721,INVALC,0x5E00,0x5F0C,0x6237,0x6238,0x6534,
-	0x6535,0x65E0,INVALC,0x738D,0x4E97,0x4EE0,INVALC,INVALC,
-	0x4EE7,INVALC,0x4EE6,INVALC,INVALC,INVALC,INVALC,0x56D8,
-	0x518B,0x518C,0x5199,0x51E5,INVALC,0x520B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 35, Array index 0x0200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5304,0x5303,0x5307,INVALC,0x531E,0x535F,
-	0x536D,0x5389,0x53BA,0x53D0,INVALC,0x53F6,0x53F7,0x53F9,
-	INVALC,0x53F4,INVALC,INVALC,0x5724,0x5904,0x5918,0x5932,
-	0x5930,0x5934,INVALC,0x5975,INVALC,0x5B82,0x5BF9,0x5C14,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E81,
-	0x5E83,0x5F0D,0x5F52,INVALC,0x5FCA,0x5FC7,0x6239,INVALC,
-	0x624F,0x65E7,0x672F,0x6B7A,0x6C39,INVALC,INVALC,0x6C37,
-	0x6C44,0x6C45,0x738C,0x7592,0x7676,0x9093,0x9092,INVALC,
-	INVALC,0x4E21,0x4E20,0x4E22,0x4E68,0x4E89,0x4E98,0x4EF9,
-	0x4EEF,INVALC,INVALC,0x4EF8,0x4F06,0x4F03,0x4EFC,0x4EEE,
-	0x4F16,INVALC,0x4F28,0x4F1C,0x4F07,0x4F1A,0x4EFA,0x4F17,
-	0x514A,INVALC,0x5172,INVALC,0x51B4,0x51B3,0x51B2,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 36, Array index 0x0300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x51E8,INVALC,0x5214,0x520F,0x5215,0x5218,
-	0x52A8,INVALC,0x534B,0x534F,INVALC,0x5350,INVALC,0x538B,
-	INVALC,0x53BE,INVALC,0x53D2,0x5416,0x53FF,INVALC,0x5400,
-	INVALC,0x5405,0x5413,0x5415,INVALC,INVALC,0x56E3,0x5735,
-	0x5736,0x5731,0x5732,0x58EE,0x5905,0x4E54,INVALC,0x5936,
-	INVALC,INVALC,INVALC,0x597A,INVALC,0x5986,INVALC,INVALC,
-	0x5B86,0x5F53,0x5C18,INVALC,0x5C3D,0x5C78,INVALC,INVALC,
-	INVALC,INVALC,0x5C80,INVALC,0x5E08,INVALC,INVALC,INVALC,
-	INVALC,0x5EF5,0x5F0E,INVALC,INVALC,INVALC,0x5FD3,0x5FDA,
-	INVALC,0x5FDB,INVALC,0x620F,0x625D,0x625F,0x6267,0x6257,
-	0x9F50,INVALC,0x65EB,0x65EA,INVALC,0x6737,INVALC,0x6732,
-	0x6736,0x6B22,0x6BCE,INVALC,0x6C58,0x6C51,0x6C77,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 37, Array index 0x0400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6C3C,INVALC,0x6C5A,INVALC,0x6C53,0x706F,0x7072,
-	0x706E,INVALC,INVALC,0x7073,0x72B1,0x72B2,INVALC,0x738F,
-	INVALC,INVALC,INVALC,0x793C,INVALC,0x808D,0x808E,INVALC,
-	0x827B,INVALC,0x8D71,0x8FB9,0x9096,0x909A,INVALC,0x4E24,
-	0x4E71,INVALC,0x4E9C,0x4F45,0x4F4A,0x4F39,0x4F37,INVALC,
-	0x4F32,0x4F42,INVALC,0x4F44,0x4F4B,INVALC,0x4F40,0x4F35,
-	0x4F31,0x5151,INVALC,0x5150,0x514E,INVALC,INVALC,0x519D,
-	INVALC,0x51B5,0x51B8,0x51EC,0x5223,0x5227,0x5226,0x521F,
-	0x522B,0x5220,0x52B4,0x52B3,INVALC,0x5325,0x533B,0x5374,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x544D,INVALC,INVALC,
-	0x543A,INVALC,INVALC,0x5444,0x544C,0x5423,0x541A,0x5432,
-	0x544B,0x5421,INVALC,0x5434,0x5449,0x5450,0x5422,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 38, Array index 0x0500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x543F,0x5451,0x545A,0x542F,INVALC,0x56E9,0x56F2,
-	0x56F3,0x56EF,0x56ED,0x56EC,0x56E6,0x5748,INVALC,0x5744,
-	0x573F,0x573C,0x5753,0x5756,INVALC,0x575F,0x5743,0x5758,
-	0x5757,INVALC,INVALC,INVALC,0x5746,INVALC,0x573D,INVALC,
-	0x5742,0x5754,0x5755,0x58F1,0x58F2,0x58F0,0x590B,0x9EA6,
-	0x56F1,0x593D,INVALC,0x5994,0x598C,INVALC,0x599C,INVALC,
-	INVALC,0x599F,INVALC,0x599B,INVALC,0x5989,0x599A,INVALC,
-	0x6588,INVALC,0x5B8D,INVALC,0x5BFE,0x5BFF,0x5BFD,0x5C2B,
-	INVALC,0x5C84,0x5C8E,0x5C9C,INVALC,INVALC,0x5C85,0x5DF5,
-	0x5E09,INVALC,INVALC,0x5E0B,INVALC,0x5E92,0x5E90,0x5F03,
-	INVALC,0x5F1E,0x5F63,INVALC,0x5FE7,0x5FFE,0x5FE6,0x5FDC,
-	0x5FCE,INVALC,0x5FFC,0x5FDF,0x5FEC,0x5FF6,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 39, Array index 0x0600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5FF2,0x5FF0,0x5FF9,INVALC,0x6213,INVALC,INVALC,
-	0x623B,0x623C,0x6282,INVALC,INVALC,INVALC,0x6278,0x628B,
-	INVALC,0x629E,0x62A5,0x629B,0x629C,0x6299,0x628D,0x6285,
-	0x629D,0x6275,INVALC,INVALC,INVALC,0x65F6,INVALC,INVALC,
-	INVALC,0x66F5,0x675B,INVALC,0x6754,0x6752,INVALC,0x6758,
-	0x6744,0x674A,0x6761,INVALC,0x6C7F,0x6C91,0x6C9E,INVALC,
-	0x6C6E,0x6C7C,0x6C9F,0x6C75,INVALC,0x6C56,0x6CA2,0x6C79,
-	INVALC,0x6CA1,INVALC,0x6CAA,0x6CA0,INVALC,0x7079,0x7077,
-	0x707E,INVALC,0x7075,0x707B,0x7264,INVALC,0x72BB,0x72BC,
-	0x72C7,0x72B9,0x72BE,0x72B6,INVALC,INVALC,0x7398,INVALC,
-	INVALC,INVALC,INVALC,0x7593,0x7680,INVALC,0x7683,0x76C0,
-	0x76C1,INVALC,INVALC,0x77F4,0x77F5,INVALC,0x7ACC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 40, Array index 0x0700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7ACD,0x7CFA,0x809F,0x8091,0x8097,0x8094,INVALC,
-	0x8286,0x828C,INVALC,0x8295,INVALC,0x866C,INVALC,0x8FB5,
-	0x8FBE,0x8FC7,INVALC,0x8FC1,0x90A9,0x90A4,INVALC,INVALC,
-	INVALC,0x90A8,0x9627,0x9626,0x962B,0x9633,0x9634,0x9629,
-	0x4E3D,INVALC,0x4E9D,0x4F93,0x4F8A,INVALC,INVALC,0x4F6D,
-	0x4F8E,0x4FA0,0x4FA2,0x4FA1,0x4F9F,0x4FA3,INVALC,0x4F72,
-	INVALC,0x4F8C,0x5156,INVALC,INVALC,0x5190,INVALC,INVALC,
-	INVALC,0x51ED,0x51FE,0x522F,INVALC,0x523C,0x5234,0x5239,
-	0x52B9,0x52B5,0x52BF,0x5355,INVALC,0x5376,0x537A,0x5393,
-	INVALC,0x53C1,0x53C2,0x53D5,0x5485,INVALC,0x545F,0x5493,
-	0x5489,0x5479,0x9EFE,0x548F,0x5469,0x546D,INVALC,0x5494,
-	0x546A,0x548A,INVALC,0x56FD,0x56FB,0x56F8,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 41, Array index 0x0800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x56FC,0x56F6,0x5765,0x5781,0x5763,0x5767,INVALC,
-	0x576E,0x5778,0x577F,INVALC,INVALC,0x58F3,0x594B,0x594C,
-	INVALC,INVALC,INVALC,0x59AD,INVALC,0x59C4,INVALC,0x59C2,
-	0x59B0,INVALC,INVALC,INVALC,INVALC,0x59BF,INVALC,0x59C9,
-	0x59B8,0x59AC,INVALC,INVALC,INVALC,0x59B7,0x59D7,INVALC,
-	0x5B60,INVALC,0x5B96,0x5B9E,0x5B94,0x5B9F,0x5B9D,INVALC,
-	0x5C00,0x5C19,INVALC,INVALC,0x5C49,0x5C4A,INVALC,0x5CBB,
-	0x5CC1,INVALC,INVALC,INVALC,0x5CB9,0x5C9E,0x5CB4,0x5CBA,
-	0x5DF6,0x5E13,0x5E12,0x5E77,INVALC,0x5E98,INVALC,0x5E99,
-	0x5E9D,0x5EF8,INVALC,0x5EF9,INVALC,0x5F06,0x5F21,INVALC,
-	0x5F25,0x5F55,INVALC,INVALC,INVALC,0x5F84,0x5F83,0x6030,
-	0x6007,INVALC,0x6036,INVALC,INVALC,INVALC,0x5FE9,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 42, Array index 0x0900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x603D,0x6008,INVALC,INVALC,0x62BA,0x62B2,INVALC,
-	0x62B7,0x62E4,0x62A7,INVALC,INVALC,INVALC,0x62D5,0x62E1,
-	0x62DD,0x62A6,0x62C1,0x62C5,0x62C0,0x62DF,0x62E0,0x62DE,
-	INVALC,0x6589,INVALC,0x65A6,0x65BA,INVALC,0x65FF,INVALC,
-	0x6617,0x6618,0x6601,0x65FE,INVALC,0x670C,INVALC,0x676B,
-	0x6796,0x6782,0x678A,INVALC,0x67A3,INVALC,0x67A2,0x678F,
-	INVALC,0x67F9,0x6780,0x6B26,0x6B27,0x6B68,0x6B69,INVALC,
-	0x6B81,0x6BB4,0x6BD1,INVALC,INVALC,0x6C1C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6C97,0x6C6C,0x6CDF,INVALC,0x6CEA,
-	INVALC,0x6CE4,0x6CD8,0x6CB2,0x6CCE,0x6CC8,INVALC,0x708B,
-	0x7088,0x7090,0x708F,INVALC,0x7087,0x7089,0x708D,0x7081,
-	INVALC,0x708C,INVALC,INVALC,0x7240,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 43, Array index 0x0A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7265,0x7266,0x7268,INVALC,INVALC,0x72CD,0x72D3,
-	0x72DB,INVALC,0x72CF,0x73A7,0x73A3,0x739E,INVALC,0x73AF,
-	INVALC,INVALC,0x73AA,0x739C,INVALC,0x7542,0x7544,0x753B,
-	0x7541,INVALC,0x759B,0x759E,INVALC,0x79C4,0x79C3,0x79C6,
-	INVALC,INVALC,0x79C7,INVALC,0x79CA,INVALC,INVALC,0x7ACF,
-	0x7C76,0x7C74,0x7CFF,0x7CFC,INVALC,INVALC,0x7F59,0x80A8,
-	INVALC,INVALC,0x80B0,INVALC,0x80B3,INVALC,0x80A4,0x80B6,
-	0x80A7,0x80AC,INVALC,0x80A6,0x5367,0x820E,0x82C4,0x833E,
-	0x829C,INVALC,INVALC,INVALC,INVALC,INVALC,0x82AA,INVALC,
-	0x82C9,INVALC,INVALC,0x82A6,0x82B2,INVALC,INVALC,INVALC,
-	0x8FCC,0x8FD9,0x8FCA,0x8FD8,0x8FCF,0x90B7,INVALC,0x90AD,
-	0x90B9,0x9637,INVALC,0x9641,0x963E,0x96B6,0x9751,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 44, Array index 0x0B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9763,0x4E57,0x4E79,0x4EB2,0x4EB0,0x4EAF,0x4EB1,
-	0x4FD2,0x4FD5,INVALC,0x4FBE,0x4FB8,0x4FB0,0x4FB1,0x4FC8,
-	INVALC,INVALC,0x4FC6,0x4FCC,0x4FE5,0x4FE3,0x4FB4,0x516A,
-	INVALC,0x519F,INVALC,0x51C1,INVALC,0x51C2,0x51C3,0x5245,
-	0x5248,INVALC,INVALC,0x524F,INVALC,INVALC,0x52C5,0x52CA,
-	0x52C4,0x5327,0x5358,0x537D,INVALC,0x53DD,0x53DC,0x53DA,
-	0x53D9,0x54B9,INVALC,0x54D0,0x54B4,0x54CA,INVALC,0x54A3,
-	0x54DA,0x54A4,INVALC,0x54B2,0x549E,0x549F,0x54B5,INVALC,
-	INVALC,0x54CD,INVALC,0x54CC,INVALC,0x5700,0x57AC,0x5791,
-	0x578E,0x578D,0x5792,0x57A1,0x5790,0x57A6,0x57A8,INVALC,
-	0x579C,0x5796,0x57A7,INVALC,INVALC,INVALC,INVALC,0x58F5,
-	INVALC,0x5909,0x5908,INVALC,0x5952,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 45, Array index 0x0C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x59DF,INVALC,0x59EB,0x59EF,0x59F0,0x59D5,0x5A0D,
-	0x5A04,0x59F9,0x5A02,0x59F8,0x59E2,0x59D9,0x59E7,0x5B6A,
-	INVALC,INVALC,0x5BAB,INVALC,0x5C1B,0x5C2F,INVALC,0x663C,
-	INVALC,INVALC,INVALC,0x5CD1,0x5CDC,0x5CE6,0x5CE1,0x5CCD,
-	INVALC,0x5CE2,0x5CDD,0x5CE5,0x5DFB,0x5DFA,0x5E1E,INVALC,
-	0x5EA1,INVALC,INVALC,0x5EFC,0x5EFB,0x5F2F,INVALC,INVALC,
-	0x5F66,INVALC,INVALC,INVALC,0x605C,INVALC,0x604E,0x6051,
-	INVALC,INVALC,0x6023,0x6031,0x607C,0x6052,INVALC,0x6060,
-	0x604A,0x6061,INVALC,0x6218,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x631F,0x6317,0x62EA,0x6321,0x6304,
-	0x6305,INVALC,0x6531,0x6544,0x6540,INVALC,0x6542,0x65BE,
-	INVALC,0x6629,0x661B,INVALC,0x6623,0x662C,0x661A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 46, Array index 0x0D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6630,0x663B,0x661E,0x6637,0x6638,INVALC,0x670E,
-	INVALC,INVALC,0x67E8,0x67D6,INVALC,0x67C7,0x67BC,0x6852,
-	0x67BF,0x67D5,0x67FE,0x8363,0x67FB,INVALC,0x67B1,0x6801,
-	0x6805,0x6800,0x67D7,INVALC,0x6B2A,0x6B6B,INVALC,INVALC,
-	INVALC,INVALC,0x6BE1,INVALC,INVALC,0x6D23,0x6CFF,0x6D14,
-	0x6D05,0x6D13,0x6D06,0x6D21,INVALC,0x6D15,0x6CAF,0x6CF4,
-	0x6D02,0x6D45,INVALC,0x6D26,INVALC,0x6D44,INVALC,0x6D24,
-	0x70A5,INVALC,0x70A3,INVALC,0x70A2,0x70BB,0x70A0,0x70AA,
-	INVALC,INVALC,0x70A8,0x70B6,0x70B2,0x70A7,INVALC,INVALC,
-	0x70B9,0x722E,INVALC,0x723C,INVALC,0x726D,INVALC,INVALC,
-	0x72E7,0x72ED,INVALC,0x72EC,0x72E5,0x72E2,INVALC,0x73C4,
-	0x73BD,0x73CF,0x73C9,0x73C1,0x73D0,INVALC,0x73CE,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 47, Array index 0x0E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x74ED,0x74EB,INVALC,0x74EF,0x7549,0x7550,0x7546,
-	0x754A,INVALC,0x754D,0x75A6,INVALC,INVALC,INVALC,0x75A8,
-	INVALC,INVALC,0x76C7,0x76FF,INVALC,0x76FD,0x77E6,0x780A,
-	INVALC,0x7804,0x780B,0x7807,INVALC,0x7815,0x7808,INVALC,
-	0x79D3,0x79D4,0x79D0,0x79D7,0x7A7C,INVALC,INVALC,0x7A7D,
-	0x7A83,0x7A82,INVALC,0x7AD4,0x7AD5,0x7AD3,0x7AD0,0x7AD2,
-	0x7AFE,0x7AFC,0x7C77,0x7C7C,0x7C7B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7F8F,0x80D3,INVALC,
-	0x80CB,0x80D2,INVALC,0x8109,0x80E2,0x80DF,0x80C6,INVALC,
-	0x8224,0x82F7,0x82D8,0x82DD,INVALC,INVALC,0x82F8,0x82FC,
-	INVALC,INVALC,0x82E9,INVALC,0x82EE,INVALC,0x82D0,0x830E,
-	0x82E2,0x830B,0x82FD,0x5179,0x8676,INVALC,0x8678,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 48, Array index 0x0F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x8675,0x867D,INVALC,0x8842,0x8866,
-	INVALC,0x898C,0x8A05,INVALC,0x8A06,INVALC,0x8C9F,INVALC,
-	0x8FF1,0x8FE7,0x8FE9,0x8FEF,0x90C2,0x90BC,INVALC,0x90C6,
-	0x90C0,INVALC,INVALC,0x90CD,0x90C9,INVALC,0x90C4,INVALC,
-	0x9581,INVALC,0x9CEC,0x5032,0x4FF9,0x501D,0x4FFF,0x5004,
-	0x4FF0,0x5003,INVALC,0x5002,0x4FFC,0x4FF2,0x5024,0x5008,
-	0x5036,0x502E,INVALC,0x5010,0x5038,0x5039,0x4FFD,0x5056,
-	0x4FFB,0x51A3,0x51A6,0x51A1,INVALC,INVALC,0x51C7,0x51C9,
-	0x5260,0x5264,0x5259,0x5265,0x5267,0x5257,0x5263,INVALC,
-	0x5253,INVALC,0x52CF,INVALC,0x52CE,0x52D0,0x52D1,0x52CC,
-	INVALC,INVALC,INVALC,0x550D,0x54F4,INVALC,0x5513,0x54EF,
-	0x54F5,0x54F9,0x5502,0x5500,INVALC,INVALC,0x5518,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 49, Array index 0x1000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x54F0,0x54F6,INVALC,INVALC,0x5519,INVALC,0x5705,
-	0x57C9,INVALC,0x57B7,0x57CD,INVALC,INVALC,INVALC,0x57BE,
-	0x57BB,INVALC,0x57DB,0x57C8,0x57C4,0x57C5,0x57D1,0x57CA,
-	0x57C0,INVALC,INVALC,0x5A21,0x5A2A,INVALC,0x5A1D,INVALC,
-	0x5A0B,INVALC,INVALC,INVALC,INVALC,0x5A22,INVALC,INVALC,
-	0x5A24,INVALC,0x5A14,0x5A31,INVALC,0x5A2F,0x5A1A,0x5A12,
-	INVALC,INVALC,0x5A26,INVALC,INVALC,0x5BBC,0x5BBB,0x5BB7,
-	0x5C05,0x5C06,0x5C52,0x5C53,INVALC,INVALC,0x5CFA,0x5CEB,
-	INVALC,0x5CF3,0x5CF5,0x5CE9,0x5CEF,INVALC,0x5E2A,0x5E30,
-	0x5E2E,0x5E2C,0x5E2F,0x5EAF,0x5EA9,INVALC,0x5EFD,0x5F32,
-	0x5F8E,0x5F93,0x5F8F,0x604F,0x6099,INVALC,0x607E,INVALC,
-	0x6074,0x604B,0x6073,0x6075,INVALC,INVALC,0x6056,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 50, Array index 0x1100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x60A9,0x608B,0x60A6,INVALC,0x6093,0x60AE,0x609E,
-	0x60A7,0x6245,INVALC,INVALC,0x632E,INVALC,0x6352,0x6330,
-	0x635B,INVALC,0x6319,0x631B,INVALC,0x6331,0x635D,0x6337,
-	0x6335,0x6353,INVALC,0x635C,0x633F,0x654B,INVALC,INVALC,
-	0x658B,INVALC,0x659A,0x6650,0x6646,0x664E,0x6640,INVALC,
-	0x664B,0x6648,INVALC,0x6660,0x6644,0x664D,INVALC,0x6837,
-	0x6824,INVALC,INVALC,0x681B,0x6836,INVALC,0x682C,0x6819,
-	0x6856,0x6847,0x683E,0x681E,INVALC,0x6815,0x6822,0x6827,
-	0x6859,0x6858,0x6855,0x6830,0x6823,0x6B2E,0x6B2B,0x6B30,
-	0x6B6C,INVALC,0x6B8B,INVALC,0x6BE9,0x6BEA,0x6BE5,0x6D6B,
-	INVALC,INVALC,0x6D73,0x6D57,INVALC,INVALC,0x6D5D,0x6D56,
-	0x6D8F,0x6D5B,0x6D1C,0x6D9A,0x6D9B,0x6D99,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 51, Array index 0x1200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6D81,0x6D71,INVALC,INVALC,0x6D72,0x6D5C,0x6D96,
-	0x70C4,0x70DB,0x70CC,0x70D0,0x70E3,0x70DF,INVALC,0x70D6,
-	0x70EE,0x70D5,INVALC,INVALC,INVALC,INVALC,0x727A,INVALC,
-	0x72F5,0x7302,INVALC,INVALC,0x73E2,0x73EC,0x73D5,0x73F9,
-	0x73DF,0x73E6,INVALC,INVALC,INVALC,INVALC,0x73E4,0x73E1,
-	0x74F3,INVALC,INVALC,INVALC,INVALC,0x7556,0x7555,0x7558,
-	0x7557,0x755E,0x75C3,INVALC,INVALC,0x75B4,INVALC,0x75B1,
-	INVALC,INVALC,0x76CB,0x76CC,0x772A,INVALC,0x7716,0x770F,
-	INVALC,INVALC,0x773F,0x772B,0x770E,0x7724,INVALC,0x7721,
-	0x7718,0x77DD,INVALC,INVALC,0x7824,0x7836,INVALC,0x7958,
-	0x7959,INVALC,0x7962,0x79DA,0x79D9,INVALC,0x79E1,0x79E5,
-	0x79E8,0x79DB,INVALC,0x79E2,0x79F0,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 52, Array index 0x1300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7ADA,0x7ADD,INVALC,0x7ADB,0x7ADC,
-	INVALC,INVALC,0x7B0D,0x7B0B,0x7B14,0x7C8E,0x7C86,INVALC,
-	0x7C87,0x7C83,0x7C8B,INVALC,INVALC,INVALC,INVALC,0x7D24,
-	INVALC,INVALC,INVALC,0x7D25,0x7F62,0x7F93,0x7F99,0x7F97,
-	INVALC,INVALC,0x7FC4,0x7FC6,0x800A,INVALC,INVALC,0x8040,
-	0x803C,0x803B,0x80F6,0x80FF,0x80EE,0x8104,0x8103,0x8107,
-	INVALC,INVALC,0x80F7,INVALC,INVALC,0x822D,INVALC,0x8227,
-	0x8229,0x831F,0x8357,INVALC,INVALC,INVALC,INVALC,0x8321,
-	INVALC,INVALC,0x8318,0x8358,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8684,0x869F,0x869B,0x8689,0x86A6,0x8692,0x868F,
-	0x86A0,0x884F,0x8878,0x887A,0x886E,0x887B,0x8884,0x8873,
-	INVALC,INVALC,0x8A0D,0x8A0B,0x8A19,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 53, Array index 0x1400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x8FF9,0x9009,0x9008,
-	INVALC,0x90DE,0x9151,INVALC,INVALC,0x91DB,0x91DF,0x91DE,
-	0x91D6,0x91E0,0x9585,0x9660,0x9659,INVALC,0x9656,INVALC,
-	INVALC,0x96BD,INVALC,INVALC,0x5042,0x5059,INVALC,0x5044,
-	0x5066,0x5052,0x5054,0x5071,0x5050,0x507B,0x507C,0x5058,
-	INVALC,INVALC,0x5079,0x506C,0x5078,0x51A8,0x51D1,0x51CF,
-	0x5268,0x5276,0x52D4,INVALC,0x53A0,0x53C4,INVALC,0x5558,
-	0x554C,0x5568,INVALC,0x5549,INVALC,INVALC,0x555D,0x5529,
-	INVALC,0x5554,0x5553,INVALC,0x555A,INVALC,0x553A,0x553F,
-	0x552B,0x57EA,INVALC,0x57EF,INVALC,INVALC,0x57DD,0x57FE,
-	INVALC,0x57DE,0x57E6,INVALC,0x57E8,0x57FF,0x5803,0x58F7,
-	0x68A6,0x591F,INVALC,0x595B,0x595D,0x595E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 54, Array index 0x1500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5A2B,INVALC,0x5A3B,INVALC,INVALC,0x5A61,
-	0x5A3A,0x5A6E,0x5A4B,0x5A6B,INVALC,INVALC,0x5A45,0x5A4E,
-	0x5A68,0x5A3D,0x5A71,0x5A3F,0x5A6F,0x5A75,INVALC,0x5A73,
-	0x5A2C,0x5A59,0x5A54,0x5A4F,0x5A63,INVALC,INVALC,0x5BC8,
-	INVALC,0x5BC3,INVALC,0x5C5B,0x5C61,INVALC,0x5D21,0x5D0A,
-	0x5D09,INVALC,0x5D2C,0x5D08,INVALC,INVALC,0x5D2A,0x5D15,
-	INVALC,0x5D10,0x5D13,INVALC,0x5D2F,0x5D18,INVALC,0x5DE3,
-	0x5E39,0x5E35,0x5E3A,0x5E32,INVALC,INVALC,INVALC,INVALC,
-	0x5EBB,0x5EBA,0x5F34,0x5F39,INVALC,INVALC,INVALC,INVALC,
-	0x6098,INVALC,0x60D0,INVALC,INVALC,INVALC,0x60D7,0x60AA,
-	INVALC,0x60A1,0x60A4,INVALC,0x60EE,INVALC,0x60E7,INVALC,
-	INVALC,0x60DE,INVALC,INVALC,0x637E,0x638B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 55, Array index 0x1600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6379,0x6386,0x6393,INVALC,0x6373,0x636A,
-	INVALC,0x636C,INVALC,0x637F,INVALC,0x63B2,0x63BA,INVALC,
-	INVALC,0x6366,0x6374,INVALC,0x655A,INVALC,0x654E,0x654D,
-	0x658D,0x658E,0x65AD,INVALC,0x65C7,0x65CA,INVALC,0x65C9,
-	INVALC,0x65E3,0x6657,INVALC,0x6663,0x6667,0x671A,0x6719,
-	0x6716,INVALC,INVALC,0x689E,0x68B6,0x6898,0x6873,INVALC,
-	0x689A,0x688E,0x68B7,0x68DB,0x68A5,0x686C,0x68C1,0x6884,
-	INVALC,INVALC,0x6895,0x687A,0x6899,INVALC,0x68B8,0x68B9,
-	0x6870,INVALC,0x6B35,INVALC,0x6B90,0x6BBB,0x6BED,INVALC,
-	INVALC,INVALC,0x6DC1,0x6DC3,0x6DCE,INVALC,INVALC,0x6DAD,
-	0x6E04,INVALC,0x6DB9,INVALC,0x6DE7,INVALC,0x6E08,0x6E06,
-	INVALC,0x6E0A,0x6DB0,INVALC,0x6DF8,0x6E0C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 56, Array index 0x1700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6DB1,INVALC,0x6E02,0x6E07,0x6E09,0x6E01,0x6E17,
-	0x6DFF,0x6E12,INVALC,INVALC,0x7103,0x7107,0x7101,0x70F5,
-	0x70F1,0x7108,0x70F2,0x710F,INVALC,0x70FE,INVALC,INVALC,
-	INVALC,0x731A,0x7310,0x730E,0x7402,0x73F3,INVALC,INVALC,
-	0x73FB,INVALC,INVALC,INVALC,0x751B,0x7523,0x7561,0x7568,
-	INVALC,0x7567,0x75D3,INVALC,INVALC,0x7690,INVALC,INVALC,
-	0x76D5,0x76D7,0x76D6,0x7730,INVALC,0x7726,INVALC,0x7740,
-	INVALC,0x771E,INVALC,INVALC,INVALC,0x7847,INVALC,0x784B,
-	0x7851,0x784F,0x7842,0x7846,INVALC,0x796E,0x796C,0x79F2,
-	INVALC,0x79F1,0x79F5,0x79F3,0x79F9,INVALC,INVALC,INVALC,
-	0x7A9A,0x7A93,0x7A91,0x7AE1,INVALC,INVALC,0x7B21,0x7B1C,
-	0x7B16,0x7B17,0x7B36,0x7B1F,INVALC,0x7C93,0x7C99,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 57, Array index 0x1800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7C9A,0x7C9C,INVALC,0x7D49,INVALC,0x7D34,0x7D37,
-	INVALC,0x7D2D,INVALC,0x7D4C,INVALC,INVALC,0x7D48,INVALC,
-	INVALC,0x7F3B,INVALC,INVALC,INVALC,INVALC,0x8008,0x801A,
-	INVALC,0x801D,INVALC,0x8049,0x8045,0x8044,0x7C9B,INVALC,
-	INVALC,0x812A,0x812E,INVALC,INVALC,0x8131,INVALC,0x811A,
-	0x8134,0x8117,INVALC,INVALC,INVALC,0x831D,0x8371,0x8384,
-	0x8380,0x8372,0x83A1,INVALC,0x8379,0x8391,INVALC,0x839F,
-	0x83AD,INVALC,INVALC,0x8323,INVALC,0x8385,0x839C,0x83B7,
-	0x8658,0x865A,INVALC,0x8657,0x86B2,INVALC,0x86AE,INVALC,
-	INVALC,INVALC,0x8845,0x889C,0x8894,0x88A3,0x888F,0x88A5,
-	0x88A9,0x88A6,0x888A,0x88A0,0x8890,0x8992,0x8991,0x8994,
-	INVALC,0x8A26,0x8A32,0x8A28,INVALC,INVALC,0x8A1C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 58, Array index 0x1900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x8A2B,0x8A20,INVALC,0x8A29,INVALC,INVALC,
-	INVALC,0x8A21,0x8C3A,INVALC,0x8C5B,0x8C58,0x8C7C,INVALC,
-	0x8CA6,0x8CAE,0x8CAD,0x8D65,INVALC,0x8D7E,INVALC,0x8D7C,
-	0x8D7F,0x8D7A,0x8DBD,INVALC,INVALC,0x8DC0,0x8DBB,0x8EAD,
-	0x8EAF,0x8ED6,INVALC,INVALC,INVALC,INVALC,INVALC,0x8ED9,
-	INVALC,INVALC,0x9012,0x900E,0x9025,INVALC,0x9013,0x90EE,
-	INVALC,0x90AB,0x90F7,INVALC,0x9159,0x9154,0x91F2,0x91F0,
-	0x91E5,0x91F6,INVALC,INVALC,0x9587,INVALC,0x965A,INVALC,
-	INVALC,0x966E,INVALC,INVALC,INVALC,0x9679,INVALC,0x98E1,
-	0x98E6,INVALC,0x9EC4,0x9ED2,0x4E80,INVALC,0x4E81,0x508F,
-	0x5097,0x5088,0x5089,INVALC,INVALC,0x5081,0x5160,INVALC,
-	INVALC,0x5E42,0x51D3,INVALC,INVALC,0x51D2,0x51D6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 59, Array index 0x1A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5273,INVALC,0x5270,INVALC,INVALC,INVALC,0x53A8,
-	0x53A6,0x53C5,0x5597,0x55DE,INVALC,INVALC,0x5596,0x55B4,
-	INVALC,0x5585,INVALC,0x559B,0x55A0,INVALC,0x5559,INVALC,
-	0x5586,INVALC,INVALC,0x55AF,0x557A,INVALC,INVALC,INVALC,
-	0x559E,INVALC,0x55A9,0x570F,0x570E,0x581A,INVALC,0x581F,
-	INVALC,0x583C,0x5818,0x583E,0x5826,INVALC,0x583A,INVALC,
-	0x5822,INVALC,0x58FB,0x5963,0x5964,INVALC,0x5AA8,0x5AA3,
-	0x5A82,0x5A88,0x5AA1,0x5A85,0x5A98,INVALC,0x5A99,INVALC,
-	0x5A89,0x5A81,0x5A96,0x5A80,INVALC,INVALC,0x5A91,INVALC,
-	INVALC,INVALC,INVALC,0x5ACF,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5A87,0x5AA0,INVALC,0x5A79,INVALC,0x5A86,
-	0x5AAB,0x5AAA,0x5AA4,0x5A8D,0x5A7E,INVALC,0x5BD5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 60, Array index 0x1B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5C1E,0x5C5F,0x5C5E,0x5D44,
-	0x5D3E,INVALC,0x5D48,0x5D1C,INVALC,0x5D5B,0x5D4D,INVALC,
-	INVALC,0x5D57,INVALC,0x5D53,0x5D4F,INVALC,0x5D3B,0x5D46,
-	INVALC,INVALC,0x5E46,0x5E47,INVALC,0x5E48,0x5EC0,0x5EBD,
-	0x5EBF,INVALC,0x5F11,INVALC,0x5F3E,0x5F3B,INVALC,0x5F3A,
-	INVALC,INVALC,INVALC,0x5FA7,INVALC,0x60EA,INVALC,0x6107,
-	0x6122,0x610C,INVALC,INVALC,0x60B3,0x60D6,0x60D2,INVALC,
-	0x60E3,0x60E5,0x60E9,INVALC,INVALC,0x6111,0x60FD,INVALC,
-	INVALC,0x611E,0x6120,0x6121,0x621E,INVALC,0x63E2,0x63DE,
-	0x63E6,INVALC,INVALC,INVALC,INVALC,0x63F8,INVALC,0x63FE,
-	0x63C1,0x63BF,0x63F7,0x63D1,0x655F,0x6560,0x6561,INVALC,
-	INVALC,0x65D1,INVALC,INVALC,0x667D,0x666B,0x667F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 61, Array index 0x1C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6673,0x6681,0x666D,0x6669,INVALC,
-	INVALC,0x671E,0x68ED,INVALC,INVALC,INVALC,INVALC,0x6903,
-	INVALC,0x68FE,0x68E5,0x691E,0x6902,INVALC,INVALC,0x6909,
-	0x68CA,0x6900,INVALC,0x6901,0x6918,0x68E2,0x68CF,INVALC,
-	0x692E,0x68C5,0x68FF,INVALC,0x691C,0x68C3,INVALC,0x6B6F,
-	INVALC,0x6B6E,INVALC,0x6BBE,INVALC,0x6BF4,0x6C2D,INVALC,
-	0x6DB6,0x6E75,0x6E1E,INVALC,0x6E18,INVALC,0x6E48,INVALC,
-	0x6E4F,INVALC,0x6E42,0x6E6A,0x6E70,0x6DFE,INVALC,INVALC,
-	0x6E6D,INVALC,0x6E7B,0x6E7E,0x6E59,INVALC,0x6E57,INVALC,
-	0x6E80,0x6E50,INVALC,0x6E29,0x6E76,0x6E2A,0x6E4C,0x712A,
-	INVALC,0x7135,0x712C,0x7137,0x711D,INVALC,INVALC,0x7138,
-	INVALC,0x7134,0x712B,0x7133,0x7127,0x7124,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 62, Array index 0x1D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x712D,0x7232,0x7283,0x7282,0x7287,0x7306,0x7324,
-	0x7338,0x732A,0x732C,0x732B,INVALC,0x732F,0x7328,0x7417,
-	INVALC,INVALC,0x7419,0x7438,INVALC,0x741F,0x7414,0x743C,
-	0x73F7,0x741C,0x7415,0x7418,0x7439,0x74F9,0x7524,INVALC,
-	INVALC,INVALC,0x756E,0x756D,0x7571,0x758E,INVALC,0x75E5,
-	INVALC,INVALC,INVALC,INVALC,0x7694,0x76B3,INVALC,0x76D9,
-	INVALC,0x7748,0x7749,0x7743,INVALC,INVALC,0x7742,0x77DF,
-	INVALC,0x7863,0x7876,INVALC,0x785F,0x7866,0x7966,0x7971,
-	INVALC,INVALC,0x7976,0x7984,0x7975,0x79FF,0x7A07,INVALC,
-	0x7A0E,0x7A09,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7AE7,0x7AE2,0x7B55,INVALC,INVALC,0x7B43,0x7B57,0x7B6C,
-	0x7B42,0x7B53,INVALC,0x7B41,INVALC,INVALC,0x7CA7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 63, Array index 0x1E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7CA0,0x7CA6,0x7CA4,0x7D74,INVALC,0x7D59,INVALC,
-	0x7D60,0x7D57,0x7D6C,0x7D7E,0x7D64,INVALC,0x7D5A,0x7D5D,
-	INVALC,INVALC,INVALC,0x7D76,0x7D4D,0x7D75,INVALC,0x7FD3,
-	0x7FD6,INVALC,INVALC,0x8060,0x804E,0x8145,0x813B,INVALC,
-	0x8148,0x8142,0x8149,0x8140,0x8114,0x8141,INVALC,0x81EF,
-	0x81F6,0x8203,INVALC,0x83ED,INVALC,0x83DA,0x8418,0x83D2,
-	0x8408,INVALC,0x8400,INVALC,INVALC,INVALC,0x8417,0x8346,
-	0x8414,0x83D3,0x8405,0x841F,0x8402,0x8416,0x83CD,0x83E6,
-	INVALC,0x865D,0x86D5,0x86E1,INVALC,INVALC,INVALC,INVALC,
-	0x86EE,0x8847,0x8846,INVALC,INVALC,0x88BB,INVALC,0x88BF,
-	0x88B4,INVALC,0x88B5,INVALC,0x899A,0x8A43,INVALC,INVALC,
-	0x8A5A,INVALC,INVALC,INVALC,0x8A35,0x8A38,0x8A42,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 64, Array index 0x1F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8A49,0x8A5D,0x8A4B,0x8A3D,INVALC,INVALC,INVALC,
-	INVALC,0x8C60,0x8C5E,0x8C7F,0x8C7E,0x8C83,INVALC,0x8CB1,
-	0x8D87,INVALC,INVALC,0x8D88,0x8D83,INVALC,INVALC,0x8D86,
-	0x8D8B,0x8D82,0x8DCA,0x8DD2,INVALC,INVALC,0x8DD4,0x8DC9,
-	0x8EB0,INVALC,INVALC,INVALC,0x8EF2,0x8EE4,0x8EF3,0x8EEA,
-	INVALC,0x8EFD,INVALC,0x8F9D,0x902B,0x902A,INVALC,0x9028,
-	0x9029,0x902C,INVALC,INVALC,0x903A,0x9030,0x9037,0x903B,
-	INVALC,0x910A,INVALC,INVALC,INVALC,0x91FE,0x9220,INVALC,
-	0x920B,INVALC,0x9218,0x9222,INVALC,0x921B,0x9208,INVALC,
-	0x920E,0x9213,INVALC,INVALC,0x9595,INVALC,INVALC,INVALC,
-	0x968C,0x967B,0x967F,0x9681,INVALC,0x9682,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x96EE,0x96ED,INVALC,0x96EC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 65, Array index 0x2000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x975F,0x976F,INVALC,0x976D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x98F0,INVALC,INVALC,INVALC,0x9AA9,
-	INVALC,INVALC,0x9AE0,0x4EB7,INVALC,INVALC,0x50CC,0x50BC,
-	INVALC,0x50AA,0x50B9,INVALC,0x50AB,0x50C3,0x50CD,0x517E,
-	0x527E,0x5279,INVALC,INVALC,0x52E1,0x52E0,0x52E7,0x5380,
-	0x53AB,0x53AA,0x53A9,0x53E0,0x55EA,INVALC,0x55D7,INVALC,
-	INVALC,0x55C1,0x5715,INVALC,0x586C,INVALC,0x585C,0x5850,
-	0x5861,0x586A,0x5869,0x5856,0x5860,0x5866,0x585F,0x5923,
-	0x5966,0x5968,INVALC,INVALC,0x5ACE,INVALC,0x5AC5,0x5AC3,
-	INVALC,INVALC,0x5AD0,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5B74,0x5B76,0x5BDC,0x5BD7,0x5BDA,0x5BDB,INVALC,
-	0x5C20,0x5D6D,0x5D66,INVALC,0x5D64,0x5D6E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 66, Array index 0x2100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D60,0x5F42,0x5F5A,0x5F6E,INVALC,INVALC,0x6130,
-	0x613A,0x612A,0x6143,0x6119,0x6131,INVALC,0x613D,INVALC,
-	INVALC,INVALC,0x6408,0x6432,0x6438,INVALC,0x6431,INVALC,
-	0x6419,INVALC,0x6411,INVALC,INVALC,0x6429,0x641D,INVALC,
-	INVALC,INVALC,0x643C,INVALC,0x6446,0x6447,INVALC,INVALC,
-	0x643A,0x6407,INVALC,0x656B,INVALC,0x6570,0x656D,INVALC,
-	0x65E4,0x6693,INVALC,INVALC,INVALC,INVALC,0x668F,INVALC,
-	INVALC,0x6692,INVALC,0x668E,INVALC,0x6946,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6931,INVALC,INVALC,
-	0x693E,INVALC,0x697C,0x6943,INVALC,0x6973,INVALC,0x6955,
-	INVALC,INVALC,0x6985,0x694D,0x6950,0x6947,0x6967,0x6936,
-	0x6964,0x6961,INVALC,0x697D,0x6B44,0x6B40,0x6B71,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 67, Array index 0x2200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B73,0x6B9C,INVALC,INVALC,INVALC,0x6BC1,INVALC,
-	0x6BFA,0x6C31,0x6C32,INVALC,INVALC,0x6EB8,0x6EA8,INVALC,
-	0x6E91,0x6EBB,INVALC,0x6E9A,INVALC,INVALC,0x6EA9,INVALC,
-	INVALC,0x6EB5,0x6E6C,0x6EE8,INVALC,0x6EDD,0x6EDA,0x6EE6,
-	0x6EAC,INVALC,INVALC,INVALC,0x6ED9,0x6EE3,0x6EE9,0x6EDB,
-	INVALC,0x716F,INVALC,INVALC,0x7148,INVALC,0x714A,0x716B,
-	INVALC,0x714F,0x7157,0x7174,INVALC,INVALC,INVALC,0x7145,
-	0x7151,0x716D,INVALC,0x7251,0x7250,0x724E,INVALC,0x7341,
-	INVALC,0x732E,0x7346,INVALC,0x7427,INVALC,0x7448,0x7453,
-	0x743D,INVALC,0x745D,0x7456,INVALC,0x741E,0x7447,0x7443,
-	0x7458,0x7449,INVALC,0x744C,0x7445,0x743E,INVALC,0x7501,
-	0x751E,INVALC,INVALC,0x757A,0x75EE,0x7602,0x7697,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 68, Array index 0x2300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7698,INVALC,INVALC,INVALC,0x775D,0x7764,0x7753,
-	0x7758,0x7882,0x7890,0x788A,INVALC,0x787A,0x787D,INVALC,
-	0x788B,0x7878,INVALC,INVALC,0x788D,0x7888,0x7892,0x7881,
-	0x797E,0x7983,INVALC,INVALC,INVALC,0x7980,INVALC,INVALC,
-	INVALC,0x7A0F,INVALC,INVALC,0x7A1D,INVALC,0x7AA1,0x7AA4,
-	INVALC,0x7AE9,0x7AEA,INVALC,0x7B62,0x7B6B,INVALC,0x7B5E,
-	INVALC,0x7B79,INVALC,INVALC,0x7B6F,0x7B68,INVALC,INVALC,
-	0x7CAE,INVALC,INVALC,INVALC,0x7CB0,INVALC,0x7D90,INVALC,
-	0x7D8A,INVALC,0x7D8B,0x7D99,0x7D95,INVALC,0x7D87,0x7D78,
-	0x7D97,0x7D89,0x7D98,INVALC,INVALC,INVALC,0x7FA3,INVALC,
-	INVALC,INVALC,0x7FDD,0x8057,INVALC,0x8163,0x816A,0x816C,
-	INVALC,INVALC,INVALC,0x815D,0x8175,INVALC,0x815F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 69, Array index 0x2400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x817D,0x816D,INVALC,INVALC,0x8241,0x844F,
-	0x8484,INVALC,0x847F,INVALC,0x8448,0x842A,0x847B,0x8472,
-	0x8464,0x842E,0x845C,0x8453,INVALC,0x8441,0x84C8,INVALC,
-	0x8462,0x8480,0x843E,0x8483,0x8471,INVALC,0x844A,0x8455,
-	0x8458,INVALC,INVALC,INVALC,0x86FC,0x86FD,0x8715,INVALC,
-	0x8716,0x86FF,INVALC,INVALC,INVALC,0x8858,0x88CF,0x88E0,
-	INVALC,INVALC,INVALC,INVALC,0x89E7,0x8A6A,0x8A80,INVALC,
-	0x8A6F,0x8A65,INVALC,0x8A78,0x8A7D,0x8A88,INVALC,INVALC,
-	0x8A64,0x8A7E,INVALC,0x8A67,0x8C63,0x8C88,INVALC,0x8CCD,
-	INVALC,0x8CC9,INVALC,0x8DED,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x8EB1,INVALC,INVALC,0x8F04,0x8F9E,
-	0x8FA0,0x9043,0x9046,0x9048,0x9045,0x9040,0x904C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 70, Array index 0x2500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x910C,0x9113,0x9115,INVALC,0x916B,
-	0x9167,0x925D,0x9255,0x9235,INVALC,0x9259,0x922F,0x923C,
-	0x928F,0x925C,0x926A,0x9262,0x925F,0x926B,0x926E,0x923B,
-	0x9244,0x9241,0x959A,INVALC,0x9599,INVALC,INVALC,INVALC,
-	0x968F,INVALC,0x9696,INVALC,INVALC,INVALC,0x96F4,0x96FC,
-	INVALC,0x9755,INVALC,0x9779,INVALC,INVALC,INVALC,0x97EE,
-	0x97F5,INVALC,0x980B,INVALC,0x98F3,INVALC,INVALC,0x98F7,
-	0x98FF,0x98F5,INVALC,0x98EC,0x98F1,INVALC,INVALC,0x999A,
-	INVALC,0x9AE2,0x9B3D,0x9B5D,0x9CE8,INVALC,0x9CEB,0x9CEF,
-	0x9CEE,0x9E81,0x9F14,0x50D0,0x50D9,0x50DC,0x50D8,INVALC,
-	0x50E1,0x50EB,INVALC,INVALC,0x50F4,0x50E2,0x50DE,INVALC,
-	INVALC,INVALC,0x51F4,INVALC,INVALC,INVALC,0x52ED,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 71, Array index 0x2600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x52EA,INVALC,0x5332,INVALC,0x53AE,0x53B0,INVALC,
-	0x55FB,0x5603,0x560B,INVALC,0x5607,INVALC,0x55F8,INVALC,
-	0x5628,0x561E,INVALC,0x5618,0x5611,0x5651,0x5605,0x5717,
-	0x5892,INVALC,0x588C,INVALC,0x5878,0x5884,0x5873,0x58AD,
-	0x5897,0x5895,0x5877,0x5872,0x5896,0x588D,0x5910,INVALC,
-	0x596C,INVALC,0x5AE7,INVALC,0x5AE4,INVALC,INVALC,0x5AEF,
-	0x5626,INVALC,INVALC,0x5AF0,0x5D7B,INVALC,0x5D83,INVALC,
-	INVALC,0x5D8B,0x5D8C,INVALC,0x5D78,0x5E52,INVALC,INVALC,
-	0x5ED0,0x5ECF,INVALC,0x5FB3,0x5FB4,INVALC,INVALC,INVALC,
-	0x617B,INVALC,0x616F,0x6181,0x613C,0x6142,0x6138,0x6133,
-	INVALC,0x6160,0x6169,0x617D,0x6186,0x622C,0x6228,INVALC,
-	0x644C,INVALC,0x6457,0x647C,INVALC,INVALC,0x6455,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 72, Array index 0x2700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6462,0x6471,0x646A,0x6456,0x643B,0x6481,INVALC,
-	0x644F,0x647E,0x6464,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6571,INVALC,INVALC,0x66A5,0x669A,0x669C,INVALC,0x66A6,
-	INVALC,0x66A4,0x698F,0x69C5,0x69C8,0x6992,0x69B2,INVALC,
-	INVALC,INVALC,0x69E3,0x69C0,0x69D6,0x69D1,0x699F,0x69A2,
-	0x69D2,INVALC,INVALC,INVALC,0x69E1,0x69D5,0x699D,INVALC,
-	INVALC,0x6998,INVALC,0x6B74,0x6BA1,INVALC,0x6EF0,0x6EF3,
-	INVALC,INVALC,0x6F1B,0x6F0C,0x6F1D,0x6F34,0x6F28,0x6F17,
-	INVALC,0x6F44,0x6F42,0x6F04,0x6F11,0x6EFA,0x6F4A,0x7191,
-	0x718E,INVALC,0x718B,0x718D,0x717F,0x718C,0x717E,0x717C,
-	0x7183,INVALC,0x7188,INVALC,INVALC,0x7294,INVALC,0x7355,
-	0x7353,0x734F,0x7354,0x746C,0x7465,0x7466,0x7461,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 73, Array index 0x2800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x746B,0x7468,0x7476,INVALC,0x7460,INVALC,0x7474,
-	0x7506,0x760E,INVALC,0x7607,INVALC,INVALC,0x76B9,INVALC,
-	0x76B7,0x76E2,INVALC,0x7774,0x7777,0x7776,0x7775,INVALC,
-	0x7778,0x7771,INVALC,0x777A,0x715B,0x777B,0x78A6,0x78AE,
-	0x78B8,INVALC,INVALC,INVALC,0x78B1,0x78AF,INVALC,0x7989,
-	0x7987,INVALC,INVALC,0x7A29,INVALC,0x7A2A,INVALC,0x7A2D,
-	0x7A2C,INVALC,0x7A32,INVALC,0x7AEC,0x7AF0,0x7B81,0x7B9E,
-	0x7B83,INVALC,0x7B92,INVALC,0x7BA3,0x7B9F,0x7B93,INVALC,
-	0x7B86,0x7CB8,0x7CB7,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7DC8,0x7DB6,INVALC,0x7DD1,INVALC,0x7DA8,0x7DAB,INVALC,
-	0x7DB3,0x7DCD,INVALC,0x7DCF,0x7DA4,INVALC,INVALC,0x7F41,
-	0x7F6F,0x7F71,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 74, Array index 0x2900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x8023,0x805B,INVALC,0x8061,0x805F,0x8181,
-	INVALC,INVALC,0x8184,0x8213,INVALC,0x824A,0x824C,INVALC,
-	INVALC,INVALC,0x84BD,0x8495,INVALC,0x8492,0x84C3,INVALC,
-	0x8496,0x84A5,0x84B5,0x84B3,0x84A3,0x84E4,0x84D8,0x84D5,
-	INVALC,0x84B7,0x84AD,0x84DA,0x8493,0x8736,INVALC,INVALC,
-	INVALC,0x873D,0x872B,0x8747,0x8739,INVALC,0x8745,0x871D,
-	INVALC,0x88FF,0x88EA,INVALC,0x88F5,INVALC,0x8900,0x88ED,
-	0x8903,0x88E9,INVALC,INVALC,0x89EA,INVALC,0x8A9B,0x8A8E,
-	0x8AA2,INVALC,0x8A9C,0x8A94,0x8A90,0x8AA9,0x8AAC,INVALC,
-	0x8A9F,INVALC,INVALC,0x8A9D,INVALC,0x8C67,INVALC,INVALC,
-	0x8CD0,0x8CD6,0x8CD4,0x8D98,0x8D9A,0x8D97,INVALC,INVALC,
-	INVALC,0x8E0B,0x8E08,0x8E01,0x8EB4,0x8EB3,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 75, Array index 0x2A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8FA1,0x8FA2,INVALC,0x905A,INVALC,0x9061,0x905F,
-	INVALC,INVALC,0x9125,0x917B,0x9176,0x917C,INVALC,0x9289,
-	0x92F6,0x92B1,0x92AD,0x9292,0x9281,0x9284,INVALC,0x92AE,
-	0x9290,0x929E,INVALC,INVALC,INVALC,0x95A2,0x95A7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x96A0,0x969D,0x969F,0x96D0,
-	INVALC,0x96D1,INVALC,INVALC,0x9759,INVALC,0x9764,INVALC,
-	INVALC,INVALC,0x9819,INVALC,0x9814,0x9815,0x981A,INVALC,
-	INVALC,INVALC,INVALC,0x9906,INVALC,0x98F8,0x9901,INVALC,
-	0x99BE,0x99BC,0x99B7,0x99B6,0x99C0,INVALC,0x99B8,INVALC,
-	INVALC,INVALC,0x99C4,INVALC,0x99BF,INVALC,0x9ADA,0x9AE4,
-	0x9AE9,0x9AE8,0x9AEA,0x9AE5,INVALC,0x9B26,INVALC,INVALC,
-	0x9B40,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 76, Array index 0x2B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x9EBD,INVALC,INVALC,INVALC,INVALC,0x510E,
-	INVALC,0x50F7,INVALC,0x50FC,0x510D,0x5101,0x51DA,0x51D9,
-	0x51DB,0x5286,0x528E,0x52EE,0x5333,0x53B1,INVALC,0x5647,
-	0x562D,0x5654,INVALC,0x564B,0x5652,0x5631,0x5644,0x5656,
-	0x5650,0x562B,INVALC,0x564D,0x5637,0x564F,0x58A2,0x58B7,
-	INVALC,0x58B2,INVALC,0x58AA,0x58B5,0x58B0,INVALC,0x58B4,
-	0x58A4,0x58A7,INVALC,0x5926,0x5AFE,INVALC,0x5B04,INVALC,
-	0x5AFC,INVALC,0x5B06,0x5B0A,0x5AFA,0x5B0D,0x5B00,0x5B0E,
-	INVALC,INVALC,INVALC,0x5D91,INVALC,0x5D8F,0x5D90,0x5D98,
-	0x5DA4,0x5D9B,0x5DA3,0x5D96,0x5DE4,0x5E5A,INVALC,INVALC,
-	0x5E5E,INVALC,0x5FB8,0x6157,0x615C,0x61A6,0x6195,0x6188,
-	INVALC,0x61A3,0x618F,INVALC,0x6164,INVALC,0x6159,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 77, Array index 0x2C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6178,INVALC,0x6185,0x6187,0x619E,INVALC,INVALC,
-	0x6198,0x619C,INVALC,INVALC,0x622F,0x6480,0x649B,0x648E,
-	0x648D,0x6494,0x64C6,INVALC,0x64A8,0x6483,INVALC,0x64B9,
-	0x6486,0x64B4,0x64AF,0x6491,INVALC,0x64AA,0x64A1,0x64A7,
-	0x66B6,0x66B3,INVALC,0x66BC,0x66AC,INVALC,0x66AD,0x6A0E,
-	INVALC,0x6A1C,0x6A1A,INVALC,INVALC,0x6A0B,INVALC,0x69EF,
-	0x6A0C,0x69F0,0x6A22,INVALC,0x69D8,INVALC,0x6A12,0x69FA,
-	INVALC,0x6A2A,INVALC,0x6A10,INVALC,INVALC,0x6A29,0x69F9,
-	0x69EA,0x6A2C,0x6A24,INVALC,0x69E9,0x6B52,0x6B4F,0x6B53,
-	INVALC,INVALC,0x6F10,0x6F65,0x6F75,INVALC,INVALC,INVALC,
-	INVALC,0x6FD0,INVALC,0x6F5C,0x6F3D,0x6F71,INVALC,0x6F91,
-	0x6F0B,0x6F79,0x6F81,0x6F8F,INVALC,0x6F59,0x6F74,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 78, Array index 0x2D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x71AE,INVALC,0x71A3,0x71AD,INVALC,INVALC,
-	0x71AB,0x71A6,0x71A2,INVALC,0x52F2,0x7257,0x7255,0x7299,
-	0x734B,0x747A,INVALC,INVALC,INVALC,0x748C,0x7484,INVALC,
-	INVALC,0x7482,0x7493,0x747B,INVALC,0x7509,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x778A,INVALC,0x7790,INVALC,
-	0x78C6,0x78D3,0x78C0,0x78D2,0x78C7,0x78C2,INVALC,0x799F,
-	0x799D,0x799E,INVALC,0x7A41,INVALC,0x7A38,0x7A3A,0x7A42,
-	INVALC,INVALC,0x7A3E,0x7AB0,0x7BAE,0x7BB3,INVALC,INVALC,
-	0x7BBF,INVALC,INVALC,0x7BCD,INVALC,0x7BB2,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7CC4,0x7CCD,0x7CC2,
-	0x7CC6,0x7CC3,0x7CC9,0x7CC7,INVALC,0x7DF8,INVALC,0x7DED,
-	0x7DE2,INVALC,INVALC,INVALC,0x7DDC,0x7E02,0x7E01,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 79, Array index 0x2E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7DD6,INVALC,0x7DE4,0x7DFE,INVALC,0x7E00,
-	0x7DFC,0x7DFD,INVALC,0x7DF5,0x7DFF,INVALC,0x7DEB,0x7DE5,
-	0x7F78,0x7FAE,0x7FE7,INVALC,0x8065,0x806A,0x8066,0x8068,
-	0x806B,0x8194,0x81A1,0x8192,0x8196,0x8193,INVALC,INVALC,
-	0x8501,INVALC,0x84F8,INVALC,0x84F5,INVALC,0x8504,INVALC,
-	INVALC,INVALC,INVALC,0x851B,0x8503,0x8533,0x8534,0x84ED,
-	INVALC,INVALC,0x8535,INVALC,0x8505,INVALC,INVALC,INVALC,
-	INVALC,0x877D,INVALC,INVALC,INVALC,0x8771,INVALC,0x885C,
-	0x88E6,0x890F,0x891B,INVALC,0x89A9,0x89A5,0x89EE,0x8AB1,
-	INVALC,0x8ACC,0x8ACE,INVALC,0x8AB7,INVALC,0x8AB5,0x8AE9,
-	0x8AB4,INVALC,0x8AB3,0x8AC1,0x8AAF,0x8ACA,0x8AD0,INVALC,
-	INVALC,INVALC,0x8C8E,INVALC,INVALC,0x8CE9,0x8CDB,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 80, Array index 0x2F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x8CEB,0x8DA4,INVALC,0x8DA2,0x8D9D,INVALC,
-	INVALC,INVALC,INVALC,0x8E2A,0x8E28,INVALC,INVALC,0x8EB8,
-	0x8EB6,0x8EB9,0x8EB7,0x8F22,0x8F2B,0x8F27,0x8F19,0x8FA4,
-	INVALC,0x8FB3,INVALC,0x9071,0x906A,INVALC,INVALC,0x9188,
-	0x918C,0x92BF,0x92B8,0x92BE,0x92DC,0x92E5,INVALC,INVALC,
-	0x92D4,0x92D6,INVALC,0x92DA,0x92ED,0x92F3,0x92DB,INVALC,
-	0x92B9,0x92E2,0x92EB,0x95AF,INVALC,0x95B2,0x95B3,INVALC,
-	INVALC,INVALC,0x96A3,0x96A5,INVALC,INVALC,INVALC,INVALC,
-	0x970A,INVALC,0x9787,0x9789,0x978C,0x97EF,0x982A,0x9822,
-	INVALC,0x981F,INVALC,0x9919,INVALC,0x99CA,0x99DA,INVALC,
-	INVALC,INVALC,0x99DE,0x99C8,0x99E0,INVALC,0x9AB6,0x9AB5,
-	INVALC,0x9AF4,INVALC,0x9B6B,0x9B69,0x9B72,0x9B63,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 81, Array index 0x3000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x9D0D,INVALC,0x9D01,0x9D0C,INVALC,0x9CF8,
-	INVALC,INVALC,0x9CFE,0x9D02,0x9E84,INVALC,0x9EAB,0x9EAA,
-	0x511D,0x5116,INVALC,0x512B,0x511E,0x511B,0x5290,0x5294,
-	0x5314,INVALC,INVALC,0x5667,INVALC,0x567B,INVALC,0x565F,
-	0x5661,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x58C3,0x58CA,0x58BB,0x58C0,0x58C4,0x5901,0x5B1F,0x5B18,
-	0x5B11,0x5B15,INVALC,0x5B12,0x5B1C,INVALC,0x5B22,0x5B79,
-	0x5DA6,INVALC,0x5DB3,0x5DAB,0x5EEA,INVALC,0x5F5B,INVALC,
-	INVALC,0x61B7,0x61CE,0x61B9,0x61BD,0x61CF,0x61C0,0x6199,
-	0x6197,INVALC,0x61BB,0x61D0,0x61C4,0x6231,INVALC,0x64D3,
-	0x64C0,INVALC,INVALC,INVALC,INVALC,0x64DC,0x64D1,0x64C8,
-	INVALC,0x64D5,0x66C3,INVALC,INVALC,0x66BF,0x66C5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 82, Array index 0x3100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x66CD,0x66C1,0x6706,INVALC,0x6724,0x6A63,
-	0x6A42,0x6A52,INVALC,0x6A43,0x6A33,INVALC,0x6A6C,0x6A57,
-	INVALC,0x6A4C,0x6A6E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6A37,INVALC,0x6A71,0x6A4A,0x6A36,INVALC,0x6A53,INVALC,
-	0x6A45,0x6A70,INVALC,INVALC,0x6A5C,0x6B58,0x6B57,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6FBB,INVALC,INVALC,
-	0x6FBE,INVALC,INVALC,INVALC,0x6FB5,0x6FD3,0x6F9F,INVALC,
-	0x6FB7,0x6FF5,0x71B7,INVALC,0x71BB,INVALC,0x71D1,INVALC,
-	0x71BA,INVALC,0x71B6,0x71CC,INVALC,INVALC,0x71D3,0x749B,
-	INVALC,INVALC,0x7496,0x74A2,0x749D,0x750A,0x750E,INVALC,
-	0x7581,0x762C,0x7637,0x7636,0x763B,INVALC,0x76A1,INVALC,
-	INVALC,0x7798,INVALC,0x7796,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 83, Array index 0x3200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x78D6,0x78EB,INVALC,0x78DC,INVALC,0x79A5,0x79A9,
-	0x9834,0x7A53,0x7A45,INVALC,0x7A4F,INVALC,0x7ABD,0x7ABB,
-	0x7AF1,INVALC,INVALC,0x7BEC,0x7BED,INVALC,INVALC,0x7CD3,
-	INVALC,0x7CE1,INVALC,0x7E19,INVALC,INVALC,INVALC,0x7E27,
-	0x7E26,INVALC,INVALC,0x806E,0x81AF,INVALC,INVALC,0x81AD,
-	INVALC,0x81AA,0x8218,INVALC,INVALC,INVALC,INVALC,0x856F,
-	0x854C,INVALC,0x8542,INVALC,0x855C,0x8570,0x855F,INVALC,
-	0x855A,0x854B,0x853F,0x878A,INVALC,0x878B,0x87A1,0x878E,
-	INVALC,INVALC,0x8799,0x885E,0x885F,0x8924,0x89A7,0x8AEA,
-	0x8AFD,0x8AF9,0x8AE3,0x8AE5,INVALC,INVALC,0x8AEC,INVALC,
-	INVALC,INVALC,INVALC,0x8CF2,INVALC,0x8CEF,INVALC,0x8DA6,
-	INVALC,INVALC,INVALC,0x8E3B,0x8E43,INVALC,0x8E32,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 84, Array index 0x3300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8F31,0x8F30,INVALC,0x8F2D,0x8F3C,0x8FA7,0x8FA5,
-	INVALC,INVALC,INVALC,0x9137,0x9195,0x918E,INVALC,0x9196,
-	INVALC,0x9345,0x930A,INVALC,INVALC,0x92FD,0x9317,0x931C,
-	0x9307,0x9331,0x9332,0x932C,0x9330,0x9303,0x9305,INVALC,
-	0x95C2,INVALC,0x95B8,INVALC,0x95C1,INVALC,INVALC,INVALC,
-	0x96AB,0x96B7,INVALC,INVALC,0x9715,0x9714,INVALC,INVALC,
-	0x970C,0x9717,INVALC,0x9793,INVALC,0x97D2,INVALC,INVALC,
-	0x9836,0x9831,0x9833,0x983C,0x982E,0x983A,INVALC,0x983D,
-	INVALC,0x98B5,0x9922,0x9923,0x9920,0x991C,0x991D,INVALC,
-	0x99A0,INVALC,0x99EF,0x99E8,0x99EB,INVALC,INVALC,INVALC,
-	0x99E1,0x99E6,INVALC,INVALC,0x9AF8,0x9AF5,INVALC,INVALC,
-	0x9B83,0x9B94,0x9B84,INVALC,0x9B8B,0x9B8F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 85, Array index 0x3400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9B8C,INVALC,0x9B89,INVALC,0x9B8E,INVALC,INVALC,
-	INVALC,0x9D24,0x9D0F,INVALC,0x9D13,0x9D0A,INVALC,INVALC,
-	INVALC,INVALC,0x9D2A,0x9D1A,INVALC,0x9D27,0x9D16,0x9D21,
-	INVALC,0x9E85,0x9EAC,0x9EC6,0x9EC5,0x9ED7,0x9F53,INVALC,
-	0x5128,0x5127,0x51DF,INVALC,0x5335,0x53B3,INVALC,0x568A,
-	0x567D,0x5689,INVALC,0x58CD,0x58D0,INVALC,0x5B2B,0x5B33,
-	0x5B29,0x5B35,0x5B31,0x5B37,0x5C36,0x5DBE,INVALC,0x5DB9,
-	INVALC,0x5DBB,INVALC,0x61E2,0x61DB,0x61DD,0x61DC,0x61DA,
-	INVALC,0x61D9,INVALC,INVALC,0x64DF,INVALC,INVALC,0x64E1,
-	INVALC,0x64EE,INVALC,0x65B5,0x66D4,0x66D5,INVALC,0x66D0,
-	0x66D1,0x66CE,0x66D7,INVALC,INVALC,0x6A7D,0x6A8A,INVALC,
-	0x6AA7,INVALC,0x6A99,0x6A82,0x6A88,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 86, Array index 0x3500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A86,INVALC,0x6A98,0x6A9D,INVALC,INVALC,0x6A8F,
-	INVALC,0x6AAA,INVALC,0x6B5D,INVALC,0x6C0A,INVALC,0x6FD7,
-	0x6FD6,0x6FE5,INVALC,INVALC,INVALC,0x6FD9,0x6FDA,0x6FEA,
-	INVALC,0x6FF6,INVALC,INVALC,0x71E3,INVALC,0x71E9,INVALC,
-	0x71EB,0x71EF,0x71F3,0x71EA,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7371,INVALC,0x74AE,INVALC,0x74B3,INVALC,0x74AC,
-	INVALC,INVALC,0x7583,0x7645,0x764E,0x7644,0x76A3,0x76A5,
-	0x77A6,0x77A4,INVALC,0x77A9,0x77AF,INVALC,INVALC,INVALC,
-	0x78F0,0x78F8,0x78F1,INVALC,0x7A49,INVALC,INVALC,INVALC,
-	0x7AC2,0x7AF2,0x7AF3,0x7BFA,INVALC,0x7BF6,0x7BFC,0x7C18,
-	0x7C08,0x7C12,INVALC,INVALC,0x7CDB,0x7CDA,INVALC,INVALC,
-	INVALC,0x7E2C,0x7E4D,INVALC,INVALC,0x7F46,0x7FF6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 87, Array index 0x3600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x802B,0x8074,0x81B8,0x81C8,INVALC,INVALC,INVALC,
-	0x8592,0x8593,INVALC,0x857F,0x85AB,0x8597,INVALC,INVALC,
-	0x85AC,INVALC,INVALC,INVALC,0x87CE,INVALC,0x87CD,INVALC,
-	INVALC,0x87C1,0x87B1,0x87C7,INVALC,0x8940,INVALC,0x893F,
-	0x8939,INVALC,0x8943,INVALC,INVALC,INVALC,0x89AB,INVALC,
-	0x8B1F,0x8B09,0x8B0C,INVALC,INVALC,0x8C40,INVALC,0x8C96,
-	INVALC,0x8CF6,0x8CF7,INVALC,0x8E46,0x8E4F,INVALC,INVALC,
-	INVALC,0x8F3D,0x8F41,0x9366,0x9378,0x935D,0x9369,0x9374,
-	0x937D,0x936E,0x9372,0x9373,0x9362,0x9348,0x9353,0x935F,
-	0x9368,INVALC,0x937F,0x936B,INVALC,0x95C4,INVALC,0x96AF,
-	0x96AD,0x96B2,INVALC,INVALC,0x971A,0x971B,INVALC,INVALC,
-	INVALC,INVALC,0x979B,0x979F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 88, Array index 0x3700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x9840,INVALC,
-	0x9847,INVALC,0x98B7,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x99A2,INVALC,INVALC,0x9A00,0x99F3,INVALC,INVALC,0x99F5,
-	INVALC,INVALC,0x9ABD,0x9B00,0x9B02,INVALC,0x9B34,0x9B49,
-	0x9B9F,INVALC,0x9BA3,0x9BCD,0x9B99,0x9B9D,INVALC,INVALC,
-	0x9D39,INVALC,0x9D44,INVALC,INVALC,0x9D35,INVALC,INVALC,
-	0x9EAF,INVALC,0x512F,INVALC,INVALC,0x9F8E,INVALC,0x569F,
-	0x569B,0x569E,0x5696,0x5694,0x56A0,INVALC,0x5B3B,INVALC,
-	INVALC,0x5B3A,0x5DC1,0x5F4D,0x5F5D,0x61F3,INVALC,INVALC,
-	INVALC,INVALC,0x64F6,0x64E5,0x64EA,0x64E7,0x6505,INVALC,
-	0x64F9,INVALC,INVALC,INVALC,0x6AAB,0x6AED,0x6AB2,0x6AB0,
-	0x6AB5,0x6ABE,0x6AC1,0x6AC8,INVALC,0x6AC0,0x6ABC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 89, Array index 0x3800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6AB1,0x6AC4,0x6ABF,INVALC,INVALC,0x7008,0x7003,
-	0x6FFD,0x7010,0x7002,0x7013,INVALC,0x71FA,0x7200,0x74B9,
-	0x74BC,INVALC,0x765B,0x7651,0x764F,0x76EB,0x77B8,INVALC,
-	0x77B9,0x77C1,0x77C0,0x77BE,0x790B,INVALC,0x7907,0x790A,
-	0x7908,INVALC,0x790D,0x7906,0x7915,0x79AF,INVALC,INVALC,
-	INVALC,0x7AF5,INVALC,INVALC,0x7C2E,INVALC,0x7C1B,INVALC,
-	0x7C1A,0x7C24,INVALC,INVALC,0x7CE6,0x7CE3,INVALC,INVALC,
-	0x7E5D,0x7E4F,0x7E66,0x7E5B,0x7F47,0x7FB4,INVALC,INVALC,
-	INVALC,0x7FFA,0x802E,INVALC,INVALC,0x81CE,INVALC,INVALC,
-	0x8219,INVALC,INVALC,0x85CC,0x85B2,INVALC,0x85BB,0x85C1,
-	INVALC,INVALC,INVALC,0x87E9,0x87EE,0x87F0,0x87D6,0x880E,
-	0x87DA,0x8948,0x894A,0x894E,0x894D,0x89B1,0x89B0,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 90, Array index 0x3900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x89B3,INVALC,0x8B38,0x8B32,INVALC,0x8B2D,INVALC,
-	0x8B34,INVALC,0x8B29,0x8C74,INVALC,INVALC,0x8D03,INVALC,
-	INVALC,0x8DA9,0x8E58,INVALC,INVALC,0x8EBF,0x8EC1,0x8F4A,
-	0x8FAC,INVALC,0x9089,0x913D,0x913C,0x91A9,0x93A0,INVALC,
-	0x9390,INVALC,0x9393,0x938B,0x93AD,0x93BB,0x93B8,INVALC,
-	INVALC,0x939C,0x95D8,0x95D7,INVALC,INVALC,INVALC,0x975D,
-	0x97A9,0x97DA,INVALC,INVALC,INVALC,INVALC,0x9854,INVALC,
-	0x9855,0x984B,INVALC,0x983F,0x98B9,INVALC,INVALC,INVALC,
-	INVALC,0x9938,0x9936,0x9940,INVALC,0x993B,0x9939,0x99A4,
-	INVALC,INVALC,0x9A08,0x9A0C,INVALC,0x9A10,INVALC,0x9B07,
-	INVALC,0x9BD2,INVALC,0x9BC2,0x9BBB,0x9BCC,0x9BCB,INVALC,
-	INVALC,0x9D4D,0x9D63,0x9D4E,INVALC,0x9D50,0x9D55,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 91, Array index 0x3A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x9D5E,INVALC,0x9E90,0x9EB2,0x9EB1,INVALC,
-	0x9ECA,0x9F02,0x9F27,0x9F26,INVALC,0x56AF,0x58E0,0x58DC,
-	INVALC,0x5B39,INVALC,INVALC,0x5B7C,0x5BF3,INVALC,INVALC,
-	0x5C6B,0x5DC4,0x650B,0x6508,0x650A,INVALC,INVALC,0x65DC,
-	INVALC,INVALC,0x66E1,0x66DF,0x6ACE,0x6AD4,0x6AE3,0x6AD7,
-	0x6AE2,INVALC,INVALC,INVALC,INVALC,0x6AD8,0x6AD5,0x6AD2,
-	INVALC,INVALC,0x701E,0x702C,0x7025,0x6FF3,0x7204,0x7208,
-	0x7215,INVALC,0x74C4,0x74C9,0x74C7,0x74C8,0x76A9,0x77C6,
-	0x77C5,0x7918,0x791A,0x7920,INVALC,0x7A66,0x7A64,0x7A6A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7C35,0x7C34,
-	INVALC,INVALC,0x7E6C,INVALC,0x7E6E,0x7E71,INVALC,0x81D4,
-	0x81D6,0x821A,0x8262,0x8265,0x8276,0x85DB,0x85D6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 92, Array index 0x3B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x85E7,INVALC,INVALC,0x85F4,INVALC,0x87FD,
-	0x87D5,0x8807,INVALC,0x880F,0x87F8,INVALC,INVALC,0x8987,
-	INVALC,0x89B5,0x89F5,INVALC,0x8B3F,0x8B43,0x8B4C,INVALC,
-	0x8D0B,0x8E6B,0x8E68,0x8E70,0x8E75,0x8E77,INVALC,0x8EC3,
-	INVALC,0x93E9,0x93EA,0x93CB,0x93C5,0x93C6,INVALC,0x93ED,
-	0x93D3,INVALC,0x93E5,INVALC,INVALC,0x93DB,0x93EB,0x93E0,
-	0x93C1,INVALC,INVALC,0x95DD,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x97B2,0x97B4,0x97B1,
-	0x97B5,0x97F2,INVALC,INVALC,INVALC,0x9856,INVALC,INVALC,
-	INVALC,0x9944,INVALC,0x9A26,0x9A1F,0x9A18,0x9A21,0x9A17,
-	INVALC,0x9B09,INVALC,INVALC,0x9BC5,0x9BDF,INVALC,0x9BE3,
-	INVALC,0x9BE9,0x9BEE,INVALC,INVALC,0x9D66,0x9D7A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 93, Array index 0x3C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x9D6E,0x9D91,0x9D83,0x9D76,0x9D7E,0x9D6D,
-	INVALC,0x9E95,0x9EE3,INVALC,INVALC,0x9F03,0x9F04,INVALC,
-	0x9F17,INVALC,0x5136,INVALC,0x5336,INVALC,0x5B42,INVALC,
-	INVALC,0x5B44,0x5B46,0x5B7E,0x5DCA,0x5DC8,0x5DCC,0x5EF0,
-	INVALC,0x6585,0x66E5,0x66E7,INVALC,INVALC,INVALC,0x6AF4,
-	INVALC,0x6AE9,INVALC,INVALC,INVALC,INVALC,INVALC,0x703D,
-	INVALC,0x7036,INVALC,0x7216,INVALC,0x7212,0x720F,0x7217,
-	0x7211,0x720B,INVALC,INVALC,0x74CD,0x74D0,0x74CC,0x74CE,
-	0x74D1,INVALC,0x7589,INVALC,0x7A6F,0x7C4B,0x7C44,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7E7F,0x8B71,INVALC,0x802F,
-	0x807A,0x807B,0x807C,INVALC,INVALC,INVALC,0x85FC,0x8610,
-	0x8602,INVALC,INVALC,0x85EE,0x8603,INVALC,0x860D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 94, Array index 0x3D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8613,0x8608,0x860F,0x8818,0x8812,INVALC,INVALC,
-	0x8967,0x8965,0x89BB,0x8B69,0x8B62,INVALC,0x8B6E,INVALC,
-	0x8B61,INVALC,0x8B64,0x8B4D,0x8C51,INVALC,INVALC,0x8E83,
-	0x8EC6,INVALC,0x941F,INVALC,0x9404,0x9417,0x9408,0x9405,
-	INVALC,0x93F3,0x941E,0x9402,0x941A,0x941B,0x9427,0x941C,
-	INVALC,0x96B5,INVALC,INVALC,0x9733,INVALC,0x9734,0x9731,
-	0x97B8,0x97BA,INVALC,0x97FC,INVALC,INVALC,0x98C3,INVALC,
-	0x994D,INVALC,0x9A2F,INVALC,INVALC,INVALC,0x9AC9,INVALC,
-	0x9AC8,0x9AC4,0x9B2A,0x9B38,0x9B50,INVALC,0x9C0A,0x9BFB,
-	0x9C04,0x9BFC,0x9BFE,INVALC,INVALC,INVALC,0x9C02,0x9BF6,
-	0x9C1B,0x9BF9,0x9C15,0x9C10,0x9BFF,0x9C00,0x9C0C,INVALC,
-	INVALC,0x9D95,0x9DA5,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 95, Array index 0x3E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9E98,0x9EC1,INVALC,0x9F5A,0x5164,0x56BB,INVALC,
-	0x58E6,0x5B49,0x5BF7,INVALC,INVALC,0x5DD0,INVALC,0x5FC2,
-	INVALC,0x6511,INVALC,0x6AFF,0x6AFE,0x6AFD,INVALC,0x6B01,
-	INVALC,INVALC,0x704B,0x704D,0x7047,0x74D3,0x7668,0x7667,
-	INVALC,INVALC,0x77D1,0x7930,0x7932,0x792E,INVALC,0x9F9D,
-	0x7AC9,0x7AC8,INVALC,0x7C56,0x7C51,INVALC,INVALC,INVALC,
-	0x7E85,0x7E89,0x7E8E,0x7E84,INVALC,0x826A,0x862B,0x862F,
-	0x8628,INVALC,0x8616,0x8615,0x861D,0x881A,INVALC,INVALC,
-	INVALC,0x89BC,0x8B75,0x8B7C,INVALC,0x8D11,0x8D12,0x8F5C,
-	0x91BB,INVALC,0x93F4,INVALC,INVALC,0x942D,INVALC,INVALC,
-	0x96E4,0x9737,0x9736,0x9767,0x97BE,0x97BD,0x97E2,0x9868,
-	0x9866,0x98C8,0x98CA,0x98C7,0x98DC,INVALC,0x994F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 96, Array index 0x3F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x99A9,0x9A3C,INVALC,0x9A3B,0x9ACE,INVALC,0x9B14,
-	0x9B53,INVALC,0x9C2E,INVALC,0x9C1F,INVALC,INVALC,INVALC,
-	INVALC,0x9DB0,0x9DBD,INVALC,INVALC,0x9DAE,0x9DC4,0x9E7B,
-	INVALC,INVALC,0x9E9E,INVALC,0x9F05,INVALC,0x9F69,0x9FA1,
-	0x56C7,0x571D,0x5B4A,0x5DD3,INVALC,0x5F72,0x6202,INVALC,
-	0x6235,0x6527,0x651E,0x651F,INVALC,INVALC,0x6B07,0x6B06,
-	INVALC,INVALC,0x7054,0x721C,0x7220,0x7AF8,INVALC,0x7C5D,
-	0x7C58,INVALC,0x7E92,0x7F4E,INVALC,INVALC,INVALC,0x8827,
-	INVALC,0x8B81,0x8B83,INVALC,0x8C44,INVALC,INVALC,INVALC,
-	INVALC,0x9442,0x944D,0x9454,0x944E,INVALC,0x9443,INVALC,
-	INVALC,0x973C,0x9740,0x97C0,INVALC,INVALC,INVALC,INVALC,
-	0x995A,0x9A51,INVALC,0x9ADD,INVALC,INVALC,0x9C38,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 97, Array index 0x4000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x9C45,0x9C3A,INVALC,0x9C35,INVALC,INVALC,
-	INVALC,0x9EF1,INVALC,0x9F93,0x529A,INVALC,INVALC,0x8641,
-	0x5DD7,INVALC,0x6528,INVALC,INVALC,INVALC,0x7053,0x7059,
-	INVALC,0x7221,INVALC,0x766F,0x7937,0x79B5,0x7C62,0x7C5E,
-	0x7CF5,INVALC,INVALC,0x863D,INVALC,0x882D,0x8989,0x8B8D,
-	0x8B87,0x8B90,0x8D1A,0x8E99,INVALC,INVALC,INVALC,0x945F,
-	INVALC,INVALC,0x9456,0x9461,0x945B,0x945A,0x945C,0x9465,
-	INVALC,0x9741,INVALC,INVALC,0x986E,0x986C,0x986D,INVALC,
-	0x99AA,0x9A5C,0x9A58,0x9ADE,INVALC,0x9C4F,0x9C51,INVALC,
-	0x9C53,INVALC,INVALC,INVALC,0x9DFC,0x9F39,INVALC,0x513E,
-	INVALC,0x56D2,INVALC,0x5B4F,0x6B14,INVALC,0x7A72,0x7A73,
-	INVALC,INVALC,INVALC,0x8B91,INVALC,INVALC,0x91BF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 98, Array index 0x4100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x946C,INVALC,INVALC,0x96E6,0x9745,INVALC,
-	0x97C8,0x97E4,0x995D,INVALC,0x9B21,INVALC,0x9B2C,0x9B57,
-	INVALC,INVALC,0x9C5D,0x9C61,0x9C65,0x9E08,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x9F45,INVALC,INVALC,0x6205,0x66EF,
-	0x6B1B,0x6B1D,0x7225,0x7224,0x7C6D,INVALC,0x8642,0x8649,
-	INVALC,0x8978,0x898A,0x8B97,INVALC,0x8C9B,0x8D1C,INVALC,
-	0x8EA2,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9C6C,INVALC,0x9C6F,INVALC,0x9E0E,INVALC,0x9F08,
-	0x9F1D,0x9FA3,INVALC,INVALC,0x5F60,0x6B1C,INVALC,INVALC,
-	INVALC,0x7CF3,INVALC,0x8B9B,0x8EA7,0x91C4,INVALC,0x947A,
-	INVALC,INVALC,0x9A61,0x9A63,0x9AD7,0x9C76,INVALC,0x9FA5,
-	INVALC,0x7067,INVALC,0x72AB,0x864A,0x897D,0x8B9D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 99, Array index 0x4200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8C53,0x8F65,0x947B,INVALC,0x98CD,0x98DD,INVALC,
-	0x9B30,0x9E16,INVALC,INVALC,INVALC,INVALC,INVALC,0x96E7,
-	0x9E18,0x9EA2,INVALC,0x9F7C,INVALC,0x7E9E,0x9484,INVALC,
-	0x9E1C,INVALC,0x7C71,0x97CA,INVALC,INVALC,INVALC,0x9EA3,
-	INVALC,0x9C7B,0x9F97,INVALC,INVALC,0x9750,INVALC,INVALC,
-	INVALC,0x5727,0x5C13,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5FC8,INVALC,INVALC,INVALC,INVALC,INVALC,0x6765,
-	INVALC,INVALC,0x52BD,INVALC,0x5B66,INVALC,0x65F9,0x6788,
-	0x6CE6,0x6CCB,INVALC,0x4FBD,0x5F8D,INVALC,0x6018,0x6048,
-	INVALC,0x6B29,0x70A6,INVALC,0x7706,INVALC,INVALC,INVALC,
-	0x5A10,0x5CFC,0x5CFE,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x70C9,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 100, Array index 0x4300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x9579,INVALC,0x96BA,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7B29,0x8128,INVALC,
-	0x8A2E,INVALC,INVALC,INVALC,0x9AD9,INVALC,0x582B,0x5845,
-	INVALC,0x63FA,INVALC,INVALC,INVALC,0x6E86,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5867,INVALC,0x5BDD,0x656E,INVALC,
-	INVALC,INVALC,0x8C87,INVALC,0x50D2,0x50DF,INVALC,INVALC,
-	INVALC,INVALC,0x69BA,INVALC,0x6B9D,INVALC,0x8059,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6F8A,INVALC,INVALC,0x7BC3,0x7BC2,
-	INVALC,INVALC,INVALC,INVALC,0x90F6,INVALC,0x9823,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x71CD,0x7499,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x9842,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 101, Array index 0x4400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7F84,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x8D0E,INVALC,0x9861,INVALC,INVALC,0x8B73,INVALC,0x9C27,
-	INVALC,0x9458,0x77D6,0x9B2D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F66,0x4F68,0x4FE7,0x503F,INVALC,0x50A6,0x510F,0x523E,
-	0x5324,0x5365,0x539B,0x517F,0x54CB,0x5573,0x5571,0x556B,
-	0x55F4,0x5622,0x5620,0x5692,0x56BA,0x5691,0x56B0,0x5759,
-	0x578A,0x580F,0x5812,0x5813,0x5847,0x589B,0x5900,0x594D,
-	0x5AD1,0x5AD3,0x5B67,0x5C57,0x5C77,0x5CD5,0x5D75,0x5D8E,
-	0x5DA5,0x5DB6,0x5DBF,0x5E65,0x5ECD,0x5EED,0x5F94,0x5F9A,
-	0x5FBA,0x6125,0x6150,0x62A3,0x6360,0x6364,0x63B6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 102, Array index 0x4500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6403,0x64B6,0x651A,0x7A25,0x5C21,0x66E2,0x6702,
-	0x67A4,0x67AC,0x6810,0x6806,0x685E,0x685A,0x692C,0x6929,
-	0x6A2D,0x6A77,0x6A7A,0x6ACA,0x6AE6,0x6AF5,0x6B0D,0x6B0E,
-	0x6BDC,0x6BDD,0x6BF6,0x6C1E,0x6C63,0x6DA5,0x6E0F,0x6E8A,
-	0x6E84,0x6E8B,0x6E7C,0x6F4C,0x6F48,0x6F49,0x6F9D,0x6F99,
-	0x6FF8,0x702E,0x702D,0x705C,0x79CC,0x70BF,0x70EA,0x70E5,
-	0x7111,0x7112,0x713F,0x7139,0x713B,0x713D,0x7177,0x7175,
-	0x7176,0x7171,0x7196,0x7193,0x71B4,0x71DD,0x71DE,0x720E,
-	0x5911,0x7218,0x7347,0x7348,0x73EF,0x7412,0x743B,0x74A4,
-	0x748D,0x74B4,0x7673,0x7677,0x76BC,0x7819,0x781B,0x783D,
-	0x7853,0x7854,0x7858,0x78B7,0x78D8,0x78EE,0x7922,0x794D,
-	0x7986,0x7999,0x79A3,0x79BC,0x7AA7,0x7B37,0x7B59,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 103, Array index 0x4600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7BD0,0x7C2F,0x7C32,0x7C42,0x7C4E,0x7C68,0x7CA9,
-	0x7CED,0x7DD0,0x7E07,0x7DD3,0x7E64,0x7F40,INVALC,0x8041,
-	0x8063,0x80BB,0x6711,0x6725,0x8248,0x8310,0x8362,0x8312,
-	0x8421,0x841E,0x84E2,0x84DE,0x84E1,0x8573,0x85D4,0x85F5,
-	0x8637,0x8645,0x8672,0x874A,0x87A9,0x87A5,0x87F5,0x8834,
-	0x8850,0x8887,0x8954,0x8984,0x8B03,0x8C52,0x8CD8,0x8D0C,
-	0x8D18,0x8DB0,0x8EBC,0x8ED5,0x8FAA,0x909C,INVALC,0x915C,
-	0x922B,0x9221,0x9273,0x92F4,0x92F5,0x933F,0x9342,0x9386,
-	0x93BE,0x93BC,0x93BD,0x93F1,0x93F2,0x93EF,0x9422,0x9423,
-	0x9424,0x9467,0x9466,0x9597,0x95CE,0x95E7,0x973B,0x974D,
-	0x98E4,0x9942,0x9B1D,0x9B98,INVALC,0x9D49,0x6449,0x5E71,
-	0x5E85,0x61D3,0x990E,0x8002,0x781E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 104, Array index 0x4700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5528,0x5572,0x55BA,0x55F0,0x55EE,0x56B8,0x56B9,
-	0x56C4,0x8053,0x92B0,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_TO_UCS_CCS_CNS11643_PLANE14 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit cns11643_plane14 -> UCS size-optimized table (12822 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_size_cns11643_plane14[] =
-{
-	0x00DE, /* Ranges number */
-	0x01A6, /* Unranged codes number */
-	0x15BF, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x2121, 0x216D, 0x029D,
-	/* Array index: 0x0006 */ 0x2177, 0x217D, 0x02EA,
-	/* Array index: 0x0009 */ 0x2222, 0x223F, 0x02F1,
-	/* Array index: 0x000C */ 0x2247, 0x227E, 0x030F,
-	/* Array index: 0x000F */ 0x2322, 0x2347, 0x0347,
-	/* Array index: 0x0012 */ 0x2350, 0x2355, 0x036D,
-	/* Array index: 0x0015 */ 0x2369, 0x237E, 0x0373,
-	/* Array index: 0x0018 */ 0x2423, 0x242F, 0x0389,
-	/* Array index: 0x001B */ 0x2438, 0x2454, 0x0396,
-	/* Array index: 0x001E */ 0x2457, 0x2467, 0x03B3,
-	/* Array index: 0x0021 */ 0x2473, 0x247E, 0x03C4,
-	/* Array index: 0x0024 */ 0x2521, 0x2538, 0x03D0,
-	/* Array index: 0x0027 */ 0x253E, 0x254E, 0x03E8,
-	/* Array index: 0x002A */ 0x255A, 0x2568, 0x03F9,
-	/* Array index: 0x002D */ 0x256B, 0x257D, 0x0408,
-	/* Array index: 0x0030 */ 0x2621, 0x262A, 0x041B,
-	/* Array index: 0x0033 */ 0x262E, 0x2639, 0x0425,
-	/* Array index: 0x0036 */ 0x2641, 0x266B, 0x0431,
-	/* Array index: 0x0039 */ 0x2673, 0x267E, 0x045C,
-	/* Array index: 0x003C */ 0x2721, 0x2752, 0x0468,
-	/* Array index: 0x003F */ 0x2759, 0x277D, 0x049A,
-	/* Array index: 0x0042 */ 0x2821, 0x282F, 0x04BF,
-	/* Array index: 0x0045 */ 0x283D, 0x2841, 0x04CE,
-	/* Array index: 0x0048 */ 0x2848, 0x287A, 0x04D3,
-	/* Array index: 0x004B */ 0x2925, 0x295A, 0x0506,
-	/* Array index: 0x004E */ 0x2963, 0x2979, 0x053C,
-	/* Array index: 0x0051 */ 0x2A21, 0x2A3F, 0x0553,
-	/* Array index: 0x0054 */ 0x2A47, 0x2A4F, 0x0572,
-	/* Array index: 0x0057 */ 0x2A54, 0x2A60, 0x057B,
-	/* Array index: 0x005A */ 0x2A70, 0x2A7E, 0x0588,
-	/* Array index: 0x005D */ 0x2B21, 0x2B40, 0x0597,
-	/* Array index: 0x0060 */ 0x2B46, 0x2B5E, 0x05B7,
-	/* Array index: 0x0063 */ 0x2B63, 0x2B72, 0x05D0,
-	/* Array index: 0x0066 */ 0x2C21, 0x2C2F, 0x05E0,
-	/* Array index: 0x0069 */ 0x2C3B, 0x2C4D, 0x05EF,
-	/* Array index: 0x006C */ 0x2C56, 0x2C63, 0x0602,
-	/* Array index: 0x006F */ 0x2C6B, 0x2C7E, 0x0610,
-	/* Array index: 0x0072 */ 0x2D21, 0x2D3D, 0x0624,
-	/* Array index: 0x0075 */ 0x2D45, 0x2D7E, 0x0641,
-	/* Array index: 0x0078 */ 0x2E21, 0x2E2B, 0x067B,
-	/* Array index: 0x007B */ 0x2E32, 0x2E54, 0x0686,
-	/* Array index: 0x007E */ 0x2E5D, 0x2E6F, 0x06A9,
-	/* Array index: 0x0081 */ 0x2E74, 0x2E7E, 0x06BC,
-	/* Array index: 0x0084 */ 0x2F23, 0x2F6F, 0x06C7,
-	/* Array index: 0x0087 */ 0x2F73, 0x2F7B, 0x0714,
-	/* Array index: 0x008A */ 0x3027, 0x302B, 0x071D,
-	/* Array index: 0x008D */ 0x302F, 0x3040, 0x0722,
-	/* Array index: 0x0090 */ 0x304A, 0x304F, 0x0734,
-	/* Array index: 0x0093 */ 0x3055, 0x307B, 0x073A,
-	/* Array index: 0x0096 */ 0x3121, 0x3129, 0x0761,
-	/* Array index: 0x0099 */ 0x312C, 0x313D, 0x076A,
-	/* Array index: 0x009C */ 0x3140, 0x317D, 0x077C,
-	/* Array index: 0x009F */ 0x3221, 0x3231, 0x07BA,
-	/* Array index: 0x00A2 */ 0x3238, 0x3241, 0x07CB,
-	/* Array index: 0x00A5 */ 0x3246, 0x3248, 0x07D5,
-	/* Array index: 0x00A8 */ 0x324D, 0x3252, 0x07D8,
-	/* Array index: 0x00AB */ 0x325A, 0x327C, 0x07DE,
-	/* Array index: 0x00AE */ 0x3323, 0x3332, 0x0801,
-	/* Array index: 0x00B1 */ 0x333B, 0x334F, 0x0811,
-	/* Array index: 0x00B4 */ 0x3355, 0x335A, 0x0826,
-	/* Array index: 0x00B7 */ 0x3369, 0x337C, 0x082C,
-	/* Array index: 0x00BA */ 0x3425, 0x3436, 0x0840,
-	/* Array index: 0x00BD */ 0x343C, 0x347D, 0x0852,
-	/* Array index: 0x00C0 */ 0x3527, 0x353C, 0x0894,
-	/* Array index: 0x00C3 */ 0x3543, 0x355B, 0x08AA,
-	/* Array index: 0x00C6 */ 0x3560, 0x3563, 0x08C3,
-	/* Array index: 0x00C9 */ 0x356E, 0x3576, 0x08C7,
-	/* Array index: 0x00CC */ 0x3622, 0x367D, 0x08D0,
-	/* Array index: 0x00CF */ 0x3721, 0x373D, 0x092C,
-	/* Array index: 0x00D2 */ 0x3744, 0x374A, 0x0949,
-	/* Array index: 0x00D5 */ 0x3750, 0x3759, 0x0950,
-	/* Array index: 0x00D8 */ 0x375D, 0x377E, 0x095A,
-	/* Array index: 0x00DB */ 0x3839, 0x3842, 0x097C,
-	/* Array index: 0x00DE */ 0x3845, 0x3858, 0x0986,
-	/* Array index: 0x00E1 */ 0x385B, 0x387B, 0x099A,
-	/* Array index: 0x00E4 */ 0x3929, 0x3941, 0x09BB,
-	/* Array index: 0x00E7 */ 0x394A, 0x3959, 0x09D4,
-	/* Array index: 0x00EA */ 0x3967, 0x397E, 0x09E4,
-	/* Array index: 0x00ED */ 0x3A27, 0x3A3C, 0x09FC,
-	/* Array index: 0x00F0 */ 0x3A40, 0x3A63, 0x0A12,
-	/* Array index: 0x00F3 */ 0x3A75, 0x3A7E, 0x0A36,
-	/* Array index: 0x00F6 */ 0x3B24, 0x3B2E, 0x0A40,
-	/* Array index: 0x00F9 */ 0x3B33, 0x3B47, 0x0A4B,
-	/* Array index: 0x00FC */ 0x3B4D, 0x3B68, 0x0A60,
-	/* Array index: 0x00FF */ 0x3B6D, 0x3B76, 0x0A7C,
-	/* Array index: 0x0102 */ 0x3B7C, 0x3B7E, 0x0A86,
-	/* Array index: 0x0105 */ 0x3C23, 0x3C2A, 0x0A89,
-	/* Array index: 0x0108 */ 0x3C2F, 0x3C5D, 0x0A91,
-	/* Array index: 0x010B */ 0x3C60, 0x3C74, 0x0AC0,
-	/* Array index: 0x010E */ 0x3C77, 0x3C7D, 0x0AD5,
-	/* Array index: 0x0111 */ 0x3D21, 0x3D47, 0x0ADC,
-	/* Array index: 0x0114 */ 0x3D4F, 0x3D69, 0x0B03,
-	/* Array index: 0x0117 */ 0x3D70, 0x3D7B, 0x0B1E,
-	/* Array index: 0x011A */ 0x3E21, 0x3E63, 0x0B2A,
-	/* Array index: 0x011D */ 0x3E68, 0x3E6A, 0x0B6D,
-	/* Array index: 0x0120 */ 0x3E7C, 0x3E7E, 0x0B70,
-	/* Array index: 0x0123 */ 0x3F21, 0x3F24, 0x0B73,
-	/* Array index: 0x0126 */ 0x3F29, 0x3F59, 0x0B77,
-	/* Array index: 0x0129 */ 0x3F62, 0x3F69, 0x0BA8,
-	/* Array index: 0x012C */ 0x3F70, 0x3F75, 0x0BB0,
-	/* Array index: 0x012F */ 0x4036, 0x4061, 0x0BB6,
-	/* Array index: 0x0132 */ 0x4071, 0x407D, 0x0BE2,
-	/* Array index: 0x0135 */ 0x4121, 0x413E, 0x0BEF,
-	/* Array index: 0x0138 */ 0x414D, 0x4151, 0x0C0D,
-	/* Array index: 0x013B */ 0x4172, 0x417E, 0x0C12,
-	/* Array index: 0x013E */ 0x4226, 0x4233, 0x0C1F,
-	/* Array index: 0x0141 */ 0x4239, 0x4249, 0x0C2D,
-	/* Array index: 0x0144 */ 0x424E, 0x427E, 0x0C3E,
-	/* Array index: 0x0147 */ 0x4325, 0x4339, 0x0C6F,
-	/* Array index: 0x014A */ 0x4346, 0x4355, 0x0C84,
-	/* Array index: 0x014D */ 0x4360, 0x436A, 0x0C94,
-	/* Array index: 0x0150 */ 0x4372, 0x4377, 0x0C9F,
-	/* Array index: 0x0153 */ 0x4422, 0x444F, 0x0CA5,
-	/* Array index: 0x0156 */ 0x4454, 0x446B, 0x0CD3,
-	/* Array index: 0x0159 */ 0x4476, 0x447E, 0x0CEB,
-	/* Array index: 0x015C */ 0x4523, 0x453C, 0x0CF4,
-	/* Array index: 0x015F */ 0x4557, 0x455C, 0x0D0E,
-	/* Array index: 0x0162 */ 0x455F, 0x4576, 0x0D14,
-	/* Array index: 0x0165 */ 0x4625, 0x4664, 0x0D2C,
-	/* Array index: 0x0168 */ 0x4668, 0x467B, 0x0D6C,
-	/* Array index: 0x016B */ 0x4721, 0x472A, 0x0D80,
-	/* Array index: 0x016E */ 0x4733, 0x474E, 0x0D8A,
-	/* Array index: 0x0171 */ 0x4753, 0x4772, 0x0DA6,
-	/* Array index: 0x0174 */ 0x4775, 0x477E, 0x0DC6,
-	/* Array index: 0x0177 */ 0x4821, 0x482B, 0x0DD0,
-	/* Array index: 0x017A */ 0x4830, 0x4840, 0x0DDB,
-	/* Array index: 0x017D */ 0x4844, 0x4848, 0x0DEC,
-	/* Array index: 0x0180 */ 0x4852, 0x4862, 0x0DF1,
-	/* Array index: 0x0183 */ 0x486D, 0x4879, 0x0E02,
-	/* Array index: 0x0186 */ 0x4922, 0x492E, 0x0E0F,
-	/* Array index: 0x0189 */ 0x4932, 0x4959, 0x0E1C,
-	/* Array index: 0x018C */ 0x495C, 0x4968, 0x0E44,
-	/* Array index: 0x018F */ 0x4970, 0x497D, 0x0E51,
-	/* Array index: 0x0192 */ 0x4A26, 0x4A39, 0x0E5F,
-	/* Array index: 0x0195 */ 0x4A44, 0x4A49, 0x0E73,
-	/* Array index: 0x0198 */ 0x4A52, 0x4A56, 0x0E79,
-	/* Array index: 0x019B */ 0x4A5D, 0x4A66, 0x0E7E,
-	/* Array index: 0x019E */ 0x4A6C, 0x4A75, 0x0E88,
-	/* Array index: 0x01A1 */ 0x4B29, 0x4B5F, 0x0E92,
-	/* Array index: 0x01A4 */ 0x4B63, 0x4B6D, 0x0EC9,
-	/* Array index: 0x01A7 */ 0x4B70, 0x4B7E, 0x0ED4,
-	/* Array index: 0x01AA */ 0x4C21, 0x4C4A, 0x0EE3,
-	/* Array index: 0x01AD */ 0x4C4D, 0x4C6C, 0x0F0D,
-	/* Array index: 0x01B0 */ 0x4C71, 0x4C7E, 0x0F2D,
-	/* Array index: 0x01B3 */ 0x4D24, 0x4D31, 0x0F3B,
-	/* Array index: 0x01B6 */ 0x4D35, 0x4D3D, 0x0F49,
-	/* Array index: 0x01B9 */ 0x4D46, 0x4D5D, 0x0F52,
-	/* Array index: 0x01BC */ 0x4D6D, 0x4D7E, 0x0F6A,
-	/* Array index: 0x01BF */ 0x4E24, 0x4E3D, 0x0F7C,
-	/* Array index: 0x01C2 */ 0x4E4B, 0x4E4F, 0x0F96,
-	/* Array index: 0x01C5 */ 0x4E5D, 0x4E76, 0x0F9B,
-	/* Array index: 0x01C8 */ 0x4F22, 0x4F26, 0x0FB5,
-	/* Array index: 0x01CB */ 0x4F2B, 0x4F56, 0x0FBA,
-	/* Array index: 0x01CE */ 0x4F60, 0x4F7E, 0x0FE6,
-	/* Array index: 0x01D1 */ 0x502A, 0x5038, 0x1005,
-	/* Array index: 0x01D4 */ 0x5048, 0x5070, 0x1014,
-	/* Array index: 0x01D7 */ 0x5075, 0x507E, 0x103D,
-	/* Array index: 0x01DA */ 0x5122, 0x5132, 0x1047,
-	/* Array index: 0x01DD */ 0x5138, 0x5146, 0x1058,
-	/* Array index: 0x01E0 */ 0x5154, 0x5176, 0x1067,
-	/* Array index: 0x01E3 */ 0x5224, 0x5234, 0x108A,
-	/* Array index: 0x01E6 */ 0x5252, 0x526B, 0x109B,
-	/* Array index: 0x01E9 */ 0x5321, 0x5344, 0x10B5,
-	/* Array index: 0x01EC */ 0x5358, 0x536C, 0x10D9,
-	/* Array index: 0x01EF */ 0x5374, 0x537D, 0x10EE,
-	/* Array index: 0x01F2 */ 0x5429, 0x542D, 0x10F8,
-	/* Array index: 0x01F5 */ 0x5432, 0x5461, 0x10FD,
-	/* Array index: 0x01F8 */ 0x5469, 0x547C, 0x112D,
-	/* Array index: 0x01FB */ 0x552D, 0x5539, 0x1141,
-	/* Array index: 0x01FE */ 0x553E, 0x5543, 0x114E,
-	/* Array index: 0x0201 */ 0x5552, 0x5575, 0x1154,
-	/* Array index: 0x0204 */ 0x5621, 0x5624, 0x1178,
-	/* Array index: 0x0207 */ 0x5628, 0x562D, 0x117C,
-	/* Array index: 0x020A */ 0x5639, 0x5642, 0x1182,
-	/* Array index: 0x020D */ 0x5646, 0x564A, 0x118C,
-	/* Array index: 0x0210 */ 0x5651, 0x5675, 0x1191,
-	/* Array index: 0x0213 */ 0x573A, 0x5745, 0x11B6,
-	/* Array index: 0x0216 */ 0x5755, 0x5765, 0x11C2,
-	/* Array index: 0x0219 */ 0x576A, 0x577E, 0x11D3,
-	/* Array index: 0x021C */ 0x5821, 0x5845, 0x11E8,
-	/* Array index: 0x021F */ 0x5854, 0x585D, 0x120D,
-	/* Array index: 0x0222 */ 0x586B, 0x587E, 0x1217,
-	/* Array index: 0x0225 */ 0x5931, 0x5951, 0x122B,
-	/* Array index: 0x0228 */ 0x5958, 0x595C, 0x124C,
-	/* Array index: 0x022B */ 0x5961, 0x597E, 0x1251,
-	/* Array index: 0x022E */ 0x5A22, 0x5A3C, 0x126F,
-	/* Array index: 0x0231 */ 0x5A42, 0x5A48, 0x128A,
-	/* Array index: 0x0234 */ 0x5A4D, 0x5A67, 0x1291,
-	/* Array index: 0x0237 */ 0x5A74, 0x5A7E, 0x12AC,
-	/* Array index: 0x023A */ 0x5B25, 0x5B2C, 0x12B7,
-	/* Array index: 0x023D */ 0x5B31, 0x5B50, 0x12BF,
-	/* Array index: 0x0240 */ 0x5B5D, 0x5B61, 0x12DF,
-	/* Array index: 0x0243 */ 0x5B69, 0x5B7E, 0x12E4,
-	/* Array index: 0x0246 */ 0x5C22, 0x5C43, 0x12FA,
-	/* Array index: 0x0249 */ 0x5C53, 0x5C66, 0x131C,
-	/* Array index: 0x024C */ 0x5C6C, 0x5C7E, 0x1330,
-	/* Array index: 0x024F */ 0x5D21, 0x5D49, 0x1343,
-	/* Array index: 0x0252 */ 0x5D4C, 0x5D53, 0x136C,
-	/* Array index: 0x0255 */ 0x5D5E, 0x5D7A, 0x1374,
-	/* Array index: 0x0258 */ 0x5E21, 0x5E2A, 0x1391,
-	/* Array index: 0x025B */ 0x5E31, 0x5E6A, 0x139B,
-	/* Array index: 0x025E */ 0x5E70, 0x5E7E, 0x13D5,
-	/* Array index: 0x0261 */ 0x5F21, 0x5F2C, 0x13E4,
-	/* Array index: 0x0264 */ 0x5F31, 0x5F37, 0x13F0,
-	/* Array index: 0x0267 */ 0x5F3C, 0x5F5B, 0x13F7,
-	/* Array index: 0x026A */ 0x5F69, 0x5F73, 0x1417,
-	/* Array index: 0x026D */ 0x6039, 0x6040, 0x1422,
-	/* Array index: 0x0270 */ 0x6043, 0x604B, 0x142A,
-	/* Array index: 0x0273 */ 0x6052, 0x6068, 0x1433,
-	/* Array index: 0x0276 */ 0x6073, 0x6077, 0x144A,
-	/* Array index: 0x0279 */ 0x6125, 0x6135, 0x144F,
-	/* Array index: 0x027C */ 0x613E, 0x6150, 0x1460,
-	/* Array index: 0x027F */ 0x615D, 0x6165, 0x1473,
-	/* Array index: 0x0282 */ 0x6169, 0x617E, 0x147C,
-	/* Array index: 0x0285 */ 0x6221, 0x6229, 0x1492,
-	/* Array index: 0x0288 */ 0x622F, 0x623B, 0x149B,
-	/* Array index: 0x028B */ 0x625C, 0x6272, 0x14A8,
-	/* Array index: 0x028E */ 0x642F, 0x6433, 0x14BF,
-	/* Array index: 0x0291 */ 0x6448, 0x647E, 0x14C4,
-	/* Array index: 0x0294 */ 0x6521, 0x657E, 0x14FB,
-	/* Array index: 0x0297 */ 0x6621, 0x667C, 0x1559,
-	/* Array index: 0x029A */ 0x6721, 0x672A, 0x15B5,
-	/* Ranges content */
-	/* Range 0x2121 - 0x216D, array index: 0x029D */
-	0x4E28,0x4E36,0x4E3F,0x4E85,0x4E05,0x4E04,0x5182,0x5196,
-	0x5338,0x5369,0x53B6,0x4E2A,0x4E87,0x4E49,0x51E2,0x4E46,
-	0x4E8F,0x4EBC,0x4EBE,0x5166,0x51E3,0x5204,0x529C,INVALC,
-	0x5902,0x590A,0x5B80,0x5DDB,0x5E7A,0x5E7F,0x5EF4,0x5F50,
-	0x5F51,0x5F61,0x961D,INVALC,0x4E63,0x4E62,0x4EA3,0x5185,
-	0x4EC5,0x4ECF,0x4ECE,0x4ECC,0x5184,0x5186,INVALC,INVALC,
-	0x51E4,0x5205,0x529E,0x529D,0x52FD,0x5300,0x533A,INVALC,
-	0x5346,0x535D,0x5386,0x53B7,INVALC,0x53CC,INVALC,0x53CE,
-	0x5721,INVALC,0x5E00,0x5F0C,0x6237,0x6238,0x6534,0x6535,
-	0x65E0,INVALC,0x738D,0x4E97,0x4EE0,
-	/* Range 0x2177 - 0x217D, array index: 0x02EA */
-	0x56D8,0x518B,0x518C,0x5199,0x51E5,INVALC,0x520B,
-	/* Range 0x2222 - 0x223F, array index: 0x02F1 */
-	0x5304,0x5303,0x5307,INVALC,0x531E,0x535F,0x536D,0x5389,
-	0x53BA,0x53D0,INVALC,0x53F6,0x53F7,0x53F9,INVALC,0x53F4,
-	INVALC,INVALC,0x5724,0x5904,0x5918,0x5932,0x5930,0x5934,
-	INVALC,0x5975,INVALC,0x5B82,0x5BF9,0x5C14,
-	/* Range 0x2247 - 0x227E, array index: 0x030F */
-	0x5E81,0x5E83,0x5F0D,0x5F52,INVALC,0x5FCA,0x5FC7,0x6239,
-	INVALC,0x624F,0x65E7,0x672F,0x6B7A,0x6C39,INVALC,INVALC,
-	0x6C37,0x6C44,0x6C45,0x738C,0x7592,0x7676,0x9093,0x9092,
-	INVALC,INVALC,0x4E21,0x4E20,0x4E22,0x4E68,0x4E89,0x4E98,
-	0x4EF9,0x4EEF,INVALC,INVALC,0x4EF8,0x4F06,0x4F03,0x4EFC,
-	0x4EEE,0x4F16,INVALC,0x4F28,0x4F1C,0x4F07,0x4F1A,0x4EFA,
-	0x4F17,0x514A,INVALC,0x5172,INVALC,0x51B4,0x51B3,0x51B2,
-	/* Range 0x2322 - 0x2347, array index: 0x0347 */
-	0x51E8,INVALC,0x5214,0x520F,0x5215,0x5218,0x52A8,INVALC,
-	0x534B,0x534F,INVALC,0x5350,INVALC,0x538B,INVALC,0x53BE,
-	INVALC,0x53D2,0x5416,0x53FF,INVALC,0x5400,INVALC,0x5405,
-	0x5413,0x5415,INVALC,INVALC,0x56E3,0x5735,0x5736,0x5731,
-	0x5732,0x58EE,0x5905,0x4E54,INVALC,0x5936,
-	/* Range 0x2350 - 0x2355, array index: 0x036D */
-	0x5B86,0x5F53,0x5C18,INVALC,0x5C3D,0x5C78,
-	/* Range 0x2369 - 0x237E, array index: 0x0373 */
-	0x5FDB,INVALC,0x620F,0x625D,0x625F,0x6267,0x6257,0x9F50,
-	INVALC,0x65EB,0x65EA,INVALC,0x6737,INVALC,0x6732,0x6736,
-	0x6B22,0x6BCE,INVALC,0x6C58,0x6C51,0x6C77,
-	/* Range 0x2423 - 0x242F, array index: 0x0389 */
-	0x6C5A,INVALC,0x6C53,0x706F,0x7072,0x706E,INVALC,INVALC,
-	0x7073,0x72B1,0x72B2,INVALC,0x738F,
-	/* Range 0x2438 - 0x2454, array index: 0x0396 */
-	0x827B,INVALC,0x8D71,0x8FB9,0x9096,0x909A,INVALC,0x4E24,
-	0x4E71,INVALC,0x4E9C,0x4F45,0x4F4A,0x4F39,0x4F37,INVALC,
-	0x4F32,0x4F42,INVALC,0x4F44,0x4F4B,INVALC,0x4F40,0x4F35,
-	0x4F31,0x5151,INVALC,0x5150,0x514E,
-	/* Range 0x2457 - 0x2467, array index: 0x03B3 */
-	0x519D,INVALC,0x51B5,0x51B8,0x51EC,0x5223,0x5227,0x5226,
-	0x521F,0x522B,0x5220,0x52B4,0x52B3,INVALC,0x5325,0x533B,
-	0x5374,
-	/* Range 0x2473 - 0x247E, array index: 0x03C4 */
-	0x5444,0x544C,0x5423,0x541A,0x5432,0x544B,0x5421,INVALC,
-	0x5434,0x5449,0x5450,0x5422,
-	/* Range 0x2521 - 0x2538, array index: 0x03D0 */
-	0x543F,0x5451,0x545A,0x542F,INVALC,0x56E9,0x56F2,0x56F3,
-	0x56EF,0x56ED,0x56EC,0x56E6,0x5748,INVALC,0x5744,0x573F,
-	0x573C,0x5753,0x5756,INVALC,0x575F,0x5743,0x5758,0x5757,
-	/* Range 0x253E - 0x254E, array index: 0x03E8 */
-	0x573D,INVALC,0x5742,0x5754,0x5755,0x58F1,0x58F2,0x58F0,
-	0x590B,0x9EA6,0x56F1,0x593D,INVALC,0x5994,0x598C,INVALC,
-	0x599C,
-	/* Range 0x255A - 0x2568, array index: 0x03F9 */
-	0x5B8D,INVALC,0x5BFE,0x5BFF,0x5BFD,0x5C2B,INVALC,0x5C84,
-	0x5C8E,0x5C9C,INVALC,INVALC,0x5C85,0x5DF5,0x5E09,
-	/* Range 0x256B - 0x257D, array index: 0x0408 */
-	0x5E0B,INVALC,0x5E92,0x5E90,0x5F03,INVALC,0x5F1E,0x5F63,
-	INVALC,0x5FE7,0x5FFE,0x5FE6,0x5FDC,0x5FCE,INVALC,0x5FFC,
-	0x5FDF,0x5FEC,0x5FF6,
-	/* Range 0x2621 - 0x262A, array index: 0x041B */
-	0x5FF2,0x5FF0,0x5FF9,INVALC,0x6213,INVALC,INVALC,0x623B,
-	0x623C,0x6282,
-	/* Range 0x262E - 0x2639, array index: 0x0425 */
-	0x6278,0x628B,INVALC,0x629E,0x62A5,0x629B,0x629C,0x6299,
-	0x628D,0x6285,0x629D,0x6275,
-	/* Range 0x2641 - 0x266B, array index: 0x0431 */
-	0x66F5,0x675B,INVALC,0x6754,0x6752,INVALC,0x6758,0x6744,
-	0x674A,0x6761,INVALC,0x6C7F,0x6C91,0x6C9E,INVALC,0x6C6E,
-	0x6C7C,0x6C9F,0x6C75,INVALC,0x6C56,0x6CA2,0x6C79,INVALC,
-	0x6CA1,INVALC,0x6CAA,0x6CA0,INVALC,0x7079,0x7077,0x707E,
-	INVALC,0x7075,0x707B,0x7264,INVALC,0x72BB,0x72BC,0x72C7,
-	0x72B9,0x72BE,0x72B6,
-	/* Range 0x2673 - 0x267E, array index: 0x045C */
-	0x7593,0x7680,INVALC,0x7683,0x76C0,0x76C1,INVALC,INVALC,
-	0x77F4,0x77F5,INVALC,0x7ACC,
-	/* Range 0x2721 - 0x2752, array index: 0x0468 */
-	0x7ACD,0x7CFA,0x809F,0x8091,0x8097,0x8094,INVALC,0x8286,
-	0x828C,INVALC,0x8295,INVALC,0x866C,INVALC,0x8FB5,0x8FBE,
-	0x8FC7,INVALC,0x8FC1,0x90A9,0x90A4,INVALC,INVALC,INVALC,
-	0x90A8,0x9627,0x9626,0x962B,0x9633,0x9634,0x9629,0x4E3D,
-	INVALC,0x4E9D,0x4F93,0x4F8A,INVALC,INVALC,0x4F6D,0x4F8E,
-	0x4FA0,0x4FA2,0x4FA1,0x4F9F,0x4FA3,INVALC,0x4F72,INVALC,
-	0x4F8C,0x5156,
-	/* Range 0x2759 - 0x277D, array index: 0x049A */
-	0x51ED,0x51FE,0x522F,INVALC,0x523C,0x5234,0x5239,0x52B9,
-	0x52B5,0x52BF,0x5355,INVALC,0x5376,0x537A,0x5393,INVALC,
-	0x53C1,0x53C2,0x53D5,0x5485,INVALC,0x545F,0x5493,0x5489,
-	0x5479,0x9EFE,0x548F,0x5469,0x546D,INVALC,0x5494,0x546A,
-	0x548A,INVALC,0x56FD,0x56FB,0x56F8,
-	/* Range 0x2821 - 0x282F, array index: 0x04BF */
-	0x56FC,0x56F6,0x5765,0x5781,0x5763,0x5767,INVALC,0x576E,
-	0x5778,0x577F,INVALC,INVALC,0x58F3,0x594B,0x594C,
-	/* Range 0x283D - 0x2841, array index: 0x04CE */
-	0x59BF,INVALC,0x59C9,0x59B8,0x59AC,
-	/* Range 0x2848 - 0x287A, array index: 0x04D3 */
-	0x5B60,INVALC,0x5B96,0x5B9E,0x5B94,0x5B9F,0x5B9D,INVALC,
-	0x5C00,0x5C19,INVALC,INVALC,0x5C49,0x5C4A,INVALC,0x5CBB,
-	0x5CC1,INVALC,INVALC,INVALC,0x5CB9,0x5C9E,0x5CB4,0x5CBA,
-	0x5DF6,0x5E13,0x5E12,0x5E77,INVALC,0x5E98,INVALC,0x5E99,
-	0x5E9D,0x5EF8,INVALC,0x5EF9,INVALC,0x5F06,0x5F21,INVALC,
-	0x5F25,0x5F55,INVALC,INVALC,INVALC,0x5F84,0x5F83,0x6030,
-	0x6007,INVALC,0x6036,
-	/* Range 0x2925 - 0x295A, array index: 0x0506 */
-	0x62BA,0x62B2,INVALC,0x62B7,0x62E4,0x62A7,INVALC,INVALC,
-	INVALC,0x62D5,0x62E1,0x62DD,0x62A6,0x62C1,0x62C5,0x62C0,
-	0x62DF,0x62E0,0x62DE,INVALC,0x6589,INVALC,0x65A6,0x65BA,
-	INVALC,0x65FF,INVALC,0x6617,0x6618,0x6601,0x65FE,INVALC,
-	0x670C,INVALC,0x676B,0x6796,0x6782,0x678A,INVALC,0x67A3,
-	INVALC,0x67A2,0x678F,INVALC,0x67F9,0x6780,0x6B26,0x6B27,
-	0x6B68,0x6B69,INVALC,0x6B81,0x6BB4,0x6BD1,
-	/* Range 0x2963 - 0x2979, array index: 0x053C */
-	0x6C97,0x6C6C,0x6CDF,INVALC,0x6CEA,INVALC,0x6CE4,0x6CD8,
-	0x6CB2,0x6CCE,0x6CC8,INVALC,0x708B,0x7088,0x7090,0x708F,
-	INVALC,0x7087,0x7089,0x708D,0x7081,INVALC,0x708C,
-	/* Range 0x2A21 - 0x2A3F, array index: 0x0553 */
-	0x7265,0x7266,0x7268,INVALC,INVALC,0x72CD,0x72D3,0x72DB,
-	INVALC,0x72CF,0x73A7,0x73A3,0x739E,INVALC,0x73AF,INVALC,
-	INVALC,0x73AA,0x739C,INVALC,0x7542,0x7544,0x753B,0x7541,
-	INVALC,0x759B,0x759E,INVALC,0x79C4,0x79C3,0x79C6,
-	/* Range 0x2A47 - 0x2A4F, array index: 0x0572 */
-	0x7ACF,0x7C76,0x7C74,0x7CFF,0x7CFC,INVALC,INVALC,0x7F59,
-	0x80A8,
-	/* Range 0x2A54 - 0x2A60, array index: 0x057B */
-	0x80B3,INVALC,0x80A4,0x80B6,0x80A7,0x80AC,INVALC,0x80A6,
-	0x5367,0x820E,0x82C4,0x833E,0x829C,
-	/* Range 0x2A70 - 0x2A7E, array index: 0x0588 */
-	0x8FCC,0x8FD9,0x8FCA,0x8FD8,0x8FCF,0x90B7,INVALC,0x90AD,
-	0x90B9,0x9637,INVALC,0x9641,0x963E,0x96B6,0x9751,
-	/* Range 0x2B21 - 0x2B40, array index: 0x0597 */
-	0x9763,0x4E57,0x4E79,0x4EB2,0x4EB0,0x4EAF,0x4EB1,0x4FD2,
-	0x4FD5,INVALC,0x4FBE,0x4FB8,0x4FB0,0x4FB1,0x4FC8,INVALC,
-	INVALC,0x4FC6,0x4FCC,0x4FE5,0x4FE3,0x4FB4,0x516A,INVALC,
-	0x519F,INVALC,0x51C1,INVALC,0x51C2,0x51C3,0x5245,0x5248,
-	/* Range 0x2B46 - 0x2B5E, array index: 0x05B7 */
-	0x52C5,0x52CA,0x52C4,0x5327,0x5358,0x537D,INVALC,0x53DD,
-	0x53DC,0x53DA,0x53D9,0x54B9,INVALC,0x54D0,0x54B4,0x54CA,
-	INVALC,0x54A3,0x54DA,0x54A4,INVALC,0x54B2,0x549E,0x549F,
-	0x54B5,
-	/* Range 0x2B63 - 0x2B72, array index: 0x05D0 */
-	0x54CC,INVALC,0x5700,0x57AC,0x5791,0x578E,0x578D,0x5792,
-	0x57A1,0x5790,0x57A6,0x57A8,INVALC,0x579C,0x5796,0x57A7,
-	/* Range 0x2C21 - 0x2C2F, array index: 0x05E0 */
-	0x59DF,INVALC,0x59EB,0x59EF,0x59F0,0x59D5,0x5A0D,0x5A04,
-	0x59F9,0x5A02,0x59F8,0x59E2,0x59D9,0x59E7,0x5B6A,
-	/* Range 0x2C3B - 0x2C4D, array index: 0x05EF */
-	0x5CD1,0x5CDC,0x5CE6,0x5CE1,0x5CCD,INVALC,0x5CE2,0x5CDD,
-	0x5CE5,0x5DFB,0x5DFA,0x5E1E,INVALC,0x5EA1,INVALC,INVALC,
-	0x5EFC,0x5EFB,0x5F2F,
-	/* Range 0x2C56 - 0x2C63, array index: 0x0602 */
-	0x604E,0x6051,INVALC,INVALC,0x6023,0x6031,0x607C,0x6052,
-	INVALC,0x6060,0x604A,0x6061,INVALC,0x6218,
-	/* Range 0x2C6B - 0x2C7E, array index: 0x0610 */
-	0x631F,0x6317,0x62EA,0x6321,0x6304,0x6305,INVALC,0x6531,
-	0x6544,0x6540,INVALC,0x6542,0x65BE,INVALC,0x6629,0x661B,
-	INVALC,0x6623,0x662C,0x661A,
-	/* Range 0x2D21 - 0x2D3D, array index: 0x0624 */
-	0x6630,0x663B,0x661E,0x6637,0x6638,INVALC,0x670E,INVALC,
-	INVALC,0x67E8,0x67D6,INVALC,0x67C7,0x67BC,0x6852,0x67BF,
-	0x67D5,0x67FE,0x8363,0x67FB,INVALC,0x67B1,0x6801,0x6805,
-	0x6800,0x67D7,INVALC,0x6B2A,0x6B6B,
-	/* Range 0x2D45 - 0x2D7E, array index: 0x0641 */
-	0x6D23,0x6CFF,0x6D14,0x6D05,0x6D13,0x6D06,0x6D21,INVALC,
-	0x6D15,0x6CAF,0x6CF4,0x6D02,0x6D45,INVALC,0x6D26,INVALC,
-	0x6D44,INVALC,0x6D24,0x70A5,INVALC,0x70A3,INVALC,0x70A2,
-	0x70BB,0x70A0,0x70AA,INVALC,INVALC,0x70A8,0x70B6,0x70B2,
-	0x70A7,INVALC,INVALC,0x70B9,0x722E,INVALC,0x723C,INVALC,
-	0x726D,INVALC,INVALC,0x72E7,0x72ED,INVALC,0x72EC,0x72E5,
-	0x72E2,INVALC,0x73C4,0x73BD,0x73CF,0x73C9,0x73C1,0x73D0,
-	INVALC,0x73CE,
-	/* Range 0x2E21 - 0x2E2B, array index: 0x067B */
-	0x74ED,0x74EB,INVALC,0x74EF,0x7549,0x7550,0x7546,0x754A,
-	INVALC,0x754D,0x75A6,
-	/* Range 0x2E32 - 0x2E54, array index: 0x0686 */
-	0x76C7,0x76FF,INVALC,0x76FD,0x77E6,0x780A,INVALC,0x7804,
-	0x780B,0x7807,INVALC,0x7815,0x7808,INVALC,0x79D3,0x79D4,
-	0x79D0,0x79D7,0x7A7C,INVALC,INVALC,0x7A7D,0x7A83,0x7A82,
-	INVALC,0x7AD4,0x7AD5,0x7AD3,0x7AD0,0x7AD2,0x7AFE,0x7AFC,
-	0x7C77,0x7C7C,0x7C7B,
-	/* Range 0x2E5D - 0x2E6F, array index: 0x06A9 */
-	0x7F8F,0x80D3,INVALC,0x80CB,0x80D2,INVALC,0x8109,0x80E2,
-	0x80DF,0x80C6,INVALC,0x8224,0x82F7,0x82D8,0x82DD,INVALC,
-	INVALC,0x82F8,0x82FC,
-	/* Range 0x2E74 - 0x2E7E, array index: 0x06BC */
-	0x82EE,INVALC,0x82D0,0x830E,0x82E2,0x830B,0x82FD,0x5179,
-	0x8676,INVALC,0x8678,
-	/* Range 0x2F23 - 0x2F6F, array index: 0x06C7 */
-	0x8675,0x867D,INVALC,0x8842,0x8866,INVALC,0x898C,0x8A05,
-	INVALC,0x8A06,INVALC,0x8C9F,INVALC,0x8FF1,0x8FE7,0x8FE9,
-	0x8FEF,0x90C2,0x90BC,INVALC,0x90C6,0x90C0,INVALC,INVALC,
-	0x90CD,0x90C9,INVALC,0x90C4,INVALC,0x9581,INVALC,0x9CEC,
-	0x5032,0x4FF9,0x501D,0x4FFF,0x5004,0x4FF0,0x5003,INVALC,
-	0x5002,0x4FFC,0x4FF2,0x5024,0x5008,0x5036,0x502E,INVALC,
-	0x5010,0x5038,0x5039,0x4FFD,0x5056,0x4FFB,0x51A3,0x51A6,
-	0x51A1,INVALC,INVALC,0x51C7,0x51C9,0x5260,0x5264,0x5259,
-	0x5265,0x5267,0x5257,0x5263,INVALC,0x5253,INVALC,0x52CF,
-	INVALC,0x52CE,0x52D0,0x52D1,0x52CC,
-	/* Range 0x2F73 - 0x2F7B, array index: 0x0714 */
-	0x550D,0x54F4,INVALC,0x5513,0x54EF,0x54F5,0x54F9,0x5502,
-	0x5500,
-	/* Range 0x3027 - 0x302B, array index: 0x071D */
-	0x5705,0x57C9,INVALC,0x57B7,0x57CD,
-	/* Range 0x302F - 0x3040, array index: 0x0722 */
-	0x57BE,0x57BB,INVALC,0x57DB,0x57C8,0x57C4,0x57C5,0x57D1,
-	0x57CA,0x57C0,INVALC,INVALC,0x5A21,0x5A2A,INVALC,0x5A1D,
-	INVALC,0x5A0B,
-	/* Range 0x304A - 0x304F, array index: 0x0734 */
-	0x5A14,0x5A31,INVALC,0x5A2F,0x5A1A,0x5A12,
-	/* Range 0x3055 - 0x307B, array index: 0x073A */
-	0x5BBC,0x5BBB,0x5BB7,0x5C05,0x5C06,0x5C52,0x5C53,INVALC,
-	INVALC,0x5CFA,0x5CEB,INVALC,0x5CF3,0x5CF5,0x5CE9,0x5CEF,
-	INVALC,0x5E2A,0x5E30,0x5E2E,0x5E2C,0x5E2F,0x5EAF,0x5EA9,
-	INVALC,0x5EFD,0x5F32,0x5F8E,0x5F93,0x5F8F,0x604F,0x6099,
-	INVALC,0x607E,INVALC,0x6074,0x604B,0x6073,0x6075,
-	/* Range 0x3121 - 0x3129, array index: 0x0761 */
-	0x60A9,0x608B,0x60A6,INVALC,0x6093,0x60AE,0x609E,0x60A7,
-	0x6245,
-	/* Range 0x312C - 0x313D, array index: 0x076A */
-	0x632E,INVALC,0x6352,0x6330,0x635B,INVALC,0x6319,0x631B,
-	INVALC,0x6331,0x635D,0x6337,0x6335,0x6353,INVALC,0x635C,
-	0x633F,0x654B,
-	/* Range 0x3140 - 0x317D, array index: 0x077C */
-	0x658B,INVALC,0x659A,0x6650,0x6646,0x664E,0x6640,INVALC,
-	0x664B,0x6648,INVALC,0x6660,0x6644,0x664D,INVALC,0x6837,
-	0x6824,INVALC,INVALC,0x681B,0x6836,INVALC,0x682C,0x6819,
-	0x6856,0x6847,0x683E,0x681E,INVALC,0x6815,0x6822,0x6827,
-	0x6859,0x6858,0x6855,0x6830,0x6823,0x6B2E,0x6B2B,0x6B30,
-	0x6B6C,INVALC,0x6B8B,INVALC,0x6BE9,0x6BEA,0x6BE5,0x6D6B,
-	INVALC,INVALC,0x6D73,0x6D57,INVALC,INVALC,0x6D5D,0x6D56,
-	0x6D8F,0x6D5B,0x6D1C,0x6D9A,0x6D9B,0x6D99,
-	/* Range 0x3221 - 0x3231, array index: 0x07BA */
-	0x6D81,0x6D71,INVALC,INVALC,0x6D72,0x6D5C,0x6D96,0x70C4,
-	0x70DB,0x70CC,0x70D0,0x70E3,0x70DF,INVALC,0x70D6,0x70EE,
-	0x70D5,
-	/* Range 0x3238 - 0x3241, array index: 0x07CB */
-	0x72F5,0x7302,INVALC,INVALC,0x73E2,0x73EC,0x73D5,0x73F9,
-	0x73DF,0x73E6,
-	/* Range 0x3246 - 0x3248, array index: 0x07D5 */
-	0x73E4,0x73E1,0x74F3,
-	/* Range 0x324D - 0x3252, array index: 0x07D8 */
-	0x7556,0x7555,0x7558,0x7557,0x755E,0x75C3,
-	/* Range 0x325A - 0x327C, array index: 0x07DE */
-	0x76CB,0x76CC,0x772A,INVALC,0x7716,0x770F,INVALC,INVALC,
-	0x773F,0x772B,0x770E,0x7724,INVALC,0x7721,0x7718,0x77DD,
-	INVALC,INVALC,0x7824,0x7836,INVALC,0x7958,0x7959,INVALC,
-	0x7962,0x79DA,0x79D9,INVALC,0x79E1,0x79E5,0x79E8,0x79DB,
-	INVALC,0x79E2,0x79F0,
-	/* Range 0x3323 - 0x3332, array index: 0x0801 */
-	0x7ADA,0x7ADD,INVALC,0x7ADB,0x7ADC,INVALC,INVALC,0x7B0D,
-	0x7B0B,0x7B14,0x7C8E,0x7C86,INVALC,0x7C87,0x7C83,0x7C8B,
-	/* Range 0x333B - 0x334F, array index: 0x0811 */
-	0x7D25,0x7F62,0x7F93,0x7F99,0x7F97,INVALC,INVALC,0x7FC4,
-	0x7FC6,0x800A,INVALC,INVALC,0x8040,0x803C,0x803B,0x80F6,
-	0x80FF,0x80EE,0x8104,0x8103,0x8107,
-	/* Range 0x3355 - 0x335A, array index: 0x0826 */
-	0x822D,INVALC,0x8227,0x8229,0x831F,0x8357,
-	/* Range 0x3369 - 0x337C, array index: 0x082C */
-	0x8684,0x869F,0x869B,0x8689,0x86A6,0x8692,0x868F,0x86A0,
-	0x884F,0x8878,0x887A,0x886E,0x887B,0x8884,0x8873,INVALC,
-	INVALC,0x8A0D,0x8A0B,0x8A19,
-	/* Range 0x3425 - 0x3436, array index: 0x0840 */
-	0x8FF9,0x9009,0x9008,INVALC,0x90DE,0x9151,INVALC,INVALC,
-	0x91DB,0x91DF,0x91DE,0x91D6,0x91E0,0x9585,0x9660,0x9659,
-	INVALC,0x9656,
-	/* Range 0x343C - 0x347D, array index: 0x0852 */
-	0x5042,0x5059,INVALC,0x5044,0x5066,0x5052,0x5054,0x5071,
-	0x5050,0x507B,0x507C,0x5058,INVALC,INVALC,0x5079,0x506C,
-	0x5078,0x51A8,0x51D1,0x51CF,0x5268,0x5276,0x52D4,INVALC,
-	0x53A0,0x53C4,INVALC,0x5558,0x554C,0x5568,INVALC,0x5549,
-	INVALC,INVALC,0x555D,0x5529,INVALC,0x5554,0x5553,INVALC,
-	0x555A,INVALC,0x553A,0x553F,0x552B,0x57EA,INVALC,0x57EF,
-	INVALC,INVALC,0x57DD,0x57FE,INVALC,0x57DE,0x57E6,INVALC,
-	0x57E8,0x57FF,0x5803,0x58F7,0x68A6,0x591F,INVALC,0x595B,
-	0x595D,0x595E,
-	/* Range 0x3527 - 0x353C, array index: 0x0894 */
-	0x5A61,0x5A3A,0x5A6E,0x5A4B,0x5A6B,INVALC,INVALC,0x5A45,
-	0x5A4E,0x5A68,0x5A3D,0x5A71,0x5A3F,0x5A6F,0x5A75,INVALC,
-	0x5A73,0x5A2C,0x5A59,0x5A54,0x5A4F,0x5A63,
-	/* Range 0x3543 - 0x355B, array index: 0x08AA */
-	0x5C5B,0x5C61,INVALC,0x5D21,0x5D0A,0x5D09,INVALC,0x5D2C,
-	0x5D08,INVALC,INVALC,0x5D2A,0x5D15,INVALC,0x5D10,0x5D13,
-	INVALC,0x5D2F,0x5D18,INVALC,0x5DE3,0x5E39,0x5E35,0x5E3A,
-	0x5E32,
-	/* Range 0x3560 - 0x3563, array index: 0x08C3 */
-	0x5EBB,0x5EBA,0x5F34,0x5F39,
-	/* Range 0x356E - 0x3576, array index: 0x08C7 */
-	0x60D7,0x60AA,INVALC,0x60A1,0x60A4,INVALC,0x60EE,INVALC,
-	0x60E7,
-	/* Range 0x3622 - 0x367D, array index: 0x08D0 */
-	0x6379,0x6386,0x6393,INVALC,0x6373,0x636A,INVALC,0x636C,
-	INVALC,0x637F,INVALC,0x63B2,0x63BA,INVALC,INVALC,0x6366,
-	0x6374,INVALC,0x655A,INVALC,0x654E,0x654D,0x658D,0x658E,
-	0x65AD,INVALC,0x65C7,0x65CA,INVALC,0x65C9,INVALC,0x65E3,
-	0x6657,INVALC,0x6663,0x6667,0x671A,0x6719,0x6716,INVALC,
-	INVALC,0x689E,0x68B6,0x6898,0x6873,INVALC,0x689A,0x688E,
-	0x68B7,0x68DB,0x68A5,0x686C,0x68C1,0x6884,INVALC,INVALC,
-	0x6895,0x687A,0x6899,INVALC,0x68B8,0x68B9,0x6870,INVALC,
-	0x6B35,INVALC,0x6B90,0x6BBB,0x6BED,INVALC,INVALC,INVALC,
-	0x6DC1,0x6DC3,0x6DCE,INVALC,INVALC,0x6DAD,0x6E04,INVALC,
-	0x6DB9,INVALC,0x6DE7,INVALC,0x6E08,0x6E06,INVALC,0x6E0A,
-	0x6DB0,INVALC,0x6DF8,0x6E0C,
-	/* Range 0x3721 - 0x373D, array index: 0x092C */
-	0x6DB1,INVALC,0x6E02,0x6E07,0x6E09,0x6E01,0x6E17,0x6DFF,
-	0x6E12,INVALC,INVALC,0x7103,0x7107,0x7101,0x70F5,0x70F1,
-	0x7108,0x70F2,0x710F,INVALC,0x70FE,INVALC,INVALC,INVALC,
-	0x731A,0x7310,0x730E,0x7402,0x73F3,
-	/* Range 0x3744 - 0x374A, array index: 0x0949 */
-	0x751B,0x7523,0x7561,0x7568,INVALC,0x7567,0x75D3,
-	/* Range 0x3750 - 0x3759, array index: 0x0950 */
-	0x76D5,0x76D7,0x76D6,0x7730,INVALC,0x7726,INVALC,0x7740,
-	INVALC,0x771E,
-	/* Range 0x375D - 0x377E, array index: 0x095A */
-	0x7847,INVALC,0x784B,0x7851,0x784F,0x7842,0x7846,INVALC,
-	0x796E,0x796C,0x79F2,INVALC,0x79F1,0x79F5,0x79F3,0x79F9,
-	INVALC,INVALC,INVALC,0x7A9A,0x7A93,0x7A91,0x7AE1,INVALC,
-	INVALC,0x7B21,0x7B1C,0x7B16,0x7B17,0x7B36,0x7B1F,INVALC,
-	0x7C93,0x7C99,
-	/* Range 0x3839 - 0x3842, array index: 0x097C */
-	0x801D,INVALC,0x8049,0x8045,0x8044,0x7C9B,INVALC,INVALC,
-	0x812A,0x812E,
-	/* Range 0x3845 - 0x3858, array index: 0x0986 */
-	0x8131,INVALC,0x811A,0x8134,0x8117,INVALC,INVALC,INVALC,
-	0x831D,0x8371,0x8384,0x8380,0x8372,0x83A1,INVALC,0x8379,
-	0x8391,INVALC,0x839F,0x83AD,
-	/* Range 0x385B - 0x387B, array index: 0x099A */
-	0x8323,INVALC,0x8385,0x839C,0x83B7,0x8658,0x865A,INVALC,
-	0x8657,0x86B2,INVALC,0x86AE,INVALC,INVALC,INVALC,0x8845,
-	0x889C,0x8894,0x88A3,0x888F,0x88A5,0x88A9,0x88A6,0x888A,
-	0x88A0,0x8890,0x8992,0x8991,0x8994,INVALC,0x8A26,0x8A32,
-	0x8A28,
-	/* Range 0x3929 - 0x3941, array index: 0x09BB */
-	0x8A21,0x8C3A,INVALC,0x8C5B,0x8C58,0x8C7C,INVALC,0x8CA6,
-	0x8CAE,0x8CAD,0x8D65,INVALC,0x8D7E,INVALC,0x8D7C,0x8D7F,
-	0x8D7A,0x8DBD,INVALC,INVALC,0x8DC0,0x8DBB,0x8EAD,0x8EAF,
-	0x8ED6,
-	/* Range 0x394A - 0x3959, array index: 0x09D4 */
-	0x9012,0x900E,0x9025,INVALC,0x9013,0x90EE,INVALC,0x90AB,
-	0x90F7,INVALC,0x9159,0x9154,0x91F2,0x91F0,0x91E5,0x91F6,
-	/* Range 0x3967 - 0x397E, array index: 0x09E4 */
-	0x98E1,0x98E6,INVALC,0x9EC4,0x9ED2,0x4E80,INVALC,0x4E81,
-	0x508F,0x5097,0x5088,0x5089,INVALC,INVALC,0x5081,0x5160,
-	INVALC,INVALC,0x5E42,0x51D3,INVALC,INVALC,0x51D2,0x51D6,
-	/* Range 0x3A27 - 0x3A3C, array index: 0x09FC */
-	0x53A8,0x53A6,0x53C5,0x5597,0x55DE,INVALC,INVALC,0x5596,
-	0x55B4,INVALC,0x5585,INVALC,0x559B,0x55A0,INVALC,0x5559,
-	INVALC,0x5586,INVALC,INVALC,0x55AF,0x557A,
-	/* Range 0x3A40 - 0x3A63, array index: 0x0A12 */
-	0x559E,INVALC,0x55A9,0x570F,0x570E,0x581A,INVALC,0x581F,
-	INVALC,0x583C,0x5818,0x583E,0x5826,INVALC,0x583A,INVALC,
-	0x5822,INVALC,0x58FB,0x5963,0x5964,INVALC,0x5AA8,0x5AA3,
-	0x5A82,0x5A88,0x5AA1,0x5A85,0x5A98,INVALC,0x5A99,INVALC,
-	0x5A89,0x5A81,0x5A96,0x5A80,
-	/* Range 0x3A75 - 0x3A7E, array index: 0x0A36 */
-	0x5A79,INVALC,0x5A86,0x5AAB,0x5AAA,0x5AA4,0x5A8D,0x5A7E,
-	INVALC,0x5BD5,
-	/* Range 0x3B24 - 0x3B2E, array index: 0x0A40 */
-	0x5C1E,0x5C5F,0x5C5E,0x5D44,0x5D3E,INVALC,0x5D48,0x5D1C,
-	INVALC,0x5D5B,0x5D4D,
-	/* Range 0x3B33 - 0x3B47, array index: 0x0A4B */
-	0x5D53,0x5D4F,INVALC,0x5D3B,0x5D46,INVALC,INVALC,0x5E46,
-	0x5E47,INVALC,0x5E48,0x5EC0,0x5EBD,0x5EBF,INVALC,0x5F11,
-	INVALC,0x5F3E,0x5F3B,INVALC,0x5F3A,
-	/* Range 0x3B4D - 0x3B68, array index: 0x0A60 */
-	0x60EA,INVALC,0x6107,0x6122,0x610C,INVALC,INVALC,0x60B3,
-	0x60D6,0x60D2,INVALC,0x60E3,0x60E5,0x60E9,INVALC,INVALC,
-	0x6111,0x60FD,INVALC,INVALC,0x611E,0x6120,0x6121,0x621E,
-	INVALC,0x63E2,0x63DE,0x63E6,
-	/* Range 0x3B6D - 0x3B76, array index: 0x0A7C */
-	0x63F8,INVALC,0x63FE,0x63C1,0x63BF,0x63F7,0x63D1,0x655F,
-	0x6560,0x6561,
-	/* Range 0x3B7C - 0x3B7E, array index: 0x0A86 */
-	0x667D,0x666B,0x667F,
-	/* Range 0x3C23 - 0x3C2A, array index: 0x0A89 */
-	0x6673,0x6681,0x666D,0x6669,INVALC,INVALC,0x671E,0x68ED,
-	/* Range 0x3C2F - 0x3C5D, array index: 0x0A91 */
-	0x6903,INVALC,0x68FE,0x68E5,0x691E,0x6902,INVALC,INVALC,
-	0x6909,0x68CA,0x6900,INVALC,0x6901,0x6918,0x68E2,0x68CF,
-	INVALC,0x692E,0x68C5,0x68FF,INVALC,0x691C,0x68C3,INVALC,
-	0x6B6F,INVALC,0x6B6E,INVALC,0x6BBE,INVALC,0x6BF4,0x6C2D,
-	INVALC,0x6DB6,0x6E75,0x6E1E,INVALC,0x6E18,INVALC,0x6E48,
-	INVALC,0x6E4F,INVALC,0x6E42,0x6E6A,0x6E70,0x6DFE,
-	/* Range 0x3C60 - 0x3C74, array index: 0x0AC0 */
-	0x6E6D,INVALC,0x6E7B,0x6E7E,0x6E59,INVALC,0x6E57,INVALC,
-	0x6E80,0x6E50,INVALC,0x6E29,0x6E76,0x6E2A,0x6E4C,0x712A,
-	INVALC,0x7135,0x712C,0x7137,0x711D,
-	/* Range 0x3C77 - 0x3C7D, array index: 0x0AD5 */
-	0x7138,INVALC,0x7134,0x712B,0x7133,0x7127,0x7124,
-	/* Range 0x3D21 - 0x3D47, array index: 0x0ADC */
-	0x712D,0x7232,0x7283,0x7282,0x7287,0x7306,0x7324,0x7338,
-	0x732A,0x732C,0x732B,INVALC,0x732F,0x7328,0x7417,INVALC,
-	INVALC,0x7419,0x7438,INVALC,0x741F,0x7414,0x743C,0x73F7,
-	0x741C,0x7415,0x7418,0x7439,0x74F9,0x7524,INVALC,INVALC,
-	INVALC,0x756E,0x756D,0x7571,0x758E,INVALC,0x75E5,
-	/* Range 0x3D4F - 0x3D69, array index: 0x0B03 */
-	0x76D9,INVALC,0x7748,0x7749,0x7743,INVALC,INVALC,0x7742,
-	0x77DF,INVALC,0x7863,0x7876,INVALC,0x785F,0x7866,0x7966,
-	0x7971,INVALC,INVALC,0x7976,0x7984,0x7975,0x79FF,0x7A07,
-	INVALC,0x7A0E,0x7A09,
-	/* Range 0x3D70 - 0x3D7B, array index: 0x0B1E */
-	0x7AE7,0x7AE2,0x7B55,INVALC,INVALC,0x7B43,0x7B57,0x7B6C,
-	0x7B42,0x7B53,INVALC,0x7B41,
-	/* Range 0x3E21 - 0x3E63, array index: 0x0B2A */
-	0x7CA0,0x7CA6,0x7CA4,0x7D74,INVALC,0x7D59,INVALC,0x7D60,
-	0x7D57,0x7D6C,0x7D7E,0x7D64,INVALC,0x7D5A,0x7D5D,INVALC,
-	INVALC,INVALC,0x7D76,0x7D4D,0x7D75,INVALC,0x7FD3,0x7FD6,
-	INVALC,INVALC,0x8060,0x804E,0x8145,0x813B,INVALC,0x8148,
-	0x8142,0x8149,0x8140,0x8114,0x8141,INVALC,0x81EF,0x81F6,
-	0x8203,INVALC,0x83ED,INVALC,0x83DA,0x8418,0x83D2,0x8408,
-	INVALC,0x8400,INVALC,INVALC,INVALC,0x8417,0x8346,0x8414,
-	0x83D3,0x8405,0x841F,0x8402,0x8416,0x83CD,0x83E6,INVALC,
-	0x865D,0x86D5,0x86E1,
-	/* Range 0x3E68 - 0x3E6A, array index: 0x0B6D */
-	0x86EE,0x8847,0x8846,
-	/* Range 0x3E7C - 0x3E7E, array index: 0x0B70 */
-	0x8A35,0x8A38,0x8A42,
-	/* Range 0x3F21 - 0x3F24, array index: 0x0B73 */
-	0x8A49,0x8A5D,0x8A4B,0x8A3D,
-	/* Range 0x3F29 - 0x3F59, array index: 0x0B77 */
-	0x8C60,0x8C5E,0x8C7F,0x8C7E,0x8C83,INVALC,0x8CB1,0x8D87,
-	INVALC,INVALC,0x8D88,0x8D83,INVALC,INVALC,0x8D86,0x8D8B,
-	0x8D82,0x8DCA,0x8DD2,INVALC,INVALC,0x8DD4,0x8DC9,0x8EB0,
-	INVALC,INVALC,INVALC,0x8EF2,0x8EE4,0x8EF3,0x8EEA,INVALC,
-	0x8EFD,INVALC,0x8F9D,0x902B,0x902A,INVALC,0x9028,0x9029,
-	0x902C,INVALC,INVALC,0x903A,0x9030,0x9037,0x903B,INVALC,
-	0x910A,
-	/* Range 0x3F62 - 0x3F69, array index: 0x0BA8 */
-	0x9218,0x9222,INVALC,0x921B,0x9208,INVALC,0x920E,0x9213,
-	/* Range 0x3F70 - 0x3F75, array index: 0x0BB0 */
-	0x968C,0x967B,0x967F,0x9681,INVALC,0x9682,
-	/* Range 0x4036 - 0x4061, array index: 0x0BB6 */
-	0x50CC,0x50BC,INVALC,0x50AA,0x50B9,INVALC,0x50AB,0x50C3,
-	0x50CD,0x517E,0x527E,0x5279,INVALC,INVALC,0x52E1,0x52E0,
-	0x52E7,0x5380,0x53AB,0x53AA,0x53A9,0x53E0,0x55EA,INVALC,
-	0x55D7,INVALC,INVALC,0x55C1,0x5715,INVALC,0x586C,INVALC,
-	0x585C,0x5850,0x5861,0x586A,0x5869,0x5856,0x5860,0x5866,
-	0x585F,0x5923,0x5966,0x5968,
-	/* Range 0x4071 - 0x407D, array index: 0x0BE2 */
-	0x5B74,0x5B76,0x5BDC,0x5BD7,0x5BDA,0x5BDB,INVALC,0x5C20,
-	0x5D6D,0x5D66,INVALC,0x5D64,0x5D6E,
-	/* Range 0x4121 - 0x413E, array index: 0x0BEF */
-	0x5D60,0x5F42,0x5F5A,0x5F6E,INVALC,INVALC,0x6130,0x613A,
-	0x612A,0x6143,0x6119,0x6131,INVALC,0x613D,INVALC,INVALC,
-	INVALC,0x6408,0x6432,0x6438,INVALC,0x6431,INVALC,0x6419,
-	INVALC,0x6411,INVALC,INVALC,0x6429,0x641D,
-	/* Range 0x414D - 0x4151, array index: 0x0C0D */
-	0x6570,0x656D,INVALC,0x65E4,0x6693,
-	/* Range 0x4172 - 0x417E, array index: 0x0C12 */
-	0x6985,0x694D,0x6950,0x6947,0x6967,0x6936,0x6964,0x6961,
-	INVALC,0x697D,0x6B44,0x6B40,0x6B71,
-	/* Range 0x4226 - 0x4233, array index: 0x0C1F */
-	0x6BC1,INVALC,0x6BFA,0x6C31,0x6C32,INVALC,INVALC,0x6EB8,
-	0x6EA8,INVALC,0x6E91,0x6EBB,INVALC,0x6E9A,
-	/* Range 0x4239 - 0x4249, array index: 0x0C2D */
-	0x6EB5,0x6E6C,0x6EE8,INVALC,0x6EDD,0x6EDA,0x6EE6,0x6EAC,
-	INVALC,INVALC,INVALC,0x6ED9,0x6EE3,0x6EE9,0x6EDB,INVALC,
-	0x716F,
-	/* Range 0x424E - 0x427E, array index: 0x0C3E */
-	0x714A,0x716B,INVALC,0x714F,0x7157,0x7174,INVALC,INVALC,
-	INVALC,0x7145,0x7151,0x716D,INVALC,0x7251,0x7250,0x724E,
-	INVALC,0x7341,INVALC,0x732E,0x7346,INVALC,0x7427,INVALC,
-	0x7448,0x7453,0x743D,INVALC,0x745D,0x7456,INVALC,0x741E,
-	0x7447,0x7443,0x7458,0x7449,INVALC,0x744C,0x7445,0x743E,
-	INVALC,0x7501,0x751E,INVALC,INVALC,0x757A,0x75EE,0x7602,
-	0x7697,
-	/* Range 0x4325 - 0x4339, array index: 0x0C6F */
-	0x775D,0x7764,0x7753,0x7758,0x7882,0x7890,0x788A,INVALC,
-	0x787A,0x787D,INVALC,0x788B,0x7878,INVALC,INVALC,0x788D,
-	0x7888,0x7892,0x7881,0x797E,0x7983,
-	/* Range 0x4346 - 0x4355, array index: 0x0C84 */
-	0x7AA1,0x7AA4,INVALC,0x7AE9,0x7AEA,INVALC,0x7B62,0x7B6B,
-	INVALC,0x7B5E,INVALC,0x7B79,INVALC,INVALC,0x7B6F,0x7B68,
-	/* Range 0x4360 - 0x436A, array index: 0x0C94 */
-	0x7D8A,INVALC,0x7D8B,0x7D99,0x7D95,INVALC,0x7D87,0x7D78,
-	0x7D97,0x7D89,0x7D98,
-	/* Range 0x4372 - 0x4377, array index: 0x0C9F */
-	0x7FDD,0x8057,INVALC,0x8163,0x816A,0x816C,
-	/* Range 0x4422 - 0x444F, array index: 0x0CA5 */
-	0x817D,0x816D,INVALC,INVALC,0x8241,0x844F,0x8484,INVALC,
-	0x847F,INVALC,0x8448,0x842A,0x847B,0x8472,0x8464,0x842E,
-	0x845C,0x8453,INVALC,0x8441,0x84C8,INVALC,0x8462,0x8480,
-	0x843E,0x8483,0x8471,INVALC,0x844A,0x8455,0x8458,INVALC,
-	INVALC,INVALC,0x86FC,0x86FD,0x8715,INVALC,0x8716,0x86FF,
-	INVALC,INVALC,INVALC,0x8858,0x88CF,0x88E0,
-	/* Range 0x4454 - 0x446B, array index: 0x0CD3 */
-	0x89E7,0x8A6A,0x8A80,INVALC,0x8A6F,0x8A65,INVALC,0x8A78,
-	0x8A7D,0x8A88,INVALC,INVALC,0x8A64,0x8A7E,INVALC,0x8A67,
-	0x8C63,0x8C88,INVALC,0x8CCD,INVALC,0x8CC9,INVALC,0x8DED,
-	/* Range 0x4476 - 0x447E, array index: 0x0CEB */
-	0x8F04,0x8F9E,0x8FA0,0x9043,0x9046,0x9048,0x9045,0x9040,
-	0x904C,
-	/* Range 0x4523 - 0x453C, array index: 0x0CF4 */
-	0x910C,0x9113,0x9115,INVALC,0x916B,0x9167,0x925D,0x9255,
-	0x9235,INVALC,0x9259,0x922F,0x923C,0x928F,0x925C,0x926A,
-	0x9262,0x925F,0x926B,0x926E,0x923B,0x9244,0x9241,0x959A,
-	INVALC,0x9599,
-	/* Range 0x4557 - 0x455C, array index: 0x0D0E */
-	0x98F7,0x98FF,0x98F5,INVALC,0x98EC,0x98F1,
-	/* Range 0x455F - 0x4576, array index: 0x0D14 */
-	0x999A,INVALC,0x9AE2,0x9B3D,0x9B5D,0x9CE8,INVALC,0x9CEB,
-	0x9CEF,0x9CEE,0x9E81,0x9F14,0x50D0,0x50D9,0x50DC,0x50D8,
-	INVALC,0x50E1,0x50EB,INVALC,INVALC,0x50F4,0x50E2,0x50DE,
-	/* Range 0x4625 - 0x4664, array index: 0x0D2C */
-	0x53AE,0x53B0,INVALC,0x55FB,0x5603,0x560B,INVALC,0x5607,
-	INVALC,0x55F8,INVALC,0x5628,0x561E,INVALC,0x5618,0x5611,
-	0x5651,0x5605,0x5717,0x5892,INVALC,0x588C,INVALC,0x5878,
-	0x5884,0x5873,0x58AD,0x5897,0x5895,0x5877,0x5872,0x5896,
-	0x588D,0x5910,INVALC,0x596C,INVALC,0x5AE7,INVALC,0x5AE4,
-	INVALC,INVALC,0x5AEF,0x5626,INVALC,INVALC,0x5AF0,0x5D7B,
-	INVALC,0x5D83,INVALC,INVALC,0x5D8B,0x5D8C,INVALC,0x5D78,
-	0x5E52,INVALC,INVALC,0x5ED0,0x5ECF,INVALC,0x5FB3,0x5FB4,
-	/* Range 0x4668 - 0x467B, array index: 0x0D6C */
-	0x617B,INVALC,0x616F,0x6181,0x613C,0x6142,0x6138,0x6133,
-	INVALC,0x6160,0x6169,0x617D,0x6186,0x622C,0x6228,INVALC,
-	0x644C,INVALC,0x6457,0x647C,
-	/* Range 0x4721 - 0x472A, array index: 0x0D80 */
-	0x6462,0x6471,0x646A,0x6456,0x643B,0x6481,INVALC,0x644F,
-	0x647E,0x6464,
-	/* Range 0x4733 - 0x474E, array index: 0x0D8A */
-	0x66A5,0x669A,0x669C,INVALC,0x66A6,INVALC,0x66A4,0x698F,
-	0x69C5,0x69C8,0x6992,0x69B2,INVALC,INVALC,INVALC,0x69E3,
-	0x69C0,0x69D6,0x69D1,0x699F,0x69A2,0x69D2,INVALC,INVALC,
-	INVALC,0x69E1,0x69D5,0x699D,
-	/* Range 0x4753 - 0x4772, array index: 0x0DA6 */
-	0x6B74,0x6BA1,INVALC,0x6EF0,0x6EF3,INVALC,INVALC,0x6F1B,
-	0x6F0C,0x6F1D,0x6F34,0x6F28,0x6F17,INVALC,0x6F44,0x6F42,
-	0x6F04,0x6F11,0x6EFA,0x6F4A,0x7191,0x718E,INVALC,0x718B,
-	0x718D,0x717F,0x718C,0x717E,0x717C,0x7183,INVALC,0x7188,
-	/* Range 0x4775 - 0x477E, array index: 0x0DC6 */
-	0x7294,INVALC,0x7355,0x7353,0x734F,0x7354,0x746C,0x7465,
-	0x7466,0x7461,
-	/* Range 0x4821 - 0x482B, array index: 0x0DD0 */
-	0x746B,0x7468,0x7476,INVALC,0x7460,INVALC,0x7474,0x7506,
-	0x760E,INVALC,0x7607,
-	/* Range 0x4830 - 0x4840, array index: 0x0DDB */
-	0x76B7,0x76E2,INVALC,0x7774,0x7777,0x7776,0x7775,INVALC,
-	0x7778,0x7771,INVALC,0x777A,0x715B,0x777B,0x78A6,0x78AE,
-	0x78B8,
-	/* Range 0x4844 - 0x4848, array index: 0x0DEC */
-	0x78B1,0x78AF,INVALC,0x7989,0x7987,
-	/* Range 0x4852 - 0x4862, array index: 0x0DF1 */
-	0x7A32,INVALC,0x7AEC,0x7AF0,0x7B81,0x7B9E,0x7B83,INVALC,
-	0x7B92,INVALC,0x7BA3,0x7B9F,0x7B93,INVALC,0x7B86,0x7CB8,
-	0x7CB7,
-	/* Range 0x486D - 0x4879, array index: 0x0E02 */
-	0x7DA8,0x7DAB,INVALC,0x7DB3,0x7DCD,INVALC,0x7DCF,0x7DA4,
-	INVALC,INVALC,0x7F41,0x7F6F,0x7F71,
-	/* Range 0x4922 - 0x492E, array index: 0x0E0F */
-	0x8023,0x805B,INVALC,0x8061,0x805F,0x8181,INVALC,INVALC,
-	0x8184,0x8213,INVALC,0x824A,0x824C,
-	/* Range 0x4932 - 0x4959, array index: 0x0E1C */
-	0x84BD,0x8495,INVALC,0x8492,0x84C3,INVALC,0x8496,0x84A5,
-	0x84B5,0x84B3,0x84A3,0x84E4,0x84D8,0x84D5,INVALC,0x84B7,
-	0x84AD,0x84DA,0x8493,0x8736,INVALC,INVALC,INVALC,0x873D,
-	0x872B,0x8747,0x8739,INVALC,0x8745,0x871D,INVALC,0x88FF,
-	0x88EA,INVALC,0x88F5,INVALC,0x8900,0x88ED,0x8903,0x88E9,
-	/* Range 0x495C - 0x4968, array index: 0x0E44 */
-	0x89EA,INVALC,0x8A9B,0x8A8E,0x8AA2,INVALC,0x8A9C,0x8A94,
-	0x8A90,0x8AA9,0x8AAC,INVALC,0x8A9F,
-	/* Range 0x4970 - 0x497D, array index: 0x0E51 */
-	0x8CD0,0x8CD6,0x8CD4,0x8D98,0x8D9A,0x8D97,INVALC,INVALC,
-	INVALC,0x8E0B,0x8E08,0x8E01,0x8EB4,0x8EB3,
-	/* Range 0x4A26 - 0x4A39, array index: 0x0E5F */
-	0x9061,0x905F,INVALC,INVALC,0x9125,0x917B,0x9176,0x917C,
-	INVALC,0x9289,0x92F6,0x92B1,0x92AD,0x9292,0x9281,0x9284,
-	INVALC,0x92AE,0x9290,0x929E,
-	/* Range 0x4A44 - 0x4A49, array index: 0x0E73 */
-	0x96A0,0x969D,0x969F,0x96D0,INVALC,0x96D1,
-	/* Range 0x4A52 - 0x4A56, array index: 0x0E79 */
-	0x9819,INVALC,0x9814,0x9815,0x981A,
-	/* Range 0x4A5D - 0x4A66, array index: 0x0E7E */
-	0x98F8,0x9901,INVALC,0x99BE,0x99BC,0x99B7,0x99B6,0x99C0,
-	INVALC,0x99B8,
-	/* Range 0x4A6C - 0x4A75, array index: 0x0E88 */
-	0x99BF,INVALC,0x9ADA,0x9AE4,0x9AE9,0x9AE8,0x9AEA,0x9AE5,
-	INVALC,0x9B26,
-	/* Range 0x4B29 - 0x4B5F, array index: 0x0E92 */
-	0x50F7,INVALC,0x50FC,0x510D,0x5101,0x51DA,0x51D9,0x51DB,
-	0x5286,0x528E,0x52EE,0x5333,0x53B1,INVALC,0x5647,0x562D,
-	0x5654,INVALC,0x564B,0x5652,0x5631,0x5644,0x5656,0x5650,
-	0x562B,INVALC,0x564D,0x5637,0x564F,0x58A2,0x58B7,INVALC,
-	0x58B2,INVALC,0x58AA,0x58B5,0x58B0,INVALC,0x58B4,0x58A4,
-	0x58A7,INVALC,0x5926,0x5AFE,INVALC,0x5B04,INVALC,0x5AFC,
-	INVALC,0x5B06,0x5B0A,0x5AFA,0x5B0D,0x5B00,0x5B0E,
-	/* Range 0x4B63 - 0x4B6D, array index: 0x0EC9 */
-	0x5D91,INVALC,0x5D8F,0x5D90,0x5D98,0x5DA4,0x5D9B,0x5DA3,
-	0x5D96,0x5DE4,0x5E5A,
-	/* Range 0x4B70 - 0x4B7E, array index: 0x0ED4 */
-	0x5E5E,INVALC,0x5FB8,0x6157,0x615C,0x61A6,0x6195,0x6188,
-	INVALC,0x61A3,0x618F,INVALC,0x6164,INVALC,0x6159,
-	/* Range 0x4C21 - 0x4C4A, array index: 0x0EE3 */
-	0x6178,INVALC,0x6185,0x6187,0x619E,INVALC,INVALC,0x6198,
-	0x619C,INVALC,INVALC,0x622F,0x6480,0x649B,0x648E,0x648D,
-	0x6494,0x64C6,INVALC,0x64A8,0x6483,INVALC,0x64B9,0x6486,
-	0x64B4,0x64AF,0x6491,INVALC,0x64AA,0x64A1,0x64A7,0x66B6,
-	0x66B3,INVALC,0x66BC,0x66AC,INVALC,0x66AD,0x6A0E,INVALC,
-	0x6A1C,0x6A1A,
-	/* Range 0x4C4D - 0x4C6C, array index: 0x0F0D */
-	0x6A0B,INVALC,0x69EF,0x6A0C,0x69F0,0x6A22,INVALC,0x69D8,
-	INVALC,0x6A12,0x69FA,INVALC,0x6A2A,INVALC,0x6A10,INVALC,
-	INVALC,0x6A29,0x69F9,0x69EA,0x6A2C,0x6A24,INVALC,0x69E9,
-	0x6B52,0x6B4F,0x6B53,INVALC,INVALC,0x6F10,0x6F65,0x6F75,
-	/* Range 0x4C71 - 0x4C7E, array index: 0x0F2D */
-	0x6FD0,INVALC,0x6F5C,0x6F3D,0x6F71,INVALC,0x6F91,0x6F0B,
-	0x6F79,0x6F81,0x6F8F,INVALC,0x6F59,0x6F74,
-	/* Range 0x4D24 - 0x4D31, array index: 0x0F3B */
-	0x71A3,0x71AD,INVALC,INVALC,0x71AB,0x71A6,0x71A2,INVALC,
-	0x52F2,0x7257,0x7255,0x7299,0x734B,0x747A,
-	/* Range 0x4D35 - 0x4D3D, array index: 0x0F49 */
-	0x748C,0x7484,INVALC,INVALC,0x7482,0x7493,0x747B,INVALC,
-	0x7509,
-	/* Range 0x4D46 - 0x4D5D, array index: 0x0F52 */
-	0x7790,INVALC,0x78C6,0x78D3,0x78C0,0x78D2,0x78C7,0x78C2,
-	INVALC,0x799F,0x799D,0x799E,INVALC,0x7A41,INVALC,0x7A38,
-	0x7A3A,0x7A42,INVALC,INVALC,0x7A3E,0x7AB0,0x7BAE,0x7BB3,
-	/* Range 0x4D6D - 0x4D7E, array index: 0x0F6A */
-	0x7CC4,0x7CCD,0x7CC2,0x7CC6,0x7CC3,0x7CC9,0x7CC7,INVALC,
-	0x7DF8,INVALC,0x7DED,0x7DE2,INVALC,INVALC,INVALC,0x7DDC,
-	0x7E02,0x7E01,
-	/* Range 0x4E24 - 0x4E3D, array index: 0x0F7C */
-	0x7DE4,0x7DFE,INVALC,0x7E00,0x7DFC,0x7DFD,INVALC,0x7DF5,
-	0x7DFF,INVALC,0x7DEB,0x7DE5,0x7F78,0x7FAE,0x7FE7,INVALC,
-	0x8065,0x806A,0x8066,0x8068,0x806B,0x8194,0x81A1,0x8192,
-	0x8196,0x8193,
-	/* Range 0x4E4B - 0x4E4F, array index: 0x0F96 */
-	0x851B,0x8503,0x8533,0x8534,0x84ED,
-	/* Range 0x4E5D - 0x4E76, array index: 0x0F9B */
-	0x8771,INVALC,0x885C,0x88E6,0x890F,0x891B,INVALC,0x89A9,
-	0x89A5,0x89EE,0x8AB1,INVALC,0x8ACC,0x8ACE,INVALC,0x8AB7,
-	INVALC,0x8AB5,0x8AE9,0x8AB4,INVALC,0x8AB3,0x8AC1,0x8AAF,
-	0x8ACA,0x8AD0,
-	/* Range 0x4F22 - 0x4F26, array index: 0x0FB5 */
-	0x8CEB,0x8DA4,INVALC,0x8DA2,0x8D9D,
-	/* Range 0x4F2B - 0x4F56, array index: 0x0FBA */
-	0x8E2A,0x8E28,INVALC,INVALC,0x8EB8,0x8EB6,0x8EB9,0x8EB7,
-	0x8F22,0x8F2B,0x8F27,0x8F19,0x8FA4,INVALC,0x8FB3,INVALC,
-	0x9071,0x906A,INVALC,INVALC,0x9188,0x918C,0x92BF,0x92B8,
-	0x92BE,0x92DC,0x92E5,INVALC,INVALC,0x92D4,0x92D6,INVALC,
-	0x92DA,0x92ED,0x92F3,0x92DB,INVALC,0x92B9,0x92E2,0x92EB,
-	0x95AF,INVALC,0x95B2,0x95B3,
-	/* Range 0x4F60 - 0x4F7E, array index: 0x0FE6 */
-	0x970A,INVALC,0x9787,0x9789,0x978C,0x97EF,0x982A,0x9822,
-	INVALC,0x981F,INVALC,0x9919,INVALC,0x99CA,0x99DA,INVALC,
-	INVALC,INVALC,0x99DE,0x99C8,0x99E0,INVALC,0x9AB6,0x9AB5,
-	INVALC,0x9AF4,INVALC,0x9B6B,0x9B69,0x9B72,0x9B63,
-	/* Range 0x502A - 0x5038, array index: 0x1005 */
-	0x9CFE,0x9D02,0x9E84,INVALC,0x9EAB,0x9EAA,0x511D,0x5116,
-	INVALC,0x512B,0x511E,0x511B,0x5290,0x5294,0x5314,
-	/* Range 0x5048 - 0x5070, array index: 0x1014 */
-	0x58C3,0x58CA,0x58BB,0x58C0,0x58C4,0x5901,0x5B1F,0x5B18,
-	0x5B11,0x5B15,INVALC,0x5B12,0x5B1C,INVALC,0x5B22,0x5B79,
-	0x5DA6,INVALC,0x5DB3,0x5DAB,0x5EEA,INVALC,0x5F5B,INVALC,
-	INVALC,0x61B7,0x61CE,0x61B9,0x61BD,0x61CF,0x61C0,0x6199,
-	0x6197,INVALC,0x61BB,0x61D0,0x61C4,0x6231,INVALC,0x64D3,
-	0x64C0,
-	/* Range 0x5075 - 0x507E, array index: 0x103D */
-	0x64DC,0x64D1,0x64C8,INVALC,0x64D5,0x66C3,INVALC,INVALC,
-	0x66BF,0x66C5,
-	/* Range 0x5122 - 0x5132, array index: 0x1047 */
-	0x66CD,0x66C1,0x6706,INVALC,0x6724,0x6A63,0x6A42,0x6A52,
-	INVALC,0x6A43,0x6A33,INVALC,0x6A6C,0x6A57,INVALC,0x6A4C,
-	0x6A6E,
-	/* Range 0x5138 - 0x5146, array index: 0x1058 */
-	0x6A37,INVALC,0x6A71,0x6A4A,0x6A36,INVALC,0x6A53,INVALC,
-	0x6A45,0x6A70,INVALC,INVALC,0x6A5C,0x6B58,0x6B57,
-	/* Range 0x5154 - 0x5176, array index: 0x1067 */
-	0x6FB5,0x6FD3,0x6F9F,INVALC,0x6FB7,0x6FF5,0x71B7,INVALC,
-	0x71BB,INVALC,0x71D1,INVALC,0x71BA,INVALC,0x71B6,0x71CC,
-	INVALC,INVALC,0x71D3,0x749B,INVALC,INVALC,0x7496,0x74A2,
-	0x749D,0x750A,0x750E,INVALC,0x7581,0x762C,0x7637,0x7636,
-	0x763B,INVALC,0x76A1,
-	/* Range 0x5224 - 0x5234, array index: 0x108A */
-	0x78DC,INVALC,0x79A5,0x79A9,0x9834,0x7A53,0x7A45,INVALC,
-	0x7A4F,INVALC,0x7ABD,0x7ABB,0x7AF1,INVALC,INVALC,0x7BEC,
-	0x7BED,
-	/* Range 0x5252 - 0x526B, array index: 0x109B */
-	0x8542,INVALC,0x855C,0x8570,0x855F,INVALC,0x855A,0x854B,
-	0x853F,0x878A,INVALC,0x878B,0x87A1,0x878E,INVALC,INVALC,
-	0x8799,0x885E,0x885F,0x8924,0x89A7,0x8AEA,0x8AFD,0x8AF9,
-	0x8AE3,0x8AE5,
-	/* Range 0x5321 - 0x5344, array index: 0x10B5 */
-	0x8F31,0x8F30,INVALC,0x8F2D,0x8F3C,0x8FA7,0x8FA5,INVALC,
-	INVALC,INVALC,0x9137,0x9195,0x918E,INVALC,0x9196,INVALC,
-	0x9345,0x930A,INVALC,INVALC,0x92FD,0x9317,0x931C,0x9307,
-	0x9331,0x9332,0x932C,0x9330,0x9303,0x9305,INVALC,0x95C2,
-	INVALC,0x95B8,INVALC,0x95C1,
-	/* Range 0x5358 - 0x536C, array index: 0x10D9 */
-	0x9836,0x9831,0x9833,0x983C,0x982E,0x983A,INVALC,0x983D,
-	INVALC,0x98B5,0x9922,0x9923,0x9920,0x991C,0x991D,INVALC,
-	0x99A0,INVALC,0x99EF,0x99E8,0x99EB,
-	/* Range 0x5374 - 0x537D, array index: 0x10EE */
-	0x9AF8,0x9AF5,INVALC,INVALC,0x9B83,0x9B94,0x9B84,INVALC,
-	0x9B8B,0x9B8F,
-	/* Range 0x5429 - 0x542D, array index: 0x10F8 */
-	0x9D24,0x9D0F,INVALC,0x9D13,0x9D0A,
-	/* Range 0x5432 - 0x5461, array index: 0x10FD */
-	0x9D2A,0x9D1A,INVALC,0x9D27,0x9D16,0x9D21,INVALC,0x9E85,
-	0x9EAC,0x9EC6,0x9EC5,0x9ED7,0x9F53,INVALC,0x5128,0x5127,
-	0x51DF,INVALC,0x5335,0x53B3,INVALC,0x568A,0x567D,0x5689,
-	INVALC,0x58CD,0x58D0,INVALC,0x5B2B,0x5B33,0x5B29,0x5B35,
-	0x5B31,0x5B37,0x5C36,0x5DBE,INVALC,0x5DB9,INVALC,0x5DBB,
-	INVALC,0x61E2,0x61DB,0x61DD,0x61DC,0x61DA,INVALC,0x61D9,
-	/* Range 0x5469 - 0x547C, array index: 0x112D */
-	0x64EE,INVALC,0x65B5,0x66D4,0x66D5,INVALC,0x66D0,0x66D1,
-	0x66CE,0x66D7,INVALC,INVALC,0x6A7D,0x6A8A,INVALC,0x6AA7,
-	INVALC,0x6A99,0x6A82,0x6A88,
-	/* Range 0x552D - 0x5539, array index: 0x1141 */
-	0x6C0A,INVALC,0x6FD7,0x6FD6,0x6FE5,INVALC,INVALC,INVALC,
-	0x6FD9,0x6FDA,0x6FEA,INVALC,0x6FF6,
-	/* Range 0x553E - 0x5543, array index: 0x114E */
-	0x71E9,INVALC,0x71EB,0x71EF,0x71F3,0x71EA,
-	/* Range 0x5552 - 0x5575, array index: 0x1154 */
-	0x7583,0x7645,0x764E,0x7644,0x76A3,0x76A5,0x77A6,0x77A4,
-	INVALC,0x77A9,0x77AF,INVALC,INVALC,INVALC,0x78F0,0x78F8,
-	0x78F1,INVALC,0x7A49,INVALC,INVALC,INVALC,0x7AC2,0x7AF2,
-	0x7AF3,0x7BFA,INVALC,0x7BF6,0x7BFC,0x7C18,0x7C08,0x7C12,
-	INVALC,INVALC,0x7CDB,0x7CDA,
-	/* Range 0x5621 - 0x5624, array index: 0x1178 */
-	0x802B,0x8074,0x81B8,0x81C8,
-	/* Range 0x5628 - 0x562D, array index: 0x117C */
-	0x8592,0x8593,INVALC,0x857F,0x85AB,0x8597,
-	/* Range 0x5639 - 0x5642, array index: 0x1182 */
-	0x87C1,0x87B1,0x87C7,INVALC,0x8940,INVALC,0x893F,0x8939,
-	INVALC,0x8943,
-	/* Range 0x5646 - 0x564A, array index: 0x118C */
-	0x89AB,INVALC,0x8B1F,0x8B09,0x8B0C,
-	/* Range 0x5651 - 0x5675, array index: 0x1191 */
-	0x8CF6,0x8CF7,INVALC,0x8E46,0x8E4F,INVALC,INVALC,INVALC,
-	0x8F3D,0x8F41,0x9366,0x9378,0x935D,0x9369,0x9374,0x937D,
-	0x936E,0x9372,0x9373,0x9362,0x9348,0x9353,0x935F,0x9368,
-	INVALC,0x937F,0x936B,INVALC,0x95C4,INVALC,0x96AF,0x96AD,
-	0x96B2,INVALC,INVALC,0x971A,0x971B,
-	/* Range 0x573A - 0x5745, array index: 0x11B6 */
-	0x9ABD,0x9B00,0x9B02,INVALC,0x9B34,0x9B49,0x9B9F,INVALC,
-	0x9BA3,0x9BCD,0x9B99,0x9B9D,
-	/* Range 0x5755 - 0x5765, array index: 0x11C2 */
-	0x9F8E,INVALC,0x569F,0x569B,0x569E,0x5696,0x5694,0x56A0,
-	INVALC,0x5B3B,INVALC,INVALC,0x5B3A,0x5DC1,0x5F4D,0x5F5D,
-	0x61F3,
-	/* Range 0x576A - 0x577E, array index: 0x11D3 */
-	0x64F6,0x64E5,0x64EA,0x64E7,0x6505,INVALC,0x64F9,INVALC,
-	INVALC,INVALC,0x6AAB,0x6AED,0x6AB2,0x6AB0,0x6AB5,0x6ABE,
-	0x6AC1,0x6AC8,INVALC,0x6AC0,0x6ABC,
-	/* Range 0x5821 - 0x5845, array index: 0x11E8 */
-	0x6AB1,0x6AC4,0x6ABF,INVALC,INVALC,0x7008,0x7003,0x6FFD,
-	0x7010,0x7002,0x7013,INVALC,0x71FA,0x7200,0x74B9,0x74BC,
-	INVALC,0x765B,0x7651,0x764F,0x76EB,0x77B8,INVALC,0x77B9,
-	0x77C1,0x77C0,0x77BE,0x790B,INVALC,0x7907,0x790A,0x7908,
-	INVALC,0x790D,0x7906,0x7915,0x79AF,
-	/* Range 0x5854 - 0x585D, array index: 0x120D */
-	0x7CE6,0x7CE3,INVALC,INVALC,0x7E5D,0x7E4F,0x7E66,0x7E5B,
-	0x7F47,0x7FB4,
-	/* Range 0x586B - 0x587E, array index: 0x1217 */
-	0x85CC,0x85B2,INVALC,0x85BB,0x85C1,INVALC,INVALC,INVALC,
-	0x87E9,0x87EE,0x87F0,0x87D6,0x880E,0x87DA,0x8948,0x894A,
-	0x894E,0x894D,0x89B1,0x89B0,
-	/* Range 0x5931 - 0x5951, array index: 0x122B */
-	0x8DA9,0x8E58,INVALC,INVALC,0x8EBF,0x8EC1,0x8F4A,0x8FAC,
-	INVALC,0x9089,0x913D,0x913C,0x91A9,0x93A0,INVALC,0x9390,
-	INVALC,0x9393,0x938B,0x93AD,0x93BB,0x93B8,INVALC,INVALC,
-	0x939C,0x95D8,0x95D7,INVALC,INVALC,INVALC,0x975D,0x97A9,
-	0x97DA,
-	/* Range 0x5958 - 0x595C, array index: 0x124C */
-	0x9855,0x984B,INVALC,0x983F,0x98B9,
-	/* Range 0x5961 - 0x597E, array index: 0x1251 */
-	0x9938,0x9936,0x9940,INVALC,0x993B,0x9939,0x99A4,INVALC,
-	INVALC,0x9A08,0x9A0C,INVALC,0x9A10,INVALC,0x9B07,INVALC,
-	0x9BD2,INVALC,0x9BC2,0x9BBB,0x9BCC,0x9BCB,INVALC,INVALC,
-	0x9D4D,0x9D63,0x9D4E,INVALC,0x9D50,0x9D55,
-	/* Range 0x5A22 - 0x5A3C, array index: 0x126F */
-	0x9D5E,INVALC,0x9E90,0x9EB2,0x9EB1,INVALC,0x9ECA,0x9F02,
-	0x9F27,0x9F26,INVALC,0x56AF,0x58E0,0x58DC,INVALC,0x5B39,
-	INVALC,INVALC,0x5B7C,0x5BF3,INVALC,INVALC,0x5C6B,0x5DC4,
-	0x650B,0x6508,0x650A,
-	/* Range 0x5A42 - 0x5A48, array index: 0x128A */
-	0x66E1,0x66DF,0x6ACE,0x6AD4,0x6AE3,0x6AD7,0x6AE2,
-	/* Range 0x5A4D - 0x5A67, array index: 0x1291 */
-	0x6AD8,0x6AD5,0x6AD2,INVALC,INVALC,0x701E,0x702C,0x7025,
-	0x6FF3,0x7204,0x7208,0x7215,INVALC,0x74C4,0x74C9,0x74C7,
-	0x74C8,0x76A9,0x77C6,0x77C5,0x7918,0x791A,0x7920,INVALC,
-	0x7A66,0x7A64,0x7A6A,
-	/* Range 0x5A74 - 0x5A7E, array index: 0x12AC */
-	0x7E6E,0x7E71,INVALC,0x81D4,0x81D6,0x821A,0x8262,0x8265,
-	0x8276,0x85DB,0x85D6,
-	/* Range 0x5B25 - 0x5B2C, array index: 0x12B7 */
-	0x85F4,INVALC,0x87FD,0x87D5,0x8807,INVALC,0x880F,0x87F8,
-	/* Range 0x5B31 - 0x5B50, array index: 0x12BF */
-	0x89B5,0x89F5,INVALC,0x8B3F,0x8B43,0x8B4C,INVALC,0x8D0B,
-	0x8E6B,0x8E68,0x8E70,0x8E75,0x8E77,INVALC,0x8EC3,INVALC,
-	0x93E9,0x93EA,0x93CB,0x93C5,0x93C6,INVALC,0x93ED,0x93D3,
-	INVALC,0x93E5,INVALC,INVALC,0x93DB,0x93EB,0x93E0,0x93C1,
-	/* Range 0x5B5D - 0x5B61, array index: 0x12DF */
-	0x97B2,0x97B4,0x97B1,0x97B5,0x97F2,
-	/* Range 0x5B69 - 0x5B7E, array index: 0x12E4 */
-	0x9944,INVALC,0x9A26,0x9A1F,0x9A18,0x9A21,0x9A17,INVALC,
-	0x9B09,INVALC,INVALC,0x9BC5,0x9BDF,INVALC,0x9BE3,INVALC,
-	0x9BE9,0x9BEE,INVALC,INVALC,0x9D66,0x9D7A,
-	/* Range 0x5C22 - 0x5C43, array index: 0x12FA */
-	0x9D6E,0x9D91,0x9D83,0x9D76,0x9D7E,0x9D6D,INVALC,0x9E95,
-	0x9EE3,INVALC,INVALC,0x9F03,0x9F04,INVALC,0x9F17,INVALC,
-	0x5136,INVALC,0x5336,INVALC,0x5B42,INVALC,INVALC,0x5B44,
-	0x5B46,0x5B7E,0x5DCA,0x5DC8,0x5DCC,0x5EF0,INVALC,0x6585,
-	0x66E5,0x66E7,
-	/* Range 0x5C53 - 0x5C66, array index: 0x131C */
-	0x7216,INVALC,0x7212,0x720F,0x7217,0x7211,0x720B,INVALC,
-	INVALC,0x74CD,0x74D0,0x74CC,0x74CE,0x74D1,INVALC,0x7589,
-	INVALC,0x7A6F,0x7C4B,0x7C44,
-	/* Range 0x5C6C - 0x5C7E, array index: 0x1330 */
-	0x7E7F,0x8B71,INVALC,0x802F,0x807A,0x807B,0x807C,INVALC,
-	INVALC,INVALC,0x85FC,0x8610,0x8602,INVALC,INVALC,0x85EE,
-	0x8603,INVALC,0x860D,
-	/* Range 0x5D21 - 0x5D49, array index: 0x1343 */
-	0x8613,0x8608,0x860F,0x8818,0x8812,INVALC,INVALC,0x8967,
-	0x8965,0x89BB,0x8B69,0x8B62,INVALC,0x8B6E,INVALC,0x8B61,
-	INVALC,0x8B64,0x8B4D,0x8C51,INVALC,INVALC,0x8E83,0x8EC6,
-	INVALC,0x941F,INVALC,0x9404,0x9417,0x9408,0x9405,INVALC,
-	0x93F3,0x941E,0x9402,0x941A,0x941B,0x9427,0x941C,INVALC,
-	0x96B5,
-	/* Range 0x5D4C - 0x5D53, array index: 0x136C */
-	0x9733,INVALC,0x9734,0x9731,0x97B8,0x97BA,INVALC,0x97FC,
-	/* Range 0x5D5E - 0x5D7A, array index: 0x1374 */
-	0x9AC9,INVALC,0x9AC8,0x9AC4,0x9B2A,0x9B38,0x9B50,INVALC,
-	0x9C0A,0x9BFB,0x9C04,0x9BFC,0x9BFE,INVALC,INVALC,INVALC,
-	0x9C02,0x9BF6,0x9C1B,0x9BF9,0x9C15,0x9C10,0x9BFF,0x9C00,
-	0x9C0C,INVALC,INVALC,0x9D95,0x9DA5,
-	/* Range 0x5E21 - 0x5E2A, array index: 0x1391 */
-	0x9E98,0x9EC1,INVALC,0x9F5A,0x5164,0x56BB,INVALC,0x58E6,
-	0x5B49,0x5BF7,
-	/* Range 0x5E31 - 0x5E6A, array index: 0x139B */
-	0x6511,INVALC,0x6AFF,0x6AFE,0x6AFD,INVALC,0x6B01,INVALC,
-	INVALC,0x704B,0x704D,0x7047,0x74D3,0x7668,0x7667,INVALC,
-	INVALC,0x77D1,0x7930,0x7932,0x792E,INVALC,0x9F9D,0x7AC9,
-	0x7AC8,INVALC,0x7C56,0x7C51,INVALC,INVALC,INVALC,0x7E85,
-	0x7E89,0x7E8E,0x7E84,INVALC,0x826A,0x862B,0x862F,0x8628,
-	INVALC,0x8616,0x8615,0x861D,0x881A,INVALC,INVALC,INVALC,
-	0x89BC,0x8B75,0x8B7C,INVALC,0x8D11,0x8D12,0x8F5C,0x91BB,
-	INVALC,0x93F4,
-	/* Range 0x5E70 - 0x5E7E, array index: 0x13D5 */
-	0x96E4,0x9737,0x9736,0x9767,0x97BE,0x97BD,0x97E2,0x9868,
-	0x9866,0x98C8,0x98CA,0x98C7,0x98DC,INVALC,0x994F,
-	/* Range 0x5F21 - 0x5F2C, array index: 0x13E4 */
-	0x99A9,0x9A3C,INVALC,0x9A3B,0x9ACE,INVALC,0x9B14,0x9B53,
-	INVALC,0x9C2E,INVALC,0x9C1F,
-	/* Range 0x5F31 - 0x5F37, array index: 0x13F0 */
-	0x9DB0,0x9DBD,INVALC,INVALC,0x9DAE,0x9DC4,0x9E7B,
-	/* Range 0x5F3C - 0x5F5B, array index: 0x13F7 */
-	0x9F05,INVALC,0x9F69,0x9FA1,0x56C7,0x571D,0x5B4A,0x5DD3,
-	INVALC,0x5F72,0x6202,INVALC,0x6235,0x6527,0x651E,0x651F,
-	INVALC,INVALC,0x6B07,0x6B06,INVALC,INVALC,0x7054,0x721C,
-	0x7220,0x7AF8,INVALC,0x7C5D,0x7C58,INVALC,0x7E92,0x7F4E,
-	/* Range 0x5F69 - 0x5F73, array index: 0x1417 */
-	0x9442,0x944D,0x9454,0x944E,INVALC,0x9443,INVALC,INVALC,
-	0x973C,0x9740,0x97C0,
-	/* Range 0x6039 - 0x6040, array index: 0x1422 */
-	0x7221,INVALC,0x766F,0x7937,0x79B5,0x7C62,0x7C5E,0x7CF5,
-	/* Range 0x6043 - 0x604B, array index: 0x142A */
-	0x863D,INVALC,0x882D,0x8989,0x8B8D,0x8B87,0x8B90,0x8D1A,
-	0x8E99,
-	/* Range 0x6052 - 0x6068, array index: 0x1433 */
-	0x9456,0x9461,0x945B,0x945A,0x945C,0x9465,INVALC,0x9741,
-	INVALC,INVALC,0x986E,0x986C,0x986D,INVALC,0x99AA,0x9A5C,
-	0x9A58,0x9ADE,INVALC,0x9C4F,0x9C51,INVALC,0x9C53,
-	/* Range 0x6073 - 0x6077, array index: 0x144A */
-	0x5B4F,0x6B14,INVALC,0x7A72,0x7A73,
-	/* Range 0x6125 - 0x6135, array index: 0x144F */
-	0x96E6,0x9745,INVALC,0x97C8,0x97E4,0x995D,INVALC,0x9B21,
-	INVALC,0x9B2C,0x9B57,INVALC,INVALC,0x9C5D,0x9C61,0x9C65,
-	0x9E08,
-	/* Range 0x613E - 0x6150, array index: 0x1460 */
-	0x6205,0x66EF,0x6B1B,0x6B1D,0x7225,0x7224,0x7C6D,INVALC,
-	0x8642,0x8649,INVALC,0x8978,0x898A,0x8B97,INVALC,0x8C9B,
-	0x8D1C,INVALC,0x8EA2,
-	/* Range 0x615D - 0x6165, array index: 0x1473 */
-	0x9E0E,INVALC,0x9F08,0x9F1D,0x9FA3,INVALC,INVALC,0x5F60,
-	0x6B1C,
-	/* Range 0x6169 - 0x617E, array index: 0x147C */
-	0x7CF3,INVALC,0x8B9B,0x8EA7,0x91C4,INVALC,0x947A,INVALC,
-	INVALC,0x9A61,0x9A63,0x9AD7,0x9C76,INVALC,0x9FA5,INVALC,
-	0x7067,INVALC,0x72AB,0x864A,0x897D,0x8B9D,
-	/* Range 0x6221 - 0x6229, array index: 0x1492 */
-	0x8C53,0x8F65,0x947B,INVALC,0x98CD,0x98DD,INVALC,0x9B30,
-	0x9E16,
-	/* Range 0x622F - 0x623B, array index: 0x149B */
-	0x96E7,0x9E18,0x9EA2,INVALC,0x9F7C,INVALC,0x7E9E,0x9484,
-	INVALC,0x9E1C,INVALC,0x7C71,0x97CA,
-	/* Range 0x625C - 0x6272, array index: 0x14A8 */
-	0x5B66,INVALC,0x65F9,0x6788,0x6CE6,0x6CCB,INVALC,0x4FBD,
-	0x5F8D,INVALC,0x6018,0x6048,INVALC,0x6B29,0x70A6,INVALC,
-	0x7706,INVALC,INVALC,INVALC,0x5A10,0x5CFC,0x5CFE,
-	/* Range 0x642F - 0x6433, array index: 0x14BF */
-	0x9C27,INVALC,0x9458,0x77D6,0x9B2D,
-	/* Range 0x6448 - 0x647E, array index: 0x14C4 */
-	0x4F66,0x4F68,0x4FE7,0x503F,INVALC,0x50A6,0x510F,0x523E,
-	0x5324,0x5365,0x539B,0x517F,0x54CB,0x5573,0x5571,0x556B,
-	0x55F4,0x5622,0x5620,0x5692,0x56BA,0x5691,0x56B0,0x5759,
-	0x578A,0x580F,0x5812,0x5813,0x5847,0x589B,0x5900,0x594D,
-	0x5AD1,0x5AD3,0x5B67,0x5C57,0x5C77,0x5CD5,0x5D75,0x5D8E,
-	0x5DA5,0x5DB6,0x5DBF,0x5E65,0x5ECD,0x5EED,0x5F94,0x5F9A,
-	0x5FBA,0x6125,0x6150,0x62A3,0x6360,0x6364,0x63B6,
-	/* Range 0x6521 - 0x657E, array index: 0x14FB */
-	0x6403,0x64B6,0x651A,0x7A25,0x5C21,0x66E2,0x6702,0x67A4,
-	0x67AC,0x6810,0x6806,0x685E,0x685A,0x692C,0x6929,0x6A2D,
-	0x6A77,0x6A7A,0x6ACA,0x6AE6,0x6AF5,0x6B0D,0x6B0E,0x6BDC,
-	0x6BDD,0x6BF6,0x6C1E,0x6C63,0x6DA5,0x6E0F,0x6E8A,0x6E84,
-	0x6E8B,0x6E7C,0x6F4C,0x6F48,0x6F49,0x6F9D,0x6F99,0x6FF8,
-	0x702E,0x702D,0x705C,0x79CC,0x70BF,0x70EA,0x70E5,0x7111,
-	0x7112,0x713F,0x7139,0x713B,0x713D,0x7177,0x7175,0x7176,
-	0x7171,0x7196,0x7193,0x71B4,0x71DD,0x71DE,0x720E,0x5911,
-	0x7218,0x7347,0x7348,0x73EF,0x7412,0x743B,0x74A4,0x748D,
-	0x74B4,0x7673,0x7677,0x76BC,0x7819,0x781B,0x783D,0x7853,
-	0x7854,0x7858,0x78B7,0x78D8,0x78EE,0x7922,0x794D,0x7986,
-	0x7999,0x79A3,0x79BC,0x7AA7,0x7B37,0x7B59,
-	/* Range 0x6621 - 0x667C, array index: 0x1559 */
-	0x7BD0,0x7C2F,0x7C32,0x7C42,0x7C4E,0x7C68,0x7CA9,0x7CED,
-	0x7DD0,0x7E07,0x7DD3,0x7E64,0x7F40,INVALC,0x8041,0x8063,
-	0x80BB,0x6711,0x6725,0x8248,0x8310,0x8362,0x8312,0x8421,
-	0x841E,0x84E2,0x84DE,0x84E1,0x8573,0x85D4,0x85F5,0x8637,
-	0x8645,0x8672,0x874A,0x87A9,0x87A5,0x87F5,0x8834,0x8850,
-	0x8887,0x8954,0x8984,0x8B03,0x8C52,0x8CD8,0x8D0C,0x8D18,
-	0x8DB0,0x8EBC,0x8ED5,0x8FAA,0x909C,INVALC,0x915C,0x922B,
-	0x9221,0x9273,0x92F4,0x92F5,0x933F,0x9342,0x9386,0x93BE,
-	0x93BC,0x93BD,0x93F1,0x93F2,0x93EF,0x9422,0x9423,0x9424,
-	0x9467,0x9466,0x9597,0x95CE,0x95E7,0x973B,0x974D,0x98E4,
-	0x9942,0x9B1D,0x9B98,INVALC,0x9D49,0x6449,0x5E71,0x5E85,
-	0x61D3,0x990E,0x8002,0x781E,
-	/* Range 0x6721 - 0x672A, array index: 0x15B5 */
-	0x5528,0x5572,0x55BA,0x55F0,0x55EE,0x56B8,0x56B9,0x56C4,
-	0x8053,0x92B0,
-	/* Unranged codes (222 codes) */
-	/* Array index: 0x15BF */ 0x2170,0x4EE7,
-	/* Array index: 0x15BF */ 0x2172,0x4EE6,
-	/* Array index: 0x15BF */ 0x234B,0x597A,
-	/* Array index: 0x15BF */ 0x234D,0x5986,
-	/* Array index: 0x15BF */ 0x235A,0x5C80,
-	/* Array index: 0x15BF */ 0x235C,0x5E08,
-	/* Array index: 0x15BF */ 0x2361,0x5EF5,
-	/* Array index: 0x15BF */ 0x2362,0x5F0E,
-	/* Array index: 0x15BF */ 0x2366,0x5FD3,
-	/* Array index: 0x15BF */ 0x2367,0x5FDA,
-	/* Array index: 0x15BF */ 0x2421,0x6C3C,
-	/* Array index: 0x15BF */ 0x2433,0x793C,
-	/* Array index: 0x15BF */ 0x2435,0x808D,
-	/* Array index: 0x15BF */ 0x2436,0x808E,
-	/* Array index: 0x15BF */ 0x246D,0x544D,
-	/* Array index: 0x15BF */ 0x2470,0x543A,
-	/* Array index: 0x15BF */ 0x253C,0x5746,
-	/* Array index: 0x15BF */ 0x2551,0x599F,
-	/* Array index: 0x15BF */ 0x2553,0x599B,
-	/* Array index: 0x15BF */ 0x2555,0x5989,
-	/* Array index: 0x15BF */ 0x2556,0x599A,
-	/* Array index: 0x15BF */ 0x2558,0x6588,
-	/* Array index: 0x15BF */ 0x263D,0x65F6,
-	/* Array index: 0x15BF */ 0x266E,0x7398,
-	/* Array index: 0x15BF */ 0x2755,0x5190,
-	/* Array index: 0x15BF */ 0x2833,0x59AD,
-	/* Array index: 0x15BF */ 0x2835,0x59C4,
-	/* Array index: 0x15BF */ 0x2837,0x59C2,
-	/* Array index: 0x15BF */ 0x2838,0x59B0,
-	/* Array index: 0x15BF */ 0x2845,0x59B7,
-	/* Array index: 0x15BF */ 0x2846,0x59D7,
-	/* Array index: 0x15BF */ 0x287E,0x5FE9,
-	/* Array index: 0x15BF */ 0x2921,0x603D,
-	/* Array index: 0x15BF */ 0x2922,0x6008,
-	/* Array index: 0x15BF */ 0x295D,0x6C1C,
-	/* Array index: 0x15BF */ 0x297C,0x7240,
-	/* Array index: 0x15BF */ 0x2A42,0x79C7,
-	/* Array index: 0x15BF */ 0x2A44,0x79CA,
-	/* Array index: 0x15BF */ 0x2A52,0x80B0,
-	/* Array index: 0x15BF */ 0x2A66,0x82AA,
-	/* Array index: 0x15BF */ 0x2A68,0x82C9,
-	/* Array index: 0x15BF */ 0x2A6B,0x82A6,
-	/* Array index: 0x15BF */ 0x2A6C,0x82B2,
-	/* Array index: 0x15BF */ 0x2B43,0x524F,
-	/* Array index: 0x15BF */ 0x2B61,0x54CD,
-	/* Array index: 0x15BF */ 0x2B77,0x58F5,
-	/* Array index: 0x15BF */ 0x2B79,0x5909,
-	/* Array index: 0x15BF */ 0x2B7A,0x5908,
-	/* Array index: 0x15BF */ 0x2B7C,0x5952,
-	/* Array index: 0x15BF */ 0x2C32,0x5BAB,
-	/* Array index: 0x15BF */ 0x2C34,0x5C1B,
-	/* Array index: 0x15BF */ 0x2C35,0x5C2F,
-	/* Array index: 0x15BF */ 0x2C37,0x663C,
-	/* Array index: 0x15BF */ 0x2C50,0x5F66,
-	/* Array index: 0x15BF */ 0x2C54,0x605C,
-	/* Array index: 0x15BF */ 0x2D42,0x6BE1,
-	/* Array index: 0x15BF */ 0x2E2F,0x75A8,
-	/* Array index: 0x15BF */ 0x2E72,0x82E9,
-	/* Array index: 0x15BF */ 0x2F7E,0x5518,
-	/* Array index: 0x15BF */ 0x3021,0x54F0,
-	/* Array index: 0x15BF */ 0x3022,0x54F6,
-	/* Array index: 0x15BF */ 0x3025,0x5519,
-	/* Array index: 0x15BF */ 0x3045,0x5A22,
-	/* Array index: 0x15BF */ 0x3048,0x5A24,
-	/* Array index: 0x15BF */ 0x3052,0x5A26,
-	/* Array index: 0x15BF */ 0x307E,0x6056,
-	/* Array index: 0x15BF */ 0x3236,0x727A,
-	/* Array index: 0x15BF */ 0x3255,0x75B4,
-	/* Array index: 0x15BF */ 0x3257,0x75B1,
-	/* Array index: 0x15BF */ 0x3337,0x7D24,
-	/* Array index: 0x15BF */ 0x3352,0x80F7,
-	/* Array index: 0x15BF */ 0x335F,0x8321,
-	/* Array index: 0x15BF */ 0x3362,0x8318,
-	/* Array index: 0x15BF */ 0x3363,0x8358,
-	/* Array index: 0x15BF */ 0x3439,0x96BD,
-	/* Array index: 0x15BF */ 0x3522,0x5A2B,
-	/* Array index: 0x15BF */ 0x3524,0x5A3B,
-	/* Array index: 0x15BF */ 0x353F,0x5BC8,
-	/* Array index: 0x15BF */ 0x3541,0x5BC3,
-	/* Array index: 0x15BF */ 0x3568,0x6098,
-	/* Array index: 0x15BF */ 0x356A,0x60D0,
-	/* Array index: 0x15BF */ 0x3579,0x60DE,
-	/* Array index: 0x15BF */ 0x357C,0x637E,
-	/* Array index: 0x15BF */ 0x357D,0x638B,
-	/* Array index: 0x15BF */ 0x3740,0x73FB,
-	/* Array index: 0x15BF */ 0x374D,0x7690,
-	/* Array index: 0x15BF */ 0x3821,0x7C9A,
-	/* Array index: 0x15BF */ 0x3822,0x7C9C,
-	/* Array index: 0x15BF */ 0x3824,0x7D49,
-	/* Array index: 0x15BF */ 0x3826,0x7D34,
-	/* Array index: 0x15BF */ 0x3827,0x7D37,
-	/* Array index: 0x15BF */ 0x3829,0x7D2D,
-	/* Array index: 0x15BF */ 0x382B,0x7D4C,
-	/* Array index: 0x15BF */ 0x382E,0x7D48,
-	/* Array index: 0x15BF */ 0x3831,0x7F3B,
-	/* Array index: 0x15BF */ 0x3836,0x8008,
-	/* Array index: 0x15BF */ 0x3837,0x801A,
-	/* Array index: 0x15BF */ 0x387E,0x8A1C,
-	/* Array index: 0x15BF */ 0x3922,0x8A2B,
-	/* Array index: 0x15BF */ 0x3923,0x8A20,
-	/* Array index: 0x15BF */ 0x3925,0x8A29,
-	/* Array index: 0x15BF */ 0x3947,0x8ED9,
-	/* Array index: 0x15BF */ 0x395C,0x9587,
-	/* Array index: 0x15BF */ 0x395E,0x965A,
-	/* Array index: 0x15BF */ 0x3961,0x966E,
-	/* Array index: 0x15BF */ 0x3965,0x9679,
-	/* Array index: 0x15BF */ 0x3A21,0x5273,
-	/* Array index: 0x15BF */ 0x3A23,0x5270,
-	/* Array index: 0x15BF */ 0x3A66,0x5A91,
-	/* Array index: 0x15BF */ 0x3A6B,0x5ACF,
-	/* Array index: 0x15BF */ 0x3A72,0x5A87,
-	/* Array index: 0x15BF */ 0x3A73,0x5AA0,
-	/* Array index: 0x15BF */ 0x3B31,0x5D57,
-	/* Array index: 0x15BF */ 0x3B4B,0x5FA7,
-	/* Array index: 0x15BF */ 0x3B79,0x65D1,
-	/* Array index: 0x15BF */ 0x3D4C,0x7694,
-	/* Array index: 0x15BF */ 0x3D4D,0x76B3,
-	/* Array index: 0x15BF */ 0x3D7E,0x7CA7,
-	/* Array index: 0x15BF */ 0x3E6D,0x88BB,
-	/* Array index: 0x15BF */ 0x3E6F,0x88BF,
-	/* Array index: 0x15BF */ 0x3E70,0x88B4,
-	/* Array index: 0x15BF */ 0x3E72,0x88B5,
-	/* Array index: 0x15BF */ 0x3E74,0x899A,
-	/* Array index: 0x15BF */ 0x3E75,0x8A43,
-	/* Array index: 0x15BF */ 0x3E78,0x8A5A,
-	/* Array index: 0x15BF */ 0x3F5D,0x91FE,
-	/* Array index: 0x15BF */ 0x3F5E,0x9220,
-	/* Array index: 0x15BF */ 0x3F60,0x920B,
-	/* Array index: 0x15BF */ 0x3F6C,0x9595,
-	/* Array index: 0x15BF */ 0x3F7B,0x96EE,
-	/* Array index: 0x15BF */ 0x3F7C,0x96ED,
-	/* Array index: 0x15BF */ 0x3F7E,0x96EC,
-	/* Array index: 0x15BF */ 0x4021,0x975F,
-	/* Array index: 0x15BF */ 0x4022,0x976F,
-	/* Array index: 0x15BF */ 0x4024,0x976D,
-	/* Array index: 0x15BF */ 0x402B,0x98F0,
-	/* Array index: 0x15BF */ 0x402F,0x9AA9,
-	/* Array index: 0x15BF */ 0x4032,0x9AE0,
-	/* Array index: 0x15BF */ 0x4033,0x4EB7,
-	/* Array index: 0x15BF */ 0x4064,0x5ACE,
-	/* Array index: 0x15BF */ 0x4066,0x5AC5,
-	/* Array index: 0x15BF */ 0x4067,0x5AC3,
-	/* Array index: 0x15BF */ 0x406A,0x5AD0,
-	/* Array index: 0x15BF */ 0x4142,0x643C,
-	/* Array index: 0x15BF */ 0x4144,0x6446,
-	/* Array index: 0x15BF */ 0x4145,0x6447,
-	/* Array index: 0x15BF */ 0x4148,0x643A,
-	/* Array index: 0x15BF */ 0x4149,0x6407,
-	/* Array index: 0x15BF */ 0x414B,0x656B,
-	/* Array index: 0x15BF */ 0x4156,0x668F,
-	/* Array index: 0x15BF */ 0x4159,0x6692,
-	/* Array index: 0x15BF */ 0x415B,0x668E,
-	/* Array index: 0x15BF */ 0x415D,0x6946,
-	/* Array index: 0x15BF */ 0x4165,0x6931,
-	/* Array index: 0x15BF */ 0x4168,0x693E,
-	/* Array index: 0x15BF */ 0x416A,0x697C,
-	/* Array index: 0x15BF */ 0x416B,0x6943,
-	/* Array index: 0x15BF */ 0x416D,0x6973,
-	/* Array index: 0x15BF */ 0x416F,0x6955,
-	/* Array index: 0x15BF */ 0x4221,0x6B73,
-	/* Array index: 0x15BF */ 0x4222,0x6B9C,
-	/* Array index: 0x15BF */ 0x4236,0x6EA9,
-	/* Array index: 0x15BF */ 0x424C,0x7148,
-	/* Array index: 0x15BF */ 0x4321,0x7698,
-	/* Array index: 0x15BF */ 0x433D,0x7980,
-	/* Array index: 0x15BF */ 0x4341,0x7A0F,
-	/* Array index: 0x15BF */ 0x4344,0x7A1D,
-	/* Array index: 0x15BF */ 0x4358,0x7CAE,
-	/* Array index: 0x15BF */ 0x435C,0x7CB0,
-	/* Array index: 0x15BF */ 0x435E,0x7D90,
-	/* Array index: 0x15BF */ 0x436E,0x7FA3,
-	/* Array index: 0x15BF */ 0x437B,0x815D,
-	/* Array index: 0x15BF */ 0x437C,0x8175,
-	/* Array index: 0x15BF */ 0x437E,0x815F,
-	/* Array index: 0x15BF */ 0x4473,0x8EB1,
-	/* Array index: 0x15BF */ 0x4540,0x968F,
-	/* Array index: 0x15BF */ 0x4542,0x9696,
-	/* Array index: 0x15BF */ 0x4546,0x96F4,
-	/* Array index: 0x15BF */ 0x4547,0x96FC,
-	/* Array index: 0x15BF */ 0x4549,0x9755,
-	/* Array index: 0x15BF */ 0x454B,0x9779,
-	/* Array index: 0x15BF */ 0x454F,0x97EE,
-	/* Array index: 0x15BF */ 0x4550,0x97F5,
-	/* Array index: 0x15BF */ 0x4552,0x980B,
-	/* Array index: 0x15BF */ 0x4554,0x98F3,
-	/* Array index: 0x15BF */ 0x457A,0x51F4,
-	/* Array index: 0x15BF */ 0x457E,0x52ED,
-	/* Array index: 0x15BF */ 0x4621,0x52EA,
-	/* Array index: 0x15BF */ 0x4623,0x5332,
-	/* Array index: 0x15BF */ 0x467E,0x6455,
-	/* Array index: 0x15BF */ 0x4730,0x6571,
-	/* Array index: 0x15BF */ 0x4751,0x6998,
-	/* Array index: 0x15BF */ 0x482E,0x76B9,
-	/* Array index: 0x15BF */ 0x484B,0x7A29,
-	/* Array index: 0x15BF */ 0x484D,0x7A2A,
-	/* Array index: 0x15BF */ 0x484F,0x7A2D,
-	/* Array index: 0x15BF */ 0x4850,0x7A2C,
-	/* Array index: 0x15BF */ 0x4868,0x7DC8,
-	/* Array index: 0x15BF */ 0x4869,0x7DB6,
-	/* Array index: 0x15BF */ 0x486B,0x7DD1,
-	/* Array index: 0x15BF */ 0x496B,0x8A9D,
-	/* Array index: 0x15BF */ 0x496D,0x8C67,
-	/* Array index: 0x15BF */ 0x4A21,0x8FA1,
-	/* Array index: 0x15BF */ 0x4A22,0x8FA2,
-	/* Array index: 0x15BF */ 0x4A24,0x905A,
-	/* Array index: 0x15BF */ 0x4A3D,0x95A2,
-	/* Array index: 0x15BF */ 0x4A3E,0x95A7,
-	/* Array index: 0x15BF */ 0x4A4C,0x9759,
-	/* Array index: 0x15BF */ 0x4A4E,0x9764,
-	/* Array index: 0x15BF */ 0x4A5B,0x9906,
-	/* Array index: 0x15BF */ 0x4A6A,0x99C4,
-	/* Array index: 0x15BF */ 0x4A78,0x9B40,
-	/* Array index: 0x15BF */ 0x4B22,0x9EBD,
-	/* Array index: 0x15BF */ 0x4B27,0x510E,
-	/* Array index: 0x15BF */ 0x4D22,0x71AE,
-	/* Array index: 0x15BF */ 0x4D44,0x778A,
-	/* Array index: 0x15BF */ 0x4D60,0x7BBF,
-	/* Array index: 0x15BF */ 0x4D63,0x7BCD,
-	/* Array index: 0x15BF */ 0x4D65,0x7BB2,
-	/* Array index: 0x15BF */ 0x4E22,0x7DD6,
-	/* Array index: 0x15BF */ 0x4E40,0x8501,
-	/* Array index: 0x15BF */ 0x4E42,0x84F8,
-	/* Array index: 0x15BF */ 0x4E44,0x84F5,
-	/* Array index: 0x15BF */ 0x4E46,0x8504,
-	/* Array index: 0x15BF */ 0x4E52,0x8535,
-	/* Array index: 0x15BF */ 0x4E54,0x8505,
-	/* Array index: 0x15BF */ 0x4E59,0x877D,
-	/* Array index: 0x15BF */ 0x4E7A,0x8C8E,
-	/* Array index: 0x15BF */ 0x4E7D,0x8CE9,
-	/* Array index: 0x15BF */ 0x4E7E,0x8CDB,
-	/* Array index: 0x15BF */ 0x4F5A,0x96A3,
-	/* Array index: 0x15BF */ 0x4F5B,0x96A5,
-	/* Array index: 0x15BF */ 0x5022,0x9D0D,
-	/* Array index: 0x15BF */ 0x5024,0x9D01,
-	/* Array index: 0x15BF */ 0x5025,0x9D0C,
-	/* Array index: 0x15BF */ 0x5027,0x9CF8,
-	/* Array index: 0x15BF */ 0x503B,0x5667,
-	/* Array index: 0x15BF */ 0x503D,0x567B,
-	/* Array index: 0x15BF */ 0x503F,0x565F,
-	/* Array index: 0x15BF */ 0x5040,0x5661,
-	/* Array index: 0x15BF */ 0x514D,0x6FBB,
-	/* Array index: 0x15BF */ 0x5150,0x6FBE,
-	/* Array index: 0x15BF */ 0x5179,0x7798,
-	/* Array index: 0x15BF */ 0x517B,0x7796,
-	/* Array index: 0x15BF */ 0x5221,0x78D6,
-	/* Array index: 0x15BF */ 0x5222,0x78EB,
-	/* Array index: 0x15BF */ 0x5237,0x7CD3,
-	/* Array index: 0x15BF */ 0x5239,0x7CE1,
-	/* Array index: 0x15BF */ 0x523B,0x7E19,
-	/* Array index: 0x15BF */ 0x523F,0x7E27,
-	/* Array index: 0x15BF */ 0x5240,0x7E26,
-	/* Array index: 0x15BF */ 0x5243,0x806E,
-	/* Array index: 0x15BF */ 0x5244,0x81AF,
-	/* Array index: 0x15BF */ 0x5247,0x81AD,
-	/* Array index: 0x15BF */ 0x5249,0x81AA,
-	/* Array index: 0x15BF */ 0x524A,0x8218,
-	/* Array index: 0x15BF */ 0x524F,0x856F,
-	/* Array index: 0x15BF */ 0x5250,0x854C,
-	/* Array index: 0x15BF */ 0x526E,0x8AEC,
-	/* Array index: 0x15BF */ 0x5273,0x8CF2,
-	/* Array index: 0x15BF */ 0x5275,0x8CEF,
-	/* Array index: 0x15BF */ 0x5277,0x8DA6,
-	/* Array index: 0x15BF */ 0x527B,0x8E3B,
-	/* Array index: 0x15BF */ 0x527C,0x8E43,
-	/* Array index: 0x15BF */ 0x527E,0x8E32,
-	/* Array index: 0x15BF */ 0x5348,0x96AB,
-	/* Array index: 0x15BF */ 0x5349,0x96B7,
-	/* Array index: 0x15BF */ 0x534C,0x9715,
-	/* Array index: 0x15BF */ 0x534D,0x9714,
-	/* Array index: 0x15BF */ 0x5350,0x970C,
-	/* Array index: 0x15BF */ 0x5351,0x9717,
-	/* Array index: 0x15BF */ 0x5353,0x9793,
-	/* Array index: 0x15BF */ 0x5355,0x97D2,
-	/* Array index: 0x15BF */ 0x5370,0x99E1,
-	/* Array index: 0x15BF */ 0x5371,0x99E6,
-	/* Array index: 0x15BF */ 0x5421,0x9B8C,
-	/* Array index: 0x15BF */ 0x5423,0x9B89,
-	/* Array index: 0x15BF */ 0x5425,0x9B8E,
-	/* Array index: 0x15BF */ 0x5464,0x64DF,
-	/* Array index: 0x15BF */ 0x5467,0x64E1,
-	/* Array index: 0x15BF */ 0x5521,0x6A86,
-	/* Array index: 0x15BF */ 0x5523,0x6A98,
-	/* Array index: 0x15BF */ 0x5524,0x6A9D,
-	/* Array index: 0x15BF */ 0x5527,0x6A8F,
-	/* Array index: 0x15BF */ 0x5529,0x6AAA,
-	/* Array index: 0x15BF */ 0x552B,0x6B5D,
-	/* Array index: 0x15BF */ 0x553C,0x71E3,
-	/* Array index: 0x15BF */ 0x5549,0x7371,
-	/* Array index: 0x15BF */ 0x554B,0x74AE,
-	/* Array index: 0x15BF */ 0x554D,0x74B3,
-	/* Array index: 0x15BF */ 0x554F,0x74AC,
-	/* Array index: 0x15BF */ 0x5579,0x7E2C,
-	/* Array index: 0x15BF */ 0x557A,0x7E4D,
-	/* Array index: 0x15BF */ 0x557D,0x7F46,
-	/* Array index: 0x15BF */ 0x557E,0x7FF6,
-	/* Array index: 0x15BF */ 0x5630,0x85AC,
-	/* Array index: 0x15BF */ 0x5634,0x87CE,
-	/* Array index: 0x15BF */ 0x5636,0x87CD,
-	/* Array index: 0x15BF */ 0x564D,0x8C40,
-	/* Array index: 0x15BF */ 0x564F,0x8C96,
-	/* Array index: 0x15BF */ 0x567A,0x979B,
-	/* Array index: 0x15BF */ 0x567B,0x979F,
-	/* Array index: 0x15BF */ 0x5726,0x9840,
-	/* Array index: 0x15BF */ 0x5728,0x9847,
-	/* Array index: 0x15BF */ 0x572A,0x98B7,
-	/* Array index: 0x15BF */ 0x5730,0x99A2,
-	/* Array index: 0x15BF */ 0x5733,0x9A00,
-	/* Array index: 0x15BF */ 0x5734,0x99F3,
-	/* Array index: 0x15BF */ 0x5737,0x99F5,
-	/* Array index: 0x15BF */ 0x5748,0x9D39,
-	/* Array index: 0x15BF */ 0x574A,0x9D44,
-	/* Array index: 0x15BF */ 0x574D,0x9D35,
-	/* Array index: 0x15BF */ 0x5750,0x9EAF,
-	/* Array index: 0x15BF */ 0x5752,0x512F,
-	/* Array index: 0x15BF */ 0x5849,0x7AF5,
-	/* Array index: 0x15BF */ 0x584C,0x7C2E,
-	/* Array index: 0x15BF */ 0x584E,0x7C1B,
-	/* Array index: 0x15BF */ 0x5850,0x7C1A,
-	/* Array index: 0x15BF */ 0x5851,0x7C24,
-	/* Array index: 0x15BF */ 0x5861,0x7FFA,
-	/* Array index: 0x15BF */ 0x5862,0x802E,
-	/* Array index: 0x15BF */ 0x5865,0x81CE,
-	/* Array index: 0x15BF */ 0x5868,0x8219,
-	/* Array index: 0x15BF */ 0x5921,0x89B3,
-	/* Array index: 0x15BF */ 0x5923,0x8B38,
-	/* Array index: 0x15BF */ 0x5924,0x8B32,
-	/* Array index: 0x15BF */ 0x5926,0x8B2D,
-	/* Array index: 0x15BF */ 0x5928,0x8B34,
-	/* Array index: 0x15BF */ 0x592A,0x8B29,
-	/* Array index: 0x15BF */ 0x592B,0x8C74,
-	/* Array index: 0x15BF */ 0x592E,0x8D03,
-	/* Array index: 0x15BF */ 0x5956,0x9854,
-	/* Array index: 0x15BF */ 0x5A3F,0x65DC,
-	/* Array index: 0x15BF */ 0x5A6E,0x7C35,
-	/* Array index: 0x15BF */ 0x5A6F,0x7C34,
-	/* Array index: 0x15BF */ 0x5A72,0x7E6C,
-	/* Array index: 0x15BF */ 0x5B22,0x85E7,
-	/* Array index: 0x15BF */ 0x5B2F,0x8987,
-	/* Array index: 0x15BF */ 0x5B53,0x95DD,
-	/* Array index: 0x15BF */ 0x5B65,0x9856,
-	/* Array index: 0x15BF */ 0x5C47,0x6AF4,
-	/* Array index: 0x15BF */ 0x5C49,0x6AE9,
-	/* Array index: 0x15BF */ 0x5C4F,0x703D,
-	/* Array index: 0x15BF */ 0x5C51,0x7036,
-	/* Array index: 0x15BF */ 0x5D56,0x98C3,
-	/* Array index: 0x15BF */ 0x5D58,0x994D,
-	/* Array index: 0x15BF */ 0x5D5A,0x9A2F,
-	/* Array index: 0x15BF */ 0x5E2D,0x5DD0,
-	/* Array index: 0x15BF */ 0x5E2F,0x5FC2,
-	/* Array index: 0x15BF */ 0x5E6D,0x942D,
-	/* Array index: 0x15BF */ 0x5F3A,0x9E9E,
-	/* Array index: 0x15BF */ 0x5F5F,0x8827,
-	/* Array index: 0x15BF */ 0x5F61,0x8B81,
-	/* Array index: 0x15BF */ 0x5F62,0x8B83,
-	/* Array index: 0x15BF */ 0x5F64,0x8C44,
-	/* Array index: 0x15BF */ 0x5F78,0x995A,
-	/* Array index: 0x15BF */ 0x5F79,0x9A51,
-	/* Array index: 0x15BF */ 0x5F7B,0x9ADD,
-	/* Array index: 0x15BF */ 0x5F7E,0x9C38,
-	/* Array index: 0x15BF */ 0x6022,0x9C45,
-	/* Array index: 0x15BF */ 0x6023,0x9C3A,
-	/* Array index: 0x15BF */ 0x6025,0x9C35,
-	/* Array index: 0x15BF */ 0x6029,0x9EF1,
-	/* Array index: 0x15BF */ 0x602B,0x9F93,
-	/* Array index: 0x15BF */ 0x602C,0x529A,
-	/* Array index: 0x15BF */ 0x602F,0x8641,
-	/* Array index: 0x15BF */ 0x6030,0x5DD7,
-	/* Array index: 0x15BF */ 0x6032,0x6528,
-	/* Array index: 0x15BF */ 0x6036,0x7053,
-	/* Array index: 0x15BF */ 0x6037,0x7059,
-	/* Array index: 0x15BF */ 0x604F,0x945F,
-	/* Array index: 0x15BF */ 0x606C,0x9DFC,
-	/* Array index: 0x15BF */ 0x606D,0x9F39,
-	/* Array index: 0x15BF */ 0x606F,0x513E,
-	/* Array index: 0x15BF */ 0x6071,0x56D2,
-	/* Array index: 0x15BF */ 0x607B,0x8B91,
-	/* Array index: 0x15BF */ 0x607E,0x91BF,
-	/* Array index: 0x15BF */ 0x6122,0x946C,
-	/* Array index: 0x15BF */ 0x613B,0x9F45,
-	/* Array index: 0x15BF */ 0x6159,0x9C6C,
-	/* Array index: 0x15BF */ 0x615B,0x9C6F,
-	/* Array index: 0x15BF */ 0x623F,0x9EA3,
-	/* Array index: 0x15BF */ 0x6241,0x9C7B,
-	/* Array index: 0x15BF */ 0x6242,0x9F97,
-	/* Array index: 0x15BF */ 0x6245,0x9750,
-	/* Array index: 0x15BF */ 0x6249,0x5727,
-	/* Array index: 0x15BF */ 0x624A,0x5C13,
-	/* Array index: 0x15BF */ 0x6251,0x5FC8,
-	/* Array index: 0x15BF */ 0x6257,0x6765,
-	/* Array index: 0x15BF */ 0x625A,0x52BD,
-	/* Array index: 0x15BF */ 0x6279,0x70C9,
-	/* Array index: 0x15BF */ 0x6323,0x9579,
-	/* Array index: 0x15BF */ 0x6325,0x96BA,
-	/* Array index: 0x15BF */ 0x632D,0x7B29,
-	/* Array index: 0x15BF */ 0x632E,0x8128,
-	/* Array index: 0x15BF */ 0x6330,0x8A2E,
-	/* Array index: 0x15BF */ 0x6334,0x9AD9,
-	/* Array index: 0x15BF */ 0x6336,0x582B,
-	/* Array index: 0x15BF */ 0x6337,0x5845,
-	/* Array index: 0x15BF */ 0x6339,0x63FA,
-	/* Array index: 0x15BF */ 0x633D,0x6E86,
-	/* Array index: 0x15BF */ 0x6343,0x5867,
-	/* Array index: 0x15BF */ 0x6345,0x5BDD,
-	/* Array index: 0x15BF */ 0x6346,0x656E,
-	/* Array index: 0x15BF */ 0x634A,0x8C87,
-	/* Array index: 0x15BF */ 0x634C,0x50D2,
-	/* Array index: 0x15BF */ 0x634D,0x50DF,
-	/* Array index: 0x15BF */ 0x6352,0x69BA,
-	/* Array index: 0x15BF */ 0x6354,0x6B9D,
-	/* Array index: 0x15BF */ 0x6356,0x8059,
-	/* Array index: 0x15BF */ 0x6363,0x6F8A,
-	/* Array index: 0x15BF */ 0x6366,0x7BC3,
-	/* Array index: 0x15BF */ 0x6367,0x7BC2,
-	/* Array index: 0x15BF */ 0x636C,0x90F6,
-	/* Array index: 0x15BF */ 0x636E,0x9823,
-	/* Array index: 0x15BF */ 0x6374,0x71CD,
-	/* Array index: 0x15BF */ 0x6375,0x7499,
-	/* Array index: 0x15BF */ 0x637B,0x9842,
-	/* Array index: 0x15BF */ 0x6422,0x7F84,
-	/* Array index: 0x15BF */ 0x6428,0x8D0E,
-	/* Array index: 0x15BF */ 0x642A,0x9861,
-	/* Array index: 0x15BF */ 0x642D,0x8B73,
-};
-
-#endif /* ICONV_TO_UCS_CCS_CNS11643_PLANE14 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> cns11643_plane14 speed-optimized table (42496 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_speed_cns11643_plane14[] =
-{
-	/* Heading Block */
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,0x0100,0x0200,
-	0x0300,0x0400,0x0500,0x0600,0x0700,0x0800,0x0900,0x0A00,
-	0x0B00,0x0C00,0x0D00,0x0E00,0x0F00,0x1000,0x1100,0x1200,
-	0x1300,0x1400,0x1500,0x1600,0x1700,0x1800,0x1900,0x1A00,
-	0x1B00,0x1C00,0x1D00,0x1E00,0x1F00,0x2000,0x2100,0x2200,
-	0x2300,0x2400,0x2500,0x2600,0x2700,0x2800,0x2900,0x2A00,
-	0x2B00,0x2C00,0x2D00,0x2E00,0x2F00,0x3000,0x3100,0x3200,
-	0x3300,0x3400,0x3500,0x3600,0x3700,0x3800,0x3900,0x3A00,
-	0x3B00,0x3C00,0x3D00,0x3E00,0x3F00,0x4000,0x4100,0x4200,
-	0x4300,0x4400,0x4500,0x4600,0x4700,0x4800,0x4900,0x4A00,
-	0x4B00,0x4C00,0x4D00,0x4E00,0x4F00,0x5000,0x5100,0x5200,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	/* Block 79, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,0x2126,0x2125,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2262,0x2261,0x2263,INVALC,0x243F,INVALC,INVALC,INVALC,
-	0x2121,INVALC,0x212C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2122,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2740,INVALC,0x2123,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2130,INVALC,
-	INVALC,0x212E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2345,INVALC,INVALC,0x2B22,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2146,0x2145,INVALC,INVALC,INVALC,INVALC,
-	0x2264,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2440,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2B23,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x396C,0x396E,INVALC,INVALC,INVALC,0x2124,INVALC,0x212D,
-	INVALC,0x2265,INVALC,INVALC,INVALC,INVALC,INVALC,0x2131,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x216C,
-	0x2266,INVALC,INVALC,INVALC,0x2442,0x2742,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2147,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2B26,
-	0x2B25,0x2B27,0x2B24,INVALC,INVALC,INVALC,INVALC,0x4033,
-	INVALC,INVALC,INVALC,INVALC,0x2132,INVALC,0x2133,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2149,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x214C,INVALC,0x214B,0x214A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x216D,INVALC,INVALC,INVALC,INVALC,INVALC,0x2172,0x2170,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x226F,0x2268,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x226B,0x2267,0x2276,INVALC,0x226E,INVALC,INVALC,INVALC,
-	/* Block 80, Array index 0x0200 */
-	INVALC,INVALC,INVALC,0x226D,INVALC,INVALC,0x226C,0x2274,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2270,0x2277,
-	INVALC,INVALC,0x2275,INVALC,0x2273,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2272,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2450,0x2448,INVALC,INVALC,0x244F,INVALC,0x2446,
-	INVALC,0x2445,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x244E,INVALC,0x2449,INVALC,0x244B,0x2443,INVALC,INVALC,
-	INVALC,INVALC,0x2444,0x244C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6448,INVALC,
-	0x6449,INVALC,INVALC,INVALC,INVALC,0x2747,INVALC,INVALC,
-	INVALC,INVALC,0x274F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2744,INVALC,0x2751,INVALC,0x2748,INVALC,
-	INVALC,INVALC,INVALC,0x2743,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x274C,
-	0x2749,0x274B,0x274A,0x274D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2B2D,0x2B2E,INVALC,INVALC,0x2B36,INVALC,INVALC,INVALC,
-	0x2B2C,INVALC,INVALC,INVALC,INVALC,0x6263,0x2B2B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2B32,INVALC,
-	0x2B2F,INVALC,INVALC,INVALC,0x2B33,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2B28,INVALC,INVALC,0x2B29,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2B35,INVALC,0x2B34,INVALC,0x644A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2F48,INVALC,0x2F4D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2F44,INVALC,0x2F58,0x2F4C,0x2F56,INVALC,0x2F46,
-	/* Block 81, Array index 0x0300 */
-	INVALC,INVALC,0x2F4B,0x2F49,0x2F47,INVALC,INVALC,INVALC,
-	0x2F4F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2F53,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2F45,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2F4E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2F51,INVALC,
-	INVALC,INVALC,0x2F43,INVALC,INVALC,INVALC,0x2F50,INVALC,
-	0x2F54,0x2F55,INVALC,INVALC,INVALC,INVALC,INVALC,0x644B,
-	INVALC,INVALC,0x343C,INVALC,0x343F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3444,INVALC,0x3441,INVALC,0x3442,INVALC,0x2F57,INVALC,
-	0x3447,0x343D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3440,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x344B,INVALC,INVALC,INVALC,
-	INVALC,0x3443,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x344C,0x344A,INVALC,0x3445,0x3446,INVALC,INVALC,INVALC,
-	INVALC,0x3975,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3971,0x3972,INVALC,INVALC,INVALC,INVALC,INVALC,0x396F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3970,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x644D,INVALC,
-	INVALC,INVALC,0x4039,0x403C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x403A,INVALC,INVALC,0x4037,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x403D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4036,0x403E,INVALC,INVALC,
-	0x456B,INVALC,0x634C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x456E,0x456C,INVALC,INVALC,0x456D,INVALC,0x4576,0x634D,
-	INVALC,0x4570,0x4575,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4571,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4574,INVALC,INVALC,0x4B29,
-	INVALC,INVALC,INVALC,INVALC,0x4B2B,INVALC,INVALC,INVALC,
-	/* Block 82, Array index 0x0400 */
-	INVALC,0x4B2D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B2C,0x4B27,0x644E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5031,INVALC,
-	INVALC,INVALC,INVALC,0x5035,INVALC,0x5030,0x5034,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5441,
-	0x5440,INVALC,INVALC,0x5033,INVALC,INVALC,INVALC,0x5752,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C32,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x606F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2278,INVALC,INVALC,INVALC,0x2454,INVALC,
-	0x2453,0x2451,INVALC,INVALC,INVALC,INVALC,0x2752,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3976,INVALC,INVALC,INVALC,0x5E25,INVALC,0x2134,INVALC,
-	INVALC,INVALC,0x2B37,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x227A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2E7B,INVALC,INVALC,INVALC,INVALC,0x403F,0x6453,
-	INVALC,INVALC,0x2127,INVALC,0x214D,0x2148,0x214E,INVALC,
-	INVALC,INVALC,INVALC,0x2178,0x2179,INVALC,INVALC,INVALC,
-	0x2755,INVALC,INVALC,INVALC,INVALC,INVALC,0x2128,INVALC,
-	INVALC,0x217A,INVALC,INVALC,INVALC,0x2457,INVALC,0x2B39,
-	INVALC,0x2F5B,INVALC,0x2F59,INVALC,INVALC,0x2F5A,INVALC,
-	0x344D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x227E,0x227D,0x227C,0x2459,INVALC,INVALC,
-	0x245A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2B3B,0x2B3D,0x2B3E,INVALC,INVALC,INVALC,0x2F5E,
-	INVALC,0x2F5F,INVALC,INVALC,INVALC,INVALC,INVALC,0x344F,
-	INVALC,0x344E,0x397D,0x397A,INVALC,INVALC,0x397E,INVALC,
-	INVALC,0x4B2F,0x4B2E,0x4B30,INVALC,INVALC,INVALC,0x5442,
-	INVALC,INVALC,0x212F,0x2135,0x2151,0x217B,INVALC,INVALC,
-	0x2322,INVALC,INVALC,INVALC,0x245B,0x2759,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x457A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x275A,INVALC,
-	/* Block 83, Array index 0x0500 */
-	INVALC,INVALC,INVALC,INVALC,0x2136,0x2152,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x217D,INVALC,INVALC,INVALC,0x2325,
-	INVALC,INVALC,INVALC,INVALC,0x2324,0x2326,INVALC,INVALC,
-	0x2327,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x245F,
-	0x2461,INVALC,INVALC,0x245C,INVALC,INVALC,0x245E,0x245D,
-	INVALC,INVALC,INVALC,0x2460,INVALC,INVALC,INVALC,0x275B,
-	INVALC,INVALC,INVALC,INVALC,0x275E,INVALC,INVALC,INVALC,
-	INVALC,0x275F,INVALC,INVALC,0x275D,INVALC,0x644F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2B3F,INVALC,INVALC,
-	0x2B40,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2B43,
-	INVALC,INVALC,INVALC,0x2F68,INVALC,INVALC,INVALC,0x2F65,
-	INVALC,0x2F62,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2F60,INVALC,INVALC,0x2F66,0x2F61,0x2F63,INVALC,0x2F64,
-	0x3450,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A23,INVALC,INVALC,0x3A21,INVALC,INVALC,0x3451,INVALC,
-	INVALC,0x4041,INVALC,INVALC,INVALC,INVALC,0x4040,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B31,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B32,INVALC,
-	0x5036,INVALC,INVALC,INVALC,0x5037,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x602C,INVALC,0x2137,0x2154,0x2153,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2328,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2463,0x2462,0x2761,INVALC,INVALC,
-	INVALC,0x2760,INVALC,INVALC,INVALC,0x625A,INVALC,0x2762,
-	INVALC,INVALC,INVALC,INVALC,0x2B48,0x2B46,INVALC,INVALC,
-	INVALC,INVALC,0x2B47,INVALC,0x2F6F,INVALC,0x2F6C,0x2F6A,
-	0x2F6D,0x2F6E,INVALC,INVALC,0x3452,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4045,0x4044,INVALC,INVALC,INVALC,INVALC,INVALC,0x4046,
-	INVALC,INVALC,0x4621,INVALC,INVALC,0x457E,0x4B33,INVALC,
-	INVALC,INVALC,0x4D2C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2155,INVALC,INVALC,
-	/* Block 84, Array index 0x0600 */
-	0x2156,INVALC,INVALC,0x2223,0x2222,INVALC,INVALC,0x2224,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5038,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2226,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6450,0x2465,INVALC,0x2B49,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4623,0x4B34,INVALC,0x5444,0x5C34,INVALC,
-	0x2129,INVALC,0x2157,0x2466,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2159,INVALC,
-	INVALC,INVALC,INVALC,0x232A,INVALC,INVALC,INVALC,0x232B,
-	0x232D,INVALC,INVALC,INVALC,INVALC,0x2763,INVALC,INVALC,
-	0x2B4A,INVALC,INVALC,INVALC,INVALC,0x215A,INVALC,0x2227,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6451,INVALC,0x2A5C,
-	INVALC,0x212A,INVALC,INVALC,INVALC,0x2228,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2467,INVALC,0x2765,INVALC,
-	INVALC,INVALC,0x2766,INVALC,INVALC,0x2B4B,INVALC,INVALC,
-	0x4047,INVALC,INVALC,INVALC,INVALC,INVALC,0x215B,INVALC,
-	INVALC,0x2229,INVALC,0x232F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2767,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6452,INVALC,INVALC,INVALC,INVALC,
-	0x3454,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A28,INVALC,
-	0x3A27,0x404A,0x4049,0x4048,INVALC,INVALC,0x4625,INVALC,
-	0x4626,0x4B35,INVALC,0x5445,INVALC,INVALC,0x212B,0x215C,
-	INVALC,INVALC,0x222A,INVALC,INVALC,INVALC,0x2331,INVALC,
-	INVALC,0x2769,0x276A,INVALC,0x3455,0x3A29,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x215E,INVALC,0x2160,INVALC,
-	0x222B,INVALC,0x2333,INVALC,INVALC,0x276B,INVALC,INVALC,
-	INVALC,0x2B50,0x2B4F,INVALC,0x2B4E,0x2B4D,INVALC,INVALC,
-	0x404B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2231,INVALC,0x222D,0x222E,
-	INVALC,0x222F,INVALC,INVALC,INVALC,INVALC,INVALC,0x2335,
-	/* Block 85, Array index 0x0700 */
-	0x2337,INVALC,INVALC,INVALC,INVALC,0x2339,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x233A,INVALC,0x233B,0x2334,INVALC,
-	INVALC,INVALC,0x2476,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2479,0x247E,0x2475,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2524,
-	INVALC,INVALC,0x2477,INVALC,0x247B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2470,INVALC,INVALC,INVALC,INVALC,0x2521,
-	INVALC,INVALC,INVALC,INVALC,0x2473,INVALC,INVALC,INVALC,
-	INVALC,0x247C,INVALC,0x2478,0x2474,0x246D,INVALC,INVALC,
-	0x247D,0x2522,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2523,INVALC,INVALC,INVALC,INVALC,0x276E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2774,0x2778,INVALC,INVALC,0x2775,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2771,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x276C,INVALC,INVALC,
-	INVALC,0x2770,0x2779,INVALC,INVALC,INVALC,INVALC,0x2773,
-	INVALC,INVALC,INVALC,0x276F,0x2777,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2B5C,0x2B5D,
-	INVALC,INVALC,INVALC,0x2B57,0x2B59,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2B5B,INVALC,0x2B54,0x2B5E,INVALC,INVALC,
-	INVALC,0x2B51,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2B55,0x6454,0x2B63,0x2B61,INVALC,INVALC,
-	0x2B53,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2B58,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2F77,
-	0x3021,INVALC,INVALC,INVALC,0x2F74,0x2F78,0x3022,INVALC,
-	INVALC,0x2F79,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 86, Array index 0x0800 */
-	0x2F7B,INVALC,0x2F7A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2F73,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2F76,INVALC,INVALC,INVALC,INVALC,
-	0x2F7E,0x3025,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6721,0x345F,INVALC,0x3468,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3466,INVALC,INVALC,INVALC,INVALC,0x3467,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x345B,INVALC,INVALC,0x3458,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3462,0x3461,INVALC,INVALC,INVALC,
-	0x3457,0x3A36,0x3464,INVALC,INVALC,0x345E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3459,INVALC,INVALC,0x6457,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6456,0x6722,0x6455,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3A3C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3A31,0x3A38,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A2E,0x3A2A,
-	INVALC,INVALC,INVALC,0x3A33,INVALC,INVALC,0x3A40,INVALC,
-	0x3A34,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3A42,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A3B,
-	INVALC,INVALC,INVALC,INVALC,0x3A2F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6723,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4051,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x404E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A2B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x404C,INVALC,INVALC,INVALC,0x6725,INVALC,
-	0x6724,INVALC,INVALC,INVALC,0x6458,INVALC,INVALC,INVALC,
-	0x462E,INVALC,INVALC,0x4628,INVALC,INVALC,INVALC,INVALC,
-	/* Block 87, Array index 0x0900 */
-	INVALC,INVALC,INVALC,0x4629,INVALC,0x4636,INVALC,0x462C,
-	INVALC,INVALC,INVALC,0x462A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4634,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4633,INVALC,INVALC,INVALC,INVALC,INVALC,0x4631,INVALC,
-	0x645A,INVALC,0x6459,INVALC,INVALC,INVALC,0x4650,INVALC,
-	0x4630,INVALC,INVALC,0x4B41,INVALC,0x4B38,INVALC,INVALC,
-	INVALC,0x4B3D,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B44,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4B3E,INVALC,INVALC,0x4B37,
-	INVALC,INVALC,INVALC,0x4B3B,INVALC,0x4B43,INVALC,0x4B45,
-	0x4B40,0x4635,0x4B3C,INVALC,0x4B39,INVALC,0x4B3F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x503F,
-	INVALC,0x5040,INVALC,INVALC,INVALC,INVALC,INVALC,0x503B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x503D,INVALC,0x5448,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5449,0x5447,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x645D,0x645B,INVALC,0x575B,INVALC,0x575A,INVALC,
-	INVALC,INVALC,INVALC,0x5758,INVALC,INVALC,0x5759,0x5757,
-	0x575C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A2D,
-	0x645E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6726,0x6727,0x645C,0x5E26,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6728,INVALC,INVALC,0x5F40,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6071,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2177,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x233E,INVALC,INVALC,0x252C,INVALC,
-	INVALC,0x2526,INVALC,INVALC,0x252B,0x252A,INVALC,0x2529,
-	INVALC,0x2548,0x2527,0x2528,INVALC,INVALC,0x2822,INVALC,
-	0x277D,INVALC,INVALC,0x277C,0x2821,0x277B,INVALC,INVALC,
-	/* Block 88, Array index 0x0A00 */
-	0x2B65,INVALC,INVALC,INVALC,INVALC,0x3027,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A44,0x3A43,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4052,INVALC,0x4637,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F41,INVALC,INVALC,
-	INVALC,0x2161,INVALC,INVALC,0x2234,INVALC,INVALC,0x6249,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2341,0x2342,INVALC,INVALC,0x233F,0x2340,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2531,0x253E,INVALC,0x2530,
-	INVALC,INVALC,0x2540,0x2536,0x252F,INVALC,0x253C,INVALC,
-	0x252D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2532,0x2541,0x2542,0x2533,0x2538,
-	0x2537,0x645F,INVALC,INVALC,INVALC,INVALC,INVALC,0x2535,
-	INVALC,INVALC,INVALC,0x2825,INVALC,0x2823,INVALC,0x2826,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2828,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2829,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x282A,
-	INVALC,0x2824,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6460,INVALC,INVALC,0x2B69,0x2B68,INVALC,
-	0x2B6C,0x2B67,0x2B6A,INVALC,INVALC,INVALC,0x2B71,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2B70,INVALC,INVALC,INVALC,
-	INVALC,0x2B6B,INVALC,INVALC,INVALC,INVALC,0x2B6D,0x2B72,
-	0x2B6E,INVALC,INVALC,INVALC,0x2B66,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x302A,
-	INVALC,INVALC,INVALC,0x3030,INVALC,INVALC,0x302F,INVALC,
-	0x3038,INVALC,INVALC,INVALC,0x3034,0x3035,INVALC,INVALC,
-	0x3033,0x3028,0x3037,INVALC,INVALC,0x302B,INVALC,INVALC,
-	INVALC,0x3036,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3032,INVALC,0x346E,0x3471,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3472,INVALC,
-	0x3474,INVALC,0x3469,INVALC,INVALC,INVALC,INVALC,0x346B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x346F,0x3475,
-	/* Block 89, Array index 0x0B00 */
-	INVALC,INVALC,INVALC,0x3476,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6461,
-	INVALC,INVALC,0x6462,0x6463,INVALC,INVALC,INVALC,INVALC,
-	0x3A4A,INVALC,0x3A45,INVALC,INVALC,INVALC,INVALC,0x3A47,
-	INVALC,INVALC,0x3A50,INVALC,INVALC,INVALC,0x3A4C,INVALC,
-	INVALC,INVALC,INVALC,0x6336,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3A4E,INVALC,0x3A49,INVALC,0x3A4B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6337,INVALC,0x6464,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4057,INVALC,INVALC,INVALC,INVALC,INVALC,0x405B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4056,INVALC,INVALC,0x405E,
-	0x405C,0x4058,INVALC,INVALC,INVALC,INVALC,0x405D,0x6343,
-	INVALC,0x405A,0x4059,INVALC,0x4054,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4643,0x463E,INVALC,INVALC,INVALC,0x4642,
-	0x463C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x463D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x463A,0x4645,INVALC,INVALC,
-	INVALC,INVALC,0x4638,INVALC,INVALC,0x4641,0x4644,0x4640,
-	INVALC,INVALC,INVALC,0x6465,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B46,INVALC,0x4B50,INVALC,INVALC,0x4B51,
-	INVALC,INVALC,0x4B4B,INVALC,INVALC,0x463F,INVALC,INVALC,
-	0x4B4D,INVALC,0x4B49,INVALC,0x4B4F,0x4B4C,INVALC,0x4B47,
-	INVALC,INVALC,INVALC,0x504A,INVALC,INVALC,INVALC,INVALC,
-	0x504B,INVALC,INVALC,0x5048,0x504C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5049,INVALC,INVALC,0x544B,INVALC,INVALC,
-	0x544C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5A2F,INVALC,INVALC,INVALC,
-	0x5A2E,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E28,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2343,INVALC,
-	0x2545,0x2543,0x2544,0x282D,INVALC,0x2B77,INVALC,0x3477,
-	INVALC,INVALC,INVALC,0x3A52,INVALC,INVALC,INVALC,INVALC,
-	/* Block 90, Array index 0x0C00 */
-	0x6466,0x504D,0x2139,INVALC,0x2235,0x2344,INVALC,INVALC,
-	0x2B7A,0x2B79,0x213A,0x2546,INVALC,INVALC,INVALC,INVALC,
-	0x4646,0x6560,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2236,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3479,
-	INVALC,INVALC,INVALC,0x405F,INVALC,INVALC,0x4B53,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2238,INVALC,0x2237,INVALC,0x2239,INVALC,0x2347,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2549,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x282E,0x282F,0x6467,INVALC,INVALC,
-	INVALC,INVALC,0x2B7C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x347B,INVALC,0x347C,0x347D,INVALC,
-	INVALC,INVALC,INVALC,0x3A53,0x3A54,INVALC,0x4060,INVALC,
-	0x4061,INVALC,INVALC,INVALC,0x4648,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x223B,INVALC,INVALC,
-	INVALC,INVALC,0x234B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x234D,INVALC,
-	INVALC,0x2555,INVALC,INVALC,0x254C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x254B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2556,0x2553,0x254E,INVALC,INVALC,0x2551,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2841,0x2833,INVALC,INVALC,
-	0x2838,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2845,
-	0x2840,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x283D,
-	INVALC,INVALC,0x2837,INVALC,0x2835,INVALC,INVALC,INVALC,
-	INVALC,0x283F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2C26,INVALC,0x2846,
-	INVALC,0x2C2D,INVALC,INVALC,INVALC,INVALC,INVALC,0x2C21,
-	INVALC,INVALC,0x2C2C,INVALC,INVALC,INVALC,INVALC,0x2C2E,
-	INVALC,INVALC,INVALC,0x2C23,INVALC,INVALC,INVALC,0x2C24,
-	0x2C25,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2C2B,0x2C29,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 91, Array index 0x0D00 */
-	INVALC,INVALC,0x2C2A,INVALC,0x2C28,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3040,INVALC,0x2C27,INVALC,INVALC,
-	0x6270,INVALC,0x304F,INVALC,0x304A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x304E,INVALC,INVALC,0x303E,INVALC,INVALC,
-	INVALC,0x303B,0x3045,INVALC,0x3048,INVALC,0x3052,INVALC,
-	INVALC,INVALC,0x303C,0x3522,0x3538,INVALC,INVALC,0x304D,
-	INVALC,0x304B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3528,0x3524,INVALC,0x3531,INVALC,0x3533,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x352E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x352A,INVALC,INVALC,0x352F,0x353B,
-	INVALC,INVALC,INVALC,INVALC,0x353A,INVALC,INVALC,INVALC,
-	INVALC,0x3539,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3527,INVALC,0x353C,INVALC,INVALC,INVALC,INVALC,
-	0x3530,INVALC,INVALC,0x352B,INVALC,INVALC,0x3529,0x3534,
-	INVALC,0x3532,INVALC,0x3537,INVALC,0x3535,INVALC,INVALC,
-	INVALC,0x3A75,INVALC,INVALC,INVALC,INVALC,0x3A7C,INVALC,
-	0x3A63,0x3A61,0x3A58,INVALC,INVALC,0x3A5B,0x3A77,0x3A72,
-	0x3A59,0x3A60,INVALC,INVALC,INVALC,0x3A7B,INVALC,INVALC,
-	INVALC,0x3A66,INVALC,INVALC,INVALC,INVALC,0x3A62,INVALC,
-	0x3A5C,0x3A5E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A73,0x3A5A,INVALC,0x3A57,0x3A7A,INVALC,INVALC,INVALC,
-	0x3A56,INVALC,0x3A79,0x3A78,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4067,INVALC,0x4066,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4064,0x3A6B,
-	0x406A,0x6468,INVALC,0x6469,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x464C,INVALC,INVALC,0x464A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x464F,
-	0x4653,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B5C,INVALC,0x4B58,INVALC,0x4B54,INVALC,
-	/* Block 92, Array index 0x0E00 */
-	0x4B5E,INVALC,INVALC,INVALC,0x4B56,INVALC,0x4B5A,INVALC,
-	INVALC,INVALC,0x4B5B,INVALC,INVALC,0x4B5D,0x4B5F,INVALC,
-	INVALC,0x5050,0x5053,INVALC,INVALC,0x5051,INVALC,INVALC,
-	0x504F,INVALC,INVALC,INVALC,0x5054,INVALC,INVALC,0x504E,
-	INVALC,INVALC,0x5056,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5450,INVALC,0x544E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5452,INVALC,0x544F,INVALC,0x5451,INVALC,0x5453,
-	INVALC,0x5A31,0x5761,0x575E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C36,INVALC,0x5C39,INVALC,0x5C3A,INVALC,
-	INVALC,0x5E29,0x5F42,INVALC,INVALC,INVALC,INVALC,0x6073,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2848,INVALC,INVALC,INVALC,INVALC,INVALC,0x625C,0x646A,
-	INVALC,INVALC,0x2C2F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4071,INVALC,0x4072,INVALC,
-	INVALC,0x5057,INVALC,INVALC,0x5A34,INVALC,0x5C3B,INVALC,
-	0x213B,INVALC,0x223D,INVALC,INVALC,INVALC,0x2350,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x255A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x284C,INVALC,0x284A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x284E,0x284B,0x284D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2C32,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3057,
-	INVALC,INVALC,INVALC,0x3056,0x3055,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3541,INVALC,INVALC,INVALC,INVALC,
-	0x353F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3A7E,INVALC,0x4074,
-	INVALC,INVALC,0x4075,0x4076,0x4073,0x6345,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5A35,INVALC,INVALC,INVALC,0x5E2A,
-	INVALC,0x223E,INVALC,INVALC,INVALC,0x255E,0x255C,0x255D,
-	/* Block 93, Array index 0x0F00 */
-	0x2850,INVALC,INVALC,INVALC,INVALC,0x3058,0x3059,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x624A,0x223F,INVALC,INVALC,INVALC,
-	0x2352,0x2851,INVALC,0x2C34,INVALC,INVALC,0x3B24,INVALC,
-	0x4078,0x6525,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x255F,INVALC,INVALC,INVALC,0x2C35,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5454,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2354,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2854,0x2855,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x305A,0x305B,INVALC,INVALC,INVALC,0x646B,
-	INVALC,INVALC,INVALC,0x3543,INVALC,INVALC,0x3B26,0x3B25,
-	INVALC,0x3544,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5A38,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x646C,
-	0x2355,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x235A,INVALC,INVALC,INVALC,0x2561,0x2566,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2562,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2563,INVALC,0x285D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x285E,INVALC,INVALC,INVALC,
-	INVALC,0x285C,0x285F,0x2857,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2858,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2C3F,INVALC,INVALC,
-	INVALC,0x2C3B,INVALC,INVALC,INVALC,0x646D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2C3C,0x2C42,INVALC,INVALC,
-	INVALC,0x2C3E,0x2C41,INVALC,INVALC,0x2C43,0x2C3D,INVALC,
-	INVALC,0x3063,INVALC,0x305F,INVALC,INVALC,INVALC,0x3064,
-	INVALC,INVALC,INVALC,0x3061,INVALC,0x3062,INVALC,INVALC,
-	INVALC,INVALC,0x305E,INVALC,0x6271,INVALC,0x6272,INVALC,
-	/* Block 94, Array index 0x1000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x354B,0x3548,0x3547,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3551,INVALC,INVALC,0x3552,INVALC,0x354F,INVALC,INVALC,
-	0x3555,INVALC,INVALC,INVALC,0x3B2B,INVALC,INVALC,INVALC,
-	INVALC,0x3546,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x354E,INVALC,0x354A,INVALC,INVALC,0x3554,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3B36,INVALC,INVALC,0x3B28,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3B27,INVALC,0x3B37,INVALC,
-	0x3B2A,INVALC,INVALC,INVALC,INVALC,0x3B2E,INVALC,0x3B34,
-	INVALC,INVALC,INVALC,0x3B33,INVALC,INVALC,INVALC,0x3B31,
-	INVALC,INVALC,INVALC,0x3B2D,INVALC,INVALC,INVALC,INVALC,
-	0x4121,INVALC,INVALC,INVALC,0x407C,INVALC,0x407A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4079,0x407D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x646E,INVALC,INVALC,
-	0x465C,INVALC,INVALC,0x4654,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4656,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4659,0x465A,INVALC,0x646F,0x4B65,
-	0x4B66,0x4B63,INVALC,INVALC,INVALC,INVALC,0x4B6B,INVALC,
-	0x4B67,INVALC,INVALC,0x4B69,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4B6A,0x4B68,0x6470,0x5058,INVALC,
-	INVALC,INVALC,INVALC,0x505B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x505A,INVALC,INVALC,0x6471,INVALC,
-	INVALC,0x5457,INVALC,0x5459,INVALC,INVALC,0x5455,0x6472,
-	INVALC,0x5762,INVALC,INVALC,0x5A39,INVALC,INVALC,INVALC,
-	0x5C3D,INVALC,0x5C3C,INVALC,0x5C3E,INVALC,INVALC,INVALC,
-	0x5E2D,INVALC,INVALC,0x5F43,INVALC,INVALC,INVALC,0x6030,
-	INVALC,INVALC,INVALC,0x213C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3557,0x4B6C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2567,0x2860,INVALC,
-	INVALC,INVALC,0x2C45,0x2C44,INVALC,INVALC,INVALC,INVALC,
-	/* Block 95, Array index 0x1100 */
-	0x2163,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x235C,0x2568,INVALC,0x256B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2862,0x2861,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2C46,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3066,INVALC,0x3069,INVALC,0x3068,0x306A,
-	0x3067,INVALC,0x355B,INVALC,INVALC,0x3559,INVALC,INVALC,
-	INVALC,0x3558,0x355A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3979,INVALC,INVALC,INVALC,0x3B3A,0x3B3B,
-	0x3B3D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x465D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B6D,INVALC,INVALC,INVALC,0x4B70,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6473,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6677,INVALC,INVALC,INVALC,INVALC,INVALC,0x2863,
-	INVALC,INVALC,0x213D,INVALC,INVALC,INVALC,INVALC,0x213E,
-	INVALC,0x2247,INVALC,0x2248,INVALC,0x6678,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x256E,INVALC,0x256D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2865,0x2867,INVALC,INVALC,INVALC,0x2868,INVALC,INVALC,
-	INVALC,0x2C48,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x306C,INVALC,INVALC,INVALC,INVALC,INVALC,0x306B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3561,0x3560,INVALC,0x3B3F,INVALC,0x3B40,
-	0x3B3E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6474,INVALC,0x4661,
-	0x4660,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x505C,INVALC,INVALC,0x6475,INVALC,INVALC,
-	0x5C3F,INVALC,INVALC,INVALC,0x213F,0x2361,INVALC,INVALC,
-	0x2869,0x286B,INVALC,0x2C4C,0x2C4B,0x306E,INVALC,INVALC,
-	/* Block 96, Array index 0x1200 */
-	INVALC,INVALC,INVALC,0x256F,INVALC,INVALC,0x286D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2164,0x2249,0x2362,INVALC,
-	INVALC,0x3B42,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2571,INVALC,
-	INVALC,0x286E,INVALC,INVALC,INVALC,0x2870,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2C4D,
-	INVALC,INVALC,0x306F,INVALC,0x3562,INVALC,INVALC,INVALC,
-	INVALC,0x3563,0x3B47,0x3B45,INVALC,INVALC,0x3B44,INVALC,
-	INVALC,INVALC,0x4122,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5763,INVALC,INVALC,
-	0x2140,0x2141,0x224A,0x2351,INVALC,0x2871,INVALC,INVALC,
-	INVALC,INVALC,0x4123,0x505E,INVALC,0x5764,INVALC,INVALC,
-	0x6164,0x2142,INVALC,0x2572,INVALC,INVALC,0x2C50,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4124,INVALC,
-	INVALC,INVALC,0x5F45,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2876,0x2875,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6264,0x3070,0x3072,
-	INVALC,INVALC,INVALC,0x3071,0x6476,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6477,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3B4B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4663,0x4664,INVALC,INVALC,INVALC,
-	0x4B72,INVALC,0x6478,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5E2F,INVALC,INVALC,INVALC,INVALC,0x224D,
-	0x6251,INVALC,0x224C,INVALC,INVALC,INVALC,0x2578,INVALC,
-	INVALC,INVALC,INVALC,0x2366,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2367,0x2369,0x2577,INVALC,INVALC,0x257B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2576,0x2574,
-	INVALC,0x287E,INVALC,INVALC,0x257C,INVALC,INVALC,INVALC,
-	0x2622,INVALC,0x2621,INVALC,INVALC,INVALC,0x257D,INVALC,
-	INVALC,0x2623,INVALC,INVALC,0x257A,INVALC,0x2575,INVALC,
-	/* Block 97, Array index 0x1300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2878,
-	0x2922,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6266,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2C5A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2877,0x2C5B,INVALC,INVALC,INVALC,INVALC,0x287A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2921,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6267,INVALC,0x2C60,0x3079,INVALC,INVALC,0x2C56,0x3073,
-	INVALC,0x2C57,0x2C5D,INVALC,INVALC,INVALC,0x307E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2C54,INVALC,INVALC,INVALC,
-	0x2C5F,0x2C61,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x307A,0x3078,0x307B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2C5C,INVALC,0x3076,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3122,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3125,INVALC,INVALC,INVALC,INVALC,
-	0x3568,0x3074,INVALC,INVALC,INVALC,INVALC,0x3127,INVALC,
-	INVALC,0x3571,INVALC,INVALC,0x3572,INVALC,0x3123,0x3128,
-	INVALC,0x3121,0x356F,INVALC,INVALC,INVALC,0x3126,INVALC,
-	INVALC,INVALC,INVALC,0x3B54,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x356A,INVALC,0x3B56,INVALC,INVALC,INVALC,0x3B55,0x356E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3579,INVALC,
-	INVALC,INVALC,INVALC,0x3B58,INVALC,0x3B59,INVALC,0x3576,
-	INVALC,0x3B5A,0x3B4D,INVALC,INVALC,INVALC,0x3574,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3B5E,INVALC,INVALC,
-	/* Block 98, Array index 0x1400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3B4F,
-	INVALC,INVALC,INVALC,INVALC,0x3B51,INVALC,INVALC,INVALC,
-	INVALC,0x3B5D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x412B,INVALC,INVALC,INVALC,INVALC,0x3B61,INVALC,
-	0x3B62,0x3B63,0x3B50,INVALC,INVALC,0x6479,INVALC,INVALC,
-	INVALC,INVALC,0x4129,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4127,0x412C,INVALC,0x466F,INVALC,INVALC,INVALC,INVALC,
-	0x466E,INVALC,0x4128,INVALC,0x466C,0x412E,INVALC,INVALC,
-	INVALC,INVALC,0x466D,0x412A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x647A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B73,
-	INVALC,0x4B7E,INVALC,INVALC,0x4B74,INVALC,INVALC,INVALC,
-	0x4671,INVALC,INVALC,INVALC,0x4B7C,INVALC,INVALC,INVALC,
-	INVALC,0x4672,INVALC,INVALC,INVALC,INVALC,INVALC,0x466A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C21,INVALC,INVALC,0x4668,INVALC,0x4673,INVALC,INVALC,
-	INVALC,0x466B,INVALC,INVALC,INVALC,0x4C23,0x4674,0x4C24,
-	0x4B77,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B7A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B76,INVALC,0x5068,
-	0x4C28,0x5067,INVALC,INVALC,0x4C29,INVALC,0x4C25,INVALC,
-	INVALC,INVALC,INVALC,0x4B79,INVALC,INVALC,0x4B75,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5061,
-	INVALC,0x5063,INVALC,0x506A,INVALC,0x5064,INVALC,INVALC,
-	0x5066,INVALC,INVALC,INVALC,0x506C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5062,0x5065,
-	0x506B,INVALC,INVALC,0x6679,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5461,0x545F,0x545C,0x545E,0x545D,INVALC,INVALC,
-	INVALC,INVALC,0x545B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5765,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 99, Array index 0x1500 */
-	INVALC,INVALC,0x5F46,INVALC,INVALC,0x613E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x236B,
-	INVALC,INVALC,INVALC,0x2625,INVALC,INVALC,INVALC,INVALC,
-	0x2C63,INVALC,INVALC,INVALC,INVALC,INVALC,0x3B64,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4676,INVALC,INVALC,INVALC,0x4675,INVALC,INVALC,0x4C2C,
-	INVALC,0x506D,INVALC,INVALC,INVALC,0x5F48,INVALC,0x2165,
-	0x2166,0x224E,INVALC,0x2628,0x2629,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3129,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2250,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x236F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x236C,INVALC,0x236D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x236E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2639,INVALC,INVALC,
-	0x262E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x262A,INVALC,INVALC,0x2637,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x262F,INVALC,0x2636,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2635,INVALC,0x2633,0x2634,0x2638,0x2631,INVALC,
-	INVALC,INVALC,INVALC,0x647B,INVALC,0x2632,0x2931,0x292A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2926,INVALC,INVALC,INVALC,INVALC,0x2928,
-	INVALC,INVALC,0x2925,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2934,0x2932,INVALC,INVALC,INVALC,0x2933,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x292E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2930,0x2937,0x2935,
-	0x2936,0x292F,INVALC,INVALC,0x2929,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2C6D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 100, Array index 0x1600 */
-	INVALC,INVALC,INVALC,INVALC,0x2C6F,0x2C70,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2C6C,
-	INVALC,0x3132,INVALC,0x3133,INVALC,INVALC,INVALC,0x2C6B,
-	INVALC,0x2C6E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x312C,INVALC,
-	0x312F,0x3135,INVALC,INVALC,INVALC,0x3138,INVALC,0x3137,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x313C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x312E,0x3139,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3130,0x313B,0x3136,INVALC,INVALC,
-	0x647C,INVALC,INVALC,INVALC,0x647D,INVALC,0x3631,INVALC,
-	INVALC,INVALC,0x3627,INVALC,0x3629,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3626,0x3632,INVALC,INVALC,INVALC,
-	INVALC,0x3622,INVALC,INVALC,INVALC,INVALC,0x357C,0x362B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3623,INVALC,
-	INVALC,INVALC,INVALC,0x357D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3624,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x362D,INVALC,INVALC,INVALC,0x647E,INVALC,
-	INVALC,INVALC,0x362E,INVALC,INVALC,INVALC,INVALC,0x3B71,
-	INVALC,0x3B70,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3B73,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3B67,INVALC,
-	INVALC,INVALC,0x3B66,INVALC,INVALC,INVALC,0x3B68,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3B72,
-	0x3B6D,INVALC,0x6339,INVALC,INVALC,INVALC,0x3B6F,INVALC,
-	/* Block 101, Array index 0x1700 */
-	INVALC,INVALC,INVALC,0x6521,INVALC,INVALC,INVALC,0x4149,
-	0x4132,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x413A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4138,INVALC,INVALC,INVALC,0x413E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x413D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4136,0x4133,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4134,INVALC,0x4148,0x4725,0x4142,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4144,0x4145,
-	INVALC,0x6676,INVALC,INVALC,0x4678,INVALC,INVALC,0x4728,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x467E,0x4724,0x467A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4721,INVALC,0x472A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4723,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4722,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x467B,INVALC,0x4729,INVALC,
-	0x4C2D,0x4726,INVALC,0x4C35,INVALC,INVALC,0x4C38,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4C30,0x4C2F,INVALC,
-	INVALC,0x4C3B,INVALC,INVALC,0x4C31,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4C2E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C3E,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C3F,
-	0x4C34,INVALC,0x4C3D,INVALC,INVALC,INVALC,INVALC,0x4C3A,
-	INVALC,INVALC,INVALC,INVALC,0x4C39,INVALC,0x6522,INVALC,
-	INVALC,0x4C37,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5070,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C32,INVALC,
-	0x5077,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5076,INVALC,0x506F,INVALC,0x5079,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5075,INVALC,INVALC,0x5464,
-	INVALC,0x5467,INVALC,INVALC,INVALC,0x576B,INVALC,0x576D,
-	INVALC,INVALC,0x576C,INVALC,INVALC,INVALC,0x5469,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x576A,INVALC,
-	INVALC,0x5770,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 102, Array index 0x1800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x576E,INVALC,INVALC,
-	0x5A3B,INVALC,0x5A3C,0x5A3A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5E31,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6523,INVALC,INVALC,INVALC,0x5F4A,0x5F4B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F49,
-	0x6032,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2C72,INVALC,INVALC,0x2167,0x2168,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2C74,INVALC,0x2C76,INVALC,0x2C73,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x313D,INVALC,0x3637,0x3636,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3634,INVALC,INVALC,INVALC,INVALC,0x3B74,
-	0x3B75,0x3B76,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x414B,INVALC,0x414E,0x6346,INVALC,
-	0x414D,0x4730,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5C41,INVALC,INVALC,
-	0x2558,0x2939,INVALC,0x3140,INVALC,0x3638,0x3639,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3142,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x293B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x363A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x546B,INVALC,INVALC,
-	INVALC,INVALC,0x293C,INVALC,INVALC,INVALC,0x2C77,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x363C,
-	INVALC,0x363F,0x363D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3B79,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5A3F,INVALC,INVALC,INVALC,
-	0x2169,INVALC,INVALC,0x3641,0x4150,INVALC,INVALC,0x2251,
-	INVALC,INVALC,0x2373,0x2372,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x263D,INVALC,
-	INVALC,0x625E,INVALC,INVALC,INVALC,INVALC,0x2943,0x293E,
-	/* Block 103, Array index 0x1900 */
-	INVALC,0x2942,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2940,
-	0x2941,INVALC,0x2C7E,0x2C7A,INVALC,INVALC,0x2D23,INVALC,
-	INVALC,INVALC,INVALC,0x2C7C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2C79,INVALC,INVALC,0x2C7D,INVALC,INVALC,INVALC,
-	0x2D21,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2D24,
-	0x2D25,INVALC,INVALC,0x2D22,0x2C37,INVALC,INVALC,INVALC,
-	0x3146,INVALC,INVALC,INVALC,0x314C,INVALC,0x3144,INVALC,
-	0x3149,INVALC,INVALC,0x3148,INVALC,0x314D,0x3145,INVALC,
-	0x3143,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3642,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x314B,INVALC,INVALC,0x3644,INVALC,INVALC,INVALC,0x3645,
-	INVALC,0x3C26,INVALC,0x3B7D,INVALC,0x3C25,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3C23,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3B7C,INVALC,0x3B7E,
-	INVALC,0x3C24,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x415B,0x4156,
-	INVALC,INVALC,0x4159,0x4151,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4734,INVALC,0x4735,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4739,0x4733,0x4737,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4C44,0x4C46,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4C41,INVALC,INVALC,0x4C40,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4C43,INVALC,INVALC,0x507D,
-	INVALC,0x5123,INVALC,0x507A,INVALC,0x507E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5122,0x5471,INVALC,
-	0x546F,0x5470,INVALC,INVALC,0x546C,0x546D,INVALC,0x5472,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A43,
-	INVALC,0x5A42,0x6526,INVALC,INVALC,0x5C42,INVALC,0x5C43,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x613F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2641,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 104, Array index 0x1A00 */
-	INVALC,INVALC,0x6527,INVALC,INVALC,INVALC,0x5124,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2945,INVALC,0x2D27,INVALC,
-	INVALC,0x6632,INVALC,INVALC,INVALC,INVALC,0x3648,INVALC,
-	INVALC,0x3647,0x3646,INVALC,INVALC,INVALC,0x3C29,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5126,0x6633,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2252,
-	INVALC,INVALC,0x2377,INVALC,INVALC,INVALC,0x2378,0x2375,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2648,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2649,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2645,INVALC,0x2644,INVALC,INVALC,INVALC,
-	0x2647,INVALC,INVALC,0x2642,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x264A,INVALC,INVALC,INVALC,0x6257,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2947,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2952,INVALC,0x2949,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x625F,INVALC,0x294A,INVALC,INVALC,INVALC,INVALC,0x294F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2948,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x294E,0x294C,0x6528,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6529,INVALC,INVALC,INVALC,
-	INVALC,0x2D36,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2D2E,INVALC,INVALC,0x2D30,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2D2D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2D31,0x2D2B,0x2D3A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2D2A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2951,INVALC,0x2D34,INVALC,INVALC,0x2D32,INVALC,
-	/* Block 105, Array index 0x1B00 */
-	0x2D39,0x2D37,INVALC,INVALC,INVALC,0x2D38,0x652B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x652A,INVALC,INVALC,INVALC,INVALC,0x315D,INVALC,INVALC,
-	INVALC,0x3157,INVALC,0x3153,INVALC,INVALC,0x315B,INVALC,
-	INVALC,INVALC,0x315E,0x3164,0x3150,INVALC,INVALC,0x315F,
-	INVALC,INVALC,INVALC,INVALC,0x3156,INVALC,INVALC,INVALC,
-	0x3163,INVALC,INVALC,INVALC,INVALC,INVALC,0x3154,0x314F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x315A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3159,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2D2F,INVALC,INVALC,0x3162,0x3158,INVALC,
-	0x3161,0x3160,0x652D,INVALC,INVALC,INVALC,0x652C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3655,INVALC,INVALC,INVALC,
-	0x3660,INVALC,INVALC,0x364E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x365B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3657,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3651,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x365A,INVALC,INVALC,
-	0x364D,0x365C,0x3650,INVALC,INVALC,INVALC,0x364B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3654,0x3478,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x364C,0x3652,
-	0x365E,0x365F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3656,INVALC,0x3C45,INVALC,0x3C41,INVALC,INVALC,
-	INVALC,INVALC,0x3C38,INVALC,INVALC,INVALC,INVALC,0x3C3E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3653,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3C3D,INVALC,INVALC,0x3C32,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3C2A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C31,0x3C42,
-	/* Block 106, Array index 0x1C00 */
-	0x3C39,0x3C3B,0x3C34,0x3C2F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3C37,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C3C,INVALC,INVALC,INVALC,0x3C44,INVALC,0x3C33,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x652F,INVALC,INVALC,0x652E,INVALC,0x3C40,INVALC,
-	INVALC,0x4165,INVALC,INVALC,INVALC,INVALC,0x4177,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4168,INVALC,
-	INVALC,INVALC,INVALC,0x416B,INVALC,INVALC,0x415D,0x4175,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4173,INVALC,INVALC,
-	0x4174,INVALC,INVALC,INVALC,INVALC,0x416F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4179,INVALC,INVALC,0x4178,INVALC,INVALC,0x4176,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x416D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x416A,0x417B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4172,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x473A,
-	INVALC,INVALC,0x473D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4751,INVALC,INVALC,INVALC,INVALC,0x474E,INVALC,0x4746,
-	INVALC,INVALC,0x4747,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x473E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6352,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4743,INVALC,INVALC,INVALC,INVALC,0x473B,INVALC,INVALC,
-	0x473C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4745,0x4748,INVALC,INVALC,0x474D,0x4744,INVALC,
-	0x4C54,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x474C,INVALC,0x4742,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C64,0x4C60,INVALC,INVALC,INVALC,INVALC,0x4C4F,
-	0x4C51,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C5F,0x4C57,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 107, Array index 0x1D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4C4D,0x4C50,INVALC,0x4C47,INVALC,
-	0x4C5B,INVALC,0x4C56,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C4A,INVALC,0x4C49,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C52,INVALC,0x4C62,INVALC,INVALC,INVALC,
-	INVALC,0x4C5E,0x4C59,INVALC,0x4C61,0x6530,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x512C,INVALC,INVALC,0x513C,0x5138,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5128,0x512B,INVALC,0x5140,INVALC,INVALC,
-	INVALC,INVALC,0x513B,INVALC,0x5131,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5129,0x513E,INVALC,INVALC,INVALC,0x512F,
-	INVALC,INVALC,INVALC,INVALC,0x5144,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5127,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x512E,INVALC,0x5132,INVALC,
-	0x5141,0x513A,INVALC,INVALC,INVALC,INVALC,INVALC,0x6531,
-	INVALC,INVALC,0x6532,INVALC,INVALC,0x5475,INVALC,INVALC,
-	INVALC,INVALC,0x547B,INVALC,INVALC,INVALC,0x5521,INVALC,
-	0x547C,INVALC,0x5476,INVALC,INVALC,INVALC,INVALC,0x5527,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5523,0x547A,INVALC,INVALC,INVALC,0x5524,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5478,
-	INVALC,INVALC,0x5529,0x5774,INVALC,INVALC,INVALC,INVALC,
-	0x5777,0x5821,0x5776,INVALC,INVALC,0x5778,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x577E,INVALC,0x5779,0x5823,
-	0x577D,0x577A,INVALC,INVALC,0x5822,INVALC,INVALC,INVALC,
-	0x577B,INVALC,0x6533,INVALC,INVALC,INVALC,0x5A44,INVALC,
-	INVALC,INVALC,0x5A4F,INVALC,0x5A45,0x5A4E,INVALC,0x5A47,
-	0x5A4D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5A48,0x5A46,INVALC,INVALC,0x6534,INVALC,
-	INVALC,0x5C49,INVALC,INVALC,INVALC,0x5775,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5C47,0x6535,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E35,0x5E34,0x5E33,
-	/* Block 108, Array index 0x1E00 */
-	INVALC,0x5E37,INVALC,INVALC,INVALC,INVALC,0x5F4F,0x5F4E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6536,0x6537,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6074,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6140,0x6165,0x6141,INVALC,INVALC,
-	INVALC,INVALC,0x2379,INVALC,INVALC,INVALC,0x2953,0x2954,
-	INVALC,0x6269,0x2D3C,0x3166,INVALC,INVALC,0x3165,INVALC,
-	0x3167,INVALC,INVALC,INVALC,INVALC,0x3662,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x417D,INVALC,INVALC,INVALC,0x417C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C66,
-	INVALC,INVALC,0x4C65,0x4C67,INVALC,INVALC,INVALC,0x5146,
-	0x5145,INVALC,INVALC,INVALC,INVALC,0x552B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2955,0x2956,INVALC,0x2D3D,0x3168,INVALC,0x3C49,0x3C47,
-	INVALC,0x417E,INVALC,0x4221,0x4753,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2253,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2958,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x316A,INVALC,INVALC,INVALC,INVALC,
-	0x3664,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4222,0x6354,INVALC,INVALC,
-	INVALC,0x4754,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2959,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3665,INVALC,INVALC,0x3C4B,INVALC,
-	INVALC,0x4226,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x237A,INVALC,
-	INVALC,0x295A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6538,0x6539,INVALC,INVALC,
-	INVALC,0x2D42,INVALC,INVALC,INVALC,0x316E,INVALC,INVALC,
-	INVALC,0x316C,0x316D,INVALC,INVALC,0x3666,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C4D,INVALC,0x653A,INVALC,
-	INVALC,INVALC,0x4228,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 109, Array index 0x1F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x552D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x295D,INVALC,0x653B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3C4E,INVALC,INVALC,
-	INVALC,0x4229,0x422A,INVALC,INVALC,INVALC,INVALC,0x2257,
-	INVALC,0x2254,INVALC,INVALC,0x2421,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2258,0x2259,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x237D,INVALC,0x2425,INVALC,INVALC,0x2655,INVALC,
-	0x237C,INVALC,0x2423,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x653C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2964,INVALC,0x2650,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2653,INVALC,0x237E,
-	INVALC,0x2657,INVALC,INVALC,0x2651,INVALC,INVALC,0x264C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x264D,INVALC,INVALC,INVALC,INVALC,INVALC,0x2963,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x264E,0x2652,
-	0x265C,0x2659,0x2656,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x265B,INVALC,INVALC,INVALC,INVALC,0x2D4E,
-	INVALC,INVALC,0x296B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x296D,INVALC,INVALC,0x6261,INVALC,INVALC,0x296C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x296A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2965,
-	INVALC,INVALC,INVALC,INVALC,0x2969,INVALC,0x6260,INVALC,
-	INVALC,INVALC,0x2967,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2D4F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2D46,
-	/* Block 110, Array index 0x2000 */
-	INVALC,INVALC,0x2D50,INVALC,INVALC,0x2D48,0x2D4A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2D49,0x2D47,0x2D4D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x317A,INVALC,INVALC,INVALC,
-	INVALC,0x2D4B,INVALC,0x2D45,0x2D57,INVALC,0x2D53,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2D55,0x2D51,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3177,0x3173,
-	INVALC,INVALC,INVALC,0x3179,0x3226,0x3176,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x316F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3222,0x3225,0x3172,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3221,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3178,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3227,INVALC,
-	INVALC,0x317D,0x317B,0x317C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x653D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x366F,INVALC,INVALC,
-	0x367A,0x3721,INVALC,INVALC,INVALC,INVALC,0x3C50,INVALC,
-	INVALC,0x3672,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x366A,INVALC,0x366B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x366C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3674,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x367C,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C5D,0x3728,
-	/* Block 111, Array index 0x2100 */
-	INVALC,0x3726,0x3723,INVALC,0x3670,INVALC,0x3677,0x3724,
-	0x3676,0x3725,0x3679,INVALC,0x367D,INVALC,INVALC,0x653E,
-	INVALC,INVALC,0x3729,INVALC,INVALC,INVALC,INVALC,0x3727,
-	0x3C54,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C52,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3C6B,0x3C6D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3C5A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C56,INVALC,INVALC,INVALC,0x3C6E,INVALC,INVALC,0x3C58,
-	0x3C69,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C66,
-	INVALC,0x3C64,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3C5B,INVALC,0x423A,0x3C60,INVALC,INVALC,
-	0x3C5C,INVALC,INVALC,INVALC,INVALC,0x3C51,0x3C6C,INVALC,
-	INVALC,INVALC,INVALC,0x3C62,0x6542,INVALC,0x3C63,INVALC,
-	0x3C68,INVALC,INVALC,INVALC,0x6540,INVALC,0x633D,INVALC,
-	INVALC,INVALC,0x653F,0x6541,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4230,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4233,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x422E,0x4236,INVALC,INVALC,0x4240,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4239,INVALC,INVALC,
-	0x422D,INVALC,INVALC,0x4231,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4244,0x423E,0x4247,INVALC,0x423D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4245,INVALC,INVALC,0x423F,INVALC,
-	0x423B,0x4246,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4756,INVALC,INVALC,0x4757,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4765,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 112, Array index 0x2200 */
-	INVALC,INVALC,INVALC,INVALC,0x4763,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4C78,0x475B,INVALC,INVALC,INVALC,
-	0x4C6A,0x4764,INVALC,INVALC,INVALC,INVALC,INVALC,0x475F,
-	INVALC,INVALC,INVALC,0x475A,INVALC,0x475C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x475E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x475D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4C74,INVALC,INVALC,
-	INVALC,INVALC,0x4762,INVALC,0x4761,INVALC,INVALC,INVALC,
-	0x6544,0x6545,0x4766,INVALC,0x6543,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C7D,INVALC,INVALC,0x4C73,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4C6B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C75,INVALC,INVALC,0x4C7E,0x4C6C,INVALC,INVALC,
-	INVALC,0x4C79,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C7A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6363,INVALC,INVALC,INVALC,INVALC,0x4C7B,
-	INVALC,0x4C77,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6547,INVALC,INVALC,INVALC,0x6546,INVALC,0x5156,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5154,INVALC,0x5158,
-	INVALC,INVALC,INVALC,0x514D,INVALC,INVALC,0x5150,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C71,INVALC,INVALC,0x5155,INVALC,INVALC,0x5530,0x552F,
-	INVALC,0x5535,0x5536,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5531,INVALC,INVALC,
-	INVALC,INVALC,0x5537,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5A55,INVALC,0x5159,0x5539,INVALC,
-	0x6548,INVALC,INVALC,INVALC,INVALC,0x5828,INVALC,INVALC,
-	/* Block 113, Array index 0x2300 */
-	INVALC,INVALC,0x582A,0x5827,INVALC,INVALC,INVALC,INVALC,
-	0x5826,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5829,INVALC,INVALC,0x582B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A52,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5A54,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5A53,0x654A,0x6549,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C51,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5C4F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E3C,
-	INVALC,INVALC,INVALC,0x5E3A,INVALC,0x5E3B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6036,0x5F52,INVALC,INVALC,INVALC,
-	INVALC,0x6037,INVALC,INVALC,0x654B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6179,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2428,0x2426,
-	INVALC,INVALC,0x2427,0x242B,INVALC,0x2662,INVALC,0x265F,
-	INVALC,0x265E,INVALC,0x2663,INVALC,INVALC,0x2660,INVALC,
-	INVALC,0x2977,INVALC,INVALC,INVALC,INVALC,INVALC,0x2974,
-	0x2970,0x2975,INVALC,0x296F,0x2979,0x2976,INVALC,0x2972,
-	0x2971,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2D5E,INVALC,0x2D5C,0x2D5A,INVALC,0x2D58,0x626A,0x2D65,
-	0x2D62,INVALC,0x2D5F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2D64,INVALC,INVALC,INVALC,0x2D63,INVALC,
-	INVALC,0x2D68,INVALC,0x2D5D,INVALC,INVALC,INVALC,0x654D,
-	INVALC,INVALC,INVALC,INVALC,0x3228,INVALC,INVALC,INVALC,
-	INVALC,0x6279,INVALC,INVALC,0x322A,INVALC,INVALC,INVALC,
-	0x322B,INVALC,INVALC,INVALC,INVALC,0x3231,0x322F,INVALC,
-	INVALC,INVALC,INVALC,0x3229,INVALC,INVALC,INVALC,0x322D,
-	INVALC,INVALC,INVALC,0x322C,INVALC,0x654F,INVALC,INVALC,
-	INVALC,INVALC,0x654E,INVALC,INVALC,INVALC,0x3230,INVALC,
-	INVALC,0x3730,0x3732,INVALC,INVALC,0x372F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3735,INVALC,
-	/* Block 114, Array index 0x2400 */
-	INVALC,0x372E,INVALC,0x372C,INVALC,INVALC,INVALC,0x372D,
-	0x3731,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3733,
-	INVALC,0x6550,0x6551,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3C74,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C7D,INVALC,INVALC,0x3C7C,
-	INVALC,INVALC,0x3C6F,0x3C7A,0x3C72,0x3D21,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3C7B,0x3C79,0x3C71,INVALC,0x3C73,
-	0x3C77,0x6553,INVALC,0x6554,INVALC,0x6555,INVALC,0x6552,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4257,INVALC,INVALC,
-	0x424C,INVALC,0x424E,INVALC,INVALC,INVALC,INVALC,0x4251,
-	INVALC,0x4258,INVALC,INVALC,INVALC,INVALC,INVALC,0x4252,
-	INVALC,INVALC,INVALC,0x483C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x424F,INVALC,0x4259,INVALC,0x4249,
-	INVALC,0x6559,INVALC,INVALC,0x4253,0x6557,0x6558,0x6556,
-	INVALC,INVALC,INVALC,INVALC,0x476F,INVALC,0x476E,0x476C,
-	INVALC,INVALC,INVALC,0x4770,INVALC,INVALC,INVALC,INVALC,
-	0x4772,INVALC,INVALC,0x476A,0x476D,0x476B,0x4768,INVALC,
-	INVALC,0x4767,INVALC,0x655B,INVALC,INVALC,0x655A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D2A,0x4D24,INVALC,INVALC,0x4D29,INVALC,
-	INVALC,INVALC,INVALC,0x4D28,INVALC,0x4D25,0x4D22,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x655C,INVALC,0x5162,0x515A,
-	INVALC,INVALC,0x5160,0x515C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5163,0x6374,INVALC,INVALC,
-	INVALC,0x515E,INVALC,0x5166,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x655D,0x655E,INVALC,
-	INVALC,INVALC,INVALC,0x553C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x553E,0x5543,0x5540,INVALC,INVALC,INVALC,0x5541,
-	INVALC,INVALC,INVALC,0x5542,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x582D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 115, Array index 0x2500 */
-	0x582E,INVALC,INVALC,INVALC,0x5A56,INVALC,INVALC,INVALC,
-	0x5A57,INVALC,INVALC,0x5C59,INVALC,INVALC,0x655F,0x5C56,
-	INVALC,0x5C58,0x5C55,INVALC,INVALC,0x5A58,0x5C53,0x5C57,
-	0x6561,INVALC,INVALC,INVALC,0x5F53,INVALC,INVALC,INVALC,
-	0x5F54,0x6039,INVALC,INVALC,0x6143,0x6142,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2D69,INVALC,
-	INVALC,INVALC,0x3D22,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2D6B,INVALC,INVALC,INVALC,
-	0x297C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x425D,INVALC,
-	0x425C,0x425B,INVALC,INVALC,INVALC,0x4D2E,INVALC,0x4D2D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2664,0x2A21,0x2A22,INVALC,
-	0x2A23,INVALC,INVALC,INVALC,INVALC,0x2D6D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3236,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3D24,0x3D23,INVALC,INVALC,INVALC,0x3D25,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4775,INVALC,INVALC,INVALC,
-	INVALC,0x4D2F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x617B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x242C,0x242D,INVALC,INVALC,INVALC,0x266B,INVALC,
-	INVALC,0x2669,INVALC,0x2666,0x2667,INVALC,0x266A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2668,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2A26,INVALC,0x2A2A,
-	INVALC,INVALC,INVALC,0x2A27,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2A28,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2D75,INVALC,INVALC,0x2D74,INVALC,0x2D70,
-	INVALC,INVALC,INVALC,INVALC,0x2D73,0x2D71,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3238,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 116, Array index 0x2600 */
-	INVALC,INVALC,0x3239,INVALC,INVALC,INVALC,0x3D26,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x373B,INVALC,
-	0x373A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3739,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D27,INVALC,INVALC,INVALC,
-	0x3D2E,INVALC,0x3D29,0x3D2B,0x3D2A,INVALC,0x4261,0x3D2D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D28,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x425F,INVALC,INVALC,INVALC,INVALC,0x4262,0x6562,
-	0x6563,INVALC,INVALC,0x4D30,INVALC,INVALC,INVALC,0x4779,
-	INVALC,INVALC,INVALC,0x4778,0x477A,0x4777,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5549,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x225A,0x216B,INVALC,0x242F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x266E,INVALC,INVALC,INVALC,0x2A33,INVALC,0x2A2D,INVALC,
-	INVALC,INVALC,INVALC,0x2A2C,INVALC,INVALC,INVALC,0x2A2B,
-	INVALC,INVALC,0x2A32,INVALC,INVALC,INVALC,INVALC,0x2A2F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2D78,INVALC,INVALC,
-	INVALC,0x2D7B,INVALC,INVALC,0x2D77,INVALC,INVALC,INVALC,
-	INVALC,0x2D7A,INVALC,INVALC,INVALC,INVALC,0x2D7E,0x2D79,
-	0x2D7C,INVALC,INVALC,INVALC,INVALC,0x323E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3240,
-	INVALC,0x3247,0x323C,INVALC,0x3246,INVALC,0x3241,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x323D,INVALC,INVALC,0x6564,
-	INVALC,INVALC,INVALC,0x373D,INVALC,INVALC,INVALC,0x3D38,
-	INVALC,0x323F,INVALC,0x3740,INVALC,INVALC,INVALC,INVALC,
-	/* Block 117, Array index 0x2700 */
-	INVALC,INVALC,0x373C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6565,INVALC,0x3D36,0x3D3A,INVALC,0x3D2F,
-	0x3D3B,0x3D32,INVALC,INVALC,0x3D39,INVALC,0x426D,0x3D35,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4264,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D33,0x3D3C,INVALC,0x6566,0x3D37,0x4268,0x4275,INVALC,
-	INVALC,INVALC,INVALC,0x426F,INVALC,0x4274,INVALC,0x426E,
-	0x4266,0x4271,INVALC,INVALC,0x4273,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4267,INVALC,INVALC,0x426B,INVALC,
-	0x4270,INVALC,INVALC,INVALC,INVALC,0x426A,INVALC,INVALC,
-	0x4825,0x477E,INVALC,INVALC,INVALC,0x477C,0x477D,INVALC,
-	0x4822,INVALC,INVALC,0x4821,0x477B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4827,INVALC,0x4823,INVALC,
-	INVALC,INVALC,0x4D31,0x4D3B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D39,INVALC,0x4D36,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4D35,0x6568,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4D3A,INVALC,INVALC,0x516A,INVALC,
-	INVALC,0x6375,INVALC,0x5167,INVALC,0x516C,INVALC,INVALC,
-	INVALC,INVALC,0x516B,INVALC,0x6567,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x554F,INVALC,0x554B,INVALC,
-	INVALC,INVALC,INVALC,0x554D,0x6569,INVALC,INVALC,INVALC,
-	INVALC,0x582F,INVALC,INVALC,0x5830,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5A5A,INVALC,INVALC,0x5A5C,
-	0x5A5D,0x5A5B,INVALC,INVALC,0x5C5E,0x5C5C,0x5C5F,INVALC,
-	0x5C5D,0x5C60,INVALC,0x5E3D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2E22,INVALC,0x2E21,INVALC,0x2E24,
-	INVALC,INVALC,INVALC,0x3248,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3D3D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 118, Array index 0x2800 */
-	INVALC,0x4277,INVALC,INVALC,INVALC,INVALC,0x4828,INVALC,
-	INVALC,0x4D3D,0x516D,INVALC,INVALC,INVALC,0x516E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3744,INVALC,INVALC,0x4278,INVALC,
-	INVALC,INVALC,INVALC,0x3745,0x3D3E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2A37,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2A38,0x2A35,INVALC,0x2A36,INVALC,0x2E27,INVALC,
-	INVALC,0x2E25,0x2E28,INVALC,INVALC,0x2E2A,INVALC,INVALC,
-	0x2E26,INVALC,INVALC,INVALC,INVALC,0x324E,0x324D,0x3250,
-	0x324F,INVALC,INVALC,INVALC,INVALC,INVALC,0x3251,INVALC,
-	INVALC,0x3746,INVALC,INVALC,INVALC,INVALC,INVALC,0x3749,
-	0x3747,INVALC,INVALC,INVALC,INVALC,0x3D43,0x3D42,INVALC,
-	INVALC,0x3D44,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x427B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5170,INVALC,0x5552,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C62,INVALC,INVALC,INVALC,INVALC,0x3D45,INVALC,
-	INVALC,INVALC,0x225B,0x2673,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2A3A,INVALC,INVALC,0x2A3B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2E2B,INVALC,
-	0x2E2F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3257,INVALC,INVALC,0x3255,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3252,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x374A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3D47,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x427C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 119, Array index 0x2900 */
-	INVALC,INVALC,0x427D,INVALC,INVALC,INVALC,INVALC,0x482B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4829,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5171,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5173,0x5172,
-	INVALC,INVALC,INVALC,0x5174,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5555,0x5553,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5554,0x5834,
-	INVALC,0x5833,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5832,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E3F,
-	0x5E3E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x603B,
-	INVALC,INVALC,INVALC,0x656A,INVALC,INVALC,0x225C,0x656B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2674,INVALC,INVALC,0x2676,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x374D,INVALC,INVALC,INVALC,0x3D4C,INVALC,INVALC,0x427E,
-	0x4321,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5176,INVALC,0x5556,INVALC,0x5557,INVALC,INVALC,
-	INVALC,0x5A5E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3D4D,INVALC,INVALC,INVALC,0x4830,
-	INVALC,0x482E,INVALC,INVALC,0x656C,INVALC,INVALC,INVALC,
-	0x2677,0x2678,INVALC,INVALC,INVALC,INVALC,INVALC,0x2E32,
-	INVALC,INVALC,INVALC,0x325A,0x325B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3750,0x3752,0x3751,
-	INVALC,0x3D4F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4831,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5835,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2E35,INVALC,0x2E33,
-	/* Block 120, Array index 0x2A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x626C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3264,0x325F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x325E,INVALC,
-	0x3268,INVALC,INVALC,INVALC,INVALC,INVALC,0x3759,INVALC,
-	INVALC,0x3267,INVALC,INVALC,0x3265,INVALC,0x3755,INVALC,
-	INVALC,INVALC,0x325C,0x3263,INVALC,INVALC,INVALC,INVALC,
-	0x3753,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3262,
-	0x3757,INVALC,0x3D56,0x3D53,INVALC,INVALC,INVALC,INVALC,
-	0x3D51,0x3D52,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4327,INVALC,INVALC,INVALC,INVALC,
-	0x4328,INVALC,INVALC,INVALC,INVALC,0x4325,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4326,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4839,INVALC,INVALC,0x4833,0x4836,0x4835,0x4834,
-	0x4838,INVALC,0x483B,0x483D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D44,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4D46,INVALC,INVALC,INVALC,INVALC,INVALC,0x517B,INVALC,
-	0x5179,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5559,INVALC,0x5558,INVALC,
-	INVALC,0x555B,INVALC,INVALC,INVALC,INVALC,INVALC,0x555C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5836,0x5838,INVALC,INVALC,INVALC,INVALC,0x583B,INVALC,
-	0x583A,0x5839,INVALC,INVALC,INVALC,0x5A60,0x5A5F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5E42,INVALC,INVALC,INVALC,INVALC,0x6432,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3269,INVALC,0x3D57,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2E36,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x267B,0x267C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 121, Array index 0x2B00 */
-	INVALC,INVALC,INVALC,INVALC,0x2E39,INVALC,INVALC,0x2E3B,
-	0x2E3E,INVALC,0x2E37,0x2E3A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2E3D,INVALC,INVALC,
-	INVALC,0x656D,INVALC,0x656E,INVALC,INVALC,0x667C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x326C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x326D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x656F,INVALC,INVALC,
-	INVALC,INVALC,0x3762,INVALC,INVALC,INVALC,0x3763,0x375D,
-	INVALC,INVALC,INVALC,0x375F,INVALC,INVALC,INVALC,0x3761,
-	INVALC,0x3760,INVALC,0x6570,0x6571,INVALC,INVALC,INVALC,
-	0x6572,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D5C,
-	INVALC,INVALC,INVALC,0x3D59,INVALC,INVALC,0x3D5D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D5A,INVALC,
-	0x4331,INVALC,0x432D,INVALC,INVALC,0x432E,INVALC,INVALC,
-	INVALC,0x4337,0x4329,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4335,INVALC,0x432B,0x4330,INVALC,0x4334,INVALC,INVALC,
-	0x432A,INVALC,0x4336,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x483E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x483F,0x4845,
-	INVALC,0x4844,INVALC,INVALC,INVALC,INVALC,INVALC,0x6573,
-	0x4840,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4D4A,INVALC,0x4D4D,INVALC,INVALC,INVALC,0x4D48,0x4D4C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D4B,0x4D49,INVALC,INVALC,0x5221,INVALC,
-	0x6574,INVALC,INVALC,INVALC,0x5224,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5222,INVALC,INVALC,0x6575,INVALC,
-	0x5560,0x5562,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5561,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 122, Array index 0x2C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5843,0x583E,
-	0x5840,INVALC,0x583F,0x583C,INVALC,0x5842,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5844,INVALC,INVALC,
-	0x5A61,INVALC,0x5A62,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5A63,INVALC,0x6576,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E45,INVALC,
-	0x5E43,INVALC,0x5E44,INVALC,INVALC,INVALC,INVALC,0x603C,
-	INVALC,INVALC,INVALC,INVALC,0x2433,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6577,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x326F,0x3270,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3272,INVALC,INVALC,INVALC,0x3D5E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3766,INVALC,0x3765,INVALC,
-	INVALC,0x3D5F,INVALC,INVALC,INVALC,0x3D64,0x3D62,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4338,INVALC,
-	0x433D,INVALC,INVALC,0x4339,0x3D63,INVALC,0x6578,0x4848,
-	INVALC,0x4847,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6579,INVALC,INVALC,INVALC,0x4D50,0x4D51,0x4D4F,
-	INVALC,INVALC,INVALC,0x657A,INVALC,0x5226,INVALC,INVALC,
-	INVALC,0x5227,INVALC,INVALC,INVALC,INVALC,INVALC,0x5845,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x603D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x657B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2A3E,0x2A3D,INVALC,0x2A3F,0x2A42,
-	INVALC,INVALC,0x2A44,INVALC,0x654C,INVALC,INVALC,INVALC,
-	0x2E42,INVALC,INVALC,0x2E40,0x2E41,INVALC,INVALC,0x2E43,
-	INVALC,0x3274,0x3273,0x3279,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3276,0x327B,INVALC,INVALC,0x3277,INVALC,INVALC,
-	0x3278,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x327C,0x3769,0x3767,0x376B,INVALC,0x376A,INVALC,INVALC,
-	INVALC,0x376C,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D65,
-	/* Block 123, Array index 0x2D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D66,
-	INVALC,0x3D69,INVALC,INVALC,INVALC,INVALC,0x3D68,0x4341,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4344,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6524,INVALC,INVALC,
-	INVALC,0x484B,0x484D,INVALC,0x4850,0x484F,INVALC,INVALC,
-	INVALC,INVALC,0x4852,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4D55,INVALC,0x4D56,INVALC,INVALC,INVALC,0x4D5A,INVALC,
-	INVALC,0x4D53,0x4D57,INVALC,INVALC,0x522A,INVALC,INVALC,
-	INVALC,0x5564,INVALC,INVALC,INVALC,INVALC,INVALC,0x522C,
-	INVALC,INVALC,INVALC,0x5229,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5A66,INVALC,0x5A65,INVALC,
-	INVALC,INVALC,0x5A67,INVALC,INVALC,INVALC,INVALC,0x5C64,
-	INVALC,INVALC,0x6076,0x6077,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2E44,0x2E47,INVALC,INVALC,
-	INVALC,INVALC,0x2E49,0x2E48,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3772,INVALC,0x3771,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3770,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4346,INVALC,INVALC,0x4347,INVALC,INVALC,0x657C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4D5B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x522F,INVALC,0x522E,INVALC,INVALC,
-	INVALC,INVALC,0x5568,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5E49,0x5E48,INVALC,INVALC,0x267E,0x2721,INVALC,0x2A47,
-	0x2E4E,INVALC,0x2E4F,0x2E4D,0x2E4B,0x2E4C,INVALC,INVALC,
-	INVALC,INVALC,0x3323,0x3326,0x3327,0x3324,INVALC,INVALC,
-	INVALC,0x3773,0x3D71,INVALC,INVALC,INVALC,INVALC,0x3D70,
-	INVALC,0x4349,0x434A,INVALC,0x4854,INVALC,INVALC,INVALC,
-	0x4855,0x5230,0x5569,0x556A,INVALC,0x5849,INVALC,INVALC,
-	0x5F55,INVALC,INVALC,INVALC,0x2E51,INVALC,0x2E50,INVALC,
-	/* Block 124, Array index 0x2E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x332B,INVALC,0x332A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x332C,INVALC,0x3778,0x3779,
-	INVALC,INVALC,INVALC,INVALC,0x3777,INVALC,INVALC,0x377B,
-	INVALC,0x3776,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x632D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x377A,0x657D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3D7B,0x3D78,0x3D75,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3D79,INVALC,0x3D72,INVALC,0x3D76,
-	INVALC,0x657E,INVALC,INVALC,INVALC,INVALC,0x434F,INVALC,
-	INVALC,INVALC,0x434C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4355,INVALC,INVALC,0x434D,0x3D77,INVALC,INVALC,0x4354,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4351,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4856,INVALC,0x4858,INVALC,INVALC,0x4860,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x485A,0x485E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4857,0x485D,
-	INVALC,INVALC,INVALC,0x485C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D5C,INVALC,
-	INVALC,INVALC,0x4D65,0x4D5D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D60,
-	INVALC,INVALC,0x6367,0x6366,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4D63,INVALC,INVALC,
-	0x6621,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5233,0x5234,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x556D,INVALC,
-	INVALC,INVALC,0x556B,INVALC,0x556E,INVALC,INVALC,INVALC,
-	/* Block 125, Array index 0x2F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5570,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5571,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x556F,INVALC,0x5850,0x584E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5851,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x584C,0x6622,
-	INVALC,INVALC,0x6623,INVALC,0x5A6F,0x5A6E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6624,INVALC,0x5C66,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C65,INVALC,INVALC,0x6625,INVALC,
-	INVALC,0x5E4C,INVALC,INVALC,INVALC,INVALC,0x5E4B,INVALC,
-	0x5F58,INVALC,INVALC,INVALC,INVALC,0x5F57,0x603F,INVALC,
-	INVALC,INVALC,0x603E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6626,INVALC,INVALC,INVALC,INVALC,0x6144,INVALC,INVALC,
-	INVALC,0x623A,INVALC,INVALC,0x2A49,INVALC,0x2A48,0x2E52,
-	INVALC,INVALC,INVALC,0x2E54,0x2E53,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3331,INVALC,INVALC,0x332E,0x3330,
-	INVALC,INVALC,INVALC,0x3332,INVALC,INVALC,0x332D,INVALC,
-	INVALC,INVALC,INVALC,0x377D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x377E,0x3821,0x383E,0x3822,INVALC,INVALC,INVALC,
-	0x3E21,INVALC,INVALC,INVALC,0x3E23,INVALC,0x3E22,0x3D7E,
-	INVALC,0x6627,INVALC,INVALC,INVALC,INVALC,0x4358,INVALC,
-	0x435C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4862,
-	0x4861,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D6F,0x4D71,0x4D6D,INVALC,0x4D70,0x4D73,
-	INVALC,0x4D72,INVALC,INVALC,INVALC,0x4D6E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5237,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5575,0x5574,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5239,INVALC,0x5855,INVALC,INVALC,0x5854,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6628,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6169,INVALC,0x6040,INVALC,INVALC,
-	INVALC,INVALC,0x2722,INVALC,0x2A4B,INVALC,INVALC,0x2A4A,
-	/* Block 126, Array index 0x3000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3337,0x333B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3829,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3826,INVALC,INVALC,0x3827,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x382E,0x3824,INVALC,INVALC,0x382B,0x3E34,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3E29,
-	INVALC,0x3E26,0x3E2E,INVALC,INVALC,0x3E2F,INVALC,INVALC,
-	0x3E28,INVALC,INVALC,INVALC,0x3E2C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E2A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E24,0x3E35,0x3E33,INVALC,
-	0x4367,INVALC,INVALC,INVALC,INVALC,INVALC,0x3E2B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4366,
-	INVALC,0x4369,0x4360,0x4362,INVALC,INVALC,INVALC,INVALC,
-	0x435E,INVALC,INVALC,INVALC,INVALC,0x4364,INVALC,0x4368,
-	0x436A,0x4363,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4874,INVALC,INVALC,INVALC,
-	0x486D,INVALC,INVALC,0x486E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4870,INVALC,INVALC,0x4869,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4868,INVALC,INVALC,INVALC,INVALC,0x4871,INVALC,0x4873,
-	0x6629,0x486B,INVALC,0x662B,INVALC,INVALC,0x4E22,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4D7C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D78,INVALC,0x4E24,0x4E2F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E2E,INVALC,0x4D77,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E2B,INVALC,INVALC,
-	0x4D75,INVALC,INVALC,INVALC,0x4E28,0x4E29,0x4E25,0x4E2C,
-	/* Block 127, Array index 0x3100 */
-	0x4E27,0x4D7E,0x4D7D,INVALC,INVALC,INVALC,INVALC,0x662A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x523B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5240,0x523F,
-	INVALC,INVALC,INVALC,INVALC,0x5579,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x557A,INVALC,0x5859,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x585B,INVALC,0x5858,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x662C,INVALC,0x585A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5A72,INVALC,0x5A74,INVALC,
-	INVALC,0x5A75,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C6C,
-	INVALC,INVALC,INVALC,INVALC,0x5E53,0x5E50,INVALC,INVALC,
-	INVALC,0x5E51,INVALC,INVALC,INVALC,INVALC,0x5E52,INVALC,
-	INVALC,INVALC,0x5F5A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6235,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 128, Array index 0x3200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3831,INVALC,INVALC,INVALC,INVALC,
-	0x662D,0x4877,INVALC,INVALC,INVALC,INVALC,0x557D,0x585C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F5B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2A4E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x333C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4878,
-	INVALC,0x4879,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4E30,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6422,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2E5D,
-	INVALC,INVALC,INVALC,0x333D,INVALC,INVALC,INVALC,0x333F,
-	INVALC,0x333E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x436E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E31,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x585D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3342,INVALC,0x3343,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3E37,INVALC,INVALC,0x3E38,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4372,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E32,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x557E,INVALC,
-	INVALC,INVALC,0x5861,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 129, Array index 0x3300 */
-	INVALC,INVALC,0x667B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3836,INVALC,0x3344,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3837,INVALC,INVALC,0x3839,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4922,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5621,INVALC,INVALC,0x5862,0x5C6F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3349,0x3348,INVALC,INVALC,INVALC,
-	0x3347,0x662F,INVALC,INVALC,0x383D,0x383C,INVALC,INVALC,
-	INVALC,0x383B,INVALC,INVALC,INVALC,INVALC,0x3E3C,INVALC,
-	INVALC,INVALC,INVALC,0x6729,INVALC,INVALC,INVALC,0x4373,
-	INVALC,0x6356,INVALC,0x4923,INVALC,INVALC,INVALC,0x4926,
-	0x3E3B,0x4925,INVALC,0x6630,INVALC,0x4E34,0x4E36,INVALC,
-	0x4E37,INVALC,0x4E35,0x4E38,INVALC,INVALC,0x5243,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5622,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C70,0x5C71,0x5C72,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2435,0x2436,INVALC,
-	INVALC,0x2724,INVALC,INVALC,0x2726,INVALC,INVALC,0x2725,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2723,
-	INVALC,INVALC,INVALC,INVALC,0x2A56,INVALC,0x2A5B,0x2A58,
-	0x2A4F,INVALC,INVALC,INVALC,0x2A59,INVALC,INVALC,INVALC,
-	0x2A52,INVALC,INVALC,0x2A54,INVALC,INVALC,0x2A57,INVALC,
-	INVALC,INVALC,INVALC,0x6631,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2E66,INVALC,
-	INVALC,INVALC,INVALC,0x2E60,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2E61,0x2E5E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2E65,
-	INVALC,INVALC,0x2E64,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x334C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x334A,0x3352,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x334B,
-	/* Block 130, Array index 0x3400 */
-	INVALC,INVALC,INVALC,0x334E,0x334D,INVALC,INVALC,0x334F,
-	INVALC,0x2E63,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E44,INVALC,INVALC,0x3849,
-	INVALC,INVALC,0x3847,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x632E,INVALC,0x3841,INVALC,INVALC,INVALC,0x3842,INVALC,
-	INVALC,0x3845,INVALC,INVALC,0x3848,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3E3E,INVALC,INVALC,INVALC,INVALC,
-	0x3E43,0x3E45,0x3E41,INVALC,INVALC,0x3E3D,INVALC,INVALC,
-	0x3E40,0x3E42,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x437B,INVALC,0x437E,
-	INVALC,INVALC,INVALC,0x4375,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4376,INVALC,0x4377,0x4423,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x437C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4422,INVALC,INVALC,
-	INVALC,0x4927,INVALC,INVALC,0x492A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4E3B,0x4E3D,0x4E39,INVALC,0x4E3C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E3A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5249,INVALC,INVALC,0x5247,INVALC,0x5244,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5623,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5624,INVALC,INVALC,INVALC,INVALC,INVALC,0x5865,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5A77,INVALC,0x5A78,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3E47,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3E48,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 131, Array index 0x3500 */
-	INVALC,INVALC,INVALC,0x3E49,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2A5D,INVALC,
-	INVALC,INVALC,INVALC,0x492B,INVALC,INVALC,INVALC,INVALC,
-	0x524A,0x5868,0x5A79,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2E68,INVALC,INVALC,0x3357,
-	INVALC,0x3358,INVALC,INVALC,INVALC,0x3355,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4426,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6634,INVALC,0x492D,INVALC,0x492E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5A7A,INVALC,INVALC,0x5A7B,INVALC,INVALC,
-	INVALC,INVALC,0x5E55,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A7C,INVALC,
-	INVALC,INVALC,INVALC,0x2438,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2728,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2729,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x272B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2A60,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2A6B,INVALC,
-	INVALC,INVALC,0x2A66,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2A6C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2A5E,INVALC,INVALC,INVALC,
-	INVALC,0x2A68,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2E76,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2E6A,INVALC,INVALC,INVALC,INVALC,0x2E6B,INVALC,INVALC,
-	INVALC,INVALC,0x2E78,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2E72,INVALC,INVALC,INVALC,INVALC,0x2E74,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2E69,
-	0x2E6E,INVALC,INVALC,INVALC,0x2E6F,0x2E7A,INVALC,INVALC,
-	/* Block 132, Array index 0x3600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2E79,INVALC,INVALC,0x2E77,INVALC,
-	0x6635,INVALC,0x6637,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3362,INVALC,INVALC,INVALC,INVALC,0x384D,INVALC,0x3359,
-	INVALC,0x335F,INVALC,0x385B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2A5F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3E57,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x335A,
-	0x3363,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6636,0x2D33,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x384E,0x3851,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3854,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3850,INVALC,INVALC,INVALC,0x384F,0x385D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3855,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x385E,INVALC,INVALC,0x3857,
-	INVALC,0x3852,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3858,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x385F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3E5E,INVALC,INVALC,
-	INVALC,INVALC,0x3E4F,0x3E59,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3E4D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3E5F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3E4B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 133, Array index 0x3700 */
-	0x3E52,INVALC,0x3E5C,INVALC,INVALC,0x3E5A,INVALC,INVALC,
-	0x3E50,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E58,INVALC,0x3E5D,0x3E56,
-	0x3E4E,INVALC,INVALC,INVALC,INVALC,INVALC,0x6639,0x3E5B,
-	INVALC,0x6638,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x442D,INVALC,INVALC,INVALC,0x4431,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x443A,INVALC,
-	INVALC,0x4435,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x442C,INVALC,0x443E,INVALC,INVALC,INVALC,INVALC,0x4427,
-	INVALC,INVALC,INVALC,0x4433,INVALC,0x443F,INVALC,INVALC,
-	0x4440,INVALC,INVALC,INVALC,0x4432,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4438,INVALC,0x4430,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x443C,0x442F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x442E,INVALC,INVALC,INVALC,0x442A,
-	0x4439,INVALC,INVALC,0x443B,0x4428,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4935,0x4944,INVALC,0x4933,0x4938,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x493C,INVALC,0x4939,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4942,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x493B,INVALC,0x493A,INVALC,0x4941,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4932,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4936,INVALC,INVALC,INVALC,INVALC,
-	0x4436,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x493F,INVALC,INVALC,
-	0x493E,INVALC,0x4943,INVALC,INVALC,INVALC,0x663B,INVALC,
-	INVALC,0x663C,0x663A,INVALC,0x493D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E4F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E44,INVALC,INVALC,
-	0x4E42,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 134, Array index 0x3800 */
-	INVALC,0x4E40,INVALC,0x4E4C,0x4E46,0x4E54,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E4B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E4D,0x4E4E,0x4E52,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x525A,
-	INVALC,INVALC,0x5252,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5259,0x5250,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5258,INVALC,0x5254,INVALC,INVALC,0x5256,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x524F,
-	0x5255,INVALC,INVALC,0x663D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x562B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5628,0x5629,INVALC,INVALC,INVALC,0x562D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x562C,0x5630,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x586C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x586E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x586F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x586B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x663E,INVALC,0x5A7E,INVALC,
-	INVALC,INVALC,INVALC,0x5A7D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B22,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C7B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5B25,0x663F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5C76,INVALC,INVALC,INVALC,
-	/* Block 135, Array index 0x3900 */
-	INVALC,INVALC,0x5C78,0x5C7C,INVALC,INVALC,INVALC,INVALC,
-	0x5D22,INVALC,INVALC,INVALC,INVALC,0x5C7E,INVALC,0x5D23,
-	0x5C77,INVALC,INVALC,0x5D21,INVALC,0x5E5B,0x5E5A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E5C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5E58,INVALC,INVALC,0x5E56,INVALC,INVALC,INVALC,0x5E57,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6640,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6043,INVALC,INVALC,
-	INVALC,0x602F,0x6146,INVALC,INVALC,0x6641,INVALC,INVALC,
-	INVALC,0x6147,0x617C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3863,
-	0x3860,INVALC,0x3861,INVALC,INVALC,0x3E61,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x272D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6642,INVALC,INVALC,0x2F23,0x2E7C,INVALC,
-	0x2E7E,INVALC,INVALC,INVALC,INVALC,0x2F24,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3369,INVALC,INVALC,INVALC,
-	INVALC,0x336C,INVALC,INVALC,INVALC,INVALC,INVALC,0x336F,
-	INVALC,INVALC,0x336E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x336B,INVALC,INVALC,INVALC,0x336A,
-	0x3370,INVALC,INVALC,INVALC,INVALC,INVALC,0x336D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3866,INVALC,
-	INVALC,INVALC,0x3864,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3E62,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3E63,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3E68,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4444,0x4445,INVALC,0x4449,
-	/* Block 136, Array index 0x3A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4446,0x4448,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x494F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x494A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4945,INVALC,
-	INVALC,0x494C,INVALC,INVALC,INVALC,0x4949,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x494E,INVALC,0x494B,
-	INVALC,INVALC,0x6643,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E5D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E59,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x525B,0x525D,INVALC,INVALC,0x525F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5262,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x525E,INVALC,INVALC,INVALC,0x6645,INVALC,INVALC,
-	INVALC,0x6644,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x563A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5639,INVALC,INVALC,INVALC,INVALC,INVALC,0x563B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5636,0x5634,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5B28,0x5876,INVALC,
-	INVALC,INVALC,0x5878,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5873,INVALC,INVALC,INVALC,INVALC,0x5874,INVALC,
-	0x5875,INVALC,INVALC,INVALC,INVALC,0x6646,INVALC,INVALC,
-	0x5B2C,INVALC,INVALC,INVALC,INVALC,0x5B27,INVALC,INVALC,
-	/* Block 137, Array index 0x3B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B29,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5877,0x5B2B,
-	INVALC,INVALC,0x5D25,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D24,INVALC,0x5E5D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F5F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6045,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6647,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2F26,INVALC,INVALC,0x386A,0x3E6A,0x3E69,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3371,
-	0x6648,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x444D,INVALC,INVALC,INVALC,0x4E5F,INVALC,0x5263,0x5264,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2F27,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3374,INVALC,
-	INVALC,INVALC,INVALC,0x3377,INVALC,INVALC,INVALC,INVALC,
-	0x3372,INVALC,0x3373,0x3375,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3376,INVALC,INVALC,0x6649,
-	INVALC,INVALC,0x3872,INVALC,INVALC,INVALC,INVALC,0x386E,
-	0x3874,INVALC,INVALC,INVALC,0x386C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x386B,INVALC,INVALC,INVALC,
-	0x3873,INVALC,INVALC,0x386D,INVALC,0x386F,0x3871,INVALC,
-	INVALC,0x3870,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E70,0x3E72,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3E6D,INVALC,INVALC,INVALC,0x3E6F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x444E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x444F,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E60,INVALC,
-	INVALC,0x4959,0x4952,INVALC,INVALC,0x4957,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4954,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4951,
-	/* Block 138, Array index 0x3C00 */
-	0x4956,INVALC,INVALC,0x4958,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E61,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E62,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5265,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5640,INVALC,INVALC,INVALC,INVALC,INVALC,0x563F,
-	0x563D,INVALC,INVALC,0x5642,INVALC,INVALC,INVALC,INVALC,
-	0x5879,INVALC,0x587A,INVALC,INVALC,0x587C,0x587B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x664A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5D29,INVALC,0x5D28,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6149,INVALC,INVALC,INVALC,INVALC,0x617D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x664B,INVALC,INVALC,0x5B2F,
-	INVALC,0x6046,0x614A,INVALC,0x2F29,INVALC,INVALC,INVALC,
-	INVALC,0x3876,0x3875,INVALC,0x3877,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3E74,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E65,INVALC,0x5266,
-	INVALC,0x4E64,INVALC,0x5646,INVALC,INVALC,INVALC,INVALC,
-	0x587E,0x587D,INVALC,0x5921,INVALC,0x5B31,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D2A,0x5E61,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4454,
-	INVALC,INVALC,0x495C,INVALC,INVALC,INVALC,0x4E66,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5B32,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 139, Array index 0x3D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2F2A,0x2F2C,INVALC,
-	INVALC,INVALC,INVALC,0x337B,INVALC,0x337A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x337C,INVALC,INVALC,0x387E,INVALC,INVALC,INVALC,
-	0x3923,0x3929,INVALC,INVALC,INVALC,INVALC,0x3879,INVALC,
-	0x387B,0x3925,INVALC,0x3922,INVALC,INVALC,0x6330,INVALC,
-	INVALC,INVALC,0x387A,INVALC,INVALC,0x3E7C,INVALC,INVALC,
-	0x3E7D,INVALC,INVALC,INVALC,INVALC,0x3F24,INVALC,INVALC,
-	INVALC,INVALC,0x3E7E,0x3E75,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3F21,INVALC,0x3F23,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3E78,INVALC,INVALC,0x3F22,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4460,0x4459,INVALC,0x4463,
-	INVALC,INVALC,0x4455,INVALC,INVALC,INVALC,INVALC,0x4458,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x445B,INVALC,INVALC,INVALC,INVALC,0x445C,0x4461,INVALC,
-	0x4456,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x445D,INVALC,INVALC,INVALC,INVALC,INVALC,0x495F,INVALC,
-	0x4964,INVALC,INVALC,INVALC,0x4963,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x495E,0x4962,0x496B,INVALC,0x4968,
-	INVALC,INVALC,0x4960,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4965,INVALC,INVALC,0x4966,INVALC,INVALC,0x4E74,
-	INVALC,0x4E67,INVALC,0x4E72,0x4E70,0x4E6E,INVALC,0x4E6C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E73,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4E75,INVALC,0x4E69,INVALC,0x4E6A,INVALC,
-	0x4E76,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x526A,INVALC,0x526B,INVALC,INVALC,
-	INVALC,0x4E6F,0x5267,INVALC,0x526E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5269,INVALC,INVALC,INVALC,0x5268,INVALC,INVALC,
-	/* Block 140, Array index 0x3E00 */
-	INVALC,INVALC,INVALC,0x664C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5649,INVALC,INVALC,0x564A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5648,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x592A,INVALC,INVALC,INVALC,0x5926,INVALC,INVALC,
-	INVALC,INVALC,0x5924,INVALC,0x5928,INVALC,INVALC,INVALC,
-	0x5923,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B34,
-	INVALC,INVALC,INVALC,0x5B35,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5B36,0x5D33,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D30,0x5D2C,INVALC,0x5D32,INVALC,INVALC,INVALC,
-	INVALC,0x5D2B,INVALC,INVALC,INVALC,INVALC,0x5D2E,INVALC,
-	INVALC,0x5C6D,INVALC,0x642D,INVALC,0x5E62,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E63,INVALC,INVALC,INVALC,
-	INVALC,0x5F61,INVALC,0x5F62,INVALC,INVALC,INVALC,0x6048,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6047,INVALC,INVALC,
-	0x6049,0x607B,INVALC,INVALC,INVALC,INVALC,INVALC,0x614B,
-	INVALC,INVALC,INVALC,0x616B,INVALC,0x617E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 141, Array index 0x3F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x392A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x564D,INVALC,INVALC,INVALC,0x5F64,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D34,0x664D,0x6221,INVALC,INVALC,INVALC,INVALC,
-	0x392D,INVALC,INVALC,0x392C,INVALC,INVALC,0x3F2A,INVALC,
-	0x3F29,INVALC,INVALC,0x4464,INVALC,INVALC,INVALC,0x496D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x592B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x392E,INVALC,0x3F2C,0x3F2B,
-	INVALC,INVALC,INVALC,0x3F2D,INVALC,INVALC,INVALC,0x634A,
-	0x4465,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E7A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x564F,INVALC,
-	INVALC,INVALC,INVALC,0x614D,INVALC,INVALC,INVALC,0x2F2E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3930,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3932,0x3931,INVALC,
-	INVALC,0x3F2F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4469,INVALC,INVALC,INVALC,0x4467,INVALC,INVALC,
-	0x4970,INVALC,INVALC,INVALC,0x4972,INVALC,0x4971,INVALC,
-	0x664E,INVALC,INVALC,0x4E7E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E7D,INVALC,0x4F22,INVALC,INVALC,INVALC,0x5275,
-	INVALC,INVALC,0x5273,INVALC,INVALC,INVALC,0x5651,0x5652,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 142, Array index 0x4000 */
-	INVALC,INVALC,INVALC,0x592E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5B38,0x664F,INVALC,0x6428,INVALC,
-	INVALC,0x5E65,0x5E66,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6650,INVALC,0x604A,INVALC,0x614E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3933,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x243A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3939,INVALC,0x3937,INVALC,0x3935,0x3938,
-	INVALC,INVALC,0x3F39,0x3F34,INVALC,INVALC,0x3F37,0x3F30,
-	0x3F33,INVALC,INVALC,0x3F38,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4975,
-	0x4973,INVALC,0x4974,INVALC,INVALC,0x4F26,INVALC,INVALC,
-	INVALC,INVALC,0x4F25,INVALC,0x4F23,INVALC,0x5277,INVALC,
-	INVALC,0x5931,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6651,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x393E,INVALC,0x393A,INVALC,INVALC,
-	0x393D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3F3F,0x3F3A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3F3B,INVALC,0x3F3E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x446B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 143, Array index 0x4100 */
-	INVALC,0x497B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x497A,INVALC,INVALC,0x4979,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F2C,INVALC,0x4F2B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x527E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x527B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x527C,INVALC,INVALC,0x5654,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5655,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5932,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5B3A,INVALC,INVALC,0x5B39,INVALC,INVALC,INVALC,INVALC,
-	0x5B3B,INVALC,INVALC,INVALC,INVALC,0x5B3C,INVALC,0x5B3D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D37,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x604B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6150,INVALC,INVALC,INVALC,INVALC,0x616C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x393F,INVALC,0x3940,
-	0x3F40,0x4473,INVALC,0x497D,0x497C,INVALC,0x4F30,0x4F32,
-	0x4F2F,0x4F31,INVALC,INVALC,0x6652,INVALC,INVALC,0x5935,
-	INVALC,0x5936,INVALC,0x5B3F,INVALC,INVALC,0x5D38,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6653,0x3941,INVALC,
-	INVALC,0x3947,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F45,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3F47,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3F44,0x3F46,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3F49,INVALC,INVALC,
-	/* Block 144, Array index 0x4200 */
-	INVALC,INVALC,INVALC,INVALC,0x4476,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F36,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F33,INVALC,INVALC,INVALC,INVALC,0x4F35,
-	INVALC,INVALC,INVALC,0x4F34,INVALC,0x5324,INVALC,INVALC,
-	0x5322,0x5321,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5325,0x5659,INVALC,INVALC,
-	INVALC,0x565A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5937,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E67,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6222,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3F4B,0x4477,INVALC,
-	0x4478,0x4A21,0x4A22,INVALC,0x4F37,0x5327,INVALC,0x5326,
-	INVALC,INVALC,0x6654,INVALC,0x5938,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4F39,INVALC,0x272F,INVALC,INVALC,
-	INVALC,0x243B,INVALC,INVALC,INVALC,INVALC,0x2730,INVALC,
-	INVALC,0x2733,INVALC,INVALC,INVALC,INVALC,INVALC,0x2731,
-	INVALC,INVALC,0x2A72,INVALC,0x2A70,INVALC,INVALC,0x2A74,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2A73,0x2A71,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2F31,
-	INVALC,0x2F32,INVALC,INVALC,INVALC,INVALC,INVALC,0x2F33,
-	INVALC,0x2F30,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3425,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 145, Array index 0x4300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3427,0x3426,INVALC,INVALC,INVALC,INVALC,0x394B,INVALC,
-	INVALC,INVALC,0x394A,0x394E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x394C,INVALC,INVALC,
-	0x3F4F,0x3F50,0x3F4D,0x3F4C,0x3F51,INVALC,INVALC,INVALC,
-	0x3F55,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3F56,
-	INVALC,INVALC,0x3F54,0x3F57,INVALC,INVALC,INVALC,INVALC,
-	0x447D,INVALC,INVALC,0x4479,INVALC,0x447C,0x447A,INVALC,
-	0x447B,INVALC,INVALC,INVALC,0x447E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4A24,INVALC,INVALC,INVALC,INVALC,0x4A27,
-	INVALC,0x4A26,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F3C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F3B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x593A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x225E,0x225D,INVALC,INVALC,0x243C,INVALC,
-	INVALC,INVALC,0x243D,INVALC,0x6655,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2735,INVALC,INVALC,INVALC,
-	0x2739,0x2734,INVALC,0x3951,INVALC,0x2A77,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2A75,
-	INVALC,0x2A78,INVALC,INVALC,0x2F35,INVALC,INVALC,INVALC,
-	0x2F38,INVALC,0x2F34,INVALC,0x2F3E,INVALC,0x2F37,INVALC,
-	INVALC,0x2F3C,INVALC,INVALC,INVALC,0x2F3B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3429,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x394F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x636C,0x3952,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 146, Array index 0x4400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3F59,INVALC,0x4523,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4524,INVALC,0x4525,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4A2A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x532B,
-	INVALC,INVALC,INVALC,INVALC,0x593C,0x593B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x342A,INVALC,INVALC,0x3955,INVALC,INVALC,INVALC,
-	INVALC,0x3954,INVALC,INVALC,0x6657,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4528,
-	INVALC,INVALC,INVALC,0x4527,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A2C,INVALC,
-	INVALC,INVALC,INVALC,0x4A2B,0x4A2D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F3F,INVALC,INVALC,INVALC,0x4F40,INVALC,0x532D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x532C,0x532F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x593D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E68,INVALC,INVALC,INVALC,0x607E,
-	INVALC,INVALC,INVALC,INVALC,0x616D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3430,INVALC,
-	INVALC,INVALC,INVALC,0x342D,INVALC,INVALC,0x342F,0x342E,
-	0x3431,INVALC,INVALC,INVALC,INVALC,0x3958,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3957,INVALC,0x3956,INVALC,INVALC,INVALC,0x3959,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3F5D,INVALC,
-	/* Block 147, Array index 0x4500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3F66,INVALC,INVALC,0x3F60,INVALC,INVALC,0x3F68,INVALC,
-	INVALC,INVALC,INVALC,0x3F69,INVALC,INVALC,INVALC,INVALC,
-	0x3F62,INVALC,INVALC,0x3F65,INVALC,INVALC,INVALC,INVALC,
-	0x3F5E,0x6659,0x3F63,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6658,INVALC,INVALC,INVALC,0x452E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x452B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4537,0x452F,INVALC,INVALC,INVALC,
-	INVALC,0x4539,INVALC,INVALC,0x4538,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x452A,INVALC,INVALC,
-	INVALC,0x452D,INVALC,INVALC,0x4531,0x4529,INVALC,0x4534,
-	INVALC,INVALC,0x4533,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4532,0x4535,INVALC,INVALC,0x4536,INVALC,
-	INVALC,INVALC,INVALC,0x665A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A34,INVALC,INVALC,0x4A35,INVALC,INVALC,INVALC,
-	INVALC,0x4A2F,INVALC,INVALC,INVALC,INVALC,INVALC,0x4530,
-	0x4A38,INVALC,0x4A33,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A39,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4A32,0x4A37,INVALC,
-	0x672A,0x4A31,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F42,0x4F50,INVALC,INVALC,INVALC,INVALC,0x4F43,0x4F41,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4F48,INVALC,0x4F49,INVALC,
-	INVALC,INVALC,0x4F4B,0x4F4E,0x4F44,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F51,INVALC,INVALC,0x4F45,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4F52,INVALC,0x4F4C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4F4D,0x665B,0x665C,0x4A30,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5335,INVALC,INVALC,
-	/* Block 148, Array index 0x4600 */
-	INVALC,INVALC,INVALC,0x533D,INVALC,0x533E,INVALC,0x5338,
-	INVALC,INVALC,0x5332,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5336,
-	INVALC,INVALC,INVALC,INVALC,0x5337,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x533B,INVALC,INVALC,INVALC,
-	0x533C,0x5339,0x533A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x665D,
-	INVALC,INVALC,0x665E,INVALC,INVALC,0x5331,INVALC,INVALC,
-	0x5665,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5666,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x565D,INVALC,0x5667,
-	INVALC,INVALC,0x5664,INVALC,INVALC,INVALC,0x565B,INVALC,
-	0x5668,0x565E,INVALC,0x566B,INVALC,INVALC,0x5661,INVALC,
-	INVALC,INVALC,0x5662,0x5663,0x565F,INVALC,INVALC,INVALC,
-	0x565C,INVALC,INVALC,INVALC,INVALC,0x5660,INVALC,0x566A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x665F,INVALC,
-	INVALC,INVALC,INVALC,0x5943,INVALC,INVALC,INVALC,INVALC,
-	0x5940,INVALC,INVALC,0x5942,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5949,INVALC,INVALC,INVALC,
-	0x593E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5944,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5946,INVALC,INVALC,0x5945,0x6661,0x6662,0x6660,INVALC,
-	INVALC,0x5B50,INVALC,INVALC,INVALC,0x5B44,0x5B45,INVALC,
-	INVALC,INVALC,INVALC,0x5B43,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5B48,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5B4D,INVALC,INVALC,INVALC,INVALC,
-	0x5B4F,INVALC,INVALC,INVALC,INVALC,0x5B4A,INVALC,INVALC,
-	INVALC,0x5B41,0x5B42,0x5B4E,INVALC,0x5B47,INVALC,0x6665,
-	INVALC,0x6663,0x6664,0x5D41,0x5E6A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 149, Array index 0x4700 */
-	INVALC,INVALC,0x5D43,INVALC,0x5D3C,0x5D3F,INVALC,INVALC,
-	0x5D3E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D3D,
-	INVALC,INVALC,0x5D44,0x5D45,0x5D47,INVALC,0x5D42,0x5D3A,
-	INVALC,INVALC,0x6666,0x6667,0x6668,INVALC,INVALC,0x5D46,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E6D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5F69,0x5F6E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F6A,0x5F6C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5F6B,INVALC,0x6052,INVALC,
-	0x6431,INVALC,0x6055,0x6054,0x6056,INVALC,INVALC,0x604F,
-	INVALC,0x6053,INVALC,INVALC,INVALC,0x6057,0x666A,0x6669,
-	INVALC,INVALC,INVALC,INVALC,0x6122,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x616F,0x6223,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6236,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 150, Array index 0x4800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6323,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2F40,INVALC,INVALC,INVALC,0x3432,INVALC,0x395C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3F6C,INVALC,0x666B,
-	INVALC,0x453C,0x453A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4A3D,INVALC,INVALC,INVALC,INVALC,0x4A3E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F53,
-	INVALC,INVALC,0x4F55,0x4F56,INVALC,INVALC,INVALC,INVALC,
-	0x5342,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5344,0x5340,INVALC,0x566D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x666C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x594B,
-	0x594A,INVALC,INVALC,INVALC,INVALC,0x5B53,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x666D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 151, Array index 0x4900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2143,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x273B,0x273A,
-	INVALC,0x273F,INVALC,0x273C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x273D,0x273E,INVALC,INVALC,0x2A79,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2A7C,INVALC,
-	INVALC,0x2A7B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3436,INVALC,
-	INVALC,0x3434,0x395E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3433,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3961,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3965,INVALC,0x3F71,INVALC,INVALC,INVALC,0x3F72,
-	INVALC,0x3F73,0x3F75,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F70,INVALC,INVALC,0x4540,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4542,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4A45,INVALC,0x4A46,
-	0x4A44,INVALC,INVALC,0x4F5A,INVALC,0x4F5B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5348,INVALC,0x5670,INVALC,0x566F,
-	INVALC,INVALC,0x5671,INVALC,INVALC,0x5D49,0x2A7D,0x5349,
-	INVALC,INVALC,0x6325,INVALC,INVALC,0x3439,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A47,0x4A49,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E70,INVALC,0x6125,0x622F,
-	INVALC,INVALC,INVALC,INVALC,0x3F7E,0x3F7C,0x3F7B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4546,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4547,INVALC,INVALC,INVALC,
-	/* Block 152, Array index 0x4A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F60,INVALC,0x5350,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x534D,0x534C,INVALC,0x5351,
-	INVALC,INVALC,0x5674,0x5675,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D4F,INVALC,0x5D4C,0x5D4E,INVALC,0x5E72,0x5E71,
-	INVALC,INVALC,INVALC,0x666E,0x5F71,INVALC,INVALC,INVALC,
-	0x5F72,0x6059,INVALC,INVALC,INVALC,0x6126,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x666F,INVALC,INVALC,
-	0x6245,0x2A7E,INVALC,INVALC,INVALC,0x4549,INVALC,INVALC,
-	INVALC,0x4A4C,INVALC,INVALC,INVALC,0x594F,INVALC,0x4021,
-	INVALC,INVALC,INVALC,0x2B21,0x4A4E,INVALC,INVALC,0x5E73,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4024,INVALC,0x4022,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x454B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F62,
-	INVALC,0x4F63,INVALC,INVALC,0x4F64,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5353,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x567A,INVALC,INVALC,INVALC,0x567B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5950,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5B5F,0x5B5D,INVALC,0x5B5E,0x5B60,INVALC,INVALC,
-	0x5D50,INVALC,0x5D51,INVALC,INVALC,0x5E75,0x5E74,INVALC,
-	0x5F73,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6128,INVALC,0x623B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5355,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5951,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5E76,INVALC,0x6129,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x454F,0x4F65,
-	INVALC,INVALC,0x5B61,INVALC,INVALC,0x4550,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5D53,INVALC,INVALC,INVALC,
-	/* Block 153, Array index 0x4B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4552,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4A54,0x4A55,INVALC,INVALC,
-	INVALC,0x4A52,0x4A56,INVALC,INVALC,INVALC,INVALC,0x4F69,
-	INVALC,INVALC,0x4F67,0x636E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F66,INVALC,INVALC,INVALC,0x535C,INVALC,
-	INVALC,0x5359,INVALC,0x535A,0x5228,INVALC,0x5358,INVALC,
-	INVALC,INVALC,0x535D,INVALC,0x535B,0x535F,INVALC,0x595B,
-	0x5726,INVALC,0x637B,INVALC,INVALC,INVALC,INVALC,0x5728,
-	INVALC,INVALC,INVALC,0x5959,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5956,0x5958,0x5B65,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x642A,INVALC,INVALC,INVALC,INVALC,0x5E78,INVALC,
-	0x5E77,INVALC,INVALC,INVALC,0x605D,0x605E,0x605C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5361,INVALC,0x572A,
-	INVALC,0x595C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D56,INVALC,INVALC,INVALC,0x5E7B,
-	0x5E79,INVALC,0x5E7A,INVALC,INVALC,0x6225,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E7C,0x6226,INVALC,INVALC,
-	INVALC,0x3967,INVALC,INVALC,0x6670,INVALC,0x3968,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x455B,INVALC,INVALC,INVALC,
-	0x402B,0x455C,INVALC,0x4554,INVALC,0x4559,INVALC,0x4557,
-	0x4A5D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4558,
-	/* Block 154, Array index 0x4C00 */
-	INVALC,0x4A5E,INVALC,INVALC,INVALC,INVALC,0x4A5B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x667A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F6B,INVALC,INVALC,0x5365,0x5366,INVALC,INVALC,
-	0x5364,INVALC,0x5362,0x5363,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5962,INVALC,
-	0x5961,0x5966,INVALC,0x5965,INVALC,INVALC,INVALC,INVALC,
-	0x5963,INVALC,0x6671,INVALC,0x5B69,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5D58,INVALC,0x5E7E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5F78,INVALC,INVALC,0x612A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x455F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5368,INVALC,0x5730,INVALC,0x5967,INVALC,INVALC,INVALC,
-	INVALC,0x5F21,0x6060,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A63,0x4A62,
-	0x4A66,INVALC,INVALC,INVALC,0x4A61,INVALC,0x4A60,0x4A6C,
-	0x4A64,INVALC,INVALC,INVALC,0x4A6A,INVALC,INVALC,INVALC,
-	0x4F73,INVALC,0x4F6D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F6E,INVALC,INVALC,INVALC,0x4F72,INVALC,
-	0x4F74,0x5370,INVALC,INVALC,INVALC,INVALC,0x5371,INVALC,
-	0x536B,INVALC,INVALC,0x536C,INVALC,INVALC,INVALC,0x536A,
-	INVALC,INVALC,INVALC,0x5734,INVALC,0x5737,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 155, Array index 0x4D00 */
-	0x5733,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x596A,INVALC,INVALC,INVALC,0x596B,INVALC,INVALC,INVALC,
-	0x596D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B6F,
-	0x5B6D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B6C,
-	INVALC,0x5B6E,INVALC,INVALC,INVALC,INVALC,0x5B6B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D5A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5F24,0x5F22,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F79,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6062,INVALC,INVALC,INVALC,0x6061,INVALC,INVALC,INVALC,
-	INVALC,0x6172,INVALC,0x6173,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x402F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4F77,0x4F76,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x573A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5D61,INVALC,INVALC,INVALC,
-	0x5D60,0x5D5E,INVALC,INVALC,INVALC,INVALC,0x5F25,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6174,
-	INVALC,0x6334,0x4A6E,INVALC,INVALC,0x5F7B,0x6063,INVALC,
-	0x4032,INVALC,0x4561,INVALC,0x4A6F,0x4A73,INVALC,INVALC,
-	0x4A71,0x4A70,0x4A72,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4F79,0x5375,INVALC,INVALC,
-	0x5374,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 156, Array index 0x4E00 */
-	0x573B,INVALC,0x573C,INVALC,INVALC,INVALC,INVALC,0x596F,
-	INVALC,0x5B71,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5F27,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6672,INVALC,INVALC,
-	INVALC,0x612C,INVALC,INVALC,INVALC,INVALC,0x4A75,INVALC,
-	INVALC,INVALC,0x5D62,INVALC,0x612E,0x6433,INVALC,INVALC,
-	0x6228,INVALC,INVALC,INVALC,0x573E,INVALC,INVALC,INVALC,
-	0x5D63,INVALC,INVALC,INVALC,INVALC,0x4562,INVALC,INVALC,
-	0x4A78,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x573F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D64,INVALC,INVALC,0x5F28,INVALC,INVALC,INVALC,0x612F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4563,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4F7E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F7C,INVALC,0x4F7B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F7D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5378,0x537A,INVALC,INVALC,INVALC,
-	INVALC,0x5423,INVALC,0x537C,0x5421,INVALC,0x5425,0x537D,
-	INVALC,INVALC,INVALC,INVALC,0x5379,INVALC,INVALC,INVALC,
-	0x6673,0x5744,INVALC,INVALC,INVALC,0x5745,INVALC,0x5740,
-	INVALC,INVALC,INVALC,0x5742,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5974,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5973,INVALC,INVALC,0x5B74,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5976,0x5975,0x5743,INVALC,INVALC,
-	INVALC,INVALC,0x5971,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B75,
-	INVALC,INVALC,INVALC,0x5B77,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5B79,INVALC,INVALC,INVALC,INVALC,0x5B7A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D6F,INVALC,
-	INVALC,0x5D71,INVALC,0x5D67,0x5D69,INVALC,0x5D6A,0x5D74,
-	/* Block 157, Array index 0x4F00 */
-	0x5D75,INVALC,0x5D6E,INVALC,0x5D68,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D66,INVALC,0x5D76,INVALC,INVALC,INVALC,
-	0x5D73,INVALC,INVALC,INVALC,INVALC,0x5D72,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D70,INVALC,INVALC,INVALC,0x5F2C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x642F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F2A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6025,INVALC,INVALC,
-	0x5F7E,INVALC,0x6023,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6022,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6065,
-	INVALC,0x6066,INVALC,0x6068,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6132,INVALC,INVALC,
-	INVALC,0x6133,INVALC,INVALC,INVALC,0x6134,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6159,INVALC,INVALC,0x615B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6175,INVALC,
-	INVALC,INVALC,INVALC,0x6241,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4564,INVALC,INVALC,0x4566,0x2F42,INVALC,0x4568,0x4567,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5027,INVALC,INVALC,INVALC,INVALC,INVALC,0x502A,INVALC,
-	/* Block 158, Array index 0x5000 */
-	INVALC,0x5024,0x502B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x542D,INVALC,0x5025,0x5022,INVALC,0x542A,
-	INVALC,INVALC,INVALC,0x542C,INVALC,INVALC,0x5436,INVALC,
-	INVALC,INVALC,0x5433,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5437,INVALC,INVALC,0x5429,INVALC,INVALC,0x5435,
-	INVALC,INVALC,0x5432,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x574D,INVALC,INVALC,
-	INVALC,0x5748,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x574A,INVALC,INVALC,INVALC,
-	INVALC,0x6675,INVALC,INVALC,INVALC,0x5979,0x597B,INVALC,
-	0x597D,INVALC,INVALC,INVALC,INVALC,0x597E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A22,INVALC,
-	INVALC,INVALC,INVALC,0x597A,INVALC,INVALC,0x5B7D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5C27,0x5C22,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C25,INVALC,
-	INVALC,INVALC,0x5B7E,INVALC,INVALC,INVALC,0x5C26,INVALC,
-	INVALC,INVALC,INVALC,0x5C24,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C23,INVALC,INVALC,INVALC,0x5D79,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5D7A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F35,INVALC,
-	0x5F31,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F32,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5F36,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x606C,INVALC,INVALC,INVALC,
-	/* Block 159, Array index 0x5100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6135,INVALC,INVALC,INVALC,INVALC,INVALC,0x615D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6229,INVALC,
-	0x6230,INVALC,INVALC,INVALC,0x6238,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5F37,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4569,INVALC,INVALC,0x502C,0x5439,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5A24,INVALC,INVALC,INVALC,INVALC,0x5C29,INVALC,INVALC,
-	0x5E21,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F3A,INVALC,
-	INVALC,INVALC,0x6231,0x623F,INVALC,INVALC,0x2547,INVALC,
-	INVALC,INVALC,0x502F,0x502E,0x543A,INVALC,INVALC,0x5750,
-	INVALC,0x5A26,0x5A25,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B22,INVALC,INVALC,
-	INVALC,0x5E22,INVALC,INVALC,0x396A,0x543C,0x543B,INVALC,
-	INVALC,INVALC,0x5A28,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x396B,INVALC,INVALC,INVALC,INVALC,0x543D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C2A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6029,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2772,INVALC,
-	/* Block 160, Array index 0x5200 */
-	INVALC,INVALC,0x5A29,0x5C2D,0x5C2E,0x5F3C,INVALC,INVALC,
-	0x615F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x456A,INVALC,INVALC,0x5C30,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6160,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A2B,0x5A2A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x606D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x613B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2370,INVALC,INVALC,0x543E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5E24,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F3E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6233,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5755,INVALC,
-	INVALC,INVALC,INVALC,0x602B,INVALC,INVALC,INVALC,0x6242,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E47,INVALC,INVALC,
-	INVALC,0x5F3F,INVALC,0x6161,INVALC,0x6177,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_CNS11643_PLANE14 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> cns11643_plane14 size-optimized table (16576 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_size_cns11643_plane14[] =
-{
-	0x00C5, /* Ranges number */
-	0x0D04, /* Unranged codes number */
-	0x0658, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x4E20, 0x4E24, 0x0252,
-	/* Array index: 0x0006 */ 0x4EAF, 0x4EB2, 0x0257,
-	/* Array index: 0x0009 */ 0x4EF8, 0x4EFC, 0x025B,
-	/* Array index: 0x000C */ 0x4F9F, 0x4FA3, 0x0260,
-	/* Array index: 0x000F */ 0x4FF9, 0x5004, 0x0265,
-	/* Array index: 0x0012 */ 0x5078, 0x507C, 0x0271,
-	/* Array index: 0x0015 */ 0x50DE, 0x50E2, 0x0276,
-	/* Array index: 0x0018 */ 0x510D, 0x510F, 0x027B,
-	/* Array index: 0x001B */ 0x5182, 0x5186, 0x027E,
-	/* Array index: 0x001E */ 0x51B2, 0x51B5, 0x0283,
-	/* Array index: 0x0021 */ 0x51C1, 0x51C3, 0x0287,
-	/* Array index: 0x0024 */ 0x51CF, 0x51D3, 0x028A,
-	/* Array index: 0x0027 */ 0x51D9, 0x51DB, 0x028F,
-	/* Array index: 0x002A */ 0x51E2, 0x51E5, 0x0292,
-	/* Array index: 0x002D */ 0x5263, 0x5268, 0x0296,
-	/* Array index: 0x0030 */ 0x529A, 0x529E, 0x029C,
-	/* Array index: 0x0033 */ 0x52B3, 0x52B5, 0x02A1,
-	/* Array index: 0x0036 */ 0x52CC, 0x52D1, 0x02A4,
-	/* Array index: 0x0039 */ 0x5332, 0x533B, 0x02AA,
-	/* Array index: 0x003C */ 0x53A6, 0x53AB, 0x02B4,
-	/* Array index: 0x003F */ 0x53C1, 0x53C5, 0x02BA,
-	/* Array index: 0x0042 */ 0x53D9, 0x53DD, 0x02BF,
-	/* Array index: 0x0045 */ 0x5421, 0x5423, 0x02C4,
-	/* Array index: 0x0048 */ 0x5449, 0x5451, 0x02C7,
-	/* Array index: 0x004B */ 0x54CA, 0x54CD, 0x02D0,
-	/* Array index: 0x004E */ 0x54F4, 0x54F6, 0x02D4,
-	/* Array index: 0x0051 */ 0x5558, 0x555A, 0x02D7,
-	/* Array index: 0x0054 */ 0x5571, 0x5573, 0x02DA,
-	/* Array index: 0x0057 */ 0x564D, 0x5656, 0x02DD,
-	/* Array index: 0x005A */ 0x569E, 0x56A0, 0x02E7,
-	/* Array index: 0x005D */ 0x56B8, 0x56BB, 0x02EA,
-	/* Array index: 0x0060 */ 0x56EF, 0x56F3, 0x02EE,
-	/* Array index: 0x0063 */ 0x56FB, 0x56FD, 0x02F3,
-	/* Array index: 0x0066 */ 0x5742, 0x5748, 0x02F6,
-	/* Array index: 0x0069 */ 0x5753, 0x5759, 0x02FD,
-	/* Array index: 0x006C */ 0x578D, 0x5792, 0x0304,
-	/* Array index: 0x006F */ 0x57A6, 0x57A8, 0x030A,
-	/* Array index: 0x0072 */ 0x57C4, 0x57CA, 0x030D,
-	/* Array index: 0x0075 */ 0x585F, 0x5861, 0x0314,
-	/* Array index: 0x0078 */ 0x5866, 0x586C, 0x0317,
-	/* Array index: 0x007B */ 0x5895, 0x5897, 0x031E,
-	/* Array index: 0x007E */ 0x58EE, 0x58F7, 0x0321,
-	/* Array index: 0x0081 */ 0x5900, 0x590B, 0x032B,
-	/* Array index: 0x0084 */ 0x594B, 0x594D, 0x0337,
-	/* Array index: 0x0087 */ 0x599A, 0x599C, 0x033A,
-	/* Array index: 0x008A */ 0x5A2A, 0x5A2C, 0x033D,
-	/* Array index: 0x008D */ 0x5A7E, 0x5A89, 0x0340,
-	/* Array index: 0x0090 */ 0x5AA0, 0x5AA4, 0x034C,
-	/* Array index: 0x0093 */ 0x5ACE, 0x5AD3, 0x0351,
-	/* Array index: 0x0096 */ 0x5B37, 0x5B3B, 0x0357,
-	/* Array index: 0x0099 */ 0x5B9D, 0x5B9F, 0x035C,
-	/* Array index: 0x009C */ 0x5BDA, 0x5BDD, 0x035F,
-	/* Array index: 0x009F */ 0x5BFD, 0x5C00, 0x0363,
-	/* Array index: 0x00A2 */ 0x5CB9, 0x5CBB, 0x0367,
-	/* Array index: 0x00A5 */ 0x5D08, 0x5D0A, 0x036A,
-	/* Array index: 0x00A8 */ 0x5D8B, 0x5D91, 0x036D,
-	/* Array index: 0x00AB */ 0x5DA3, 0x5DA6, 0x0374,
-	/* Array index: 0x00AE */ 0x5E2C, 0x5E32, 0x0378,
-	/* Array index: 0x00B1 */ 0x5E46, 0x5E48, 0x037F,
-	/* Array index: 0x00B4 */ 0x5EF8, 0x5EFD, 0x0382,
-	/* Array index: 0x00B7 */ 0x5F0C, 0x5F0E, 0x0388,
-	/* Array index: 0x00BA */ 0x5F39, 0x5F3B, 0x038B,
-	/* Array index: 0x00BD */ 0x5F50, 0x5F55, 0x038E,
-	/* Array index: 0x00C0 */ 0x5F8D, 0x5F8F, 0x0394,
-	/* Array index: 0x00C3 */ 0x5FDA, 0x5FDC, 0x0397,
-	/* Array index: 0x00C6 */ 0x604E, 0x6052, 0x039A,
-	/* Array index: 0x00C9 */ 0x6073, 0x6075, 0x039F,
-	/* Array index: 0x00CC */ 0x60A6, 0x60AA, 0x03A2,
-	/* Array index: 0x00CF */ 0x611E, 0x6122, 0x03A7,
-	/* Array index: 0x00D2 */ 0x6185, 0x6188, 0x03AC,
-	/* Array index: 0x00D5 */ 0x6195, 0x6199, 0x03B0,
-	/* Array index: 0x00D8 */ 0x61CE, 0x61D0, 0x03B5,
-	/* Array index: 0x00DB */ 0x61D9, 0x61DD, 0x03B8,
-	/* Array index: 0x00DE */ 0x6235, 0x623C, 0x03BD,
-	/* Array index: 0x00E1 */ 0x6299, 0x629E, 0x03C5,
-	/* Array index: 0x00E4 */ 0x62A3, 0x62A7, 0x03CB,
-	/* Array index: 0x00E7 */ 0x62DD, 0x62E1, 0x03D0,
-	/* Array index: 0x00EA */ 0x635B, 0x635D, 0x03D5,
-	/* Array index: 0x00ED */ 0x6438, 0x643C, 0x03D8,
-	/* Array index: 0x00F0 */ 0x6455, 0x6457, 0x03DD,
-	/* Array index: 0x00F3 */ 0x655F, 0x6561, 0x03E0,
-	/* Array index: 0x00F6 */ 0x656D, 0x6571, 0x03E3,
-	/* Array index: 0x00F9 */ 0x6617, 0x661B, 0x03E8,
-	/* Array index: 0x00FC */ 0x66A4, 0x66A6, 0x03ED,
-	/* Array index: 0x00FF */ 0x66CD, 0x66D7, 0x03F0,
-	/* Array index: 0x0102 */ 0x67A2, 0x67A4, 0x03FB,
-	/* Array index: 0x0105 */ 0x67D5, 0x67D7, 0x03FE,
-	/* Array index: 0x0108 */ 0x6822, 0x6824, 0x0401,
-	/* Array index: 0x010B */ 0x6855, 0x685A, 0x0404,
-	/* Array index: 0x010E */ 0x6898, 0x689A, 0x040A,
-	/* Array index: 0x0111 */ 0x68B6, 0x68B9, 0x040D,
-	/* Array index: 0x0114 */ 0x68FE, 0x6903, 0x0411,
-	/* Array index: 0x0117 */ 0x6A29, 0x6A2D, 0x0417,
-	/* Array index: 0x011A */ 0x6AB0, 0x6AB2, 0x041C,
-	/* Array index: 0x011D */ 0x6ABC, 0x6AC1, 0x041F,
-	/* Array index: 0x0120 */ 0x6AD4, 0x6AD8, 0x0425,
-	/* Array index: 0x0123 */ 0x6AFD, 0x6B01, 0x042A,
-	/* Array index: 0x0126 */ 0x6B1B, 0x6B1D, 0x042F,
-	/* Array index: 0x0129 */ 0x6B26, 0x6B2B, 0x0432,
-	/* Array index: 0x012C */ 0x6B68, 0x6B74, 0x0438,
-	/* Array index: 0x012F */ 0x6C9E, 0x6CA2, 0x0445,
-	/* Array index: 0x0132 */ 0x6D13, 0x6D15, 0x044A,
-	/* Array index: 0x0135 */ 0x6D5B, 0x6D5D, 0x044D,
-	/* Array index: 0x0138 */ 0x6D71, 0x6D73, 0x0450,
-	/* Array index: 0x013B */ 0x6D99, 0x6D9B, 0x0453,
-	/* Array index: 0x013E */ 0x6DFE, 0x6E0C, 0x0456,
-	/* Array index: 0x0141 */ 0x6ED9, 0x6EDD, 0x0465,
-	/* Array index: 0x0144 */ 0x6F48, 0x6F4C, 0x046A,
-	/* Array index: 0x0147 */ 0x6FD6, 0x6FDA, 0x046F,
-	/* Array index: 0x014A */ 0x702C, 0x702E, 0x0474,
-	/* Array index: 0x014D */ 0x7087, 0x7090, 0x0477,
-	/* Array index: 0x0150 */ 0x70A2, 0x70AA, 0x0481,
-	/* Array index: 0x0153 */ 0x712A, 0x712D, 0x048A,
-	/* Array index: 0x0156 */ 0x7133, 0x713F, 0x048E,
-	/* Array index: 0x0159 */ 0x7174, 0x7177, 0x049B,
-	/* Array index: 0x015C */ 0x718B, 0x718E, 0x049F,
-	/* Array index: 0x015F */ 0x71E9, 0x71EB, 0x04A3,
-	/* Array index: 0x0162 */ 0x720E, 0x7218, 0x04A6,
-	/* Array index: 0x0165 */ 0x7264, 0x7268, 0x04B1,
-	/* Array index: 0x0168 */ 0x7328, 0x732F, 0x04B6,
-	/* Array index: 0x016B */ 0x7346, 0x7348, 0x04BE,
-	/* Array index: 0x016E */ 0x7353, 0x7355, 0x04C1,
-	/* Array index: 0x0171 */ 0x73CE, 0x73D0, 0x04C4,
-	/* Array index: 0x0174 */ 0x7414, 0x7419, 0x04C7,
-	/* Array index: 0x0177 */ 0x7438, 0x743E, 0x04CD,
-	/* Array index: 0x017A */ 0x7445, 0x7449, 0x04D4,
-	/* Array index: 0x017D */ 0x74C7, 0x74D3, 0x04D9,
-	/* Array index: 0x0180 */ 0x7555, 0x7558, 0x04E6,
-	/* Array index: 0x0183 */ 0x76D5, 0x76D9, 0x04EA,
-	/* Array index: 0x0186 */ 0x773F, 0x7743, 0x04EF,
-	/* Array index: 0x0189 */ 0x7774, 0x777B, 0x04F4,
-	/* Array index: 0x018C */ 0x7807, 0x780B, 0x04FC,
-	/* Array index: 0x018F */ 0x7906, 0x790D, 0x0501,
-	/* Array index: 0x0192 */ 0x7983, 0x7989, 0x0509,
-	/* Array index: 0x0195 */ 0x799D, 0x799F, 0x0510,
-	/* Array index: 0x0198 */ 0x79C3, 0x79C7, 0x0513,
-	/* Array index: 0x019B */ 0x79D7, 0x79DB, 0x0518,
-	/* Array index: 0x019E */ 0x79F0, 0x79F5, 0x051D,
-	/* Array index: 0x01A1 */ 0x7A29, 0x7A2D, 0x0523,
-	/* Array index: 0x01A4 */ 0x7ACC, 0x7AD5, 0x0528,
-	/* Array index: 0x01A7 */ 0x7ADA, 0x7ADD, 0x0532,
-	/* Array index: 0x01AA */ 0x7AF0, 0x7AF5, 0x0536,
-	/* Array index: 0x01AD */ 0x7B41, 0x7B43, 0x053C,
-	/* Array index: 0x01B0 */ 0x7C99, 0x7C9C, 0x053F,
-	/* Array index: 0x01B3 */ 0x7CC2, 0x7CC9, 0x0543,
-	/* Array index: 0x01B6 */ 0x7D74, 0x7D78, 0x054B,
-	/* Array index: 0x01B9 */ 0x7D87, 0x7D8B, 0x0550,
-	/* Array index: 0x01BC */ 0x7D95, 0x7D99, 0x0555,
-	/* Array index: 0x01BF */ 0x7DCD, 0x7DD3, 0x055A,
-	/* Array index: 0x01C2 */ 0x7DFC, 0x7E02, 0x0561,
-	/* Array index: 0x01C5 */ 0x805F, 0x806B, 0x0568,
-	/* Array index: 0x01C8 */ 0x807A, 0x807C, 0x0575,
-	/* Array index: 0x01CB */ 0x80A4, 0x80A8, 0x0578,
-	/* Array index: 0x01CE */ 0x8140, 0x8142, 0x057D,
-	/* Array index: 0x01D1 */ 0x8192, 0x8196, 0x0580,
-	/* Array index: 0x01D4 */ 0x8218, 0x821A, 0x0585,
-	/* Array index: 0x01D7 */ 0x8414, 0x8418, 0x0588,
-	/* Array index: 0x01DA */ 0x8492, 0x8496, 0x058D,
-	/* Array index: 0x01DD */ 0x8501, 0x8505, 0x0592,
-	/* Array index: 0x01E0 */ 0x8533, 0x8535, 0x0597,
-	/* Array index: 0x01E3 */ 0x8845, 0x8847, 0x059A,
-	/* Array index: 0x01E6 */ 0x8A9B, 0x8A9F, 0x059D,
-	/* Array index: 0x01E9 */ 0x8AB1, 0x8AB7, 0x05A2,
-	/* Array index: 0x01EC */ 0x8C51, 0x8C53, 0x05A9,
-	/* Array index: 0x01EF */ 0x8D82, 0x8D88, 0x05AC,
-	/* Array index: 0x01F2 */ 0x8EAD, 0x8EB9, 0x05B3,
-	/* Array index: 0x01F5 */ 0x8F9D, 0x8FA7, 0x05C0,
-	/* Array index: 0x01F8 */ 0x9028, 0x902C, 0x05CB,
-	/* Array index: 0x01FB */ 0x91DE, 0x91E0, 0x05D0,
-	/* Array index: 0x01FE */ 0x9220, 0x9222, 0x05D3,
-	/* Array index: 0x0201 */ 0x92AD, 0x92B1, 0x05D6,
-	/* Array index: 0x0204 */ 0x92DA, 0x92DC, 0x05DB,
-	/* Array index: 0x0207 */ 0x92F3, 0x92F6, 0x05DE,
-	/* Array index: 0x020A */ 0x9330, 0x9332, 0x05E2,
-	/* Array index: 0x020D */ 0x9372, 0x9374, 0x05E5,
-	/* Array index: 0x0210 */ 0x93BB, 0x93BE, 0x05E8,
-	/* Array index: 0x0213 */ 0x93E9, 0x93F4, 0x05EC,
-	/* Array index: 0x0216 */ 0x941A, 0x9424, 0x05F8,
-	/* Array index: 0x0219 */ 0x9458, 0x945C, 0x0603,
-	/* Array index: 0x021C */ 0x9465, 0x9467, 0x0608,
-	/* Array index: 0x021F */ 0x96B5, 0x96B7, 0x060B,
-	/* Array index: 0x0222 */ 0x96EC, 0x96EE, 0x060E,
-	/* Array index: 0x0225 */ 0x9733, 0x9737, 0x0611,
-	/* Array index: 0x0228 */ 0x97B1, 0x97B5, 0x0616,
-	/* Array index: 0x022B */ 0x983C, 0x9842, 0x061B,
-	/* Array index: 0x022E */ 0x9854, 0x9856, 0x0622,
-	/* Array index: 0x0231 */ 0x986C, 0x986E, 0x0625,
-	/* Array index: 0x0234 */ 0x99B6, 0x99B8, 0x0628,
-	/* Array index: 0x0237 */ 0x99BC, 0x99C0, 0x062B,
-	/* Array index: 0x023A */ 0x9AE4, 0x9AEA, 0x0630,
-	/* Array index: 0x023D */ 0x9B8B, 0x9B8F, 0x0637,
-	/* Array index: 0x0240 */ 0x9BCB, 0x9BCD, 0x063C,
-	/* Array index: 0x0243 */ 0x9BFB, 0x9C04, 0x063F,
-	/* Array index: 0x0246 */ 0x9CEB, 0x9CEF, 0x0649,
-	/* Array index: 0x0249 */ 0x9EAA, 0x9EAC, 0x064E,
-	/* Array index: 0x024C */ 0x9EC4, 0x9EC6, 0x0651,
-	/* Array index: 0x024F */ 0x9F02, 0x9F05, 0x0654,
-	/* Ranges content */
-	/* Range 0x4E20 - 0x4E24, array index: 0x0252 */
-	0x2262,0x2261,0x2263,INVALC,0x243F,
-	/* Range 0x4EAF - 0x4EB2, array index: 0x0257 */
-	0x2B26,0x2B25,0x2B27,0x2B24,
-	/* Range 0x4EF8 - 0x4EFC, array index: 0x025B */
-	0x226B,0x2267,0x2276,INVALC,0x226E,
-	/* Range 0x4F9F - 0x4FA3, array index: 0x0260 */
-	0x274C,0x2749,0x274B,0x274A,0x274D,
-	/* Range 0x4FF9 - 0x5004, array index: 0x0265 */
-	0x2F44,INVALC,0x2F58,0x2F4C,0x2F56,INVALC,0x2F46,INVALC,
-	INVALC,0x2F4B,0x2F49,0x2F47,
-	/* Range 0x5078 - 0x507C, array index: 0x0271 */
-	0x344C,0x344A,INVALC,0x3445,0x3446,
-	/* Range 0x50DE - 0x50E2, array index: 0x0276 */
-	0x4576,0x634D,INVALC,0x4570,0x4575,
-	/* Range 0x510D - 0x510F, array index: 0x027B */
-	0x4B2C,0x4B27,0x644E,
-	/* Range 0x5182 - 0x5186, array index: 0x027E */
-	0x2127,INVALC,0x214D,0x2148,0x214E,
-	/* Range 0x51B2 - 0x51B5, array index: 0x0283 */
-	0x227E,0x227D,0x227C,0x2459,
-	/* Range 0x51C1 - 0x51C3, array index: 0x0287 */
-	0x2B3B,0x2B3D,0x2B3E,
-	/* Range 0x51CF - 0x51D3, array index: 0x028A */
-	0x344F,INVALC,0x344E,0x397D,0x397A,
-	/* Range 0x51D9 - 0x51DB, array index: 0x028F */
-	0x4B2F,0x4B2E,0x4B30,
-	/* Range 0x51E2 - 0x51E5, array index: 0x0292 */
-	0x212F,0x2135,0x2151,0x217B,
-	/* Range 0x5263 - 0x5268, array index: 0x0296 */
-	0x2F66,0x2F61,0x2F63,INVALC,0x2F64,0x3450,
-	/* Range 0x529A - 0x529E, array index: 0x029C */
-	0x602C,INVALC,0x2137,0x2154,0x2153,
-	/* Range 0x52B3 - 0x52B5, array index: 0x02A1 */
-	0x2463,0x2462,0x2761,
-	/* Range 0x52CC - 0x52D1, array index: 0x02A4 */
-	0x2F6F,INVALC,0x2F6C,0x2F6A,0x2F6D,0x2F6E,
-	/* Range 0x5332 - 0x533B, array index: 0x02AA */
-	0x4623,0x4B34,INVALC,0x5444,0x5C34,INVALC,0x2129,INVALC,
-	0x2157,0x2466,
-	/* Range 0x53A6 - 0x53AB, array index: 0x02B4 */
-	0x3A28,INVALC,0x3A27,0x404A,0x4049,0x4048,
-	/* Range 0x53C1 - 0x53C5, array index: 0x02BA */
-	0x2769,0x276A,INVALC,0x3455,0x3A29,
-	/* Range 0x53D9 - 0x53DD, array index: 0x02BF */
-	0x2B50,0x2B4F,INVALC,0x2B4E,0x2B4D,
-	/* Range 0x5421 - 0x5423, array index: 0x02C4 */
-	0x2479,0x247E,0x2475,
-	/* Range 0x5449 - 0x5451, array index: 0x02C7 */
-	0x247C,INVALC,0x2478,0x2474,0x246D,INVALC,INVALC,0x247D,
-	0x2522,
-	/* Range 0x54CA - 0x54CD, array index: 0x02D0 */
-	0x2B55,0x6454,0x2B63,0x2B61,
-	/* Range 0x54F4 - 0x54F6, array index: 0x02D4 */
-	0x2F74,0x2F78,0x3022,
-	/* Range 0x5558 - 0x555A, array index: 0x02D7 */
-	0x3457,0x3A36,0x3464,
-	/* Range 0x5571 - 0x5573, array index: 0x02DA */
-	0x6456,0x6722,0x6455,
-	/* Range 0x564D - 0x5656, array index: 0x02DD */
-	0x4B43,INVALC,0x4B45,0x4B40,0x4635,0x4B3C,INVALC,0x4B39,
-	INVALC,0x4B3F,
-	/* Range 0x569E - 0x56A0, array index: 0x02E7 */
-	0x5759,0x5757,0x575C,
-	/* Range 0x56B8 - 0x56BB, array index: 0x02EA */
-	0x6726,0x6727,0x645C,0x5E26,
-	/* Range 0x56EF - 0x56F3, array index: 0x02EE */
-	0x2529,INVALC,0x2548,0x2527,0x2528,
-	/* Range 0x56FB - 0x56FD, array index: 0x02F3 */
-	0x277C,0x2821,0x277B,
-	/* Range 0x5742 - 0x5748, array index: 0x02F6 */
-	0x2540,0x2536,0x252F,INVALC,0x253C,INVALC,0x252D,
-	/* Range 0x5753 - 0x5759, array index: 0x02FD */
-	0x2532,0x2541,0x2542,0x2533,0x2538,0x2537,0x645F,
-	/* Range 0x578D - 0x5792, array index: 0x0304 */
-	0x2B69,0x2B68,INVALC,0x2B6C,0x2B67,0x2B6A,
-	/* Range 0x57A6 - 0x57A8, array index: 0x030A */
-	0x2B6D,0x2B72,0x2B6E,
-	/* Range 0x57C4 - 0x57CA, array index: 0x030D */
-	0x3034,0x3035,INVALC,INVALC,0x3033,0x3028,0x3037,
-	/* Range 0x585F - 0x5861, array index: 0x0314 */
-	0x405E,0x405C,0x4058,
-	/* Range 0x5866 - 0x586C, array index: 0x0317 */
-	0x405D,0x6343,INVALC,0x405A,0x4059,INVALC,0x4054,
-	/* Range 0x5895 - 0x5897, array index: 0x031E */
-	0x4641,0x4644,0x4640,
-	/* Range 0x58EE - 0x58F7, array index: 0x0321 */
-	0x2343,INVALC,0x2545,0x2543,0x2544,0x282D,INVALC,0x2B77,
-	INVALC,0x3477,
-	/* Range 0x5900 - 0x590B, array index: 0x032B */
-	0x6466,0x504D,0x2139,INVALC,0x2235,0x2344,INVALC,INVALC,
-	0x2B7A,0x2B79,0x213A,0x2546,
-	/* Range 0x594B - 0x594D, array index: 0x0337 */
-	0x282E,0x282F,0x6467,
-	/* Range 0x599A - 0x599C, array index: 0x033A */
-	0x2556,0x2553,0x254E,
-	/* Range 0x5A2A - 0x5A2C, array index: 0x033D */
-	0x303C,0x3522,0x3538,
-	/* Range 0x5A7E - 0x5A89, array index: 0x0340 */
-	0x3A7C,INVALC,0x3A63,0x3A61,0x3A58,INVALC,INVALC,0x3A5B,
-	0x3A77,0x3A72,0x3A59,0x3A60,
-	/* Range 0x5AA0 - 0x5AA4, array index: 0x034C */
-	0x3A73,0x3A5A,INVALC,0x3A57,0x3A7A,
-	/* Range 0x5ACE - 0x5AD3, array index: 0x0351 */
-	0x4064,0x3A6B,0x406A,0x6468,INVALC,0x6469,
-	/* Range 0x5B37 - 0x5B3B, array index: 0x0357 */
-	0x5453,INVALC,0x5A31,0x5761,0x575E,
-	/* Range 0x5B9D - 0x5B9F, array index: 0x035C */
-	0x284E,0x284B,0x284D,
-	/* Range 0x5BDA - 0x5BDD, array index: 0x035F */
-	0x4075,0x4076,0x4073,0x6345,
-	/* Range 0x5BFD - 0x5C00, array index: 0x0363 */
-	0x255E,0x255C,0x255D,0x2850,
-	/* Range 0x5CB9 - 0x5CBB, array index: 0x0367 */
-	0x285C,0x285F,0x2857,
-	/* Range 0x5D08 - 0x5D0A, array index: 0x036A */
-	0x354B,0x3548,0x3547,
-	/* Range 0x5D8B - 0x5D91, array index: 0x036D */
-	0x4659,0x465A,INVALC,0x646F,0x4B65,0x4B66,0x4B63,
-	/* Range 0x5DA3 - 0x5DA6, array index: 0x0374 */
-	0x4B6A,0x4B68,0x6470,0x5058,
-	/* Range 0x5E2C - 0x5E32, array index: 0x0378 */
-	0x3069,INVALC,0x3068,0x306A,0x3067,INVALC,0x355B,
-	/* Range 0x5E46 - 0x5E48, array index: 0x037F */
-	0x3B3A,0x3B3B,0x3B3D,
-	/* Range 0x5EF8 - 0x5EFD, array index: 0x0382 */
-	0x2869,0x286B,INVALC,0x2C4C,0x2C4B,0x306E,
-	/* Range 0x5F0C - 0x5F0E, array index: 0x0388 */
-	0x2164,0x2249,0x2362,
-	/* Range 0x5F39 - 0x5F3B, array index: 0x038B */
-	0x3563,0x3B47,0x3B45,
-	/* Range 0x5F50 - 0x5F55, array index: 0x038E */
-	0x2140,0x2141,0x224A,0x2351,INVALC,0x2871,
-	/* Range 0x5F8D - 0x5F8F, array index: 0x0394 */
-	0x6264,0x3070,0x3072,
-	/* Range 0x5FDA - 0x5FDC, array index: 0x0397 */
-	0x2367,0x2369,0x2577,
-	/* Range 0x604E - 0x6052, array index: 0x039A */
-	0x2C56,0x3073,INVALC,0x2C57,0x2C5D,
-	/* Range 0x6073 - 0x6075, array index: 0x039F */
-	0x307A,0x3078,0x307B,
-	/* Range 0x60A6 - 0x60AA, array index: 0x03A2 */
-	0x3123,0x3128,INVALC,0x3121,0x356F,
-	/* Range 0x611E - 0x6122, array index: 0x03A7 */
-	0x3B61,INVALC,0x3B62,0x3B63,0x3B50,
-	/* Range 0x6185 - 0x6188, array index: 0x03AC */
-	0x4C23,0x4674,0x4C24,0x4B77,
-	/* Range 0x6195 - 0x6199, array index: 0x03B0 */
-	0x4B76,INVALC,0x5068,0x4C28,0x5067,
-	/* Range 0x61CE - 0x61D0, array index: 0x03B5 */
-	0x5062,0x5065,0x506B,
-	/* Range 0x61D9 - 0x61DD, array index: 0x03B8 */
-	0x5461,0x545F,0x545C,0x545E,0x545D,
-	/* Range 0x6235 - 0x623C, array index: 0x03BD */
-	0x5F48,INVALC,0x2165,0x2166,0x224E,INVALC,0x2628,0x2629,
-	/* Range 0x6299 - 0x629E, array index: 0x03C5 */
-	0x2635,INVALC,0x2633,0x2634,0x2638,0x2631,
-	/* Range 0x62A3 - 0x62A7, array index: 0x03CB */
-	0x647B,INVALC,0x2632,0x2931,0x292A,
-	/* Range 0x62DD - 0x62E1, array index: 0x03D0 */
-	0x2930,0x2937,0x2935,0x2936,0x292F,
-	/* Range 0x635B - 0x635D, array index: 0x03D5 */
-	0x3130,0x313B,0x3136,
-	/* Range 0x6438 - 0x643C, array index: 0x03D8 */
-	0x4134,INVALC,0x4148,0x4725,0x4142,
-	/* Range 0x6455 - 0x6457, array index: 0x03DD */
-	0x467E,0x4724,0x467A,
-	/* Range 0x655F - 0x6561, array index: 0x03E0 */
-	0x3B74,0x3B75,0x3B76,
-	/* Range 0x656D - 0x6571, array index: 0x03E3 */
-	0x414E,0x6346,INVALC,0x414D,0x4730,
-	/* Range 0x6617 - 0x661B, array index: 0x03E8 */
-	0x2940,0x2941,INVALC,0x2C7E,0x2C7A,
-	/* Range 0x66A4 - 0x66A6, array index: 0x03ED */
-	0x4739,0x4733,0x4737,
-	/* Range 0x66CD - 0x66D7, array index: 0x03F0 */
-	0x5122,0x5471,INVALC,0x546F,0x5470,INVALC,INVALC,0x546C,
-	0x546D,INVALC,0x5472,
-	/* Range 0x67A2 - 0x67A4, array index: 0x03FB */
-	0x294E,0x294C,0x6528,
-	/* Range 0x67D5 - 0x67D7, array index: 0x03FE */
-	0x2D31,0x2D2B,0x2D3A,
-	/* Range 0x6822 - 0x6824, array index: 0x0401 */
-	0x315E,0x3164,0x3150,
-	/* Range 0x6855 - 0x685A, array index: 0x0404 */
-	0x3162,0x3158,INVALC,0x3161,0x3160,0x652D,
-	/* Range 0x6898 - 0x689A, array index: 0x040A */
-	0x364D,0x365C,0x3650,
-	/* Range 0x68B6 - 0x68B9, array index: 0x040D */
-	0x364C,0x3652,0x365E,0x365F,
-	/* Range 0x68FE - 0x6903, array index: 0x0411 */
-	0x3C31,0x3C42,0x3C39,0x3C3B,0x3C34,0x3C2F,
-	/* Range 0x6A29 - 0x6A2D, array index: 0x0417 */
-	0x4C5E,0x4C59,INVALC,0x4C61,0x6530,
-	/* Range 0x6AB0 - 0x6AB2, array index: 0x041C */
-	0x5777,0x5821,0x5776,
-	/* Range 0x6ABC - 0x6AC1, array index: 0x041F */
-	0x577E,INVALC,0x5779,0x5823,0x577D,0x577A,
-	/* Range 0x6AD4 - 0x6AD8, array index: 0x0425 */
-	0x5A45,0x5A4E,INVALC,0x5A47,0x5A4D,
-	/* Range 0x6AFD - 0x6B01, array index: 0x042A */
-	0x5E35,0x5E34,0x5E33,INVALC,0x5E37,
-	/* Range 0x6B1B - 0x6B1D, array index: 0x042F */
-	0x6140,0x6165,0x6141,
-	/* Range 0x6B26 - 0x6B2B, array index: 0x0432 */
-	0x2953,0x2954,INVALC,0x6269,0x2D3C,0x3166,
-	/* Range 0x6B68 - 0x6B74, array index: 0x0438 */
-	0x2955,0x2956,INVALC,0x2D3D,0x3168,INVALC,0x3C49,0x3C47,
-	INVALC,0x417E,INVALC,0x4221,0x4753,
-	/* Range 0x6C9E - 0x6CA2, array index: 0x0445 */
-	0x264E,0x2652,0x265C,0x2659,0x2656,
-	/* Range 0x6D13 - 0x6D15, array index: 0x044A */
-	0x2D49,0x2D47,0x2D4D,
-	/* Range 0x6D5B - 0x6D5D, array index: 0x044D */
-	0x3179,0x3226,0x3176,
-	/* Range 0x6D71 - 0x6D73, array index: 0x0450 */
-	0x3222,0x3225,0x3172,
-	/* Range 0x6D99 - 0x6D9B, array index: 0x0453 */
-	0x317D,0x317B,0x317C,
-	/* Range 0x6DFE - 0x6E0C, array index: 0x0456 */
-	0x3C5D,0x3728,INVALC,0x3726,0x3723,INVALC,0x3670,INVALC,
-	0x3677,0x3724,0x3676,0x3725,0x3679,INVALC,0x367D,
-	/* Range 0x6ED9 - 0x6EDD, array index: 0x0465 */
-	0x4244,0x423E,0x4247,INVALC,0x423D,
-	/* Range 0x6F48 - 0x6F4C, array index: 0x046A */
-	0x6544,0x6545,0x4766,INVALC,0x6543,
-	/* Range 0x6FD6 - 0x6FDA, array index: 0x046F */
-	0x5530,0x552F,INVALC,0x5535,0x5536,
-	/* Range 0x702C - 0x702E, array index: 0x0474 */
-	0x5A53,0x654A,0x6549,
-	/* Range 0x7087 - 0x7090, array index: 0x0477 */
-	0x2974,0x2970,0x2975,INVALC,0x296F,0x2979,0x2976,INVALC,
-	0x2972,0x2971,
-	/* Range 0x70A2 - 0x70AA, array index: 0x0481 */
-	0x2D5C,0x2D5A,INVALC,0x2D58,0x626A,0x2D65,0x2D62,INVALC,
-	0x2D5F,
-	/* Range 0x712A - 0x712D, array index: 0x048A */
-	0x3C6F,0x3C7A,0x3C72,0x3D21,
-	/* Range 0x7133 - 0x713F, array index: 0x048E */
-	0x3C7B,0x3C79,0x3C71,INVALC,0x3C73,0x3C77,0x6553,INVALC,
-	0x6554,INVALC,0x6555,INVALC,0x6552,
-	/* Range 0x7174 - 0x7177, array index: 0x049B */
-	0x4253,0x6557,0x6558,0x6556,
-	/* Range 0x718B - 0x718E, array index: 0x049F */
-	0x476A,0x476D,0x476B,0x4768,
-	/* Range 0x71E9 - 0x71EB, array index: 0x04A3 */
-	0x553E,0x5543,0x5540,
-	/* Range 0x720E - 0x7218, array index: 0x04A6 */
-	0x655F,0x5C56,INVALC,0x5C58,0x5C55,INVALC,INVALC,0x5A58,
-	0x5C53,0x5C57,0x6561,
-	/* Range 0x7264 - 0x7268, array index: 0x04B1 */
-	0x2664,0x2A21,0x2A22,INVALC,0x2A23,
-	/* Range 0x7328 - 0x732F, array index: 0x04B6 */
-	0x3D2E,INVALC,0x3D29,0x3D2B,0x3D2A,INVALC,0x4261,0x3D2D,
-	/* Range 0x7346 - 0x7348, array index: 0x04BE */
-	0x4262,0x6562,0x6563,
-	/* Range 0x7353 - 0x7355, array index: 0x04C1 */
-	0x4778,0x477A,0x4777,
-	/* Range 0x73CE - 0x73D0, array index: 0x04C4 */
-	0x2D7E,0x2D79,0x2D7C,
-	/* Range 0x7414 - 0x7419, array index: 0x04C7 */
-	0x3D36,0x3D3A,INVALC,0x3D2F,0x3D3B,0x3D32,
-	/* Range 0x7438 - 0x743E, array index: 0x04CD */
-	0x3D33,0x3D3C,INVALC,0x6566,0x3D37,0x4268,0x4275,
-	/* Range 0x7445 - 0x7449, array index: 0x04D4 */
-	0x4274,INVALC,0x426E,0x4266,0x4271,
-	/* Range 0x74C7 - 0x74D3, array index: 0x04D9 */
-	0x5A5C,0x5A5D,0x5A5B,INVALC,INVALC,0x5C5E,0x5C5C,0x5C5F,
-	INVALC,0x5C5D,0x5C60,INVALC,0x5E3D,
-	/* Range 0x7555 - 0x7558, array index: 0x04E6 */
-	0x324E,0x324D,0x3250,0x324F,
-	/* Range 0x76D5 - 0x76D9, array index: 0x04EA */
-	0x3750,0x3752,0x3751,INVALC,0x3D4F,
-	/* Range 0x773F - 0x7743, array index: 0x04EF */
-	0x3262,0x3757,INVALC,0x3D56,0x3D53,
-	/* Range 0x7774 - 0x777B, array index: 0x04F4 */
-	0x4833,0x4836,0x4835,0x4834,0x4838,INVALC,0x483B,0x483D,
-	/* Range 0x7807 - 0x780B, array index: 0x04FC */
-	0x2E3B,0x2E3E,INVALC,0x2E37,0x2E3A,
-	/* Range 0x7906 - 0x790D, array index: 0x0501 */
-	0x5843,0x583E,0x5840,INVALC,0x583F,0x583C,INVALC,0x5842,
-	/* Range 0x7983 - 0x7989, array index: 0x0509 */
-	0x4339,0x3D63,INVALC,0x6578,0x4848,INVALC,0x4847,
-	/* Range 0x799D - 0x799F, array index: 0x0510 */
-	0x4D50,0x4D51,0x4D4F,
-	/* Range 0x79C3 - 0x79C7, array index: 0x0513 */
-	0x2A3E,0x2A3D,INVALC,0x2A3F,0x2A42,
-	/* Range 0x79D7 - 0x79DB, array index: 0x0518 */
-	0x2E43,INVALC,0x3274,0x3273,0x3279,
-	/* Range 0x79F0 - 0x79F5, array index: 0x051D */
-	0x327C,0x3769,0x3767,0x376B,INVALC,0x376A,
-	/* Range 0x7A29 - 0x7A2D, array index: 0x0523 */
-	0x484B,0x484D,INVALC,0x4850,0x484F,
-	/* Range 0x7ACC - 0x7AD5, array index: 0x0528 */
-	0x267E,0x2721,INVALC,0x2A47,0x2E4E,INVALC,0x2E4F,0x2E4D,
-	0x2E4B,0x2E4C,
-	/* Range 0x7ADA - 0x7ADD, array index: 0x0532 */
-	0x3323,0x3326,0x3327,0x3324,
-	/* Range 0x7AF0 - 0x7AF5, array index: 0x0536 */
-	0x4855,0x5230,0x5569,0x556A,INVALC,0x5849,
-	/* Range 0x7B41 - 0x7B43, array index: 0x053C */
-	0x3D7B,0x3D78,0x3D75,
-	/* Range 0x7C99 - 0x7C9C, array index: 0x053F */
-	0x377E,0x3821,0x383E,0x3822,
-	/* Range 0x7CC2 - 0x7CC9, array index: 0x0543 */
-	0x4D6F,0x4D71,0x4D6D,INVALC,0x4D70,0x4D73,INVALC,0x4D72,
-	/* Range 0x7D74 - 0x7D78, array index: 0x054B */
-	0x3E24,0x3E35,0x3E33,INVALC,0x4367,
-	/* Range 0x7D87 - 0x7D8B, array index: 0x0550 */
-	0x4366,INVALC,0x4369,0x4360,0x4362,
-	/* Range 0x7D95 - 0x7D99, array index: 0x0555 */
-	0x4364,INVALC,0x4368,0x436A,0x4363,
-	/* Range 0x7DCD - 0x7DD3, array index: 0x055A */
-	0x4871,INVALC,0x4873,0x6629,0x486B,INVALC,0x662B,
-	/* Range 0x7DFC - 0x7E02, array index: 0x0561 */
-	0x4E28,0x4E29,0x4E25,0x4E2C,0x4E27,0x4D7E,0x4D7D,
-	/* Range 0x805F - 0x806B, array index: 0x0568 */
-	0x4926,0x3E3B,0x4925,INVALC,0x6630,INVALC,0x4E34,0x4E36,
-	INVALC,0x4E37,INVALC,0x4E35,0x4E38,
-	/* Range 0x807A - 0x807C, array index: 0x0575 */
-	0x5C70,0x5C71,0x5C72,
-	/* Range 0x80A4 - 0x80A8, array index: 0x0578 */
-	0x2A56,INVALC,0x2A5B,0x2A58,0x2A4F,
-	/* Range 0x8140 - 0x8142, array index: 0x057D */
-	0x3E43,0x3E45,0x3E41,
-	/* Range 0x8192 - 0x8196, array index: 0x0580 */
-	0x4E3B,0x4E3D,0x4E39,INVALC,0x4E3C,
-	/* Range 0x8218 - 0x821A, array index: 0x0585 */
-	0x524A,0x5868,0x5A79,
-	/* Range 0x8414 - 0x8418, array index: 0x0588 */
-	0x3E58,INVALC,0x3E5D,0x3E56,0x3E4E,
-	/* Range 0x8492 - 0x8496, array index: 0x058D */
-	0x4935,0x4944,INVALC,0x4933,0x4938,
-	/* Range 0x8501 - 0x8505, array index: 0x0592 */
-	0x4E40,INVALC,0x4E4C,0x4E46,0x4E54,
-	/* Range 0x8533 - 0x8535, array index: 0x0597 */
-	0x4E4D,0x4E4E,0x4E52,
-	/* Range 0x8845 - 0x8847, array index: 0x059A */
-	0x386A,0x3E6A,0x3E69,
-	/* Range 0x8A9B - 0x8A9F, array index: 0x059D */
-	0x495E,0x4962,0x496B,INVALC,0x4968,
-	/* Range 0x8AB1 - 0x8AB7, array index: 0x05A2 */
-	0x4E67,INVALC,0x4E72,0x4E70,0x4E6E,INVALC,0x4E6C,
-	/* Range 0x8C51 - 0x8C53, array index: 0x05A9 */
-	0x5D34,0x664D,0x6221,
-	/* Range 0x8D82 - 0x8D88, array index: 0x05AC */
-	0x3F39,0x3F34,INVALC,INVALC,0x3F37,0x3F30,0x3F33,
-	/* Range 0x8EAD - 0x8EB9, array index: 0x05B3 */
-	0x393F,INVALC,0x3940,0x3F40,0x4473,INVALC,0x497D,0x497C,
-	INVALC,0x4F30,0x4F32,0x4F2F,0x4F31,
-	/* Range 0x8F9D - 0x8FA7, array index: 0x05C0 */
-	0x3F4B,0x4477,INVALC,0x4478,0x4A21,0x4A22,INVALC,0x4F37,
-	0x5327,INVALC,0x5326,
-	/* Range 0x9028 - 0x902C, array index: 0x05CB */
-	0x3F4F,0x3F50,0x3F4D,0x3F4C,0x3F51,
-	/* Range 0x91DE - 0x91E0, array index: 0x05D0 */
-	0x342F,0x342E,0x3431,
-	/* Range 0x9220 - 0x9222, array index: 0x05D3 */
-	0x3F5E,0x6659,0x3F63,
-	/* Range 0x92AD - 0x92B1, array index: 0x05D6 */
-	0x4A32,0x4A37,INVALC,0x672A,0x4A31,
-	/* Range 0x92DA - 0x92DC, array index: 0x05DB */
-	0x4F4B,0x4F4E,0x4F44,
-	/* Range 0x92F3 - 0x92F6, array index: 0x05DE */
-	0x4F4D,0x665B,0x665C,0x4A30,
-	/* Range 0x9330 - 0x9332, array index: 0x05E2 */
-	0x533C,0x5339,0x533A,
-	/* Range 0x9372 - 0x9374, array index: 0x05E5 */
-	0x5662,0x5663,0x565F,
-	/* Range 0x93BB - 0x93BE, array index: 0x05E8 */
-	0x5945,0x6661,0x6662,0x6660,
-	/* Range 0x93E9 - 0x93F4, array index: 0x05EC */
-	0x5B41,0x5B42,0x5B4E,INVALC,0x5B47,INVALC,0x6665,INVALC,
-	0x6663,0x6664,0x5D41,0x5E6A,
-	/* Range 0x941A - 0x9424, array index: 0x05F8 */
-	0x5D44,0x5D45,0x5D47,INVALC,0x5D42,0x5D3A,INVALC,INVALC,
-	0x6666,0x6667,0x6668,
-	/* Range 0x9458 - 0x945C, array index: 0x0603 */
-	0x6431,INVALC,0x6055,0x6054,0x6056,
-	/* Range 0x9465 - 0x9467, array index: 0x0608 */
-	0x6057,0x666A,0x6669,
-	/* Range 0x96B5 - 0x96B7, array index: 0x060B */
-	0x5D49,0x2A7D,0x5349,
-	/* Range 0x96EC - 0x96EE, array index: 0x060E */
-	0x3F7E,0x3F7C,0x3F7B,
-	/* Range 0x9733 - 0x9737, array index: 0x0611 */
-	0x5D4C,0x5D4E,INVALC,0x5E72,0x5E71,
-	/* Range 0x97B1 - 0x97B5, array index: 0x0616 */
-	0x5B5F,0x5B5D,INVALC,0x5B5E,0x5B60,
-	/* Range 0x983C - 0x9842, array index: 0x061B */
-	0x535B,0x535F,INVALC,0x595B,0x5726,INVALC,0x637B,
-	/* Range 0x9854 - 0x9856, array index: 0x0622 */
-	0x5956,0x5958,0x5B65,
-	/* Range 0x986C - 0x986E, array index: 0x0625 */
-	0x605D,0x605E,0x605C,
-	/* Range 0x99B6 - 0x99B8, array index: 0x0628 */
-	0x4A63,0x4A62,0x4A66,
-	/* Range 0x99BC - 0x99C0, array index: 0x062B */
-	0x4A61,INVALC,0x4A60,0x4A6C,0x4A64,
-	/* Range 0x9AE4 - 0x9AEA, array index: 0x0630 */
-	0x4A6F,0x4A73,INVALC,INVALC,0x4A71,0x4A70,0x4A72,
-	/* Range 0x9B8B - 0x9B8F, array index: 0x0637 */
-	0x537C,0x5421,INVALC,0x5425,0x537D,
-	/* Range 0x9BCB - 0x9BCD, array index: 0x063C */
-	0x5976,0x5975,0x5743,
-	/* Range 0x9BFB - 0x9C04, array index: 0x063F */
-	0x5D67,0x5D69,INVALC,0x5D6A,0x5D74,0x5D75,INVALC,0x5D6E,
-	INVALC,0x5D68,
-	/* Range 0x9CEB - 0x9CEF, array index: 0x0649 */
-	0x4566,0x2F42,INVALC,0x4568,0x4567,
-	/* Range 0x9EAA - 0x9EAC, array index: 0x064E */
-	0x502F,0x502E,0x543A,
-	/* Range 0x9EC4 - 0x9EC6, array index: 0x0651 */
-	0x396A,0x543C,0x543B,
-	/* Range 0x9F02 - 0x9F05, array index: 0x0654 */
-	0x5A29,0x5C2D,0x5C2E,0x5F3C,
-	/* Unranged codes (197 codes) */
-	/* Array index: 0x0658 */ 0x4E04,0x2126,
-	/* Array index: 0x0658 */ 0x4E05,0x2125,
-	/* Array index: 0x0658 */ 0x4E28,0x2121,
-	/* Array index: 0x0658 */ 0x4E2A,0x212C,
-	/* Array index: 0x0658 */ 0x4E36,0x2122,
-	/* Array index: 0x0658 */ 0x4E3D,0x2740,
-	/* Array index: 0x0658 */ 0x4E3F,0x2123,
-	/* Array index: 0x0658 */ 0x4E46,0x2130,
-	/* Array index: 0x0658 */ 0x4E49,0x212E,
-	/* Array index: 0x0658 */ 0x4E54,0x2345,
-	/* Array index: 0x0658 */ 0x4E57,0x2B22,
-	/* Array index: 0x0658 */ 0x4E62,0x2146,
-	/* Array index: 0x0658 */ 0x4E63,0x2145,
-	/* Array index: 0x0658 */ 0x4E68,0x2264,
-	/* Array index: 0x0658 */ 0x4E71,0x2440,
-	/* Array index: 0x0658 */ 0x4E79,0x2B23,
-	/* Array index: 0x0658 */ 0x4E80,0x396C,
-	/* Array index: 0x0658 */ 0x4E81,0x396E,
-	/* Array index: 0x0658 */ 0x4E85,0x2124,
-	/* Array index: 0x0658 */ 0x4E87,0x212D,
-	/* Array index: 0x0658 */ 0x4E89,0x2265,
-	/* Array index: 0x0658 */ 0x4E8F,0x2131,
-	/* Array index: 0x0658 */ 0x4E97,0x216C,
-	/* Array index: 0x0658 */ 0x4E98,0x2266,
-	/* Array index: 0x0658 */ 0x4E9C,0x2442,
-	/* Array index: 0x0658 */ 0x4E9D,0x2742,
-	/* Array index: 0x0658 */ 0x4EA3,0x2147,
-	/* Array index: 0x0658 */ 0x4EB7,0x4033,
-	/* Array index: 0x0658 */ 0x4EBC,0x2132,
-	/* Array index: 0x0658 */ 0x4EBE,0x2133,
-	/* Array index: 0x0658 */ 0x4EC5,0x2149,
-	/* Array index: 0x0658 */ 0x4ECC,0x214C,
-	/* Array index: 0x0658 */ 0x4ECE,0x214B,
-	/* Array index: 0x0658 */ 0x4ECF,0x214A,
-	/* Array index: 0x0658 */ 0x4EE0,0x216D,
-	/* Array index: 0x0658 */ 0x4EE6,0x2172,
-	/* Array index: 0x0658 */ 0x4EE7,0x2170,
-	/* Array index: 0x0658 */ 0x4EEE,0x226F,
-	/* Array index: 0x0658 */ 0x4EEF,0x2268,
-	/* Array index: 0x0658 */ 0x4F03,0x226D,
-	/* Array index: 0x0658 */ 0x4F06,0x226C,
-	/* Array index: 0x0658 */ 0x4F07,0x2274,
-	/* Array index: 0x0658 */ 0x4F16,0x2270,
-	/* Array index: 0x0658 */ 0x4F17,0x2277,
-	/* Array index: 0x0658 */ 0x4F1A,0x2275,
-	/* Array index: 0x0658 */ 0x4F1C,0x2273,
-	/* Array index: 0x0658 */ 0x4F28,0x2272,
-	/* Array index: 0x0658 */ 0x4F31,0x2450,
-	/* Array index: 0x0658 */ 0x4F32,0x2448,
-	/* Array index: 0x0658 */ 0x4F35,0x244F,
-	/* Array index: 0x0658 */ 0x4F37,0x2446,
-	/* Array index: 0x0658 */ 0x4F39,0x2445,
-	/* Array index: 0x0658 */ 0x4F40,0x244E,
-	/* Array index: 0x0658 */ 0x4F42,0x2449,
-	/* Array index: 0x0658 */ 0x4F44,0x244B,
-	/* Array index: 0x0658 */ 0x4F45,0x2443,
-	/* Array index: 0x0658 */ 0x4F4A,0x2444,
-	/* Array index: 0x0658 */ 0x4F4B,0x244C,
-	/* Array index: 0x0658 */ 0x4F66,0x6448,
-	/* Array index: 0x0658 */ 0x4F68,0x6449,
-	/* Array index: 0x0658 */ 0x4F6D,0x2747,
-	/* Array index: 0x0658 */ 0x4F72,0x274F,
-	/* Array index: 0x0658 */ 0x4F8A,0x2744,
-	/* Array index: 0x0658 */ 0x4F8C,0x2751,
-	/* Array index: 0x0658 */ 0x4F8E,0x2748,
-	/* Array index: 0x0658 */ 0x4F93,0x2743,
-	/* Array index: 0x0658 */ 0x4FB0,0x2B2D,
-	/* Array index: 0x0658 */ 0x4FB1,0x2B2E,
-	/* Array index: 0x0658 */ 0x4FB4,0x2B36,
-	/* Array index: 0x0658 */ 0x4FB8,0x2B2C,
-	/* Array index: 0x0658 */ 0x4FBD,0x6263,
-	/* Array index: 0x0658 */ 0x4FBE,0x2B2B,
-	/* Array index: 0x0658 */ 0x4FC6,0x2B32,
-	/* Array index: 0x0658 */ 0x4FC8,0x2B2F,
-	/* Array index: 0x0658 */ 0x4FCC,0x2B33,
-	/* Array index: 0x0658 */ 0x4FD2,0x2B28,
-	/* Array index: 0x0658 */ 0x4FD5,0x2B29,
-	/* Array index: 0x0658 */ 0x4FE3,0x2B35,
-	/* Array index: 0x0658 */ 0x4FE5,0x2B34,
-	/* Array index: 0x0658 */ 0x4FE7,0x644A,
-	/* Array index: 0x0658 */ 0x4FF0,0x2F48,
-	/* Array index: 0x0658 */ 0x4FF2,0x2F4D,
-	/* Array index: 0x0658 */ 0x5008,0x2F4F,
-	/* Array index: 0x0658 */ 0x5010,0x2F53,
-	/* Array index: 0x0658 */ 0x501D,0x2F45,
-	/* Array index: 0x0658 */ 0x5024,0x2F4E,
-	/* Array index: 0x0658 */ 0x502E,0x2F51,
-	/* Array index: 0x0658 */ 0x5032,0x2F43,
-	/* Array index: 0x0658 */ 0x5036,0x2F50,
-	/* Array index: 0x0658 */ 0x5038,0x2F54,
-	/* Array index: 0x0658 */ 0x5039,0x2F55,
-	/* Array index: 0x0658 */ 0x503F,0x644B,
-	/* Array index: 0x0658 */ 0x5042,0x343C,
-	/* Array index: 0x0658 */ 0x5044,0x343F,
-	/* Array index: 0x0658 */ 0x5050,0x3444,
-	/* Array index: 0x0658 */ 0x5052,0x3441,
-	/* Array index: 0x0658 */ 0x5054,0x3442,
-	/* Array index: 0x0658 */ 0x5056,0x2F57,
-	/* Array index: 0x0658 */ 0x5058,0x3447,
-	/* Array index: 0x0658 */ 0x5059,0x343D,
-	/* Array index: 0x0658 */ 0x5066,0x3440,
-	/* Array index: 0x0658 */ 0x506C,0x344B,
-	/* Array index: 0x0658 */ 0x5071,0x3443,
-	/* Array index: 0x0658 */ 0x5081,0x3975,
-	/* Array index: 0x0658 */ 0x5088,0x3971,
-	/* Array index: 0x0658 */ 0x5089,0x3972,
-	/* Array index: 0x0658 */ 0x508F,0x396F,
-	/* Array index: 0x0658 */ 0x5097,0x3970,
-	/* Array index: 0x0658 */ 0x50A6,0x644D,
-	/* Array index: 0x0658 */ 0x50AA,0x4039,
-	/* Array index: 0x0658 */ 0x50AB,0x403C,
-	/* Array index: 0x0658 */ 0x50B9,0x403A,
-	/* Array index: 0x0658 */ 0x50BC,0x4037,
-	/* Array index: 0x0658 */ 0x50C3,0x403D,
-	/* Array index: 0x0658 */ 0x50CC,0x4036,
-	/* Array index: 0x0658 */ 0x50CD,0x403E,
-	/* Array index: 0x0658 */ 0x50D0,0x456B,
-	/* Array index: 0x0658 */ 0x50D2,0x634C,
-	/* Array index: 0x0658 */ 0x50D8,0x456E,
-	/* Array index: 0x0658 */ 0x50D9,0x456C,
-	/* Array index: 0x0658 */ 0x50DC,0x456D,
-	/* Array index: 0x0658 */ 0x50EB,0x4571,
-	/* Array index: 0x0658 */ 0x50F4,0x4574,
-	/* Array index: 0x0658 */ 0x50F7,0x4B29,
-	/* Array index: 0x0658 */ 0x50FC,0x4B2B,
-	/* Array index: 0x0658 */ 0x5101,0x4B2D,
-	/* Array index: 0x0658 */ 0x5116,0x5031,
-	/* Array index: 0x0658 */ 0x511B,0x5035,
-	/* Array index: 0x0658 */ 0x511D,0x5030,
-	/* Array index: 0x0658 */ 0x511E,0x5034,
-	/* Array index: 0x0658 */ 0x5127,0x5441,
-	/* Array index: 0x0658 */ 0x5128,0x5440,
-	/* Array index: 0x0658 */ 0x512B,0x5033,
-	/* Array index: 0x0658 */ 0x512F,0x5752,
-	/* Array index: 0x0658 */ 0x5136,0x5C32,
-	/* Array index: 0x0658 */ 0x513E,0x606F,
-	/* Array index: 0x0658 */ 0x514A,0x2278,
-	/* Array index: 0x0658 */ 0x514E,0x2454,
-	/* Array index: 0x0658 */ 0x5150,0x2453,
-	/* Array index: 0x0658 */ 0x5151,0x2451,
-	/* Array index: 0x0658 */ 0x5156,0x2752,
-	/* Array index: 0x0658 */ 0x5160,0x3976,
-	/* Array index: 0x0658 */ 0x5164,0x5E25,
-	/* Array index: 0x0658 */ 0x5166,0x2134,
-	/* Array index: 0x0658 */ 0x516A,0x2B37,
-	/* Array index: 0x0658 */ 0x5172,0x227A,
-	/* Array index: 0x0658 */ 0x5179,0x2E7B,
-	/* Array index: 0x0658 */ 0x517E,0x403F,
-	/* Array index: 0x0658 */ 0x517F,0x6453,
-	/* Array index: 0x0658 */ 0x518B,0x2178,
-	/* Array index: 0x0658 */ 0x518C,0x2179,
-	/* Array index: 0x0658 */ 0x5190,0x2755,
-	/* Array index: 0x0658 */ 0x5196,0x2128,
-	/* Array index: 0x0658 */ 0x5199,0x217A,
-	/* Array index: 0x0658 */ 0x519D,0x2457,
-	/* Array index: 0x0658 */ 0x519F,0x2B39,
-	/* Array index: 0x0658 */ 0x51A1,0x2F5B,
-	/* Array index: 0x0658 */ 0x51A3,0x2F59,
-	/* Array index: 0x0658 */ 0x51A6,0x2F5A,
-	/* Array index: 0x0658 */ 0x51A8,0x344D,
-	/* Array index: 0x0658 */ 0x51B8,0x245A,
-	/* Array index: 0x0658 */ 0x51C7,0x2F5E,
-	/* Array index: 0x0658 */ 0x51C9,0x2F5F,
-	/* Array index: 0x0658 */ 0x51D6,0x397E,
-	/* Array index: 0x0658 */ 0x51DF,0x5442,
-	/* Array index: 0x0658 */ 0x51E8,0x2322,
-	/* Array index: 0x0658 */ 0x51EC,0x245B,
-	/* Array index: 0x0658 */ 0x51ED,0x2759,
-	/* Array index: 0x0658 */ 0x51F4,0x457A,
-	/* Array index: 0x0658 */ 0x51FE,0x275A,
-	/* Array index: 0x0658 */ 0x5204,0x2136,
-	/* Array index: 0x0658 */ 0x5205,0x2152,
-	/* Array index: 0x0658 */ 0x520B,0x217D,
-	/* Array index: 0x0658 */ 0x520F,0x2325,
-	/* Array index: 0x0658 */ 0x5214,0x2324,
-	/* Array index: 0x0658 */ 0x5215,0x2326,
-	/* Array index: 0x0658 */ 0x5218,0x2327,
-	/* Array index: 0x0658 */ 0x521F,0x245F,
-	/* Array index: 0x0658 */ 0x5220,0x2461,
-	/* Array index: 0x0658 */ 0x5223,0x245C,
-	/* Array index: 0x0658 */ 0x5226,0x245E,
-	/* Array index: 0x0658 */ 0x5227,0x245D,
-	/* Array index: 0x0658 */ 0x522B,0x2460,
-	/* Array index: 0x0658 */ 0x522F,0x275B,
-	/* Array index: 0x0658 */ 0x5234,0x275E,
-	/* Array index: 0x0658 */ 0x5239,0x275F,
-	/* Array index: 0x0658 */ 0x523C,0x275D,
-	/* Array index: 0x0658 */ 0x523E,0x644F,
-	/* Array index: 0x0658 */ 0x5245,0x2B3F,
-	/* Array index: 0x0658 */ 0x5248,0x2B40,
-	/* Array index: 0x0658 */ 0x524F,0x2B43,
-	/* Array index: 0x0658 */ 0x5253,0x2F68,
-	/* Array index: 0x0658 */ 0x5257,0x2F65,
-	/* Array index: 0x0658 */ 0x5259,0x2F62,
-	/* Array index: 0x0658 */ 0x5260,0x2F60,
-	/* Array index: 0x0658 */ 0x5270,0x3A23,
-	/* Array index: 0x0658 */ 0x5273,0x3A21,
-	/* Array index: 0x0658 */ 0x5276,0x3451,
-	/* Array index: 0x0658 */ 0x5279,0x4041,
-	/* Array index: 0x0658 */ 0x527E,0x4040,
-	/* Array index: 0x0658 */ 0x5286,0x4B31,
-	/* Array index: 0x0658 */ 0x528E,0x4B32,
-	/* Array index: 0x0658 */ 0x5290,0x5036,
-	/* Array index: 0x0658 */ 0x5294,0x5037,
-	/* Array index: 0x0658 */ 0x52A8,0x2328,
-	/* Array index: 0x0658 */ 0x52B9,0x2760,
-	/* Array index: 0x0658 */ 0x52BD,0x625A,
-	/* Array index: 0x0658 */ 0x52BF,0x2762,
-	/* Array index: 0x0658 */ 0x52C4,0x2B48,
-	/* Array index: 0x0658 */ 0x52C5,0x2B46,
-	/* Array index: 0x0658 */ 0x52CA,0x2B47,
-	/* Array index: 0x0658 */ 0x52D4,0x3452,
-	/* Array index: 0x0658 */ 0x52E0,0x4045,
-	/* Array index: 0x0658 */ 0x52E1,0x4044,
-	/* Array index: 0x0658 */ 0x52E7,0x4046,
-	/* Array index: 0x0658 */ 0x52EA,0x4621,
-	/* Array index: 0x0658 */ 0x52ED,0x457E,
-	/* Array index: 0x0658 */ 0x52EE,0x4B33,
-	/* Array index: 0x0658 */ 0x52F2,0x4D2C,
-	/* Array index: 0x0658 */ 0x52FD,0x2155,
-	/* Array index: 0x0658 */ 0x5300,0x2156,
-	/* Array index: 0x0658 */ 0x5303,0x2223,
-	/* Array index: 0x0658 */ 0x5304,0x2222,
-	/* Array index: 0x0658 */ 0x5307,0x2224,
-	/* Array index: 0x0658 */ 0x5314,0x5038,
-	/* Array index: 0x0658 */ 0x531E,0x2226,
-	/* Array index: 0x0658 */ 0x5324,0x6450,
-	/* Array index: 0x0658 */ 0x5325,0x2465,
-	/* Array index: 0x0658 */ 0x5327,0x2B49,
-	/* Array index: 0x0658 */ 0x5346,0x2159,
-	/* Array index: 0x0658 */ 0x534B,0x232A,
-	/* Array index: 0x0658 */ 0x534F,0x232B,
-	/* Array index: 0x0658 */ 0x5350,0x232D,
-	/* Array index: 0x0658 */ 0x5355,0x2763,
-	/* Array index: 0x0658 */ 0x5358,0x2B4A,
-	/* Array index: 0x0658 */ 0x535D,0x215A,
-	/* Array index: 0x0658 */ 0x535F,0x2227,
-	/* Array index: 0x0658 */ 0x5365,0x6451,
-	/* Array index: 0x0658 */ 0x5367,0x2A5C,
-	/* Array index: 0x0658 */ 0x5369,0x212A,
-	/* Array index: 0x0658 */ 0x536D,0x2228,
-	/* Array index: 0x0658 */ 0x5374,0x2467,
-	/* Array index: 0x0658 */ 0x5376,0x2765,
-	/* Array index: 0x0658 */ 0x537A,0x2766,
-	/* Array index: 0x0658 */ 0x537D,0x2B4B,
-	/* Array index: 0x0658 */ 0x5380,0x4047,
-	/* Array index: 0x0658 */ 0x5386,0x215B,
-	/* Array index: 0x0658 */ 0x5389,0x2229,
-	/* Array index: 0x0658 */ 0x538B,0x232F,
-	/* Array index: 0x0658 */ 0x5393,0x2767,
-	/* Array index: 0x0658 */ 0x539B,0x6452,
-	/* Array index: 0x0658 */ 0x53A0,0x3454,
-	/* Array index: 0x0658 */ 0x53AE,0x4625,
-	/* Array index: 0x0658 */ 0x53B0,0x4626,
-	/* Array index: 0x0658 */ 0x53B1,0x4B35,
-	/* Array index: 0x0658 */ 0x53B3,0x5445,
-	/* Array index: 0x0658 */ 0x53B6,0x212B,
-	/* Array index: 0x0658 */ 0x53B7,0x215C,
-	/* Array index: 0x0658 */ 0x53BA,0x222A,
-	/* Array index: 0x0658 */ 0x53BE,0x2331,
-	/* Array index: 0x0658 */ 0x53CC,0x215E,
-	/* Array index: 0x0658 */ 0x53CE,0x2160,
-	/* Array index: 0x0658 */ 0x53D0,0x222B,
-	/* Array index: 0x0658 */ 0x53D2,0x2333,
-	/* Array index: 0x0658 */ 0x53D5,0x276B,
-	/* Array index: 0x0658 */ 0x53E0,0x404B,
-	/* Array index: 0x0658 */ 0x53F4,0x2231,
-	/* Array index: 0x0658 */ 0x53F6,0x222D,
-	/* Array index: 0x0658 */ 0x53F7,0x222E,
-	/* Array index: 0x0658 */ 0x53F9,0x222F,
-	/* Array index: 0x0658 */ 0x53FF,0x2335,
-	/* Array index: 0x0658 */ 0x5400,0x2337,
-	/* Array index: 0x0658 */ 0x5405,0x2339,
-	/* Array index: 0x0658 */ 0x5413,0x233A,
-	/* Array index: 0x0658 */ 0x5415,0x233B,
-	/* Array index: 0x0658 */ 0x5416,0x2334,
-	/* Array index: 0x0658 */ 0x541A,0x2476,
-	/* Array index: 0x0658 */ 0x542F,0x2524,
-	/* Array index: 0x0658 */ 0x5432,0x2477,
-	/* Array index: 0x0658 */ 0x5434,0x247B,
-	/* Array index: 0x0658 */ 0x543A,0x2470,
-	/* Array index: 0x0658 */ 0x543F,0x2521,
-	/* Array index: 0x0658 */ 0x5444,0x2473,
-	/* Array index: 0x0658 */ 0x545A,0x2523,
-	/* Array index: 0x0658 */ 0x545F,0x276E,
-	/* Array index: 0x0658 */ 0x5469,0x2774,
-	/* Array index: 0x0658 */ 0x546A,0x2778,
-	/* Array index: 0x0658 */ 0x546D,0x2775,
-	/* Array index: 0x0658 */ 0x5479,0x2771,
-	/* Array index: 0x0658 */ 0x5485,0x276C,
-	/* Array index: 0x0658 */ 0x5489,0x2770,
-	/* Array index: 0x0658 */ 0x548A,0x2779,
-	/* Array index: 0x0658 */ 0x548F,0x2773,
-	/* Array index: 0x0658 */ 0x5493,0x276F,
-	/* Array index: 0x0658 */ 0x5494,0x2777,
-	/* Array index: 0x0658 */ 0x549E,0x2B5C,
-	/* Array index: 0x0658 */ 0x549F,0x2B5D,
-	/* Array index: 0x0658 */ 0x54A3,0x2B57,
-	/* Array index: 0x0658 */ 0x54A4,0x2B59,
-	/* Array index: 0x0658 */ 0x54B2,0x2B5B,
-	/* Array index: 0x0658 */ 0x54B4,0x2B54,
-	/* Array index: 0x0658 */ 0x54B5,0x2B5E,
-	/* Array index: 0x0658 */ 0x54B9,0x2B51,
-	/* Array index: 0x0658 */ 0x54D0,0x2B53,
-	/* Array index: 0x0658 */ 0x54DA,0x2B58,
-	/* Array index: 0x0658 */ 0x54EF,0x2F77,
-	/* Array index: 0x0658 */ 0x54F0,0x3021,
-	/* Array index: 0x0658 */ 0x54F9,0x2F79,
-	/* Array index: 0x0658 */ 0x5500,0x2F7B,
-	/* Array index: 0x0658 */ 0x5502,0x2F7A,
-	/* Array index: 0x0658 */ 0x550D,0x2F73,
-	/* Array index: 0x0658 */ 0x5513,0x2F76,
-	/* Array index: 0x0658 */ 0x5518,0x2F7E,
-	/* Array index: 0x0658 */ 0x5519,0x3025,
-	/* Array index: 0x0658 */ 0x5528,0x6721,
-	/* Array index: 0x0658 */ 0x5529,0x345F,
-	/* Array index: 0x0658 */ 0x552B,0x3468,
-	/* Array index: 0x0658 */ 0x553A,0x3466,
-	/* Array index: 0x0658 */ 0x553F,0x3467,
-	/* Array index: 0x0658 */ 0x5549,0x345B,
-	/* Array index: 0x0658 */ 0x554C,0x3458,
-	/* Array index: 0x0658 */ 0x5553,0x3462,
-	/* Array index: 0x0658 */ 0x5554,0x3461,
-	/* Array index: 0x0658 */ 0x555D,0x345E,
-	/* Array index: 0x0658 */ 0x5568,0x3459,
-	/* Array index: 0x0658 */ 0x556B,0x6457,
-	/* Array index: 0x0658 */ 0x557A,0x3A3C,
-	/* Array index: 0x0658 */ 0x5585,0x3A31,
-	/* Array index: 0x0658 */ 0x5586,0x3A38,
-	/* Array index: 0x0658 */ 0x5596,0x3A2E,
-	/* Array index: 0x0658 */ 0x5597,0x3A2A,
-	/* Array index: 0x0658 */ 0x559B,0x3A33,
-	/* Array index: 0x0658 */ 0x559E,0x3A40,
-	/* Array index: 0x0658 */ 0x55A0,0x3A34,
-	/* Array index: 0x0658 */ 0x55A9,0x3A42,
-	/* Array index: 0x0658 */ 0x55AF,0x3A3B,
-	/* Array index: 0x0658 */ 0x55B4,0x3A2F,
-	/* Array index: 0x0658 */ 0x55BA,0x6723,
-	/* Array index: 0x0658 */ 0x55C1,0x4051,
-	/* Array index: 0x0658 */ 0x55D7,0x404E,
-	/* Array index: 0x0658 */ 0x55DE,0x3A2B,
-	/* Array index: 0x0658 */ 0x55EA,0x404C,
-	/* Array index: 0x0658 */ 0x55EE,0x6725,
-	/* Array index: 0x0658 */ 0x55F0,0x6724,
-	/* Array index: 0x0658 */ 0x55F4,0x6458,
-	/* Array index: 0x0658 */ 0x55F8,0x462E,
-	/* Array index: 0x0658 */ 0x55FB,0x4628,
-	/* Array index: 0x0658 */ 0x5603,0x4629,
-	/* Array index: 0x0658 */ 0x5605,0x4636,
-	/* Array index: 0x0658 */ 0x5607,0x462C,
-	/* Array index: 0x0658 */ 0x560B,0x462A,
-	/* Array index: 0x0658 */ 0x5611,0x4634,
-	/* Array index: 0x0658 */ 0x5618,0x4633,
-	/* Array index: 0x0658 */ 0x561E,0x4631,
-	/* Array index: 0x0658 */ 0x5620,0x645A,
-	/* Array index: 0x0658 */ 0x5622,0x6459,
-	/* Array index: 0x0658 */ 0x5626,0x4650,
-	/* Array index: 0x0658 */ 0x5628,0x4630,
-	/* Array index: 0x0658 */ 0x562B,0x4B41,
-	/* Array index: 0x0658 */ 0x562D,0x4B38,
-	/* Array index: 0x0658 */ 0x5631,0x4B3D,
-	/* Array index: 0x0658 */ 0x5637,0x4B44,
-	/* Array index: 0x0658 */ 0x5644,0x4B3E,
-	/* Array index: 0x0658 */ 0x5647,0x4B37,
-	/* Array index: 0x0658 */ 0x564B,0x4B3B,
-	/* Array index: 0x0658 */ 0x565F,0x503F,
-	/* Array index: 0x0658 */ 0x5661,0x5040,
-	/* Array index: 0x0658 */ 0x5667,0x503B,
-	/* Array index: 0x0658 */ 0x567B,0x503D,
-	/* Array index: 0x0658 */ 0x567D,0x5448,
-	/* Array index: 0x0658 */ 0x5689,0x5449,
-	/* Array index: 0x0658 */ 0x568A,0x5447,
-	/* Array index: 0x0658 */ 0x5691,0x645D,
-	/* Array index: 0x0658 */ 0x5692,0x645B,
-	/* Array index: 0x0658 */ 0x5694,0x575B,
-	/* Array index: 0x0658 */ 0x5696,0x575A,
-	/* Array index: 0x0658 */ 0x569B,0x5758,
-	/* Array index: 0x0658 */ 0x56AF,0x5A2D,
-	/* Array index: 0x0658 */ 0x56B0,0x645E,
-	/* Array index: 0x0658 */ 0x56C4,0x6728,
-	/* Array index: 0x0658 */ 0x56C7,0x5F40,
-	/* Array index: 0x0658 */ 0x56D2,0x6071,
-	/* Array index: 0x0658 */ 0x56D8,0x2177,
-	/* Array index: 0x0658 */ 0x56E3,0x233E,
-	/* Array index: 0x0658 */ 0x56E6,0x252C,
-	/* Array index: 0x0658 */ 0x56E9,0x2526,
-	/* Array index: 0x0658 */ 0x56EC,0x252B,
-	/* Array index: 0x0658 */ 0x56ED,0x252A,
-	/* Array index: 0x0658 */ 0x56F6,0x2822,
-	/* Array index: 0x0658 */ 0x56F8,0x277D,
-	/* Array index: 0x0658 */ 0x5700,0x2B65,
-	/* Array index: 0x0658 */ 0x5705,0x3027,
-	/* Array index: 0x0658 */ 0x570E,0x3A44,
-	/* Array index: 0x0658 */ 0x570F,0x3A43,
-	/* Array index: 0x0658 */ 0x5715,0x4052,
-	/* Array index: 0x0658 */ 0x5717,0x4637,
-	/* Array index: 0x0658 */ 0x571D,0x5F41,
-	/* Array index: 0x0658 */ 0x5721,0x2161,
-	/* Array index: 0x0658 */ 0x5724,0x2234,
-	/* Array index: 0x0658 */ 0x5727,0x6249,
-	/* Array index: 0x0658 */ 0x5731,0x2341,
-	/* Array index: 0x0658 */ 0x5732,0x2342,
-	/* Array index: 0x0658 */ 0x5735,0x233F,
-	/* Array index: 0x0658 */ 0x5736,0x2340,
-	/* Array index: 0x0658 */ 0x573C,0x2531,
-	/* Array index: 0x0658 */ 0x573D,0x253E,
-	/* Array index: 0x0658 */ 0x573F,0x2530,
-	/* Array index: 0x0658 */ 0x575F,0x2535,
-	/* Array index: 0x0658 */ 0x5763,0x2825,
-	/* Array index: 0x0658 */ 0x5765,0x2823,
-	/* Array index: 0x0658 */ 0x5767,0x2826,
-	/* Array index: 0x0658 */ 0x576E,0x2828,
-	/* Array index: 0x0658 */ 0x5778,0x2829,
-	/* Array index: 0x0658 */ 0x577F,0x282A,
-	/* Array index: 0x0658 */ 0x5781,0x2824,
-	/* Array index: 0x0658 */ 0x578A,0x6460,
-	/* Array index: 0x0658 */ 0x5796,0x2B71,
-	/* Array index: 0x0658 */ 0x579C,0x2B70,
-	/* Array index: 0x0658 */ 0x57A1,0x2B6B,
-	/* Array index: 0x0658 */ 0x57AC,0x2B66,
-	/* Array index: 0x0658 */ 0x57B7,0x302A,
-	/* Array index: 0x0658 */ 0x57BB,0x3030,
-	/* Array index: 0x0658 */ 0x57BE,0x302F,
-	/* Array index: 0x0658 */ 0x57C0,0x3038,
-	/* Array index: 0x0658 */ 0x57CD,0x302B,
-	/* Array index: 0x0658 */ 0x57D1,0x3036,
-	/* Array index: 0x0658 */ 0x57DB,0x3032,
-	/* Array index: 0x0658 */ 0x57DD,0x346E,
-	/* Array index: 0x0658 */ 0x57DE,0x3471,
-	/* Array index: 0x0658 */ 0x57E6,0x3472,
-	/* Array index: 0x0658 */ 0x57E8,0x3474,
-	/* Array index: 0x0658 */ 0x57EA,0x3469,
-	/* Array index: 0x0658 */ 0x57EF,0x346B,
-	/* Array index: 0x0658 */ 0x57FE,0x346F,
-	/* Array index: 0x0658 */ 0x57FF,0x3475,
-	/* Array index: 0x0658 */ 0x5803,0x3476,
-	/* Array index: 0x0658 */ 0x580F,0x6461,
-	/* Array index: 0x0658 */ 0x5812,0x6462,
-	/* Array index: 0x0658 */ 0x5813,0x6463,
-	/* Array index: 0x0658 */ 0x5818,0x3A4A,
-	/* Array index: 0x0658 */ 0x581A,0x3A45,
-	/* Array index: 0x0658 */ 0x581F,0x3A47,
-	/* Array index: 0x0658 */ 0x5822,0x3A50,
-	/* Array index: 0x0658 */ 0x5826,0x3A4C,
-	/* Array index: 0x0658 */ 0x582B,0x6336,
-	/* Array index: 0x0658 */ 0x583A,0x3A4E,
-	/* Array index: 0x0658 */ 0x583C,0x3A49,
-	/* Array index: 0x0658 */ 0x583E,0x3A4B,
-	/* Array index: 0x0658 */ 0x5845,0x6337,
-	/* Array index: 0x0658 */ 0x5847,0x6464,
-	/* Array index: 0x0658 */ 0x5850,0x4057,
-	/* Array index: 0x0658 */ 0x5856,0x405B,
-	/* Array index: 0x0658 */ 0x585C,0x4056,
-	/* Array index: 0x0658 */ 0x5872,0x4643,
-	/* Array index: 0x0658 */ 0x5873,0x463E,
-	/* Array index: 0x0658 */ 0x5877,0x4642,
-	/* Array index: 0x0658 */ 0x5878,0x463C,
-	/* Array index: 0x0658 */ 0x5884,0x463D,
-	/* Array index: 0x0658 */ 0x588C,0x463A,
-	/* Array index: 0x0658 */ 0x588D,0x4645,
-	/* Array index: 0x0658 */ 0x5892,0x4638,
-	/* Array index: 0x0658 */ 0x589B,0x6465,
-	/* Array index: 0x0658 */ 0x58A2,0x4B46,
-	/* Array index: 0x0658 */ 0x58A4,0x4B50,
-	/* Array index: 0x0658 */ 0x58A7,0x4B51,
-	/* Array index: 0x0658 */ 0x58AA,0x4B4B,
-	/* Array index: 0x0658 */ 0x58AD,0x463F,
-	/* Array index: 0x0658 */ 0x58B0,0x4B4D,
-	/* Array index: 0x0658 */ 0x58B2,0x4B49,
-	/* Array index: 0x0658 */ 0x58B4,0x4B4F,
-	/* Array index: 0x0658 */ 0x58B5,0x4B4C,
-	/* Array index: 0x0658 */ 0x58B7,0x4B47,
-	/* Array index: 0x0658 */ 0x58BB,0x504A,
-	/* Array index: 0x0658 */ 0x58C0,0x504B,
-	/* Array index: 0x0658 */ 0x58C3,0x5048,
-	/* Array index: 0x0658 */ 0x58C4,0x504C,
-	/* Array index: 0x0658 */ 0x58CA,0x5049,
-	/* Array index: 0x0658 */ 0x58CD,0x544B,
-	/* Array index: 0x0658 */ 0x58D0,0x544C,
-	/* Array index: 0x0658 */ 0x58DC,0x5A2F,
-	/* Array index: 0x0658 */ 0x58E0,0x5A2E,
-	/* Array index: 0x0658 */ 0x58E6,0x5E28,
-	/* Array index: 0x0658 */ 0x58FB,0x3A52,
-	/* Array index: 0x0658 */ 0x5910,0x4646,
-	/* Array index: 0x0658 */ 0x5911,0x6560,
-	/* Array index: 0x0658 */ 0x5918,0x2236,
-	/* Array index: 0x0658 */ 0x591F,0x3479,
-	/* Array index: 0x0658 */ 0x5923,0x405F,
-	/* Array index: 0x0658 */ 0x5926,0x4B53,
-	/* Array index: 0x0658 */ 0x5930,0x2238,
-	/* Array index: 0x0658 */ 0x5932,0x2237,
-	/* Array index: 0x0658 */ 0x5934,0x2239,
-	/* Array index: 0x0658 */ 0x5936,0x2347,
-	/* Array index: 0x0658 */ 0x593D,0x2549,
-	/* Array index: 0x0658 */ 0x5952,0x2B7C,
-	/* Array index: 0x0658 */ 0x595B,0x347B,
-	/* Array index: 0x0658 */ 0x595D,0x347C,
-	/* Array index: 0x0658 */ 0x595E,0x347D,
-	/* Array index: 0x0658 */ 0x5963,0x3A53,
-	/* Array index: 0x0658 */ 0x5964,0x3A54,
-	/* Array index: 0x0658 */ 0x5966,0x4060,
-	/* Array index: 0x0658 */ 0x5968,0x4061,
-	/* Array index: 0x0658 */ 0x596C,0x4648,
-	/* Array index: 0x0658 */ 0x5975,0x223B,
-	/* Array index: 0x0658 */ 0x597A,0x234B,
-	/* Array index: 0x0658 */ 0x5986,0x234D,
-	/* Array index: 0x0658 */ 0x5989,0x2555,
-	/* Array index: 0x0658 */ 0x598C,0x254C,
-	/* Array index: 0x0658 */ 0x5994,0x254B,
-	/* Array index: 0x0658 */ 0x599F,0x2551,
-	/* Array index: 0x0658 */ 0x59AC,0x2841,
-	/* Array index: 0x0658 */ 0x59AD,0x2833,
-	/* Array index: 0x0658 */ 0x59B0,0x2838,
-	/* Array index: 0x0658 */ 0x59B7,0x2845,
-	/* Array index: 0x0658 */ 0x59B8,0x2840,
-	/* Array index: 0x0658 */ 0x59BF,0x283D,
-	/* Array index: 0x0658 */ 0x59C2,0x2837,
-	/* Array index: 0x0658 */ 0x59C4,0x2835,
-	/* Array index: 0x0658 */ 0x59C9,0x283F,
-	/* Array index: 0x0658 */ 0x59D5,0x2C26,
-	/* Array index: 0x0658 */ 0x59D7,0x2846,
-	/* Array index: 0x0658 */ 0x59D9,0x2C2D,
-	/* Array index: 0x0658 */ 0x59DF,0x2C21,
-	/* Array index: 0x0658 */ 0x59E2,0x2C2C,
-	/* Array index: 0x0658 */ 0x59E7,0x2C2E,
-	/* Array index: 0x0658 */ 0x59EB,0x2C23,
-	/* Array index: 0x0658 */ 0x59EF,0x2C24,
-	/* Array index: 0x0658 */ 0x59F0,0x2C25,
-	/* Array index: 0x0658 */ 0x59F8,0x2C2B,
-	/* Array index: 0x0658 */ 0x59F9,0x2C29,
-	/* Array index: 0x0658 */ 0x5A02,0x2C2A,
-	/* Array index: 0x0658 */ 0x5A04,0x2C28,
-	/* Array index: 0x0658 */ 0x5A0B,0x3040,
-	/* Array index: 0x0658 */ 0x5A0D,0x2C27,
-	/* Array index: 0x0658 */ 0x5A10,0x6270,
-	/* Array index: 0x0658 */ 0x5A12,0x304F,
-	/* Array index: 0x0658 */ 0x5A14,0x304A,
-	/* Array index: 0x0658 */ 0x5A1A,0x304E,
-	/* Array index: 0x0658 */ 0x5A1D,0x303E,
-	/* Array index: 0x0658 */ 0x5A21,0x303B,
-	/* Array index: 0x0658 */ 0x5A22,0x3045,
-	/* Array index: 0x0658 */ 0x5A24,0x3048,
-	/* Array index: 0x0658 */ 0x5A26,0x3052,
-	/* Array index: 0x0658 */ 0x5A2F,0x304D,
-	/* Array index: 0x0658 */ 0x5A31,0x304B,
-	/* Array index: 0x0658 */ 0x5A3A,0x3528,
-	/* Array index: 0x0658 */ 0x5A3B,0x3524,
-	/* Array index: 0x0658 */ 0x5A3D,0x3531,
-	/* Array index: 0x0658 */ 0x5A3F,0x3533,
-	/* Array index: 0x0658 */ 0x5A45,0x352E,
-	/* Array index: 0x0658 */ 0x5A4B,0x352A,
-	/* Array index: 0x0658 */ 0x5A4E,0x352F,
-	/* Array index: 0x0658 */ 0x5A4F,0x353B,
-	/* Array index: 0x0658 */ 0x5A54,0x353A,
-	/* Array index: 0x0658 */ 0x5A59,0x3539,
-	/* Array index: 0x0658 */ 0x5A61,0x3527,
-	/* Array index: 0x0658 */ 0x5A63,0x353C,
-	/* Array index: 0x0658 */ 0x5A68,0x3530,
-	/* Array index: 0x0658 */ 0x5A6B,0x352B,
-	/* Array index: 0x0658 */ 0x5A6E,0x3529,
-	/* Array index: 0x0658 */ 0x5A6F,0x3534,
-	/* Array index: 0x0658 */ 0x5A71,0x3532,
-	/* Array index: 0x0658 */ 0x5A73,0x3537,
-	/* Array index: 0x0658 */ 0x5A75,0x3535,
-	/* Array index: 0x0658 */ 0x5A79,0x3A75,
-	/* Array index: 0x0658 */ 0x5A8D,0x3A7B,
-	/* Array index: 0x0658 */ 0x5A91,0x3A66,
-	/* Array index: 0x0658 */ 0x5A96,0x3A62,
-	/* Array index: 0x0658 */ 0x5A98,0x3A5C,
-	/* Array index: 0x0658 */ 0x5A99,0x3A5E,
-	/* Array index: 0x0658 */ 0x5AA8,0x3A56,
-	/* Array index: 0x0658 */ 0x5AAA,0x3A79,
-	/* Array index: 0x0658 */ 0x5AAB,0x3A78,
-	/* Array index: 0x0658 */ 0x5AC3,0x4067,
-	/* Array index: 0x0658 */ 0x5AC5,0x4066,
-	/* Array index: 0x0658 */ 0x5AE4,0x464C,
-	/* Array index: 0x0658 */ 0x5AE7,0x464A,
-	/* Array index: 0x0658 */ 0x5AEF,0x464F,
-	/* Array index: 0x0658 */ 0x5AF0,0x4653,
-	/* Array index: 0x0658 */ 0x5AFA,0x4B5C,
-	/* Array index: 0x0658 */ 0x5AFC,0x4B58,
-	/* Array index: 0x0658 */ 0x5AFE,0x4B54,
-	/* Array index: 0x0658 */ 0x5B00,0x4B5E,
-	/* Array index: 0x0658 */ 0x5B04,0x4B56,
-	/* Array index: 0x0658 */ 0x5B06,0x4B5A,
-	/* Array index: 0x0658 */ 0x5B0A,0x4B5B,
-	/* Array index: 0x0658 */ 0x5B0D,0x4B5D,
-	/* Array index: 0x0658 */ 0x5B0E,0x4B5F,
-	/* Array index: 0x0658 */ 0x5B11,0x5050,
-	/* Array index: 0x0658 */ 0x5B12,0x5053,
-	/* Array index: 0x0658 */ 0x5B15,0x5051,
-	/* Array index: 0x0658 */ 0x5B18,0x504F,
-	/* Array index: 0x0658 */ 0x5B1C,0x5054,
-	/* Array index: 0x0658 */ 0x5B1F,0x504E,
-	/* Array index: 0x0658 */ 0x5B22,0x5056,
-	/* Array index: 0x0658 */ 0x5B29,0x5450,
-	/* Array index: 0x0658 */ 0x5B2B,0x544E,
-	/* Array index: 0x0658 */ 0x5B31,0x5452,
-	/* Array index: 0x0658 */ 0x5B33,0x544F,
-	/* Array index: 0x0658 */ 0x5B35,0x5451,
-	/* Array index: 0x0658 */ 0x5B42,0x5C36,
-	/* Array index: 0x0658 */ 0x5B44,0x5C39,
-	/* Array index: 0x0658 */ 0x5B46,0x5C3A,
-	/* Array index: 0x0658 */ 0x5B49,0x5E29,
-	/* Array index: 0x0658 */ 0x5B4A,0x5F42,
-	/* Array index: 0x0658 */ 0x5B4F,0x6073,
-	/* Array index: 0x0658 */ 0x5B60,0x2848,
-	/* Array index: 0x0658 */ 0x5B66,0x625C,
-	/* Array index: 0x0658 */ 0x5B67,0x646A,
-	/* Array index: 0x0658 */ 0x5B6A,0x2C2F,
-	/* Array index: 0x0658 */ 0x5B74,0x4071,
-	/* Array index: 0x0658 */ 0x5B76,0x4072,
-	/* Array index: 0x0658 */ 0x5B79,0x5057,
-	/* Array index: 0x0658 */ 0x5B7C,0x5A34,
-	/* Array index: 0x0658 */ 0x5B7E,0x5C3B,
-	/* Array index: 0x0658 */ 0x5B80,0x213B,
-	/* Array index: 0x0658 */ 0x5B82,0x223D,
-	/* Array index: 0x0658 */ 0x5B86,0x2350,
-	/* Array index: 0x0658 */ 0x5B8D,0x255A,
-	/* Array index: 0x0658 */ 0x5B94,0x284C,
-	/* Array index: 0x0658 */ 0x5B96,0x284A,
-	/* Array index: 0x0658 */ 0x5BAB,0x2C32,
-	/* Array index: 0x0658 */ 0x5BB7,0x3057,
-	/* Array index: 0x0658 */ 0x5BBB,0x3056,
-	/* Array index: 0x0658 */ 0x5BBC,0x3055,
-	/* Array index: 0x0658 */ 0x5BC3,0x3541,
-	/* Array index: 0x0658 */ 0x5BC8,0x353F,
-	/* Array index: 0x0658 */ 0x5BD5,0x3A7E,
-	/* Array index: 0x0658 */ 0x5BD7,0x4074,
-	/* Array index: 0x0658 */ 0x5BF3,0x5A35,
-	/* Array index: 0x0658 */ 0x5BF7,0x5E2A,
-	/* Array index: 0x0658 */ 0x5BF9,0x223E,
-	/* Array index: 0x0658 */ 0x5C05,0x3058,
-	/* Array index: 0x0658 */ 0x5C06,0x3059,
-	/* Array index: 0x0658 */ 0x5C13,0x624A,
-	/* Array index: 0x0658 */ 0x5C14,0x223F,
-	/* Array index: 0x0658 */ 0x5C18,0x2352,
-	/* Array index: 0x0658 */ 0x5C19,0x2851,
-	/* Array index: 0x0658 */ 0x5C1B,0x2C34,
-	/* Array index: 0x0658 */ 0x5C1E,0x3B24,
-	/* Array index: 0x0658 */ 0x5C20,0x4078,
-	/* Array index: 0x0658 */ 0x5C21,0x6525,
-	/* Array index: 0x0658 */ 0x5C2B,0x255F,
-	/* Array index: 0x0658 */ 0x5C2F,0x2C35,
-	/* Array index: 0x0658 */ 0x5C36,0x5454,
-	/* Array index: 0x0658 */ 0x5C3D,0x2354,
-	/* Array index: 0x0658 */ 0x5C49,0x2854,
-	/* Array index: 0x0658 */ 0x5C4A,0x2855,
-	/* Array index: 0x0658 */ 0x5C52,0x305A,
-	/* Array index: 0x0658 */ 0x5C53,0x305B,
-	/* Array index: 0x0658 */ 0x5C57,0x646B,
-	/* Array index: 0x0658 */ 0x5C5B,0x3543,
-	/* Array index: 0x0658 */ 0x5C5E,0x3B26,
-	/* Array index: 0x0658 */ 0x5C5F,0x3B25,
-	/* Array index: 0x0658 */ 0x5C61,0x3544,
-	/* Array index: 0x0658 */ 0x5C6B,0x5A38,
-	/* Array index: 0x0658 */ 0x5C77,0x646C,
-	/* Array index: 0x0658 */ 0x5C78,0x2355,
-	/* Array index: 0x0658 */ 0x5C80,0x235A,
-	/* Array index: 0x0658 */ 0x5C84,0x2561,
-	/* Array index: 0x0658 */ 0x5C85,0x2566,
-	/* Array index: 0x0658 */ 0x5C8E,0x2562,
-	/* Array index: 0x0658 */ 0x5C9C,0x2563,
-	/* Array index: 0x0658 */ 0x5C9E,0x285D,
-	/* Array index: 0x0658 */ 0x5CB4,0x285E,
-	/* Array index: 0x0658 */ 0x5CC1,0x2858,
-	/* Array index: 0x0658 */ 0x5CCD,0x2C3F,
-	/* Array index: 0x0658 */ 0x5CD1,0x2C3B,
-	/* Array index: 0x0658 */ 0x5CD5,0x646D,
-	/* Array index: 0x0658 */ 0x5CDC,0x2C3C,
-	/* Array index: 0x0658 */ 0x5CDD,0x2C42,
-	/* Array index: 0x0658 */ 0x5CE1,0x2C3E,
-	/* Array index: 0x0658 */ 0x5CE2,0x2C41,
-	/* Array index: 0x0658 */ 0x5CE5,0x2C43,
-	/* Array index: 0x0658 */ 0x5CE6,0x2C3D,
-	/* Array index: 0x0658 */ 0x5CE9,0x3063,
-	/* Array index: 0x0658 */ 0x5CEB,0x305F,
-	/* Array index: 0x0658 */ 0x5CEF,0x3064,
-	/* Array index: 0x0658 */ 0x5CF3,0x3061,
-	/* Array index: 0x0658 */ 0x5CF5,0x3062,
-	/* Array index: 0x0658 */ 0x5CFA,0x305E,
-	/* Array index: 0x0658 */ 0x5CFC,0x6271,
-	/* Array index: 0x0658 */ 0x5CFE,0x6272,
-	/* Array index: 0x0658 */ 0x5D10,0x3551,
-	/* Array index: 0x0658 */ 0x5D13,0x3552,
-	/* Array index: 0x0658 */ 0x5D15,0x354F,
-	/* Array index: 0x0658 */ 0x5D18,0x3555,
-	/* Array index: 0x0658 */ 0x5D1C,0x3B2B,
-	/* Array index: 0x0658 */ 0x5D21,0x3546,
-	/* Array index: 0x0658 */ 0x5D2A,0x354E,
-	/* Array index: 0x0658 */ 0x5D2C,0x354A,
-	/* Array index: 0x0658 */ 0x5D2F,0x3554,
-	/* Array index: 0x0658 */ 0x5D3B,0x3B36,
-	/* Array index: 0x0658 */ 0x5D3E,0x3B28,
-	/* Array index: 0x0658 */ 0x5D44,0x3B27,
-	/* Array index: 0x0658 */ 0x5D46,0x3B37,
-	/* Array index: 0x0658 */ 0x5D48,0x3B2A,
-	/* Array index: 0x0658 */ 0x5D4D,0x3B2E,
-	/* Array index: 0x0658 */ 0x5D4F,0x3B34,
-	/* Array index: 0x0658 */ 0x5D53,0x3B33,
-	/* Array index: 0x0658 */ 0x5D57,0x3B31,
-	/* Array index: 0x0658 */ 0x5D5B,0x3B2D,
-	/* Array index: 0x0658 */ 0x5D60,0x4121,
-	/* Array index: 0x0658 */ 0x5D64,0x407C,
-	/* Array index: 0x0658 */ 0x5D66,0x407A,
-	/* Array index: 0x0658 */ 0x5D6D,0x4079,
-	/* Array index: 0x0658 */ 0x5D6E,0x407D,
-	/* Array index: 0x0658 */ 0x5D75,0x646E,
-	/* Array index: 0x0658 */ 0x5D78,0x465C,
-	/* Array index: 0x0658 */ 0x5D7B,0x4654,
-	/* Array index: 0x0658 */ 0x5D83,0x4656,
-	/* Array index: 0x0658 */ 0x5D96,0x4B6B,
-	/* Array index: 0x0658 */ 0x5D98,0x4B67,
-	/* Array index: 0x0658 */ 0x5D9B,0x4B69,
-	/* Array index: 0x0658 */ 0x5DAB,0x505B,
-	/* Array index: 0x0658 */ 0x5DB3,0x505A,
-	/* Array index: 0x0658 */ 0x5DB6,0x6471,
-	/* Array index: 0x0658 */ 0x5DB9,0x5457,
-	/* Array index: 0x0658 */ 0x5DBB,0x5459,
-	/* Array index: 0x0658 */ 0x5DBE,0x5455,
-	/* Array index: 0x0658 */ 0x5DBF,0x6472,
-	/* Array index: 0x0658 */ 0x5DC1,0x5762,
-	/* Array index: 0x0658 */ 0x5DC4,0x5A39,
-	/* Array index: 0x0658 */ 0x5DC8,0x5C3D,
-	/* Array index: 0x0658 */ 0x5DCA,0x5C3C,
-	/* Array index: 0x0658 */ 0x5DCC,0x5C3E,
-	/* Array index: 0x0658 */ 0x5DD0,0x5E2D,
-	/* Array index: 0x0658 */ 0x5DD3,0x5F43,
-	/* Array index: 0x0658 */ 0x5DD7,0x6030,
-	/* Array index: 0x0658 */ 0x5DDB,0x213C,
-	/* Array index: 0x0658 */ 0x5DE3,0x3557,
-	/* Array index: 0x0658 */ 0x5DE4,0x4B6C,
-	/* Array index: 0x0658 */ 0x5DF5,0x2567,
-	/* Array index: 0x0658 */ 0x5DF6,0x2860,
-	/* Array index: 0x0658 */ 0x5DFA,0x2C45,
-	/* Array index: 0x0658 */ 0x5DFB,0x2C44,
-	/* Array index: 0x0658 */ 0x5E00,0x2163,
-	/* Array index: 0x0658 */ 0x5E08,0x235C,
-	/* Array index: 0x0658 */ 0x5E09,0x2568,
-	/* Array index: 0x0658 */ 0x5E0B,0x256B,
-	/* Array index: 0x0658 */ 0x5E12,0x2862,
-	/* Array index: 0x0658 */ 0x5E13,0x2861,
-	/* Array index: 0x0658 */ 0x5E1E,0x2C46,
-	/* Array index: 0x0658 */ 0x5E2A,0x3066,
-	/* Array index: 0x0658 */ 0x5E35,0x3559,
-	/* Array index: 0x0658 */ 0x5E39,0x3558,
-	/* Array index: 0x0658 */ 0x5E3A,0x355A,
-	/* Array index: 0x0658 */ 0x5E42,0x3979,
-	/* Array index: 0x0658 */ 0x5E52,0x465D,
-	/* Array index: 0x0658 */ 0x5E5A,0x4B6D,
-	/* Array index: 0x0658 */ 0x5E5E,0x4B70,
-	/* Array index: 0x0658 */ 0x5E65,0x6473,
-	/* Array index: 0x0658 */ 0x5E71,0x6677,
-	/* Array index: 0x0658 */ 0x5E77,0x2863,
-	/* Array index: 0x0658 */ 0x5E7A,0x213D,
-	/* Array index: 0x0658 */ 0x5E7F,0x213E,
-	/* Array index: 0x0658 */ 0x5E81,0x2247,
-	/* Array index: 0x0658 */ 0x5E83,0x2248,
-	/* Array index: 0x0658 */ 0x5E85,0x6678,
-	/* Array index: 0x0658 */ 0x5E90,0x256E,
-	/* Array index: 0x0658 */ 0x5E92,0x256D,
-	/* Array index: 0x0658 */ 0x5E98,0x2865,
-	/* Array index: 0x0658 */ 0x5E99,0x2867,
-	/* Array index: 0x0658 */ 0x5E9D,0x2868,
-	/* Array index: 0x0658 */ 0x5EA1,0x2C48,
-	/* Array index: 0x0658 */ 0x5EA9,0x306C,
-	/* Array index: 0x0658 */ 0x5EAF,0x306B,
-	/* Array index: 0x0658 */ 0x5EBA,0x3561,
-	/* Array index: 0x0658 */ 0x5EBB,0x3560,
-	/* Array index: 0x0658 */ 0x5EBD,0x3B3F,
-	/* Array index: 0x0658 */ 0x5EBF,0x3B40,
-	/* Array index: 0x0658 */ 0x5EC0,0x3B3E,
-	/* Array index: 0x0658 */ 0x5ECD,0x6474,
-	/* Array index: 0x0658 */ 0x5ECF,0x4661,
-	/* Array index: 0x0658 */ 0x5ED0,0x4660,
-	/* Array index: 0x0658 */ 0x5EEA,0x505C,
-	/* Array index: 0x0658 */ 0x5EED,0x6475,
-	/* Array index: 0x0658 */ 0x5EF0,0x5C3F,
-	/* Array index: 0x0658 */ 0x5EF4,0x213F,
-	/* Array index: 0x0658 */ 0x5EF5,0x2361,
-	/* Array index: 0x0658 */ 0x5F03,0x256F,
-	/* Array index: 0x0658 */ 0x5F06,0x286D,
-	/* Array index: 0x0658 */ 0x5F11,0x3B42,
-	/* Array index: 0x0658 */ 0x5F1E,0x2571,
-	/* Array index: 0x0658 */ 0x5F21,0x286E,
-	/* Array index: 0x0658 */ 0x5F25,0x2870,
-	/* Array index: 0x0658 */ 0x5F2F,0x2C4D,
-	/* Array index: 0x0658 */ 0x5F32,0x306F,
-	/* Array index: 0x0658 */ 0x5F34,0x3562,
-	/* Array index: 0x0658 */ 0x5F3E,0x3B44,
-	/* Array index: 0x0658 */ 0x5F42,0x4122,
-	/* Array index: 0x0658 */ 0x5F4D,0x5763,
-	/* Array index: 0x0658 */ 0x5F5A,0x4123,
-	/* Array index: 0x0658 */ 0x5F5B,0x505E,
-	/* Array index: 0x0658 */ 0x5F5D,0x5764,
-	/* Array index: 0x0658 */ 0x5F60,0x6164,
-	/* Array index: 0x0658 */ 0x5F61,0x2142,
-	/* Array index: 0x0658 */ 0x5F63,0x2572,
-	/* Array index: 0x0658 */ 0x5F66,0x2C50,
-	/* Array index: 0x0658 */ 0x5F6E,0x4124,
-	/* Array index: 0x0658 */ 0x5F72,0x5F45,
-	/* Array index: 0x0658 */ 0x5F83,0x2876,
-	/* Array index: 0x0658 */ 0x5F84,0x2875,
-	/* Array index: 0x0658 */ 0x5F93,0x3071,
-	/* Array index: 0x0658 */ 0x5F94,0x6476,
-	/* Array index: 0x0658 */ 0x5F9A,0x6477,
-	/* Array index: 0x0658 */ 0x5FA7,0x3B4B,
-	/* Array index: 0x0658 */ 0x5FB3,0x4663,
-	/* Array index: 0x0658 */ 0x5FB4,0x4664,
-	/* Array index: 0x0658 */ 0x5FB8,0x4B72,
-	/* Array index: 0x0658 */ 0x5FBA,0x6478,
-	/* Array index: 0x0658 */ 0x5FC2,0x5E2F,
-	/* Array index: 0x0658 */ 0x5FC7,0x224D,
-	/* Array index: 0x0658 */ 0x5FC8,0x6251,
-	/* Array index: 0x0658 */ 0x5FCA,0x224C,
-	/* Array index: 0x0658 */ 0x5FCE,0x2578,
-	/* Array index: 0x0658 */ 0x5FD3,0x2366,
-	/* Array index: 0x0658 */ 0x5FDF,0x257B,
-	/* Array index: 0x0658 */ 0x5FE6,0x2576,
-	/* Array index: 0x0658 */ 0x5FE7,0x2574,
-	/* Array index: 0x0658 */ 0x5FE9,0x287E,
-	/* Array index: 0x0658 */ 0x5FEC,0x257C,
-	/* Array index: 0x0658 */ 0x5FF0,0x2622,
-	/* Array index: 0x0658 */ 0x5FF2,0x2621,
-	/* Array index: 0x0658 */ 0x5FF6,0x257D,
-	/* Array index: 0x0658 */ 0x5FF9,0x2623,
-	/* Array index: 0x0658 */ 0x5FFC,0x257A,
-	/* Array index: 0x0658 */ 0x5FFE,0x2575,
-	/* Array index: 0x0658 */ 0x6007,0x2878,
-	/* Array index: 0x0658 */ 0x6008,0x2922,
-	/* Array index: 0x0658 */ 0x6018,0x6266,
-	/* Array index: 0x0658 */ 0x6023,0x2C5A,
-	/* Array index: 0x0658 */ 0x6030,0x2877,
-	/* Array index: 0x0658 */ 0x6031,0x2C5B,
-	/* Array index: 0x0658 */ 0x6036,0x287A,
-	/* Array index: 0x0658 */ 0x603D,0x2921,
-	/* Array index: 0x0658 */ 0x6048,0x6267,
-	/* Array index: 0x0658 */ 0x604A,0x2C60,
-	/* Array index: 0x0658 */ 0x604B,0x3079,
-	/* Array index: 0x0658 */ 0x6056,0x307E,
-	/* Array index: 0x0658 */ 0x605C,0x2C54,
-	/* Array index: 0x0658 */ 0x6060,0x2C5F,
-	/* Array index: 0x0658 */ 0x6061,0x2C61,
-	/* Array index: 0x0658 */ 0x607C,0x2C5C,
-	/* Array index: 0x0658 */ 0x607E,0x3076,
-	/* Array index: 0x0658 */ 0x608B,0x3122,
-	/* Array index: 0x0658 */ 0x6093,0x3125,
-	/* Array index: 0x0658 */ 0x6098,0x3568,
-	/* Array index: 0x0658 */ 0x6099,0x3074,
-	/* Array index: 0x0658 */ 0x609E,0x3127,
-	/* Array index: 0x0658 */ 0x60A1,0x3571,
-	/* Array index: 0x0658 */ 0x60A4,0x3572,
-	/* Array index: 0x0658 */ 0x60AE,0x3126,
-	/* Array index: 0x0658 */ 0x60B3,0x3B54,
-	/* Array index: 0x0658 */ 0x60D0,0x356A,
-	/* Array index: 0x0658 */ 0x60D2,0x3B56,
-	/* Array index: 0x0658 */ 0x60D6,0x3B55,
-	/* Array index: 0x0658 */ 0x60D7,0x356E,
-	/* Array index: 0x0658 */ 0x60DE,0x3579,
-	/* Array index: 0x0658 */ 0x60E3,0x3B58,
-	/* Array index: 0x0658 */ 0x60E5,0x3B59,
-	/* Array index: 0x0658 */ 0x60E7,0x3576,
-	/* Array index: 0x0658 */ 0x60E9,0x3B5A,
-	/* Array index: 0x0658 */ 0x60EA,0x3B4D,
-	/* Array index: 0x0658 */ 0x60EE,0x3574,
-	/* Array index: 0x0658 */ 0x60FD,0x3B5E,
-	/* Array index: 0x0658 */ 0x6107,0x3B4F,
-	/* Array index: 0x0658 */ 0x610C,0x3B51,
-	/* Array index: 0x0658 */ 0x6111,0x3B5D,
-	/* Array index: 0x0658 */ 0x6119,0x412B,
-	/* Array index: 0x0658 */ 0x6125,0x6479,
-	/* Array index: 0x0658 */ 0x612A,0x4129,
-	/* Array index: 0x0658 */ 0x6130,0x4127,
-	/* Array index: 0x0658 */ 0x6131,0x412C,
-	/* Array index: 0x0658 */ 0x6133,0x466F,
-	/* Array index: 0x0658 */ 0x6138,0x466E,
-	/* Array index: 0x0658 */ 0x613A,0x4128,
-	/* Array index: 0x0658 */ 0x613C,0x466C,
-	/* Array index: 0x0658 */ 0x613D,0x412E,
-	/* Array index: 0x0658 */ 0x6142,0x466D,
-	/* Array index: 0x0658 */ 0x6143,0x412A,
-	/* Array index: 0x0658 */ 0x6150,0x647A,
-	/* Array index: 0x0658 */ 0x6157,0x4B73,
-	/* Array index: 0x0658 */ 0x6159,0x4B7E,
-	/* Array index: 0x0658 */ 0x615C,0x4B74,
-	/* Array index: 0x0658 */ 0x6160,0x4671,
-	/* Array index: 0x0658 */ 0x6164,0x4B7C,
-	/* Array index: 0x0658 */ 0x6169,0x4672,
-	/* Array index: 0x0658 */ 0x616F,0x466A,
-	/* Array index: 0x0658 */ 0x6178,0x4C21,
-	/* Array index: 0x0658 */ 0x617B,0x4668,
-	/* Array index: 0x0658 */ 0x617D,0x4673,
-	/* Array index: 0x0658 */ 0x6181,0x466B,
-	/* Array index: 0x0658 */ 0x618F,0x4B7A,
-	/* Array index: 0x0658 */ 0x619C,0x4C29,
-	/* Array index: 0x0658 */ 0x619E,0x4C25,
-	/* Array index: 0x0658 */ 0x61A3,0x4B79,
-	/* Array index: 0x0658 */ 0x61A6,0x4B75,
-	/* Array index: 0x0658 */ 0x61B7,0x5061,
-	/* Array index: 0x0658 */ 0x61B9,0x5063,
-	/* Array index: 0x0658 */ 0x61BB,0x506A,
-	/* Array index: 0x0658 */ 0x61BD,0x5064,
-	/* Array index: 0x0658 */ 0x61C0,0x5066,
-	/* Array index: 0x0658 */ 0x61C4,0x506C,
-	/* Array index: 0x0658 */ 0x61D3,0x6679,
-	/* Array index: 0x0658 */ 0x61E2,0x545B,
-	/* Array index: 0x0658 */ 0x61F3,0x5765,
-	/* Array index: 0x0658 */ 0x6202,0x5F46,
-	/* Array index: 0x0658 */ 0x6205,0x613E,
-	/* Array index: 0x0658 */ 0x620F,0x236B,
-	/* Array index: 0x0658 */ 0x6213,0x2625,
-	/* Array index: 0x0658 */ 0x6218,0x2C63,
-	/* Array index: 0x0658 */ 0x621E,0x3B64,
-	/* Array index: 0x0658 */ 0x6228,0x4676,
-	/* Array index: 0x0658 */ 0x622C,0x4675,
-	/* Array index: 0x0658 */ 0x622F,0x4C2C,
-	/* Array index: 0x0658 */ 0x6231,0x506D,
-	/* Array index: 0x0658 */ 0x6245,0x3129,
-	/* Array index: 0x0658 */ 0x624F,0x2250,
-	/* Array index: 0x0658 */ 0x6257,0x236F,
-	/* Array index: 0x0658 */ 0x625D,0x236C,
-	/* Array index: 0x0658 */ 0x625F,0x236D,
-	/* Array index: 0x0658 */ 0x6267,0x236E,
-	/* Array index: 0x0658 */ 0x6275,0x2639,
-	/* Array index: 0x0658 */ 0x6278,0x262E,
-	/* Array index: 0x0658 */ 0x6282,0x262A,
-	/* Array index: 0x0658 */ 0x6285,0x2637,
-	/* Array index: 0x0658 */ 0x628B,0x262F,
-	/* Array index: 0x0658 */ 0x628D,0x2636,
-	/* Array index: 0x0658 */ 0x62B2,0x2926,
-	/* Array index: 0x0658 */ 0x62B7,0x2928,
-	/* Array index: 0x0658 */ 0x62BA,0x2925,
-	/* Array index: 0x0658 */ 0x62C0,0x2934,
-	/* Array index: 0x0658 */ 0x62C1,0x2932,
-	/* Array index: 0x0658 */ 0x62C5,0x2933,
-	/* Array index: 0x0658 */ 0x62D5,0x292E,
-	/* Array index: 0x0658 */ 0x62E4,0x2929,
-	/* Array index: 0x0658 */ 0x62EA,0x2C6D,
-	/* Array index: 0x0658 */ 0x6304,0x2C6F,
-	/* Array index: 0x0658 */ 0x6305,0x2C70,
-	/* Array index: 0x0658 */ 0x6317,0x2C6C,
-	/* Array index: 0x0658 */ 0x6319,0x3132,
-	/* Array index: 0x0658 */ 0x631B,0x3133,
-	/* Array index: 0x0658 */ 0x631F,0x2C6B,
-	/* Array index: 0x0658 */ 0x6321,0x2C6E,
-	/* Array index: 0x0658 */ 0x632E,0x312C,
-	/* Array index: 0x0658 */ 0x6330,0x312F,
-	/* Array index: 0x0658 */ 0x6331,0x3135,
-	/* Array index: 0x0658 */ 0x6335,0x3138,
-	/* Array index: 0x0658 */ 0x6337,0x3137,
-	/* Array index: 0x0658 */ 0x633F,0x313C,
-	/* Array index: 0x0658 */ 0x6352,0x312E,
-	/* Array index: 0x0658 */ 0x6353,0x3139,
-	/* Array index: 0x0658 */ 0x6360,0x647C,
-	/* Array index: 0x0658 */ 0x6364,0x647D,
-	/* Array index: 0x0658 */ 0x6366,0x3631,
-	/* Array index: 0x0658 */ 0x636A,0x3627,
-	/* Array index: 0x0658 */ 0x636C,0x3629,
-	/* Array index: 0x0658 */ 0x6373,0x3626,
-	/* Array index: 0x0658 */ 0x6374,0x3632,
-	/* Array index: 0x0658 */ 0x6379,0x3622,
-	/* Array index: 0x0658 */ 0x637E,0x357C,
-	/* Array index: 0x0658 */ 0x637F,0x362B,
-	/* Array index: 0x0658 */ 0x6386,0x3623,
-	/* Array index: 0x0658 */ 0x638B,0x357D,
-	/* Array index: 0x0658 */ 0x6393,0x3624,
-	/* Array index: 0x0658 */ 0x63B2,0x362D,
-	/* Array index: 0x0658 */ 0x63B6,0x647E,
-	/* Array index: 0x0658 */ 0x63BA,0x362E,
-	/* Array index: 0x0658 */ 0x63BF,0x3B71,
-	/* Array index: 0x0658 */ 0x63C1,0x3B70,
-	/* Array index: 0x0658 */ 0x63D1,0x3B73,
-	/* Array index: 0x0658 */ 0x63DE,0x3B67,
-	/* Array index: 0x0658 */ 0x63E2,0x3B66,
-	/* Array index: 0x0658 */ 0x63E6,0x3B68,
-	/* Array index: 0x0658 */ 0x63F7,0x3B72,
-	/* Array index: 0x0658 */ 0x63F8,0x3B6D,
-	/* Array index: 0x0658 */ 0x63FA,0x6339,
-	/* Array index: 0x0658 */ 0x63FE,0x3B6F,
-	/* Array index: 0x0658 */ 0x6403,0x6521,
-	/* Array index: 0x0658 */ 0x6407,0x4149,
-	/* Array index: 0x0658 */ 0x6408,0x4132,
-	/* Array index: 0x0658 */ 0x6411,0x413A,
-	/* Array index: 0x0658 */ 0x6419,0x4138,
-	/* Array index: 0x0658 */ 0x641D,0x413E,
-	/* Array index: 0x0658 */ 0x6429,0x413D,
-	/* Array index: 0x0658 */ 0x6431,0x4136,
-	/* Array index: 0x0658 */ 0x6432,0x4133,
-	/* Array index: 0x0658 */ 0x6446,0x4144,
-	/* Array index: 0x0658 */ 0x6447,0x4145,
-	/* Array index: 0x0658 */ 0x6449,0x6676,
-	/* Array index: 0x0658 */ 0x644C,0x4678,
-	/* Array index: 0x0658 */ 0x644F,0x4728,
-	/* Array index: 0x0658 */ 0x6462,0x4721,
-	/* Array index: 0x0658 */ 0x6464,0x472A,
-	/* Array index: 0x0658 */ 0x646A,0x4723,
-	/* Array index: 0x0658 */ 0x6471,0x4722,
-	/* Array index: 0x0658 */ 0x647C,0x467B,
-	/* Array index: 0x0658 */ 0x647E,0x4729,
-	/* Array index: 0x0658 */ 0x6480,0x4C2D,
-	/* Array index: 0x0658 */ 0x6481,0x4726,
-	/* Array index: 0x0658 */ 0x6483,0x4C35,
-	/* Array index: 0x0658 */ 0x6486,0x4C38,
-	/* Array index: 0x0658 */ 0x648D,0x4C30,
-	/* Array index: 0x0658 */ 0x648E,0x4C2F,
-	/* Array index: 0x0658 */ 0x6491,0x4C3B,
-	/* Array index: 0x0658 */ 0x6494,0x4C31,
-	/* Array index: 0x0658 */ 0x649B,0x4C2E,
-	/* Array index: 0x0658 */ 0x64A1,0x4C3E,
-	/* Array index: 0x0658 */ 0x64A7,0x4C3F,
-	/* Array index: 0x0658 */ 0x64A8,0x4C34,
-	/* Array index: 0x0658 */ 0x64AA,0x4C3D,
-	/* Array index: 0x0658 */ 0x64AF,0x4C3A,
-	/* Array index: 0x0658 */ 0x64B4,0x4C39,
-	/* Array index: 0x0658 */ 0x64B6,0x6522,
-	/* Array index: 0x0658 */ 0x64B9,0x4C37,
-	/* Array index: 0x0658 */ 0x64C0,0x5070,
-	/* Array index: 0x0658 */ 0x64C6,0x4C32,
-	/* Array index: 0x0658 */ 0x64C8,0x5077,
-	/* Array index: 0x0658 */ 0x64D1,0x5076,
-	/* Array index: 0x0658 */ 0x64D3,0x506F,
-	/* Array index: 0x0658 */ 0x64D5,0x5079,
-	/* Array index: 0x0658 */ 0x64DC,0x5075,
-	/* Array index: 0x0658 */ 0x64DF,0x5464,
-	/* Array index: 0x0658 */ 0x64E1,0x5467,
-	/* Array index: 0x0658 */ 0x64E5,0x576B,
-	/* Array index: 0x0658 */ 0x64E7,0x576D,
-	/* Array index: 0x0658 */ 0x64EA,0x576C,
-	/* Array index: 0x0658 */ 0x64EE,0x5469,
-	/* Array index: 0x0658 */ 0x64F6,0x576A,
-	/* Array index: 0x0658 */ 0x64F9,0x5770,
-	/* Array index: 0x0658 */ 0x6505,0x576E,
-	/* Array index: 0x0658 */ 0x6508,0x5A3B,
-	/* Array index: 0x0658 */ 0x650A,0x5A3C,
-	/* Array index: 0x0658 */ 0x650B,0x5A3A,
-	/* Array index: 0x0658 */ 0x6511,0x5E31,
-	/* Array index: 0x0658 */ 0x651A,0x6523,
-	/* Array index: 0x0658 */ 0x651E,0x5F4A,
-	/* Array index: 0x0658 */ 0x651F,0x5F4B,
-	/* Array index: 0x0658 */ 0x6527,0x5F49,
-	/* Array index: 0x0658 */ 0x6528,0x6032,
-	/* Array index: 0x0658 */ 0x6531,0x2C72,
-	/* Array index: 0x0658 */ 0x6534,0x2167,
-	/* Array index: 0x0658 */ 0x6535,0x2168,
-	/* Array index: 0x0658 */ 0x6540,0x2C74,
-	/* Array index: 0x0658 */ 0x6542,0x2C76,
-	/* Array index: 0x0658 */ 0x6544,0x2C73,
-	/* Array index: 0x0658 */ 0x654B,0x313D,
-	/* Array index: 0x0658 */ 0x654D,0x3637,
-	/* Array index: 0x0658 */ 0x654E,0x3636,
-	/* Array index: 0x0658 */ 0x655A,0x3634,
-	/* Array index: 0x0658 */ 0x656B,0x414B,
-	/* Array index: 0x0658 */ 0x6585,0x5C41,
-	/* Array index: 0x0658 */ 0x6588,0x2558,
-	/* Array index: 0x0658 */ 0x6589,0x2939,
-	/* Array index: 0x0658 */ 0x658B,0x3140,
-	/* Array index: 0x0658 */ 0x658D,0x3638,
-	/* Array index: 0x0658 */ 0x658E,0x3639,
-	/* Array index: 0x0658 */ 0x659A,0x3142,
-	/* Array index: 0x0658 */ 0x65A6,0x293B,
-	/* Array index: 0x0658 */ 0x65AD,0x363A,
-	/* Array index: 0x0658 */ 0x65B5,0x546B,
-	/* Array index: 0x0658 */ 0x65BA,0x293C,
-	/* Array index: 0x0658 */ 0x65BE,0x2C77,
-	/* Array index: 0x0658 */ 0x65C7,0x363C,
-	/* Array index: 0x0658 */ 0x65C9,0x363F,
-	/* Array index: 0x0658 */ 0x65CA,0x363D,
-	/* Array index: 0x0658 */ 0x65D1,0x3B79,
-	/* Array index: 0x0658 */ 0x65DC,0x5A3F,
-	/* Array index: 0x0658 */ 0x65E0,0x2169,
-	/* Array index: 0x0658 */ 0x65E3,0x3641,
-	/* Array index: 0x0658 */ 0x65E4,0x4150,
-	/* Array index: 0x0658 */ 0x65E7,0x2251,
-	/* Array index: 0x0658 */ 0x65EA,0x2373,
-	/* Array index: 0x0658 */ 0x65EB,0x2372,
-	/* Array index: 0x0658 */ 0x65F6,0x263D,
-	/* Array index: 0x0658 */ 0x65F9,0x625E,
-	/* Array index: 0x0658 */ 0x65FE,0x2943,
-	/* Array index: 0x0658 */ 0x65FF,0x293E,
-	/* Array index: 0x0658 */ 0x6601,0x2942,
-	/* Array index: 0x0658 */ 0x661E,0x2D23,
-	/* Array index: 0x0658 */ 0x6623,0x2C7C,
-	/* Array index: 0x0658 */ 0x6629,0x2C79,
-	/* Array index: 0x0658 */ 0x662C,0x2C7D,
-	/* Array index: 0x0658 */ 0x6630,0x2D21,
-	/* Array index: 0x0658 */ 0x6637,0x2D24,
-	/* Array index: 0x0658 */ 0x6638,0x2D25,
-	/* Array index: 0x0658 */ 0x663B,0x2D22,
-	/* Array index: 0x0658 */ 0x663C,0x2C37,
-	/* Array index: 0x0658 */ 0x6640,0x3146,
-	/* Array index: 0x0658 */ 0x6644,0x314C,
-	/* Array index: 0x0658 */ 0x6646,0x3144,
-	/* Array index: 0x0658 */ 0x6648,0x3149,
-	/* Array index: 0x0658 */ 0x664B,0x3148,
-	/* Array index: 0x0658 */ 0x664D,0x314D,
-	/* Array index: 0x0658 */ 0x664E,0x3145,
-	/* Array index: 0x0658 */ 0x6650,0x3143,
-	/* Array index: 0x0658 */ 0x6657,0x3642,
-	/* Array index: 0x0658 */ 0x6660,0x314B,
-	/* Array index: 0x0658 */ 0x6663,0x3644,
-	/* Array index: 0x0658 */ 0x6667,0x3645,
-	/* Array index: 0x0658 */ 0x6669,0x3C26,
-	/* Array index: 0x0658 */ 0x666B,0x3B7D,
-	/* Array index: 0x0658 */ 0x666D,0x3C25,
-	/* Array index: 0x0658 */ 0x6673,0x3C23,
-	/* Array index: 0x0658 */ 0x667D,0x3B7C,
-	/* Array index: 0x0658 */ 0x667F,0x3B7E,
-	/* Array index: 0x0658 */ 0x6681,0x3C24,
-	/* Array index: 0x0658 */ 0x668E,0x415B,
-	/* Array index: 0x0658 */ 0x668F,0x4156,
-	/* Array index: 0x0658 */ 0x6692,0x4159,
-	/* Array index: 0x0658 */ 0x6693,0x4151,
-	/* Array index: 0x0658 */ 0x669A,0x4734,
-	/* Array index: 0x0658 */ 0x669C,0x4735,
-	/* Array index: 0x0658 */ 0x66AC,0x4C44,
-	/* Array index: 0x0658 */ 0x66AD,0x4C46,
-	/* Array index: 0x0658 */ 0x66B3,0x4C41,
-	/* Array index: 0x0658 */ 0x66B6,0x4C40,
-	/* Array index: 0x0658 */ 0x66BC,0x4C43,
-	/* Array index: 0x0658 */ 0x66BF,0x507D,
-	/* Array index: 0x0658 */ 0x66C1,0x5123,
-	/* Array index: 0x0658 */ 0x66C3,0x507A,
-	/* Array index: 0x0658 */ 0x66C5,0x507E,
-	/* Array index: 0x0658 */ 0x66DF,0x5A43,
-	/* Array index: 0x0658 */ 0x66E1,0x5A42,
-	/* Array index: 0x0658 */ 0x66E2,0x6526,
-	/* Array index: 0x0658 */ 0x66E5,0x5C42,
-	/* Array index: 0x0658 */ 0x66E7,0x5C43,
-	/* Array index: 0x0658 */ 0x66EF,0x613F,
-	/* Array index: 0x0658 */ 0x66F5,0x2641,
-	/* Array index: 0x0658 */ 0x6702,0x6527,
-	/* Array index: 0x0658 */ 0x6706,0x5124,
-	/* Array index: 0x0658 */ 0x670C,0x2945,
-	/* Array index: 0x0658 */ 0x670E,0x2D27,
-	/* Array index: 0x0658 */ 0x6711,0x6632,
-	/* Array index: 0x0658 */ 0x6716,0x3648,
-	/* Array index: 0x0658 */ 0x6719,0x3647,
-	/* Array index: 0x0658 */ 0x671A,0x3646,
-	/* Array index: 0x0658 */ 0x671E,0x3C29,
-	/* Array index: 0x0658 */ 0x6724,0x5126,
-	/* Array index: 0x0658 */ 0x6725,0x6633,
-	/* Array index: 0x0658 */ 0x672F,0x2252,
-	/* Array index: 0x0658 */ 0x6732,0x2377,
-	/* Array index: 0x0658 */ 0x6736,0x2378,
-	/* Array index: 0x0658 */ 0x6737,0x2375,
-	/* Array index: 0x0658 */ 0x6744,0x2648,
-	/* Array index: 0x0658 */ 0x674A,0x2649,
-	/* Array index: 0x0658 */ 0x6752,0x2645,
-	/* Array index: 0x0658 */ 0x6754,0x2644,
-	/* Array index: 0x0658 */ 0x6758,0x2647,
-	/* Array index: 0x0658 */ 0x675B,0x2642,
-	/* Array index: 0x0658 */ 0x6761,0x264A,
-	/* Array index: 0x0658 */ 0x6765,0x6257,
-	/* Array index: 0x0658 */ 0x676B,0x2947,
-	/* Array index: 0x0658 */ 0x6780,0x2952,
-	/* Array index: 0x0658 */ 0x6782,0x2949,
-	/* Array index: 0x0658 */ 0x6788,0x625F,
-	/* Array index: 0x0658 */ 0x678A,0x294A,
-	/* Array index: 0x0658 */ 0x678F,0x294F,
-	/* Array index: 0x0658 */ 0x6796,0x2948,
-	/* Array index: 0x0658 */ 0x67AC,0x6529,
-	/* Array index: 0x0658 */ 0x67B1,0x2D36,
-	/* Array index: 0x0658 */ 0x67BC,0x2D2E,
-	/* Array index: 0x0658 */ 0x67BF,0x2D30,
-	/* Array index: 0x0658 */ 0x67C7,0x2D2D,
-	/* Array index: 0x0658 */ 0x67E8,0x2D2A,
-	/* Array index: 0x0658 */ 0x67F9,0x2951,
-	/* Array index: 0x0658 */ 0x67FB,0x2D34,
-	/* Array index: 0x0658 */ 0x67FE,0x2D32,
-	/* Array index: 0x0658 */ 0x6800,0x2D39,
-	/* Array index: 0x0658 */ 0x6801,0x2D37,
-	/* Array index: 0x0658 */ 0x6805,0x2D38,
-	/* Array index: 0x0658 */ 0x6806,0x652B,
-	/* Array index: 0x0658 */ 0x6810,0x652A,
-	/* Array index: 0x0658 */ 0x6815,0x315D,
-	/* Array index: 0x0658 */ 0x6819,0x3157,
-	/* Array index: 0x0658 */ 0x681B,0x3153,
-	/* Array index: 0x0658 */ 0x681E,0x315B,
-	/* Array index: 0x0658 */ 0x6827,0x315F,
-	/* Array index: 0x0658 */ 0x682C,0x3156,
-	/* Array index: 0x0658 */ 0x6830,0x3163,
-	/* Array index: 0x0658 */ 0x6836,0x3154,
-	/* Array index: 0x0658 */ 0x6837,0x314F,
-	/* Array index: 0x0658 */ 0x683E,0x315A,
-	/* Array index: 0x0658 */ 0x6847,0x3159,
-	/* Array index: 0x0658 */ 0x6852,0x2D2F,
-	/* Array index: 0x0658 */ 0x685E,0x652C,
-	/* Array index: 0x0658 */ 0x686C,0x3655,
-	/* Array index: 0x0658 */ 0x6870,0x3660,
-	/* Array index: 0x0658 */ 0x6873,0x364E,
-	/* Array index: 0x0658 */ 0x687A,0x365B,
-	/* Array index: 0x0658 */ 0x6884,0x3657,
-	/* Array index: 0x0658 */ 0x688E,0x3651,
-	/* Array index: 0x0658 */ 0x6895,0x365A,
-	/* Array index: 0x0658 */ 0x689E,0x364B,
-	/* Array index: 0x0658 */ 0x68A5,0x3654,
-	/* Array index: 0x0658 */ 0x68A6,0x3478,
-	/* Array index: 0x0658 */ 0x68C1,0x3656,
-	/* Array index: 0x0658 */ 0x68C3,0x3C45,
-	/* Array index: 0x0658 */ 0x68C5,0x3C41,
-	/* Array index: 0x0658 */ 0x68CA,0x3C38,
-	/* Array index: 0x0658 */ 0x68CF,0x3C3E,
-	/* Array index: 0x0658 */ 0x68DB,0x3653,
-	/* Array index: 0x0658 */ 0x68E2,0x3C3D,
-	/* Array index: 0x0658 */ 0x68E5,0x3C32,
-	/* Array index: 0x0658 */ 0x68ED,0x3C2A,
-	/* Array index: 0x0658 */ 0x6909,0x3C37,
-	/* Array index: 0x0658 */ 0x6918,0x3C3C,
-	/* Array index: 0x0658 */ 0x691C,0x3C44,
-	/* Array index: 0x0658 */ 0x691E,0x3C33,
-	/* Array index: 0x0658 */ 0x6929,0x652F,
-	/* Array index: 0x0658 */ 0x692C,0x652E,
-	/* Array index: 0x0658 */ 0x692E,0x3C40,
-	/* Array index: 0x0658 */ 0x6931,0x4165,
-	/* Array index: 0x0658 */ 0x6936,0x4177,
-	/* Array index: 0x0658 */ 0x693E,0x4168,
-	/* Array index: 0x0658 */ 0x6943,0x416B,
-	/* Array index: 0x0658 */ 0x6946,0x415D,
-	/* Array index: 0x0658 */ 0x6947,0x4175,
-	/* Array index: 0x0658 */ 0x694D,0x4173,
-	/* Array index: 0x0658 */ 0x6950,0x4174,
-	/* Array index: 0x0658 */ 0x6955,0x416F,
-	/* Array index: 0x0658 */ 0x6961,0x4179,
-	/* Array index: 0x0658 */ 0x6964,0x4178,
-	/* Array index: 0x0658 */ 0x6967,0x4176,
-	/* Array index: 0x0658 */ 0x6973,0x416D,
-	/* Array index: 0x0658 */ 0x697C,0x416A,
-	/* Array index: 0x0658 */ 0x697D,0x417B,
-	/* Array index: 0x0658 */ 0x6985,0x4172,
-	/* Array index: 0x0658 */ 0x698F,0x473A,
-	/* Array index: 0x0658 */ 0x6992,0x473D,
-	/* Array index: 0x0658 */ 0x6998,0x4751,
-	/* Array index: 0x0658 */ 0x699D,0x474E,
-	/* Array index: 0x0658 */ 0x699F,0x4746,
-	/* Array index: 0x0658 */ 0x69A2,0x4747,
-	/* Array index: 0x0658 */ 0x69B2,0x473E,
-	/* Array index: 0x0658 */ 0x69BA,0x6352,
-	/* Array index: 0x0658 */ 0x69C0,0x4743,
-	/* Array index: 0x0658 */ 0x69C5,0x473B,
-	/* Array index: 0x0658 */ 0x69C8,0x473C,
-	/* Array index: 0x0658 */ 0x69D1,0x4745,
-	/* Array index: 0x0658 */ 0x69D2,0x4748,
-	/* Array index: 0x0658 */ 0x69D5,0x474D,
-	/* Array index: 0x0658 */ 0x69D6,0x4744,
-	/* Array index: 0x0658 */ 0x69D8,0x4C54,
-	/* Array index: 0x0658 */ 0x69E1,0x474C,
-	/* Array index: 0x0658 */ 0x69E3,0x4742,
-	/* Array index: 0x0658 */ 0x69E9,0x4C64,
-	/* Array index: 0x0658 */ 0x69EA,0x4C60,
-	/* Array index: 0x0658 */ 0x69EF,0x4C4F,
-	/* Array index: 0x0658 */ 0x69F0,0x4C51,
-	/* Array index: 0x0658 */ 0x69F9,0x4C5F,
-	/* Array index: 0x0658 */ 0x69FA,0x4C57,
-	/* Array index: 0x0658 */ 0x6A0B,0x4C4D,
-	/* Array index: 0x0658 */ 0x6A0C,0x4C50,
-	/* Array index: 0x0658 */ 0x6A0E,0x4C47,
-	/* Array index: 0x0658 */ 0x6A10,0x4C5B,
-	/* Array index: 0x0658 */ 0x6A12,0x4C56,
-	/* Array index: 0x0658 */ 0x6A1A,0x4C4A,
-	/* Array index: 0x0658 */ 0x6A1C,0x4C49,
-	/* Array index: 0x0658 */ 0x6A22,0x4C52,
-	/* Array index: 0x0658 */ 0x6A24,0x4C62,
-	/* Array index: 0x0658 */ 0x6A33,0x512C,
-	/* Array index: 0x0658 */ 0x6A36,0x513C,
-	/* Array index: 0x0658 */ 0x6A37,0x5138,
-	/* Array index: 0x0658 */ 0x6A42,0x5128,
-	/* Array index: 0x0658 */ 0x6A43,0x512B,
-	/* Array index: 0x0658 */ 0x6A45,0x5140,
-	/* Array index: 0x0658 */ 0x6A4A,0x513B,
-	/* Array index: 0x0658 */ 0x6A4C,0x5131,
-	/* Array index: 0x0658 */ 0x6A52,0x5129,
-	/* Array index: 0x0658 */ 0x6A53,0x513E,
-	/* Array index: 0x0658 */ 0x6A57,0x512F,
-	/* Array index: 0x0658 */ 0x6A5C,0x5144,
-	/* Array index: 0x0658 */ 0x6A63,0x5127,
-	/* Array index: 0x0658 */ 0x6A6C,0x512E,
-	/* Array index: 0x0658 */ 0x6A6E,0x5132,
-	/* Array index: 0x0658 */ 0x6A70,0x5141,
-	/* Array index: 0x0658 */ 0x6A71,0x513A,
-	/* Array index: 0x0658 */ 0x6A77,0x6531,
-	/* Array index: 0x0658 */ 0x6A7A,0x6532,
-	/* Array index: 0x0658 */ 0x6A7D,0x5475,
-	/* Array index: 0x0658 */ 0x6A82,0x547B,
-	/* Array index: 0x0658 */ 0x6A86,0x5521,
-	/* Array index: 0x0658 */ 0x6A88,0x547C,
-	/* Array index: 0x0658 */ 0x6A8A,0x5476,
-	/* Array index: 0x0658 */ 0x6A8F,0x5527,
-	/* Array index: 0x0658 */ 0x6A98,0x5523,
-	/* Array index: 0x0658 */ 0x6A99,0x547A,
-	/* Array index: 0x0658 */ 0x6A9D,0x5524,
-	/* Array index: 0x0658 */ 0x6AA7,0x5478,
-	/* Array index: 0x0658 */ 0x6AAA,0x5529,
-	/* Array index: 0x0658 */ 0x6AAB,0x5774,
-	/* Array index: 0x0658 */ 0x6AB5,0x5778,
-	/* Array index: 0x0658 */ 0x6AC4,0x5822,
-	/* Array index: 0x0658 */ 0x6AC8,0x577B,
-	/* Array index: 0x0658 */ 0x6ACA,0x6533,
-	/* Array index: 0x0658 */ 0x6ACE,0x5A44,
-	/* Array index: 0x0658 */ 0x6AD2,0x5A4F,
-	/* Array index: 0x0658 */ 0x6AE2,0x5A48,
-	/* Array index: 0x0658 */ 0x6AE3,0x5A46,
-	/* Array index: 0x0658 */ 0x6AE6,0x6534,
-	/* Array index: 0x0658 */ 0x6AE9,0x5C49,
-	/* Array index: 0x0658 */ 0x6AED,0x5775,
-	/* Array index: 0x0658 */ 0x6AF4,0x5C47,
-	/* Array index: 0x0658 */ 0x6AF5,0x6535,
-	/* Array index: 0x0658 */ 0x6B06,0x5F4F,
-	/* Array index: 0x0658 */ 0x6B07,0x5F4E,
-	/* Array index: 0x0658 */ 0x6B0D,0x6536,
-	/* Array index: 0x0658 */ 0x6B0E,0x6537,
-	/* Array index: 0x0658 */ 0x6B14,0x6074,
-	/* Array index: 0x0658 */ 0x6B22,0x2379,
-	/* Array index: 0x0658 */ 0x6B2E,0x3165,
-	/* Array index: 0x0658 */ 0x6B30,0x3167,
-	/* Array index: 0x0658 */ 0x6B35,0x3662,
-	/* Array index: 0x0658 */ 0x6B40,0x417D,
-	/* Array index: 0x0658 */ 0x6B44,0x417C,
-	/* Array index: 0x0658 */ 0x6B4F,0x4C66,
-	/* Array index: 0x0658 */ 0x6B52,0x4C65,
-	/* Array index: 0x0658 */ 0x6B53,0x4C67,
-	/* Array index: 0x0658 */ 0x6B57,0x5146,
-	/* Array index: 0x0658 */ 0x6B58,0x5145,
-	/* Array index: 0x0658 */ 0x6B5D,0x552B,
-	/* Array index: 0x0658 */ 0x6B7A,0x2253,
-	/* Array index: 0x0658 */ 0x6B81,0x2958,
-	/* Array index: 0x0658 */ 0x6B8B,0x316A,
-	/* Array index: 0x0658 */ 0x6B90,0x3664,
-	/* Array index: 0x0658 */ 0x6B9C,0x4222,
-	/* Array index: 0x0658 */ 0x6B9D,0x6354,
-	/* Array index: 0x0658 */ 0x6BA1,0x4754,
-	/* Array index: 0x0658 */ 0x6BB4,0x2959,
-	/* Array index: 0x0658 */ 0x6BBB,0x3665,
-	/* Array index: 0x0658 */ 0x6BBE,0x3C4B,
-	/* Array index: 0x0658 */ 0x6BC1,0x4226,
-	/* Array index: 0x0658 */ 0x6BCE,0x237A,
-	/* Array index: 0x0658 */ 0x6BD1,0x295A,
-	/* Array index: 0x0658 */ 0x6BDC,0x6538,
-	/* Array index: 0x0658 */ 0x6BDD,0x6539,
-	/* Array index: 0x0658 */ 0x6BE1,0x2D42,
-	/* Array index: 0x0658 */ 0x6BE5,0x316E,
-	/* Array index: 0x0658 */ 0x6BE9,0x316C,
-	/* Array index: 0x0658 */ 0x6BEA,0x316D,
-	/* Array index: 0x0658 */ 0x6BED,0x3666,
-	/* Array index: 0x0658 */ 0x6BF4,0x3C4D,
-	/* Array index: 0x0658 */ 0x6BF6,0x653A,
-	/* Array index: 0x0658 */ 0x6BFA,0x4228,
-	/* Array index: 0x0658 */ 0x6C0A,0x552D,
-	/* Array index: 0x0658 */ 0x6C1C,0x295D,
-	/* Array index: 0x0658 */ 0x6C1E,0x653B,
-	/* Array index: 0x0658 */ 0x6C2D,0x3C4E,
-	/* Array index: 0x0658 */ 0x6C31,0x4229,
-	/* Array index: 0x0658 */ 0x6C32,0x422A,
-	/* Array index: 0x0658 */ 0x6C37,0x2257,
-	/* Array index: 0x0658 */ 0x6C39,0x2254,
-	/* Array index: 0x0658 */ 0x6C3C,0x2421,
-	/* Array index: 0x0658 */ 0x6C44,0x2258,
-	/* Array index: 0x0658 */ 0x6C45,0x2259,
-	/* Array index: 0x0658 */ 0x6C51,0x237D,
-	/* Array index: 0x0658 */ 0x6C53,0x2425,
-	/* Array index: 0x0658 */ 0x6C56,0x2655,
-	/* Array index: 0x0658 */ 0x6C58,0x237C,
-	/* Array index: 0x0658 */ 0x6C5A,0x2423,
-	/* Array index: 0x0658 */ 0x6C63,0x653C,
-	/* Array index: 0x0658 */ 0x6C6C,0x2964,
-	/* Array index: 0x0658 */ 0x6C6E,0x2650,
-	/* Array index: 0x0658 */ 0x6C75,0x2653,
-	/* Array index: 0x0658 */ 0x6C77,0x237E,
-	/* Array index: 0x0658 */ 0x6C79,0x2657,
-	/* Array index: 0x0658 */ 0x6C7C,0x2651,
-	/* Array index: 0x0658 */ 0x6C7F,0x264C,
-	/* Array index: 0x0658 */ 0x6C91,0x264D,
-	/* Array index: 0x0658 */ 0x6C97,0x2963,
-	/* Array index: 0x0658 */ 0x6CAA,0x265B,
-	/* Array index: 0x0658 */ 0x6CAF,0x2D4E,
-	/* Array index: 0x0658 */ 0x6CB2,0x296B,
-	/* Array index: 0x0658 */ 0x6CC8,0x296D,
-	/* Array index: 0x0658 */ 0x6CCB,0x6261,
-	/* Array index: 0x0658 */ 0x6CCE,0x296C,
-	/* Array index: 0x0658 */ 0x6CD8,0x296A,
-	/* Array index: 0x0658 */ 0x6CDF,0x2965,
-	/* Array index: 0x0658 */ 0x6CE4,0x2969,
-	/* Array index: 0x0658 */ 0x6CE6,0x6260,
-	/* Array index: 0x0658 */ 0x6CEA,0x2967,
-	/* Array index: 0x0658 */ 0x6CF4,0x2D4F,
-	/* Array index: 0x0658 */ 0x6CFF,0x2D46,
-	/* Array index: 0x0658 */ 0x6D02,0x2D50,
-	/* Array index: 0x0658 */ 0x6D05,0x2D48,
-	/* Array index: 0x0658 */ 0x6D06,0x2D4A,
-	/* Array index: 0x0658 */ 0x6D1C,0x317A,
-	/* Array index: 0x0658 */ 0x6D21,0x2D4B,
-	/* Array index: 0x0658 */ 0x6D23,0x2D45,
-	/* Array index: 0x0658 */ 0x6D24,0x2D57,
-	/* Array index: 0x0658 */ 0x6D26,0x2D53,
-	/* Array index: 0x0658 */ 0x6D44,0x2D55,
-	/* Array index: 0x0658 */ 0x6D45,0x2D51,
-	/* Array index: 0x0658 */ 0x6D56,0x3177,
-	/* Array index: 0x0658 */ 0x6D57,0x3173,
-	/* Array index: 0x0658 */ 0x6D6B,0x316F,
-	/* Array index: 0x0658 */ 0x6D81,0x3221,
-	/* Array index: 0x0658 */ 0x6D8F,0x3178,
-	/* Array index: 0x0658 */ 0x6D96,0x3227,
-	/* Array index: 0x0658 */ 0x6DA5,0x653D,
-	/* Array index: 0x0658 */ 0x6DAD,0x366F,
-	/* Array index: 0x0658 */ 0x6DB0,0x367A,
-	/* Array index: 0x0658 */ 0x6DB1,0x3721,
-	/* Array index: 0x0658 */ 0x6DB6,0x3C50,
-	/* Array index: 0x0658 */ 0x6DB9,0x3672,
-	/* Array index: 0x0658 */ 0x6DC1,0x366A,
-	/* Array index: 0x0658 */ 0x6DC3,0x366B,
-	/* Array index: 0x0658 */ 0x6DCE,0x366C,
-	/* Array index: 0x0658 */ 0x6DE7,0x3674,
-	/* Array index: 0x0658 */ 0x6DF8,0x367C,
-	/* Array index: 0x0658 */ 0x6E0F,0x653E,
-	/* Array index: 0x0658 */ 0x6E12,0x3729,
-	/* Array index: 0x0658 */ 0x6E17,0x3727,
-	/* Array index: 0x0658 */ 0x6E18,0x3C54,
-	/* Array index: 0x0658 */ 0x6E1E,0x3C52,
-	/* Array index: 0x0658 */ 0x6E29,0x3C6B,
-	/* Array index: 0x0658 */ 0x6E2A,0x3C6D,
-	/* Array index: 0x0658 */ 0x6E42,0x3C5A,
-	/* Array index: 0x0658 */ 0x6E48,0x3C56,
-	/* Array index: 0x0658 */ 0x6E4C,0x3C6E,
-	/* Array index: 0x0658 */ 0x6E4F,0x3C58,
-	/* Array index: 0x0658 */ 0x6E50,0x3C69,
-	/* Array index: 0x0658 */ 0x6E57,0x3C66,
-	/* Array index: 0x0658 */ 0x6E59,0x3C64,
-	/* Array index: 0x0658 */ 0x6E6A,0x3C5B,
-	/* Array index: 0x0658 */ 0x6E6C,0x423A,
-	/* Array index: 0x0658 */ 0x6E6D,0x3C60,
-	/* Array index: 0x0658 */ 0x6E70,0x3C5C,
-	/* Array index: 0x0658 */ 0x6E75,0x3C51,
-	/* Array index: 0x0658 */ 0x6E76,0x3C6C,
-	/* Array index: 0x0658 */ 0x6E7B,0x3C62,
-	/* Array index: 0x0658 */ 0x6E7C,0x6542,
-	/* Array index: 0x0658 */ 0x6E7E,0x3C63,
-	/* Array index: 0x0658 */ 0x6E80,0x3C68,
-	/* Array index: 0x0658 */ 0x6E84,0x6540,
-	/* Array index: 0x0658 */ 0x6E86,0x633D,
-	/* Array index: 0x0658 */ 0x6E8A,0x653F,
-	/* Array index: 0x0658 */ 0x6E8B,0x6541,
-	/* Array index: 0x0658 */ 0x6E91,0x4230,
-	/* Array index: 0x0658 */ 0x6E9A,0x4233,
-	/* Array index: 0x0658 */ 0x6EA8,0x422E,
-	/* Array index: 0x0658 */ 0x6EA9,0x4236,
-	/* Array index: 0x0658 */ 0x6EAC,0x4240,
-	/* Array index: 0x0658 */ 0x6EB5,0x4239,
-	/* Array index: 0x0658 */ 0x6EB8,0x422D,
-	/* Array index: 0x0658 */ 0x6EBB,0x4231,
-	/* Array index: 0x0658 */ 0x6EE3,0x4245,
-	/* Array index: 0x0658 */ 0x6EE6,0x423F,
-	/* Array index: 0x0658 */ 0x6EE8,0x423B,
-	/* Array index: 0x0658 */ 0x6EE9,0x4246,
-	/* Array index: 0x0658 */ 0x6EF0,0x4756,
-	/* Array index: 0x0658 */ 0x6EF3,0x4757,
-	/* Array index: 0x0658 */ 0x6EFA,0x4765,
-	/* Array index: 0x0658 */ 0x6F04,0x4763,
-	/* Array index: 0x0658 */ 0x6F0B,0x4C78,
-	/* Array index: 0x0658 */ 0x6F0C,0x475B,
-	/* Array index: 0x0658 */ 0x6F10,0x4C6A,
-	/* Array index: 0x0658 */ 0x6F11,0x4764,
-	/* Array index: 0x0658 */ 0x6F17,0x475F,
-	/* Array index: 0x0658 */ 0x6F1B,0x475A,
-	/* Array index: 0x0658 */ 0x6F1D,0x475C,
-	/* Array index: 0x0658 */ 0x6F28,0x475E,
-	/* Array index: 0x0658 */ 0x6F34,0x475D,
-	/* Array index: 0x0658 */ 0x6F3D,0x4C74,
-	/* Array index: 0x0658 */ 0x6F42,0x4762,
-	/* Array index: 0x0658 */ 0x6F44,0x4761,
-	/* Array index: 0x0658 */ 0x6F59,0x4C7D,
-	/* Array index: 0x0658 */ 0x6F5C,0x4C73,
-	/* Array index: 0x0658 */ 0x6F65,0x4C6B,
-	/* Array index: 0x0658 */ 0x6F71,0x4C75,
-	/* Array index: 0x0658 */ 0x6F74,0x4C7E,
-	/* Array index: 0x0658 */ 0x6F75,0x4C6C,
-	/* Array index: 0x0658 */ 0x6F79,0x4C79,
-	/* Array index: 0x0658 */ 0x6F81,0x4C7A,
-	/* Array index: 0x0658 */ 0x6F8A,0x6363,
-	/* Array index: 0x0658 */ 0x6F8F,0x4C7B,
-	/* Array index: 0x0658 */ 0x6F91,0x4C77,
-	/* Array index: 0x0658 */ 0x6F99,0x6547,
-	/* Array index: 0x0658 */ 0x6F9D,0x6546,
-	/* Array index: 0x0658 */ 0x6F9F,0x5156,
-	/* Array index: 0x0658 */ 0x6FB5,0x5154,
-	/* Array index: 0x0658 */ 0x6FB7,0x5158,
-	/* Array index: 0x0658 */ 0x6FBB,0x514D,
-	/* Array index: 0x0658 */ 0x6FBE,0x5150,
-	/* Array index: 0x0658 */ 0x6FD0,0x4C71,
-	/* Array index: 0x0658 */ 0x6FD3,0x5155,
-	/* Array index: 0x0658 */ 0x6FE5,0x5531,
-	/* Array index: 0x0658 */ 0x6FEA,0x5537,
-	/* Array index: 0x0658 */ 0x6FF3,0x5A55,
-	/* Array index: 0x0658 */ 0x6FF5,0x5159,
-	/* Array index: 0x0658 */ 0x6FF6,0x5539,
-	/* Array index: 0x0658 */ 0x6FF8,0x6548,
-	/* Array index: 0x0658 */ 0x6FFD,0x5828,
-	/* Array index: 0x0658 */ 0x7002,0x582A,
-	/* Array index: 0x0658 */ 0x7003,0x5827,
-	/* Array index: 0x0658 */ 0x7008,0x5826,
-	/* Array index: 0x0658 */ 0x7010,0x5829,
-	/* Array index: 0x0658 */ 0x7013,0x582B,
-	/* Array index: 0x0658 */ 0x701E,0x5A52,
-	/* Array index: 0x0658 */ 0x7025,0x5A54,
-	/* Array index: 0x0658 */ 0x7036,0x5C51,
-	/* Array index: 0x0658 */ 0x703D,0x5C4F,
-	/* Array index: 0x0658 */ 0x7047,0x5E3C,
-	/* Array index: 0x0658 */ 0x704B,0x5E3A,
-	/* Array index: 0x0658 */ 0x704D,0x5E3B,
-	/* Array index: 0x0658 */ 0x7053,0x6036,
-	/* Array index: 0x0658 */ 0x7054,0x5F52,
-	/* Array index: 0x0658 */ 0x7059,0x6037,
-	/* Array index: 0x0658 */ 0x705C,0x654B,
-	/* Array index: 0x0658 */ 0x7067,0x6179,
-	/* Array index: 0x0658 */ 0x706E,0x2428,
-	/* Array index: 0x0658 */ 0x706F,0x2426,
-	/* Array index: 0x0658 */ 0x7072,0x2427,
-	/* Array index: 0x0658 */ 0x7073,0x242B,
-	/* Array index: 0x0658 */ 0x7075,0x2662,
-	/* Array index: 0x0658 */ 0x7077,0x265F,
-	/* Array index: 0x0658 */ 0x7079,0x265E,
-	/* Array index: 0x0658 */ 0x707B,0x2663,
-	/* Array index: 0x0658 */ 0x707E,0x2660,
-	/* Array index: 0x0658 */ 0x7081,0x2977,
-	/* Array index: 0x0658 */ 0x70A0,0x2D5E,
-	/* Array index: 0x0658 */ 0x70B2,0x2D64,
-	/* Array index: 0x0658 */ 0x70B6,0x2D63,
-	/* Array index: 0x0658 */ 0x70B9,0x2D68,
-	/* Array index: 0x0658 */ 0x70BB,0x2D5D,
-	/* Array index: 0x0658 */ 0x70BF,0x654D,
-	/* Array index: 0x0658 */ 0x70C4,0x3228,
-	/* Array index: 0x0658 */ 0x70C9,0x6279,
-	/* Array index: 0x0658 */ 0x70CC,0x322A,
-	/* Array index: 0x0658 */ 0x70D0,0x322B,
-	/* Array index: 0x0658 */ 0x70D5,0x3231,
-	/* Array index: 0x0658 */ 0x70D6,0x322F,
-	/* Array index: 0x0658 */ 0x70DB,0x3229,
-	/* Array index: 0x0658 */ 0x70DF,0x322D,
-	/* Array index: 0x0658 */ 0x70E3,0x322C,
-	/* Array index: 0x0658 */ 0x70E5,0x654F,
-	/* Array index: 0x0658 */ 0x70EA,0x654E,
-	/* Array index: 0x0658 */ 0x70EE,0x3230,
-	/* Array index: 0x0658 */ 0x70F1,0x3730,
-	/* Array index: 0x0658 */ 0x70F2,0x3732,
-	/* Array index: 0x0658 */ 0x70F5,0x372F,
-	/* Array index: 0x0658 */ 0x70FE,0x3735,
-	/* Array index: 0x0658 */ 0x7101,0x372E,
-	/* Array index: 0x0658 */ 0x7103,0x372C,
-	/* Array index: 0x0658 */ 0x7107,0x372D,
-	/* Array index: 0x0658 */ 0x7108,0x3731,
-	/* Array index: 0x0658 */ 0x710F,0x3733,
-	/* Array index: 0x0658 */ 0x7111,0x6550,
-	/* Array index: 0x0658 */ 0x7112,0x6551,
-	/* Array index: 0x0658 */ 0x711D,0x3C74,
-	/* Array index: 0x0658 */ 0x7124,0x3C7D,
-	/* Array index: 0x0658 */ 0x7127,0x3C7C,
-	/* Array index: 0x0658 */ 0x7145,0x4257,
-	/* Array index: 0x0658 */ 0x7148,0x424C,
-	/* Array index: 0x0658 */ 0x714A,0x424E,
-	/* Array index: 0x0658 */ 0x714F,0x4251,
-	/* Array index: 0x0658 */ 0x7151,0x4258,
-	/* Array index: 0x0658 */ 0x7157,0x4252,
-	/* Array index: 0x0658 */ 0x715B,0x483C,
-	/* Array index: 0x0658 */ 0x716B,0x424F,
-	/* Array index: 0x0658 */ 0x716D,0x4259,
-	/* Array index: 0x0658 */ 0x716F,0x4249,
-	/* Array index: 0x0658 */ 0x7171,0x6559,
-	/* Array index: 0x0658 */ 0x717C,0x476F,
-	/* Array index: 0x0658 */ 0x717E,0x476E,
-	/* Array index: 0x0658 */ 0x717F,0x476C,
-	/* Array index: 0x0658 */ 0x7183,0x4770,
-	/* Array index: 0x0658 */ 0x7188,0x4772,
-	/* Array index: 0x0658 */ 0x7191,0x4767,
-	/* Array index: 0x0658 */ 0x7193,0x655B,
-	/* Array index: 0x0658 */ 0x7196,0x655A,
-	/* Array index: 0x0658 */ 0x71A2,0x4D2A,
-	/* Array index: 0x0658 */ 0x71A3,0x4D24,
-	/* Array index: 0x0658 */ 0x71A6,0x4D29,
-	/* Array index: 0x0658 */ 0x71AB,0x4D28,
-	/* Array index: 0x0658 */ 0x71AD,0x4D25,
-	/* Array index: 0x0658 */ 0x71AE,0x4D22,
-	/* Array index: 0x0658 */ 0x71B4,0x655C,
-	/* Array index: 0x0658 */ 0x71B6,0x5162,
-	/* Array index: 0x0658 */ 0x71B7,0x515A,
-	/* Array index: 0x0658 */ 0x71BA,0x5160,
-	/* Array index: 0x0658 */ 0x71BB,0x515C,
-	/* Array index: 0x0658 */ 0x71CC,0x5163,
-	/* Array index: 0x0658 */ 0x71CD,0x6374,
-	/* Array index: 0x0658 */ 0x71D1,0x515E,
-	/* Array index: 0x0658 */ 0x71D3,0x5166,
-	/* Array index: 0x0658 */ 0x71DD,0x655D,
-	/* Array index: 0x0658 */ 0x71DE,0x655E,
-	/* Array index: 0x0658 */ 0x71E3,0x553C,
-	/* Array index: 0x0658 */ 0x71EF,0x5541,
-	/* Array index: 0x0658 */ 0x71F3,0x5542,
-	/* Array index: 0x0658 */ 0x71FA,0x582D,
-	/* Array index: 0x0658 */ 0x7200,0x582E,
-	/* Array index: 0x0658 */ 0x7204,0x5A56,
-	/* Array index: 0x0658 */ 0x7208,0x5A57,
-	/* Array index: 0x0658 */ 0x720B,0x5C59,
-	/* Array index: 0x0658 */ 0x721C,0x5F53,
-	/* Array index: 0x0658 */ 0x7220,0x5F54,
-	/* Array index: 0x0658 */ 0x7221,0x6039,
-	/* Array index: 0x0658 */ 0x7224,0x6143,
-	/* Array index: 0x0658 */ 0x7225,0x6142,
-	/* Array index: 0x0658 */ 0x722E,0x2D69,
-	/* Array index: 0x0658 */ 0x7232,0x3D22,
-	/* Array index: 0x0658 */ 0x723C,0x2D6B,
-	/* Array index: 0x0658 */ 0x7240,0x297C,
-	/* Array index: 0x0658 */ 0x724E,0x425D,
-	/* Array index: 0x0658 */ 0x7250,0x425C,
-	/* Array index: 0x0658 */ 0x7251,0x425B,
-	/* Array index: 0x0658 */ 0x7255,0x4D2E,
-	/* Array index: 0x0658 */ 0x7257,0x4D2D,
-	/* Array index: 0x0658 */ 0x726D,0x2D6D,
-	/* Array index: 0x0658 */ 0x727A,0x3236,
-	/* Array index: 0x0658 */ 0x7282,0x3D24,
-	/* Array index: 0x0658 */ 0x7283,0x3D23,
-	/* Array index: 0x0658 */ 0x7287,0x3D25,
-	/* Array index: 0x0658 */ 0x7294,0x4775,
-	/* Array index: 0x0658 */ 0x7299,0x4D2F,
-	/* Array index: 0x0658 */ 0x72AB,0x617B,
-	/* Array index: 0x0658 */ 0x72B1,0x242C,
-	/* Array index: 0x0658 */ 0x72B2,0x242D,
-	/* Array index: 0x0658 */ 0x72B6,0x266B,
-	/* Array index: 0x0658 */ 0x72B9,0x2669,
-	/* Array index: 0x0658 */ 0x72BB,0x2666,
-	/* Array index: 0x0658 */ 0x72BC,0x2667,
-	/* Array index: 0x0658 */ 0x72BE,0x266A,
-	/* Array index: 0x0658 */ 0x72C7,0x2668,
-	/* Array index: 0x0658 */ 0x72CD,0x2A26,
-	/* Array index: 0x0658 */ 0x72CF,0x2A2A,
-	/* Array index: 0x0658 */ 0x72D3,0x2A27,
-	/* Array index: 0x0658 */ 0x72DB,0x2A28,
-	/* Array index: 0x0658 */ 0x72E2,0x2D75,
-	/* Array index: 0x0658 */ 0x72E5,0x2D74,
-	/* Array index: 0x0658 */ 0x72E7,0x2D70,
-	/* Array index: 0x0658 */ 0x72EC,0x2D73,
-	/* Array index: 0x0658 */ 0x72ED,0x2D71,
-	/* Array index: 0x0658 */ 0x72F5,0x3238,
-	/* Array index: 0x0658 */ 0x7302,0x3239,
-	/* Array index: 0x0658 */ 0x7306,0x3D26,
-	/* Array index: 0x0658 */ 0x730E,0x373B,
-	/* Array index: 0x0658 */ 0x7310,0x373A,
-	/* Array index: 0x0658 */ 0x731A,0x3739,
-	/* Array index: 0x0658 */ 0x7324,0x3D27,
-	/* Array index: 0x0658 */ 0x7338,0x3D28,
-	/* Array index: 0x0658 */ 0x7341,0x425F,
-	/* Array index: 0x0658 */ 0x734B,0x4D30,
-	/* Array index: 0x0658 */ 0x734F,0x4779,
-	/* Array index: 0x0658 */ 0x7371,0x5549,
-	/* Array index: 0x0658 */ 0x738C,0x225A,
-	/* Array index: 0x0658 */ 0x738D,0x216B,
-	/* Array index: 0x0658 */ 0x738F,0x242F,
-	/* Array index: 0x0658 */ 0x7398,0x266E,
-	/* Array index: 0x0658 */ 0x739C,0x2A33,
-	/* Array index: 0x0658 */ 0x739E,0x2A2D,
-	/* Array index: 0x0658 */ 0x73A3,0x2A2C,
-	/* Array index: 0x0658 */ 0x73A7,0x2A2B,
-	/* Array index: 0x0658 */ 0x73AA,0x2A32,
-	/* Array index: 0x0658 */ 0x73AF,0x2A2F,
-	/* Array index: 0x0658 */ 0x73BD,0x2D78,
-	/* Array index: 0x0658 */ 0x73C1,0x2D7B,
-	/* Array index: 0x0658 */ 0x73C4,0x2D77,
-	/* Array index: 0x0658 */ 0x73C9,0x2D7A,
-	/* Array index: 0x0658 */ 0x73D5,0x323E,
-	/* Array index: 0x0658 */ 0x73DF,0x3240,
-	/* Array index: 0x0658 */ 0x73E1,0x3247,
-	/* Array index: 0x0658 */ 0x73E2,0x323C,
-	/* Array index: 0x0658 */ 0x73E4,0x3246,
-	/* Array index: 0x0658 */ 0x73E6,0x3241,
-	/* Array index: 0x0658 */ 0x73EC,0x323D,
-	/* Array index: 0x0658 */ 0x73EF,0x6564,
-	/* Array index: 0x0658 */ 0x73F3,0x373D,
-	/* Array index: 0x0658 */ 0x73F7,0x3D38,
-	/* Array index: 0x0658 */ 0x73F9,0x323F,
-	/* Array index: 0x0658 */ 0x73FB,0x3740,
-	/* Array index: 0x0658 */ 0x7402,0x373C,
-	/* Array index: 0x0658 */ 0x7412,0x6565,
-	/* Array index: 0x0658 */ 0x741C,0x3D39,
-	/* Array index: 0x0658 */ 0x741E,0x426D,
-	/* Array index: 0x0658 */ 0x741F,0x3D35,
-	/* Array index: 0x0658 */ 0x7427,0x4264,
-	/* Array index: 0x0658 */ 0x7443,0x426F,
-	/* Array index: 0x0658 */ 0x744C,0x4273,
-	/* Array index: 0x0658 */ 0x7453,0x4267,
-	/* Array index: 0x0658 */ 0x7456,0x426B,
-	/* Array index: 0x0658 */ 0x7458,0x4270,
-	/* Array index: 0x0658 */ 0x745D,0x426A,
-	/* Array index: 0x0658 */ 0x7460,0x4825,
-	/* Array index: 0x0658 */ 0x7461,0x477E,
-	/* Array index: 0x0658 */ 0x7465,0x477C,
-	/* Array index: 0x0658 */ 0x7466,0x477D,
-	/* Array index: 0x0658 */ 0x7468,0x4822,
-	/* Array index: 0x0658 */ 0x746B,0x4821,
-	/* Array index: 0x0658 */ 0x746C,0x477B,
-	/* Array index: 0x0658 */ 0x7474,0x4827,
-	/* Array index: 0x0658 */ 0x7476,0x4823,
-	/* Array index: 0x0658 */ 0x747A,0x4D31,
-	/* Array index: 0x0658 */ 0x747B,0x4D3B,
-	/* Array index: 0x0658 */ 0x7482,0x4D39,
-	/* Array index: 0x0658 */ 0x7484,0x4D36,
-	/* Array index: 0x0658 */ 0x748C,0x4D35,
-	/* Array index: 0x0658 */ 0x748D,0x6568,
-	/* Array index: 0x0658 */ 0x7493,0x4D3A,
-	/* Array index: 0x0658 */ 0x7496,0x516A,
-	/* Array index: 0x0658 */ 0x7499,0x6375,
-	/* Array index: 0x0658 */ 0x749B,0x5167,
-	/* Array index: 0x0658 */ 0x749D,0x516C,
-	/* Array index: 0x0658 */ 0x74A2,0x516B,
-	/* Array index: 0x0658 */ 0x74A4,0x6567,
-	/* Array index: 0x0658 */ 0x74AC,0x554F,
-	/* Array index: 0x0658 */ 0x74AE,0x554B,
-	/* Array index: 0x0658 */ 0x74B3,0x554D,
-	/* Array index: 0x0658 */ 0x74B4,0x6569,
-	/* Array index: 0x0658 */ 0x74B9,0x582F,
-	/* Array index: 0x0658 */ 0x74BC,0x5830,
-	/* Array index: 0x0658 */ 0x74C4,0x5A5A,
-	/* Array index: 0x0658 */ 0x74EB,0x2E22,
-	/* Array index: 0x0658 */ 0x74ED,0x2E21,
-	/* Array index: 0x0658 */ 0x74EF,0x2E24,
-	/* Array index: 0x0658 */ 0x74F3,0x3248,
-	/* Array index: 0x0658 */ 0x74F9,0x3D3D,
-	/* Array index: 0x0658 */ 0x7501,0x4277,
-	/* Array index: 0x0658 */ 0x7506,0x4828,
-	/* Array index: 0x0658 */ 0x7509,0x4D3D,
-	/* Array index: 0x0658 */ 0x750A,0x516D,
-	/* Array index: 0x0658 */ 0x750E,0x516E,
-	/* Array index: 0x0658 */ 0x751B,0x3744,
-	/* Array index: 0x0658 */ 0x751E,0x4278,
-	/* Array index: 0x0658 */ 0x7523,0x3745,
-	/* Array index: 0x0658 */ 0x7524,0x3D3E,
-	/* Array index: 0x0658 */ 0x753B,0x2A37,
-	/* Array index: 0x0658 */ 0x7541,0x2A38,
-	/* Array index: 0x0658 */ 0x7542,0x2A35,
-	/* Array index: 0x0658 */ 0x7544,0x2A36,
-	/* Array index: 0x0658 */ 0x7546,0x2E27,
-	/* Array index: 0x0658 */ 0x7549,0x2E25,
-	/* Array index: 0x0658 */ 0x754A,0x2E28,
-	/* Array index: 0x0658 */ 0x754D,0x2E2A,
-	/* Array index: 0x0658 */ 0x7550,0x2E26,
-	/* Array index: 0x0658 */ 0x755E,0x3251,
-	/* Array index: 0x0658 */ 0x7561,0x3746,
-	/* Array index: 0x0658 */ 0x7567,0x3749,
-	/* Array index: 0x0658 */ 0x7568,0x3747,
-	/* Array index: 0x0658 */ 0x756D,0x3D43,
-	/* Array index: 0x0658 */ 0x756E,0x3D42,
-	/* Array index: 0x0658 */ 0x7571,0x3D44,
-	/* Array index: 0x0658 */ 0x757A,0x427B,
-	/* Array index: 0x0658 */ 0x7581,0x5170,
-	/* Array index: 0x0658 */ 0x7583,0x5552,
-	/* Array index: 0x0658 */ 0x7589,0x5C62,
-	/* Array index: 0x0658 */ 0x758E,0x3D45,
-	/* Array index: 0x0658 */ 0x7592,0x225B,
-	/* Array index: 0x0658 */ 0x7593,0x2673,
-	/* Array index: 0x0658 */ 0x759B,0x2A3A,
-	/* Array index: 0x0658 */ 0x759E,0x2A3B,
-	/* Array index: 0x0658 */ 0x75A6,0x2E2B,
-	/* Array index: 0x0658 */ 0x75A8,0x2E2F,
-	/* Array index: 0x0658 */ 0x75B1,0x3257,
-	/* Array index: 0x0658 */ 0x75B4,0x3255,
-	/* Array index: 0x0658 */ 0x75C3,0x3252,
-	/* Array index: 0x0658 */ 0x75D3,0x374A,
-	/* Array index: 0x0658 */ 0x75E5,0x3D47,
-	/* Array index: 0x0658 */ 0x75EE,0x427C,
-	/* Array index: 0x0658 */ 0x7602,0x427D,
-	/* Array index: 0x0658 */ 0x7607,0x482B,
-	/* Array index: 0x0658 */ 0x760E,0x4829,
-	/* Array index: 0x0658 */ 0x762C,0x5171,
-	/* Array index: 0x0658 */ 0x7636,0x5173,
-	/* Array index: 0x0658 */ 0x7637,0x5172,
-	/* Array index: 0x0658 */ 0x763B,0x5174,
-	/* Array index: 0x0658 */ 0x7644,0x5555,
-	/* Array index: 0x0658 */ 0x7645,0x5553,
-	/* Array index: 0x0658 */ 0x764E,0x5554,
-	/* Array index: 0x0658 */ 0x764F,0x5834,
-	/* Array index: 0x0658 */ 0x7651,0x5833,
-	/* Array index: 0x0658 */ 0x765B,0x5832,
-	/* Array index: 0x0658 */ 0x7667,0x5E3F,
-	/* Array index: 0x0658 */ 0x7668,0x5E3E,
-	/* Array index: 0x0658 */ 0x766F,0x603B,
-	/* Array index: 0x0658 */ 0x7673,0x656A,
-	/* Array index: 0x0658 */ 0x7676,0x225C,
-	/* Array index: 0x0658 */ 0x7677,0x656B,
-	/* Array index: 0x0658 */ 0x7680,0x2674,
-	/* Array index: 0x0658 */ 0x7683,0x2676,
-	/* Array index: 0x0658 */ 0x7690,0x374D,
-	/* Array index: 0x0658 */ 0x7694,0x3D4C,
-	/* Array index: 0x0658 */ 0x7697,0x427E,
-	/* Array index: 0x0658 */ 0x7698,0x4321,
-	/* Array index: 0x0658 */ 0x76A1,0x5176,
-	/* Array index: 0x0658 */ 0x76A3,0x5556,
-	/* Array index: 0x0658 */ 0x76A5,0x5557,
-	/* Array index: 0x0658 */ 0x76A9,0x5A5E,
-	/* Array index: 0x0658 */ 0x76B3,0x3D4D,
-	/* Array index: 0x0658 */ 0x76B7,0x4830,
-	/* Array index: 0x0658 */ 0x76B9,0x482E,
-	/* Array index: 0x0658 */ 0x76BC,0x656C,
-	/* Array index: 0x0658 */ 0x76C0,0x2677,
-	/* Array index: 0x0658 */ 0x76C1,0x2678,
-	/* Array index: 0x0658 */ 0x76C7,0x2E32,
-	/* Array index: 0x0658 */ 0x76CB,0x325A,
-	/* Array index: 0x0658 */ 0x76CC,0x325B,
-	/* Array index: 0x0658 */ 0x76E2,0x4831,
-	/* Array index: 0x0658 */ 0x76EB,0x5835,
-	/* Array index: 0x0658 */ 0x76FD,0x2E35,
-	/* Array index: 0x0658 */ 0x76FF,0x2E33,
-	/* Array index: 0x0658 */ 0x7706,0x626C,
-	/* Array index: 0x0658 */ 0x770E,0x3264,
-	/* Array index: 0x0658 */ 0x770F,0x325F,
-	/* Array index: 0x0658 */ 0x7716,0x325E,
-	/* Array index: 0x0658 */ 0x7718,0x3268,
-	/* Array index: 0x0658 */ 0x771E,0x3759,
-	/* Array index: 0x0658 */ 0x7721,0x3267,
-	/* Array index: 0x0658 */ 0x7724,0x3265,
-	/* Array index: 0x0658 */ 0x7726,0x3755,
-	/* Array index: 0x0658 */ 0x772A,0x325C,
-	/* Array index: 0x0658 */ 0x772B,0x3263,
-	/* Array index: 0x0658 */ 0x7730,0x3753,
-	/* Array index: 0x0658 */ 0x7748,0x3D51,
-	/* Array index: 0x0658 */ 0x7749,0x3D52,
-	/* Array index: 0x0658 */ 0x7753,0x4327,
-	/* Array index: 0x0658 */ 0x7758,0x4328,
-	/* Array index: 0x0658 */ 0x775D,0x4325,
-	/* Array index: 0x0658 */ 0x7764,0x4326,
-	/* Array index: 0x0658 */ 0x7771,0x4839,
-	/* Array index: 0x0658 */ 0x778A,0x4D44,
-	/* Array index: 0x0658 */ 0x7790,0x4D46,
-	/* Array index: 0x0658 */ 0x7796,0x517B,
-	/* Array index: 0x0658 */ 0x7798,0x5179,
-	/* Array index: 0x0658 */ 0x77A4,0x5559,
-	/* Array index: 0x0658 */ 0x77A6,0x5558,
-	/* Array index: 0x0658 */ 0x77A9,0x555B,
-	/* Array index: 0x0658 */ 0x77AF,0x555C,
-	/* Array index: 0x0658 */ 0x77B8,0x5836,
-	/* Array index: 0x0658 */ 0x77B9,0x5838,
-	/* Array index: 0x0658 */ 0x77BE,0x583B,
-	/* Array index: 0x0658 */ 0x77C0,0x583A,
-	/* Array index: 0x0658 */ 0x77C1,0x5839,
-	/* Array index: 0x0658 */ 0x77C5,0x5A60,
-	/* Array index: 0x0658 */ 0x77C6,0x5A5F,
-	/* Array index: 0x0658 */ 0x77D1,0x5E42,
-	/* Array index: 0x0658 */ 0x77D6,0x6432,
-	/* Array index: 0x0658 */ 0x77DD,0x3269,
-	/* Array index: 0x0658 */ 0x77DF,0x3D57,
-	/* Array index: 0x0658 */ 0x77E6,0x2E36,
-	/* Array index: 0x0658 */ 0x77F4,0x267B,
-	/* Array index: 0x0658 */ 0x77F5,0x267C,
-	/* Array index: 0x0658 */ 0x7804,0x2E39,
-	/* Array index: 0x0658 */ 0x7815,0x2E3D,
-	/* Array index: 0x0658 */ 0x7819,0x656D,
-	/* Array index: 0x0658 */ 0x781B,0x656E,
-	/* Array index: 0x0658 */ 0x781E,0x667C,
-	/* Array index: 0x0658 */ 0x7824,0x326C,
-	/* Array index: 0x0658 */ 0x7836,0x326D,
-	/* Array index: 0x0658 */ 0x783D,0x656F,
-	/* Array index: 0x0658 */ 0x7842,0x3762,
-	/* Array index: 0x0658 */ 0x7846,0x3763,
-	/* Array index: 0x0658 */ 0x7847,0x375D,
-	/* Array index: 0x0658 */ 0x784B,0x375F,
-	/* Array index: 0x0658 */ 0x784F,0x3761,
-	/* Array index: 0x0658 */ 0x7851,0x3760,
-	/* Array index: 0x0658 */ 0x7853,0x6570,
-	/* Array index: 0x0658 */ 0x7854,0x6571,
-	/* Array index: 0x0658 */ 0x7858,0x6572,
-	/* Array index: 0x0658 */ 0x785F,0x3D5C,
-	/* Array index: 0x0658 */ 0x7863,0x3D59,
-	/* Array index: 0x0658 */ 0x7866,0x3D5D,
-	/* Array index: 0x0658 */ 0x7876,0x3D5A,
-	/* Array index: 0x0658 */ 0x7878,0x4331,
-	/* Array index: 0x0658 */ 0x787A,0x432D,
-	/* Array index: 0x0658 */ 0x787D,0x432E,
-	/* Array index: 0x0658 */ 0x7881,0x4337,
-	/* Array index: 0x0658 */ 0x7882,0x4329,
-	/* Array index: 0x0658 */ 0x7888,0x4335,
-	/* Array index: 0x0658 */ 0x788A,0x432B,
-	/* Array index: 0x0658 */ 0x788B,0x4330,
-	/* Array index: 0x0658 */ 0x788D,0x4334,
-	/* Array index: 0x0658 */ 0x7890,0x432A,
-	/* Array index: 0x0658 */ 0x7892,0x4336,
-	/* Array index: 0x0658 */ 0x78A6,0x483E,
-	/* Array index: 0x0658 */ 0x78AE,0x483F,
-	/* Array index: 0x0658 */ 0x78AF,0x4845,
-	/* Array index: 0x0658 */ 0x78B1,0x4844,
-	/* Array index: 0x0658 */ 0x78B7,0x6573,
-	/* Array index: 0x0658 */ 0x78B8,0x4840,
-	/* Array index: 0x0658 */ 0x78C0,0x4D4A,
-	/* Array index: 0x0658 */ 0x78C2,0x4D4D,
-	/* Array index: 0x0658 */ 0x78C6,0x4D48,
-	/* Array index: 0x0658 */ 0x78C7,0x4D4C,
-	/* Array index: 0x0658 */ 0x78D2,0x4D4B,
-	/* Array index: 0x0658 */ 0x78D3,0x4D49,
-	/* Array index: 0x0658 */ 0x78D6,0x5221,
-	/* Array index: 0x0658 */ 0x78D8,0x6574,
-	/* Array index: 0x0658 */ 0x78DC,0x5224,
-	/* Array index: 0x0658 */ 0x78EB,0x5222,
-	/* Array index: 0x0658 */ 0x78EE,0x6575,
-	/* Array index: 0x0658 */ 0x78F0,0x5560,
-	/* Array index: 0x0658 */ 0x78F1,0x5562,
-	/* Array index: 0x0658 */ 0x78F8,0x5561,
-	/* Array index: 0x0658 */ 0x7915,0x5844,
-	/* Array index: 0x0658 */ 0x7918,0x5A61,
-	/* Array index: 0x0658 */ 0x791A,0x5A62,
-	/* Array index: 0x0658 */ 0x7920,0x5A63,
-	/* Array index: 0x0658 */ 0x7922,0x6576,
-	/* Array index: 0x0658 */ 0x792E,0x5E45,
-	/* Array index: 0x0658 */ 0x7930,0x5E43,
-	/* Array index: 0x0658 */ 0x7932,0x5E44,
-	/* Array index: 0x0658 */ 0x7937,0x603C,
-	/* Array index: 0x0658 */ 0x793C,0x2433,
-	/* Array index: 0x0658 */ 0x794D,0x6577,
-	/* Array index: 0x0658 */ 0x7958,0x326F,
-	/* Array index: 0x0658 */ 0x7959,0x3270,
-	/* Array index: 0x0658 */ 0x7962,0x3272,
-	/* Array index: 0x0658 */ 0x7966,0x3D5E,
-	/* Array index: 0x0658 */ 0x796C,0x3766,
-	/* Array index: 0x0658 */ 0x796E,0x3765,
-	/* Array index: 0x0658 */ 0x7971,0x3D5F,
-	/* Array index: 0x0658 */ 0x7975,0x3D64,
-	/* Array index: 0x0658 */ 0x7976,0x3D62,
-	/* Array index: 0x0658 */ 0x797E,0x4338,
-	/* Array index: 0x0658 */ 0x7980,0x433D,
-	/* Array index: 0x0658 */ 0x7999,0x6579,
-	/* Array index: 0x0658 */ 0x79A3,0x657A,
-	/* Array index: 0x0658 */ 0x79A5,0x5226,
-	/* Array index: 0x0658 */ 0x79A9,0x5227,
-	/* Array index: 0x0658 */ 0x79AF,0x5845,
-	/* Array index: 0x0658 */ 0x79B5,0x603D,
-	/* Array index: 0x0658 */ 0x79BC,0x657B,
-	/* Array index: 0x0658 */ 0x79CA,0x2A44,
-	/* Array index: 0x0658 */ 0x79CC,0x654C,
-	/* Array index: 0x0658 */ 0x79D0,0x2E42,
-	/* Array index: 0x0658 */ 0x79D3,0x2E40,
-	/* Array index: 0x0658 */ 0x79D4,0x2E41,
-	/* Array index: 0x0658 */ 0x79E1,0x3276,
-	/* Array index: 0x0658 */ 0x79E2,0x327B,
-	/* Array index: 0x0658 */ 0x79E5,0x3277,
-	/* Array index: 0x0658 */ 0x79E8,0x3278,
-	/* Array index: 0x0658 */ 0x79F9,0x376C,
-	/* Array index: 0x0658 */ 0x79FF,0x3D65,
-	/* Array index: 0x0658 */ 0x7A07,0x3D66,
-	/* Array index: 0x0658 */ 0x7A09,0x3D69,
-	/* Array index: 0x0658 */ 0x7A0E,0x3D68,
-	/* Array index: 0x0658 */ 0x7A0F,0x4341,
-	/* Array index: 0x0658 */ 0x7A1D,0x4344,
-	/* Array index: 0x0658 */ 0x7A25,0x6524,
-	/* Array index: 0x0658 */ 0x7A32,0x4852,
-	/* Array index: 0x0658 */ 0x7A38,0x4D55,
-	/* Array index: 0x0658 */ 0x7A3A,0x4D56,
-	/* Array index: 0x0658 */ 0x7A3E,0x4D5A,
-	/* Array index: 0x0658 */ 0x7A41,0x4D53,
-	/* Array index: 0x0658 */ 0x7A42,0x4D57,
-	/* Array index: 0x0658 */ 0x7A45,0x522A,
-	/* Array index: 0x0658 */ 0x7A49,0x5564,
-	/* Array index: 0x0658 */ 0x7A4F,0x522C,
-	/* Array index: 0x0658 */ 0x7A53,0x5229,
-	/* Array index: 0x0658 */ 0x7A64,0x5A66,
-	/* Array index: 0x0658 */ 0x7A66,0x5A65,
-	/* Array index: 0x0658 */ 0x7A6A,0x5A67,
-	/* Array index: 0x0658 */ 0x7A6F,0x5C64,
-	/* Array index: 0x0658 */ 0x7A72,0x6076,
-	/* Array index: 0x0658 */ 0x7A73,0x6077,
-	/* Array index: 0x0658 */ 0x7A7C,0x2E44,
-	/* Array index: 0x0658 */ 0x7A7D,0x2E47,
-	/* Array index: 0x0658 */ 0x7A82,0x2E49,
-	/* Array index: 0x0658 */ 0x7A83,0x2E48,
-	/* Array index: 0x0658 */ 0x7A91,0x3772,
-	/* Array index: 0x0658 */ 0x7A93,0x3771,
-	/* Array index: 0x0658 */ 0x7A9A,0x3770,
-	/* Array index: 0x0658 */ 0x7AA1,0x4346,
-	/* Array index: 0x0658 */ 0x7AA4,0x4347,
-	/* Array index: 0x0658 */ 0x7AA7,0x657C,
-	/* Array index: 0x0658 */ 0x7AB0,0x4D5B,
-	/* Array index: 0x0658 */ 0x7ABB,0x522F,
-	/* Array index: 0x0658 */ 0x7ABD,0x522E,
-	/* Array index: 0x0658 */ 0x7AC2,0x5568,
-	/* Array index: 0x0658 */ 0x7AC8,0x5E49,
-	/* Array index: 0x0658 */ 0x7AC9,0x5E48,
-	/* Array index: 0x0658 */ 0x7AE1,0x3773,
-	/* Array index: 0x0658 */ 0x7AE2,0x3D71,
-	/* Array index: 0x0658 */ 0x7AE7,0x3D70,
-	/* Array index: 0x0658 */ 0x7AE9,0x4349,
-	/* Array index: 0x0658 */ 0x7AEA,0x434A,
-	/* Array index: 0x0658 */ 0x7AEC,0x4854,
-	/* Array index: 0x0658 */ 0x7AF8,0x5F55,
-	/* Array index: 0x0658 */ 0x7AFC,0x2E51,
-	/* Array index: 0x0658 */ 0x7AFE,0x2E50,
-	/* Array index: 0x0658 */ 0x7B0B,0x332B,
-	/* Array index: 0x0658 */ 0x7B0D,0x332A,
-	/* Array index: 0x0658 */ 0x7B14,0x332C,
-	/* Array index: 0x0658 */ 0x7B16,0x3778,
-	/* Array index: 0x0658 */ 0x7B17,0x3779,
-	/* Array index: 0x0658 */ 0x7B1C,0x3777,
-	/* Array index: 0x0658 */ 0x7B1F,0x377B,
-	/* Array index: 0x0658 */ 0x7B21,0x3776,
-	/* Array index: 0x0658 */ 0x7B29,0x632D,
-	/* Array index: 0x0658 */ 0x7B36,0x377A,
-	/* Array index: 0x0658 */ 0x7B37,0x657D,
-	/* Array index: 0x0658 */ 0x7B53,0x3D79,
-	/* Array index: 0x0658 */ 0x7B55,0x3D72,
-	/* Array index: 0x0658 */ 0x7B57,0x3D76,
-	/* Array index: 0x0658 */ 0x7B59,0x657E,
-	/* Array index: 0x0658 */ 0x7B5E,0x434F,
-	/* Array index: 0x0658 */ 0x7B62,0x434C,
-	/* Array index: 0x0658 */ 0x7B68,0x4355,
-	/* Array index: 0x0658 */ 0x7B6B,0x434D,
-	/* Array index: 0x0658 */ 0x7B6C,0x3D77,
-	/* Array index: 0x0658 */ 0x7B6F,0x4354,
-	/* Array index: 0x0658 */ 0x7B79,0x4351,
-	/* Array index: 0x0658 */ 0x7B81,0x4856,
-	/* Array index: 0x0658 */ 0x7B83,0x4858,
-	/* Array index: 0x0658 */ 0x7B86,0x4860,
-	/* Array index: 0x0658 */ 0x7B92,0x485A,
-	/* Array index: 0x0658 */ 0x7B93,0x485E,
-	/* Array index: 0x0658 */ 0x7B9E,0x4857,
-	/* Array index: 0x0658 */ 0x7B9F,0x485D,
-	/* Array index: 0x0658 */ 0x7BA3,0x485C,
-	/* Array index: 0x0658 */ 0x7BAE,0x4D5C,
-	/* Array index: 0x0658 */ 0x7BB2,0x4D65,
-	/* Array index: 0x0658 */ 0x7BB3,0x4D5D,
-	/* Array index: 0x0658 */ 0x7BBF,0x4D60,
-	/* Array index: 0x0658 */ 0x7BC2,0x6367,
-	/* Array index: 0x0658 */ 0x7BC3,0x6366,
-	/* Array index: 0x0658 */ 0x7BCD,0x4D63,
-	/* Array index: 0x0658 */ 0x7BD0,0x6621,
-	/* Array index: 0x0658 */ 0x7BEC,0x5233,
-	/* Array index: 0x0658 */ 0x7BED,0x5234,
-	/* Array index: 0x0658 */ 0x7BF6,0x556D,
-	/* Array index: 0x0658 */ 0x7BFA,0x556B,
-	/* Array index: 0x0658 */ 0x7BFC,0x556E,
-	/* Array index: 0x0658 */ 0x7C08,0x5570,
-	/* Array index: 0x0658 */ 0x7C12,0x5571,
-	/* Array index: 0x0658 */ 0x7C18,0x556F,
-	/* Array index: 0x0658 */ 0x7C1A,0x5850,
-	/* Array index: 0x0658 */ 0x7C1B,0x584E,
-	/* Array index: 0x0658 */ 0x7C24,0x5851,
-	/* Array index: 0x0658 */ 0x7C2E,0x584C,
-	/* Array index: 0x0658 */ 0x7C2F,0x6622,
-	/* Array index: 0x0658 */ 0x7C32,0x6623,
-	/* Array index: 0x0658 */ 0x7C34,0x5A6F,
-	/* Array index: 0x0658 */ 0x7C35,0x5A6E,
-	/* Array index: 0x0658 */ 0x7C42,0x6624,
-	/* Array index: 0x0658 */ 0x7C44,0x5C66,
-	/* Array index: 0x0658 */ 0x7C4B,0x5C65,
-	/* Array index: 0x0658 */ 0x7C4E,0x6625,
-	/* Array index: 0x0658 */ 0x7C51,0x5E4C,
-	/* Array index: 0x0658 */ 0x7C56,0x5E4B,
-	/* Array index: 0x0658 */ 0x7C58,0x5F58,
-	/* Array index: 0x0658 */ 0x7C5D,0x5F57,
-	/* Array index: 0x0658 */ 0x7C5E,0x603F,
-	/* Array index: 0x0658 */ 0x7C62,0x603E,
-	/* Array index: 0x0658 */ 0x7C68,0x6626,
-	/* Array index: 0x0658 */ 0x7C6D,0x6144,
-	/* Array index: 0x0658 */ 0x7C71,0x623A,
-	/* Array index: 0x0658 */ 0x7C74,0x2A49,
-	/* Array index: 0x0658 */ 0x7C76,0x2A48,
-	/* Array index: 0x0658 */ 0x7C77,0x2E52,
-	/* Array index: 0x0658 */ 0x7C7B,0x2E54,
-	/* Array index: 0x0658 */ 0x7C7C,0x2E53,
-	/* Array index: 0x0658 */ 0x7C83,0x3331,
-	/* Array index: 0x0658 */ 0x7C86,0x332E,
-	/* Array index: 0x0658 */ 0x7C87,0x3330,
-	/* Array index: 0x0658 */ 0x7C8B,0x3332,
-	/* Array index: 0x0658 */ 0x7C8E,0x332D,
-	/* Array index: 0x0658 */ 0x7C93,0x377D,
-	/* Array index: 0x0658 */ 0x7CA0,0x3E21,
-	/* Array index: 0x0658 */ 0x7CA4,0x3E23,
-	/* Array index: 0x0658 */ 0x7CA6,0x3E22,
-	/* Array index: 0x0658 */ 0x7CA7,0x3D7E,
-	/* Array index: 0x0658 */ 0x7CA9,0x6627,
-	/* Array index: 0x0658 */ 0x7CAE,0x4358,
-	/* Array index: 0x0658 */ 0x7CB0,0x435C,
-	/* Array index: 0x0658 */ 0x7CB7,0x4862,
-	/* Array index: 0x0658 */ 0x7CB8,0x4861,
-	/* Array index: 0x0658 */ 0x7CCD,0x4D6E,
-	/* Array index: 0x0658 */ 0x7CD3,0x5237,
-	/* Array index: 0x0658 */ 0x7CDA,0x5575,
-	/* Array index: 0x0658 */ 0x7CDB,0x5574,
-	/* Array index: 0x0658 */ 0x7CE1,0x5239,
-	/* Array index: 0x0658 */ 0x7CE3,0x5855,
-	/* Array index: 0x0658 */ 0x7CE6,0x5854,
-	/* Array index: 0x0658 */ 0x7CED,0x6628,
-	/* Array index: 0x0658 */ 0x7CF3,0x6169,
-	/* Array index: 0x0658 */ 0x7CF5,0x6040,
-	/* Array index: 0x0658 */ 0x7CFA,0x2722,
-	/* Array index: 0x0658 */ 0x7CFC,0x2A4B,
-	/* Array index: 0x0658 */ 0x7CFF,0x2A4A,
-	/* Array index: 0x0658 */ 0x7D24,0x3337,
-	/* Array index: 0x0658 */ 0x7D25,0x333B,
-	/* Array index: 0x0658 */ 0x7D2D,0x3829,
-	/* Array index: 0x0658 */ 0x7D34,0x3826,
-	/* Array index: 0x0658 */ 0x7D37,0x3827,
-	/* Array index: 0x0658 */ 0x7D48,0x382E,
-	/* Array index: 0x0658 */ 0x7D49,0x3824,
-	/* Array index: 0x0658 */ 0x7D4C,0x382B,
-	/* Array index: 0x0658 */ 0x7D4D,0x3E34,
-	/* Array index: 0x0658 */ 0x7D57,0x3E29,
-	/* Array index: 0x0658 */ 0x7D59,0x3E26,
-	/* Array index: 0x0658 */ 0x7D5A,0x3E2E,
-	/* Array index: 0x0658 */ 0x7D5D,0x3E2F,
-	/* Array index: 0x0658 */ 0x7D60,0x3E28,
-	/* Array index: 0x0658 */ 0x7D64,0x3E2C,
-	/* Array index: 0x0658 */ 0x7D6C,0x3E2A,
-	/* Array index: 0x0658 */ 0x7D7E,0x3E2B,
-	/* Array index: 0x0658 */ 0x7D90,0x435E,
-	/* Array index: 0x0658 */ 0x7DA4,0x4874,
-	/* Array index: 0x0658 */ 0x7DA8,0x486D,
-	/* Array index: 0x0658 */ 0x7DAB,0x486E,
-	/* Array index: 0x0658 */ 0x7DB3,0x4870,
-	/* Array index: 0x0658 */ 0x7DB6,0x4869,
-	/* Array index: 0x0658 */ 0x7DC8,0x4868,
-	/* Array index: 0x0658 */ 0x7DD6,0x4E22,
-	/* Array index: 0x0658 */ 0x7DDC,0x4D7C,
-	/* Array index: 0x0658 */ 0x7DE2,0x4D78,
-	/* Array index: 0x0658 */ 0x7DE4,0x4E24,
-	/* Array index: 0x0658 */ 0x7DE5,0x4E2F,
-	/* Array index: 0x0658 */ 0x7DEB,0x4E2E,
-	/* Array index: 0x0658 */ 0x7DED,0x4D77,
-	/* Array index: 0x0658 */ 0x7DF5,0x4E2B,
-	/* Array index: 0x0658 */ 0x7DF8,0x4D75,
-	/* Array index: 0x0658 */ 0x7E07,0x662A,
-	/* Array index: 0x0658 */ 0x7E19,0x523B,
-	/* Array index: 0x0658 */ 0x7E26,0x5240,
-	/* Array index: 0x0658 */ 0x7E27,0x523F,
-	/* Array index: 0x0658 */ 0x7E2C,0x5579,
-	/* Array index: 0x0658 */ 0x7E4D,0x557A,
-	/* Array index: 0x0658 */ 0x7E4F,0x5859,
-	/* Array index: 0x0658 */ 0x7E5B,0x585B,
-	/* Array index: 0x0658 */ 0x7E5D,0x5858,
-	/* Array index: 0x0658 */ 0x7E64,0x662C,
-	/* Array index: 0x0658 */ 0x7E66,0x585A,
-	/* Array index: 0x0658 */ 0x7E6C,0x5A72,
-	/* Array index: 0x0658 */ 0x7E6E,0x5A74,
-	/* Array index: 0x0658 */ 0x7E71,0x5A75,
-	/* Array index: 0x0658 */ 0x7E7F,0x5C6C,
-	/* Array index: 0x0658 */ 0x7E84,0x5E53,
-	/* Array index: 0x0658 */ 0x7E85,0x5E50,
-	/* Array index: 0x0658 */ 0x7E89,0x5E51,
-	/* Array index: 0x0658 */ 0x7E8E,0x5E52,
-	/* Array index: 0x0658 */ 0x7E92,0x5F5A,
-	/* Array index: 0x0658 */ 0x7E9E,0x6235,
-	/* Array index: 0x0658 */ 0x7F3B,0x3831,
-	/* Array index: 0x0658 */ 0x7F40,0x662D,
-	/* Array index: 0x0658 */ 0x7F41,0x4877,
-	/* Array index: 0x0658 */ 0x7F46,0x557D,
-	/* Array index: 0x0658 */ 0x7F47,0x585C,
-	/* Array index: 0x0658 */ 0x7F4E,0x5F5B,
-	/* Array index: 0x0658 */ 0x7F59,0x2A4E,
-	/* Array index: 0x0658 */ 0x7F62,0x333C,
-	/* Array index: 0x0658 */ 0x7F6F,0x4878,
-	/* Array index: 0x0658 */ 0x7F71,0x4879,
-	/* Array index: 0x0658 */ 0x7F78,0x4E30,
-	/* Array index: 0x0658 */ 0x7F84,0x6422,
-	/* Array index: 0x0658 */ 0x7F8F,0x2E5D,
-	/* Array index: 0x0658 */ 0x7F93,0x333D,
-	/* Array index: 0x0658 */ 0x7F97,0x333F,
-	/* Array index: 0x0658 */ 0x7F99,0x333E,
-	/* Array index: 0x0658 */ 0x7FA3,0x436E,
-	/* Array index: 0x0658 */ 0x7FAE,0x4E31,
-	/* Array index: 0x0658 */ 0x7FB4,0x585D,
-	/* Array index: 0x0658 */ 0x7FC4,0x3342,
-	/* Array index: 0x0658 */ 0x7FC6,0x3343,
-	/* Array index: 0x0658 */ 0x7FD3,0x3E37,
-	/* Array index: 0x0658 */ 0x7FD6,0x3E38,
-	/* Array index: 0x0658 */ 0x7FDD,0x4372,
-	/* Array index: 0x0658 */ 0x7FE7,0x4E32,
-	/* Array index: 0x0658 */ 0x7FF6,0x557E,
-	/* Array index: 0x0658 */ 0x7FFA,0x5861,
-	/* Array index: 0x0658 */ 0x8002,0x667B,
-	/* Array index: 0x0658 */ 0x8008,0x3836,
-	/* Array index: 0x0658 */ 0x800A,0x3344,
-	/* Array index: 0x0658 */ 0x801A,0x3837,
-	/* Array index: 0x0658 */ 0x801D,0x3839,
-	/* Array index: 0x0658 */ 0x8023,0x4922,
-	/* Array index: 0x0658 */ 0x802B,0x5621,
-	/* Array index: 0x0658 */ 0x802E,0x5862,
-	/* Array index: 0x0658 */ 0x802F,0x5C6F,
-	/* Array index: 0x0658 */ 0x803B,0x3349,
-	/* Array index: 0x0658 */ 0x803C,0x3348,
-	/* Array index: 0x0658 */ 0x8040,0x3347,
-	/* Array index: 0x0658 */ 0x8041,0x662F,
-	/* Array index: 0x0658 */ 0x8044,0x383D,
-	/* Array index: 0x0658 */ 0x8045,0x383C,
-	/* Array index: 0x0658 */ 0x8049,0x383B,
-	/* Array index: 0x0658 */ 0x804E,0x3E3C,
-	/* Array index: 0x0658 */ 0x8053,0x6729,
-	/* Array index: 0x0658 */ 0x8057,0x4373,
-	/* Array index: 0x0658 */ 0x8059,0x6356,
-	/* Array index: 0x0658 */ 0x805B,0x4923,
-	/* Array index: 0x0658 */ 0x806E,0x5243,
-	/* Array index: 0x0658 */ 0x8074,0x5622,
-	/* Array index: 0x0658 */ 0x808D,0x2435,
-	/* Array index: 0x0658 */ 0x808E,0x2436,
-	/* Array index: 0x0658 */ 0x8091,0x2724,
-	/* Array index: 0x0658 */ 0x8094,0x2726,
-	/* Array index: 0x0658 */ 0x8097,0x2725,
-	/* Array index: 0x0658 */ 0x809F,0x2723,
-	/* Array index: 0x0658 */ 0x80AC,0x2A59,
-	/* Array index: 0x0658 */ 0x80B0,0x2A52,
-	/* Array index: 0x0658 */ 0x80B3,0x2A54,
-	/* Array index: 0x0658 */ 0x80B6,0x2A57,
-	/* Array index: 0x0658 */ 0x80BB,0x6631,
-	/* Array index: 0x0658 */ 0x80C6,0x2E66,
-	/* Array index: 0x0658 */ 0x80CB,0x2E60,
-	/* Array index: 0x0658 */ 0x80D2,0x2E61,
-	/* Array index: 0x0658 */ 0x80D3,0x2E5E,
-	/* Array index: 0x0658 */ 0x80DF,0x2E65,
-	/* Array index: 0x0658 */ 0x80E2,0x2E64,
-	/* Array index: 0x0658 */ 0x80EE,0x334C,
-	/* Array index: 0x0658 */ 0x80F6,0x334A,
-	/* Array index: 0x0658 */ 0x80F7,0x3352,
-	/* Array index: 0x0658 */ 0x80FF,0x334B,
-	/* Array index: 0x0658 */ 0x8103,0x334E,
-	/* Array index: 0x0658 */ 0x8104,0x334D,
-	/* Array index: 0x0658 */ 0x8107,0x334F,
-	/* Array index: 0x0658 */ 0x8109,0x2E63,
-	/* Array index: 0x0658 */ 0x8114,0x3E44,
-	/* Array index: 0x0658 */ 0x8117,0x3849,
-	/* Array index: 0x0658 */ 0x811A,0x3847,
-	/* Array index: 0x0658 */ 0x8128,0x632E,
-	/* Array index: 0x0658 */ 0x812A,0x3841,
-	/* Array index: 0x0658 */ 0x812E,0x3842,
-	/* Array index: 0x0658 */ 0x8131,0x3845,
-	/* Array index: 0x0658 */ 0x8134,0x3848,
-	/* Array index: 0x0658 */ 0x813B,0x3E3E,
-	/* Array index: 0x0658 */ 0x8145,0x3E3D,
-	/* Array index: 0x0658 */ 0x8148,0x3E40,
-	/* Array index: 0x0658 */ 0x8149,0x3E42,
-	/* Array index: 0x0658 */ 0x815D,0x437B,
-	/* Array index: 0x0658 */ 0x815F,0x437E,
-	/* Array index: 0x0658 */ 0x8163,0x4375,
-	/* Array index: 0x0658 */ 0x816A,0x4376,
-	/* Array index: 0x0658 */ 0x816C,0x4377,
-	/* Array index: 0x0658 */ 0x816D,0x4423,
-	/* Array index: 0x0658 */ 0x8175,0x437C,
-	/* Array index: 0x0658 */ 0x817D,0x4422,
-	/* Array index: 0x0658 */ 0x8181,0x4927,
-	/* Array index: 0x0658 */ 0x8184,0x492A,
-	/* Array index: 0x0658 */ 0x81A1,0x4E3A,
-	/* Array index: 0x0658 */ 0x81AA,0x5249,
-	/* Array index: 0x0658 */ 0x81AD,0x5247,
-	/* Array index: 0x0658 */ 0x81AF,0x5244,
-	/* Array index: 0x0658 */ 0x81B8,0x5623,
-	/* Array index: 0x0658 */ 0x81C8,0x5624,
-	/* Array index: 0x0658 */ 0x81CE,0x5865,
-	/* Array index: 0x0658 */ 0x81D4,0x5A77,
-	/* Array index: 0x0658 */ 0x81D6,0x5A78,
-	/* Array index: 0x0658 */ 0x81EF,0x3E47,
-	/* Array index: 0x0658 */ 0x81F6,0x3E48,
-	/* Array index: 0x0658 */ 0x8203,0x3E49,
-	/* Array index: 0x0658 */ 0x820E,0x2A5D,
-	/* Array index: 0x0658 */ 0x8213,0x492B,
-	/* Array index: 0x0658 */ 0x8224,0x2E68,
-	/* Array index: 0x0658 */ 0x8227,0x3357,
-	/* Array index: 0x0658 */ 0x8229,0x3358,
-	/* Array index: 0x0658 */ 0x822D,0x3355,
-	/* Array index: 0x0658 */ 0x8241,0x4426,
-	/* Array index: 0x0658 */ 0x8248,0x6634,
-	/* Array index: 0x0658 */ 0x824A,0x492D,
-	/* Array index: 0x0658 */ 0x824C,0x492E,
-	/* Array index: 0x0658 */ 0x8262,0x5A7A,
-	/* Array index: 0x0658 */ 0x8265,0x5A7B,
-	/* Array index: 0x0658 */ 0x826A,0x5E55,
-	/* Array index: 0x0658 */ 0x8276,0x5A7C,
-	/* Array index: 0x0658 */ 0x827B,0x2438,
-	/* Array index: 0x0658 */ 0x8286,0x2728,
-	/* Array index: 0x0658 */ 0x828C,0x2729,
-	/* Array index: 0x0658 */ 0x8295,0x272B,
-	/* Array index: 0x0658 */ 0x829C,0x2A60,
-	/* Array index: 0x0658 */ 0x82A6,0x2A6B,
-	/* Array index: 0x0658 */ 0x82AA,0x2A66,
-	/* Array index: 0x0658 */ 0x82B2,0x2A6C,
-	/* Array index: 0x0658 */ 0x82C4,0x2A5E,
-	/* Array index: 0x0658 */ 0x82C9,0x2A68,
-	/* Array index: 0x0658 */ 0x82D0,0x2E76,
-	/* Array index: 0x0658 */ 0x82D8,0x2E6A,
-	/* Array index: 0x0658 */ 0x82DD,0x2E6B,
-	/* Array index: 0x0658 */ 0x82E2,0x2E78,
-	/* Array index: 0x0658 */ 0x82E9,0x2E72,
-	/* Array index: 0x0658 */ 0x82EE,0x2E74,
-	/* Array index: 0x0658 */ 0x82F7,0x2E69,
-	/* Array index: 0x0658 */ 0x82F8,0x2E6E,
-	/* Array index: 0x0658 */ 0x82FC,0x2E6F,
-	/* Array index: 0x0658 */ 0x82FD,0x2E7A,
-	/* Array index: 0x0658 */ 0x830B,0x2E79,
-	/* Array index: 0x0658 */ 0x830E,0x2E77,
-	/* Array index: 0x0658 */ 0x8310,0x6635,
-	/* Array index: 0x0658 */ 0x8312,0x6637,
-	/* Array index: 0x0658 */ 0x8318,0x3362,
-	/* Array index: 0x0658 */ 0x831D,0x384D,
-	/* Array index: 0x0658 */ 0x831F,0x3359,
-	/* Array index: 0x0658 */ 0x8321,0x335F,
-	/* Array index: 0x0658 */ 0x8323,0x385B,
-	/* Array index: 0x0658 */ 0x833E,0x2A5F,
-	/* Array index: 0x0658 */ 0x8346,0x3E57,
-	/* Array index: 0x0658 */ 0x8357,0x335A,
-	/* Array index: 0x0658 */ 0x8358,0x3363,
-	/* Array index: 0x0658 */ 0x8362,0x6636,
-	/* Array index: 0x0658 */ 0x8363,0x2D33,
-	/* Array index: 0x0658 */ 0x8371,0x384E,
-	/* Array index: 0x0658 */ 0x8372,0x3851,
-	/* Array index: 0x0658 */ 0x8379,0x3854,
-	/* Array index: 0x0658 */ 0x8380,0x3850,
-	/* Array index: 0x0658 */ 0x8384,0x384F,
-	/* Array index: 0x0658 */ 0x8385,0x385D,
-	/* Array index: 0x0658 */ 0x8391,0x3855,
-	/* Array index: 0x0658 */ 0x839C,0x385E,
-	/* Array index: 0x0658 */ 0x839F,0x3857,
-	/* Array index: 0x0658 */ 0x83A1,0x3852,
-	/* Array index: 0x0658 */ 0x83AD,0x3858,
-	/* Array index: 0x0658 */ 0x83B7,0x385F,
-	/* Array index: 0x0658 */ 0x83CD,0x3E5E,
-	/* Array index: 0x0658 */ 0x83D2,0x3E4F,
-	/* Array index: 0x0658 */ 0x83D3,0x3E59,
-	/* Array index: 0x0658 */ 0x83DA,0x3E4D,
-	/* Array index: 0x0658 */ 0x83E6,0x3E5F,
-	/* Array index: 0x0658 */ 0x83ED,0x3E4B,
-	/* Array index: 0x0658 */ 0x8400,0x3E52,
-	/* Array index: 0x0658 */ 0x8402,0x3E5C,
-	/* Array index: 0x0658 */ 0x8405,0x3E5A,
-	/* Array index: 0x0658 */ 0x8408,0x3E50,
-	/* Array index: 0x0658 */ 0x841E,0x6639,
-	/* Array index: 0x0658 */ 0x841F,0x3E5B,
-	/* Array index: 0x0658 */ 0x8421,0x6638,
-	/* Array index: 0x0658 */ 0x842A,0x442D,
-	/* Array index: 0x0658 */ 0x842E,0x4431,
-	/* Array index: 0x0658 */ 0x843E,0x443A,
-	/* Array index: 0x0658 */ 0x8441,0x4435,
-	/* Array index: 0x0658 */ 0x8448,0x442C,
-	/* Array index: 0x0658 */ 0x844A,0x443E,
-	/* Array index: 0x0658 */ 0x844F,0x4427,
-	/* Array index: 0x0658 */ 0x8453,0x4433,
-	/* Array index: 0x0658 */ 0x8455,0x443F,
-	/* Array index: 0x0658 */ 0x8458,0x4440,
-	/* Array index: 0x0658 */ 0x845C,0x4432,
-	/* Array index: 0x0658 */ 0x8462,0x4438,
-	/* Array index: 0x0658 */ 0x8464,0x4430,
-	/* Array index: 0x0658 */ 0x8471,0x443C,
-	/* Array index: 0x0658 */ 0x8472,0x442F,
-	/* Array index: 0x0658 */ 0x847B,0x442E,
-	/* Array index: 0x0658 */ 0x847F,0x442A,
-	/* Array index: 0x0658 */ 0x8480,0x4439,
-	/* Array index: 0x0658 */ 0x8483,0x443B,
-	/* Array index: 0x0658 */ 0x8484,0x4428,
-	/* Array index: 0x0658 */ 0x84A3,0x493C,
-	/* Array index: 0x0658 */ 0x84A5,0x4939,
-	/* Array index: 0x0658 */ 0x84AD,0x4942,
-	/* Array index: 0x0658 */ 0x84B3,0x493B,
-	/* Array index: 0x0658 */ 0x84B5,0x493A,
-	/* Array index: 0x0658 */ 0x84B7,0x4941,
-	/* Array index: 0x0658 */ 0x84BD,0x4932,
-	/* Array index: 0x0658 */ 0x84C3,0x4936,
-	/* Array index: 0x0658 */ 0x84C8,0x4436,
-	/* Array index: 0x0658 */ 0x84D5,0x493F,
-	/* Array index: 0x0658 */ 0x84D8,0x493E,
-	/* Array index: 0x0658 */ 0x84DA,0x4943,
-	/* Array index: 0x0658 */ 0x84DE,0x663B,
-	/* Array index: 0x0658 */ 0x84E1,0x663C,
-	/* Array index: 0x0658 */ 0x84E2,0x663A,
-	/* Array index: 0x0658 */ 0x84E4,0x493D,
-	/* Array index: 0x0658 */ 0x84ED,0x4E4F,
-	/* Array index: 0x0658 */ 0x84F5,0x4E44,
-	/* Array index: 0x0658 */ 0x84F8,0x4E42,
-	/* Array index: 0x0658 */ 0x851B,0x4E4B,
-	/* Array index: 0x0658 */ 0x853F,0x525A,
-	/* Array index: 0x0658 */ 0x8542,0x5252,
-	/* Array index: 0x0658 */ 0x854B,0x5259,
-	/* Array index: 0x0658 */ 0x854C,0x5250,
-	/* Array index: 0x0658 */ 0x855A,0x5258,
-	/* Array index: 0x0658 */ 0x855C,0x5254,
-	/* Array index: 0x0658 */ 0x855F,0x5256,
-	/* Array index: 0x0658 */ 0x856F,0x524F,
-	/* Array index: 0x0658 */ 0x8570,0x5255,
-	/* Array index: 0x0658 */ 0x8573,0x663D,
-	/* Array index: 0x0658 */ 0x857F,0x562B,
-	/* Array index: 0x0658 */ 0x8592,0x5628,
-	/* Array index: 0x0658 */ 0x8593,0x5629,
-	/* Array index: 0x0658 */ 0x8597,0x562D,
-	/* Array index: 0x0658 */ 0x85AB,0x562C,
-	/* Array index: 0x0658 */ 0x85AC,0x5630,
-	/* Array index: 0x0658 */ 0x85B2,0x586C,
-	/* Array index: 0x0658 */ 0x85BB,0x586E,
-	/* Array index: 0x0658 */ 0x85C1,0x586F,
-	/* Array index: 0x0658 */ 0x85CC,0x586B,
-	/* Array index: 0x0658 */ 0x85D4,0x663E,
-	/* Array index: 0x0658 */ 0x85D6,0x5A7E,
-	/* Array index: 0x0658 */ 0x85DB,0x5A7D,
-	/* Array index: 0x0658 */ 0x85E7,0x5B22,
-	/* Array index: 0x0658 */ 0x85EE,0x5C7B,
-	/* Array index: 0x0658 */ 0x85F4,0x5B25,
-	/* Array index: 0x0658 */ 0x85F5,0x663F,
-	/* Array index: 0x0658 */ 0x85FC,0x5C76,
-	/* Array index: 0x0658 */ 0x8602,0x5C78,
-	/* Array index: 0x0658 */ 0x8603,0x5C7C,
-	/* Array index: 0x0658 */ 0x8608,0x5D22,
-	/* Array index: 0x0658 */ 0x860D,0x5C7E,
-	/* Array index: 0x0658 */ 0x860F,0x5D23,
-	/* Array index: 0x0658 */ 0x8610,0x5C77,
-	/* Array index: 0x0658 */ 0x8613,0x5D21,
-	/* Array index: 0x0658 */ 0x8615,0x5E5B,
-	/* Array index: 0x0658 */ 0x8616,0x5E5A,
-	/* Array index: 0x0658 */ 0x861D,0x5E5C,
-	/* Array index: 0x0658 */ 0x8628,0x5E58,
-	/* Array index: 0x0658 */ 0x862B,0x5E56,
-	/* Array index: 0x0658 */ 0x862F,0x5E57,
-	/* Array index: 0x0658 */ 0x8637,0x6640,
-	/* Array index: 0x0658 */ 0x863D,0x6043,
-	/* Array index: 0x0658 */ 0x8641,0x602F,
-	/* Array index: 0x0658 */ 0x8642,0x6146,
-	/* Array index: 0x0658 */ 0x8645,0x6641,
-	/* Array index: 0x0658 */ 0x8649,0x6147,
-	/* Array index: 0x0658 */ 0x864A,0x617C,
-	/* Array index: 0x0658 */ 0x8657,0x3863,
-	/* Array index: 0x0658 */ 0x8658,0x3860,
-	/* Array index: 0x0658 */ 0x865A,0x3861,
-	/* Array index: 0x0658 */ 0x865D,0x3E61,
-	/* Array index: 0x0658 */ 0x866C,0x272D,
-	/* Array index: 0x0658 */ 0x8672,0x6642,
-	/* Array index: 0x0658 */ 0x8675,0x2F23,
-	/* Array index: 0x0658 */ 0x8676,0x2E7C,
-	/* Array index: 0x0658 */ 0x8678,0x2E7E,
-	/* Array index: 0x0658 */ 0x867D,0x2F24,
-	/* Array index: 0x0658 */ 0x8684,0x3369,
-	/* Array index: 0x0658 */ 0x8689,0x336C,
-	/* Array index: 0x0658 */ 0x868F,0x336F,
-	/* Array index: 0x0658 */ 0x8692,0x336E,
-	/* Array index: 0x0658 */ 0x869B,0x336B,
-	/* Array index: 0x0658 */ 0x869F,0x336A,
-	/* Array index: 0x0658 */ 0x86A0,0x3370,
-	/* Array index: 0x0658 */ 0x86A6,0x336D,
-	/* Array index: 0x0658 */ 0x86AE,0x3866,
-	/* Array index: 0x0658 */ 0x86B2,0x3864,
-	/* Array index: 0x0658 */ 0x86D5,0x3E62,
-	/* Array index: 0x0658 */ 0x86E1,0x3E63,
-	/* Array index: 0x0658 */ 0x86EE,0x3E68,
-	/* Array index: 0x0658 */ 0x86FC,0x4444,
-	/* Array index: 0x0658 */ 0x86FD,0x4445,
-	/* Array index: 0x0658 */ 0x86FF,0x4449,
-	/* Array index: 0x0658 */ 0x8715,0x4446,
-	/* Array index: 0x0658 */ 0x8716,0x4448,
-	/* Array index: 0x0658 */ 0x871D,0x494F,
-	/* Array index: 0x0658 */ 0x872B,0x494A,
-	/* Array index: 0x0658 */ 0x8736,0x4945,
-	/* Array index: 0x0658 */ 0x8739,0x494C,
-	/* Array index: 0x0658 */ 0x873D,0x4949,
-	/* Array index: 0x0658 */ 0x8745,0x494E,
-	/* Array index: 0x0658 */ 0x8747,0x494B,
-	/* Array index: 0x0658 */ 0x874A,0x6643,
-	/* Array index: 0x0658 */ 0x8771,0x4E5D,
-	/* Array index: 0x0658 */ 0x877D,0x4E59,
-	/* Array index: 0x0658 */ 0x878A,0x525B,
-	/* Array index: 0x0658 */ 0x878B,0x525D,
-	/* Array index: 0x0658 */ 0x878E,0x525F,
-	/* Array index: 0x0658 */ 0x8799,0x5262,
-	/* Array index: 0x0658 */ 0x87A1,0x525E,
-	/* Array index: 0x0658 */ 0x87A5,0x6645,
-	/* Array index: 0x0658 */ 0x87A9,0x6644,
-	/* Array index: 0x0658 */ 0x87B1,0x563A,
-	/* Array index: 0x0658 */ 0x87C1,0x5639,
-	/* Array index: 0x0658 */ 0x87C7,0x563B,
-	/* Array index: 0x0658 */ 0x87CD,0x5636,
-	/* Array index: 0x0658 */ 0x87CE,0x5634,
-	/* Array index: 0x0658 */ 0x87D5,0x5B28,
-	/* Array index: 0x0658 */ 0x87D6,0x5876,
-	/* Array index: 0x0658 */ 0x87DA,0x5878,
-	/* Array index: 0x0658 */ 0x87E9,0x5873,
-	/* Array index: 0x0658 */ 0x87EE,0x5874,
-	/* Array index: 0x0658 */ 0x87F0,0x5875,
-	/* Array index: 0x0658 */ 0x87F5,0x6646,
-	/* Array index: 0x0658 */ 0x87F8,0x5B2C,
-	/* Array index: 0x0658 */ 0x87FD,0x5B27,
-	/* Array index: 0x0658 */ 0x8807,0x5B29,
-	/* Array index: 0x0658 */ 0x880E,0x5877,
-	/* Array index: 0x0658 */ 0x880F,0x5B2B,
-	/* Array index: 0x0658 */ 0x8812,0x5D25,
-	/* Array index: 0x0658 */ 0x8818,0x5D24,
-	/* Array index: 0x0658 */ 0x881A,0x5E5D,
-	/* Array index: 0x0658 */ 0x8827,0x5F5F,
-	/* Array index: 0x0658 */ 0x882D,0x6045,
-	/* Array index: 0x0658 */ 0x8834,0x6647,
-	/* Array index: 0x0658 */ 0x8842,0x2F26,
-	/* Array index: 0x0658 */ 0x884F,0x3371,
-	/* Array index: 0x0658 */ 0x8850,0x6648,
-	/* Array index: 0x0658 */ 0x8858,0x444D,
-	/* Array index: 0x0658 */ 0x885C,0x4E5F,
-	/* Array index: 0x0658 */ 0x885E,0x5263,
-	/* Array index: 0x0658 */ 0x885F,0x5264,
-	/* Array index: 0x0658 */ 0x8866,0x2F27,
-	/* Array index: 0x0658 */ 0x886E,0x3374,
-	/* Array index: 0x0658 */ 0x8873,0x3377,
-	/* Array index: 0x0658 */ 0x8878,0x3372,
-	/* Array index: 0x0658 */ 0x887A,0x3373,
-	/* Array index: 0x0658 */ 0x887B,0x3375,
-	/* Array index: 0x0658 */ 0x8884,0x3376,
-	/* Array index: 0x0658 */ 0x8887,0x6649,
-	/* Array index: 0x0658 */ 0x888A,0x3872,
-	/* Array index: 0x0658 */ 0x888F,0x386E,
-	/* Array index: 0x0658 */ 0x8890,0x3874,
-	/* Array index: 0x0658 */ 0x8894,0x386C,
-	/* Array index: 0x0658 */ 0x889C,0x386B,
-	/* Array index: 0x0658 */ 0x88A0,0x3873,
-	/* Array index: 0x0658 */ 0x88A3,0x386D,
-	/* Array index: 0x0658 */ 0x88A5,0x386F,
-	/* Array index: 0x0658 */ 0x88A6,0x3871,
-	/* Array index: 0x0658 */ 0x88A9,0x3870,
-	/* Array index: 0x0658 */ 0x88B4,0x3E70,
-	/* Array index: 0x0658 */ 0x88B5,0x3E72,
-	/* Array index: 0x0658 */ 0x88BB,0x3E6D,
-	/* Array index: 0x0658 */ 0x88BF,0x3E6F,
-	/* Array index: 0x0658 */ 0x88CF,0x444E,
-	/* Array index: 0x0658 */ 0x88E0,0x444F,
-	/* Array index: 0x0658 */ 0x88E6,0x4E60,
-	/* Array index: 0x0658 */ 0x88E9,0x4959,
-	/* Array index: 0x0658 */ 0x88EA,0x4952,
-	/* Array index: 0x0658 */ 0x88ED,0x4957,
-	/* Array index: 0x0658 */ 0x88F5,0x4954,
-	/* Array index: 0x0658 */ 0x88FF,0x4951,
-	/* Array index: 0x0658 */ 0x8900,0x4956,
-	/* Array index: 0x0658 */ 0x8903,0x4958,
-	/* Array index: 0x0658 */ 0x890F,0x4E61,
-	/* Array index: 0x0658 */ 0x891B,0x4E62,
-	/* Array index: 0x0658 */ 0x8924,0x5265,
-	/* Array index: 0x0658 */ 0x8939,0x5640,
-	/* Array index: 0x0658 */ 0x893F,0x563F,
-	/* Array index: 0x0658 */ 0x8940,0x563D,
-	/* Array index: 0x0658 */ 0x8943,0x5642,
-	/* Array index: 0x0658 */ 0x8948,0x5879,
-	/* Array index: 0x0658 */ 0x894A,0x587A,
-	/* Array index: 0x0658 */ 0x894D,0x587C,
-	/* Array index: 0x0658 */ 0x894E,0x587B,
-	/* Array index: 0x0658 */ 0x8954,0x664A,
-	/* Array index: 0x0658 */ 0x8965,0x5D29,
-	/* Array index: 0x0658 */ 0x8967,0x5D28,
-	/* Array index: 0x0658 */ 0x8978,0x6149,
-	/* Array index: 0x0658 */ 0x897D,0x617D,
-	/* Array index: 0x0658 */ 0x8984,0x664B,
-	/* Array index: 0x0658 */ 0x8987,0x5B2F,
-	/* Array index: 0x0658 */ 0x8989,0x6046,
-	/* Array index: 0x0658 */ 0x898A,0x614A,
-	/* Array index: 0x0658 */ 0x898C,0x2F29,
-	/* Array index: 0x0658 */ 0x8991,0x3876,
-	/* Array index: 0x0658 */ 0x8992,0x3875,
-	/* Array index: 0x0658 */ 0x8994,0x3877,
-	/* Array index: 0x0658 */ 0x899A,0x3E74,
-	/* Array index: 0x0658 */ 0x89A5,0x4E65,
-	/* Array index: 0x0658 */ 0x89A7,0x5266,
-	/* Array index: 0x0658 */ 0x89A9,0x4E64,
-	/* Array index: 0x0658 */ 0x89AB,0x5646,
-	/* Array index: 0x0658 */ 0x89B0,0x587E,
-	/* Array index: 0x0658 */ 0x89B1,0x587D,
-	/* Array index: 0x0658 */ 0x89B3,0x5921,
-	/* Array index: 0x0658 */ 0x89B5,0x5B31,
-	/* Array index: 0x0658 */ 0x89BB,0x5D2A,
-	/* Array index: 0x0658 */ 0x89BC,0x5E61,
-	/* Array index: 0x0658 */ 0x89E7,0x4454,
-	/* Array index: 0x0658 */ 0x89EA,0x495C,
-	/* Array index: 0x0658 */ 0x89EE,0x4E66,
-	/* Array index: 0x0658 */ 0x89F5,0x5B32,
-	/* Array index: 0x0658 */ 0x8A05,0x2F2A,
-	/* Array index: 0x0658 */ 0x8A06,0x2F2C,
-	/* Array index: 0x0658 */ 0x8A0B,0x337B,
-	/* Array index: 0x0658 */ 0x8A0D,0x337A,
-	/* Array index: 0x0658 */ 0x8A19,0x337C,
-	/* Array index: 0x0658 */ 0x8A1C,0x387E,
-	/* Array index: 0x0658 */ 0x8A20,0x3923,
-	/* Array index: 0x0658 */ 0x8A21,0x3929,
-	/* Array index: 0x0658 */ 0x8A26,0x3879,
-	/* Array index: 0x0658 */ 0x8A28,0x387B,
-	/* Array index: 0x0658 */ 0x8A29,0x3925,
-	/* Array index: 0x0658 */ 0x8A2B,0x3922,
-	/* Array index: 0x0658 */ 0x8A2E,0x6330,
-	/* Array index: 0x0658 */ 0x8A32,0x387A,
-	/* Array index: 0x0658 */ 0x8A35,0x3E7C,
-	/* Array index: 0x0658 */ 0x8A38,0x3E7D,
-	/* Array index: 0x0658 */ 0x8A3D,0x3F24,
-	/* Array index: 0x0658 */ 0x8A42,0x3E7E,
-	/* Array index: 0x0658 */ 0x8A43,0x3E75,
-	/* Array index: 0x0658 */ 0x8A49,0x3F21,
-	/* Array index: 0x0658 */ 0x8A4B,0x3F23,
-	/* Array index: 0x0658 */ 0x8A5A,0x3E78,
-	/* Array index: 0x0658 */ 0x8A5D,0x3F22,
-	/* Array index: 0x0658 */ 0x8A64,0x4460,
-	/* Array index: 0x0658 */ 0x8A65,0x4459,
-	/* Array index: 0x0658 */ 0x8A67,0x4463,
-	/* Array index: 0x0658 */ 0x8A6A,0x4455,
-	/* Array index: 0x0658 */ 0x8A6F,0x4458,
-	/* Array index: 0x0658 */ 0x8A78,0x445B,
-	/* Array index: 0x0658 */ 0x8A7D,0x445C,
-	/* Array index: 0x0658 */ 0x8A7E,0x4461,
-	/* Array index: 0x0658 */ 0x8A80,0x4456,
-	/* Array index: 0x0658 */ 0x8A88,0x445D,
-	/* Array index: 0x0658 */ 0x8A8E,0x495F,
-	/* Array index: 0x0658 */ 0x8A90,0x4964,
-	/* Array index: 0x0658 */ 0x8A94,0x4963,
-	/* Array index: 0x0658 */ 0x8AA2,0x4960,
-	/* Array index: 0x0658 */ 0x8AA9,0x4965,
-	/* Array index: 0x0658 */ 0x8AAC,0x4966,
-	/* Array index: 0x0658 */ 0x8AAF,0x4E74,
-	/* Array index: 0x0658 */ 0x8AC1,0x4E73,
-	/* Array index: 0x0658 */ 0x8ACA,0x4E75,
-	/* Array index: 0x0658 */ 0x8ACC,0x4E69,
-	/* Array index: 0x0658 */ 0x8ACE,0x4E6A,
-	/* Array index: 0x0658 */ 0x8AD0,0x4E76,
-	/* Array index: 0x0658 */ 0x8AE3,0x526A,
-	/* Array index: 0x0658 */ 0x8AE5,0x526B,
-	/* Array index: 0x0658 */ 0x8AE9,0x4E6F,
-	/* Array index: 0x0658 */ 0x8AEA,0x5267,
-	/* Array index: 0x0658 */ 0x8AEC,0x526E,
-	/* Array index: 0x0658 */ 0x8AF9,0x5269,
-	/* Array index: 0x0658 */ 0x8AFD,0x5268,
-	/* Array index: 0x0658 */ 0x8B03,0x664C,
-	/* Array index: 0x0658 */ 0x8B09,0x5649,
-	/* Array index: 0x0658 */ 0x8B0C,0x564A,
-	/* Array index: 0x0658 */ 0x8B1F,0x5648,
-	/* Array index: 0x0658 */ 0x8B29,0x592A,
-	/* Array index: 0x0658 */ 0x8B2D,0x5926,
-	/* Array index: 0x0658 */ 0x8B32,0x5924,
-	/* Array index: 0x0658 */ 0x8B34,0x5928,
-	/* Array index: 0x0658 */ 0x8B38,0x5923,
-	/* Array index: 0x0658 */ 0x8B3F,0x5B34,
-	/* Array index: 0x0658 */ 0x8B43,0x5B35,
-	/* Array index: 0x0658 */ 0x8B4C,0x5B36,
-	/* Array index: 0x0658 */ 0x8B4D,0x5D33,
-	/* Array index: 0x0658 */ 0x8B61,0x5D30,
-	/* Array index: 0x0658 */ 0x8B62,0x5D2C,
-	/* Array index: 0x0658 */ 0x8B64,0x5D32,
-	/* Array index: 0x0658 */ 0x8B69,0x5D2B,
-	/* Array index: 0x0658 */ 0x8B6E,0x5D2E,
-	/* Array index: 0x0658 */ 0x8B71,0x5C6D,
-	/* Array index: 0x0658 */ 0x8B73,0x642D,
-	/* Array index: 0x0658 */ 0x8B75,0x5E62,
-	/* Array index: 0x0658 */ 0x8B7C,0x5E63,
-	/* Array index: 0x0658 */ 0x8B81,0x5F61,
-	/* Array index: 0x0658 */ 0x8B83,0x5F62,
-	/* Array index: 0x0658 */ 0x8B87,0x6048,
-	/* Array index: 0x0658 */ 0x8B8D,0x6047,
-	/* Array index: 0x0658 */ 0x8B90,0x6049,
-	/* Array index: 0x0658 */ 0x8B91,0x607B,
-	/* Array index: 0x0658 */ 0x8B97,0x614B,
-	/* Array index: 0x0658 */ 0x8B9B,0x616B,
-	/* Array index: 0x0658 */ 0x8B9D,0x617E,
-	/* Array index: 0x0658 */ 0x8C3A,0x392A,
-	/* Array index: 0x0658 */ 0x8C40,0x564D,
-	/* Array index: 0x0658 */ 0x8C44,0x5F64,
-	/* Array index: 0x0658 */ 0x8C58,0x392D,
-	/* Array index: 0x0658 */ 0x8C5B,0x392C,
-	/* Array index: 0x0658 */ 0x8C5E,0x3F2A,
-	/* Array index: 0x0658 */ 0x8C60,0x3F29,
-	/* Array index: 0x0658 */ 0x8C63,0x4464,
-	/* Array index: 0x0658 */ 0x8C67,0x496D,
-	/* Array index: 0x0658 */ 0x8C74,0x592B,
-	/* Array index: 0x0658 */ 0x8C7C,0x392E,
-	/* Array index: 0x0658 */ 0x8C7E,0x3F2C,
-	/* Array index: 0x0658 */ 0x8C7F,0x3F2B,
-	/* Array index: 0x0658 */ 0x8C83,0x3F2D,
-	/* Array index: 0x0658 */ 0x8C87,0x634A,
-	/* Array index: 0x0658 */ 0x8C88,0x4465,
-	/* Array index: 0x0658 */ 0x8C8E,0x4E7A,
-	/* Array index: 0x0658 */ 0x8C96,0x564F,
-	/* Array index: 0x0658 */ 0x8C9B,0x614D,
-	/* Array index: 0x0658 */ 0x8C9F,0x2F2E,
-	/* Array index: 0x0658 */ 0x8CA6,0x3930,
-	/* Array index: 0x0658 */ 0x8CAD,0x3932,
-	/* Array index: 0x0658 */ 0x8CAE,0x3931,
-	/* Array index: 0x0658 */ 0x8CB1,0x3F2F,
-	/* Array index: 0x0658 */ 0x8CC9,0x4469,
-	/* Array index: 0x0658 */ 0x8CCD,0x4467,
-	/* Array index: 0x0658 */ 0x8CD0,0x4970,
-	/* Array index: 0x0658 */ 0x8CD4,0x4972,
-	/* Array index: 0x0658 */ 0x8CD6,0x4971,
-	/* Array index: 0x0658 */ 0x8CD8,0x664E,
-	/* Array index: 0x0658 */ 0x8CDB,0x4E7E,
-	/* Array index: 0x0658 */ 0x8CE9,0x4E7D,
-	/* Array index: 0x0658 */ 0x8CEB,0x4F22,
-	/* Array index: 0x0658 */ 0x8CEF,0x5275,
-	/* Array index: 0x0658 */ 0x8CF2,0x5273,
-	/* Array index: 0x0658 */ 0x8CF6,0x5651,
-	/* Array index: 0x0658 */ 0x8CF7,0x5652,
-	/* Array index: 0x0658 */ 0x8D03,0x592E,
-	/* Array index: 0x0658 */ 0x8D0B,0x5B38,
-	/* Array index: 0x0658 */ 0x8D0C,0x664F,
-	/* Array index: 0x0658 */ 0x8D0E,0x6428,
-	/* Array index: 0x0658 */ 0x8D11,0x5E65,
-	/* Array index: 0x0658 */ 0x8D12,0x5E66,
-	/* Array index: 0x0658 */ 0x8D18,0x6650,
-	/* Array index: 0x0658 */ 0x8D1A,0x604A,
-	/* Array index: 0x0658 */ 0x8D1C,0x614E,
-	/* Array index: 0x0658 */ 0x8D65,0x3933,
-	/* Array index: 0x0658 */ 0x8D71,0x243A,
-	/* Array index: 0x0658 */ 0x8D7A,0x3939,
-	/* Array index: 0x0658 */ 0x8D7C,0x3937,
-	/* Array index: 0x0658 */ 0x8D7E,0x3935,
-	/* Array index: 0x0658 */ 0x8D7F,0x3938,
-	/* Array index: 0x0658 */ 0x8D8B,0x3F38,
-	/* Array index: 0x0658 */ 0x8D97,0x4975,
-	/* Array index: 0x0658 */ 0x8D98,0x4973,
-	/* Array index: 0x0658 */ 0x8D9A,0x4974,
-	/* Array index: 0x0658 */ 0x8D9D,0x4F26,
-	/* Array index: 0x0658 */ 0x8DA2,0x4F25,
-	/* Array index: 0x0658 */ 0x8DA4,0x4F23,
-	/* Array index: 0x0658 */ 0x8DA6,0x5277,
-	/* Array index: 0x0658 */ 0x8DA9,0x5931,
-	/* Array index: 0x0658 */ 0x8DB0,0x6651,
-	/* Array index: 0x0658 */ 0x8DBB,0x393E,
-	/* Array index: 0x0658 */ 0x8DBD,0x393A,
-	/* Array index: 0x0658 */ 0x8DC0,0x393D,
-	/* Array index: 0x0658 */ 0x8DC9,0x3F3F,
-	/* Array index: 0x0658 */ 0x8DCA,0x3F3A,
-	/* Array index: 0x0658 */ 0x8DD2,0x3F3B,
-	/* Array index: 0x0658 */ 0x8DD4,0x3F3E,
-	/* Array index: 0x0658 */ 0x8DED,0x446B,
-	/* Array index: 0x0658 */ 0x8E01,0x497B,
-	/* Array index: 0x0658 */ 0x8E08,0x497A,
-	/* Array index: 0x0658 */ 0x8E0B,0x4979,
-	/* Array index: 0x0658 */ 0x8E28,0x4F2C,
-	/* Array index: 0x0658 */ 0x8E2A,0x4F2B,
-	/* Array index: 0x0658 */ 0x8E32,0x527E,
-	/* Array index: 0x0658 */ 0x8E3B,0x527B,
-	/* Array index: 0x0658 */ 0x8E43,0x527C,
-	/* Array index: 0x0658 */ 0x8E46,0x5654,
-	/* Array index: 0x0658 */ 0x8E4F,0x5655,
-	/* Array index: 0x0658 */ 0x8E58,0x5932,
-	/* Array index: 0x0658 */ 0x8E68,0x5B3A,
-	/* Array index: 0x0658 */ 0x8E6B,0x5B39,
-	/* Array index: 0x0658 */ 0x8E70,0x5B3B,
-	/* Array index: 0x0658 */ 0x8E75,0x5B3C,
-	/* Array index: 0x0658 */ 0x8E77,0x5B3D,
-	/* Array index: 0x0658 */ 0x8E83,0x5D37,
-	/* Array index: 0x0658 */ 0x8E99,0x604B,
-	/* Array index: 0x0658 */ 0x8EA2,0x6150,
-	/* Array index: 0x0658 */ 0x8EA7,0x616C,
-	/* Array index: 0x0658 */ 0x8EBC,0x6652,
-	/* Array index: 0x0658 */ 0x8EBF,0x5935,
-	/* Array index: 0x0658 */ 0x8EC1,0x5936,
-	/* Array index: 0x0658 */ 0x8EC3,0x5B3F,
-	/* Array index: 0x0658 */ 0x8EC6,0x5D38,
-	/* Array index: 0x0658 */ 0x8ED5,0x6653,
-	/* Array index: 0x0658 */ 0x8ED6,0x3941,
-	/* Array index: 0x0658 */ 0x8ED9,0x3947,
-	/* Array index: 0x0658 */ 0x8EE4,0x3F45,
-	/* Array index: 0x0658 */ 0x8EEA,0x3F47,
-	/* Array index: 0x0658 */ 0x8EF2,0x3F44,
-	/* Array index: 0x0658 */ 0x8EF3,0x3F46,
-	/* Array index: 0x0658 */ 0x8EFD,0x3F49,
-	/* Array index: 0x0658 */ 0x8F04,0x4476,
-	/* Array index: 0x0658 */ 0x8F19,0x4F36,
-	/* Array index: 0x0658 */ 0x8F22,0x4F33,
-	/* Array index: 0x0658 */ 0x8F27,0x4F35,
-	/* Array index: 0x0658 */ 0x8F2B,0x4F34,
-	/* Array index: 0x0658 */ 0x8F2D,0x5324,
-	/* Array index: 0x0658 */ 0x8F30,0x5322,
-	/* Array index: 0x0658 */ 0x8F31,0x5321,
-	/* Array index: 0x0658 */ 0x8F3C,0x5325,
-	/* Array index: 0x0658 */ 0x8F3D,0x5659,
-	/* Array index: 0x0658 */ 0x8F41,0x565A,
-	/* Array index: 0x0658 */ 0x8F4A,0x5937,
-	/* Array index: 0x0658 */ 0x8F5C,0x5E67,
-	/* Array index: 0x0658 */ 0x8F65,0x6222,
-	/* Array index: 0x0658 */ 0x8FAA,0x6654,
-	/* Array index: 0x0658 */ 0x8FAC,0x5938,
-	/* Array index: 0x0658 */ 0x8FB3,0x4F39,
-	/* Array index: 0x0658 */ 0x8FB5,0x272F,
-	/* Array index: 0x0658 */ 0x8FB9,0x243B,
-	/* Array index: 0x0658 */ 0x8FBE,0x2730,
-	/* Array index: 0x0658 */ 0x8FC1,0x2733,
-	/* Array index: 0x0658 */ 0x8FC7,0x2731,
-	/* Array index: 0x0658 */ 0x8FCA,0x2A72,
-	/* Array index: 0x0658 */ 0x8FCC,0x2A70,
-	/* Array index: 0x0658 */ 0x8FCF,0x2A74,
-	/* Array index: 0x0658 */ 0x8FD8,0x2A73,
-	/* Array index: 0x0658 */ 0x8FD9,0x2A71,
-	/* Array index: 0x0658 */ 0x8FE7,0x2F31,
-	/* Array index: 0x0658 */ 0x8FE9,0x2F32,
-	/* Array index: 0x0658 */ 0x8FEF,0x2F33,
-	/* Array index: 0x0658 */ 0x8FF1,0x2F30,
-	/* Array index: 0x0658 */ 0x8FF9,0x3425,
-	/* Array index: 0x0658 */ 0x9008,0x3427,
-	/* Array index: 0x0658 */ 0x9009,0x3426,
-	/* Array index: 0x0658 */ 0x900E,0x394B,
-	/* Array index: 0x0658 */ 0x9012,0x394A,
-	/* Array index: 0x0658 */ 0x9013,0x394E,
-	/* Array index: 0x0658 */ 0x9025,0x394C,
-	/* Array index: 0x0658 */ 0x9030,0x3F55,
-	/* Array index: 0x0658 */ 0x9037,0x3F56,
-	/* Array index: 0x0658 */ 0x903A,0x3F54,
-	/* Array index: 0x0658 */ 0x903B,0x3F57,
-	/* Array index: 0x0658 */ 0x9040,0x447D,
-	/* Array index: 0x0658 */ 0x9043,0x4479,
-	/* Array index: 0x0658 */ 0x9045,0x447C,
-	/* Array index: 0x0658 */ 0x9046,0x447A,
-	/* Array index: 0x0658 */ 0x9048,0x447B,
-	/* Array index: 0x0658 */ 0x904C,0x447E,
-	/* Array index: 0x0658 */ 0x905A,0x4A24,
-	/* Array index: 0x0658 */ 0x905F,0x4A27,
-	/* Array index: 0x0658 */ 0x9061,0x4A26,
-	/* Array index: 0x0658 */ 0x906A,0x4F3C,
-	/* Array index: 0x0658 */ 0x9071,0x4F3B,
-	/* Array index: 0x0658 */ 0x9089,0x593A,
-	/* Array index: 0x0658 */ 0x9092,0x225E,
-	/* Array index: 0x0658 */ 0x9093,0x225D,
-	/* Array index: 0x0658 */ 0x9096,0x243C,
-	/* Array index: 0x0658 */ 0x909A,0x243D,
-	/* Array index: 0x0658 */ 0x909C,0x6655,
-	/* Array index: 0x0658 */ 0x90A4,0x2735,
-	/* Array index: 0x0658 */ 0x90A8,0x2739,
-	/* Array index: 0x0658 */ 0x90A9,0x2734,
-	/* Array index: 0x0658 */ 0x90AB,0x3951,
-	/* Array index: 0x0658 */ 0x90AD,0x2A77,
-	/* Array index: 0x0658 */ 0x90B7,0x2A75,
-	/* Array index: 0x0658 */ 0x90B9,0x2A78,
-	/* Array index: 0x0658 */ 0x90BC,0x2F35,
-	/* Array index: 0x0658 */ 0x90C0,0x2F38,
-	/* Array index: 0x0658 */ 0x90C2,0x2F34,
-	/* Array index: 0x0658 */ 0x90C4,0x2F3E,
-	/* Array index: 0x0658 */ 0x90C6,0x2F37,
-	/* Array index: 0x0658 */ 0x90C9,0x2F3C,
-	/* Array index: 0x0658 */ 0x90CD,0x2F3B,
-	/* Array index: 0x0658 */ 0x90DE,0x3429,
-	/* Array index: 0x0658 */ 0x90EE,0x394F,
-	/* Array index: 0x0658 */ 0x90F6,0x636C,
-	/* Array index: 0x0658 */ 0x90F7,0x3952,
-	/* Array index: 0x0658 */ 0x910A,0x3F59,
-	/* Array index: 0x0658 */ 0x910C,0x4523,
-	/* Array index: 0x0658 */ 0x9113,0x4524,
-	/* Array index: 0x0658 */ 0x9115,0x4525,
-	/* Array index: 0x0658 */ 0x9125,0x4A2A,
-	/* Array index: 0x0658 */ 0x9137,0x532B,
-	/* Array index: 0x0658 */ 0x913C,0x593C,
-	/* Array index: 0x0658 */ 0x913D,0x593B,
-	/* Array index: 0x0658 */ 0x9151,0x342A,
-	/* Array index: 0x0658 */ 0x9154,0x3955,
-	/* Array index: 0x0658 */ 0x9159,0x3954,
-	/* Array index: 0x0658 */ 0x915C,0x6657,
-	/* Array index: 0x0658 */ 0x9167,0x4528,
-	/* Array index: 0x0658 */ 0x916B,0x4527,
-	/* Array index: 0x0658 */ 0x9176,0x4A2C,
-	/* Array index: 0x0658 */ 0x917B,0x4A2B,
-	/* Array index: 0x0658 */ 0x917C,0x4A2D,
-	/* Array index: 0x0658 */ 0x9188,0x4F3F,
-	/* Array index: 0x0658 */ 0x918C,0x4F40,
-	/* Array index: 0x0658 */ 0x918E,0x532D,
-	/* Array index: 0x0658 */ 0x9195,0x532C,
-	/* Array index: 0x0658 */ 0x9196,0x532F,
-	/* Array index: 0x0658 */ 0x91A9,0x593D,
-	/* Array index: 0x0658 */ 0x91BB,0x5E68,
-	/* Array index: 0x0658 */ 0x91BF,0x607E,
-	/* Array index: 0x0658 */ 0x91C4,0x616D,
-	/* Array index: 0x0658 */ 0x91D6,0x3430,
-	/* Array index: 0x0658 */ 0x91DB,0x342D,
-	/* Array index: 0x0658 */ 0x91E5,0x3958,
-	/* Array index: 0x0658 */ 0x91F0,0x3957,
-	/* Array index: 0x0658 */ 0x91F2,0x3956,
-	/* Array index: 0x0658 */ 0x91F6,0x3959,
-	/* Array index: 0x0658 */ 0x91FE,0x3F5D,
-	/* Array index: 0x0658 */ 0x9208,0x3F66,
-	/* Array index: 0x0658 */ 0x920B,0x3F60,
-	/* Array index: 0x0658 */ 0x920E,0x3F68,
-	/* Array index: 0x0658 */ 0x9213,0x3F69,
-	/* Array index: 0x0658 */ 0x9218,0x3F62,
-	/* Array index: 0x0658 */ 0x921B,0x3F65,
-	/* Array index: 0x0658 */ 0x922B,0x6658,
-	/* Array index: 0x0658 */ 0x922F,0x452E,
-	/* Array index: 0x0658 */ 0x9235,0x452B,
-	/* Array index: 0x0658 */ 0x923B,0x4537,
-	/* Array index: 0x0658 */ 0x923C,0x452F,
-	/* Array index: 0x0658 */ 0x9241,0x4539,
-	/* Array index: 0x0658 */ 0x9244,0x4538,
-	/* Array index: 0x0658 */ 0x9255,0x452A,
-	/* Array index: 0x0658 */ 0x9259,0x452D,
-	/* Array index: 0x0658 */ 0x925C,0x4531,
-	/* Array index: 0x0658 */ 0x925D,0x4529,
-	/* Array index: 0x0658 */ 0x925F,0x4534,
-	/* Array index: 0x0658 */ 0x9262,0x4533,
-	/* Array index: 0x0658 */ 0x926A,0x4532,
-	/* Array index: 0x0658 */ 0x926B,0x4535,
-	/* Array index: 0x0658 */ 0x926E,0x4536,
-	/* Array index: 0x0658 */ 0x9273,0x665A,
-	/* Array index: 0x0658 */ 0x9281,0x4A34,
-	/* Array index: 0x0658 */ 0x9284,0x4A35,
-	/* Array index: 0x0658 */ 0x9289,0x4A2F,
-	/* Array index: 0x0658 */ 0x928F,0x4530,
-	/* Array index: 0x0658 */ 0x9290,0x4A38,
-	/* Array index: 0x0658 */ 0x9292,0x4A33,
-	/* Array index: 0x0658 */ 0x929E,0x4A39,
-	/* Array index: 0x0658 */ 0x92B8,0x4F42,
-	/* Array index: 0x0658 */ 0x92B9,0x4F50,
-	/* Array index: 0x0658 */ 0x92BE,0x4F43,
-	/* Array index: 0x0658 */ 0x92BF,0x4F41,
-	/* Array index: 0x0658 */ 0x92D4,0x4F48,
-	/* Array index: 0x0658 */ 0x92D6,0x4F49,
-	/* Array index: 0x0658 */ 0x92E2,0x4F51,
-	/* Array index: 0x0658 */ 0x92E5,0x4F45,
-	/* Array index: 0x0658 */ 0x92EB,0x4F52,
-	/* Array index: 0x0658 */ 0x92ED,0x4F4C,
-	/* Array index: 0x0658 */ 0x92FD,0x5335,
-	/* Array index: 0x0658 */ 0x9303,0x533D,
-	/* Array index: 0x0658 */ 0x9305,0x533E,
-	/* Array index: 0x0658 */ 0x9307,0x5338,
-	/* Array index: 0x0658 */ 0x930A,0x5332,
-	/* Array index: 0x0658 */ 0x9317,0x5336,
-	/* Array index: 0x0658 */ 0x931C,0x5337,
-	/* Array index: 0x0658 */ 0x932C,0x533B,
-	/* Array index: 0x0658 */ 0x933F,0x665D,
-	/* Array index: 0x0658 */ 0x9342,0x665E,
-	/* Array index: 0x0658 */ 0x9345,0x5331,
-	/* Array index: 0x0658 */ 0x9348,0x5665,
-	/* Array index: 0x0658 */ 0x9353,0x5666,
-	/* Array index: 0x0658 */ 0x935D,0x565D,
-	/* Array index: 0x0658 */ 0x935F,0x5667,
-	/* Array index: 0x0658 */ 0x9362,0x5664,
-	/* Array index: 0x0658 */ 0x9366,0x565B,
-	/* Array index: 0x0658 */ 0x9368,0x5668,
-	/* Array index: 0x0658 */ 0x9369,0x565E,
-	/* Array index: 0x0658 */ 0x936B,0x566B,
-	/* Array index: 0x0658 */ 0x936E,0x5661,
-	/* Array index: 0x0658 */ 0x9378,0x565C,
-	/* Array index: 0x0658 */ 0x937D,0x5660,
-	/* Array index: 0x0658 */ 0x937F,0x566A,
-	/* Array index: 0x0658 */ 0x9386,0x665F,
-	/* Array index: 0x0658 */ 0x938B,0x5943,
-	/* Array index: 0x0658 */ 0x9390,0x5940,
-	/* Array index: 0x0658 */ 0x9393,0x5942,
-	/* Array index: 0x0658 */ 0x939C,0x5949,
-	/* Array index: 0x0658 */ 0x93A0,0x593E,
-	/* Array index: 0x0658 */ 0x93AD,0x5944,
-	/* Array index: 0x0658 */ 0x93B8,0x5946,
-	/* Array index: 0x0658 */ 0x93C1,0x5B50,
-	/* Array index: 0x0658 */ 0x93C5,0x5B44,
-	/* Array index: 0x0658 */ 0x93C6,0x5B45,
-	/* Array index: 0x0658 */ 0x93CB,0x5B43,
-	/* Array index: 0x0658 */ 0x93D3,0x5B48,
-	/* Array index: 0x0658 */ 0x93DB,0x5B4D,
-	/* Array index: 0x0658 */ 0x93E0,0x5B4F,
-	/* Array index: 0x0658 */ 0x93E5,0x5B4A,
-	/* Array index: 0x0658 */ 0x9402,0x5D43,
-	/* Array index: 0x0658 */ 0x9404,0x5D3C,
-	/* Array index: 0x0658 */ 0x9405,0x5D3F,
-	/* Array index: 0x0658 */ 0x9408,0x5D3E,
-	/* Array index: 0x0658 */ 0x9417,0x5D3D,
-	/* Array index: 0x0658 */ 0x9427,0x5D46,
-	/* Array index: 0x0658 */ 0x942D,0x5E6D,
-	/* Array index: 0x0658 */ 0x9442,0x5F69,
-	/* Array index: 0x0658 */ 0x9443,0x5F6E,
-	/* Array index: 0x0658 */ 0x944D,0x5F6A,
-	/* Array index: 0x0658 */ 0x944E,0x5F6C,
-	/* Array index: 0x0658 */ 0x9454,0x5F6B,
-	/* Array index: 0x0658 */ 0x9456,0x6052,
-	/* Array index: 0x0658 */ 0x945F,0x604F,
-	/* Array index: 0x0658 */ 0x9461,0x6053,
-	/* Array index: 0x0658 */ 0x946C,0x6122,
-	/* Array index: 0x0658 */ 0x947A,0x616F,
-	/* Array index: 0x0658 */ 0x947B,0x6223,
-	/* Array index: 0x0658 */ 0x9484,0x6236,
-	/* Array index: 0x0658 */ 0x9579,0x6323,
-	/* Array index: 0x0658 */ 0x9581,0x2F40,
-	/* Array index: 0x0658 */ 0x9585,0x3432,
-	/* Array index: 0x0658 */ 0x9587,0x395C,
-	/* Array index: 0x0658 */ 0x9595,0x3F6C,
-	/* Array index: 0x0658 */ 0x9597,0x666B,
-	/* Array index: 0x0658 */ 0x9599,0x453C,
-	/* Array index: 0x0658 */ 0x959A,0x453A,
-	/* Array index: 0x0658 */ 0x95A2,0x4A3D,
-	/* Array index: 0x0658 */ 0x95A7,0x4A3E,
-	/* Array index: 0x0658 */ 0x95AF,0x4F53,
-	/* Array index: 0x0658 */ 0x95B2,0x4F55,
-	/* Array index: 0x0658 */ 0x95B3,0x4F56,
-	/* Array index: 0x0658 */ 0x95B8,0x5342,
-	/* Array index: 0x0658 */ 0x95C1,0x5344,
-	/* Array index: 0x0658 */ 0x95C2,0x5340,
-	/* Array index: 0x0658 */ 0x95C4,0x566D,
-	/* Array index: 0x0658 */ 0x95CE,0x666C,
-	/* Array index: 0x0658 */ 0x95D7,0x594B,
-	/* Array index: 0x0658 */ 0x95D8,0x594A,
-	/* Array index: 0x0658 */ 0x95DD,0x5B53,
-	/* Array index: 0x0658 */ 0x95E7,0x666D,
-	/* Array index: 0x0658 */ 0x961D,0x2143,
-	/* Array index: 0x0658 */ 0x9626,0x273B,
-	/* Array index: 0x0658 */ 0x9627,0x273A,
-	/* Array index: 0x0658 */ 0x9629,0x273F,
-	/* Array index: 0x0658 */ 0x962B,0x273C,
-	/* Array index: 0x0658 */ 0x9633,0x273D,
-	/* Array index: 0x0658 */ 0x9634,0x273E,
-	/* Array index: 0x0658 */ 0x9637,0x2A79,
-	/* Array index: 0x0658 */ 0x963E,0x2A7C,
-	/* Array index: 0x0658 */ 0x9641,0x2A7B,
-	/* Array index: 0x0658 */ 0x9656,0x3436,
-	/* Array index: 0x0658 */ 0x9659,0x3434,
-	/* Array index: 0x0658 */ 0x965A,0x395E,
-	/* Array index: 0x0658 */ 0x9660,0x3433,
-	/* Array index: 0x0658 */ 0x966E,0x3961,
-	/* Array index: 0x0658 */ 0x9679,0x3965,
-	/* Array index: 0x0658 */ 0x967B,0x3F71,
-	/* Array index: 0x0658 */ 0x967F,0x3F72,
-	/* Array index: 0x0658 */ 0x9681,0x3F73,
-	/* Array index: 0x0658 */ 0x9682,0x3F75,
-	/* Array index: 0x0658 */ 0x968C,0x3F70,
-	/* Array index: 0x0658 */ 0x968F,0x4540,
-	/* Array index: 0x0658 */ 0x9696,0x4542,
-	/* Array index: 0x0658 */ 0x969D,0x4A45,
-	/* Array index: 0x0658 */ 0x969F,0x4A46,
-	/* Array index: 0x0658 */ 0x96A0,0x4A44,
-	/* Array index: 0x0658 */ 0x96A3,0x4F5A,
-	/* Array index: 0x0658 */ 0x96A5,0x4F5B,
-	/* Array index: 0x0658 */ 0x96AB,0x5348,
-	/* Array index: 0x0658 */ 0x96AD,0x5670,
-	/* Array index: 0x0658 */ 0x96AF,0x566F,
-	/* Array index: 0x0658 */ 0x96B2,0x5671,
-	/* Array index: 0x0658 */ 0x96BA,0x6325,
-	/* Array index: 0x0658 */ 0x96BD,0x3439,
-	/* Array index: 0x0658 */ 0x96D0,0x4A47,
-	/* Array index: 0x0658 */ 0x96D1,0x4A49,
-	/* Array index: 0x0658 */ 0x96E4,0x5E70,
-	/* Array index: 0x0658 */ 0x96E6,0x6125,
-	/* Array index: 0x0658 */ 0x96E7,0x622F,
-	/* Array index: 0x0658 */ 0x96F4,0x4546,
-	/* Array index: 0x0658 */ 0x96FC,0x4547,
-	/* Array index: 0x0658 */ 0x970A,0x4F60,
-	/* Array index: 0x0658 */ 0x970C,0x5350,
-	/* Array index: 0x0658 */ 0x9714,0x534D,
-	/* Array index: 0x0658 */ 0x9715,0x534C,
-	/* Array index: 0x0658 */ 0x9717,0x5351,
-	/* Array index: 0x0658 */ 0x971A,0x5674,
-	/* Array index: 0x0658 */ 0x971B,0x5675,
-	/* Array index: 0x0658 */ 0x9731,0x5D4F,
-	/* Array index: 0x0658 */ 0x973B,0x666E,
-	/* Array index: 0x0658 */ 0x973C,0x5F71,
-	/* Array index: 0x0658 */ 0x9740,0x5F72,
-	/* Array index: 0x0658 */ 0x9741,0x6059,
-	/* Array index: 0x0658 */ 0x9745,0x6126,
-	/* Array index: 0x0658 */ 0x974D,0x666F,
-	/* Array index: 0x0658 */ 0x9750,0x6245,
-	/* Array index: 0x0658 */ 0x9751,0x2A7E,
-	/* Array index: 0x0658 */ 0x9755,0x4549,
-	/* Array index: 0x0658 */ 0x9759,0x4A4C,
-	/* Array index: 0x0658 */ 0x975D,0x594F,
-	/* Array index: 0x0658 */ 0x975F,0x4021,
-	/* Array index: 0x0658 */ 0x9763,0x2B21,
-	/* Array index: 0x0658 */ 0x9764,0x4A4E,
-	/* Array index: 0x0658 */ 0x9767,0x5E73,
-	/* Array index: 0x0658 */ 0x976D,0x4024,
-	/* Array index: 0x0658 */ 0x976F,0x4022,
-	/* Array index: 0x0658 */ 0x9779,0x454B,
-	/* Array index: 0x0658 */ 0x9787,0x4F62,
-	/* Array index: 0x0658 */ 0x9789,0x4F63,
-	/* Array index: 0x0658 */ 0x978C,0x4F64,
-	/* Array index: 0x0658 */ 0x9793,0x5353,
-	/* Array index: 0x0658 */ 0x979B,0x567A,
-	/* Array index: 0x0658 */ 0x979F,0x567B,
-	/* Array index: 0x0658 */ 0x97A9,0x5950,
-	/* Array index: 0x0658 */ 0x97B8,0x5D50,
-	/* Array index: 0x0658 */ 0x97BA,0x5D51,
-	/* Array index: 0x0658 */ 0x97BD,0x5E75,
-	/* Array index: 0x0658 */ 0x97BE,0x5E74,
-	/* Array index: 0x0658 */ 0x97C0,0x5F73,
-	/* Array index: 0x0658 */ 0x97C8,0x6128,
-	/* Array index: 0x0658 */ 0x97CA,0x623B,
-	/* Array index: 0x0658 */ 0x97D2,0x5355,
-	/* Array index: 0x0658 */ 0x97DA,0x5951,
-	/* Array index: 0x0658 */ 0x97E2,0x5E76,
-	/* Array index: 0x0658 */ 0x97E4,0x6129,
-	/* Array index: 0x0658 */ 0x97EE,0x454F,
-	/* Array index: 0x0658 */ 0x97EF,0x4F65,
-	/* Array index: 0x0658 */ 0x97F2,0x5B61,
-	/* Array index: 0x0658 */ 0x97F5,0x4550,
-	/* Array index: 0x0658 */ 0x97FC,0x5D53,
-	/* Array index: 0x0658 */ 0x980B,0x4552,
-	/* Array index: 0x0658 */ 0x9814,0x4A54,
-	/* Array index: 0x0658 */ 0x9815,0x4A55,
-	/* Array index: 0x0658 */ 0x9819,0x4A52,
-	/* Array index: 0x0658 */ 0x981A,0x4A56,
-	/* Array index: 0x0658 */ 0x981F,0x4F69,
-	/* Array index: 0x0658 */ 0x9822,0x4F67,
-	/* Array index: 0x0658 */ 0x9823,0x636E,
-	/* Array index: 0x0658 */ 0x982A,0x4F66,
-	/* Array index: 0x0658 */ 0x982E,0x535C,
-	/* Array index: 0x0658 */ 0x9831,0x5359,
-	/* Array index: 0x0658 */ 0x9833,0x535A,
-	/* Array index: 0x0658 */ 0x9834,0x5228,
-	/* Array index: 0x0658 */ 0x9836,0x5358,
-	/* Array index: 0x0658 */ 0x983A,0x535D,
-	/* Array index: 0x0658 */ 0x9847,0x5728,
-	/* Array index: 0x0658 */ 0x984B,0x5959,
-	/* Array index: 0x0658 */ 0x9861,0x642A,
-	/* Array index: 0x0658 */ 0x9866,0x5E78,
-	/* Array index: 0x0658 */ 0x9868,0x5E77,
-	/* Array index: 0x0658 */ 0x98B5,0x5361,
-	/* Array index: 0x0658 */ 0x98B7,0x572A,
-	/* Array index: 0x0658 */ 0x98B9,0x595C,
-	/* Array index: 0x0658 */ 0x98C3,0x5D56,
-	/* Array index: 0x0658 */ 0x98C7,0x5E7B,
-	/* Array index: 0x0658 */ 0x98C8,0x5E79,
-	/* Array index: 0x0658 */ 0x98CA,0x5E7A,
-	/* Array index: 0x0658 */ 0x98CD,0x6225,
-	/* Array index: 0x0658 */ 0x98DC,0x5E7C,
-	/* Array index: 0x0658 */ 0x98DD,0x6226,
-	/* Array index: 0x0658 */ 0x98E1,0x3967,
-	/* Array index: 0x0658 */ 0x98E4,0x6670,
-	/* Array index: 0x0658 */ 0x98E6,0x3968,
-	/* Array index: 0x0658 */ 0x98EC,0x455B,
-	/* Array index: 0x0658 */ 0x98F0,0x402B,
-	/* Array index: 0x0658 */ 0x98F1,0x455C,
-	/* Array index: 0x0658 */ 0x98F3,0x4554,
-	/* Array index: 0x0658 */ 0x98F5,0x4559,
-	/* Array index: 0x0658 */ 0x98F7,0x4557,
-	/* Array index: 0x0658 */ 0x98F8,0x4A5D,
-	/* Array index: 0x0658 */ 0x98FF,0x4558,
-	/* Array index: 0x0658 */ 0x9901,0x4A5E,
-	/* Array index: 0x0658 */ 0x9906,0x4A5B,
-	/* Array index: 0x0658 */ 0x990E,0x667A,
-	/* Array index: 0x0658 */ 0x9919,0x4F6B,
-	/* Array index: 0x0658 */ 0x991C,0x5365,
-	/* Array index: 0x0658 */ 0x991D,0x5366,
-	/* Array index: 0x0658 */ 0x9920,0x5364,
-	/* Array index: 0x0658 */ 0x9922,0x5362,
-	/* Array index: 0x0658 */ 0x9923,0x5363,
-	/* Array index: 0x0658 */ 0x9936,0x5962,
-	/* Array index: 0x0658 */ 0x9938,0x5961,
-	/* Array index: 0x0658 */ 0x9939,0x5966,
-	/* Array index: 0x0658 */ 0x993B,0x5965,
-	/* Array index: 0x0658 */ 0x9940,0x5963,
-	/* Array index: 0x0658 */ 0x9942,0x6671,
-	/* Array index: 0x0658 */ 0x9944,0x5B69,
-	/* Array index: 0x0658 */ 0x994D,0x5D58,
-	/* Array index: 0x0658 */ 0x994F,0x5E7E,
-	/* Array index: 0x0658 */ 0x995A,0x5F78,
-	/* Array index: 0x0658 */ 0x995D,0x612A,
-	/* Array index: 0x0658 */ 0x999A,0x455F,
-	/* Array index: 0x0658 */ 0x99A0,0x5368,
-	/* Array index: 0x0658 */ 0x99A2,0x5730,
-	/* Array index: 0x0658 */ 0x99A4,0x5967,
-	/* Array index: 0x0658 */ 0x99A9,0x5F21,
-	/* Array index: 0x0658 */ 0x99AA,0x6060,
-	/* Array index: 0x0658 */ 0x99C4,0x4A6A,
-	/* Array index: 0x0658 */ 0x99C8,0x4F73,
-	/* Array index: 0x0658 */ 0x99CA,0x4F6D,
-	/* Array index: 0x0658 */ 0x99DA,0x4F6E,
-	/* Array index: 0x0658 */ 0x99DE,0x4F72,
-	/* Array index: 0x0658 */ 0x99E0,0x4F74,
-	/* Array index: 0x0658 */ 0x99E1,0x5370,
-	/* Array index: 0x0658 */ 0x99E6,0x5371,
-	/* Array index: 0x0658 */ 0x99E8,0x536B,
-	/* Array index: 0x0658 */ 0x99EB,0x536C,
-	/* Array index: 0x0658 */ 0x99EF,0x536A,
-	/* Array index: 0x0658 */ 0x99F3,0x5734,
-	/* Array index: 0x0658 */ 0x99F5,0x5737,
-	/* Array index: 0x0658 */ 0x9A00,0x5733,
-	/* Array index: 0x0658 */ 0x9A08,0x596A,
-	/* Array index: 0x0658 */ 0x9A0C,0x596B,
-	/* Array index: 0x0658 */ 0x9A10,0x596D,
-	/* Array index: 0x0658 */ 0x9A17,0x5B6F,
-	/* Array index: 0x0658 */ 0x9A18,0x5B6D,
-	/* Array index: 0x0658 */ 0x9A1F,0x5B6C,
-	/* Array index: 0x0658 */ 0x9A21,0x5B6E,
-	/* Array index: 0x0658 */ 0x9A26,0x5B6B,
-	/* Array index: 0x0658 */ 0x9A2F,0x5D5A,
-	/* Array index: 0x0658 */ 0x9A3B,0x5F24,
-	/* Array index: 0x0658 */ 0x9A3C,0x5F22,
-	/* Array index: 0x0658 */ 0x9A51,0x5F79,
-	/* Array index: 0x0658 */ 0x9A58,0x6062,
-	/* Array index: 0x0658 */ 0x9A5C,0x6061,
-	/* Array index: 0x0658 */ 0x9A61,0x6172,
-	/* Array index: 0x0658 */ 0x9A63,0x6173,
-	/* Array index: 0x0658 */ 0x9AA9,0x402F,
-	/* Array index: 0x0658 */ 0x9AB5,0x4F77,
-	/* Array index: 0x0658 */ 0x9AB6,0x4F76,
-	/* Array index: 0x0658 */ 0x9ABD,0x573A,
-	/* Array index: 0x0658 */ 0x9AC4,0x5D61,
-	/* Array index: 0x0658 */ 0x9AC8,0x5D60,
-	/* Array index: 0x0658 */ 0x9AC9,0x5D5E,
-	/* Array index: 0x0658 */ 0x9ACE,0x5F25,
-	/* Array index: 0x0658 */ 0x9AD7,0x6174,
-	/* Array index: 0x0658 */ 0x9AD9,0x6334,
-	/* Array index: 0x0658 */ 0x9ADA,0x4A6E,
-	/* Array index: 0x0658 */ 0x9ADD,0x5F7B,
-	/* Array index: 0x0658 */ 0x9ADE,0x6063,
-	/* Array index: 0x0658 */ 0x9AE0,0x4032,
-	/* Array index: 0x0658 */ 0x9AE2,0x4561,
-	/* Array index: 0x0658 */ 0x9AF4,0x4F79,
-	/* Array index: 0x0658 */ 0x9AF5,0x5375,
-	/* Array index: 0x0658 */ 0x9AF8,0x5374,
-	/* Array index: 0x0658 */ 0x9B00,0x573B,
-	/* Array index: 0x0658 */ 0x9B02,0x573C,
-	/* Array index: 0x0658 */ 0x9B07,0x596F,
-	/* Array index: 0x0658 */ 0x9B09,0x5B71,
-	/* Array index: 0x0658 */ 0x9B14,0x5F27,
-	/* Array index: 0x0658 */ 0x9B1D,0x6672,
-	/* Array index: 0x0658 */ 0x9B21,0x612C,
-	/* Array index: 0x0658 */ 0x9B26,0x4A75,
-	/* Array index: 0x0658 */ 0x9B2A,0x5D62,
-	/* Array index: 0x0658 */ 0x9B2C,0x612E,
-	/* Array index: 0x0658 */ 0x9B2D,0x6433,
-	/* Array index: 0x0658 */ 0x9B30,0x6228,
-	/* Array index: 0x0658 */ 0x9B34,0x573E,
-	/* Array index: 0x0658 */ 0x9B38,0x5D63,
-	/* Array index: 0x0658 */ 0x9B3D,0x4562,
-	/* Array index: 0x0658 */ 0x9B40,0x4A78,
-	/* Array index: 0x0658 */ 0x9B49,0x573F,
-	/* Array index: 0x0658 */ 0x9B50,0x5D64,
-	/* Array index: 0x0658 */ 0x9B53,0x5F28,
-	/* Array index: 0x0658 */ 0x9B57,0x612F,
-	/* Array index: 0x0658 */ 0x9B5D,0x4563,
-	/* Array index: 0x0658 */ 0x9B63,0x4F7E,
-	/* Array index: 0x0658 */ 0x9B69,0x4F7C,
-	/* Array index: 0x0658 */ 0x9B6B,0x4F7B,
-	/* Array index: 0x0658 */ 0x9B72,0x4F7D,
-	/* Array index: 0x0658 */ 0x9B83,0x5378,
-	/* Array index: 0x0658 */ 0x9B84,0x537A,
-	/* Array index: 0x0658 */ 0x9B89,0x5423,
-	/* Array index: 0x0658 */ 0x9B94,0x5379,
-	/* Array index: 0x0658 */ 0x9B98,0x6673,
-	/* Array index: 0x0658 */ 0x9B99,0x5744,
-	/* Array index: 0x0658 */ 0x9B9D,0x5745,
-	/* Array index: 0x0658 */ 0x9B9F,0x5740,
-	/* Array index: 0x0658 */ 0x9BA3,0x5742,
-	/* Array index: 0x0658 */ 0x9BBB,0x5974,
-	/* Array index: 0x0658 */ 0x9BC2,0x5973,
-	/* Array index: 0x0658 */ 0x9BC5,0x5B74,
-	/* Array index: 0x0658 */ 0x9BD2,0x5971,
-	/* Array index: 0x0658 */ 0x9BDF,0x5B75,
-	/* Array index: 0x0658 */ 0x9BE3,0x5B77,
-	/* Array index: 0x0658 */ 0x9BE9,0x5B79,
-	/* Array index: 0x0658 */ 0x9BEE,0x5B7A,
-	/* Array index: 0x0658 */ 0x9BF6,0x5D6F,
-	/* Array index: 0x0658 */ 0x9BF9,0x5D71,
-	/* Array index: 0x0658 */ 0x9C0A,0x5D66,
-	/* Array index: 0x0658 */ 0x9C0C,0x5D76,
-	/* Array index: 0x0658 */ 0x9C10,0x5D73,
-	/* Array index: 0x0658 */ 0x9C15,0x5D72,
-	/* Array index: 0x0658 */ 0x9C1B,0x5D70,
-	/* Array index: 0x0658 */ 0x9C1F,0x5F2C,
-	/* Array index: 0x0658 */ 0x9C27,0x642F,
-	/* Array index: 0x0658 */ 0x9C2E,0x5F2A,
-	/* Array index: 0x0658 */ 0x9C35,0x6025,
-	/* Array index: 0x0658 */ 0x9C38,0x5F7E,
-	/* Array index: 0x0658 */ 0x9C3A,0x6023,
-	/* Array index: 0x0658 */ 0x9C45,0x6022,
-	/* Array index: 0x0658 */ 0x9C4F,0x6065,
-	/* Array index: 0x0658 */ 0x9C51,0x6066,
-	/* Array index: 0x0658 */ 0x9C53,0x6068,
-	/* Array index: 0x0658 */ 0x9C5D,0x6132,
-	/* Array index: 0x0658 */ 0x9C61,0x6133,
-	/* Array index: 0x0658 */ 0x9C65,0x6134,
-	/* Array index: 0x0658 */ 0x9C6C,0x6159,
-	/* Array index: 0x0658 */ 0x9C6F,0x615B,
-	/* Array index: 0x0658 */ 0x9C76,0x6175,
-	/* Array index: 0x0658 */ 0x9C7B,0x6241,
-	/* Array index: 0x0658 */ 0x9CE8,0x4564,
-	/* Array index: 0x0658 */ 0x9CF8,0x5027,
-	/* Array index: 0x0658 */ 0x9CFE,0x502A,
-	/* Array index: 0x0658 */ 0x9D01,0x5024,
-	/* Array index: 0x0658 */ 0x9D02,0x502B,
-	/* Array index: 0x0658 */ 0x9D0A,0x542D,
-	/* Array index: 0x0658 */ 0x9D0C,0x5025,
-	/* Array index: 0x0658 */ 0x9D0D,0x5022,
-	/* Array index: 0x0658 */ 0x9D0F,0x542A,
-	/* Array index: 0x0658 */ 0x9D13,0x542C,
-	/* Array index: 0x0658 */ 0x9D16,0x5436,
-	/* Array index: 0x0658 */ 0x9D1A,0x5433,
-	/* Array index: 0x0658 */ 0x9D21,0x5437,
-	/* Array index: 0x0658 */ 0x9D24,0x5429,
-	/* Array index: 0x0658 */ 0x9D27,0x5435,
-	/* Array index: 0x0658 */ 0x9D2A,0x5432,
-	/* Array index: 0x0658 */ 0x9D35,0x574D,
-	/* Array index: 0x0658 */ 0x9D39,0x5748,
-	/* Array index: 0x0658 */ 0x9D44,0x574A,
-	/* Array index: 0x0658 */ 0x9D49,0x6675,
-	/* Array index: 0x0658 */ 0x9D4D,0x5979,
-	/* Array index: 0x0658 */ 0x9D4E,0x597B,
-	/* Array index: 0x0658 */ 0x9D50,0x597D,
-	/* Array index: 0x0658 */ 0x9D55,0x597E,
-	/* Array index: 0x0658 */ 0x9D5E,0x5A22,
-	/* Array index: 0x0658 */ 0x9D63,0x597A,
-	/* Array index: 0x0658 */ 0x9D66,0x5B7D,
-	/* Array index: 0x0658 */ 0x9D6D,0x5C27,
-	/* Array index: 0x0658 */ 0x9D6E,0x5C22,
-	/* Array index: 0x0658 */ 0x9D76,0x5C25,
-	/* Array index: 0x0658 */ 0x9D7A,0x5B7E,
-	/* Array index: 0x0658 */ 0x9D7E,0x5C26,
-	/* Array index: 0x0658 */ 0x9D83,0x5C24,
-	/* Array index: 0x0658 */ 0x9D91,0x5C23,
-	/* Array index: 0x0658 */ 0x9D95,0x5D79,
-	/* Array index: 0x0658 */ 0x9DA5,0x5D7A,
-	/* Array index: 0x0658 */ 0x9DAE,0x5F35,
-	/* Array index: 0x0658 */ 0x9DB0,0x5F31,
-	/* Array index: 0x0658 */ 0x9DBD,0x5F32,
-	/* Array index: 0x0658 */ 0x9DC4,0x5F36,
-	/* Array index: 0x0658 */ 0x9DFC,0x606C,
-	/* Array index: 0x0658 */ 0x9E08,0x6135,
-	/* Array index: 0x0658 */ 0x9E0E,0x615D,
-	/* Array index: 0x0658 */ 0x9E16,0x6229,
-	/* Array index: 0x0658 */ 0x9E18,0x6230,
-	/* Array index: 0x0658 */ 0x9E1C,0x6238,
-	/* Array index: 0x0658 */ 0x9E7B,0x5F37,
-	/* Array index: 0x0658 */ 0x9E81,0x4569,
-	/* Array index: 0x0658 */ 0x9E84,0x502C,
-	/* Array index: 0x0658 */ 0x9E85,0x5439,
-	/* Array index: 0x0658 */ 0x9E90,0x5A24,
-	/* Array index: 0x0658 */ 0x9E95,0x5C29,
-	/* Array index: 0x0658 */ 0x9E98,0x5E21,
-	/* Array index: 0x0658 */ 0x9E9E,0x5F3A,
-	/* Array index: 0x0658 */ 0x9EA2,0x6231,
-	/* Array index: 0x0658 */ 0x9EA3,0x623F,
-	/* Array index: 0x0658 */ 0x9EA6,0x2547,
-	/* Array index: 0x0658 */ 0x9EAF,0x5750,
-	/* Array index: 0x0658 */ 0x9EB1,0x5A26,
-	/* Array index: 0x0658 */ 0x9EB2,0x5A25,
-	/* Array index: 0x0658 */ 0x9EBD,0x4B22,
-	/* Array index: 0x0658 */ 0x9EC1,0x5E22,
-	/* Array index: 0x0658 */ 0x9ECA,0x5A28,
-	/* Array index: 0x0658 */ 0x9ED2,0x396B,
-	/* Array index: 0x0658 */ 0x9ED7,0x543D,
-	/* Array index: 0x0658 */ 0x9EE3,0x5C2A,
-	/* Array index: 0x0658 */ 0x9EF1,0x6029,
-	/* Array index: 0x0658 */ 0x9EFE,0x2772,
-	/* Array index: 0x0658 */ 0x9F08,0x615F,
-	/* Array index: 0x0658 */ 0x9F14,0x456A,
-	/* Array index: 0x0658 */ 0x9F17,0x5C30,
-	/* Array index: 0x0658 */ 0x9F1D,0x6160,
-	/* Array index: 0x0658 */ 0x9F26,0x5A2B,
-	/* Array index: 0x0658 */ 0x9F27,0x5A2A,
-	/* Array index: 0x0658 */ 0x9F39,0x606D,
-	/* Array index: 0x0658 */ 0x9F45,0x613B,
-	/* Array index: 0x0658 */ 0x9F50,0x2370,
-	/* Array index: 0x0658 */ 0x9F53,0x543E,
-	/* Array index: 0x0658 */ 0x9F5A,0x5E24,
-	/* Array index: 0x0658 */ 0x9F69,0x5F3E,
-	/* Array index: 0x0658 */ 0x9F7C,0x6233,
-	/* Array index: 0x0658 */ 0x9F8E,0x5755,
-	/* Array index: 0x0658 */ 0x9F93,0x602B,
-	/* Array index: 0x0658 */ 0x9F97,0x6242,
-	/* Array index: 0x0658 */ 0x9F9D,0x5E47,
-	/* Array index: 0x0658 */ 0x9FA1,0x5F3F,
-	/* Array index: 0x0658 */ 0x9FA3,0x6161,
-	/* Array index: 0x0658 */ 0x9FA5,0x6177,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_CNS11643_PLANE14 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * cns11643_plane14 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_cns11643_plane14 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_CNS11643_PLANE14, /* CCS name */
-	TABLE_16BIT, /* Table bits */
-#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&from_ucs_size_cns11643_plane14, /* UCS -> cns11643_plane14 table size-optimized table */
-#elif defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&from_ucs_speed_cns11643_plane14, /* UCS -> cns11643_plane14 table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&to_ucs_size_cns11643_plane14 /* cns11643_plane14 -> UCS table speed-optimized table */
-#elif defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&to_ucs_speed_cns11643_plane14 /* cns11643_plane14 -> UCS table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_CNS11643_PLANE14) || ... */
-
diff --git a/newlib/libc/iconv/ccs/cns11643_plane2.c b/newlib/libc/iconv/ccs/cns11643_plane2.c
deleted file mode 100644
index c591ce3..0000000
--- a/newlib/libc/iconv/ccs/cns11643_plane2.c
+++ /dev/null
@@ -1,11948 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for cns11643_plane2 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
- || defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-/*
- * 16-bit cns11643_plane2 -> UCS speed-optimized table (42496 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_speed_cns11643_plane2[] =
-{
-	/* Heading Block */
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,0x0100,0x0200,0x0300,0x0400,0x0500,0x0600,0x0700,
-	0x0800,0x0900,0x0A00,0x0B00,0x0C00,0x0D00,0x0E00,0x0F00,
-	0x1000,0x1100,0x1200,0x1300,0x1400,0x1500,0x1600,0x1700,
-	0x1800,0x1900,0x1A00,0x1B00,0x1C00,0x1D00,0x1E00,0x1F00,
-	0x2000,0x2100,0x2200,0x2300,0x2400,0x2500,0x2600,0x2700,
-	0x2800,0x2900,0x2A00,0x2B00,0x2C00,0x2D00,0x2E00,0x2F00,
-	0x3000,0x3100,0x3200,0x3300,0x3400,0x3500,0x3600,0x3700,
-	0x3800,0x3900,0x3A00,0x3B00,0x3C00,0x3D00,0x3E00,0x3F00,
-	0x4000,0x4100,0x4200,0x4300,0x4400,0x4500,0x4600,0x4700,
-	0x4800,0x4900,0x4A00,0x4B00,0x4C00,0x4D00,0x4E00,0x4F00,
-	0x5000,0x5100,0x5200,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	/* Block 34, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E42,0x4E5C,0x51F5,0x531A,0x5382,0x4E07,0x4E0C,
-	0x4E47,0x4E8D,0x56D7,0x5C6E,0x5F73,0x4E0F,0x5187,0x4E0E,
-	0x4E2E,0x4E93,0x4EC2,0x4EC9,0x4EC8,0x5198,0x52FC,0x536C,
-	0x53B9,0x5720,0x5903,0x592C,0x5C10,0x5DFF,0x65E1,0x6BB3,
-	0x6BCC,0x6C14,0x723F,0x4E31,0x4E3C,0x4EE8,0x4EDC,0x4EE9,
-	0x4EE1,0x4EDD,0x4EDA,0x520C,0x5209,0x531C,0x534C,0x5722,
-	0x5723,0x5917,0x592F,0x5B81,0x5B84,0x5C12,0x5C3B,0x5C74,
-	0x5C73,0x5E04,0x5E80,0x5E82,0x5FC9,0x6209,0x6250,0x6C15,
-	0x6C36,0x6C43,0x6C3F,0x6C3B,0x72AE,0x72B0,0x738A,0x79B8,
-	0x808A,0x961E,0x4F0E,0x4F18,0x4F2C,0x4EF5,0x4F14,0x4EF1,
-	0x4F00,0x4EF7,0x4F08,0x4F1D,0x4F02,0x4F05,0x4F22,0x4F13,
-	0x4F04,0x4EF4,0x4F12,0x51B1,0x5213,0x5210,0x52A6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 35, Array index 0x0200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5322,0x531F,0x534D,0x538A,0x5407,0x56E1,0x56DF,
-	0x572E,0x572A,0x5734,0x593C,0x5980,0x597C,0x5985,0x597B,
-	0x597E,0x5977,0x597F,0x5B56,0x5C15,0x5C25,0x5C7C,0x5C7A,
-	0x5C7B,0x5C7E,0x5DDF,0x5E75,0x5E84,0x5F02,0x5F1A,0x5F74,
-	0x5FD5,0x5FD4,0x5FCF,0x625C,0x625E,0x6264,0x6261,0x6266,
-	0x6262,0x6259,0x6260,0x625A,0x6265,0x6537,0x65EF,0x65EE,
-	0x673E,0x6739,0x6738,0x673B,0x673A,0x673F,0x673C,0x6733,
-	0x6C18,0x6C46,0x6C52,0x6C5C,0x6C4F,0x6C4A,0x6C54,0x6C4B,
-	0x6C4C,0x7071,0x725E,0x72B4,0x72B5,0x738E,0x752A,0x767F,
-	0x7A75,0x7F51,0x8278,0x827C,0x8280,0x827D,0x827F,0x864D,
-	0x897E,0x9099,0x9097,0x9098,0x909B,0x9094,0x9622,0x9624,
-	0x9620,0x9623,0x4F56,0x4F3B,0x4F62,0x4F49,0x4F53,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 36, Array index 0x0300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F64,0x4F3E,0x4F67,0x4F52,0x4F5F,0x4F41,0x4F58,
-	0x4F2D,0x4F33,0x4F3F,0x4F61,0x518F,0x51B9,0x521C,0x521E,
-	0x5221,0x52AD,0x52AE,0x5309,0x5363,0x5372,0x538E,0x538F,
-	0x5430,0x5437,0x542A,0x5454,0x5445,0x5419,0x541C,0x5425,
-	0x5418,0x543D,0x544F,0x5441,0x5428,0x5424,0x5447,0x56EE,
-	0x56E7,0x56E5,0x5741,0x5745,0x574C,0x5749,0x574B,0x5752,
-	0x5906,0x5940,0x59A6,0x5998,0x59A0,0x5997,0x598E,0x59A2,
-	0x5990,0x598F,0x59A7,0x59A1,0x5B8E,0x5B92,0x5C28,0x5C2A,
-	0x5C8D,0x5C8F,0x5C88,0x5C8B,0x5C89,0x5C92,0x5C8A,0x5C86,
-	0x5C93,0x5C95,0x5DE0,0x5E0A,0x5E0E,0x5E8B,0x5E89,0x5E8C,
-	0x5E88,0x5E8D,0x5F05,0x5F1D,0x5F78,0x5F76,0x5FD2,0x5FD1,
-	0x5FD0,0x5FED,0x5FE8,0x5FEE,0x5FF3,0x5FE1,0x5FE4,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 37, Array index 0x0400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5FE3,0x5FFA,0x5FEF,0x5FF7,0x5FFB,0x6000,0x5FF4,
-	0x623A,0x6283,0x628C,0x628E,0x628F,0x6294,0x6287,0x6271,
-	0x627B,0x627A,0x6270,0x6281,0x6288,0x6277,0x627D,0x6272,
-	0x6274,0x65F0,0x65F4,0x65F3,0x65F2,0x65F5,0x6745,0x6747,
-	0x6759,0x6755,0x674C,0x6748,0x675D,0x674D,0x675A,0x674B,
-	0x6BD0,0x6C19,0x6C1A,0x6C78,0x6C67,0x6C6B,0x6C84,0x6C8B,
-	0x6C8F,0x6C71,0x6C6F,0x6C69,0x6C9A,0x6C6D,0x6C87,0x6C95,
-	0x6C9C,0x6C66,0x6C73,0x6C65,0x6C7B,0x6C8E,0x7074,0x707A,
-	0x7263,0x72BF,0x72BD,0x72C3,0x72C6,0x72C1,0x72BA,0x72C5,
-	0x7395,0x7397,0x7393,0x7394,0x7392,0x753A,0x7539,0x7594,
-	0x7595,0x7681,0x793D,0x8034,0x8095,0x8099,0x8090,0x8092,
-	0x809C,0x8290,0x828F,0x8285,0x828E,0x8291,0x8293,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 38, Array index 0x0500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x828A,0x8283,0x8284,0x8C78,0x8FC9,0x8FBF,0x909F,
-	0x90A1,0x90A5,0x909E,0x90A7,0x90A0,0x9630,0x9628,0x962F,
-	0x962D,0x4E33,0x4F98,0x4F7C,0x4F85,0x4F7D,0x4F80,0x4F87,
-	0x4F76,0x4F74,0x4F89,0x4F84,0x4F77,0x4F4C,0x4F97,0x4F6A,
-	0x4F9A,0x4F79,0x4F81,0x4F78,0x4F90,0x4F9C,0x4F94,0x4F9E,
-	0x4F92,0x4F82,0x4F95,0x4F6B,0x4F6E,0x519E,0x51BC,0x51BE,
-	0x5235,0x5232,0x5233,0x5246,0x5231,0x52BC,0x530A,0x530B,
-	0x533C,0x5392,0x5394,0x5487,0x547F,0x5481,0x5491,0x5482,
-	0x5488,0x546B,0x547A,0x547E,0x5465,0x546C,0x5474,0x5466,
-	0x548D,0x546F,0x5461,0x5460,0x5498,0x5463,0x5467,0x5464,
-	0x56F7,0x56F9,0x576F,0x5772,0x576D,0x576B,0x5771,0x5770,
-	0x5776,0x5780,0x5775,0x577B,0x5773,0x5774,0x5762,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 39, Array index 0x0600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5768,0x577D,0x590C,0x5945,0x59B5,0x59BA,0x59CF,
-	0x59CE,0x59B2,0x59CC,0x59C1,0x59B6,0x59BC,0x59C3,0x59D6,
-	0x59B1,0x59BD,0x59C0,0x59C8,0x59B4,0x59C7,0x5B62,0x5B65,
-	0x5B93,0x5B95,0x5C44,0x5C47,0x5CAE,0x5CA4,0x5CA0,0x5CB5,
-	0x5CAF,0x5CA8,0x5CAC,0x5C9F,0x5CA3,0x5CAD,0x5CA2,0x5CAA,
-	0x5CA7,0x5C9D,0x5CA5,0x5CB6,0x5CB0,0x5CA6,0x5E17,0x5E14,
-	0x5E19,0x5F28,0x5F22,0x5F23,0x5F24,0x5F54,0x5F82,0x5F7E,
-	0x5F7D,0x5FDE,0x5FE5,0x602D,0x6026,0x6019,0x6032,0x600B,
-	0x6034,0x600A,0x6017,0x6033,0x601A,0x601E,0x602C,0x6022,
-	0x600D,0x6010,0x602E,0x6013,0x6011,0x600C,0x6009,0x601C,
-	0x6214,0x623D,0x62AD,0x62B4,0x62D1,0x62BE,0x62AA,0x62B6,
-	0x62CA,0x62AE,0x62B3,0x62AF,0x62BB,0x62A9,0x62B0,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 40, Array index 0x0700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x62B8,0x653D,0x65A8,0x65BB,0x6609,0x65FC,0x6604,
-	0x6612,0x6608,0x65FB,0x6603,0x660B,0x660D,0x6605,0x65FD,
-	0x6611,0x6610,0x66F6,0x670A,0x6785,0x676C,0x678E,0x6792,
-	0x6776,0x677B,0x6798,0x6786,0x6784,0x6774,0x678D,0x678C,
-	0x677A,0x679F,0x6791,0x6799,0x6783,0x677D,0x6781,0x6778,
-	0x6779,0x6794,0x6B25,0x6B80,0x6B7E,0x6BDE,0x6C1D,0x6C93,
-	0x6CEC,0x6CEB,0x6CEE,0x6CD9,0x6CB6,0x6CD4,0x6CAD,0x6CE7,
-	0x6CB7,0x6CD0,0x6CC2,0x6CBA,0x6CC3,0x6CC6,0x6CED,0x6CF2,
-	0x6CD2,0x6CDD,0x6CB4,0x6C8A,0x6C9D,0x6C80,0x6CDE,0x6CC0,
-	0x6D30,0x6CCD,0x6CC7,0x6CB0,0x6CF9,0x6CCF,0x6CE9,0x6CD1,
-	0x7094,0x7098,0x7085,0x7093,0x7086,0x7084,0x7091,0x7096,
-	0x7082,0x709A,0x7083,0x726A,0x72D6,0x72CB,0x72D8,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 41, Array index 0x0800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x72C9,0x72DC,0x72D2,0x72D4,0x72DA,0x72CC,0x72D1,
-	0x73A4,0x73A1,0x73AD,0x73A6,0x73A2,0x73A0,0x73AC,0x739D,
-	0x74DD,0x74E8,0x753F,0x7540,0x753E,0x758C,0x7598,0x76AF,
-	0x76F3,0x76F1,0x76F0,0x76F5,0x77F8,0x77FC,0x77F9,0x77FB,
-	0x77FA,0x77F7,0x7942,0x793F,0x79C5,0x7A78,0x7A7B,0x7AFB,
-	0x7C75,0x7CFD,0x8035,0x808F,0x80AE,0x80A3,0x80B8,0x80B5,
-	0x80AD,0x8220,0x82A0,0x82C0,0x82AB,0x829A,0x8298,0x829B,
-	0x82B5,0x82A7,0x82AE,0x82BC,0x829E,0x82BA,0x82B4,0x82A8,
-	0x82A1,0x82A9,0x82C2,0x82A4,0x82C3,0x82B6,0x82A2,0x8670,
-	0x866F,0x866D,0x866E,0x8C56,0x8FD2,0x8FCB,0x8FD3,0x8FCD,
-	0x8FD6,0x8FD5,0x8FD7,0x90B2,0x90B4,0x90AF,0x90B3,0x90B0,
-	0x9639,0x963D,0x963C,0x963A,0x9643,0x4FCD,0x4FC5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 42, Array index 0x0900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4FD3,0x4FB2,0x4FC9,0x4FCB,0x4FC1,0x4FD4,0x4FDC,
-	0x4FD9,0x4FBB,0x4FB3,0x4FDB,0x4FC7,0x4FD6,0x4FBA,0x4FC0,
-	0x4FB9,0x4FEC,0x5244,0x5249,0x52C0,0x52C2,0x533D,0x537C,
-	0x5397,0x5396,0x5399,0x5398,0x54BA,0x54A1,0x54AD,0x54A5,
-	0x54CF,0x54C3,0x830D,0x54B7,0x54AE,0x54D6,0x54B6,0x54C5,
-	0x54C6,0x54A0,0x5470,0x54BC,0x54A2,0x54BE,0x5472,0x54DE,
-	0x54B0,0x57B5,0x579E,0x579F,0x57A4,0x578C,0x5797,0x579D,
-	0x579B,0x5794,0x5798,0x578F,0x5799,0x57A5,0x579A,0x5795,
-	0x58F4,0x590D,0x5953,0x59E1,0x59DE,0x59EE,0x5A00,0x59F1,
-	0x59DD,0x59FA,0x59FD,0x59FC,0x59F6,0x59E4,0x59F2,0x59F7,
-	0x59DB,0x59E9,0x59F3,0x59F5,0x59E0,0x59FE,0x59F4,0x59ED,
-	0x5BA8,0x5C4C,0x5CD0,0x5CD8,0x5CCC,0x5CD7,0x5CCB,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 43, Array index 0x0A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5CDB,0x5CDE,0x5CDA,0x5CC9,0x5CC7,0x5CCA,0x5CD6,
-	0x5CD3,0x5CD4,0x5CCF,0x5CC8,0x5CC6,0x5CCE,0x5CDF,0x5CF8,
-	0x5DF9,0x5E21,0x5E22,0x5E23,0x5E20,0x5E24,0x5EB0,0x5EA4,
-	0x5EA2,0x5E9B,0x5EA3,0x5EA5,0x5F07,0x5F2E,0x5F56,0x5F86,
-	0x6037,0x6039,0x6054,0x6072,0x605E,0x6045,0x6053,0x6047,
-	0x6049,0x605B,0x604C,0x6040,0x6042,0x605F,0x6024,0x6044,
-	0x6058,0x6066,0x606E,0x6242,0x6243,0x62CF,0x630D,0x630B,
-	0x62F5,0x630E,0x6303,0x62EB,0x62F9,0x630F,0x630C,0x62F8,
-	0x62F6,0x6300,0x6313,0x6314,0x62FA,0x6315,0x62FB,0x62F0,
-	0x6541,0x6543,0x65AA,0x65BF,0x6636,0x6621,0x6632,0x6635,
-	0x661C,0x6626,0x6622,0x6633,0x662B,0x663A,0x661D,0x6634,
-	0x6639,0x662E,0x670F,0x6710,0x67C1,0x67F2,0x67C8,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 44, Array index 0x0B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x67BA,0x67DC,0x67BB,0x67F8,0x67D8,0x67C0,0x67B7,
-	0x67C5,0x67EB,0x67E4,0x67DF,0x67B5,0x67CD,0x67B3,0x67F7,
-	0x67F6,0x67EE,0x67E3,0x67C2,0x67B9,0x67CE,0x67E7,0x67F0,
-	0x67B2,0x67FC,0x67C6,0x67ED,0x67CC,0x67AE,0x67E6,0x67DB,
-	0x67FA,0x67C9,0x67CA,0x67C3,0x67EA,0x67CB,0x6B28,0x6B82,
-	0x6B84,0x6BB6,0x6BD6,0x6BD8,0x6BE0,0x6C20,0x6C21,0x6D28,
-	0x6D34,0x6D2D,0x6D1F,0x6D3C,0x6D3F,0x6D12,0x6D0A,0x6CDA,
-	0x6D33,0x6D04,0x6D19,0x6D3A,0x6D1A,0x6D11,0x6D00,0x6D1D,
-	0x6D42,0x6D01,0x6D18,0x6D37,0x6D03,0x6D0F,0x6D40,0x6D07,
-	0x6D20,0x6D2C,0x6D08,0x6D22,0x6D09,0x6D10,0x70B7,0x709F,
-	0x70BE,0x70B1,0x70B0,0x70A1,0x70B4,0x70B5,0x70A9,0x7241,
-	0x7249,0x724A,0x726C,0x7270,0x7273,0x726E,0x72CA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 45, Array index 0x0C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x72E4,0x72E8,0x72EB,0x72DF,0x72EA,0x72E6,0x72E3,
-	0x7385,0x73CC,0x73C2,0x73C8,0x73C5,0x73B9,0x73B6,0x73B5,
-	0x73B4,0x73EB,0x73BF,0x73C7,0x73BE,0x73C3,0x73C6,0x73B8,
-	0x73CB,0x74EC,0x74EE,0x752E,0x7547,0x7548,0x75A7,0x75AA,
-	0x7679,0x76C4,0x7708,0x7703,0x7704,0x7705,0x770A,0x76F7,
-	0x76FB,0x76FA,0x77E7,0x77E8,0x7806,0x7811,0x7812,0x7805,
-	0x7810,0x780F,0x780E,0x7809,0x7803,0x7813,0x794A,0x794C,
-	0x794B,0x7945,0x7944,0x79D5,0x79CD,0x79CF,0x79D6,0x79CE,
-	0x7A80,0x7A7E,0x7AD1,0x7B00,0x7B01,0x7C7A,0x7C78,0x7C79,
-	0x7C7F,0x7C80,0x7C81,0x7D03,0x7D08,0x7D01,0x7F58,0x7F91,
-	0x7F8D,0x7FBE,0x8007,0x800E,0x800F,0x8014,0x8037,0x80D8,
-	0x80C7,0x80E0,0x80D1,0x80C8,0x80C2,0x80D0,0x80C5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 46, Array index 0x0D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x80E3,0x80D9,0x80DC,0x80CA,0x80D5,0x80C9,0x80CF,
-	0x80D7,0x80E6,0x80CD,0x81FF,0x8221,0x8294,0x82D9,0x82FE,
-	0x82F9,0x8307,0x82E8,0x8300,0x82D5,0x833A,0x82EB,0x82D6,
-	0x82F4,0x82EC,0x82E1,0x82F2,0x82F5,0x830C,0x82FB,0x82F6,
-	0x82F0,0x82EA,0x82E4,0x82E0,0x82FA,0x82F3,0x82ED,0x8677,
-	0x8674,0x867C,0x8673,0x8841,0x884E,0x8867,0x886A,0x8869,
-	0x89D3,0x8A04,0x8A07,0x8D72,0x8FE3,0x8FE1,0x8FEE,0x8FE0,
-	0x90F1,0x90BD,0x90BF,0x90D5,0x90C5,0x90BE,0x90C7,0x90CB,
-	0x90C8,0x91D4,0x91D3,0x9654,0x964F,0x9651,0x9653,0x964A,
-	0x964E,0x501E,0x5005,0x5007,0x5013,0x5022,0x5030,0x501B,
-	0x4FF5,0x4FF4,0x5033,0x5037,0x502C,0x4FF6,0x4FF7,0x5017,
-	0x501C,0x5020,0x5027,0x5035,0x502F,0x5031,0x500E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 47, Array index 0x0E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x515A,0x5194,0x5193,0x51CA,0x51C4,0x51C5,0x51C8,
-	0x51CE,0x5261,0x525A,0x5252,0x525E,0x525F,0x5255,0x5262,
-	0x52CD,0x530E,0x539E,0x5526,0x54E2,0x5517,0x5512,0x54E7,
-	0x54F3,0x54E4,0x551A,0x54FF,0x5504,0x5508,0x54EB,0x5511,
-	0x5505,0x54F1,0x550A,0x54FB,0x54F7,0x54F8,0x54E0,0x550E,
-	0x5503,0x550B,0x5701,0x5702,0x57CC,0x5832,0x57D5,0x57D2,
-	0x57BA,0x57C6,0x57BD,0x57BC,0x57B8,0x57B6,0x57BF,0x57C7,
-	0x57D0,0x57B9,0x57C1,0x590E,0x594A,0x5A19,0x5A16,0x5A2D,
-	0x5A2E,0x5A15,0x5A0F,0x5A17,0x5A0A,0x5A1E,0x5A33,0x5B6C,
-	0x5BA7,0x5BAD,0x5BAC,0x5C03,0x5C56,0x5C54,0x5CEC,0x5CFF,
-	0x5CEE,0x5CF1,0x5CF7,0x5D00,0x5CF9,0x5E29,0x5E28,0x5EA8,
-	0x5EAE,0x5EAA,0x5EAC,0x5F33,0x5F30,0x5F67,0x605D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 48, Array index 0x0F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x605A,0x6067,0x6041,0x60A2,0x6088,0x6080,0x6092,
-	0x6081,0x609D,0x6083,0x6095,0x609B,0x6097,0x6087,0x609C,
-	0x608E,0x6219,0x6246,0x62F2,0x6310,0x6356,0x632C,0x6344,
-	0x6345,0x6336,0x6343,0x63E4,0x6339,0x634B,0x634A,0x633C,
-	0x6329,0x6341,0x6334,0x6358,0x6354,0x6359,0x632D,0x6347,
-	0x6333,0x635A,0x6351,0x6338,0x6357,0x6340,0x6348,0x654A,
-	0x6546,0x65C6,0x65C3,0x65C4,0x65C2,0x664A,0x665F,0x6647,
-	0x6651,0x6712,0x6713,0x681F,0x681A,0x6849,0x6832,0x6833,
-	0x683B,0x684B,0x684F,0x6816,0x6831,0x681C,0x6835,0x682B,
-	0x682D,0x682F,0x684E,0x6844,0x6834,0x681D,0x6812,0x6814,
-	0x6826,0x6828,0x682E,0x684D,0x683A,0x6825,0x6820,0x6B2C,
-	0x6B2F,0x6B2D,0x6B31,0x6B34,0x6B6D,0x8082,0x6B88,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 49, Array index 0x1000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6BE6,0x6BE4,0x6BE8,0x6BE3,0x6BE2,0x6BE7,0x6C25,
-	0x6D7A,0x6D63,0x6D64,0x6D76,0x6D0D,0x6D61,0x6D92,0x6D58,
-	0x6D62,0x6D6D,0x6D6F,0x6D91,0x6D8D,0x6DEF,0x6D7F,0x6D86,
-	0x6D5E,0x6D67,0x6D60,0x6D97,0x6D70,0x6D7C,0x6D5F,0x6D82,
-	0x6D98,0x6D2F,0x6D68,0x6D8B,0x6D7E,0x6D80,0x6D84,0x6D16,
-	0x6D83,0x6D7B,0x6D7D,0x6D75,0x6D90,0x70DC,0x70D3,0x70D1,
-	0x70DD,0x70CB,0x7F39,0x70E2,0x70D7,0x70D2,0x70DE,0x70E0,
-	0x70D4,0x70CD,0x70C5,0x70C6,0x70C7,0x70DA,0x70CE,0x70E1,
-	0x7242,0x7278,0x7277,0x7276,0x7300,0x72FA,0x72F4,0x72FE,
-	0x72F6,0x72F3,0x72FB,0x7301,0x73D3,0x73D9,0x73E5,0x73D6,
-	0x73BC,0x73E7,0x73E3,0x73E9,0x73DC,0x73D2,0x73DB,0x73D4,
-	0x73DD,0x73DA,0x73D7,0x73D8,0x73E8,0x74DE,0x74DF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 50, Array index 0x1100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x74F4,0x74F5,0x7521,0x755B,0x755F,0x75B0,0x75C1,
-	0x75BB,0x75C4,0x75C0,0x75BF,0x75B6,0x75BA,0x768A,0x76C9,
-	0x771D,0x771B,0x7710,0x7713,0x7712,0x7723,0x7711,0x7715,
-	0x7719,0x771A,0x7722,0x7727,0x7823,0x782C,0x7822,0x7835,
-	0x782F,0x7828,0x782E,0x782B,0x7821,0x7829,0x7833,0x782A,
-	0x7831,0x7954,0x795B,0x794F,0x795C,0x7953,0x7952,0x7951,
-	0x79EB,0x79EC,0x79E0,0x79EE,0x79ED,0x79EA,0x79DC,0x79DE,
-	0x79DD,0x7A86,0x7A89,0x7A85,0x7A8B,0x7A8C,0x7A8A,0x7A87,
-	0x7AD8,0x7B10,0x7B04,0x7B13,0x7B05,0x7B0F,0x7B08,0x7B0A,
-	0x7B0E,0x7B09,0x7B12,0x7C84,0x7C91,0x7C8A,0x7C8C,0x7C88,
-	0x7C8D,0x7C85,0x7D1E,0x7D1D,0x7D11,0x7D0E,0x7D18,0x7D16,
-	0x7D13,0x7D1F,0x7D12,0x7D0F,0x7D0C,0x7F5C,0x7F61,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 51, Array index 0x1200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7F5E,0x7F60,0x7F5D,0x7F5B,0x7F96,0x7F92,0x7FC3,
-	0x7FC2,0x7FC0,0x8016,0x803E,0x8039,0x80FA,0x80F2,0x80F9,
-	0x80F5,0x8101,0x80FB,0x8100,0x8201,0x822F,0x8225,0x8333,
-	0x832D,0x8344,0x8319,0x8351,0x8325,0x8356,0x833F,0x8341,
-	0x8326,0x831C,0x8322,0x8342,0x834E,0x831B,0x832A,0x8308,
-	0x833C,0x834D,0x8316,0x8324,0x8320,0x8337,0x832F,0x8329,
-	0x8347,0x8345,0x834C,0x8353,0x831E,0x832C,0x834B,0x8327,
-	0x8348,0x8653,0x8652,0x86A2,0x86A8,0x8696,0x868D,0x8691,
-	0x869E,0x8687,0x8697,0x8686,0x868B,0x869A,0x8685,0x86A5,
-	0x8699,0x86A1,0x86A7,0x8695,0x8698,0x868E,0x869D,0x8690,
-	0x8694,0x8843,0x8844,0x886D,0x8875,0x8876,0x8872,0x8880,
-	0x8871,0x887F,0x886F,0x8883,0x887E,0x8874,0x887C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 52, Array index 0x1300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8A12,0x8C47,0x8C57,0x8C7B,0x8CA4,0x8CA3,0x8D76,
-	0x8D78,0x8DB5,0x8DB7,0x8DB6,0x8ED1,0x8ED3,0x8FFE,0x8FF5,
-	0x9002,0x8FFF,0x8FFB,0x9004,0x8FFC,0x8FF6,0x90D6,0x90E0,
-	0x90D9,0x90DA,0x90E3,0x90DF,0x90E5,0x90D8,0x90DB,0x90D7,
-	0x90DC,0x90E4,0x9150,0x914E,0x914F,0x91D5,0x91E2,0x91DA,
-	0x965C,0x965F,0x96BC,0x98E3,0x9ADF,0x9B2F,0x4E7F,0x5070,
-	0x506A,0x5061,0x505E,0x5060,0x5053,0x504B,0x505D,0x5072,
-	0x5048,0x504D,0x5041,0x505B,0x504A,0x5062,0x5015,0x5045,
-	0x505F,0x5069,0x506B,0x5063,0x5064,0x5046,0x5040,0x506E,
-	0x5073,0x5057,0x5051,0x51D0,0x526B,0x526D,0x526C,0x526E,
-	0x52D6,0x52D3,0x532D,0x539C,0x5575,0x5576,0x553C,0x554D,
-	0x5550,0x5534,0x552A,0x5551,0x5562,0x5536,0x5535,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 53, Array index 0x1400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5530,0x5552,0x5545,0x550C,0x5532,0x5565,0x554E,
-	0x5539,0x5548,0x552D,0x553B,0x5540,0x554B,0x570A,0x5707,
-	0x57FB,0x5814,0x57E2,0x57F6,0x57DC,0x57F4,0x5800,0x57ED,
-	0x57FD,0x5808,0x57F8,0x580B,0x57F3,0x57CF,0x5807,0x57EE,
-	0x57E3,0x57F2,0x57E5,0x57EC,0x57E1,0x580E,0x57FC,0x5810,
-	0x57E7,0x5801,0x580C,0x57F1,0x57E9,0x57F0,0x580D,0x5804,
-	0x595C,0x5A60,0x5A58,0x5A55,0x5A67,0x5A5E,0x5A38,0x5A35,
-	0x5A6D,0x5A50,0x5A5F,0x5A65,0x5A6C,0x5A53,0x5A64,0x5A57,
-	0x5A43,0x5A5D,0x5A52,0x5A44,0x5A5B,0x5A48,0x5A8E,0x5A3E,
-	0x5A4D,0x5A39,0x5A4C,0x5A70,0x5A69,0x5A47,0x5A51,0x5A56,
-	0x5A42,0x5A5C,0x5B72,0x5B6E,0x5BC1,0x5BC0,0x5C59,0x5D1E,
-	0x5D0B,0x5D1D,0x5D1A,0x5D20,0x5D0C,0x5D28,0x5D0D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 54, Array index 0x1500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D26,0x5D25,0x5D0F,0x5D30,0x5D12,0x5D23,0x5D1F,
-	0x5D2E,0x5E3E,0x5E34,0x5EB1,0x5EB4,0x5EB9,0x5EB2,0x5EB3,
-	0x5F36,0x5F38,0x5F9B,0x5F96,0x5F9F,0x608A,0x6090,0x6086,
-	0x60BE,0x60B0,0x60BA,0x60D3,0x60D4,0x60CF,0x60E4,0x60D9,
-	0x60DD,0x60C8,0x60B1,0x60DB,0x60B7,0x60CA,0x60BF,0x60C3,
-	0x60CD,0x60C0,0x6332,0x6365,0x638A,0x6382,0x637D,0x63BD,
-	0x639E,0x63AD,0x639D,0x6397,0x63AB,0x638E,0x636F,0x6387,
-	0x6390,0x636E,0x63AF,0x6375,0x639C,0x636D,0x63AE,0x637C,
-	0x63A4,0x633B,0x639F,0x6378,0x6385,0x6381,0x6391,0x638D,
-	0x6370,0x6553,0x65CD,0x6665,0x6661,0x665B,0x6659,0x665C,
-	0x6662,0x6718,0x6879,0x6887,0x6890,0x689C,0x686D,0x686E,
-	0x68AE,0x68AB,0x6956,0x686F,0x68A3,0x68AC,0x68A9,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 55, Array index 0x1600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6875,0x6874,0x68B2,0x688F,0x6877,0x6892,0x687C,
-	0x686B,0x6872,0x68AA,0x6880,0x6871,0x687E,0x689B,0x6896,
-	0x688B,0x68A0,0x6889,0x68A4,0x6878,0x687B,0x6891,0x688C,
-	0x688A,0x687D,0x6B36,0x6B33,0x6B37,0x6B38,0x6B91,0x6B8F,
-	0x6B8D,0x6B8E,0x6B8C,0x6C2A,0x6DC0,0x6DAB,0x6DB4,0x6DB3,
-	0x6E74,0x6DAC,0x6DE9,0x6DE2,0x6DB7,0x6DF6,0x6DD4,0x6E00,
-	0x6DC8,0x6DE0,0x6DDF,0x6DD6,0x6DBE,0x6DE5,0x6DDC,0x6DDD,
-	0x6DDB,0x6DF4,0x6DCA,0x6DBD,0x6DED,0x6DF0,0x6DBA,0x6DD5,
-	0x6DC2,0x6DCF,0x6DC9,0x6DD0,0x6DF2,0x6DD3,0x6DFD,0x6DD7,
-	0x6DCD,0x6DE3,0x6DBB,0x70FA,0x710D,0x70F7,0x7117,0x70F4,
-	0x710C,0x70F0,0x7104,0x70F3,0x7110,0x70FC,0x70FF,0x7106,
-	0x7113,0x7100,0x70F8,0x70F6,0x710B,0x7102,0x710E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 56, Array index 0x1700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x727E,0x727B,0x727C,0x727F,0x731D,0x7317,0x7307,
-	0x7311,0x7318,0x730A,0x7308,0x72FF,0x730F,0x731E,0x7388,
-	0x73F6,0x73F8,0x73F5,0x7404,0x7401,0x73FD,0x7407,0x7400,
-	0x73FA,0x73FC,0x73FF,0x740C,0x740B,0x73F4,0x7408,0x7564,
-	0x7563,0x75CE,0x75D2,0x75CF,0x75CB,0x75CC,0x75D1,0x75D0,
-	0x768F,0x7689,0x76D3,0x7739,0x772F,0x772D,0x7731,0x7732,
-	0x7734,0x7733,0x773D,0x7725,0x773B,0x7735,0x7848,0x7852,
-	0x7849,0x784D,0x784A,0x784C,0x7826,0x7845,0x7850,0x7964,
-	0x7967,0x7969,0x796A,0x7963,0x796B,0x7961,0x79BB,0x79FA,
-	0x79F8,0x79F6,0x79F7,0x7A8F,0x7A94,0x7A90,0x7B35,0x7B3B,
-	0x7B34,0x7B25,0x7B30,0x7B22,0x7B24,0x7B33,0x7B18,0x7B2A,
-	0x7B1D,0x7B31,0x7B2B,0x7B2D,0x7B2F,0x7B32,0x7B38,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 57, Array index 0x1800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7B1A,0x7B23,0x7C94,0x7C98,0x7C96,0x7CA3,0x7D35,
-	0x7D3D,0x7D38,0x7D36,0x7D3A,0x7D45,0x7D2C,0x7D29,0x7D41,
-	0x7D47,0x7D3E,0x7D3F,0x7D4A,0x7D3B,0x7D28,0x7F63,0x7F95,
-	0x7F9C,0x7F9D,0x7F9B,0x7FCA,0x7FCB,0x7FCD,0x7FD0,0x7FD1,
-	0x7FC7,0x7FCF,0x7FC9,0x801F,0x801E,0x801B,0x8047,0x8043,
-	0x8048,0x8118,0x8125,0x8119,0x811B,0x812D,0x811F,0x812C,
-	0x811E,0x8121,0x8115,0x8127,0x811D,0x8122,0x8211,0x8238,
-	0x8233,0x823A,0x8234,0x8232,0x8274,0x8390,0x83A3,0x83A8,
-	0x838D,0x837A,0x8373,0x83A4,0x8374,0x838F,0x8381,0x8395,
-	0x8399,0x8375,0x8394,0x83A9,0x837D,0x8383,0x838C,0x839D,
-	0x839B,0x83AA,0x838B,0x837E,0x83A5,0x83AF,0x8388,0x8397,
-	0x83B0,0x837F,0x83A6,0x8387,0x83AE,0x8376,0x8659,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 58, Array index 0x1900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8656,0x86BF,0x86B7,0x86C2,0x86C1,0x86C5,0x86BA,
-	0x86B0,0x86C8,0x86B9,0x86B3,0x86B8,0x86CC,0x86B4,0x86BB,
-	0x86BC,0x86C3,0x86BD,0x86BE,0x8852,0x8889,0x8895,0x88A8,
-	0x88A2,0x88AA,0x889A,0x8891,0x88A1,0x889F,0x8898,0x88A7,
-	0x8899,0x889B,0x8897,0x88A4,0x88AC,0x888C,0x8893,0x888E,
-	0x8982,0x89D6,0x89D9,0x89D5,0x8A30,0x8A27,0x8A2C,0x8A1E,
-	0x8C39,0x8C3B,0x8C5C,0x8C5D,0x8C7D,0x8CA5,0x8D7D,0x8D7B,
-	0x8D79,0x8DBC,0x8DC2,0x8DB9,0x8DBF,0x8DC1,0x8ED8,0x8EDE,
-	0x8EDD,0x8EDC,0x8ED7,0x8EE0,0x8EE1,0x9024,0x900B,0x9011,
-	0x901C,0x900C,0x9021,0x90EF,0x90EA,0x90F0,0x90F4,0x90F2,
-	0x90F3,0x90D4,0x90EB,0x90EC,0x90E9,0x9156,0x9158,0x915A,
-	0x9153,0x9155,0x91EC,0x91F4,0x91F1,0x91F3,0x91F8,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 59, Array index 0x1A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x91E4,0x91F9,0x91EA,0x91EB,0x91F7,0x91E8,0x91EE,
-	0x957A,0x9586,0x9588,0x967C,0x966D,0x966B,0x9671,0x966F,
-	0x96BF,0x976A,0x9804,0x98E5,0x9997,0x509B,0x5095,0x5094,
-	0x509E,0x508B,0x50A3,0x5083,0x508C,0x508E,0x509D,0x5068,
-	0x509C,0x5092,0x5082,0x5087,0x515F,0x51D4,0x5312,0x5311,
-	0x53A4,0x53A7,0x5591,0x55A8,0x55A5,0x55AD,0x5577,0x5645,
-	0x55A2,0x5593,0x5588,0x558F,0x55B5,0x5581,0x55A3,0x5592,
-	0x55A4,0x557D,0x558C,0x55A6,0x557F,0x5595,0x55A1,0x558E,
-	0x570C,0x5829,0x5837,0x5819,0x581E,0x5827,0x5823,0x5828,
-	0x57F5,0x5848,0x5825,0x581C,0x581B,0x5833,0x583F,0x5836,
-	0x582E,0x5839,0x5838,0x582D,0x582C,0x583B,0x5961,0x5AAF,
-	0x5A94,0x5A9F,0x5A7A,0x5AA2,0x5A9E,0x5A78,0x5AA6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 60, Array index 0x1B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5A7C,0x5AA5,0x5AAC,0x5A95,0x5AAE,0x5A37,0x5A84,
-	0x5A8A,0x5A97,0x5A83,0x5A8B,0x5AA9,0x5A7B,0x5A7D,0x5A8C,
-	0x5A9C,0x5A8F,0x5A93,0x5A9D,0x5BEA,0x5BCD,0x5BCB,0x5BD4,
-	0x5BD1,0x5BCA,0x5BCE,0x5C0C,0x5C30,0x5D37,0x5D43,0x5D6B,
-	0x5D41,0x5D4B,0x5D3F,0x5D35,0x5D51,0x5D4E,0x5D55,0x5D33,
-	0x5D3A,0x5D52,0x5D3D,0x5D31,0x5D59,0x5D42,0x5D39,0x5D49,
-	0x5D38,0x5D3C,0x5D32,0x5D36,0x5D40,0x5D45,0x5E44,0x5E41,
-	0x5F58,0x5FA6,0x5FA5,0x5FAB,0x60C9,0x60B9,0x60CC,0x60E2,
-	0x60CE,0x60C4,0x6114,0x60F2,0x610A,0x6116,0x6105,0x60F5,
-	0x6113,0x60F8,0x60FC,0x60FE,0x60C1,0x6103,0x6118,0x611D,
-	0x6110,0x60FF,0x6104,0x610B,0x624A,0x6394,0x63B1,0x63B0,
-	0x63CE,0x63E5,0x63E8,0x63EF,0x63C3,0x649D,0x63F3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 61, Array index 0x1C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x63CA,0x63E0,0x63F6,0x63D5,0x63F2,0x63F5,0x6461,
-	0x63DF,0x63BE,0x63DD,0x63DC,0x63C4,0x63D8,0x63D3,0x63C2,
-	0x63C7,0x63CC,0x63CB,0x63C8,0x63F0,0x63D7,0x63D9,0x6532,
-	0x6567,0x656A,0x6564,0x655C,0x6568,0x6565,0x658C,0x659D,
-	0x659E,0x65AE,0x65D0,0x65D2,0x667C,0x666C,0x667B,0x6680,
-	0x6671,0x6679,0x666A,0x6672,0x6701,0x690C,0x68D3,0x6904,
-	0x68DC,0x692A,0x68EC,0x68EA,0x68F1,0x690F,0x68D6,0x68F7,
-	0x68EB,0x68E4,0x68F6,0x6913,0x6910,0x68F3,0x68E1,0x6907,
-	0x68CC,0x6908,0x6970,0x68B4,0x6911,0x68EF,0x68C6,0x6914,
-	0x68F8,0x68D0,0x68FD,0x68FC,0x68E8,0x690B,0x690A,0x6917,
-	0x68CE,0x68C8,0x68DD,0x68DE,0x68E6,0x68F4,0x68D1,0x6906,
-	0x68D4,0x68E9,0x6915,0x6925,0x68C7,0x6B39,0x6B3B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 62, Array index 0x1D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B3F,0x6B3C,0x6B94,0x6B97,0x6B99,0x6B95,0x6BBD,
-	0x6BF0,0x6BF2,0x6BF3,0x6C30,0x6DFC,0x6E46,0x6E47,0x6E1F,
-	0x6E49,0x6E88,0x6E3C,0x6E3D,0x6E45,0x6E62,0x6E2B,0x6E3F,
-	0x6E41,0x6E5D,0x6E73,0x6E1C,0x6E33,0x6E4B,0x6E40,0x6E51,
-	0x6E3B,0x6E03,0x6E2E,0x6E5E,0x6E68,0x6E5C,0x6E61,0x6E31,
-	0x6E28,0x6E60,0x6E71,0x6E6B,0x6E39,0x6E22,0x6E30,0x6E53,
-	0x6E65,0x6E27,0x6E78,0x6E64,0x6E77,0x6E55,0x6E79,0x6E52,
-	0x6E66,0x6E35,0x6E36,0x6E5A,0x7120,0x711E,0x712F,0x70FB,
-	0x712E,0x7131,0x7123,0x7125,0x7122,0x7132,0x711F,0x7128,
-	0x713A,0x711B,0x724B,0x725A,0x7288,0x7289,0x7286,0x7285,
-	0x728B,0x7312,0x730B,0x7330,0x7322,0x7331,0x7333,0x7327,
-	0x7332,0x732D,0x7326,0x7323,0x7335,0x730C,0x742E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 63, Array index 0x1E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x742C,0x7430,0x742B,0x7416,0x741A,0x7421,0x742D,
-	0x7431,0x7424,0x7423,0x741D,0x7429,0x7420,0x7432,0x74FB,
-	0x752F,0x756F,0x756C,0x75E7,0x75DA,0x75E1,0x75E6,0x75DD,
-	0x75DF,0x75E4,0x75D7,0x7695,0x7692,0x76DA,0x7746,0x7747,
-	0x7744,0x774D,0x7745,0x774A,0x774E,0x774B,0x774C,0x77DE,
-	0x77EC,0x7860,0x7864,0x7865,0x785C,0x786D,0x7871,0x786A,
-	0x786E,0x7870,0x7869,0x7868,0x785E,0x7862,0x7974,0x7973,
-	0x7972,0x7970,0x7A02,0x7A0A,0x7A03,0x7A0C,0x7A04,0x7A99,
-	0x7AE6,0x7AE4,0x7B4A,0x7B47,0x7B44,0x7B48,0x7B4C,0x7B4E,
-	0x7B40,0x7B58,0x7B45,0x7CA2,0x7C9E,0x7CA8,0x7CA1,0x7D58,
-	0x7D6F,0x7D63,0x7D53,0x7D56,0x7D67,0x7D6A,0x7D4F,0x7D6D,
-	0x7D5C,0x7D6B,0x7D52,0x7D54,0x7D69,0x7D51,0x7D5F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 64, Array index 0x1F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7D4E,0x7F3E,0x7F3F,0x7F65,0x7F66,0x7FA2,0x7FA0,
-	0x7FA1,0x7FD7,0x8051,0x804F,0x8050,0x80FE,0x80D4,0x8143,
-	0x814A,0x8152,0x814F,0x8147,0x813D,0x814D,0x813A,0x81E6,
-	0x81EE,0x81F7,0x81F8,0x81F9,0x8204,0x823C,0x823D,0x823F,
-	0x8275,0x833B,0x83CF,0x83F9,0x8423,0x83C0,0x83E8,0x8412,
-	0x83E7,0x83E4,0x83FC,0x83F6,0x8410,0x83C6,0x83C8,0x83EB,
-	0x83E3,0x83BF,0x8401,0x83DD,0x83E5,0x83D8,0x83FF,0x83E1,
-	0x83CB,0x83CE,0x83D6,0x83F5,0x83C9,0x8409,0x840F,0x83DE,
-	0x8411,0x8406,0x83C2,0x83F3,0x83D5,0x83FA,0x83C7,0x83D1,
-	0x83EA,0x8413,0x839A,0x83C3,0x83EC,0x83EE,0x83C4,0x83FB,
-	0x83D7,0x83E2,0x841B,0x83DB,0x83FE,0x86D8,0x86E2,0x86E6,
-	0x86D3,0x86E3,0x86DA,0x86EA,0x86DD,0x86EB,0x86DC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 65, Array index 0x2000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x86EC,0x86E9,0x86D7,0x86E8,0x86D1,0x8848,0x8856,
-	0x8855,0x88BA,0x88D7,0x88B9,0x88B8,0x88C0,0x88BE,0x88B6,
-	0x88BC,0x88B7,0x88BD,0x88B2,0x8901,0x88C9,0x8995,0x8998,
-	0x8997,0x89DD,0x89DA,0x89DB,0x8A4E,0x8A4D,0x8A39,0x8A59,
-	0x8A40,0x8A57,0x8A58,0x8A44,0x8A45,0x8A52,0x8A48,0x8A51,
-	0x8A4A,0x8A4C,0x8A4F,0x8C5F,0x8C81,0x8C80,0x8CBA,0x8CBE,
-	0x8CB0,0x8CB9,0x8CB5,0x8D84,0x8D80,0x8D89,0x8DD8,0x8DD3,
-	0x8DCD,0x8DC7,0x8DD6,0x8DDC,0x8DCF,0x8DD5,0x8DD9,0x8DC8,
-	0x8DD7,0x8DC5,0x8EEF,0x8EF7,0x8EFA,0x8EF9,0x8EE6,0x8EEE,
-	0x8EE5,0x8EF5,0x8EE7,0x8EE8,0x8EF6,0x8EEB,0x8EF1,0x8EEC,
-	0x8EF4,0x8EE9,0x902D,0x9034,0x902F,0x9106,0x912C,0x9104,
-	0x90FF,0x90FC,0x9108,0x90F9,0x90FB,0x9101,0x9100,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 66, Array index 0x2100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9107,0x9105,0x9103,0x9161,0x9164,0x915F,0x9162,
-	0x9160,0x9201,0x920A,0x9225,0x9203,0x921A,0x9226,0x920F,
-	0x920C,0x9200,0x9212,0x91FF,0x91FD,0x9206,0x9204,0x9227,
-	0x9202,0x921C,0x9224,0x9219,0x9217,0x9205,0x9216,0x957B,
-	0x958D,0x958C,0x9590,0x9687,0x967E,0x9688,0x9689,0x9683,
-	0x9680,0x96C2,0x96C8,0x96C3,0x96F1,0x96F0,0x976C,0x9770,
-	0x976E,0x9807,0x98A9,0x98EB,0x9CE6,0x9EF9,0x4E83,0x4E84,
-	0x4EB6,0x50BD,0x50BF,0x50C6,0x50AE,0x50C4,0x50CA,0x50B4,
-	0x50C8,0x50C2,0x50B0,0x50C1,0x50BA,0x50B1,0x50CB,0x50C9,
-	0x50B6,0x50B8,0x51D7,0x527A,0x5278,0x527B,0x527C,0x55C3,
-	0x55DB,0x55CC,0x55D0,0x55CB,0x55CA,0x55DD,0x55C0,0x55D4,
-	0x55C4,0x55E9,0x55BF,0x55D2,0x558D,0x55CF,0x55D5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 67, Array index 0x2200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x55E2,0x55D6,0x55C8,0x55F2,0x55CD,0x55D9,0x55C2,
-	0x5714,0x5853,0x5868,0x5864,0x584F,0x584D,0x5849,0x586F,
-	0x5855,0x584E,0x585D,0x5859,0x5865,0x585B,0x583D,0x5863,
-	0x5871,0x58FC,0x5AC7,0x5AC4,0x5ACB,0x5ABA,0x5AB8,0x5AB1,
-	0x5AB5,0x5AB0,0x5ABF,0x5AC8,0x5ABB,0x5AC6,0x5AB7,0x5AC0,
-	0x5ACA,0x5AB4,0x5AB6,0x5ACD,0x5AB9,0x5A90,0x5BD6,0x5BD8,
-	0x5BD9,0x5C1F,0x5C33,0x5D71,0x5D63,0x5D4A,0x5D65,0x5D72,
-	0x5D6C,0x5D5E,0x5D68,0x5D67,0x5D62,0x5DF0,0x5E4F,0x5E4E,
-	0x5E4A,0x5E4D,0x5E4B,0x5EC5,0x5ECC,0x5EC6,0x5ECB,0x5EC7,
-	0x5F40,0x5FAF,0x5FAD,0x60F7,0x6149,0x614A,0x612B,0x6145,
-	0x6136,0x6132,0x612E,0x6146,0x612F,0x614F,0x6129,0x6140,
-	0x6220,0x9168,0x6223,0x6225,0x6224,0x63C5,0x63F1,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 68, Array index 0x2300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x63EB,0x6410,0x6412,0x6409,0x6420,0x6424,0x6433,
-	0x6443,0x641F,0x6415,0x6418,0x6439,0x6437,0x6422,0x6423,
-	0x640C,0x6426,0x6430,0x6428,0x6441,0x6435,0x642F,0x640A,
-	0x641A,0x6440,0x6425,0x6427,0x640B,0x63E7,0x641B,0x642E,
-	0x6421,0x640E,0x656F,0x6592,0x65D3,0x6686,0x668C,0x6695,
-	0x6690,0x668B,0x668A,0x6699,0x6694,0x6678,0x6720,0x6966,
-	0x695F,0x6938,0x694E,0x6962,0x6971,0x693F,0x6945,0x696A,
-	0x6939,0x6942,0x6957,0x6959,0x697A,0x6948,0x6949,0x6935,
-	0x696C,0x6933,0x693D,0x6965,0x68F0,0x6978,0x6934,0x6969,
-	0x6940,0x696F,0x6944,0x6976,0x6958,0x6941,0x6974,0x694C,
-	0x693B,0x694B,0x6937,0x695C,0x694F,0x6951,0x6932,0x6952,
-	0x692F,0x697B,0x693C,0x6B46,0x6B45,0x6B43,0x6B42,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 69, Array index 0x2400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B48,0x6B41,0x6B9B,0x6BFB,0x6BFC,0x6BF9,0x6BF7,
-	0x6BF8,0x6E9B,0x6ED6,0x6EC8,0x6E8F,0x6EC0,0x6E9F,0x6E93,
-	0x6E94,0x6EA0,0x6EB1,0x6EB9,0x6EC6,0x6ED2,0x6EBD,0x6EC1,
-	0x6E9E,0x6EC9,0x6EB7,0x6EB0,0x6ECD,0x6EA6,0x6ECF,0x6EB2,
-	0x6EBE,0x6EC3,0x6EDC,0x6ED8,0x6E99,0x6E92,0x6E8E,0x6E8D,
-	0x6EA4,0x6EA1,0x6EBF,0x6EB3,0x6ED0,0x6ECA,0x6E97,0x6EAE,
-	0x6EA3,0x7147,0x7154,0x7152,0x7163,0x7160,0x7141,0x715D,
-	0x7162,0x7172,0x7178,0x716A,0x7161,0x7142,0x7158,0x7143,
-	0x714B,0x7170,0x715F,0x7150,0x7153,0x7144,0x714D,0x715A,
-	0x724F,0x728D,0x728C,0x7291,0x7290,0x728E,0x733C,0x7342,
-	0x733B,0x733A,0x7340,0x734A,0x7349,0x7444,0x744A,0x744B,
-	0x7452,0x7451,0x7457,0x7440,0x744F,0x7450,0x744E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 70, Array index 0x2500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7442,0x7446,0x744D,0x7454,0x74E1,0x74FF,0x74FE,
-	0x74FD,0x751D,0x7579,0x7577,0x6983,0x75EF,0x760F,0x7603,
-	0x75F7,0x75FE,0x75FC,0x75F9,0x75F8,0x7610,0x75FB,0x75F6,
-	0x75ED,0x75F5,0x75FD,0x7699,0x76B5,0x76DD,0x7755,0x775F,
-	0x7760,0x7752,0x7756,0x775A,0x7769,0x7767,0x7754,0x7759,
-	0x776D,0x77E0,0x7887,0x789A,0x7894,0x788F,0x7884,0x7895,
-	0x7885,0x7886,0x78A1,0x7883,0x7879,0x7899,0x7880,0x7896,
-	0x787B,0x797C,0x7982,0x797D,0x7979,0x7A11,0x7A18,0x7A19,
-	0x7A12,0x7A17,0x7A15,0x7A22,0x7A13,0x7A1B,0x7A10,0x7AA3,
-	0x7AA2,0x7A9E,0x7AEB,0x7B66,0x7B64,0x7B6D,0x7B74,0x7B69,
-	0x7B72,0x7B65,0x7B73,0x7B71,0x7B70,0x7B61,0x7B78,0x7B76,
-	0x7B63,0x7CB2,0x7CB4,0x7CAF,0x7D88,0x7D86,0x7D80,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 71, Array index 0x2600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7D8D,0x7D7F,0x7D85,0x7D7A,0x7D8E,0x7D7B,0x7D83,
-	0x7D7C,0x7D8C,0x7D94,0x7D84,0x7D7D,0x7D92,0x7F6D,0x7F6B,
-	0x7F67,0x7F68,0x7F6C,0x7FA6,0x7FA5,0x7FA7,0x7FDB,0x7FDC,
-	0x8021,0x8164,0x8160,0x8177,0x815C,0x8169,0x815B,0x8162,
-	0x8172,0x6721,0x815E,0x8176,0x8167,0x816F,0x8144,0x8161,
-	0x821D,0x8249,0x8244,0x8240,0x8242,0x8245,0x84F1,0x843F,
-	0x8456,0x8476,0x8479,0x848F,0x848D,0x8465,0x8451,0x8440,
-	0x8486,0x8467,0x8430,0x844D,0x847D,0x845A,0x8459,0x8474,
-	0x8473,0x845D,0x8507,0x845E,0x8437,0x843A,0x8434,0x847A,
-	0x8443,0x8478,0x8432,0x8445,0x8429,0x83D9,0x844B,0x842F,
-	0x8442,0x842D,0x845F,0x8470,0x8439,0x844E,0x844C,0x8452,
-	0x846F,0x84C5,0x848E,0x843B,0x8447,0x8436,0x8433,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 72, Array index 0x2700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8468,0x847E,0x8444,0x842B,0x8460,0x8454,0x846E,
-	0x8450,0x870B,0x8704,0x86F7,0x870C,0x86FA,0x86D6,0x86F5,
-	0x874D,0x86F8,0x870E,0x8709,0x8701,0x86F6,0x870D,0x8705,
-	0x88D6,0x88CB,0x88CD,0x88CE,0x88DE,0x88DB,0x88DA,0x88CC,
-	0x88D0,0x8985,0x899B,0x89DF,0x89E5,0x89E4,0x89E1,0x89E0,
-	0x89E2,0x89DC,0x89E6,0x8A76,0x8A86,0x8A7F,0x8A61,0x8A3F,
-	0x8A77,0x8A82,0x8A84,0x8A75,0x8A83,0x8A81,0x8A74,0x8A7A,
-	0x8C3C,0x8C4B,0x8C4A,0x8C65,0x8C64,0x8C66,0x8C86,0x8C84,
-	0x8C85,0x8CCC,0x8D68,0x8D69,0x8D91,0x8D8C,0x8D8E,0x8D8F,
-	0x8D8D,0x8D93,0x8D94,0x8D90,0x8D92,0x8DF0,0x8DE0,0x8DEC,
-	0x8DF1,0x8DEE,0x8DD0,0x8DE9,0x8DE3,0x8DE2,0x8DE7,0x8DF2,
-	0x8DEB,0x8DF4,0x8F06,0x8EFF,0x8F01,0x8F00,0x8F05,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 73, Array index 0x2800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8F07,0x8F08,0x8F02,0x8F0B,0x9052,0x903F,0x9044,
-	0x9049,0x903D,0x9110,0x910D,0x910F,0x9111,0x9116,0x9114,
-	0x910B,0x910E,0x916E,0x916F,0x9248,0x9252,0x9230,0x923A,
-	0x9266,0x9233,0x9265,0x925E,0x9283,0x922E,0x924A,0x9246,
-	0x926D,0x926C,0x924F,0x9260,0x9267,0x926F,0x9236,0x9261,
-	0x9270,0x9231,0x9254,0x9263,0x9250,0x9272,0x924E,0x9253,
-	0x924C,0x9256,0x9232,0x959F,0x959C,0x959E,0x959B,0x9692,
-	0x9693,0x9691,0x9697,0x96CE,0x96FA,0x96FD,0x96F8,0x96F5,
-	0x9773,0x9777,0x9778,0x9772,0x980F,0x980D,0x980E,0x98AC,
-	0x98F6,0x98F9,0x99AF,0x99B2,0x99B0,0x99B5,0x9AAD,0x9AAB,
-	0x9B5B,0x9CEA,0x9CED,0x9CE7,0x9E80,0x9EFD,0x50E6,0x50D4,
-	0x50D7,0x50E8,0x50F3,0x50DB,0x50EA,0x50DD,0x50E4,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 74, Array index 0x2900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x50D3,0x50EC,0x50F0,0x50EF,0x50E3,0x50E0,0x51D8,
-	0x5280,0x5281,0x52E9,0x52EB,0x5330,0x53AC,0x5627,0x5615,
-	0x560C,0x5612,0x55FC,0x560F,0x561C,0x5601,0x5613,0x5602,
-	0x55FA,0x561D,0x5604,0x55FF,0x55F9,0x5889,0x587C,0x5890,
-	0x5898,0x5886,0x5881,0x587F,0x5874,0x588B,0x587A,0x5887,
-	0x5891,0x588E,0x5876,0x5882,0x5888,0x587B,0x5894,0x588F,
-	0x58FE,0x596B,0x5ADC,0x5AEE,0x5AE5,0x5AD5,0x5AEA,0x5ADA,
-	0x5AED,0x5AEB,0x5AF3,0x5AE2,0x5AE0,0x5ADB,0x5AEC,0x5ADE,
-	0x5ADD,0x5AD9,0x5AE8,0x5ADF,0x5B77,0x5BE0,0x5BE3,0x5C63,
-	0x5D82,0x5D80,0x5D7D,0x5D86,0x5D7A,0x5D81,0x5D77,0x5D8A,
-	0x5D89,0x5D88,0x5D7E,0x5D7C,0x5D8D,0x5D79,0x5D7F,0x5E58,
-	0x5E59,0x5E53,0x5ED8,0x5ED1,0x5ED7,0x5ECE,0x5EDC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 75, Array index 0x2A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5ED5,0x5ED9,0x5ED2,0x5ED4,0x5F44,0x5F43,0x5F6F,
-	0x5FB6,0x612C,0x6128,0x6141,0x615E,0x6171,0x6173,0x6152,
-	0x6153,0x6172,0x616C,0x6180,0x6174,0x6154,0x617A,0x615B,
-	0x6165,0x613B,0x616A,0x6161,0x6156,0x6229,0x6227,0x622B,
-	0x642B,0x644D,0x645B,0x645D,0x6474,0x6476,0x6472,0x6473,
-	0x647D,0x6475,0x6466,0x64A6,0x644E,0x6482,0x645E,0x645C,
-	0x644B,0x6453,0x6460,0x6450,0x647F,0x643F,0x646C,0x646B,
-	0x6459,0x6465,0x6477,0x6573,0x65A0,0x66A1,0x66A0,0x669F,
-	0x6705,0x6704,0x6722,0x69B1,0x69B6,0x69C9,0x69A0,0x69CE,
-	0x6996,0x69B0,0x69AC,0x69BC,0x6991,0x6999,0x698E,0x69A7,
-	0x698D,0x69A9,0x69BE,0x69AF,0x69BF,0x69C4,0x69BD,0x69A4,
-	0x69D4,0x69B9,0x69CA,0x699A,0x69CF,0x69B3,0x6993,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 76, Array index 0x2B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x69AA,0x69A1,0x699E,0x69D9,0x6997,0x6990,0x69C2,
-	0x69B5,0x69A5,0x69C6,0x6B4A,0x6B4D,0x6B4B,0x6B9E,0x6B9F,
-	0x6BA0,0x6BC3,0x6BC4,0x6BFE,0x6ECE,0x6EF5,0x6EF1,0x6F03,
-	0x6F25,0x6EF8,0x6F37,0x6EFB,0x6F2E,0x6F09,0x6F4E,0x6F19,
-	0x6F1A,0x6F27,0x6F18,0x6F3B,0x6F12,0x6EED,0x6F0A,0x6F36,
-	0x6F73,0x6EF9,0x6EEE,0x6F2D,0x6F40,0x6F30,0x6F3C,0x6F35,
-	0x6EEB,0x6F07,0x6F0E,0x6F43,0x6F05,0x6EFD,0x6EF6,0x6F39,
-	0x6F1C,0x6EFC,0x6F3A,0x6F1F,0x6F0D,0x6F1E,0x6F08,0x6F21,
-	0x7187,0x7190,0x7189,0x7180,0x7185,0x7182,0x718F,0x717B,
-	0x7186,0x7181,0x7197,0x7244,0x7253,0x7297,0x7295,0x7293,
-	0x7343,0x734D,0x7351,0x734C,0x7462,0x7473,0x7471,0x7475,
-	0x7472,0x7467,0x746E,0x7500,0x7502,0x7503,0x757D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 77, Array index 0x2C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7590,0x7616,0x7608,0x760C,0x7615,0x7611,0x760A,
-	0x7614,0x76B8,0x7781,0x777C,0x7785,0x7782,0x776E,0x7780,
-	0x776F,0x777E,0x7783,0x78B2,0x78AA,0x78B4,0x78AD,0x78A8,
-	0x787E,0x78AB,0x789E,0x78A5,0x78A0,0x78AC,0x78A2,0x78A4,
-	0x7998,0x798A,0x798B,0x7996,0x7995,0x7994,0x7993,0x7997,
-	0x7988,0x7992,0x7990,0x7A2B,0x7A4A,0x7A30,0x7A2F,0x7A28,
-	0x7A26,0x7AA8,0x7AAB,0x7AAC,0x7AEE,0x7B88,0x7B9C,0x7B8A,
-	0x7B91,0x7B90,0x7B96,0x7B8D,0x7B8C,0x7B9B,0x7B8E,0x7B85,
-	0x7B98,0x5284,0x7B99,0x7BA4,0x7B82,0x7CBB,0x7CBF,0x7CBC,
-	0x7CBA,0x7DA7,0x7DB7,0x7DC2,0x7DA3,0x7DAA,0x7DC1,0x7DC0,
-	0x7DC5,0x7D9D,0x7DCE,0x7DC4,0x7DC6,0x7DCB,0x7DCC,0x7DAF,
-	0x7DB9,0x7D96,0x7DBC,0x7D9F,0x7DA6,0x7DAE,0x7DA9,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 78, Array index 0x2D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7DA1,0x7DC9,0x7F73,0x7FE2,0x7FE3,0x7FE5,0x7FDE,
-	0x8024,0x805D,0x805C,0x8189,0x8186,0x8183,0x8187,0x818D,
-	0x818C,0x818B,0x8215,0x8497,0x84A4,0x84A1,0x849F,0x84BA,
-	0x84CE,0x84C2,0x84AC,0x84AE,0x84AB,0x84B9,0x84B4,0x84C1,
-	0x84CD,0x84AA,0x849A,0x84B1,0x84D0,0x849D,0x84A7,0x84BB,
-	0x84A2,0x8494,0x84C7,0x84CC,0x849B,0x84A9,0x84AF,0x84A8,
-	0x84D6,0x8498,0x84B6,0x84CF,0x84A0,0x84D7,0x84D4,0x84D2,
-	0x84DB,0x84B0,0x8491,0x8661,0x8733,0x8723,0x8728,0x876B,
-	0x8740,0x872E,0x871E,0x8721,0x8719,0x871B,0x8743,0x872C,
-	0x8741,0x873E,0x8746,0x8720,0x8732,0x872A,0x872D,0x873C,
-	0x8712,0x873A,0x8731,0x8735,0x8742,0x8726,0x8727,0x8738,
-	0x8724,0x871A,0x8730,0x8711,0x88F7,0x88E7,0x88F1,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 79, Array index 0x2E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x88F2,0x88FA,0x88FE,0x88EE,0x88FC,0x88F6,0x88FB,
-	0x88F0,0x88EC,0x88EB,0x899D,0x89A1,0x899F,0x899E,0x89E9,
-	0x89EB,0x89E8,0x8AAB,0x8A99,0x8A8B,0x8A92,0x8A8F,0x8A96,
-	0x8C3D,0x8C68,0x8C69,0x8CD5,0x8CCF,0x8CD7,0x8D96,0x8E09,
-	0x8E02,0x8DFF,0x8E0D,0x8DFD,0x8E0A,0x8E03,0x8E07,0x8E06,
-	0x8E05,0x8DFE,0x8E00,0x8E04,0x8F10,0x8F11,0x8F0E,0x8F0D,
-	0x9123,0x911C,0x9120,0x9122,0x911F,0x911D,0x911A,0x9124,
-	0x9121,0x911B,0x917A,0x9172,0x9179,0x9173,0x92A5,0x92A4,
-	0x9276,0x929B,0x927A,0x92A0,0x9294,0x92AA,0x928D,0x92A6,
-	0x929A,0x92AB,0x9279,0x9297,0x927F,0x92A3,0x92EE,0x928E,
-	0x9282,0x9295,0x92A2,0x927D,0x9288,0x92A1,0x928A,0x9286,
-	0x928C,0x9299,0x92A7,0x927E,0x9287,0x92A9,0x929D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 80, Array index 0x2F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x928B,0x922D,0x969E,0x96A1,0x96FF,0x9758,0x977D,
-	0x977A,0x977E,0x9783,0x9780,0x9782,0x977B,0x9784,0x9781,
-	0x977F,0x97CE,0x97CD,0x9816,0x98AD,0x98AE,0x9902,0x9900,
-	0x9907,0x999D,0x999C,0x99C3,0x99B9,0x99BB,0x99BA,0x99C2,
-	0x99BD,0x99C7,0x9AB1,0x9AE3,0x9AE7,0x9B3E,0x9B3F,0x9B60,
-	0x9B61,0x9B5F,0x9CF1,0x9CF2,0x9CF5,0x9EA7,0x50FF,0x5103,
-	0x5130,0x50F8,0x5106,0x5107,0x50F6,0x50FE,0x510B,0x510C,
-	0x50FD,0x510A,0x528B,0x528C,0x52F1,0x52EF,0x5648,0x5642,
-	0x564C,0x5635,0x5641,0x564A,0x5649,0x5646,0x5658,0x565A,
-	0x5640,0x5633,0x563D,0x562C,0x563E,0x5638,0x562A,0x563A,
-	0x571A,0x58AB,0x589D,0x58B1,0x58A0,0x58A3,0x58AF,0x58AC,
-	0x58A5,0x58A1,0x58FF,0x5AFF,0x5AF4,0x5AFD,0x5AF7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 81, Array index 0x3000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5AF6,0x5B03,0x5AF8,0x5B02,0x5AF9,0x5B01,0x5B07,
-	0x5B05,0x5B0F,0x5C67,0x5D99,0x5D97,0x5D9F,0x5D92,0x5DA2,
-	0x5D93,0x5D95,0x5DA0,0x5D9C,0x5DA1,0x5D9A,0x5D9E,0x5E69,
-	0x5E5D,0x5E60,0x5E5C,0x7DF3,0x5EDB,0x5EDE,0x5EE1,0x5F49,
-	0x5FB2,0x618B,0x6183,0x6179,0x61B1,0x61B0,0x61A2,0x6189,
-	0x619B,0x6193,0x61AF,0x61AD,0x619F,0x6192,0x61AA,0x61A1,
-	0x618D,0x6166,0x61B3,0x622D,0x646E,0x6470,0x6496,0x64A0,
-	0x6485,0x6497,0x649C,0x648F,0x648B,0x648A,0x648C,0x64A3,
-	0x649F,0x6468,0x64B1,0x6498,0x6576,0x657A,0x6579,0x657B,
-	0x65B2,0x65B3,0x66B5,0x66B0,0x66A9,0x66B2,0x66B7,0x66AA,
-	0x66AF,0x6A00,0x6A06,0x6A17,0x69E5,0x69F8,0x6A15,0x69F1,
-	0x69E4,0x6A20,0x69FF,0x69EC,0x69E2,0x6A1B,0x6A1D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 82, Array index 0x3100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x69FE,0x6A27,0x69F2,0x69EE,0x6A14,0x69F7,0x69E7,
-	0x6A40,0x6A08,0x69E6,0x69FB,0x6A0D,0x69FC,0x69EB,0x6A09,
-	0x6A04,0x6A18,0x6A25,0x6A0F,0x69F6,0x6A26,0x6A07,0x69F4,
-	0x6A16,0x6B51,0x6BA5,0x6BA3,0x6BA2,0x6BA6,0x6C01,0x6C00,
-	0x6BFF,0x6C02,0x6F41,0x6F26,0x6F7E,0x6F87,0x6FC6,0x6F92,
-	0x6F8D,0x6F89,0x6F8C,0x6F62,0x6F4F,0x6F85,0x6F5A,0x6F96,
-	0x6F76,0x6F6C,0x6F82,0x6F55,0x6F72,0x6F52,0x6F50,0x6F57,
-	0x6F94,0x6F93,0x6F5D,0x6F00,0x6F61,0x6F6B,0x6F7D,0x6F67,
-	0x6F90,0x6F53,0x6F8B,0x6F69,0x6F7F,0x6F95,0x6F63,0x6F77,
-	0x6F6A,0x6F7B,0x71B2,0x71AF,0x719B,0x71B0,0x71A0,0x719A,
-	0x71A9,0x71B5,0x719D,0x71A5,0x719E,0x71A4,0x71A1,0x71AA,
-	0x719C,0x71A7,0x71B3,0x7298,0x729A,0x7358,0x7352,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 83, Array index 0x3200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x735E,0x735F,0x7360,0x735D,0x735B,0x7361,0x735A,
-	0x7359,0x7362,0x7487,0x7489,0x748A,0x7486,0x7481,0x747D,
-	0x7485,0x7488,0x747C,0x7479,0x7508,0x7507,0x757E,0x7625,
-	0x761E,0x7619,0x761D,0x761C,0x7623,0x761A,0x7628,0x761B,
-	0x769C,0x769D,0x769E,0x769B,0x778D,0x778F,0x7789,0x7788,
-	0x78CD,0x78BB,0x78CF,0x78CC,0x78D1,0x78CE,0x78D4,0x78C8,
-	0x78C3,0x78C4,0x78C9,0x799A,0x79A1,0x79A0,0x799C,0x79A2,
-	0x799B,0x6B76,0x7A39,0x7AB2,0x7AB4,0x7AB3,0x7BB7,0x7BCB,
-	0x7BBE,0x7BAC,0x7BCE,0x7BAF,0x7BB9,0x7BCA,0x7BB5,0x7CC5,
-	0x7CC8,0x7CCC,0x7CCB,0x7DF7,0x7DDB,0x7DEA,0x7DE7,0x7DD7,
-	0x7DE1,0x7E03,0x7DFA,0x7DE6,0x7DF6,0x7DF1,0x7DF0,0x7DEE,
-	0x7DDF,0x7F76,0x7FAC,0x7FB0,0x7FAD,0x7FED,0x7FEB,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 84, Array index 0x3300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7FEA,0x7FEC,0x7FE6,0x7FE8,0x8064,0x8067,0x81A3,
-	0x819F,0x819E,0x8195,0x81A2,0x8199,0x8197,0x8216,0x824F,
-	0x8253,0x8252,0x8250,0x824E,0x8251,0x8524,0x853B,0x850F,
-	0x8500,0x8529,0x850E,0x8509,0x850D,0x851F,0x850A,0x8527,
-	0x851C,0x84FB,0x852B,0x84FA,0x8508,0x850C,0x84F4,0x852A,
-	0x84F2,0x8515,0x84F7,0x84EB,0x84F3,0x84FC,0x8512,0x84EA,
-	0x84E9,0x8516,0x84FE,0x8528,0x851D,0x852E,0x8502,0x84FD,
-	0x851E,0x84F6,0x8531,0x8526,0x84E7,0x84E8,0x84F0,0x84EF,
-	0x84F9,0x8518,0x8520,0x8530,0x850B,0x8519,0x852F,0x8662,
-	0x8756,0x8763,0x8764,0x8777,0x87E1,0x8773,0x8758,0x8754,
-	0x875B,0x8752,0x8761,0x875A,0x8751,0x875E,0x876D,0x876A,
-	0x8750,0x874E,0x875F,0x875D,0x876F,0x876C,0x877A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 85, Array index 0x3400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x876E,0x875C,0x8765,0x874F,0x877B,0x8775,0x8762,
-	0x8767,0x8769,0x885A,0x8905,0x890C,0x8914,0x890B,0x8917,
-	0x8918,0x8919,0x8906,0x8916,0x8911,0x890E,0x8909,0x89A2,
-	0x89A4,0x89A3,0x89ED,0x89F0,0x89EC,0x8ACF,0x8AC6,0x8AB8,
-	0x8AD3,0x8AD1,0x8AD4,0x8AD5,0x8ABB,0x8AD7,0x8ABE,0x8AC0,
-	0x8AC5,0x8AD8,0x8AC3,0x8ABA,0x8ABD,0x8AD9,0x8C3E,0x8C4D,
-	0x8C8F,0x8CE5,0x8CDF,0x8CD9,0x8CE8,0x8CDA,0x8CDD,0x8CE7,
-	0x8DA0,0x8D9C,0x8DA1,0x8D9B,0x8E20,0x8E23,0x8E25,0x8E24,
-	0x8E2E,0x8E15,0x8E1B,0x8E16,0x8E11,0x8E19,0x8E26,0x8E27,
-	0x8E14,0x8E12,0x8E18,0x8E13,0x8E1C,0x8E17,0x8E1A,0x8F2C,
-	0x8F24,0x8F18,0x8F1A,0x8F20,0x8F23,0x8F16,0x8F17,0x9073,
-	0x9070,0x906F,0x9067,0x906B,0x912F,0x912B,0x9129,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 86, Array index 0x3500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x912A,0x9132,0x9126,0x912E,0x9185,0x9186,0x918A,
-	0x9181,0x9182,0x9184,0x9180,0x92D0,0x92C3,0x92C4,0x92C0,
-	0x92D9,0x92B6,0x92CF,0x92F1,0x92DF,0x92D8,0x92E9,0x92D7,
-	0x92DD,0x92CC,0x92EF,0x92C2,0x92E8,0x92CA,0x92C8,0x92CE,
-	0x92E6,0x92CD,0x92D5,0x92C9,0x92E0,0x92DE,0x92E7,0x92D1,
-	0x92D3,0x92B5,0x92E1,0x9325,0x92C6,0x92B4,0x957C,0x95AC,
-	0x95AB,0x95AE,0x95B0,0x96A4,0x96A2,0x96D3,0x9705,0x9708,
-	0x9702,0x975A,0x978A,0x978E,0x9788,0x97D0,0x97CF,0x981E,
-	0x981D,0x9826,0x9829,0x9828,0x9820,0x981B,0x9827,0x98B2,
-	0x9908,0x98FA,0x9911,0x9914,0x9916,0x9917,0x9915,0x99DC,
-	0x99CD,0x99CF,0x99D3,0x99D4,0x99CE,0x99C9,0x99D6,0x99D8,
-	0x99CB,0x99D7,0x99CC,0x9AB3,0x9AEC,0x9AEB,0x9AF3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 87, Array index 0x3600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9AF2,0x9AF1,0x9B46,0x9B43,0x9B67,0x9B74,0x9B71,
-	0x9B66,0x9B76,0x9B75,0x9B70,0x9B68,0x9B64,0x9B6C,0x9CFC,
-	0x9CFA,0x9CFD,0x9CFF,0x9CF7,0x9D07,0x9D00,0x9CF9,0x9CFB,
-	0x9D08,0x9D05,0x9D04,0x9E83,0x9ED3,0x9F0F,0x9F10,0x511C,
-	0x5113,0x5117,0x511A,0x5111,0x51DE,0x5334,0x53E1,0x5670,
-	0x5660,0x566E,0x5673,0x5666,0x5663,0x566D,0x5672,0x565E,
-	0x5677,0x571C,0x571B,0x58C8,0x58BD,0x58C9,0x58BF,0x58BA,
-	0x58C2,0x58BC,0x58C6,0x5B17,0x5B19,0x5B1B,0x5B21,0x5B14,
-	0x5B13,0x5B10,0x5B16,0x5B28,0x5B1A,0x5B20,0x5B1E,0x5BEF,
-	0x5DAC,0x5DB1,0x5DA9,0x5DA7,0x5DB5,0x5DB0,0x5DAE,0x5DAA,
-	0x5DA8,0x5DB2,0x5DAD,0x5DAF,0x5DB4,0x5E67,0x5E68,0x5E66,
-	0x5E6F,0x5EE9,0x5EE7,0x5EE6,0x5EE8,0x5EE5,0x5F4B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 88, Array index 0x3700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5FBC,0x5FBB,0x619D,0x61A8,0x6196,0x61C5,0x61B4,
-	0x61C6,0x61C1,0x61CC,0x61BA,0x61BF,0x61B8,0x618C,0x64D7,
-	0x64D6,0x64D0,0x64CF,0x64C9,0x64BD,0x6489,0x64C3,0x64DB,
-	0x64F3,0x64D9,0x6533,0x657F,0x657C,0x65A2,0x66C8,0x66BE,
-	0x66C0,0x66CA,0x66CB,0x66CF,0x66BD,0x66BB,0x66BA,0x66CC,
-	0x6723,0x6A34,0x6A66,0x6A49,0x6A67,0x6A32,0x6A68,0x6A3E,
-	0x6A5D,0x6A6D,0x6A76,0x6A5B,0x6A51,0x6A28,0x6A5A,0x6A3B,
-	0x6A3F,0x6A41,0x6A6A,0x6A64,0x6A50,0x6A4F,0x6A54,0x6A6F,
-	0x6A69,0x6A60,0x6A3C,0x6A5E,0x6A56,0x6A55,0x6A4D,0x6A4E,
-	0x6A46,0x6B55,0x6B54,0x6B56,0x6BA7,0x6BAA,0x6BAB,0x6BC8,
-	0x6BC7,0x6C04,0x6C03,0x6C06,0x6FAD,0x6FCB,0x6FA3,0x6FC7,
-	0x6FBC,0x6FCE,0x6FC8,0x6F5E,0x6FC4,0x6FBD,0x6F9E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 89, Array index 0x3800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6FCA,0x6FA8,0x7004,0x6FA5,0x6FAE,0x6FBA,0x6FAC,
-	0x6FAA,0x6FCF,0x6FBF,0x6FB8,0x6FA2,0x6FC9,0x6FAB,0x6FCD,
-	0x6FAF,0x6FB2,0x6FB0,0x71C5,0x71C2,0x71BF,0x71B8,0x71D6,
-	0x71C0,0x71C1,0x71CB,0x71D4,0x71CA,0x71C7,0x71CF,0x71BD,
-	0x71D8,0x71BC,0x71C6,0x71DA,0x71DB,0x729D,0x729E,0x7369,
-	0x7366,0x7367,0x736C,0x7365,0x736B,0x736A,0x747F,0x749A,
-	0x74A0,0x7494,0x7492,0x7495,0x74A1,0x750B,0x7580,0x762F,
-	0x762D,0x7631,0x763D,0x7633,0x763C,0x7635,0x7632,0x7630,
-	0x76BB,0x76E6,0x779A,0x779D,0x77A1,0x779C,0x779B,0x77A2,
-	0x77A3,0x7795,0x7799,0x7797,0x78DD,0x78E9,0x78E5,0x78EA,
-	0x78DE,0x78E3,0x78DB,0x78E1,0x78E2,0x78ED,0x78DF,0x78E0,
-	0x79A4,0x7A44,0x7A48,0x7A47,0x7AB6,0x7AB8,0x7AB5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 90, Array index 0x3900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7AB1,0x7AB7,0x7BDE,0x7BE3,0x7BE7,0x7BDD,0x7BD5,
-	0x7BE5,0x7BDA,0x7BE8,0x7BF9,0x7BD4,0x7BEA,0x7BE2,0x7BDC,
-	0x7BEB,0x7BD8,0x7BDF,0x7CD2,0x7CD4,0x7CD7,0x7CD0,0x7CD1,
-	0x7E12,0x7E21,0x7E17,0x7E0C,0x7E1F,0x7E20,0x7E13,0x7E0E,
-	0x7E1C,0x7E15,0x7E1A,0x7E22,0x7E0B,0x7E0F,0x7E16,0x7E0D,
-	0x7E14,0x7E25,0x7E24,0x7F43,0x7F7B,0x7F7C,0x7F7A,0x7FB1,
-	0x7FEF,0x802A,0x8029,0x806C,0x81B1,0x81A6,0x81AE,0x81B9,
-	0x81B5,0x81AB,0x81B0,0x81AC,0x81B4,0x81B2,0x81B7,0x81A7,
-	0x81F2,0x8255,0x8256,0x8257,0x8556,0x8545,0x856B,0x854D,
-	0x8553,0x8561,0x8558,0x8540,0x8546,0x8564,0x8541,0x8562,
-	0x8544,0x8551,0x8547,0x8563,0x853E,0x855B,0x8571,0x854E,
-	0x856E,0x8575,0x8555,0x8567,0x8560,0x858C,0x8566,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 91, Array index 0x3A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x855D,0x8554,0x8565,0x856C,0x8663,0x8665,0x8664,
-	0x87A4,0x879B,0x878F,0x8797,0x8793,0x8792,0x8788,0x8781,
-	0x8796,0x8798,0x8779,0x8787,0x87A3,0x8785,0x8790,0x8791,
-	0x879D,0x8784,0x8794,0x879C,0x879A,0x8789,0x891E,0x8926,
-	0x8930,0x892D,0x892E,0x8927,0x8931,0x8922,0x8929,0x8923,
-	0x892F,0x892C,0x891F,0x89F1,0x8AE0,0x8AE2,0x8AF2,0x8AF4,
-	0x8AF5,0x8ADD,0x8B14,0x8AE4,0x8ADF,0x8AF0,0x8AC8,0x8ADE,
-	0x8AE1,0x8AE8,0x8AFF,0x8AEF,0x8AFB,0x8C91,0x8C92,0x8C90,
-	0x8CF5,0x8CEE,0x8CF1,0x8CF0,0x8CF3,0x8D6C,0x8D6E,0x8DA5,
-	0x8DA7,0x8E33,0x8E3E,0x8E38,0x8E40,0x8E45,0x8E36,0x8E3C,
-	0x8E3D,0x8E41,0x8E30,0x8E3F,0x8EBD,0x8F36,0x8F2E,0x8F35,
-	0x8F32,0x8F39,0x8F37,0x8F34,0x9076,0x9079,0x907B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 92, Array index 0x3B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9086,0x90FA,0x9133,0x9135,0x9136,0x9193,0x9190,
-	0x9191,0x918D,0x918F,0x9327,0x931E,0x9308,0x931F,0x9306,
-	0x930F,0x937A,0x9338,0x933C,0x931B,0x9323,0x9312,0x9301,
-	0x9346,0x932D,0x930E,0x930D,0x92CB,0x931D,0x92FA,0x9313,
-	0x92F9,0x92F7,0x9334,0x9302,0x9324,0x92FF,0x9329,0x9339,
-	0x9335,0x932A,0x9314,0x930C,0x930B,0x92FE,0x9309,0x9300,
-	0x92FB,0x9316,0x95BC,0x95CD,0x95BE,0x95B9,0x95BA,0x95B6,
-	0x95BF,0x95B5,0x95BD,0x96A9,0x96D4,0x970B,0x9712,0x9710,
-	0x9799,0x9797,0x9794,0x97F0,0x97F8,0x9835,0x982F,0x9832,
-	0x9924,0x991F,0x9927,0x9929,0x999E,0x99EE,0x99EC,0x99E5,
-	0x99E4,0x99F0,0x99E3,0x99EA,0x99E9,0x99E7,0x9AB9,0x9ABF,
-	0x9AB4,0x9ABB,0x9AF6,0x9AFA,0x9AF9,0x9AF7,0x9B33,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 93, Array index 0x3C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9B80,0x9B85,0x9B87,0x9B7C,0x9B7E,0x9B7B,0x9B82,
-	0x9B93,0x9B92,0x9B90,0x9B7A,0x9B95,0x9B7D,0x9B88,0x9D25,
-	0x9D17,0x9D20,0x9D1E,0x9D14,0x9D29,0x9D1D,0x9D18,0x9D22,
-	0x9D10,0x9D19,0x9D1F,0x9E88,0x9E86,0x9E87,0x9EAE,0x9EAD,
-	0x9ED5,0x9ED6,0x9EFA,0x9F12,0x9F3D,0x5126,0x5125,0x5122,
-	0x5124,0x5120,0x5129,0x52F4,0x5693,0x568C,0x568D,0x5686,
-	0x5684,0x5683,0x567E,0x5682,0x567F,0x5681,0x58D6,0x58D4,
-	0x58CF,0x58D2,0x5B2D,0x5B25,0x5B32,0x5B23,0x5B2C,0x5B27,
-	0x5B26,0x5B2F,0x5B2E,0x5B7B,0x5BF1,0x5BF2,0x5DB7,0x5E6C,
-	0x5E6A,0x5FBE,0x61C3,0x61B5,0x61BC,0x61E7,0x61E0,0x61E5,
-	0x61E4,0x61E8,0x61DE,0x64EF,0x64E9,0x64E3,0x64EB,0x64E4,
-	0x64E8,0x6581,0x6580,0x65B6,0x65DA,0x66D2,0x6A8D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 94, Array index 0x3D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A96,0x6A81,0x6AA5,0x6A89,0x6A9F,0x6A9B,0x6AA1,
-	0x6A9E,0x6A87,0x6A93,0x6A8E,0x6A95,0x6A83,0x6AA8,0x6AA4,
-	0x6A91,0x6A7F,0x6AA6,0x6A9A,0x6A85,0x6A8C,0x6A92,0x6B5B,
-	0x6BAD,0x6C09,0x6FCC,0x6FA9,0x6FF4,0x6FD4,0x6FE3,0x6FDC,
-	0x6FED,0x6FE7,0x6FE6,0x6FDE,0x6FF2,0x6FDD,0x6FE2,0x6FE8,
-	0x71E1,0x71F1,0x71E8,0x71F2,0x71E4,0x71F0,0x71E2,0x7373,
-	0x736E,0x736F,0x7497,0x74B2,0x74AB,0x7490,0x74AA,0x74AD,
-	0x74B1,0x74A5,0x74AF,0x7510,0x7511,0x7512,0x750F,0x7584,
-	0x7643,0x7648,0x7649,0x7647,0x76A4,0x76E9,0x77B5,0x77AB,
-	0x77B2,0x77B7,0x77B6,0x77B4,0x77B1,0x77A8,0x77F0,0x78F3,
-	0x78FD,0x7902,0x78FB,0x78FC,0x78FF,0x78F2,0x7905,0x78F9,
-	0x78FE,0x7904,0x79AB,0x79A8,0x7A5C,0x7A5B,0x7A56,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 95, Array index 0x3E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7A58,0x7A54,0x7A5A,0x7ABE,0x7AC0,0x7AC1,0x7C05,
-	0x7C0F,0x7BF2,0x7C00,0x7BFF,0x7BFB,0x7C0E,0x7BF4,0x7C0B,
-	0x7BF3,0x7C02,0x7C09,0x7C03,0x7C01,0x7BF8,0x7BFD,0x7C06,
-	0x7BF0,0x7BF1,0x7C10,0x7C0A,0x7CE8,0x7E2D,0x7E3C,0x7E42,
-	0x7E33,0x9848,0x7E38,0x7E2A,0x7E49,0x7E40,0x7E47,0x7E29,
-	0x7E4C,0x7E30,0x7E3B,0x7E36,0x7E44,0x7E3A,0x7F45,0x7F7F,
-	0x7F7E,0x7F7D,0x7FF4,0x7FF2,0x802C,0x81BB,0x81C4,0x81CC,
-	0x81CA,0x81C5,0x81C7,0x81BC,0x81E9,0x825B,0x825A,0x825C,
-	0x8583,0x8580,0x858F,0x85A7,0x8595,0x85A0,0x858B,0x85A3,
-	0x857B,0x85A4,0x859A,0x859E,0x8577,0x857C,0x8589,0x85A1,
-	0x857A,0x8578,0x8557,0x858E,0x8596,0x8586,0x858D,0x8599,
-	0x859D,0x8581,0x85A2,0x8582,0x8588,0x8585,0x8579,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 96, Array index 0x3F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8576,0x8598,0x8590,0x859F,0x8668,0x87BE,0x87AA,
-	0x87AD,0x87C5,0x87B0,0x87AC,0x87B9,0x87B5,0x87BC,0x87AE,
-	0x87C9,0x87C3,0x87C2,0x87CC,0x87B7,0x87AF,0x87C4,0x87CA,
-	0x87B4,0x87B6,0x87BF,0x87B8,0x87BD,0x87DE,0x87B2,0x8935,
-	0x8933,0x893C,0x893E,0x8941,0x8952,0x8937,0x8942,0x89AD,
-	0x89AF,0x89AE,0x89F2,0x89F3,0x8B1E,0x8B18,0x8B16,0x8B11,
-	0x8B05,0x8B0B,0x8B22,0x8B0F,0x8B12,0x8B15,0x8B07,0x8B0D,
-	0x8B08,0x8B06,0x8B1C,0x8B13,0x8B1A,0x8C4F,0x8C70,0x8C72,
-	0x8C71,0x8C6F,0x8C95,0x8C94,0x8CF9,0x8D6F,0x8E4E,0x8E4D,
-	0x8E53,0x8E50,0x8E4C,0x8E47,0x8F43,0x8F40,0x9085,0x907E,
-	0x9138,0x919A,0x91A2,0x919B,0x9199,0x919F,0x91A1,0x919D,
-	0x91A0,0x93A1,0x9383,0x93AF,0x9364,0x9356,0x9347,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 97, Array index 0x4000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x937C,0x9358,0x935C,0x9376,0x9349,0x9350,0x9351,
-	0x9360,0x936D,0x938F,0x934C,0x936A,0x9379,0x9357,0x9355,
-	0x9352,0x934F,0x9371,0x9377,0x937B,0x9361,0x935E,0x9363,
-	0x9367,0x934E,0x9359,0x95C7,0x95C0,0x95C9,0x95C3,0x95C5,
-	0x95B7,0x96AE,0x96B0,0x96AC,0x9720,0x971F,0x9718,0x971D,
-	0x9719,0x979A,0x97A1,0x979C,0x979E,0x979D,0x97D5,0x97D4,
-	0x97F1,0x9841,0x9844,0x984A,0x9849,0x9845,0x9843,0x9925,
-	0x992B,0x992C,0x992A,0x9933,0x9932,0x992F,0x992D,0x9931,
-	0x9930,0x9998,0x99A3,0x99A1,0x9A02,0x99FA,0x99F4,0x99F7,
-	0x99F9,0x99F8,0x99F6,0x99FB,0x99FD,0x99FE,0x99FC,0x9A03,
-	0x9ABE,0x9AFE,0x9AFD,0x9B01,0x9AFC,0x9B48,0x9B9A,0x9BA8,
-	0x9B9E,0x9B9B,0x9BA6,0x9BA1,0x9BA5,0x9BA4,0x9B86,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 98, Array index 0x4100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9BA2,0x9BA0,0x9BAF,0x9D33,0x9D41,0x9D67,0x9D36,
-	0x9D2E,0x9D2F,0x9D31,0x9D38,0x9D30,0x9D45,0x9D42,0x9D43,
-	0x9D3E,0x9D37,0x9D40,0x9D3D,0x7FF5,0x9D2D,0x9E8A,0x9E89,
-	0x9E8D,0x9EB0,0x9EC8,0x9EDA,0x9EFB,0x9EFF,0x9F24,0x9F23,
-	0x9F22,0x9F54,0x9FA0,0x5131,0x512D,0x512E,0x5698,0x569C,
-	0x5697,0x569A,0x569D,0x5699,0x5970,0x5B3C,0x5C69,0x5C6A,
-	0x5DC0,0x5E6D,0x5E6E,0x61D8,0x61DF,0x61ED,0x61EE,0x61F1,
-	0x61EA,0x61F0,0x61EB,0x61D6,0x61E9,0x64FF,0x6504,0x64FD,
-	0x64F8,0x6501,0x6503,0x64FC,0x6594,0x65DB,0x66DA,0x66DB,
-	0x66D8,0x6AC5,0x6AB9,0x6ABD,0x6AE1,0x6AC6,0x6ABA,0x6AB6,
-	0x6AB7,0x6AC7,0x6AB4,0x6AAD,0x6B5E,0x6BC9,0x6C0B,0x7007,
-	0x700C,0x700D,0x7001,0x7005,0x7014,0x700E,0x6FFF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 99, Array index 0x4200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7000,0x6FFB,0x7026,0x6FFC,0x6FF7,0x700A,0x7201,
-	0x71FF,0x71F9,0x7203,0x71FD,0x7376,0x74B8,0x74C0,0x74B5,
-	0x74C1,0x74BE,0x74B6,0x74BB,0x74C2,0x7514,0x7513,0x765C,
-	0x7664,0x7659,0x7650,0x7653,0x7657,0x765A,0x76A6,0x76BD,
-	0x76EC,0x77C2,0x77BA,0x790C,0x7913,0x7914,0x7909,0x7910,
-	0x7912,0x7911,0x79AD,0x79AC,0x7A5F,0x7C1C,0x7C29,0x7C19,
-	0x7C20,0x7C1F,0x7C2D,0x7C1D,0x7C26,0x7C28,0x7C22,0x7C25,
-	0x7C30,0x7E5C,0x7E50,0x7E56,0x7E63,0x7E58,0x7E62,0x7E5F,
-	0x7E51,0x7E60,0x7E57,0x7E53,0x7FB5,0x7FB3,0x7FF7,0x7FF8,
-	0x8075,0x81D1,0x81D2,0x81D0,0x825F,0x825E,0x85B4,0x85C6,
-	0x85C0,0x85C3,0x85C2,0x85B3,0x85B5,0x85BD,0x85C7,0x85C4,
-	0x85BF,0x85CB,0x85CE,0x85C8,0x85C5,0x85B1,0x85B6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 100, Array index 0x4300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x85D2,0x8624,0x85B8,0x85B7,0x85BE,0x8669,0x87E7,
-	0x87E6,0x87E2,0x87DB,0x87EB,0x87EA,0x87E5,0x87DF,0x87F3,
-	0x87E4,0x87D4,0x87DC,0x87D3,0x87ED,0x87D8,0x87E3,0x87D7,
-	0x87D9,0x8801,0x87F4,0x87E8,0x87DD,0x8953,0x894B,0x894F,
-	0x894C,0x8946,0x8950,0x8951,0x8949,0x8B2A,0x8B27,0x8B23,
-	0x8B33,0x8B30,0x8B35,0x8B47,0x8B2F,0x8B3C,0x8B3E,0x8B31,
-	0x8B25,0x8B37,0x8B26,0x8B36,0x8B2E,0x8B24,0x8B3B,0x8B3D,
-	0x8B3A,0x8C42,0x8C75,0x8C99,0x8C98,0x8C97,0x8CFE,0x8D04,
-	0x8D02,0x8D00,0x8E5C,0x8E62,0x8E60,0x8E57,0x8E56,0x8E5E,
-	0x8E65,0x8E67,0x8E5B,0x8E5A,0x8E61,0x8E5D,0x8E69,0x8E54,
-	0x8F46,0x8F47,0x8F48,0x8F4B,0x9128,0x913A,0x913B,0x913E,
-	0x91A8,0x91A5,0x91A7,0x91AF,0x91AA,0x93B5,0x938C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 101, Array index 0x4400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9392,0x93B7,0x939B,0x939D,0x9389,0x93A7,0x938E,
-	0x93AA,0x939E,0x93A6,0x9395,0x9388,0x9399,0x939F,0x9380,
-	0x938D,0x93B1,0x9391,0x93B2,0x93A4,0x93A8,0x93B4,0x93A3,
-	0x95D2,0x95D3,0x95D1,0x96B3,0x96D7,0x96DA,0x5DC2,0x96DF,
-	0x96D8,0x96DD,0x9723,0x9722,0x9725,0x97AC,0x97AE,0x97A8,
-	0x97AB,0x97A4,0x97AA,0x97A2,0x97A5,0x97D7,0x97D9,0x97D6,
-	0x97D8,0x97FA,0x9850,0x9851,0x9852,0x98B8,0x9941,0x993C,
-	0x993A,0x9A0F,0x9A0B,0x9A09,0x9A0D,0x9A04,0x9A11,0x9A0A,
-	0x9A05,0x9A07,0x9A06,0x9AC0,0x9ADC,0x9B08,0x9B04,0x9B05,
-	0x9B29,0x9B35,0x9B4A,0x9B4C,0x9B4B,0x9BC7,0x9BC6,0x9BC3,
-	0x9BBF,0x9BC1,0x9BB5,0x9BB8,0x9BD3,0x9BB6,0x9BC4,0x9BB9,
-	0x9BBD,0x9D5C,0x9D53,0x9D4F,0x9D4A,0x9D5B,0x9D4B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 102, Array index 0x4500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9D59,0x9D56,0x9D4C,0x9D57,0x9D52,0x9D54,0x9D5F,
-	0x9D58,0x9D5A,0x9E8E,0x9E8C,0x9EDF,0x9F01,0x9F00,0x9F16,
-	0x9F25,0x9F2B,0x9F2A,0x9F29,0x9F28,0x9F4C,0x9F55,0x5134,
-	0x5135,0x5296,0x52F7,0x53B4,0x56AB,0x56AD,0x56A6,0x56A7,
-	0x56AA,0x56AC,0x58DA,0x58DD,0x58DB,0x5912,0x5B3D,0x5B3E,
-	0x5B3F,0x5DC3,0x5E70,0x5FBF,0x61FB,0x6507,0x6510,0x650D,
-	0x6509,0x650C,0x650E,0x6584,0x65DE,0x65DD,0x66DE,0x6AE7,
-	0x6AE0,0x6ACC,0x6AD1,0x6AD9,0x6ACB,0x6ADF,0x6ADC,0x6AD0,
-	0x6AEB,0x6ACF,0x6ACD,0x6ADE,0x6B60,0x6BB0,0x6C0C,0x7019,
-	0x7027,0x7020,0x7016,0x702B,0x7021,0x7022,0x7023,0x7029,
-	0x7017,0x7024,0x701C,0x720C,0x720A,0x7207,0x7202,0x7205,
-	0x72A5,0x72A6,0x72A4,0x72A3,0x72A1,0x74CB,0x74C5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 103, Array index 0x4600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x74B7,0x74C3,0x7516,0x7660,0x77C9,0x77CA,0x77C4,
-	0x77F1,0x791D,0x791B,0x7921,0x791C,0x7917,0x791E,0x79B0,
-	0x7A67,0x7A68,0x7C33,0x7C3C,0x7C39,0x7C2C,0x7C3B,0x7CEC,
-	0x7CEA,0x7E76,0x7E75,0x7E78,0x7E70,0x7E77,0x7E6F,0x7E7A,
-	0x7E72,0x7E74,0x7E68,0x7F4B,0x7F4A,0x7F83,0x7F86,0x7FB7,
-	0x7FFD,0x7FFE,0x8078,0x81D7,0x81D5,0x820B,0x8264,0x8261,
-	0x8263,0x85EB,0x85F1,0x85ED,0x85D9,0x85E1,0x85E8,0x85DA,
-	0x85D7,0x85EC,0x85F2,0x85F8,0x85D8,0x85DF,0x85E3,0x85DC,
-	0x85D1,0x85F0,0x85E6,0x85EF,0x85DE,0x85E2,0x8800,0x87FA,
-	0x8803,0x87F6,0x87F7,0x8809,0x880C,0x880B,0x8806,0x87FC,
-	0x8808,0x87FF,0x880A,0x8802,0x8962,0x895A,0x895B,0x8957,
-	0x8961,0x895C,0x8958,0x895D,0x8959,0x8988,0x89B7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 104, Array index 0x4700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x89B6,0x89F6,0x8B50,0x8B48,0x8B4A,0x8B40,0x8B53,
-	0x8B56,0x8B54,0x8B4B,0x8B55,0x8B51,0x8B42,0x8B52,0x8B57,
-	0x8C43,0x8C77,0x8C76,0x8C9A,0x8D06,0x8D07,0x8D09,0x8DAC,
-	0x8DAA,0x8DAD,0x8DAB,0x8E6D,0x8E78,0x8E73,0x8E6A,0x8E6F,
-	0x8E7B,0x8EC2,0x8F52,0x8F51,0x8F4F,0x8F50,0x8F53,0x8FB4,
-	0x9140,0x913F,0x91B0,0x91AD,0x93DE,0x93C7,0x93CF,0x93C2,
-	0x93DA,0x93D0,0x93F9,0x93EC,0x93CC,0x93D9,0x93A9,0x93E6,
-	0x93CA,0x93D4,0x93EE,0x93E3,0x93D5,0x93C4,0x93CE,0x93C0,
-	0x93D2,0x93A5,0x93E7,0x957D,0x95DA,0x95DB,0x96E1,0x9729,
-	0x972B,0x972C,0x9728,0x9726,0x97B3,0x97B7,0x97B6,0x97DD,
-	0x97DE,0x97DF,0x985C,0x9859,0x985D,0x9857,0x98BF,0x98BD,
-	0x98BB,0x98BE,0x9948,0x9947,0x9943,0x99A6,0x99A7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 105, Array index 0x4800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9A1A,0x9A15,0x9A25,0x9A1D,0x9A24,0x9A1B,0x9A22,
-	0x9A20,0x9A27,0x9A23,0x9A1E,0x9A1C,0x9A14,0x9AC2,0x9B0B,
-	0x9B0A,0x9B0E,0x9B0C,0x9B37,0x9BEA,0x9BEB,0x9BE0,0x9BDE,
-	0x9BE4,0x9BE6,0x9BE2,0x9BF0,0x9BD4,0x9BD7,0x9BEC,0x9BDC,
-	0x9BD9,0x9BE5,0x9BD5,0x9BE1,0x9BDA,0x9D77,0x9D81,0x9D8A,
-	0x9D84,0x9D88,0x9D71,0x9D80,0x9D78,0x9D86,0x9D8B,0x9D8C,
-	0x9D7D,0x9D6B,0x9D74,0x9D75,0x9D70,0x9D69,0x9D85,0x9D73,
-	0x9D7B,0x9D82,0x9D6F,0x9D79,0x9D7F,0x9D87,0x9D68,0x9E94,
-	0x9E91,0x9EC0,0x9EFC,0x9F2D,0x9F40,0x9F41,0x9F4D,0x9F56,
-	0x9F57,0x9F58,0x5337,0x56B2,0x56B5,0x56B3,0x58E3,0x5B45,
-	0x5DC6,0x5DC7,0x5EEE,0x5EEF,0x5FC0,0x5FC1,0x61F9,0x6517,
-	0x6516,0x6515,0x6513,0x65DF,0x66E8,0x66E3,0x66E4,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 106, Array index 0x4900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6AF3,0x6AF0,0x6AEA,0x6AE8,0x6AF9,0x6AF1,0x6AEE,
-	0x6AEF,0x703C,0x7035,0x702F,0x7037,0x7034,0x7031,0x7042,
-	0x7038,0x703F,0x703A,0x7039,0x702A,0x7040,0x703B,0x7033,
-	0x7041,0x7213,0x7214,0x72A8,0x737D,0x737C,0x74BA,0x76AB,
-	0x76AA,0x76BE,0x76ED,0x77CC,0x77CE,0x77CF,0x77CD,0x77F2,
-	0x7925,0x7923,0x7927,0x7928,0x7924,0x7929,0x79B2,0x7A6E,
-	0x7A6C,0x7A6D,0x7AF7,0x7C49,0x7C48,0x7C4A,0x7C47,0x7C45,
-	0x7CEE,0x7E7B,0x7E7E,0x7E81,0x7E80,0x7FBA,0x7FFF,0x8079,
-	0x81DB,0x81D9,0x8268,0x8269,0x8622,0x85FF,0x8601,0x85FE,
-	0x861B,0x8600,0x85F6,0x8604,0x8609,0x8605,0x860C,0x85FD,
-	0x8819,0x8810,0x8811,0x8817,0x8813,0x8816,0x8963,0x8966,
-	0x89B9,0x89F7,0x8B60,0x8B6A,0x8B5D,0x8B68,0x8B63,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 107, Array index 0x4A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8B65,0x8B67,0x8B6D,0x8DAE,0x8E86,0x8E88,0x8E84,
-	0x8F59,0x8F56,0x8F57,0x8F55,0x8F58,0x8F5A,0x908D,0x9143,
-	0x9141,0x91B7,0x91B5,0x91B2,0x91B3,0x940B,0x9413,0x93FB,
-	0x9420,0x940F,0x9414,0x93FE,0x9415,0x9410,0x9428,0x9419,
-	0x940D,0x93F5,0x9400,0x93F7,0x9407,0x940E,0x9416,0x9412,
-	0x93FA,0x9409,0x93F8,0x943C,0x940A,0x93FF,0x93FC,0x940C,
-	0x93F6,0x9411,0x9406,0x95DE,0x95E0,0x95DF,0x972E,0x972F,
-	0x97B9,0x97BB,0x97FD,0x97FE,0x9860,0x9862,0x9863,0x985F,
-	0x98C1,0x98C2,0x9950,0x994E,0x9959,0x994C,0x994B,0x9953,
-	0x9A32,0x9A34,0x9A31,0x9A2C,0x9A2A,0x9A36,0x9A29,0x9A2E,
-	0x9A38,0x9A2D,0x9AC7,0x9ACA,0x9AC6,0x9B10,0x9B12,0x9B11,
-	0x9C0B,0x9C08,0x9BF7,0x9C05,0x9C12,0x9BF8,0x9C40,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 108, Array index 0x4B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9C07,0x9C0E,0x9C06,0x9C17,0x9C14,0x9C09,0x9D9F,
-	0x9D99,0x9DA4,0x9D9D,0x9D92,0x9D98,0x9D90,0x9D9B,0x9DA0,
-	0x9D94,0x9D9C,0x9DAA,0x9D97,0x9DA1,0x9D9A,0x9DA2,0x9DA8,
-	0x9D9E,0x9DA3,0x9DBF,0x9DA9,0x9D96,0x9DA6,0x9DA7,0x9E99,
-	0x9E9B,0x9E9A,0x9EE5,0x9EE4,0x9EE7,0x9EE6,0x9F30,0x9F2E,
-	0x9F5B,0x9F60,0x9F5E,0x9F5D,0x9F59,0x9F91,0x513A,0x5139,
-	0x5298,0x5297,0x56C3,0x56BD,0x56BE,0x5B48,0x5B47,0x5DCB,
-	0x5DCF,0x5EF1,0x61FD,0x651B,0x6B02,0x6AFC,0x6B03,0x6AF8,
-	0x6B00,0x7043,0x7044,0x704A,0x7048,0x7049,0x7045,0x7046,
-	0x721D,0x721A,0x7219,0x737E,0x7517,0x766A,0x77D0,0x792D,
-	0x7931,0x792F,0x7C54,0x7C53,0x7CF2,0x7E8A,0x7E87,0x7E88,
-	0x7E8B,0x7E86,0x7E8D,0x7F4D,0x7FBB,0x8030,0x81DD,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 109, Array index 0x4C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8618,0x862A,0x8626,0x861F,0x8623,0x861C,0x8619,
-	0x8627,0x862E,0x8621,0x8620,0x8629,0x861E,0x8625,0x8829,
-	0x881D,0x881B,0x8820,0x8824,0x881C,0x882B,0x884A,0x896D,
-	0x8969,0x896E,0x896B,0x89FA,0x8B79,0x8B78,0x8B45,0x8B7A,
-	0x8B7B,0x8D10,0x8D14,0x8DAF,0x8E8E,0x8E8C,0x8F5E,0x8F5B,
-	0x8F5D,0x9146,0x9144,0x9145,0x91B9,0x943F,0x943B,0x9436,
-	0x9429,0x943D,0x9430,0x9439,0x942A,0x9437,0x942C,0x9440,
-	0x9431,0x95E5,0x95E4,0x95E3,0x9735,0x973A,0x97BF,0x97E1,
-	0x9864,0x98C9,0x98C6,0x98C0,0x9958,0x9956,0x9A39,0x9A3D,
-	0x9A46,0x9A44,0x9A42,0x9A41,0x9A3A,0x9A3F,0x9ACD,0x9B15,
-	0x9B17,0x9B18,0x9B16,0x9B3A,0x9B52,0x9C2B,0x9C1D,0x9C1C,
-	0x9C2C,0x9C23,0x9C28,0x9C29,0x9C24,0x9C21,0x9DB7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 110, Array index 0x4D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9DB6,0x9DBC,0x9DC1,0x9DC7,0x9DCA,0x9DCF,0x9DBE,
-	0x9DC5,0x9DC3,0x9DBB,0x9DB5,0x9DCE,0x9DB9,0x9DBA,0x9DAC,
-	0x9DC8,0x9DB1,0x9DAD,0x9DCC,0x9DB3,0x9DCD,0x9DB2,0x9E7A,
-	0x9E9C,0x9EEB,0x9EEE,0x9EED,0x9F1B,0x9F18,0x9F1A,0x9F31,
-	0x9F4E,0x9F65,0x9F64,0x9F92,0x4EB9,0x56C6,0x56C5,0x56CB,
-	0x5971,0x5B4B,0x5B4C,0x5DD5,0x5DD1,0x5EF2,0x6521,0x6520,
-	0x6526,0x6522,0x6B0B,0x6B08,0x6B09,0x6C0D,0x7055,0x7056,
-	0x7057,0x7052,0x721E,0x721F,0x72A9,0x737F,0x74D8,0x74D5,
-	0x74D9,0x74D7,0x766D,0x76AD,0x7935,0x79B4,0x7A70,0x7A71,
-	0x7C57,0x7C5C,0x7C59,0x7C5B,0x7C5A,0x7CF4,0x7CF1,0x7E91,
-	0x7F4F,0x7F87,0x81DE,0x826B,0x8634,0x8635,0x8633,0x862C,
-	0x8632,0x8636,0x882C,0x8828,0x8826,0x882A,0x8825,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 111, Array index 0x4E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8971,0x89BF,0x89BE,0x89FB,0x8B7E,0x8B84,0x8B82,
-	0x8B86,0x8B85,0x8B7F,0x8D15,0x8E95,0x8E94,0x8E9A,0x8E92,
-	0x8E90,0x8E96,0x8E97,0x8F60,0x8F62,0x9147,0x944C,0x9450,
-	0x944A,0x944B,0x944F,0x9447,0x9445,0x9448,0x9449,0x9446,
-	0x973F,0x97E3,0x986A,0x9869,0x98CB,0x9954,0x995B,0x9A4E,
-	0x9A53,0x9A54,0x9A4C,0x9A4F,0x9A48,0x9A4A,0x9A49,0x9A52,
-	0x9A50,0x9AD0,0x9B19,0x9B2B,0x9B3B,0x9B56,0x9B55,0x9C46,
-	0x9C48,0x9C3F,0x9C44,0x9C39,0x9C33,0x9C41,0x9C3C,0x9C37,
-	0x9C34,0x9C32,0x9C3D,0x9C36,0x9DDB,0x9DD2,0x9DDE,0x9DDA,
-	0x9DCB,0x9DD0,0x9DDC,0x9DD1,0x9DDF,0x9DE9,0x9DD9,0x9DD8,
-	0x9DD6,0x9DF5,0x9DD5,0x9DDD,0x9EB6,0x9EF0,0x9F35,0x9F33,
-	0x9F32,0x9F42,0x9F6B,0x9F95,0x9FA2,0x513D,0x5299,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 112, Array index 0x4F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x58E8,0x58E7,0x5972,0x5B4D,0x5DD8,0x882F,0x5F4F,
-	0x6201,0x6203,0x6204,0x6529,0x6525,0x6596,0x66EB,0x6B11,
-	0x6B12,0x6B0F,0x6BCA,0x705B,0x705A,0x7222,0x7382,0x7381,
-	0x7383,0x7670,0x77D4,0x7C67,0x7C66,0x7E95,0x826C,0x863A,
-	0x8640,0x8639,0x863C,0x8631,0x863B,0x863E,0x8830,0x8832,
-	0x882E,0x8833,0x8976,0x8974,0x8973,0x89FE,0x8B8C,0x8B8E,
-	0x8B8B,0x8B88,0x8C45,0x8D19,0x8E98,0x8F64,0x8F63,0x91BC,
-	0x9462,0x9455,0x945D,0x9457,0x945E,0x97C4,0x97C5,0x9800,
-	0x9A56,0x9A59,0x9B1E,0x9B1F,0x9B20,0x9C52,0x9C58,0x9C50,
-	0x9C4A,0x9C4D,0x9C4B,0x9C55,0x9C59,0x9C4C,0x9C4E,0x9DFB,
-	0x9DF7,0x9DEF,0x9DE3,0x9DEB,0x9DF8,0x9DE4,0x9DF6,0x9DE1,
-	0x9DEE,0x9DE6,0x9DF2,0x9DF0,0x9DE2,0x9DEC,0x9DF4,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 113, Array index 0x5000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9DF3,0x9DE8,0x9DED,0x9EC2,0x9ED0,0x9EF2,0x9EF3,
-	0x9F06,0x9F1C,0x9F38,0x9F37,0x9F36,0x9F43,0x9F4F,0x9F71,
-	0x9F70,0x9F6E,0x9F6F,0x56D3,0x56CD,0x5B4E,0x5C6D,0x652D,
-	0x66ED,0x66EE,0x6B13,0x705F,0x7061,0x705D,0x7060,0x7223,
-	0x74DB,0x74E5,0x77D5,0x7938,0x79B7,0x79B6,0x7C6A,0x7E97,
-	0x7F89,0x826D,0x8643,0x8838,0x8837,0x8835,0x884B,0x8B94,
-	0x8B95,0x8E9E,0x8E9F,0x8EA0,0x8E9D,0x91BE,0x91BD,0x91C2,
-	0x946B,0x9468,0x9469,0x96E5,0x9746,0x9743,0x9747,0x97C7,
-	0x97E5,0x9A5E,0x9AD5,0x9B59,0x9C63,0x9C67,0x9C66,0x9C62,
-	0x9C5E,0x9C60,0x9E02,0x9DFE,0x9E07,0x9E03,0x9E06,0x9E05,
-	0x9E00,0x9E01,0x9E09,0x9DFF,0x9DFD,0x9E04,0x9EA0,0x9F1E,
-	0x9F46,0x9F74,0x9F75,0x9F76,0x56D4,0x652E,0x65B8,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 114, Array index 0x5100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B18,0x6B19,0x6B17,0x6B1A,0x7062,0x7226,0x72AA,
-	0x77D8,0x77D9,0x7939,0x7C69,0x7C6B,0x7CF6,0x7E9A,0x7E98,
-	0x7E9B,0x7E99,0x81E0,0x81E1,0x8646,0x8647,0x8648,0x8979,
-	0x897A,0x897C,0x897B,0x89FF,0x8B98,0x8B99,0x8EA5,0x8EA4,
-	0x8EA3,0x946E,0x946D,0x946F,0x9471,0x9473,0x9749,0x9872,
-	0x995F,0x9C68,0x9C6E,0x9C6D,0x9E0B,0x9E0D,0x9E10,0x9E0F,
-	0x9E12,0x9E11,0x9EA1,0x9EF5,0x9F09,0x9F47,0x9F78,0x9F7B,
-	0x9F7A,0x9F79,0x571E,0x7066,0x7C6F,0x883C,0x8DB2,0x8EA6,
-	0x91C3,0x9474,0x9478,0x9476,0x9475,0x9A60,0x9B2E,0x9C74,
-	0x9C73,0x9C71,0x9C75,0x9E14,0x9E13,0x9EF6,0x9F0A,0x9FA4,
-	0x7068,0x7065,0x7CF7,0x866A,0x883E,0x883D,0x883F,0x8B9E,
-	0x8C9C,0x8EA9,0x8EC9,0x974B,0x9873,0x9874,0x98CC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 115, Array index 0x5200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9961,0x99AB,0x9A64,0x9A66,0x9A67,0x9B24,0x9E15,
-	0x9E17,0x9F48,0x6207,0x6B1E,0x7227,0x864C,0x8EA8,0x9482,
-	0x9480,0x9481,0x9A69,0x9A68,0x9E19,0x864B,0x8B9F,0x9483,
-	0x9C79,0x9EB7,0x7675,0x9A6B,0x9C7A,0x9E1D,0x7069,0x706A,
-	0x7229,0x9EA4,0x9F7E,0x9F49,0x9F98,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_TO_UCS_CCS_CNS11643_PLANE2 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit cns11643_plane2 -> UCS size-optimized table (15798 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_size_cns11643_plane2[] =
-{
-	0x0052, /* Ranges number */
-	0x0000, /* Unranged codes number */
-	0x1EDB, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x2121, 0x217E, 0x00F9,
-	/* Array index: 0x0006 */ 0x2221, 0x227E, 0x0157,
-	/* Array index: 0x0009 */ 0x2321, 0x237E, 0x01B5,
-	/* Array index: 0x000C */ 0x2421, 0x247E, 0x0213,
-	/* Array index: 0x000F */ 0x2521, 0x257E, 0x0271,
-	/* Array index: 0x0012 */ 0x2621, 0x267E, 0x02CF,
-	/* Array index: 0x0015 */ 0x2721, 0x277E, 0x032D,
-	/* Array index: 0x0018 */ 0x2821, 0x287E, 0x038B,
-	/* Array index: 0x001B */ 0x2921, 0x297E, 0x03E9,
-	/* Array index: 0x001E */ 0x2A21, 0x2A7E, 0x0447,
-	/* Array index: 0x0021 */ 0x2B21, 0x2B7E, 0x04A5,
-	/* Array index: 0x0024 */ 0x2C21, 0x2C7E, 0x0503,
-	/* Array index: 0x0027 */ 0x2D21, 0x2D7E, 0x0561,
-	/* Array index: 0x002A */ 0x2E21, 0x2E7E, 0x05BF,
-	/* Array index: 0x002D */ 0x2F21, 0x2F7E, 0x061D,
-	/* Array index: 0x0030 */ 0x3021, 0x307E, 0x067B,
-	/* Array index: 0x0033 */ 0x3121, 0x317E, 0x06D9,
-	/* Array index: 0x0036 */ 0x3221, 0x327E, 0x0737,
-	/* Array index: 0x0039 */ 0x3321, 0x337E, 0x0795,
-	/* Array index: 0x003C */ 0x3421, 0x347E, 0x07F3,
-	/* Array index: 0x003F */ 0x3521, 0x357E, 0x0851,
-	/* Array index: 0x0042 */ 0x3621, 0x367E, 0x08AF,
-	/* Array index: 0x0045 */ 0x3721, 0x377E, 0x090D,
-	/* Array index: 0x0048 */ 0x3821, 0x387E, 0x096B,
-	/* Array index: 0x004B */ 0x3921, 0x397E, 0x09C9,
-	/* Array index: 0x004E */ 0x3A21, 0x3A7E, 0x0A27,
-	/* Array index: 0x0051 */ 0x3B21, 0x3B7E, 0x0A85,
-	/* Array index: 0x0054 */ 0x3C21, 0x3C7E, 0x0AE3,
-	/* Array index: 0x0057 */ 0x3D21, 0x3D7E, 0x0B41,
-	/* Array index: 0x005A */ 0x3E21, 0x3E7E, 0x0B9F,
-	/* Array index: 0x005D */ 0x3F21, 0x3F7E, 0x0BFD,
-	/* Array index: 0x0060 */ 0x4021, 0x407E, 0x0C5B,
-	/* Array index: 0x0063 */ 0x4121, 0x417E, 0x0CB9,
-	/* Array index: 0x0066 */ 0x4221, 0x427E, 0x0D17,
-	/* Array index: 0x0069 */ 0x4321, 0x437E, 0x0D75,
-	/* Array index: 0x006C */ 0x4421, 0x447E, 0x0DD3,
-	/* Array index: 0x006F */ 0x4521, 0x457E, 0x0E31,
-	/* Array index: 0x0072 */ 0x4621, 0x467E, 0x0E8F,
-	/* Array index: 0x0075 */ 0x4721, 0x477E, 0x0EED,
-	/* Array index: 0x0078 */ 0x4821, 0x487E, 0x0F4B,
-	/* Array index: 0x007B */ 0x4921, 0x497E, 0x0FA9,
-	/* Array index: 0x007E */ 0x4A21, 0x4A7E, 0x1007,
-	/* Array index: 0x0081 */ 0x4B21, 0x4B7E, 0x1065,
-	/* Array index: 0x0084 */ 0x4C21, 0x4C7E, 0x10C3,
-	/* Array index: 0x0087 */ 0x4D21, 0x4D7E, 0x1121,
-	/* Array index: 0x008A */ 0x4E21, 0x4E7E, 0x117F,
-	/* Array index: 0x008D */ 0x4F21, 0x4F7E, 0x11DD,
-	/* Array index: 0x0090 */ 0x5021, 0x507E, 0x123B,
-	/* Array index: 0x0093 */ 0x5121, 0x517E, 0x1299,
-	/* Array index: 0x0096 */ 0x5221, 0x527E, 0x12F7,
-	/* Array index: 0x0099 */ 0x5321, 0x537E, 0x1355,
-	/* Array index: 0x009C */ 0x5421, 0x547E, 0x13B3,
-	/* Array index: 0x009F */ 0x5521, 0x557E, 0x1411,
-	/* Array index: 0x00A2 */ 0x5621, 0x567E, 0x146F,
-	/* Array index: 0x00A5 */ 0x5721, 0x577E, 0x14CD,
-	/* Array index: 0x00A8 */ 0x5821, 0x587E, 0x152B,
-	/* Array index: 0x00AB */ 0x5921, 0x597E, 0x1589,
-	/* Array index: 0x00AE */ 0x5A21, 0x5A7E, 0x15E7,
-	/* Array index: 0x00B1 */ 0x5B21, 0x5B7E, 0x1645,
-	/* Array index: 0x00B4 */ 0x5C21, 0x5C7E, 0x16A3,
-	/* Array index: 0x00B7 */ 0x5D21, 0x5D7E, 0x1701,
-	/* Array index: 0x00BA */ 0x5E21, 0x5E7E, 0x175F,
-	/* Array index: 0x00BD */ 0x5F21, 0x5F7E, 0x17BD,
-	/* Array index: 0x00C0 */ 0x6021, 0x607E, 0x181B,
-	/* Array index: 0x00C3 */ 0x6121, 0x617E, 0x1879,
-	/* Array index: 0x00C6 */ 0x6221, 0x627E, 0x18D7,
-	/* Array index: 0x00C9 */ 0x6321, 0x637E, 0x1935,
-	/* Array index: 0x00CC */ 0x6421, 0x647E, 0x1993,
-	/* Array index: 0x00CF */ 0x6521, 0x657E, 0x19F1,
-	/* Array index: 0x00D2 */ 0x6621, 0x667E, 0x1A4F,
-	/* Array index: 0x00D5 */ 0x6721, 0x677E, 0x1AAD,
-	/* Array index: 0x00D8 */ 0x6821, 0x687E, 0x1B0B,
-	/* Array index: 0x00DB */ 0x6921, 0x697E, 0x1B69,
-	/* Array index: 0x00DE */ 0x6A21, 0x6A7E, 0x1BC7,
-	/* Array index: 0x00E1 */ 0x6B21, 0x6B7E, 0x1C25,
-	/* Array index: 0x00E4 */ 0x6C21, 0x6C7E, 0x1C83,
-	/* Array index: 0x00E7 */ 0x6D21, 0x6D7E, 0x1CE1,
-	/* Array index: 0x00EA */ 0x6E21, 0x6E7E, 0x1D3F,
-	/* Array index: 0x00ED */ 0x6F21, 0x6F7E, 0x1D9D,
-	/* Array index: 0x00F0 */ 0x7021, 0x707E, 0x1DFB,
-	/* Array index: 0x00F3 */ 0x7121, 0x717E, 0x1E59,
-	/* Array index: 0x00F6 */ 0x7221, 0x7244, 0x1EB7,
-	/* Ranges content */
-	/* Range 0x2121 - 0x217E, array index: 0x00F9 */
-	0x4E42,0x4E5C,0x51F5,0x531A,0x5382,0x4E07,0x4E0C,0x4E47,
-	0x4E8D,0x56D7,0x5C6E,0x5F73,0x4E0F,0x5187,0x4E0E,0x4E2E,
-	0x4E93,0x4EC2,0x4EC9,0x4EC8,0x5198,0x52FC,0x536C,0x53B9,
-	0x5720,0x5903,0x592C,0x5C10,0x5DFF,0x65E1,0x6BB3,0x6BCC,
-	0x6C14,0x723F,0x4E31,0x4E3C,0x4EE8,0x4EDC,0x4EE9,0x4EE1,
-	0x4EDD,0x4EDA,0x520C,0x5209,0x531C,0x534C,0x5722,0x5723,
-	0x5917,0x592F,0x5B81,0x5B84,0x5C12,0x5C3B,0x5C74,0x5C73,
-	0x5E04,0x5E80,0x5E82,0x5FC9,0x6209,0x6250,0x6C15,0x6C36,
-	0x6C43,0x6C3F,0x6C3B,0x72AE,0x72B0,0x738A,0x79B8,0x808A,
-	0x961E,0x4F0E,0x4F18,0x4F2C,0x4EF5,0x4F14,0x4EF1,0x4F00,
-	0x4EF7,0x4F08,0x4F1D,0x4F02,0x4F05,0x4F22,0x4F13,0x4F04,
-	0x4EF4,0x4F12,0x51B1,0x5213,0x5210,0x52A6,
-	/* Range 0x2221 - 0x227E, array index: 0x0157 */
-	0x5322,0x531F,0x534D,0x538A,0x5407,0x56E1,0x56DF,0x572E,
-	0x572A,0x5734,0x593C,0x5980,0x597C,0x5985,0x597B,0x597E,
-	0x5977,0x597F,0x5B56,0x5C15,0x5C25,0x5C7C,0x5C7A,0x5C7B,
-	0x5C7E,0x5DDF,0x5E75,0x5E84,0x5F02,0x5F1A,0x5F74,0x5FD5,
-	0x5FD4,0x5FCF,0x625C,0x625E,0x6264,0x6261,0x6266,0x6262,
-	0x6259,0x6260,0x625A,0x6265,0x6537,0x65EF,0x65EE,0x673E,
-	0x6739,0x6738,0x673B,0x673A,0x673F,0x673C,0x6733,0x6C18,
-	0x6C46,0x6C52,0x6C5C,0x6C4F,0x6C4A,0x6C54,0x6C4B,0x6C4C,
-	0x7071,0x725E,0x72B4,0x72B5,0x738E,0x752A,0x767F,0x7A75,
-	0x7F51,0x8278,0x827C,0x8280,0x827D,0x827F,0x864D,0x897E,
-	0x9099,0x9097,0x9098,0x909B,0x9094,0x9622,0x9624,0x9620,
-	0x9623,0x4F56,0x4F3B,0x4F62,0x4F49,0x4F53,
-	/* Range 0x2321 - 0x237E, array index: 0x01B5 */
-	0x4F64,0x4F3E,0x4F67,0x4F52,0x4F5F,0x4F41,0x4F58,0x4F2D,
-	0x4F33,0x4F3F,0x4F61,0x518F,0x51B9,0x521C,0x521E,0x5221,
-	0x52AD,0x52AE,0x5309,0x5363,0x5372,0x538E,0x538F,0x5430,
-	0x5437,0x542A,0x5454,0x5445,0x5419,0x541C,0x5425,0x5418,
-	0x543D,0x544F,0x5441,0x5428,0x5424,0x5447,0x56EE,0x56E7,
-	0x56E5,0x5741,0x5745,0x574C,0x5749,0x574B,0x5752,0x5906,
-	0x5940,0x59A6,0x5998,0x59A0,0x5997,0x598E,0x59A2,0x5990,
-	0x598F,0x59A7,0x59A1,0x5B8E,0x5B92,0x5C28,0x5C2A,0x5C8D,
-	0x5C8F,0x5C88,0x5C8B,0x5C89,0x5C92,0x5C8A,0x5C86,0x5C93,
-	0x5C95,0x5DE0,0x5E0A,0x5E0E,0x5E8B,0x5E89,0x5E8C,0x5E88,
-	0x5E8D,0x5F05,0x5F1D,0x5F78,0x5F76,0x5FD2,0x5FD1,0x5FD0,
-	0x5FED,0x5FE8,0x5FEE,0x5FF3,0x5FE1,0x5FE4,
-	/* Range 0x2421 - 0x247E, array index: 0x0213 */
-	0x5FE3,0x5FFA,0x5FEF,0x5FF7,0x5FFB,0x6000,0x5FF4,0x623A,
-	0x6283,0x628C,0x628E,0x628F,0x6294,0x6287,0x6271,0x627B,
-	0x627A,0x6270,0x6281,0x6288,0x6277,0x627D,0x6272,0x6274,
-	0x65F0,0x65F4,0x65F3,0x65F2,0x65F5,0x6745,0x6747,0x6759,
-	0x6755,0x674C,0x6748,0x675D,0x674D,0x675A,0x674B,0x6BD0,
-	0x6C19,0x6C1A,0x6C78,0x6C67,0x6C6B,0x6C84,0x6C8B,0x6C8F,
-	0x6C71,0x6C6F,0x6C69,0x6C9A,0x6C6D,0x6C87,0x6C95,0x6C9C,
-	0x6C66,0x6C73,0x6C65,0x6C7B,0x6C8E,0x7074,0x707A,0x7263,
-	0x72BF,0x72BD,0x72C3,0x72C6,0x72C1,0x72BA,0x72C5,0x7395,
-	0x7397,0x7393,0x7394,0x7392,0x753A,0x7539,0x7594,0x7595,
-	0x7681,0x793D,0x8034,0x8095,0x8099,0x8090,0x8092,0x809C,
-	0x8290,0x828F,0x8285,0x828E,0x8291,0x8293,
-	/* Range 0x2521 - 0x257E, array index: 0x0271 */
-	0x828A,0x8283,0x8284,0x8C78,0x8FC9,0x8FBF,0x909F,0x90A1,
-	0x90A5,0x909E,0x90A7,0x90A0,0x9630,0x9628,0x962F,0x962D,
-	0x4E33,0x4F98,0x4F7C,0x4F85,0x4F7D,0x4F80,0x4F87,0x4F76,
-	0x4F74,0x4F89,0x4F84,0x4F77,0x4F4C,0x4F97,0x4F6A,0x4F9A,
-	0x4F79,0x4F81,0x4F78,0x4F90,0x4F9C,0x4F94,0x4F9E,0x4F92,
-	0x4F82,0x4F95,0x4F6B,0x4F6E,0x519E,0x51BC,0x51BE,0x5235,
-	0x5232,0x5233,0x5246,0x5231,0x52BC,0x530A,0x530B,0x533C,
-	0x5392,0x5394,0x5487,0x547F,0x5481,0x5491,0x5482,0x5488,
-	0x546B,0x547A,0x547E,0x5465,0x546C,0x5474,0x5466,0x548D,
-	0x546F,0x5461,0x5460,0x5498,0x5463,0x5467,0x5464,0x56F7,
-	0x56F9,0x576F,0x5772,0x576D,0x576B,0x5771,0x5770,0x5776,
-	0x5780,0x5775,0x577B,0x5773,0x5774,0x5762,
-	/* Range 0x2621 - 0x267E, array index: 0x02CF */
-	0x5768,0x577D,0x590C,0x5945,0x59B5,0x59BA,0x59CF,0x59CE,
-	0x59B2,0x59CC,0x59C1,0x59B6,0x59BC,0x59C3,0x59D6,0x59B1,
-	0x59BD,0x59C0,0x59C8,0x59B4,0x59C7,0x5B62,0x5B65,0x5B93,
-	0x5B95,0x5C44,0x5C47,0x5CAE,0x5CA4,0x5CA0,0x5CB5,0x5CAF,
-	0x5CA8,0x5CAC,0x5C9F,0x5CA3,0x5CAD,0x5CA2,0x5CAA,0x5CA7,
-	0x5C9D,0x5CA5,0x5CB6,0x5CB0,0x5CA6,0x5E17,0x5E14,0x5E19,
-	0x5F28,0x5F22,0x5F23,0x5F24,0x5F54,0x5F82,0x5F7E,0x5F7D,
-	0x5FDE,0x5FE5,0x602D,0x6026,0x6019,0x6032,0x600B,0x6034,
-	0x600A,0x6017,0x6033,0x601A,0x601E,0x602C,0x6022,0x600D,
-	0x6010,0x602E,0x6013,0x6011,0x600C,0x6009,0x601C,0x6214,
-	0x623D,0x62AD,0x62B4,0x62D1,0x62BE,0x62AA,0x62B6,0x62CA,
-	0x62AE,0x62B3,0x62AF,0x62BB,0x62A9,0x62B0,
-	/* Range 0x2721 - 0x277E, array index: 0x032D */
-	0x62B8,0x653D,0x65A8,0x65BB,0x6609,0x65FC,0x6604,0x6612,
-	0x6608,0x65FB,0x6603,0x660B,0x660D,0x6605,0x65FD,0x6611,
-	0x6610,0x66F6,0x670A,0x6785,0x676C,0x678E,0x6792,0x6776,
-	0x677B,0x6798,0x6786,0x6784,0x6774,0x678D,0x678C,0x677A,
-	0x679F,0x6791,0x6799,0x6783,0x677D,0x6781,0x6778,0x6779,
-	0x6794,0x6B25,0x6B80,0x6B7E,0x6BDE,0x6C1D,0x6C93,0x6CEC,
-	0x6CEB,0x6CEE,0x6CD9,0x6CB6,0x6CD4,0x6CAD,0x6CE7,0x6CB7,
-	0x6CD0,0x6CC2,0x6CBA,0x6CC3,0x6CC6,0x6CED,0x6CF2,0x6CD2,
-	0x6CDD,0x6CB4,0x6C8A,0x6C9D,0x6C80,0x6CDE,0x6CC0,0x6D30,
-	0x6CCD,0x6CC7,0x6CB0,0x6CF9,0x6CCF,0x6CE9,0x6CD1,0x7094,
-	0x7098,0x7085,0x7093,0x7086,0x7084,0x7091,0x7096,0x7082,
-	0x709A,0x7083,0x726A,0x72D6,0x72CB,0x72D8,
-	/* Range 0x2821 - 0x287E, array index: 0x038B */
-	0x72C9,0x72DC,0x72D2,0x72D4,0x72DA,0x72CC,0x72D1,0x73A4,
-	0x73A1,0x73AD,0x73A6,0x73A2,0x73A0,0x73AC,0x739D,0x74DD,
-	0x74E8,0x753F,0x7540,0x753E,0x758C,0x7598,0x76AF,0x76F3,
-	0x76F1,0x76F0,0x76F5,0x77F8,0x77FC,0x77F9,0x77FB,0x77FA,
-	0x77F7,0x7942,0x793F,0x79C5,0x7A78,0x7A7B,0x7AFB,0x7C75,
-	0x7CFD,0x8035,0x808F,0x80AE,0x80A3,0x80B8,0x80B5,0x80AD,
-	0x8220,0x82A0,0x82C0,0x82AB,0x829A,0x8298,0x829B,0x82B5,
-	0x82A7,0x82AE,0x82BC,0x829E,0x82BA,0x82B4,0x82A8,0x82A1,
-	0x82A9,0x82C2,0x82A4,0x82C3,0x82B6,0x82A2,0x8670,0x866F,
-	0x866D,0x866E,0x8C56,0x8FD2,0x8FCB,0x8FD3,0x8FCD,0x8FD6,
-	0x8FD5,0x8FD7,0x90B2,0x90B4,0x90AF,0x90B3,0x90B0,0x9639,
-	0x963D,0x963C,0x963A,0x9643,0x4FCD,0x4FC5,
-	/* Range 0x2921 - 0x297E, array index: 0x03E9 */
-	0x4FD3,0x4FB2,0x4FC9,0x4FCB,0x4FC1,0x4FD4,0x4FDC,0x4FD9,
-	0x4FBB,0x4FB3,0x4FDB,0x4FC7,0x4FD6,0x4FBA,0x4FC0,0x4FB9,
-	0x4FEC,0x5244,0x5249,0x52C0,0x52C2,0x533D,0x537C,0x5397,
-	0x5396,0x5399,0x5398,0x54BA,0x54A1,0x54AD,0x54A5,0x54CF,
-	0x54C3,0x830D,0x54B7,0x54AE,0x54D6,0x54B6,0x54C5,0x54C6,
-	0x54A0,0x5470,0x54BC,0x54A2,0x54BE,0x5472,0x54DE,0x54B0,
-	0x57B5,0x579E,0x579F,0x57A4,0x578C,0x5797,0x579D,0x579B,
-	0x5794,0x5798,0x578F,0x5799,0x57A5,0x579A,0x5795,0x58F4,
-	0x590D,0x5953,0x59E1,0x59DE,0x59EE,0x5A00,0x59F1,0x59DD,
-	0x59FA,0x59FD,0x59FC,0x59F6,0x59E4,0x59F2,0x59F7,0x59DB,
-	0x59E9,0x59F3,0x59F5,0x59E0,0x59FE,0x59F4,0x59ED,0x5BA8,
-	0x5C4C,0x5CD0,0x5CD8,0x5CCC,0x5CD7,0x5CCB,
-	/* Range 0x2A21 - 0x2A7E, array index: 0x0447 */
-	0x5CDB,0x5CDE,0x5CDA,0x5CC9,0x5CC7,0x5CCA,0x5CD6,0x5CD3,
-	0x5CD4,0x5CCF,0x5CC8,0x5CC6,0x5CCE,0x5CDF,0x5CF8,0x5DF9,
-	0x5E21,0x5E22,0x5E23,0x5E20,0x5E24,0x5EB0,0x5EA4,0x5EA2,
-	0x5E9B,0x5EA3,0x5EA5,0x5F07,0x5F2E,0x5F56,0x5F86,0x6037,
-	0x6039,0x6054,0x6072,0x605E,0x6045,0x6053,0x6047,0x6049,
-	0x605B,0x604C,0x6040,0x6042,0x605F,0x6024,0x6044,0x6058,
-	0x6066,0x606E,0x6242,0x6243,0x62CF,0x630D,0x630B,0x62F5,
-	0x630E,0x6303,0x62EB,0x62F9,0x630F,0x630C,0x62F8,0x62F6,
-	0x6300,0x6313,0x6314,0x62FA,0x6315,0x62FB,0x62F0,0x6541,
-	0x6543,0x65AA,0x65BF,0x6636,0x6621,0x6632,0x6635,0x661C,
-	0x6626,0x6622,0x6633,0x662B,0x663A,0x661D,0x6634,0x6639,
-	0x662E,0x670F,0x6710,0x67C1,0x67F2,0x67C8,
-	/* Range 0x2B21 - 0x2B7E, array index: 0x04A5 */
-	0x67BA,0x67DC,0x67BB,0x67F8,0x67D8,0x67C0,0x67B7,0x67C5,
-	0x67EB,0x67E4,0x67DF,0x67B5,0x67CD,0x67B3,0x67F7,0x67F6,
-	0x67EE,0x67E3,0x67C2,0x67B9,0x67CE,0x67E7,0x67F0,0x67B2,
-	0x67FC,0x67C6,0x67ED,0x67CC,0x67AE,0x67E6,0x67DB,0x67FA,
-	0x67C9,0x67CA,0x67C3,0x67EA,0x67CB,0x6B28,0x6B82,0x6B84,
-	0x6BB6,0x6BD6,0x6BD8,0x6BE0,0x6C20,0x6C21,0x6D28,0x6D34,
-	0x6D2D,0x6D1F,0x6D3C,0x6D3F,0x6D12,0x6D0A,0x6CDA,0x6D33,
-	0x6D04,0x6D19,0x6D3A,0x6D1A,0x6D11,0x6D00,0x6D1D,0x6D42,
-	0x6D01,0x6D18,0x6D37,0x6D03,0x6D0F,0x6D40,0x6D07,0x6D20,
-	0x6D2C,0x6D08,0x6D22,0x6D09,0x6D10,0x70B7,0x709F,0x70BE,
-	0x70B1,0x70B0,0x70A1,0x70B4,0x70B5,0x70A9,0x7241,0x7249,
-	0x724A,0x726C,0x7270,0x7273,0x726E,0x72CA,
-	/* Range 0x2C21 - 0x2C7E, array index: 0x0503 */
-	0x72E4,0x72E8,0x72EB,0x72DF,0x72EA,0x72E6,0x72E3,0x7385,
-	0x73CC,0x73C2,0x73C8,0x73C5,0x73B9,0x73B6,0x73B5,0x73B4,
-	0x73EB,0x73BF,0x73C7,0x73BE,0x73C3,0x73C6,0x73B8,0x73CB,
-	0x74EC,0x74EE,0x752E,0x7547,0x7548,0x75A7,0x75AA,0x7679,
-	0x76C4,0x7708,0x7703,0x7704,0x7705,0x770A,0x76F7,0x76FB,
-	0x76FA,0x77E7,0x77E8,0x7806,0x7811,0x7812,0x7805,0x7810,
-	0x780F,0x780E,0x7809,0x7803,0x7813,0x794A,0x794C,0x794B,
-	0x7945,0x7944,0x79D5,0x79CD,0x79CF,0x79D6,0x79CE,0x7A80,
-	0x7A7E,0x7AD1,0x7B00,0x7B01,0x7C7A,0x7C78,0x7C79,0x7C7F,
-	0x7C80,0x7C81,0x7D03,0x7D08,0x7D01,0x7F58,0x7F91,0x7F8D,
-	0x7FBE,0x8007,0x800E,0x800F,0x8014,0x8037,0x80D8,0x80C7,
-	0x80E0,0x80D1,0x80C8,0x80C2,0x80D0,0x80C5,
-	/* Range 0x2D21 - 0x2D7E, array index: 0x0561 */
-	0x80E3,0x80D9,0x80DC,0x80CA,0x80D5,0x80C9,0x80CF,0x80D7,
-	0x80E6,0x80CD,0x81FF,0x8221,0x8294,0x82D9,0x82FE,0x82F9,
-	0x8307,0x82E8,0x8300,0x82D5,0x833A,0x82EB,0x82D6,0x82F4,
-	0x82EC,0x82E1,0x82F2,0x82F5,0x830C,0x82FB,0x82F6,0x82F0,
-	0x82EA,0x82E4,0x82E0,0x82FA,0x82F3,0x82ED,0x8677,0x8674,
-	0x867C,0x8673,0x8841,0x884E,0x8867,0x886A,0x8869,0x89D3,
-	0x8A04,0x8A07,0x8D72,0x8FE3,0x8FE1,0x8FEE,0x8FE0,0x90F1,
-	0x90BD,0x90BF,0x90D5,0x90C5,0x90BE,0x90C7,0x90CB,0x90C8,
-	0x91D4,0x91D3,0x9654,0x964F,0x9651,0x9653,0x964A,0x964E,
-	0x501E,0x5005,0x5007,0x5013,0x5022,0x5030,0x501B,0x4FF5,
-	0x4FF4,0x5033,0x5037,0x502C,0x4FF6,0x4FF7,0x5017,0x501C,
-	0x5020,0x5027,0x5035,0x502F,0x5031,0x500E,
-	/* Range 0x2E21 - 0x2E7E, array index: 0x05BF */
-	0x515A,0x5194,0x5193,0x51CA,0x51C4,0x51C5,0x51C8,0x51CE,
-	0x5261,0x525A,0x5252,0x525E,0x525F,0x5255,0x5262,0x52CD,
-	0x530E,0x539E,0x5526,0x54E2,0x5517,0x5512,0x54E7,0x54F3,
-	0x54E4,0x551A,0x54FF,0x5504,0x5508,0x54EB,0x5511,0x5505,
-	0x54F1,0x550A,0x54FB,0x54F7,0x54F8,0x54E0,0x550E,0x5503,
-	0x550B,0x5701,0x5702,0x57CC,0x5832,0x57D5,0x57D2,0x57BA,
-	0x57C6,0x57BD,0x57BC,0x57B8,0x57B6,0x57BF,0x57C7,0x57D0,
-	0x57B9,0x57C1,0x590E,0x594A,0x5A19,0x5A16,0x5A2D,0x5A2E,
-	0x5A15,0x5A0F,0x5A17,0x5A0A,0x5A1E,0x5A33,0x5B6C,0x5BA7,
-	0x5BAD,0x5BAC,0x5C03,0x5C56,0x5C54,0x5CEC,0x5CFF,0x5CEE,
-	0x5CF1,0x5CF7,0x5D00,0x5CF9,0x5E29,0x5E28,0x5EA8,0x5EAE,
-	0x5EAA,0x5EAC,0x5F33,0x5F30,0x5F67,0x605D,
-	/* Range 0x2F21 - 0x2F7E, array index: 0x061D */
-	0x605A,0x6067,0x6041,0x60A2,0x6088,0x6080,0x6092,0x6081,
-	0x609D,0x6083,0x6095,0x609B,0x6097,0x6087,0x609C,0x608E,
-	0x6219,0x6246,0x62F2,0x6310,0x6356,0x632C,0x6344,0x6345,
-	0x6336,0x6343,0x63E4,0x6339,0x634B,0x634A,0x633C,0x6329,
-	0x6341,0x6334,0x6358,0x6354,0x6359,0x632D,0x6347,0x6333,
-	0x635A,0x6351,0x6338,0x6357,0x6340,0x6348,0x654A,0x6546,
-	0x65C6,0x65C3,0x65C4,0x65C2,0x664A,0x665F,0x6647,0x6651,
-	0x6712,0x6713,0x681F,0x681A,0x6849,0x6832,0x6833,0x683B,
-	0x684B,0x684F,0x6816,0x6831,0x681C,0x6835,0x682B,0x682D,
-	0x682F,0x684E,0x6844,0x6834,0x681D,0x6812,0x6814,0x6826,
-	0x6828,0x682E,0x684D,0x683A,0x6825,0x6820,0x6B2C,0x6B2F,
-	0x6B2D,0x6B31,0x6B34,0x6B6D,0x8082,0x6B88,
-	/* Range 0x3021 - 0x307E, array index: 0x067B */
-	0x6BE6,0x6BE4,0x6BE8,0x6BE3,0x6BE2,0x6BE7,0x6C25,0x6D7A,
-	0x6D63,0x6D64,0x6D76,0x6D0D,0x6D61,0x6D92,0x6D58,0x6D62,
-	0x6D6D,0x6D6F,0x6D91,0x6D8D,0x6DEF,0x6D7F,0x6D86,0x6D5E,
-	0x6D67,0x6D60,0x6D97,0x6D70,0x6D7C,0x6D5F,0x6D82,0x6D98,
-	0x6D2F,0x6D68,0x6D8B,0x6D7E,0x6D80,0x6D84,0x6D16,0x6D83,
-	0x6D7B,0x6D7D,0x6D75,0x6D90,0x70DC,0x70D3,0x70D1,0x70DD,
-	0x70CB,0x7F39,0x70E2,0x70D7,0x70D2,0x70DE,0x70E0,0x70D4,
-	0x70CD,0x70C5,0x70C6,0x70C7,0x70DA,0x70CE,0x70E1,0x7242,
-	0x7278,0x7277,0x7276,0x7300,0x72FA,0x72F4,0x72FE,0x72F6,
-	0x72F3,0x72FB,0x7301,0x73D3,0x73D9,0x73E5,0x73D6,0x73BC,
-	0x73E7,0x73E3,0x73E9,0x73DC,0x73D2,0x73DB,0x73D4,0x73DD,
-	0x73DA,0x73D7,0x73D8,0x73E8,0x74DE,0x74DF,
-	/* Range 0x3121 - 0x317E, array index: 0x06D9 */
-	0x74F4,0x74F5,0x7521,0x755B,0x755F,0x75B0,0x75C1,0x75BB,
-	0x75C4,0x75C0,0x75BF,0x75B6,0x75BA,0x768A,0x76C9,0x771D,
-	0x771B,0x7710,0x7713,0x7712,0x7723,0x7711,0x7715,0x7719,
-	0x771A,0x7722,0x7727,0x7823,0x782C,0x7822,0x7835,0x782F,
-	0x7828,0x782E,0x782B,0x7821,0x7829,0x7833,0x782A,0x7831,
-	0x7954,0x795B,0x794F,0x795C,0x7953,0x7952,0x7951,0x79EB,
-	0x79EC,0x79E0,0x79EE,0x79ED,0x79EA,0x79DC,0x79DE,0x79DD,
-	0x7A86,0x7A89,0x7A85,0x7A8B,0x7A8C,0x7A8A,0x7A87,0x7AD8,
-	0x7B10,0x7B04,0x7B13,0x7B05,0x7B0F,0x7B08,0x7B0A,0x7B0E,
-	0x7B09,0x7B12,0x7C84,0x7C91,0x7C8A,0x7C8C,0x7C88,0x7C8D,
-	0x7C85,0x7D1E,0x7D1D,0x7D11,0x7D0E,0x7D18,0x7D16,0x7D13,
-	0x7D1F,0x7D12,0x7D0F,0x7D0C,0x7F5C,0x7F61,
-	/* Range 0x3221 - 0x327E, array index: 0x0737 */
-	0x7F5E,0x7F60,0x7F5D,0x7F5B,0x7F96,0x7F92,0x7FC3,0x7FC2,
-	0x7FC0,0x8016,0x803E,0x8039,0x80FA,0x80F2,0x80F9,0x80F5,
-	0x8101,0x80FB,0x8100,0x8201,0x822F,0x8225,0x8333,0x832D,
-	0x8344,0x8319,0x8351,0x8325,0x8356,0x833F,0x8341,0x8326,
-	0x831C,0x8322,0x8342,0x834E,0x831B,0x832A,0x8308,0x833C,
-	0x834D,0x8316,0x8324,0x8320,0x8337,0x832F,0x8329,0x8347,
-	0x8345,0x834C,0x8353,0x831E,0x832C,0x834B,0x8327,0x8348,
-	0x8653,0x8652,0x86A2,0x86A8,0x8696,0x868D,0x8691,0x869E,
-	0x8687,0x8697,0x8686,0x868B,0x869A,0x8685,0x86A5,0x8699,
-	0x86A1,0x86A7,0x8695,0x8698,0x868E,0x869D,0x8690,0x8694,
-	0x8843,0x8844,0x886D,0x8875,0x8876,0x8872,0x8880,0x8871,
-	0x887F,0x886F,0x8883,0x887E,0x8874,0x887C,
-	/* Range 0x3321 - 0x337E, array index: 0x0795 */
-	0x8A12,0x8C47,0x8C57,0x8C7B,0x8CA4,0x8CA3,0x8D76,0x8D78,
-	0x8DB5,0x8DB7,0x8DB6,0x8ED1,0x8ED3,0x8FFE,0x8FF5,0x9002,
-	0x8FFF,0x8FFB,0x9004,0x8FFC,0x8FF6,0x90D6,0x90E0,0x90D9,
-	0x90DA,0x90E3,0x90DF,0x90E5,0x90D8,0x90DB,0x90D7,0x90DC,
-	0x90E4,0x9150,0x914E,0x914F,0x91D5,0x91E2,0x91DA,0x965C,
-	0x965F,0x96BC,0x98E3,0x9ADF,0x9B2F,0x4E7F,0x5070,0x506A,
-	0x5061,0x505E,0x5060,0x5053,0x504B,0x505D,0x5072,0x5048,
-	0x504D,0x5041,0x505B,0x504A,0x5062,0x5015,0x5045,0x505F,
-	0x5069,0x506B,0x5063,0x5064,0x5046,0x5040,0x506E,0x5073,
-	0x5057,0x5051,0x51D0,0x526B,0x526D,0x526C,0x526E,0x52D6,
-	0x52D3,0x532D,0x539C,0x5575,0x5576,0x553C,0x554D,0x5550,
-	0x5534,0x552A,0x5551,0x5562,0x5536,0x5535,
-	/* Range 0x3421 - 0x347E, array index: 0x07F3 */
-	0x5530,0x5552,0x5545,0x550C,0x5532,0x5565,0x554E,0x5539,
-	0x5548,0x552D,0x553B,0x5540,0x554B,0x570A,0x5707,0x57FB,
-	0x5814,0x57E2,0x57F6,0x57DC,0x57F4,0x5800,0x57ED,0x57FD,
-	0x5808,0x57F8,0x580B,0x57F3,0x57CF,0x5807,0x57EE,0x57E3,
-	0x57F2,0x57E5,0x57EC,0x57E1,0x580E,0x57FC,0x5810,0x57E7,
-	0x5801,0x580C,0x57F1,0x57E9,0x57F0,0x580D,0x5804,0x595C,
-	0x5A60,0x5A58,0x5A55,0x5A67,0x5A5E,0x5A38,0x5A35,0x5A6D,
-	0x5A50,0x5A5F,0x5A65,0x5A6C,0x5A53,0x5A64,0x5A57,0x5A43,
-	0x5A5D,0x5A52,0x5A44,0x5A5B,0x5A48,0x5A8E,0x5A3E,0x5A4D,
-	0x5A39,0x5A4C,0x5A70,0x5A69,0x5A47,0x5A51,0x5A56,0x5A42,
-	0x5A5C,0x5B72,0x5B6E,0x5BC1,0x5BC0,0x5C59,0x5D1E,0x5D0B,
-	0x5D1D,0x5D1A,0x5D20,0x5D0C,0x5D28,0x5D0D,
-	/* Range 0x3521 - 0x357E, array index: 0x0851 */
-	0x5D26,0x5D25,0x5D0F,0x5D30,0x5D12,0x5D23,0x5D1F,0x5D2E,
-	0x5E3E,0x5E34,0x5EB1,0x5EB4,0x5EB9,0x5EB2,0x5EB3,0x5F36,
-	0x5F38,0x5F9B,0x5F96,0x5F9F,0x608A,0x6090,0x6086,0x60BE,
-	0x60B0,0x60BA,0x60D3,0x60D4,0x60CF,0x60E4,0x60D9,0x60DD,
-	0x60C8,0x60B1,0x60DB,0x60B7,0x60CA,0x60BF,0x60C3,0x60CD,
-	0x60C0,0x6332,0x6365,0x638A,0x6382,0x637D,0x63BD,0x639E,
-	0x63AD,0x639D,0x6397,0x63AB,0x638E,0x636F,0x6387,0x6390,
-	0x636E,0x63AF,0x6375,0x639C,0x636D,0x63AE,0x637C,0x63A4,
-	0x633B,0x639F,0x6378,0x6385,0x6381,0x6391,0x638D,0x6370,
-	0x6553,0x65CD,0x6665,0x6661,0x665B,0x6659,0x665C,0x6662,
-	0x6718,0x6879,0x6887,0x6890,0x689C,0x686D,0x686E,0x68AE,
-	0x68AB,0x6956,0x686F,0x68A3,0x68AC,0x68A9,
-	/* Range 0x3621 - 0x367E, array index: 0x08AF */
-	0x6875,0x6874,0x68B2,0x688F,0x6877,0x6892,0x687C,0x686B,
-	0x6872,0x68AA,0x6880,0x6871,0x687E,0x689B,0x6896,0x688B,
-	0x68A0,0x6889,0x68A4,0x6878,0x687B,0x6891,0x688C,0x688A,
-	0x687D,0x6B36,0x6B33,0x6B37,0x6B38,0x6B91,0x6B8F,0x6B8D,
-	0x6B8E,0x6B8C,0x6C2A,0x6DC0,0x6DAB,0x6DB4,0x6DB3,0x6E74,
-	0x6DAC,0x6DE9,0x6DE2,0x6DB7,0x6DF6,0x6DD4,0x6E00,0x6DC8,
-	0x6DE0,0x6DDF,0x6DD6,0x6DBE,0x6DE5,0x6DDC,0x6DDD,0x6DDB,
-	0x6DF4,0x6DCA,0x6DBD,0x6DED,0x6DF0,0x6DBA,0x6DD5,0x6DC2,
-	0x6DCF,0x6DC9,0x6DD0,0x6DF2,0x6DD3,0x6DFD,0x6DD7,0x6DCD,
-	0x6DE3,0x6DBB,0x70FA,0x710D,0x70F7,0x7117,0x70F4,0x710C,
-	0x70F0,0x7104,0x70F3,0x7110,0x70FC,0x70FF,0x7106,0x7113,
-	0x7100,0x70F8,0x70F6,0x710B,0x7102,0x710E,
-	/* Range 0x3721 - 0x377E, array index: 0x090D */
-	0x727E,0x727B,0x727C,0x727F,0x731D,0x7317,0x7307,0x7311,
-	0x7318,0x730A,0x7308,0x72FF,0x730F,0x731E,0x7388,0x73F6,
-	0x73F8,0x73F5,0x7404,0x7401,0x73FD,0x7407,0x7400,0x73FA,
-	0x73FC,0x73FF,0x740C,0x740B,0x73F4,0x7408,0x7564,0x7563,
-	0x75CE,0x75D2,0x75CF,0x75CB,0x75CC,0x75D1,0x75D0,0x768F,
-	0x7689,0x76D3,0x7739,0x772F,0x772D,0x7731,0x7732,0x7734,
-	0x7733,0x773D,0x7725,0x773B,0x7735,0x7848,0x7852,0x7849,
-	0x784D,0x784A,0x784C,0x7826,0x7845,0x7850,0x7964,0x7967,
-	0x7969,0x796A,0x7963,0x796B,0x7961,0x79BB,0x79FA,0x79F8,
-	0x79F6,0x79F7,0x7A8F,0x7A94,0x7A90,0x7B35,0x7B3B,0x7B34,
-	0x7B25,0x7B30,0x7B22,0x7B24,0x7B33,0x7B18,0x7B2A,0x7B1D,
-	0x7B31,0x7B2B,0x7B2D,0x7B2F,0x7B32,0x7B38,
-	/* Range 0x3821 - 0x387E, array index: 0x096B */
-	0x7B1A,0x7B23,0x7C94,0x7C98,0x7C96,0x7CA3,0x7D35,0x7D3D,
-	0x7D38,0x7D36,0x7D3A,0x7D45,0x7D2C,0x7D29,0x7D41,0x7D47,
-	0x7D3E,0x7D3F,0x7D4A,0x7D3B,0x7D28,0x7F63,0x7F95,0x7F9C,
-	0x7F9D,0x7F9B,0x7FCA,0x7FCB,0x7FCD,0x7FD0,0x7FD1,0x7FC7,
-	0x7FCF,0x7FC9,0x801F,0x801E,0x801B,0x8047,0x8043,0x8048,
-	0x8118,0x8125,0x8119,0x811B,0x812D,0x811F,0x812C,0x811E,
-	0x8121,0x8115,0x8127,0x811D,0x8122,0x8211,0x8238,0x8233,
-	0x823A,0x8234,0x8232,0x8274,0x8390,0x83A3,0x83A8,0x838D,
-	0x837A,0x8373,0x83A4,0x8374,0x838F,0x8381,0x8395,0x8399,
-	0x8375,0x8394,0x83A9,0x837D,0x8383,0x838C,0x839D,0x839B,
-	0x83AA,0x838B,0x837E,0x83A5,0x83AF,0x8388,0x8397,0x83B0,
-	0x837F,0x83A6,0x8387,0x83AE,0x8376,0x8659,
-	/* Range 0x3921 - 0x397E, array index: 0x09C9 */
-	0x8656,0x86BF,0x86B7,0x86C2,0x86C1,0x86C5,0x86BA,0x86B0,
-	0x86C8,0x86B9,0x86B3,0x86B8,0x86CC,0x86B4,0x86BB,0x86BC,
-	0x86C3,0x86BD,0x86BE,0x8852,0x8889,0x8895,0x88A8,0x88A2,
-	0x88AA,0x889A,0x8891,0x88A1,0x889F,0x8898,0x88A7,0x8899,
-	0x889B,0x8897,0x88A4,0x88AC,0x888C,0x8893,0x888E,0x8982,
-	0x89D6,0x89D9,0x89D5,0x8A30,0x8A27,0x8A2C,0x8A1E,0x8C39,
-	0x8C3B,0x8C5C,0x8C5D,0x8C7D,0x8CA5,0x8D7D,0x8D7B,0x8D79,
-	0x8DBC,0x8DC2,0x8DB9,0x8DBF,0x8DC1,0x8ED8,0x8EDE,0x8EDD,
-	0x8EDC,0x8ED7,0x8EE0,0x8EE1,0x9024,0x900B,0x9011,0x901C,
-	0x900C,0x9021,0x90EF,0x90EA,0x90F0,0x90F4,0x90F2,0x90F3,
-	0x90D4,0x90EB,0x90EC,0x90E9,0x9156,0x9158,0x915A,0x9153,
-	0x9155,0x91EC,0x91F4,0x91F1,0x91F3,0x91F8,
-	/* Range 0x3A21 - 0x3A7E, array index: 0x0A27 */
-	0x91E4,0x91F9,0x91EA,0x91EB,0x91F7,0x91E8,0x91EE,0x957A,
-	0x9586,0x9588,0x967C,0x966D,0x966B,0x9671,0x966F,0x96BF,
-	0x976A,0x9804,0x98E5,0x9997,0x509B,0x5095,0x5094,0x509E,
-	0x508B,0x50A3,0x5083,0x508C,0x508E,0x509D,0x5068,0x509C,
-	0x5092,0x5082,0x5087,0x515F,0x51D4,0x5312,0x5311,0x53A4,
-	0x53A7,0x5591,0x55A8,0x55A5,0x55AD,0x5577,0x5645,0x55A2,
-	0x5593,0x5588,0x558F,0x55B5,0x5581,0x55A3,0x5592,0x55A4,
-	0x557D,0x558C,0x55A6,0x557F,0x5595,0x55A1,0x558E,0x570C,
-	0x5829,0x5837,0x5819,0x581E,0x5827,0x5823,0x5828,0x57F5,
-	0x5848,0x5825,0x581C,0x581B,0x5833,0x583F,0x5836,0x582E,
-	0x5839,0x5838,0x582D,0x582C,0x583B,0x5961,0x5AAF,0x5A94,
-	0x5A9F,0x5A7A,0x5AA2,0x5A9E,0x5A78,0x5AA6,
-	/* Range 0x3B21 - 0x3B7E, array index: 0x0A85 */
-	0x5A7C,0x5AA5,0x5AAC,0x5A95,0x5AAE,0x5A37,0x5A84,0x5A8A,
-	0x5A97,0x5A83,0x5A8B,0x5AA9,0x5A7B,0x5A7D,0x5A8C,0x5A9C,
-	0x5A8F,0x5A93,0x5A9D,0x5BEA,0x5BCD,0x5BCB,0x5BD4,0x5BD1,
-	0x5BCA,0x5BCE,0x5C0C,0x5C30,0x5D37,0x5D43,0x5D6B,0x5D41,
-	0x5D4B,0x5D3F,0x5D35,0x5D51,0x5D4E,0x5D55,0x5D33,0x5D3A,
-	0x5D52,0x5D3D,0x5D31,0x5D59,0x5D42,0x5D39,0x5D49,0x5D38,
-	0x5D3C,0x5D32,0x5D36,0x5D40,0x5D45,0x5E44,0x5E41,0x5F58,
-	0x5FA6,0x5FA5,0x5FAB,0x60C9,0x60B9,0x60CC,0x60E2,0x60CE,
-	0x60C4,0x6114,0x60F2,0x610A,0x6116,0x6105,0x60F5,0x6113,
-	0x60F8,0x60FC,0x60FE,0x60C1,0x6103,0x6118,0x611D,0x6110,
-	0x60FF,0x6104,0x610B,0x624A,0x6394,0x63B1,0x63B0,0x63CE,
-	0x63E5,0x63E8,0x63EF,0x63C3,0x649D,0x63F3,
-	/* Range 0x3C21 - 0x3C7E, array index: 0x0AE3 */
-	0x63CA,0x63E0,0x63F6,0x63D5,0x63F2,0x63F5,0x6461,0x63DF,
-	0x63BE,0x63DD,0x63DC,0x63C4,0x63D8,0x63D3,0x63C2,0x63C7,
-	0x63CC,0x63CB,0x63C8,0x63F0,0x63D7,0x63D9,0x6532,0x6567,
-	0x656A,0x6564,0x655C,0x6568,0x6565,0x658C,0x659D,0x659E,
-	0x65AE,0x65D0,0x65D2,0x667C,0x666C,0x667B,0x6680,0x6671,
-	0x6679,0x666A,0x6672,0x6701,0x690C,0x68D3,0x6904,0x68DC,
-	0x692A,0x68EC,0x68EA,0x68F1,0x690F,0x68D6,0x68F7,0x68EB,
-	0x68E4,0x68F6,0x6913,0x6910,0x68F3,0x68E1,0x6907,0x68CC,
-	0x6908,0x6970,0x68B4,0x6911,0x68EF,0x68C6,0x6914,0x68F8,
-	0x68D0,0x68FD,0x68FC,0x68E8,0x690B,0x690A,0x6917,0x68CE,
-	0x68C8,0x68DD,0x68DE,0x68E6,0x68F4,0x68D1,0x6906,0x68D4,
-	0x68E9,0x6915,0x6925,0x68C7,0x6B39,0x6B3B,
-	/* Range 0x3D21 - 0x3D7E, array index: 0x0B41 */
-	0x6B3F,0x6B3C,0x6B94,0x6B97,0x6B99,0x6B95,0x6BBD,0x6BF0,
-	0x6BF2,0x6BF3,0x6C30,0x6DFC,0x6E46,0x6E47,0x6E1F,0x6E49,
-	0x6E88,0x6E3C,0x6E3D,0x6E45,0x6E62,0x6E2B,0x6E3F,0x6E41,
-	0x6E5D,0x6E73,0x6E1C,0x6E33,0x6E4B,0x6E40,0x6E51,0x6E3B,
-	0x6E03,0x6E2E,0x6E5E,0x6E68,0x6E5C,0x6E61,0x6E31,0x6E28,
-	0x6E60,0x6E71,0x6E6B,0x6E39,0x6E22,0x6E30,0x6E53,0x6E65,
-	0x6E27,0x6E78,0x6E64,0x6E77,0x6E55,0x6E79,0x6E52,0x6E66,
-	0x6E35,0x6E36,0x6E5A,0x7120,0x711E,0x712F,0x70FB,0x712E,
-	0x7131,0x7123,0x7125,0x7122,0x7132,0x711F,0x7128,0x713A,
-	0x711B,0x724B,0x725A,0x7288,0x7289,0x7286,0x7285,0x728B,
-	0x7312,0x730B,0x7330,0x7322,0x7331,0x7333,0x7327,0x7332,
-	0x732D,0x7326,0x7323,0x7335,0x730C,0x742E,
-	/* Range 0x3E21 - 0x3E7E, array index: 0x0B9F */
-	0x742C,0x7430,0x742B,0x7416,0x741A,0x7421,0x742D,0x7431,
-	0x7424,0x7423,0x741D,0x7429,0x7420,0x7432,0x74FB,0x752F,
-	0x756F,0x756C,0x75E7,0x75DA,0x75E1,0x75E6,0x75DD,0x75DF,
-	0x75E4,0x75D7,0x7695,0x7692,0x76DA,0x7746,0x7747,0x7744,
-	0x774D,0x7745,0x774A,0x774E,0x774B,0x774C,0x77DE,0x77EC,
-	0x7860,0x7864,0x7865,0x785C,0x786D,0x7871,0x786A,0x786E,
-	0x7870,0x7869,0x7868,0x785E,0x7862,0x7974,0x7973,0x7972,
-	0x7970,0x7A02,0x7A0A,0x7A03,0x7A0C,0x7A04,0x7A99,0x7AE6,
-	0x7AE4,0x7B4A,0x7B47,0x7B44,0x7B48,0x7B4C,0x7B4E,0x7B40,
-	0x7B58,0x7B45,0x7CA2,0x7C9E,0x7CA8,0x7CA1,0x7D58,0x7D6F,
-	0x7D63,0x7D53,0x7D56,0x7D67,0x7D6A,0x7D4F,0x7D6D,0x7D5C,
-	0x7D6B,0x7D52,0x7D54,0x7D69,0x7D51,0x7D5F,
-	/* Range 0x3F21 - 0x3F7E, array index: 0x0BFD */
-	0x7D4E,0x7F3E,0x7F3F,0x7F65,0x7F66,0x7FA2,0x7FA0,0x7FA1,
-	0x7FD7,0x8051,0x804F,0x8050,0x80FE,0x80D4,0x8143,0x814A,
-	0x8152,0x814F,0x8147,0x813D,0x814D,0x813A,0x81E6,0x81EE,
-	0x81F7,0x81F8,0x81F9,0x8204,0x823C,0x823D,0x823F,0x8275,
-	0x833B,0x83CF,0x83F9,0x8423,0x83C0,0x83E8,0x8412,0x83E7,
-	0x83E4,0x83FC,0x83F6,0x8410,0x83C6,0x83C8,0x83EB,0x83E3,
-	0x83BF,0x8401,0x83DD,0x83E5,0x83D8,0x83FF,0x83E1,0x83CB,
-	0x83CE,0x83D6,0x83F5,0x83C9,0x8409,0x840F,0x83DE,0x8411,
-	0x8406,0x83C2,0x83F3,0x83D5,0x83FA,0x83C7,0x83D1,0x83EA,
-	0x8413,0x839A,0x83C3,0x83EC,0x83EE,0x83C4,0x83FB,0x83D7,
-	0x83E2,0x841B,0x83DB,0x83FE,0x86D8,0x86E2,0x86E6,0x86D3,
-	0x86E3,0x86DA,0x86EA,0x86DD,0x86EB,0x86DC,
-	/* Range 0x4021 - 0x407E, array index: 0x0C5B */
-	0x86EC,0x86E9,0x86D7,0x86E8,0x86D1,0x8848,0x8856,0x8855,
-	0x88BA,0x88D7,0x88B9,0x88B8,0x88C0,0x88BE,0x88B6,0x88BC,
-	0x88B7,0x88BD,0x88B2,0x8901,0x88C9,0x8995,0x8998,0x8997,
-	0x89DD,0x89DA,0x89DB,0x8A4E,0x8A4D,0x8A39,0x8A59,0x8A40,
-	0x8A57,0x8A58,0x8A44,0x8A45,0x8A52,0x8A48,0x8A51,0x8A4A,
-	0x8A4C,0x8A4F,0x8C5F,0x8C81,0x8C80,0x8CBA,0x8CBE,0x8CB0,
-	0x8CB9,0x8CB5,0x8D84,0x8D80,0x8D89,0x8DD8,0x8DD3,0x8DCD,
-	0x8DC7,0x8DD6,0x8DDC,0x8DCF,0x8DD5,0x8DD9,0x8DC8,0x8DD7,
-	0x8DC5,0x8EEF,0x8EF7,0x8EFA,0x8EF9,0x8EE6,0x8EEE,0x8EE5,
-	0x8EF5,0x8EE7,0x8EE8,0x8EF6,0x8EEB,0x8EF1,0x8EEC,0x8EF4,
-	0x8EE9,0x902D,0x9034,0x902F,0x9106,0x912C,0x9104,0x90FF,
-	0x90FC,0x9108,0x90F9,0x90FB,0x9101,0x9100,
-	/* Range 0x4121 - 0x417E, array index: 0x0CB9 */
-	0x9107,0x9105,0x9103,0x9161,0x9164,0x915F,0x9162,0x9160,
-	0x9201,0x920A,0x9225,0x9203,0x921A,0x9226,0x920F,0x920C,
-	0x9200,0x9212,0x91FF,0x91FD,0x9206,0x9204,0x9227,0x9202,
-	0x921C,0x9224,0x9219,0x9217,0x9205,0x9216,0x957B,0x958D,
-	0x958C,0x9590,0x9687,0x967E,0x9688,0x9689,0x9683,0x9680,
-	0x96C2,0x96C8,0x96C3,0x96F1,0x96F0,0x976C,0x9770,0x976E,
-	0x9807,0x98A9,0x98EB,0x9CE6,0x9EF9,0x4E83,0x4E84,0x4EB6,
-	0x50BD,0x50BF,0x50C6,0x50AE,0x50C4,0x50CA,0x50B4,0x50C8,
-	0x50C2,0x50B0,0x50C1,0x50BA,0x50B1,0x50CB,0x50C9,0x50B6,
-	0x50B8,0x51D7,0x527A,0x5278,0x527B,0x527C,0x55C3,0x55DB,
-	0x55CC,0x55D0,0x55CB,0x55CA,0x55DD,0x55C0,0x55D4,0x55C4,
-	0x55E9,0x55BF,0x55D2,0x558D,0x55CF,0x55D5,
-	/* Range 0x4221 - 0x427E, array index: 0x0D17 */
-	0x55E2,0x55D6,0x55C8,0x55F2,0x55CD,0x55D9,0x55C2,0x5714,
-	0x5853,0x5868,0x5864,0x584F,0x584D,0x5849,0x586F,0x5855,
-	0x584E,0x585D,0x5859,0x5865,0x585B,0x583D,0x5863,0x5871,
-	0x58FC,0x5AC7,0x5AC4,0x5ACB,0x5ABA,0x5AB8,0x5AB1,0x5AB5,
-	0x5AB0,0x5ABF,0x5AC8,0x5ABB,0x5AC6,0x5AB7,0x5AC0,0x5ACA,
-	0x5AB4,0x5AB6,0x5ACD,0x5AB9,0x5A90,0x5BD6,0x5BD8,0x5BD9,
-	0x5C1F,0x5C33,0x5D71,0x5D63,0x5D4A,0x5D65,0x5D72,0x5D6C,
-	0x5D5E,0x5D68,0x5D67,0x5D62,0x5DF0,0x5E4F,0x5E4E,0x5E4A,
-	0x5E4D,0x5E4B,0x5EC5,0x5ECC,0x5EC6,0x5ECB,0x5EC7,0x5F40,
-	0x5FAF,0x5FAD,0x60F7,0x6149,0x614A,0x612B,0x6145,0x6136,
-	0x6132,0x612E,0x6146,0x612F,0x614F,0x6129,0x6140,0x6220,
-	0x9168,0x6223,0x6225,0x6224,0x63C5,0x63F1,
-	/* Range 0x4321 - 0x437E, array index: 0x0D75 */
-	0x63EB,0x6410,0x6412,0x6409,0x6420,0x6424,0x6433,0x6443,
-	0x641F,0x6415,0x6418,0x6439,0x6437,0x6422,0x6423,0x640C,
-	0x6426,0x6430,0x6428,0x6441,0x6435,0x642F,0x640A,0x641A,
-	0x6440,0x6425,0x6427,0x640B,0x63E7,0x641B,0x642E,0x6421,
-	0x640E,0x656F,0x6592,0x65D3,0x6686,0x668C,0x6695,0x6690,
-	0x668B,0x668A,0x6699,0x6694,0x6678,0x6720,0x6966,0x695F,
-	0x6938,0x694E,0x6962,0x6971,0x693F,0x6945,0x696A,0x6939,
-	0x6942,0x6957,0x6959,0x697A,0x6948,0x6949,0x6935,0x696C,
-	0x6933,0x693D,0x6965,0x68F0,0x6978,0x6934,0x6969,0x6940,
-	0x696F,0x6944,0x6976,0x6958,0x6941,0x6974,0x694C,0x693B,
-	0x694B,0x6937,0x695C,0x694F,0x6951,0x6932,0x6952,0x692F,
-	0x697B,0x693C,0x6B46,0x6B45,0x6B43,0x6B42,
-	/* Range 0x4421 - 0x447E, array index: 0x0DD3 */
-	0x6B48,0x6B41,0x6B9B,0x6BFB,0x6BFC,0x6BF9,0x6BF7,0x6BF8,
-	0x6E9B,0x6ED6,0x6EC8,0x6E8F,0x6EC0,0x6E9F,0x6E93,0x6E94,
-	0x6EA0,0x6EB1,0x6EB9,0x6EC6,0x6ED2,0x6EBD,0x6EC1,0x6E9E,
-	0x6EC9,0x6EB7,0x6EB0,0x6ECD,0x6EA6,0x6ECF,0x6EB2,0x6EBE,
-	0x6EC3,0x6EDC,0x6ED8,0x6E99,0x6E92,0x6E8E,0x6E8D,0x6EA4,
-	0x6EA1,0x6EBF,0x6EB3,0x6ED0,0x6ECA,0x6E97,0x6EAE,0x6EA3,
-	0x7147,0x7154,0x7152,0x7163,0x7160,0x7141,0x715D,0x7162,
-	0x7172,0x7178,0x716A,0x7161,0x7142,0x7158,0x7143,0x714B,
-	0x7170,0x715F,0x7150,0x7153,0x7144,0x714D,0x715A,0x724F,
-	0x728D,0x728C,0x7291,0x7290,0x728E,0x733C,0x7342,0x733B,
-	0x733A,0x7340,0x734A,0x7349,0x7444,0x744A,0x744B,0x7452,
-	0x7451,0x7457,0x7440,0x744F,0x7450,0x744E,
-	/* Range 0x4521 - 0x457E, array index: 0x0E31 */
-	0x7442,0x7446,0x744D,0x7454,0x74E1,0x74FF,0x74FE,0x74FD,
-	0x751D,0x7579,0x7577,0x6983,0x75EF,0x760F,0x7603,0x75F7,
-	0x75FE,0x75FC,0x75F9,0x75F8,0x7610,0x75FB,0x75F6,0x75ED,
-	0x75F5,0x75FD,0x7699,0x76B5,0x76DD,0x7755,0x775F,0x7760,
-	0x7752,0x7756,0x775A,0x7769,0x7767,0x7754,0x7759,0x776D,
-	0x77E0,0x7887,0x789A,0x7894,0x788F,0x7884,0x7895,0x7885,
-	0x7886,0x78A1,0x7883,0x7879,0x7899,0x7880,0x7896,0x787B,
-	0x797C,0x7982,0x797D,0x7979,0x7A11,0x7A18,0x7A19,0x7A12,
-	0x7A17,0x7A15,0x7A22,0x7A13,0x7A1B,0x7A10,0x7AA3,0x7AA2,
-	0x7A9E,0x7AEB,0x7B66,0x7B64,0x7B6D,0x7B74,0x7B69,0x7B72,
-	0x7B65,0x7B73,0x7B71,0x7B70,0x7B61,0x7B78,0x7B76,0x7B63,
-	0x7CB2,0x7CB4,0x7CAF,0x7D88,0x7D86,0x7D80,
-	/* Range 0x4621 - 0x467E, array index: 0x0E8F */
-	0x7D8D,0x7D7F,0x7D85,0x7D7A,0x7D8E,0x7D7B,0x7D83,0x7D7C,
-	0x7D8C,0x7D94,0x7D84,0x7D7D,0x7D92,0x7F6D,0x7F6B,0x7F67,
-	0x7F68,0x7F6C,0x7FA6,0x7FA5,0x7FA7,0x7FDB,0x7FDC,0x8021,
-	0x8164,0x8160,0x8177,0x815C,0x8169,0x815B,0x8162,0x8172,
-	0x6721,0x815E,0x8176,0x8167,0x816F,0x8144,0x8161,0x821D,
-	0x8249,0x8244,0x8240,0x8242,0x8245,0x84F1,0x843F,0x8456,
-	0x8476,0x8479,0x848F,0x848D,0x8465,0x8451,0x8440,0x8486,
-	0x8467,0x8430,0x844D,0x847D,0x845A,0x8459,0x8474,0x8473,
-	0x845D,0x8507,0x845E,0x8437,0x843A,0x8434,0x847A,0x8443,
-	0x8478,0x8432,0x8445,0x8429,0x83D9,0x844B,0x842F,0x8442,
-	0x842D,0x845F,0x8470,0x8439,0x844E,0x844C,0x8452,0x846F,
-	0x84C5,0x848E,0x843B,0x8447,0x8436,0x8433,
-	/* Range 0x4721 - 0x477E, array index: 0x0EED */
-	0x8468,0x847E,0x8444,0x842B,0x8460,0x8454,0x846E,0x8450,
-	0x870B,0x8704,0x86F7,0x870C,0x86FA,0x86D6,0x86F5,0x874D,
-	0x86F8,0x870E,0x8709,0x8701,0x86F6,0x870D,0x8705,0x88D6,
-	0x88CB,0x88CD,0x88CE,0x88DE,0x88DB,0x88DA,0x88CC,0x88D0,
-	0x8985,0x899B,0x89DF,0x89E5,0x89E4,0x89E1,0x89E0,0x89E2,
-	0x89DC,0x89E6,0x8A76,0x8A86,0x8A7F,0x8A61,0x8A3F,0x8A77,
-	0x8A82,0x8A84,0x8A75,0x8A83,0x8A81,0x8A74,0x8A7A,0x8C3C,
-	0x8C4B,0x8C4A,0x8C65,0x8C64,0x8C66,0x8C86,0x8C84,0x8C85,
-	0x8CCC,0x8D68,0x8D69,0x8D91,0x8D8C,0x8D8E,0x8D8F,0x8D8D,
-	0x8D93,0x8D94,0x8D90,0x8D92,0x8DF0,0x8DE0,0x8DEC,0x8DF1,
-	0x8DEE,0x8DD0,0x8DE9,0x8DE3,0x8DE2,0x8DE7,0x8DF2,0x8DEB,
-	0x8DF4,0x8F06,0x8EFF,0x8F01,0x8F00,0x8F05,
-	/* Range 0x4821 - 0x487E, array index: 0x0F4B */
-	0x8F07,0x8F08,0x8F02,0x8F0B,0x9052,0x903F,0x9044,0x9049,
-	0x903D,0x9110,0x910D,0x910F,0x9111,0x9116,0x9114,0x910B,
-	0x910E,0x916E,0x916F,0x9248,0x9252,0x9230,0x923A,0x9266,
-	0x9233,0x9265,0x925E,0x9283,0x922E,0x924A,0x9246,0x926D,
-	0x926C,0x924F,0x9260,0x9267,0x926F,0x9236,0x9261,0x9270,
-	0x9231,0x9254,0x9263,0x9250,0x9272,0x924E,0x9253,0x924C,
-	0x9256,0x9232,0x959F,0x959C,0x959E,0x959B,0x9692,0x9693,
-	0x9691,0x9697,0x96CE,0x96FA,0x96FD,0x96F8,0x96F5,0x9773,
-	0x9777,0x9778,0x9772,0x980F,0x980D,0x980E,0x98AC,0x98F6,
-	0x98F9,0x99AF,0x99B2,0x99B0,0x99B5,0x9AAD,0x9AAB,0x9B5B,
-	0x9CEA,0x9CED,0x9CE7,0x9E80,0x9EFD,0x50E6,0x50D4,0x50D7,
-	0x50E8,0x50F3,0x50DB,0x50EA,0x50DD,0x50E4,
-	/* Range 0x4921 - 0x497E, array index: 0x0FA9 */
-	0x50D3,0x50EC,0x50F0,0x50EF,0x50E3,0x50E0,0x51D8,0x5280,
-	0x5281,0x52E9,0x52EB,0x5330,0x53AC,0x5627,0x5615,0x560C,
-	0x5612,0x55FC,0x560F,0x561C,0x5601,0x5613,0x5602,0x55FA,
-	0x561D,0x5604,0x55FF,0x55F9,0x5889,0x587C,0x5890,0x5898,
-	0x5886,0x5881,0x587F,0x5874,0x588B,0x587A,0x5887,0x5891,
-	0x588E,0x5876,0x5882,0x5888,0x587B,0x5894,0x588F,0x58FE,
-	0x596B,0x5ADC,0x5AEE,0x5AE5,0x5AD5,0x5AEA,0x5ADA,0x5AED,
-	0x5AEB,0x5AF3,0x5AE2,0x5AE0,0x5ADB,0x5AEC,0x5ADE,0x5ADD,
-	0x5AD9,0x5AE8,0x5ADF,0x5B77,0x5BE0,0x5BE3,0x5C63,0x5D82,
-	0x5D80,0x5D7D,0x5D86,0x5D7A,0x5D81,0x5D77,0x5D8A,0x5D89,
-	0x5D88,0x5D7E,0x5D7C,0x5D8D,0x5D79,0x5D7F,0x5E58,0x5E59,
-	0x5E53,0x5ED8,0x5ED1,0x5ED7,0x5ECE,0x5EDC,
-	/* Range 0x4A21 - 0x4A7E, array index: 0x1007 */
-	0x5ED5,0x5ED9,0x5ED2,0x5ED4,0x5F44,0x5F43,0x5F6F,0x5FB6,
-	0x612C,0x6128,0x6141,0x615E,0x6171,0x6173,0x6152,0x6153,
-	0x6172,0x616C,0x6180,0x6174,0x6154,0x617A,0x615B,0x6165,
-	0x613B,0x616A,0x6161,0x6156,0x6229,0x6227,0x622B,0x642B,
-	0x644D,0x645B,0x645D,0x6474,0x6476,0x6472,0x6473,0x647D,
-	0x6475,0x6466,0x64A6,0x644E,0x6482,0x645E,0x645C,0x644B,
-	0x6453,0x6460,0x6450,0x647F,0x643F,0x646C,0x646B,0x6459,
-	0x6465,0x6477,0x6573,0x65A0,0x66A1,0x66A0,0x669F,0x6705,
-	0x6704,0x6722,0x69B1,0x69B6,0x69C9,0x69A0,0x69CE,0x6996,
-	0x69B0,0x69AC,0x69BC,0x6991,0x6999,0x698E,0x69A7,0x698D,
-	0x69A9,0x69BE,0x69AF,0x69BF,0x69C4,0x69BD,0x69A4,0x69D4,
-	0x69B9,0x69CA,0x699A,0x69CF,0x69B3,0x6993,
-	/* Range 0x4B21 - 0x4B7E, array index: 0x1065 */
-	0x69AA,0x69A1,0x699E,0x69D9,0x6997,0x6990,0x69C2,0x69B5,
-	0x69A5,0x69C6,0x6B4A,0x6B4D,0x6B4B,0x6B9E,0x6B9F,0x6BA0,
-	0x6BC3,0x6BC4,0x6BFE,0x6ECE,0x6EF5,0x6EF1,0x6F03,0x6F25,
-	0x6EF8,0x6F37,0x6EFB,0x6F2E,0x6F09,0x6F4E,0x6F19,0x6F1A,
-	0x6F27,0x6F18,0x6F3B,0x6F12,0x6EED,0x6F0A,0x6F36,0x6F73,
-	0x6EF9,0x6EEE,0x6F2D,0x6F40,0x6F30,0x6F3C,0x6F35,0x6EEB,
-	0x6F07,0x6F0E,0x6F43,0x6F05,0x6EFD,0x6EF6,0x6F39,0x6F1C,
-	0x6EFC,0x6F3A,0x6F1F,0x6F0D,0x6F1E,0x6F08,0x6F21,0x7187,
-	0x7190,0x7189,0x7180,0x7185,0x7182,0x718F,0x717B,0x7186,
-	0x7181,0x7197,0x7244,0x7253,0x7297,0x7295,0x7293,0x7343,
-	0x734D,0x7351,0x734C,0x7462,0x7473,0x7471,0x7475,0x7472,
-	0x7467,0x746E,0x7500,0x7502,0x7503,0x757D,
-	/* Range 0x4C21 - 0x4C7E, array index: 0x10C3 */
-	0x7590,0x7616,0x7608,0x760C,0x7615,0x7611,0x760A,0x7614,
-	0x76B8,0x7781,0x777C,0x7785,0x7782,0x776E,0x7780,0x776F,
-	0x777E,0x7783,0x78B2,0x78AA,0x78B4,0x78AD,0x78A8,0x787E,
-	0x78AB,0x789E,0x78A5,0x78A0,0x78AC,0x78A2,0x78A4,0x7998,
-	0x798A,0x798B,0x7996,0x7995,0x7994,0x7993,0x7997,0x7988,
-	0x7992,0x7990,0x7A2B,0x7A4A,0x7A30,0x7A2F,0x7A28,0x7A26,
-	0x7AA8,0x7AAB,0x7AAC,0x7AEE,0x7B88,0x7B9C,0x7B8A,0x7B91,
-	0x7B90,0x7B96,0x7B8D,0x7B8C,0x7B9B,0x7B8E,0x7B85,0x7B98,
-	0x5284,0x7B99,0x7BA4,0x7B82,0x7CBB,0x7CBF,0x7CBC,0x7CBA,
-	0x7DA7,0x7DB7,0x7DC2,0x7DA3,0x7DAA,0x7DC1,0x7DC0,0x7DC5,
-	0x7D9D,0x7DCE,0x7DC4,0x7DC6,0x7DCB,0x7DCC,0x7DAF,0x7DB9,
-	0x7D96,0x7DBC,0x7D9F,0x7DA6,0x7DAE,0x7DA9,
-	/* Range 0x4D21 - 0x4D7E, array index: 0x1121 */
-	0x7DA1,0x7DC9,0x7F73,0x7FE2,0x7FE3,0x7FE5,0x7FDE,0x8024,
-	0x805D,0x805C,0x8189,0x8186,0x8183,0x8187,0x818D,0x818C,
-	0x818B,0x8215,0x8497,0x84A4,0x84A1,0x849F,0x84BA,0x84CE,
-	0x84C2,0x84AC,0x84AE,0x84AB,0x84B9,0x84B4,0x84C1,0x84CD,
-	0x84AA,0x849A,0x84B1,0x84D0,0x849D,0x84A7,0x84BB,0x84A2,
-	0x8494,0x84C7,0x84CC,0x849B,0x84A9,0x84AF,0x84A8,0x84D6,
-	0x8498,0x84B6,0x84CF,0x84A0,0x84D7,0x84D4,0x84D2,0x84DB,
-	0x84B0,0x8491,0x8661,0x8733,0x8723,0x8728,0x876B,0x8740,
-	0x872E,0x871E,0x8721,0x8719,0x871B,0x8743,0x872C,0x8741,
-	0x873E,0x8746,0x8720,0x8732,0x872A,0x872D,0x873C,0x8712,
-	0x873A,0x8731,0x8735,0x8742,0x8726,0x8727,0x8738,0x8724,
-	0x871A,0x8730,0x8711,0x88F7,0x88E7,0x88F1,
-	/* Range 0x4E21 - 0x4E7E, array index: 0x117F */
-	0x88F2,0x88FA,0x88FE,0x88EE,0x88FC,0x88F6,0x88FB,0x88F0,
-	0x88EC,0x88EB,0x899D,0x89A1,0x899F,0x899E,0x89E9,0x89EB,
-	0x89E8,0x8AAB,0x8A99,0x8A8B,0x8A92,0x8A8F,0x8A96,0x8C3D,
-	0x8C68,0x8C69,0x8CD5,0x8CCF,0x8CD7,0x8D96,0x8E09,0x8E02,
-	0x8DFF,0x8E0D,0x8DFD,0x8E0A,0x8E03,0x8E07,0x8E06,0x8E05,
-	0x8DFE,0x8E00,0x8E04,0x8F10,0x8F11,0x8F0E,0x8F0D,0x9123,
-	0x911C,0x9120,0x9122,0x911F,0x911D,0x911A,0x9124,0x9121,
-	0x911B,0x917A,0x9172,0x9179,0x9173,0x92A5,0x92A4,0x9276,
-	0x929B,0x927A,0x92A0,0x9294,0x92AA,0x928D,0x92A6,0x929A,
-	0x92AB,0x9279,0x9297,0x927F,0x92A3,0x92EE,0x928E,0x9282,
-	0x9295,0x92A2,0x927D,0x9288,0x92A1,0x928A,0x9286,0x928C,
-	0x9299,0x92A7,0x927E,0x9287,0x92A9,0x929D,
-	/* Range 0x4F21 - 0x4F7E, array index: 0x11DD */
-	0x928B,0x922D,0x969E,0x96A1,0x96FF,0x9758,0x977D,0x977A,
-	0x977E,0x9783,0x9780,0x9782,0x977B,0x9784,0x9781,0x977F,
-	0x97CE,0x97CD,0x9816,0x98AD,0x98AE,0x9902,0x9900,0x9907,
-	0x999D,0x999C,0x99C3,0x99B9,0x99BB,0x99BA,0x99C2,0x99BD,
-	0x99C7,0x9AB1,0x9AE3,0x9AE7,0x9B3E,0x9B3F,0x9B60,0x9B61,
-	0x9B5F,0x9CF1,0x9CF2,0x9CF5,0x9EA7,0x50FF,0x5103,0x5130,
-	0x50F8,0x5106,0x5107,0x50F6,0x50FE,0x510B,0x510C,0x50FD,
-	0x510A,0x528B,0x528C,0x52F1,0x52EF,0x5648,0x5642,0x564C,
-	0x5635,0x5641,0x564A,0x5649,0x5646,0x5658,0x565A,0x5640,
-	0x5633,0x563D,0x562C,0x563E,0x5638,0x562A,0x563A,0x571A,
-	0x58AB,0x589D,0x58B1,0x58A0,0x58A3,0x58AF,0x58AC,0x58A5,
-	0x58A1,0x58FF,0x5AFF,0x5AF4,0x5AFD,0x5AF7,
-	/* Range 0x5021 - 0x507E, array index: 0x123B */
-	0x5AF6,0x5B03,0x5AF8,0x5B02,0x5AF9,0x5B01,0x5B07,0x5B05,
-	0x5B0F,0x5C67,0x5D99,0x5D97,0x5D9F,0x5D92,0x5DA2,0x5D93,
-	0x5D95,0x5DA0,0x5D9C,0x5DA1,0x5D9A,0x5D9E,0x5E69,0x5E5D,
-	0x5E60,0x5E5C,0x7DF3,0x5EDB,0x5EDE,0x5EE1,0x5F49,0x5FB2,
-	0x618B,0x6183,0x6179,0x61B1,0x61B0,0x61A2,0x6189,0x619B,
-	0x6193,0x61AF,0x61AD,0x619F,0x6192,0x61AA,0x61A1,0x618D,
-	0x6166,0x61B3,0x622D,0x646E,0x6470,0x6496,0x64A0,0x6485,
-	0x6497,0x649C,0x648F,0x648B,0x648A,0x648C,0x64A3,0x649F,
-	0x6468,0x64B1,0x6498,0x6576,0x657A,0x6579,0x657B,0x65B2,
-	0x65B3,0x66B5,0x66B0,0x66A9,0x66B2,0x66B7,0x66AA,0x66AF,
-	0x6A00,0x6A06,0x6A17,0x69E5,0x69F8,0x6A15,0x69F1,0x69E4,
-	0x6A20,0x69FF,0x69EC,0x69E2,0x6A1B,0x6A1D,
-	/* Range 0x5121 - 0x517E, array index: 0x1299 */
-	0x69FE,0x6A27,0x69F2,0x69EE,0x6A14,0x69F7,0x69E7,0x6A40,
-	0x6A08,0x69E6,0x69FB,0x6A0D,0x69FC,0x69EB,0x6A09,0x6A04,
-	0x6A18,0x6A25,0x6A0F,0x69F6,0x6A26,0x6A07,0x69F4,0x6A16,
-	0x6B51,0x6BA5,0x6BA3,0x6BA2,0x6BA6,0x6C01,0x6C00,0x6BFF,
-	0x6C02,0x6F41,0x6F26,0x6F7E,0x6F87,0x6FC6,0x6F92,0x6F8D,
-	0x6F89,0x6F8C,0x6F62,0x6F4F,0x6F85,0x6F5A,0x6F96,0x6F76,
-	0x6F6C,0x6F82,0x6F55,0x6F72,0x6F52,0x6F50,0x6F57,0x6F94,
-	0x6F93,0x6F5D,0x6F00,0x6F61,0x6F6B,0x6F7D,0x6F67,0x6F90,
-	0x6F53,0x6F8B,0x6F69,0x6F7F,0x6F95,0x6F63,0x6F77,0x6F6A,
-	0x6F7B,0x71B2,0x71AF,0x719B,0x71B0,0x71A0,0x719A,0x71A9,
-	0x71B5,0x719D,0x71A5,0x719E,0x71A4,0x71A1,0x71AA,0x719C,
-	0x71A7,0x71B3,0x7298,0x729A,0x7358,0x7352,
-	/* Range 0x5221 - 0x527E, array index: 0x12F7 */
-	0x735E,0x735F,0x7360,0x735D,0x735B,0x7361,0x735A,0x7359,
-	0x7362,0x7487,0x7489,0x748A,0x7486,0x7481,0x747D,0x7485,
-	0x7488,0x747C,0x7479,0x7508,0x7507,0x757E,0x7625,0x761E,
-	0x7619,0x761D,0x761C,0x7623,0x761A,0x7628,0x761B,0x769C,
-	0x769D,0x769E,0x769B,0x778D,0x778F,0x7789,0x7788,0x78CD,
-	0x78BB,0x78CF,0x78CC,0x78D1,0x78CE,0x78D4,0x78C8,0x78C3,
-	0x78C4,0x78C9,0x799A,0x79A1,0x79A0,0x799C,0x79A2,0x799B,
-	0x6B76,0x7A39,0x7AB2,0x7AB4,0x7AB3,0x7BB7,0x7BCB,0x7BBE,
-	0x7BAC,0x7BCE,0x7BAF,0x7BB9,0x7BCA,0x7BB5,0x7CC5,0x7CC8,
-	0x7CCC,0x7CCB,0x7DF7,0x7DDB,0x7DEA,0x7DE7,0x7DD7,0x7DE1,
-	0x7E03,0x7DFA,0x7DE6,0x7DF6,0x7DF1,0x7DF0,0x7DEE,0x7DDF,
-	0x7F76,0x7FAC,0x7FB0,0x7FAD,0x7FED,0x7FEB,
-	/* Range 0x5321 - 0x537E, array index: 0x1355 */
-	0x7FEA,0x7FEC,0x7FE6,0x7FE8,0x8064,0x8067,0x81A3,0x819F,
-	0x819E,0x8195,0x81A2,0x8199,0x8197,0x8216,0x824F,0x8253,
-	0x8252,0x8250,0x824E,0x8251,0x8524,0x853B,0x850F,0x8500,
-	0x8529,0x850E,0x8509,0x850D,0x851F,0x850A,0x8527,0x851C,
-	0x84FB,0x852B,0x84FA,0x8508,0x850C,0x84F4,0x852A,0x84F2,
-	0x8515,0x84F7,0x84EB,0x84F3,0x84FC,0x8512,0x84EA,0x84E9,
-	0x8516,0x84FE,0x8528,0x851D,0x852E,0x8502,0x84FD,0x851E,
-	0x84F6,0x8531,0x8526,0x84E7,0x84E8,0x84F0,0x84EF,0x84F9,
-	0x8518,0x8520,0x8530,0x850B,0x8519,0x852F,0x8662,0x8756,
-	0x8763,0x8764,0x8777,0x87E1,0x8773,0x8758,0x8754,0x875B,
-	0x8752,0x8761,0x875A,0x8751,0x875E,0x876D,0x876A,0x8750,
-	0x874E,0x875F,0x875D,0x876F,0x876C,0x877A,
-	/* Range 0x5421 - 0x547E, array index: 0x13B3 */
-	0x876E,0x875C,0x8765,0x874F,0x877B,0x8775,0x8762,0x8767,
-	0x8769,0x885A,0x8905,0x890C,0x8914,0x890B,0x8917,0x8918,
-	0x8919,0x8906,0x8916,0x8911,0x890E,0x8909,0x89A2,0x89A4,
-	0x89A3,0x89ED,0x89F0,0x89EC,0x8ACF,0x8AC6,0x8AB8,0x8AD3,
-	0x8AD1,0x8AD4,0x8AD5,0x8ABB,0x8AD7,0x8ABE,0x8AC0,0x8AC5,
-	0x8AD8,0x8AC3,0x8ABA,0x8ABD,0x8AD9,0x8C3E,0x8C4D,0x8C8F,
-	0x8CE5,0x8CDF,0x8CD9,0x8CE8,0x8CDA,0x8CDD,0x8CE7,0x8DA0,
-	0x8D9C,0x8DA1,0x8D9B,0x8E20,0x8E23,0x8E25,0x8E24,0x8E2E,
-	0x8E15,0x8E1B,0x8E16,0x8E11,0x8E19,0x8E26,0x8E27,0x8E14,
-	0x8E12,0x8E18,0x8E13,0x8E1C,0x8E17,0x8E1A,0x8F2C,0x8F24,
-	0x8F18,0x8F1A,0x8F20,0x8F23,0x8F16,0x8F17,0x9073,0x9070,
-	0x906F,0x9067,0x906B,0x912F,0x912B,0x9129,
-	/* Range 0x5521 - 0x557E, array index: 0x1411 */
-	0x912A,0x9132,0x9126,0x912E,0x9185,0x9186,0x918A,0x9181,
-	0x9182,0x9184,0x9180,0x92D0,0x92C3,0x92C4,0x92C0,0x92D9,
-	0x92B6,0x92CF,0x92F1,0x92DF,0x92D8,0x92E9,0x92D7,0x92DD,
-	0x92CC,0x92EF,0x92C2,0x92E8,0x92CA,0x92C8,0x92CE,0x92E6,
-	0x92CD,0x92D5,0x92C9,0x92E0,0x92DE,0x92E7,0x92D1,0x92D3,
-	0x92B5,0x92E1,0x9325,0x92C6,0x92B4,0x957C,0x95AC,0x95AB,
-	0x95AE,0x95B0,0x96A4,0x96A2,0x96D3,0x9705,0x9708,0x9702,
-	0x975A,0x978A,0x978E,0x9788,0x97D0,0x97CF,0x981E,0x981D,
-	0x9826,0x9829,0x9828,0x9820,0x981B,0x9827,0x98B2,0x9908,
-	0x98FA,0x9911,0x9914,0x9916,0x9917,0x9915,0x99DC,0x99CD,
-	0x99CF,0x99D3,0x99D4,0x99CE,0x99C9,0x99D6,0x99D8,0x99CB,
-	0x99D7,0x99CC,0x9AB3,0x9AEC,0x9AEB,0x9AF3,
-	/* Range 0x5621 - 0x567E, array index: 0x146F */
-	0x9AF2,0x9AF1,0x9B46,0x9B43,0x9B67,0x9B74,0x9B71,0x9B66,
-	0x9B76,0x9B75,0x9B70,0x9B68,0x9B64,0x9B6C,0x9CFC,0x9CFA,
-	0x9CFD,0x9CFF,0x9CF7,0x9D07,0x9D00,0x9CF9,0x9CFB,0x9D08,
-	0x9D05,0x9D04,0x9E83,0x9ED3,0x9F0F,0x9F10,0x511C,0x5113,
-	0x5117,0x511A,0x5111,0x51DE,0x5334,0x53E1,0x5670,0x5660,
-	0x566E,0x5673,0x5666,0x5663,0x566D,0x5672,0x565E,0x5677,
-	0x571C,0x571B,0x58C8,0x58BD,0x58C9,0x58BF,0x58BA,0x58C2,
-	0x58BC,0x58C6,0x5B17,0x5B19,0x5B1B,0x5B21,0x5B14,0x5B13,
-	0x5B10,0x5B16,0x5B28,0x5B1A,0x5B20,0x5B1E,0x5BEF,0x5DAC,
-	0x5DB1,0x5DA9,0x5DA7,0x5DB5,0x5DB0,0x5DAE,0x5DAA,0x5DA8,
-	0x5DB2,0x5DAD,0x5DAF,0x5DB4,0x5E67,0x5E68,0x5E66,0x5E6F,
-	0x5EE9,0x5EE7,0x5EE6,0x5EE8,0x5EE5,0x5F4B,
-	/* Range 0x5721 - 0x577E, array index: 0x14CD */
-	0x5FBC,0x5FBB,0x619D,0x61A8,0x6196,0x61C5,0x61B4,0x61C6,
-	0x61C1,0x61CC,0x61BA,0x61BF,0x61B8,0x618C,0x64D7,0x64D6,
-	0x64D0,0x64CF,0x64C9,0x64BD,0x6489,0x64C3,0x64DB,0x64F3,
-	0x64D9,0x6533,0x657F,0x657C,0x65A2,0x66C8,0x66BE,0x66C0,
-	0x66CA,0x66CB,0x66CF,0x66BD,0x66BB,0x66BA,0x66CC,0x6723,
-	0x6A34,0x6A66,0x6A49,0x6A67,0x6A32,0x6A68,0x6A3E,0x6A5D,
-	0x6A6D,0x6A76,0x6A5B,0x6A51,0x6A28,0x6A5A,0x6A3B,0x6A3F,
-	0x6A41,0x6A6A,0x6A64,0x6A50,0x6A4F,0x6A54,0x6A6F,0x6A69,
-	0x6A60,0x6A3C,0x6A5E,0x6A56,0x6A55,0x6A4D,0x6A4E,0x6A46,
-	0x6B55,0x6B54,0x6B56,0x6BA7,0x6BAA,0x6BAB,0x6BC8,0x6BC7,
-	0x6C04,0x6C03,0x6C06,0x6FAD,0x6FCB,0x6FA3,0x6FC7,0x6FBC,
-	0x6FCE,0x6FC8,0x6F5E,0x6FC4,0x6FBD,0x6F9E,
-	/* Range 0x5821 - 0x587E, array index: 0x152B */
-	0x6FCA,0x6FA8,0x7004,0x6FA5,0x6FAE,0x6FBA,0x6FAC,0x6FAA,
-	0x6FCF,0x6FBF,0x6FB8,0x6FA2,0x6FC9,0x6FAB,0x6FCD,0x6FAF,
-	0x6FB2,0x6FB0,0x71C5,0x71C2,0x71BF,0x71B8,0x71D6,0x71C0,
-	0x71C1,0x71CB,0x71D4,0x71CA,0x71C7,0x71CF,0x71BD,0x71D8,
-	0x71BC,0x71C6,0x71DA,0x71DB,0x729D,0x729E,0x7369,0x7366,
-	0x7367,0x736C,0x7365,0x736B,0x736A,0x747F,0x749A,0x74A0,
-	0x7494,0x7492,0x7495,0x74A1,0x750B,0x7580,0x762F,0x762D,
-	0x7631,0x763D,0x7633,0x763C,0x7635,0x7632,0x7630,0x76BB,
-	0x76E6,0x779A,0x779D,0x77A1,0x779C,0x779B,0x77A2,0x77A3,
-	0x7795,0x7799,0x7797,0x78DD,0x78E9,0x78E5,0x78EA,0x78DE,
-	0x78E3,0x78DB,0x78E1,0x78E2,0x78ED,0x78DF,0x78E0,0x79A4,
-	0x7A44,0x7A48,0x7A47,0x7AB6,0x7AB8,0x7AB5,
-	/* Range 0x5921 - 0x597E, array index: 0x1589 */
-	0x7AB1,0x7AB7,0x7BDE,0x7BE3,0x7BE7,0x7BDD,0x7BD5,0x7BE5,
-	0x7BDA,0x7BE8,0x7BF9,0x7BD4,0x7BEA,0x7BE2,0x7BDC,0x7BEB,
-	0x7BD8,0x7BDF,0x7CD2,0x7CD4,0x7CD7,0x7CD0,0x7CD1,0x7E12,
-	0x7E21,0x7E17,0x7E0C,0x7E1F,0x7E20,0x7E13,0x7E0E,0x7E1C,
-	0x7E15,0x7E1A,0x7E22,0x7E0B,0x7E0F,0x7E16,0x7E0D,0x7E14,
-	0x7E25,0x7E24,0x7F43,0x7F7B,0x7F7C,0x7F7A,0x7FB1,0x7FEF,
-	0x802A,0x8029,0x806C,0x81B1,0x81A6,0x81AE,0x81B9,0x81B5,
-	0x81AB,0x81B0,0x81AC,0x81B4,0x81B2,0x81B7,0x81A7,0x81F2,
-	0x8255,0x8256,0x8257,0x8556,0x8545,0x856B,0x854D,0x8553,
-	0x8561,0x8558,0x8540,0x8546,0x8564,0x8541,0x8562,0x8544,
-	0x8551,0x8547,0x8563,0x853E,0x855B,0x8571,0x854E,0x856E,
-	0x8575,0x8555,0x8567,0x8560,0x858C,0x8566,
-	/* Range 0x5A21 - 0x5A7E, array index: 0x15E7 */
-	0x855D,0x8554,0x8565,0x856C,0x8663,0x8665,0x8664,0x87A4,
-	0x879B,0x878F,0x8797,0x8793,0x8792,0x8788,0x8781,0x8796,
-	0x8798,0x8779,0x8787,0x87A3,0x8785,0x8790,0x8791,0x879D,
-	0x8784,0x8794,0x879C,0x879A,0x8789,0x891E,0x8926,0x8930,
-	0x892D,0x892E,0x8927,0x8931,0x8922,0x8929,0x8923,0x892F,
-	0x892C,0x891F,0x89F1,0x8AE0,0x8AE2,0x8AF2,0x8AF4,0x8AF5,
-	0x8ADD,0x8B14,0x8AE4,0x8ADF,0x8AF0,0x8AC8,0x8ADE,0x8AE1,
-	0x8AE8,0x8AFF,0x8AEF,0x8AFB,0x8C91,0x8C92,0x8C90,0x8CF5,
-	0x8CEE,0x8CF1,0x8CF0,0x8CF3,0x8D6C,0x8D6E,0x8DA5,0x8DA7,
-	0x8E33,0x8E3E,0x8E38,0x8E40,0x8E45,0x8E36,0x8E3C,0x8E3D,
-	0x8E41,0x8E30,0x8E3F,0x8EBD,0x8F36,0x8F2E,0x8F35,0x8F32,
-	0x8F39,0x8F37,0x8F34,0x9076,0x9079,0x907B,
-	/* Range 0x5B21 - 0x5B7E, array index: 0x1645 */
-	0x9086,0x90FA,0x9133,0x9135,0x9136,0x9193,0x9190,0x9191,
-	0x918D,0x918F,0x9327,0x931E,0x9308,0x931F,0x9306,0x930F,
-	0x937A,0x9338,0x933C,0x931B,0x9323,0x9312,0x9301,0x9346,
-	0x932D,0x930E,0x930D,0x92CB,0x931D,0x92FA,0x9313,0x92F9,
-	0x92F7,0x9334,0x9302,0x9324,0x92FF,0x9329,0x9339,0x9335,
-	0x932A,0x9314,0x930C,0x930B,0x92FE,0x9309,0x9300,0x92FB,
-	0x9316,0x95BC,0x95CD,0x95BE,0x95B9,0x95BA,0x95B6,0x95BF,
-	0x95B5,0x95BD,0x96A9,0x96D4,0x970B,0x9712,0x9710,0x9799,
-	0x9797,0x9794,0x97F0,0x97F8,0x9835,0x982F,0x9832,0x9924,
-	0x991F,0x9927,0x9929,0x999E,0x99EE,0x99EC,0x99E5,0x99E4,
-	0x99F0,0x99E3,0x99EA,0x99E9,0x99E7,0x9AB9,0x9ABF,0x9AB4,
-	0x9ABB,0x9AF6,0x9AFA,0x9AF9,0x9AF7,0x9B33,
-	/* Range 0x5C21 - 0x5C7E, array index: 0x16A3 */
-	0x9B80,0x9B85,0x9B87,0x9B7C,0x9B7E,0x9B7B,0x9B82,0x9B93,
-	0x9B92,0x9B90,0x9B7A,0x9B95,0x9B7D,0x9B88,0x9D25,0x9D17,
-	0x9D20,0x9D1E,0x9D14,0x9D29,0x9D1D,0x9D18,0x9D22,0x9D10,
-	0x9D19,0x9D1F,0x9E88,0x9E86,0x9E87,0x9EAE,0x9EAD,0x9ED5,
-	0x9ED6,0x9EFA,0x9F12,0x9F3D,0x5126,0x5125,0x5122,0x5124,
-	0x5120,0x5129,0x52F4,0x5693,0x568C,0x568D,0x5686,0x5684,
-	0x5683,0x567E,0x5682,0x567F,0x5681,0x58D6,0x58D4,0x58CF,
-	0x58D2,0x5B2D,0x5B25,0x5B32,0x5B23,0x5B2C,0x5B27,0x5B26,
-	0x5B2F,0x5B2E,0x5B7B,0x5BF1,0x5BF2,0x5DB7,0x5E6C,0x5E6A,
-	0x5FBE,0x61C3,0x61B5,0x61BC,0x61E7,0x61E0,0x61E5,0x61E4,
-	0x61E8,0x61DE,0x64EF,0x64E9,0x64E3,0x64EB,0x64E4,0x64E8,
-	0x6581,0x6580,0x65B6,0x65DA,0x66D2,0x6A8D,
-	/* Range 0x5D21 - 0x5D7E, array index: 0x1701 */
-	0x6A96,0x6A81,0x6AA5,0x6A89,0x6A9F,0x6A9B,0x6AA1,0x6A9E,
-	0x6A87,0x6A93,0x6A8E,0x6A95,0x6A83,0x6AA8,0x6AA4,0x6A91,
-	0x6A7F,0x6AA6,0x6A9A,0x6A85,0x6A8C,0x6A92,0x6B5B,0x6BAD,
-	0x6C09,0x6FCC,0x6FA9,0x6FF4,0x6FD4,0x6FE3,0x6FDC,0x6FED,
-	0x6FE7,0x6FE6,0x6FDE,0x6FF2,0x6FDD,0x6FE2,0x6FE8,0x71E1,
-	0x71F1,0x71E8,0x71F2,0x71E4,0x71F0,0x71E2,0x7373,0x736E,
-	0x736F,0x7497,0x74B2,0x74AB,0x7490,0x74AA,0x74AD,0x74B1,
-	0x74A5,0x74AF,0x7510,0x7511,0x7512,0x750F,0x7584,0x7643,
-	0x7648,0x7649,0x7647,0x76A4,0x76E9,0x77B5,0x77AB,0x77B2,
-	0x77B7,0x77B6,0x77B4,0x77B1,0x77A8,0x77F0,0x78F3,0x78FD,
-	0x7902,0x78FB,0x78FC,0x78FF,0x78F2,0x7905,0x78F9,0x78FE,
-	0x7904,0x79AB,0x79A8,0x7A5C,0x7A5B,0x7A56,
-	/* Range 0x5E21 - 0x5E7E, array index: 0x175F */
-	0x7A58,0x7A54,0x7A5A,0x7ABE,0x7AC0,0x7AC1,0x7C05,0x7C0F,
-	0x7BF2,0x7C00,0x7BFF,0x7BFB,0x7C0E,0x7BF4,0x7C0B,0x7BF3,
-	0x7C02,0x7C09,0x7C03,0x7C01,0x7BF8,0x7BFD,0x7C06,0x7BF0,
-	0x7BF1,0x7C10,0x7C0A,0x7CE8,0x7E2D,0x7E3C,0x7E42,0x7E33,
-	0x9848,0x7E38,0x7E2A,0x7E49,0x7E40,0x7E47,0x7E29,0x7E4C,
-	0x7E30,0x7E3B,0x7E36,0x7E44,0x7E3A,0x7F45,0x7F7F,0x7F7E,
-	0x7F7D,0x7FF4,0x7FF2,0x802C,0x81BB,0x81C4,0x81CC,0x81CA,
-	0x81C5,0x81C7,0x81BC,0x81E9,0x825B,0x825A,0x825C,0x8583,
-	0x8580,0x858F,0x85A7,0x8595,0x85A0,0x858B,0x85A3,0x857B,
-	0x85A4,0x859A,0x859E,0x8577,0x857C,0x8589,0x85A1,0x857A,
-	0x8578,0x8557,0x858E,0x8596,0x8586,0x858D,0x8599,0x859D,
-	0x8581,0x85A2,0x8582,0x8588,0x8585,0x8579,
-	/* Range 0x5F21 - 0x5F7E, array index: 0x17BD */
-	0x8576,0x8598,0x8590,0x859F,0x8668,0x87BE,0x87AA,0x87AD,
-	0x87C5,0x87B0,0x87AC,0x87B9,0x87B5,0x87BC,0x87AE,0x87C9,
-	0x87C3,0x87C2,0x87CC,0x87B7,0x87AF,0x87C4,0x87CA,0x87B4,
-	0x87B6,0x87BF,0x87B8,0x87BD,0x87DE,0x87B2,0x8935,0x8933,
-	0x893C,0x893E,0x8941,0x8952,0x8937,0x8942,0x89AD,0x89AF,
-	0x89AE,0x89F2,0x89F3,0x8B1E,0x8B18,0x8B16,0x8B11,0x8B05,
-	0x8B0B,0x8B22,0x8B0F,0x8B12,0x8B15,0x8B07,0x8B0D,0x8B08,
-	0x8B06,0x8B1C,0x8B13,0x8B1A,0x8C4F,0x8C70,0x8C72,0x8C71,
-	0x8C6F,0x8C95,0x8C94,0x8CF9,0x8D6F,0x8E4E,0x8E4D,0x8E53,
-	0x8E50,0x8E4C,0x8E47,0x8F43,0x8F40,0x9085,0x907E,0x9138,
-	0x919A,0x91A2,0x919B,0x9199,0x919F,0x91A1,0x919D,0x91A0,
-	0x93A1,0x9383,0x93AF,0x9364,0x9356,0x9347,
-	/* Range 0x6021 - 0x607E, array index: 0x181B */
-	0x937C,0x9358,0x935C,0x9376,0x9349,0x9350,0x9351,0x9360,
-	0x936D,0x938F,0x934C,0x936A,0x9379,0x9357,0x9355,0x9352,
-	0x934F,0x9371,0x9377,0x937B,0x9361,0x935E,0x9363,0x9367,
-	0x934E,0x9359,0x95C7,0x95C0,0x95C9,0x95C3,0x95C5,0x95B7,
-	0x96AE,0x96B0,0x96AC,0x9720,0x971F,0x9718,0x971D,0x9719,
-	0x979A,0x97A1,0x979C,0x979E,0x979D,0x97D5,0x97D4,0x97F1,
-	0x9841,0x9844,0x984A,0x9849,0x9845,0x9843,0x9925,0x992B,
-	0x992C,0x992A,0x9933,0x9932,0x992F,0x992D,0x9931,0x9930,
-	0x9998,0x99A3,0x99A1,0x9A02,0x99FA,0x99F4,0x99F7,0x99F9,
-	0x99F8,0x99F6,0x99FB,0x99FD,0x99FE,0x99FC,0x9A03,0x9ABE,
-	0x9AFE,0x9AFD,0x9B01,0x9AFC,0x9B48,0x9B9A,0x9BA8,0x9B9E,
-	0x9B9B,0x9BA6,0x9BA1,0x9BA5,0x9BA4,0x9B86,
-	/* Range 0x6121 - 0x617E, array index: 0x1879 */
-	0x9BA2,0x9BA0,0x9BAF,0x9D33,0x9D41,0x9D67,0x9D36,0x9D2E,
-	0x9D2F,0x9D31,0x9D38,0x9D30,0x9D45,0x9D42,0x9D43,0x9D3E,
-	0x9D37,0x9D40,0x9D3D,0x7FF5,0x9D2D,0x9E8A,0x9E89,0x9E8D,
-	0x9EB0,0x9EC8,0x9EDA,0x9EFB,0x9EFF,0x9F24,0x9F23,0x9F22,
-	0x9F54,0x9FA0,0x5131,0x512D,0x512E,0x5698,0x569C,0x5697,
-	0x569A,0x569D,0x5699,0x5970,0x5B3C,0x5C69,0x5C6A,0x5DC0,
-	0x5E6D,0x5E6E,0x61D8,0x61DF,0x61ED,0x61EE,0x61F1,0x61EA,
-	0x61F0,0x61EB,0x61D6,0x61E9,0x64FF,0x6504,0x64FD,0x64F8,
-	0x6501,0x6503,0x64FC,0x6594,0x65DB,0x66DA,0x66DB,0x66D8,
-	0x6AC5,0x6AB9,0x6ABD,0x6AE1,0x6AC6,0x6ABA,0x6AB6,0x6AB7,
-	0x6AC7,0x6AB4,0x6AAD,0x6B5E,0x6BC9,0x6C0B,0x7007,0x700C,
-	0x700D,0x7001,0x7005,0x7014,0x700E,0x6FFF,
-	/* Range 0x6221 - 0x627E, array index: 0x18D7 */
-	0x7000,0x6FFB,0x7026,0x6FFC,0x6FF7,0x700A,0x7201,0x71FF,
-	0x71F9,0x7203,0x71FD,0x7376,0x74B8,0x74C0,0x74B5,0x74C1,
-	0x74BE,0x74B6,0x74BB,0x74C2,0x7514,0x7513,0x765C,0x7664,
-	0x7659,0x7650,0x7653,0x7657,0x765A,0x76A6,0x76BD,0x76EC,
-	0x77C2,0x77BA,0x790C,0x7913,0x7914,0x7909,0x7910,0x7912,
-	0x7911,0x79AD,0x79AC,0x7A5F,0x7C1C,0x7C29,0x7C19,0x7C20,
-	0x7C1F,0x7C2D,0x7C1D,0x7C26,0x7C28,0x7C22,0x7C25,0x7C30,
-	0x7E5C,0x7E50,0x7E56,0x7E63,0x7E58,0x7E62,0x7E5F,0x7E51,
-	0x7E60,0x7E57,0x7E53,0x7FB5,0x7FB3,0x7FF7,0x7FF8,0x8075,
-	0x81D1,0x81D2,0x81D0,0x825F,0x825E,0x85B4,0x85C6,0x85C0,
-	0x85C3,0x85C2,0x85B3,0x85B5,0x85BD,0x85C7,0x85C4,0x85BF,
-	0x85CB,0x85CE,0x85C8,0x85C5,0x85B1,0x85B6,
-	/* Range 0x6321 - 0x637E, array index: 0x1935 */
-	0x85D2,0x8624,0x85B8,0x85B7,0x85BE,0x8669,0x87E7,0x87E6,
-	0x87E2,0x87DB,0x87EB,0x87EA,0x87E5,0x87DF,0x87F3,0x87E4,
-	0x87D4,0x87DC,0x87D3,0x87ED,0x87D8,0x87E3,0x87D7,0x87D9,
-	0x8801,0x87F4,0x87E8,0x87DD,0x8953,0x894B,0x894F,0x894C,
-	0x8946,0x8950,0x8951,0x8949,0x8B2A,0x8B27,0x8B23,0x8B33,
-	0x8B30,0x8B35,0x8B47,0x8B2F,0x8B3C,0x8B3E,0x8B31,0x8B25,
-	0x8B37,0x8B26,0x8B36,0x8B2E,0x8B24,0x8B3B,0x8B3D,0x8B3A,
-	0x8C42,0x8C75,0x8C99,0x8C98,0x8C97,0x8CFE,0x8D04,0x8D02,
-	0x8D00,0x8E5C,0x8E62,0x8E60,0x8E57,0x8E56,0x8E5E,0x8E65,
-	0x8E67,0x8E5B,0x8E5A,0x8E61,0x8E5D,0x8E69,0x8E54,0x8F46,
-	0x8F47,0x8F48,0x8F4B,0x9128,0x913A,0x913B,0x913E,0x91A8,
-	0x91A5,0x91A7,0x91AF,0x91AA,0x93B5,0x938C,
-	/* Range 0x6421 - 0x647E, array index: 0x1993 */
-	0x9392,0x93B7,0x939B,0x939D,0x9389,0x93A7,0x938E,0x93AA,
-	0x939E,0x93A6,0x9395,0x9388,0x9399,0x939F,0x9380,0x938D,
-	0x93B1,0x9391,0x93B2,0x93A4,0x93A8,0x93B4,0x93A3,0x95D2,
-	0x95D3,0x95D1,0x96B3,0x96D7,0x96DA,0x5DC2,0x96DF,0x96D8,
-	0x96DD,0x9723,0x9722,0x9725,0x97AC,0x97AE,0x97A8,0x97AB,
-	0x97A4,0x97AA,0x97A2,0x97A5,0x97D7,0x97D9,0x97D6,0x97D8,
-	0x97FA,0x9850,0x9851,0x9852,0x98B8,0x9941,0x993C,0x993A,
-	0x9A0F,0x9A0B,0x9A09,0x9A0D,0x9A04,0x9A11,0x9A0A,0x9A05,
-	0x9A07,0x9A06,0x9AC0,0x9ADC,0x9B08,0x9B04,0x9B05,0x9B29,
-	0x9B35,0x9B4A,0x9B4C,0x9B4B,0x9BC7,0x9BC6,0x9BC3,0x9BBF,
-	0x9BC1,0x9BB5,0x9BB8,0x9BD3,0x9BB6,0x9BC4,0x9BB9,0x9BBD,
-	0x9D5C,0x9D53,0x9D4F,0x9D4A,0x9D5B,0x9D4B,
-	/* Range 0x6521 - 0x657E, array index: 0x19F1 */
-	0x9D59,0x9D56,0x9D4C,0x9D57,0x9D52,0x9D54,0x9D5F,0x9D58,
-	0x9D5A,0x9E8E,0x9E8C,0x9EDF,0x9F01,0x9F00,0x9F16,0x9F25,
-	0x9F2B,0x9F2A,0x9F29,0x9F28,0x9F4C,0x9F55,0x5134,0x5135,
-	0x5296,0x52F7,0x53B4,0x56AB,0x56AD,0x56A6,0x56A7,0x56AA,
-	0x56AC,0x58DA,0x58DD,0x58DB,0x5912,0x5B3D,0x5B3E,0x5B3F,
-	0x5DC3,0x5E70,0x5FBF,0x61FB,0x6507,0x6510,0x650D,0x6509,
-	0x650C,0x650E,0x6584,0x65DE,0x65DD,0x66DE,0x6AE7,0x6AE0,
-	0x6ACC,0x6AD1,0x6AD9,0x6ACB,0x6ADF,0x6ADC,0x6AD0,0x6AEB,
-	0x6ACF,0x6ACD,0x6ADE,0x6B60,0x6BB0,0x6C0C,0x7019,0x7027,
-	0x7020,0x7016,0x702B,0x7021,0x7022,0x7023,0x7029,0x7017,
-	0x7024,0x701C,0x720C,0x720A,0x7207,0x7202,0x7205,0x72A5,
-	0x72A6,0x72A4,0x72A3,0x72A1,0x74CB,0x74C5,
-	/* Range 0x6621 - 0x667E, array index: 0x1A4F */
-	0x74B7,0x74C3,0x7516,0x7660,0x77C9,0x77CA,0x77C4,0x77F1,
-	0x791D,0x791B,0x7921,0x791C,0x7917,0x791E,0x79B0,0x7A67,
-	0x7A68,0x7C33,0x7C3C,0x7C39,0x7C2C,0x7C3B,0x7CEC,0x7CEA,
-	0x7E76,0x7E75,0x7E78,0x7E70,0x7E77,0x7E6F,0x7E7A,0x7E72,
-	0x7E74,0x7E68,0x7F4B,0x7F4A,0x7F83,0x7F86,0x7FB7,0x7FFD,
-	0x7FFE,0x8078,0x81D7,0x81D5,0x820B,0x8264,0x8261,0x8263,
-	0x85EB,0x85F1,0x85ED,0x85D9,0x85E1,0x85E8,0x85DA,0x85D7,
-	0x85EC,0x85F2,0x85F8,0x85D8,0x85DF,0x85E3,0x85DC,0x85D1,
-	0x85F0,0x85E6,0x85EF,0x85DE,0x85E2,0x8800,0x87FA,0x8803,
-	0x87F6,0x87F7,0x8809,0x880C,0x880B,0x8806,0x87FC,0x8808,
-	0x87FF,0x880A,0x8802,0x8962,0x895A,0x895B,0x8957,0x8961,
-	0x895C,0x8958,0x895D,0x8959,0x8988,0x89B7,
-	/* Range 0x6721 - 0x677E, array index: 0x1AAD */
-	0x89B6,0x89F6,0x8B50,0x8B48,0x8B4A,0x8B40,0x8B53,0x8B56,
-	0x8B54,0x8B4B,0x8B55,0x8B51,0x8B42,0x8B52,0x8B57,0x8C43,
-	0x8C77,0x8C76,0x8C9A,0x8D06,0x8D07,0x8D09,0x8DAC,0x8DAA,
-	0x8DAD,0x8DAB,0x8E6D,0x8E78,0x8E73,0x8E6A,0x8E6F,0x8E7B,
-	0x8EC2,0x8F52,0x8F51,0x8F4F,0x8F50,0x8F53,0x8FB4,0x9140,
-	0x913F,0x91B0,0x91AD,0x93DE,0x93C7,0x93CF,0x93C2,0x93DA,
-	0x93D0,0x93F9,0x93EC,0x93CC,0x93D9,0x93A9,0x93E6,0x93CA,
-	0x93D4,0x93EE,0x93E3,0x93D5,0x93C4,0x93CE,0x93C0,0x93D2,
-	0x93A5,0x93E7,0x957D,0x95DA,0x95DB,0x96E1,0x9729,0x972B,
-	0x972C,0x9728,0x9726,0x97B3,0x97B7,0x97B6,0x97DD,0x97DE,
-	0x97DF,0x985C,0x9859,0x985D,0x9857,0x98BF,0x98BD,0x98BB,
-	0x98BE,0x9948,0x9947,0x9943,0x99A6,0x99A7,
-	/* Range 0x6821 - 0x687E, array index: 0x1B0B */
-	0x9A1A,0x9A15,0x9A25,0x9A1D,0x9A24,0x9A1B,0x9A22,0x9A20,
-	0x9A27,0x9A23,0x9A1E,0x9A1C,0x9A14,0x9AC2,0x9B0B,0x9B0A,
-	0x9B0E,0x9B0C,0x9B37,0x9BEA,0x9BEB,0x9BE0,0x9BDE,0x9BE4,
-	0x9BE6,0x9BE2,0x9BF0,0x9BD4,0x9BD7,0x9BEC,0x9BDC,0x9BD9,
-	0x9BE5,0x9BD5,0x9BE1,0x9BDA,0x9D77,0x9D81,0x9D8A,0x9D84,
-	0x9D88,0x9D71,0x9D80,0x9D78,0x9D86,0x9D8B,0x9D8C,0x9D7D,
-	0x9D6B,0x9D74,0x9D75,0x9D70,0x9D69,0x9D85,0x9D73,0x9D7B,
-	0x9D82,0x9D6F,0x9D79,0x9D7F,0x9D87,0x9D68,0x9E94,0x9E91,
-	0x9EC0,0x9EFC,0x9F2D,0x9F40,0x9F41,0x9F4D,0x9F56,0x9F57,
-	0x9F58,0x5337,0x56B2,0x56B5,0x56B3,0x58E3,0x5B45,0x5DC6,
-	0x5DC7,0x5EEE,0x5EEF,0x5FC0,0x5FC1,0x61F9,0x6517,0x6516,
-	0x6515,0x6513,0x65DF,0x66E8,0x66E3,0x66E4,
-	/* Range 0x6921 - 0x697E, array index: 0x1B69 */
-	0x6AF3,0x6AF0,0x6AEA,0x6AE8,0x6AF9,0x6AF1,0x6AEE,0x6AEF,
-	0x703C,0x7035,0x702F,0x7037,0x7034,0x7031,0x7042,0x7038,
-	0x703F,0x703A,0x7039,0x702A,0x7040,0x703B,0x7033,0x7041,
-	0x7213,0x7214,0x72A8,0x737D,0x737C,0x74BA,0x76AB,0x76AA,
-	0x76BE,0x76ED,0x77CC,0x77CE,0x77CF,0x77CD,0x77F2,0x7925,
-	0x7923,0x7927,0x7928,0x7924,0x7929,0x79B2,0x7A6E,0x7A6C,
-	0x7A6D,0x7AF7,0x7C49,0x7C48,0x7C4A,0x7C47,0x7C45,0x7CEE,
-	0x7E7B,0x7E7E,0x7E81,0x7E80,0x7FBA,0x7FFF,0x8079,0x81DB,
-	0x81D9,0x8268,0x8269,0x8622,0x85FF,0x8601,0x85FE,0x861B,
-	0x8600,0x85F6,0x8604,0x8609,0x8605,0x860C,0x85FD,0x8819,
-	0x8810,0x8811,0x8817,0x8813,0x8816,0x8963,0x8966,0x89B9,
-	0x89F7,0x8B60,0x8B6A,0x8B5D,0x8B68,0x8B63,
-	/* Range 0x6A21 - 0x6A7E, array index: 0x1BC7 */
-	0x8B65,0x8B67,0x8B6D,0x8DAE,0x8E86,0x8E88,0x8E84,0x8F59,
-	0x8F56,0x8F57,0x8F55,0x8F58,0x8F5A,0x908D,0x9143,0x9141,
-	0x91B7,0x91B5,0x91B2,0x91B3,0x940B,0x9413,0x93FB,0x9420,
-	0x940F,0x9414,0x93FE,0x9415,0x9410,0x9428,0x9419,0x940D,
-	0x93F5,0x9400,0x93F7,0x9407,0x940E,0x9416,0x9412,0x93FA,
-	0x9409,0x93F8,0x943C,0x940A,0x93FF,0x93FC,0x940C,0x93F6,
-	0x9411,0x9406,0x95DE,0x95E0,0x95DF,0x972E,0x972F,0x97B9,
-	0x97BB,0x97FD,0x97FE,0x9860,0x9862,0x9863,0x985F,0x98C1,
-	0x98C2,0x9950,0x994E,0x9959,0x994C,0x994B,0x9953,0x9A32,
-	0x9A34,0x9A31,0x9A2C,0x9A2A,0x9A36,0x9A29,0x9A2E,0x9A38,
-	0x9A2D,0x9AC7,0x9ACA,0x9AC6,0x9B10,0x9B12,0x9B11,0x9C0B,
-	0x9C08,0x9BF7,0x9C05,0x9C12,0x9BF8,0x9C40,
-	/* Range 0x6B21 - 0x6B7E, array index: 0x1C25 */
-	0x9C07,0x9C0E,0x9C06,0x9C17,0x9C14,0x9C09,0x9D9F,0x9D99,
-	0x9DA4,0x9D9D,0x9D92,0x9D98,0x9D90,0x9D9B,0x9DA0,0x9D94,
-	0x9D9C,0x9DAA,0x9D97,0x9DA1,0x9D9A,0x9DA2,0x9DA8,0x9D9E,
-	0x9DA3,0x9DBF,0x9DA9,0x9D96,0x9DA6,0x9DA7,0x9E99,0x9E9B,
-	0x9E9A,0x9EE5,0x9EE4,0x9EE7,0x9EE6,0x9F30,0x9F2E,0x9F5B,
-	0x9F60,0x9F5E,0x9F5D,0x9F59,0x9F91,0x513A,0x5139,0x5298,
-	0x5297,0x56C3,0x56BD,0x56BE,0x5B48,0x5B47,0x5DCB,0x5DCF,
-	0x5EF1,0x61FD,0x651B,0x6B02,0x6AFC,0x6B03,0x6AF8,0x6B00,
-	0x7043,0x7044,0x704A,0x7048,0x7049,0x7045,0x7046,0x721D,
-	0x721A,0x7219,0x737E,0x7517,0x766A,0x77D0,0x792D,0x7931,
-	0x792F,0x7C54,0x7C53,0x7CF2,0x7E8A,0x7E87,0x7E88,0x7E8B,
-	0x7E86,0x7E8D,0x7F4D,0x7FBB,0x8030,0x81DD,
-	/* Range 0x6C21 - 0x6C7E, array index: 0x1C83 */
-	0x8618,0x862A,0x8626,0x861F,0x8623,0x861C,0x8619,0x8627,
-	0x862E,0x8621,0x8620,0x8629,0x861E,0x8625,0x8829,0x881D,
-	0x881B,0x8820,0x8824,0x881C,0x882B,0x884A,0x896D,0x8969,
-	0x896E,0x896B,0x89FA,0x8B79,0x8B78,0x8B45,0x8B7A,0x8B7B,
-	0x8D10,0x8D14,0x8DAF,0x8E8E,0x8E8C,0x8F5E,0x8F5B,0x8F5D,
-	0x9146,0x9144,0x9145,0x91B9,0x943F,0x943B,0x9436,0x9429,
-	0x943D,0x9430,0x9439,0x942A,0x9437,0x942C,0x9440,0x9431,
-	0x95E5,0x95E4,0x95E3,0x9735,0x973A,0x97BF,0x97E1,0x9864,
-	0x98C9,0x98C6,0x98C0,0x9958,0x9956,0x9A39,0x9A3D,0x9A46,
-	0x9A44,0x9A42,0x9A41,0x9A3A,0x9A3F,0x9ACD,0x9B15,0x9B17,
-	0x9B18,0x9B16,0x9B3A,0x9B52,0x9C2B,0x9C1D,0x9C1C,0x9C2C,
-	0x9C23,0x9C28,0x9C29,0x9C24,0x9C21,0x9DB7,
-	/* Range 0x6D21 - 0x6D7E, array index: 0x1CE1 */
-	0x9DB6,0x9DBC,0x9DC1,0x9DC7,0x9DCA,0x9DCF,0x9DBE,0x9DC5,
-	0x9DC3,0x9DBB,0x9DB5,0x9DCE,0x9DB9,0x9DBA,0x9DAC,0x9DC8,
-	0x9DB1,0x9DAD,0x9DCC,0x9DB3,0x9DCD,0x9DB2,0x9E7A,0x9E9C,
-	0x9EEB,0x9EEE,0x9EED,0x9F1B,0x9F18,0x9F1A,0x9F31,0x9F4E,
-	0x9F65,0x9F64,0x9F92,0x4EB9,0x56C6,0x56C5,0x56CB,0x5971,
-	0x5B4B,0x5B4C,0x5DD5,0x5DD1,0x5EF2,0x6521,0x6520,0x6526,
-	0x6522,0x6B0B,0x6B08,0x6B09,0x6C0D,0x7055,0x7056,0x7057,
-	0x7052,0x721E,0x721F,0x72A9,0x737F,0x74D8,0x74D5,0x74D9,
-	0x74D7,0x766D,0x76AD,0x7935,0x79B4,0x7A70,0x7A71,0x7C57,
-	0x7C5C,0x7C59,0x7C5B,0x7C5A,0x7CF4,0x7CF1,0x7E91,0x7F4F,
-	0x7F87,0x81DE,0x826B,0x8634,0x8635,0x8633,0x862C,0x8632,
-	0x8636,0x882C,0x8828,0x8826,0x882A,0x8825,
-	/* Range 0x6E21 - 0x6E7E, array index: 0x1D3F */
-	0x8971,0x89BF,0x89BE,0x89FB,0x8B7E,0x8B84,0x8B82,0x8B86,
-	0x8B85,0x8B7F,0x8D15,0x8E95,0x8E94,0x8E9A,0x8E92,0x8E90,
-	0x8E96,0x8E97,0x8F60,0x8F62,0x9147,0x944C,0x9450,0x944A,
-	0x944B,0x944F,0x9447,0x9445,0x9448,0x9449,0x9446,0x973F,
-	0x97E3,0x986A,0x9869,0x98CB,0x9954,0x995B,0x9A4E,0x9A53,
-	0x9A54,0x9A4C,0x9A4F,0x9A48,0x9A4A,0x9A49,0x9A52,0x9A50,
-	0x9AD0,0x9B19,0x9B2B,0x9B3B,0x9B56,0x9B55,0x9C46,0x9C48,
-	0x9C3F,0x9C44,0x9C39,0x9C33,0x9C41,0x9C3C,0x9C37,0x9C34,
-	0x9C32,0x9C3D,0x9C36,0x9DDB,0x9DD2,0x9DDE,0x9DDA,0x9DCB,
-	0x9DD0,0x9DDC,0x9DD1,0x9DDF,0x9DE9,0x9DD9,0x9DD8,0x9DD6,
-	0x9DF5,0x9DD5,0x9DDD,0x9EB6,0x9EF0,0x9F35,0x9F33,0x9F32,
-	0x9F42,0x9F6B,0x9F95,0x9FA2,0x513D,0x5299,
-	/* Range 0x6F21 - 0x6F7E, array index: 0x1D9D */
-	0x58E8,0x58E7,0x5972,0x5B4D,0x5DD8,0x882F,0x5F4F,0x6201,
-	0x6203,0x6204,0x6529,0x6525,0x6596,0x66EB,0x6B11,0x6B12,
-	0x6B0F,0x6BCA,0x705B,0x705A,0x7222,0x7382,0x7381,0x7383,
-	0x7670,0x77D4,0x7C67,0x7C66,0x7E95,0x826C,0x863A,0x8640,
-	0x8639,0x863C,0x8631,0x863B,0x863E,0x8830,0x8832,0x882E,
-	0x8833,0x8976,0x8974,0x8973,0x89FE,0x8B8C,0x8B8E,0x8B8B,
-	0x8B88,0x8C45,0x8D19,0x8E98,0x8F64,0x8F63,0x91BC,0x9462,
-	0x9455,0x945D,0x9457,0x945E,0x97C4,0x97C5,0x9800,0x9A56,
-	0x9A59,0x9B1E,0x9B1F,0x9B20,0x9C52,0x9C58,0x9C50,0x9C4A,
-	0x9C4D,0x9C4B,0x9C55,0x9C59,0x9C4C,0x9C4E,0x9DFB,0x9DF7,
-	0x9DEF,0x9DE3,0x9DEB,0x9DF8,0x9DE4,0x9DF6,0x9DE1,0x9DEE,
-	0x9DE6,0x9DF2,0x9DF0,0x9DE2,0x9DEC,0x9DF4,
-	/* Range 0x7021 - 0x707E, array index: 0x1DFB */
-	0x9DF3,0x9DE8,0x9DED,0x9EC2,0x9ED0,0x9EF2,0x9EF3,0x9F06,
-	0x9F1C,0x9F38,0x9F37,0x9F36,0x9F43,0x9F4F,0x9F71,0x9F70,
-	0x9F6E,0x9F6F,0x56D3,0x56CD,0x5B4E,0x5C6D,0x652D,0x66ED,
-	0x66EE,0x6B13,0x705F,0x7061,0x705D,0x7060,0x7223,0x74DB,
-	0x74E5,0x77D5,0x7938,0x79B7,0x79B6,0x7C6A,0x7E97,0x7F89,
-	0x826D,0x8643,0x8838,0x8837,0x8835,0x884B,0x8B94,0x8B95,
-	0x8E9E,0x8E9F,0x8EA0,0x8E9D,0x91BE,0x91BD,0x91C2,0x946B,
-	0x9468,0x9469,0x96E5,0x9746,0x9743,0x9747,0x97C7,0x97E5,
-	0x9A5E,0x9AD5,0x9B59,0x9C63,0x9C67,0x9C66,0x9C62,0x9C5E,
-	0x9C60,0x9E02,0x9DFE,0x9E07,0x9E03,0x9E06,0x9E05,0x9E00,
-	0x9E01,0x9E09,0x9DFF,0x9DFD,0x9E04,0x9EA0,0x9F1E,0x9F46,
-	0x9F74,0x9F75,0x9F76,0x56D4,0x652E,0x65B8,
-	/* Range 0x7121 - 0x717E, array index: 0x1E59 */
-	0x6B18,0x6B19,0x6B17,0x6B1A,0x7062,0x7226,0x72AA,0x77D8,
-	0x77D9,0x7939,0x7C69,0x7C6B,0x7CF6,0x7E9A,0x7E98,0x7E9B,
-	0x7E99,0x81E0,0x81E1,0x8646,0x8647,0x8648,0x8979,0x897A,
-	0x897C,0x897B,0x89FF,0x8B98,0x8B99,0x8EA5,0x8EA4,0x8EA3,
-	0x946E,0x946D,0x946F,0x9471,0x9473,0x9749,0x9872,0x995F,
-	0x9C68,0x9C6E,0x9C6D,0x9E0B,0x9E0D,0x9E10,0x9E0F,0x9E12,
-	0x9E11,0x9EA1,0x9EF5,0x9F09,0x9F47,0x9F78,0x9F7B,0x9F7A,
-	0x9F79,0x571E,0x7066,0x7C6F,0x883C,0x8DB2,0x8EA6,0x91C3,
-	0x9474,0x9478,0x9476,0x9475,0x9A60,0x9B2E,0x9C74,0x9C73,
-	0x9C71,0x9C75,0x9E14,0x9E13,0x9EF6,0x9F0A,0x9FA4,0x7068,
-	0x7065,0x7CF7,0x866A,0x883E,0x883D,0x883F,0x8B9E,0x8C9C,
-	0x8EA9,0x8EC9,0x974B,0x9873,0x9874,0x98CC,
-	/* Range 0x7221 - 0x7244, array index: 0x1EB7 */
-	0x9961,0x99AB,0x9A64,0x9A66,0x9A67,0x9B24,0x9E15,0x9E17,
-	0x9F48,0x6207,0x6B1E,0x7227,0x864C,0x8EA8,0x9482,0x9480,
-	0x9481,0x9A69,0x9A68,0x9E19,0x864B,0x8B9F,0x9483,0x9C79,
-	0x9EB7,0x7675,0x9A6B,0x9C7A,0x9E1D,0x7069,0x706A,0x7229,
-	0x9EA4,0x9F7E,0x9F49,0x9F98,
-	/* Unranged codes (82 codes) */
-};
-
-#endif /* ICONV_TO_UCS_CCS_CNS11643_PLANE2 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> cns11643_plane2 speed-optimized table (42496 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_speed_cns11643_plane2[] =
-{
-	/* Heading Block */
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,0x0100,0x0200,
-	0x0300,0x0400,0x0500,0x0600,0x0700,0x0800,0x0900,0x0A00,
-	0x0B00,0x0C00,0x0D00,0x0E00,0x0F00,0x1000,0x1100,0x1200,
-	0x1300,0x1400,0x1500,0x1600,0x1700,0x1800,0x1900,0x1A00,
-	0x1B00,0x1C00,0x1D00,0x1E00,0x1F00,0x2000,0x2100,0x2200,
-	0x2300,0x2400,0x2500,0x2600,0x2700,0x2800,0x2900,0x2A00,
-	0x2B00,0x2C00,0x2D00,0x2E00,0x2F00,0x3000,0x3100,0x3200,
-	0x3300,0x3400,0x3500,0x3600,0x3700,0x3800,0x3900,0x3A00,
-	0x3B00,0x3C00,0x3D00,0x3E00,0x3F00,0x4000,0x4100,0x4200,
-	0x4300,0x4400,0x4500,0x4600,0x4700,0x4800,0x4900,0x4A00,
-	0x4B00,0x4C00,0x4D00,0x4E00,0x4F00,0x5000,0x5100,0x5200,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	/* Block 79, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2126,
-	INVALC,INVALC,INVALC,INVALC,0x2127,INVALC,0x212F,0x212D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2130,INVALC,
-	INVALC,0x2143,INVALC,0x2531,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2144,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2121,INVALC,INVALC,INVALC,INVALC,0x2128,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2122,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x334E,
-	INVALC,INVALC,INVALC,0x4156,0x4157,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2129,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2131,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4158,INVALC,
-	INVALC,0x6D44,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2132,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2134,0x2133,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x214A,INVALC,0x2146,0x2149,INVALC,INVALC,
-	INVALC,0x2148,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2145,0x2147,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x216F,INVALC,INVALC,0x2179,0x216D,INVALC,0x2171,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 80, Array index 0x0200 */
-	0x2170,INVALC,0x2174,INVALC,0x2178,0x2175,INVALC,INVALC,
-	0x2172,INVALC,INVALC,INVALC,INVALC,INVALC,0x216A,INVALC,
-	INVALC,INVALC,0x217A,0x2177,0x216E,INVALC,INVALC,INVALC,
-	0x216B,INVALC,INVALC,INVALC,INVALC,0x2173,INVALC,INVALC,
-	INVALC,INVALC,0x2176,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x216C,0x2328,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2329,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x227B,INVALC,INVALC,0x2322,0x232A,
-	INVALC,0x2326,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x227D,INVALC,INVALC,0x253D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2324,0x227E,INVALC,INVALC,0x227A,INVALC,
-	0x2327,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2325,
-	INVALC,0x232B,0x227C,INVALC,0x2321,INVALC,INVALC,0x2323,
-	INVALC,INVALC,0x253F,0x254B,INVALC,INVALC,0x254C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2539,INVALC,0x2538,0x253C,
-	0x2543,0x2541,INVALC,INVALC,0x2533,0x2535,INVALC,INVALC,
-	0x2536,0x2542,0x2549,INVALC,0x253B,0x2534,INVALC,0x2537,
-	INVALC,0x253A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2544,INVALC,0x2548,INVALC,0x2546,0x254A,INVALC,0x253E,
-	0x2532,INVALC,0x2540,INVALC,0x2545,INVALC,0x2547,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2922,0x292A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2930,0x292E,0x2929,INVALC,INVALC,INVALC,INVALC,
-	0x292F,0x2925,INVALC,INVALC,INVALC,0x287E,INVALC,0x292C,
-	INVALC,0x2923,INVALC,0x2924,INVALC,0x287D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2921,0x2926,INVALC,0x292D,INVALC,
-	INVALC,0x2928,INVALC,0x292B,0x2927,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2931,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2D71,0x2D70,0x2D75,0x2D76,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 81, Array index 0x0300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2D6A,INVALC,0x2D6B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2D7E,INVALC,
-	INVALC,INVALC,INVALC,0x2D6C,INVALC,0x335E,INVALC,0x2D77,
-	INVALC,INVALC,INVALC,0x2D6F,0x2D78,INVALC,0x2D69,INVALC,
-	0x2D79,INVALC,0x2D6D,INVALC,INVALC,INVALC,INVALC,0x2D7A,
-	INVALC,INVALC,INVALC,INVALC,0x2D74,INVALC,INVALC,0x2D7C,
-	0x2D6E,0x2D7D,INVALC,0x2D72,INVALC,0x2D7B,INVALC,0x2D73,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3366,0x335A,INVALC,INVALC,INVALC,0x335F,0x3365,INVALC,
-	0x3358,INVALC,0x335C,0x3355,INVALC,0x3359,INVALC,INVALC,
-	INVALC,0x336A,INVALC,0x3354,INVALC,INVALC,INVALC,0x3369,
-	INVALC,INVALC,INVALC,0x335B,INVALC,0x3356,0x3352,0x3360,
-	0x3353,0x3351,0x335D,0x3363,0x3364,INVALC,INVALC,INVALC,
-	0x3A3F,0x3361,0x3350,0x3362,INVALC,INVALC,0x3367,INVALC,
-	0x334F,INVALC,0x3357,0x3368,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3A42,0x3A3B,INVALC,INVALC,INVALC,0x3A43,
-	INVALC,INVALC,INVALC,0x3A39,0x3A3C,INVALC,0x3A3D,INVALC,
-	INVALC,INVALC,0x3A41,INVALC,0x3A37,0x3A36,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3A35,0x3A40,0x3A3E,0x3A38,INVALC,
-	INVALC,INVALC,INVALC,0x3A3A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x415C,INVALC,
-	0x4162,0x4165,INVALC,INVALC,0x415F,INVALC,0x4168,INVALC,
-	0x4169,INVALC,0x4164,INVALC,INVALC,0x4159,INVALC,0x415A,
-	INVALC,0x4163,0x4161,INVALC,0x415D,INVALC,0x415B,INVALC,
-	0x4160,0x4167,0x415E,0x4166,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4921,0x4877,INVALC,INVALC,0x4878,
-	INVALC,INVALC,INVALC,0x487B,INVALC,0x487D,INVALC,INVALC,
-	0x4926,INVALC,INVALC,0x4925,0x487E,INVALC,0x4876,INVALC,
-	0x4879,INVALC,0x487C,INVALC,0x4922,INVALC,INVALC,0x4924,
-	0x4923,INVALC,INVALC,0x487A,INVALC,INVALC,0x4F54,INVALC,
-	0x4F51,INVALC,INVALC,INVALC,INVALC,0x4F58,0x4F55,0x4F4E,
-	/* Block 82, Array index 0x0400 */
-	INVALC,INVALC,INVALC,0x4F4F,INVALC,INVALC,0x4F52,0x4F53,
-	INVALC,INVALC,0x4F59,0x4F56,0x4F57,INVALC,INVALC,INVALC,
-	INVALC,0x5643,INVALC,0x5640,INVALC,INVALC,INVALC,0x5641,
-	INVALC,INVALC,0x5642,INVALC,0x563F,INVALC,INVALC,INVALC,
-	0x5C49,INVALC,0x5C47,INVALC,0x5C48,0x5C46,0x5C45,INVALC,
-	INVALC,0x5C4A,INVALC,INVALC,INVALC,0x6144,0x6145,INVALC,
-	0x4F50,0x6143,INVALC,INVALC,0x6537,0x6538,INVALC,INVALC,
-	INVALC,0x6B4F,0x6B4E,INVALC,INVALC,0x6E7D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2E21,INVALC,INVALC,INVALC,INVALC,0x3A44,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x212E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x232C,
-	INVALC,INVALC,INVALC,0x2E23,0x2E22,INVALC,INVALC,INVALC,
-	0x2135,INVALC,INVALC,INVALC,INVALC,INVALC,0x254D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x217B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x232D,INVALC,INVALC,0x254E,INVALC,0x254F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2E25,0x2E26,INVALC,INVALC,
-	0x2E27,INVALC,0x2E24,INVALC,INVALC,INVALC,0x2E28,INVALC,
-	0x336B,INVALC,INVALC,INVALC,0x3A45,INVALC,INVALC,0x416A,
-	0x4927,INVALC,INVALC,INVALC,INVALC,INVALC,0x5644,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2123,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 83, Array index 0x0500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x214C,INVALC,INVALC,0x214B,INVALC,INVALC,INVALC,
-	0x217D,INVALC,INVALC,0x217C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x232E,INVALC,0x232F,INVALC,
-	INVALC,0x2330,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2554,0x2551,0x2552,INVALC,0x2550,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2932,INVALC,0x2553,INVALC,
-	INVALC,0x2933,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2E2B,INVALC,INVALC,0x2E2E,INVALC,INVALC,
-	INVALC,INVALC,0x2E2A,INVALC,INVALC,INVALC,0x2E2C,0x2E2D,
-	INVALC,0x2E29,0x2E2F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x336C,0x336E,0x336D,0x336F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x416C,INVALC,0x416B,0x416D,0x416E,INVALC,INVALC,INVALC,
-	0x4928,0x4929,INVALC,INVALC,0x4C61,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4F5A,0x4F5B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6539,0x6B51,
-	0x6B50,0x6E7E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x217E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2331,0x2332,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2555,INVALC,INVALC,INVALC,
-	0x2934,INVALC,0x2935,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2E30,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3371,INVALC,INVALC,0x3370,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x492A,INVALC,0x492B,INVALC,INVALC,INVALC,0x4F5D,
-	INVALC,0x4F5C,INVALC,INVALC,0x5C4B,INVALC,INVALC,0x653A,
-	INVALC,INVALC,INVALC,INVALC,0x2136,INVALC,INVALC,INVALC,
-	/* Block 84, Array index 0x0600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2333,0x2556,0x2557,INVALC,INVALC,0x2E31,INVALC,
-	INVALC,0x3A47,0x3A46,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2124,INVALC,0x214D,INVALC,INVALC,0x2222,
-	INVALC,INVALC,0x2221,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3372,INVALC,INVALC,
-	0x492C,INVALC,INVALC,INVALC,0x5645,INVALC,INVALC,0x686A,
-	INVALC,INVALC,INVALC,INVALC,0x2558,0x2936,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x214E,0x2223,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2334,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2137,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2335,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2937,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2125,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2224,INVALC,INVALC,INVALC,0x2336,0x2337,
-	INVALC,INVALC,0x2559,INVALC,0x255A,INVALC,0x2939,0x2938,
-	0x293B,0x293A,INVALC,INVALC,0x3373,INVALC,0x2E32,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A48,INVALC,INVALC,0x3A49,
-	INVALC,INVALC,INVALC,INVALC,0x492D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x653B,INVALC,INVALC,INVALC,
-	INVALC,0x2138,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5646,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 85, Array index 0x0700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2225,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2340,0x233D,INVALC,INVALC,0x233E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2345,0x233F,INVALC,INVALC,
-	0x2344,INVALC,0x233A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2338,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2339,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2341,INVALC,INVALC,
-	INVALC,0x2343,INVALC,INVALC,INVALC,0x233C,INVALC,0x2346,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2342,
-	INVALC,INVALC,INVALC,INVALC,0x233B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x256B,0x256A,INVALC,0x256D,0x256F,0x2564,0x2567,0x256E,
-	INVALC,INVALC,INVALC,0x2561,0x2565,INVALC,INVALC,0x2569,
-	0x294A,INVALC,0x294E,INVALC,0x2566,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2562,INVALC,INVALC,INVALC,0x2563,0x255C,
-	INVALC,0x255D,0x255F,INVALC,INVALC,INVALC,INVALC,0x255B,
-	0x2560,INVALC,INVALC,INVALC,INVALC,0x2568,INVALC,INVALC,
-	INVALC,0x255E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x256C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2949,0x293D,0x294C,INVALC,INVALC,0x293F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x293E,0x2944,INVALC,
-	0x2950,INVALC,INVALC,INVALC,INVALC,INVALC,0x2946,0x2943,
-	INVALC,INVALC,0x293C,INVALC,0x294B,INVALC,0x294D,INVALC,
-	INVALC,INVALC,INVALC,0x2941,INVALC,0x2947,0x2948,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2940,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2945,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x294F,INVALC,
-	0x2E46,INVALC,0x2E34,INVALC,0x2E39,INVALC,INVALC,0x2E37,
-	INVALC,INVALC,INVALC,0x2E3E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2E41,INVALC,0x2E38,INVALC,INVALC,INVALC,0x2E44,
-	0x2E45,INVALC,INVALC,0x2E43,INVALC,INVALC,INVALC,0x2E3B,
-	/* Block 86, Array index 0x0800 */
-	INVALC,INVALC,INVALC,0x2E48,0x2E3C,0x2E40,INVALC,INVALC,
-	0x2E3D,INVALC,0x2E42,0x2E49,0x3424,INVALC,0x2E47,INVALC,
-	INVALC,0x2E3F,0x2E36,INVALC,INVALC,INVALC,INVALC,0x2E35,
-	INVALC,INVALC,0x2E3A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2E33,INVALC,
-	INVALC,INVALC,0x337A,INVALC,INVALC,0x342A,INVALC,INVALC,
-	0x3421,INVALC,0x3425,INVALC,0x3379,0x337E,0x337D,INVALC,
-	INVALC,0x3428,INVALC,0x342B,0x3376,INVALC,INVALC,INVALC,
-	0x342C,INVALC,INVALC,INVALC,INVALC,0x3423,INVALC,INVALC,
-	0x3429,INVALC,INVALC,0x342D,INVALC,0x3377,0x3427,INVALC,
-	0x3378,0x337B,0x3422,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x337C,INVALC,INVALC,0x3426,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3374,0x3375,0x3A4E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3A59,INVALC,0x3A5C,
-	INVALC,0x3A55,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A52,INVALC,INVALC,INVALC,0x3A5A,0x417C,0x3A5F,0x3A53,
-	INVALC,0x3A4A,0x3A57,0x3A51,INVALC,0x3A5D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3A5E,0x3A50,0x3A56,0x3A58,0x3A4C,0x3A5B,INVALC,
-	0x3A4B,INVALC,INVALC,INVALC,INVALC,0x3A4D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3A54,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x417A,
-	0x4176,INVALC,0x4227,0x416F,0x4178,INVALC,INVALC,INVALC,
-	0x4223,INVALC,0x4174,0x4173,0x4171,0x4225,INVALC,0x417D,
-	0x4172,INVALC,0x417B,INVALC,0x4177,0x417E,0x4222,INVALC,
-	INVALC,0x4226,INVALC,0x4170,INVALC,0x4175,INVALC,INVALC,
-	INVALC,INVALC,0x4221,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4179,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4224,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x493C,0x4938,INVALC,0x4932,INVALC,INVALC,0x493B,
-	/* Block 87, Array index 0x0900 */
-	INVALC,0x4935,0x4937,INVALC,0x493A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4930,INVALC,INVALC,0x4933,
-	INVALC,INVALC,0x4931,0x4936,INVALC,0x492F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4934,0x4939,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x492E,
-	INVALC,INVALC,0x4F6E,INVALC,0x4F6B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4F69,INVALC,0x4F61,INVALC,INVALC,
-	0x4F6D,INVALC,0x4F6F,INVALC,INVALC,0x4F6A,0x4F6C,INVALC,
-	0x4F68,0x4F62,0x4F5F,INVALC,INVALC,0x3A4F,0x4F65,INVALC,
-	0x4F5E,0x4F64,0x4F63,INVALC,0x4F60,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F66,INVALC,0x4F67,INVALC,INVALC,INVALC,0x564F,INVALC,
-	0x5648,INVALC,INVALC,0x564C,INVALC,INVALC,0x564B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x564D,0x5649,INVALC,
-	0x5647,INVALC,0x564E,0x564A,INVALC,INVALC,INVALC,0x5650,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C52,0x5C54,
-	INVALC,0x5C55,0x5C53,0x5C51,0x5C50,INVALC,0x5C4F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5C4D,0x5C4E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C4C,INVALC,INVALC,INVALC,0x6148,
-	0x6146,0x614B,0x6149,INVALC,0x6147,0x614A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x653E,0x653F,
-	INVALC,INVALC,0x6540,0x653C,0x6541,0x653D,INVALC,INVALC,
-	INVALC,INVALC,0x686B,0x686D,INVALC,0x686C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6B53,0x6B54,INVALC,
-	INVALC,INVALC,INVALC,0x6B52,INVALC,0x6D46,0x6D45,INVALC,
-	INVALC,INVALC,INVALC,0x6D47,INVALC,0x7034,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7033,0x707C,INVALC,INVALC,0x212A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2227,
-	INVALC,0x2226,INVALC,INVALC,INVALC,0x2349,INVALC,0x2348,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2347,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2570,
-	INVALC,0x2571,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 88, Array index 0x0A00 */
-	INVALC,0x2E4A,0x2E4B,INVALC,INVALC,INVALC,INVALC,0x342F,
-	INVALC,INVALC,0x342E,INVALC,0x3A60,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4228,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F70,0x5652,0x5651,INVALC,0x715A,INVALC,
-	0x2139,INVALC,0x214F,0x2150,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2229,INVALC,INVALC,INVALC,0x2228,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x222A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x234A,INVALC,INVALC,INVALC,0x234B,INVALC,INVALC,
-	INVALC,0x234D,INVALC,0x234E,0x234C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x234F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x257E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2621,INVALC,INVALC,0x2575,INVALC,0x2574,INVALC,0x2572,
-	0x2577,0x2576,0x2573,0x257C,0x257D,0x257A,0x2578,INVALC,
-	INVALC,INVALC,INVALC,0x257B,INVALC,0x2622,INVALC,INVALC,
-	0x2579,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2955,INVALC,INVALC,0x295B,
-	INVALC,INVALC,INVALC,INVALC,0x2959,0x295F,INVALC,0x2956,
-	0x295A,0x295C,0x295E,0x2958,INVALC,0x2957,0x2952,0x2953,
-	INVALC,INVALC,INVALC,INVALC,0x2954,0x295D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2951,0x2E55,INVALC,
-	0x2E54,0x2E59,0x2E50,INVALC,0x2E53,0x2E52,INVALC,0x2E56,
-	INVALC,0x2E5A,INVALC,INVALC,INVALC,INVALC,0x2E51,0x2E57,
-	INVALC,INVALC,INVALC,INVALC,0x2E4C,INVALC,INVALC,0x343D,
-	0x2E58,INVALC,0x2E4F,INVALC,INVALC,0x2E4E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3434,INVALC,INVALC,INVALC,
-	INVALC,0x3444,0x3432,0x3440,INVALC,0x3442,INVALC,0x3448,
-	INVALC,0x344C,INVALC,INVALC,0x3443,0x3437,0x343F,INVALC,
-	0x344D,0x344B,0x3441,0x343C,0x3435,0x3A68,0x3433,INVALC,
-	0x343A,INVALC,INVALC,0x3430,0x3446,0x3438,INVALC,INVALC,
-	/* Block 89, Array index 0x0B00 */
-	0x3436,0x3449,INVALC,INVALC,0x344F,INVALC,INVALC,0x343E,
-	0x3439,INVALC,INVALC,0x343B,0x344A,0x344E,0x3445,INVALC,
-	0x3447,INVALC,INVALC,INVALC,0x3431,INVALC,INVALC,INVALC,
-	INVALC,0x3A63,INVALC,0x3A6C,0x3A6B,INVALC,0x3A64,INVALC,
-	INVALC,INVALC,INVALC,0x3A66,INVALC,0x3A6A,INVALC,0x3A65,
-	0x3A67,0x3A61,INVALC,INVALC,0x3A74,0x3A73,0x3A70,INVALC,
-	INVALC,INVALC,0x2E4D,0x3A6D,INVALC,INVALC,0x3A6F,0x3A62,
-	0x3A72,0x3A71,INVALC,0x3A75,INVALC,0x4236,INVALC,0x3A6E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A69,0x422E,INVALC,INVALC,INVALC,0x422D,0x4231,0x422C,
-	INVALC,INVALC,INVALC,0x4229,INVALC,0x4230,INVALC,INVALC,
-	INVALC,0x4233,INVALC,0x4235,INVALC,0x4232,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4237,0x422B,0x4234,INVALC,INVALC,
-	0x422A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x422F,
-	INVALC,0x4238,INVALC,INVALC,0x4944,INVALC,0x494A,INVALC,
-	INVALC,INVALC,0x4946,0x494D,0x493E,INVALC,INVALC,0x4943,
-	INVALC,0x4942,0x494B,INVALC,INVALC,INVALC,0x4941,0x4947,
-	0x494C,0x493D,INVALC,0x4945,INVALC,INVALC,0x4949,0x494F,
-	0x493F,0x4948,INVALC,INVALC,0x494E,INVALC,INVALC,INVALC,
-	0x4940,INVALC,INVALC,INVALC,INVALC,0x4F72,INVALC,INVALC,
-	0x4F74,0x4F79,INVALC,0x4F75,INVALC,0x4F78,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4F71,0x4F77,INVALC,INVALC,0x4F76,
-	INVALC,0x4F73,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5657,INVALC,0x5659,0x5654,INVALC,0x5656,
-	INVALC,INVALC,0x5658,INVALC,INVALC,INVALC,0x565A,INVALC,
-	0x5653,0x5655,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C58,
-	INVALC,INVALC,0x5C59,INVALC,0x5C57,INVALC,0x5C56,INVALC,
-	INVALC,INVALC,0x6542,0x6544,INVALC,0x6543,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x686E,INVALC,INVALC,INVALC,0x6F22,
-	0x6F21,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2960,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4239,INVALC,0x4950,0x4F7A,
-	/* Block 90, Array index 0x0C00 */
-	INVALC,INVALC,INVALC,0x213A,INVALC,INVALC,0x2350,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2623,0x2961,0x2E5B,INVALC,
-	INVALC,INVALC,0x6545,INVALC,INVALC,INVALC,INVALC,0x2151,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x213B,INVALC,INVALC,0x2152,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x222B,INVALC,INVALC,INVALC,
-	0x2351,INVALC,INVALC,INVALC,INVALC,0x2624,INVALC,INVALC,
-	INVALC,INVALC,0x2E5C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2962,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3450,INVALC,INVALC,INVALC,
-	INVALC,0x3A76,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4951,INVALC,INVALC,INVALC,INVALC,
-	0x614C,0x6D48,0x6F23,INVALC,INVALC,INVALC,INVALC,0x2231,
-	INVALC,INVALC,INVALC,0x222F,0x222D,INVALC,0x2230,0x2232,
-	0x222C,INVALC,INVALC,INVALC,INVALC,0x222E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2356,0x2359,
-	0x2358,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2355,
-	0x2353,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2354,0x235B,0x2357,INVALC,INVALC,INVALC,0x2352,0x235A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2630,0x2629,INVALC,0x2634,0x2625,0x262C,INVALC,
-	INVALC,INVALC,0x2626,INVALC,0x262D,0x2631,INVALC,INVALC,
-	0x2632,0x262B,INVALC,0x262E,INVALC,INVALC,INVALC,0x2635,
-	0x2633,INVALC,INVALC,INVALC,0x262A,INVALC,0x2628,0x2627,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x262F,INVALC,
-	INVALC,INVALC,INVALC,0x2970,INVALC,0x2968,0x2964,INVALC,
-	0x2974,0x2963,INVALC,INVALC,0x296D,INVALC,INVALC,INVALC,
-	INVALC,0x2971,INVALC,INVALC,INVALC,0x2977,0x2965,INVALC,
-	INVALC,0x2967,0x296E,0x2972,0x2976,0x2973,0x296C,0x296F,
-	INVALC,INVALC,0x2969,INVALC,0x296B,0x296A,0x2975,INVALC,
-	/* Block 91, Array index 0x0D00 */
-	0x2966,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2E64,INVALC,INVALC,INVALC,INVALC,0x2E62,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2E61,0x2E5E,0x2E63,
-	INVALC,0x2E5D,INVALC,INVALC,INVALC,INVALC,0x2E65,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2E5F,0x2E60,INVALC,
-	INVALC,INVALC,INVALC,0x2E66,INVALC,0x3457,INVALC,0x3B26,
-	0x3456,0x3469,INVALC,INVALC,INVALC,INVALC,0x3467,INVALC,
-	INVALC,INVALC,0x3470,0x3460,0x3463,INVALC,INVALC,0x346D,
-	0x3465,INVALC,INVALC,INVALC,0x346A,0x3468,INVALC,INVALC,
-	0x3459,0x346E,0x3462,0x345D,INVALC,0x3453,0x346F,0x345F,
-	0x3452,INVALC,INVALC,0x3464,0x3471,0x3461,0x3455,0x345A,
-	0x3451,INVALC,INVALC,INVALC,0x345E,0x345B,INVALC,0x3454,
-	INVALC,0x346C,INVALC,INVALC,0x345C,0x3458,INVALC,INVALC,
-	0x346B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A7D,INVALC,0x3A7A,0x3B2D,0x3B21,0x3B2E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3B2A,0x3B27,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3B28,0x3B2B,0x3B2F,INVALC,0x3466,0x3B31,
-	0x424D,INVALC,INVALC,0x3B32,0x3A78,0x3B24,INVALC,0x3B29,
-	INVALC,INVALC,INVALC,INVALC,0x3B30,0x3B33,0x3A7C,0x3A79,
-	INVALC,INVALC,0x3A7B,INVALC,INVALC,0x3B22,0x3A7E,INVALC,
-	INVALC,0x3B2C,INVALC,INVALC,0x3B23,INVALC,0x3B25,0x3A77,
-	0x4241,0x423F,INVALC,INVALC,0x4249,0x4240,0x424A,0x4246,
-	0x423E,0x424C,0x423D,0x4244,INVALC,INVALC,INVALC,0x4242,
-	0x4247,INVALC,INVALC,INVALC,0x423B,INVALC,0x4245,0x423A,
-	0x4243,INVALC,0x4248,0x423C,INVALC,0x424B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4955,INVALC,INVALC,
-	INVALC,0x4961,0x4957,0x495D,0x4952,0x4960,0x495F,0x4963,
-	0x495C,INVALC,0x495B,INVALC,INVALC,0x4954,INVALC,INVALC,
-	0x4962,INVALC,0x4956,0x4959,0x495E,0x4958,0x4953,INVALC,
-	INVALC,INVALC,INVALC,0x495A,0x4F7C,INVALC,0x5021,0x4F7E,
-	0x5023,0x5025,INVALC,INVALC,INVALC,0x4F7D,INVALC,0x4F7B,
-	/* Block 92, Array index 0x0E00 */
-	INVALC,0x5026,0x5024,0x5022,INVALC,0x5028,INVALC,0x5027,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5029,
-	0x5661,INVALC,INVALC,0x5660,0x565F,INVALC,0x5662,0x565B,
-	INVALC,0x565C,0x5664,0x565D,INVALC,INVALC,0x5666,INVALC,
-	0x5665,0x565E,INVALC,0x5C5D,INVALC,0x5C5B,0x5C60,0x5C5F,
-	0x5663,INVALC,INVALC,INVALC,0x5C5E,0x5C5A,0x5C62,0x5C61,
-	INVALC,INVALC,0x5C5C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x614D,0x6546,0x6547,0x6548,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x686F,INVALC,0x6B56,
-	0x6B55,INVALC,INVALC,0x6D49,0x6D4A,0x6F24,0x7035,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2233,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2636,INVALC,INVALC,0x2637,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2E67,INVALC,0x3473,INVALC,
-	INVALC,INVALC,0x3472,INVALC,INVALC,INVALC,INVALC,0x4964,
-	INVALC,INVALC,INVALC,0x5C63,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2153,INVALC,INVALC,0x2154,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x235C,INVALC,
-	INVALC,INVALC,0x235D,0x2638,INVALC,0x2639,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2E68,
-	0x2978,INVALC,INVALC,INVALC,0x2E6A,0x2E69,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3475,0x3474,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3B39,0x3B36,INVALC,0x3B35,0x3B3A,INVALC,
-	INVALC,0x3B38,INVALC,INVALC,0x3B37,INVALC,0x424E,INVALC,
-	0x424F,0x4250,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4965,INVALC,INVALC,0x4966,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3B34,INVALC,INVALC,INVALC,INVALC,0x5667,
-	INVALC,0x5C64,0x5C65,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 93, Array index 0x0F00 */
-	INVALC,INVALC,INVALC,0x2E6B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3B3B,INVALC,INVALC,INVALC,
-	0x213C,INVALC,0x2155,INVALC,INVALC,0x2234,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4251,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2235,INVALC,INVALC,
-	0x235E,INVALC,0x235F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B3C,INVALC,INVALC,0x4252,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2156,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x263A,INVALC,INVALC,0x263B,
-	INVALC,INVALC,INVALC,INVALC,0x2979,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2E6D,INVALC,0x2E6C,INVALC,
-	INVALC,0x3476,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4967,INVALC,INVALC,INVALC,0x502A,
-	INVALC,0x614E,0x614F,INVALC,INVALC,0x7036,0x212B,INVALC,
-	INVALC,INVALC,INVALC,0x2158,0x2157,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2237,0x2238,0x2236,INVALC,0x2239,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2367,INVALC,
-	0x2362,0x2364,0x2366,0x2363,INVALC,0x2360,INVALC,0x2361,
-	INVALC,INVALC,0x2365,0x2368,INVALC,0x2369,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2649,INVALC,0x2643,
-	0x263E,INVALC,0x2646,0x2644,0x263D,0x264A,0x264D,0x2648,
-	0x2641,INVALC,0x2647,INVALC,0x2642,0x2645,0x263C,0x2640,
-	0x264C,INVALC,INVALC,INVALC,INVALC,0x263F,0x264B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2A2C,0x2A25,
-	0x2A2B,0x2A24,0x2A26,0x297E,0x297C,INVALC,0x2A2D,0x2A2A,
-	0x297A,INVALC,INVALC,0x2A28,0x2A29,INVALC,0x2A27,0x297D,
-	0x297B,INVALC,0x2A23,0x2A21,INVALC,INVALC,0x2A22,0x2A2E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2E6E,INVALC,0x2E70,INVALC,
-	INVALC,0x2E71,INVALC,INVALC,INVALC,INVALC,INVALC,0x2E72,
-	0x2A2F,0x2E74,INVALC,INVALC,INVALC,INVALC,INVALC,0x2E6F,
-	/* Block 94, Array index 0x1000 */
-	0x2E73,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3478,0x347C,0x347E,INVALC,0x3523,
-	INVALC,INVALC,0x3525,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x347A,INVALC,INVALC,0x3479,0x3477,0x3527,
-	0x347B,INVALC,INVALC,0x3526,INVALC,0x3522,0x3521,INVALC,
-	0x347D,INVALC,INVALC,INVALC,INVALC,INVALC,0x3528,INVALC,
-	0x3524,0x3B4B,0x3B52,0x3B47,INVALC,0x3B43,0x3B53,0x3B3D,
-	0x3B50,0x3B4E,0x3B48,INVALC,0x3B51,0x3B4A,INVALC,0x3B42,
-	0x3B54,0x3B40,0x3B4D,0x3B3E,INVALC,0x3B55,INVALC,INVALC,
-	INVALC,0x3B4F,0x4255,0x3B41,INVALC,INVALC,0x3B45,INVALC,
-	INVALC,0x3B44,0x3B49,INVALC,INVALC,0x3B46,INVALC,INVALC,
-	INVALC,0x3B4C,INVALC,INVALC,INVALC,INVALC,0x4259,INVALC,
-	INVALC,INVALC,0x425C,0x4254,INVALC,0x4256,INVALC,0x425B,
-	0x425A,INVALC,INVALC,0x3B3F,0x4258,INVALC,INVALC,INVALC,
-	INVALC,0x4253,0x4257,INVALC,INVALC,INVALC,INVALC,0x496E,
-	INVALC,0x4975,0x496C,INVALC,0x4973,0x496A,0x4972,0x4976,
-	0x4969,0x496D,0x4968,INVALC,INVALC,INVALC,0x496B,INVALC,
-	0x4971,0x4970,0x496F,INVALC,INVALC,0x4974,INVALC,INVALC,
-	INVALC,INVALC,0x502E,0x5030,INVALC,0x5031,INVALC,0x502C,
-	INVALC,0x502B,0x5035,INVALC,0x5033,INVALC,0x5036,0x502D,
-	0x5032,0x5034,0x502F,INVALC,INVALC,INVALC,INVALC,0x566B,
-	0x5670,0x566A,0x566F,INVALC,0x5668,0x5672,0x566E,0x5673,
-	0x566D,0x5669,0x5671,INVALC,0x5674,0x566C,INVALC,0x5C66,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6150,INVALC,0x643E,0x6549,INVALC,INVALC,0x6870,0x6871,
-	INVALC,INVALC,INVALC,0x6B57,INVALC,INVALC,INVALC,0x6B58,
-	INVALC,0x6D4C,INVALC,INVALC,INVALC,0x6D4B,INVALC,INVALC,
-	0x6F25,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x223A,
-	0x236A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x425D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2A30,INVALC,INVALC,INVALC,INVALC,INVALC,0x213D,
-	/* Block 95, Array index 0x1100 */
-	INVALC,INVALC,INVALC,INVALC,0x2159,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x236B,INVALC,INVALC,INVALC,0x236C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x264F,INVALC,INVALC,0x264E,
-	INVALC,0x2650,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2A34,0x2A31,0x2A32,0x2A33,0x2A35,INVALC,INVALC,INVALC,
-	0x2E76,0x2E75,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x352A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3529,INVALC,
-	INVALC,0x3B57,INVALC,INVALC,0x3B56,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4260,0x4262,INVALC,0x4261,0x425F,0x425E,
-	INVALC,INVALC,INVALC,0x4979,INVALC,INVALC,INVALC,INVALC,
-	0x4977,0x4978,INVALC,INVALC,0x503A,0x5038,INVALC,INVALC,
-	0x5039,INVALC,INVALC,INVALC,INVALC,INVALC,0x5677,0x5675,
-	0x5676,0x5037,0x5C68,INVALC,0x5C67,0x6151,0x6152,0x5678,
-	0x654A,INVALC,INVALC,INVALC,INVALC,0x223B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x215A,INVALC,0x215B,INVALC,0x223C,INVALC,INVALC,INVALC,
-	0x2370,0x236E,INVALC,0x236D,0x236F,0x2371,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2A39,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2A38,0x2A3A,0x2A37,0x2A3B,INVALC,INVALC,
-	0x2E77,INVALC,0x2E79,INVALC,0x2E7A,INVALC,0x2E78,INVALC,
-	0x2A36,0x352B,0x352E,0x352F,0x352C,INVALC,INVALC,INVALC,
-	INVALC,0x352D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4263,0x4265,0x4267,
-	INVALC,INVALC,INVALC,0x4266,0x4264,INVALC,0x497D,INVALC,
-	INVALC,0x497B,0x4A23,INVALC,0x4A24,0x4A21,INVALC,0x497C,
-	0x497A,0x4A22,INVALC,0x503C,0x497E,INVALC,0x503D,INVALC,
-	INVALC,0x503E,INVALC,INVALC,INVALC,0x567D,0x567B,0x567A,
-	0x567C,0x5679,INVALC,INVALC,INVALC,INVALC,0x6872,0x6873,
-	INVALC,0x6B59,0x6D4D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 96, Array index 0x1200 */
-	INVALC,INVALC,0x223D,INVALC,INVALC,0x2372,INVALC,0x2A3C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x223E,INVALC,INVALC,0x2373,INVALC,INVALC,
-	INVALC,INVALC,0x2652,0x2653,0x2654,INVALC,INVALC,INVALC,
-	0x2651,INVALC,INVALC,INVALC,INVALC,INVALC,0x2A3D,INVALC,
-	0x2E7C,INVALC,INVALC,0x2E7B,INVALC,INVALC,0x3530,INVALC,
-	0x3531,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4268,INVALC,INVALC,0x4A26,0x4A25,INVALC,INVALC,INVALC,
-	INVALC,0x503F,INVALC,0x567E,INVALC,INVALC,INVALC,0x6F27,
-	INVALC,INVALC,INVALC,INVALC,0x2655,INVALC,0x2A3E,INVALC,
-	0x3B58,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2E7D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A27,
-	INVALC,INVALC,INVALC,0x212C,0x223F,INVALC,0x2375,INVALC,
-	0x2374,INVALC,INVALC,INVALC,INVALC,0x2658,0x2657,INVALC,
-	INVALC,INVALC,0x2656,INVALC,INVALC,INVALC,0x2A3F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3533,INVALC,
-	INVALC,INVALC,INVALC,0x3532,INVALC,INVALC,INVALC,0x3534,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3B5A,0x3B59,INVALC,
-	INVALC,INVALC,INVALC,0x3B5B,INVALC,0x426A,INVALC,0x4269,
-	INVALC,INVALC,0x5040,INVALC,INVALC,INVALC,0x4A28,INVALC,
-	INVALC,INVALC,INVALC,0x5722,0x5721,INVALC,0x5C69,0x654B,
-	0x6874,0x6875,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x215C,INVALC,INVALC,INVALC,INVALC,INVALC,0x2242,
-	0x2378,0x2377,0x2376,INVALC,0x2241,0x2240,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2659,INVALC,
-	INVALC,0x237D,INVALC,0x2421,0x237E,0x265A,INVALC,INVALC,
-	0x237A,INVALC,INVALC,INVALC,INVALC,0x2379,0x237B,0x2423,
-	INVALC,INVALC,INVALC,0x237C,0x2427,INVALC,INVALC,0x2424,
-	INVALC,INVALC,0x2422,0x2425,INVALC,INVALC,INVALC,INVALC,
-	/* Block 97, Array index 0x1300 */
-	0x2426,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x266E,0x2661,0x265F,0x266D,0x2668,INVALC,INVALC,
-	0x2669,0x266C,INVALC,0x266B,INVALC,INVALC,INVALC,0x2662,
-	INVALC,0x265D,0x2664,INVALC,0x266F,INVALC,0x2665,INVALC,
-	INVALC,INVALC,0x2667,INVALC,0x2A4E,INVALC,0x265C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2666,0x265B,0x266A,INVALC,
-	INVALC,INVALC,0x265E,0x2663,0x2660,INVALC,INVALC,0x2A40,
-	INVALC,0x2A41,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2A4B,0x2F23,0x2A4C,INVALC,0x2A4F,0x2A45,INVALC,0x2A47,
-	INVALC,0x2A48,INVALC,INVALC,0x2A4A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2A46,0x2A42,INVALC,INVALC,INVALC,
-	0x2A50,INVALC,0x2F21,0x2A49,INVALC,0x2E7E,0x2A44,0x2A4D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2A51,0x2F22,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2A52,INVALC,
-	INVALC,INVALC,0x2A43,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2F26,0x2F28,INVALC,0x2F2A,INVALC,INVALC,0x3537,0x2F2E,
-	0x2F25,INVALC,0x3535,INVALC,INVALC,INVALC,0x2F30,INVALC,
-	0x3536,INVALC,0x2F27,INVALC,INVALC,0x2F2B,INVALC,0x2F2D,
-	INVALC,INVALC,INVALC,0x2F2C,0x2F2F,0x2F29,INVALC,INVALC,
-	INVALC,INVALC,0x2F24,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3539,0x3542,INVALC,INVALC,INVALC,INVALC,INVALC,0x3544,
-	INVALC,0x3B5D,0x353A,INVALC,INVALC,INVALC,0x3538,0x3546,
-	0x3549,0x3B6C,INVALC,0x3547,0x3B61,INVALC,INVALC,INVALC,
-	0x3541,0x3B5C,0x3545,INVALC,0x3B5E,0x3548,0x3B60,0x353D,
-	INVALC,INVALC,INVALC,0x353B,0x353C,INVALC,INVALC,INVALC,
-	INVALC,0x353F,INVALC,0x3543,INVALC,0x3540,INVALC,INVALC,
-	INVALC,INVALC,0x3B5F,INVALC,0x353E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3B63,INVALC,INVALC,0x3B67,INVALC,0x426B,
-	0x3B69,INVALC,INVALC,INVALC,0x3B6A,INVALC,0x3B6B,0x3B71,
-	/* Block 98, Array index 0x1400 */
-	INVALC,INVALC,INVALC,0x3B6D,0x3B72,0x3B66,INVALC,INVALC,
-	INVALC,INVALC,0x3B64,0x3B73,INVALC,INVALC,INVALC,INVALC,
-	0x3B70,INVALC,INVALC,0x3B68,0x3B62,INVALC,0x3B65,INVALC,
-	0x3B6E,INVALC,INVALC,INVALC,INVALC,0x3B6F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A2A,0x4276,INVALC,0x426E,0x4A29,INVALC,0x4272,0x4274,
-	INVALC,INVALC,0x4271,INVALC,INVALC,INVALC,0x4270,INVALC,
-	INVALC,INVALC,INVALC,0x4A39,INVALC,INVALC,INVALC,INVALC,
-	0x4277,0x4A2B,INVALC,INVALC,INVALC,0x426F,0x4273,INVALC,
-	INVALC,0x426C,0x426D,INVALC,INVALC,INVALC,INVALC,0x4275,
-	INVALC,INVALC,0x4A2F,0x4A30,0x4A35,INVALC,0x4A3C,INVALC,
-	INVALC,INVALC,INVALC,0x4A37,INVALC,INVALC,0x4A2C,INVALC,
-	INVALC,0x4A3B,INVALC,INVALC,INVALC,0x4A38,0x5051,INVALC,
-	INVALC,INVALC,0x4A3A,INVALC,0x4A32,INVALC,INVALC,INVALC,
-	INVALC,0x4A2D,0x4A31,0x4A2E,0x4A34,INVALC,INVALC,INVALC,
-	INVALC,0x5043,0x4A36,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A33,INVALC,INVALC,0x5042,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5047,INVALC,0x5041,0x572E,0x5050,INVALC,INVALC,
-	INVALC,INVALC,0x504D,0x5049,INVALC,INVALC,0x5725,INVALC,
-	INVALC,INVALC,INVALC,0x5048,INVALC,0x5723,INVALC,0x504C,
-	INVALC,0x504F,0x5046,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5724,INVALC,0x504E,INVALC,INVALC,0x504B,INVALC,0x504A,
-	0x5045,0x5044,INVALC,0x5052,0x5727,0x5C6B,INVALC,INVALC,
-	0x572D,INVALC,0x572B,INVALC,0x5C6C,INVALC,INVALC,0x572C,
-	INVALC,0x5729,INVALC,0x5C6A,INVALC,0x5726,0x5728,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x572A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x615B,INVALC,
-	0x6153,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C72,0x6154,
-	0x5C6E,INVALC,INVALC,INVALC,0x5C70,0x5C6F,INVALC,0x5C6D,
-	0x5C71,0x615C,0x6158,0x615A,INVALC,0x6155,0x6156,INVALC,
-	0x6159,0x6157,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6876,INVALC,0x654C,INVALC,0x6B5A,INVALC,INVALC,
-	/* Block 99, Array index 0x1500 */
-	INVALC,0x6F28,INVALC,0x6F29,0x6F2A,INVALC,INVALC,0x722A,
-	INVALC,0x215D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2670,INVALC,INVALC,INVALC,
-	INVALC,0x2F31,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4278,INVALC,INVALC,0x427A,0x427C,0x427B,INVALC,0x4A3E,
-	INVALC,0x4A3D,INVALC,0x4A3F,INVALC,0x5053,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2428,INVALC,INVALC,0x2671,INVALC,INVALC,
-	INVALC,INVALC,0x2A53,0x2A54,INVALC,INVALC,0x2F32,INVALC,
-	INVALC,INVALC,0x3B74,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x215E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2249,0x224B,INVALC,0x2243,INVALC,0x2244,INVALC,
-	0x224A,0x2246,0x2248,INVALC,0x2245,0x224C,0x2247,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2432,0x242F,0x2437,INVALC,0x2438,INVALC,INVALC,0x2435,
-	INVALC,INVALC,0x2431,0x2430,INVALC,0x2436,INVALC,INVALC,
-	INVALC,0x2433,INVALC,0x2429,INVALC,INVALC,INVALC,0x242E,
-	0x2434,INVALC,INVALC,INVALC,0x242A,INVALC,0x242B,0x242C,
-	INVALC,INVALC,INVALC,INVALC,0x242D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x267D,0x2676,INVALC,INVALC,0x2672,0x2679,0x267B,
-	0x267E,INVALC,INVALC,0x267A,0x2673,INVALC,0x2677,INVALC,
-	0x2721,INVALC,INVALC,0x267C,INVALC,INVALC,0x2675,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2678,INVALC,INVALC,INVALC,INVALC,0x2A55,
-	INVALC,0x2674,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2A5B,INVALC,INVALC,INVALC,INVALC,
-	0x2A67,INVALC,0x2F33,INVALC,INVALC,0x2A58,0x2A60,INVALC,
-	0x2A5F,0x2A5C,0x2A64,0x2A66,INVALC,INVALC,INVALC,INVALC,
-	/* Block 100, Array index 0x1600 */
-	0x2A61,INVALC,INVALC,0x2A5A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2A57,0x2A5E,0x2A56,0x2A59,0x2A5D,
-	0x2F34,INVALC,INVALC,0x2A62,0x2A63,0x2A65,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2F40,INVALC,INVALC,0x2F36,0x2F46,INVALC,INVALC,
-	INVALC,INVALC,0x354A,0x2F48,0x2F42,INVALC,0x2F39,INVALC,
-	0x2F4B,0x2F3C,INVALC,0x3561,0x2F3F,INVALC,INVALC,INVALC,
-	0x2F4D,0x2F41,INVALC,0x2F3A,0x2F37,0x2F38,INVALC,0x2F47,
-	0x2F4E,INVALC,0x2F3E,0x2F3D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2F4A,INVALC,INVALC,0x2F44,INVALC,0x2F35,0x2F4C,
-	0x2F43,0x2F45,0x2F49,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x354B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x355D,0x3559,0x3556,
-	0x3568,INVALC,INVALC,INVALC,INVALC,0x355B,INVALC,INVALC,
-	0x3563,INVALC,INVALC,INVALC,0x355F,0x354E,INVALC,INVALC,
-	INVALC,0x3565,0x354D,INVALC,INVALC,0x3564,INVALC,0x3557,
-	INVALC,INVALC,0x354C,INVALC,INVALC,0x3567,0x3555,INVALC,
-	0x3558,0x3566,INVALC,INVALC,0x3B75,INVALC,INVALC,0x3553,
-	INVALC,INVALC,INVALC,INVALC,0x355C,0x3552,0x3550,0x3562,
-	INVALC,INVALC,INVALC,INVALC,0x3560,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3554,INVALC,0x3551,0x355E,0x355A,
-	0x3B77,0x3B76,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x354F,0x3C29,INVALC,
-	INVALC,INVALC,0x3C2F,0x3B7C,0x3C2C,0x427D,INVALC,0x3C30,
-	0x3C33,INVALC,0x3C21,0x3C32,0x3C31,INVALC,0x3B78,INVALC,
-	INVALC,INVALC,INVALC,0x3C2E,INVALC,0x3C24,INVALC,0x3C35,
-	0x3C2D,0x3C36,INVALC,INVALC,0x3C2B,0x3C2A,INVALC,0x3C28,
-	0x3C22,INVALC,INVALC,INVALC,0x2F3B,0x3B79,INVALC,0x433D,
-	0x3B7A,INVALC,INVALC,0x4321,INVALC,INVALC,INVALC,0x3B7B,
-	0x3C34,0x427E,0x3C25,0x3B7E,INVALC,0x3C26,0x3C23,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 101, Array index 0x1700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4324,0x4337,0x433C,0x4330,INVALC,0x4341,INVALC,
-	0x4322,INVALC,0x4323,INVALC,INVALC,0x432A,INVALC,INVALC,
-	0x432B,INVALC,0x4338,0x433E,INVALC,INVALC,INVALC,0x4329,
-	0x4325,0x4340,0x432E,0x432F,0x4326,0x433A,0x4331,0x433B,
-	0x4333,INVALC,INVALC,0x4A40,INVALC,INVALC,0x433F,0x4336,
-	0x4332,INVALC,INVALC,0x4327,INVALC,0x4335,INVALC,0x432D,
-	INVALC,0x432C,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A55,
-	0x4339,0x4334,INVALC,0x4328,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A50,INVALC,0x4A41,0x4A4C,INVALC,
-	0x4A53,INVALC,INVALC,0x4A51,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A58,INVALC,0x4A42,0x4A4F,0x4A43,0x4A4E,INVALC,
-	0x4A52,0x3C27,INVALC,INVALC,INVALC,0x4A59,0x4A4A,INVALC,
-	0x5061,INVALC,INVALC,0x4A57,0x4A56,INVALC,0x5054,INVALC,
-	0x5055,INVALC,0x4A46,0x4A47,0x4A44,0x4A49,0x4A45,0x4A5A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4A48,INVALC,0x4A54,
-	INVALC,INVALC,0x4A4D,INVALC,INVALC,0x5058,INVALC,INVALC,
-	INVALC,0x5735,0x505D,0x505C,0x505E,INVALC,INVALC,0x505B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5056,0x5059,
-	0x5063,INVALC,INVALC,INVALC,0x505A,0x3B7D,INVALC,0x5060,
-	0x5057,INVALC,INVALC,0x505F,INVALC,INVALC,0x4A4B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5062,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5734,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5736,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5733,INVALC,INVALC,INVALC,INVALC,INVALC,0x5732,
-	0x5731,INVALC,INVALC,INVALC,INVALC,INVALC,0x5730,0x572F,
-	INVALC,0x5739,INVALC,0x5737,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C75,0x5C77,INVALC,INVALC,INVALC,
-	0x5C78,0x5C74,INVALC,0x5C76,INVALC,INVALC,INVALC,0x5C73,
-	INVALC,INVALC,INVALC,0x5738,INVALC,INVALC,INVALC,INVALC,
-	0x6160,INVALC,INVALC,INVALC,0x6163,0x615F,INVALC,0x615D,
-	/* Block 102, Array index 0x1800 */
-	INVALC,0x6161,INVALC,0x6162,0x615E,INVALC,INVALC,0x654D,
-	INVALC,0x6550,INVALC,INVALC,0x6551,0x654F,0x6552,INVALC,
-	0x654E,INVALC,INVALC,0x687A,INVALC,0x6879,0x6878,0x6877,
-	INVALC,INVALC,INVALC,0x6B5B,INVALC,INVALC,INVALC,INVALC,
-	0x6D4F,0x6D4E,0x6D51,INVALC,INVALC,0x6F2C,0x6D50,INVALC,
-	INVALC,0x6F2B,INVALC,INVALC,INVALC,0x7037,0x707D,INVALC,
-	INVALC,INVALC,0x3C37,0x573A,INVALC,INVALC,INVALC,0x224D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2722,INVALC,INVALC,
-	INVALC,0x2A68,INVALC,0x2A69,INVALC,INVALC,0x2F50,INVALC,
-	INVALC,INVALC,0x2F4F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3569,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C3B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C3A,0x3C3D,INVALC,0x3C38,
-	0x3C3C,INVALC,0x3C39,INVALC,INVALC,INVALC,INVALC,0x4342,
-	INVALC,INVALC,INVALC,0x4A5B,INVALC,INVALC,0x5064,INVALC,
-	INVALC,0x5066,0x5065,0x5067,0x573C,INVALC,INVALC,0x573B,
-	0x5C7A,0x5C79,INVALC,INVALC,0x6553,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C3E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4343,INVALC,0x6164,INVALC,0x6F2D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3C3F,0x3C40,INVALC,
-	0x4A5C,INVALC,0x573D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2723,INVALC,0x2A6A,INVALC,INVALC,INVALC,0x3C41,INVALC,
-	INVALC,INVALC,0x5068,0x5069,INVALC,INVALC,0x5C7B,INVALC,
-	0x707E,INVALC,INVALC,0x2724,INVALC,INVALC,INVALC,0x2A6B,
-	INVALC,INVALC,0x2F54,0x2F52,0x2F53,INVALC,0x2F51,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x356A,INVALC,INVALC,
-	0x3C42,INVALC,0x3C43,0x4344,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C7C,0x6165,INVALC,0x6555,0x6554,0x687B,
-	INVALC,0x213E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x224F,0x224E,
-	0x2439,INVALC,0x243C,0x243B,0x243A,0x243D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x272A,0x2726,0x272F,INVALC,INVALC,
-	/* Block 103, Array index 0x1900 */
-	INVALC,INVALC,INVALC,0x272B,0x2727,0x272E,INVALC,INVALC,
-	0x2729,0x2725,INVALC,0x272C,INVALC,0x272D,INVALC,INVALC,
-	0x2731,0x2730,0x2728,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2A70,0x2A76,INVALC,INVALC,
-	INVALC,0x2A6D,0x2A72,INVALC,INVALC,INVALC,0x2A71,INVALC,
-	INVALC,INVALC,INVALC,0x2A74,INVALC,INVALC,0x2A79,INVALC,
-	INVALC,INVALC,0x2A6E,0x2A73,0x2A77,0x2A6F,0x2A6C,INVALC,
-	INVALC,0x2A78,0x2A75,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2F57,
-	INVALC,INVALC,0x2F55,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2F58,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x356E,INVALC,0x356D,0x356F,INVALC,INVALC,0x2F56,
-	INVALC,0x356C,0x3570,INVALC,INVALC,0x356B,INVALC,INVALC,
-	INVALC,INVALC,0x3C4A,INVALC,0x3C45,INVALC,INVALC,INVALC,
-	INVALC,0x3C48,0x3C4B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x434D,0x3C49,INVALC,0x3C46,0x3C44,INVALC,INVALC,INVALC,
-	0x3C47,INVALC,INVALC,INVALC,INVALC,INVALC,0x4345,INVALC,
-	INVALC,INVALC,0x434A,0x4349,0x4346,INVALC,INVALC,INVALC,
-	0x4348,INVALC,INVALC,INVALC,0x434C,0x4347,INVALC,INVALC,
-	INVALC,0x434B,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A5F,
-	0x4A5E,0x4A5D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x506C,0x506F,INVALC,INVALC,INVALC,INVALC,0x5070,
-	0x506B,INVALC,0x506D,INVALC,INVALC,0x506A,INVALC,0x506E,
-	INVALC,INVALC,0x5746,0x5745,INVALC,0x5744,0x573F,INVALC,
-	0x5740,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x573E,INVALC,0x5741,0x5742,0x5747,INVALC,INVALC,0x5743,
-	INVALC,INVALC,0x5C7D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6168,INVALC,0x6166,0x6167,INVALC,INVALC,0x6556,INVALC,
-	INVALC,INVALC,INVALC,0x687D,0x687E,INVALC,INVALC,INVALC,
-	0x687C,INVALC,INVALC,0x6F2E,INVALC,0x7038,0x7039,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2732,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 104, Array index 0x1A00 */
-	INVALC,0x3C4C,INVALC,INVALC,0x4A61,0x4A60,INVALC,INVALC,
-	INVALC,INVALC,0x2733,INVALC,INVALC,INVALC,INVALC,0x2A7A,
-	0x2A7B,INVALC,0x2F59,0x2F5A,INVALC,INVALC,INVALC,INVALC,
-	0x3571,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x434E,0x4641,0x4A62,0x5748,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2257,INVALC,INVALC,INVALC,INVALC,
-	0x2252,0x2251,0x2254,0x2253,0x2256,INVALC,0x2250,0x2255,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x243E,INVALC,0x243F,
-	0x2443,INVALC,INVALC,0x2447,0x2442,0x2445,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2441,INVALC,INVALC,
-	INVALC,0x2440,0x2446,INVALC,INVALC,0x2444,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2735,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x273D,INVALC,0x2738,INVALC,
-	0x2747,0x2748,0x2740,0x2739,INVALC,0x2745,INVALC,INVALC,
-	INVALC,0x2746,INVALC,0x2744,0x273C,0x2734,0x273B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x273F,0x273E,0x2736,INVALC,
-	INVALC,0x2742,0x2737,INVALC,0x2749,INVALC,INVALC,INVALC,
-	0x273A,0x2743,INVALC,INVALC,INVALC,INVALC,INVALC,0x2741,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2B3D,INVALC,
-	INVALC,INVALC,0x2B38,0x2B2E,INVALC,0x2B2C,INVALC,0x2B27,
-	INVALC,0x2B34,0x2B21,0x2B23,INVALC,INVALC,INVALC,INVALC,
-	0x2B26,0x2A7C,0x2B33,0x2B43,INVALC,0x2B28,0x2B3A,INVALC,
-	0x2A7E,0x2B41,0x2B42,0x2B45,0x2B3C,0x2B2D,0x2B35,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2B25,INVALC,INVALC,0x2B3F,0x2B22,INVALC,INVALC,0x2B2B,
-	INVALC,INVALC,INVALC,0x2B32,0x2B2A,INVALC,0x2B3E,0x2B36,
-	INVALC,INVALC,0x2B44,0x2B29,INVALC,0x2B3B,0x2B31,INVALC,
-	0x2B37,INVALC,0x2A7D,INVALC,INVALC,INVALC,0x2B30,0x2B2F,
-	0x2B24,INVALC,0x2B40,INVALC,0x2B39,INVALC,INVALC,INVALC,
-	/* Block 105, Array index 0x1B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2F6E,INVALC,0x2F6F,INVALC,0x2F63,INVALC,
-	INVALC,INVALC,0x2F5C,INVALC,0x2F65,0x2F6D,INVALC,0x2F5B,
-	0x2F76,INVALC,INVALC,INVALC,INVALC,0x2F75,0x2F70,INVALC,
-	0x2F71,INVALC,INVALC,0x2F67,INVALC,0x2F68,0x2F72,0x2F69,
-	INVALC,0x2F64,0x2F5E,0x2F5F,0x2F6C,0x2F66,INVALC,INVALC,
-	INVALC,INVALC,0x2F74,0x2F60,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2F6B,INVALC,INVALC,INVALC,
-	INVALC,0x2F5D,INVALC,0x2F61,INVALC,0x2F73,0x2F6A,0x2F62,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3628,INVALC,0x3576,0x3577,0x357B,
-	INVALC,0x362C,0x3629,INVALC,0x3622,0x3621,INVALC,0x3625,
-	0x3634,0x3572,INVALC,0x3635,0x3627,0x3639,0x362D,INVALC,
-	0x362B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3573,
-	INVALC,0x3632,0x3638,0x3630,0x3637,INVALC,INVALC,0x3624,
-	0x3574,0x3636,0x3626,INVALC,INVALC,INVALC,0x362F,INVALC,
-	INVALC,INVALC,INVALC,0x362E,0x3575,INVALC,INVALC,INVALC,
-	0x3631,INVALC,INVALC,0x357C,0x3633,INVALC,INVALC,INVALC,
-	INVALC,0x357E,0x362A,0x3579,0x357D,INVALC,0x3578,INVALC,
-	INVALC,INVALC,0x3623,INVALC,0x3C63,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C66,0x3C7C,
-	0x3C71,INVALC,INVALC,INVALC,0x3C60,INVALC,0x3C70,INVALC,
-	0x3C69,0x3C76,INVALC,0x3C4E,0x3C78,INVALC,0x3C56,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C50,0x3C72,0x3C73,INVALC,
-	INVALC,0x3C5E,INVALC,INVALC,0x3C59,INVALC,0x3C74,INVALC,
-	0x3C6C,0x3C79,0x3C53,0x3C58,0x3C52,INVALC,INVALC,0x3C65,
-	0x4364,0x3C54,INVALC,0x3C5D,0x3C75,INVALC,0x3C5A,0x3C57,
-	0x3C68,INVALC,INVALC,INVALC,0x3C6B,0x3C6A,INVALC,INVALC,
-	/* Block 106, Array index 0x1C00 */
-	INVALC,INVALC,INVALC,INVALC,0x3C4F,INVALC,0x3C77,0x3C5F,
-	0x3C61,INVALC,0x3C6E,0x3C6D,0x3C4D,INVALC,INVALC,0x3C55,
-	0x3C5C,0x3C64,INVALC,0x3C5B,0x3C67,0x3C7A,INVALC,0x3C6F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3C7B,INVALC,INVALC,
-	INVALC,INVALC,0x3C51,INVALC,INVALC,INVALC,INVALC,0x4378,
-	INVALC,INVALC,0x4376,0x4361,0x4366,0x435F,INVALC,0x4372,
-	0x4351,0x4358,INVALC,0x4370,0x437A,0x4362,INVALC,0x4355,
-	0x4368,0x436D,0x4359,INVALC,0x436A,0x4356,INVALC,INVALC,
-	0x435D,0x435E,INVALC,0x4371,0x436F,INVALC,0x4352,0x4374,
-	INVALC,0x4375,0x4377,INVALC,INVALC,INVALC,0x357A,0x435A,
-	0x436C,0x435B,INVALC,INVALC,0x4373,INVALC,INVALC,0x4350,
-	INVALC,INVALC,0x4353,INVALC,INVALC,0x4363,0x434F,INVALC,
-	INVALC,0x4367,0x4357,INVALC,0x4360,INVALC,INVALC,0x4369,
-	0x3C62,0x4354,INVALC,INVALC,0x436E,INVALC,0x436B,INVALC,
-	0x4365,INVALC,0x435C,0x4379,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x452C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4A70,0x4A6E,INVALC,
-	0x4B26,0x4A6C,INVALC,0x4A7E,INVALC,INVALC,0x4A68,0x4B25,
-	INVALC,0x4A6D,0x4A7B,INVALC,INVALC,INVALC,0x4B23,INVALC,
-	0x4A66,0x4B22,INVALC,INVALC,0x4A77,0x4B29,INVALC,0x4A6F,
-	INVALC,0x4A71,0x4B21,INVALC,0x4A6A,INVALC,INVALC,0x4A73,
-	0x4A69,0x4A63,INVALC,0x4A7D,INVALC,0x4B28,0x4A64,INVALC,
-	INVALC,0x4A79,INVALC,INVALC,0x4A6B,0x4A76,0x4A72,0x4A74,
-	INVALC,INVALC,0x4B27,INVALC,0x4A75,INVALC,0x4B2A,INVALC,
-	INVALC,0x4A65,0x4A7A,INVALC,INVALC,INVALC,0x4A67,0x4A7C,
-	INVALC,INVALC,INVALC,INVALC,0x4A78,INVALC,INVALC,INVALC,
-	INVALC,0x4B24,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x507C,INVALC,0x5078,0x5074,0x512A,0x5127,
-	INVALC,INVALC,INVALC,0x512E,0x507B,INVALC,0x5124,INVALC,
-	INVALC,0x5077,0x5123,INVALC,0x5137,INVALC,0x5134,0x5126,
-	0x5075,INVALC,INVALC,0x512B,0x512D,INVALC,0x5121,0x507A,
-	/* Block 107, Array index 0x1D00 */
-	0x5071,INVALC,INVALC,INVALC,0x5130,INVALC,0x5072,0x5136,
-	0x5129,0x512F,INVALC,INVALC,INVALC,0x512C,INVALC,0x5133,
-	INVALC,INVALC,INVALC,INVALC,0x5125,0x5076,0x5138,0x5073,
-	0x5131,INVALC,INVALC,0x507D,INVALC,0x507E,INVALC,INVALC,
-	0x5079,INVALC,INVALC,INVALC,INVALC,0x5132,0x5135,0x5122,
-	0x5755,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x574D,INVALC,0x5749,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5757,0x5762,INVALC,0x574F,0x5758,
-	0x5128,0x5759,INVALC,INVALC,INVALC,INVALC,0x5768,INVALC,
-	INVALC,0x574B,INVALC,INVALC,INVALC,0x5766,0x5767,0x575D,
-	0x575C,0x5754,INVALC,INVALC,0x575E,0x5765,0x5764,INVALC,
-	INVALC,INVALC,0x5756,0x5753,INVALC,0x5750,0x5763,INVALC,
-	0x5761,INVALC,INVALC,INVALC,0x575B,INVALC,0x574A,0x574C,
-	0x574E,0x5760,0x575A,INVALC,INVALC,0x5751,INVALC,0x575F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5752,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D31,
-	INVALC,0x5D22,INVALC,0x5D2D,INVALC,0x5D34,INVALC,0x5D29,
-	INVALC,0x5D24,INVALC,INVALC,0x5D35,0x5C7E,0x5D2B,INVALC,
-	INVALC,0x5D30,0x5D36,0x5D2A,INVALC,0x5D2C,0x5D21,INVALC,
-	INVALC,INVALC,0x5D33,0x5D26,INVALC,INVALC,0x5D28,0x5D25,
-	INVALC,0x5D27,INVALC,INVALC,0x5D2F,0x5D23,0x5D32,INVALC,
-	0x5D2E,INVALC,INVALC,INVALC,INVALC,0x6173,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6172,INVALC,0x616F,0x6170,
-	INVALC,0x616A,0x616E,INVALC,INVALC,0x616B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6169,0x616D,0x6171,
-	INVALC,INVALC,INVALC,0x655C,0x6559,0x6562,INVALC,0x6561,
-	0x655F,0x655A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x655B,INVALC,INVALC,0x655E,INVALC,0x6563,0x655D,
-	0x6558,0x616C,INVALC,INVALC,INVALC,INVALC,INVALC,0x6557,
-	0x6924,INVALC,0x6923,0x6560,INVALC,INVALC,0x6927,0x6928,
-	0x6922,0x6926,INVALC,0x6921,INVALC,INVALC,INVALC,INVALC,
-	0x6B5F,0x6925,INVALC,INVALC,0x6B5D,INVALC,INVALC,INVALC,
-	/* Block 108, Array index 0x1E00 */
-	0x6B60,INVALC,0x6B5C,0x6B5E,INVALC,INVALC,INVALC,INVALC,
-	0x6D53,0x6D54,INVALC,0x6D52,INVALC,INVALC,INVALC,0x6F31,
-	INVALC,0x6F2F,0x6F30,0x703A,INVALC,INVALC,INVALC,0x7123,
-	0x7121,0x7122,0x7124,INVALC,INVALC,INVALC,0x722B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x274A,INVALC,INVALC,
-	0x2B46,INVALC,INVALC,INVALC,0x2F77,0x2F79,INVALC,0x2F78,
-	INVALC,0x2F7A,INVALC,0x363B,0x2F7B,INVALC,0x363A,0x363C,
-	0x363D,0x3C7D,INVALC,0x3C7E,0x3D22,INVALC,INVALC,0x3D21,
-	INVALC,0x4422,0x437E,0x437D,INVALC,0x437C,0x437B,INVALC,
-	0x4421,INVALC,0x4B2B,0x4B2D,INVALC,0x4B2C,INVALC,INVALC,
-	INVALC,0x5139,INVALC,INVALC,0x576A,0x5769,0x576B,INVALC,
-	INVALC,INVALC,INVALC,0x5D37,INVALC,INVALC,0x6174,INVALC,
-	0x6564,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2F7C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5259,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x274C,INVALC,
-	0x274B,INVALC,0x2B47,INVALC,0x2B48,INVALC,INVALC,INVALC,
-	0x2F7E,INVALC,INVALC,INVALC,0x3642,0x3640,0x3641,0x363F,
-	INVALC,0x363E,INVALC,INVALC,0x3D23,0x3D26,INVALC,0x3D24,
-	INVALC,0x3D25,INVALC,0x4423,INVALC,INVALC,0x4B2E,0x4B2F,
-	0x4B30,INVALC,0x513C,0x513B,INVALC,0x513A,0x513D,0x576C,
-	INVALC,INVALC,0x576D,0x576E,INVALC,0x5D38,INVALC,INVALC,
-	0x6565,INVALC,INVALC,0x213F,INVALC,INVALC,0x2B49,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3D27,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4B31,0x4B32,INVALC,INVALC,0x5770,
-	0x576F,0x6175,0x6F32,INVALC,0x2140,INVALC,INVALC,INVALC,
-	0x2448,INVALC,INVALC,INVALC,INVALC,INVALC,0x2B4A,INVALC,
-	0x2B4B,INVALC,INVALC,INVALC,INVALC,INVALC,0x274D,INVALC,
-	0x2B4C,INVALC,0x3025,0x3024,0x3022,INVALC,0x3021,0x3026,
-	0x3023,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D28,INVALC,0x3D29,0x3D2A,INVALC,INVALC,INVALC,0x4427,
-	0x4428,0x4426,INVALC,0x4424,0x4425,INVALC,0x4B33,0x5140,
-	/* Block 109, Array index 0x1F00 */
-	0x513F,0x513E,0x5141,0x5772,0x5771,INVALC,0x5773,INVALC,
-	INVALC,0x5D39,INVALC,0x6176,0x6566,0x6D55,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2141,0x215F,INVALC,INVALC,
-	0x2258,0x2449,0x244A,INVALC,INVALC,0x274E,INVALC,INVALC,
-	0x2B4D,0x2B4E,INVALC,INVALC,INVALC,0x3027,INVALC,INVALC,
-	INVALC,INVALC,0x3643,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D2B,INVALC,INVALC,INVALC,INVALC,INVALC,0x2160,INVALC,
-	INVALC,INVALC,INVALC,0x2163,INVALC,INVALC,INVALC,0x2162,
-	INVALC,INVALC,INVALC,0x2161,INVALC,INVALC,0x2259,INVALC,
-	INVALC,INVALC,0x225D,0x225F,0x2260,INVALC,INVALC,0x225C,
-	INVALC,INVALC,0x225A,INVALC,0x225E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x225B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x245B,0x2459,0x244C,
-	INVALC,0x2453,INVALC,0x244D,INVALC,0x2455,INVALC,0x2452,
-	INVALC,0x2451,INVALC,0x245A,INVALC,INVALC,INVALC,INVALC,
-	0x244B,INVALC,INVALC,0x245C,INVALC,INVALC,INVALC,INVALC,
-	0x2765,INVALC,INVALC,INVALC,0x244E,INVALC,INVALC,0x2456,
-	INVALC,INVALC,0x2763,0x244F,INVALC,INVALC,0x245D,0x2450,
-	INVALC,INVALC,INVALC,0x274F,INVALC,0x2457,INVALC,INVALC,
-	INVALC,INVALC,0x2454,INVALC,0x2458,0x2764,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2756,INVALC,INVALC,
-	0x276B,INVALC,INVALC,INVALC,0x2762,INVALC,0x2754,0x2758,
-	INVALC,INVALC,0x275B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2767,INVALC,0x275A,0x275C,INVALC,INVALC,0x275D,0x276A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2769,INVALC,0x276D,
-	0x2759,0x276F,0x2760,INVALC,0x2755,INVALC,INVALC,INVALC,
-	INVALC,0x2753,0x2B57,INVALC,INVALC,0x2761,0x2766,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2757,
-	INVALC,0x276E,INVALC,0x2751,0x2750,0x275E,0x2752,INVALC,
-	INVALC,INVALC,0x275F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x276C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 110, Array index 0x2000 */
-	0x2B5E,0x2B61,INVALC,0x2B64,0x2B59,INVALC,INVALC,0x2B67,
-	0x2B6A,0x2B6C,0x2B56,INVALC,INVALC,0x302C,INVALC,0x2B65,
-	0x2B6D,0x2B5D,0x2B55,INVALC,INVALC,INVALC,0x3047,INVALC,
-	0x2B62,0x2B5A,0x2B5C,INVALC,INVALC,0x2B5F,INVALC,0x2B52,
-	0x2B68,INVALC,0x2B6B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2B4F,INVALC,INVALC,INVALC,0x2B69,0x2B51,INVALC,0x3041,
-	0x2768,INVALC,INVALC,0x2B58,0x2B50,INVALC,INVALC,0x2B63,
-	INVALC,INVALC,0x2B5B,INVALC,0x2B53,INVALC,INVALC,0x2B54,
-	0x2B66,INVALC,0x2B60,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x302F,INVALC,INVALC,INVALC,INVALC,INVALC,0x3038,0x303E,
-	0x303A,0x302D,0x3030,0x3029,0x302A,INVALC,INVALC,0x3039,
-	0x3042,INVALC,INVALC,INVALC,INVALC,0x3031,INVALC,0x3032,
-	0x303C,INVALC,INVALC,INVALC,INVALC,0x304B,0x302B,INVALC,
-	INVALC,INVALC,0x3028,0x3049,0x303D,0x304A,0x3044,0x3036,
-	0x3045,INVALC,0x303F,0x3048,0x3046,INVALC,0x3037,INVALC,
-	INVALC,INVALC,INVALC,0x3043,INVALC,0x3034,INVALC,INVALC,
-	0x304C,0x3033,0x302E,INVALC,INVALC,INVALC,INVALC,0x303B,
-	0x3040,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3645,0x3649,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3647,0x3646,INVALC,INVALC,0x364C,
-	INVALC,INVALC,0x365E,0x366A,INVALC,0x365B,0x3654,INVALC,
-	0x3644,INVALC,0x3660,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3650,0x3662,0x365A,INVALC,INVALC,0x3668,INVALC,0x3661,
-	0x3663,INVALC,INVALC,0x3665,0x364E,0x365F,0x3653,0x3667,
-	INVALC,INVALC,INVALC,0x3658,0x3656,0x3657,INVALC,0x3652,
-	0x3651,INVALC,0x364B,0x3669,INVALC,0x3655,INVALC,INVALC,
-	INVALC,0x364A,INVALC,INVALC,INVALC,0x365C,INVALC,0x3035,
-	0x365D,INVALC,0x3664,INVALC,0x3659,INVALC,0x364D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D2C,0x3666,INVALC,INVALC,
-	/* Block 111, Array index 0x2100 */
-	0x364F,INVALC,INVALC,0x3D41,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D3B,INVALC,INVALC,0x3D2F,
-	INVALC,INVALC,0x3D4D,INVALC,INVALC,INVALC,INVALC,0x3D51,
-	0x3D48,INVALC,INVALC,0x3D36,INVALC,INVALC,0x3D42,INVALC,
-	0x3D4E,0x3D47,INVALC,0x3D3C,INVALC,0x3D59,0x3D5A,INVALC,
-	INVALC,0x3D4C,INVALC,0x3D40,0x3D32,0x3D33,INVALC,0x3D37,
-	0x3D3E,0x3D38,INVALC,INVALC,INVALC,0x3D34,0x3D2D,0x3D2E,
-	INVALC,0x3D30,INVALC,0x3D3D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3D3F,0x3D57,0x3D4F,INVALC,0x3D55,INVALC,INVALC,
-	INVALC,INVALC,0x3D5B,INVALC,0x3D45,0x3D39,0x3D43,INVALC,
-	0x3D49,0x3D46,0x3D35,INVALC,0x3D53,0x3D50,0x3D58,INVALC,
-	0x3D44,INVALC,INVALC,0x3D4B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3D4A,INVALC,0x3D3A,0x3648,INVALC,INVALC,0x3D54,
-	0x3D52,0x3D56,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D31,INVALC,INVALC,INVALC,INVALC,0x4447,0x4446,0x442C,
-	INVALC,INVALC,0x4445,0x442F,0x4430,INVALC,INVALC,0x444E,
-	INVALC,0x4444,INVALC,0x4429,INVALC,INVALC,0x4438,0x442E,
-	0x4431,0x4449,INVALC,0x4450,0x4448,INVALC,0x443D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x444F,INVALC,
-	0x443B,0x4432,0x443F,0x444B,INVALC,INVALC,INVALC,0x443A,
-	INVALC,0x4433,INVALC,INVALC,INVALC,0x4436,0x4440,0x444A,
-	0x442D,0x4437,INVALC,0x4441,INVALC,INVALC,0x4434,INVALC,
-	0x442B,0x4439,0x444D,INVALC,INVALC,0x443C,0x4B34,0x443E,
-	0x444C,INVALC,0x4435,INVALC,INVALC,INVALC,0x442A,INVALC,
-	0x4443,INVALC,INVALC,INVALC,0x4442,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4B50,INVALC,0x4B45,0x4B4A,INVALC,
-	INVALC,0x4B36,INVALC,INVALC,INVALC,0x4B35,0x4B56,INVALC,
-	0x4B39,0x4B49,INVALC,0x4B3B,0x4B59,0x4B55,INVALC,INVALC,
-	/* Block 112, Array index 0x2200 */
-	0x515B,INVALC,INVALC,0x4B37,INVALC,0x4B54,INVALC,0x4B51,
-	0x4B5E,0x4B3D,0x4B46,INVALC,INVALC,0x4B5C,0x4B52,INVALC,
-	INVALC,INVALC,0x4B44,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4B42,0x4B3F,0x4B40,INVALC,0x4B58,INVALC,0x4B5D,0x4B5B,
-	INVALC,0x4B5F,INVALC,INVALC,INVALC,0x4B38,0x5143,0x4B41,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B4B,0x4B3C,INVALC,
-	0x4B4D,INVALC,INVALC,INVALC,INVALC,0x4B4F,0x4B47,0x4B3A,
-	INVALC,0x4B57,0x4B5A,0x4B43,0x4B4E,INVALC,INVALC,INVALC,
-	0x4B4C,0x5142,INVALC,0x4B53,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B3E,0x514C,
-	0x5156,INVALC,0x5155,0x5161,INVALC,0x5153,INVALC,0x5157,
-	INVALC,INVALC,0x514E,INVALC,INVALC,0x515A,0x577B,INVALC,
-	INVALC,0x515C,0x514B,0x5166,INVALC,INVALC,INVALC,0x515F,
-	INVALC,0x5163,0x5168,0x515D,0x5151,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5154,0x4B48,INVALC,INVALC,0x5150,0x5167,
-	INVALC,INVALC,INVALC,0x5169,INVALC,0x515E,0x5144,0x5164,
-	INVALC,INVALC,0x5152,INVALC,INVALC,0x514D,INVALC,0x5145,
-	INVALC,0x5149,INVALC,0x5162,0x514A,0x5148,INVALC,INVALC,
-	0x5160,INVALC,0x5147,0x5159,0x5158,0x5165,0x514F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x577E,INVALC,
-	INVALC,INVALC,0x582C,0x5776,INVALC,0x5824,INVALC,INVALC,
-	0x5822,0x5D3B,0x5828,0x582E,0x5827,0x5774,0x5825,0x5830,
-	0x5832,INVALC,0x5831,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x582B,INVALC,0x5826,INVALC,0x5778,0x577D,INVALC,0x582A,
-	INVALC,INVALC,INVALC,INVALC,0x577C,INVALC,0x5146,0x5777,
-	0x577A,0x582D,0x5821,0x5775,0x5D3A,0x582F,0x5779,0x5829,
-	INVALC,INVALC,INVALC,INVALC,0x5D3D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5D3F,0x5D45,0x5D43,INVALC,
-	INVALC,INVALC,0x5D46,0x5D3E,INVALC,INVALC,0x5D42,0x5D41,
-	0x5D47,INVALC,INVALC,INVALC,INVALC,0x5D40,INVALC,INVALC,
-	INVALC,INVALC,0x5D44,INVALC,0x5D3C,INVALC,INVALC,0x6225,
-	INVALC,INVALC,INVALC,0x6222,0x6224,INVALC,INVALC,0x617E,
-	/* Block 113, Array index 0x2300 */
-	0x6221,0x617A,INVALC,INVALC,0x5823,0x617B,INVALC,0x6177,
-	INVALC,INVALC,0x6226,INVALC,0x6178,0x6179,0x617D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x617C,INVALC,0x656A,0x6570,
-	INVALC,0x6567,INVALC,INVALC,0x6572,INVALC,INVALC,INVALC,
-	0x6569,0x656C,0x656D,0x656E,0x6571,INVALC,0x6223,0x6568,
-	INVALC,0x656F,0x6934,0x656B,INVALC,INVALC,INVALC,0x692B,
-	INVALC,0x692E,INVALC,0x6937,0x692D,0x692A,INVALC,0x692C,
-	0x6930,0x6933,0x6932,0x6936,0x6929,INVALC,INVALC,0x6931,
-	0x6935,0x6938,0x692F,0x6B61,0x6B62,0x6B66,0x6B67,INVALC,
-	0x6B64,0x6B65,0x6B63,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6D59,INVALC,INVALC,0x6D56,0x6D57,0x6D58,
-	INVALC,INVALC,0x6F34,0x6F33,INVALC,0x703D,INVALC,0x703B,
-	0x703E,0x703C,0x7125,INVALC,INVALC,0x7171,0x715B,INVALC,
-	0x7170,0x723E,0x723F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2261,INVALC,INVALC,0x245E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x245F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2778,0x277A,0x2775,0x2772,0x2774,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2776,INVALC,0x2773,0x2770,INVALC,0x2777,INVALC,
-	0x2771,INVALC,0x2779,INVALC,INVALC,INVALC,INVALC,0x2B6F,
-	INVALC,0x2B73,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2B76,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2B72,0x2B71,INVALC,INVALC,0x2B74,0x2B75,INVALC,0x2B6E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2B70,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x305A,0x305B,0x305C,
-	INVALC,INVALC,INVALC,0x3051,INVALC,0x3059,0x305E,INVALC,
-	INVALC,0x304F,0x3055,0x304E,0x3058,INVALC,INVALC,0x3054,
-	INVALC,INVALC,0x305D,INVALC,0x304D,0x3050,0x3056,INVALC,
-	0x3057,0x305F,0x3053,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3671,INVALC,INVALC,0x3673,0x366F,INVALC,0x367B,0x366D,
-	0x367A,INVALC,0x366B,0x3D5F,0x3675,INVALC,INVALC,0x3676,
-	/* Block 114, Array index 0x2400 */
-	0x3679,INVALC,0x367D,INVALC,0x3672,INVALC,0x3677,INVALC,
-	INVALC,INVALC,INVALC,0x367C,0x3670,0x366C,0x367E,INVALC,
-	0x3674,INVALC,INVALC,0x3678,INVALC,INVALC,INVALC,0x366E,
-	INVALC,INVALC,INVALC,0x3D69,INVALC,INVALC,0x3D5D,0x3D66,
-	0x3D5C,INVALC,0x3D64,0x3D62,INVALC,0x3D63,INVALC,INVALC,
-	0x3D67,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D60,0x3D5E,
-	INVALC,0x3D61,0x3D65,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3D68,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4456,0x445D,0x445F,0x4465,INVALC,INVALC,0x4451,
-	INVALC,INVALC,INVALC,0x4460,INVALC,0x4466,INVALC,INVALC,
-	0x4463,INVALC,0x4453,0x4464,0x4452,INVALC,INVALC,INVALC,
-	0x445E,INVALC,0x4467,INVALC,INVALC,0x4457,INVALC,0x4462,
-	0x4455,0x445C,0x4458,0x4454,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x445B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4461,INVALC,0x4459,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x445A,INVALC,INVALC,0x4B67,INVALC,INVALC,INVALC,INVALC,
-	0x4B63,0x4B69,0x4B65,INVALC,INVALC,0x4B64,0x4B68,0x4B60,
-	INVALC,0x4B62,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B66,
-	0x4B61,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B6A,
-	INVALC,INVALC,0x516F,0x516C,0x5178,0x5172,0x5174,INVALC,
-	0x516E,0x5176,INVALC,INVALC,0x5175,0x5173,INVALC,0x5179,
-	INVALC,0x5170,0x5177,INVALC,INVALC,INVALC,INVALC,0x516B,
-	0x516D,INVALC,0x516A,0x517A,INVALC,0x5171,INVALC,INVALC,
-	0x5836,INVALC,INVALC,INVALC,0x5841,0x583F,INVALC,0x5835,
-	0x5838,0x5839,0x5834,INVALC,INVALC,0x5833,0x5842,0x583D,
-	INVALC,INVALC,0x583C,0x583A,INVALC,INVALC,INVALC,0x583E,
-	INVALC,INVALC,INVALC,INVALC,0x583B,INVALC,0x5837,INVALC,
-	0x5840,INVALC,0x5843,0x5844,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D48,0x5D4E,INVALC,0x5D4C,INVALC,INVALC,INVALC,
-	0x5D4A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D4D,0x5D49,0x5D4B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6229,INVALC,INVALC,INVALC,0x622B,INVALC,0x6228,
-	/* Block 115, Array index 0x2500 */
-	INVALC,0x6227,0x6576,0x622A,INVALC,0x6577,INVALC,0x6575,
-	INVALC,INVALC,0x6574,INVALC,0x6573,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6939,0x693A,INVALC,INVALC,INVALC,
-	INVALC,0x6B6A,0x6B69,INVALC,INVALC,0x6B68,0x6D5A,0x6D5B,
-	INVALC,INVALC,0x6F35,0x703F,INVALC,INVALC,0x7126,0x722C,
-	INVALC,0x7240,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2142,
-	INVALC,0x2B77,0x3060,INVALC,0x4B6B,INVALC,INVALC,INVALC,
-	INVALC,0x2B78,0x2B79,0x3D6A,INVALC,INVALC,INVALC,0x4468,
-	INVALC,INVALC,INVALC,0x4B6C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3D6B,INVALC,INVALC,INVALC,0x2262,INVALC,
-	INVALC,INVALC,INVALC,0x2460,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x277B,INVALC,0x2B7A,INVALC,0x2B7D,INVALC,
-	0x2B7B,INVALC,INVALC,0x2B7C,INVALC,INVALC,0x3063,0x3062,
-	0x3061,INVALC,INVALC,0x3722,0x3723,INVALC,0x3721,0x3724,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3D6F,0x3D6E,INVALC,
-	0x3D6C,0x3D6D,INVALC,0x3D70,0x446A,0x4469,0x446D,INVALC,
-	0x446C,0x446B,INVALC,0x4B6F,INVALC,0x4B6E,INVALC,0x4B6D,
-	0x517B,INVALC,0x517C,INVALC,INVALC,0x5845,0x5846,INVALC,
-	INVALC,0x657C,INVALC,0x657B,0x657A,0x6578,0x6579,INVALC,
-	0x693B,0x6D5C,0x7127,INVALC,INVALC,INVALC,0x2164,INVALC,
-	0x2165,INVALC,INVALC,INVALC,0x2263,0x2264,INVALC,INVALC,
-	INVALC,INVALC,0x2466,INVALC,INVALC,0x2462,INVALC,0x2461,
-	INVALC,0x2465,INVALC,0x2463,INVALC,0x2467,0x2464,INVALC,
-	INVALC,0x2821,0x2B7E,0x277D,0x2826,INVALC,INVALC,INVALC,
-	INVALC,0x2827,0x2823,INVALC,0x2824,INVALC,0x277C,INVALC,
-	0x277E,INVALC,0x2825,INVALC,0x2822,INVALC,INVALC,0x2C24,
-	INVALC,INVALC,INVALC,0x2C27,0x2C21,INVALC,0x2C26,INVALC,
-	0x2C22,INVALC,0x2C25,0x2C23,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3069,0x3066,INVALC,0x3068,INVALC,
-	INVALC,INVALC,0x3065,0x306A,INVALC,INVALC,0x3067,0x372C,
-	/* Block 116, Array index 0x2600 */
-	0x3064,0x306B,INVALC,INVALC,INVALC,INVALC,INVALC,0x3727,
-	0x372B,INVALC,0x372A,0x3D72,0x3D7D,INVALC,INVALC,0x372D,
-	INVALC,0x3728,0x3D71,INVALC,INVALC,INVALC,INVALC,0x3726,
-	0x3729,INVALC,INVALC,INVALC,INVALC,0x3725,0x372E,INVALC,
-	INVALC,INVALC,0x3D74,0x3D7B,INVALC,INVALC,0x3D7A,0x3D77,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3D79,INVALC,INVALC,
-	0x3D73,0x3D75,0x3D78,0x3D76,INVALC,0x3D7C,INVALC,INVALC,
-	INVALC,INVALC,0x4471,0x4470,0x446E,INVALC,INVALC,INVALC,
-	0x4472,INVALC,0x446F,0x4B70,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4474,0x4473,INVALC,0x4B73,0x4B71,INVALC,INVALC,
-	INVALC,0x4B72,0x517E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x517D,0x5228,0x5227,0x5225,INVALC,0x5224,0x5221,0x5222,
-	0x5223,0x5226,0x5229,INVALC,INVALC,0x584B,0x5848,0x5849,
-	INVALC,0x5847,0x584D,0x584C,0x584A,INVALC,0x5D50,0x5D51,
-	INVALC,INVALC,INVALC,0x5D4F,INVALC,INVALC,0x622C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x693D,0x693C,0x6B6B,0x6D5D,
-	INVALC,0x6F37,0x6F36,0x6F38,INVALC,0x2C28,INVALC,INVALC,
-	0x372F,INVALC,0x2166,INVALC,INVALC,INVALC,0x2265,INVALC,
-	INVALC,INVALC,0x246C,0x246A,0x246B,0x2468,INVALC,0x2469,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x282F,INVALC,INVALC,
-	0x282D,0x2829,0x282C,INVALC,0x2828,INVALC,0x282B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x282E,0x282A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2C30,0x2C2F,0x2C2E,INVALC,
-	0x2C37,0x2C2D,INVALC,INVALC,0x3070,INVALC,0x2C34,0x2C32,
-	INVALC,INVALC,0x2C2A,0x2C35,INVALC,0x2C2C,0x2C36,0x2C33,
-	0x2C2B,INVALC,INVALC,0x2C38,0x2C29,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3075,0x306C,0x3077,INVALC,0x306F,0x307A,
-	0x307B,0x306D,0x3079,0x3076,0x3074,0x3078,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3072,INVALC,0x306E,INVALC,0x3071,
-	0x307C,0x3073,INVALC,0x2C31,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x373D,0x3732,0x3730,INVALC,
-	0x3731,INVALC,0x3738,INVALC,0x3739,0x3735,INVALC,0x373A,
-	/* Block 117, Array index 0x2700 */
-	0x3737,0x3734,INVALC,INVALC,0x3733,INVALC,INVALC,0x3736,
-	0x373E,INVALC,INVALC,0x373C,0x373B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3E24,INVALC,
-	INVALC,INVALC,0x3E25,INVALC,INVALC,0x3E2B,INVALC,INVALC,
-	0x3E2D,0x3E26,INVALC,0x3E2A,0x3E29,INVALC,INVALC,INVALC,
-	INVALC,0x3E2C,INVALC,0x3E23,0x3E21,0x3E27,0x3D7E,INVALC,
-	0x3E22,0x3E28,0x3E2E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x447B,INVALC,0x4521,INVALC,0x4475,INVALC,0x4522,INVALC,
-	INVALC,INVALC,0x4476,0x4477,INVALC,0x4523,0x447E,0x447C,
-	0x447D,0x4479,0x4478,INVALC,0x4524,INVALC,INVALC,0x447A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B74,INVALC,INVALC,INVALC,INVALC,0x4B79,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B7A,INVALC,
-	INVALC,0x4B76,0x4B78,0x4B75,INVALC,0x4B77,INVALC,INVALC,
-	INVALC,0x5233,INVALC,INVALC,0x5232,0x522F,INVALC,0x584E,
-	INVALC,0x522E,INVALC,INVALC,INVALC,0x5230,0x522D,0x522A,
-	0x5231,0x522B,0x522C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D55,INVALC,0x5852,INVALC,0x5851,0x5853,INVALC,0x5D52,
-	INVALC,INVALC,0x584F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5850,0x5854,INVALC,INVALC,INVALC,0x5D59,INVALC,INVALC,
-	INVALC,INVALC,0x5D56,0x5D54,INVALC,0x5D57,INVALC,0x5D5A,
-	INVALC,0x5D58,0x5D53,INVALC,INVALC,0x622F,0x6232,0x6621,
-	0x622D,INVALC,0x693E,0x6233,INVALC,INVALC,0x6231,INVALC,
-	0x622E,0x6230,0x6234,0x6622,INVALC,0x657E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x657D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6D5F,INVALC,0x6D61,
-	0x6D5E,0x6D60,INVALC,0x7040,INVALC,0x2830,0x307D,0x307E,
-	INVALC,0x4525,INVALC,INVALC,INVALC,0x7041,INVALC,INVALC,
-	0x2831,INVALC,INVALC,INVALC,0x2C39,INVALC,0x2C3A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3121,0x3122,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3E2F,INVALC,0x4528,0x4527,0x4526,
-	/* Block 118, Array index 0x2800 */
-	0x4B7B,INVALC,0x4B7C,0x4B7D,INVALC,INVALC,INVALC,0x5235,
-	0x5234,INVALC,INVALC,0x5855,INVALC,INVALC,INVALC,0x5D5E,
-	0x5D5B,0x5D5C,0x5D5D,0x6236,0x6235,INVALC,0x6623,0x6B6C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4529,INVALC,INVALC,
-	INVALC,0x3123,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2266,INVALC,INVALC,INVALC,0x2C3B,0x3E30,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x246E,0x246D,INVALC,INVALC,INVALC,0x2834,0x2832,
-	0x2833,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2C3C,
-	0x2C3D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3124,INVALC,INVALC,INVALC,0x3125,
-	INVALC,INVALC,INVALC,0x3740,0x373F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E32,INVALC,INVALC,0x3E31,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x452B,
-	INVALC,0x452A,INVALC,INVALC,INVALC,0x4B7E,0x5236,INVALC,
-	0x5856,INVALC,INVALC,INVALC,0x5D5F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2835,INVALC,INVALC,INVALC,
-	0x4C21,INVALC,INVALC,INVALC,0x246F,0x2470,INVALC,INVALC,
-	0x2836,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2C3E,
-	INVALC,INVALC,0x2C3F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3126,INVALC,INVALC,INVALC,INVALC,INVALC,0x312C,INVALC,
-	INVALC,INVALC,0x312D,0x3128,INVALC,INVALC,INVALC,0x312B,
-	0x312A,0x3127,INVALC,INVALC,0x3129,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3744,0x3745,INVALC,0x3741,0x3743,
-	0x3747,0x3746,0x3742,INVALC,INVALC,INVALC,INVALC,0x3E3A,
-	INVALC,INVALC,0x3E34,INVALC,INVALC,0x3E37,INVALC,0x3E38,
-	INVALC,0x3E35,INVALC,INVALC,0x3E39,INVALC,0x3E36,0x3E33,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4538,INVALC,0x452D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4539,0x4537,0x4530,
-	0x4534,0x4533,INVALC,0x4536,0x4532,0x453A,0x4531,INVALC,
-	/* Block 119, Array index 0x2900 */
-	INVALC,INVALC,INVALC,0x452F,INVALC,INVALC,INVALC,INVALC,
-	0x4C23,INVALC,0x4C27,INVALC,0x4C24,INVALC,INVALC,0x452E,
-	0x4535,0x4C26,INVALC,INVALC,0x4C28,0x4C25,0x4C22,INVALC,
-	INVALC,0x5239,0x523D,0x523F,0x523B,0x523A,0x5238,INVALC,
-	INVALC,INVALC,INVALC,0x523C,INVALC,0x5237,INVALC,INVALC,
-	0x523E,INVALC,INVALC,INVALC,INVALC,0x5858,INVALC,0x5857,
-	0x585F,0x5859,0x585E,0x585B,INVALC,0x585D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x585C,0x585A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D60,INVALC,INVALC,INVALC,0x5D63,
-	0x5D61,0x5D62,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x623A,INVALC,INVALC,0x623B,INVALC,INVALC,INVALC,0x623C,
-	INVALC,0x6239,0x623D,INVALC,0x6237,INVALC,INVALC,INVALC,
-	0x6624,INVALC,INVALC,INVALC,0x6238,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6B6D,INVALC,INVALC,0x6D62,INVALC,INVALC,
-	0x6F39,INVALC,INVALC,INVALC,INVALC,0x723A,INVALC,INVALC,
-	INVALC,0x2C40,INVALC,INVALC,INVALC,INVALC,INVALC,0x2267,
-	INVALC,0x2471,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3749,0x312E,INVALC,INVALC,INVALC,INVALC,0x3748,
-	INVALC,INVALC,0x3E3C,INVALC,INVALC,0x3E3B,INVALC,INVALC,
-	INVALC,0x453B,INVALC,0x5243,0x5240,0x5241,0x5242,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5D64,INVALC,0x623E,INVALC,
-	INVALC,INVALC,0x6940,0x693F,INVALC,0x6D63,INVALC,0x2837,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x453C,INVALC,INVALC,
-	0x4C29,INVALC,INVALC,0x5860,INVALC,0x623F,0x6941,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2C41,INVALC,INVALC,INVALC,
-	INVALC,0x312F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x374A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3E3D,INVALC,INVALC,0x453D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5861,INVALC,
-	INVALC,0x5D65,INVALC,INVALC,0x6240,0x6942,INVALC,INVALC,
-	0x283A,0x2839,INVALC,0x2838,INVALC,0x283B,INVALC,0x2C47,
-	INVALC,INVALC,0x2C49,0x2C48,INVALC,INVALC,INVALC,INVALC,
-	/* Block 120, Array index 0x2A00 */
-	INVALC,INVALC,INVALC,0x2C43,0x2C44,0x2C45,INVALC,INVALC,
-	0x2C42,INVALC,0x2C46,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3132,0x3136,0x3134,0x3133,INVALC,0x3137,INVALC,INVALC,
-	INVALC,0x3138,0x3139,0x3131,INVALC,0x3130,INVALC,INVALC,
-	INVALC,INVALC,0x313A,0x3135,INVALC,0x3753,INVALC,0x313B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x374D,INVALC,0x374C,
-	INVALC,0x374E,0x374F,0x3751,0x3750,0x3755,INVALC,INVALC,
-	INVALC,0x374B,INVALC,0x3754,INVALC,0x3752,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E40,0x3E42,0x3E3E,0x3E3F,
-	INVALC,INVALC,0x3E43,0x3E45,0x3E46,0x3E41,0x3E44,INVALC,
-	INVALC,INVALC,0x4541,INVALC,0x4546,0x453E,0x4542,INVALC,
-	INVALC,0x4547,0x4543,INVALC,INVALC,INVALC,INVALC,0x453F,
-	0x4540,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4545,
-	INVALC,0x4544,INVALC,INVALC,INVALC,0x4548,0x4C2E,0x4C30,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4C2B,INVALC,0x4C31,INVALC,
-	0x4C2F,0x4C2A,0x4C2D,0x4C32,INVALC,0x4C2C,INVALC,INVALC,
-	0x5247,0x5246,INVALC,INVALC,INVALC,0x5244,INVALC,0x5245,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5869,INVALC,0x586B,
-	INVALC,0x586A,0x5862,0x5866,0x5865,0x5863,INVALC,INVALC,
-	INVALC,0x5864,0x5867,0x5868,INVALC,INVALC,INVALC,INVALC,
-	0x5D6D,INVALC,INVALC,0x5D67,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D6C,0x5D68,INVALC,0x5D6B,0x5D66,0x5D6A,0x5D69,
-	INVALC,INVALC,0x6242,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6241,INVALC,0x6627,INVALC,INVALC,INVALC,
-	INVALC,0x6625,0x6626,INVALC,0x6943,0x6946,0x6944,0x6945,
-	0x6B6E,INVALC,INVALC,INVALC,0x6F3A,0x7042,INVALC,INVALC,
-	0x7128,0x7129,INVALC,INVALC,INVALC,INVALC,0x3E47,INVALC,
-	0x4549,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2C4A,
-	0x2C4B,INVALC,INVALC,INVALC,0x3E48,INVALC,INVALC,INVALC,
-	0x5D6E,0x6628,0x6947,INVALC,INVALC,INVALC,INVALC,0x2841,
-	0x283C,0x283E,0x2840,0x283F,0x283D,INVALC,INVALC,INVALC,
-	/* Block 121, Array index 0x2B00 */
-	INVALC,INVALC,INVALC,0x2C54,INVALC,0x2C4F,0x2C4C,INVALC,
-	INVALC,0x2C53,INVALC,INVALC,INVALC,INVALC,0x2C52,0x2C51,
-	0x2C50,0x2C4D,0x2C4E,0x2C55,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3144,0x313E,0x313C,INVALC,INVALC,0x375C,INVALC,
-	0x3141,0x3145,0x3147,0x3143,0x313D,INVALC,0x3142,0x3140,
-	INVALC,0x3148,INVALC,0x3146,INVALC,0x313F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x375D,INVALC,INVALC,
-	0x3756,0x3758,0x375A,INVALC,0x375B,0x3759,INVALC,INVALC,
-	0x375E,INVALC,0x3757,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E4C,INVALC,0x3E54,INVALC,
-	0x3E49,INVALC,0x3E55,INVALC,0x3E4A,0x3E4B,INVALC,INVALC,
-	0x3E53,0x3E52,0x3E4F,INVALC,INVALC,0x3E4D,0x3E50,INVALC,
-	0x3E51,0x3E4E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4554,INVALC,0x4558,INVALC,INVALC,0x4C38,INVALC,
-	0x4556,INVALC,INVALC,0x4553,0x454E,0x4550,0x4551,0x454A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x454D,
-	INVALC,INVALC,INVALC,INVALC,0x454C,0x454F,0x4557,INVALC,
-	INVALC,0x4555,0x454B,INVALC,INVALC,INVALC,0x4C3A,INVALC,
-	0x4C3C,0x4552,0x4C3E,INVALC,0x4C3F,0x4C3B,INVALC,INVALC,
-	0x4C37,INVALC,0x4C34,0x4C39,0x4C3D,0x4C36,INVALC,INVALC,
-	INVALC,INVALC,0x4C33,INVALC,0x4C35,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5249,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5250,0x5251,INVALC,INVALC,INVALC,
-	0x524F,0x5252,INVALC,INVALC,0x524B,0x5248,0x524D,0x524A,
-	INVALC,0x524C,INVALC,INVALC,0x524E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5872,INVALC,0x586C,0x5870,0x5876,
-	0x5877,0x5873,0x5874,0x5871,INVALC,0x586E,INVALC,INVALC,
-	INVALC,0x586D,0x586F,INVALC,INVALC,0x5875,INVALC,INVALC,
-	INVALC,INVALC,0x5D75,0x5D6F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D77,INVALC,0x5D72,0x5D73,0x5D70,0x5D78,0x5D74,
-	/* Block 122, Array index 0x2C00 */
-	INVALC,INVALC,0x5D71,INVALC,0x5D79,0x5D76,INVALC,INVALC,
-	INVALC,0x6246,INVALC,INVALC,0x6243,INVALC,INVALC,INVALC,
-	0x6247,0x6249,0x6248,0x6244,0x6245,INVALC,INVALC,0x662D,
-	INVALC,INVALC,INVALC,0x662A,0x662C,0x6629,0x662E,INVALC,
-	INVALC,0x662B,INVALC,0x6949,0x694C,0x6948,INVALC,0x694A,
-	0x694B,0x694D,INVALC,INVALC,INVALC,0x6B6F,INVALC,0x6B71,
-	INVALC,0x6B70,INVALC,INVALC,INVALC,0x6D64,INVALC,INVALC,
-	0x7043,0x712A,INVALC,INVALC,INVALC,0x2472,INVALC,0x2843,
-	INVALC,INVALC,0x2842,INVALC,0x2C5A,0x2C59,INVALC,INVALC,
-	INVALC,INVALC,0x2C56,0x2C58,0x2C57,INVALC,INVALC,0x314B,
-	INVALC,0x314F,0x314E,0x314D,0x3149,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x314A,0x314C,INVALC,INVALC,INVALC,
-	INVALC,0x3765,INVALC,0x3763,0x375F,INVALC,INVALC,0x3760,
-	INVALC,0x3761,0x3762,0x3764,INVALC,INVALC,INVALC,INVALC,
-	0x3E59,INVALC,0x3E58,0x3E57,0x3E56,INVALC,INVALC,INVALC,
-	INVALC,0x455C,INVALC,INVALC,0x4559,0x455B,INVALC,INVALC,
-	INVALC,INVALC,0x455A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C48,INVALC,0x4C41,0x4C42,INVALC,INVALC,INVALC,INVALC,
-	0x4C4A,INVALC,0x4C49,0x4C46,0x4C45,0x4C44,0x4C43,0x4C47,
-	0x4C40,INVALC,0x5253,0x5258,0x5256,INVALC,INVALC,INVALC,
-	0x5255,0x5254,0x5257,INVALC,0x5878,INVALC,INVALC,INVALC,
-	0x5D7B,INVALC,INVALC,0x5D7A,0x624B,0x624A,INVALC,INVALC,
-	0x662F,INVALC,0x694E,INVALC,0x6D65,INVALC,0x7045,0x7044,
-	0x2167,INVALC,INVALC,0x3766,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2844,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2C5C,0x2C5F,0x2C5D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2C5B,0x2C5E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3156,0x3158,0x3157,INVALC,
-	0x3152,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3155,0x3150,0x3151,0x3154,0x3153,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3769,0x376A,
-	0x3768,INVALC,0x3767,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 123, Array index 0x2D00 */
-	INVALC,INVALC,0x3E5A,0x3E5C,0x3E5E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3E5B,INVALC,0x3E5D,INVALC,INVALC,INVALC,
-	0x4566,0x455D,0x4560,0x4564,INVALC,0x4562,INVALC,0x4561,
-	0x455E,0x455F,INVALC,0x4565,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4563,INVALC,INVALC,INVALC,0x4C50,INVALC,
-	0x4C4F,INVALC,INVALC,0x4C4B,INVALC,INVALC,INVALC,0x4C4E,
-	0x4C4D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x525A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5879,INVALC,INVALC,0x587B,
-	0x587A,INVALC,0x4C4C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E22,INVALC,0x5D7E,INVALC,
-	0x5E21,INVALC,0x5E23,0x5D7D,0x5D7C,INVALC,INVALC,0x624C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6630,
-	0x6631,INVALC,INVALC,INVALC,0x6950,0x6951,0x694F,INVALC,
-	0x6D66,0x6D67,INVALC,INVALC,INVALC,0x2268,INVALC,INVALC,
-	0x2845,INVALC,INVALC,0x2846,INVALC,INVALC,0x2C61,INVALC,
-	0x2C60,INVALC,INVALC,INVALC,INVALC,0x315B,0x3159,0x315F,
-	INVALC,0x315A,0x315E,0x315C,0x315D,INVALC,INVALC,0x376B,
-	0x376D,INVALC,INVALC,INVALC,0x376C,INVALC,INVALC,INVALC,
-	INVALC,0x3E5F,INVALC,INVALC,INVALC,INVALC,0x4569,INVALC,
-	INVALC,INVALC,0x4568,0x4567,INVALC,INVALC,INVALC,INVALC,
-	0x4C51,INVALC,INVALC,0x4C52,0x4C53,INVALC,INVALC,INVALC,
-	INVALC,0x5921,0x525B,0x525D,0x525C,0x587E,0x587C,0x5922,
-	0x587D,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E24,INVALC,
-	0x5E25,0x5E26,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2C62,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3160,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E61,INVALC,0x3E60,INVALC,
-	INVALC,INVALC,INVALC,0x456A,INVALC,INVALC,0x4C54,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6952,
-	INVALC,INVALC,INVALC,0x2847,INVALC,INVALC,INVALC,INVALC,
-	/* Block 124, Array index 0x2E00 */
-	0x2C63,0x2C64,INVALC,INVALC,0x3162,0x3164,INVALC,INVALC,
-	0x3166,0x3169,0x3167,INVALC,INVALC,INVALC,0x3168,0x3165,
-	0x3161,INVALC,0x316A,0x3163,INVALC,INVALC,INVALC,INVALC,
-	0x3776,INVALC,0x3821,INVALC,INVALC,0x3778,INVALC,INVALC,
-	INVALC,INVALC,0x3773,0x3822,0x3774,0x3771,INVALC,INVALC,
-	INVALC,INVALC,0x3777,0x377A,INVALC,0x377B,INVALC,0x377C,
-	0x3772,0x3779,0x377D,0x3775,0x3770,0x376E,INVALC,INVALC,
-	0x377E,INVALC,INVALC,0x376F,INVALC,INVALC,INVALC,INVALC,
-	0x3E68,INVALC,INVALC,INVALC,0x3E64,0x3E6A,INVALC,0x3E63,
-	0x3E65,INVALC,0x3E62,INVALC,0x3E66,INVALC,0x3E67,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E69,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4575,INVALC,0x4578,0x456C,0x4571,0x456B,INVALC,
-	INVALC,0x456F,INVALC,INVALC,INVALC,0x456D,INVALC,INVALC,
-	0x4574,0x4573,0x4570,0x4572,0x456E,INVALC,0x4577,INVALC,
-	0x4576,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C64,INVALC,INVALC,0x4C5F,INVALC,INVALC,
-	0x4C55,INVALC,0x4C57,INVALC,0x4C5C,0x4C5B,0x4C5E,INVALC,
-	0x4C59,0x4C58,INVALC,INVALC,INVALC,INVALC,0x4C5A,INVALC,
-	0x4C60,0x4C62,INVALC,0x4C5D,0x4C56,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4C63,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5261,INVALC,INVALC,0x5263,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5266,INVALC,0x525E,
-	INVALC,0x5264,INVALC,INVALC,INVALC,INVALC,0x5260,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5265,0x525F,INVALC,INVALC,0x5262,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x592C,0x5927,INVALC,INVALC,
-	0x5931,INVALC,0x5929,INVALC,0x592F,0x5926,0x5923,0x5932,
-	INVALC,INVALC,0x592E,0x5924,INVALC,0x5928,INVALC,0x5925,
-	0x592A,INVALC,0x592D,0x5930,INVALC,INVALC,INVALC,INVALC,
-	0x5E38,0x5E39,0x5E29,0x5E30,0x5E2E,INVALC,INVALC,INVALC,
-	0x5E35,0x592B,INVALC,0x5E2C,INVALC,0x5E36,INVALC,0x5E2B,
-	/* Block 125, Array index 0x2F00 */
-	0x5E2A,0x5E34,0x5E31,0x5E33,INVALC,0x5E27,0x5E37,INVALC,
-	INVALC,0x5E32,0x5E3B,0x5E2F,INVALC,INVALC,0x5E2D,0x5E28,
-	0x5E3A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x624F,INVALC,INVALC,0x624D,0x6253,INVALC,0x6251,
-	0x6250,INVALC,0x6256,INVALC,INVALC,0x6257,0x6254,INVALC,
-	0x6255,0x624E,INVALC,INVALC,0x6635,0x6252,INVALC,INVALC,
-	0x6258,INVALC,INVALC,0x6632,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6634,INVALC,0x6636,0x6633,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6957,INVALC,0x6956,
-	0x6954,0x6953,0x6955,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6B73,0x6B72,INVALC,INVALC,0x6D68,
-	INVALC,0x6D6A,0x6D6C,0x6D6B,0x6D69,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6F3C,0x6F3B,
-	INVALC,0x712B,0x7046,0x712C,INVALC,INVALC,INVALC,0x715C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2848,INVALC,INVALC,
-	0x2C66,0x2C67,0x2C65,INVALC,INVALC,INVALC,INVALC,0x2C68,
-	0x2C69,0x2C6A,INVALC,INVALC,0x316B,0x3171,INVALC,INVALC,
-	0x316F,INVALC,0x316D,INVALC,0x316E,0x3170,INVALC,INVALC,
-	INVALC,0x316C,INVALC,INVALC,0x3823,INVALC,0x3825,INVALC,
-	0x3824,INVALC,INVALC,INVALC,INVALC,INVALC,0x3E6C,INVALC,
-	INVALC,0x3E6E,0x3E6B,0x3826,INVALC,INVALC,INVALC,INVALC,
-	0x3E6D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x457B,
-	INVALC,INVALC,0x4579,INVALC,0x457A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C68,0x4C65,0x4C67,INVALC,INVALC,0x4C66,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5267,INVALC,INVALC,
-	0x5268,INVALC,INVALC,0x526A,0x5269,INVALC,INVALC,INVALC,
-	0x5936,0x5937,0x5933,INVALC,0x5934,INVALC,INVALC,0x5935,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5E3C,INVALC,0x6638,INVALC,0x6637,INVALC,0x6958,INVALC,
-	INVALC,0x6D6E,0x6B74,INVALC,0x6D6D,INVALC,0x712D,0x7172,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2849,INVALC,INVALC,
-	/* Block 126, Array index 0x3000 */
-	INVALC,0x2C6D,INVALC,0x2C6B,INVALC,INVALC,INVALC,INVALC,
-	0x2C6C,INVALC,INVALC,INVALC,0x317C,INVALC,0x3175,0x317B,
-	INVALC,0x3174,0x317A,0x3178,INVALC,INVALC,0x3177,INVALC,
-	0x3176,INVALC,INVALC,INVALC,INVALC,0x3173,0x3172,0x3179,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3835,0x382E,INVALC,INVALC,0x382D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3827,0x382A,INVALC,
-	0x3829,INVALC,0x382B,0x3834,INVALC,0x3828,0x3831,0x3832,
-	INVALC,0x382F,INVALC,INVALC,INVALC,0x382C,INVALC,0x3830,
-	INVALC,INVALC,0x3833,INVALC,INVALC,INVALC,0x3F21,0x3E76,
-	INVALC,0x3E7D,0x3E7A,0x3E72,0x3E7B,INVALC,0x3E73,INVALC,
-	0x3E6F,INVALC,INVALC,INVALC,0x3E78,INVALC,INVALC,0x3E7E,
-	INVALC,INVALC,INVALC,0x3E71,INVALC,INVALC,INVALC,0x3E74,
-	INVALC,0x3E7C,0x3E75,0x3E79,INVALC,0x3E77,INVALC,0x3E70,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4624,0x4626,0x4628,0x462C,INVALC,0x4622,
-	0x457E,INVALC,INVALC,0x4627,0x462B,0x4623,0x457D,INVALC,
-	0x457C,INVALC,INVALC,INVALC,0x4629,0x4621,0x4625,INVALC,
-	INVALC,INVALC,0x462D,INVALC,0x462A,INVALC,0x4C79,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4C71,INVALC,0x4C7B,
-	INVALC,0x4D21,INVALC,0x4C6C,INVALC,INVALC,0x4C7C,0x4C69,
-	INVALC,0x4C7E,0x4C6D,INVALC,INVALC,INVALC,0x4C7D,0x4C77,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C6A,
-	INVALC,0x4C78,INVALC,INVALC,0x4C7A,INVALC,INVALC,INVALC,
-	0x4C6F,0x4C6E,0x4C6B,INVALC,0x4C73,0x4C70,0x4C74,INVALC,
-	INVALC,0x4D22,INVALC,0x4C75,0x4C76,INVALC,0x4C72,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x526F,
-	INVALC,INVALC,INVALC,0x526C,INVALC,INVALC,INVALC,0x5278,
-	INVALC,0x5270,INVALC,INVALC,INVALC,INVALC,0x5273,0x526E,
-	INVALC,INVALC,0x526D,INVALC,INVALC,INVALC,0x5277,INVALC,
-	0x5276,0x5275,INVALC,0x503B,INVALC,INVALC,0x5274,0x526B,
-	INVALC,INVALC,0x5272,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 127, Array index 0x3100 */
-	INVALC,INVALC,INVALC,0x5271,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5944,0x593B,0x5947,0x593F,0x5945,
-	INVALC,INVALC,0x5938,0x593E,0x5948,0x5941,0x5946,0x593A,
-	INVALC,INVALC,0x5942,INVALC,0x5940,INVALC,INVALC,0x593C,
-	0x593D,0x5939,0x5943,INVALC,0x594A,0x5949,INVALC,INVALC,
-	INVALC,0x5E47,0x5E43,INVALC,INVALC,0x5E3D,INVALC,INVALC,
-	0x5E49,INVALC,INVALC,0x5E40,INVALC,INVALC,0x5E4B,INVALC,
-	0x5E42,INVALC,0x5E4D,0x5E4A,0x5E3E,INVALC,INVALC,INVALC,
-	0x5E45,INVALC,0x5E3F,INVALC,0x5E4C,INVALC,INVALC,0x5E46,
-	INVALC,0x5E44,INVALC,INVALC,0x5E48,INVALC,INVALC,INVALC,
-	0x625A,0x6260,INVALC,0x6263,INVALC,INVALC,0x625B,0x6262,
-	0x625D,INVALC,INVALC,INVALC,0x6259,INVALC,INVALC,0x625F,
-	0x6261,INVALC,0x625E,0x625C,INVALC,INVALC,INVALC,INVALC,
-	0x6642,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x663E,
-	0x663C,INVALC,0x6640,INVALC,0x6641,0x663A,0x6639,0x663D,
-	0x663B,INVALC,0x663F,0x6959,INVALC,INVALC,0x695A,INVALC,
-	0x695C,0x695B,INVALC,INVALC,INVALC,INVALC,0x6B79,0x6B76,
-	0x6B77,INVALC,0x6B75,0x6B78,INVALC,0x6B7A,INVALC,INVALC,
-	INVALC,0x6D6F,INVALC,INVALC,INVALC,0x6F3D,INVALC,0x7047,
-	0x712F,0x7131,0x712E,0x7130,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 128, Array index 0x3200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3052,INVALC,INVALC,INVALC,INVALC,0x3F22,0x3F23,
-	INVALC,INVALC,INVALC,0x594B,INVALC,0x5E4E,INVALC,INVALC,
-	INVALC,INVALC,0x6644,0x6643,INVALC,0x6B7B,INVALC,0x6D70,
-	INVALC,0x2269,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2C6E,INVALC,INVALC,0x3224,0x317D,0x3223,0x3221,INVALC,
-	0x3222,0x317E,INVALC,0x3836,INVALC,0x3F24,0x3F25,0x4630,
-	0x4631,INVALC,INVALC,0x462F,0x4632,0x462E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4D23,INVALC,INVALC,0x5279,INVALC,
-	INVALC,INVALC,0x594E,0x594C,0x594D,0x5E51,0x5E50,0x5E4F,
-	INVALC,INVALC,INVALC,0x6645,INVALC,INVALC,0x6646,0x6D71,
-	INVALC,0x7048,INVALC,INVALC,INVALC,0x2C70,INVALC,INVALC,
-	INVALC,0x2C6F,0x3226,INVALC,INVALC,0x3837,0x3225,INVALC,
-	INVALC,INVALC,INVALC,0x383A,0x3838,0x3839,INVALC,INVALC,
-	0x3F27,0x3F28,0x3F26,INVALC,INVALC,0x4634,0x4633,0x4635,
-	INVALC,INVALC,INVALC,INVALC,0x527A,0x527C,INVALC,INVALC,
-	0x527B,0x594F,INVALC,0x6265,INVALC,0x6264,INVALC,0x6647,
-	INVALC,INVALC,0x695D,0x6B7C,INVALC,INVALC,0x2C71,INVALC,
-	0x3229,INVALC,0x3228,0x3227,INVALC,INVALC,INVALC,0x3840,
-	INVALC,0x3842,0x383B,0x383C,INVALC,0x383D,INVALC,0x3841,
-	0x383E,0x383F,INVALC,INVALC,INVALC,INVALC,INVALC,0x3F29,
-	INVALC,INVALC,INVALC,0x4636,0x4637,INVALC,0x4D27,INVALC,
-	INVALC,INVALC,0x4D24,0x4D25,INVALC,0x4D26,0x5323,INVALC,
-	0x5324,INVALC,0x5321,0x527E,0x5322,0x527D,INVALC,0x5950,
-	INVALC,INVALC,0x5E53,INVALC,0x5E52,0x6134,INVALC,0x6266,
-	0x6267,INVALC,INVALC,INVALC,INVALC,0x6648,0x6649,0x695E,
-	/* Block 129, Array index 0x3300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2C72,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2C73,0x2C74,
-	INVALC,INVALC,INVALC,INVALC,0x2C75,INVALC,0x322A,INVALC,
-	INVALC,INVALC,INVALC,0x3845,INVALC,INVALC,0x3844,0x3843,
-	INVALC,0x4638,INVALC,INVALC,0x4D28,INVALC,INVALC,INVALC,
-	INVALC,0x5952,0x5951,INVALC,0x5E54,INVALC,INVALC,INVALC,
-	0x6B7D,INVALC,INVALC,INVALC,0x2473,0x284A,INVALC,0x2C76,
-	INVALC,0x322C,INVALC,INVALC,INVALC,INVALC,0x322B,INVALC,
-	INVALC,INVALC,INVALC,0x3847,INVALC,INVALC,INVALC,0x3846,
-	0x3848,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3F2B,
-	0x3F2C,0x3F2A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4D2A,0x4D29,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5325,INVALC,INVALC,0x5326,
-	INVALC,INVALC,INVALC,INVALC,0x5953,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6268,INVALC,INVALC,
-	0x664A,0x695F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2F7D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2168,INVALC,INVALC,INVALC,INVALC,0x284B,
-	0x2476,INVALC,0x2477,INVALC,INVALC,0x2474,INVALC,INVALC,
-	INVALC,0x2475,INVALC,INVALC,0x2478,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x284D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2850,0x284C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x284F,INVALC,INVALC,
-	0x284E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2C7C,INVALC,INVALC,0x2C7E,INVALC,0x2C78,
-	0x2C7B,0x2D26,0x2D24,INVALC,INVALC,0x2D2A,INVALC,0x2D27,
-	0x2C7D,0x2C7A,INVALC,INVALC,0x3F2E,0x2D25,INVALC,0x2D28,
-	0x2C77,0x2D22,INVALC,INVALC,0x2D23,INVALC,INVALC,INVALC,
-	0x2C79,INVALC,INVALC,0x2D21,INVALC,INVALC,0x2D29,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x322E,INVALC,INVALC,0x3230,INVALC,INVALC,
-	INVALC,0x322F,0x322D,0x3232,INVALC,INVALC,0x3F2D,INVALC,
-	/* Block 130, Array index 0x3400 */
-	0x3233,0x3231,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3852,INVALC,INVALC,
-	0x3849,0x384B,INVALC,0x384C,INVALC,0x3854,0x3850,0x384E,
-	INVALC,0x3851,0x3855,INVALC,INVALC,0x384A,INVALC,0x3853,
-	INVALC,INVALC,INVALC,INVALC,0x384F,0x384D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3F36,INVALC,INVALC,0x3F34,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3F2F,0x4646,INVALC,INVALC,0x3F33,
-	INVALC,INVALC,0x3F30,INVALC,INVALC,0x3F35,INVALC,0x3F32,
-	INVALC,INVALC,0x3F31,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x463E,0x463C,INVALC,0x4642,INVALC,
-	0x463A,0x4647,0x463F,INVALC,0x4639,INVALC,INVALC,0x4644,
-	INVALC,0x463D,INVALC,INVALC,INVALC,INVALC,INVALC,0x4645,
-	INVALC,INVALC,0x4640,INVALC,INVALC,INVALC,0x4643,0x463B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4D2D,INVALC,INVALC,0x4D2C,0x4D2E,
-	INVALC,0x4D2B,INVALC,0x4D31,0x4D30,0x4D2F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x532A,INVALC,0x532D,
-	INVALC,0x532C,INVALC,INVALC,INVALC,INVALC,0x5329,0x5328,
-	INVALC,INVALC,0x532B,0x5327,INVALC,INVALC,0x5955,0x595F,
-	INVALC,INVALC,INVALC,0x5959,0x595B,INVALC,0x5956,INVALC,
-	0x595A,0x5954,0x595D,INVALC,0x595C,0x5958,INVALC,0x595E,
-	INVALC,0x5957,INVALC,0x5E55,0x5E5B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E56,0x5E59,INVALC,0x5E5A,
-	INVALC,INVALC,0x5E58,INVALC,0x5E57,INVALC,INVALC,INVALC,
-	0x626B,0x6269,0x626A,INVALC,INVALC,0x664C,INVALC,0x664B,
-	INVALC,0x6961,INVALC,0x6960,INVALC,0x6B7E,0x6D72,INVALC,
-	0x7132,0x7133,INVALC,INVALC,INVALC,INVALC,0x3F37,INVALC,
-	INVALC,0x5E5C,INVALC,INVALC,INVALC,INVALC,0x3F38,INVALC,
-	INVALC,INVALC,0x5960,INVALC,INVALC,INVALC,INVALC,0x3F39,
-	0x3F3A,0x3F3B,INVALC,INVALC,INVALC,INVALC,INVALC,0x2D2B,
-	/* Block 131, Array index 0x3500 */
-	INVALC,0x3234,INVALC,INVALC,0x3F3C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x664D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3856,INVALC,INVALC,INVALC,0x4D32,0x532E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4648,INVALC,INVALC,
-	0x2851,0x2D2C,INVALC,INVALC,INVALC,0x3236,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3235,
-	INVALC,INVALC,0x385B,0x3858,0x385A,INVALC,INVALC,INVALC,
-	0x3857,INVALC,0x3859,INVALC,0x3F3D,0x3F3E,INVALC,0x3F3F,
-	0x464B,INVALC,0x464C,INVALC,0x464A,0x464D,INVALC,INVALC,
-	INVALC,0x4649,INVALC,INVALC,INVALC,INVALC,0x5333,0x532F,
-	0x5332,0x5334,0x5331,0x5330,INVALC,0x5961,0x5962,0x5963,
-	INVALC,INVALC,0x5E5E,0x5E5D,0x5E5F,INVALC,0x626D,0x626C,
-	INVALC,0x664F,INVALC,0x6650,0x664E,INVALC,INVALC,INVALC,
-	0x6962,0x6963,INVALC,0x6D73,0x6F3E,0x7049,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x385C,0x3F40,INVALC,INVALC,
-	0x226A,INVALC,INVALC,INVALC,0x226B,0x226D,INVALC,0x226E,
-	0x226C,INVALC,INVALC,0x2522,0x2523,0x247B,INVALC,INVALC,
-	INVALC,INVALC,0x2521,INVALC,INVALC,INVALC,0x247C,0x247A,
-	0x2479,0x247D,INVALC,0x247E,0x2D2D,INVALC,INVALC,INVALC,
-	0x2856,INVALC,0x2855,0x2857,INVALC,INVALC,0x285C,INVALC,
-	0x2852,0x2860,0x2866,INVALC,0x2863,INVALC,INVALC,0x2859,
-	0x285F,0x2861,INVALC,0x2854,INVALC,INVALC,0x285A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x285E,0x2858,0x2865,INVALC,
-	INVALC,INVALC,0x285D,INVALC,0x285B,INVALC,INVALC,INVALC,
-	0x2853,INVALC,0x2862,0x2864,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2D34,0x2D37,INVALC,
-	INVALC,0x2D2E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2D43,0x2D3A,INVALC,INVALC,0x2D42,INVALC,INVALC,INVALC,
-	0x2D32,INVALC,0x2D41,0x2D36,0x2D39,0x2D46,INVALC,INVALC,
-	0x2D40,INVALC,0x2D3B,0x2D45,0x2D38,0x2D3C,0x2D3F,INVALC,
-	INVALC,0x2D30,0x2D44,0x2D3E,INVALC,INVALC,0x2D2F,INVALC,
-	/* Block 132, Array index 0x3600 */
-	0x2D33,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2D31,
-	0x3247,INVALC,INVALC,INVALC,0x2D3D,0x2942,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x324A,INVALC,
-	INVALC,0x323A,INVALC,0x3245,0x3241,INVALC,0x3254,INVALC,
-	0x324C,INVALC,0x3242,INVALC,0x324B,0x323C,0x3240,0x3257,
-	INVALC,0x324F,0x3246,INVALC,0x3255,0x3238,INVALC,0x324E,
-	INVALC,INVALC,INVALC,0x3237,INVALC,INVALC,INVALC,0x324D,
-	INVALC,INVALC,0x2D35,0x3F41,0x3248,INVALC,INVALC,0x323E,
-	INVALC,0x323F,0x3243,INVALC,0x3239,0x3251,INVALC,0x3250,
-	0x3258,INVALC,INVALC,0x3256,0x3252,0x3249,0x3244,INVALC,
-	INVALC,0x323B,INVALC,0x3253,INVALC,INVALC,0x323D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3862,0x3864,0x3869,0x387D,INVALC,
-	INVALC,INVALC,0x3861,INVALC,INVALC,0x386C,0x3873,0x3879,
-	INVALC,0x3866,INVALC,0x386D,INVALC,INVALC,INVALC,0x387B,
-	0x3876,INVALC,INVALC,0x3872,0x386E,0x3860,INVALC,0x3865,
-	0x385D,INVALC,INVALC,INVALC,0x386A,0x3867,INVALC,0x3877,
-	INVALC,0x3868,0x3F6A,0x3870,INVALC,0x386F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x385E,0x3863,0x3874,0x387A,INVALC,
-	0x385F,0x386B,0x3871,INVALC,INVALC,INVALC,0x387C,0x3875,
-	0x3878,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3F51,
-	0x3F45,INVALC,0x3F62,0x3F6B,0x3F6E,INVALC,0x3F4D,0x3F66,
-	0x3F4E,0x3F5C,INVALC,0x3F58,INVALC,INVALC,0x3F59,0x3F42,
-	INVALC,0x3F67,INVALC,INVALC,INVALC,0x3F64,0x3F5A,0x3F70,
-	0x3F55,0x466D,INVALC,0x3F73,INVALC,0x3F53,0x3F5F,INVALC,
-	INVALC,0x3F57,0x3F71,0x3F50,0x3F49,0x3F54,INVALC,0x3F48,
-	0x3F46,INVALC,0x3F68,0x3F4F,0x3F6C,INVALC,0x3F6D,INVALC,
-	INVALC,INVALC,INVALC,0x3F63,INVALC,0x3F5B,0x3F4B,INVALC,
-	INVALC,0x3F43,0x3F65,0x3F6F,0x3F4A,INVALC,0x3F74,0x3F56,
-	/* Block 133, Array index 0x3700 */
-	INVALC,0x3F52,INVALC,INVALC,INVALC,INVALC,0x3F61,INVALC,
-	INVALC,0x3F5D,INVALC,INVALC,INVALC,INVALC,INVALC,0x3F5E,
-	0x3F4C,0x3F60,0x3F47,0x3F69,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3F72,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3F44,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x466C,INVALC,0x4724,INVALC,0x4671,INVALC,0x466F,
-	0x465A,INVALC,0x466A,0x467E,0x4666,INVALC,0x467D,0x4664,
-	INVALC,0x4674,0x4665,0x467B,INVALC,INVALC,INVALC,0x464F,
-	0x4657,INVALC,0x4670,0x4668,0x4723,0x466B,INVALC,0x467C,
-	INVALC,INVALC,INVALC,0x466E,0x4676,0x465B,0x4675,INVALC,
-	0x4728,0x4656,0x4677,INVALC,0x4726,INVALC,0x4650,INVALC,
-	INVALC,0x465E,0x465D,INVALC,INVALC,0x4661,0x4663,0x4672,
-	0x4725,INVALC,INVALC,INVALC,INVALC,0x4655,INVALC,0x4659,
-	0x4721,INVALC,INVALC,INVALC,INVALC,INVALC,0x4727,0x4678,
-	0x4673,INVALC,INVALC,0x4660,0x465F,INVALC,0x4651,INVALC,
-	0x4669,0x4652,0x4667,INVALC,INVALC,0x465C,0x4722,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4658,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4654,0x467A,0x4653,
-	INVALC,0x4D5A,INVALC,INVALC,0x4D49,INVALC,INVALC,0x4D33,
-	0x4D51,INVALC,0x4D42,0x4D4C,INVALC,0x4D45,INVALC,0x4D36,
-	0x4D54,0x4D35,0x4D48,INVALC,0x4D34,INVALC,INVALC,0x4D46,
-	0x4D4F,0x4D4D,0x4D41,0x4D3C,0x4D3A,INVALC,0x4D3B,0x4D4E,
-	0x4D59,0x4D43,INVALC,INVALC,0x4D3E,INVALC,0x4D52,INVALC,
-	INVALC,0x4D3D,0x4D37,0x4D47,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D3F,0x4D39,INVALC,INVALC,0x4679,INVALC,0x4D4A,
-	INVALC,INVALC,INVALC,INVALC,0x4D4B,0x4D40,0x4D38,0x4D53,
-	0x4D44,INVALC,0x4D57,INVALC,0x4D56,INVALC,0x4D50,0x4D55,
-	INVALC,INVALC,INVALC,0x4D58,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x535C,
-	0x535D,0x5350,0x534F,0x534B,INVALC,INVALC,INVALC,0x535F,
-	0x535E,0x464E,0x5348,0x534C,0x5346,INVALC,0x5359,0x534A,
-	INVALC,0x5360,0x5343,0x5341,0x534D,0x5357,0x5352,INVALC,
-	/* Block 134, Array index 0x3800 */
-	0x5338,INVALC,0x5356,INVALC,INVALC,INVALC,INVALC,0x4662,
-	0x5344,0x533B,0x533E,0x5364,0x5345,0x533C,0x533A,0x5337,
-	INVALC,INVALC,0x534E,INVALC,INVALC,0x5349,0x5351,INVALC,
-	0x5361,0x5365,INVALC,INVALC,0x5340,0x5354,0x5358,0x533D,
-	0x5362,INVALC,INVALC,INVALC,0x5335,INVALC,0x535B,0x533F,
-	0x5353,0x5339,0x5347,0x5342,INVALC,INVALC,0x5355,0x5366,
-	0x5363,0x535A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5336,INVALC,INVALC,0x5974,INVALC,
-	0x596B,0x596E,INVALC,INVALC,0x5970,0x5965,0x596C,0x5972,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5967,0x5977,INVALC,
-	INVALC,0x5971,INVALC,0x5968,0x5A22,0x597A,0x5964,0x5E72,
-	0x596A,INVALC,INVALC,0x5975,INVALC,0x5A21,INVALC,INVALC,
-	0x597C,0x5969,0x596F,0x5973,0x596D,0x5A23,0x597E,0x597B,
-	INVALC,INVALC,INVALC,0x5966,0x5A24,INVALC,0x5978,INVALC,
-	INVALC,0x5976,INVALC,INVALC,INVALC,0x5979,0x5F21,0x5E6C,
-	0x5E71,0x5E7E,0x5E70,0x5E68,0x5E6D,INVALC,INVALC,INVALC,
-	0x5E61,0x5E79,0x5E7B,0x5E60,INVALC,0x5E7D,0x5E75,INVALC,
-	0x5E7C,0x5E6E,INVALC,0x5E66,0x597D,0x5E76,0x5E73,0x5E62,
-	0x5F23,INVALC,INVALC,INVALC,INVALC,0x5E64,0x5E74,INVALC,
-	0x5F22,0x5E77,0x5E6A,INVALC,INVALC,0x5E78,0x5E6B,0x5F24,
-	0x5E65,0x5E6F,0x5E7A,0x5E67,0x5E69,INVALC,INVALC,0x5E63,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x627D,INVALC,0x6273,0x626E,0x6274,0x627E,0x6324,
-	0x6323,INVALC,INVALC,INVALC,INVALC,0x6275,0x6325,0x6278,
-	0x6270,INVALC,0x6272,0x6271,0x6277,0x627C,0x626F,0x6276,
-	0x627B,INVALC,INVALC,0x6279,INVALC,INVALC,0x627A,INVALC,
-	INVALC,0x6660,0x6321,INVALC,INVALC,INVALC,INVALC,0x6658,
-	0x665C,0x6654,0x6657,INVALC,0x665F,INVALC,0x6664,0x665D,
-	INVALC,0x6655,0x6665,0x665E,INVALC,INVALC,0x6662,INVALC,
-	0x6656,INVALC,INVALC,0x6651,0x6659,0x6653,INVALC,0x6663,
-	0x6661,0x6652,0x665A,INVALC,INVALC,INVALC,0x696A,INVALC,
-	0x665B,INVALC,INVALC,INVALC,INVALC,0x696F,0x6967,0x6965,
-	/* Block 135, Array index 0x3900 */
-	0x6969,0x6966,INVALC,INVALC,0x696B,0x696D,INVALC,INVALC,
-	INVALC,0x696C,INVALC,INVALC,0x696E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6C21,0x6C27,INVALC,0x6968,0x6C26,INVALC,0x6C2D,0x6C24,
-	0x6C2B,0x6C2A,0x6964,0x6C25,0x6322,0x6C2E,0x6C23,0x6C28,
-	INVALC,0x6C2C,0x6C22,INVALC,0x6D77,INVALC,0x6C29,INVALC,
-	INVALC,0x6F43,0x6D78,0x6D76,0x6D74,0x6D75,0x6D79,INVALC,
-	INVALC,0x6F41,0x6F3F,0x6F44,0x6F42,INVALC,0x6F45,INVALC,
-	0x6F40,INVALC,INVALC,0x704A,INVALC,INVALC,0x7134,0x7135,
-	0x7136,INVALC,INVALC,0x7235,0x722D,0x226F,INVALC,INVALC,
-	INVALC,INVALC,0x325A,0x3259,INVALC,INVALC,0x3921,INVALC,
-	INVALC,0x387E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D5B,0x5367,0x5A25,0x5A27,0x5A26,INVALC,INVALC,
-	0x5F25,0x6326,0x7173,INVALC,INVALC,0x2869,0x286A,0x2868,
-	0x2867,INVALC,INVALC,0x2D4A,0x2D48,INVALC,INVALC,0x2D47,
-	INVALC,INVALC,INVALC,INVALC,0x2D49,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3266,0x3263,0x3261,
-	INVALC,INVALC,INVALC,0x3264,INVALC,0x325E,0x326D,INVALC,
-	0x326F,0x325F,INVALC,INVALC,0x3270,0x326B,0x325D,0x3262,
-	0x326C,0x3268,0x3265,INVALC,INVALC,0x326E,0x3260,INVALC,
-	INVALC,0x3269,0x325B,INVALC,INVALC,0x3267,INVALC,0x326A,
-	0x325C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3928,INVALC,INVALC,0x392B,0x392E,INVALC,INVALC,0x3923,
-	0x392C,0x392A,0x3927,0x392F,0x3930,0x3932,0x3933,0x3922,
-	INVALC,0x3925,0x3924,0x3931,INVALC,0x3926,INVALC,INVALC,
-	0x3929,INVALC,INVALC,INVALC,0x392D,INVALC,INVALC,INVALC,
-	INVALC,0x4025,INVALC,0x3F78,INVALC,INVALC,0x472E,0x4023,
-	0x3F75,INVALC,0x3F7A,INVALC,0x3F7E,0x3F7C,INVALC,INVALC,
-	INVALC,INVALC,0x3F76,0x3F79,INVALC,INVALC,0x3F77,INVALC,
-	0x4024,0x4022,0x3F7B,0x3F7D,0x4021,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x472F,0x4735,0x472B,
-	0x4731,INVALC,0x472D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 136, Array index 0x3A00 */
-	INVALC,0x4734,INVALC,INVALC,0x472A,0x4737,INVALC,INVALC,
-	INVALC,0x4733,INVALC,0x4729,0x472C,0x4736,0x4732,INVALC,
-	INVALC,0x4D7B,0x4D70,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D64,0x4D79,0x4D65,INVALC,INVALC,0x4D62,INVALC,
-	0x4D6B,0x4D63,INVALC,0x4D5D,0x4D78,INVALC,0x4D75,0x4D76,
-	0x4D5E,INVALC,0x4D6D,INVALC,0x4D67,0x4D6E,0x4D61,INVALC,
-	0x4D7A,0x4D72,0x4D6C,0x4D5C,INVALC,0x4D73,INVALC,INVALC,
-	0x4D77,INVALC,0x4D71,INVALC,0x4D6F,INVALC,0x4D69,INVALC,
-	0x4D60,0x4D68,0x4D74,0x4D66,INVALC,INVALC,0x4D6A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4730,0x5379,0x5424,
-	0x5378,0x5374,0x5371,INVALC,0x536F,INVALC,0x5368,INVALC,
-	0x536E,INVALC,0x5373,0x5370,0x5422,0x537B,0x5375,0x537A,
-	INVALC,0x5372,0x5427,0x5369,0x536A,0x5423,INVALC,0x5428,
-	INVALC,0x5429,0x5377,0x4D5F,0x537D,0x5376,0x5421,0x537C,
-	INVALC,INVALC,INVALC,0x536D,INVALC,0x5426,INVALC,0x536B,
-	INVALC,0x5A32,0x537E,0x5425,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5A2F,INVALC,INVALC,0x5A39,0x5A35,INVALC,0x5A33,
-	0x5A2E,0x5A3D,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A2A,
-	0x5A36,0x5A37,0x5A2D,0x5A2C,0x5A3A,INVALC,0x5A30,0x5A2B,
-	0x5A31,INVALC,0x5A3C,0x5A29,0x5A3B,0x5A38,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5A34,0x5A28,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5F27,INVALC,0x5F2B,0x5F28,0x5F2F,0x5F35,
-	0x5F2A,INVALC,0x5F3E,INVALC,0x5F38,0x5F2D,0x5F39,0x5F34,
-	0x5F3B,0x5F2C,INVALC,INVALC,0x5F2E,0x5F3C,0x5F26,0x5F3A,
-	INVALC,INVALC,0x5F32,0x5F31,0x5F36,0x5F29,INVALC,INVALC,
-	INVALC,0x5F30,0x5F37,INVALC,0x5F33,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6333,0x6331,INVALC,INVALC,0x6337,
-	0x6335,0x6338,INVALC,0x632A,0x6332,0x633C,0x5F3D,0x632E,
-	INVALC,0x536C,0x6329,0x6336,0x6330,0x632D,0x6328,0x6327,
-	0x633B,INVALC,0x632C,0x632B,INVALC,0x6334,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x632F,0x633A,INVALC,0x6669,0x666A,
-	INVALC,INVALC,0x6667,INVALC,0x666F,INVALC,INVALC,0x6671,
-	/* Block 137, Array index 0x3B00 */
-	0x6666,0x6339,0x6673,0x6668,INVALC,INVALC,0x666E,INVALC,
-	0x6670,0x666B,0x6672,0x666D,0x666C,INVALC,INVALC,INVALC,
-	0x6971,0x6972,INVALC,0x6974,INVALC,INVALC,0x6975,0x6973,
-	INVALC,0x6970,INVALC,0x6C31,0x6C34,0x6C30,INVALC,INVALC,
-	0x6C32,INVALC,INVALC,INVALC,0x6C33,0x6D7E,0x6D7C,INVALC,
-	0x6D7B,0x6C2F,0x6D7D,0x6C35,0x6D7A,INVALC,0x6F48,0x6F26,
-	0x6F46,INVALC,0x6F47,0x6F49,INVALC,0x704D,INVALC,0x704C,
-	0x704B,INVALC,INVALC,INVALC,0x715D,0x7175,0x7174,0x7176,
-	INVALC,0x2D4B,INVALC,0x3271,0x3272,INVALC,INVALC,INVALC,
-	0x4026,INVALC,0x6C36,0x704E,INVALC,INVALC,0x2D4C,INVALC,
-	INVALC,INVALC,0x3934,INVALC,INVALC,0x4028,0x4027,INVALC,
-	INVALC,INVALC,0x542A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2D4D,
-	INVALC,0x2D4F,0x2D4E,INVALC,INVALC,0x3273,INVALC,0x327A,
-	INVALC,0x3278,0x3276,INVALC,0x327D,0x3274,0x3275,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x327E,INVALC,0x327C,0x3279,
-	0x3277,INVALC,INVALC,0x327B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3935,INVALC,INVALC,0x3945,INVALC,0x3947,INVALC,
-	INVALC,0x393B,INVALC,0x3946,INVALC,0x3936,INVALC,0x3942,
-	0x393E,0x3940,0x393A,0x3941,INVALC,INVALC,INVALC,0x393D,
-	INVALC,0x393C,0x3938,INVALC,0x3943,INVALC,INVALC,0x393F,
-	0x3937,INVALC,0x3939,INVALC,0x3944,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4033,INVALC,INVALC,INVALC,0x402F,0x4031,
-	0x402C,0x402B,0x4029,INVALC,0x4030,0x4032,0x402E,INVALC,
-	0x402D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4035,INVALC,0x4739,0x473F,0x473A,0x473B,INVALC,
-	0x4740,INVALC,INVALC,INVALC,INVALC,INVALC,0x4738,0x402A,
-	INVALC,INVALC,0x473E,0x473D,INVALC,INVALC,0x473C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D7D,
-	INVALC,INVALC,INVALC,0x4E2A,0x4E29,INVALC,0x4E24,INVALC,
-	0x4E28,0x4D7E,0x4E21,INVALC,INVALC,INVALC,0x4E26,0x4D7C,
-	INVALC,INVALC,0x4E22,0x4E27,0x4E25,INVALC,0x4E23,INVALC,
-	/* Block 138, Array index 0x3C00 */
-	INVALC,0x4034,INVALC,INVALC,INVALC,0x542B,0x5432,INVALC,
-	INVALC,0x5436,INVALC,0x542E,0x542C,INVALC,0x5435,INVALC,
-	INVALC,0x5434,INVALC,INVALC,0x542D,INVALC,0x5433,0x542F,
-	0x5430,0x5431,INVALC,INVALC,INVALC,INVALC,0x5A3E,0x5A4A,
-	INVALC,INVALC,0x5A45,0x5A47,INVALC,INVALC,0x5A3F,0x5A43,
-	INVALC,0x5A46,INVALC,INVALC,0x5A49,0x5A41,0x5A42,0x5A48,
-	0x5A40,0x5A44,INVALC,0x5F40,INVALC,0x5F3F,INVALC,0x5F45,
-	INVALC,INVALC,INVALC,INVALC,0x5F41,INVALC,0x5F42,INVALC,
-	INVALC,0x5F43,0x5F46,INVALC,INVALC,INVALC,0x6341,INVALC,
-	INVALC,0x6344,INVALC,0x633E,0x6340,INVALC,INVALC,0x633F,
-	0x6342,0x6343,0x5F44,0x633D,INVALC,INVALC,INVALC,0x6677,
-	0x667A,0x667C,0x6675,0x6676,0x6679,0x667B,INVALC,INVALC,
-	INVALC,0x6678,0x6674,0x6976,INVALC,INVALC,0x6977,INVALC,
-	INVALC,0x6C38,INVALC,0x6C3A,INVALC,0x6C37,0x6C39,INVALC,
-	INVALC,0x6E21,INVALC,0x6F4C,0x6F4B,INVALC,0x6F4A,INVALC,
-	INVALC,0x7137,0x7138,0x713A,0x7139,INVALC,0x2270,INVALC,
-	INVALC,INVALC,0x3948,INVALC,INVALC,0x4741,INVALC,INVALC,
-	0x667D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4036,INVALC,0x4038,
-	0x4037,INVALC,INVALC,0x4742,INVALC,0x4E2B,0x4E2E,0x4E2D,
-	INVALC,0x4E2C,0x5437,0x5439,0x5438,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F47,0x5F49,0x5F48,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6721,0x667E,
-	INVALC,0x6978,INVALC,INVALC,INVALC,INVALC,0x6E23,0x6E22,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2D50,INVALC,0x394B,0x3949,INVALC,
-	INVALC,0x394A,0x403A,0x403B,0x4749,0x4039,INVALC,0x4743,
-	0x4747,0x4746,0x4748,INVALC,0x4745,0x4744,0x474A,INVALC,
-	0x4E31,0x4E2F,INVALC,0x4E30,0x543C,0x543A,INVALC,INVALC,
-	0x543B,0x5A4B,0x5F4A,0x5F4B,INVALC,INVALC,0x6722,0x6979,
-	INVALC,INVALC,0x6C3B,0x6E24,INVALC,INVALC,0x6F4D,0x713B,
-	/* Block 139, Array index 0x3D00 */
-	INVALC,INVALC,INVALC,INVALC,0x2D51,INVALC,INVALC,0x2D52,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3321,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x394F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x394D,
-	INVALC,INVALC,INVALC,INVALC,0x394E,INVALC,INVALC,INVALC,
-	0x394C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x403E,INVALC,INVALC,INVALC,INVALC,INVALC,0x474F,
-	0x4040,INVALC,INVALC,INVALC,0x4043,0x4044,INVALC,INVALC,
-	0x4046,INVALC,0x4048,INVALC,0x4049,0x403D,0x403C,0x404A,
-	INVALC,0x4047,0x4045,INVALC,INVALC,INVALC,INVALC,0x4041,
-	0x4042,0x403F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x474E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4756,0x4753,0x474B,0x4750,
-	INVALC,INVALC,0x4757,INVALC,INVALC,INVALC,INVALC,0x474D,
-	INVALC,0x4755,0x4751,0x4754,0x4752,INVALC,0x474C,INVALC,
-	INVALC,INVALC,INVALC,0x4E34,INVALC,INVALC,INVALC,0x4E36,
-	INVALC,INVALC,0x4E35,INVALC,INVALC,INVALC,0x4E37,INVALC,
-	INVALC,0x4E33,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E32,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x543F,INVALC,0x544B,0x5444,INVALC,0x544C,0x5446,INVALC,
-	0x5447,INVALC,INVALC,0x544A,INVALC,0x5448,0x543E,INVALC,
-	0x5A56,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x543D,
-	INVALC,0x5441,INVALC,0x5440,0x5442,0x5443,INVALC,0x5445,
-	0x5449,0x544D,INVALC,INVALC,INVALC,0x5A51,0x5A57,0x5A54,
-	0x5A4C,0x5A58,0x5A4D,INVALC,0x5A53,INVALC,INVALC,INVALC,
-	0x5A59,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A5B,
-	0x5A55,INVALC,0x5A4E,INVALC,0x5A4F,0x5A50,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5A5C,INVALC,INVALC,INVALC,0x5A5A,
-	/* Block 140, Array index 0x3E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F50,0x5F59,0x5F56,
-	0x5F58,INVALC,INVALC,0x5F51,INVALC,0x5F57,INVALC,0x5F53,
-	INVALC,0x5F4F,0x5F54,0x5F5B,0x5A52,0x5F55,0x5F4E,INVALC,
-	0x5F4D,INVALC,0x5F5C,INVALC,0x5F5A,INVALC,0x5F4C,INVALC,
-	INVALC,INVALC,0x5F52,0x6347,0x6355,0x6350,0x6352,0x6346,
-	INVALC,INVALC,0x6345,INVALC,INVALC,INVALC,0x6354,0x634C,
-	0x6349,0x634F,INVALC,0x6348,INVALC,0x634A,0x6353,0x6351,
-	INVALC,INVALC,0x6358,0x6356,0x634D,0x6357,0x634E,INVALC,
-	0x6726,INVALC,0x672D,INVALC,INVALC,0x6C3E,INVALC,0x634B,
-	0x6724,INVALC,0x6725,0x672A,INVALC,INVALC,INVALC,INVALC,
-	0x6723,0x672C,0x672E,0x6727,0x6729,0x672B,0x6728,0x672F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x697C,INVALC,INVALC,
-	0x697A,INVALC,INVALC,0x697E,INVALC,0x6A21,INVALC,0x6A22,
-	0x697D,INVALC,0x697B,INVALC,INVALC,0x6A23,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6C3D,0x6C3C,0x6C3F,0x6C40,INVALC,INVALC,0x6E25,0x6E2A,
-	INVALC,INVALC,0x6E27,INVALC,0x6E26,0x6E29,0x6E28,INVALC,
-	0x6F51,INVALC,INVALC,0x6F50,0x6F4E,INVALC,0x6F4F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x704F,0x7050,INVALC,INVALC,
-	0x713C,0x713D,INVALC,INVALC,INVALC,INVALC,0x7177,0x7236,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 141, Array index 0x3F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3950,INVALC,0x3951,0x4758,0x4E38,0x544E,INVALC,
-	INVALC,INVALC,0x6359,0x6730,INVALC,0x6F52,INVALC,0x3322,
-	INVALC,INVALC,0x475A,0x4759,INVALC,0x544F,INVALC,0x5F5D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x286B,0x3323,
-	INVALC,INVALC,INVALC,INVALC,0x3952,0x3953,INVALC,0x404B,
-	INVALC,INVALC,INVALC,INVALC,0x475C,0x475B,0x475D,INVALC,
-	0x4E39,0x4E3A,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F61,
-	0x5F5E,0x5F60,0x5F5F,INVALC,INVALC,0x635A,0x6732,0x6731,
-	0x2524,INVALC,INVALC,0x3324,INVALC,0x3954,INVALC,INVALC,
-	0x404D,0x404C,INVALC,INVALC,0x475F,0x4760,0x475E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5450,
-	0x5A5F,0x5A5D,0x5A5E,INVALC,0x5F63,0x5F62,INVALC,0x635D,
-	0x635C,0x635B,0x6733,INVALC,0x7178,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3326,0x3325,0x3955,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4050,INVALC,INVALC,INVALC,INVALC,0x4052,INVALC,INVALC,
-	INVALC,0x4051,0x404E,INVALC,INVALC,INVALC,0x404F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4761,INVALC,INVALC,0x4E3C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E3B,INVALC,0x4E3D,
-	INVALC,0x5453,0x5455,INVALC,INVALC,0x5456,INVALC,0x5452,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5451,INVALC,0x5457,
-	0x5454,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A61,INVALC,
-	0x5A63,0x5A62,INVALC,0x5A64,INVALC,0x5A60,INVALC,INVALC,
-	INVALC,0x5F64,INVALC,INVALC,INVALC,INVALC,0x635E,INVALC,
-	/* Block 142, Array index 0x4000 */
-	0x6361,INVALC,0x6360,INVALC,0x635F,INVALC,0x6734,0x6735,
-	INVALC,0x6736,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6C41,INVALC,INVALC,INVALC,0x6C42,0x6E2B,INVALC,INVALC,
-	INVALC,0x6F53,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4762,0x4763,INVALC,INVALC,0x5A65,INVALC,0x5A66,0x5F65,
-	INVALC,INVALC,0x2D53,INVALC,INVALC,INVALC,0x3327,INVALC,
-	0x3328,0x3958,INVALC,0x3957,INVALC,0x3956,INVALC,INVALC,
-	0x4054,INVALC,INVALC,INVALC,0x4053,INVALC,INVALC,INVALC,
-	INVALC,0x4055,INVALC,INVALC,0x4765,0x4768,0x4766,0x4767,
-	0x476B,0x4764,0x476C,0x4769,0x476A,INVALC,0x4E3E,INVALC,
-	INVALC,INVALC,INVALC,0x545B,0x5459,INVALC,INVALC,INVALC,
-	0x5458,0x545A,INVALC,INVALC,INVALC,0x5A67,INVALC,0x5A68,
-	INVALC,INVALC,0x6738,0x673A,0x6737,0x6739,0x6A24,0x6C43,
-	INVALC,INVALC,0x715E,INVALC,INVALC,0x3329,0x332B,0x332A,
-	INVALC,0x395B,INVALC,INVALC,0x3959,INVALC,INVALC,0x395C,
-	INVALC,0x395D,0x395A,INVALC,INVALC,0x4061,INVALC,0x4059,
-	0x405F,INVALC,INVALC,INVALC,INVALC,0x4058,INVALC,0x405C,
-	0x4772,INVALC,INVALC,0x4057,INVALC,0x405D,0x405A,0x4060,
-	0x4056,0x405E,INVALC,INVALC,0x405B,INVALC,INVALC,INVALC,
-	0x476E,INVALC,0x4775,0x4774,INVALC,INVALC,INVALC,0x4776,
-	INVALC,0x4773,INVALC,0x4778,0x476F,INVALC,0x4771,INVALC,
-	0x476D,0x4770,0x4777,INVALC,0x4779,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E43,0x4E49,0x4E41,
-	/* Block 143, Array index 0x4100 */
-	0x4E4A,INVALC,0x4E40,0x4E45,0x4E4B,0x4E48,0x4E47,0x4E46,
-	INVALC,0x4E3F,0x4E44,INVALC,INVALC,0x4E42,INVALC,INVALC,
-	INVALC,0x5464,0x5469,0x546B,0x5468,0x5461,0x5463,0x546D,
-	0x546A,0x5465,0x546E,0x5462,0x546C,INVALC,INVALC,INVALC,
-	0x545C,INVALC,INVALC,0x545D,0x545F,0x545E,0x5466,0x5467,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5460,INVALC,
-	0x5A72,INVALC,INVALC,0x5A69,INVALC,INVALC,0x5A6E,INVALC,
-	0x5A6B,INVALC,INVALC,INVALC,0x5A6F,0x5A70,0x5A6A,0x5A73,
-	0x5A6C,0x5A71,INVALC,INVALC,INVALC,0x5A6D,INVALC,0x5F6B,
-	INVALC,INVALC,INVALC,INVALC,0x5F6A,0x5F67,0x5F66,INVALC,
-	0x5F69,INVALC,INVALC,0x5F68,0x636F,INVALC,0x6366,0x6365,
-	INVALC,INVALC,0x636B,0x636A,0x6362,0x636D,0x6367,INVALC,
-	0x6364,0x636C,0x6363,INVALC,INVALC,0x6368,INVALC,0x6369,
-	INVALC,0x636E,0x673E,INVALC,INVALC,0x673B,INVALC,0x673F,
-	INVALC,INVALC,INVALC,0x673D,INVALC,INVALC,INVALC,INVALC,
-	0x673C,INVALC,INVALC,0x6740,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6A27,INVALC,0x6A25,INVALC,
-	0x6A26,INVALC,INVALC,INVALC,0x6C45,INVALC,0x6C44,INVALC,
-	0x6E30,INVALC,0x6E2F,INVALC,0x6E2D,0x6E2C,0x6E31,0x6E32,
-	0x6F54,INVALC,0x6E2E,INVALC,INVALC,0x7054,0x7051,0x7052,
-	0x7053,INVALC,INVALC,0x7140,0x713F,0x713E,0x715F,INVALC,
-	0x722E,0x7179,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5A74,INVALC,INVALC,
-	INVALC,INVALC,0x6741,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x717A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x332C,INVALC,0x332D,INVALC,INVALC,INVALC,0x3962,
-	0x395E,INVALC,INVALC,INVALC,0x3961,0x3960,0x395F,INVALC,
-	0x3963,0x3964,INVALC,INVALC,INVALC,0x4068,0x4066,0x406A,
-	0x406B,0x4071,INVALC,0x406D,0x406F,INVALC,0x4067,0x4062,
-	INVALC,0x406E,INVALC,INVALC,0x4070,0x4069,0x406C,0x4063,
-	INVALC,0x4065,0x4064,INVALC,INVALC,INVALC,INVALC,0x477B,
-	/* Block 144, Array index 0x4200 */
-	0x477D,0x477C,0x4823,INVALC,INVALC,0x477E,0x477A,0x4821,
-	0x4822,INVALC,INVALC,0x4824,INVALC,0x4E4F,0x4E4E,INVALC,
-	0x4E4C,0x4E4D,INVALC,INVALC,INVALC,INVALC,0x5475,0x5476,
-	0x5471,INVALC,0x5472,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5473,INVALC,INVALC,0x5474,0x5470,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x546F,INVALC,0x5A76,INVALC,
-	INVALC,INVALC,0x5A78,INVALC,0x5A7B,0x5A77,0x5A75,0x5A7A,
-	INVALC,0x5A79,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F6D,INVALC,INVALC,0x5F6C,INVALC,INVALC,0x6370,0x6371,
-	0x6372,INVALC,INVALC,0x6373,INVALC,INVALC,INVALC,0x6744,
-	0x6745,0x6743,0x6742,0x6746,INVALC,0x6A2B,0x6A29,0x6A2A,
-	0x6A2C,0x6A28,0x6A2D,0x6C47,INVALC,0x6C48,0x6C46,INVALC,
-	0x6E33,INVALC,0x6E34,0x6F56,0x6F55,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6747,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2526,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2525,INVALC,0x286D,INVALC,0x286F,INVALC,INVALC,
-	INVALC,INVALC,0x286C,0x286E,INVALC,0x2871,0x2870,0x2872,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2D57,0x2D55,INVALC,0x2D54,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2D56,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x332F,0x3335,INVALC,
-	INVALC,INVALC,INVALC,0x3332,0x3334,INVALC,0x332E,0x3331,
-	/* Block 145, Array index 0x4300 */
-	INVALC,INVALC,0x3330,INVALC,0x3333,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3966,0x3969,INVALC,INVALC,INVALC,
-	INVALC,0x3967,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3968,INVALC,INVALC,INVALC,
-	INVALC,0x396A,INVALC,INVALC,0x3965,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4072,INVALC,0x4074,
-	INVALC,INVALC,INVALC,INVALC,0x4073,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4829,INVALC,0x4826,
-	INVALC,INVALC,INVALC,INVALC,0x4827,INVALC,INVALC,INVALC,
-	INVALC,0x4828,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4825,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x547A,
-	INVALC,INVALC,INVALC,0x547B,INVALC,INVALC,INVALC,0x5479,
-	0x5478,INVALC,INVALC,0x5477,INVALC,INVALC,0x5A7C,INVALC,
-	INVALC,0x5A7D,INVALC,0x5A7E,INVALC,INVALC,0x5F6F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F6E,0x5B21,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A2E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2275,INVALC,INVALC,0x2272,
-	0x2273,0x2271,INVALC,0x2274,INVALC,INVALC,0x252A,0x2527,
-	0x252C,0x2528,INVALC,INVALC,INVALC,0x2529,INVALC,0x252B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2875,
-	0x2877,INVALC,0x2873,0x2876,0x2874,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2D59,0x2D5D,0x2D5A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2D5C,INVALC,0x2D5E,
-	0x2D60,INVALC,INVALC,0x2D5F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3971,0x2D5B,0x3336,0x333F,
-	0x333D,0x3338,0x3339,0x333E,0x3340,INVALC,INVALC,0x333B,
-	0x3337,INVALC,INVALC,0x333A,0x3341,0x333C,INVALC,INVALC,
-	INVALC,0x3974,0x396C,0x3972,0x3973,INVALC,INVALC,0x396B,
-	0x396D,0x2D58,0x396F,0x3970,0x396E,INVALC,INVALC,INVALC,
-	INVALC,0x407B,0x5B22,0x407C,0x4079,INVALC,INVALC,0x4078,
-	/* Block 146, Array index 0x4400 */
-	0x407E,0x407D,INVALC,0x4123,0x4077,0x4122,0x4075,0x4121,
-	0x407A,INVALC,INVALC,0x4830,INVALC,0x482B,0x4831,0x482C,
-	0x482A,0x482D,INVALC,INVALC,0x482F,INVALC,0x482E,INVALC,
-	INVALC,INVALC,0x4E56,0x4E59,0x4E51,0x4E55,INVALC,0x4E54,
-	0x4E52,0x4E58,0x4E53,0x4E50,0x4E57,INVALC,0x5523,INVALC,
-	0x6374,0x547E,0x5521,0x547D,0x4076,INVALC,0x5524,0x547C,
-	INVALC,INVALC,0x5522,0x5B23,INVALC,0x5B24,0x5B25,INVALC,
-	0x5F70,INVALC,0x6375,0x6376,INVALC,INVALC,0x6377,0x6749,
-	0x6748,0x6A30,INVALC,0x6A2F,0x6C4A,0x6C4B,0x6C49,0x6E35,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3343,0x3344,
-	0x3342,INVALC,INVALC,0x3978,INVALC,0x3979,0x3975,INVALC,
-	0x3976,INVALC,0x3977,INVALC,INVALC,INVALC,INVALC,0x4126,
-	0x4128,0x4124,0x4127,INVALC,0x4125,INVALC,INVALC,INVALC,
-	0x4279,INVALC,INVALC,INVALC,INVALC,INVALC,0x4832,0x4833,
-	INVALC,INVALC,0x4E5B,0x4E5D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E5C,0x4E5A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x552B,0x5528,0x5529,INVALC,0x552A,0x5525,0x5526,INVALC,
-	INVALC,INVALC,0x5527,INVALC,INVALC,0x5B29,INVALC,0x5B2A,
-	0x5B27,0x5B28,INVALC,0x5B26,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F74,0x5F71,0x5F73,INVALC,0x5F77,INVALC,0x5F75,
-	0x5F78,0x5F76,0x5F72,INVALC,INVALC,0x6379,INVALC,0x637A,
-	0x6378,INVALC,0x637C,INVALC,INVALC,0x674B,INVALC,0x637B,
-	0x674A,INVALC,0x6A33,0x6A34,INVALC,0x6A32,INVALC,0x6A31,
-	INVALC,0x6C4C,INVALC,INVALC,0x6F57,0x7056,0x7055,INVALC,
-	INVALC,INVALC,0x7057,0x7160,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2D62,0x2D61,0x3345,INVALC,INVALC,
-	INVALC,INVALC,0x3347,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3346,INVALC,0x3A21,INVALC,INVALC,INVALC,
-	0x3A26,INVALC,0x3A23,0x3A24,0x397A,INVALC,0x3A27,INVALC,
-	INVALC,0x397C,INVALC,0x397D,0x397B,INVALC,INVALC,0x3A25,
-	0x397E,0x3A22,INVALC,INVALC,INVALC,0x4134,INVALC,0x4133,
-	/* Block 147, Array index 0x4500 */
-	0x4131,0x4129,0x4138,0x412C,0x4136,0x413D,0x4135,INVALC,
-	INVALC,INVALC,0x412A,INVALC,0x4130,INVALC,INVALC,0x412F,
-	INVALC,INVALC,0x4132,INVALC,INVALC,INVALC,0x413E,0x413C,
-	INVALC,0x413B,0x412D,INVALC,0x4139,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x413A,0x412B,0x412E,0x4137,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4F22,0x483D,INVALC,
-	0x4836,0x4849,0x4852,0x4839,INVALC,INVALC,0x4846,INVALC,
-	INVALC,INVALC,0x4837,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x483F,INVALC,
-	0x4834,INVALC,0x483E,INVALC,0x4850,INVALC,0x484E,0x4842,
-	0x484C,INVALC,0x4835,0x484F,0x484A,INVALC,0x4851,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x483B,INVALC,
-	0x4843,0x4847,INVALC,0x484B,INVALC,0x483A,0x4838,0x4844,
-	INVALC,INVALC,INVALC,INVALC,0x4841,0x4840,INVALC,0x4845,
-	0x4848,INVALC,0x484D,INVALC,INVALC,INVALC,0x4E60,INVALC,
-	INVALC,0x4E6A,0x4E62,INVALC,INVALC,0x4E73,0x4E7B,0x4E6C,
-	INVALC,INVALC,0x4E70,0x483C,INVALC,INVALC,0x4E77,0x4E7C,
-	0x4E74,INVALC,0x4E76,0x4F21,0x4E78,0x4E66,0x4E6F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4E64,0x4E71,INVALC,0x4E6B,
-	INVALC,0x4E79,0x4E68,0x4E61,INVALC,0x4E7E,INVALC,INVALC,
-	0x4E63,0x4E75,0x4E72,0x4E6D,0x4E5F,0x4E5E,0x4E67,0x4E7A,
-	INVALC,0x4E7D,0x4E65,0x4E69,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x554D,0x5549,0x5531,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x552F,INVALC,0x553B,0x552D,0x552E,INVALC,0x554C,INVALC,
-	0x553E,0x5543,0x553D,0x5B3C,0x5539,0x5541,0x553F,0x5532,
-	0x552C,0x5547,INVALC,0x5548,INVALC,0x5542,INVALC,0x5537,
-	0x5535,0x5530,INVALC,INVALC,INVALC,0x5538,0x5545,0x5534,
-	0x5544,0x554A,INVALC,INVALC,INVALC,INVALC,0x5540,0x5546,
-	0x553C,0x5536,INVALC,INVALC,INVALC,INVALC,0x4E6E,0x553A,
-	INVALC,0x5533,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B41,
-	INVALC,0x5B40,0x5B3E,0x5B50,INVALC,INVALC,0x5B4D,0x5B45,
-	/* Block 148, Array index 0x4600 */
-	0x5B4F,0x5B37,0x5B43,INVALC,INVALC,INVALC,0x5B2F,INVALC,
-	0x5B2D,0x5B4E,INVALC,0x5B4C,0x5B4B,0x5B3B,0x5B3A,0x5B30,
-	INVALC,INVALC,0x5B36,0x5B3F,0x5B4A,INVALC,0x5B51,INVALC,
-	INVALC,INVALC,INVALC,0x5B34,INVALC,0x5B3D,0x5B2C,0x5B2E,
-	INVALC,INVALC,INVALC,0x5B35,0x5B44,0x554B,INVALC,0x5B2B,
-	INVALC,0x5B46,0x5B49,INVALC,INVALC,0x5B39,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5B42,0x5B48,INVALC,INVALC,
-	0x5B32,0x5B47,INVALC,INVALC,0x5B33,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B38,0x5F7E,
-	INVALC,0x6025,INVALC,INVALC,0x602B,INVALC,0x6039,0x6031,
-	0x6026,0x6027,0x6030,INVALC,INVALC,0x602F,0x5F7D,0x602E,
-	0x6022,0x603A,INVALC,INVALC,0x6023,INVALC,0x6036,INVALC,
-	0x6028,0x6035,INVALC,0x6037,0x5F7C,INVALC,INVALC,0x6038,
-	INVALC,INVALC,0x602C,INVALC,INVALC,0x6029,INVALC,INVALC,
-	INVALC,0x6032,INVALC,INVALC,INVALC,INVALC,0x6024,0x6033,
-	INVALC,0x602D,0x5B31,0x6034,0x6021,INVALC,INVALC,INVALC,
-	0x642F,INVALC,INVALC,0x5F7A,INVALC,INVALC,INVALC,INVALC,
-	0x642C,0x6425,INVALC,INVALC,0x637E,0x6430,0x6427,0x602A,
-	INVALC,0x6432,0x6421,INVALC,INVALC,0x642B,INVALC,INVALC,
-	INVALC,0x642D,INVALC,0x6423,INVALC,0x6424,0x6429,0x642E,
-	INVALC,0x5F79,INVALC,0x6437,0x6434,0x6761,0x642A,0x6426,
-	0x6435,0x6756,0x6428,INVALC,INVALC,INVALC,INVALC,0x5F7B,
-	INVALC,0x6431,0x6433,INVALC,0x6436,0x637D,INVALC,0x6422,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x675F,INVALC,0x674F,INVALC,0x675D,INVALC,INVALC,0x674D,
-	INVALC,INVALC,0x6758,INVALC,0x6754,INVALC,0x675E,0x674E,
-	0x6751,INVALC,0x6760,INVALC,0x6759,0x675C,INVALC,INVALC,
-	INVALC,0x6755,0x6750,INVALC,INVALC,INVALC,0x674C,INVALC,
-	INVALC,INVALC,INVALC,0x675B,INVALC,INVALC,0x6757,0x6762,
-	INVALC,INVALC,INVALC,INVALC,0x6753,INVALC,0x675A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A41,0x6A50,0x6A43,
-	0x6A4A,0x6752,0x6A48,0x6A37,0x6A4E,INVALC,0x6A3B,0x6A4D,
-	/* Block 149, Array index 0x4700 */
-	0x6A42,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A52,0x6A44,
-	INVALC,0x6A49,0x6A4C,0x6A35,0x6A4F,0x6A40,0x6A45,0x6A39,
-	0x6A3D,0x6A51,0x6A47,0x6A36,0x6A3A,0x6A3C,0x6A46,INVALC,
-	INVALC,0x6A3F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6A38,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6A3E,0x6C50,0x6C54,INVALC,0x6C56,INVALC,INVALC,INVALC,
-	0x6C52,0x6C58,INVALC,INVALC,INVALC,INVALC,0x6C4F,0x6C55,
-	INVALC,0x6C53,INVALC,0x6C4E,0x6A4B,0x6C51,INVALC,0x6C4D,
-	0x6C57,INVALC,INVALC,INVALC,INVALC,0x6E3C,0x6E3F,0x6E3B,
-	0x6E3D,0x6E3E,0x6E38,0x6E39,0x6E36,INVALC,INVALC,0x6E3A,
-	0x6E37,INVALC,INVALC,INVALC,INVALC,0x6F59,INVALC,0x6F5B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6F5A,0x6F5C,INVALC,
-	INVALC,INVALC,0x6F58,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7059,0x705A,INVALC,0x7058,INVALC,0x7142,0x7141,0x7143,
-	INVALC,0x7144,INVALC,0x7145,0x7161,0x7164,0x7163,INVALC,
-	0x7162,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7230,0x7231,0x722F,0x7237,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 150, Array index 0x4800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3A28,0x413F,0x554E,0x6763,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A29,INVALC,
-	0x3A2A,INVALC,INVALC,INVALC,0x4141,0x4140,INVALC,INVALC,
-	0x4142,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4856,0x4854,INVALC,0x4855,0x4853,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5550,0x554F,INVALC,0x5551,INVALC,
-	0x5552,INVALC,INVALC,INVALC,INVALC,0x5B59,0x5B57,0x6040,
-	INVALC,0x5B55,0x5B56,INVALC,0x5B52,0x5B5A,0x5B54,0x5B58,
-	0x603C,INVALC,INVALC,0x603E,INVALC,0x603F,INVALC,0x603B,
-	INVALC,0x603D,INVALC,INVALC,INVALC,0x5B53,INVALC,INVALC,
-	INVALC,0x643A,0x6438,0x6439,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6764,0x6765,INVALC,INVALC,0x6A53,0x6A55,
-	0x6A54,INVALC,INVALC,0x6C5B,0x6C5A,0x6C59,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 151, Array index 0x4900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2169,INVALC,
-	0x2278,INVALC,0x2276,0x2279,0x2277,INVALC,INVALC,INVALC,
-	0x252E,INVALC,INVALC,INVALC,INVALC,0x2530,INVALC,0x252F,
-	0x252D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2878,0x287B,INVALC,0x287A,0x2879,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x287C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2D67,INVALC,INVALC,INVALC,0x2D68,0x2D64,
-	INVALC,0x2D65,INVALC,0x2D66,0x2D63,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3348,INVALC,INVALC,0x3349,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3A2D,INVALC,0x3A2C,INVALC,0x3A2F,
-	INVALC,0x3A2E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A2B,INVALC,0x4144,INVALC,
-	0x4148,INVALC,INVALC,0x4147,INVALC,INVALC,INVALC,0x4143,
-	0x4145,0x4146,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4859,0x4857,0x4858,INVALC,INVALC,INVALC,0x485A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F23,INVALC,
-	INVALC,0x4F24,0x5554,INVALC,0x5553,INVALC,INVALC,INVALC,
-	INVALC,0x5B5B,INVALC,INVALC,0x6043,INVALC,0x6041,INVALC,
-	0x6042,INVALC,INVALC,0x643B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x334A,INVALC,INVALC,0x3A30,
-	INVALC,INVALC,0x4149,0x414B,INVALC,INVALC,INVALC,INVALC,
-	0x414A,INVALC,INVALC,INVALC,INVALC,INVALC,0x485B,INVALC,
-	INVALC,INVALC,INVALC,0x5555,0x5B5C,INVALC,INVALC,0x643C,
-	0x6440,INVALC,0x643D,INVALC,INVALC,0x6441,INVALC,0x643F,
-	INVALC,0x6766,INVALC,INVALC,INVALC,0x705B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x414D,0x414C,INVALC,INVALC,INVALC,0x485F,INVALC,INVALC,
-	0x485E,INVALC,0x485C,INVALC,INVALC,0x485D,INVALC,0x4F25,
-	/* Block 152, Array index 0x4A00 */
-	INVALC,INVALC,0x5558,INVALC,INVALC,0x5556,INVALC,INVALC,
-	0x5557,INVALC,INVALC,0x5B5D,INVALC,INVALC,INVALC,INVALC,
-	0x5B5F,INVALC,0x5B5E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6046,0x6048,INVALC,INVALC,INVALC,0x6047,INVALC,0x6045,
-	0x6044,INVALC,0x6443,0x6442,INVALC,0x6444,0x676B,INVALC,
-	0x676A,0x6767,INVALC,0x6768,0x6769,INVALC,0x6A56,0x6A57,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6C5C,INVALC,INVALC,
-	INVALC,INVALC,0x6C5D,INVALC,INVALC,INVALC,INVALC,0x6E40,
-	INVALC,INVALC,INVALC,0x705D,INVALC,INVALC,0x705C,0x705E,
-	INVALC,0x7146,INVALC,0x717B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F26,INVALC,0x5559,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3A31,INVALC,0x414E,INVALC,0x4150,INVALC,
-	0x414F,INVALC,0x4863,0x4860,INVALC,INVALC,INVALC,0x4861,
-	0x4862,INVALC,0x4F28,0x4F2D,INVALC,0x4F27,0x4F29,0x4F30,
-	0x4F2B,0x4F2F,0x4F2C,0x4F2A,0x4F2E,INVALC,INVALC,INVALC,
-	0x555C,INVALC,0x555A,INVALC,INVALC,INVALC,0x555B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5B62,INVALC,INVALC,0x5B61,
-	INVALC,0x5B60,0x6049,INVALC,0x604B,0x604D,0x604C,INVALC,
-	INVALC,0x604A,0x644B,INVALC,0x6449,0x644C,INVALC,INVALC,
-	0x6447,INVALC,0x644A,0x6448,0x6445,INVALC,0x6446,INVALC,
-	INVALC,INVALC,INVALC,0x676C,INVALC,INVALC,0x676E,0x676D,
-	INVALC,0x6A58,INVALC,0x6A59,INVALC,INVALC,INVALC,0x6C5E,
-	INVALC,INVALC,INVALC,INVALC,0x6F5D,0x6F5E,INVALC,0x705F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4F32,0x4F31,0x555E,
-	0x555D,INVALC,INVALC,INVALC,0x604F,0x604E,0x644F,0x644D,
-	0x6450,0x644E,INVALC,INVALC,INVALC,0x676F,0x6770,0x6771,
-	INVALC,0x6C5F,INVALC,0x6E41,INVALC,0x7060,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5B63,0x6050,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5B64,INVALC,0x6451,INVALC,INVALC,0x6A5A,0x6A5B,INVALC,
-	/* Block 153, Array index 0x4B00 */
-	0x6F5F,INVALC,INVALC,INVALC,0x3A32,INVALC,INVALC,0x4151,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4865,0x4866,0x4864,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F33,INVALC,
-	INVALC,INVALC,INVALC,0x5565,INVALC,0x5560,0x555F,INVALC,
-	0x5564,INVALC,INVALC,INVALC,INVALC,INVALC,0x5561,0x5566,
-	0x5563,0x5562,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B66,
-	INVALC,INVALC,0x5B67,INVALC,INVALC,0x5B65,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6051,INVALC,0x6056,0x6052,0x6055,INVALC,INVALC,
-	0x5E41,0x6054,0x6053,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6452,0x6453,0x6454,INVALC,INVALC,INVALC,INVALC,0x6775,
-	INVALC,0x6773,INVALC,INVALC,0x6772,0x6774,INVALC,0x6A5F,
-	0x6A5C,INVALC,0x6A5D,0x6A5E,0x6C60,INVALC,INVALC,INVALC,
-	INVALC,0x6E43,0x6E42,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7147,0x717C,0x717D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4152,INVALC,INVALC,0x4867,0x4F34,0x4F35,INVALC,
-	INVALC,INVALC,0x5567,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6455,INVALC,INVALC,0x6778,INVALC,0x6777,0x6779,0x6776,
-	0x6C63,0x6A60,0x6A61,INVALC,INVALC,INVALC,0x6C62,INVALC,
-	INVALC,0x6C61,INVALC,0x6E44,0x717E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x334B,INVALC,0x3A33,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4153,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4868,INVALC,
-	INVALC,0x4869,0x5569,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 154, Array index 0x4C00 */
-	0x4F37,INVALC,0x4F36,INVALC,INVALC,INVALC,INVALC,0x4F38,
-	0x5568,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x556A,INVALC,INVALC,0x556B,0x556E,0x556C,0x556D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B69,
-	INVALC,INVALC,INVALC,INVALC,0x5B68,0x6057,INVALC,0x5B6A,
-	INVALC,0x5B6B,0x605A,0x6058,0x6059,0x605E,INVALC,0x605D,
-	0x6060,0x605F,0x605C,0x605B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6458,INVALC,0x6457,INVALC,INVALC,INVALC,
-	INVALC,0x6456,INVALC,0x677C,INVALC,INVALC,INVALC,0x677B,
-	0x677A,INVALC,INVALC,0x6A66,0x6A65,INVALC,0x6A63,INVALC,
-	0x6A62,INVALC,INVALC,0x6A67,0x6E45,INVALC,0x6C65,INVALC,
-	0x6C64,0x6A64,INVALC,0x6E46,INVALC,INVALC,INVALC,0x7148,
-	INVALC,0x7221,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A34,
-	0x6061,INVALC,INVALC,INVALC,0x4F3A,0x4F39,0x5B6C,INVALC,
-	INVALC,0x6063,INVALC,0x6062,INVALC,INVALC,0x677D,0x677E,
-	INVALC,INVALC,INVALC,0x7222,INVALC,INVALC,INVALC,0x486A,
-	0x486C,INVALC,0x486B,INVALC,INVALC,0x486D,INVALC,INVALC,
-	INVALC,0x4F3C,0x4F3E,0x4F3D,INVALC,0x4F40,INVALC,INVALC,
-	INVALC,INVALC,0x4F3F,0x4F3B,INVALC,INVALC,INVALC,0x4F41,
-	INVALC,0x5575,INVALC,0x5578,0x557A,0x5570,0x5574,0x5571,
-	INVALC,INVALC,INVALC,0x5572,0x5573,INVALC,0x5576,0x5579,
-	0x5577,INVALC,INVALC,INVALC,0x556F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5B72,0x5B70,0x5B6F,INVALC,0x5B75,
-	INVALC,0x5B74,0x5B73,INVALC,0x5B6E,INVALC,0x5B6D,INVALC,
-	0x5B71,INVALC,INVALC,INVALC,0x6066,INVALC,0x606A,0x6067,
-	0x6069,0x6068,0x6065,0x606B,0x606E,0x606C,0x606D,INVALC,
-	/* Block 155, Array index 0x4D00 */
-	INVALC,INVALC,0x6064,0x606F,0x645D,0x6460,0x6462,0x6461,
-	INVALC,0x645B,0x645F,0x645A,INVALC,0x645C,INVALC,0x6459,
-	INVALC,0x645E,INVALC,INVALC,0x682D,0x6822,INVALC,INVALC,
-	INVALC,INVALC,0x6821,0x6826,0x682C,0x6824,0x682B,INVALC,
-	0x6828,INVALC,0x6827,0x682A,0x6825,0x6823,INVALC,0x6829,
-	INVALC,0x6A6E,0x6A6C,INVALC,0x6A6B,0x6A71,0x6A6F,INVALC,
-	INVALC,0x6A6A,0x6A68,INVALC,0x6A69,INVALC,0x6A6D,INVALC,
-	0x6A70,0x6C66,0x6C6C,INVALC,INVALC,0x6C67,INVALC,0x6C6D,
-	INVALC,0x6C6B,0x6C6A,INVALC,0x6C69,INVALC,0x6C68,INVALC,
-	0x6E4C,0x6E4E,0x6E4D,INVALC,0x6E4A,INVALC,0x6E47,0x6E4B,
-	0x6E50,INVALC,0x6E4F,0x6E48,0x6E49,INVALC,0x6F60,INVALC,
-	INVALC,0x6F61,INVALC,INVALC,INVALC,INVALC,0x7061,INVALC,
-	0x7165,INVALC,INVALC,INVALC,0x7223,INVALC,0x7224,0x7225,
-	0x7233,0x7232,INVALC,0x723B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x486F,INVALC,0x486E,INVALC,INVALC,
-	INVALC,0x4F42,INVALC,0x557B,0x5B78,INVALC,INVALC,INVALC,
-	INVALC,0x5B76,INVALC,0x5B79,INVALC,INVALC,0x6070,0x5B77,
-	0x6463,INVALC,0x682E,INVALC,INVALC,INVALC,0x6A74,0x6A72,
-	INVALC,INVALC,0x6A73,INVALC,INVALC,0x6C6E,INVALC,INVALC,
-	0x6E51,INVALC,INVALC,INVALC,INVALC,0x7062,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6464,INVALC,INVALC,0x334C,
-	INVALC,INVALC,INVALC,0x4F43,INVALC,INVALC,INVALC,0x4F44,
-	INVALC,INVALC,INVALC,0x557D,0x557C,INVALC,INVALC,INVALC,
-	INVALC,0x5622,0x5621,0x557E,INVALC,INVALC,0x5B7A,0x5B7D,
-	INVALC,0x5B7C,0x5B7B,INVALC,0x6074,0x6072,0x6071,INVALC,
-	/* Block 156, Array index 0x4E00 */
-	INVALC,0x6073,INVALC,INVALC,0x6466,0x6467,INVALC,INVALC,
-	0x6465,INVALC,0x6830,0x682F,0x6832,INVALC,0x6831,INVALC,
-	0x6A75,0x6A77,0x6A76,INVALC,INVALC,0x6C6F,0x6C72,0x6C70,
-	0x6C71,0x6E52,INVALC,INVALC,INVALC,INVALC,0x6F62,0x6F63,
-	0x6F64,INVALC,INVALC,INVALC,0x7226,INVALC,INVALC,INVALC,
-	INVALC,0x6468,INVALC,0x6E53,INVALC,INVALC,0x7166,0x334D,
-	INVALC,INVALC,INVALC,0x5B7E,INVALC,0x6469,INVALC,0x6833,
-	INVALC,INVALC,0x6C73,0x6E54,INVALC,INVALC,0x4F45,0x4F46,
-	INVALC,INVALC,INVALC,0x5624,INVALC,INVALC,0x5623,INVALC,
-	0x6075,INVALC,0x646A,0x646C,0x646B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6C74,INVALC,INVALC,0x6E56,0x6E55,INVALC,
-	INVALC,0x7063,INVALC,0x4870,INVALC,INVALC,INVALC,0x4F49,
-	0x4F47,0x4F48,INVALC,INVALC,0x562D,INVALC,0x5628,0x5625,
-	0x562C,INVALC,INVALC,INVALC,0x562E,INVALC,INVALC,INVALC,
-	0x562B,0x5627,INVALC,INVALC,0x5626,0x562A,0x5629,INVALC,
-	INVALC,INVALC,0x5C2B,0x5C26,0x5C24,0x5C2D,0x5C25,INVALC,
-	0x5C21,INVALC,0x5C27,INVALC,INVALC,0x5C22,0x607E,0x5C23,
-	0x5C2E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5C2A,INVALC,0x5C29,0x5C28,INVALC,0x5C2C,INVALC,INVALC,
-	INVALC,INVALC,0x6076,0x6079,INVALC,INVALC,0x6078,INVALC,
-	0x6122,0x607B,0x6121,INVALC,0x607D,0x607C,0x607A,INVALC,
-	0x6077,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6123,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6472,0x6475,INVALC,
-	0x6473,0x6477,INVALC,INVALC,INVALC,0x6478,INVALC,0x6470,
-	INVALC,0x6471,INVALC,0x646F,0x6476,INVALC,0x646E,0x646D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6474,0x683C,0x6842,INVALC,0x683D,
-	INVALC,0x6840,0x6844,INVALC,0x683F,INVALC,0x6837,INVALC,
-	0x6836,0x6843,0x683A,INVALC,0x6838,0x6841,0x6839,INVALC,
-	INVALC,INVALC,0x6834,0x6835,0x683E,INVALC,INVALC,INVALC,
-	0x683B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A7A,
-	0x6A7D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 157, Array index 0x4F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A7B,0x6B23,0x6B21,
-	0x6A79,0x6B26,INVALC,0x6A78,INVALC,INVALC,0x6B22,INVALC,
-	INVALC,INVALC,0x6A7C,INVALC,0x6B25,INVALC,INVALC,0x6B24,
-	INVALC,INVALC,INVALC,INVALC,0x6C77,0x6C76,INVALC,INVALC,
-	INVALC,0x6C7D,INVALC,0x6C79,0x6C7C,INVALC,INVALC,INVALC,
-	0x6C7A,0x6C7B,INVALC,0x6C75,0x6C78,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6E61,0x6E5C,0x6E60,INVALC,0x6E63,0x6E5F,
-	INVALC,0x6E5B,INVALC,INVALC,0x6E5E,0x6E62,INVALC,0x6E59,
-	0x6A7E,0x6E5D,INVALC,INVALC,0x6E5A,INVALC,0x6E57,INVALC,
-	0x6E58,INVALC,0x6F68,0x6F6A,0x6F6D,0x6F69,0x6F6E,INVALC,
-	0x6F67,INVALC,0x6F65,INVALC,INVALC,0x6F6B,INVALC,INVALC,
-	0x6F66,0x6F6C,INVALC,INVALC,INVALC,INVALC,0x7068,INVALC,
-	0x7069,INVALC,0x7067,0x7064,INVALC,INVALC,0x7066,0x7065,
-	0x7149,INVALC,INVALC,INVALC,INVALC,0x714B,0x714A,INVALC,
-	INVALC,0x7169,INVALC,0x7168,0x7167,0x716A,INVALC,INVALC,
-	INVALC,0x7238,0x723C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4154,0x4873,
-	INVALC,INVALC,0x4871,INVALC,INVALC,0x4872,INVALC,INVALC,
-	INVALC,0x4F4A,0x4F4B,INVALC,INVALC,0x4F4C,INVALC,0x5633,
-	INVALC,0x5636,0x5630,0x5637,0x562F,0x5631,INVALC,0x5632,
-	/* Block 158, Array index 0x5000 */
-	0x5635,INVALC,INVALC,INVALC,0x563A,0x5639,INVALC,0x5634,
-	0x5638,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5C38,INVALC,INVALC,INVALC,0x5C33,INVALC,INVALC,0x5C30,
-	0x5C36,0x5C39,INVALC,INVALC,INVALC,0x5C35,0x5C32,0x5C3A,
-	0x5C31,INVALC,0x5C37,INVALC,INVALC,0x5C2F,INVALC,INVALC,
-	INVALC,0x5C34,INVALC,INVALC,INVALC,0x6135,0x6128,0x6129,
-	0x612C,0x612A,INVALC,0x6124,INVALC,INVALC,0x6127,0x6131,
-	0x612B,INVALC,INVALC,INVALC,INVALC,0x6133,0x6130,INVALC,
-	0x6132,0x6125,0x612E,0x612F,INVALC,0x612D,INVALC,INVALC,
-	INVALC,INVALC,0x647C,0x647E,0x6523,INVALC,INVALC,0x647B,
-	INVALC,INVALC,0x6525,0x647A,0x6526,INVALC,0x6522,0x6524,
-	0x6528,0x6521,0x6529,0x647D,0x6479,INVALC,INVALC,0x6527,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6126,
-	0x685E,0x6855,INVALC,0x6851,INVALC,INVALC,INVALC,0x685A,
-	0x6854,0x684A,INVALC,0x6857,0x6852,0x6853,INVALC,0x6845,
-	0x684C,0x685B,INVALC,0x6858,INVALC,0x6850,INVALC,0x685C,
-	0x684B,0x6846,0x6859,INVALC,0x6848,0x6856,0x684D,0x685D,
-	0x6849,INVALC,0x6847,0x684E,0x684F,INVALC,INVALC,INVALC,
-	0x6B2D,INVALC,0x6B2B,INVALC,0x6B30,INVALC,0x6B3C,0x6B33,
-	0x6B2C,0x6B28,0x6B35,0x6B2E,0x6B31,0x6B2A,0x6B38,0x6B27,
-	0x6B2F,0x6B34,0x6B36,0x6B39,0x6B29,INVALC,0x6B3D,0x6B3E,
-	0x6B37,0x6B3B,0x6B32,INVALC,0x6D2F,0x6D32,INVALC,INVALC,
-	INVALC,0x6D31,0x6D36,0x6D34,INVALC,0x6D2B,0x6D21,0x6C7E,
-	INVALC,0x6D2D,0x6D2E,0x6D2A,0x6D22,INVALC,0x6D27,0x6B3A,
-	INVALC,0x6D23,INVALC,0x6D29,INVALC,0x6D28,INVALC,0x6D24,
-	0x6D30,INVALC,0x6D25,0x6E68,0x6D33,0x6D35,0x6D2C,0x6D26,
-	0x6E69,0x6E6B,0x6E65,INVALC,INVALC,0x6E72,0x6E70,INVALC,
-	0x6E6F,0x6E6E,0x6E67,0x6E64,0x6E6A,0x6E73,0x6E66,0x6E6C,
-	INVALC,0x6F77,0x6F7C,0x6F72,0x6F75,INVALC,0x6F79,INVALC,
-	0x7022,0x6E6D,INVALC,0x6F73,0x6F7D,0x7023,0x6F78,0x6F71,
-	0x6F7B,INVALC,0x6F7A,0x7021,0x6F7E,0x6E71,0x6F76,0x6F70,
-	0x6F74,INVALC,INVALC,0x6F6F,INVALC,0x7074,0x706B,0x7073,
-	/* Block 159, Array index 0x5100 */
-	0x7070,0x7071,0x706A,0x706D,0x7075,0x706F,0x706E,0x706C,
-	INVALC,0x7072,INVALC,0x714C,INVALC,0x714D,INVALC,0x714F,
-	0x714E,0x7151,0x7150,0x716C,0x716B,0x7227,INVALC,0x7228,
-	INVALC,0x7234,INVALC,INVALC,INVALC,0x723D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6D37,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4874,INVALC,INVALC,0x563B,INVALC,INVALC,0x5C3C,0x5C3D,
-	0x5C3B,0x6137,0x6136,INVALC,0x652B,0x6138,0x652A,INVALC,
-	INVALC,0x6860,INVALC,INVALC,0x685F,INVALC,INVALC,INVALC,
-	INVALC,0x6B3F,0x6B41,0x6B40,0x6D38,INVALC,INVALC,INVALC,
-	0x7076,0x7152,INVALC,INVALC,0x7241,INVALC,INVALC,0x4F4D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5C3F,0x5C3E,INVALC,
-	0x6139,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E74,0x7239,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6861,INVALC,0x7024,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x613A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7025,INVALC,INVALC,0x563C,INVALC,0x5C40,0x5C41,INVALC,
-	INVALC,INVALC,0x613B,INVALC,INVALC,INVALC,INVALC,0x652C,
-	INVALC,INVALC,INVALC,INVALC,0x6B43,0x6B42,0x6B45,0x6B44,
-	INVALC,INVALC,INVALC,0x6D39,INVALC,0x6D3B,0x6D3A,INVALC,
-	0x6E75,INVALC,0x7026,0x7027,INVALC,0x7153,0x716D,INVALC,
-	INVALC,0x4155,0x5C42,0x613C,0x6862,0x4875,INVALC,0x613D,
-	/* Block 160, Array index 0x5200 */
-	0x652E,0x652D,INVALC,INVALC,INVALC,INVALC,0x7028,INVALC,
-	INVALC,0x7154,0x716E,INVALC,INVALC,INVALC,INVALC,0x563D,
-	0x563E,INVALC,0x5C43,INVALC,INVALC,INVALC,0x652F,INVALC,
-	0x6D3D,INVALC,0x6D3E,0x6D3C,0x7029,INVALC,0x7077,INVALC,
-	INVALC,INVALC,0x6140,0x613F,0x613E,0x6530,INVALC,INVALC,
-	0x6534,0x6533,0x6532,0x6531,INVALC,0x6863,0x6B47,INVALC,
-	0x6B46,0x6D3F,0x6E78,0x6E77,INVALC,0x6E76,0x702C,0x702B,
-	0x702A,INVALC,INVALC,INVALC,INVALC,0x5C44,INVALC,INVALC,
-	0x6864,0x6865,0x6E79,0x702D,INVALC,INVALC,0x7078,0x7155,
-	0x7229,0x7243,INVALC,INVALC,0x6535,0x6866,0x6D40,0x702E,
-	INVALC,INVALC,INVALC,INVALC,0x6141,0x6536,0x6867,0x6868,
-	0x6869,0x6B4C,INVALC,0x6B48,INVALC,0x6B4B,0x6B4A,INVALC,
-	0x6B49,INVALC,INVALC,INVALC,0x6D42,0x6D41,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6E7A,INVALC,INVALC,0x7031,0x7032,
-	0x7030,0x702F,INVALC,INVALC,0x7079,0x707A,0x707B,INVALC,
-	0x7156,0x7159,0x7158,0x7157,INVALC,INVALC,0x7242,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B4D,0x6D43,INVALC,INVALC,0x6E7B,INVALC,INVALC,
-	0x7244,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6142,INVALC,0x6E7C,INVALC,0x716F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_CNS11643_PLANE2 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> cns11643_plane2 size-optimized table (27768 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_size_cns11643_plane2[] =
-{
-	0x027E, /* Ranges number */
-	0x0B48, /* Unranged codes number */
-	0x1FAC, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x4F12, 0x4F14, 0x077D,
-	/* Array index: 0x0006 */ 0x4F74, 0x4F89, 0x0780,
-	/* Array index: 0x0009 */ 0x4F94, 0x4F9E, 0x0796,
-	/* Array index: 0x000C */ 0x4FB9, 0x4FBB, 0x07A1,
-	/* Array index: 0x000F */ 0x4FF4, 0x4FF7, 0x07A4,
-	/* Array index: 0x0012 */ 0x502F, 0x5037, 0x07A8,
-	/* Array index: 0x0015 */ 0x505B, 0x506B, 0x07B1,
-	/* Array index: 0x0018 */ 0x509B, 0x509E, 0x07C2,
-	/* Array index: 0x001B */ 0x50C6, 0x50CB, 0x07C6,
-	/* Array index: 0x001E */ 0x50FD, 0x50FF, 0x07CC,
-	/* Array index: 0x0021 */ 0x5106, 0x510C, 0x07CF,
-	/* Array index: 0x0024 */ 0x5122, 0x5126, 0x07D6,
-	/* Array index: 0x0027 */ 0x512D, 0x5135, 0x07DB,
-	/* Array index: 0x002A */ 0x5231, 0x5235, 0x07E4,
-	/* Array index: 0x002D */ 0x525E, 0x5262, 0x07E9,
-	/* Array index: 0x0030 */ 0x526B, 0x526E, 0x07EE,
-	/* Array index: 0x0033 */ 0x5278, 0x527C, 0x07F2,
-	/* Array index: 0x0036 */ 0x5296, 0x5299, 0x07F7,
-	/* Array index: 0x0039 */ 0x5309, 0x530B, 0x07FB,
-	/* Array index: 0x003C */ 0x5394, 0x5399, 0x07FE,
-	/* Array index: 0x003F */ 0x5460, 0x5467, 0x0804,
-	/* Array index: 0x0042 */ 0x547E, 0x5482, 0x080C,
-	/* Array index: 0x0045 */ 0x54A0, 0x54A2, 0x0811,
-	/* Array index: 0x0048 */ 0x5503, 0x5505, 0x0814,
-	/* Array index: 0x004B */ 0x5508, 0x5512, 0x0817,
-	/* Array index: 0x004E */ 0x5532, 0x5536, 0x0822,
-	/* Array index: 0x0051 */ 0x554D, 0x5552, 0x0827,
-	/* Array index: 0x0054 */ 0x5575, 0x5577, 0x082D,
-	/* Array index: 0x0057 */ 0x558C, 0x5595, 0x0830,
-	/* Array index: 0x005A */ 0x55A1, 0x55A8, 0x083A,
-	/* Array index: 0x005D */ 0x55BF, 0x55C4, 0x0842,
-	/* Array index: 0x0060 */ 0x55C8, 0x55D6, 0x0848,
-	/* Array index: 0x0063 */ 0x563D, 0x564C, 0x0857,
-	/* Array index: 0x0066 */ 0x567E, 0x5686, 0x0867,
-	/* Array index: 0x0069 */ 0x5697, 0x569D, 0x0870,
-	/* Array index: 0x006C */ 0x56A6, 0x56AD, 0x0877,
-	/* Array index: 0x006F */ 0x571A, 0x5723, 0x087F,
-	/* Array index: 0x0072 */ 0x576D, 0x5776, 0x0889,
-	/* Array index: 0x0075 */ 0x5794, 0x579F, 0x0893,
-	/* Array index: 0x0078 */ 0x57B5, 0x57C1, 0x089F,
-	/* Array index: 0x007B */ 0x57E1, 0x5801, 0x08AC,
-	/* Array index: 0x007E */ 0x5807, 0x5810, 0x08CD,
-	/* Array index: 0x0081 */ 0x5825, 0x582E, 0x08D7,
-	/* Array index: 0x0084 */ 0x5832, 0x583F, 0x08E1,
-	/* Array index: 0x0087 */ 0x584D, 0x584F, 0x08EF,
-	/* Array index: 0x008A */ 0x5863, 0x5865, 0x08F2,
-	/* Array index: 0x008D */ 0x587A, 0x587C, 0x08F5,
-	/* Array index: 0x0090 */ 0x5886, 0x5891, 0x08F8,
-	/* Array index: 0x0093 */ 0x590C, 0x590E, 0x0904,
-	/* Array index: 0x0096 */ 0x5970, 0x5972, 0x0907,
-	/* Array index: 0x0099 */ 0x597B, 0x5980, 0x090A,
-	/* Array index: 0x009C */ 0x598E, 0x5990, 0x0910,
-	/* Array index: 0x009F */ 0x59A0, 0x59A2, 0x0913,
-	/* Array index: 0x00A2 */ 0x59B1, 0x59B6, 0x0916,
-	/* Array index: 0x00A5 */ 0x59DD, 0x59E1, 0x091C,
-	/* Array index: 0x00A8 */ 0x59ED, 0x59F7, 0x0921,
-	/* Array index: 0x00AB */ 0x59FA, 0x5A00, 0x092C,
-	/* Array index: 0x00AE */ 0x5A15, 0x5A19, 0x0933,
-	/* Array index: 0x00B1 */ 0x5A35, 0x5A39, 0x0938,
-	/* Array index: 0x00B4 */ 0x5A42, 0x5A48, 0x093D,
-	/* Array index: 0x00B7 */ 0x5A4C, 0x5A60, 0x0944,
-	/* Array index: 0x00BA */ 0x5A78, 0x5A7D, 0x0959,
-	/* Array index: 0x00BD */ 0x5A8A, 0x5A97, 0x095F,
-	/* Array index: 0x00C0 */ 0x5A9C, 0x5A9F, 0x096D,
-	/* Array index: 0x00C3 */ 0x5AAC, 0x5ABB, 0x0971,
-	/* Array index: 0x00C6 */ 0x5AC4, 0x5ACD, 0x0981,
-	/* Array index: 0x00C9 */ 0x5AD9, 0x5AE2, 0x098B,
-	/* Array index: 0x00CC */ 0x5AE8, 0x5AEE, 0x0995,
-	/* Array index: 0x00CF */ 0x5AF3, 0x5AF9, 0x099C,
-	/* Array index: 0x00D2 */ 0x5AFF, 0x5B07, 0x09A3,
-	/* Array index: 0x00D5 */ 0x5B13, 0x5B1B, 0x09AC,
-	/* Array index: 0x00D8 */ 0x5B23, 0x5B2F, 0x09B5,
-	/* Array index: 0x00DB */ 0x5B3C, 0x5B3F, 0x09C2,
-	/* Array index: 0x00DE */ 0x5B47, 0x5B4E, 0x09C6,
-	/* Array index: 0x00E1 */ 0x5BCA, 0x5BCE, 0x09CE,
-	/* Array index: 0x00E4 */ 0x5C7A, 0x5C7E, 0x09D3,
-	/* Array index: 0x00E7 */ 0x5C86, 0x5C95, 0x09D8,
-	/* Array index: 0x00EA */ 0x5C9F, 0x5CB0, 0x09E8,
-	/* Array index: 0x00ED */ 0x5CC6, 0x5CDF, 0x09FA,
-	/* Array index: 0x00F0 */ 0x5CF7, 0x5CF9, 0x0A14,
-	/* Array index: 0x00F3 */ 0x5D0B, 0x5D0F, 0x0A17,
-	/* Array index: 0x00F6 */ 0x5D1D, 0x5D20, 0x0A1C,
-	/* Array index: 0x00F9 */ 0x5D2E, 0x5D4B, 0x0A20,
-	/* Array index: 0x00FC */ 0x5D79, 0x5D82, 0x0A3E,
-	/* Array index: 0x00FF */ 0x5D86, 0x5D8A, 0x0A48,
-	/* Array index: 0x0102 */ 0x5D9C, 0x5DA2, 0x0A4D,
-	/* Array index: 0x0105 */ 0x5DA7, 0x5DB7, 0x0A54,
-	/* Array index: 0x0108 */ 0x5E20, 0x5E24, 0x0A65,
-	/* Array index: 0x010B */ 0x5E4A, 0x5E4F, 0x0A6A,
-	/* Array index: 0x010E */ 0x5E66, 0x5E70, 0x0A70,
-	/* Array index: 0x0111 */ 0x5E88, 0x5E8D, 0x0A7B,
-	/* Array index: 0x0114 */ 0x5EA2, 0x5EA5, 0x0A81,
-	/* Array index: 0x0117 */ 0x5EAE, 0x5EB4, 0x0A85,
-	/* Array index: 0x011A */ 0x5EC5, 0x5EC7, 0x0A8C,
-	/* Array index: 0x011D */ 0x5ED1, 0x5EDE, 0x0A8F,
-	/* Array index: 0x0120 */ 0x5EE5, 0x5EE9, 0x0A9D,
-	/* Array index: 0x0123 */ 0x5EEE, 0x5EF2, 0x0AA2,
-	/* Array index: 0x0126 */ 0x5F22, 0x5F24, 0x0AA7,
-	/* Array index: 0x0129 */ 0x5FBB, 0x5FC1, 0x0AAA,
-	/* Array index: 0x012C */ 0x5FCF, 0x5FD5, 0x0AB1,
-	/* Array index: 0x012F */ 0x5FE1, 0x5FE5, 0x0AB8,
-	/* Array index: 0x0132 */ 0x5FED, 0x5FEF, 0x0ABD,
-	/* Array index: 0x0135 */ 0x6009, 0x6013, 0x0AC0,
-	/* Array index: 0x0138 */ 0x602C, 0x6034, 0x0ACB,
-	/* Array index: 0x013B */ 0x6040, 0x6049, 0x0AD4,
-	/* Array index: 0x013E */ 0x605A, 0x605F, 0x0ADE,
-	/* Array index: 0x0141 */ 0x6086, 0x608A, 0x0AE4,
-	/* Array index: 0x0144 */ 0x609B, 0x609D, 0x0AE9,
-	/* Array index: 0x0147 */ 0x60BE, 0x60CF, 0x0AEC,
-	/* Array index: 0x014A */ 0x6103, 0x6105, 0x0AFE,
-	/* Array index: 0x014D */ 0x6128, 0x612F, 0x0B01,
-	/* Array index: 0x0150 */ 0x6152, 0x6156, 0x0B09,
-	/* Array index: 0x0153 */ 0x6171, 0x6174, 0x0B0E,
-	/* Array index: 0x0156 */ 0x6189, 0x618D, 0x0B12,
-	/* Array index: 0x0159 */ 0x61AD, 0x61B5, 0x0B17,
-	/* Array index: 0x015C */ 0x61DE, 0x61E0, 0x0B20,
-	/* Array index: 0x015F */ 0x61E4, 0x61F1, 0x0B23,
-	/* Array index: 0x0162 */ 0x6223, 0x622D, 0x0B31,
-	/* Array index: 0x0165 */ 0x625E, 0x6266, 0x0B3C,
-	/* Array index: 0x0168 */ 0x6270, 0x6274, 0x0B45,
-	/* Array index: 0x016B */ 0x62A9, 0x62B8, 0x0B4A,
-	/* Array index: 0x016E */ 0x62F5, 0x62FB, 0x0B5A,
-	/* Array index: 0x0171 */ 0x630B, 0x6315, 0x0B61,
-	/* Array index: 0x0174 */ 0x6332, 0x633C, 0x0B6C,
-	/* Array index: 0x0177 */ 0x6340, 0x634B, 0x0B77,
-	/* Array index: 0x017A */ 0x6354, 0x635A, 0x0B83,
-	/* Array index: 0x017D */ 0x636D, 0x6370, 0x0B8A,
-	/* Array index: 0x0180 */ 0x638D, 0x6391, 0x0B8E,
-	/* Array index: 0x0183 */ 0x639C, 0x639F, 0x0B93,
-	/* Array index: 0x0186 */ 0x63AB, 0x63B1, 0x0B97,
-	/* Array index: 0x0189 */ 0x63C2, 0x63CE, 0x0B9E,
-	/* Array index: 0x018C */ 0x63D5, 0x63E0, 0x0BAB,
-	/* Array index: 0x018F */ 0x63E4, 0x63E8, 0x0BB7,
-	/* Array index: 0x0192 */ 0x63EF, 0x63F6, 0x0BBC,
-	/* Array index: 0x0195 */ 0x6409, 0x6412, 0x0BC4,
-	/* Array index: 0x0198 */ 0x641F, 0x6428, 0x0BCE,
-	/* Array index: 0x019B */ 0x642E, 0x6430, 0x0BD8,
-	/* Array index: 0x019E */ 0x643F, 0x6443, 0x0BDB,
-	/* Array index: 0x01A1 */ 0x6459, 0x6461, 0x0BE0,
-	/* Array index: 0x01A4 */ 0x6470, 0x6477, 0x0BE9,
-	/* Array index: 0x01A7 */ 0x6489, 0x648C, 0x0BF1,
-	/* Array index: 0x01AA */ 0x6496, 0x6498, 0x0BF5,
-	/* Array index: 0x01AD */ 0x649C, 0x64A0, 0x0BF8,
-	/* Array index: 0x01B0 */ 0x650C, 0x6510, 0x0BFD,
-	/* Array index: 0x01B3 */ 0x6513, 0x6517, 0x0C02,
-	/* Array index: 0x01B6 */ 0x6520, 0x6526, 0x0C07,
-	/* Array index: 0x01B9 */ 0x6564, 0x656A, 0x0C0E,
-	/* Array index: 0x01BC */ 0x6579, 0x6581, 0x0C15,
-	/* Array index: 0x01BF */ 0x65C2, 0x65C6, 0x0C1E,
-	/* Array index: 0x01C2 */ 0x65DA, 0x65E1, 0x0C23,
-	/* Array index: 0x01C5 */ 0x65EE, 0x65F5, 0x0C2B,
-	/* Array index: 0x01C8 */ 0x65FB, 0x65FD, 0x0C33,
-	/* Array index: 0x01CB */ 0x6603, 0x6612, 0x0C36,
-	/* Array index: 0x01CE */ 0x6632, 0x663A, 0x0C46,
-	/* Array index: 0x01D1 */ 0x6678, 0x667C, 0x0C4F,
-	/* Array index: 0x01D4 */ 0x668A, 0x668C, 0x0C54,
-	/* Array index: 0x01D7 */ 0x669F, 0x66A1, 0x0C57,
-	/* Array index: 0x01DA */ 0x66BA, 0x66C0, 0x0C5A,
-	/* Array index: 0x01DD */ 0x66C8, 0x66CC, 0x0C61,
-	/* Array index: 0x01E0 */ 0x670F, 0x6713, 0x0C66,
-	/* Array index: 0x01E3 */ 0x6720, 0x6723, 0x0C6B,
-	/* Array index: 0x01E6 */ 0x6738, 0x673F, 0x0C6F,
-	/* Array index: 0x01E9 */ 0x6747, 0x674D, 0x0C77,
-	/* Array index: 0x01EC */ 0x6776, 0x677D, 0x0C7E,
-	/* Array index: 0x01EF */ 0x6781, 0x6786, 0x0C86,
-	/* Array index: 0x01F2 */ 0x678C, 0x6794, 0x0C8C,
-	/* Array index: 0x01F5 */ 0x67B7, 0x67BB, 0x0C95,
-	/* Array index: 0x01F8 */ 0x67C0, 0x67CE, 0x0C9A,
-	/* Array index: 0x01FB */ 0x67E3, 0x67FC, 0x0CA9,
-	/* Array index: 0x01FE */ 0x681C, 0x6820, 0x0CC3,
-	/* Array index: 0x0201 */ 0x682B, 0x6835, 0x0CC8,
-	/* Array index: 0x0204 */ 0x684B, 0x684F, 0x0CD3,
-	/* Array index: 0x0207 */ 0x686B, 0x6880, 0x0CD8,
-	/* Array index: 0x020A */ 0x6887, 0x6892, 0x0CEE,
-	/* Array index: 0x020D */ 0x68A9, 0x68AE, 0x0CFA,
-	/* Array index: 0x0210 */ 0x68C6, 0x68C8, 0x0D00,
-	/* Array index: 0x0213 */ 0x68D0, 0x68D6, 0x0D03,
-	/* Array index: 0x0216 */ 0x68DC, 0x68DE, 0x0D0A,
-	/* Array index: 0x0219 */ 0x68E6, 0x68F8, 0x0D0D,
-	/* Array index: 0x021C */ 0x6904, 0x6917, 0x0D20,
-	/* Array index: 0x021F */ 0x6932, 0x6959, 0x0D34,
-	/* Array index: 0x0222 */ 0x696F, 0x6971, 0x0D5C,
-	/* Array index: 0x0225 */ 0x698D, 0x699A, 0x0D5F,
-	/* Array index: 0x0228 */ 0x69AF, 0x69B6, 0x0D6D,
-	/* Array index: 0x022B */ 0x69BC, 0x69BF, 0x0D75,
-	/* Array index: 0x022E */ 0x69E2, 0x69E7, 0x0D79,
-	/* Array index: 0x0231 */ 0x69F4, 0x6A00, 0x0D7F,
-	/* Array index: 0x0234 */ 0x6A04, 0x6A09, 0x0D8C,
-	/* Array index: 0x0237 */ 0x6A14, 0x6A18, 0x0D92,
-	/* Array index: 0x023A */ 0x6A25, 0x6A28, 0x0D97,
-	/* Array index: 0x023D */ 0x6A3B, 0x6A41, 0x0D9B,
-	/* Array index: 0x0240 */ 0x6A4D, 0x6A56, 0x0DA2,
-	/* Array index: 0x0243 */ 0x6A5A, 0x6A60, 0x0DAC,
-	/* Array index: 0x0246 */ 0x6A64, 0x6A6A, 0x0DB3,
-	/* Array index: 0x0249 */ 0x6A8C, 0x6A96, 0x0DBA,
-	/* Array index: 0x024C */ 0x6AA4, 0x6AA8, 0x0DC5,
-	/* Array index: 0x024F */ 0x6AB6, 0x6ABA, 0x0DCA,
-	/* Array index: 0x0252 */ 0x6AC5, 0x6AD1, 0x0DCF,
-	/* Array index: 0x0255 */ 0x6ADC, 0x6AE1, 0x0DDC,
-	/* Array index: 0x0258 */ 0x6AE7, 0x6AF3, 0x0DE2,
-	/* Array index: 0x025B */ 0x6B0F, 0x6B1A, 0x0DEF,
-	/* Array index: 0x025E */ 0x6B33, 0x6B3C, 0x0DFB,
-	/* Array index: 0x0261 */ 0x6B3F, 0x6B4D, 0x0E05,
-	/* Array index: 0x0264 */ 0x6B54, 0x6B56, 0x0E14,
-	/* Array index: 0x0267 */ 0x6B8C, 0x6BAD, 0x0E17,
-	/* Array index: 0x026A */ 0x6BC3, 0x6BCC, 0x0E39,
-	/* Array index: 0x026D */ 0x6BE0, 0x6BE8, 0x0E43,
-	/* Array index: 0x0270 */ 0x6BF7, 0x6C06, 0x0E4C,
-	/* Array index: 0x0273 */ 0x6C09, 0x6C0D, 0x0E5C,
-	/* Array index: 0x0276 */ 0x6C14, 0x6C1A, 0x0E61,
-	/* Array index: 0x0279 */ 0x6C4A, 0x6C4C, 0x0E68,
-	/* Array index: 0x027C */ 0x6C65, 0x6C73, 0x0E6B,
-	/* Array index: 0x027F */ 0x6CCD, 0x6CD4, 0x0E7A,
-	/* Array index: 0x0282 */ 0x6CE9, 0x6CEE, 0x0E82,
-	/* Array index: 0x0285 */ 0x6D00, 0x6D0A, 0x0E88,
-	/* Array index: 0x0288 */ 0x6D0D, 0x6D12, 0x0E93,
-	/* Array index: 0x028B */ 0x6D16, 0x6D1A, 0x0E99,
-	/* Array index: 0x028E */ 0x6D2C, 0x6D34, 0x0E9E,
-	/* Array index: 0x0291 */ 0x6D5E, 0x6D68, 0x0EA7,
-	/* Array index: 0x0294 */ 0x6D7A, 0x6D86, 0x0EB2,
-	/* Array index: 0x0297 */ 0x6D90, 0x6D92, 0x0EBF,
-	/* Array index: 0x029A */ 0x6DBA, 0x6DC2, 0x0EC2,
-	/* Array index: 0x029D */ 0x6DC8, 0x6DCA, 0x0ECB,
-	/* Array index: 0x02A0 */ 0x6DCF, 0x6DE5, 0x0ECE,
-	/* Array index: 0x02A3 */ 0x6E39, 0x6E4B, 0x0EE5,
-	/* Array index: 0x02A6 */ 0x6E51, 0x6E55, 0x0EF8,
-	/* Array index: 0x02A9 */ 0x6E5A, 0x6E68, 0x0EFD,
-	/* Array index: 0x02AC */ 0x6E73, 0x6E79, 0x0F0C,
-	/* Array index: 0x02AF */ 0x6E8D, 0x6E94, 0x0F13,
-	/* Array index: 0x02B2 */ 0x6E9E, 0x6EA6, 0x0F1B,
-	/* Array index: 0x02B5 */ 0x6EAE, 0x6EB3, 0x0F24,
-	/* Array index: 0x02B8 */ 0x6EBD, 0x6EC3, 0x0F2A,
-	/* Array index: 0x02BB */ 0x6EC6, 0x6ED2, 0x0F31,
-	/* Array index: 0x02BE */ 0x6EF5, 0x6EFD, 0x0F3E,
-	/* Array index: 0x02C1 */ 0x6F05, 0x6F0E, 0x0F47,
-	/* Array index: 0x02C4 */ 0x6F18, 0x6F27, 0x0F51,
-	/* Array index: 0x02C7 */ 0x6F35, 0x6F3C, 0x0F61,
-	/* Array index: 0x02CA */ 0x6F4E, 0x6F57, 0x0F69,
-	/* Array index: 0x02CD */ 0x6F5D, 0x6F63, 0x0F73,
-	/* Array index: 0x02D0 */ 0x6F67, 0x6F6C, 0x0F7A,
-	/* Array index: 0x02D3 */ 0x6F7B, 0x6F7F, 0x0F80,
-	/* Array index: 0x02D6 */ 0x6F89, 0x6F8D, 0x0F85,
-	/* Array index: 0x02D9 */ 0x6F90, 0x6F96, 0x0F8A,
-	/* Array index: 0x02DC */ 0x6FA8, 0x6FB2, 0x0F91,
-	/* Array index: 0x02DF */ 0x6FC4, 0x6FCF, 0x0F9C,
-	/* Array index: 0x02E2 */ 0x6FDC, 0x6FDE, 0x0FA8,
-	/* Array index: 0x02E5 */ 0x6FE2, 0x6FE8, 0x0FAB,
-	/* Array index: 0x02E8 */ 0x6FFB, 0x7007, 0x0FB2,
-	/* Array index: 0x02EB */ 0x700A, 0x700E, 0x0FBF,
-	/* Array index: 0x02EE */ 0x7020, 0x702B, 0x0FC4,
-	/* Array index: 0x02F1 */ 0x7031, 0x704A, 0x0FD0,
-	/* Array index: 0x02F4 */ 0x7055, 0x706A, 0x0FEA,
-	/* Array index: 0x02F7 */ 0x7082, 0x7086, 0x1000,
-	/* Array index: 0x02FA */ 0x70C5, 0x70C7, 0x1005,
-	/* Array index: 0x02FD */ 0x70CD, 0x70D4, 0x1008,
-	/* Array index: 0x0300 */ 0x70DA, 0x70E2, 0x1010,
-	/* Array index: 0x0303 */ 0x70F3, 0x7106, 0x1019,
-	/* Array index: 0x0306 */ 0x710B, 0x7110, 0x102D,
-	/* Array index: 0x0309 */ 0x711E, 0x7125, 0x1033,
-	/* Array index: 0x030C */ 0x712E, 0x7132, 0x103B,
-	/* Array index: 0x030F */ 0x7141, 0x7144, 0x1040,
-	/* Array index: 0x0312 */ 0x7150, 0x7154, 0x1044,
-	/* Array index: 0x0315 */ 0x715D, 0x7163, 0x1049,
-	/* Array index: 0x0318 */ 0x7180, 0x7189, 0x1050,
-	/* Array index: 0x031B */ 0x719A, 0x71AA, 0x105A,
-	/* Array index: 0x031E */ 0x71AF, 0x71B5, 0x106B,
-	/* Array index: 0x0321 */ 0x71BC, 0x71CB, 0x1072,
-	/* Array index: 0x0324 */ 0x71F0, 0x71F2, 0x1082,
-	/* Array index: 0x0327 */ 0x71FF, 0x7207, 0x1085,
-	/* Array index: 0x032A */ 0x7219, 0x7229, 0x108E,
-	/* Array index: 0x032D */ 0x7249, 0x724B, 0x109F,
-	/* Array index: 0x0330 */ 0x7276, 0x727F, 0x10A2,
-	/* Array index: 0x0333 */ 0x7285, 0x729E, 0x10AC,
-	/* Array index: 0x0336 */ 0x72A1, 0x72AA, 0x10C6,
-	/* Array index: 0x0339 */ 0x72C5, 0x72CC, 0x10D0,
-	/* Array index: 0x033C */ 0x72FA, 0x7301, 0x10D8,
-	/* Array index: 0x033F */ 0x7307, 0x730C, 0x10E0,
-	/* Array index: 0x0342 */ 0x7330, 0x7335, 0x10E6,
-	/* Array index: 0x0345 */ 0x733A, 0x733C, 0x10EC,
-	/* Array index: 0x0348 */ 0x7349, 0x734D, 0x10EF,
-	/* Array index: 0x034B */ 0x7358, 0x736F, 0x10F4,
-	/* Array index: 0x034E */ 0x737C, 0x7385, 0x110C,
-	/* Array index: 0x0351 */ 0x7392, 0x7397, 0x1116,
-	/* Array index: 0x0354 */ 0x73A0, 0x73A6, 0x111C,
-	/* Array index: 0x0357 */ 0x73B4, 0x73B9, 0x1123,
-	/* Array index: 0x035A */ 0x73C2, 0x73CC, 0x1129,
-	/* Array index: 0x035D */ 0x73D2, 0x73DD, 0x1134,
-	/* Array index: 0x0360 */ 0x73E5, 0x73EB, 0x1140,
-	/* Array index: 0x0363 */ 0x73F4, 0x7401, 0x1147,
-	/* Array index: 0x0366 */ 0x7420, 0x7424, 0x1155,
-	/* Array index: 0x0369 */ 0x7429, 0x7432, 0x115A,
-	/* Array index: 0x036C */ 0x744A, 0x7454, 0x1164,
-	/* Array index: 0x036F */ 0x7471, 0x7475, 0x116F,
-	/* Array index: 0x0372 */ 0x7485, 0x748A, 0x1174,
-	/* Array index: 0x0375 */ 0x74B1, 0x74BB, 0x117A,
-	/* Array index: 0x0378 */ 0x74BE, 0x74C5, 0x1185,
-	/* Array index: 0x037B */ 0x74D5, 0x74E1, 0x118D,
-	/* Array index: 0x037E */ 0x74FB, 0x7503, 0x119A,
-	/* Array index: 0x0381 */ 0x750F, 0x7517, 0x11A3,
-	/* Array index: 0x0384 */ 0x753E, 0x7540, 0x11AC,
-	/* Array index: 0x0387 */ 0x75BF, 0x75C1, 0x11AF,
-	/* Array index: 0x038A */ 0x75CB, 0x75D2, 0x11B2,
-	/* Array index: 0x038D */ 0x75F5, 0x75FE, 0x11BA,
-	/* Array index: 0x0390 */ 0x760F, 0x761E, 0x11C4,
-	/* Array index: 0x0393 */ 0x762D, 0x7635, 0x11D4,
-	/* Array index: 0x0396 */ 0x7647, 0x7649, 0x11DD,
-	/* Array index: 0x0399 */ 0x7699, 0x769E, 0x11E0,
-	/* Array index: 0x039C */ 0x7703, 0x7705, 0x11E6,
-	/* Array index: 0x039F */ 0x7710, 0x771D, 0x11E9,
-	/* Array index: 0x03A2 */ 0x772F, 0x7735, 0x11F7,
-	/* Array index: 0x03A5 */ 0x7744, 0x774E, 0x11FE,
-	/* Array index: 0x03A8 */ 0x7752, 0x775A, 0x1209,
-	/* Array index: 0x03AB */ 0x776D, 0x776F, 0x1212,
-	/* Array index: 0x03AE */ 0x777E, 0x7789, 0x1215,
-	/* Array index: 0x03B1 */ 0x7797, 0x77A3, 0x1221,
-	/* Array index: 0x03B4 */ 0x77B1, 0x77B7, 0x122E,
-	/* Array index: 0x03B7 */ 0x77C9, 0x77D0, 0x1235,
-	/* Array index: 0x03BA */ 0x77F0, 0x77F2, 0x123D,
-	/* Array index: 0x03BD */ 0x77F7, 0x77FC, 0x1240,
-	/* Array index: 0x03C0 */ 0x780E, 0x7813, 0x1246,
-	/* Array index: 0x03C3 */ 0x7821, 0x7823, 0x124C,
-	/* Array index: 0x03C6 */ 0x7826, 0x7835, 0x124F,
-	/* Array index: 0x03C9 */ 0x7848, 0x784D, 0x125F,
-	/* Array index: 0x03CC */ 0x7864, 0x7871, 0x1265,
-	/* Array index: 0x03CF */ 0x7883, 0x7887, 0x1273,
-	/* Array index: 0x03D2 */ 0x7894, 0x789A, 0x1278,
-	/* Array index: 0x03D5 */ 0x789E, 0x78A5, 0x127F,
-	/* Array index: 0x03D8 */ 0x78A8, 0x78AD, 0x1287,
-	/* Array index: 0x03DB */ 0x78C8, 0x78D1, 0x128D,
-	/* Array index: 0x03DE */ 0x78DB, 0x78E5, 0x1297,
-	/* Array index: 0x03E1 */ 0x78F9, 0x78FF, 0x12A2,
-	/* Array index: 0x03E4 */ 0x7910, 0x7914, 0x12A9,
-	/* Array index: 0x03E7 */ 0x791B, 0x791E, 0x12AE,
-	/* Array index: 0x03EA */ 0x7921, 0x7929, 0x12B2,
-	/* Array index: 0x03ED */ 0x794A, 0x794C, 0x12BB,
-	/* Array index: 0x03F0 */ 0x794F, 0x7954, 0x12BE,
-	/* Array index: 0x03F3 */ 0x7967, 0x796B, 0x12C4,
-	/* Array index: 0x03F6 */ 0x7970, 0x7974, 0x12C9,
-	/* Array index: 0x03F9 */ 0x7990, 0x79A4, 0x12CE,
-	/* Array index: 0x03FC */ 0x79AB, 0x79AD, 0x12E3,
-	/* Array index: 0x03FF */ 0x79B4, 0x79B8, 0x12E6,
-	/* Array index: 0x0402 */ 0x79CD, 0x79CF, 0x12EB,
-	/* Array index: 0x0405 */ 0x79DC, 0x79E0, 0x12EE,
-	/* Array index: 0x0408 */ 0x79EA, 0x79EE, 0x12F3,
-	/* Array index: 0x040B */ 0x79F6, 0x79FA, 0x12F8,
-	/* Array index: 0x040E */ 0x7A02, 0x7A04, 0x12FD,
-	/* Array index: 0x0411 */ 0x7A10, 0x7A1B, 0x1300,
-	/* Array index: 0x0414 */ 0x7A58, 0x7A5C, 0x130C,
-	/* Array index: 0x0417 */ 0x7A6C, 0x7A71, 0x1311,
-	/* Array index: 0x041A */ 0x7A85, 0x7A90, 0x1317,
-	/* Array index: 0x041D */ 0x7AB1, 0x7AB8, 0x1323,
-	/* Array index: 0x0420 */ 0x7B04, 0x7B13, 0x132B,
-	/* Array index: 0x0423 */ 0x7B22, 0x7B25, 0x133B,
-	/* Array index: 0x0426 */ 0x7B2D, 0x7B35, 0x133F,
-	/* Array index: 0x0429 */ 0x7B44, 0x7B4E, 0x1348,
-	/* Array index: 0x042C */ 0x7B61, 0x7B66, 0x1353,
-	/* Array index: 0x042F */ 0x7B70, 0x7B78, 0x1359,
-	/* Array index: 0x0432 */ 0x7B8A, 0x7B91, 0x1362,
-	/* Array index: 0x0435 */ 0x7B98, 0x7B9C, 0x136A,
-	/* Array index: 0x0438 */ 0x7BDA, 0x7BEB, 0x136F,
-	/* Array index: 0x043B */ 0x7BF0, 0x7BF4, 0x1381,
-	/* Array index: 0x043E */ 0x7BFD, 0x7C10, 0x1386,
-	/* Array index: 0x0441 */ 0x7C1C, 0x7C2D, 0x139A,
-	/* Array index: 0x0444 */ 0x7C45, 0x7C4A, 0x13AC,
-	/* Array index: 0x0447 */ 0x7C57, 0x7C5C, 0x13B2,
-	/* Array index: 0x044A */ 0x7C66, 0x7C6B, 0x13B8,
-	/* Array index: 0x044D */ 0x7C78, 0x7C7A, 0x13BE,
-	/* Array index: 0x0450 */ 0x7C7F, 0x7C85, 0x13C1,
-	/* Array index: 0x0453 */ 0x7CA1, 0x7CA3, 0x13C8,
-	/* Array index: 0x0456 */ 0x7CBA, 0x7CBC, 0x13CB,
-	/* Array index: 0x0459 */ 0x7CD0, 0x7CD4, 0x13CE,
-	/* Array index: 0x045C */ 0x7D0E, 0x7D13, 0x13D3,
-	/* Array index: 0x045F */ 0x7D1D, 0x7D1F, 0x13D9,
-	/* Array index: 0x0462 */ 0x7D3A, 0x7D41, 0x13DC,
-	/* Array index: 0x0465 */ 0x7D4E, 0x7D58, 0x13E4,
-	/* Array index: 0x0468 */ 0x7D67, 0x7D6F, 0x13EF,
-	/* Array index: 0x046B */ 0x7D7A, 0x7D8E, 0x13F8,
-	/* Array index: 0x046E */ 0x7DA6, 0x7DAA, 0x140D,
-	/* Array index: 0x0471 */ 0x7DC0, 0x7DC6, 0x1412,
-	/* Array index: 0x0474 */ 0x7E0B, 0x7E17, 0x1419,
-	/* Array index: 0x0477 */ 0x7E1F, 0x7E25, 0x1426,
-	/* Array index: 0x047A */ 0x7E38, 0x7E3C, 0x142D,
-	/* Array index: 0x047D */ 0x7E56, 0x7E58, 0x1432,
-	/* Array index: 0x0480 */ 0x7E5F, 0x7E63, 0x1435,
-	/* Array index: 0x0483 */ 0x7E72, 0x7E7B, 0x143A,
-	/* Array index: 0x0486 */ 0x7E86, 0x7E8D, 0x1444,
-	/* Array index: 0x0489 */ 0x7E95, 0x7E9B, 0x144C,
-	/* Array index: 0x048C */ 0x7F5B, 0x7F6D, 0x1453,
-	/* Array index: 0x048F */ 0x7F7A, 0x7F7F, 0x1466,
-	/* Array index: 0x0492 */ 0x7F9B, 0x7FA7, 0x146C,
-	/* Array index: 0x0495 */ 0x7FC7, 0x7FD1, 0x1479,
-	/* Array index: 0x0498 */ 0x7FE2, 0x7FEF, 0x1484,
-	/* Array index: 0x049B */ 0x7FF4, 0x7FF8, 0x1492,
-	/* Array index: 0x049E */ 0x7FFD, 0x7FFF, 0x1497,
-	/* Array index: 0x04A1 */ 0x804F, 0x8051, 0x149A,
-	/* Array index: 0x04A4 */ 0x80C5, 0x80CA, 0x149D,
-	/* Array index: 0x04A7 */ 0x80CD, 0x80D9, 0x14A3,
-	/* Array index: 0x04AA */ 0x80F9, 0x80FB, 0x14B0,
-	/* Array index: 0x04AD */ 0x811B, 0x8122, 0x14B3,
-	/* Array index: 0x04B0 */ 0x815E, 0x8164, 0x14BB,
-	/* Array index: 0x04B3 */ 0x8189, 0x818D, 0x14C2,
-	/* Array index: 0x04B6 */ 0x81AE, 0x81BC, 0x14C7,
-	/* Array index: 0x04B9 */ 0x81D0, 0x81D2, 0x14D6,
-	/* Array index: 0x04BC */ 0x81DD, 0x81E1, 0x14D9,
-	/* Array index: 0x04BF */ 0x81F7, 0x81F9, 0x14DE,
-	/* Array index: 0x04C2 */ 0x8232, 0x8234, 0x14E1,
-	/* Array index: 0x04C5 */ 0x823C, 0x8245, 0x14E4,
-	/* Array index: 0x04C8 */ 0x824E, 0x8264, 0x14EE,
-	/* Array index: 0x04CB */ 0x8268, 0x826D, 0x1505,
-	/* Array index: 0x04CE */ 0x827C, 0x8285, 0x150B,
-	/* Array index: 0x04D1 */ 0x828E, 0x8294, 0x1515,
-	/* Array index: 0x04D4 */ 0x829E, 0x82AB, 0x151C,
-	/* Array index: 0x04D7 */ 0x82B4, 0x82B6, 0x152A,
-	/* Array index: 0x04DA */ 0x82E8, 0x82ED, 0x152D,
-	/* Array index: 0x04DD */ 0x82F0, 0x82FB, 0x1533,
-	/* Array index: 0x04E0 */ 0x8322, 0x832F, 0x153F,
-	/* Array index: 0x04E3 */ 0x833A, 0x833C, 0x154D,
-	/* Array index: 0x04E6 */ 0x8341, 0x834E, 0x1550,
-	/* Array index: 0x04E9 */ 0x8373, 0x8376, 0x155E,
-	/* Array index: 0x04EC */ 0x837D, 0x8383, 0x1562,
-	/* Array index: 0x04EF */ 0x8387, 0x8390, 0x1569,
-	/* Array index: 0x04F2 */ 0x8397, 0x839D, 0x1573,
-	/* Array index: 0x04F5 */ 0x83A3, 0x83B0, 0x157A,
-	/* Array index: 0x04F8 */ 0x83BF, 0x83EE, 0x1588,
-	/* Array index: 0x04FB */ 0x83F5, 0x8401, 0x15B8,
-	/* Array index: 0x04FE */ 0x840F, 0x8413, 0x15C5,
-	/* Array index: 0x0501 */ 0x842F, 0x843B, 0x15CA,
-	/* Array index: 0x0504 */ 0x843F, 0x8460, 0x15D7,
-	/* Array index: 0x0507 */ 0x846E, 0x847E, 0x15F9,
-	/* Array index: 0x050A */ 0x848D, 0x8491, 0x160A,
-	/* Array index: 0x050D */ 0x8497, 0x84B1, 0x160F,
-	/* Array index: 0x0510 */ 0x84B9, 0x84BB, 0x162A,
-	/* Array index: 0x0513 */ 0x84CC, 0x84D7, 0x162D,
-	/* Array index: 0x0516 */ 0x84E7, 0x8502, 0x1639,
-	/* Array index: 0x0519 */ 0x8507, 0x850F, 0x1655,
-	/* Array index: 0x051C */ 0x8515, 0x8520, 0x165E,
-	/* Array index: 0x051F */ 0x8524, 0x8531, 0x166A,
-	/* Array index: 0x0522 */ 0x8540, 0x8547, 0x1678,
-	/* Array index: 0x0525 */ 0x8551, 0x8558, 0x1680,
-	/* Array index: 0x0528 */ 0x8560, 0x8567, 0x1688,
-	/* Array index: 0x052B */ 0x8575, 0x8590, 0x1690,
-	/* Array index: 0x052E */ 0x8595, 0x85A4, 0x16AC,
-	/* Array index: 0x0531 */ 0x85B1, 0x85B8, 0x16BC,
-	/* Array index: 0x0534 */ 0x85BD, 0x85C8, 0x16C4,
-	/* Array index: 0x0537 */ 0x85D7, 0x85E3, 0x16D0,
-	/* Array index: 0x053A */ 0x85EB, 0x85F2, 0x16DD,
-	/* Array index: 0x053D */ 0x85FD, 0x8605, 0x16E5,
-	/* Array index: 0x0540 */ 0x8618, 0x8640, 0x16EE,
-	/* Array index: 0x0543 */ 0x8646, 0x864D, 0x1717,
-	/* Array index: 0x0546 */ 0x8661, 0x8674, 0x171F,
-	/* Array index: 0x0549 */ 0x8685, 0x8687, 0x1733,
-	/* Array index: 0x054C */ 0x868D, 0x86A2, 0x1736,
-	/* Array index: 0x054F */ 0x86B3, 0x86C5, 0x174C,
-	/* Array index: 0x0552 */ 0x86D6, 0x86DD, 0x175F,
-	/* Array index: 0x0555 */ 0x86E6, 0x86EC, 0x1767,
-	/* Array index: 0x0558 */ 0x86F5, 0x86FA, 0x176E,
-	/* Array index: 0x055B */ 0x8709, 0x8712, 0x1774,
-	/* Array index: 0x055E */ 0x8719, 0x871B, 0x177E,
-	/* Array index: 0x0561 */ 0x8720, 0x8735, 0x1781,
-	/* Array index: 0x0564 */ 0x873E, 0x8743, 0x1797,
-	/* Array index: 0x0567 */ 0x874D, 0x876F, 0x179D,
-	/* Array index: 0x056A */ 0x8777, 0x877B, 0x17C0,
-	/* Array index: 0x056D */ 0x8784, 0x8789, 0x17C5,
-	/* Array index: 0x0570 */ 0x878F, 0x879D, 0x17CB,
-	/* Array index: 0x0573 */ 0x87AA, 0x87C5, 0x17DA,
-	/* Array index: 0x0576 */ 0x87D3, 0x87ED, 0x17F6,
-	/* Array index: 0x0579 */ 0x87F3, 0x87F7, 0x1811,
-	/* Array index: 0x057C */ 0x87FF, 0x8803, 0x1816,
-	/* Array index: 0x057F */ 0x8806, 0x880C, 0x181B,
-	/* Array index: 0x0582 */ 0x8819, 0x881D, 0x1822,
-	/* Array index: 0x0585 */ 0x8824, 0x8844, 0x1827,
-	/* Array index: 0x0588 */ 0x8871, 0x8876, 0x1848,
-	/* Array index: 0x058B */ 0x887C, 0x8880, 0x184E,
-	/* Array index: 0x058E */ 0x8895, 0x889B, 0x1853,
-	/* Array index: 0x0591 */ 0x88B6, 0x88C0, 0x185A,
-	/* Array index: 0x0594 */ 0x88C9, 0x88D0, 0x1865,
-	/* Array index: 0x0597 */ 0x88EE, 0x88F2, 0x186D,
-	/* Array index: 0x059A */ 0x88F6, 0x88FE, 0x1872,
-	/* Array index: 0x059D */ 0x8914, 0x8919, 0x187B,
-	/* Array index: 0x05A0 */ 0x892C, 0x8937, 0x1881,
-	/* Array index: 0x05A3 */ 0x894B, 0x8963, 0x188D,
-	/* Array index: 0x05A6 */ 0x8979, 0x897E, 0x18A6,
-	/* Array index: 0x05A9 */ 0x899B, 0x89A4, 0x18AC,
-	/* Array index: 0x05AC */ 0x89AD, 0x89AF, 0x18B6,
-	/* Array index: 0x05AF */ 0x89D5, 0x89FF, 0x18B9,
-	/* Array index: 0x05B2 */ 0x8A4A, 0x8A52, 0x18E4,
-	/* Array index: 0x05B5 */ 0x8A57, 0x8A59, 0x18ED,
-	/* Array index: 0x05B8 */ 0x8A74, 0x8A77, 0x18F0,
-	/* Array index: 0x05BB */ 0x8A7F, 0x8A86, 0x18F4,
-	/* Array index: 0x05BE */ 0x8ABA, 0x8AC0, 0x18FC,
-	/* Array index: 0x05C1 */ 0x8AD1, 0x8AE4, 0x1903,
-	/* Array index: 0x05C4 */ 0x8B05, 0x8B08, 0x1917,
-	/* Array index: 0x05C7 */ 0x8B0F, 0x8B27, 0x191B,
-	/* Array index: 0x05CA */ 0x8B2E, 0x8B42, 0x1934,
-	/* Array index: 0x05CD */ 0x8B47, 0x8B4B, 0x1949,
-	/* Array index: 0x05D0 */ 0x8B50, 0x8B57, 0x194E,
-	/* Array index: 0x05D3 */ 0x8B78, 0x8B7F, 0x1956,
-	/* Array index: 0x05D6 */ 0x8B82, 0x8B8E, 0x195E,
-	/* Array index: 0x05D9 */ 0x8C39, 0x8C3E, 0x196B,
-	/* Array index: 0x05DC */ 0x8C64, 0x8C69, 0x1971,
-	/* Array index: 0x05DF */ 0x8C6F, 0x8C78, 0x1977,
-	/* Array index: 0x05E2 */ 0x8C80, 0x8C86, 0x1981,
-	/* Array index: 0x05E5 */ 0x8C8F, 0x8C9C, 0x1988,
-	/* Array index: 0x05E8 */ 0x8CA3, 0x8CA5, 0x1996,
-	/* Array index: 0x05EB */ 0x8D8C, 0x8D96, 0x1999,
-	/* Array index: 0x05EE */ 0x8DAA, 0x8DAF, 0x19A4,
-	/* Array index: 0x05F1 */ 0x8DB5, 0x8DB9, 0x19AA,
-	/* Array index: 0x05F4 */ 0x8DD3, 0x8DD9, 0x19AF,
-	/* Array index: 0x05F7 */ 0x8DEE, 0x8DF4, 0x19B6,
-	/* Array index: 0x05FA */ 0x8DFD, 0x8E0A, 0x19BD,
-	/* Array index: 0x05FD */ 0x8E11, 0x8E1C, 0x19CB,
-	/* Array index: 0x0600 */ 0x8E23, 0x8E27, 0x19D7,
-	/* Array index: 0x0603 */ 0x8E3C, 0x8E41, 0x19DC,
-	/* Array index: 0x0606 */ 0x8E4C, 0x8E62, 0x19E2,
-	/* Array index: 0x0609 */ 0x8E92, 0x8EA9, 0x19F9,
-	/* Array index: 0x060C */ 0x8EDC, 0x8EFA, 0x1A11,
-	/* Array index: 0x060F */ 0x8EFF, 0x8F08, 0x1A30,
-	/* Array index: 0x0612 */ 0x8F0D, 0x8F11, 0x1A3A,
-	/* Array index: 0x0615 */ 0x8F16, 0x8F1A, 0x1A3F,
-	/* Array index: 0x0618 */ 0x8F32, 0x8F39, 0x1A44,
-	/* Array index: 0x061B */ 0x8F46, 0x8F48, 0x1A4C,
-	/* Array index: 0x061E */ 0x8F4F, 0x8F64, 0x1A4F,
-	/* Array index: 0x0621 */ 0x8FD2, 0x8FD7, 0x1A65,
-	/* Array index: 0x0624 */ 0x8FFB, 0x8FFF, 0x1A6B,
-	/* Array index: 0x0627 */ 0x9097, 0x90A1, 0x1A70,
-	/* Array index: 0x062A */ 0x90AF, 0x90B4, 0x1A7B,
-	/* Array index: 0x062D */ 0x90BD, 0x90BF, 0x1A81,
-	/* Array index: 0x0630 */ 0x90D4, 0x90F4, 0x1A84,
-	/* Array index: 0x0633 */ 0x90F9, 0x9108, 0x1AA5,
-	/* Array index: 0x0636 */ 0x910B, 0x9111, 0x1AB5,
-	/* Array index: 0x0639 */ 0x911A, 0x9147, 0x1ABC,
-	/* Array index: 0x063C */ 0x914E, 0x9150, 0x1AEA,
-	/* Array index: 0x063F */ 0x915F, 0x9164, 0x1AED,
-	/* Array index: 0x0642 */ 0x9180, 0x9186, 0x1AF3,
-	/* Array index: 0x0645 */ 0x918D, 0x9193, 0x1AFA,
-	/* Array index: 0x0648 */ 0x9199, 0x91A2, 0x1B01,
-	/* Array index: 0x064B */ 0x91AF, 0x91BE, 0x1B0B,
-	/* Array index: 0x064E */ 0x91D3, 0x91D5, 0x1B1B,
-	/* Array index: 0x0651 */ 0x91E8, 0x91EE, 0x1B1E,
-	/* Array index: 0x0654 */ 0x91F3, 0x91F9, 0x1B25,
-	/* Array index: 0x0657 */ 0x91FD, 0x9206, 0x1B2C,
-	/* Array index: 0x065A */ 0x9216, 0x921C, 0x1B36,
-	/* Array index: 0x065D */ 0x9224, 0x9227, 0x1B3D,
-	/* Array index: 0x0660 */ 0x922D, 0x9233, 0x1B41,
-	/* Array index: 0x0663 */ 0x924C, 0x9256, 0x1B48,
-	/* Array index: 0x0666 */ 0x9263, 0x9267, 0x1B53,
-	/* Array index: 0x0669 */ 0x926C, 0x9272, 0x1B58,
-	/* Array index: 0x066C */ 0x9279, 0x928E, 0x1B5F,
-	/* Array index: 0x066F */ 0x9297, 0x92AB, 0x1B75,
-	/* Array index: 0x0672 */ 0x92B4, 0x92B6, 0x1B8A,
-	/* Array index: 0x0675 */ 0x92C0, 0x92E1, 0x1B8D,
-	/* Array index: 0x0678 */ 0x92E6, 0x92E9, 0x1BAF,
-	/* Array index: 0x067B */ 0x92F7, 0x9302, 0x1BB3,
-	/* Array index: 0x067E */ 0x9308, 0x9316, 0x1BBF,
-	/* Array index: 0x0681 */ 0x931B, 0x932A, 0x1BCE,
-	/* Array index: 0x0684 */ 0x934C, 0x9359, 0x1BDE,
-	/* Array index: 0x0687 */ 0x9360, 0x9364, 0x1BEC,
-	/* Array index: 0x068A */ 0x9376, 0x937C, 0x1BF1,
-	/* Array index: 0x068D */ 0x9388, 0x9392, 0x1BF8,
-	/* Array index: 0x0690 */ 0x939B, 0x93AA, 0x1C03,
-	/* Array index: 0x0693 */ 0x93B1, 0x93B7, 0x1C13,
-	/* Array index: 0x0696 */ 0x93CC, 0x93D5, 0x1C1A,
-	/* Array index: 0x0699 */ 0x93F5, 0x9400, 0x1C24,
-	/* Array index: 0x069C */ 0x9406, 0x9416, 0x1C30,
-	/* Array index: 0x069F */ 0x9428, 0x942C, 0x1C41,
-	/* Array index: 0x06A2 */ 0x9439, 0x9440, 0x1C46,
-	/* Array index: 0x06A5 */ 0x9445, 0x9450, 0x1C4E,
-	/* Array index: 0x06A8 */ 0x946B, 0x9478, 0x1C5A,
-	/* Array index: 0x06AB */ 0x9480, 0x9483, 0x1C68,
-	/* Array index: 0x06AE */ 0x957A, 0x957D, 0x1C6C,
-	/* Array index: 0x06B1 */ 0x959B, 0x959F, 0x1C70,
-	/* Array index: 0x06B4 */ 0x95B5, 0x95C0, 0x1C75,
-	/* Array index: 0x06B7 */ 0x95D1, 0x95D3, 0x1C81,
-	/* Array index: 0x06BA */ 0x95DA, 0x95E5, 0x1C84,
-	/* Array index: 0x06BD */ 0x9620, 0x9624, 0x1C90,
-	/* Array index: 0x06C0 */ 0x9639, 0x963D, 0x1C95,
-	/* Array index: 0x06C3 */ 0x9687, 0x9689, 0x1C9A,
-	/* Array index: 0x06C6 */ 0x9691, 0x9693, 0x1C9D,
-	/* Array index: 0x06C9 */ 0x971F, 0x972F, 0x1CA0,
-	/* Array index: 0x06CC */ 0x9777, 0x9784, 0x1CB1,
-	/* Array index: 0x06CF */ 0x9799, 0x97A5, 0x1CBF,
-	/* Array index: 0x06D2 */ 0x97A8, 0x97AE, 0x1CCC,
-	/* Array index: 0x06D5 */ 0x97CD, 0x97E5, 0x1CD3,
-	/* Array index: 0x06D8 */ 0x980D, 0x980F, 0x1CEC,
-	/* Array index: 0x06DB */ 0x9826, 0x9829, 0x1CEF,
-	/* Array index: 0x06DE */ 0x9841, 0x984A, 0x1CF3,
-	/* Array index: 0x06E1 */ 0x9850, 0x9852, 0x1CFD,
-	/* Array index: 0x06E4 */ 0x985C, 0x9864, 0x1D00,
-	/* Array index: 0x06E7 */ 0x9872, 0x9874, 0x1D09,
-	/* Array index: 0x06EA */ 0x98AC, 0x98AE, 0x1D0C,
-	/* Array index: 0x06ED */ 0x98BB, 0x98C2, 0x1D0F,
-	/* Array index: 0x06F0 */ 0x9914, 0x9917, 0x1D17,
-	/* Array index: 0x06F3 */ 0x9927, 0x9933, 0x1D1B,
-	/* Array index: 0x06F6 */ 0x999C, 0x999E, 0x1D28,
-	/* Array index: 0x06F9 */ 0x99B9, 0x99BD, 0x1D2B,
-	/* Array index: 0x06FC */ 0x99C9, 0x99CF, 0x1D30,
-	/* Array index: 0x06FF */ 0x99D3, 0x99D8, 0x1D37,
-	/* Array index: 0x0702 */ 0x99E3, 0x99F0, 0x1D3D,
-	/* Array index: 0x0705 */ 0x99F4, 0x9A15, 0x1D4B,
-	/* Array index: 0x0708 */ 0x9A1A, 0x9A3A, 0x1D6D,
-	/* Array index: 0x070B */ 0x9A46, 0x9A56, 0x1D8E,
-	/* Array index: 0x070E */ 0x9A64, 0x9A6B, 0x1D9F,
-	/* Array index: 0x0711 */ 0x9ABE, 0x9AC2, 0x1DA7,
-	/* Array index: 0x0714 */ 0x9AF1, 0x9AFE, 0x1DAC,
-	/* Array index: 0x0717 */ 0x9B08, 0x9B19, 0x1DBA,
-	/* Array index: 0x071A */ 0x9B1E, 0x9B20, 0x1DCC,
-	/* Array index: 0x071D */ 0x9B48, 0x9B4C, 0x1DCF,
-	/* Array index: 0x0720 */ 0x9B5F, 0x9B61, 0x1DD4,
-	/* Array index: 0x0723 */ 0x9B64, 0x9B68, 0x1DD7,
-	/* Array index: 0x0726 */ 0x9B70, 0x9B88, 0x1DDC,
-	/* Array index: 0x0729 */ 0x9B9E, 0x9BA8, 0x1DF5,
-	/* Array index: 0x072C */ 0x9BB5, 0x9BB9, 0x1E00,
-	/* Array index: 0x072F */ 0x9BC3, 0x9BC7, 0x1E05,
-	/* Array index: 0x0732 */ 0x9BD3, 0x9BEC, 0x1E0A,
-	/* Array index: 0x0735 */ 0x9C05, 0x9C0B, 0x1E24,
-	/* Array index: 0x0738 */ 0x9C28, 0x9C2C, 0x1E2B,
-	/* Array index: 0x073B */ 0x9C32, 0x9C41, 0x1E30,
-	/* Array index: 0x073E */ 0x9C48, 0x9C52, 0x1E40,
-	/* Array index: 0x0741 */ 0x9C62, 0x9C68, 0x1E4B,
-	/* Array index: 0x0744 */ 0x9C71, 0x9C75, 0x1E52,
-	/* Array index: 0x0747 */ 0x9CF7, 0x9D00, 0x1E57,
-	/* Array index: 0x074A */ 0x9D04, 0x9D08, 0x1E61,
-	/* Array index: 0x074D */ 0x9D17, 0x9D22, 0x1E66,
-	/* Array index: 0x0750 */ 0x9D2D, 0x9D38, 0x1E72,
-	/* Array index: 0x0753 */ 0x9D3D, 0x9D45, 0x1E7E,
-	/* Array index: 0x0756 */ 0x9D4A, 0x9D4C, 0x1E87,
-	/* Array index: 0x0759 */ 0x9D52, 0x9D5C, 0x1E8A,
-	/* Array index: 0x075C */ 0x9D67, 0x9D8C, 0x1E95,
-	/* Array index: 0x075F */ 0x9D94, 0x9DF8, 0x1EBB,
-	/* Array index: 0x0762 */ 0x9DFB, 0x9E19, 0x1F20,
-	/* Array index: 0x0765 */ 0x9E86, 0x9E8E, 0x1F3F,
-	/* Array index: 0x0768 */ 0x9E99, 0x9E9C, 0x1F48,
-	/* Array index: 0x076B */ 0x9EE4, 0x9EE7, 0x1F4C,
-	/* Array index: 0x076E */ 0x9EF2, 0x9F01, 0x1F50,
-	/* Array index: 0x0771 */ 0x9F18, 0x9F38, 0x1F60,
-	/* Array index: 0x0774 */ 0x9F40, 0x9F4F, 0x1F81,
-	/* Array index: 0x0777 */ 0x9F54, 0x9F60, 0x1F91,
-	/* Array index: 0x077A */ 0x9F6E, 0x9F7B, 0x1F9E,
-	/* Ranges content */
-	/* Range 0x4F12 - 0x4F14, array index: 0x077D */
-	0x217A,0x2177,0x216E,
-	/* Range 0x4F74 - 0x4F89, array index: 0x0780 */
-	0x2539,INVALC,0x2538,0x253C,0x2543,0x2541,INVALC,INVALC,
-	0x2533,0x2535,INVALC,INVALC,0x2536,0x2542,0x2549,INVALC,
-	0x253B,0x2534,INVALC,0x2537,INVALC,0x253A,
-	/* Range 0x4F94 - 0x4F9E, array index: 0x0796 */
-	0x2546,0x254A,INVALC,0x253E,0x2532,INVALC,0x2540,INVALC,
-	0x2545,INVALC,0x2547,
-	/* Range 0x4FB9 - 0x4FBB, array index: 0x07A1 */
-	0x2930,0x292E,0x2929,
-	/* Range 0x4FF4 - 0x4FF7, array index: 0x07A4 */
-	0x2D71,0x2D70,0x2D75,0x2D76,
-	/* Range 0x502F - 0x5037, array index: 0x07A8 */
-	0x2D7C,0x2D6E,0x2D7D,INVALC,0x2D72,INVALC,0x2D7B,INVALC,
-	0x2D73,
-	/* Range 0x505B - 0x506B, array index: 0x07B1 */
-	0x335B,INVALC,0x3356,0x3352,0x3360,0x3353,0x3351,0x335D,
-	0x3363,0x3364,INVALC,INVALC,INVALC,0x3A3F,0x3361,0x3350,
-	0x3362,
-	/* Range 0x509B - 0x509E, array index: 0x07C2 */
-	0x3A35,0x3A40,0x3A3E,0x3A38,
-	/* Range 0x50C6 - 0x50CB, array index: 0x07C6 */
-	0x415B,INVALC,0x4160,0x4167,0x415E,0x4166,
-	/* Range 0x50FD - 0x50FF, array index: 0x07CC */
-	0x4F58,0x4F55,0x4F4E,
-	/* Range 0x5106 - 0x510C, array index: 0x07CF */
-	0x4F52,0x4F53,INVALC,INVALC,0x4F59,0x4F56,0x4F57,
-	/* Range 0x5122 - 0x5126, array index: 0x07D6 */
-	0x5C47,INVALC,0x5C48,0x5C46,0x5C45,
-	/* Range 0x512D - 0x5135, array index: 0x07DB */
-	0x6144,0x6145,INVALC,0x4F50,0x6143,INVALC,INVALC,0x6537,
-	0x6538,
-	/* Range 0x5231 - 0x5235, array index: 0x07E4 */
-	0x2554,0x2551,0x2552,INVALC,0x2550,
-	/* Range 0x525E - 0x5262, array index: 0x07E9 */
-	0x2E2C,0x2E2D,INVALC,0x2E29,0x2E2F,
-	/* Range 0x526B - 0x526E, array index: 0x07EE */
-	0x336C,0x336E,0x336D,0x336F,
-	/* Range 0x5278 - 0x527C, array index: 0x07F2 */
-	0x416C,INVALC,0x416B,0x416D,0x416E,
-	/* Range 0x5296 - 0x5299, array index: 0x07F7 */
-	0x6539,0x6B51,0x6B50,0x6E7E,
-	/* Range 0x5309 - 0x530B, array index: 0x07FB */
-	0x2333,0x2556,0x2557,
-	/* Range 0x5394 - 0x5399, array index: 0x07FE */
-	0x255A,INVALC,0x2939,0x2938,0x293B,0x293A,
-	/* Range 0x5460 - 0x5467, array index: 0x0804 */
-	0x256B,0x256A,INVALC,0x256D,0x256F,0x2564,0x2567,0x256E,
-	/* Range 0x547E - 0x5482, array index: 0x080C */
-	0x2563,0x255C,INVALC,0x255D,0x255F,
-	/* Range 0x54A0 - 0x54A2, array index: 0x0811 */
-	0x2949,0x293D,0x294C,
-	/* Range 0x5503 - 0x5505, array index: 0x0814 */
-	0x2E48,0x2E3C,0x2E40,
-	/* Range 0x5508 - 0x5512, array index: 0x0817 */
-	0x2E3D,INVALC,0x2E42,0x2E49,0x3424,INVALC,0x2E47,INVALC,
-	INVALC,0x2E3F,0x2E36,
-	/* Range 0x5532 - 0x5536, array index: 0x0822 */
-	0x3425,INVALC,0x3379,0x337E,0x337D,
-	/* Range 0x554D - 0x5552, array index: 0x0827 */
-	0x3377,0x3427,INVALC,0x3378,0x337B,0x3422,
-	/* Range 0x5575 - 0x5577, array index: 0x082D */
-	0x3374,0x3375,0x3A4E,
-	/* Range 0x558C - 0x5595, array index: 0x0830 */
-	0x3A5A,0x417C,0x3A5F,0x3A53,INVALC,0x3A4A,0x3A57,0x3A51,
-	INVALC,0x3A5D,
-	/* Range 0x55A1 - 0x55A8, array index: 0x083A */
-	0x3A5E,0x3A50,0x3A56,0x3A58,0x3A4C,0x3A5B,INVALC,0x3A4B,
-	/* Range 0x55BF - 0x55C4, array index: 0x0842 */
-	0x417A,0x4176,INVALC,0x4227,0x416F,0x4178,
-	/* Range 0x55C8 - 0x55D6, array index: 0x0848 */
-	0x4223,INVALC,0x4174,0x4173,0x4171,0x4225,INVALC,0x417D,
-	0x4172,INVALC,0x417B,INVALC,0x4177,0x417E,0x4222,
-	/* Range 0x563D - 0x564C, array index: 0x0857 */
-	0x4F6A,0x4F6C,INVALC,0x4F68,0x4F62,0x4F5F,INVALC,INVALC,
-	0x3A4F,0x4F65,INVALC,0x4F5E,0x4F64,0x4F63,INVALC,0x4F60,
-	/* Range 0x567E - 0x5686, array index: 0x0867 */
-	0x5C52,0x5C54,INVALC,0x5C55,0x5C53,0x5C51,0x5C50,INVALC,
-	0x5C4F,
-	/* Range 0x5697 - 0x569D, array index: 0x0870 */
-	0x6148,0x6146,0x614B,0x6149,INVALC,0x6147,0x614A,
-	/* Range 0x56A6 - 0x56AD, array index: 0x0877 */
-	0x653E,0x653F,INVALC,INVALC,0x6540,0x653C,0x6541,0x653D,
-	/* Range 0x571A - 0x5723, array index: 0x087F */
-	0x4F70,0x5652,0x5651,INVALC,0x715A,INVALC,0x2139,INVALC,
-	0x214F,0x2150,
-	/* Range 0x576D - 0x5776, array index: 0x0889 */
-	0x2574,INVALC,0x2572,0x2577,0x2576,0x2573,0x257C,0x257D,
-	0x257A,0x2578,
-	/* Range 0x5794 - 0x579F, array index: 0x0893 */
-	0x2959,0x295F,INVALC,0x2956,0x295A,0x295C,0x295E,0x2958,
-	INVALC,0x2957,0x2952,0x2953,
-	/* Range 0x57B5 - 0x57C1, array index: 0x089F */
-	0x2951,0x2E55,INVALC,0x2E54,0x2E59,0x2E50,INVALC,0x2E53,
-	0x2E52,INVALC,0x2E56,INVALC,0x2E5A,
-	/* Range 0x57E1 - 0x5801, array index: 0x08AC */
-	0x3444,0x3432,0x3440,INVALC,0x3442,INVALC,0x3448,INVALC,
-	0x344C,INVALC,INVALC,0x3443,0x3437,0x343F,INVALC,0x344D,
-	0x344B,0x3441,0x343C,0x3435,0x3A68,0x3433,INVALC,0x343A,
-	INVALC,INVALC,0x3430,0x3446,0x3438,INVALC,INVALC,0x3436,
-	0x3449,
-	/* Range 0x5807 - 0x5810, array index: 0x08CD */
-	0x343E,0x3439,INVALC,INVALC,0x343B,0x344A,0x344E,0x3445,
-	INVALC,0x3447,
-	/* Range 0x5825 - 0x582E, array index: 0x08D7 */
-	0x3A6A,INVALC,0x3A65,0x3A67,0x3A61,INVALC,INVALC,0x3A74,
-	0x3A73,0x3A70,
-	/* Range 0x5832 - 0x583F, array index: 0x08E1 */
-	0x2E4D,0x3A6D,INVALC,INVALC,0x3A6F,0x3A62,0x3A72,0x3A71,
-	INVALC,0x3A75,INVALC,0x4236,INVALC,0x3A6E,
-	/* Range 0x584D - 0x584F, array index: 0x08EF */
-	0x422D,0x4231,0x422C,
-	/* Range 0x5863 - 0x5865, array index: 0x08F2 */
-	0x4237,0x422B,0x4234,
-	/* Range 0x587A - 0x587C, array index: 0x08F5 */
-	0x4946,0x494D,0x493E,
-	/* Range 0x5886 - 0x5891, array index: 0x08F8 */
-	0x4941,0x4947,0x494C,0x493D,INVALC,0x4945,INVALC,INVALC,
-	0x4949,0x494F,0x493F,0x4948,
-	/* Range 0x590C - 0x590E, array index: 0x0904 */
-	0x2623,0x2961,0x2E5B,
-	/* Range 0x5970 - 0x5972, array index: 0x0907 */
-	0x614C,0x6D48,0x6F23,
-	/* Range 0x597B - 0x5980, array index: 0x090A */
-	0x222F,0x222D,INVALC,0x2230,0x2232,0x222C,
-	/* Range 0x598E - 0x5990, array index: 0x0910 */
-	0x2356,0x2359,0x2358,
-	/* Range 0x59A0 - 0x59A2, array index: 0x0913 */
-	0x2354,0x235B,0x2357,
-	/* Range 0x59B1 - 0x59B6, array index: 0x0916 */
-	0x2630,0x2629,INVALC,0x2634,0x2625,0x262C,
-	/* Range 0x59DD - 0x59E1, array index: 0x091C */
-	0x2968,0x2964,INVALC,0x2974,0x2963,
-	/* Range 0x59ED - 0x59F7, array index: 0x0921 */
-	0x2977,0x2965,INVALC,INVALC,0x2967,0x296E,0x2972,0x2976,
-	0x2973,0x296C,0x296F,
-	/* Range 0x59FA - 0x5A00, array index: 0x092C */
-	0x2969,INVALC,0x296B,0x296A,0x2975,INVALC,0x2966,
-	/* Range 0x5A15 - 0x5A19, array index: 0x0933 */
-	0x2E61,0x2E5E,0x2E63,INVALC,0x2E5D,
-	/* Range 0x5A35 - 0x5A39, array index: 0x0938 */
-	0x3457,INVALC,0x3B26,0x3456,0x3469,
-	/* Range 0x5A42 - 0x5A48, array index: 0x093D */
-	0x3470,0x3460,0x3463,INVALC,INVALC,0x346D,0x3465,
-	/* Range 0x5A4C - 0x5A60, array index: 0x0944 */
-	0x346A,0x3468,INVALC,INVALC,0x3459,0x346E,0x3462,0x345D,
-	INVALC,0x3453,0x346F,0x345F,0x3452,INVALC,INVALC,0x3464,
-	0x3471,0x3461,0x3455,0x345A,0x3451,
-	/* Range 0x5A78 - 0x5A7D, array index: 0x0959 */
-	0x3A7D,INVALC,0x3A7A,0x3B2D,0x3B21,0x3B2E,
-	/* Range 0x5A8A - 0x5A97, array index: 0x095F */
-	0x3B28,0x3B2B,0x3B2F,INVALC,0x3466,0x3B31,0x424D,INVALC,
-	INVALC,0x3B32,0x3A78,0x3B24,INVALC,0x3B29,
-	/* Range 0x5A9C - 0x5A9F, array index: 0x096D */
-	0x3B30,0x3B33,0x3A7C,0x3A79,
-	/* Range 0x5AAC - 0x5ABB, array index: 0x0971 */
-	0x3B23,INVALC,0x3B25,0x3A77,0x4241,0x423F,INVALC,INVALC,
-	0x4249,0x4240,0x424A,0x4246,0x423E,0x424C,0x423D,0x4244,
-	/* Range 0x5AC4 - 0x5ACD, array index: 0x0981 */
-	0x423B,INVALC,0x4245,0x423A,0x4243,INVALC,0x4248,0x423C,
-	INVALC,0x424B,
-	/* Range 0x5AD9 - 0x5AE2, array index: 0x098B */
-	0x4961,0x4957,0x495D,0x4952,0x4960,0x495F,0x4963,0x495C,
-	INVALC,0x495B,
-	/* Range 0x5AE8 - 0x5AEE, array index: 0x0995 */
-	0x4962,INVALC,0x4956,0x4959,0x495E,0x4958,0x4953,
-	/* Range 0x5AF3 - 0x5AF9, array index: 0x099C */
-	0x495A,0x4F7C,INVALC,0x5021,0x4F7E,0x5023,0x5025,
-	/* Range 0x5AFF - 0x5B07, array index: 0x09A3 */
-	0x4F7B,INVALC,0x5026,0x5024,0x5022,INVALC,0x5028,INVALC,
-	0x5027,
-	/* Range 0x5B13 - 0x5B1B, array index: 0x09AC */
-	0x5660,0x565F,INVALC,0x5662,0x565B,INVALC,0x565C,0x5664,
-	0x565D,
-	/* Range 0x5B23 - 0x5B2F, array index: 0x09B5 */
-	0x5C5D,INVALC,0x5C5B,0x5C60,0x5C5F,0x5663,INVALC,INVALC,
-	INVALC,0x5C5E,0x5C5A,0x5C62,0x5C61,
-	/* Range 0x5B3C - 0x5B3F, array index: 0x09C2 */
-	0x614D,0x6546,0x6547,0x6548,
-	/* Range 0x5B47 - 0x5B4E, array index: 0x09C6 */
-	0x6B56,0x6B55,INVALC,INVALC,0x6D49,0x6D4A,0x6F24,0x7035,
-	/* Range 0x5BCA - 0x5BCE, array index: 0x09CE */
-	0x3B39,0x3B36,INVALC,0x3B35,0x3B3A,
-	/* Range 0x5C7A - 0x5C7E, array index: 0x09D3 */
-	0x2237,0x2238,0x2236,INVALC,0x2239,
-	/* Range 0x5C86 - 0x5C95, array index: 0x09D8 */
-	0x2367,INVALC,0x2362,0x2364,0x2366,0x2363,INVALC,0x2360,
-	INVALC,0x2361,INVALC,INVALC,0x2365,0x2368,INVALC,0x2369,
-	/* Range 0x5C9F - 0x5CB0, array index: 0x09E8 */
-	0x2643,0x263E,INVALC,0x2646,0x2644,0x263D,0x264A,0x264D,
-	0x2648,0x2641,INVALC,0x2647,INVALC,0x2642,0x2645,0x263C,
-	0x2640,0x264C,
-	/* Range 0x5CC6 - 0x5CDF, array index: 0x09FA */
-	0x2A2C,0x2A25,0x2A2B,0x2A24,0x2A26,0x297E,0x297C,INVALC,
-	0x2A2D,0x2A2A,0x297A,INVALC,INVALC,0x2A28,0x2A29,INVALC,
-	0x2A27,0x297D,0x297B,INVALC,0x2A23,0x2A21,INVALC,INVALC,
-	0x2A22,0x2A2E,
-	/* Range 0x5CF7 - 0x5CF9, array index: 0x0A14 */
-	0x2E72,0x2A2F,0x2E74,
-	/* Range 0x5D0B - 0x5D0F, array index: 0x0A17 */
-	0x3478,0x347C,0x347E,INVALC,0x3523,
-	/* Range 0x5D1D - 0x5D20, array index: 0x0A1C */
-	0x3479,0x3477,0x3527,0x347B,
-	/* Range 0x5D2E - 0x5D4B, array index: 0x0A20 */
-	0x3528,INVALC,0x3524,0x3B4B,0x3B52,0x3B47,INVALC,0x3B43,
-	0x3B53,0x3B3D,0x3B50,0x3B4E,0x3B48,INVALC,0x3B51,0x3B4A,
-	INVALC,0x3B42,0x3B54,0x3B40,0x3B4D,0x3B3E,INVALC,0x3B55,
-	INVALC,INVALC,INVALC,0x3B4F,0x4255,0x3B41,
-	/* Range 0x5D79 - 0x5D82, array index: 0x0A3E */
-	0x4975,0x496C,INVALC,0x4973,0x496A,0x4972,0x4976,0x4969,
-	0x496D,0x4968,
-	/* Range 0x5D86 - 0x5D8A, array index: 0x0A48 */
-	0x496B,INVALC,0x4971,0x4970,0x496F,
-	/* Range 0x5D9C - 0x5DA2, array index: 0x0A4D */
-	0x5033,INVALC,0x5036,0x502D,0x5032,0x5034,0x502F,
-	/* Range 0x5DA7 - 0x5DB7, array index: 0x0A54 */
-	0x566B,0x5670,0x566A,0x566F,INVALC,0x5668,0x5672,0x566E,
-	0x5673,0x566D,0x5669,0x5671,INVALC,0x5674,0x566C,INVALC,
-	0x5C66,
-	/* Range 0x5E20 - 0x5E24, array index: 0x0A65 */
-	0x2A34,0x2A31,0x2A32,0x2A33,0x2A35,
-	/* Range 0x5E4A - 0x5E4F, array index: 0x0A6A */
-	0x4260,0x4262,INVALC,0x4261,0x425F,0x425E,
-	/* Range 0x5E66 - 0x5E70, array index: 0x0A70 */
-	0x5677,0x5675,0x5676,0x5037,0x5C68,INVALC,0x5C67,0x6151,
-	0x6152,0x5678,0x654A,
-	/* Range 0x5E88 - 0x5E8D, array index: 0x0A7B */
-	0x2370,0x236E,INVALC,0x236D,0x236F,0x2371,
-	/* Range 0x5EA2 - 0x5EA5, array index: 0x0A81 */
-	0x2A38,0x2A3A,0x2A37,0x2A3B,
-	/* Range 0x5EAE - 0x5EB4, array index: 0x0A85 */
-	0x2E78,INVALC,0x2A36,0x352B,0x352E,0x352F,0x352C,
-	/* Range 0x5EC5 - 0x5EC7, array index: 0x0A8C */
-	0x4263,0x4265,0x4267,
-	/* Range 0x5ED1 - 0x5EDE, array index: 0x0A8F */
-	0x497B,0x4A23,INVALC,0x4A24,0x4A21,INVALC,0x497C,0x497A,
-	0x4A22,INVALC,0x503C,0x497E,INVALC,0x503D,
-	/* Range 0x5EE5 - 0x5EE9, array index: 0x0A9D */
-	0x567D,0x567B,0x567A,0x567C,0x5679,
-	/* Range 0x5EEE - 0x5EF2, array index: 0x0AA2 */
-	0x6872,0x6873,INVALC,0x6B59,0x6D4D,
-	/* Range 0x5F22 - 0x5F24, array index: 0x0AA7 */
-	0x2652,0x2653,0x2654,
-	/* Range 0x5FBB - 0x5FC1, array index: 0x0AAA */
-	0x5722,0x5721,INVALC,0x5C69,0x654B,0x6874,0x6875,
-	/* Range 0x5FCF - 0x5FD5, array index: 0x0AB1 */
-	0x2242,0x2378,0x2377,0x2376,INVALC,0x2241,0x2240,
-	/* Range 0x5FE1 - 0x5FE5, array index: 0x0AB8 */
-	0x237D,INVALC,0x2421,0x237E,0x265A,
-	/* Range 0x5FED - 0x5FEF, array index: 0x0ABD */
-	0x2379,0x237B,0x2423,
-	/* Range 0x6009 - 0x6013, array index: 0x0AC0 */
-	0x266E,0x2661,0x265F,0x266D,0x2668,INVALC,INVALC,0x2669,
-	0x266C,INVALC,0x266B,
-	/* Range 0x602C - 0x6034, array index: 0x0ACB */
-	0x2666,0x265B,0x266A,INVALC,INVALC,INVALC,0x265E,0x2663,
-	0x2660,
-	/* Range 0x6040 - 0x6049, array index: 0x0AD4 */
-	0x2A4B,0x2F23,0x2A4C,INVALC,0x2A4F,0x2A45,INVALC,0x2A47,
-	INVALC,0x2A48,
-	/* Range 0x605A - 0x605F, array index: 0x0ADE */
-	0x2F21,0x2A49,INVALC,0x2E7E,0x2A44,0x2A4D,
-	/* Range 0x6086 - 0x608A, array index: 0x0AE4 */
-	0x3537,0x2F2E,0x2F25,INVALC,0x3535,
-	/* Range 0x609B - 0x609D, array index: 0x0AE9 */
-	0x2F2C,0x2F2F,0x2F29,
-	/* Range 0x60BE - 0x60CF, array index: 0x0AEC */
-	0x3538,0x3546,0x3549,0x3B6C,INVALC,0x3547,0x3B61,INVALC,
-	INVALC,INVALC,0x3541,0x3B5C,0x3545,INVALC,0x3B5E,0x3548,
-	0x3B60,0x353D,
-	/* Range 0x6103 - 0x6105, array index: 0x0AFE */
-	0x3B6D,0x3B72,0x3B66,
-	/* Range 0x6128 - 0x612F, array index: 0x0B01 */
-	0x4A2A,0x4276,INVALC,0x426E,0x4A29,INVALC,0x4272,0x4274,
-	/* Range 0x6152 - 0x6156, array index: 0x0B09 */
-	0x4A2F,0x4A30,0x4A35,INVALC,0x4A3C,
-	/* Range 0x6171 - 0x6174, array index: 0x0B0E */
-	0x4A2D,0x4A31,0x4A2E,0x4A34,
-	/* Range 0x6189 - 0x618D, array index: 0x0B12 */
-	0x5047,INVALC,0x5041,0x572E,0x5050,
-	/* Range 0x61AD - 0x61B5, array index: 0x0B17 */
-	0x504B,INVALC,0x504A,0x5045,0x5044,INVALC,0x5052,0x5727,
-	0x5C6B,
-	/* Range 0x61DE - 0x61E0, array index: 0x0B20 */
-	0x5C72,0x6154,0x5C6E,
-	/* Range 0x61E4 - 0x61F1, array index: 0x0B23 */
-	0x5C70,0x5C6F,INVALC,0x5C6D,0x5C71,0x615C,0x6158,0x615A,
-	INVALC,0x6155,0x6156,INVALC,0x6159,0x6157,
-	/* Range 0x6223 - 0x622D, array index: 0x0B31 */
-	0x427A,0x427C,0x427B,INVALC,0x4A3E,INVALC,0x4A3D,INVALC,
-	0x4A3F,INVALC,0x5053,
-	/* Range 0x625E - 0x6266, array index: 0x0B3C */
-	0x2244,INVALC,0x224A,0x2246,0x2248,INVALC,0x2245,0x224C,
-	0x2247,
-	/* Range 0x6270 - 0x6274, array index: 0x0B45 */
-	0x2432,0x242F,0x2437,INVALC,0x2438,
-	/* Range 0x62A9 - 0x62B8, array index: 0x0B4A */
-	0x267D,0x2676,INVALC,INVALC,0x2672,0x2679,0x267B,0x267E,
-	INVALC,INVALC,0x267A,0x2673,INVALC,0x2677,INVALC,0x2721,
-	/* Range 0x62F5 - 0x62FB, array index: 0x0B5A */
-	0x2A58,0x2A60,INVALC,0x2A5F,0x2A5C,0x2A64,0x2A66,
-	/* Range 0x630B - 0x6315, array index: 0x0B61 */
-	0x2A57,0x2A5E,0x2A56,0x2A59,0x2A5D,0x2F34,INVALC,INVALC,
-	0x2A62,0x2A63,0x2A65,
-	/* Range 0x6332 - 0x633C, array index: 0x0B6C */
-	0x354A,0x2F48,0x2F42,INVALC,0x2F39,INVALC,0x2F4B,0x2F3C,
-	INVALC,0x3561,0x2F3F,
-	/* Range 0x6340 - 0x634B, array index: 0x0B77 */
-	0x2F4D,0x2F41,INVALC,0x2F3A,0x2F37,0x2F38,INVALC,0x2F47,
-	0x2F4E,INVALC,0x2F3E,0x2F3D,
-	/* Range 0x6354 - 0x635A, array index: 0x0B83 */
-	0x2F44,INVALC,0x2F35,0x2F4C,0x2F43,0x2F45,0x2F49,
-	/* Range 0x636D - 0x6370, array index: 0x0B8A */
-	0x355D,0x3559,0x3556,0x3568,
-	/* Range 0x638D - 0x6391, array index: 0x0B8E */
-	0x3567,0x3555,INVALC,0x3558,0x3566,
-	/* Range 0x639C - 0x639F, array index: 0x0B93 */
-	0x355C,0x3552,0x3550,0x3562,
-	/* Range 0x63AB - 0x63B1, array index: 0x0B97 */
-	0x3554,INVALC,0x3551,0x355E,0x355A,0x3B77,0x3B76,
-	/* Range 0x63C2 - 0x63CE, array index: 0x0B9E */
-	0x3C2F,0x3B7C,0x3C2C,0x427D,INVALC,0x3C30,0x3C33,INVALC,
-	0x3C21,0x3C32,0x3C31,INVALC,0x3B78,
-	/* Range 0x63D5 - 0x63E0, array index: 0x0BAB */
-	0x3C24,INVALC,0x3C35,0x3C2D,0x3C36,INVALC,INVALC,0x3C2B,
-	0x3C2A,INVALC,0x3C28,0x3C22,
-	/* Range 0x63E4 - 0x63E8, array index: 0x0BB7 */
-	0x2F3B,0x3B79,INVALC,0x433D,0x3B7A,
-	/* Range 0x63EF - 0x63F6, array index: 0x0BBC */
-	0x3B7B,0x3C34,0x427E,0x3C25,0x3B7E,INVALC,0x3C26,0x3C23,
-	/* Range 0x6409 - 0x6412, array index: 0x0BC4 */
-	0x4324,0x4337,0x433C,0x4330,INVALC,0x4341,INVALC,0x4322,
-	INVALC,0x4323,
-	/* Range 0x641F - 0x6428, array index: 0x0BCE */
-	0x4329,0x4325,0x4340,0x432E,0x432F,0x4326,0x433A,0x4331,
-	0x433B,0x4333,
-	/* Range 0x642E - 0x6430, array index: 0x0BD8 */
-	0x433F,0x4336,0x4332,
-	/* Range 0x643F - 0x6443, array index: 0x0BDB */
-	0x4A55,0x4339,0x4334,INVALC,0x4328,
-	/* Range 0x6459 - 0x6461, array index: 0x0BE0 */
-	0x4A58,INVALC,0x4A42,0x4A4F,0x4A43,0x4A4E,INVALC,0x4A52,
-	0x3C27,
-	/* Range 0x6470 - 0x6477, array index: 0x0BE9 */
-	0x5055,INVALC,0x4A46,0x4A47,0x4A44,0x4A49,0x4A45,0x4A5A,
-	/* Range 0x6489 - 0x648C, array index: 0x0BF1 */
-	0x5735,0x505D,0x505C,0x505E,
-	/* Range 0x6496 - 0x6498, array index: 0x0BF5 */
-	0x5056,0x5059,0x5063,
-	/* Range 0x649C - 0x64A0, array index: 0x0BF8 */
-	0x505A,0x3B7D,INVALC,0x5060,0x5057,
-	/* Range 0x650C - 0x6510, array index: 0x0BFD */
-	0x6551,0x654F,0x6552,INVALC,0x654E,
-	/* Range 0x6513 - 0x6517, array index: 0x0C02 */
-	0x687A,INVALC,0x6879,0x6878,0x6877,
-	/* Range 0x6520 - 0x6526, array index: 0x0C07 */
-	0x6D4F,0x6D4E,0x6D51,INVALC,INVALC,0x6F2C,0x6D50,
-	/* Range 0x6564 - 0x656A, array index: 0x0C0E */
-	0x3C3A,0x3C3D,INVALC,0x3C38,0x3C3C,INVALC,0x3C39,
-	/* Range 0x6579 - 0x6581, array index: 0x0C15 */
-	0x5066,0x5065,0x5067,0x573C,INVALC,INVALC,0x573B,0x5C7A,
-	0x5C79,
-	/* Range 0x65C2 - 0x65C6, array index: 0x0C1E */
-	0x2F54,0x2F52,0x2F53,INVALC,0x2F51,
-	/* Range 0x65DA - 0x65E1, array index: 0x0C23 */
-	0x5C7C,0x6165,INVALC,0x6555,0x6554,0x687B,INVALC,0x213E,
-	/* Range 0x65EE - 0x65F5, array index: 0x0C2B */
-	0x224F,0x224E,0x2439,INVALC,0x243C,0x243B,0x243A,0x243D,
-	/* Range 0x65FB - 0x65FD, array index: 0x0C33 */
-	0x272A,0x2726,0x272F,
-	/* Range 0x6603 - 0x6612, array index: 0x0C36 */
-	0x272B,0x2727,0x272E,INVALC,INVALC,0x2729,0x2725,INVALC,
-	0x272C,INVALC,0x272D,INVALC,INVALC,0x2731,0x2730,0x2728,
-	/* Range 0x6632 - 0x663A, array index: 0x0C46 */
-	0x2A6E,0x2A73,0x2A77,0x2A6F,0x2A6C,INVALC,INVALC,0x2A78,
-	0x2A75,
-	/* Range 0x6678 - 0x667C, array index: 0x0C4F */
-	0x434D,0x3C49,INVALC,0x3C46,0x3C44,
-	/* Range 0x668A - 0x668C, array index: 0x0C54 */
-	0x434A,0x4349,0x4346,
-	/* Range 0x669F - 0x66A1, array index: 0x0C57 */
-	0x4A5F,0x4A5E,0x4A5D,
-	/* Range 0x66BA - 0x66C0, array index: 0x0C5A */
-	0x5746,0x5745,INVALC,0x5744,0x573F,INVALC,0x5740,
-	/* Range 0x66C8 - 0x66CC, array index: 0x0C61 */
-	0x573E,INVALC,0x5741,0x5742,0x5747,
-	/* Range 0x670F - 0x6713, array index: 0x0C66 */
-	0x2A7A,0x2A7B,INVALC,0x2F59,0x2F5A,
-	/* Range 0x6720 - 0x6723, array index: 0x0C6B */
-	0x434E,0x4641,0x4A62,0x5748,
-	/* Range 0x6738 - 0x673F, array index: 0x0C6F */
-	0x2252,0x2251,0x2254,0x2253,0x2256,INVALC,0x2250,0x2255,
-	/* Range 0x6747 - 0x674D, array index: 0x0C77 */
-	0x243F,0x2443,INVALC,INVALC,0x2447,0x2442,0x2445,
-	/* Range 0x6776 - 0x677D, array index: 0x0C7E */
-	0x2738,INVALC,0x2747,0x2748,0x2740,0x2739,INVALC,0x2745,
-	/* Range 0x6781 - 0x6786, array index: 0x0C86 */
-	0x2746,INVALC,0x2744,0x273C,0x2734,0x273B,
-	/* Range 0x678C - 0x6794, array index: 0x0C8C */
-	0x273F,0x273E,0x2736,INVALC,INVALC,0x2742,0x2737,INVALC,
-	0x2749,
-	/* Range 0x67B7 - 0x67BB, array index: 0x0C95 */
-	0x2B27,INVALC,0x2B34,0x2B21,0x2B23,
-	/* Range 0x67C0 - 0x67CE, array index: 0x0C9A */
-	0x2B26,0x2A7C,0x2B33,0x2B43,INVALC,0x2B28,0x2B3A,INVALC,
-	0x2A7E,0x2B41,0x2B42,0x2B45,0x2B3C,0x2B2D,0x2B35,
-	/* Range 0x67E3 - 0x67FC, array index: 0x0CA9 */
-	0x2B32,0x2B2A,INVALC,0x2B3E,0x2B36,INVALC,INVALC,0x2B44,
-	0x2B29,INVALC,0x2B3B,0x2B31,INVALC,0x2B37,INVALC,0x2A7D,
-	INVALC,INVALC,INVALC,0x2B30,0x2B2F,0x2B24,INVALC,0x2B40,
-	INVALC,0x2B39,
-	/* Range 0x681C - 0x6820, array index: 0x0CC3 */
-	0x2F65,0x2F6D,INVALC,0x2F5B,0x2F76,
-	/* Range 0x682B - 0x6835, array index: 0x0CC8 */
-	0x2F67,INVALC,0x2F68,0x2F72,0x2F69,INVALC,0x2F64,0x2F5E,
-	0x2F5F,0x2F6C,0x2F66,
-	/* Range 0x684B - 0x684F, array index: 0x0CD3 */
-	0x2F61,INVALC,0x2F73,0x2F6A,0x2F62,
-	/* Range 0x686B - 0x6880, array index: 0x0CD8 */
-	0x3628,INVALC,0x3576,0x3577,0x357B,INVALC,0x362C,0x3629,
-	INVALC,0x3622,0x3621,INVALC,0x3625,0x3634,0x3572,INVALC,
-	0x3635,0x3627,0x3639,0x362D,INVALC,0x362B,
-	/* Range 0x6887 - 0x6892, array index: 0x0CEE */
-	0x3573,INVALC,0x3632,0x3638,0x3630,0x3637,INVALC,INVALC,
-	0x3624,0x3574,0x3636,0x3626,
-	/* Range 0x68A9 - 0x68AE, array index: 0x0CFA */
-	0x357E,0x362A,0x3579,0x357D,INVALC,0x3578,
-	/* Range 0x68C6 - 0x68C8, array index: 0x0D00 */
-	0x3C66,0x3C7C,0x3C71,
-	/* Range 0x68D0 - 0x68D6, array index: 0x0D03 */
-	0x3C69,0x3C76,INVALC,0x3C4E,0x3C78,INVALC,0x3C56,
-	/* Range 0x68DC - 0x68DE, array index: 0x0D0A */
-	0x3C50,0x3C72,0x3C73,
-	/* Range 0x68E6 - 0x68F8, array index: 0x0D0D */
-	0x3C74,INVALC,0x3C6C,0x3C79,0x3C53,0x3C58,0x3C52,INVALC,
-	INVALC,0x3C65,0x4364,0x3C54,INVALC,0x3C5D,0x3C75,INVALC,
-	0x3C5A,0x3C57,0x3C68,
-	/* Range 0x6904 - 0x6917, array index: 0x0D20 */
-	0x3C4F,INVALC,0x3C77,0x3C5F,0x3C61,INVALC,0x3C6E,0x3C6D,
-	0x3C4D,INVALC,INVALC,0x3C55,0x3C5C,0x3C64,INVALC,0x3C5B,
-	0x3C67,0x3C7A,INVALC,0x3C6F,
-	/* Range 0x6932 - 0x6959, array index: 0x0D34 */
-	0x4376,0x4361,0x4366,0x435F,INVALC,0x4372,0x4351,0x4358,
-	INVALC,0x4370,0x437A,0x4362,INVALC,0x4355,0x4368,0x436D,
-	0x4359,INVALC,0x436A,0x4356,INVALC,INVALC,0x435D,0x435E,
-	INVALC,0x4371,0x436F,INVALC,0x4352,0x4374,INVALC,0x4375,
-	0x4377,INVALC,INVALC,INVALC,0x357A,0x435A,0x436C,0x435B,
-	/* Range 0x696F - 0x6971, array index: 0x0D5C */
-	0x4369,0x3C62,0x4354,
-	/* Range 0x698D - 0x699A, array index: 0x0D5F */
-	0x4A70,0x4A6E,INVALC,0x4B26,0x4A6C,INVALC,0x4A7E,INVALC,
-	INVALC,0x4A68,0x4B25,INVALC,0x4A6D,0x4A7B,
-	/* Range 0x69AF - 0x69B6, array index: 0x0D6D */
-	0x4A73,0x4A69,0x4A63,INVALC,0x4A7D,INVALC,0x4B28,0x4A64,
-	/* Range 0x69BC - 0x69BF, array index: 0x0D75 */
-	0x4A6B,0x4A76,0x4A72,0x4A74,
-	/* Range 0x69E2 - 0x69E7, array index: 0x0D79 */
-	0x507C,INVALC,0x5078,0x5074,0x512A,0x5127,
-	/* Range 0x69F4 - 0x6A00, array index: 0x0D7F */
-	0x5137,INVALC,0x5134,0x5126,0x5075,INVALC,INVALC,0x512B,
-	0x512D,INVALC,0x5121,0x507A,0x5071,
-	/* Range 0x6A04 - 0x6A09, array index: 0x0D8C */
-	0x5130,INVALC,0x5072,0x5136,0x5129,0x512F,
-	/* Range 0x6A14 - 0x6A18, array index: 0x0D92 */
-	0x5125,0x5076,0x5138,0x5073,0x5131,
-	/* Range 0x6A25 - 0x6A28, array index: 0x0D97 */
-	0x5132,0x5135,0x5122,0x5755,
-	/* Range 0x6A3B - 0x6A41, array index: 0x0D9B */
-	0x5757,0x5762,INVALC,0x574F,0x5758,0x5128,0x5759,
-	/* Range 0x6A4D - 0x6A56, array index: 0x0DA2 */
-	0x5766,0x5767,0x575D,0x575C,0x5754,INVALC,INVALC,0x575E,
-	0x5765,0x5764,
-	/* Range 0x6A5A - 0x6A60, array index: 0x0DAC */
-	0x5756,0x5753,INVALC,0x5750,0x5763,INVALC,0x5761,
-	/* Range 0x6A64 - 0x6A6A, array index: 0x0DB3 */
-	0x575B,INVALC,0x574A,0x574C,0x574E,0x5760,0x575A,
-	/* Range 0x6A8C - 0x6A96, array index: 0x0DBA */
-	0x5D35,0x5C7E,0x5D2B,INVALC,INVALC,0x5D30,0x5D36,0x5D2A,
-	INVALC,0x5D2C,0x5D21,
-	/* Range 0x6AA4 - 0x6AA8, array index: 0x0DC5 */
-	0x5D2F,0x5D23,0x5D32,INVALC,0x5D2E,
-	/* Range 0x6AB6 - 0x6ABA, array index: 0x0DCA */
-	0x616F,0x6170,INVALC,0x616A,0x616E,
-	/* Range 0x6AC5 - 0x6AD1, array index: 0x0DCF */
-	0x6169,0x616D,0x6171,INVALC,INVALC,INVALC,0x655C,0x6559,
-	0x6562,INVALC,0x6561,0x655F,0x655A,
-	/* Range 0x6ADC - 0x6AE1, array index: 0x0DDC */
-	0x655E,INVALC,0x6563,0x655D,0x6558,0x616C,
-	/* Range 0x6AE7 - 0x6AF3, array index: 0x0DE2 */
-	0x6557,0x6924,INVALC,0x6923,0x6560,INVALC,INVALC,0x6927,
-	0x6928,0x6922,0x6926,INVALC,0x6921,
-	/* Range 0x6B0F - 0x6B1A, array index: 0x0DEF */
-	0x6F31,INVALC,0x6F2F,0x6F30,0x703A,INVALC,INVALC,INVALC,
-	0x7123,0x7121,0x7122,0x7124,
-	/* Range 0x6B33 - 0x6B3C, array index: 0x0DFB */
-	0x363B,0x2F7B,INVALC,0x363A,0x363C,0x363D,0x3C7D,INVALC,
-	0x3C7E,0x3D22,
-	/* Range 0x6B3F - 0x6B4D, array index: 0x0E05 */
-	0x3D21,INVALC,0x4422,0x437E,0x437D,INVALC,0x437C,0x437B,
-	INVALC,0x4421,INVALC,0x4B2B,0x4B2D,INVALC,0x4B2C,
-	/* Range 0x6B54 - 0x6B56, array index: 0x0E14 */
-	0x576A,0x5769,0x576B,
-	/* Range 0x6B8C - 0x6BAD, array index: 0x0E17 */
-	0x3642,0x3640,0x3641,0x363F,INVALC,0x363E,INVALC,INVALC,
-	0x3D23,0x3D26,INVALC,0x3D24,INVALC,0x3D25,INVALC,0x4423,
-	INVALC,INVALC,0x4B2E,0x4B2F,0x4B30,INVALC,0x513C,0x513B,
-	INVALC,0x513A,0x513D,0x576C,INVALC,INVALC,0x576D,0x576E,
-	INVALC,0x5D38,
-	/* Range 0x6BC3 - 0x6BCC, array index: 0x0E39 */
-	0x4B31,0x4B32,INVALC,INVALC,0x5770,0x576F,0x6175,0x6F32,
-	INVALC,0x2140,
-	/* Range 0x6BE0 - 0x6BE8, array index: 0x0E43 */
-	0x2B4C,INVALC,0x3025,0x3024,0x3022,INVALC,0x3021,0x3026,
-	0x3023,
-	/* Range 0x6BF7 - 0x6C06, array index: 0x0E4C */
-	0x4427,0x4428,0x4426,INVALC,0x4424,0x4425,INVALC,0x4B33,
-	0x5140,0x513F,0x513E,0x5141,0x5772,0x5771,INVALC,0x5773,
-	/* Range 0x6C09 - 0x6C0D, array index: 0x0E5C */
-	0x5D39,INVALC,0x6176,0x6566,0x6D55,
-	/* Range 0x6C14 - 0x6C1A, array index: 0x0E61 */
-	0x2141,0x215F,INVALC,INVALC,0x2258,0x2449,0x244A,
-	/* Range 0x6C4A - 0x6C4C, array index: 0x0E68 */
-	0x225D,0x225F,0x2260,
-	/* Range 0x6C65 - 0x6C73, array index: 0x0E6B */
-	0x245B,0x2459,0x244C,INVALC,0x2453,INVALC,0x244D,INVALC,
-	0x2455,INVALC,0x2452,INVALC,0x2451,INVALC,0x245A,
-	/* Range 0x6CCD - 0x6CD4, array index: 0x0E7A */
-	0x2769,INVALC,0x276D,0x2759,0x276F,0x2760,INVALC,0x2755,
-	/* Range 0x6CE9 - 0x6CEE, array index: 0x0E82 */
-	0x276E,INVALC,0x2751,0x2750,0x275E,0x2752,
-	/* Range 0x6D00 - 0x6D0A, array index: 0x0E88 */
-	0x2B5E,0x2B61,INVALC,0x2B64,0x2B59,INVALC,INVALC,0x2B67,
-	0x2B6A,0x2B6C,0x2B56,
-	/* Range 0x6D0D - 0x6D12, array index: 0x0E93 */
-	0x302C,INVALC,0x2B65,0x2B6D,0x2B5D,0x2B55,
-	/* Range 0x6D16 - 0x6D1A, array index: 0x0E99 */
-	0x3047,INVALC,0x2B62,0x2B5A,0x2B5C,
-	/* Range 0x6D2C - 0x6D34, array index: 0x0E9E */
-	0x2B69,0x2B51,INVALC,0x3041,0x2768,INVALC,INVALC,0x2B58,
-	0x2B50,
-	/* Range 0x6D5E - 0x6D68, array index: 0x0EA7 */
-	0x3038,0x303E,0x303A,0x302D,0x3030,0x3029,0x302A,INVALC,
-	INVALC,0x3039,0x3042,
-	/* Range 0x6D7A - 0x6D86, array index: 0x0EB2 */
-	0x3028,0x3049,0x303D,0x304A,0x3044,0x3036,0x3045,INVALC,
-	0x303F,0x3048,0x3046,INVALC,0x3037,
-	/* Range 0x6D90 - 0x6D92, array index: 0x0EBF */
-	0x304C,0x3033,0x302E,
-	/* Range 0x6DBA - 0x6DC2, array index: 0x0EC2 */
-	0x365E,0x366A,INVALC,0x365B,0x3654,INVALC,0x3644,INVALC,
-	0x3660,
-	/* Range 0x6DC8 - 0x6DCA, array index: 0x0ECB */
-	0x3650,0x3662,0x365A,
-	/* Range 0x6DCF - 0x6DE5, array index: 0x0ECE */
-	0x3661,0x3663,INVALC,INVALC,0x3665,0x364E,0x365F,0x3653,
-	0x3667,INVALC,INVALC,INVALC,0x3658,0x3656,0x3657,INVALC,
-	0x3652,0x3651,INVALC,0x364B,0x3669,INVALC,0x3655,
-	/* Range 0x6E39 - 0x6E4B, array index: 0x0EE5 */
-	0x3D4C,INVALC,0x3D40,0x3D32,0x3D33,INVALC,0x3D37,0x3D3E,
-	0x3D38,INVALC,INVALC,INVALC,0x3D34,0x3D2D,0x3D2E,INVALC,
-	0x3D30,INVALC,0x3D3D,
-	/* Range 0x6E51 - 0x6E55, array index: 0x0EF8 */
-	0x3D3F,0x3D57,0x3D4F,INVALC,0x3D55,
-	/* Range 0x6E5A - 0x6E68, array index: 0x0EFD */
-	0x3D5B,INVALC,0x3D45,0x3D39,0x3D43,INVALC,0x3D49,0x3D46,
-	0x3D35,INVALC,0x3D53,0x3D50,0x3D58,INVALC,0x3D44,
-	/* Range 0x6E73 - 0x6E79, array index: 0x0F0C */
-	0x3D3A,0x3648,INVALC,INVALC,0x3D54,0x3D52,0x3D56,
-	/* Range 0x6E8D - 0x6E94, array index: 0x0F13 */
-	0x4447,0x4446,0x442C,INVALC,INVALC,0x4445,0x442F,0x4430,
-	/* Range 0x6E9E - 0x6EA6, array index: 0x0F1B */
-	0x4438,0x442E,0x4431,0x4449,INVALC,0x4450,0x4448,INVALC,
-	0x443D,
-	/* Range 0x6EAE - 0x6EB3, array index: 0x0F24 */
-	0x444F,INVALC,0x443B,0x4432,0x443F,0x444B,
-	/* Range 0x6EBD - 0x6EC3, array index: 0x0F2A */
-	0x4436,0x4440,0x444A,0x442D,0x4437,INVALC,0x4441,
-	/* Range 0x6EC6 - 0x6ED2, array index: 0x0F31 */
-	0x4434,INVALC,0x442B,0x4439,0x444D,INVALC,INVALC,0x443C,
-	0x4B34,0x443E,0x444C,INVALC,0x4435,
-	/* Range 0x6EF5 - 0x6EFD, array index: 0x0F3E */
-	0x4B35,0x4B56,INVALC,0x4B39,0x4B49,INVALC,0x4B3B,0x4B59,
-	0x4B55,
-	/* Range 0x6F05 - 0x6F0E, array index: 0x0F47 */
-	0x4B54,INVALC,0x4B51,0x4B5E,0x4B3D,0x4B46,INVALC,INVALC,
-	0x4B5C,0x4B52,
-	/* Range 0x6F18 - 0x6F27, array index: 0x0F51 */
-	0x4B42,0x4B3F,0x4B40,INVALC,0x4B58,INVALC,0x4B5D,0x4B5B,
-	INVALC,0x4B5F,INVALC,INVALC,INVALC,0x4B38,0x5143,0x4B41,
-	/* Range 0x6F35 - 0x6F3C, array index: 0x0F61 */
-	0x4B4F,0x4B47,0x4B3A,INVALC,0x4B57,0x4B5A,0x4B43,0x4B4E,
-	/* Range 0x6F4E - 0x6F57, array index: 0x0F69 */
-	0x4B3E,0x514C,0x5156,INVALC,0x5155,0x5161,INVALC,0x5153,
-	INVALC,0x5157,
-	/* Range 0x6F5D - 0x6F63, array index: 0x0F73 */
-	0x515A,0x577B,INVALC,INVALC,0x515C,0x514B,0x5166,
-	/* Range 0x6F67 - 0x6F6C, array index: 0x0F7A */
-	0x515F,INVALC,0x5163,0x5168,0x515D,0x5151,
-	/* Range 0x6F7B - 0x6F7F, array index: 0x0F80 */
-	0x5169,INVALC,0x515E,0x5144,0x5164,
-	/* Range 0x6F89 - 0x6F8D, array index: 0x0F85 */
-	0x5149,INVALC,0x5162,0x514A,0x5148,
-	/* Range 0x6F90 - 0x6F96, array index: 0x0F8A */
-	0x5160,INVALC,0x5147,0x5159,0x5158,0x5165,0x514F,
-	/* Range 0x6FA8 - 0x6FB2, array index: 0x0F91 */
-	0x5822,0x5D3B,0x5828,0x582E,0x5827,0x5774,0x5825,0x5830,
-	0x5832,INVALC,0x5831,
-	/* Range 0x6FC4 - 0x6FCF, array index: 0x0F9C */
-	0x577C,INVALC,0x5146,0x5777,0x577A,0x582D,0x5821,0x5775,
-	0x5D3A,0x582F,0x5779,0x5829,
-	/* Range 0x6FDC - 0x6FDE, array index: 0x0FA8 */
-	0x5D3F,0x5D45,0x5D43,
-	/* Range 0x6FE2 - 0x6FE8, array index: 0x0FAB */
-	0x5D46,0x5D3E,INVALC,INVALC,0x5D42,0x5D41,0x5D47,
-	/* Range 0x6FFB - 0x7007, array index: 0x0FB2 */
-	0x6222,0x6224,INVALC,INVALC,0x617E,0x6221,0x617A,INVALC,
-	INVALC,0x5823,0x617B,INVALC,0x6177,
-	/* Range 0x700A - 0x700E, array index: 0x0FBF */
-	0x6226,INVALC,0x6178,0x6179,0x617D,
-	/* Range 0x7020 - 0x702B, array index: 0x0FC4 */
-	0x6569,0x656C,0x656D,0x656E,0x6571,INVALC,0x6223,0x6568,
-	INVALC,0x656F,0x6934,0x656B,
-	/* Range 0x7031 - 0x704A, array index: 0x0FD0 */
-	0x692E,INVALC,0x6937,0x692D,0x692A,INVALC,0x692C,0x6930,
-	0x6933,0x6932,0x6936,0x6929,INVALC,INVALC,0x6931,0x6935,
-	0x6938,0x692F,0x6B61,0x6B62,0x6B66,0x6B67,INVALC,0x6B64,
-	0x6B65,0x6B63,
-	/* Range 0x7055 - 0x706A, array index: 0x0FEA */
-	0x6D56,0x6D57,0x6D58,INVALC,INVALC,0x6F34,0x6F33,INVALC,
-	0x703D,INVALC,0x703B,0x703E,0x703C,0x7125,INVALC,INVALC,
-	0x7171,0x715B,INVALC,0x7170,0x723E,0x723F,
-	/* Range 0x7082 - 0x7086, array index: 0x1000 */
-	0x2778,0x277A,0x2775,0x2772,0x2774,
-	/* Range 0x70C5 - 0x70C7, array index: 0x1005 */
-	0x305A,0x305B,0x305C,
-	/* Range 0x70CD - 0x70D4, array index: 0x1008 */
-	0x3059,0x305E,INVALC,INVALC,0x304F,0x3055,0x304E,0x3058,
-	/* Range 0x70DA - 0x70E2, array index: 0x1010 */
-	0x305D,INVALC,0x304D,0x3050,0x3056,INVALC,0x3057,0x305F,
-	0x3053,
-	/* Range 0x70F3 - 0x7106, array index: 0x1019 */
-	0x3673,0x366F,INVALC,0x367B,0x366D,0x367A,INVALC,0x366B,
-	0x3D5F,0x3675,INVALC,INVALC,0x3676,0x3679,INVALC,0x367D,
-	INVALC,0x3672,INVALC,0x3677,
-	/* Range 0x710B - 0x7110, array index: 0x102D */
-	0x367C,0x3670,0x366C,0x367E,INVALC,0x3674,
-	/* Range 0x711E - 0x7125, array index: 0x1033 */
-	0x3D5D,0x3D66,0x3D5C,INVALC,0x3D64,0x3D62,INVALC,0x3D63,
-	/* Range 0x712E - 0x7132, array index: 0x103B */
-	0x3D60,0x3D5E,INVALC,0x3D61,0x3D65,
-	/* Range 0x7141 - 0x7144, array index: 0x1040 */
-	0x4456,0x445D,0x445F,0x4465,
-	/* Range 0x7150 - 0x7154, array index: 0x1044 */
-	0x4463,INVALC,0x4453,0x4464,0x4452,
-	/* Range 0x715D - 0x7163, array index: 0x1049 */
-	0x4457,INVALC,0x4462,0x4455,0x445C,0x4458,0x4454,
-	/* Range 0x7180 - 0x7189, array index: 0x1050 */
-	0x4B63,0x4B69,0x4B65,INVALC,INVALC,0x4B64,0x4B68,0x4B60,
-	INVALC,0x4B62,
-	/* Range 0x719A - 0x71AA, array index: 0x105A */
-	0x516F,0x516C,0x5178,0x5172,0x5174,INVALC,0x516E,0x5176,
-	INVALC,INVALC,0x5175,0x5173,INVALC,0x5179,INVALC,0x5170,
-	0x5177,
-	/* Range 0x71AF - 0x71B5, array index: 0x106B */
-	0x516B,0x516D,INVALC,0x516A,0x517A,INVALC,0x5171,
-	/* Range 0x71BC - 0x71CB, array index: 0x1072 */
-	0x5841,0x583F,INVALC,0x5835,0x5838,0x5839,0x5834,INVALC,
-	INVALC,0x5833,0x5842,0x583D,INVALC,INVALC,0x583C,0x583A,
-	/* Range 0x71F0 - 0x71F2, array index: 0x1082 */
-	0x5D4D,0x5D49,0x5D4B,
-	/* Range 0x71FF - 0x7207, array index: 0x1085 */
-	0x6228,INVALC,0x6227,0x6576,0x622A,INVALC,0x6577,INVALC,
-	0x6575,
-	/* Range 0x7219 - 0x7229, array index: 0x108E */
-	0x6B6A,0x6B69,INVALC,INVALC,0x6B68,0x6D5A,0x6D5B,INVALC,
-	INVALC,0x6F35,0x703F,INVALC,INVALC,0x7126,0x722C,INVALC,
-	0x7240,
-	/* Range 0x7249 - 0x724B, array index: 0x109F */
-	0x2B78,0x2B79,0x3D6A,
-	/* Range 0x7276 - 0x727F, array index: 0x10A2 */
-	0x3063,0x3062,0x3061,INVALC,INVALC,0x3722,0x3723,INVALC,
-	0x3721,0x3724,
-	/* Range 0x7285 - 0x729E, array index: 0x10AC */
-	0x3D6F,0x3D6E,INVALC,0x3D6C,0x3D6D,INVALC,0x3D70,0x446A,
-	0x4469,0x446D,INVALC,0x446C,0x446B,INVALC,0x4B6F,INVALC,
-	0x4B6E,INVALC,0x4B6D,0x517B,INVALC,0x517C,INVALC,INVALC,
-	0x5845,0x5846,
-	/* Range 0x72A1 - 0x72AA, array index: 0x10C6 */
-	0x657C,INVALC,0x657B,0x657A,0x6578,0x6579,INVALC,0x693B,
-	0x6D5C,0x7127,
-	/* Range 0x72C5 - 0x72CC, array index: 0x10D0 */
-	0x2467,0x2464,INVALC,INVALC,0x2821,0x2B7E,0x277D,0x2826,
-	/* Range 0x72FA - 0x7301, array index: 0x10D8 */
-	0x3065,0x306A,INVALC,INVALC,0x3067,0x372C,0x3064,0x306B,
-	/* Range 0x7307 - 0x730C, array index: 0x10E0 */
-	0x3727,0x372B,INVALC,0x372A,0x3D72,0x3D7D,
-	/* Range 0x7330 - 0x7335, array index: 0x10E6 */
-	0x3D73,0x3D75,0x3D78,0x3D76,INVALC,0x3D7C,
-	/* Range 0x733A - 0x733C, array index: 0x10EC */
-	0x4471,0x4470,0x446E,
-	/* Range 0x7349 - 0x734D, array index: 0x10EF */
-	0x4474,0x4473,INVALC,0x4B73,0x4B71,
-	/* Range 0x7358 - 0x736F, array index: 0x10F4 */
-	0x517D,0x5228,0x5227,0x5225,INVALC,0x5224,0x5221,0x5222,
-	0x5223,0x5226,0x5229,INVALC,INVALC,0x584B,0x5848,0x5849,
-	INVALC,0x5847,0x584D,0x584C,0x584A,INVALC,0x5D50,0x5D51,
-	/* Range 0x737C - 0x7385, array index: 0x110C */
-	0x693D,0x693C,0x6B6B,0x6D5D,INVALC,0x6F37,0x6F36,0x6F38,
-	INVALC,0x2C28,
-	/* Range 0x7392 - 0x7397, array index: 0x1116 */
-	0x246C,0x246A,0x246B,0x2468,INVALC,0x2469,
-	/* Range 0x73A0 - 0x73A6, array index: 0x111C */
-	0x282D,0x2829,0x282C,INVALC,0x2828,INVALC,0x282B,
-	/* Range 0x73B4 - 0x73B9, array index: 0x1123 */
-	0x2C30,0x2C2F,0x2C2E,INVALC,0x2C37,0x2C2D,
-	/* Range 0x73C2 - 0x73CC, array index: 0x1129 */
-	0x2C2A,0x2C35,INVALC,0x2C2C,0x2C36,0x2C33,0x2C2B,INVALC,
-	INVALC,0x2C38,0x2C29,
-	/* Range 0x73D2 - 0x73DD, array index: 0x1134 */
-	0x3075,0x306C,0x3077,INVALC,0x306F,0x307A,0x307B,0x306D,
-	0x3079,0x3076,0x3074,0x3078,
-	/* Range 0x73E5 - 0x73EB, array index: 0x1140 */
-	0x306E,INVALC,0x3071,0x307C,0x3073,INVALC,0x2C31,
-	/* Range 0x73F4 - 0x7401, array index: 0x1147 */
-	0x373D,0x3732,0x3730,INVALC,0x3731,INVALC,0x3738,INVALC,
-	0x3739,0x3735,INVALC,0x373A,0x3737,0x3734,
-	/* Range 0x7420 - 0x7424, array index: 0x1155 */
-	0x3E2D,0x3E26,INVALC,0x3E2A,0x3E29,
-	/* Range 0x7429 - 0x7432, array index: 0x115A */
-	0x3E2C,INVALC,0x3E23,0x3E21,0x3E27,0x3D7E,INVALC,0x3E22,
-	0x3E28,0x3E2E,
-	/* Range 0x744A - 0x7454, array index: 0x1164 */
-	0x4476,0x4477,INVALC,0x4523,0x447E,0x447C,0x447D,0x4479,
-	0x4478,INVALC,0x4524,
-	/* Range 0x7471 - 0x7475, array index: 0x116F */
-	0x4B76,0x4B78,0x4B75,INVALC,0x4B77,
-	/* Range 0x7485 - 0x748A, array index: 0x1174 */
-	0x5230,0x522D,0x522A,0x5231,0x522B,0x522C,
-	/* Range 0x74B1 - 0x74BB, array index: 0x117A */
-	0x5D58,0x5D53,INVALC,INVALC,0x622F,0x6232,0x6621,0x622D,
-	INVALC,0x693E,0x6233,
-	/* Range 0x74BE - 0x74C5, array index: 0x1185 */
-	0x6231,INVALC,0x622E,0x6230,0x6234,0x6622,INVALC,0x657E,
-	/* Range 0x74D5 - 0x74E1, array index: 0x118D */
-	0x6D5F,INVALC,0x6D61,0x6D5E,0x6D60,INVALC,0x7040,INVALC,
-	0x2830,0x307D,0x307E,INVALC,0x4525,
-	/* Range 0x74FB - 0x7503, array index: 0x119A */
-	0x3E2F,INVALC,0x4528,0x4527,0x4526,0x4B7B,INVALC,0x4B7C,
-	0x4B7D,
-	/* Range 0x750F - 0x7517, array index: 0x11A3 */
-	0x5D5E,0x5D5B,0x5D5C,0x5D5D,0x6236,0x6235,INVALC,0x6623,
-	0x6B6C,
-	/* Range 0x753E - 0x7540, array index: 0x11AC */
-	0x2834,0x2832,0x2833,
-	/* Range 0x75BF - 0x75C1, array index: 0x11AF */
-	0x312B,0x312A,0x3127,
-	/* Range 0x75CB - 0x75D2, array index: 0x11B2 */
-	0x3744,0x3745,INVALC,0x3741,0x3743,0x3747,0x3746,0x3742,
-	/* Range 0x75F5 - 0x75FE, array index: 0x11BA */
-	0x4539,0x4537,0x4530,0x4534,0x4533,INVALC,0x4536,0x4532,
-	0x453A,0x4531,
-	/* Range 0x760F - 0x761E, array index: 0x11C4 */
-	0x452E,0x4535,0x4C26,INVALC,INVALC,0x4C28,0x4C25,0x4C22,
-	INVALC,INVALC,0x5239,0x523D,0x523F,0x523B,0x523A,0x5238,
-	/* Range 0x762D - 0x7635, array index: 0x11D4 */
-	0x5858,INVALC,0x5857,0x585F,0x5859,0x585E,0x585B,INVALC,
-	0x585D,
-	/* Range 0x7647 - 0x7649, array index: 0x11DD */
-	0x5D63,0x5D61,0x5D62,
-	/* Range 0x7699 - 0x769E, array index: 0x11E0 */
-	0x453B,INVALC,0x5243,0x5240,0x5241,0x5242,
-	/* Range 0x7703 - 0x7705, array index: 0x11E6 */
-	0x2C43,0x2C44,0x2C45,
-	/* Range 0x7710 - 0x771D, array index: 0x11E9 */
-	0x3132,0x3136,0x3134,0x3133,INVALC,0x3137,INVALC,INVALC,
-	INVALC,0x3138,0x3139,0x3131,INVALC,0x3130,
-	/* Range 0x772F - 0x7735, array index: 0x11F7 */
-	0x374C,INVALC,0x374E,0x374F,0x3751,0x3750,0x3755,
-	/* Range 0x7744 - 0x774E, array index: 0x11FE */
-	0x3E40,0x3E42,0x3E3E,0x3E3F,INVALC,INVALC,0x3E43,0x3E45,
-	0x3E46,0x3E41,0x3E44,
-	/* Range 0x7752 - 0x775A, array index: 0x1209 */
-	0x4541,INVALC,0x4546,0x453E,0x4542,INVALC,INVALC,0x4547,
-	0x4543,
-	/* Range 0x776D - 0x776F, array index: 0x1212 */
-	0x4548,0x4C2E,0x4C30,
-	/* Range 0x777E - 0x7789, array index: 0x1215 */
-	0x4C31,INVALC,0x4C2F,0x4C2A,0x4C2D,0x4C32,INVALC,0x4C2C,
-	INVALC,INVALC,0x5247,0x5246,
-	/* Range 0x7797 - 0x77A3, array index: 0x1221 */
-	0x586B,INVALC,0x586A,0x5862,0x5866,0x5865,0x5863,INVALC,
-	INVALC,INVALC,0x5864,0x5867,0x5868,
-	/* Range 0x77B1 - 0x77B7, array index: 0x122E */
-	0x5D6C,0x5D68,INVALC,0x5D6B,0x5D66,0x5D6A,0x5D69,
-	/* Range 0x77C9 - 0x77D0, array index: 0x1235 */
-	0x6625,0x6626,INVALC,0x6943,0x6946,0x6944,0x6945,0x6B6E,
-	/* Range 0x77F0 - 0x77F2, array index: 0x123D */
-	0x5D6E,0x6628,0x6947,
-	/* Range 0x77F7 - 0x77FC, array index: 0x1240 */
-	0x2841,0x283C,0x283E,0x2840,0x283F,0x283D,
-	/* Range 0x780E - 0x7813, array index: 0x1246 */
-	0x2C52,0x2C51,0x2C50,0x2C4D,0x2C4E,0x2C55,
-	/* Range 0x7821 - 0x7823, array index: 0x124C */
-	0x3144,0x313E,0x313C,
-	/* Range 0x7826 - 0x7835, array index: 0x124F */
-	0x375C,INVALC,0x3141,0x3145,0x3147,0x3143,0x313D,INVALC,
-	0x3142,0x3140,INVALC,0x3148,INVALC,0x3146,INVALC,0x313F,
-	/* Range 0x7848 - 0x784D, array index: 0x125F */
-	0x3756,0x3758,0x375A,INVALC,0x375B,0x3759,
-	/* Range 0x7864 - 0x7871, array index: 0x1265 */
-	0x3E4A,0x3E4B,INVALC,INVALC,0x3E53,0x3E52,0x3E4F,INVALC,
-	INVALC,0x3E4D,0x3E50,INVALC,0x3E51,0x3E4E,
-	/* Range 0x7883 - 0x7887, array index: 0x1273 */
-	0x4553,0x454E,0x4550,0x4551,0x454A,
-	/* Range 0x7894 - 0x789A, array index: 0x1278 */
-	0x454C,0x454F,0x4557,INVALC,INVALC,0x4555,0x454B,
-	/* Range 0x789E - 0x78A5, array index: 0x127F */
-	0x4C3A,INVALC,0x4C3C,0x4552,0x4C3E,INVALC,0x4C3F,0x4C3B,
-	/* Range 0x78A8 - 0x78AD, array index: 0x1287 */
-	0x4C37,INVALC,0x4C34,0x4C39,0x4C3D,0x4C36,
-	/* Range 0x78C8 - 0x78D1, array index: 0x128D */
-	0x524F,0x5252,INVALC,INVALC,0x524B,0x5248,0x524D,0x524A,
-	INVALC,0x524C,
-	/* Range 0x78DB - 0x78E5, array index: 0x1297 */
-	0x5872,INVALC,0x586C,0x5870,0x5876,0x5877,0x5873,0x5874,
-	0x5871,INVALC,0x586E,
-	/* Range 0x78F9 - 0x78FF, array index: 0x12A2 */
-	0x5D77,INVALC,0x5D72,0x5D73,0x5D70,0x5D78,0x5D74,
-	/* Range 0x7910 - 0x7914, array index: 0x12A9 */
-	0x6247,0x6249,0x6248,0x6244,0x6245,
-	/* Range 0x791B - 0x791E, array index: 0x12AE */
-	0x662A,0x662C,0x6629,0x662E,
-	/* Range 0x7921 - 0x7929, array index: 0x12B2 */
-	0x662B,INVALC,0x6949,0x694C,0x6948,INVALC,0x694A,0x694B,
-	0x694D,
-	/* Range 0x794A - 0x794C, array index: 0x12BB */
-	0x2C56,0x2C58,0x2C57,
-	/* Range 0x794F - 0x7954, array index: 0x12BE */
-	0x314B,INVALC,0x314F,0x314E,0x314D,0x3149,
-	/* Range 0x7967 - 0x796B, array index: 0x12C4 */
-	0x3760,INVALC,0x3761,0x3762,0x3764,
-	/* Range 0x7970 - 0x7974, array index: 0x12C9 */
-	0x3E59,INVALC,0x3E58,0x3E57,0x3E56,
-	/* Range 0x7990 - 0x79A4, array index: 0x12CE */
-	0x4C4A,INVALC,0x4C49,0x4C46,0x4C45,0x4C44,0x4C43,0x4C47,
-	0x4C40,INVALC,0x5253,0x5258,0x5256,INVALC,INVALC,INVALC,
-	0x5255,0x5254,0x5257,INVALC,0x5878,
-	/* Range 0x79AB - 0x79AD, array index: 0x12E3 */
-	0x5D7A,0x624B,0x624A,
-	/* Range 0x79B4 - 0x79B8, array index: 0x12E6 */
-	0x6D65,INVALC,0x7045,0x7044,0x2167,
-	/* Range 0x79CD - 0x79CF, array index: 0x12EB */
-	0x2C5C,0x2C5F,0x2C5D,
-	/* Range 0x79DC - 0x79E0, array index: 0x12EE */
-	0x3156,0x3158,0x3157,INVALC,0x3152,
-	/* Range 0x79EA - 0x79EE, array index: 0x12F3 */
-	0x3155,0x3150,0x3151,0x3154,0x3153,
-	/* Range 0x79F6 - 0x79FA, array index: 0x12F8 */
-	0x3769,0x376A,0x3768,INVALC,0x3767,
-	/* Range 0x7A02 - 0x7A04, array index: 0x12FD */
-	0x3E5A,0x3E5C,0x3E5E,
-	/* Range 0x7A10 - 0x7A1B, array index: 0x1300 */
-	0x4566,0x455D,0x4560,0x4564,INVALC,0x4562,INVALC,0x4561,
-	0x455E,0x455F,INVALC,0x4565,
-	/* Range 0x7A58 - 0x7A5C, array index: 0x130C */
-	0x5E21,INVALC,0x5E23,0x5D7D,0x5D7C,
-	/* Range 0x7A6C - 0x7A71, array index: 0x1311 */
-	0x6950,0x6951,0x694F,INVALC,0x6D66,0x6D67,
-	/* Range 0x7A85 - 0x7A90, array index: 0x1317 */
-	0x315B,0x3159,0x315F,INVALC,0x315A,0x315E,0x315C,0x315D,
-	INVALC,INVALC,0x376B,0x376D,
-	/* Range 0x7AB1 - 0x7AB8, array index: 0x1323 */
-	0x5921,0x525B,0x525D,0x525C,0x587E,0x587C,0x5922,0x587D,
-	/* Range 0x7B04 - 0x7B13, array index: 0x132B */
-	0x3162,0x3164,INVALC,INVALC,0x3166,0x3169,0x3167,INVALC,
-	INVALC,INVALC,0x3168,0x3165,0x3161,INVALC,0x316A,0x3163,
-	/* Range 0x7B22 - 0x7B25, array index: 0x133B */
-	0x3773,0x3822,0x3774,0x3771,
-	/* Range 0x7B2D - 0x7B35, array index: 0x133F */
-	0x377B,INVALC,0x377C,0x3772,0x3779,0x377D,0x3775,0x3770,
-	0x376E,
-	/* Range 0x7B44 - 0x7B4E, array index: 0x1348 */
-	0x3E64,0x3E6A,INVALC,0x3E63,0x3E65,INVALC,0x3E62,INVALC,
-	0x3E66,INVALC,0x3E67,
-	/* Range 0x7B61 - 0x7B66, array index: 0x1353 */
-	0x4575,INVALC,0x4578,0x456C,0x4571,0x456B,
-	/* Range 0x7B70 - 0x7B78, array index: 0x1359 */
-	0x4574,0x4573,0x4570,0x4572,0x456E,INVALC,0x4577,INVALC,
-	0x4576,
-	/* Range 0x7B8A - 0x7B91, array index: 0x1362 */
-	0x4C57,INVALC,0x4C5C,0x4C5B,0x4C5E,INVALC,0x4C59,0x4C58,
-	/* Range 0x7B98 - 0x7B9C, array index: 0x136A */
-	0x4C60,0x4C62,INVALC,0x4C5D,0x4C56,
-	/* Range 0x7BDA - 0x7BEB, array index: 0x136F */
-	0x5929,INVALC,0x592F,0x5926,0x5923,0x5932,INVALC,INVALC,
-	0x592E,0x5924,INVALC,0x5928,INVALC,0x5925,0x592A,INVALC,
-	0x592D,0x5930,
-	/* Range 0x7BF0 - 0x7BF4, array index: 0x1381 */
-	0x5E38,0x5E39,0x5E29,0x5E30,0x5E2E,
-	/* Range 0x7BFD - 0x7C10, array index: 0x1386 */
-	0x5E36,INVALC,0x5E2B,0x5E2A,0x5E34,0x5E31,0x5E33,INVALC,
-	0x5E27,0x5E37,INVALC,INVALC,0x5E32,0x5E3B,0x5E2F,INVALC,
-	INVALC,0x5E2D,0x5E28,0x5E3A,
-	/* Range 0x7C1C - 0x7C2D, array index: 0x139A */
-	0x624D,0x6253,INVALC,0x6251,0x6250,INVALC,0x6256,INVALC,
-	INVALC,0x6257,0x6254,INVALC,0x6255,0x624E,INVALC,INVALC,
-	0x6635,0x6252,
-	/* Range 0x7C45 - 0x7C4A, array index: 0x13AC */
-	0x6957,INVALC,0x6956,0x6954,0x6953,0x6955,
-	/* Range 0x7C57 - 0x7C5C, array index: 0x13B2 */
-	0x6D68,INVALC,0x6D6A,0x6D6C,0x6D6B,0x6D69,
-	/* Range 0x7C66 - 0x7C6B, array index: 0x13B8 */
-	0x6F3C,0x6F3B,INVALC,0x712B,0x7046,0x712C,
-	/* Range 0x7C78 - 0x7C7A, array index: 0x13BE */
-	0x2C66,0x2C67,0x2C65,
-	/* Range 0x7C7F - 0x7C85, array index: 0x13C1 */
-	0x2C68,0x2C69,0x2C6A,INVALC,INVALC,0x316B,0x3171,
-	/* Range 0x7CA1 - 0x7CA3, array index: 0x13C8 */
-	0x3E6E,0x3E6B,0x3826,
-	/* Range 0x7CBA - 0x7CBC, array index: 0x13CB */
-	0x4C68,0x4C65,0x4C67,
-	/* Range 0x7CD0 - 0x7CD4, array index: 0x13CE */
-	0x5936,0x5937,0x5933,INVALC,0x5934,
-	/* Range 0x7D0E - 0x7D13, array index: 0x13D3 */
-	0x3175,0x317B,INVALC,0x3174,0x317A,0x3178,
-	/* Range 0x7D1D - 0x7D1F, array index: 0x13D9 */
-	0x3173,0x3172,0x3179,
-	/* Range 0x7D3A - 0x7D41, array index: 0x13DC */
-	0x382B,0x3834,INVALC,0x3828,0x3831,0x3832,INVALC,0x382F,
-	/* Range 0x7D4E - 0x7D58, array index: 0x13E4 */
-	0x3F21,0x3E76,INVALC,0x3E7D,0x3E7A,0x3E72,0x3E7B,INVALC,
-	0x3E73,INVALC,0x3E6F,
-	/* Range 0x7D67 - 0x7D6F, array index: 0x13EF */
-	0x3E74,INVALC,0x3E7C,0x3E75,0x3E79,INVALC,0x3E77,INVALC,
-	0x3E70,
-	/* Range 0x7D7A - 0x7D8E, array index: 0x13F8 */
-	0x4624,0x4626,0x4628,0x462C,INVALC,0x4622,0x457E,INVALC,
-	INVALC,0x4627,0x462B,0x4623,0x457D,INVALC,0x457C,INVALC,
-	INVALC,INVALC,0x4629,0x4621,0x4625,
-	/* Range 0x7DA6 - 0x7DAA, array index: 0x140D */
-	0x4C7C,0x4C69,INVALC,0x4C7E,0x4C6D,
-	/* Range 0x7DC0 - 0x7DC6, array index: 0x1412 */
-	0x4C6F,0x4C6E,0x4C6B,INVALC,0x4C73,0x4C70,0x4C74,
-	/* Range 0x7E0B - 0x7E17, array index: 0x1419 */
-	0x5944,0x593B,0x5947,0x593F,0x5945,INVALC,INVALC,0x5938,
-	0x593E,0x5948,0x5941,0x5946,0x593A,
-	/* Range 0x7E1F - 0x7E25, array index: 0x1426 */
-	0x593C,0x593D,0x5939,0x5943,INVALC,0x594A,0x5949,
-	/* Range 0x7E38 - 0x7E3C, array index: 0x142D */
-	0x5E42,INVALC,0x5E4D,0x5E4A,0x5E3E,
-	/* Range 0x7E56 - 0x7E58, array index: 0x1432 */
-	0x625B,0x6262,0x625D,
-	/* Range 0x7E5F - 0x7E63, array index: 0x1435 */
-	0x625F,0x6261,INVALC,0x625E,0x625C,
-	/* Range 0x7E72 - 0x7E7B, array index: 0x143A */
-	0x6640,INVALC,0x6641,0x663A,0x6639,0x663D,0x663B,INVALC,
-	0x663F,0x6959,
-	/* Range 0x7E86 - 0x7E8D, array index: 0x1444 */
-	0x6B79,0x6B76,0x6B77,INVALC,0x6B75,0x6B78,INVALC,0x6B7A,
-	/* Range 0x7E95 - 0x7E9B, array index: 0x144C */
-	0x6F3D,INVALC,0x7047,0x712F,0x7131,0x712E,0x7130,
-	/* Range 0x7F5B - 0x7F6D, array index: 0x1453 */
-	0x3224,0x317D,0x3223,0x3221,INVALC,0x3222,0x317E,INVALC,
-	0x3836,INVALC,0x3F24,0x3F25,0x4630,0x4631,INVALC,INVALC,
-	0x462F,0x4632,0x462E,
-	/* Range 0x7F7A - 0x7F7F, array index: 0x1466 */
-	0x594E,0x594C,0x594D,0x5E51,0x5E50,0x5E4F,
-	/* Range 0x7F9B - 0x7FA7, array index: 0x146C */
-	0x383A,0x3838,0x3839,INVALC,INVALC,0x3F27,0x3F28,0x3F26,
-	INVALC,INVALC,0x4634,0x4633,0x4635,
-	/* Range 0x7FC7 - 0x7FD1, array index: 0x1479 */
-	0x3840,INVALC,0x3842,0x383B,0x383C,INVALC,0x383D,INVALC,
-	0x3841,0x383E,0x383F,
-	/* Range 0x7FE2 - 0x7FEF, array index: 0x1484 */
-	0x4D24,0x4D25,INVALC,0x4D26,0x5323,INVALC,0x5324,INVALC,
-	0x5321,0x527E,0x5322,0x527D,INVALC,0x5950,
-	/* Range 0x7FF4 - 0x7FF8, array index: 0x1492 */
-	0x5E52,0x6134,INVALC,0x6266,0x6267,
-	/* Range 0x7FFD - 0x7FFF, array index: 0x1497 */
-	0x6648,0x6649,0x695E,
-	/* Range 0x804F - 0x8051, array index: 0x149A */
-	0x3F2B,0x3F2C,0x3F2A,
-	/* Range 0x80C5 - 0x80CA, array index: 0x149D */
-	0x2C7E,INVALC,0x2C78,0x2C7B,0x2D26,0x2D24,
-	/* Range 0x80CD - 0x80D9, array index: 0x14A3 */
-	0x2D2A,INVALC,0x2D27,0x2C7D,0x2C7A,INVALC,INVALC,0x3F2E,
-	0x2D25,INVALC,0x2D28,0x2C77,0x2D22,
-	/* Range 0x80F9 - 0x80FB, array index: 0x14B0 */
-	0x322F,0x322D,0x3232,
-	/* Range 0x811B - 0x8122, array index: 0x14B3 */
-	0x384C,INVALC,0x3854,0x3850,0x384E,INVALC,0x3851,0x3855,
-	/* Range 0x815E - 0x8164, array index: 0x14BB */
-	0x4642,INVALC,0x463A,0x4647,0x463F,INVALC,0x4639,
-	/* Range 0x8189 - 0x818D, array index: 0x14C2 */
-	0x4D2B,INVALC,0x4D31,0x4D30,0x4D2F,
-	/* Range 0x81AE - 0x81BC, array index: 0x14C7 */
-	0x5956,INVALC,0x595A,0x5954,0x595D,INVALC,0x595C,0x5958,
-	INVALC,0x595E,INVALC,0x5957,INVALC,0x5E55,0x5E5B,
-	/* Range 0x81D0 - 0x81D2, array index: 0x14D6 */
-	0x626B,0x6269,0x626A,
-	/* Range 0x81DD - 0x81E1, array index: 0x14D9 */
-	0x6B7E,0x6D72,INVALC,0x7132,0x7133,
-	/* Range 0x81F7 - 0x81F9, array index: 0x14DE */
-	0x3F39,0x3F3A,0x3F3B,
-	/* Range 0x8232 - 0x8234, array index: 0x14E1 */
-	0x385B,0x3858,0x385A,
-	/* Range 0x823C - 0x8245, array index: 0x14E4 */
-	0x3F3D,0x3F3E,INVALC,0x3F3F,0x464B,INVALC,0x464C,INVALC,
-	0x464A,0x464D,
-	/* Range 0x824E - 0x8264, array index: 0x14EE */
-	0x5333,0x532F,0x5332,0x5334,0x5331,0x5330,INVALC,0x5961,
-	0x5962,0x5963,INVALC,INVALC,0x5E5E,0x5E5D,0x5E5F,INVALC,
-	0x626D,0x626C,INVALC,0x664F,INVALC,0x6650,0x664E,
-	/* Range 0x8268 - 0x826D, array index: 0x1505 */
-	0x6962,0x6963,INVALC,0x6D73,0x6F3E,0x7049,
-	/* Range 0x827C - 0x8285, array index: 0x150B */
-	0x226B,0x226D,INVALC,0x226E,0x226C,INVALC,INVALC,0x2522,
-	0x2523,0x247B,
-	/* Range 0x828E - 0x8294, array index: 0x1515 */
-	0x247C,0x247A,0x2479,0x247D,INVALC,0x247E,0x2D2D,
-	/* Range 0x829E - 0x82AB, array index: 0x151C */
-	0x285C,INVALC,0x2852,0x2860,0x2866,INVALC,0x2863,INVALC,
-	INVALC,0x2859,0x285F,0x2861,INVALC,0x2854,
-	/* Range 0x82B4 - 0x82B6, array index: 0x152A */
-	0x285E,0x2858,0x2865,
-	/* Range 0x82E8 - 0x82ED, array index: 0x152D */
-	0x2D32,INVALC,0x2D41,0x2D36,0x2D39,0x2D46,
-	/* Range 0x82F0 - 0x82FB, array index: 0x1533 */
-	0x2D40,INVALC,0x2D3B,0x2D45,0x2D38,0x2D3C,0x2D3F,INVALC,
-	INVALC,0x2D30,0x2D44,0x2D3E,
-	/* Range 0x8322 - 0x832F, array index: 0x153F */
-	0x3242,INVALC,0x324B,0x323C,0x3240,0x3257,INVALC,0x324F,
-	0x3246,INVALC,0x3255,0x3238,INVALC,0x324E,
-	/* Range 0x833A - 0x833C, array index: 0x154D */
-	0x2D35,0x3F41,0x3248,
-	/* Range 0x8341 - 0x834E, array index: 0x1550 */
-	0x323F,0x3243,INVALC,0x3239,0x3251,INVALC,0x3250,0x3258,
-	INVALC,INVALC,0x3256,0x3252,0x3249,0x3244,
-	/* Range 0x8373 - 0x8376, array index: 0x155E */
-	0x3862,0x3864,0x3869,0x387D,
-	/* Range 0x837D - 0x8383, array index: 0x1562 */
-	0x386C,0x3873,0x3879,INVALC,0x3866,INVALC,0x386D,
-	/* Range 0x8387 - 0x8390, array index: 0x1569 */
-	0x387B,0x3876,INVALC,INVALC,0x3872,0x386E,0x3860,INVALC,
-	0x3865,0x385D,
-	/* Range 0x8397 - 0x839D, array index: 0x1573 */
-	0x3877,INVALC,0x3868,0x3F6A,0x3870,INVALC,0x386F,
-	/* Range 0x83A3 - 0x83B0, array index: 0x157A */
-	0x385E,0x3863,0x3874,0x387A,INVALC,0x385F,0x386B,0x3871,
-	INVALC,INVALC,INVALC,0x387C,0x3875,0x3878,
-	/* Range 0x83BF - 0x83EE, array index: 0x1588 */
-	0x3F51,0x3F45,INVALC,0x3F62,0x3F6B,0x3F6E,INVALC,0x3F4D,
-	0x3F66,0x3F4E,0x3F5C,INVALC,0x3F58,INVALC,INVALC,0x3F59,
-	0x3F42,INVALC,0x3F67,INVALC,INVALC,INVALC,0x3F64,0x3F5A,
-	0x3F70,0x3F55,0x466D,INVALC,0x3F73,INVALC,0x3F53,0x3F5F,
-	INVALC,INVALC,0x3F57,0x3F71,0x3F50,0x3F49,0x3F54,INVALC,
-	0x3F48,0x3F46,INVALC,0x3F68,0x3F4F,0x3F6C,INVALC,0x3F6D,
-	/* Range 0x83F5 - 0x8401, array index: 0x15B8 */
-	0x3F5B,0x3F4B,INVALC,INVALC,0x3F43,0x3F65,0x3F6F,0x3F4A,
-	INVALC,0x3F74,0x3F56,INVALC,0x3F52,
-	/* Range 0x840F - 0x8413, array index: 0x15C5 */
-	0x3F5E,0x3F4C,0x3F60,0x3F47,0x3F69,
-	/* Range 0x842F - 0x843B, array index: 0x15CA */
-	0x466F,0x465A,INVALC,0x466A,0x467E,0x4666,INVALC,0x467D,
-	0x4664,INVALC,0x4674,0x4665,0x467B,
-	/* Range 0x843F - 0x8460, array index: 0x15D7 */
-	0x464F,0x4657,INVALC,0x4670,0x4668,0x4723,0x466B,INVALC,
-	0x467C,INVALC,INVALC,INVALC,0x466E,0x4676,0x465B,0x4675,
-	INVALC,0x4728,0x4656,0x4677,INVALC,0x4726,INVALC,0x4650,
-	INVALC,INVALC,0x465E,0x465D,INVALC,INVALC,0x4661,0x4663,
-	0x4672,0x4725,
-	/* Range 0x846E - 0x847E, array index: 0x15F9 */
-	0x4727,0x4678,0x4673,INVALC,INVALC,0x4660,0x465F,INVALC,
-	0x4651,INVALC,0x4669,0x4652,0x4667,INVALC,INVALC,0x465C,
-	0x4722,
-	/* Range 0x848D - 0x8491, array index: 0x160A */
-	0x4654,0x467A,0x4653,INVALC,0x4D5A,
-	/* Range 0x8497 - 0x84B1, array index: 0x160F */
-	0x4D33,0x4D51,INVALC,0x4D42,0x4D4C,INVALC,0x4D45,INVALC,
-	0x4D36,0x4D54,0x4D35,0x4D48,INVALC,0x4D34,INVALC,INVALC,
-	0x4D46,0x4D4F,0x4D4D,0x4D41,0x4D3C,0x4D3A,INVALC,0x4D3B,
-	0x4D4E,0x4D59,0x4D43,
-	/* Range 0x84B9 - 0x84BB, array index: 0x162A */
-	0x4D3D,0x4D37,0x4D47,
-	/* Range 0x84CC - 0x84D7, array index: 0x162D */
-	0x4D4B,0x4D40,0x4D38,0x4D53,0x4D44,INVALC,0x4D57,INVALC,
-	0x4D56,INVALC,0x4D50,0x4D55,
-	/* Range 0x84E7 - 0x8502, array index: 0x1639 */
-	0x535C,0x535D,0x5350,0x534F,0x534B,INVALC,INVALC,INVALC,
-	0x535F,0x535E,0x464E,0x5348,0x534C,0x5346,INVALC,0x5359,
-	0x534A,INVALC,0x5360,0x5343,0x5341,0x534D,0x5357,0x5352,
-	INVALC,0x5338,INVALC,0x5356,
-	/* Range 0x8507 - 0x850F, array index: 0x1655 */
-	0x4662,0x5344,0x533B,0x533E,0x5364,0x5345,0x533C,0x533A,
-	0x5337,
-	/* Range 0x8515 - 0x8520, array index: 0x165E */
-	0x5349,0x5351,INVALC,0x5361,0x5365,INVALC,INVALC,0x5340,
-	0x5354,0x5358,0x533D,0x5362,
-	/* Range 0x8524 - 0x8531, array index: 0x166A */
-	0x5335,INVALC,0x535B,0x533F,0x5353,0x5339,0x5347,0x5342,
-	INVALC,INVALC,0x5355,0x5366,0x5363,0x535A,
-	/* Range 0x8540 - 0x8547, array index: 0x1678 */
-	0x596B,0x596E,INVALC,INVALC,0x5970,0x5965,0x596C,0x5972,
-	/* Range 0x8551 - 0x8558, array index: 0x1680 */
-	0x5971,INVALC,0x5968,0x5A22,0x597A,0x5964,0x5E72,0x596A,
-	/* Range 0x8560 - 0x8567, array index: 0x1688 */
-	0x597C,0x5969,0x596F,0x5973,0x596D,0x5A23,0x597E,0x597B,
-	/* Range 0x8575 - 0x8590, array index: 0x1690 */
-	0x5979,0x5F21,0x5E6C,0x5E71,0x5E7E,0x5E70,0x5E68,0x5E6D,
-	INVALC,INVALC,INVALC,0x5E61,0x5E79,0x5E7B,0x5E60,INVALC,
-	0x5E7D,0x5E75,INVALC,0x5E7C,0x5E6E,INVALC,0x5E66,0x597D,
-	0x5E76,0x5E73,0x5E62,0x5F23,
-	/* Range 0x8595 - 0x85A4, array index: 0x16AC */
-	0x5E64,0x5E74,INVALC,0x5F22,0x5E77,0x5E6A,INVALC,INVALC,
-	0x5E78,0x5E6B,0x5F24,0x5E65,0x5E6F,0x5E7A,0x5E67,0x5E69,
-	/* Range 0x85B1 - 0x85B8, array index: 0x16BC */
-	0x627D,INVALC,0x6273,0x626E,0x6274,0x627E,0x6324,0x6323,
-	/* Range 0x85BD - 0x85C8, array index: 0x16C4 */
-	0x6275,0x6325,0x6278,0x6270,INVALC,0x6272,0x6271,0x6277,
-	0x627C,0x626F,0x6276,0x627B,
-	/* Range 0x85D7 - 0x85E3, array index: 0x16D0 */
-	0x6658,0x665C,0x6654,0x6657,INVALC,0x665F,INVALC,0x6664,
-	0x665D,INVALC,0x6655,0x6665,0x665E,
-	/* Range 0x85EB - 0x85F2, array index: 0x16DD */
-	0x6651,0x6659,0x6653,INVALC,0x6663,0x6661,0x6652,0x665A,
-	/* Range 0x85FD - 0x8605, array index: 0x16E5 */
-	0x696F,0x6967,0x6965,0x6969,0x6966,INVALC,INVALC,0x696B,
-	0x696D,
-	/* Range 0x8618 - 0x8640, array index: 0x16EE */
-	0x6C21,0x6C27,INVALC,0x6968,0x6C26,INVALC,0x6C2D,0x6C24,
-	0x6C2B,0x6C2A,0x6964,0x6C25,0x6322,0x6C2E,0x6C23,0x6C28,
-	INVALC,0x6C2C,0x6C22,INVALC,0x6D77,INVALC,0x6C29,INVALC,
-	INVALC,0x6F43,0x6D78,0x6D76,0x6D74,0x6D75,0x6D79,INVALC,
-	INVALC,0x6F41,0x6F3F,0x6F44,0x6F42,INVALC,0x6F45,INVALC,
-	0x6F40,
-	/* Range 0x8646 - 0x864D, array index: 0x1717 */
-	0x7134,0x7135,0x7136,INVALC,INVALC,0x7235,0x722D,0x226F,
-	/* Range 0x8661 - 0x8674, array index: 0x171F */
-	0x4D5B,0x5367,0x5A25,0x5A27,0x5A26,INVALC,INVALC,0x5F25,
-	0x6326,0x7173,INVALC,INVALC,0x2869,0x286A,0x2868,0x2867,
-	INVALC,INVALC,0x2D4A,0x2D48,
-	/* Range 0x8685 - 0x8687, array index: 0x1733 */
-	0x3266,0x3263,0x3261,
-	/* Range 0x868D - 0x86A2, array index: 0x1736 */
-	0x325E,0x326D,INVALC,0x326F,0x325F,INVALC,INVALC,0x3270,
-	0x326B,0x325D,0x3262,0x326C,0x3268,0x3265,INVALC,INVALC,
-	0x326E,0x3260,INVALC,INVALC,0x3269,0x325B,
-	/* Range 0x86B3 - 0x86C5, array index: 0x174C */
-	0x392B,0x392E,INVALC,INVALC,0x3923,0x392C,0x392A,0x3927,
-	0x392F,0x3930,0x3932,0x3933,0x3922,INVALC,0x3925,0x3924,
-	0x3931,INVALC,0x3926,
-	/* Range 0x86D6 - 0x86DD, array index: 0x175F */
-	0x472E,0x4023,0x3F75,INVALC,0x3F7A,INVALC,0x3F7E,0x3F7C,
-	/* Range 0x86E6 - 0x86EC, array index: 0x1767 */
-	0x3F77,INVALC,0x4024,0x4022,0x3F7B,0x3F7D,0x4021,
-	/* Range 0x86F5 - 0x86FA, array index: 0x176E */
-	0x472F,0x4735,0x472B,0x4731,INVALC,0x472D,
-	/* Range 0x8709 - 0x8712, array index: 0x1774 */
-	0x4733,INVALC,0x4729,0x472C,0x4736,0x4732,INVALC,INVALC,
-	0x4D7B,0x4D70,
-	/* Range 0x8719 - 0x871B, array index: 0x177E */
-	0x4D64,0x4D79,0x4D65,
-	/* Range 0x8720 - 0x8735, array index: 0x1781 */
-	0x4D6B,0x4D63,INVALC,0x4D5D,0x4D78,INVALC,0x4D75,0x4D76,
-	0x4D5E,INVALC,0x4D6D,INVALC,0x4D67,0x4D6E,0x4D61,INVALC,
-	0x4D7A,0x4D72,0x4D6C,0x4D5C,INVALC,0x4D73,
-	/* Range 0x873E - 0x8743, array index: 0x1797 */
-	0x4D69,INVALC,0x4D60,0x4D68,0x4D74,0x4D66,
-	/* Range 0x874D - 0x876F, array index: 0x179D */
-	0x4730,0x5379,0x5424,0x5378,0x5374,0x5371,INVALC,0x536F,
-	INVALC,0x5368,INVALC,0x536E,INVALC,0x5373,0x5370,0x5422,
-	0x537B,0x5375,0x537A,INVALC,0x5372,0x5427,0x5369,0x536A,
-	0x5423,INVALC,0x5428,INVALC,0x5429,0x5377,0x4D5F,0x537D,
-	0x5376,0x5421,0x537C,
-	/* Range 0x8777 - 0x877B, array index: 0x17C0 */
-	0x536B,INVALC,0x5A32,0x537E,0x5425,
-	/* Range 0x8784 - 0x8789, array index: 0x17C5 */
-	0x5A39,0x5A35,INVALC,0x5A33,0x5A2E,0x5A3D,
-	/* Range 0x878F - 0x879D, array index: 0x17CB */
-	0x5A2A,0x5A36,0x5A37,0x5A2D,0x5A2C,0x5A3A,INVALC,0x5A30,
-	0x5A2B,0x5A31,INVALC,0x5A3C,0x5A29,0x5A3B,0x5A38,
-	/* Range 0x87AA - 0x87C5, array index: 0x17DA */
-	0x5F27,INVALC,0x5F2B,0x5F28,0x5F2F,0x5F35,0x5F2A,INVALC,
-	0x5F3E,INVALC,0x5F38,0x5F2D,0x5F39,0x5F34,0x5F3B,0x5F2C,
-	INVALC,INVALC,0x5F2E,0x5F3C,0x5F26,0x5F3A,INVALC,INVALC,
-	0x5F32,0x5F31,0x5F36,0x5F29,
-	/* Range 0x87D3 - 0x87ED, array index: 0x17F6 */
-	0x6333,0x6331,INVALC,INVALC,0x6337,0x6335,0x6338,INVALC,
-	0x632A,0x6332,0x633C,0x5F3D,0x632E,INVALC,0x536C,0x6329,
-	0x6336,0x6330,0x632D,0x6328,0x6327,0x633B,INVALC,0x632C,
-	0x632B,INVALC,0x6334,
-	/* Range 0x87F3 - 0x87F7, array index: 0x1811 */
-	0x632F,0x633A,INVALC,0x6669,0x666A,
-	/* Range 0x87FF - 0x8803, array index: 0x1816 */
-	0x6671,0x6666,0x6339,0x6673,0x6668,
-	/* Range 0x8806 - 0x880C, array index: 0x181B */
-	0x666E,INVALC,0x6670,0x666B,0x6672,0x666D,0x666C,
-	/* Range 0x8819 - 0x881D, array index: 0x1822 */
-	0x6970,INVALC,0x6C31,0x6C34,0x6C30,
-	/* Range 0x8824 - 0x8844, array index: 0x1827 */
-	0x6C33,0x6D7E,0x6D7C,INVALC,0x6D7B,0x6C2F,0x6D7D,0x6C35,
-	0x6D7A,INVALC,0x6F48,0x6F26,0x6F46,INVALC,0x6F47,0x6F49,
-	INVALC,0x704D,INVALC,0x704C,0x704B,INVALC,INVALC,INVALC,
-	0x715D,0x7175,0x7174,0x7176,INVALC,0x2D4B,INVALC,0x3271,
-	0x3272,
-	/* Range 0x8871 - 0x8876, array index: 0x1848 */
-	0x3278,0x3276,INVALC,0x327D,0x3274,0x3275,
-	/* Range 0x887C - 0x8880, array index: 0x184E */
-	0x327E,INVALC,0x327C,0x3279,0x3277,
-	/* Range 0x8895 - 0x889B, array index: 0x1853 */
-	0x3936,INVALC,0x3942,0x393E,0x3940,0x393A,0x3941,
-	/* Range 0x88B6 - 0x88C0, array index: 0x185A */
-	0x402F,0x4031,0x402C,0x402B,0x4029,INVALC,0x4030,0x4032,
-	0x402E,INVALC,0x402D,
-	/* Range 0x88C9 - 0x88D0, array index: 0x1865 */
-	0x4035,INVALC,0x4739,0x473F,0x473A,0x473B,INVALC,0x4740,
-	/* Range 0x88EE - 0x88F2, array index: 0x186D */
-	0x4E24,INVALC,0x4E28,0x4D7E,0x4E21,
-	/* Range 0x88F6 - 0x88FE, array index: 0x1872 */
-	0x4E26,0x4D7C,INVALC,INVALC,0x4E22,0x4E27,0x4E25,INVALC,
-	0x4E23,
-	/* Range 0x8914 - 0x8919, array index: 0x187B */
-	0x542D,INVALC,0x5433,0x542F,0x5430,0x5431,
-	/* Range 0x892C - 0x8937, array index: 0x1881 */
-	0x5A49,0x5A41,0x5A42,0x5A48,0x5A40,0x5A44,INVALC,0x5F40,
-	INVALC,0x5F3F,INVALC,0x5F45,
-	/* Range 0x894B - 0x8963, array index: 0x188D */
-	0x633E,0x6340,INVALC,INVALC,0x633F,0x6342,0x6343,0x5F44,
-	0x633D,INVALC,INVALC,INVALC,0x6677,0x667A,0x667C,0x6675,
-	0x6676,0x6679,0x667B,INVALC,INVALC,INVALC,0x6678,0x6674,
-	0x6976,
-	/* Range 0x8979 - 0x897E, array index: 0x18A6 */
-	0x7137,0x7138,0x713A,0x7139,INVALC,0x2270,
-	/* Range 0x899B - 0x89A4, array index: 0x18AC */
-	0x4742,INVALC,0x4E2B,0x4E2E,0x4E2D,INVALC,0x4E2C,0x5437,
-	0x5439,0x5438,
-	/* Range 0x89AD - 0x89AF, array index: 0x18B6 */
-	0x5F47,0x5F49,0x5F48,
-	/* Range 0x89D5 - 0x89FF, array index: 0x18B9 */
-	0x394B,0x3949,INVALC,INVALC,0x394A,0x403A,0x403B,0x4749,
-	0x4039,INVALC,0x4743,0x4747,0x4746,0x4748,INVALC,0x4745,
-	0x4744,0x474A,INVALC,0x4E31,0x4E2F,INVALC,0x4E30,0x543C,
-	0x543A,INVALC,INVALC,0x543B,0x5A4B,0x5F4A,0x5F4B,INVALC,
-	INVALC,0x6722,0x6979,INVALC,INVALC,0x6C3B,0x6E24,INVALC,
-	INVALC,0x6F4D,0x713B,
-	/* Range 0x8A4A - 0x8A52, array index: 0x18E4 */
-	0x4048,INVALC,0x4049,0x403D,0x403C,0x404A,INVALC,0x4047,
-	0x4045,
-	/* Range 0x8A57 - 0x8A59, array index: 0x18ED */
-	0x4041,0x4042,0x403F,
-	/* Range 0x8A74 - 0x8A77, array index: 0x18F0 */
-	0x4756,0x4753,0x474B,0x4750,
-	/* Range 0x8A7F - 0x8A86, array index: 0x18F4 */
-	0x474D,INVALC,0x4755,0x4751,0x4754,0x4752,INVALC,0x474C,
-	/* Range 0x8ABA - 0x8AC0, array index: 0x18FC */
-	0x544B,0x5444,INVALC,0x544C,0x5446,INVALC,0x5447,
-	/* Range 0x8AD1 - 0x8AE4, array index: 0x1903 */
-	0x5441,INVALC,0x5440,0x5442,0x5443,INVALC,0x5445,0x5449,
-	0x544D,INVALC,INVALC,INVALC,0x5A51,0x5A57,0x5A54,0x5A4C,
-	0x5A58,0x5A4D,INVALC,0x5A53,
-	/* Range 0x8B05 - 0x8B08, array index: 0x1917 */
-	0x5F50,0x5F59,0x5F56,0x5F58,
-	/* Range 0x8B0F - 0x8B27, array index: 0x191B */
-	0x5F53,INVALC,0x5F4F,0x5F54,0x5F5B,0x5A52,0x5F55,0x5F4E,
-	INVALC,0x5F4D,INVALC,0x5F5C,INVALC,0x5F5A,INVALC,0x5F4C,
-	INVALC,INVALC,INVALC,0x5F52,0x6347,0x6355,0x6350,0x6352,
-	0x6346,
-	/* Range 0x8B2E - 0x8B42, array index: 0x1934 */
-	0x6354,0x634C,0x6349,0x634F,INVALC,0x6348,INVALC,0x634A,
-	0x6353,0x6351,INVALC,INVALC,0x6358,0x6356,0x634D,0x6357,
-	0x634E,INVALC,0x6726,INVALC,0x672D,
-	/* Range 0x8B47 - 0x8B4B, array index: 0x1949 */
-	0x634B,0x6724,INVALC,0x6725,0x672A,
-	/* Range 0x8B50 - 0x8B57, array index: 0x194E */
-	0x6723,0x672C,0x672E,0x6727,0x6729,0x672B,0x6728,0x672F,
-	/* Range 0x8B78 - 0x8B7F, array index: 0x1956 */
-	0x6C3D,0x6C3C,0x6C3F,0x6C40,INVALC,INVALC,0x6E25,0x6E2A,
-	/* Range 0x8B82 - 0x8B8E, array index: 0x195E */
-	0x6E27,INVALC,0x6E26,0x6E29,0x6E28,INVALC,0x6F51,INVALC,
-	INVALC,0x6F50,0x6F4E,INVALC,0x6F4F,
-	/* Range 0x8C39 - 0x8C3E, array index: 0x196B */
-	0x3950,INVALC,0x3951,0x4758,0x4E38,0x544E,
-	/* Range 0x8C64 - 0x8C69, array index: 0x1971 */
-	0x475C,0x475B,0x475D,INVALC,0x4E39,0x4E3A,
-	/* Range 0x8C6F - 0x8C78, array index: 0x1977 */
-	0x5F61,0x5F5E,0x5F60,0x5F5F,INVALC,INVALC,0x635A,0x6732,
-	0x6731,0x2524,
-	/* Range 0x8C80 - 0x8C86, array index: 0x1981 */
-	0x404D,0x404C,INVALC,INVALC,0x475F,0x4760,0x475E,
-	/* Range 0x8C8F - 0x8C9C, array index: 0x1988 */
-	0x5450,0x5A5F,0x5A5D,0x5A5E,INVALC,0x5F63,0x5F62,INVALC,
-	0x635D,0x635C,0x635B,0x6733,INVALC,0x7178,
-	/* Range 0x8CA3 - 0x8CA5, array index: 0x1996 */
-	0x3326,0x3325,0x3955,
-	/* Range 0x8D8C - 0x8D96, array index: 0x1999 */
-	0x4765,0x4768,0x4766,0x4767,0x476B,0x4764,0x476C,0x4769,
-	0x476A,INVALC,0x4E3E,
-	/* Range 0x8DAA - 0x8DAF, array index: 0x19A4 */
-	0x6738,0x673A,0x6737,0x6739,0x6A24,0x6C43,
-	/* Range 0x8DB5 - 0x8DB9, array index: 0x19AA */
-	0x3329,0x332B,0x332A,INVALC,0x395B,
-	/* Range 0x8DD3 - 0x8DD9, array index: 0x19AF */
-	0x4057,INVALC,0x405D,0x405A,0x4060,0x4056,0x405E,
-	/* Range 0x8DEE - 0x8DF4, array index: 0x19B6 */
-	0x4771,INVALC,0x476D,0x4770,0x4777,INVALC,0x4779,
-	/* Range 0x8DFD - 0x8E0A, array index: 0x19BD */
-	0x4E43,0x4E49,0x4E41,0x4E4A,INVALC,0x4E40,0x4E45,0x4E4B,
-	0x4E48,0x4E47,0x4E46,INVALC,0x4E3F,0x4E44,
-	/* Range 0x8E11 - 0x8E1C, array index: 0x19CB */
-	0x5464,0x5469,0x546B,0x5468,0x5461,0x5463,0x546D,0x546A,
-	0x5465,0x546E,0x5462,0x546C,
-	/* Range 0x8E23 - 0x8E27, array index: 0x19D7 */
-	0x545D,0x545F,0x545E,0x5466,0x5467,
-	/* Range 0x8E3C - 0x8E41, array index: 0x19DC */
-	0x5A6F,0x5A70,0x5A6A,0x5A73,0x5A6C,0x5A71,
-	/* Range 0x8E4C - 0x8E62, array index: 0x19E2 */
-	0x5F6A,0x5F67,0x5F66,INVALC,0x5F69,INVALC,INVALC,0x5F68,
-	0x636F,INVALC,0x6366,0x6365,INVALC,INVALC,0x636B,0x636A,
-	0x6362,0x636D,0x6367,INVALC,0x6364,0x636C,0x6363,
-	/* Range 0x8E92 - 0x8EA9, array index: 0x19F9 */
-	0x6E2F,INVALC,0x6E2D,0x6E2C,0x6E31,0x6E32,0x6F54,INVALC,
-	0x6E2E,INVALC,INVALC,0x7054,0x7051,0x7052,0x7053,INVALC,
-	INVALC,0x7140,0x713F,0x713E,0x715F,INVALC,0x722E,0x7179,
-	/* Range 0x8EDC - 0x8EFA, array index: 0x1A11 */
-	0x3961,0x3960,0x395F,INVALC,0x3963,0x3964,INVALC,INVALC,
-	INVALC,0x4068,0x4066,0x406A,0x406B,0x4071,INVALC,0x406D,
-	0x406F,INVALC,0x4067,0x4062,INVALC,0x406E,INVALC,INVALC,
-	0x4070,0x4069,0x406C,0x4063,INVALC,0x4065,0x4064,
-	/* Range 0x8EFF - 0x8F08, array index: 0x1A30 */
-	0x477B,0x477D,0x477C,0x4823,INVALC,INVALC,0x477E,0x477A,
-	0x4821,0x4822,
-	/* Range 0x8F0D - 0x8F11, array index: 0x1A3A */
-	0x4E4F,0x4E4E,INVALC,0x4E4C,0x4E4D,
-	/* Range 0x8F16 - 0x8F1A, array index: 0x1A3F */
-	0x5475,0x5476,0x5471,INVALC,0x5472,
-	/* Range 0x8F32 - 0x8F39, array index: 0x1A44 */
-	0x5A78,INVALC,0x5A7B,0x5A77,0x5A75,0x5A7A,INVALC,0x5A79,
-	/* Range 0x8F46 - 0x8F48, array index: 0x1A4C */
-	0x6370,0x6371,0x6372,
-	/* Range 0x8F4F - 0x8F64, array index: 0x1A4F */
-	0x6744,0x6745,0x6743,0x6742,0x6746,INVALC,0x6A2B,0x6A29,
-	0x6A2A,0x6A2C,0x6A28,0x6A2D,0x6C47,INVALC,0x6C48,0x6C46,
-	INVALC,0x6E33,INVALC,0x6E34,0x6F56,0x6F55,
-	/* Range 0x8FD2 - 0x8FD7, array index: 0x1A65 */
-	0x286C,0x286E,INVALC,0x2871,0x2870,0x2872,
-	/* Range 0x8FFB - 0x8FFF, array index: 0x1A6B */
-	0x3332,0x3334,INVALC,0x332E,0x3331,
-	/* Range 0x9097 - 0x90A1, array index: 0x1A70 */
-	0x2272,0x2273,0x2271,INVALC,0x2274,INVALC,INVALC,0x252A,
-	0x2527,0x252C,0x2528,
-	/* Range 0x90AF - 0x90B4, array index: 0x1A7B */
-	0x2875,0x2877,INVALC,0x2873,0x2876,0x2874,
-	/* Range 0x90BD - 0x90BF, array index: 0x1A81 */
-	0x2D59,0x2D5D,0x2D5A,
-	/* Range 0x90D4 - 0x90F4, array index: 0x1A84 */
-	0x3971,0x2D5B,0x3336,0x333F,0x333D,0x3338,0x3339,0x333E,
-	0x3340,INVALC,INVALC,0x333B,0x3337,INVALC,INVALC,0x333A,
-	0x3341,0x333C,INVALC,INVALC,INVALC,0x3974,0x396C,0x3972,
-	0x3973,INVALC,INVALC,0x396B,0x396D,0x2D58,0x396F,0x3970,
-	0x396E,
-	/* Range 0x90F9 - 0x9108, array index: 0x1AA5 */
-	0x407B,0x5B22,0x407C,0x4079,INVALC,INVALC,0x4078,0x407E,
-	0x407D,INVALC,0x4123,0x4077,0x4122,0x4075,0x4121,0x407A,
-	/* Range 0x910B - 0x9111, array index: 0x1AB5 */
-	0x4830,INVALC,0x482B,0x4831,0x482C,0x482A,0x482D,
-	/* Range 0x911A - 0x9147, array index: 0x1ABC */
-	0x4E56,0x4E59,0x4E51,0x4E55,INVALC,0x4E54,0x4E52,0x4E58,
-	0x4E53,0x4E50,0x4E57,INVALC,0x5523,INVALC,0x6374,0x547E,
-	0x5521,0x547D,0x4076,INVALC,0x5524,0x547C,INVALC,INVALC,
-	0x5522,0x5B23,INVALC,0x5B24,0x5B25,INVALC,0x5F70,INVALC,
-	0x6375,0x6376,INVALC,INVALC,0x6377,0x6749,0x6748,0x6A30,
-	INVALC,0x6A2F,0x6C4A,0x6C4B,0x6C49,0x6E35,
-	/* Range 0x914E - 0x9150, array index: 0x1AEA */
-	0x3343,0x3344,0x3342,
-	/* Range 0x915F - 0x9164, array index: 0x1AED */
-	0x4126,0x4128,0x4124,0x4127,INVALC,0x4125,
-	/* Range 0x9180 - 0x9186, array index: 0x1AF3 */
-	0x552B,0x5528,0x5529,INVALC,0x552A,0x5525,0x5526,
-	/* Range 0x918D - 0x9193, array index: 0x1AFA */
-	0x5B29,INVALC,0x5B2A,0x5B27,0x5B28,INVALC,0x5B26,
-	/* Range 0x9199 - 0x91A2, array index: 0x1B01 */
-	0x5F74,0x5F71,0x5F73,INVALC,0x5F77,INVALC,0x5F75,0x5F78,
-	0x5F76,0x5F72,
-	/* Range 0x91AF - 0x91BE, array index: 0x1B0B */
-	0x637B,0x674A,INVALC,0x6A33,0x6A34,INVALC,0x6A32,INVALC,
-	0x6A31,INVALC,0x6C4C,INVALC,INVALC,0x6F57,0x7056,0x7055,
-	/* Range 0x91D3 - 0x91D5, array index: 0x1B1B */
-	0x2D62,0x2D61,0x3345,
-	/* Range 0x91E8 - 0x91EE, array index: 0x1B1E */
-	0x3A26,INVALC,0x3A23,0x3A24,0x397A,INVALC,0x3A27,
-	/* Range 0x91F3 - 0x91F9, array index: 0x1B25 */
-	0x397D,0x397B,INVALC,INVALC,0x3A25,0x397E,0x3A22,
-	/* Range 0x91FD - 0x9206, array index: 0x1B2C */
-	0x4134,INVALC,0x4133,0x4131,0x4129,0x4138,0x412C,0x4136,
-	0x413D,0x4135,
-	/* Range 0x9216 - 0x921C, array index: 0x1B36 */
-	0x413E,0x413C,INVALC,0x413B,0x412D,INVALC,0x4139,
-	/* Range 0x9224 - 0x9227, array index: 0x1B3D */
-	0x413A,0x412B,0x412E,0x4137,
-	/* Range 0x922D - 0x9233, array index: 0x1B41 */
-	0x4F22,0x483D,INVALC,0x4836,0x4849,0x4852,0x4839,
-	/* Range 0x924C - 0x9256, array index: 0x1B48 */
-	0x4850,INVALC,0x484E,0x4842,0x484C,INVALC,0x4835,0x484F,
-	0x484A,INVALC,0x4851,
-	/* Range 0x9263 - 0x9267, array index: 0x1B53 */
-	0x484B,INVALC,0x483A,0x4838,0x4844,
-	/* Range 0x926C - 0x9272, array index: 0x1B58 */
-	0x4841,0x4840,INVALC,0x4845,0x4848,INVALC,0x484D,
-	/* Range 0x9279 - 0x928E, array index: 0x1B5F */
-	0x4E6A,0x4E62,INVALC,INVALC,0x4E73,0x4E7B,0x4E6C,INVALC,
-	INVALC,0x4E70,0x483C,INVALC,INVALC,0x4E77,0x4E7C,0x4E74,
-	INVALC,0x4E76,0x4F21,0x4E78,0x4E66,0x4E6F,
-	/* Range 0x9297 - 0x92AB, array index: 0x1B75 */
-	0x4E6B,INVALC,0x4E79,0x4E68,0x4E61,INVALC,0x4E7E,INVALC,
-	INVALC,0x4E63,0x4E75,0x4E72,0x4E6D,0x4E5F,0x4E5E,0x4E67,
-	0x4E7A,INVALC,0x4E7D,0x4E65,0x4E69,
-	/* Range 0x92B4 - 0x92B6, array index: 0x1B8A */
-	0x554D,0x5549,0x5531,
-	/* Range 0x92C0 - 0x92E1, array index: 0x1B8D */
-	0x552F,INVALC,0x553B,0x552D,0x552E,INVALC,0x554C,INVALC,
-	0x553E,0x5543,0x553D,0x5B3C,0x5539,0x5541,0x553F,0x5532,
-	0x552C,0x5547,INVALC,0x5548,INVALC,0x5542,INVALC,0x5537,
-	0x5535,0x5530,INVALC,INVALC,INVALC,0x5538,0x5545,0x5534,
-	0x5544,0x554A,
-	/* Range 0x92E6 - 0x92E9, array index: 0x1BAF */
-	0x5540,0x5546,0x553C,0x5536,
-	/* Range 0x92F7 - 0x9302, array index: 0x1BB3 */
-	0x5B41,INVALC,0x5B40,0x5B3E,0x5B50,INVALC,INVALC,0x5B4D,
-	0x5B45,0x5B4F,0x5B37,0x5B43,
-	/* Range 0x9308 - 0x9316, array index: 0x1BBF */
-	0x5B2D,0x5B4E,INVALC,0x5B4C,0x5B4B,0x5B3B,0x5B3A,0x5B30,
-	INVALC,INVALC,0x5B36,0x5B3F,0x5B4A,INVALC,0x5B51,
-	/* Range 0x931B - 0x932A, array index: 0x1BCE */
-	0x5B34,INVALC,0x5B3D,0x5B2C,0x5B2E,INVALC,INVALC,INVALC,
-	0x5B35,0x5B44,0x554B,INVALC,0x5B2B,INVALC,0x5B46,0x5B49,
-	/* Range 0x934C - 0x9359, array index: 0x1BDE */
-	0x602B,INVALC,0x6039,0x6031,0x6026,0x6027,0x6030,INVALC,
-	INVALC,0x602F,0x5F7D,0x602E,0x6022,0x603A,
-	/* Range 0x9360 - 0x9364, array index: 0x1BEC */
-	0x6028,0x6035,INVALC,0x6037,0x5F7C,
-	/* Range 0x9376 - 0x937C, array index: 0x1BF1 */
-	0x6024,0x6033,INVALC,0x602D,0x5B31,0x6034,0x6021,
-	/* Range 0x9388 - 0x9392, array index: 0x1BF8 */
-	0x642C,0x6425,INVALC,INVALC,0x637E,0x6430,0x6427,0x602A,
-	INVALC,0x6432,0x6421,
-	/* Range 0x939B - 0x93AA, array index: 0x1C03 */
-	0x6423,INVALC,0x6424,0x6429,0x642E,INVALC,0x5F79,INVALC,
-	0x6437,0x6434,0x6761,0x642A,0x6426,0x6435,0x6756,0x6428,
-	/* Range 0x93B1 - 0x93B7, array index: 0x1C13 */
-	0x6431,0x6433,INVALC,0x6436,0x637D,INVALC,0x6422,
-	/* Range 0x93CC - 0x93D5, array index: 0x1C1A */
-	0x6754,INVALC,0x675E,0x674E,0x6751,INVALC,0x6760,INVALC,
-	0x6759,0x675C,
-	/* Range 0x93F5 - 0x9400, array index: 0x1C24 */
-	0x6A41,0x6A50,0x6A43,0x6A4A,0x6752,0x6A48,0x6A37,0x6A4E,
-	INVALC,0x6A3B,0x6A4D,0x6A42,
-	/* Range 0x9406 - 0x9416, array index: 0x1C30 */
-	0x6A52,0x6A44,INVALC,0x6A49,0x6A4C,0x6A35,0x6A4F,0x6A40,
-	0x6A45,0x6A39,0x6A3D,0x6A51,0x6A47,0x6A36,0x6A3A,0x6A3C,
-	0x6A46,
-	/* Range 0x9428 - 0x942C, array index: 0x1C41 */
-	0x6A3E,0x6C50,0x6C54,INVALC,0x6C56,
-	/* Range 0x9439 - 0x9440, array index: 0x1C46 */
-	0x6C53,INVALC,0x6C4E,0x6A4B,0x6C51,INVALC,0x6C4D,0x6C57,
-	/* Range 0x9445 - 0x9450, array index: 0x1C4E */
-	0x6E3C,0x6E3F,0x6E3B,0x6E3D,0x6E3E,0x6E38,0x6E39,0x6E36,
-	INVALC,INVALC,0x6E3A,0x6E37,
-	/* Range 0x946B - 0x9478, array index: 0x1C5A */
-	0x7058,INVALC,0x7142,0x7141,0x7143,INVALC,0x7144,INVALC,
-	0x7145,0x7161,0x7164,0x7163,INVALC,0x7162,
-	/* Range 0x9480 - 0x9483, array index: 0x1C68 */
-	0x7230,0x7231,0x722F,0x7237,
-	/* Range 0x957A - 0x957D, array index: 0x1C6C */
-	0x3A28,0x413F,0x554E,0x6763,
-	/* Range 0x959B - 0x959F, array index: 0x1C70 */
-	0x4856,0x4854,INVALC,0x4855,0x4853,
-	/* Range 0x95B5 - 0x95C0, array index: 0x1C75 */
-	0x5B59,0x5B57,0x6040,INVALC,0x5B55,0x5B56,INVALC,0x5B52,
-	0x5B5A,0x5B54,0x5B58,0x603C,
-	/* Range 0x95D1 - 0x95D3, array index: 0x1C81 */
-	0x643A,0x6438,0x6439,
-	/* Range 0x95DA - 0x95E5, array index: 0x1C84 */
-	0x6764,0x6765,INVALC,INVALC,0x6A53,0x6A55,0x6A54,INVALC,
-	INVALC,0x6C5B,0x6C5A,0x6C59,
-	/* Range 0x9620 - 0x9624, array index: 0x1C90 */
-	0x2278,INVALC,0x2276,0x2279,0x2277,
-	/* Range 0x9639 - 0x963D, array index: 0x1C95 */
-	0x2878,0x287B,INVALC,0x287A,0x2879,
-	/* Range 0x9687 - 0x9689, array index: 0x1C9A */
-	0x4143,0x4145,0x4146,
-	/* Range 0x9691 - 0x9693, array index: 0x1C9D */
-	0x4859,0x4857,0x4858,
-	/* Range 0x971F - 0x972F, array index: 0x1CA0 */
-	0x6045,0x6044,INVALC,0x6443,0x6442,INVALC,0x6444,0x676B,
-	INVALC,0x676A,0x6767,INVALC,0x6768,0x6769,INVALC,0x6A56,
-	0x6A57,
-	/* Range 0x9777 - 0x9784, array index: 0x1CB1 */
-	0x4861,0x4862,INVALC,0x4F28,0x4F2D,INVALC,0x4F27,0x4F29,
-	0x4F30,0x4F2B,0x4F2F,0x4F2C,0x4F2A,0x4F2E,
-	/* Range 0x9799 - 0x97A5, array index: 0x1CBF */
-	0x5B60,0x6049,INVALC,0x604B,0x604D,0x604C,INVALC,INVALC,
-	0x604A,0x644B,INVALC,0x6449,0x644C,
-	/* Range 0x97A8 - 0x97AE, array index: 0x1CCC */
-	0x6447,INVALC,0x644A,0x6448,0x6445,INVALC,0x6446,
-	/* Range 0x97CD - 0x97E5, array index: 0x1CD3 */
-	0x4F32,0x4F31,0x555E,0x555D,INVALC,INVALC,INVALC,0x604F,
-	0x604E,0x644F,0x644D,0x6450,0x644E,INVALC,INVALC,INVALC,
-	0x676F,0x6770,0x6771,INVALC,0x6C5F,INVALC,0x6E41,INVALC,
-	0x7060,
-	/* Range 0x980D - 0x980F, array index: 0x1CEC */
-	0x4865,0x4866,0x4864,
-	/* Range 0x9826 - 0x9829, array index: 0x1CEF */
-	0x5561,0x5566,0x5563,0x5562,
-	/* Range 0x9841 - 0x984A, array index: 0x1CF3 */
-	0x6051,INVALC,0x6056,0x6052,0x6055,INVALC,INVALC,0x5E41,
-	0x6054,0x6053,
-	/* Range 0x9850 - 0x9852, array index: 0x1CFD */
-	0x6452,0x6453,0x6454,
-	/* Range 0x985C - 0x9864, array index: 0x1D00 */
-	0x6772,0x6774,INVALC,0x6A5F,0x6A5C,INVALC,0x6A5D,0x6A5E,
-	0x6C60,
-	/* Range 0x9872 - 0x9874, array index: 0x1D09 */
-	0x7147,0x717C,0x717D,
-	/* Range 0x98AC - 0x98AE, array index: 0x1D0C */
-	0x4867,0x4F34,0x4F35,
-	/* Range 0x98BB - 0x98C2, array index: 0x1D0F */
-	0x6778,INVALC,0x6777,0x6779,0x6776,0x6C63,0x6A60,0x6A61,
-	/* Range 0x9914 - 0x9917, array index: 0x1D17 */
-	0x556B,0x556E,0x556C,0x556D,
-	/* Range 0x9927 - 0x9933, array index: 0x1D1B */
-	0x5B6A,INVALC,0x5B6B,0x605A,0x6058,0x6059,0x605E,INVALC,
-	0x605D,0x6060,0x605F,0x605C,0x605B,
-	/* Range 0x999C - 0x999E, array index: 0x1D28 */
-	0x4F3A,0x4F39,0x5B6C,
-	/* Range 0x99B9 - 0x99BD, array index: 0x1D2B */
-	0x4F3C,0x4F3E,0x4F3D,INVALC,0x4F40,
-	/* Range 0x99C9 - 0x99CF, array index: 0x1D30 */
-	0x5575,INVALC,0x5578,0x557A,0x5570,0x5574,0x5571,
-	/* Range 0x99D3 - 0x99D8, array index: 0x1D37 */
-	0x5572,0x5573,INVALC,0x5576,0x5579,0x5577,
-	/* Range 0x99E3 - 0x99F0, array index: 0x1D3D */
-	0x5B72,0x5B70,0x5B6F,INVALC,0x5B75,INVALC,0x5B74,0x5B73,
-	INVALC,0x5B6E,INVALC,0x5B6D,INVALC,0x5B71,
-	/* Range 0x99F4 - 0x9A15, array index: 0x1D4B */
-	0x6066,INVALC,0x606A,0x6067,0x6069,0x6068,0x6065,0x606B,
-	0x606E,0x606C,0x606D,INVALC,INVALC,INVALC,0x6064,0x606F,
-	0x645D,0x6460,0x6462,0x6461,INVALC,0x645B,0x645F,0x645A,
-	INVALC,0x645C,INVALC,0x6459,INVALC,0x645E,INVALC,INVALC,
-	0x682D,0x6822,
-	/* Range 0x9A1A - 0x9A3A, array index: 0x1D6D */
-	0x6821,0x6826,0x682C,0x6824,0x682B,INVALC,0x6828,INVALC,
-	0x6827,0x682A,0x6825,0x6823,INVALC,0x6829,INVALC,0x6A6E,
-	0x6A6C,INVALC,0x6A6B,0x6A71,0x6A6F,INVALC,INVALC,0x6A6A,
-	0x6A68,INVALC,0x6A69,INVALC,0x6A6D,INVALC,0x6A70,0x6C66,
-	0x6C6C,
-	/* Range 0x9A46 - 0x9A56, array index: 0x1D8E */
-	0x6C68,INVALC,0x6E4C,0x6E4E,0x6E4D,INVALC,0x6E4A,INVALC,
-	0x6E47,0x6E4B,0x6E50,INVALC,0x6E4F,0x6E48,0x6E49,INVALC,
-	0x6F60,
-	/* Range 0x9A64 - 0x9A6B, array index: 0x1D9F */
-	0x7223,INVALC,0x7224,0x7225,0x7233,0x7232,INVALC,0x723B,
-	/* Range 0x9ABE - 0x9AC2, array index: 0x1DA7 */
-	0x6070,0x5B77,0x6463,INVALC,0x682E,
-	/* Range 0x9AF1 - 0x9AFE, array index: 0x1DAC */
-	0x5622,0x5621,0x557E,INVALC,INVALC,0x5B7A,0x5B7D,INVALC,
-	0x5B7C,0x5B7B,INVALC,0x6074,0x6072,0x6071,
-	/* Range 0x9B08 - 0x9B19, array index: 0x1DBA */
-	0x6465,INVALC,0x6830,0x682F,0x6832,INVALC,0x6831,INVALC,
-	0x6A75,0x6A77,0x6A76,INVALC,INVALC,0x6C6F,0x6C72,0x6C70,
-	0x6C71,0x6E52,
-	/* Range 0x9B1E - 0x9B20, array index: 0x1DCC */
-	0x6F62,0x6F63,0x6F64,
-	/* Range 0x9B48 - 0x9B4C, array index: 0x1DCF */
-	0x6075,INVALC,0x646A,0x646C,0x646B,
-	/* Range 0x9B5F - 0x9B61, array index: 0x1DD4 */
-	0x4F49,0x4F47,0x4F48,
-	/* Range 0x9B64 - 0x9B68, array index: 0x1DD7 */
-	0x562D,INVALC,0x5628,0x5625,0x562C,
-	/* Range 0x9B70 - 0x9B88, array index: 0x1DDC */
-	0x562B,0x5627,INVALC,INVALC,0x5626,0x562A,0x5629,INVALC,
-	INVALC,INVALC,0x5C2B,0x5C26,0x5C24,0x5C2D,0x5C25,INVALC,
-	0x5C21,INVALC,0x5C27,INVALC,INVALC,0x5C22,0x607E,0x5C23,
-	0x5C2E,
-	/* Range 0x9B9E - 0x9BA8, array index: 0x1DF5 */
-	0x6078,INVALC,0x6122,0x607B,0x6121,INVALC,0x607D,0x607C,
-	0x607A,INVALC,0x6077,
-	/* Range 0x9BB5 - 0x9BB9, array index: 0x1E00 */
-	0x6472,0x6475,INVALC,0x6473,0x6477,
-	/* Range 0x9BC3 - 0x9BC7, array index: 0x1E05 */
-	0x646F,0x6476,INVALC,0x646E,0x646D,
-	/* Range 0x9BD3 - 0x9BEC, array index: 0x1E0A */
-	0x6474,0x683C,0x6842,INVALC,0x683D,INVALC,0x6840,0x6844,
-	INVALC,0x683F,INVALC,0x6837,INVALC,0x6836,0x6843,0x683A,
-	INVALC,0x6838,0x6841,0x6839,INVALC,INVALC,INVALC,0x6834,
-	0x6835,0x683E,
-	/* Range 0x9C05 - 0x9C0B, array index: 0x1E24 */
-	0x6A7B,0x6B23,0x6B21,0x6A79,0x6B26,INVALC,0x6A78,
-	/* Range 0x9C28 - 0x9C2C, array index: 0x1E2B */
-	0x6C7A,0x6C7B,INVALC,0x6C75,0x6C78,
-	/* Range 0x9C32 - 0x9C41, array index: 0x1E30 */
-	0x6E61,0x6E5C,0x6E60,INVALC,0x6E63,0x6E5F,INVALC,0x6E5B,
-	INVALC,INVALC,0x6E5E,0x6E62,INVALC,0x6E59,0x6A7E,0x6E5D,
-	/* Range 0x9C48 - 0x9C52, array index: 0x1E40 */
-	0x6E58,INVALC,0x6F68,0x6F6A,0x6F6D,0x6F69,0x6F6E,INVALC,
-	0x6F67,INVALC,0x6F65,
-	/* Range 0x9C62 - 0x9C68, array index: 0x1E4B */
-	0x7067,0x7064,INVALC,INVALC,0x7066,0x7065,0x7149,
-	/* Range 0x9C71 - 0x9C75, array index: 0x1E52 */
-	0x7169,INVALC,0x7168,0x7167,0x716A,
-	/* Range 0x9CF7 - 0x9D00, array index: 0x1E57 */
-	0x5633,INVALC,0x5636,0x5630,0x5637,0x562F,0x5631,INVALC,
-	0x5632,0x5635,
-	/* Range 0x9D04 - 0x9D08, array index: 0x1E61 */
-	0x563A,0x5639,INVALC,0x5634,0x5638,
-	/* Range 0x9D17 - 0x9D22, array index: 0x1E66 */
-	0x5C30,0x5C36,0x5C39,INVALC,INVALC,INVALC,0x5C35,0x5C32,
-	0x5C3A,0x5C31,INVALC,0x5C37,
-	/* Range 0x9D2D - 0x9D38, array index: 0x1E72 */
-	0x6135,0x6128,0x6129,0x612C,0x612A,INVALC,0x6124,INVALC,
-	INVALC,0x6127,0x6131,0x612B,
-	/* Range 0x9D3D - 0x9D45, array index: 0x1E7E */
-	0x6133,0x6130,INVALC,0x6132,0x6125,0x612E,0x612F,INVALC,
-	0x612D,
-	/* Range 0x9D4A - 0x9D4C, array index: 0x1E87 */
-	0x647C,0x647E,0x6523,
-	/* Range 0x9D52 - 0x9D5C, array index: 0x1E8A */
-	0x6525,0x647A,0x6526,INVALC,0x6522,0x6524,0x6528,0x6521,
-	0x6529,0x647D,0x6479,
-	/* Range 0x9D67 - 0x9D8C, array index: 0x1E95 */
-	0x6126,0x685E,0x6855,INVALC,0x6851,INVALC,INVALC,INVALC,
-	0x685A,0x6854,0x684A,INVALC,0x6857,0x6852,0x6853,INVALC,
-	0x6845,0x684C,0x685B,INVALC,0x6858,INVALC,0x6850,INVALC,
-	0x685C,0x684B,0x6846,0x6859,INVALC,0x6848,0x6856,0x684D,
-	0x685D,0x6849,INVALC,0x6847,0x684E,0x684F,
-	/* Range 0x9D94 - 0x9DF8, array index: 0x1EBB */
-	0x6B30,INVALC,0x6B3C,0x6B33,0x6B2C,0x6B28,0x6B35,0x6B2E,
-	0x6B31,0x6B2A,0x6B38,0x6B27,0x6B2F,0x6B34,0x6B36,0x6B39,
-	0x6B29,INVALC,0x6B3D,0x6B3E,0x6B37,0x6B3B,0x6B32,INVALC,
-	0x6D2F,0x6D32,INVALC,INVALC,INVALC,0x6D31,0x6D36,0x6D34,
-	INVALC,0x6D2B,0x6D21,0x6C7E,INVALC,0x6D2D,0x6D2E,0x6D2A,
-	0x6D22,INVALC,0x6D27,0x6B3A,INVALC,0x6D23,INVALC,0x6D29,
-	INVALC,0x6D28,INVALC,0x6D24,0x6D30,INVALC,0x6D25,0x6E68,
-	0x6D33,0x6D35,0x6D2C,0x6D26,0x6E69,0x6E6B,0x6E65,INVALC,
-	INVALC,0x6E72,0x6E70,INVALC,0x6E6F,0x6E6E,0x6E67,0x6E64,
-	0x6E6A,0x6E73,0x6E66,0x6E6C,INVALC,0x6F77,0x6F7C,0x6F72,
-	0x6F75,INVALC,0x6F79,INVALC,0x7022,0x6E6D,INVALC,0x6F73,
-	0x6F7D,0x7023,0x6F78,0x6F71,0x6F7B,INVALC,0x6F7A,0x7021,
-	0x6F7E,0x6E71,0x6F76,0x6F70,0x6F74,
-	/* Range 0x9DFB - 0x9E19, array index: 0x1F20 */
-	0x6F6F,INVALC,0x7074,0x706B,0x7073,0x7070,0x7071,0x706A,
-	0x706D,0x7075,0x706F,0x706E,0x706C,INVALC,0x7072,INVALC,
-	0x714C,INVALC,0x714D,INVALC,0x714F,0x714E,0x7151,0x7150,
-	0x716C,0x716B,0x7227,INVALC,0x7228,INVALC,0x7234,
-	/* Range 0x9E86 - 0x9E8E, array index: 0x1F3F */
-	0x5C3C,0x5C3D,0x5C3B,0x6137,0x6136,INVALC,0x652B,0x6138,
-	0x652A,
-	/* Range 0x9E99 - 0x9E9C, array index: 0x1F48 */
-	0x6B3F,0x6B41,0x6B40,0x6D38,
-	/* Range 0x9EE4 - 0x9EE7, array index: 0x1F4C */
-	0x6B43,0x6B42,0x6B45,0x6B44,
-	/* Range 0x9EF2 - 0x9F01, array index: 0x1F50 */
-	0x7026,0x7027,INVALC,0x7153,0x716D,INVALC,INVALC,0x4155,
-	0x5C42,0x613C,0x6862,0x4875,INVALC,0x613D,0x652E,0x652D,
-	/* Range 0x9F18 - 0x9F38, array index: 0x1F60 */
-	0x6D3D,INVALC,0x6D3E,0x6D3C,0x7029,INVALC,0x7077,INVALC,
-	INVALC,INVALC,0x6140,0x613F,0x613E,0x6530,INVALC,INVALC,
-	0x6534,0x6533,0x6532,0x6531,INVALC,0x6863,0x6B47,INVALC,
-	0x6B46,0x6D3F,0x6E78,0x6E77,INVALC,0x6E76,0x702C,0x702B,
-	0x702A,
-	/* Range 0x9F40 - 0x9F4F, array index: 0x1F81 */
-	0x6864,0x6865,0x6E79,0x702D,INVALC,INVALC,0x7078,0x7155,
-	0x7229,0x7243,INVALC,INVALC,0x6535,0x6866,0x6D40,0x702E,
-	/* Range 0x9F54 - 0x9F60, array index: 0x1F91 */
-	0x6141,0x6536,0x6867,0x6868,0x6869,0x6B4C,INVALC,0x6B48,
-	INVALC,0x6B4B,0x6B4A,INVALC,0x6B49,
-	/* Range 0x9F6E - 0x9F7B, array index: 0x1F9E */
-	0x7031,0x7032,0x7030,0x702F,INVALC,INVALC,0x7079,0x707A,
-	0x707B,INVALC,0x7156,0x7159,0x7158,0x7157,
-	/* Unranged codes (638 codes) */
-	/* Array index: 0x1FAC */ 0x4E07,0x2126,
-	/* Array index: 0x1FAC */ 0x4E0C,0x2127,
-	/* Array index: 0x1FAC */ 0x4E0E,0x212F,
-	/* Array index: 0x1FAC */ 0x4E0F,0x212D,
-	/* Array index: 0x1FAC */ 0x4E2E,0x2130,
-	/* Array index: 0x1FAC */ 0x4E31,0x2143,
-	/* Array index: 0x1FAC */ 0x4E33,0x2531,
-	/* Array index: 0x1FAC */ 0x4E3C,0x2144,
-	/* Array index: 0x1FAC */ 0x4E42,0x2121,
-	/* Array index: 0x1FAC */ 0x4E47,0x2128,
-	/* Array index: 0x1FAC */ 0x4E5C,0x2122,
-	/* Array index: 0x1FAC */ 0x4E7F,0x334E,
-	/* Array index: 0x1FAC */ 0x4E83,0x4156,
-	/* Array index: 0x1FAC */ 0x4E84,0x4157,
-	/* Array index: 0x1FAC */ 0x4E8D,0x2129,
-	/* Array index: 0x1FAC */ 0x4E93,0x2131,
-	/* Array index: 0x1FAC */ 0x4EB6,0x4158,
-	/* Array index: 0x1FAC */ 0x4EB9,0x6D44,
-	/* Array index: 0x1FAC */ 0x4EC2,0x2132,
-	/* Array index: 0x1FAC */ 0x4EC8,0x2134,
-	/* Array index: 0x1FAC */ 0x4EC9,0x2133,
-	/* Array index: 0x1FAC */ 0x4EDA,0x214A,
-	/* Array index: 0x1FAC */ 0x4EDC,0x2146,
-	/* Array index: 0x1FAC */ 0x4EDD,0x2149,
-	/* Array index: 0x1FAC */ 0x4EE1,0x2148,
-	/* Array index: 0x1FAC */ 0x4EE8,0x2145,
-	/* Array index: 0x1FAC */ 0x4EE9,0x2147,
-	/* Array index: 0x1FAC */ 0x4EF1,0x216F,
-	/* Array index: 0x1FAC */ 0x4EF4,0x2179,
-	/* Array index: 0x1FAC */ 0x4EF5,0x216D,
-	/* Array index: 0x1FAC */ 0x4EF7,0x2171,
-	/* Array index: 0x1FAC */ 0x4F00,0x2170,
-	/* Array index: 0x1FAC */ 0x4F02,0x2174,
-	/* Array index: 0x1FAC */ 0x4F04,0x2178,
-	/* Array index: 0x1FAC */ 0x4F05,0x2175,
-	/* Array index: 0x1FAC */ 0x4F08,0x2172,
-	/* Array index: 0x1FAC */ 0x4F0E,0x216A,
-	/* Array index: 0x1FAC */ 0x4F18,0x216B,
-	/* Array index: 0x1FAC */ 0x4F1D,0x2173,
-	/* Array index: 0x1FAC */ 0x4F22,0x2176,
-	/* Array index: 0x1FAC */ 0x4F2C,0x216C,
-	/* Array index: 0x1FAC */ 0x4F2D,0x2328,
-	/* Array index: 0x1FAC */ 0x4F33,0x2329,
-	/* Array index: 0x1FAC */ 0x4F3B,0x227B,
-	/* Array index: 0x1FAC */ 0x4F3E,0x2322,
-	/* Array index: 0x1FAC */ 0x4F3F,0x232A,
-	/* Array index: 0x1FAC */ 0x4F41,0x2326,
-	/* Array index: 0x1FAC */ 0x4F49,0x227D,
-	/* Array index: 0x1FAC */ 0x4F4C,0x253D,
-	/* Array index: 0x1FAC */ 0x4F52,0x2324,
-	/* Array index: 0x1FAC */ 0x4F53,0x227E,
-	/* Array index: 0x1FAC */ 0x4F56,0x227A,
-	/* Array index: 0x1FAC */ 0x4F58,0x2327,
-	/* Array index: 0x1FAC */ 0x4F5F,0x2325,
-	/* Array index: 0x1FAC */ 0x4F61,0x232B,
-	/* Array index: 0x1FAC */ 0x4F62,0x227C,
-	/* Array index: 0x1FAC */ 0x4F64,0x2321,
-	/* Array index: 0x1FAC */ 0x4F67,0x2323,
-	/* Array index: 0x1FAC */ 0x4F6A,0x253F,
-	/* Array index: 0x1FAC */ 0x4F6B,0x254B,
-	/* Array index: 0x1FAC */ 0x4F6E,0x254C,
-	/* Array index: 0x1FAC */ 0x4F90,0x2544,
-	/* Array index: 0x1FAC */ 0x4F92,0x2548,
-	/* Array index: 0x1FAC */ 0x4FB2,0x2922,
-	/* Array index: 0x1FAC */ 0x4FB3,0x292A,
-	/* Array index: 0x1FAC */ 0x4FC0,0x292F,
-	/* Array index: 0x1FAC */ 0x4FC1,0x2925,
-	/* Array index: 0x1FAC */ 0x4FC5,0x287E,
-	/* Array index: 0x1FAC */ 0x4FC7,0x292C,
-	/* Array index: 0x1FAC */ 0x4FC9,0x2923,
-	/* Array index: 0x1FAC */ 0x4FCB,0x2924,
-	/* Array index: 0x1FAC */ 0x4FCD,0x287D,
-	/* Array index: 0x1FAC */ 0x4FD3,0x2921,
-	/* Array index: 0x1FAC */ 0x4FD4,0x2926,
-	/* Array index: 0x1FAC */ 0x4FD6,0x292D,
-	/* Array index: 0x1FAC */ 0x4FD9,0x2928,
-	/* Array index: 0x1FAC */ 0x4FDB,0x292B,
-	/* Array index: 0x1FAC */ 0x4FDC,0x2927,
-	/* Array index: 0x1FAC */ 0x4FEC,0x2931,
-	/* Array index: 0x1FAC */ 0x5005,0x2D6A,
-	/* Array index: 0x1FAC */ 0x5007,0x2D6B,
-	/* Array index: 0x1FAC */ 0x500E,0x2D7E,
-	/* Array index: 0x1FAC */ 0x5013,0x2D6C,
-	/* Array index: 0x1FAC */ 0x5015,0x335E,
-	/* Array index: 0x1FAC */ 0x5017,0x2D77,
-	/* Array index: 0x1FAC */ 0x501B,0x2D6F,
-	/* Array index: 0x1FAC */ 0x501C,0x2D78,
-	/* Array index: 0x1FAC */ 0x501E,0x2D69,
-	/* Array index: 0x1FAC */ 0x5020,0x2D79,
-	/* Array index: 0x1FAC */ 0x5022,0x2D6D,
-	/* Array index: 0x1FAC */ 0x5027,0x2D7A,
-	/* Array index: 0x1FAC */ 0x502C,0x2D74,
-	/* Array index: 0x1FAC */ 0x5040,0x3366,
-	/* Array index: 0x1FAC */ 0x5041,0x335A,
-	/* Array index: 0x1FAC */ 0x5045,0x335F,
-	/* Array index: 0x1FAC */ 0x5046,0x3365,
-	/* Array index: 0x1FAC */ 0x5048,0x3358,
-	/* Array index: 0x1FAC */ 0x504A,0x335C,
-	/* Array index: 0x1FAC */ 0x504B,0x3355,
-	/* Array index: 0x1FAC */ 0x504D,0x3359,
-	/* Array index: 0x1FAC */ 0x5051,0x336A,
-	/* Array index: 0x1FAC */ 0x5053,0x3354,
-	/* Array index: 0x1FAC */ 0x5057,0x3369,
-	/* Array index: 0x1FAC */ 0x506E,0x3367,
-	/* Array index: 0x1FAC */ 0x5070,0x334F,
-	/* Array index: 0x1FAC */ 0x5072,0x3357,
-	/* Array index: 0x1FAC */ 0x5073,0x3368,
-	/* Array index: 0x1FAC */ 0x5082,0x3A42,
-	/* Array index: 0x1FAC */ 0x5083,0x3A3B,
-	/* Array index: 0x1FAC */ 0x5087,0x3A43,
-	/* Array index: 0x1FAC */ 0x508B,0x3A39,
-	/* Array index: 0x1FAC */ 0x508C,0x3A3C,
-	/* Array index: 0x1FAC */ 0x508E,0x3A3D,
-	/* Array index: 0x1FAC */ 0x5092,0x3A41,
-	/* Array index: 0x1FAC */ 0x5094,0x3A37,
-	/* Array index: 0x1FAC */ 0x5095,0x3A36,
-	/* Array index: 0x1FAC */ 0x50A3,0x3A3A,
-	/* Array index: 0x1FAC */ 0x50AE,0x415C,
-	/* Array index: 0x1FAC */ 0x50B0,0x4162,
-	/* Array index: 0x1FAC */ 0x50B1,0x4165,
-	/* Array index: 0x1FAC */ 0x50B4,0x415F,
-	/* Array index: 0x1FAC */ 0x50B6,0x4168,
-	/* Array index: 0x1FAC */ 0x50B8,0x4169,
-	/* Array index: 0x1FAC */ 0x50BA,0x4164,
-	/* Array index: 0x1FAC */ 0x50BD,0x4159,
-	/* Array index: 0x1FAC */ 0x50BF,0x415A,
-	/* Array index: 0x1FAC */ 0x50C1,0x4163,
-	/* Array index: 0x1FAC */ 0x50C2,0x4161,
-	/* Array index: 0x1FAC */ 0x50C4,0x415D,
-	/* Array index: 0x1FAC */ 0x50D3,0x4921,
-	/* Array index: 0x1FAC */ 0x50D4,0x4877,
-	/* Array index: 0x1FAC */ 0x50D7,0x4878,
-	/* Array index: 0x1FAC */ 0x50DB,0x487B,
-	/* Array index: 0x1FAC */ 0x50DD,0x487D,
-	/* Array index: 0x1FAC */ 0x50E0,0x4926,
-	/* Array index: 0x1FAC */ 0x50E3,0x4925,
-	/* Array index: 0x1FAC */ 0x50E4,0x487E,
-	/* Array index: 0x1FAC */ 0x50E6,0x4876,
-	/* Array index: 0x1FAC */ 0x50E8,0x4879,
-	/* Array index: 0x1FAC */ 0x50EA,0x487C,
-	/* Array index: 0x1FAC */ 0x50EC,0x4922,
-	/* Array index: 0x1FAC */ 0x50EF,0x4924,
-	/* Array index: 0x1FAC */ 0x50F0,0x4923,
-	/* Array index: 0x1FAC */ 0x50F3,0x487A,
-	/* Array index: 0x1FAC */ 0x50F6,0x4F54,
-	/* Array index: 0x1FAC */ 0x50F8,0x4F51,
-	/* Array index: 0x1FAC */ 0x5103,0x4F4F,
-	/* Array index: 0x1FAC */ 0x5111,0x5643,
-	/* Array index: 0x1FAC */ 0x5113,0x5640,
-	/* Array index: 0x1FAC */ 0x5117,0x5641,
-	/* Array index: 0x1FAC */ 0x511A,0x5642,
-	/* Array index: 0x1FAC */ 0x511C,0x563F,
-	/* Array index: 0x1FAC */ 0x5120,0x5C49,
-	/* Array index: 0x1FAC */ 0x5129,0x5C4A,
-	/* Array index: 0x1FAC */ 0x5139,0x6B4F,
-	/* Array index: 0x1FAC */ 0x513A,0x6B4E,
-	/* Array index: 0x1FAC */ 0x513D,0x6E7D,
-	/* Array index: 0x1FAC */ 0x515A,0x2E21,
-	/* Array index: 0x1FAC */ 0x515F,0x3A44,
-	/* Array index: 0x1FAC */ 0x5187,0x212E,
-	/* Array index: 0x1FAC */ 0x518F,0x232C,
-	/* Array index: 0x1FAC */ 0x5193,0x2E23,
-	/* Array index: 0x1FAC */ 0x5194,0x2E22,
-	/* Array index: 0x1FAC */ 0x5198,0x2135,
-	/* Array index: 0x1FAC */ 0x519E,0x254D,
-	/* Array index: 0x1FAC */ 0x51B1,0x217B,
-	/* Array index: 0x1FAC */ 0x51B9,0x232D,
-	/* Array index: 0x1FAC */ 0x51BC,0x254E,
-	/* Array index: 0x1FAC */ 0x51BE,0x254F,
-	/* Array index: 0x1FAC */ 0x51C4,0x2E25,
-	/* Array index: 0x1FAC */ 0x51C5,0x2E26,
-	/* Array index: 0x1FAC */ 0x51C8,0x2E27,
-	/* Array index: 0x1FAC */ 0x51CA,0x2E24,
-	/* Array index: 0x1FAC */ 0x51CE,0x2E28,
-	/* Array index: 0x1FAC */ 0x51D0,0x336B,
-	/* Array index: 0x1FAC */ 0x51D4,0x3A45,
-	/* Array index: 0x1FAC */ 0x51D7,0x416A,
-	/* Array index: 0x1FAC */ 0x51D8,0x4927,
-	/* Array index: 0x1FAC */ 0x51DE,0x5644,
-	/* Array index: 0x1FAC */ 0x51F5,0x2123,
-	/* Array index: 0x1FAC */ 0x5209,0x214C,
-	/* Array index: 0x1FAC */ 0x520C,0x214B,
-	/* Array index: 0x1FAC */ 0x5210,0x217D,
-	/* Array index: 0x1FAC */ 0x5213,0x217C,
-	/* Array index: 0x1FAC */ 0x521C,0x232E,
-	/* Array index: 0x1FAC */ 0x521E,0x232F,
-	/* Array index: 0x1FAC */ 0x5221,0x2330,
-	/* Array index: 0x1FAC */ 0x5244,0x2932,
-	/* Array index: 0x1FAC */ 0x5246,0x2553,
-	/* Array index: 0x1FAC */ 0x5249,0x2933,
-	/* Array index: 0x1FAC */ 0x5252,0x2E2B,
-	/* Array index: 0x1FAC */ 0x5255,0x2E2E,
-	/* Array index: 0x1FAC */ 0x525A,0x2E2A,
-	/* Array index: 0x1FAC */ 0x5280,0x4928,
-	/* Array index: 0x1FAC */ 0x5281,0x4929,
-	/* Array index: 0x1FAC */ 0x5284,0x4C61,
-	/* Array index: 0x1FAC */ 0x528B,0x4F5A,
-	/* Array index: 0x1FAC */ 0x528C,0x4F5B,
-	/* Array index: 0x1FAC */ 0x52A6,0x217E,
-	/* Array index: 0x1FAC */ 0x52AD,0x2331,
-	/* Array index: 0x1FAC */ 0x52AE,0x2332,
-	/* Array index: 0x1FAC */ 0x52BC,0x2555,
-	/* Array index: 0x1FAC */ 0x52C0,0x2934,
-	/* Array index: 0x1FAC */ 0x52C2,0x2935,
-	/* Array index: 0x1FAC */ 0x52CD,0x2E30,
-	/* Array index: 0x1FAC */ 0x52D3,0x3371,
-	/* Array index: 0x1FAC */ 0x52D6,0x3370,
-	/* Array index: 0x1FAC */ 0x52E9,0x492A,
-	/* Array index: 0x1FAC */ 0x52EB,0x492B,
-	/* Array index: 0x1FAC */ 0x52EF,0x4F5D,
-	/* Array index: 0x1FAC */ 0x52F1,0x4F5C,
-	/* Array index: 0x1FAC */ 0x52F4,0x5C4B,
-	/* Array index: 0x1FAC */ 0x52F7,0x653A,
-	/* Array index: 0x1FAC */ 0x52FC,0x2136,
-	/* Array index: 0x1FAC */ 0x530E,0x2E31,
-	/* Array index: 0x1FAC */ 0x5311,0x3A47,
-	/* Array index: 0x1FAC */ 0x5312,0x3A46,
-	/* Array index: 0x1FAC */ 0x531A,0x2124,
-	/* Array index: 0x1FAC */ 0x531C,0x214D,
-	/* Array index: 0x1FAC */ 0x531F,0x2222,
-	/* Array index: 0x1FAC */ 0x5322,0x2221,
-	/* Array index: 0x1FAC */ 0x532D,0x3372,
-	/* Array index: 0x1FAC */ 0x5330,0x492C,
-	/* Array index: 0x1FAC */ 0x5334,0x5645,
-	/* Array index: 0x1FAC */ 0x5337,0x686A,
-	/* Array index: 0x1FAC */ 0x533C,0x2558,
-	/* Array index: 0x1FAC */ 0x533D,0x2936,
-	/* Array index: 0x1FAC */ 0x534C,0x214E,
-	/* Array index: 0x1FAC */ 0x534D,0x2223,
-	/* Array index: 0x1FAC */ 0x5363,0x2334,
-	/* Array index: 0x1FAC */ 0x536C,0x2137,
-	/* Array index: 0x1FAC */ 0x5372,0x2335,
-	/* Array index: 0x1FAC */ 0x537C,0x2937,
-	/* Array index: 0x1FAC */ 0x5382,0x2125,
-	/* Array index: 0x1FAC */ 0x538A,0x2224,
-	/* Array index: 0x1FAC */ 0x538E,0x2336,
-	/* Array index: 0x1FAC */ 0x538F,0x2337,
-	/* Array index: 0x1FAC */ 0x5392,0x2559,
-	/* Array index: 0x1FAC */ 0x539C,0x3373,
-	/* Array index: 0x1FAC */ 0x539E,0x2E32,
-	/* Array index: 0x1FAC */ 0x53A4,0x3A48,
-	/* Array index: 0x1FAC */ 0x53A7,0x3A49,
-	/* Array index: 0x1FAC */ 0x53AC,0x492D,
-	/* Array index: 0x1FAC */ 0x53B4,0x653B,
-	/* Array index: 0x1FAC */ 0x53B9,0x2138,
-	/* Array index: 0x1FAC */ 0x53E1,0x5646,
-	/* Array index: 0x1FAC */ 0x5407,0x2225,
-	/* Array index: 0x1FAC */ 0x5418,0x2340,
-	/* Array index: 0x1FAC */ 0x5419,0x233D,
-	/* Array index: 0x1FAC */ 0x541C,0x233E,
-	/* Array index: 0x1FAC */ 0x5424,0x2345,
-	/* Array index: 0x1FAC */ 0x5425,0x233F,
-	/* Array index: 0x1FAC */ 0x5428,0x2344,
-	/* Array index: 0x1FAC */ 0x542A,0x233A,
-	/* Array index: 0x1FAC */ 0x5430,0x2338,
-	/* Array index: 0x1FAC */ 0x5437,0x2339,
-	/* Array index: 0x1FAC */ 0x543D,0x2341,
-	/* Array index: 0x1FAC */ 0x5441,0x2343,
-	/* Array index: 0x1FAC */ 0x5445,0x233C,
-	/* Array index: 0x1FAC */ 0x5447,0x2346,
-	/* Array index: 0x1FAC */ 0x544F,0x2342,
-	/* Array index: 0x1FAC */ 0x5454,0x233B,
-	/* Array index: 0x1FAC */ 0x546B,0x2561,
-	/* Array index: 0x1FAC */ 0x546C,0x2565,
-	/* Array index: 0x1FAC */ 0x546F,0x2569,
-	/* Array index: 0x1FAC */ 0x5470,0x294A,
-	/* Array index: 0x1FAC */ 0x5472,0x294E,
-	/* Array index: 0x1FAC */ 0x5474,0x2566,
-	/* Array index: 0x1FAC */ 0x547A,0x2562,
-	/* Array index: 0x1FAC */ 0x5487,0x255B,
-	/* Array index: 0x1FAC */ 0x5488,0x2560,
-	/* Array index: 0x1FAC */ 0x548D,0x2568,
-	/* Array index: 0x1FAC */ 0x5491,0x255E,
-	/* Array index: 0x1FAC */ 0x5498,0x256C,
-	/* Array index: 0x1FAC */ 0x54A5,0x293F,
-	/* Array index: 0x1FAC */ 0x54AD,0x293E,
-	/* Array index: 0x1FAC */ 0x54AE,0x2944,
-	/* Array index: 0x1FAC */ 0x54B0,0x2950,
-	/* Array index: 0x1FAC */ 0x54B6,0x2946,
-	/* Array index: 0x1FAC */ 0x54B7,0x2943,
-	/* Array index: 0x1FAC */ 0x54BA,0x293C,
-	/* Array index: 0x1FAC */ 0x54BC,0x294B,
-	/* Array index: 0x1FAC */ 0x54BE,0x294D,
-	/* Array index: 0x1FAC */ 0x54C3,0x2941,
-	/* Array index: 0x1FAC */ 0x54C5,0x2947,
-	/* Array index: 0x1FAC */ 0x54C6,0x2948,
-	/* Array index: 0x1FAC */ 0x54CF,0x2940,
-	/* Array index: 0x1FAC */ 0x54D6,0x2945,
-	/* Array index: 0x1FAC */ 0x54DE,0x294F,
-	/* Array index: 0x1FAC */ 0x54E0,0x2E46,
-	/* Array index: 0x1FAC */ 0x54E2,0x2E34,
-	/* Array index: 0x1FAC */ 0x54E4,0x2E39,
-	/* Array index: 0x1FAC */ 0x54E7,0x2E37,
-	/* Array index: 0x1FAC */ 0x54EB,0x2E3E,
-	/* Array index: 0x1FAC */ 0x54F1,0x2E41,
-	/* Array index: 0x1FAC */ 0x54F3,0x2E38,
-	/* Array index: 0x1FAC */ 0x54F7,0x2E44,
-	/* Array index: 0x1FAC */ 0x54F8,0x2E45,
-	/* Array index: 0x1FAC */ 0x54FB,0x2E43,
-	/* Array index: 0x1FAC */ 0x54FF,0x2E3B,
-	/* Array index: 0x1FAC */ 0x5517,0x2E35,
-	/* Array index: 0x1FAC */ 0x551A,0x2E3A,
-	/* Array index: 0x1FAC */ 0x5526,0x2E33,
-	/* Array index: 0x1FAC */ 0x552A,0x337A,
-	/* Array index: 0x1FAC */ 0x552D,0x342A,
-	/* Array index: 0x1FAC */ 0x5530,0x3421,
-	/* Array index: 0x1FAC */ 0x5539,0x3428,
-	/* Array index: 0x1FAC */ 0x553B,0x342B,
-	/* Array index: 0x1FAC */ 0x553C,0x3376,
-	/* Array index: 0x1FAC */ 0x5540,0x342C,
-	/* Array index: 0x1FAC */ 0x5545,0x3423,
-	/* Array index: 0x1FAC */ 0x5548,0x3429,
-	/* Array index: 0x1FAC */ 0x554B,0x342D,
-	/* Array index: 0x1FAC */ 0x5562,0x337C,
-	/* Array index: 0x1FAC */ 0x5565,0x3426,
-	/* Array index: 0x1FAC */ 0x557D,0x3A59,
-	/* Array index: 0x1FAC */ 0x557F,0x3A5C,
-	/* Array index: 0x1FAC */ 0x5581,0x3A55,
-	/* Array index: 0x1FAC */ 0x5588,0x3A52,
-	/* Array index: 0x1FAC */ 0x55AD,0x3A4D,
-	/* Array index: 0x1FAC */ 0x55B5,0x3A54,
-	/* Array index: 0x1FAC */ 0x55D9,0x4226,
-	/* Array index: 0x1FAC */ 0x55DB,0x4170,
-	/* Array index: 0x1FAC */ 0x55DD,0x4175,
-	/* Array index: 0x1FAC */ 0x55E2,0x4221,
-	/* Array index: 0x1FAC */ 0x55E9,0x4179,
-	/* Array index: 0x1FAC */ 0x55F2,0x4224,
-	/* Array index: 0x1FAC */ 0x55F9,0x493C,
-	/* Array index: 0x1FAC */ 0x55FA,0x4938,
-	/* Array index: 0x1FAC */ 0x55FC,0x4932,
-	/* Array index: 0x1FAC */ 0x55FF,0x493B,
-	/* Array index: 0x1FAC */ 0x5601,0x4935,
-	/* Array index: 0x1FAC */ 0x5602,0x4937,
-	/* Array index: 0x1FAC */ 0x5604,0x493A,
-	/* Array index: 0x1FAC */ 0x560C,0x4930,
-	/* Array index: 0x1FAC */ 0x560F,0x4933,
-	/* Array index: 0x1FAC */ 0x5612,0x4931,
-	/* Array index: 0x1FAC */ 0x5613,0x4936,
-	/* Array index: 0x1FAC */ 0x5615,0x492F,
-	/* Array index: 0x1FAC */ 0x561C,0x4934,
-	/* Array index: 0x1FAC */ 0x561D,0x4939,
-	/* Array index: 0x1FAC */ 0x5627,0x492E,
-	/* Array index: 0x1FAC */ 0x562A,0x4F6E,
-	/* Array index: 0x1FAC */ 0x562C,0x4F6B,
-	/* Array index: 0x1FAC */ 0x5633,0x4F69,
-	/* Array index: 0x1FAC */ 0x5635,0x4F61,
-	/* Array index: 0x1FAC */ 0x5638,0x4F6D,
-	/* Array index: 0x1FAC */ 0x563A,0x4F6F,
-	/* Array index: 0x1FAC */ 0x5658,0x4F66,
-	/* Array index: 0x1FAC */ 0x565A,0x4F67,
-	/* Array index: 0x1FAC */ 0x565E,0x564F,
-	/* Array index: 0x1FAC */ 0x5660,0x5648,
-	/* Array index: 0x1FAC */ 0x5663,0x564C,
-	/* Array index: 0x1FAC */ 0x5666,0x564B,
-	/* Array index: 0x1FAC */ 0x566D,0x564D,
-	/* Array index: 0x1FAC */ 0x566E,0x5649,
-	/* Array index: 0x1FAC */ 0x5670,0x5647,
-	/* Array index: 0x1FAC */ 0x5672,0x564E,
-	/* Array index: 0x1FAC */ 0x5673,0x564A,
-	/* Array index: 0x1FAC */ 0x5677,0x5650,
-	/* Array index: 0x1FAC */ 0x568C,0x5C4D,
-	/* Array index: 0x1FAC */ 0x568D,0x5C4E,
-	/* Array index: 0x1FAC */ 0x5693,0x5C4C,
-	/* Array index: 0x1FAC */ 0x56B2,0x686B,
-	/* Array index: 0x1FAC */ 0x56B3,0x686D,
-	/* Array index: 0x1FAC */ 0x56B5,0x686C,
-	/* Array index: 0x1FAC */ 0x56BD,0x6B53,
-	/* Array index: 0x1FAC */ 0x56BE,0x6B54,
-	/* Array index: 0x1FAC */ 0x56C3,0x6B52,
-	/* Array index: 0x1FAC */ 0x56C5,0x6D46,
-	/* Array index: 0x1FAC */ 0x56C6,0x6D45,
-	/* Array index: 0x1FAC */ 0x56CB,0x6D47,
-	/* Array index: 0x1FAC */ 0x56CD,0x7034,
-	/* Array index: 0x1FAC */ 0x56D3,0x7033,
-	/* Array index: 0x1FAC */ 0x56D4,0x707C,
-	/* Array index: 0x1FAC */ 0x56D7,0x212A,
-	/* Array index: 0x1FAC */ 0x56DF,0x2227,
-	/* Array index: 0x1FAC */ 0x56E1,0x2226,
-	/* Array index: 0x1FAC */ 0x56E5,0x2349,
-	/* Array index: 0x1FAC */ 0x56E7,0x2348,
-	/* Array index: 0x1FAC */ 0x56EE,0x2347,
-	/* Array index: 0x1FAC */ 0x56F7,0x2570,
-	/* Array index: 0x1FAC */ 0x56F9,0x2571,
-	/* Array index: 0x1FAC */ 0x5701,0x2E4A,
-	/* Array index: 0x1FAC */ 0x5702,0x2E4B,
-	/* Array index: 0x1FAC */ 0x5707,0x342F,
-	/* Array index: 0x1FAC */ 0x570A,0x342E,
-	/* Array index: 0x1FAC */ 0x570C,0x3A60,
-	/* Array index: 0x1FAC */ 0x5714,0x4228,
-	/* Array index: 0x1FAC */ 0x572A,0x2229,
-	/* Array index: 0x1FAC */ 0x572E,0x2228,
-	/* Array index: 0x1FAC */ 0x5734,0x222A,
-	/* Array index: 0x1FAC */ 0x5741,0x234A,
-	/* Array index: 0x1FAC */ 0x5745,0x234B,
-	/* Array index: 0x1FAC */ 0x5749,0x234D,
-	/* Array index: 0x1FAC */ 0x574B,0x234E,
-	/* Array index: 0x1FAC */ 0x574C,0x234C,
-	/* Array index: 0x1FAC */ 0x5752,0x234F,
-	/* Array index: 0x1FAC */ 0x5762,0x257E,
-	/* Array index: 0x1FAC */ 0x5768,0x2621,
-	/* Array index: 0x1FAC */ 0x576B,0x2575,
-	/* Array index: 0x1FAC */ 0x577B,0x257B,
-	/* Array index: 0x1FAC */ 0x577D,0x2622,
-	/* Array index: 0x1FAC */ 0x5780,0x2579,
-	/* Array index: 0x1FAC */ 0x578C,0x2955,
-	/* Array index: 0x1FAC */ 0x578F,0x295B,
-	/* Array index: 0x1FAC */ 0x57A4,0x2954,
-	/* Array index: 0x1FAC */ 0x57A5,0x295D,
-	/* Array index: 0x1FAC */ 0x57C6,0x2E51,
-	/* Array index: 0x1FAC */ 0x57C7,0x2E57,
-	/* Array index: 0x1FAC */ 0x57CC,0x2E4C,
-	/* Array index: 0x1FAC */ 0x57CF,0x343D,
-	/* Array index: 0x1FAC */ 0x57D0,0x2E58,
-	/* Array index: 0x1FAC */ 0x57D2,0x2E4F,
-	/* Array index: 0x1FAC */ 0x57D5,0x2E4E,
-	/* Array index: 0x1FAC */ 0x57DC,0x3434,
-	/* Array index: 0x1FAC */ 0x5804,0x344F,
-	/* Array index: 0x1FAC */ 0x5814,0x3431,
-	/* Array index: 0x1FAC */ 0x5819,0x3A63,
-	/* Array index: 0x1FAC */ 0x581B,0x3A6C,
-	/* Array index: 0x1FAC */ 0x581C,0x3A6B,
-	/* Array index: 0x1FAC */ 0x581E,0x3A64,
-	/* Array index: 0x1FAC */ 0x5823,0x3A66,
-	/* Array index: 0x1FAC */ 0x5848,0x3A69,
-	/* Array index: 0x1FAC */ 0x5849,0x422E,
-	/* Array index: 0x1FAC */ 0x5853,0x4229,
-	/* Array index: 0x1FAC */ 0x5855,0x4230,
-	/* Array index: 0x1FAC */ 0x5859,0x4233,
-	/* Array index: 0x1FAC */ 0x585B,0x4235,
-	/* Array index: 0x1FAC */ 0x585D,0x4232,
-	/* Array index: 0x1FAC */ 0x5868,0x422A,
-	/* Array index: 0x1FAC */ 0x586F,0x422F,
-	/* Array index: 0x1FAC */ 0x5871,0x4238,
-	/* Array index: 0x1FAC */ 0x5874,0x4944,
-	/* Array index: 0x1FAC */ 0x5876,0x494A,
-	/* Array index: 0x1FAC */ 0x587F,0x4943,
-	/* Array index: 0x1FAC */ 0x5881,0x4942,
-	/* Array index: 0x1FAC */ 0x5882,0x494B,
-	/* Array index: 0x1FAC */ 0x5894,0x494E,
-	/* Array index: 0x1FAC */ 0x5898,0x4940,
-	/* Array index: 0x1FAC */ 0x589D,0x4F72,
-	/* Array index: 0x1FAC */ 0x58A0,0x4F74,
-	/* Array index: 0x1FAC */ 0x58A1,0x4F79,
-	/* Array index: 0x1FAC */ 0x58A3,0x4F75,
-	/* Array index: 0x1FAC */ 0x58A5,0x4F78,
-	/* Array index: 0x1FAC */ 0x58AB,0x4F71,
-	/* Array index: 0x1FAC */ 0x58AC,0x4F77,
-	/* Array index: 0x1FAC */ 0x58AF,0x4F76,
-	/* Array index: 0x1FAC */ 0x58B1,0x4F73,
-	/* Array index: 0x1FAC */ 0x58BA,0x5657,
-	/* Array index: 0x1FAC */ 0x58BC,0x5659,
-	/* Array index: 0x1FAC */ 0x58BD,0x5654,
-	/* Array index: 0x1FAC */ 0x58BF,0x5656,
-	/* Array index: 0x1FAC */ 0x58C2,0x5658,
-	/* Array index: 0x1FAC */ 0x58C6,0x565A,
-	/* Array index: 0x1FAC */ 0x58C8,0x5653,
-	/* Array index: 0x1FAC */ 0x58C9,0x5655,
-	/* Array index: 0x1FAC */ 0x58CF,0x5C58,
-	/* Array index: 0x1FAC */ 0x58D2,0x5C59,
-	/* Array index: 0x1FAC */ 0x58D4,0x5C57,
-	/* Array index: 0x1FAC */ 0x58D6,0x5C56,
-	/* Array index: 0x1FAC */ 0x58DA,0x6542,
-	/* Array index: 0x1FAC */ 0x58DB,0x6544,
-	/* Array index: 0x1FAC */ 0x58DD,0x6543,
-	/* Array index: 0x1FAC */ 0x58E3,0x686E,
-	/* Array index: 0x1FAC */ 0x58E7,0x6F22,
-	/* Array index: 0x1FAC */ 0x58E8,0x6F21,
-	/* Array index: 0x1FAC */ 0x58F4,0x2960,
-	/* Array index: 0x1FAC */ 0x58FC,0x4239,
-	/* Array index: 0x1FAC */ 0x58FE,0x4950,
-	/* Array index: 0x1FAC */ 0x58FF,0x4F7A,
-	/* Array index: 0x1FAC */ 0x5903,0x213A,
-	/* Array index: 0x1FAC */ 0x5906,0x2350,
-	/* Array index: 0x1FAC */ 0x5912,0x6545,
-	/* Array index: 0x1FAC */ 0x5917,0x2151,
-	/* Array index: 0x1FAC */ 0x592C,0x213B,
-	/* Array index: 0x1FAC */ 0x592F,0x2152,
-	/* Array index: 0x1FAC */ 0x593C,0x222B,
-	/* Array index: 0x1FAC */ 0x5940,0x2351,
-	/* Array index: 0x1FAC */ 0x5945,0x2624,
-	/* Array index: 0x1FAC */ 0x594A,0x2E5C,
-	/* Array index: 0x1FAC */ 0x5953,0x2962,
-	/* Array index: 0x1FAC */ 0x595C,0x3450,
-	/* Array index: 0x1FAC */ 0x5961,0x3A76,
-	/* Array index: 0x1FAC */ 0x596B,0x4951,
-	/* Array index: 0x1FAC */ 0x5977,0x2231,
-	/* Array index: 0x1FAC */ 0x5985,0x222E,
-	/* Array index: 0x1FAC */ 0x5997,0x2355,
-	/* Array index: 0x1FAC */ 0x5998,0x2353,
-	/* Array index: 0x1FAC */ 0x59A6,0x2352,
-	/* Array index: 0x1FAC */ 0x59A7,0x235A,
-	/* Array index: 0x1FAC */ 0x59BA,0x2626,
-	/* Array index: 0x1FAC */ 0x59BC,0x262D,
-	/* Array index: 0x1FAC */ 0x59BD,0x2631,
-	/* Array index: 0x1FAC */ 0x59C0,0x2632,
-	/* Array index: 0x1FAC */ 0x59C1,0x262B,
-	/* Array index: 0x1FAC */ 0x59C3,0x262E,
-	/* Array index: 0x1FAC */ 0x59C7,0x2635,
-	/* Array index: 0x1FAC */ 0x59C8,0x2633,
-	/* Array index: 0x1FAC */ 0x59CC,0x262A,
-	/* Array index: 0x1FAC */ 0x59CE,0x2628,
-	/* Array index: 0x1FAC */ 0x59CF,0x2627,
-	/* Array index: 0x1FAC */ 0x59D6,0x262F,
-	/* Array index: 0x1FAC */ 0x59DB,0x2970,
-	/* Array index: 0x1FAC */ 0x59E4,0x296D,
-	/* Array index: 0x1FAC */ 0x59E9,0x2971,
-	/* Array index: 0x1FAC */ 0x5A0A,0x2E64,
-	/* Array index: 0x1FAC */ 0x5A0F,0x2E62,
-	/* Array index: 0x1FAC */ 0x5A1E,0x2E65,
-	/* Array index: 0x1FAC */ 0x5A2D,0x2E5F,
-	/* Array index: 0x1FAC */ 0x5A2E,0x2E60,
-	/* Array index: 0x1FAC */ 0x5A33,0x2E66,
-	/* Array index: 0x1FAC */ 0x5A3E,0x3467,
-	/* Array index: 0x1FAC */ 0x5A64,0x345E,
-	/* Array index: 0x1FAC */ 0x5A65,0x345B,
-	/* Array index: 0x1FAC */ 0x5A67,0x3454,
-	/* Array index: 0x1FAC */ 0x5A69,0x346C,
-	/* Array index: 0x1FAC */ 0x5A6C,0x345C,
-	/* Array index: 0x1FAC */ 0x5A6D,0x3458,
-	/* Array index: 0x1FAC */ 0x5A70,0x346B,
-	/* Array index: 0x1FAC */ 0x5A83,0x3B2A,
-	/* Array index: 0x1FAC */ 0x5A84,0x3B27,
-	/* Array index: 0x1FAC */ 0x5AA2,0x3A7B,
-	/* Array index: 0x1FAC */ 0x5AA5,0x3B22,
-	/* Array index: 0x1FAC */ 0x5AA6,0x3A7E,
-	/* Array index: 0x1FAC */ 0x5AA9,0x3B2C,
-	/* Array index: 0x1FAC */ 0x5ABF,0x4242,
-	/* Array index: 0x1FAC */ 0x5AC0,0x4247,
-	/* Array index: 0x1FAC */ 0x5AD5,0x4955,
-	/* Array index: 0x1FAC */ 0x5AE5,0x4954,
-	/* Array index: 0x1FAC */ 0x5AFD,0x4F7D,
-	/* Array index: 0x1FAC */ 0x5B0F,0x5029,
-	/* Array index: 0x1FAC */ 0x5B10,0x5661,
-	/* Array index: 0x1FAC */ 0x5B1E,0x5666,
-	/* Array index: 0x1FAC */ 0x5B20,0x5665,
-	/* Array index: 0x1FAC */ 0x5B21,0x565E,
-	/* Array index: 0x1FAC */ 0x5B32,0x5C5C,
-	/* Array index: 0x1FAC */ 0x5B45,0x686F,
-	/* Array index: 0x1FAC */ 0x5B56,0x2233,
-	/* Array index: 0x1FAC */ 0x5B62,0x2636,
-	/* Array index: 0x1FAC */ 0x5B65,0x2637,
-	/* Array index: 0x1FAC */ 0x5B6C,0x2E67,
-	/* Array index: 0x1FAC */ 0x5B6E,0x3473,
-	/* Array index: 0x1FAC */ 0x5B72,0x3472,
-	/* Array index: 0x1FAC */ 0x5B77,0x4964,
-	/* Array index: 0x1FAC */ 0x5B7B,0x5C63,
-	/* Array index: 0x1FAC */ 0x5B81,0x2153,
-	/* Array index: 0x1FAC */ 0x5B84,0x2154,
-	/* Array index: 0x1FAC */ 0x5B8E,0x235C,
-	/* Array index: 0x1FAC */ 0x5B92,0x235D,
-	/* Array index: 0x1FAC */ 0x5B93,0x2638,
-	/* Array index: 0x1FAC */ 0x5B95,0x2639,
-	/* Array index: 0x1FAC */ 0x5BA7,0x2E68,
-	/* Array index: 0x1FAC */ 0x5BA8,0x2978,
-	/* Array index: 0x1FAC */ 0x5BAC,0x2E6A,
-	/* Array index: 0x1FAC */ 0x5BAD,0x2E69,
-	/* Array index: 0x1FAC */ 0x5BC0,0x3475,
-	/* Array index: 0x1FAC */ 0x5BC1,0x3474,
-	/* Array index: 0x1FAC */ 0x5BD1,0x3B38,
-	/* Array index: 0x1FAC */ 0x5BD4,0x3B37,
-	/* Array index: 0x1FAC */ 0x5BD6,0x424E,
-	/* Array index: 0x1FAC */ 0x5BD8,0x424F,
-	/* Array index: 0x1FAC */ 0x5BD9,0x4250,
-	/* Array index: 0x1FAC */ 0x5BE0,0x4965,
-	/* Array index: 0x1FAC */ 0x5BE3,0x4966,
-	/* Array index: 0x1FAC */ 0x5BEA,0x3B34,
-	/* Array index: 0x1FAC */ 0x5BEF,0x5667,
-	/* Array index: 0x1FAC */ 0x5BF1,0x5C64,
-	/* Array index: 0x1FAC */ 0x5BF2,0x5C65,
-	/* Array index: 0x1FAC */ 0x5C03,0x2E6B,
-	/* Array index: 0x1FAC */ 0x5C0C,0x3B3B,
-	/* Array index: 0x1FAC */ 0x5C10,0x213C,
-	/* Array index: 0x1FAC */ 0x5C12,0x2155,
-	/* Array index: 0x1FAC */ 0x5C15,0x2234,
-	/* Array index: 0x1FAC */ 0x5C1F,0x4251,
-	/* Array index: 0x1FAC */ 0x5C25,0x2235,
-	/* Array index: 0x1FAC */ 0x5C28,0x235E,
-	/* Array index: 0x1FAC */ 0x5C2A,0x235F,
-	/* Array index: 0x1FAC */ 0x5C30,0x3B3C,
-	/* Array index: 0x1FAC */ 0x5C33,0x4252,
-	/* Array index: 0x1FAC */ 0x5C3B,0x2156,
-	/* Array index: 0x1FAC */ 0x5C44,0x263A,
-	/* Array index: 0x1FAC */ 0x5C47,0x263B,
-	/* Array index: 0x1FAC */ 0x5C4C,0x2979,
-	/* Array index: 0x1FAC */ 0x5C54,0x2E6D,
-	/* Array index: 0x1FAC */ 0x5C56,0x2E6C,
-	/* Array index: 0x1FAC */ 0x5C59,0x3476,
-	/* Array index: 0x1FAC */ 0x5C63,0x4967,
-	/* Array index: 0x1FAC */ 0x5C67,0x502A,
-	/* Array index: 0x1FAC */ 0x5C69,0x614E,
-	/* Array index: 0x1FAC */ 0x5C6A,0x614F,
-	/* Array index: 0x1FAC */ 0x5C6D,0x7036,
-	/* Array index: 0x1FAC */ 0x5C6E,0x212B,
-	/* Array index: 0x1FAC */ 0x5C73,0x2158,
-	/* Array index: 0x1FAC */ 0x5C74,0x2157,
-	/* Array index: 0x1FAC */ 0x5C9D,0x2649,
-	/* Array index: 0x1FAC */ 0x5CB5,0x263F,
-	/* Array index: 0x1FAC */ 0x5CB6,0x264B,
-	/* Array index: 0x1FAC */ 0x5CEC,0x2E6E,
-	/* Array index: 0x1FAC */ 0x5CEE,0x2E70,
-	/* Array index: 0x1FAC */ 0x5CF1,0x2E71,
-	/* Array index: 0x1FAC */ 0x5CFF,0x2E6F,
-	/* Array index: 0x1FAC */ 0x5D00,0x2E73,
-	/* Array index: 0x1FAC */ 0x5D12,0x3525,
-	/* Array index: 0x1FAC */ 0x5D1A,0x347A,
-	/* Array index: 0x1FAC */ 0x5D23,0x3526,
-	/* Array index: 0x1FAC */ 0x5D25,0x3522,
-	/* Array index: 0x1FAC */ 0x5D26,0x3521,
-	/* Array index: 0x1FAC */ 0x5D28,0x347D,
-	/* Array index: 0x1FAC */ 0x5D4E,0x3B45,
-	/* Array index: 0x1FAC */ 0x5D51,0x3B44,
-	/* Array index: 0x1FAC */ 0x5D52,0x3B49,
-	/* Array index: 0x1FAC */ 0x5D55,0x3B46,
-	/* Array index: 0x1FAC */ 0x5D59,0x3B4C,
-	/* Array index: 0x1FAC */ 0x5D5E,0x4259,
-	/* Array index: 0x1FAC */ 0x5D62,0x425C,
-	/* Array index: 0x1FAC */ 0x5D63,0x4254,
-	/* Array index: 0x1FAC */ 0x5D65,0x4256,
-	/* Array index: 0x1FAC */ 0x5D67,0x425B,
-	/* Array index: 0x1FAC */ 0x5D68,0x425A,
-	/* Array index: 0x1FAC */ 0x5D6B,0x3B3F,
-	/* Array index: 0x1FAC */ 0x5D6C,0x4258,
-	/* Array index: 0x1FAC */ 0x5D71,0x4253,
-	/* Array index: 0x1FAC */ 0x5D72,0x4257,
-	/* Array index: 0x1FAC */ 0x5D77,0x496E,
-	/* Array index: 0x1FAC */ 0x5D8D,0x4974,
-	/* Array index: 0x1FAC */ 0x5D92,0x502E,
-	/* Array index: 0x1FAC */ 0x5D93,0x5030,
-	/* Array index: 0x1FAC */ 0x5D95,0x5031,
-	/* Array index: 0x1FAC */ 0x5D97,0x502C,
-	/* Array index: 0x1FAC */ 0x5D99,0x502B,
-	/* Array index: 0x1FAC */ 0x5D9A,0x5035,
-	/* Array index: 0x1FAC */ 0x5DC0,0x6150,
-	/* Array index: 0x1FAC */ 0x5DC2,0x643E,
-	/* Array index: 0x1FAC */ 0x5DC3,0x6549,
-	/* Array index: 0x1FAC */ 0x5DC6,0x6870,
-	/* Array index: 0x1FAC */ 0x5DC7,0x6871,
-	/* Array index: 0x1FAC */ 0x5DCB,0x6B57,
-	/* Array index: 0x1FAC */ 0x5DCF,0x6B58,
-	/* Array index: 0x1FAC */ 0x5DD1,0x6D4C,
-	/* Array index: 0x1FAC */ 0x5DD5,0x6D4B,
-	/* Array index: 0x1FAC */ 0x5DD8,0x6F25,
-	/* Array index: 0x1FAC */ 0x5DDF,0x223A,
-	/* Array index: 0x1FAC */ 0x5DE0,0x236A,
-	/* Array index: 0x1FAC */ 0x5DF0,0x425D,
-	/* Array index: 0x1FAC */ 0x5DF9,0x2A30,
-	/* Array index: 0x1FAC */ 0x5DFF,0x213D,
-	/* Array index: 0x1FAC */ 0x5E04,0x2159,
-	/* Array index: 0x1FAC */ 0x5E0A,0x236B,
-	/* Array index: 0x1FAC */ 0x5E0E,0x236C,
-	/* Array index: 0x1FAC */ 0x5E14,0x264F,
-	/* Array index: 0x1FAC */ 0x5E17,0x264E,
-	/* Array index: 0x1FAC */ 0x5E19,0x2650,
-	/* Array index: 0x1FAC */ 0x5E28,0x2E76,
-	/* Array index: 0x1FAC */ 0x5E29,0x2E75,
-	/* Array index: 0x1FAC */ 0x5E34,0x352A,
-	/* Array index: 0x1FAC */ 0x5E3E,0x3529,
-	/* Array index: 0x1FAC */ 0x5E41,0x3B57,
-	/* Array index: 0x1FAC */ 0x5E44,0x3B56,
-	/* Array index: 0x1FAC */ 0x5E53,0x4979,
-	/* Array index: 0x1FAC */ 0x5E58,0x4977,
-	/* Array index: 0x1FAC */ 0x5E59,0x4978,
-	/* Array index: 0x1FAC */ 0x5E5C,0x503A,
-	/* Array index: 0x1FAC */ 0x5E5D,0x5038,
-	/* Array index: 0x1FAC */ 0x5E60,0x5039,
-	/* Array index: 0x1FAC */ 0x5E75,0x223B,
-	/* Array index: 0x1FAC */ 0x5E80,0x215A,
-	/* Array index: 0x1FAC */ 0x5E82,0x215B,
-	/* Array index: 0x1FAC */ 0x5E84,0x223C,
-	/* Array index: 0x1FAC */ 0x5E9B,0x2A39,
-	/* Array index: 0x1FAC */ 0x5EA8,0x2E77,
-	/* Array index: 0x1FAC */ 0x5EAA,0x2E79,
-	/* Array index: 0x1FAC */ 0x5EAC,0x2E7A,
-	/* Array index: 0x1FAC */ 0x5EB9,0x352D,
-	/* Array index: 0x1FAC */ 0x5ECB,0x4266,
-	/* Array index: 0x1FAC */ 0x5ECC,0x4264,
-	/* Array index: 0x1FAC */ 0x5ECE,0x497D,
-	/* Array index: 0x1FAC */ 0x5EE1,0x503E,
-	/* Array index: 0x1FAC */ 0x5F02,0x223D,
-	/* Array index: 0x1FAC */ 0x5F05,0x2372,
-	/* Array index: 0x1FAC */ 0x5F07,0x2A3C,
-	/* Array index: 0x1FAC */ 0x5F1A,0x223E,
-	/* Array index: 0x1FAC */ 0x5F1D,0x2373,
-	/* Array index: 0x1FAC */ 0x5F28,0x2651,
-	/* Array index: 0x1FAC */ 0x5F2E,0x2A3D,
-	/* Array index: 0x1FAC */ 0x5F30,0x2E7C,
-	/* Array index: 0x1FAC */ 0x5F33,0x2E7B,
-	/* Array index: 0x1FAC */ 0x5F36,0x3530,
-	/* Array index: 0x1FAC */ 0x5F38,0x3531,
-	/* Array index: 0x1FAC */ 0x5F40,0x4268,
-	/* Array index: 0x1FAC */ 0x5F43,0x4A26,
-	/* Array index: 0x1FAC */ 0x5F44,0x4A25,
-	/* Array index: 0x1FAC */ 0x5F49,0x503F,
-	/* Array index: 0x1FAC */ 0x5F4B,0x567E,
-	/* Array index: 0x1FAC */ 0x5F4F,0x6F27,
-	/* Array index: 0x1FAC */ 0x5F54,0x2655,
-	/* Array index: 0x1FAC */ 0x5F56,0x2A3E,
-	/* Array index: 0x1FAC */ 0x5F58,0x3B58,
-	/* Array index: 0x1FAC */ 0x5F67,0x2E7D,
-	/* Array index: 0x1FAC */ 0x5F6F,0x4A27,
-	/* Array index: 0x1FAC */ 0x5F73,0x212C,
-	/* Array index: 0x1FAC */ 0x5F74,0x223F,
-	/* Array index: 0x1FAC */ 0x5F76,0x2375,
-	/* Array index: 0x1FAC */ 0x5F78,0x2374,
-	/* Array index: 0x1FAC */ 0x5F7D,0x2658,
-	/* Array index: 0x1FAC */ 0x5F7E,0x2657,
-	/* Array index: 0x1FAC */ 0x5F82,0x2656,
-	/* Array index: 0x1FAC */ 0x5F86,0x2A3F,
-	/* Array index: 0x1FAC */ 0x5F96,0x3533,
-	/* Array index: 0x1FAC */ 0x5F9B,0x3532,
-	/* Array index: 0x1FAC */ 0x5F9F,0x3534,
-	/* Array index: 0x1FAC */ 0x5FA5,0x3B5A,
-	/* Array index: 0x1FAC */ 0x5FA6,0x3B59,
-	/* Array index: 0x1FAC */ 0x5FAB,0x3B5B,
-	/* Array index: 0x1FAC */ 0x5FAD,0x426A,
-	/* Array index: 0x1FAC */ 0x5FAF,0x4269,
-	/* Array index: 0x1FAC */ 0x5FB2,0x5040,
-	/* Array index: 0x1FAC */ 0x5FB6,0x4A28,
-	/* Array index: 0x1FAC */ 0x5FC9,0x215C,
-	/* Array index: 0x1FAC */ 0x5FDE,0x2659,
-	/* Array index: 0x1FAC */ 0x5FE8,0x237A,
-	/* Array index: 0x1FAC */ 0x5FF3,0x237C,
-	/* Array index: 0x1FAC */ 0x5FF4,0x2427,
-	/* Array index: 0x1FAC */ 0x5FF7,0x2424,
-	/* Array index: 0x1FAC */ 0x5FFA,0x2422,
-	/* Array index: 0x1FAC */ 0x5FFB,0x2425,
-	/* Array index: 0x1FAC */ 0x6000,0x2426,
-	/* Array index: 0x1FAC */ 0x6017,0x2662,
-	/* Array index: 0x1FAC */ 0x6019,0x265D,
-	/* Array index: 0x1FAC */ 0x601A,0x2664,
-	/* Array index: 0x1FAC */ 0x601C,0x266F,
-	/* Array index: 0x1FAC */ 0x601E,0x2665,
-	/* Array index: 0x1FAC */ 0x6022,0x2667,
-	/* Array index: 0x1FAC */ 0x6024,0x2A4E,
-	/* Array index: 0x1FAC */ 0x6026,0x265C,
-	/* Array index: 0x1FAC */ 0x6037,0x2A40,
-	/* Array index: 0x1FAC */ 0x6039,0x2A41,
-	/* Array index: 0x1FAC */ 0x604C,0x2A4A,
-	/* Array index: 0x1FAC */ 0x6053,0x2A46,
-	/* Array index: 0x1FAC */ 0x6054,0x2A42,
-	/* Array index: 0x1FAC */ 0x6058,0x2A50,
-	/* Array index: 0x1FAC */ 0x6066,0x2A51,
-	/* Array index: 0x1FAC */ 0x6067,0x2F22,
-	/* Array index: 0x1FAC */ 0x606E,0x2A52,
-	/* Array index: 0x1FAC */ 0x6072,0x2A43,
-	/* Array index: 0x1FAC */ 0x6080,0x2F26,
-	/* Array index: 0x1FAC */ 0x6081,0x2F28,
-	/* Array index: 0x1FAC */ 0x6083,0x2F2A,
-	/* Array index: 0x1FAC */ 0x608E,0x2F30,
-	/* Array index: 0x1FAC */ 0x6090,0x3536,
-	/* Array index: 0x1FAC */ 0x6092,0x2F27,
-	/* Array index: 0x1FAC */ 0x6095,0x2F2B,
-	/* Array index: 0x1FAC */ 0x6097,0x2F2D,
-	/* Array index: 0x1FAC */ 0x60A2,0x2F24,
-	/* Array index: 0x1FAC */ 0x60B0,0x3539,
-	/* Array index: 0x1FAC */ 0x60B1,0x3542,
-	/* Array index: 0x1FAC */ 0x60B7,0x3544,
-	/* Array index: 0x1FAC */ 0x60B9,0x3B5D,
-	/* Array index: 0x1FAC */ 0x60BA,0x353A,
-	/* Array index: 0x1FAC */ 0x60D3,0x353B,
-	/* Array index: 0x1FAC */ 0x60D4,0x353C,
-	/* Array index: 0x1FAC */ 0x60D9,0x353F,
-	/* Array index: 0x1FAC */ 0x60DB,0x3543,
-	/* Array index: 0x1FAC */ 0x60DD,0x3540,
-	/* Array index: 0x1FAC */ 0x60E2,0x3B5F,
-	/* Array index: 0x1FAC */ 0x60E4,0x353E,
-	/* Array index: 0x1FAC */ 0x60F2,0x3B63,
-	/* Array index: 0x1FAC */ 0x60F5,0x3B67,
-	/* Array index: 0x1FAC */ 0x60F7,0x426B,
-	/* Array index: 0x1FAC */ 0x60F8,0x3B69,
-	/* Array index: 0x1FAC */ 0x60FC,0x3B6A,
-	/* Array index: 0x1FAC */ 0x60FE,0x3B6B,
-	/* Array index: 0x1FAC */ 0x60FF,0x3B71,
-	/* Array index: 0x1FAC */ 0x610A,0x3B64,
-	/* Array index: 0x1FAC */ 0x610B,0x3B73,
-	/* Array index: 0x1FAC */ 0x6110,0x3B70,
-	/* Array index: 0x1FAC */ 0x6113,0x3B68,
-	/* Array index: 0x1FAC */ 0x6114,0x3B62,
-	/* Array index: 0x1FAC */ 0x6116,0x3B65,
-	/* Array index: 0x1FAC */ 0x6118,0x3B6E,
-	/* Array index: 0x1FAC */ 0x611D,0x3B6F,
-	/* Array index: 0x1FAC */ 0x6132,0x4271,
-	/* Array index: 0x1FAC */ 0x6136,0x4270,
-	/* Array index: 0x1FAC */ 0x613B,0x4A39,
-	/* Array index: 0x1FAC */ 0x6140,0x4277,
-	/* Array index: 0x1FAC */ 0x6141,0x4A2B,
-	/* Array index: 0x1FAC */ 0x6145,0x426F,
-	/* Array index: 0x1FAC */ 0x6146,0x4273,
-	/* Array index: 0x1FAC */ 0x6149,0x426C,
-	/* Array index: 0x1FAC */ 0x614A,0x426D,
-	/* Array index: 0x1FAC */ 0x614F,0x4275,
-	/* Array index: 0x1FAC */ 0x615B,0x4A37,
-	/* Array index: 0x1FAC */ 0x615E,0x4A2C,
-	/* Array index: 0x1FAC */ 0x6161,0x4A3B,
-	/* Array index: 0x1FAC */ 0x6165,0x4A38,
-	/* Array index: 0x1FAC */ 0x6166,0x5051,
-	/* Array index: 0x1FAC */ 0x616A,0x4A3A,
-	/* Array index: 0x1FAC */ 0x616C,0x4A32,
-	/* Array index: 0x1FAC */ 0x6179,0x5043,
-	/* Array index: 0x1FAC */ 0x617A,0x4A36,
-	/* Array index: 0x1FAC */ 0x6180,0x4A33,
-	/* Array index: 0x1FAC */ 0x6183,0x5042,
-	/* Array index: 0x1FAC */ 0x6192,0x504D,
-	/* Array index: 0x1FAC */ 0x6193,0x5049,
-	/* Array index: 0x1FAC */ 0x6196,0x5725,
-	/* Array index: 0x1FAC */ 0x619B,0x5048,
-	/* Array index: 0x1FAC */ 0x619D,0x5723,
-	/* Array index: 0x1FAC */ 0x619F,0x504C,
-	/* Array index: 0x1FAC */ 0x61A1,0x504F,
-	/* Array index: 0x1FAC */ 0x61A2,0x5046,
-	/* Array index: 0x1FAC */ 0x61A8,0x5724,
-	/* Array index: 0x1FAC */ 0x61AA,0x504E,
-	/* Array index: 0x1FAC */ 0x61B8,0x572D,
-	/* Array index: 0x1FAC */ 0x61BA,0x572B,
-	/* Array index: 0x1FAC */ 0x61BC,0x5C6C,
-	/* Array index: 0x1FAC */ 0x61BF,0x572C,
-	/* Array index: 0x1FAC */ 0x61C1,0x5729,
-	/* Array index: 0x1FAC */ 0x61C3,0x5C6A,
-	/* Array index: 0x1FAC */ 0x61C5,0x5726,
-	/* Array index: 0x1FAC */ 0x61C6,0x5728,
-	/* Array index: 0x1FAC */ 0x61CC,0x572A,
-	/* Array index: 0x1FAC */ 0x61D6,0x615B,
-	/* Array index: 0x1FAC */ 0x61D8,0x6153,
-	/* Array index: 0x1FAC */ 0x61F9,0x6876,
-	/* Array index: 0x1FAC */ 0x61FB,0x654C,
-	/* Array index: 0x1FAC */ 0x61FD,0x6B5A,
-	/* Array index: 0x1FAC */ 0x6201,0x6F28,
-	/* Array index: 0x1FAC */ 0x6203,0x6F29,
-	/* Array index: 0x1FAC */ 0x6204,0x6F2A,
-	/* Array index: 0x1FAC */ 0x6207,0x722A,
-	/* Array index: 0x1FAC */ 0x6209,0x215D,
-	/* Array index: 0x1FAC */ 0x6214,0x2670,
-	/* Array index: 0x1FAC */ 0x6219,0x2F31,
-	/* Array index: 0x1FAC */ 0x6220,0x4278,
-	/* Array index: 0x1FAC */ 0x623A,0x2428,
-	/* Array index: 0x1FAC */ 0x623D,0x2671,
-	/* Array index: 0x1FAC */ 0x6242,0x2A53,
-	/* Array index: 0x1FAC */ 0x6243,0x2A54,
-	/* Array index: 0x1FAC */ 0x6246,0x2F32,
-	/* Array index: 0x1FAC */ 0x624A,0x3B74,
-	/* Array index: 0x1FAC */ 0x6250,0x215E,
-	/* Array index: 0x1FAC */ 0x6259,0x2249,
-	/* Array index: 0x1FAC */ 0x625A,0x224B,
-	/* Array index: 0x1FAC */ 0x625C,0x2243,
-	/* Array index: 0x1FAC */ 0x6277,0x2435,
-	/* Array index: 0x1FAC */ 0x627A,0x2431,
-	/* Array index: 0x1FAC */ 0x627B,0x2430,
-	/* Array index: 0x1FAC */ 0x627D,0x2436,
-	/* Array index: 0x1FAC */ 0x6281,0x2433,
-	/* Array index: 0x1FAC */ 0x6283,0x2429,
-	/* Array index: 0x1FAC */ 0x6287,0x242E,
-	/* Array index: 0x1FAC */ 0x6288,0x2434,
-	/* Array index: 0x1FAC */ 0x628C,0x242A,
-	/* Array index: 0x1FAC */ 0x628E,0x242B,
-	/* Array index: 0x1FAC */ 0x628F,0x242C,
-	/* Array index: 0x1FAC */ 0x6294,0x242D,
-	/* Array index: 0x1FAC */ 0x62BB,0x267C,
-	/* Array index: 0x1FAC */ 0x62BE,0x2675,
-	/* Array index: 0x1FAC */ 0x62CA,0x2678,
-	/* Array index: 0x1FAC */ 0x62CF,0x2A55,
-	/* Array index: 0x1FAC */ 0x62D1,0x2674,
-	/* Array index: 0x1FAC */ 0x62EB,0x2A5B,
-	/* Array index: 0x1FAC */ 0x62F0,0x2A67,
-	/* Array index: 0x1FAC */ 0x62F2,0x2F33,
-	/* Array index: 0x1FAC */ 0x6300,0x2A61,
-	/* Array index: 0x1FAC */ 0x6303,0x2A5A,
-	/* Array index: 0x1FAC */ 0x6329,0x2F40,
-	/* Array index: 0x1FAC */ 0x632C,0x2F36,
-	/* Array index: 0x1FAC */ 0x632D,0x2F46,
-	/* Array index: 0x1FAC */ 0x6351,0x2F4A,
-	/* Array index: 0x1FAC */ 0x6365,0x354B,
-	/* Array index: 0x1FAC */ 0x6375,0x355B,
-	/* Array index: 0x1FAC */ 0x6378,0x3563,
-	/* Array index: 0x1FAC */ 0x637C,0x355F,
-	/* Array index: 0x1FAC */ 0x637D,0x354E,
-	/* Array index: 0x1FAC */ 0x6381,0x3565,
-	/* Array index: 0x1FAC */ 0x6382,0x354D,
-	/* Array index: 0x1FAC */ 0x6385,0x3564,
-	/* Array index: 0x1FAC */ 0x6387,0x3557,
-	/* Array index: 0x1FAC */ 0x638A,0x354C,
-	/* Array index: 0x1FAC */ 0x6394,0x3B75,
-	/* Array index: 0x1FAC */ 0x6397,0x3553,
-	/* Array index: 0x1FAC */ 0x63A4,0x3560,
-	/* Array index: 0x1FAC */ 0x63BD,0x354F,
-	/* Array index: 0x1FAC */ 0x63BE,0x3C29,
-	/* Array index: 0x1FAC */ 0x63D3,0x3C2E,
-	/* Array index: 0x1FAC */ 0x63EB,0x4321,
-	/* Array index: 0x1FAC */ 0x6415,0x432A,
-	/* Array index: 0x1FAC */ 0x6418,0x432B,
-	/* Array index: 0x1FAC */ 0x641A,0x4338,
-	/* Array index: 0x1FAC */ 0x641B,0x433E,
-	/* Array index: 0x1FAC */ 0x642B,0x4A40,
-	/* Array index: 0x1FAC */ 0x6433,0x4327,
-	/* Array index: 0x1FAC */ 0x6435,0x4335,
-	/* Array index: 0x1FAC */ 0x6437,0x432D,
-	/* Array index: 0x1FAC */ 0x6439,0x432C,
-	/* Array index: 0x1FAC */ 0x644B,0x4A50,
-	/* Array index: 0x1FAC */ 0x644D,0x4A41,
-	/* Array index: 0x1FAC */ 0x644E,0x4A4C,
-	/* Array index: 0x1FAC */ 0x6450,0x4A53,
-	/* Array index: 0x1FAC */ 0x6453,0x4A51,
-	/* Array index: 0x1FAC */ 0x6465,0x4A59,
-	/* Array index: 0x1FAC */ 0x6466,0x4A4A,
-	/* Array index: 0x1FAC */ 0x6468,0x5061,
-	/* Array index: 0x1FAC */ 0x646B,0x4A57,
-	/* Array index: 0x1FAC */ 0x646C,0x4A56,
-	/* Array index: 0x1FAC */ 0x646E,0x5054,
-	/* Array index: 0x1FAC */ 0x647D,0x4A48,
-	/* Array index: 0x1FAC */ 0x647F,0x4A54,
-	/* Array index: 0x1FAC */ 0x6482,0x4A4D,
-	/* Array index: 0x1FAC */ 0x6485,0x5058,
-	/* Array index: 0x1FAC */ 0x648F,0x505B,
-	/* Array index: 0x1FAC */ 0x64A3,0x505F,
-	/* Array index: 0x1FAC */ 0x64A6,0x4A4B,
-	/* Array index: 0x1FAC */ 0x64B1,0x5062,
-	/* Array index: 0x1FAC */ 0x64BD,0x5734,
-	/* Array index: 0x1FAC */ 0x64C3,0x5736,
-	/* Array index: 0x1FAC */ 0x64C9,0x5733,
-	/* Array index: 0x1FAC */ 0x64CF,0x5732,
-	/* Array index: 0x1FAC */ 0x64D0,0x5731,
-	/* Array index: 0x1FAC */ 0x64D6,0x5730,
-	/* Array index: 0x1FAC */ 0x64D7,0x572F,
-	/* Array index: 0x1FAC */ 0x64D9,0x5739,
-	/* Array index: 0x1FAC */ 0x64DB,0x5737,
-	/* Array index: 0x1FAC */ 0x64E3,0x5C75,
-	/* Array index: 0x1FAC */ 0x64E4,0x5C77,
-	/* Array index: 0x1FAC */ 0x64E8,0x5C78,
-	/* Array index: 0x1FAC */ 0x64E9,0x5C74,
-	/* Array index: 0x1FAC */ 0x64EB,0x5C76,
-	/* Array index: 0x1FAC */ 0x64EF,0x5C73,
-	/* Array index: 0x1FAC */ 0x64F3,0x5738,
-	/* Array index: 0x1FAC */ 0x64F8,0x6160,
-	/* Array index: 0x1FAC */ 0x64FC,0x6163,
-	/* Array index: 0x1FAC */ 0x64FD,0x615F,
-	/* Array index: 0x1FAC */ 0x64FF,0x615D,
-	/* Array index: 0x1FAC */ 0x6501,0x6161,
-	/* Array index: 0x1FAC */ 0x6503,0x6162,
-	/* Array index: 0x1FAC */ 0x6504,0x615E,
-	/* Array index: 0x1FAC */ 0x6507,0x654D,
-	/* Array index: 0x1FAC */ 0x6509,0x6550,
-	/* Array index: 0x1FAC */ 0x651B,0x6B5B,
-	/* Array index: 0x1FAC */ 0x6529,0x6F2B,
-	/* Array index: 0x1FAC */ 0x652D,0x7037,
-	/* Array index: 0x1FAC */ 0x652E,0x707D,
-	/* Array index: 0x1FAC */ 0x6532,0x3C37,
-	/* Array index: 0x1FAC */ 0x6533,0x573A,
-	/* Array index: 0x1FAC */ 0x6537,0x224D,
-	/* Array index: 0x1FAC */ 0x653D,0x2722,
-	/* Array index: 0x1FAC */ 0x6541,0x2A68,
-	/* Array index: 0x1FAC */ 0x6543,0x2A69,
-	/* Array index: 0x1FAC */ 0x6546,0x2F50,
-	/* Array index: 0x1FAC */ 0x654A,0x2F4F,
-	/* Array index: 0x1FAC */ 0x6553,0x3569,
-	/* Array index: 0x1FAC */ 0x655C,0x3C3B,
-	/* Array index: 0x1FAC */ 0x656F,0x4342,
-	/* Array index: 0x1FAC */ 0x6573,0x4A5B,
-	/* Array index: 0x1FAC */ 0x6576,0x5064,
-	/* Array index: 0x1FAC */ 0x6584,0x6553,
-	/* Array index: 0x1FAC */ 0x658C,0x3C3E,
-	/* Array index: 0x1FAC */ 0x6592,0x4343,
-	/* Array index: 0x1FAC */ 0x6594,0x6164,
-	/* Array index: 0x1FAC */ 0x6596,0x6F2D,
-	/* Array index: 0x1FAC */ 0x659D,0x3C3F,
-	/* Array index: 0x1FAC */ 0x659E,0x3C40,
-	/* Array index: 0x1FAC */ 0x65A0,0x4A5C,
-	/* Array index: 0x1FAC */ 0x65A2,0x573D,
-	/* Array index: 0x1FAC */ 0x65A8,0x2723,
-	/* Array index: 0x1FAC */ 0x65AA,0x2A6A,
-	/* Array index: 0x1FAC */ 0x65AE,0x3C41,
-	/* Array index: 0x1FAC */ 0x65B2,0x5068,
-	/* Array index: 0x1FAC */ 0x65B3,0x5069,
-	/* Array index: 0x1FAC */ 0x65B6,0x5C7B,
-	/* Array index: 0x1FAC */ 0x65B8,0x707E,
-	/* Array index: 0x1FAC */ 0x65BB,0x2724,
-	/* Array index: 0x1FAC */ 0x65BF,0x2A6B,
-	/* Array index: 0x1FAC */ 0x65CD,0x356A,
-	/* Array index: 0x1FAC */ 0x65D0,0x3C42,
-	/* Array index: 0x1FAC */ 0x65D2,0x3C43,
-	/* Array index: 0x1FAC */ 0x65D3,0x4344,
-	/* Array index: 0x1FAC */ 0x661C,0x2A70,
-	/* Array index: 0x1FAC */ 0x661D,0x2A76,
-	/* Array index: 0x1FAC */ 0x6621,0x2A6D,
-	/* Array index: 0x1FAC */ 0x6622,0x2A72,
-	/* Array index: 0x1FAC */ 0x6626,0x2A71,
-	/* Array index: 0x1FAC */ 0x662B,0x2A74,
-	/* Array index: 0x1FAC */ 0x662E,0x2A79,
-	/* Array index: 0x1FAC */ 0x6647,0x2F57,
-	/* Array index: 0x1FAC */ 0x664A,0x2F55,
-	/* Array index: 0x1FAC */ 0x6651,0x2F58,
-	/* Array index: 0x1FAC */ 0x6659,0x356E,
-	/* Array index: 0x1FAC */ 0x665B,0x356D,
-	/* Array index: 0x1FAC */ 0x665C,0x356F,
-	/* Array index: 0x1FAC */ 0x665F,0x2F56,
-	/* Array index: 0x1FAC */ 0x6661,0x356C,
-	/* Array index: 0x1FAC */ 0x6662,0x3570,
-	/* Array index: 0x1FAC */ 0x6665,0x356B,
-	/* Array index: 0x1FAC */ 0x666A,0x3C4A,
-	/* Array index: 0x1FAC */ 0x666C,0x3C45,
-	/* Array index: 0x1FAC */ 0x6671,0x3C48,
-	/* Array index: 0x1FAC */ 0x6672,0x3C4B,
-	/* Array index: 0x1FAC */ 0x6680,0x3C47,
-	/* Array index: 0x1FAC */ 0x6686,0x4345,
-	/* Array index: 0x1FAC */ 0x6690,0x4348,
-	/* Array index: 0x1FAC */ 0x6694,0x434C,
-	/* Array index: 0x1FAC */ 0x6695,0x4347,
-	/* Array index: 0x1FAC */ 0x6699,0x434B,
-	/* Array index: 0x1FAC */ 0x66A9,0x506C,
-	/* Array index: 0x1FAC */ 0x66AA,0x506F,
-	/* Array index: 0x1FAC */ 0x66AF,0x5070,
-	/* Array index: 0x1FAC */ 0x66B0,0x506B,
-	/* Array index: 0x1FAC */ 0x66B2,0x506D,
-	/* Array index: 0x1FAC */ 0x66B5,0x506A,
-	/* Array index: 0x1FAC */ 0x66B7,0x506E,
-	/* Array index: 0x1FAC */ 0x66CF,0x5743,
-	/* Array index: 0x1FAC */ 0x66D2,0x5C7D,
-	/* Array index: 0x1FAC */ 0x66D8,0x6168,
-	/* Array index: 0x1FAC */ 0x66DA,0x6166,
-	/* Array index: 0x1FAC */ 0x66DB,0x6167,
-	/* Array index: 0x1FAC */ 0x66DE,0x6556,
-	/* Array index: 0x1FAC */ 0x66E3,0x687D,
-	/* Array index: 0x1FAC */ 0x66E4,0x687E,
-	/* Array index: 0x1FAC */ 0x66E8,0x687C,
-	/* Array index: 0x1FAC */ 0x66EB,0x6F2E,
-	/* Array index: 0x1FAC */ 0x66ED,0x7038,
-	/* Array index: 0x1FAC */ 0x66EE,0x7039,
-	/* Array index: 0x1FAC */ 0x66F6,0x2732,
-	/* Array index: 0x1FAC */ 0x6701,0x3C4C,
-	/* Array index: 0x1FAC */ 0x6704,0x4A61,
-	/* Array index: 0x1FAC */ 0x6705,0x4A60,
-	/* Array index: 0x1FAC */ 0x670A,0x2733,
-	/* Array index: 0x1FAC */ 0x6718,0x3571,
-	/* Array index: 0x1FAC */ 0x6733,0x2257,
-	/* Array index: 0x1FAC */ 0x6745,0x243E,
-	/* Array index: 0x1FAC */ 0x6755,0x2441,
-	/* Array index: 0x1FAC */ 0x6759,0x2440,
-	/* Array index: 0x1FAC */ 0x675A,0x2446,
-	/* Array index: 0x1FAC */ 0x675D,0x2444,
-	/* Array index: 0x1FAC */ 0x676C,0x2735,
-	/* Array index: 0x1FAC */ 0x6774,0x273D,
-	/* Array index: 0x1FAC */ 0x6798,0x273A,
-	/* Array index: 0x1FAC */ 0x6799,0x2743,
-	/* Array index: 0x1FAC */ 0x679F,0x2741,
-	/* Array index: 0x1FAC */ 0x67AE,0x2B3D,
-	/* Array index: 0x1FAC */ 0x67B2,0x2B38,
-	/* Array index: 0x1FAC */ 0x67B3,0x2B2E,
-	/* Array index: 0x1FAC */ 0x67B5,0x2B2C,
-	/* Array index: 0x1FAC */ 0x67D8,0x2B25,
-	/* Array index: 0x1FAC */ 0x67DB,0x2B3F,
-	/* Array index: 0x1FAC */ 0x67DC,0x2B22,
-	/* Array index: 0x1FAC */ 0x67DF,0x2B2B,
-	/* Array index: 0x1FAC */ 0x6812,0x2F6E,
-	/* Array index: 0x1FAC */ 0x6814,0x2F6F,
-	/* Array index: 0x1FAC */ 0x6816,0x2F63,
-	/* Array index: 0x1FAC */ 0x681A,0x2F5C,
-	/* Array index: 0x1FAC */ 0x6825,0x2F75,
-	/* Array index: 0x1FAC */ 0x6826,0x2F70,
-	/* Array index: 0x1FAC */ 0x6828,0x2F71,
-	/* Array index: 0x1FAC */ 0x683A,0x2F74,
-	/* Array index: 0x1FAC */ 0x683B,0x2F60,
-	/* Array index: 0x1FAC */ 0x6844,0x2F6B,
-	/* Array index: 0x1FAC */ 0x6849,0x2F5D,
-	/* Array index: 0x1FAC */ 0x6896,0x362F,
-	/* Array index: 0x1FAC */ 0x689B,0x362E,
-	/* Array index: 0x1FAC */ 0x689C,0x3575,
-	/* Array index: 0x1FAC */ 0x68A0,0x3631,
-	/* Array index: 0x1FAC */ 0x68A3,0x357C,
-	/* Array index: 0x1FAC */ 0x68A4,0x3633,
-	/* Array index: 0x1FAC */ 0x68B2,0x3623,
-	/* Array index: 0x1FAC */ 0x68B4,0x3C63,
-	/* Array index: 0x1FAC */ 0x68CC,0x3C60,
-	/* Array index: 0x1FAC */ 0x68CE,0x3C70,
-	/* Array index: 0x1FAC */ 0x68E1,0x3C5E,
-	/* Array index: 0x1FAC */ 0x68E4,0x3C59,
-	/* Array index: 0x1FAC */ 0x68FC,0x3C6B,
-	/* Array index: 0x1FAC */ 0x68FD,0x3C6A,
-	/* Array index: 0x1FAC */ 0x6925,0x3C7B,
-	/* Array index: 0x1FAC */ 0x692A,0x3C51,
-	/* Array index: 0x1FAC */ 0x692F,0x4378,
-	/* Array index: 0x1FAC */ 0x695C,0x4373,
-	/* Array index: 0x1FAC */ 0x695F,0x4350,
-	/* Array index: 0x1FAC */ 0x6962,0x4353,
-	/* Array index: 0x1FAC */ 0x6965,0x4363,
-	/* Array index: 0x1FAC */ 0x6966,0x434F,
-	/* Array index: 0x1FAC */ 0x6969,0x4367,
-	/* Array index: 0x1FAC */ 0x696A,0x4357,
-	/* Array index: 0x1FAC */ 0x696C,0x4360,
-	/* Array index: 0x1FAC */ 0x6974,0x436E,
-	/* Array index: 0x1FAC */ 0x6976,0x436B,
-	/* Array index: 0x1FAC */ 0x6978,0x4365,
-	/* Array index: 0x1FAC */ 0x697A,0x435C,
-	/* Array index: 0x1FAC */ 0x697B,0x4379,
-	/* Array index: 0x1FAC */ 0x6983,0x452C,
-	/* Array index: 0x1FAC */ 0x699E,0x4B23,
-	/* Array index: 0x1FAC */ 0x69A0,0x4A66,
-	/* Array index: 0x1FAC */ 0x69A1,0x4B22,
-	/* Array index: 0x1FAC */ 0x69A4,0x4A77,
-	/* Array index: 0x1FAC */ 0x69A5,0x4B29,
-	/* Array index: 0x1FAC */ 0x69A7,0x4A6F,
-	/* Array index: 0x1FAC */ 0x69A9,0x4A71,
-	/* Array index: 0x1FAC */ 0x69AA,0x4B21,
-	/* Array index: 0x1FAC */ 0x69AC,0x4A6A,
-	/* Array index: 0x1FAC */ 0x69B9,0x4A79,
-	/* Array index: 0x1FAC */ 0x69C2,0x4B27,
-	/* Array index: 0x1FAC */ 0x69C4,0x4A75,
-	/* Array index: 0x1FAC */ 0x69C6,0x4B2A,
-	/* Array index: 0x1FAC */ 0x69C9,0x4A65,
-	/* Array index: 0x1FAC */ 0x69CA,0x4A7A,
-	/* Array index: 0x1FAC */ 0x69CE,0x4A67,
-	/* Array index: 0x1FAC */ 0x69CF,0x4A7C,
-	/* Array index: 0x1FAC */ 0x69D4,0x4A78,
-	/* Array index: 0x1FAC */ 0x69D9,0x4B24,
-	/* Array index: 0x1FAC */ 0x69EB,0x512E,
-	/* Array index: 0x1FAC */ 0x69EC,0x507B,
-	/* Array index: 0x1FAC */ 0x69EE,0x5124,
-	/* Array index: 0x1FAC */ 0x69F1,0x5077,
-	/* Array index: 0x1FAC */ 0x69F2,0x5123,
-	/* Array index: 0x1FAC */ 0x6A0D,0x512C,
-	/* Array index: 0x1FAC */ 0x6A0F,0x5133,
-	/* Array index: 0x1FAC */ 0x6A1B,0x507D,
-	/* Array index: 0x1FAC */ 0x6A1D,0x507E,
-	/* Array index: 0x1FAC */ 0x6A20,0x5079,
-	/* Array index: 0x1FAC */ 0x6A32,0x574D,
-	/* Array index: 0x1FAC */ 0x6A34,0x5749,
-	/* Array index: 0x1FAC */ 0x6A46,0x5768,
-	/* Array index: 0x1FAC */ 0x6A49,0x574B,
-	/* Array index: 0x1FAC */ 0x6A6D,0x5751,
-	/* Array index: 0x1FAC */ 0x6A6F,0x575F,
-	/* Array index: 0x1FAC */ 0x6A76,0x5752,
-	/* Array index: 0x1FAC */ 0x6A7F,0x5D31,
-	/* Array index: 0x1FAC */ 0x6A81,0x5D22,
-	/* Array index: 0x1FAC */ 0x6A83,0x5D2D,
-	/* Array index: 0x1FAC */ 0x6A85,0x5D34,
-	/* Array index: 0x1FAC */ 0x6A87,0x5D29,
-	/* Array index: 0x1FAC */ 0x6A89,0x5D24,
-	/* Array index: 0x1FAC */ 0x6A9A,0x5D33,
-	/* Array index: 0x1FAC */ 0x6A9B,0x5D26,
-	/* Array index: 0x1FAC */ 0x6A9E,0x5D28,
-	/* Array index: 0x1FAC */ 0x6A9F,0x5D25,
-	/* Array index: 0x1FAC */ 0x6AA1,0x5D27,
-	/* Array index: 0x1FAC */ 0x6AAD,0x6173,
-	/* Array index: 0x1FAC */ 0x6AB4,0x6172,
-	/* Array index: 0x1FAC */ 0x6ABD,0x616B,
-	/* Array index: 0x1FAC */ 0x6AD9,0x655B,
-	/* Array index: 0x1FAC */ 0x6AF8,0x6B5F,
-	/* Array index: 0x1FAC */ 0x6AF9,0x6925,
-	/* Array index: 0x1FAC */ 0x6AFC,0x6B5D,
-	/* Array index: 0x1FAC */ 0x6B00,0x6B60,
-	/* Array index: 0x1FAC */ 0x6B02,0x6B5C,
-	/* Array index: 0x1FAC */ 0x6B03,0x6B5E,
-	/* Array index: 0x1FAC */ 0x6B08,0x6D53,
-	/* Array index: 0x1FAC */ 0x6B09,0x6D54,
-	/* Array index: 0x1FAC */ 0x6B0B,0x6D52,
-	/* Array index: 0x1FAC */ 0x6B1E,0x722B,
-	/* Array index: 0x1FAC */ 0x6B25,0x274A,
-	/* Array index: 0x1FAC */ 0x6B28,0x2B46,
-	/* Array index: 0x1FAC */ 0x6B2C,0x2F77,
-	/* Array index: 0x1FAC */ 0x6B2D,0x2F79,
-	/* Array index: 0x1FAC */ 0x6B2F,0x2F78,
-	/* Array index: 0x1FAC */ 0x6B31,0x2F7A,
-	/* Array index: 0x1FAC */ 0x6B51,0x5139,
-	/* Array index: 0x1FAC */ 0x6B5B,0x5D37,
-	/* Array index: 0x1FAC */ 0x6B5E,0x6174,
-	/* Array index: 0x1FAC */ 0x6B60,0x6564,
-	/* Array index: 0x1FAC */ 0x6B6D,0x2F7C,
-	/* Array index: 0x1FAC */ 0x6B76,0x5259,
-	/* Array index: 0x1FAC */ 0x6B7E,0x274C,
-	/* Array index: 0x1FAC */ 0x6B80,0x274B,
-	/* Array index: 0x1FAC */ 0x6B82,0x2B47,
-	/* Array index: 0x1FAC */ 0x6B84,0x2B48,
-	/* Array index: 0x1FAC */ 0x6B88,0x2F7E,
-	/* Array index: 0x1FAC */ 0x6BB0,0x6565,
-	/* Array index: 0x1FAC */ 0x6BB3,0x213F,
-	/* Array index: 0x1FAC */ 0x6BB6,0x2B49,
-	/* Array index: 0x1FAC */ 0x6BBD,0x3D27,
-	/* Array index: 0x1FAC */ 0x6BD0,0x2448,
-	/* Array index: 0x1FAC */ 0x6BD6,0x2B4A,
-	/* Array index: 0x1FAC */ 0x6BD8,0x2B4B,
-	/* Array index: 0x1FAC */ 0x6BDE,0x274D,
-	/* Array index: 0x1FAC */ 0x6BF0,0x3D28,
-	/* Array index: 0x1FAC */ 0x6BF2,0x3D29,
-	/* Array index: 0x1FAC */ 0x6BF3,0x3D2A,
-	/* Array index: 0x1FAC */ 0x6C1D,0x274E,
-	/* Array index: 0x1FAC */ 0x6C20,0x2B4D,
-	/* Array index: 0x1FAC */ 0x6C21,0x2B4E,
-	/* Array index: 0x1FAC */ 0x6C25,0x3027,
-	/* Array index: 0x1FAC */ 0x6C2A,0x3643,
-	/* Array index: 0x1FAC */ 0x6C30,0x3D2B,
-	/* Array index: 0x1FAC */ 0x6C36,0x2160,
-	/* Array index: 0x1FAC */ 0x6C3B,0x2163,
-	/* Array index: 0x1FAC */ 0x6C3F,0x2162,
-	/* Array index: 0x1FAC */ 0x6C43,0x2161,
-	/* Array index: 0x1FAC */ 0x6C46,0x2259,
-	/* Array index: 0x1FAC */ 0x6C4F,0x225C,
-	/* Array index: 0x1FAC */ 0x6C52,0x225A,
-	/* Array index: 0x1FAC */ 0x6C54,0x225E,
-	/* Array index: 0x1FAC */ 0x6C5C,0x225B,
-	/* Array index: 0x1FAC */ 0x6C78,0x244B,
-	/* Array index: 0x1FAC */ 0x6C7B,0x245C,
-	/* Array index: 0x1FAC */ 0x6C80,0x2765,
-	/* Array index: 0x1FAC */ 0x6C84,0x244E,
-	/* Array index: 0x1FAC */ 0x6C87,0x2456,
-	/* Array index: 0x1FAC */ 0x6C8A,0x2763,
-	/* Array index: 0x1FAC */ 0x6C8B,0x244F,
-	/* Array index: 0x1FAC */ 0x6C8E,0x245D,
-	/* Array index: 0x1FAC */ 0x6C8F,0x2450,
-	/* Array index: 0x1FAC */ 0x6C93,0x274F,
-	/* Array index: 0x1FAC */ 0x6C95,0x2457,
-	/* Array index: 0x1FAC */ 0x6C9A,0x2454,
-	/* Array index: 0x1FAC */ 0x6C9C,0x2458,
-	/* Array index: 0x1FAC */ 0x6C9D,0x2764,
-	/* Array index: 0x1FAC */ 0x6CAD,0x2756,
-	/* Array index: 0x1FAC */ 0x6CB0,0x276B,
-	/* Array index: 0x1FAC */ 0x6CB4,0x2762,
-	/* Array index: 0x1FAC */ 0x6CB6,0x2754,
-	/* Array index: 0x1FAC */ 0x6CB7,0x2758,
-	/* Array index: 0x1FAC */ 0x6CBA,0x275B,
-	/* Array index: 0x1FAC */ 0x6CC0,0x2767,
-	/* Array index: 0x1FAC */ 0x6CC2,0x275A,
-	/* Array index: 0x1FAC */ 0x6CC3,0x275C,
-	/* Array index: 0x1FAC */ 0x6CC6,0x275D,
-	/* Array index: 0x1FAC */ 0x6CC7,0x276A,
-	/* Array index: 0x1FAC */ 0x6CD9,0x2753,
-	/* Array index: 0x1FAC */ 0x6CDA,0x2B57,
-	/* Array index: 0x1FAC */ 0x6CDD,0x2761,
-	/* Array index: 0x1FAC */ 0x6CDE,0x2766,
-	/* Array index: 0x1FAC */ 0x6CE7,0x2757,
-	/* Array index: 0x1FAC */ 0x6CF2,0x275F,
-	/* Array index: 0x1FAC */ 0x6CF9,0x276C,
-	/* Array index: 0x1FAC */ 0x6D1D,0x2B5F,
-	/* Array index: 0x1FAC */ 0x6D1F,0x2B52,
-	/* Array index: 0x1FAC */ 0x6D20,0x2B68,
-	/* Array index: 0x1FAC */ 0x6D22,0x2B6B,
-	/* Array index: 0x1FAC */ 0x6D28,0x2B4F,
-	/* Array index: 0x1FAC */ 0x6D37,0x2B63,
-	/* Array index: 0x1FAC */ 0x6D3A,0x2B5B,
-	/* Array index: 0x1FAC */ 0x6D3C,0x2B53,
-	/* Array index: 0x1FAC */ 0x6D3F,0x2B54,
-	/* Array index: 0x1FAC */ 0x6D40,0x2B66,
-	/* Array index: 0x1FAC */ 0x6D42,0x2B60,
-	/* Array index: 0x1FAC */ 0x6D58,0x302F,
-	/* Array index: 0x1FAC */ 0x6D6D,0x3031,
-	/* Array index: 0x1FAC */ 0x6D6F,0x3032,
-	/* Array index: 0x1FAC */ 0x6D70,0x303C,
-	/* Array index: 0x1FAC */ 0x6D75,0x304B,
-	/* Array index: 0x1FAC */ 0x6D76,0x302B,
-	/* Array index: 0x1FAC */ 0x6D8B,0x3043,
-	/* Array index: 0x1FAC */ 0x6D8D,0x3034,
-	/* Array index: 0x1FAC */ 0x6D97,0x303B,
-	/* Array index: 0x1FAC */ 0x6D98,0x3040,
-	/* Array index: 0x1FAC */ 0x6DAB,0x3645,
-	/* Array index: 0x1FAC */ 0x6DAC,0x3649,
-	/* Array index: 0x1FAC */ 0x6DB3,0x3647,
-	/* Array index: 0x1FAC */ 0x6DB4,0x3646,
-	/* Array index: 0x1FAC */ 0x6DB7,0x364C,
-	/* Array index: 0x1FAC */ 0x6DCD,0x3668,
-	/* Array index: 0x1FAC */ 0x6DE9,0x364A,
-	/* Array index: 0x1FAC */ 0x6DED,0x365C,
-	/* Array index: 0x1FAC */ 0x6DEF,0x3035,
-	/* Array index: 0x1FAC */ 0x6DF0,0x365D,
-	/* Array index: 0x1FAC */ 0x6DF2,0x3664,
-	/* Array index: 0x1FAC */ 0x6DF4,0x3659,
-	/* Array index: 0x1FAC */ 0x6DF6,0x364D,
-	/* Array index: 0x1FAC */ 0x6DFC,0x3D2C,
-	/* Array index: 0x1FAC */ 0x6DFD,0x3666,
-	/* Array index: 0x1FAC */ 0x6E00,0x364F,
-	/* Array index: 0x1FAC */ 0x6E03,0x3D41,
-	/* Array index: 0x1FAC */ 0x6E1C,0x3D3B,
-	/* Array index: 0x1FAC */ 0x6E1F,0x3D2F,
-	/* Array index: 0x1FAC */ 0x6E22,0x3D4D,
-	/* Array index: 0x1FAC */ 0x6E27,0x3D51,
-	/* Array index: 0x1FAC */ 0x6E28,0x3D48,
-	/* Array index: 0x1FAC */ 0x6E2B,0x3D36,
-	/* Array index: 0x1FAC */ 0x6E2E,0x3D42,
-	/* Array index: 0x1FAC */ 0x6E30,0x3D4E,
-	/* Array index: 0x1FAC */ 0x6E31,0x3D47,
-	/* Array index: 0x1FAC */ 0x6E33,0x3D3C,
-	/* Array index: 0x1FAC */ 0x6E35,0x3D59,
-	/* Array index: 0x1FAC */ 0x6E36,0x3D5A,
-	/* Array index: 0x1FAC */ 0x6E6B,0x3D4B,
-	/* Array index: 0x1FAC */ 0x6E71,0x3D4A,
-	/* Array index: 0x1FAC */ 0x6E88,0x3D31,
-	/* Array index: 0x1FAC */ 0x6E97,0x444E,
-	/* Array index: 0x1FAC */ 0x6E99,0x4444,
-	/* Array index: 0x1FAC */ 0x6E9B,0x4429,
-	/* Array index: 0x1FAC */ 0x6EB7,0x443A,
-	/* Array index: 0x1FAC */ 0x6EB9,0x4433,
-	/* Array index: 0x1FAC */ 0x6ED6,0x442A,
-	/* Array index: 0x1FAC */ 0x6ED8,0x4443,
-	/* Array index: 0x1FAC */ 0x6EDC,0x4442,
-	/* Array index: 0x1FAC */ 0x6EEB,0x4B50,
-	/* Array index: 0x1FAC */ 0x6EED,0x4B45,
-	/* Array index: 0x1FAC */ 0x6EEE,0x4B4A,
-	/* Array index: 0x1FAC */ 0x6EF1,0x4B36,
-	/* Array index: 0x1FAC */ 0x6F00,0x515B,
-	/* Array index: 0x1FAC */ 0x6F03,0x4B37,
-	/* Array index: 0x1FAC */ 0x6F12,0x4B44,
-	/* Array index: 0x1FAC */ 0x6F2D,0x4B4B,
-	/* Array index: 0x1FAC */ 0x6F2E,0x4B3C,
-	/* Array index: 0x1FAC */ 0x6F30,0x4B4D,
-	/* Array index: 0x1FAC */ 0x6F40,0x4B4C,
-	/* Array index: 0x1FAC */ 0x6F41,0x5142,
-	/* Array index: 0x1FAC */ 0x6F43,0x4B53,
-	/* Array index: 0x1FAC */ 0x6F5A,0x514E,
-	/* Array index: 0x1FAC */ 0x6F72,0x5154,
-	/* Array index: 0x1FAC */ 0x6F73,0x4B48,
-	/* Array index: 0x1FAC */ 0x6F76,0x5150,
-	/* Array index: 0x1FAC */ 0x6F77,0x5167,
-	/* Array index: 0x1FAC */ 0x6F82,0x5152,
-	/* Array index: 0x1FAC */ 0x6F85,0x514D,
-	/* Array index: 0x1FAC */ 0x6F87,0x5145,
-	/* Array index: 0x1FAC */ 0x6F9E,0x577E,
-	/* Array index: 0x1FAC */ 0x6FA2,0x582C,
-	/* Array index: 0x1FAC */ 0x6FA3,0x5776,
-	/* Array index: 0x1FAC */ 0x6FA5,0x5824,
-	/* Array index: 0x1FAC */ 0x6FB8,0x582B,
-	/* Array index: 0x1FAC */ 0x6FBA,0x5826,
-	/* Array index: 0x1FAC */ 0x6FBC,0x5778,
-	/* Array index: 0x1FAC */ 0x6FBD,0x577D,
-	/* Array index: 0x1FAC */ 0x6FBF,0x582A,
-	/* Array index: 0x1FAC */ 0x6FD4,0x5D3D,
-	/* Array index: 0x1FAC */ 0x6FED,0x5D40,
-	/* Array index: 0x1FAC */ 0x6FF2,0x5D44,
-	/* Array index: 0x1FAC */ 0x6FF4,0x5D3C,
-	/* Array index: 0x1FAC */ 0x6FF7,0x6225,
-	/* Array index: 0x1FAC */ 0x7014,0x617C,
-	/* Array index: 0x1FAC */ 0x7016,0x656A,
-	/* Array index: 0x1FAC */ 0x7017,0x6570,
-	/* Array index: 0x1FAC */ 0x7019,0x6567,
-	/* Array index: 0x1FAC */ 0x701C,0x6572,
-	/* Array index: 0x1FAC */ 0x702F,0x692B,
-	/* Array index: 0x1FAC */ 0x7052,0x6D59,
-	/* Array index: 0x1FAC */ 0x7071,0x2261,
-	/* Array index: 0x1FAC */ 0x7074,0x245E,
-	/* Array index: 0x1FAC */ 0x707A,0x245F,
-	/* Array index: 0x1FAC */ 0x7091,0x2776,
-	/* Array index: 0x1FAC */ 0x7093,0x2773,
-	/* Array index: 0x1FAC */ 0x7094,0x2770,
-	/* Array index: 0x1FAC */ 0x7096,0x2777,
-	/* Array index: 0x1FAC */ 0x7098,0x2771,
-	/* Array index: 0x1FAC */ 0x709A,0x2779,
-	/* Array index: 0x1FAC */ 0x709F,0x2B6F,
-	/* Array index: 0x1FAC */ 0x70A1,0x2B73,
-	/* Array index: 0x1FAC */ 0x70A9,0x2B76,
-	/* Array index: 0x1FAC */ 0x70B0,0x2B72,
-	/* Array index: 0x1FAC */ 0x70B1,0x2B71,
-	/* Array index: 0x1FAC */ 0x70B4,0x2B74,
-	/* Array index: 0x1FAC */ 0x70B5,0x2B75,
-	/* Array index: 0x1FAC */ 0x70B7,0x2B6E,
-	/* Array index: 0x1FAC */ 0x70BE,0x2B70,
-	/* Array index: 0x1FAC */ 0x70CB,0x3051,
-	/* Array index: 0x1FAC */ 0x70D7,0x3054,
-	/* Array index: 0x1FAC */ 0x70F0,0x3671,
-	/* Array index: 0x1FAC */ 0x7113,0x3678,
-	/* Array index: 0x1FAC */ 0x7117,0x366E,
-	/* Array index: 0x1FAC */ 0x711B,0x3D69,
-	/* Array index: 0x1FAC */ 0x7128,0x3D67,
-	/* Array index: 0x1FAC */ 0x713A,0x3D68,
-	/* Array index: 0x1FAC */ 0x7147,0x4451,
-	/* Array index: 0x1FAC */ 0x714B,0x4460,
-	/* Array index: 0x1FAC */ 0x714D,0x4466,
-	/* Array index: 0x1FAC */ 0x7158,0x445E,
-	/* Array index: 0x1FAC */ 0x715A,0x4467,
-	/* Array index: 0x1FAC */ 0x716A,0x445B,
-	/* Array index: 0x1FAC */ 0x7170,0x4461,
-	/* Array index: 0x1FAC */ 0x7172,0x4459,
-	/* Array index: 0x1FAC */ 0x7178,0x445A,
-	/* Array index: 0x1FAC */ 0x717B,0x4B67,
-	/* Array index: 0x1FAC */ 0x718F,0x4B66,
-	/* Array index: 0x1FAC */ 0x7190,0x4B61,
-	/* Array index: 0x1FAC */ 0x7197,0x4B6A,
-	/* Array index: 0x1FAC */ 0x71B8,0x5836,
-	/* Array index: 0x1FAC */ 0x71CF,0x583E,
-	/* Array index: 0x1FAC */ 0x71D4,0x583B,
-	/* Array index: 0x1FAC */ 0x71D6,0x5837,
-	/* Array index: 0x1FAC */ 0x71D8,0x5840,
-	/* Array index: 0x1FAC */ 0x71DA,0x5843,
-	/* Array index: 0x1FAC */ 0x71DB,0x5844,
-	/* Array index: 0x1FAC */ 0x71E1,0x5D48,
-	/* Array index: 0x1FAC */ 0x71E2,0x5D4E,
-	/* Array index: 0x1FAC */ 0x71E4,0x5D4C,
-	/* Array index: 0x1FAC */ 0x71E8,0x5D4A,
-	/* Array index: 0x1FAC */ 0x71F9,0x6229,
-	/* Array index: 0x1FAC */ 0x71FD,0x622B,
-	/* Array index: 0x1FAC */ 0x720A,0x6574,
-	/* Array index: 0x1FAC */ 0x720C,0x6573,
-	/* Array index: 0x1FAC */ 0x7213,0x6939,
-	/* Array index: 0x1FAC */ 0x7214,0x693A,
-	/* Array index: 0x1FAC */ 0x723F,0x2142,
-	/* Array index: 0x1FAC */ 0x7241,0x2B77,
-	/* Array index: 0x1FAC */ 0x7242,0x3060,
-	/* Array index: 0x1FAC */ 0x7244,0x4B6B,
-	/* Array index: 0x1FAC */ 0x724F,0x4468,
-	/* Array index: 0x1FAC */ 0x7253,0x4B6C,
-	/* Array index: 0x1FAC */ 0x725A,0x3D6B,
-	/* Array index: 0x1FAC */ 0x725E,0x2262,
-	/* Array index: 0x1FAC */ 0x7263,0x2460,
-	/* Array index: 0x1FAC */ 0x726A,0x277B,
-	/* Array index: 0x1FAC */ 0x726C,0x2B7A,
-	/* Array index: 0x1FAC */ 0x726E,0x2B7D,
-	/* Array index: 0x1FAC */ 0x7270,0x2B7B,
-	/* Array index: 0x1FAC */ 0x7273,0x2B7C,
-	/* Array index: 0x1FAC */ 0x72AE,0x2164,
-	/* Array index: 0x1FAC */ 0x72B0,0x2165,
-	/* Array index: 0x1FAC */ 0x72B4,0x2263,
-	/* Array index: 0x1FAC */ 0x72B5,0x2264,
-	/* Array index: 0x1FAC */ 0x72BA,0x2466,
-	/* Array index: 0x1FAC */ 0x72BD,0x2462,
-	/* Array index: 0x1FAC */ 0x72BF,0x2461,
-	/* Array index: 0x1FAC */ 0x72C1,0x2465,
-	/* Array index: 0x1FAC */ 0x72C3,0x2463,
-	/* Array index: 0x1FAC */ 0x72D1,0x2827,
-	/* Array index: 0x1FAC */ 0x72D2,0x2823,
-	/* Array index: 0x1FAC */ 0x72D4,0x2824,
-	/* Array index: 0x1FAC */ 0x72D6,0x277C,
-	/* Array index: 0x1FAC */ 0x72D8,0x277E,
-	/* Array index: 0x1FAC */ 0x72DA,0x2825,
-	/* Array index: 0x1FAC */ 0x72DC,0x2822,
-	/* Array index: 0x1FAC */ 0x72DF,0x2C24,
-	/* Array index: 0x1FAC */ 0x72E3,0x2C27,
-	/* Array index: 0x1FAC */ 0x72E4,0x2C21,
-	/* Array index: 0x1FAC */ 0x72E6,0x2C26,
-	/* Array index: 0x1FAC */ 0x72E8,0x2C22,
-	/* Array index: 0x1FAC */ 0x72EA,0x2C25,
-	/* Array index: 0x1FAC */ 0x72EB,0x2C23,
-	/* Array index: 0x1FAC */ 0x72F3,0x3069,
-	/* Array index: 0x1FAC */ 0x72F4,0x3066,
-	/* Array index: 0x1FAC */ 0x72F6,0x3068,
-	/* Array index: 0x1FAC */ 0x730F,0x372D,
-	/* Array index: 0x1FAC */ 0x7311,0x3728,
-	/* Array index: 0x1FAC */ 0x7312,0x3D71,
-	/* Array index: 0x1FAC */ 0x7317,0x3726,
-	/* Array index: 0x1FAC */ 0x7318,0x3729,
-	/* Array index: 0x1FAC */ 0x731D,0x3725,
-	/* Array index: 0x1FAC */ 0x731E,0x372E,
-	/* Array index: 0x1FAC */ 0x7322,0x3D74,
-	/* Array index: 0x1FAC */ 0x7323,0x3D7B,
-	/* Array index: 0x1FAC */ 0x7326,0x3D7A,
-	/* Array index: 0x1FAC */ 0x7327,0x3D77,
-	/* Array index: 0x1FAC */ 0x732D,0x3D79,
-	/* Array index: 0x1FAC */ 0x7340,0x4472,
-	/* Array index: 0x1FAC */ 0x7342,0x446F,
-	/* Array index: 0x1FAC */ 0x7343,0x4B70,
-	/* Array index: 0x1FAC */ 0x7351,0x4B72,
-	/* Array index: 0x1FAC */ 0x7352,0x517E,
-	/* Array index: 0x1FAC */ 0x7373,0x5D4F,
-	/* Array index: 0x1FAC */ 0x7376,0x622C,
-	/* Array index: 0x1FAC */ 0x7388,0x372F,
-	/* Array index: 0x1FAC */ 0x738A,0x2166,
-	/* Array index: 0x1FAC */ 0x738E,0x2265,
-	/* Array index: 0x1FAC */ 0x739D,0x282F,
-	/* Array index: 0x1FAC */ 0x73AC,0x282E,
-	/* Array index: 0x1FAC */ 0x73AD,0x282A,
-	/* Array index: 0x1FAC */ 0x73BC,0x3070,
-	/* Array index: 0x1FAC */ 0x73BE,0x2C34,
-	/* Array index: 0x1FAC */ 0x73BF,0x2C32,
-	/* Array index: 0x1FAC */ 0x73E3,0x3072,
-	/* Array index: 0x1FAC */ 0x7404,0x3733,
-	/* Array index: 0x1FAC */ 0x7407,0x3736,
-	/* Array index: 0x1FAC */ 0x7408,0x373E,
-	/* Array index: 0x1FAC */ 0x740B,0x373C,
-	/* Array index: 0x1FAC */ 0x740C,0x373B,
-	/* Array index: 0x1FAC */ 0x7416,0x3E24,
-	/* Array index: 0x1FAC */ 0x741A,0x3E25,
-	/* Array index: 0x1FAC */ 0x741D,0x3E2B,
-	/* Array index: 0x1FAC */ 0x7440,0x447B,
-	/* Array index: 0x1FAC */ 0x7442,0x4521,
-	/* Array index: 0x1FAC */ 0x7444,0x4475,
-	/* Array index: 0x1FAC */ 0x7446,0x4522,
-	/* Array index: 0x1FAC */ 0x7457,0x447A,
-	/* Array index: 0x1FAC */ 0x7462,0x4B74,
-	/* Array index: 0x1FAC */ 0x7467,0x4B79,
-	/* Array index: 0x1FAC */ 0x746E,0x4B7A,
-	/* Array index: 0x1FAC */ 0x7479,0x5233,
-	/* Array index: 0x1FAC */ 0x747C,0x5232,
-	/* Array index: 0x1FAC */ 0x747D,0x522F,
-	/* Array index: 0x1FAC */ 0x747F,0x584E,
-	/* Array index: 0x1FAC */ 0x7481,0x522E,
-	/* Array index: 0x1FAC */ 0x7490,0x5D55,
-	/* Array index: 0x1FAC */ 0x7492,0x5852,
-	/* Array index: 0x1FAC */ 0x7494,0x5851,
-	/* Array index: 0x1FAC */ 0x7495,0x5853,
-	/* Array index: 0x1FAC */ 0x7497,0x5D52,
-	/* Array index: 0x1FAC */ 0x749A,0x584F,
-	/* Array index: 0x1FAC */ 0x74A0,0x5850,
-	/* Array index: 0x1FAC */ 0x74A1,0x5854,
-	/* Array index: 0x1FAC */ 0x74A5,0x5D59,
-	/* Array index: 0x1FAC */ 0x74AA,0x5D56,
-	/* Array index: 0x1FAC */ 0x74AB,0x5D54,
-	/* Array index: 0x1FAC */ 0x74AD,0x5D57,
-	/* Array index: 0x1FAC */ 0x74AF,0x5D5A,
-	/* Array index: 0x1FAC */ 0x74CB,0x657D,
-	/* Array index: 0x1FAC */ 0x74E5,0x7041,
-	/* Array index: 0x1FAC */ 0x74E8,0x2831,
-	/* Array index: 0x1FAC */ 0x74EC,0x2C39,
-	/* Array index: 0x1FAC */ 0x74EE,0x2C3A,
-	/* Array index: 0x1FAC */ 0x74F4,0x3121,
-	/* Array index: 0x1FAC */ 0x74F5,0x3122,
-	/* Array index: 0x1FAC */ 0x7507,0x5235,
-	/* Array index: 0x1FAC */ 0x7508,0x5234,
-	/* Array index: 0x1FAC */ 0x750B,0x5855,
-	/* Array index: 0x1FAC */ 0x751D,0x4529,
-	/* Array index: 0x1FAC */ 0x7521,0x3123,
-	/* Array index: 0x1FAC */ 0x752A,0x2266,
-	/* Array index: 0x1FAC */ 0x752E,0x2C3B,
-	/* Array index: 0x1FAC */ 0x752F,0x3E30,
-	/* Array index: 0x1FAC */ 0x7539,0x246E,
-	/* Array index: 0x1FAC */ 0x753A,0x246D,
-	/* Array index: 0x1FAC */ 0x7547,0x2C3C,
-	/* Array index: 0x1FAC */ 0x7548,0x2C3D,
-	/* Array index: 0x1FAC */ 0x755B,0x3124,
-	/* Array index: 0x1FAC */ 0x755F,0x3125,
-	/* Array index: 0x1FAC */ 0x7563,0x3740,
-	/* Array index: 0x1FAC */ 0x7564,0x373F,
-	/* Array index: 0x1FAC */ 0x756C,0x3E32,
-	/* Array index: 0x1FAC */ 0x756F,0x3E31,
-	/* Array index: 0x1FAC */ 0x7577,0x452B,
-	/* Array index: 0x1FAC */ 0x7579,0x452A,
-	/* Array index: 0x1FAC */ 0x757D,0x4B7E,
-	/* Array index: 0x1FAC */ 0x757E,0x5236,
-	/* Array index: 0x1FAC */ 0x7580,0x5856,
-	/* Array index: 0x1FAC */ 0x7584,0x5D5F,
-	/* Array index: 0x1FAC */ 0x758C,0x2835,
-	/* Array index: 0x1FAC */ 0x7590,0x4C21,
-	/* Array index: 0x1FAC */ 0x7594,0x246F,
-	/* Array index: 0x1FAC */ 0x7595,0x2470,
-	/* Array index: 0x1FAC */ 0x7598,0x2836,
-	/* Array index: 0x1FAC */ 0x75A7,0x2C3E,
-	/* Array index: 0x1FAC */ 0x75AA,0x2C3F,
-	/* Array index: 0x1FAC */ 0x75B0,0x3126,
-	/* Array index: 0x1FAC */ 0x75B6,0x312C,
-	/* Array index: 0x1FAC */ 0x75BA,0x312D,
-	/* Array index: 0x1FAC */ 0x75BB,0x3128,
-	/* Array index: 0x1FAC */ 0x75C4,0x3129,
-	/* Array index: 0x1FAC */ 0x75D7,0x3E3A,
-	/* Array index: 0x1FAC */ 0x75DA,0x3E34,
-	/* Array index: 0x1FAC */ 0x75DD,0x3E37,
-	/* Array index: 0x1FAC */ 0x75DF,0x3E38,
-	/* Array index: 0x1FAC */ 0x75E1,0x3E35,
-	/* Array index: 0x1FAC */ 0x75E4,0x3E39,
-	/* Array index: 0x1FAC */ 0x75E6,0x3E36,
-	/* Array index: 0x1FAC */ 0x75E7,0x3E33,
-	/* Array index: 0x1FAC */ 0x75ED,0x4538,
-	/* Array index: 0x1FAC */ 0x75EF,0x452D,
-	/* Array index: 0x1FAC */ 0x7603,0x452F,
-	/* Array index: 0x1FAC */ 0x7608,0x4C23,
-	/* Array index: 0x1FAC */ 0x760A,0x4C27,
-	/* Array index: 0x1FAC */ 0x760C,0x4C24,
-	/* Array index: 0x1FAC */ 0x7623,0x523C,
-	/* Array index: 0x1FAC */ 0x7625,0x5237,
-	/* Array index: 0x1FAC */ 0x7628,0x523E,
-	/* Array index: 0x1FAC */ 0x763C,0x585C,
-	/* Array index: 0x1FAC */ 0x763D,0x585A,
-	/* Array index: 0x1FAC */ 0x7643,0x5D60,
-	/* Array index: 0x1FAC */ 0x7650,0x623A,
-	/* Array index: 0x1FAC */ 0x7653,0x623B,
-	/* Array index: 0x1FAC */ 0x7657,0x623C,
-	/* Array index: 0x1FAC */ 0x7659,0x6239,
-	/* Array index: 0x1FAC */ 0x765A,0x623D,
-	/* Array index: 0x1FAC */ 0x765C,0x6237,
-	/* Array index: 0x1FAC */ 0x7660,0x6624,
-	/* Array index: 0x1FAC */ 0x7664,0x6238,
-	/* Array index: 0x1FAC */ 0x766A,0x6B6D,
-	/* Array index: 0x1FAC */ 0x766D,0x6D62,
-	/* Array index: 0x1FAC */ 0x7670,0x6F39,
-	/* Array index: 0x1FAC */ 0x7675,0x723A,
-	/* Array index: 0x1FAC */ 0x7679,0x2C40,
-	/* Array index: 0x1FAC */ 0x767F,0x2267,
-	/* Array index: 0x1FAC */ 0x7681,0x2471,
-	/* Array index: 0x1FAC */ 0x7689,0x3749,
-	/* Array index: 0x1FAC */ 0x768A,0x312E,
-	/* Array index: 0x1FAC */ 0x768F,0x3748,
-	/* Array index: 0x1FAC */ 0x7692,0x3E3C,
-	/* Array index: 0x1FAC */ 0x7695,0x3E3B,
-	/* Array index: 0x1FAC */ 0x76A4,0x5D64,
-	/* Array index: 0x1FAC */ 0x76A6,0x623E,
-	/* Array index: 0x1FAC */ 0x76AA,0x6940,
-	/* Array index: 0x1FAC */ 0x76AB,0x693F,
-	/* Array index: 0x1FAC */ 0x76AD,0x6D63,
-	/* Array index: 0x1FAC */ 0x76AF,0x2837,
-	/* Array index: 0x1FAC */ 0x76B5,0x453C,
-	/* Array index: 0x1FAC */ 0x76B8,0x4C29,
-	/* Array index: 0x1FAC */ 0x76BB,0x5860,
-	/* Array index: 0x1FAC */ 0x76BD,0x623F,
-	/* Array index: 0x1FAC */ 0x76BE,0x6941,
-	/* Array index: 0x1FAC */ 0x76C4,0x2C41,
-	/* Array index: 0x1FAC */ 0x76C9,0x312F,
-	/* Array index: 0x1FAC */ 0x76D3,0x374A,
-	/* Array index: 0x1FAC */ 0x76DA,0x3E3D,
-	/* Array index: 0x1FAC */ 0x76DD,0x453D,
-	/* Array index: 0x1FAC */ 0x76E6,0x5861,
-	/* Array index: 0x1FAC */ 0x76E9,0x5D65,
-	/* Array index: 0x1FAC */ 0x76EC,0x6240,
-	/* Array index: 0x1FAC */ 0x76ED,0x6942,
-	/* Array index: 0x1FAC */ 0x76F0,0x283A,
-	/* Array index: 0x1FAC */ 0x76F1,0x2839,
-	/* Array index: 0x1FAC */ 0x76F3,0x2838,
-	/* Array index: 0x1FAC */ 0x76F5,0x283B,
-	/* Array index: 0x1FAC */ 0x76F7,0x2C47,
-	/* Array index: 0x1FAC */ 0x76FA,0x2C49,
-	/* Array index: 0x1FAC */ 0x76FB,0x2C48,
-	/* Array index: 0x1FAC */ 0x7708,0x2C42,
-	/* Array index: 0x1FAC */ 0x770A,0x2C46,
-	/* Array index: 0x1FAC */ 0x7722,0x313A,
-	/* Array index: 0x1FAC */ 0x7723,0x3135,
-	/* Array index: 0x1FAC */ 0x7725,0x3753,
-	/* Array index: 0x1FAC */ 0x7727,0x313B,
-	/* Array index: 0x1FAC */ 0x772D,0x374D,
-	/* Array index: 0x1FAC */ 0x7739,0x374B,
-	/* Array index: 0x1FAC */ 0x773B,0x3754,
-	/* Array index: 0x1FAC */ 0x773D,0x3752,
-	/* Array index: 0x1FAC */ 0x775F,0x453F,
-	/* Array index: 0x1FAC */ 0x7760,0x4540,
-	/* Array index: 0x1FAC */ 0x7767,0x4545,
-	/* Array index: 0x1FAC */ 0x7769,0x4544,
-	/* Array index: 0x1FAC */ 0x777C,0x4C2B,
-	/* Array index: 0x1FAC */ 0x778D,0x5244,
-	/* Array index: 0x1FAC */ 0x778F,0x5245,
-	/* Array index: 0x1FAC */ 0x7795,0x5869,
-	/* Array index: 0x1FAC */ 0x77A8,0x5D6D,
-	/* Array index: 0x1FAC */ 0x77AB,0x5D67,
-	/* Array index: 0x1FAC */ 0x77BA,0x6242,
-	/* Array index: 0x1FAC */ 0x77C2,0x6241,
-	/* Array index: 0x1FAC */ 0x77C4,0x6627,
-	/* Array index: 0x1FAC */ 0x77D4,0x6F3A,
-	/* Array index: 0x1FAC */ 0x77D5,0x7042,
-	/* Array index: 0x1FAC */ 0x77D8,0x7128,
-	/* Array index: 0x1FAC */ 0x77D9,0x7129,
-	/* Array index: 0x1FAC */ 0x77DE,0x3E47,
-	/* Array index: 0x1FAC */ 0x77E0,0x4549,
-	/* Array index: 0x1FAC */ 0x77E7,0x2C4A,
-	/* Array index: 0x1FAC */ 0x77E8,0x2C4B,
-	/* Array index: 0x1FAC */ 0x77EC,0x3E48,
-	/* Array index: 0x1FAC */ 0x7803,0x2C54,
-	/* Array index: 0x1FAC */ 0x7805,0x2C4F,
-	/* Array index: 0x1FAC */ 0x7806,0x2C4C,
-	/* Array index: 0x1FAC */ 0x7809,0x2C53,
-	/* Array index: 0x1FAC */ 0x7845,0x375D,
-	/* Array index: 0x1FAC */ 0x7850,0x375E,
-	/* Array index: 0x1FAC */ 0x7852,0x3757,
-	/* Array index: 0x1FAC */ 0x785C,0x3E4C,
-	/* Array index: 0x1FAC */ 0x785E,0x3E54,
-	/* Array index: 0x1FAC */ 0x7860,0x3E49,
-	/* Array index: 0x1FAC */ 0x7862,0x3E55,
-	/* Array index: 0x1FAC */ 0x7879,0x4554,
-	/* Array index: 0x1FAC */ 0x787B,0x4558,
-	/* Array index: 0x1FAC */ 0x787E,0x4C38,
-	/* Array index: 0x1FAC */ 0x7880,0x4556,
-	/* Array index: 0x1FAC */ 0x788F,0x454D,
-	/* Array index: 0x1FAC */ 0x78B2,0x4C33,
-	/* Array index: 0x1FAC */ 0x78B4,0x4C35,
-	/* Array index: 0x1FAC */ 0x78BB,0x5249,
-	/* Array index: 0x1FAC */ 0x78C3,0x5250,
-	/* Array index: 0x1FAC */ 0x78C4,0x5251,
-	/* Array index: 0x1FAC */ 0x78D4,0x524E,
-	/* Array index: 0x1FAC */ 0x78E9,0x586D,
-	/* Array index: 0x1FAC */ 0x78EA,0x586F,
-	/* Array index: 0x1FAC */ 0x78ED,0x5875,
-	/* Array index: 0x1FAC */ 0x78F2,0x5D75,
-	/* Array index: 0x1FAC */ 0x78F3,0x5D6F,
-	/* Array index: 0x1FAC */ 0x7902,0x5D71,
-	/* Array index: 0x1FAC */ 0x7904,0x5D79,
-	/* Array index: 0x1FAC */ 0x7905,0x5D76,
-	/* Array index: 0x1FAC */ 0x7909,0x6246,
-	/* Array index: 0x1FAC */ 0x790C,0x6243,
-	/* Array index: 0x1FAC */ 0x7917,0x662D,
-	/* Array index: 0x1FAC */ 0x792D,0x6B6F,
-	/* Array index: 0x1FAC */ 0x792F,0x6B71,
-	/* Array index: 0x1FAC */ 0x7931,0x6B70,
-	/* Array index: 0x1FAC */ 0x7935,0x6D64,
-	/* Array index: 0x1FAC */ 0x7938,0x7043,
-	/* Array index: 0x1FAC */ 0x7939,0x712A,
-	/* Array index: 0x1FAC */ 0x793D,0x2472,
-	/* Array index: 0x1FAC */ 0x793F,0x2843,
-	/* Array index: 0x1FAC */ 0x7942,0x2842,
-	/* Array index: 0x1FAC */ 0x7944,0x2C5A,
-	/* Array index: 0x1FAC */ 0x7945,0x2C59,
-	/* Array index: 0x1FAC */ 0x795B,0x314A,
-	/* Array index: 0x1FAC */ 0x795C,0x314C,
-	/* Array index: 0x1FAC */ 0x7961,0x3765,
-	/* Array index: 0x1FAC */ 0x7963,0x3763,
-	/* Array index: 0x1FAC */ 0x7964,0x375F,
-	/* Array index: 0x1FAC */ 0x7979,0x455C,
-	/* Array index: 0x1FAC */ 0x797C,0x4559,
-	/* Array index: 0x1FAC */ 0x797D,0x455B,
-	/* Array index: 0x1FAC */ 0x7982,0x455A,
-	/* Array index: 0x1FAC */ 0x7988,0x4C48,
-	/* Array index: 0x1FAC */ 0x798A,0x4C41,
-	/* Array index: 0x1FAC */ 0x798B,0x4C42,
-	/* Array index: 0x1FAC */ 0x79A8,0x5D7B,
-	/* Array index: 0x1FAC */ 0x79B0,0x662F,
-	/* Array index: 0x1FAC */ 0x79B2,0x694E,
-	/* Array index: 0x1FAC */ 0x79BB,0x3766,
-	/* Array index: 0x1FAC */ 0x79C5,0x2844,
-	/* Array index: 0x1FAC */ 0x79D5,0x2C5B,
-	/* Array index: 0x1FAC */ 0x79D6,0x2C5E,
-	/* Array index: 0x1FAC */ 0x7A0A,0x3E5B,
-	/* Array index: 0x1FAC */ 0x7A0C,0x3E5D,
-	/* Array index: 0x1FAC */ 0x7A22,0x4563,
-	/* Array index: 0x1FAC */ 0x7A26,0x4C50,
-	/* Array index: 0x1FAC */ 0x7A28,0x4C4F,
-	/* Array index: 0x1FAC */ 0x7A2B,0x4C4B,
-	/* Array index: 0x1FAC */ 0x7A2F,0x4C4E,
-	/* Array index: 0x1FAC */ 0x7A30,0x4C4D,
-	/* Array index: 0x1FAC */ 0x7A39,0x525A,
-	/* Array index: 0x1FAC */ 0x7A44,0x5879,
-	/* Array index: 0x1FAC */ 0x7A47,0x587B,
-	/* Array index: 0x1FAC */ 0x7A48,0x587A,
-	/* Array index: 0x1FAC */ 0x7A4A,0x4C4C,
-	/* Array index: 0x1FAC */ 0x7A54,0x5E22,
-	/* Array index: 0x1FAC */ 0x7A56,0x5D7E,
-	/* Array index: 0x1FAC */ 0x7A5F,0x624C,
-	/* Array index: 0x1FAC */ 0x7A67,0x6630,
-	/* Array index: 0x1FAC */ 0x7A68,0x6631,
-	/* Array index: 0x1FAC */ 0x7A75,0x2268,
-	/* Array index: 0x1FAC */ 0x7A78,0x2845,
-	/* Array index: 0x1FAC */ 0x7A7B,0x2846,
-	/* Array index: 0x1FAC */ 0x7A7E,0x2C61,
-	/* Array index: 0x1FAC */ 0x7A80,0x2C60,
-	/* Array index: 0x1FAC */ 0x7A94,0x376C,
-	/* Array index: 0x1FAC */ 0x7A99,0x3E5F,
-	/* Array index: 0x1FAC */ 0x7A9E,0x4569,
-	/* Array index: 0x1FAC */ 0x7AA2,0x4568,
-	/* Array index: 0x1FAC */ 0x7AA3,0x4567,
-	/* Array index: 0x1FAC */ 0x7AA8,0x4C51,
-	/* Array index: 0x1FAC */ 0x7AAB,0x4C52,
-	/* Array index: 0x1FAC */ 0x7AAC,0x4C53,
-	/* Array index: 0x1FAC */ 0x7ABE,0x5E24,
-	/* Array index: 0x1FAC */ 0x7AC0,0x5E25,
-	/* Array index: 0x1FAC */ 0x7AC1,0x5E26,
-	/* Array index: 0x1FAC */ 0x7AD1,0x2C62,
-	/* Array index: 0x1FAC */ 0x7AD8,0x3160,
-	/* Array index: 0x1FAC */ 0x7AE4,0x3E61,
-	/* Array index: 0x1FAC */ 0x7AE6,0x3E60,
-	/* Array index: 0x1FAC */ 0x7AEB,0x456A,
-	/* Array index: 0x1FAC */ 0x7AEE,0x4C54,
-	/* Array index: 0x1FAC */ 0x7AF7,0x6952,
-	/* Array index: 0x1FAC */ 0x7AFB,0x2847,
-	/* Array index: 0x1FAC */ 0x7B00,0x2C63,
-	/* Array index: 0x1FAC */ 0x7B01,0x2C64,
-	/* Array index: 0x1FAC */ 0x7B18,0x3776,
-	/* Array index: 0x1FAC */ 0x7B1A,0x3821,
-	/* Array index: 0x1FAC */ 0x7B1D,0x3778,
-	/* Array index: 0x1FAC */ 0x7B2A,0x3777,
-	/* Array index: 0x1FAC */ 0x7B2B,0x377A,
-	/* Array index: 0x1FAC */ 0x7B38,0x377E,
-	/* Array index: 0x1FAC */ 0x7B3B,0x376F,
-	/* Array index: 0x1FAC */ 0x7B40,0x3E68,
-	/* Array index: 0x1FAC */ 0x7B58,0x3E69,
-	/* Array index: 0x1FAC */ 0x7B69,0x456F,
-	/* Array index: 0x1FAC */ 0x7B6D,0x456D,
-	/* Array index: 0x1FAC */ 0x7B82,0x4C64,
-	/* Array index: 0x1FAC */ 0x7B85,0x4C5F,
-	/* Array index: 0x1FAC */ 0x7B88,0x4C55,
-	/* Array index: 0x1FAC */ 0x7B96,0x4C5A,
-	/* Array index: 0x1FAC */ 0x7BA4,0x4C63,
-	/* Array index: 0x1FAC */ 0x7BAC,0x5261,
-	/* Array index: 0x1FAC */ 0x7BAF,0x5263,
-	/* Array index: 0x1FAC */ 0x7BB5,0x5266,
-	/* Array index: 0x1FAC */ 0x7BB7,0x525E,
-	/* Array index: 0x1FAC */ 0x7BB9,0x5264,
-	/* Array index: 0x1FAC */ 0x7BBE,0x5260,
-	/* Array index: 0x1FAC */ 0x7BCA,0x5265,
-	/* Array index: 0x1FAC */ 0x7BCB,0x525F,
-	/* Array index: 0x1FAC */ 0x7BCE,0x5262,
-	/* Array index: 0x1FAC */ 0x7BD4,0x592C,
-	/* Array index: 0x1FAC */ 0x7BD5,0x5927,
-	/* Array index: 0x1FAC */ 0x7BD8,0x5931,
-	/* Array index: 0x1FAC */ 0x7BF8,0x5E35,
-	/* Array index: 0x1FAC */ 0x7BF9,0x592B,
-	/* Array index: 0x1FAC */ 0x7BFB,0x5E2C,
-	/* Array index: 0x1FAC */ 0x7C19,0x624F,
-	/* Array index: 0x1FAC */ 0x7C30,0x6258,
-	/* Array index: 0x1FAC */ 0x7C33,0x6632,
-	/* Array index: 0x1FAC */ 0x7C39,0x6634,
-	/* Array index: 0x1FAC */ 0x7C3B,0x6636,
-	/* Array index: 0x1FAC */ 0x7C3C,0x6633,
-	/* Array index: 0x1FAC */ 0x7C53,0x6B73,
-	/* Array index: 0x1FAC */ 0x7C54,0x6B72,
-	/* Array index: 0x1FAC */ 0x7C6F,0x715C,
-	/* Array index: 0x1FAC */ 0x7C75,0x2848,
-	/* Array index: 0x1FAC */ 0x7C88,0x316F,
-	/* Array index: 0x1FAC */ 0x7C8A,0x316D,
-	/* Array index: 0x1FAC */ 0x7C8C,0x316E,
-	/* Array index: 0x1FAC */ 0x7C8D,0x3170,
-	/* Array index: 0x1FAC */ 0x7C91,0x316C,
-	/* Array index: 0x1FAC */ 0x7C94,0x3823,
-	/* Array index: 0x1FAC */ 0x7C96,0x3825,
-	/* Array index: 0x1FAC */ 0x7C98,0x3824,
-	/* Array index: 0x1FAC */ 0x7C9E,0x3E6C,
-	/* Array index: 0x1FAC */ 0x7CA8,0x3E6D,
-	/* Array index: 0x1FAC */ 0x7CAF,0x457B,
-	/* Array index: 0x1FAC */ 0x7CB2,0x4579,
-	/* Array index: 0x1FAC */ 0x7CB4,0x457A,
-	/* Array index: 0x1FAC */ 0x7CBF,0x4C66,
-	/* Array index: 0x1FAC */ 0x7CC5,0x5267,
-	/* Array index: 0x1FAC */ 0x7CC8,0x5268,
-	/* Array index: 0x1FAC */ 0x7CCB,0x526A,
-	/* Array index: 0x1FAC */ 0x7CCC,0x5269,
-	/* Array index: 0x1FAC */ 0x7CD7,0x5935,
-	/* Array index: 0x1FAC */ 0x7CE8,0x5E3C,
-	/* Array index: 0x1FAC */ 0x7CEA,0x6638,
-	/* Array index: 0x1FAC */ 0x7CEC,0x6637,
-	/* Array index: 0x1FAC */ 0x7CEE,0x6958,
-	/* Array index: 0x1FAC */ 0x7CF1,0x6D6E,
-	/* Array index: 0x1FAC */ 0x7CF2,0x6B74,
-	/* Array index: 0x1FAC */ 0x7CF4,0x6D6D,
-	/* Array index: 0x1FAC */ 0x7CF6,0x712D,
-	/* Array index: 0x1FAC */ 0x7CF7,0x7172,
-	/* Array index: 0x1FAC */ 0x7CFD,0x2849,
-	/* Array index: 0x1FAC */ 0x7D01,0x2C6D,
-	/* Array index: 0x1FAC */ 0x7D03,0x2C6B,
-	/* Array index: 0x1FAC */ 0x7D08,0x2C6C,
-	/* Array index: 0x1FAC */ 0x7D0C,0x317C,
-	/* Array index: 0x1FAC */ 0x7D16,0x3177,
-	/* Array index: 0x1FAC */ 0x7D18,0x3176,
-	/* Array index: 0x1FAC */ 0x7D28,0x3835,
-	/* Array index: 0x1FAC */ 0x7D29,0x382E,
-	/* Array index: 0x1FAC */ 0x7D2C,0x382D,
-	/* Array index: 0x1FAC */ 0x7D35,0x3827,
-	/* Array index: 0x1FAC */ 0x7D36,0x382A,
-	/* Array index: 0x1FAC */ 0x7D38,0x3829,
-	/* Array index: 0x1FAC */ 0x7D45,0x382C,
-	/* Array index: 0x1FAC */ 0x7D47,0x3830,
-	/* Array index: 0x1FAC */ 0x7D4A,0x3833,
-	/* Array index: 0x1FAC */ 0x7D5C,0x3E78,
-	/* Array index: 0x1FAC */ 0x7D5F,0x3E7E,
-	/* Array index: 0x1FAC */ 0x7D63,0x3E71,
-	/* Array index: 0x1FAC */ 0x7D92,0x462D,
-	/* Array index: 0x1FAC */ 0x7D94,0x462A,
-	/* Array index: 0x1FAC */ 0x7D96,0x4C79,
-	/* Array index: 0x1FAC */ 0x7D9D,0x4C71,
-	/* Array index: 0x1FAC */ 0x7D9F,0x4C7B,
-	/* Array index: 0x1FAC */ 0x7DA1,0x4D21,
-	/* Array index: 0x1FAC */ 0x7DA3,0x4C6C,
-	/* Array index: 0x1FAC */ 0x7DAE,0x4C7D,
-	/* Array index: 0x1FAC */ 0x7DAF,0x4C77,
-	/* Array index: 0x1FAC */ 0x7DB7,0x4C6A,
-	/* Array index: 0x1FAC */ 0x7DB9,0x4C78,
-	/* Array index: 0x1FAC */ 0x7DBC,0x4C7A,
-	/* Array index: 0x1FAC */ 0x7DC9,0x4D22,
-	/* Array index: 0x1FAC */ 0x7DCB,0x4C75,
-	/* Array index: 0x1FAC */ 0x7DCC,0x4C76,
-	/* Array index: 0x1FAC */ 0x7DCE,0x4C72,
-	/* Array index: 0x1FAC */ 0x7DD7,0x526F,
-	/* Array index: 0x1FAC */ 0x7DDB,0x526C,
-	/* Array index: 0x1FAC */ 0x7DDF,0x5278,
-	/* Array index: 0x1FAC */ 0x7DE1,0x5270,
-	/* Array index: 0x1FAC */ 0x7DE6,0x5273,
-	/* Array index: 0x1FAC */ 0x7DE7,0x526E,
-	/* Array index: 0x1FAC */ 0x7DEA,0x526D,
-	/* Array index: 0x1FAC */ 0x7DEE,0x5277,
-	/* Array index: 0x1FAC */ 0x7DF0,0x5276,
-	/* Array index: 0x1FAC */ 0x7DF1,0x5275,
-	/* Array index: 0x1FAC */ 0x7DF3,0x503B,
-	/* Array index: 0x1FAC */ 0x7DF6,0x5274,
-	/* Array index: 0x1FAC */ 0x7DF7,0x526B,
-	/* Array index: 0x1FAC */ 0x7DFA,0x5272,
-	/* Array index: 0x1FAC */ 0x7E03,0x5271,
-	/* Array index: 0x1FAC */ 0x7E1A,0x5942,
-	/* Array index: 0x1FAC */ 0x7E1C,0x5940,
-	/* Array index: 0x1FAC */ 0x7E29,0x5E47,
-	/* Array index: 0x1FAC */ 0x7E2A,0x5E43,
-	/* Array index: 0x1FAC */ 0x7E2D,0x5E3D,
-	/* Array index: 0x1FAC */ 0x7E30,0x5E49,
-	/* Array index: 0x1FAC */ 0x7E33,0x5E40,
-	/* Array index: 0x1FAC */ 0x7E36,0x5E4B,
-	/* Array index: 0x1FAC */ 0x7E40,0x5E45,
-	/* Array index: 0x1FAC */ 0x7E42,0x5E3F,
-	/* Array index: 0x1FAC */ 0x7E44,0x5E4C,
-	/* Array index: 0x1FAC */ 0x7E47,0x5E46,
-	/* Array index: 0x1FAC */ 0x7E49,0x5E44,
-	/* Array index: 0x1FAC */ 0x7E4C,0x5E48,
-	/* Array index: 0x1FAC */ 0x7E50,0x625A,
-	/* Array index: 0x1FAC */ 0x7E51,0x6260,
-	/* Array index: 0x1FAC */ 0x7E53,0x6263,
-	/* Array index: 0x1FAC */ 0x7E5C,0x6259,
-	/* Array index: 0x1FAC */ 0x7E68,0x6642,
-	/* Array index: 0x1FAC */ 0x7E6F,0x663E,
-	/* Array index: 0x1FAC */ 0x7E70,0x663C,
-	/* Array index: 0x1FAC */ 0x7E7E,0x695A,
-	/* Array index: 0x1FAC */ 0x7E80,0x695C,
-	/* Array index: 0x1FAC */ 0x7E81,0x695B,
-	/* Array index: 0x1FAC */ 0x7E91,0x6D6F,
-	/* Array index: 0x1FAC */ 0x7F39,0x3052,
-	/* Array index: 0x1FAC */ 0x7F3E,0x3F22,
-	/* Array index: 0x1FAC */ 0x7F3F,0x3F23,
-	/* Array index: 0x1FAC */ 0x7F43,0x594B,
-	/* Array index: 0x1FAC */ 0x7F45,0x5E4E,
-	/* Array index: 0x1FAC */ 0x7F4A,0x6644,
-	/* Array index: 0x1FAC */ 0x7F4B,0x6643,
-	/* Array index: 0x1FAC */ 0x7F4D,0x6B7B,
-	/* Array index: 0x1FAC */ 0x7F4F,0x6D70,
-	/* Array index: 0x1FAC */ 0x7F51,0x2269,
-	/* Array index: 0x1FAC */ 0x7F58,0x2C6E,
-	/* Array index: 0x1FAC */ 0x7F73,0x4D23,
-	/* Array index: 0x1FAC */ 0x7F76,0x5279,
-	/* Array index: 0x1FAC */ 0x7F83,0x6645,
-	/* Array index: 0x1FAC */ 0x7F86,0x6646,
-	/* Array index: 0x1FAC */ 0x7F87,0x6D71,
-	/* Array index: 0x1FAC */ 0x7F89,0x7048,
-	/* Array index: 0x1FAC */ 0x7F8D,0x2C70,
-	/* Array index: 0x1FAC */ 0x7F91,0x2C6F,
-	/* Array index: 0x1FAC */ 0x7F92,0x3226,
-	/* Array index: 0x1FAC */ 0x7F95,0x3837,
-	/* Array index: 0x1FAC */ 0x7F96,0x3225,
-	/* Array index: 0x1FAC */ 0x7FAC,0x527A,
-	/* Array index: 0x1FAC */ 0x7FAD,0x527C,
-	/* Array index: 0x1FAC */ 0x7FB0,0x527B,
-	/* Array index: 0x1FAC */ 0x7FB1,0x594F,
-	/* Array index: 0x1FAC */ 0x7FB3,0x6265,
-	/* Array index: 0x1FAC */ 0x7FB5,0x6264,
-	/* Array index: 0x1FAC */ 0x7FB7,0x6647,
-	/* Array index: 0x1FAC */ 0x7FBA,0x695D,
-	/* Array index: 0x1FAC */ 0x7FBB,0x6B7C,
-	/* Array index: 0x1FAC */ 0x7FBE,0x2C71,
-	/* Array index: 0x1FAC */ 0x7FC0,0x3229,
-	/* Array index: 0x1FAC */ 0x7FC2,0x3228,
-	/* Array index: 0x1FAC */ 0x7FC3,0x3227,
-	/* Array index: 0x1FAC */ 0x7FD7,0x3F29,
-	/* Array index: 0x1FAC */ 0x7FDB,0x4636,
-	/* Array index: 0x1FAC */ 0x7FDC,0x4637,
-	/* Array index: 0x1FAC */ 0x7FDE,0x4D27,
-	/* Array index: 0x1FAC */ 0x7FF2,0x5E53,
-	/* Array index: 0x1FAC */ 0x8007,0x2C72,
-	/* Array index: 0x1FAC */ 0x800E,0x2C73,
-	/* Array index: 0x1FAC */ 0x800F,0x2C74,
-	/* Array index: 0x1FAC */ 0x8014,0x2C75,
-	/* Array index: 0x1FAC */ 0x8016,0x322A,
-	/* Array index: 0x1FAC */ 0x801B,0x3845,
-	/* Array index: 0x1FAC */ 0x801E,0x3844,
-	/* Array index: 0x1FAC */ 0x801F,0x3843,
-	/* Array index: 0x1FAC */ 0x8021,0x4638,
-	/* Array index: 0x1FAC */ 0x8024,0x4D28,
-	/* Array index: 0x1FAC */ 0x8029,0x5952,
-	/* Array index: 0x1FAC */ 0x802A,0x5951,
-	/* Array index: 0x1FAC */ 0x802C,0x5E54,
-	/* Array index: 0x1FAC */ 0x8030,0x6B7D,
-	/* Array index: 0x1FAC */ 0x8034,0x2473,
-	/* Array index: 0x1FAC */ 0x8035,0x284A,
-	/* Array index: 0x1FAC */ 0x8037,0x2C76,
-	/* Array index: 0x1FAC */ 0x8039,0x322C,
-	/* Array index: 0x1FAC */ 0x803E,0x322B,
-	/* Array index: 0x1FAC */ 0x8043,0x3847,
-	/* Array index: 0x1FAC */ 0x8047,0x3846,
-	/* Array index: 0x1FAC */ 0x8048,0x3848,
-	/* Array index: 0x1FAC */ 0x805C,0x4D2A,
-	/* Array index: 0x1FAC */ 0x805D,0x4D29,
-	/* Array index: 0x1FAC */ 0x8064,0x5325,
-	/* Array index: 0x1FAC */ 0x8067,0x5326,
-	/* Array index: 0x1FAC */ 0x806C,0x5953,
-	/* Array index: 0x1FAC */ 0x8075,0x6268,
-	/* Array index: 0x1FAC */ 0x8078,0x664A,
-	/* Array index: 0x1FAC */ 0x8079,0x695F,
-	/* Array index: 0x1FAC */ 0x8082,0x2F7D,
-	/* Array index: 0x1FAC */ 0x808A,0x2168,
-	/* Array index: 0x1FAC */ 0x808F,0x284B,
-	/* Array index: 0x1FAC */ 0x8090,0x2476,
-	/* Array index: 0x1FAC */ 0x8092,0x2477,
-	/* Array index: 0x1FAC */ 0x8095,0x2474,
-	/* Array index: 0x1FAC */ 0x8099,0x2475,
-	/* Array index: 0x1FAC */ 0x809C,0x2478,
-	/* Array index: 0x1FAC */ 0x80A3,0x284D,
-	/* Array index: 0x1FAC */ 0x80AD,0x2850,
-	/* Array index: 0x1FAC */ 0x80AE,0x284C,
-	/* Array index: 0x1FAC */ 0x80B5,0x284F,
-	/* Array index: 0x1FAC */ 0x80B8,0x284E,
-	/* Array index: 0x1FAC */ 0x80C2,0x2C7C,
-	/* Array index: 0x1FAC */ 0x80DC,0x2D23,
-	/* Array index: 0x1FAC */ 0x80E0,0x2C79,
-	/* Array index: 0x1FAC */ 0x80E3,0x2D21,
-	/* Array index: 0x1FAC */ 0x80E6,0x2D29,
-	/* Array index: 0x1FAC */ 0x80F2,0x322E,
-	/* Array index: 0x1FAC */ 0x80F5,0x3230,
-	/* Array index: 0x1FAC */ 0x80FE,0x3F2D,
-	/* Array index: 0x1FAC */ 0x8100,0x3233,
-	/* Array index: 0x1FAC */ 0x8101,0x3231,
-	/* Array index: 0x1FAC */ 0x8115,0x3852,
-	/* Array index: 0x1FAC */ 0x8118,0x3849,
-	/* Array index: 0x1FAC */ 0x8119,0x384B,
-	/* Array index: 0x1FAC */ 0x8125,0x384A,
-	/* Array index: 0x1FAC */ 0x8127,0x3853,
-	/* Array index: 0x1FAC */ 0x812C,0x384F,
-	/* Array index: 0x1FAC */ 0x812D,0x384D,
-	/* Array index: 0x1FAC */ 0x813A,0x3F36,
-	/* Array index: 0x1FAC */ 0x813D,0x3F34,
-	/* Array index: 0x1FAC */ 0x8143,0x3F2F,
-	/* Array index: 0x1FAC */ 0x8144,0x4646,
-	/* Array index: 0x1FAC */ 0x8147,0x3F33,
-	/* Array index: 0x1FAC */ 0x814A,0x3F30,
-	/* Array index: 0x1FAC */ 0x814D,0x3F35,
-	/* Array index: 0x1FAC */ 0x814F,0x3F32,
-	/* Array index: 0x1FAC */ 0x8152,0x3F31,
-	/* Array index: 0x1FAC */ 0x815B,0x463E,
-	/* Array index: 0x1FAC */ 0x815C,0x463C,
-	/* Array index: 0x1FAC */ 0x8167,0x4644,
-	/* Array index: 0x1FAC */ 0x8169,0x463D,
-	/* Array index: 0x1FAC */ 0x816F,0x4645,
-	/* Array index: 0x1FAC */ 0x8172,0x4640,
-	/* Array index: 0x1FAC */ 0x8176,0x4643,
-	/* Array index: 0x1FAC */ 0x8177,0x463B,
-	/* Array index: 0x1FAC */ 0x8183,0x4D2D,
-	/* Array index: 0x1FAC */ 0x8186,0x4D2C,
-	/* Array index: 0x1FAC */ 0x8187,0x4D2E,
-	/* Array index: 0x1FAC */ 0x8195,0x532A,
-	/* Array index: 0x1FAC */ 0x8197,0x532D,
-	/* Array index: 0x1FAC */ 0x8199,0x532C,
-	/* Array index: 0x1FAC */ 0x819E,0x5329,
-	/* Array index: 0x1FAC */ 0x819F,0x5328,
-	/* Array index: 0x1FAC */ 0x81A2,0x532B,
-	/* Array index: 0x1FAC */ 0x81A3,0x5327,
-	/* Array index: 0x1FAC */ 0x81A6,0x5955,
-	/* Array index: 0x1FAC */ 0x81A7,0x595F,
-	/* Array index: 0x1FAC */ 0x81AB,0x5959,
-	/* Array index: 0x1FAC */ 0x81AC,0x595B,
-	/* Array index: 0x1FAC */ 0x81C4,0x5E56,
-	/* Array index: 0x1FAC */ 0x81C5,0x5E59,
-	/* Array index: 0x1FAC */ 0x81C7,0x5E5A,
-	/* Array index: 0x1FAC */ 0x81CA,0x5E58,
-	/* Array index: 0x1FAC */ 0x81CC,0x5E57,
-	/* Array index: 0x1FAC */ 0x81D5,0x664C,
-	/* Array index: 0x1FAC */ 0x81D7,0x664B,
-	/* Array index: 0x1FAC */ 0x81D9,0x6961,
-	/* Array index: 0x1FAC */ 0x81DB,0x6960,
-	/* Array index: 0x1FAC */ 0x81E6,0x3F37,
-	/* Array index: 0x1FAC */ 0x81E9,0x5E5C,
-	/* Array index: 0x1FAC */ 0x81EE,0x3F38,
-	/* Array index: 0x1FAC */ 0x81F2,0x5960,
-	/* Array index: 0x1FAC */ 0x81FF,0x2D2B,
-	/* Array index: 0x1FAC */ 0x8201,0x3234,
-	/* Array index: 0x1FAC */ 0x8204,0x3F3C,
-	/* Array index: 0x1FAC */ 0x820B,0x664D,
-	/* Array index: 0x1FAC */ 0x8211,0x3856,
-	/* Array index: 0x1FAC */ 0x8215,0x4D32,
-	/* Array index: 0x1FAC */ 0x8216,0x532E,
-	/* Array index: 0x1FAC */ 0x821D,0x4648,
-	/* Array index: 0x1FAC */ 0x8220,0x2851,
-	/* Array index: 0x1FAC */ 0x8221,0x2D2C,
-	/* Array index: 0x1FAC */ 0x8225,0x3236,
-	/* Array index: 0x1FAC */ 0x822F,0x3235,
-	/* Array index: 0x1FAC */ 0x8238,0x3857,
-	/* Array index: 0x1FAC */ 0x823A,0x3859,
-	/* Array index: 0x1FAC */ 0x8249,0x4649,
-	/* Array index: 0x1FAC */ 0x8274,0x385C,
-	/* Array index: 0x1FAC */ 0x8275,0x3F40,
-	/* Array index: 0x1FAC */ 0x8278,0x226A,
-	/* Array index: 0x1FAC */ 0x828A,0x2521,
-	/* Array index: 0x1FAC */ 0x8298,0x2856,
-	/* Array index: 0x1FAC */ 0x829A,0x2855,
-	/* Array index: 0x1FAC */ 0x829B,0x2857,
-	/* Array index: 0x1FAC */ 0x82AE,0x285A,
-	/* Array index: 0x1FAC */ 0x82BA,0x285D,
-	/* Array index: 0x1FAC */ 0x82BC,0x285B,
-	/* Array index: 0x1FAC */ 0x82C0,0x2853,
-	/* Array index: 0x1FAC */ 0x82C2,0x2862,
-	/* Array index: 0x1FAC */ 0x82C3,0x2864,
-	/* Array index: 0x1FAC */ 0x82D5,0x2D34,
-	/* Array index: 0x1FAC */ 0x82D6,0x2D37,
-	/* Array index: 0x1FAC */ 0x82D9,0x2D2E,
-	/* Array index: 0x1FAC */ 0x82E0,0x2D43,
-	/* Array index: 0x1FAC */ 0x82E1,0x2D3A,
-	/* Array index: 0x1FAC */ 0x82E4,0x2D42,
-	/* Array index: 0x1FAC */ 0x82FE,0x2D2F,
-	/* Array index: 0x1FAC */ 0x8300,0x2D33,
-	/* Array index: 0x1FAC */ 0x8307,0x2D31,
-	/* Array index: 0x1FAC */ 0x8308,0x3247,
-	/* Array index: 0x1FAC */ 0x830C,0x2D3D,
-	/* Array index: 0x1FAC */ 0x830D,0x2942,
-	/* Array index: 0x1FAC */ 0x8316,0x324A,
-	/* Array index: 0x1FAC */ 0x8319,0x323A,
-	/* Array index: 0x1FAC */ 0x831B,0x3245,
-	/* Array index: 0x1FAC */ 0x831C,0x3241,
-	/* Array index: 0x1FAC */ 0x831E,0x3254,
-	/* Array index: 0x1FAC */ 0x8320,0x324C,
-	/* Array index: 0x1FAC */ 0x8333,0x3237,
-	/* Array index: 0x1FAC */ 0x8337,0x324D,
-	/* Array index: 0x1FAC */ 0x833F,0x323E,
-	/* Array index: 0x1FAC */ 0x8351,0x323B,
-	/* Array index: 0x1FAC */ 0x8353,0x3253,
-	/* Array index: 0x1FAC */ 0x8356,0x323D,
-	/* Array index: 0x1FAC */ 0x837A,0x3861,
-	/* Array index: 0x1FAC */ 0x8394,0x386A,
-	/* Array index: 0x1FAC */ 0x8395,0x3867,
-	/* Array index: 0x1FAC */ 0x83F3,0x3F63,
-	/* Array index: 0x1FAC */ 0x8406,0x3F61,
-	/* Array index: 0x1FAC */ 0x8409,0x3F5D,
-	/* Array index: 0x1FAC */ 0x841B,0x3F72,
-	/* Array index: 0x1FAC */ 0x8423,0x3F44,
-	/* Array index: 0x1FAC */ 0x8429,0x466C,
-	/* Array index: 0x1FAC */ 0x842B,0x4724,
-	/* Array index: 0x1FAC */ 0x842D,0x4671,
-	/* Array index: 0x1FAC */ 0x8465,0x4655,
-	/* Array index: 0x1FAC */ 0x8467,0x4659,
-	/* Array index: 0x1FAC */ 0x8468,0x4721,
-	/* Array index: 0x1FAC */ 0x8486,0x4658,
-	/* Array index: 0x1FAC */ 0x8494,0x4D49,
-	/* Array index: 0x1FAC */ 0x84B4,0x4D3E,
-	/* Array index: 0x1FAC */ 0x84B6,0x4D52,
-	/* Array index: 0x1FAC */ 0x84C1,0x4D3F,
-	/* Array index: 0x1FAC */ 0x84C2,0x4D39,
-	/* Array index: 0x1FAC */ 0x84C5,0x4679,
-	/* Array index: 0x1FAC */ 0x84C7,0x4D4A,
-	/* Array index: 0x1FAC */ 0x84DB,0x4D58,
-	/* Array index: 0x1FAC */ 0x8512,0x534E,
-	/* Array index: 0x1FAC */ 0x853B,0x5336,
-	/* Array index: 0x1FAC */ 0x853E,0x5974,
-	/* Array index: 0x1FAC */ 0x854D,0x5967,
-	/* Array index: 0x1FAC */ 0x854E,0x5977,
-	/* Array index: 0x1FAC */ 0x855B,0x5975,
-	/* Array index: 0x1FAC */ 0x855D,0x5A21,
-	/* Array index: 0x1FAC */ 0x856B,0x5966,
-	/* Array index: 0x1FAC */ 0x856C,0x5A24,
-	/* Array index: 0x1FAC */ 0x856E,0x5978,
-	/* Array index: 0x1FAC */ 0x8571,0x5976,
-	/* Array index: 0x1FAC */ 0x85A7,0x5E63,
-	/* Array index: 0x1FAC */ 0x85CB,0x6279,
-	/* Array index: 0x1FAC */ 0x85CE,0x627A,
-	/* Array index: 0x1FAC */ 0x85D1,0x6660,
-	/* Array index: 0x1FAC */ 0x85D2,0x6321,
-	/* Array index: 0x1FAC */ 0x85E6,0x6662,
-	/* Array index: 0x1FAC */ 0x85E8,0x6656,
-	/* Array index: 0x1FAC */ 0x85F6,0x696A,
-	/* Array index: 0x1FAC */ 0x85F8,0x665B,
-	/* Array index: 0x1FAC */ 0x8609,0x696C,
-	/* Array index: 0x1FAC */ 0x860C,0x696E,
-	/* Array index: 0x1FAC */ 0x8643,0x704A,
-	/* Array index: 0x1FAC */ 0x8652,0x325A,
-	/* Array index: 0x1FAC */ 0x8653,0x3259,
-	/* Array index: 0x1FAC */ 0x8656,0x3921,
-	/* Array index: 0x1FAC */ 0x8659,0x387E,
-	/* Array index: 0x1FAC */ 0x8677,0x2D47,
-	/* Array index: 0x1FAC */ 0x867C,0x2D49,
-	/* Array index: 0x1FAC */ 0x868B,0x3264,
-	/* Array index: 0x1FAC */ 0x86A5,0x3267,
-	/* Array index: 0x1FAC */ 0x86A7,0x326A,
-	/* Array index: 0x1FAC */ 0x86A8,0x325C,
-	/* Array index: 0x1FAC */ 0x86B0,0x3928,
-	/* Array index: 0x1FAC */ 0x86C8,0x3929,
-	/* Array index: 0x1FAC */ 0x86CC,0x392D,
-	/* Array index: 0x1FAC */ 0x86D1,0x4025,
-	/* Array index: 0x1FAC */ 0x86D3,0x3F78,
-	/* Array index: 0x1FAC */ 0x86E2,0x3F76,
-	/* Array index: 0x1FAC */ 0x86E3,0x3F79,
-	/* Array index: 0x1FAC */ 0x8701,0x4734,
-	/* Array index: 0x1FAC */ 0x8704,0x472A,
-	/* Array index: 0x1FAC */ 0x8705,0x4737,
-	/* Array index: 0x1FAC */ 0x871E,0x4D62,
-	/* Array index: 0x1FAC */ 0x8738,0x4D77,
-	/* Array index: 0x1FAC */ 0x873A,0x4D71,
-	/* Array index: 0x1FAC */ 0x873C,0x4D6F,
-	/* Array index: 0x1FAC */ 0x8746,0x4D6A,
-	/* Array index: 0x1FAC */ 0x8773,0x536D,
-	/* Array index: 0x1FAC */ 0x8775,0x5426,
-	/* Array index: 0x1FAC */ 0x8781,0x5A2F,
-	/* Array index: 0x1FAC */ 0x87A3,0x5A34,
-	/* Array index: 0x1FAC */ 0x87A4,0x5A28,
-	/* Array index: 0x1FAC */ 0x87C9,0x5F30,
-	/* Array index: 0x1FAC */ 0x87CA,0x5F37,
-	/* Array index: 0x1FAC */ 0x87CC,0x5F33,
-	/* Array index: 0x1FAC */ 0x87FA,0x6667,
-	/* Array index: 0x1FAC */ 0x87FC,0x666F,
-	/* Array index: 0x1FAC */ 0x8810,0x6971,
-	/* Array index: 0x1FAC */ 0x8811,0x6972,
-	/* Array index: 0x1FAC */ 0x8813,0x6974,
-	/* Array index: 0x1FAC */ 0x8816,0x6975,
-	/* Array index: 0x1FAC */ 0x8817,0x6973,
-	/* Array index: 0x1FAC */ 0x8820,0x6C32,
-	/* Array index: 0x1FAC */ 0x8848,0x4026,
-	/* Array index: 0x1FAC */ 0x884A,0x6C36,
-	/* Array index: 0x1FAC */ 0x884B,0x704E,
-	/* Array index: 0x1FAC */ 0x884E,0x2D4C,
-	/* Array index: 0x1FAC */ 0x8852,0x3934,
-	/* Array index: 0x1FAC */ 0x8855,0x4028,
-	/* Array index: 0x1FAC */ 0x8856,0x4027,
-	/* Array index: 0x1FAC */ 0x885A,0x542A,
-	/* Array index: 0x1FAC */ 0x8867,0x2D4D,
-	/* Array index: 0x1FAC */ 0x8869,0x2D4F,
-	/* Array index: 0x1FAC */ 0x886A,0x2D4E,
-	/* Array index: 0x1FAC */ 0x886D,0x3273,
-	/* Array index: 0x1FAC */ 0x886F,0x327A,
-	/* Array index: 0x1FAC */ 0x8883,0x327B,
-	/* Array index: 0x1FAC */ 0x8889,0x3935,
-	/* Array index: 0x1FAC */ 0x888C,0x3945,
-	/* Array index: 0x1FAC */ 0x888E,0x3947,
-	/* Array index: 0x1FAC */ 0x8891,0x393B,
-	/* Array index: 0x1FAC */ 0x8893,0x3946,
-	/* Array index: 0x1FAC */ 0x889F,0x393D,
-	/* Array index: 0x1FAC */ 0x88A1,0x393C,
-	/* Array index: 0x1FAC */ 0x88A2,0x3938,
-	/* Array index: 0x1FAC */ 0x88A4,0x3943,
-	/* Array index: 0x1FAC */ 0x88A7,0x393F,
-	/* Array index: 0x1FAC */ 0x88A8,0x3937,
-	/* Array index: 0x1FAC */ 0x88AA,0x3939,
-	/* Array index: 0x1FAC */ 0x88AC,0x3944,
-	/* Array index: 0x1FAC */ 0x88B2,0x4033,
-	/* Array index: 0x1FAC */ 0x88D6,0x4738,
-	/* Array index: 0x1FAC */ 0x88D7,0x402A,
-	/* Array index: 0x1FAC */ 0x88DA,0x473E,
-	/* Array index: 0x1FAC */ 0x88DB,0x473D,
-	/* Array index: 0x1FAC */ 0x88DE,0x473C,
-	/* Array index: 0x1FAC */ 0x88E7,0x4D7D,
-	/* Array index: 0x1FAC */ 0x88EB,0x4E2A,
-	/* Array index: 0x1FAC */ 0x88EC,0x4E29,
-	/* Array index: 0x1FAC */ 0x8901,0x4034,
-	/* Array index: 0x1FAC */ 0x8905,0x542B,
-	/* Array index: 0x1FAC */ 0x8906,0x5432,
-	/* Array index: 0x1FAC */ 0x8909,0x5436,
-	/* Array index: 0x1FAC */ 0x890B,0x542E,
-	/* Array index: 0x1FAC */ 0x890C,0x542C,
-	/* Array index: 0x1FAC */ 0x890E,0x5435,
-	/* Array index: 0x1FAC */ 0x8911,0x5434,
-	/* Array index: 0x1FAC */ 0x891E,0x5A3E,
-	/* Array index: 0x1FAC */ 0x891F,0x5A4A,
-	/* Array index: 0x1FAC */ 0x8922,0x5A45,
-	/* Array index: 0x1FAC */ 0x8923,0x5A47,
-	/* Array index: 0x1FAC */ 0x8926,0x5A3F,
-	/* Array index: 0x1FAC */ 0x8927,0x5A43,
-	/* Array index: 0x1FAC */ 0x8929,0x5A46,
-	/* Array index: 0x1FAC */ 0x893C,0x5F41,
-	/* Array index: 0x1FAC */ 0x893E,0x5F42,
-	/* Array index: 0x1FAC */ 0x8941,0x5F43,
-	/* Array index: 0x1FAC */ 0x8942,0x5F46,
-	/* Array index: 0x1FAC */ 0x8946,0x6341,
-	/* Array index: 0x1FAC */ 0x8949,0x6344,
-	/* Array index: 0x1FAC */ 0x8966,0x6977,
-	/* Array index: 0x1FAC */ 0x8969,0x6C38,
-	/* Array index: 0x1FAC */ 0x896B,0x6C3A,
-	/* Array index: 0x1FAC */ 0x896D,0x6C37,
-	/* Array index: 0x1FAC */ 0x896E,0x6C39,
-	/* Array index: 0x1FAC */ 0x8971,0x6E21,
-	/* Array index: 0x1FAC */ 0x8973,0x6F4C,
-	/* Array index: 0x1FAC */ 0x8974,0x6F4B,
-	/* Array index: 0x1FAC */ 0x8976,0x6F4A,
-	/* Array index: 0x1FAC */ 0x8982,0x3948,
-	/* Array index: 0x1FAC */ 0x8985,0x4741,
-	/* Array index: 0x1FAC */ 0x8988,0x667D,
-	/* Array index: 0x1FAC */ 0x8995,0x4036,
-	/* Array index: 0x1FAC */ 0x8997,0x4038,
-	/* Array index: 0x1FAC */ 0x8998,0x4037,
-	/* Array index: 0x1FAC */ 0x89B6,0x6721,
-	/* Array index: 0x1FAC */ 0x89B7,0x667E,
-	/* Array index: 0x1FAC */ 0x89B9,0x6978,
-	/* Array index: 0x1FAC */ 0x89BE,0x6E23,
-	/* Array index: 0x1FAC */ 0x89BF,0x6E22,
-	/* Array index: 0x1FAC */ 0x89D3,0x2D50,
-	/* Array index: 0x1FAC */ 0x8A04,0x2D51,
-	/* Array index: 0x1FAC */ 0x8A07,0x2D52,
-	/* Array index: 0x1FAC */ 0x8A12,0x3321,
-	/* Array index: 0x1FAC */ 0x8A1E,0x394F,
-	/* Array index: 0x1FAC */ 0x8A27,0x394D,
-	/* Array index: 0x1FAC */ 0x8A2C,0x394E,
-	/* Array index: 0x1FAC */ 0x8A30,0x394C,
-	/* Array index: 0x1FAC */ 0x8A39,0x403E,
-	/* Array index: 0x1FAC */ 0x8A3F,0x474F,
-	/* Array index: 0x1FAC */ 0x8A40,0x4040,
-	/* Array index: 0x1FAC */ 0x8A44,0x4043,
-	/* Array index: 0x1FAC */ 0x8A45,0x4044,
-	/* Array index: 0x1FAC */ 0x8A48,0x4046,
-	/* Array index: 0x1FAC */ 0x8A61,0x474E,
-	/* Array index: 0x1FAC */ 0x8A7A,0x4757,
-	/* Array index: 0x1FAC */ 0x8A8B,0x4E34,
-	/* Array index: 0x1FAC */ 0x8A8F,0x4E36,
-	/* Array index: 0x1FAC */ 0x8A92,0x4E35,
-	/* Array index: 0x1FAC */ 0x8A96,0x4E37,
-	/* Array index: 0x1FAC */ 0x8A99,0x4E33,
-	/* Array index: 0x1FAC */ 0x8AAB,0x4E32,
-	/* Array index: 0x1FAC */ 0x8AB8,0x543F,
-	/* Array index: 0x1FAC */ 0x8AC3,0x544A,
-	/* Array index: 0x1FAC */ 0x8AC5,0x5448,
-	/* Array index: 0x1FAC */ 0x8AC6,0x543E,
-	/* Array index: 0x1FAC */ 0x8AC8,0x5A56,
-	/* Array index: 0x1FAC */ 0x8ACF,0x543D,
-	/* Array index: 0x1FAC */ 0x8AE8,0x5A59,
-	/* Array index: 0x1FAC */ 0x8AEF,0x5A5B,
-	/* Array index: 0x1FAC */ 0x8AF0,0x5A55,
-	/* Array index: 0x1FAC */ 0x8AF2,0x5A4E,
-	/* Array index: 0x1FAC */ 0x8AF4,0x5A4F,
-	/* Array index: 0x1FAC */ 0x8AF5,0x5A50,
-	/* Array index: 0x1FAC */ 0x8AFB,0x5A5C,
-	/* Array index: 0x1FAC */ 0x8AFF,0x5A5A,
-	/* Array index: 0x1FAC */ 0x8B0B,0x5F51,
-	/* Array index: 0x1FAC */ 0x8B0D,0x5F57,
-	/* Array index: 0x1FAC */ 0x8B2A,0x6345,
-	/* Array index: 0x1FAC */ 0x8B45,0x6C3E,
-	/* Array index: 0x1FAC */ 0x8B5D,0x697C,
-	/* Array index: 0x1FAC */ 0x8B60,0x697A,
-	/* Array index: 0x1FAC */ 0x8B63,0x697E,
-	/* Array index: 0x1FAC */ 0x8B65,0x6A21,
-	/* Array index: 0x1FAC */ 0x8B67,0x6A22,
-	/* Array index: 0x1FAC */ 0x8B68,0x697D,
-	/* Array index: 0x1FAC */ 0x8B6A,0x697B,
-	/* Array index: 0x1FAC */ 0x8B6D,0x6A23,
-	/* Array index: 0x1FAC */ 0x8B94,0x704F,
-	/* Array index: 0x1FAC */ 0x8B95,0x7050,
-	/* Array index: 0x1FAC */ 0x8B98,0x713C,
-	/* Array index: 0x1FAC */ 0x8B99,0x713D,
-	/* Array index: 0x1FAC */ 0x8B9E,0x7177,
-	/* Array index: 0x1FAC */ 0x8B9F,0x7236,
-	/* Array index: 0x1FAC */ 0x8C42,0x6359,
-	/* Array index: 0x1FAC */ 0x8C43,0x6730,
-	/* Array index: 0x1FAC */ 0x8C45,0x6F52,
-	/* Array index: 0x1FAC */ 0x8C47,0x3322,
-	/* Array index: 0x1FAC */ 0x8C4A,0x475A,
-	/* Array index: 0x1FAC */ 0x8C4B,0x4759,
-	/* Array index: 0x1FAC */ 0x8C4D,0x544F,
-	/* Array index: 0x1FAC */ 0x8C4F,0x5F5D,
-	/* Array index: 0x1FAC */ 0x8C56,0x286B,
-	/* Array index: 0x1FAC */ 0x8C57,0x3323,
-	/* Array index: 0x1FAC */ 0x8C5C,0x3952,
-	/* Array index: 0x1FAC */ 0x8C5D,0x3953,
-	/* Array index: 0x1FAC */ 0x8C5F,0x404B,
-	/* Array index: 0x1FAC */ 0x8C7B,0x3324,
-	/* Array index: 0x1FAC */ 0x8C7D,0x3954,
-	/* Array index: 0x1FAC */ 0x8CB0,0x4050,
-	/* Array index: 0x1FAC */ 0x8CB5,0x4052,
-	/* Array index: 0x1FAC */ 0x8CB9,0x4051,
-	/* Array index: 0x1FAC */ 0x8CBA,0x404E,
-	/* Array index: 0x1FAC */ 0x8CBE,0x404F,
-	/* Array index: 0x1FAC */ 0x8CCC,0x4761,
-	/* Array index: 0x1FAC */ 0x8CCF,0x4E3C,
-	/* Array index: 0x1FAC */ 0x8CD5,0x4E3B,
-	/* Array index: 0x1FAC */ 0x8CD7,0x4E3D,
-	/* Array index: 0x1FAC */ 0x8CD9,0x5453,
-	/* Array index: 0x1FAC */ 0x8CDA,0x5455,
-	/* Array index: 0x1FAC */ 0x8CDD,0x5456,
-	/* Array index: 0x1FAC */ 0x8CDF,0x5452,
-	/* Array index: 0x1FAC */ 0x8CE5,0x5451,
-	/* Array index: 0x1FAC */ 0x8CE7,0x5457,
-	/* Array index: 0x1FAC */ 0x8CE8,0x5454,
-	/* Array index: 0x1FAC */ 0x8CEE,0x5A61,
-	/* Array index: 0x1FAC */ 0x8CF0,0x5A63,
-	/* Array index: 0x1FAC */ 0x8CF1,0x5A62,
-	/* Array index: 0x1FAC */ 0x8CF3,0x5A64,
-	/* Array index: 0x1FAC */ 0x8CF5,0x5A60,
-	/* Array index: 0x1FAC */ 0x8CF9,0x5F64,
-	/* Array index: 0x1FAC */ 0x8CFE,0x635E,
-	/* Array index: 0x1FAC */ 0x8D00,0x6361,
-	/* Array index: 0x1FAC */ 0x8D02,0x6360,
-	/* Array index: 0x1FAC */ 0x8D04,0x635F,
-	/* Array index: 0x1FAC */ 0x8D06,0x6734,
-	/* Array index: 0x1FAC */ 0x8D07,0x6735,
-	/* Array index: 0x1FAC */ 0x8D09,0x6736,
-	/* Array index: 0x1FAC */ 0x8D10,0x6C41,
-	/* Array index: 0x1FAC */ 0x8D14,0x6C42,
-	/* Array index: 0x1FAC */ 0x8D15,0x6E2B,
-	/* Array index: 0x1FAC */ 0x8D19,0x6F53,
-	/* Array index: 0x1FAC */ 0x8D68,0x4762,
-	/* Array index: 0x1FAC */ 0x8D69,0x4763,
-	/* Array index: 0x1FAC */ 0x8D6C,0x5A65,
-	/* Array index: 0x1FAC */ 0x8D6E,0x5A66,
-	/* Array index: 0x1FAC */ 0x8D6F,0x5F65,
-	/* Array index: 0x1FAC */ 0x8D72,0x2D53,
-	/* Array index: 0x1FAC */ 0x8D76,0x3327,
-	/* Array index: 0x1FAC */ 0x8D78,0x3328,
-	/* Array index: 0x1FAC */ 0x8D79,0x3958,
-	/* Array index: 0x1FAC */ 0x8D7B,0x3957,
-	/* Array index: 0x1FAC */ 0x8D7D,0x3956,
-	/* Array index: 0x1FAC */ 0x8D80,0x4054,
-	/* Array index: 0x1FAC */ 0x8D84,0x4053,
-	/* Array index: 0x1FAC */ 0x8D89,0x4055,
-	/* Array index: 0x1FAC */ 0x8D9B,0x545B,
-	/* Array index: 0x1FAC */ 0x8D9C,0x5459,
-	/* Array index: 0x1FAC */ 0x8DA0,0x5458,
-	/* Array index: 0x1FAC */ 0x8DA1,0x545A,
-	/* Array index: 0x1FAC */ 0x8DA5,0x5A67,
-	/* Array index: 0x1FAC */ 0x8DA7,0x5A68,
-	/* Array index: 0x1FAC */ 0x8DB2,0x715E,
-	/* Array index: 0x1FAC */ 0x8DBC,0x3959,
-	/* Array index: 0x1FAC */ 0x8DBF,0x395C,
-	/* Array index: 0x1FAC */ 0x8DC1,0x395D,
-	/* Array index: 0x1FAC */ 0x8DC2,0x395A,
-	/* Array index: 0x1FAC */ 0x8DC5,0x4061,
-	/* Array index: 0x1FAC */ 0x8DC7,0x4059,
-	/* Array index: 0x1FAC */ 0x8DC8,0x405F,
-	/* Array index: 0x1FAC */ 0x8DCD,0x4058,
-	/* Array index: 0x1FAC */ 0x8DCF,0x405C,
-	/* Array index: 0x1FAC */ 0x8DD0,0x4772,
-	/* Array index: 0x1FAC */ 0x8DDC,0x405B,
-	/* Array index: 0x1FAC */ 0x8DE0,0x476E,
-	/* Array index: 0x1FAC */ 0x8DE2,0x4775,
-	/* Array index: 0x1FAC */ 0x8DE3,0x4774,
-	/* Array index: 0x1FAC */ 0x8DE7,0x4776,
-	/* Array index: 0x1FAC */ 0x8DE9,0x4773,
-	/* Array index: 0x1FAC */ 0x8DEB,0x4778,
-	/* Array index: 0x1FAC */ 0x8DEC,0x476F,
-	/* Array index: 0x1FAC */ 0x8E0D,0x4E42,
-	/* Array index: 0x1FAC */ 0x8E20,0x545C,
-	/* Array index: 0x1FAC */ 0x8E2E,0x5460,
-	/* Array index: 0x1FAC */ 0x8E30,0x5A72,
-	/* Array index: 0x1FAC */ 0x8E33,0x5A69,
-	/* Array index: 0x1FAC */ 0x8E36,0x5A6E,
-	/* Array index: 0x1FAC */ 0x8E38,0x5A6B,
-	/* Array index: 0x1FAC */ 0x8E45,0x5A6D,
-	/* Array index: 0x1FAC */ 0x8E47,0x5F6B,
-	/* Array index: 0x1FAC */ 0x8E65,0x6368,
-	/* Array index: 0x1FAC */ 0x8E67,0x6369,
-	/* Array index: 0x1FAC */ 0x8E69,0x636E,
-	/* Array index: 0x1FAC */ 0x8E6A,0x673E,
-	/* Array index: 0x1FAC */ 0x8E6D,0x673B,
-	/* Array index: 0x1FAC */ 0x8E6F,0x673F,
-	/* Array index: 0x1FAC */ 0x8E73,0x673D,
-	/* Array index: 0x1FAC */ 0x8E78,0x673C,
-	/* Array index: 0x1FAC */ 0x8E7B,0x6740,
-	/* Array index: 0x1FAC */ 0x8E84,0x6A27,
-	/* Array index: 0x1FAC */ 0x8E86,0x6A25,
-	/* Array index: 0x1FAC */ 0x8E88,0x6A26,
-	/* Array index: 0x1FAC */ 0x8E8C,0x6C45,
-	/* Array index: 0x1FAC */ 0x8E8E,0x6C44,
-	/* Array index: 0x1FAC */ 0x8E90,0x6E30,
-	/* Array index: 0x1FAC */ 0x8EBD,0x5A74,
-	/* Array index: 0x1FAC */ 0x8EC2,0x6741,
-	/* Array index: 0x1FAC */ 0x8EC9,0x717A,
-	/* Array index: 0x1FAC */ 0x8ED1,0x332C,
-	/* Array index: 0x1FAC */ 0x8ED3,0x332D,
-	/* Array index: 0x1FAC */ 0x8ED7,0x3962,
-	/* Array index: 0x1FAC */ 0x8ED8,0x395E,
-	/* Array index: 0x1FAC */ 0x8F0B,0x4824,
-	/* Array index: 0x1FAC */ 0x8F20,0x5473,
-	/* Array index: 0x1FAC */ 0x8F23,0x5474,
-	/* Array index: 0x1FAC */ 0x8F24,0x5470,
-	/* Array index: 0x1FAC */ 0x8F2C,0x546F,
-	/* Array index: 0x1FAC */ 0x8F2E,0x5A76,
-	/* Array index: 0x1FAC */ 0x8F40,0x5F6D,
-	/* Array index: 0x1FAC */ 0x8F43,0x5F6C,
-	/* Array index: 0x1FAC */ 0x8F4B,0x6373,
-	/* Array index: 0x1FAC */ 0x8FB4,0x6747,
-	/* Array index: 0x1FAC */ 0x8FBF,0x2526,
-	/* Array index: 0x1FAC */ 0x8FC9,0x2525,
-	/* Array index: 0x1FAC */ 0x8FCB,0x286D,
-	/* Array index: 0x1FAC */ 0x8FCD,0x286F,
-	/* Array index: 0x1FAC */ 0x8FE0,0x2D57,
-	/* Array index: 0x1FAC */ 0x8FE1,0x2D55,
-	/* Array index: 0x1FAC */ 0x8FE3,0x2D54,
-	/* Array index: 0x1FAC */ 0x8FEE,0x2D56,
-	/* Array index: 0x1FAC */ 0x8FF5,0x332F,
-	/* Array index: 0x1FAC */ 0x8FF6,0x3335,
-	/* Array index: 0x1FAC */ 0x9002,0x3330,
-	/* Array index: 0x1FAC */ 0x9004,0x3333,
-	/* Array index: 0x1FAC */ 0x900B,0x3966,
-	/* Array index: 0x1FAC */ 0x900C,0x3969,
-	/* Array index: 0x1FAC */ 0x9011,0x3967,
-	/* Array index: 0x1FAC */ 0x901C,0x3968,
-	/* Array index: 0x1FAC */ 0x9021,0x396A,
-	/* Array index: 0x1FAC */ 0x9024,0x3965,
-	/* Array index: 0x1FAC */ 0x902D,0x4072,
-	/* Array index: 0x1FAC */ 0x902F,0x4074,
-	/* Array index: 0x1FAC */ 0x9034,0x4073,
-	/* Array index: 0x1FAC */ 0x903D,0x4829,
-	/* Array index: 0x1FAC */ 0x903F,0x4826,
-	/* Array index: 0x1FAC */ 0x9044,0x4827,
-	/* Array index: 0x1FAC */ 0x9049,0x4828,
-	/* Array index: 0x1FAC */ 0x9052,0x4825,
-	/* Array index: 0x1FAC */ 0x9067,0x547A,
-	/* Array index: 0x1FAC */ 0x906B,0x547B,
-	/* Array index: 0x1FAC */ 0x906F,0x5479,
-	/* Array index: 0x1FAC */ 0x9070,0x5478,
-	/* Array index: 0x1FAC */ 0x9073,0x5477,
-	/* Array index: 0x1FAC */ 0x9076,0x5A7C,
-	/* Array index: 0x1FAC */ 0x9079,0x5A7D,
-	/* Array index: 0x1FAC */ 0x907B,0x5A7E,
-	/* Array index: 0x1FAC */ 0x907E,0x5F6F,
-	/* Array index: 0x1FAC */ 0x9085,0x5F6E,
-	/* Array index: 0x1FAC */ 0x9086,0x5B21,
-	/* Array index: 0x1FAC */ 0x908D,0x6A2E,
-	/* Array index: 0x1FAC */ 0x9094,0x2275,
-	/* Array index: 0x1FAC */ 0x90A5,0x2529,
-	/* Array index: 0x1FAC */ 0x90A7,0x252B,
-	/* Array index: 0x1FAC */ 0x90C5,0x2D5C,
-	/* Array index: 0x1FAC */ 0x90C7,0x2D5E,
-	/* Array index: 0x1FAC */ 0x90C8,0x2D60,
-	/* Array index: 0x1FAC */ 0x90CB,0x2D5F,
-	/* Array index: 0x1FAC */ 0x9114,0x482F,
-	/* Array index: 0x1FAC */ 0x9116,0x482E,
-	/* Array index: 0x1FAC */ 0x9153,0x3978,
-	/* Array index: 0x1FAC */ 0x9155,0x3979,
-	/* Array index: 0x1FAC */ 0x9156,0x3975,
-	/* Array index: 0x1FAC */ 0x9158,0x3976,
-	/* Array index: 0x1FAC */ 0x915A,0x3977,
-	/* Array index: 0x1FAC */ 0x9168,0x4279,
-	/* Array index: 0x1FAC */ 0x916E,0x4832,
-	/* Array index: 0x1FAC */ 0x916F,0x4833,
-	/* Array index: 0x1FAC */ 0x9172,0x4E5B,
-	/* Array index: 0x1FAC */ 0x9173,0x4E5D,
-	/* Array index: 0x1FAC */ 0x9179,0x4E5C,
-	/* Array index: 0x1FAC */ 0x917A,0x4E5A,
-	/* Array index: 0x1FAC */ 0x918A,0x5527,
-	/* Array index: 0x1FAC */ 0x91A5,0x6379,
-	/* Array index: 0x1FAC */ 0x91A7,0x637A,
-	/* Array index: 0x1FAC */ 0x91A8,0x6378,
-	/* Array index: 0x1FAC */ 0x91AA,0x637C,
-	/* Array index: 0x1FAC */ 0x91AD,0x674B,
-	/* Array index: 0x1FAC */ 0x91C2,0x7057,
-	/* Array index: 0x1FAC */ 0x91C3,0x7160,
-	/* Array index: 0x1FAC */ 0x91DA,0x3347,
-	/* Array index: 0x1FAC */ 0x91E2,0x3346,
-	/* Array index: 0x1FAC */ 0x91E4,0x3A21,
-	/* Array index: 0x1FAC */ 0x91F1,0x397C,
-	/* Array index: 0x1FAC */ 0x920A,0x412A,
-	/* Array index: 0x1FAC */ 0x920C,0x4130,
-	/* Array index: 0x1FAC */ 0x920F,0x412F,
-	/* Array index: 0x1FAC */ 0x9212,0x4132,
-	/* Array index: 0x1FAC */ 0x9236,0x4846,
-	/* Array index: 0x1FAC */ 0x923A,0x4837,
-	/* Array index: 0x1FAC */ 0x9246,0x483F,
-	/* Array index: 0x1FAC */ 0x9248,0x4834,
-	/* Array index: 0x1FAC */ 0x924A,0x483E,
-	/* Array index: 0x1FAC */ 0x925E,0x483B,
-	/* Array index: 0x1FAC */ 0x9260,0x4843,
-	/* Array index: 0x1FAC */ 0x9261,0x4847,
-	/* Array index: 0x1FAC */ 0x9276,0x4E60,
-	/* Array index: 0x1FAC */ 0x9294,0x4E64,
-	/* Array index: 0x1FAC */ 0x9295,0x4E71,
-	/* Array index: 0x1FAC */ 0x92EE,0x4E6E,
-	/* Array index: 0x1FAC */ 0x92EF,0x553A,
-	/* Array index: 0x1FAC */ 0x92F1,0x5533,
-	/* Array index: 0x1FAC */ 0x9306,0x5B2F,
-	/* Array index: 0x1FAC */ 0x932D,0x5B39,
-	/* Array index: 0x1FAC */ 0x9334,0x5B42,
-	/* Array index: 0x1FAC */ 0x9335,0x5B48,
-	/* Array index: 0x1FAC */ 0x9338,0x5B32,
-	/* Array index: 0x1FAC */ 0x9339,0x5B47,
-	/* Array index: 0x1FAC */ 0x933C,0x5B33,
-	/* Array index: 0x1FAC */ 0x9346,0x5B38,
-	/* Array index: 0x1FAC */ 0x9347,0x5F7E,
-	/* Array index: 0x1FAC */ 0x9349,0x6025,
-	/* Array index: 0x1FAC */ 0x935C,0x6023,
-	/* Array index: 0x1FAC */ 0x935E,0x6036,
-	/* Array index: 0x1FAC */ 0x9367,0x6038,
-	/* Array index: 0x1FAC */ 0x936A,0x602C,
-	/* Array index: 0x1FAC */ 0x936D,0x6029,
-	/* Array index: 0x1FAC */ 0x9371,0x6032,
-	/* Array index: 0x1FAC */ 0x9380,0x642F,
-	/* Array index: 0x1FAC */ 0x9383,0x5F7A,
-	/* Array index: 0x1FAC */ 0x9395,0x642B,
-	/* Array index: 0x1FAC */ 0x9399,0x642D,
-	/* Array index: 0x1FAC */ 0x93AF,0x5F7B,
-	/* Array index: 0x1FAC */ 0x93C0,0x675F,
-	/* Array index: 0x1FAC */ 0x93C2,0x674F,
-	/* Array index: 0x1FAC */ 0x93C4,0x675D,
-	/* Array index: 0x1FAC */ 0x93C7,0x674D,
-	/* Array index: 0x1FAC */ 0x93CA,0x6758,
-	/* Array index: 0x1FAC */ 0x93D9,0x6755,
-	/* Array index: 0x1FAC */ 0x93DA,0x6750,
-	/* Array index: 0x1FAC */ 0x93DE,0x674C,
-	/* Array index: 0x1FAC */ 0x93E3,0x675B,
-	/* Array index: 0x1FAC */ 0x93E6,0x6757,
-	/* Array index: 0x1FAC */ 0x93E7,0x6762,
-	/* Array index: 0x1FAC */ 0x93EC,0x6753,
-	/* Array index: 0x1FAC */ 0x93EE,0x675A,
-	/* Array index: 0x1FAC */ 0x9419,0x6A3F,
-	/* Array index: 0x1FAC */ 0x9420,0x6A38,
-	/* Array index: 0x1FAC */ 0x9430,0x6C52,
-	/* Array index: 0x1FAC */ 0x9431,0x6C58,
-	/* Array index: 0x1FAC */ 0x9436,0x6C4F,
-	/* Array index: 0x1FAC */ 0x9437,0x6C55,
-	/* Array index: 0x1FAC */ 0x9455,0x6F59,
-	/* Array index: 0x1FAC */ 0x9457,0x6F5B,
-	/* Array index: 0x1FAC */ 0x945D,0x6F5A,
-	/* Array index: 0x1FAC */ 0x945E,0x6F5C,
-	/* Array index: 0x1FAC */ 0x9462,0x6F58,
-	/* Array index: 0x1FAC */ 0x9468,0x7059,
-	/* Array index: 0x1FAC */ 0x9469,0x705A,
-	/* Array index: 0x1FAC */ 0x9586,0x3A29,
-	/* Array index: 0x1FAC */ 0x9588,0x3A2A,
-	/* Array index: 0x1FAC */ 0x958C,0x4141,
-	/* Array index: 0x1FAC */ 0x958D,0x4140,
-	/* Array index: 0x1FAC */ 0x9590,0x4142,
-	/* Array index: 0x1FAC */ 0x95AB,0x5550,
-	/* Array index: 0x1FAC */ 0x95AC,0x554F,
-	/* Array index: 0x1FAC */ 0x95AE,0x5551,
-	/* Array index: 0x1FAC */ 0x95B0,0x5552,
-	/* Array index: 0x1FAC */ 0x95C3,0x603E,
-	/* Array index: 0x1FAC */ 0x95C5,0x603F,
-	/* Array index: 0x1FAC */ 0x95C7,0x603B,
-	/* Array index: 0x1FAC */ 0x95C9,0x603D,
-	/* Array index: 0x1FAC */ 0x95CD,0x5B53,
-	/* Array index: 0x1FAC */ 0x961E,0x2169,
-	/* Array index: 0x1FAC */ 0x9628,0x252E,
-	/* Array index: 0x1FAC */ 0x962D,0x2530,
-	/* Array index: 0x1FAC */ 0x962F,0x252F,
-	/* Array index: 0x1FAC */ 0x9630,0x252D,
-	/* Array index: 0x1FAC */ 0x9643,0x287C,
-	/* Array index: 0x1FAC */ 0x964A,0x2D67,
-	/* Array index: 0x1FAC */ 0x964E,0x2D68,
-	/* Array index: 0x1FAC */ 0x964F,0x2D64,
-	/* Array index: 0x1FAC */ 0x9651,0x2D65,
-	/* Array index: 0x1FAC */ 0x9653,0x2D66,
-	/* Array index: 0x1FAC */ 0x9654,0x2D63,
-	/* Array index: 0x1FAC */ 0x965C,0x3348,
-	/* Array index: 0x1FAC */ 0x965F,0x3349,
-	/* Array index: 0x1FAC */ 0x966B,0x3A2D,
-	/* Array index: 0x1FAC */ 0x966D,0x3A2C,
-	/* Array index: 0x1FAC */ 0x966F,0x3A2F,
-	/* Array index: 0x1FAC */ 0x9671,0x3A2E,
-	/* Array index: 0x1FAC */ 0x967C,0x3A2B,
-	/* Array index: 0x1FAC */ 0x967E,0x4144,
-	/* Array index: 0x1FAC */ 0x9680,0x4148,
-	/* Array index: 0x1FAC */ 0x9683,0x4147,
-	/* Array index: 0x1FAC */ 0x9697,0x485A,
-	/* Array index: 0x1FAC */ 0x969E,0x4F23,
-	/* Array index: 0x1FAC */ 0x96A1,0x4F24,
-	/* Array index: 0x1FAC */ 0x96A2,0x5554,
-	/* Array index: 0x1FAC */ 0x96A4,0x5553,
-	/* Array index: 0x1FAC */ 0x96A9,0x5B5B,
-	/* Array index: 0x1FAC */ 0x96AC,0x6043,
-	/* Array index: 0x1FAC */ 0x96AE,0x6041,
-	/* Array index: 0x1FAC */ 0x96B0,0x6042,
-	/* Array index: 0x1FAC */ 0x96B3,0x643B,
-	/* Array index: 0x1FAC */ 0x96BC,0x334A,
-	/* Array index: 0x1FAC */ 0x96BF,0x3A30,
-	/* Array index: 0x1FAC */ 0x96C2,0x4149,
-	/* Array index: 0x1FAC */ 0x96C3,0x414B,
-	/* Array index: 0x1FAC */ 0x96C8,0x414A,
-	/* Array index: 0x1FAC */ 0x96CE,0x485B,
-	/* Array index: 0x1FAC */ 0x96D3,0x5555,
-	/* Array index: 0x1FAC */ 0x96D4,0x5B5C,
-	/* Array index: 0x1FAC */ 0x96D7,0x643C,
-	/* Array index: 0x1FAC */ 0x96D8,0x6440,
-	/* Array index: 0x1FAC */ 0x96DA,0x643D,
-	/* Array index: 0x1FAC */ 0x96DD,0x6441,
-	/* Array index: 0x1FAC */ 0x96DF,0x643F,
-	/* Array index: 0x1FAC */ 0x96E1,0x6766,
-	/* Array index: 0x1FAC */ 0x96E5,0x705B,
-	/* Array index: 0x1FAC */ 0x96F0,0x414D,
-	/* Array index: 0x1FAC */ 0x96F1,0x414C,
-	/* Array index: 0x1FAC */ 0x96F5,0x485F,
-	/* Array index: 0x1FAC */ 0x96F8,0x485E,
-	/* Array index: 0x1FAC */ 0x96FA,0x485C,
-	/* Array index: 0x1FAC */ 0x96FD,0x485D,
-	/* Array index: 0x1FAC */ 0x96FF,0x4F25,
-	/* Array index: 0x1FAC */ 0x9702,0x5558,
-	/* Array index: 0x1FAC */ 0x9705,0x5556,
-	/* Array index: 0x1FAC */ 0x9708,0x5557,
-	/* Array index: 0x1FAC */ 0x970B,0x5B5D,
-	/* Array index: 0x1FAC */ 0x9710,0x5B5F,
-	/* Array index: 0x1FAC */ 0x9712,0x5B5E,
-	/* Array index: 0x1FAC */ 0x9718,0x6046,
-	/* Array index: 0x1FAC */ 0x9719,0x6048,
-	/* Array index: 0x1FAC */ 0x971D,0x6047,
-	/* Array index: 0x1FAC */ 0x9735,0x6C5C,
-	/* Array index: 0x1FAC */ 0x973A,0x6C5D,
-	/* Array index: 0x1FAC */ 0x973F,0x6E40,
-	/* Array index: 0x1FAC */ 0x9743,0x705D,
-	/* Array index: 0x1FAC */ 0x9746,0x705C,
-	/* Array index: 0x1FAC */ 0x9747,0x705E,
-	/* Array index: 0x1FAC */ 0x9749,0x7146,
-	/* Array index: 0x1FAC */ 0x974B,0x717B,
-	/* Array index: 0x1FAC */ 0x9758,0x4F26,
-	/* Array index: 0x1FAC */ 0x975A,0x5559,
-	/* Array index: 0x1FAC */ 0x976A,0x3A31,
-	/* Array index: 0x1FAC */ 0x976C,0x414E,
-	/* Array index: 0x1FAC */ 0x976E,0x4150,
-	/* Array index: 0x1FAC */ 0x9770,0x414F,
-	/* Array index: 0x1FAC */ 0x9772,0x4863,
-	/* Array index: 0x1FAC */ 0x9773,0x4860,
-	/* Array index: 0x1FAC */ 0x9788,0x555C,
-	/* Array index: 0x1FAC */ 0x978A,0x555A,
-	/* Array index: 0x1FAC */ 0x978E,0x555B,
-	/* Array index: 0x1FAC */ 0x9794,0x5B62,
-	/* Array index: 0x1FAC */ 0x9797,0x5B61,
-	/* Array index: 0x1FAC */ 0x97B3,0x676C,
-	/* Array index: 0x1FAC */ 0x97B6,0x676E,
-	/* Array index: 0x1FAC */ 0x97B7,0x676D,
-	/* Array index: 0x1FAC */ 0x97B9,0x6A58,
-	/* Array index: 0x1FAC */ 0x97BB,0x6A59,
-	/* Array index: 0x1FAC */ 0x97BF,0x6C5E,
-	/* Array index: 0x1FAC */ 0x97C4,0x6F5D,
-	/* Array index: 0x1FAC */ 0x97C5,0x6F5E,
-	/* Array index: 0x1FAC */ 0x97C7,0x705F,
-	/* Array index: 0x1FAC */ 0x97F0,0x5B63,
-	/* Array index: 0x1FAC */ 0x97F1,0x6050,
-	/* Array index: 0x1FAC */ 0x97F8,0x5B64,
-	/* Array index: 0x1FAC */ 0x97FA,0x6451,
-	/* Array index: 0x1FAC */ 0x97FD,0x6A5A,
-	/* Array index: 0x1FAC */ 0x97FE,0x6A5B,
-	/* Array index: 0x1FAC */ 0x9800,0x6F5F,
-	/* Array index: 0x1FAC */ 0x9804,0x3A32,
-	/* Array index: 0x1FAC */ 0x9807,0x4151,
-	/* Array index: 0x1FAC */ 0x9816,0x4F33,
-	/* Array index: 0x1FAC */ 0x981B,0x5565,
-	/* Array index: 0x1FAC */ 0x981D,0x5560,
-	/* Array index: 0x1FAC */ 0x981E,0x555F,
-	/* Array index: 0x1FAC */ 0x9820,0x5564,
-	/* Array index: 0x1FAC */ 0x982F,0x5B66,
-	/* Array index: 0x1FAC */ 0x9832,0x5B67,
-	/* Array index: 0x1FAC */ 0x9835,0x5B65,
-	/* Array index: 0x1FAC */ 0x9857,0x6775,
-	/* Array index: 0x1FAC */ 0x9859,0x6773,
-	/* Array index: 0x1FAC */ 0x9869,0x6E43,
-	/* Array index: 0x1FAC */ 0x986A,0x6E42,
-	/* Array index: 0x1FAC */ 0x98A9,0x4152,
-	/* Array index: 0x1FAC */ 0x98B2,0x5567,
-	/* Array index: 0x1FAC */ 0x98B8,0x6455,
-	/* Array index: 0x1FAC */ 0x98C6,0x6C62,
-	/* Array index: 0x1FAC */ 0x98C9,0x6C61,
-	/* Array index: 0x1FAC */ 0x98CB,0x6E44,
-	/* Array index: 0x1FAC */ 0x98CC,0x717E,
-	/* Array index: 0x1FAC */ 0x98E3,0x334B,
-	/* Array index: 0x1FAC */ 0x98E5,0x3A33,
-	/* Array index: 0x1FAC */ 0x98EB,0x4153,
-	/* Array index: 0x1FAC */ 0x98F6,0x4868,
-	/* Array index: 0x1FAC */ 0x98F9,0x4869,
-	/* Array index: 0x1FAC */ 0x98FA,0x5569,
-	/* Array index: 0x1FAC */ 0x9900,0x4F37,
-	/* Array index: 0x1FAC */ 0x9902,0x4F36,
-	/* Array index: 0x1FAC */ 0x9907,0x4F38,
-	/* Array index: 0x1FAC */ 0x9908,0x5568,
-	/* Array index: 0x1FAC */ 0x9911,0x556A,
-	/* Array index: 0x1FAC */ 0x991F,0x5B69,
-	/* Array index: 0x1FAC */ 0x9924,0x5B68,
-	/* Array index: 0x1FAC */ 0x9925,0x6057,
-	/* Array index: 0x1FAC */ 0x993A,0x6458,
-	/* Array index: 0x1FAC */ 0x993C,0x6457,
-	/* Array index: 0x1FAC */ 0x9941,0x6456,
-	/* Array index: 0x1FAC */ 0x9943,0x677C,
-	/* Array index: 0x1FAC */ 0x9947,0x677B,
-	/* Array index: 0x1FAC */ 0x9948,0x677A,
-	/* Array index: 0x1FAC */ 0x994B,0x6A66,
-	/* Array index: 0x1FAC */ 0x994C,0x6A65,
-	/* Array index: 0x1FAC */ 0x994E,0x6A63,
-	/* Array index: 0x1FAC */ 0x9950,0x6A62,
-	/* Array index: 0x1FAC */ 0x9953,0x6A67,
-	/* Array index: 0x1FAC */ 0x9954,0x6E45,
-	/* Array index: 0x1FAC */ 0x9956,0x6C65,
-	/* Array index: 0x1FAC */ 0x9958,0x6C64,
-	/* Array index: 0x1FAC */ 0x9959,0x6A64,
-	/* Array index: 0x1FAC */ 0x995B,0x6E46,
-	/* Array index: 0x1FAC */ 0x995F,0x7148,
-	/* Array index: 0x1FAC */ 0x9961,0x7221,
-	/* Array index: 0x1FAC */ 0x9997,0x3A34,
-	/* Array index: 0x1FAC */ 0x9998,0x6061,
-	/* Array index: 0x1FAC */ 0x99A1,0x6063,
-	/* Array index: 0x1FAC */ 0x99A3,0x6062,
-	/* Array index: 0x1FAC */ 0x99A6,0x677D,
-	/* Array index: 0x1FAC */ 0x99A7,0x677E,
-	/* Array index: 0x1FAC */ 0x99AB,0x7222,
-	/* Array index: 0x1FAC */ 0x99AF,0x486A,
-	/* Array index: 0x1FAC */ 0x99B0,0x486C,
-	/* Array index: 0x1FAC */ 0x99B2,0x486B,
-	/* Array index: 0x1FAC */ 0x99B5,0x486D,
-	/* Array index: 0x1FAC */ 0x99C2,0x4F3F,
-	/* Array index: 0x1FAC */ 0x99C3,0x4F3B,
-	/* Array index: 0x1FAC */ 0x99C7,0x4F41,
-	/* Array index: 0x1FAC */ 0x99DC,0x556F,
-	/* Array index: 0x1FAC */ 0x9A3D,0x6C67,
-	/* Array index: 0x1FAC */ 0x9A3F,0x6C6D,
-	/* Array index: 0x1FAC */ 0x9A41,0x6C6B,
-	/* Array index: 0x1FAC */ 0x9A42,0x6C6A,
-	/* Array index: 0x1FAC */ 0x9A44,0x6C69,
-	/* Array index: 0x1FAC */ 0x9A59,0x6F61,
-	/* Array index: 0x1FAC */ 0x9A5E,0x7061,
-	/* Array index: 0x1FAC */ 0x9A60,0x7165,
-	/* Array index: 0x1FAC */ 0x9AAB,0x486F,
-	/* Array index: 0x1FAC */ 0x9AAD,0x486E,
-	/* Array index: 0x1FAC */ 0x9AB1,0x4F42,
-	/* Array index: 0x1FAC */ 0x9AB3,0x557B,
-	/* Array index: 0x1FAC */ 0x9AB4,0x5B78,
-	/* Array index: 0x1FAC */ 0x9AB9,0x5B76,
-	/* Array index: 0x1FAC */ 0x9ABB,0x5B79,
-	/* Array index: 0x1FAC */ 0x9AC6,0x6A74,
-	/* Array index: 0x1FAC */ 0x9AC7,0x6A72,
-	/* Array index: 0x1FAC */ 0x9ACA,0x6A73,
-	/* Array index: 0x1FAC */ 0x9ACD,0x6C6E,
-	/* Array index: 0x1FAC */ 0x9AD0,0x6E51,
-	/* Array index: 0x1FAC */ 0x9AD5,0x7062,
-	/* Array index: 0x1FAC */ 0x9ADC,0x6464,
-	/* Array index: 0x1FAC */ 0x9ADF,0x334C,
-	/* Array index: 0x1FAC */ 0x9AE3,0x4F43,
-	/* Array index: 0x1FAC */ 0x9AE7,0x4F44,
-	/* Array index: 0x1FAC */ 0x9AEB,0x557D,
-	/* Array index: 0x1FAC */ 0x9AEC,0x557C,
-	/* Array index: 0x1FAC */ 0x9B01,0x6073,
-	/* Array index: 0x1FAC */ 0x9B04,0x6466,
-	/* Array index: 0x1FAC */ 0x9B05,0x6467,
-	/* Array index: 0x1FAC */ 0x9B24,0x7226,
-	/* Array index: 0x1FAC */ 0x9B29,0x6468,
-	/* Array index: 0x1FAC */ 0x9B2B,0x6E53,
-	/* Array index: 0x1FAC */ 0x9B2E,0x7166,
-	/* Array index: 0x1FAC */ 0x9B2F,0x334D,
-	/* Array index: 0x1FAC */ 0x9B33,0x5B7E,
-	/* Array index: 0x1FAC */ 0x9B35,0x6469,
-	/* Array index: 0x1FAC */ 0x9B37,0x6833,
-	/* Array index: 0x1FAC */ 0x9B3A,0x6C73,
-	/* Array index: 0x1FAC */ 0x9B3B,0x6E54,
-	/* Array index: 0x1FAC */ 0x9B3E,0x4F45,
-	/* Array index: 0x1FAC */ 0x9B3F,0x4F46,
-	/* Array index: 0x1FAC */ 0x9B43,0x5624,
-	/* Array index: 0x1FAC */ 0x9B46,0x5623,
-	/* Array index: 0x1FAC */ 0x9B52,0x6C74,
-	/* Array index: 0x1FAC */ 0x9B55,0x6E56,
-	/* Array index: 0x1FAC */ 0x9B56,0x6E55,
-	/* Array index: 0x1FAC */ 0x9B59,0x7063,
-	/* Array index: 0x1FAC */ 0x9B5B,0x4870,
-	/* Array index: 0x1FAC */ 0x9B6C,0x562E,
-	/* Array index: 0x1FAC */ 0x9B90,0x5C2A,
-	/* Array index: 0x1FAC */ 0x9B92,0x5C29,
-	/* Array index: 0x1FAC */ 0x9B93,0x5C28,
-	/* Array index: 0x1FAC */ 0x9B95,0x5C2C,
-	/* Array index: 0x1FAC */ 0x9B9A,0x6076,
-	/* Array index: 0x1FAC */ 0x9B9B,0x6079,
-	/* Array index: 0x1FAC */ 0x9BAF,0x6123,
-	/* Array index: 0x1FAC */ 0x9BBD,0x6478,
-	/* Array index: 0x1FAC */ 0x9BBF,0x6470,
-	/* Array index: 0x1FAC */ 0x9BC1,0x6471,
-	/* Array index: 0x1FAC */ 0x9BF0,0x683B,
-	/* Array index: 0x1FAC */ 0x9BF7,0x6A7A,
-	/* Array index: 0x1FAC */ 0x9BF8,0x6A7D,
-	/* Array index: 0x1FAC */ 0x9C0E,0x6B22,
-	/* Array index: 0x1FAC */ 0x9C12,0x6A7C,
-	/* Array index: 0x1FAC */ 0x9C14,0x6B25,
-	/* Array index: 0x1FAC */ 0x9C17,0x6B24,
-	/* Array index: 0x1FAC */ 0x9C1C,0x6C77,
-	/* Array index: 0x1FAC */ 0x9C1D,0x6C76,
-	/* Array index: 0x1FAC */ 0x9C21,0x6C7D,
-	/* Array index: 0x1FAC */ 0x9C23,0x6C79,
-	/* Array index: 0x1FAC */ 0x9C24,0x6C7C,
-	/* Array index: 0x1FAC */ 0x9C44,0x6E5A,
-	/* Array index: 0x1FAC */ 0x9C46,0x6E57,
-	/* Array index: 0x1FAC */ 0x9C55,0x6F6B,
-	/* Array index: 0x1FAC */ 0x9C58,0x6F66,
-	/* Array index: 0x1FAC */ 0x9C59,0x6F6C,
-	/* Array index: 0x1FAC */ 0x9C5E,0x7068,
-	/* Array index: 0x1FAC */ 0x9C60,0x7069,
-	/* Array index: 0x1FAC */ 0x9C6D,0x714B,
-	/* Array index: 0x1FAC */ 0x9C6E,0x714A,
-	/* Array index: 0x1FAC */ 0x9C79,0x7238,
-	/* Array index: 0x1FAC */ 0x9C7A,0x723C,
-	/* Array index: 0x1FAC */ 0x9CE6,0x4154,
-	/* Array index: 0x1FAC */ 0x9CE7,0x4873,
-	/* Array index: 0x1FAC */ 0x9CEA,0x4871,
-	/* Array index: 0x1FAC */ 0x9CED,0x4872,
-	/* Array index: 0x1FAC */ 0x9CF1,0x4F4A,
-	/* Array index: 0x1FAC */ 0x9CF2,0x4F4B,
-	/* Array index: 0x1FAC */ 0x9CF5,0x4F4C,
-	/* Array index: 0x1FAC */ 0x9D10,0x5C38,
-	/* Array index: 0x1FAC */ 0x9D14,0x5C33,
-	/* Array index: 0x1FAC */ 0x9D25,0x5C2F,
-	/* Array index: 0x1FAC */ 0x9D29,0x5C34,
-	/* Array index: 0x1FAC */ 0x9D4F,0x647B,
-	/* Array index: 0x1FAC */ 0x9D5F,0x6527,
-	/* Array index: 0x1FAC */ 0x9D90,0x6B2D,
-	/* Array index: 0x1FAC */ 0x9D92,0x6B2B,
-	/* Array index: 0x1FAC */ 0x9E1D,0x723D,
-	/* Array index: 0x1FAC */ 0x9E7A,0x6D37,
-	/* Array index: 0x1FAC */ 0x9E80,0x4874,
-	/* Array index: 0x1FAC */ 0x9E83,0x563B,
-	/* Array index: 0x1FAC */ 0x9E91,0x6860,
-	/* Array index: 0x1FAC */ 0x9E94,0x685F,
-	/* Array index: 0x1FAC */ 0x9EA0,0x7076,
-	/* Array index: 0x1FAC */ 0x9EA1,0x7152,
-	/* Array index: 0x1FAC */ 0x9EA4,0x7241,
-	/* Array index: 0x1FAC */ 0x9EA7,0x4F4D,
-	/* Array index: 0x1FAC */ 0x9EAD,0x5C3F,
-	/* Array index: 0x1FAC */ 0x9EAE,0x5C3E,
-	/* Array index: 0x1FAC */ 0x9EB0,0x6139,
-	/* Array index: 0x1FAC */ 0x9EB6,0x6E74,
-	/* Array index: 0x1FAC */ 0x9EB7,0x7239,
-	/* Array index: 0x1FAC */ 0x9EC0,0x6861,
-	/* Array index: 0x1FAC */ 0x9EC2,0x7024,
-	/* Array index: 0x1FAC */ 0x9EC8,0x613A,
-	/* Array index: 0x1FAC */ 0x9ED0,0x7025,
-	/* Array index: 0x1FAC */ 0x9ED3,0x563C,
-	/* Array index: 0x1FAC */ 0x9ED5,0x5C40,
-	/* Array index: 0x1FAC */ 0x9ED6,0x5C41,
-	/* Array index: 0x1FAC */ 0x9EDA,0x613B,
-	/* Array index: 0x1FAC */ 0x9EDF,0x652C,
-	/* Array index: 0x1FAC */ 0x9EEB,0x6D39,
-	/* Array index: 0x1FAC */ 0x9EED,0x6D3B,
-	/* Array index: 0x1FAC */ 0x9EEE,0x6D3A,
-	/* Array index: 0x1FAC */ 0x9EF0,0x6E75,
-	/* Array index: 0x1FAC */ 0x9F06,0x7028,
-	/* Array index: 0x1FAC */ 0x9F09,0x7154,
-	/* Array index: 0x1FAC */ 0x9F0A,0x716E,
-	/* Array index: 0x1FAC */ 0x9F0F,0x563D,
-	/* Array index: 0x1FAC */ 0x9F10,0x563E,
-	/* Array index: 0x1FAC */ 0x9F12,0x5C43,
-	/* Array index: 0x1FAC */ 0x9F16,0x652F,
-	/* Array index: 0x1FAC */ 0x9F3D,0x5C44,
-	/* Array index: 0x1FAC */ 0x9F64,0x6D42,
-	/* Array index: 0x1FAC */ 0x9F65,0x6D41,
-	/* Array index: 0x1FAC */ 0x9F6B,0x6E7A,
-	/* Array index: 0x1FAC */ 0x9F7E,0x7242,
-	/* Array index: 0x1FAC */ 0x9F91,0x6B4D,
-	/* Array index: 0x1FAC */ 0x9F92,0x6D43,
-	/* Array index: 0x1FAC */ 0x9F95,0x6E7B,
-	/* Array index: 0x1FAC */ 0x9F98,0x7244,
-	/* Array index: 0x1FAC */ 0x9FA0,0x6142,
-	/* Array index: 0x1FAC */ 0x9FA2,0x6E7C,
-	/* Array index: 0x1FAC */ 0x9FA4,0x716F,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_CNS11643_PLANE2 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * cns11643_plane2 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_cns11643_plane2 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_CNS11643_PLANE2, /* CCS name */
-	TABLE_16BIT, /* Table bits */
-#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&from_ucs_size_cns11643_plane2, /* UCS -> cns11643_plane2 table size-optimized table */
-#elif defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&from_ucs_speed_cns11643_plane2, /* UCS -> cns11643_plane2 table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&to_ucs_size_cns11643_plane2 /* cns11643_plane2 -> UCS table speed-optimized table */
-#elif defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&to_ucs_speed_cns11643_plane2 /* cns11643_plane2 -> UCS table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_CNS11643_PLANE2) || ... */
-
diff --git a/newlib/libc/iconv/ccs/cp775.c b/newlib/libc/iconv/ccs/cp775.c
deleted file mode 100644
index c35a87c..0000000
--- a/newlib/libc/iconv/ccs/cp775.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for cp775 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_CP775) \
- || defined (ICONV_FROM_UCS_CCS_CP775)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit cp775 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_CP775)
-
-static _CONST __uint16_t
-to_ucs_speed_cp775[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0106,0x00FC,0x00E9,0x0101,0x00E4,0x0123,0x00E5,0x0107,
-	0x0142,0x0113,0x0156,0x0157,0x012B,0x0179,0x00C4,0x00C5,
-	0x00C9,0x00E6,0x00C6,0x014D,0x00F6,0x0122,0x00A2,0x015A,
-	0x015B,0x00D6,0x00DC,0x00F8,0x00A3,0x00D8,0x00D7,0x00A4,
-	0x0100,0x012A,0x00F3,0x017B,0x017C,0x017A,0x201D,0x00A6,
-	0x00A9,0x00AE,0x00AC,0x00BD,0x00BC,0x0141,0x00AB,0x00BB,
-	0x2591,0x2592,0x2593,0x2502,0x2524,0x0104,0x010C,0x0118,
-	0x0116,0x2563,0x2551,0x2557,0x255D,0x012E,0x0160,0x2510,
-	0x2514,0x2534,0x252C,0x251C,0x2500,0x253C,0x0172,0x016A,
-	0x255A,0x2554,0x2569,0x2566,0x2560,0x2550,0x256C,0x017D,
-	0x0105,0x010D,0x0119,0x0117,0x012F,0x0161,0x0173,0x016B,
-	0x017E,0x2518,0x250C,0x2588,0x2584,0x258C,0x2590,0x2580,
-	0x00D3,0x00DF,0x014C,0x0143,0x00F5,0x00D5,0x00B5,0x0144,
-	0x0136,0x0137,0x013B,0x013C,0x0146,0x0112,0x0145,0x2019,
-	0x00AD,0x00B1,0x201C,0x00BE,0x00B6,0x00A7,0x00F7,0x201E,
-	0x00B0,0x2219,0x00B7,0x00B9,0x00B3,0x00B2,0x25A0,0x00A0,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_CP775 */
-
-/*
- * 8-bit UCS -> cp775 speed-optimized table (1794 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_CP775)
-
-static _CONST unsigned char
-from_ucs_speed_cp775[] =
-{
-	W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0402),W(INVBLK),W(0x0502),W(INVBLK),
-	W(INVBLK),W(0x0602),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x96,0x9C,0x9F,0xFF,0xA7,0xF5,
-	0xFF,0xA8,0xFF,0xAE,0xAA,0xF0,0xA9,0xFF,
-	0xF8,0xF1,0xFD,0xFC,0xFF,0xE6,0xF4,0xFA,
-	0xFF,0xFB,0xFF,0xAF,0xAC,0xAB,0xF3,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x8E,0x8F,0x92,0xFF,
-	0xFF,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xE0,0xFF,0xE5,0x99,0x9E,
-	0x9D,0xFF,0xFF,0xFF,0x9A,0xFF,0xFF,0xE1,
-	0xFF,0xFF,0xFF,0xFF,0x84,0x86,0x91,0xFF,
-	0xFF,0x82,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xA2,0xFF,0xE4,0x94,0xF6,
-	0x9B,0xFF,0xFF,0xFF,0x81,0xFF,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xA0,0x83,0xFF,0xFF,0xB5,0xD0,0x80,0x87,
-	0xFF,0xFF,0xFF,0xFF,0xB6,0xD1,0xFF,0xFF,
-	0xFF,0xFF,0xED,0x89,0xFF,0xFF,0xB8,0xD3,
-	0xB7,0xD2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x95,0x85,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xA1,0x8C,0xFF,0xFF,0xBD,0xD4,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xE8,0xE9,
-	0xFF,0xFF,0xFF,0xEA,0xEB,0xFF,0xFF,0xFF,
-	0xFF,0xAD,0x88,0xE3,0xE7,0xEE,0xEC,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xE2,0x93,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8A,0x8B,
-	0xFF,0xFF,0x97,0x98,0xFF,0xFF,0xFF,0xFF,
-	0xBE,0xD5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xC7,0xD7,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xC6,0xD6,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8D,0xA5,0xA3,0xA4,0xCF,0xD8,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xEF,0xFF,0xFF,0xF2,0xA6,0xF7,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 35, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xF9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 38, Array index 0x0602 */
-	0xC4,0xFF,0xB3,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xDA,0xFF,0xFF,0xFF,
-	0xBF,0xFF,0xFF,0xFF,0xC0,0xFF,0xFF,0xFF,
-	0xD9,0xFF,0xFF,0xFF,0xC3,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xB4,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC2,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC1,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC5,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xCD,0xBA,0xFF,0xFF,0xC9,0xFF,0xFF,0xBB,
-	0xFF,0xFF,0xC8,0xFF,0xFF,0xBC,0xFF,0xFF,
-	0xCC,0xFF,0xFF,0xB9,0xFF,0xFF,0xCB,0xFF,
-	0xFF,0xCA,0xFF,0xFF,0xCE,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xDF,0xFF,0xFF,0xFF,0xDC,0xFF,0xFF,0xFF,
-	0xDB,0xFF,0xFF,0xFF,0xDD,0xFF,0xFF,0xFF,
-	0xDE,0xB0,0xB1,0xB2,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_CP775 */
-
-/*
- * cp775 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_cp775 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_CP775, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_CP775)
-	(__uint16_t *)&from_ucs_speed_cp775, /* UCS -> cp775 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_CP775)
-	(__uint16_t *)&to_ucs_speed_cp775 /* cp775 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_CP775) || ... */
-
diff --git a/newlib/libc/iconv/ccs/cp850.c b/newlib/libc/iconv/ccs/cp850.c
deleted file mode 100644
index 305ae85..0000000
--- a/newlib/libc/iconv/ccs/cp850.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for cp850 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_CP850) \
- || defined (ICONV_FROM_UCS_CCS_CP850)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit cp850 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_CP850)
-
-static _CONST __uint16_t
-to_ucs_speed_cp850[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x00C7,0x00FC,0x00E9,0x00E2,0x00E4,0x00E0,0x00E5,0x00E7,
-	0x00EA,0x00EB,0x00E8,0x00EF,0x00EE,0x00EC,0x00C4,0x00C5,
-	0x00C9,0x00E6,0x00C6,0x00F4,0x00F6,0x00F2,0x00FB,0x00F9,
-	0x00FF,0x00D6,0x00DC,0x00F8,0x00A3,0x00D8,0x00D7,0x0192,
-	0x00E1,0x00ED,0x00F3,0x00FA,0x00F1,0x00D1,0x00AA,0x00BA,
-	0x00BF,0x00AE,0x00AC,0x00BD,0x00BC,0x00A1,0x00AB,0x00BB,
-	0x2591,0x2592,0x2593,0x2502,0x2524,0x00C1,0x00C2,0x00C0,
-	0x00A9,0x2563,0x2551,0x2557,0x255D,0x00A2,0x00A5,0x2510,
-	0x2514,0x2534,0x252C,0x251C,0x2500,0x253C,0x00E3,0x00C3,
-	0x255A,0x2554,0x2569,0x2566,0x2560,0x2550,0x256C,0x00A4,
-	0x00F0,0x00D0,0x00CA,0x00CB,0x00C8,0x0131,0x00CD,0x00CE,
-	0x00CF,0x2518,0x250C,0x2588,0x2584,0x00A6,0x00CC,0x2580,
-	0x00D3,0x00DF,0x00D4,0x00D2,0x00F5,0x00D5,0x00B5,0x00FE,
-	0x00DE,0x00DA,0x00DB,0x00D9,0x00FD,0x00DD,0x00AF,0x00B4,
-	0x00AD,0x00B1,0x2017,0x00BE,0x00B6,0x00A7,0x00F7,0x00B8,
-	0x00B0,0x00A8,0x00B7,0x00B9,0x00B3,0x00B2,0x25A0,0x00A0,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_CP850 */
-
-/*
- * 8-bit UCS -> cp850 speed-optimized table (1538 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_CP850)
-
-static _CONST unsigned char
-from_ucs_speed_cp850[] =
-{
-	W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0402),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(0x0502),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xAD,0xBD,0x9C,0xCF,0xBE,0xDD,0xF5,
-	0xF9,0xB8,0xA6,0xAE,0xAA,0xF0,0xA9,0xEE,
-	0xF8,0xF1,0xFD,0xFC,0xEF,0xE6,0xF4,0xFA,
-	0xF7,0xFB,0xA7,0xAF,0xAC,0xAB,0xF3,0xA8,
-	0xB7,0xB5,0xB6,0xC7,0x8E,0x8F,0x92,0x80,
-	0xD4,0x90,0xD2,0xD3,0xDE,0xD6,0xD7,0xD8,
-	0xD1,0xA5,0xE3,0xE0,0xE2,0xE5,0x99,0x9E,
-	0x9D,0xEB,0xE9,0xEA,0x9A,0xED,0xE8,0xE1,
-	0x85,0xA0,0x83,0xC6,0x84,0x86,0x91,0x87,
-	0x8A,0x82,0x88,0x89,0x8D,0xA1,0x8C,0x8B,
-	0xD0,0xA4,0x95,0xA2,0x93,0xE4,0x94,0xF6,
-	0x9B,0x97,0xA3,0x96,0x81,0xEC,0xE7,0x98,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xD5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x9F,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF2,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 38, Array index 0x0502 */
-	0xC4,0xFF,0xB3,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xDA,0xFF,0xFF,0xFF,
-	0xBF,0xFF,0xFF,0xFF,0xC0,0xFF,0xFF,0xFF,
-	0xD9,0xFF,0xFF,0xFF,0xC3,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xB4,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC2,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC1,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC5,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xCD,0xBA,0xFF,0xFF,0xC9,0xFF,0xFF,0xBB,
-	0xFF,0xFF,0xC8,0xFF,0xFF,0xBC,0xFF,0xFF,
-	0xCC,0xFF,0xFF,0xB9,0xFF,0xFF,0xCB,0xFF,
-	0xFF,0xCA,0xFF,0xFF,0xCE,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xDF,0xFF,0xFF,0xFF,0xDC,0xFF,0xFF,0xFF,
-	0xDB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xB0,0xB1,0xB2,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_CP850 */
-
-/*
- * cp850 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_cp850 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_CP850, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_CP850)
-	(__uint16_t *)&from_ucs_speed_cp850, /* UCS -> cp850 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_CP850)
-	(__uint16_t *)&to_ucs_speed_cp850 /* cp850 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_CP850) || ... */
-
diff --git a/newlib/libc/iconv/ccs/cp852.c b/newlib/libc/iconv/ccs/cp852.c
deleted file mode 100644
index 73a1e0f..0000000
--- a/newlib/libc/iconv/ccs/cp852.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for cp852 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_CP852) \
- || defined (ICONV_FROM_UCS_CCS_CP852)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit cp852 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_CP852)
-
-static _CONST __uint16_t
-to_ucs_speed_cp852[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x00C7,0x00FC,0x00E9,0x00E2,0x00E4,0x016F,0x0107,0x00E7,
-	0x0142,0x00EB,0x0150,0x0151,0x00EE,0x0179,0x00C4,0x0106,
-	0x00C9,0x0139,0x013A,0x00F4,0x00F6,0x013D,0x013E,0x015A,
-	0x015B,0x00D6,0x00DC,0x0164,0x0165,0x0141,0x00D7,0x010D,
-	0x00E1,0x00ED,0x00F3,0x00FA,0x0104,0x0105,0x017D,0x017E,
-	0x0118,0x0119,0x00AC,0x017A,0x010C,0x015F,0x00AB,0x00BB,
-	0x2591,0x2592,0x2593,0x2502,0x2524,0x00C1,0x00C2,0x011A,
-	0x015E,0x2563,0x2551,0x2557,0x255D,0x017B,0x017C,0x2510,
-	0x2514,0x2534,0x252C,0x251C,0x2500,0x253C,0x0102,0x0103,
-	0x255A,0x2554,0x2569,0x2566,0x2560,0x2550,0x256C,0x00A4,
-	0x0111,0x0110,0x010E,0x00CB,0x010F,0x0147,0x00CD,0x00CE,
-	0x011B,0x2518,0x250C,0x2588,0x2584,0x0162,0x016E,0x2580,
-	0x00D3,0x00DF,0x00D4,0x0143,0x0144,0x0148,0x0160,0x0161,
-	0x0154,0x00DA,0x0155,0x0170,0x00FD,0x00DD,0x0163,0x00B4,
-	0x00AD,0x02DD,0x02DB,0x02C7,0x02D8,0x00A7,0x00F7,0x00B8,
-	0x00B0,0x00A8,0x02D9,0x0171,0x0158,0x0159,0x25A0,0x00A0,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_CP852 */
-
-/*
- * 8-bit UCS -> cp852 speed-optimized table (1538 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_CP852)
-
-static _CONST unsigned char
-from_ucs_speed_cp852[] =
-{
-	W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(0x0402),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(0x0502),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xCF,0xFF,0xFF,0xF5,
-	0xF9,0xFF,0xFF,0xAE,0xAA,0xF0,0xFF,0xFF,
-	0xF8,0xFF,0xFF,0xFF,0xEF,0xFF,0xFF,0xFF,
-	0xF7,0xFF,0xFF,0xAF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xB5,0xB6,0xFF,0x8E,0xFF,0xFF,0x80,
-	0xFF,0x90,0xFF,0xD3,0xFF,0xD6,0xD7,0xFF,
-	0xFF,0xFF,0xFF,0xE0,0xE2,0xFF,0x99,0x9E,
-	0xFF,0xFF,0xE9,0xFF,0x9A,0xED,0xFF,0xE1,
-	0xFF,0xA0,0x83,0xFF,0x84,0xFF,0xFF,0x87,
-	0xFF,0x82,0xFF,0x89,0xFF,0xA1,0x8C,0xFF,
-	0xFF,0xFF,0xFF,0xA2,0x93,0xFF,0x94,0xF6,
-	0xFF,0xFF,0xA3,0xFF,0x81,0xEC,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xC6,0xC7,0xA4,0xA5,0x8F,0x86,
-	0xFF,0xFF,0xFF,0xFF,0xAC,0x9F,0xD2,0xD4,
-	0xD1,0xD0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA8,0xA9,0xB7,0xD8,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x91,0x92,0xFF,0xFF,0x95,0x96,0xFF,
-	0xFF,0x9D,0x88,0xE3,0xE4,0xFF,0xFF,0xD5,
-	0xE5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x8A,0x8B,0xFF,0xFF,0xE8,0xEA,0xFF,0xFF,
-	0xFC,0xFD,0x97,0x98,0xFF,0xFF,0xB8,0xAD,
-	0xE6,0xE7,0xDD,0xEE,0x9B,0x9C,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDE,0x85,
-	0xEB,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8D,0xAB,0xBD,0xBE,0xA6,0xA7,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 3, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF3,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xF4,0xFA,0xFF,0xF2,0xFF,0xF1,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 38, Array index 0x0502 */
-	0xC4,0xFF,0xB3,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xDA,0xFF,0xFF,0xFF,
-	0xBF,0xFF,0xFF,0xFF,0xC0,0xFF,0xFF,0xFF,
-	0xD9,0xFF,0xFF,0xFF,0xC3,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xB4,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC2,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC1,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC5,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xCD,0xBA,0xFF,0xFF,0xC9,0xFF,0xFF,0xBB,
-	0xFF,0xFF,0xC8,0xFF,0xFF,0xBC,0xFF,0xFF,
-	0xCC,0xFF,0xFF,0xB9,0xFF,0xFF,0xCB,0xFF,
-	0xFF,0xCA,0xFF,0xFF,0xCE,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xDF,0xFF,0xFF,0xFF,0xDC,0xFF,0xFF,0xFF,
-	0xDB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xB0,0xB1,0xB2,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_CP852 */
-
-/*
- * cp852 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_cp852 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_CP852, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_CP852)
-	(__uint16_t *)&from_ucs_speed_cp852, /* UCS -> cp852 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_CP852)
-	(__uint16_t *)&to_ucs_speed_cp852 /* cp852 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_CP852) || ... */
-
diff --git a/newlib/libc/iconv/ccs/cp855.c b/newlib/libc/iconv/ccs/cp855.c
deleted file mode 100644
index 2add727..0000000
--- a/newlib/libc/iconv/ccs/cp855.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for cp855 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_CP855) \
- || defined (ICONV_FROM_UCS_CCS_CP855)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit cp855 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_CP855)
-
-static _CONST __uint16_t
-to_ucs_speed_cp855[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0452,0x0402,0x0453,0x0403,0x0451,0x0401,0x0454,0x0404,
-	0x0455,0x0405,0x0456,0x0406,0x0457,0x0407,0x0458,0x0408,
-	0x0459,0x0409,0x045A,0x040A,0x045B,0x040B,0x045C,0x040C,
-	0x045E,0x040E,0x045F,0x040F,0x044E,0x042E,0x044A,0x042A,
-	0x0430,0x0410,0x0431,0x0411,0x0446,0x0426,0x0434,0x0414,
-	0x0435,0x0415,0x0444,0x0424,0x0433,0x0413,0x00AB,0x00BB,
-	0x2591,0x2592,0x2593,0x2502,0x2524,0x0445,0x0425,0x0438,
-	0x0418,0x2563,0x2551,0x2557,0x255D,0x0439,0x0419,0x2510,
-	0x2514,0x2534,0x252C,0x251C,0x2500,0x253C,0x043A,0x041A,
-	0x255A,0x2554,0x2569,0x2566,0x2560,0x2550,0x256C,0x00A4,
-	0x043B,0x041B,0x043C,0x041C,0x043D,0x041D,0x043E,0x041E,
-	0x043F,0x2518,0x250C,0x2588,0x2584,0x041F,0x044F,0x2580,
-	0x042F,0x0440,0x0420,0x0441,0x0421,0x0442,0x0422,0x0443,
-	0x0423,0x0436,0x0416,0x0432,0x0412,0x044C,0x042C,0x2116,
-	0x00AD,0x044B,0x042B,0x0437,0x0417,0x0448,0x0428,0x044D,
-	0x042D,0x0449,0x0429,0x0447,0x0427,0x00A7,0x25A0,0x00A0,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_CP855 */
-
-/*
- * 8-bit UCS -> cp855 speed-optimized table (1538 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_CP855)
-
-static _CONST unsigned char
-from_ucs_speed_cp855[] =
-{
-	W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0302),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(0x0402),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(0x0502),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xCF,0xFF,0xFF,0xFD,
-	0xFF,0xFF,0xFF,0xAE,0xFF,0xF0,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xAF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 5, Array index 0x0302 */
-	0xFF,0x85,0x81,0x83,0x87,0x89,0x8B,0x8D,
-	0x8F,0x91,0x93,0x95,0x97,0xFF,0x99,0x9B,
-	0xA1,0xA3,0xEC,0xAD,0xA7,0xA9,0xEA,0xF4,
-	0xB8,0xBE,0xC7,0xD1,0xD3,0xD5,0xD7,0xDD,
-	0xE2,0xE4,0xE6,0xE8,0xAB,0xB6,0xA5,0xFC,
-	0xF6,0xFA,0x9F,0xF2,0xEE,0xF8,0x9D,0xE0,
-	0xA0,0xA2,0xEB,0xAC,0xA6,0xA8,0xE9,0xF3,
-	0xB7,0xBD,0xC6,0xD0,0xD2,0xD4,0xD6,0xD8,
-	0xE1,0xE3,0xE5,0xE7,0xAA,0xB5,0xA4,0xFB,
-	0xF5,0xF9,0x9E,0xF1,0xED,0xF7,0x9C,0xDE,
-	0xFF,0x84,0x80,0x82,0x86,0x88,0x8A,0x8C,
-	0x8E,0x90,0x92,0x94,0x96,0xFF,0x98,0x9A,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 38, Array index 0x0502 */
-	0xC4,0xFF,0xB3,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xDA,0xFF,0xFF,0xFF,
-	0xBF,0xFF,0xFF,0xFF,0xC0,0xFF,0xFF,0xFF,
-	0xD9,0xFF,0xFF,0xFF,0xC3,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xB4,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC2,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC1,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC5,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xCD,0xBA,0xFF,0xFF,0xC9,0xFF,0xFF,0xBB,
-	0xFF,0xFF,0xC8,0xFF,0xFF,0xBC,0xFF,0xFF,
-	0xCC,0xFF,0xFF,0xB9,0xFF,0xFF,0xCB,0xFF,
-	0xFF,0xCA,0xFF,0xFF,0xCE,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xDF,0xFF,0xFF,0xFF,0xDC,0xFF,0xFF,0xFF,
-	0xDB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xB0,0xB1,0xB2,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_CP855 */
-
-/*
- * cp855 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_cp855 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_CP855, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_CP855)
-	(__uint16_t *)&from_ucs_speed_cp855, /* UCS -> cp855 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_CP855)
-	(__uint16_t *)&to_ucs_speed_cp855 /* cp855 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_CP855) || ... */
-
diff --git a/newlib/libc/iconv/ccs/cp866.c b/newlib/libc/iconv/ccs/cp866.c
deleted file mode 100644
index 678ea42..0000000
--- a/newlib/libc/iconv/ccs/cp866.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for cp866 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_CP866) \
- || defined (ICONV_FROM_UCS_CCS_CP866)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit cp866 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_CP866)
-
-static _CONST __uint16_t
-to_ucs_speed_cp866[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417,
-	0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,0x041F,
-	0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427,
-	0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,
-	0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437,
-	0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,
-	0x2591,0x2592,0x2593,0x2502,0x2524,0x2561,0x2562,0x2556,
-	0x2555,0x2563,0x2551,0x2557,0x255D,0x255C,0x255B,0x2510,
-	0x2514,0x2534,0x252C,0x251C,0x2500,0x253C,0x255E,0x255F,
-	0x255A,0x2554,0x2569,0x2566,0x2560,0x2550,0x256C,0x2567,
-	0x2568,0x2564,0x2565,0x2559,0x2558,0x2552,0x2553,0x256B,
-	0x256A,0x2518,0x250C,0x2588,0x2584,0x258C,0x2590,0x2580,
-	0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,
-	0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F,
-	0x0401,0x0451,0x0404,0x0454,0x0407,0x0457,0x040E,0x045E,
-	0x00B0,0x2219,0x00B7,0x221A,0x2116,0x00A4,0x25A0,0x00A0,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_CP866 */
-
-/*
- * 8-bit UCS -> cp866 speed-optimized table (1794 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_CP866)
-
-static _CONST unsigned char
-from_ucs_speed_cp866[] =
-{
-	W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0302),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(0x0402),W(0x0502),W(INVBLK),
-	W(INVBLK),W(0x0602),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFD,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xF8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFA,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 5, Array index 0x0302 */
-	0xFF,0xF0,0xFF,0xFF,0xF2,0xFF,0xFF,0xF4,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF6,0xFF,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xFF,0xF1,0xFF,0xFF,0xF3,0xFF,0xFF,0xF5,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF7,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFC,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 35, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xF9,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 38, Array index 0x0602 */
-	0xC4,0xFF,0xB3,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xDA,0xFF,0xFF,0xFF,
-	0xBF,0xFF,0xFF,0xFF,0xC0,0xFF,0xFF,0xFF,
-	0xD9,0xFF,0xFF,0xFF,0xC3,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xB4,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC2,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC1,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC5,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xCD,0xBA,0xD5,0xD6,0xC9,0xB8,0xB7,0xBB,
-	0xD4,0xD3,0xC8,0xBE,0xBD,0xBC,0xC6,0xC7,
-	0xCC,0xB5,0xB6,0xB9,0xD1,0xD2,0xCB,0xCF,
-	0xD0,0xCA,0xD8,0xD7,0xCE,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xDF,0xFF,0xFF,0xFF,0xDC,0xFF,0xFF,0xFF,
-	0xDB,0xFF,0xFF,0xFF,0xDD,0xFF,0xFF,0xFF,
-	0xDE,0xB0,0xB1,0xB2,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFE,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_CP866 */
-
-/*
- * cp866 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_cp866 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_CP866, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_CP866)
-	(__uint16_t *)&from_ucs_speed_cp866, /* UCS -> cp866 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_CP866)
-	(__uint16_t *)&to_ucs_speed_cp866 /* cp866 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_CP866) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_1.c b/newlib/libc/iconv/ccs/iso_8859_1.c
deleted file mode 100644
index a239477..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_1.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_1 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_1) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_1)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_1 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_1)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_1[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x00A1,0x00A2,0x00A3,0x00A4,0x00A5,0x00A6,0x00A7,
-	0x00A8,0x00A9,0x00AA,0x00AB,0x00AC,0x00AD,0x00AE,0x00AF,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x00B4,0x00B5,0x00B6,0x00B7,
-	0x00B8,0x00B9,0x00BA,0x00BB,0x00BC,0x00BD,0x00BE,0x00BF,
-	0x00C0,0x00C1,0x00C2,0x00C3,0x00C4,0x00C5,0x00C6,0x00C7,
-	0x00C8,0x00C9,0x00CA,0x00CB,0x00CC,0x00CD,0x00CE,0x00CF,
-	0x00D0,0x00D1,0x00D2,0x00D3,0x00D4,0x00D5,0x00D6,0x00D7,
-	0x00D8,0x00D9,0x00DA,0x00DB,0x00DC,0x00DD,0x00DE,0x00DF,
-	0x00E0,0x00E1,0x00E2,0x00E3,0x00E4,0x00E5,0x00E6,0x00E7,
-	0x00E8,0x00E9,0x00EA,0x00EB,0x00EC,0x00ED,0x00EE,0x00EF,
-	0x00F0,0x00F1,0x00F2,0x00F3,0x00F4,0x00F5,0x00F6,0x00F7,
-	0x00F8,0x00F9,0x00FA,0x00FB,0x00FC,0x00FD,0x00FE,0x00FF,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_1 */
-
-/*
- * 8-bit UCS -> iso_8859_1 speed-optimized table (770 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_1)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_1[] =
-{
-	W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
-	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_1 */
-
-/*
- * iso_8859_1 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_1 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_1, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_1)
-	(__uint16_t *)&from_ucs_speed_iso_8859_1, /* UCS -> iso_8859_1 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_1)
-	(__uint16_t *)&to_ucs_speed_iso_8859_1 /* iso_8859_1 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_1) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_10.c b/newlib/libc/iconv/ccs/iso_8859_10.c
deleted file mode 100644
index 1848afd..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_10.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_10 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_10) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_10)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_10 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_10)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_10[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x0104,0x0112,0x0122,0x012A,0x0128,0x0136,0x00A7,
-	0x013B,0x0110,0x0160,0x0166,0x017D,0x00AD,0x016A,0x014A,
-	0x00B0,0x0105,0x0113,0x0123,0x012B,0x0129,0x0137,0x00B7,
-	0x013C,0x0111,0x0161,0x0167,0x017E,0x2015,0x016B,0x014B,
-	0x0100,0x00C1,0x00C2,0x00C3,0x00C4,0x00C5,0x00C6,0x012E,
-	0x010C,0x00C9,0x0118,0x00CB,0x0116,0x00CD,0x00CE,0x00CF,
-	0x00D0,0x0145,0x014C,0x00D3,0x00D4,0x00D5,0x00D6,0x0168,
-	0x00D8,0x0172,0x00DA,0x00DB,0x00DC,0x00DD,0x00DE,0x00DF,
-	0x0101,0x00E1,0x00E2,0x00E3,0x00E4,0x00E5,0x00E6,0x012F,
-	0x010D,0x00E9,0x0119,0x00EB,0x0117,0x00ED,0x00EE,0x00EF,
-	0x00F0,0x0146,0x014D,0x00F3,0x00F4,0x00F5,0x00F6,0x0169,
-	0x00F8,0x0173,0x00FA,0x00FB,0x00FC,0x00FD,0x00FE,0x0138,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_10 */
-
-/*
- * 8-bit UCS -> iso_8859_10 speed-optimized table (1282 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_10)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_10[] =
-{
-	W(0x0138), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0402),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA7,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xAD,0xFF,0xFF,
-	0xB0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB7,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xFF,
-	0xFF,0xC9,0xFF,0xCB,0xFF,0xCD,0xCE,0xCF,
-	0xD0,0xFF,0xFF,0xD3,0xD4,0xD5,0xD6,0xFF,
-	0xD8,0xFF,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
-	0xFF,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xFF,
-	0xFF,0xE9,0xFF,0xEB,0xFF,0xED,0xEE,0xEF,
-	0xF0,0xFF,0xFF,0xF3,0xF4,0xF5,0xF6,0xFF,
-	0xF8,0xFF,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xC0,0xE0,0xFF,0xFF,0xA1,0xB1,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC8,0xE8,0xFF,0xFF,
-	0xA9,0xB9,0xA2,0xB2,0xFF,0xFF,0xCC,0xEC,
-	0xCA,0xEA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xA3,0xB3,0xFF,0xFF,0xFF,0xFF,
-	0xA5,0xB5,0xA4,0xB4,0xFF,0xFF,0xC7,0xE7,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA6,0xB6,
-	0xFF,0xFF,0xFF,0xA8,0xB8,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xD1,0xF1,0xFF,
-	0xFF,0xFF,0xAF,0xBF,0xD2,0xF2,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xAA,0xBA,0xFF,0xFF,0xFF,0xFF,0xAB,0xBB,
-	0xD7,0xF7,0xAE,0xBE,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xD9,0xF9,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xAC,0xBC,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xBD,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_10 */
-
-/*
- * iso_8859_10 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_10 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_10, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_10)
-	(__uint16_t *)&from_ucs_speed_iso_8859_10, /* UCS -> iso_8859_10 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_10)
-	(__uint16_t *)&to_ucs_speed_iso_8859_10 /* iso_8859_10 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_10) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_11.c b/newlib/libc/iconv/ccs/iso_8859_11.c
deleted file mode 100644
index 97cc075..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_11.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_11 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_11) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_11)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_11 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_11)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_11[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x0E01,0x0E02,0x0E03,0x0E04,0x0E05,0x0E06,0x0E07,
-	0x0E08,0x0E09,0x0E0A,0x0E0B,0x0E0C,0x0E0D,0x0E0E,0x0E0F,
-	0x0E10,0x0E11,0x0E12,0x0E13,0x0E14,0x0E15,0x0E16,0x0E17,
-	0x0E18,0x0E19,0x0E1A,0x0E1B,0x0E1C,0x0E1D,0x0E1E,0x0E1F,
-	0x0E20,0x0E21,0x0E22,0x0E23,0x0E24,0x0E25,0x0E26,0x0E27,
-	0x0E28,0x0E29,0x0E2A,0x0E2B,0x0E2C,0x0E2D,0x0E2E,0x0E2F,
-	0x0E30,0x0E31,0x0E32,0x0E33,0x0E34,0x0E35,0x0E36,0x0E37,
-	0x0E38,0x0E39,0x0E3A,INVALC,INVALC,INVALC,INVALC,0x0E3F,
-	0x0E40,0x0E41,0x0E42,0x0E43,0x0E44,0x0E45,0x0E46,0x0E47,
-	0x0E48,0x0E49,0x0E4A,0x0E4B,0x0E4C,0x0E4D,0x0E4E,0x0E4F,
-	0x0E50,0x0E51,0x0E52,0x0E53,0x0E54,0x0E55,0x0E56,0x0E57,
-	0x0E58,0x0E59,0x0E5A,0x0E5B,INVALC,INVALC,INVALC,INVALC,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_11 */
-
-/*
- * 8-bit UCS -> iso_8859_11 speed-optimized table (1026 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_11)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_11[] =
-{
-	W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(0x0302),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 15, Array index 0x0302 */
-	0xFF,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
-	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xFF,0xFF,0xFF,0xFF,0xDF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFB,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_11 */
-
-/*
- * iso_8859_11 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_11 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_11, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_11)
-	(__uint16_t *)&from_ucs_speed_iso_8859_11, /* UCS -> iso_8859_11 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_11)
-	(__uint16_t *)&to_ucs_speed_iso_8859_11 /* iso_8859_11 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_11) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_13.c b/newlib/libc/iconv/ccs/iso_8859_13.c
deleted file mode 100644
index 88a2a6f..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_13.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_13 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_13) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_13)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_13 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_13)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_13[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x201D,0x00A2,0x00A3,0x00A4,0x201E,0x00A6,0x00A7,
-	0x00D8,0x00A9,0x0156,0x00AB,0x00AC,0x00AD,0x00AE,0x00C6,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x201C,0x00B5,0x00B6,0x00B7,
-	0x00F8,0x00B9,0x0157,0x00BB,0x00BC,0x00BD,0x00BE,0x00E6,
-	0x0104,0x012E,0x0100,0x0106,0x00C4,0x00C5,0x0118,0x0112,
-	0x010C,0x00C9,0x0179,0x0116,0x0122,0x0136,0x012A,0x013B,
-	0x0160,0x0143,0x0145,0x00D3,0x014C,0x00D5,0x00D6,0x00D7,
-	0x0172,0x0141,0x015A,0x016A,0x00DC,0x017B,0x017D,0x00DF,
-	0x0105,0x012F,0x0101,0x0107,0x00E4,0x00E5,0x0119,0x0113,
-	0x010D,0x00E9,0x017A,0x0117,0x0123,0x0137,0x012B,0x013C,
-	0x0161,0x0144,0x0146,0x00F3,0x014D,0x00F5,0x00F6,0x00F7,
-	0x0173,0x0142,0x015B,0x016B,0x00FC,0x017C,0x017E,0x2019,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_13 */
-
-/*
- * 8-bit UCS -> iso_8859_13 speed-optimized table (1282 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_13)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_13[] =
-{
-	W(0x2019), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0402),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xFF,0xA2,0xA3,0xA4,0xFF,0xA6,0xA7,
-	0xFF,0xA9,0xFF,0xAB,0xAC,0xAD,0xAE,0xFF,
-	0xB0,0xB1,0xB2,0xB3,0xFF,0xB5,0xB6,0xB7,
-	0xFF,0xB9,0xFF,0xBB,0xBC,0xBD,0xBE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC4,0xC5,0xAF,0xFF,
-	0xFF,0xC9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xD3,0xFF,0xD5,0xD6,0xD7,
-	0xA8,0xFF,0xFF,0xFF,0xDC,0xFF,0xFF,0xDF,
-	0xFF,0xFF,0xFF,0xFF,0xE4,0xE5,0xBF,0xFF,
-	0xFF,0xE9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xF3,0xFF,0xF5,0xF6,0xF7,
-	0xB8,0xFF,0xFF,0xFF,0xFC,0xFF,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xC2,0xE2,0xFF,0xFF,0xC0,0xE0,0xC3,0xE3,
-	0xFF,0xFF,0xFF,0xFF,0xC8,0xE8,0xFF,0xFF,
-	0xFF,0xFF,0xC7,0xE7,0xFF,0xFF,0xCB,0xEB,
-	0xC6,0xE6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xCC,0xEC,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xCE,0xEE,0xFF,0xFF,0xC1,0xE1,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCD,0xED,
-	0xFF,0xFF,0xFF,0xCF,0xEF,0xFF,0xFF,0xFF,
-	0xFF,0xD9,0xF9,0xD1,0xF1,0xD2,0xF2,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xD4,0xF4,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAA,0xBA,
-	0xFF,0xFF,0xDA,0xFA,0xFF,0xFF,0xFF,0xFF,
-	0xD0,0xF0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xDB,0xFB,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xD8,0xF8,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xCA,0xEA,0xDD,0xFD,0xDE,0xFE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xB4,0xA1,0xA5,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_13 */
-
-/*
- * iso_8859_13 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_13 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_13, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_13)
-	(__uint16_t *)&from_ucs_speed_iso_8859_13, /* UCS -> iso_8859_13 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_13)
-	(__uint16_t *)&to_ucs_speed_iso_8859_13 /* iso_8859_13 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_13) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_14.c b/newlib/libc/iconv/ccs/iso_8859_14.c
deleted file mode 100644
index 28052a7..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_14.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_14 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_14) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_14)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_14 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_14)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_14[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x1E02,0x1E03,0x00A3,0x010A,0x010B,0x1E0A,0x00A7,
-	0x1E80,0x00A9,0x1E82,0x1E0B,0x1EF2,0x00AD,0x00AE,0x0178,
-	0x1E1E,0x1E1F,0x0120,0x0121,0x1E40,0x1E41,0x00B6,0x1E56,
-	0x1E81,0x1E57,0x1E83,0x1E60,0x1EF3,0x1E84,0x1E85,0x1E61,
-	0x00C0,0x00C1,0x00C2,0x00C3,0x00C4,0x00C5,0x00C6,0x00C7,
-	0x00C8,0x00C9,0x00CA,0x00CB,0x00CC,0x00CD,0x00CE,0x00CF,
-	0x0174,0x00D1,0x00D2,0x00D3,0x00D4,0x00D5,0x00D6,0x1E6A,
-	0x00D8,0x00D9,0x00DA,0x00DB,0x00DC,0x00DD,0x0176,0x00DF,
-	0x00E0,0x00E1,0x00E2,0x00E3,0x00E4,0x00E5,0x00E6,0x00E7,
-	0x00E8,0x00E9,0x00EA,0x00EB,0x00EC,0x00ED,0x00EE,0x00EF,
-	0x0175,0x00F1,0x00F2,0x00F3,0x00F4,0x00F5,0x00F6,0x1E6B,
-	0x00F8,0x00F9,0x00FA,0x00FB,0x00FC,0x00FD,0x0177,0x00FF,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_14 */
-
-/*
- * 8-bit UCS -> iso_8859_14 speed-optimized table (1282 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_14)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_14[] =
-{
-	W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(0x0402),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xFF,0xFF,0xA3,0xFF,0xFF,0xFF,0xA7,
-	0xFF,0xA9,0xFF,0xFF,0xFF,0xAD,0xAE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB6,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xFF,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xFF,
-	0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xFF,0xDF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xFF,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xFF,
-	0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xA4,0xA5,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xB2,0xB3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xD0,0xF0,0xDE,0xFE,
-	0xAF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 31, Array index 0x0402 */
-	0xFF,0xFF,0xA1,0xA2,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xA6,0xAB,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB0,0xB1,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xB4,0xB5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB7,0xB9,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xBB,0xBF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xD7,0xF7,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA8,0xB8,0xAA,0xBA,0xBD,0xBE,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xAC,0xBC,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_14 */
-
-/*
- * iso_8859_14 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_14 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_14, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_14)
-	(__uint16_t *)&from_ucs_speed_iso_8859_14, /* UCS -> iso_8859_14 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_14)
-	(__uint16_t *)&to_ucs_speed_iso_8859_14 /* iso_8859_14 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_14) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_15.c b/newlib/libc/iconv/ccs/iso_8859_15.c
deleted file mode 100644
index da3cfc3..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_15.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_15 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_15) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_15)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_15 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_15)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_15[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x00A1,0x00A2,0x00A3,0x20AC,0x00A5,0x0160,0x00A7,
-	0x0161,0x00A9,0x00AA,0x00AB,0x00AC,0x00AD,0x00AE,0x00AF,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x017D,0x00B5,0x00B6,0x00B7,
-	0x017E,0x00B9,0x00BA,0x00BB,0x0152,0x0153,0x0178,0x00BF,
-	0x00C0,0x00C1,0x00C2,0x00C3,0x00C4,0x00C5,0x00C6,0x00C7,
-	0x00C8,0x00C9,0x00CA,0x00CB,0x00CC,0x00CD,0x00CE,0x00CF,
-	0x00D0,0x00D1,0x00D2,0x00D3,0x00D4,0x00D5,0x00D6,0x00D7,
-	0x00D8,0x00D9,0x00DA,0x00DB,0x00DC,0x00DD,0x00DE,0x00DF,
-	0x00E0,0x00E1,0x00E2,0x00E3,0x00E4,0x00E5,0x00E6,0x00E7,
-	0x00E8,0x00E9,0x00EA,0x00EB,0x00EC,0x00ED,0x00EE,0x00EF,
-	0x00F0,0x00F1,0x00F2,0x00F3,0x00F4,0x00F5,0x00F6,0x00F7,
-	0x00F8,0x00F9,0x00FA,0x00FB,0x00FC,0x00FD,0x00FE,0x00FF,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_15 */
-
-/*
- * 8-bit UCS -> iso_8859_15 speed-optimized table (1282 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_15)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_15[] =
-{
-	W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0402),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xA1,0xA2,0xA3,0xFF,0xA5,0xFF,0xA7,
-	0xFF,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
-	0xB0,0xB1,0xB2,0xB3,0xFF,0xB5,0xB6,0xB7,
-	0xFF,0xB9,0xBA,0xBB,0xFF,0xFF,0xFF,0xBF,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xBC,0xBD,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA6,0xA8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xBE,0xFF,0xFF,0xFF,0xFF,0xB4,0xB8,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xA4,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_15 */
-
-/*
- * iso_8859_15 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_15 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_15, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_15)
-	(__uint16_t *)&from_ucs_speed_iso_8859_15, /* UCS -> iso_8859_15 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_15)
-	(__uint16_t *)&to_ucs_speed_iso_8859_15 /* iso_8859_15 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_15) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_2.c b/newlib/libc/iconv/ccs/iso_8859_2.c
deleted file mode 100644
index 5a19666..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_2.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_2 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_2) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_2)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_2 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_2)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_2[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x0104,0x02D8,0x0141,0x00A4,0x013D,0x015A,0x00A7,
-	0x00A8,0x0160,0x015E,0x0164,0x0179,0x00AD,0x017D,0x017B,
-	0x00B0,0x0105,0x02DB,0x0142,0x00B4,0x013E,0x015B,0x02C7,
-	0x00B8,0x0161,0x015F,0x0165,0x017A,0x02DD,0x017E,0x017C,
-	0x0154,0x00C1,0x00C2,0x0102,0x00C4,0x0139,0x0106,0x00C7,
-	0x010C,0x00C9,0x0118,0x00CB,0x011A,0x00CD,0x00CE,0x010E,
-	0x0110,0x0143,0x0147,0x00D3,0x00D4,0x0150,0x00D6,0x00D7,
-	0x0158,0x016E,0x00DA,0x0170,0x00DC,0x00DD,0x0162,0x00DF,
-	0x0155,0x00E1,0x00E2,0x0103,0x00E4,0x013A,0x0107,0x00E7,
-	0x010D,0x00E9,0x0119,0x00EB,0x011B,0x00ED,0x00EE,0x010F,
-	0x0111,0x0144,0x0148,0x00F3,0x00F4,0x0151,0x00F6,0x00F7,
-	0x0159,0x016F,0x00FA,0x0171,0x00FC,0x00FD,0x0163,0x02D9,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_2 */
-
-/*
- * 8-bit UCS -> iso_8859_2 speed-optimized table (1282 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_2)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_2[] =
-{
-	W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(0x0402),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xFF,0xFF,0xFF,0xA4,0xFF,0xFF,0xA7,
-	0xA8,0xFF,0xFF,0xFF,0xFF,0xAD,0xFF,0xFF,
-	0xB0,0xFF,0xFF,0xFF,0xB4,0xFF,0xFF,0xFF,
-	0xB8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xC1,0xC2,0xFF,0xC4,0xFF,0xFF,0xC7,
-	0xFF,0xC9,0xFF,0xCB,0xFF,0xCD,0xCE,0xFF,
-	0xFF,0xFF,0xFF,0xD3,0xD4,0xFF,0xD6,0xD7,
-	0xFF,0xFF,0xDA,0xFF,0xDC,0xDD,0xFF,0xDF,
-	0xFF,0xE1,0xE2,0xFF,0xE4,0xFF,0xFF,0xE7,
-	0xFF,0xE9,0xFF,0xEB,0xFF,0xED,0xEE,0xFF,
-	0xFF,0xFF,0xFF,0xF3,0xF4,0xFF,0xF6,0xF7,
-	0xFF,0xFF,0xFA,0xFF,0xFC,0xFD,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xC3,0xE3,0xA1,0xB1,0xC6,0xE6,
-	0xFF,0xFF,0xFF,0xFF,0xC8,0xE8,0xCF,0xEF,
-	0xD0,0xF0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xCA,0xEA,0xCC,0xEC,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xC5,0xE5,0xFF,0xFF,0xA5,0xB5,0xFF,
-	0xFF,0xA3,0xB3,0xD1,0xF1,0xFF,0xFF,0xD2,
-	0xF2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xD5,0xF5,0xFF,0xFF,0xC0,0xE0,0xFF,0xFF,
-	0xD8,0xF8,0xA6,0xB6,0xFF,0xFF,0xAA,0xBA,
-	0xA9,0xB9,0xDE,0xFE,0xAB,0xBB,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD9,0xF9,
-	0xDB,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xAC,0xBC,0xAF,0xBF,0xAE,0xBE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 3, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB7,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA2,0xFF,0xFF,0xB2,0xFF,0xBD,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_2 */
-
-/*
- * iso_8859_2 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_2 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_2, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_2)
-	(__uint16_t *)&from_ucs_speed_iso_8859_2, /* UCS -> iso_8859_2 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_2)
-	(__uint16_t *)&to_ucs_speed_iso_8859_2 /* iso_8859_2 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_2) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_3.c b/newlib/libc/iconv/ccs/iso_8859_3.c
deleted file mode 100644
index a69fcb3..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_3.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_3 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_3) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_3)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_3 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_3)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_3[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x0126,0x02D8,0x00A3,0x00A4,INVALC,0x0124,0x00A7,
-	0x00A8,0x0130,0x015E,0x011E,0x0134,0x00AD,INVALC,0x017B,
-	0x00B0,0x0127,0x00B2,0x00B3,0x00B4,0x00B5,0x0125,0x00B7,
-	0x00B8,0x0131,0x015F,0x011F,0x0135,0x00BD,INVALC,0x017C,
-	0x00C0,0x00C1,0x00C2,INVALC,0x00C4,0x010A,0x0108,0x00C7,
-	0x00C8,0x00C9,0x00CA,0x00CB,0x00CC,0x00CD,0x00CE,0x00CF,
-	INVALC,0x00D1,0x00D2,0x00D3,0x00D4,0x0120,0x00D6,0x00D7,
-	0x011C,0x00D9,0x00DA,0x00DB,0x00DC,0x016C,0x015C,0x00DF,
-	0x00E0,0x00E1,0x00E2,INVALC,0x00E4,0x010B,0x0109,0x00E7,
-	0x00E8,0x00E9,0x00EA,0x00EB,0x00EC,0x00ED,0x00EE,0x00EF,
-	INVALC,0x00F1,0x00F2,0x00F3,0x00F4,0x0121,0x00F6,0x00F7,
-	0x011D,0x00F9,0x00FA,0x00FB,0x00FC,0x016D,0x015D,0x02D9,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_3 */
-
-/*
- * 8-bit UCS -> iso_8859_3 speed-optimized table (1282 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_3)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_3[] =
-{
-	W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(0x0402),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xFF,0xFF,0xA3,0xA4,0xFF,0xFF,0xA7,
-	0xA8,0xFF,0xFF,0xFF,0xFF,0xAD,0xFF,0xFF,
-	0xB0,0xFF,0xB2,0xB3,0xB4,0xB5,0xFF,0xB7,
-	0xB8,0xFF,0xFF,0xFF,0xFF,0xBD,0xFF,0xFF,
-	0xC0,0xC1,0xC2,0xFF,0xC4,0xFF,0xFF,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xFF,0xD1,0xD2,0xD3,0xD4,0xFF,0xD6,0xD7,
-	0xFF,0xD9,0xDA,0xDB,0xDC,0xFF,0xFF,0xDF,
-	0xE0,0xE1,0xE2,0xFF,0xE4,0xFF,0xFF,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xFF,0xF1,0xF2,0xF3,0xF4,0xFF,0xF6,0xF7,
-	0xFF,0xF9,0xFA,0xFB,0xFC,0xFF,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xC6,0xE6,0xC5,0xE5,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xD8,0xF8,0xAB,0xBB,
-	0xD5,0xF5,0xFF,0xFF,0xA6,0xB6,0xA1,0xB1,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA9,0xB9,0xFF,0xFF,0xAC,0xBC,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xDE,0xFE,0xAA,0xBA,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xDD,0xFD,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xAF,0xBF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 3, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_3 */
-
-/*
- * iso_8859_3 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_3 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_3, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_3)
-	(__uint16_t *)&from_ucs_speed_iso_8859_3, /* UCS -> iso_8859_3 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_3)
-	(__uint16_t *)&to_ucs_speed_iso_8859_3 /* iso_8859_3 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_3) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_4.c b/newlib/libc/iconv/ccs/iso_8859_4.c
deleted file mode 100644
index 0cec458..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_4.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_4 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_4) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_4)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_4 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_4)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_4[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x0104,0x0138,0x0156,0x00A4,0x0128,0x013B,0x00A7,
-	0x00A8,0x0160,0x0112,0x0122,0x0166,0x00AD,0x017D,0x00AF,
-	0x00B0,0x0105,0x02DB,0x0157,0x00B4,0x0129,0x013C,0x02C7,
-	0x00B8,0x0161,0x0113,0x0123,0x0167,0x014A,0x017E,0x014B,
-	0x0100,0x00C1,0x00C2,0x00C3,0x00C4,0x00C5,0x00C6,0x012E,
-	0x010C,0x00C9,0x0118,0x00CB,0x0116,0x00CD,0x00CE,0x012A,
-	0x0110,0x0145,0x014C,0x0136,0x00D4,0x00D5,0x00D6,0x00D7,
-	0x00D8,0x0172,0x00DA,0x00DB,0x00DC,0x0168,0x016A,0x00DF,
-	0x0101,0x00E1,0x00E2,0x00E3,0x00E4,0x00E5,0x00E6,0x012F,
-	0x010D,0x00E9,0x0119,0x00EB,0x0117,0x00ED,0x00EE,0x012B,
-	0x0111,0x0146,0x014D,0x0137,0x00F4,0x00F5,0x00F6,0x00F7,
-	0x00F8,0x0173,0x00FA,0x00FB,0x00FC,0x0169,0x016B,0x02D9,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_4 */
-
-/*
- * 8-bit UCS -> iso_8859_4 speed-optimized table (1282 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_4)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_4[] =
-{
-	W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(0x0402),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xFF,0xFF,0xFF,0xA4,0xFF,0xFF,0xA7,
-	0xA8,0xFF,0xFF,0xFF,0xFF,0xAD,0xFF,0xAF,
-	0xB0,0xFF,0xFF,0xFF,0xB4,0xFF,0xFF,0xFF,
-	0xB8,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xFF,
-	0xFF,0xC9,0xFF,0xCB,0xFF,0xCD,0xCE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xFF,0xDA,0xDB,0xDC,0xFF,0xFF,0xDF,
-	0xFF,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xFF,
-	0xFF,0xE9,0xFF,0xEB,0xFF,0xED,0xEE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xFF,0xFA,0xFB,0xFC,0xFF,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xC0,0xE0,0xFF,0xFF,0xA1,0xB1,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC8,0xE8,0xFF,0xFF,
-	0xD0,0xF0,0xAA,0xBA,0xFF,0xFF,0xCC,0xEC,
-	0xCA,0xEA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xAB,0xBB,0xFF,0xFF,0xFF,0xFF,
-	0xA5,0xB5,0xCF,0xEF,0xFF,0xFF,0xC7,0xE7,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD3,0xF3,
-	0xA2,0xFF,0xFF,0xA6,0xB6,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xD1,0xF1,0xFF,
-	0xFF,0xFF,0xBD,0xBF,0xD2,0xF2,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA3,0xB3,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA9,0xB9,0xFF,0xFF,0xFF,0xFF,0xAC,0xBC,
-	0xDD,0xFD,0xDE,0xFE,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xD9,0xF9,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xAE,0xBE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 3, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB7,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xB2,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_4 */
-
-/*
- * iso_8859_4 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_4 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_4, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_4)
-	(__uint16_t *)&from_ucs_speed_iso_8859_4, /* UCS -> iso_8859_4 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_4)
-	(__uint16_t *)&to_ucs_speed_iso_8859_4 /* iso_8859_4 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_4) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_5.c b/newlib/libc/iconv/ccs/iso_8859_5.c
deleted file mode 100644
index e4765ff..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_5.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_5 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_5) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_5)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_5 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_5)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_5[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x0401,0x0402,0x0403,0x0404,0x0405,0x0406,0x0407,
-	0x0408,0x0409,0x040A,0x040B,0x040C,0x00AD,0x040E,0x040F,
-	0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417,
-	0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,0x041F,
-	0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427,
-	0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,
-	0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437,
-	0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,
-	0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,
-	0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F,
-	0x2116,0x0451,0x0452,0x0453,0x0454,0x0455,0x0456,0x0457,
-	0x0458,0x0459,0x045A,0x045B,0x045C,0x00A7,0x045E,0x045F,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_5 */
-
-/*
- * 8-bit UCS -> iso_8859_5 speed-optimized table (1282 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_5)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_5[] =
-{
-	W(0x045F), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0302),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(0x0402),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xAD,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 5, Array index 0x0302 */
-	0xFF,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xAA,0xAB,0xAC,0xFF,0xAE,0xAF,
-	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xFF,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFB,0xFC,0xFF,0xFE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_5 */
-
-/*
- * iso_8859_5 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_5 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_5, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_5)
-	(__uint16_t *)&from_ucs_speed_iso_8859_5, /* UCS -> iso_8859_5 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_5)
-	(__uint16_t *)&to_ucs_speed_iso_8859_5 /* iso_8859_5 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_5) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_6.c b/newlib/libc/iconv/ccs/iso_8859_6.c
deleted file mode 100644
index 783cf1f..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_6.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_6 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_6) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_6)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_6 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_6)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_6[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,INVALC,INVALC,INVALC,0x00A4,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x060C,0x00AD,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x061B,INVALC,INVALC,INVALC,0x061F,
-	INVALC,0x0621,0x0622,0x0623,0x0624,0x0625,0x0626,0x0627,
-	0x0628,0x0629,0x062A,0x062B,0x062C,0x062D,0x062E,0x062F,
-	0x0630,0x0631,0x0632,0x0633,0x0634,0x0635,0x0636,0x0637,
-	0x0638,0x0639,0x063A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x0640,0x0641,0x0642,0x0643,0x0644,0x0645,0x0646,0x0647,
-	0x0648,0x0649,0x064A,0x064B,0x064C,0x064D,0x064E,0x064F,
-	0x0650,0x0651,0x0652,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_6 */
-
-/*
- * 8-bit UCS -> iso_8859_6 speed-optimized table (1026 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_6)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_6[] =
-{
-	W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(0x0302),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xFF,0xFF,0xFF,0xA4,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xAD,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 7, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xAC,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xBB,0xFF,0xFF,0xFF,0xBF,
-	0xFF,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xF0,0xF1,0xF2,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_6 */
-
-/*
- * iso_8859_6 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_6 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_6, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_6)
-	(__uint16_t *)&from_ucs_speed_iso_8859_6, /* UCS -> iso_8859_6 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_6)
-	(__uint16_t *)&to_ucs_speed_iso_8859_6 /* iso_8859_6 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_6) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_7.c b/newlib/libc/iconv/ccs/iso_8859_7.c
deleted file mode 100644
index e964a02..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_7.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_7 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_7) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_7)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_7 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_7)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_7[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x2018,0x2019,0x00A3,INVALC,INVALC,0x00A6,0x00A7,
-	0x00A8,0x00A9,INVALC,0x00AB,0x00AC,0x00AD,INVALC,0x2015,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x0384,0x0385,0x0386,0x00B7,
-	0x0388,0x0389,0x038A,0x00BB,0x038C,0x00BD,0x038E,0x038F,
-	0x0390,0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,
-	0x0398,0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F,
-	0x03A0,0x03A1,INVALC,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,
-	0x03A8,0x03A9,0x03AA,0x03AB,0x03AC,0x03AD,0x03AE,0x03AF,
-	0x03B0,0x03B1,0x03B2,0x03B3,0x03B4,0x03B5,0x03B6,0x03B7,
-	0x03B8,0x03B9,0x03BA,0x03BB,0x03BC,0x03BD,0x03BE,0x03BF,
-	0x03C0,0x03C1,0x03C2,0x03C3,0x03C4,0x03C5,0x03C6,0x03C7,
-	0x03C8,0x03C9,0x03CA,0x03CB,0x03CC,0x03CD,0x03CE,INVALC,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_7 */
-
-/*
- * 8-bit UCS -> iso_8859_7 speed-optimized table (1282 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_7)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_7[] =
-{
-	W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(0x0302),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0402),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xFF,0xFF,0xA3,0xFF,0xFF,0xA6,0xA7,
-	0xA8,0xA9,0xFF,0xAB,0xAC,0xAD,0xFF,0xFF,
-	0xB0,0xB1,0xB2,0xB3,0xFF,0xFF,0xFF,0xB7,
-	0xFF,0xFF,0xFF,0xBB,0xFF,0xBD,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 4, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xB4,0xB5,0xB6,0xFF,
-	0xB8,0xB9,0xBA,0xFF,0xBC,0xFF,0xBE,0xBF,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xD0,0xD1,0xFF,0xD3,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xAF,0xFF,0xFF,
-	0xA1,0xA2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_7 */
-
-/*
- * iso_8859_7 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_7 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_7, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_7)
-	(__uint16_t *)&from_ucs_speed_iso_8859_7, /* UCS -> iso_8859_7 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_7)
-	(__uint16_t *)&to_ucs_speed_iso_8859_7 /* iso_8859_7 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_7) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_8.c b/newlib/libc/iconv/ccs/iso_8859_8.c
deleted file mode 100644
index bf49604..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_8.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_8 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_8) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_8)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_8 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_8)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_8[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,INVALC,0x00A2,0x00A3,0x00A4,0x00A5,0x00A6,0x00A7,
-	0x00A8,0x00A9,0x00D7,0x00AB,0x00AC,0x00AD,0x00AE,0x00AF,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x00B4,0x00B5,0x00B6,0x00B7,
-	0x00B8,0x00B9,0x00F7,0x00BB,0x00BC,0x00BD,0x00BE,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2017,
-	0x05D0,0x05D1,0x05D2,0x05D3,0x05D4,0x05D5,0x05D6,0x05D7,
-	0x05D8,0x05D9,0x05DA,0x05DB,0x05DC,0x05DD,0x05DE,0x05DF,
-	0x05E0,0x05E1,0x05E2,0x05E3,0x05E4,0x05E5,0x05E6,0x05E7,
-	0x05E8,0x05E9,0x05EA,INVALC,INVALC,0x200E,0x200F,INVALC,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_8 */
-
-/*
- * 8-bit UCS -> iso_8859_8 speed-optimized table (1282 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_8)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_8[] =
-{
-	W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(0x0302),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0402),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xFF,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xFF,0xAB,0xAC,0xAD,0xAE,0xAF,
-	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xFF,0xBB,0xBC,0xBD,0xBE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAA,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xBA,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 6, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0xFE,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_8 */
-
-/*
- * iso_8859_8 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_8 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_8, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_8)
-	(__uint16_t *)&from_ucs_speed_iso_8859_8, /* UCS -> iso_8859_8 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_8)
-	(__uint16_t *)&to_ucs_speed_iso_8859_8 /* iso_8859_8 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_8) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_8859_9.c b/newlib/libc/iconv/ccs/iso_8859_9.c
deleted file mode 100644
index 20fbb84..0000000
--- a/newlib/libc/iconv/ccs/iso_8859_9.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_8859_9 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_9) \
- || defined (ICONV_FROM_UCS_CCS_ISO_8859_9)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_8859_9 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_9)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_8859_9[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x00A1,0x00A2,0x00A3,0x00A4,0x00A5,0x00A6,0x00A7,
-	0x00A8,0x00A9,0x00AA,0x00AB,0x00AC,0x00AD,0x00AE,0x00AF,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x00B4,0x00B5,0x00B6,0x00B7,
-	0x00B8,0x00B9,0x00BA,0x00BB,0x00BC,0x00BD,0x00BE,0x00BF,
-	0x00C0,0x00C1,0x00C2,0x00C3,0x00C4,0x00C5,0x00C6,0x00C7,
-	0x00C8,0x00C9,0x00CA,0x00CB,0x00CC,0x00CD,0x00CE,0x00CF,
-	0x011E,0x00D1,0x00D2,0x00D3,0x00D4,0x00D5,0x00D6,0x00D7,
-	0x00D8,0x00D9,0x00DA,0x00DB,0x00DC,0x0130,0x015E,0x00DF,
-	0x00E0,0x00E1,0x00E2,0x00E3,0x00E4,0x00E5,0x00E6,0x00E7,
-	0x00E8,0x00E9,0x00EA,0x00EB,0x00EC,0x00ED,0x00EE,0x00EF,
-	0x011F,0x00F1,0x00F2,0x00F3,0x00F4,0x00F5,0x00F6,0x00F7,
-	0x00F8,0x00F9,0x00FA,0x00FB,0x00FC,0x0131,0x015F,0x00FF,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_9 */
-
-/*
- * 8-bit UCS -> iso_8859_9 speed-optimized table (1026 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_9)
-
-static _CONST unsigned char
-from_ucs_speed_iso_8859_9[] =
-{
-	W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
-	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xFF,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xDB,0xDC,0xFF,0xFF,0xDF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xFF,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFB,0xFC,0xFF,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD0,0xF0,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xDD,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDE,0xFE,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_8859_9 */
-
-/*
- * iso_8859_9 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_8859_9 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_8859_9, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_8859_9)
-	(__uint16_t *)&from_ucs_speed_iso_8859_9, /* UCS -> iso_8859_9 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_8859_9)
-	(__uint16_t *)&to_ucs_speed_iso_8859_9 /* iso_8859_9 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_8859_9) || ... */
-
diff --git a/newlib/libc/iconv/ccs/iso_ir_111.c b/newlib/libc/iconv/ccs/iso_ir_111.c
deleted file mode 100644
index 0e9bcc4..0000000
--- a/newlib/libc/iconv/ccs/iso_ir_111.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for iso_ir_111 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_ISO_IR_111) \
- || defined (ICONV_FROM_UCS_CCS_ISO_IR_111)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit iso_ir_111 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_ISO_IR_111)
-
-static _CONST __uint16_t
-to_ucs_speed_iso_ir_111[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0080,0x0081,0x0082,0x0083,0x0084,0x0085,0x0086,0x0087,
-	0x0088,0x0089,0x008A,0x008B,0x008C,0x008D,0x008E,0x008F,
-	0x0090,0x0091,0x0092,0x0093,0x0094,0x0095,0x0096,0x0097,
-	0x0098,0x0099,0x009A,0x009B,0x009C,0x009D,0x009E,0x009F,
-	0x00A0,0x0452,0x0453,0x0451,0x0454,0x0455,0x0456,0x0457,
-	0x0458,0x0459,0x045A,0x045B,0x045C,0x00AD,0x045E,0x045F,
-	0x2116,0x0402,0x0403,0x0401,0x0404,0x0405,0x0406,0x0407,
-	0x0408,0x0409,0x040A,0x040B,0x040C,0x00A4,0x040E,0x040F,
-	0x044E,0x0430,0x0431,0x0446,0x0434,0x0435,0x0444,0x0433,
-	0x0445,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,
-	0x043F,0x044F,0x0440,0x0441,0x0442,0x0443,0x0436,0x0432,
-	0x044C,0x044B,0x0437,0x0448,0x044D,0x0449,0x0447,0x044A,
-	0x042E,0x0410,0x0411,0x0426,0x0414,0x0415,0x0424,0x0413,
-	0x0425,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,
-	0x041F,0x042F,0x0420,0x0421,0x0422,0x0423,0x0416,0x0412,
-	0x042C,0x042B,0x0417,0x0428,0x042D,0x0429,0x0427,0x042A,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_IR_111 */
-
-/*
- * 8-bit UCS -> iso_ir_111 speed-optimized table (1282 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_ISO_IR_111)
-
-static _CONST unsigned char
-from_ucs_speed_iso_ir_111[] =
-{
-	W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0302),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(0x0402),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
-	0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
-	0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
-	0xA0,0xFF,0xFF,0xFF,0xBD,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xAD,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 5, Array index 0x0302 */
-	0xFF,0xB3,0xB1,0xB2,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xBA,0xBB,0xBC,0xFF,0xBE,0xBF,
-	0xE1,0xE2,0xF7,0xE7,0xE4,0xE5,0xF6,0xFA,
-	0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,
-	0xF2,0xF3,0xF4,0xF5,0xE6,0xE8,0xE3,0xFE,
-	0xFB,0xFD,0xFF,0xF9,0xF8,0xFC,0xE0,0xF1,
-	0xC1,0xC2,0xD7,0xC7,0xC4,0xC5,0xD6,0xDA,
-	0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,
-	0xD2,0xD3,0xD4,0xD5,0xC6,0xC8,0xC3,0xDE,
-	0xDB,0xDD,0xDF,0xD9,0xD8,0xDC,0xC0,0xD1,
-	0xFF,0xA3,0xA1,0xA2,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xAA,0xAB,0xAC,0xFF,0xAE,0xAF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB0,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_ISO_IR_111 */
-
-/*
- * iso_ir_111 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_iso_ir_111 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_ISO_IR_111, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_ISO_IR_111)
-	(__uint16_t *)&from_ucs_speed_iso_ir_111, /* UCS -> iso_ir_111 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_ISO_IR_111)
-	(__uint16_t *)&to_ucs_speed_iso_ir_111 /* iso_ir_111 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_ISO_IR_111) || ... */
-
diff --git a/newlib/libc/iconv/ccs/jis_x0201_1976.c b/newlib/libc/iconv/ccs/jis_x0201_1976.c
deleted file mode 100644
index e5cdb5f..0000000
--- a/newlib/libc/iconv/ccs/jis_x0201_1976.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for jis_x0201_1976 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_JIS_X0201_1976) \
- || defined (ICONV_FROM_UCS_CCS_JIS_X0201_1976)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit jis_x0201_1976 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_JIS_X0201_1976)
-
-static _CONST __uint16_t
-to_ucs_speed_jis_x0201_1976[] =
-{
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xFF61,0xFF62,0xFF63,0xFF64,0xFF65,0xFF66,0xFF67,
-	0xFF68,0xFF69,0xFF6A,0xFF6B,0xFF6C,0xFF6D,0xFF6E,0xFF6F,
-	0xFF70,0xFF71,0xFF72,0xFF73,0xFF74,0xFF75,0xFF76,0xFF77,
-	0xFF78,0xFF79,0xFF7A,0xFF7B,0xFF7C,0xFF7D,0xFF7E,0xFF7F,
-	0xFF80,0xFF81,0xFF82,0xFF83,0xFF84,0xFF85,0xFF86,0xFF87,
-	0xFF88,0xFF89,0xFF8A,0xFF8B,0xFF8C,0xFF8D,0xFF8E,0xFF8F,
-	0xFF90,0xFF91,0xFF92,0xFF93,0xFF94,0xFF95,0xFF96,0xFF97,
-	0xFF98,0xFF99,0xFF9A,0xFF9B,0xFF9C,0xFF9D,0xFF9E,0xFF9F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_JIS_X0201_1976 */
-
-/*
- * 8-bit UCS -> jis_x0201_1976 speed-optimized table (770 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_JIS_X0201_1976)
-
-static _CONST unsigned char
-from_ucs_speed_jis_x0201_1976[] =
-{
-	W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(0x0202),
-	/* Block 256, Array index 0x0202 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
-	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_JIS_X0201_1976 */
-
-/*
- * jis_x0201_1976 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_jis_x0201_1976 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_JIS_X0201_1976, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_JIS_X0201_1976)
-	(__uint16_t *)&from_ucs_speed_jis_x0201_1976, /* UCS -> jis_x0201_1976 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_JIS_X0201_1976)
-	(__uint16_t *)&to_ucs_speed_jis_x0201_1976 /* jis_x0201_1976 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_JIS_X0201_1976) || ... */
-
diff --git a/newlib/libc/iconv/ccs/jis_x0208_1990.c b/newlib/libc/iconv/ccs/jis_x0208_1990.c
deleted file mode 100644
index c12d134..0000000
--- a/newlib/libc/iconv/ccs/jis_x0208_1990.c
+++ /dev/null
@@ -1,12161 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for jis_x0208_1990 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
- || defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-/*
- * 16-bit jis_x0208_1990 -> UCS speed-optimized table (39936 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_speed_jis_x0208_1990[] =
-{
-	/* Heading Block */
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,0x0100,0x0200,0x0300,0x0400,0x0500,0x0600,0x0700,
-	0x0800,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	0x0900,0x0A00,0x0B00,0x0C00,0x0D00,0x0E00,0x0F00,0x1000,
-	0x1100,0x1200,0x1300,0x1400,0x1500,0x1600,0x1700,0x1800,
-	0x1900,0x1A00,0x1B00,0x1C00,0x1D00,0x1E00,0x1F00,0x2000,
-	0x2100,0x2200,0x2300,0x2400,0x2500,0x2600,0x2700,0x2800,
-	0x2900,0x2A00,0x2B00,0x2C00,0x2D00,0x2E00,0x2F00,0x3000,
-	0x3100,0x3200,0x3300,0x3400,0x3500,0x3600,0x3700,0x3800,
-	0x3900,0x3A00,0x3B00,0x3C00,0x3D00,0x3E00,0x3F00,0x4000,
-	0x4100,0x4200,0x4300,0x4400,0x4500,0x4600,0x4700,0x4800,
-	0x4900,0x4A00,0x4B00,0x4C00,0x4D00,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	/* Block 34, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3000,0x3001,0x3002,0xFF0C,0xFF0E,0x30FB,0xFF1A,
-	0xFF1B,0xFF1F,0xFF01,0x309B,0x309C,0x00B4,0xFF40,0x00A8,
-	0xFF3E,0xFFE3,0xFF3F,0x30FD,0x30FE,0x309D,0x309E,0x3003,
-	0x4EDD,0x3005,0x3006,0x3007,0x30FC,0x2015,0x2010,0xFF0F,
-	0x005C,0x301C,0x2016,0xFF5C,0x2026,0x2025,0x2018,0x2019,
-	0x201C,0x201D,0xFF08,0xFF09,0x3014,0x3015,0xFF3B,0xFF3D,
-	0xFF5B,0xFF5D,0x3008,0x3009,0x300A,0x300B,0x300C,0x300D,
-	0x300E,0x300F,0x3010,0x3011,0xFF0B,0x2212,0x00B1,0x00D7,
-	0x00F7,0xFF1D,0x2260,0xFF1C,0xFF1E,0x2266,0x2267,0x221E,
-	0x2234,0x2642,0x2640,0x00B0,0x2032,0x2033,0x2103,0xFFE5,
-	0xFF04,0x00A2,0x00A3,0xFF05,0xFF03,0xFF06,0xFF0A,0xFF20,
-	0x00A7,0x2606,0x2605,0x25CB,0x25CF,0x25CE,0x25C7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 35, Array index 0x0200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x25C6,0x25A1,0x25A0,0x25B3,0x25B2,0x25BD,0x25BC,
-	0x203B,0x3012,0x2192,0x2190,0x2191,0x2193,0x3013,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2208,0x220B,0x2286,0x2287,0x2282,0x2283,
-	0x222A,0x2229,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2227,0x2228,0x00AC,0x21D2,0x21D4,0x2200,
-	0x2203,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2220,0x22A5,0x2312,0x2202,
-	0x2207,0x2261,0x2252,0x226A,0x226B,0x221A,0x223D,0x221D,
-	0x2235,0x222B,0x222C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x212B,0x2030,0x266F,0x266D,0x266A,0x2020,
-	0x2021,0x00B6,INVALC,INVALC,INVALC,INVALC,0x25EF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 36, Array index 0x0300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0xFF10,0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17,
-	0xFF18,0xFF19,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xFF21,0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27,
-	0xFF28,0xFF29,0xFF2A,0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,
-	0xFF30,0xFF31,0xFF32,0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,
-	0xFF38,0xFF39,0xFF3A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xFF41,0xFF42,0xFF43,0xFF44,0xFF45,0xFF46,0xFF47,
-	0xFF48,0xFF49,0xFF4A,0xFF4B,0xFF4C,0xFF4D,0xFF4E,0xFF4F,
-	0xFF50,0xFF51,0xFF52,0xFF53,0xFF54,0xFF55,0xFF56,0xFF57,
-	0xFF58,0xFF59,0xFF5A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 37, Array index 0x0400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3041,0x3042,0x3043,0x3044,0x3045,0x3046,0x3047,
-	0x3048,0x3049,0x304A,0x304B,0x304C,0x304D,0x304E,0x304F,
-	0x3050,0x3051,0x3052,0x3053,0x3054,0x3055,0x3056,0x3057,
-	0x3058,0x3059,0x305A,0x305B,0x305C,0x305D,0x305E,0x305F,
-	0x3060,0x3061,0x3062,0x3063,0x3064,0x3065,0x3066,0x3067,
-	0x3068,0x3069,0x306A,0x306B,0x306C,0x306D,0x306E,0x306F,
-	0x3070,0x3071,0x3072,0x3073,0x3074,0x3075,0x3076,0x3077,
-	0x3078,0x3079,0x307A,0x307B,0x307C,0x307D,0x307E,0x307F,
-	0x3080,0x3081,0x3082,0x3083,0x3084,0x3085,0x3086,0x3087,
-	0x3088,0x3089,0x308A,0x308B,0x308C,0x308D,0x308E,0x308F,
-	0x3090,0x3091,0x3092,0x3093,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 38, Array index 0x0500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x30A1,0x30A2,0x30A3,0x30A4,0x30A5,0x30A6,0x30A7,
-	0x30A8,0x30A9,0x30AA,0x30AB,0x30AC,0x30AD,0x30AE,0x30AF,
-	0x30B0,0x30B1,0x30B2,0x30B3,0x30B4,0x30B5,0x30B6,0x30B7,
-	0x30B8,0x30B9,0x30BA,0x30BB,0x30BC,0x30BD,0x30BE,0x30BF,
-	0x30C0,0x30C1,0x30C2,0x30C3,0x30C4,0x30C5,0x30C6,0x30C7,
-	0x30C8,0x30C9,0x30CA,0x30CB,0x30CC,0x30CD,0x30CE,0x30CF,
-	0x30D0,0x30D1,0x30D2,0x30D3,0x30D4,0x30D5,0x30D6,0x30D7,
-	0x30D8,0x30D9,0x30DA,0x30DB,0x30DC,0x30DD,0x30DE,0x30DF,
-	0x30E0,0x30E1,0x30E2,0x30E3,0x30E4,0x30E5,0x30E6,0x30E7,
-	0x30E8,0x30E9,0x30EA,0x30EB,0x30EC,0x30ED,0x30EE,0x30EF,
-	0x30F0,0x30F1,0x30F2,0x30F3,0x30F4,0x30F5,0x30F6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 39, Array index 0x0600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,
-	0x0398,0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F,
-	0x03A0,0x03A1,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,
-	0x03A9,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x03B1,0x03B2,0x03B3,0x03B4,0x03B5,0x03B6,0x03B7,
-	0x03B8,0x03B9,0x03BA,0x03BB,0x03BC,0x03BD,0x03BE,0x03BF,
-	0x03C0,0x03C1,0x03C3,0x03C4,0x03C5,0x03C6,0x03C7,0x03C8,
-	0x03C9,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 40, Array index 0x0700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0401,
-	0x0416,0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,
-	0x041E,0x041F,0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,
-	0x0426,0x0427,0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,
-	0x042E,0x042F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0451,
-	0x0436,0x0437,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,
-	0x043E,0x043F,0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,
-	0x0446,0x0447,0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,
-	0x044E,0x044F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 41, Array index 0x0800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2500,0x2502,0x250C,0x2510,0x2518,0x2514,0x251C,
-	0x252C,0x2524,0x2534,0x253C,0x2501,0x2503,0x250F,0x2513,
-	0x251B,0x2517,0x2523,0x2533,0x252B,0x253B,0x254B,0x2520,
-	0x252F,0x2528,0x2537,0x253F,0x251D,0x2530,0x2525,0x2538,
-	0x2542,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 49, Array index 0x0900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E9C,0x5516,0x5A03,0x963F,0x54C0,0x611B,0x6328,
-	0x59F6,0x9022,0x8475,0x831C,0x7A50,0x60AA,0x63E1,0x6E25,
-	0x65ED,0x8466,0x82A6,0x9BF5,0x6893,0x5727,0x65A1,0x6271,
-	0x5B9B,0x59D0,0x867B,0x98F4,0x7D62,0x7DBE,0x9B8E,0x6216,
-	0x7C9F,0x88B7,0x5B89,0x5EB5,0x6309,0x6697,0x6848,0x95C7,
-	0x978D,0x674F,0x4EE5,0x4F0A,0x4F4D,0x4F9D,0x5049,0x56F2,
-	0x5937,0x59D4,0x5A01,0x5C09,0x60DF,0x610F,0x6170,0x6613,
-	0x6905,0x70BA,0x754F,0x7570,0x79FB,0x7DAD,0x7DEF,0x80C3,
-	0x840E,0x8863,0x8B02,0x9055,0x907A,0x533B,0x4E95,0x4EA5,
-	0x57DF,0x80B2,0x90C1,0x78EF,0x4E00,0x58F1,0x6EA2,0x9038,
-	0x7A32,0x8328,0x828B,0x9C2F,0x5141,0x5370,0x54BD,0x54E1,
-	0x56E0,0x59FB,0x5F15,0x98F2,0x6DEB,0x80E4,0x852D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 50, Array index 0x0A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9662,0x9670,0x96A0,0x97FB,0x540B,0x53F3,0x5B87,
-	0x70CF,0x7FBD,0x8FC2,0x96E8,0x536F,0x9D5C,0x7ABA,0x4E11,
-	0x7893,0x81FC,0x6E26,0x5618,0x5504,0x6B1D,0x851A,0x9C3B,
-	0x59E5,0x53A9,0x6D66,0x74DC,0x958F,0x5642,0x4E91,0x904B,
-	0x96F2,0x834F,0x990C,0x53E1,0x55B6,0x5B30,0x5F71,0x6620,
-	0x66F3,0x6804,0x6C38,0x6CF3,0x6D29,0x745B,0x76C8,0x7A4E,
-	0x9834,0x82F1,0x885B,0x8A60,0x92ED,0x6DB2,0x75AB,0x76CA,
-	0x99C5,0x60A6,0x8B01,0x8D8A,0x95B2,0x698E,0x53AD,0x5186,
-	0x5712,0x5830,0x5944,0x5BB4,0x5EF6,0x6028,0x63A9,0x63F4,
-	0x6CBF,0x6F14,0x708E,0x7114,0x7159,0x71D5,0x733F,0x7E01,
-	0x8276,0x82D1,0x8597,0x9060,0x925B,0x9D1B,0x5869,0x65BC,
-	0x6C5A,0x7525,0x51F9,0x592E,0x5965,0x5F80,0x5FDC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 51, Array index 0x0B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x62BC,0x65FA,0x6A2A,0x6B27,0x6BB4,0x738B,0x7FC1,
-	0x8956,0x9D2C,0x9D0E,0x9EC4,0x5CA1,0x6C96,0x837B,0x5104,
-	0x5C4B,0x61B6,0x81C6,0x6876,0x7261,0x4E59,0x4FFA,0x5378,
-	0x6069,0x6E29,0x7A4F,0x97F3,0x4E0B,0x5316,0x4EEE,0x4F55,
-	0x4F3D,0x4FA1,0x4F73,0x52A0,0x53EF,0x5609,0x590F,0x5AC1,
-	0x5BB6,0x5BE1,0x79D1,0x6687,0x679C,0x67B6,0x6B4C,0x6CB3,
-	0x706B,0x73C2,0x798D,0x79BE,0x7A3C,0x7B87,0x82B1,0x82DB,
-	0x8304,0x8377,0x83EF,0x83D3,0x8766,0x8AB2,0x5629,0x8CA8,
-	0x8FE6,0x904E,0x971E,0x868A,0x4FC4,0x5CE8,0x6211,0x7259,
-	0x753B,0x81E5,0x82BD,0x86FE,0x8CC0,0x96C5,0x9913,0x99D5,
-	0x4ECB,0x4F1A,0x89E3,0x56DE,0x584A,0x58CA,0x5EFB,0x5FEB,
-	0x602A,0x6094,0x6062,0x61D0,0x6212,0x62D0,0x6539,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 52, Array index 0x0C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9B41,0x6666,0x68B0,0x6D77,0x7070,0x754C,0x7686,
-	0x7D75,0x82A5,0x87F9,0x958B,0x968E,0x8C9D,0x51F1,0x52BE,
-	0x5916,0x54B3,0x5BB3,0x5D16,0x6168,0x6982,0x6DAF,0x788D,
-	0x84CB,0x8857,0x8A72,0x93A7,0x9AB8,0x6D6C,0x99A8,0x86D9,
-	0x57A3,0x67FF,0x86CE,0x920E,0x5283,0x5687,0x5404,0x5ED3,
-	0x62E1,0x64B9,0x683C,0x6838,0x6BBB,0x7372,0x78BA,0x7A6B,
-	0x899A,0x89D2,0x8D6B,0x8F03,0x90ED,0x95A3,0x9694,0x9769,
-	0x5B66,0x5CB3,0x697D,0x984D,0x984E,0x639B,0x7B20,0x6A2B,
-	0x6A7F,0x68B6,0x9C0D,0x6F5F,0x5272,0x559D,0x6070,0x62EC,
-	0x6D3B,0x6E07,0x6ED1,0x845B,0x8910,0x8F44,0x4E14,0x9C39,
-	0x53F6,0x691B,0x6A3A,0x9784,0x682A,0x515C,0x7AC3,0x84B2,
-	0x91DC,0x938C,0x565B,0x9D28,0x6822,0x8305,0x8431,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 53, Array index 0x0D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7CA5,0x5208,0x82C5,0x74E6,0x4E7E,0x4F83,0x51A0,
-	0x5BD2,0x520A,0x52D8,0x52E7,0x5DFB,0x559A,0x582A,0x59E6,
-	0x5B8C,0x5B98,0x5BDB,0x5E72,0x5E79,0x60A3,0x611F,0x6163,
-	0x61BE,0x63DB,0x6562,0x67D1,0x6853,0x68FA,0x6B3E,0x6B53,
-	0x6C57,0x6F22,0x6F97,0x6F45,0x74B0,0x7518,0x76E3,0x770B,
-	0x7AFF,0x7BA1,0x7C21,0x7DE9,0x7F36,0x7FF0,0x809D,0x8266,
-	0x839E,0x89B3,0x8ACC,0x8CAB,0x9084,0x9451,0x9593,0x9591,
-	0x95A2,0x9665,0x97D3,0x9928,0x8218,0x4E38,0x542B,0x5CB8,
-	0x5DCC,0x73A9,0x764C,0x773C,0x5CA9,0x7FEB,0x8D0B,0x96C1,
-	0x9811,0x9854,0x9858,0x4F01,0x4F0E,0x5371,0x559C,0x5668,
-	0x57FA,0x5947,0x5B09,0x5BC4,0x5C90,0x5E0C,0x5E7E,0x5FCC,
-	0x63EE,0x673A,0x65D7,0x65E2,0x671F,0x68CB,0x68C4,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 54, Array index 0x0E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A5F,0x5E30,0x6BC5,0x6C17,0x6C7D,0x757F,0x7948,
-	0x5B63,0x7A00,0x7D00,0x5FBD,0x898F,0x8A18,0x8CB4,0x8D77,
-	0x8ECC,0x8F1D,0x98E2,0x9A0E,0x9B3C,0x4E80,0x507D,0x5100,
-	0x5993,0x5B9C,0x622F,0x6280,0x64EC,0x6B3A,0x72A0,0x7591,
-	0x7947,0x7FA9,0x87FB,0x8ABC,0x8B70,0x63AC,0x83CA,0x97A0,
-	0x5409,0x5403,0x55AB,0x6854,0x6A58,0x8A70,0x7827,0x6775,
-	0x9ECD,0x5374,0x5BA2,0x811A,0x8650,0x9006,0x4E18,0x4E45,
-	0x4EC7,0x4F11,0x53CA,0x5438,0x5BAE,0x5F13,0x6025,0x6551,
-	0x673D,0x6C42,0x6C72,0x6CE3,0x7078,0x7403,0x7A76,0x7AAE,
-	0x7B08,0x7D1A,0x7CFE,0x7D66,0x65E7,0x725B,0x53BB,0x5C45,
-	0x5DE8,0x62D2,0x62E0,0x6319,0x6E20,0x865A,0x8A31,0x8DDD,
-	0x92F8,0x6F01,0x79A6,0x9B5A,0x4EA8,0x4EAB,0x4EAC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 55, Array index 0x0F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F9B,0x4FA0,0x50D1,0x5147,0x7AF6,0x5171,0x51F6,
-	0x5354,0x5321,0x537F,0x53EB,0x55AC,0x5883,0x5CE1,0x5F37,
-	0x5F4A,0x602F,0x6050,0x606D,0x631F,0x6559,0x6A4B,0x6CC1,
-	0x72C2,0x72ED,0x77EF,0x80F8,0x8105,0x8208,0x854E,0x90F7,
-	0x93E1,0x97FF,0x9957,0x9A5A,0x4EF0,0x51DD,0x5C2D,0x6681,
-	0x696D,0x5C40,0x66F2,0x6975,0x7389,0x6850,0x7C81,0x50C5,
-	0x52E4,0x5747,0x5DFE,0x9326,0x65A4,0x6B23,0x6B3D,0x7434,
-	0x7981,0x79BD,0x7B4B,0x7DCA,0x82B9,0x83CC,0x887F,0x895F,
-	0x8B39,0x8FD1,0x91D1,0x541F,0x9280,0x4E5D,0x5036,0x53E5,
-	0x533A,0x72D7,0x7396,0x77E9,0x82E6,0x8EAF,0x99C6,0x99C8,
-	0x99D2,0x5177,0x611A,0x865E,0x55B0,0x7A7A,0x5076,0x5BD3,
-	0x9047,0x9685,0x4E32,0x6ADB,0x91E7,0x5C51,0x5C48,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 56, Array index 0x1000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6398,0x7A9F,0x6C93,0x9774,0x8F61,0x7AAA,0x718A,
-	0x9688,0x7C82,0x6817,0x7E70,0x6851,0x936C,0x52F2,0x541B,
-	0x85AB,0x8A13,0x7FA4,0x8ECD,0x90E1,0x5366,0x8888,0x7941,
-	0x4FC2,0x50BE,0x5211,0x5144,0x5553,0x572D,0x73EA,0x578B,
-	0x5951,0x5F62,0x5F84,0x6075,0x6176,0x6167,0x61A9,0x63B2,
-	0x643A,0x656C,0x666F,0x6842,0x6E13,0x7566,0x7A3D,0x7CFB,
-	0x7D4C,0x7D99,0x7E4B,0x7F6B,0x830E,0x834A,0x86CD,0x8A08,
-	0x8A63,0x8B66,0x8EFD,0x981A,0x9D8F,0x82B8,0x8FCE,0x9BE8,
-	0x5287,0x621F,0x6483,0x6FC0,0x9699,0x6841,0x5091,0x6B20,
-	0x6C7A,0x6F54,0x7A74,0x7D50,0x8840,0x8A23,0x6708,0x4EF6,
-	0x5039,0x5026,0x5065,0x517C,0x5238,0x5263,0x55A7,0x570F,
-	0x5805,0x5ACC,0x5EFA,0x61B2,0x61F8,0x62F3,0x6372,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 57, Array index 0x1100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x691C,0x6A29,0x727D,0x72AC,0x732E,0x7814,0x786F,
-	0x7D79,0x770C,0x80A9,0x898B,0x8B19,0x8CE2,0x8ED2,0x9063,
-	0x9375,0x967A,0x9855,0x9A13,0x9E78,0x5143,0x539F,0x53B3,
-	0x5E7B,0x5F26,0x6E1B,0x6E90,0x7384,0x73FE,0x7D43,0x8237,
-	0x8A00,0x8AFA,0x9650,0x4E4E,0x500B,0x53E4,0x547C,0x56FA,
-	0x59D1,0x5B64,0x5DF1,0x5EAB,0x5F27,0x6238,0x6545,0x67AF,
-	0x6E56,0x72D0,0x7CCA,0x88B4,0x80A1,0x80E1,0x83F0,0x864E,
-	0x8A87,0x8DE8,0x9237,0x96C7,0x9867,0x9F13,0x4E94,0x4E92,
-	0x4F0D,0x5348,0x5449,0x543E,0x5A2F,0x5F8C,0x5FA1,0x609F,
-	0x68A7,0x6A8E,0x745A,0x7881,0x8A9E,0x8AA4,0x8B77,0x9190,
-	0x4E5E,0x9BC9,0x4EA4,0x4F7C,0x4FAF,0x5019,0x5016,0x5149,
-	0x516C,0x529F,0x52B9,0x52FE,0x539A,0x53E3,0x5411,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 58, Array index 0x1200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x540E,0x5589,0x5751,0x57A2,0x597D,0x5B54,0x5B5D,
-	0x5B8F,0x5DE5,0x5DE7,0x5DF7,0x5E78,0x5E83,0x5E9A,0x5EB7,
-	0x5F18,0x6052,0x614C,0x6297,0x62D8,0x63A7,0x653B,0x6602,
-	0x6643,0x66F4,0x676D,0x6821,0x6897,0x69CB,0x6C5F,0x6D2A,
-	0x6D69,0x6E2F,0x6E9D,0x7532,0x7687,0x786C,0x7A3F,0x7CE0,
-	0x7D05,0x7D18,0x7D5E,0x7DB1,0x8015,0x8003,0x80AF,0x80B1,
-	0x8154,0x818F,0x822A,0x8352,0x884C,0x8861,0x8B1B,0x8CA2,
-	0x8CFC,0x90CA,0x9175,0x9271,0x783F,0x92FC,0x95A4,0x964D,
-	0x9805,0x9999,0x9AD8,0x9D3B,0x525B,0x52AB,0x53F7,0x5408,
-	0x58D5,0x62F7,0x6FE0,0x8C6A,0x8F5F,0x9EB9,0x514B,0x523B,
-	0x544A,0x56FD,0x7A40,0x9177,0x9D60,0x9ED2,0x7344,0x6F09,
-	0x8170,0x7511,0x5FFD,0x60DA,0x9AA8,0x72DB,0x8FBC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 59, Array index 0x1300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B64,0x9803,0x4ECA,0x56F0,0x5764,0x58BE,0x5A5A,
-	0x6068,0x61C7,0x660F,0x6606,0x6839,0x68B1,0x6DF7,0x75D5,
-	0x7D3A,0x826E,0x9B42,0x4E9B,0x4F50,0x53C9,0x5506,0x5D6F,
-	0x5DE6,0x5DEE,0x67FB,0x6C99,0x7473,0x7802,0x8A50,0x9396,
-	0x88DF,0x5750,0x5EA7,0x632B,0x50B5,0x50AC,0x518D,0x6700,
-	0x54C9,0x585E,0x59BB,0x5BB0,0x5F69,0x624D,0x63A1,0x683D,
-	0x6B73,0x6E08,0x707D,0x91C7,0x7280,0x7815,0x7826,0x796D,
-	0x658E,0x7D30,0x83DC,0x88C1,0x8F09,0x969B,0x5264,0x5728,
-	0x6750,0x7F6A,0x8CA1,0x51B4,0x5742,0x962A,0x583A,0x698A,
-	0x80B4,0x54B2,0x5D0E,0x57FC,0x7895,0x9DFA,0x4F5C,0x524A,
-	0x548B,0x643E,0x6628,0x6714,0x67F5,0x7A84,0x7B56,0x7D22,
-	0x932F,0x685C,0x9BAD,0x7B39,0x5319,0x518A,0x5237,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 60, Array index 0x1400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5BDF,0x62F6,0x64AE,0x64E6,0x672D,0x6BBA,0x85A9,
-	0x96D1,0x7690,0x9BD6,0x634C,0x9306,0x9BAB,0x76BF,0x6652,
-	0x4E09,0x5098,0x53C2,0x5C71,0x60E8,0x6492,0x6563,0x685F,
-	0x71E6,0x73CA,0x7523,0x7B97,0x7E82,0x8695,0x8B83,0x8CDB,
-	0x9178,0x9910,0x65AC,0x66AB,0x6B8B,0x4ED5,0x4ED4,0x4F3A,
-	0x4F7F,0x523A,0x53F8,0x53F2,0x55E3,0x56DB,0x58EB,0x59CB,
-	0x59C9,0x59FF,0x5B50,0x5C4D,0x5E02,0x5E2B,0x5FD7,0x601D,
-	0x6307,0x652F,0x5B5C,0x65AF,0x65BD,0x65E8,0x679D,0x6B62,
-	0x6B7B,0x6C0F,0x7345,0x7949,0x79C1,0x7CF8,0x7D19,0x7D2B,
-	0x80A2,0x8102,0x81F3,0x8996,0x8A5E,0x8A69,0x8A66,0x8A8C,
-	0x8AEE,0x8CC7,0x8CDC,0x96CC,0x98FC,0x6B6F,0x4E8B,0x4F3C,
-	0x4F8D,0x5150,0x5B57,0x5BFA,0x6148,0x6301,0x6642,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 61, Array index 0x1500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B21,0x6ECB,0x6CBB,0x723E,0x74BD,0x75D4,0x78C1,
-	0x793A,0x800C,0x8033,0x81EA,0x8494,0x8F9E,0x6C50,0x9E7F,
-	0x5F0F,0x8B58,0x9D2B,0x7AFA,0x8EF8,0x5B8D,0x96EB,0x4E03,
-	0x53F1,0x57F7,0x5931,0x5AC9,0x5BA4,0x6089,0x6E7F,0x6F06,
-	0x75BE,0x8CEA,0x5B9F,0x8500,0x7BE0,0x5072,0x67F4,0x829D,
-	0x5C61,0x854A,0x7E1E,0x820E,0x5199,0x5C04,0x6368,0x8D66,
-	0x659C,0x716E,0x793E,0x7D17,0x8005,0x8B1D,0x8ECA,0x906E,
-	0x86C7,0x90AA,0x501F,0x52FA,0x5C3A,0x6753,0x707C,0x7235,
-	0x914C,0x91C8,0x932B,0x82E5,0x5BC2,0x5F31,0x60F9,0x4E3B,
-	0x53D6,0x5B88,0x624B,0x6731,0x6B8A,0x72E9,0x73E0,0x7A2E,
-	0x816B,0x8DA3,0x9152,0x9996,0x5112,0x53D7,0x546A,0x5BFF,
-	0x6388,0x6A39,0x7DAC,0x9700,0x56DA,0x53CE,0x5468,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 62, Array index 0x1600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5B97,0x5C31,0x5DDE,0x4FEE,0x6101,0x62FE,0x6D32,
-	0x79C0,0x79CB,0x7D42,0x7E4D,0x7FD2,0x81ED,0x821F,0x8490,
-	0x8846,0x8972,0x8B90,0x8E74,0x8F2F,0x9031,0x914B,0x916C,
-	0x96C6,0x919C,0x4EC0,0x4F4F,0x5145,0x5341,0x5F93,0x620E,
-	0x67D4,0x6C41,0x6E0B,0x7363,0x7E26,0x91CD,0x9283,0x53D4,
-	0x5919,0x5BBF,0x6DD1,0x795D,0x7E2E,0x7C9B,0x587E,0x719F,
-	0x51FA,0x8853,0x8FF0,0x4FCA,0x5CFB,0x6625,0x77AC,0x7AE3,
-	0x821C,0x99FF,0x51C6,0x5FAA,0x65EC,0x696F,0x6B89,0x6DF3,
-	0x6E96,0x6F64,0x76FE,0x7D14,0x5DE1,0x9075,0x9187,0x9806,
-	0x51E6,0x521D,0x6240,0x6691,0x66D9,0x6E1A,0x5EB6,0x7DD2,
-	0x7F72,0x66F8,0x85AF,0x85F7,0x8AF8,0x52A9,0x53D9,0x5973,
-	0x5E8F,0x5F90,0x6055,0x92E4,0x9664,0x50B7,0x511F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 63, Array index 0x1700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x52DD,0x5320,0x5347,0x53EC,0x54E8,0x5546,0x5531,
-	0x5617,0x5968,0x59BE,0x5A3C,0x5BB5,0x5C06,0x5C0F,0x5C11,
-	0x5C1A,0x5E84,0x5E8A,0x5EE0,0x5F70,0x627F,0x6284,0x62DB,
-	0x638C,0x6377,0x6607,0x660C,0x662D,0x6676,0x677E,0x68A2,
-	0x6A1F,0x6A35,0x6CBC,0x6D88,0x6E09,0x6E58,0x713C,0x7126,
-	0x7167,0x75C7,0x7701,0x785D,0x7901,0x7965,0x79F0,0x7AE0,
-	0x7B11,0x7CA7,0x7D39,0x8096,0x83D6,0x848B,0x8549,0x885D,
-	0x88F3,0x8A1F,0x8A3C,0x8A54,0x8A73,0x8C61,0x8CDE,0x91A4,
-	0x9266,0x937E,0x9418,0x969C,0x9798,0x4E0A,0x4E08,0x4E1E,
-	0x4E57,0x5197,0x5270,0x57CE,0x5834,0x58CC,0x5B22,0x5E38,
-	0x60C5,0x64FE,0x6761,0x6756,0x6D44,0x72B6,0x7573,0x7A63,
-	0x84B8,0x8B72,0x91B8,0x9320,0x5631,0x57F4,0x98FE,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 64, Array index 0x1800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x62ED,0x690D,0x6B96,0x71ED,0x7E54,0x8077,0x8272,
-	0x89E6,0x98DF,0x8755,0x8FB1,0x5C3B,0x4F38,0x4FE1,0x4FB5,
-	0x5507,0x5A20,0x5BDD,0x5BE9,0x5FC3,0x614E,0x632F,0x65B0,
-	0x664B,0x68EE,0x699B,0x6D78,0x6DF1,0x7533,0x75B9,0x771F,
-	0x795E,0x79E6,0x7D33,0x81E3,0x82AF,0x85AA,0x89AA,0x8A3A,
-	0x8EAB,0x8F9B,0x9032,0x91DD,0x9707,0x4EBA,0x4EC1,0x5203,
-	0x5875,0x58EC,0x5C0B,0x751A,0x5C3D,0x814E,0x8A0A,0x8FC5,
-	0x9663,0x976D,0x7B25,0x8ACF,0x9808,0x9162,0x56F3,0x53A8,
-	0x9017,0x5439,0x5782,0x5E25,0x63A8,0x6C34,0x708A,0x7761,
-	0x7C8B,0x7FE0,0x8870,0x9042,0x9154,0x9310,0x9318,0x968F,
-	0x745E,0x9AC4,0x5D07,0x5D69,0x6570,0x67A2,0x8DA8,0x96DB,
-	0x636E,0x6749,0x6919,0x83C5,0x9817,0x96C0,0x88FE,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 65, Array index 0x1900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F84,0x647A,0x5BF8,0x4E16,0x702C,0x755D,0x662F,
-	0x51C4,0x5236,0x52E2,0x59D3,0x5F81,0x6027,0x6210,0x653F,
-	0x6574,0x661F,0x6674,0x68F2,0x6816,0x6B63,0x6E05,0x7272,
-	0x751F,0x76DB,0x7CBE,0x8056,0x58F0,0x88FD,0x897F,0x8AA0,
-	0x8A93,0x8ACB,0x901D,0x9192,0x9752,0x9759,0x6589,0x7A0E,
-	0x8106,0x96BB,0x5E2D,0x60DC,0x621A,0x65A5,0x6614,0x6790,
-	0x77F3,0x7A4D,0x7C4D,0x7E3E,0x810A,0x8CAC,0x8D64,0x8DE1,
-	0x8E5F,0x78A9,0x5207,0x62D9,0x63A5,0x6442,0x6298,0x8A2D,
-	0x7A83,0x7BC0,0x8AAC,0x96EA,0x7D76,0x820C,0x8749,0x4ED9,
-	0x5148,0x5343,0x5360,0x5BA3,0x5C02,0x5C16,0x5DDD,0x6226,
-	0x6247,0x64B0,0x6813,0x6834,0x6CC9,0x6D45,0x6D17,0x67D3,
-	0x6F5C,0x714E,0x717D,0x65CB,0x7A7F,0x7BAD,0x7DDA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 66, Array index 0x1A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7E4A,0x7FA8,0x817A,0x821B,0x8239,0x85A6,0x8A6E,
-	0x8CCE,0x8DF5,0x9078,0x9077,0x92AD,0x9291,0x9583,0x9BAE,
-	0x524D,0x5584,0x6F38,0x7136,0x5168,0x7985,0x7E55,0x81B3,
-	0x7CCE,0x564C,0x5851,0x5CA8,0x63AA,0x66FE,0x66FD,0x695A,
-	0x72D9,0x758F,0x758E,0x790E,0x7956,0x79DF,0x7C97,0x7D20,
-	0x7D44,0x8607,0x8A34,0x963B,0x9061,0x9F20,0x50E7,0x5275,
-	0x53CC,0x53E2,0x5009,0x55AA,0x58EE,0x594F,0x723D,0x5B8B,
-	0x5C64,0x531D,0x60E3,0x60F3,0x635C,0x6383,0x633F,0x63BB,
-	0x64CD,0x65E9,0x66F9,0x5DE3,0x69CD,0x69FD,0x6F15,0x71E5,
-	0x4E89,0x75E9,0x76F8,0x7A93,0x7CDF,0x7DCF,0x7D9C,0x8061,
-	0x8349,0x8358,0x846C,0x84BC,0x85FB,0x88C5,0x8D70,0x9001,
-	0x906D,0x9397,0x971C,0x9A12,0x50CF,0x5897,0x618E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 67, Array index 0x1B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x81D3,0x8535,0x8D08,0x9020,0x4FC3,0x5074,0x5247,
-	0x5373,0x606F,0x6349,0x675F,0x6E2C,0x8DB3,0x901F,0x4FD7,
-	0x5C5E,0x8CCA,0x65CF,0x7D9A,0x5352,0x8896,0x5176,0x63C3,
-	0x5B58,0x5B6B,0x5C0A,0x640D,0x6751,0x905C,0x4ED6,0x591A,
-	0x592A,0x6C70,0x8A51,0x553E,0x5815,0x59A5,0x60F0,0x6253,
-	0x67C1,0x8235,0x6955,0x9640,0x99C4,0x9A28,0x4F53,0x5806,
-	0x5BFE,0x8010,0x5CB1,0x5E2F,0x5F85,0x6020,0x614B,0x6234,
-	0x66FF,0x6CF0,0x6EDE,0x80CE,0x817F,0x82D4,0x888B,0x8CB8,
-	0x9000,0x902E,0x968A,0x9EDB,0x9BDB,0x4EE3,0x53F0,0x5927,
-	0x7B2C,0x918D,0x984C,0x9DF9,0x6EDD,0x7027,0x5353,0x5544,
-	0x5B85,0x6258,0x629E,0x62D3,0x6CA2,0x6FEF,0x7422,0x8A17,
-	0x9438,0x6FC1,0x8AFE,0x8338,0x51E7,0x86F8,0x53EA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 68, Array index 0x1C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x53E9,0x4F46,0x9054,0x8FB0,0x596A,0x8131,0x5DFD,
-	0x7AEA,0x8FBF,0x68DA,0x8C37,0x72F8,0x9C48,0x6A3D,0x8AB0,
-	0x4E39,0x5358,0x5606,0x5766,0x62C5,0x63A2,0x65E6,0x6B4E,
-	0x6DE1,0x6E5B,0x70AD,0x77ED,0x7AEF,0x7BAA,0x7DBB,0x803D,
-	0x80C6,0x86CB,0x8A95,0x935B,0x56E3,0x58C7,0x5F3E,0x65AD,
-	0x6696,0x6A80,0x6BB5,0x7537,0x8AC7,0x5024,0x77E5,0x5730,
-	0x5F1B,0x6065,0x667A,0x6C60,0x75F4,0x7A1A,0x7F6E,0x81F4,
-	0x8718,0x9045,0x99B3,0x7BC9,0x755C,0x7AF9,0x7B51,0x84C4,
-	0x9010,0x79E9,0x7A92,0x8336,0x5AE1,0x7740,0x4E2D,0x4EF2,
-	0x5B99,0x5FE0,0x62BD,0x663C,0x67F1,0x6CE8,0x866B,0x8877,
-	0x8A3B,0x914E,0x92F3,0x99D0,0x6A17,0x7026,0x732A,0x82E7,
-	0x8457,0x8CAF,0x4E01,0x5146,0x51CB,0x558B,0x5BF5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 69, Array index 0x1D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5E16,0x5E33,0x5E81,0x5F14,0x5F35,0x5F6B,0x5FB4,
-	0x61F2,0x6311,0x66A2,0x671D,0x6F6E,0x7252,0x753A,0x773A,
-	0x8074,0x8139,0x8178,0x8776,0x8ABF,0x8ADC,0x8D85,0x8DF3,
-	0x929A,0x9577,0x9802,0x9CE5,0x52C5,0x6357,0x76F4,0x6715,
-	0x6C88,0x73CD,0x8CC3,0x93AE,0x9673,0x6D25,0x589C,0x690E,
-	0x69CC,0x8FFD,0x939A,0x75DB,0x901A,0x585A,0x6802,0x63B4,
-	0x69FB,0x4F43,0x6F2C,0x67D8,0x8FBB,0x8526,0x7DB4,0x9354,
-	0x693F,0x6F70,0x576A,0x58F7,0x5B2C,0x7D2C,0x722A,0x540A,
-	0x91E3,0x9DB4,0x4EAD,0x4F4E,0x505C,0x5075,0x5243,0x8C9E,
-	0x5448,0x5824,0x5B9A,0x5E1D,0x5E95,0x5EAD,0x5EF7,0x5F1F,
-	0x608C,0x62B5,0x633A,0x63D0,0x68AF,0x6C40,0x7887,0x798E,
-	0x7A0B,0x7DE0,0x8247,0x8A02,0x8AE6,0x8E44,0x9013,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 70, Array index 0x1E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x90B8,0x912D,0x91D8,0x9F0E,0x6CE5,0x6458,0x64E2,
-	0x6575,0x6EF4,0x7684,0x7B1B,0x9069,0x93D1,0x6EBA,0x54F2,
-	0x5FB9,0x64A4,0x8F4D,0x8FED,0x9244,0x5178,0x586B,0x5929,
-	0x5C55,0x5E97,0x6DFB,0x7E8F,0x751C,0x8CBC,0x8EE2,0x985B,
-	0x70B9,0x4F1D,0x6BBF,0x6FB1,0x7530,0x96FB,0x514E,0x5410,
-	0x5835,0x5857,0x59AC,0x5C60,0x5F92,0x6597,0x675C,0x6E21,
-	0x767B,0x83DF,0x8CED,0x9014,0x90FD,0x934D,0x7825,0x783A,
-	0x52AA,0x5EA6,0x571F,0x5974,0x6012,0x5012,0x515A,0x51AC,
-	0x51CD,0x5200,0x5510,0x5854,0x5858,0x5957,0x5B95,0x5CF6,
-	0x5D8B,0x60BC,0x6295,0x642D,0x6771,0x6843,0x68BC,0x68DF,
-	0x76D7,0x6DD8,0x6E6F,0x6D9B,0x706F,0x71C8,0x5F53,0x75D8,
-	0x7977,0x7B49,0x7B54,0x7B52,0x7CD6,0x7D71,0x5230,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 71, Array index 0x1F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8463,0x8569,0x85E4,0x8A0E,0x8B04,0x8C46,0x8E0F,
-	0x9003,0x900F,0x9419,0x9676,0x982D,0x9A30,0x95D8,0x50CD,
-	0x52D5,0x540C,0x5802,0x5C0E,0x61A7,0x649E,0x6D1E,0x77B3,
-	0x7AE5,0x80F4,0x8404,0x9053,0x9285,0x5CE0,0x9D07,0x533F,
-	0x5F97,0x5FB3,0x6D9C,0x7279,0x7763,0x79BF,0x7BE4,0x6BD2,
-	0x72EC,0x8AAD,0x6803,0x6A61,0x51F8,0x7A81,0x6934,0x5C4A,
-	0x9CF6,0x82EB,0x5BC5,0x9149,0x701E,0x5678,0x5C6F,0x60C7,
-	0x6566,0x6C8C,0x8C5A,0x9041,0x9813,0x5451,0x66C7,0x920D,
-	0x5948,0x90A3,0x5185,0x4E4D,0x51EA,0x8599,0x8B0E,0x7058,
-	0x637A,0x934B,0x6962,0x99B4,0x7E04,0x7577,0x5357,0x6960,
-	0x8EDF,0x96E3,0x6C5D,0x4E8C,0x5C3C,0x5F10,0x8FE9,0x5302,
-	0x8CD1,0x8089,0x8679,0x5EFF,0x65E5,0x4E73,0x5165,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 72, Array index 0x2000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5982,0x5C3F,0x97EE,0x4EFB,0x598A,0x5FCD,0x8A8D,
-	0x6FE1,0x79B0,0x7962,0x5BE7,0x8471,0x732B,0x71B1,0x5E74,
-	0x5FF5,0x637B,0x649A,0x71C3,0x7C98,0x4E43,0x5EFC,0x4E4B,
-	0x57DC,0x56A2,0x60A9,0x6FC3,0x7D0D,0x80FD,0x8133,0x81BF,
-	0x8FB2,0x8997,0x86A4,0x5DF4,0x628A,0x64AD,0x8987,0x6777,
-	0x6CE2,0x6D3E,0x7436,0x7834,0x5A46,0x7F75,0x82AD,0x99AC,
-	0x4FF3,0x5EC3,0x62DD,0x6392,0x6557,0x676F,0x76C3,0x724C,
-	0x80CC,0x80BA,0x8F29,0x914D,0x500D,0x57F9,0x5A92,0x6885,
-	0x6973,0x7164,0x72FD,0x8CB7,0x58F2,0x8CE0,0x966A,0x9019,
-	0x877F,0x79E4,0x77E7,0x8429,0x4F2F,0x5265,0x535A,0x62CD,
-	0x67CF,0x6CCA,0x767D,0x7B94,0x7C95,0x8236,0x8584,0x8FEB,
-	0x66DD,0x6F20,0x7206,0x7E1B,0x83AB,0x99C1,0x9EA6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 73, Array index 0x2100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x51FD,0x7BB1,0x7872,0x7BB8,0x8087,0x7B48,0x6AE8,
-	0x5E61,0x808C,0x7551,0x7560,0x516B,0x9262,0x6E8C,0x767A,
-	0x9197,0x9AEA,0x4F10,0x7F70,0x629C,0x7B4F,0x95A5,0x9CE9,
-	0x567A,0x5859,0x86E4,0x96BC,0x4F34,0x5224,0x534A,0x53CD,
-	0x53DB,0x5E06,0x642C,0x6591,0x677F,0x6C3E,0x6C4E,0x7248,
-	0x72AF,0x73ED,0x7554,0x7E41,0x822C,0x85E9,0x8CA9,0x7BC4,
-	0x91C6,0x7169,0x9812,0x98EF,0x633D,0x6669,0x756A,0x76E4,
-	0x78D0,0x8543,0x86EE,0x532A,0x5351,0x5426,0x5983,0x5E87,
-	0x5F7C,0x60B2,0x6249,0x6279,0x62AB,0x6590,0x6BD4,0x6CCC,
-	0x75B2,0x76AE,0x7891,0x79D8,0x7DCB,0x7F77,0x80A5,0x88AB,
-	0x8AB9,0x8CBB,0x907F,0x975E,0x98DB,0x6A0B,0x7C38,0x5099,
-	0x5C3E,0x5FAE,0x6787,0x6BD8,0x7435,0x7709,0x7F8E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 74, Array index 0x2200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9F3B,0x67CA,0x7A17,0x5339,0x758B,0x9AED,0x5F66,
-	0x819D,0x83F1,0x8098,0x5F3C,0x5FC5,0x7562,0x7B46,0x903C,
-	0x6867,0x59EB,0x5A9B,0x7D10,0x767E,0x8B2C,0x4FF5,0x5F6A,
-	0x6A19,0x6C37,0x6F02,0x74E2,0x7968,0x8868,0x8A55,0x8C79,
-	0x5EDF,0x63CF,0x75C5,0x79D2,0x82D7,0x9328,0x92F2,0x849C,
-	0x86ED,0x9C2D,0x54C1,0x5F6C,0x658C,0x6D5C,0x7015,0x8CA7,
-	0x8CD3,0x983B,0x654F,0x74F6,0x4E0D,0x4ED8,0x57E0,0x592B,
-	0x5A66,0x5BCC,0x51A8,0x5E03,0x5E9C,0x6016,0x6276,0x6577,
-	0x65A7,0x666E,0x6D6E,0x7236,0x7B26,0x8150,0x819A,0x8299,
-	0x8B5C,0x8CA0,0x8CE6,0x8D74,0x961C,0x9644,0x4FAE,0x64AB,
-	0x6B66,0x821E,0x8461,0x856A,0x90E8,0x5C01,0x6953,0x98A8,
-	0x847A,0x8557,0x4F0F,0x526F,0x5FA9,0x5E45,0x670D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 75, Array index 0x2300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x798F,0x8179,0x8907,0x8986,0x6DF5,0x5F17,0x6255,
-	0x6CB8,0x4ECF,0x7269,0x9B92,0x5206,0x543B,0x5674,0x58B3,
-	0x61A4,0x626E,0x711A,0x596E,0x7C89,0x7CDE,0x7D1B,0x96F0,
-	0x6587,0x805E,0x4E19,0x4F75,0x5175,0x5840,0x5E63,0x5E73,
-	0x5F0A,0x67C4,0x4E26,0x853D,0x9589,0x965B,0x7C73,0x9801,
-	0x50FB,0x58C1,0x7656,0x78A7,0x5225,0x77A5,0x8511,0x7B86,
-	0x504F,0x5909,0x7247,0x7BC7,0x7DE8,0x8FBA,0x8FD4,0x904D,
-	0x4FBF,0x52C9,0x5A29,0x5F01,0x97AD,0x4FDD,0x8217,0x92EA,
-	0x5703,0x6355,0x6B69,0x752B,0x88DC,0x8F14,0x7A42,0x52DF,
-	0x5893,0x6155,0x620A,0x66AE,0x6BCD,0x7C3F,0x83E9,0x5023,
-	0x4FF8,0x5305,0x5446,0x5831,0x5949,0x5B9D,0x5CF0,0x5CEF,
-	0x5D29,0x5E96,0x62B1,0x6367,0x653E,0x65B9,0x670B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 76, Array index 0x2400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6CD5,0x6CE1,0x70F9,0x7832,0x7E2B,0x80DE,0x82B3,
-	0x840C,0x84EC,0x8702,0x8912,0x8A2A,0x8C4A,0x90A6,0x92D2,
-	0x98FD,0x9CF3,0x9D6C,0x4E4F,0x4EA1,0x508D,0x5256,0x574A,
-	0x59A8,0x5E3D,0x5FD8,0x5FD9,0x623F,0x66B4,0x671B,0x67D0,
-	0x68D2,0x5192,0x7D21,0x80AA,0x81A8,0x8B00,0x8C8C,0x8CBF,
-	0x927E,0x9632,0x5420,0x982C,0x5317,0x50D5,0x535C,0x58A8,
-	0x64B2,0x6734,0x7267,0x7766,0x7A46,0x91E6,0x52C3,0x6CA1,
-	0x6B86,0x5800,0x5E4C,0x5954,0x672C,0x7FFB,0x51E1,0x76C6,
-	0x6469,0x78E8,0x9B54,0x9EBB,0x57CB,0x59B9,0x6627,0x679A,
-	0x6BCE,0x54E9,0x69D9,0x5E55,0x819C,0x6795,0x9BAA,0x67FE,
-	0x9C52,0x685D,0x4EA6,0x4FE3,0x53C8,0x62B9,0x672B,0x6CAB,
-	0x8FC4,0x4FAD,0x7E6D,0x9EBF,0x4E07,0x6162,0x6E80,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 77, Array index 0x2500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F2B,0x8513,0x5473,0x672A,0x9B45,0x5DF3,0x7B95,
-	0x5CAC,0x5BC6,0x871C,0x6E4A,0x84D1,0x7A14,0x8108,0x5999,
-	0x7C8D,0x6C11,0x7720,0x52D9,0x5922,0x7121,0x725F,0x77DB,
-	0x9727,0x9D61,0x690B,0x5A7F,0x5A18,0x51A5,0x540D,0x547D,
-	0x660E,0x76DF,0x8FF7,0x9298,0x9CF4,0x59EA,0x725D,0x6EC5,
-	0x514D,0x68C9,0x7DBF,0x7DEC,0x9762,0x9EBA,0x6478,0x6A21,
-	0x8302,0x5984,0x5B5F,0x6BDB,0x731B,0x76F2,0x7DB2,0x8017,
-	0x8499,0x5132,0x6728,0x9ED9,0x76EE,0x6762,0x52FF,0x9905,
-	0x5C24,0x623B,0x7C7E,0x8CB0,0x554F,0x60B6,0x7D0B,0x9580,
-	0x5301,0x4E5F,0x51B6,0x591C,0x723A,0x8036,0x91CE,0x5F25,
-	0x77E2,0x5384,0x5F79,0x7D04,0x85AC,0x8A33,0x8E8D,0x9756,
-	0x67F3,0x85AE,0x9453,0x6109,0x6108,0x6CB9,0x7652,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 78, Array index 0x2600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8AED,0x8F38,0x552F,0x4F51,0x512A,0x52C7,0x53CB,
-	0x5BA5,0x5E7D,0x60A0,0x6182,0x63D6,0x6709,0x67DA,0x6E67,
-	0x6D8C,0x7336,0x7337,0x7531,0x7950,0x88D5,0x8A98,0x904A,
-	0x9091,0x90F5,0x96C4,0x878D,0x5915,0x4E88,0x4F59,0x4E0E,
-	0x8A89,0x8F3F,0x9810,0x50AD,0x5E7C,0x5996,0x5BB9,0x5EB8,
-	0x63DA,0x63FA,0x64C1,0x66DC,0x694A,0x69D8,0x6D0B,0x6EB6,
-	0x7194,0x7528,0x7AAF,0x7F8A,0x8000,0x8449,0x84C9,0x8981,
-	0x8B21,0x8E0A,0x9065,0x967D,0x990A,0x617E,0x6291,0x6B32,
-	0x6C83,0x6D74,0x7FCC,0x7FFC,0x6DC0,0x7F85,0x87BA,0x88F8,
-	0x6765,0x83B1,0x983C,0x96F7,0x6D1B,0x7D61,0x843D,0x916A,
-	0x4E71,0x5375,0x5D50,0x6B04,0x6FEB,0x85CD,0x862D,0x89A7,
-	0x5229,0x540F,0x5C65,0x674E,0x68A8,0x7406,0x7483,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 79, Array index 0x2700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x75E2,0x88CF,0x88E1,0x91CC,0x96E2,0x9678,0x5F8B,
-	0x7387,0x7ACB,0x844E,0x63A0,0x7565,0x5289,0x6D41,0x6E9C,
-	0x7409,0x7559,0x786B,0x7C92,0x9686,0x7ADC,0x9F8D,0x4FB6,
-	0x616E,0x65C5,0x865C,0x4E86,0x4EAE,0x50DA,0x4E21,0x51CC,
-	0x5BEE,0x6599,0x6881,0x6DBC,0x731F,0x7642,0x77AD,0x7A1C,
-	0x7CE7,0x826F,0x8AD2,0x907C,0x91CF,0x9675,0x9818,0x529B,
-	0x7DD1,0x502B,0x5398,0x6797,0x6DCB,0x71D0,0x7433,0x81E8,
-	0x8F2A,0x96A3,0x9C57,0x9E9F,0x7460,0x5841,0x6D99,0x7D2F,
-	0x985E,0x4EE4,0x4F36,0x4F8B,0x51B7,0x52B1,0x5DBA,0x601C,
-	0x73B2,0x793C,0x82D3,0x9234,0x96B7,0x96F6,0x970A,0x9E97,
-	0x9F62,0x66A6,0x6B74,0x5217,0x52A3,0x70C8,0x88C2,0x5EC9,
-	0x604B,0x6190,0x6F23,0x7149,0x7C3E,0x7DF4,0x806F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 80, Array index 0x2800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x84EE,0x9023,0x932C,0x5442,0x9B6F,0x6AD3,0x7089,
-	0x8CC2,0x8DEF,0x9732,0x52B4,0x5A41,0x5ECA,0x5F04,0x6717,
-	0x697C,0x6994,0x6D6A,0x6F0F,0x7262,0x72FC,0x7BED,0x8001,
-	0x807E,0x874B,0x90CE,0x516D,0x9E93,0x7984,0x808B,0x9332,
-	0x8AD6,0x502D,0x548C,0x8A71,0x6B6A,0x8CC4,0x8107,0x60D1,
-	0x67A0,0x9DF2,0x4E99,0x4E98,0x9C10,0x8A6B,0x85C1,0x8568,
-	0x6900,0x6E7E,0x7897,0x8155,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 81, Array index 0x2900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F0C,0x4E10,0x4E15,0x4E2A,0x4E31,0x4E36,0x4E3C,
-	0x4E3F,0x4E42,0x4E56,0x4E58,0x4E82,0x4E85,0x8C6B,0x4E8A,
-	0x8212,0x5F0D,0x4E8E,0x4E9E,0x4E9F,0x4EA0,0x4EA2,0x4EB0,
-	0x4EB3,0x4EB6,0x4ECE,0x4ECD,0x4EC4,0x4EC6,0x4EC2,0x4ED7,
-	0x4EDE,0x4EED,0x4EDF,0x4EF7,0x4F09,0x4F5A,0x4F30,0x4F5B,
-	0x4F5D,0x4F57,0x4F47,0x4F76,0x4F88,0x4F8F,0x4F98,0x4F7B,
-	0x4F69,0x4F70,0x4F91,0x4F6F,0x4F86,0x4F96,0x5118,0x4FD4,
-	0x4FDF,0x4FCE,0x4FD8,0x4FDB,0x4FD1,0x4FDA,0x4FD0,0x4FE4,
-	0x4FE5,0x501A,0x5028,0x5014,0x502A,0x5025,0x5005,0x4F1C,
-	0x4FF6,0x5021,0x5029,0x502C,0x4FFE,0x4FEF,0x5011,0x5006,
-	0x5043,0x5047,0x6703,0x5055,0x5050,0x5048,0x505A,0x5056,
-	0x506C,0x5078,0x5080,0x509A,0x5085,0x50B4,0x50B2,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 82, Array index 0x2A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x50C9,0x50CA,0x50B3,0x50C2,0x50D6,0x50DE,0x50E5,
-	0x50ED,0x50E3,0x50EE,0x50F9,0x50F5,0x5109,0x5101,0x5102,
-	0x5116,0x5115,0x5114,0x511A,0x5121,0x513A,0x5137,0x513C,
-	0x513B,0x513F,0x5140,0x5152,0x514C,0x5154,0x5162,0x7AF8,
-	0x5169,0x516A,0x516E,0x5180,0x5182,0x56D8,0x518C,0x5189,
-	0x518F,0x5191,0x5193,0x5195,0x5196,0x51A4,0x51A6,0x51A2,
-	0x51A9,0x51AA,0x51AB,0x51B3,0x51B1,0x51B2,0x51B0,0x51B5,
-	0x51BD,0x51C5,0x51C9,0x51DB,0x51E0,0x8655,0x51E9,0x51ED,
-	0x51F0,0x51F5,0x51FE,0x5204,0x520B,0x5214,0x520E,0x5227,
-	0x522A,0x522E,0x5233,0x5239,0x524F,0x5244,0x524B,0x524C,
-	0x525E,0x5254,0x526A,0x5274,0x5269,0x5273,0x527F,0x527D,
-	0x528D,0x5294,0x5292,0x5271,0x5288,0x5291,0x8FA8,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 83, Array index 0x2B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8FA7,0x52AC,0x52AD,0x52BC,0x52B5,0x52C1,0x52CD,
-	0x52D7,0x52DE,0x52E3,0x52E6,0x98ED,0x52E0,0x52F3,0x52F5,
-	0x52F8,0x52F9,0x5306,0x5308,0x7538,0x530D,0x5310,0x530F,
-	0x5315,0x531A,0x5323,0x532F,0x5331,0x5333,0x5338,0x5340,
-	0x5346,0x5345,0x4E17,0x5349,0x534D,0x51D6,0x535E,0x5369,
-	0x536E,0x5918,0x537B,0x5377,0x5382,0x5396,0x53A0,0x53A6,
-	0x53A5,0x53AE,0x53B0,0x53B6,0x53C3,0x7C12,0x96D9,0x53DF,
-	0x66FC,0x71EE,0x53EE,0x53E8,0x53ED,0x53FA,0x5401,0x543D,
-	0x5440,0x542C,0x542D,0x543C,0x542E,0x5436,0x5429,0x541D,
-	0x544E,0x548F,0x5475,0x548E,0x545F,0x5471,0x5477,0x5470,
-	0x5492,0x547B,0x5480,0x5476,0x5484,0x5490,0x5486,0x54C7,
-	0x54A2,0x54B8,0x54A5,0x54AC,0x54C4,0x54C8,0x54A8,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 84, Array index 0x2C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x54AB,0x54C2,0x54A4,0x54BE,0x54BC,0x54D8,0x54E5,
-	0x54E6,0x550F,0x5514,0x54FD,0x54EE,0x54ED,0x54FA,0x54E2,
-	0x5539,0x5540,0x5563,0x554C,0x552E,0x555C,0x5545,0x5556,
-	0x5557,0x5538,0x5533,0x555D,0x5599,0x5580,0x54AF,0x558A,
-	0x559F,0x557B,0x557E,0x5598,0x559E,0x55AE,0x557C,0x5583,
-	0x55A9,0x5587,0x55A8,0x55DA,0x55C5,0x55DF,0x55C4,0x55DC,
-	0x55E4,0x55D4,0x5614,0x55F7,0x5616,0x55FE,0x55FD,0x561B,
-	0x55F9,0x564E,0x5650,0x71DF,0x5634,0x5636,0x5632,0x5638,
-	0x566B,0x5664,0x562F,0x566C,0x566A,0x5686,0x5680,0x568A,
-	0x56A0,0x5694,0x568F,0x56A5,0x56AE,0x56B6,0x56B4,0x56C2,
-	0x56BC,0x56C1,0x56C3,0x56C0,0x56C8,0x56CE,0x56D1,0x56D3,
-	0x56D7,0x56EE,0x56F9,0x5700,0x56FF,0x5704,0x5709,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 85, Array index 0x2D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5708,0x570B,0x570D,0x5713,0x5718,0x5716,0x55C7,
-	0x571C,0x5726,0x5737,0x5738,0x574E,0x573B,0x5740,0x574F,
-	0x5769,0x57C0,0x5788,0x5761,0x577F,0x5789,0x5793,0x57A0,
-	0x57B3,0x57A4,0x57AA,0x57B0,0x57C3,0x57C6,0x57D4,0x57D2,
-	0x57D3,0x580A,0x57D6,0x57E3,0x580B,0x5819,0x581D,0x5872,
-	0x5821,0x5862,0x584B,0x5870,0x6BC0,0x5852,0x583D,0x5879,
-	0x5885,0x58B9,0x589F,0x58AB,0x58BA,0x58DE,0x58BB,0x58B8,
-	0x58AE,0x58C5,0x58D3,0x58D1,0x58D7,0x58D9,0x58D8,0x58E5,
-	0x58DC,0x58E4,0x58DF,0x58EF,0x58FA,0x58F9,0x58FB,0x58FC,
-	0x58FD,0x5902,0x590A,0x5910,0x591B,0x68A6,0x5925,0x592C,
-	0x592D,0x5932,0x5938,0x593E,0x7AD2,0x5955,0x5950,0x594E,
-	0x595A,0x5958,0x5962,0x5960,0x5967,0x596C,0x5969,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 86, Array index 0x2E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5978,0x5981,0x599D,0x4F5E,0x4FAB,0x59A3,0x59B2,
-	0x59C6,0x59E8,0x59DC,0x598D,0x59D9,0x59DA,0x5A25,0x5A1F,
-	0x5A11,0x5A1C,0x5A09,0x5A1A,0x5A40,0x5A6C,0x5A49,0x5A35,
-	0x5A36,0x5A62,0x5A6A,0x5A9A,0x5ABC,0x5ABE,0x5ACB,0x5AC2,
-	0x5ABD,0x5AE3,0x5AD7,0x5AE6,0x5AE9,0x5AD6,0x5AFA,0x5AFB,
-	0x5B0C,0x5B0B,0x5B16,0x5B32,0x5AD0,0x5B2A,0x5B36,0x5B3E,
-	0x5B43,0x5B45,0x5B40,0x5B51,0x5B55,0x5B5A,0x5B5B,0x5B65,
-	0x5B69,0x5B70,0x5B73,0x5B75,0x5B78,0x6588,0x5B7A,0x5B80,
-	0x5B83,0x5BA6,0x5BB8,0x5BC3,0x5BC7,0x5BC9,0x5BD4,0x5BD0,
-	0x5BE4,0x5BE6,0x5BE2,0x5BDE,0x5BE5,0x5BEB,0x5BF0,0x5BF6,
-	0x5BF3,0x5C05,0x5C07,0x5C08,0x5C0D,0x5C13,0x5C20,0x5C22,
-	0x5C28,0x5C38,0x5C39,0x5C41,0x5C46,0x5C4E,0x5C53,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 87, Array index 0x2F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C50,0x5C4F,0x5B71,0x5C6C,0x5C6E,0x4E62,0x5C76,
-	0x5C79,0x5C8C,0x5C91,0x5C94,0x599B,0x5CAB,0x5CBB,0x5CB6,
-	0x5CBC,0x5CB7,0x5CC5,0x5CBE,0x5CC7,0x5CD9,0x5CE9,0x5CFD,
-	0x5CFA,0x5CED,0x5D8C,0x5CEA,0x5D0B,0x5D15,0x5D17,0x5D5C,
-	0x5D1F,0x5D1B,0x5D11,0x5D14,0x5D22,0x5D1A,0x5D19,0x5D18,
-	0x5D4C,0x5D52,0x5D4E,0x5D4B,0x5D6C,0x5D73,0x5D76,0x5D87,
-	0x5D84,0x5D82,0x5DA2,0x5D9D,0x5DAC,0x5DAE,0x5DBD,0x5D90,
-	0x5DB7,0x5DBC,0x5DC9,0x5DCD,0x5DD3,0x5DD2,0x5DD6,0x5DDB,
-	0x5DEB,0x5DF2,0x5DF5,0x5E0B,0x5E1A,0x5E19,0x5E11,0x5E1B,
-	0x5E36,0x5E37,0x5E44,0x5E43,0x5E40,0x5E4E,0x5E57,0x5E54,
-	0x5E5F,0x5E62,0x5E64,0x5E47,0x5E75,0x5E76,0x5E7A,0x9EBC,
-	0x5E7F,0x5EA0,0x5EC1,0x5EC2,0x5EC8,0x5ED0,0x5ECF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 88, Array index 0x3000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5ED6,0x5EE3,0x5EDD,0x5EDA,0x5EDB,0x5EE2,0x5EE1,
-	0x5EE8,0x5EE9,0x5EEC,0x5EF1,0x5EF3,0x5EF0,0x5EF4,0x5EF8,
-	0x5EFE,0x5F03,0x5F09,0x5F5D,0x5F5C,0x5F0B,0x5F11,0x5F16,
-	0x5F29,0x5F2D,0x5F38,0x5F41,0x5F48,0x5F4C,0x5F4E,0x5F2F,
-	0x5F51,0x5F56,0x5F57,0x5F59,0x5F61,0x5F6D,0x5F73,0x5F77,
-	0x5F83,0x5F82,0x5F7F,0x5F8A,0x5F88,0x5F91,0x5F87,0x5F9E,
-	0x5F99,0x5F98,0x5FA0,0x5FA8,0x5FAD,0x5FBC,0x5FD6,0x5FFB,
-	0x5FE4,0x5FF8,0x5FF1,0x5FDD,0x60B3,0x5FFF,0x6021,0x6060,
-	0x6019,0x6010,0x6029,0x600E,0x6031,0x601B,0x6015,0x602B,
-	0x6026,0x600F,0x603A,0x605A,0x6041,0x606A,0x6077,0x605F,
-	0x604A,0x6046,0x604D,0x6063,0x6043,0x6064,0x6042,0x606C,
-	0x606B,0x6059,0x6081,0x608D,0x60E7,0x6083,0x609A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 89, Array index 0x3100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6084,0x609B,0x6096,0x6097,0x6092,0x60A7,0x608B,
-	0x60E1,0x60B8,0x60E0,0x60D3,0x60B4,0x5FF0,0x60BD,0x60C6,
-	0x60B5,0x60D8,0x614D,0x6115,0x6106,0x60F6,0x60F7,0x6100,
-	0x60F4,0x60FA,0x6103,0x6121,0x60FB,0x60F1,0x610D,0x610E,
-	0x6147,0x613E,0x6128,0x6127,0x614A,0x613F,0x613C,0x612C,
-	0x6134,0x613D,0x6142,0x6144,0x6173,0x6177,0x6158,0x6159,
-	0x615A,0x616B,0x6174,0x616F,0x6165,0x6171,0x615F,0x615D,
-	0x6153,0x6175,0x6199,0x6196,0x6187,0x61AC,0x6194,0x619A,
-	0x618A,0x6191,0x61AB,0x61AE,0x61CC,0x61CA,0x61C9,0x61F7,
-	0x61C8,0x61C3,0x61C6,0x61BA,0x61CB,0x7F79,0x61CD,0x61E6,
-	0x61E3,0x61F6,0x61FA,0x61F4,0x61FF,0x61FD,0x61FC,0x61FE,
-	0x6200,0x6208,0x6209,0x620D,0x620C,0x6214,0x621B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 90, Array index 0x3200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x621E,0x6221,0x622A,0x622E,0x6230,0x6232,0x6233,
-	0x6241,0x624E,0x625E,0x6263,0x625B,0x6260,0x6268,0x627C,
-	0x6282,0x6289,0x627E,0x6292,0x6293,0x6296,0x62D4,0x6283,
-	0x6294,0x62D7,0x62D1,0x62BB,0x62CF,0x62FF,0x62C6,0x64D4,
-	0x62C8,0x62DC,0x62CC,0x62CA,0x62C2,0x62C7,0x629B,0x62C9,
-	0x630C,0x62EE,0x62F1,0x6327,0x6302,0x6308,0x62EF,0x62F5,
-	0x6350,0x633E,0x634D,0x641C,0x634F,0x6396,0x638E,0x6380,
-	0x63AB,0x6376,0x63A3,0x638F,0x6389,0x639F,0x63B5,0x636B,
-	0x6369,0x63BE,0x63E9,0x63C0,0x63C6,0x63E3,0x63C9,0x63D2,
-	0x63F6,0x63C4,0x6416,0x6434,0x6406,0x6413,0x6426,0x6436,
-	0x651D,0x6417,0x6428,0x640F,0x6467,0x646F,0x6476,0x644E,
-	0x652A,0x6495,0x6493,0x64A5,0x64A9,0x6488,0x64BC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 91, Array index 0x3300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x64DA,0x64D2,0x64C5,0x64C7,0x64BB,0x64D8,0x64C2,
-	0x64F1,0x64E7,0x8209,0x64E0,0x64E1,0x62AC,0x64E3,0x64EF,
-	0x652C,0x64F6,0x64F4,0x64F2,0x64FA,0x6500,0x64FD,0x6518,
-	0x651C,0x6505,0x6524,0x6523,0x652B,0x6534,0x6535,0x6537,
-	0x6536,0x6538,0x754B,0x6548,0x6556,0x6555,0x654D,0x6558,
-	0x655E,0x655D,0x6572,0x6578,0x6582,0x6583,0x8B8A,0x659B,
-	0x659F,0x65AB,0x65B7,0x65C3,0x65C6,0x65C1,0x65C4,0x65CC,
-	0x65D2,0x65DB,0x65D9,0x65E0,0x65E1,0x65F1,0x6772,0x660A,
-	0x6603,0x65FB,0x6773,0x6635,0x6636,0x6634,0x661C,0x664F,
-	0x6644,0x6649,0x6641,0x665E,0x665D,0x6664,0x6667,0x6668,
-	0x665F,0x6662,0x6670,0x6683,0x6688,0x668E,0x6689,0x6684,
-	0x6698,0x669D,0x66C1,0x66B9,0x66C9,0x66BE,0x66BC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 92, Array index 0x3400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x66C4,0x66B8,0x66D6,0x66DA,0x66E0,0x663F,0x66E6,
-	0x66E9,0x66F0,0x66F5,0x66F7,0x670F,0x6716,0x671E,0x6726,
-	0x6727,0x9738,0x672E,0x673F,0x6736,0x6741,0x6738,0x6737,
-	0x6746,0x675E,0x6760,0x6759,0x6763,0x6764,0x6789,0x6770,
-	0x67A9,0x677C,0x676A,0x678C,0x678B,0x67A6,0x67A1,0x6785,
-	0x67B7,0x67EF,0x67B4,0x67EC,0x67B3,0x67E9,0x67B8,0x67E4,
-	0x67DE,0x67DD,0x67E2,0x67EE,0x67B9,0x67CE,0x67C6,0x67E7,
-	0x6A9C,0x681E,0x6846,0x6829,0x6840,0x684D,0x6832,0x684E,
-	0x68B3,0x682B,0x6859,0x6863,0x6877,0x687F,0x689F,0x688F,
-	0x68AD,0x6894,0x689D,0x689B,0x6883,0x6AAE,0x68B9,0x6874,
-	0x68B5,0x68A0,0x68BA,0x690F,0x688D,0x687E,0x6901,0x68CA,
-	0x6908,0x68D8,0x6922,0x6926,0x68E1,0x690C,0x68CD,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 93, Array index 0x3500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x68D4,0x68E7,0x68D5,0x6936,0x6912,0x6904,0x68D7,
-	0x68E3,0x6925,0x68F9,0x68E0,0x68EF,0x6928,0x692A,0x691A,
-	0x6923,0x6921,0x68C6,0x6979,0x6977,0x695C,0x6978,0x696B,
-	0x6954,0x697E,0x696E,0x6939,0x6974,0x693D,0x6959,0x6930,
-	0x6961,0x695E,0x695D,0x6981,0x696A,0x69B2,0x69AE,0x69D0,
-	0x69BF,0x69C1,0x69D3,0x69BE,0x69CE,0x5BE8,0x69CA,0x69DD,
-	0x69BB,0x69C3,0x69A7,0x6A2E,0x6991,0x69A0,0x699C,0x6995,
-	0x69B4,0x69DE,0x69E8,0x6A02,0x6A1B,0x69FF,0x6B0A,0x69F9,
-	0x69F2,0x69E7,0x6A05,0x69B1,0x6A1E,0x69ED,0x6A14,0x69EB,
-	0x6A0A,0x6A12,0x6AC1,0x6A23,0x6A13,0x6A44,0x6A0C,0x6A72,
-	0x6A36,0x6A78,0x6A47,0x6A62,0x6A59,0x6A66,0x6A48,0x6A38,
-	0x6A22,0x6A90,0x6A8D,0x6AA0,0x6A84,0x6AA2,0x6AA3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 94, Array index 0x3600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A97,0x8617,0x6ABB,0x6AC3,0x6AC2,0x6AB8,0x6AB3,
-	0x6AAC,0x6ADE,0x6AD1,0x6ADF,0x6AAA,0x6ADA,0x6AEA,0x6AFB,
-	0x6B05,0x8616,0x6AFA,0x6B12,0x6B16,0x9B31,0x6B1F,0x6B38,
-	0x6B37,0x76DC,0x6B39,0x98EE,0x6B47,0x6B43,0x6B49,0x6B50,
-	0x6B59,0x6B54,0x6B5B,0x6B5F,0x6B61,0x6B78,0x6B79,0x6B7F,
-	0x6B80,0x6B84,0x6B83,0x6B8D,0x6B98,0x6B95,0x6B9E,0x6BA4,
-	0x6BAA,0x6BAB,0x6BAF,0x6BB2,0x6BB1,0x6BB3,0x6BB7,0x6BBC,
-	0x6BC6,0x6BCB,0x6BD3,0x6BDF,0x6BEC,0x6BEB,0x6BF3,0x6BEF,
-	0x9EBE,0x6C08,0x6C13,0x6C14,0x6C1B,0x6C24,0x6C23,0x6C5E,
-	0x6C55,0x6C62,0x6C6A,0x6C82,0x6C8D,0x6C9A,0x6C81,0x6C9B,
-	0x6C7E,0x6C68,0x6C73,0x6C92,0x6C90,0x6CC4,0x6CF1,0x6CD3,
-	0x6CBD,0x6CD7,0x6CC5,0x6CDD,0x6CAE,0x6CB1,0x6CBE,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 95, Array index 0x3700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6CBA,0x6CDB,0x6CEF,0x6CD9,0x6CEA,0x6D1F,0x884D,
-	0x6D36,0x6D2B,0x6D3D,0x6D38,0x6D19,0x6D35,0x6D33,0x6D12,
-	0x6D0C,0x6D63,0x6D93,0x6D64,0x6D5A,0x6D79,0x6D59,0x6D8E,
-	0x6D95,0x6FE4,0x6D85,0x6DF9,0x6E15,0x6E0A,0x6DB5,0x6DC7,
-	0x6DE6,0x6DB8,0x6DC6,0x6DEC,0x6DDE,0x6DCC,0x6DE8,0x6DD2,
-	0x6DC5,0x6DFA,0x6DD9,0x6DE4,0x6DD5,0x6DEA,0x6DEE,0x6E2D,
-	0x6E6E,0x6E2E,0x6E19,0x6E72,0x6E5F,0x6E3E,0x6E23,0x6E6B,
-	0x6E2B,0x6E76,0x6E4D,0x6E1F,0x6E43,0x6E3A,0x6E4E,0x6E24,
-	0x6EFF,0x6E1D,0x6E38,0x6E82,0x6EAA,0x6E98,0x6EC9,0x6EB7,
-	0x6ED3,0x6EBD,0x6EAF,0x6EC4,0x6EB2,0x6ED4,0x6ED5,0x6E8F,
-	0x6EA5,0x6EC2,0x6E9F,0x6F41,0x6F11,0x704C,0x6EEC,0x6EF8,
-	0x6EFE,0x6F3F,0x6EF2,0x6F31,0x6EEF,0x6F32,0x6ECC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 96, Array index 0x3800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F3E,0x6F13,0x6EF7,0x6F86,0x6F7A,0x6F78,0x6F81,
-	0x6F80,0x6F6F,0x6F5B,0x6FF3,0x6F6D,0x6F82,0x6F7C,0x6F58,
-	0x6F8E,0x6F91,0x6FC2,0x6F66,0x6FB3,0x6FA3,0x6FA1,0x6FA4,
-	0x6FB9,0x6FC6,0x6FAA,0x6FDF,0x6FD5,0x6FEC,0x6FD4,0x6FD8,
-	0x6FF1,0x6FEE,0x6FDB,0x7009,0x700B,0x6FFA,0x7011,0x7001,
-	0x700F,0x6FFE,0x701B,0x701A,0x6F74,0x701D,0x7018,0x701F,
-	0x7030,0x703E,0x7032,0x7051,0x7063,0x7099,0x7092,0x70AF,
-	0x70F1,0x70AC,0x70B8,0x70B3,0x70AE,0x70DF,0x70CB,0x70DD,
-	0x70D9,0x7109,0x70FD,0x711C,0x7119,0x7165,0x7155,0x7188,
-	0x7166,0x7162,0x714C,0x7156,0x716C,0x718F,0x71FB,0x7184,
-	0x7195,0x71A8,0x71AC,0x71D7,0x71B9,0x71BE,0x71D2,0x71C9,
-	0x71D4,0x71CE,0x71E0,0x71EC,0x71E7,0x71F5,0x71FC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 97, Array index 0x3900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x71F9,0x71FF,0x720D,0x7210,0x721B,0x7228,0x722D,
-	0x722C,0x7230,0x7232,0x723B,0x723C,0x723F,0x7240,0x7246,
-	0x724B,0x7258,0x7274,0x727E,0x7282,0x7281,0x7287,0x7292,
-	0x7296,0x72A2,0x72A7,0x72B9,0x72B2,0x72C3,0x72C6,0x72C4,
-	0x72CE,0x72D2,0x72E2,0x72E0,0x72E1,0x72F9,0x72F7,0x500F,
-	0x7317,0x730A,0x731C,0x7316,0x731D,0x7334,0x732F,0x7329,
-	0x7325,0x733E,0x734E,0x734F,0x9ED8,0x7357,0x736A,0x7368,
-	0x7370,0x7378,0x7375,0x737B,0x737A,0x73C8,0x73B3,0x73CE,
-	0x73BB,0x73C0,0x73E5,0x73EE,0x73DE,0x74A2,0x7405,0x746F,
-	0x7425,0x73F8,0x7432,0x743A,0x7455,0x743F,0x745F,0x7459,
-	0x7441,0x745C,0x7469,0x7470,0x7463,0x746A,0x7476,0x747E,
-	0x748B,0x749E,0x74A7,0x74CA,0x74CF,0x74D4,0x73F1,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 98, Array index 0x3A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x74E0,0x74E3,0x74E7,0x74E9,0x74EE,0x74F2,0x74F0,
-	0x74F1,0x74F8,0x74F7,0x7504,0x7503,0x7505,0x750C,0x750E,
-	0x750D,0x7515,0x7513,0x751E,0x7526,0x752C,0x753C,0x7544,
-	0x754D,0x754A,0x7549,0x755B,0x7546,0x755A,0x7569,0x7564,
-	0x7567,0x756B,0x756D,0x7578,0x7576,0x7586,0x7587,0x7574,
-	0x758A,0x7589,0x7582,0x7594,0x759A,0x759D,0x75A5,0x75A3,
-	0x75C2,0x75B3,0x75C3,0x75B5,0x75BD,0x75B8,0x75BC,0x75B1,
-	0x75CD,0x75CA,0x75D2,0x75D9,0x75E3,0x75DE,0x75FE,0x75FF,
-	0x75FC,0x7601,0x75F0,0x75FA,0x75F2,0x75F3,0x760B,0x760D,
-	0x7609,0x761F,0x7627,0x7620,0x7621,0x7622,0x7624,0x7634,
-	0x7630,0x763B,0x7647,0x7648,0x7646,0x765C,0x7658,0x7661,
-	0x7662,0x7668,0x7669,0x766A,0x7667,0x766C,0x7670,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 99, Array index 0x3B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7672,0x7676,0x7678,0x767C,0x7680,0x7683,0x7688,
-	0x768B,0x768E,0x7696,0x7693,0x7699,0x769A,0x76B0,0x76B4,
-	0x76B8,0x76B9,0x76BA,0x76C2,0x76CD,0x76D6,0x76D2,0x76DE,
-	0x76E1,0x76E5,0x76E7,0x76EA,0x862F,0x76FB,0x7708,0x7707,
-	0x7704,0x7729,0x7724,0x771E,0x7725,0x7726,0x771B,0x7737,
-	0x7738,0x7747,0x775A,0x7768,0x776B,0x775B,0x7765,0x777F,
-	0x777E,0x7779,0x778E,0x778B,0x7791,0x77A0,0x779E,0x77B0,
-	0x77B6,0x77B9,0x77BF,0x77BC,0x77BD,0x77BB,0x77C7,0x77CD,
-	0x77D7,0x77DA,0x77DC,0x77E3,0x77EE,0x77FC,0x780C,0x7812,
-	0x7926,0x7820,0x792A,0x7845,0x788E,0x7874,0x7886,0x787C,
-	0x789A,0x788C,0x78A3,0x78B5,0x78AA,0x78AF,0x78D1,0x78C6,
-	0x78CB,0x78D4,0x78BE,0x78BC,0x78C5,0x78CA,0x78EC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 100, Array index 0x3C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x78E7,0x78DA,0x78FD,0x78F4,0x7907,0x7912,0x7911,
-	0x7919,0x792C,0x792B,0x7940,0x7960,0x7957,0x795F,0x795A,
-	0x7955,0x7953,0x797A,0x797F,0x798A,0x799D,0x79A7,0x9F4B,
-	0x79AA,0x79AE,0x79B3,0x79B9,0x79BA,0x79C9,0x79D5,0x79E7,
-	0x79EC,0x79E1,0x79E3,0x7A08,0x7A0D,0x7A18,0x7A19,0x7A20,
-	0x7A1F,0x7980,0x7A31,0x7A3B,0x7A3E,0x7A37,0x7A43,0x7A57,
-	0x7A49,0x7A61,0x7A62,0x7A69,0x9F9D,0x7A70,0x7A79,0x7A7D,
-	0x7A88,0x7A97,0x7A95,0x7A98,0x7A96,0x7AA9,0x7AC8,0x7AB0,
-	0x7AB6,0x7AC5,0x7AC4,0x7ABF,0x9083,0x7AC7,0x7ACA,0x7ACD,
-	0x7ACF,0x7AD5,0x7AD3,0x7AD9,0x7ADA,0x7ADD,0x7AE1,0x7AE2,
-	0x7AE6,0x7AED,0x7AF0,0x7B02,0x7B0F,0x7B0A,0x7B06,0x7B33,
-	0x7B18,0x7B19,0x7B1E,0x7B35,0x7B28,0x7B36,0x7B50,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 101, Array index 0x3D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7B7A,0x7B04,0x7B4D,0x7B0B,0x7B4C,0x7B45,0x7B75,
-	0x7B65,0x7B74,0x7B67,0x7B70,0x7B71,0x7B6C,0x7B6E,0x7B9D,
-	0x7B98,0x7B9F,0x7B8D,0x7B9C,0x7B9A,0x7B8B,0x7B92,0x7B8F,
-	0x7B5D,0x7B99,0x7BCB,0x7BC1,0x7BCC,0x7BCF,0x7BB4,0x7BC6,
-	0x7BDD,0x7BE9,0x7C11,0x7C14,0x7BE6,0x7BE5,0x7C60,0x7C00,
-	0x7C07,0x7C13,0x7BF3,0x7BF7,0x7C17,0x7C0D,0x7BF6,0x7C23,
-	0x7C27,0x7C2A,0x7C1F,0x7C37,0x7C2B,0x7C3D,0x7C4C,0x7C43,
-	0x7C54,0x7C4F,0x7C40,0x7C50,0x7C58,0x7C5F,0x7C64,0x7C56,
-	0x7C65,0x7C6C,0x7C75,0x7C83,0x7C90,0x7CA4,0x7CAD,0x7CA2,
-	0x7CAB,0x7CA1,0x7CA8,0x7CB3,0x7CB2,0x7CB1,0x7CAE,0x7CB9,
-	0x7CBD,0x7CC0,0x7CC5,0x7CC2,0x7CD8,0x7CD2,0x7CDC,0x7CE2,
-	0x9B3B,0x7CEF,0x7CF2,0x7CF4,0x7CF6,0x7CFA,0x7D06,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 102, Array index 0x3E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7D02,0x7D1C,0x7D15,0x7D0A,0x7D45,0x7D4B,0x7D2E,
-	0x7D32,0x7D3F,0x7D35,0x7D46,0x7D73,0x7D56,0x7D4E,0x7D72,
-	0x7D68,0x7D6E,0x7D4F,0x7D63,0x7D93,0x7D89,0x7D5B,0x7D8F,
-	0x7D7D,0x7D9B,0x7DBA,0x7DAE,0x7DA3,0x7DB5,0x7DC7,0x7DBD,
-	0x7DAB,0x7E3D,0x7DA2,0x7DAF,0x7DDC,0x7DB8,0x7D9F,0x7DB0,
-	0x7DD8,0x7DDD,0x7DE4,0x7DDE,0x7DFB,0x7DF2,0x7DE1,0x7E05,
-	0x7E0A,0x7E23,0x7E21,0x7E12,0x7E31,0x7E1F,0x7E09,0x7E0B,
-	0x7E22,0x7E46,0x7E66,0x7E3B,0x7E35,0x7E39,0x7E43,0x7E37,
-	0x7E32,0x7E3A,0x7E67,0x7E5D,0x7E56,0x7E5E,0x7E59,0x7E5A,
-	0x7E79,0x7E6A,0x7E69,0x7E7C,0x7E7B,0x7E83,0x7DD5,0x7E7D,
-	0x8FAE,0x7E7F,0x7E88,0x7E89,0x7E8C,0x7E92,0x7E90,0x7E93,
-	0x7E94,0x7E96,0x7E8E,0x7E9B,0x7E9C,0x7F38,0x7F3A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 103, Array index 0x3F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7F45,0x7F4C,0x7F4D,0x7F4E,0x7F50,0x7F51,0x7F55,
-	0x7F54,0x7F58,0x7F5F,0x7F60,0x7F68,0x7F69,0x7F67,0x7F78,
-	0x7F82,0x7F86,0x7F83,0x7F88,0x7F87,0x7F8C,0x7F94,0x7F9E,
-	0x7F9D,0x7F9A,0x7FA3,0x7FAF,0x7FB2,0x7FB9,0x7FAE,0x7FB6,
-	0x7FB8,0x8B71,0x7FC5,0x7FC6,0x7FCA,0x7FD5,0x7FD4,0x7FE1,
-	0x7FE6,0x7FE9,0x7FF3,0x7FF9,0x98DC,0x8006,0x8004,0x800B,
-	0x8012,0x8018,0x8019,0x801C,0x8021,0x8028,0x803F,0x803B,
-	0x804A,0x8046,0x8052,0x8058,0x805A,0x805F,0x8062,0x8068,
-	0x8073,0x8072,0x8070,0x8076,0x8079,0x807D,0x807F,0x8084,
-	0x8086,0x8085,0x809B,0x8093,0x809A,0x80AD,0x5190,0x80AC,
-	0x80DB,0x80E5,0x80D9,0x80DD,0x80C4,0x80DA,0x80D6,0x8109,
-	0x80EF,0x80F1,0x811B,0x8129,0x8123,0x812F,0x814B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 104, Array index 0x4000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x968B,0x8146,0x813E,0x8153,0x8151,0x80FC,0x8171,
-	0x816E,0x8165,0x8166,0x8174,0x8183,0x8188,0x818A,0x8180,
-	0x8182,0x81A0,0x8195,0x81A4,0x81A3,0x815F,0x8193,0x81A9,
-	0x81B0,0x81B5,0x81BE,0x81B8,0x81BD,0x81C0,0x81C2,0x81BA,
-	0x81C9,0x81CD,0x81D1,0x81D9,0x81D8,0x81C8,0x81DA,0x81DF,
-	0x81E0,0x81E7,0x81FA,0x81FB,0x81FE,0x8201,0x8202,0x8205,
-	0x8207,0x820A,0x820D,0x8210,0x8216,0x8229,0x822B,0x8238,
-	0x8233,0x8240,0x8259,0x8258,0x825D,0x825A,0x825F,0x8264,
-	0x8262,0x8268,0x826A,0x826B,0x822E,0x8271,0x8277,0x8278,
-	0x827E,0x828D,0x8292,0x82AB,0x829F,0x82BB,0x82AC,0x82E1,
-	0x82E3,0x82DF,0x82D2,0x82F4,0x82F3,0x82FA,0x8393,0x8303,
-	0x82FB,0x82F9,0x82DE,0x8306,0x82DC,0x8309,0x82D9,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 105, Array index 0x4100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8335,0x8334,0x8316,0x8332,0x8331,0x8340,0x8339,
-	0x8350,0x8345,0x832F,0x832B,0x8317,0x8318,0x8385,0x839A,
-	0x83AA,0x839F,0x83A2,0x8396,0x8323,0x838E,0x8387,0x838A,
-	0x837C,0x83B5,0x8373,0x8375,0x83A0,0x8389,0x83A8,0x83F4,
-	0x8413,0x83EB,0x83CE,0x83FD,0x8403,0x83D8,0x840B,0x83C1,
-	0x83F7,0x8407,0x83E0,0x83F2,0x840D,0x8422,0x8420,0x83BD,
-	0x8438,0x8506,0x83FB,0x846D,0x842A,0x843C,0x855A,0x8484,
-	0x8477,0x846B,0x84AD,0x846E,0x8482,0x8469,0x8446,0x842C,
-	0x846F,0x8479,0x8435,0x84CA,0x8462,0x84B9,0x84BF,0x849F,
-	0x84D9,0x84CD,0x84BB,0x84DA,0x84D0,0x84C1,0x84C6,0x84D6,
-	0x84A1,0x8521,0x84FF,0x84F4,0x8517,0x8518,0x852C,0x851F,
-	0x8515,0x8514,0x84FC,0x8540,0x8563,0x8558,0x8548,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 106, Array index 0x4200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8541,0x8602,0x854B,0x8555,0x8580,0x85A4,0x8588,
-	0x8591,0x858A,0x85A8,0x856D,0x8594,0x859B,0x85EA,0x8587,
-	0x859C,0x8577,0x857E,0x8590,0x85C9,0x85BA,0x85CF,0x85B9,
-	0x85D0,0x85D5,0x85DD,0x85E5,0x85DC,0x85F9,0x860A,0x8613,
-	0x860B,0x85FE,0x85FA,0x8606,0x8622,0x861A,0x8630,0x863F,
-	0x864D,0x4E55,0x8654,0x865F,0x8667,0x8671,0x8693,0x86A3,
-	0x86A9,0x86AA,0x868B,0x868C,0x86B6,0x86AF,0x86C4,0x86C6,
-	0x86B0,0x86C9,0x8823,0x86AB,0x86D4,0x86DE,0x86E9,0x86EC,
-	0x86DF,0x86DB,0x86EF,0x8712,0x8706,0x8708,0x8700,0x8703,
-	0x86FB,0x8711,0x8709,0x870D,0x86F9,0x870A,0x8734,0x873F,
-	0x8737,0x873B,0x8725,0x8729,0x871A,0x8760,0x875F,0x8778,
-	0x874C,0x874E,0x8774,0x8757,0x8768,0x876E,0x8759,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 107, Array index 0x4300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8753,0x8763,0x876A,0x8805,0x87A2,0x879F,0x8782,
-	0x87AF,0x87CB,0x87BD,0x87C0,0x87D0,0x96D6,0x87AB,0x87C4,
-	0x87B3,0x87C7,0x87C6,0x87BB,0x87EF,0x87F2,0x87E0,0x880F,
-	0x880D,0x87FE,0x87F6,0x87F7,0x880E,0x87D2,0x8811,0x8816,
-	0x8815,0x8822,0x8821,0x8831,0x8836,0x8839,0x8827,0x883B,
-	0x8844,0x8842,0x8852,0x8859,0x885E,0x8862,0x886B,0x8881,
-	0x887E,0x889E,0x8875,0x887D,0x88B5,0x8872,0x8882,0x8897,
-	0x8892,0x88AE,0x8899,0x88A2,0x888D,0x88A4,0x88B0,0x88BF,
-	0x88B1,0x88C3,0x88C4,0x88D4,0x88D8,0x88D9,0x88DD,0x88F9,
-	0x8902,0x88FC,0x88F4,0x88E8,0x88F2,0x8904,0x890C,0x890A,
-	0x8913,0x8943,0x891E,0x8925,0x892A,0x892B,0x8941,0x8944,
-	0x893B,0x8936,0x8938,0x894C,0x891D,0x8960,0x895E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 108, Array index 0x4400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8966,0x8964,0x896D,0x896A,0x896F,0x8974,0x8977,
-	0x897E,0x8983,0x8988,0x898A,0x8993,0x8998,0x89A1,0x89A9,
-	0x89A6,0x89AC,0x89AF,0x89B2,0x89BA,0x89BD,0x89BF,0x89C0,
-	0x89DA,0x89DC,0x89DD,0x89E7,0x89F4,0x89F8,0x8A03,0x8A16,
-	0x8A10,0x8A0C,0x8A1B,0x8A1D,0x8A25,0x8A36,0x8A41,0x8A5B,
-	0x8A52,0x8A46,0x8A48,0x8A7C,0x8A6D,0x8A6C,0x8A62,0x8A85,
-	0x8A82,0x8A84,0x8AA8,0x8AA1,0x8A91,0x8AA5,0x8AA6,0x8A9A,
-	0x8AA3,0x8AC4,0x8ACD,0x8AC2,0x8ADA,0x8AEB,0x8AF3,0x8AE7,
-	0x8AE4,0x8AF1,0x8B14,0x8AE0,0x8AE2,0x8AF7,0x8ADE,0x8ADB,
-	0x8B0C,0x8B07,0x8B1A,0x8AE1,0x8B16,0x8B10,0x8B17,0x8B20,
-	0x8B33,0x97AB,0x8B26,0x8B2B,0x8B3E,0x8B28,0x8B41,0x8B4C,
-	0x8B4F,0x8B4E,0x8B49,0x8B56,0x8B5B,0x8B5A,0x8B6B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 109, Array index 0x4500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8B5F,0x8B6C,0x8B6F,0x8B74,0x8B7D,0x8B80,0x8B8C,
-	0x8B8E,0x8B92,0x8B93,0x8B96,0x8B99,0x8B9A,0x8C3A,0x8C41,
-	0x8C3F,0x8C48,0x8C4C,0x8C4E,0x8C50,0x8C55,0x8C62,0x8C6C,
-	0x8C78,0x8C7A,0x8C82,0x8C89,0x8C85,0x8C8A,0x8C8D,0x8C8E,
-	0x8C94,0x8C7C,0x8C98,0x621D,0x8CAD,0x8CAA,0x8CBD,0x8CB2,
-	0x8CB3,0x8CAE,0x8CB6,0x8CC8,0x8CC1,0x8CE4,0x8CE3,0x8CDA,
-	0x8CFD,0x8CFA,0x8CFB,0x8D04,0x8D05,0x8D0A,0x8D07,0x8D0F,
-	0x8D0D,0x8D10,0x9F4E,0x8D13,0x8CCD,0x8D14,0x8D16,0x8D67,
-	0x8D6D,0x8D71,0x8D73,0x8D81,0x8D99,0x8DC2,0x8DBE,0x8DBA,
-	0x8DCF,0x8DDA,0x8DD6,0x8DCC,0x8DDB,0x8DCB,0x8DEA,0x8DEB,
-	0x8DDF,0x8DE3,0x8DFC,0x8E08,0x8E09,0x8DFF,0x8E1D,0x8E1E,
-	0x8E10,0x8E1F,0x8E42,0x8E35,0x8E30,0x8E34,0x8E4A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 110, Array index 0x4600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8E47,0x8E49,0x8E4C,0x8E50,0x8E48,0x8E59,0x8E64,
-	0x8E60,0x8E2A,0x8E63,0x8E55,0x8E76,0x8E72,0x8E7C,0x8E81,
-	0x8E87,0x8E85,0x8E84,0x8E8B,0x8E8A,0x8E93,0x8E91,0x8E94,
-	0x8E99,0x8EAA,0x8EA1,0x8EAC,0x8EB0,0x8EC6,0x8EB1,0x8EBE,
-	0x8EC5,0x8EC8,0x8ECB,0x8EDB,0x8EE3,0x8EFC,0x8EFB,0x8EEB,
-	0x8EFE,0x8F0A,0x8F05,0x8F15,0x8F12,0x8F19,0x8F13,0x8F1C,
-	0x8F1F,0x8F1B,0x8F0C,0x8F26,0x8F33,0x8F3B,0x8F39,0x8F45,
-	0x8F42,0x8F3E,0x8F4C,0x8F49,0x8F46,0x8F4E,0x8F57,0x8F5C,
-	0x8F62,0x8F63,0x8F64,0x8F9C,0x8F9F,0x8FA3,0x8FAD,0x8FAF,
-	0x8FB7,0x8FDA,0x8FE5,0x8FE2,0x8FEA,0x8FEF,0x9087,0x8FF4,
-	0x9005,0x8FF9,0x8FFA,0x9011,0x9015,0x9021,0x900D,0x901E,
-	0x9016,0x900B,0x9027,0x9036,0x9035,0x9039,0x8FF8,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 111, Array index 0x4700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x904F,0x9050,0x9051,0x9052,0x900E,0x9049,0x903E,
-	0x9056,0x9058,0x905E,0x9068,0x906F,0x9076,0x96A8,0x9072,
-	0x9082,0x907D,0x9081,0x9080,0x908A,0x9089,0x908F,0x90A8,
-	0x90AF,0x90B1,0x90B5,0x90E2,0x90E4,0x6248,0x90DB,0x9102,
-	0x9112,0x9119,0x9132,0x9130,0x914A,0x9156,0x9158,0x9163,
-	0x9165,0x9169,0x9173,0x9172,0x918B,0x9189,0x9182,0x91A2,
-	0x91AB,0x91AF,0x91AA,0x91B5,0x91B4,0x91BA,0x91C0,0x91C1,
-	0x91C9,0x91CB,0x91D0,0x91D6,0x91DF,0x91E1,0x91DB,0x91FC,
-	0x91F5,0x91F6,0x921E,0x91FF,0x9214,0x922C,0x9215,0x9211,
-	0x925E,0x9257,0x9245,0x9249,0x9264,0x9248,0x9295,0x923F,
-	0x924B,0x9250,0x929C,0x9296,0x9293,0x929B,0x925A,0x92CF,
-	0x92B9,0x92B7,0x92E9,0x930F,0x92FA,0x9344,0x932E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 112, Array index 0x4800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9319,0x9322,0x931A,0x9323,0x933A,0x9335,0x933B,
-	0x935C,0x9360,0x937C,0x936E,0x9356,0x93B0,0x93AC,0x93AD,
-	0x9394,0x93B9,0x93D6,0x93D7,0x93E8,0x93E5,0x93D8,0x93C3,
-	0x93DD,0x93D0,0x93C8,0x93E4,0x941A,0x9414,0x9413,0x9403,
-	0x9407,0x9410,0x9436,0x942B,0x9435,0x9421,0x943A,0x9441,
-	0x9452,0x9444,0x945B,0x9460,0x9462,0x945E,0x946A,0x9229,
-	0x9470,0x9475,0x9477,0x947D,0x945A,0x947C,0x947E,0x9481,
-	0x947F,0x9582,0x9587,0x958A,0x9594,0x9596,0x9598,0x9599,
-	0x95A0,0x95A8,0x95A7,0x95AD,0x95BC,0x95BB,0x95B9,0x95BE,
-	0x95CA,0x6FF6,0x95C3,0x95CD,0x95CC,0x95D5,0x95D4,0x95D6,
-	0x95DC,0x95E1,0x95E5,0x95E2,0x9621,0x9628,0x962E,0x962F,
-	0x9642,0x964C,0x964F,0x964B,0x9677,0x965C,0x965E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 113, Array index 0x4900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x965D,0x965F,0x9666,0x9672,0x966C,0x968D,0x9698,
-	0x9695,0x9697,0x96AA,0x96A7,0x96B1,0x96B2,0x96B0,0x96B4,
-	0x96B6,0x96B8,0x96B9,0x96CE,0x96CB,0x96C9,0x96CD,0x894D,
-	0x96DC,0x970D,0x96D5,0x96F9,0x9704,0x9706,0x9708,0x9713,
-	0x970E,0x9711,0x970F,0x9716,0x9719,0x9724,0x972A,0x9730,
-	0x9739,0x973D,0x973E,0x9744,0x9746,0x9748,0x9742,0x9749,
-	0x975C,0x9760,0x9764,0x9766,0x9768,0x52D2,0x976B,0x9771,
-	0x9779,0x9785,0x977C,0x9781,0x977A,0x9786,0x978B,0x978F,
-	0x9790,0x979C,0x97A8,0x97A6,0x97A3,0x97B3,0x97B4,0x97C3,
-	0x97C6,0x97C8,0x97CB,0x97DC,0x97ED,0x9F4F,0x97F2,0x7ADF,
-	0x97F6,0x97F5,0x980F,0x980C,0x9838,0x9824,0x9821,0x9837,
-	0x983D,0x9846,0x984F,0x984B,0x986B,0x986F,0x9870,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 114, Array index 0x4A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9871,0x9874,0x9873,0x98AA,0x98AF,0x98B1,0x98B6,
-	0x98C4,0x98C3,0x98C6,0x98E9,0x98EB,0x9903,0x9909,0x9912,
-	0x9914,0x9918,0x9921,0x991D,0x991E,0x9924,0x9920,0x992C,
-	0x992E,0x993D,0x993E,0x9942,0x9949,0x9945,0x9950,0x994B,
-	0x9951,0x9952,0x994C,0x9955,0x9997,0x9998,0x99A5,0x99AD,
-	0x99AE,0x99BC,0x99DF,0x99DB,0x99DD,0x99D8,0x99D1,0x99ED,
-	0x99EE,0x99F1,0x99F2,0x99FB,0x99F8,0x9A01,0x9A0F,0x9A05,
-	0x99E2,0x9A19,0x9A2B,0x9A37,0x9A45,0x9A42,0x9A40,0x9A43,
-	0x9A3E,0x9A55,0x9A4D,0x9A5B,0x9A57,0x9A5F,0x9A62,0x9A65,
-	0x9A64,0x9A69,0x9A6B,0x9A6A,0x9AAD,0x9AB0,0x9ABC,0x9AC0,
-	0x9ACF,0x9AD1,0x9AD3,0x9AD4,0x9ADE,0x9ADF,0x9AE2,0x9AE3,
-	0x9AE6,0x9AEF,0x9AEB,0x9AEE,0x9AF4,0x9AF1,0x9AF7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 115, Array index 0x4B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9AFB,0x9B06,0x9B18,0x9B1A,0x9B1F,0x9B22,0x9B23,
-	0x9B25,0x9B27,0x9B28,0x9B29,0x9B2A,0x9B2E,0x9B2F,0x9B32,
-	0x9B44,0x9B43,0x9B4F,0x9B4D,0x9B4E,0x9B51,0x9B58,0x9B74,
-	0x9B93,0x9B83,0x9B91,0x9B96,0x9B97,0x9B9F,0x9BA0,0x9BA8,
-	0x9BB4,0x9BC0,0x9BCA,0x9BB9,0x9BC6,0x9BCF,0x9BD1,0x9BD2,
-	0x9BE3,0x9BE2,0x9BE4,0x9BD4,0x9BE1,0x9C3A,0x9BF2,0x9BF1,
-	0x9BF0,0x9C15,0x9C14,0x9C09,0x9C13,0x9C0C,0x9C06,0x9C08,
-	0x9C12,0x9C0A,0x9C04,0x9C2E,0x9C1B,0x9C25,0x9C24,0x9C21,
-	0x9C30,0x9C47,0x9C32,0x9C46,0x9C3E,0x9C5A,0x9C60,0x9C67,
-	0x9C76,0x9C78,0x9CE7,0x9CEC,0x9CF0,0x9D09,0x9D08,0x9CEB,
-	0x9D03,0x9D06,0x9D2A,0x9D26,0x9DAF,0x9D23,0x9D1F,0x9D44,
-	0x9D15,0x9D12,0x9D41,0x9D3F,0x9D3E,0x9D46,0x9D48,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 116, Array index 0x4C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9D5D,0x9D5E,0x9D64,0x9D51,0x9D50,0x9D59,0x9D72,
-	0x9D89,0x9D87,0x9DAB,0x9D6F,0x9D7A,0x9D9A,0x9DA4,0x9DA9,
-	0x9DB2,0x9DC4,0x9DC1,0x9DBB,0x9DB8,0x9DBA,0x9DC6,0x9DCF,
-	0x9DC2,0x9DD9,0x9DD3,0x9DF8,0x9DE6,0x9DED,0x9DEF,0x9DFD,
-	0x9E1A,0x9E1B,0x9E1E,0x9E75,0x9E79,0x9E7D,0x9E81,0x9E88,
-	0x9E8B,0x9E8C,0x9E92,0x9E95,0x9E91,0x9E9D,0x9EA5,0x9EA9,
-	0x9EB8,0x9EAA,0x9EAD,0x9761,0x9ECC,0x9ECE,0x9ECF,0x9ED0,
-	0x9ED4,0x9EDC,0x9EDE,0x9EDD,0x9EE0,0x9EE5,0x9EE8,0x9EEF,
-	0x9EF4,0x9EF6,0x9EF7,0x9EF9,0x9EFB,0x9EFC,0x9EFD,0x9F07,
-	0x9F08,0x76B7,0x9F15,0x9F21,0x9F2C,0x9F3E,0x9F4A,0x9F52,
-	0x9F54,0x9F63,0x9F5F,0x9F60,0x9F61,0x9F66,0x9F67,0x9F6C,
-	0x9F6A,0x9F77,0x9F72,0x9F76,0x9F95,0x9F9C,0x9FA0,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 117, Array index 0x4D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x582F,0x69C7,0x9059,0x7464,0x51DC,0x7199,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_TO_UCS_CCS_JIS_X0208_1990 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit jis_x0208_1990 -> UCS size-optimized table (14276 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_size_jis_x0208_1990[] =
-{
-	0x0055, /* Ranges number */
-	0x0001, /* Unranged codes number */
-	0x1BE0, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x2121, 0x217E, 0x0102,
-	/* Array index: 0x0006 */ 0x2221, 0x222E, 0x0160,
-	/* Array index: 0x0009 */ 0x223A, 0x2241, 0x016E,
-	/* Array index: 0x000C */ 0x224A, 0x2250, 0x0176,
-	/* Array index: 0x000F */ 0x225C, 0x226A, 0x017D,
-	/* Array index: 0x0012 */ 0x2272, 0x2279, 0x018C,
-	/* Array index: 0x0015 */ 0x2330, 0x2339, 0x0194,
-	/* Array index: 0x0018 */ 0x2341, 0x235A, 0x019E,
-	/* Array index: 0x001B */ 0x2361, 0x237A, 0x01B8,
-	/* Array index: 0x001E */ 0x2421, 0x2473, 0x01D2,
-	/* Array index: 0x0021 */ 0x2521, 0x2576, 0x0225,
-	/* Array index: 0x0024 */ 0x2621, 0x2638, 0x027B,
-	/* Array index: 0x0027 */ 0x2641, 0x2658, 0x0293,
-	/* Array index: 0x002A */ 0x2721, 0x2741, 0x02AB,
-	/* Array index: 0x002D */ 0x2751, 0x2771, 0x02CC,
-	/* Array index: 0x0030 */ 0x2821, 0x2840, 0x02ED,
-	/* Array index: 0x0033 */ 0x3021, 0x307E, 0x030D,
-	/* Array index: 0x0036 */ 0x3121, 0x317E, 0x036B,
-	/* Array index: 0x0039 */ 0x3221, 0x327E, 0x03C9,
-	/* Array index: 0x003C */ 0x3321, 0x337E, 0x0427,
-	/* Array index: 0x003F */ 0x3421, 0x347E, 0x0485,
-	/* Array index: 0x0042 */ 0x3521, 0x357E, 0x04E3,
-	/* Array index: 0x0045 */ 0x3621, 0x367E, 0x0541,
-	/* Array index: 0x0048 */ 0x3721, 0x377E, 0x059F,
-	/* Array index: 0x004B */ 0x3821, 0x387E, 0x05FD,
-	/* Array index: 0x004E */ 0x3921, 0x397E, 0x065B,
-	/* Array index: 0x0051 */ 0x3A21, 0x3A7E, 0x06B9,
-	/* Array index: 0x0054 */ 0x3B21, 0x3B7E, 0x0717,
-	/* Array index: 0x0057 */ 0x3C21, 0x3C7E, 0x0775,
-	/* Array index: 0x005A */ 0x3D21, 0x3D7E, 0x07D3,
-	/* Array index: 0x005D */ 0x3E21, 0x3E7E, 0x0831,
-	/* Array index: 0x0060 */ 0x3F21, 0x3F7E, 0x088F,
-	/* Array index: 0x0063 */ 0x4021, 0x407E, 0x08ED,
-	/* Array index: 0x0066 */ 0x4121, 0x417E, 0x094B,
-	/* Array index: 0x0069 */ 0x4221, 0x427E, 0x09A9,
-	/* Array index: 0x006C */ 0x4321, 0x437E, 0x0A07,
-	/* Array index: 0x006F */ 0x4421, 0x447E, 0x0A65,
-	/* Array index: 0x0072 */ 0x4521, 0x457E, 0x0AC3,
-	/* Array index: 0x0075 */ 0x4621, 0x467E, 0x0B21,
-	/* Array index: 0x0078 */ 0x4721, 0x477E, 0x0B7F,
-	/* Array index: 0x007B */ 0x4821, 0x487E, 0x0BDD,
-	/* Array index: 0x007E */ 0x4921, 0x497E, 0x0C3B,
-	/* Array index: 0x0081 */ 0x4A21, 0x4A7E, 0x0C99,
-	/* Array index: 0x0084 */ 0x4B21, 0x4B7E, 0x0CF7,
-	/* Array index: 0x0087 */ 0x4C21, 0x4C7E, 0x0D55,
-	/* Array index: 0x008A */ 0x4D21, 0x4D7E, 0x0DB3,
-	/* Array index: 0x008D */ 0x4E21, 0x4E7E, 0x0E11,
-	/* Array index: 0x0090 */ 0x4F21, 0x4F53, 0x0E6F,
-	/* Array index: 0x0093 */ 0x5021, 0x507E, 0x0EA2,
-	/* Array index: 0x0096 */ 0x5121, 0x517E, 0x0F00,
-	/* Array index: 0x0099 */ 0x5221, 0x527E, 0x0F5E,
-	/* Array index: 0x009C */ 0x5321, 0x537E, 0x0FBC,
-	/* Array index: 0x009F */ 0x5421, 0x547E, 0x101A,
-	/* Array index: 0x00A2 */ 0x5521, 0x557E, 0x1078,
-	/* Array index: 0x00A5 */ 0x5621, 0x567E, 0x10D6,
-	/* Array index: 0x00A8 */ 0x5721, 0x577E, 0x1134,
-	/* Array index: 0x00AB */ 0x5821, 0x587E, 0x1192,
-	/* Array index: 0x00AE */ 0x5921, 0x597E, 0x11F0,
-	/* Array index: 0x00B1 */ 0x5A21, 0x5A7E, 0x124E,
-	/* Array index: 0x00B4 */ 0x5B21, 0x5B7E, 0x12AC,
-	/* Array index: 0x00B7 */ 0x5C21, 0x5C7E, 0x130A,
-	/* Array index: 0x00BA */ 0x5D21, 0x5D7E, 0x1368,
-	/* Array index: 0x00BD */ 0x5E21, 0x5E7E, 0x13C6,
-	/* Array index: 0x00C0 */ 0x5F21, 0x5F7E, 0x1424,
-	/* Array index: 0x00C3 */ 0x6021, 0x607E, 0x1482,
-	/* Array index: 0x00C6 */ 0x6121, 0x617E, 0x14E0,
-	/* Array index: 0x00C9 */ 0x6221, 0x627E, 0x153E,
-	/* Array index: 0x00CC */ 0x6321, 0x637E, 0x159C,
-	/* Array index: 0x00CF */ 0x6421, 0x647E, 0x15FA,
-	/* Array index: 0x00D2 */ 0x6521, 0x657E, 0x1658,
-	/* Array index: 0x00D5 */ 0x6621, 0x667E, 0x16B6,
-	/* Array index: 0x00D8 */ 0x6721, 0x677E, 0x1714,
-	/* Array index: 0x00DB */ 0x6821, 0x687E, 0x1772,
-	/* Array index: 0x00DE */ 0x6921, 0x697E, 0x17D0,
-	/* Array index: 0x00E1 */ 0x6A21, 0x6A7E, 0x182E,
-	/* Array index: 0x00E4 */ 0x6B21, 0x6B7E, 0x188C,
-	/* Array index: 0x00E7 */ 0x6C21, 0x6C7E, 0x18EA,
-	/* Array index: 0x00EA */ 0x6D21, 0x6D7E, 0x1948,
-	/* Array index: 0x00ED */ 0x6E21, 0x6E7E, 0x19A6,
-	/* Array index: 0x00F0 */ 0x6F21, 0x6F7E, 0x1A04,
-	/* Array index: 0x00F3 */ 0x7021, 0x707E, 0x1A62,
-	/* Array index: 0x00F6 */ 0x7121, 0x717E, 0x1AC0,
-	/* Array index: 0x00F9 */ 0x7221, 0x727E, 0x1B1E,
-	/* Array index: 0x00FC */ 0x7321, 0x737E, 0x1B7C,
-	/* Array index: 0x00FF */ 0x7421, 0x7426, 0x1BDA,
-	/* Ranges content */
-	/* Range 0x2121 - 0x217E, array index: 0x0102 */
-	0x3000,0x3001,0x3002,0xFF0C,0xFF0E,0x30FB,0xFF1A,0xFF1B,
-	0xFF1F,0xFF01,0x309B,0x309C,0x00B4,0xFF40,0x00A8,0xFF3E,
-	0xFFE3,0xFF3F,0x30FD,0x30FE,0x309D,0x309E,0x3003,0x4EDD,
-	0x3005,0x3006,0x3007,0x30FC,0x2015,0x2010,0xFF0F,0x005C,
-	0x301C,0x2016,0xFF5C,0x2026,0x2025,0x2018,0x2019,0x201C,
-	0x201D,0xFF08,0xFF09,0x3014,0x3015,0xFF3B,0xFF3D,0xFF5B,
-	0xFF5D,0x3008,0x3009,0x300A,0x300B,0x300C,0x300D,0x300E,
-	0x300F,0x3010,0x3011,0xFF0B,0x2212,0x00B1,0x00D7,0x00F7,
-	0xFF1D,0x2260,0xFF1C,0xFF1E,0x2266,0x2267,0x221E,0x2234,
-	0x2642,0x2640,0x00B0,0x2032,0x2033,0x2103,0xFFE5,0xFF04,
-	0x00A2,0x00A3,0xFF05,0xFF03,0xFF06,0xFF0A,0xFF20,0x00A7,
-	0x2606,0x2605,0x25CB,0x25CF,0x25CE,0x25C7,
-	/* Range 0x2221 - 0x222E, array index: 0x0160 */
-	0x25C6,0x25A1,0x25A0,0x25B3,0x25B2,0x25BD,0x25BC,0x203B,
-	0x3012,0x2192,0x2190,0x2191,0x2193,0x3013,
-	/* Range 0x223A - 0x2241, array index: 0x016E */
-	0x2208,0x220B,0x2286,0x2287,0x2282,0x2283,0x222A,0x2229,
-	/* Range 0x224A - 0x2250, array index: 0x0176 */
-	0x2227,0x2228,0x00AC,0x21D2,0x21D4,0x2200,0x2203,
-	/* Range 0x225C - 0x226A, array index: 0x017D */
-	0x2220,0x22A5,0x2312,0x2202,0x2207,0x2261,0x2252,0x226A,
-	0x226B,0x221A,0x223D,0x221D,0x2235,0x222B,0x222C,
-	/* Range 0x2272 - 0x2279, array index: 0x018C */
-	0x212B,0x2030,0x266F,0x266D,0x266A,0x2020,0x2021,0x00B6,
-	/* Range 0x2330 - 0x2339, array index: 0x0194 */
-	0xFF10,0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17,
-	0xFF18,0xFF19,
-	/* Range 0x2341 - 0x235A, array index: 0x019E */
-	0xFF21,0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27,0xFF28,
-	0xFF29,0xFF2A,0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,0xFF30,
-	0xFF31,0xFF32,0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,0xFF38,
-	0xFF39,0xFF3A,
-	/* Range 0x2361 - 0x237A, array index: 0x01B8 */
-	0xFF41,0xFF42,0xFF43,0xFF44,0xFF45,0xFF46,0xFF47,0xFF48,
-	0xFF49,0xFF4A,0xFF4B,0xFF4C,0xFF4D,0xFF4E,0xFF4F,0xFF50,
-	0xFF51,0xFF52,0xFF53,0xFF54,0xFF55,0xFF56,0xFF57,0xFF58,
-	0xFF59,0xFF5A,
-	/* Range 0x2421 - 0x2473, array index: 0x01D2 */
-	0x3041,0x3042,0x3043,0x3044,0x3045,0x3046,0x3047,0x3048,
-	0x3049,0x304A,0x304B,0x304C,0x304D,0x304E,0x304F,0x3050,
-	0x3051,0x3052,0x3053,0x3054,0x3055,0x3056,0x3057,0x3058,
-	0x3059,0x305A,0x305B,0x305C,0x305D,0x305E,0x305F,0x3060,
-	0x3061,0x3062,0x3063,0x3064,0x3065,0x3066,0x3067,0x3068,
-	0x3069,0x306A,0x306B,0x306C,0x306D,0x306E,0x306F,0x3070,
-	0x3071,0x3072,0x3073,0x3074,0x3075,0x3076,0x3077,0x3078,
-	0x3079,0x307A,0x307B,0x307C,0x307D,0x307E,0x307F,0x3080,
-	0x3081,0x3082,0x3083,0x3084,0x3085,0x3086,0x3087,0x3088,
-	0x3089,0x308A,0x308B,0x308C,0x308D,0x308E,0x308F,0x3090,
-	0x3091,0x3092,0x3093,
-	/* Range 0x2521 - 0x2576, array index: 0x0225 */
-	0x30A1,0x30A2,0x30A3,0x30A4,0x30A5,0x30A6,0x30A7,0x30A8,
-	0x30A9,0x30AA,0x30AB,0x30AC,0x30AD,0x30AE,0x30AF,0x30B0,
-	0x30B1,0x30B2,0x30B3,0x30B4,0x30B5,0x30B6,0x30B7,0x30B8,
-	0x30B9,0x30BA,0x30BB,0x30BC,0x30BD,0x30BE,0x30BF,0x30C0,
-	0x30C1,0x30C2,0x30C3,0x30C4,0x30C5,0x30C6,0x30C7,0x30C8,
-	0x30C9,0x30CA,0x30CB,0x30CC,0x30CD,0x30CE,0x30CF,0x30D0,
-	0x30D1,0x30D2,0x30D3,0x30D4,0x30D5,0x30D6,0x30D7,0x30D8,
-	0x30D9,0x30DA,0x30DB,0x30DC,0x30DD,0x30DE,0x30DF,0x30E0,
-	0x30E1,0x30E2,0x30E3,0x30E4,0x30E5,0x30E6,0x30E7,0x30E8,
-	0x30E9,0x30EA,0x30EB,0x30EC,0x30ED,0x30EE,0x30EF,0x30F0,
-	0x30F1,0x30F2,0x30F3,0x30F4,0x30F5,0x30F6,
-	/* Range 0x2621 - 0x2638, array index: 0x027B */
-	0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,0x0398,
-	0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F,0x03A0,
-	0x03A1,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,0x03A9,
-	/* Range 0x2641 - 0x2658, array index: 0x0293 */
-	0x03B1,0x03B2,0x03B3,0x03B4,0x03B5,0x03B6,0x03B7,0x03B8,
-	0x03B9,0x03BA,0x03BB,0x03BC,0x03BD,0x03BE,0x03BF,0x03C0,
-	0x03C1,0x03C3,0x03C4,0x03C5,0x03C6,0x03C7,0x03C8,0x03C9,
-	/* Range 0x2721 - 0x2741, array index: 0x02AB */
-	0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0401,0x0416,
-	0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,
-	0x041F,0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,
-	0x0427,0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,
-	0x042F,
-	/* Range 0x2751 - 0x2771, array index: 0x02CC */
-	0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0451,0x0436,
-	0x0437,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,
-	0x043F,0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,
-	0x0447,0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,
-	0x044F,
-	/* Range 0x2821 - 0x2840, array index: 0x02ED */
-	0x2500,0x2502,0x250C,0x2510,0x2518,0x2514,0x251C,0x252C,
-	0x2524,0x2534,0x253C,0x2501,0x2503,0x250F,0x2513,0x251B,
-	0x2517,0x2523,0x2533,0x252B,0x253B,0x254B,0x2520,0x252F,
-	0x2528,0x2537,0x253F,0x251D,0x2530,0x2525,0x2538,0x2542,
-	/* Range 0x3021 - 0x307E, array index: 0x030D */
-	0x4E9C,0x5516,0x5A03,0x963F,0x54C0,0x611B,0x6328,0x59F6,
-	0x9022,0x8475,0x831C,0x7A50,0x60AA,0x63E1,0x6E25,0x65ED,
-	0x8466,0x82A6,0x9BF5,0x6893,0x5727,0x65A1,0x6271,0x5B9B,
-	0x59D0,0x867B,0x98F4,0x7D62,0x7DBE,0x9B8E,0x6216,0x7C9F,
-	0x88B7,0x5B89,0x5EB5,0x6309,0x6697,0x6848,0x95C7,0x978D,
-	0x674F,0x4EE5,0x4F0A,0x4F4D,0x4F9D,0x5049,0x56F2,0x5937,
-	0x59D4,0x5A01,0x5C09,0x60DF,0x610F,0x6170,0x6613,0x6905,
-	0x70BA,0x754F,0x7570,0x79FB,0x7DAD,0x7DEF,0x80C3,0x840E,
-	0x8863,0x8B02,0x9055,0x907A,0x533B,0x4E95,0x4EA5,0x57DF,
-	0x80B2,0x90C1,0x78EF,0x4E00,0x58F1,0x6EA2,0x9038,0x7A32,
-	0x8328,0x828B,0x9C2F,0x5141,0x5370,0x54BD,0x54E1,0x56E0,
-	0x59FB,0x5F15,0x98F2,0x6DEB,0x80E4,0x852D,
-	/* Range 0x3121 - 0x317E, array index: 0x036B */
-	0x9662,0x9670,0x96A0,0x97FB,0x540B,0x53F3,0x5B87,0x70CF,
-	0x7FBD,0x8FC2,0x96E8,0x536F,0x9D5C,0x7ABA,0x4E11,0x7893,
-	0x81FC,0x6E26,0x5618,0x5504,0x6B1D,0x851A,0x9C3B,0x59E5,
-	0x53A9,0x6D66,0x74DC,0x958F,0x5642,0x4E91,0x904B,0x96F2,
-	0x834F,0x990C,0x53E1,0x55B6,0x5B30,0x5F71,0x6620,0x66F3,
-	0x6804,0x6C38,0x6CF3,0x6D29,0x745B,0x76C8,0x7A4E,0x9834,
-	0x82F1,0x885B,0x8A60,0x92ED,0x6DB2,0x75AB,0x76CA,0x99C5,
-	0x60A6,0x8B01,0x8D8A,0x95B2,0x698E,0x53AD,0x5186,0x5712,
-	0x5830,0x5944,0x5BB4,0x5EF6,0x6028,0x63A9,0x63F4,0x6CBF,
-	0x6F14,0x708E,0x7114,0x7159,0x71D5,0x733F,0x7E01,0x8276,
-	0x82D1,0x8597,0x9060,0x925B,0x9D1B,0x5869,0x65BC,0x6C5A,
-	0x7525,0x51F9,0x592E,0x5965,0x5F80,0x5FDC,
-	/* Range 0x3221 - 0x327E, array index: 0x03C9 */
-	0x62BC,0x65FA,0x6A2A,0x6B27,0x6BB4,0x738B,0x7FC1,0x8956,
-	0x9D2C,0x9D0E,0x9EC4,0x5CA1,0x6C96,0x837B,0x5104,0x5C4B,
-	0x61B6,0x81C6,0x6876,0x7261,0x4E59,0x4FFA,0x5378,0x6069,
-	0x6E29,0x7A4F,0x97F3,0x4E0B,0x5316,0x4EEE,0x4F55,0x4F3D,
-	0x4FA1,0x4F73,0x52A0,0x53EF,0x5609,0x590F,0x5AC1,0x5BB6,
-	0x5BE1,0x79D1,0x6687,0x679C,0x67B6,0x6B4C,0x6CB3,0x706B,
-	0x73C2,0x798D,0x79BE,0x7A3C,0x7B87,0x82B1,0x82DB,0x8304,
-	0x8377,0x83EF,0x83D3,0x8766,0x8AB2,0x5629,0x8CA8,0x8FE6,
-	0x904E,0x971E,0x868A,0x4FC4,0x5CE8,0x6211,0x7259,0x753B,
-	0x81E5,0x82BD,0x86FE,0x8CC0,0x96C5,0x9913,0x99D5,0x4ECB,
-	0x4F1A,0x89E3,0x56DE,0x584A,0x58CA,0x5EFB,0x5FEB,0x602A,
-	0x6094,0x6062,0x61D0,0x6212,0x62D0,0x6539,
-	/* Range 0x3321 - 0x337E, array index: 0x0427 */
-	0x9B41,0x6666,0x68B0,0x6D77,0x7070,0x754C,0x7686,0x7D75,
-	0x82A5,0x87F9,0x958B,0x968E,0x8C9D,0x51F1,0x52BE,0x5916,
-	0x54B3,0x5BB3,0x5D16,0x6168,0x6982,0x6DAF,0x788D,0x84CB,
-	0x8857,0x8A72,0x93A7,0x9AB8,0x6D6C,0x99A8,0x86D9,0x57A3,
-	0x67FF,0x86CE,0x920E,0x5283,0x5687,0x5404,0x5ED3,0x62E1,
-	0x64B9,0x683C,0x6838,0x6BBB,0x7372,0x78BA,0x7A6B,0x899A,
-	0x89D2,0x8D6B,0x8F03,0x90ED,0x95A3,0x9694,0x9769,0x5B66,
-	0x5CB3,0x697D,0x984D,0x984E,0x639B,0x7B20,0x6A2B,0x6A7F,
-	0x68B6,0x9C0D,0x6F5F,0x5272,0x559D,0x6070,0x62EC,0x6D3B,
-	0x6E07,0x6ED1,0x845B,0x8910,0x8F44,0x4E14,0x9C39,0x53F6,
-	0x691B,0x6A3A,0x9784,0x682A,0x515C,0x7AC3,0x84B2,0x91DC,
-	0x938C,0x565B,0x9D28,0x6822,0x8305,0x8431,
-	/* Range 0x3421 - 0x347E, array index: 0x0485 */
-	0x7CA5,0x5208,0x82C5,0x74E6,0x4E7E,0x4F83,0x51A0,0x5BD2,
-	0x520A,0x52D8,0x52E7,0x5DFB,0x559A,0x582A,0x59E6,0x5B8C,
-	0x5B98,0x5BDB,0x5E72,0x5E79,0x60A3,0x611F,0x6163,0x61BE,
-	0x63DB,0x6562,0x67D1,0x6853,0x68FA,0x6B3E,0x6B53,0x6C57,
-	0x6F22,0x6F97,0x6F45,0x74B0,0x7518,0x76E3,0x770B,0x7AFF,
-	0x7BA1,0x7C21,0x7DE9,0x7F36,0x7FF0,0x809D,0x8266,0x839E,
-	0x89B3,0x8ACC,0x8CAB,0x9084,0x9451,0x9593,0x9591,0x95A2,
-	0x9665,0x97D3,0x9928,0x8218,0x4E38,0x542B,0x5CB8,0x5DCC,
-	0x73A9,0x764C,0x773C,0x5CA9,0x7FEB,0x8D0B,0x96C1,0x9811,
-	0x9854,0x9858,0x4F01,0x4F0E,0x5371,0x559C,0x5668,0x57FA,
-	0x5947,0x5B09,0x5BC4,0x5C90,0x5E0C,0x5E7E,0x5FCC,0x63EE,
-	0x673A,0x65D7,0x65E2,0x671F,0x68CB,0x68C4,
-	/* Range 0x3521 - 0x357E, array index: 0x04E3 */
-	0x6A5F,0x5E30,0x6BC5,0x6C17,0x6C7D,0x757F,0x7948,0x5B63,
-	0x7A00,0x7D00,0x5FBD,0x898F,0x8A18,0x8CB4,0x8D77,0x8ECC,
-	0x8F1D,0x98E2,0x9A0E,0x9B3C,0x4E80,0x507D,0x5100,0x5993,
-	0x5B9C,0x622F,0x6280,0x64EC,0x6B3A,0x72A0,0x7591,0x7947,
-	0x7FA9,0x87FB,0x8ABC,0x8B70,0x63AC,0x83CA,0x97A0,0x5409,
-	0x5403,0x55AB,0x6854,0x6A58,0x8A70,0x7827,0x6775,0x9ECD,
-	0x5374,0x5BA2,0x811A,0x8650,0x9006,0x4E18,0x4E45,0x4EC7,
-	0x4F11,0x53CA,0x5438,0x5BAE,0x5F13,0x6025,0x6551,0x673D,
-	0x6C42,0x6C72,0x6CE3,0x7078,0x7403,0x7A76,0x7AAE,0x7B08,
-	0x7D1A,0x7CFE,0x7D66,0x65E7,0x725B,0x53BB,0x5C45,0x5DE8,
-	0x62D2,0x62E0,0x6319,0x6E20,0x865A,0x8A31,0x8DDD,0x92F8,
-	0x6F01,0x79A6,0x9B5A,0x4EA8,0x4EAB,0x4EAC,
-	/* Range 0x3621 - 0x367E, array index: 0x0541 */
-	0x4F9B,0x4FA0,0x50D1,0x5147,0x7AF6,0x5171,0x51F6,0x5354,
-	0x5321,0x537F,0x53EB,0x55AC,0x5883,0x5CE1,0x5F37,0x5F4A,
-	0x602F,0x6050,0x606D,0x631F,0x6559,0x6A4B,0x6CC1,0x72C2,
-	0x72ED,0x77EF,0x80F8,0x8105,0x8208,0x854E,0x90F7,0x93E1,
-	0x97FF,0x9957,0x9A5A,0x4EF0,0x51DD,0x5C2D,0x6681,0x696D,
-	0x5C40,0x66F2,0x6975,0x7389,0x6850,0x7C81,0x50C5,0x52E4,
-	0x5747,0x5DFE,0x9326,0x65A4,0x6B23,0x6B3D,0x7434,0x7981,
-	0x79BD,0x7B4B,0x7DCA,0x82B9,0x83CC,0x887F,0x895F,0x8B39,
-	0x8FD1,0x91D1,0x541F,0x9280,0x4E5D,0x5036,0x53E5,0x533A,
-	0x72D7,0x7396,0x77E9,0x82E6,0x8EAF,0x99C6,0x99C8,0x99D2,
-	0x5177,0x611A,0x865E,0x55B0,0x7A7A,0x5076,0x5BD3,0x9047,
-	0x9685,0x4E32,0x6ADB,0x91E7,0x5C51,0x5C48,
-	/* Range 0x3721 - 0x377E, array index: 0x059F */
-	0x6398,0x7A9F,0x6C93,0x9774,0x8F61,0x7AAA,0x718A,0x9688,
-	0x7C82,0x6817,0x7E70,0x6851,0x936C,0x52F2,0x541B,0x85AB,
-	0x8A13,0x7FA4,0x8ECD,0x90E1,0x5366,0x8888,0x7941,0x4FC2,
-	0x50BE,0x5211,0x5144,0x5553,0x572D,0x73EA,0x578B,0x5951,
-	0x5F62,0x5F84,0x6075,0x6176,0x6167,0x61A9,0x63B2,0x643A,
-	0x656C,0x666F,0x6842,0x6E13,0x7566,0x7A3D,0x7CFB,0x7D4C,
-	0x7D99,0x7E4B,0x7F6B,0x830E,0x834A,0x86CD,0x8A08,0x8A63,
-	0x8B66,0x8EFD,0x981A,0x9D8F,0x82B8,0x8FCE,0x9BE8,0x5287,
-	0x621F,0x6483,0x6FC0,0x9699,0x6841,0x5091,0x6B20,0x6C7A,
-	0x6F54,0x7A74,0x7D50,0x8840,0x8A23,0x6708,0x4EF6,0x5039,
-	0x5026,0x5065,0x517C,0x5238,0x5263,0x55A7,0x570F,0x5805,
-	0x5ACC,0x5EFA,0x61B2,0x61F8,0x62F3,0x6372,
-	/* Range 0x3821 - 0x387E, array index: 0x05FD */
-	0x691C,0x6A29,0x727D,0x72AC,0x732E,0x7814,0x786F,0x7D79,
-	0x770C,0x80A9,0x898B,0x8B19,0x8CE2,0x8ED2,0x9063,0x9375,
-	0x967A,0x9855,0x9A13,0x9E78,0x5143,0x539F,0x53B3,0x5E7B,
-	0x5F26,0x6E1B,0x6E90,0x7384,0x73FE,0x7D43,0x8237,0x8A00,
-	0x8AFA,0x9650,0x4E4E,0x500B,0x53E4,0x547C,0x56FA,0x59D1,
-	0x5B64,0x5DF1,0x5EAB,0x5F27,0x6238,0x6545,0x67AF,0x6E56,
-	0x72D0,0x7CCA,0x88B4,0x80A1,0x80E1,0x83F0,0x864E,0x8A87,
-	0x8DE8,0x9237,0x96C7,0x9867,0x9F13,0x4E94,0x4E92,0x4F0D,
-	0x5348,0x5449,0x543E,0x5A2F,0x5F8C,0x5FA1,0x609F,0x68A7,
-	0x6A8E,0x745A,0x7881,0x8A9E,0x8AA4,0x8B77,0x9190,0x4E5E,
-	0x9BC9,0x4EA4,0x4F7C,0x4FAF,0x5019,0x5016,0x5149,0x516C,
-	0x529F,0x52B9,0x52FE,0x539A,0x53E3,0x5411,
-	/* Range 0x3921 - 0x397E, array index: 0x065B */
-	0x540E,0x5589,0x5751,0x57A2,0x597D,0x5B54,0x5B5D,0x5B8F,
-	0x5DE5,0x5DE7,0x5DF7,0x5E78,0x5E83,0x5E9A,0x5EB7,0x5F18,
-	0x6052,0x614C,0x6297,0x62D8,0x63A7,0x653B,0x6602,0x6643,
-	0x66F4,0x676D,0x6821,0x6897,0x69CB,0x6C5F,0x6D2A,0x6D69,
-	0x6E2F,0x6E9D,0x7532,0x7687,0x786C,0x7A3F,0x7CE0,0x7D05,
-	0x7D18,0x7D5E,0x7DB1,0x8015,0x8003,0x80AF,0x80B1,0x8154,
-	0x818F,0x822A,0x8352,0x884C,0x8861,0x8B1B,0x8CA2,0x8CFC,
-	0x90CA,0x9175,0x9271,0x783F,0x92FC,0x95A4,0x964D,0x9805,
-	0x9999,0x9AD8,0x9D3B,0x525B,0x52AB,0x53F7,0x5408,0x58D5,
-	0x62F7,0x6FE0,0x8C6A,0x8F5F,0x9EB9,0x514B,0x523B,0x544A,
-	0x56FD,0x7A40,0x9177,0x9D60,0x9ED2,0x7344,0x6F09,0x8170,
-	0x7511,0x5FFD,0x60DA,0x9AA8,0x72DB,0x8FBC,
-	/* Range 0x3A21 - 0x3A7E, array index: 0x06B9 */
-	0x6B64,0x9803,0x4ECA,0x56F0,0x5764,0x58BE,0x5A5A,0x6068,
-	0x61C7,0x660F,0x6606,0x6839,0x68B1,0x6DF7,0x75D5,0x7D3A,
-	0x826E,0x9B42,0x4E9B,0x4F50,0x53C9,0x5506,0x5D6F,0x5DE6,
-	0x5DEE,0x67FB,0x6C99,0x7473,0x7802,0x8A50,0x9396,0x88DF,
-	0x5750,0x5EA7,0x632B,0x50B5,0x50AC,0x518D,0x6700,0x54C9,
-	0x585E,0x59BB,0x5BB0,0x5F69,0x624D,0x63A1,0x683D,0x6B73,
-	0x6E08,0x707D,0x91C7,0x7280,0x7815,0x7826,0x796D,0x658E,
-	0x7D30,0x83DC,0x88C1,0x8F09,0x969B,0x5264,0x5728,0x6750,
-	0x7F6A,0x8CA1,0x51B4,0x5742,0x962A,0x583A,0x698A,0x80B4,
-	0x54B2,0x5D0E,0x57FC,0x7895,0x9DFA,0x4F5C,0x524A,0x548B,
-	0x643E,0x6628,0x6714,0x67F5,0x7A84,0x7B56,0x7D22,0x932F,
-	0x685C,0x9BAD,0x7B39,0x5319,0x518A,0x5237,
-	/* Range 0x3B21 - 0x3B7E, array index: 0x0717 */
-	0x5BDF,0x62F6,0x64AE,0x64E6,0x672D,0x6BBA,0x85A9,0x96D1,
-	0x7690,0x9BD6,0x634C,0x9306,0x9BAB,0x76BF,0x6652,0x4E09,
-	0x5098,0x53C2,0x5C71,0x60E8,0x6492,0x6563,0x685F,0x71E6,
-	0x73CA,0x7523,0x7B97,0x7E82,0x8695,0x8B83,0x8CDB,0x9178,
-	0x9910,0x65AC,0x66AB,0x6B8B,0x4ED5,0x4ED4,0x4F3A,0x4F7F,
-	0x523A,0x53F8,0x53F2,0x55E3,0x56DB,0x58EB,0x59CB,0x59C9,
-	0x59FF,0x5B50,0x5C4D,0x5E02,0x5E2B,0x5FD7,0x601D,0x6307,
-	0x652F,0x5B5C,0x65AF,0x65BD,0x65E8,0x679D,0x6B62,0x6B7B,
-	0x6C0F,0x7345,0x7949,0x79C1,0x7CF8,0x7D19,0x7D2B,0x80A2,
-	0x8102,0x81F3,0x8996,0x8A5E,0x8A69,0x8A66,0x8A8C,0x8AEE,
-	0x8CC7,0x8CDC,0x96CC,0x98FC,0x6B6F,0x4E8B,0x4F3C,0x4F8D,
-	0x5150,0x5B57,0x5BFA,0x6148,0x6301,0x6642,
-	/* Range 0x3C21 - 0x3C7E, array index: 0x0775 */
-	0x6B21,0x6ECB,0x6CBB,0x723E,0x74BD,0x75D4,0x78C1,0x793A,
-	0x800C,0x8033,0x81EA,0x8494,0x8F9E,0x6C50,0x9E7F,0x5F0F,
-	0x8B58,0x9D2B,0x7AFA,0x8EF8,0x5B8D,0x96EB,0x4E03,0x53F1,
-	0x57F7,0x5931,0x5AC9,0x5BA4,0x6089,0x6E7F,0x6F06,0x75BE,
-	0x8CEA,0x5B9F,0x8500,0x7BE0,0x5072,0x67F4,0x829D,0x5C61,
-	0x854A,0x7E1E,0x820E,0x5199,0x5C04,0x6368,0x8D66,0x659C,
-	0x716E,0x793E,0x7D17,0x8005,0x8B1D,0x8ECA,0x906E,0x86C7,
-	0x90AA,0x501F,0x52FA,0x5C3A,0x6753,0x707C,0x7235,0x914C,
-	0x91C8,0x932B,0x82E5,0x5BC2,0x5F31,0x60F9,0x4E3B,0x53D6,
-	0x5B88,0x624B,0x6731,0x6B8A,0x72E9,0x73E0,0x7A2E,0x816B,
-	0x8DA3,0x9152,0x9996,0x5112,0x53D7,0x546A,0x5BFF,0x6388,
-	0x6A39,0x7DAC,0x9700,0x56DA,0x53CE,0x5468,
-	/* Range 0x3D21 - 0x3D7E, array index: 0x07D3 */
-	0x5B97,0x5C31,0x5DDE,0x4FEE,0x6101,0x62FE,0x6D32,0x79C0,
-	0x79CB,0x7D42,0x7E4D,0x7FD2,0x81ED,0x821F,0x8490,0x8846,
-	0x8972,0x8B90,0x8E74,0x8F2F,0x9031,0x914B,0x916C,0x96C6,
-	0x919C,0x4EC0,0x4F4F,0x5145,0x5341,0x5F93,0x620E,0x67D4,
-	0x6C41,0x6E0B,0x7363,0x7E26,0x91CD,0x9283,0x53D4,0x5919,
-	0x5BBF,0x6DD1,0x795D,0x7E2E,0x7C9B,0x587E,0x719F,0x51FA,
-	0x8853,0x8FF0,0x4FCA,0x5CFB,0x6625,0x77AC,0x7AE3,0x821C,
-	0x99FF,0x51C6,0x5FAA,0x65EC,0x696F,0x6B89,0x6DF3,0x6E96,
-	0x6F64,0x76FE,0x7D14,0x5DE1,0x9075,0x9187,0x9806,0x51E6,
-	0x521D,0x6240,0x6691,0x66D9,0x6E1A,0x5EB6,0x7DD2,0x7F72,
-	0x66F8,0x85AF,0x85F7,0x8AF8,0x52A9,0x53D9,0x5973,0x5E8F,
-	0x5F90,0x6055,0x92E4,0x9664,0x50B7,0x511F,
-	/* Range 0x3E21 - 0x3E7E, array index: 0x0831 */
-	0x52DD,0x5320,0x5347,0x53EC,0x54E8,0x5546,0x5531,0x5617,
-	0x5968,0x59BE,0x5A3C,0x5BB5,0x5C06,0x5C0F,0x5C11,0x5C1A,
-	0x5E84,0x5E8A,0x5EE0,0x5F70,0x627F,0x6284,0x62DB,0x638C,
-	0x6377,0x6607,0x660C,0x662D,0x6676,0x677E,0x68A2,0x6A1F,
-	0x6A35,0x6CBC,0x6D88,0x6E09,0x6E58,0x713C,0x7126,0x7167,
-	0x75C7,0x7701,0x785D,0x7901,0x7965,0x79F0,0x7AE0,0x7B11,
-	0x7CA7,0x7D39,0x8096,0x83D6,0x848B,0x8549,0x885D,0x88F3,
-	0x8A1F,0x8A3C,0x8A54,0x8A73,0x8C61,0x8CDE,0x91A4,0x9266,
-	0x937E,0x9418,0x969C,0x9798,0x4E0A,0x4E08,0x4E1E,0x4E57,
-	0x5197,0x5270,0x57CE,0x5834,0x58CC,0x5B22,0x5E38,0x60C5,
-	0x64FE,0x6761,0x6756,0x6D44,0x72B6,0x7573,0x7A63,0x84B8,
-	0x8B72,0x91B8,0x9320,0x5631,0x57F4,0x98FE,
-	/* Range 0x3F21 - 0x3F7E, array index: 0x088F */
-	0x62ED,0x690D,0x6B96,0x71ED,0x7E54,0x8077,0x8272,0x89E6,
-	0x98DF,0x8755,0x8FB1,0x5C3B,0x4F38,0x4FE1,0x4FB5,0x5507,
-	0x5A20,0x5BDD,0x5BE9,0x5FC3,0x614E,0x632F,0x65B0,0x664B,
-	0x68EE,0x699B,0x6D78,0x6DF1,0x7533,0x75B9,0x771F,0x795E,
-	0x79E6,0x7D33,0x81E3,0x82AF,0x85AA,0x89AA,0x8A3A,0x8EAB,
-	0x8F9B,0x9032,0x91DD,0x9707,0x4EBA,0x4EC1,0x5203,0x5875,
-	0x58EC,0x5C0B,0x751A,0x5C3D,0x814E,0x8A0A,0x8FC5,0x9663,
-	0x976D,0x7B25,0x8ACF,0x9808,0x9162,0x56F3,0x53A8,0x9017,
-	0x5439,0x5782,0x5E25,0x63A8,0x6C34,0x708A,0x7761,0x7C8B,
-	0x7FE0,0x8870,0x9042,0x9154,0x9310,0x9318,0x968F,0x745E,
-	0x9AC4,0x5D07,0x5D69,0x6570,0x67A2,0x8DA8,0x96DB,0x636E,
-	0x6749,0x6919,0x83C5,0x9817,0x96C0,0x88FE,
-	/* Range 0x4021 - 0x407E, array index: 0x08ED */
-	0x6F84,0x647A,0x5BF8,0x4E16,0x702C,0x755D,0x662F,0x51C4,
-	0x5236,0x52E2,0x59D3,0x5F81,0x6027,0x6210,0x653F,0x6574,
-	0x661F,0x6674,0x68F2,0x6816,0x6B63,0x6E05,0x7272,0x751F,
-	0x76DB,0x7CBE,0x8056,0x58F0,0x88FD,0x897F,0x8AA0,0x8A93,
-	0x8ACB,0x901D,0x9192,0x9752,0x9759,0x6589,0x7A0E,0x8106,
-	0x96BB,0x5E2D,0x60DC,0x621A,0x65A5,0x6614,0x6790,0x77F3,
-	0x7A4D,0x7C4D,0x7E3E,0x810A,0x8CAC,0x8D64,0x8DE1,0x8E5F,
-	0x78A9,0x5207,0x62D9,0x63A5,0x6442,0x6298,0x8A2D,0x7A83,
-	0x7BC0,0x8AAC,0x96EA,0x7D76,0x820C,0x8749,0x4ED9,0x5148,
-	0x5343,0x5360,0x5BA3,0x5C02,0x5C16,0x5DDD,0x6226,0x6247,
-	0x64B0,0x6813,0x6834,0x6CC9,0x6D45,0x6D17,0x67D3,0x6F5C,
-	0x714E,0x717D,0x65CB,0x7A7F,0x7BAD,0x7DDA,
-	/* Range 0x4121 - 0x417E, array index: 0x094B */
-	0x7E4A,0x7FA8,0x817A,0x821B,0x8239,0x85A6,0x8A6E,0x8CCE,
-	0x8DF5,0x9078,0x9077,0x92AD,0x9291,0x9583,0x9BAE,0x524D,
-	0x5584,0x6F38,0x7136,0x5168,0x7985,0x7E55,0x81B3,0x7CCE,
-	0x564C,0x5851,0x5CA8,0x63AA,0x66FE,0x66FD,0x695A,0x72D9,
-	0x758F,0x758E,0x790E,0x7956,0x79DF,0x7C97,0x7D20,0x7D44,
-	0x8607,0x8A34,0x963B,0x9061,0x9F20,0x50E7,0x5275,0x53CC,
-	0x53E2,0x5009,0x55AA,0x58EE,0x594F,0x723D,0x5B8B,0x5C64,
-	0x531D,0x60E3,0x60F3,0x635C,0x6383,0x633F,0x63BB,0x64CD,
-	0x65E9,0x66F9,0x5DE3,0x69CD,0x69FD,0x6F15,0x71E5,0x4E89,
-	0x75E9,0x76F8,0x7A93,0x7CDF,0x7DCF,0x7D9C,0x8061,0x8349,
-	0x8358,0x846C,0x84BC,0x85FB,0x88C5,0x8D70,0x9001,0x906D,
-	0x9397,0x971C,0x9A12,0x50CF,0x5897,0x618E,
-	/* Range 0x4221 - 0x427E, array index: 0x09A9 */
-	0x81D3,0x8535,0x8D08,0x9020,0x4FC3,0x5074,0x5247,0x5373,
-	0x606F,0x6349,0x675F,0x6E2C,0x8DB3,0x901F,0x4FD7,0x5C5E,
-	0x8CCA,0x65CF,0x7D9A,0x5352,0x8896,0x5176,0x63C3,0x5B58,
-	0x5B6B,0x5C0A,0x640D,0x6751,0x905C,0x4ED6,0x591A,0x592A,
-	0x6C70,0x8A51,0x553E,0x5815,0x59A5,0x60F0,0x6253,0x67C1,
-	0x8235,0x6955,0x9640,0x99C4,0x9A28,0x4F53,0x5806,0x5BFE,
-	0x8010,0x5CB1,0x5E2F,0x5F85,0x6020,0x614B,0x6234,0x66FF,
-	0x6CF0,0x6EDE,0x80CE,0x817F,0x82D4,0x888B,0x8CB8,0x9000,
-	0x902E,0x968A,0x9EDB,0x9BDB,0x4EE3,0x53F0,0x5927,0x7B2C,
-	0x918D,0x984C,0x9DF9,0x6EDD,0x7027,0x5353,0x5544,0x5B85,
-	0x6258,0x629E,0x62D3,0x6CA2,0x6FEF,0x7422,0x8A17,0x9438,
-	0x6FC1,0x8AFE,0x8338,0x51E7,0x86F8,0x53EA,
-	/* Range 0x4321 - 0x437E, array index: 0x0A07 */
-	0x53E9,0x4F46,0x9054,0x8FB0,0x596A,0x8131,0x5DFD,0x7AEA,
-	0x8FBF,0x68DA,0x8C37,0x72F8,0x9C48,0x6A3D,0x8AB0,0x4E39,
-	0x5358,0x5606,0x5766,0x62C5,0x63A2,0x65E6,0x6B4E,0x6DE1,
-	0x6E5B,0x70AD,0x77ED,0x7AEF,0x7BAA,0x7DBB,0x803D,0x80C6,
-	0x86CB,0x8A95,0x935B,0x56E3,0x58C7,0x5F3E,0x65AD,0x6696,
-	0x6A80,0x6BB5,0x7537,0x8AC7,0x5024,0x77E5,0x5730,0x5F1B,
-	0x6065,0x667A,0x6C60,0x75F4,0x7A1A,0x7F6E,0x81F4,0x8718,
-	0x9045,0x99B3,0x7BC9,0x755C,0x7AF9,0x7B51,0x84C4,0x9010,
-	0x79E9,0x7A92,0x8336,0x5AE1,0x7740,0x4E2D,0x4EF2,0x5B99,
-	0x5FE0,0x62BD,0x663C,0x67F1,0x6CE8,0x866B,0x8877,0x8A3B,
-	0x914E,0x92F3,0x99D0,0x6A17,0x7026,0x732A,0x82E7,0x8457,
-	0x8CAF,0x4E01,0x5146,0x51CB,0x558B,0x5BF5,
-	/* Range 0x4421 - 0x447E, array index: 0x0A65 */
-	0x5E16,0x5E33,0x5E81,0x5F14,0x5F35,0x5F6B,0x5FB4,0x61F2,
-	0x6311,0x66A2,0x671D,0x6F6E,0x7252,0x753A,0x773A,0x8074,
-	0x8139,0x8178,0x8776,0x8ABF,0x8ADC,0x8D85,0x8DF3,0x929A,
-	0x9577,0x9802,0x9CE5,0x52C5,0x6357,0x76F4,0x6715,0x6C88,
-	0x73CD,0x8CC3,0x93AE,0x9673,0x6D25,0x589C,0x690E,0x69CC,
-	0x8FFD,0x939A,0x75DB,0x901A,0x585A,0x6802,0x63B4,0x69FB,
-	0x4F43,0x6F2C,0x67D8,0x8FBB,0x8526,0x7DB4,0x9354,0x693F,
-	0x6F70,0x576A,0x58F7,0x5B2C,0x7D2C,0x722A,0x540A,0x91E3,
-	0x9DB4,0x4EAD,0x4F4E,0x505C,0x5075,0x5243,0x8C9E,0x5448,
-	0x5824,0x5B9A,0x5E1D,0x5E95,0x5EAD,0x5EF7,0x5F1F,0x608C,
-	0x62B5,0x633A,0x63D0,0x68AF,0x6C40,0x7887,0x798E,0x7A0B,
-	0x7DE0,0x8247,0x8A02,0x8AE6,0x8E44,0x9013,
-	/* Range 0x4521 - 0x457E, array index: 0x0AC3 */
-	0x90B8,0x912D,0x91D8,0x9F0E,0x6CE5,0x6458,0x64E2,0x6575,
-	0x6EF4,0x7684,0x7B1B,0x9069,0x93D1,0x6EBA,0x54F2,0x5FB9,
-	0x64A4,0x8F4D,0x8FED,0x9244,0x5178,0x586B,0x5929,0x5C55,
-	0x5E97,0x6DFB,0x7E8F,0x751C,0x8CBC,0x8EE2,0x985B,0x70B9,
-	0x4F1D,0x6BBF,0x6FB1,0x7530,0x96FB,0x514E,0x5410,0x5835,
-	0x5857,0x59AC,0x5C60,0x5F92,0x6597,0x675C,0x6E21,0x767B,
-	0x83DF,0x8CED,0x9014,0x90FD,0x934D,0x7825,0x783A,0x52AA,
-	0x5EA6,0x571F,0x5974,0x6012,0x5012,0x515A,0x51AC,0x51CD,
-	0x5200,0x5510,0x5854,0x5858,0x5957,0x5B95,0x5CF6,0x5D8B,
-	0x60BC,0x6295,0x642D,0x6771,0x6843,0x68BC,0x68DF,0x76D7,
-	0x6DD8,0x6E6F,0x6D9B,0x706F,0x71C8,0x5F53,0x75D8,0x7977,
-	0x7B49,0x7B54,0x7B52,0x7CD6,0x7D71,0x5230,
-	/* Range 0x4621 - 0x467E, array index: 0x0B21 */
-	0x8463,0x8569,0x85E4,0x8A0E,0x8B04,0x8C46,0x8E0F,0x9003,
-	0x900F,0x9419,0x9676,0x982D,0x9A30,0x95D8,0x50CD,0x52D5,
-	0x540C,0x5802,0x5C0E,0x61A7,0x649E,0x6D1E,0x77B3,0x7AE5,
-	0x80F4,0x8404,0x9053,0x9285,0x5CE0,0x9D07,0x533F,0x5F97,
-	0x5FB3,0x6D9C,0x7279,0x7763,0x79BF,0x7BE4,0x6BD2,0x72EC,
-	0x8AAD,0x6803,0x6A61,0x51F8,0x7A81,0x6934,0x5C4A,0x9CF6,
-	0x82EB,0x5BC5,0x9149,0x701E,0x5678,0x5C6F,0x60C7,0x6566,
-	0x6C8C,0x8C5A,0x9041,0x9813,0x5451,0x66C7,0x920D,0x5948,
-	0x90A3,0x5185,0x4E4D,0x51EA,0x8599,0x8B0E,0x7058,0x637A,
-	0x934B,0x6962,0x99B4,0x7E04,0x7577,0x5357,0x6960,0x8EDF,
-	0x96E3,0x6C5D,0x4E8C,0x5C3C,0x5F10,0x8FE9,0x5302,0x8CD1,
-	0x8089,0x8679,0x5EFF,0x65E5,0x4E73,0x5165,
-	/* Range 0x4721 - 0x477E, array index: 0x0B7F */
-	0x5982,0x5C3F,0x97EE,0x4EFB,0x598A,0x5FCD,0x8A8D,0x6FE1,
-	0x79B0,0x7962,0x5BE7,0x8471,0x732B,0x71B1,0x5E74,0x5FF5,
-	0x637B,0x649A,0x71C3,0x7C98,0x4E43,0x5EFC,0x4E4B,0x57DC,
-	0x56A2,0x60A9,0x6FC3,0x7D0D,0x80FD,0x8133,0x81BF,0x8FB2,
-	0x8997,0x86A4,0x5DF4,0x628A,0x64AD,0x8987,0x6777,0x6CE2,
-	0x6D3E,0x7436,0x7834,0x5A46,0x7F75,0x82AD,0x99AC,0x4FF3,
-	0x5EC3,0x62DD,0x6392,0x6557,0x676F,0x76C3,0x724C,0x80CC,
-	0x80BA,0x8F29,0x914D,0x500D,0x57F9,0x5A92,0x6885,0x6973,
-	0x7164,0x72FD,0x8CB7,0x58F2,0x8CE0,0x966A,0x9019,0x877F,
-	0x79E4,0x77E7,0x8429,0x4F2F,0x5265,0x535A,0x62CD,0x67CF,
-	0x6CCA,0x767D,0x7B94,0x7C95,0x8236,0x8584,0x8FEB,0x66DD,
-	0x6F20,0x7206,0x7E1B,0x83AB,0x99C1,0x9EA6,
-	/* Range 0x4821 - 0x487E, array index: 0x0BDD */
-	0x51FD,0x7BB1,0x7872,0x7BB8,0x8087,0x7B48,0x6AE8,0x5E61,
-	0x808C,0x7551,0x7560,0x516B,0x9262,0x6E8C,0x767A,0x9197,
-	0x9AEA,0x4F10,0x7F70,0x629C,0x7B4F,0x95A5,0x9CE9,0x567A,
-	0x5859,0x86E4,0x96BC,0x4F34,0x5224,0x534A,0x53CD,0x53DB,
-	0x5E06,0x642C,0x6591,0x677F,0x6C3E,0x6C4E,0x7248,0x72AF,
-	0x73ED,0x7554,0x7E41,0x822C,0x85E9,0x8CA9,0x7BC4,0x91C6,
-	0x7169,0x9812,0x98EF,0x633D,0x6669,0x756A,0x76E4,0x78D0,
-	0x8543,0x86EE,0x532A,0x5351,0x5426,0x5983,0x5E87,0x5F7C,
-	0x60B2,0x6249,0x6279,0x62AB,0x6590,0x6BD4,0x6CCC,0x75B2,
-	0x76AE,0x7891,0x79D8,0x7DCB,0x7F77,0x80A5,0x88AB,0x8AB9,
-	0x8CBB,0x907F,0x975E,0x98DB,0x6A0B,0x7C38,0x5099,0x5C3E,
-	0x5FAE,0x6787,0x6BD8,0x7435,0x7709,0x7F8E,
-	/* Range 0x4921 - 0x497E, array index: 0x0C3B */
-	0x9F3B,0x67CA,0x7A17,0x5339,0x758B,0x9AED,0x5F66,0x819D,
-	0x83F1,0x8098,0x5F3C,0x5FC5,0x7562,0x7B46,0x903C,0x6867,
-	0x59EB,0x5A9B,0x7D10,0x767E,0x8B2C,0x4FF5,0x5F6A,0x6A19,
-	0x6C37,0x6F02,0x74E2,0x7968,0x8868,0x8A55,0x8C79,0x5EDF,
-	0x63CF,0x75C5,0x79D2,0x82D7,0x9328,0x92F2,0x849C,0x86ED,
-	0x9C2D,0x54C1,0x5F6C,0x658C,0x6D5C,0x7015,0x8CA7,0x8CD3,
-	0x983B,0x654F,0x74F6,0x4E0D,0x4ED8,0x57E0,0x592B,0x5A66,
-	0x5BCC,0x51A8,0x5E03,0x5E9C,0x6016,0x6276,0x6577,0x65A7,
-	0x666E,0x6D6E,0x7236,0x7B26,0x8150,0x819A,0x8299,0x8B5C,
-	0x8CA0,0x8CE6,0x8D74,0x961C,0x9644,0x4FAE,0x64AB,0x6B66,
-	0x821E,0x8461,0x856A,0x90E8,0x5C01,0x6953,0x98A8,0x847A,
-	0x8557,0x4F0F,0x526F,0x5FA9,0x5E45,0x670D,
-	/* Range 0x4A21 - 0x4A7E, array index: 0x0C99 */
-	0x798F,0x8179,0x8907,0x8986,0x6DF5,0x5F17,0x6255,0x6CB8,
-	0x4ECF,0x7269,0x9B92,0x5206,0x543B,0x5674,0x58B3,0x61A4,
-	0x626E,0x711A,0x596E,0x7C89,0x7CDE,0x7D1B,0x96F0,0x6587,
-	0x805E,0x4E19,0x4F75,0x5175,0x5840,0x5E63,0x5E73,0x5F0A,
-	0x67C4,0x4E26,0x853D,0x9589,0x965B,0x7C73,0x9801,0x50FB,
-	0x58C1,0x7656,0x78A7,0x5225,0x77A5,0x8511,0x7B86,0x504F,
-	0x5909,0x7247,0x7BC7,0x7DE8,0x8FBA,0x8FD4,0x904D,0x4FBF,
-	0x52C9,0x5A29,0x5F01,0x97AD,0x4FDD,0x8217,0x92EA,0x5703,
-	0x6355,0x6B69,0x752B,0x88DC,0x8F14,0x7A42,0x52DF,0x5893,
-	0x6155,0x620A,0x66AE,0x6BCD,0x7C3F,0x83E9,0x5023,0x4FF8,
-	0x5305,0x5446,0x5831,0x5949,0x5B9D,0x5CF0,0x5CEF,0x5D29,
-	0x5E96,0x62B1,0x6367,0x653E,0x65B9,0x670B,
-	/* Range 0x4B21 - 0x4B7E, array index: 0x0CF7 */
-	0x6CD5,0x6CE1,0x70F9,0x7832,0x7E2B,0x80DE,0x82B3,0x840C,
-	0x84EC,0x8702,0x8912,0x8A2A,0x8C4A,0x90A6,0x92D2,0x98FD,
-	0x9CF3,0x9D6C,0x4E4F,0x4EA1,0x508D,0x5256,0x574A,0x59A8,
-	0x5E3D,0x5FD8,0x5FD9,0x623F,0x66B4,0x671B,0x67D0,0x68D2,
-	0x5192,0x7D21,0x80AA,0x81A8,0x8B00,0x8C8C,0x8CBF,0x927E,
-	0x9632,0x5420,0x982C,0x5317,0x50D5,0x535C,0x58A8,0x64B2,
-	0x6734,0x7267,0x7766,0x7A46,0x91E6,0x52C3,0x6CA1,0x6B86,
-	0x5800,0x5E4C,0x5954,0x672C,0x7FFB,0x51E1,0x76C6,0x6469,
-	0x78E8,0x9B54,0x9EBB,0x57CB,0x59B9,0x6627,0x679A,0x6BCE,
-	0x54E9,0x69D9,0x5E55,0x819C,0x6795,0x9BAA,0x67FE,0x9C52,
-	0x685D,0x4EA6,0x4FE3,0x53C8,0x62B9,0x672B,0x6CAB,0x8FC4,
-	0x4FAD,0x7E6D,0x9EBF,0x4E07,0x6162,0x6E80,
-	/* Range 0x4C21 - 0x4C7E, array index: 0x0D55 */
-	0x6F2B,0x8513,0x5473,0x672A,0x9B45,0x5DF3,0x7B95,0x5CAC,
-	0x5BC6,0x871C,0x6E4A,0x84D1,0x7A14,0x8108,0x5999,0x7C8D,
-	0x6C11,0x7720,0x52D9,0x5922,0x7121,0x725F,0x77DB,0x9727,
-	0x9D61,0x690B,0x5A7F,0x5A18,0x51A5,0x540D,0x547D,0x660E,
-	0x76DF,0x8FF7,0x9298,0x9CF4,0x59EA,0x725D,0x6EC5,0x514D,
-	0x68C9,0x7DBF,0x7DEC,0x9762,0x9EBA,0x6478,0x6A21,0x8302,
-	0x5984,0x5B5F,0x6BDB,0x731B,0x76F2,0x7DB2,0x8017,0x8499,
-	0x5132,0x6728,0x9ED9,0x76EE,0x6762,0x52FF,0x9905,0x5C24,
-	0x623B,0x7C7E,0x8CB0,0x554F,0x60B6,0x7D0B,0x9580,0x5301,
-	0x4E5F,0x51B6,0x591C,0x723A,0x8036,0x91CE,0x5F25,0x77E2,
-	0x5384,0x5F79,0x7D04,0x85AC,0x8A33,0x8E8D,0x9756,0x67F3,
-	0x85AE,0x9453,0x6109,0x6108,0x6CB9,0x7652,
-	/* Range 0x4D21 - 0x4D7E, array index: 0x0DB3 */
-	0x8AED,0x8F38,0x552F,0x4F51,0x512A,0x52C7,0x53CB,0x5BA5,
-	0x5E7D,0x60A0,0x6182,0x63D6,0x6709,0x67DA,0x6E67,0x6D8C,
-	0x7336,0x7337,0x7531,0x7950,0x88D5,0x8A98,0x904A,0x9091,
-	0x90F5,0x96C4,0x878D,0x5915,0x4E88,0x4F59,0x4E0E,0x8A89,
-	0x8F3F,0x9810,0x50AD,0x5E7C,0x5996,0x5BB9,0x5EB8,0x63DA,
-	0x63FA,0x64C1,0x66DC,0x694A,0x69D8,0x6D0B,0x6EB6,0x7194,
-	0x7528,0x7AAF,0x7F8A,0x8000,0x8449,0x84C9,0x8981,0x8B21,
-	0x8E0A,0x9065,0x967D,0x990A,0x617E,0x6291,0x6B32,0x6C83,
-	0x6D74,0x7FCC,0x7FFC,0x6DC0,0x7F85,0x87BA,0x88F8,0x6765,
-	0x83B1,0x983C,0x96F7,0x6D1B,0x7D61,0x843D,0x916A,0x4E71,
-	0x5375,0x5D50,0x6B04,0x6FEB,0x85CD,0x862D,0x89A7,0x5229,
-	0x540F,0x5C65,0x674E,0x68A8,0x7406,0x7483,
-	/* Range 0x4E21 - 0x4E7E, array index: 0x0E11 */
-	0x75E2,0x88CF,0x88E1,0x91CC,0x96E2,0x9678,0x5F8B,0x7387,
-	0x7ACB,0x844E,0x63A0,0x7565,0x5289,0x6D41,0x6E9C,0x7409,
-	0x7559,0x786B,0x7C92,0x9686,0x7ADC,0x9F8D,0x4FB6,0x616E,
-	0x65C5,0x865C,0x4E86,0x4EAE,0x50DA,0x4E21,0x51CC,0x5BEE,
-	0x6599,0x6881,0x6DBC,0x731F,0x7642,0x77AD,0x7A1C,0x7CE7,
-	0x826F,0x8AD2,0x907C,0x91CF,0x9675,0x9818,0x529B,0x7DD1,
-	0x502B,0x5398,0x6797,0x6DCB,0x71D0,0x7433,0x81E8,0x8F2A,
-	0x96A3,0x9C57,0x9E9F,0x7460,0x5841,0x6D99,0x7D2F,0x985E,
-	0x4EE4,0x4F36,0x4F8B,0x51B7,0x52B1,0x5DBA,0x601C,0x73B2,
-	0x793C,0x82D3,0x9234,0x96B7,0x96F6,0x970A,0x9E97,0x9F62,
-	0x66A6,0x6B74,0x5217,0x52A3,0x70C8,0x88C2,0x5EC9,0x604B,
-	0x6190,0x6F23,0x7149,0x7C3E,0x7DF4,0x806F,
-	/* Range 0x4F21 - 0x4F53, array index: 0x0E6F */
-	0x84EE,0x9023,0x932C,0x5442,0x9B6F,0x6AD3,0x7089,0x8CC2,
-	0x8DEF,0x9732,0x52B4,0x5A41,0x5ECA,0x5F04,0x6717,0x697C,
-	0x6994,0x6D6A,0x6F0F,0x7262,0x72FC,0x7BED,0x8001,0x807E,
-	0x874B,0x90CE,0x516D,0x9E93,0x7984,0x808B,0x9332,0x8AD6,
-	0x502D,0x548C,0x8A71,0x6B6A,0x8CC4,0x8107,0x60D1,0x67A0,
-	0x9DF2,0x4E99,0x4E98,0x9C10,0x8A6B,0x85C1,0x8568,0x6900,
-	0x6E7E,0x7897,0x8155,
-	/* Range 0x5021 - 0x507E, array index: 0x0EA2 */
-	0x5F0C,0x4E10,0x4E15,0x4E2A,0x4E31,0x4E36,0x4E3C,0x4E3F,
-	0x4E42,0x4E56,0x4E58,0x4E82,0x4E85,0x8C6B,0x4E8A,0x8212,
-	0x5F0D,0x4E8E,0x4E9E,0x4E9F,0x4EA0,0x4EA2,0x4EB0,0x4EB3,
-	0x4EB6,0x4ECE,0x4ECD,0x4EC4,0x4EC6,0x4EC2,0x4ED7,0x4EDE,
-	0x4EED,0x4EDF,0x4EF7,0x4F09,0x4F5A,0x4F30,0x4F5B,0x4F5D,
-	0x4F57,0x4F47,0x4F76,0x4F88,0x4F8F,0x4F98,0x4F7B,0x4F69,
-	0x4F70,0x4F91,0x4F6F,0x4F86,0x4F96,0x5118,0x4FD4,0x4FDF,
-	0x4FCE,0x4FD8,0x4FDB,0x4FD1,0x4FDA,0x4FD0,0x4FE4,0x4FE5,
-	0x501A,0x5028,0x5014,0x502A,0x5025,0x5005,0x4F1C,0x4FF6,
-	0x5021,0x5029,0x502C,0x4FFE,0x4FEF,0x5011,0x5006,0x5043,
-	0x5047,0x6703,0x5055,0x5050,0x5048,0x505A,0x5056,0x506C,
-	0x5078,0x5080,0x509A,0x5085,0x50B4,0x50B2,
-	/* Range 0x5121 - 0x517E, array index: 0x0F00 */
-	0x50C9,0x50CA,0x50B3,0x50C2,0x50D6,0x50DE,0x50E5,0x50ED,
-	0x50E3,0x50EE,0x50F9,0x50F5,0x5109,0x5101,0x5102,0x5116,
-	0x5115,0x5114,0x511A,0x5121,0x513A,0x5137,0x513C,0x513B,
-	0x513F,0x5140,0x5152,0x514C,0x5154,0x5162,0x7AF8,0x5169,
-	0x516A,0x516E,0x5180,0x5182,0x56D8,0x518C,0x5189,0x518F,
-	0x5191,0x5193,0x5195,0x5196,0x51A4,0x51A6,0x51A2,0x51A9,
-	0x51AA,0x51AB,0x51B3,0x51B1,0x51B2,0x51B0,0x51B5,0x51BD,
-	0x51C5,0x51C9,0x51DB,0x51E0,0x8655,0x51E9,0x51ED,0x51F0,
-	0x51F5,0x51FE,0x5204,0x520B,0x5214,0x520E,0x5227,0x522A,
-	0x522E,0x5233,0x5239,0x524F,0x5244,0x524B,0x524C,0x525E,
-	0x5254,0x526A,0x5274,0x5269,0x5273,0x527F,0x527D,0x528D,
-	0x5294,0x5292,0x5271,0x5288,0x5291,0x8FA8,
-	/* Range 0x5221 - 0x527E, array index: 0x0F5E */
-	0x8FA7,0x52AC,0x52AD,0x52BC,0x52B5,0x52C1,0x52CD,0x52D7,
-	0x52DE,0x52E3,0x52E6,0x98ED,0x52E0,0x52F3,0x52F5,0x52F8,
-	0x52F9,0x5306,0x5308,0x7538,0x530D,0x5310,0x530F,0x5315,
-	0x531A,0x5323,0x532F,0x5331,0x5333,0x5338,0x5340,0x5346,
-	0x5345,0x4E17,0x5349,0x534D,0x51D6,0x535E,0x5369,0x536E,
-	0x5918,0x537B,0x5377,0x5382,0x5396,0x53A0,0x53A6,0x53A5,
-	0x53AE,0x53B0,0x53B6,0x53C3,0x7C12,0x96D9,0x53DF,0x66FC,
-	0x71EE,0x53EE,0x53E8,0x53ED,0x53FA,0x5401,0x543D,0x5440,
-	0x542C,0x542D,0x543C,0x542E,0x5436,0x5429,0x541D,0x544E,
-	0x548F,0x5475,0x548E,0x545F,0x5471,0x5477,0x5470,0x5492,
-	0x547B,0x5480,0x5476,0x5484,0x5490,0x5486,0x54C7,0x54A2,
-	0x54B8,0x54A5,0x54AC,0x54C4,0x54C8,0x54A8,
-	/* Range 0x5321 - 0x537E, array index: 0x0FBC */
-	0x54AB,0x54C2,0x54A4,0x54BE,0x54BC,0x54D8,0x54E5,0x54E6,
-	0x550F,0x5514,0x54FD,0x54EE,0x54ED,0x54FA,0x54E2,0x5539,
-	0x5540,0x5563,0x554C,0x552E,0x555C,0x5545,0x5556,0x5557,
-	0x5538,0x5533,0x555D,0x5599,0x5580,0x54AF,0x558A,0x559F,
-	0x557B,0x557E,0x5598,0x559E,0x55AE,0x557C,0x5583,0x55A9,
-	0x5587,0x55A8,0x55DA,0x55C5,0x55DF,0x55C4,0x55DC,0x55E4,
-	0x55D4,0x5614,0x55F7,0x5616,0x55FE,0x55FD,0x561B,0x55F9,
-	0x564E,0x5650,0x71DF,0x5634,0x5636,0x5632,0x5638,0x566B,
-	0x5664,0x562F,0x566C,0x566A,0x5686,0x5680,0x568A,0x56A0,
-	0x5694,0x568F,0x56A5,0x56AE,0x56B6,0x56B4,0x56C2,0x56BC,
-	0x56C1,0x56C3,0x56C0,0x56C8,0x56CE,0x56D1,0x56D3,0x56D7,
-	0x56EE,0x56F9,0x5700,0x56FF,0x5704,0x5709,
-	/* Range 0x5421 - 0x547E, array index: 0x101A */
-	0x5708,0x570B,0x570D,0x5713,0x5718,0x5716,0x55C7,0x571C,
-	0x5726,0x5737,0x5738,0x574E,0x573B,0x5740,0x574F,0x5769,
-	0x57C0,0x5788,0x5761,0x577F,0x5789,0x5793,0x57A0,0x57B3,
-	0x57A4,0x57AA,0x57B0,0x57C3,0x57C6,0x57D4,0x57D2,0x57D3,
-	0x580A,0x57D6,0x57E3,0x580B,0x5819,0x581D,0x5872,0x5821,
-	0x5862,0x584B,0x5870,0x6BC0,0x5852,0x583D,0x5879,0x5885,
-	0x58B9,0x589F,0x58AB,0x58BA,0x58DE,0x58BB,0x58B8,0x58AE,
-	0x58C5,0x58D3,0x58D1,0x58D7,0x58D9,0x58D8,0x58E5,0x58DC,
-	0x58E4,0x58DF,0x58EF,0x58FA,0x58F9,0x58FB,0x58FC,0x58FD,
-	0x5902,0x590A,0x5910,0x591B,0x68A6,0x5925,0x592C,0x592D,
-	0x5932,0x5938,0x593E,0x7AD2,0x5955,0x5950,0x594E,0x595A,
-	0x5958,0x5962,0x5960,0x5967,0x596C,0x5969,
-	/* Range 0x5521 - 0x557E, array index: 0x1078 */
-	0x5978,0x5981,0x599D,0x4F5E,0x4FAB,0x59A3,0x59B2,0x59C6,
-	0x59E8,0x59DC,0x598D,0x59D9,0x59DA,0x5A25,0x5A1F,0x5A11,
-	0x5A1C,0x5A09,0x5A1A,0x5A40,0x5A6C,0x5A49,0x5A35,0x5A36,
-	0x5A62,0x5A6A,0x5A9A,0x5ABC,0x5ABE,0x5ACB,0x5AC2,0x5ABD,
-	0x5AE3,0x5AD7,0x5AE6,0x5AE9,0x5AD6,0x5AFA,0x5AFB,0x5B0C,
-	0x5B0B,0x5B16,0x5B32,0x5AD0,0x5B2A,0x5B36,0x5B3E,0x5B43,
-	0x5B45,0x5B40,0x5B51,0x5B55,0x5B5A,0x5B5B,0x5B65,0x5B69,
-	0x5B70,0x5B73,0x5B75,0x5B78,0x6588,0x5B7A,0x5B80,0x5B83,
-	0x5BA6,0x5BB8,0x5BC3,0x5BC7,0x5BC9,0x5BD4,0x5BD0,0x5BE4,
-	0x5BE6,0x5BE2,0x5BDE,0x5BE5,0x5BEB,0x5BF0,0x5BF6,0x5BF3,
-	0x5C05,0x5C07,0x5C08,0x5C0D,0x5C13,0x5C20,0x5C22,0x5C28,
-	0x5C38,0x5C39,0x5C41,0x5C46,0x5C4E,0x5C53,
-	/* Range 0x5621 - 0x567E, array index: 0x10D6 */
-	0x5C50,0x5C4F,0x5B71,0x5C6C,0x5C6E,0x4E62,0x5C76,0x5C79,
-	0x5C8C,0x5C91,0x5C94,0x599B,0x5CAB,0x5CBB,0x5CB6,0x5CBC,
-	0x5CB7,0x5CC5,0x5CBE,0x5CC7,0x5CD9,0x5CE9,0x5CFD,0x5CFA,
-	0x5CED,0x5D8C,0x5CEA,0x5D0B,0x5D15,0x5D17,0x5D5C,0x5D1F,
-	0x5D1B,0x5D11,0x5D14,0x5D22,0x5D1A,0x5D19,0x5D18,0x5D4C,
-	0x5D52,0x5D4E,0x5D4B,0x5D6C,0x5D73,0x5D76,0x5D87,0x5D84,
-	0x5D82,0x5DA2,0x5D9D,0x5DAC,0x5DAE,0x5DBD,0x5D90,0x5DB7,
-	0x5DBC,0x5DC9,0x5DCD,0x5DD3,0x5DD2,0x5DD6,0x5DDB,0x5DEB,
-	0x5DF2,0x5DF5,0x5E0B,0x5E1A,0x5E19,0x5E11,0x5E1B,0x5E36,
-	0x5E37,0x5E44,0x5E43,0x5E40,0x5E4E,0x5E57,0x5E54,0x5E5F,
-	0x5E62,0x5E64,0x5E47,0x5E75,0x5E76,0x5E7A,0x9EBC,0x5E7F,
-	0x5EA0,0x5EC1,0x5EC2,0x5EC8,0x5ED0,0x5ECF,
-	/* Range 0x5721 - 0x577E, array index: 0x1134 */
-	0x5ED6,0x5EE3,0x5EDD,0x5EDA,0x5EDB,0x5EE2,0x5EE1,0x5EE8,
-	0x5EE9,0x5EEC,0x5EF1,0x5EF3,0x5EF0,0x5EF4,0x5EF8,0x5EFE,
-	0x5F03,0x5F09,0x5F5D,0x5F5C,0x5F0B,0x5F11,0x5F16,0x5F29,
-	0x5F2D,0x5F38,0x5F41,0x5F48,0x5F4C,0x5F4E,0x5F2F,0x5F51,
-	0x5F56,0x5F57,0x5F59,0x5F61,0x5F6D,0x5F73,0x5F77,0x5F83,
-	0x5F82,0x5F7F,0x5F8A,0x5F88,0x5F91,0x5F87,0x5F9E,0x5F99,
-	0x5F98,0x5FA0,0x5FA8,0x5FAD,0x5FBC,0x5FD6,0x5FFB,0x5FE4,
-	0x5FF8,0x5FF1,0x5FDD,0x60B3,0x5FFF,0x6021,0x6060,0x6019,
-	0x6010,0x6029,0x600E,0x6031,0x601B,0x6015,0x602B,0x6026,
-	0x600F,0x603A,0x605A,0x6041,0x606A,0x6077,0x605F,0x604A,
-	0x6046,0x604D,0x6063,0x6043,0x6064,0x6042,0x606C,0x606B,
-	0x6059,0x6081,0x608D,0x60E7,0x6083,0x609A,
-	/* Range 0x5821 - 0x587E, array index: 0x1192 */
-	0x6084,0x609B,0x6096,0x6097,0x6092,0x60A7,0x608B,0x60E1,
-	0x60B8,0x60E0,0x60D3,0x60B4,0x5FF0,0x60BD,0x60C6,0x60B5,
-	0x60D8,0x614D,0x6115,0x6106,0x60F6,0x60F7,0x6100,0x60F4,
-	0x60FA,0x6103,0x6121,0x60FB,0x60F1,0x610D,0x610E,0x6147,
-	0x613E,0x6128,0x6127,0x614A,0x613F,0x613C,0x612C,0x6134,
-	0x613D,0x6142,0x6144,0x6173,0x6177,0x6158,0x6159,0x615A,
-	0x616B,0x6174,0x616F,0x6165,0x6171,0x615F,0x615D,0x6153,
-	0x6175,0x6199,0x6196,0x6187,0x61AC,0x6194,0x619A,0x618A,
-	0x6191,0x61AB,0x61AE,0x61CC,0x61CA,0x61C9,0x61F7,0x61C8,
-	0x61C3,0x61C6,0x61BA,0x61CB,0x7F79,0x61CD,0x61E6,0x61E3,
-	0x61F6,0x61FA,0x61F4,0x61FF,0x61FD,0x61FC,0x61FE,0x6200,
-	0x6208,0x6209,0x620D,0x620C,0x6214,0x621B,
-	/* Range 0x5921 - 0x597E, array index: 0x11F0 */
-	0x621E,0x6221,0x622A,0x622E,0x6230,0x6232,0x6233,0x6241,
-	0x624E,0x625E,0x6263,0x625B,0x6260,0x6268,0x627C,0x6282,
-	0x6289,0x627E,0x6292,0x6293,0x6296,0x62D4,0x6283,0x6294,
-	0x62D7,0x62D1,0x62BB,0x62CF,0x62FF,0x62C6,0x64D4,0x62C8,
-	0x62DC,0x62CC,0x62CA,0x62C2,0x62C7,0x629B,0x62C9,0x630C,
-	0x62EE,0x62F1,0x6327,0x6302,0x6308,0x62EF,0x62F5,0x6350,
-	0x633E,0x634D,0x641C,0x634F,0x6396,0x638E,0x6380,0x63AB,
-	0x6376,0x63A3,0x638F,0x6389,0x639F,0x63B5,0x636B,0x6369,
-	0x63BE,0x63E9,0x63C0,0x63C6,0x63E3,0x63C9,0x63D2,0x63F6,
-	0x63C4,0x6416,0x6434,0x6406,0x6413,0x6426,0x6436,0x651D,
-	0x6417,0x6428,0x640F,0x6467,0x646F,0x6476,0x644E,0x652A,
-	0x6495,0x6493,0x64A5,0x64A9,0x6488,0x64BC,
-	/* Range 0x5A21 - 0x5A7E, array index: 0x124E */
-	0x64DA,0x64D2,0x64C5,0x64C7,0x64BB,0x64D8,0x64C2,0x64F1,
-	0x64E7,0x8209,0x64E0,0x64E1,0x62AC,0x64E3,0x64EF,0x652C,
-	0x64F6,0x64F4,0x64F2,0x64FA,0x6500,0x64FD,0x6518,0x651C,
-	0x6505,0x6524,0x6523,0x652B,0x6534,0x6535,0x6537,0x6536,
-	0x6538,0x754B,0x6548,0x6556,0x6555,0x654D,0x6558,0x655E,
-	0x655D,0x6572,0x6578,0x6582,0x6583,0x8B8A,0x659B,0x659F,
-	0x65AB,0x65B7,0x65C3,0x65C6,0x65C1,0x65C4,0x65CC,0x65D2,
-	0x65DB,0x65D9,0x65E0,0x65E1,0x65F1,0x6772,0x660A,0x6603,
-	0x65FB,0x6773,0x6635,0x6636,0x6634,0x661C,0x664F,0x6644,
-	0x6649,0x6641,0x665E,0x665D,0x6664,0x6667,0x6668,0x665F,
-	0x6662,0x6670,0x6683,0x6688,0x668E,0x6689,0x6684,0x6698,
-	0x669D,0x66C1,0x66B9,0x66C9,0x66BE,0x66BC,
-	/* Range 0x5B21 - 0x5B7E, array index: 0x12AC */
-	0x66C4,0x66B8,0x66D6,0x66DA,0x66E0,0x663F,0x66E6,0x66E9,
-	0x66F0,0x66F5,0x66F7,0x670F,0x6716,0x671E,0x6726,0x6727,
-	0x9738,0x672E,0x673F,0x6736,0x6741,0x6738,0x6737,0x6746,
-	0x675E,0x6760,0x6759,0x6763,0x6764,0x6789,0x6770,0x67A9,
-	0x677C,0x676A,0x678C,0x678B,0x67A6,0x67A1,0x6785,0x67B7,
-	0x67EF,0x67B4,0x67EC,0x67B3,0x67E9,0x67B8,0x67E4,0x67DE,
-	0x67DD,0x67E2,0x67EE,0x67B9,0x67CE,0x67C6,0x67E7,0x6A9C,
-	0x681E,0x6846,0x6829,0x6840,0x684D,0x6832,0x684E,0x68B3,
-	0x682B,0x6859,0x6863,0x6877,0x687F,0x689F,0x688F,0x68AD,
-	0x6894,0x689D,0x689B,0x6883,0x6AAE,0x68B9,0x6874,0x68B5,
-	0x68A0,0x68BA,0x690F,0x688D,0x687E,0x6901,0x68CA,0x6908,
-	0x68D8,0x6922,0x6926,0x68E1,0x690C,0x68CD,
-	/* Range 0x5C21 - 0x5C7E, array index: 0x130A */
-	0x68D4,0x68E7,0x68D5,0x6936,0x6912,0x6904,0x68D7,0x68E3,
-	0x6925,0x68F9,0x68E0,0x68EF,0x6928,0x692A,0x691A,0x6923,
-	0x6921,0x68C6,0x6979,0x6977,0x695C,0x6978,0x696B,0x6954,
-	0x697E,0x696E,0x6939,0x6974,0x693D,0x6959,0x6930,0x6961,
-	0x695E,0x695D,0x6981,0x696A,0x69B2,0x69AE,0x69D0,0x69BF,
-	0x69C1,0x69D3,0x69BE,0x69CE,0x5BE8,0x69CA,0x69DD,0x69BB,
-	0x69C3,0x69A7,0x6A2E,0x6991,0x69A0,0x699C,0x6995,0x69B4,
-	0x69DE,0x69E8,0x6A02,0x6A1B,0x69FF,0x6B0A,0x69F9,0x69F2,
-	0x69E7,0x6A05,0x69B1,0x6A1E,0x69ED,0x6A14,0x69EB,0x6A0A,
-	0x6A12,0x6AC1,0x6A23,0x6A13,0x6A44,0x6A0C,0x6A72,0x6A36,
-	0x6A78,0x6A47,0x6A62,0x6A59,0x6A66,0x6A48,0x6A38,0x6A22,
-	0x6A90,0x6A8D,0x6AA0,0x6A84,0x6AA2,0x6AA3,
-	/* Range 0x5D21 - 0x5D7E, array index: 0x1368 */
-	0x6A97,0x8617,0x6ABB,0x6AC3,0x6AC2,0x6AB8,0x6AB3,0x6AAC,
-	0x6ADE,0x6AD1,0x6ADF,0x6AAA,0x6ADA,0x6AEA,0x6AFB,0x6B05,
-	0x8616,0x6AFA,0x6B12,0x6B16,0x9B31,0x6B1F,0x6B38,0x6B37,
-	0x76DC,0x6B39,0x98EE,0x6B47,0x6B43,0x6B49,0x6B50,0x6B59,
-	0x6B54,0x6B5B,0x6B5F,0x6B61,0x6B78,0x6B79,0x6B7F,0x6B80,
-	0x6B84,0x6B83,0x6B8D,0x6B98,0x6B95,0x6B9E,0x6BA4,0x6BAA,
-	0x6BAB,0x6BAF,0x6BB2,0x6BB1,0x6BB3,0x6BB7,0x6BBC,0x6BC6,
-	0x6BCB,0x6BD3,0x6BDF,0x6BEC,0x6BEB,0x6BF3,0x6BEF,0x9EBE,
-	0x6C08,0x6C13,0x6C14,0x6C1B,0x6C24,0x6C23,0x6C5E,0x6C55,
-	0x6C62,0x6C6A,0x6C82,0x6C8D,0x6C9A,0x6C81,0x6C9B,0x6C7E,
-	0x6C68,0x6C73,0x6C92,0x6C90,0x6CC4,0x6CF1,0x6CD3,0x6CBD,
-	0x6CD7,0x6CC5,0x6CDD,0x6CAE,0x6CB1,0x6CBE,
-	/* Range 0x5E21 - 0x5E7E, array index: 0x13C6 */
-	0x6CBA,0x6CDB,0x6CEF,0x6CD9,0x6CEA,0x6D1F,0x884D,0x6D36,
-	0x6D2B,0x6D3D,0x6D38,0x6D19,0x6D35,0x6D33,0x6D12,0x6D0C,
-	0x6D63,0x6D93,0x6D64,0x6D5A,0x6D79,0x6D59,0x6D8E,0x6D95,
-	0x6FE4,0x6D85,0x6DF9,0x6E15,0x6E0A,0x6DB5,0x6DC7,0x6DE6,
-	0x6DB8,0x6DC6,0x6DEC,0x6DDE,0x6DCC,0x6DE8,0x6DD2,0x6DC5,
-	0x6DFA,0x6DD9,0x6DE4,0x6DD5,0x6DEA,0x6DEE,0x6E2D,0x6E6E,
-	0x6E2E,0x6E19,0x6E72,0x6E5F,0x6E3E,0x6E23,0x6E6B,0x6E2B,
-	0x6E76,0x6E4D,0x6E1F,0x6E43,0x6E3A,0x6E4E,0x6E24,0x6EFF,
-	0x6E1D,0x6E38,0x6E82,0x6EAA,0x6E98,0x6EC9,0x6EB7,0x6ED3,
-	0x6EBD,0x6EAF,0x6EC4,0x6EB2,0x6ED4,0x6ED5,0x6E8F,0x6EA5,
-	0x6EC2,0x6E9F,0x6F41,0x6F11,0x704C,0x6EEC,0x6EF8,0x6EFE,
-	0x6F3F,0x6EF2,0x6F31,0x6EEF,0x6F32,0x6ECC,
-	/* Range 0x5F21 - 0x5F7E, array index: 0x1424 */
-	0x6F3E,0x6F13,0x6EF7,0x6F86,0x6F7A,0x6F78,0x6F81,0x6F80,
-	0x6F6F,0x6F5B,0x6FF3,0x6F6D,0x6F82,0x6F7C,0x6F58,0x6F8E,
-	0x6F91,0x6FC2,0x6F66,0x6FB3,0x6FA3,0x6FA1,0x6FA4,0x6FB9,
-	0x6FC6,0x6FAA,0x6FDF,0x6FD5,0x6FEC,0x6FD4,0x6FD8,0x6FF1,
-	0x6FEE,0x6FDB,0x7009,0x700B,0x6FFA,0x7011,0x7001,0x700F,
-	0x6FFE,0x701B,0x701A,0x6F74,0x701D,0x7018,0x701F,0x7030,
-	0x703E,0x7032,0x7051,0x7063,0x7099,0x7092,0x70AF,0x70F1,
-	0x70AC,0x70B8,0x70B3,0x70AE,0x70DF,0x70CB,0x70DD,0x70D9,
-	0x7109,0x70FD,0x711C,0x7119,0x7165,0x7155,0x7188,0x7166,
-	0x7162,0x714C,0x7156,0x716C,0x718F,0x71FB,0x7184,0x7195,
-	0x71A8,0x71AC,0x71D7,0x71B9,0x71BE,0x71D2,0x71C9,0x71D4,
-	0x71CE,0x71E0,0x71EC,0x71E7,0x71F5,0x71FC,
-	/* Range 0x6021 - 0x607E, array index: 0x1482 */
-	0x71F9,0x71FF,0x720D,0x7210,0x721B,0x7228,0x722D,0x722C,
-	0x7230,0x7232,0x723B,0x723C,0x723F,0x7240,0x7246,0x724B,
-	0x7258,0x7274,0x727E,0x7282,0x7281,0x7287,0x7292,0x7296,
-	0x72A2,0x72A7,0x72B9,0x72B2,0x72C3,0x72C6,0x72C4,0x72CE,
-	0x72D2,0x72E2,0x72E0,0x72E1,0x72F9,0x72F7,0x500F,0x7317,
-	0x730A,0x731C,0x7316,0x731D,0x7334,0x732F,0x7329,0x7325,
-	0x733E,0x734E,0x734F,0x9ED8,0x7357,0x736A,0x7368,0x7370,
-	0x7378,0x7375,0x737B,0x737A,0x73C8,0x73B3,0x73CE,0x73BB,
-	0x73C0,0x73E5,0x73EE,0x73DE,0x74A2,0x7405,0x746F,0x7425,
-	0x73F8,0x7432,0x743A,0x7455,0x743F,0x745F,0x7459,0x7441,
-	0x745C,0x7469,0x7470,0x7463,0x746A,0x7476,0x747E,0x748B,
-	0x749E,0x74A7,0x74CA,0x74CF,0x74D4,0x73F1,
-	/* Range 0x6121 - 0x617E, array index: 0x14E0 */
-	0x74E0,0x74E3,0x74E7,0x74E9,0x74EE,0x74F2,0x74F0,0x74F1,
-	0x74F8,0x74F7,0x7504,0x7503,0x7505,0x750C,0x750E,0x750D,
-	0x7515,0x7513,0x751E,0x7526,0x752C,0x753C,0x7544,0x754D,
-	0x754A,0x7549,0x755B,0x7546,0x755A,0x7569,0x7564,0x7567,
-	0x756B,0x756D,0x7578,0x7576,0x7586,0x7587,0x7574,0x758A,
-	0x7589,0x7582,0x7594,0x759A,0x759D,0x75A5,0x75A3,0x75C2,
-	0x75B3,0x75C3,0x75B5,0x75BD,0x75B8,0x75BC,0x75B1,0x75CD,
-	0x75CA,0x75D2,0x75D9,0x75E3,0x75DE,0x75FE,0x75FF,0x75FC,
-	0x7601,0x75F0,0x75FA,0x75F2,0x75F3,0x760B,0x760D,0x7609,
-	0x761F,0x7627,0x7620,0x7621,0x7622,0x7624,0x7634,0x7630,
-	0x763B,0x7647,0x7648,0x7646,0x765C,0x7658,0x7661,0x7662,
-	0x7668,0x7669,0x766A,0x7667,0x766C,0x7670,
-	/* Range 0x6221 - 0x627E, array index: 0x153E */
-	0x7672,0x7676,0x7678,0x767C,0x7680,0x7683,0x7688,0x768B,
-	0x768E,0x7696,0x7693,0x7699,0x769A,0x76B0,0x76B4,0x76B8,
-	0x76B9,0x76BA,0x76C2,0x76CD,0x76D6,0x76D2,0x76DE,0x76E1,
-	0x76E5,0x76E7,0x76EA,0x862F,0x76FB,0x7708,0x7707,0x7704,
-	0x7729,0x7724,0x771E,0x7725,0x7726,0x771B,0x7737,0x7738,
-	0x7747,0x775A,0x7768,0x776B,0x775B,0x7765,0x777F,0x777E,
-	0x7779,0x778E,0x778B,0x7791,0x77A0,0x779E,0x77B0,0x77B6,
-	0x77B9,0x77BF,0x77BC,0x77BD,0x77BB,0x77C7,0x77CD,0x77D7,
-	0x77DA,0x77DC,0x77E3,0x77EE,0x77FC,0x780C,0x7812,0x7926,
-	0x7820,0x792A,0x7845,0x788E,0x7874,0x7886,0x787C,0x789A,
-	0x788C,0x78A3,0x78B5,0x78AA,0x78AF,0x78D1,0x78C6,0x78CB,
-	0x78D4,0x78BE,0x78BC,0x78C5,0x78CA,0x78EC,
-	/* Range 0x6321 - 0x637E, array index: 0x159C */
-	0x78E7,0x78DA,0x78FD,0x78F4,0x7907,0x7912,0x7911,0x7919,
-	0x792C,0x792B,0x7940,0x7960,0x7957,0x795F,0x795A,0x7955,
-	0x7953,0x797A,0x797F,0x798A,0x799D,0x79A7,0x9F4B,0x79AA,
-	0x79AE,0x79B3,0x79B9,0x79BA,0x79C9,0x79D5,0x79E7,0x79EC,
-	0x79E1,0x79E3,0x7A08,0x7A0D,0x7A18,0x7A19,0x7A20,0x7A1F,
-	0x7980,0x7A31,0x7A3B,0x7A3E,0x7A37,0x7A43,0x7A57,0x7A49,
-	0x7A61,0x7A62,0x7A69,0x9F9D,0x7A70,0x7A79,0x7A7D,0x7A88,
-	0x7A97,0x7A95,0x7A98,0x7A96,0x7AA9,0x7AC8,0x7AB0,0x7AB6,
-	0x7AC5,0x7AC4,0x7ABF,0x9083,0x7AC7,0x7ACA,0x7ACD,0x7ACF,
-	0x7AD5,0x7AD3,0x7AD9,0x7ADA,0x7ADD,0x7AE1,0x7AE2,0x7AE6,
-	0x7AED,0x7AF0,0x7B02,0x7B0F,0x7B0A,0x7B06,0x7B33,0x7B18,
-	0x7B19,0x7B1E,0x7B35,0x7B28,0x7B36,0x7B50,
-	/* Range 0x6421 - 0x647E, array index: 0x15FA */
-	0x7B7A,0x7B04,0x7B4D,0x7B0B,0x7B4C,0x7B45,0x7B75,0x7B65,
-	0x7B74,0x7B67,0x7B70,0x7B71,0x7B6C,0x7B6E,0x7B9D,0x7B98,
-	0x7B9F,0x7B8D,0x7B9C,0x7B9A,0x7B8B,0x7B92,0x7B8F,0x7B5D,
-	0x7B99,0x7BCB,0x7BC1,0x7BCC,0x7BCF,0x7BB4,0x7BC6,0x7BDD,
-	0x7BE9,0x7C11,0x7C14,0x7BE6,0x7BE5,0x7C60,0x7C00,0x7C07,
-	0x7C13,0x7BF3,0x7BF7,0x7C17,0x7C0D,0x7BF6,0x7C23,0x7C27,
-	0x7C2A,0x7C1F,0x7C37,0x7C2B,0x7C3D,0x7C4C,0x7C43,0x7C54,
-	0x7C4F,0x7C40,0x7C50,0x7C58,0x7C5F,0x7C64,0x7C56,0x7C65,
-	0x7C6C,0x7C75,0x7C83,0x7C90,0x7CA4,0x7CAD,0x7CA2,0x7CAB,
-	0x7CA1,0x7CA8,0x7CB3,0x7CB2,0x7CB1,0x7CAE,0x7CB9,0x7CBD,
-	0x7CC0,0x7CC5,0x7CC2,0x7CD8,0x7CD2,0x7CDC,0x7CE2,0x9B3B,
-	0x7CEF,0x7CF2,0x7CF4,0x7CF6,0x7CFA,0x7D06,
-	/* Range 0x6521 - 0x657E, array index: 0x1658 */
-	0x7D02,0x7D1C,0x7D15,0x7D0A,0x7D45,0x7D4B,0x7D2E,0x7D32,
-	0x7D3F,0x7D35,0x7D46,0x7D73,0x7D56,0x7D4E,0x7D72,0x7D68,
-	0x7D6E,0x7D4F,0x7D63,0x7D93,0x7D89,0x7D5B,0x7D8F,0x7D7D,
-	0x7D9B,0x7DBA,0x7DAE,0x7DA3,0x7DB5,0x7DC7,0x7DBD,0x7DAB,
-	0x7E3D,0x7DA2,0x7DAF,0x7DDC,0x7DB8,0x7D9F,0x7DB0,0x7DD8,
-	0x7DDD,0x7DE4,0x7DDE,0x7DFB,0x7DF2,0x7DE1,0x7E05,0x7E0A,
-	0x7E23,0x7E21,0x7E12,0x7E31,0x7E1F,0x7E09,0x7E0B,0x7E22,
-	0x7E46,0x7E66,0x7E3B,0x7E35,0x7E39,0x7E43,0x7E37,0x7E32,
-	0x7E3A,0x7E67,0x7E5D,0x7E56,0x7E5E,0x7E59,0x7E5A,0x7E79,
-	0x7E6A,0x7E69,0x7E7C,0x7E7B,0x7E83,0x7DD5,0x7E7D,0x8FAE,
-	0x7E7F,0x7E88,0x7E89,0x7E8C,0x7E92,0x7E90,0x7E93,0x7E94,
-	0x7E96,0x7E8E,0x7E9B,0x7E9C,0x7F38,0x7F3A,
-	/* Range 0x6621 - 0x667E, array index: 0x16B6 */
-	0x7F45,0x7F4C,0x7F4D,0x7F4E,0x7F50,0x7F51,0x7F55,0x7F54,
-	0x7F58,0x7F5F,0x7F60,0x7F68,0x7F69,0x7F67,0x7F78,0x7F82,
-	0x7F86,0x7F83,0x7F88,0x7F87,0x7F8C,0x7F94,0x7F9E,0x7F9D,
-	0x7F9A,0x7FA3,0x7FAF,0x7FB2,0x7FB9,0x7FAE,0x7FB6,0x7FB8,
-	0x8B71,0x7FC5,0x7FC6,0x7FCA,0x7FD5,0x7FD4,0x7FE1,0x7FE6,
-	0x7FE9,0x7FF3,0x7FF9,0x98DC,0x8006,0x8004,0x800B,0x8012,
-	0x8018,0x8019,0x801C,0x8021,0x8028,0x803F,0x803B,0x804A,
-	0x8046,0x8052,0x8058,0x805A,0x805F,0x8062,0x8068,0x8073,
-	0x8072,0x8070,0x8076,0x8079,0x807D,0x807F,0x8084,0x8086,
-	0x8085,0x809B,0x8093,0x809A,0x80AD,0x5190,0x80AC,0x80DB,
-	0x80E5,0x80D9,0x80DD,0x80C4,0x80DA,0x80D6,0x8109,0x80EF,
-	0x80F1,0x811B,0x8129,0x8123,0x812F,0x814B,
-	/* Range 0x6721 - 0x677E, array index: 0x1714 */
-	0x968B,0x8146,0x813E,0x8153,0x8151,0x80FC,0x8171,0x816E,
-	0x8165,0x8166,0x8174,0x8183,0x8188,0x818A,0x8180,0x8182,
-	0x81A0,0x8195,0x81A4,0x81A3,0x815F,0x8193,0x81A9,0x81B0,
-	0x81B5,0x81BE,0x81B8,0x81BD,0x81C0,0x81C2,0x81BA,0x81C9,
-	0x81CD,0x81D1,0x81D9,0x81D8,0x81C8,0x81DA,0x81DF,0x81E0,
-	0x81E7,0x81FA,0x81FB,0x81FE,0x8201,0x8202,0x8205,0x8207,
-	0x820A,0x820D,0x8210,0x8216,0x8229,0x822B,0x8238,0x8233,
-	0x8240,0x8259,0x8258,0x825D,0x825A,0x825F,0x8264,0x8262,
-	0x8268,0x826A,0x826B,0x822E,0x8271,0x8277,0x8278,0x827E,
-	0x828D,0x8292,0x82AB,0x829F,0x82BB,0x82AC,0x82E1,0x82E3,
-	0x82DF,0x82D2,0x82F4,0x82F3,0x82FA,0x8393,0x8303,0x82FB,
-	0x82F9,0x82DE,0x8306,0x82DC,0x8309,0x82D9,
-	/* Range 0x6821 - 0x687E, array index: 0x1772 */
-	0x8335,0x8334,0x8316,0x8332,0x8331,0x8340,0x8339,0x8350,
-	0x8345,0x832F,0x832B,0x8317,0x8318,0x8385,0x839A,0x83AA,
-	0x839F,0x83A2,0x8396,0x8323,0x838E,0x8387,0x838A,0x837C,
-	0x83B5,0x8373,0x8375,0x83A0,0x8389,0x83A8,0x83F4,0x8413,
-	0x83EB,0x83CE,0x83FD,0x8403,0x83D8,0x840B,0x83C1,0x83F7,
-	0x8407,0x83E0,0x83F2,0x840D,0x8422,0x8420,0x83BD,0x8438,
-	0x8506,0x83FB,0x846D,0x842A,0x843C,0x855A,0x8484,0x8477,
-	0x846B,0x84AD,0x846E,0x8482,0x8469,0x8446,0x842C,0x846F,
-	0x8479,0x8435,0x84CA,0x8462,0x84B9,0x84BF,0x849F,0x84D9,
-	0x84CD,0x84BB,0x84DA,0x84D0,0x84C1,0x84C6,0x84D6,0x84A1,
-	0x8521,0x84FF,0x84F4,0x8517,0x8518,0x852C,0x851F,0x8515,
-	0x8514,0x84FC,0x8540,0x8563,0x8558,0x8548,
-	/* Range 0x6921 - 0x697E, array index: 0x17D0 */
-	0x8541,0x8602,0x854B,0x8555,0x8580,0x85A4,0x8588,0x8591,
-	0x858A,0x85A8,0x856D,0x8594,0x859B,0x85EA,0x8587,0x859C,
-	0x8577,0x857E,0x8590,0x85C9,0x85BA,0x85CF,0x85B9,0x85D0,
-	0x85D5,0x85DD,0x85E5,0x85DC,0x85F9,0x860A,0x8613,0x860B,
-	0x85FE,0x85FA,0x8606,0x8622,0x861A,0x8630,0x863F,0x864D,
-	0x4E55,0x8654,0x865F,0x8667,0x8671,0x8693,0x86A3,0x86A9,
-	0x86AA,0x868B,0x868C,0x86B6,0x86AF,0x86C4,0x86C6,0x86B0,
-	0x86C9,0x8823,0x86AB,0x86D4,0x86DE,0x86E9,0x86EC,0x86DF,
-	0x86DB,0x86EF,0x8712,0x8706,0x8708,0x8700,0x8703,0x86FB,
-	0x8711,0x8709,0x870D,0x86F9,0x870A,0x8734,0x873F,0x8737,
-	0x873B,0x8725,0x8729,0x871A,0x8760,0x875F,0x8778,0x874C,
-	0x874E,0x8774,0x8757,0x8768,0x876E,0x8759,
-	/* Range 0x6A21 - 0x6A7E, array index: 0x182E */
-	0x8753,0x8763,0x876A,0x8805,0x87A2,0x879F,0x8782,0x87AF,
-	0x87CB,0x87BD,0x87C0,0x87D0,0x96D6,0x87AB,0x87C4,0x87B3,
-	0x87C7,0x87C6,0x87BB,0x87EF,0x87F2,0x87E0,0x880F,0x880D,
-	0x87FE,0x87F6,0x87F7,0x880E,0x87D2,0x8811,0x8816,0x8815,
-	0x8822,0x8821,0x8831,0x8836,0x8839,0x8827,0x883B,0x8844,
-	0x8842,0x8852,0x8859,0x885E,0x8862,0x886B,0x8881,0x887E,
-	0x889E,0x8875,0x887D,0x88B5,0x8872,0x8882,0x8897,0x8892,
-	0x88AE,0x8899,0x88A2,0x888D,0x88A4,0x88B0,0x88BF,0x88B1,
-	0x88C3,0x88C4,0x88D4,0x88D8,0x88D9,0x88DD,0x88F9,0x8902,
-	0x88FC,0x88F4,0x88E8,0x88F2,0x8904,0x890C,0x890A,0x8913,
-	0x8943,0x891E,0x8925,0x892A,0x892B,0x8941,0x8944,0x893B,
-	0x8936,0x8938,0x894C,0x891D,0x8960,0x895E,
-	/* Range 0x6B21 - 0x6B7E, array index: 0x188C */
-	0x8966,0x8964,0x896D,0x896A,0x896F,0x8974,0x8977,0x897E,
-	0x8983,0x8988,0x898A,0x8993,0x8998,0x89A1,0x89A9,0x89A6,
-	0x89AC,0x89AF,0x89B2,0x89BA,0x89BD,0x89BF,0x89C0,0x89DA,
-	0x89DC,0x89DD,0x89E7,0x89F4,0x89F8,0x8A03,0x8A16,0x8A10,
-	0x8A0C,0x8A1B,0x8A1D,0x8A25,0x8A36,0x8A41,0x8A5B,0x8A52,
-	0x8A46,0x8A48,0x8A7C,0x8A6D,0x8A6C,0x8A62,0x8A85,0x8A82,
-	0x8A84,0x8AA8,0x8AA1,0x8A91,0x8AA5,0x8AA6,0x8A9A,0x8AA3,
-	0x8AC4,0x8ACD,0x8AC2,0x8ADA,0x8AEB,0x8AF3,0x8AE7,0x8AE4,
-	0x8AF1,0x8B14,0x8AE0,0x8AE2,0x8AF7,0x8ADE,0x8ADB,0x8B0C,
-	0x8B07,0x8B1A,0x8AE1,0x8B16,0x8B10,0x8B17,0x8B20,0x8B33,
-	0x97AB,0x8B26,0x8B2B,0x8B3E,0x8B28,0x8B41,0x8B4C,0x8B4F,
-	0x8B4E,0x8B49,0x8B56,0x8B5B,0x8B5A,0x8B6B,
-	/* Range 0x6C21 - 0x6C7E, array index: 0x18EA */
-	0x8B5F,0x8B6C,0x8B6F,0x8B74,0x8B7D,0x8B80,0x8B8C,0x8B8E,
-	0x8B92,0x8B93,0x8B96,0x8B99,0x8B9A,0x8C3A,0x8C41,0x8C3F,
-	0x8C48,0x8C4C,0x8C4E,0x8C50,0x8C55,0x8C62,0x8C6C,0x8C78,
-	0x8C7A,0x8C82,0x8C89,0x8C85,0x8C8A,0x8C8D,0x8C8E,0x8C94,
-	0x8C7C,0x8C98,0x621D,0x8CAD,0x8CAA,0x8CBD,0x8CB2,0x8CB3,
-	0x8CAE,0x8CB6,0x8CC8,0x8CC1,0x8CE4,0x8CE3,0x8CDA,0x8CFD,
-	0x8CFA,0x8CFB,0x8D04,0x8D05,0x8D0A,0x8D07,0x8D0F,0x8D0D,
-	0x8D10,0x9F4E,0x8D13,0x8CCD,0x8D14,0x8D16,0x8D67,0x8D6D,
-	0x8D71,0x8D73,0x8D81,0x8D99,0x8DC2,0x8DBE,0x8DBA,0x8DCF,
-	0x8DDA,0x8DD6,0x8DCC,0x8DDB,0x8DCB,0x8DEA,0x8DEB,0x8DDF,
-	0x8DE3,0x8DFC,0x8E08,0x8E09,0x8DFF,0x8E1D,0x8E1E,0x8E10,
-	0x8E1F,0x8E42,0x8E35,0x8E30,0x8E34,0x8E4A,
-	/* Range 0x6D21 - 0x6D7E, array index: 0x1948 */
-	0x8E47,0x8E49,0x8E4C,0x8E50,0x8E48,0x8E59,0x8E64,0x8E60,
-	0x8E2A,0x8E63,0x8E55,0x8E76,0x8E72,0x8E7C,0x8E81,0x8E87,
-	0x8E85,0x8E84,0x8E8B,0x8E8A,0x8E93,0x8E91,0x8E94,0x8E99,
-	0x8EAA,0x8EA1,0x8EAC,0x8EB0,0x8EC6,0x8EB1,0x8EBE,0x8EC5,
-	0x8EC8,0x8ECB,0x8EDB,0x8EE3,0x8EFC,0x8EFB,0x8EEB,0x8EFE,
-	0x8F0A,0x8F05,0x8F15,0x8F12,0x8F19,0x8F13,0x8F1C,0x8F1F,
-	0x8F1B,0x8F0C,0x8F26,0x8F33,0x8F3B,0x8F39,0x8F45,0x8F42,
-	0x8F3E,0x8F4C,0x8F49,0x8F46,0x8F4E,0x8F57,0x8F5C,0x8F62,
-	0x8F63,0x8F64,0x8F9C,0x8F9F,0x8FA3,0x8FAD,0x8FAF,0x8FB7,
-	0x8FDA,0x8FE5,0x8FE2,0x8FEA,0x8FEF,0x9087,0x8FF4,0x9005,
-	0x8FF9,0x8FFA,0x9011,0x9015,0x9021,0x900D,0x901E,0x9016,
-	0x900B,0x9027,0x9036,0x9035,0x9039,0x8FF8,
-	/* Range 0x6E21 - 0x6E7E, array index: 0x19A6 */
-	0x904F,0x9050,0x9051,0x9052,0x900E,0x9049,0x903E,0x9056,
-	0x9058,0x905E,0x9068,0x906F,0x9076,0x96A8,0x9072,0x9082,
-	0x907D,0x9081,0x9080,0x908A,0x9089,0x908F,0x90A8,0x90AF,
-	0x90B1,0x90B5,0x90E2,0x90E4,0x6248,0x90DB,0x9102,0x9112,
-	0x9119,0x9132,0x9130,0x914A,0x9156,0x9158,0x9163,0x9165,
-	0x9169,0x9173,0x9172,0x918B,0x9189,0x9182,0x91A2,0x91AB,
-	0x91AF,0x91AA,0x91B5,0x91B4,0x91BA,0x91C0,0x91C1,0x91C9,
-	0x91CB,0x91D0,0x91D6,0x91DF,0x91E1,0x91DB,0x91FC,0x91F5,
-	0x91F6,0x921E,0x91FF,0x9214,0x922C,0x9215,0x9211,0x925E,
-	0x9257,0x9245,0x9249,0x9264,0x9248,0x9295,0x923F,0x924B,
-	0x9250,0x929C,0x9296,0x9293,0x929B,0x925A,0x92CF,0x92B9,
-	0x92B7,0x92E9,0x930F,0x92FA,0x9344,0x932E,
-	/* Range 0x6F21 - 0x6F7E, array index: 0x1A04 */
-	0x9319,0x9322,0x931A,0x9323,0x933A,0x9335,0x933B,0x935C,
-	0x9360,0x937C,0x936E,0x9356,0x93B0,0x93AC,0x93AD,0x9394,
-	0x93B9,0x93D6,0x93D7,0x93E8,0x93E5,0x93D8,0x93C3,0x93DD,
-	0x93D0,0x93C8,0x93E4,0x941A,0x9414,0x9413,0x9403,0x9407,
-	0x9410,0x9436,0x942B,0x9435,0x9421,0x943A,0x9441,0x9452,
-	0x9444,0x945B,0x9460,0x9462,0x945E,0x946A,0x9229,0x9470,
-	0x9475,0x9477,0x947D,0x945A,0x947C,0x947E,0x9481,0x947F,
-	0x9582,0x9587,0x958A,0x9594,0x9596,0x9598,0x9599,0x95A0,
-	0x95A8,0x95A7,0x95AD,0x95BC,0x95BB,0x95B9,0x95BE,0x95CA,
-	0x6FF6,0x95C3,0x95CD,0x95CC,0x95D5,0x95D4,0x95D6,0x95DC,
-	0x95E1,0x95E5,0x95E2,0x9621,0x9628,0x962E,0x962F,0x9642,
-	0x964C,0x964F,0x964B,0x9677,0x965C,0x965E,
-	/* Range 0x7021 - 0x707E, array index: 0x1A62 */
-	0x965D,0x965F,0x9666,0x9672,0x966C,0x968D,0x9698,0x9695,
-	0x9697,0x96AA,0x96A7,0x96B1,0x96B2,0x96B0,0x96B4,0x96B6,
-	0x96B8,0x96B9,0x96CE,0x96CB,0x96C9,0x96CD,0x894D,0x96DC,
-	0x970D,0x96D5,0x96F9,0x9704,0x9706,0x9708,0x9713,0x970E,
-	0x9711,0x970F,0x9716,0x9719,0x9724,0x972A,0x9730,0x9739,
-	0x973D,0x973E,0x9744,0x9746,0x9748,0x9742,0x9749,0x975C,
-	0x9760,0x9764,0x9766,0x9768,0x52D2,0x976B,0x9771,0x9779,
-	0x9785,0x977C,0x9781,0x977A,0x9786,0x978B,0x978F,0x9790,
-	0x979C,0x97A8,0x97A6,0x97A3,0x97B3,0x97B4,0x97C3,0x97C6,
-	0x97C8,0x97CB,0x97DC,0x97ED,0x9F4F,0x97F2,0x7ADF,0x97F6,
-	0x97F5,0x980F,0x980C,0x9838,0x9824,0x9821,0x9837,0x983D,
-	0x9846,0x984F,0x984B,0x986B,0x986F,0x9870,
-	/* Range 0x7121 - 0x717E, array index: 0x1AC0 */
-	0x9871,0x9874,0x9873,0x98AA,0x98AF,0x98B1,0x98B6,0x98C4,
-	0x98C3,0x98C6,0x98E9,0x98EB,0x9903,0x9909,0x9912,0x9914,
-	0x9918,0x9921,0x991D,0x991E,0x9924,0x9920,0x992C,0x992E,
-	0x993D,0x993E,0x9942,0x9949,0x9945,0x9950,0x994B,0x9951,
-	0x9952,0x994C,0x9955,0x9997,0x9998,0x99A5,0x99AD,0x99AE,
-	0x99BC,0x99DF,0x99DB,0x99DD,0x99D8,0x99D1,0x99ED,0x99EE,
-	0x99F1,0x99F2,0x99FB,0x99F8,0x9A01,0x9A0F,0x9A05,0x99E2,
-	0x9A19,0x9A2B,0x9A37,0x9A45,0x9A42,0x9A40,0x9A43,0x9A3E,
-	0x9A55,0x9A4D,0x9A5B,0x9A57,0x9A5F,0x9A62,0x9A65,0x9A64,
-	0x9A69,0x9A6B,0x9A6A,0x9AAD,0x9AB0,0x9ABC,0x9AC0,0x9ACF,
-	0x9AD1,0x9AD3,0x9AD4,0x9ADE,0x9ADF,0x9AE2,0x9AE3,0x9AE6,
-	0x9AEF,0x9AEB,0x9AEE,0x9AF4,0x9AF1,0x9AF7,
-	/* Range 0x7221 - 0x727E, array index: 0x1B1E */
-	0x9AFB,0x9B06,0x9B18,0x9B1A,0x9B1F,0x9B22,0x9B23,0x9B25,
-	0x9B27,0x9B28,0x9B29,0x9B2A,0x9B2E,0x9B2F,0x9B32,0x9B44,
-	0x9B43,0x9B4F,0x9B4D,0x9B4E,0x9B51,0x9B58,0x9B74,0x9B93,
-	0x9B83,0x9B91,0x9B96,0x9B97,0x9B9F,0x9BA0,0x9BA8,0x9BB4,
-	0x9BC0,0x9BCA,0x9BB9,0x9BC6,0x9BCF,0x9BD1,0x9BD2,0x9BE3,
-	0x9BE2,0x9BE4,0x9BD4,0x9BE1,0x9C3A,0x9BF2,0x9BF1,0x9BF0,
-	0x9C15,0x9C14,0x9C09,0x9C13,0x9C0C,0x9C06,0x9C08,0x9C12,
-	0x9C0A,0x9C04,0x9C2E,0x9C1B,0x9C25,0x9C24,0x9C21,0x9C30,
-	0x9C47,0x9C32,0x9C46,0x9C3E,0x9C5A,0x9C60,0x9C67,0x9C76,
-	0x9C78,0x9CE7,0x9CEC,0x9CF0,0x9D09,0x9D08,0x9CEB,0x9D03,
-	0x9D06,0x9D2A,0x9D26,0x9DAF,0x9D23,0x9D1F,0x9D44,0x9D15,
-	0x9D12,0x9D41,0x9D3F,0x9D3E,0x9D46,0x9D48,
-	/* Range 0x7321 - 0x737E, array index: 0x1B7C */
-	0x9D5D,0x9D5E,0x9D64,0x9D51,0x9D50,0x9D59,0x9D72,0x9D89,
-	0x9D87,0x9DAB,0x9D6F,0x9D7A,0x9D9A,0x9DA4,0x9DA9,0x9DB2,
-	0x9DC4,0x9DC1,0x9DBB,0x9DB8,0x9DBA,0x9DC6,0x9DCF,0x9DC2,
-	0x9DD9,0x9DD3,0x9DF8,0x9DE6,0x9DED,0x9DEF,0x9DFD,0x9E1A,
-	0x9E1B,0x9E1E,0x9E75,0x9E79,0x9E7D,0x9E81,0x9E88,0x9E8B,
-	0x9E8C,0x9E92,0x9E95,0x9E91,0x9E9D,0x9EA5,0x9EA9,0x9EB8,
-	0x9EAA,0x9EAD,0x9761,0x9ECC,0x9ECE,0x9ECF,0x9ED0,0x9ED4,
-	0x9EDC,0x9EDE,0x9EDD,0x9EE0,0x9EE5,0x9EE8,0x9EEF,0x9EF4,
-	0x9EF6,0x9EF7,0x9EF9,0x9EFB,0x9EFC,0x9EFD,0x9F07,0x9F08,
-	0x76B7,0x9F15,0x9F21,0x9F2C,0x9F3E,0x9F4A,0x9F52,0x9F54,
-	0x9F63,0x9F5F,0x9F60,0x9F61,0x9F66,0x9F67,0x9F6C,0x9F6A,
-	0x9F77,0x9F72,0x9F76,0x9F95,0x9F9C,0x9FA0,
-	/* Range 0x7421 - 0x7426, array index: 0x1BDA */
-	0x582F,0x69C7,0x9059,0x7464,0x51DC,0x7199,
-	/* Unranged codes (85 codes) */
-	/* Array index: 0x1BE0 */ 0x227E,0x25EF,
-};
-
-#endif /* ICONV_TO_UCS_CCS_JIS_X0208_1990 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> jis_x0208_1990 speed-optimized table (48128 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_speed_jis_x0208_1990[] =
-{
-	/* Heading Block */
-	0x0100,INVBLK,INVBLK,0x0200,0x0300,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	0x0400,0x0500,0x0600,0x0700,INVBLK,0x0800,0x0900,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	0x0A00,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,0x0B00,0x0C00,
-	0x0D00,0x0E00,0x0F00,0x1000,0x1100,0x1200,0x1300,0x1400,
-	0x1500,0x1600,0x1700,0x1800,0x1900,0x1A00,0x1B00,0x1C00,
-	0x1D00,0x1E00,0x1F00,0x2000,0x2100,0x2200,0x2300,0x2400,
-	0x2500,0x2600,0x2700,0x2800,0x2900,0x2A00,0x2B00,0x2C00,
-	0x2D00,0x2E00,0x2F00,0x3000,0x3100,0x3200,0x3300,0x3400,
-	0x3500,0x3600,0x3700,0x3800,0x3900,0x3A00,0x3B00,0x3C00,
-	0x3D00,0x3E00,0x3F00,0x4000,0x4100,0x4200,0x4300,0x4400,
-	0x4500,0x4600,0x4700,0x4800,0x4900,0x4A00,0x4B00,0x4C00,
-	0x4D00,0x4E00,0x4F00,0x5000,0x5100,0x5200,0x5300,0x5400,
-	0x5500,0x5600,0x5700,0x5800,0x5900,0x5A00,0x5B00,0x5C00,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,0x5D00,
-	/* Block 1, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2140,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2171,0x2172,INVALC,INVALC,INVALC,0x2178,
-	0x212F,INVALC,INVALC,INVALC,0x224C,INVALC,INVALC,INVALC,
-	0x216B,0x215E,INVALC,INVALC,0x212D,INVALC,0x2279,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x215F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2160,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 4, Array index 0x0200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2621,0x2622,0x2623,0x2624,0x2625,0x2626,0x2627,
-	0x2628,0x2629,0x262A,0x262B,0x262C,0x262D,0x262E,0x262F,
-	0x2630,0x2631,INVALC,0x2632,0x2633,0x2634,0x2635,0x2636,
-	0x2637,0x2638,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2641,0x2642,0x2643,0x2644,0x2645,0x2646,0x2647,
-	0x2648,0x2649,0x264A,0x264B,0x264C,0x264D,0x264E,0x264F,
-	0x2650,0x2651,INVALC,0x2652,0x2653,0x2654,0x2655,0x2656,
-	0x2657,0x2658,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 5, Array index 0x0300 */
-	INVALC,0x2727,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2721,0x2722,0x2723,0x2724,0x2725,0x2726,0x2728,0x2729,
-	0x272A,0x272B,0x272C,0x272D,0x272E,0x272F,0x2730,0x2731,
-	0x2732,0x2733,0x2734,0x2735,0x2736,0x2737,0x2738,0x2739,
-	0x273A,0x273B,0x273C,0x273D,0x273E,0x273F,0x2740,0x2741,
-	0x2751,0x2752,0x2753,0x2754,0x2755,0x2756,0x2758,0x2759,
-	0x275A,0x275B,0x275C,0x275D,0x275E,0x275F,0x2760,0x2761,
-	0x2762,0x2763,0x2764,0x2765,0x2766,0x2767,0x2768,0x2769,
-	0x276A,0x276B,0x276C,0x276D,0x276E,0x276F,0x2770,0x2771,
-	INVALC,0x2757,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 33, Array index 0x0400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x213E,INVALC,INVALC,INVALC,INVALC,0x213D,0x2142,INVALC,
-	0x2146,0x2147,INVALC,INVALC,0x2148,0x2149,INVALC,INVALC,
-	0x2277,0x2278,INVALC,INVALC,INVALC,0x2145,0x2144,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2273,INVALC,0x216C,0x216D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2228,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 34, Array index 0x0500 */
-	INVALC,INVALC,INVALC,0x216E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2272,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x222B,0x222C,0x222A,0x222D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x224D,INVALC,0x224E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 35, Array index 0x0600 */
-	0x224F,INVALC,0x225F,0x2250,INVALC,INVALC,INVALC,0x2260,
-	0x223A,INVALC,INVALC,0x223B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x215D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2265,INVALC,INVALC,0x2267,0x2167,INVALC,
-	0x225C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x224A,
-	0x224B,0x2241,0x2240,0x2269,0x226A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2168,0x2268,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2266,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2262,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2162,0x2261,INVALC,INVALC,INVALC,INVALC,0x2165,0x2166,
-	INVALC,INVALC,0x2263,0x2264,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x223E,0x223F,INVALC,INVALC,0x223C,0x223D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x225D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 36, Array index 0x0700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x225E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 38, Array index 0x0800 */
-	0x2821,0x282C,0x2822,0x282D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2823,INVALC,INVALC,0x282E,
-	0x2824,INVALC,INVALC,0x282F,0x2826,INVALC,INVALC,0x2831,
-	0x2825,INVALC,INVALC,0x2830,0x2827,0x283C,INVALC,INVALC,
-	0x2837,INVALC,INVALC,0x2832,0x2829,0x283E,INVALC,INVALC,
-	0x2839,INVALC,INVALC,0x2834,0x2828,INVALC,INVALC,0x2838,
-	0x283D,INVALC,INVALC,0x2833,0x282A,INVALC,INVALC,0x283A,
-	0x283F,INVALC,INVALC,0x2835,0x282B,INVALC,INVALC,0x283B,
-	INVALC,INVALC,0x2840,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2836,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2223,0x2222,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2225,0x2224,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2227,0x2226,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2221,0x217E,
-	INVALC,INVALC,INVALC,0x217B,INVALC,INVALC,0x217D,0x217C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x227E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 39, Array index 0x0900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x217A,0x2179,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x216A,INVALC,0x2169,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2276,INVALC,INVALC,0x2275,INVALC,0x2274,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 49, Array index 0x0A00 */
-	0x2121,0x2122,0x2123,0x2137,INVALC,0x2139,0x213A,0x213B,
-	0x2152,0x2153,0x2154,0x2155,0x2156,0x2157,0x2158,0x2159,
-	0x215A,0x215B,0x2229,0x222E,0x214C,0x214D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2141,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2421,0x2422,0x2423,0x2424,0x2425,0x2426,0x2427,
-	0x2428,0x2429,0x242A,0x242B,0x242C,0x242D,0x242E,0x242F,
-	0x2430,0x2431,0x2432,0x2433,0x2434,0x2435,0x2436,0x2437,
-	0x2438,0x2439,0x243A,0x243B,0x243C,0x243D,0x243E,0x243F,
-	0x2440,0x2441,0x2442,0x2443,0x2444,0x2445,0x2446,0x2447,
-	0x2448,0x2449,0x244A,0x244B,0x244C,0x244D,0x244E,0x244F,
-	0x2450,0x2451,0x2452,0x2453,0x2454,0x2455,0x2456,0x2457,
-	0x2458,0x2459,0x245A,0x245B,0x245C,0x245D,0x245E,0x245F,
-	0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467,
-	0x2468,0x2469,0x246A,0x246B,0x246C,0x246D,0x246E,0x246F,
-	0x2470,0x2471,0x2472,0x2473,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x212B,0x212C,0x2135,0x2136,INVALC,
-	INVALC,0x2521,0x2522,0x2523,0x2524,0x2525,0x2526,0x2527,
-	0x2528,0x2529,0x252A,0x252B,0x252C,0x252D,0x252E,0x252F,
-	0x2530,0x2531,0x2532,0x2533,0x2534,0x2535,0x2536,0x2537,
-	0x2538,0x2539,0x253A,0x253B,0x253C,0x253D,0x253E,0x253F,
-	0x2540,0x2541,0x2542,0x2543,0x2544,0x2545,0x2546,0x2547,
-	0x2548,0x2549,0x254A,0x254B,0x254C,0x254D,0x254E,0x254F,
-	0x2550,0x2551,0x2552,0x2553,0x2554,0x2555,0x2556,0x2557,
-	0x2558,0x2559,0x255A,0x255B,0x255C,0x255D,0x255E,0x255F,
-	0x2560,0x2561,0x2562,0x2563,0x2564,0x2565,0x2566,0x2567,
-	0x2568,0x2569,0x256A,0x256B,0x256C,0x256D,0x256E,0x256F,
-	0x2570,0x2571,0x2572,0x2573,0x2574,0x2575,0x2576,INVALC,
-	INVALC,INVALC,INVALC,0x2126,0x213C,0x2133,0x2134,INVALC,
-	/* Block 79, Array index 0x0B00 */
-	0x306C,0x437A,INVALC,0x3C37,INVALC,INVALC,INVALC,0x4B7C,
-	0x3E66,0x3B30,0x3E65,0x323C,INVALC,0x4954,0x4D3F,INVALC,
-	0x5022,0x312F,INVALC,INVALC,0x336E,0x5023,0x4024,0x5242,
-	0x3556,0x4A3A,INVALC,INVALC,INVALC,INVALC,0x3E67,INVALC,
-	INVALC,0x4E3E,INVALC,INVALC,INVALC,INVALC,0x4A42,INVALC,
-	INVALC,INVALC,0x5024,INVALC,INVALC,0x4366,INVALC,INVALC,
-	INVALC,0x5025,0x367A,INVALC,INVALC,INVALC,0x5026,INVALC,
-	0x345D,0x4330,INVALC,0x3C67,0x5027,INVALC,INVALC,0x5028,
-	INVALC,INVALC,0x5029,0x4735,INVALC,0x3557,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4737,INVALC,0x4663,0x3843,0x4B33,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6949,0x502A,0x3E68,
-	0x502B,0x3235,INVALC,INVALC,INVALC,0x3665,0x3870,0x4C69,
-	INVALC,INVALC,0x5626,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D70,INVALC,0x467D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3425,INVALC,
-	0x3535,INVALC,0x502C,INVALC,INVALC,0x502D,0x4E3B,INVALC,
-	0x4D3D,0x4168,0x502F,0x3B76,0x4673,INVALC,0x5032,INVALC,
-	INVALC,0x313E,0x385F,INVALC,0x385E,0x3066,INVALC,INVALC,
-	0x4F4B,0x4F4A,INVALC,0x3A33,0x3021,INVALC,0x5033,0x5034,
-	0x5035,0x4B34,0x5036,INVALC,0x3872,0x3067,0x4B72,INVALC,
-	0x357C,INVALC,INVALC,0x357D,0x357E,0x4462,0x4E3C,INVALC,
-	0x5037,INVALC,INVALC,0x5038,INVALC,INVALC,0x5039,INVALC,
-	INVALC,INVALC,0x3F4D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D3A,0x3F4E,0x503E,INVALC,0x503C,INVALC,0x503D,0x3558,
-	INVALC,INVALC,0x3A23,0x3270,INVALC,0x503B,0x503A,0x4A29,
-	INVALC,INVALC,INVALC,INVALC,0x3B46,0x3B45,0x423E,0x503F,
-	0x4955,0x4067,INVALC,INVALC,INVALC,0x2138,0x5040,0x5042,
-	INVALC,INVALC,INVALC,0x4265,0x4E61,0x304A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5041,0x323E,INVALC,
-	0x3644,INVALC,0x4367,INVALC,INVALC,INVALC,0x376F,0x5043,
-	INVALC,INVALC,INVALC,0x4724,INVALC,INVALC,INVALC,INVALC,
-	/* Block 80, Array index 0x0C00 */
-	INVALC,0x346B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5044,0x304B,INVALC,INVALC,0x3860,0x346C,0x497A,
-	0x4832,0x3559,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3271,INVALC,0x5067,0x4541,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x476C,
-	0x5046,INVALC,INVALC,INVALC,0x483C,INVALC,0x4E62,INVALC,
-	0x3F2D,INVALC,0x3B47,INVALC,0x3B77,0x3240,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4451,INVALC,INVALC,0x4322,0x504A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x304C,0x4463,0x3D3B,
-	0x3A34,0x4D24,INVALC,0x424E,INVALC,0x323F,INVALC,0x5049,
-	INVALC,0x4D3E,0x5045,0x5047,0x3A6E,0x5048,0x5524,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5050,INVALC,INVALC,INVALC,INVALC,INVALC,0x5053,
-	0x5051,INVALC,INVALC,0x3242,INVALC,0x4A3B,0x504B,INVALC,
-	INVALC,INVALC,INVALC,0x504F,0x3873,INVALC,INVALC,0x3B48,
-	INVALC,INVALC,INVALC,0x3426,INVALC,INVALC,0x5054,INVALC,
-	0x504C,INVALC,INVALC,0x4E63,INVALC,0x3B78,INVALC,0x504D,
-	INVALC,0x5052,INVALC,INVALC,INVALC,INVALC,0x5055,INVALC,
-	0x504E,INVALC,INVALC,0x3621,INVALC,0x304D,INVALC,INVALC,
-	0x3622,0x3241,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5525,INVALC,0x4B79,0x496E,0x3874,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3F2F,0x4E37,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A58,
-	INVALC,INVALC,0x3738,0x4225,0x3264,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3D53,INVALC,INVALC,INVALC,0x5059,INVALC,
-	0x505E,0x505C,INVALC,INVALC,0x5057,INVALC,INVALC,0x422F,
-	0x505A,INVALC,0x505D,0x505B,INVALC,0x4A5D,INVALC,0x5058,
-	INVALC,0x3F2E,INVALC,0x4B73,0x505F,0x5060,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D24,0x506D,
-	INVALC,INVALC,INVALC,0x4750,INVALC,0x4936,0x5068,INVALC,
-	0x4A70,INVALC,0x3236,INVALC,INVALC,INVALC,0x506C,INVALC,
-	/* Block 81, Array index 0x0D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5066,0x506F,INVALC,
-	INVALC,0x4152,INVALC,0x3844,INVALC,0x475C,INVALC,0x6047,
-	INVALC,0x506E,0x455D,INVALC,0x5063,INVALC,0x3876,INVALC,
-	INVALC,0x3875,0x5061,INVALC,INVALC,INVALC,INVALC,0x3C5A,
-	INVALC,0x5069,INVALC,0x4A6F,0x434D,0x5065,0x3771,INVALC,
-	0x5062,0x506A,0x5064,0x4E51,0x506B,0x4F41,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3666,INVALC,
-	INVALC,0x3770,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5070,INVALC,INVALC,INVALC,0x5071,
-	0x5075,0x304E,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A50,
-	0x5074,INVALC,INVALC,INVALC,INVALC,0x5073,0x5077,INVALC,
-	INVALC,INVALC,0x5076,INVALC,0x4464,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3772,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5078,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3C45,INVALC,0x4226,0x4465,0x3676,INVALC,
-	0x5079,INVALC,INVALC,INVALC,INVALC,0x3536,INVALC,INVALC,
-	0x507A,INVALC,INVALC,INVALC,INVALC,0x507C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B35,INVALC,INVALC,
-	INVALC,0x3766,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B31,0x4877,0x507B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A45,0x4D43,INVALC,INVALC,
-	INVALC,INVALC,0x507E,0x5123,0x507D,0x3A44,INVALC,0x3D7D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3739,INVALC,
-	INVALC,INVALC,0x5124,INVALC,INVALC,0x364F,INVALC,INVALC,
-	INVALC,0x5121,0x5122,INVALC,INVALC,0x462F,INVALC,0x417C,
-	INVALC,0x3623,INVALC,INVALC,INVALC,0x4B4D,0x5125,INVALC,
-	INVALC,INVALC,0x4E3D,INVALC,INVALC,INVALC,0x5126,INVALC,
-	INVALC,INVALC,INVALC,0x5129,INVALC,0x5127,INVALC,0x414E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5128,0x512A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x512C,INVALC,INVALC,
-	INVALC,0x512B,INVALC,0x4A48,INVALC,INVALC,INVALC,INVALC,
-	/* Block 82, Array index 0x0E00 */
-	0x3537,0x512E,0x512F,INVALC,0x322F,INVALC,INVALC,INVALC,
-	INVALC,0x512D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3C74,INVALC,0x5132,0x5131,0x5130,INVALC,
-	0x5056,INVALC,0x5133,INVALC,INVALC,INVALC,INVALC,0x3D7E,
-	INVALC,0x5134,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D25,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C59,INVALC,INVALC,INVALC,INVALC,0x5136,
-	INVALC,INVALC,0x5135,0x5138,0x5137,INVALC,INVALC,0x5139,
-	0x513A,0x3074,INVALC,0x3835,0x373B,0x3D3C,0x437B,0x3624,
-	0x4068,0x3877,INVALC,0x396E,0x513C,0x4C48,0x4546,INVALC,
-	0x3B79,INVALC,0x513B,INVALC,0x513D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x455E,INVALC,0x3375,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x513E,INVALC,INVALC,0x467E,INVALC,INVALC,
-	0x4134,0x5140,0x5141,0x482C,0x3878,0x4F3B,0x5142,INVALC,
-	INVALC,0x3626,INVALC,INVALC,INVALC,0x4A3C,0x4236,0x3671,
-	0x4535,INVALC,INVALC,INVALC,0x3773,INVALC,INVALC,INVALC,
-	0x5143,INVALC,0x5144,INVALC,INVALC,0x4662,0x315F,INVALC,
-	INVALC,0x5147,0x3A7D,INVALC,0x5146,0x3A46,INVALC,0x5148,
-	0x666E,0x5149,0x4B41,0x514A,INVALC,0x514B,0x514C,0x3E69,
-	INVALC,0x3C4C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3427,INVALC,0x514F,INVALC,0x514D,0x4C3D,0x514E,INVALC,
-	0x495A,0x5150,0x5151,0x5152,0x455F,INVALC,INVALC,INVALC,
-	0x5156,0x5154,0x5155,0x5153,0x3A63,0x5157,0x4C6A,0x4E64,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5158,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4028,0x5159,0x3D5A,INVALC,
-	INVALC,0x515A,INVALC,0x437C,0x4E3F,0x4560,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5245,INVALC,
-	INVALC,INVALC,INVALC,0x515B,0x7425,0x3645,INVALC,INVALC,
-	0x515C,0x4B5E,INVALC,INVALC,INVALC,INVALC,0x3D68,0x427C,
-	INVALC,0x515E,0x4664,INVALC,INVALC,0x515F,INVALC,INVALC,
-	0x5160,0x332E,INVALC,INVALC,INVALC,0x5161,0x3627,INVALC,
-	0x464C,0x317A,0x3D50,INVALC,INVALC,0x4821,0x5162,INVALC,
-	/* Block 83, Array index 0x0F00 */
-	0x4561,INVALC,INVALC,0x3F4F,0x5163,INVALC,0x4A2C,0x405A,
-	0x3422,INVALC,0x3429,0x5164,INVALC,INVALC,0x5166,INVALC,
-	INVALC,0x373A,INVALC,INVALC,0x5165,INVALC,INVALC,0x4E73,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3D69,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x483D,0x4A4C,INVALC,0x5167,
-	INVALC,0x4D78,0x5168,INVALC,INVALC,INVALC,0x5169,INVALC,
-	0x457E,INVALC,INVALC,0x516A,INVALC,INVALC,0x4029,0x3A7E,
-	0x3774,0x516B,0x3B49,0x396F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4466,0x516D,INVALC,INVALC,0x4227,
-	INVALC,INVALC,0x3A6F,0x516E,0x516F,0x4130,INVALC,0x516C,
-	INVALC,INVALC,INVALC,INVALC,0x5171,INVALC,0x4B36,INVALC,
-	INVALC,INVALC,INVALC,0x3964,INVALC,INVALC,0x5170,INVALC,
-	INVALC,INVALC,INVALC,0x3775,0x3A5E,0x476D,INVALC,INVALC,
-	INVALC,0x5174,0x5172,INVALC,INVALC,INVALC,INVALC,0x497B,
-	0x3E6A,0x517B,0x3364,0x5175,0x5173,0x414F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5177,INVALC,0x5176,
-	INVALC,INVALC,INVALC,0x3344,INVALC,INVALC,INVALC,0x3760,
-	0x517C,0x4E2D,INVALC,INVALC,INVALC,0x5178,INVALC,INVALC,
-	INVALC,0x517D,0x517A,INVALC,0x5179,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E4F,INVALC,INVALC,INVALC,0x3879,
-	0x3243,INVALC,INVALC,0x4E74,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3D75,0x4558,0x3965,0x5222,0x5223,INVALC,INVALC,
-	INVALC,0x4E65,INVALC,INVALC,0x4F2B,0x5225,INVALC,INVALC,
-	INVALC,0x387A,INVALC,INVALC,0x5224,INVALC,0x332F,INVALC,
-	INVALC,0x5226,INVALC,0x4B56,INVALC,0x443C,INVALC,0x4D26,
-	INVALC,0x4A59,INVALC,INVALC,INVALC,0x5227,INVALC,INVALC,
-	INVALC,INVALC,0x7055,INVALC,INVALC,0x4630,INVALC,0x5228,
-	0x342A,0x4C33,INVALC,INVALC,INVALC,0x3E21,0x5229,0x4A67,
-	0x522D,INVALC,0x402A,0x522A,0x3650,INVALC,0x522B,0x342B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x372E,0x522E,INVALC,0x522F,INVALC,INVALC,
-	0x5230,0x5231,0x3C5B,INVALC,INVALC,INVALC,0x387B,0x4C5E,
-	/* Block 84, Array index 0x1000 */
-	INVALC,0x4C68,0x4677,INVALC,INVALC,0x4A71,0x5232,INVALC,
-	0x5233,INVALC,INVALC,INVALC,INVALC,0x5235,INVALC,0x5237,
-	0x5236,INVALC,INVALC,INVALC,INVALC,0x5238,0x323D,0x4B4C,
-	INVALC,0x3A7C,0x5239,INVALC,INVALC,0x4159,INVALC,INVALC,
-	0x3E22,0x3629,INVALC,0x523A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x485B,INVALC,INVALC,INVALC,INVALC,0x523B,
-	INVALC,0x523C,INVALC,0x523D,INVALC,INVALC,INVALC,INVALC,
-	0x523E,0x4924,0x3668,0x3065,INVALC,INVALC,INVALC,0x463F,
-	0x523F,0x3D3D,INVALC,0x4069,INVALC,0x5241,0x5240,0x3E23,
-	0x3861,0x5243,0x483E,INVALC,INVALC,0x5244,INVALC,INVALC,
-	INVALC,0x485C,0x4234,0x426E,0x3628,INVALC,INVALC,0x466E,
-	0x4331,INVALC,0x476E,INVALC,0x4B4E,INVALC,0x5246,INVALC,
-	0x406A,INVALC,INVALC,INVALC,INVALC,INVALC,0x3735,INVALC,
-	INVALC,0x5247,INVALC,INVALC,INVALC,INVALC,0x5248,0x312C,
-	0x3075,0x346D,INVALC,0x4228,0x3551,0x4D71,INVALC,0x524B,
-	0x3237,INVALC,INVALC,0x524A,INVALC,INVALC,INVALC,0x362A,
-	INVALC,INVALC,0x524C,INVALC,0x4C71,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x524D,INVALC,
-	0x4E52,INVALC,0x387C,INVALC,INVALC,INVALC,INVALC,0x3836,
-	0x524E,INVALC,INVALC,INVALC,INVALC,0x5250,0x524F,INVALC,
-	0x3F5F,0x3139,INVALC,INVALC,INVALC,0x315E,0x5251,INVALC,
-	0x5252,INVALC,INVALC,0x3837,INVALC,INVALC,0x5253,INVALC,
-	INVALC,INVALC,INVALC,0x356E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3B32,0x5254,INVALC,INVALC,INVALC,INVALC,
-	0x4B74,0x3A35,0x355A,0x4D27,0x4150,0x483F,0x3C7D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D47,INVALC,0x3C68,0x3C75,
-	INVALC,0x3D76,INVALC,0x4840,INVALC,INVALC,INVALC,0x5257,
-	INVALC,0x3143,0x4151,0x387D,0x3845,0x3667,INVALC,INVALC,
-	0x525B,0x4321,0x427E,0x362B,0x3E24,0x525C,0x525A,0x3244,
-	0x4266,0x3C38,0x3B4B,0x3126,INVALC,INVALC,0x3370,0x3966,
-	0x3B4A,INVALC,0x525D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 85, Array index 0x1100 */
-	INVALC,0x525E,INVALC,0x3549,0x3346,INVALC,INVALC,INVALC,
-	0x3967,0x3548,0x445F,0x3125,0x4631,0x4C3E,0x3921,0x4D79,
-	0x4547,0x387E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x372F,INVALC,0x5267,INVALC,0x3663,
-	0x4B4A,INVALC,INVALC,INVALC,INVALC,INVALC,0x485D,INVALC,
-	INVALC,0x5266,INVALC,0x345E,0x5261,0x5262,0x5264,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5265,INVALC,
-	0x355B,0x3F61,INVALC,0x4A2D,0x5263,0x525F,0x3863,INVALC,
-	0x5260,INVALC,0x4F24,INVALC,INVALC,INVALC,0x4A72,INVALC,
-	0x4468,0x3862,0x3970,INVALC,INVALC,INVALC,0x5268,INVALC,
-	INVALC,0x465D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x526C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C7E,INVALC,0x3C76,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x526F,0x526D,INVALC,0x4C23,INVALC,0x526A,0x5273,0x526E,
-	INVALC,INVALC,INVALC,0x5271,0x3846,0x4C3F,INVALC,INVALC,
-	0x5272,INVALC,INVALC,INVALC,0x5274,INVALC,0x5276,INVALC,
-	INVALC,INVALC,INVALC,0x3A70,0x4F42,INVALC,0x526B,0x5269,
-	0x5275,INVALC,0x5270,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5278,INVALC,0x5323,0x527A,INVALC,INVALC,
-	0x527E,INVALC,INVALC,0x5321,0x527B,INVALC,INVALC,0x533E,
-	INVALC,INVALC,0x3A69,0x3331,INVALC,INVALC,INVALC,INVALC,
-	0x5279,INVALC,INVALC,INVALC,0x5325,0x3076,0x5324,INVALC,
-	0x3025,0x494A,0x5322,INVALC,0x527C,INVALC,INVALC,0x5277,
-	0x527D,0x3A48,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5326,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3077,0x532F,INVALC,INVALC,0x5327,0x5328,INVALC,
-	0x3E25,0x4B69,INVALC,INVALC,INVALC,0x532D,0x532C,INVALC,
-	INVALC,INVALC,0x452F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x532E,INVALC,INVALC,0x532B,INVALC,INVALC,
-	/* Block 86, Array index 0x1200 */
-	INVALC,INVALC,INVALC,INVALC,0x3134,INVALC,0x3A36,0x3F30,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5329,
-	0x4562,INVALC,INVALC,INVALC,0x532A,INVALC,0x3022,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5334,0x4D23,
-	INVALC,0x3E27,INVALC,0x533A,INVALC,INVALC,INVALC,INVALC,
-	0x5339,0x5330,INVALC,INVALC,INVALC,INVALC,0x4243,INVALC,
-	0x5331,INVALC,INVALC,INVALC,0x426F,0x5336,0x3E26,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5333,INVALC,INVALC,0x4C64,
-	INVALC,INVALC,INVALC,0x373C,INVALC,INVALC,0x5337,0x5338,
-	INVALC,INVALC,INVALC,INVALC,0x5335,0x533B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5332,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5341,0x5346,INVALC,0x5342,INVALC,
-	0x533D,INVALC,INVALC,0x5347,0x4131,INVALC,INVALC,0x5349,
-	INVALC,0x3922,0x533F,0x437D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5343,0x533C,0x342D,INVALC,0x346E,0x3365,0x5344,0x5340,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3776,
-	0x534A,0x5348,0x4153,0x354A,0x362C,INVALC,0x5345,INVALC,
-	0x3674,INVALC,INVALC,INVALC,INVALC,INVALC,0x3144,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x534E,0x534C,INVALC,0x5427,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5351,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x534B,INVALC,0x534F,INVALC,INVALC,0x534D,
-	INVALC,INVALC,INVALC,0x3B4C,0x5350,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5353,
-	INVALC,0x5358,INVALC,INVALC,INVALC,0x5356,0x5355,INVALC,
-	/* Block 87, Array index 0x1300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4332,INVALC,
-	INVALC,0x3245,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5352,INVALC,0x5354,0x3E28,
-	0x3133,INVALC,INVALC,0x5357,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x325E,INVALC,INVALC,INVALC,INVALC,INVALC,0x5362,
-	INVALC,0x3E7C,0x535E,INVALC,0x535C,INVALC,0x535D,INVALC,
-	0x535F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x313D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4139,INVALC,0x5359,INVALC,
-	0x535A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x337A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5361,INVALC,INVALC,INVALC,
-	0x346F,INVALC,0x5364,0x5360,0x5363,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4A2E,INVALC,INVALC,INVALC,
-	0x4655,INVALC,0x4838,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5366,INVALC,INVALC,INVALC,INVALC,INVALC,0x5365,0x3345,
-	INVALC,INVALC,0x5367,INVALC,INVALC,INVALC,INVALC,0x536A,
-	INVALC,INVALC,INVALC,INVALC,0x5369,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5368,INVALC,0x4739,INVALC,INVALC,0x536B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x536C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x536E,INVALC,0x536D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5370,INVALC,INVALC,INVALC,
-	0x5373,0x5371,0x536F,0x5372,INVALC,INVALC,INVALC,INVALC,
-	0x5374,INVALC,INVALC,INVALC,INVALC,INVALC,0x5375,INVALC,
-	INVALC,0x5376,INVALC,0x5377,INVALC,INVALC,INVALC,0x5378,
-	0x5145,INVALC,0x3C7C,0x3B4D,INVALC,INVALC,0x3273,INVALC,
-	0x3078,INVALC,INVALC,0x4344,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5379,INVALC,
-	0x3A24,INVALC,0x304F,0x3F5E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x537A,0x3847,INVALC,INVALC,0x3971,INVALC,0x537C,
-	/* Block 88, Array index 0x1400 */
-	0x537B,INVALC,INVALC,0x4A60,0x537D,INVALC,INVALC,INVALC,
-	0x5421,0x537E,INVALC,0x5422,INVALC,0x5423,INVALC,0x3777,
-	INVALC,INVALC,0x3160,0x5424,INVALC,INVALC,0x5426,INVALC,
-	0x5425,INVALC,INVALC,INVALC,0x5428,INVALC,INVALC,0x455A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5429,0x3035,
-	0x3A5F,INVALC,INVALC,INVALC,INVALC,0x373D,INVALC,INVALC,
-	0x434F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x542A,
-	0x542B,INVALC,INVALC,0x542D,INVALC,INVALC,INVALC,INVALC,
-	0x542E,INVALC,0x3A64,INVALC,INVALC,INVALC,INVALC,0x3651,
-	INVALC,INVALC,0x4B37,INVALC,INVALC,INVALC,0x542C,0x542F,
-	0x3A41,0x3923,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5433,INVALC,INVALC,0x3A25,INVALC,0x4333,INVALC,
-	INVALC,0x5430,0x445A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5434,
-	INVALC,INVALC,0x3F62,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5432,0x5435,INVALC,0x373F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5436,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5437,INVALC,0x3924,0x3340,0x5439,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x543A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x543B,INVALC,INVALC,0x5438,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5431,INVALC,INVALC,0x543C,INVALC,INVALC,0x543D,INVALC,
-	INVALC,INVALC,INVALC,0x4B64,INVALC,INVALC,0x3E6B,INVALC,
-	INVALC,INVALC,0x543F,0x5440,0x543E,INVALC,0x5442,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4738,INVALC,INVALC,0x3068,
-	0x4956,INVALC,INVALC,0x5443,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E7D,INVALC,INVALC,0x3C39,
-	INVALC,0x475D,0x3470,INVALC,0x3A6B,INVALC,INVALC,INVALC,
-	/* Block 89, Array index 0x1500 */
-	0x4B59,INVALC,0x4632,INVALC,INVALC,0x3778,0x424F,INVALC,
-	INVALC,INVALC,0x5441,0x5444,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4244,INVALC,INVALC,
-	INVALC,0x5445,INVALC,INVALC,INVALC,0x5446,INVALC,INVALC,
-	INVALC,0x5448,INVALC,INVALC,0x4469,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x342E,INVALC,INVALC,INVALC,INVALC,0x7421,
-	0x3161,0x4A73,INVALC,INVALC,0x3E6C,0x4548,INVALC,INVALC,
-	INVALC,INVALC,0x3A66,INVALC,INVALC,0x544E,INVALC,INVALC,
-	0x4A3D,0x4E5D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3274,0x544A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x413A,0x544D,INVALC,0x4563,INVALC,INVALC,0x4549,
-	0x4564,0x4839,0x444D,INVALC,INVALC,INVALC,0x3A49,INVALC,
-	INVALC,INVALC,0x5449,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3176,INVALC,0x4536,INVALC,INVALC,INVALC,INVALC,
-	0x544B,INVALC,0x5447,INVALC,INVALC,0x3F50,INVALC,INVALC,
-	INVALC,0x544F,INVALC,INVALC,INVALC,INVALC,0x3D4E,INVALC,
-	INVALC,INVALC,INVALC,0x362D,INVALC,0x5450,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A68,INVALC,INVALC,INVALC,0x417D,
-	INVALC,INVALC,INVALC,INVALC,0x4446,INVALC,INVALC,0x5452,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4B4F,INVALC,INVALC,0x5453,INVALC,INVALC,0x5458,INVALC,
-	INVALC,INVALC,INVALC,0x4A2F,INVALC,INVALC,INVALC,INVALC,
-	0x5457,0x5451,0x5454,0x5456,INVALC,INVALC,0x3A26,INVALC,
-	INVALC,0x4A49,INVALC,INVALC,INVALC,0x5459,INVALC,0x4345,
-	INVALC,INVALC,0x3275,INVALC,0x3E6D,INVALC,INVALC,INVALC,
-	INVALC,0x545B,INVALC,0x545A,INVALC,0x3968,INVALC,0x545C,
-	0x545E,0x545D,INVALC,INVALC,0x5460,INVALC,0x5455,0x5462,
-	INVALC,INVALC,INVALC,INVALC,0x5461,0x545F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3B4E,0x3F51,INVALC,0x4154,0x5463,
-	0x403C,0x306D,0x4764,INVALC,INVALC,INVALC,INVALC,0x445B,
-	INVALC,0x5465,0x5464,0x5466,0x5467,0x5468,INVALC,INVALC,
-	/* Block 90, Array index 0x1600 */
-	INVALC,INVALC,0x5469,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A51,0x546A,INVALC,INVALC,INVALC,INVALC,0x3246,
-	0x546B,INVALC,INVALC,INVALC,INVALC,0x4D3C,0x3330,INVALC,
-	0x5249,0x3D48,0x423F,0x546C,0x4C6B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C34,INVALC,INVALC,0x546E,INVALC,0x4267,
-	INVALC,0x4537,0x4240,0x4957,0x546F,0x5470,0x317B,INVALC,
-	INVALC,0x3C3A,0x5471,INVALC,INVALC,INVALC,INVALC,0x3050,
-	0x5472,INVALC,INVALC,INVALC,INVALC,INVALC,0x5473,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3162,INVALC,INVALC,0x3471,
-	0x4660,0x4A74,INVALC,INVALC,INVALC,INVALC,0x5477,0x4155,
-	0x5476,0x3740,INVALC,INVALC,0x4B5B,0x5475,INVALC,0x4565,
-	0x5479,INVALC,0x5478,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x547B,INVALC,0x547A,INVALC,INVALC,0x317C,INVALC,0x547C,
-	0x3E29,0x547E,0x4325,INVALC,0x547D,INVALC,0x4A33,INVALC,
-	INVALC,INVALC,INVALC,0x3D77,0x455B,INVALC,INVALC,INVALC,
-	0x5521,INVALC,INVALC,INVALC,INVALC,0x3925,INVALC,INVALC,
-	INVALC,0x5522,0x4721,0x485E,0x4C51,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4725,INVALC,INVALC,0x552B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3538,INVALC,INVALC,0x4D45,INVALC,
-	INVALC,0x4C2F,INVALC,0x562C,INVALC,0x5523,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5526,INVALC,0x4245,INVALC,INVALC,
-	0x4B38,INVALC,INVALC,INVALC,0x454A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5527,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4B65,INVALC,0x3A4A,INVALC,INVALC,0x3E2A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5528,INVALC,
-	INVALC,0x3B50,INVALC,0x3B4F,INVALC,INVALC,INVALC,INVALC,
-	0x3039,0x3848,INVALC,0x402B,0x3051,INVALC,INVALC,INVALC,
-	INVALC,0x552C,0x552D,INVALC,0x552A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3138,0x342F,INVALC,
-	0x5529,INVALC,0x4C45,0x4931,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3028,INVALC,
-	INVALC,INVALC,INVALC,0x3079,INVALC,INVALC,INVALC,0x3B51,
-	/* Block 91, Array index 0x1700 */
-	INVALC,0x3052,INVALC,0x3023,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5532,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5530,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C3C,INVALC,0x5533,INVALC,0x5531,INVALC,INVALC,0x552F,
-	0x3F31,INVALC,INVALC,INVALC,INVALC,0x552E,INVALC,INVALC,
-	INVALC,0x4A5A,INVALC,INVALC,INVALC,INVALC,INVALC,0x3864,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5537,0x5538,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E2B,INVALC,INVALC,INVALC,
-	0x5534,0x4F2C,INVALC,INVALC,INVALC,INVALC,0x474C,INVALC,
-	INVALC,0x5536,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3A27,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5539,INVALC,INVALC,INVALC,0x4958,INVALC,
-	INVALC,INVALC,0x553A,INVALC,0x5535,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C3B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x475E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x553B,0x4932,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x553C,0x5540,0x553D,INVALC,
-	INVALC,0x3247,0x553F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3C3B,INVALC,0x553E,0x3779,INVALC,INVALC,INVALC,
-	0x554C,INVALC,INVALC,INVALC,INVALC,INVALC,0x5545,0x5542,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4364,INVALC,0x5541,INVALC,INVALC,0x5543,INVALC,
-	INVALC,0x5544,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5546,0x5547,INVALC,INVALC,INVALC,INVALC,
-	/* Block 92, Array index 0x1800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3472,INVALC,0x5549,0x5548,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x554A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3E6E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x554D,INVALC,0x445C,INVALC,INVALC,INVALC,
-	0x3145,INVALC,0x554B,INVALC,INVALC,INVALC,0x554E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x554F,INVALC,
-	0x5552,INVALC,INVALC,0x5550,INVALC,0x5551,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B52,0x5553,INVALC,INVALC,0x3926,0x5554,INVALC,0x3B7A,
-	0x4238,INVALC,0x5555,0x5556,0x3B5A,0x3927,INVALC,0x4C52,
-	INVALC,INVALC,INVALC,0x3528,0x3849,0x5557,0x3358,INVALC,
-	INVALC,0x5558,INVALC,0x4239,INVALC,INVALC,INVALC,INVALC,
-	0x5559,0x5623,INVALC,0x555A,INVALC,0x555B,INVALC,INVALC,
-	0x555C,INVALC,0x555E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x555F,INVALC,INVALC,0x5560,INVALC,0x4270,INVALC,0x3127,
-	0x3C69,0x3042,INVALC,0x4157,0x3430,0x3C35,INVALC,0x3928,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4566,INVALC,0x3D21,
-	0x3431,0x4368,0x446A,0x3038,0x3539,0x4A75,INVALC,0x3C42,
-	INVALC,INVALC,0x3552,0x406B,0x3C3C,0x4D28,0x5561,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x355C,INVALC,
-	0x3A4B,INVALC,INVALC,0x3332,0x3163,0x3E2C,0x3248,INVALC,
-	0x5562,0x4D46,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D49,
-	INVALC,INVALC,0x3C64,0x5563,0x3473,0x4652,0x4C29,0x5564,
-	INVALC,0x5565,INVALC,INVALC,0x4959,INVALC,INVALC,INVALC,
-	0x5567,INVALC,0x3428,0x3677,0x5566,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3432,INVALC,0x3F32,0x556B,0x3B21,
-	INVALC,0x3249,0x556A,INVALC,0x5568,0x556C,0x5569,0x472B,
-	0x5C4D,0x3F33,INVALC,0x556D,INVALC,INVALC,0x4E40,INVALC,
-	0x556E,INVALC,INVALC,0x5570,INVALC,0x437E,0x556F,INVALC,
-	0x4023,INVALC,0x3B7B,INVALC,INVALC,INVALC,0x4250,0x3C77,
-	/* Block 93, Array index 0x1900 */
-	INVALC,0x4975,0x406C,INVALC,0x3C4D,0x5571,0x3E2D,0x5572,
-	0x5573,0x3053,0x423A,0x3F52,INVALC,0x5574,0x4633,0x3E2E,
-	INVALC,0x3E2F,INVALC,0x5575,INVALC,INVALC,0x406D,INVALC,
-	INVALC,INVALC,0x3E30,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5576,INVALC,0x5577,INVALC,0x4C60,INVALC,INVALC,INVALC,
-	0x5578,INVALC,INVALC,INVALC,INVALC,0x3646,INVALC,INVALC,
-	INVALC,0x3D22,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5579,0x557A,0x3C5C,0x3F2C,0x4674,0x3F54,0x4878,0x4722,
-	0x3649,0x557B,INVALC,INVALC,INVALC,0x356F,0x557C,INVALC,
-	0x367E,INVALC,0x464F,0x3230,INVALC,0x3B53,0x557D,0x5622,
-	0x5621,0x367D,INVALC,0x557E,INVALC,0x4538,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4230,INVALC,
-	0x454B,0x3C48,INVALC,INVALC,0x4158,0x4D7A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5624,INVALC,0x5625,0x4656,
-	INVALC,0x3B33,INVALC,INVALC,INVALC,INVALC,0x5627,INVALC,
-	INVALC,0x5628,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5629,INVALC,INVALC,INVALC,
-	0x3474,0x562A,INVALC,INVALC,0x562B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x322C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x413B,0x3464,INVALC,0x562D,0x4C28,INVALC,INVALC,INVALC,
-	INVALC,0x4252,INVALC,0x3359,INVALC,INVALC,0x562F,0x5631,
-	0x345F,INVALC,INVALC,0x562E,0x5630,INVALC,0x5633,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5632,INVALC,0x5634,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5635,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x463D,0x362E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3265,0x5636,0x563B,INVALC,INVALC,0x5639,INVALC,0x4A77,
-	0x4A76,INVALC,INVALC,INVALC,INVALC,INVALC,0x4567,INVALC,
-	INVALC,INVALC,0x5638,0x3D54,INVALC,0x5637,INVALC,INVALC,
-	/* Block 94, Array index 0x1A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3F72,
-	INVALC,INVALC,INVALC,0x563C,INVALC,INVALC,0x3A6A,INVALC,
-	INVALC,0x5642,INVALC,INVALC,0x5643,0x563D,0x3333,0x563E,
-	0x5647,0x5646,0x5645,0x5641,INVALC,INVALC,INVALC,0x5640,
-	INVALC,INVALC,0x5644,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A78,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x564B,0x5648,INVALC,0x564A,INVALC,
-	0x4D72,INVALC,0x5649,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x563F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3F73,INVALC,INVALC,0x564C,INVALC,INVALC,0x3A37,
-	INVALC,INVALC,INVALC,0x564D,INVALC,INVALC,0x564E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5651,INVALC,0x5650,INVALC,INVALC,0x564F,
-	INVALC,INVALC,INVALC,0x4568,0x563A,INVALC,INVALC,INVALC,
-	0x5657,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5653,INVALC,INVALC,
-	INVALC,INVALC,0x5652,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5654,INVALC,0x5655,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5658,
-	INVALC,INVALC,0x4E66,INVALC,0x5659,0x5656,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x565A,INVALC,INVALC,0x3460,0x565B,INVALC,INVALC,
-	INVALC,INVALC,0x565D,0x565C,INVALC,INVALC,0x565E,INVALC,
-	INVALC,INVALC,INVALC,0x565F,INVALC,0x406E,0x3D23,INVALC,
-	INVALC,0x3D64,INVALC,0x4163,INVALC,0x3929,0x3A38,0x392A,
-	0x3570,INVALC,INVALC,0x5660,INVALC,INVALC,0x3A39,INVALC,
-	INVALC,0x384A,0x5661,0x4C26,0x4743,0x5662,INVALC,0x392B,
-	INVALC,INVALC,INVALC,0x342C,INVALC,0x4327,0x3652,INVALC,
-	/* Block 95, Array index 0x1B00 */
-	INVALC,INVALC,0x3B54,0x495B,INVALC,INVALC,0x4841,INVALC,
-	INVALC,INVALC,INVALC,0x5663,0x3475,INVALC,INVALC,INVALC,
-	INVALC,0x5666,INVALC,INVALC,INVALC,INVALC,0x4421,INVALC,
-	INVALC,0x5665,0x5664,0x5667,INVALC,0x446B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3F63,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3B55,INVALC,0x404A,INVALC,0x4253,
-	0x3522,INVALC,INVALC,0x4422,INVALC,INVALC,0x5668,0x5669,
-	0x3E6F,INVALC,INVALC,INVALC,INVALC,0x4B39,INVALC,INVALC,
-	0x566C,INVALC,INVALC,0x566B,0x566A,0x497D,INVALC,0x5673,
-	INVALC,INVALC,INVALC,INVALC,0x4B5A,INVALC,0x566D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x566F,0x4B6B,INVALC,0x566E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5670,
-	INVALC,0x4828,0x5671,0x4A3E,0x5672,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3433,0x4A3F,0x472F,0x5674,0x5675,INVALC,
-	0x392C,0x3434,0x5676,0x3838,0x4D44,0x4D29,0x3476,0x5678,
-	INVALC,0x4423,INVALC,0x392D,0x3E31,INVALC,INVALC,0x485F,
-	INVALC,INVALC,0x3E32,INVALC,INVALC,INVALC,INVALC,0x3D78,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x446C,0x4A79,0x4539,
-	INVALC,INVALC,0x392E,INVALC,0x495C,INVALC,INVALC,INVALC,
-	0x5679,INVALC,INVALC,INVALC,INVALC,INVALC,0x4559,0x3A42,
-	INVALC,INVALC,INVALC,0x384B,INVALC,0x446D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3043,0x3D6E,0x392F,
-	0x4D47,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x567A,0x567B,0x4751,INVALC,INVALC,INVALC,INVALC,
-	0x567C,0x4E77,0x4F2D,INVALC,INVALC,INVALC,INVALC,0x567E,
-	0x567D,INVALC,INVALC,0x3347,INVALC,INVALC,0x5721,INVALC,
-	INVALC,INVALC,0x5724,0x5725,INVALC,0x5723,INVALC,0x4940,
-	0x3E33,0x5727,0x5726,0x5722,INVALC,INVALC,INVALC,INVALC,
-	0x5728,0x5729,INVALC,INVALC,0x572A,INVALC,INVALC,INVALC,
-	0x572D,0x572B,INVALC,0x572C,0x572E,INVALC,0x3164,0x446E,
-	0x572F,INVALC,0x377A,0x3276,0x4736,INVALC,0x5730,0x467B,
-	/* Block 96, Array index 0x1C00 */
-	INVALC,0x4A5B,INVALC,0x5731,0x4F2E,INVALC,INVALC,INVALC,
-	INVALC,0x5732,0x4A40,0x5735,0x5021,0x5031,INVALC,0x3C30,
-	0x4675,0x5736,INVALC,0x355D,0x4424,0x307A,0x5737,0x4A26,
-	0x3930,INVALC,INVALC,0x4350,INVALC,INVALC,INVALC,0x446F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4C6F,0x3839,0x384C,
-	INVALC,0x5738,INVALC,INVALC,INVALC,0x5739,INVALC,0x573F,
-	INVALC,0x3C65,INVALC,INVALC,INVALC,0x4425,INVALC,0x362F,
-	0x573A,INVALC,INVALC,INVALC,0x492B,INVALC,0x4346,INVALC,
-	INVALC,0x573B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x573C,INVALC,0x3630,INVALC,0x573D,INVALC,0x573E,INVALC,
-	INVALC,0x5740,INVALC,0x4576,INVALC,INVALC,0x5741,0x5742,
-	INVALC,0x5743,INVALC,INVALC,0x5734,0x5733,INVALC,INVALC,
-	INVALC,0x5744,0x3741,INVALC,INVALC,INVALC,0x4927,INVALC,
-	INVALC,0x3A4C,0x4937,0x4426,0x494B,0x5745,INVALC,INVALC,
-	0x3E34,0x3146,INVALC,0x5746,INVALC,INVALC,INVALC,0x5747,
-	INVALC,0x4C72,INVALC,INVALC,0x4860,INVALC,INVALC,0x574A,
-	0x317D,0x402C,0x5749,0x5748,0x3742,0x4254,INVALC,0x574E,
-	0x574C,INVALC,0x574B,0x4E27,0x3865,INVALC,INVALC,INVALC,
-	0x3D79,0x574D,0x454C,0x3D3E,INVALC,INVALC,INVALC,0x4640,
-	0x5751,0x5750,INVALC,INVALC,INVALC,INVALC,0x574F,INVALC,
-	0x5752,0x3866,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5753,0x497C,0x3D5B,INVALC,INVALC,0x5754,0x4879,INVALC,
-	INVALC,INVALC,INVALC,0x4641,0x4427,INVALC,INVALC,INVALC,
-	INVALC,0x4530,INVALC,INVALC,0x5755,0x352B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3F34,INVALC,0x492C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3477,0x4726,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5756,0x3B56,
-	0x4B3A,0x4B3B,INVALC,INVALC,0x317E,0x575B,INVALC,INVALC,
-	0x4369,INVALC,INVALC,INVALC,0x5758,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3277,INVALC,INVALC,INVALC,INVALC,
-	0x582D,0x575A,INVALC,INVALC,INVALC,0x4730,INVALC,INVALC,
-	0x5759,INVALC,INVALC,0x5757,INVALC,0x397A,INVALC,0x575D,
-	/* Block 97, Array index 0x1D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5763,0x5769,
-	0x5761,INVALC,0x455C,INVALC,INVALC,0x5766,0x495D,INVALC,
-	INVALC,0x5760,INVALC,0x5765,0x4E67,0x3B57,INVALC,INVALC,
-	0x4255,0x575E,INVALC,INVALC,INVALC,0x355E,0x5768,0x402D,
-	0x3165,0x5762,0x3278,0x5767,INVALC,INVALC,INVALC,0x3631,
-	INVALC,0x5764,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x576A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x576C,0x5776,0x5774,INVALC,INVALC,0x5771,INVALC,
-	INVALC,INVALC,0x5770,0x4E78,INVALC,0x5772,INVALC,INVALC,
-	0x3632,INVALC,0x3931,INVALC,INVALC,0x3D7A,INVALC,INVALC,
-	INVALC,0x5779,0x576B,INVALC,INVALC,INVALC,INVALC,0x576F,
-	0x575F,INVALC,0x327A,0x5773,0x5775,0x4351,INVALC,INVALC,
-	0x3A28,0x3238,0x576D,0x5778,0x5777,0x3633,INVALC,0x4229,
-	0x3366,INVALC,INVALC,INVALC,INVALC,0x3743,INVALC,0x576E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x577A,INVALC,0x577D,0x5821,INVALC,INVALC,INVALC,
-	INVALC,0x3C3D,INVALC,0x5827,0x4470,0x577B,INVALC,INVALC,
-	INVALC,INVALC,0x5825,INVALC,0x3279,INVALC,0x5823,0x5824,
-	INVALC,INVALC,0x577E,0x5822,INVALC,INVALC,INVALC,0x3867,
-	0x4D2A,INVALC,INVALC,0x3435,INVALC,INVALC,0x3159,0x5826,
-	INVALC,0x473A,0x302D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4861,0x575C,0x582C,0x5830,0x4C65,INVALC,
-	0x5829,INVALC,INVALC,INVALC,0x4569,0x582E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3E70,0x582F,0x4657,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F47,INVALC,0x582B,INVALC,INVALC,INVALC,INVALC,
-	0x5831,INVALC,0x397B,INVALC,0x404B,INVALC,INVALC,0x3054,
-	0x582A,0x5828,INVALC,0x415A,INVALC,INVALC,INVALC,0x577C,
-	0x3B34,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4246,0x583D,INVALC,0x415B,0x5838,INVALC,0x5835,0x5836,
-	INVALC,0x3C66,0x5839,0x583C,INVALC,INVALC,INVALC,INVALC,
-	/* Block 98, Array index 0x1E00 */
-	0x5837,0x3D25,INVALC,0x583A,INVALC,INVALC,0x5834,INVALC,
-	0x4C7C,0x4C7B,INVALC,INVALC,INVALC,0x583E,0x583F,0x3055,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5833,INVALC,INVALC,
-	INVALC,INVALC,0x3672,0x3026,INVALC,INVALC,INVALC,0x3436,
-	INVALC,0x583B,INVALC,INVALC,INVALC,INVALC,INVALC,0x5843,
-	0x5842,INVALC,INVALC,INVALC,0x5847,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5848,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5846,0x5849,0x5841,0x5845,
-	INVALC,INVALC,0x584A,INVALC,0x584B,INVALC,INVALC,0x5840,
-	0x3B7C,INVALC,0x5844,0x4256,0x3932,0x5832,0x3F35,INVALC,
-	INVALC,INVALC,INVALC,0x5858,INVALC,0x4A69,INVALC,INVALC,
-	0x584E,0x584F,0x5850,INVALC,INVALC,0x5857,INVALC,0x5856,
-	INVALC,INVALC,0x4B7D,0x3437,INVALC,0x5854,INVALC,0x3745,
-	0x3334,INVALC,INVALC,0x5851,INVALC,INVALC,0x4E38,0x5853,
-	0x3056,0x5855,INVALC,0x584C,0x5852,0x5859,0x3744,0x584D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D5D,INVALC,
-	INVALC,INVALC,0x4D2B,INVALC,INVALC,INVALC,INVALC,0x585C,
-	INVALC,INVALC,0x5860,INVALC,INVALC,INVALC,0x417E,INVALC,
-	0x4E79,0x5861,INVALC,INVALC,0x585E,INVALC,0x585B,INVALC,
-	INVALC,0x585A,0x585F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4A30,INVALC,INVALC,0x4634,
-	INVALC,0x3746,INVALC,0x5862,0x585D,INVALC,0x5863,INVALC,
-	INVALC,INVALC,0x377B,INVALC,INVALC,INVALC,0x3231,INVALC,
-	INVALC,INVALC,0x586B,INVALC,INVALC,INVALC,0x3438,INVALC,
-	INVALC,INVALC,INVALC,0x5869,INVALC,INVALC,0x586A,0x3A29,
-	0x5868,0x5866,0x5865,0x586C,0x5864,0x586E,INVALC,INVALC,
-	0x327B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5870,INVALC,INVALC,0x586F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4428,INVALC,0x5873,INVALC,0x5871,0x5867,
-	0x377C,INVALC,0x5872,INVALC,0x5876,0x5875,0x5877,0x5874,
-	/* Block 99, Array index 0x1F00 */
-	0x5878,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5879,0x587A,0x4A6A,INVALC,0x587C,0x587B,0x3D3F,INVALC,
-	0x402E,0x3266,0x327C,INVALC,0x587D,INVALC,0x303F,INVALC,
-	INVALC,INVALC,0x404C,0x587E,INVALC,0x6C43,0x5921,0x3761,
-	INVALC,0x5922,INVALC,INVALC,INVALC,INVALC,0x406F,INVALC,
-	INVALC,INVALC,0x5923,INVALC,INVALC,INVALC,0x5924,0x353A,
-	0x5925,INVALC,0x5926,0x5927,0x4257,INVALC,INVALC,INVALC,
-	0x384D,INVALC,INVALC,0x4C61,INVALC,INVALC,INVALC,0x4B3C,
-	0x3D6A,0x5928,INVALC,INVALC,INVALC,INVALC,INVALC,0x4070,
-	0x6E3D,0x4862,INVALC,0x3C6A,INVALC,0x3A4D,0x5929,INVALC,
-	INVALC,INVALC,INVALC,0x4247,INVALC,0x4A27,INVALC,INVALC,
-	0x4271,INVALC,INVALC,0x592C,INVALC,INVALC,0x592A,INVALC,
-	0x592D,INVALC,INVALC,0x592B,INVALC,INVALC,INVALC,INVALC,
-	0x592E,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A31,INVALC,
-	INVALC,0x3037,INVALC,INVALC,INVALC,INVALC,0x495E,INVALC,
-	INVALC,0x4863,INVALC,INVALC,0x592F,INVALC,0x5932,0x3E35,
-	0x353B,INVALC,0x5930,0x5937,0x3E36,INVALC,INVALC,INVALC,
-	INVALC,0x5931,0x4744,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D5E,0x5933,0x5934,0x5938,0x456A,0x5935,0x3933,
-	0x405E,INVALC,INVALC,0x5946,0x4834,INVALC,0x4272,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4864,0x5A2D,INVALC,INVALC,INVALC,
-	INVALC,0x4A7A,INVALC,INVALC,INVALC,0x4471,INVALC,INVALC,
-	INVALC,0x4B75,INVALC,0x593B,0x3221,0x436A,INVALC,INVALC,
-	INVALC,INVALC,0x5944,INVALC,INVALC,0x4334,0x593E,0x5945,
-	0x5940,0x5947,0x5943,INVALC,0x5942,0x476F,INVALC,0x593C,
-	0x327D,0x593A,0x3571,0x4273,0x5936,INVALC,INVALC,0x5939,
-	0x3934,0x405B,INVALC,0x3E37,0x5941,0x4752,INVALC,INVALC,
-	0x3572,0x3348,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3367,0x3F21,0x5949,0x594E,
-	INVALC,0x594A,INVALC,0x377D,INVALC,0x594F,0x3B22,0x3969,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D26,0x593D,
-	/* Block 100, Array index 0x2000 */
-	INVALC,0x3B7D,0x594C,INVALC,INVALC,INVALC,INVALC,0x3B58,
-	0x594D,0x3044,INVALC,INVALC,0x5948,INVALC,INVALC,INVALC,
-	INVALC,0x4429,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3573,INVALC,INVALC,INVALC,INVALC,INVALC,0x3634,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x594B,
-	0x3027,INVALC,INVALC,0x3A43,INVALC,INVALC,INVALC,0x3F36,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4472,INVALC,INVALC,0x4854,0x5951,0x415E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x422A,INVALC,INVALC,0x3B2B,0x5952,INVALC,0x5954,
-	0x5950,INVALC,INVALC,INVALC,INVALC,0x4A61,INVALC,0x443D,
-	INVALC,INVALC,INVALC,INVALC,0x415C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A7B,
-	0x3C4E,0x5960,INVALC,0x595F,INVALC,INVALC,0x3F78,INVALC,
-	INVALC,INVALC,0x377E,INVALC,INVALC,INVALC,0x5959,0x3E39,
-	INVALC,INVALC,0x4668,0x4731,INVALC,INVALC,INVALC,INVALC,
-	0x5957,INVALC,INVALC,0x415D,INVALC,INVALC,INVALC,INVALC,
-	0x3C78,0x595C,INVALC,INVALC,0x3E38,INVALC,0x5956,0x595B,
-	INVALC,INVALC,0x4753,INVALC,INVALC,INVALC,0x5955,INVALC,
-	0x3721,INVALC,INVALC,0x335D,INVALC,INVALC,INVALC,0x595D,
-	0x4E2B,0x3A4E,0x4335,0x595A,INVALC,0x405C,INVALC,0x3935,
-	0x3F64,0x3166,0x413C,0x5958,0x3545,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3747,INVALC,0x444F,0x595E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x415F,INVALC,INVALC,0x5961,INVALC,
-	0x5963,INVALC,INVALC,0x4237,0x5969,INVALC,0x5964,INVALC,
-	INVALC,0x5966,INVALC,INVALC,INVALC,INVALC,INVALC,0x4941,
-	0x4473,INVALC,0x5967,INVALC,INVALC,INVALC,0x4D2C,INVALC,
-	INVALC,INVALC,0x4D48,0x3439,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x302E,INVALC,0x5965,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5962,INVALC,INVALC,INVALC,INVALC,0x3478,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3167,INVALC,0x5968,INVALC,
-	INVALC,INVALC,0x4D49,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 101, Array index 0x2100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x596C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x423B,INVALC,0x5973,
-	INVALC,INVALC,INVALC,0x596D,INVALC,INVALC,0x596A,0x5971,
-	INVALC,INVALC,INVALC,INVALC,0x5953,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x596E,INVALC,
-	0x5972,INVALC,INVALC,INVALC,0x4842,0x456B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x596B,INVALC,0x596F,INVALC,
-	INVALC,INVALC,0x3748,INVALC,INVALC,INVALC,0x3A71,INVALC,
-	INVALC,INVALC,0x405D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5977,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4526,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5974,
-	INVALC,0x4B60,INVALC,INVALC,INVALC,INVALC,INVALC,0x5975,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5976,INVALC,
-	0x4C4E,INVALC,0x4022,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3762,INVALC,INVALC,INVALC,INVALC,
-	0x597D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3B35,0x597A,INVALC,0x5979,INVALC,INVALC,
-	INVALC,INVALC,0x4732,INVALC,INVALC,INVALC,0x4635,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4531,0x597B,INVALC,INVALC,
-	INVALC,0x597C,INVALC,0x496F,INVALC,0x4745,0x3B23,INVALC,
-	0x4071,INVALC,0x4B50,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3349,INVALC,0x5A25,0x597E,INVALC,INVALC,INVALC,
-	INVALC,0x4D4A,0x5A27,INVALC,INVALC,0x5A23,INVALC,0x5A24,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4160,INVALC,INVALC,
-	INVALC,INVALC,0x5A22,INVALC,0x593F,INVALC,INVALC,INVALC,
-	0x5A26,INVALC,0x5A21,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5A2B,0x5A2C,0x4527,0x5A2E,INVALC,INVALC,0x3B24,0x5A29,
-	INVALC,INVALC,INVALC,INVALC,0x353C,INVALC,INVALC,0x5A2F,
-	INVALC,0x5A28,0x5A33,INVALC,0x5A32,INVALC,0x5A31,INVALC,
-	INVALC,INVALC,0x5A34,INVALC,INVALC,0x5A36,0x3E71,INVALC,
-	/* Block 102, Array index 0x2200 */
-	0x5A35,INVALC,INVALC,INVALC,INVALC,0x5A39,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5A37,INVALC,INVALC,INVALC,0x5A38,0x5970,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5A3B,0x5A3A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5978,0x5A3C,0x5A30,INVALC,INVALC,0x3B59,
-	INVALC,INVALC,INVALC,INVALC,0x5A3D,0x5A3E,0x5A40,0x5A3F,
-	0x5A41,0x327E,INVALC,0x3936,INVALC,INVALC,0x4A7C,0x402F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x384E,INVALC,INVALC,
-	0x5A43,INVALC,INVALC,INVALC,INVALC,0x5A46,INVALC,0x4952,
-	INVALC,0x355F,INVALC,INVALC,INVALC,0x5A45,0x5A44,0x4754,
-	0x5A47,0x3635,INVALC,INVALC,INVALC,0x5A49,0x5A48,INVALC,
-	INVALC,INVALC,0x343A,0x3B36,INVALC,INVALC,0x4658,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3749,INVALC,INVALC,INVALC,
-	0x3F74,INVALC,0x5A4A,INVALC,0x4030,0x4528,INVALC,0x495F,
-	0x5A4B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5A4C,0x5A4D,INVALC,INVALC,INVALC,0x4A38,
-	0x555D,0x4046,INVALC,INVALC,0x494C,INVALC,0x3A58,INVALC,
-	0x4865,0x4843,INVALC,INVALC,INVALC,INVALC,INVALC,0x454D,
-	INVALC,0x4E41,INVALC,0x5A4F,0x3C50,INVALC,INVALC,0x5A50,
-	INVALC,0x3036,INVALC,INVALC,0x3654,0x404D,INVALC,0x4960,
-	INVALC,INVALC,INVALC,0x5A51,0x3B42,0x4347,INVALC,0x3B5B,
-	0x3F37,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A52,
-	INVALC,0x4A7D,INVALC,INVALC,0x3177,0x3B5C,INVALC,INVALC,
-	INVALC,0x5A55,INVALC,0x5A53,0x5A56,0x4E39,0x5A54,INVALC,
-	INVALC,INVALC,INVALC,0x407B,0x5A57,INVALC,INVALC,0x4232,
-	INVALC,INVALC,0x5A58,INVALC,INVALC,INVALC,INVALC,0x347A,
-	INVALC,0x5A5A,INVALC,0x5A59,INVALC,INVALC,INVALC,INVALC,
-	0x5A5B,0x5A5C,0x347B,INVALC,INVALC,0x467C,0x4336,0x356C,
-	0x3B5D,0x4161,INVALC,INVALC,0x3D5C,0x3030,INVALC,INVALC,
-	INVALC,0x5A5D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3222,0x5A61,INVALC,INVALC,INVALC,INVALC,
-	/* Block 103, Array index 0x2300 */
-	INVALC,INVALC,0x3937,0x5A60,INVALC,INVALC,0x3A2B,0x3E3A,
-	INVALC,INVALC,0x5A5F,INVALC,0x3E3B,INVALC,0x4C40,0x3A2A,
-	INVALC,INVALC,INVALC,0x3057,0x404E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5A66,INVALC,INVALC,0x4031,
-	0x3147,INVALC,INVALC,INVALC,INVALC,0x3D55,INVALC,0x4B66,
-	0x3A72,INVALC,INVALC,INVALC,INVALC,0x3E3C,INVALC,0x4027,
-	INVALC,INVALC,INVALC,INVALC,0x5A65,0x5A63,0x5A64,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x436B,INVALC,INVALC,0x5B26,
-	INVALC,0x5A6A,0x3B7E,0x3938,0x5A68,INVALC,INVALC,INVALC,
-	INVALC,0x5A69,INVALC,0x3F38,INVALC,INVALC,INVALC,0x5A67,
-	INVALC,INVALC,0x3B2F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5A6C,0x5A6B,0x5A70,
-	INVALC,INVALC,0x5A71,INVALC,0x5A6D,INVALC,0x3322,0x5A6E,
-	0x5A6F,0x4855,INVALC,INVALC,INVALC,INVALC,0x4961,0x374A,
-	0x5A72,INVALC,INVALC,INVALC,0x4032,INVALC,0x3E3D,INVALC,
-	INVALC,INVALC,0x4352,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3647,INVALC,0x5A73,0x5A77,INVALC,INVALC,0x324B,
-	0x5A74,0x5A76,INVALC,INVALC,INVALC,INVALC,0x5A75,INVALC,
-	INVALC,0x3D6B,INVALC,INVALC,INVALC,INVALC,0x4348,0x3045,
-	0x5A78,INVALC,INVALC,INVALC,INVALC,0x5A79,INVALC,INVALC,
-	INVALC,INVALC,0x442A,INVALC,INVALC,INVALC,0x4E71,INVALC,
-	INVALC,INVALC,INVALC,0x3B43,INVALC,INVALC,0x4A6B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4B3D,INVALC,INVALC,INVALC,
-	0x5B22,0x5A7B,INVALC,INVALC,0x5A7E,INVALC,0x5A7D,INVALC,
-	INVALC,0x5A7A,INVALC,INVALC,0x5B21,INVALC,INVALC,0x465E,
-	INVALC,0x5A7C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B23,INVALC,
-	INVALC,0x3D6C,0x5B24,INVALC,0x4D4B,0x4778,INVALC,INVALC,
-	0x5B25,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B27,INVALC,
-	INVALC,0x5B28,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5B29,INVALC,0x364A,0x3148,0x3939,0x5B2A,INVALC,0x5B2B,
-	0x3D71,0x4162,INVALC,INVALC,0x5258,0x413E,0x413D,0x4258,
-	/* Block 104, Array index 0x2400 */
-	0x3A47,INVALC,INVALC,0x5072,INVALC,INVALC,INVALC,INVALC,
-	0x376E,0x4D2D,INVALC,0x4A7E,INVALC,0x497E,INVALC,0x5B2C,
-	INVALC,INVALC,INVALC,INVALC,0x3A73,0x443F,0x5B2D,0x4F2F,
-	INVALC,INVALC,INVALC,0x4B3E,INVALC,0x442B,0x5B2E,0x347C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B2F,0x5B30,
-	0x4C5A,INVALC,0x4C24,0x4B76,0x4B5C,0x3B25,0x5B32,INVALC,
-	INVALC,0x3C6B,INVALC,INVALC,0x4B51,INVALC,0x5B34,0x5B37,
-	0x5B36,INVALC,0x3479,INVALC,INVALC,0x3560,INVALC,0x5B33,
-	INVALC,0x5B35,INVALC,INVALC,INVALC,INVALC,0x5B38,INVALC,
-	INVALC,0x3F79,INVALC,INVALC,INVALC,INVALC,0x4D7B,0x3049,
-	0x3A60,0x423C,INVALC,0x3C5D,INVALC,INVALC,0x3E73,INVALC,
-	INVALC,0x5B3B,INVALC,INVALC,0x454E,INVALC,0x5B39,0x422B,
-	0x5B3A,0x3E72,0x4C5D,0x5B3C,0x5B3D,0x4D68,INVALC,INVALC,
-	INVALC,INVALC,0x5B42,INVALC,INVALC,0x393A,INVALC,0x4755,
-	0x5B3F,0x456C,0x5A5E,0x5A62,INVALC,0x354F,INVALC,0x4747,
-	INVALC,INVALC,INVALC,INVALC,0x5B41,INVALC,0x3E3E,0x4844,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5B47,INVALC,0x487A,
-	INVALC,0x5B3E,INVALC,0x5B44,0x5B43,INVALC,INVALC,INVALC,
-	0x404F,INVALC,INVALC,INVALC,INVALC,0x4B6D,INVALC,0x4E53,
-	INVALC,INVALC,0x4B67,INVALC,0x324C,0x3B5E,INVALC,INVALC,
-	0x4F48,0x5B46,0x3F75,INVALC,INVALC,INVALC,0x5B45,INVALC,
-	INVALC,0x5B40,INVALC,INVALC,INVALC,INVALC,INVALC,0x384F,
-	INVALC,INVALC,INVALC,0x5B4C,0x5B4A,INVALC,0x324D,0x5B48,
-	0x5B4E,0x5B54,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4248,INVALC,INVALC,0x4A41,INVALC,0x5B56,INVALC,
-	INVALC,INVALC,0x4922,INVALC,INVALC,INVALC,0x5B55,0x4770,
-	0x4B3F,0x343B,INVALC,0x4077,0x3D40,INVALC,INVALC,INVALC,
-	0x4453,INVALC,0x4D2E,INVALC,INVALC,0x5B51,0x5B50,INVALC,
-	INVALC,INVALC,0x5B52,INVALC,0x5B4F,INVALC,INVALC,0x5B57,
-	INVALC,0x5B4D,INVALC,INVALC,0x5B4B,INVALC,0x5B53,0x5B49,
-	INVALC,0x436C,INVALC,0x4C78,0x3C46,0x3A74,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3A3A,INVALC,INVALC,0x4B6F,0x3341,
-	/* Block 105, Array index 0x2500 */
-	INVALC,INVALC,0x444E,0x464A,0x3149,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4072,INVALC,INVALC,0x4034,0x372A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B59,INVALC,
-	INVALC,0x393B,0x337C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5B5B,0x3374,0x5B61,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5B5E,INVALC,0x4073,INVALC,INVALC,INVALC,
-	0x334B,0x3A2C,INVALC,INVALC,0x334A,0x3A4F,INVALC,INVALC,
-	0x5B5C,0x3765,0x374B,0x456D,INVALC,INVALC,0x5B5A,INVALC,
-	0x3046,INVALC,INVALC,INVALC,INVALC,0x5B5D,0x5B5F,INVALC,
-	0x364D,0x372C,INVALC,0x343C,0x354B,INVALC,INVALC,INVALC,
-	INVALC,0x5B62,INVALC,INVALC,0x3A79,0x4B71,INVALC,0x3B37,
-	INVALC,INVALC,INVALC,0x5B63,INVALC,INVALC,INVALC,0x4930,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5B6F,INVALC,0x3233,0x5B64,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B75,0x5B65,
-	INVALC,0x4E42,INVALC,0x5B6C,INVALC,0x475F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5B74,INVALC,0x5B67,
-	INVALC,INVALC,INVALC,0x3034,0x5B69,INVALC,INVALC,0x393C,
-	INVALC,INVALC,INVALC,0x5B6B,INVALC,0x5B6A,INVALC,0x5B66,
-	0x5B71,INVALC,0x3E3F,INVALC,INVALC,INVALC,0x546D,0x3868,
-	0x4D7C,INVALC,INVALC,INVALC,INVALC,0x5B68,INVALC,0x4474,
-	0x3323,0x3A2D,INVALC,0x5B60,INVALC,0x5B70,0x3361,INVALC,
-	INVALC,0x5B6E,0x5B72,INVALC,0x456E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x347E,INVALC,0x5C32,INVALC,
-	INVALC,0x4C49,0x5B77,0x347D,INVALC,0x5B7E,INVALC,INVALC,
-	INVALC,INVALC,0x4B40,INVALC,0x5C21,0x5C23,INVALC,0x5C27,
-	0x5B79,INVALC,0x432A,INVALC,INVALC,INVALC,INVALC,0x456F,
-	0x5C2B,0x5B7C,INVALC,0x5C28,INVALC,INVALC,INVALC,0x5C22,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3F39,0x5C2C,
-	INVALC,INVALC,0x4033,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C2A,0x343D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 106, Array index 0x2600 */
-	0x4F50,0x5B76,INVALC,INVALC,0x5C26,0x3058,INVALC,INVALC,
-	0x5B78,INVALC,INVALC,0x4C3A,0x5B7D,0x3F22,0x4447,0x5B73,
-	INVALC,INVALC,0x5C25,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3F7A,0x5C2F,0x3371,0x3821,INVALC,INVALC,INVALC,
-	INVALC,0x5C31,0x5B7A,0x5C30,INVALC,0x5C29,0x5B7B,INVALC,
-	0x5C2D,INVALC,0x5C2E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5C3F,INVALC,INVALC,INVALC,0x464E,INVALC,0x5C24,INVALC,
-	INVALC,0x5C3B,INVALC,INVALC,INVALC,0x5C3D,INVALC,0x4458,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D4C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4976,0x5C38,0x424A,INVALC,INVALC,
-	INVALC,0x5C3E,0x413F,INVALC,0x5C35,0x5C42,0x5C41,INVALC,
-	0x466F,0x5C40,0x466A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C44,0x5C37,INVALC,0x3648,0x5C3A,0x3D5D,
-	INVALC,INVALC,INVALC,0x4760,0x5C3C,0x364B,INVALC,0x5C34,
-	0x5C36,0x5C33,INVALC,INVALC,0x4F30,0x335A,0x5C39,INVALC,
-	INVALC,0x5C43,0x3335,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3A67,INVALC,INVALC,INVALC,0x315D,INVALC,
-	INVALC,0x5C54,INVALC,INVALC,0x4F31,0x5C57,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3F3A,0x5C56,INVALC,INVALC,INVALC,
-	0x5C55,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C52,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C46,INVALC,
-	INVALC,0x5C63,0x5C45,INVALC,0x5C58,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C50,INVALC,INVALC,0x5C4B,0x5C48,
-	INVALC,0x5C49,INVALC,0x5C51,INVALC,INVALC,INVALC,0x7422,
-	INVALC,INVALC,0x5C4E,0x393D,0x4448,0x4164,0x5C4C,INVALC,
-	0x5C47,INVALC,INVALC,0x5C4A,INVALC,INVALC,INVALC,INVALC,
-	0x4D4D,0x4B6A,INVALC,INVALC,INVALC,0x5C4F,0x5C59,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C61,
-	0x5C5A,INVALC,INVALC,0x5C67,INVALC,0x5C65,INVALC,INVALC,
-	INVALC,INVALC,0x5C60,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C5F,INVALC,0x4450,INVALC,0x4165,INVALC,0x5C5D,
-	/* Block 107, Array index 0x2700 */
-	INVALC,INVALC,0x5C5B,INVALC,INVALC,0x5C62,INVALC,INVALC,
-	INVALC,INVALC,0x5C68,0x4875,0x5C6E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C69,0x5C6C,0x5C66,INVALC,INVALC,0x4374,
-	INVALC,0x4938,INVALC,0x5C5C,INVALC,INVALC,0x5C64,0x3E40,
-	INVALC,0x4C4F,0x5C78,0x5C6B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3822,0x3223,0x335F,INVALC,INVALC,0x5C53,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3E41,0x5C70,INVALC,
-	0x5C77,0x3C79,0x3372,INVALC,INVALC,0x432E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5C6D,INVALC,INVALC,0x5C72,
-	0x5C76,INVALC,INVALC,0x3636,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x354C,0x5C74,INVALC,INVALC,INVALC,INVALC,INVALC,0x3521,
-	INVALC,0x464B,0x5C73,INVALC,INVALC,INVALC,0x5C75,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C6F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5C71,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3360,
-	0x4349,INVALC,INVALC,INVALC,0x5C7C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5C7A,0x3869,INVALC,
-	0x5C79,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D21,
-	INVALC,INVALC,INVALC,INVALC,0x5B58,INVALC,INVALC,INVALC,
-	0x5C7B,INVALC,0x5C7D,0x5C7E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D2C,INVALC,0x5D28,INVALC,0x5B6D,INVALC,
-	INVALC,INVALC,INVALC,0x5D27,INVALC,INVALC,INVALC,INVALC,
-	0x5D26,INVALC,INVALC,0x5D23,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C6A,0x5D25,0x5D24,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D2A,INVALC,0x4F26,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D2D,0x367B,INVALC,INVALC,0x5D29,0x5D2B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4827,INVALC,0x5D2E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D32,0x5D2F,INVALC,INVALC,INVALC,INVALC,
-	/* Block 108, Array index 0x2800 */
-	INVALC,INVALC,INVALC,INVALC,0x4D73,0x5D30,INVALC,INVALC,
-	INVALC,INVALC,0x5C5E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D33,INVALC,INVALC,INVALC,0x5D34,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3135,INVALC,0x5D36,
-	0x3767,0x3C21,INVALC,0x3655,INVALC,INVALC,INVALC,0x3224,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D5F,INVALC,INVALC,INVALC,INVALC,0x5D38,
-	0x5D37,0x5D3A,0x353D,INVALC,INVALC,0x3656,0x343E,INVALC,
-	INVALC,INVALC,INVALC,0x5D3D,INVALC,INVALC,INVALC,0x5D3C,
-	INVALC,0x5D3E,INVALC,INVALC,0x324E,INVALC,0x4337,INVALC,
-	0x5D3F,INVALC,INVALC,0x343F,0x5D41,INVALC,INVALC,INVALC,
-	INVALC,0x5D40,INVALC,0x5D42,INVALC,INVALC,INVALC,0x5D43,
-	INVALC,0x5D44,0x3B5F,0x4035,0x3A21,INVALC,0x4970,INVALC,
-	INVALC,0x4A62,0x4F44,INVALC,INVALC,INVALC,INVALC,0x3B75,
-	INVALC,INVALC,INVALC,0x3A50,0x4E72,INVALC,INVALC,INVALC,
-	0x5D45,0x5D46,INVALC,0x3B60,INVALC,INVALC,INVALC,0x5D47,
-	0x5D48,INVALC,INVALC,0x5D4A,0x5D49,INVALC,0x4B58,INVALC,
-	INVALC,0x3D5E,0x3C6C,0x3B44,INVALC,0x5D4B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5D4D,0x3F23,INVALC,
-	0x5D4C,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D4E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5D4F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D50,0x5D51,INVALC,INVALC,INVALC,0x5D52,
-	INVALC,0x5D54,0x5D53,0x5D55,0x3225,0x434A,INVALC,0x5D56,
-	INVALC,INVALC,0x3B26,0x334C,0x5D57,INVALC,INVALC,0x4542,
-	0x544C,INVALC,INVALC,INVALC,INVALC,0x3523,0x5D58,INVALC,
-	INVALC,INVALC,INVALC,0x5D59,INVALC,0x4A6C,0x4B68,INVALC,
-	INVALC,INVALC,0x4647,0x5D5A,0x4866,INVALC,INVALC,INVALC,
-	0x487B,INVALC,INVALC,0x4C53,INVALC,INVALC,INVALC,0x5D5B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D5D,0x5D5C,INVALC,INVALC,0x5D5F,
-	INVALC,INVALC,INVALC,0x5D5E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 109, Array index 0x2900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D61,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3B61,
-	INVALC,0x4C31,INVALC,0x5D62,0x5D63,INVALC,INVALC,0x3524,
-	INVALC,INVALC,INVALC,0x5D64,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D66,0x5D65,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F65,INVALC,INVALC,0x4939,
-	0x314A,INVALC,INVALC,INVALC,INVALC,INVALC,0x4845,INVALC,
-	0x4475,0x3D41,0x3561,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4846,INVALC,
-	0x3C2E,INVALC,INVALC,INVALC,INVALC,0x5D68,INVALC,0x3440,
-	INVALC,INVALC,0x3178,INVALC,INVALC,0x4672,0x5D67,0x393E,
-	0x4353,INVALC,0x5D69,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D71,INVALC,0x5D6A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4241,INVALC,0x3562,0x5D72,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3768,INVALC,INVALC,0x3525,0x5D70,INVALC,
-	INVALC,0x5D6E,0x5D6B,0x4D60,INVALC,INVALC,INVALC,INVALC,
-	0x4440,INVALC,INVALC,INVALC,0x4659,0x5D6C,INVALC,INVALC,
-	0x5D74,INVALC,0x5D73,0x3723,INVALC,INVALC,0x322D,INVALC,
-	INVALC,0x3A3B,0x5D6D,0x5D6F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4B57,0x4274,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4B77,INVALC,INVALC,0x5D7C,INVALC,
-	INVALC,0x5D7D,INVALC,0x324F,INVALC,INVALC,INVALC,INVALC,
-	0x4A28,0x4C7D,0x5E21,0x3C23,0x3E42,0x5D78,0x5D7E,0x3168,
-	INVALC,0x3637,INVALC,INVALC,0x5D75,0x5D7A,INVALC,INVALC,
-	INVALC,0x4074,0x4771,INVALC,0x4867,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D77,INVALC,0x4B21,INVALC,0x5D79,
-	INVALC,0x5E24,INVALC,0x5E22,INVALC,0x5D7B,INVALC,INVALC,
-	INVALC,0x4B22,0x4748,0x3563,INVALC,0x4525,INVALC,INVALC,
-	0x436D,INVALC,0x5E25,INVALC,INVALC,INVALC,INVALC,0x5E23,
-	0x4259,0x5D76,INVALC,0x314B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 110, Array index 0x2A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4D4E,0x5E30,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5E2F,INVALC,INVALC,INVALC,INVALC,0x4076,
-	INVALC,0x5E2C,INVALC,0x4D6C,INVALC,INVALC,0x4636,0x5E26,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4445,INVALC,INVALC,
-	INVALC,0x314C,0x393F,0x5E29,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3D27,0x5E2E,INVALC,0x5E2D,0x5E28,INVALC,
-	0x5E2B,INVALC,INVALC,0x3368,INVALC,0x5E2A,0x4749,INVALC,
-	INVALC,0x4E2E,INVALC,INVALC,0x3E74,0x4075,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5E36,0x5E34,INVALC,0x494D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E31,0x5E33,INVALC,0x313A,INVALC,
-	INVALC,0x3940,0x4F32,INVALC,0x333D,INVALC,0x4962,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4D61,INVALC,INVALC,0x3324,
-	0x3F3B,0x5E35,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E3A,INVALC,INVALC,
-	0x3E43,INVALC,INVALC,INVALC,0x4D30,INVALC,0x5E37,INVALC,
-	INVALC,INVALC,INVALC,0x5E32,INVALC,0x5E38,INVALC,INVALC,
-	INVALC,0x4E5E,INVALC,0x4573,0x4642,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3336,
-	INVALC,INVALC,0x3155,INVALC,INVALC,0x5E3E,INVALC,INVALC,
-	0x5E41,INVALC,INVALC,INVALC,0x4E43,INVALC,INVALC,INVALC,
-	0x4D64,INVALC,INVALC,INVALC,INVALC,0x5E48,0x5E42,0x5E3F,
-	INVALC,INVALC,INVALC,0x4E54,0x5E45,INVALC,INVALC,INVALC,
-	INVALC,0x3D4A,0x5E47,INVALC,INVALC,0x5E4C,INVALC,INVALC,
-	0x4571,0x5E4A,INVALC,INVALC,INVALC,INVALC,0x5E44,INVALC,
-	INVALC,0x4338,INVALC,INVALC,0x5E4B,INVALC,0x5E40,INVALC,
-	0x5E46,INVALC,0x5E4D,0x307C,0x5E43,INVALC,0x5E4E,INVALC,
-	INVALC,0x3F3C,INVALC,0x3D5F,INVALC,0x4A25,INVALC,0x3A2E,
-	INVALC,0x5E3B,0x5E49,0x453A,INVALC,INVALC,INVALC,INVALC,
-	/* Block 111, Array index 0x2B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4036,INVALC,0x3369,
-	0x3A51,0x3E44,0x5E3D,0x3D42,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x374C,INVALC,0x5E3C,INVALC,INVALC,
-	INVALC,0x5E52,0x3D6D,0x383A,INVALC,0x5E61,INVALC,0x5E5B,
-	0x3574,0x454F,INVALC,0x5E56,0x5E5F,0x302F,0x3132,INVALC,
-	INVALC,0x3239,INVALC,0x5E58,0x422C,0x5E4F,0x5E51,0x3941,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5E62,INVALC,0x5E5D,INVALC,INVALC,INVALC,0x5E55,INVALC,
-	INVALC,INVALC,INVALC,0x5E5C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C2B,INVALC,INVALC,0x5E5A,0x5E5E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3850,INVALC,
-	0x3E45,INVALC,INVALC,0x4339,INVALC,INVALC,INVALC,0x5E54,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D2F,
-	INVALC,INVALC,INVALC,0x5E57,INVALC,INVALC,0x5E50,0x4572,
-	INVALC,INVALC,0x5E53,INVALC,INVALC,INVALC,0x5E59,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F51,0x3C3E,
-	0x4B7E,INVALC,0x5E63,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x482E,INVALC,INVALC,0x5E6F,
-	0x383B,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D60,INVALC,
-	0x5E65,INVALC,INVALC,INVALC,0x4E2F,0x3942,INVALC,0x5E72,
-	INVALC,INVALC,0x306E,INVALC,INVALC,0x5E70,INVALC,INVALC,
-	INVALC,INVALC,0x5E64,INVALC,INVALC,INVALC,INVALC,0x5E6A,
-	INVALC,INVALC,0x5E6C,INVALC,INVALC,INVALC,0x4D4F,0x5E67,
-	INVALC,INVALC,0x452E,INVALC,INVALC,0x5E69,INVALC,INVALC,
-	INVALC,INVALC,0x5E71,INVALC,0x5E6B,0x4C47,INVALC,INVALC,
-	INVALC,0x5E66,INVALC,0x3C22,0x5E7E,INVALC,INVALC,INVALC,
-	INVALC,0x336A,INVALC,0x5E68,0x5E6D,0x5E6E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x426C,0x425A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E76,INVALC,INVALC,0x5E7C,
-	INVALC,INVALC,0x5E7A,INVALC,0x4529,INVALC,INVALC,0x5F23,
-	0x5E77,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E78,0x5E60,
-	/* Block 112, Array index 0x2C00 */
-	INVALC,0x3579,0x493A,INVALC,INVALC,INVALC,0x3C3F,INVALC,
-	INVALC,0x3977,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F33,
-	INVALC,0x5E74,INVALC,0x5F22,0x3169,0x4166,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4779,INVALC,0x3441,0x4E7A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4C21,0x4452,INVALC,INVALC,INVALC,
-	INVALC,0x5E7B,0x5E7D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4132,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F21,0x5E79,
-	INVALC,0x5E73,INVALC,INVALC,INVALC,0x3443,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3769,INVALC,INVALC,INVALC,
-	0x5F2F,INVALC,INVALC,0x5F2A,0x4078,INVALC,INVALC,0x3363,
-	INVALC,INVALC,INVALC,INVALC,0x3D61,INVALC,0x5F33,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F2C,0x442C,0x5F29,
-	0x4459,INVALC,INVALC,INVALC,0x5F4C,INVALC,INVALC,INVALC,
-	0x5F26,INVALC,0x5F25,INVALC,0x5F2E,INVALC,INVALC,INVALC,
-	0x5F28,0x5F27,0x5F2D,INVALC,0x4021,INVALC,0x5F24,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F30,INVALC,
-	INVALC,0x5F31,INVALC,INVALC,INVALC,INVALC,INVALC,0x3442,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F36,INVALC,0x5F35,0x5F37,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5F3A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4543,INVALC,0x5F34,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F38,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3763,0x4279,0x5F32,0x473B,INVALC,INVALC,0x5F39,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5F3E,0x5F3C,INVALC,INVALC,
-	0x5F3F,INVALC,INVALC,0x5F42,INVALC,INVALC,INVALC,0x5F3B,
-	0x396A,0x4728,INVALC,INVALC,0x5E39,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4D74,0x5F3D,INVALC,0x5F41,0x4275,
-	INVALC,0x5F40,INVALC,0x5F2B,INVALC,INVALC,0x6F69,INVALC,
-	INVALC,INVALC,0x5F45,INVALC,INVALC,INVALC,0x5F49,INVALC,
-	/* Block 113, Array index 0x2D00 */
-	INVALC,0x5F47,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F43,INVALC,0x5F44,INVALC,INVALC,INVALC,0x5F48,
-	INVALC,0x5F46,INVALC,INVALC,INVALC,0x494E,INVALC,INVALC,
-	0x5F4E,INVALC,0x5F4B,0x5F4A,INVALC,0x5F4D,0x4654,0x5F4F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4375,0x426D,
-	INVALC,INVALC,INVALC,INVALC,0x4025,INVALC,INVALC,INVALC,
-	0x5F50,INVALC,0x5F52,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F51,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E75,INVALC,INVALC,INVALC,
-	INVALC,0x5F53,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4667,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5F54,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3250,INVALC,INVALC,INVALC,0x4574,
-	0x3325,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3564,INVALC,INVALC,INVALC,0x3C5E,0x3A52,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F27,0x3F66,INVALC,INVALC,INVALC,0x316A,INVALC,
-	INVALC,INVALC,0x5F56,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F55,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5F59,0x433A,0x5F5C,0x5F57,
-	INVALC,INVALC,INVALC,0x5F5B,INVALC,INVALC,INVALC,INVALC,
-	0x5F5A,0x4540,0x3059,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4E75,INVALC,INVALC,0x5F5E,INVALC,INVALC,INVALC,0x3128,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F60,INVALC,INVALC,INVALC,0x5F5F,INVALC,0x5F5D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F58,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4B23,INVALC,INVALC,INVALC,0x5F62,INVALC,INVALC,
-	/* Block 114, Array index 0x2E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F61,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x316B,INVALC,INVALC,INVALC,
-	INVALC,0x5F64,0x4A32,INVALC,0x5F63,INVALC,INVALC,INVALC,
-	INVALC,0x4C35,INVALC,INVALC,INVALC,INVALC,0x3E47,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4133,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E46,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E7B,INVALC,INVALC,0x5F6A,INVALC,0x4079,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F66,0x5F6B,INVALC,
-	INVALC,0x316C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5F69,INVALC,0x4761,0x5F65,0x5F68,0x3E48,
-	INVALC,0x4851,INVALC,INVALC,0x5F6C,INVALC,0x3C51,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x407A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5F6F,INVALC,INVALC,INVALC,
-	0x5F67,INVALC,0x3727,INVALC,INVALC,INVALC,INVALC,0x5F6D,
-	INVALC,INVALC,INVALC,INVALC,0x4D50,0x5F70,INVALC,INVALC,
-	INVALC,0x7426,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D4F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F71,INVALC,INVALC,INVALC,0x5F72,INVALC,INVALC,INVALC,
-	INVALC,0x472E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F74,INVALC,INVALC,INVALC,INVALC,0x5F75,INVALC,
-	INVALC,INVALC,INVALC,0x4733,INVALC,INVALC,INVALC,INVALC,
-	0x4575,0x5F77,INVALC,INVALC,INVALC,INVALC,0x5F79,INVALC,
-	0x4E55,INVALC,0x5F76,INVALC,0x5F78,0x316D,INVALC,0x5F73,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x535B,
-	0x5F7A,INVALC,INVALC,INVALC,INVALC,0x4167,0x3B38,0x5F7C,
-	INVALC,INVALC,INVALC,INVALC,0x5F7B,0x3F24,0x5259,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F7D,INVALC,INVALC,
-	INVALC,0x6021,INVALC,0x5F6E,0x5F7E,INVALC,INVALC,0x6022,
-	/* Block 115, Array index 0x2F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x477A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6023,INVALC,INVALC,
-	0x6024,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6025,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6026,INVALC,0x445E,INVALC,0x6028,0x6027,INVALC,INVALC,
-	0x6029,INVALC,0x602A,INVALC,INVALC,0x3C5F,0x4963,INVALC,
-	INVALC,INVALC,0x4C6C,0x602B,0x602C,0x4156,0x3C24,0x602D,
-	0x602E,INVALC,INVALC,INVALC,INVALC,INVALC,0x602F,0x4A52,
-	0x4847,INVALC,INVALC,0x6030,0x4757,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x442D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6031,0x3267,INVALC,0x356D,INVALC,0x4C46,INVALC,0x4C36,
-	INVALC,0x3234,0x4F34,INVALC,INVALC,INVALC,INVALC,0x4B52,
-	INVALC,0x4A2A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4037,INVALC,0x6032,INVALC,INVALC,INVALC,
-	INVALC,0x4643,INVALC,INVALC,INVALC,0x3823,0x6033,INVALC,
-	0x3A54,0x6035,0x6034,INVALC,INVALC,INVALC,INVALC,0x6036,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6037,INVALC,INVALC,INVALC,0x6038,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x353E,INVALC,0x6039,INVALC,INVALC,INVALC,INVALC,0x603A,
-	INVALC,INVALC,INVALC,INVALC,0x3824,INVALC,INVALC,0x4848,
-	INVALC,INVALC,0x603C,INVALC,INVALC,INVALC,0x3E75,INVALC,
-	INVALC,0x603B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3638,0x603D,0x603F,INVALC,0x603E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6040,INVALC,
-	0x3851,INVALC,0x6041,INVALC,INVALC,INVALC,INVALC,0x3669,
-	INVALC,0x4140,INVALC,0x397D,INVALC,INVALC,INVALC,INVALC,
-	0x6043,0x6044,0x6042,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3C6D,INVALC,INVALC,0x4648,0x3639,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6046,
-	0x432C,0x6045,INVALC,INVALC,0x4F35,0x4762,INVALC,INVALC,
-	/* Block 116, Array index 0x3000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6049,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x604B,0x6048,
-	INVALC,INVALC,INVALC,0x4C54,0x604A,0x604C,INVALC,0x4E44,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6050,INVALC,INVALC,
-	INVALC,0x604F,0x4376,0x472D,INVALC,INVALC,0x3825,0x604E,
-	INVALC,INVALC,INVALC,INVALC,0x604D,INVALC,0x4D31,0x4D32,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6051,0x316E,
-	INVALC,INVALC,INVALC,INVALC,0x3976,0x3B62,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6052,0x6053,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6055,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3D43,INVALC,INVALC,INVALC,INVALC,
-	0x6057,INVALC,0x6056,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6058,INVALC,0x334D,INVALC,INVALC,0x605A,INVALC,INVALC,
-	0x6059,INVALC,0x605C,0x605B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x383C,INVALC,INVALC,0x4E28,
-	INVALC,0x364C,INVALC,0x3226,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x366A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3461,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4E68,0x605E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6060,INVALC,INVALC,INVALC,INVALC,
-	0x6061,INVALC,0x3251,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x605D,INVALC,0x3B39,INVALC,INVALC,0x4441,0x605F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6064,INVALC,
-	0x3C6E,INVALC,INVALC,INVALC,INVALC,0x6062,INVALC,INVALC,
-	INVALC,INVALC,0x373E,INVALC,INVALC,0x4849,0x6063,INVALC,
-	INVALC,0x607E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6069,INVALC,INVALC,INVALC,INVALC,INVALC,0x383D,INVALC,
-	/* Block 117, Array index 0x3100 */
-	INVALC,INVALC,INVALC,0x3565,INVALC,0x6066,0x4D7D,INVALC,
-	INVALC,0x4E30,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4276,INVALC,INVALC,0x6068,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x606A,0x4E56,0x3657,0x487C,0x474A,INVALC,
-	INVALC,INVALC,0x606B,INVALC,INVALC,INVALC,INVALC,0x606D,
-	INVALC,0x6070,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x606C,INVALC,INVALC,
-	INVALC,0x606F,0x386A,0x314D,0x6071,INVALC,0x3F70,0x606E,
-	0x4E5C,INVALC,INVALC,0x6074,0x7424,INVALC,INVALC,INVALC,
-	INVALC,0x6072,0x6075,INVALC,INVALC,INVALC,INVALC,0x6067,
-	0x6073,INVALC,INVALC,0x3A3C,INVALC,INVALC,0x6076,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6077,INVALC,
-	INVALC,INVALC,INVALC,0x4D7E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6078,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6079,INVALC,
-	INVALC,INVALC,0x6065,INVALC,INVALC,INVALC,INVALC,0x607A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3444,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3C25,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x607B,INVALC,INVALC,INVALC,INVALC,0x607C,
-	INVALC,INVALC,INVALC,INVALC,0x607D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x313B,INVALC,INVALC,INVALC,
-	0x6121,INVALC,0x493B,0x6122,INVALC,INVALC,0x3424,0x6123,
-	INVALC,0x6124,INVALC,INVALC,INVALC,INVALC,0x6125,INVALC,
-	0x6127,0x6128,0x6126,INVALC,INVALC,INVALC,0x4953,0x612A,
-	0x6129,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 118, Array index 0x3200 */
-	INVALC,INVALC,INVALC,0x612C,0x612B,0x612D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x612E,0x6130,0x612F,INVALC,
-	INVALC,0x3979,INVALC,0x6132,INVALC,0x6131,INVALC,INVALC,
-	0x3445,INVALC,0x3F53,INVALC,0x453C,INVALC,0x6133,0x4038,
-	INVALC,INVALC,INVALC,0x3B3A,INVALC,0x3179,0x6134,INVALC,
-	0x4D51,INVALC,INVALC,0x4A63,0x6135,INVALC,INVALC,INVALC,
-	0x4544,0x4D33,0x3943,0x3F3D,INVALC,INVALC,INVALC,0x434B,
-	0x5234,INVALC,0x442E,0x3268,0x6136,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6137,INVALC,0x613C,INVALC,
-	INVALC,0x613A,0x6139,0x5A42,0x3326,0x6138,INVALC,0x305A,
-	INVALC,0x482A,INVALC,INVALC,0x484A,INVALC,INVALC,INVALC,
-	INVALC,0x4E31,0x613D,0x613B,0x435C,0x4026,INVALC,INVALC,
-	0x482B,INVALC,0x492D,INVALC,0x613F,0x4E2C,0x374D,0x6140,
-	INVALC,0x613E,0x4856,0x6141,INVALC,0x6142,INVALC,INVALC,
-	0x305B,INVALC,INVALC,0x3E76,0x6147,INVALC,0x6144,0x466D,
-	0x6143,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3526,
-	INVALC,INVALC,0x614A,INVALC,INVALC,INVALC,0x6145,0x6146,
-	INVALC,0x6149,0x6148,0x4925,INVALC,INVALC,0x4142,0x4141,
-	INVALC,0x353F,INVALC,INVALC,0x614B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x614C,INVALC,INVALC,0x614D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x614F,INVALC,0x614E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3156,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6157,0x4868,0x6151,INVALC,0x6153,INVALC,INVALC,
-	0x6155,0x3F3E,INVALC,INVALC,0x6156,0x6154,0x3C40,INVALC,
-	INVALC,INVALC,0x6150,0x6152,INVALC,0x4942,INVALC,0x3E49,
-	INVALC,INVALC,0x6159,INVALC,INVALC,0x6158,INVALC,INVALC,
-	INVALC,INVALC,0x615A,INVALC,0x3C26,0x3A2F,INVALC,INVALC,
-	0x4577,0x615B,INVALC,0x444B,INVALC,INVALC,0x615D,INVALC,
-	INVALC,INVALC,0x4E21,0x615C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4169,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6162,INVALC,0x6164,0x6165,0x4354,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6163,INVALC,0x6160,INVALC,0x615E,0x615F,
-	/* Block 119, Array index 0x3300 */
-	INVALC,0x6161,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6168,INVALC,0x6166,INVALC,0x6167,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6169,
-	0x616B,0x616C,0x616D,INVALC,0x616E,INVALC,INVALC,0x616A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6170,INVALC,INVALC,INVALC,0x616F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6171,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4E45,INVALC,INVALC,INVALC,0x6174,0x6172,
-	0x6173,INVALC,INVALC,INVALC,0x3462,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C7E,INVALC,INVALC,INVALC,0x4A4A,INVALC,
-	0x6176,INVALC,INVALC,INVALC,0x6175,INVALC,INVALC,INVALC,
-	INVALC,0x6177,0x6178,INVALC,INVALC,INVALC,INVALC,0x617C,
-	0x6179,0x617A,0x617B,INVALC,0x617D,INVALC,INVALC,INVALC,
-	0x617E,INVALC,0x6221,INVALC,INVALC,INVALC,0x6222,INVALC,
-	0x6223,INVALC,0x482F,0x4550,0x6224,0x4772,0x4934,INVALC,
-	0x6225,INVALC,INVALC,0x6226,0x452A,INVALC,0x3327,0x3944,
-	0x6227,INVALC,INVALC,0x6228,INVALC,INVALC,0x6229,INVALC,
-	0x3B29,INVALC,INVALC,0x622B,INVALC,INVALC,0x622A,INVALC,
-	INVALC,0x622C,0x622D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4869,INVALC,
-	0x622E,INVALC,INVALC,INVALC,0x622F,INVALC,INVALC,0x7369,
-	0x6230,0x6231,0x6232,INVALC,INVALC,INVALC,INVALC,0x3B2E,
-	INVALC,INVALC,0x6233,0x4756,INVALC,INVALC,0x4B5F,INVALC,
-	0x314E,INVALC,0x3157,INVALC,INVALC,0x6234,INVALC,INVALC,
-	INVALC,INVALC,0x6236,INVALC,INVALC,INVALC,0x6235,0x4570,
-	INVALC,INVALC,INVALC,0x4039,0x5D39,INVALC,0x6237,0x4C41,
-	INVALC,0x6238,INVALC,0x3446,0x4857,0x6239,INVALC,0x623A,
-	INVALC,INVALC,0x623B,INVALC,INVALC,INVALC,0x4C5C,INVALC,
-	INVALC,INVALC,0x4C55,INVALC,0x443E,INVALC,INVALC,INVALC,
-	0x416A,INVALC,INVALC,0x623D,INVALC,INVALC,0x3D62,INVALC,
-	/* Block 120, Array index 0x3400 */
-	INVALC,0x3E4A,INVALC,INVALC,0x6240,INVALC,INVALC,0x623F,
-	0x623E,0x487D,INVALC,0x3447,0x3829,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6246,INVALC,INVALC,0x6243,0x3F3F,
-	0x4C32,INVALC,INVALC,INVALC,0x6242,0x6244,0x6245,INVALC,
-	INVALC,0x6241,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6247,
-	0x6248,INVALC,0x442F,INVALC,0x3463,INVALC,INVALC,INVALC,
-	0x4365,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6249,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x624A,0x624D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3F67,INVALC,0x4644,INVALC,0x624E,0x4B53,INVALC,
-	0x624B,INVALC,INVALC,0x624C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6251,INVALC,INVALC,INVALC,INVALC,0x6250,0x624F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6253,INVALC,INVALC,0x6252,INVALC,
-	INVALC,0x6254,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6256,INVALC,
-	0x6255,INVALC,INVALC,INVALC,INVALC,0x4A4D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D56,0x4E46,INVALC,INVALC,
-	0x6257,INVALC,INVALC,0x4637,INVALC,INVALC,0x6258,INVALC,
-	INVALC,0x6259,INVALC,0x625D,0x625B,0x625C,INVALC,0x625A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x625E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x625F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6260,
-	INVALC,INVALC,0x6261,0x4C37,0x6262,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C70,0x6263,INVALC,0x434E,INVALC,0x476A,
-	INVALC,0x366B,INVALC,INVALC,INVALC,0x433B,0x6264,0x363A,
-	INVALC,INVALC,INVALC,0x4050,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6265,INVALC,INVALC,INVALC,
-	/* Block 121, Array index 0x3500 */
-	INVALC,INVALC,0x3A3D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6266,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6267,INVALC,0x3826,0x3A55,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6269,INVALC,INVALC,INVALC,INVALC,0x4556,0x3A56,0x354E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B24,INVALC,0x474B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4557,INVALC,INVALC,INVALC,INVALC,0x395C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x626B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3E4B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E32,0x3945,INVALC,INVALC,0x3827,
-	INVALC,INVALC,0x4823,INVALC,0x626D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x626F,INVALC,INVALC,INVALC,
-	INVALC,0x386B,INVALC,INVALC,INVALC,INVALC,0x626E,0x4476,
-	INVALC,INVALC,INVALC,INVALC,0x6271,0x3337,0x626C,INVALC,
-	INVALC,0x486A,INVALC,0x3130,INVALC,0x3A6C,INVALC,0x4F52,
-	INVALC,INVALC,0x6270,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6272,INVALC,INVALC,INVALC,0x4A4B,
-	INVALC,0x4059,0x6274,INVALC,INVALC,INVALC,INVALC,0x6275,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6273,INVALC,INVALC,
-	INVALC,INVALC,0x334E,INVALC,0x627B,INVALC,0x627A,INVALC,
-	INVALC,0x3C27,INVALC,INVALC,INVALC,0x627C,0x6277,INVALC,
-	INVALC,INVALC,0x627D,0x6278,INVALC,INVALC,INVALC,INVALC,
-	0x4858,0x6276,INVALC,INVALC,0x6279,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6322,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6321,
-	0x4B61,INVALC,INVALC,INVALC,0x627E,INVALC,INVALC,0x306B,
-	INVALC,INVALC,INVALC,INVALC,0x6324,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6323,INVALC,INVALC,
-	/* Block 122, Array index 0x3600 */
-	INVALC,0x3E4C,INVALC,INVALC,INVALC,INVALC,INVALC,0x6325,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4143,INVALC,
-	INVALC,0x6327,0x6326,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6328,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6268,INVALC,
-	INVALC,INVALC,0x626A,0x632A,0x6329,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3C28,INVALC,0x4E69,INVALC,0x3C52,INVALC,
-	0x632B,0x3737,INVALC,INVALC,INVALC,INVALC,INVALC,0x3540,
-	0x3527,0x3B63,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4D34,INVALC,INVALC,0x6331,INVALC,0x6330,0x4144,0x632D,
-	INVALC,INVALC,0x632F,INVALC,INVALC,0x3D4B,0x3F40,0x632E,
-	0x632C,INVALC,0x472A,INVALC,INVALC,0x3E4D,INVALC,INVALC,
-	0x493C,INVALC,INVALC,INVALC,INVALC,0x3A57,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4578,
-	INVALC,INVALC,0x6332,INVALC,INVALC,INVALC,INVALC,0x6333,
-	0x6349,0x3658,INVALC,INVALC,0x4F3D,0x4135,INVALC,INVALC,
-	INVALC,INVALC,0x6334,INVALC,INVALC,0x3252,0x4477,0x4A21,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6335,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x357A,0x6336,
-	INVALC,INVALC,0x6338,INVALC,INVALC,INVALC,0x6339,INVALC,
-	0x4729,INVALC,INVALC,0x633A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x633B,0x633C,INVALC,INVALC,0x3659,0x3253,0x4645,
-	0x3D28,0x3B64,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x633D,INVALC,0x3D29,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x324A,0x4943,INVALC,INVALC,0x633E,INVALC,INVALC,
-	0x486B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4145,
-	INVALC,0x6341,INVALC,0x6342,0x4769,INVALC,0x3F41,0x633F,
-	INVALC,0x4361,INVALC,INVALC,0x6340,INVALC,INVALC,INVALC,
-	0x3E4E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x305C,INVALC,INVALC,INVALC,INVALC,
-	/* Block 123, Array index 0x3700 */
-	0x3529,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6343,INVALC,INVALC,0x4478,INVALC,0x6344,0x4047,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4C2D,INVALC,INVALC,0x4923,
-	0x6345,0x6346,0x4355,INVALC,0x4E47,INVALC,INVALC,0x6348,
-	0x6347,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C6F,INVALC,
-	INVALC,0x634A,0x3070,INVALC,INVALC,INVALC,INVALC,0x634D,
-	INVALC,INVALC,INVALC,0x634B,0x3254,0x374E,0x634C,0x3946,
-	0x3972,INVALC,0x4A66,0x634E,INVALC,INVALC,0x4B54,INVALC,
-	INVALC,0x6350,INVALC,INVALC,INVALC,0x4051,0x314F,0x323A,
-	0x302C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x634F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6351,0x6352,0x3E77,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6353,INVALC,0x334F,INVALC,INVALC,INVALC,INVALC,
-	0x6355,INVALC,INVALC,INVALC,0x376A,INVALC,0x3566,INVALC,
-	INVALC,0x6356,0x3675,INVALC,INVALC,0x6357,INVALC,0x407C,
-	INVALC,0x464D,INVALC,0x4060,0x3A75,INVALC,INVALC,INVALC,
-	0x6358,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4362,0x416B,INVALC,0x635A,0x635C,0x6359,
-	0x635B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3722,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x635D,0x3726,INVALC,INVALC,INVALC,0x3567,0x4D52,
-	0x635F,INVALC,INVALC,INVALC,INVALC,INVALC,0x6360,INVALC,
-	INVALC,INVALC,0x312E,INVALC,INVALC,INVALC,INVALC,0x6363,
-	INVALC,INVALC,INVALC,0x3376,0x6362,0x6361,INVALC,0x6365,
-	0x635E,INVALC,0x6366,0x4E29,INVALC,0x6367,INVALC,0x6368,
-	INVALC,INVALC,0x5474,0x636A,INVALC,0x6369,INVALC,INVALC,
-	INVALC,0x636B,0x636C,INVALC,0x4E35,0x636D,INVALC,0x706F,
-	0x3E4F,0x636E,0x636F,0x3D57,INVALC,0x4638,0x6370,INVALC,
-	INVALC,INVALC,0x4328,INVALC,INVALC,0x6371,INVALC,0x433C,
-	0x6372,INVALC,INVALC,INVALC,INVALC,INVALC,0x3625,INVALC,
-	0x513F,0x435D,0x3C33,INVALC,INVALC,INVALC,INVALC,0x3448,
-	/* Block 124, Array index 0x3800 */
-	INVALC,INVALC,0x6373,INVALC,0x6422,INVALC,0x6376,INVALC,
-	0x3568,INVALC,0x6375,0x6424,INVALC,INVALC,INVALC,0x6374,
-	INVALC,0x3E50,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6378,0x6379,INVALC,0x452B,INVALC,INVALC,0x637A,INVALC,
-	0x335E,INVALC,INVALC,INVALC,INVALC,0x3F5A,0x4964,INVALC,
-	0x637C,INVALC,INVALC,INVALC,0x4268,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6377,INVALC,0x637B,0x637D,INVALC,
-	INVALC,0x3A7B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6426,0x492E,INVALC,
-	0x4826,0x4579,INVALC,0x365A,0x6425,0x6423,INVALC,0x4835,
-	0x637E,0x435E,0x457B,INVALC,0x457A,INVALC,0x3A76,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6438,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6428,INVALC,0x642A,
-	INVALC,INVALC,INVALC,INVALC,0x642D,INVALC,0x642E,INVALC,
-	0x642B,0x642C,INVALC,INVALC,0x6429,0x6427,INVALC,INVALC,
-	INVALC,INVALC,0x6421,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A4F,0x3255,
-	INVALC,INVALC,INVALC,0x6435,INVALC,0x6432,INVALC,0x6437,
-	INVALC,INVALC,0x6436,INVALC,0x4773,0x4C27,INVALC,0x3B3B,
-	0x6430,0x6439,0x6434,INVALC,0x6433,0x642F,INVALC,0x6431,
-	INVALC,0x3449,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x433D,INVALC,INVALC,0x407D,INVALC,INVALC,
-	INVALC,0x4822,INVALC,INVALC,0x643E,INVALC,INVALC,INVALC,
-	0x4824,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4061,0x643B,INVALC,INVALC,0x484F,INVALC,0x643F,0x4A53,
-	INVALC,0x435B,INVALC,0x643A,0x643C,INVALC,INVALC,0x643D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6440,INVALC,INVALC,
-	0x3C44,INVALC,INVALC,INVALC,0x4646,0x6445,0x6444,INVALC,
-	INVALC,0x6441,INVALC,INVALC,INVALC,0x4F36,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x644A,INVALC,INVALC,0x644E,0x644B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 125, Array index 0x3900 */
-	0x6447,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6448,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x644D,INVALC,INVALC,
-	INVALC,0x6442,0x5255,0x6449,0x6443,INVALC,INVALC,0x644C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6452,
-	INVALC,0x344A,INVALC,0x644F,INVALC,INVALC,INVALC,0x6450,
-	INVALC,INVALC,0x6451,0x6454,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6453,
-	0x4876,INVALC,INVALC,INVALC,INVALC,0x6455,0x4E7C,0x4A6D,
-	0x645A,INVALC,INVALC,0x6457,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6456,0x4052,INVALC,0x6459,
-	0x645B,INVALC,INVALC,INVALC,0x6458,INVALC,0x645F,INVALC,
-	0x645C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x645D,
-	0x6446,INVALC,INVALC,INVALC,0x645E,0x6460,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6461,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A46,INVALC,0x6462,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C62,INVALC,
-	INVALC,0x364E,0x3729,0x6463,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A34,INVALC,0x3F68,INVALC,0x4C30,INVALC,INVALC,
-	0x6464,INVALC,0x4E33,INVALC,INVALC,0x4774,INVALC,0x4146,
-	0x4734,INVALC,INVALC,0x3D4D,INVALC,INVALC,INVALC,0x3040,
-	INVALC,0x6469,0x6467,INVALC,0x6465,0x3421,INVALC,0x3E51,
-	0x646A,INVALC,INVALC,0x6468,INVALC,0x6466,0x646E,INVALC,
-	INVALC,0x646D,0x646C,0x646B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x646F,INVALC,INVALC,INVALC,0x6470,0x403A,INVALC,
-	0x6471,INVALC,0x6473,INVALC,INVALC,0x6472,INVALC,INVALC,
-	INVALC,INVALC,0x3852,INVALC,INVALC,INVALC,0x4138,INVALC,
-	INVALC,INVALC,0x6475,INVALC,INVALC,INVALC,0x457C,INVALC,
-	0x6474,INVALC,INVALC,INVALC,0x6476,INVALC,0x4A35,0x416C,
-	0x3947,INVALC,0x6477,INVALC,INVALC,INVALC,INVALC,0x4E48,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6479,
-	INVALC,INVALC,0x647A,INVALC,0x647B,INVALC,0x647C,INVALC,
-	0x3B65,INVALC,0x647D,0x374F,INVALC,INVALC,0x356A,INVALC,
-	/* Block 126, Array index 0x3A00 */
-	0x352A,INVALC,0x6521,INVALC,0x4C73,0x3948,0x647E,INVALC,
-	INVALC,INVALC,0x6524,0x4C66,INVALC,0x473C,INVALC,INVALC,
-	0x4933,INVALC,INVALC,INVALC,0x3D63,0x6523,INVALC,0x3C53,
-	0x3949,0x3B66,0x3569,0x4A36,0x6522,INVALC,INVALC,INVALC,
-	0x4147,0x4B42,0x3A77,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3B67,0x445D,INVALC,0x6527,0x4E5F,
-	0x3A59,INVALC,0x6528,0x3F42,INVALC,0x652A,INVALC,INVALC,
-	INVALC,0x3E52,0x3A30,INVALC,INVALC,INVALC,INVALC,0x6529,
-	INVALC,INVALC,0x3D2A,0x383E,0x4148,0x6525,0x652B,INVALC,
-	INVALC,INVALC,INVALC,0x6526,0x3750,INVALC,0x652E,0x6532,
-	0x376B,INVALC,INVALC,INVALC,INVALC,INVALC,0x652D,INVALC,
-	INVALC,INVALC,INVALC,0x6536,INVALC,INVALC,0x394A,INVALC,
-	INVALC,0x4D6D,0x303C,0x6533,INVALC,INVALC,0x356B,INVALC,
-	0x6530,INVALC,INVALC,INVALC,INVALC,INVALC,0x6531,INVALC,
-	INVALC,0x457D,0x652F,0x652C,INVALC,0x3328,0x4064,INVALC,
-	INVALC,0x3828,INVALC,INVALC,INVALC,0x6538,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6535,INVALC,INVALC,INVALC,INVALC,INVALC,0x6537,
-	INVALC,INVALC,INVALC,0x6534,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3751,0x4233,0x6539,0x416E,INVALC,INVALC,0x6546,
-	INVALC,INVALC,0x6542,0x653C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6540,0x3C7A,0x305D,0x653B,0x6543,
-	0x6547,0x394B,0x4C56,INVALC,0x4456,0x653D,INVALC,INVALC,
-	0x6545,INVALC,0x653A,0x433E,INVALC,0x653F,0x303D,0x4C4A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x653E,
-	INVALC,INVALC,0x365B,0x486C,INVALC,INVALC,INVALC,0x416D,
-	INVALC,0x4E50,0x3D6F,INVALC,INVALC,0x656E,INVALC,INVALC,
-	0x6548,INVALC,0x407E,INVALC,0x6544,0x6549,0x654B,INVALC,
-	0x4479,0x654E,INVALC,INVALC,0x654A,INVALC,INVALC,INVALC,
-	0x4A54,0x344B,INVALC,INVALC,0x4C4B,INVALC,INVALC,0x305E,
-	INVALC,INVALC,0x654D,INVALC,0x4E7D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x654C,INVALC,INVALC,INVALC,INVALC,
-	/* Block 127, Array index 0x3B00 */
-	INVALC,0x316F,INVALC,INVALC,0x466C,0x654F,INVALC,INVALC,
-	INVALC,0x6556,0x6550,0x6557,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6553,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x477B,INVALC,INVALC,0x3C4A,0x6555,
-	INVALC,0x6552,0x6558,0x6551,INVALC,INVALC,0x3D44,INVALC,
-	INVALC,INVALC,INVALC,0x4B25,INVALC,INVALC,0x3D4C,INVALC,
-	INVALC,0x6554,0x6560,INVALC,INVALC,0x655C,INVALC,0x655F,
-	INVALC,0x655D,0x6561,0x655B,INVALC,0x6541,0x4053,INVALC,
-	INVALC,0x484B,INVALC,0x655E,INVALC,INVALC,0x6559,INVALC,
-	INVALC,INVALC,0x4121,0x3752,INVALC,0x3D2B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F25,0x4136,0x6564,INVALC,
-	INVALC,0x6566,0x6567,INVALC,INVALC,0x6563,0x6565,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x655A,0x6562,
-	INVALC,0x656A,0x6569,INVALC,INVALC,0x4B7A,INVALC,INVALC,
-	0x372B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6568,INVALC,0x656C,0x656B,0x656F,INVALC,0x6571,
-	INVALC,INVALC,0x3B3C,0x656D,INVALC,INVALC,INVALC,INVALC,
-	0x6572,0x6573,INVALC,INVALC,0x6574,INVALC,0x657A,0x453B,
-	0x6576,INVALC,0x6575,0x6577,0x6578,INVALC,0x6579,INVALC,
-	INVALC,INVALC,INVALC,0x657B,0x657C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 128, Array index 0x3C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x344C,INVALC,
-	0x657D,INVALC,0x657E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6621,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6622,0x6623,0x6624,INVALC,
-	0x6625,0x6626,INVALC,INVALC,0x6628,0x6627,INVALC,INVALC,
-	0x6629,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x662A,
-	0x662B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x662E,
-	0x662C,0x662D,0x3A61,0x3753,INVALC,INVALC,0x4356,INVALC,
-	0x4833,INVALC,0x3D70,INVALC,INVALC,0x474D,INVALC,0x486D,
-	0x662F,0x586D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6630,0x6632,INVALC,0x4D65,0x6631,0x6634,
-	0x6633,INVALC,0x4D53,INVALC,0x6635,INVALC,0x487E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6636,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6639,INVALC,INVALC,0x6638,0x6637,INVALC,
-	INVALC,INVALC,INVALC,0x663A,0x3732,INVALC,INVALC,INVALC,
-	0x4122,0x3541,INVALC,INVALC,INVALC,INVALC,0x663E,0x663B,
-	INVALC,INVALC,0x663C,INVALC,INVALC,INVALC,0x663F,INVALC,
-	0x6640,0x663D,INVALC,INVALC,INVALC,0x3129,INVALC,INVALC,
-	INVALC,0x3227,INVALC,INVALC,INVALC,0x6642,0x6643,INVALC,
-	INVALC,INVALC,0x6644,INVALC,0x4D62,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3D2C,INVALC,0x6646,0x6645,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3F69,0x6647,INVALC,INVALC,INVALC,INVALC,0x6648,INVALC,
-	INVALC,0x6649,INVALC,0x3465,INVALC,INVALC,INVALC,INVALC,
-	0x344D,INVALC,INVALC,0x664A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x664B,INVALC,0x4B5D,0x4D63,INVALC,INVALC,INVALC,
-	/* Block 129, Array index 0x3D00 */
-	0x4D54,0x4F37,INVALC,0x394D,0x664E,0x3C54,0x664D,INVALC,
-	INVALC,INVALC,INVALC,0x664F,0x3C29,INVALC,INVALC,INVALC,
-	0x4251,INVALC,0x6650,INVALC,INVALC,0x394C,INVALC,0x4C57,
-	0x6651,0x6652,INVALC,INVALC,0x6653,INVALC,INVALC,INVALC,
-	INVALC,0x6654,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6655,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3C2A,INVALC,INVALC,0x4C6D,INVALC,
-	INVALC,INVALC,INVALC,0x6657,INVALC,0x433F,INVALC,0x6656,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6659,INVALC,
-	INVALC,INVALC,0x6658,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x665A,INVALC,INVALC,INVALC,0x403B,INVALC,
-	0x665B,INVALC,0x665C,INVALC,INVALC,INVALC,0x4A39,0x665D,
-	INVALC,0x416F,0x665E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x665F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E7E,
-	0x6662,INVALC,0x6661,0x6660,0x4430,INVALC,0x6663,0x3F26,
-	INVALC,0x6664,INVALC,INVALC,INVALC,0x6665,0x4F38,0x6666,
-	INVALC,INVALC,INVALC,INVALC,0x6667,0x6669,0x6668,0x4825,
-	INVALC,0x4679,INVALC,0x4F3E,0x4829,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x666B,INVALC,INVALC,0x3E53,INVALC,
-	0x492A,INVALC,0x666C,0x666A,INVALC,0x344E,INVALC,INVALC,
-	INVALC,0x3854,0x3B68,INVALC,INVALC,0x486E,INVALC,INVALC,
-	INVALC,0x382A,0x4B43,INVALC,0x666F,0x666D,INVALC,0x394E,
-	INVALC,0x394F,0x3069,INVALC,0x3A68,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4759,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x305F,0x6674,INVALC,0x4340,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4758,INVALC,0x425B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6676,INVALC,
-	INVALC,0x6672,0x6675,0x6670,INVALC,0x6673,0x4B26,INVALC,
-	INVALC,0x3855,INVALC,INVALC,0x307D,0x6671,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6678,
-	INVALC,0x6679,INVALC,INVALC,0x4639,INVALC,INVALC,INVALC,
-	0x363B,INVALC,INVALC,INVALC,0x6726,0x473D,INVALC,INVALC,
-	/* Block 130, Array index 0x3E00 */
-	INVALC,INVALC,0x3B69,INVALC,INVALC,0x363C,0x4048,0x4F46,
-	0x4C2E,0x6677,0x4054,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3553,0x667A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x667C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x667B,INVALC,INVALC,INVALC,INVALC,INVALC,0x667D,
-	INVALC,0x4326,INVALC,0x473E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4431,INVALC,INVALC,INVALC,INVALC,0x6723,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6722,INVALC,
-	INVALC,INVALC,INVALC,0x667E,INVALC,INVALC,0x3F55,INVALC,
-	0x4965,0x6725,INVALC,0x6724,0x3950,0x4F53,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6735,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6729,0x672A,INVALC,
-	INVALC,INVALC,INVALC,0x3C70,INVALC,INVALC,0x6728,INVALC,
-	0x3978,0x6727,INVALC,INVALC,0x672B,INVALC,INVALC,INVALC,
-	0x4432,0x4A22,0x4123,INVALC,INVALC,INVALC,INVALC,0x425C,
-	0x672F,INVALC,0x6730,0x672C,INVALC,INVALC,INVALC,INVALC,
-	0x672D,INVALC,0x672E,INVALC,INVALC,INVALC,INVALC,0x3951,
-	INVALC,INVALC,INVALC,0x6736,INVALC,0x6732,INVALC,INVALC,
-	INVALC,INVALC,0x4966,INVALC,0x4B6C,0x4928,INVALC,INVALC,
-	0x6731,INVALC,INVALC,0x6734,0x6733,INVALC,INVALC,INVALC,
-	0x4B44,0x6737,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6738,INVALC,INVALC,0x4137,INVALC,0x6739,INVALC,INVALC,
-	0x673B,INVALC,0x673F,INVALC,INVALC,0x673C,0x673A,0x473F,
-	0x673D,INVALC,0x673E,INVALC,INVALC,INVALC,0x3232,INVALC,
-	0x6745,0x6740,INVALC,INVALC,INVALC,0x6741,INVALC,INVALC,
-	INVALC,0x6742,INVALC,0x4221,INVALC,INVALC,INVALC,INVALC,
-	0x6744,0x6743,0x6746,INVALC,INVALC,INVALC,INVALC,0x6747,
-	0x6748,INVALC,INVALC,0x3F43,INVALC,0x3269,INVALC,0x6749,
-	0x4E57,INVALC,0x3C2B,INVALC,INVALC,0x3D2D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3B6A,0x4357,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x674A,0x674B,0x3131,INVALC,0x674C,INVALC,
-	/* Block 131, Array index 0x3F00 */
-	INVALC,0x674D,0x674E,INVALC,INVALC,0x674F,INVALC,0x6750,
-	0x363D,0x5A2A,0x6751,INVALC,0x4065,0x6752,0x3C4B,INVALC,
-	0x6753,INVALC,0x5030,INVALC,INVALC,INVALC,0x6754,0x4A5E,
-	0x345C,INVALC,INVALC,0x4124,0x3D58,INVALC,0x4971,0x3D2E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6755,0x3952,0x6756,0x484C,INVALC,0x6764,INVALC,
-	INVALC,INVALC,INVALC,0x6758,INVALC,0x4249,0x4775,0x383F,
-	0x6757,0x4125,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6759,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x447A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x675B,0x675A,0x675D,INVALC,INVALC,0x675C,INVALC,0x675E,
-	INVALC,INVALC,0x6760,INVALC,0x675F,INVALC,0x344F,INVALC,
-	0x6761,INVALC,0x6762,0x6763,INVALC,INVALC,0x3A31,0x4E49,
-	INVALC,0x6765,0x3F27,INVALC,INVALC,INVALC,0x3170,0x6766,
-	0x6767,INVALC,INVALC,INVALC,INVALC,INVALC,0x6768,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3072,INVALC,0x6769,INVALC,INVALC,
-	INVALC,INVALC,0x676A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4967,INVALC,INVALC,INVALC,0x3C47,INVALC,0x676C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3329,0x3032,INVALC,
-	INVALC,INVALC,INVALC,0x676B,0x676E,0x474E,INVALC,0x3F44,
-	INVALC,0x3256,INVALC,0x4B27,INVALC,INVALC,INVALC,INVALC,
-	0x375D,0x365C,INVALC,0x676D,INVALC,0x326A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3423,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3171,0x6772,0x4E6A,0x425D,INVALC,INVALC,0x4944,
-	INVALC,0x677E,INVALC,0x3257,0x677C,INVALC,0x677A,0x6771,
-	INVALC,0x676F,INVALC,0x6770,INVALC,0x3C63,0x366C,0x4377,
-	INVALC,INVALC,INVALC,0x4651,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3151,INVALC,0x6774,0x6773,INVALC,INVALC,INVALC,
-	INVALC,0x6779,0x6775,0x6778,INVALC,INVALC,INVALC,INVALC,
-	/* Block 132, Array index 0x4000 */
-	INVALC,INVALC,0x4C50,0x6777,0x3258,0x337D,0x677B,INVALC,
-	INVALC,0x677D,INVALC,INVALC,INVALC,INVALC,0x3754,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6823,0x682C,
-	0x682D,INVALC,INVALC,INVALC,0x302B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6834,INVALC,INVALC,INVALC,INVALC,
-	0x3071,INVALC,INVALC,0x682B,INVALC,INVALC,INVALC,0x682A,
-	INVALC,0x6825,0x6824,INVALC,0x6822,0x6821,0x4363,INVALC,
-	0x427B,0x6827,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6826,INVALC,INVALC,INVALC,INVALC,0x6829,INVALC,INVALC,
-	INVALC,0x4170,0x3755,INVALC,INVALC,INVALC,INVALC,0x3141,
-	0x6828,INVALC,0x3953,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4171,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x683A,INVALC,0x683B,INVALC,0x3259,
-	INVALC,INVALC,INVALC,0x322E,0x6838,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x682E,INVALC,0x6836,
-	INVALC,0x683D,0x6837,INVALC,INVALC,INVALC,0x6835,INVALC,
-	INVALC,INVALC,INVALC,0x6776,INVALC,INVALC,0x6833,INVALC,
-	INVALC,INVALC,0x682F,INVALC,INVALC,INVALC,0x3450,0x6831,
-	0x683C,INVALC,0x6832,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x683E,INVALC,0x6830,0x477C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D69,INVALC,INVALC,INVALC,0x6839,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x684F,INVALC,INVALC,
-	INVALC,0x6847,INVALC,INVALC,INVALC,0x3F7B,INVALC,INVALC,
-	INVALC,INVALC,0x3546,INVALC,0x365D,INVALC,0x6842,INVALC,
-	INVALC,INVALC,INVALC,0x325B,INVALC,INVALC,0x3E54,INVALC,
-	0x6845,INVALC,INVALC,INVALC,0x3A5A,INVALC,INVALC,0x4551,
-	0x684A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A6E,INVALC,0x6841,INVALC,INVALC,INVALC,0x325A,
-	0x3856,0x4929,0x684B,INVALC,0x683F,INVALC,INVALC,0x6848,
-	INVALC,INVALC,INVALC,0x6852,INVALC,0x6843,INVALC,INVALC,
-	/* Block 133, Array index 0x4100 */
-	INVALC,INVALC,INVALC,0x6844,0x463A,INVALC,INVALC,0x6849,
-	INVALC,INVALC,INVALC,0x6846,0x4B28,0x684C,0x3060,INVALC,
-	INVALC,INVALC,INVALC,0x6840,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x684E,INVALC,0x684D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x476B,0x6854,INVALC,0x685F,INVALC,INVALC,INVALC,
-	INVALC,0x337E,INVALC,INVALC,INVALC,0x6862,INVALC,INVALC,
-	0x6850,INVALC,INVALC,INVALC,0x6855,0x4D6E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x685E,INVALC,
-	INVALC,0x4D55,INVALC,INVALC,INVALC,INVALC,0x4E2A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4378,
-	INVALC,INVALC,INVALC,0x336B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4972,0x6864,0x4621,INVALC,INVALC,0x3031,INVALC,
-	INVALC,0x685D,INVALC,0x6859,0x4172,0x6853,0x685B,0x6860,
-	INVALC,0x472C,INVALC,INVALC,INVALC,0x302A,INVALC,0x6858,
-	INVALC,0x6861,0x4978,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x685C,INVALC,0x6857,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3E55,INVALC,INVALC,INVALC,INVALC,
-	0x3D2F,INVALC,INVALC,INVALC,0x3C2C,INVALC,INVALC,INVALC,
-	INVALC,0x4C58,INVALC,INVALC,0x4947,INVALC,INVALC,0x6867,
-	INVALC,0x6870,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x685A,INVALC,INVALC,
-	INVALC,INVALC,0x3377,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E78,0x6865,INVALC,0x686A,0x4173,INVALC,INVALC,0x6866,
-	INVALC,0x686D,INVALC,INVALC,0x435F,INVALC,0x686E,INVALC,
-	INVALC,0x4D56,0x6863,0x3338,INVALC,0x6869,INVALC,INVALC,
-	0x686C,0x4C2C,INVALC,INVALC,INVALC,INVALC,0x686F,INVALC,
-	INVALC,0x6868,0x686B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4B29,INVALC,0x4F21,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6873,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x687A,INVALC,INVALC,0x6872,
-	/* Block 134, Array index 0x4200 */
-	0x3C43,INVALC,INVALC,INVALC,INVALC,INVALC,0x6851,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A4E,INVALC,0x4C22,0x6879,0x6878,INVALC,0x6874,
-	0x6875,INVALC,0x3136,INVALC,INVALC,INVALC,INVALC,0x6877,
-	INVALC,0x6871,INVALC,INVALC,INVALC,INVALC,0x4455,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6876,0x307E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4222,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4A43,INVALC,INVALC,
-	0x687B,0x6921,INVALC,0x4859,INVALC,INVALC,INVALC,INVALC,
-	0x687E,0x3E56,0x3C49,0x6923,INVALC,INVALC,0x363E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6924,INVALC,0x4979,
-	0x687D,INVALC,0x6856,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x687C,INVALC,INVALC,INVALC,INVALC,
-	0x4F4F,0x4622,0x4973,INVALC,INVALC,0x692B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6931,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6932,INVALC,
-	0x6925,INVALC,INVALC,INVALC,0x4776,INVALC,INVALC,0x692F,
-	0x6927,INVALC,0x6929,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6933,0x6928,INVALC,INVALC,0x692C,INVALC,INVALC,0x3172,
-	INVALC,0x4665,INVALC,0x692D,0x6930,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6926,INVALC,0x4126,INVALC,
-	0x692A,0x3B27,0x3F45,0x3730,0x4C74,INVALC,0x4C79,0x3D72,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6937,0x6935,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F4E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6934,INVALC,INVALC,INVALC,0x4D75,INVALC,0x6936,
-	0x6938,INVALC,INVALC,INVALC,INVALC,0x6939,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x693C,0x693A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4623,0x693B,INVALC,INVALC,
-	INVALC,0x484D,0x692E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D73,
-	INVALC,0x693D,0x6942,0x4174,INVALC,INVALC,0x6941,INVALC,
-	/* Block 135, Array index 0x4300 */
-	INVALC,INVALC,0x6922,INVALC,INVALC,INVALC,0x6943,0x4149,
-	INVALC,INVALC,0x693E,0x6940,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x693F,INVALC,INVALC,0x5D31,0x5D22,
-	INVALC,INVALC,0x6945,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6944,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4D76,INVALC,0x623C,
-	0x6946,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6947,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6948,0x3857,INVALC,
-	0x3554,INVALC,INVALC,INVALC,0x694A,0x515D,INVALC,INVALC,
-	INVALC,INVALC,0x3575,INVALC,0x4E3A,INVALC,0x3673,0x694B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x694C,
-	INVALC,INVALC,INVALC,0x436E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x694D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x467A,INVALC,0x303A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3263,0x6952,0x6953,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x694E,INVALC,0x3B3D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x694F,0x4742,INVALC,INVALC,INVALC,
-	INVALC,0x6950,0x6951,0x695B,INVALC,INVALC,INVALC,0x6955,
-	0x6958,INVALC,INVALC,INVALC,INVALC,INVALC,0x6954,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6956,INVALC,0x6957,0x3C58,
-	INVALC,0x6959,INVALC,0x4341,INVALC,0x3756,0x3342,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x695C,INVALC,INVALC,INVALC,
-	INVALC,0x333F,INVALC,0x6961,INVALC,INVALC,0x695D,0x6960,
-	INVALC,INVALC,INVALC,INVALC,0x483A,INVALC,INVALC,INVALC,
-	INVALC,0x695E,INVALC,INVALC,0x695F,0x4948,0x485A,0x6962,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x427D,0x696C,INVALC,0x6968,INVALC,INVALC,0x326B,INVALC,
-	/* Block 136, Array index 0x4400 */
-	0x6966,INVALC,0x4B2A,0x6967,INVALC,INVALC,0x6964,INVALC,
-	0x6965,0x696A,0x696D,INVALC,INVALC,0x696B,INVALC,INVALC,
-	INVALC,0x6969,0x6963,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4358,INVALC,0x6974,INVALC,0x4C2A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6972,INVALC,INVALC,
-	INVALC,0x6973,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x696E,INVALC,INVALC,0x6970,
-	INVALC,INVALC,INVALC,0x6971,INVALC,INVALC,INVALC,0x696F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4066,INVALC,0x4F39,0x6978,INVALC,0x6979,INVALC,
-	INVALC,INVALC,INVALC,0x6A21,INVALC,0x3F2A,INVALC,0x697B,
-	INVALC,0x697E,INVALC,INVALC,INVALC,INVALC,INVALC,0x6976,
-	0x6975,INVALC,INVALC,0x6A22,INVALC,INVALC,0x325C,INVALC,
-	0x697C,INVALC,0x6A23,INVALC,INVALC,INVALC,0x697D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x697A,INVALC,0x4433,INVALC,
-	0x6977,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4768,
-	INVALC,INVALC,0x6A27,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4D3B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A26,
-	INVALC,INVALC,0x6A25,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6A2E,INVALC,INVALC,INVALC,0x6A28,
-	INVALC,INVALC,INVALC,0x6A30,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D66,0x6A33,INVALC,0x6A2A,INVALC,INVALC,
-	0x6A2B,INVALC,INVALC,INVALC,0x6A2F,INVALC,0x6A32,0x6A31,
-	INVALC,INVALC,INVALC,0x6A29,INVALC,INVALC,INVALC,INVALC,
-	0x6A2C,INVALC,0x6A3D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6A36,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A34,
-	INVALC,INVALC,0x6A35,INVALC,INVALC,INVALC,0x6A3A,0x6A3B,
-	INVALC,0x332A,INVALC,0x3542,INVALC,INVALC,0x6A39,INVALC,
-	/* Block 137, Array index 0x4500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A24,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A38,0x6A3C,0x6A37,
-	INVALC,0x6A3E,INVALC,INVALC,INVALC,0x6A40,0x6A3F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A42,0x6A41,0x695A,INVALC,INVALC,INVALC,0x6A46,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A43,INVALC,INVALC,INVALC,INVALC,0x6A44,INVALC,
-	INVALC,0x6A45,INVALC,0x6A47,INVALC,INVALC,INVALC,INVALC,
-	0x376C,INVALC,0x6A49,INVALC,0x6A48,INVALC,0x3D30,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3954,0x5E27,INVALC,INVALC,
-	INVALC,INVALC,0x6A4A,0x3D51,INVALC,INVALC,INVALC,0x3339,
-	INVALC,0x6A4B,INVALC,0x3152,INVALC,0x3E57,0x6A4C,INVALC,
-	INVALC,0x3955,0x6A4D,0x3061,INVALC,INVALC,INVALC,INVALC,
-	0x493D,INVALC,INVALC,0x6A4E,INVALC,INVALC,INVALC,INVALC,
-	0x3F6A,INVALC,0x6A55,INVALC,INVALC,0x6A52,INVALC,0x436F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A53,0x6A50,0x365E,
-	INVALC,0x6A4F,0x6A56,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3736,INVALC,INVALC,0x425E,INVALC,0x6A5C,INVALC,INVALC,
-	INVALC,INVALC,0x6A58,INVALC,INVALC,INVALC,0x4235,0x6A57,
-	INVALC,0x6A5A,INVALC,INVALC,INVALC,INVALC,0x6A51,INVALC,
-	INVALC,INVALC,0x6A5B,INVALC,0x6A5D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x486F,INVALC,INVALC,0x6A59,INVALC,
-	0x6A5E,0x6A60,INVALC,INVALC,0x3853,0x6A54,INVALC,0x3041,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A5F,
-	INVALC,0x3A5B,0x4E76,0x6A61,0x6A62,0x4175,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E22,
-	INVALC,INVALC,INVALC,INVALC,0x6A63,0x4D35,INVALC,INVALC,
-	0x6A64,0x6A65,INVALC,INVALC,0x4A64,0x6A66,INVALC,0x3A40,
-	INVALC,0x4E23,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6A6B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6A6C,0x3E58,0x6A6A,INVALC,INVALC,INVALC,
-	0x4D67,0x6A67,INVALC,INVALC,0x6A69,0x403D,0x3F7E,INVALC,
-	/* Block 138, Array index 0x4600 */
-	INVALC,INVALC,0x6A68,INVALC,0x6A6D,INVALC,INVALC,0x4A23,
-	INVALC,INVALC,0x6A6F,INVALC,0x6A6E,INVALC,INVALC,INVALC,
-	0x336C,INVALC,0x4B2B,0x6A70,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A7C,0x6A72,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A73,INVALC,INVALC,
-	INVALC,INVALC,0x6A74,0x6A75,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A79,INVALC,
-	0x6A7A,INVALC,INVALC,0x6A78,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A76,INVALC,0x6A71,0x6A77,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6A7B,0x7037,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3228,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A7E,0x365F,
-	0x6A7D,INVALC,INVALC,INVALC,0x6B22,INVALC,0x6B21,INVALC,
-	INVALC,INVALC,0x6B24,INVALC,INVALC,0x6B23,INVALC,0x6B25,
-	INVALC,INVALC,0x3D31,INVALC,0x6B26,INVALC,INVALC,0x6B27,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B28,0x403E,
-	INVALC,0x4D57,INVALC,0x6B29,INVALC,INVALC,0x4A24,0x4746,
-	0x6B2A,INVALC,0x6B2B,0x382B,INVALC,INVALC,INVALC,0x352C,
-	INVALC,INVALC,INVALC,0x6B2C,INVALC,INVALC,0x3B6B,0x4741,
-	0x6B2D,INVALC,0x3350,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B2E,INVALC,INVALC,INVALC,INVALC,0x6B30,0x4D77,
-	INVALC,0x6B2F,0x3F46,INVALC,0x6B31,INVALC,INVALC,0x6B32,
-	INVALC,INVALC,0x6B33,0x3451,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6B34,INVALC,INVALC,0x6B35,INVALC,0x6B36,
-	0x6B37,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3351,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6B38,INVALC,0x6B39,0x6B3A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3272,INVALC,INVALC,0x3F28,0x6B3B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6B3C,INVALC,INVALC,INVALC,
-	0x6B3D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 139, Array index 0x4700 */
-	0x3840,INVALC,0x447B,0x6B3E,INVALC,INVALC,INVALC,INVALC,
-	0x3757,INVALC,0x3F56,INVALC,0x6B41,INVALC,0x4624,INVALC,
-	0x6B40,INVALC,INVALC,0x3731,INVALC,INVALC,0x6B3F,0x4277,
-	0x352D,INVALC,INVALC,0x6B42,INVALC,0x6B43,INVALC,0x3E59,
-	INVALC,INVALC,INVALC,0x376D,INVALC,0x6B44,INVALC,INVALC,
-	INVALC,INVALC,0x4B2C,INVALC,INVALC,0x405F,INVALC,INVALC,
-	INVALC,0x3576,INVALC,0x4C75,0x414A,INVALC,0x6B45,INVALC,
-	INVALC,INVALC,0x3F47,0x4370,0x3E5A,INVALC,INVALC,INVALC,
-	INVALC,0x6B46,INVALC,INVALC,INVALC,INVALC,0x6B49,INVALC,
-	0x6B4A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A3E,0x4242,0x6B48,INVALC,0x3E5B,0x493E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6B47,INVALC,INVALC,0x3B6C,INVALC,
-	0x3153,INVALC,0x6B4E,0x3758,INVALC,INVALC,0x3B6E,INVALC,
-	INVALC,0x3B6D,INVALC,0x4F4D,0x6B4D,0x6B4C,0x4127,INVALC,
-	0x354D,0x4F43,0x333A,0x3E5C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6B4B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6B50,INVALC,0x6B51,0x6B4F,INVALC,0x3858,
-	INVALC,0x4D40,INVALC,INVALC,0x3B6F,0x4727,INVALC,INVALC,
-	INVALC,0x6B54,INVALC,0x4040,INVALC,0x4342,INVALC,INVALC,
-	0x4D36,INVALC,0x6B57,INVALC,INVALC,INVALC,0x386C,INVALC,
-	0x403F,0x6B53,INVALC,0x6B58,0x386D,0x6B55,0x6B56,INVALC,
-	0x6B52,INVALC,INVALC,INVALC,0x4062,0x4649,INVALC,INVALC,
-	0x432F,INVALC,0x325D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4870,INVALC,INVALC,0x3543,INVALC,INVALC,0x4434,
-	INVALC,INVALC,0x6B5B,INVALC,0x6B59,INVALC,INVALC,0x434C,
-	INVALC,INVALC,INVALC,0x4041,0x3452,0x6B5A,INVALC,0x3F5B,
-	INVALC,INVALC,0x4E4A,INVALC,INVALC,INVALC,0x4F40,INVALC,
-	INVALC,INVALC,0x6B5C,0x6B67,0x4435,INVALC,0x6B66,INVALC,
-	0x6B63,0x6B6B,0x6B64,INVALC,0x6B60,INVALC,0x447C,0x6B5F,
-	INVALC,INVALC,INVALC,0x6B5D,INVALC,0x4D21,0x3B70,INVALC,
-	INVALC,0x6B61,INVALC,0x6B5E,INVALC,INVALC,INVALC,0x6B65,
-	0x3D74,INVALC,0x3841,INVALC,INVALC,INVALC,0x427A,INVALC,
-	/* Block 140, Array index 0x4800 */
-	0x4B45,0x315A,0x3062,INVALC,0x4625,INVALC,INVALC,0x6B69,
-	INVALC,INVALC,INVALC,INVALC,0x6B68,INVALC,0x4666,INVALC,
-	0x6B6D,INVALC,INVALC,INVALC,0x6B62,INVALC,0x6B6C,0x6B6E,
-	INVALC,0x382C,0x6B6A,0x3956,INVALC,0x3C55,INVALC,INVALC,
-	0x6B6F,0x4D58,INVALC,INVALC,INVALC,INVALC,0x6B72,INVALC,
-	0x6B75,INVALC,INVALC,0x6B73,0x4935,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6B70,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3660,INVALC,INVALC,INVALC,INVALC,0x6B74,INVALC,
-	INVALC,0x6B76,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B7A,INVALC,INVALC,0x6B77,INVALC,0x6B79,0x6B78,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B7B,INVALC,
-	0x3C31,INVALC,0x6B7D,0x6B7C,0x4968,INVALC,INVALC,0x6C21,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3759,INVALC,
-	INVALC,INVALC,INVALC,0x6B7E,0x6C22,INVALC,INVALC,0x6C23,
-	0x3544,0x6641,0x3E79,INVALC,0x6C24,INVALC,INVALC,0x386E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6C25,INVALC,INVALC,
-	0x6C26,INVALC,INVALC,0x3B3E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5A4E,INVALC,0x6C27,INVALC,0x6C28,INVALC,
-	0x3D32,INVALC,0x6C29,0x6C2A,INVALC,INVALC,0x6C2B,INVALC,
-	INVALC,0x6C2C,0x6C2D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 141, Array index 0x4900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x432B,
-	INVALC,INVALC,0x6C2E,INVALC,INVALC,INVALC,INVALC,0x6C30,
-	INVALC,0x6C2F,INVALC,INVALC,INVALC,INVALC,0x4626,INVALC,
-	0x6C31,INVALC,0x4B2D,INVALC,0x6C32,INVALC,0x6C33,INVALC,
-	0x6C34,INVALC,INVALC,INVALC,INVALC,0x6C35,INVALC,INVALC,
-	INVALC,INVALC,0x465A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3E5D,0x6C36,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x396B,0x502E,0x6C37,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6C38,0x493F,0x6C39,INVALC,0x6C41,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6C3A,INVALC,INVALC,0x6C3C,INVALC,INVALC,
-	INVALC,0x6C3B,0x6C3D,INVALC,0x4B46,0x6C3E,0x6C3F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6C40,INVALC,INVALC,INVALC,
-	0x6C42,INVALC,INVALC,INVALC,INVALC,0x332D,0x4467,INVALC,
-	0x4969,0x3A62,0x3957,INVALC,INVALC,INVALC,INVALC,0x494F,
-	0x325F,0x484E,0x6C45,0x3453,0x4055,0x6C44,0x6C49,0x4379,
-	0x4C63,INVALC,0x6C47,0x6C48,0x352E,INVALC,0x6C4A,0x4763,
-	0x425F,INVALC,INVALC,0x4871,0x453D,0x6C46,INVALC,0x4B47,
-	0x326C,0x6C4C,0x4F28,0x4442,0x4F45,INVALC,INVALC,0x3B71,
-	0x6C4B,INVALC,0x4231,INVALC,INVALC,0x6C5C,0x4128,INVALC,
-	INVALC,0x4678,INVALC,0x4950,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6C4F,0x3B3F,0x3B72,INVALC,0x3E5E,INVALC,
-	0x4765,INVALC,0x382D,0x6C4E,0x6C4D,INVALC,0x496A,INVALC,
-	INVALC,INVALC,0x3C41,INVALC,INVALC,0x4552,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6C51,0x6C52,0x3958,0x6C50,INVALC,INVALC,
-	/* Block 142, Array index 0x4A00 */
-	INVALC,INVALC,INVALC,INVALC,0x6C53,0x6C54,INVALC,0x6C56,
-	0x4223,INVALC,0x6C55,0x3466,INVALC,0x6C58,INVALC,0x6C57,
-	0x6C59,INVALC,INVALC,0x6C5B,0x6C5D,INVALC,0x6C5E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4056,INVALC,0x3C4F,0x6C5F,
-	INVALC,INVALC,INVALC,0x3352,INVALC,0x6C60,INVALC,INVALC,
-	0x4176,0x6C61,INVALC,0x6C62,0x496B,INVALC,INVALC,0x352F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6C63,INVALC,INVALC,INVALC,0x4436,INVALC,INVALC,
-	INVALC,INVALC,0x315B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6C64,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3C71,INVALC,INVALC,INVALC,INVALC,
-	0x3F76,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x422D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6C67,INVALC,INVALC,INVALC,0x6C66,INVALC,
-	INVALC,INVALC,0x6C65,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6C6D,0x6C6B,INVALC,INVALC,0x6C68,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6C6A,INVALC,
-	INVALC,INVALC,0x6C69,0x6C6C,INVALC,0x3577,INVALC,0x6C70,
-	INVALC,0x4057,INVALC,0x6C71,INVALC,INVALC,INVALC,INVALC,
-	0x3859,INVALC,0x6C6E,0x6C6F,INVALC,INVALC,INVALC,0x4F29,
-	INVALC,INVALC,INVALC,0x4437,INVALC,0x4129,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6C72,INVALC,INVALC,0x6C75,
-	/* Block 143, Array index 0x4B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6C73,0x6C74,0x4D59,INVALC,INVALC,INVALC,INVALC,0x4627,
-	0x6C78,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6C76,0x6C77,0x6C79,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6D29,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6C7C,INVALC,INVALC,INVALC,0x6C7D,0x6C7B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6C7A,INVALC,0x447D,INVALC,INVALC,0x6D21,
-	0x6D25,0x6D22,0x6C7E,INVALC,0x6D23,INVALC,INVALC,INVALC,
-	0x6D24,INVALC,INVALC,INVALC,INVALC,0x6D2B,INVALC,INVALC,
-	INVALC,0x6D26,INVALC,INVALC,INVALC,INVALC,INVALC,0x4058,
-	0x6D28,INVALC,INVALC,0x6D2A,0x6D27,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6D2D,INVALC,0x3D33,INVALC,0x6D2C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6D2E,INVALC,INVALC,INVALC,
-	INVALC,0x6D2F,INVALC,INVALC,0x6D32,0x6D31,INVALC,0x6D30,
-	INVALC,INVALC,0x6D34,0x6D33,INVALC,0x4C76,INVALC,INVALC,
-	INVALC,0x6D36,INVALC,0x6D35,0x6D37,INVALC,INVALC,INVALC,
-	INVALC,0x6D38,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6D3A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6D39,0x3F48,0x6D3B,INVALC,INVALC,0x366D,
-	0x6D3C,0x6D3E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D3F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6D40,0x6D3D,INVALC,
-	0x6D41,INVALC,0x3C56,0x6D42,0x3530,0x3733,INVALC,INVALC,
-	INVALC,INVALC,0x382E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6D43,INVALC,INVALC,INVALC,0x4670,
-	INVALC,INVALC,0x453E,0x6D44,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6D47,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C34,INVALC,INVALC,0x6D46,0x6D45,0x375A,0x6D48,INVALC,
-	/* Block 144, Array index 0x4C00 */
-	INVALC,INVALC,INVALC,0x3353,INVALC,0x6D4A,INVALC,INVALC,
-	INVALC,0x3A5C,0x6D49,INVALC,0x6D52,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6D4C,0x6D4E,0x4A65,0x6D4B,INVALC,INVALC,
-	INVALC,0x6D4D,INVALC,0x6D51,0x6D4F,0x3531,INVALC,0x6D50,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D53,INVALC,
-	INVALC,0x475A,0x4E58,INVALC,INVALC,INVALC,INVALC,0x3D34,
-	INVALC,INVALC,INVALC,0x6D54,INVALC,INVALC,INVALC,INVALC,
-	0x4D22,0x6D56,INVALC,0x6D55,INVALC,INVALC,0x6D59,0x4D41,
-	INVALC,INVALC,0x6D58,INVALC,0x336D,0x6D57,0x6D5C,INVALC,
-	INVALC,0x6D5B,INVALC,INVALC,0x6D5A,0x4532,0x6D5D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D5E,
-	INVALC,INVALC,INVALC,INVALC,0x6D5F,INVALC,INVALC,0x396C,
-	INVALC,0x3725,0x6D60,0x6D61,0x6D62,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3F49,0x6D63,INVALC,0x3C2D,0x6D64,
-	INVALC,INVALC,INVALC,0x6D65,INVALC,INVALC,INVALC,0x5221,
-	0x517E,INVALC,INVALC,INVALC,INVALC,0x6D66,0x6570,0x6D67,
-	0x4324,0x3F2B,0x4740,INVALC,INVALC,INVALC,INVALC,0x6D68,
-	INVALC,INVALC,0x4A55,0x4454,0x397E,INVALC,INVALC,0x4329,
-	INVALC,INVALC,0x312A,INVALC,0x4B78,0x3F57,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x375E,INVALC,
-	INVALC,0x3661,INVALC,INVALC,0x4A56,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6D69,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6D6B,INVALC,INVALC,0x6D6A,0x3260,INVALC,
-	INVALC,0x4676,0x6D6C,0x4777,INVALC,0x4533,INVALC,0x6D6D,
-	0x3D52,INVALC,INVALC,INVALC,0x6D6F,INVALC,INVALC,0x4C42,
-	0x6D7E,0x6D71,0x6D72,INVALC,INVALC,0x4449,INVALC,INVALC,
-	/* Block 145, Array index 0x4D00 */
-	0x4260,0x4177,INVALC,0x4628,INVALC,0x6D70,0x3555,INVALC,
-	INVALC,INVALC,INVALC,0x6D79,INVALC,0x6D76,0x6E25,0x4629,
-	0x4360,0x6D73,INVALC,0x447E,0x4553,0x6D74,0x6D78,0x3F60,
-	INVALC,0x4767,0x444C,INVALC,INVALC,0x4042,0x6D77,0x422E,
-	0x4224,0x6D75,0x3029,0x4F22,INVALC,INVALC,INVALC,0x6D7A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4261,INVALC,
-	INVALC,0x3D35,0x3F4A,INVALC,INVALC,0x6D7C,0x6D7B,INVALC,
-	0x306F,0x6D7D,INVALC,INVALC,0x492F,INVALC,0x6E27,INVALC,
-	INVALC,0x465B,0x3F6B,INVALC,INVALC,0x4359,INVALC,0x3678,
-	INVALC,0x6E26,0x4D37,0x313F,INVALC,0x4A57,0x3261,0x6E21,
-	0x6E22,0x6E23,0x6E24,0x463B,0x4323,0x3063,0x6E28,INVALC,
-	0x6E29,0x7423,INVALC,INVALC,0x423D,INVALC,0x6E2A,INVALC,
-	0x3173,0x414C,INVALC,0x382F,INVALC,0x4D5A,INVALC,INVALC,
-	0x6E2B,0x452C,INVALC,INVALC,INVALC,0x4178,0x3C57,0x6E2C,
-	INVALC,INVALC,0x6E2F,INVALC,INVALC,0x3D65,0x6E2D,0x412B,
-	0x412A,INVALC,0x3064,INVALC,0x4E4B,0x6E31,INVALC,0x4872,
-	0x6E33,0x6E32,0x6E30,0x6364,0x3454,INVALC,INVALC,0x6D6E,
-	INVALC,0x6E35,0x6E34,INVALC,INVALC,INVALC,INVALC,0x6E36,
-	INVALC,0x4D38,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4661,INVALC,INVALC,0x4B2E,INVALC,
-	0x6E37,INVALC,0x3C59,INVALC,INVALC,INVALC,INVALC,0x6E38,
-	INVALC,0x6E39,INVALC,INVALC,INVALC,0x6E3A,INVALC,INVALC,
-	0x4521,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x306A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3959,INVALC,INVALC,INVALC,0x4F3A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6E3E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3734,0x6E3B,INVALC,0x6E3C,INVALC,INVALC,INVALC,
-	0x4974,INVALC,INVALC,INVALC,INVALC,0x3354,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4D39,INVALC,0x363F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4554,INVALC,INVALC,
-	/* Block 146, Array index 0x4E00 */
-	INVALC,INVALC,0x6E3F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6E40,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6E41,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4522,INVALC,INVALC,
-	0x6E43,INVALC,0x6E42,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4653,0x6E44,0x3D36,0x3C60,0x475B,0x4371,INVALC,
-	INVALC,INVALC,0x3C72,INVALC,0x3F6C,INVALC,0x6E45,INVALC,
-	0x6E46,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3F5D,0x6E47,INVALC,0x6E48,INVALC,INVALC,
-	INVALC,0x6E49,0x4D6F,INVALC,0x3D37,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6E4B,0x6E4A,INVALC,0x395A,INVALC,0x3973,
-	0x3B40,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6E4E,INVALC,INVALC,INVALC,INVALC,0x3D66,
-	INVALC,0x6E4D,INVALC,0x6E4C,INVALC,0x4269,INVALC,INVALC,
-	0x386F,INVALC,0x4043,INVALC,INVALC,INVALC,INVALC,0x4830,
-	INVALC,INVALC,INVALC,INVALC,0x3D39,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6E4F,INVALC,0x3E5F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6E52,0x6E50,INVALC,INVALC,INVALC,0x6E51,
-	INVALC,INVALC,INVALC,INVALC,0x6E54,0x6E53,INVALC,INVALC,
-	0x3E7A,INVALC,0x6E55,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6E56,0x6E57,INVALC,INVALC,INVALC,INVALC,0x4850,0x3A53,
-	0x3C61,0x6E58,INVALC,0x6E59,0x4E24,0x3D45,0x4C6E,0x4E4C,
-	0x6E5A,0x3662,INVALC,INVALC,INVALC,INVALC,0x6E5B,INVALC,
-	0x4523,INVALC,INVALC,0x6E5E,0x3378,0x3F4B,INVALC,0x6E5C,
-	INVALC,0x6E5D,INVALC,0x4460,INVALC,INVALC,0x4B55,0x367C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6E60,0x6E61,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6E5F,INVALC,INVALC,0x6E63,
-	/* Block 147, Array index 0x4F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x465F,0x3343,INVALC,
-	INVALC,0x6E67,INVALC,INVALC,0x6E64,0x6E66,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E62,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F4F,INVALC,INVALC,0x6E65,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4E6B,INVALC,INVALC,0x385A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E6F,
-	INVALC,INVALC,INVALC,INVALC,0x4534,0x6E6A,INVALC,INVALC,
-	0x6E6D,0x6E6B,INVALC,0x6E70,INVALC,INVALC,INVALC,INVALC,
-	0x6E71,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E69,
-	INVALC,INVALC,0x6E76,0x3174,INVALC,INVALC,0x6E68,INVALC,
-	INVALC,INVALC,0x482D,INVALC,0x6E6C,INVALC,0x3E60,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x395B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B48,INVALC,
-	0x3664,INVALC,INVALC,0x3D46,INVALC,0x463C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x412D,INVALC,0x6E74,INVALC,0x6E6E,0x6E73,INVALC,
-	0x4C43,INVALC,0x4438,0x6E75,0x6E72,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x412C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E79,
-	INVALC,0x6E78,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E77,
-	INVALC,INVALC,0x4B2F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D7B,INVALC,INVALC,INVALC,
-	INVALC,0x6E7A,0x4A5F,INVALC,INVALC,0x3154,INVALC,INVALC,
-	INVALC,INVALC,0x4946,0x4372,INVALC,INVALC,INVALC,INVALC,
-	0x3578,INVALC,0x6E7C,INVALC,0x395D,INVALC,INVALC,INVALC,
-	/* Block 148, Array index 0x5000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3B2C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E7B,
-	0x3F6D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3F6E,0x6F21,0x6F23,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E7B,INVALC,0x6F22,0x6F24,INVALC,INVALC,0x3653,INVALC,
-	0x4945,INVALC,INVALC,0x3C62,0x4F23,INVALC,0x6E7E,0x3A78,
-	INVALC,INVALC,0x4F3F,INVALC,INVALC,0x6F26,INVALC,INVALC,
-	INVALC,INVALC,0x6F25,0x6F27,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6E7D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4669,INVALC,0x4555,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4457,INVALC,0x6F2C,INVALC,
-	INVALC,INVALC,INVALC,0x4343,0x6F28,INVALC,INVALC,INVALC,
-	0x6F29,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x372D,INVALC,0x6F2B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3830,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6F2A,INVALC,0x3E61,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3379,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6F30,INVALC,0x3A3F,0x4179,
-	INVALC,INVALC,0x444A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x333B,
-	INVALC,INVALC,INVALC,INVALC,0x6F2E,0x6F2F,0x4443,INVALC,
-	0x6F2D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F31,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6F37,INVALC,INVALC,INVALC,INVALC,
-	0x6F3A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F39,0x452D,INVALC,INVALC,INVALC,INVALC,0x6F32,0x6F33,
-	0x6F36,INVALC,INVALC,INVALC,INVALC,0x6F38,INVALC,INVALC,
-	INVALC,0x3640,INVALC,INVALC,0x6F3B,0x6F35,INVALC,INVALC,
-	0x6F34,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 149, Array index 0x5100 */
-	INVALC,INVALC,INVALC,0x6F3F,INVALC,INVALC,INVALC,0x6F40,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F41,INVALC,INVALC,0x6F3E,0x6F3D,INVALC,INVALC,INVALC,
-	0x3E62,0x462A,0x6F3C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F45,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6F43,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6F44,0x6F42,INVALC,
-	0x4278,INVALC,0x6F46,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F47,INVALC,INVALC,0x6F49,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3455,0x6F48,0x4C7A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6F54,0x6F4A,INVALC,INVALC,0x6F4D,INVALC,
-	0x6F4B,INVALC,0x6F4C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6F4E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F50,INVALC,INVALC,INVALC,INVALC,0x6F51,INVALC,0x6F52,
-	INVALC,INVALC,INVALC,INVALC,0x6F55,0x6F53,0x6F56,0x6F58,
-	INVALC,0x6F57,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 150, Array index 0x5200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4439,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C67,INVALC,0x6F59,0x412E,INVALC,INVALC,INVALC,0x6F5A,
-	INVALC,0x4A44,0x6F5B,0x332B,INVALC,INVALC,INVALC,0x313C,
-	INVALC,0x3457,INVALC,0x3456,0x6F5C,INVALC,0x6F5D,INVALC,
-	0x6F5E,0x6F5F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F60,INVALC,0x3458,0x3355,0x395E,0x4836,INVALC,0x6F62,
-	0x6F61,INVALC,INVALC,INVALC,INVALC,0x6F63,INVALC,INVALC,
-	INVALC,INVALC,0x315C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F66,INVALC,0x6F65,0x6F64,INVALC,0x6F67,INVALC,
-	INVALC,INVALC,INVALC,0x6F6A,INVALC,INVALC,INVALC,0x3047,
-	INVALC,INVALC,0x6F68,INVALC,0x6F6C,0x6F6B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6F6E,0x6F6D,0x6F6F,INVALC,
-	0x462E,INVALC,INVALC,INVALC,0x6F70,INVALC,INVALC,INVALC,
-	INVALC,0x6F71,0x6F73,INVALC,INVALC,0x6F72,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 151, Array index 0x5300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x496C,INVALC,INVALC,INVALC,
-	INVALC,0x6F74,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F75,INVALC,0x3A65,INVALC,INVALC,INVALC,0x6F76,0x6F77,
-	INVALC,INVALC,0x4B49,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x414B,INVALC,INVALC,INVALC,0x3024,
-	0x424B,INVALC,0x6F78,INVALC,0x496D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6F7B,0x6F79,0x395F,INVALC,0x6F7A,
-	0x3842,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A45,0x6F7D,0x7021,0x6F7E,0x7022,
-	INVALC,INVALC,0x3121,0x3F58,0x3D7C,0x3459,0x7023,INVALC,
-	INVALC,INVALC,0x4766,INVALC,0x7025,INVALC,INVALC,INVALC,
-	0x3122,INVALC,0x7024,0x4444,INVALC,0x4E4D,0x462B,0x6F7C,
-	0x4E26,INVALC,0x3831,INVALC,INVALC,0x4D5B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3679,0x4E34,INVALC,
-	0x3728,INVALC,0x4262,0x6721,INVALC,0x7026,0x332C,0x3F6F,
-	INVALC,INVALC,INVALC,INVALC,0x3356,0x7028,INVALC,0x7029,
-	0x7027,0x3764,INVALC,0x3A5D,0x3E63,INVALC,INVALC,INVALC,
-	0x3123,INVALC,INVALC,0x4E59,INVALC,INVALC,INVALC,0x702B,
-	0x6E2E,INVALC,0x702A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x702E,0x702C,0x702D,INVALC,0x702F,INVALC,0x7030,0x4E6C,
-	0x7031,0x7032,INVALC,0x4049,0x483B,INVALC,INVALC,INVALC,
-	0x3F7D,0x3467,INVALC,INVALC,0x4D3A,0x326D,0x3D38,0x385B,
-	INVALC,0x7035,INVALC,0x7034,0x3B73,0x7036,0x7033,INVALC,
-	INVALC,0x3B28,INVALC,INVALC,INVALC,0x703A,0x6A2D,INVALC,
-	INVALC,0x5256,INVALC,0x3F77,0x7038,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4E25,0x4671,INVALC,INVALC,INVALC,INVALC,
-	0x312B,INVALC,0x4063,0x3C36,INVALC,INVALC,INVALC,INVALC,
-	0x4A37,INVALC,0x3140,INVALC,INVALC,INVALC,0x4E6D,0x4D6B,
-	INVALC,0x703B,INVALC,0x4545,INVALC,INVALC,INVALC,INVALC,
-	/* Block 152, Array index 0x5400 */
-	0x3C7B,INVALC,INVALC,INVALC,0x703C,INVALC,0x703D,0x3F4C,
-	0x703E,INVALC,0x4E6E,INVALC,INVALC,0x7039,0x7040,0x7042,
-	INVALC,0x7041,INVALC,0x703F,INVALC,INVALC,0x7043,INVALC,
-	INVALC,0x7044,INVALC,INVALC,0x417A,INVALC,0x3262,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7045,INVALC,INVALC,0x4C38,
-	INVALC,INVALC,0x7046,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7047,INVALC,0x4F2A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5B31,0x7048,INVALC,INVALC,INVALC,0x7049,0x704A,INVALC,
-	INVALC,INVALC,0x704E,INVALC,0x704B,INVALC,0x704C,INVALC,
-	0x704D,0x704F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4044,INVALC,INVALC,INVALC,0x4C77,INVALC,
-	INVALC,0x4045,INVALC,INVALC,0x7050,INVALC,0x4873,INVALC,
-	0x7051,0x7353,0x4C4C,INVALC,0x7052,INVALC,0x7053,INVALC,
-	0x7054,0x3357,INVALC,0x7056,INVALC,0x3F59,INVALC,INVALC,
-	INVALC,0x7057,INVALC,INVALC,0x3724,INVALC,INVALC,INVALC,
-	INVALC,0x7058,0x705C,INVALC,0x705A,INVALC,INVALC,INVALC,
-	INVALC,0x705B,INVALC,INVALC,0x3373,0x7059,0x705D,INVALC,
-	INVALC,INVALC,INVALC,0x705E,INVALC,0x3048,INVALC,0x705F,
-	0x7060,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E64,INVALC,INVALC,INVALC,0x7061,INVALC,INVALC,INVALC,
-	0x3547,INVALC,INVALC,0x7064,INVALC,INVALC,0x7063,INVALC,
-	0x7062,INVALC,INVALC,0x6B71,INVALC,0x4A5C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7065,0x7066,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7067,INVALC,INVALC,0x7068,INVALC,
-	0x7069,INVALC,INVALC,0x706A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x345A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x706B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x706C,0x4723,INVALC,
-	INVALC,INVALC,0x706E,0x323B,INVALC,0x7071,0x7070,INVALC,
-	INVALC,INVALC,INVALC,0x3124,INVALC,INVALC,INVALC,0x3641,
-	/* Block 153, Array index 0x5500 */
-	INVALC,0x4A47,0x443A,0x3A22,INVALC,0x3960,0x3D67,INVALC,
-	0x3F5C,INVALC,INVALC,INVALC,0x7073,INVALC,INVALC,0x7072,
-	0x4D42,0x3468,0x4852,0x465C,INVALC,INVALC,INVALC,0x3F7C,
-	0x4E4E,INVALC,0x375B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7076,INVALC,INVALC,0x7075,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4B4B,0x462C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3150,INVALC,INVALC,0x7077,
-	0x7074,INVALC,INVALC,0x4951,0x4D6A,0x7078,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7079,INVALC,
-	INVALC,INVALC,INVALC,0x707B,0x426A,0x335B,0x335C,0x707A,
-	INVALC,INVALC,INVALC,INVALC,0x3469,0x3832,INVALC,INVALC,
-	0x346A,INVALC,INVALC,0x453F,INVALC,INVALC,0x4E60,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x385C,
-	INVALC,INVALC,INVALC,0x707C,INVALC,INVALC,INVALC,0x707D,
-	0x707E,0x7121,INVALC,0x7123,0x7122,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4977,INVALC,0x7124,INVALC,INVALC,INVALC,INVALC,0x7125,
-	INVALC,0x7126,INVALC,INVALC,INVALC,INVALC,0x7127,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7129,0x7128,INVALC,0x712A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4874,0x664C,INVALC,INVALC,0x3F29,
-	INVALC,INVALC,0x3532,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x712B,INVALC,0x712C,INVALC,0x522C,0x5D3B,0x4853,
-	INVALC,INVALC,0x307B,INVALC,0x303B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3B74,0x4B30,0x3E7E,INVALC,
-	/* Block 154, Array index 0x5600 */
-	INVALC,INVALC,INVALC,0x712D,INVALC,0x4C5F,INVALC,INVALC,
-	INVALC,0x712E,0x4D5C,INVALC,0x3142,INVALC,INVALC,INVALC,
-	0x3B41,INVALC,0x712F,0x326E,0x7130,INVALC,INVALC,INVALC,
-	0x7131,INVALC,INVALC,INVALC,INVALC,0x7133,0x7134,INVALC,
-	0x7136,0x7132,INVALC,INVALC,0x7135,INVALC,INVALC,INVALC,
-	0x345B,INVALC,INVALC,INVALC,0x7137,INVALC,0x7138,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7139,0x713A,INVALC,
-	INVALC,INVALC,0x713B,INVALC,INVALC,0x713D,INVALC,INVALC,
-	INVALC,0x713C,INVALC,0x713F,0x7142,INVALC,INVALC,INVALC,
-	0x713E,0x7140,0x7141,INVALC,INVALC,0x7143,INVALC,0x3642,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C73,0x7144,
-	0x7145,0x3961,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7146,INVALC,INVALC,
-	0x333E,INVALC,INVALC,INVALC,0x474F,0x7147,0x7148,INVALC,
-	INVALC,INVALC,INVALC,0x435A,0x466B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7149,INVALC,INVALC,INVALC,
-	INVALC,0x477D,INVALC,INVALC,0x424C,0x3158,0x366E,INVALC,
-	0x366F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4373,0x714E,0x3670,INVALC,INVALC,0x326F,INVALC,INVALC,
-	0x714D,INVALC,INVALC,0x714B,INVALC,0x714C,INVALC,0x714A,
-	INVALC,INVALC,0x7158,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x714F,0x7150,INVALC,
-	INVALC,0x7151,0x7152,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7154,INVALC,INVALC,0x7153,INVALC,INVALC,INVALC,0x3D59,
-	/* Block 155, Array index 0x5700 */
-	INVALC,0x7155,INVALC,INVALC,INVALC,0x7157,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3533,0x7156,
-	INVALC,INVALC,0x417B,0x3833,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7159,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x424D,INVALC,INVALC,0x715A,INVALC,INVALC,INVALC,INVALC,
-	0x462D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x715B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7160,INVALC,
-	0x715E,INVALC,0x715D,0x715F,INVALC,0x715C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7162,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7161,INVALC,0x7164,
-	INVALC,INVALC,0x3643,0x7163,INVALC,INVALC,INVALC,0x7165,
-	INVALC,INVALC,0x7166,INVALC,0x7168,0x7167,INVALC,INVALC,
-	INVALC,0x7169,0x716B,0x716A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x397C,INVALC,INVALC,INVALC,INVALC,0x716C,INVALC,INVALC,
-	0x716D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x333C,INVALC,INVALC,INVALC,0x716E,INVALC,INVALC,INVALC,
-	0x716F,INVALC,INVALC,INVALC,0x3F71,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7170,
-	INVALC,0x7171,INVALC,0x7172,0x7173,INVALC,INVALC,INVALC,
-	0x3962,INVALC,INVALC,INVALC,INVALC,INVALC,0x7174,0x7175,
-	INVALC,INVALC,0x7176,0x7177,INVALC,INVALC,0x7178,INVALC,
-	INVALC,INVALC,0x4831,0x717A,INVALC,0x4926,0x717B,0x7179,
-	INVALC,0x717D,INVALC,INVALC,0x717C,INVALC,INVALC,0x717E,
-	INVALC,INVALC,INVALC,0x7221,INVALC,INVALC,INVALC,INVALC,
-	/* Block 156, Array index 0x5800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7222,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7223,INVALC,0x7224,INVALC,INVALC,INVALC,INVALC,0x7225,
-	INVALC,INVALC,0x7226,0x7227,INVALC,0x7228,INVALC,0x7229,
-	0x722A,0x722B,0x722C,INVALC,INVALC,INVALC,0x722D,0x722E,
-	INVALC,0x5D35,0x722F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6478,0x3534,INVALC,INVALC,INVALC,
-	INVALC,0x3321,0x3A32,0x7231,0x7230,0x4C25,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7233,0x7234,0x7232,
-	INVALC,0x7235,INVALC,INVALC,0x4B62,INVALC,INVALC,INVALC,
-	0x7236,INVALC,0x357B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F25,
-	INVALC,INVALC,INVALC,INVALC,0x7237,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7239,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x303E,INVALC,
-	INVALC,0x723A,0x4A2B,0x7238,INVALC,INVALC,0x723B,0x723C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x723D,
-	0x723E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x723F,INVALC,0x4B6E,0x3B2D,INVALC,0x3A7A,0x412F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7240,INVALC,INVALC,INVALC,
-	INVALC,0x7243,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7241,INVALC,INVALC,INVALC,INVALC,INVALC,0x7244,INVALC,
-	INVALC,0x3871,0x7242,INVALC,INVALC,INVALC,INVALC,0x7245,
-	INVALC,0x7246,0x7247,INVALC,0x724B,INVALC,0x3B2A,INVALC,
-	INVALC,INVALC,INVALC,0x4264,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x724C,0x7249,0x7248,0x724A,INVALC,INVALC,INVALC,
-	0x375F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7250,0x724F,0x724E,INVALC,INVALC,0x3033,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 157, Array index 0x5900 */
-	INVALC,INVALC,INVALC,INVALC,0x725A,INVALC,0x7256,INVALC,
-	0x7257,0x7253,0x7259,INVALC,0x7255,0x3362,INVALC,INVALC,
-	0x4F4C,INVALC,0x7258,0x7254,0x7252,0x7251,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x725C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x725F,INVALC,INVALC,0x725E,0x725D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4949,0x725B,0x3073,
-	0x7260,INVALC,0x7262,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x336F,0x724D,0x3137,INVALC,INVALC,0x7264,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7263,0x7261,
-	0x432D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B70,INVALC,INVALC,INVALC,INVALC,0x4E5A,
-	INVALC,INVALC,0x7265,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7266,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7267,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7268,INVALC,
-	0x7269,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x443B,INVALC,0x726A,
-	INVALC,0x4837,INVALC,0x726F,0x726B,INVALC,INVALC,INVALC,
-	0x726C,INVALC,INVALC,0x4B31,0x4C44,INVALC,0x4650,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 158, Array index 0x5A00 */
-	INVALC,INVALC,INVALC,0x7270,INVALC,INVALC,0x7271,0x463E,
-	0x726E,0x726D,INVALC,INVALC,INVALC,INVALC,0x322A,INVALC,
-	INVALC,INVALC,0x7279,INVALC,INVALC,0x7278,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3175,INVALC,INVALC,INVALC,0x7276,
-	INVALC,INVALC,INVALC,0x7275,INVALC,INVALC,0x7273,INVALC,
-	0x337B,INVALC,0x7272,0x3C32,0x3229,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3963,INVALC,INVALC,0x727C,0x727B,
-	INVALC,0x727A,INVALC,INVALC,0x7277,INVALC,0x727D,INVALC,
-	0x727E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7325,0x7324,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7326,INVALC,INVALC,0x312D,0x7321,0x7322,INVALC,
-	0x3974,0x4C39,INVALC,INVALC,0x7323,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4B32,INVALC,INVALC,0x732B,
-	INVALC,INVALC,0x7327,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x732C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7329,
-	INVALC,0x7328,INVALC,INVALC,INVALC,INVALC,INVALC,0x375C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x732D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x732E,INVALC,INVALC,INVALC,
-	INVALC,0x732F,INVALC,0x732A,INVALC,INVALC,INVALC,0x7274,
-	INVALC,INVALC,0x7330,INVALC,0x4461,INVALC,INVALC,INVALC,
-	0x7334,INVALC,0x7335,0x7333,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7332,0x7338,INVALC,0x7331,INVALC,0x7336,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7337,
-	INVALC,INVALC,INVALC,0x733A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7339,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x733C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x733D,INVALC,0x733E,
-	INVALC,INVALC,0x4F49,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x733B,0x426B,0x3A6D,INVALC,INVALC,0x733F,INVALC,INVALC,
-	/* Block 159, Array index 0x5B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7340,0x7341,INVALC,INVALC,0x7342,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7343,INVALC,INVALC,
-	0x3834,0x7344,INVALC,INVALC,INVALC,0x7345,INVALC,0x3C2F,
-	INVALC,0x7346,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7347,INVALC,INVALC,0x7348,0x7349,INVALC,INVALC,INVALC,
-	INVALC,0x734C,0x734A,0x4F3C,INVALC,0x734B,INVALC,0x4E6F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x734D,INVALC,0x4E5B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x734E,0x477E,INVALC,
-	INVALC,0x734F,0x7351,INVALC,INVALC,0x7352,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7350,0x396D,0x4C4D,0x4B63,0x5677,INVALC,0x5D60,0x4B7B,
-	INVALC,INVALC,INVALC,INVALC,0x322B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7354,0x3550,0x7355,0x7356,
-	0x7357,INVALC,0x3975,INVALC,0x7358,INVALC,INVALC,INVALC,
-	0x6054,0x4C5B,INVALC,0x4263,0x7359,0x735B,0x735A,INVALC,
-	0x735C,INVALC,INVALC,INVALC,INVALC,0x735D,INVALC,INVALC,
-	0x735E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x735F,
-	INVALC,INVALC,INVALC,INVALC,0x7360,INVALC,0x7361,0x7362,
-	INVALC,0x7363,INVALC,0x7364,0x7365,0x7366,INVALC,INVALC,
-	/* Block 160, Array index 0x5C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7367,
-	0x7368,INVALC,INVALC,INVALC,INVALC,INVALC,0x4524,INVALC,
-	INVALC,INVALC,INVALC,0x385D,INVALC,0x736A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x414D,0x736B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x736C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4921,INVALC,INVALC,0x736D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x736E,0x6337,INVALC,INVALC,0x6C5A,0x706D,
-	INVALC,INVALC,0x736F,INVALC,0x7370,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7372,
-	0x7373,0x7374,0x4E70,0x7371,INVALC,INVALC,0x7375,0x7376,
-	INVALC,INVALC,0x7378,INVALC,0x7377,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x737A,INVALC,INVALC,INVALC,0x737B,0x7379,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E36,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x737C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x737D,0x6354,INVALC,INVALC,
-	0x737E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 256, Array index 0x5D00 */
-	INVALC,0x212A,INVALC,0x2174,0x2170,0x2173,0x2175,INVALC,
-	0x214A,0x214B,0x2176,0x215C,0x2124,INVALC,0x2125,0x213F,
-	0x2330,0x2331,0x2332,0x2333,0x2334,0x2335,0x2336,0x2337,
-	0x2338,0x2339,0x2127,0x2128,0x2163,0x2161,0x2164,0x2129,
-	0x2177,0x2341,0x2342,0x2343,0x2344,0x2345,0x2346,0x2347,
-	0x2348,0x2349,0x234A,0x234B,0x234C,0x234D,0x234E,0x234F,
-	0x2350,0x2351,0x2352,0x2353,0x2354,0x2355,0x2356,0x2357,
-	0x2358,0x2359,0x235A,0x214E,INVALC,0x214F,0x2130,0x2132,
-	0x212E,0x2361,0x2362,0x2363,0x2364,0x2365,0x2366,0x2367,
-	0x2368,0x2369,0x236A,0x236B,0x236C,0x236D,0x236E,0x236F,
-	0x2370,0x2371,0x2372,0x2373,0x2374,0x2375,0x2376,0x2377,
-	0x2378,0x2379,0x237A,0x2150,0x2143,0x2151,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2131,INVALC,0x216F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_JIS_X0208_1990 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> jis_x0208_1990 size-optimized table (25440 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_size_jis_x0208_1990[] =
-{
-	0x01E9, /* Ranges number */
-	0x0E1F, /* Unranged codes number */
-	0x1572, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x0391, 0x03A9, 0x05BE,
-	/* Array index: 0x0006 */ 0x03B1, 0x03C9, 0x05D7,
-	/* Array index: 0x0009 */ 0x0410, 0x0451, 0x05F0,
-	/* Array index: 0x000C */ 0x2015, 0x2021, 0x0632,
-	/* Array index: 0x000F */ 0x2190, 0x2193, 0x063F,
-	/* Array index: 0x0012 */ 0x2227, 0x222C, 0x0643,
-	/* Array index: 0x0015 */ 0x2500, 0x2503, 0x0649,
-	/* Array index: 0x0018 */ 0x2517, 0x251D, 0x064D,
-	/* Array index: 0x001B */ 0x2523, 0x2525, 0x0654,
-	/* Array index: 0x001E */ 0x3000, 0x3015, 0x0657,
-	/* Array index: 0x0021 */ 0x3041, 0x3093, 0x066D,
-	/* Array index: 0x0024 */ 0x309B, 0x30F6, 0x06C0,
-	/* Array index: 0x0027 */ 0x30FB, 0x30FE, 0x071C,
-	/* Array index: 0x002A */ 0x4E07, 0x4E19, 0x0720,
-	/* Array index: 0x002D */ 0x4E38, 0x4E3C, 0x0733,
-	/* Array index: 0x0030 */ 0x4E4B, 0x4E4F, 0x0738,
-	/* Array index: 0x0033 */ 0x4E55, 0x4E5F, 0x073D,
-	/* Array index: 0x0036 */ 0x4E85, 0x4EB0, 0x0748,
-	/* Array index: 0x0039 */ 0x4EC0, 0x4ECF, 0x0774,
-	/* Array index: 0x003C */ 0x4ED4, 0x4EE5, 0x0784,
-	/* Array index: 0x003F */ 0x4F09, 0x4F11, 0x0796,
-	/* Array index: 0x0042 */ 0x4F4D, 0x4F5E, 0x079F,
-	/* Array index: 0x0045 */ 0x4FAB, 0x4FAF, 0x07B1,
-	/* Array index: 0x0048 */ 0x4FC2, 0x4FC4, 0x07B6,
-	/* Array index: 0x004B */ 0x4FD7, 0x4FE5, 0x07B9,
-	/* Array index: 0x004E */ 0x5021, 0x502D, 0x07C8,
-	/* Array index: 0x0051 */ 0x5047, 0x5049, 0x07D5,
-	/* Array index: 0x0054 */ 0x5072, 0x5078, 0x07D8,
-	/* Array index: 0x0057 */ 0x5098, 0x509A, 0x07DF,
-	/* Array index: 0x005A */ 0x50B2, 0x50B7, 0x07E2,
-	/* Array index: 0x005D */ 0x5100, 0x5104, 0x07E8,
-	/* Array index: 0x0060 */ 0x5112, 0x511A, 0x07ED,
-	/* Array index: 0x0063 */ 0x513A, 0x5154, 0x07F6,
-	/* Array index: 0x0066 */ 0x5168, 0x516E, 0x0811,
-	/* Array index: 0x0069 */ 0x5175, 0x5178, 0x0818,
-	/* Array index: 0x006C */ 0x5189, 0x5199, 0x081C,
-	/* Array index: 0x006F */ 0x51A2, 0x51B7, 0x082D,
-	/* Array index: 0x0072 */ 0x51C4, 0x51C6, 0x0843,
-	/* Array index: 0x0075 */ 0x51C9, 0x51CD, 0x0846,
-	/* Array index: 0x0078 */ 0x51DB, 0x51E1, 0x084B,
-	/* Array index: 0x007B */ 0x51E6, 0x51EA, 0x0852,
-	/* Array index: 0x007E */ 0x51F5, 0x520B, 0x0857,
-	/* Array index: 0x0081 */ 0x5236, 0x523B, 0x086E,
-	/* Array index: 0x0084 */ 0x524A, 0x524F, 0x0874,
-	/* Array index: 0x0087 */ 0x5263, 0x5265, 0x087A,
-	/* Array index: 0x008A */ 0x526F, 0x5275, 0x087D,
-	/* Array index: 0x008D */ 0x5287, 0x5289, 0x0884,
-	/* Array index: 0x0090 */ 0x52A9, 0x52AD, 0x0887,
-	/* Array index: 0x0093 */ 0x52D5, 0x52E7, 0x088C,
-	/* Array index: 0x0096 */ 0x52F8, 0x52FA, 0x089F,
-	/* Array index: 0x0099 */ 0x52FE, 0x5308, 0x08A2,
-	/* Array index: 0x009C */ 0x5315, 0x531A, 0x08AD,
-	/* Array index: 0x009F */ 0x5338, 0x534A, 0x08B3,
-	/* Array index: 0x00A2 */ 0x5351, 0x5360, 0x08C6,
-	/* Array index: 0x00A5 */ 0x536E, 0x5378, 0x08D6,
-	/* Array index: 0x00A8 */ 0x53A5, 0x53A9, 0x08E1,
-	/* Array index: 0x00AB */ 0x53C8, 0x53CE, 0x08E6,
-	/* Array index: 0x00AE */ 0x53DF, 0x53FA, 0x08ED,
-	/* Array index: 0x00B1 */ 0x5408, 0x5411, 0x0909,
-	/* Array index: 0x00B4 */ 0x5429, 0x542E, 0x0913,
-	/* Array index: 0x00B7 */ 0x5438, 0x5442, 0x0919,
-	/* Array index: 0x00BA */ 0x5446, 0x544A, 0x0924,
-	/* Array index: 0x00BD */ 0x5473, 0x547D, 0x0929,
-	/* Array index: 0x00C0 */ 0x548B, 0x5492, 0x0934,
-	/* Array index: 0x00C3 */ 0x54BC, 0x54C9, 0x093C,
-	/* Array index: 0x00C6 */ 0x54E5, 0x54E9, 0x094A,
-	/* Array index: 0x00C9 */ 0x5544, 0x5546, 0x094F,
-	/* Array index: 0x00CC */ 0x5587, 0x558B, 0x0952,
-	/* Array index: 0x00CF */ 0x5598, 0x559F, 0x0957,
-	/* Array index: 0x00D2 */ 0x55A7, 0x55B0, 0x095F,
-	/* Array index: 0x00D5 */ 0x5614, 0x5618, 0x0969,
-	/* Array index: 0x00D8 */ 0x5668, 0x566C, 0x096E,
-	/* Array index: 0x00DB */ 0x56C0, 0x56C3, 0x0973,
-	/* Array index: 0x00DE */ 0x56D7, 0x56DB, 0x0977,
-	/* Array index: 0x00E1 */ 0x5726, 0x5728, 0x097C,
-	/* Array index: 0x00E4 */ 0x574E, 0x5751, 0x097F,
-	/* Array index: 0x00E7 */ 0x57A0, 0x57A4, 0x0983,
-	/* Array index: 0x00EA */ 0x57D2, 0x57D6, 0x0988,
-	/* Array index: 0x00ED */ 0x582F, 0x5835, 0x098D,
-	/* Array index: 0x00F0 */ 0x5857, 0x585A, 0x0994,
-	/* Array index: 0x00F3 */ 0x58B8, 0x58BB, 0x0998,
-	/* Array index: 0x00F6 */ 0x58D5, 0x58D9, 0x099C,
-	/* Array index: 0x00F9 */ 0x58EB, 0x58F2, 0x09A1,
-	/* Array index: 0x00FC */ 0x58F7, 0x58FD, 0x09A9,
-	/* Array index: 0x00FF */ 0x5915, 0x591C, 0x09B0,
-	/* Array index: 0x0102 */ 0x5927, 0x5932, 0x09B8,
-	/* Array index: 0x0105 */ 0x5947, 0x5949, 0x09C4,
-	/* Array index: 0x0108 */ 0x594E, 0x595A, 0x09C7,
-	/* Array index: 0x010B */ 0x5965, 0x596E, 0x09D4,
-	/* Array index: 0x010E */ 0x5981, 0x5984, 0x09DE,
-	/* Array index: 0x0111 */ 0x59D0, 0x59D4, 0x09E2,
-	/* Array index: 0x0114 */ 0x5ABC, 0x5AC2, 0x09E7,
-	/* Array index: 0x0117 */ 0x5B54, 0x5B66, 0x09EE,
-	/* Array index: 0x011A */ 0x5B85, 0x5B8F, 0x0A01,
-	/* Array index: 0x011D */ 0x5B95, 0x5BA6, 0x0A0C,
-	/* Array index: 0x0120 */ 0x5BB3, 0x5BB9, 0x0A1E,
-	/* Array index: 0x0123 */ 0x5BC2, 0x5BC9, 0x0A25,
-	/* Array index: 0x0126 */ 0x5BD0, 0x5BD4, 0x0A2D,
-	/* Array index: 0x0129 */ 0x5BDB, 0x5BEB, 0x0A32,
-	/* Array index: 0x012C */ 0x5BFE, 0x5C13, 0x0A43,
-	/* Array index: 0x012F */ 0x5C38, 0x5C41, 0x0A59,
-	/* Array index: 0x0132 */ 0x5C4A, 0x5C55, 0x0A63,
-	/* Array index: 0x0135 */ 0x5CA8, 0x5CAC, 0x0A6F,
-	/* Array index: 0x0138 */ 0x5CB6, 0x5CBE, 0x0A74,
-	/* Array index: 0x013B */ 0x5CE8, 0x5CEA, 0x0A7D,
-	/* Array index: 0x013E */ 0x5D14, 0x5D1B, 0x0A80,
-	/* Array index: 0x0141 */ 0x5DE3, 0x5DE8, 0x0A88,
-	/* Array index: 0x0144 */ 0x5DF1, 0x5DF7, 0x0A8E,
-	/* Array index: 0x0147 */ 0x5E19, 0x5E1D, 0x0A95,
-	/* Array index: 0x014A */ 0x5E36, 0x5E38, 0x0A9A,
-	/* Array index: 0x014D */ 0x5E43, 0x5E47, 0x0A9D,
-	/* Array index: 0x0150 */ 0x5E5F, 0x5E64, 0x0AA2,
-	/* Array index: 0x0153 */ 0x5E72, 0x5E84, 0x0AA8,
-	/* Array index: 0x0156 */ 0x5E95, 0x5E97, 0x0ABB,
-	/* Array index: 0x0159 */ 0x5EB5, 0x5EB8, 0x0ABE,
-	/* Array index: 0x015C */ 0x5EC1, 0x5EC3, 0x0AC2,
-	/* Array index: 0x015F */ 0x5EC8, 0x5ECA, 0x0AC5,
-	/* Array index: 0x0162 */ 0x5EDD, 0x5EE3, 0x0AC8,
-	/* Array index: 0x0165 */ 0x5EF0, 0x5F04, 0x0ACF,
-	/* Array index: 0x0168 */ 0x5F09, 0x5F18, 0x0AE4,
-	/* Array index: 0x016B */ 0x5F25, 0x5F29, 0x0AF4,
-	/* Array index: 0x016E */ 0x5F69, 0x5F73, 0x0AF9,
-	/* Array index: 0x0171 */ 0x5F7F, 0x5F99, 0x0B04,
-	/* Array index: 0x0174 */ 0x5FA8, 0x5FAE, 0x0B1F,
-	/* Array index: 0x0177 */ 0x5FD6, 0x5FDD, 0x0B26,
-	/* Array index: 0x017A */ 0x600E, 0x6016, 0x0B2E,
-	/* Array index: 0x017D */ 0x6019, 0x602B, 0x0B37,
-	/* Array index: 0x0180 */ 0x6041, 0x6043, 0x0B4A,
-	/* Array index: 0x0183 */ 0x605F, 0x6070, 0x0B4D,
-	/* Array index: 0x0186 */ 0x6089, 0x608D, 0x0B5F,
-	/* Array index: 0x0189 */ 0x60A6, 0x60AA, 0x0B64,
-	/* Array index: 0x018C */ 0x60B2, 0x60B8, 0x0B69,
-	/* Array index: 0x018F */ 0x60C5, 0x60C7, 0x0B70,
-	/* Array index: 0x0192 */ 0x60DF, 0x60E3, 0x0B73,
-	/* Array index: 0x0195 */ 0x60F0, 0x60FB, 0x0B78,
-	/* Array index: 0x0198 */ 0x610D, 0x610F, 0x0B84,
-	/* Array index: 0x019B */ 0x613C, 0x613F, 0x0B87,
-	/* Array index: 0x019E */ 0x6147, 0x614E, 0x0B8B,
-	/* Array index: 0x01A1 */ 0x6158, 0x615A, 0x0B93,
-	/* Array index: 0x01A4 */ 0x616E, 0x6177, 0x0B96,
-	/* Array index: 0x01A7 */ 0x61C6, 0x61CD, 0x0BA0,
-	/* Array index: 0x01AA */ 0x61F4, 0x6200, 0x0BA8,
-	/* Array index: 0x01AD */ 0x6208, 0x6216, 0x0BB5,
-	/* Array index: 0x01B0 */ 0x621A, 0x6221, 0x0BC4,
-	/* Array index: 0x01B3 */ 0x622E, 0x6234, 0x0BCC,
-	/* Array index: 0x01B6 */ 0x623F, 0x6241, 0x0BD3,
-	/* Array index: 0x01B9 */ 0x6247, 0x624E, 0x0BD6,
-	/* Array index: 0x01BC */ 0x627C, 0x6284, 0x0BDE,
-	/* Array index: 0x01BF */ 0x6291, 0x629E, 0x0BE7,
-	/* Array index: 0x01C2 */ 0x62B9, 0x62BD, 0x0BF5,
-	/* Array index: 0x01C5 */ 0x62C5, 0x62E1, 0x0BFA,
-	/* Array index: 0x01C8 */ 0x62EC, 0x62F7, 0x0C17,
-	/* Array index: 0x01CB */ 0x62FE, 0x6302, 0x0C23,
-	/* Array index: 0x01CE */ 0x6307, 0x6309, 0x0C28,
-	/* Array index: 0x01D1 */ 0x633D, 0x633F, 0x0C2B,
-	/* Array index: 0x01D4 */ 0x634C, 0x6350, 0x0C2E,
-	/* Array index: 0x01D7 */ 0x6367, 0x636B, 0x0C33,
-	/* Array index: 0x01DA */ 0x639F, 0x63AC, 0x0C38,
-	/* Array index: 0x01DD */ 0x64E0, 0x64E7, 0x0C46,
-	/* Array index: 0x01E0 */ 0x652A, 0x652C, 0x0C4E,
-	/* Array index: 0x01E3 */ 0x6534, 0x653F, 0x0C51,
-	/* Array index: 0x01E6 */ 0x6555, 0x6559, 0x0C5D,
-	/* Array index: 0x01E9 */ 0x6574, 0x6578, 0x0C62,
-	/* Array index: 0x01EC */ 0x6587, 0x6589, 0x0C67,
-	/* Array index: 0x01EF */ 0x65AB, 0x65B0, 0x0C6A,
-	/* Array index: 0x01F2 */ 0x65C1, 0x65C6, 0x0C70,
-	/* Array index: 0x01F5 */ 0x65E0, 0x65ED, 0x0C76,
-	/* Array index: 0x01F8 */ 0x6634, 0x6636, 0x0C84,
-	/* Array index: 0x01FB */ 0x663F, 0x6644, 0x0C87,
-	/* Array index: 0x01FE */ 0x665D, 0x665F, 0x0C8D,
-	/* Array index: 0x0201 */ 0x6664, 0x6669, 0x0C90,
-	/* Array index: 0x0204 */ 0x666E, 0x6670, 0x0C96,
-	/* Array index: 0x0207 */ 0x6683, 0x6689, 0x0C99,
-	/* Array index: 0x020A */ 0x6696, 0x6698, 0x0CA0,
-	/* Array index: 0x020D */ 0x66D9, 0x66DD, 0x0CA3,
-	/* Array index: 0x0210 */ 0x66F0, 0x6700, 0x0CA8,
-	/* Array index: 0x0213 */ 0x6714, 0x6717, 0x0CB9,
-	/* Array index: 0x0216 */ 0x671B, 0x671F, 0x0CBD,
-	/* Array index: 0x0219 */ 0x6726, 0x672E, 0x0CC2,
-	/* Array index: 0x021C */ 0x6734, 0x673A, 0x0CCB,
-	/* Array index: 0x021F */ 0x674E, 0x6753, 0x0CD2,
-	/* Array index: 0x0222 */ 0x675C, 0x6765, 0x0CD8,
-	/* Array index: 0x0225 */ 0x676D, 0x6777, 0x0CE2,
-	/* Array index: 0x0228 */ 0x679C, 0x67A2, 0x0CED,
-	/* Array index: 0x022B */ 0x67B3, 0x67B9, 0x0CF4,
-	/* Array index: 0x022E */ 0x67CE, 0x67D4, 0x0CFB,
-	/* Array index: 0x0231 */ 0x67F1, 0x67F5, 0x0D02,
-	/* Array index: 0x0234 */ 0x67FE, 0x6804, 0x0D07,
-	/* Array index: 0x0237 */ 0x6829, 0x682B, 0x0D0E,
-	/* Array index: 0x023A */ 0x683C, 0x6843, 0x0D11,
-	/* Array index: 0x023D */ 0x684D, 0x6854, 0x0D19,
-	/* Array index: 0x0240 */ 0x68A6, 0x68A8, 0x0D21,
-	/* Array index: 0x0243 */ 0x68AD, 0x68BC, 0x0D24,
-	/* Array index: 0x0246 */ 0x68C9, 0x68CD, 0x0D34,
-	/* Array index: 0x0249 */ 0x68D4, 0x68DA, 0x0D39,
-	/* Array index: 0x024C */ 0x68DF, 0x68E3, 0x0D40,
-	/* Array index: 0x024F */ 0x690B, 0x690F, 0x0D45,
-	/* Array index: 0x0252 */ 0x6919, 0x691C, 0x0D4A,
-	/* Array index: 0x0255 */ 0x6921, 0x692A, 0x0D4E,
-	/* Array index: 0x0258 */ 0x6953, 0x6955, 0x0D58,
-	/* Array index: 0x025B */ 0x6959, 0x6962, 0x0D5B,
-	/* Array index: 0x025E */ 0x696A, 0x6982, 0x0D65,
-	/* Array index: 0x0261 */ 0x69CA, 0x69D0, 0x0D7E,
-	/* Array index: 0x0264 */ 0x6A0A, 0x6A0C, 0x0D85,
-	/* Array index: 0x0267 */ 0x6A12, 0x6A14, 0x0D88,
-	/* Array index: 0x026A */ 0x6A1E, 0x6A23, 0x0D8B,
-	/* Array index: 0x026D */ 0x6A29, 0x6A2B, 0x0D91,
-	/* Array index: 0x0270 */ 0x6A35, 0x6A3A, 0x0D94,
-	/* Array index: 0x0273 */ 0x6AC1, 0x6AC3, 0x0D9A,
-	/* Array index: 0x0276 */ 0x6B1D, 0x6B23, 0x0D9D,
-	/* Array index: 0x0279 */ 0x6B37, 0x6B3E, 0x0DA4,
-	/* Array index: 0x027C */ 0x6B5F, 0x6B6A, 0x0DAC,
-	/* Array index: 0x027F */ 0x6B89, 0x6B8D, 0x0DB8,
-	/* Array index: 0x0282 */ 0x6BAF, 0x6BC0, 0x0DBD,
-	/* Array index: 0x0285 */ 0x6BD2, 0x6BD4, 0x0DCF,
-	/* Array index: 0x0288 */ 0x6C3E, 0x6C42, 0x0DD2,
-	/* Array index: 0x028B */ 0x6C5D, 0x6C62, 0x0DD7,
-	/* Array index: 0x028E */ 0x6C7D, 0x6C83, 0x0DDD,
-	/* Array index: 0x0291 */ 0x6C99, 0x6C9B, 0x0DE4,
-	/* Array index: 0x0294 */ 0x6CB8, 0x6CC5, 0x0DE7,
-	/* Array index: 0x0297 */ 0x6CE1, 0x6CE5, 0x0DF5,
-	/* Array index: 0x029A */ 0x6CEF, 0x6CF3, 0x0DFA,
-	/* Array index: 0x029D */ 0x6D29, 0x6D2B, 0x0DFF,
-	/* Array index: 0x02A0 */ 0x6D32, 0x6D38, 0x0E02,
-	/* Array index: 0x02A3 */ 0x6D77, 0x6D79, 0x0E09,
-	/* Array index: 0x02A6 */ 0x6DC5, 0x6DC7, 0x0E0C,
-	/* Array index: 0x02A9 */ 0x6DE8, 0x6DEE, 0x0E0F,
-	/* Array index: 0x02AC */ 0x6DF7, 0x6DFB, 0x0E16,
-	/* Array index: 0x02AF */ 0x6E05, 0x6E0B, 0x0E1B,
-	/* Array index: 0x02B2 */ 0x6E19, 0x6E26, 0x0E22,
-	/* Array index: 0x02B5 */ 0x6E29, 0x6E2F, 0x0E30,
-	/* Array index: 0x02B8 */ 0x6E7E, 0x6E82, 0x0E37,
-	/* Array index: 0x02BB */ 0x6ED1, 0x6ED5, 0x0E3C,
-	/* Array index: 0x02BE */ 0x6EFE, 0x6F02, 0x0E41,
-	/* Array index: 0x02C1 */ 0x6F11, 0x6F15, 0x0E46,
-	/* Array index: 0x02C4 */ 0x6F6D, 0x6F70, 0x0E4B,
-	/* Array index: 0x02C7 */ 0x6F80, 0x6F86, 0x0E4F,
-	/* Array index: 0x02CA */ 0x6FC0, 0x6FC3, 0x0E56,
-	/* Array index: 0x02CD */ 0x6FDF, 0x6FE1, 0x0E5A,
-	/* Array index: 0x02D0 */ 0x6FEB, 0x6FF3, 0x0E5D,
-	/* Array index: 0x02D3 */ 0x701A, 0x701F, 0x0E66,
-	/* Array index: 0x02D6 */ 0x70AC, 0x70AF, 0x0E6C,
-	/* Array index: 0x02D9 */ 0x70B8, 0x70BA, 0x0E70,
-	/* Array index: 0x02DC */ 0x7162, 0x7169, 0x0E73,
-	/* Array index: 0x02DF */ 0x71E5, 0x71E7, 0x0E7B,
-	/* Array index: 0x02E2 */ 0x71EC, 0x71EE, 0x0E7E,
-	/* Array index: 0x02E5 */ 0x723A, 0x7240, 0x0E81,
-	/* Array index: 0x02E8 */ 0x7246, 0x724C, 0x0E88,
-	/* Array index: 0x02EB */ 0x727D, 0x7282, 0x0E8F,
-	/* Array index: 0x02EE */ 0x72C2, 0x72C6, 0x0E95,
-	/* Array index: 0x02F1 */ 0x72E0, 0x72E2, 0x0E9A,
-	/* Array index: 0x02F4 */ 0x72F7, 0x72FD, 0x0E9D,
-	/* Array index: 0x02F7 */ 0x731B, 0x731F, 0x0EA4,
-	/* Array index: 0x02FA */ 0x7329, 0x732F, 0x0EA9,
-	/* Array index: 0x02FD */ 0x7432, 0x7436, 0x0EB0,
-	/* Array index: 0x0300 */ 0x7459, 0x7464, 0x0EB5,
-	/* Array index: 0x0303 */ 0x74EE, 0x74F8, 0x0EC1,
-	/* Array index: 0x0306 */ 0x7503, 0x7505, 0x0ECC,
-	/* Array index: 0x0309 */ 0x750C, 0x750E, 0x0ECF,
-	/* Array index: 0x030C */ 0x7530, 0x7533, 0x0ED2,
-	/* Array index: 0x030F */ 0x7537, 0x753C, 0x0ED6,
-	/* Array index: 0x0312 */ 0x7549, 0x7551, 0x0EDC,
-	/* Array index: 0x0315 */ 0x7559, 0x755D, 0x0EE5,
-	/* Array index: 0x0318 */ 0x7562, 0x756D, 0x0EEA,
-	/* Array index: 0x031B */ 0x7573, 0x7578, 0x0EF6,
-	/* Array index: 0x031E */ 0x7586, 0x7591, 0x0EFC,
-	/* Array index: 0x0321 */ 0x75B1, 0x75BE, 0x0F08,
-	/* Array index: 0x0324 */ 0x75F0, 0x75F4, 0x0F16,
-	/* Array index: 0x0327 */ 0x761F, 0x7624, 0x0F1B,
-	/* Array index: 0x032A */ 0x7646, 0x7648, 0x0F21,
-	/* Array index: 0x032D */ 0x7667, 0x766C, 0x0F24,
-	/* Array index: 0x0330 */ 0x7678, 0x7688, 0x0F2A,
-	/* Array index: 0x0333 */ 0x76B7, 0x76BA, 0x0F3B,
-	/* Array index: 0x0336 */ 0x76DB, 0x76E7, 0x0F3F,
-	/* Array index: 0x0339 */ 0x7707, 0x770C, 0x0F4C,
-	/* Array index: 0x033C */ 0x771E, 0x7726, 0x0F52,
-	/* Array index: 0x033F */ 0x77B9, 0x77BF, 0x0F5B,
-	/* Array index: 0x0342 */ 0x77DA, 0x77DC, 0x0F62,
-	/* Array index: 0x0345 */ 0x77ED, 0x77EF, 0x0F65,
-	/* Array index: 0x0348 */ 0x7825, 0x7827, 0x0F68,
-	/* Array index: 0x034B */ 0x788C, 0x788E, 0x0F6B,
-	/* Array index: 0x034E */ 0x792A, 0x792C, 0x0F6E,
-	/* Array index: 0x0351 */ 0x7947, 0x7949, 0x0F71,
-	/* Array index: 0x0354 */ 0x7953, 0x7957, 0x0F74,
-	/* Array index: 0x0357 */ 0x795D, 0x7962, 0x0F79,
-	/* Array index: 0x035A */ 0x797F, 0x7985, 0x0F7F,
-	/* Array index: 0x035D */ 0x798D, 0x798F, 0x0F86,
-	/* Array index: 0x0360 */ 0x79B9, 0x79C1, 0x0F89,
-	/* Array index: 0x0363 */ 0x79E3, 0x79E9, 0x0F92,
-	/* Array index: 0x0366 */ 0x7A17, 0x7A20, 0x0F99,
-	/* Array index: 0x0369 */ 0x7A3B, 0x7A43, 0x0FA3,
-	/* Array index: 0x036C */ 0x7A4D, 0x7A50, 0x0FAC,
-	/* Array index: 0x036F */ 0x7A61, 0x7A63, 0x0FB0,
-	/* Array index: 0x0372 */ 0x7A92, 0x7A98, 0x0FB3,
-	/* Array index: 0x0375 */ 0x7AAE, 0x7AB0, 0x0FBA,
-	/* Array index: 0x0378 */ 0x7AC3, 0x7AD5, 0x0FBD,
-	/* Array index: 0x037B */ 0x7AD9, 0x7AE6, 0x0FD0,
-	/* Array index: 0x037E */ 0x7AF6, 0x7AFA, 0x0FDE,
-	/* Array index: 0x0381 */ 0x7B45, 0x7B56, 0x0FE3,
-	/* Array index: 0x0384 */ 0x7B94, 0x7BA1, 0x0FF5,
-	/* Array index: 0x0387 */ 0x7BE4, 0x7BE6, 0x1003,
-	/* Array index: 0x038A */ 0x7C11, 0x7C14, 0x1006,
-	/* Array index: 0x038D */ 0x7C3D, 0x7C40, 0x100A,
-	/* Array index: 0x0390 */ 0x7C4C, 0x7C50, 0x100E,
-	/* Array index: 0x0393 */ 0x7C81, 0x7C83, 0x1013,
-	/* Array index: 0x0396 */ 0x7CA1, 0x7CA8, 0x1016,
-	/* Array index: 0x0399 */ 0x7CAD, 0x7CB3, 0x101E,
-	/* Array index: 0x039C */ 0x7CDC, 0x7CE2, 0x1025,
-	/* Array index: 0x039F */ 0x7D02, 0x7D06, 0x102C,
-	/* Array index: 0x03A2 */ 0x7D14, 0x7D22, 0x1031,
-	/* Array index: 0x03A5 */ 0x7D2B, 0x7D35, 0x1040,
-	/* Array index: 0x03A8 */ 0x7D42, 0x7D46, 0x104B,
-	/* Array index: 0x03AB */ 0x7D4B, 0x7D50, 0x1050,
-	/* Array index: 0x03AE */ 0x7D61, 0x7D63, 0x1056,
-	/* Array index: 0x03B1 */ 0x7D71, 0x7D76, 0x1059,
-	/* Array index: 0x03B4 */ 0x7D99, 0x7D9C, 0x105F,
-	/* Array index: 0x03B7 */ 0x7DAB, 0x7DB5, 0x1063,
-	/* Array index: 0x03BA */ 0x7DBA, 0x7DBF, 0x106E,
-	/* Array index: 0x03BD */ 0x7DDA, 0x7DE1, 0x1074,
-	/* Array index: 0x03C0 */ 0x7E09, 0x7E0B, 0x107C,
-	/* Array index: 0x03C3 */ 0x7E1E, 0x7E23, 0x107F,
-	/* Array index: 0x03C6 */ 0x7E37, 0x7E3E, 0x1085,
-	/* Array index: 0x03C9 */ 0x7E54, 0x7E5E, 0x108D,
-	/* Array index: 0x03CC */ 0x7E66, 0x7E6A, 0x1098,
-	/* Array index: 0x03CF */ 0x7E79, 0x7E83, 0x109D,
-	/* Array index: 0x03D2 */ 0x7E8C, 0x7E96, 0x10A8,
-	/* Array index: 0x03D5 */ 0x7F4C, 0x7F55, 0x10B3,
-	/* Array index: 0x03D8 */ 0x7F67, 0x7F6B, 0x10BD,
-	/* Array index: 0x03DB */ 0x7F75, 0x7F79, 0x10C2,
-	/* Array index: 0x03DE */ 0x7F82, 0x7F8E, 0x10C7,
-	/* Array index: 0x03E1 */ 0x8000, 0x8006, 0x10D4,
-	/* Array index: 0x03E4 */ 0x8015, 0x8019, 0x10DB,
-	/* Array index: 0x03E7 */ 0x805E, 0x8062, 0x10E0,
-	/* Array index: 0x03EA */ 0x806F, 0x807F, 0x10E5,
-	/* Array index: 0x03ED */ 0x8084, 0x808C, 0x10F6,
-	/* Array index: 0x03F0 */ 0x80A9, 0x80B4, 0x10FF,
-	/* Array index: 0x03F3 */ 0x80D9, 0x80DE, 0x110B,
-	/* Array index: 0x03F6 */ 0x8105, 0x810A, 0x1111,
-	/* Array index: 0x03F9 */ 0x8150, 0x8155, 0x1117,
-	/* Array index: 0x03FC */ 0x8178, 0x817A, 0x111D,
-	/* Array index: 0x03FF */ 0x817F, 0x8183, 0x1120,
-	/* Array index: 0x0402 */ 0x81BD, 0x81C2, 0x1125,
-	/* Array index: 0x0405 */ 0x81D8, 0x81DA, 0x112B,
-	/* Array index: 0x0408 */ 0x81FA, 0x8202, 0x112E,
-	/* Array index: 0x040B */ 0x8205, 0x821F, 0x1137,
-	/* Array index: 0x040E */ 0x8229, 0x822E, 0x1152,
-	/* Array index: 0x0411 */ 0x8233, 0x8239, 0x1158,
-	/* Array index: 0x0414 */ 0x8258, 0x825A, 0x115F,
-	/* Array index: 0x0417 */ 0x826E, 0x8278, 0x1162,
-	/* Array index: 0x041A */ 0x82AB, 0x82B3, 0x116D,
-	/* Array index: 0x041D */ 0x82D1, 0x82D4, 0x1176,
-	/* Array index: 0x0420 */ 0x82DB, 0x82E7, 0x117A,
-	/* Array index: 0x0423 */ 0x82F9, 0x82FB, 0x1187,
-	/* Array index: 0x0426 */ 0x8302, 0x8306, 0x118A,
-	/* Array index: 0x0429 */ 0x8316, 0x8318, 0x118F,
-	/* Array index: 0x042C */ 0x8331, 0x8339, 0x1192,
-	/* Array index: 0x042F */ 0x839E, 0x83A2, 0x119B,
-	/* Array index: 0x0432 */ 0x83EF, 0x83F4, 0x11A0,
-	/* Array index: 0x0435 */ 0x840B, 0x840E, 0x11A6,
-	/* Array index: 0x0438 */ 0x8461, 0x8463, 0x11AA,
-	/* Array index: 0x043B */ 0x8469, 0x8471, 0x11AD,
-	/* Array index: 0x043E */ 0x84B8, 0x84BC, 0x11B6,
-	/* Array index: 0x0441 */ 0x84C9, 0x84D1, 0x11BB,
-	/* Array index: 0x0444 */ 0x8511, 0x851A, 0x11C4,
-	/* Array index: 0x0447 */ 0x8548, 0x854B, 0x11CE,
-	/* Array index: 0x044A */ 0x8568, 0x856A, 0x11D2,
-	/* Array index: 0x044D */ 0x85A6, 0x85AF, 0x11D5,
-	/* Array index: 0x0450 */ 0x85F7, 0x85FB, 0x11DF,
-	/* Array index: 0x0453 */ 0x868A, 0x868C, 0x11E4,
-	/* Array index: 0x0456 */ 0x86A9, 0x86AB, 0x11E7,
-	/* Array index: 0x0459 */ 0x86EC, 0x86EF, 0x11EA,
-	/* Array index: 0x045C */ 0x8706, 0x870A, 0x11EE,
-	/* Array index: 0x045F */ 0x880D, 0x8811, 0x11F3,
-	/* Array index: 0x0462 */ 0x8821, 0x8823, 0x11F8,
-	/* Array index: 0x0465 */ 0x885D, 0x8863, 0x11FB,
-	/* Array index: 0x0468 */ 0x887D, 0x8882, 0x1202,
-	/* Array index: 0x046B */ 0x88BF, 0x88C5, 0x1208,
-	/* Array index: 0x046E */ 0x88F2, 0x88F4, 0x120F,
-	/* Array index: 0x0471 */ 0x88F8, 0x88FE, 0x1212,
-	/* Array index: 0x0474 */ 0x895E, 0x8960, 0x1219,
-	/* Array index: 0x0477 */ 0x8986, 0x898B, 0x121C,
-	/* Array index: 0x047A */ 0x8996, 0x899A, 0x1222,
-	/* Array index: 0x047D */ 0x89A6, 0x89AC, 0x1227,
-	/* Array index: 0x0480 */ 0x8A16, 0x8A18, 0x122E,
-	/* Array index: 0x0483 */ 0x8A3A, 0x8A3C, 0x1231,
-	/* Array index: 0x0486 */ 0x8A50, 0x8A55, 0x1234,
-	/* Array index: 0x0489 */ 0x8A69, 0x8A73, 0x123A,
-	/* Array index: 0x048C */ 0x8AA0, 0x8AA8, 0x1245,
-	/* Array index: 0x048F */ 0x8ACB, 0x8ACF, 0x124E,
-	/* Array index: 0x0492 */ 0x8ADA, 0x8AE7, 0x1253,
-	/* Array index: 0x0495 */ 0x8AFE, 0x8B04, 0x1261,
-	/* Array index: 0x0498 */ 0x8B16, 0x8B21, 0x1268,
-	/* Array index: 0x049B */ 0x8B58, 0x8B5C, 0x1274,
-	/* Array index: 0x049E */ 0x8B6B, 0x8B74, 0x1279,
-	/* Array index: 0x04A1 */ 0x8C6A, 0x8C6C, 0x1283,
-	/* Array index: 0x04A4 */ 0x8C78, 0x8C7C, 0x1286,
-	/* Array index: 0x04A7 */ 0x8C89, 0x8C8E, 0x128B,
-	/* Array index: 0x04AA */ 0x8C9D, 0x8CA2, 0x1291,
-	/* Array index: 0x04AD */ 0x8CA7, 0x8CCE, 0x1297,
-	/* Array index: 0x04B0 */ 0x8CDA, 0x8CE6, 0x12BF,
-	/* Array index: 0x04B3 */ 0x8CFA, 0x8CFD, 0x12CC,
-	/* Array index: 0x04B6 */ 0x8D04, 0x8D16, 0x12D0,
-	/* Array index: 0x04B9 */ 0x8D70, 0x8D74, 0x12E3,
-	/* Array index: 0x04BC */ 0x8E08, 0x8E0A, 0x12E8,
-	/* Array index: 0x04BF */ 0x8E1D, 0x8E1F, 0x12EB,
-	/* Array index: 0x04C2 */ 0x8E47, 0x8E4C, 0x12EE,
-	/* Array index: 0x04C5 */ 0x8EAA, 0x8EB1, 0x12F4,
-	/* Array index: 0x04C8 */ 0x8EC8, 0x8ECD, 0x12FC,
-	/* Array index: 0x04CB */ 0x8EFB, 0x8EFE, 0x1302,
-	/* Array index: 0x04CE */ 0x8F12, 0x8F15, 0x1306,
-	/* Array index: 0x04D1 */ 0x8F19, 0x8F1F, 0x130A,
-	/* Array index: 0x04D4 */ 0x8F42, 0x8F46, 0x1311,
-	/* Array index: 0x04D7 */ 0x8F4C, 0x8F4E, 0x1316,
-	/* Array index: 0x04DA */ 0x8F5F, 0x8F64, 0x1319,
-	/* Array index: 0x04DD */ 0x8F9B, 0x8F9F, 0x131F,
-	/* Array index: 0x04E0 */ 0x8FAD, 0x8FB2, 0x1324,
-	/* Array index: 0x04E3 */ 0x8FBA, 0x8FBC, 0x132A,
-	/* Array index: 0x04E6 */ 0x8FE5, 0x8FF0, 0x132D,
-	/* Array index: 0x04E9 */ 0x8FF7, 0x8FFA, 0x1339,
-	/* Array index: 0x04EC */ 0x900B, 0x9023, 0x133D,
-	/* Array index: 0x04EF */ 0x9035, 0x9039, 0x1356,
-	/* Array index: 0x04F2 */ 0x9047, 0x9059, 0x135B,
-	/* Array index: 0x04F5 */ 0x906D, 0x906F, 0x136E,
-	/* Array index: 0x04F8 */ 0x9075, 0x9084, 0x1371,
-	/* Array index: 0x04FB */ 0x9149, 0x914E, 0x1381,
-	/* Array index: 0x04FE */ 0x91C6, 0x91D1, 0x1387,
-	/* Array index: 0x0501 */ 0x91DB, 0x91E7, 0x1393,
-	/* Array index: 0x0504 */ 0x9298, 0x929C, 0x13A0,
-	/* Array index: 0x0507 */ 0x9318, 0x931A, 0x13A5,
-	/* Array index: 0x050A */ 0x932B, 0x932F, 0x13A8,
-	/* Array index: 0x050D */ 0x93AC, 0x93B0, 0x13AD,
-	/* Array index: 0x0510 */ 0x93D6, 0x93D8, 0x13B2,
-	/* Array index: 0x0513 */ 0x9418, 0x941A, 0x13B5,
-	/* Array index: 0x0516 */ 0x9451, 0x9453, 0x13B8,
-	/* Array index: 0x0519 */ 0x947C, 0x9481, 0x13BB,
-	/* Array index: 0x051C */ 0x9587, 0x958B, 0x13C1,
-	/* Array index: 0x051F */ 0x95A0, 0x95A8, 0x13C6,
-	/* Array index: 0x0522 */ 0x95D4, 0x95D8, 0x13CF,
-	/* Array index: 0x0525 */ 0x964B, 0x9650, 0x13D4,
-	/* Array index: 0x0528 */ 0x965B, 0x9666, 0x13DA,
-	/* Array index: 0x052B */ 0x9672, 0x967A, 0x13E6,
-	/* Array index: 0x052E */ 0x968A, 0x968F, 0x13EF,
-	/* Array index: 0x0531 */ 0x9694, 0x969C, 0x13F5,
-	/* Array index: 0x0534 */ 0x96B0, 0x96BC, 0x13FE,
-	/* Array index: 0x0537 */ 0x96C0, 0x96CE, 0x140B,
-	/* Array index: 0x053A */ 0x9704, 0x9713, 0x141A,
-	/* Array index: 0x053D */ 0x975E, 0x976D, 0x142A,
-	/* Array index: 0x0540 */ 0x9784, 0x9786, 0x143A,
-	/* Array index: 0x0543 */ 0x97F2, 0x97F6, 0x143D,
-	/* Array index: 0x0546 */ 0x97FF, 0x9808, 0x1442,
-	/* Array index: 0x0549 */ 0x980F, 0x9813, 0x144C,
-	/* Array index: 0x054C */ 0x9837, 0x983D, 0x1451,
-	/* Array index: 0x054F */ 0x984B, 0x984F, 0x1458,
-	/* Array index: 0x0552 */ 0x986F, 0x9874, 0x145D,
-	/* Array index: 0x0555 */ 0x98EB, 0x98EF, 0x1463,
-	/* Array index: 0x0558 */ 0x98FC, 0x98FE, 0x1468,
-	/* Array index: 0x055B */ 0x9910, 0x9914, 0x146B,
-	/* Array index: 0x055E */ 0x991D, 0x9921, 0x1470,
-	/* Array index: 0x0561 */ 0x9950, 0x9952, 0x1475,
-	/* Array index: 0x0564 */ 0x9996, 0x9999, 0x1478,
-	/* Array index: 0x0567 */ 0x99AC, 0x99AE, 0x147C,
-	/* Array index: 0x056A */ 0x99C4, 0x99C8, 0x147F,
-	/* Array index: 0x056D */ 0x99D0, 0x99D2, 0x1484,
-	/* Array index: 0x0570 */ 0x9A69, 0x9A6B, 0x1487,
-	/* Array index: 0x0573 */ 0x9AEA, 0x9AF1, 0x148A,
-	/* Array index: 0x0576 */ 0x9B25, 0x9B2A, 0x1492,
-	/* Array index: 0x0579 */ 0x9B2E, 0x9B32, 0x1498,
-	/* Array index: 0x057C */ 0x9B41, 0x9B45, 0x149D,
-	/* Array index: 0x057F */ 0x9B4D, 0x9B51, 0x14A2,
-	/* Array index: 0x0582 */ 0x9B91, 0x9B97, 0x14A7,
-	/* Array index: 0x0585 */ 0x9BAA, 0x9BAE, 0x14AE,
-	/* Array index: 0x0588 */ 0x9BE1, 0x9BE4, 0x14B3,
-	/* Array index: 0x058B */ 0x9BF0, 0x9BF2, 0x14B7,
-	/* Array index: 0x058E */ 0x9C06, 0x9C0D, 0x14BA,
-	/* Array index: 0x0591 */ 0x9C10, 0x9C15, 0x14C2,
-	/* Array index: 0x0594 */ 0x9C2D, 0x9C32, 0x14C8,
-	/* Array index: 0x0597 */ 0x9C39, 0x9C3B, 0x14CE,
-	/* Array index: 0x059A */ 0x9C46, 0x9C48, 0x14D1,
-	/* Array index: 0x059D */ 0x9D06, 0x9D09, 0x14D4,
-	/* Array index: 0x05A0 */ 0x9D28, 0x9D2C, 0x14D8,
-	/* Array index: 0x05A3 */ 0x9D5C, 0x9D61, 0x14DD,
-	/* Array index: 0x05A6 */ 0x9DF8, 0x9DFA, 0x14E3,
-	/* Array index: 0x05A9 */ 0x9E91, 0x9E97, 0x14E6,
-	/* Array index: 0x05AC */ 0x9EB8, 0x9EBF, 0x14ED,
-	/* Array index: 0x05AF */ 0x9ECC, 0x9ED4, 0x14F5,
-	/* Array index: 0x05B2 */ 0x9ED8, 0x9EE0, 0x14FE,
-	/* Array index: 0x05B5 */ 0x9EF9, 0x9EFD, 0x1507,
-	/* Array index: 0x05B8 */ 0x9F5F, 0x9F67, 0x150C,
-	/* Array index: 0x05BB */ 0xFF01, 0xFF5D, 0x1515,
-	/* Ranges content */
-	/* Range 0x0391 - 0x03A9, array index: 0x05BE */
-	0x2621,0x2622,0x2623,0x2624,0x2625,0x2626,0x2627,0x2628,
-	0x2629,0x262A,0x262B,0x262C,0x262D,0x262E,0x262F,0x2630,
-	0x2631,INVALC,0x2632,0x2633,0x2634,0x2635,0x2636,0x2637,
-	0x2638,
-	/* Range 0x03B1 - 0x03C9, array index: 0x05D7 */
-	0x2641,0x2642,0x2643,0x2644,0x2645,0x2646,0x2647,0x2648,
-	0x2649,0x264A,0x264B,0x264C,0x264D,0x264E,0x264F,0x2650,
-	0x2651,INVALC,0x2652,0x2653,0x2654,0x2655,0x2656,0x2657,
-	0x2658,
-	/* Range 0x0410 - 0x0451, array index: 0x05F0 */
-	0x2721,0x2722,0x2723,0x2724,0x2725,0x2726,0x2728,0x2729,
-	0x272A,0x272B,0x272C,0x272D,0x272E,0x272F,0x2730,0x2731,
-	0x2732,0x2733,0x2734,0x2735,0x2736,0x2737,0x2738,0x2739,
-	0x273A,0x273B,0x273C,0x273D,0x273E,0x273F,0x2740,0x2741,
-	0x2751,0x2752,0x2753,0x2754,0x2755,0x2756,0x2758,0x2759,
-	0x275A,0x275B,0x275C,0x275D,0x275E,0x275F,0x2760,0x2761,
-	0x2762,0x2763,0x2764,0x2765,0x2766,0x2767,0x2768,0x2769,
-	0x276A,0x276B,0x276C,0x276D,0x276E,0x276F,0x2770,0x2771,
-	INVALC,0x2757,
-	/* Range 0x2015 - 0x2021, array index: 0x0632 */
-	0x213D,0x2142,INVALC,0x2146,0x2147,INVALC,INVALC,0x2148,
-	0x2149,INVALC,INVALC,0x2277,0x2278,
-	/* Range 0x2190 - 0x2193, array index: 0x063F */
-	0x222B,0x222C,0x222A,0x222D,
-	/* Range 0x2227 - 0x222C, array index: 0x0643 */
-	0x224A,0x224B,0x2241,0x2240,0x2269,0x226A,
-	/* Range 0x2500 - 0x2503, array index: 0x0649 */
-	0x2821,0x282C,0x2822,0x282D,
-	/* Range 0x2517 - 0x251D, array index: 0x064D */
-	0x2831,0x2825,INVALC,INVALC,0x2830,0x2827,0x283C,
-	/* Range 0x2523 - 0x2525, array index: 0x0654 */
-	0x2832,0x2829,0x283E,
-	/* Range 0x3000 - 0x3015, array index: 0x0657 */
-	0x2121,0x2122,0x2123,0x2137,INVALC,0x2139,0x213A,0x213B,
-	0x2152,0x2153,0x2154,0x2155,0x2156,0x2157,0x2158,0x2159,
-	0x215A,0x215B,0x2229,0x222E,0x214C,0x214D,
-	/* Range 0x3041 - 0x3093, array index: 0x066D */
-	0x2421,0x2422,0x2423,0x2424,0x2425,0x2426,0x2427,0x2428,
-	0x2429,0x242A,0x242B,0x242C,0x242D,0x242E,0x242F,0x2430,
-	0x2431,0x2432,0x2433,0x2434,0x2435,0x2436,0x2437,0x2438,
-	0x2439,0x243A,0x243B,0x243C,0x243D,0x243E,0x243F,0x2440,
-	0x2441,0x2442,0x2443,0x2444,0x2445,0x2446,0x2447,0x2448,
-	0x2449,0x244A,0x244B,0x244C,0x244D,0x244E,0x244F,0x2450,
-	0x2451,0x2452,0x2453,0x2454,0x2455,0x2456,0x2457,0x2458,
-	0x2459,0x245A,0x245B,0x245C,0x245D,0x245E,0x245F,0x2460,
-	0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467,0x2468,
-	0x2469,0x246A,0x246B,0x246C,0x246D,0x246E,0x246F,0x2470,
-	0x2471,0x2472,0x2473,
-	/* Range 0x309B - 0x30F6, array index: 0x06C0 */
-	0x212B,0x212C,0x2135,0x2136,INVALC,INVALC,0x2521,0x2522,
-	0x2523,0x2524,0x2525,0x2526,0x2527,0x2528,0x2529,0x252A,
-	0x252B,0x252C,0x252D,0x252E,0x252F,0x2530,0x2531,0x2532,
-	0x2533,0x2534,0x2535,0x2536,0x2537,0x2538,0x2539,0x253A,
-	0x253B,0x253C,0x253D,0x253E,0x253F,0x2540,0x2541,0x2542,
-	0x2543,0x2544,0x2545,0x2546,0x2547,0x2548,0x2549,0x254A,
-	0x254B,0x254C,0x254D,0x254E,0x254F,0x2550,0x2551,0x2552,
-	0x2553,0x2554,0x2555,0x2556,0x2557,0x2558,0x2559,0x255A,
-	0x255B,0x255C,0x255D,0x255E,0x255F,0x2560,0x2561,0x2562,
-	0x2563,0x2564,0x2565,0x2566,0x2567,0x2568,0x2569,0x256A,
-	0x256B,0x256C,0x256D,0x256E,0x256F,0x2570,0x2571,0x2572,
-	0x2573,0x2574,0x2575,0x2576,
-	/* Range 0x30FB - 0x30FE, array index: 0x071C */
-	0x2126,0x213C,0x2133,0x2134,
-	/* Range 0x4E07 - 0x4E19, array index: 0x0720 */
-	0x4B7C,0x3E66,0x3B30,0x3E65,0x323C,INVALC,0x4954,0x4D3F,
-	INVALC,0x5022,0x312F,INVALC,INVALC,0x336E,0x5023,0x4024,
-	0x5242,0x3556,0x4A3A,
-	/* Range 0x4E38 - 0x4E3C, array index: 0x0733 */
-	0x345D,0x4330,INVALC,0x3C67,0x5027,
-	/* Range 0x4E4B - 0x4E4F, array index: 0x0738 */
-	0x4737,INVALC,0x4663,0x3843,0x4B33,
-	/* Range 0x4E55 - 0x4E5F, array index: 0x073D */
-	0x6949,0x502A,0x3E68,0x502B,0x3235,INVALC,INVALC,INVALC,
-	0x3665,0x3870,0x4C69,
-	/* Range 0x4E85 - 0x4EB0, array index: 0x0748 */
-	0x502D,0x4E3B,INVALC,0x4D3D,0x4168,0x502F,0x3B76,0x4673,
-	INVALC,0x5032,INVALC,INVALC,0x313E,0x385F,INVALC,0x385E,
-	0x3066,INVALC,INVALC,0x4F4B,0x4F4A,INVALC,0x3A33,0x3021,
-	INVALC,0x5033,0x5034,0x5035,0x4B34,0x5036,INVALC,0x3872,
-	0x3067,0x4B72,INVALC,0x357C,INVALC,INVALC,0x357D,0x357E,
-	0x4462,0x4E3C,INVALC,0x5037,
-	/* Range 0x4EC0 - 0x4ECF, array index: 0x0774 */
-	0x3D3A,0x3F4E,0x503E,INVALC,0x503C,INVALC,0x503D,0x3558,
-	INVALC,INVALC,0x3A23,0x3270,INVALC,0x503B,0x503A,0x4A29,
-	/* Range 0x4ED4 - 0x4EE5, array index: 0x0784 */
-	0x3B46,0x3B45,0x423E,0x503F,0x4955,0x4067,INVALC,INVALC,
-	INVALC,0x2138,0x5040,0x5042,INVALC,INVALC,INVALC,0x4265,
-	0x4E61,0x304A,
-	/* Range 0x4F09 - 0x4F11, array index: 0x0796 */
-	0x5044,0x304B,INVALC,INVALC,0x3860,0x346C,0x497A,0x4832,
-	0x3559,
-	/* Range 0x4F4D - 0x4F5E, array index: 0x079F */
-	0x304C,0x4463,0x3D3B,0x3A34,0x4D24,INVALC,0x424E,INVALC,
-	0x323F,INVALC,0x5049,INVALC,0x4D3E,0x5045,0x5047,0x3A6E,
-	0x5048,0x5524,
-	/* Range 0x4FAB - 0x4FAF, array index: 0x07B1 */
-	0x5525,INVALC,0x4B79,0x496E,0x3874,
-	/* Range 0x4FC2 - 0x4FC4, array index: 0x07B6 */
-	0x3738,0x4225,0x3264,
-	/* Range 0x4FD7 - 0x4FE5, array index: 0x07B9 */
-	0x422F,0x505A,INVALC,0x505D,0x505B,INVALC,0x4A5D,INVALC,
-	0x5058,INVALC,0x3F2E,INVALC,0x4B73,0x505F,0x5060,
-	/* Range 0x5021 - 0x502D, array index: 0x07C8 */
-	0x5069,INVALC,0x4A6F,0x434D,0x5065,0x3771,INVALC,0x5062,
-	0x506A,0x5064,0x4E51,0x506B,0x4F41,
-	/* Range 0x5047 - 0x5049, array index: 0x07D5 */
-	0x5071,0x5075,0x304E,
-	/* Range 0x5072 - 0x5078, array index: 0x07D8 */
-	0x3C45,INVALC,0x4226,0x4465,0x3676,INVALC,0x5079,
-	/* Range 0x5098 - 0x509A, array index: 0x07DF */
-	0x3B31,0x4877,0x507B,
-	/* Range 0x50B2 - 0x50B7, array index: 0x07E2 */
-	0x507E,0x5123,0x507D,0x3A44,INVALC,0x3D7D,
-	/* Range 0x5100 - 0x5104, array index: 0x07E8 */
-	0x3537,0x512E,0x512F,INVALC,0x322F,
-	/* Range 0x5112 - 0x511A, array index: 0x07ED */
-	0x3C74,INVALC,0x5132,0x5131,0x5130,INVALC,0x5056,INVALC,
-	0x5133,
-	/* Range 0x513A - 0x5154, array index: 0x07F6 */
-	0x5135,0x5138,0x5137,INVALC,INVALC,0x5139,0x513A,0x3074,
-	INVALC,0x3835,0x373B,0x3D3C,0x437B,0x3624,0x4068,0x3877,
-	INVALC,0x396E,0x513C,0x4C48,0x4546,INVALC,0x3B79,INVALC,
-	0x513B,INVALC,0x513D,
-	/* Range 0x5168 - 0x516E, array index: 0x0811 */
-	0x4134,0x5140,0x5141,0x482C,0x3878,0x4F3B,0x5142,
-	/* Range 0x5175 - 0x5178, array index: 0x0818 */
-	0x4A3C,0x4236,0x3671,0x4535,
-	/* Range 0x5189 - 0x5199, array index: 0x081C */
-	0x5147,0x3A7D,INVALC,0x5146,0x3A46,INVALC,0x5148,0x666E,
-	0x5149,0x4B41,0x514A,INVALC,0x514B,0x514C,0x3E69,INVALC,
-	0x3C4C,
-	/* Range 0x51A2 - 0x51B7, array index: 0x082D */
-	0x514F,INVALC,0x514D,0x4C3D,0x514E,INVALC,0x495A,0x5150,
-	0x5151,0x5152,0x455F,INVALC,INVALC,INVALC,0x5156,0x5154,
-	0x5155,0x5153,0x3A63,0x5157,0x4C6A,0x4E64,
-	/* Range 0x51C4 - 0x51C6, array index: 0x0843 */
-	0x4028,0x5159,0x3D5A,
-	/* Range 0x51C9 - 0x51CD, array index: 0x0846 */
-	0x515A,INVALC,0x437C,0x4E3F,0x4560,
-	/* Range 0x51DB - 0x51E1, array index: 0x084B */
-	0x515B,0x7425,0x3645,INVALC,INVALC,0x515C,0x4B5E,
-	/* Range 0x51E6 - 0x51EA, array index: 0x0852 */
-	0x3D68,0x427C,INVALC,0x515E,0x4664,
-	/* Range 0x51F5 - 0x520B, array index: 0x0857 */
-	0x5161,0x3627,INVALC,0x464C,0x317A,0x3D50,INVALC,INVALC,
-	0x4821,0x5162,INVALC,0x4561,INVALC,INVALC,0x3F4F,0x5163,
-	INVALC,0x4A2C,0x405A,0x3422,INVALC,0x3429,0x5164,
-	/* Range 0x5236 - 0x523B, array index: 0x086E */
-	0x4029,0x3A7E,0x3774,0x516B,0x3B49,0x396F,
-	/* Range 0x524A - 0x524F, array index: 0x0874 */
-	0x3A6F,0x516E,0x516F,0x4130,INVALC,0x516C,
-	/* Range 0x5263 - 0x5265, array index: 0x087A */
-	0x3775,0x3A5E,0x476D,
-	/* Range 0x526F - 0x5275, array index: 0x087D */
-	0x497B,0x3E6A,0x517B,0x3364,0x5175,0x5173,0x414F,
-	/* Range 0x5287 - 0x5289, array index: 0x0884 */
-	0x3760,0x517C,0x4E2D,
-	/* Range 0x52A9 - 0x52AD, array index: 0x0887 */
-	0x3D75,0x4558,0x3965,0x5222,0x5223,
-	/* Range 0x52D5 - 0x52E7, array index: 0x088C */
-	0x4630,INVALC,0x5228,0x342A,0x4C33,INVALC,INVALC,INVALC,
-	0x3E21,0x5229,0x4A67,0x522D,INVALC,0x402A,0x522A,0x3650,
-	INVALC,0x522B,0x342B,
-	/* Range 0x52F8 - 0x52FA, array index: 0x089F */
-	0x5230,0x5231,0x3C5B,
-	/* Range 0x52FE - 0x5308, array index: 0x08A2 */
-	0x387B,0x4C5E,INVALC,0x4C68,0x4677,INVALC,INVALC,0x4A71,
-	0x5232,INVALC,0x5233,
-	/* Range 0x5315 - 0x531A, array index: 0x08AD */
-	0x5238,0x323D,0x4B4C,INVALC,0x3A7C,0x5239,
-	/* Range 0x5338 - 0x534A, array index: 0x08B3 */
-	0x523E,0x4924,0x3668,0x3065,INVALC,INVALC,INVALC,0x463F,
-	0x523F,0x3D3D,INVALC,0x4069,INVALC,0x5241,0x5240,0x3E23,
-	0x3861,0x5243,0x483E,
-	/* Range 0x5351 - 0x5360, array index: 0x08C6 */
-	0x485C,0x4234,0x426E,0x3628,INVALC,INVALC,0x466E,0x4331,
-	INVALC,0x476E,INVALC,0x4B4E,INVALC,0x5246,INVALC,0x406A,
-	/* Range 0x536E - 0x5378, array index: 0x08D6 */
-	0x5248,0x312C,0x3075,0x346D,INVALC,0x4228,0x3551,0x4D71,
-	INVALC,0x524B,0x3237,
-	/* Range 0x53A5 - 0x53A9, array index: 0x08E1 */
-	0x5250,0x524F,INVALC,0x3F5F,0x3139,
-	/* Range 0x53C8 - 0x53CE, array index: 0x08E6 */
-	0x4B74,0x3A35,0x355A,0x4D27,0x4150,0x483F,0x3C7D,
-	/* Range 0x53DF - 0x53FA, array index: 0x08ED */
-	0x5257,INVALC,0x3143,0x4151,0x387D,0x3845,0x3667,INVALC,
-	INVALC,0x525B,0x4321,0x427E,0x362B,0x3E24,0x525C,0x525A,
-	0x3244,0x4266,0x3C38,0x3B4B,0x3126,INVALC,INVALC,0x3370,
-	0x3966,0x3B4A,INVALC,0x525D,
-	/* Range 0x5408 - 0x5411, array index: 0x0909 */
-	0x3967,0x3548,0x445F,0x3125,0x4631,0x4C3E,0x3921,0x4D79,
-	0x4547,0x387E,
-	/* Range 0x5429 - 0x542E, array index: 0x0913 */
-	0x5266,INVALC,0x345E,0x5261,0x5262,0x5264,
-	/* Range 0x5438 - 0x5442, array index: 0x0919 */
-	0x355B,0x3F61,INVALC,0x4A2D,0x5263,0x525F,0x3863,INVALC,
-	0x5260,INVALC,0x4F24,
-	/* Range 0x5446 - 0x544A, array index: 0x0924 */
-	0x4A72,INVALC,0x4468,0x3862,0x3970,
-	/* Range 0x5473 - 0x547D, array index: 0x0929 */
-	0x4C23,INVALC,0x526A,0x5273,0x526E,INVALC,INVALC,INVALC,
-	0x5271,0x3846,0x4C3F,
-	/* Range 0x548B - 0x5492, array index: 0x0934 */
-	0x3A70,0x4F42,INVALC,0x526B,0x5269,0x5275,INVALC,0x5270,
-	/* Range 0x54BC - 0x54C9, array index: 0x093C */
-	0x5325,0x3076,0x5324,INVALC,0x3025,0x494A,0x5322,INVALC,
-	0x527C,INVALC,INVALC,0x5277,0x527D,0x3A48,
-	/* Range 0x54E5 - 0x54E9, array index: 0x094A */
-	0x5327,0x5328,INVALC,0x3E25,0x4B69,
-	/* Range 0x5544 - 0x5546, array index: 0x094F */
-	0x426F,0x5336,0x3E26,
-	/* Range 0x5587 - 0x558B, array index: 0x0952 */
-	0x5349,INVALC,0x3922,0x533F,0x437D,
-	/* Range 0x5598 - 0x559F, array index: 0x0957 */
-	0x5343,0x533C,0x342D,INVALC,0x346E,0x3365,0x5344,0x5340,
-	/* Range 0x55A7 - 0x55B0, array index: 0x095F */
-	0x3776,0x534A,0x5348,0x4153,0x354A,0x362C,INVALC,0x5345,
-	INVALC,0x3674,
-	/* Range 0x5614 - 0x5618, array index: 0x0969 */
-	0x5352,INVALC,0x5354,0x3E28,0x3133,
-	/* Range 0x5668 - 0x566C, array index: 0x096E */
-	0x346F,INVALC,0x5364,0x5360,0x5363,
-	/* Range 0x56C0 - 0x56C3, array index: 0x0973 */
-	0x5373,0x5371,0x536F,0x5372,
-	/* Range 0x56D7 - 0x56DB, array index: 0x0977 */
-	0x5378,0x5145,INVALC,0x3C7C,0x3B4D,
-	/* Range 0x5726 - 0x5728, array index: 0x097C */
-	0x5429,0x3035,0x3A5F,
-	/* Range 0x574E - 0x5751, array index: 0x097F */
-	0x542C,0x542F,0x3A41,0x3923,
-	/* Range 0x57A0 - 0x57A4, array index: 0x0983 */
-	0x5437,INVALC,0x3924,0x3340,0x5439,
-	/* Range 0x57D2 - 0x57D6, array index: 0x0988 */
-	0x543F,0x5440,0x543E,INVALC,0x5442,
-	/* Range 0x582F - 0x5835, array index: 0x098D */
-	0x7421,0x3161,0x4A73,INVALC,INVALC,0x3E6C,0x4548,
-	/* Range 0x5857 - 0x585A, array index: 0x0994 */
-	0x4549,0x4564,0x4839,0x444D,
-	/* Range 0x58B8 - 0x58BB, array index: 0x0998 */
-	0x5457,0x5451,0x5454,0x5456,
-	/* Range 0x58D5 - 0x58D9, array index: 0x099C */
-	0x3968,INVALC,0x545C,0x545E,0x545D,
-	/* Range 0x58EB - 0x58F2, array index: 0x09A1 */
-	0x3B4E,0x3F51,INVALC,0x4154,0x5463,0x403C,0x306D,0x4764,
-	/* Range 0x58F7 - 0x58FD, array index: 0x09A9 */
-	0x445B,INVALC,0x5465,0x5464,0x5466,0x5467,0x5468,
-	/* Range 0x5915 - 0x591C, array index: 0x09B0 */
-	0x4D3C,0x3330,INVALC,0x5249,0x3D48,0x423F,0x546C,0x4C6B,
-	/* Range 0x5927 - 0x5932, array index: 0x09B8 */
-	0x4267,INVALC,0x4537,0x4240,0x4957,0x546F,0x5470,0x317B,
-	INVALC,INVALC,0x3C3A,0x5471,
-	/* Range 0x5947 - 0x5949, array index: 0x09C4 */
-	0x3471,0x4660,0x4A74,
-	/* Range 0x594E - 0x595A, array index: 0x09C7 */
-	0x5477,0x4155,0x5476,0x3740,INVALC,INVALC,0x4B5B,0x5475,
-	INVALC,0x4565,0x5479,INVALC,0x5478,
-	/* Range 0x5965 - 0x596E, array index: 0x09D4 */
-	0x317C,INVALC,0x547C,0x3E29,0x547E,0x4325,INVALC,0x547D,
-	INVALC,0x4A33,
-	/* Range 0x5981 - 0x5984, array index: 0x09DE */
-	0x5522,0x4721,0x485E,0x4C51,
-	/* Range 0x59D0 - 0x59D4, array index: 0x09E2 */
-	0x3039,0x3848,INVALC,0x402B,0x3051,
-	/* Range 0x5ABC - 0x5AC2, array index: 0x09E7 */
-	0x553C,0x5540,0x553D,INVALC,INVALC,0x3247,0x553F,
-	/* Range 0x5B54 - 0x5B66, array index: 0x09EE */
-	0x3926,0x5554,INVALC,0x3B7A,0x4238,INVALC,0x5555,0x5556,
-	0x3B5A,0x3927,INVALC,0x4C52,INVALC,INVALC,INVALC,0x3528,
-	0x3849,0x5557,0x3358,
-	/* Range 0x5B85 - 0x5B8F, array index: 0x0A01 */
-	0x4270,INVALC,0x3127,0x3C69,0x3042,INVALC,0x4157,0x3430,
-	0x3C35,INVALC,0x3928,
-	/* Range 0x5B95 - 0x5BA6, array index: 0x0A0C */
-	0x4566,INVALC,0x3D21,0x3431,0x4368,0x446A,0x3038,0x3539,
-	0x4A75,INVALC,0x3C42,INVALC,INVALC,0x3552,0x406B,0x3C3C,
-	0x4D28,0x5561,
-	/* Range 0x5BB3 - 0x5BB9, array index: 0x0A1E */
-	0x3332,0x3163,0x3E2C,0x3248,INVALC,0x5562,0x4D46,
-	/* Range 0x5BC2 - 0x5BC9, array index: 0x0A25 */
-	0x3C64,0x5563,0x3473,0x4652,0x4C29,0x5564,INVALC,0x5565,
-	/* Range 0x5BD0 - 0x5BD4, array index: 0x0A2D */
-	0x5567,INVALC,0x3428,0x3677,0x5566,
-	/* Range 0x5BDB - 0x5BEB, array index: 0x0A32 */
-	0x3432,INVALC,0x3F32,0x556B,0x3B21,INVALC,0x3249,0x556A,
-	INVALC,0x5568,0x556C,0x5569,0x472B,0x5C4D,0x3F33,INVALC,
-	0x556D,
-	/* Range 0x5BFE - 0x5C13, array index: 0x0A43 */
-	0x4250,0x3C77,INVALC,0x4975,0x406C,INVALC,0x3C4D,0x5571,
-	0x3E2D,0x5572,0x5573,0x3053,0x423A,0x3F52,INVALC,0x5574,
-	0x4633,0x3E2E,INVALC,0x3E2F,INVALC,0x5575,
-	/* Range 0x5C38 - 0x5C41, array index: 0x0A59 */
-	0x5579,0x557A,0x3C5C,0x3F2C,0x4674,0x3F54,0x4878,0x4722,
-	0x3649,0x557B,
-	/* Range 0x5C4A - 0x5C55, array index: 0x0A63 */
-	0x464F,0x3230,INVALC,0x3B53,0x557D,0x5622,0x5621,0x367D,
-	INVALC,0x557E,INVALC,0x4538,
-	/* Range 0x5CA8 - 0x5CAC, array index: 0x0A6F */
-	0x413B,0x3464,INVALC,0x562D,0x4C28,
-	/* Range 0x5CB6 - 0x5CBE, array index: 0x0A74 */
-	0x562F,0x5631,0x345F,INVALC,INVALC,0x562E,0x5630,INVALC,
-	0x5633,
-	/* Range 0x5CE8 - 0x5CEA, array index: 0x0A7D */
-	0x3265,0x5636,0x563B,
-	/* Range 0x5D14 - 0x5D1B, array index: 0x0A80 */
-	0x5643,0x563D,0x3333,0x563E,0x5647,0x5646,0x5645,0x5641,
-	/* Range 0x5DE3 - 0x5DE8, array index: 0x0A88 */
-	0x4163,INVALC,0x3929,0x3A38,0x392A,0x3570,
-	/* Range 0x5DF1 - 0x5DF7, array index: 0x0A8E */
-	0x384A,0x5661,0x4C26,0x4743,0x5662,INVALC,0x392B,
-	/* Range 0x5E19 - 0x5E1D, array index: 0x0A95 */
-	0x5665,0x5664,0x5667,INVALC,0x446B,
-	/* Range 0x5E36 - 0x5E38, array index: 0x0A9A */
-	0x5668,0x5669,0x3E6F,
-	/* Range 0x5E43 - 0x5E47, array index: 0x0A9D */
-	0x566B,0x566A,0x497D,INVALC,0x5673,
-	/* Range 0x5E5F - 0x5E64, array index: 0x0AA2 */
-	0x5670,INVALC,0x4828,0x5671,0x4A3E,0x5672,
-	/* Range 0x5E72 - 0x5E84, array index: 0x0AA8 */
-	0x3433,0x4A3F,0x472F,0x5674,0x5675,INVALC,0x392C,0x3434,
-	0x5676,0x3838,0x4D44,0x4D29,0x3476,0x5678,INVALC,0x4423,
-	INVALC,0x392D,0x3E31,
-	/* Range 0x5E95 - 0x5E97, array index: 0x0ABB */
-	0x446C,0x4A79,0x4539,
-	/* Range 0x5EB5 - 0x5EB8, array index: 0x0ABE */
-	0x3043,0x3D6E,0x392F,0x4D47,
-	/* Range 0x5EC1 - 0x5EC3, array index: 0x0AC2 */
-	0x567A,0x567B,0x4751,
-	/* Range 0x5EC8 - 0x5ECA, array index: 0x0AC5 */
-	0x567C,0x4E77,0x4F2D,
-	/* Range 0x5EDD - 0x5EE3, array index: 0x0AC8 */
-	0x5723,INVALC,0x4940,0x3E33,0x5727,0x5726,0x5722,
-	/* Range 0x5EF0 - 0x5F04, array index: 0x0ACF */
-	0x572D,0x572B,INVALC,0x572C,0x572E,INVALC,0x3164,0x446E,
-	0x572F,INVALC,0x377A,0x3276,0x4736,INVALC,0x5730,0x467B,
-	INVALC,0x4A5B,INVALC,0x5731,0x4F2E,
-	/* Range 0x5F09 - 0x5F18, array index: 0x0AE4 */
-	0x5732,0x4A40,0x5735,0x5021,0x5031,INVALC,0x3C30,0x4675,
-	0x5736,INVALC,0x355D,0x4424,0x307A,0x5737,0x4A26,0x3930,
-	/* Range 0x5F25 - 0x5F29, array index: 0x0AF4 */
-	0x4C6F,0x3839,0x384C,INVALC,0x5738,
-	/* Range 0x5F69 - 0x5F73, array index: 0x0AF9 */
-	0x3A4C,0x4937,0x4426,0x494B,0x5745,INVALC,INVALC,0x3E34,
-	0x3146,INVALC,0x5746,
-	/* Range 0x5F7F - 0x5F99, array index: 0x0B04 */
-	0x574A,0x317D,0x402C,0x5749,0x5748,0x3742,0x4254,INVALC,
-	0x574E,0x574C,INVALC,0x574B,0x4E27,0x3865,INVALC,INVALC,
-	INVALC,0x3D79,0x574D,0x454C,0x3D3E,INVALC,INVALC,INVALC,
-	0x4640,0x5751,0x5750,
-	/* Range 0x5FA8 - 0x5FAE, array index: 0x0B1F */
-	0x5753,0x497C,0x3D5B,INVALC,INVALC,0x5754,0x4879,
-	/* Range 0x5FD6 - 0x5FDD, array index: 0x0B26 */
-	0x5756,0x3B56,0x4B3A,0x4B3B,INVALC,INVALC,0x317E,0x575B,
-	/* Range 0x600E - 0x6016, array index: 0x0B2E */
-	0x5763,0x5769,0x5761,INVALC,0x455C,INVALC,INVALC,0x5766,
-	0x495D,
-	/* Range 0x6019 - 0x602B, array index: 0x0B37 */
-	0x5760,INVALC,0x5765,0x4E67,0x3B57,INVALC,INVALC,0x4255,
-	0x575E,INVALC,INVALC,INVALC,0x355E,0x5768,0x402D,0x3165,
-	0x5762,0x3278,0x5767,
-	/* Range 0x6041 - 0x6043, array index: 0x0B4A */
-	0x576C,0x5776,0x5774,
-	/* Range 0x605F - 0x6070, array index: 0x0B4D */
-	0x576F,0x575F,INVALC,0x327A,0x5773,0x5775,0x4351,INVALC,
-	INVALC,0x3A28,0x3238,0x576D,0x5778,0x5777,0x3633,INVALC,
-	0x4229,0x3366,
-	/* Range 0x6089 - 0x608D, array index: 0x0B5F */
-	0x3C3D,INVALC,0x5827,0x4470,0x577B,
-	/* Range 0x60A6 - 0x60AA, array index: 0x0B64 */
-	0x3159,0x5826,INVALC,0x473A,0x302D,
-	/* Range 0x60B2 - 0x60B8, array index: 0x0B69 */
-	0x4861,0x575C,0x582C,0x5830,0x4C65,INVALC,0x5829,
-	/* Range 0x60C5 - 0x60C7, array index: 0x0B70 */
-	0x3E70,0x582F,0x4657,
-	/* Range 0x60DF - 0x60E3, array index: 0x0B73 */
-	0x3054,0x582A,0x5828,INVALC,0x415A,
-	/* Range 0x60F0 - 0x60FB, array index: 0x0B78 */
-	0x4246,0x583D,INVALC,0x415B,0x5838,INVALC,0x5835,0x5836,
-	INVALC,0x3C66,0x5839,0x583C,
-	/* Range 0x610D - 0x610F, array index: 0x0B84 */
-	0x583E,0x583F,0x3055,
-	/* Range 0x613C - 0x613F, array index: 0x0B87 */
-	0x5846,0x5849,0x5841,0x5845,
-	/* Range 0x6147 - 0x614E, array index: 0x0B8B */
-	0x5840,0x3B7C,INVALC,0x5844,0x4256,0x3932,0x5832,0x3F35,
-	/* Range 0x6158 - 0x615A, array index: 0x0B93 */
-	0x584E,0x584F,0x5850,
-	/* Range 0x616E - 0x6177, array index: 0x0B96 */
-	0x4E38,0x5853,0x3056,0x5855,INVALC,0x584C,0x5852,0x5859,
-	0x3744,0x584D,
-	/* Range 0x61C6 - 0x61CD, array index: 0x0BA0 */
-	0x586A,0x3A29,0x5868,0x5866,0x5865,0x586C,0x5864,0x586E,
-	/* Range 0x61F4 - 0x6200, array index: 0x0BA8 */
-	0x5873,INVALC,0x5871,0x5867,0x377C,INVALC,0x5872,INVALC,
-	0x5876,0x5875,0x5877,0x5874,0x5878,
-	/* Range 0x6208 - 0x6216, array index: 0x0BB5 */
-	0x5879,0x587A,0x4A6A,INVALC,0x587C,0x587B,0x3D3F,INVALC,
-	0x402E,0x3266,0x327C,INVALC,0x587D,INVALC,0x303F,
-	/* Range 0x621A - 0x6221, array index: 0x0BC4 */
-	0x404C,0x587E,INVALC,0x6C43,0x5921,0x3761,INVALC,0x5922,
-	/* Range 0x622E - 0x6234, array index: 0x0BCC */
-	0x5924,0x353A,0x5925,INVALC,0x5926,0x5927,0x4257,
-	/* Range 0x623F - 0x6241, array index: 0x0BD3 */
-	0x4B3C,0x3D6A,0x5928,
-	/* Range 0x6247 - 0x624E, array index: 0x0BD6 */
-	0x4070,0x6E3D,0x4862,INVALC,0x3C6A,INVALC,0x3A4D,0x5929,
-	/* Range 0x627C - 0x6284, array index: 0x0BDE */
-	0x592F,INVALC,0x5932,0x3E35,0x353B,INVALC,0x5930,0x5937,
-	0x3E36,
-	/* Range 0x6291 - 0x629E, array index: 0x0BE7 */
-	0x4D5E,0x5933,0x5934,0x5938,0x456A,0x5935,0x3933,0x405E,
-	INVALC,INVALC,0x5946,0x4834,INVALC,0x4272,
-	/* Range 0x62B9 - 0x62BD, array index: 0x0BF5 */
-	0x4B75,INVALC,0x593B,0x3221,0x436A,
-	/* Range 0x62C5 - 0x62E1, array index: 0x0BFA */
-	0x4334,0x593E,0x5945,0x5940,0x5947,0x5943,INVALC,0x5942,
-	0x476F,INVALC,0x593C,0x327D,0x593A,0x3571,0x4273,0x5936,
-	INVALC,INVALC,0x5939,0x3934,0x405B,INVALC,0x3E37,0x5941,
-	0x4752,INVALC,INVALC,0x3572,0x3348,
-	/* Range 0x62EC - 0x62F7, array index: 0x0C17 */
-	0x3367,0x3F21,0x5949,0x594E,INVALC,0x594A,INVALC,0x377D,
-	INVALC,0x594F,0x3B22,0x3969,
-	/* Range 0x62FE - 0x6302, array index: 0x0C23 */
-	0x3D26,0x593D,INVALC,0x3B7D,0x594C,
-	/* Range 0x6307 - 0x6309, array index: 0x0C28 */
-	0x3B58,0x594D,0x3044,
-	/* Range 0x633D - 0x633F, array index: 0x0C2B */
-	0x4854,0x5951,0x415E,
-	/* Range 0x634C - 0x6350, array index: 0x0C2E */
-	0x3B2B,0x5952,INVALC,0x5954,0x5950,
-	/* Range 0x6367 - 0x636B, array index: 0x0C33 */
-	0x4A7B,0x3C4E,0x5960,INVALC,0x595F,
-	/* Range 0x639F - 0x63AC, array index: 0x0C38 */
-	0x595D,0x4E2B,0x3A4E,0x4335,0x595A,INVALC,0x405C,INVALC,
-	0x3935,0x3F64,0x3166,0x413C,0x5958,0x3545,
-	/* Range 0x64E0 - 0x64E7, array index: 0x0C46 */
-	0x5A2B,0x5A2C,0x4527,0x5A2E,INVALC,INVALC,0x3B24,0x5A29,
-	/* Range 0x652A - 0x652C, array index: 0x0C4E */
-	0x5978,0x5A3C,0x5A30,
-	/* Range 0x6534 - 0x653F, array index: 0x0C51 */
-	0x5A3D,0x5A3E,0x5A40,0x5A3F,0x5A41,0x327E,INVALC,0x3936,
-	INVALC,INVALC,0x4A7C,0x402F,
-	/* Range 0x6555 - 0x6559, array index: 0x0C5D */
-	0x5A45,0x5A44,0x4754,0x5A47,0x3635,
-	/* Range 0x6574 - 0x6578, array index: 0x0C62 */
-	0x4030,0x4528,INVALC,0x495F,0x5A4B,
-	/* Range 0x6587 - 0x6589, array index: 0x0C67 */
-	0x4A38,0x555D,0x4046,
-	/* Range 0x65AB - 0x65B0, array index: 0x0C6A */
-	0x5A51,0x3B42,0x4347,INVALC,0x3B5B,0x3F37,
-	/* Range 0x65C1 - 0x65C6, array index: 0x0C70 */
-	0x5A55,INVALC,0x5A53,0x5A56,0x4E39,0x5A54,
-	/* Range 0x65E0 - 0x65ED, array index: 0x0C76 */
-	0x5A5B,0x5A5C,0x347B,INVALC,INVALC,0x467C,0x4336,0x356C,
-	0x3B5D,0x4161,INVALC,INVALC,0x3D5C,0x3030,
-	/* Range 0x6634 - 0x6636, array index: 0x0C84 */
-	0x5A65,0x5A63,0x5A64,
-	/* Range 0x663F - 0x6644, array index: 0x0C87 */
-	0x5B26,INVALC,0x5A6A,0x3B7E,0x3938,0x5A68,
-	/* Range 0x665D - 0x665F, array index: 0x0C8D */
-	0x5A6C,0x5A6B,0x5A70,
-	/* Range 0x6664 - 0x6669, array index: 0x0C90 */
-	0x5A6D,INVALC,0x3322,0x5A6E,0x5A6F,0x4855,
-	/* Range 0x666E - 0x6670, array index: 0x0C96 */
-	0x4961,0x374A,0x5A72,
-	/* Range 0x6683 - 0x6689, array index: 0x0C99 */
-	0x5A73,0x5A77,INVALC,INVALC,0x324B,0x5A74,0x5A76,
-	/* Range 0x6696 - 0x6698, array index: 0x0CA0 */
-	0x4348,0x3045,0x5A78,
-	/* Range 0x66D9 - 0x66DD, array index: 0x0CA3 */
-	0x3D6C,0x5B24,INVALC,0x4D4B,0x4778,
-	/* Range 0x66F0 - 0x6700, array index: 0x0CA8 */
-	0x5B29,INVALC,0x364A,0x3148,0x3939,0x5B2A,INVALC,0x5B2B,
-	0x3D71,0x4162,INVALC,INVALC,0x5258,0x413E,0x413D,0x4258,
-	0x3A47,
-	/* Range 0x6714 - 0x6717, array index: 0x0CB9 */
-	0x3A73,0x443F,0x5B2D,0x4F2F,
-	/* Range 0x671B - 0x671F, array index: 0x0CBD */
-	0x4B3E,INVALC,0x442B,0x5B2E,0x347C,
-	/* Range 0x6726 - 0x672E, array index: 0x0CC2 */
-	0x5B2F,0x5B30,0x4C5A,INVALC,0x4C24,0x4B76,0x4B5C,0x3B25,
-	0x5B32,
-	/* Range 0x6734 - 0x673A, array index: 0x0CCB */
-	0x4B51,INVALC,0x5B34,0x5B37,0x5B36,INVALC,0x3479,
-	/* Range 0x674E - 0x6753, array index: 0x0CD2 */
-	0x4D7B,0x3049,0x3A60,0x423C,INVALC,0x3C5D,
-	/* Range 0x675C - 0x6765, array index: 0x0CD8 */
-	0x454E,INVALC,0x5B39,0x422B,0x5B3A,0x3E72,0x4C5D,0x5B3C,
-	0x5B3D,0x4D68,
-	/* Range 0x676D - 0x6777, array index: 0x0CE2 */
-	0x393A,INVALC,0x4755,0x5B3F,0x456C,0x5A5E,0x5A62,INVALC,
-	0x354F,INVALC,0x4747,
-	/* Range 0x679C - 0x67A2, array index: 0x0CED */
-	0x324C,0x3B5E,INVALC,INVALC,0x4F48,0x5B46,0x3F75,
-	/* Range 0x67B3 - 0x67B9, array index: 0x0CF4 */
-	0x5B4C,0x5B4A,INVALC,0x324D,0x5B48,0x5B4E,0x5B54,
-	/* Range 0x67CE - 0x67D4, array index: 0x0CFB */
-	0x5B55,0x4770,0x4B3F,0x343B,INVALC,0x4077,0x3D40,
-	/* Range 0x67F1 - 0x67F5, array index: 0x0D02 */
-	0x436C,INVALC,0x4C78,0x3C46,0x3A74,
-	/* Range 0x67FE - 0x6804, array index: 0x0D07 */
-	0x4B6F,0x3341,INVALC,INVALC,0x444E,0x464A,0x3149,
-	/* Range 0x6829 - 0x682B, array index: 0x0D0E */
-	0x5B5B,0x3374,0x5B61,
-	/* Range 0x683C - 0x6843, array index: 0x0D11 */
-	0x334A,0x3A4F,INVALC,INVALC,0x5B5C,0x3765,0x374B,0x456D,
-	/* Range 0x684D - 0x6854, array index: 0x0D19 */
-	0x5B5D,0x5B5F,INVALC,0x364D,0x372C,INVALC,0x343C,0x354B,
-	/* Range 0x68A6 - 0x68A8, array index: 0x0D21 */
-	0x546D,0x3868,0x4D7C,
-	/* Range 0x68AD - 0x68BC, array index: 0x0D24 */
-	0x5B68,INVALC,0x4474,0x3323,0x3A2D,INVALC,0x5B60,INVALC,
-	0x5B70,0x3361,INVALC,INVALC,0x5B6E,0x5B72,INVALC,0x456E,
-	/* Range 0x68C9 - 0x68CD, array index: 0x0D34 */
-	0x4C49,0x5B77,0x347D,INVALC,0x5B7E,
-	/* Range 0x68D4 - 0x68DA, array index: 0x0D39 */
-	0x5C21,0x5C23,INVALC,0x5C27,0x5B79,INVALC,0x432A,
-	/* Range 0x68DF - 0x68E3, array index: 0x0D40 */
-	0x456F,0x5C2B,0x5B7C,INVALC,0x5C28,
-	/* Range 0x690B - 0x690F, array index: 0x0D45 */
-	0x4C3A,0x5B7D,0x3F22,0x4447,0x5B73,
-	/* Range 0x6919 - 0x691C, array index: 0x0D4A */
-	0x3F7A,0x5C2F,0x3371,0x3821,
-	/* Range 0x6921 - 0x692A, array index: 0x0D4E */
-	0x5C31,0x5B7A,0x5C30,INVALC,0x5C29,0x5B7B,INVALC,0x5C2D,
-	INVALC,0x5C2E,
-	/* Range 0x6953 - 0x6955, array index: 0x0D58 */
-	0x4976,0x5C38,0x424A,
-	/* Range 0x6959 - 0x6962, array index: 0x0D5B */
-	0x5C3E,0x413F,INVALC,0x5C35,0x5C42,0x5C41,INVALC,0x466F,
-	0x5C40,0x466A,
-	/* Range 0x696A - 0x6982, array index: 0x0D65 */
-	0x5C44,0x5C37,INVALC,0x3648,0x5C3A,0x3D5D,INVALC,INVALC,
-	INVALC,0x4760,0x5C3C,0x364B,INVALC,0x5C34,0x5C36,0x5C33,
-	INVALC,INVALC,0x4F30,0x335A,0x5C39,INVALC,INVALC,0x5C43,
-	0x3335,
-	/* Range 0x69CA - 0x69D0, array index: 0x0D7E */
-	0x5C4E,0x393D,0x4448,0x4164,0x5C4C,INVALC,0x5C47,
-	/* Range 0x6A0A - 0x6A0C, array index: 0x0D85 */
-	0x5C68,0x4875,0x5C6E,
-	/* Range 0x6A12 - 0x6A14, array index: 0x0D88 */
-	0x5C69,0x5C6C,0x5C66,
-	/* Range 0x6A1E - 0x6A23, array index: 0x0D8B */
-	0x5C64,0x3E40,INVALC,0x4C4F,0x5C78,0x5C6B,
-	/* Range 0x6A29 - 0x6A2B, array index: 0x0D91 */
-	0x3822,0x3223,0x335F,
-	/* Range 0x6A35 - 0x6A3A, array index: 0x0D94 */
-	0x3E41,0x5C70,INVALC,0x5C77,0x3C79,0x3372,
-	/* Range 0x6AC1 - 0x6AC3, array index: 0x0D9A */
-	0x5C6A,0x5D25,0x5D24,
-	/* Range 0x6B1D - 0x6B23, array index: 0x0D9D */
-	0x3135,INVALC,0x5D36,0x3767,0x3C21,INVALC,0x3655,
-	/* Range 0x6B37 - 0x6B3E, array index: 0x0DA4 */
-	0x5D38,0x5D37,0x5D3A,0x353D,INVALC,INVALC,0x3656,0x343E,
-	/* Range 0x6B5F - 0x6B6A, array index: 0x0DAC */
-	0x5D43,INVALC,0x5D44,0x3B5F,0x4035,0x3A21,INVALC,0x4970,
-	INVALC,INVALC,0x4A62,0x4F44,
-	/* Range 0x6B89 - 0x6B8D, array index: 0x0DB8 */
-	0x3D5E,0x3C6C,0x3B44,INVALC,0x5D4B,
-	/* Range 0x6BAF - 0x6BC0, array index: 0x0DBD */
-	0x5D52,INVALC,0x5D54,0x5D53,0x5D55,0x3225,0x434A,INVALC,
-	0x5D56,INVALC,INVALC,0x3B26,0x334C,0x5D57,INVALC,INVALC,
-	0x4542,0x544C,
-	/* Range 0x6BD2 - 0x6BD4, array index: 0x0DCF */
-	0x4647,0x5D5A,0x4866,
-	/* Range 0x6C3E - 0x6C42, array index: 0x0DD2 */
-	0x4845,INVALC,0x4475,0x3D41,0x3561,
-	/* Range 0x6C5D - 0x6C62, array index: 0x0DD7 */
-	0x4672,0x5D67,0x393E,0x4353,INVALC,0x5D69,
-	/* Range 0x6C7D - 0x6C83, array index: 0x0DDD */
-	0x3525,0x5D70,INVALC,INVALC,0x5D6E,0x5D6B,0x4D60,
-	/* Range 0x6C99 - 0x6C9B, array index: 0x0DE4 */
-	0x3A3B,0x5D6D,0x5D6F,
-	/* Range 0x6CB8 - 0x6CC5, array index: 0x0DE7 */
-	0x4A28,0x4C7D,0x5E21,0x3C23,0x3E42,0x5D78,0x5D7E,0x3168,
-	INVALC,0x3637,INVALC,INVALC,0x5D75,0x5D7A,
-	/* Range 0x6CE1 - 0x6CE5, array index: 0x0DF5 */
-	0x4B22,0x4748,0x3563,INVALC,0x4525,
-	/* Range 0x6CEF - 0x6CF3, array index: 0x0DFA */
-	0x5E23,0x4259,0x5D76,INVALC,0x314B,
-	/* Range 0x6D29 - 0x6D2B, array index: 0x0DFF */
-	0x314C,0x393F,0x5E29,
-	/* Range 0x6D32 - 0x6D38, array index: 0x0E02 */
-	0x3D27,0x5E2E,INVALC,0x5E2D,0x5E28,INVALC,0x5E2B,
-	/* Range 0x6D77 - 0x6D79, array index: 0x0E09 */
-	0x3324,0x3F3B,0x5E35,
-	/* Range 0x6DC5 - 0x6DC7, array index: 0x0E0C */
-	0x5E48,0x5E42,0x5E3F,
-	/* Range 0x6DE8 - 0x6DEE, array index: 0x0E0F */
-	0x5E46,INVALC,0x5E4D,0x307C,0x5E43,INVALC,0x5E4E,
-	/* Range 0x6DF7 - 0x6DFB, array index: 0x0E16 */
-	0x3A2E,INVALC,0x5E3B,0x5E49,0x453A,
-	/* Range 0x6E05 - 0x6E0B, array index: 0x0E1B */
-	0x4036,INVALC,0x3369,0x3A51,0x3E44,0x5E3D,0x3D42,
-	/* Range 0x6E19 - 0x6E26, array index: 0x0E22 */
-	0x5E52,0x3D6D,0x383A,INVALC,0x5E61,INVALC,0x5E5B,0x3574,
-	0x454F,INVALC,0x5E56,0x5E5F,0x302F,0x3132,
-	/* Range 0x6E29 - 0x6E2F, array index: 0x0E30 */
-	0x3239,INVALC,0x5E58,0x422C,0x5E4F,0x5E51,0x3941,
-	/* Range 0x6E7E - 0x6E82, array index: 0x0E37 */
-	0x4F51,0x3C3E,0x4B7E,INVALC,0x5E63,
-	/* Range 0x6ED1 - 0x6ED5, array index: 0x0E3C */
-	0x336A,INVALC,0x5E68,0x5E6D,0x5E6E,
-	/* Range 0x6EFE - 0x6F02, array index: 0x0E41 */
-	0x5E78,0x5E60,INVALC,0x3579,0x493A,
-	/* Range 0x6F11 - 0x6F15, array index: 0x0E46 */
-	0x5E74,INVALC,0x5F22,0x3169,0x4166,
-	/* Range 0x6F6D - 0x6F70, array index: 0x0E4B */
-	0x5F2C,0x442C,0x5F29,0x4459,
-	/* Range 0x6F80 - 0x6F86, array index: 0x0E4F */
-	0x5F28,0x5F27,0x5F2D,INVALC,0x4021,INVALC,0x5F24,
-	/* Range 0x6FC0 - 0x6FC3, array index: 0x0E56 */
-	0x3763,0x4279,0x5F32,0x473B,
-	/* Range 0x6FDF - 0x6FE1, array index: 0x0E5A */
-	0x5F3B,0x396A,0x4728,
-	/* Range 0x6FEB - 0x6FF3, array index: 0x0E5D */
-	0x4D74,0x5F3D,INVALC,0x5F41,0x4275,INVALC,0x5F40,INVALC,
-	0x5F2B,
-	/* Range 0x701A - 0x701F, array index: 0x0E66 */
-	0x5F4B,0x5F4A,INVALC,0x5F4D,0x4654,0x5F4F,
-	/* Range 0x70AC - 0x70AF, array index: 0x0E6C */
-	0x5F59,0x433A,0x5F5C,0x5F57,
-	/* Range 0x70B8 - 0x70BA, array index: 0x0E70 */
-	0x5F5A,0x4540,0x3059,
-	/* Range 0x7162 - 0x7169, array index: 0x0E73 */
-	0x5F69,INVALC,0x4761,0x5F65,0x5F68,0x3E48,INVALC,0x4851,
-	/* Range 0x71E5 - 0x71E7, array index: 0x0E7B */
-	0x4167,0x3B38,0x5F7C,
-	/* Range 0x71EC - 0x71EE, array index: 0x0E7E */
-	0x5F7B,0x3F24,0x5259,
-	/* Range 0x723A - 0x7240, array index: 0x0E81 */
-	0x4C6C,0x602B,0x602C,0x4156,0x3C24,0x602D,0x602E,
-	/* Range 0x7246 - 0x724C, array index: 0x0E88 */
-	0x602F,0x4A52,0x4847,INVALC,INVALC,0x6030,0x4757,
-	/* Range 0x727D - 0x7282, array index: 0x0E8F */
-	0x3823,0x6033,INVALC,0x3A54,0x6035,0x6034,
-	/* Range 0x72C2 - 0x72C6, array index: 0x0E95 */
-	0x3638,0x603D,0x603F,INVALC,0x603E,
-	/* Range 0x72E0 - 0x72E2, array index: 0x0E9A */
-	0x6043,0x6044,0x6042,
-	/* Range 0x72F7 - 0x72FD, array index: 0x0E9D */
-	0x6046,0x432C,0x6045,INVALC,INVALC,0x4F35,0x4762,
-	/* Range 0x731B - 0x731F, array index: 0x0EA4 */
-	0x4C54,0x604A,0x604C,INVALC,0x4E44,
-	/* Range 0x7329 - 0x732F, array index: 0x0EA9 */
-	0x604F,0x4376,0x472D,INVALC,INVALC,0x3825,0x604E,
-	/* Range 0x7432 - 0x7436, array index: 0x0EB0 */
-	0x606A,0x4E56,0x3657,0x487C,0x474A,
-	/* Range 0x7459 - 0x7464, array index: 0x0EB5 */
-	0x606F,0x386A,0x314D,0x6071,INVALC,0x3F70,0x606E,0x4E5C,
-	INVALC,INVALC,0x6074,0x7424,
-	/* Range 0x74EE - 0x74F8, array index: 0x0EC1 */
-	0x6125,INVALC,0x6127,0x6128,0x6126,INVALC,INVALC,INVALC,
-	0x4953,0x612A,0x6129,
-	/* Range 0x7503 - 0x7505, array index: 0x0ECC */
-	0x612C,0x612B,0x612D,
-	/* Range 0x750C - 0x750E, array index: 0x0ECF */
-	0x612E,0x6130,0x612F,
-	/* Range 0x7530 - 0x7533, array index: 0x0ED2 */
-	0x4544,0x4D33,0x3943,0x3F3D,
-	/* Range 0x7537 - 0x753C, array index: 0x0ED6 */
-	0x434B,0x5234,INVALC,0x442E,0x3268,0x6136,
-	/* Range 0x7549 - 0x7551, array index: 0x0EDC */
-	0x613A,0x6139,0x5A42,0x3326,0x6138,INVALC,0x305A,INVALC,
-	0x482A,
-	/* Range 0x7559 - 0x755D, array index: 0x0EE5 */
-	0x4E31,0x613D,0x613B,0x435C,0x4026,
-	/* Range 0x7562 - 0x756D, array index: 0x0EEA */
-	0x492D,INVALC,0x613F,0x4E2C,0x374D,0x6140,INVALC,0x613E,
-	0x4856,0x6141,INVALC,0x6142,
-	/* Range 0x7573 - 0x7578, array index: 0x0EF6 */
-	0x3E76,0x6147,INVALC,0x6144,0x466D,0x6143,
-	/* Range 0x7586 - 0x7591, array index: 0x0EFC */
-	0x6145,0x6146,INVALC,0x6149,0x6148,0x4925,INVALC,INVALC,
-	0x4142,0x4141,INVALC,0x353F,
-	/* Range 0x75B1 - 0x75BE, array index: 0x0F08 */
-	0x6157,0x4868,0x6151,INVALC,0x6153,INVALC,INVALC,0x6155,
-	0x3F3E,INVALC,INVALC,0x6156,0x6154,0x3C40,
-	/* Range 0x75F0 - 0x75F4, array index: 0x0F16 */
-	0x6162,INVALC,0x6164,0x6165,0x4354,
-	/* Range 0x761F - 0x7624, array index: 0x0F1B */
-	0x6169,0x616B,0x616C,0x616D,INVALC,0x616E,
-	/* Range 0x7646 - 0x7648, array index: 0x0F21 */
-	0x6174,0x6172,0x6173,
-	/* Range 0x7667 - 0x766C, array index: 0x0F24 */
-	0x617C,0x6179,0x617A,0x617B,INVALC,0x617D,
-	/* Range 0x7678 - 0x7688, array index: 0x0F2A */
-	0x6223,INVALC,0x482F,0x4550,0x6224,0x4772,0x4934,INVALC,
-	0x6225,INVALC,INVALC,0x6226,0x452A,INVALC,0x3327,0x3944,
-	0x6227,
-	/* Range 0x76B7 - 0x76BA, array index: 0x0F3B */
-	0x7369,0x6230,0x6231,0x6232,
-	/* Range 0x76DB - 0x76E7, array index: 0x0F3F */
-	0x4039,0x5D39,INVALC,0x6237,0x4C41,INVALC,0x6238,INVALC,
-	0x3446,0x4857,0x6239,INVALC,0x623A,
-	/* Range 0x7707 - 0x770C, array index: 0x0F4C */
-	0x623F,0x623E,0x487D,INVALC,0x3447,0x3829,
-	/* Range 0x771E - 0x7726, array index: 0x0F52 */
-	0x6243,0x3F3F,0x4C32,INVALC,INVALC,INVALC,0x6242,0x6244,
-	0x6245,
-	/* Range 0x77B9 - 0x77BF, array index: 0x0F5B */
-	0x6259,INVALC,0x625D,0x625B,0x625C,INVALC,0x625A,
-	/* Range 0x77DA - 0x77DC, array index: 0x0F62 */
-	0x6261,0x4C37,0x6262,
-	/* Range 0x77ED - 0x77EF, array index: 0x0F65 */
-	0x433B,0x6264,0x363A,
-	/* Range 0x7825 - 0x7827, array index: 0x0F68 */
-	0x4556,0x3A56,0x354E,
-	/* Range 0x788C - 0x788E, array index: 0x0F6B */
-	0x6271,0x3337,0x626C,
-	/* Range 0x792A - 0x792C, array index: 0x0F6E */
-	0x626A,0x632A,0x6329,
-	/* Range 0x7947 - 0x7949, array index: 0x0F71 */
-	0x3540,0x3527,0x3B63,
-	/* Range 0x7953 - 0x7957, array index: 0x0F74 */
-	0x6331,INVALC,0x6330,0x4144,0x632D,
-	/* Range 0x795D - 0x7962, array index: 0x0F79 */
-	0x3D4B,0x3F40,0x632E,0x632C,INVALC,0x472A,
-	/* Range 0x797F - 0x7985, array index: 0x0F7F */
-	0x6333,0x6349,0x3658,INVALC,INVALC,0x4F3D,0x4135,
-	/* Range 0x798D - 0x798F, array index: 0x0F86 */
-	0x3252,0x4477,0x4A21,
-	/* Range 0x79B9 - 0x79C1, array index: 0x0F89 */
-	0x633B,0x633C,INVALC,INVALC,0x3659,0x3253,0x4645,0x3D28,
-	0x3B64,
-	/* Range 0x79E3 - 0x79E9, array index: 0x0F92 */
-	0x6342,0x4769,INVALC,0x3F41,0x633F,INVALC,0x4361,
-	/* Range 0x7A17 - 0x7A20, array index: 0x0F99 */
-	0x4923,0x6345,0x6346,0x4355,INVALC,0x4E47,INVALC,INVALC,
-	0x6348,0x6347,
-	/* Range 0x7A3B - 0x7A43, array index: 0x0FA3 */
-	0x634B,0x3254,0x374E,0x634C,0x3946,0x3972,INVALC,0x4A66,
-	0x634E,
-	/* Range 0x7A4D - 0x7A50, array index: 0x0FAC */
-	0x4051,0x314F,0x323A,0x302C,
-	/* Range 0x7A61 - 0x7A63, array index: 0x0FB0 */
-	0x6351,0x6352,0x3E77,
-	/* Range 0x7A92 - 0x7A98, array index: 0x0FB3 */
-	0x4362,0x416B,INVALC,0x635A,0x635C,0x6359,0x635B,
-	/* Range 0x7AAE - 0x7AB0, array index: 0x0FBA */
-	0x3567,0x4D52,0x635F,
-	/* Range 0x7AC3 - 0x7AD5, array index: 0x0FBD */
-	0x3376,0x6362,0x6361,INVALC,0x6365,0x635E,INVALC,0x6366,
-	0x4E29,INVALC,0x6367,INVALC,0x6368,INVALC,INVALC,0x5474,
-	0x636A,INVALC,0x6369,
-	/* Range 0x7AD9 - 0x7AE6, array index: 0x0FD0 */
-	0x636B,0x636C,INVALC,0x4E35,0x636D,INVALC,0x706F,0x3E4F,
-	0x636E,0x636F,0x3D57,INVALC,0x4638,0x6370,
-	/* Range 0x7AF6 - 0x7AFA, array index: 0x0FDE */
-	0x3625,INVALC,0x513F,0x435D,0x3C33,
-	/* Range 0x7B45 - 0x7B56, array index: 0x0FE3 */
-	0x6426,0x492E,INVALC,0x4826,0x4579,INVALC,0x365A,0x6425,
-	0x6423,INVALC,0x4835,0x637E,0x435E,0x457B,INVALC,0x457A,
-	INVALC,0x3A76,
-	/* Range 0x7B94 - 0x7BA1, array index: 0x0FF5 */
-	0x4773,0x4C27,INVALC,0x3B3B,0x6430,0x6439,0x6434,INVALC,
-	0x6433,0x642F,INVALC,0x6431,INVALC,0x3449,
-	/* Range 0x7BE4 - 0x7BE6, array index: 0x1003 */
-	0x4646,0x6445,0x6444,
-	/* Range 0x7C11 - 0x7C14, array index: 0x1006 */
-	0x6442,0x5255,0x6449,0x6443,
-	/* Range 0x7C3D - 0x7C40, array index: 0x100A */
-	0x6455,0x4E7C,0x4A6D,0x645A,
-	/* Range 0x7C4C - 0x7C50, array index: 0x100E */
-	0x6456,0x4052,INVALC,0x6459,0x645B,
-	/* Range 0x7C81 - 0x7C83, array index: 0x1013 */
-	0x364E,0x3729,0x6463,
-	/* Range 0x7CA1 - 0x7CA8, array index: 0x1016 */
-	0x6469,0x6467,INVALC,0x6465,0x3421,INVALC,0x3E51,0x646A,
-	/* Range 0x7CAD - 0x7CB3, array index: 0x101E */
-	0x6466,0x646E,INVALC,INVALC,0x646D,0x646C,0x646B,
-	/* Range 0x7CDC - 0x7CE2, array index: 0x1025 */
-	0x6476,INVALC,0x4A35,0x416C,0x3947,INVALC,0x6477,
-	/* Range 0x7D02 - 0x7D06, array index: 0x102C */
-	0x6521,INVALC,0x4C73,0x3948,0x647E,
-	/* Range 0x7D14 - 0x7D22, array index: 0x1031 */
-	0x3D63,0x6523,INVALC,0x3C53,0x3949,0x3B66,0x3569,0x4A36,
-	0x6522,INVALC,INVALC,INVALC,0x4147,0x4B42,0x3A77,
-	/* Range 0x7D2B - 0x7D35, array index: 0x1040 */
-	0x3B67,0x445D,INVALC,0x6527,0x4E5F,0x3A59,INVALC,0x6528,
-	0x3F42,INVALC,0x652A,
-	/* Range 0x7D42 - 0x7D46, array index: 0x104B */
-	0x3D2A,0x383E,0x4148,0x6525,0x652B,
-	/* Range 0x7D4B - 0x7D50, array index: 0x1050 */
-	0x6526,0x3750,INVALC,0x652E,0x6532,0x376B,
-	/* Range 0x7D61 - 0x7D63, array index: 0x1056 */
-	0x4D6D,0x303C,0x6533,
-	/* Range 0x7D71 - 0x7D76, array index: 0x1059 */
-	0x457D,0x652F,0x652C,INVALC,0x3328,0x4064,
-	/* Range 0x7D99 - 0x7D9C, array index: 0x105F */
-	0x3751,0x4233,0x6539,0x416E,
-	/* Range 0x7DAB - 0x7DB5, array index: 0x1063 */
-	0x6540,0x3C7A,0x305D,0x653B,0x6543,0x6547,0x394B,0x4C56,
-	INVALC,0x4456,0x653D,
-	/* Range 0x7DBA - 0x7DBF, array index: 0x106E */
-	0x653A,0x433E,INVALC,0x653F,0x303D,0x4C4A,
-	/* Range 0x7DDA - 0x7DE1, array index: 0x1074 */
-	0x407E,INVALC,0x6544,0x6549,0x654B,INVALC,0x4479,0x654E,
-	/* Range 0x7E09 - 0x7E0B, array index: 0x107C */
-	0x6556,0x6550,0x6557,
-	/* Range 0x7E1E - 0x7E23, array index: 0x107F */
-	0x3C4A,0x6555,INVALC,0x6552,0x6558,0x6551,
-	/* Range 0x7E37 - 0x7E3E, array index: 0x1085 */
-	0x655F,INVALC,0x655D,0x6561,0x655B,INVALC,0x6541,0x4053,
-	/* Range 0x7E54 - 0x7E5E, array index: 0x108D */
-	0x3F25,0x4136,0x6564,INVALC,INVALC,0x6566,0x6567,INVALC,
-	INVALC,0x6563,0x6565,
-	/* Range 0x7E66 - 0x7E6A, array index: 0x1098 */
-	0x655A,0x6562,INVALC,0x656A,0x6569,
-	/* Range 0x7E79 - 0x7E83, array index: 0x109D */
-	0x6568,INVALC,0x656C,0x656B,0x656F,INVALC,0x6571,INVALC,
-	INVALC,0x3B3C,0x656D,
-	/* Range 0x7E8C - 0x7E96, array index: 0x10A8 */
-	0x6574,INVALC,0x657A,0x453B,0x6576,INVALC,0x6575,0x6577,
-	0x6578,INVALC,0x6579,
-	/* Range 0x7F4C - 0x7F55, array index: 0x10B3 */
-	0x6622,0x6623,0x6624,INVALC,0x6625,0x6626,INVALC,INVALC,
-	0x6628,0x6627,
-	/* Range 0x7F67 - 0x7F6B, array index: 0x10BD */
-	0x662E,0x662C,0x662D,0x3A61,0x3753,
-	/* Range 0x7F75 - 0x7F79, array index: 0x10C2 */
-	0x474D,INVALC,0x486D,0x662F,0x586D,
-	/* Range 0x7F82 - 0x7F8E, array index: 0x10C7 */
-	0x6630,0x6632,INVALC,0x4D65,0x6631,0x6634,0x6633,INVALC,
-	0x4D53,INVALC,0x6635,INVALC,0x487E,
-	/* Range 0x8000 - 0x8006, array index: 0x10D4 */
-	0x4D54,0x4F37,INVALC,0x394D,0x664E,0x3C54,0x664D,
-	/* Range 0x8015 - 0x8019, array index: 0x10DB */
-	0x394C,INVALC,0x4C57,0x6651,0x6652,
-	/* Range 0x805E - 0x8062, array index: 0x10E0 */
-	0x4A39,0x665D,INVALC,0x416F,0x665E,
-	/* Range 0x806F - 0x807F, array index: 0x10E5 */
-	0x4E7E,0x6662,INVALC,0x6661,0x6660,0x4430,INVALC,0x6663,
-	0x3F26,INVALC,0x6664,INVALC,INVALC,INVALC,0x6665,0x4F38,
-	0x6666,
-	/* Range 0x8084 - 0x808C, array index: 0x10F6 */
-	0x6667,0x6669,0x6668,0x4825,INVALC,0x4679,INVALC,0x4F3E,
-	0x4829,
-	/* Range 0x80A9 - 0x80B4, array index: 0x10FF */
-	0x382A,0x4B43,INVALC,0x666F,0x666D,INVALC,0x394E,INVALC,
-	0x394F,0x3069,INVALC,0x3A68,
-	/* Range 0x80D9 - 0x80DE, array index: 0x110B */
-	0x6672,0x6675,0x6670,INVALC,0x6673,0x4B26,
-	/* Range 0x8105 - 0x810A, array index: 0x1111 */
-	0x363C,0x4048,0x4F46,0x4C2E,0x6677,0x4054,
-	/* Range 0x8150 - 0x8155, array index: 0x1117 */
-	0x4965,0x6725,INVALC,0x6724,0x3950,0x4F53,
-	/* Range 0x8178 - 0x817A, array index: 0x111D */
-	0x4432,0x4A22,0x4123,
-	/* Range 0x817F - 0x8183, array index: 0x1120 */
-	0x425C,0x672F,INVALC,0x6730,0x672C,
-	/* Range 0x81BD - 0x81C2, array index: 0x1125 */
-	0x673C,0x673A,0x473F,0x673D,INVALC,0x673E,
-	/* Range 0x81D8 - 0x81DA, array index: 0x112B */
-	0x6744,0x6743,0x6746,
-	/* Range 0x81FA - 0x8202, array index: 0x112E */
-	0x674A,0x674B,0x3131,INVALC,0x674C,INVALC,INVALC,0x674D,
-	0x674E,
-	/* Range 0x8205 - 0x821F, array index: 0x1137 */
-	0x674F,INVALC,0x6750,0x363D,0x5A2A,0x6751,INVALC,0x4065,
-	0x6752,0x3C4B,INVALC,0x6753,INVALC,0x5030,INVALC,INVALC,
-	INVALC,0x6754,0x4A5E,0x345C,INVALC,INVALC,0x4124,0x3D58,
-	INVALC,0x4971,0x3D2E,
-	/* Range 0x8229 - 0x822E, array index: 0x1152 */
-	0x6755,0x3952,0x6756,0x484C,INVALC,0x6764,
-	/* Range 0x8233 - 0x8239, array index: 0x1158 */
-	0x6758,INVALC,0x4249,0x4775,0x383F,0x6757,0x4125,
-	/* Range 0x8258 - 0x825A, array index: 0x115F */
-	0x675B,0x675A,0x675D,
-	/* Range 0x826E - 0x8278, array index: 0x1162 */
-	0x3A31,0x4E49,INVALC,0x6765,0x3F27,INVALC,INVALC,INVALC,
-	0x3170,0x6766,0x6767,
-	/* Range 0x82AB - 0x82B3, array index: 0x116D */
-	0x676B,0x676E,0x474E,INVALC,0x3F44,INVALC,0x3256,INVALC,
-	0x4B27,
-	/* Range 0x82D1 - 0x82D4, array index: 0x1176 */
-	0x3171,0x6772,0x4E6A,0x425D,
-	/* Range 0x82DB - 0x82E7, array index: 0x117A */
-	0x3257,0x677C,INVALC,0x677A,0x6771,INVALC,0x676F,INVALC,
-	0x6770,INVALC,0x3C63,0x366C,0x4377,
-	/* Range 0x82F9 - 0x82FB, array index: 0x1187 */
-	0x6779,0x6775,0x6778,
-	/* Range 0x8302 - 0x8306, array index: 0x118A */
-	0x4C50,0x6777,0x3258,0x337D,0x677B,
-	/* Range 0x8316 - 0x8318, array index: 0x118F */
-	0x6823,0x682C,0x682D,
-	/* Range 0x8331 - 0x8339, array index: 0x1192 */
-	0x6825,0x6824,INVALC,0x6822,0x6821,0x4363,INVALC,0x427B,
-	0x6827,
-	/* Range 0x839E - 0x83A2, array index: 0x119B */
-	0x3450,0x6831,0x683C,INVALC,0x6832,
-	/* Range 0x83EF - 0x83F4, array index: 0x11A0 */
-	0x325A,0x3856,0x4929,0x684B,INVALC,0x683F,
-	/* Range 0x840B - 0x840E, array index: 0x11A6 */
-	0x6846,0x4B28,0x684C,0x3060,
-	/* Range 0x8461 - 0x8463, array index: 0x11AA */
-	0x4972,0x6864,0x4621,
-	/* Range 0x8469 - 0x8471, array index: 0x11AD */
-	0x685D,INVALC,0x6859,0x4172,0x6853,0x685B,0x6860,INVALC,
-	0x472C,
-	/* Range 0x84B8 - 0x84BC, array index: 0x11B6 */
-	0x3E78,0x6865,INVALC,0x686A,0x4173,
-	/* Range 0x84C9 - 0x84D1, array index: 0x11BB */
-	0x4D56,0x6863,0x3338,INVALC,0x6869,INVALC,INVALC,0x686C,
-	0x4C2C,
-	/* Range 0x8511 - 0x851A, array index: 0x11C4 */
-	0x4A4E,INVALC,0x4C22,0x6879,0x6878,INVALC,0x6874,0x6875,
-	INVALC,0x3136,
-	/* Range 0x8548 - 0x854B, array index: 0x11CE */
-	0x687E,0x3E56,0x3C49,0x6923,
-	/* Range 0x8568 - 0x856A, array index: 0x11D2 */
-	0x4F4F,0x4622,0x4973,
-	/* Range 0x85A6 - 0x85AF, array index: 0x11D5 */
-	0x4126,INVALC,0x692A,0x3B27,0x3F45,0x3730,0x4C74,INVALC,
-	0x4C79,0x3D72,
-	/* Range 0x85F7 - 0x85FB, array index: 0x11DF */
-	0x3D73,INVALC,0x693D,0x6942,0x4174,
-	/* Range 0x868A - 0x868C, array index: 0x11E4 */
-	0x3263,0x6952,0x6953,
-	/* Range 0x86A9 - 0x86AB, array index: 0x11E7 */
-	0x6950,0x6951,0x695B,
-	/* Range 0x86EC - 0x86EF, array index: 0x11EA */
-	0x695F,0x4948,0x485A,0x6962,
-	/* Range 0x8706 - 0x870A, array index: 0x11EE */
-	0x6964,INVALC,0x6965,0x696A,0x696D,
-	/* Range 0x880D - 0x8811, array index: 0x11F3 */
-	0x6A38,0x6A3C,0x6A37,INVALC,0x6A3E,
-	/* Range 0x8821 - 0x8823, array index: 0x11F8 */
-	0x6A42,0x6A41,0x695A,
-	/* Range 0x885D - 0x8863, array index: 0x11FB */
-	0x3E57,0x6A4C,INVALC,INVALC,0x3955,0x6A4D,0x3061,
-	/* Range 0x887D - 0x8882, array index: 0x1202 */
-	0x6A53,0x6A50,0x365E,INVALC,0x6A4F,0x6A56,
-	/* Range 0x88BF - 0x88C5, array index: 0x1208 */
-	0x6A5F,INVALC,0x3A5B,0x4E76,0x6A61,0x6A62,0x4175,
-	/* Range 0x88F2 - 0x88F4, array index: 0x120F */
-	0x6A6C,0x3E58,0x6A6A,
-	/* Range 0x88F8 - 0x88FE, array index: 0x1212 */
-	0x4D67,0x6A67,INVALC,INVALC,0x6A69,0x403D,0x3F7E,
-	/* Range 0x895E - 0x8960, array index: 0x1219 */
-	0x6A7E,0x365F,0x6A7D,
-	/* Range 0x8986 - 0x898B, array index: 0x121C */
-	0x4A24,0x4746,0x6B2A,INVALC,0x6B2B,0x382B,
-	/* Range 0x8996 - 0x899A, array index: 0x1222 */
-	0x3B6B,0x4741,0x6B2D,INVALC,0x3350,
-	/* Range 0x89A6 - 0x89AC, array index: 0x1227 */
-	0x6B30,0x4D77,INVALC,0x6B2F,0x3F46,INVALC,0x6B31,
-	/* Range 0x8A16 - 0x8A18, array index: 0x122E */
-	0x6B3F,0x4277,0x352D,
-	/* Range 0x8A3A - 0x8A3C, array index: 0x1231 */
-	0x3F47,0x4370,0x3E5A,
-	/* Range 0x8A50 - 0x8A55, array index: 0x1234 */
-	0x3A3E,0x4242,0x6B48,INVALC,0x3E5B,0x493E,
-	/* Range 0x8A69 - 0x8A73, array index: 0x123A */
-	0x3B6D,INVALC,0x4F4D,0x6B4D,0x6B4C,0x4127,INVALC,0x354D,
-	0x4F43,0x333A,0x3E5C,
-	/* Range 0x8AA0 - 0x8AA8, array index: 0x1245 */
-	0x403F,0x6B53,INVALC,0x6B58,0x386D,0x6B55,0x6B56,INVALC,
-	0x6B52,
-	/* Range 0x8ACB - 0x8ACF, array index: 0x124E */
-	0x4041,0x3452,0x6B5A,INVALC,0x3F5B,
-	/* Range 0x8ADA - 0x8AE7, array index: 0x1253 */
-	0x6B5C,0x6B67,0x4435,INVALC,0x6B66,INVALC,0x6B63,0x6B6B,
-	0x6B64,INVALC,0x6B60,INVALC,0x447C,0x6B5F,
-	/* Range 0x8AFE - 0x8B04, array index: 0x1261 */
-	0x427A,INVALC,0x4B45,0x315A,0x3062,INVALC,0x4625,
-	/* Range 0x8B16 - 0x8B21, array index: 0x1268 */
-	0x6B6C,0x6B6E,INVALC,0x382C,0x6B6A,0x3956,INVALC,0x3C55,
-	INVALC,INVALC,0x6B6F,0x4D58,
-	/* Range 0x8B58 - 0x8B5C, array index: 0x1274 */
-	0x3C31,INVALC,0x6B7D,0x6B7C,0x4968,
-	/* Range 0x8B6B - 0x8B74, array index: 0x1279 */
-	0x6B7E,0x6C22,INVALC,INVALC,0x6C23,0x3544,0x6641,0x3E79,
-	INVALC,0x6C24,
-	/* Range 0x8C6A - 0x8C6C, array index: 0x1283 */
-	0x396B,0x502E,0x6C37,
-	/* Range 0x8C78 - 0x8C7C, array index: 0x1286 */
-	0x6C38,0x493F,0x6C39,INVALC,0x6C41,
-	/* Range 0x8C89 - 0x8C8E, array index: 0x128B */
-	0x6C3B,0x6C3D,INVALC,0x4B46,0x6C3E,0x6C3F,
-	/* Range 0x8C9D - 0x8CA2, array index: 0x1291 */
-	0x332D,0x4467,INVALC,0x4969,0x3A62,0x3957,
-	/* Range 0x8CA7 - 0x8CCE, array index: 0x1297 */
-	0x494F,0x325F,0x484E,0x6C45,0x3453,0x4055,0x6C44,0x6C49,
-	0x4379,0x4C63,INVALC,0x6C47,0x6C48,0x352E,INVALC,0x6C4A,
-	0x4763,0x425F,INVALC,INVALC,0x4871,0x453D,0x6C46,INVALC,
-	0x4B47,0x326C,0x6C4C,0x4F28,0x4442,0x4F45,INVALC,INVALC,
-	0x3B71,0x6C4B,INVALC,0x4231,INVALC,INVALC,0x6C5C,0x4128,
-	/* Range 0x8CDA - 0x8CE6, array index: 0x12BF */
-	0x6C4F,0x3B3F,0x3B72,INVALC,0x3E5E,INVALC,0x4765,INVALC,
-	0x382D,0x6C4E,0x6C4D,INVALC,0x496A,
-	/* Range 0x8CFA - 0x8CFD, array index: 0x12CC */
-	0x6C51,0x6C52,0x3958,0x6C50,
-	/* Range 0x8D04 - 0x8D16, array index: 0x12D0 */
-	0x6C53,0x6C54,INVALC,0x6C56,0x4223,INVALC,0x6C55,0x3466,
-	INVALC,0x6C58,INVALC,0x6C57,0x6C59,INVALC,INVALC,0x6C5B,
-	0x6C5D,INVALC,0x6C5E,
-	/* Range 0x8D70 - 0x8D74, array index: 0x12E3 */
-	0x4176,0x6C61,INVALC,0x6C62,0x496B,
-	/* Range 0x8E08 - 0x8E0A, array index: 0x12E8 */
-	0x6C73,0x6C74,0x4D59,
-	/* Range 0x8E1D - 0x8E1F, array index: 0x12EB */
-	0x6C76,0x6C77,0x6C79,
-	/* Range 0x8E47 - 0x8E4C, array index: 0x12EE */
-	0x6D21,0x6D25,0x6D22,0x6C7E,INVALC,0x6D23,
-	/* Range 0x8EAA - 0x8EB1, array index: 0x12F4 */
-	0x6D39,0x3F48,0x6D3B,INVALC,INVALC,0x366D,0x6D3C,0x6D3E,
-	/* Range 0x8EC8 - 0x8ECD, array index: 0x12FC */
-	0x6D41,INVALC,0x3C56,0x6D42,0x3530,0x3733,
-	/* Range 0x8EFB - 0x8EFE, array index: 0x1302 */
-	0x6D46,0x6D45,0x375A,0x6D48,
-	/* Range 0x8F12 - 0x8F15, array index: 0x1306 */
-	0x6D4C,0x6D4E,0x4A65,0x6D4B,
-	/* Range 0x8F19 - 0x8F1F, array index: 0x130A */
-	0x6D4D,INVALC,0x6D51,0x6D4F,0x3531,INVALC,0x6D50,
-	/* Range 0x8F42 - 0x8F46, array index: 0x1311 */
-	0x6D58,INVALC,0x336D,0x6D57,0x6D5C,
-	/* Range 0x8F4C - 0x8F4E, array index: 0x1316 */
-	0x6D5A,0x4532,0x6D5D,
-	/* Range 0x8F5F - 0x8F64, array index: 0x1319 */
-	0x396C,INVALC,0x3725,0x6D60,0x6D61,0x6D62,
-	/* Range 0x8F9B - 0x8F9F, array index: 0x131F */
-	0x3F49,0x6D63,INVALC,0x3C2D,0x6D64,
-	/* Range 0x8FAD - 0x8FB2, array index: 0x1324 */
-	0x6D66,0x6570,0x6D67,0x4324,0x3F2B,0x4740,
-	/* Range 0x8FBA - 0x8FBC, array index: 0x132A */
-	0x4A55,0x4454,0x397E,
-	/* Range 0x8FE5 - 0x8FF0, array index: 0x132D */
-	0x6D6A,0x3260,INVALC,INVALC,0x4676,0x6D6C,0x4777,INVALC,
-	0x4533,INVALC,0x6D6D,0x3D52,
-	/* Range 0x8FF7 - 0x8FFA, array index: 0x1339 */
-	0x4C42,0x6D7E,0x6D71,0x6D72,
-	/* Range 0x900B - 0x9023, array index: 0x133D */
-	0x6D79,INVALC,0x6D76,0x6E25,0x4629,0x4360,0x6D73,INVALC,
-	0x447E,0x4553,0x6D74,0x6D78,0x3F60,INVALC,0x4767,0x444C,
-	INVALC,INVALC,0x4042,0x6D77,0x422E,0x4224,0x6D75,0x3029,
-	0x4F22,
-	/* Range 0x9035 - 0x9039, array index: 0x1356 */
-	0x6D7C,0x6D7B,INVALC,0x306F,0x6D7D,
-	/* Range 0x9047 - 0x9059, array index: 0x135B */
-	0x3678,INVALC,0x6E26,0x4D37,0x313F,INVALC,0x4A57,0x3261,
-	0x6E21,0x6E22,0x6E23,0x6E24,0x463B,0x4323,0x3063,0x6E28,
-	INVALC,0x6E29,0x7423,
-	/* Range 0x906D - 0x906F, array index: 0x136E */
-	0x4178,0x3C57,0x6E2C,
-	/* Range 0x9075 - 0x9084, array index: 0x1371 */
-	0x3D65,0x6E2D,0x412B,0x412A,INVALC,0x3064,INVALC,0x4E4B,
-	0x6E31,INVALC,0x4872,0x6E33,0x6E32,0x6E30,0x6364,0x3454,
-	/* Range 0x9149 - 0x914E, array index: 0x1381 */
-	0x4653,0x6E44,0x3D36,0x3C60,0x475B,0x4371,
-	/* Range 0x91C6 - 0x91D1, array index: 0x1387 */
-	0x4850,0x3A53,0x3C61,0x6E58,INVALC,0x6E59,0x4E24,0x3D45,
-	0x4C6E,0x4E4C,0x6E5A,0x3662,
-	/* Range 0x91DB - 0x91E7, array index: 0x1393 */
-	0x6E5E,0x3378,0x3F4B,INVALC,0x6E5C,INVALC,0x6E5D,INVALC,
-	0x4460,INVALC,INVALC,0x4B55,0x367C,
-	/* Range 0x9298 - 0x929C, array index: 0x13A0 */
-	0x4C43,INVALC,0x4438,0x6E75,0x6E72,
-	/* Range 0x9318 - 0x931A, array index: 0x13A5 */
-	0x3F6E,0x6F21,0x6F23,
-	/* Range 0x932B - 0x932F, array index: 0x13A8 */
-	0x3C62,0x4F23,INVALC,0x6E7E,0x3A78,
-	/* Range 0x93AC - 0x93B0, array index: 0x13AD */
-	0x6F2E,0x6F2F,0x4443,INVALC,0x6F2D,
-	/* Range 0x93D6 - 0x93D8, array index: 0x13B2 */
-	0x6F32,0x6F33,0x6F36,
-	/* Range 0x9418 - 0x941A, array index: 0x13B5 */
-	0x3E62,0x462A,0x6F3C,
-	/* Range 0x9451 - 0x9453, array index: 0x13B8 */
-	0x3455,0x6F48,0x4C7A,
-	/* Range 0x947C - 0x9481, array index: 0x13BB */
-	0x6F55,0x6F53,0x6F56,0x6F58,INVALC,0x6F57,
-	/* Range 0x9587 - 0x958B, array index: 0x13C1 */
-	0x6F5A,INVALC,0x4A44,0x6F5B,0x332B,
-	/* Range 0x95A0 - 0x95A8, array index: 0x13C6 */
-	0x6F60,INVALC,0x3458,0x3355,0x395E,0x4836,INVALC,0x6F62,
-	0x6F61,
-	/* Range 0x95D4 - 0x95D8, array index: 0x13CF */
-	0x6F6E,0x6F6D,0x6F6F,INVALC,0x462E,
-	/* Range 0x964B - 0x9650, array index: 0x13D4 */
-	0x6F7B,0x6F79,0x395F,INVALC,0x6F7A,0x3842,
-	/* Range 0x965B - 0x9666, array index: 0x13DA */
-	0x4A45,0x6F7D,0x7021,0x6F7E,0x7022,INVALC,INVALC,0x3121,
-	0x3F58,0x3D7C,0x3459,0x7023,
-	/* Range 0x9672 - 0x967A, array index: 0x13E6 */
-	0x7024,0x4444,INVALC,0x4E4D,0x462B,0x6F7C,0x4E26,INVALC,
-	0x3831,
-	/* Range 0x968A - 0x968F, array index: 0x13EF */
-	0x4262,0x6721,INVALC,0x7026,0x332C,0x3F6F,
-	/* Range 0x9694 - 0x969C, array index: 0x13F5 */
-	0x3356,0x7028,INVALC,0x7029,0x7027,0x3764,INVALC,0x3A5D,
-	0x3E63,
-	/* Range 0x96B0 - 0x96BC, array index: 0x13FE */
-	0x702E,0x702C,0x702D,INVALC,0x702F,INVALC,0x7030,0x4E6C,
-	0x7031,0x7032,INVALC,0x4049,0x483B,
-	/* Range 0x96C0 - 0x96CE, array index: 0x140B */
-	0x3F7D,0x3467,INVALC,INVALC,0x4D3A,0x326D,0x3D38,0x385B,
-	INVALC,0x7035,INVALC,0x7034,0x3B73,0x7036,0x7033,
-	/* Range 0x9704 - 0x9713, array index: 0x141A */
-	0x703C,INVALC,0x703D,0x3F4C,0x703E,INVALC,0x4E6E,INVALC,
-	INVALC,0x7039,0x7040,0x7042,INVALC,0x7041,INVALC,0x703F,
-	/* Range 0x975E - 0x976D, array index: 0x142A */
-	0x4873,INVALC,0x7051,0x7353,0x4C4C,INVALC,0x7052,INVALC,
-	0x7053,INVALC,0x7054,0x3357,INVALC,0x7056,INVALC,0x3F59,
-	/* Range 0x9784 - 0x9786, array index: 0x143A */
-	0x3373,0x7059,0x705D,
-	/* Range 0x97F2 - 0x97F6, array index: 0x143D */
-	0x706E,0x323B,INVALC,0x7071,0x7070,
-	/* Range 0x97FF - 0x9808, array index: 0x1442 */
-	0x3641,INVALC,0x4A47,0x443A,0x3A22,INVALC,0x3960,0x3D67,
-	INVALC,0x3F5C,
-	/* Range 0x980F - 0x9813, array index: 0x144C */
-	0x7072,0x4D42,0x3468,0x4852,0x465C,
-	/* Range 0x9837 - 0x983D, array index: 0x1451 */
-	0x7077,0x7074,INVALC,INVALC,0x4951,0x4D6A,0x7078,
-	/* Range 0x984B - 0x984F, array index: 0x1458 */
-	0x707B,0x426A,0x335B,0x335C,0x707A,
-	/* Range 0x986F - 0x9874, array index: 0x145D */
-	0x707D,0x707E,0x7121,INVALC,0x7123,0x7122,
-	/* Range 0x98EB - 0x98EF, array index: 0x1463 */
-	0x712C,INVALC,0x522C,0x5D3B,0x4853,
-	/* Range 0x98FC - 0x98FE, array index: 0x1468 */
-	0x3B74,0x4B30,0x3E7E,
-	/* Range 0x9910 - 0x9914, array index: 0x146B */
-	0x3B41,INVALC,0x712F,0x326E,0x7130,
-	/* Range 0x991D - 0x9921, array index: 0x1470 */
-	0x7133,0x7134,INVALC,0x7136,0x7132,
-	/* Range 0x9950 - 0x9952, array index: 0x1475 */
-	0x713E,0x7140,0x7141,
-	/* Range 0x9996 - 0x9999, array index: 0x1478 */
-	0x3C73,0x7144,0x7145,0x3961,
-	/* Range 0x99AC - 0x99AE, array index: 0x147C */
-	0x474F,0x7147,0x7148,
-	/* Range 0x99C4 - 0x99C8, array index: 0x147F */
-	0x424C,0x3158,0x366E,INVALC,0x366F,
-	/* Range 0x99D0 - 0x99D2, array index: 0x1484 */
-	0x4373,0x714E,0x3670,
-	/* Range 0x9A69 - 0x9A6B, array index: 0x1487 */
-	0x7169,0x716B,0x716A,
-	/* Range 0x9AEA - 0x9AF1, array index: 0x148A */
-	0x4831,0x717A,INVALC,0x4926,0x717B,0x7179,INVALC,0x717D,
-	/* Range 0x9B25 - 0x9B2A, array index: 0x1492 */
-	0x7228,INVALC,0x7229,0x722A,0x722B,0x722C,
-	/* Range 0x9B2E - 0x9B32, array index: 0x1498 */
-	0x722D,0x722E,INVALC,0x5D35,0x722F,
-	/* Range 0x9B41 - 0x9B45, array index: 0x149D */
-	0x3321,0x3A32,0x7231,0x7230,0x4C25,
-	/* Range 0x9B4D - 0x9B51, array index: 0x14A2 */
-	0x7233,0x7234,0x7232,INVALC,0x7235,
-	/* Range 0x9B91 - 0x9B97, array index: 0x14A7 */
-	0x723A,0x4A2B,0x7238,INVALC,INVALC,0x723B,0x723C,
-	/* Range 0x9BAA - 0x9BAE, array index: 0x14AE */
-	0x4B6E,0x3B2D,INVALC,0x3A7A,0x412F,
-	/* Range 0x9BE1 - 0x9BE4, array index: 0x14B3 */
-	0x724C,0x7249,0x7248,0x724A,
-	/* Range 0x9BF0 - 0x9BF2, array index: 0x14B7 */
-	0x7250,0x724F,0x724E,
-	/* Range 0x9C06 - 0x9C0D, array index: 0x14BA */
-	0x7256,INVALC,0x7257,0x7253,0x7259,INVALC,0x7255,0x3362,
-	/* Range 0x9C10 - 0x9C15, array index: 0x14C2 */
-	0x4F4C,INVALC,0x7258,0x7254,0x7252,0x7251,
-	/* Range 0x9C2D - 0x9C32, array index: 0x14C8 */
-	0x4949,0x725B,0x3073,0x7260,INVALC,0x7262,
-	/* Range 0x9C39 - 0x9C3B, array index: 0x14CE */
-	0x336F,0x724D,0x3137,
-	/* Range 0x9C46 - 0x9C48, array index: 0x14D1 */
-	0x7263,0x7261,0x432D,
-	/* Range 0x9D06 - 0x9D09, array index: 0x14D4 */
-	0x7271,0x463E,0x726E,0x726D,
-	/* Range 0x9D28 - 0x9D2C, array index: 0x14D8 */
-	0x337B,INVALC,0x7272,0x3C32,0x3229,
-	/* Range 0x9D5C - 0x9D61, array index: 0x14DD */
-	0x312D,0x7321,0x7322,INVALC,0x3974,0x4C39,
-	/* Range 0x9DF8 - 0x9DFA, array index: 0x14E3 */
-	0x733B,0x426B,0x3A6D,
-	/* Range 0x9E91 - 0x9E97, array index: 0x14E6 */
-	0x734C,0x734A,0x4F3C,INVALC,0x734B,INVALC,0x4E6F,
-	/* Range 0x9EB8 - 0x9EBF, array index: 0x14ED */
-	0x7350,0x396D,0x4C4D,0x4B63,0x5677,INVALC,0x5D60,0x4B7B,
-	/* Range 0x9ECC - 0x9ED4, array index: 0x14F5 */
-	0x7354,0x3550,0x7355,0x7356,0x7357,INVALC,0x3975,INVALC,
-	0x7358,
-	/* Range 0x9ED8 - 0x9EE0, array index: 0x14FE */
-	0x6054,0x4C5B,INVALC,0x4263,0x7359,0x735B,0x735A,INVALC,
-	0x735C,
-	/* Range 0x9EF9 - 0x9EFD, array index: 0x1507 */
-	0x7363,INVALC,0x7364,0x7365,0x7366,
-	/* Range 0x9F5F - 0x9F67, array index: 0x150C */
-	0x7372,0x7373,0x7374,0x4E70,0x7371,INVALC,INVALC,0x7375,
-	0x7376,
-	/* Range 0xFF01 - 0xFF5D, array index: 0x1515 */
-	0x212A,INVALC,0x2174,0x2170,0x2173,0x2175,INVALC,0x214A,
-	0x214B,0x2176,0x215C,0x2124,INVALC,0x2125,0x213F,0x2330,
-	0x2331,0x2332,0x2333,0x2334,0x2335,0x2336,0x2337,0x2338,
-	0x2339,0x2127,0x2128,0x2163,0x2161,0x2164,0x2129,0x2177,
-	0x2341,0x2342,0x2343,0x2344,0x2345,0x2346,0x2347,0x2348,
-	0x2349,0x234A,0x234B,0x234C,0x234D,0x234E,0x234F,0x2350,
-	0x2351,0x2352,0x2353,0x2354,0x2355,0x2356,0x2357,0x2358,
-	0x2359,0x235A,0x214E,INVALC,0x214F,0x2130,0x2132,0x212E,
-	0x2361,0x2362,0x2363,0x2364,0x2365,0x2366,0x2367,0x2368,
-	0x2369,0x236A,0x236B,0x236C,0x236D,0x236E,0x236F,0x2370,
-	0x2371,0x2372,0x2373,0x2374,0x2375,0x2376,0x2377,0x2378,
-	0x2379,0x237A,0x2150,0x2143,0x2151,
-	/* Unranged codes (489 codes) */
-	/* Array index: 0x1572 */ 0x005C,0x2140,
-	/* Array index: 0x1572 */ 0x00A2,0x2171,
-	/* Array index: 0x1572 */ 0x00A3,0x2172,
-	/* Array index: 0x1572 */ 0x00A7,0x2178,
-	/* Array index: 0x1572 */ 0x00A8,0x212F,
-	/* Array index: 0x1572 */ 0x00AC,0x224C,
-	/* Array index: 0x1572 */ 0x00B0,0x216B,
-	/* Array index: 0x1572 */ 0x00B1,0x215E,
-	/* Array index: 0x1572 */ 0x00B4,0x212D,
-	/* Array index: 0x1572 */ 0x00B6,0x2279,
-	/* Array index: 0x1572 */ 0x00D7,0x215F,
-	/* Array index: 0x1572 */ 0x00F7,0x2160,
-	/* Array index: 0x1572 */ 0x0401,0x2727,
-	/* Array index: 0x1572 */ 0x2010,0x213E,
-	/* Array index: 0x1572 */ 0x2025,0x2145,
-	/* Array index: 0x1572 */ 0x2026,0x2144,
-	/* Array index: 0x1572 */ 0x2030,0x2273,
-	/* Array index: 0x1572 */ 0x2032,0x216C,
-	/* Array index: 0x1572 */ 0x2033,0x216D,
-	/* Array index: 0x1572 */ 0x203B,0x2228,
-	/* Array index: 0x1572 */ 0x2103,0x216E,
-	/* Array index: 0x1572 */ 0x212B,0x2272,
-	/* Array index: 0x1572 */ 0x21D2,0x224D,
-	/* Array index: 0x1572 */ 0x21D4,0x224E,
-	/* Array index: 0x1572 */ 0x2200,0x224F,
-	/* Array index: 0x1572 */ 0x2202,0x225F,
-	/* Array index: 0x1572 */ 0x2203,0x2250,
-	/* Array index: 0x1572 */ 0x2207,0x2260,
-	/* Array index: 0x1572 */ 0x2208,0x223A,
-	/* Array index: 0x1572 */ 0x220B,0x223B,
-	/* Array index: 0x1572 */ 0x2212,0x215D,
-	/* Array index: 0x1572 */ 0x221A,0x2265,
-	/* Array index: 0x1572 */ 0x221D,0x2267,
-	/* Array index: 0x1572 */ 0x221E,0x2167,
-	/* Array index: 0x1572 */ 0x2220,0x225C,
-	/* Array index: 0x1572 */ 0x2234,0x2168,
-	/* Array index: 0x1572 */ 0x2235,0x2268,
-	/* Array index: 0x1572 */ 0x223D,0x2266,
-	/* Array index: 0x1572 */ 0x2252,0x2262,
-	/* Array index: 0x1572 */ 0x2260,0x2162,
-	/* Array index: 0x1572 */ 0x2261,0x2261,
-	/* Array index: 0x1572 */ 0x2266,0x2165,
-	/* Array index: 0x1572 */ 0x2267,0x2166,
-	/* Array index: 0x1572 */ 0x226A,0x2263,
-	/* Array index: 0x1572 */ 0x226B,0x2264,
-	/* Array index: 0x1572 */ 0x2282,0x223E,
-	/* Array index: 0x1572 */ 0x2283,0x223F,
-	/* Array index: 0x1572 */ 0x2286,0x223C,
-	/* Array index: 0x1572 */ 0x2287,0x223D,
-	/* Array index: 0x1572 */ 0x22A5,0x225D,
-	/* Array index: 0x1572 */ 0x2312,0x225E,
-	/* Array index: 0x1572 */ 0x250C,0x2823,
-	/* Array index: 0x1572 */ 0x250F,0x282E,
-	/* Array index: 0x1572 */ 0x2510,0x2824,
-	/* Array index: 0x1572 */ 0x2513,0x282F,
-	/* Array index: 0x1572 */ 0x2514,0x2826,
-	/* Array index: 0x1572 */ 0x2520,0x2837,
-	/* Array index: 0x1572 */ 0x2528,0x2839,
-	/* Array index: 0x1572 */ 0x252B,0x2834,
-	/* Array index: 0x1572 */ 0x252C,0x2828,
-	/* Array index: 0x1572 */ 0x252F,0x2838,
-	/* Array index: 0x1572 */ 0x2530,0x283D,
-	/* Array index: 0x1572 */ 0x2533,0x2833,
-	/* Array index: 0x1572 */ 0x2534,0x282A,
-	/* Array index: 0x1572 */ 0x2537,0x283A,
-	/* Array index: 0x1572 */ 0x2538,0x283F,
-	/* Array index: 0x1572 */ 0x253B,0x2835,
-	/* Array index: 0x1572 */ 0x253C,0x282B,
-	/* Array index: 0x1572 */ 0x253F,0x283B,
-	/* Array index: 0x1572 */ 0x2542,0x2840,
-	/* Array index: 0x1572 */ 0x254B,0x2836,
-	/* Array index: 0x1572 */ 0x25A0,0x2223,
-	/* Array index: 0x1572 */ 0x25A1,0x2222,
-	/* Array index: 0x1572 */ 0x25B2,0x2225,
-	/* Array index: 0x1572 */ 0x25B3,0x2224,
-	/* Array index: 0x1572 */ 0x25BC,0x2227,
-	/* Array index: 0x1572 */ 0x25BD,0x2226,
-	/* Array index: 0x1572 */ 0x25C6,0x2221,
-	/* Array index: 0x1572 */ 0x25C7,0x217E,
-	/* Array index: 0x1572 */ 0x25CB,0x217B,
-	/* Array index: 0x1572 */ 0x25CE,0x217D,
-	/* Array index: 0x1572 */ 0x25CF,0x217C,
-	/* Array index: 0x1572 */ 0x25EF,0x227E,
-	/* Array index: 0x1572 */ 0x2605,0x217A,
-	/* Array index: 0x1572 */ 0x2606,0x2179,
-	/* Array index: 0x1572 */ 0x2640,0x216A,
-	/* Array index: 0x1572 */ 0x2642,0x2169,
-	/* Array index: 0x1572 */ 0x266A,0x2276,
-	/* Array index: 0x1572 */ 0x266D,0x2275,
-	/* Array index: 0x1572 */ 0x266F,0x2274,
-	/* Array index: 0x1572 */ 0x301C,0x2141,
-	/* Array index: 0x1572 */ 0x4E00,0x306C,
-	/* Array index: 0x1572 */ 0x4E01,0x437A,
-	/* Array index: 0x1572 */ 0x4E03,0x3C37,
-	/* Array index: 0x1572 */ 0x4E1E,0x3E67,
-	/* Array index: 0x1572 */ 0x4E21,0x4E3E,
-	/* Array index: 0x1572 */ 0x4E26,0x4A42,
-	/* Array index: 0x1572 */ 0x4E2A,0x5024,
-	/* Array index: 0x1572 */ 0x4E2D,0x4366,
-	/* Array index: 0x1572 */ 0x4E31,0x5025,
-	/* Array index: 0x1572 */ 0x4E32,0x367A,
-	/* Array index: 0x1572 */ 0x4E36,0x5026,
-	/* Array index: 0x1572 */ 0x4E3F,0x5028,
-	/* Array index: 0x1572 */ 0x4E42,0x5029,
-	/* Array index: 0x1572 */ 0x4E43,0x4735,
-	/* Array index: 0x1572 */ 0x4E45,0x3557,
-	/* Array index: 0x1572 */ 0x4E62,0x5626,
-	/* Array index: 0x1572 */ 0x4E71,0x4D70,
-	/* Array index: 0x1572 */ 0x4E73,0x467D,
-	/* Array index: 0x1572 */ 0x4E7E,0x3425,
-	/* Array index: 0x1572 */ 0x4E80,0x3535,
-	/* Array index: 0x1572 */ 0x4E82,0x502C,
-	/* Array index: 0x1572 */ 0x4EB3,0x5038,
-	/* Array index: 0x1572 */ 0x4EB6,0x5039,
-	/* Array index: 0x1572 */ 0x4EBA,0x3F4D,
-	/* Array index: 0x1572 */ 0x4EED,0x5041,
-	/* Array index: 0x1572 */ 0x4EEE,0x323E,
-	/* Array index: 0x1572 */ 0x4EF0,0x3644,
-	/* Array index: 0x1572 */ 0x4EF2,0x4367,
-	/* Array index: 0x1572 */ 0x4EF6,0x376F,
-	/* Array index: 0x1572 */ 0x4EF7,0x5043,
-	/* Array index: 0x1572 */ 0x4EFB,0x4724,
-	/* Array index: 0x1572 */ 0x4F01,0x346B,
-	/* Array index: 0x1572 */ 0x4F1A,0x3271,
-	/* Array index: 0x1572 */ 0x4F1C,0x5067,
-	/* Array index: 0x1572 */ 0x4F1D,0x4541,
-	/* Array index: 0x1572 */ 0x4F2F,0x476C,
-	/* Array index: 0x1572 */ 0x4F30,0x5046,
-	/* Array index: 0x1572 */ 0x4F34,0x483C,
-	/* Array index: 0x1572 */ 0x4F36,0x4E62,
-	/* Array index: 0x1572 */ 0x4F38,0x3F2D,
-	/* Array index: 0x1572 */ 0x4F3A,0x3B47,
-	/* Array index: 0x1572 */ 0x4F3C,0x3B77,
-	/* Array index: 0x1572 */ 0x4F3D,0x3240,
-	/* Array index: 0x1572 */ 0x4F43,0x4451,
-	/* Array index: 0x1572 */ 0x4F46,0x4322,
-	/* Array index: 0x1572 */ 0x4F47,0x504A,
-	/* Array index: 0x1572 */ 0x4F69,0x5050,
-	/* Array index: 0x1572 */ 0x4F6F,0x5053,
-	/* Array index: 0x1572 */ 0x4F70,0x5051,
-	/* Array index: 0x1572 */ 0x4F73,0x3242,
-	/* Array index: 0x1572 */ 0x4F75,0x4A3B,
-	/* Array index: 0x1572 */ 0x4F76,0x504B,
-	/* Array index: 0x1572 */ 0x4F7B,0x504F,
-	/* Array index: 0x1572 */ 0x4F7C,0x3873,
-	/* Array index: 0x1572 */ 0x4F7F,0x3B48,
-	/* Array index: 0x1572 */ 0x4F83,0x3426,
-	/* Array index: 0x1572 */ 0x4F86,0x5054,
-	/* Array index: 0x1572 */ 0x4F88,0x504C,
-	/* Array index: 0x1572 */ 0x4F8B,0x4E63,
-	/* Array index: 0x1572 */ 0x4F8D,0x3B78,
-	/* Array index: 0x1572 */ 0x4F8F,0x504D,
-	/* Array index: 0x1572 */ 0x4F91,0x5052,
-	/* Array index: 0x1572 */ 0x4F96,0x5055,
-	/* Array index: 0x1572 */ 0x4F98,0x504E,
-	/* Array index: 0x1572 */ 0x4F9B,0x3621,
-	/* Array index: 0x1572 */ 0x4F9D,0x304D,
-	/* Array index: 0x1572 */ 0x4FA0,0x3622,
-	/* Array index: 0x1572 */ 0x4FA1,0x3241,
-	/* Array index: 0x1572 */ 0x4FB5,0x3F2F,
-	/* Array index: 0x1572 */ 0x4FB6,0x4E37,
-	/* Array index: 0x1572 */ 0x4FBF,0x4A58,
-	/* Array index: 0x1572 */ 0x4FCA,0x3D53,
-	/* Array index: 0x1572 */ 0x4FCE,0x5059,
-	/* Array index: 0x1572 */ 0x4FD0,0x505E,
-	/* Array index: 0x1572 */ 0x4FD1,0x505C,
-	/* Array index: 0x1572 */ 0x4FD4,0x5057,
-	/* Array index: 0x1572 */ 0x4FEE,0x3D24,
-	/* Array index: 0x1572 */ 0x4FEF,0x506D,
-	/* Array index: 0x1572 */ 0x4FF3,0x4750,
-	/* Array index: 0x1572 */ 0x4FF5,0x4936,
-	/* Array index: 0x1572 */ 0x4FF6,0x5068,
-	/* Array index: 0x1572 */ 0x4FF8,0x4A70,
-	/* Array index: 0x1572 */ 0x4FFA,0x3236,
-	/* Array index: 0x1572 */ 0x4FFE,0x506C,
-	/* Array index: 0x1572 */ 0x5005,0x5066,
-	/* Array index: 0x1572 */ 0x5006,0x506F,
-	/* Array index: 0x1572 */ 0x5009,0x4152,
-	/* Array index: 0x1572 */ 0x500B,0x3844,
-	/* Array index: 0x1572 */ 0x500D,0x475C,
-	/* Array index: 0x1572 */ 0x500F,0x6047,
-	/* Array index: 0x1572 */ 0x5011,0x506E,
-	/* Array index: 0x1572 */ 0x5012,0x455D,
-	/* Array index: 0x1572 */ 0x5014,0x5063,
-	/* Array index: 0x1572 */ 0x5016,0x3876,
-	/* Array index: 0x1572 */ 0x5019,0x3875,
-	/* Array index: 0x1572 */ 0x501A,0x5061,
-	/* Array index: 0x1572 */ 0x501F,0x3C5A,
-	/* Array index: 0x1572 */ 0x5036,0x3666,
-	/* Array index: 0x1572 */ 0x5039,0x3770,
-	/* Array index: 0x1572 */ 0x5043,0x5070,
-	/* Array index: 0x1572 */ 0x504F,0x4A50,
-	/* Array index: 0x1572 */ 0x5050,0x5074,
-	/* Array index: 0x1572 */ 0x5055,0x5073,
-	/* Array index: 0x1572 */ 0x5056,0x5077,
-	/* Array index: 0x1572 */ 0x505A,0x5076,
-	/* Array index: 0x1572 */ 0x505C,0x4464,
-	/* Array index: 0x1572 */ 0x5065,0x3772,
-	/* Array index: 0x1572 */ 0x506C,0x5078,
-	/* Array index: 0x1572 */ 0x507D,0x3536,
-	/* Array index: 0x1572 */ 0x5080,0x507A,
-	/* Array index: 0x1572 */ 0x5085,0x507C,
-	/* Array index: 0x1572 */ 0x508D,0x4B35,
-	/* Array index: 0x1572 */ 0x5091,0x3766,
-	/* Array index: 0x1572 */ 0x50AC,0x3A45,
-	/* Array index: 0x1572 */ 0x50AD,0x4D43,
-	/* Array index: 0x1572 */ 0x50BE,0x3739,
-	/* Array index: 0x1572 */ 0x50C2,0x5124,
-	/* Array index: 0x1572 */ 0x50C5,0x364F,
-	/* Array index: 0x1572 */ 0x50C9,0x5121,
-	/* Array index: 0x1572 */ 0x50CA,0x5122,
-	/* Array index: 0x1572 */ 0x50CD,0x462F,
-	/* Array index: 0x1572 */ 0x50CF,0x417C,
-	/* Array index: 0x1572 */ 0x50D1,0x3623,
-	/* Array index: 0x1572 */ 0x50D5,0x4B4D,
-	/* Array index: 0x1572 */ 0x50D6,0x5125,
-	/* Array index: 0x1572 */ 0x50DA,0x4E3D,
-	/* Array index: 0x1572 */ 0x50DE,0x5126,
-	/* Array index: 0x1572 */ 0x50E3,0x5129,
-	/* Array index: 0x1572 */ 0x50E5,0x5127,
-	/* Array index: 0x1572 */ 0x50E7,0x414E,
-	/* Array index: 0x1572 */ 0x50ED,0x5128,
-	/* Array index: 0x1572 */ 0x50EE,0x512A,
-	/* Array index: 0x1572 */ 0x50F5,0x512C,
-	/* Array index: 0x1572 */ 0x50F9,0x512B,
-	/* Array index: 0x1572 */ 0x50FB,0x4A48,
-	/* Array index: 0x1572 */ 0x5109,0x512D,
-	/* Array index: 0x1572 */ 0x511F,0x3D7E,
-	/* Array index: 0x1572 */ 0x5121,0x5134,
-	/* Array index: 0x1572 */ 0x512A,0x4D25,
-	/* Array index: 0x1572 */ 0x5132,0x4C59,
-	/* Array index: 0x1572 */ 0x5137,0x5136,
-	/* Array index: 0x1572 */ 0x515A,0x455E,
-	/* Array index: 0x1572 */ 0x515C,0x3375,
-	/* Array index: 0x1572 */ 0x5162,0x513E,
-	/* Array index: 0x1572 */ 0x5165,0x467E,
-	/* Array index: 0x1572 */ 0x5171,0x3626,
-	/* Array index: 0x1572 */ 0x517C,0x3773,
-	/* Array index: 0x1572 */ 0x5180,0x5143,
-	/* Array index: 0x1572 */ 0x5182,0x5144,
-	/* Array index: 0x1572 */ 0x5185,0x4662,
-	/* Array index: 0x1572 */ 0x5186,0x315F,
-	/* Array index: 0x1572 */ 0x51A0,0x3427,
-	/* Array index: 0x1572 */ 0x51BD,0x5158,
-	/* Array index: 0x1572 */ 0x51D6,0x5245,
-	/* Array index: 0x1572 */ 0x51ED,0x515F,
-	/* Array index: 0x1572 */ 0x51F0,0x5160,
-	/* Array index: 0x1572 */ 0x51F1,0x332E,
-	/* Array index: 0x1572 */ 0x520E,0x5166,
-	/* Array index: 0x1572 */ 0x5211,0x373A,
-	/* Array index: 0x1572 */ 0x5214,0x5165,
-	/* Array index: 0x1572 */ 0x5217,0x4E73,
-	/* Array index: 0x1572 */ 0x521D,0x3D69,
-	/* Array index: 0x1572 */ 0x5224,0x483D,
-	/* Array index: 0x1572 */ 0x5225,0x4A4C,
-	/* Array index: 0x1572 */ 0x5227,0x5167,
-	/* Array index: 0x1572 */ 0x5229,0x4D78,
-	/* Array index: 0x1572 */ 0x522A,0x5168,
-	/* Array index: 0x1572 */ 0x522E,0x5169,
-	/* Array index: 0x1572 */ 0x5230,0x457E,
-	/* Array index: 0x1572 */ 0x5233,0x516A,
-	/* Array index: 0x1572 */ 0x5243,0x4466,
-	/* Array index: 0x1572 */ 0x5244,0x516D,
-	/* Array index: 0x1572 */ 0x5247,0x4227,
-	/* Array index: 0x1572 */ 0x5254,0x5171,
-	/* Array index: 0x1572 */ 0x5256,0x4B36,
-	/* Array index: 0x1572 */ 0x525B,0x3964,
-	/* Array index: 0x1572 */ 0x525E,0x5170,
-	/* Array index: 0x1572 */ 0x5269,0x5174,
-	/* Array index: 0x1572 */ 0x526A,0x5172,
-	/* Array index: 0x1572 */ 0x527D,0x5177,
-	/* Array index: 0x1572 */ 0x527F,0x5176,
-	/* Array index: 0x1572 */ 0x5283,0x3344,
-	/* Array index: 0x1572 */ 0x528D,0x5178,
-	/* Array index: 0x1572 */ 0x5291,0x517D,
-	/* Array index: 0x1572 */ 0x5292,0x517A,
-	/* Array index: 0x1572 */ 0x5294,0x5179,
-	/* Array index: 0x1572 */ 0x529B,0x4E4F,
-	/* Array index: 0x1572 */ 0x529F,0x3879,
-	/* Array index: 0x1572 */ 0x52A0,0x3243,
-	/* Array index: 0x1572 */ 0x52A3,0x4E74,
-	/* Array index: 0x1572 */ 0x52B1,0x4E65,
-	/* Array index: 0x1572 */ 0x52B4,0x4F2B,
-	/* Array index: 0x1572 */ 0x52B5,0x5225,
-	/* Array index: 0x1572 */ 0x52B9,0x387A,
-	/* Array index: 0x1572 */ 0x52BC,0x5224,
-	/* Array index: 0x1572 */ 0x52BE,0x332F,
-	/* Array index: 0x1572 */ 0x52C1,0x5226,
-	/* Array index: 0x1572 */ 0x52C3,0x4B56,
-	/* Array index: 0x1572 */ 0x52C5,0x443C,
-	/* Array index: 0x1572 */ 0x52C7,0x4D26,
-	/* Array index: 0x1572 */ 0x52C9,0x4A59,
-	/* Array index: 0x1572 */ 0x52CD,0x5227,
-	/* Array index: 0x1572 */ 0x52D2,0x7055,
-	/* Array index: 0x1572 */ 0x52F2,0x372E,
-	/* Array index: 0x1572 */ 0x52F3,0x522E,
-	/* Array index: 0x1572 */ 0x52F5,0x522F,
-	/* Array index: 0x1572 */ 0x530D,0x5235,
-	/* Array index: 0x1572 */ 0x530F,0x5237,
-	/* Array index: 0x1572 */ 0x5310,0x5236,
-	/* Array index: 0x1572 */ 0x531D,0x4159,
-	/* Array index: 0x1572 */ 0x5320,0x3E22,
-	/* Array index: 0x1572 */ 0x5321,0x3629,
-	/* Array index: 0x1572 */ 0x5323,0x523A,
-	/* Array index: 0x1572 */ 0x532A,0x485B,
-	/* Array index: 0x1572 */ 0x532F,0x523B,
-	/* Array index: 0x1572 */ 0x5331,0x523C,
-	/* Array index: 0x1572 */ 0x5333,0x523D,
-	/* Array index: 0x1572 */ 0x534D,0x5244,
-	/* Array index: 0x1572 */ 0x5366,0x3735,
-	/* Array index: 0x1572 */ 0x5369,0x5247,
-	/* Array index: 0x1572 */ 0x537B,0x524A,
-	/* Array index: 0x1572 */ 0x537F,0x362A,
-	/* Array index: 0x1572 */ 0x5382,0x524C,
-	/* Array index: 0x1572 */ 0x5384,0x4C71,
-	/* Array index: 0x1572 */ 0x5396,0x524D,
-	/* Array index: 0x1572 */ 0x5398,0x4E52,
-	/* Array index: 0x1572 */ 0x539A,0x387C,
-	/* Array index: 0x1572 */ 0x539F,0x3836,
-	/* Array index: 0x1572 */ 0x53A0,0x524E,
-	/* Array index: 0x1572 */ 0x53AD,0x315E,
-	/* Array index: 0x1572 */ 0x53AE,0x5251,
-	/* Array index: 0x1572 */ 0x53B0,0x5252,
-	/* Array index: 0x1572 */ 0x53B3,0x3837,
-	/* Array index: 0x1572 */ 0x53B6,0x5253,
-	/* Array index: 0x1572 */ 0x53BB,0x356E,
-	/* Array index: 0x1572 */ 0x53C2,0x3B32,
-	/* Array index: 0x1572 */ 0x53C3,0x5254,
-	/* Array index: 0x1572 */ 0x53D4,0x3D47,
-	/* Array index: 0x1572 */ 0x53D6,0x3C68,
-	/* Array index: 0x1572 */ 0x53D7,0x3C75,
-	/* Array index: 0x1572 */ 0x53D9,0x3D76,
-	/* Array index: 0x1572 */ 0x53DB,0x4840,
-	/* Array index: 0x1572 */ 0x5401,0x525E,
-	/* Array index: 0x1572 */ 0x5403,0x3549,
-	/* Array index: 0x1572 */ 0x5404,0x3346,
-	/* Array index: 0x1572 */ 0x541B,0x372F,
-	/* Array index: 0x1572 */ 0x541D,0x5267,
-	/* Array index: 0x1572 */ 0x541F,0x3663,
-	/* Array index: 0x1572 */ 0x5420,0x4B4A,
-	/* Array index: 0x1572 */ 0x5426,0x485D,
-	/* Array index: 0x1572 */ 0x5436,0x5265,
-	/* Array index: 0x1572 */ 0x544E,0x5268,
-	/* Array index: 0x1572 */ 0x5451,0x465D,
-	/* Array index: 0x1572 */ 0x545F,0x526C,
-	/* Array index: 0x1572 */ 0x5468,0x3C7E,
-	/* Array index: 0x1572 */ 0x546A,0x3C76,
-	/* Array index: 0x1572 */ 0x5470,0x526F,
-	/* Array index: 0x1572 */ 0x5471,0x526D,
-	/* Array index: 0x1572 */ 0x5480,0x5272,
-	/* Array index: 0x1572 */ 0x5484,0x5274,
-	/* Array index: 0x1572 */ 0x5486,0x5276,
-	/* Array index: 0x1572 */ 0x54A2,0x5278,
-	/* Array index: 0x1572 */ 0x54A4,0x5323,
-	/* Array index: 0x1572 */ 0x54A5,0x527A,
-	/* Array index: 0x1572 */ 0x54A8,0x527E,
-	/* Array index: 0x1572 */ 0x54AB,0x5321,
-	/* Array index: 0x1572 */ 0x54AC,0x527B,
-	/* Array index: 0x1572 */ 0x54AF,0x533E,
-	/* Array index: 0x1572 */ 0x54B2,0x3A69,
-	/* Array index: 0x1572 */ 0x54B3,0x3331,
-	/* Array index: 0x1572 */ 0x54B8,0x5279,
-	/* Array index: 0x1572 */ 0x54D8,0x5326,
-	/* Array index: 0x1572 */ 0x54E1,0x3077,
-	/* Array index: 0x1572 */ 0x54E2,0x532F,
-	/* Array index: 0x1572 */ 0x54ED,0x532D,
-	/* Array index: 0x1572 */ 0x54EE,0x532C,
-	/* Array index: 0x1572 */ 0x54F2,0x452F,
-	/* Array index: 0x1572 */ 0x54FA,0x532E,
-	/* Array index: 0x1572 */ 0x54FD,0x532B,
-	/* Array index: 0x1572 */ 0x5504,0x3134,
-	/* Array index: 0x1572 */ 0x5506,0x3A36,
-	/* Array index: 0x1572 */ 0x5507,0x3F30,
-	/* Array index: 0x1572 */ 0x550F,0x5329,
-	/* Array index: 0x1572 */ 0x5510,0x4562,
-	/* Array index: 0x1572 */ 0x5514,0x532A,
-	/* Array index: 0x1572 */ 0x5516,0x3022,
-	/* Array index: 0x1572 */ 0x552E,0x5334,
-	/* Array index: 0x1572 */ 0x552F,0x4D23,
-	/* Array index: 0x1572 */ 0x5531,0x3E27,
-	/* Array index: 0x1572 */ 0x5533,0x533A,
-	/* Array index: 0x1572 */ 0x5538,0x5339,
-	/* Array index: 0x1572 */ 0x5539,0x5330,
-	/* Array index: 0x1572 */ 0x553E,0x4243,
-	/* Array index: 0x1572 */ 0x5540,0x5331,
-	/* Array index: 0x1572 */ 0x554C,0x5333,
-	/* Array index: 0x1572 */ 0x554F,0x4C64,
-	/* Array index: 0x1572 */ 0x5553,0x373C,
-	/* Array index: 0x1572 */ 0x5556,0x5337,
-	/* Array index: 0x1572 */ 0x5557,0x5338,
-	/* Array index: 0x1572 */ 0x555C,0x5335,
-	/* Array index: 0x1572 */ 0x555D,0x533B,
-	/* Array index: 0x1572 */ 0x5563,0x5332,
-	/* Array index: 0x1572 */ 0x557B,0x5341,
-	/* Array index: 0x1572 */ 0x557C,0x5346,
-	/* Array index: 0x1572 */ 0x557E,0x5342,
-	/* Array index: 0x1572 */ 0x5580,0x533D,
-	/* Array index: 0x1572 */ 0x5583,0x5347,
-	/* Array index: 0x1572 */ 0x5584,0x4131,
-	/* Array index: 0x1572 */ 0x55B6,0x3144,
-	/* Array index: 0x1572 */ 0x55C4,0x534E,
-	/* Array index: 0x1572 */ 0x55C5,0x534C,
-	/* Array index: 0x1572 */ 0x55C7,0x5427,
-	/* Array index: 0x1572 */ 0x55D4,0x5351,
-	/* Array index: 0x1572 */ 0x55DA,0x534B,
-	/* Array index: 0x1572 */ 0x55DC,0x534F,
-	/* Array index: 0x1572 */ 0x55DF,0x534D,
-	/* Array index: 0x1572 */ 0x55E3,0x3B4C,
-	/* Array index: 0x1572 */ 0x55E4,0x5350,
-	/* Array index: 0x1572 */ 0x55F7,0x5353,
-	/* Array index: 0x1572 */ 0x55F9,0x5358,
-	/* Array index: 0x1572 */ 0x55FD,0x5356,
-	/* Array index: 0x1572 */ 0x55FE,0x5355,
-	/* Array index: 0x1572 */ 0x5606,0x4332,
-	/* Array index: 0x1572 */ 0x5609,0x3245,
-	/* Array index: 0x1572 */ 0x561B,0x5357,
-	/* Array index: 0x1572 */ 0x5629,0x325E,
-	/* Array index: 0x1572 */ 0x562F,0x5362,
-	/* Array index: 0x1572 */ 0x5631,0x3E7C,
-	/* Array index: 0x1572 */ 0x5632,0x535E,
-	/* Array index: 0x1572 */ 0x5634,0x535C,
-	/* Array index: 0x1572 */ 0x5636,0x535D,
-	/* Array index: 0x1572 */ 0x5638,0x535F,
-	/* Array index: 0x1572 */ 0x5642,0x313D,
-	/* Array index: 0x1572 */ 0x564C,0x4139,
-	/* Array index: 0x1572 */ 0x564E,0x5359,
-	/* Array index: 0x1572 */ 0x5650,0x535A,
-	/* Array index: 0x1572 */ 0x565B,0x337A,
-	/* Array index: 0x1572 */ 0x5664,0x5361,
-	/* Array index: 0x1572 */ 0x5674,0x4A2E,
-	/* Array index: 0x1572 */ 0x5678,0x4655,
-	/* Array index: 0x1572 */ 0x567A,0x4838,
-	/* Array index: 0x1572 */ 0x5680,0x5366,
-	/* Array index: 0x1572 */ 0x5686,0x5365,
-	/* Array index: 0x1572 */ 0x5687,0x3345,
-	/* Array index: 0x1572 */ 0x568A,0x5367,
-	/* Array index: 0x1572 */ 0x568F,0x536A,
-	/* Array index: 0x1572 */ 0x5694,0x5369,
-	/* Array index: 0x1572 */ 0x56A0,0x5368,
-	/* Array index: 0x1572 */ 0x56A2,0x4739,
-	/* Array index: 0x1572 */ 0x56A5,0x536B,
-	/* Array index: 0x1572 */ 0x56AE,0x536C,
-	/* Array index: 0x1572 */ 0x56B4,0x536E,
-	/* Array index: 0x1572 */ 0x56B6,0x536D,
-	/* Array index: 0x1572 */ 0x56BC,0x5370,
-	/* Array index: 0x1572 */ 0x56C8,0x5374,
-	/* Array index: 0x1572 */ 0x56CE,0x5375,
-	/* Array index: 0x1572 */ 0x56D1,0x5376,
-	/* Array index: 0x1572 */ 0x56D3,0x5377,
-	/* Array index: 0x1572 */ 0x56DE,0x3273,
-	/* Array index: 0x1572 */ 0x56E0,0x3078,
-	/* Array index: 0x1572 */ 0x56E3,0x4344,
-	/* Array index: 0x1572 */ 0x56EE,0x5379,
-	/* Array index: 0x1572 */ 0x56F0,0x3A24,
-	/* Array index: 0x1572 */ 0x56F2,0x304F,
-	/* Array index: 0x1572 */ 0x56F3,0x3F5E,
-	/* Array index: 0x1572 */ 0x56F9,0x537A,
-	/* Array index: 0x1572 */ 0x56FA,0x3847,
-	/* Array index: 0x1572 */ 0x56FD,0x3971,
-	/* Array index: 0x1572 */ 0x56FF,0x537C,
-	/* Array index: 0x1572 */ 0x5700,0x537B,
-	/* Array index: 0x1572 */ 0x5703,0x4A60,
-	/* Array index: 0x1572 */ 0x5704,0x537D,
-	/* Array index: 0x1572 */ 0x5708,0x5421,
-	/* Array index: 0x1572 */ 0x5709,0x537E,
-	/* Array index: 0x1572 */ 0x570B,0x5422,
-	/* Array index: 0x1572 */ 0x570D,0x5423,
-	/* Array index: 0x1572 */ 0x570F,0x3777,
-	/* Array index: 0x1572 */ 0x5712,0x3160,
-	/* Array index: 0x1572 */ 0x5713,0x5424,
-	/* Array index: 0x1572 */ 0x5716,0x5426,
-	/* Array index: 0x1572 */ 0x5718,0x5425,
-	/* Array index: 0x1572 */ 0x571C,0x5428,
-	/* Array index: 0x1572 */ 0x571F,0x455A,
-	/* Array index: 0x1572 */ 0x572D,0x373D,
-	/* Array index: 0x1572 */ 0x5730,0x434F,
-	/* Array index: 0x1572 */ 0x5737,0x542A,
-	/* Array index: 0x1572 */ 0x5738,0x542B,
-	/* Array index: 0x1572 */ 0x573B,0x542D,
-	/* Array index: 0x1572 */ 0x5740,0x542E,
-	/* Array index: 0x1572 */ 0x5742,0x3A64,
-	/* Array index: 0x1572 */ 0x5747,0x3651,
-	/* Array index: 0x1572 */ 0x574A,0x4B37,
-	/* Array index: 0x1572 */ 0x5761,0x5433,
-	/* Array index: 0x1572 */ 0x5764,0x3A25,
-	/* Array index: 0x1572 */ 0x5766,0x4333,
-	/* Array index: 0x1572 */ 0x5769,0x5430,
-	/* Array index: 0x1572 */ 0x576A,0x445A,
-	/* Array index: 0x1572 */ 0x577F,0x5434,
-	/* Array index: 0x1572 */ 0x5782,0x3F62,
-	/* Array index: 0x1572 */ 0x5788,0x5432,
-	/* Array index: 0x1572 */ 0x5789,0x5435,
-	/* Array index: 0x1572 */ 0x578B,0x373F,
-	/* Array index: 0x1572 */ 0x5793,0x5436,
-	/* Array index: 0x1572 */ 0x57AA,0x543A,
-	/* Array index: 0x1572 */ 0x57B0,0x543B,
-	/* Array index: 0x1572 */ 0x57B3,0x5438,
-	/* Array index: 0x1572 */ 0x57C0,0x5431,
-	/* Array index: 0x1572 */ 0x57C3,0x543C,
-	/* Array index: 0x1572 */ 0x57C6,0x543D,
-	/* Array index: 0x1572 */ 0x57CB,0x4B64,
-	/* Array index: 0x1572 */ 0x57CE,0x3E6B,
-	/* Array index: 0x1572 */ 0x57DC,0x4738,
-	/* Array index: 0x1572 */ 0x57DF,0x3068,
-	/* Array index: 0x1572 */ 0x57E0,0x4956,
-	/* Array index: 0x1572 */ 0x57E3,0x5443,
-	/* Array index: 0x1572 */ 0x57F4,0x3E7D,
-	/* Array index: 0x1572 */ 0x57F7,0x3C39,
-	/* Array index: 0x1572 */ 0x57F9,0x475D,
-	/* Array index: 0x1572 */ 0x57FA,0x3470,
-	/* Array index: 0x1572 */ 0x57FC,0x3A6B,
-	/* Array index: 0x1572 */ 0x5800,0x4B59,
-	/* Array index: 0x1572 */ 0x5802,0x4632,
-	/* Array index: 0x1572 */ 0x5805,0x3778,
-	/* Array index: 0x1572 */ 0x5806,0x424F,
-	/* Array index: 0x1572 */ 0x580A,0x5441,
-	/* Array index: 0x1572 */ 0x580B,0x5444,
-	/* Array index: 0x1572 */ 0x5815,0x4244,
-	/* Array index: 0x1572 */ 0x5819,0x5445,
-	/* Array index: 0x1572 */ 0x581D,0x5446,
-	/* Array index: 0x1572 */ 0x5821,0x5448,
-	/* Array index: 0x1572 */ 0x5824,0x4469,
-	/* Array index: 0x1572 */ 0x582A,0x342E,
-	/* Array index: 0x1572 */ 0x583A,0x3A66,
-	/* Array index: 0x1572 */ 0x583D,0x544E,
-	/* Array index: 0x1572 */ 0x5840,0x4A3D,
-	/* Array index: 0x1572 */ 0x5841,0x4E5D,
-	/* Array index: 0x1572 */ 0x584A,0x3274,
-	/* Array index: 0x1572 */ 0x584B,0x544A,
-	/* Array index: 0x1572 */ 0x5851,0x413A,
-	/* Array index: 0x1572 */ 0x5852,0x544D,
-	/* Array index: 0x1572 */ 0x5854,0x4563,
-	/* Array index: 0x1572 */ 0x585E,0x3A49,
-	/* Array index: 0x1572 */ 0x5862,0x5449,
-	/* Array index: 0x1572 */ 0x5869,0x3176,
-	/* Array index: 0x1572 */ 0x586B,0x4536,
-	/* Array index: 0x1572 */ 0x5870,0x544B,
-	/* Array index: 0x1572 */ 0x5872,0x5447,
-	/* Array index: 0x1572 */ 0x5875,0x3F50,
-	/* Array index: 0x1572 */ 0x5879,0x544F,
-	/* Array index: 0x1572 */ 0x587E,0x3D4E,
-	/* Array index: 0x1572 */ 0x5883,0x362D,
-	/* Array index: 0x1572 */ 0x5885,0x5450,
-	/* Array index: 0x1572 */ 0x5893,0x4A68,
-	/* Array index: 0x1572 */ 0x5897,0x417D,
-	/* Array index: 0x1572 */ 0x589C,0x4446,
-	/* Array index: 0x1572 */ 0x589F,0x5452,
-	/* Array index: 0x1572 */ 0x58A8,0x4B4F,
-	/* Array index: 0x1572 */ 0x58AB,0x5453,
-	/* Array index: 0x1572 */ 0x58AE,0x5458,
-	/* Array index: 0x1572 */ 0x58B3,0x4A2F,
-	/* Array index: 0x1572 */ 0x58BE,0x3A26,
-	/* Array index: 0x1572 */ 0x58C1,0x4A49,
-	/* Array index: 0x1572 */ 0x58C5,0x5459,
-	/* Array index: 0x1572 */ 0x58C7,0x4345,
-	/* Array index: 0x1572 */ 0x58CA,0x3275,
-	/* Array index: 0x1572 */ 0x58CC,0x3E6D,
-	/* Array index: 0x1572 */ 0x58D1,0x545B,
-	/* Array index: 0x1572 */ 0x58D3,0x545A,
-	/* Array index: 0x1572 */ 0x58DC,0x5460,
-	/* Array index: 0x1572 */ 0x58DE,0x5455,
-	/* Array index: 0x1572 */ 0x58DF,0x5462,
-	/* Array index: 0x1572 */ 0x58E4,0x5461,
-	/* Array index: 0x1572 */ 0x58E5,0x545F,
-	/* Array index: 0x1572 */ 0x5902,0x5469,
-	/* Array index: 0x1572 */ 0x5909,0x4A51,
-	/* Array index: 0x1572 */ 0x590A,0x546A,
-	/* Array index: 0x1572 */ 0x590F,0x3246,
-	/* Array index: 0x1572 */ 0x5910,0x546B,
-	/* Array index: 0x1572 */ 0x5922,0x4C34,
-	/* Array index: 0x1572 */ 0x5925,0x546E,
-	/* Array index: 0x1572 */ 0x5937,0x3050,
-	/* Array index: 0x1572 */ 0x5938,0x5472,
-	/* Array index: 0x1572 */ 0x593E,0x5473,
-	/* Array index: 0x1572 */ 0x5944,0x3162,
-	/* Array index: 0x1572 */ 0x5960,0x547B,
-	/* Array index: 0x1572 */ 0x5962,0x547A,
-	/* Array index: 0x1572 */ 0x5973,0x3D77,
-	/* Array index: 0x1572 */ 0x5974,0x455B,
-	/* Array index: 0x1572 */ 0x5978,0x5521,
-	/* Array index: 0x1572 */ 0x597D,0x3925,
-	/* Array index: 0x1572 */ 0x598A,0x4725,
-	/* Array index: 0x1572 */ 0x598D,0x552B,
-	/* Array index: 0x1572 */ 0x5993,0x3538,
-	/* Array index: 0x1572 */ 0x5996,0x4D45,
-	/* Array index: 0x1572 */ 0x5999,0x4C2F,
-	/* Array index: 0x1572 */ 0x599B,0x562C,
-	/* Array index: 0x1572 */ 0x599D,0x5523,
-	/* Array index: 0x1572 */ 0x59A3,0x5526,
-	/* Array index: 0x1572 */ 0x59A5,0x4245,
-	/* Array index: 0x1572 */ 0x59A8,0x4B38,
-	/* Array index: 0x1572 */ 0x59AC,0x454A,
-	/* Array index: 0x1572 */ 0x59B2,0x5527,
-	/* Array index: 0x1572 */ 0x59B9,0x4B65,
-	/* Array index: 0x1572 */ 0x59BB,0x3A4A,
-	/* Array index: 0x1572 */ 0x59BE,0x3E2A,
-	/* Array index: 0x1572 */ 0x59C6,0x5528,
-	/* Array index: 0x1572 */ 0x59C9,0x3B50,
-	/* Array index: 0x1572 */ 0x59CB,0x3B4F,
-	/* Array index: 0x1572 */ 0x59D9,0x552C,
-	/* Array index: 0x1572 */ 0x59DA,0x552D,
-	/* Array index: 0x1572 */ 0x59DC,0x552A,
-	/* Array index: 0x1572 */ 0x59E5,0x3138,
-	/* Array index: 0x1572 */ 0x59E6,0x342F,
-	/* Array index: 0x1572 */ 0x59E8,0x5529,
-	/* Array index: 0x1572 */ 0x59EA,0x4C45,
-	/* Array index: 0x1572 */ 0x59EB,0x4931,
-	/* Array index: 0x1572 */ 0x59F6,0x3028,
-	/* Array index: 0x1572 */ 0x59FB,0x3079,
-	/* Array index: 0x1572 */ 0x59FF,0x3B51,
-	/* Array index: 0x1572 */ 0x5A01,0x3052,
-	/* Array index: 0x1572 */ 0x5A03,0x3023,
-	/* Array index: 0x1572 */ 0x5A09,0x5532,
-	/* Array index: 0x1572 */ 0x5A11,0x5530,
-	/* Array index: 0x1572 */ 0x5A18,0x4C3C,
-	/* Array index: 0x1572 */ 0x5A1A,0x5533,
-	/* Array index: 0x1572 */ 0x5A1C,0x5531,
-	/* Array index: 0x1572 */ 0x5A1F,0x552F,
-	/* Array index: 0x1572 */ 0x5A20,0x3F31,
-	/* Array index: 0x1572 */ 0x5A25,0x552E,
-	/* Array index: 0x1572 */ 0x5A29,0x4A5A,
-	/* Array index: 0x1572 */ 0x5A2F,0x3864,
-	/* Array index: 0x1572 */ 0x5A35,0x5537,
-	/* Array index: 0x1572 */ 0x5A36,0x5538,
-	/* Array index: 0x1572 */ 0x5A3C,0x3E2B,
-	/* Array index: 0x1572 */ 0x5A40,0x5534,
-	/* Array index: 0x1572 */ 0x5A41,0x4F2C,
-	/* Array index: 0x1572 */ 0x5A46,0x474C,
-	/* Array index: 0x1572 */ 0x5A49,0x5536,
-	/* Array index: 0x1572 */ 0x5A5A,0x3A27,
-	/* Array index: 0x1572 */ 0x5A62,0x5539,
-	/* Array index: 0x1572 */ 0x5A66,0x4958,
-	/* Array index: 0x1572 */ 0x5A6A,0x553A,
-	/* Array index: 0x1572 */ 0x5A6C,0x5535,
-	/* Array index: 0x1572 */ 0x5A7F,0x4C3B,
-	/* Array index: 0x1572 */ 0x5A92,0x475E,
-	/* Array index: 0x1572 */ 0x5A9A,0x553B,
-	/* Array index: 0x1572 */ 0x5A9B,0x4932,
-	/* Array index: 0x1572 */ 0x5AC9,0x3C3B,
-	/* Array index: 0x1572 */ 0x5ACB,0x553E,
-	/* Array index: 0x1572 */ 0x5ACC,0x3779,
-	/* Array index: 0x1572 */ 0x5AD0,0x554C,
-	/* Array index: 0x1572 */ 0x5AD6,0x5545,
-	/* Array index: 0x1572 */ 0x5AD7,0x5542,
-	/* Array index: 0x1572 */ 0x5AE1,0x4364,
-	/* Array index: 0x1572 */ 0x5AE3,0x5541,
-	/* Array index: 0x1572 */ 0x5AE6,0x5543,
-	/* Array index: 0x1572 */ 0x5AE9,0x5544,
-	/* Array index: 0x1572 */ 0x5AFA,0x5546,
-	/* Array index: 0x1572 */ 0x5AFB,0x5547,
-	/* Array index: 0x1572 */ 0x5B09,0x3472,
-	/* Array index: 0x1572 */ 0x5B0B,0x5549,
-	/* Array index: 0x1572 */ 0x5B0C,0x5548,
-	/* Array index: 0x1572 */ 0x5B16,0x554A,
-	/* Array index: 0x1572 */ 0x5B22,0x3E6E,
-	/* Array index: 0x1572 */ 0x5B2A,0x554D,
-	/* Array index: 0x1572 */ 0x5B2C,0x445C,
-	/* Array index: 0x1572 */ 0x5B30,0x3145,
-	/* Array index: 0x1572 */ 0x5B32,0x554B,
-	/* Array index: 0x1572 */ 0x5B36,0x554E,
-	/* Array index: 0x1572 */ 0x5B3E,0x554F,
-	/* Array index: 0x1572 */ 0x5B40,0x5552,
-	/* Array index: 0x1572 */ 0x5B43,0x5550,
-	/* Array index: 0x1572 */ 0x5B45,0x5551,
-	/* Array index: 0x1572 */ 0x5B50,0x3B52,
-	/* Array index: 0x1572 */ 0x5B51,0x5553,
-	/* Array index: 0x1572 */ 0x5B69,0x5558,
-	/* Array index: 0x1572 */ 0x5B6B,0x4239,
-	/* Array index: 0x1572 */ 0x5B70,0x5559,
-	/* Array index: 0x1572 */ 0x5B71,0x5623,
-	/* Array index: 0x1572 */ 0x5B73,0x555A,
-	/* Array index: 0x1572 */ 0x5B75,0x555B,
-	/* Array index: 0x1572 */ 0x5B78,0x555C,
-	/* Array index: 0x1572 */ 0x5B7A,0x555E,
-	/* Array index: 0x1572 */ 0x5B80,0x555F,
-	/* Array index: 0x1572 */ 0x5B83,0x5560,
-	/* Array index: 0x1572 */ 0x5BAE,0x355C,
-	/* Array index: 0x1572 */ 0x5BB0,0x3A4B,
-	/* Array index: 0x1572 */ 0x5BBF,0x3D49,
-	/* Array index: 0x1572 */ 0x5BCC,0x4959,
-	/* Array index: 0x1572 */ 0x5BEE,0x4E40,
-	/* Array index: 0x1572 */ 0x5BF0,0x556E,
-	/* Array index: 0x1572 */ 0x5BF3,0x5570,
-	/* Array index: 0x1572 */ 0x5BF5,0x437E,
-	/* Array index: 0x1572 */ 0x5BF6,0x556F,
-	/* Array index: 0x1572 */ 0x5BF8,0x4023,
-	/* Array index: 0x1572 */ 0x5BFA,0x3B7B,
-	/* Array index: 0x1572 */ 0x5C16,0x406D,
-	/* Array index: 0x1572 */ 0x5C1A,0x3E30,
-	/* Array index: 0x1572 */ 0x5C20,0x5576,
-	/* Array index: 0x1572 */ 0x5C22,0x5577,
-	/* Array index: 0x1572 */ 0x5C24,0x4C60,
-	/* Array index: 0x1572 */ 0x5C28,0x5578,
-	/* Array index: 0x1572 */ 0x5C2D,0x3646,
-	/* Array index: 0x1572 */ 0x5C31,0x3D22,
-	/* Array index: 0x1572 */ 0x5C45,0x356F,
-	/* Array index: 0x1572 */ 0x5C46,0x557C,
-	/* Array index: 0x1572 */ 0x5C48,0x367E,
-	/* Array index: 0x1572 */ 0x5C5E,0x4230,
-	/* Array index: 0x1572 */ 0x5C60,0x454B,
-	/* Array index: 0x1572 */ 0x5C61,0x3C48,
-	/* Array index: 0x1572 */ 0x5C64,0x4158,
-	/* Array index: 0x1572 */ 0x5C65,0x4D7A,
-	/* Array index: 0x1572 */ 0x5C6C,0x5624,
-	/* Array index: 0x1572 */ 0x5C6E,0x5625,
-	/* Array index: 0x1572 */ 0x5C6F,0x4656,
-	/* Array index: 0x1572 */ 0x5C71,0x3B33,
-	/* Array index: 0x1572 */ 0x5C76,0x5627,
-	/* Array index: 0x1572 */ 0x5C79,0x5628,
-	/* Array index: 0x1572 */ 0x5C8C,0x5629,
-	/* Array index: 0x1572 */ 0x5C90,0x3474,
-	/* Array index: 0x1572 */ 0x5C91,0x562A,
-	/* Array index: 0x1572 */ 0x5C94,0x562B,
-	/* Array index: 0x1572 */ 0x5CA1,0x322C,
-	/* Array index: 0x1572 */ 0x5CB1,0x4252,
-	/* Array index: 0x1572 */ 0x5CB3,0x3359,
-	/* Array index: 0x1572 */ 0x5CC5,0x5632,
-	/* Array index: 0x1572 */ 0x5CC7,0x5634,
-	/* Array index: 0x1572 */ 0x5CD9,0x5635,
-	/* Array index: 0x1572 */ 0x5CE0,0x463D,
-	/* Array index: 0x1572 */ 0x5CE1,0x362E,
-	/* Array index: 0x1572 */ 0x5CED,0x5639,
-	/* Array index: 0x1572 */ 0x5CEF,0x4A77,
-	/* Array index: 0x1572 */ 0x5CF0,0x4A76,
-	/* Array index: 0x1572 */ 0x5CF6,0x4567,
-	/* Array index: 0x1572 */ 0x5CFA,0x5638,
-	/* Array index: 0x1572 */ 0x5CFB,0x3D54,
-	/* Array index: 0x1572 */ 0x5CFD,0x5637,
-	/* Array index: 0x1572 */ 0x5D07,0x3F72,
-	/* Array index: 0x1572 */ 0x5D0B,0x563C,
-	/* Array index: 0x1572 */ 0x5D0E,0x3A6A,
-	/* Array index: 0x1572 */ 0x5D11,0x5642,
-	/* Array index: 0x1572 */ 0x5D1F,0x5640,
-	/* Array index: 0x1572 */ 0x5D22,0x5644,
-	/* Array index: 0x1572 */ 0x5D29,0x4A78,
-	/* Array index: 0x1572 */ 0x5D4B,0x564B,
-	/* Array index: 0x1572 */ 0x5D4C,0x5648,
-	/* Array index: 0x1572 */ 0x5D4E,0x564A,
-	/* Array index: 0x1572 */ 0x5D50,0x4D72,
-	/* Array index: 0x1572 */ 0x5D52,0x5649,
-	/* Array index: 0x1572 */ 0x5D5C,0x563F,
-	/* Array index: 0x1572 */ 0x5D69,0x3F73,
-	/* Array index: 0x1572 */ 0x5D6C,0x564C,
-	/* Array index: 0x1572 */ 0x5D6F,0x3A37,
-	/* Array index: 0x1572 */ 0x5D73,0x564D,
-	/* Array index: 0x1572 */ 0x5D76,0x564E,
-	/* Array index: 0x1572 */ 0x5D82,0x5651,
-	/* Array index: 0x1572 */ 0x5D84,0x5650,
-	/* Array index: 0x1572 */ 0x5D87,0x564F,
-	/* Array index: 0x1572 */ 0x5D8B,0x4568,
-	/* Array index: 0x1572 */ 0x5D8C,0x563A,
-	/* Array index: 0x1572 */ 0x5D90,0x5657,
-	/* Array index: 0x1572 */ 0x5D9D,0x5653,
-	/* Array index: 0x1572 */ 0x5DA2,0x5652,
-	/* Array index: 0x1572 */ 0x5DAC,0x5654,
-	/* Array index: 0x1572 */ 0x5DAE,0x5655,
-	/* Array index: 0x1572 */ 0x5DB7,0x5658,
-	/* Array index: 0x1572 */ 0x5DBA,0x4E66,
-	/* Array index: 0x1572 */ 0x5DBC,0x5659,
-	/* Array index: 0x1572 */ 0x5DBD,0x5656,
-	/* Array index: 0x1572 */ 0x5DC9,0x565A,
-	/* Array index: 0x1572 */ 0x5DCC,0x3460,
-	/* Array index: 0x1572 */ 0x5DCD,0x565B,
-	/* Array index: 0x1572 */ 0x5DD2,0x565D,
-	/* Array index: 0x1572 */ 0x5DD3,0x565C,
-	/* Array index: 0x1572 */ 0x5DD6,0x565E,
-	/* Array index: 0x1572 */ 0x5DDB,0x565F,
-	/* Array index: 0x1572 */ 0x5DDD,0x406E,
-	/* Array index: 0x1572 */ 0x5DDE,0x3D23,
-	/* Array index: 0x1572 */ 0x5DE1,0x3D64,
-	/* Array index: 0x1572 */ 0x5DEB,0x5660,
-	/* Array index: 0x1572 */ 0x5DEE,0x3A39,
-	/* Array index: 0x1572 */ 0x5DFB,0x342C,
-	/* Array index: 0x1572 */ 0x5DFD,0x4327,
-	/* Array index: 0x1572 */ 0x5DFE,0x3652,
-	/* Array index: 0x1572 */ 0x5E02,0x3B54,
-	/* Array index: 0x1572 */ 0x5E03,0x495B,
-	/* Array index: 0x1572 */ 0x5E06,0x4841,
-	/* Array index: 0x1572 */ 0x5E0B,0x5663,
-	/* Array index: 0x1572 */ 0x5E0C,0x3475,
-	/* Array index: 0x1572 */ 0x5E11,0x5666,
-	/* Array index: 0x1572 */ 0x5E16,0x4421,
-	/* Array index: 0x1572 */ 0x5E25,0x3F63,
-	/* Array index: 0x1572 */ 0x5E2B,0x3B55,
-	/* Array index: 0x1572 */ 0x5E2D,0x404A,
-	/* Array index: 0x1572 */ 0x5E2F,0x4253,
-	/* Array index: 0x1572 */ 0x5E30,0x3522,
-	/* Array index: 0x1572 */ 0x5E33,0x4422,
-	/* Array index: 0x1572 */ 0x5E3D,0x4B39,
-	/* Array index: 0x1572 */ 0x5E40,0x566C,
-	/* Array index: 0x1572 */ 0x5E4C,0x4B5A,
-	/* Array index: 0x1572 */ 0x5E4E,0x566D,
-	/* Array index: 0x1572 */ 0x5E54,0x566F,
-	/* Array index: 0x1572 */ 0x5E55,0x4B6B,
-	/* Array index: 0x1572 */ 0x5E57,0x566E,
-	/* Array index: 0x1572 */ 0x5E87,0x485F,
-	/* Array index: 0x1572 */ 0x5E8A,0x3E32,
-	/* Array index: 0x1572 */ 0x5E8F,0x3D78,
-	/* Array index: 0x1572 */ 0x5E9A,0x392E,
-	/* Array index: 0x1572 */ 0x5E9C,0x495C,
-	/* Array index: 0x1572 */ 0x5EA0,0x5679,
-	/* Array index: 0x1572 */ 0x5EA6,0x4559,
-	/* Array index: 0x1572 */ 0x5EA7,0x3A42,
-	/* Array index: 0x1572 */ 0x5EAB,0x384B,
-	/* Array index: 0x1572 */ 0x5EAD,0x446D,
-	/* Array index: 0x1572 */ 0x5ECF,0x567E,
-	/* Array index: 0x1572 */ 0x5ED0,0x567D,
-	/* Array index: 0x1572 */ 0x5ED3,0x3347,
-	/* Array index: 0x1572 */ 0x5ED6,0x5721,
-	/* Array index: 0x1572 */ 0x5EDA,0x5724,
-	/* Array index: 0x1572 */ 0x5EDB,0x5725,
-	/* Array index: 0x1572 */ 0x5EE8,0x5728,
-	/* Array index: 0x1572 */ 0x5EE9,0x5729,
-	/* Array index: 0x1572 */ 0x5EEC,0x572A,
-	/* Array index: 0x1572 */ 0x5F1B,0x4350,
-	/* Array index: 0x1572 */ 0x5F1F,0x446F,
-	/* Array index: 0x1572 */ 0x5F2D,0x5739,
-	/* Array index: 0x1572 */ 0x5F2F,0x573F,
-	/* Array index: 0x1572 */ 0x5F31,0x3C65,
-	/* Array index: 0x1572 */ 0x5F35,0x4425,
-	/* Array index: 0x1572 */ 0x5F37,0x362F,
-	/* Array index: 0x1572 */ 0x5F38,0x573A,
-	/* Array index: 0x1572 */ 0x5F3C,0x492B,
-	/* Array index: 0x1572 */ 0x5F3E,0x4346,
-	/* Array index: 0x1572 */ 0x5F41,0x573B,
-	/* Array index: 0x1572 */ 0x5F48,0x573C,
-	/* Array index: 0x1572 */ 0x5F4A,0x3630,
-	/* Array index: 0x1572 */ 0x5F4C,0x573D,
-	/* Array index: 0x1572 */ 0x5F4E,0x573E,
-	/* Array index: 0x1572 */ 0x5F51,0x5740,
-	/* Array index: 0x1572 */ 0x5F53,0x4576,
-	/* Array index: 0x1572 */ 0x5F56,0x5741,
-	/* Array index: 0x1572 */ 0x5F57,0x5742,
-	/* Array index: 0x1572 */ 0x5F59,0x5743,
-	/* Array index: 0x1572 */ 0x5F5C,0x5734,
-	/* Array index: 0x1572 */ 0x5F5D,0x5733,
-	/* Array index: 0x1572 */ 0x5F61,0x5744,
-	/* Array index: 0x1572 */ 0x5F62,0x3741,
-	/* Array index: 0x1572 */ 0x5F66,0x4927,
-	/* Array index: 0x1572 */ 0x5F77,0x5747,
-	/* Array index: 0x1572 */ 0x5F79,0x4C72,
-	/* Array index: 0x1572 */ 0x5F7C,0x4860,
-	/* Array index: 0x1572 */ 0x5F9E,0x574F,
-	/* Array index: 0x1572 */ 0x5FA0,0x5752,
-	/* Array index: 0x1572 */ 0x5FA1,0x3866,
-	/* Array index: 0x1572 */ 0x5FB3,0x4641,
-	/* Array index: 0x1572 */ 0x5FB4,0x4427,
-	/* Array index: 0x1572 */ 0x5FB9,0x4530,
-	/* Array index: 0x1572 */ 0x5FBC,0x5755,
-	/* Array index: 0x1572 */ 0x5FBD,0x352B,
-	/* Array index: 0x1572 */ 0x5FC3,0x3F34,
-	/* Array index: 0x1572 */ 0x5FC5,0x492C,
-	/* Array index: 0x1572 */ 0x5FCC,0x3477,
-	/* Array index: 0x1572 */ 0x5FCD,0x4726,
-	/* Array index: 0x1572 */ 0x5FE0,0x4369,
-	/* Array index: 0x1572 */ 0x5FE4,0x5758,
-	/* Array index: 0x1572 */ 0x5FEB,0x3277,
-	/* Array index: 0x1572 */ 0x5FF0,0x582D,
-	/* Array index: 0x1572 */ 0x5FF1,0x575A,
-	/* Array index: 0x1572 */ 0x5FF5,0x4730,
-	/* Array index: 0x1572 */ 0x5FF8,0x5759,
-	/* Array index: 0x1572 */ 0x5FFB,0x5757,
-	/* Array index: 0x1572 */ 0x5FFD,0x397A,
-	/* Array index: 0x1572 */ 0x5FFF,0x575D,
-	/* Array index: 0x1572 */ 0x602F,0x3631,
-	/* Array index: 0x1572 */ 0x6031,0x5764,
-	/* Array index: 0x1572 */ 0x603A,0x576A,
-	/* Array index: 0x1572 */ 0x6046,0x5771,
-	/* Array index: 0x1572 */ 0x604A,0x5770,
-	/* Array index: 0x1572 */ 0x604B,0x4E78,
-	/* Array index: 0x1572 */ 0x604D,0x5772,
-	/* Array index: 0x1572 */ 0x6050,0x3632,
-	/* Array index: 0x1572 */ 0x6052,0x3931,
-	/* Array index: 0x1572 */ 0x6055,0x3D7A,
-	/* Array index: 0x1572 */ 0x6059,0x5779,
-	/* Array index: 0x1572 */ 0x605A,0x576B,
-	/* Array index: 0x1572 */ 0x6075,0x3743,
-	/* Array index: 0x1572 */ 0x6077,0x576E,
-	/* Array index: 0x1572 */ 0x6081,0x577A,
-	/* Array index: 0x1572 */ 0x6083,0x577D,
-	/* Array index: 0x1572 */ 0x6084,0x5821,
-	/* Array index: 0x1572 */ 0x6092,0x5825,
-	/* Array index: 0x1572 */ 0x6094,0x3279,
-	/* Array index: 0x1572 */ 0x6096,0x5823,
-	/* Array index: 0x1572 */ 0x6097,0x5824,
-	/* Array index: 0x1572 */ 0x609A,0x577E,
-	/* Array index: 0x1572 */ 0x609B,0x5822,
-	/* Array index: 0x1572 */ 0x609F,0x3867,
-	/* Array index: 0x1572 */ 0x60A0,0x4D2A,
-	/* Array index: 0x1572 */ 0x60A3,0x3435,
-	/* Array index: 0x1572 */ 0x60BC,0x4569,
-	/* Array index: 0x1572 */ 0x60BD,0x582E,
-	/* Array index: 0x1572 */ 0x60D1,0x4F47,
-	/* Array index: 0x1572 */ 0x60D3,0x582B,
-	/* Array index: 0x1572 */ 0x60D8,0x5831,
-	/* Array index: 0x1572 */ 0x60DA,0x397B,
-	/* Array index: 0x1572 */ 0x60DC,0x404B,
-	/* Array index: 0x1572 */ 0x60E7,0x577C,
-	/* Array index: 0x1572 */ 0x60E8,0x3B34,
-	/* Array index: 0x1572 */ 0x6100,0x5837,
-	/* Array index: 0x1572 */ 0x6101,0x3D25,
-	/* Array index: 0x1572 */ 0x6103,0x583A,
-	/* Array index: 0x1572 */ 0x6106,0x5834,
-	/* Array index: 0x1572 */ 0x6108,0x4C7C,
-	/* Array index: 0x1572 */ 0x6109,0x4C7B,
-	/* Array index: 0x1572 */ 0x6115,0x5833,
-	/* Array index: 0x1572 */ 0x611A,0x3672,
-	/* Array index: 0x1572 */ 0x611B,0x3026,
-	/* Array index: 0x1572 */ 0x611F,0x3436,
-	/* Array index: 0x1572 */ 0x6121,0x583B,
-	/* Array index: 0x1572 */ 0x6127,0x5843,
-	/* Array index: 0x1572 */ 0x6128,0x5842,
-	/* Array index: 0x1572 */ 0x612C,0x5847,
-	/* Array index: 0x1572 */ 0x6134,0x5848,
-	/* Array index: 0x1572 */ 0x6142,0x584A,
-	/* Array index: 0x1572 */ 0x6144,0x584B,
-	/* Array index: 0x1572 */ 0x6153,0x5858,
-	/* Array index: 0x1572 */ 0x6155,0x4A69,
-	/* Array index: 0x1572 */ 0x615D,0x5857,
-	/* Array index: 0x1572 */ 0x615F,0x5856,
-	/* Array index: 0x1572 */ 0x6162,0x4B7D,
-	/* Array index: 0x1572 */ 0x6163,0x3437,
-	/* Array index: 0x1572 */ 0x6165,0x5854,
-	/* Array index: 0x1572 */ 0x6167,0x3745,
-	/* Array index: 0x1572 */ 0x6168,0x3334,
-	/* Array index: 0x1572 */ 0x616B,0x5851,
-	/* Array index: 0x1572 */ 0x617E,0x4D5D,
-	/* Array index: 0x1572 */ 0x6182,0x4D2B,
-	/* Array index: 0x1572 */ 0x6187,0x585C,
-	/* Array index: 0x1572 */ 0x618A,0x5860,
-	/* Array index: 0x1572 */ 0x618E,0x417E,
-	/* Array index: 0x1572 */ 0x6190,0x4E79,
-	/* Array index: 0x1572 */ 0x6191,0x5861,
-	/* Array index: 0x1572 */ 0x6194,0x585E,
-	/* Array index: 0x1572 */ 0x6196,0x585B,
-	/* Array index: 0x1572 */ 0x6199,0x585A,
-	/* Array index: 0x1572 */ 0x619A,0x585F,
-	/* Array index: 0x1572 */ 0x61A4,0x4A30,
-	/* Array index: 0x1572 */ 0x61A7,0x4634,
-	/* Array index: 0x1572 */ 0x61A9,0x3746,
-	/* Array index: 0x1572 */ 0x61AB,0x5862,
-	/* Array index: 0x1572 */ 0x61AC,0x585D,
-	/* Array index: 0x1572 */ 0x61AE,0x5863,
-	/* Array index: 0x1572 */ 0x61B2,0x377B,
-	/* Array index: 0x1572 */ 0x61B6,0x3231,
-	/* Array index: 0x1572 */ 0x61BA,0x586B,
-	/* Array index: 0x1572 */ 0x61BE,0x3438,
-	/* Array index: 0x1572 */ 0x61C3,0x5869,
-	/* Array index: 0x1572 */ 0x61D0,0x327B,
-	/* Array index: 0x1572 */ 0x61E3,0x5870,
-	/* Array index: 0x1572 */ 0x61E6,0x586F,
-	/* Array index: 0x1572 */ 0x61F2,0x4428,
-	/* Array index: 0x1572 */ 0x6226,0x406F,
-	/* Array index: 0x1572 */ 0x622A,0x5923,
-	/* Array index: 0x1572 */ 0x6238,0x384D,
-	/* Array index: 0x1572 */ 0x623B,0x4C61,
-	/* Array index: 0x1572 */ 0x6253,0x4247,
-	/* Array index: 0x1572 */ 0x6255,0x4A27,
-	/* Array index: 0x1572 */ 0x6258,0x4271,
-	/* Array index: 0x1572 */ 0x625B,0x592C,
-	/* Array index: 0x1572 */ 0x625E,0x592A,
-	/* Array index: 0x1572 */ 0x6260,0x592D,
-	/* Array index: 0x1572 */ 0x6263,0x592B,
-	/* Array index: 0x1572 */ 0x6268,0x592E,
-	/* Array index: 0x1572 */ 0x626E,0x4A31,
-	/* Array index: 0x1572 */ 0x6271,0x3037,
-	/* Array index: 0x1572 */ 0x6276,0x495E,
-	/* Array index: 0x1572 */ 0x6279,0x4863,
-	/* Array index: 0x1572 */ 0x6289,0x5931,
-	/* Array index: 0x1572 */ 0x628A,0x4744,
-	/* Array index: 0x1572 */ 0x62AB,0x4864,
-	/* Array index: 0x1572 */ 0x62AC,0x5A2D,
-	/* Array index: 0x1572 */ 0x62B1,0x4A7A,
-	/* Array index: 0x1572 */ 0x62B5,0x4471,
-	/* Array index: 0x1572 */ 0x62C2,0x5944,
-	/* Array index: 0x1572 */ 0x630C,0x5948,
-	/* Array index: 0x1572 */ 0x6311,0x4429,
-	/* Array index: 0x1572 */ 0x6319,0x3573,
-	/* Array index: 0x1572 */ 0x631F,0x3634,
-	/* Array index: 0x1572 */ 0x6327,0x594B,
-	/* Array index: 0x1572 */ 0x6328,0x3027,
-	/* Array index: 0x1572 */ 0x632B,0x3A43,
-	/* Array index: 0x1572 */ 0x632F,0x3F36,
-	/* Array index: 0x1572 */ 0x633A,0x4472,
-	/* Array index: 0x1572 */ 0x6349,0x422A,
-	/* Array index: 0x1572 */ 0x6355,0x4A61,
-	/* Array index: 0x1572 */ 0x6357,0x443D,
-	/* Array index: 0x1572 */ 0x635C,0x415C,
-	/* Array index: 0x1572 */ 0x636E,0x3F78,
-	/* Array index: 0x1572 */ 0x6372,0x377E,
-	/* Array index: 0x1572 */ 0x6376,0x5959,
-	/* Array index: 0x1572 */ 0x6377,0x3E39,
-	/* Array index: 0x1572 */ 0x637A,0x4668,
-	/* Array index: 0x1572 */ 0x637B,0x4731,
-	/* Array index: 0x1572 */ 0x6380,0x5957,
-	/* Array index: 0x1572 */ 0x6383,0x415D,
-	/* Array index: 0x1572 */ 0x6388,0x3C78,
-	/* Array index: 0x1572 */ 0x6389,0x595C,
-	/* Array index: 0x1572 */ 0x638C,0x3E38,
-	/* Array index: 0x1572 */ 0x638E,0x5956,
-	/* Array index: 0x1572 */ 0x638F,0x595B,
-	/* Array index: 0x1572 */ 0x6392,0x4753,
-	/* Array index: 0x1572 */ 0x6396,0x5955,
-	/* Array index: 0x1572 */ 0x6398,0x3721,
-	/* Array index: 0x1572 */ 0x639B,0x335D,
-	/* Array index: 0x1572 */ 0x63B2,0x3747,
-	/* Array index: 0x1572 */ 0x63B4,0x444F,
-	/* Array index: 0x1572 */ 0x63B5,0x595E,
-	/* Array index: 0x1572 */ 0x63BB,0x415F,
-	/* Array index: 0x1572 */ 0x63BE,0x5961,
-	/* Array index: 0x1572 */ 0x63C0,0x5963,
-	/* Array index: 0x1572 */ 0x63C3,0x4237,
-	/* Array index: 0x1572 */ 0x63C4,0x5969,
-	/* Array index: 0x1572 */ 0x63C6,0x5964,
-	/* Array index: 0x1572 */ 0x63C9,0x5966,
-	/* Array index: 0x1572 */ 0x63CF,0x4941,
-	/* Array index: 0x1572 */ 0x63D0,0x4473,
-	/* Array index: 0x1572 */ 0x63D2,0x5967,
-	/* Array index: 0x1572 */ 0x63D6,0x4D2C,
-	/* Array index: 0x1572 */ 0x63DA,0x4D48,
-	/* Array index: 0x1572 */ 0x63DB,0x3439,
-	/* Array index: 0x1572 */ 0x63E1,0x302E,
-	/* Array index: 0x1572 */ 0x63E3,0x5965,
-	/* Array index: 0x1572 */ 0x63E9,0x5962,
-	/* Array index: 0x1572 */ 0x63EE,0x3478,
-	/* Array index: 0x1572 */ 0x63F4,0x3167,
-	/* Array index: 0x1572 */ 0x63F6,0x5968,
-	/* Array index: 0x1572 */ 0x63FA,0x4D49,
-	/* Array index: 0x1572 */ 0x6406,0x596C,
-	/* Array index: 0x1572 */ 0x640D,0x423B,
-	/* Array index: 0x1572 */ 0x640F,0x5973,
-	/* Array index: 0x1572 */ 0x6413,0x596D,
-	/* Array index: 0x1572 */ 0x6416,0x596A,
-	/* Array index: 0x1572 */ 0x6417,0x5971,
-	/* Array index: 0x1572 */ 0x641C,0x5953,
-	/* Array index: 0x1572 */ 0x6426,0x596E,
-	/* Array index: 0x1572 */ 0x6428,0x5972,
-	/* Array index: 0x1572 */ 0x642C,0x4842,
-	/* Array index: 0x1572 */ 0x642D,0x456B,
-	/* Array index: 0x1572 */ 0x6434,0x596B,
-	/* Array index: 0x1572 */ 0x6436,0x596F,
-	/* Array index: 0x1572 */ 0x643A,0x3748,
-	/* Array index: 0x1572 */ 0x643E,0x3A71,
-	/* Array index: 0x1572 */ 0x6442,0x405D,
-	/* Array index: 0x1572 */ 0x644E,0x5977,
-	/* Array index: 0x1572 */ 0x6458,0x4526,
-	/* Array index: 0x1572 */ 0x6467,0x5974,
-	/* Array index: 0x1572 */ 0x6469,0x4B60,
-	/* Array index: 0x1572 */ 0x646F,0x5975,
-	/* Array index: 0x1572 */ 0x6476,0x5976,
-	/* Array index: 0x1572 */ 0x6478,0x4C4E,
-	/* Array index: 0x1572 */ 0x647A,0x4022,
-	/* Array index: 0x1572 */ 0x6483,0x3762,
-	/* Array index: 0x1572 */ 0x6488,0x597D,
-	/* Array index: 0x1572 */ 0x6492,0x3B35,
-	/* Array index: 0x1572 */ 0x6493,0x597A,
-	/* Array index: 0x1572 */ 0x6495,0x5979,
-	/* Array index: 0x1572 */ 0x649A,0x4732,
-	/* Array index: 0x1572 */ 0x649E,0x4635,
-	/* Array index: 0x1572 */ 0x64A4,0x4531,
-	/* Array index: 0x1572 */ 0x64A5,0x597B,
-	/* Array index: 0x1572 */ 0x64A9,0x597C,
-	/* Array index: 0x1572 */ 0x64AB,0x496F,
-	/* Array index: 0x1572 */ 0x64AD,0x4745,
-	/* Array index: 0x1572 */ 0x64AE,0x3B23,
-	/* Array index: 0x1572 */ 0x64B0,0x4071,
-	/* Array index: 0x1572 */ 0x64B2,0x4B50,
-	/* Array index: 0x1572 */ 0x64B9,0x3349,
-	/* Array index: 0x1572 */ 0x64BB,0x5A25,
-	/* Array index: 0x1572 */ 0x64BC,0x597E,
-	/* Array index: 0x1572 */ 0x64C1,0x4D4A,
-	/* Array index: 0x1572 */ 0x64C2,0x5A27,
-	/* Array index: 0x1572 */ 0x64C5,0x5A23,
-	/* Array index: 0x1572 */ 0x64C7,0x5A24,
-	/* Array index: 0x1572 */ 0x64CD,0x4160,
-	/* Array index: 0x1572 */ 0x64D2,0x5A22,
-	/* Array index: 0x1572 */ 0x64D4,0x593F,
-	/* Array index: 0x1572 */ 0x64D8,0x5A26,
-	/* Array index: 0x1572 */ 0x64DA,0x5A21,
-	/* Array index: 0x1572 */ 0x64EC,0x353C,
-	/* Array index: 0x1572 */ 0x64EF,0x5A2F,
-	/* Array index: 0x1572 */ 0x64F1,0x5A28,
-	/* Array index: 0x1572 */ 0x64F2,0x5A33,
-	/* Array index: 0x1572 */ 0x64F4,0x5A32,
-	/* Array index: 0x1572 */ 0x64F6,0x5A31,
-	/* Array index: 0x1572 */ 0x64FA,0x5A34,
-	/* Array index: 0x1572 */ 0x64FD,0x5A36,
-	/* Array index: 0x1572 */ 0x64FE,0x3E71,
-	/* Array index: 0x1572 */ 0x6500,0x5A35,
-	/* Array index: 0x1572 */ 0x6505,0x5A39,
-	/* Array index: 0x1572 */ 0x6518,0x5A37,
-	/* Array index: 0x1572 */ 0x651C,0x5A38,
-	/* Array index: 0x1572 */ 0x651D,0x5970,
-	/* Array index: 0x1572 */ 0x6523,0x5A3B,
-	/* Array index: 0x1572 */ 0x6524,0x5A3A,
-	/* Array index: 0x1572 */ 0x652F,0x3B59,
-	/* Array index: 0x1572 */ 0x6545,0x384E,
-	/* Array index: 0x1572 */ 0x6548,0x5A43,
-	/* Array index: 0x1572 */ 0x654D,0x5A46,
-	/* Array index: 0x1572 */ 0x654F,0x4952,
-	/* Array index: 0x1572 */ 0x6551,0x355F,
-	/* Array index: 0x1572 */ 0x655D,0x5A49,
-	/* Array index: 0x1572 */ 0x655E,0x5A48,
-	/* Array index: 0x1572 */ 0x6562,0x343A,
-	/* Array index: 0x1572 */ 0x6563,0x3B36,
-	/* Array index: 0x1572 */ 0x6566,0x4658,
-	/* Array index: 0x1572 */ 0x656C,0x3749,
-	/* Array index: 0x1572 */ 0x6570,0x3F74,
-	/* Array index: 0x1572 */ 0x6572,0x5A4A,
-	/* Array index: 0x1572 */ 0x6582,0x5A4C,
-	/* Array index: 0x1572 */ 0x6583,0x5A4D,
-	/* Array index: 0x1572 */ 0x658C,0x494C,
-	/* Array index: 0x1572 */ 0x658E,0x3A58,
-	/* Array index: 0x1572 */ 0x6590,0x4865,
-	/* Array index: 0x1572 */ 0x6591,0x4843,
-	/* Array index: 0x1572 */ 0x6597,0x454D,
-	/* Array index: 0x1572 */ 0x6599,0x4E41,
-	/* Array index: 0x1572 */ 0x659B,0x5A4F,
-	/* Array index: 0x1572 */ 0x659C,0x3C50,
-	/* Array index: 0x1572 */ 0x659F,0x5A50,
-	/* Array index: 0x1572 */ 0x65A1,0x3036,
-	/* Array index: 0x1572 */ 0x65A4,0x3654,
-	/* Array index: 0x1572 */ 0x65A5,0x404D,
-	/* Array index: 0x1572 */ 0x65A7,0x4960,
-	/* Array index: 0x1572 */ 0x65B7,0x5A52,
-	/* Array index: 0x1572 */ 0x65B9,0x4A7D,
-	/* Array index: 0x1572 */ 0x65BC,0x3177,
-	/* Array index: 0x1572 */ 0x65BD,0x3B5C,
-	/* Array index: 0x1572 */ 0x65CB,0x407B,
-	/* Array index: 0x1572 */ 0x65CC,0x5A57,
-	/* Array index: 0x1572 */ 0x65CF,0x4232,
-	/* Array index: 0x1572 */ 0x65D2,0x5A58,
-	/* Array index: 0x1572 */ 0x65D7,0x347A,
-	/* Array index: 0x1572 */ 0x65D9,0x5A5A,
-	/* Array index: 0x1572 */ 0x65DB,0x5A59,
-	/* Array index: 0x1572 */ 0x65F1,0x5A5D,
-	/* Array index: 0x1572 */ 0x65FA,0x3222,
-	/* Array index: 0x1572 */ 0x65FB,0x5A61,
-	/* Array index: 0x1572 */ 0x6602,0x3937,
-	/* Array index: 0x1572 */ 0x6603,0x5A60,
-	/* Array index: 0x1572 */ 0x6606,0x3A2B,
-	/* Array index: 0x1572 */ 0x6607,0x3E3A,
-	/* Array index: 0x1572 */ 0x660A,0x5A5F,
-	/* Array index: 0x1572 */ 0x660C,0x3E3B,
-	/* Array index: 0x1572 */ 0x660E,0x4C40,
-	/* Array index: 0x1572 */ 0x660F,0x3A2A,
-	/* Array index: 0x1572 */ 0x6613,0x3057,
-	/* Array index: 0x1572 */ 0x6614,0x404E,
-	/* Array index: 0x1572 */ 0x661C,0x5A66,
-	/* Array index: 0x1572 */ 0x661F,0x4031,
-	/* Array index: 0x1572 */ 0x6620,0x3147,
-	/* Array index: 0x1572 */ 0x6625,0x3D55,
-	/* Array index: 0x1572 */ 0x6627,0x4B66,
-	/* Array index: 0x1572 */ 0x6628,0x3A72,
-	/* Array index: 0x1572 */ 0x662D,0x3E3C,
-	/* Array index: 0x1572 */ 0x662F,0x4027,
-	/* Array index: 0x1572 */ 0x663C,0x436B,
-	/* Array index: 0x1572 */ 0x6649,0x5A69,
-	/* Array index: 0x1572 */ 0x664B,0x3F38,
-	/* Array index: 0x1572 */ 0x664F,0x5A67,
-	/* Array index: 0x1572 */ 0x6652,0x3B2F,
-	/* Array index: 0x1572 */ 0x6662,0x5A71,
-	/* Array index: 0x1572 */ 0x6674,0x4032,
-	/* Array index: 0x1572 */ 0x6676,0x3E3D,
-	/* Array index: 0x1572 */ 0x667A,0x4352,
-	/* Array index: 0x1572 */ 0x6681,0x3647,
-	/* Array index: 0x1572 */ 0x668E,0x5A75,
-	/* Array index: 0x1572 */ 0x6691,0x3D6B,
-	/* Array index: 0x1572 */ 0x669D,0x5A79,
-	/* Array index: 0x1572 */ 0x66A2,0x442A,
-	/* Array index: 0x1572 */ 0x66A6,0x4E71,
-	/* Array index: 0x1572 */ 0x66AB,0x3B43,
-	/* Array index: 0x1572 */ 0x66AE,0x4A6B,
-	/* Array index: 0x1572 */ 0x66B4,0x4B3D,
-	/* Array index: 0x1572 */ 0x66B8,0x5B22,
-	/* Array index: 0x1572 */ 0x66B9,0x5A7B,
-	/* Array index: 0x1572 */ 0x66BC,0x5A7E,
-	/* Array index: 0x1572 */ 0x66BE,0x5A7D,
-	/* Array index: 0x1572 */ 0x66C1,0x5A7A,
-	/* Array index: 0x1572 */ 0x66C4,0x5B21,
-	/* Array index: 0x1572 */ 0x66C7,0x465E,
-	/* Array index: 0x1572 */ 0x66C9,0x5A7C,
-	/* Array index: 0x1572 */ 0x66D6,0x5B23,
-	/* Array index: 0x1572 */ 0x66E0,0x5B25,
-	/* Array index: 0x1572 */ 0x66E6,0x5B27,
-	/* Array index: 0x1572 */ 0x66E9,0x5B28,
-	/* Array index: 0x1572 */ 0x6703,0x5072,
-	/* Array index: 0x1572 */ 0x6708,0x376E,
-	/* Array index: 0x1572 */ 0x6709,0x4D2D,
-	/* Array index: 0x1572 */ 0x670B,0x4A7E,
-	/* Array index: 0x1572 */ 0x670D,0x497E,
-	/* Array index: 0x1572 */ 0x670F,0x5B2C,
-	/* Array index: 0x1572 */ 0x6731,0x3C6B,
-	/* Array index: 0x1572 */ 0x673D,0x3560,
-	/* Array index: 0x1572 */ 0x673F,0x5B33,
-	/* Array index: 0x1572 */ 0x6741,0x5B35,
-	/* Array index: 0x1572 */ 0x6746,0x5B38,
-	/* Array index: 0x1572 */ 0x6749,0x3F79,
-	/* Array index: 0x1572 */ 0x6756,0x3E73,
-	/* Array index: 0x1572 */ 0x6759,0x5B3B,
-	/* Array index: 0x1572 */ 0x676A,0x5B42,
-	/* Array index: 0x1572 */ 0x677C,0x5B41,
-	/* Array index: 0x1572 */ 0x677E,0x3E3E,
-	/* Array index: 0x1572 */ 0x677F,0x4844,
-	/* Array index: 0x1572 */ 0x6785,0x5B47,
-	/* Array index: 0x1572 */ 0x6787,0x487A,
-	/* Array index: 0x1572 */ 0x6789,0x5B3E,
-	/* Array index: 0x1572 */ 0x678B,0x5B44,
-	/* Array index: 0x1572 */ 0x678C,0x5B43,
-	/* Array index: 0x1572 */ 0x6790,0x404F,
-	/* Array index: 0x1572 */ 0x6795,0x4B6D,
-	/* Array index: 0x1572 */ 0x6797,0x4E53,
-	/* Array index: 0x1572 */ 0x679A,0x4B67,
-	/* Array index: 0x1572 */ 0x67A6,0x5B45,
-	/* Array index: 0x1572 */ 0x67A9,0x5B40,
-	/* Array index: 0x1572 */ 0x67AF,0x384F,
-	/* Array index: 0x1572 */ 0x67C1,0x4248,
-	/* Array index: 0x1572 */ 0x67C4,0x4A41,
-	/* Array index: 0x1572 */ 0x67C6,0x5B56,
-	/* Array index: 0x1572 */ 0x67CA,0x4922,
-	/* Array index: 0x1572 */ 0x67D8,0x4453,
-	/* Array index: 0x1572 */ 0x67DA,0x4D2E,
-	/* Array index: 0x1572 */ 0x67DD,0x5B51,
-	/* Array index: 0x1572 */ 0x67DE,0x5B50,
-	/* Array index: 0x1572 */ 0x67E2,0x5B52,
-	/* Array index: 0x1572 */ 0x67E4,0x5B4F,
-	/* Array index: 0x1572 */ 0x67E7,0x5B57,
-	/* Array index: 0x1572 */ 0x67E9,0x5B4D,
-	/* Array index: 0x1572 */ 0x67EC,0x5B4B,
-	/* Array index: 0x1572 */ 0x67EE,0x5B53,
-	/* Array index: 0x1572 */ 0x67EF,0x5B49,
-	/* Array index: 0x1572 */ 0x67FB,0x3A3A,
-	/* Array index: 0x1572 */ 0x6813,0x4072,
-	/* Array index: 0x1572 */ 0x6816,0x4034,
-	/* Array index: 0x1572 */ 0x6817,0x372A,
-	/* Array index: 0x1572 */ 0x681E,0x5B59,
-	/* Array index: 0x1572 */ 0x6821,0x393B,
-	/* Array index: 0x1572 */ 0x6822,0x337C,
-	/* Array index: 0x1572 */ 0x6832,0x5B5E,
-	/* Array index: 0x1572 */ 0x6834,0x4073,
-	/* Array index: 0x1572 */ 0x6838,0x334B,
-	/* Array index: 0x1572 */ 0x6839,0x3A2C,
-	/* Array index: 0x1572 */ 0x6846,0x5B5A,
-	/* Array index: 0x1572 */ 0x6848,0x3046,
-	/* Array index: 0x1572 */ 0x6859,0x5B62,
-	/* Array index: 0x1572 */ 0x685C,0x3A79,
-	/* Array index: 0x1572 */ 0x685D,0x4B71,
-	/* Array index: 0x1572 */ 0x685F,0x3B37,
-	/* Array index: 0x1572 */ 0x6863,0x5B63,
-	/* Array index: 0x1572 */ 0x6867,0x4930,
-	/* Array index: 0x1572 */ 0x6874,0x5B6F,
-	/* Array index: 0x1572 */ 0x6876,0x3233,
-	/* Array index: 0x1572 */ 0x6877,0x5B64,
-	/* Array index: 0x1572 */ 0x687E,0x5B75,
-	/* Array index: 0x1572 */ 0x687F,0x5B65,
-	/* Array index: 0x1572 */ 0x6881,0x4E42,
-	/* Array index: 0x1572 */ 0x6883,0x5B6C,
-	/* Array index: 0x1572 */ 0x6885,0x475F,
-	/* Array index: 0x1572 */ 0x688D,0x5B74,
-	/* Array index: 0x1572 */ 0x688F,0x5B67,
-	/* Array index: 0x1572 */ 0x6893,0x3034,
-	/* Array index: 0x1572 */ 0x6894,0x5B69,
-	/* Array index: 0x1572 */ 0x6897,0x393C,
-	/* Array index: 0x1572 */ 0x689B,0x5B6B,
-	/* Array index: 0x1572 */ 0x689D,0x5B6A,
-	/* Array index: 0x1572 */ 0x689F,0x5B66,
-	/* Array index: 0x1572 */ 0x68A0,0x5B71,
-	/* Array index: 0x1572 */ 0x68A2,0x3E3F,
-	/* Array index: 0x1572 */ 0x68C4,0x347E,
-	/* Array index: 0x1572 */ 0x68C6,0x5C32,
-	/* Array index: 0x1572 */ 0x68D2,0x4B40,
-	/* Array index: 0x1572 */ 0x68E7,0x5C22,
-	/* Array index: 0x1572 */ 0x68EE,0x3F39,
-	/* Array index: 0x1572 */ 0x68EF,0x5C2C,
-	/* Array index: 0x1572 */ 0x68F2,0x4033,
-	/* Array index: 0x1572 */ 0x68F9,0x5C2A,
-	/* Array index: 0x1572 */ 0x68FA,0x343D,
-	/* Array index: 0x1572 */ 0x6900,0x4F50,
-	/* Array index: 0x1572 */ 0x6901,0x5B76,
-	/* Array index: 0x1572 */ 0x6904,0x5C26,
-	/* Array index: 0x1572 */ 0x6905,0x3058,
-	/* Array index: 0x1572 */ 0x6908,0x5B78,
-	/* Array index: 0x1572 */ 0x6912,0x5C25,
-	/* Array index: 0x1572 */ 0x6930,0x5C3F,
-	/* Array index: 0x1572 */ 0x6934,0x464E,
-	/* Array index: 0x1572 */ 0x6936,0x5C24,
-	/* Array index: 0x1572 */ 0x6939,0x5C3B,
-	/* Array index: 0x1572 */ 0x693D,0x5C3D,
-	/* Array index: 0x1572 */ 0x693F,0x4458,
-	/* Array index: 0x1572 */ 0x694A,0x4D4C,
-	/* Array index: 0x1572 */ 0x698A,0x3A67,
-	/* Array index: 0x1572 */ 0x698E,0x315D,
-	/* Array index: 0x1572 */ 0x6991,0x5C54,
-	/* Array index: 0x1572 */ 0x6994,0x4F31,
-	/* Array index: 0x1572 */ 0x6995,0x5C57,
-	/* Array index: 0x1572 */ 0x699B,0x3F3A,
-	/* Array index: 0x1572 */ 0x699C,0x5C56,
-	/* Array index: 0x1572 */ 0x69A0,0x5C55,
-	/* Array index: 0x1572 */ 0x69A7,0x5C52,
-	/* Array index: 0x1572 */ 0x69AE,0x5C46,
-	/* Array index: 0x1572 */ 0x69B1,0x5C63,
-	/* Array index: 0x1572 */ 0x69B2,0x5C45,
-	/* Array index: 0x1572 */ 0x69B4,0x5C58,
-	/* Array index: 0x1572 */ 0x69BB,0x5C50,
-	/* Array index: 0x1572 */ 0x69BE,0x5C4B,
-	/* Array index: 0x1572 */ 0x69BF,0x5C48,
-	/* Array index: 0x1572 */ 0x69C1,0x5C49,
-	/* Array index: 0x1572 */ 0x69C3,0x5C51,
-	/* Array index: 0x1572 */ 0x69C7,0x7422,
-	/* Array index: 0x1572 */ 0x69D3,0x5C4A,
-	/* Array index: 0x1572 */ 0x69D8,0x4D4D,
-	/* Array index: 0x1572 */ 0x69D9,0x4B6A,
-	/* Array index: 0x1572 */ 0x69DD,0x5C4F,
-	/* Array index: 0x1572 */ 0x69DE,0x5C59,
-	/* Array index: 0x1572 */ 0x69E7,0x5C61,
-	/* Array index: 0x1572 */ 0x69E8,0x5C5A,
-	/* Array index: 0x1572 */ 0x69EB,0x5C67,
-	/* Array index: 0x1572 */ 0x69ED,0x5C65,
-	/* Array index: 0x1572 */ 0x69F2,0x5C60,
-	/* Array index: 0x1572 */ 0x69F9,0x5C5F,
-	/* Array index: 0x1572 */ 0x69FB,0x4450,
-	/* Array index: 0x1572 */ 0x69FD,0x4165,
-	/* Array index: 0x1572 */ 0x69FF,0x5C5D,
-	/* Array index: 0x1572 */ 0x6A02,0x5C5B,
-	/* Array index: 0x1572 */ 0x6A05,0x5C62,
-	/* Array index: 0x1572 */ 0x6A17,0x4374,
-	/* Array index: 0x1572 */ 0x6A19,0x4938,
-	/* Array index: 0x1572 */ 0x6A1B,0x5C5C,
-	/* Array index: 0x1572 */ 0x6A2E,0x5C53,
-	/* Array index: 0x1572 */ 0x6A3D,0x432E,
-	/* Array index: 0x1572 */ 0x6A44,0x5C6D,
-	/* Array index: 0x1572 */ 0x6A47,0x5C72,
-	/* Array index: 0x1572 */ 0x6A48,0x5C76,
-	/* Array index: 0x1572 */ 0x6A4B,0x3636,
-	/* Array index: 0x1572 */ 0x6A58,0x354C,
-	/* Array index: 0x1572 */ 0x6A59,0x5C74,
-	/* Array index: 0x1572 */ 0x6A5F,0x3521,
-	/* Array index: 0x1572 */ 0x6A61,0x464B,
-	/* Array index: 0x1572 */ 0x6A62,0x5C73,
-	/* Array index: 0x1572 */ 0x6A66,0x5C75,
-	/* Array index: 0x1572 */ 0x6A72,0x5C6F,
-	/* Array index: 0x1572 */ 0x6A78,0x5C71,
-	/* Array index: 0x1572 */ 0x6A7F,0x3360,
-	/* Array index: 0x1572 */ 0x6A80,0x4349,
-	/* Array index: 0x1572 */ 0x6A84,0x5C7C,
-	/* Array index: 0x1572 */ 0x6A8D,0x5C7A,
-	/* Array index: 0x1572 */ 0x6A8E,0x3869,
-	/* Array index: 0x1572 */ 0x6A90,0x5C79,
-	/* Array index: 0x1572 */ 0x6A97,0x5D21,
-	/* Array index: 0x1572 */ 0x6A9C,0x5B58,
-	/* Array index: 0x1572 */ 0x6AA0,0x5C7B,
-	/* Array index: 0x1572 */ 0x6AA2,0x5C7D,
-	/* Array index: 0x1572 */ 0x6AA3,0x5C7E,
-	/* Array index: 0x1572 */ 0x6AAA,0x5D2C,
-	/* Array index: 0x1572 */ 0x6AAC,0x5D28,
-	/* Array index: 0x1572 */ 0x6AAE,0x5B6D,
-	/* Array index: 0x1572 */ 0x6AB3,0x5D27,
-	/* Array index: 0x1572 */ 0x6AB8,0x5D26,
-	/* Array index: 0x1572 */ 0x6ABB,0x5D23,
-	/* Array index: 0x1572 */ 0x6AD1,0x5D2A,
-	/* Array index: 0x1572 */ 0x6AD3,0x4F26,
-	/* Array index: 0x1572 */ 0x6ADA,0x5D2D,
-	/* Array index: 0x1572 */ 0x6ADB,0x367B,
-	/* Array index: 0x1572 */ 0x6ADE,0x5D29,
-	/* Array index: 0x1572 */ 0x6ADF,0x5D2B,
-	/* Array index: 0x1572 */ 0x6AE8,0x4827,
-	/* Array index: 0x1572 */ 0x6AEA,0x5D2E,
-	/* Array index: 0x1572 */ 0x6AFA,0x5D32,
-	/* Array index: 0x1572 */ 0x6AFB,0x5D2F,
-	/* Array index: 0x1572 */ 0x6B04,0x4D73,
-	/* Array index: 0x1572 */ 0x6B05,0x5D30,
-	/* Array index: 0x1572 */ 0x6B0A,0x5C5E,
-	/* Array index: 0x1572 */ 0x6B12,0x5D33,
-	/* Array index: 0x1572 */ 0x6B16,0x5D34,
-	/* Array index: 0x1572 */ 0x6B27,0x3224,
-	/* Array index: 0x1572 */ 0x6B32,0x4D5F,
-	/* Array index: 0x1572 */ 0x6B43,0x5D3D,
-	/* Array index: 0x1572 */ 0x6B47,0x5D3C,
-	/* Array index: 0x1572 */ 0x6B49,0x5D3E,
-	/* Array index: 0x1572 */ 0x6B4C,0x324E,
-	/* Array index: 0x1572 */ 0x6B4E,0x4337,
-	/* Array index: 0x1572 */ 0x6B50,0x5D3F,
-	/* Array index: 0x1572 */ 0x6B53,0x343F,
-	/* Array index: 0x1572 */ 0x6B54,0x5D41,
-	/* Array index: 0x1572 */ 0x6B59,0x5D40,
-	/* Array index: 0x1572 */ 0x6B5B,0x5D42,
-	/* Array index: 0x1572 */ 0x6B6F,0x3B75,
-	/* Array index: 0x1572 */ 0x6B73,0x3A50,
-	/* Array index: 0x1572 */ 0x6B74,0x4E72,
-	/* Array index: 0x1572 */ 0x6B78,0x5D45,
-	/* Array index: 0x1572 */ 0x6B79,0x5D46,
-	/* Array index: 0x1572 */ 0x6B7B,0x3B60,
-	/* Array index: 0x1572 */ 0x6B7F,0x5D47,
-	/* Array index: 0x1572 */ 0x6B80,0x5D48,
-	/* Array index: 0x1572 */ 0x6B83,0x5D4A,
-	/* Array index: 0x1572 */ 0x6B84,0x5D49,
-	/* Array index: 0x1572 */ 0x6B86,0x4B58,
-	/* Array index: 0x1572 */ 0x6B95,0x5D4D,
-	/* Array index: 0x1572 */ 0x6B96,0x3F23,
-	/* Array index: 0x1572 */ 0x6B98,0x5D4C,
-	/* Array index: 0x1572 */ 0x6B9E,0x5D4E,
-	/* Array index: 0x1572 */ 0x6BA4,0x5D4F,
-	/* Array index: 0x1572 */ 0x6BAA,0x5D50,
-	/* Array index: 0x1572 */ 0x6BAB,0x5D51,
-	/* Array index: 0x1572 */ 0x6BC5,0x3523,
-	/* Array index: 0x1572 */ 0x6BC6,0x5D58,
-	/* Array index: 0x1572 */ 0x6BCB,0x5D59,
-	/* Array index: 0x1572 */ 0x6BCD,0x4A6C,
-	/* Array index: 0x1572 */ 0x6BCE,0x4B68,
-	/* Array index: 0x1572 */ 0x6BD8,0x487B,
-	/* Array index: 0x1572 */ 0x6BDB,0x4C53,
-	/* Array index: 0x1572 */ 0x6BDF,0x5D5B,
-	/* Array index: 0x1572 */ 0x6BEB,0x5D5D,
-	/* Array index: 0x1572 */ 0x6BEC,0x5D5C,
-	/* Array index: 0x1572 */ 0x6BEF,0x5D5F,
-	/* Array index: 0x1572 */ 0x6BF3,0x5D5E,
-	/* Array index: 0x1572 */ 0x6C08,0x5D61,
-	/* Array index: 0x1572 */ 0x6C0F,0x3B61,
-	/* Array index: 0x1572 */ 0x6C11,0x4C31,
-	/* Array index: 0x1572 */ 0x6C13,0x5D62,
-	/* Array index: 0x1572 */ 0x6C14,0x5D63,
-	/* Array index: 0x1572 */ 0x6C17,0x3524,
-	/* Array index: 0x1572 */ 0x6C1B,0x5D64,
-	/* Array index: 0x1572 */ 0x6C23,0x5D66,
-	/* Array index: 0x1572 */ 0x6C24,0x5D65,
-	/* Array index: 0x1572 */ 0x6C34,0x3F65,
-	/* Array index: 0x1572 */ 0x6C37,0x4939,
-	/* Array index: 0x1572 */ 0x6C38,0x314A,
-	/* Array index: 0x1572 */ 0x6C4E,0x4846,
-	/* Array index: 0x1572 */ 0x6C50,0x3C2E,
-	/* Array index: 0x1572 */ 0x6C55,0x5D68,
-	/* Array index: 0x1572 */ 0x6C57,0x3440,
-	/* Array index: 0x1572 */ 0x6C5A,0x3178,
-	/* Array index: 0x1572 */ 0x6C68,0x5D71,
-	/* Array index: 0x1572 */ 0x6C6A,0x5D6A,
-	/* Array index: 0x1572 */ 0x6C70,0x4241,
-	/* Array index: 0x1572 */ 0x6C72,0x3562,
-	/* Array index: 0x1572 */ 0x6C73,0x5D72,
-	/* Array index: 0x1572 */ 0x6C7A,0x3768,
-	/* Array index: 0x1572 */ 0x6C88,0x4440,
-	/* Array index: 0x1572 */ 0x6C8C,0x4659,
-	/* Array index: 0x1572 */ 0x6C8D,0x5D6C,
-	/* Array index: 0x1572 */ 0x6C90,0x5D74,
-	/* Array index: 0x1572 */ 0x6C92,0x5D73,
-	/* Array index: 0x1572 */ 0x6C93,0x3723,
-	/* Array index: 0x1572 */ 0x6C96,0x322D,
-	/* Array index: 0x1572 */ 0x6CA1,0x4B57,
-	/* Array index: 0x1572 */ 0x6CA2,0x4274,
-	/* Array index: 0x1572 */ 0x6CAB,0x4B77,
-	/* Array index: 0x1572 */ 0x6CAE,0x5D7C,
-	/* Array index: 0x1572 */ 0x6CB1,0x5D7D,
-	/* Array index: 0x1572 */ 0x6CB3,0x324F,
-	/* Array index: 0x1572 */ 0x6CC9,0x4074,
-	/* Array index: 0x1572 */ 0x6CCA,0x4771,
-	/* Array index: 0x1572 */ 0x6CCC,0x4867,
-	/* Array index: 0x1572 */ 0x6CD3,0x5D77,
-	/* Array index: 0x1572 */ 0x6CD5,0x4B21,
-	/* Array index: 0x1572 */ 0x6CD7,0x5D79,
-	/* Array index: 0x1572 */ 0x6CD9,0x5E24,
-	/* Array index: 0x1572 */ 0x6CDB,0x5E22,
-	/* Array index: 0x1572 */ 0x6CDD,0x5D7B,
-	/* Array index: 0x1572 */ 0x6CE8,0x436D,
-	/* Array index: 0x1572 */ 0x6CEA,0x5E25,
-	/* Array index: 0x1572 */ 0x6D0B,0x4D4E,
-	/* Array index: 0x1572 */ 0x6D0C,0x5E30,
-	/* Array index: 0x1572 */ 0x6D12,0x5E2F,
-	/* Array index: 0x1572 */ 0x6D17,0x4076,
-	/* Array index: 0x1572 */ 0x6D19,0x5E2C,
-	/* Array index: 0x1572 */ 0x6D1B,0x4D6C,
-	/* Array index: 0x1572 */ 0x6D1E,0x4636,
-	/* Array index: 0x1572 */ 0x6D1F,0x5E26,
-	/* Array index: 0x1572 */ 0x6D25,0x4445,
-	/* Array index: 0x1572 */ 0x6D3B,0x3368,
-	/* Array index: 0x1572 */ 0x6D3D,0x5E2A,
-	/* Array index: 0x1572 */ 0x6D3E,0x4749,
-	/* Array index: 0x1572 */ 0x6D41,0x4E2E,
-	/* Array index: 0x1572 */ 0x6D44,0x3E74,
-	/* Array index: 0x1572 */ 0x6D45,0x4075,
-	/* Array index: 0x1572 */ 0x6D59,0x5E36,
-	/* Array index: 0x1572 */ 0x6D5A,0x5E34,
-	/* Array index: 0x1572 */ 0x6D5C,0x494D,
-	/* Array index: 0x1572 */ 0x6D63,0x5E31,
-	/* Array index: 0x1572 */ 0x6D64,0x5E33,
-	/* Array index: 0x1572 */ 0x6D66,0x313A,
-	/* Array index: 0x1572 */ 0x6D69,0x3940,
-	/* Array index: 0x1572 */ 0x6D6A,0x4F32,
-	/* Array index: 0x1572 */ 0x6D6C,0x333D,
-	/* Array index: 0x1572 */ 0x6D6E,0x4962,
-	/* Array index: 0x1572 */ 0x6D74,0x4D61,
-	/* Array index: 0x1572 */ 0x6D85,0x5E3A,
-	/* Array index: 0x1572 */ 0x6D88,0x3E43,
-	/* Array index: 0x1572 */ 0x6D8C,0x4D30,
-	/* Array index: 0x1572 */ 0x6D8E,0x5E37,
-	/* Array index: 0x1572 */ 0x6D93,0x5E32,
-	/* Array index: 0x1572 */ 0x6D95,0x5E38,
-	/* Array index: 0x1572 */ 0x6D99,0x4E5E,
-	/* Array index: 0x1572 */ 0x6D9B,0x4573,
-	/* Array index: 0x1572 */ 0x6D9C,0x4642,
-	/* Array index: 0x1572 */ 0x6DAF,0x3336,
-	/* Array index: 0x1572 */ 0x6DB2,0x3155,
-	/* Array index: 0x1572 */ 0x6DB5,0x5E3E,
-	/* Array index: 0x1572 */ 0x6DB8,0x5E41,
-	/* Array index: 0x1572 */ 0x6DBC,0x4E43,
-	/* Array index: 0x1572 */ 0x6DC0,0x4D64,
-	/* Array index: 0x1572 */ 0x6DCB,0x4E54,
-	/* Array index: 0x1572 */ 0x6DCC,0x5E45,
-	/* Array index: 0x1572 */ 0x6DD1,0x3D4A,
-	/* Array index: 0x1572 */ 0x6DD2,0x5E47,
-	/* Array index: 0x1572 */ 0x6DD5,0x5E4C,
-	/* Array index: 0x1572 */ 0x6DD8,0x4571,
-	/* Array index: 0x1572 */ 0x6DD9,0x5E4A,
-	/* Array index: 0x1572 */ 0x6DDE,0x5E44,
-	/* Array index: 0x1572 */ 0x6DE1,0x4338,
-	/* Array index: 0x1572 */ 0x6DE4,0x5E4B,
-	/* Array index: 0x1572 */ 0x6DE6,0x5E40,
-	/* Array index: 0x1572 */ 0x6DF1,0x3F3C,
-	/* Array index: 0x1572 */ 0x6DF3,0x3D5F,
-	/* Array index: 0x1572 */ 0x6DF5,0x4A25,
-	/* Array index: 0x1572 */ 0x6E13,0x374C,
-	/* Array index: 0x1572 */ 0x6E15,0x5E3C,
-	/* Array index: 0x1572 */ 0x6E38,0x5E62,
-	/* Array index: 0x1572 */ 0x6E3A,0x5E5D,
-	/* Array index: 0x1572 */ 0x6E3E,0x5E55,
-	/* Array index: 0x1572 */ 0x6E43,0x5E5C,
-	/* Array index: 0x1572 */ 0x6E4A,0x4C2B,
-	/* Array index: 0x1572 */ 0x6E4D,0x5E5A,
-	/* Array index: 0x1572 */ 0x6E4E,0x5E5E,
-	/* Array index: 0x1572 */ 0x6E56,0x3850,
-	/* Array index: 0x1572 */ 0x6E58,0x3E45,
-	/* Array index: 0x1572 */ 0x6E5B,0x4339,
-	/* Array index: 0x1572 */ 0x6E5F,0x5E54,
-	/* Array index: 0x1572 */ 0x6E67,0x4D2F,
-	/* Array index: 0x1572 */ 0x6E6B,0x5E57,
-	/* Array index: 0x1572 */ 0x6E6E,0x5E50,
-	/* Array index: 0x1572 */ 0x6E6F,0x4572,
-	/* Array index: 0x1572 */ 0x6E72,0x5E53,
-	/* Array index: 0x1572 */ 0x6E76,0x5E59,
-	/* Array index: 0x1572 */ 0x6E8C,0x482E,
-	/* Array index: 0x1572 */ 0x6E8F,0x5E6F,
-	/* Array index: 0x1572 */ 0x6E90,0x383B,
-	/* Array index: 0x1572 */ 0x6E96,0x3D60,
-	/* Array index: 0x1572 */ 0x6E98,0x5E65,
-	/* Array index: 0x1572 */ 0x6E9C,0x4E2F,
-	/* Array index: 0x1572 */ 0x6E9D,0x3942,
-	/* Array index: 0x1572 */ 0x6E9F,0x5E72,
-	/* Array index: 0x1572 */ 0x6EA2,0x306E,
-	/* Array index: 0x1572 */ 0x6EA5,0x5E70,
-	/* Array index: 0x1572 */ 0x6EAA,0x5E64,
-	/* Array index: 0x1572 */ 0x6EAF,0x5E6A,
-	/* Array index: 0x1572 */ 0x6EB2,0x5E6C,
-	/* Array index: 0x1572 */ 0x6EB6,0x4D4F,
-	/* Array index: 0x1572 */ 0x6EB7,0x5E67,
-	/* Array index: 0x1572 */ 0x6EBA,0x452E,
-	/* Array index: 0x1572 */ 0x6EBD,0x5E69,
-	/* Array index: 0x1572 */ 0x6EC2,0x5E71,
-	/* Array index: 0x1572 */ 0x6EC4,0x5E6B,
-	/* Array index: 0x1572 */ 0x6EC5,0x4C47,
-	/* Array index: 0x1572 */ 0x6EC9,0x5E66,
-	/* Array index: 0x1572 */ 0x6ECB,0x3C22,
-	/* Array index: 0x1572 */ 0x6ECC,0x5E7E,
-	/* Array index: 0x1572 */ 0x6EDD,0x426C,
-	/* Array index: 0x1572 */ 0x6EDE,0x425A,
-	/* Array index: 0x1572 */ 0x6EEC,0x5E76,
-	/* Array index: 0x1572 */ 0x6EEF,0x5E7C,
-	/* Array index: 0x1572 */ 0x6EF2,0x5E7A,
-	/* Array index: 0x1572 */ 0x6EF4,0x4529,
-	/* Array index: 0x1572 */ 0x6EF7,0x5F23,
-	/* Array index: 0x1572 */ 0x6EF8,0x5E77,
-	/* Array index: 0x1572 */ 0x6F06,0x3C3F,
-	/* Array index: 0x1572 */ 0x6F09,0x3977,
-	/* Array index: 0x1572 */ 0x6F0F,0x4F33,
-	/* Array index: 0x1572 */ 0x6F20,0x4779,
-	/* Array index: 0x1572 */ 0x6F22,0x3441,
-	/* Array index: 0x1572 */ 0x6F23,0x4E7A,
-	/* Array index: 0x1572 */ 0x6F2B,0x4C21,
-	/* Array index: 0x1572 */ 0x6F2C,0x4452,
-	/* Array index: 0x1572 */ 0x6F31,0x5E7B,
-	/* Array index: 0x1572 */ 0x6F32,0x5E7D,
-	/* Array index: 0x1572 */ 0x6F38,0x4132,
-	/* Array index: 0x1572 */ 0x6F3E,0x5F21,
-	/* Array index: 0x1572 */ 0x6F3F,0x5E79,
-	/* Array index: 0x1572 */ 0x6F41,0x5E73,
-	/* Array index: 0x1572 */ 0x6F45,0x3443,
-	/* Array index: 0x1572 */ 0x6F54,0x3769,
-	/* Array index: 0x1572 */ 0x6F58,0x5F2F,
-	/* Array index: 0x1572 */ 0x6F5B,0x5F2A,
-	/* Array index: 0x1572 */ 0x6F5C,0x4078,
-	/* Array index: 0x1572 */ 0x6F5F,0x3363,
-	/* Array index: 0x1572 */ 0x6F64,0x3D61,
-	/* Array index: 0x1572 */ 0x6F66,0x5F33,
-	/* Array index: 0x1572 */ 0x6F74,0x5F4C,
-	/* Array index: 0x1572 */ 0x6F78,0x5F26,
-	/* Array index: 0x1572 */ 0x6F7A,0x5F25,
-	/* Array index: 0x1572 */ 0x6F7C,0x5F2E,
-	/* Array index: 0x1572 */ 0x6F8E,0x5F30,
-	/* Array index: 0x1572 */ 0x6F91,0x5F31,
-	/* Array index: 0x1572 */ 0x6F97,0x3442,
-	/* Array index: 0x1572 */ 0x6FA1,0x5F36,
-	/* Array index: 0x1572 */ 0x6FA3,0x5F35,
-	/* Array index: 0x1572 */ 0x6FA4,0x5F37,
-	/* Array index: 0x1572 */ 0x6FAA,0x5F3A,
-	/* Array index: 0x1572 */ 0x6FB1,0x4543,
-	/* Array index: 0x1572 */ 0x6FB3,0x5F34,
-	/* Array index: 0x1572 */ 0x6FB9,0x5F38,
-	/* Array index: 0x1572 */ 0x6FC6,0x5F39,
-	/* Array index: 0x1572 */ 0x6FD4,0x5F3E,
-	/* Array index: 0x1572 */ 0x6FD5,0x5F3C,
-	/* Array index: 0x1572 */ 0x6FD8,0x5F3F,
-	/* Array index: 0x1572 */ 0x6FDB,0x5F42,
-	/* Array index: 0x1572 */ 0x6FE4,0x5E39,
-	/* Array index: 0x1572 */ 0x6FF6,0x6F69,
-	/* Array index: 0x1572 */ 0x6FFA,0x5F45,
-	/* Array index: 0x1572 */ 0x6FFE,0x5F49,
-	/* Array index: 0x1572 */ 0x7001,0x5F47,
-	/* Array index: 0x1572 */ 0x7009,0x5F43,
-	/* Array index: 0x1572 */ 0x700B,0x5F44,
-	/* Array index: 0x1572 */ 0x700F,0x5F48,
-	/* Array index: 0x1572 */ 0x7011,0x5F46,
-	/* Array index: 0x1572 */ 0x7015,0x494E,
-	/* Array index: 0x1572 */ 0x7018,0x5F4E,
-	/* Array index: 0x1572 */ 0x7026,0x4375,
-	/* Array index: 0x1572 */ 0x7027,0x426D,
-	/* Array index: 0x1572 */ 0x702C,0x4025,
-	/* Array index: 0x1572 */ 0x7030,0x5F50,
-	/* Array index: 0x1572 */ 0x7032,0x5F52,
-	/* Array index: 0x1572 */ 0x703E,0x5F51,
-	/* Array index: 0x1572 */ 0x704C,0x5E75,
-	/* Array index: 0x1572 */ 0x7051,0x5F53,
-	/* Array index: 0x1572 */ 0x7058,0x4667,
-	/* Array index: 0x1572 */ 0x7063,0x5F54,
-	/* Array index: 0x1572 */ 0x706B,0x3250,
-	/* Array index: 0x1572 */ 0x706F,0x4574,
-	/* Array index: 0x1572 */ 0x7070,0x3325,
-	/* Array index: 0x1572 */ 0x7078,0x3564,
-	/* Array index: 0x1572 */ 0x707C,0x3C5E,
-	/* Array index: 0x1572 */ 0x707D,0x3A52,
-	/* Array index: 0x1572 */ 0x7089,0x4F27,
-	/* Array index: 0x1572 */ 0x708A,0x3F66,
-	/* Array index: 0x1572 */ 0x708E,0x316A,
-	/* Array index: 0x1572 */ 0x7092,0x5F56,
-	/* Array index: 0x1572 */ 0x7099,0x5F55,
-	/* Array index: 0x1572 */ 0x70B3,0x5F5B,
-	/* Array index: 0x1572 */ 0x70C8,0x4E75,
-	/* Array index: 0x1572 */ 0x70CB,0x5F5E,
-	/* Array index: 0x1572 */ 0x70CF,0x3128,
-	/* Array index: 0x1572 */ 0x70D9,0x5F60,
-	/* Array index: 0x1572 */ 0x70DD,0x5F5F,
-	/* Array index: 0x1572 */ 0x70DF,0x5F5D,
-	/* Array index: 0x1572 */ 0x70F1,0x5F58,
-	/* Array index: 0x1572 */ 0x70F9,0x4B23,
-	/* Array index: 0x1572 */ 0x70FD,0x5F62,
-	/* Array index: 0x1572 */ 0x7109,0x5F61,
-	/* Array index: 0x1572 */ 0x7114,0x316B,
-	/* Array index: 0x1572 */ 0x7119,0x5F64,
-	/* Array index: 0x1572 */ 0x711A,0x4A32,
-	/* Array index: 0x1572 */ 0x711C,0x5F63,
-	/* Array index: 0x1572 */ 0x7121,0x4C35,
-	/* Array index: 0x1572 */ 0x7126,0x3E47,
-	/* Array index: 0x1572 */ 0x7136,0x4133,
-	/* Array index: 0x1572 */ 0x713C,0x3E46,
-	/* Array index: 0x1572 */ 0x7149,0x4E7B,
-	/* Array index: 0x1572 */ 0x714C,0x5F6A,
-	/* Array index: 0x1572 */ 0x714E,0x4079,
-	/* Array index: 0x1572 */ 0x7155,0x5F66,
-	/* Array index: 0x1572 */ 0x7156,0x5F6B,
-	/* Array index: 0x1572 */ 0x7159,0x316C,
-	/* Array index: 0x1572 */ 0x716C,0x5F6C,
-	/* Array index: 0x1572 */ 0x716E,0x3C51,
-	/* Array index: 0x1572 */ 0x717D,0x407A,
-	/* Array index: 0x1572 */ 0x7184,0x5F6F,
-	/* Array index: 0x1572 */ 0x7188,0x5F67,
-	/* Array index: 0x1572 */ 0x718A,0x3727,
-	/* Array index: 0x1572 */ 0x718F,0x5F6D,
-	/* Array index: 0x1572 */ 0x7194,0x4D50,
-	/* Array index: 0x1572 */ 0x7195,0x5F70,
-	/* Array index: 0x1572 */ 0x7199,0x7426,
-	/* Array index: 0x1572 */ 0x719F,0x3D4F,
-	/* Array index: 0x1572 */ 0x71A8,0x5F71,
-	/* Array index: 0x1572 */ 0x71AC,0x5F72,
-	/* Array index: 0x1572 */ 0x71B1,0x472E,
-	/* Array index: 0x1572 */ 0x71B9,0x5F74,
-	/* Array index: 0x1572 */ 0x71BE,0x5F75,
-	/* Array index: 0x1572 */ 0x71C3,0x4733,
-	/* Array index: 0x1572 */ 0x71C8,0x4575,
-	/* Array index: 0x1572 */ 0x71C9,0x5F77,
-	/* Array index: 0x1572 */ 0x71CE,0x5F79,
-	/* Array index: 0x1572 */ 0x71D0,0x4E55,
-	/* Array index: 0x1572 */ 0x71D2,0x5F76,
-	/* Array index: 0x1572 */ 0x71D4,0x5F78,
-	/* Array index: 0x1572 */ 0x71D5,0x316D,
-	/* Array index: 0x1572 */ 0x71D7,0x5F73,
-	/* Array index: 0x1572 */ 0x71DF,0x535B,
-	/* Array index: 0x1572 */ 0x71E0,0x5F7A,
-	/* Array index: 0x1572 */ 0x71F5,0x5F7D,
-	/* Array index: 0x1572 */ 0x71F9,0x6021,
-	/* Array index: 0x1572 */ 0x71FB,0x5F6E,
-	/* Array index: 0x1572 */ 0x71FC,0x5F7E,
-	/* Array index: 0x1572 */ 0x71FF,0x6022,
-	/* Array index: 0x1572 */ 0x7206,0x477A,
-	/* Array index: 0x1572 */ 0x720D,0x6023,
-	/* Array index: 0x1572 */ 0x7210,0x6024,
-	/* Array index: 0x1572 */ 0x721B,0x6025,
-	/* Array index: 0x1572 */ 0x7228,0x6026,
-	/* Array index: 0x1572 */ 0x722A,0x445E,
-	/* Array index: 0x1572 */ 0x722C,0x6028,
-	/* Array index: 0x1572 */ 0x722D,0x6027,
-	/* Array index: 0x1572 */ 0x7230,0x6029,
-	/* Array index: 0x1572 */ 0x7232,0x602A,
-	/* Array index: 0x1572 */ 0x7235,0x3C5F,
-	/* Array index: 0x1572 */ 0x7236,0x4963,
-	/* Array index: 0x1572 */ 0x7252,0x442D,
-	/* Array index: 0x1572 */ 0x7258,0x6031,
-	/* Array index: 0x1572 */ 0x7259,0x3267,
-	/* Array index: 0x1572 */ 0x725B,0x356D,
-	/* Array index: 0x1572 */ 0x725D,0x4C46,
-	/* Array index: 0x1572 */ 0x725F,0x4C36,
-	/* Array index: 0x1572 */ 0x7261,0x3234,
-	/* Array index: 0x1572 */ 0x7262,0x4F34,
-	/* Array index: 0x1572 */ 0x7267,0x4B52,
-	/* Array index: 0x1572 */ 0x7269,0x4A2A,
-	/* Array index: 0x1572 */ 0x7272,0x4037,
-	/* Array index: 0x1572 */ 0x7274,0x6032,
-	/* Array index: 0x1572 */ 0x7279,0x4643,
-	/* Array index: 0x1572 */ 0x7287,0x6036,
-	/* Array index: 0x1572 */ 0x7292,0x6037,
-	/* Array index: 0x1572 */ 0x7296,0x6038,
-	/* Array index: 0x1572 */ 0x72A0,0x353E,
-	/* Array index: 0x1572 */ 0x72A2,0x6039,
-	/* Array index: 0x1572 */ 0x72A7,0x603A,
-	/* Array index: 0x1572 */ 0x72AC,0x3824,
-	/* Array index: 0x1572 */ 0x72AF,0x4848,
-	/* Array index: 0x1572 */ 0x72B2,0x603C,
-	/* Array index: 0x1572 */ 0x72B6,0x3E75,
-	/* Array index: 0x1572 */ 0x72B9,0x603B,
-	/* Array index: 0x1572 */ 0x72CE,0x6040,
-	/* Array index: 0x1572 */ 0x72D0,0x3851,
-	/* Array index: 0x1572 */ 0x72D2,0x6041,
-	/* Array index: 0x1572 */ 0x72D7,0x3669,
-	/* Array index: 0x1572 */ 0x72D9,0x4140,
-	/* Array index: 0x1572 */ 0x72DB,0x397D,
-	/* Array index: 0x1572 */ 0x72E9,0x3C6D,
-	/* Array index: 0x1572 */ 0x72EC,0x4648,
-	/* Array index: 0x1572 */ 0x72ED,0x3639,
-	/* Array index: 0x1572 */ 0x730A,0x6049,
-	/* Array index: 0x1572 */ 0x7316,0x604B,
-	/* Array index: 0x1572 */ 0x7317,0x6048,
-	/* Array index: 0x1572 */ 0x7325,0x6050,
-	/* Array index: 0x1572 */ 0x7334,0x604D,
-	/* Array index: 0x1572 */ 0x7336,0x4D31,
-	/* Array index: 0x1572 */ 0x7337,0x4D32,
-	/* Array index: 0x1572 */ 0x733E,0x6051,
-	/* Array index: 0x1572 */ 0x733F,0x316E,
-	/* Array index: 0x1572 */ 0x7344,0x3976,
-	/* Array index: 0x1572 */ 0x7345,0x3B62,
-	/* Array index: 0x1572 */ 0x734E,0x6052,
-	/* Array index: 0x1572 */ 0x734F,0x6053,
-	/* Array index: 0x1572 */ 0x7357,0x6055,
-	/* Array index: 0x1572 */ 0x7363,0x3D43,
-	/* Array index: 0x1572 */ 0x7368,0x6057,
-	/* Array index: 0x1572 */ 0x736A,0x6056,
-	/* Array index: 0x1572 */ 0x7370,0x6058,
-	/* Array index: 0x1572 */ 0x7372,0x334D,
-	/* Array index: 0x1572 */ 0x7375,0x605A,
-	/* Array index: 0x1572 */ 0x7378,0x6059,
-	/* Array index: 0x1572 */ 0x737A,0x605C,
-	/* Array index: 0x1572 */ 0x737B,0x605B,
-	/* Array index: 0x1572 */ 0x7384,0x383C,
-	/* Array index: 0x1572 */ 0x7387,0x4E28,
-	/* Array index: 0x1572 */ 0x7389,0x364C,
-	/* Array index: 0x1572 */ 0x738B,0x3226,
-	/* Array index: 0x1572 */ 0x7396,0x366A,
-	/* Array index: 0x1572 */ 0x73A9,0x3461,
-	/* Array index: 0x1572 */ 0x73B2,0x4E68,
-	/* Array index: 0x1572 */ 0x73B3,0x605E,
-	/* Array index: 0x1572 */ 0x73BB,0x6060,
-	/* Array index: 0x1572 */ 0x73C0,0x6061,
-	/* Array index: 0x1572 */ 0x73C2,0x3251,
-	/* Array index: 0x1572 */ 0x73C8,0x605D,
-	/* Array index: 0x1572 */ 0x73CA,0x3B39,
-	/* Array index: 0x1572 */ 0x73CD,0x4441,
-	/* Array index: 0x1572 */ 0x73CE,0x605F,
-	/* Array index: 0x1572 */ 0x73DE,0x6064,
-	/* Array index: 0x1572 */ 0x73E0,0x3C6E,
-	/* Array index: 0x1572 */ 0x73E5,0x6062,
-	/* Array index: 0x1572 */ 0x73EA,0x373E,
-	/* Array index: 0x1572 */ 0x73ED,0x4849,
-	/* Array index: 0x1572 */ 0x73EE,0x6063,
-	/* Array index: 0x1572 */ 0x73F1,0x607E,
-	/* Array index: 0x1572 */ 0x73F8,0x6069,
-	/* Array index: 0x1572 */ 0x73FE,0x383D,
-	/* Array index: 0x1572 */ 0x7403,0x3565,
-	/* Array index: 0x1572 */ 0x7405,0x6066,
-	/* Array index: 0x1572 */ 0x7406,0x4D7D,
-	/* Array index: 0x1572 */ 0x7409,0x4E30,
-	/* Array index: 0x1572 */ 0x7422,0x4276,
-	/* Array index: 0x1572 */ 0x7425,0x6068,
-	/* Array index: 0x1572 */ 0x743A,0x606B,
-	/* Array index: 0x1572 */ 0x743F,0x606D,
-	/* Array index: 0x1572 */ 0x7441,0x6070,
-	/* Array index: 0x1572 */ 0x7455,0x606C,
-	/* Array index: 0x1572 */ 0x7469,0x6072,
-	/* Array index: 0x1572 */ 0x746A,0x6075,
-	/* Array index: 0x1572 */ 0x746F,0x6067,
-	/* Array index: 0x1572 */ 0x7470,0x6073,
-	/* Array index: 0x1572 */ 0x7473,0x3A3C,
-	/* Array index: 0x1572 */ 0x7476,0x6076,
-	/* Array index: 0x1572 */ 0x747E,0x6077,
-	/* Array index: 0x1572 */ 0x7483,0x4D7E,
-	/* Array index: 0x1572 */ 0x748B,0x6078,
-	/* Array index: 0x1572 */ 0x749E,0x6079,
-	/* Array index: 0x1572 */ 0x74A2,0x6065,
-	/* Array index: 0x1572 */ 0x74A7,0x607A,
-	/* Array index: 0x1572 */ 0x74B0,0x3444,
-	/* Array index: 0x1572 */ 0x74BD,0x3C25,
-	/* Array index: 0x1572 */ 0x74CA,0x607B,
-	/* Array index: 0x1572 */ 0x74CF,0x607C,
-	/* Array index: 0x1572 */ 0x74D4,0x607D,
-	/* Array index: 0x1572 */ 0x74DC,0x313B,
-	/* Array index: 0x1572 */ 0x74E0,0x6121,
-	/* Array index: 0x1572 */ 0x74E2,0x493B,
-	/* Array index: 0x1572 */ 0x74E3,0x6122,
-	/* Array index: 0x1572 */ 0x74E6,0x3424,
-	/* Array index: 0x1572 */ 0x74E7,0x6123,
-	/* Array index: 0x1572 */ 0x74E9,0x6124,
-	/* Array index: 0x1572 */ 0x7511,0x3979,
-	/* Array index: 0x1572 */ 0x7513,0x6132,
-	/* Array index: 0x1572 */ 0x7515,0x6131,
-	/* Array index: 0x1572 */ 0x7518,0x3445,
-	/* Array index: 0x1572 */ 0x751A,0x3F53,
-	/* Array index: 0x1572 */ 0x751C,0x453C,
-	/* Array index: 0x1572 */ 0x751E,0x6133,
-	/* Array index: 0x1572 */ 0x751F,0x4038,
-	/* Array index: 0x1572 */ 0x7523,0x3B3A,
-	/* Array index: 0x1572 */ 0x7525,0x3179,
-	/* Array index: 0x1572 */ 0x7526,0x6134,
-	/* Array index: 0x1572 */ 0x7528,0x4D51,
-	/* Array index: 0x1572 */ 0x752B,0x4A63,
-	/* Array index: 0x1572 */ 0x752C,0x6135,
-	/* Array index: 0x1572 */ 0x7544,0x6137,
-	/* Array index: 0x1572 */ 0x7546,0x613C,
-	/* Array index: 0x1572 */ 0x7554,0x484A,
-	/* Array index: 0x1572 */ 0x7560,0x482B,
-	/* Array index: 0x1572 */ 0x7570,0x305B,
-	/* Array index: 0x1572 */ 0x757F,0x3526,
-	/* Array index: 0x1572 */ 0x7582,0x614A,
-	/* Array index: 0x1572 */ 0x7594,0x614B,
-	/* Array index: 0x1572 */ 0x759A,0x614C,
-	/* Array index: 0x1572 */ 0x759D,0x614D,
-	/* Array index: 0x1572 */ 0x75A3,0x614F,
-	/* Array index: 0x1572 */ 0x75A5,0x614E,
-	/* Array index: 0x1572 */ 0x75AB,0x3156,
-	/* Array index: 0x1572 */ 0x75C2,0x6150,
-	/* Array index: 0x1572 */ 0x75C3,0x6152,
-	/* Array index: 0x1572 */ 0x75C5,0x4942,
-	/* Array index: 0x1572 */ 0x75C7,0x3E49,
-	/* Array index: 0x1572 */ 0x75CA,0x6159,
-	/* Array index: 0x1572 */ 0x75CD,0x6158,
-	/* Array index: 0x1572 */ 0x75D2,0x615A,
-	/* Array index: 0x1572 */ 0x75D4,0x3C26,
-	/* Array index: 0x1572 */ 0x75D5,0x3A2F,
-	/* Array index: 0x1572 */ 0x75D8,0x4577,
-	/* Array index: 0x1572 */ 0x75D9,0x615B,
-	/* Array index: 0x1572 */ 0x75DB,0x444B,
-	/* Array index: 0x1572 */ 0x75DE,0x615D,
-	/* Array index: 0x1572 */ 0x75E2,0x4E21,
-	/* Array index: 0x1572 */ 0x75E3,0x615C,
-	/* Array index: 0x1572 */ 0x75E9,0x4169,
-	/* Array index: 0x1572 */ 0x75FA,0x6163,
-	/* Array index: 0x1572 */ 0x75FC,0x6160,
-	/* Array index: 0x1572 */ 0x75FE,0x615E,
-	/* Array index: 0x1572 */ 0x75FF,0x615F,
-	/* Array index: 0x1572 */ 0x7601,0x6161,
-	/* Array index: 0x1572 */ 0x7609,0x6168,
-	/* Array index: 0x1572 */ 0x760B,0x6166,
-	/* Array index: 0x1572 */ 0x760D,0x6167,
-	/* Array index: 0x1572 */ 0x7627,0x616A,
-	/* Array index: 0x1572 */ 0x7630,0x6170,
-	/* Array index: 0x1572 */ 0x7634,0x616F,
-	/* Array index: 0x1572 */ 0x763B,0x6171,
-	/* Array index: 0x1572 */ 0x7642,0x4E45,
-	/* Array index: 0x1572 */ 0x764C,0x3462,
-	/* Array index: 0x1572 */ 0x7652,0x4C7E,
-	/* Array index: 0x1572 */ 0x7656,0x4A4A,
-	/* Array index: 0x1572 */ 0x7658,0x6176,
-	/* Array index: 0x1572 */ 0x765C,0x6175,
-	/* Array index: 0x1572 */ 0x7661,0x6177,
-	/* Array index: 0x1572 */ 0x7662,0x6178,
-	/* Array index: 0x1572 */ 0x7670,0x617E,
-	/* Array index: 0x1572 */ 0x7672,0x6221,
-	/* Array index: 0x1572 */ 0x7676,0x6222,
-	/* Array index: 0x1572 */ 0x768B,0x6228,
-	/* Array index: 0x1572 */ 0x768E,0x6229,
-	/* Array index: 0x1572 */ 0x7690,0x3B29,
-	/* Array index: 0x1572 */ 0x7693,0x622B,
-	/* Array index: 0x1572 */ 0x7696,0x622A,
-	/* Array index: 0x1572 */ 0x7699,0x622C,
-	/* Array index: 0x1572 */ 0x769A,0x622D,
-	/* Array index: 0x1572 */ 0x76AE,0x4869,
-	/* Array index: 0x1572 */ 0x76B0,0x622E,
-	/* Array index: 0x1572 */ 0x76B4,0x622F,
-	/* Array index: 0x1572 */ 0x76BF,0x3B2E,
-	/* Array index: 0x1572 */ 0x76C2,0x6233,
-	/* Array index: 0x1572 */ 0x76C3,0x4756,
-	/* Array index: 0x1572 */ 0x76C6,0x4B5F,
-	/* Array index: 0x1572 */ 0x76C8,0x314E,
-	/* Array index: 0x1572 */ 0x76CA,0x3157,
-	/* Array index: 0x1572 */ 0x76CD,0x6234,
-	/* Array index: 0x1572 */ 0x76D2,0x6236,
-	/* Array index: 0x1572 */ 0x76D6,0x6235,
-	/* Array index: 0x1572 */ 0x76D7,0x4570,
-	/* Array index: 0x1572 */ 0x76EA,0x623B,
-	/* Array index: 0x1572 */ 0x76EE,0x4C5C,
-	/* Array index: 0x1572 */ 0x76F2,0x4C55,
-	/* Array index: 0x1572 */ 0x76F4,0x443E,
-	/* Array index: 0x1572 */ 0x76F8,0x416A,
-	/* Array index: 0x1572 */ 0x76FB,0x623D,
-	/* Array index: 0x1572 */ 0x76FE,0x3D62,
-	/* Array index: 0x1572 */ 0x7701,0x3E4A,
-	/* Array index: 0x1572 */ 0x7704,0x6240,
-	/* Array index: 0x1572 */ 0x771B,0x6246,
-	/* Array index: 0x1572 */ 0x7729,0x6241,
-	/* Array index: 0x1572 */ 0x7737,0x6247,
-	/* Array index: 0x1572 */ 0x7738,0x6248,
-	/* Array index: 0x1572 */ 0x773A,0x442F,
-	/* Array index: 0x1572 */ 0x773C,0x3463,
-	/* Array index: 0x1572 */ 0x7740,0x4365,
-	/* Array index: 0x1572 */ 0x7747,0x6249,
-	/* Array index: 0x1572 */ 0x775A,0x624A,
-	/* Array index: 0x1572 */ 0x775B,0x624D,
-	/* Array index: 0x1572 */ 0x7761,0x3F67,
-	/* Array index: 0x1572 */ 0x7763,0x4644,
-	/* Array index: 0x1572 */ 0x7765,0x624E,
-	/* Array index: 0x1572 */ 0x7766,0x4B53,
-	/* Array index: 0x1572 */ 0x7768,0x624B,
-	/* Array index: 0x1572 */ 0x776B,0x624C,
-	/* Array index: 0x1572 */ 0x7779,0x6251,
-	/* Array index: 0x1572 */ 0x777E,0x6250,
-	/* Array index: 0x1572 */ 0x777F,0x624F,
-	/* Array index: 0x1572 */ 0x778B,0x6253,
-	/* Array index: 0x1572 */ 0x778E,0x6252,
-	/* Array index: 0x1572 */ 0x7791,0x6254,
-	/* Array index: 0x1572 */ 0x779E,0x6256,
-	/* Array index: 0x1572 */ 0x77A0,0x6255,
-	/* Array index: 0x1572 */ 0x77A5,0x4A4D,
-	/* Array index: 0x1572 */ 0x77AC,0x3D56,
-	/* Array index: 0x1572 */ 0x77AD,0x4E46,
-	/* Array index: 0x1572 */ 0x77B0,0x6257,
-	/* Array index: 0x1572 */ 0x77B3,0x4637,
-	/* Array index: 0x1572 */ 0x77B6,0x6258,
-	/* Array index: 0x1572 */ 0x77C7,0x625E,
-	/* Array index: 0x1572 */ 0x77CD,0x625F,
-	/* Array index: 0x1572 */ 0x77D7,0x6260,
-	/* Array index: 0x1572 */ 0x77E2,0x4C70,
-	/* Array index: 0x1572 */ 0x77E3,0x6263,
-	/* Array index: 0x1572 */ 0x77E5,0x434E,
-	/* Array index: 0x1572 */ 0x77E7,0x476A,
-	/* Array index: 0x1572 */ 0x77E9,0x366B,
-	/* Array index: 0x1572 */ 0x77F3,0x4050,
-	/* Array index: 0x1572 */ 0x77FC,0x6265,
-	/* Array index: 0x1572 */ 0x7802,0x3A3D,
-	/* Array index: 0x1572 */ 0x780C,0x6266,
-	/* Array index: 0x1572 */ 0x7812,0x6267,
-	/* Array index: 0x1572 */ 0x7814,0x3826,
-	/* Array index: 0x1572 */ 0x7815,0x3A55,
-	/* Array index: 0x1572 */ 0x7820,0x6269,
-	/* Array index: 0x1572 */ 0x7832,0x4B24,
-	/* Array index: 0x1572 */ 0x7834,0x474B,
-	/* Array index: 0x1572 */ 0x783A,0x4557,
-	/* Array index: 0x1572 */ 0x783F,0x395C,
-	/* Array index: 0x1572 */ 0x7845,0x626B,
-	/* Array index: 0x1572 */ 0x785D,0x3E4B,
-	/* Array index: 0x1572 */ 0x786B,0x4E32,
-	/* Array index: 0x1572 */ 0x786C,0x3945,
-	/* Array index: 0x1572 */ 0x786F,0x3827,
-	/* Array index: 0x1572 */ 0x7872,0x4823,
-	/* Array index: 0x1572 */ 0x7874,0x626D,
-	/* Array index: 0x1572 */ 0x787C,0x626F,
-	/* Array index: 0x1572 */ 0x7881,0x386B,
-	/* Array index: 0x1572 */ 0x7886,0x626E,
-	/* Array index: 0x1572 */ 0x7887,0x4476,
-	/* Array index: 0x1572 */ 0x7891,0x486A,
-	/* Array index: 0x1572 */ 0x7893,0x3130,
-	/* Array index: 0x1572 */ 0x7895,0x3A6C,
-	/* Array index: 0x1572 */ 0x7897,0x4F52,
-	/* Array index: 0x1572 */ 0x789A,0x6270,
-	/* Array index: 0x1572 */ 0x78A3,0x6272,
-	/* Array index: 0x1572 */ 0x78A7,0x4A4B,
-	/* Array index: 0x1572 */ 0x78A9,0x4059,
-	/* Array index: 0x1572 */ 0x78AA,0x6274,
-	/* Array index: 0x1572 */ 0x78AF,0x6275,
-	/* Array index: 0x1572 */ 0x78B5,0x6273,
-	/* Array index: 0x1572 */ 0x78BA,0x334E,
-	/* Array index: 0x1572 */ 0x78BC,0x627B,
-	/* Array index: 0x1572 */ 0x78BE,0x627A,
-	/* Array index: 0x1572 */ 0x78C1,0x3C27,
-	/* Array index: 0x1572 */ 0x78C5,0x627C,
-	/* Array index: 0x1572 */ 0x78C6,0x6277,
-	/* Array index: 0x1572 */ 0x78CA,0x627D,
-	/* Array index: 0x1572 */ 0x78CB,0x6278,
-	/* Array index: 0x1572 */ 0x78D0,0x4858,
-	/* Array index: 0x1572 */ 0x78D1,0x6276,
-	/* Array index: 0x1572 */ 0x78D4,0x6279,
-	/* Array index: 0x1572 */ 0x78DA,0x6322,
-	/* Array index: 0x1572 */ 0x78E7,0x6321,
-	/* Array index: 0x1572 */ 0x78E8,0x4B61,
-	/* Array index: 0x1572 */ 0x78EC,0x627E,
-	/* Array index: 0x1572 */ 0x78EF,0x306B,
-	/* Array index: 0x1572 */ 0x78F4,0x6324,
-	/* Array index: 0x1572 */ 0x78FD,0x6323,
-	/* Array index: 0x1572 */ 0x7901,0x3E4C,
-	/* Array index: 0x1572 */ 0x7907,0x6325,
-	/* Array index: 0x1572 */ 0x790E,0x4143,
-	/* Array index: 0x1572 */ 0x7911,0x6327,
-	/* Array index: 0x1572 */ 0x7912,0x6326,
-	/* Array index: 0x1572 */ 0x7919,0x6328,
-	/* Array index: 0x1572 */ 0x7926,0x6268,
-	/* Array index: 0x1572 */ 0x793A,0x3C28,
-	/* Array index: 0x1572 */ 0x793C,0x4E69,
-	/* Array index: 0x1572 */ 0x793E,0x3C52,
-	/* Array index: 0x1572 */ 0x7940,0x632B,
-	/* Array index: 0x1572 */ 0x7941,0x3737,
-	/* Array index: 0x1572 */ 0x7950,0x4D34,
-	/* Array index: 0x1572 */ 0x795A,0x632F,
-	/* Array index: 0x1572 */ 0x7965,0x3E4D,
-	/* Array index: 0x1572 */ 0x7968,0x493C,
-	/* Array index: 0x1572 */ 0x796D,0x3A57,
-	/* Array index: 0x1572 */ 0x7977,0x4578,
-	/* Array index: 0x1572 */ 0x797A,0x6332,
-	/* Array index: 0x1572 */ 0x798A,0x6334,
-	/* Array index: 0x1572 */ 0x799D,0x6335,
-	/* Array index: 0x1572 */ 0x79A6,0x357A,
-	/* Array index: 0x1572 */ 0x79A7,0x6336,
-	/* Array index: 0x1572 */ 0x79AA,0x6338,
-	/* Array index: 0x1572 */ 0x79AE,0x6339,
-	/* Array index: 0x1572 */ 0x79B0,0x4729,
-	/* Array index: 0x1572 */ 0x79B3,0x633A,
-	/* Array index: 0x1572 */ 0x79C9,0x633D,
-	/* Array index: 0x1572 */ 0x79CB,0x3D29,
-	/* Array index: 0x1572 */ 0x79D1,0x324A,
-	/* Array index: 0x1572 */ 0x79D2,0x4943,
-	/* Array index: 0x1572 */ 0x79D5,0x633E,
-	/* Array index: 0x1572 */ 0x79D8,0x486B,
-	/* Array index: 0x1572 */ 0x79DF,0x4145,
-	/* Array index: 0x1572 */ 0x79E1,0x6341,
-	/* Array index: 0x1572 */ 0x79EC,0x6340,
-	/* Array index: 0x1572 */ 0x79F0,0x3E4E,
-	/* Array index: 0x1572 */ 0x79FB,0x305C,
-	/* Array index: 0x1572 */ 0x7A00,0x3529,
-	/* Array index: 0x1572 */ 0x7A08,0x6343,
-	/* Array index: 0x1572 */ 0x7A0B,0x4478,
-	/* Array index: 0x1572 */ 0x7A0D,0x6344,
-	/* Array index: 0x1572 */ 0x7A0E,0x4047,
-	/* Array index: 0x1572 */ 0x7A14,0x4C2D,
-	/* Array index: 0x1572 */ 0x7A2E,0x3C6F,
-	/* Array index: 0x1572 */ 0x7A31,0x634A,
-	/* Array index: 0x1572 */ 0x7A32,0x3070,
-	/* Array index: 0x1572 */ 0x7A37,0x634D,
-	/* Array index: 0x1572 */ 0x7A46,0x4B54,
-	/* Array index: 0x1572 */ 0x7A49,0x6350,
-	/* Array index: 0x1572 */ 0x7A57,0x634F,
-	/* Array index: 0x1572 */ 0x7A69,0x6353,
-	/* Array index: 0x1572 */ 0x7A6B,0x334F,
-	/* Array index: 0x1572 */ 0x7A70,0x6355,
-	/* Array index: 0x1572 */ 0x7A74,0x376A,
-	/* Array index: 0x1572 */ 0x7A76,0x3566,
-	/* Array index: 0x1572 */ 0x7A79,0x6356,
-	/* Array index: 0x1572 */ 0x7A7A,0x3675,
-	/* Array index: 0x1572 */ 0x7A7D,0x6357,
-	/* Array index: 0x1572 */ 0x7A7F,0x407C,
-	/* Array index: 0x1572 */ 0x7A81,0x464D,
-	/* Array index: 0x1572 */ 0x7A83,0x4060,
-	/* Array index: 0x1572 */ 0x7A84,0x3A75,
-	/* Array index: 0x1572 */ 0x7A88,0x6358,
-	/* Array index: 0x1572 */ 0x7A9F,0x3722,
-	/* Array index: 0x1572 */ 0x7AA9,0x635D,
-	/* Array index: 0x1572 */ 0x7AAA,0x3726,
-	/* Array index: 0x1572 */ 0x7AB6,0x6360,
-	/* Array index: 0x1572 */ 0x7ABA,0x312E,
-	/* Array index: 0x1572 */ 0x7ABF,0x6363,
-	/* Array index: 0x1572 */ 0x7AEA,0x4328,
-	/* Array index: 0x1572 */ 0x7AED,0x6371,
-	/* Array index: 0x1572 */ 0x7AEF,0x433C,
-	/* Array index: 0x1572 */ 0x7AF0,0x6372,
-	/* Array index: 0x1572 */ 0x7AFF,0x3448,
-	/* Array index: 0x1572 */ 0x7B02,0x6373,
-	/* Array index: 0x1572 */ 0x7B04,0x6422,
-	/* Array index: 0x1572 */ 0x7B06,0x6376,
-	/* Array index: 0x1572 */ 0x7B08,0x3568,
-	/* Array index: 0x1572 */ 0x7B0A,0x6375,
-	/* Array index: 0x1572 */ 0x7B0B,0x6424,
-	/* Array index: 0x1572 */ 0x7B0F,0x6374,
-	/* Array index: 0x1572 */ 0x7B11,0x3E50,
-	/* Array index: 0x1572 */ 0x7B18,0x6378,
-	/* Array index: 0x1572 */ 0x7B19,0x6379,
-	/* Array index: 0x1572 */ 0x7B1B,0x452B,
-	/* Array index: 0x1572 */ 0x7B1E,0x637A,
-	/* Array index: 0x1572 */ 0x7B20,0x335E,
-	/* Array index: 0x1572 */ 0x7B25,0x3F5A,
-	/* Array index: 0x1572 */ 0x7B26,0x4964,
-	/* Array index: 0x1572 */ 0x7B28,0x637C,
-	/* Array index: 0x1572 */ 0x7B2C,0x4268,
-	/* Array index: 0x1572 */ 0x7B33,0x6377,
-	/* Array index: 0x1572 */ 0x7B35,0x637B,
-	/* Array index: 0x1572 */ 0x7B36,0x637D,
-	/* Array index: 0x1572 */ 0x7B39,0x3A7B,
-	/* Array index: 0x1572 */ 0x7B5D,0x6438,
-	/* Array index: 0x1572 */ 0x7B65,0x6428,
-	/* Array index: 0x1572 */ 0x7B67,0x642A,
-	/* Array index: 0x1572 */ 0x7B6C,0x642D,
-	/* Array index: 0x1572 */ 0x7B6E,0x642E,
-	/* Array index: 0x1572 */ 0x7B70,0x642B,
-	/* Array index: 0x1572 */ 0x7B71,0x642C,
-	/* Array index: 0x1572 */ 0x7B74,0x6429,
-	/* Array index: 0x1572 */ 0x7B75,0x6427,
-	/* Array index: 0x1572 */ 0x7B7A,0x6421,
-	/* Array index: 0x1572 */ 0x7B86,0x4A4F,
-	/* Array index: 0x1572 */ 0x7B87,0x3255,
-	/* Array index: 0x1572 */ 0x7B8B,0x6435,
-	/* Array index: 0x1572 */ 0x7B8D,0x6432,
-	/* Array index: 0x1572 */ 0x7B8F,0x6437,
-	/* Array index: 0x1572 */ 0x7B92,0x6436,
-	/* Array index: 0x1572 */ 0x7BAA,0x433D,
-	/* Array index: 0x1572 */ 0x7BAD,0x407D,
-	/* Array index: 0x1572 */ 0x7BB1,0x4822,
-	/* Array index: 0x1572 */ 0x7BB4,0x643E,
-	/* Array index: 0x1572 */ 0x7BB8,0x4824,
-	/* Array index: 0x1572 */ 0x7BC0,0x4061,
-	/* Array index: 0x1572 */ 0x7BC1,0x643B,
-	/* Array index: 0x1572 */ 0x7BC4,0x484F,
-	/* Array index: 0x1572 */ 0x7BC6,0x643F,
-	/* Array index: 0x1572 */ 0x7BC7,0x4A53,
-	/* Array index: 0x1572 */ 0x7BC9,0x435B,
-	/* Array index: 0x1572 */ 0x7BCB,0x643A,
-	/* Array index: 0x1572 */ 0x7BCC,0x643C,
-	/* Array index: 0x1572 */ 0x7BCF,0x643D,
-	/* Array index: 0x1572 */ 0x7BDD,0x6440,
-	/* Array index: 0x1572 */ 0x7BE0,0x3C44,
-	/* Array index: 0x1572 */ 0x7BE9,0x6441,
-	/* Array index: 0x1572 */ 0x7BED,0x4F36,
-	/* Array index: 0x1572 */ 0x7BF3,0x644A,
-	/* Array index: 0x1572 */ 0x7BF6,0x644E,
-	/* Array index: 0x1572 */ 0x7BF7,0x644B,
-	/* Array index: 0x1572 */ 0x7C00,0x6447,
-	/* Array index: 0x1572 */ 0x7C07,0x6448,
-	/* Array index: 0x1572 */ 0x7C0D,0x644D,
-	/* Array index: 0x1572 */ 0x7C17,0x644C,
-	/* Array index: 0x1572 */ 0x7C1F,0x6452,
-	/* Array index: 0x1572 */ 0x7C21,0x344A,
-	/* Array index: 0x1572 */ 0x7C23,0x644F,
-	/* Array index: 0x1572 */ 0x7C27,0x6450,
-	/* Array index: 0x1572 */ 0x7C2A,0x6451,
-	/* Array index: 0x1572 */ 0x7C2B,0x6454,
-	/* Array index: 0x1572 */ 0x7C37,0x6453,
-	/* Array index: 0x1572 */ 0x7C38,0x4876,
-	/* Array index: 0x1572 */ 0x7C43,0x6457,
-	/* Array index: 0x1572 */ 0x7C54,0x6458,
-	/* Array index: 0x1572 */ 0x7C56,0x645F,
-	/* Array index: 0x1572 */ 0x7C58,0x645C,
-	/* Array index: 0x1572 */ 0x7C5F,0x645D,
-	/* Array index: 0x1572 */ 0x7C60,0x6446,
-	/* Array index: 0x1572 */ 0x7C64,0x645E,
-	/* Array index: 0x1572 */ 0x7C65,0x6460,
-	/* Array index: 0x1572 */ 0x7C6C,0x6461,
-	/* Array index: 0x1572 */ 0x7C73,0x4A46,
-	/* Array index: 0x1572 */ 0x7C75,0x6462,
-	/* Array index: 0x1572 */ 0x7C7E,0x4C62,
-	/* Array index: 0x1572 */ 0x7C89,0x4A34,
-	/* Array index: 0x1572 */ 0x7C8B,0x3F68,
-	/* Array index: 0x1572 */ 0x7C8D,0x4C30,
-	/* Array index: 0x1572 */ 0x7C90,0x6464,
-	/* Array index: 0x1572 */ 0x7C92,0x4E33,
-	/* Array index: 0x1572 */ 0x7C95,0x4774,
-	/* Array index: 0x1572 */ 0x7C97,0x4146,
-	/* Array index: 0x1572 */ 0x7C98,0x4734,
-	/* Array index: 0x1572 */ 0x7C9B,0x3D4D,
-	/* Array index: 0x1572 */ 0x7C9F,0x3040,
-	/* Array index: 0x1572 */ 0x7CAB,0x6468,
-	/* Array index: 0x1572 */ 0x7CB9,0x646F,
-	/* Array index: 0x1572 */ 0x7CBD,0x6470,
-	/* Array index: 0x1572 */ 0x7CBE,0x403A,
-	/* Array index: 0x1572 */ 0x7CC0,0x6471,
-	/* Array index: 0x1572 */ 0x7CC2,0x6473,
-	/* Array index: 0x1572 */ 0x7CC5,0x6472,
-	/* Array index: 0x1572 */ 0x7CCA,0x3852,
-	/* Array index: 0x1572 */ 0x7CCE,0x4138,
-	/* Array index: 0x1572 */ 0x7CD2,0x6475,
-	/* Array index: 0x1572 */ 0x7CD6,0x457C,
-	/* Array index: 0x1572 */ 0x7CD8,0x6474,
-	/* Array index: 0x1572 */ 0x7CE7,0x4E48,
-	/* Array index: 0x1572 */ 0x7CEF,0x6479,
-	/* Array index: 0x1572 */ 0x7CF2,0x647A,
-	/* Array index: 0x1572 */ 0x7CF4,0x647B,
-	/* Array index: 0x1572 */ 0x7CF6,0x647C,
-	/* Array index: 0x1572 */ 0x7CF8,0x3B65,
-	/* Array index: 0x1572 */ 0x7CFA,0x647D,
-	/* Array index: 0x1572 */ 0x7CFB,0x374F,
-	/* Array index: 0x1572 */ 0x7CFE,0x356A,
-	/* Array index: 0x1572 */ 0x7D00,0x352A,
-	/* Array index: 0x1572 */ 0x7D0A,0x6524,
-	/* Array index: 0x1572 */ 0x7D0B,0x4C66,
-	/* Array index: 0x1572 */ 0x7D0D,0x473C,
-	/* Array index: 0x1572 */ 0x7D10,0x4933,
-	/* Array index: 0x1572 */ 0x7D39,0x3E52,
-	/* Array index: 0x1572 */ 0x7D3A,0x3A30,
-	/* Array index: 0x1572 */ 0x7D3F,0x6529,
-	/* Array index: 0x1572 */ 0x7D56,0x652D,
-	/* Array index: 0x1572 */ 0x7D5B,0x6536,
-	/* Array index: 0x1572 */ 0x7D5E,0x394A,
-	/* Array index: 0x1572 */ 0x7D66,0x356B,
-	/* Array index: 0x1572 */ 0x7D68,0x6530,
-	/* Array index: 0x1572 */ 0x7D6E,0x6531,
-	/* Array index: 0x1572 */ 0x7D79,0x3828,
-	/* Array index: 0x1572 */ 0x7D7D,0x6538,
-	/* Array index: 0x1572 */ 0x7D89,0x6535,
-	/* Array index: 0x1572 */ 0x7D8F,0x6537,
-	/* Array index: 0x1572 */ 0x7D93,0x6534,
-	/* Array index: 0x1572 */ 0x7D9F,0x6546,
-	/* Array index: 0x1572 */ 0x7DA2,0x6542,
-	/* Array index: 0x1572 */ 0x7DA3,0x653C,
-	/* Array index: 0x1572 */ 0x7DB8,0x6545,
-	/* Array index: 0x1572 */ 0x7DC7,0x653E,
-	/* Array index: 0x1572 */ 0x7DCA,0x365B,
-	/* Array index: 0x1572 */ 0x7DCB,0x486C,
-	/* Array index: 0x1572 */ 0x7DCF,0x416D,
-	/* Array index: 0x1572 */ 0x7DD1,0x4E50,
-	/* Array index: 0x1572 */ 0x7DD2,0x3D6F,
-	/* Array index: 0x1572 */ 0x7DD5,0x656E,
-	/* Array index: 0x1572 */ 0x7DD8,0x6548,
-	/* Array index: 0x1572 */ 0x7DE4,0x654A,
-	/* Array index: 0x1572 */ 0x7DE8,0x4A54,
-	/* Array index: 0x1572 */ 0x7DE9,0x344B,
-	/* Array index: 0x1572 */ 0x7DEC,0x4C4B,
-	/* Array index: 0x1572 */ 0x7DEF,0x305E,
-	/* Array index: 0x1572 */ 0x7DF2,0x654D,
-	/* Array index: 0x1572 */ 0x7DF4,0x4E7D,
-	/* Array index: 0x1572 */ 0x7DFB,0x654C,
-	/* Array index: 0x1572 */ 0x7E01,0x316F,
-	/* Array index: 0x1572 */ 0x7E04,0x466C,
-	/* Array index: 0x1572 */ 0x7E05,0x654F,
-	/* Array index: 0x1572 */ 0x7E12,0x6553,
-	/* Array index: 0x1572 */ 0x7E1B,0x477B,
-	/* Array index: 0x1572 */ 0x7E26,0x3D44,
-	/* Array index: 0x1572 */ 0x7E2B,0x4B25,
-	/* Array index: 0x1572 */ 0x7E2E,0x3D4C,
-	/* Array index: 0x1572 */ 0x7E31,0x6554,
-	/* Array index: 0x1572 */ 0x7E32,0x6560,
-	/* Array index: 0x1572 */ 0x7E35,0x655C,
-	/* Array index: 0x1572 */ 0x7E41,0x484B,
-	/* Array index: 0x1572 */ 0x7E43,0x655E,
-	/* Array index: 0x1572 */ 0x7E46,0x6559,
-	/* Array index: 0x1572 */ 0x7E4A,0x4121,
-	/* Array index: 0x1572 */ 0x7E4B,0x3752,
-	/* Array index: 0x1572 */ 0x7E4D,0x3D2B,
-	/* Array index: 0x1572 */ 0x7E6D,0x4B7A,
-	/* Array index: 0x1572 */ 0x7E70,0x372B,
-	/* Array index: 0x1572 */ 0x7E88,0x6572,
-	/* Array index: 0x1572 */ 0x7E89,0x6573,
-	/* Array index: 0x1572 */ 0x7E9B,0x657B,
-	/* Array index: 0x1572 */ 0x7E9C,0x657C,
-	/* Array index: 0x1572 */ 0x7F36,0x344C,
-	/* Array index: 0x1572 */ 0x7F38,0x657D,
-	/* Array index: 0x1572 */ 0x7F3A,0x657E,
-	/* Array index: 0x1572 */ 0x7F45,0x6621,
-	/* Array index: 0x1572 */ 0x7F58,0x6629,
-	/* Array index: 0x1572 */ 0x7F5F,0x662A,
-	/* Array index: 0x1572 */ 0x7F60,0x662B,
-	/* Array index: 0x1572 */ 0x7F6E,0x4356,
-	/* Array index: 0x1572 */ 0x7F70,0x4833,
-	/* Array index: 0x1572 */ 0x7F72,0x3D70,
-	/* Array index: 0x1572 */ 0x7F94,0x6636,
-	/* Array index: 0x1572 */ 0x7F9A,0x6639,
-	/* Array index: 0x1572 */ 0x7F9D,0x6638,
-	/* Array index: 0x1572 */ 0x7F9E,0x6637,
-	/* Array index: 0x1572 */ 0x7FA3,0x663A,
-	/* Array index: 0x1572 */ 0x7FA4,0x3732,
-	/* Array index: 0x1572 */ 0x7FA8,0x4122,
-	/* Array index: 0x1572 */ 0x7FA9,0x3541,
-	/* Array index: 0x1572 */ 0x7FAE,0x663E,
-	/* Array index: 0x1572 */ 0x7FAF,0x663B,
-	/* Array index: 0x1572 */ 0x7FB2,0x663C,
-	/* Array index: 0x1572 */ 0x7FB6,0x663F,
-	/* Array index: 0x1572 */ 0x7FB8,0x6640,
-	/* Array index: 0x1572 */ 0x7FB9,0x663D,
-	/* Array index: 0x1572 */ 0x7FBD,0x3129,
-	/* Array index: 0x1572 */ 0x7FC1,0x3227,
-	/* Array index: 0x1572 */ 0x7FC5,0x6642,
-	/* Array index: 0x1572 */ 0x7FC6,0x6643,
-	/* Array index: 0x1572 */ 0x7FCA,0x6644,
-	/* Array index: 0x1572 */ 0x7FCC,0x4D62,
-	/* Array index: 0x1572 */ 0x7FD2,0x3D2C,
-	/* Array index: 0x1572 */ 0x7FD4,0x6646,
-	/* Array index: 0x1572 */ 0x7FD5,0x6645,
-	/* Array index: 0x1572 */ 0x7FE0,0x3F69,
-	/* Array index: 0x1572 */ 0x7FE1,0x6647,
-	/* Array index: 0x1572 */ 0x7FE6,0x6648,
-	/* Array index: 0x1572 */ 0x7FE9,0x6649,
-	/* Array index: 0x1572 */ 0x7FEB,0x3465,
-	/* Array index: 0x1572 */ 0x7FF0,0x344D,
-	/* Array index: 0x1572 */ 0x7FF3,0x664A,
-	/* Array index: 0x1572 */ 0x7FF9,0x664B,
-	/* Array index: 0x1572 */ 0x7FFB,0x4B5D,
-	/* Array index: 0x1572 */ 0x7FFC,0x4D63,
-	/* Array index: 0x1572 */ 0x800B,0x664F,
-	/* Array index: 0x1572 */ 0x800C,0x3C29,
-	/* Array index: 0x1572 */ 0x8010,0x4251,
-	/* Array index: 0x1572 */ 0x8012,0x6650,
-	/* Array index: 0x1572 */ 0x801C,0x6653,
-	/* Array index: 0x1572 */ 0x8021,0x6654,
-	/* Array index: 0x1572 */ 0x8028,0x6655,
-	/* Array index: 0x1572 */ 0x8033,0x3C2A,
-	/* Array index: 0x1572 */ 0x8036,0x4C6D,
-	/* Array index: 0x1572 */ 0x803B,0x6657,
-	/* Array index: 0x1572 */ 0x803D,0x433F,
-	/* Array index: 0x1572 */ 0x803F,0x6656,
-	/* Array index: 0x1572 */ 0x8046,0x6659,
-	/* Array index: 0x1572 */ 0x804A,0x6658,
-	/* Array index: 0x1572 */ 0x8052,0x665A,
-	/* Array index: 0x1572 */ 0x8056,0x403B,
-	/* Array index: 0x1572 */ 0x8058,0x665B,
-	/* Array index: 0x1572 */ 0x805A,0x665C,
-	/* Array index: 0x1572 */ 0x8068,0x665F,
-	/* Array index: 0x1572 */ 0x8093,0x666B,
-	/* Array index: 0x1572 */ 0x8096,0x3E53,
-	/* Array index: 0x1572 */ 0x8098,0x492A,
-	/* Array index: 0x1572 */ 0x809A,0x666C,
-	/* Array index: 0x1572 */ 0x809B,0x666A,
-	/* Array index: 0x1572 */ 0x809D,0x344E,
-	/* Array index: 0x1572 */ 0x80A1,0x3854,
-	/* Array index: 0x1572 */ 0x80A2,0x3B68,
-	/* Array index: 0x1572 */ 0x80A5,0x486E,
-	/* Array index: 0x1572 */ 0x80BA,0x4759,
-	/* Array index: 0x1572 */ 0x80C3,0x305F,
-	/* Array index: 0x1572 */ 0x80C4,0x6674,
-	/* Array index: 0x1572 */ 0x80C6,0x4340,
-	/* Array index: 0x1572 */ 0x80CC,0x4758,
-	/* Array index: 0x1572 */ 0x80CE,0x425B,
-	/* Array index: 0x1572 */ 0x80D6,0x6676,
-	/* Array index: 0x1572 */ 0x80E1,0x3855,
-	/* Array index: 0x1572 */ 0x80E4,0x307D,
-	/* Array index: 0x1572 */ 0x80E5,0x6671,
-	/* Array index: 0x1572 */ 0x80EF,0x6678,
-	/* Array index: 0x1572 */ 0x80F1,0x6679,
-	/* Array index: 0x1572 */ 0x80F4,0x4639,
-	/* Array index: 0x1572 */ 0x80F8,0x363B,
-	/* Array index: 0x1572 */ 0x80FC,0x6726,
-	/* Array index: 0x1572 */ 0x80FD,0x473D,
-	/* Array index: 0x1572 */ 0x8102,0x3B69,
-	/* Array index: 0x1572 */ 0x811A,0x3553,
-	/* Array index: 0x1572 */ 0x811B,0x667A,
-	/* Array index: 0x1572 */ 0x8123,0x667C,
-	/* Array index: 0x1572 */ 0x8129,0x667B,
-	/* Array index: 0x1572 */ 0x812F,0x667D,
-	/* Array index: 0x1572 */ 0x8131,0x4326,
-	/* Array index: 0x1572 */ 0x8133,0x473E,
-	/* Array index: 0x1572 */ 0x8139,0x4431,
-	/* Array index: 0x1572 */ 0x813E,0x6723,
-	/* Array index: 0x1572 */ 0x8146,0x6722,
-	/* Array index: 0x1572 */ 0x814B,0x667E,
-	/* Array index: 0x1572 */ 0x814E,0x3F55,
-	/* Array index: 0x1572 */ 0x815F,0x6735,
-	/* Array index: 0x1572 */ 0x8165,0x6729,
-	/* Array index: 0x1572 */ 0x8166,0x672A,
-	/* Array index: 0x1572 */ 0x816B,0x3C70,
-	/* Array index: 0x1572 */ 0x816E,0x6728,
-	/* Array index: 0x1572 */ 0x8170,0x3978,
-	/* Array index: 0x1572 */ 0x8171,0x6727,
-	/* Array index: 0x1572 */ 0x8174,0x672B,
-	/* Array index: 0x1572 */ 0x8188,0x672D,
-	/* Array index: 0x1572 */ 0x818A,0x672E,
-	/* Array index: 0x1572 */ 0x818F,0x3951,
-	/* Array index: 0x1572 */ 0x8193,0x6736,
-	/* Array index: 0x1572 */ 0x8195,0x6732,
-	/* Array index: 0x1572 */ 0x819A,0x4966,
-	/* Array index: 0x1572 */ 0x819C,0x4B6C,
-	/* Array index: 0x1572 */ 0x819D,0x4928,
-	/* Array index: 0x1572 */ 0x81A0,0x6731,
-	/* Array index: 0x1572 */ 0x81A3,0x6734,
-	/* Array index: 0x1572 */ 0x81A4,0x6733,
-	/* Array index: 0x1572 */ 0x81A8,0x4B44,
-	/* Array index: 0x1572 */ 0x81A9,0x6737,
-	/* Array index: 0x1572 */ 0x81B0,0x6738,
-	/* Array index: 0x1572 */ 0x81B3,0x4137,
-	/* Array index: 0x1572 */ 0x81B5,0x6739,
-	/* Array index: 0x1572 */ 0x81B8,0x673B,
-	/* Array index: 0x1572 */ 0x81BA,0x673F,
-	/* Array index: 0x1572 */ 0x81C6,0x3232,
-	/* Array index: 0x1572 */ 0x81C8,0x6745,
-	/* Array index: 0x1572 */ 0x81C9,0x6740,
-	/* Array index: 0x1572 */ 0x81CD,0x6741,
-	/* Array index: 0x1572 */ 0x81D1,0x6742,
-	/* Array index: 0x1572 */ 0x81D3,0x4221,
-	/* Array index: 0x1572 */ 0x81DF,0x6747,
-	/* Array index: 0x1572 */ 0x81E0,0x6748,
-	/* Array index: 0x1572 */ 0x81E3,0x3F43,
-	/* Array index: 0x1572 */ 0x81E5,0x3269,
-	/* Array index: 0x1572 */ 0x81E7,0x6749,
-	/* Array index: 0x1572 */ 0x81E8,0x4E57,
-	/* Array index: 0x1572 */ 0x81EA,0x3C2B,
-	/* Array index: 0x1572 */ 0x81ED,0x3D2D,
-	/* Array index: 0x1572 */ 0x81F3,0x3B6A,
-	/* Array index: 0x1572 */ 0x81F4,0x4357,
-	/* Array index: 0x1572 */ 0x8240,0x6759,
-	/* Array index: 0x1572 */ 0x8247,0x447A,
-	/* Array index: 0x1572 */ 0x825D,0x675C,
-	/* Array index: 0x1572 */ 0x825F,0x675E,
-	/* Array index: 0x1572 */ 0x8262,0x6760,
-	/* Array index: 0x1572 */ 0x8264,0x675F,
-	/* Array index: 0x1572 */ 0x8266,0x344F,
-	/* Array index: 0x1572 */ 0x8268,0x6761,
-	/* Array index: 0x1572 */ 0x826A,0x6762,
-	/* Array index: 0x1572 */ 0x826B,0x6763,
-	/* Array index: 0x1572 */ 0x827E,0x6768,
-	/* Array index: 0x1572 */ 0x828B,0x3072,
-	/* Array index: 0x1572 */ 0x828D,0x6769,
-	/* Array index: 0x1572 */ 0x8292,0x676A,
-	/* Array index: 0x1572 */ 0x8299,0x4967,
-	/* Array index: 0x1572 */ 0x829D,0x3C47,
-	/* Array index: 0x1572 */ 0x829F,0x676C,
-	/* Array index: 0x1572 */ 0x82A5,0x3329,
-	/* Array index: 0x1572 */ 0x82A6,0x3032,
-	/* Array index: 0x1572 */ 0x82B8,0x375D,
-	/* Array index: 0x1572 */ 0x82B9,0x365C,
-	/* Array index: 0x1572 */ 0x82BB,0x676D,
-	/* Array index: 0x1572 */ 0x82BD,0x326A,
-	/* Array index: 0x1572 */ 0x82C5,0x3423,
-	/* Array index: 0x1572 */ 0x82D7,0x4944,
-	/* Array index: 0x1572 */ 0x82D9,0x677E,
-	/* Array index: 0x1572 */ 0x82EB,0x4651,
-	/* Array index: 0x1572 */ 0x82F1,0x3151,
-	/* Array index: 0x1572 */ 0x82F3,0x6774,
-	/* Array index: 0x1572 */ 0x82F4,0x6773,
-	/* Array index: 0x1572 */ 0x8309,0x677D,
-	/* Array index: 0x1572 */ 0x830E,0x3754,
-	/* Array index: 0x1572 */ 0x831C,0x302B,
-	/* Array index: 0x1572 */ 0x8323,0x6834,
-	/* Array index: 0x1572 */ 0x8328,0x3071,
-	/* Array index: 0x1572 */ 0x832B,0x682B,
-	/* Array index: 0x1572 */ 0x832F,0x682A,
-	/* Array index: 0x1572 */ 0x8340,0x6826,
-	/* Array index: 0x1572 */ 0x8345,0x6829,
-	/* Array index: 0x1572 */ 0x8349,0x4170,
-	/* Array index: 0x1572 */ 0x834A,0x3755,
-	/* Array index: 0x1572 */ 0x834F,0x3141,
-	/* Array index: 0x1572 */ 0x8350,0x6828,
-	/* Array index: 0x1572 */ 0x8352,0x3953,
-	/* Array index: 0x1572 */ 0x8358,0x4171,
-	/* Array index: 0x1572 */ 0x8373,0x683A,
-	/* Array index: 0x1572 */ 0x8375,0x683B,
-	/* Array index: 0x1572 */ 0x8377,0x3259,
-	/* Array index: 0x1572 */ 0x837B,0x322E,
-	/* Array index: 0x1572 */ 0x837C,0x6838,
-	/* Array index: 0x1572 */ 0x8385,0x682E,
-	/* Array index: 0x1572 */ 0x8387,0x6836,
-	/* Array index: 0x1572 */ 0x8389,0x683D,
-	/* Array index: 0x1572 */ 0x838A,0x6837,
-	/* Array index: 0x1572 */ 0x838E,0x6835,
-	/* Array index: 0x1572 */ 0x8393,0x6776,
-	/* Array index: 0x1572 */ 0x8396,0x6833,
-	/* Array index: 0x1572 */ 0x839A,0x682F,
-	/* Array index: 0x1572 */ 0x83A8,0x683E,
-	/* Array index: 0x1572 */ 0x83AA,0x6830,
-	/* Array index: 0x1572 */ 0x83AB,0x477C,
-	/* Array index: 0x1572 */ 0x83B1,0x4D69,
-	/* Array index: 0x1572 */ 0x83B5,0x6839,
-	/* Array index: 0x1572 */ 0x83BD,0x684F,
-	/* Array index: 0x1572 */ 0x83C1,0x6847,
-	/* Array index: 0x1572 */ 0x83C5,0x3F7B,
-	/* Array index: 0x1572 */ 0x83CA,0x3546,
-	/* Array index: 0x1572 */ 0x83CC,0x365D,
-	/* Array index: 0x1572 */ 0x83CE,0x6842,
-	/* Array index: 0x1572 */ 0x83D3,0x325B,
-	/* Array index: 0x1572 */ 0x83D6,0x3E54,
-	/* Array index: 0x1572 */ 0x83D8,0x6845,
-	/* Array index: 0x1572 */ 0x83DC,0x3A5A,
-	/* Array index: 0x1572 */ 0x83DF,0x4551,
-	/* Array index: 0x1572 */ 0x83E0,0x684A,
-	/* Array index: 0x1572 */ 0x83E9,0x4A6E,
-	/* Array index: 0x1572 */ 0x83EB,0x6841,
-	/* Array index: 0x1572 */ 0x83F7,0x6848,
-	/* Array index: 0x1572 */ 0x83FB,0x6852,
-	/* Array index: 0x1572 */ 0x83FD,0x6843,
-	/* Array index: 0x1572 */ 0x8403,0x6844,
-	/* Array index: 0x1572 */ 0x8404,0x463A,
-	/* Array index: 0x1572 */ 0x8407,0x6849,
-	/* Array index: 0x1572 */ 0x8413,0x6840,
-	/* Array index: 0x1572 */ 0x8420,0x684E,
-	/* Array index: 0x1572 */ 0x8422,0x684D,
-	/* Array index: 0x1572 */ 0x8429,0x476B,
-	/* Array index: 0x1572 */ 0x842A,0x6854,
-	/* Array index: 0x1572 */ 0x842C,0x685F,
-	/* Array index: 0x1572 */ 0x8431,0x337E,
-	/* Array index: 0x1572 */ 0x8435,0x6862,
-	/* Array index: 0x1572 */ 0x8438,0x6850,
-	/* Array index: 0x1572 */ 0x843C,0x6855,
-	/* Array index: 0x1572 */ 0x843D,0x4D6E,
-	/* Array index: 0x1572 */ 0x8446,0x685E,
-	/* Array index: 0x1572 */ 0x8449,0x4D55,
-	/* Array index: 0x1572 */ 0x844E,0x4E2A,
-	/* Array index: 0x1572 */ 0x8457,0x4378,
-	/* Array index: 0x1572 */ 0x845B,0x336B,
-	/* Array index: 0x1572 */ 0x8466,0x3031,
-	/* Array index: 0x1572 */ 0x8475,0x302A,
-	/* Array index: 0x1572 */ 0x8477,0x6858,
-	/* Array index: 0x1572 */ 0x8479,0x6861,
-	/* Array index: 0x1572 */ 0x847A,0x4978,
-	/* Array index: 0x1572 */ 0x8482,0x685C,
-	/* Array index: 0x1572 */ 0x8484,0x6857,
-	/* Array index: 0x1572 */ 0x848B,0x3E55,
-	/* Array index: 0x1572 */ 0x8490,0x3D2F,
-	/* Array index: 0x1572 */ 0x8494,0x3C2C,
-	/* Array index: 0x1572 */ 0x8499,0x4C58,
-	/* Array index: 0x1572 */ 0x849C,0x4947,
-	/* Array index: 0x1572 */ 0x849F,0x6867,
-	/* Array index: 0x1572 */ 0x84A1,0x6870,
-	/* Array index: 0x1572 */ 0x84AD,0x685A,
-	/* Array index: 0x1572 */ 0x84B2,0x3377,
-	/* Array index: 0x1572 */ 0x84BF,0x6866,
-	/* Array index: 0x1572 */ 0x84C1,0x686D,
-	/* Array index: 0x1572 */ 0x84C4,0x435F,
-	/* Array index: 0x1572 */ 0x84C6,0x686E,
-	/* Array index: 0x1572 */ 0x84D6,0x686F,
-	/* Array index: 0x1572 */ 0x84D9,0x6868,
-	/* Array index: 0x1572 */ 0x84DA,0x686B,
-	/* Array index: 0x1572 */ 0x84EC,0x4B29,
-	/* Array index: 0x1572 */ 0x84EE,0x4F21,
-	/* Array index: 0x1572 */ 0x84F4,0x6873,
-	/* Array index: 0x1572 */ 0x84FC,0x687A,
-	/* Array index: 0x1572 */ 0x84FF,0x6872,
-	/* Array index: 0x1572 */ 0x8500,0x3C43,
-	/* Array index: 0x1572 */ 0x8506,0x6851,
-	/* Array index: 0x1572 */ 0x851F,0x6877,
-	/* Array index: 0x1572 */ 0x8521,0x6871,
-	/* Array index: 0x1572 */ 0x8526,0x4455,
-	/* Array index: 0x1572 */ 0x852C,0x6876,
-	/* Array index: 0x1572 */ 0x852D,0x307E,
-	/* Array index: 0x1572 */ 0x8535,0x4222,
-	/* Array index: 0x1572 */ 0x853D,0x4A43,
-	/* Array index: 0x1572 */ 0x8540,0x687B,
-	/* Array index: 0x1572 */ 0x8541,0x6921,
-	/* Array index: 0x1572 */ 0x8543,0x4859,
-	/* Array index: 0x1572 */ 0x854E,0x363E,
-	/* Array index: 0x1572 */ 0x8555,0x6924,
-	/* Array index: 0x1572 */ 0x8557,0x4979,
-	/* Array index: 0x1572 */ 0x8558,0x687D,
-	/* Array index: 0x1572 */ 0x855A,0x6856,
-	/* Array index: 0x1572 */ 0x8563,0x687C,
-	/* Array index: 0x1572 */ 0x856D,0x692B,
-	/* Array index: 0x1572 */ 0x8577,0x6931,
-	/* Array index: 0x1572 */ 0x857E,0x6932,
-	/* Array index: 0x1572 */ 0x8580,0x6925,
-	/* Array index: 0x1572 */ 0x8584,0x4776,
-	/* Array index: 0x1572 */ 0x8587,0x692F,
-	/* Array index: 0x1572 */ 0x8588,0x6927,
-	/* Array index: 0x1572 */ 0x858A,0x6929,
-	/* Array index: 0x1572 */ 0x8590,0x6933,
-	/* Array index: 0x1572 */ 0x8591,0x6928,
-	/* Array index: 0x1572 */ 0x8594,0x692C,
-	/* Array index: 0x1572 */ 0x8597,0x3172,
-	/* Array index: 0x1572 */ 0x8599,0x4665,
-	/* Array index: 0x1572 */ 0x859B,0x692D,
-	/* Array index: 0x1572 */ 0x859C,0x6930,
-	/* Array index: 0x1572 */ 0x85A4,0x6926,
-	/* Array index: 0x1572 */ 0x85B9,0x6937,
-	/* Array index: 0x1572 */ 0x85BA,0x6935,
-	/* Array index: 0x1572 */ 0x85C1,0x4F4E,
-	/* Array index: 0x1572 */ 0x85C9,0x6934,
-	/* Array index: 0x1572 */ 0x85CD,0x4D75,
-	/* Array index: 0x1572 */ 0x85CF,0x6936,
-	/* Array index: 0x1572 */ 0x85D0,0x6938,
-	/* Array index: 0x1572 */ 0x85D5,0x6939,
-	/* Array index: 0x1572 */ 0x85DC,0x693C,
-	/* Array index: 0x1572 */ 0x85DD,0x693A,
-	/* Array index: 0x1572 */ 0x85E4,0x4623,
-	/* Array index: 0x1572 */ 0x85E5,0x693B,
-	/* Array index: 0x1572 */ 0x85E9,0x484D,
-	/* Array index: 0x1572 */ 0x85EA,0x692E,
-	/* Array index: 0x1572 */ 0x85FE,0x6941,
-	/* Array index: 0x1572 */ 0x8602,0x6922,
-	/* Array index: 0x1572 */ 0x8606,0x6943,
-	/* Array index: 0x1572 */ 0x8607,0x4149,
-	/* Array index: 0x1572 */ 0x860A,0x693E,
-	/* Array index: 0x1572 */ 0x860B,0x6940,
-	/* Array index: 0x1572 */ 0x8613,0x693F,
-	/* Array index: 0x1572 */ 0x8616,0x5D31,
-	/* Array index: 0x1572 */ 0x8617,0x5D22,
-	/* Array index: 0x1572 */ 0x861A,0x6945,
-	/* Array index: 0x1572 */ 0x8622,0x6944,
-	/* Array index: 0x1572 */ 0x862D,0x4D76,
-	/* Array index: 0x1572 */ 0x862F,0x623C,
-	/* Array index: 0x1572 */ 0x8630,0x6946,
-	/* Array index: 0x1572 */ 0x863F,0x6947,
-	/* Array index: 0x1572 */ 0x864D,0x6948,
-	/* Array index: 0x1572 */ 0x864E,0x3857,
-	/* Array index: 0x1572 */ 0x8650,0x3554,
-	/* Array index: 0x1572 */ 0x8654,0x694A,
-	/* Array index: 0x1572 */ 0x8655,0x515D,
-	/* Array index: 0x1572 */ 0x865A,0x3575,
-	/* Array index: 0x1572 */ 0x865C,0x4E3A,
-	/* Array index: 0x1572 */ 0x865E,0x3673,
-	/* Array index: 0x1572 */ 0x865F,0x694B,
-	/* Array index: 0x1572 */ 0x8667,0x694C,
-	/* Array index: 0x1572 */ 0x866B,0x436E,
-	/* Array index: 0x1572 */ 0x8671,0x694D,
-	/* Array index: 0x1572 */ 0x8679,0x467A,
-	/* Array index: 0x1572 */ 0x867B,0x303A,
-	/* Array index: 0x1572 */ 0x8693,0x694E,
-	/* Array index: 0x1572 */ 0x8695,0x3B3D,
-	/* Array index: 0x1572 */ 0x86A3,0x694F,
-	/* Array index: 0x1572 */ 0x86A4,0x4742,
-	/* Array index: 0x1572 */ 0x86AF,0x6955,
-	/* Array index: 0x1572 */ 0x86B0,0x6958,
-	/* Array index: 0x1572 */ 0x86B6,0x6954,
-	/* Array index: 0x1572 */ 0x86C4,0x6956,
-	/* Array index: 0x1572 */ 0x86C6,0x6957,
-	/* Array index: 0x1572 */ 0x86C7,0x3C58,
-	/* Array index: 0x1572 */ 0x86C9,0x6959,
-	/* Array index: 0x1572 */ 0x86CB,0x4341,
-	/* Array index: 0x1572 */ 0x86CD,0x3756,
-	/* Array index: 0x1572 */ 0x86CE,0x3342,
-	/* Array index: 0x1572 */ 0x86D4,0x695C,
-	/* Array index: 0x1572 */ 0x86D9,0x333F,
-	/* Array index: 0x1572 */ 0x86DB,0x6961,
-	/* Array index: 0x1572 */ 0x86DE,0x695D,
-	/* Array index: 0x1572 */ 0x86DF,0x6960,
-	/* Array index: 0x1572 */ 0x86E4,0x483A,
-	/* Array index: 0x1572 */ 0x86E9,0x695E,
-	/* Array index: 0x1572 */ 0x86F8,0x427D,
-	/* Array index: 0x1572 */ 0x86F9,0x696C,
-	/* Array index: 0x1572 */ 0x86FB,0x6968,
-	/* Array index: 0x1572 */ 0x86FE,0x326B,
-	/* Array index: 0x1572 */ 0x8700,0x6966,
-	/* Array index: 0x1572 */ 0x8702,0x4B2A,
-	/* Array index: 0x1572 */ 0x8703,0x6967,
-	/* Array index: 0x1572 */ 0x870D,0x696B,
-	/* Array index: 0x1572 */ 0x8711,0x6969,
-	/* Array index: 0x1572 */ 0x8712,0x6963,
-	/* Array index: 0x1572 */ 0x8718,0x4358,
-	/* Array index: 0x1572 */ 0x871A,0x6974,
-	/* Array index: 0x1572 */ 0x871C,0x4C2A,
-	/* Array index: 0x1572 */ 0x8725,0x6972,
-	/* Array index: 0x1572 */ 0x8729,0x6973,
-	/* Array index: 0x1572 */ 0x8734,0x696E,
-	/* Array index: 0x1572 */ 0x8737,0x6970,
-	/* Array index: 0x1572 */ 0x873B,0x6971,
-	/* Array index: 0x1572 */ 0x873F,0x696F,
-	/* Array index: 0x1572 */ 0x8749,0x4066,
-	/* Array index: 0x1572 */ 0x874B,0x4F39,
-	/* Array index: 0x1572 */ 0x874C,0x6978,
-	/* Array index: 0x1572 */ 0x874E,0x6979,
-	/* Array index: 0x1572 */ 0x8753,0x6A21,
-	/* Array index: 0x1572 */ 0x8755,0x3F2A,
-	/* Array index: 0x1572 */ 0x8757,0x697B,
-	/* Array index: 0x1572 */ 0x8759,0x697E,
-	/* Array index: 0x1572 */ 0x875F,0x6976,
-	/* Array index: 0x1572 */ 0x8760,0x6975,
-	/* Array index: 0x1572 */ 0x8763,0x6A22,
-	/* Array index: 0x1572 */ 0x8766,0x325C,
-	/* Array index: 0x1572 */ 0x8768,0x697C,
-	/* Array index: 0x1572 */ 0x876A,0x6A23,
-	/* Array index: 0x1572 */ 0x876E,0x697D,
-	/* Array index: 0x1572 */ 0x8774,0x697A,
-	/* Array index: 0x1572 */ 0x8776,0x4433,
-	/* Array index: 0x1572 */ 0x8778,0x6977,
-	/* Array index: 0x1572 */ 0x877F,0x4768,
-	/* Array index: 0x1572 */ 0x8782,0x6A27,
-	/* Array index: 0x1572 */ 0x878D,0x4D3B,
-	/* Array index: 0x1572 */ 0x879F,0x6A26,
-	/* Array index: 0x1572 */ 0x87A2,0x6A25,
-	/* Array index: 0x1572 */ 0x87AB,0x6A2E,
-	/* Array index: 0x1572 */ 0x87AF,0x6A28,
-	/* Array index: 0x1572 */ 0x87B3,0x6A30,
-	/* Array index: 0x1572 */ 0x87BA,0x4D66,
-	/* Array index: 0x1572 */ 0x87BB,0x6A33,
-	/* Array index: 0x1572 */ 0x87BD,0x6A2A,
-	/* Array index: 0x1572 */ 0x87C0,0x6A2B,
-	/* Array index: 0x1572 */ 0x87C4,0x6A2F,
-	/* Array index: 0x1572 */ 0x87C6,0x6A32,
-	/* Array index: 0x1572 */ 0x87C7,0x6A31,
-	/* Array index: 0x1572 */ 0x87CB,0x6A29,
-	/* Array index: 0x1572 */ 0x87D0,0x6A2C,
-	/* Array index: 0x1572 */ 0x87D2,0x6A3D,
-	/* Array index: 0x1572 */ 0x87E0,0x6A36,
-	/* Array index: 0x1572 */ 0x87EF,0x6A34,
-	/* Array index: 0x1572 */ 0x87F2,0x6A35,
-	/* Array index: 0x1572 */ 0x87F6,0x6A3A,
-	/* Array index: 0x1572 */ 0x87F7,0x6A3B,
-	/* Array index: 0x1572 */ 0x87F9,0x332A,
-	/* Array index: 0x1572 */ 0x87FB,0x3542,
-	/* Array index: 0x1572 */ 0x87FE,0x6A39,
-	/* Array index: 0x1572 */ 0x8805,0x6A24,
-	/* Array index: 0x1572 */ 0x8815,0x6A40,
-	/* Array index: 0x1572 */ 0x8816,0x6A3F,
-	/* Array index: 0x1572 */ 0x8827,0x6A46,
-	/* Array index: 0x1572 */ 0x8831,0x6A43,
-	/* Array index: 0x1572 */ 0x8836,0x6A44,
-	/* Array index: 0x1572 */ 0x8839,0x6A45,
-	/* Array index: 0x1572 */ 0x883B,0x6A47,
-	/* Array index: 0x1572 */ 0x8840,0x376C,
-	/* Array index: 0x1572 */ 0x8842,0x6A49,
-	/* Array index: 0x1572 */ 0x8844,0x6A48,
-	/* Array index: 0x1572 */ 0x8846,0x3D30,
-	/* Array index: 0x1572 */ 0x884C,0x3954,
-	/* Array index: 0x1572 */ 0x884D,0x5E27,
-	/* Array index: 0x1572 */ 0x8852,0x6A4A,
-	/* Array index: 0x1572 */ 0x8853,0x3D51,
-	/* Array index: 0x1572 */ 0x8857,0x3339,
-	/* Array index: 0x1572 */ 0x8859,0x6A4B,
-	/* Array index: 0x1572 */ 0x885B,0x3152,
-	/* Array index: 0x1572 */ 0x8868,0x493D,
-	/* Array index: 0x1572 */ 0x886B,0x6A4E,
-	/* Array index: 0x1572 */ 0x8870,0x3F6A,
-	/* Array index: 0x1572 */ 0x8872,0x6A55,
-	/* Array index: 0x1572 */ 0x8875,0x6A52,
-	/* Array index: 0x1572 */ 0x8877,0x436F,
-	/* Array index: 0x1572 */ 0x8888,0x3736,
-	/* Array index: 0x1572 */ 0x888B,0x425E,
-	/* Array index: 0x1572 */ 0x888D,0x6A5C,
-	/* Array index: 0x1572 */ 0x8892,0x6A58,
-	/* Array index: 0x1572 */ 0x8896,0x4235,
-	/* Array index: 0x1572 */ 0x8897,0x6A57,
-	/* Array index: 0x1572 */ 0x8899,0x6A5A,
-	/* Array index: 0x1572 */ 0x889E,0x6A51,
-	/* Array index: 0x1572 */ 0x88A2,0x6A5B,
-	/* Array index: 0x1572 */ 0x88A4,0x6A5D,
-	/* Array index: 0x1572 */ 0x88AB,0x486F,
-	/* Array index: 0x1572 */ 0x88AE,0x6A59,
-	/* Array index: 0x1572 */ 0x88B0,0x6A5E,
-	/* Array index: 0x1572 */ 0x88B1,0x6A60,
-	/* Array index: 0x1572 */ 0x88B4,0x3853,
-	/* Array index: 0x1572 */ 0x88B5,0x6A54,
-	/* Array index: 0x1572 */ 0x88B7,0x3041,
-	/* Array index: 0x1572 */ 0x88CF,0x4E22,
-	/* Array index: 0x1572 */ 0x88D4,0x6A63,
-	/* Array index: 0x1572 */ 0x88D5,0x4D35,
-	/* Array index: 0x1572 */ 0x88D8,0x6A64,
-	/* Array index: 0x1572 */ 0x88D9,0x6A65,
-	/* Array index: 0x1572 */ 0x88DC,0x4A64,
-	/* Array index: 0x1572 */ 0x88DD,0x6A66,
-	/* Array index: 0x1572 */ 0x88DF,0x3A40,
-	/* Array index: 0x1572 */ 0x88E1,0x4E23,
-	/* Array index: 0x1572 */ 0x88E8,0x6A6B,
-	/* Array index: 0x1572 */ 0x8902,0x6A68,
-	/* Array index: 0x1572 */ 0x8904,0x6A6D,
-	/* Array index: 0x1572 */ 0x8907,0x4A23,
-	/* Array index: 0x1572 */ 0x890A,0x6A6F,
-	/* Array index: 0x1572 */ 0x890C,0x6A6E,
-	/* Array index: 0x1572 */ 0x8910,0x336C,
-	/* Array index: 0x1572 */ 0x8912,0x4B2B,
-	/* Array index: 0x1572 */ 0x8913,0x6A70,
-	/* Array index: 0x1572 */ 0x891D,0x6A7C,
-	/* Array index: 0x1572 */ 0x891E,0x6A72,
-	/* Array index: 0x1572 */ 0x8925,0x6A73,
-	/* Array index: 0x1572 */ 0x892A,0x6A74,
-	/* Array index: 0x1572 */ 0x892B,0x6A75,
-	/* Array index: 0x1572 */ 0x8936,0x6A79,
-	/* Array index: 0x1572 */ 0x8938,0x6A7A,
-	/* Array index: 0x1572 */ 0x893B,0x6A78,
-	/* Array index: 0x1572 */ 0x8941,0x6A76,
-	/* Array index: 0x1572 */ 0x8943,0x6A71,
-	/* Array index: 0x1572 */ 0x8944,0x6A77,
-	/* Array index: 0x1572 */ 0x894C,0x6A7B,
-	/* Array index: 0x1572 */ 0x894D,0x7037,
-	/* Array index: 0x1572 */ 0x8956,0x3228,
-	/* Array index: 0x1572 */ 0x8964,0x6B22,
-	/* Array index: 0x1572 */ 0x8966,0x6B21,
-	/* Array index: 0x1572 */ 0x896A,0x6B24,
-	/* Array index: 0x1572 */ 0x896D,0x6B23,
-	/* Array index: 0x1572 */ 0x896F,0x6B25,
-	/* Array index: 0x1572 */ 0x8972,0x3D31,
-	/* Array index: 0x1572 */ 0x8974,0x6B26,
-	/* Array index: 0x1572 */ 0x8977,0x6B27,
-	/* Array index: 0x1572 */ 0x897E,0x6B28,
-	/* Array index: 0x1572 */ 0x897F,0x403E,
-	/* Array index: 0x1572 */ 0x8981,0x4D57,
-	/* Array index: 0x1572 */ 0x8983,0x6B29,
-	/* Array index: 0x1572 */ 0x898F,0x352C,
-	/* Array index: 0x1572 */ 0x8993,0x6B2C,
-	/* Array index: 0x1572 */ 0x89A1,0x6B2E,
-	/* Array index: 0x1572 */ 0x89AF,0x6B32,
-	/* Array index: 0x1572 */ 0x89B2,0x6B33,
-	/* Array index: 0x1572 */ 0x89B3,0x3451,
-	/* Array index: 0x1572 */ 0x89BA,0x6B34,
-	/* Array index: 0x1572 */ 0x89BD,0x6B35,
-	/* Array index: 0x1572 */ 0x89BF,0x6B36,
-	/* Array index: 0x1572 */ 0x89C0,0x6B37,
-	/* Array index: 0x1572 */ 0x89D2,0x3351,
-	/* Array index: 0x1572 */ 0x89DA,0x6B38,
-	/* Array index: 0x1572 */ 0x89DC,0x6B39,
-	/* Array index: 0x1572 */ 0x89DD,0x6B3A,
-	/* Array index: 0x1572 */ 0x89E3,0x3272,
-	/* Array index: 0x1572 */ 0x89E6,0x3F28,
-	/* Array index: 0x1572 */ 0x89E7,0x6B3B,
-	/* Array index: 0x1572 */ 0x89F4,0x6B3C,
-	/* Array index: 0x1572 */ 0x89F8,0x6B3D,
-	/* Array index: 0x1572 */ 0x8A00,0x3840,
-	/* Array index: 0x1572 */ 0x8A02,0x447B,
-	/* Array index: 0x1572 */ 0x8A03,0x6B3E,
-	/* Array index: 0x1572 */ 0x8A08,0x3757,
-	/* Array index: 0x1572 */ 0x8A0A,0x3F56,
-	/* Array index: 0x1572 */ 0x8A0C,0x6B41,
-	/* Array index: 0x1572 */ 0x8A0E,0x4624,
-	/* Array index: 0x1572 */ 0x8A10,0x6B40,
-	/* Array index: 0x1572 */ 0x8A13,0x3731,
-	/* Array index: 0x1572 */ 0x8A1B,0x6B42,
-	/* Array index: 0x1572 */ 0x8A1D,0x6B43,
-	/* Array index: 0x1572 */ 0x8A1F,0x3E59,
-	/* Array index: 0x1572 */ 0x8A23,0x376D,
-	/* Array index: 0x1572 */ 0x8A25,0x6B44,
-	/* Array index: 0x1572 */ 0x8A2A,0x4B2C,
-	/* Array index: 0x1572 */ 0x8A2D,0x405F,
-	/* Array index: 0x1572 */ 0x8A31,0x3576,
-	/* Array index: 0x1572 */ 0x8A33,0x4C75,
-	/* Array index: 0x1572 */ 0x8A34,0x414A,
-	/* Array index: 0x1572 */ 0x8A36,0x6B45,
-	/* Array index: 0x1572 */ 0x8A41,0x6B46,
-	/* Array index: 0x1572 */ 0x8A46,0x6B49,
-	/* Array index: 0x1572 */ 0x8A48,0x6B4A,
-	/* Array index: 0x1572 */ 0x8A5B,0x6B47,
-	/* Array index: 0x1572 */ 0x8A5E,0x3B6C,
-	/* Array index: 0x1572 */ 0x8A60,0x3153,
-	/* Array index: 0x1572 */ 0x8A62,0x6B4E,
-	/* Array index: 0x1572 */ 0x8A63,0x3758,
-	/* Array index: 0x1572 */ 0x8A66,0x3B6E,
-	/* Array index: 0x1572 */ 0x8A7C,0x6B4B,
-	/* Array index: 0x1572 */ 0x8A82,0x6B50,
-	/* Array index: 0x1572 */ 0x8A84,0x6B51,
-	/* Array index: 0x1572 */ 0x8A85,0x6B4F,
-	/* Array index: 0x1572 */ 0x8A87,0x3858,
-	/* Array index: 0x1572 */ 0x8A89,0x4D40,
-	/* Array index: 0x1572 */ 0x8A8C,0x3B6F,
-	/* Array index: 0x1572 */ 0x8A8D,0x4727,
-	/* Array index: 0x1572 */ 0x8A91,0x6B54,
-	/* Array index: 0x1572 */ 0x8A93,0x4040,
-	/* Array index: 0x1572 */ 0x8A95,0x4342,
-	/* Array index: 0x1572 */ 0x8A98,0x4D36,
-	/* Array index: 0x1572 */ 0x8A9A,0x6B57,
-	/* Array index: 0x1572 */ 0x8A9E,0x386C,
-	/* Array index: 0x1572 */ 0x8AAC,0x4062,
-	/* Array index: 0x1572 */ 0x8AAD,0x4649,
-	/* Array index: 0x1572 */ 0x8AB0,0x432F,
-	/* Array index: 0x1572 */ 0x8AB2,0x325D,
-	/* Array index: 0x1572 */ 0x8AB9,0x4870,
-	/* Array index: 0x1572 */ 0x8ABC,0x3543,
-	/* Array index: 0x1572 */ 0x8ABF,0x4434,
-	/* Array index: 0x1572 */ 0x8AC2,0x6B5B,
-	/* Array index: 0x1572 */ 0x8AC4,0x6B59,
-	/* Array index: 0x1572 */ 0x8AC7,0x434C,
-	/* Array index: 0x1572 */ 0x8AD2,0x4E4A,
-	/* Array index: 0x1572 */ 0x8AD6,0x4F40,
-	/* Array index: 0x1572 */ 0x8AEB,0x6B5D,
-	/* Array index: 0x1572 */ 0x8AED,0x4D21,
-	/* Array index: 0x1572 */ 0x8AEE,0x3B70,
-	/* Array index: 0x1572 */ 0x8AF1,0x6B61,
-	/* Array index: 0x1572 */ 0x8AF3,0x6B5E,
-	/* Array index: 0x1572 */ 0x8AF7,0x6B65,
-	/* Array index: 0x1572 */ 0x8AF8,0x3D74,
-	/* Array index: 0x1572 */ 0x8AFA,0x3841,
-	/* Array index: 0x1572 */ 0x8B07,0x6B69,
-	/* Array index: 0x1572 */ 0x8B0C,0x6B68,
-	/* Array index: 0x1572 */ 0x8B0E,0x4666,
-	/* Array index: 0x1572 */ 0x8B10,0x6B6D,
-	/* Array index: 0x1572 */ 0x8B14,0x6B62,
-	/* Array index: 0x1572 */ 0x8B26,0x6B72,
-	/* Array index: 0x1572 */ 0x8B28,0x6B75,
-	/* Array index: 0x1572 */ 0x8B2B,0x6B73,
-	/* Array index: 0x1572 */ 0x8B2C,0x4935,
-	/* Array index: 0x1572 */ 0x8B33,0x6B70,
-	/* Array index: 0x1572 */ 0x8B39,0x3660,
-	/* Array index: 0x1572 */ 0x8B3E,0x6B74,
-	/* Array index: 0x1572 */ 0x8B41,0x6B76,
-	/* Array index: 0x1572 */ 0x8B49,0x6B7A,
-	/* Array index: 0x1572 */ 0x8B4C,0x6B77,
-	/* Array index: 0x1572 */ 0x8B4E,0x6B79,
-	/* Array index: 0x1572 */ 0x8B4F,0x6B78,
-	/* Array index: 0x1572 */ 0x8B56,0x6B7B,
-	/* Array index: 0x1572 */ 0x8B5F,0x6C21,
-	/* Array index: 0x1572 */ 0x8B66,0x3759,
-	/* Array index: 0x1572 */ 0x8B77,0x386E,
-	/* Array index: 0x1572 */ 0x8B7D,0x6C25,
-	/* Array index: 0x1572 */ 0x8B80,0x6C26,
-	/* Array index: 0x1572 */ 0x8B83,0x3B3E,
-	/* Array index: 0x1572 */ 0x8B8A,0x5A4E,
-	/* Array index: 0x1572 */ 0x8B8C,0x6C27,
-	/* Array index: 0x1572 */ 0x8B8E,0x6C28,
-	/* Array index: 0x1572 */ 0x8B90,0x3D32,
-	/* Array index: 0x1572 */ 0x8B92,0x6C29,
-	/* Array index: 0x1572 */ 0x8B93,0x6C2A,
-	/* Array index: 0x1572 */ 0x8B96,0x6C2B,
-	/* Array index: 0x1572 */ 0x8B99,0x6C2C,
-	/* Array index: 0x1572 */ 0x8B9A,0x6C2D,
-	/* Array index: 0x1572 */ 0x8C37,0x432B,
-	/* Array index: 0x1572 */ 0x8C3A,0x6C2E,
-	/* Array index: 0x1572 */ 0x8C3F,0x6C30,
-	/* Array index: 0x1572 */ 0x8C41,0x6C2F,
-	/* Array index: 0x1572 */ 0x8C46,0x4626,
-	/* Array index: 0x1572 */ 0x8C48,0x6C31,
-	/* Array index: 0x1572 */ 0x8C4A,0x4B2D,
-	/* Array index: 0x1572 */ 0x8C4C,0x6C32,
-	/* Array index: 0x1572 */ 0x8C4E,0x6C33,
-	/* Array index: 0x1572 */ 0x8C50,0x6C34,
-	/* Array index: 0x1572 */ 0x8C55,0x6C35,
-	/* Array index: 0x1572 */ 0x8C5A,0x465A,
-	/* Array index: 0x1572 */ 0x8C61,0x3E5D,
-	/* Array index: 0x1572 */ 0x8C62,0x6C36,
-	/* Array index: 0x1572 */ 0x8C82,0x6C3A,
-	/* Array index: 0x1572 */ 0x8C85,0x6C3C,
-	/* Array index: 0x1572 */ 0x8C94,0x6C40,
-	/* Array index: 0x1572 */ 0x8C98,0x6C42,
-	/* Array index: 0x1572 */ 0x8CD1,0x4678,
-	/* Array index: 0x1572 */ 0x8CD3,0x4950,
-	/* Array index: 0x1572 */ 0x8CEA,0x3C41,
-	/* Array index: 0x1572 */ 0x8CED,0x4552,
-	/* Array index: 0x1572 */ 0x8D64,0x4056,
-	/* Array index: 0x1572 */ 0x8D66,0x3C4F,
-	/* Array index: 0x1572 */ 0x8D67,0x6C5F,
-	/* Array index: 0x1572 */ 0x8D6B,0x3352,
-	/* Array index: 0x1572 */ 0x8D6D,0x6C60,
-	/* Array index: 0x1572 */ 0x8D77,0x352F,
-	/* Array index: 0x1572 */ 0x8D81,0x6C63,
-	/* Array index: 0x1572 */ 0x8D85,0x4436,
-	/* Array index: 0x1572 */ 0x8D8A,0x315B,
-	/* Array index: 0x1572 */ 0x8D99,0x6C64,
-	/* Array index: 0x1572 */ 0x8DA3,0x3C71,
-	/* Array index: 0x1572 */ 0x8DA8,0x3F76,
-	/* Array index: 0x1572 */ 0x8DB3,0x422D,
-	/* Array index: 0x1572 */ 0x8DBA,0x6C67,
-	/* Array index: 0x1572 */ 0x8DBE,0x6C66,
-	/* Array index: 0x1572 */ 0x8DC2,0x6C65,
-	/* Array index: 0x1572 */ 0x8DCB,0x6C6D,
-	/* Array index: 0x1572 */ 0x8DCC,0x6C6B,
-	/* Array index: 0x1572 */ 0x8DCF,0x6C68,
-	/* Array index: 0x1572 */ 0x8DD6,0x6C6A,
-	/* Array index: 0x1572 */ 0x8DDA,0x6C69,
-	/* Array index: 0x1572 */ 0x8DDB,0x6C6C,
-	/* Array index: 0x1572 */ 0x8DDD,0x3577,
-	/* Array index: 0x1572 */ 0x8DDF,0x6C70,
-	/* Array index: 0x1572 */ 0x8DE1,0x4057,
-	/* Array index: 0x1572 */ 0x8DE3,0x6C71,
-	/* Array index: 0x1572 */ 0x8DE8,0x3859,
-	/* Array index: 0x1572 */ 0x8DEA,0x6C6E,
-	/* Array index: 0x1572 */ 0x8DEB,0x6C6F,
-	/* Array index: 0x1572 */ 0x8DEF,0x4F29,
-	/* Array index: 0x1572 */ 0x8DF3,0x4437,
-	/* Array index: 0x1572 */ 0x8DF5,0x4129,
-	/* Array index: 0x1572 */ 0x8DFC,0x6C72,
-	/* Array index: 0x1572 */ 0x8DFF,0x6C75,
-	/* Array index: 0x1572 */ 0x8E0F,0x4627,
-	/* Array index: 0x1572 */ 0x8E10,0x6C78,
-	/* Array index: 0x1572 */ 0x8E2A,0x6D29,
-	/* Array index: 0x1572 */ 0x8E30,0x6C7C,
-	/* Array index: 0x1572 */ 0x8E34,0x6C7D,
-	/* Array index: 0x1572 */ 0x8E35,0x6C7B,
-	/* Array index: 0x1572 */ 0x8E42,0x6C7A,
-	/* Array index: 0x1572 */ 0x8E44,0x447D,
-	/* Array index: 0x1572 */ 0x8E50,0x6D24,
-	/* Array index: 0x1572 */ 0x8E55,0x6D2B,
-	/* Array index: 0x1572 */ 0x8E59,0x6D26,
-	/* Array index: 0x1572 */ 0x8E5F,0x4058,
-	/* Array index: 0x1572 */ 0x8E60,0x6D28,
-	/* Array index: 0x1572 */ 0x8E63,0x6D2A,
-	/* Array index: 0x1572 */ 0x8E64,0x6D27,
-	/* Array index: 0x1572 */ 0x8E72,0x6D2D,
-	/* Array index: 0x1572 */ 0x8E74,0x3D33,
-	/* Array index: 0x1572 */ 0x8E76,0x6D2C,
-	/* Array index: 0x1572 */ 0x8E7C,0x6D2E,
-	/* Array index: 0x1572 */ 0x8E81,0x6D2F,
-	/* Array index: 0x1572 */ 0x8E84,0x6D32,
-	/* Array index: 0x1572 */ 0x8E85,0x6D31,
-	/* Array index: 0x1572 */ 0x8E87,0x6D30,
-	/* Array index: 0x1572 */ 0x8E8A,0x6D34,
-	/* Array index: 0x1572 */ 0x8E8B,0x6D33,
-	/* Array index: 0x1572 */ 0x8E8D,0x4C76,
-	/* Array index: 0x1572 */ 0x8E91,0x6D36,
-	/* Array index: 0x1572 */ 0x8E93,0x6D35,
-	/* Array index: 0x1572 */ 0x8E94,0x6D37,
-	/* Array index: 0x1572 */ 0x8E99,0x6D38,
-	/* Array index: 0x1572 */ 0x8EA1,0x6D3A,
-	/* Array index: 0x1572 */ 0x8EBE,0x6D3F,
-	/* Array index: 0x1572 */ 0x8EC5,0x6D40,
-	/* Array index: 0x1572 */ 0x8EC6,0x6D3D,
-	/* Array index: 0x1572 */ 0x8ED2,0x382E,
-	/* Array index: 0x1572 */ 0x8EDB,0x6D43,
-	/* Array index: 0x1572 */ 0x8EDF,0x4670,
-	/* Array index: 0x1572 */ 0x8EE2,0x453E,
-	/* Array index: 0x1572 */ 0x8EE3,0x6D44,
-	/* Array index: 0x1572 */ 0x8EEB,0x6D47,
-	/* Array index: 0x1572 */ 0x8EF8,0x3C34,
-	/* Array index: 0x1572 */ 0x8F03,0x3353,
-	/* Array index: 0x1572 */ 0x8F05,0x6D4A,
-	/* Array index: 0x1572 */ 0x8F09,0x3A5C,
-	/* Array index: 0x1572 */ 0x8F0A,0x6D49,
-	/* Array index: 0x1572 */ 0x8F0C,0x6D52,
-	/* Array index: 0x1572 */ 0x8F26,0x6D53,
-	/* Array index: 0x1572 */ 0x8F29,0x475A,
-	/* Array index: 0x1572 */ 0x8F2A,0x4E58,
-	/* Array index: 0x1572 */ 0x8F2F,0x3D34,
-	/* Array index: 0x1572 */ 0x8F33,0x6D54,
-	/* Array index: 0x1572 */ 0x8F38,0x4D22,
-	/* Array index: 0x1572 */ 0x8F39,0x6D56,
-	/* Array index: 0x1572 */ 0x8F3B,0x6D55,
-	/* Array index: 0x1572 */ 0x8F3E,0x6D59,
-	/* Array index: 0x1572 */ 0x8F3F,0x4D41,
-	/* Array index: 0x1572 */ 0x8F49,0x6D5B,
-	/* Array index: 0x1572 */ 0x8F57,0x6D5E,
-	/* Array index: 0x1572 */ 0x8F5C,0x6D5F,
-	/* Array index: 0x1572 */ 0x8FA3,0x6D65,
-	/* Array index: 0x1572 */ 0x8FA7,0x5221,
-	/* Array index: 0x1572 */ 0x8FA8,0x517E,
-	/* Array index: 0x1572 */ 0x8FB7,0x6D68,
-	/* Array index: 0x1572 */ 0x8FBF,0x4329,
-	/* Array index: 0x1572 */ 0x8FC2,0x312A,
-	/* Array index: 0x1572 */ 0x8FC4,0x4B78,
-	/* Array index: 0x1572 */ 0x8FC5,0x3F57,
-	/* Array index: 0x1572 */ 0x8FCE,0x375E,
-	/* Array index: 0x1572 */ 0x8FD1,0x3661,
-	/* Array index: 0x1572 */ 0x8FD4,0x4A56,
-	/* Array index: 0x1572 */ 0x8FDA,0x6D69,
-	/* Array index: 0x1572 */ 0x8FE2,0x6D6B,
-	/* Array index: 0x1572 */ 0x8FF4,0x6D6F,
-	/* Array index: 0x1572 */ 0x8FFD,0x4449,
-	/* Array index: 0x1572 */ 0x9000,0x4260,
-	/* Array index: 0x1572 */ 0x9001,0x4177,
-	/* Array index: 0x1572 */ 0x9003,0x4628,
-	/* Array index: 0x1572 */ 0x9005,0x6D70,
-	/* Array index: 0x1572 */ 0x9006,0x3555,
-	/* Array index: 0x1572 */ 0x9027,0x6D7A,
-	/* Array index: 0x1572 */ 0x902E,0x4261,
-	/* Array index: 0x1572 */ 0x9031,0x3D35,
-	/* Array index: 0x1572 */ 0x9032,0x3F4A,
-	/* Array index: 0x1572 */ 0x903C,0x492F,
-	/* Array index: 0x1572 */ 0x903E,0x6E27,
-	/* Array index: 0x1572 */ 0x9041,0x465B,
-	/* Array index: 0x1572 */ 0x9042,0x3F6B,
-	/* Array index: 0x1572 */ 0x9045,0x4359,
-	/* Array index: 0x1572 */ 0x905C,0x423D,
-	/* Array index: 0x1572 */ 0x905E,0x6E2A,
-	/* Array index: 0x1572 */ 0x9060,0x3173,
-	/* Array index: 0x1572 */ 0x9061,0x414C,
-	/* Array index: 0x1572 */ 0x9063,0x382F,
-	/* Array index: 0x1572 */ 0x9065,0x4D5A,
-	/* Array index: 0x1572 */ 0x9068,0x6E2B,
-	/* Array index: 0x1572 */ 0x9069,0x452C,
-	/* Array index: 0x1572 */ 0x9072,0x6E2F,
-	/* Array index: 0x1572 */ 0x9087,0x6D6E,
-	/* Array index: 0x1572 */ 0x9089,0x6E35,
-	/* Array index: 0x1572 */ 0x908A,0x6E34,
-	/* Array index: 0x1572 */ 0x908F,0x6E36,
-	/* Array index: 0x1572 */ 0x9091,0x4D38,
-	/* Array index: 0x1572 */ 0x90A3,0x4661,
-	/* Array index: 0x1572 */ 0x90A6,0x4B2E,
-	/* Array index: 0x1572 */ 0x90A8,0x6E37,
-	/* Array index: 0x1572 */ 0x90AA,0x3C59,
-	/* Array index: 0x1572 */ 0x90AF,0x6E38,
-	/* Array index: 0x1572 */ 0x90B1,0x6E39,
-	/* Array index: 0x1572 */ 0x90B5,0x6E3A,
-	/* Array index: 0x1572 */ 0x90B8,0x4521,
-	/* Array index: 0x1572 */ 0x90C1,0x306A,
-	/* Array index: 0x1572 */ 0x90CA,0x3959,
-	/* Array index: 0x1572 */ 0x90CE,0x4F3A,
-	/* Array index: 0x1572 */ 0x90DB,0x6E3E,
-	/* Array index: 0x1572 */ 0x90E1,0x3734,
-	/* Array index: 0x1572 */ 0x90E2,0x6E3B,
-	/* Array index: 0x1572 */ 0x90E4,0x6E3C,
-	/* Array index: 0x1572 */ 0x90E8,0x4974,
-	/* Array index: 0x1572 */ 0x90ED,0x3354,
-	/* Array index: 0x1572 */ 0x90F5,0x4D39,
-	/* Array index: 0x1572 */ 0x90F7,0x363F,
-	/* Array index: 0x1572 */ 0x90FD,0x4554,
-	/* Array index: 0x1572 */ 0x9102,0x6E3F,
-	/* Array index: 0x1572 */ 0x9112,0x6E40,
-	/* Array index: 0x1572 */ 0x9119,0x6E41,
-	/* Array index: 0x1572 */ 0x912D,0x4522,
-	/* Array index: 0x1572 */ 0x9130,0x6E43,
-	/* Array index: 0x1572 */ 0x9132,0x6E42,
-	/* Array index: 0x1572 */ 0x9152,0x3C72,
-	/* Array index: 0x1572 */ 0x9154,0x3F6C,
-	/* Array index: 0x1572 */ 0x9156,0x6E45,
-	/* Array index: 0x1572 */ 0x9158,0x6E46,
-	/* Array index: 0x1572 */ 0x9162,0x3F5D,
-	/* Array index: 0x1572 */ 0x9163,0x6E47,
-	/* Array index: 0x1572 */ 0x9165,0x6E48,
-	/* Array index: 0x1572 */ 0x9169,0x6E49,
-	/* Array index: 0x1572 */ 0x916A,0x4D6F,
-	/* Array index: 0x1572 */ 0x916C,0x3D37,
-	/* Array index: 0x1572 */ 0x9172,0x6E4B,
-	/* Array index: 0x1572 */ 0x9173,0x6E4A,
-	/* Array index: 0x1572 */ 0x9175,0x395A,
-	/* Array index: 0x1572 */ 0x9177,0x3973,
-	/* Array index: 0x1572 */ 0x9178,0x3B40,
-	/* Array index: 0x1572 */ 0x9182,0x6E4E,
-	/* Array index: 0x1572 */ 0x9187,0x3D66,
-	/* Array index: 0x1572 */ 0x9189,0x6E4D,
-	/* Array index: 0x1572 */ 0x918B,0x6E4C,
-	/* Array index: 0x1572 */ 0x918D,0x4269,
-	/* Array index: 0x1572 */ 0x9190,0x386F,
-	/* Array index: 0x1572 */ 0x9192,0x4043,
-	/* Array index: 0x1572 */ 0x9197,0x4830,
-	/* Array index: 0x1572 */ 0x919C,0x3D39,
-	/* Array index: 0x1572 */ 0x91A2,0x6E4F,
-	/* Array index: 0x1572 */ 0x91A4,0x3E5F,
-	/* Array index: 0x1572 */ 0x91AA,0x6E52,
-	/* Array index: 0x1572 */ 0x91AB,0x6E50,
-	/* Array index: 0x1572 */ 0x91AF,0x6E51,
-	/* Array index: 0x1572 */ 0x91B4,0x6E54,
-	/* Array index: 0x1572 */ 0x91B5,0x6E53,
-	/* Array index: 0x1572 */ 0x91B8,0x3E7A,
-	/* Array index: 0x1572 */ 0x91BA,0x6E55,
-	/* Array index: 0x1572 */ 0x91C0,0x6E56,
-	/* Array index: 0x1572 */ 0x91C1,0x6E57,
-	/* Array index: 0x1572 */ 0x91D6,0x6E5B,
-	/* Array index: 0x1572 */ 0x91D8,0x4523,
-	/* Array index: 0x1572 */ 0x91F5,0x6E60,
-	/* Array index: 0x1572 */ 0x91F6,0x6E61,
-	/* Array index: 0x1572 */ 0x91FC,0x6E5F,
-	/* Array index: 0x1572 */ 0x91FF,0x6E63,
-	/* Array index: 0x1572 */ 0x920D,0x465F,
-	/* Array index: 0x1572 */ 0x920E,0x3343,
-	/* Array index: 0x1572 */ 0x9211,0x6E67,
-	/* Array index: 0x1572 */ 0x9214,0x6E64,
-	/* Array index: 0x1572 */ 0x9215,0x6E66,
-	/* Array index: 0x1572 */ 0x921E,0x6E62,
-	/* Array index: 0x1572 */ 0x9229,0x6F4F,
-	/* Array index: 0x1572 */ 0x922C,0x6E65,
-	/* Array index: 0x1572 */ 0x9234,0x4E6B,
-	/* Array index: 0x1572 */ 0x9237,0x385A,
-	/* Array index: 0x1572 */ 0x923F,0x6E6F,
-	/* Array index: 0x1572 */ 0x9244,0x4534,
-	/* Array index: 0x1572 */ 0x9245,0x6E6A,
-	/* Array index: 0x1572 */ 0x9248,0x6E6D,
-	/* Array index: 0x1572 */ 0x9249,0x6E6B,
-	/* Array index: 0x1572 */ 0x924B,0x6E70,
-	/* Array index: 0x1572 */ 0x9250,0x6E71,
-	/* Array index: 0x1572 */ 0x9257,0x6E69,
-	/* Array index: 0x1572 */ 0x925A,0x6E76,
-	/* Array index: 0x1572 */ 0x925B,0x3174,
-	/* Array index: 0x1572 */ 0x925E,0x6E68,
-	/* Array index: 0x1572 */ 0x9262,0x482D,
-	/* Array index: 0x1572 */ 0x9264,0x6E6C,
-	/* Array index: 0x1572 */ 0x9266,0x3E60,
-	/* Array index: 0x1572 */ 0x9271,0x395B,
-	/* Array index: 0x1572 */ 0x927E,0x4B48,
-	/* Array index: 0x1572 */ 0x9280,0x3664,
-	/* Array index: 0x1572 */ 0x9283,0x3D46,
-	/* Array index: 0x1572 */ 0x9285,0x463C,
-	/* Array index: 0x1572 */ 0x9291,0x412D,
-	/* Array index: 0x1572 */ 0x9293,0x6E74,
-	/* Array index: 0x1572 */ 0x9295,0x6E6E,
-	/* Array index: 0x1572 */ 0x9296,0x6E73,
-	/* Array index: 0x1572 */ 0x92AD,0x412C,
-	/* Array index: 0x1572 */ 0x92B7,0x6E79,
-	/* Array index: 0x1572 */ 0x92B9,0x6E78,
-	/* Array index: 0x1572 */ 0x92CF,0x6E77,
-	/* Array index: 0x1572 */ 0x92D2,0x4B2F,
-	/* Array index: 0x1572 */ 0x92E4,0x3D7B,
-	/* Array index: 0x1572 */ 0x92E9,0x6E7A,
-	/* Array index: 0x1572 */ 0x92EA,0x4A5F,
-	/* Array index: 0x1572 */ 0x92ED,0x3154,
-	/* Array index: 0x1572 */ 0x92F2,0x4946,
-	/* Array index: 0x1572 */ 0x92F3,0x4372,
-	/* Array index: 0x1572 */ 0x92F8,0x3578,
-	/* Array index: 0x1572 */ 0x92FA,0x6E7C,
-	/* Array index: 0x1572 */ 0x92FC,0x395D,
-	/* Array index: 0x1572 */ 0x9306,0x3B2C,
-	/* Array index: 0x1572 */ 0x930F,0x6E7B,
-	/* Array index: 0x1572 */ 0x9310,0x3F6D,
-	/* Array index: 0x1572 */ 0x9320,0x3E7B,
-	/* Array index: 0x1572 */ 0x9322,0x6F22,
-	/* Array index: 0x1572 */ 0x9323,0x6F24,
-	/* Array index: 0x1572 */ 0x9326,0x3653,
-	/* Array index: 0x1572 */ 0x9328,0x4945,
-	/* Array index: 0x1572 */ 0x9332,0x4F3F,
-	/* Array index: 0x1572 */ 0x9335,0x6F26,
-	/* Array index: 0x1572 */ 0x933A,0x6F25,
-	/* Array index: 0x1572 */ 0x933B,0x6F27,
-	/* Array index: 0x1572 */ 0x9344,0x6E7D,
-	/* Array index: 0x1572 */ 0x934B,0x4669,
-	/* Array index: 0x1572 */ 0x934D,0x4555,
-	/* Array index: 0x1572 */ 0x9354,0x4457,
-	/* Array index: 0x1572 */ 0x9356,0x6F2C,
-	/* Array index: 0x1572 */ 0x935B,0x4343,
-	/* Array index: 0x1572 */ 0x935C,0x6F28,
-	/* Array index: 0x1572 */ 0x9360,0x6F29,
-	/* Array index: 0x1572 */ 0x936C,0x372D,
-	/* Array index: 0x1572 */ 0x936E,0x6F2B,
-	/* Array index: 0x1572 */ 0x9375,0x3830,
-	/* Array index: 0x1572 */ 0x937C,0x6F2A,
-	/* Array index: 0x1572 */ 0x937E,0x3E61,
-	/* Array index: 0x1572 */ 0x938C,0x3379,
-	/* Array index: 0x1572 */ 0x9394,0x6F30,
-	/* Array index: 0x1572 */ 0x9396,0x3A3F,
-	/* Array index: 0x1572 */ 0x9397,0x4179,
-	/* Array index: 0x1572 */ 0x939A,0x444A,
-	/* Array index: 0x1572 */ 0x93A7,0x333B,
-	/* Array index: 0x1572 */ 0x93B9,0x6F31,
-	/* Array index: 0x1572 */ 0x93C3,0x6F37,
-	/* Array index: 0x1572 */ 0x93C8,0x6F3A,
-	/* Array index: 0x1572 */ 0x93D0,0x6F39,
-	/* Array index: 0x1572 */ 0x93D1,0x452D,
-	/* Array index: 0x1572 */ 0x93DD,0x6F38,
-	/* Array index: 0x1572 */ 0x93E1,0x3640,
-	/* Array index: 0x1572 */ 0x93E4,0x6F3B,
-	/* Array index: 0x1572 */ 0x93E5,0x6F35,
-	/* Array index: 0x1572 */ 0x93E8,0x6F34,
-	/* Array index: 0x1572 */ 0x9403,0x6F3F,
-	/* Array index: 0x1572 */ 0x9407,0x6F40,
-	/* Array index: 0x1572 */ 0x9410,0x6F41,
-	/* Array index: 0x1572 */ 0x9413,0x6F3E,
-	/* Array index: 0x1572 */ 0x9414,0x6F3D,
-	/* Array index: 0x1572 */ 0x9421,0x6F45,
-	/* Array index: 0x1572 */ 0x942B,0x6F43,
-	/* Array index: 0x1572 */ 0x9435,0x6F44,
-	/* Array index: 0x1572 */ 0x9436,0x6F42,
-	/* Array index: 0x1572 */ 0x9438,0x4278,
-	/* Array index: 0x1572 */ 0x943A,0x6F46,
-	/* Array index: 0x1572 */ 0x9441,0x6F47,
-	/* Array index: 0x1572 */ 0x9444,0x6F49,
-	/* Array index: 0x1572 */ 0x945A,0x6F54,
-	/* Array index: 0x1572 */ 0x945B,0x6F4A,
-	/* Array index: 0x1572 */ 0x945E,0x6F4D,
-	/* Array index: 0x1572 */ 0x9460,0x6F4B,
-	/* Array index: 0x1572 */ 0x9462,0x6F4C,
-	/* Array index: 0x1572 */ 0x946A,0x6F4E,
-	/* Array index: 0x1572 */ 0x9470,0x6F50,
-	/* Array index: 0x1572 */ 0x9475,0x6F51,
-	/* Array index: 0x1572 */ 0x9477,0x6F52,
-	/* Array index: 0x1572 */ 0x9577,0x4439,
-	/* Array index: 0x1572 */ 0x9580,0x4C67,
-	/* Array index: 0x1572 */ 0x9582,0x6F59,
-	/* Array index: 0x1572 */ 0x9583,0x412E,
-	/* Array index: 0x1572 */ 0x958F,0x313C,
-	/* Array index: 0x1572 */ 0x9591,0x3457,
-	/* Array index: 0x1572 */ 0x9593,0x3456,
-	/* Array index: 0x1572 */ 0x9594,0x6F5C,
-	/* Array index: 0x1572 */ 0x9596,0x6F5D,
-	/* Array index: 0x1572 */ 0x9598,0x6F5E,
-	/* Array index: 0x1572 */ 0x9599,0x6F5F,
-	/* Array index: 0x1572 */ 0x95AD,0x6F63,
-	/* Array index: 0x1572 */ 0x95B2,0x315C,
-	/* Array index: 0x1572 */ 0x95B9,0x6F66,
-	/* Array index: 0x1572 */ 0x95BB,0x6F65,
-	/* Array index: 0x1572 */ 0x95BC,0x6F64,
-	/* Array index: 0x1572 */ 0x95BE,0x6F67,
-	/* Array index: 0x1572 */ 0x95C3,0x6F6A,
-	/* Array index: 0x1572 */ 0x95C7,0x3047,
-	/* Array index: 0x1572 */ 0x95CA,0x6F68,
-	/* Array index: 0x1572 */ 0x95CC,0x6F6C,
-	/* Array index: 0x1572 */ 0x95CD,0x6F6B,
-	/* Array index: 0x1572 */ 0x95DC,0x6F70,
-	/* Array index: 0x1572 */ 0x95E1,0x6F71,
-	/* Array index: 0x1572 */ 0x95E2,0x6F73,
-	/* Array index: 0x1572 */ 0x95E5,0x6F72,
-	/* Array index: 0x1572 */ 0x961C,0x496C,
-	/* Array index: 0x1572 */ 0x9621,0x6F74,
-	/* Array index: 0x1572 */ 0x9628,0x6F75,
-	/* Array index: 0x1572 */ 0x962A,0x3A65,
-	/* Array index: 0x1572 */ 0x962E,0x6F76,
-	/* Array index: 0x1572 */ 0x962F,0x6F77,
-	/* Array index: 0x1572 */ 0x9632,0x4B49,
-	/* Array index: 0x1572 */ 0x963B,0x414B,
-	/* Array index: 0x1572 */ 0x963F,0x3024,
-	/* Array index: 0x1572 */ 0x9640,0x424B,
-	/* Array index: 0x1572 */ 0x9642,0x6F78,
-	/* Array index: 0x1572 */ 0x9644,0x496D,
-	/* Array index: 0x1572 */ 0x966A,0x4766,
-	/* Array index: 0x1572 */ 0x966C,0x7025,
-	/* Array index: 0x1572 */ 0x9670,0x3122,
-	/* Array index: 0x1572 */ 0x967D,0x4D5B,
-	/* Array index: 0x1572 */ 0x9685,0x3679,
-	/* Array index: 0x1572 */ 0x9686,0x4E34,
-	/* Array index: 0x1572 */ 0x9688,0x3728,
-	/* Array index: 0x1572 */ 0x96A0,0x3123,
-	/* Array index: 0x1572 */ 0x96A3,0x4E59,
-	/* Array index: 0x1572 */ 0x96A7,0x702B,
-	/* Array index: 0x1572 */ 0x96A8,0x6E2E,
-	/* Array index: 0x1572 */ 0x96AA,0x702A,
-	/* Array index: 0x1572 */ 0x96D1,0x3B28,
-	/* Array index: 0x1572 */ 0x96D5,0x703A,
-	/* Array index: 0x1572 */ 0x96D6,0x6A2D,
-	/* Array index: 0x1572 */ 0x96D9,0x5256,
-	/* Array index: 0x1572 */ 0x96DB,0x3F77,
-	/* Array index: 0x1572 */ 0x96DC,0x7038,
-	/* Array index: 0x1572 */ 0x96E2,0x4E25,
-	/* Array index: 0x1572 */ 0x96E3,0x4671,
-	/* Array index: 0x1572 */ 0x96E8,0x312B,
-	/* Array index: 0x1572 */ 0x96EA,0x4063,
-	/* Array index: 0x1572 */ 0x96EB,0x3C36,
-	/* Array index: 0x1572 */ 0x96F0,0x4A37,
-	/* Array index: 0x1572 */ 0x96F2,0x3140,
-	/* Array index: 0x1572 */ 0x96F6,0x4E6D,
-	/* Array index: 0x1572 */ 0x96F7,0x4D6B,
-	/* Array index: 0x1572 */ 0x96F9,0x703B,
-	/* Array index: 0x1572 */ 0x96FB,0x4545,
-	/* Array index: 0x1572 */ 0x9700,0x3C7B,
-	/* Array index: 0x1572 */ 0x9716,0x7043,
-	/* Array index: 0x1572 */ 0x9719,0x7044,
-	/* Array index: 0x1572 */ 0x971C,0x417A,
-	/* Array index: 0x1572 */ 0x971E,0x3262,
-	/* Array index: 0x1572 */ 0x9724,0x7045,
-	/* Array index: 0x1572 */ 0x9727,0x4C38,
-	/* Array index: 0x1572 */ 0x972A,0x7046,
-	/* Array index: 0x1572 */ 0x9730,0x7047,
-	/* Array index: 0x1572 */ 0x9732,0x4F2A,
-	/* Array index: 0x1572 */ 0x9738,0x5B31,
-	/* Array index: 0x1572 */ 0x9739,0x7048,
-	/* Array index: 0x1572 */ 0x973D,0x7049,
-	/* Array index: 0x1572 */ 0x973E,0x704A,
-	/* Array index: 0x1572 */ 0x9742,0x704E,
-	/* Array index: 0x1572 */ 0x9744,0x704B,
-	/* Array index: 0x1572 */ 0x9746,0x704C,
-	/* Array index: 0x1572 */ 0x9748,0x704D,
-	/* Array index: 0x1572 */ 0x9749,0x704F,
-	/* Array index: 0x1572 */ 0x9752,0x4044,
-	/* Array index: 0x1572 */ 0x9756,0x4C77,
-	/* Array index: 0x1572 */ 0x9759,0x4045,
-	/* Array index: 0x1572 */ 0x975C,0x7050,
-	/* Array index: 0x1572 */ 0x9771,0x7057,
-	/* Array index: 0x1572 */ 0x9774,0x3724,
-	/* Array index: 0x1572 */ 0x9779,0x7058,
-	/* Array index: 0x1572 */ 0x977A,0x705C,
-	/* Array index: 0x1572 */ 0x977C,0x705A,
-	/* Array index: 0x1572 */ 0x9781,0x705B,
-	/* Array index: 0x1572 */ 0x978B,0x705E,
-	/* Array index: 0x1572 */ 0x978D,0x3048,
-	/* Array index: 0x1572 */ 0x978F,0x705F,
-	/* Array index: 0x1572 */ 0x9790,0x7060,
-	/* Array index: 0x1572 */ 0x9798,0x3E64,
-	/* Array index: 0x1572 */ 0x979C,0x7061,
-	/* Array index: 0x1572 */ 0x97A0,0x3547,
-	/* Array index: 0x1572 */ 0x97A3,0x7064,
-	/* Array index: 0x1572 */ 0x97A6,0x7063,
-	/* Array index: 0x1572 */ 0x97A8,0x7062,
-	/* Array index: 0x1572 */ 0x97AB,0x6B71,
-	/* Array index: 0x1572 */ 0x97AD,0x4A5C,
-	/* Array index: 0x1572 */ 0x97B3,0x7065,
-	/* Array index: 0x1572 */ 0x97B4,0x7066,
-	/* Array index: 0x1572 */ 0x97C3,0x7067,
-	/* Array index: 0x1572 */ 0x97C6,0x7068,
-	/* Array index: 0x1572 */ 0x97C8,0x7069,
-	/* Array index: 0x1572 */ 0x97CB,0x706A,
-	/* Array index: 0x1572 */ 0x97D3,0x345A,
-	/* Array index: 0x1572 */ 0x97DC,0x706B,
-	/* Array index: 0x1572 */ 0x97ED,0x706C,
-	/* Array index: 0x1572 */ 0x97EE,0x4723,
-	/* Array index: 0x1572 */ 0x97FB,0x3124,
-	/* Array index: 0x1572 */ 0x980C,0x7073,
-	/* Array index: 0x1572 */ 0x9817,0x3F7C,
-	/* Array index: 0x1572 */ 0x9818,0x4E4E,
-	/* Array index: 0x1572 */ 0x981A,0x375B,
-	/* Array index: 0x1572 */ 0x9821,0x7076,
-	/* Array index: 0x1572 */ 0x9824,0x7075,
-	/* Array index: 0x1572 */ 0x982C,0x4B4B,
-	/* Array index: 0x1572 */ 0x982D,0x462C,
-	/* Array index: 0x1572 */ 0x9834,0x3150,
-	/* Array index: 0x1572 */ 0x9846,0x7079,
-	/* Array index: 0x1572 */ 0x9854,0x3469,
-	/* Array index: 0x1572 */ 0x9855,0x3832,
-	/* Array index: 0x1572 */ 0x9858,0x346A,
-	/* Array index: 0x1572 */ 0x985B,0x453F,
-	/* Array index: 0x1572 */ 0x985E,0x4E60,
-	/* Array index: 0x1572 */ 0x9867,0x385C,
-	/* Array index: 0x1572 */ 0x986B,0x707C,
-	/* Array index: 0x1572 */ 0x98A8,0x4977,
-	/* Array index: 0x1572 */ 0x98AA,0x7124,
-	/* Array index: 0x1572 */ 0x98AF,0x7125,
-	/* Array index: 0x1572 */ 0x98B1,0x7126,
-	/* Array index: 0x1572 */ 0x98B6,0x7127,
-	/* Array index: 0x1572 */ 0x98C3,0x7129,
-	/* Array index: 0x1572 */ 0x98C4,0x7128,
-	/* Array index: 0x1572 */ 0x98C6,0x712A,
-	/* Array index: 0x1572 */ 0x98DB,0x4874,
-	/* Array index: 0x1572 */ 0x98DC,0x664C,
-	/* Array index: 0x1572 */ 0x98DF,0x3F29,
-	/* Array index: 0x1572 */ 0x98E2,0x3532,
-	/* Array index: 0x1572 */ 0x98E9,0x712B,
-	/* Array index: 0x1572 */ 0x98F2,0x307B,
-	/* Array index: 0x1572 */ 0x98F4,0x303B,
-	/* Array index: 0x1572 */ 0x9903,0x712D,
-	/* Array index: 0x1572 */ 0x9905,0x4C5F,
-	/* Array index: 0x1572 */ 0x9909,0x712E,
-	/* Array index: 0x1572 */ 0x990A,0x4D5C,
-	/* Array index: 0x1572 */ 0x990C,0x3142,
-	/* Array index: 0x1572 */ 0x9918,0x7131,
-	/* Array index: 0x1572 */ 0x9924,0x7135,
-	/* Array index: 0x1572 */ 0x9928,0x345B,
-	/* Array index: 0x1572 */ 0x992C,0x7137,
-	/* Array index: 0x1572 */ 0x992E,0x7138,
-	/* Array index: 0x1572 */ 0x993D,0x7139,
-	/* Array index: 0x1572 */ 0x993E,0x713A,
-	/* Array index: 0x1572 */ 0x9942,0x713B,
-	/* Array index: 0x1572 */ 0x9945,0x713D,
-	/* Array index: 0x1572 */ 0x9949,0x713C,
-	/* Array index: 0x1572 */ 0x994B,0x713F,
-	/* Array index: 0x1572 */ 0x994C,0x7142,
-	/* Array index: 0x1572 */ 0x9955,0x7143,
-	/* Array index: 0x1572 */ 0x9957,0x3642,
-	/* Array index: 0x1572 */ 0x99A5,0x7146,
-	/* Array index: 0x1572 */ 0x99A8,0x333E,
-	/* Array index: 0x1572 */ 0x99B3,0x435A,
-	/* Array index: 0x1572 */ 0x99B4,0x466B,
-	/* Array index: 0x1572 */ 0x99BC,0x7149,
-	/* Array index: 0x1572 */ 0x99C1,0x477D,
-	/* Array index: 0x1572 */ 0x99D5,0x326F,
-	/* Array index: 0x1572 */ 0x99D8,0x714D,
-	/* Array index: 0x1572 */ 0x99DB,0x714B,
-	/* Array index: 0x1572 */ 0x99DD,0x714C,
-	/* Array index: 0x1572 */ 0x99DF,0x714A,
-	/* Array index: 0x1572 */ 0x99E2,0x7158,
-	/* Array index: 0x1572 */ 0x99ED,0x714F,
-	/* Array index: 0x1572 */ 0x99EE,0x7150,
-	/* Array index: 0x1572 */ 0x99F1,0x7151,
-	/* Array index: 0x1572 */ 0x99F2,0x7152,
-	/* Array index: 0x1572 */ 0x99F8,0x7154,
-	/* Array index: 0x1572 */ 0x99FB,0x7153,
-	/* Array index: 0x1572 */ 0x99FF,0x3D59,
-	/* Array index: 0x1572 */ 0x9A01,0x7155,
-	/* Array index: 0x1572 */ 0x9A05,0x7157,
-	/* Array index: 0x1572 */ 0x9A0E,0x3533,
-	/* Array index: 0x1572 */ 0x9A0F,0x7156,
-	/* Array index: 0x1572 */ 0x9A12,0x417B,
-	/* Array index: 0x1572 */ 0x9A13,0x3833,
-	/* Array index: 0x1572 */ 0x9A19,0x7159,
-	/* Array index: 0x1572 */ 0x9A28,0x424D,
-	/* Array index: 0x1572 */ 0x9A2B,0x715A,
-	/* Array index: 0x1572 */ 0x9A30,0x462D,
-	/* Array index: 0x1572 */ 0x9A37,0x715B,
-	/* Array index: 0x1572 */ 0x9A3E,0x7160,
-	/* Array index: 0x1572 */ 0x9A40,0x715E,
-	/* Array index: 0x1572 */ 0x9A42,0x715D,
-	/* Array index: 0x1572 */ 0x9A43,0x715F,
-	/* Array index: 0x1572 */ 0x9A45,0x715C,
-	/* Array index: 0x1572 */ 0x9A4D,0x7162,
-	/* Array index: 0x1572 */ 0x9A55,0x7161,
-	/* Array index: 0x1572 */ 0x9A57,0x7164,
-	/* Array index: 0x1572 */ 0x9A5A,0x3643,
-	/* Array index: 0x1572 */ 0x9A5B,0x7163,
-	/* Array index: 0x1572 */ 0x9A5F,0x7165,
-	/* Array index: 0x1572 */ 0x9A62,0x7166,
-	/* Array index: 0x1572 */ 0x9A64,0x7168,
-	/* Array index: 0x1572 */ 0x9A65,0x7167,
-	/* Array index: 0x1572 */ 0x9AA8,0x397C,
-	/* Array index: 0x1572 */ 0x9AAD,0x716C,
-	/* Array index: 0x1572 */ 0x9AB0,0x716D,
-	/* Array index: 0x1572 */ 0x9AB8,0x333C,
-	/* Array index: 0x1572 */ 0x9ABC,0x716E,
-	/* Array index: 0x1572 */ 0x9AC0,0x716F,
-	/* Array index: 0x1572 */ 0x9AC4,0x3F71,
-	/* Array index: 0x1572 */ 0x9ACF,0x7170,
-	/* Array index: 0x1572 */ 0x9AD1,0x7171,
-	/* Array index: 0x1572 */ 0x9AD3,0x7172,
-	/* Array index: 0x1572 */ 0x9AD4,0x7173,
-	/* Array index: 0x1572 */ 0x9AD8,0x3962,
-	/* Array index: 0x1572 */ 0x9ADE,0x7174,
-	/* Array index: 0x1572 */ 0x9ADF,0x7175,
-	/* Array index: 0x1572 */ 0x9AE2,0x7176,
-	/* Array index: 0x1572 */ 0x9AE3,0x7177,
-	/* Array index: 0x1572 */ 0x9AE6,0x7178,
-	/* Array index: 0x1572 */ 0x9AF4,0x717C,
-	/* Array index: 0x1572 */ 0x9AF7,0x717E,
-	/* Array index: 0x1572 */ 0x9AFB,0x7221,
-	/* Array index: 0x1572 */ 0x9B06,0x7222,
-	/* Array index: 0x1572 */ 0x9B18,0x7223,
-	/* Array index: 0x1572 */ 0x9B1A,0x7224,
-	/* Array index: 0x1572 */ 0x9B1F,0x7225,
-	/* Array index: 0x1572 */ 0x9B22,0x7226,
-	/* Array index: 0x1572 */ 0x9B23,0x7227,
-	/* Array index: 0x1572 */ 0x9B3B,0x6478,
-	/* Array index: 0x1572 */ 0x9B3C,0x3534,
-	/* Array index: 0x1572 */ 0x9B54,0x4B62,
-	/* Array index: 0x1572 */ 0x9B58,0x7236,
-	/* Array index: 0x1572 */ 0x9B5A,0x357B,
-	/* Array index: 0x1572 */ 0x9B6F,0x4F25,
-	/* Array index: 0x1572 */ 0x9B74,0x7237,
-	/* Array index: 0x1572 */ 0x9B83,0x7239,
-	/* Array index: 0x1572 */ 0x9B8E,0x303E,
-	/* Array index: 0x1572 */ 0x9B9F,0x723D,
-	/* Array index: 0x1572 */ 0x9BA0,0x723E,
-	/* Array index: 0x1572 */ 0x9BA8,0x723F,
-	/* Array index: 0x1572 */ 0x9BB4,0x7240,
-	/* Array index: 0x1572 */ 0x9BB9,0x7243,
-	/* Array index: 0x1572 */ 0x9BC0,0x7241,
-	/* Array index: 0x1572 */ 0x9BC6,0x7244,
-	/* Array index: 0x1572 */ 0x9BC9,0x3871,
-	/* Array index: 0x1572 */ 0x9BCA,0x7242,
-	/* Array index: 0x1572 */ 0x9BCF,0x7245,
-	/* Array index: 0x1572 */ 0x9BD1,0x7246,
-	/* Array index: 0x1572 */ 0x9BD2,0x7247,
-	/* Array index: 0x1572 */ 0x9BD4,0x724B,
-	/* Array index: 0x1572 */ 0x9BD6,0x3B2A,
-	/* Array index: 0x1572 */ 0x9BDB,0x4264,
-	/* Array index: 0x1572 */ 0x9BE8,0x375F,
-	/* Array index: 0x1572 */ 0x9BF5,0x3033,
-	/* Array index: 0x1572 */ 0x9C04,0x725A,
-	/* Array index: 0x1572 */ 0x9C1B,0x725C,
-	/* Array index: 0x1572 */ 0x9C21,0x725F,
-	/* Array index: 0x1572 */ 0x9C24,0x725E,
-	/* Array index: 0x1572 */ 0x9C25,0x725D,
-	/* Array index: 0x1572 */ 0x9C3E,0x7264,
-	/* Array index: 0x1572 */ 0x9C52,0x4B70,
-	/* Array index: 0x1572 */ 0x9C57,0x4E5A,
-	/* Array index: 0x1572 */ 0x9C5A,0x7265,
-	/* Array index: 0x1572 */ 0x9C60,0x7266,
-	/* Array index: 0x1572 */ 0x9C67,0x7267,
-	/* Array index: 0x1572 */ 0x9C76,0x7268,
-	/* Array index: 0x1572 */ 0x9C78,0x7269,
-	/* Array index: 0x1572 */ 0x9CE5,0x443B,
-	/* Array index: 0x1572 */ 0x9CE7,0x726A,
-	/* Array index: 0x1572 */ 0x9CE9,0x4837,
-	/* Array index: 0x1572 */ 0x9CEB,0x726F,
-	/* Array index: 0x1572 */ 0x9CEC,0x726B,
-	/* Array index: 0x1572 */ 0x9CF0,0x726C,
-	/* Array index: 0x1572 */ 0x9CF3,0x4B31,
-	/* Array index: 0x1572 */ 0x9CF4,0x4C44,
-	/* Array index: 0x1572 */ 0x9CF6,0x4650,
-	/* Array index: 0x1572 */ 0x9D03,0x7270,
-	/* Array index: 0x1572 */ 0x9D0E,0x322A,
-	/* Array index: 0x1572 */ 0x9D12,0x7279,
-	/* Array index: 0x1572 */ 0x9D15,0x7278,
-	/* Array index: 0x1572 */ 0x9D1B,0x3175,
-	/* Array index: 0x1572 */ 0x9D1F,0x7276,
-	/* Array index: 0x1572 */ 0x9D23,0x7275,
-	/* Array index: 0x1572 */ 0x9D26,0x7273,
-	/* Array index: 0x1572 */ 0x9D3B,0x3963,
-	/* Array index: 0x1572 */ 0x9D3E,0x727C,
-	/* Array index: 0x1572 */ 0x9D3F,0x727B,
-	/* Array index: 0x1572 */ 0x9D41,0x727A,
-	/* Array index: 0x1572 */ 0x9D44,0x7277,
-	/* Array index: 0x1572 */ 0x9D46,0x727D,
-	/* Array index: 0x1572 */ 0x9D48,0x727E,
-	/* Array index: 0x1572 */ 0x9D50,0x7325,
-	/* Array index: 0x1572 */ 0x9D51,0x7324,
-	/* Array index: 0x1572 */ 0x9D59,0x7326,
-	/* Array index: 0x1572 */ 0x9D64,0x7323,
-	/* Array index: 0x1572 */ 0x9D6C,0x4B32,
-	/* Array index: 0x1572 */ 0x9D6F,0x732B,
-	/* Array index: 0x1572 */ 0x9D72,0x7327,
-	/* Array index: 0x1572 */ 0x9D7A,0x732C,
-	/* Array index: 0x1572 */ 0x9D87,0x7329,
-	/* Array index: 0x1572 */ 0x9D89,0x7328,
-	/* Array index: 0x1572 */ 0x9D8F,0x375C,
-	/* Array index: 0x1572 */ 0x9D9A,0x732D,
-	/* Array index: 0x1572 */ 0x9DA4,0x732E,
-	/* Array index: 0x1572 */ 0x9DA9,0x732F,
-	/* Array index: 0x1572 */ 0x9DAB,0x732A,
-	/* Array index: 0x1572 */ 0x9DAF,0x7274,
-	/* Array index: 0x1572 */ 0x9DB2,0x7330,
-	/* Array index: 0x1572 */ 0x9DB4,0x4461,
-	/* Array index: 0x1572 */ 0x9DB8,0x7334,
-	/* Array index: 0x1572 */ 0x9DBA,0x7335,
-	/* Array index: 0x1572 */ 0x9DBB,0x7333,
-	/* Array index: 0x1572 */ 0x9DC1,0x7332,
-	/* Array index: 0x1572 */ 0x9DC2,0x7338,
-	/* Array index: 0x1572 */ 0x9DC4,0x7331,
-	/* Array index: 0x1572 */ 0x9DC6,0x7336,
-	/* Array index: 0x1572 */ 0x9DCF,0x7337,
-	/* Array index: 0x1572 */ 0x9DD3,0x733A,
-	/* Array index: 0x1572 */ 0x9DD9,0x7339,
-	/* Array index: 0x1572 */ 0x9DE6,0x733C,
-	/* Array index: 0x1572 */ 0x9DED,0x733D,
-	/* Array index: 0x1572 */ 0x9DEF,0x733E,
-	/* Array index: 0x1572 */ 0x9DF2,0x4F49,
-	/* Array index: 0x1572 */ 0x9DFD,0x733F,
-	/* Array index: 0x1572 */ 0x9E1A,0x7340,
-	/* Array index: 0x1572 */ 0x9E1B,0x7341,
-	/* Array index: 0x1572 */ 0x9E1E,0x7342,
-	/* Array index: 0x1572 */ 0x9E75,0x7343,
-	/* Array index: 0x1572 */ 0x9E78,0x3834,
-	/* Array index: 0x1572 */ 0x9E79,0x7344,
-	/* Array index: 0x1572 */ 0x9E7D,0x7345,
-	/* Array index: 0x1572 */ 0x9E7F,0x3C2F,
-	/* Array index: 0x1572 */ 0x9E81,0x7346,
-	/* Array index: 0x1572 */ 0x9E88,0x7347,
-	/* Array index: 0x1572 */ 0x9E8B,0x7348,
-	/* Array index: 0x1572 */ 0x9E8C,0x7349,
-	/* Array index: 0x1572 */ 0x9E9D,0x734D,
-	/* Array index: 0x1572 */ 0x9E9F,0x4E5B,
-	/* Array index: 0x1572 */ 0x9EA5,0x734E,
-	/* Array index: 0x1572 */ 0x9EA6,0x477E,
-	/* Array index: 0x1572 */ 0x9EA9,0x734F,
-	/* Array index: 0x1572 */ 0x9EAA,0x7351,
-	/* Array index: 0x1572 */ 0x9EAD,0x7352,
-	/* Array index: 0x1572 */ 0x9EC4,0x322B,
-	/* Array index: 0x1572 */ 0x9EE5,0x735D,
-	/* Array index: 0x1572 */ 0x9EE8,0x735E,
-	/* Array index: 0x1572 */ 0x9EEF,0x735F,
-	/* Array index: 0x1572 */ 0x9EF4,0x7360,
-	/* Array index: 0x1572 */ 0x9EF6,0x7361,
-	/* Array index: 0x1572 */ 0x9EF7,0x7362,
-	/* Array index: 0x1572 */ 0x9F07,0x7367,
-	/* Array index: 0x1572 */ 0x9F08,0x7368,
-	/* Array index: 0x1572 */ 0x9F0E,0x4524,
-	/* Array index: 0x1572 */ 0x9F13,0x385D,
-	/* Array index: 0x1572 */ 0x9F15,0x736A,
-	/* Array index: 0x1572 */ 0x9F20,0x414D,
-	/* Array index: 0x1572 */ 0x9F21,0x736B,
-	/* Array index: 0x1572 */ 0x9F2C,0x736C,
-	/* Array index: 0x1572 */ 0x9F3B,0x4921,
-	/* Array index: 0x1572 */ 0x9F3E,0x736D,
-	/* Array index: 0x1572 */ 0x9F4A,0x736E,
-	/* Array index: 0x1572 */ 0x9F4B,0x6337,
-	/* Array index: 0x1572 */ 0x9F4E,0x6C5A,
-	/* Array index: 0x1572 */ 0x9F4F,0x706D,
-	/* Array index: 0x1572 */ 0x9F52,0x736F,
-	/* Array index: 0x1572 */ 0x9F54,0x7370,
-	/* Array index: 0x1572 */ 0x9F6A,0x7378,
-	/* Array index: 0x1572 */ 0x9F6C,0x7377,
-	/* Array index: 0x1572 */ 0x9F72,0x737A,
-	/* Array index: 0x1572 */ 0x9F76,0x737B,
-	/* Array index: 0x1572 */ 0x9F77,0x7379,
-	/* Array index: 0x1572 */ 0x9F8D,0x4E36,
-	/* Array index: 0x1572 */ 0x9F95,0x737C,
-	/* Array index: 0x1572 */ 0x9F9C,0x737D,
-	/* Array index: 0x1572 */ 0x9F9D,0x6354,
-	/* Array index: 0x1572 */ 0x9FA0,0x737E,
-	/* Array index: 0x1572 */ 0xFFE3,0x2131,
-	/* Array index: 0x1572 */ 0xFFE5,0x216F,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_JIS_X0208_1990 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * jis_x0208_1990 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_jis_x0208_1990 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_JIS_X0208_1990, /* CCS name */
-	TABLE_16BIT, /* Table bits */
-#if defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&from_ucs_size_jis_x0208_1990, /* UCS -> jis_x0208_1990 table size-optimized table */
-#elif defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&from_ucs_speed_jis_x0208_1990, /* UCS -> jis_x0208_1990 table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-#if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&to_ucs_size_jis_x0208_1990 /* jis_x0208_1990 -> UCS table speed-optimized table */
-#elif defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&to_ucs_speed_jis_x0208_1990 /* jis_x0208_1990 -> UCS table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_JIS_X0208_1990) || ... */
-
diff --git a/newlib/libc/iconv/ccs/jis_x0212_1990.c b/newlib/libc/iconv/ccs/jis_x0212_1990.c
deleted file mode 100644
index eb8882f..0000000
--- a/newlib/libc/iconv/ccs/jis_x0212_1990.c
+++ /dev/null
@@ -1,11385 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for jis_x0212_1990 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
- || defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-/*
- * 16-bit jis_x0212_1990 -> UCS speed-optimized table (35328 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_speed_jis_x0212_1990[] =
-{
-	/* Heading Block */
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,0x0100,INVBLK,INVBLK,INVBLK,0x0200,0x0300,
-	INVBLK,0x0400,0x0500,0x0600,INVBLK,INVBLK,INVBLK,INVBLK,
-	0x0700,0x0800,0x0900,0x0A00,0x0B00,0x0C00,0x0D00,0x0E00,
-	0x0F00,0x1000,0x1100,0x1200,0x1300,0x1400,0x1500,0x1600,
-	0x1700,0x1800,0x1900,0x1A00,0x1B00,0x1C00,0x1D00,0x1E00,
-	0x1F00,0x2000,0x2100,0x2200,0x2300,0x2400,0x2500,0x2600,
-	0x2700,0x2800,0x2900,0x2A00,0x2B00,0x2C00,0x2D00,0x2E00,
-	0x2F00,0x3000,0x3100,0x3200,0x3300,0x3400,0x3500,0x3600,
-	0x3700,0x3800,0x3900,0x3A00,0x3B00,0x3C00,0x3D00,0x3E00,
-	0x3F00,0x4000,0x4100,0x4200,0x4300,0x4400,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	/* Block 35, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x02D8,
-	0x02C7,0x00B8,0x02D9,0x02DD,0x00AF,0x02DB,0x02DA,0x007E,
-	0x0384,0x0385,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x00A1,0x00A6,0x00BF,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x00BA,0x00AA,0x00A9,0x00AE,0x2122,
-	0x00A4,0x2116,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 39, Array index 0x0200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x0386,0x0388,0x0389,0x038A,0x03AA,INVALC,0x038C,
-	INVALC,0x038E,0x03AB,INVALC,0x038F,INVALC,INVALC,INVALC,
-	INVALC,0x03AC,0x03AD,0x03AE,0x03AF,0x03CA,0x0390,0x03CC,
-	0x03C2,0x03CD,0x03CB,0x03B0,0x03CE,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 40, Array index 0x0300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x0402,0x0403,0x0404,0x0405,0x0406,0x0407,
-	0x0408,0x0409,0x040A,0x040B,0x040C,0x040E,0x040F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x0452,0x0453,0x0454,0x0455,0x0456,0x0457,
-	0x0458,0x0459,0x045A,0x045B,0x045C,0x045E,0x045F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 42, Array index 0x0400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x00C6,0x0110,INVALC,0x0126,INVALC,0x0132,INVALC,
-	0x0141,0x013F,INVALC,0x014A,0x00D8,0x0152,INVALC,0x0166,
-	0x00DE,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x00E6,0x0111,0x00F0,0x0127,0x0131,0x0133,0x0138,
-	0x0142,0x0140,0x0149,0x014B,0x00F8,0x0153,0x00DF,0x0167,
-	0x00FE,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 43, Array index 0x0500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x00C1,0x00C0,0x00C4,0x00C2,0x0102,0x01CD,0x0100,
-	0x0104,0x00C5,0x00C3,0x0106,0x0108,0x010C,0x00C7,0x010A,
-	0x010E,0x00C9,0x00C8,0x00CB,0x00CA,0x011A,0x0116,0x0112,
-	0x0118,INVALC,0x011C,0x011E,0x0122,0x0120,0x0124,0x00CD,
-	0x00CC,0x00CF,0x00CE,0x01CF,0x0130,0x012A,0x012E,0x0128,
-	0x0134,0x0136,0x0139,0x013D,0x013B,0x0143,0x0147,0x0145,
-	0x00D1,0x00D3,0x00D2,0x00D6,0x00D4,0x01D1,0x0150,0x014C,
-	0x00D5,0x0154,0x0158,0x0156,0x015A,0x015C,0x0160,0x015E,
-	0x0164,0x0162,0x00DA,0x00D9,0x00DC,0x00DB,0x016C,0x01D3,
-	0x0170,0x016A,0x0172,0x016E,0x0168,0x01D7,0x01DB,0x01D9,
-	0x01D5,0x0174,0x00DD,0x0178,0x0176,0x0179,0x017D,0x017B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 44, Array index 0x0600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x00E1,0x00E0,0x00E4,0x00E2,0x0103,0x01CE,0x0101,
-	0x0105,0x00E5,0x00E3,0x0107,0x0109,0x010D,0x00E7,0x010B,
-	0x010F,0x00E9,0x00E8,0x00EB,0x00EA,0x011B,0x0117,0x0113,
-	0x0119,0x01F5,0x011D,0x011F,INVALC,0x0121,0x0125,0x00ED,
-	0x00EC,0x00EF,0x00EE,0x01D0,INVALC,0x012B,0x012F,0x0129,
-	0x0135,0x0137,0x013A,0x013E,0x013C,0x0144,0x0148,0x0146,
-	0x00F1,0x00F3,0x00F2,0x00F6,0x00F4,0x01D2,0x0151,0x014D,
-	0x00F5,0x0155,0x0159,0x0157,0x015B,0x015D,0x0161,0x015F,
-	0x0165,0x0163,0x00FA,0x00F9,0x00FC,0x00FB,0x016D,0x01D4,
-	0x0171,0x016B,0x0173,0x016F,0x0169,0x01D8,0x01DC,0x01DA,
-	0x01D6,0x0175,0x00FD,0x00FF,0x0177,0x017A,0x017E,0x017C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 49, Array index 0x0700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E02,0x4E04,0x4E05,0x4E0C,0x4E12,0x4E1F,0x4E23,
-	0x4E24,0x4E28,0x4E2B,0x4E2E,0x4E2F,0x4E30,0x4E35,0x4E40,
-	0x4E41,0x4E44,0x4E47,0x4E51,0x4E5A,0x4E5C,0x4E63,0x4E68,
-	0x4E69,0x4E74,0x4E75,0x4E79,0x4E7F,0x4E8D,0x4E96,0x4E97,
-	0x4E9D,0x4EAF,0x4EB9,0x4EC3,0x4ED0,0x4EDA,0x4EDB,0x4EE0,
-	0x4EE1,0x4EE2,0x4EE8,0x4EEF,0x4EF1,0x4EF3,0x4EF5,0x4EFD,
-	0x4EFE,0x4EFF,0x4F00,0x4F02,0x4F03,0x4F08,0x4F0B,0x4F0C,
-	0x4F12,0x4F15,0x4F16,0x4F17,0x4F19,0x4F2E,0x4F31,0x4F60,
-	0x4F33,0x4F35,0x4F37,0x4F39,0x4F3B,0x4F3E,0x4F40,0x4F42,
-	0x4F48,0x4F49,0x4F4B,0x4F4C,0x4F52,0x4F54,0x4F56,0x4F58,
-	0x4F5F,0x4F63,0x4F6A,0x4F6C,0x4F6E,0x4F71,0x4F77,0x4F78,
-	0x4F79,0x4F7A,0x4F7D,0x4F7E,0x4F81,0x4F82,0x4F84,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 50, Array index 0x0800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F85,0x4F89,0x4F8A,0x4F8C,0x4F8E,0x4F90,0x4F92,
-	0x4F93,0x4F94,0x4F97,0x4F99,0x4F9A,0x4F9E,0x4F9F,0x4FB2,
-	0x4FB7,0x4FB9,0x4FBB,0x4FBC,0x4FBD,0x4FBE,0x4FC0,0x4FC1,
-	0x4FC5,0x4FC6,0x4FC8,0x4FC9,0x4FCB,0x4FCC,0x4FCD,0x4FCF,
-	0x4FD2,0x4FDC,0x4FE0,0x4FE2,0x4FF0,0x4FF2,0x4FFC,0x4FFD,
-	0x4FFF,0x5000,0x5001,0x5004,0x5007,0x500A,0x500C,0x500E,
-	0x5010,0x5013,0x5017,0x5018,0x501B,0x501C,0x501D,0x501E,
-	0x5022,0x5027,0x502E,0x5030,0x5032,0x5033,0x5035,0x5040,
-	0x5041,0x5042,0x5045,0x5046,0x504A,0x504C,0x504E,0x5051,
-	0x5052,0x5053,0x5057,0x5059,0x505F,0x5060,0x5062,0x5063,
-	0x5066,0x5067,0x506A,0x506D,0x5070,0x5071,0x503B,0x5081,
-	0x5083,0x5084,0x5086,0x508A,0x508E,0x508F,0x5090,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 51, Array index 0x0900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5092,0x5093,0x5094,0x5096,0x509B,0x509C,0x509E,
-	0x509F,0x50A0,0x50A1,0x50A2,0x50AA,0x50AF,0x50B0,0x50B9,
-	0x50BA,0x50BD,0x50C0,0x50C3,0x50C4,0x50C7,0x50CC,0x50CE,
-	0x50D0,0x50D3,0x50D4,0x50D8,0x50DC,0x50DD,0x50DF,0x50E2,
-	0x50E4,0x50E6,0x50E8,0x50E9,0x50EF,0x50F1,0x50F6,0x50FA,
-	0x50FE,0x5103,0x5106,0x5107,0x5108,0x510B,0x510C,0x510D,
-	0x510E,0x50F2,0x5110,0x5117,0x5119,0x511B,0x511C,0x511D,
-	0x511E,0x5123,0x5127,0x5128,0x512C,0x512D,0x512F,0x5131,
-	0x5133,0x5134,0x5135,0x5138,0x5139,0x5142,0x514A,0x514F,
-	0x5153,0x5155,0x5157,0x5158,0x515F,0x5164,0x5166,0x517E,
-	0x5183,0x5184,0x518B,0x518E,0x5198,0x519D,0x51A1,0x51A3,
-	0x51AD,0x51B8,0x51BA,0x51BC,0x51BE,0x51BF,0x51C2,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 52, Array index 0x0A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x51C8,0x51CF,0x51D1,0x51D2,0x51D3,0x51D5,0x51D8,
-	0x51DE,0x51E2,0x51E5,0x51EE,0x51F2,0x51F3,0x51F4,0x51F7,
-	0x5201,0x5202,0x5205,0x5212,0x5213,0x5215,0x5216,0x5218,
-	0x5222,0x5228,0x5231,0x5232,0x5235,0x523C,0x5245,0x5249,
-	0x5255,0x5257,0x5258,0x525A,0x525C,0x525F,0x5260,0x5261,
-	0x5266,0x526E,0x5277,0x5278,0x5279,0x5280,0x5282,0x5285,
-	0x528A,0x528C,0x5293,0x5295,0x5296,0x5297,0x5298,0x529A,
-	0x529C,0x52A4,0x52A5,0x52A6,0x52A7,0x52AF,0x52B0,0x52B6,
-	0x52B7,0x52B8,0x52BA,0x52BB,0x52BD,0x52C0,0x52C4,0x52C6,
-	0x52C8,0x52CC,0x52CF,0x52D1,0x52D4,0x52D6,0x52DB,0x52DC,
-	0x52E1,0x52E5,0x52E8,0x52E9,0x52EA,0x52EC,0x52F0,0x52F1,
-	0x52F4,0x52F6,0x52F7,0x5300,0x5303,0x530A,0x530B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 53, Array index 0x0B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x530C,0x5311,0x5313,0x5318,0x531B,0x531C,0x531E,
-	0x531F,0x5325,0x5327,0x5328,0x5329,0x532B,0x532C,0x532D,
-	0x5330,0x5332,0x5335,0x533C,0x533D,0x533E,0x5342,0x534C,
-	0x534B,0x5359,0x535B,0x5361,0x5363,0x5365,0x536C,0x536D,
-	0x5372,0x5379,0x537E,0x5383,0x5387,0x5388,0x538E,0x5393,
-	0x5394,0x5399,0x539D,0x53A1,0x53A4,0x53AA,0x53AB,0x53AF,
-	0x53B2,0x53B4,0x53B5,0x53B7,0x53B8,0x53BA,0x53BD,0x53C0,
-	0x53C5,0x53CF,0x53D2,0x53D3,0x53D5,0x53DA,0x53DD,0x53DE,
-	0x53E0,0x53E6,0x53E7,0x53F5,0x5402,0x5413,0x541A,0x5421,
-	0x5427,0x5428,0x542A,0x542F,0x5431,0x5434,0x5435,0x5443,
-	0x5444,0x5447,0x544D,0x544F,0x545E,0x5462,0x5464,0x5466,
-	0x5467,0x5469,0x546B,0x546D,0x546E,0x5474,0x547F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 54, Array index 0x0C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5481,0x5483,0x5485,0x5488,0x5489,0x548D,0x5491,
-	0x5495,0x5496,0x549C,0x549F,0x54A1,0x54A6,0x54A7,0x54A9,
-	0x54AA,0x54AD,0x54AE,0x54B1,0x54B7,0x54B9,0x54BA,0x54BB,
-	0x54BF,0x54C6,0x54CA,0x54CD,0x54CE,0x54E0,0x54EA,0x54EC,
-	0x54EF,0x54F6,0x54FC,0x54FE,0x54FF,0x5500,0x5501,0x5505,
-	0x5508,0x5509,0x550C,0x550D,0x550E,0x5515,0x552A,0x552B,
-	0x5532,0x5535,0x5536,0x553B,0x553C,0x553D,0x5541,0x5547,
-	0x5549,0x554A,0x554D,0x5550,0x5551,0x5558,0x555A,0x555B,
-	0x555E,0x5560,0x5561,0x5564,0x5566,0x557F,0x5581,0x5582,
-	0x5586,0x5588,0x558E,0x558F,0x5591,0x5592,0x5593,0x5594,
-	0x5597,0x55A3,0x55A4,0x55AD,0x55B2,0x55BF,0x55C1,0x55C3,
-	0x55C6,0x55C9,0x55CB,0x55CC,0x55CE,0x55D1,0x55D2,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 55, Array index 0x0D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x55D3,0x55D7,0x55D8,0x55DB,0x55DE,0x55E2,0x55E9,
-	0x55F6,0x55FF,0x5605,0x5608,0x560A,0x560D,0x560E,0x560F,
-	0x5610,0x5611,0x5612,0x5619,0x562C,0x5630,0x5633,0x5635,
-	0x5637,0x5639,0x563B,0x563C,0x563D,0x563F,0x5640,0x5641,
-	0x5643,0x5644,0x5646,0x5649,0x564B,0x564D,0x564F,0x5654,
-	0x565E,0x5660,0x5661,0x5662,0x5663,0x5666,0x5669,0x566D,
-	0x566F,0x5671,0x5672,0x5675,0x5684,0x5685,0x5688,0x568B,
-	0x568C,0x5695,0x5699,0x569A,0x569D,0x569E,0x569F,0x56A6,
-	0x56A7,0x56A8,0x56A9,0x56AB,0x56AC,0x56AD,0x56B1,0x56B3,
-	0x56B7,0x56BE,0x56C5,0x56C9,0x56CA,0x56CB,0x56CF,0x56D0,
-	0x56CC,0x56CD,0x56D9,0x56DC,0x56DD,0x56DF,0x56E1,0x56E4,
-	0x56E5,0x56E6,0x56E7,0x56E8,0x56F1,0x56EB,0x56ED,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 56, Array index 0x0E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x56F6,0x56F7,0x5701,0x5702,0x5707,0x570A,0x570C,
-	0x5711,0x5715,0x571A,0x571B,0x571D,0x5720,0x5722,0x5723,
-	0x5724,0x5725,0x5729,0x572A,0x572C,0x572E,0x572F,0x5733,
-	0x5734,0x573D,0x573E,0x573F,0x5745,0x5746,0x574C,0x574D,
-	0x5752,0x5762,0x5765,0x5767,0x5768,0x576B,0x576D,0x576E,
-	0x576F,0x5770,0x5771,0x5773,0x5774,0x5775,0x5777,0x5779,
-	0x577A,0x577B,0x577C,0x577E,0x5781,0x5783,0x578C,0x5794,
-	0x5797,0x5799,0x579A,0x579C,0x579D,0x579E,0x579F,0x57A1,
-	0x5795,0x57A7,0x57A8,0x57A9,0x57AC,0x57B8,0x57BD,0x57C7,
-	0x57C8,0x57CC,0x57CF,0x57D5,0x57DD,0x57DE,0x57E4,0x57E6,
-	0x57E7,0x57E9,0x57ED,0x57F0,0x57F5,0x57F6,0x57F8,0x57FD,
-	0x57FE,0x57FF,0x5803,0x5804,0x5808,0x5809,0x57E1,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 57, Array index 0x0F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x580C,0x580D,0x581B,0x581E,0x581F,0x5820,0x5826,
-	0x5827,0x582D,0x5832,0x5839,0x583F,0x5849,0x584C,0x584D,
-	0x584F,0x5850,0x5855,0x585F,0x5861,0x5864,0x5867,0x5868,
-	0x5878,0x587C,0x587F,0x5880,0x5881,0x5887,0x5888,0x5889,
-	0x588A,0x588C,0x588D,0x588F,0x5890,0x5894,0x5896,0x589D,
-	0x58A0,0x58A1,0x58A2,0x58A6,0x58A9,0x58B1,0x58B2,0x58C4,
-	0x58BC,0x58C2,0x58C8,0x58CD,0x58CE,0x58D0,0x58D2,0x58D4,
-	0x58D6,0x58DA,0x58DD,0x58E1,0x58E2,0x58E9,0x58F3,0x5905,
-	0x5906,0x590B,0x590C,0x5912,0x5913,0x5914,0x8641,0x591D,
-	0x5921,0x5923,0x5924,0x5928,0x592F,0x5930,0x5933,0x5935,
-	0x5936,0x593F,0x5943,0x5946,0x5952,0x5953,0x5959,0x595B,
-	0x595D,0x595E,0x595F,0x5961,0x5963,0x596B,0x596D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 58, Array index 0x1000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x596F,0x5972,0x5975,0x5976,0x5979,0x597B,0x597C,
-	0x598B,0x598C,0x598E,0x5992,0x5995,0x5997,0x599F,0x59A4,
-	0x59A7,0x59AD,0x59AE,0x59AF,0x59B0,0x59B3,0x59B7,0x59BA,
-	0x59BC,0x59C1,0x59C3,0x59C4,0x59C8,0x59CA,0x59CD,0x59D2,
-	0x59DD,0x59DE,0x59DF,0x59E3,0x59E4,0x59E7,0x59EE,0x59EF,
-	0x59F1,0x59F2,0x59F4,0x59F7,0x5A00,0x5A04,0x5A0C,0x5A0D,
-	0x5A0E,0x5A12,0x5A13,0x5A1E,0x5A23,0x5A24,0x5A27,0x5A28,
-	0x5A2A,0x5A2D,0x5A30,0x5A44,0x5A45,0x5A47,0x5A48,0x5A4C,
-	0x5A50,0x5A55,0x5A5E,0x5A63,0x5A65,0x5A67,0x5A6D,0x5A77,
-	0x5A7A,0x5A7B,0x5A7E,0x5A8B,0x5A90,0x5A93,0x5A96,0x5A99,
-	0x5A9C,0x5A9E,0x5A9F,0x5AA0,0x5AA2,0x5AA7,0x5AAC,0x5AB1,
-	0x5AB2,0x5AB3,0x5AB5,0x5AB8,0x5ABA,0x5ABB,0x5ABF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 59, Array index 0x1100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5AC4,0x5AC6,0x5AC8,0x5ACF,0x5ADA,0x5ADC,0x5AE0,
-	0x5AE5,0x5AEA,0x5AEE,0x5AF5,0x5AF6,0x5AFD,0x5B00,0x5B01,
-	0x5B08,0x5B17,0x5B34,0x5B19,0x5B1B,0x5B1D,0x5B21,0x5B25,
-	0x5B2D,0x5B38,0x5B41,0x5B4B,0x5B4C,0x5B52,0x5B56,0x5B5E,
-	0x5B68,0x5B6E,0x5B6F,0x5B7C,0x5B7D,0x5B7E,0x5B7F,0x5B81,
-	0x5B84,0x5B86,0x5B8A,0x5B8E,0x5B90,0x5B91,0x5B93,0x5B94,
-	0x5B96,0x5BA8,0x5BA9,0x5BAC,0x5BAD,0x5BAF,0x5BB1,0x5BB2,
-	0x5BB7,0x5BBA,0x5BBC,0x5BC0,0x5BC1,0x5BCD,0x5BCF,0x5BD6,
-	0x5BD7,0x5BD8,0x5BD9,0x5BDA,0x5BE0,0x5BEF,0x5BF1,0x5BF4,
-	0x5BFD,0x5C0C,0x5C17,0x5C1E,0x5C1F,0x5C23,0x5C26,0x5C29,
-	0x5C2B,0x5C2C,0x5C2E,0x5C30,0x5C32,0x5C35,0x5C36,0x5C59,
-	0x5C5A,0x5C5C,0x5C62,0x5C63,0x5C67,0x5C68,0x5C69,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 60, Array index 0x1200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C6D,0x5C70,0x5C74,0x5C75,0x5C7A,0x5C7B,0x5C7C,
-	0x5C7D,0x5C87,0x5C88,0x5C8A,0x5C8F,0x5C92,0x5C9D,0x5C9F,
-	0x5CA0,0x5CA2,0x5CA3,0x5CA6,0x5CAA,0x5CB2,0x5CB4,0x5CB5,
-	0x5CBA,0x5CC9,0x5CCB,0x5CD2,0x5CDD,0x5CD7,0x5CEE,0x5CF1,
-	0x5CF2,0x5CF4,0x5D01,0x5D06,0x5D0D,0x5D12,0x5D2B,0x5D23,
-	0x5D24,0x5D26,0x5D27,0x5D31,0x5D34,0x5D39,0x5D3D,0x5D3F,
-	0x5D42,0x5D43,0x5D46,0x5D48,0x5D55,0x5D51,0x5D59,0x5D4A,
-	0x5D5F,0x5D60,0x5D61,0x5D62,0x5D64,0x5D6A,0x5D6D,0x5D70,
-	0x5D79,0x5D7A,0x5D7E,0x5D7F,0x5D81,0x5D83,0x5D88,0x5D8A,
-	0x5D92,0x5D93,0x5D94,0x5D95,0x5D99,0x5D9B,0x5D9F,0x5DA0,
-	0x5DA7,0x5DAB,0x5DB0,0x5DB4,0x5DB8,0x5DB9,0x5DC3,0x5DC7,
-	0x5DCB,0x5DD0,0x5DCE,0x5DD8,0x5DD9,0x5DE0,0x5DE4,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 61, Array index 0x1300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5DE9,0x5DF8,0x5DF9,0x5E00,0x5E07,0x5E0D,0x5E12,
-	0x5E14,0x5E15,0x5E18,0x5E1F,0x5E20,0x5E2E,0x5E28,0x5E32,
-	0x5E35,0x5E3E,0x5E4B,0x5E50,0x5E49,0x5E51,0x5E56,0x5E58,
-	0x5E5B,0x5E5C,0x5E5E,0x5E68,0x5E6A,0x5E6B,0x5E6C,0x5E6D,
-	0x5E6E,0x5E70,0x5E80,0x5E8B,0x5E8E,0x5EA2,0x5EA4,0x5EA5,
-	0x5EA8,0x5EAA,0x5EAC,0x5EB1,0x5EB3,0x5EBD,0x5EBE,0x5EBF,
-	0x5EC6,0x5ECC,0x5ECB,0x5ECE,0x5ED1,0x5ED2,0x5ED4,0x5ED5,
-	0x5EDC,0x5EDE,0x5EE5,0x5EEB,0x5F02,0x5F06,0x5F07,0x5F08,
-	0x5F0E,0x5F19,0x5F1C,0x5F1D,0x5F21,0x5F22,0x5F23,0x5F24,
-	0x5F28,0x5F2B,0x5F2C,0x5F2E,0x5F30,0x5F34,0x5F36,0x5F3B,
-	0x5F3D,0x5F3F,0x5F40,0x5F44,0x5F45,0x5F47,0x5F4D,0x5F50,
-	0x5F54,0x5F58,0x5F5B,0x5F60,0x5F63,0x5F64,0x5F67,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 62, Array index 0x1400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F6F,0x5F72,0x5F74,0x5F75,0x5F78,0x5F7A,0x5F7D,
-	0x5F7E,0x5F89,0x5F8D,0x5F8F,0x5F96,0x5F9C,0x5F9D,0x5FA2,
-	0x5FA7,0x5FAB,0x5FA4,0x5FAC,0x5FAF,0x5FB0,0x5FB1,0x5FB8,
-	0x5FC4,0x5FC7,0x5FC8,0x5FC9,0x5FCB,0x5FD0,0x5FD1,0x5FD2,
-	0x5FD3,0x5FD4,0x5FDE,0x5FE1,0x5FE2,0x5FE8,0x5FE9,0x5FEA,
-	0x5FEC,0x5FED,0x5FEE,0x5FEF,0x5FF2,0x5FF3,0x5FF6,0x5FFA,
-	0x5FFC,0x6007,0x600A,0x600D,0x6013,0x6014,0x6017,0x6018,
-	0x601A,0x601F,0x6024,0x602D,0x6033,0x6035,0x6040,0x6047,
-	0x6048,0x6049,0x604C,0x6051,0x6054,0x6056,0x6057,0x605D,
-	0x6061,0x6067,0x6071,0x607E,0x607F,0x6082,0x6086,0x6088,
-	0x608A,0x608E,0x6091,0x6093,0x6095,0x6098,0x609D,0x609E,
-	0x60A2,0x60A4,0x60A5,0x60A8,0x60B0,0x60B1,0x60B7,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 63, Array index 0x1500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x60BB,0x60BE,0x60C2,0x60C4,0x60C8,0x60C9,0x60CA,
-	0x60CB,0x60CE,0x60CF,0x60D4,0x60D5,0x60D9,0x60DB,0x60DD,
-	0x60DE,0x60E2,0x60E5,0x60F2,0x60F5,0x60F8,0x60FC,0x60FD,
-	0x6102,0x6107,0x610A,0x610C,0x6110,0x6111,0x6112,0x6113,
-	0x6114,0x6116,0x6117,0x6119,0x611C,0x611E,0x6122,0x612A,
-	0x612B,0x6130,0x6131,0x6135,0x6136,0x6137,0x6139,0x6141,
-	0x6145,0x6146,0x6149,0x615E,0x6160,0x616C,0x6172,0x6178,
-	0x617B,0x617C,0x617F,0x6180,0x6181,0x6183,0x6184,0x618B,
-	0x618D,0x6192,0x6193,0x6197,0x6198,0x619C,0x619D,0x619F,
-	0x61A0,0x61A5,0x61A8,0x61AA,0x61AD,0x61B8,0x61B9,0x61BC,
-	0x61C0,0x61C1,0x61C2,0x61CE,0x61CF,0x61D5,0x61DC,0x61DD,
-	0x61DE,0x61DF,0x61E1,0x61E2,0x61E7,0x61E9,0x61E5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 64, Array index 0x1600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x61EC,0x61ED,0x61EF,0x6201,0x6203,0x6204,0x6207,
-	0x6213,0x6215,0x621C,0x6220,0x6222,0x6223,0x6227,0x6229,
-	0x622B,0x6239,0x623D,0x6242,0x6243,0x6244,0x6246,0x624C,
-	0x6250,0x6251,0x6252,0x6254,0x6256,0x625A,0x625C,0x6264,
-	0x626D,0x626F,0x6273,0x627A,0x627D,0x628D,0x628E,0x628F,
-	0x6290,0x62A6,0x62A8,0x62B3,0x62B6,0x62B7,0x62BA,0x62BE,
-	0x62BF,0x62C4,0x62CE,0x62D5,0x62D6,0x62DA,0x62EA,0x62F2,
-	0x62F4,0x62FC,0x62FD,0x6303,0x6304,0x630A,0x630B,0x630D,
-	0x6310,0x6313,0x6316,0x6318,0x6329,0x632A,0x632D,0x6335,
-	0x6336,0x6339,0x633C,0x6341,0x6342,0x6343,0x6344,0x6346,
-	0x634A,0x634B,0x634E,0x6352,0x6353,0x6354,0x6358,0x635B,
-	0x6365,0x6366,0x636C,0x636D,0x6371,0x6374,0x6375,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 65, Array index 0x1700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6378,0x637C,0x637D,0x637F,0x6382,0x6384,0x6387,
-	0x638A,0x6390,0x6394,0x6395,0x6399,0x639A,0x639E,0x63A4,
-	0x63A6,0x63AD,0x63AE,0x63AF,0x63BD,0x63C1,0x63C5,0x63C8,
-	0x63CE,0x63D1,0x63D3,0x63D4,0x63D5,0x63DC,0x63E0,0x63E5,
-	0x63EA,0x63EC,0x63F2,0x63F3,0x63F5,0x63F8,0x63F9,0x6409,
-	0x640A,0x6410,0x6412,0x6414,0x6418,0x641E,0x6420,0x6422,
-	0x6424,0x6425,0x6429,0x642A,0x642F,0x6430,0x6435,0x643D,
-	0x643F,0x644B,0x644F,0x6451,0x6452,0x6453,0x6454,0x645A,
-	0x645B,0x645C,0x645D,0x645F,0x6460,0x6461,0x6463,0x646D,
-	0x6473,0x6474,0x647B,0x647D,0x6485,0x6487,0x648F,0x6490,
-	0x6491,0x6498,0x6499,0x649B,0x649D,0x649F,0x64A1,0x64A3,
-	0x64A6,0x64A8,0x64AC,0x64B3,0x64BD,0x64BE,0x64BF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 66, Array index 0x1800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x64C4,0x64C9,0x64CA,0x64CB,0x64CC,0x64CE,0x64D0,
-	0x64D1,0x64D5,0x64D7,0x64E4,0x64E5,0x64E9,0x64EA,0x64ED,
-	0x64F0,0x64F5,0x64F7,0x64FB,0x64FF,0x6501,0x6504,0x6508,
-	0x6509,0x650A,0x650F,0x6513,0x6514,0x6516,0x6519,0x651B,
-	0x651E,0x651F,0x6522,0x6526,0x6529,0x652E,0x6531,0x653A,
-	0x653C,0x653D,0x6543,0x6547,0x6549,0x6550,0x6552,0x6554,
-	0x655F,0x6560,0x6567,0x656B,0x657A,0x657D,0x6581,0x6585,
-	0x658A,0x6592,0x6595,0x6598,0x659D,0x65A0,0x65A3,0x65A6,
-	0x65AE,0x65B2,0x65B3,0x65B4,0x65BF,0x65C2,0x65C8,0x65C9,
-	0x65CE,0x65D0,0x65D4,0x65D6,0x65D8,0x65DF,0x65F0,0x65F2,
-	0x65F4,0x65F5,0x65F9,0x65FE,0x65FF,0x6600,0x6604,0x6608,
-	0x6609,0x660D,0x6611,0x6612,0x6615,0x6616,0x661D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 67, Array index 0x1900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x661E,0x6621,0x6622,0x6623,0x6624,0x6626,0x6629,
-	0x662A,0x662B,0x662C,0x662E,0x6630,0x6631,0x6633,0x6639,
-	0x6637,0x6640,0x6645,0x6646,0x664A,0x664C,0x6651,0x664E,
-	0x6657,0x6658,0x6659,0x665B,0x665C,0x6660,0x6661,0x66FB,
-	0x666A,0x666B,0x666C,0x667E,0x6673,0x6675,0x667F,0x6677,
-	0x6678,0x6679,0x667B,0x6680,0x667C,0x668B,0x668C,0x668D,
-	0x6690,0x6692,0x6699,0x669A,0x669B,0x669C,0x669F,0x66A0,
-	0x66A4,0x66AD,0x66B1,0x66B2,0x66B5,0x66BB,0x66BF,0x66C0,
-	0x66C2,0x66C3,0x66C8,0x66CC,0x66CE,0x66CF,0x66D4,0x66DB,
-	0x66DF,0x66E8,0x66EB,0x66EC,0x66EE,0x66FA,0x6705,0x6707,
-	0x670E,0x6713,0x6719,0x671C,0x6720,0x6722,0x6733,0x673E,
-	0x6745,0x6747,0x6748,0x674C,0x6754,0x6755,0x675D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 68, Array index 0x1A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6766,0x676C,0x676E,0x6774,0x6776,0x677B,0x6781,
-	0x6784,0x678E,0x678F,0x6791,0x6793,0x6796,0x6798,0x6799,
-	0x679B,0x67B0,0x67B1,0x67B2,0x67B5,0x67BB,0x67BC,0x67BD,
-	0x67F9,0x67C0,0x67C2,0x67C3,0x67C5,0x67C8,0x67C9,0x67D2,
-	0x67D7,0x67D9,0x67DC,0x67E1,0x67E6,0x67F0,0x67F2,0x67F6,
-	0x67F7,0x6852,0x6814,0x6819,0x681D,0x681F,0x6828,0x6827,
-	0x682C,0x682D,0x682F,0x6830,0x6831,0x6833,0x683B,0x683F,
-	0x6844,0x6845,0x684A,0x684C,0x6855,0x6857,0x6858,0x685B,
-	0x686B,0x686E,0x686F,0x6870,0x6871,0x6872,0x6875,0x6879,
-	0x687A,0x687B,0x687C,0x6882,0x6884,0x6886,0x6888,0x6896,
-	0x6898,0x689A,0x689C,0x68A1,0x68A3,0x68A5,0x68A9,0x68AA,
-	0x68AE,0x68B2,0x68BB,0x68C5,0x68C8,0x68CC,0x68CF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 69, Array index 0x1B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x68D0,0x68D1,0x68D3,0x68D6,0x68D9,0x68DC,0x68DD,
-	0x68E5,0x68E8,0x68EA,0x68EB,0x68EC,0x68ED,0x68F0,0x68F1,
-	0x68F5,0x68F6,0x68FB,0x68FC,0x68FD,0x6906,0x6909,0x690A,
-	0x6910,0x6911,0x6913,0x6916,0x6917,0x6931,0x6933,0x6935,
-	0x6938,0x693B,0x6942,0x6945,0x6949,0x694E,0x6957,0x695B,
-	0x6963,0x6964,0x6965,0x6966,0x6968,0x6969,0x696C,0x6970,
-	0x6971,0x6972,0x697A,0x697B,0x697F,0x6980,0x698D,0x6992,
-	0x6996,0x6998,0x69A1,0x69A5,0x69A6,0x69A8,0x69AB,0x69AD,
-	0x69AF,0x69B7,0x69B8,0x69BA,0x69BC,0x69C5,0x69C8,0x69D1,
-	0x69D6,0x69D7,0x69E2,0x69E5,0x69EE,0x69EF,0x69F1,0x69F3,
-	0x69F5,0x69FE,0x6A00,0x6A01,0x6A03,0x6A0F,0x6A11,0x6A15,
-	0x6A1A,0x6A1D,0x6A20,0x6A24,0x6A28,0x6A30,0x6A32,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 70, Array index 0x1C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A34,0x6A37,0x6A3B,0x6A3E,0x6A3F,0x6A45,0x6A46,
-	0x6A49,0x6A4A,0x6A4E,0x6A50,0x6A51,0x6A52,0x6A55,0x6A56,
-	0x6A5B,0x6A64,0x6A67,0x6A6A,0x6A71,0x6A73,0x6A7E,0x6A81,
-	0x6A83,0x6A86,0x6A87,0x6A89,0x6A8B,0x6A91,0x6A9B,0x6A9D,
-	0x6A9E,0x6A9F,0x6AA5,0x6AAB,0x6AAF,0x6AB0,0x6AB1,0x6AB4,
-	0x6ABD,0x6ABE,0x6ABF,0x6AC6,0x6AC9,0x6AC8,0x6ACC,0x6AD0,
-	0x6AD4,0x6AD5,0x6AD6,0x6ADC,0x6ADD,0x6AE4,0x6AE7,0x6AEC,
-	0x6AF0,0x6AF1,0x6AF2,0x6AFC,0x6AFD,0x6B02,0x6B03,0x6B06,
-	0x6B07,0x6B09,0x6B0F,0x6B10,0x6B11,0x6B17,0x6B1B,0x6B1E,
-	0x6B24,0x6B28,0x6B2B,0x6B2C,0x6B2F,0x6B35,0x6B36,0x6B3B,
-	0x6B3F,0x6B46,0x6B4A,0x6B4D,0x6B52,0x6B56,0x6B58,0x6B5D,
-	0x6B60,0x6B67,0x6B6B,0x6B6E,0x6B70,0x6B75,0x6B7D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 71, Array index 0x1D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B7E,0x6B82,0x6B85,0x6B97,0x6B9B,0x6B9F,0x6BA0,
-	0x6BA2,0x6BA3,0x6BA8,0x6BA9,0x6BAC,0x6BAD,0x6BAE,0x6BB0,
-	0x6BB8,0x6BB9,0x6BBD,0x6BBE,0x6BC3,0x6BC4,0x6BC9,0x6BCC,
-	0x6BD6,0x6BDA,0x6BE1,0x6BE3,0x6BE6,0x6BE7,0x6BEE,0x6BF1,
-	0x6BF7,0x6BF9,0x6BFF,0x6C02,0x6C04,0x6C05,0x6C09,0x6C0D,
-	0x6C0E,0x6C10,0x6C12,0x6C19,0x6C1F,0x6C26,0x6C27,0x6C28,
-	0x6C2C,0x6C2E,0x6C33,0x6C35,0x6C36,0x6C3A,0x6C3B,0x6C3F,
-	0x6C4A,0x6C4B,0x6C4D,0x6C4F,0x6C52,0x6C54,0x6C59,0x6C5B,
-	0x6C5C,0x6C6B,0x6C6D,0x6C6F,0x6C74,0x6C76,0x6C78,0x6C79,
-	0x6C7B,0x6C85,0x6C86,0x6C87,0x6C89,0x6C94,0x6C95,0x6C97,
-	0x6C98,0x6C9C,0x6C9F,0x6CB0,0x6CB2,0x6CB4,0x6CC2,0x6CC6,
-	0x6CCD,0x6CCF,0x6CD0,0x6CD1,0x6CD2,0x6CD4,0x6CD6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 72, Array index 0x1E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6CDA,0x6CDC,0x6CE0,0x6CE7,0x6CE9,0x6CEB,0x6CEC,
-	0x6CEE,0x6CF2,0x6CF4,0x6D04,0x6D07,0x6D0A,0x6D0E,0x6D0F,
-	0x6D11,0x6D13,0x6D1A,0x6D26,0x6D27,0x6D28,0x6C67,0x6D2E,
-	0x6D2F,0x6D31,0x6D39,0x6D3C,0x6D3F,0x6D57,0x6D5E,0x6D5F,
-	0x6D61,0x6D65,0x6D67,0x6D6F,0x6D70,0x6D7C,0x6D82,0x6D87,
-	0x6D91,0x6D92,0x6D94,0x6D96,0x6D97,0x6D98,0x6DAA,0x6DAC,
-	0x6DB4,0x6DB7,0x6DB9,0x6DBD,0x6DBF,0x6DC4,0x6DC8,0x6DCA,
-	0x6DCE,0x6DCF,0x6DD6,0x6DDB,0x6DDD,0x6DDF,0x6DE0,0x6DE2,
-	0x6DE5,0x6DE9,0x6DEF,0x6DF0,0x6DF4,0x6DF6,0x6DFC,0x6E00,
-	0x6E04,0x6E1E,0x6E22,0x6E27,0x6E32,0x6E36,0x6E39,0x6E3B,
-	0x6E3C,0x6E44,0x6E45,0x6E48,0x6E49,0x6E4B,0x6E4F,0x6E51,
-	0x6E52,0x6E53,0x6E54,0x6E57,0x6E5C,0x6E5D,0x6E5E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 73, Array index 0x1F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6E62,0x6E63,0x6E68,0x6E73,0x6E7B,0x6E7D,0x6E8D,
-	0x6E93,0x6E99,0x6EA0,0x6EA7,0x6EAD,0x6EAE,0x6EB1,0x6EB3,
-	0x6EBB,0x6EBF,0x6EC0,0x6EC1,0x6EC3,0x6EC7,0x6EC8,0x6ECA,
-	0x6ECD,0x6ECE,0x6ECF,0x6EEB,0x6EED,0x6EEE,0x6EF9,0x6EFB,
-	0x6EFD,0x6F04,0x6F08,0x6F0A,0x6F0C,0x6F0D,0x6F16,0x6F18,
-	0x6F1A,0x6F1B,0x6F26,0x6F29,0x6F2A,0x6F2F,0x6F30,0x6F33,
-	0x6F36,0x6F3B,0x6F3C,0x6F2D,0x6F4F,0x6F51,0x6F52,0x6F53,
-	0x6F57,0x6F59,0x6F5A,0x6F5D,0x6F5E,0x6F61,0x6F62,0x6F68,
-	0x6F6C,0x6F7D,0x6F7E,0x6F83,0x6F87,0x6F88,0x6F8B,0x6F8C,
-	0x6F8D,0x6F90,0x6F92,0x6F93,0x6F94,0x6F96,0x6F9A,0x6F9F,
-	0x6FA0,0x6FA5,0x6FA6,0x6FA7,0x6FA8,0x6FAE,0x6FAF,0x6FB0,
-	0x6FB5,0x6FB6,0x6FBC,0x6FC5,0x6FC7,0x6FC8,0x6FCA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 74, Array index 0x2000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6FDA,0x6FDE,0x6FE8,0x6FE9,0x6FF0,0x6FF5,0x6FF9,
-	0x6FFC,0x6FFD,0x7000,0x7005,0x7006,0x7007,0x700D,0x7017,
-	0x7020,0x7023,0x702F,0x7034,0x7037,0x7039,0x703C,0x7043,
-	0x7044,0x7048,0x7049,0x704A,0x704B,0x7054,0x7055,0x705D,
-	0x705E,0x704E,0x7064,0x7065,0x706C,0x706E,0x7075,0x7076,
-	0x707E,0x7081,0x7085,0x7086,0x7094,0x7095,0x7096,0x7097,
-	0x7098,0x709B,0x70A4,0x70AB,0x70B0,0x70B1,0x70B4,0x70B7,
-	0x70CA,0x70D1,0x70D3,0x70D4,0x70D5,0x70D6,0x70D8,0x70DC,
-	0x70E4,0x70FA,0x7103,0x7104,0x7105,0x7106,0x7107,0x710B,
-	0x710C,0x710F,0x711E,0x7120,0x712B,0x712D,0x712F,0x7130,
-	0x7131,0x7138,0x7141,0x7145,0x7146,0x7147,0x714A,0x714B,
-	0x7150,0x7152,0x7157,0x715A,0x715C,0x715E,0x7160,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 75, Array index 0x2100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7168,0x7179,0x7180,0x7185,0x7187,0x718C,0x7192,
-	0x719A,0x719B,0x71A0,0x71A2,0x71AF,0x71B0,0x71B2,0x71B3,
-	0x71BA,0x71BF,0x71C0,0x71C1,0x71C4,0x71CB,0x71CC,0x71D3,
-	0x71D6,0x71D9,0x71DA,0x71DC,0x71F8,0x71FE,0x7200,0x7207,
-	0x7208,0x7209,0x7213,0x7217,0x721A,0x721D,0x721F,0x7224,
-	0x722B,0x722F,0x7234,0x7238,0x7239,0x7241,0x7242,0x7243,
-	0x7245,0x724E,0x724F,0x7250,0x7253,0x7255,0x7256,0x725A,
-	0x725C,0x725E,0x7260,0x7263,0x7268,0x726B,0x726E,0x726F,
-	0x7271,0x7277,0x7278,0x727B,0x727C,0x727F,0x7284,0x7289,
-	0x728D,0x728E,0x7293,0x729B,0x72A8,0x72AD,0x72AE,0x72B1,
-	0x72B4,0x72BE,0x72C1,0x72C7,0x72C9,0x72CC,0x72D5,0x72D6,
-	0x72D8,0x72DF,0x72E5,0x72F3,0x72F4,0x72FA,0x72FB,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 76, Array index 0x2200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x72FE,0x7302,0x7304,0x7305,0x7307,0x730B,0x730D,
-	0x7312,0x7313,0x7318,0x7319,0x731E,0x7322,0x7324,0x7327,
-	0x7328,0x732C,0x7331,0x7332,0x7335,0x733A,0x733B,0x733D,
-	0x7343,0x734D,0x7350,0x7352,0x7356,0x7358,0x735D,0x735E,
-	0x735F,0x7360,0x7366,0x7367,0x7369,0x736B,0x736C,0x736E,
-	0x736F,0x7371,0x7377,0x7379,0x737C,0x7380,0x7381,0x7383,
-	0x7385,0x7386,0x738E,0x7390,0x7393,0x7395,0x7397,0x7398,
-	0x739C,0x739E,0x739F,0x73A0,0x73A2,0x73A5,0x73A6,0x73AA,
-	0x73AB,0x73AD,0x73B5,0x73B7,0x73B9,0x73BC,0x73BD,0x73BF,
-	0x73C5,0x73C6,0x73C9,0x73CB,0x73CC,0x73CF,0x73D2,0x73D3,
-	0x73D6,0x73D9,0x73DD,0x73E1,0x73E3,0x73E6,0x73E7,0x73E9,
-	0x73F4,0x73F5,0x73F7,0x73F9,0x73FA,0x73FB,0x73FD,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 77, Array index 0x2300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x73FF,0x7400,0x7401,0x7404,0x7407,0x740A,0x7411,
-	0x741A,0x741B,0x7424,0x7426,0x7428,0x7429,0x742A,0x742B,
-	0x742C,0x742D,0x742E,0x742F,0x7430,0x7431,0x7439,0x7440,
-	0x7443,0x7444,0x7446,0x7447,0x744B,0x744D,0x7451,0x7452,
-	0x7457,0x745D,0x7462,0x7466,0x7467,0x7468,0x746B,0x746D,
-	0x746E,0x7471,0x7472,0x7480,0x7481,0x7485,0x7486,0x7487,
-	0x7489,0x748F,0x7490,0x7491,0x7492,0x7498,0x7499,0x749A,
-	0x749C,0x749F,0x74A0,0x74A1,0x74A3,0x74A6,0x74A8,0x74A9,
-	0x74AA,0x74AB,0x74AE,0x74AF,0x74B1,0x74B2,0x74B5,0x74B9,
-	0x74BB,0x74BF,0x74C8,0x74C9,0x74CC,0x74D0,0x74D3,0x74D8,
-	0x74DA,0x74DB,0x74DE,0x74DF,0x74E4,0x74E8,0x74EA,0x74EB,
-	0x74EF,0x74F4,0x74FA,0x74FB,0x74FC,0x74FF,0x7506,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 78, Array index 0x2400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7512,0x7516,0x7517,0x7520,0x7521,0x7524,0x7527,
-	0x7529,0x752A,0x752F,0x7536,0x7539,0x753D,0x753E,0x753F,
-	0x7540,0x7543,0x7547,0x7548,0x754E,0x7550,0x7552,0x7557,
-	0x755E,0x755F,0x7561,0x756F,0x7571,0x7579,0x757A,0x757B,
-	0x757C,0x757D,0x757E,0x7581,0x7585,0x7590,0x7592,0x7593,
-	0x7595,0x7599,0x759C,0x75A2,0x75A4,0x75B4,0x75BA,0x75BF,
-	0x75C0,0x75C1,0x75C4,0x75C6,0x75CC,0x75CE,0x75CF,0x75D7,
-	0x75DC,0x75DF,0x75E0,0x75E1,0x75E4,0x75E7,0x75EC,0x75EE,
-	0x75EF,0x75F1,0x75F9,0x7600,0x7602,0x7603,0x7604,0x7607,
-	0x7608,0x760A,0x760C,0x760F,0x7612,0x7613,0x7615,0x7616,
-	0x7619,0x761B,0x761C,0x761D,0x761E,0x7623,0x7625,0x7626,
-	0x7629,0x762D,0x7632,0x7633,0x7635,0x7638,0x7639,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 79, Array index 0x2500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x763A,0x763C,0x764A,0x7640,0x7641,0x7643,0x7644,
-	0x7645,0x7649,0x764B,0x7655,0x7659,0x765F,0x7664,0x7665,
-	0x766D,0x766E,0x766F,0x7671,0x7674,0x7681,0x7685,0x768C,
-	0x768D,0x7695,0x769B,0x769C,0x769D,0x769F,0x76A0,0x76A2,
-	0x76A3,0x76A4,0x76A5,0x76A6,0x76A7,0x76A8,0x76AA,0x76AD,
-	0x76BD,0x76C1,0x76C5,0x76C9,0x76CB,0x76CC,0x76CE,0x76D4,
-	0x76D9,0x76E0,0x76E6,0x76E8,0x76EC,0x76F0,0x76F1,0x76F6,
-	0x76F9,0x76FC,0x7700,0x7706,0x770A,0x770E,0x7712,0x7714,
-	0x7715,0x7717,0x7719,0x771A,0x771C,0x7722,0x7728,0x772D,
-	0x772E,0x772F,0x7734,0x7735,0x7736,0x7739,0x773D,0x773E,
-	0x7742,0x7745,0x7746,0x774A,0x774D,0x774E,0x774F,0x7752,
-	0x7756,0x7757,0x775C,0x775E,0x775F,0x7760,0x7762,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 80, Array index 0x2600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7764,0x7767,0x776A,0x776C,0x7770,0x7772,0x7773,
-	0x7774,0x777A,0x777D,0x7780,0x7784,0x778C,0x778D,0x7794,
-	0x7795,0x7796,0x779A,0x779F,0x77A2,0x77A7,0x77AA,0x77AE,
-	0x77AF,0x77B1,0x77B5,0x77BE,0x77C3,0x77C9,0x77D1,0x77D2,
-	0x77D5,0x77D9,0x77DE,0x77DF,0x77E0,0x77E4,0x77E6,0x77EA,
-	0x77EC,0x77F0,0x77F1,0x77F4,0x77F8,0x77FB,0x7805,0x7806,
-	0x7809,0x780D,0x780E,0x7811,0x781D,0x7821,0x7822,0x7823,
-	0x782D,0x782E,0x7830,0x7835,0x7837,0x7843,0x7844,0x7847,
-	0x7848,0x784C,0x784E,0x7852,0x785C,0x785E,0x7860,0x7861,
-	0x7863,0x7864,0x7868,0x786A,0x786E,0x787A,0x787E,0x788A,
-	0x788F,0x7894,0x7898,0x78A1,0x789D,0x789E,0x789F,0x78A4,
-	0x78A8,0x78AC,0x78AD,0x78B0,0x78B1,0x78B2,0x78B3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 81, Array index 0x2700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x78BB,0x78BD,0x78BF,0x78C7,0x78C8,0x78C9,0x78CC,
-	0x78CE,0x78D2,0x78D3,0x78D5,0x78D6,0x78E4,0x78DB,0x78DF,
-	0x78E0,0x78E1,0x78E6,0x78EA,0x78F2,0x78F3,0x7900,0x78F6,
-	0x78F7,0x78FA,0x78FB,0x78FF,0x7906,0x790C,0x7910,0x791A,
-	0x791C,0x791E,0x791F,0x7920,0x7925,0x7927,0x7929,0x792D,
-	0x7931,0x7934,0x7935,0x793B,0x793D,0x793F,0x7944,0x7945,
-	0x7946,0x794A,0x794B,0x794F,0x7951,0x7954,0x7958,0x795B,
-	0x795C,0x7967,0x7969,0x796B,0x7972,0x7979,0x797B,0x797C,
-	0x797E,0x798B,0x798C,0x7991,0x7993,0x7994,0x7995,0x7996,
-	0x7998,0x799B,0x799C,0x79A1,0x79A8,0x79A9,0x79AB,0x79AF,
-	0x79B1,0x79B4,0x79B8,0x79BB,0x79C2,0x79C4,0x79C7,0x79C8,
-	0x79CA,0x79CF,0x79D4,0x79D6,0x79DA,0x79DD,0x79DE,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 82, Array index 0x2800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x79E0,0x79E2,0x79E5,0x79EA,0x79EB,0x79ED,0x79F1,
-	0x79F8,0x79FC,0x7A02,0x7A03,0x7A07,0x7A09,0x7A0A,0x7A0C,
-	0x7A11,0x7A15,0x7A1B,0x7A1E,0x7A21,0x7A27,0x7A2B,0x7A2D,
-	0x7A2F,0x7A30,0x7A34,0x7A35,0x7A38,0x7A39,0x7A3A,0x7A44,
-	0x7A45,0x7A47,0x7A48,0x7A4C,0x7A55,0x7A56,0x7A59,0x7A5C,
-	0x7A5D,0x7A5F,0x7A60,0x7A65,0x7A67,0x7A6A,0x7A6D,0x7A75,
-	0x7A78,0x7A7E,0x7A80,0x7A82,0x7A85,0x7A86,0x7A8A,0x7A8B,
-	0x7A90,0x7A91,0x7A94,0x7A9E,0x7AA0,0x7AA3,0x7AAC,0x7AB3,
-	0x7AB5,0x7AB9,0x7ABB,0x7ABC,0x7AC6,0x7AC9,0x7ACC,0x7ACE,
-	0x7AD1,0x7ADB,0x7AE8,0x7AE9,0x7AEB,0x7AEC,0x7AF1,0x7AF4,
-	0x7AFB,0x7AFD,0x7AFE,0x7B07,0x7B14,0x7B1F,0x7B23,0x7B27,
-	0x7B29,0x7B2A,0x7B2B,0x7B2D,0x7B2E,0x7B2F,0x7B30,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 83, Array index 0x2900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7B31,0x7B34,0x7B3D,0x7B3F,0x7B40,0x7B41,0x7B47,
-	0x7B4E,0x7B55,0x7B60,0x7B64,0x7B66,0x7B69,0x7B6A,0x7B6D,
-	0x7B6F,0x7B72,0x7B73,0x7B77,0x7B84,0x7B89,0x7B8E,0x7B90,
-	0x7B91,0x7B96,0x7B9B,0x7B9E,0x7BA0,0x7BA5,0x7BAC,0x7BAF,
-	0x7BB0,0x7BB2,0x7BB5,0x7BB6,0x7BBA,0x7BBB,0x7BBC,0x7BBD,
-	0x7BC2,0x7BC5,0x7BC8,0x7BCA,0x7BD4,0x7BD6,0x7BD7,0x7BD9,
-	0x7BDA,0x7BDB,0x7BE8,0x7BEA,0x7BF2,0x7BF4,0x7BF5,0x7BF8,
-	0x7BF9,0x7BFA,0x7BFC,0x7BFE,0x7C01,0x7C02,0x7C03,0x7C04,
-	0x7C06,0x7C09,0x7C0B,0x7C0C,0x7C0E,0x7C0F,0x7C19,0x7C1B,
-	0x7C20,0x7C25,0x7C26,0x7C28,0x7C2C,0x7C31,0x7C33,0x7C34,
-	0x7C36,0x7C39,0x7C3A,0x7C46,0x7C4A,0x7C55,0x7C51,0x7C52,
-	0x7C53,0x7C59,0x7C5A,0x7C5B,0x7C5C,0x7C5D,0x7C5E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 84, Array index 0x2A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7C61,0x7C63,0x7C67,0x7C69,0x7C6D,0x7C6E,0x7C70,
-	0x7C72,0x7C79,0x7C7C,0x7C7D,0x7C86,0x7C87,0x7C8F,0x7C94,
-	0x7C9E,0x7CA0,0x7CA6,0x7CB0,0x7CB6,0x7CB7,0x7CBA,0x7CBB,
-	0x7CBC,0x7CBF,0x7CC4,0x7CC7,0x7CC8,0x7CC9,0x7CCD,0x7CCF,
-	0x7CD3,0x7CD4,0x7CD5,0x7CD7,0x7CD9,0x7CDA,0x7CDD,0x7CE6,
-	0x7CE9,0x7CEB,0x7CF5,0x7D03,0x7D07,0x7D08,0x7D09,0x7D0F,
-	0x7D11,0x7D12,0x7D13,0x7D16,0x7D1D,0x7D1E,0x7D23,0x7D26,
-	0x7D2A,0x7D2D,0x7D31,0x7D3C,0x7D3D,0x7D3E,0x7D40,0x7D41,
-	0x7D47,0x7D48,0x7D4D,0x7D51,0x7D53,0x7D57,0x7D59,0x7D5A,
-	0x7D5C,0x7D5D,0x7D65,0x7D67,0x7D6A,0x7D70,0x7D78,0x7D7A,
-	0x7D7B,0x7D7F,0x7D81,0x7D82,0x7D83,0x7D85,0x7D86,0x7D88,
-	0x7D8B,0x7D8C,0x7D8D,0x7D91,0x7D96,0x7D97,0x7D9D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 85, Array index 0x2B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7D9E,0x7DA6,0x7DA7,0x7DAA,0x7DB3,0x7DB6,0x7DB7,
-	0x7DB9,0x7DC2,0x7DC3,0x7DC4,0x7DC5,0x7DC6,0x7DCC,0x7DCD,
-	0x7DCE,0x7DD7,0x7DD9,0x7E00,0x7DE2,0x7DE5,0x7DE6,0x7DEA,
-	0x7DEB,0x7DED,0x7DF1,0x7DF5,0x7DF6,0x7DF9,0x7DFA,0x7E08,
-	0x7E10,0x7E11,0x7E15,0x7E17,0x7E1C,0x7E1D,0x7E20,0x7E27,
-	0x7E28,0x7E2C,0x7E2D,0x7E2F,0x7E33,0x7E36,0x7E3F,0x7E44,
-	0x7E45,0x7E47,0x7E4E,0x7E50,0x7E52,0x7E58,0x7E5F,0x7E61,
-	0x7E62,0x7E65,0x7E6B,0x7E6E,0x7E6F,0x7E73,0x7E78,0x7E7E,
-	0x7E81,0x7E86,0x7E87,0x7E8A,0x7E8D,0x7E91,0x7E95,0x7E98,
-	0x7E9A,0x7E9D,0x7E9E,0x7F3C,0x7F3B,0x7F3D,0x7F3E,0x7F3F,
-	0x7F43,0x7F44,0x7F47,0x7F4F,0x7F52,0x7F53,0x7F5B,0x7F5C,
-	0x7F5D,0x7F61,0x7F63,0x7F64,0x7F65,0x7F66,0x7F6D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 86, Array index 0x2C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7F71,0x7F7D,0x7F7E,0x7F7F,0x7F80,0x7F8B,0x7F8D,
-	0x7F8F,0x7F90,0x7F91,0x7F96,0x7F97,0x7F9C,0x7FA1,0x7FA2,
-	0x7FA6,0x7FAA,0x7FAD,0x7FB4,0x7FBC,0x7FBF,0x7FC0,0x7FC3,
-	0x7FC8,0x7FCE,0x7FCF,0x7FDB,0x7FDF,0x7FE3,0x7FE5,0x7FE8,
-	0x7FEC,0x7FEE,0x7FEF,0x7FF2,0x7FFA,0x7FFD,0x7FFE,0x7FFF,
-	0x8007,0x8008,0x800A,0x800D,0x800E,0x800F,0x8011,0x8013,
-	0x8014,0x8016,0x801D,0x801E,0x801F,0x8020,0x8024,0x8026,
-	0x802C,0x802E,0x8030,0x8034,0x8035,0x8037,0x8039,0x803A,
-	0x803C,0x803E,0x8040,0x8044,0x8060,0x8064,0x8066,0x806D,
-	0x8071,0x8075,0x8081,0x8088,0x808E,0x809C,0x809E,0x80A6,
-	0x80A7,0x80AB,0x80B8,0x80B9,0x80C8,0x80CD,0x80CF,0x80D2,
-	0x80D4,0x80D5,0x80D7,0x80D8,0x80E0,0x80ED,0x80EE,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 87, Array index 0x2D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x80F0,0x80F2,0x80F3,0x80F6,0x80F9,0x80FA,0x80FE,
-	0x8103,0x810B,0x8116,0x8117,0x8118,0x811C,0x811E,0x8120,
-	0x8124,0x8127,0x812C,0x8130,0x8135,0x813A,0x813C,0x8145,
-	0x8147,0x814A,0x814C,0x8152,0x8157,0x8160,0x8161,0x8167,
-	0x8168,0x8169,0x816D,0x816F,0x8177,0x8181,0x8190,0x8184,
-	0x8185,0x8186,0x818B,0x818E,0x8196,0x8198,0x819B,0x819E,
-	0x81A2,0x81AE,0x81B2,0x81B4,0x81BB,0x81CB,0x81C3,0x81C5,
-	0x81CA,0x81CE,0x81CF,0x81D5,0x81D7,0x81DB,0x81DD,0x81DE,
-	0x81E1,0x81E4,0x81EB,0x81EC,0x81F0,0x81F1,0x81F2,0x81F5,
-	0x81F6,0x81F8,0x81F9,0x81FD,0x81FF,0x8200,0x8203,0x820F,
-	0x8213,0x8214,0x8219,0x821A,0x821D,0x8221,0x8222,0x8228,
-	0x8232,0x8234,0x823A,0x8243,0x8244,0x8245,0x8246,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 88, Array index 0x2E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x824B,0x824E,0x824F,0x8251,0x8256,0x825C,0x8260,
-	0x8263,0x8267,0x826D,0x8274,0x827B,0x827D,0x827F,0x8280,
-	0x8281,0x8283,0x8284,0x8287,0x8289,0x828A,0x828E,0x8291,
-	0x8294,0x8296,0x8298,0x829A,0x829B,0x82A0,0x82A1,0x82A3,
-	0x82A4,0x82A7,0x82A8,0x82A9,0x82AA,0x82AE,0x82B0,0x82B2,
-	0x82B4,0x82B7,0x82BA,0x82BC,0x82BE,0x82BF,0x82C6,0x82D0,
-	0x82D5,0x82DA,0x82E0,0x82E2,0x82E4,0x82E8,0x82EA,0x82ED,
-	0x82EF,0x82F6,0x82F7,0x82FD,0x82FE,0x8300,0x8301,0x8307,
-	0x8308,0x830A,0x830B,0x8354,0x831B,0x831D,0x831E,0x831F,
-	0x8321,0x8322,0x832C,0x832D,0x832E,0x8330,0x8333,0x8337,
-	0x833A,0x833C,0x833D,0x8342,0x8343,0x8344,0x8347,0x834D,
-	0x834E,0x8351,0x8355,0x8356,0x8357,0x8370,0x8378,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 89, Array index 0x2F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x837D,0x837F,0x8380,0x8382,0x8384,0x8386,0x838D,
-	0x8392,0x8394,0x8395,0x8398,0x8399,0x839B,0x839C,0x839D,
-	0x83A6,0x83A7,0x83A9,0x83AC,0x83BE,0x83BF,0x83C0,0x83C7,
-	0x83C9,0x83CF,0x83D0,0x83D1,0x83D4,0x83DD,0x8353,0x83E8,
-	0x83EA,0x83F6,0x83F8,0x83F9,0x83FC,0x8401,0x8406,0x840A,
-	0x840F,0x8411,0x8415,0x8419,0x83AD,0x842F,0x8439,0x8445,
-	0x8447,0x8448,0x844A,0x844D,0x844F,0x8451,0x8452,0x8456,
-	0x8458,0x8459,0x845A,0x845C,0x8460,0x8464,0x8465,0x8467,
-	0x846A,0x8470,0x8473,0x8474,0x8476,0x8478,0x847C,0x847D,
-	0x8481,0x8485,0x8492,0x8493,0x8495,0x849E,0x84A6,0x84A8,
-	0x84A9,0x84AA,0x84AF,0x84B1,0x84B4,0x84BA,0x84BD,0x84BE,
-	0x84C0,0x84C2,0x84C7,0x84C8,0x84CC,0x84CF,0x84D3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 90, Array index 0x3000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x84DC,0x84E7,0x84EA,0x84EF,0x84F0,0x84F1,0x84F2,
-	0x84F7,0x8532,0x84FA,0x84FB,0x84FD,0x8502,0x8503,0x8507,
-	0x850C,0x850E,0x8510,0x851C,0x851E,0x8522,0x8523,0x8524,
-	0x8525,0x8527,0x852A,0x852B,0x852F,0x8533,0x8534,0x8536,
-	0x853F,0x8546,0x854F,0x8550,0x8551,0x8552,0x8553,0x8556,
-	0x8559,0x855C,0x855D,0x855E,0x855F,0x8560,0x8561,0x8562,
-	0x8564,0x856B,0x856F,0x8579,0x857A,0x857B,0x857D,0x857F,
-	0x8581,0x8585,0x8586,0x8589,0x858B,0x858C,0x858F,0x8593,
-	0x8598,0x859D,0x859F,0x85A0,0x85A2,0x85A5,0x85A7,0x85B4,
-	0x85B6,0x85B7,0x85B8,0x85BC,0x85BD,0x85BE,0x85BF,0x85C2,
-	0x85C7,0x85CA,0x85CB,0x85CE,0x85AD,0x85D8,0x85DA,0x85DF,
-	0x85E0,0x85E6,0x85E8,0x85ED,0x85F3,0x85F6,0x85FC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 91, Array index 0x3100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x85FF,0x8600,0x8604,0x8605,0x860D,0x860E,0x8610,
-	0x8611,0x8612,0x8618,0x8619,0x861B,0x861E,0x8621,0x8627,
-	0x8629,0x8636,0x8638,0x863A,0x863C,0x863D,0x8640,0x8642,
-	0x8646,0x8652,0x8653,0x8656,0x8657,0x8658,0x8659,0x865D,
-	0x8660,0x8661,0x8662,0x8663,0x8664,0x8669,0x866C,0x866F,
-	0x8675,0x8676,0x8677,0x867A,0x868D,0x8691,0x8696,0x8698,
-	0x869A,0x869C,0x86A1,0x86A6,0x86A7,0x86A8,0x86AD,0x86B1,
-	0x86B3,0x86B4,0x86B5,0x86B7,0x86B8,0x86B9,0x86BF,0x86C0,
-	0x86C1,0x86C3,0x86C5,0x86D1,0x86D2,0x86D5,0x86D7,0x86DA,
-	0x86DC,0x86E0,0x86E3,0x86E5,0x86E7,0x8688,0x86FA,0x86FC,
-	0x86FD,0x8704,0x8705,0x8707,0x870B,0x870E,0x870F,0x8710,
-	0x8713,0x8714,0x8719,0x871E,0x871F,0x8721,0x8723,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 92, Array index 0x3200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8728,0x872E,0x872F,0x8731,0x8732,0x8739,0x873A,
-	0x873C,0x873D,0x873E,0x8740,0x8743,0x8745,0x874D,0x8758,
-	0x875D,0x8761,0x8764,0x8765,0x876F,0x8771,0x8772,0x877B,
-	0x8783,0x8784,0x8785,0x8786,0x8787,0x8788,0x8789,0x878B,
-	0x878C,0x8790,0x8793,0x8795,0x8797,0x8798,0x8799,0x879E,
-	0x87A0,0x87A3,0x87A7,0x87AC,0x87AD,0x87AE,0x87B1,0x87B5,
-	0x87BE,0x87BF,0x87C1,0x87C8,0x87C9,0x87CA,0x87CE,0x87D5,
-	0x87D6,0x87D9,0x87DA,0x87DC,0x87DF,0x87E2,0x87E3,0x87E4,
-	0x87EA,0x87EB,0x87ED,0x87F1,0x87F3,0x87F8,0x87FA,0x87FF,
-	0x8801,0x8803,0x8806,0x8809,0x880A,0x880B,0x8810,0x8819,
-	0x8812,0x8813,0x8814,0x8818,0x881A,0x881B,0x881C,0x881E,
-	0x881F,0x8828,0x882D,0x882E,0x8830,0x8832,0x8835,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 93, Array index 0x3300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x883A,0x883C,0x8841,0x8843,0x8845,0x8848,0x8849,
-	0x884A,0x884B,0x884E,0x8851,0x8855,0x8856,0x8858,0x885A,
-	0x885C,0x885F,0x8860,0x8864,0x8869,0x8871,0x8879,0x887B,
-	0x8880,0x8898,0x889A,0x889B,0x889C,0x889F,0x88A0,0x88A8,
-	0x88AA,0x88BA,0x88BD,0x88BE,0x88C0,0x88CA,0x88CB,0x88CC,
-	0x88CD,0x88CE,0x88D1,0x88D2,0x88D3,0x88DB,0x88DE,0x88E7,
-	0x88EF,0x88F0,0x88F1,0x88F5,0x88F7,0x8901,0x8906,0x890D,
-	0x890E,0x890F,0x8915,0x8916,0x8918,0x8919,0x891A,0x891C,
-	0x8920,0x8926,0x8927,0x8928,0x8930,0x8931,0x8932,0x8935,
-	0x8939,0x893A,0x893E,0x8940,0x8942,0x8945,0x8946,0x8949,
-	0x894F,0x8952,0x8957,0x895A,0x895B,0x895C,0x8961,0x8962,
-	0x8963,0x896B,0x896E,0x8970,0x8973,0x8975,0x897A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 94, Array index 0x3400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x897B,0x897C,0x897D,0x8989,0x898D,0x8990,0x8994,
-	0x8995,0x899B,0x899C,0x899F,0x89A0,0x89A5,0x89B0,0x89B4,
-	0x89B5,0x89B6,0x89B7,0x89BC,0x89D4,0x89D5,0x89D6,0x89D7,
-	0x89D8,0x89E5,0x89E9,0x89EB,0x89ED,0x89F1,0x89F3,0x89F6,
-	0x89F9,0x89FD,0x89FF,0x8A04,0x8A05,0x8A07,0x8A0F,0x8A11,
-	0x8A12,0x8A14,0x8A15,0x8A1E,0x8A20,0x8A22,0x8A24,0x8A26,
-	0x8A2B,0x8A2C,0x8A2F,0x8A35,0x8A37,0x8A3D,0x8A3E,0x8A40,
-	0x8A43,0x8A45,0x8A47,0x8A49,0x8A4D,0x8A4E,0x8A53,0x8A56,
-	0x8A57,0x8A58,0x8A5C,0x8A5D,0x8A61,0x8A65,0x8A67,0x8A75,
-	0x8A76,0x8A77,0x8A79,0x8A7A,0x8A7B,0x8A7E,0x8A7F,0x8A80,
-	0x8A83,0x8A86,0x8A8B,0x8A8F,0x8A90,0x8A92,0x8A96,0x8A97,
-	0x8A99,0x8A9F,0x8AA7,0x8AA9,0x8AAE,0x8AAF,0x8AB3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 95, Array index 0x3500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8AB6,0x8AB7,0x8ABB,0x8ABE,0x8AC3,0x8AC6,0x8AC8,
-	0x8AC9,0x8ACA,0x8AD1,0x8AD3,0x8AD4,0x8AD5,0x8AD7,0x8ADD,
-	0x8ADF,0x8AEC,0x8AF0,0x8AF4,0x8AF5,0x8AF6,0x8AFC,0x8AFF,
-	0x8B05,0x8B06,0x8B0B,0x8B11,0x8B1C,0x8B1E,0x8B1F,0x8B0A,
-	0x8B2D,0x8B30,0x8B37,0x8B3C,0x8B42,0x8B43,0x8B44,0x8B45,
-	0x8B46,0x8B48,0x8B52,0x8B53,0x8B54,0x8B59,0x8B4D,0x8B5E,
-	0x8B63,0x8B6D,0x8B76,0x8B78,0x8B79,0x8B7C,0x8B7E,0x8B81,
-	0x8B84,0x8B85,0x8B8B,0x8B8D,0x8B8F,0x8B94,0x8B95,0x8B9C,
-	0x8B9E,0x8B9F,0x8C38,0x8C39,0x8C3D,0x8C3E,0x8C45,0x8C47,
-	0x8C49,0x8C4B,0x8C4F,0x8C51,0x8C53,0x8C54,0x8C57,0x8C58,
-	0x8C5B,0x8C5D,0x8C59,0x8C63,0x8C64,0x8C66,0x8C68,0x8C69,
-	0x8C6D,0x8C73,0x8C75,0x8C76,0x8C7B,0x8C7E,0x8C86,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 96, Array index 0x3600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8C87,0x8C8B,0x8C90,0x8C92,0x8C93,0x8C99,0x8C9B,
-	0x8C9C,0x8CA4,0x8CB9,0x8CBA,0x8CC5,0x8CC6,0x8CC9,0x8CCB,
-	0x8CCF,0x8CD6,0x8CD5,0x8CD9,0x8CDD,0x8CE1,0x8CE8,0x8CEC,
-	0x8CEF,0x8CF0,0x8CF2,0x8CF5,0x8CF7,0x8CF8,0x8CFE,0x8CFF,
-	0x8D01,0x8D03,0x8D09,0x8D12,0x8D17,0x8D1B,0x8D65,0x8D69,
-	0x8D6C,0x8D6E,0x8D7F,0x8D82,0x8D84,0x8D88,0x8D8D,0x8D90,
-	0x8D91,0x8D95,0x8D9E,0x8D9F,0x8DA0,0x8DA6,0x8DAB,0x8DAC,
-	0x8DAF,0x8DB2,0x8DB5,0x8DB7,0x8DB9,0x8DBB,0x8DC0,0x8DC5,
-	0x8DC6,0x8DC7,0x8DC8,0x8DCA,0x8DCE,0x8DD1,0x8DD4,0x8DD5,
-	0x8DD7,0x8DD9,0x8DE4,0x8DE5,0x8DE7,0x8DEC,0x8DF0,0x8DBC,
-	0x8DF1,0x8DF2,0x8DF4,0x8DFD,0x8E01,0x8E04,0x8E05,0x8E06,
-	0x8E0B,0x8E11,0x8E14,0x8E16,0x8E20,0x8E21,0x8E22,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 97, Array index 0x3700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8E23,0x8E26,0x8E27,0x8E31,0x8E33,0x8E36,0x8E37,
-	0x8E38,0x8E39,0x8E3D,0x8E40,0x8E41,0x8E4B,0x8E4D,0x8E4E,
-	0x8E4F,0x8E54,0x8E5B,0x8E5C,0x8E5D,0x8E5E,0x8E61,0x8E62,
-	0x8E69,0x8E6C,0x8E6D,0x8E6F,0x8E70,0x8E71,0x8E79,0x8E7A,
-	0x8E7B,0x8E82,0x8E83,0x8E89,0x8E90,0x8E92,0x8E95,0x8E9A,
-	0x8E9B,0x8E9D,0x8E9E,0x8EA2,0x8EA7,0x8EA9,0x8EAD,0x8EAE,
-	0x8EB3,0x8EB5,0x8EBA,0x8EBB,0x8EC0,0x8EC1,0x8EC3,0x8EC4,
-	0x8EC7,0x8ECF,0x8ED1,0x8ED4,0x8EDC,0x8EE8,0x8EEE,0x8EF0,
-	0x8EF1,0x8EF7,0x8EF9,0x8EFA,0x8EED,0x8F00,0x8F02,0x8F07,
-	0x8F08,0x8F0F,0x8F10,0x8F16,0x8F17,0x8F18,0x8F1E,0x8F20,
-	0x8F21,0x8F23,0x8F25,0x8F27,0x8F28,0x8F2C,0x8F2D,0x8F2E,
-	0x8F34,0x8F35,0x8F36,0x8F37,0x8F3A,0x8F40,0x8F41,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 98, Array index 0x3800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8F43,0x8F47,0x8F4F,0x8F51,0x8F52,0x8F53,0x8F54,
-	0x8F55,0x8F58,0x8F5D,0x8F5E,0x8F65,0x8F9D,0x8FA0,0x8FA1,
-	0x8FA4,0x8FA5,0x8FA6,0x8FB5,0x8FB6,0x8FB8,0x8FBE,0x8FC0,
-	0x8FC1,0x8FC6,0x8FCA,0x8FCB,0x8FCD,0x8FD0,0x8FD2,0x8FD3,
-	0x8FD5,0x8FE0,0x8FE3,0x8FE4,0x8FE8,0x8FEE,0x8FF1,0x8FF5,
-	0x8FF6,0x8FFB,0x8FFE,0x9002,0x9004,0x9008,0x900C,0x9018,
-	0x901B,0x9028,0x9029,0x902F,0x902A,0x902C,0x902D,0x9033,
-	0x9034,0x9037,0x903F,0x9043,0x9044,0x904C,0x905B,0x905D,
-	0x9062,0x9066,0x9067,0x906C,0x9070,0x9074,0x9079,0x9085,
-	0x9088,0x908B,0x908C,0x908E,0x9090,0x9095,0x9097,0x9098,
-	0x9099,0x909B,0x90A0,0x90A1,0x90A2,0x90A5,0x90B0,0x90B2,
-	0x90B3,0x90B4,0x90B6,0x90BD,0x90CC,0x90BE,0x90C3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 99, Array index 0x3900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x90C4,0x90C5,0x90C7,0x90C8,0x90D5,0x90D7,0x90D8,
-	0x90D9,0x90DC,0x90DD,0x90DF,0x90E5,0x90D2,0x90F6,0x90EB,
-	0x90EF,0x90F0,0x90F4,0x90FE,0x90FF,0x9100,0x9104,0x9105,
-	0x9106,0x9108,0x910D,0x9110,0x9114,0x9116,0x9117,0x9118,
-	0x911A,0x911C,0x911E,0x9120,0x9125,0x9122,0x9123,0x9127,
-	0x9129,0x912E,0x912F,0x9131,0x9134,0x9136,0x9137,0x9139,
-	0x913A,0x913C,0x913D,0x9143,0x9147,0x9148,0x914F,0x9153,
-	0x9157,0x9159,0x915A,0x915B,0x9161,0x9164,0x9167,0x916D,
-	0x9174,0x9179,0x917A,0x917B,0x9181,0x9183,0x9185,0x9186,
-	0x918A,0x918E,0x9191,0x9193,0x9194,0x9195,0x9198,0x919E,
-	0x91A1,0x91A6,0x91A8,0x91AC,0x91AD,0x91AE,0x91B0,0x91B1,
-	0x91B2,0x91B3,0x91B6,0x91BB,0x91BC,0x91BD,0x91BF,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 100, Array index 0x3A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x91C2,0x91C3,0x91C5,0x91D3,0x91D4,0x91D7,0x91D9,
-	0x91DA,0x91DE,0x91E4,0x91E5,0x91E9,0x91EA,0x91EC,0x91ED,
-	0x91EE,0x91EF,0x91F0,0x91F1,0x91F7,0x91F9,0x91FB,0x91FD,
-	0x9200,0x9201,0x9204,0x9205,0x9206,0x9207,0x9209,0x920A,
-	0x920C,0x9210,0x9212,0x9213,0x9216,0x9218,0x921C,0x921D,
-	0x9223,0x9224,0x9225,0x9226,0x9228,0x922E,0x922F,0x9230,
-	0x9233,0x9235,0x9236,0x9238,0x9239,0x923A,0x923C,0x923E,
-	0x9240,0x9242,0x9243,0x9246,0x9247,0x924A,0x924D,0x924E,
-	0x924F,0x9251,0x9258,0x9259,0x925C,0x925D,0x9260,0x9261,
-	0x9265,0x9267,0x9268,0x9269,0x926E,0x926F,0x9270,0x9275,
-	0x9276,0x9277,0x9278,0x9279,0x927B,0x927C,0x927D,0x927F,
-	0x9288,0x9289,0x928A,0x928D,0x928E,0x9292,0x9297,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 101, Array index 0x3B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9299,0x929F,0x92A0,0x92A4,0x92A5,0x92A7,0x92A8,
-	0x92AB,0x92AF,0x92B2,0x92B6,0x92B8,0x92BA,0x92BB,0x92BC,
-	0x92BD,0x92BF,0x92C0,0x92C1,0x92C2,0x92C3,0x92C5,0x92C6,
-	0x92C7,0x92C8,0x92CB,0x92CC,0x92CD,0x92CE,0x92D0,0x92D3,
-	0x92D5,0x92D7,0x92D8,0x92D9,0x92DC,0x92DD,0x92DF,0x92E0,
-	0x92E1,0x92E3,0x92E5,0x92E7,0x92E8,0x92EC,0x92EE,0x92F0,
-	0x92F9,0x92FB,0x92FF,0x9300,0x9302,0x9308,0x930D,0x9311,
-	0x9314,0x9315,0x931C,0x931D,0x931E,0x931F,0x9321,0x9324,
-	0x9325,0x9327,0x9329,0x932A,0x9333,0x9334,0x9336,0x9337,
-	0x9347,0x9348,0x9349,0x9350,0x9351,0x9352,0x9355,0x9357,
-	0x9358,0x935A,0x935E,0x9364,0x9365,0x9367,0x9369,0x936A,
-	0x936D,0x936F,0x9370,0x9371,0x9373,0x9374,0x9376,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 102, Array index 0x3C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x937A,0x937D,0x937F,0x9380,0x9381,0x9382,0x9388,
-	0x938A,0x938B,0x938D,0x938F,0x9392,0x9395,0x9398,0x939B,
-	0x939E,0x93A1,0x93A3,0x93A4,0x93A6,0x93A8,0x93AB,0x93B4,
-	0x93B5,0x93B6,0x93BA,0x93A9,0x93C1,0x93C4,0x93C5,0x93C6,
-	0x93C7,0x93C9,0x93CA,0x93CB,0x93CC,0x93CD,0x93D3,0x93D9,
-	0x93DC,0x93DE,0x93DF,0x93E2,0x93E6,0x93E7,0x93F9,0x93F7,
-	0x93F8,0x93FA,0x93FB,0x93FD,0x9401,0x9402,0x9404,0x9408,
-	0x9409,0x940D,0x940E,0x940F,0x9415,0x9416,0x9417,0x941F,
-	0x942E,0x942F,0x9431,0x9432,0x9433,0x9434,0x943B,0x943F,
-	0x943D,0x9443,0x9445,0x9448,0x944A,0x944C,0x9455,0x9459,
-	0x945C,0x945F,0x9461,0x9463,0x9468,0x946B,0x946D,0x946E,
-	0x946F,0x9471,0x9472,0x9484,0x9483,0x9578,0x9579,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 103, Array index 0x3D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x957E,0x9584,0x9588,0x958C,0x958D,0x958E,0x959D,
-	0x959E,0x959F,0x95A1,0x95A6,0x95A9,0x95AB,0x95AC,0x95B4,
-	0x95B6,0x95BA,0x95BD,0x95BF,0x95C6,0x95C8,0x95C9,0x95CB,
-	0x95D0,0x95D1,0x95D2,0x95D3,0x95D9,0x95DA,0x95DD,0x95DE,
-	0x95DF,0x95E0,0x95E4,0x95E6,0x961D,0x961E,0x9622,0x9624,
-	0x9625,0x9626,0x962C,0x9631,0x9633,0x9637,0x9638,0x9639,
-	0x963A,0x963C,0x963D,0x9641,0x9652,0x9654,0x9656,0x9657,
-	0x9658,0x9661,0x966E,0x9674,0x967B,0x967C,0x967E,0x967F,
-	0x9681,0x9682,0x9683,0x9684,0x9689,0x9691,0x9696,0x969A,
-	0x969D,0x969F,0x96A4,0x96A5,0x96A6,0x96A9,0x96AE,0x96AF,
-	0x96B3,0x96BA,0x96CA,0x96D2,0x5DB2,0x96D8,0x96DA,0x96DD,
-	0x96DE,0x96DF,0x96E9,0x96EF,0x96F1,0x96FA,0x9702,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 104, Array index 0x3E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9703,0x9705,0x9709,0x971A,0x971B,0x971D,0x9721,
-	0x9722,0x9723,0x9728,0x9731,0x9733,0x9741,0x9743,0x974A,
-	0x974E,0x974F,0x9755,0x9757,0x9758,0x975A,0x975B,0x9763,
-	0x9767,0x976A,0x976E,0x9773,0x9776,0x9777,0x9778,0x977B,
-	0x977D,0x977F,0x9780,0x9789,0x9795,0x9796,0x9797,0x9799,
-	0x979A,0x979E,0x979F,0x97A2,0x97AC,0x97AE,0x97B1,0x97B2,
-	0x97B5,0x97B6,0x97B8,0x97B9,0x97BA,0x97BC,0x97BE,0x97BF,
-	0x97C1,0x97C4,0x97C5,0x97C7,0x97C9,0x97CA,0x97CC,0x97CD,
-	0x97CE,0x97D0,0x97D1,0x97D4,0x97D7,0x97D8,0x97D9,0x97DD,
-	0x97DE,0x97E0,0x97DB,0x97E1,0x97E4,0x97EF,0x97F1,0x97F4,
-	0x97F7,0x97F8,0x97FA,0x9807,0x980A,0x9819,0x980D,0x980E,
-	0x9814,0x9816,0x981C,0x981E,0x9820,0x9823,0x9826,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 105, Array index 0x3F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x982B,0x982E,0x982F,0x9830,0x9832,0x9833,0x9835,
-	0x9825,0x983E,0x9844,0x9847,0x984A,0x9851,0x9852,0x9853,
-	0x9856,0x9857,0x9859,0x985A,0x9862,0x9863,0x9865,0x9866,
-	0x986A,0x986C,0x98AB,0x98AD,0x98AE,0x98B0,0x98B4,0x98B7,
-	0x98B8,0x98BA,0x98BB,0x98BF,0x98C2,0x98C5,0x98C8,0x98CC,
-	0x98E1,0x98E3,0x98E5,0x98E6,0x98E7,0x98EA,0x98F3,0x98F6,
-	0x9902,0x9907,0x9908,0x9911,0x9915,0x9916,0x9917,0x991A,
-	0x991B,0x991C,0x991F,0x9922,0x9926,0x9927,0x992B,0x9931,
-	0x9932,0x9933,0x9934,0x9935,0x9939,0x993A,0x993B,0x993C,
-	0x9940,0x9941,0x9946,0x9947,0x9948,0x994D,0x994E,0x9954,
-	0x9958,0x9959,0x995B,0x995C,0x995E,0x995F,0x9960,0x999B,
-	0x999D,0x999F,0x99A6,0x99B0,0x99B1,0x99B2,0x99B5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 106, Array index 0x4000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x99B9,0x99BA,0x99BD,0x99BF,0x99C3,0x99C9,0x99D3,
-	0x99D4,0x99D9,0x99DA,0x99DC,0x99DE,0x99E7,0x99EA,0x99EB,
-	0x99EC,0x99F0,0x99F4,0x99F5,0x99F9,0x99FD,0x99FE,0x9A02,
-	0x9A03,0x9A04,0x9A0B,0x9A0C,0x9A10,0x9A11,0x9A16,0x9A1E,
-	0x9A20,0x9A22,0x9A23,0x9A24,0x9A27,0x9A2D,0x9A2E,0x9A33,
-	0x9A35,0x9A36,0x9A38,0x9A47,0x9A41,0x9A44,0x9A4A,0x9A4B,
-	0x9A4C,0x9A4E,0x9A51,0x9A54,0x9A56,0x9A5D,0x9AAA,0x9AAC,
-	0x9AAE,0x9AAF,0x9AB2,0x9AB4,0x9AB5,0x9AB6,0x9AB9,0x9ABB,
-	0x9ABE,0x9ABF,0x9AC1,0x9AC3,0x9AC6,0x9AC8,0x9ACE,0x9AD0,
-	0x9AD2,0x9AD5,0x9AD6,0x9AD7,0x9ADB,0x9ADC,0x9AE0,0x9AE4,
-	0x9AE5,0x9AE7,0x9AE9,0x9AEC,0x9AF2,0x9AF3,0x9AF5,0x9AF9,
-	0x9AFA,0x9AFD,0x9AFF,0x9B00,0x9B01,0x9B02,0x9B03,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 107, Array index 0x4100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9B04,0x9B05,0x9B08,0x9B09,0x9B0B,0x9B0C,0x9B0D,
-	0x9B0E,0x9B10,0x9B12,0x9B16,0x9B19,0x9B1B,0x9B1C,0x9B20,
-	0x9B26,0x9B2B,0x9B2D,0x9B33,0x9B34,0x9B35,0x9B37,0x9B39,
-	0x9B3A,0x9B3D,0x9B48,0x9B4B,0x9B4C,0x9B55,0x9B56,0x9B57,
-	0x9B5B,0x9B5E,0x9B61,0x9B63,0x9B65,0x9B66,0x9B68,0x9B6A,
-	0x9B6B,0x9B6C,0x9B6D,0x9B6E,0x9B73,0x9B75,0x9B77,0x9B78,
-	0x9B79,0x9B7F,0x9B80,0x9B84,0x9B85,0x9B86,0x9B87,0x9B89,
-	0x9B8A,0x9B8B,0x9B8D,0x9B8F,0x9B90,0x9B94,0x9B9A,0x9B9D,
-	0x9B9E,0x9BA6,0x9BA7,0x9BA9,0x9BAC,0x9BB0,0x9BB1,0x9BB2,
-	0x9BB7,0x9BB8,0x9BBB,0x9BBC,0x9BBE,0x9BBF,0x9BC1,0x9BC7,
-	0x9BC8,0x9BCE,0x9BD0,0x9BD7,0x9BD8,0x9BDD,0x9BDF,0x9BE5,
-	0x9BE7,0x9BEA,0x9BEB,0x9BEF,0x9BF3,0x9BF7,0x9BF8,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 108, Array index 0x4200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9BF9,0x9BFA,0x9BFD,0x9BFF,0x9C00,0x9C02,0x9C0B,
-	0x9C0F,0x9C11,0x9C16,0x9C18,0x9C19,0x9C1A,0x9C1C,0x9C1E,
-	0x9C22,0x9C23,0x9C26,0x9C27,0x9C28,0x9C29,0x9C2A,0x9C31,
-	0x9C35,0x9C36,0x9C37,0x9C3D,0x9C41,0x9C43,0x9C44,0x9C45,
-	0x9C49,0x9C4A,0x9C4E,0x9C4F,0x9C50,0x9C53,0x9C54,0x9C56,
-	0x9C58,0x9C5B,0x9C5D,0x9C5E,0x9C5F,0x9C63,0x9C69,0x9C6A,
-	0x9C5C,0x9C6B,0x9C68,0x9C6E,0x9C70,0x9C72,0x9C75,0x9C77,
-	0x9C7B,0x9CE6,0x9CF2,0x9CF7,0x9CF9,0x9D0B,0x9D02,0x9D11,
-	0x9D17,0x9D18,0x9D1C,0x9D1D,0x9D1E,0x9D2F,0x9D30,0x9D32,
-	0x9D33,0x9D34,0x9D3A,0x9D3C,0x9D45,0x9D3D,0x9D42,0x9D43,
-	0x9D47,0x9D4A,0x9D53,0x9D54,0x9D5F,0x9D63,0x9D62,0x9D65,
-	0x9D69,0x9D6A,0x9D6B,0x9D70,0x9D76,0x9D77,0x9D7B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 109, Array index 0x4300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9D7C,0x9D7E,0x9D83,0x9D84,0x9D86,0x9D8A,0x9D8D,
-	0x9D8E,0x9D92,0x9D93,0x9D95,0x9D96,0x9D97,0x9D98,0x9DA1,
-	0x9DAA,0x9DAC,0x9DAE,0x9DB1,0x9DB5,0x9DB9,0x9DBC,0x9DBF,
-	0x9DC3,0x9DC7,0x9DC9,0x9DCA,0x9DD4,0x9DD5,0x9DD6,0x9DD7,
-	0x9DDA,0x9DDE,0x9DDF,0x9DE0,0x9DE5,0x9DE7,0x9DE9,0x9DEB,
-	0x9DEE,0x9DF0,0x9DF3,0x9DF4,0x9DFE,0x9E0A,0x9E02,0x9E07,
-	0x9E0E,0x9E10,0x9E11,0x9E12,0x9E15,0x9E16,0x9E19,0x9E1C,
-	0x9E1D,0x9E7A,0x9E7B,0x9E7C,0x9E80,0x9E82,0x9E83,0x9E84,
-	0x9E85,0x9E87,0x9E8E,0x9E8F,0x9E96,0x9E98,0x9E9B,0x9E9E,
-	0x9EA4,0x9EA8,0x9EAC,0x9EAE,0x9EAF,0x9EB0,0x9EB3,0x9EB4,
-	0x9EB5,0x9EC6,0x9EC8,0x9ECB,0x9ED5,0x9EDF,0x9EE4,0x9EE7,
-	0x9EEC,0x9EED,0x9EEE,0x9EF0,0x9EF1,0x9EF2,0x9EF5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 110, Array index 0x4400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9EF8,0x9EFF,0x9F02,0x9F03,0x9F09,0x9F0F,0x9F10,
-	0x9F11,0x9F12,0x9F14,0x9F16,0x9F17,0x9F19,0x9F1A,0x9F1B,
-	0x9F1F,0x9F22,0x9F26,0x9F2A,0x9F2B,0x9F2F,0x9F31,0x9F32,
-	0x9F34,0x9F37,0x9F39,0x9F3A,0x9F3C,0x9F3D,0x9F3F,0x9F41,
-	0x9F43,0x9F44,0x9F45,0x9F46,0x9F47,0x9F53,0x9F55,0x9F56,
-	0x9F57,0x9F58,0x9F5A,0x9F5D,0x9F5E,0x9F68,0x9F69,0x9F6D,
-	0x9F6E,0x9F6F,0x9F70,0x9F71,0x9F73,0x9F75,0x9F7A,0x9F7D,
-	0x9F8F,0x9F90,0x9F91,0x9F92,0x9F94,0x9F96,0x9F97,0x9F9E,
-	0x9FA1,0x9FA2,0x9FA3,0x9FA5,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_TO_UCS_CCS_JIS_X0212_1990 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit jis_x0212_1990 -> UCS size-optimized table (12602 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_size_jis_x0212_1990[] =
-{
-	0x0049, /* Ranges number */
-	0x0004, /* Unranged codes number */
-	0x1895, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x222F, 0x2239, 0x00DE,
-	/* Array index: 0x0006 */ 0x2242, 0x2244, 0x00E9,
-	/* Array index: 0x0009 */ 0x226B, 0x2271, 0x00EC,
-	/* Array index: 0x000C */ 0x2661, 0x266C, 0x00F3,
-	/* Array index: 0x000F */ 0x2671, 0x267C, 0x00FF,
-	/* Array index: 0x0012 */ 0x2742, 0x274E, 0x010B,
-	/* Array index: 0x0015 */ 0x2772, 0x277E, 0x0118,
-	/* Array index: 0x0018 */ 0x2928, 0x2930, 0x0125,
-	/* Array index: 0x001B */ 0x2941, 0x2950, 0x012E,
-	/* Array index: 0x001E */ 0x2A21, 0x2A77, 0x013E,
-	/* Array index: 0x0021 */ 0x2B21, 0x2B77, 0x0195,
-	/* Array index: 0x0024 */ 0x3021, 0x307E, 0x01EC,
-	/* Array index: 0x0027 */ 0x3121, 0x317E, 0x024A,
-	/* Array index: 0x002A */ 0x3221, 0x327E, 0x02A8,
-	/* Array index: 0x002D */ 0x3321, 0x337E, 0x0306,
-	/* Array index: 0x0030 */ 0x3421, 0x347E, 0x0364,
-	/* Array index: 0x0033 */ 0x3521, 0x357E, 0x03C2,
-	/* Array index: 0x0036 */ 0x3621, 0x367E, 0x0420,
-	/* Array index: 0x0039 */ 0x3721, 0x377E, 0x047E,
-	/* Array index: 0x003C */ 0x3821, 0x387E, 0x04DC,
-	/* Array index: 0x003F */ 0x3921, 0x397E, 0x053A,
-	/* Array index: 0x0042 */ 0x3A21, 0x3A7E, 0x0598,
-	/* Array index: 0x0045 */ 0x3B21, 0x3B7E, 0x05F6,
-	/* Array index: 0x0048 */ 0x3C21, 0x3C7E, 0x0654,
-	/* Array index: 0x004B */ 0x3D21, 0x3D7E, 0x06B2,
-	/* Array index: 0x004E */ 0x3E21, 0x3E7E, 0x0710,
-	/* Array index: 0x0051 */ 0x3F21, 0x3F7E, 0x076E,
-	/* Array index: 0x0054 */ 0x4021, 0x407E, 0x07CC,
-	/* Array index: 0x0057 */ 0x4121, 0x417E, 0x082A,
-	/* Array index: 0x005A */ 0x4221, 0x427E, 0x0888,
-	/* Array index: 0x005D */ 0x4321, 0x437E, 0x08E6,
-	/* Array index: 0x0060 */ 0x4421, 0x447E, 0x0944,
-	/* Array index: 0x0063 */ 0x4521, 0x457E, 0x09A2,
-	/* Array index: 0x0066 */ 0x4621, 0x467E, 0x0A00,
-	/* Array index: 0x0069 */ 0x4721, 0x477E, 0x0A5E,
-	/* Array index: 0x006C */ 0x4821, 0x487E, 0x0ABC,
-	/* Array index: 0x006F */ 0x4921, 0x497E, 0x0B1A,
-	/* Array index: 0x0072 */ 0x4A21, 0x4A7E, 0x0B78,
-	/* Array index: 0x0075 */ 0x4B21, 0x4B7E, 0x0BD6,
-	/* Array index: 0x0078 */ 0x4C21, 0x4C7E, 0x0C34,
-	/* Array index: 0x007B */ 0x4D21, 0x4D7E, 0x0C92,
-	/* Array index: 0x007E */ 0x4E21, 0x4E7E, 0x0CF0,
-	/* Array index: 0x0081 */ 0x4F21, 0x4F7E, 0x0D4E,
-	/* Array index: 0x0084 */ 0x5021, 0x507E, 0x0DAC,
-	/* Array index: 0x0087 */ 0x5121, 0x517E, 0x0E0A,
-	/* Array index: 0x008A */ 0x5221, 0x527E, 0x0E68,
-	/* Array index: 0x008D */ 0x5321, 0x537E, 0x0EC6,
-	/* Array index: 0x0090 */ 0x5421, 0x547E, 0x0F24,
-	/* Array index: 0x0093 */ 0x5521, 0x557E, 0x0F82,
-	/* Array index: 0x0096 */ 0x5621, 0x567E, 0x0FE0,
-	/* Array index: 0x0099 */ 0x5721, 0x577E, 0x103E,
-	/* Array index: 0x009C */ 0x5821, 0x587E, 0x109C,
-	/* Array index: 0x009F */ 0x5921, 0x597E, 0x10FA,
-	/* Array index: 0x00A2 */ 0x5A21, 0x5A7E, 0x1158,
-	/* Array index: 0x00A5 */ 0x5B21, 0x5B7E, 0x11B6,
-	/* Array index: 0x00A8 */ 0x5C21, 0x5C7E, 0x1214,
-	/* Array index: 0x00AB */ 0x5D21, 0x5D7E, 0x1272,
-	/* Array index: 0x00AE */ 0x5E21, 0x5E7E, 0x12D0,
-	/* Array index: 0x00B1 */ 0x5F21, 0x5F7E, 0x132E,
-	/* Array index: 0x00B4 */ 0x6021, 0x607E, 0x138C,
-	/* Array index: 0x00B7 */ 0x6121, 0x617E, 0x13EA,
-	/* Array index: 0x00BA */ 0x6221, 0x627E, 0x1448,
-	/* Array index: 0x00BD */ 0x6321, 0x637E, 0x14A6,
-	/* Array index: 0x00C0 */ 0x6421, 0x647E, 0x1504,
-	/* Array index: 0x00C3 */ 0x6521, 0x657E, 0x1562,
-	/* Array index: 0x00C6 */ 0x6621, 0x667E, 0x15C0,
-	/* Array index: 0x00C9 */ 0x6721, 0x677E, 0x161E,
-	/* Array index: 0x00CC */ 0x6821, 0x687E, 0x167C,
-	/* Array index: 0x00CF */ 0x6921, 0x697E, 0x16DA,
-	/* Array index: 0x00D2 */ 0x6A21, 0x6A7E, 0x1738,
-	/* Array index: 0x00D5 */ 0x6B21, 0x6B7E, 0x1796,
-	/* Array index: 0x00D8 */ 0x6C21, 0x6C7E, 0x17F4,
-	/* Array index: 0x00DB */ 0x6D21, 0x6D63, 0x1852,
-	/* Ranges content */
-	/* Range 0x222F - 0x2239, array index: 0x00DE */
-	0x02D8,0x02C7,0x00B8,0x02D9,0x02DD,0x00AF,0x02DB,0x02DA,
-	0x007E,0x0384,0x0385,
-	/* Range 0x2242 - 0x2244, array index: 0x00E9 */
-	0x00A1,0x00A6,0x00BF,
-	/* Range 0x226B - 0x2271, array index: 0x00EC */
-	0x00BA,0x00AA,0x00A9,0x00AE,0x2122,0x00A4,0x2116,
-	/* Range 0x2661 - 0x266C, array index: 0x00F3 */
-	0x0386,0x0388,0x0389,0x038A,0x03AA,INVALC,0x038C,INVALC,
-	0x038E,0x03AB,INVALC,0x038F,
-	/* Range 0x2671 - 0x267C, array index: 0x00FF */
-	0x03AC,0x03AD,0x03AE,0x03AF,0x03CA,0x0390,0x03CC,0x03C2,
-	0x03CD,0x03CB,0x03B0,0x03CE,
-	/* Range 0x2742 - 0x274E, array index: 0x010B */
-	0x0402,0x0403,0x0404,0x0405,0x0406,0x0407,0x0408,0x0409,
-	0x040A,0x040B,0x040C,0x040E,0x040F,
-	/* Range 0x2772 - 0x277E, array index: 0x0118 */
-	0x0452,0x0453,0x0454,0x0455,0x0456,0x0457,0x0458,0x0459,
-	0x045A,0x045B,0x045C,0x045E,0x045F,
-	/* Range 0x2928 - 0x2930, array index: 0x0125 */
-	0x0141,0x013F,INVALC,0x014A,0x00D8,0x0152,INVALC,0x0166,
-	0x00DE,
-	/* Range 0x2941 - 0x2950, array index: 0x012E */
-	0x00E6,0x0111,0x00F0,0x0127,0x0131,0x0133,0x0138,0x0142,
-	0x0140,0x0149,0x014B,0x00F8,0x0153,0x00DF,0x0167,0x00FE,
-	/* Range 0x2A21 - 0x2A77, array index: 0x013E */
-	0x00C1,0x00C0,0x00C4,0x00C2,0x0102,0x01CD,0x0100,0x0104,
-	0x00C5,0x00C3,0x0106,0x0108,0x010C,0x00C7,0x010A,0x010E,
-	0x00C9,0x00C8,0x00CB,0x00CA,0x011A,0x0116,0x0112,0x0118,
-	INVALC,0x011C,0x011E,0x0122,0x0120,0x0124,0x00CD,0x00CC,
-	0x00CF,0x00CE,0x01CF,0x0130,0x012A,0x012E,0x0128,0x0134,
-	0x0136,0x0139,0x013D,0x013B,0x0143,0x0147,0x0145,0x00D1,
-	0x00D3,0x00D2,0x00D6,0x00D4,0x01D1,0x0150,0x014C,0x00D5,
-	0x0154,0x0158,0x0156,0x015A,0x015C,0x0160,0x015E,0x0164,
-	0x0162,0x00DA,0x00D9,0x00DC,0x00DB,0x016C,0x01D3,0x0170,
-	0x016A,0x0172,0x016E,0x0168,0x01D7,0x01DB,0x01D9,0x01D5,
-	0x0174,0x00DD,0x0178,0x0176,0x0179,0x017D,0x017B,
-	/* Range 0x2B21 - 0x2B77, array index: 0x0195 */
-	0x00E1,0x00E0,0x00E4,0x00E2,0x0103,0x01CE,0x0101,0x0105,
-	0x00E5,0x00E3,0x0107,0x0109,0x010D,0x00E7,0x010B,0x010F,
-	0x00E9,0x00E8,0x00EB,0x00EA,0x011B,0x0117,0x0113,0x0119,
-	0x01F5,0x011D,0x011F,INVALC,0x0121,0x0125,0x00ED,0x00EC,
-	0x00EF,0x00EE,0x01D0,INVALC,0x012B,0x012F,0x0129,0x0135,
-	0x0137,0x013A,0x013E,0x013C,0x0144,0x0148,0x0146,0x00F1,
-	0x00F3,0x00F2,0x00F6,0x00F4,0x01D2,0x0151,0x014D,0x00F5,
-	0x0155,0x0159,0x0157,0x015B,0x015D,0x0161,0x015F,0x0165,
-	0x0163,0x00FA,0x00F9,0x00FC,0x00FB,0x016D,0x01D4,0x0171,
-	0x016B,0x0173,0x016F,0x0169,0x01D8,0x01DC,0x01DA,0x01D6,
-	0x0175,0x00FD,0x00FF,0x0177,0x017A,0x017E,0x017C,
-	/* Range 0x3021 - 0x307E, array index: 0x01EC */
-	0x4E02,0x4E04,0x4E05,0x4E0C,0x4E12,0x4E1F,0x4E23,0x4E24,
-	0x4E28,0x4E2B,0x4E2E,0x4E2F,0x4E30,0x4E35,0x4E40,0x4E41,
-	0x4E44,0x4E47,0x4E51,0x4E5A,0x4E5C,0x4E63,0x4E68,0x4E69,
-	0x4E74,0x4E75,0x4E79,0x4E7F,0x4E8D,0x4E96,0x4E97,0x4E9D,
-	0x4EAF,0x4EB9,0x4EC3,0x4ED0,0x4EDA,0x4EDB,0x4EE0,0x4EE1,
-	0x4EE2,0x4EE8,0x4EEF,0x4EF1,0x4EF3,0x4EF5,0x4EFD,0x4EFE,
-	0x4EFF,0x4F00,0x4F02,0x4F03,0x4F08,0x4F0B,0x4F0C,0x4F12,
-	0x4F15,0x4F16,0x4F17,0x4F19,0x4F2E,0x4F31,0x4F60,0x4F33,
-	0x4F35,0x4F37,0x4F39,0x4F3B,0x4F3E,0x4F40,0x4F42,0x4F48,
-	0x4F49,0x4F4B,0x4F4C,0x4F52,0x4F54,0x4F56,0x4F58,0x4F5F,
-	0x4F63,0x4F6A,0x4F6C,0x4F6E,0x4F71,0x4F77,0x4F78,0x4F79,
-	0x4F7A,0x4F7D,0x4F7E,0x4F81,0x4F82,0x4F84,
-	/* Range 0x3121 - 0x317E, array index: 0x024A */
-	0x4F85,0x4F89,0x4F8A,0x4F8C,0x4F8E,0x4F90,0x4F92,0x4F93,
-	0x4F94,0x4F97,0x4F99,0x4F9A,0x4F9E,0x4F9F,0x4FB2,0x4FB7,
-	0x4FB9,0x4FBB,0x4FBC,0x4FBD,0x4FBE,0x4FC0,0x4FC1,0x4FC5,
-	0x4FC6,0x4FC8,0x4FC9,0x4FCB,0x4FCC,0x4FCD,0x4FCF,0x4FD2,
-	0x4FDC,0x4FE0,0x4FE2,0x4FF0,0x4FF2,0x4FFC,0x4FFD,0x4FFF,
-	0x5000,0x5001,0x5004,0x5007,0x500A,0x500C,0x500E,0x5010,
-	0x5013,0x5017,0x5018,0x501B,0x501C,0x501D,0x501E,0x5022,
-	0x5027,0x502E,0x5030,0x5032,0x5033,0x5035,0x5040,0x5041,
-	0x5042,0x5045,0x5046,0x504A,0x504C,0x504E,0x5051,0x5052,
-	0x5053,0x5057,0x5059,0x505F,0x5060,0x5062,0x5063,0x5066,
-	0x5067,0x506A,0x506D,0x5070,0x5071,0x503B,0x5081,0x5083,
-	0x5084,0x5086,0x508A,0x508E,0x508F,0x5090,
-	/* Range 0x3221 - 0x327E, array index: 0x02A8 */
-	0x5092,0x5093,0x5094,0x5096,0x509B,0x509C,0x509E,0x509F,
-	0x50A0,0x50A1,0x50A2,0x50AA,0x50AF,0x50B0,0x50B9,0x50BA,
-	0x50BD,0x50C0,0x50C3,0x50C4,0x50C7,0x50CC,0x50CE,0x50D0,
-	0x50D3,0x50D4,0x50D8,0x50DC,0x50DD,0x50DF,0x50E2,0x50E4,
-	0x50E6,0x50E8,0x50E9,0x50EF,0x50F1,0x50F6,0x50FA,0x50FE,
-	0x5103,0x5106,0x5107,0x5108,0x510B,0x510C,0x510D,0x510E,
-	0x50F2,0x5110,0x5117,0x5119,0x511B,0x511C,0x511D,0x511E,
-	0x5123,0x5127,0x5128,0x512C,0x512D,0x512F,0x5131,0x5133,
-	0x5134,0x5135,0x5138,0x5139,0x5142,0x514A,0x514F,0x5153,
-	0x5155,0x5157,0x5158,0x515F,0x5164,0x5166,0x517E,0x5183,
-	0x5184,0x518B,0x518E,0x5198,0x519D,0x51A1,0x51A3,0x51AD,
-	0x51B8,0x51BA,0x51BC,0x51BE,0x51BF,0x51C2,
-	/* Range 0x3321 - 0x337E, array index: 0x0306 */
-	0x51C8,0x51CF,0x51D1,0x51D2,0x51D3,0x51D5,0x51D8,0x51DE,
-	0x51E2,0x51E5,0x51EE,0x51F2,0x51F3,0x51F4,0x51F7,0x5201,
-	0x5202,0x5205,0x5212,0x5213,0x5215,0x5216,0x5218,0x5222,
-	0x5228,0x5231,0x5232,0x5235,0x523C,0x5245,0x5249,0x5255,
-	0x5257,0x5258,0x525A,0x525C,0x525F,0x5260,0x5261,0x5266,
-	0x526E,0x5277,0x5278,0x5279,0x5280,0x5282,0x5285,0x528A,
-	0x528C,0x5293,0x5295,0x5296,0x5297,0x5298,0x529A,0x529C,
-	0x52A4,0x52A5,0x52A6,0x52A7,0x52AF,0x52B0,0x52B6,0x52B7,
-	0x52B8,0x52BA,0x52BB,0x52BD,0x52C0,0x52C4,0x52C6,0x52C8,
-	0x52CC,0x52CF,0x52D1,0x52D4,0x52D6,0x52DB,0x52DC,0x52E1,
-	0x52E5,0x52E8,0x52E9,0x52EA,0x52EC,0x52F0,0x52F1,0x52F4,
-	0x52F6,0x52F7,0x5300,0x5303,0x530A,0x530B,
-	/* Range 0x3421 - 0x347E, array index: 0x0364 */
-	0x530C,0x5311,0x5313,0x5318,0x531B,0x531C,0x531E,0x531F,
-	0x5325,0x5327,0x5328,0x5329,0x532B,0x532C,0x532D,0x5330,
-	0x5332,0x5335,0x533C,0x533D,0x533E,0x5342,0x534C,0x534B,
-	0x5359,0x535B,0x5361,0x5363,0x5365,0x536C,0x536D,0x5372,
-	0x5379,0x537E,0x5383,0x5387,0x5388,0x538E,0x5393,0x5394,
-	0x5399,0x539D,0x53A1,0x53A4,0x53AA,0x53AB,0x53AF,0x53B2,
-	0x53B4,0x53B5,0x53B7,0x53B8,0x53BA,0x53BD,0x53C0,0x53C5,
-	0x53CF,0x53D2,0x53D3,0x53D5,0x53DA,0x53DD,0x53DE,0x53E0,
-	0x53E6,0x53E7,0x53F5,0x5402,0x5413,0x541A,0x5421,0x5427,
-	0x5428,0x542A,0x542F,0x5431,0x5434,0x5435,0x5443,0x5444,
-	0x5447,0x544D,0x544F,0x545E,0x5462,0x5464,0x5466,0x5467,
-	0x5469,0x546B,0x546D,0x546E,0x5474,0x547F,
-	/* Range 0x3521 - 0x357E, array index: 0x03C2 */
-	0x5481,0x5483,0x5485,0x5488,0x5489,0x548D,0x5491,0x5495,
-	0x5496,0x549C,0x549F,0x54A1,0x54A6,0x54A7,0x54A9,0x54AA,
-	0x54AD,0x54AE,0x54B1,0x54B7,0x54B9,0x54BA,0x54BB,0x54BF,
-	0x54C6,0x54CA,0x54CD,0x54CE,0x54E0,0x54EA,0x54EC,0x54EF,
-	0x54F6,0x54FC,0x54FE,0x54FF,0x5500,0x5501,0x5505,0x5508,
-	0x5509,0x550C,0x550D,0x550E,0x5515,0x552A,0x552B,0x5532,
-	0x5535,0x5536,0x553B,0x553C,0x553D,0x5541,0x5547,0x5549,
-	0x554A,0x554D,0x5550,0x5551,0x5558,0x555A,0x555B,0x555E,
-	0x5560,0x5561,0x5564,0x5566,0x557F,0x5581,0x5582,0x5586,
-	0x5588,0x558E,0x558F,0x5591,0x5592,0x5593,0x5594,0x5597,
-	0x55A3,0x55A4,0x55AD,0x55B2,0x55BF,0x55C1,0x55C3,0x55C6,
-	0x55C9,0x55CB,0x55CC,0x55CE,0x55D1,0x55D2,
-	/* Range 0x3621 - 0x367E, array index: 0x0420 */
-	0x55D3,0x55D7,0x55D8,0x55DB,0x55DE,0x55E2,0x55E9,0x55F6,
-	0x55FF,0x5605,0x5608,0x560A,0x560D,0x560E,0x560F,0x5610,
-	0x5611,0x5612,0x5619,0x562C,0x5630,0x5633,0x5635,0x5637,
-	0x5639,0x563B,0x563C,0x563D,0x563F,0x5640,0x5641,0x5643,
-	0x5644,0x5646,0x5649,0x564B,0x564D,0x564F,0x5654,0x565E,
-	0x5660,0x5661,0x5662,0x5663,0x5666,0x5669,0x566D,0x566F,
-	0x5671,0x5672,0x5675,0x5684,0x5685,0x5688,0x568B,0x568C,
-	0x5695,0x5699,0x569A,0x569D,0x569E,0x569F,0x56A6,0x56A7,
-	0x56A8,0x56A9,0x56AB,0x56AC,0x56AD,0x56B1,0x56B3,0x56B7,
-	0x56BE,0x56C5,0x56C9,0x56CA,0x56CB,0x56CF,0x56D0,0x56CC,
-	0x56CD,0x56D9,0x56DC,0x56DD,0x56DF,0x56E1,0x56E4,0x56E5,
-	0x56E6,0x56E7,0x56E8,0x56F1,0x56EB,0x56ED,
-	/* Range 0x3721 - 0x377E, array index: 0x047E */
-	0x56F6,0x56F7,0x5701,0x5702,0x5707,0x570A,0x570C,0x5711,
-	0x5715,0x571A,0x571B,0x571D,0x5720,0x5722,0x5723,0x5724,
-	0x5725,0x5729,0x572A,0x572C,0x572E,0x572F,0x5733,0x5734,
-	0x573D,0x573E,0x573F,0x5745,0x5746,0x574C,0x574D,0x5752,
-	0x5762,0x5765,0x5767,0x5768,0x576B,0x576D,0x576E,0x576F,
-	0x5770,0x5771,0x5773,0x5774,0x5775,0x5777,0x5779,0x577A,
-	0x577B,0x577C,0x577E,0x5781,0x5783,0x578C,0x5794,0x5797,
-	0x5799,0x579A,0x579C,0x579D,0x579E,0x579F,0x57A1,0x5795,
-	0x57A7,0x57A8,0x57A9,0x57AC,0x57B8,0x57BD,0x57C7,0x57C8,
-	0x57CC,0x57CF,0x57D5,0x57DD,0x57DE,0x57E4,0x57E6,0x57E7,
-	0x57E9,0x57ED,0x57F0,0x57F5,0x57F6,0x57F8,0x57FD,0x57FE,
-	0x57FF,0x5803,0x5804,0x5808,0x5809,0x57E1,
-	/* Range 0x3821 - 0x387E, array index: 0x04DC */
-	0x580C,0x580D,0x581B,0x581E,0x581F,0x5820,0x5826,0x5827,
-	0x582D,0x5832,0x5839,0x583F,0x5849,0x584C,0x584D,0x584F,
-	0x5850,0x5855,0x585F,0x5861,0x5864,0x5867,0x5868,0x5878,
-	0x587C,0x587F,0x5880,0x5881,0x5887,0x5888,0x5889,0x588A,
-	0x588C,0x588D,0x588F,0x5890,0x5894,0x5896,0x589D,0x58A0,
-	0x58A1,0x58A2,0x58A6,0x58A9,0x58B1,0x58B2,0x58C4,0x58BC,
-	0x58C2,0x58C8,0x58CD,0x58CE,0x58D0,0x58D2,0x58D4,0x58D6,
-	0x58DA,0x58DD,0x58E1,0x58E2,0x58E9,0x58F3,0x5905,0x5906,
-	0x590B,0x590C,0x5912,0x5913,0x5914,0x8641,0x591D,0x5921,
-	0x5923,0x5924,0x5928,0x592F,0x5930,0x5933,0x5935,0x5936,
-	0x593F,0x5943,0x5946,0x5952,0x5953,0x5959,0x595B,0x595D,
-	0x595E,0x595F,0x5961,0x5963,0x596B,0x596D,
-	/* Range 0x3921 - 0x397E, array index: 0x053A */
-	0x596F,0x5972,0x5975,0x5976,0x5979,0x597B,0x597C,0x598B,
-	0x598C,0x598E,0x5992,0x5995,0x5997,0x599F,0x59A4,0x59A7,
-	0x59AD,0x59AE,0x59AF,0x59B0,0x59B3,0x59B7,0x59BA,0x59BC,
-	0x59C1,0x59C3,0x59C4,0x59C8,0x59CA,0x59CD,0x59D2,0x59DD,
-	0x59DE,0x59DF,0x59E3,0x59E4,0x59E7,0x59EE,0x59EF,0x59F1,
-	0x59F2,0x59F4,0x59F7,0x5A00,0x5A04,0x5A0C,0x5A0D,0x5A0E,
-	0x5A12,0x5A13,0x5A1E,0x5A23,0x5A24,0x5A27,0x5A28,0x5A2A,
-	0x5A2D,0x5A30,0x5A44,0x5A45,0x5A47,0x5A48,0x5A4C,0x5A50,
-	0x5A55,0x5A5E,0x5A63,0x5A65,0x5A67,0x5A6D,0x5A77,0x5A7A,
-	0x5A7B,0x5A7E,0x5A8B,0x5A90,0x5A93,0x5A96,0x5A99,0x5A9C,
-	0x5A9E,0x5A9F,0x5AA0,0x5AA2,0x5AA7,0x5AAC,0x5AB1,0x5AB2,
-	0x5AB3,0x5AB5,0x5AB8,0x5ABA,0x5ABB,0x5ABF,
-	/* Range 0x3A21 - 0x3A7E, array index: 0x0598 */
-	0x5AC4,0x5AC6,0x5AC8,0x5ACF,0x5ADA,0x5ADC,0x5AE0,0x5AE5,
-	0x5AEA,0x5AEE,0x5AF5,0x5AF6,0x5AFD,0x5B00,0x5B01,0x5B08,
-	0x5B17,0x5B34,0x5B19,0x5B1B,0x5B1D,0x5B21,0x5B25,0x5B2D,
-	0x5B38,0x5B41,0x5B4B,0x5B4C,0x5B52,0x5B56,0x5B5E,0x5B68,
-	0x5B6E,0x5B6F,0x5B7C,0x5B7D,0x5B7E,0x5B7F,0x5B81,0x5B84,
-	0x5B86,0x5B8A,0x5B8E,0x5B90,0x5B91,0x5B93,0x5B94,0x5B96,
-	0x5BA8,0x5BA9,0x5BAC,0x5BAD,0x5BAF,0x5BB1,0x5BB2,0x5BB7,
-	0x5BBA,0x5BBC,0x5BC0,0x5BC1,0x5BCD,0x5BCF,0x5BD6,0x5BD7,
-	0x5BD8,0x5BD9,0x5BDA,0x5BE0,0x5BEF,0x5BF1,0x5BF4,0x5BFD,
-	0x5C0C,0x5C17,0x5C1E,0x5C1F,0x5C23,0x5C26,0x5C29,0x5C2B,
-	0x5C2C,0x5C2E,0x5C30,0x5C32,0x5C35,0x5C36,0x5C59,0x5C5A,
-	0x5C5C,0x5C62,0x5C63,0x5C67,0x5C68,0x5C69,
-	/* Range 0x3B21 - 0x3B7E, array index: 0x05F6 */
-	0x5C6D,0x5C70,0x5C74,0x5C75,0x5C7A,0x5C7B,0x5C7C,0x5C7D,
-	0x5C87,0x5C88,0x5C8A,0x5C8F,0x5C92,0x5C9D,0x5C9F,0x5CA0,
-	0x5CA2,0x5CA3,0x5CA6,0x5CAA,0x5CB2,0x5CB4,0x5CB5,0x5CBA,
-	0x5CC9,0x5CCB,0x5CD2,0x5CDD,0x5CD7,0x5CEE,0x5CF1,0x5CF2,
-	0x5CF4,0x5D01,0x5D06,0x5D0D,0x5D12,0x5D2B,0x5D23,0x5D24,
-	0x5D26,0x5D27,0x5D31,0x5D34,0x5D39,0x5D3D,0x5D3F,0x5D42,
-	0x5D43,0x5D46,0x5D48,0x5D55,0x5D51,0x5D59,0x5D4A,0x5D5F,
-	0x5D60,0x5D61,0x5D62,0x5D64,0x5D6A,0x5D6D,0x5D70,0x5D79,
-	0x5D7A,0x5D7E,0x5D7F,0x5D81,0x5D83,0x5D88,0x5D8A,0x5D92,
-	0x5D93,0x5D94,0x5D95,0x5D99,0x5D9B,0x5D9F,0x5DA0,0x5DA7,
-	0x5DAB,0x5DB0,0x5DB4,0x5DB8,0x5DB9,0x5DC3,0x5DC7,0x5DCB,
-	0x5DD0,0x5DCE,0x5DD8,0x5DD9,0x5DE0,0x5DE4,
-	/* Range 0x3C21 - 0x3C7E, array index: 0x0654 */
-	0x5DE9,0x5DF8,0x5DF9,0x5E00,0x5E07,0x5E0D,0x5E12,0x5E14,
-	0x5E15,0x5E18,0x5E1F,0x5E20,0x5E2E,0x5E28,0x5E32,0x5E35,
-	0x5E3E,0x5E4B,0x5E50,0x5E49,0x5E51,0x5E56,0x5E58,0x5E5B,
-	0x5E5C,0x5E5E,0x5E68,0x5E6A,0x5E6B,0x5E6C,0x5E6D,0x5E6E,
-	0x5E70,0x5E80,0x5E8B,0x5E8E,0x5EA2,0x5EA4,0x5EA5,0x5EA8,
-	0x5EAA,0x5EAC,0x5EB1,0x5EB3,0x5EBD,0x5EBE,0x5EBF,0x5EC6,
-	0x5ECC,0x5ECB,0x5ECE,0x5ED1,0x5ED2,0x5ED4,0x5ED5,0x5EDC,
-	0x5EDE,0x5EE5,0x5EEB,0x5F02,0x5F06,0x5F07,0x5F08,0x5F0E,
-	0x5F19,0x5F1C,0x5F1D,0x5F21,0x5F22,0x5F23,0x5F24,0x5F28,
-	0x5F2B,0x5F2C,0x5F2E,0x5F30,0x5F34,0x5F36,0x5F3B,0x5F3D,
-	0x5F3F,0x5F40,0x5F44,0x5F45,0x5F47,0x5F4D,0x5F50,0x5F54,
-	0x5F58,0x5F5B,0x5F60,0x5F63,0x5F64,0x5F67,
-	/* Range 0x3D21 - 0x3D7E, array index: 0x06B2 */
-	0x5F6F,0x5F72,0x5F74,0x5F75,0x5F78,0x5F7A,0x5F7D,0x5F7E,
-	0x5F89,0x5F8D,0x5F8F,0x5F96,0x5F9C,0x5F9D,0x5FA2,0x5FA7,
-	0x5FAB,0x5FA4,0x5FAC,0x5FAF,0x5FB0,0x5FB1,0x5FB8,0x5FC4,
-	0x5FC7,0x5FC8,0x5FC9,0x5FCB,0x5FD0,0x5FD1,0x5FD2,0x5FD3,
-	0x5FD4,0x5FDE,0x5FE1,0x5FE2,0x5FE8,0x5FE9,0x5FEA,0x5FEC,
-	0x5FED,0x5FEE,0x5FEF,0x5FF2,0x5FF3,0x5FF6,0x5FFA,0x5FFC,
-	0x6007,0x600A,0x600D,0x6013,0x6014,0x6017,0x6018,0x601A,
-	0x601F,0x6024,0x602D,0x6033,0x6035,0x6040,0x6047,0x6048,
-	0x6049,0x604C,0x6051,0x6054,0x6056,0x6057,0x605D,0x6061,
-	0x6067,0x6071,0x607E,0x607F,0x6082,0x6086,0x6088,0x608A,
-	0x608E,0x6091,0x6093,0x6095,0x6098,0x609D,0x609E,0x60A2,
-	0x60A4,0x60A5,0x60A8,0x60B0,0x60B1,0x60B7,
-	/* Range 0x3E21 - 0x3E7E, array index: 0x0710 */
-	0x60BB,0x60BE,0x60C2,0x60C4,0x60C8,0x60C9,0x60CA,0x60CB,
-	0x60CE,0x60CF,0x60D4,0x60D5,0x60D9,0x60DB,0x60DD,0x60DE,
-	0x60E2,0x60E5,0x60F2,0x60F5,0x60F8,0x60FC,0x60FD,0x6102,
-	0x6107,0x610A,0x610C,0x6110,0x6111,0x6112,0x6113,0x6114,
-	0x6116,0x6117,0x6119,0x611C,0x611E,0x6122,0x612A,0x612B,
-	0x6130,0x6131,0x6135,0x6136,0x6137,0x6139,0x6141,0x6145,
-	0x6146,0x6149,0x615E,0x6160,0x616C,0x6172,0x6178,0x617B,
-	0x617C,0x617F,0x6180,0x6181,0x6183,0x6184,0x618B,0x618D,
-	0x6192,0x6193,0x6197,0x6198,0x619C,0x619D,0x619F,0x61A0,
-	0x61A5,0x61A8,0x61AA,0x61AD,0x61B8,0x61B9,0x61BC,0x61C0,
-	0x61C1,0x61C2,0x61CE,0x61CF,0x61D5,0x61DC,0x61DD,0x61DE,
-	0x61DF,0x61E1,0x61E2,0x61E7,0x61E9,0x61E5,
-	/* Range 0x3F21 - 0x3F7E, array index: 0x076E */
-	0x61EC,0x61ED,0x61EF,0x6201,0x6203,0x6204,0x6207,0x6213,
-	0x6215,0x621C,0x6220,0x6222,0x6223,0x6227,0x6229,0x622B,
-	0x6239,0x623D,0x6242,0x6243,0x6244,0x6246,0x624C,0x6250,
-	0x6251,0x6252,0x6254,0x6256,0x625A,0x625C,0x6264,0x626D,
-	0x626F,0x6273,0x627A,0x627D,0x628D,0x628E,0x628F,0x6290,
-	0x62A6,0x62A8,0x62B3,0x62B6,0x62B7,0x62BA,0x62BE,0x62BF,
-	0x62C4,0x62CE,0x62D5,0x62D6,0x62DA,0x62EA,0x62F2,0x62F4,
-	0x62FC,0x62FD,0x6303,0x6304,0x630A,0x630B,0x630D,0x6310,
-	0x6313,0x6316,0x6318,0x6329,0x632A,0x632D,0x6335,0x6336,
-	0x6339,0x633C,0x6341,0x6342,0x6343,0x6344,0x6346,0x634A,
-	0x634B,0x634E,0x6352,0x6353,0x6354,0x6358,0x635B,0x6365,
-	0x6366,0x636C,0x636D,0x6371,0x6374,0x6375,
-	/* Range 0x4021 - 0x407E, array index: 0x07CC */
-	0x6378,0x637C,0x637D,0x637F,0x6382,0x6384,0x6387,0x638A,
-	0x6390,0x6394,0x6395,0x6399,0x639A,0x639E,0x63A4,0x63A6,
-	0x63AD,0x63AE,0x63AF,0x63BD,0x63C1,0x63C5,0x63C8,0x63CE,
-	0x63D1,0x63D3,0x63D4,0x63D5,0x63DC,0x63E0,0x63E5,0x63EA,
-	0x63EC,0x63F2,0x63F3,0x63F5,0x63F8,0x63F9,0x6409,0x640A,
-	0x6410,0x6412,0x6414,0x6418,0x641E,0x6420,0x6422,0x6424,
-	0x6425,0x6429,0x642A,0x642F,0x6430,0x6435,0x643D,0x643F,
-	0x644B,0x644F,0x6451,0x6452,0x6453,0x6454,0x645A,0x645B,
-	0x645C,0x645D,0x645F,0x6460,0x6461,0x6463,0x646D,0x6473,
-	0x6474,0x647B,0x647D,0x6485,0x6487,0x648F,0x6490,0x6491,
-	0x6498,0x6499,0x649B,0x649D,0x649F,0x64A1,0x64A3,0x64A6,
-	0x64A8,0x64AC,0x64B3,0x64BD,0x64BE,0x64BF,
-	/* Range 0x4121 - 0x417E, array index: 0x082A */
-	0x64C4,0x64C9,0x64CA,0x64CB,0x64CC,0x64CE,0x64D0,0x64D1,
-	0x64D5,0x64D7,0x64E4,0x64E5,0x64E9,0x64EA,0x64ED,0x64F0,
-	0x64F5,0x64F7,0x64FB,0x64FF,0x6501,0x6504,0x6508,0x6509,
-	0x650A,0x650F,0x6513,0x6514,0x6516,0x6519,0x651B,0x651E,
-	0x651F,0x6522,0x6526,0x6529,0x652E,0x6531,0x653A,0x653C,
-	0x653D,0x6543,0x6547,0x6549,0x6550,0x6552,0x6554,0x655F,
-	0x6560,0x6567,0x656B,0x657A,0x657D,0x6581,0x6585,0x658A,
-	0x6592,0x6595,0x6598,0x659D,0x65A0,0x65A3,0x65A6,0x65AE,
-	0x65B2,0x65B3,0x65B4,0x65BF,0x65C2,0x65C8,0x65C9,0x65CE,
-	0x65D0,0x65D4,0x65D6,0x65D8,0x65DF,0x65F0,0x65F2,0x65F4,
-	0x65F5,0x65F9,0x65FE,0x65FF,0x6600,0x6604,0x6608,0x6609,
-	0x660D,0x6611,0x6612,0x6615,0x6616,0x661D,
-	/* Range 0x4221 - 0x427E, array index: 0x0888 */
-	0x661E,0x6621,0x6622,0x6623,0x6624,0x6626,0x6629,0x662A,
-	0x662B,0x662C,0x662E,0x6630,0x6631,0x6633,0x6639,0x6637,
-	0x6640,0x6645,0x6646,0x664A,0x664C,0x6651,0x664E,0x6657,
-	0x6658,0x6659,0x665B,0x665C,0x6660,0x6661,0x66FB,0x666A,
-	0x666B,0x666C,0x667E,0x6673,0x6675,0x667F,0x6677,0x6678,
-	0x6679,0x667B,0x6680,0x667C,0x668B,0x668C,0x668D,0x6690,
-	0x6692,0x6699,0x669A,0x669B,0x669C,0x669F,0x66A0,0x66A4,
-	0x66AD,0x66B1,0x66B2,0x66B5,0x66BB,0x66BF,0x66C0,0x66C2,
-	0x66C3,0x66C8,0x66CC,0x66CE,0x66CF,0x66D4,0x66DB,0x66DF,
-	0x66E8,0x66EB,0x66EC,0x66EE,0x66FA,0x6705,0x6707,0x670E,
-	0x6713,0x6719,0x671C,0x6720,0x6722,0x6733,0x673E,0x6745,
-	0x6747,0x6748,0x674C,0x6754,0x6755,0x675D,
-	/* Range 0x4321 - 0x437E, array index: 0x08E6 */
-	0x6766,0x676C,0x676E,0x6774,0x6776,0x677B,0x6781,0x6784,
-	0x678E,0x678F,0x6791,0x6793,0x6796,0x6798,0x6799,0x679B,
-	0x67B0,0x67B1,0x67B2,0x67B5,0x67BB,0x67BC,0x67BD,0x67F9,
-	0x67C0,0x67C2,0x67C3,0x67C5,0x67C8,0x67C9,0x67D2,0x67D7,
-	0x67D9,0x67DC,0x67E1,0x67E6,0x67F0,0x67F2,0x67F6,0x67F7,
-	0x6852,0x6814,0x6819,0x681D,0x681F,0x6828,0x6827,0x682C,
-	0x682D,0x682F,0x6830,0x6831,0x6833,0x683B,0x683F,0x6844,
-	0x6845,0x684A,0x684C,0x6855,0x6857,0x6858,0x685B,0x686B,
-	0x686E,0x686F,0x6870,0x6871,0x6872,0x6875,0x6879,0x687A,
-	0x687B,0x687C,0x6882,0x6884,0x6886,0x6888,0x6896,0x6898,
-	0x689A,0x689C,0x68A1,0x68A3,0x68A5,0x68A9,0x68AA,0x68AE,
-	0x68B2,0x68BB,0x68C5,0x68C8,0x68CC,0x68CF,
-	/* Range 0x4421 - 0x447E, array index: 0x0944 */
-	0x68D0,0x68D1,0x68D3,0x68D6,0x68D9,0x68DC,0x68DD,0x68E5,
-	0x68E8,0x68EA,0x68EB,0x68EC,0x68ED,0x68F0,0x68F1,0x68F5,
-	0x68F6,0x68FB,0x68FC,0x68FD,0x6906,0x6909,0x690A,0x6910,
-	0x6911,0x6913,0x6916,0x6917,0x6931,0x6933,0x6935,0x6938,
-	0x693B,0x6942,0x6945,0x6949,0x694E,0x6957,0x695B,0x6963,
-	0x6964,0x6965,0x6966,0x6968,0x6969,0x696C,0x6970,0x6971,
-	0x6972,0x697A,0x697B,0x697F,0x6980,0x698D,0x6992,0x6996,
-	0x6998,0x69A1,0x69A5,0x69A6,0x69A8,0x69AB,0x69AD,0x69AF,
-	0x69B7,0x69B8,0x69BA,0x69BC,0x69C5,0x69C8,0x69D1,0x69D6,
-	0x69D7,0x69E2,0x69E5,0x69EE,0x69EF,0x69F1,0x69F3,0x69F5,
-	0x69FE,0x6A00,0x6A01,0x6A03,0x6A0F,0x6A11,0x6A15,0x6A1A,
-	0x6A1D,0x6A20,0x6A24,0x6A28,0x6A30,0x6A32,
-	/* Range 0x4521 - 0x457E, array index: 0x09A2 */
-	0x6A34,0x6A37,0x6A3B,0x6A3E,0x6A3F,0x6A45,0x6A46,0x6A49,
-	0x6A4A,0x6A4E,0x6A50,0x6A51,0x6A52,0x6A55,0x6A56,0x6A5B,
-	0x6A64,0x6A67,0x6A6A,0x6A71,0x6A73,0x6A7E,0x6A81,0x6A83,
-	0x6A86,0x6A87,0x6A89,0x6A8B,0x6A91,0x6A9B,0x6A9D,0x6A9E,
-	0x6A9F,0x6AA5,0x6AAB,0x6AAF,0x6AB0,0x6AB1,0x6AB4,0x6ABD,
-	0x6ABE,0x6ABF,0x6AC6,0x6AC9,0x6AC8,0x6ACC,0x6AD0,0x6AD4,
-	0x6AD5,0x6AD6,0x6ADC,0x6ADD,0x6AE4,0x6AE7,0x6AEC,0x6AF0,
-	0x6AF1,0x6AF2,0x6AFC,0x6AFD,0x6B02,0x6B03,0x6B06,0x6B07,
-	0x6B09,0x6B0F,0x6B10,0x6B11,0x6B17,0x6B1B,0x6B1E,0x6B24,
-	0x6B28,0x6B2B,0x6B2C,0x6B2F,0x6B35,0x6B36,0x6B3B,0x6B3F,
-	0x6B46,0x6B4A,0x6B4D,0x6B52,0x6B56,0x6B58,0x6B5D,0x6B60,
-	0x6B67,0x6B6B,0x6B6E,0x6B70,0x6B75,0x6B7D,
-	/* Range 0x4621 - 0x467E, array index: 0x0A00 */
-	0x6B7E,0x6B82,0x6B85,0x6B97,0x6B9B,0x6B9F,0x6BA0,0x6BA2,
-	0x6BA3,0x6BA8,0x6BA9,0x6BAC,0x6BAD,0x6BAE,0x6BB0,0x6BB8,
-	0x6BB9,0x6BBD,0x6BBE,0x6BC3,0x6BC4,0x6BC9,0x6BCC,0x6BD6,
-	0x6BDA,0x6BE1,0x6BE3,0x6BE6,0x6BE7,0x6BEE,0x6BF1,0x6BF7,
-	0x6BF9,0x6BFF,0x6C02,0x6C04,0x6C05,0x6C09,0x6C0D,0x6C0E,
-	0x6C10,0x6C12,0x6C19,0x6C1F,0x6C26,0x6C27,0x6C28,0x6C2C,
-	0x6C2E,0x6C33,0x6C35,0x6C36,0x6C3A,0x6C3B,0x6C3F,0x6C4A,
-	0x6C4B,0x6C4D,0x6C4F,0x6C52,0x6C54,0x6C59,0x6C5B,0x6C5C,
-	0x6C6B,0x6C6D,0x6C6F,0x6C74,0x6C76,0x6C78,0x6C79,0x6C7B,
-	0x6C85,0x6C86,0x6C87,0x6C89,0x6C94,0x6C95,0x6C97,0x6C98,
-	0x6C9C,0x6C9F,0x6CB0,0x6CB2,0x6CB4,0x6CC2,0x6CC6,0x6CCD,
-	0x6CCF,0x6CD0,0x6CD1,0x6CD2,0x6CD4,0x6CD6,
-	/* Range 0x4721 - 0x477E, array index: 0x0A5E */
-	0x6CDA,0x6CDC,0x6CE0,0x6CE7,0x6CE9,0x6CEB,0x6CEC,0x6CEE,
-	0x6CF2,0x6CF4,0x6D04,0x6D07,0x6D0A,0x6D0E,0x6D0F,0x6D11,
-	0x6D13,0x6D1A,0x6D26,0x6D27,0x6D28,0x6C67,0x6D2E,0x6D2F,
-	0x6D31,0x6D39,0x6D3C,0x6D3F,0x6D57,0x6D5E,0x6D5F,0x6D61,
-	0x6D65,0x6D67,0x6D6F,0x6D70,0x6D7C,0x6D82,0x6D87,0x6D91,
-	0x6D92,0x6D94,0x6D96,0x6D97,0x6D98,0x6DAA,0x6DAC,0x6DB4,
-	0x6DB7,0x6DB9,0x6DBD,0x6DBF,0x6DC4,0x6DC8,0x6DCA,0x6DCE,
-	0x6DCF,0x6DD6,0x6DDB,0x6DDD,0x6DDF,0x6DE0,0x6DE2,0x6DE5,
-	0x6DE9,0x6DEF,0x6DF0,0x6DF4,0x6DF6,0x6DFC,0x6E00,0x6E04,
-	0x6E1E,0x6E22,0x6E27,0x6E32,0x6E36,0x6E39,0x6E3B,0x6E3C,
-	0x6E44,0x6E45,0x6E48,0x6E49,0x6E4B,0x6E4F,0x6E51,0x6E52,
-	0x6E53,0x6E54,0x6E57,0x6E5C,0x6E5D,0x6E5E,
-	/* Range 0x4821 - 0x487E, array index: 0x0ABC */
-	0x6E62,0x6E63,0x6E68,0x6E73,0x6E7B,0x6E7D,0x6E8D,0x6E93,
-	0x6E99,0x6EA0,0x6EA7,0x6EAD,0x6EAE,0x6EB1,0x6EB3,0x6EBB,
-	0x6EBF,0x6EC0,0x6EC1,0x6EC3,0x6EC7,0x6EC8,0x6ECA,0x6ECD,
-	0x6ECE,0x6ECF,0x6EEB,0x6EED,0x6EEE,0x6EF9,0x6EFB,0x6EFD,
-	0x6F04,0x6F08,0x6F0A,0x6F0C,0x6F0D,0x6F16,0x6F18,0x6F1A,
-	0x6F1B,0x6F26,0x6F29,0x6F2A,0x6F2F,0x6F30,0x6F33,0x6F36,
-	0x6F3B,0x6F3C,0x6F2D,0x6F4F,0x6F51,0x6F52,0x6F53,0x6F57,
-	0x6F59,0x6F5A,0x6F5D,0x6F5E,0x6F61,0x6F62,0x6F68,0x6F6C,
-	0x6F7D,0x6F7E,0x6F83,0x6F87,0x6F88,0x6F8B,0x6F8C,0x6F8D,
-	0x6F90,0x6F92,0x6F93,0x6F94,0x6F96,0x6F9A,0x6F9F,0x6FA0,
-	0x6FA5,0x6FA6,0x6FA7,0x6FA8,0x6FAE,0x6FAF,0x6FB0,0x6FB5,
-	0x6FB6,0x6FBC,0x6FC5,0x6FC7,0x6FC8,0x6FCA,
-	/* Range 0x4921 - 0x497E, array index: 0x0B1A */
-	0x6FDA,0x6FDE,0x6FE8,0x6FE9,0x6FF0,0x6FF5,0x6FF9,0x6FFC,
-	0x6FFD,0x7000,0x7005,0x7006,0x7007,0x700D,0x7017,0x7020,
-	0x7023,0x702F,0x7034,0x7037,0x7039,0x703C,0x7043,0x7044,
-	0x7048,0x7049,0x704A,0x704B,0x7054,0x7055,0x705D,0x705E,
-	0x704E,0x7064,0x7065,0x706C,0x706E,0x7075,0x7076,0x707E,
-	0x7081,0x7085,0x7086,0x7094,0x7095,0x7096,0x7097,0x7098,
-	0x709B,0x70A4,0x70AB,0x70B0,0x70B1,0x70B4,0x70B7,0x70CA,
-	0x70D1,0x70D3,0x70D4,0x70D5,0x70D6,0x70D8,0x70DC,0x70E4,
-	0x70FA,0x7103,0x7104,0x7105,0x7106,0x7107,0x710B,0x710C,
-	0x710F,0x711E,0x7120,0x712B,0x712D,0x712F,0x7130,0x7131,
-	0x7138,0x7141,0x7145,0x7146,0x7147,0x714A,0x714B,0x7150,
-	0x7152,0x7157,0x715A,0x715C,0x715E,0x7160,
-	/* Range 0x4A21 - 0x4A7E, array index: 0x0B78 */
-	0x7168,0x7179,0x7180,0x7185,0x7187,0x718C,0x7192,0x719A,
-	0x719B,0x71A0,0x71A2,0x71AF,0x71B0,0x71B2,0x71B3,0x71BA,
-	0x71BF,0x71C0,0x71C1,0x71C4,0x71CB,0x71CC,0x71D3,0x71D6,
-	0x71D9,0x71DA,0x71DC,0x71F8,0x71FE,0x7200,0x7207,0x7208,
-	0x7209,0x7213,0x7217,0x721A,0x721D,0x721F,0x7224,0x722B,
-	0x722F,0x7234,0x7238,0x7239,0x7241,0x7242,0x7243,0x7245,
-	0x724E,0x724F,0x7250,0x7253,0x7255,0x7256,0x725A,0x725C,
-	0x725E,0x7260,0x7263,0x7268,0x726B,0x726E,0x726F,0x7271,
-	0x7277,0x7278,0x727B,0x727C,0x727F,0x7284,0x7289,0x728D,
-	0x728E,0x7293,0x729B,0x72A8,0x72AD,0x72AE,0x72B1,0x72B4,
-	0x72BE,0x72C1,0x72C7,0x72C9,0x72CC,0x72D5,0x72D6,0x72D8,
-	0x72DF,0x72E5,0x72F3,0x72F4,0x72FA,0x72FB,
-	/* Range 0x4B21 - 0x4B7E, array index: 0x0BD6 */
-	0x72FE,0x7302,0x7304,0x7305,0x7307,0x730B,0x730D,0x7312,
-	0x7313,0x7318,0x7319,0x731E,0x7322,0x7324,0x7327,0x7328,
-	0x732C,0x7331,0x7332,0x7335,0x733A,0x733B,0x733D,0x7343,
-	0x734D,0x7350,0x7352,0x7356,0x7358,0x735D,0x735E,0x735F,
-	0x7360,0x7366,0x7367,0x7369,0x736B,0x736C,0x736E,0x736F,
-	0x7371,0x7377,0x7379,0x737C,0x7380,0x7381,0x7383,0x7385,
-	0x7386,0x738E,0x7390,0x7393,0x7395,0x7397,0x7398,0x739C,
-	0x739E,0x739F,0x73A0,0x73A2,0x73A5,0x73A6,0x73AA,0x73AB,
-	0x73AD,0x73B5,0x73B7,0x73B9,0x73BC,0x73BD,0x73BF,0x73C5,
-	0x73C6,0x73C9,0x73CB,0x73CC,0x73CF,0x73D2,0x73D3,0x73D6,
-	0x73D9,0x73DD,0x73E1,0x73E3,0x73E6,0x73E7,0x73E9,0x73F4,
-	0x73F5,0x73F7,0x73F9,0x73FA,0x73FB,0x73FD,
-	/* Range 0x4C21 - 0x4C7E, array index: 0x0C34 */
-	0x73FF,0x7400,0x7401,0x7404,0x7407,0x740A,0x7411,0x741A,
-	0x741B,0x7424,0x7426,0x7428,0x7429,0x742A,0x742B,0x742C,
-	0x742D,0x742E,0x742F,0x7430,0x7431,0x7439,0x7440,0x7443,
-	0x7444,0x7446,0x7447,0x744B,0x744D,0x7451,0x7452,0x7457,
-	0x745D,0x7462,0x7466,0x7467,0x7468,0x746B,0x746D,0x746E,
-	0x7471,0x7472,0x7480,0x7481,0x7485,0x7486,0x7487,0x7489,
-	0x748F,0x7490,0x7491,0x7492,0x7498,0x7499,0x749A,0x749C,
-	0x749F,0x74A0,0x74A1,0x74A3,0x74A6,0x74A8,0x74A9,0x74AA,
-	0x74AB,0x74AE,0x74AF,0x74B1,0x74B2,0x74B5,0x74B9,0x74BB,
-	0x74BF,0x74C8,0x74C9,0x74CC,0x74D0,0x74D3,0x74D8,0x74DA,
-	0x74DB,0x74DE,0x74DF,0x74E4,0x74E8,0x74EA,0x74EB,0x74EF,
-	0x74F4,0x74FA,0x74FB,0x74FC,0x74FF,0x7506,
-	/* Range 0x4D21 - 0x4D7E, array index: 0x0C92 */
-	0x7512,0x7516,0x7517,0x7520,0x7521,0x7524,0x7527,0x7529,
-	0x752A,0x752F,0x7536,0x7539,0x753D,0x753E,0x753F,0x7540,
-	0x7543,0x7547,0x7548,0x754E,0x7550,0x7552,0x7557,0x755E,
-	0x755F,0x7561,0x756F,0x7571,0x7579,0x757A,0x757B,0x757C,
-	0x757D,0x757E,0x7581,0x7585,0x7590,0x7592,0x7593,0x7595,
-	0x7599,0x759C,0x75A2,0x75A4,0x75B4,0x75BA,0x75BF,0x75C0,
-	0x75C1,0x75C4,0x75C6,0x75CC,0x75CE,0x75CF,0x75D7,0x75DC,
-	0x75DF,0x75E0,0x75E1,0x75E4,0x75E7,0x75EC,0x75EE,0x75EF,
-	0x75F1,0x75F9,0x7600,0x7602,0x7603,0x7604,0x7607,0x7608,
-	0x760A,0x760C,0x760F,0x7612,0x7613,0x7615,0x7616,0x7619,
-	0x761B,0x761C,0x761D,0x761E,0x7623,0x7625,0x7626,0x7629,
-	0x762D,0x7632,0x7633,0x7635,0x7638,0x7639,
-	/* Range 0x4E21 - 0x4E7E, array index: 0x0CF0 */
-	0x763A,0x763C,0x764A,0x7640,0x7641,0x7643,0x7644,0x7645,
-	0x7649,0x764B,0x7655,0x7659,0x765F,0x7664,0x7665,0x766D,
-	0x766E,0x766F,0x7671,0x7674,0x7681,0x7685,0x768C,0x768D,
-	0x7695,0x769B,0x769C,0x769D,0x769F,0x76A0,0x76A2,0x76A3,
-	0x76A4,0x76A5,0x76A6,0x76A7,0x76A8,0x76AA,0x76AD,0x76BD,
-	0x76C1,0x76C5,0x76C9,0x76CB,0x76CC,0x76CE,0x76D4,0x76D9,
-	0x76E0,0x76E6,0x76E8,0x76EC,0x76F0,0x76F1,0x76F6,0x76F9,
-	0x76FC,0x7700,0x7706,0x770A,0x770E,0x7712,0x7714,0x7715,
-	0x7717,0x7719,0x771A,0x771C,0x7722,0x7728,0x772D,0x772E,
-	0x772F,0x7734,0x7735,0x7736,0x7739,0x773D,0x773E,0x7742,
-	0x7745,0x7746,0x774A,0x774D,0x774E,0x774F,0x7752,0x7756,
-	0x7757,0x775C,0x775E,0x775F,0x7760,0x7762,
-	/* Range 0x4F21 - 0x4F7E, array index: 0x0D4E */
-	0x7764,0x7767,0x776A,0x776C,0x7770,0x7772,0x7773,0x7774,
-	0x777A,0x777D,0x7780,0x7784,0x778C,0x778D,0x7794,0x7795,
-	0x7796,0x779A,0x779F,0x77A2,0x77A7,0x77AA,0x77AE,0x77AF,
-	0x77B1,0x77B5,0x77BE,0x77C3,0x77C9,0x77D1,0x77D2,0x77D5,
-	0x77D9,0x77DE,0x77DF,0x77E0,0x77E4,0x77E6,0x77EA,0x77EC,
-	0x77F0,0x77F1,0x77F4,0x77F8,0x77FB,0x7805,0x7806,0x7809,
-	0x780D,0x780E,0x7811,0x781D,0x7821,0x7822,0x7823,0x782D,
-	0x782E,0x7830,0x7835,0x7837,0x7843,0x7844,0x7847,0x7848,
-	0x784C,0x784E,0x7852,0x785C,0x785E,0x7860,0x7861,0x7863,
-	0x7864,0x7868,0x786A,0x786E,0x787A,0x787E,0x788A,0x788F,
-	0x7894,0x7898,0x78A1,0x789D,0x789E,0x789F,0x78A4,0x78A8,
-	0x78AC,0x78AD,0x78B0,0x78B1,0x78B2,0x78B3,
-	/* Range 0x5021 - 0x507E, array index: 0x0DAC */
-	0x78BB,0x78BD,0x78BF,0x78C7,0x78C8,0x78C9,0x78CC,0x78CE,
-	0x78D2,0x78D3,0x78D5,0x78D6,0x78E4,0x78DB,0x78DF,0x78E0,
-	0x78E1,0x78E6,0x78EA,0x78F2,0x78F3,0x7900,0x78F6,0x78F7,
-	0x78FA,0x78FB,0x78FF,0x7906,0x790C,0x7910,0x791A,0x791C,
-	0x791E,0x791F,0x7920,0x7925,0x7927,0x7929,0x792D,0x7931,
-	0x7934,0x7935,0x793B,0x793D,0x793F,0x7944,0x7945,0x7946,
-	0x794A,0x794B,0x794F,0x7951,0x7954,0x7958,0x795B,0x795C,
-	0x7967,0x7969,0x796B,0x7972,0x7979,0x797B,0x797C,0x797E,
-	0x798B,0x798C,0x7991,0x7993,0x7994,0x7995,0x7996,0x7998,
-	0x799B,0x799C,0x79A1,0x79A8,0x79A9,0x79AB,0x79AF,0x79B1,
-	0x79B4,0x79B8,0x79BB,0x79C2,0x79C4,0x79C7,0x79C8,0x79CA,
-	0x79CF,0x79D4,0x79D6,0x79DA,0x79DD,0x79DE,
-	/* Range 0x5121 - 0x517E, array index: 0x0E0A */
-	0x79E0,0x79E2,0x79E5,0x79EA,0x79EB,0x79ED,0x79F1,0x79F8,
-	0x79FC,0x7A02,0x7A03,0x7A07,0x7A09,0x7A0A,0x7A0C,0x7A11,
-	0x7A15,0x7A1B,0x7A1E,0x7A21,0x7A27,0x7A2B,0x7A2D,0x7A2F,
-	0x7A30,0x7A34,0x7A35,0x7A38,0x7A39,0x7A3A,0x7A44,0x7A45,
-	0x7A47,0x7A48,0x7A4C,0x7A55,0x7A56,0x7A59,0x7A5C,0x7A5D,
-	0x7A5F,0x7A60,0x7A65,0x7A67,0x7A6A,0x7A6D,0x7A75,0x7A78,
-	0x7A7E,0x7A80,0x7A82,0x7A85,0x7A86,0x7A8A,0x7A8B,0x7A90,
-	0x7A91,0x7A94,0x7A9E,0x7AA0,0x7AA3,0x7AAC,0x7AB3,0x7AB5,
-	0x7AB9,0x7ABB,0x7ABC,0x7AC6,0x7AC9,0x7ACC,0x7ACE,0x7AD1,
-	0x7ADB,0x7AE8,0x7AE9,0x7AEB,0x7AEC,0x7AF1,0x7AF4,0x7AFB,
-	0x7AFD,0x7AFE,0x7B07,0x7B14,0x7B1F,0x7B23,0x7B27,0x7B29,
-	0x7B2A,0x7B2B,0x7B2D,0x7B2E,0x7B2F,0x7B30,
-	/* Range 0x5221 - 0x527E, array index: 0x0E68 */
-	0x7B31,0x7B34,0x7B3D,0x7B3F,0x7B40,0x7B41,0x7B47,0x7B4E,
-	0x7B55,0x7B60,0x7B64,0x7B66,0x7B69,0x7B6A,0x7B6D,0x7B6F,
-	0x7B72,0x7B73,0x7B77,0x7B84,0x7B89,0x7B8E,0x7B90,0x7B91,
-	0x7B96,0x7B9B,0x7B9E,0x7BA0,0x7BA5,0x7BAC,0x7BAF,0x7BB0,
-	0x7BB2,0x7BB5,0x7BB6,0x7BBA,0x7BBB,0x7BBC,0x7BBD,0x7BC2,
-	0x7BC5,0x7BC8,0x7BCA,0x7BD4,0x7BD6,0x7BD7,0x7BD9,0x7BDA,
-	0x7BDB,0x7BE8,0x7BEA,0x7BF2,0x7BF4,0x7BF5,0x7BF8,0x7BF9,
-	0x7BFA,0x7BFC,0x7BFE,0x7C01,0x7C02,0x7C03,0x7C04,0x7C06,
-	0x7C09,0x7C0B,0x7C0C,0x7C0E,0x7C0F,0x7C19,0x7C1B,0x7C20,
-	0x7C25,0x7C26,0x7C28,0x7C2C,0x7C31,0x7C33,0x7C34,0x7C36,
-	0x7C39,0x7C3A,0x7C46,0x7C4A,0x7C55,0x7C51,0x7C52,0x7C53,
-	0x7C59,0x7C5A,0x7C5B,0x7C5C,0x7C5D,0x7C5E,
-	/* Range 0x5321 - 0x537E, array index: 0x0EC6 */
-	0x7C61,0x7C63,0x7C67,0x7C69,0x7C6D,0x7C6E,0x7C70,0x7C72,
-	0x7C79,0x7C7C,0x7C7D,0x7C86,0x7C87,0x7C8F,0x7C94,0x7C9E,
-	0x7CA0,0x7CA6,0x7CB0,0x7CB6,0x7CB7,0x7CBA,0x7CBB,0x7CBC,
-	0x7CBF,0x7CC4,0x7CC7,0x7CC8,0x7CC9,0x7CCD,0x7CCF,0x7CD3,
-	0x7CD4,0x7CD5,0x7CD7,0x7CD9,0x7CDA,0x7CDD,0x7CE6,0x7CE9,
-	0x7CEB,0x7CF5,0x7D03,0x7D07,0x7D08,0x7D09,0x7D0F,0x7D11,
-	0x7D12,0x7D13,0x7D16,0x7D1D,0x7D1E,0x7D23,0x7D26,0x7D2A,
-	0x7D2D,0x7D31,0x7D3C,0x7D3D,0x7D3E,0x7D40,0x7D41,0x7D47,
-	0x7D48,0x7D4D,0x7D51,0x7D53,0x7D57,0x7D59,0x7D5A,0x7D5C,
-	0x7D5D,0x7D65,0x7D67,0x7D6A,0x7D70,0x7D78,0x7D7A,0x7D7B,
-	0x7D7F,0x7D81,0x7D82,0x7D83,0x7D85,0x7D86,0x7D88,0x7D8B,
-	0x7D8C,0x7D8D,0x7D91,0x7D96,0x7D97,0x7D9D,
-	/* Range 0x5421 - 0x547E, array index: 0x0F24 */
-	0x7D9E,0x7DA6,0x7DA7,0x7DAA,0x7DB3,0x7DB6,0x7DB7,0x7DB9,
-	0x7DC2,0x7DC3,0x7DC4,0x7DC5,0x7DC6,0x7DCC,0x7DCD,0x7DCE,
-	0x7DD7,0x7DD9,0x7E00,0x7DE2,0x7DE5,0x7DE6,0x7DEA,0x7DEB,
-	0x7DED,0x7DF1,0x7DF5,0x7DF6,0x7DF9,0x7DFA,0x7E08,0x7E10,
-	0x7E11,0x7E15,0x7E17,0x7E1C,0x7E1D,0x7E20,0x7E27,0x7E28,
-	0x7E2C,0x7E2D,0x7E2F,0x7E33,0x7E36,0x7E3F,0x7E44,0x7E45,
-	0x7E47,0x7E4E,0x7E50,0x7E52,0x7E58,0x7E5F,0x7E61,0x7E62,
-	0x7E65,0x7E6B,0x7E6E,0x7E6F,0x7E73,0x7E78,0x7E7E,0x7E81,
-	0x7E86,0x7E87,0x7E8A,0x7E8D,0x7E91,0x7E95,0x7E98,0x7E9A,
-	0x7E9D,0x7E9E,0x7F3C,0x7F3B,0x7F3D,0x7F3E,0x7F3F,0x7F43,
-	0x7F44,0x7F47,0x7F4F,0x7F52,0x7F53,0x7F5B,0x7F5C,0x7F5D,
-	0x7F61,0x7F63,0x7F64,0x7F65,0x7F66,0x7F6D,
-	/* Range 0x5521 - 0x557E, array index: 0x0F82 */
-	0x7F71,0x7F7D,0x7F7E,0x7F7F,0x7F80,0x7F8B,0x7F8D,0x7F8F,
-	0x7F90,0x7F91,0x7F96,0x7F97,0x7F9C,0x7FA1,0x7FA2,0x7FA6,
-	0x7FAA,0x7FAD,0x7FB4,0x7FBC,0x7FBF,0x7FC0,0x7FC3,0x7FC8,
-	0x7FCE,0x7FCF,0x7FDB,0x7FDF,0x7FE3,0x7FE5,0x7FE8,0x7FEC,
-	0x7FEE,0x7FEF,0x7FF2,0x7FFA,0x7FFD,0x7FFE,0x7FFF,0x8007,
-	0x8008,0x800A,0x800D,0x800E,0x800F,0x8011,0x8013,0x8014,
-	0x8016,0x801D,0x801E,0x801F,0x8020,0x8024,0x8026,0x802C,
-	0x802E,0x8030,0x8034,0x8035,0x8037,0x8039,0x803A,0x803C,
-	0x803E,0x8040,0x8044,0x8060,0x8064,0x8066,0x806D,0x8071,
-	0x8075,0x8081,0x8088,0x808E,0x809C,0x809E,0x80A6,0x80A7,
-	0x80AB,0x80B8,0x80B9,0x80C8,0x80CD,0x80CF,0x80D2,0x80D4,
-	0x80D5,0x80D7,0x80D8,0x80E0,0x80ED,0x80EE,
-	/* Range 0x5621 - 0x567E, array index: 0x0FE0 */
-	0x80F0,0x80F2,0x80F3,0x80F6,0x80F9,0x80FA,0x80FE,0x8103,
-	0x810B,0x8116,0x8117,0x8118,0x811C,0x811E,0x8120,0x8124,
-	0x8127,0x812C,0x8130,0x8135,0x813A,0x813C,0x8145,0x8147,
-	0x814A,0x814C,0x8152,0x8157,0x8160,0x8161,0x8167,0x8168,
-	0x8169,0x816D,0x816F,0x8177,0x8181,0x8190,0x8184,0x8185,
-	0x8186,0x818B,0x818E,0x8196,0x8198,0x819B,0x819E,0x81A2,
-	0x81AE,0x81B2,0x81B4,0x81BB,0x81CB,0x81C3,0x81C5,0x81CA,
-	0x81CE,0x81CF,0x81D5,0x81D7,0x81DB,0x81DD,0x81DE,0x81E1,
-	0x81E4,0x81EB,0x81EC,0x81F0,0x81F1,0x81F2,0x81F5,0x81F6,
-	0x81F8,0x81F9,0x81FD,0x81FF,0x8200,0x8203,0x820F,0x8213,
-	0x8214,0x8219,0x821A,0x821D,0x8221,0x8222,0x8228,0x8232,
-	0x8234,0x823A,0x8243,0x8244,0x8245,0x8246,
-	/* Range 0x5721 - 0x577E, array index: 0x103E */
-	0x824B,0x824E,0x824F,0x8251,0x8256,0x825C,0x8260,0x8263,
-	0x8267,0x826D,0x8274,0x827B,0x827D,0x827F,0x8280,0x8281,
-	0x8283,0x8284,0x8287,0x8289,0x828A,0x828E,0x8291,0x8294,
-	0x8296,0x8298,0x829A,0x829B,0x82A0,0x82A1,0x82A3,0x82A4,
-	0x82A7,0x82A8,0x82A9,0x82AA,0x82AE,0x82B0,0x82B2,0x82B4,
-	0x82B7,0x82BA,0x82BC,0x82BE,0x82BF,0x82C6,0x82D0,0x82D5,
-	0x82DA,0x82E0,0x82E2,0x82E4,0x82E8,0x82EA,0x82ED,0x82EF,
-	0x82F6,0x82F7,0x82FD,0x82FE,0x8300,0x8301,0x8307,0x8308,
-	0x830A,0x830B,0x8354,0x831B,0x831D,0x831E,0x831F,0x8321,
-	0x8322,0x832C,0x832D,0x832E,0x8330,0x8333,0x8337,0x833A,
-	0x833C,0x833D,0x8342,0x8343,0x8344,0x8347,0x834D,0x834E,
-	0x8351,0x8355,0x8356,0x8357,0x8370,0x8378,
-	/* Range 0x5821 - 0x587E, array index: 0x109C */
-	0x837D,0x837F,0x8380,0x8382,0x8384,0x8386,0x838D,0x8392,
-	0x8394,0x8395,0x8398,0x8399,0x839B,0x839C,0x839D,0x83A6,
-	0x83A7,0x83A9,0x83AC,0x83BE,0x83BF,0x83C0,0x83C7,0x83C9,
-	0x83CF,0x83D0,0x83D1,0x83D4,0x83DD,0x8353,0x83E8,0x83EA,
-	0x83F6,0x83F8,0x83F9,0x83FC,0x8401,0x8406,0x840A,0x840F,
-	0x8411,0x8415,0x8419,0x83AD,0x842F,0x8439,0x8445,0x8447,
-	0x8448,0x844A,0x844D,0x844F,0x8451,0x8452,0x8456,0x8458,
-	0x8459,0x845A,0x845C,0x8460,0x8464,0x8465,0x8467,0x846A,
-	0x8470,0x8473,0x8474,0x8476,0x8478,0x847C,0x847D,0x8481,
-	0x8485,0x8492,0x8493,0x8495,0x849E,0x84A6,0x84A8,0x84A9,
-	0x84AA,0x84AF,0x84B1,0x84B4,0x84BA,0x84BD,0x84BE,0x84C0,
-	0x84C2,0x84C7,0x84C8,0x84CC,0x84CF,0x84D3,
-	/* Range 0x5921 - 0x597E, array index: 0x10FA */
-	0x84DC,0x84E7,0x84EA,0x84EF,0x84F0,0x84F1,0x84F2,0x84F7,
-	0x8532,0x84FA,0x84FB,0x84FD,0x8502,0x8503,0x8507,0x850C,
-	0x850E,0x8510,0x851C,0x851E,0x8522,0x8523,0x8524,0x8525,
-	0x8527,0x852A,0x852B,0x852F,0x8533,0x8534,0x8536,0x853F,
-	0x8546,0x854F,0x8550,0x8551,0x8552,0x8553,0x8556,0x8559,
-	0x855C,0x855D,0x855E,0x855F,0x8560,0x8561,0x8562,0x8564,
-	0x856B,0x856F,0x8579,0x857A,0x857B,0x857D,0x857F,0x8581,
-	0x8585,0x8586,0x8589,0x858B,0x858C,0x858F,0x8593,0x8598,
-	0x859D,0x859F,0x85A0,0x85A2,0x85A5,0x85A7,0x85B4,0x85B6,
-	0x85B7,0x85B8,0x85BC,0x85BD,0x85BE,0x85BF,0x85C2,0x85C7,
-	0x85CA,0x85CB,0x85CE,0x85AD,0x85D8,0x85DA,0x85DF,0x85E0,
-	0x85E6,0x85E8,0x85ED,0x85F3,0x85F6,0x85FC,
-	/* Range 0x5A21 - 0x5A7E, array index: 0x1158 */
-	0x85FF,0x8600,0x8604,0x8605,0x860D,0x860E,0x8610,0x8611,
-	0x8612,0x8618,0x8619,0x861B,0x861E,0x8621,0x8627,0x8629,
-	0x8636,0x8638,0x863A,0x863C,0x863D,0x8640,0x8642,0x8646,
-	0x8652,0x8653,0x8656,0x8657,0x8658,0x8659,0x865D,0x8660,
-	0x8661,0x8662,0x8663,0x8664,0x8669,0x866C,0x866F,0x8675,
-	0x8676,0x8677,0x867A,0x868D,0x8691,0x8696,0x8698,0x869A,
-	0x869C,0x86A1,0x86A6,0x86A7,0x86A8,0x86AD,0x86B1,0x86B3,
-	0x86B4,0x86B5,0x86B7,0x86B8,0x86B9,0x86BF,0x86C0,0x86C1,
-	0x86C3,0x86C5,0x86D1,0x86D2,0x86D5,0x86D7,0x86DA,0x86DC,
-	0x86E0,0x86E3,0x86E5,0x86E7,0x8688,0x86FA,0x86FC,0x86FD,
-	0x8704,0x8705,0x8707,0x870B,0x870E,0x870F,0x8710,0x8713,
-	0x8714,0x8719,0x871E,0x871F,0x8721,0x8723,
-	/* Range 0x5B21 - 0x5B7E, array index: 0x11B6 */
-	0x8728,0x872E,0x872F,0x8731,0x8732,0x8739,0x873A,0x873C,
-	0x873D,0x873E,0x8740,0x8743,0x8745,0x874D,0x8758,0x875D,
-	0x8761,0x8764,0x8765,0x876F,0x8771,0x8772,0x877B,0x8783,
-	0x8784,0x8785,0x8786,0x8787,0x8788,0x8789,0x878B,0x878C,
-	0x8790,0x8793,0x8795,0x8797,0x8798,0x8799,0x879E,0x87A0,
-	0x87A3,0x87A7,0x87AC,0x87AD,0x87AE,0x87B1,0x87B5,0x87BE,
-	0x87BF,0x87C1,0x87C8,0x87C9,0x87CA,0x87CE,0x87D5,0x87D6,
-	0x87D9,0x87DA,0x87DC,0x87DF,0x87E2,0x87E3,0x87E4,0x87EA,
-	0x87EB,0x87ED,0x87F1,0x87F3,0x87F8,0x87FA,0x87FF,0x8801,
-	0x8803,0x8806,0x8809,0x880A,0x880B,0x8810,0x8819,0x8812,
-	0x8813,0x8814,0x8818,0x881A,0x881B,0x881C,0x881E,0x881F,
-	0x8828,0x882D,0x882E,0x8830,0x8832,0x8835,
-	/* Range 0x5C21 - 0x5C7E, array index: 0x1214 */
-	0x883A,0x883C,0x8841,0x8843,0x8845,0x8848,0x8849,0x884A,
-	0x884B,0x884E,0x8851,0x8855,0x8856,0x8858,0x885A,0x885C,
-	0x885F,0x8860,0x8864,0x8869,0x8871,0x8879,0x887B,0x8880,
-	0x8898,0x889A,0x889B,0x889C,0x889F,0x88A0,0x88A8,0x88AA,
-	0x88BA,0x88BD,0x88BE,0x88C0,0x88CA,0x88CB,0x88CC,0x88CD,
-	0x88CE,0x88D1,0x88D2,0x88D3,0x88DB,0x88DE,0x88E7,0x88EF,
-	0x88F0,0x88F1,0x88F5,0x88F7,0x8901,0x8906,0x890D,0x890E,
-	0x890F,0x8915,0x8916,0x8918,0x8919,0x891A,0x891C,0x8920,
-	0x8926,0x8927,0x8928,0x8930,0x8931,0x8932,0x8935,0x8939,
-	0x893A,0x893E,0x8940,0x8942,0x8945,0x8946,0x8949,0x894F,
-	0x8952,0x8957,0x895A,0x895B,0x895C,0x8961,0x8962,0x8963,
-	0x896B,0x896E,0x8970,0x8973,0x8975,0x897A,
-	/* Range 0x5D21 - 0x5D7E, array index: 0x1272 */
-	0x897B,0x897C,0x897D,0x8989,0x898D,0x8990,0x8994,0x8995,
-	0x899B,0x899C,0x899F,0x89A0,0x89A5,0x89B0,0x89B4,0x89B5,
-	0x89B6,0x89B7,0x89BC,0x89D4,0x89D5,0x89D6,0x89D7,0x89D8,
-	0x89E5,0x89E9,0x89EB,0x89ED,0x89F1,0x89F3,0x89F6,0x89F9,
-	0x89FD,0x89FF,0x8A04,0x8A05,0x8A07,0x8A0F,0x8A11,0x8A12,
-	0x8A14,0x8A15,0x8A1E,0x8A20,0x8A22,0x8A24,0x8A26,0x8A2B,
-	0x8A2C,0x8A2F,0x8A35,0x8A37,0x8A3D,0x8A3E,0x8A40,0x8A43,
-	0x8A45,0x8A47,0x8A49,0x8A4D,0x8A4E,0x8A53,0x8A56,0x8A57,
-	0x8A58,0x8A5C,0x8A5D,0x8A61,0x8A65,0x8A67,0x8A75,0x8A76,
-	0x8A77,0x8A79,0x8A7A,0x8A7B,0x8A7E,0x8A7F,0x8A80,0x8A83,
-	0x8A86,0x8A8B,0x8A8F,0x8A90,0x8A92,0x8A96,0x8A97,0x8A99,
-	0x8A9F,0x8AA7,0x8AA9,0x8AAE,0x8AAF,0x8AB3,
-	/* Range 0x5E21 - 0x5E7E, array index: 0x12D0 */
-	0x8AB6,0x8AB7,0x8ABB,0x8ABE,0x8AC3,0x8AC6,0x8AC8,0x8AC9,
-	0x8ACA,0x8AD1,0x8AD3,0x8AD4,0x8AD5,0x8AD7,0x8ADD,0x8ADF,
-	0x8AEC,0x8AF0,0x8AF4,0x8AF5,0x8AF6,0x8AFC,0x8AFF,0x8B05,
-	0x8B06,0x8B0B,0x8B11,0x8B1C,0x8B1E,0x8B1F,0x8B0A,0x8B2D,
-	0x8B30,0x8B37,0x8B3C,0x8B42,0x8B43,0x8B44,0x8B45,0x8B46,
-	0x8B48,0x8B52,0x8B53,0x8B54,0x8B59,0x8B4D,0x8B5E,0x8B63,
-	0x8B6D,0x8B76,0x8B78,0x8B79,0x8B7C,0x8B7E,0x8B81,0x8B84,
-	0x8B85,0x8B8B,0x8B8D,0x8B8F,0x8B94,0x8B95,0x8B9C,0x8B9E,
-	0x8B9F,0x8C38,0x8C39,0x8C3D,0x8C3E,0x8C45,0x8C47,0x8C49,
-	0x8C4B,0x8C4F,0x8C51,0x8C53,0x8C54,0x8C57,0x8C58,0x8C5B,
-	0x8C5D,0x8C59,0x8C63,0x8C64,0x8C66,0x8C68,0x8C69,0x8C6D,
-	0x8C73,0x8C75,0x8C76,0x8C7B,0x8C7E,0x8C86,
-	/* Range 0x5F21 - 0x5F7E, array index: 0x132E */
-	0x8C87,0x8C8B,0x8C90,0x8C92,0x8C93,0x8C99,0x8C9B,0x8C9C,
-	0x8CA4,0x8CB9,0x8CBA,0x8CC5,0x8CC6,0x8CC9,0x8CCB,0x8CCF,
-	0x8CD6,0x8CD5,0x8CD9,0x8CDD,0x8CE1,0x8CE8,0x8CEC,0x8CEF,
-	0x8CF0,0x8CF2,0x8CF5,0x8CF7,0x8CF8,0x8CFE,0x8CFF,0x8D01,
-	0x8D03,0x8D09,0x8D12,0x8D17,0x8D1B,0x8D65,0x8D69,0x8D6C,
-	0x8D6E,0x8D7F,0x8D82,0x8D84,0x8D88,0x8D8D,0x8D90,0x8D91,
-	0x8D95,0x8D9E,0x8D9F,0x8DA0,0x8DA6,0x8DAB,0x8DAC,0x8DAF,
-	0x8DB2,0x8DB5,0x8DB7,0x8DB9,0x8DBB,0x8DC0,0x8DC5,0x8DC6,
-	0x8DC7,0x8DC8,0x8DCA,0x8DCE,0x8DD1,0x8DD4,0x8DD5,0x8DD7,
-	0x8DD9,0x8DE4,0x8DE5,0x8DE7,0x8DEC,0x8DF0,0x8DBC,0x8DF1,
-	0x8DF2,0x8DF4,0x8DFD,0x8E01,0x8E04,0x8E05,0x8E06,0x8E0B,
-	0x8E11,0x8E14,0x8E16,0x8E20,0x8E21,0x8E22,
-	/* Range 0x6021 - 0x607E, array index: 0x138C */
-	0x8E23,0x8E26,0x8E27,0x8E31,0x8E33,0x8E36,0x8E37,0x8E38,
-	0x8E39,0x8E3D,0x8E40,0x8E41,0x8E4B,0x8E4D,0x8E4E,0x8E4F,
-	0x8E54,0x8E5B,0x8E5C,0x8E5D,0x8E5E,0x8E61,0x8E62,0x8E69,
-	0x8E6C,0x8E6D,0x8E6F,0x8E70,0x8E71,0x8E79,0x8E7A,0x8E7B,
-	0x8E82,0x8E83,0x8E89,0x8E90,0x8E92,0x8E95,0x8E9A,0x8E9B,
-	0x8E9D,0x8E9E,0x8EA2,0x8EA7,0x8EA9,0x8EAD,0x8EAE,0x8EB3,
-	0x8EB5,0x8EBA,0x8EBB,0x8EC0,0x8EC1,0x8EC3,0x8EC4,0x8EC7,
-	0x8ECF,0x8ED1,0x8ED4,0x8EDC,0x8EE8,0x8EEE,0x8EF0,0x8EF1,
-	0x8EF7,0x8EF9,0x8EFA,0x8EED,0x8F00,0x8F02,0x8F07,0x8F08,
-	0x8F0F,0x8F10,0x8F16,0x8F17,0x8F18,0x8F1E,0x8F20,0x8F21,
-	0x8F23,0x8F25,0x8F27,0x8F28,0x8F2C,0x8F2D,0x8F2E,0x8F34,
-	0x8F35,0x8F36,0x8F37,0x8F3A,0x8F40,0x8F41,
-	/* Range 0x6121 - 0x617E, array index: 0x13EA */
-	0x8F43,0x8F47,0x8F4F,0x8F51,0x8F52,0x8F53,0x8F54,0x8F55,
-	0x8F58,0x8F5D,0x8F5E,0x8F65,0x8F9D,0x8FA0,0x8FA1,0x8FA4,
-	0x8FA5,0x8FA6,0x8FB5,0x8FB6,0x8FB8,0x8FBE,0x8FC0,0x8FC1,
-	0x8FC6,0x8FCA,0x8FCB,0x8FCD,0x8FD0,0x8FD2,0x8FD3,0x8FD5,
-	0x8FE0,0x8FE3,0x8FE4,0x8FE8,0x8FEE,0x8FF1,0x8FF5,0x8FF6,
-	0x8FFB,0x8FFE,0x9002,0x9004,0x9008,0x900C,0x9018,0x901B,
-	0x9028,0x9029,0x902F,0x902A,0x902C,0x902D,0x9033,0x9034,
-	0x9037,0x903F,0x9043,0x9044,0x904C,0x905B,0x905D,0x9062,
-	0x9066,0x9067,0x906C,0x9070,0x9074,0x9079,0x9085,0x9088,
-	0x908B,0x908C,0x908E,0x9090,0x9095,0x9097,0x9098,0x9099,
-	0x909B,0x90A0,0x90A1,0x90A2,0x90A5,0x90B0,0x90B2,0x90B3,
-	0x90B4,0x90B6,0x90BD,0x90CC,0x90BE,0x90C3,
-	/* Range 0x6221 - 0x627E, array index: 0x1448 */
-	0x90C4,0x90C5,0x90C7,0x90C8,0x90D5,0x90D7,0x90D8,0x90D9,
-	0x90DC,0x90DD,0x90DF,0x90E5,0x90D2,0x90F6,0x90EB,0x90EF,
-	0x90F0,0x90F4,0x90FE,0x90FF,0x9100,0x9104,0x9105,0x9106,
-	0x9108,0x910D,0x9110,0x9114,0x9116,0x9117,0x9118,0x911A,
-	0x911C,0x911E,0x9120,0x9125,0x9122,0x9123,0x9127,0x9129,
-	0x912E,0x912F,0x9131,0x9134,0x9136,0x9137,0x9139,0x913A,
-	0x913C,0x913D,0x9143,0x9147,0x9148,0x914F,0x9153,0x9157,
-	0x9159,0x915A,0x915B,0x9161,0x9164,0x9167,0x916D,0x9174,
-	0x9179,0x917A,0x917B,0x9181,0x9183,0x9185,0x9186,0x918A,
-	0x918E,0x9191,0x9193,0x9194,0x9195,0x9198,0x919E,0x91A1,
-	0x91A6,0x91A8,0x91AC,0x91AD,0x91AE,0x91B0,0x91B1,0x91B2,
-	0x91B3,0x91B6,0x91BB,0x91BC,0x91BD,0x91BF,
-	/* Range 0x6321 - 0x637E, array index: 0x14A6 */
-	0x91C2,0x91C3,0x91C5,0x91D3,0x91D4,0x91D7,0x91D9,0x91DA,
-	0x91DE,0x91E4,0x91E5,0x91E9,0x91EA,0x91EC,0x91ED,0x91EE,
-	0x91EF,0x91F0,0x91F1,0x91F7,0x91F9,0x91FB,0x91FD,0x9200,
-	0x9201,0x9204,0x9205,0x9206,0x9207,0x9209,0x920A,0x920C,
-	0x9210,0x9212,0x9213,0x9216,0x9218,0x921C,0x921D,0x9223,
-	0x9224,0x9225,0x9226,0x9228,0x922E,0x922F,0x9230,0x9233,
-	0x9235,0x9236,0x9238,0x9239,0x923A,0x923C,0x923E,0x9240,
-	0x9242,0x9243,0x9246,0x9247,0x924A,0x924D,0x924E,0x924F,
-	0x9251,0x9258,0x9259,0x925C,0x925D,0x9260,0x9261,0x9265,
-	0x9267,0x9268,0x9269,0x926E,0x926F,0x9270,0x9275,0x9276,
-	0x9277,0x9278,0x9279,0x927B,0x927C,0x927D,0x927F,0x9288,
-	0x9289,0x928A,0x928D,0x928E,0x9292,0x9297,
-	/* Range 0x6421 - 0x647E, array index: 0x1504 */
-	0x9299,0x929F,0x92A0,0x92A4,0x92A5,0x92A7,0x92A8,0x92AB,
-	0x92AF,0x92B2,0x92B6,0x92B8,0x92BA,0x92BB,0x92BC,0x92BD,
-	0x92BF,0x92C0,0x92C1,0x92C2,0x92C3,0x92C5,0x92C6,0x92C7,
-	0x92C8,0x92CB,0x92CC,0x92CD,0x92CE,0x92D0,0x92D3,0x92D5,
-	0x92D7,0x92D8,0x92D9,0x92DC,0x92DD,0x92DF,0x92E0,0x92E1,
-	0x92E3,0x92E5,0x92E7,0x92E8,0x92EC,0x92EE,0x92F0,0x92F9,
-	0x92FB,0x92FF,0x9300,0x9302,0x9308,0x930D,0x9311,0x9314,
-	0x9315,0x931C,0x931D,0x931E,0x931F,0x9321,0x9324,0x9325,
-	0x9327,0x9329,0x932A,0x9333,0x9334,0x9336,0x9337,0x9347,
-	0x9348,0x9349,0x9350,0x9351,0x9352,0x9355,0x9357,0x9358,
-	0x935A,0x935E,0x9364,0x9365,0x9367,0x9369,0x936A,0x936D,
-	0x936F,0x9370,0x9371,0x9373,0x9374,0x9376,
-	/* Range 0x6521 - 0x657E, array index: 0x1562 */
-	0x937A,0x937D,0x937F,0x9380,0x9381,0x9382,0x9388,0x938A,
-	0x938B,0x938D,0x938F,0x9392,0x9395,0x9398,0x939B,0x939E,
-	0x93A1,0x93A3,0x93A4,0x93A6,0x93A8,0x93AB,0x93B4,0x93B5,
-	0x93B6,0x93BA,0x93A9,0x93C1,0x93C4,0x93C5,0x93C6,0x93C7,
-	0x93C9,0x93CA,0x93CB,0x93CC,0x93CD,0x93D3,0x93D9,0x93DC,
-	0x93DE,0x93DF,0x93E2,0x93E6,0x93E7,0x93F9,0x93F7,0x93F8,
-	0x93FA,0x93FB,0x93FD,0x9401,0x9402,0x9404,0x9408,0x9409,
-	0x940D,0x940E,0x940F,0x9415,0x9416,0x9417,0x941F,0x942E,
-	0x942F,0x9431,0x9432,0x9433,0x9434,0x943B,0x943F,0x943D,
-	0x9443,0x9445,0x9448,0x944A,0x944C,0x9455,0x9459,0x945C,
-	0x945F,0x9461,0x9463,0x9468,0x946B,0x946D,0x946E,0x946F,
-	0x9471,0x9472,0x9484,0x9483,0x9578,0x9579,
-	/* Range 0x6621 - 0x667E, array index: 0x15C0 */
-	0x957E,0x9584,0x9588,0x958C,0x958D,0x958E,0x959D,0x959E,
-	0x959F,0x95A1,0x95A6,0x95A9,0x95AB,0x95AC,0x95B4,0x95B6,
-	0x95BA,0x95BD,0x95BF,0x95C6,0x95C8,0x95C9,0x95CB,0x95D0,
-	0x95D1,0x95D2,0x95D3,0x95D9,0x95DA,0x95DD,0x95DE,0x95DF,
-	0x95E0,0x95E4,0x95E6,0x961D,0x961E,0x9622,0x9624,0x9625,
-	0x9626,0x962C,0x9631,0x9633,0x9637,0x9638,0x9639,0x963A,
-	0x963C,0x963D,0x9641,0x9652,0x9654,0x9656,0x9657,0x9658,
-	0x9661,0x966E,0x9674,0x967B,0x967C,0x967E,0x967F,0x9681,
-	0x9682,0x9683,0x9684,0x9689,0x9691,0x9696,0x969A,0x969D,
-	0x969F,0x96A4,0x96A5,0x96A6,0x96A9,0x96AE,0x96AF,0x96B3,
-	0x96BA,0x96CA,0x96D2,0x5DB2,0x96D8,0x96DA,0x96DD,0x96DE,
-	0x96DF,0x96E9,0x96EF,0x96F1,0x96FA,0x9702,
-	/* Range 0x6721 - 0x677E, array index: 0x161E */
-	0x9703,0x9705,0x9709,0x971A,0x971B,0x971D,0x9721,0x9722,
-	0x9723,0x9728,0x9731,0x9733,0x9741,0x9743,0x974A,0x974E,
-	0x974F,0x9755,0x9757,0x9758,0x975A,0x975B,0x9763,0x9767,
-	0x976A,0x976E,0x9773,0x9776,0x9777,0x9778,0x977B,0x977D,
-	0x977F,0x9780,0x9789,0x9795,0x9796,0x9797,0x9799,0x979A,
-	0x979E,0x979F,0x97A2,0x97AC,0x97AE,0x97B1,0x97B2,0x97B5,
-	0x97B6,0x97B8,0x97B9,0x97BA,0x97BC,0x97BE,0x97BF,0x97C1,
-	0x97C4,0x97C5,0x97C7,0x97C9,0x97CA,0x97CC,0x97CD,0x97CE,
-	0x97D0,0x97D1,0x97D4,0x97D7,0x97D8,0x97D9,0x97DD,0x97DE,
-	0x97E0,0x97DB,0x97E1,0x97E4,0x97EF,0x97F1,0x97F4,0x97F7,
-	0x97F8,0x97FA,0x9807,0x980A,0x9819,0x980D,0x980E,0x9814,
-	0x9816,0x981C,0x981E,0x9820,0x9823,0x9826,
-	/* Range 0x6821 - 0x687E, array index: 0x167C */
-	0x982B,0x982E,0x982F,0x9830,0x9832,0x9833,0x9835,0x9825,
-	0x983E,0x9844,0x9847,0x984A,0x9851,0x9852,0x9853,0x9856,
-	0x9857,0x9859,0x985A,0x9862,0x9863,0x9865,0x9866,0x986A,
-	0x986C,0x98AB,0x98AD,0x98AE,0x98B0,0x98B4,0x98B7,0x98B8,
-	0x98BA,0x98BB,0x98BF,0x98C2,0x98C5,0x98C8,0x98CC,0x98E1,
-	0x98E3,0x98E5,0x98E6,0x98E7,0x98EA,0x98F3,0x98F6,0x9902,
-	0x9907,0x9908,0x9911,0x9915,0x9916,0x9917,0x991A,0x991B,
-	0x991C,0x991F,0x9922,0x9926,0x9927,0x992B,0x9931,0x9932,
-	0x9933,0x9934,0x9935,0x9939,0x993A,0x993B,0x993C,0x9940,
-	0x9941,0x9946,0x9947,0x9948,0x994D,0x994E,0x9954,0x9958,
-	0x9959,0x995B,0x995C,0x995E,0x995F,0x9960,0x999B,0x999D,
-	0x999F,0x99A6,0x99B0,0x99B1,0x99B2,0x99B5,
-	/* Range 0x6921 - 0x697E, array index: 0x16DA */
-	0x99B9,0x99BA,0x99BD,0x99BF,0x99C3,0x99C9,0x99D3,0x99D4,
-	0x99D9,0x99DA,0x99DC,0x99DE,0x99E7,0x99EA,0x99EB,0x99EC,
-	0x99F0,0x99F4,0x99F5,0x99F9,0x99FD,0x99FE,0x9A02,0x9A03,
-	0x9A04,0x9A0B,0x9A0C,0x9A10,0x9A11,0x9A16,0x9A1E,0x9A20,
-	0x9A22,0x9A23,0x9A24,0x9A27,0x9A2D,0x9A2E,0x9A33,0x9A35,
-	0x9A36,0x9A38,0x9A47,0x9A41,0x9A44,0x9A4A,0x9A4B,0x9A4C,
-	0x9A4E,0x9A51,0x9A54,0x9A56,0x9A5D,0x9AAA,0x9AAC,0x9AAE,
-	0x9AAF,0x9AB2,0x9AB4,0x9AB5,0x9AB6,0x9AB9,0x9ABB,0x9ABE,
-	0x9ABF,0x9AC1,0x9AC3,0x9AC6,0x9AC8,0x9ACE,0x9AD0,0x9AD2,
-	0x9AD5,0x9AD6,0x9AD7,0x9ADB,0x9ADC,0x9AE0,0x9AE4,0x9AE5,
-	0x9AE7,0x9AE9,0x9AEC,0x9AF2,0x9AF3,0x9AF5,0x9AF9,0x9AFA,
-	0x9AFD,0x9AFF,0x9B00,0x9B01,0x9B02,0x9B03,
-	/* Range 0x6A21 - 0x6A7E, array index: 0x1738 */
-	0x9B04,0x9B05,0x9B08,0x9B09,0x9B0B,0x9B0C,0x9B0D,0x9B0E,
-	0x9B10,0x9B12,0x9B16,0x9B19,0x9B1B,0x9B1C,0x9B20,0x9B26,
-	0x9B2B,0x9B2D,0x9B33,0x9B34,0x9B35,0x9B37,0x9B39,0x9B3A,
-	0x9B3D,0x9B48,0x9B4B,0x9B4C,0x9B55,0x9B56,0x9B57,0x9B5B,
-	0x9B5E,0x9B61,0x9B63,0x9B65,0x9B66,0x9B68,0x9B6A,0x9B6B,
-	0x9B6C,0x9B6D,0x9B6E,0x9B73,0x9B75,0x9B77,0x9B78,0x9B79,
-	0x9B7F,0x9B80,0x9B84,0x9B85,0x9B86,0x9B87,0x9B89,0x9B8A,
-	0x9B8B,0x9B8D,0x9B8F,0x9B90,0x9B94,0x9B9A,0x9B9D,0x9B9E,
-	0x9BA6,0x9BA7,0x9BA9,0x9BAC,0x9BB0,0x9BB1,0x9BB2,0x9BB7,
-	0x9BB8,0x9BBB,0x9BBC,0x9BBE,0x9BBF,0x9BC1,0x9BC7,0x9BC8,
-	0x9BCE,0x9BD0,0x9BD7,0x9BD8,0x9BDD,0x9BDF,0x9BE5,0x9BE7,
-	0x9BEA,0x9BEB,0x9BEF,0x9BF3,0x9BF7,0x9BF8,
-	/* Range 0x6B21 - 0x6B7E, array index: 0x1796 */
-	0x9BF9,0x9BFA,0x9BFD,0x9BFF,0x9C00,0x9C02,0x9C0B,0x9C0F,
-	0x9C11,0x9C16,0x9C18,0x9C19,0x9C1A,0x9C1C,0x9C1E,0x9C22,
-	0x9C23,0x9C26,0x9C27,0x9C28,0x9C29,0x9C2A,0x9C31,0x9C35,
-	0x9C36,0x9C37,0x9C3D,0x9C41,0x9C43,0x9C44,0x9C45,0x9C49,
-	0x9C4A,0x9C4E,0x9C4F,0x9C50,0x9C53,0x9C54,0x9C56,0x9C58,
-	0x9C5B,0x9C5D,0x9C5E,0x9C5F,0x9C63,0x9C69,0x9C6A,0x9C5C,
-	0x9C6B,0x9C68,0x9C6E,0x9C70,0x9C72,0x9C75,0x9C77,0x9C7B,
-	0x9CE6,0x9CF2,0x9CF7,0x9CF9,0x9D0B,0x9D02,0x9D11,0x9D17,
-	0x9D18,0x9D1C,0x9D1D,0x9D1E,0x9D2F,0x9D30,0x9D32,0x9D33,
-	0x9D34,0x9D3A,0x9D3C,0x9D45,0x9D3D,0x9D42,0x9D43,0x9D47,
-	0x9D4A,0x9D53,0x9D54,0x9D5F,0x9D63,0x9D62,0x9D65,0x9D69,
-	0x9D6A,0x9D6B,0x9D70,0x9D76,0x9D77,0x9D7B,
-	/* Range 0x6C21 - 0x6C7E, array index: 0x17F4 */
-	0x9D7C,0x9D7E,0x9D83,0x9D84,0x9D86,0x9D8A,0x9D8D,0x9D8E,
-	0x9D92,0x9D93,0x9D95,0x9D96,0x9D97,0x9D98,0x9DA1,0x9DAA,
-	0x9DAC,0x9DAE,0x9DB1,0x9DB5,0x9DB9,0x9DBC,0x9DBF,0x9DC3,
-	0x9DC7,0x9DC9,0x9DCA,0x9DD4,0x9DD5,0x9DD6,0x9DD7,0x9DDA,
-	0x9DDE,0x9DDF,0x9DE0,0x9DE5,0x9DE7,0x9DE9,0x9DEB,0x9DEE,
-	0x9DF0,0x9DF3,0x9DF4,0x9DFE,0x9E0A,0x9E02,0x9E07,0x9E0E,
-	0x9E10,0x9E11,0x9E12,0x9E15,0x9E16,0x9E19,0x9E1C,0x9E1D,
-	0x9E7A,0x9E7B,0x9E7C,0x9E80,0x9E82,0x9E83,0x9E84,0x9E85,
-	0x9E87,0x9E8E,0x9E8F,0x9E96,0x9E98,0x9E9B,0x9E9E,0x9EA4,
-	0x9EA8,0x9EAC,0x9EAE,0x9EAF,0x9EB0,0x9EB3,0x9EB4,0x9EB5,
-	0x9EC6,0x9EC8,0x9ECB,0x9ED5,0x9EDF,0x9EE4,0x9EE7,0x9EEC,
-	0x9EED,0x9EEE,0x9EF0,0x9EF1,0x9EF2,0x9EF5,
-	/* Range 0x6D21 - 0x6D63, array index: 0x1852 */
-	0x9EF8,0x9EFF,0x9F02,0x9F03,0x9F09,0x9F0F,0x9F10,0x9F11,
-	0x9F12,0x9F14,0x9F16,0x9F17,0x9F19,0x9F1A,0x9F1B,0x9F1F,
-	0x9F22,0x9F26,0x9F2A,0x9F2B,0x9F2F,0x9F31,0x9F32,0x9F34,
-	0x9F37,0x9F39,0x9F3A,0x9F3C,0x9F3D,0x9F3F,0x9F41,0x9F43,
-	0x9F44,0x9F45,0x9F46,0x9F47,0x9F53,0x9F55,0x9F56,0x9F57,
-	0x9F58,0x9F5A,0x9F5D,0x9F5E,0x9F68,0x9F69,0x9F6D,0x9F6E,
-	0x9F6F,0x9F70,0x9F71,0x9F73,0x9F75,0x9F7A,0x9F7D,0x9F8F,
-	0x9F90,0x9F91,0x9F92,0x9F94,0x9F96,0x9F97,0x9F9E,0x9FA1,
-	0x9FA2,0x9FA3,0x9FA5,
-	/* Unranged codes (73 codes) */
-	/* Array index: 0x1895 */ 0x2921,0x00C6,
-	/* Array index: 0x1895 */ 0x2922,0x0110,
-	/* Array index: 0x1895 */ 0x2924,0x0126,
-	/* Array index: 0x1895 */ 0x2926,0x0132,
-};
-
-#endif /* ICONV_TO_UCS_CCS_JIS_X0212_1990 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> jis_x0212_1990 speed-optimized table (45568 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_speed_jis_x0212_1990[] =
-{
-	/* Heading Block */
-	0x0100,0x0200,0x0300,0x0400,0x0500,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,0x0600,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,0x0700,0x0800,
-	0x0900,0x0A00,0x0B00,0x0C00,0x0D00,0x0E00,0x0F00,0x1000,
-	0x1100,0x1200,0x1300,0x1400,0x1500,0x1600,0x1700,0x1800,
-	0x1900,0x1A00,0x1B00,0x1C00,0x1D00,0x1E00,0x1F00,0x2000,
-	0x2100,0x2200,0x2300,0x2400,0x2500,0x2600,0x2700,0x2800,
-	0x2900,0x2A00,0x2B00,0x2C00,0x2D00,0x2E00,0x2F00,0x3000,
-	0x3100,0x3200,0x3300,0x3400,0x3500,0x3600,0x3700,0x3800,
-	0x3900,0x3A00,0x3B00,0x3C00,0x3D00,0x3E00,0x3F00,0x4000,
-	0x4100,0x4200,0x4300,0x4400,0x4500,0x4600,0x4700,0x4800,
-	0x4900,0x4A00,0x4B00,0x4C00,0x4D00,0x4E00,0x4F00,0x5000,
-	0x5100,0x5200,0x5300,0x5400,0x5500,0x5600,0x5700,0x5800,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	/* Block 1, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2237,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2242,INVALC,INVALC,0x2270,INVALC,0x2243,INVALC,
-	INVALC,0x226D,0x226C,INVALC,INVALC,INVALC,0x226E,0x2234,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2231,INVALC,0x226B,INVALC,INVALC,INVALC,INVALC,0x2244,
-	0x2A22,0x2A21,0x2A24,0x2A2A,0x2A23,0x2A29,0x2921,0x2A2E,
-	0x2A32,0x2A31,0x2A34,0x2A33,0x2A40,0x2A3F,0x2A42,0x2A41,
-	INVALC,0x2A50,0x2A52,0x2A51,0x2A54,0x2A58,0x2A53,INVALC,
-	0x292C,0x2A63,0x2A62,0x2A65,0x2A64,0x2A72,0x2930,0x294E,
-	0x2B22,0x2B21,0x2B24,0x2B2A,0x2B23,0x2B29,0x2941,0x2B2E,
-	0x2B32,0x2B31,0x2B34,0x2B33,0x2B40,0x2B3F,0x2B42,0x2B41,
-	0x2943,0x2B50,0x2B52,0x2B51,0x2B54,0x2B58,0x2B53,INVALC,
-	0x294C,0x2B63,0x2B62,0x2B65,0x2B64,0x2B72,0x2950,0x2B73,
-	/* Block 2, Array index 0x0200 */
-	0x2A27,0x2B27,0x2A25,0x2B25,0x2A28,0x2B28,0x2A2B,0x2B2B,
-	0x2A2C,0x2B2C,0x2A2F,0x2B2F,0x2A2D,0x2B2D,0x2A30,0x2B30,
-	0x2922,0x2942,0x2A37,0x2B37,INVALC,INVALC,0x2A36,0x2B36,
-	0x2A38,0x2B38,0x2A35,0x2B35,0x2A3A,0x2B3A,0x2A3B,0x2B3B,
-	0x2A3D,0x2B3D,0x2A3C,INVALC,0x2A3E,0x2B3E,0x2924,0x2944,
-	0x2A47,0x2B47,0x2A45,0x2B45,INVALC,INVALC,0x2A46,0x2B46,
-	0x2A44,0x2945,0x2926,0x2946,0x2A48,0x2B48,0x2A49,0x2B49,
-	0x2947,0x2A4A,0x2B4A,0x2A4C,0x2B4C,0x2A4B,0x2B4B,0x2929,
-	0x2949,0x2928,0x2948,0x2A4D,0x2B4D,0x2A4F,0x2B4F,0x2A4E,
-	0x2B4E,0x294A,0x292B,0x294B,0x2A57,0x2B57,INVALC,INVALC,
-	0x2A56,0x2B56,0x292D,0x294D,0x2A59,0x2B59,0x2A5B,0x2B5B,
-	0x2A5A,0x2B5A,0x2A5C,0x2B5C,0x2A5D,0x2B5D,0x2A5F,0x2B5F,
-	0x2A5E,0x2B5E,0x2A61,0x2B61,0x2A60,0x2B60,0x292F,0x294F,
-	0x2A6C,0x2B6C,0x2A69,0x2B69,0x2A66,0x2B66,0x2A6B,0x2B6B,
-	0x2A68,0x2B68,0x2A6A,0x2B6A,0x2A71,0x2B71,0x2A74,0x2B74,
-	0x2A73,0x2A75,0x2B75,0x2A77,0x2B77,0x2A76,0x2B76,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2A26,0x2B26,0x2A43,
-	0x2B43,0x2A55,0x2B55,0x2A67,0x2B67,0x2A70,0x2B70,0x2A6D,
-	0x2B6D,0x2A6F,0x2B6F,0x2A6E,0x2B6E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2B39,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 3, Array index 0x0300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2230,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x222F,0x2232,0x2236,0x2235,INVALC,0x2233,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 4, Array index 0x0400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2238,0x2239,0x2661,INVALC,
-	0x2662,0x2663,0x2664,INVALC,0x2667,INVALC,0x2669,0x266C,
-	0x2676,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2665,0x266A,0x2671,0x2672,0x2673,0x2674,
-	0x267B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2678,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2675,0x267A,0x2677,0x2679,0x267C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 5, Array index 0x0500 */
-	INVALC,INVALC,0x2742,0x2743,0x2744,0x2745,0x2746,0x2747,
-	0x2748,0x2749,0x274A,0x274B,0x274C,INVALC,0x274D,0x274E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2772,0x2773,0x2774,0x2775,0x2776,0x2777,
-	0x2778,0x2779,0x277A,0x277B,0x277C,INVALC,0x277D,0x277E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 34, Array index 0x0600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2271,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x226F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 79, Array index 0x0700 */
-	INVALC,INVALC,0x3021,INVALC,0x3022,0x3023,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3024,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3025,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3026,
-	INVALC,INVALC,INVALC,0x3027,0x3028,INVALC,INVALC,INVALC,
-	0x3029,INVALC,INVALC,0x302A,INVALC,INVALC,0x302B,0x302C,
-	0x302D,INVALC,INVALC,INVALC,INVALC,0x302E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x302F,0x3030,INVALC,INVALC,0x3031,INVALC,INVALC,0x3032,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3033,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3034,INVALC,0x3035,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3036,INVALC,INVALC,INVALC,INVALC,
-	0x3037,0x3038,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3039,0x303A,INVALC,INVALC,
-	INVALC,0x303B,INVALC,INVALC,INVALC,INVALC,INVALC,0x303C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x303D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x303E,0x303F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3040,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3041,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3042,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3043,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3044,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3045,0x3046,INVALC,INVALC,INVALC,INVALC,
-	0x3047,0x3048,0x3049,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x304A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x304B,
-	INVALC,0x304C,INVALC,0x304D,INVALC,0x304E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x304F,0x3050,0x3051,
-	/* Block 80, Array index 0x0800 */
-	0x3052,INVALC,0x3053,0x3054,INVALC,INVALC,INVALC,INVALC,
-	0x3055,INVALC,INVALC,0x3056,0x3057,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3058,INVALC,INVALC,0x3059,0x305A,0x305B,
-	INVALC,0x305C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x305D,INVALC,
-	INVALC,0x305E,INVALC,0x3060,INVALC,0x3061,INVALC,0x3062,
-	INVALC,0x3063,INVALC,0x3064,INVALC,INVALC,0x3065,INVALC,
-	0x3066,INVALC,0x3067,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3068,0x3069,INVALC,0x306A,0x306B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x306C,INVALC,0x306D,INVALC,0x306E,INVALC,
-	0x306F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3070,
-	0x305F,INVALC,INVALC,0x3071,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3072,INVALC,0x3073,INVALC,0x3074,INVALC,
-	INVALC,0x3075,INVALC,INVALC,INVALC,INVALC,INVALC,0x3076,
-	0x3077,0x3078,0x3079,INVALC,INVALC,0x307A,0x307B,INVALC,
-	INVALC,0x307C,0x307D,INVALC,0x307E,0x3121,INVALC,INVALC,
-	INVALC,0x3122,0x3123,INVALC,0x3124,INVALC,0x3125,INVALC,
-	0x3126,INVALC,0x3127,0x3128,0x3129,INVALC,INVALC,0x312A,
-	INVALC,0x312B,0x312C,INVALC,INVALC,INVALC,0x312D,0x312E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x312F,INVALC,INVALC,INVALC,INVALC,0x3130,
-	INVALC,0x3131,INVALC,0x3132,0x3133,0x3134,0x3135,INVALC,
-	0x3136,0x3137,INVALC,INVALC,INVALC,0x3138,0x3139,INVALC,
-	0x313A,0x313B,INVALC,0x313C,0x313D,0x313E,INVALC,0x313F,
-	INVALC,INVALC,0x3140,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3141,INVALC,INVALC,INVALC,
-	0x3142,INVALC,0x3143,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3144,INVALC,0x3145,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3146,0x3147,INVALC,0x3148,
-	/* Block 81, Array index 0x0900 */
-	0x3149,0x314A,INVALC,INVALC,0x314B,INVALC,INVALC,0x314C,
-	INVALC,INVALC,0x314D,INVALC,0x314E,INVALC,0x314F,INVALC,
-	0x3150,INVALC,INVALC,0x3151,INVALC,INVALC,INVALC,0x3152,
-	0x3153,INVALC,INVALC,0x3154,0x3155,0x3156,0x3157,INVALC,
-	INVALC,INVALC,0x3158,INVALC,INVALC,INVALC,INVALC,0x3159,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x315A,INVALC,
-	0x315B,INVALC,0x315C,0x315D,INVALC,0x315E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3176,INVALC,INVALC,INVALC,INVALC,
-	0x315F,0x3160,0x3161,INVALC,INVALC,0x3162,0x3163,INVALC,
-	INVALC,INVALC,0x3164,INVALC,0x3165,INVALC,0x3166,INVALC,
-	INVALC,0x3167,0x3168,0x3169,INVALC,INVALC,INVALC,0x316A,
-	INVALC,0x316B,INVALC,INVALC,INVALC,INVALC,INVALC,0x316C,
-	0x316D,INVALC,0x316E,0x316F,INVALC,INVALC,0x3170,0x3171,
-	INVALC,INVALC,0x3172,INVALC,INVALC,0x3173,INVALC,INVALC,
-	0x3174,0x3175,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3177,INVALC,0x3178,0x3179,INVALC,0x317A,INVALC,
-	INVALC,INVALC,0x317B,INVALC,INVALC,INVALC,0x317C,0x317D,
-	0x317E,INVALC,0x3221,0x3222,0x3223,INVALC,0x3224,INVALC,
-	INVALC,INVALC,INVALC,0x3225,0x3226,INVALC,0x3227,0x3228,
-	0x3229,0x322A,0x322B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x322C,INVALC,INVALC,INVALC,INVALC,0x322D,
-	0x322E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x322F,0x3230,INVALC,INVALC,0x3231,INVALC,INVALC,
-	0x3232,INVALC,INVALC,0x3233,0x3234,INVALC,INVALC,0x3235,
-	INVALC,INVALC,INVALC,INVALC,0x3236,INVALC,0x3237,INVALC,
-	0x3238,INVALC,INVALC,0x3239,0x323A,INVALC,INVALC,INVALC,
-	0x323B,INVALC,INVALC,INVALC,0x323C,0x323D,INVALC,0x323E,
-	INVALC,INVALC,0x323F,INVALC,0x3240,INVALC,0x3241,INVALC,
-	0x3242,0x3243,INVALC,INVALC,INVALC,INVALC,INVALC,0x3244,
-	INVALC,0x3245,0x3251,INVALC,INVALC,INVALC,0x3246,INVALC,
-	INVALC,INVALC,0x3247,INVALC,INVALC,INVALC,0x3248,INVALC,
-	/* Block 82, Array index 0x0A00 */
-	INVALC,INVALC,INVALC,0x3249,INVALC,INVALC,0x324A,0x324B,
-	0x324C,INVALC,INVALC,0x324D,0x324E,0x324F,0x3250,INVALC,
-	0x3252,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3253,
-	INVALC,0x3254,INVALC,0x3255,0x3256,0x3257,0x3258,INVALC,
-	INVALC,INVALC,INVALC,0x3259,INVALC,INVALC,INVALC,0x325A,
-	0x325B,INVALC,INVALC,INVALC,0x325C,0x325D,INVALC,0x325E,
-	INVALC,0x325F,INVALC,0x3260,0x3261,0x3262,INVALC,INVALC,
-	0x3263,0x3264,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3265,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3266,INVALC,INVALC,INVALC,INVALC,0x3267,
-	INVALC,INVALC,INVALC,0x3268,INVALC,0x3269,INVALC,0x326A,
-	0x326B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x326C,
-	INVALC,INVALC,INVALC,INVALC,0x326D,INVALC,0x326E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x326F,INVALC,
-	INVALC,INVALC,INVALC,0x3270,0x3271,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3272,INVALC,INVALC,0x3273,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3274,INVALC,INVALC,INVALC,INVALC,0x3275,INVALC,INVALC,
-	INVALC,0x3276,INVALC,0x3277,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3278,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3279,INVALC,0x327A,INVALC,0x327B,INVALC,0x327C,0x327D,
-	INVALC,INVALC,0x327E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3321,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3322,
-	INVALC,0x3323,0x3324,0x3325,INVALC,0x3326,INVALC,INVALC,
-	0x3327,INVALC,INVALC,INVALC,INVALC,INVALC,0x3328,INVALC,
-	INVALC,INVALC,0x3329,INVALC,INVALC,0x332A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x332B,INVALC,
-	INVALC,INVALC,0x332C,0x332D,0x332E,INVALC,INVALC,0x332F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 83, Array index 0x0B00 */
-	INVALC,0x3330,0x3331,INVALC,INVALC,0x3332,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3333,0x3334,INVALC,0x3335,0x3336,INVALC,
-	0x3337,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3338,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3339,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x333A,0x333B,INVALC,INVALC,0x333C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x333D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x333E,INVALC,INVALC,
-	INVALC,0x333F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3340,INVALC,0x3341,
-	0x3342,INVALC,0x3343,INVALC,0x3344,INVALC,INVALC,0x3345,
-	0x3346,0x3347,INVALC,INVALC,INVALC,INVALC,0x3348,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3349,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x334A,
-	0x334B,0x334C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x334D,INVALC,0x334E,INVALC,INVALC,0x334F,INVALC,INVALC,
-	INVALC,INVALC,0x3350,INVALC,0x3351,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3352,INVALC,0x3353,0x3354,0x3355,
-	0x3356,INVALC,0x3357,INVALC,0x3358,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3359,0x335A,0x335B,0x335C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x335D,
-	0x335E,INVALC,INVALC,INVALC,INVALC,INVALC,0x335F,0x3360,
-	0x3361,INVALC,0x3362,0x3363,INVALC,0x3364,INVALC,INVALC,
-	0x3365,INVALC,INVALC,INVALC,0x3366,INVALC,0x3367,INVALC,
-	0x3368,INVALC,INVALC,INVALC,0x3369,INVALC,INVALC,0x336A,
-	INVALC,0x336B,INVALC,INVALC,0x336C,INVALC,0x336D,INVALC,
-	INVALC,INVALC,INVALC,0x336E,0x336F,INVALC,INVALC,INVALC,
-	INVALC,0x3370,INVALC,INVALC,INVALC,0x3371,INVALC,INVALC,
-	0x3372,0x3373,0x3374,INVALC,0x3375,INVALC,INVALC,INVALC,
-	0x3376,0x3377,INVALC,INVALC,0x3378,INVALC,0x3379,0x337A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 84, Array index 0x0C00 */
-	0x337B,INVALC,INVALC,0x337C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x337D,0x337E,0x3421,INVALC,INVALC,INVALC,
-	INVALC,0x3422,INVALC,0x3423,INVALC,INVALC,INVALC,INVALC,
-	0x3424,INVALC,INVALC,0x3425,0x3426,INVALC,0x3427,0x3428,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3429,INVALC,0x342A,
-	0x342B,0x342C,INVALC,0x342D,0x342E,0x342F,INVALC,INVALC,
-	0x3430,INVALC,0x3431,INVALC,INVALC,0x3432,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3433,0x3434,0x3435,INVALC,
-	INVALC,INVALC,0x3436,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3438,0x3437,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3439,INVALC,0x343A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x343B,INVALC,0x343C,INVALC,0x343D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x343E,0x343F,INVALC,INVALC,
-	INVALC,INVALC,0x3440,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3441,INVALC,INVALC,INVALC,INVALC,0x3442,INVALC,
-	INVALC,INVALC,INVALC,0x3443,INVALC,INVALC,INVALC,0x3444,
-	0x3445,INVALC,INVALC,INVALC,INVALC,INVALC,0x3446,INVALC,
-	INVALC,INVALC,INVALC,0x3447,0x3448,INVALC,INVALC,INVALC,
-	INVALC,0x3449,INVALC,INVALC,INVALC,0x344A,INVALC,INVALC,
-	INVALC,0x344B,INVALC,INVALC,0x344C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x344D,0x344E,INVALC,INVALC,INVALC,0x344F,
-	INVALC,INVALC,0x3450,INVALC,0x3451,0x3452,INVALC,0x3453,
-	0x3454,INVALC,0x3455,INVALC,INVALC,0x3456,INVALC,INVALC,
-	0x3457,INVALC,INVALC,INVALC,INVALC,0x3458,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3459,
-	INVALC,INVALC,0x345A,0x345B,INVALC,0x345C,INVALC,INVALC,
-	INVALC,INVALC,0x345D,INVALC,INVALC,0x345E,0x345F,INVALC,
-	0x3460,INVALC,INVALC,INVALC,INVALC,INVALC,0x3461,0x3462,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3463,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 85, Array index 0x0D00 */
-	INVALC,INVALC,0x3464,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3465,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3466,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3467,INVALC,INVALC,INVALC,INVALC,INVALC,0x3468,
-	0x3469,INVALC,0x346A,INVALC,INVALC,INVALC,INVALC,0x346B,
-	INVALC,0x346C,INVALC,INVALC,0x346D,0x346E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x346F,0x3470,INVALC,INVALC,0x3471,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3472,INVALC,0x3473,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3474,INVALC,
-	INVALC,INVALC,0x3475,INVALC,0x3476,INVALC,0x3477,0x3478,
-	INVALC,0x3479,INVALC,0x347A,INVALC,0x347B,0x347C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x347D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x347E,
-	INVALC,0x3521,INVALC,0x3522,INVALC,0x3523,INVALC,INVALC,
-	0x3524,0x3525,INVALC,INVALC,INVALC,0x3526,INVALC,INVALC,
-	INVALC,0x3527,INVALC,INVALC,INVALC,0x3528,0x3529,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x352A,INVALC,INVALC,0x352B,
-	INVALC,0x352C,INVALC,INVALC,INVALC,INVALC,0x352D,0x352E,
-	INVALC,0x352F,0x3530,INVALC,INVALC,0x3531,0x3532,INVALC,
-	INVALC,0x3533,INVALC,INVALC,INVALC,INVALC,INVALC,0x3534,
-	INVALC,0x3535,0x3536,0x3537,INVALC,INVALC,INVALC,0x3538,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3539,INVALC,
-	INVALC,INVALC,0x353A,INVALC,INVALC,0x353B,0x353C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x353D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x353E,INVALC,0x353F,INVALC,INVALC,0x3540,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3541,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3542,INVALC,0x3543,0x3544,
-	/* Block 86, Array index 0x0E00 */
-	0x3545,0x3546,INVALC,INVALC,INVALC,0x3547,INVALC,INVALC,
-	0x3548,0x3549,INVALC,INVALC,0x354A,0x354B,0x354C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x354D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x354E,0x354F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3550,INVALC,INVALC,0x3551,0x3552,INVALC,
-	INVALC,INVALC,INVALC,0x3553,0x3554,0x3555,INVALC,INVALC,
-	INVALC,0x3556,INVALC,INVALC,INVALC,INVALC,INVALC,0x3557,
-	INVALC,0x3558,0x3559,INVALC,INVALC,0x355A,INVALC,INVALC,
-	0x355B,0x355C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x355D,INVALC,0x355E,0x355F,INVALC,INVALC,0x3560,INVALC,
-	0x3561,0x3562,INVALC,INVALC,0x3563,INVALC,0x3564,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3565,
-	INVALC,0x3566,0x3567,INVALC,INVALC,INVALC,0x3568,INVALC,
-	0x3569,INVALC,INVALC,INVALC,INVALC,INVALC,0x356A,0x356B,
-	INVALC,0x356C,0x356D,0x356E,0x356F,INVALC,INVALC,0x3570,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3571,0x3572,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3573,INVALC,INVALC,
-	INVALC,INVALC,0x3574,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3575,
-	INVALC,0x3576,INVALC,0x3577,INVALC,INVALC,0x3578,INVALC,
-	INVALC,0x3579,INVALC,0x357A,0x357B,INVALC,0x357C,INVALC,
-	INVALC,0x357D,0x357E,0x3621,INVALC,INVALC,INVALC,0x3622,
-	0x3623,INVALC,INVALC,0x3624,INVALC,INVALC,0x3625,INVALC,
-	INVALC,INVALC,0x3626,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3627,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3628,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3629,
-	/* Block 87, Array index 0x0F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x362A,INVALC,INVALC,
-	0x362B,INVALC,0x362C,INVALC,INVALC,0x362D,0x362E,0x362F,
-	0x3630,0x3631,0x3632,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3633,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3634,INVALC,INVALC,INVALC,
-	0x3635,INVALC,INVALC,0x3636,INVALC,0x3637,INVALC,0x3638,
-	INVALC,0x3639,INVALC,0x363A,0x363B,0x363C,INVALC,0x363D,
-	0x363E,0x363F,INVALC,0x3640,0x3641,INVALC,0x3642,INVALC,
-	INVALC,0x3643,INVALC,0x3644,INVALC,0x3645,INVALC,0x3646,
-	INVALC,INVALC,INVALC,INVALC,0x3647,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3648,INVALC,
-	0x3649,0x364A,0x364B,0x364C,INVALC,INVALC,0x364D,INVALC,
-	INVALC,0x364E,INVALC,INVALC,INVALC,0x364F,INVALC,0x3650,
-	INVALC,0x3651,0x3652,INVALC,INVALC,0x3653,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3654,0x3655,INVALC,INVALC,
-	0x3656,INVALC,INVALC,0x3657,0x3658,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3659,INVALC,INVALC,
-	INVALC,0x365A,0x365B,INVALC,INVALC,0x365C,0x365D,0x365E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x365F,0x3660,
-	0x3661,0x3662,INVALC,0x3663,0x3664,0x3665,INVALC,INVALC,
-	INVALC,0x3666,INVALC,0x3667,INVALC,INVALC,INVALC,0x3668,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3669,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x366A,INVALC,INVALC,
-	INVALC,0x366B,0x366C,0x366D,0x3670,0x3671,INVALC,0x366E,
-	0x366F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3672,INVALC,INVALC,0x3673,0x3674,INVALC,0x3675,
-	INVALC,0x3676,INVALC,INVALC,0x3677,0x3678,0x3679,0x367A,
-	0x367B,INVALC,INVALC,0x367D,INVALC,0x367E,INVALC,INVALC,
-	INVALC,0x367C,INVALC,INVALC,INVALC,INVALC,0x3721,0x3722,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 88, Array index 0x1000 */
-	INVALC,0x3723,0x3724,INVALC,INVALC,INVALC,INVALC,0x3725,
-	INVALC,INVALC,0x3726,INVALC,0x3727,INVALC,INVALC,INVALC,
-	INVALC,0x3728,INVALC,INVALC,INVALC,0x3729,INVALC,INVALC,
-	INVALC,INVALC,0x372A,0x372B,INVALC,0x372C,INVALC,INVALC,
-	0x372D,INVALC,0x372E,0x372F,0x3730,0x3731,INVALC,INVALC,
-	INVALC,0x3732,0x3733,INVALC,0x3734,INVALC,0x3735,0x3736,
-	INVALC,INVALC,INVALC,0x3737,0x3738,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3739,0x373A,0x373B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x373C,0x373D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x373E,0x373F,INVALC,INVALC,
-	INVALC,INVALC,0x3740,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3741,INVALC,INVALC,0x3742,INVALC,0x3743,
-	0x3744,INVALC,INVALC,0x3745,INVALC,0x3746,0x3747,0x3748,
-	0x3749,0x374A,INVALC,0x374B,0x374C,0x374D,INVALC,0x374E,
-	INVALC,0x374F,0x3750,0x3751,0x3752,INVALC,0x3753,INVALC,
-	INVALC,0x3754,INVALC,0x3755,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3756,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3757,0x3760,INVALC,0x3758,
-	INVALC,0x3759,0x375A,INVALC,0x375B,0x375C,0x375D,0x375E,
-	INVALC,0x375F,INVALC,INVALC,INVALC,INVALC,INVALC,0x3761,
-	0x3762,0x3763,INVALC,INVALC,0x3764,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3765,INVALC,INVALC,INVALC,INVALC,0x3766,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3767,
-	0x3768,INVALC,INVALC,INVALC,0x3769,INVALC,INVALC,0x376A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x376B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x376C,0x376D,INVALC,
-	INVALC,0x377E,INVALC,INVALC,0x376E,INVALC,0x376F,0x3770,
-	INVALC,0x3771,INVALC,INVALC,INVALC,0x3772,INVALC,INVALC,
-	0x3773,INVALC,INVALC,INVALC,INVALC,0x3774,0x3775,INVALC,
-	0x3776,INVALC,INVALC,INVALC,INVALC,0x3777,0x3778,0x3779,
-	/* Block 89, Array index 0x1100 */
-	INVALC,INVALC,INVALC,0x377A,0x377B,INVALC,INVALC,INVALC,
-	0x377C,0x377D,INVALC,INVALC,0x3821,0x3822,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3823,INVALC,INVALC,0x3824,0x3825,
-	0x3826,INVALC,INVALC,INVALC,INVALC,INVALC,0x3827,0x3828,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3829,INVALC,INVALC,
-	INVALC,INVALC,0x382A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x382B,INVALC,INVALC,INVALC,INVALC,INVALC,0x382C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x382D,INVALC,INVALC,0x382E,0x382F,INVALC,0x3830,
-	0x3831,INVALC,INVALC,INVALC,INVALC,0x3832,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3833,
-	INVALC,0x3834,INVALC,INVALC,0x3835,INVALC,INVALC,0x3836,
-	0x3837,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3838,INVALC,INVALC,INVALC,0x3839,INVALC,INVALC,0x383A,
-	0x383B,0x383C,INVALC,INVALC,INVALC,INVALC,INVALC,0x383D,
-	0x383E,0x383F,0x3840,INVALC,0x3841,0x3842,INVALC,0x3843,
-	0x3844,INVALC,INVALC,INVALC,0x3845,INVALC,0x3846,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3847,INVALC,INVALC,
-	0x3848,0x3849,0x384A,INVALC,INVALC,INVALC,0x384B,INVALC,
-	INVALC,0x384C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x384D,0x384E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3850,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3851,INVALC,0x384F,INVALC,INVALC,INVALC,
-	0x3852,INVALC,INVALC,INVALC,INVALC,0x3853,0x3854,INVALC,
-	0x3855,INVALC,0x3856,INVALC,0x3857,INVALC,0x3858,INVALC,
-	INVALC,INVALC,0x3859,INVALC,INVALC,0x385A,INVALC,INVALC,
-	INVALC,0x385B,0x385C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x385D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x385E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 90, Array index 0x1200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x385F,0x3860,INVALC,
-	INVALC,INVALC,INVALC,0x3861,0x3862,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3863,0x3864,0x3865,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3867,INVALC,INVALC,
-	INVALC,0x3868,INVALC,0x3869,0x386A,INVALC,INVALC,INVALC,
-	0x386B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x386C,
-	0x386D,INVALC,INVALC,0x386E,INVALC,0x386F,0x3870,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3871,
-	INVALC,INVALC,INVALC,0x3872,INVALC,INVALC,0x3873,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3874,0x3875,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3876,INVALC,0x3877,INVALC,0x3878,0x3879,0x387A,
-	INVALC,0x387B,INVALC,0x387C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x387D,INVALC,0x387E,INVALC,0x3921,
-	INVALC,INVALC,0x3922,INVALC,INVALC,0x3923,0x3924,INVALC,
-	INVALC,0x3925,INVALC,0x3926,0x3927,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3928,0x3929,INVALC,0x392A,INVALC,
-	INVALC,INVALC,0x392B,INVALC,INVALC,0x392C,INVALC,0x392D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x392E,
-	INVALC,INVALC,INVALC,INVALC,0x392F,INVALC,INVALC,0x3930,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3931,0x3932,0x3933,
-	0x3934,INVALC,INVALC,0x3935,INVALC,INVALC,INVALC,0x3936,
-	INVALC,INVALC,0x3937,INVALC,0x3938,INVALC,INVALC,INVALC,
-	INVALC,0x3939,INVALC,0x393A,0x393B,INVALC,INVALC,INVALC,
-	0x393C,INVALC,0x393D,INVALC,INVALC,0x393E,INVALC,INVALC,
-	INVALC,INVALC,0x393F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3940,0x3941,0x3942,
-	INVALC,INVALC,INVALC,0x3943,0x3944,INVALC,INVALC,0x3945,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3946,0x3947,
-	INVALC,0x3948,0x3949,INVALC,0x394A,INVALC,INVALC,0x394B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 91, Array index 0x1300 */
-	0x394C,INVALC,INVALC,INVALC,0x394D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x394E,0x394F,0x3950,INVALC,
-	INVALC,INVALC,0x3951,0x3952,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3953,INVALC,
-	INVALC,INVALC,INVALC,0x3954,0x3955,INVALC,INVALC,0x3956,
-	0x3957,INVALC,0x3958,INVALC,INVALC,0x3959,INVALC,INVALC,
-	0x395A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x395B,0x395C,INVALC,0x395D,
-	0x395E,INVALC,INVALC,INVALC,0x395F,INVALC,INVALC,INVALC,
-	0x3960,INVALC,INVALC,INVALC,INVALC,0x3961,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3962,INVALC,
-	INVALC,INVALC,INVALC,0x3963,INVALC,0x3964,INVALC,0x3965,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3966,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3967,
-	INVALC,INVALC,0x3968,0x3969,INVALC,INVALC,0x396A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x396B,INVALC,INVALC,INVALC,INVALC,
-	0x396C,INVALC,INVALC,0x396D,INVALC,INVALC,0x396E,INVALC,
-	INVALC,0x396F,INVALC,INVALC,0x3970,INVALC,0x3971,0x3972,
-	0x3973,INVALC,0x3974,INVALC,INVALC,INVALC,INVALC,0x3975,
-	INVALC,INVALC,INVALC,INVALC,0x3976,INVALC,INVALC,INVALC,
-	INVALC,0x3977,0x3978,0x3979,INVALC,0x397A,INVALC,INVALC,
-	0x397B,INVALC,0x397C,0x397D,INVALC,INVALC,INVALC,0x397E,
-	INVALC,INVALC,INVALC,INVALC,0x3A21,INVALC,0x3A22,INVALC,
-	0x3A23,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A24,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3A25,INVALC,0x3A26,INVALC,INVALC,INVALC,
-	0x3A27,INVALC,INVALC,INVALC,INVALC,0x3A28,INVALC,INVALC,
-	INVALC,INVALC,0x3A29,INVALC,INVALC,INVALC,0x3A2A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3A2B,0x3A2C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3A2D,INVALC,INVALC,
-	/* Block 92, Array index 0x1400 */
-	0x3A2E,0x3A2F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A30,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A31,
-	INVALC,0x3A33,INVALC,0x3A34,INVALC,0x3A35,INVALC,INVALC,
-	INVALC,0x3A36,INVALC,INVALC,INVALC,0x3A37,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3A38,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A32,INVALC,INVALC,INVALC,
-	0x3A39,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3A3A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3A3B,0x3A3C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3A3D,INVALC,INVALC,INVALC,0x3A3E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A3F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A40,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A41,0x3A42,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A43,0x3A44,0x3A45,0x3A46,
-	INVALC,0x3A47,INVALC,INVALC,0x3A48,INVALC,0x3A49,INVALC,
-	INVALC,INVALC,0x3A4A,INVALC,INVALC,INVALC,0x3A4B,INVALC,
-	0x3A4C,0x3A4D,INVALC,0x3A4E,0x3A4F,INVALC,0x3A50,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A51,0x3A52,INVALC,INVALC,0x3A53,0x3A54,INVALC,0x3A55,
-	INVALC,0x3A56,0x3A57,INVALC,INVALC,INVALC,INVALC,0x3A58,
-	INVALC,INVALC,0x3A59,INVALC,0x3A5A,INVALC,INVALC,INVALC,
-	0x3A5B,0x3A5C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3A5D,INVALC,0x3A5E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A5F,0x3A60,
-	0x3A61,0x3A62,0x3A63,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A64,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A65,
-	INVALC,0x3A66,INVALC,INVALC,0x3A67,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3A68,INVALC,INVALC,
-	/* Block 93, Array index 0x1500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A69,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A6A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3A6B,0x3A6C,
-	INVALC,INVALC,INVALC,0x3A6D,INVALC,INVALC,0x3A6E,INVALC,
-	INVALC,0x3A6F,INVALC,0x3A70,0x3A71,INVALC,0x3A72,INVALC,
-	0x3A73,INVALC,0x3A74,INVALC,INVALC,0x3A75,0x3A76,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3A77,0x3A78,INVALC,0x3A79,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3A7A,0x3A7B,INVALC,INVALC,INVALC,0x3A7C,
-	0x3A7D,0x3A7E,INVALC,INVALC,INVALC,0x3B21,INVALC,INVALC,
-	0x3B22,INVALC,INVALC,INVALC,0x3B23,0x3B24,INVALC,INVALC,
-	INVALC,INVALC,0x3B25,0x3B26,0x3B27,0x3B28,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3B29,
-	0x3B2A,INVALC,0x3B2B,INVALC,INVALC,INVALC,INVALC,0x3B2C,
-	INVALC,INVALC,0x3B2D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3B2E,INVALC,0x3B2F,
-	0x3B30,INVALC,0x3B31,0x3B32,INVALC,INVALC,0x3B33,INVALC,
-	INVALC,INVALC,0x3B34,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3B35,INVALC,0x3B36,0x3B37,INVALC,INVALC,
-	INVALC,INVALC,0x3B38,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3B39,INVALC,0x3B3A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3B3B,INVALC,INVALC,INVALC,INVALC,0x3B3D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3B3C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3B3E,INVALC,
-	INVALC,0x3B3F,0x3B40,INVALC,0x3B41,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 94, Array index 0x1600 */
-	INVALC,0x3B42,INVALC,INVALC,INVALC,INVALC,0x3B43,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3B44,INVALC,INVALC,
-	INVALC,INVALC,0x3B45,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3B47,0x3B48,INVALC,0x3B49,0x3B4A,
-	INVALC,INVALC,INVALC,0x3B46,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3B4B,INVALC,INVALC,0x3B4C,INVALC,INVALC,INVALC,
-	INVALC,0x3B4D,INVALC,INVALC,INVALC,0x3B4E,INVALC,0x3B4F,
-	INVALC,INVALC,0x3B50,0x3B51,INVALC,INVALC,0x3B52,INVALC,
-	0x3B53,INVALC,0x3B57,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3B55,INVALC,INVALC,INVALC,0x3B54,INVALC,INVALC,
-	INVALC,0x3B56,INVALC,INVALC,INVALC,INVALC,INVALC,0x3B58,
-	0x3B59,0x3B5A,0x3B5B,INVALC,0x3B5C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3B5D,INVALC,INVALC,0x3B5E,INVALC,INVALC,
-	0x3B5F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3B60,0x3B61,INVALC,INVALC,INVALC,0x3B62,0x3B63,
-	INVALC,0x3B64,INVALC,0x3B65,INVALC,INVALC,INVALC,INVALC,
-	0x3B66,INVALC,0x3B67,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3B68,0x3B69,0x3B6A,0x3B6B,INVALC,INVALC,
-	INVALC,0x3B6C,INVALC,0x3B6D,INVALC,INVALC,INVALC,0x3B6E,
-	0x3B6F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3B70,
-	INVALC,INVALC,INVALC,0x3B71,INVALC,INVALC,INVALC,INVALC,
-	0x3B72,INVALC,0x6674,INVALC,0x3B73,INVALC,INVALC,INVALC,
-	0x3B74,0x3B75,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3B76,INVALC,INVALC,INVALC,0x3B77,
-	INVALC,INVALC,INVALC,0x3B78,INVALC,INVALC,0x3B7A,INVALC,
-	0x3B79,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B7B,0x3B7C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B7D,INVALC,INVALC,INVALC,0x3B7E,INVALC,INVALC,INVALC,
-	INVALC,0x3C21,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C22,0x3C23,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 95, Array index 0x1700 */
-	0x3C24,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C25,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3C26,INVALC,INVALC,
-	INVALC,INVALC,0x3C27,INVALC,0x3C28,0x3C29,INVALC,INVALC,
-	0x3C2A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C2B,
-	0x3C2C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C2E,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C2D,INVALC,
-	INVALC,INVALC,0x3C2F,INVALC,INVALC,0x3C30,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C31,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3C34,INVALC,0x3C32,INVALC,INVALC,INVALC,INVALC,
-	0x3C33,0x3C35,INVALC,INVALC,INVALC,INVALC,0x3C36,INVALC,
-	0x3C37,INVALC,INVALC,0x3C38,0x3C39,INVALC,0x3C3A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C3B,INVALC,0x3C3C,0x3C3D,0x3C3E,0x3C3F,0x3C40,INVALC,
-	0x3C41,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C42,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3C43,INVALC,INVALC,0x3C44,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3C45,INVALC,0x3C46,0x3C47,INVALC,INVALC,
-	0x3C48,INVALC,0x3C49,INVALC,0x3C4A,INVALC,INVALC,INVALC,
-	INVALC,0x3C4B,INVALC,0x3C4C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3C4D,0x3C4E,0x3C4F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C50,INVALC,
-	INVALC,INVALC,INVALC,0x3C52,0x3C51,INVALC,0x3C53,INVALC,
-	INVALC,0x3C54,0x3C55,INVALC,0x3C56,0x3C57,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C58,INVALC,0x3C59,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3C5A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3C5B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 96, Array index 0x1800 */
-	INVALC,INVALC,0x3C5C,INVALC,INVALC,INVALC,0x3C5D,0x3C5E,
-	0x3C5F,INVALC,INVALC,INVALC,INVALC,INVALC,0x3C60,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3C61,INVALC,INVALC,0x3C62,0x3C63,INVALC,INVALC,
-	INVALC,0x3C64,0x3C65,0x3C66,0x3C67,INVALC,INVALC,INVALC,
-	0x3C68,INVALC,INVALC,0x3C69,0x3C6A,INVALC,0x3C6B,INVALC,
-	0x3C6C,INVALC,INVALC,INVALC,0x3C6D,INVALC,0x3C6E,INVALC,
-	INVALC,INVALC,INVALC,0x3C6F,INVALC,0x3C70,INVALC,0x3C71,
-	0x3C72,INVALC,INVALC,INVALC,0x3C73,0x3C74,INVALC,0x3C75,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3C76,INVALC,INVALC,
-	0x3C77,INVALC,INVALC,INVALC,0x3C78,INVALC,INVALC,INVALC,
-	0x3C79,INVALC,INVALC,0x3C7A,INVALC,INVALC,INVALC,INVALC,
-	0x3C7B,INVALC,INVALC,0x3C7C,0x3C7D,INVALC,INVALC,0x3C7E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D21,
-	INVALC,INVALC,0x3D22,INVALC,0x3D23,0x3D24,INVALC,INVALC,
-	0x3D25,INVALC,0x3D26,INVALC,INVALC,0x3D27,0x3D28,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3D29,INVALC,INVALC,INVALC,0x3D2A,INVALC,0x3D2B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D2C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D2D,0x3D2E,INVALC,INVALC,
-	INVALC,INVALC,0x3D2F,INVALC,0x3D32,INVALC,INVALC,0x3D30,
-	INVALC,INVALC,INVALC,0x3D31,0x3D33,INVALC,INVALC,0x3D34,
-	0x3D35,0x3D36,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D37,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D38,INVALC,INVALC,0x3D39,
-	0x3D3A,0x3D3B,INVALC,0x3D3C,INVALC,INVALC,INVALC,INVALC,
-	0x3D3D,0x3D3E,0x3D3F,0x3D40,0x3D41,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D42,INVALC,
-	INVALC,0x3D43,0x3D44,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D45,0x3D46,0x3D47,INVALC,0x3D48,0x3D49,0x3D4A,0x3D4B,
-	INVALC,INVALC,0x3D4C,0x3D4D,INVALC,INVALC,0x3D4E,INVALC,
-	INVALC,INVALC,0x3D4F,INVALC,0x3D50,INVALC,INVALC,INVALC,
-	/* Block 97, Array index 0x1900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D51,
-	INVALC,INVALC,0x3D52,INVALC,INVALC,0x3D53,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3D54,0x3D55,INVALC,INVALC,0x3D56,
-	0x3D57,INVALC,0x3D58,INVALC,INVALC,INVALC,INVALC,0x3D59,
-	INVALC,INVALC,INVALC,INVALC,0x3D5A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3D5B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3D5C,INVALC,0x3D5D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D5E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D5F,
-	0x3D60,0x3D61,INVALC,INVALC,0x3D62,INVALC,INVALC,INVALC,
-	INVALC,0x3D63,INVALC,INVALC,0x3D64,INVALC,0x3D65,0x3D66,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3D67,INVALC,INVALC,
-	INVALC,0x3D68,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D69,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3D6A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D6B,0x3D6C,
-	INVALC,INVALC,0x3D6D,INVALC,INVALC,INVALC,0x3D6E,INVALC,
-	0x3D6F,INVALC,0x3D70,INVALC,INVALC,INVALC,0x3D71,INVALC,
-	INVALC,0x3D72,INVALC,0x3D73,INVALC,0x3D74,INVALC,INVALC,
-	0x3D75,INVALC,INVALC,INVALC,INVALC,0x3D76,0x3D77,INVALC,
-	INVALC,INVALC,0x3D78,INVALC,0x3D79,0x3D7A,INVALC,INVALC,
-	0x3D7B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D7C,0x3D7D,INVALC,INVALC,INVALC,INVALC,INVALC,0x3D7E,
-	INVALC,INVALC,INVALC,0x3E21,INVALC,INVALC,0x3E22,INVALC,
-	INVALC,INVALC,0x3E23,INVALC,0x3E24,INVALC,INVALC,INVALC,
-	0x3E25,0x3E26,0x3E27,0x3E28,INVALC,INVALC,0x3E29,0x3E2A,
-	INVALC,INVALC,INVALC,INVALC,0x3E2B,0x3E2C,INVALC,INVALC,
-	INVALC,0x3E2D,INVALC,0x3E2E,INVALC,0x3E2F,0x3E30,INVALC,
-	INVALC,INVALC,0x3E31,INVALC,INVALC,0x3E32,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3E33,INVALC,INVALC,0x3E34,INVALC,INVALC,
-	0x3E35,INVALC,INVALC,INVALC,0x3E36,0x3E37,INVALC,INVALC,
-	/* Block 98, Array index 0x1A00 */
-	INVALC,INVALC,0x3E38,INVALC,INVALC,INVALC,INVALC,0x3E39,
-	INVALC,INVALC,0x3E3A,INVALC,0x3E3B,INVALC,INVALC,INVALC,
-	0x3E3C,0x3E3D,0x3E3E,0x3E3F,0x3E40,INVALC,0x3E41,0x3E42,
-	INVALC,0x3E43,INVALC,INVALC,0x3E44,INVALC,0x3E45,INVALC,
-	INVALC,INVALC,0x3E46,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3E47,0x3E48,INVALC,INVALC,INVALC,INVALC,
-	0x3E49,0x3E4A,INVALC,INVALC,INVALC,0x3E4B,0x3E4C,0x3E4D,
-	INVALC,0x3E4E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3E4F,INVALC,INVALC,INVALC,0x3E50,0x3E51,INVALC,
-	INVALC,0x3E52,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3E53,INVALC,
-	0x3E54,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E55,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3E56,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E57,INVALC,INVALC,0x3E58,0x3E59,INVALC,INVALC,0x3E5A,
-	0x3E5B,0x3E5C,INVALC,0x3E5D,0x3E5E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3E5F,INVALC,0x3E60,INVALC,INVALC,
-	INVALC,INVALC,0x3E61,0x3E62,INVALC,INVALC,INVALC,0x3E63,
-	0x3E64,INVALC,INVALC,INVALC,0x3E65,0x3E66,INVALC,0x3E67,
-	0x3E68,INVALC,INVALC,INVALC,INVALC,0x3E69,INVALC,INVALC,
-	0x3E6A,INVALC,0x3E6B,INVALC,INVALC,0x3E6C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E6D,0x3E6E,INVALC,INVALC,0x3E6F,INVALC,INVALC,INVALC,
-	0x3E70,0x3E71,0x3E72,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3E73,0x3E74,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3E75,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E76,0x3E77,0x3E78,0x3E79,
-	INVALC,0x3E7A,0x3E7B,INVALC,INVALC,0x3E7E,INVALC,0x3E7C,
-	INVALC,0x3E7D,INVALC,INVALC,0x3F21,0x3F22,INVALC,0x3F23,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 99, Array index 0x1B00 */
-	INVALC,0x3F24,INVALC,0x3F25,0x3F26,INVALC,INVALC,0x3F27,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3F28,INVALC,0x3F29,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F2A,INVALC,INVALC,INVALC,
-	0x3F2B,INVALC,0x3F2C,0x3F2D,INVALC,INVALC,INVALC,0x3F2E,
-	INVALC,0x3F2F,INVALC,0x3F30,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3F31,INVALC,INVALC,INVALC,0x3F32,INVALC,INVALC,
-	INVALC,INVALC,0x3F33,0x3F34,0x3F35,INVALC,0x3F36,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F37,INVALC,INVALC,INVALC,
-	0x3F38,0x3F39,0x3F3A,INVALC,0x3F3B,INVALC,0x3F3C,INVALC,
-	INVALC,INVALC,0x3F3D,INVALC,0x3F3E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F3F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3F40,INVALC,0x3F41,
-	INVALC,INVALC,INVALC,0x3F42,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3F43,INVALC,INVALC,0x3F44,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3F45,0x3F46,0x3F47,
-	0x3F48,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3F49,INVALC,
-	0x3F4A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3F4B,INVALC,INVALC,0x3F4C,0x3F4D,
-	INVALC,INVALC,0x3F4E,INVALC,INVALC,INVALC,0x3F4F,0x3F50,
-	INVALC,INVALC,INVALC,INVALC,0x3F51,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x3F52,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3F53,0x3F54,INVALC,
-	INVALC,INVALC,0x3F55,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3F56,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3F57,INVALC,0x3F58,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F59,0x3F5A,INVALC,INVALC,
-	/* Block 100, Array index 0x1C00 */
-	INVALC,INVALC,INVALC,0x3F5B,0x3F5C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x3F5D,0x3F5E,INVALC,0x3F5F,INVALC,INVALC,
-	0x3F60,INVALC,INVALC,0x3F61,INVALC,INVALC,0x3F62,INVALC,
-	0x3F63,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3F64,0x3F65,INVALC,INVALC,0x3F66,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3F67,0x3F68,INVALC,
-	INVALC,0x3F69,INVALC,INVALC,0x3F6A,INVALC,INVALC,INVALC,
-	INVALC,0x3F6B,0x3F6C,0x3F6D,0x3F6E,INVALC,0x3F6F,INVALC,
-	INVALC,INVALC,0x3F70,0x3F71,INVALC,INVALC,0x3F72,INVALC,
-	INVALC,INVALC,0x3F73,0x3F74,0x3F75,INVALC,INVALC,INVALC,
-	0x3F76,INVALC,INVALC,0x3F77,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3F78,0x3F79,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F7A,0x3F7B,INVALC,INVALC,
-	INVALC,0x3F7C,INVALC,INVALC,0x3F7D,0x3F7E,INVALC,INVALC,
-	0x4021,INVALC,INVALC,INVALC,0x4022,0x4023,INVALC,0x4024,
-	INVALC,INVALC,0x4025,INVALC,0x4026,INVALC,INVALC,0x4027,
-	INVALC,INVALC,0x4028,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4029,INVALC,INVALC,INVALC,0x402A,0x402B,INVALC,INVALC,
-	INVALC,0x402C,0x402D,INVALC,INVALC,INVALC,0x402E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x402F,INVALC,0x4030,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4031,0x4032,0x4033,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4034,INVALC,INVALC,
-	INVALC,0x4035,INVALC,INVALC,INVALC,0x4036,INVALC,INVALC,
-	0x4037,INVALC,INVALC,INVALC,INVALC,INVALC,0x4038,INVALC,
-	INVALC,0x4039,INVALC,0x403A,0x403B,0x403C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x403D,INVALC,INVALC,INVALC,
-	0x403E,INVALC,INVALC,INVALC,INVALC,0x403F,INVALC,INVALC,
-	INVALC,INVALC,0x4040,INVALC,0x4041,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4042,0x4043,INVALC,0x4044,INVALC,INVALC,
-	0x4045,0x4046,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 101, Array index 0x1D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4047,0x4048,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4049,INVALC,0x404A,INVALC,0x404B,INVALC,INVALC,INVALC,
-	0x404C,INVALC,INVALC,INVALC,INVALC,INVALC,0x404D,INVALC,
-	0x404E,INVALC,0x404F,INVALC,0x4050,0x4051,INVALC,INVALC,
-	INVALC,0x4052,0x4053,INVALC,INVALC,INVALC,INVALC,0x4054,
-	0x4055,INVALC,INVALC,INVALC,INVALC,0x4056,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4057,INVALC,0x4058,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4059,INVALC,INVALC,INVALC,0x405A,
-	INVALC,0x405B,0x405C,0x405D,0x405E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x405F,0x4060,0x4061,0x4062,INVALC,0x4063,
-	0x4064,0x4065,INVALC,0x4066,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4067,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4068,0x4069,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x406A,INVALC,0x406B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x406C,INVALC,0x406D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x406E,
-	0x406F,0x4070,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4071,0x4072,INVALC,0x4073,INVALC,0x4074,INVALC,0x4075,
-	INVALC,0x4076,INVALC,0x4077,INVALC,INVALC,0x4078,INVALC,
-	0x4079,INVALC,INVALC,INVALC,0x407A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x407B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x407C,0x407D,0x407E,
-	INVALC,INVALC,INVALC,INVALC,0x4121,INVALC,INVALC,INVALC,
-	INVALC,0x4122,0x4123,0x4124,0x4125,INVALC,0x4126,INVALC,
-	0x4127,0x4128,INVALC,INVALC,INVALC,0x4129,INVALC,0x412A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x412B,0x412C,INVALC,INVALC,
-	INVALC,0x412D,0x412E,INVALC,INVALC,0x412F,INVALC,INVALC,
-	0x4130,INVALC,INVALC,INVALC,INVALC,0x4131,INVALC,0x4132,
-	INVALC,INVALC,INVALC,0x4133,INVALC,INVALC,INVALC,0x4134,
-	/* Block 102, Array index 0x1E00 */
-	INVALC,0x4135,INVALC,INVALC,0x4136,INVALC,INVALC,INVALC,
-	0x4137,0x4138,0x4139,INVALC,INVALC,INVALC,INVALC,0x413A,
-	INVALC,INVALC,INVALC,0x413B,0x413C,INVALC,0x413D,INVALC,
-	INVALC,0x413E,INVALC,0x413F,INVALC,INVALC,0x4140,0x4141,
-	INVALC,INVALC,0x4142,INVALC,INVALC,INVALC,0x4143,INVALC,
-	INVALC,0x4144,INVALC,INVALC,INVALC,INVALC,0x4145,INVALC,
-	INVALC,0x4146,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4147,INVALC,0x4148,0x4149,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x414A,INVALC,INVALC,INVALC,0x414B,
-	INVALC,0x414C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x414D,INVALC,0x414E,INVALC,0x414F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4150,
-	0x4151,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4152,
-	INVALC,INVALC,INVALC,0x4153,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4154,INVALC,INVALC,0x4155,INVALC,INVALC,
-	INVALC,0x4156,INVALC,INVALC,INVALC,0x4157,INVALC,INVALC,
-	INVALC,INVALC,0x4158,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4159,INVALC,INVALC,0x415A,INVALC,INVALC,
-	0x415B,INVALC,INVALC,INVALC,INVALC,0x415C,INVALC,INVALC,
-	0x415D,INVALC,INVALC,0x415E,INVALC,INVALC,0x415F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4160,INVALC,
-	INVALC,INVALC,0x4161,0x4162,0x4163,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4164,
-	INVALC,INVALC,0x4165,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4166,0x4167,INVALC,INVALC,INVALC,INVALC,0x4168,INVALC,
-	0x4169,INVALC,INVALC,INVALC,0x416A,INVALC,0x416B,INVALC,
-	0x416C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x416D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x416E,INVALC,0x416F,INVALC,0x4170,0x4171,INVALC,INVALC,
-	INVALC,0x4172,INVALC,INVALC,INVALC,INVALC,0x4173,0x4174,
-	/* Block 103, Array index 0x1F00 */
-	0x4175,INVALC,INVALC,INVALC,0x4176,INVALC,INVALC,INVALC,
-	0x4177,0x4178,INVALC,INVALC,INVALC,0x4179,INVALC,INVALC,
-	INVALC,0x417A,0x417B,INVALC,INVALC,0x417C,0x417D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x417E,0x4221,INVALC,
-	INVALC,0x4222,0x4223,0x4224,0x4225,INVALC,0x4226,INVALC,
-	INVALC,0x4227,0x4228,0x4229,0x422A,INVALC,0x422B,INVALC,
-	0x422C,0x422D,INVALC,0x422E,INVALC,INVALC,INVALC,0x4230,
-	INVALC,0x422F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4231,INVALC,INVALC,INVALC,INVALC,0x4232,0x4233,INVALC,
-	INVALC,INVALC,0x4234,INVALC,0x4235,INVALC,0x4237,INVALC,
-	INVALC,0x4236,INVALC,INVALC,INVALC,INVALC,INVALC,0x4238,
-	0x4239,0x423A,INVALC,0x423B,0x423C,INVALC,INVALC,INVALC,
-	0x423D,0x423E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4240,0x4241,0x4242,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4244,INVALC,0x4245,INVALC,0x4247,
-	0x4248,0x4249,INVALC,0x424A,0x424C,INVALC,0x4243,0x4246,
-	0x424B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x424D,0x424E,0x424F,INVALC,INVALC,
-	0x4250,INVALC,0x4251,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4252,0x4253,0x4254,0x4255,INVALC,INVALC,0x4256,
-	0x4257,INVALC,INVALC,INVALC,0x4258,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4259,INVALC,INVALC,
-	INVALC,0x425A,0x425B,INVALC,INVALC,0x425C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x425D,INVALC,INVALC,INVALC,0x425E,
-	0x425F,INVALC,0x4260,0x4261,INVALC,INVALC,INVALC,INVALC,
-	0x4262,INVALC,INVALC,INVALC,0x4263,INVALC,0x4264,0x4265,
-	INVALC,INVALC,INVALC,INVALC,0x4266,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4267,INVALC,INVALC,INVALC,0x4268,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4269,INVALC,INVALC,0x426A,0x426B,INVALC,0x426C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x426D,0x423F,INVALC,INVALC,INVALC,INVALC,
-	/* Block 104, Array index 0x2000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x426E,INVALC,0x426F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4270,INVALC,
-	INVALC,INVALC,INVALC,0x4271,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4272,INVALC,INVALC,0x4273,INVALC,INVALC,INVALC,
-	0x4274,INVALC,0x4275,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4276,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4277,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4278,INVALC,0x4279,
-	0x427A,INVALC,INVALC,INVALC,0x427B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x427C,0x427D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x427E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4321,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4322,INVALC,0x4323,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4324,INVALC,0x4325,INVALC,
-	INVALC,INVALC,INVALC,0x4326,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4327,INVALC,INVALC,0x4328,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4329,0x432A,
-	INVALC,0x432B,INVALC,0x432C,INVALC,INVALC,0x432D,INVALC,
-	0x432E,0x432F,INVALC,0x4330,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4331,0x4332,0x4333,INVALC,INVALC,0x4334,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4335,0x4336,0x4337,INVALC,INVALC,
-	0x4339,INVALC,0x433A,0x433B,INVALC,0x433C,INVALC,INVALC,
-	0x433D,0x433E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x433F,INVALC,INVALC,INVALC,INVALC,0x4340,
-	INVALC,0x4341,INVALC,INVALC,0x4342,INVALC,INVALC,INVALC,
-	INVALC,0x4343,INVALC,INVALC,INVALC,INVALC,0x4344,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4345,INVALC,0x4346,INVALC,INVALC,INVALC,0x4347,0x4348,
-	INVALC,0x4338,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 105, Array index 0x2100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x434A,INVALC,INVALC,INVALC,
-	INVALC,0x434B,INVALC,INVALC,INVALC,0x434C,INVALC,0x434D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x434F,
-	0x434E,INVALC,INVALC,INVALC,0x4350,0x4351,INVALC,0x4352,
-	0x4353,0x4354,INVALC,0x4355,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4356,INVALC,INVALC,INVALC,0x4357,
-	INVALC,INVALC,INVALC,INVALC,0x4358,0x4359,INVALC,INVALC,
-	INVALC,INVALC,0x435A,INVALC,0x435B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4349,INVALC,INVALC,0x435C,INVALC,0x435D,
-	0x435E,INVALC,INVALC,0x435F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4360,INVALC,INVALC,0x4361,0x4362,
-	0x4363,0x4364,0x4365,INVALC,INVALC,0x4366,INVALC,INVALC,
-	INVALC,0x4367,0x4368,0x4369,0x436A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x436B,INVALC,0x436C,INVALC,0x436D,INVALC,
-	0x436E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x436F,INVALC,
-	0x4370,INVALC,0x4371,INVALC,0x4372,INVALC,INVALC,INVALC,
-	INVALC,0x4373,INVALC,0x4374,INVALC,0x4375,INVALC,INVALC,
-	INVALC,0x4376,0x4377,INVALC,INVALC,INVALC,0x4378,INVALC,
-	INVALC,INVALC,0x4379,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x437A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x437B,INVALC,INVALC,
-	0x437C,INVALC,INVALC,INVALC,0x437D,INVALC,INVALC,0x437E,
-	0x4421,0x4422,INVALC,0x4423,INVALC,INVALC,0x4424,INVALC,
-	INVALC,0x4425,INVALC,INVALC,0x4426,0x4427,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4428,INVALC,INVALC,
-	0x4429,INVALC,0x442A,0x442B,0x442C,0x442D,INVALC,INVALC,
-	0x442E,0x442F,INVALC,INVALC,INVALC,0x4430,0x4431,INVALC,
-	INVALC,INVALC,INVALC,0x4432,0x4433,0x4434,INVALC,INVALC,
-	/* Block 106, Array index 0x2200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4435,INVALC,
-	INVALC,0x4436,0x4437,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4438,0x4439,INVALC,0x443A,INVALC,INVALC,0x443B,0x443C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x443D,INVALC,0x443E,INVALC,0x443F,INVALC,INVALC,
-	0x4440,INVALC,INVALC,0x4441,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4442,INVALC,INVALC,0x4443,INVALC,INVALC,
-	INVALC,0x4444,INVALC,INVALC,INVALC,INVALC,0x4445,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4446,
-	INVALC,INVALC,INVALC,0x4447,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4448,0x4449,0x444A,0x444B,INVALC,
-	0x444C,0x444D,INVALC,INVALC,0x444E,INVALC,INVALC,INVALC,
-	0x444F,0x4450,0x4451,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4452,0x4453,INVALC,INVALC,INVALC,0x4454,
-	0x4455,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4456,INVALC,INVALC,
-	INVALC,INVALC,0x4457,INVALC,INVALC,INVALC,0x4458,INVALC,
-	0x4459,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x445A,INVALC,INVALC,INVALC,0x445B,0x445C,INVALC,
-	0x445D,INVALC,INVALC,0x445E,INVALC,0x445F,INVALC,0x4460,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4461,
-	0x4462,INVALC,0x4463,INVALC,0x4464,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4465,INVALC,INVALC,
-	0x4466,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4467,INVALC,INVALC,INVALC,INVALC,0x4468,0x4469,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x446A,INVALC,INVALC,0x446B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x446C,0x446D,
-	INVALC,0x446E,INVALC,0x446F,INVALC,0x4470,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4471,INVALC,
-	/* Block 107, Array index 0x2300 */
-	0x4472,0x4473,INVALC,0x4474,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4475,
-	INVALC,0x4476,INVALC,INVALC,INVALC,0x4477,INVALC,INVALC,
-	INVALC,INVALC,0x4478,INVALC,INVALC,0x4479,INVALC,INVALC,
-	0x447A,INVALC,INVALC,INVALC,0x447B,INVALC,INVALC,INVALC,
-	0x447C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x447D,INVALC,0x447E,INVALC,0x4521,INVALC,INVALC,0x4522,
-	INVALC,INVALC,INVALC,0x4523,INVALC,INVALC,0x4524,0x4525,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4526,0x4527,INVALC,
-	INVALC,0x4528,0x4529,INVALC,INVALC,INVALC,0x452A,INVALC,
-	0x452B,0x452C,0x452D,INVALC,INVALC,0x452E,0x452F,INVALC,
-	INVALC,INVALC,INVALC,0x4530,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4531,INVALC,INVALC,0x4532,
-	INVALC,INVALC,0x4533,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4534,INVALC,0x4535,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4536,INVALC,
-	INVALC,0x4537,INVALC,0x4538,INVALC,INVALC,0x4539,0x453A,
-	INVALC,0x453B,INVALC,0x453C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x453D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x453E,INVALC,0x453F,0x4540,0x4541,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4542,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4543,INVALC,INVALC,INVALC,0x4544,
-	0x4545,0x4546,INVALC,INVALC,0x4547,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4548,0x4549,0x454A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x454B,INVALC,
-	0x454D,0x454C,INVALC,INVALC,0x454E,INVALC,INVALC,INVALC,
-	0x454F,INVALC,INVALC,INVALC,0x4550,0x4551,0x4552,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4553,0x4554,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4555,INVALC,INVALC,0x4556,
-	INVALC,INVALC,INVALC,INVALC,0x4557,INVALC,INVALC,INVALC,
-	0x4558,0x4559,0x455A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x455B,0x455C,INVALC,INVALC,
-	/* Block 108, Array index 0x2400 */
-	INVALC,INVALC,0x455D,0x455E,INVALC,INVALC,0x455F,0x4560,
-	INVALC,0x4561,INVALC,INVALC,INVALC,INVALC,INVALC,0x4562,
-	0x4563,0x4564,INVALC,INVALC,INVALC,INVALC,INVALC,0x4565,
-	INVALC,INVALC,INVALC,0x4566,INVALC,INVALC,0x4567,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4568,INVALC,INVALC,INVALC,
-	0x4569,INVALC,INVALC,0x456A,0x456B,INVALC,INVALC,0x456C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x456D,0x456E,INVALC,
-	INVALC,INVALC,INVALC,0x456F,INVALC,INVALC,INVALC,0x4570,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4571,INVALC,
-	INVALC,INVALC,0x4572,INVALC,INVALC,0x4573,INVALC,INVALC,
-	INVALC,INVALC,0x4574,INVALC,INVALC,INVALC,0x4575,INVALC,
-	0x4576,INVALC,INVALC,INVALC,INVALC,0x4577,INVALC,INVALC,
-	0x4578,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4579,
-	INVALC,INVALC,INVALC,0x457A,INVALC,INVALC,0x457B,INVALC,
-	0x457C,INVALC,INVALC,INVALC,INVALC,0x457D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x457E,0x4621,INVALC,
-	INVALC,INVALC,0x4622,INVALC,INVALC,0x4623,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4624,
-	INVALC,INVALC,INVALC,0x4625,INVALC,INVALC,INVALC,0x4626,
-	0x4627,INVALC,0x4628,0x4629,INVALC,INVALC,INVALC,INVALC,
-	0x462A,0x462B,INVALC,INVALC,0x462C,0x462D,0x462E,INVALC,
-	0x462F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4630,0x4631,INVALC,INVALC,INVALC,0x4632,0x4633,INVALC,
-	INVALC,INVALC,INVALC,0x4634,0x4635,INVALC,INVALC,INVALC,
-	INVALC,0x4636,INVALC,INVALC,0x4637,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4638,INVALC,
-	INVALC,INVALC,0x4639,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x463A,INVALC,0x463B,INVALC,INVALC,0x463C,0x463D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x463E,INVALC,
-	INVALC,0x463F,INVALC,INVALC,INVALC,INVALC,INVALC,0x4640,
-	INVALC,0x4641,INVALC,INVALC,INVALC,INVALC,INVALC,0x4642,
-	/* Block 109, Array index 0x2500 */
-	INVALC,INVALC,0x4643,INVALC,0x4644,0x4645,INVALC,INVALC,
-	INVALC,0x4646,INVALC,INVALC,INVALC,0x4647,0x4648,INVALC,
-	0x4649,INVALC,0x464A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x464B,INVALC,INVALC,INVALC,INVALC,INVALC,0x464C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x464D,0x464E,
-	0x464F,INVALC,INVALC,INVALC,0x4650,INVALC,0x4651,INVALC,
-	INVALC,INVALC,INVALC,0x4652,INVALC,0x4653,0x4654,INVALC,
-	INVALC,INVALC,0x4655,0x4656,INVALC,INVALC,INVALC,0x4657,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4658,0x4659,INVALC,0x465A,INVALC,0x465B,
-	INVALC,INVALC,0x465C,INVALC,0x465D,INVALC,INVALC,INVALC,
-	INVALC,0x465E,INVALC,0x465F,0x4660,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4736,
-	INVALC,INVALC,INVALC,0x4661,INVALC,0x4662,INVALC,0x4663,
-	INVALC,INVALC,INVALC,INVALC,0x4664,INVALC,0x4665,INVALC,
-	0x4666,0x4667,INVALC,0x4668,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4669,0x466A,0x466B,
-	INVALC,0x466C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x466D,0x466E,INVALC,0x466F,
-	0x4670,INVALC,INVALC,INVALC,0x4671,INVALC,INVALC,0x4672,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4673,INVALC,0x4674,INVALC,0x4675,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4676,INVALC,INVALC,INVALC,0x4677,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4678,INVALC,0x4679,
-	0x467A,0x467B,0x467C,INVALC,0x467D,INVALC,0x467E,INVALC,
-	INVALC,INVALC,0x4721,INVALC,0x4722,INVALC,INVALC,INVALC,
-	0x4723,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4724,
-	INVALC,0x4725,INVALC,0x4726,0x4727,INVALC,0x4728,INVALC,
-	INVALC,INVALC,0x4729,INVALC,0x472A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 110, Array index 0x2600 */
-	INVALC,INVALC,INVALC,INVALC,0x472B,INVALC,INVALC,0x472C,
-	INVALC,INVALC,0x472D,INVALC,INVALC,INVALC,0x472E,0x472F,
-	INVALC,0x4730,INVALC,0x4731,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4732,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4733,0x4734,
-	0x4735,INVALC,INVALC,INVALC,INVALC,INVALC,0x4737,0x4738,
-	INVALC,0x4739,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x473A,INVALC,INVALC,0x473B,INVALC,INVALC,0x473C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x473D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x473E,0x473F,
-	INVALC,0x4740,INVALC,INVALC,INVALC,0x4741,INVALC,0x4742,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4743,
-	0x4744,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4745,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4746,INVALC,INVALC,INVALC,INVALC,0x4747,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4748,0x4749,INVALC,0x474A,INVALC,0x474B,0x474C,
-	0x474D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x474E,INVALC,0x474F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4750,INVALC,INVALC,0x4751,
-	INVALC,0x4752,INVALC,INVALC,INVALC,0x4753,INVALC,0x4754,
-	INVALC,INVALC,INVALC,INVALC,0x4755,INVALC,INVALC,INVALC,
-	0x4756,INVALC,0x4757,INVALC,INVALC,INVALC,0x4758,0x4759,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x475A,INVALC,
-	INVALC,INVALC,INVALC,0x475B,INVALC,0x475C,INVALC,0x475D,
-	0x475E,INVALC,0x475F,INVALC,INVALC,0x4760,INVALC,INVALC,
-	INVALC,0x4761,INVALC,INVALC,INVALC,INVALC,INVALC,0x4762,
-	0x4763,INVALC,INVALC,INVALC,0x4764,INVALC,0x4765,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4766,INVALC,INVALC,INVALC,
-	/* Block 111, Array index 0x2700 */
-	0x4767,INVALC,INVALC,INVALC,0x4768,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4769,INVALC,
-	INVALC,INVALC,0x476A,INVALC,INVALC,INVALC,INVALC,0x476B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x476C,INVALC,INVALC,INVALC,0x476D,INVALC,
-	INVALC,0x476E,INVALC,0x476F,0x4770,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4771,0x4772,INVALC,INVALC,
-	0x4773,0x4774,INVALC,0x4775,INVALC,INVALC,INVALC,0x4776,
-	INVALC,0x4777,0x4778,0x4779,0x477A,INVALC,INVALC,0x477B,
-	INVALC,INVALC,INVALC,INVALC,0x477C,0x477D,0x477E,INVALC,
-	INVALC,INVALC,0x4821,0x4822,INVALC,INVALC,INVALC,INVALC,
-	0x4823,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4824,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4825,INVALC,0x4826,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4827,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4828,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4829,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x482A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x482B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x482C,0x482D,INVALC,
-	INVALC,0x482E,INVALC,0x482F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4830,INVALC,INVALC,INVALC,0x4831,
-	0x4832,0x4833,INVALC,0x4834,INVALC,INVALC,INVALC,0x4835,
-	0x4836,INVALC,0x4837,INVALC,INVALC,0x4838,0x4839,0x483A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x483B,INVALC,0x483C,0x483D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x483E,INVALC,0x483F,INVALC,0x4840,INVALC,INVALC,
-	/* Block 112, Array index 0x2800 */
-	INVALC,INVALC,INVALC,INVALC,0x4841,INVALC,INVALC,INVALC,
-	0x4842,INVALC,0x4843,INVALC,0x4844,0x4845,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4846,INVALC,
-	0x4847,INVALC,0x4848,0x4849,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x484A,INVALC,
-	INVALC,0x484B,0x484C,INVALC,INVALC,0x4853,INVALC,0x484D,
-	0x484E,INVALC,INVALC,0x484F,INVALC,INVALC,0x4850,INVALC,
-	INVALC,INVALC,INVALC,0x4851,0x4852,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4854,
-	INVALC,0x4855,0x4856,0x4857,INVALC,INVALC,INVALC,0x4858,
-	INVALC,0x4859,0x485A,INVALC,INVALC,0x485B,0x485C,INVALC,
-	INVALC,0x485D,0x485E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x485F,INVALC,INVALC,INVALC,0x4860,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4861,0x4862,INVALC,
-	INVALC,INVALC,INVALC,0x4863,INVALC,INVALC,INVALC,0x4864,
-	0x4865,INVALC,INVALC,0x4866,0x4867,0x4868,INVALC,INVALC,
-	0x4869,INVALC,0x486A,0x486B,0x486C,INVALC,0x486D,INVALC,
-	INVALC,INVALC,0x486E,INVALC,INVALC,INVALC,INVALC,0x486F,
-	0x4870,INVALC,INVALC,INVALC,INVALC,0x4871,0x4872,0x4873,
-	0x4874,INVALC,INVALC,INVALC,INVALC,INVALC,0x4875,0x4876,
-	0x4877,INVALC,INVALC,INVALC,INVALC,0x4878,0x4879,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x487A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x487B,INVALC,0x487C,
-	0x487D,INVALC,0x487E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4921,INVALC,INVALC,INVALC,0x4922,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4923,0x4924,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4925,INVALC,INVALC,INVALC,INVALC,0x4926,INVALC,INVALC,
-	INVALC,0x4927,INVALC,INVALC,0x4928,0x4929,INVALC,INVALC,
-	/* Block 113, Array index 0x2900 */
-	0x492A,INVALC,INVALC,INVALC,INVALC,0x492B,0x492C,0x492D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x492E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x492F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4930,INVALC,INVALC,0x4931,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4932,
-	INVALC,INVALC,INVALC,INVALC,0x4933,INVALC,INVALC,0x4934,
-	INVALC,0x4935,INVALC,INVALC,0x4936,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4937,0x4938,INVALC,INVALC,INVALC,
-	0x4939,0x493A,0x493B,0x493C,INVALC,INVALC,0x4941,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x493D,0x493E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x493F,0x4940,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4942,0x4943,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4944,INVALC,0x4945,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4946,0x4947,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4948,INVALC,
-	INVALC,0x4949,INVALC,INVALC,INVALC,0x494A,0x494B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x494C,0x494D,0x494E,0x494F,
-	0x4950,INVALC,INVALC,0x4951,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4952,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4953,INVALC,INVALC,INVALC,INVALC,
-	0x4954,0x4955,INVALC,INVALC,0x4956,INVALC,INVALC,0x4957,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4958,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4959,INVALC,0x495A,0x495B,0x495C,0x495D,INVALC,
-	0x495E,INVALC,INVALC,INVALC,0x495F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4960,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4961,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 114, Array index 0x2A00 */
-	INVALC,INVALC,INVALC,0x4962,0x4963,0x4964,0x4965,0x4966,
-	INVALC,INVALC,INVALC,0x4967,0x4968,INVALC,INVALC,0x4969,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x496A,INVALC,
-	0x496B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x496C,INVALC,0x496D,INVALC,0x496E,
-	0x496F,0x4970,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4971,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4972,INVALC,INVALC,INVALC,0x4973,0x4974,0x4975,
-	INVALC,INVALC,0x4976,0x4977,INVALC,INVALC,INVALC,INVALC,
-	0x4978,INVALC,0x4979,INVALC,INVALC,INVALC,INVALC,0x497A,
-	INVALC,INVALC,0x497B,INVALC,0x497C,INVALC,0x497D,INVALC,
-	0x497E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A21,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A22,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A23,INVALC,INVALC,INVALC,INVALC,0x4A24,INVALC,0x4A25,
-	INVALC,INVALC,INVALC,INVALC,0x4A26,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4A27,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4A28,0x4A29,INVALC,INVALC,INVALC,INVALC,
-	0x4A2A,INVALC,0x4A2B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A2C,
-	0x4A2D,INVALC,0x4A2E,0x4A2F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4A30,INVALC,INVALC,INVALC,INVALC,0x4A31,
-	0x4A32,0x4A33,INVALC,INVALC,0x4A34,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A35,0x4A36,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A37,INVALC,INVALC,0x4A38,INVALC,
-	INVALC,0x4A39,0x4A3A,INVALC,0x4A3B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A3C,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A3D,INVALC,
-	/* Block 115, Array index 0x2B00 */
-	0x4A3E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A3F,
-	0x4A40,0x4A41,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A42,INVALC,INVALC,INVALC,0x4A43,
-	INVALC,INVALC,0x4A44,INVALC,INVALC,0x4A45,INVALC,0x4A46,
-	INVALC,INVALC,INVALC,INVALC,0x4A47,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A48,INVALC,INVALC,INVALC,0x4A49,
-	INVALC,INVALC,INVALC,INVALC,0x4A4A,INVALC,INVALC,INVALC,
-	0x4A4B,0x4A4C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A4D,0x4A4E,0x4A4F,INVALC,0x4A50,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A51,0x4A52,
-	0x4A53,INVALC,INVALC,0x4A54,INVALC,0x4A55,0x4A56,INVALC,
-	INVALC,INVALC,0x4A57,INVALC,0x4A58,INVALC,0x4A59,INVALC,
-	0x4A5A,INVALC,INVALC,0x4A5B,INVALC,INVALC,INVALC,INVALC,
-	0x4A5C,INVALC,INVALC,0x4A5D,INVALC,INVALC,0x4A5E,0x4A5F,
-	INVALC,0x4A60,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A61,
-	0x4A62,INVALC,INVALC,0x4A63,0x4A64,INVALC,INVALC,0x4A65,
-	INVALC,INVALC,INVALC,INVALC,0x4A66,INVALC,INVALC,INVALC,
-	INVALC,0x4A67,INVALC,INVALC,INVALC,0x4A68,0x4A69,INVALC,
-	INVALC,INVALC,INVALC,0x4A6A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A6B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A6C,INVALC,INVALC,INVALC,INVALC,0x4A6D,0x4A6E,INVALC,
-	INVALC,0x4A6F,INVALC,INVALC,0x4A70,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A71,INVALC,
-	INVALC,0x4A72,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A73,
-	INVALC,0x4A74,INVALC,INVALC,0x4A75,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4A76,0x4A77,INVALC,
-	0x4A78,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A79,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4A7A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A7B,0x4A7C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4A7D,0x4A7E,INVALC,INVALC,0x4B21,INVALC,
-	/* Block 116, Array index 0x2C00 */
-	INVALC,INVALC,0x4B22,INVALC,0x4B23,0x4B24,INVALC,0x4B25,
-	INVALC,INVALC,INVALC,0x4B26,INVALC,0x4B27,INVALC,INVALC,
-	INVALC,INVALC,0x4B28,0x4B29,INVALC,INVALC,INVALC,INVALC,
-	0x4B2A,0x4B2B,INVALC,INVALC,INVALC,INVALC,0x4B2C,INVALC,
-	INVALC,INVALC,0x4B2D,INVALC,0x4B2E,INVALC,INVALC,0x4B2F,
-	0x4B30,INVALC,INVALC,INVALC,0x4B31,INVALC,INVALC,INVALC,
-	INVALC,0x4B32,0x4B33,INVALC,INVALC,0x4B34,INVALC,INVALC,
-	INVALC,INVALC,0x4B35,0x4B36,INVALC,0x4B37,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4B38,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B39,INVALC,INVALC,
-	0x4B3A,INVALC,0x4B3B,INVALC,INVALC,INVALC,0x4B3C,INVALC,
-	0x4B3D,INVALC,INVALC,INVALC,INVALC,0x4B3E,0x4B3F,0x4B40,
-	0x4B41,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B42,0x4B43,
-	INVALC,0x4B44,INVALC,0x4B45,0x4B46,INVALC,0x4B47,0x4B48,
-	INVALC,0x4B49,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B4A,
-	INVALC,0x4B4B,INVALC,INVALC,0x4B4C,INVALC,INVALC,INVALC,
-	0x4B4D,0x4B4E,INVALC,0x4B4F,INVALC,0x4B50,0x4B51,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B52,INVALC,
-	0x4B53,INVALC,INVALC,0x4B54,INVALC,0x4B55,INVALC,0x4B56,
-	0x4B57,INVALC,INVALC,INVALC,0x4B58,INVALC,0x4B59,0x4B5A,
-	0x4B5B,INVALC,0x4B5C,INVALC,INVALC,0x4B5D,0x4B5E,INVALC,
-	INVALC,INVALC,0x4B5F,0x4B60,INVALC,0x4B61,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B62,INVALC,0x4B63,
-	INVALC,0x4B64,INVALC,INVALC,0x4B65,0x4B66,INVALC,0x4B67,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B68,0x4B69,INVALC,
-	INVALC,0x4B6A,INVALC,0x4B6B,0x4B6C,INVALC,INVALC,0x4B6D,
-	INVALC,INVALC,0x4B6E,0x4B6F,INVALC,INVALC,0x4B70,INVALC,
-	INVALC,0x4B71,INVALC,INVALC,INVALC,0x4B72,INVALC,INVALC,
-	INVALC,0x4B73,INVALC,0x4B74,INVALC,INVALC,0x4B75,0x4B76,
-	INVALC,0x4B77,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4B78,0x4B79,INVALC,0x4B7A,
-	INVALC,0x4B7B,0x4B7C,0x4B7D,INVALC,0x4B7E,INVALC,0x4C21,
-	/* Block 117, Array index 0x2D00 */
-	0x4C22,0x4C23,INVALC,INVALC,0x4C24,INVALC,INVALC,0x4C25,
-	INVALC,INVALC,0x4C26,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C27,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C28,0x4C29,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4C2A,INVALC,0x4C2B,INVALC,
-	0x4C2C,0x4C2D,0x4C2E,0x4C2F,0x4C30,0x4C31,0x4C32,0x4C33,
-	0x4C34,0x4C35,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C36,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C37,INVALC,INVALC,0x4C38,0x4C39,INVALC,0x4C3A,0x4C3B,
-	INVALC,INVALC,INVALC,0x4C3C,INVALC,0x4C3D,INVALC,INVALC,
-	INVALC,0x4C3E,0x4C3F,INVALC,INVALC,INVALC,INVALC,0x4C40,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4C41,INVALC,INVALC,
-	INVALC,INVALC,0x4C42,INVALC,INVALC,INVALC,0x4C43,0x4C44,
-	0x4C45,INVALC,INVALC,0x4C46,INVALC,0x4C47,0x4C48,INVALC,
-	INVALC,0x4C49,0x4C4A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C4B,0x4C4C,INVALC,INVALC,INVALC,0x4C4D,0x4C4E,0x4C4F,
-	INVALC,0x4C50,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C51,
-	0x4C52,0x4C53,0x4C54,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C55,0x4C56,0x4C57,INVALC,0x4C58,INVALC,INVALC,0x4C59,
-	0x4C5A,0x4C5B,INVALC,0x4C5C,INVALC,INVALC,0x4C5D,INVALC,
-	0x4C5E,0x4C5F,0x4C60,0x4C61,INVALC,INVALC,0x4C62,0x4C63,
-	INVALC,0x4C64,0x4C65,INVALC,INVALC,0x4C66,INVALC,INVALC,
-	INVALC,0x4C67,INVALC,0x4C68,INVALC,INVALC,INVALC,0x4C69,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C6A,0x4C6B,INVALC,INVALC,0x4C6C,INVALC,INVALC,INVALC,
-	0x4C6D,INVALC,INVALC,0x4C6E,INVALC,INVALC,INVALC,INVALC,
-	0x4C6F,INVALC,0x4C70,0x4C71,INVALC,INVALC,0x4C72,0x4C73,
-	INVALC,INVALC,INVALC,INVALC,0x4C74,INVALC,INVALC,INVALC,
-	0x4C75,INVALC,0x4C76,0x4C77,INVALC,INVALC,INVALC,0x4C78,
-	INVALC,INVALC,INVALC,INVALC,0x4C79,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4C7A,0x4C7B,0x4C7C,INVALC,INVALC,0x4C7D,
-	/* Block 118, Array index 0x2E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C7E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D21,INVALC,INVALC,INVALC,0x4D22,0x4D23,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4D24,0x4D25,INVALC,INVALC,0x4D26,INVALC,INVALC,0x4D27,
-	INVALC,0x4D28,0x4D29,INVALC,INVALC,INVALC,INVALC,0x4D2A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D2B,INVALC,
-	INVALC,0x4D2C,INVALC,INVALC,INVALC,0x4D2D,0x4D2E,0x4D2F,
-	0x4D30,INVALC,INVALC,0x4D31,INVALC,INVALC,INVALC,0x4D32,
-	0x4D33,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D34,INVALC,
-	0x4D35,INVALC,0x4D36,INVALC,INVALC,INVALC,INVALC,0x4D37,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D38,0x4D39,
-	INVALC,0x4D3A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D3B,
-	INVALC,0x4D3C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D3D,0x4D3E,0x4D3F,0x4D40,0x4D41,0x4D42,INVALC,
-	INVALC,0x4D43,INVALC,INVALC,INVALC,0x4D44,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4D45,INVALC,0x4D46,0x4D47,INVALC,0x4D48,INVALC,INVALC,
-	INVALC,0x4D49,INVALC,INVALC,0x4D4A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D4B,INVALC,0x4D4C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4D4D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4D4E,INVALC,INVALC,INVALC,INVALC,0x4D4F,
-	0x4D50,0x4D51,INVALC,INVALC,0x4D52,INVALC,0x4D53,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4D54,INVALC,0x4D55,0x4D56,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D57,
-	INVALC,INVALC,INVALC,INVALC,0x4D58,INVALC,INVALC,0x4D59,
-	0x4D5A,0x4D5B,INVALC,INVALC,0x4D5C,INVALC,INVALC,0x4D5D,
-	INVALC,INVALC,INVALC,INVALC,0x4D5E,INVALC,0x4D5F,0x4D60,
-	INVALC,0x4D61,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D62,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 119, Array index 0x2F00 */
-	0x4D63,INVALC,0x4D64,0x4D65,0x4D66,INVALC,INVALC,0x4D67,
-	0x4D68,INVALC,0x4D69,INVALC,0x4D6A,INVALC,INVALC,0x4D6B,
-	INVALC,INVALC,0x4D6C,0x4D6D,INVALC,0x4D6E,0x4D6F,INVALC,
-	INVALC,0x4D70,INVALC,0x4D71,0x4D72,0x4D73,0x4D74,INVALC,
-	INVALC,INVALC,INVALC,0x4D75,INVALC,0x4D76,0x4D77,INVALC,
-	INVALC,0x4D78,INVALC,INVALC,INVALC,0x4D79,INVALC,INVALC,
-	INVALC,INVALC,0x4D7A,0x4D7B,INVALC,0x4D7C,INVALC,INVALC,
-	0x4D7D,0x4D7E,0x4E21,INVALC,0x4E22,INVALC,INVALC,INVALC,
-	0x4E24,0x4E25,INVALC,0x4E26,0x4E27,0x4E28,INVALC,INVALC,
-	INVALC,0x4E29,0x4E23,0x4E2A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E2B,INVALC,INVALC,
-	INVALC,0x4E2C,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E2D,
-	INVALC,INVALC,INVALC,INVALC,0x4E2E,0x4E2F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E30,0x4E31,0x4E32,
-	INVALC,0x4E33,INVALC,INVALC,0x4E34,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E35,INVALC,INVALC,INVALC,0x4E36,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4E37,0x4E38,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E39,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E3A,0x4E3B,0x4E3C,INVALC,0x4E3D,
-	0x4E3E,INVALC,0x4E3F,0x4E40,0x4E41,0x4E42,0x4E43,0x4E44,
-	0x4E45,INVALC,0x4E46,INVALC,INVALC,0x4E47,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E48,INVALC,INVALC,
-	INVALC,0x4E49,INVALC,INVALC,INVALC,0x4E4A,INVALC,INVALC,
-	INVALC,0x4E4B,INVALC,0x4E4C,0x4E4D,INVALC,0x4E4E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4E4F,INVALC,INVALC,INVALC,
-	INVALC,0x4E50,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4E51,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E52,INVALC,
-	0x4E53,INVALC,INVALC,INVALC,0x4E54,INVALC,INVALC,INVALC,
-	0x4E55,0x4E56,INVALC,INVALC,INVALC,INVALC,0x4E57,INVALC,
-	INVALC,0x4E58,INVALC,INVALC,0x4E59,INVALC,INVALC,INVALC,
-	/* Block 120, Array index 0x3000 */
-	0x4E5A,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E5B,INVALC,
-	INVALC,INVALC,0x4E5C,INVALC,INVALC,INVALC,0x4E5D,INVALC,
-	INVALC,INVALC,0x4E5E,INVALC,0x4E5F,0x4E60,INVALC,0x4E61,
-	INVALC,0x4E62,0x4E63,INVALC,0x4E64,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4E65,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4E66,INVALC,INVALC,INVALC,INVALC,0x4E67,0x4E68,0x4E69,
-	INVALC,INVALC,INVALC,INVALC,0x4E6A,0x4E6B,0x4E6C,INVALC,
-	INVALC,0x4E6D,INVALC,INVALC,INVALC,0x4E6E,0x4E6F,INVALC,
-	INVALC,INVALC,0x4E70,INVALC,INVALC,0x4E71,0x4E72,INVALC,
-	INVALC,INVALC,0x4E73,INVALC,INVALC,0x4E74,0x4E75,0x4E76,
-	INVALC,INVALC,0x4E77,INVALC,INVALC,INVALC,0x4E78,0x4E79,
-	INVALC,INVALC,INVALC,INVALC,0x4E7A,INVALC,0x4E7B,0x4E7C,
-	0x4E7D,INVALC,0x4E7E,INVALC,0x4F21,INVALC,INVALC,0x4F22,
-	INVALC,INVALC,0x4F23,INVALC,0x4F24,INVALC,INVALC,INVALC,
-	0x4F25,INVALC,0x4F26,0x4F27,0x4F28,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F29,INVALC,INVALC,0x4F2A,INVALC,INVALC,
-	0x4F2B,INVALC,INVALC,INVALC,0x4F2C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4F2D,0x4F2E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4F2F,0x4F30,0x4F31,INVALC,
-	INVALC,INVALC,0x4F32,INVALC,INVALC,INVALC,INVALC,0x4F33,
-	INVALC,INVALC,0x4F34,INVALC,INVALC,INVALC,INVALC,0x4F35,
-	INVALC,INVALC,0x4F36,INVALC,INVALC,INVALC,0x4F37,0x4F38,
-	INVALC,0x4F39,INVALC,INVALC,INVALC,0x4F3A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F3B,INVALC,
-	INVALC,INVALC,INVALC,0x4F3C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F3D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F3E,0x4F3F,INVALC,INVALC,0x4F40,INVALC,INVALC,
-	INVALC,0x4F41,INVALC,INVALC,INVALC,INVALC,0x4F42,0x4F43,
-	0x4F44,INVALC,INVALC,INVALC,0x4F45,INVALC,0x4F46,INVALC,
-	INVALC,INVALC,0x4F47,INVALC,0x4F48,INVALC,INVALC,INVALC,
-	0x4F49,0x4F4A,INVALC,INVALC,0x4F4B,INVALC,INVALC,INVALC,
-	0x4F4C,INVALC,INVALC,0x4F4D,INVALC,INVALC,INVALC,INVALC,
-	/* Block 121, Array index 0x3100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4F4E,0x4F4F,INVALC,
-	INVALC,0x4F50,INVALC,INVALC,INVALC,0x4F51,0x4F52,INVALC,
-	INVALC,0x4F53,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4F54,INVALC,INVALC,
-	INVALC,0x4F55,0x4F56,0x4F57,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4F58,0x4F59,INVALC,
-	0x4F5A,INVALC,INVALC,INVALC,INVALC,0x4F5B,INVALC,0x4F5C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4F5D,0x4F5E,INVALC,INVALC,0x4F5F,
-	0x4F60,INVALC,INVALC,INVALC,0x4F61,INVALC,0x4F62,INVALC,
-	INVALC,INVALC,0x4F63,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4F64,INVALC,0x4F65,INVALC,
-	0x4F66,0x4F67,INVALC,0x4F68,0x4F69,INVALC,INVALC,INVALC,
-	0x4F6A,INVALC,0x4F6B,INVALC,INVALC,INVALC,0x4F6C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F6D,INVALC,INVALC,INVALC,0x4F6E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F6F,INVALC,INVALC,INVALC,INVALC,0x4F70,
-	INVALC,INVALC,INVALC,INVALC,0x4F71,INVALC,INVALC,INVALC,
-	0x4F72,INVALC,INVALC,INVALC,INVALC,0x4F74,0x4F75,0x4F76,
-	INVALC,0x4F73,INVALC,INVALC,0x4F77,INVALC,INVALC,INVALC,
-	0x4F78,INVALC,INVALC,INVALC,0x4F79,0x4F7A,INVALC,INVALC,
-	0x4F7B,0x4F7C,0x4F7D,0x4F7E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5021,INVALC,0x5022,INVALC,0x5023,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5024,
-	0x5025,0x5026,INVALC,INVALC,0x5027,INVALC,0x5028,INVALC,
-	INVALC,INVALC,0x5029,0x502A,INVALC,0x502B,0x502C,INVALC,
-	INVALC,INVALC,INVALC,0x502E,INVALC,INVALC,INVALC,0x502F,
-	0x5030,0x5031,INVALC,INVALC,0x502D,INVALC,0x5032,INVALC,
-	INVALC,INVALC,0x5033,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5034,0x5035,INVALC,INVALC,0x5037,0x5038,
-	INVALC,INVALC,0x5039,0x503A,INVALC,INVALC,INVALC,0x503B,
-	/* Block 122, Array index 0x3200 */
-	0x5036,INVALC,INVALC,INVALC,INVALC,INVALC,0x503C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x503D,INVALC,INVALC,INVALC,
-	0x503E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x503F,INVALC,0x5040,INVALC,0x5041,0x5042,
-	0x5043,INVALC,INVALC,INVALC,INVALC,0x5044,INVALC,0x5045,
-	INVALC,0x5046,INVALC,INVALC,INVALC,0x5047,INVALC,INVALC,
-	INVALC,0x5048,INVALC,INVALC,0x5049,0x504A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x504B,INVALC,0x504C,INVALC,0x504D,
-	INVALC,INVALC,INVALC,INVALC,0x504E,0x504F,0x5050,INVALC,
-	INVALC,INVALC,0x5051,0x5052,INVALC,INVALC,INVALC,0x5053,
-	INVALC,0x5054,INVALC,INVALC,0x5055,INVALC,INVALC,INVALC,
-	0x5056,INVALC,INVALC,0x5057,0x5058,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5059,
-	INVALC,0x505A,INVALC,0x505B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x505C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x505D,INVALC,0x505E,0x505F,INVALC,0x5060,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5061,0x5062,INVALC,INVALC,INVALC,
-	INVALC,0x5063,INVALC,0x5064,0x5065,0x5066,0x5067,INVALC,
-	0x5068,INVALC,INVALC,0x5069,0x506A,INVALC,INVALC,INVALC,
-	INVALC,0x506B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x506C,0x506D,INVALC,0x506E,INVALC,INVALC,INVALC,0x506F,
-	INVALC,0x5070,INVALC,INVALC,0x5071,INVALC,INVALC,INVALC,
-	0x5072,INVALC,INVALC,0x5073,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5074,INVALC,0x5075,INVALC,INVALC,0x5076,
-	0x5077,INVALC,0x5078,INVALC,INVALC,INVALC,INVALC,0x5079,
-	INVALC,INVALC,INVALC,INVALC,0x507A,INVALC,0x507B,INVALC,
-	INVALC,INVALC,0x507C,INVALC,INVALC,0x507D,0x507E,INVALC,
-	0x5121,INVALC,0x5122,INVALC,INVALC,0x5123,INVALC,INVALC,
-	INVALC,INVALC,0x5124,0x5125,INVALC,0x5126,INVALC,INVALC,
-	INVALC,0x5127,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5128,INVALC,INVALC,INVALC,0x5129,INVALC,INVALC,INVALC,
-	/* Block 123, Array index 0x3300 */
-	INVALC,INVALC,0x512A,0x512B,INVALC,INVALC,INVALC,0x512C,
-	INVALC,0x512D,0x512E,INVALC,0x512F,INVALC,INVALC,INVALC,
-	INVALC,0x5130,INVALC,INVALC,INVALC,0x5131,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5132,INVALC,INVALC,0x5133,INVALC,
-	INVALC,0x5134,INVALC,INVALC,INVALC,INVALC,INVALC,0x5135,
-	INVALC,INVALC,INVALC,0x5136,INVALC,0x5137,INVALC,0x5138,
-	0x5139,INVALC,INVALC,INVALC,0x513A,0x513B,INVALC,INVALC,
-	0x513C,0x513D,0x513E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x513F,0x5140,INVALC,0x5141,
-	0x5142,INVALC,INVALC,INVALC,0x5143,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5144,0x5145,INVALC,
-	INVALC,0x5146,INVALC,INVALC,0x5147,0x5148,INVALC,0x5149,
-	0x514A,INVALC,INVALC,INVALC,INVALC,0x514B,INVALC,0x514C,
-	INVALC,INVALC,0x514D,INVALC,INVALC,0x514E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x514F,INVALC,INVALC,
-	0x5150,INVALC,INVALC,INVALC,INVALC,INVALC,0x5151,INVALC,
-	0x5152,INVALC,0x5153,INVALC,INVALC,0x5154,0x5155,INVALC,
-	INVALC,INVALC,0x5156,0x5157,INVALC,INVALC,INVALC,INVALC,
-	0x5158,0x5159,INVALC,INVALC,0x515A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x515B,INVALC,
-	0x515C,INVALC,INVALC,0x515D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x515E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x515F,INVALC,0x5160,INVALC,INVALC,
-	INVALC,0x5161,INVALC,0x5162,0x5163,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5164,INVALC,
-	INVALC,0x5165,INVALC,INVALC,0x5166,INVALC,0x5167,INVALC,
-	INVALC,0x5168,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5169,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x516A,0x516B,INVALC,0x516C,0x516D,INVALC,INVALC,INVALC,
-	INVALC,0x516E,INVALC,INVALC,0x516F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5170,INVALC,0x5171,0x5172,INVALC,
-	/* Block 124, Array index 0x3400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5173,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5174,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5175,
-	INVALC,INVALC,INVALC,0x5176,INVALC,INVALC,INVALC,0x5177,
-	INVALC,0x5178,0x5179,0x517A,INVALC,0x517B,0x517C,0x517D,
-	0x517E,0x5221,INVALC,INVALC,0x5222,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5223,INVALC,0x5224,
-	0x5225,0x5226,INVALC,INVALC,INVALC,INVALC,INVALC,0x5227,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5228,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5229,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x522A,INVALC,INVALC,INVALC,0x522B,INVALC,0x522C,INVALC,
-	INVALC,0x522D,0x522E,INVALC,INVALC,0x522F,INVALC,0x5230,
-	INVALC,INVALC,0x5231,0x5232,INVALC,INVALC,INVALC,0x5233,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5234,INVALC,INVALC,INVALC,
-	INVALC,0x5235,INVALC,INVALC,INVALC,INVALC,0x5236,INVALC,
-	0x5237,0x5238,INVALC,INVALC,INVALC,INVALC,0x5239,INVALC,
-	INVALC,INVALC,INVALC,0x523A,INVALC,INVALC,0x523B,INVALC,
-	0x523C,INVALC,INVALC,INVALC,INVALC,0x523D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x523E,INVALC,INVALC,0x523F,
-	0x5240,INVALC,0x5241,INVALC,INVALC,0x5242,0x5243,INVALC,
-	INVALC,INVALC,0x5244,0x5245,0x5246,0x5247,INVALC,INVALC,
-	INVALC,INVALC,0x5248,INVALC,INVALC,0x5249,INVALC,INVALC,
-	0x524A,INVALC,0x524B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x524C,INVALC,0x524D,0x524E,
-	INVALC,0x524F,0x5250,0x5251,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5252,INVALC,0x5253,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5254,INVALC,0x5255,0x5256,INVALC,INVALC,
-	0x5257,0x5258,0x5259,INVALC,0x525A,INVALC,0x525B,INVALC,
-	/* Block 125, Array index 0x3500 */
-	INVALC,0x525C,0x525D,0x525E,0x525F,INVALC,0x5260,INVALC,
-	INVALC,0x5261,INVALC,0x5262,0x5263,INVALC,0x5264,0x5265,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5266,INVALC,0x5267,INVALC,INVALC,INVALC,INVALC,
-	0x5268,INVALC,INVALC,INVALC,INVALC,0x5269,0x526A,INVALC,
-	0x526B,INVALC,INVALC,INVALC,0x526C,INVALC,INVALC,INVALC,
-	INVALC,0x526D,INVALC,0x526E,0x526F,INVALC,0x5270,INVALC,
-	INVALC,0x5271,0x5272,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5273,INVALC,
-	INVALC,INVALC,0x5274,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5276,0x5277,0x5278,INVALC,0x5275,INVALC,INVALC,
-	INVALC,0x5279,0x527A,0x527B,0x527C,0x527D,0x527E,INVALC,
-	INVALC,0x5321,INVALC,0x5322,INVALC,INVALC,INVALC,0x5323,
-	INVALC,0x5324,INVALC,INVALC,INVALC,0x5325,0x5326,INVALC,
-	0x5327,INVALC,0x5328,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5329,INVALC,INVALC,0x532A,0x532B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x532C,0x532D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x532E,
-	INVALC,INVALC,INVALC,INVALC,0x532F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5330,INVALC,
-	0x5331,INVALC,INVALC,INVALC,INVALC,INVALC,0x5332,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5333,INVALC,INVALC,INVALC,INVALC,INVALC,0x5334,0x5335,
-	INVALC,INVALC,0x5336,0x5337,0x5338,INVALC,INVALC,0x5339,
-	INVALC,INVALC,INVALC,INVALC,0x533A,INVALC,INVALC,0x533B,
-	0x533C,0x533D,INVALC,INVALC,INVALC,0x533E,INVALC,0x533F,
-	INVALC,INVALC,INVALC,0x5340,0x5341,0x5342,INVALC,0x5343,
-	INVALC,0x5344,0x5345,INVALC,INVALC,0x5346,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5347,INVALC,
-	INVALC,0x5348,INVALC,0x5349,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x534A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 126, Array index 0x3600 */
-	INVALC,INVALC,INVALC,0x534B,INVALC,INVALC,INVALC,0x534C,
-	0x534D,0x534E,INVALC,INVALC,INVALC,INVALC,INVALC,0x534F,
-	INVALC,0x5350,0x5351,0x5352,INVALC,INVALC,0x5353,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5354,0x5355,INVALC,
-	INVALC,INVALC,INVALC,0x5356,INVALC,INVALC,0x5357,INVALC,
-	INVALC,INVALC,0x5358,INVALC,INVALC,0x5359,INVALC,INVALC,
-	INVALC,0x535A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x535B,0x535C,0x535D,INVALC,
-	0x535E,0x535F,INVALC,INVALC,INVALC,INVALC,INVALC,0x5360,
-	0x5361,INVALC,INVALC,INVALC,INVALC,0x5362,INVALC,INVALC,
-	INVALC,0x5363,INVALC,0x5364,INVALC,INVALC,INVALC,0x5365,
-	INVALC,0x5366,0x5367,INVALC,0x5368,0x5369,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x536A,INVALC,0x536B,
-	INVALC,INVALC,0x536C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x536D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x536E,INVALC,0x536F,0x5370,INVALC,INVALC,INVALC,0x5371,
-	INVALC,0x5372,0x5373,0x5374,INVALC,0x5375,0x5376,INVALC,
-	0x5377,INVALC,INVALC,0x5378,0x5379,0x537A,INVALC,INVALC,
-	INVALC,0x537B,INVALC,INVALC,INVALC,INVALC,0x537C,0x537D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x537E,0x5421,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5422,0x5423,
-	INVALC,INVALC,0x5424,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5425,INVALC,INVALC,0x5426,0x5427,
-	INVALC,0x5428,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5429,0x542A,0x542B,0x542C,0x542D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x542E,0x542F,0x5430,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5431,
-	INVALC,0x5432,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5434,INVALC,INVALC,0x5435,0x5436,INVALC,
-	INVALC,INVALC,0x5437,0x5438,INVALC,0x5439,INVALC,INVALC,
-	INVALC,0x543A,INVALC,INVALC,INVALC,0x543B,0x543C,INVALC,
-	INVALC,0x543D,0x543E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 127, Array index 0x3700 */
-	0x5433,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x543F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5440,0x5441,INVALC,INVALC,INVALC,0x5442,INVALC,0x5443,
-	INVALC,INVALC,INVALC,INVALC,0x5444,0x5445,INVALC,INVALC,
-	0x5446,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5447,
-	0x5448,INVALC,INVALC,INVALC,0x5449,0x544A,INVALC,0x544B,
-	INVALC,INVALC,INVALC,0x544C,INVALC,INVALC,0x544D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x544E,
-	INVALC,INVALC,INVALC,INVALC,0x544F,0x5450,INVALC,0x5451,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5452,INVALC,
-	0x5453,INVALC,0x5454,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5455,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5456,
-	INVALC,0x5457,0x5458,INVALC,INVALC,0x5459,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x545A,INVALC,INVALC,0x545B,0x545C,
-	INVALC,INVALC,INVALC,0x545D,INVALC,INVALC,INVALC,INVALC,
-	0x545E,INVALC,INVALC,INVALC,INVALC,INVALC,0x545F,INVALC,
-	INVALC,0x5460,INVALC,INVALC,INVALC,INVALC,0x5461,0x5462,
-	INVALC,INVALC,0x5463,INVALC,INVALC,0x5464,INVALC,INVALC,
-	INVALC,0x5465,INVALC,INVALC,INVALC,0x5466,INVALC,INVALC,
-	0x5467,INVALC,0x5468,INVALC,INVALC,0x5469,0x546A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 128, Array index 0x3800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x546C,0x546B,0x546D,0x546E,0x546F,
-	INVALC,INVALC,INVALC,0x5470,0x5471,INVALC,INVALC,0x5472,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5473,
-	INVALC,INVALC,0x5474,0x5475,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5476,0x5477,0x5478,INVALC,INVALC,
-	INVALC,0x5479,INVALC,0x547A,0x547B,0x547C,0x547D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x547E,INVALC,INVALC,
-	INVALC,0x5521,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5522,0x5523,0x5524,
-	0x5525,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5526,INVALC,0x5527,INVALC,0x5528,
-	0x5529,0x552A,INVALC,INVALC,INVALC,INVALC,0x552B,0x552C,
-	INVALC,INVALC,INVALC,INVALC,0x552D,INVALC,INVALC,INVALC,
-	INVALC,0x552E,0x552F,INVALC,INVALC,INVALC,0x5530,INVALC,
-	INVALC,INVALC,0x5531,INVALC,INVALC,0x5532,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5533,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5534,INVALC,INVALC,0x5535,
-	0x5536,INVALC,INVALC,0x5537,INVALC,INVALC,INVALC,INVALC,
-	0x5538,INVALC,INVALC,INVALC,INVALC,INVALC,0x5539,0x553A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x553B,INVALC,INVALC,INVALC,0x553C,
-	INVALC,INVALC,INVALC,0x553D,INVALC,0x553E,INVALC,INVALC,
-	0x553F,INVALC,INVALC,INVALC,0x5540,INVALC,0x5541,0x5542,
-	INVALC,INVALC,0x5543,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5544,INVALC,INVALC,0x5545,0x5546,0x5547,
-	/* Block 129, Array index 0x3900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5548,
-	0x5549,INVALC,0x554A,INVALC,INVALC,0x554B,0x554C,0x554D,
-	INVALC,0x554E,INVALC,0x554F,0x5550,INVALC,0x5551,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5552,0x5553,0x5554,
-	0x5555,INVALC,INVALC,INVALC,0x5556,INVALC,0x5557,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5558,INVALC,0x5559,INVALC,
-	0x555A,INVALC,INVALC,INVALC,0x555B,0x555C,INVALC,0x555D,
-	INVALC,0x555E,0x555F,INVALC,0x5560,INVALC,0x5561,INVALC,
-	0x5562,INVALC,INVALC,INVALC,0x5563,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5564,INVALC,INVALC,INVALC,0x5565,INVALC,0x5566,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5567,INVALC,INVALC,
-	INVALC,0x5568,INVALC,INVALC,INVALC,0x5569,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x556A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x556B,INVALC,INVALC,INVALC,INVALC,INVALC,0x556C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x556D,INVALC,0x556E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x556F,0x5570,
-	INVALC,INVALC,INVALC,0x5571,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5572,0x5573,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5574,INVALC,INVALC,INVALC,INVALC,0x5575,INVALC,0x5576,
-	INVALC,INVALC,0x5577,INVALC,0x5578,0x5579,INVALC,0x557A,
-	0x557B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x557C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x557D,0x557E,INVALC,
-	0x5621,INVALC,0x5622,0x5623,INVALC,INVALC,0x5624,INVALC,
-	INVALC,0x5625,0x5626,INVALC,INVALC,INVALC,0x5627,INVALC,
-	/* Block 130, Array index 0x3A00 */
-	INVALC,INVALC,INVALC,0x5628,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5629,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x562A,0x562B,
-	0x562C,INVALC,INVALC,INVALC,0x562D,INVALC,0x562E,INVALC,
-	0x562F,INVALC,INVALC,INVALC,0x5630,INVALC,INVALC,0x5631,
-	INVALC,INVALC,INVALC,INVALC,0x5632,INVALC,INVALC,INVALC,
-	0x5633,INVALC,INVALC,INVALC,INVALC,0x5634,INVALC,INVALC,
-	INVALC,INVALC,0x5635,INVALC,0x5636,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5637,INVALC,0x5638,
-	INVALC,INVALC,0x5639,INVALC,0x563A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x563B,INVALC,INVALC,INVALC,INVALC,0x563C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x563D,0x563E,INVALC,INVALC,INVALC,INVALC,INVALC,0x563F,
-	0x5640,0x5641,INVALC,INVALC,INVALC,0x5642,INVALC,0x5643,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5644,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5645,INVALC,INVALC,0x5647,0x5648,0x5649,INVALC,
-	INVALC,INVALC,INVALC,0x564A,INVALC,INVALC,0x564B,INVALC,
-	0x5646,INVALC,INVALC,INVALC,INVALC,INVALC,0x564C,INVALC,
-	0x564D,INVALC,INVALC,0x564E,INVALC,INVALC,0x564F,INVALC,
-	INVALC,INVALC,0x5650,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5651,INVALC,
-	INVALC,INVALC,0x5652,INVALC,0x5653,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5654,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5656,INVALC,0x5657,INVALC,INVALC,
-	INVALC,INVALC,0x5658,0x5655,INVALC,INVALC,0x5659,0x565A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x565B,INVALC,0x565C,
-	INVALC,INVALC,INVALC,0x565D,INVALC,0x565E,0x565F,INVALC,
-	INVALC,0x5660,INVALC,INVALC,0x5661,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5662,0x5663,INVALC,INVALC,INVALC,
-	0x5664,0x5665,0x5666,INVALC,INVALC,0x5667,0x5668,INVALC,
-	0x5669,0x566A,INVALC,INVALC,INVALC,0x566B,INVALC,0x566C,
-	/* Block 131, Array index 0x3B00 */
-	0x566D,INVALC,INVALC,0x566E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x566F,
-	INVALC,INVALC,INVALC,0x5670,0x5671,INVALC,INVALC,INVALC,
-	INVALC,0x5672,0x5673,INVALC,INVALC,0x5674,INVALC,INVALC,
-	INVALC,0x5675,0x5676,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5677,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5678,INVALC,0x5679,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x567A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x567B,0x567C,0x567D,0x567E,INVALC,
-	INVALC,INVALC,INVALC,0x5721,INVALC,INVALC,0x5722,0x5723,
-	INVALC,0x5724,INVALC,INVALC,INVALC,INVALC,0x5725,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5726,INVALC,INVALC,INVALC,
-	0x5727,INVALC,INVALC,0x5728,INVALC,INVALC,INVALC,0x5729,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x572A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x572B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x572C,INVALC,0x572D,INVALC,0x572E,
-	0x572F,0x5730,INVALC,0x5731,0x5732,INVALC,INVALC,0x5733,
-	INVALC,0x5734,0x5735,INVALC,INVALC,INVALC,0x5736,INVALC,
-	INVALC,0x5737,INVALC,INVALC,0x5738,INVALC,0x5739,INVALC,
-	0x573A,INVALC,0x573B,0x573C,INVALC,INVALC,INVALC,INVALC,
-	0x573D,0x573E,INVALC,0x573F,0x5740,INVALC,INVALC,0x5741,
-	0x5742,0x5743,0x5744,INVALC,INVALC,INVALC,0x5745,INVALC,
-	0x5746,INVALC,0x5747,INVALC,0x5748,INVALC,INVALC,0x5749,
-	INVALC,INVALC,0x574A,INVALC,0x574B,INVALC,0x574C,0x574D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x574E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x574F,INVALC,INVALC,INVALC,INVALC,0x5750,INVALC,INVALC,
-	INVALC,INVALC,0x5751,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5752,INVALC,0x5753,INVALC,0x5754,INVALC,INVALC,INVALC,
-	0x5755,INVALC,0x5756,INVALC,INVALC,0x5757,INVALC,0x5758,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5759,0x575A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x575B,0x575C,INVALC,
-	/* Block 132, Array index 0x3C00 */
-	0x575D,0x575E,INVALC,INVALC,INVALC,INVALC,INVALC,0x575F,
-	0x5760,INVALC,0x5761,0x5762,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5764,INVALC,0x5765,0x5766,0x5767,
-	INVALC,0x5768,0x5769,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x576A,0x576B,0x576C,INVALC,
-	0x576D,INVALC,INVALC,0x576E,INVALC,INVALC,INVALC,0x576F,
-	INVALC,INVALC,0x5770,INVALC,0x5771,0x5772,INVALC,INVALC,
-	INVALC,INVALC,0x5773,0x5774,0x5775,INVALC,INVALC,0x5776,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5777,0x5778,INVALC,
-	INVALC,0x5779,INVALC,0x583E,0x5763,0x577A,0x577B,0x577C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x577D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x577E,INVALC,INVALC,INVALC,INVALC,0x5821,INVALC,0x5822,
-	0x5823,INVALC,0x5824,INVALC,0x5825,INVALC,0x5826,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5827,INVALC,INVALC,
-	INVALC,INVALC,0x5828,INVALC,0x5829,0x582A,INVALC,INVALC,
-	0x582B,0x582C,INVALC,0x582D,0x582E,0x582F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5830,0x5831,
-	INVALC,0x5832,INVALC,INVALC,0x5833,0x584C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5834,0x5835,
-	0x5836,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5837,
-	INVALC,0x5838,INVALC,INVALC,INVALC,INVALC,INVALC,0x5839,
-	0x583A,0x583B,INVALC,INVALC,0x583C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x583D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x583F,INVALC,0x5840,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5841,INVALC,
-	0x5842,0x5843,INVALC,INVALC,0x5844,INVALC,INVALC,INVALC,
-	/* Block 133, Array index 0x3D00 */
-	INVALC,0x5845,INVALC,INVALC,INVALC,INVALC,0x5846,INVALC,
-	INVALC,INVALC,0x5847,INVALC,INVALC,INVALC,INVALC,0x5848,
-	INVALC,0x5849,INVALC,INVALC,INVALC,0x584A,INVALC,INVALC,
-	INVALC,0x584B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x584D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x584E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x584F,INVALC,0x5850,
-	0x5851,INVALC,0x5852,INVALC,INVALC,0x5853,INVALC,0x5854,
-	INVALC,0x5855,0x5856,INVALC,INVALC,INVALC,0x5857,INVALC,
-	0x5858,0x5859,0x585A,INVALC,0x585B,INVALC,INVALC,INVALC,
-	0x585C,INVALC,INVALC,INVALC,0x585D,0x585E,INVALC,0x585F,
-	INVALC,INVALC,0x5860,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5861,INVALC,INVALC,0x5862,0x5863,INVALC,0x5864,INVALC,
-	0x5865,INVALC,INVALC,INVALC,0x5866,0x5867,INVALC,INVALC,
-	INVALC,0x5868,INVALC,INVALC,INVALC,0x5869,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x586A,0x586B,INVALC,0x586C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x586D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x586E,INVALC,
-	0x586F,0x5870,0x5871,INVALC,INVALC,INVALC,INVALC,0x5872,
-	INVALC,0x5873,INVALC,INVALC,0x5874,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5875,INVALC,INVALC,0x5876,0x5877,INVALC,
-	0x5878,INVALC,0x5879,INVALC,INVALC,INVALC,INVALC,0x587A,
-	0x587B,INVALC,INVALC,INVALC,0x587C,INVALC,INVALC,0x587D,
-	INVALC,INVALC,INVALC,0x587E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5921,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5922,
-	INVALC,INVALC,0x5923,INVALC,INVALC,INVALC,INVALC,0x5924,
-	0x5925,0x5926,0x5927,INVALC,INVALC,INVALC,INVALC,0x5928,
-	INVALC,INVALC,0x592A,0x592B,INVALC,0x592C,INVALC,INVALC,
-	/* Block 134, Array index 0x3E00 */
-	INVALC,INVALC,0x592D,0x592E,INVALC,INVALC,INVALC,0x592F,
-	INVALC,INVALC,INVALC,INVALC,0x5930,INVALC,0x5931,INVALC,
-	0x5932,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5933,INVALC,0x5934,INVALC,
-	INVALC,INVALC,0x5935,0x5936,0x5937,0x5938,INVALC,0x5939,
-	INVALC,INVALC,0x593A,0x593B,INVALC,INVALC,INVALC,0x593C,
-	INVALC,INVALC,0x5929,0x593D,0x593E,INVALC,0x593F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5940,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5941,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5942,
-	0x5943,0x5944,0x5945,0x5946,INVALC,INVALC,0x5947,INVALC,
-	INVALC,0x5948,INVALC,INVALC,0x5949,0x594A,0x594B,0x594C,
-	0x594D,0x594E,0x594F,INVALC,0x5950,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5951,INVALC,INVALC,INVALC,0x5952,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5953,0x5954,0x5955,INVALC,0x5956,INVALC,0x5957,
-	INVALC,0x5958,INVALC,INVALC,INVALC,0x5959,0x595A,INVALC,
-	INVALC,0x595B,INVALC,0x595C,0x595D,INVALC,INVALC,0x595E,
-	INVALC,INVALC,INVALC,0x595F,INVALC,INVALC,INVALC,INVALC,
-	0x5960,INVALC,INVALC,INVALC,INVALC,0x5961,INVALC,0x5962,
-	0x5963,INVALC,0x5964,INVALC,INVALC,0x5965,INVALC,0x5966,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5974,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5967,INVALC,0x5968,0x5969,
-	0x596A,INVALC,INVALC,INVALC,0x596B,0x596C,0x596D,0x596E,
-	INVALC,INVALC,0x596F,INVALC,INVALC,INVALC,INVALC,0x5970,
-	INVALC,INVALC,0x5971,0x5972,INVALC,INVALC,0x5973,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5975,INVALC,0x5976,INVALC,INVALC,INVALC,INVALC,0x5977,
-	0x5978,INVALC,INVALC,INVALC,INVALC,INVALC,0x5979,INVALC,
-	0x597A,INVALC,INVALC,INVALC,INVALC,0x597B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x597C,INVALC,INVALC,0x597D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x597E,INVALC,INVALC,0x5A21,
-	/* Block 135, Array index 0x3F00 */
-	0x5A22,INVALC,INVALC,INVALC,0x5A23,0x5A24,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5A25,0x5A26,INVALC,
-	0x5A27,0x5A28,0x5A29,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5A2A,0x5A2B,INVALC,0x5A2C,INVALC,INVALC,0x5A2D,INVALC,
-	INVALC,0x5A2E,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A2F,
-	INVALC,0x5A30,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A31,INVALC,
-	0x5A32,INVALC,0x5A33,INVALC,0x5A34,0x5A35,INVALC,INVALC,
-	0x5A36,0x3866,0x5A37,INVALC,INVALC,INVALC,0x5A38,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5A39,0x5A3A,INVALC,INVALC,0x5A3B,0x5A3C,
-	0x5A3D,0x5A3E,INVALC,INVALC,INVALC,0x5A3F,INVALC,INVALC,
-	0x5A40,0x5A41,0x5A42,0x5A43,0x5A44,INVALC,INVALC,INVALC,
-	INVALC,0x5A45,INVALC,INVALC,0x5A46,INVALC,INVALC,0x5A47,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5A48,0x5A49,0x5A4A,
-	INVALC,INVALC,0x5A4B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5A6D,INVALC,INVALC,INVALC,INVALC,0x5A4C,INVALC,INVALC,
-	INVALC,0x5A4D,INVALC,INVALC,INVALC,INVALC,0x5A4E,INVALC,
-	0x5A4F,INVALC,0x5A50,INVALC,0x5A51,INVALC,INVALC,INVALC,
-	INVALC,0x5A52,INVALC,INVALC,INVALC,INVALC,0x5A53,0x5A54,
-	0x5A55,INVALC,INVALC,INVALC,INVALC,0x5A56,INVALC,INVALC,
-	INVALC,0x5A57,INVALC,0x5A58,0x5A59,0x5A5A,INVALC,0x5A5B,
-	0x5A5C,0x5A5D,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A5E,
-	0x5A5F,0x5A60,INVALC,0x5A61,INVALC,0x5A62,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5A63,0x5A64,INVALC,INVALC,0x5A65,INVALC,0x5A66,
-	INVALC,INVALC,0x5A67,INVALC,0x5A68,INVALC,INVALC,INVALC,
-	0x5A69,INVALC,INVALC,0x5A6A,INVALC,0x5A6B,INVALC,0x5A6C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5A6E,INVALC,0x5A6F,0x5A70,INVALC,INVALC,
-	/* Block 136, Array index 0x4000 */
-	INVALC,INVALC,INVALC,INVALC,0x5A71,0x5A72,INVALC,0x5A73,
-	INVALC,INVALC,INVALC,0x5A74,INVALC,INVALC,0x5A75,0x5A76,
-	0x5A77,INVALC,INVALC,0x5A78,0x5A79,INVALC,INVALC,INVALC,
-	INVALC,0x5A7A,INVALC,INVALC,INVALC,INVALC,0x5A7B,0x5A7C,
-	INVALC,0x5A7D,INVALC,0x5A7E,INVALC,INVALC,INVALC,INVALC,
-	0x5B21,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B22,0x5B23,
-	INVALC,0x5B24,0x5B25,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5B26,0x5B27,INVALC,0x5B28,0x5B29,0x5B2A,INVALC,
-	0x5B2B,INVALC,INVALC,0x5B2C,INVALC,0x5B2D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5B2E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5B2F,INVALC,INVALC,INVALC,INVALC,0x5B30,INVALC,INVALC,
-	INVALC,0x5B31,INVALC,INVALC,0x5B32,0x5B33,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B34,
-	INVALC,0x5B35,0x5B36,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5B37,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5B38,0x5B39,0x5B3A,0x5B3B,0x5B3C,
-	0x5B3D,0x5B3E,INVALC,0x5B3F,0x5B40,INVALC,INVALC,INVALC,
-	0x5B41,INVALC,INVALC,0x5B42,INVALC,0x5B43,INVALC,0x5B44,
-	0x5B45,0x5B46,INVALC,INVALC,INVALC,INVALC,0x5B47,INVALC,
-	0x5B48,INVALC,INVALC,0x5B49,INVALC,INVALC,INVALC,0x5B4A,
-	INVALC,INVALC,INVALC,INVALC,0x5B4B,0x5B4C,0x5B4D,INVALC,
-	INVALC,0x5B4E,INVALC,INVALC,INVALC,0x5B4F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B50,0x5B51,
-	INVALC,0x5B52,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5B53,0x5B54,0x5B55,INVALC,INVALC,INVALC,0x5B56,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5B57,0x5B58,INVALC,
-	INVALC,0x5B59,0x5B5A,INVALC,0x5B5B,INVALC,INVALC,0x5B5C,
-	INVALC,INVALC,0x5B5D,0x5B5E,0x5B5F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5B60,0x5B61,INVALC,0x5B62,INVALC,INVALC,
-	INVALC,0x5B63,INVALC,0x5B64,INVALC,INVALC,INVALC,INVALC,
-	0x5B65,INVALC,0x5B66,INVALC,INVALC,INVALC,INVALC,0x5B67,
-	/* Block 137, Array index 0x4100 */
-	INVALC,0x5B68,INVALC,0x5B69,INVALC,INVALC,0x5B6A,INVALC,
-	INVALC,0x5B6B,0x5B6C,0x5B6D,INVALC,INVALC,INVALC,INVALC,
-	0x5B6E,INVALC,0x5B70,0x5B71,0x5B72,INVALC,INVALC,INVALC,
-	0x5B73,0x5B6F,0x5B74,0x5B75,0x5B76,INVALC,0x5B77,0x5B78,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5B79,INVALC,INVALC,INVALC,INVALC,0x5B7A,0x5B7B,INVALC,
-	0x5B7C,INVALC,0x5B7D,INVALC,INVALC,0x5B7E,INVALC,INVALC,
-	INVALC,INVALC,0x5C21,INVALC,0x5C22,INVALC,INVALC,INVALC,
-	INVALC,0x5C23,INVALC,0x5C24,INVALC,0x5C25,INVALC,INVALC,
-	0x5C26,0x5C27,0x5C28,0x5C29,INVALC,INVALC,0x5C2A,INVALC,
-	INVALC,0x5C2B,INVALC,INVALC,INVALC,0x5C2C,0x5C2D,INVALC,
-	0x5C2E,INVALC,0x5C2F,INVALC,0x5C30,INVALC,INVALC,0x5C31,
-	0x5C32,INVALC,INVALC,INVALC,0x5C33,INVALC,INVALC,INVALC,
-	INVALC,0x5C34,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C35,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C36,INVALC,0x5C37,INVALC,INVALC,INVALC,INVALC,
-	0x5C38,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5C39,INVALC,0x5C3A,0x5C3B,0x5C3C,INVALC,INVALC,0x5C3D,
-	0x5C3E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5C3F,INVALC,0x5C40,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C41,INVALC,INVALC,0x5C42,0x5C43,INVALC,
-	0x5C44,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C45,0x5C46,0x5C47,0x5C48,0x5C49,INVALC,
-	INVALC,0x5C4A,0x5C4B,0x5C4C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C4D,INVALC,INVALC,0x5C4E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C4F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C50,
-	0x5C51,0x5C52,INVALC,INVALC,INVALC,0x5C53,INVALC,0x5C54,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 138, Array index 0x4200 */
-	INVALC,0x5C55,INVALC,INVALC,INVALC,INVALC,0x5C56,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5C57,0x5C58,0x5C59,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5C5A,0x5C5B,INVALC,
-	0x5C5C,0x5C5D,0x5C5E,INVALC,0x5C5F,INVALC,INVALC,INVALC,
-	0x5C60,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C61,0x5C62,
-	0x5C63,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5C64,0x5C65,0x5C66,INVALC,INVALC,0x5C67,INVALC,INVALC,
-	INVALC,0x5C68,0x5C69,INVALC,INVALC,INVALC,0x5C6A,INVALC,
-	0x5C6B,INVALC,0x5C6C,INVALC,INVALC,0x5C6D,0x5C6E,INVALC,
-	INVALC,0x5C6F,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C70,
-	INVALC,INVALC,0x5C71,INVALC,INVALC,INVALC,INVALC,0x5C72,
-	INVALC,INVALC,0x5C73,0x5C74,0x5C75,INVALC,INVALC,INVALC,
-	INVALC,0x5C76,0x5C77,0x5C78,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C79,INVALC,INVALC,0x5C7A,INVALC,
-	0x5C7B,INVALC,INVALC,0x5C7C,INVALC,0x5C7D,INVALC,INVALC,
-	INVALC,INVALC,0x5C7E,0x5D21,0x5D22,0x5D23,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D24,INVALC,INVALC,INVALC,0x5D25,INVALC,INVALC,
-	0x5D26,INVALC,INVALC,INVALC,0x5D27,0x5D28,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D29,0x5D2A,INVALC,INVALC,0x5D2B,
-	0x5D2C,INVALC,INVALC,INVALC,INVALC,0x5D2D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D2E,INVALC,INVALC,INVALC,0x5D2F,0x5D30,0x5D31,0x5D32,
-	INVALC,INVALC,INVALC,INVALC,0x5D33,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5D34,0x5D35,0x5D36,0x5D37,
-	0x5D38,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5D39,INVALC,INVALC,
-	INVALC,0x5D3A,INVALC,0x5D3B,INVALC,0x5D3C,INVALC,INVALC,
-	INVALC,0x5D3D,INVALC,0x5D3E,INVALC,INVALC,0x5D3F,INVALC,
-	INVALC,0x5D40,INVALC,INVALC,INVALC,0x5D41,INVALC,0x5D42,
-	/* Block 139, Array index 0x4300 */
-	INVALC,INVALC,INVALC,INVALC,0x5D43,0x5D44,INVALC,0x5D45,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D46,
-	INVALC,0x5D47,0x5D48,INVALC,0x5D49,0x5D4A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D4B,INVALC,
-	0x5D4C,INVALC,0x5D4D,INVALC,0x5D4E,INVALC,0x5D4F,INVALC,
-	INVALC,INVALC,INVALC,0x5D50,0x5D51,INVALC,INVALC,0x5D52,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5D53,INVALC,0x5D54,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5D55,0x5D56,INVALC,
-	0x5D57,INVALC,INVALC,0x5D58,INVALC,0x5D59,INVALC,0x5D5A,
-	INVALC,0x5D5B,INVALC,INVALC,INVALC,0x5D5C,0x5D5D,INVALC,
-	INVALC,INVALC,INVALC,0x5D5E,INVALC,INVALC,0x5D5F,0x5D60,
-	0x5D61,INVALC,INVALC,INVALC,0x5D62,0x5D63,INVALC,INVALC,
-	INVALC,0x5D64,INVALC,INVALC,INVALC,0x5D65,INVALC,0x5D66,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5D67,0x5D68,0x5D69,
-	INVALC,0x5D6A,0x5D6B,0x5D6C,INVALC,INVALC,0x5D6D,0x5D6E,
-	0x5D6F,INVALC,INVALC,0x5D70,INVALC,INVALC,0x5D71,INVALC,
-	INVALC,INVALC,INVALC,0x5D72,INVALC,INVALC,INVALC,0x5D73,
-	0x5D74,INVALC,0x5D75,INVALC,INVALC,INVALC,0x5D76,0x5D77,
-	INVALC,0x5D78,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D79,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D7A,
-	INVALC,0x5D7B,INVALC,INVALC,INVALC,INVALC,0x5D7C,0x5D7D,
-	INVALC,INVALC,INVALC,0x5D7E,INVALC,INVALC,0x5E21,0x5E22,
-	INVALC,INVALC,INVALC,0x5E23,INVALC,INVALC,0x5E24,INVALC,
-	INVALC,INVALC,INVALC,0x5E25,INVALC,INVALC,0x5E26,INVALC,
-	0x5E27,0x5E28,0x5E29,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5E2A,INVALC,0x5E2B,0x5E2C,0x5E2D,INVALC,0x5E2E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E2F,INVALC,0x5E30,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E31,INVALC,INVALC,INVALC,
-	0x5E32,INVALC,INVALC,INVALC,0x5E33,0x5E34,0x5E35,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E36,INVALC,INVALC,0x5E37,
-	/* Block 140, Array index 0x4400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E38,0x5E39,INVALC,
-	INVALC,INVALC,0x5E3F,0x5E3A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5E3B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E3C,INVALC,0x5E3D,0x5E3E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E40,INVALC,INVALC,
-	0x5E41,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E42,
-	INVALC,INVALC,INVALC,INVALC,0x5E43,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5E44,0x5E45,0x5E46,0x5E47,0x5E48,INVALC,
-	0x5E49,INVALC,INVALC,INVALC,INVALC,0x5E4E,INVALC,INVALC,
-	INVALC,INVALC,0x5E4A,0x5E4B,0x5E4C,INVALC,INVALC,INVALC,
-	INVALC,0x5E4D,INVALC,INVALC,INVALC,INVALC,0x5E4F,INVALC,
-	INVALC,INVALC,INVALC,0x5E50,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E51,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E52,INVALC,
-	0x5E53,0x5E54,INVALC,INVALC,0x5E55,INVALC,0x5E56,INVALC,
-	INVALC,0x5E57,INVALC,INVALC,0x5E58,0x5E59,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E5A,INVALC,0x5E5B,INVALC,0x5E5C,
-	INVALC,INVALC,INVALC,INVALC,0x5E5D,0x5E5E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E5F,INVALC,0x5E60,0x5E61,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 141, Array index 0x4500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5E62,0x5E63,INVALC,INVALC,INVALC,0x5E64,0x5E65,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E66,INVALC,0x5E67,
-	INVALC,0x5E68,INVALC,0x5E69,INVALC,INVALC,INVALC,0x5E6A,
-	INVALC,0x5E6B,INVALC,0x5E6C,0x5E6D,INVALC,INVALC,0x5E6E,
-	0x5E6F,0x5E72,INVALC,0x5E70,INVALC,0x5E71,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E73,0x5E74,INVALC,0x5E75,INVALC,
-	0x5E76,0x5E77,INVALC,INVALC,INVALC,0x5E78,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E79,INVALC,0x5E7A,0x5E7B,INVALC,
-	INVALC,INVALC,INVALC,0x5E7C,INVALC,INVALC,0x5E7D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E7E,0x5F21,
-	INVALC,INVALC,INVALC,0x5F22,INVALC,INVALC,INVALC,INVALC,
-	0x5F23,INVALC,0x5F24,0x5F25,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F26,INVALC,0x5F27,0x5F28,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5F29,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F2A,0x5F2B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F2C,0x5F2D,INVALC,
-	INVALC,0x5F2E,INVALC,0x5F2F,INVALC,INVALC,INVALC,0x5F30,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F32,0x5F31,INVALC,
-	INVALC,0x5F33,INVALC,INVALC,INVALC,0x5F34,INVALC,INVALC,
-	INVALC,0x5F35,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F36,INVALC,INVALC,INVALC,0x5F37,INVALC,INVALC,0x5F38,
-	0x5F39,INVALC,0x5F3A,INVALC,INVALC,0x5F3B,INVALC,0x5F3C,
-	0x5F3D,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F3E,0x5F3F,
-	/* Block 142, Array index 0x4600 */
-	INVALC,0x5F40,INVALC,0x5F41,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F42,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5F43,INVALC,INVALC,INVALC,INVALC,0x5F44,
-	INVALC,INVALC,INVALC,0x5F45,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F46,INVALC,INVALC,
-	INVALC,0x5F47,INVALC,INVALC,0x5F48,INVALC,0x5F49,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F4A,
-	INVALC,INVALC,0x5F4B,INVALC,0x5F4C,INVALC,INVALC,INVALC,
-	0x5F4D,INVALC,INVALC,INVALC,INVALC,0x5F4E,INVALC,INVALC,
-	0x5F4F,0x5F50,INVALC,INVALC,INVALC,0x5F51,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F52,0x5F53,
-	0x5F54,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F55,INVALC,
-	INVALC,INVALC,INVALC,0x5F56,0x5F57,INVALC,INVALC,0x5F58,
-	INVALC,INVALC,0x5F59,INVALC,INVALC,0x5F5A,INVALC,0x5F5B,
-	INVALC,0x5F5C,INVALC,0x5F5D,0x5F6F,INVALC,INVALC,INVALC,
-	0x5F5E,INVALC,INVALC,INVALC,INVALC,0x5F5F,0x5F60,0x5F61,
-	0x5F62,INVALC,0x5F63,INVALC,INVALC,INVALC,0x5F64,INVALC,
-	INVALC,0x5F65,INVALC,INVALC,0x5F66,0x5F67,INVALC,0x5F68,
-	INVALC,0x5F69,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5F6A,0x5F6B,INVALC,0x5F6C,
-	INVALC,INVALC,INVALC,INVALC,0x5F6D,INVALC,INVALC,INVALC,
-	0x5F6E,0x5F70,0x5F71,INVALC,0x5F72,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F73,INVALC,INVALC,
-	/* Block 143, Array index 0x4700 */
-	INVALC,0x5F74,INVALC,INVALC,0x5F75,0x5F76,0x5F77,INVALC,
-	INVALC,INVALC,INVALC,0x5F78,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F79,INVALC,INVALC,0x5F7A,INVALC,0x5F7B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F7C,0x5F7D,0x5F7E,0x6021,INVALC,INVALC,0x6022,0x6023,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6024,INVALC,0x6025,INVALC,INVALC,0x6026,0x6027,
-	0x6028,0x6029,INVALC,INVALC,INVALC,0x602A,INVALC,INVALC,
-	0x602B,0x602C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x602D,INVALC,0x602E,0x602F,0x6030,
-	INVALC,INVALC,INVALC,INVALC,0x6031,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6032,0x6033,0x6034,0x6035,INVALC,
-	INVALC,0x6036,0x6037,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6038,INVALC,INVALC,0x6039,0x603A,INVALC,0x603B,
-	0x603C,0x603D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x603E,0x603F,0x6040,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6041,0x6042,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6043,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6044,INVALC,0x6045,INVALC,INVALC,0x6046,INVALC,INVALC,
-	INVALC,INVALC,0x6047,0x6048,INVALC,0x6049,0x604A,INVALC,
-	INVALC,INVALC,0x604B,INVALC,INVALC,INVALC,INVALC,0x604C,
-	INVALC,0x604D,INVALC,INVALC,INVALC,0x604E,0x604F,INVALC,
-	INVALC,INVALC,INVALC,0x6050,INVALC,0x6051,INVALC,INVALC,
-	INVALC,INVALC,0x6052,0x6053,INVALC,INVALC,INVALC,INVALC,
-	0x6054,0x6055,INVALC,0x6056,0x6057,INVALC,INVALC,0x6058,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6059,
-	INVALC,0x605A,INVALC,INVALC,0x605B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x605C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x605D,INVALC,INVALC,INVALC,INVALC,0x6064,0x605E,INVALC,
-	0x605F,0x6060,INVALC,INVALC,INVALC,INVALC,INVALC,0x6061,
-	INVALC,0x6062,0x6063,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 144, Array index 0x4800 */
-	0x6065,INVALC,0x6066,INVALC,INVALC,INVALC,INVALC,0x6067,
-	0x6068,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6069,
-	0x606A,INVALC,INVALC,INVALC,INVALC,INVALC,0x606B,0x606C,
-	0x606D,INVALC,INVALC,INVALC,INVALC,INVALC,0x606E,INVALC,
-	0x606F,0x6070,INVALC,0x6071,INVALC,0x6072,INVALC,0x6073,
-	0x6074,INVALC,INVALC,INVALC,0x6075,0x6076,0x6077,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6078,0x6079,0x607A,0x607B,
-	INVALC,INVALC,0x607C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x607D,0x607E,INVALC,0x6121,INVALC,INVALC,INVALC,0x6122,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6123,
-	INVALC,0x6124,0x6125,0x6126,0x6127,0x6128,INVALC,INVALC,
-	0x6129,INVALC,INVALC,INVALC,INVALC,0x612A,0x612B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x612C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x612D,INVALC,INVALC,
-	0x612E,0x612F,INVALC,INVALC,0x6130,0x6131,0x6132,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6133,0x6134,INVALC,
-	0x6135,INVALC,INVALC,INVALC,INVALC,INVALC,0x6136,INVALC,
-	0x6137,0x6138,INVALC,INVALC,INVALC,INVALC,0x6139,INVALC,
-	INVALC,INVALC,0x613A,0x613B,INVALC,0x613C,INVALC,INVALC,
-	0x613D,INVALC,0x613E,0x613F,INVALC,0x6140,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6141,INVALC,INVALC,0x6142,0x6143,INVALC,INVALC,INVALC,
-	0x6144,INVALC,INVALC,INVALC,INVALC,INVALC,0x6145,INVALC,
-	INVALC,0x6146,INVALC,INVALC,INVALC,0x6147,0x6148,INVALC,
-	INVALC,INVALC,INVALC,0x6149,INVALC,INVALC,0x614A,INVALC,
-	/* Block 145, Array index 0x4900 */
-	INVALC,INVALC,0x614B,INVALC,0x614C,INVALC,INVALC,INVALC,
-	0x614D,INVALC,INVALC,INVALC,0x614E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x614F,INVALC,INVALC,0x6150,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6151,0x6152,0x6154,INVALC,0x6155,0x6156,INVALC,0x6153,
-	INVALC,INVALC,INVALC,0x6157,0x6158,INVALC,INVALC,0x6159,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x615A,
-	INVALC,INVALC,INVALC,0x615B,0x615C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x615D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x615E,INVALC,0x615F,INVALC,INVALC,
-	INVALC,INVALC,0x6160,INVALC,INVALC,INVALC,0x6161,0x6162,
-	INVALC,INVALC,INVALC,INVALC,0x6163,INVALC,INVALC,INVALC,
-	0x6164,INVALC,INVALC,INVALC,0x6165,INVALC,INVALC,INVALC,
-	INVALC,0x6166,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6167,INVALC,INVALC,
-	0x6168,INVALC,INVALC,0x6169,0x616A,INVALC,0x616B,INVALC,
-	0x616C,INVALC,INVALC,INVALC,INVALC,0x616D,INVALC,0x616E,
-	0x616F,0x6170,INVALC,0x6171,INVALC,INVALC,INVALC,INVALC,
-	0x6172,0x6173,0x6174,INVALC,INVALC,0x6175,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6176,INVALC,0x6177,0x6178,0x6179,INVALC,0x617A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x617B,0x617D,INVALC,
-	INVALC,INVALC,INVALC,0x617E,0x6221,0x6222,INVALC,0x6223,
-	0x6224,INVALC,INVALC,INVALC,0x617C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x622D,INVALC,INVALC,0x6225,INVALC,0x6226,
-	0x6227,0x6228,INVALC,INVALC,0x6229,0x622A,INVALC,0x622B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x622C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x622F,INVALC,INVALC,INVALC,0x6230,
-	0x6231,INVALC,INVALC,INVALC,0x6232,INVALC,0x622E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6233,0x6234,
-	/* Block 146, Array index 0x4A00 */
-	0x6235,INVALC,INVALC,INVALC,0x6236,0x6237,0x6238,INVALC,
-	0x6239,INVALC,INVALC,INVALC,INVALC,0x623A,INVALC,INVALC,
-	0x623B,INVALC,INVALC,INVALC,0x623C,INVALC,0x623D,0x623E,
-	0x623F,INVALC,0x6240,INVALC,0x6241,INVALC,0x6242,INVALC,
-	0x6243,INVALC,0x6245,0x6246,INVALC,0x6244,INVALC,0x6247,
-	INVALC,0x6248,INVALC,INVALC,INVALC,INVALC,0x6249,0x624A,
-	INVALC,0x624B,INVALC,INVALC,0x624C,INVALC,0x624D,0x624E,
-	INVALC,0x624F,0x6250,INVALC,0x6251,0x6252,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6253,INVALC,INVALC,INVALC,0x6254,
-	0x6255,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6256,
-	INVALC,INVALC,INVALC,0x6257,INVALC,INVALC,INVALC,0x6258,
-	INVALC,0x6259,0x625A,0x625B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x625C,INVALC,INVALC,0x625D,INVALC,INVALC,0x625E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x625F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6260,INVALC,INVALC,INVALC,
-	INVALC,0x6261,0x6262,0x6263,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6264,INVALC,0x6265,INVALC,0x6266,0x6267,INVALC,
-	INVALC,INVALC,0x6268,INVALC,INVALC,INVALC,0x6269,INVALC,
-	INVALC,0x626A,INVALC,0x626B,0x626C,0x626D,INVALC,INVALC,
-	0x626E,INVALC,INVALC,INVALC,INVALC,INVALC,0x626F,INVALC,
-	INVALC,0x6270,INVALC,INVALC,INVALC,INVALC,0x6271,INVALC,
-	0x6272,INVALC,INVALC,INVALC,0x6273,0x6274,0x6275,INVALC,
-	0x6276,0x6277,0x6278,0x6279,INVALC,INVALC,0x627A,INVALC,
-	INVALC,INVALC,INVALC,0x627B,0x627C,0x627D,INVALC,0x627E,
-	INVALC,INVALC,0x6321,0x6322,INVALC,0x6323,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6324,0x6325,INVALC,INVALC,0x6326,
-	INVALC,0x6327,0x6328,INVALC,INVALC,INVALC,0x6329,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x632A,0x632B,INVALC,INVALC,
-	INVALC,0x632C,0x632D,INVALC,0x632E,0x632F,0x6330,0x6331,
-	0x6332,0x6333,INVALC,INVALC,INVALC,INVALC,INVALC,0x6334,
-	INVALC,0x6335,INVALC,0x6336,INVALC,0x6337,INVALC,INVALC,
-	/* Block 147, Array index 0x4B00 */
-	0x6338,0x6339,INVALC,INVALC,0x633A,0x633B,0x633C,0x633D,
-	INVALC,0x633E,0x633F,INVALC,0x6340,INVALC,INVALC,INVALC,
-	0x6341,INVALC,0x6342,0x6343,INVALC,INVALC,0x6344,INVALC,
-	0x6345,INVALC,INVALC,INVALC,0x6346,0x6347,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6348,0x6349,0x634A,0x634B,INVALC,
-	0x634C,INVALC,INVALC,INVALC,INVALC,INVALC,0x634D,0x634E,
-	0x634F,INVALC,INVALC,0x6350,INVALC,0x6351,0x6352,INVALC,
-	0x6353,0x6354,0x6355,INVALC,0x6356,INVALC,0x6357,INVALC,
-	0x6358,INVALC,0x6359,0x635A,INVALC,INVALC,0x635B,0x635C,
-	INVALC,INVALC,0x635D,INVALC,INVALC,0x635E,0x635F,0x6360,
-	INVALC,0x6361,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6362,0x6363,INVALC,INVALC,0x6364,0x6365,INVALC,INVALC,
-	0x6366,0x6367,INVALC,INVALC,INVALC,0x6368,INVALC,0x6369,
-	0x636A,0x636B,INVALC,INVALC,INVALC,INVALC,0x636C,0x636D,
-	0x636E,INVALC,INVALC,INVALC,INVALC,0x636F,0x6370,0x6371,
-	0x6372,0x6373,INVALC,0x6374,0x6375,0x6376,INVALC,0x6377,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6378,0x6379,0x637A,INVALC,INVALC,0x637B,0x637C,INVALC,
-	INVALC,INVALC,0x637D,INVALC,INVALC,INVALC,INVALC,0x637E,
-	INVALC,0x6421,INVALC,INVALC,INVALC,INVALC,INVALC,0x6422,
-	0x6423,INVALC,INVALC,INVALC,0x6424,0x6425,INVALC,0x6426,
-	0x6427,INVALC,INVALC,0x6428,INVALC,INVALC,INVALC,0x6429,
-	INVALC,INVALC,0x642A,INVALC,INVALC,INVALC,0x642B,INVALC,
-	0x642C,INVALC,0x642D,0x642E,0x642F,0x6430,INVALC,0x6431,
-	0x6432,0x6433,0x6434,0x6435,INVALC,0x6436,0x6437,0x6438,
-	0x6439,INVALC,INVALC,0x643A,0x643B,0x643C,0x643D,INVALC,
-	0x643E,INVALC,INVALC,0x643F,INVALC,0x6440,INVALC,0x6441,
-	0x6442,0x6443,INVALC,INVALC,0x6444,0x6445,INVALC,0x6446,
-	0x6447,0x6448,INVALC,0x6449,INVALC,0x644A,INVALC,0x644B,
-	0x644C,INVALC,INVALC,INVALC,0x644D,INVALC,0x644E,INVALC,
-	0x644F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6450,INVALC,0x6451,INVALC,INVALC,INVALC,0x6452,
-	/* Block 148, Array index 0x4C00 */
-	0x6453,INVALC,0x6454,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6455,INVALC,INVALC,INVALC,INVALC,0x6456,INVALC,INVALC,
-	INVALC,0x6457,INVALC,INVALC,0x6458,0x6459,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x645A,0x645B,0x645C,0x645D,
-	INVALC,0x645E,INVALC,INVALC,0x645F,0x6460,INVALC,0x6461,
-	INVALC,0x6462,0x6463,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6464,0x6465,INVALC,0x6466,0x6467,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6468,
-	0x6469,0x646A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x646B,0x646C,0x646D,INVALC,INVALC,0x646E,INVALC,0x646F,
-	0x6470,INVALC,0x6471,INVALC,INVALC,INVALC,0x6472,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6473,0x6474,INVALC,0x6475,
-	INVALC,0x6476,0x6477,INVALC,INVALC,0x6478,INVALC,0x6479,
-	0x647A,0x647B,INVALC,0x647C,0x647D,INVALC,0x647E,INVALC,
-	INVALC,INVALC,0x6521,INVALC,INVALC,0x6522,INVALC,0x6523,
-	0x6524,0x6525,0x6526,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6527,INVALC,0x6528,0x6529,INVALC,0x652A,INVALC,0x652B,
-	INVALC,INVALC,0x652C,INVALC,INVALC,0x652D,INVALC,INVALC,
-	0x652E,INVALC,INVALC,0x652F,INVALC,INVALC,0x6530,INVALC,
-	INVALC,0x6531,INVALC,0x6532,0x6533,INVALC,0x6534,INVALC,
-	0x6535,0x653B,INVALC,0x6536,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6537,0x6538,0x6539,INVALC,
-	INVALC,INVALC,0x653A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x653C,INVALC,INVALC,0x653D,0x653E,0x653F,0x6540,
-	INVALC,0x6541,0x6542,0x6543,0x6544,0x6545,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6546,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6547,INVALC,INVALC,0x6548,INVALC,0x6549,0x654A,
-	INVALC,INVALC,0x654B,INVALC,INVALC,INVALC,0x654C,0x654D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x654F,
-	0x6550,0x654E,0x6551,0x6552,INVALC,0x6553,INVALC,INVALC,
-	/* Block 149, Array index 0x4D00 */
-	INVALC,0x6554,0x6555,INVALC,0x6556,INVALC,INVALC,INVALC,
-	0x6557,0x6558,INVALC,INVALC,INVALC,0x6559,0x655A,0x655B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x655C,0x655D,0x655E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x655F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6560,0x6561,
-	INVALC,0x6562,0x6563,0x6564,0x6565,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6566,INVALC,0x6568,INVALC,0x6567,
-	INVALC,INVALC,INVALC,0x6569,INVALC,0x656A,INVALC,INVALC,
-	0x656B,INVALC,0x656C,INVALC,0x656D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x656E,INVALC,INVALC,
-	INVALC,0x656F,INVALC,INVALC,0x6570,INVALC,INVALC,0x6571,
-	INVALC,0x6572,INVALC,0x6573,INVALC,INVALC,INVALC,INVALC,
-	0x6574,INVALC,INVALC,0x6575,INVALC,0x6576,0x6577,0x6578,
-	INVALC,0x6579,0x657A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x657C,0x657B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 150, Array index 0x4E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x657D,0x657E,INVALC,INVALC,INVALC,INVALC,0x6621,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6622,INVALC,INVALC,INVALC,
-	0x6623,INVALC,INVALC,INVALC,0x6624,0x6625,0x6626,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6627,0x6628,0x6629,
-	INVALC,0x662A,INVALC,INVALC,INVALC,INVALC,0x662B,INVALC,
-	INVALC,0x662C,INVALC,0x662D,0x662E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x662F,INVALC,0x6630,INVALC,
-	INVALC,INVALC,0x6631,INVALC,INVALC,0x6632,INVALC,0x6633,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6634,INVALC,
-	0x6635,0x6636,INVALC,0x6637,INVALC,INVALC,INVALC,INVALC,
-	0x6638,0x6639,0x663A,0x663B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x663C,0x663D,INVALC,INVALC,0x663E,0x663F,0x6640,
-	0x6641,INVALC,INVALC,INVALC,0x6642,INVALC,0x6643,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 151, Array index 0x4F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6644,0x6645,INVALC,
-	INVALC,INVALC,0x6646,INVALC,0x6647,0x6648,0x6649,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x664A,INVALC,INVALC,INVALC,
-	INVALC,0x664B,INVALC,0x664C,INVALC,INVALC,INVALC,0x664D,
-	0x664E,0x664F,0x6650,INVALC,0x6651,0x6652,INVALC,INVALC,
-	INVALC,0x6653,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6654,INVALC,0x6655,INVALC,0x6656,0x6657,
-	0x6658,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6659,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x665A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x665B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x665C,0x665D,INVALC,0x665E,0x665F,
-	INVALC,0x6660,0x6661,0x6662,0x6663,INVALC,INVALC,INVALC,
-	INVALC,0x6664,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6665,INVALC,INVALC,INVALC,INVALC,0x6666,INVALC,
-	INVALC,INVALC,0x6667,INVALC,INVALC,0x6668,INVALC,0x6669,
-	INVALC,INVALC,INVALC,INVALC,0x666A,0x666B,0x666C,INVALC,
-	INVALC,0x666D,INVALC,INVALC,INVALC,INVALC,0x666E,0x666F,
-	INVALC,INVALC,INVALC,0x6670,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6671,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6672,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6673,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6675,INVALC,0x6676,INVALC,INVALC,0x6677,0x6678,0x6679,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x667A,INVALC,INVALC,INVALC,INVALC,INVALC,0x667B,
-	INVALC,0x667C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x667D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 152, Array index 0x5000 */
-	INVALC,INVALC,0x667E,0x6721,INVALC,0x6722,INVALC,INVALC,
-	INVALC,0x6723,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6724,0x6725,INVALC,0x6726,INVALC,INVALC,
-	INVALC,0x6727,0x6728,0x6729,INVALC,INVALC,INVALC,INVALC,
-	0x672A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x672B,INVALC,0x672C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x672D,INVALC,0x672E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x672F,INVALC,INVALC,INVALC,0x6730,0x6731,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6732,INVALC,0x6733,
-	0x6734,INVALC,0x6735,0x6736,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6737,INVALC,INVALC,INVALC,0x6738,
-	INVALC,INVALC,0x6739,INVALC,INVALC,INVALC,0x673A,INVALC,
-	INVALC,INVALC,INVALC,0x673B,INVALC,INVALC,0x673C,0x673D,
-	0x673E,INVALC,INVALC,0x673F,INVALC,0x6740,INVALC,0x6741,
-	0x6742,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6743,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6744,0x6745,0x6746,
-	INVALC,0x6747,0x6748,INVALC,INVALC,INVALC,0x6749,0x674A,
-	INVALC,INVALC,0x674B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x674C,INVALC,0x674D,INVALC,
-	INVALC,0x674E,0x674F,INVALC,INVALC,0x6750,0x6751,INVALC,
-	0x6752,0x6753,0x6754,INVALC,0x6755,INVALC,0x6756,0x6757,
-	INVALC,0x6758,INVALC,INVALC,0x6759,0x675A,INVALC,0x675B,
-	INVALC,0x675C,0x675D,INVALC,0x675E,0x675F,0x6760,INVALC,
-	0x6761,0x6762,INVALC,INVALC,0x6763,INVALC,INVALC,0x6764,
-	0x6765,0x6766,INVALC,0x676A,INVALC,0x6767,0x6768,INVALC,
-	0x6769,0x676B,INVALC,INVALC,0x676C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x676D,
-	INVALC,0x676E,INVALC,INVALC,0x676F,INVALC,INVALC,0x6770,
-	0x6771,INVALC,0x6772,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 153, Array index 0x5100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6773,
-	INVALC,INVALC,0x6774,INVALC,INVALC,0x6776,0x6777,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6778,INVALC,0x6779,INVALC,
-	INVALC,0x6775,INVALC,INVALC,0x677A,INVALC,0x677B,INVALC,
-	0x677C,INVALC,INVALC,0x677D,INVALC,0x6828,0x677E,INVALC,
-	INVALC,INVALC,INVALC,0x6821,INVALC,INVALC,0x6822,0x6823,
-	0x6824,INVALC,0x6825,0x6826,INVALC,0x6827,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6829,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x682A,INVALC,INVALC,0x682B,
-	INVALC,INVALC,0x682C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x682D,0x682E,0x682F,INVALC,INVALC,0x6830,0x6831,
-	INVALC,0x6832,0x6833,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6834,0x6835,INVALC,0x6836,0x6837,INVALC,
-	INVALC,INVALC,0x6838,INVALC,0x6839,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x683A,INVALC,0x683B,0x683C,INVALC,
-	0x683D,INVALC,INVALC,INVALC,0x683E,INVALC,INVALC,0x683F,
-	0x6840,INVALC,0x6841,0x6842,INVALC,INVALC,INVALC,0x6843,
-	INVALC,INVALC,0x6844,INVALC,INVALC,0x6845,INVALC,INVALC,
-	0x6846,INVALC,INVALC,INVALC,0x6847,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6848,INVALC,0x6849,INVALC,0x684A,0x684B,0x684C,
-	INVALC,INVALC,0x684D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x684E,INVALC,INVALC,0x684F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 154, Array index 0x5200 */
-	INVALC,INVALC,0x6850,INVALC,INVALC,INVALC,INVALC,0x6851,
-	0x6852,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6853,INVALC,INVALC,INVALC,0x6854,0x6855,0x6856,
-	INVALC,INVALC,0x6857,0x6858,0x6859,INVALC,INVALC,0x685A,
-	INVALC,INVALC,0x685B,INVALC,INVALC,INVALC,0x685C,0x685D,
-	INVALC,INVALC,INVALC,0x685E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x685F,0x6860,0x6861,0x6862,0x6863,INVALC,INVALC,
-	INVALC,0x6864,0x6865,0x6866,0x6867,INVALC,INVALC,INVALC,
-	0x6868,0x6869,INVALC,INVALC,INVALC,INVALC,0x686A,0x686B,
-	0x686C,INVALC,INVALC,INVALC,INVALC,0x686D,0x686E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x686F,INVALC,INVALC,INVALC,
-	0x6870,0x6871,INVALC,0x6872,0x6873,INVALC,0x6874,0x6875,
-	0x6876,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6877,INVALC,0x6878,INVALC,0x6879,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x687A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x687B,0x687C,0x687D,INVALC,INVALC,0x687E,INVALC,INVALC,
-	INVALC,0x6921,0x6922,INVALC,INVALC,0x6923,INVALC,0x6924,
-	INVALC,INVALC,INVALC,0x6925,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6926,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6927,0x6928,INVALC,INVALC,INVALC,
-	INVALC,0x6929,0x692A,INVALC,0x692B,INVALC,0x692C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x692D,
-	INVALC,INVALC,0x692E,0x692F,0x6930,INVALC,INVALC,INVALC,
-	0x6931,INVALC,INVALC,INVALC,0x6932,0x6933,INVALC,INVALC,
-	INVALC,0x6934,INVALC,INVALC,INVALC,0x6935,0x6936,INVALC,
-	/* Block 155, Array index 0x5300 */
-	INVALC,INVALC,0x6937,0x6938,0x6939,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x693A,0x693B,INVALC,INVALC,INVALC,
-	0x693C,0x693D,INVALC,INVALC,INVALC,INVALC,0x693E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x693F,INVALC,
-	0x6940,INVALC,0x6941,0x6942,0x6943,INVALC,INVALC,0x6944,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6945,0x6946,INVALC,
-	INVALC,INVALC,INVALC,0x6947,INVALC,0x6948,0x6949,INVALC,
-	0x694A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x694C,INVALC,INVALC,0x694D,INVALC,INVALC,0x694B,
-	INVALC,INVALC,0x694E,0x694F,0x6950,INVALC,0x6951,INVALC,
-	INVALC,0x6952,INVALC,INVALC,0x6953,INVALC,0x6954,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6955,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6956,INVALC,0x6957,INVALC,0x6958,0x6959,
-	INVALC,INVALC,0x695A,INVALC,0x695B,0x695C,0x695D,INVALC,
-	INVALC,0x695E,INVALC,0x695F,INVALC,INVALC,0x6960,0x6961,
-	INVALC,0x6962,INVALC,0x6963,INVALC,INVALC,0x6964,INVALC,
-	0x6965,INVALC,INVALC,INVALC,INVALC,INVALC,0x6966,INVALC,
-	0x6967,INVALC,0x6968,INVALC,INVALC,0x6969,0x696A,0x696B,
-	INVALC,INVALC,INVALC,0x696C,0x696D,INVALC,INVALC,INVALC,
-	0x696E,INVALC,INVALC,INVALC,0x696F,0x6970,INVALC,0x6971,
-	INVALC,0x6972,INVALC,INVALC,0x6973,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6974,0x6975,INVALC,0x6976,INVALC,INVALC,
-	INVALC,0x6977,0x6978,INVALC,INVALC,0x6979,INVALC,0x697A,
-	/* Block 156, Array index 0x5400 */
-	0x697B,0x697C,0x697D,0x697E,0x6A21,0x6A22,INVALC,INVALC,
-	0x6A23,0x6A24,INVALC,0x6A25,0x6A26,0x6A27,0x6A28,INVALC,
-	0x6A29,INVALC,0x6A2A,INVALC,INVALC,INVALC,0x6A2B,INVALC,
-	INVALC,0x6A2C,INVALC,0x6A2D,0x6A2E,INVALC,INVALC,INVALC,
-	0x6A2F,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A30,INVALC,
-	INVALC,INVALC,INVALC,0x6A31,INVALC,0x6A32,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6A33,0x6A34,0x6A35,INVALC,0x6A36,
-	INVALC,0x6A37,0x6A38,INVALC,INVALC,0x6A39,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6A3A,INVALC,INVALC,0x6A3B,0x6A3C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A3D,0x6A3E,0x6A3F,
-	INVALC,INVALC,INVALC,0x6A40,INVALC,INVALC,0x6A41,INVALC,
-	INVALC,0x6A42,INVALC,0x6A43,INVALC,0x6A44,0x6A45,INVALC,
-	0x6A46,INVALC,0x6A47,0x6A48,0x6A49,0x6A4A,0x6A4B,INVALC,
-	INVALC,INVALC,INVALC,0x6A4C,INVALC,0x6A4D,INVALC,0x6A4E,
-	0x6A4F,0x6A50,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A51,
-	0x6A52,INVALC,INVALC,INVALC,0x6A53,0x6A54,0x6A55,0x6A56,
-	INVALC,0x6A57,0x6A58,0x6A59,INVALC,0x6A5A,INVALC,0x6A5B,
-	0x6A5C,INVALC,INVALC,INVALC,0x6A5D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6A5E,INVALC,INVALC,0x6A5F,0x6A60,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A61,0x6A62,
-	INVALC,0x6A63,INVALC,INVALC,0x6A64,INVALC,INVALC,INVALC,
-	0x6A65,0x6A66,0x6A67,INVALC,INVALC,INVALC,INVALC,0x6A68,
-	0x6A69,INVALC,INVALC,0x6A6A,0x6A6B,INVALC,0x6A6C,0x6A6D,
-	INVALC,0x6A6E,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A6F,
-	0x6A70,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A71,INVALC,
-	0x6A72,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A73,
-	0x6A74,INVALC,INVALC,INVALC,INVALC,0x6A75,INVALC,0x6A76,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6A77,INVALC,0x6A78,
-	INVALC,INVALC,0x6A79,0x6A7A,INVALC,INVALC,INVALC,0x6A7B,
-	INVALC,INVALC,INVALC,0x6A7C,INVALC,INVALC,INVALC,0x6A7D,
-	0x6A7E,0x6B21,0x6B22,INVALC,INVALC,0x6B23,INVALC,0x6B24,
-	/* Block 157, Array index 0x5500 */
-	0x6B25,INVALC,0x6B26,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6B27,INVALC,INVALC,INVALC,0x6B28,
-	INVALC,0x6B29,INVALC,INVALC,INVALC,INVALC,0x6B2A,INVALC,
-	0x6B2B,0x6B2C,0x6B2D,INVALC,0x6B2E,INVALC,0x6B2F,INVALC,
-	INVALC,INVALC,0x6B30,0x6B31,INVALC,INVALC,0x6B32,0x6B33,
-	0x6B34,0x6B35,0x6B36,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B37,INVALC,INVALC,INVALC,0x6B38,0x6B39,0x6B3A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6B3B,INVALC,INVALC,
-	INVALC,0x6B3C,INVALC,0x6B3D,0x6B3E,0x6B3F,INVALC,INVALC,
-	INVALC,0x6B40,0x6B41,INVALC,INVALC,INVALC,0x6B42,0x6B43,
-	0x6B44,INVALC,INVALC,0x6B45,0x6B46,INVALC,0x6B47,INVALC,
-	0x6B48,INVALC,INVALC,0x6B49,0x6B50,0x6B4A,0x6B4B,0x6B4C,
-	INVALC,INVALC,INVALC,0x6B4D,INVALC,INVALC,INVALC,INVALC,
-	0x6B52,0x6B4E,0x6B4F,0x6B51,INVALC,INVALC,0x6B53,INVALC,
-	0x6B54,INVALC,0x6B55,INVALC,INVALC,0x6B56,INVALC,0x6B57,
-	INVALC,INVALC,INVALC,0x6B58,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B59,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6B5A,INVALC,INVALC,INVALC,INVALC,0x6B5B,
-	INVALC,0x6B5C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 158, Array index 0x5600 */
-	INVALC,INVALC,0x6B5E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6B5D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B5F,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B60,
-	0x6B61,INVALC,INVALC,INVALC,0x6B62,0x6B63,0x6B64,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B65,
-	0x6B66,INVALC,0x6B67,0x6B68,0x6B69,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6B6A,INVALC,0x6B6B,0x6B6D,INVALC,INVALC,
-	INVALC,INVALC,0x6B6E,0x6B6F,INVALC,0x6B6C,INVALC,0x6B70,
-	INVALC,INVALC,0x6B71,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6B72,0x6B73,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B74,
-	INVALC,INVALC,0x6B76,0x6B75,INVALC,0x6B77,INVALC,INVALC,
-	INVALC,0x6B78,0x6B79,0x6B7A,INVALC,INVALC,INVALC,INVALC,
-	0x6B7B,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B7C,0x6B7D,
-	INVALC,INVALC,INVALC,0x6B7E,0x6C21,INVALC,0x6C22,INVALC,
-	INVALC,INVALC,INVALC,0x6C23,0x6C24,INVALC,0x6C25,INVALC,
-	INVALC,INVALC,0x6C26,INVALC,INVALC,0x6C27,0x6C28,INVALC,
-	INVALC,INVALC,0x6C29,0x6C2A,INVALC,0x6C2B,0x6C2C,0x6C2D,
-	0x6C2E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6C2F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6C30,INVALC,0x6C31,INVALC,0x6C32,INVALC,
-	INVALC,0x6C33,INVALC,INVALC,INVALC,0x6C34,INVALC,INVALC,
-	INVALC,0x6C35,INVALC,INVALC,0x6C36,INVALC,INVALC,0x6C37,
-	INVALC,INVALC,INVALC,0x6C38,INVALC,INVALC,INVALC,0x6C39,
-	INVALC,0x6C3A,0x6C3B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6C3C,0x6C3D,0x6C3E,0x6C3F,
-	INVALC,INVALC,0x6C40,INVALC,INVALC,INVALC,0x6C41,0x6C42,
-	0x6C43,INVALC,INVALC,INVALC,INVALC,0x6C44,INVALC,0x6C45,
-	INVALC,0x6C46,INVALC,0x6C47,INVALC,INVALC,0x6C48,INVALC,
-	0x6C49,INVALC,INVALC,0x6C4A,0x6C4B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6C4C,INVALC,
-	/* Block 159, Array index 0x5700 */
-	INVALC,INVALC,0x6C4E,INVALC,INVALC,INVALC,INVALC,0x6C4F,
-	INVALC,INVALC,0x6C4D,INVALC,INVALC,INVALC,0x6C50,INVALC,
-	0x6C51,0x6C52,0x6C53,INVALC,INVALC,0x6C54,0x6C55,INVALC,
-	INVALC,0x6C56,INVALC,INVALC,0x6C57,0x6C58,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6C59,0x6C5A,0x6C5B,INVALC,INVALC,INVALC,
-	0x6C5C,INVALC,0x6C5D,0x6C5E,0x6C5F,0x6C60,INVALC,0x6C61,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6C62,0x6C63,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6C64,INVALC,
-	0x6C65,INVALC,INVALC,0x6C66,INVALC,INVALC,0x6C67,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6C68,INVALC,INVALC,INVALC,
-	0x6C69,INVALC,INVALC,INVALC,0x6C6A,INVALC,0x6C6B,0x6C6C,
-	0x6C6D,INVALC,INVALC,0x6C6E,0x6C6F,0x6C70,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6C71,INVALC,
-	0x6C72,INVALC,INVALC,0x6C73,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6C74,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6C75,
-	INVALC,INVALC,INVALC,INVALC,0x6C76,INVALC,INVALC,0x6C77,
-	INVALC,INVALC,INVALC,INVALC,0x6C78,0x6C79,0x6C7A,INVALC,
-	0x6C7B,0x6C7C,0x6C7D,INVALC,INVALC,0x6C7E,INVALC,INVALC,
-	0x6D21,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D22,
-	/* Block 160, Array index 0x5800 */
-	INVALC,INVALC,0x6D23,0x6D24,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6D25,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D26,
-	0x6D27,0x6D28,0x6D29,INVALC,0x6D2A,INVALC,0x6D2B,0x6D2C,
-	INVALC,0x6D2D,0x6D2E,0x6D2F,INVALC,INVALC,INVALC,0x6D30,
-	INVALC,INVALC,0x6D31,INVALC,INVALC,INVALC,0x6D32,INVALC,
-	INVALC,INVALC,0x6D33,0x6D34,INVALC,INVALC,INVALC,0x6D35,
-	INVALC,0x6D36,0x6D37,INVALC,0x6D38,INVALC,INVALC,0x6D39,
-	INVALC,0x6D3A,0x6D3B,INVALC,0x6D3C,0x6D3D,INVALC,0x6D3E,
-	INVALC,0x6D3F,INVALC,0x6D40,0x6D41,0x6D42,0x6D43,0x6D44,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6D45,INVALC,0x6D46,0x6D47,0x6D48,
-	0x6D49,INVALC,0x6D4A,INVALC,INVALC,0x6D4B,0x6D4C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6D4D,0x6D4E,INVALC,INVALC,INVALC,0x6D4F,0x6D50,0x6D51,
-	0x6D52,0x6D53,INVALC,0x6D54,INVALC,0x6D55,INVALC,INVALC,
-	INVALC,INVALC,0x6D56,INVALC,INVALC,0x6D57,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D58,
-	0x6D59,0x6D5A,0x6D5B,INVALC,0x6D5C,INVALC,0x6D5D,0x6D5E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D5F,INVALC,
-	INVALC,0x6D60,0x6D61,0x6D62,INVALC,0x6D63,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_JIS_X0212_1990 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> jis_x0212_1990 size-optimized table (23194 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_size_jis_x0212_1990[] =
-{
-	0x01AA, /* Ranges number */
-	0x0E83, /* Unranged codes number */
-	0x1047, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x00BF, 0x017E, 0x0501,
-	/* Array index: 0x0006 */ 0x01CD, 0x01DC, 0x05C1,
-	/* Array index: 0x0009 */ 0x02D8, 0x02DD, 0x05D1,
-	/* Array index: 0x000C */ 0x0384, 0x0390, 0x05D7,
-	/* Array index: 0x000F */ 0x03AA, 0x03B0, 0x05E4,
-	/* Array index: 0x0012 */ 0x03CA, 0x03CE, 0x05EB,
-	/* Array index: 0x0015 */ 0x0402, 0x040F, 0x05F0,
-	/* Array index: 0x0018 */ 0x0452, 0x045F, 0x05FE,
-	/* Array index: 0x001B */ 0x4E2E, 0x4E30, 0x060C,
-	/* Array index: 0x001E */ 0x4EE0, 0x4EE2, 0x060F,
-	/* Array index: 0x0021 */ 0x4EFD, 0x4F03, 0x0612,
-	/* Array index: 0x0024 */ 0x4F15, 0x4F19, 0x0619,
-	/* Array index: 0x0027 */ 0x4F48, 0x4F4C, 0x061E,
-	/* Array index: 0x002A */ 0x4F77, 0x4F85, 0x0623,
-	/* Array index: 0x002D */ 0x4F90, 0x4F94, 0x0632,
-	/* Array index: 0x0030 */ 0x4FB9, 0x4FC1, 0x0637,
-	/* Array index: 0x0033 */ 0x4FC5, 0x4FCF, 0x0640,
-	/* Array index: 0x0036 */ 0x4FFC, 0x5001, 0x064B,
-	/* Array index: 0x0039 */ 0x5017, 0x501E, 0x0651,
-	/* Array index: 0x003C */ 0x5040, 0x5046, 0x0659,
-	/* Array index: 0x003F */ 0x5051, 0x5053, 0x0660,
-	/* Array index: 0x0042 */ 0x505F, 0x5067, 0x0663,
-	/* Array index: 0x0045 */ 0x508E, 0x5096, 0x066C,
-	/* Array index: 0x0048 */ 0x509B, 0x50A2, 0x0675,
-	/* Array index: 0x004B */ 0x5106, 0x5110, 0x067D,
-	/* Array index: 0x004E */ 0x5119, 0x511E, 0x0688,
-	/* Array index: 0x0051 */ 0x5131, 0x5139, 0x068E,
-	/* Array index: 0x0054 */ 0x51CF, 0x51D5, 0x0697,
-	/* Array index: 0x0057 */ 0x51F2, 0x51F4, 0x069E,
-	/* Array index: 0x005A */ 0x5212, 0x5218, 0x06A1,
-	/* Array index: 0x005D */ 0x525F, 0x5261, 0x06A8,
-	/* Array index: 0x0060 */ 0x5277, 0x5279, 0x06AB,
-	/* Array index: 0x0063 */ 0x5293, 0x529C, 0x06AE,
-	/* Array index: 0x0066 */ 0x52A4, 0x52A7, 0x06B8,
-	/* Array index: 0x0069 */ 0x52B6, 0x52BD, 0x06BC,
-	/* Array index: 0x006C */ 0x52E8, 0x52EC, 0x06C4,
-	/* Array index: 0x006F */ 0x530A, 0x530C, 0x06C9,
-	/* Array index: 0x0072 */ 0x531B, 0x531F, 0x06CC,
-	/* Array index: 0x0075 */ 0x5325, 0x532D, 0x06D1,
-	/* Array index: 0x0078 */ 0x533C, 0x533E, 0x06DA,
-	/* Array index: 0x007B */ 0x53B4, 0x53BA, 0x06DD,
-	/* Array index: 0x007E */ 0x54A6, 0x54AE, 0x06E4,
-	/* Array index: 0x0081 */ 0x54B7, 0x54BB, 0x06ED,
-	/* Array index: 0x0084 */ 0x54FC, 0x5501, 0x06F2,
-	/* Array index: 0x0087 */ 0x5508, 0x550E, 0x06F8,
-	/* Array index: 0x008A */ 0x553B, 0x553D, 0x06FF,
-	/* Array index: 0x008D */ 0x558E, 0x5594, 0x0702,
-	/* Array index: 0x0090 */ 0x55D1, 0x55D3, 0x0709,
-	/* Array index: 0x0093 */ 0x560D, 0x5612, 0x070C,
-	/* Array index: 0x0096 */ 0x5639, 0x5646, 0x0712,
-	/* Array index: 0x0099 */ 0x565E, 0x5663, 0x0720,
-	/* Array index: 0x009C */ 0x5699, 0x569F, 0x0726,
-	/* Array index: 0x009F */ 0x56A6, 0x56AD, 0x072D,
-	/* Array index: 0x00A2 */ 0x56C9, 0x56D0, 0x0735,
-	/* Array index: 0x00A5 */ 0x56E4, 0x56E8, 0x073D,
-	/* Array index: 0x00A8 */ 0x5720, 0x5725, 0x0742,
-	/* Array index: 0x00AB */ 0x573D, 0x573F, 0x0748,
-	/* Array index: 0x00AE */ 0x576B, 0x577E, 0x074B,
-	/* Array index: 0x00B1 */ 0x5799, 0x57A1, 0x075F,
-	/* Array index: 0x00B4 */ 0x57A7, 0x57A9, 0x0768,
-	/* Array index: 0x00B7 */ 0x57FD, 0x57FF, 0x076B,
-	/* Array index: 0x00BA */ 0x581E, 0x5820, 0x076E,
-	/* Array index: 0x00BD */ 0x584C, 0x5850, 0x0771,
-	/* Array index: 0x00C0 */ 0x587F, 0x5881, 0x0776,
-	/* Array index: 0x00C3 */ 0x5887, 0x5890, 0x0779,
-	/* Array index: 0x00C6 */ 0x58A0, 0x58A2, 0x0783,
-	/* Array index: 0x00C9 */ 0x5912, 0x5914, 0x0786,
-	/* Array index: 0x00CC */ 0x595B, 0x5963, 0x0789,
-	/* Array index: 0x00CF */ 0x59AD, 0x59B0, 0x0792,
-	/* Array index: 0x00D2 */ 0x59DD, 0x59DF, 0x0796,
-	/* Array index: 0x00D5 */ 0x59EE, 0x59F4, 0x0799,
-	/* Array index: 0x00D8 */ 0x5A0C, 0x5A0E, 0x07A0,
-	/* Array index: 0x00DB */ 0x5A44, 0x5A48, 0x07A3,
-	/* Array index: 0x00DE */ 0x5A9C, 0x5AA2, 0x07A8,
-	/* Array index: 0x00E1 */ 0x5AB1, 0x5AB5, 0x07AF,
-	/* Array index: 0x00E4 */ 0x5B7C, 0x5B81, 0x07B4,
-	/* Array index: 0x00E7 */ 0x5B90, 0x5B96, 0x07BA,
-	/* Array index: 0x00EA */ 0x5BD6, 0x5BDA, 0x07C1,
-	/* Array index: 0x00ED */ 0x5C67, 0x5C69, 0x07C6,
-	/* Array index: 0x00F0 */ 0x5C7A, 0x5C7D, 0x07C9,
-	/* Array index: 0x00F3 */ 0x5C9F, 0x5CA3, 0x07CD,
-	/* Array index: 0x00F6 */ 0x5D23, 0x5D27, 0x07D2,
-	/* Array index: 0x00F9 */ 0x5D5F, 0x5D64, 0x07D7,
-	/* Array index: 0x00FC */ 0x5D92, 0x5D95, 0x07DD,
-	/* Array index: 0x00FF */ 0x5E68, 0x5E70, 0x07E1,
-	/* Array index: 0x0102 */ 0x5EBD, 0x5EBF, 0x07EA,
-	/* Array index: 0x0105 */ 0x5ED1, 0x5ED5, 0x07ED,
-	/* Array index: 0x0108 */ 0x5F06, 0x5F08, 0x07F2,
-	/* Array index: 0x010B */ 0x5F21, 0x5F24, 0x07F5,
-	/* Array index: 0x010E */ 0x5FAB, 0x5FB1, 0x07F9,
-	/* Array index: 0x0111 */ 0x5FC7, 0x5FCB, 0x0800,
-	/* Array index: 0x0114 */ 0x5FD0, 0x5FD4, 0x0805,
-	/* Array index: 0x0117 */ 0x5FE8, 0x5FF3, 0x080A,
-	/* Array index: 0x011A */ 0x6047, 0x6049, 0x0816,
-	/* Array index: 0x011D */ 0x60C8, 0x60CF, 0x0819,
-	/* Array index: 0x0120 */ 0x6110, 0x6119, 0x0821,
-	/* Array index: 0x0123 */ 0x6135, 0x6139, 0x082B,
-	/* Array index: 0x0126 */ 0x617B, 0x6184, 0x0830,
-	/* Array index: 0x0129 */ 0x619C, 0x61A0, 0x083A,
-	/* Array index: 0x012C */ 0x61C0, 0x61C2, 0x083F,
-	/* Array index: 0x012F */ 0x61DC, 0x61E2, 0x0842,
-	/* Array index: 0x0132 */ 0x6242, 0x6246, 0x0849,
-	/* Array index: 0x0135 */ 0x6250, 0x6256, 0x084E,
-	/* Array index: 0x0138 */ 0x628D, 0x6290, 0x0855,
-	/* Array index: 0x013B */ 0x6341, 0x6346, 0x0859,
-	/* Array index: 0x013E */ 0x6352, 0x6354, 0x085F,
-	/* Array index: 0x0141 */ 0x63AD, 0x63AF, 0x0862,
-	/* Array index: 0x0144 */ 0x63D1, 0x63D5, 0x0865,
-	/* Array index: 0x0147 */ 0x644F, 0x6454, 0x086A,
-	/* Array index: 0x014A */ 0x645A, 0x6463, 0x0870,
-	/* Array index: 0x014D */ 0x648F, 0x6491, 0x087A,
-	/* Array index: 0x0150 */ 0x64BD, 0x64BF, 0x087D,
-	/* Array index: 0x0153 */ 0x64C9, 0x64D1, 0x0880,
-	/* Array index: 0x0156 */ 0x6508, 0x650A, 0x0889,
-	/* Array index: 0x0159 */ 0x65B2, 0x65B4, 0x088C,
-	/* Array index: 0x015C */ 0x65FE, 0x6600, 0x088F,
-	/* Array index: 0x015F */ 0x661D, 0x6633, 0x0892,
-	/* Array index: 0x0162 */ 0x6657, 0x665C, 0x08A9,
-	/* Array index: 0x0165 */ 0x666A, 0x666C, 0x08AF,
-	/* Array index: 0x0168 */ 0x6675, 0x6680, 0x08B2,
-	/* Array index: 0x016B */ 0x668B, 0x668D, 0x08BE,
-	/* Array index: 0x016E */ 0x6699, 0x66A0, 0x08C1,
-	/* Array index: 0x0171 */ 0x66BF, 0x66C3, 0x08C9,
-	/* Array index: 0x0174 */ 0x67B0, 0x67B2, 0x08CE,
-	/* Array index: 0x0177 */ 0x67BB, 0x67BD, 0x08D1,
-	/* Array index: 0x017A */ 0x682C, 0x6833, 0x08D4,
-	/* Array index: 0x017D */ 0x686E, 0x6872, 0x08DC,
-	/* Array index: 0x0180 */ 0x6879, 0x687C, 0x08E1,
-	/* Array index: 0x0183 */ 0x68CF, 0x68D3, 0x08E5,
-	/* Array index: 0x0186 */ 0x68E8, 0x68F1, 0x08EA,
-	/* Array index: 0x0189 */ 0x68FB, 0x68FD, 0x08F4,
-	/* Array index: 0x018C */ 0x6963, 0x6969, 0x08F7,
-	/* Array index: 0x018F */ 0x6970, 0x6972, 0x08FE,
-	/* Array index: 0x0192 */ 0x6A4E, 0x6A56, 0x0901,
-	/* Array index: 0x0195 */ 0x6A9B, 0x6A9F, 0x090A,
-	/* Array index: 0x0198 */ 0x6AAF, 0x6AB1, 0x090F,
-	/* Array index: 0x019B */ 0x6ABD, 0x6ABF, 0x0912,
-	/* Array index: 0x019E */ 0x6AD4, 0x6AD6, 0x0915,
-	/* Array index: 0x01A1 */ 0x6AF0, 0x6AF2, 0x0918,
-	/* Array index: 0x01A4 */ 0x6B0F, 0x6B11, 0x091B,
-	/* Array index: 0x01A7 */ 0x6B9F, 0x6BA3, 0x091E,
-	/* Array index: 0x01AA */ 0x6BA8, 0x6BB0, 0x0923,
-	/* Array index: 0x01AD */ 0x6C26, 0x6C28, 0x092C,
-	/* Array index: 0x01B0 */ 0x6C85, 0x6C89, 0x092F,
-	/* Array index: 0x01B3 */ 0x6C94, 0x6C98, 0x0934,
-	/* Array index: 0x01B6 */ 0x6CCD, 0x6CD6, 0x0939,
-	/* Array index: 0x01B9 */ 0x6D26, 0x6D28, 0x0943,
-	/* Array index: 0x01BC */ 0x6D94, 0x6D98, 0x0946,
-	/* Array index: 0x01BF */ 0x6E4F, 0x6E54, 0x094B,
-	/* Array index: 0x01C2 */ 0x6E5C, 0x6E5E, 0x0951,
-	/* Array index: 0x01C5 */ 0x6EBF, 0x6EC3, 0x0954,
-	/* Array index: 0x01C8 */ 0x6ECD, 0x6ECF, 0x0959,
-	/* Array index: 0x01CB */ 0x6F4F, 0x6F53, 0x095C,
-	/* Array index: 0x01CE */ 0x6F87, 0x6F8D, 0x0961,
-	/* Array index: 0x01D1 */ 0x6F90, 0x6F96, 0x0968,
-	/* Array index: 0x01D4 */ 0x6FA5, 0x6FA8, 0x096F,
-	/* Array index: 0x01D7 */ 0x6FAE, 0x6FB0, 0x0973,
-	/* Array index: 0x01DA */ 0x7005, 0x7007, 0x0976,
-	/* Array index: 0x01DD */ 0x7048, 0x704B, 0x0979,
-	/* Array index: 0x01E0 */ 0x7094, 0x7098, 0x097D,
-	/* Array index: 0x01E3 */ 0x70D1, 0x70D8, 0x0982,
-	/* Array index: 0x01E6 */ 0x7103, 0x7107, 0x098A,
-	/* Array index: 0x01E9 */ 0x712D, 0x7131, 0x098F,
-	/* Array index: 0x01EC */ 0x7145, 0x714B, 0x0994,
-	/* Array index: 0x01EF */ 0x71AF, 0x71B3, 0x099B,
-	/* Array index: 0x01F2 */ 0x71BF, 0x71C1, 0x09A0,
-	/* Array index: 0x01F5 */ 0x7207, 0x7209, 0x09A3,
-	/* Array index: 0x01F8 */ 0x7241, 0x7245, 0x09A6,
-	/* Array index: 0x01FB */ 0x724E, 0x7250, 0x09AB,
-	/* Array index: 0x01FE */ 0x735D, 0x7360, 0x09AE,
-	/* Array index: 0x0201 */ 0x736B, 0x7371, 0x09B2,
-	/* Array index: 0x0204 */ 0x739C, 0x73A6, 0x09B9,
-	/* Array index: 0x0207 */ 0x73F7, 0x7401, 0x09C4,
-	/* Array index: 0x020A */ 0x7426, 0x7431, 0x09CF,
-	/* Array index: 0x020D */ 0x7443, 0x7447, 0x09DB,
-	/* Array index: 0x0210 */ 0x7466, 0x7468, 0x09E0,
-	/* Array index: 0x0213 */ 0x7485, 0x7489, 0x09E3,
-	/* Array index: 0x0216 */ 0x748F, 0x7492, 0x09E8,
-	/* Array index: 0x0219 */ 0x7498, 0x74A3, 0x09EC,
-	/* Array index: 0x021C */ 0x74A6, 0x74B2, 0x09F8,
-	/* Array index: 0x021F */ 0x74FA, 0x74FC, 0x0A05,
-	/* Array index: 0x0222 */ 0x753D, 0x7540, 0x0A08,
-	/* Array index: 0x0225 */ 0x7579, 0x757E, 0x0A0C,
-	/* Array index: 0x0228 */ 0x75BF, 0x75C1, 0x0A12,
-	/* Array index: 0x022B */ 0x75DF, 0x75E1, 0x0A15,
-	/* Array index: 0x022E */ 0x7600, 0x760C, 0x0A18,
-	/* Array index: 0x0231 */ 0x7612, 0x7616, 0x0A25,
-	/* Array index: 0x0234 */ 0x7619, 0x761E, 0x0A2A,
-	/* Array index: 0x0237 */ 0x7638, 0x763C, 0x0A30,
-	/* Array index: 0x023A */ 0x7640, 0x764B, 0x0A35,
-	/* Array index: 0x023D */ 0x766D, 0x7671, 0x0A41,
-	/* Array index: 0x0240 */ 0x769B, 0x76AA, 0x0A46,
-	/* Array index: 0x0243 */ 0x772D, 0x772F, 0x0A56,
-	/* Array index: 0x0246 */ 0x7734, 0x7736, 0x0A59,
-	/* Array index: 0x0249 */ 0x774D, 0x774F, 0x0A5C,
-	/* Array index: 0x024C */ 0x775C, 0x7764, 0x0A5F,
-	/* Array index: 0x024F */ 0x7770, 0x7774, 0x0A68,
-	/* Array index: 0x0252 */ 0x7794, 0x7796, 0x0A6D,
-	/* Array index: 0x0255 */ 0x77DE, 0x77E0, 0x0A70,
-	/* Array index: 0x0258 */ 0x7821, 0x7823, 0x0A73,
-	/* Array index: 0x025B */ 0x7860, 0x7864, 0x0A76,
-	/* Array index: 0x025E */ 0x789D, 0x78A1, 0x0A7B,
-	/* Array index: 0x0261 */ 0x78AC, 0x78B3, 0x0A80,
-	/* Array index: 0x0264 */ 0x78C7, 0x78C9, 0x0A88,
-	/* Array index: 0x0267 */ 0x78D2, 0x78D6, 0x0A8B,
-	/* Array index: 0x026A */ 0x78DF, 0x78E1, 0x0A90,
-	/* Array index: 0x026D */ 0x791C, 0x7920, 0x0A93,
-	/* Array index: 0x0270 */ 0x7944, 0x7946, 0x0A98,
-	/* Array index: 0x0273 */ 0x7991, 0x799C, 0x0A9B,
-	/* Array index: 0x0276 */ 0x7A34, 0x7A3A, 0x0AA7,
-	/* Array index: 0x0279 */ 0x7A44, 0x7A48, 0x0AAE,
-	/* Array index: 0x027C */ 0x7A5C, 0x7A60, 0x0AB3,
-	/* Array index: 0x027F */ 0x7AE8, 0x7AEC, 0x0AB8,
-	/* Array index: 0x0282 */ 0x7B27, 0x7B31, 0x0ABD,
-	/* Array index: 0x0285 */ 0x7B3D, 0x7B41, 0x0AC8,
-	/* Array index: 0x0288 */ 0x7BBA, 0x7BBD, 0x0ACD,
-	/* Array index: 0x028B */ 0x7BD6, 0x7BDB, 0x0AD1,
-	/* Array index: 0x028E */ 0x7BF4, 0x7C06, 0x0AD7,
-	/* Array index: 0x0291 */ 0x7C0B, 0x7C0F, 0x0AEA,
-	/* Array index: 0x0294 */ 0x7C51, 0x7C5E, 0x0AEF,
-	/* Array index: 0x0297 */ 0x7CB6, 0x7CBC, 0x0AFD,
-	/* Array index: 0x029A */ 0x7CC7, 0x7CC9, 0x0B04,
-	/* Array index: 0x029D */ 0x7CD3, 0x7CDA, 0x0B07,
-	/* Array index: 0x02A0 */ 0x7D07, 0x7D09, 0x0B0F,
-	/* Array index: 0x02A3 */ 0x7D0F, 0x7D13, 0x0B12,
-	/* Array index: 0x02A6 */ 0x7D3C, 0x7D41, 0x0B17,
-	/* Array index: 0x02A9 */ 0x7D59, 0x7D5D, 0x0B1D,
-	/* Array index: 0x02AC */ 0x7D7F, 0x7D8D, 0x0B22,
-	/* Array index: 0x02AF */ 0x7DC2, 0x7DC6, 0x0B31,
-	/* Array index: 0x02B2 */ 0x7DCC, 0x7DCE, 0x0B36,
-	/* Array index: 0x02B5 */ 0x7F3B, 0x7F3F, 0x0B39,
-	/* Array index: 0x02B8 */ 0x7F5B, 0x7F5D, 0x0B3E,
-	/* Array index: 0x02BB */ 0x7F61, 0x7F66, 0x0B41,
-	/* Array index: 0x02BE */ 0x7F7D, 0x7F80, 0x0B47,
-	/* Array index: 0x02C1 */ 0x7F8D, 0x7F91, 0x0B4B,
-	/* Array index: 0x02C4 */ 0x7FFD, 0x7FFF, 0x0B50,
-	/* Array index: 0x02C7 */ 0x800D, 0x8016, 0x0B53,
-	/* Array index: 0x02CA */ 0x801D, 0x8020, 0x0B5D,
-	/* Array index: 0x02CD */ 0x80D4, 0x80D8, 0x0B61,
-	/* Array index: 0x02D0 */ 0x8116, 0x8118, 0x0B66,
-	/* Array index: 0x02D3 */ 0x8167, 0x8169, 0x0B69,
-	/* Array index: 0x02D6 */ 0x8184, 0x8186, 0x0B6C,
-	/* Array index: 0x02D9 */ 0x81F0, 0x81F9, 0x0B6F,
-	/* Array index: 0x02DC */ 0x8243, 0x8246, 0x0B79,
-	/* Array index: 0x02DF */ 0x827D, 0x8284, 0x0B7D,
-	/* Array index: 0x02E2 */ 0x82A0, 0x82AA, 0x0B85,
-	/* Array index: 0x02E5 */ 0x82FD, 0x8301, 0x0B90,
-	/* Array index: 0x02E8 */ 0x8307, 0x830B, 0x0B95,
-	/* Array index: 0x02EB */ 0x831B, 0x8322, 0x0B9A,
-	/* Array index: 0x02EE */ 0x832C, 0x8330, 0x0BA2,
-	/* Array index: 0x02F1 */ 0x8342, 0x8344, 0x0BA7,
-	/* Array index: 0x02F4 */ 0x8351, 0x8357, 0x0BAA,
-	/* Array index: 0x02F7 */ 0x8398, 0x839D, 0x0BB1,
-	/* Array index: 0x02FA */ 0x83BE, 0x83C0, 0x0BB7,
-	/* Array index: 0x02FD */ 0x83CF, 0x83D1, 0x0BBA,
-	/* Array index: 0x0300 */ 0x8456, 0x845C, 0x0BBD,
-	/* Array index: 0x0303 */ 0x84A6, 0x84AA, 0x0BC4,
-	/* Array index: 0x0306 */ 0x84EF, 0x84F2, 0x0BC9,
-	/* Array index: 0x0309 */ 0x8522, 0x852B, 0x0BCD,
-	/* Array index: 0x030C */ 0x8532, 0x8536, 0x0BD7,
-	/* Array index: 0x030F */ 0x854F, 0x8553, 0x0BDC,
-	/* Array index: 0x0312 */ 0x855C, 0x8564, 0x0BE1,
-	/* Array index: 0x0315 */ 0x8579, 0x8581, 0x0BEA,
-	/* Array index: 0x0318 */ 0x85B4, 0x85BF, 0x0BF3,
-	/* Array index: 0x031B */ 0x860D, 0x8612, 0x0BFF,
-	/* Array index: 0x031E */ 0x863C, 0x8642, 0x0C05,
-	/* Array index: 0x0321 */ 0x8652, 0x8659, 0x0C0C,
-	/* Array index: 0x0324 */ 0x8660, 0x8664, 0x0C14,
-	/* Array index: 0x0327 */ 0x8675, 0x8677, 0x0C19,
-	/* Array index: 0x032A */ 0x86A6, 0x86A8, 0x0C1C,
-	/* Array index: 0x032D */ 0x86B1, 0x86B9, 0x0C1F,
-	/* Array index: 0x0330 */ 0x86BF, 0x86C5, 0x0C28,
-	/* Array index: 0x0333 */ 0x870E, 0x8714, 0x0C2F,
-	/* Array index: 0x0336 */ 0x872E, 0x8732, 0x0C36,
-	/* Array index: 0x0339 */ 0x8739, 0x8740, 0x0C3B,
-	/* Array index: 0x033C */ 0x8783, 0x878C, 0x0C43,
-	/* Array index: 0x033F */ 0x8795, 0x8799, 0x0C4D,
-	/* Array index: 0x0342 */ 0x87AC, 0x87AE, 0x0C52,
-	/* Array index: 0x0345 */ 0x87C8, 0x87CA, 0x0C55,
-	/* Array index: 0x0348 */ 0x87E2, 0x87E4, 0x0C58,
-	/* Array index: 0x034B */ 0x8809, 0x880B, 0x0C5B,
-	/* Array index: 0x034E */ 0x8810, 0x881F, 0x0C5E,
-	/* Array index: 0x0351 */ 0x8848, 0x884B, 0x0C6E,
-	/* Array index: 0x0354 */ 0x8898, 0x88A0, 0x0C72,
-	/* Array index: 0x0357 */ 0x88CA, 0x88D3, 0x0C7B,
-	/* Array index: 0x035A */ 0x88EF, 0x88F1, 0x0C85,
-	/* Array index: 0x035D */ 0x890D, 0x890F, 0x0C88,
-	/* Array index: 0x0360 */ 0x8915, 0x891C, 0x0C8B,
-	/* Array index: 0x0363 */ 0x8926, 0x8928, 0x0C93,
-	/* Array index: 0x0366 */ 0x8930, 0x8932, 0x0C96,
-	/* Array index: 0x0369 */ 0x895A, 0x895C, 0x0C99,
-	/* Array index: 0x036C */ 0x8961, 0x8963, 0x0C9C,
-	/* Array index: 0x036F */ 0x897A, 0x897D, 0x0C9F,
-	/* Array index: 0x0372 */ 0x89B4, 0x89B7, 0x0CA3,
-	/* Array index: 0x0375 */ 0x89D4, 0x89D8, 0x0CA7,
-	/* Array index: 0x0378 */ 0x8A11, 0x8A15, 0x0CAC,
-	/* Array index: 0x037B */ 0x8A56, 0x8A58, 0x0CB1,
-	/* Array index: 0x037E */ 0x8A75, 0x8A80, 0x0CB4,
-	/* Array index: 0x0381 */ 0x8AC6, 0x8ACA, 0x0CC0,
-	/* Array index: 0x0384 */ 0x8AD1, 0x8AD7, 0x0CC5,
-	/* Array index: 0x0387 */ 0x8AF4, 0x8AF6, 0x0CCC,
-	/* Array index: 0x038A */ 0x8B42, 0x8B48, 0x0CCF,
-	/* Array index: 0x038D */ 0x8B52, 0x8B54, 0x0CD6,
-	/* Array index: 0x0390 */ 0x8C53, 0x8C5D, 0x0CD9,
-	/* Array index: 0x0393 */ 0x8D9E, 0x8DA0, 0x0CE4,
-	/* Array index: 0x0396 */ 0x8DC5, 0x8DCA, 0x0CE7,
-	/* Array index: 0x0399 */ 0x8DF0, 0x8DF4, 0x0CED,
-	/* Array index: 0x039C */ 0x8E04, 0x8E06, 0x0CF2,
-	/* Array index: 0x039F */ 0x8E20, 0x8E27, 0x0CF5,
-	/* Array index: 0x03A2 */ 0x8E36, 0x8E39, 0x0CFD,
-	/* Array index: 0x03A5 */ 0x8E4B, 0x8E4F, 0x0D01,
-	/* Array index: 0x03A8 */ 0x8E5B, 0x8E62, 0x0D06,
-	/* Array index: 0x03AB */ 0x8E6C, 0x8E71, 0x0D0E,
-	/* Array index: 0x03AE */ 0x8E79, 0x8E7B, 0x0D14,
-	/* Array index: 0x03B1 */ 0x8E9A, 0x8E9E, 0x0D17,
-	/* Array index: 0x03B4 */ 0x8EC0, 0x8EC4, 0x0D1C,
-	/* Array index: 0x03B7 */ 0x8EED, 0x8EF1, 0x0D21,
-	/* Array index: 0x03BA */ 0x8F16, 0x8F18, 0x0D26,
-	/* Array index: 0x03BD */ 0x8F2C, 0x8F2E, 0x0D29,
-	/* Array index: 0x03C0 */ 0x8F34, 0x8F37, 0x0D2C,
-	/* Array index: 0x03C3 */ 0x8F4F, 0x8F55, 0x0D30,
-	/* Array index: 0x03C6 */ 0x8FA0, 0x8FA6, 0x0D37,
-	/* Array index: 0x03C9 */ 0x9028, 0x902F, 0x0D3E,
-	/* Array index: 0x03CC */ 0x9095, 0x909B, 0x0D46,
-	/* Array index: 0x03CF */ 0x90A0, 0x90A2, 0x0D4D,
-	/* Array index: 0x03D2 */ 0x90B0, 0x90B6, 0x0D50,
-	/* Array index: 0x03D5 */ 0x90C3, 0x90C8, 0x0D57,
-	/* Array index: 0x03D8 */ 0x90D5, 0x90DF, 0x0D5D,
-	/* Array index: 0x03DB */ 0x90FE, 0x9108, 0x0D68,
-	/* Array index: 0x03DE */ 0x9114, 0x9129, 0x0D73,
-	/* Array index: 0x03E1 */ 0x9136, 0x913D, 0x0D89,
-	/* Array index: 0x03E4 */ 0x9157, 0x915B, 0x0D91,
-	/* Array index: 0x03E7 */ 0x9179, 0x917B, 0x0D96,
-	/* Array index: 0x03EA */ 0x9191, 0x9195, 0x0D99,
-	/* Array index: 0x03ED */ 0x91AC, 0x91B3, 0x0D9E,
-	/* Array index: 0x03F0 */ 0x91BB, 0x91C5, 0x0DA6,
-	/* Array index: 0x03F3 */ 0x91E9, 0x91F1, 0x0DB1,
-	/* Array index: 0x03F6 */ 0x9200, 0x920C, 0x0DBA,
-	/* Array index: 0x03F9 */ 0x9223, 0x9228, 0x0DC7,
-	/* Array index: 0x03FC */ 0x922E, 0x9230, 0x0DCD,
-	/* Array index: 0x03FF */ 0x9235, 0x9247, 0x0DD0,
-	/* Array index: 0x0402 */ 0x924D, 0x9251, 0x0DE3,
-	/* Array index: 0x0405 */ 0x9265, 0x9269, 0x0DE8,
-	/* Array index: 0x0408 */ 0x926E, 0x9270, 0x0DED,
-	/* Array index: 0x040B */ 0x9275, 0x927F, 0x0DF0,
-	/* Array index: 0x040E */ 0x9288, 0x928E, 0x0DFB,
-	/* Array index: 0x0411 */ 0x92A4, 0x92A8, 0x0E02,
-	/* Array index: 0x0414 */ 0x92B8, 0x92D0, 0x0E07,
-	/* Array index: 0x0417 */ 0x92D5, 0x92E8, 0x0E20,
-	/* Array index: 0x041A */ 0x931C, 0x932A, 0x0E34,
-	/* Array index: 0x041D */ 0x9333, 0x9337, 0x0E43,
-	/* Array index: 0x0420 */ 0x9347, 0x9349, 0x0E48,
-	/* Array index: 0x0423 */ 0x9350, 0x9352, 0x0E4B,
-	/* Array index: 0x0426 */ 0x936D, 0x9376, 0x0E4E,
-	/* Array index: 0x0429 */ 0x937D, 0x9382, 0x0E58,
-	/* Array index: 0x042C */ 0x93B4, 0x93B6, 0x0E5E,
-	/* Array index: 0x042F */ 0x93C4, 0x93CD, 0x0E61,
-	/* Array index: 0x0432 */ 0x93F7, 0x93FD, 0x0E6B,
-	/* Array index: 0x0435 */ 0x940D, 0x940F, 0x0E72,
-	/* Array index: 0x0438 */ 0x9415, 0x9417, 0x0E75,
-	/* Array index: 0x043B */ 0x942E, 0x9434, 0x0E78,
-	/* Array index: 0x043E */ 0x946B, 0x9472, 0x0E7F,
-	/* Array index: 0x0441 */ 0x958C, 0x958E, 0x0E87,
-	/* Array index: 0x0444 */ 0x959D, 0x95A1, 0x0E8A,
-	/* Array index: 0x0447 */ 0x95D0, 0x95D3, 0x0E8F,
-	/* Array index: 0x044A */ 0x95D9, 0x95E0, 0x0E93,
-	/* Array index: 0x044D */ 0x9622, 0x9626, 0x0E9B,
-	/* Array index: 0x0450 */ 0x9637, 0x963D, 0x0EA0,
-	/* Array index: 0x0453 */ 0x9654, 0x9658, 0x0EA7,
-	/* Array index: 0x0456 */ 0x967B, 0x9684, 0x0EAC,
-	/* Array index: 0x0459 */ 0x96A4, 0x96A6, 0x0EB6,
-	/* Array index: 0x045C */ 0x96DD, 0x96DF, 0x0EB9,
-	/* Array index: 0x045F */ 0x9721, 0x9723, 0x0EBC,
-	/* Array index: 0x0462 */ 0x9757, 0x975B, 0x0EBF,
-	/* Array index: 0x0465 */ 0x9776, 0x9778, 0x0EC4,
-	/* Array index: 0x0468 */ 0x9795, 0x979A, 0x0EC7,
-	/* Array index: 0x046B */ 0x97B5, 0x97D1, 0x0ECD,
-	/* Array index: 0x046E */ 0x97D7, 0x97E1, 0x0EEA,
-	/* Array index: 0x0471 */ 0x982E, 0x9835, 0x0EF5,
-	/* Array index: 0x0474 */ 0x9851, 0x985A, 0x0EFD,
-	/* Array index: 0x0477 */ 0x9862, 0x9866, 0x0F07,
-	/* Array index: 0x047A */ 0x98B7, 0x98BB, 0x0F0C,
-	/* Array index: 0x047D */ 0x98E3, 0x98E7, 0x0F11,
-	/* Array index: 0x0480 */ 0x9915, 0x991C, 0x0F16,
-	/* Array index: 0x0483 */ 0x9931, 0x993C, 0x0F1E,
-	/* Array index: 0x0486 */ 0x9946, 0x9948, 0x0F2A,
-	/* Array index: 0x0489 */ 0x9958, 0x9960, 0x0F2D,
-	/* Array index: 0x048C */ 0x99B0, 0x99B2, 0x0F36,
-	/* Array index: 0x048F */ 0x99EA, 0x99EC, 0x0F39,
-	/* Array index: 0x0492 */ 0x9A02, 0x9A04, 0x0F3C,
-	/* Array index: 0x0495 */ 0x9A20, 0x9A24, 0x0F3F,
-	/* Array index: 0x0498 */ 0x9A4A, 0x9A4E, 0x0F44,
-	/* Array index: 0x049B */ 0x9AB2, 0x9AB6, 0x0F49,
-	/* Array index: 0x049E */ 0x9AD5, 0x9AD7, 0x0F4E,
-	/* Array index: 0x04A1 */ 0x9AFD, 0x9B12, 0x0F51,
-	/* Array index: 0x04A4 */ 0x9B33, 0x9B3A, 0x0F67,
-	/* Array index: 0x04A7 */ 0x9B55, 0x9B57, 0x0F6F,
-	/* Array index: 0x04AA */ 0x9B68, 0x9B6E, 0x0F72,
-	/* Array index: 0x04AD */ 0x9B75, 0x9B79, 0x0F79,
-	/* Array index: 0x04B0 */ 0x9B84, 0x9B90, 0x0F7E,
-	/* Array index: 0x04B3 */ 0x9BB0, 0x9BB2, 0x0F8B,
-	/* Array index: 0x04B6 */ 0x9BBB, 0x9BC1, 0x0F8E,
-	/* Array index: 0x04B9 */ 0x9BF7, 0x9BFA, 0x0F95,
-	/* Array index: 0x04BC */ 0x9C16, 0x9C1E, 0x0F99,
-	/* Array index: 0x04BF */ 0x9C22, 0x9C2A, 0x0FA2,
-	/* Array index: 0x04C2 */ 0x9C35, 0x9C37, 0x0FAB,
-	/* Array index: 0x04C5 */ 0x9C41, 0x9C45, 0x0FAE,
-	/* Array index: 0x04C8 */ 0x9C4E, 0x9C5F, 0x0FB3,
-	/* Array index: 0x04CB */ 0x9C68, 0x9C6B, 0x0FC5,
-	/* Array index: 0x04CE */ 0x9D1C, 0x9D1E, 0x0FC9,
-	/* Array index: 0x04D1 */ 0x9D2F, 0x9D34, 0x0FCC,
-	/* Array index: 0x04D4 */ 0x9D69, 0x9D6B, 0x0FD2,
-	/* Array index: 0x04D7 */ 0x9D92, 0x9D98, 0x0FD5,
-	/* Array index: 0x04DA */ 0x9DD4, 0x9DD7, 0x0FDC,
-	/* Array index: 0x04DD */ 0x9DDE, 0x9DE0, 0x0FE0,
-	/* Array index: 0x04E0 */ 0x9E0E, 0x9E16, 0x0FE3,
-	/* Array index: 0x04E3 */ 0x9E7A, 0x9E7C, 0x0FEC,
-	/* Array index: 0x04E6 */ 0x9E80, 0x9E87, 0x0FEF,
-	/* Array index: 0x04E9 */ 0x9EAC, 0x9EB5, 0x0FF7,
-	/* Array index: 0x04EC */ 0x9EEC, 0x9EF2, 0x1001,
-	/* Array index: 0x04EF */ 0x9F0F, 0x9F1B, 0x1008,
-	/* Array index: 0x04F2 */ 0x9F39, 0x9F47, 0x1015,
-	/* Array index: 0x04F5 */ 0x9F53, 0x9F5E, 0x1024,
-	/* Array index: 0x04F8 */ 0x9F6D, 0x9F75, 0x1030,
-	/* Array index: 0x04FB */ 0x9F8F, 0x9F97, 0x1039,
-	/* Array index: 0x04FE */ 0x9FA1, 0x9FA5, 0x1042,
-	/* Ranges content */
-	/* Range 0x00BF - 0x017E, array index: 0x0501 */
-	0x2244,0x2A22,0x2A21,0x2A24,0x2A2A,0x2A23,0x2A29,0x2921,
-	0x2A2E,0x2A32,0x2A31,0x2A34,0x2A33,0x2A40,0x2A3F,0x2A42,
-	0x2A41,INVALC,0x2A50,0x2A52,0x2A51,0x2A54,0x2A58,0x2A53,
-	INVALC,0x292C,0x2A63,0x2A62,0x2A65,0x2A64,0x2A72,0x2930,
-	0x294E,0x2B22,0x2B21,0x2B24,0x2B2A,0x2B23,0x2B29,0x2941,
-	0x2B2E,0x2B32,0x2B31,0x2B34,0x2B33,0x2B40,0x2B3F,0x2B42,
-	0x2B41,0x2943,0x2B50,0x2B52,0x2B51,0x2B54,0x2B58,0x2B53,
-	INVALC,0x294C,0x2B63,0x2B62,0x2B65,0x2B64,0x2B72,0x2950,
-	0x2B73,0x2A27,0x2B27,0x2A25,0x2B25,0x2A28,0x2B28,0x2A2B,
-	0x2B2B,0x2A2C,0x2B2C,0x2A2F,0x2B2F,0x2A2D,0x2B2D,0x2A30,
-	0x2B30,0x2922,0x2942,0x2A37,0x2B37,INVALC,INVALC,0x2A36,
-	0x2B36,0x2A38,0x2B38,0x2A35,0x2B35,0x2A3A,0x2B3A,0x2A3B,
-	0x2B3B,0x2A3D,0x2B3D,0x2A3C,INVALC,0x2A3E,0x2B3E,0x2924,
-	0x2944,0x2A47,0x2B47,0x2A45,0x2B45,INVALC,INVALC,0x2A46,
-	0x2B46,0x2A44,0x2945,0x2926,0x2946,0x2A48,0x2B48,0x2A49,
-	0x2B49,0x2947,0x2A4A,0x2B4A,0x2A4C,0x2B4C,0x2A4B,0x2B4B,
-	0x2929,0x2949,0x2928,0x2948,0x2A4D,0x2B4D,0x2A4F,0x2B4F,
-	0x2A4E,0x2B4E,0x294A,0x292B,0x294B,0x2A57,0x2B57,INVALC,
-	INVALC,0x2A56,0x2B56,0x292D,0x294D,0x2A59,0x2B59,0x2A5B,
-	0x2B5B,0x2A5A,0x2B5A,0x2A5C,0x2B5C,0x2A5D,0x2B5D,0x2A5F,
-	0x2B5F,0x2A5E,0x2B5E,0x2A61,0x2B61,0x2A60,0x2B60,0x292F,
-	0x294F,0x2A6C,0x2B6C,0x2A69,0x2B69,0x2A66,0x2B66,0x2A6B,
-	0x2B6B,0x2A68,0x2B68,0x2A6A,0x2B6A,0x2A71,0x2B71,0x2A74,
-	0x2B74,0x2A73,0x2A75,0x2B75,0x2A77,0x2B77,0x2A76,0x2B76,
-	/* Range 0x01CD - 0x01DC, array index: 0x05C1 */
-	0x2A26,0x2B26,0x2A43,0x2B43,0x2A55,0x2B55,0x2A67,0x2B67,
-	0x2A70,0x2B70,0x2A6D,0x2B6D,0x2A6F,0x2B6F,0x2A6E,0x2B6E,
-	/* Range 0x02D8 - 0x02DD, array index: 0x05D1 */
-	0x222F,0x2232,0x2236,0x2235,INVALC,0x2233,
-	/* Range 0x0384 - 0x0390, array index: 0x05D7 */
-	0x2238,0x2239,0x2661,INVALC,0x2662,0x2663,0x2664,INVALC,
-	0x2667,INVALC,0x2669,0x266C,0x2676,
-	/* Range 0x03AA - 0x03B0, array index: 0x05E4 */
-	0x2665,0x266A,0x2671,0x2672,0x2673,0x2674,0x267B,
-	/* Range 0x03CA - 0x03CE, array index: 0x05EB */
-	0x2675,0x267A,0x2677,0x2679,0x267C,
-	/* Range 0x0402 - 0x040F, array index: 0x05F0 */
-	0x2742,0x2743,0x2744,0x2745,0x2746,0x2747,0x2748,0x2749,
-	0x274A,0x274B,0x274C,INVALC,0x274D,0x274E,
-	/* Range 0x0452 - 0x045F, array index: 0x05FE */
-	0x2772,0x2773,0x2774,0x2775,0x2776,0x2777,0x2778,0x2779,
-	0x277A,0x277B,0x277C,INVALC,0x277D,0x277E,
-	/* Range 0x4E2E - 0x4E30, array index: 0x060C */
-	0x302B,0x302C,0x302D,
-	/* Range 0x4EE0 - 0x4EE2, array index: 0x060F */
-	0x3047,0x3048,0x3049,
-	/* Range 0x4EFD - 0x4F03, array index: 0x0612 */
-	0x304F,0x3050,0x3051,0x3052,INVALC,0x3053,0x3054,
-	/* Range 0x4F15 - 0x4F19, array index: 0x0619 */
-	0x3059,0x305A,0x305B,INVALC,0x305C,
-	/* Range 0x4F48 - 0x4F4C, array index: 0x061E */
-	0x3068,0x3069,INVALC,0x306A,0x306B,
-	/* Range 0x4F77 - 0x4F85, array index: 0x0623 */
-	0x3076,0x3077,0x3078,0x3079,INVALC,INVALC,0x307A,0x307B,
-	INVALC,INVALC,0x307C,0x307D,INVALC,0x307E,0x3121,
-	/* Range 0x4F90 - 0x4F94, array index: 0x0632 */
-	0x3126,INVALC,0x3127,0x3128,0x3129,
-	/* Range 0x4FB9 - 0x4FC1, array index: 0x0637 */
-	0x3131,INVALC,0x3132,0x3133,0x3134,0x3135,INVALC,0x3136,
-	0x3137,
-	/* Range 0x4FC5 - 0x4FCF, array index: 0x0640 */
-	0x3138,0x3139,INVALC,0x313A,0x313B,INVALC,0x313C,0x313D,
-	0x313E,INVALC,0x313F,
-	/* Range 0x4FFC - 0x5001, array index: 0x064B */
-	0x3146,0x3147,INVALC,0x3148,0x3149,0x314A,
-	/* Range 0x5017 - 0x501E, array index: 0x0651 */
-	0x3152,0x3153,INVALC,INVALC,0x3154,0x3155,0x3156,0x3157,
-	/* Range 0x5040 - 0x5046, array index: 0x0659 */
-	0x315F,0x3160,0x3161,INVALC,INVALC,0x3162,0x3163,
-	/* Range 0x5051 - 0x5053, array index: 0x0660 */
-	0x3167,0x3168,0x3169,
-	/* Range 0x505F - 0x5067, array index: 0x0663 */
-	0x316C,0x316D,INVALC,0x316E,0x316F,INVALC,INVALC,0x3170,
-	0x3171,
-	/* Range 0x508E - 0x5096, array index: 0x066C */
-	0x317C,0x317D,0x317E,INVALC,0x3221,0x3222,0x3223,INVALC,
-	0x3224,
-	/* Range 0x509B - 0x50A2, array index: 0x0675 */
-	0x3225,0x3226,INVALC,0x3227,0x3228,0x3229,0x322A,0x322B,
-	/* Range 0x5106 - 0x5110, array index: 0x067D */
-	0x324A,0x324B,0x324C,INVALC,INVALC,0x324D,0x324E,0x324F,
-	0x3250,INVALC,0x3252,
-	/* Range 0x5119 - 0x511E, array index: 0x0688 */
-	0x3254,INVALC,0x3255,0x3256,0x3257,0x3258,
-	/* Range 0x5131 - 0x5139, array index: 0x068E */
-	0x325F,INVALC,0x3260,0x3261,0x3262,INVALC,INVALC,0x3263,
-	0x3264,
-	/* Range 0x51CF - 0x51D5, array index: 0x0697 */
-	0x3322,INVALC,0x3323,0x3324,0x3325,INVALC,0x3326,
-	/* Range 0x51F2 - 0x51F4, array index: 0x069E */
-	0x332C,0x332D,0x332E,
-	/* Range 0x5212 - 0x5218, array index: 0x06A1 */
-	0x3333,0x3334,INVALC,0x3335,0x3336,INVALC,0x3337,
-	/* Range 0x525F - 0x5261, array index: 0x06A8 */
-	0x3345,0x3346,0x3347,
-	/* Range 0x5277 - 0x5279, array index: 0x06AB */
-	0x334A,0x334B,0x334C,
-	/* Range 0x5293 - 0x529C, array index: 0x06AE */
-	0x3352,INVALC,0x3353,0x3354,0x3355,0x3356,INVALC,0x3357,
-	INVALC,0x3358,
-	/* Range 0x52A4 - 0x52A7, array index: 0x06B8 */
-	0x3359,0x335A,0x335B,0x335C,
-	/* Range 0x52B6 - 0x52BD, array index: 0x06BC */
-	0x335F,0x3360,0x3361,INVALC,0x3362,0x3363,INVALC,0x3364,
-	/* Range 0x52E8 - 0x52EC, array index: 0x06C4 */
-	0x3372,0x3373,0x3374,INVALC,0x3375,
-	/* Range 0x530A - 0x530C, array index: 0x06C9 */
-	0x337D,0x337E,0x3421,
-	/* Range 0x531B - 0x531F, array index: 0x06CC */
-	0x3425,0x3426,INVALC,0x3427,0x3428,
-	/* Range 0x5325 - 0x532D, array index: 0x06D1 */
-	0x3429,INVALC,0x342A,0x342B,0x342C,INVALC,0x342D,0x342E,
-	0x342F,
-	/* Range 0x533C - 0x533E, array index: 0x06DA */
-	0x3433,0x3434,0x3435,
-	/* Range 0x53B4 - 0x53BA, array index: 0x06DD */
-	0x3451,0x3452,INVALC,0x3453,0x3454,INVALC,0x3455,
-	/* Range 0x54A6 - 0x54AE, array index: 0x06E4 */
-	0x352D,0x352E,INVALC,0x352F,0x3530,INVALC,INVALC,0x3531,
-	0x3532,
-	/* Range 0x54B7 - 0x54BB, array index: 0x06ED */
-	0x3534,INVALC,0x3535,0x3536,0x3537,
-	/* Range 0x54FC - 0x5501, array index: 0x06F2 */
-	0x3542,INVALC,0x3543,0x3544,0x3545,0x3546,
-	/* Range 0x5508 - 0x550E, array index: 0x06F8 */
-	0x3548,0x3549,INVALC,INVALC,0x354A,0x354B,0x354C,
-	/* Range 0x553B - 0x553D, array index: 0x06FF */
-	0x3553,0x3554,0x3555,
-	/* Range 0x558E - 0x5594, array index: 0x0702 */
-	0x356A,0x356B,INVALC,0x356C,0x356D,0x356E,0x356F,
-	/* Range 0x55D1 - 0x55D3, array index: 0x0709 */
-	0x357D,0x357E,0x3621,
-	/* Range 0x560D - 0x5612, array index: 0x070C */
-	0x362D,0x362E,0x362F,0x3630,0x3631,0x3632,
-	/* Range 0x5639 - 0x5646, array index: 0x0712 */
-	0x3639,INVALC,0x363A,0x363B,0x363C,INVALC,0x363D,0x363E,
-	0x363F,INVALC,0x3640,0x3641,INVALC,0x3642,
-	/* Range 0x565E - 0x5663, array index: 0x0720 */
-	0x3648,INVALC,0x3649,0x364A,0x364B,0x364C,
-	/* Range 0x5699 - 0x569F, array index: 0x0726 */
-	0x365A,0x365B,INVALC,INVALC,0x365C,0x365D,0x365E,
-	/* Range 0x56A6 - 0x56AD, array index: 0x072D */
-	0x365F,0x3660,0x3661,0x3662,INVALC,0x3663,0x3664,0x3665,
-	/* Range 0x56C9 - 0x56D0, array index: 0x0735 */
-	0x366B,0x366C,0x366D,0x3670,0x3671,INVALC,0x366E,0x366F,
-	/* Range 0x56E4 - 0x56E8, array index: 0x073D */
-	0x3677,0x3678,0x3679,0x367A,0x367B,
-	/* Range 0x5720 - 0x5725, array index: 0x0742 */
-	0x372D,INVALC,0x372E,0x372F,0x3730,0x3731,
-	/* Range 0x573D - 0x573F, array index: 0x0748 */
-	0x3739,0x373A,0x373B,
-	/* Range 0x576B - 0x577E, array index: 0x074B */
-	0x3745,INVALC,0x3746,0x3747,0x3748,0x3749,0x374A,INVALC,
-	0x374B,0x374C,0x374D,INVALC,0x374E,INVALC,0x374F,0x3750,
-	0x3751,0x3752,INVALC,0x3753,
-	/* Range 0x5799 - 0x57A1, array index: 0x075F */
-	0x3759,0x375A,INVALC,0x375B,0x375C,0x375D,0x375E,INVALC,
-	0x375F,
-	/* Range 0x57A7 - 0x57A9, array index: 0x0768 */
-	0x3761,0x3762,0x3763,
-	/* Range 0x57FD - 0x57FF, array index: 0x076B */
-	0x3777,0x3778,0x3779,
-	/* Range 0x581E - 0x5820, array index: 0x076E */
-	0x3824,0x3825,0x3826,
-	/* Range 0x584C - 0x5850, array index: 0x0771 */
-	0x382E,0x382F,INVALC,0x3830,0x3831,
-	/* Range 0x587F - 0x5881, array index: 0x0776 */
-	0x383A,0x383B,0x383C,
-	/* Range 0x5887 - 0x5890, array index: 0x0779 */
-	0x383D,0x383E,0x383F,0x3840,INVALC,0x3841,0x3842,INVALC,
-	0x3843,0x3844,
-	/* Range 0x58A0 - 0x58A2, array index: 0x0783 */
-	0x3848,0x3849,0x384A,
-	/* Range 0x5912 - 0x5914, array index: 0x0786 */
-	0x3863,0x3864,0x3865,
-	/* Range 0x595B - 0x5963, array index: 0x0789 */
-	0x3877,INVALC,0x3878,0x3879,0x387A,INVALC,0x387B,INVALC,
-	0x387C,
-	/* Range 0x59AD - 0x59B0, array index: 0x0792 */
-	0x3931,0x3932,0x3933,0x3934,
-	/* Range 0x59DD - 0x59DF, array index: 0x0796 */
-	0x3940,0x3941,0x3942,
-	/* Range 0x59EE - 0x59F4, array index: 0x0799 */
-	0x3946,0x3947,INVALC,0x3948,0x3949,INVALC,0x394A,
-	/* Range 0x5A0C - 0x5A0E, array index: 0x07A0 */
-	0x394E,0x394F,0x3950,
-	/* Range 0x5A44 - 0x5A48, array index: 0x07A3 */
-	0x395B,0x395C,INVALC,0x395D,0x395E,
-	/* Range 0x5A9C - 0x5AA2, array index: 0x07A8 */
-	0x3970,INVALC,0x3971,0x3972,0x3973,INVALC,0x3974,
-	/* Range 0x5AB1 - 0x5AB5, array index: 0x07AF */
-	0x3977,0x3978,0x3979,INVALC,0x397A,
-	/* Range 0x5B7C - 0x5B81, array index: 0x07B4 */
-	0x3A43,0x3A44,0x3A45,0x3A46,INVALC,0x3A47,
-	/* Range 0x5B90 - 0x5B96, array index: 0x07BA */
-	0x3A4C,0x3A4D,INVALC,0x3A4E,0x3A4F,INVALC,0x3A50,
-	/* Range 0x5BD6 - 0x5BDA, array index: 0x07C1 */
-	0x3A5F,0x3A60,0x3A61,0x3A62,0x3A63,
-	/* Range 0x5C67 - 0x5C69, array index: 0x07C6 */
-	0x3A7C,0x3A7D,0x3A7E,
-	/* Range 0x5C7A - 0x5C7D, array index: 0x07C9 */
-	0x3B25,0x3B26,0x3B27,0x3B28,
-	/* Range 0x5C9F - 0x5CA3, array index: 0x07CD */
-	0x3B2F,0x3B30,INVALC,0x3B31,0x3B32,
-	/* Range 0x5D23 - 0x5D27, array index: 0x07D2 */
-	0x3B47,0x3B48,INVALC,0x3B49,0x3B4A,
-	/* Range 0x5D5F - 0x5D64, array index: 0x07D7 */
-	0x3B58,0x3B59,0x3B5A,0x3B5B,INVALC,0x3B5C,
-	/* Range 0x5D92 - 0x5D95, array index: 0x07DD */
-	0x3B68,0x3B69,0x3B6A,0x3B6B,
-	/* Range 0x5E68 - 0x5E70, array index: 0x07E1 */
-	0x3C3B,INVALC,0x3C3C,0x3C3D,0x3C3E,0x3C3F,0x3C40,INVALC,
-	0x3C41,
-	/* Range 0x5EBD - 0x5EBF, array index: 0x07EA */
-	0x3C4D,0x3C4E,0x3C4F,
-	/* Range 0x5ED1 - 0x5ED5, array index: 0x07ED */
-	0x3C54,0x3C55,INVALC,0x3C56,0x3C57,
-	/* Range 0x5F06 - 0x5F08, array index: 0x07F2 */
-	0x3C5D,0x3C5E,0x3C5F,
-	/* Range 0x5F21 - 0x5F24, array index: 0x07F5 */
-	0x3C64,0x3C65,0x3C66,0x3C67,
-	/* Range 0x5FAB - 0x5FB1, array index: 0x07F9 */
-	0x3D31,0x3D33,INVALC,INVALC,0x3D34,0x3D35,0x3D36,
-	/* Range 0x5FC7 - 0x5FCB, array index: 0x0800 */
-	0x3D39,0x3D3A,0x3D3B,INVALC,0x3D3C,
-	/* Range 0x5FD0 - 0x5FD4, array index: 0x0805 */
-	0x3D3D,0x3D3E,0x3D3F,0x3D40,0x3D41,
-	/* Range 0x5FE8 - 0x5FF3, array index: 0x080A */
-	0x3D45,0x3D46,0x3D47,INVALC,0x3D48,0x3D49,0x3D4A,0x3D4B,
-	INVALC,INVALC,0x3D4C,0x3D4D,
-	/* Range 0x6047 - 0x6049, array index: 0x0816 */
-	0x3D5F,0x3D60,0x3D61,
-	/* Range 0x60C8 - 0x60CF, array index: 0x0819 */
-	0x3E25,0x3E26,0x3E27,0x3E28,INVALC,INVALC,0x3E29,0x3E2A,
-	/* Range 0x6110 - 0x6119, array index: 0x0821 */
-	0x3E3C,0x3E3D,0x3E3E,0x3E3F,0x3E40,INVALC,0x3E41,0x3E42,
-	INVALC,0x3E43,
-	/* Range 0x6135 - 0x6139, array index: 0x082B */
-	0x3E4B,0x3E4C,0x3E4D,INVALC,0x3E4E,
-	/* Range 0x617B - 0x6184, array index: 0x0830 */
-	0x3E58,0x3E59,INVALC,INVALC,0x3E5A,0x3E5B,0x3E5C,INVALC,
-	0x3E5D,0x3E5E,
-	/* Range 0x619C - 0x61A0, array index: 0x083A */
-	0x3E65,0x3E66,INVALC,0x3E67,0x3E68,
-	/* Range 0x61C0 - 0x61C2, array index: 0x083F */
-	0x3E70,0x3E71,0x3E72,
-	/* Range 0x61DC - 0x61E2, array index: 0x0842 */
-	0x3E76,0x3E77,0x3E78,0x3E79,INVALC,0x3E7A,0x3E7B,
-	/* Range 0x6242 - 0x6246, array index: 0x0849 */
-	0x3F33,0x3F34,0x3F35,INVALC,0x3F36,
-	/* Range 0x6250 - 0x6256, array index: 0x084E */
-	0x3F38,0x3F39,0x3F3A,INVALC,0x3F3B,INVALC,0x3F3C,
-	/* Range 0x628D - 0x6290, array index: 0x0855 */
-	0x3F45,0x3F46,0x3F47,0x3F48,
-	/* Range 0x6341 - 0x6346, array index: 0x0859 */
-	0x3F6B,0x3F6C,0x3F6D,0x3F6E,INVALC,0x3F6F,
-	/* Range 0x6352 - 0x6354, array index: 0x085F */
-	0x3F73,0x3F74,0x3F75,
-	/* Range 0x63AD - 0x63AF, array index: 0x0862 */
-	0x4031,0x4032,0x4033,
-	/* Range 0x63D1 - 0x63D5, array index: 0x0865 */
-	0x4039,INVALC,0x403A,0x403B,0x403C,
-	/* Range 0x644F - 0x6454, array index: 0x086A */
-	0x405A,INVALC,0x405B,0x405C,0x405D,0x405E,
-	/* Range 0x645A - 0x6463, array index: 0x0870 */
-	0x405F,0x4060,0x4061,0x4062,INVALC,0x4063,0x4064,0x4065,
-	INVALC,0x4066,
-	/* Range 0x648F - 0x6491, array index: 0x087A */
-	0x406E,0x406F,0x4070,
-	/* Range 0x64BD - 0x64BF, array index: 0x087D */
-	0x407C,0x407D,0x407E,
-	/* Range 0x64C9 - 0x64D1, array index: 0x0880 */
-	0x4122,0x4123,0x4124,0x4125,INVALC,0x4126,INVALC,0x4127,
-	0x4128,
-	/* Range 0x6508 - 0x650A, array index: 0x0889 */
-	0x4137,0x4138,0x4139,
-	/* Range 0x65B2 - 0x65B4, array index: 0x088C */
-	0x4161,0x4162,0x4163,
-	/* Range 0x65FE - 0x6600, array index: 0x088F */
-	0x4173,0x4174,0x4175,
-	/* Range 0x661D - 0x6633, array index: 0x0892 */
-	0x417E,0x4221,INVALC,INVALC,0x4222,0x4223,0x4224,0x4225,
-	INVALC,0x4226,INVALC,INVALC,0x4227,0x4228,0x4229,0x422A,
-	INVALC,0x422B,INVALC,0x422C,0x422D,INVALC,0x422E,
-	/* Range 0x6657 - 0x665C, array index: 0x08A9 */
-	0x4238,0x4239,0x423A,INVALC,0x423B,0x423C,
-	/* Range 0x666A - 0x666C, array index: 0x08AF */
-	0x4240,0x4241,0x4242,
-	/* Range 0x6675 - 0x6680, array index: 0x08B2 */
-	0x4245,INVALC,0x4247,0x4248,0x4249,INVALC,0x424A,0x424C,
-	INVALC,0x4243,0x4246,0x424B,
-	/* Range 0x668B - 0x668D, array index: 0x08BE */
-	0x424D,0x424E,0x424F,
-	/* Range 0x6699 - 0x66A0, array index: 0x08C1 */
-	0x4252,0x4253,0x4254,0x4255,INVALC,INVALC,0x4256,0x4257,
-	/* Range 0x66BF - 0x66C3, array index: 0x08C9 */
-	0x425E,0x425F,INVALC,0x4260,0x4261,
-	/* Range 0x67B0 - 0x67B2, array index: 0x08CE */
-	0x4331,0x4332,0x4333,
-	/* Range 0x67BB - 0x67BD, array index: 0x08D1 */
-	0x4335,0x4336,0x4337,
-	/* Range 0x682C - 0x6833, array index: 0x08D4 */
-	0x4350,0x4351,INVALC,0x4352,0x4353,0x4354,INVALC,0x4355,
-	/* Range 0x686E - 0x6872, array index: 0x08DC */
-	0x4361,0x4362,0x4363,0x4364,0x4365,
-	/* Range 0x6879 - 0x687C, array index: 0x08E1 */
-	0x4367,0x4368,0x4369,0x436A,
-	/* Range 0x68CF - 0x68D3, array index: 0x08E5 */
-	0x437E,0x4421,0x4422,INVALC,0x4423,
-	/* Range 0x68E8 - 0x68F1, array index: 0x08EA */
-	0x4429,INVALC,0x442A,0x442B,0x442C,0x442D,INVALC,INVALC,
-	0x442E,0x442F,
-	/* Range 0x68FB - 0x68FD, array index: 0x08F4 */
-	0x4432,0x4433,0x4434,
-	/* Range 0x6963 - 0x6969, array index: 0x08F7 */
-	0x4448,0x4449,0x444A,0x444B,INVALC,0x444C,0x444D,
-	/* Range 0x6970 - 0x6972, array index: 0x08FE */
-	0x444F,0x4450,0x4451,
-	/* Range 0x6A4E - 0x6A56, array index: 0x0901 */
-	0x452A,INVALC,0x452B,0x452C,0x452D,INVALC,INVALC,0x452E,
-	0x452F,
-	/* Range 0x6A9B - 0x6A9F, array index: 0x090A */
-	0x453E,INVALC,0x453F,0x4540,0x4541,
-	/* Range 0x6AAF - 0x6AB1, array index: 0x090F */
-	0x4544,0x4545,0x4546,
-	/* Range 0x6ABD - 0x6ABF, array index: 0x0912 */
-	0x4548,0x4549,0x454A,
-	/* Range 0x6AD4 - 0x6AD6, array index: 0x0915 */
-	0x4550,0x4551,0x4552,
-	/* Range 0x6AF0 - 0x6AF2, array index: 0x0918 */
-	0x4558,0x4559,0x455A,
-	/* Range 0x6B0F - 0x6B11, array index: 0x091B */
-	0x4562,0x4563,0x4564,
-	/* Range 0x6B9F - 0x6BA3, array index: 0x091E */
-	0x4626,0x4627,INVALC,0x4628,0x4629,
-	/* Range 0x6BA8 - 0x6BB0, array index: 0x0923 */
-	0x462A,0x462B,INVALC,INVALC,0x462C,0x462D,0x462E,INVALC,
-	0x462F,
-	/* Range 0x6C26 - 0x6C28, array index: 0x092C */
-	0x464D,0x464E,0x464F,
-	/* Range 0x6C85 - 0x6C89, array index: 0x092F */
-	0x4669,0x466A,0x466B,INVALC,0x466C,
-	/* Range 0x6C94 - 0x6C98, array index: 0x0934 */
-	0x466D,0x466E,INVALC,0x466F,0x4670,
-	/* Range 0x6CCD - 0x6CD6, array index: 0x0939 */
-	0x4678,INVALC,0x4679,0x467A,0x467B,0x467C,INVALC,0x467D,
-	INVALC,0x467E,
-	/* Range 0x6D26 - 0x6D28, array index: 0x0943 */
-	0x4733,0x4734,0x4735,
-	/* Range 0x6D94 - 0x6D98, array index: 0x0946 */
-	0x474A,INVALC,0x474B,0x474C,0x474D,
-	/* Range 0x6E4F - 0x6E54, array index: 0x094B */
-	0x4776,INVALC,0x4777,0x4778,0x4779,0x477A,
-	/* Range 0x6E5C - 0x6E5E, array index: 0x0951 */
-	0x477C,0x477D,0x477E,
-	/* Range 0x6EBF - 0x6EC3, array index: 0x0954 */
-	0x4831,0x4832,0x4833,INVALC,0x4834,
-	/* Range 0x6ECD - 0x6ECF, array index: 0x0959 */
-	0x4838,0x4839,0x483A,
-	/* Range 0x6F4F - 0x6F53, array index: 0x095C */
-	0x4854,INVALC,0x4855,0x4856,0x4857,
-	/* Range 0x6F87 - 0x6F8D, array index: 0x0961 */
-	0x4864,0x4865,INVALC,INVALC,0x4866,0x4867,0x4868,
-	/* Range 0x6F90 - 0x6F96, array index: 0x0968 */
-	0x4869,INVALC,0x486A,0x486B,0x486C,INVALC,0x486D,
-	/* Range 0x6FA5 - 0x6FA8, array index: 0x096F */
-	0x4871,0x4872,0x4873,0x4874,
-	/* Range 0x6FAE - 0x6FB0, array index: 0x0973 */
-	0x4875,0x4876,0x4877,
-	/* Range 0x7005 - 0x7007, array index: 0x0976 */
-	0x492B,0x492C,0x492D,
-	/* Range 0x7048 - 0x704B, array index: 0x0979 */
-	0x4939,0x493A,0x493B,0x493C,
-	/* Range 0x7094 - 0x7098, array index: 0x097D */
-	0x494C,0x494D,0x494E,0x494F,0x4950,
-	/* Range 0x70D1 - 0x70D8, array index: 0x0982 */
-	0x4959,INVALC,0x495A,0x495B,0x495C,0x495D,INVALC,0x495E,
-	/* Range 0x7103 - 0x7107, array index: 0x098A */
-	0x4962,0x4963,0x4964,0x4965,0x4966,
-	/* Range 0x712D - 0x7131, array index: 0x098F */
-	0x496D,INVALC,0x496E,0x496F,0x4970,
-	/* Range 0x7145 - 0x714B, array index: 0x0994 */
-	0x4973,0x4974,0x4975,INVALC,INVALC,0x4976,0x4977,
-	/* Range 0x71AF - 0x71B3, array index: 0x099B */
-	0x4A2C,0x4A2D,INVALC,0x4A2E,0x4A2F,
-	/* Range 0x71BF - 0x71C1, array index: 0x09A0 */
-	0x4A31,0x4A32,0x4A33,
-	/* Range 0x7207 - 0x7209, array index: 0x09A3 */
-	0x4A3F,0x4A40,0x4A41,
-	/* Range 0x7241 - 0x7245, array index: 0x09A6 */
-	0x4A4D,0x4A4E,0x4A4F,INVALC,0x4A50,
-	/* Range 0x724E - 0x7250, array index: 0x09AB */
-	0x4A51,0x4A52,0x4A53,
-	/* Range 0x735D - 0x7360, array index: 0x09AE */
-	0x4B3E,0x4B3F,0x4B40,0x4B41,
-	/* Range 0x736B - 0x7371, array index: 0x09B2 */
-	0x4B45,0x4B46,INVALC,0x4B47,0x4B48,INVALC,0x4B49,
-	/* Range 0x739C - 0x73A6, array index: 0x09B9 */
-	0x4B58,INVALC,0x4B59,0x4B5A,0x4B5B,INVALC,0x4B5C,INVALC,
-	INVALC,0x4B5D,0x4B5E,
-	/* Range 0x73F7 - 0x7401, array index: 0x09C4 */
-	0x4B7A,INVALC,0x4B7B,0x4B7C,0x4B7D,INVALC,0x4B7E,INVALC,
-	0x4C21,0x4C22,0x4C23,
-	/* Range 0x7426 - 0x7431, array index: 0x09CF */
-	0x4C2B,INVALC,0x4C2C,0x4C2D,0x4C2E,0x4C2F,0x4C30,0x4C31,
-	0x4C32,0x4C33,0x4C34,0x4C35,
-	/* Range 0x7443 - 0x7447, array index: 0x09DB */
-	0x4C38,0x4C39,INVALC,0x4C3A,0x4C3B,
-	/* Range 0x7466 - 0x7468, array index: 0x09E0 */
-	0x4C43,0x4C44,0x4C45,
-	/* Range 0x7485 - 0x7489, array index: 0x09E3 */
-	0x4C4D,0x4C4E,0x4C4F,INVALC,0x4C50,
-	/* Range 0x748F - 0x7492, array index: 0x09E8 */
-	0x4C51,0x4C52,0x4C53,0x4C54,
-	/* Range 0x7498 - 0x74A3, array index: 0x09EC */
-	0x4C55,0x4C56,0x4C57,INVALC,0x4C58,INVALC,INVALC,0x4C59,
-	0x4C5A,0x4C5B,INVALC,0x4C5C,
-	/* Range 0x74A6 - 0x74B2, array index: 0x09F8 */
-	0x4C5D,INVALC,0x4C5E,0x4C5F,0x4C60,0x4C61,INVALC,INVALC,
-	0x4C62,0x4C63,INVALC,0x4C64,0x4C65,
-	/* Range 0x74FA - 0x74FC, array index: 0x0A05 */
-	0x4C7A,0x4C7B,0x4C7C,
-	/* Range 0x753D - 0x7540, array index: 0x0A08 */
-	0x4D2D,0x4D2E,0x4D2F,0x4D30,
-	/* Range 0x7579 - 0x757E, array index: 0x0A0C */
-	0x4D3D,0x4D3E,0x4D3F,0x4D40,0x4D41,0x4D42,
-	/* Range 0x75BF - 0x75C1, array index: 0x0A12 */
-	0x4D4F,0x4D50,0x4D51,
-	/* Range 0x75DF - 0x75E1, array index: 0x0A15 */
-	0x4D59,0x4D5A,0x4D5B,
-	/* Range 0x7600 - 0x760C, array index: 0x0A18 */
-	0x4D63,INVALC,0x4D64,0x4D65,0x4D66,INVALC,INVALC,0x4D67,
-	0x4D68,INVALC,0x4D69,INVALC,0x4D6A,
-	/* Range 0x7612 - 0x7616, array index: 0x0A25 */
-	0x4D6C,0x4D6D,INVALC,0x4D6E,0x4D6F,
-	/* Range 0x7619 - 0x761E, array index: 0x0A2A */
-	0x4D70,INVALC,0x4D71,0x4D72,0x4D73,0x4D74,
-	/* Range 0x7638 - 0x763C, array index: 0x0A30 */
-	0x4D7D,0x4D7E,0x4E21,INVALC,0x4E22,
-	/* Range 0x7640 - 0x764B, array index: 0x0A35 */
-	0x4E24,0x4E25,INVALC,0x4E26,0x4E27,0x4E28,INVALC,INVALC,
-	INVALC,0x4E29,0x4E23,0x4E2A,
-	/* Range 0x766D - 0x7671, array index: 0x0A41 */
-	0x4E30,0x4E31,0x4E32,INVALC,0x4E33,
-	/* Range 0x769B - 0x76AA, array index: 0x0A46 */
-	0x4E3A,0x4E3B,0x4E3C,INVALC,0x4E3D,0x4E3E,INVALC,0x4E3F,
-	0x4E40,0x4E41,0x4E42,0x4E43,0x4E44,0x4E45,INVALC,0x4E46,
-	/* Range 0x772D - 0x772F, array index: 0x0A56 */
-	0x4E67,0x4E68,0x4E69,
-	/* Range 0x7734 - 0x7736, array index: 0x0A59 */
-	0x4E6A,0x4E6B,0x4E6C,
-	/* Range 0x774D - 0x774F, array index: 0x0A5C */
-	0x4E74,0x4E75,0x4E76,
-	/* Range 0x775C - 0x7764, array index: 0x0A5F */
-	0x4E7A,INVALC,0x4E7B,0x4E7C,0x4E7D,INVALC,0x4E7E,INVALC,
-	0x4F21,
-	/* Range 0x7770 - 0x7774, array index: 0x0A68 */
-	0x4F25,INVALC,0x4F26,0x4F27,0x4F28,
-	/* Range 0x7794 - 0x7796, array index: 0x0A6D */
-	0x4F2F,0x4F30,0x4F31,
-	/* Range 0x77DE - 0x77E0, array index: 0x0A70 */
-	0x4F42,0x4F43,0x4F44,
-	/* Range 0x7821 - 0x7823, array index: 0x0A73 */
-	0x4F55,0x4F56,0x4F57,
-	/* Range 0x7860 - 0x7864, array index: 0x0A76 */
-	0x4F66,0x4F67,INVALC,0x4F68,0x4F69,
-	/* Range 0x789D - 0x78A1, array index: 0x0A7B */
-	0x4F74,0x4F75,0x4F76,INVALC,0x4F73,
-	/* Range 0x78AC - 0x78B3, array index: 0x0A80 */
-	0x4F79,0x4F7A,INVALC,INVALC,0x4F7B,0x4F7C,0x4F7D,0x4F7E,
-	/* Range 0x78C7 - 0x78C9, array index: 0x0A88 */
-	0x5024,0x5025,0x5026,
-	/* Range 0x78D2 - 0x78D6, array index: 0x0A8B */
-	0x5029,0x502A,INVALC,0x502B,0x502C,
-	/* Range 0x78DF - 0x78E1, array index: 0x0A90 */
-	0x502F,0x5030,0x5031,
-	/* Range 0x791C - 0x7920, array index: 0x0A93 */
-	0x5040,INVALC,0x5041,0x5042,0x5043,
-	/* Range 0x7944 - 0x7946, array index: 0x0A98 */
-	0x504E,0x504F,0x5050,
-	/* Range 0x7991 - 0x799C, array index: 0x0A9B */
-	0x5063,INVALC,0x5064,0x5065,0x5066,0x5067,INVALC,0x5068,
-	INVALC,INVALC,0x5069,0x506A,
-	/* Range 0x7A34 - 0x7A3A, array index: 0x0AA7 */
-	0x513A,0x513B,INVALC,INVALC,0x513C,0x513D,0x513E,
-	/* Range 0x7A44 - 0x7A48, array index: 0x0AAE */
-	0x513F,0x5140,INVALC,0x5141,0x5142,
-	/* Range 0x7A5C - 0x7A60, array index: 0x0AB3 */
-	0x5147,0x5148,INVALC,0x5149,0x514A,
-	/* Range 0x7AE8 - 0x7AEC, array index: 0x0AB8 */
-	0x516A,0x516B,INVALC,0x516C,0x516D,
-	/* Range 0x7B27 - 0x7B31, array index: 0x0ABD */
-	0x5177,INVALC,0x5178,0x5179,0x517A,INVALC,0x517B,0x517C,
-	0x517D,0x517E,0x5221,
-	/* Range 0x7B3D - 0x7B41, array index: 0x0AC8 */
-	0x5223,INVALC,0x5224,0x5225,0x5226,
-	/* Range 0x7BBA - 0x7BBD, array index: 0x0ACD */
-	0x5244,0x5245,0x5246,0x5247,
-	/* Range 0x7BD6 - 0x7BDB, array index: 0x0AD1 */
-	0x524D,0x524E,INVALC,0x524F,0x5250,0x5251,
-	/* Range 0x7BF4 - 0x7C06, array index: 0x0AD7 */
-	0x5255,0x5256,INVALC,INVALC,0x5257,0x5258,0x5259,INVALC,
-	0x525A,INVALC,0x525B,INVALC,INVALC,0x525C,0x525D,0x525E,
-	0x525F,INVALC,0x5260,
-	/* Range 0x7C0B - 0x7C0F, array index: 0x0AEA */
-	0x5262,0x5263,INVALC,0x5264,0x5265,
-	/* Range 0x7C51 - 0x7C5E, array index: 0x0AEF */
-	0x5276,0x5277,0x5278,INVALC,0x5275,INVALC,INVALC,INVALC,
-	0x5279,0x527A,0x527B,0x527C,0x527D,0x527E,
-	/* Range 0x7CB6 - 0x7CBC, array index: 0x0AFD */
-	0x5334,0x5335,INVALC,INVALC,0x5336,0x5337,0x5338,
-	/* Range 0x7CC7 - 0x7CC9, array index: 0x0B04 */
-	0x533B,0x533C,0x533D,
-	/* Range 0x7CD3 - 0x7CDA, array index: 0x0B07 */
-	0x5340,0x5341,0x5342,INVALC,0x5343,INVALC,0x5344,0x5345,
-	/* Range 0x7D07 - 0x7D09, array index: 0x0B0F */
-	0x534C,0x534D,0x534E,
-	/* Range 0x7D0F - 0x7D13, array index: 0x0B12 */
-	0x534F,INVALC,0x5350,0x5351,0x5352,
-	/* Range 0x7D3C - 0x7D41, array index: 0x0B17 */
-	0x535B,0x535C,0x535D,INVALC,0x535E,0x535F,
-	/* Range 0x7D59 - 0x7D5D, array index: 0x0B1D */
-	0x5366,0x5367,INVALC,0x5368,0x5369,
-	/* Range 0x7D7F - 0x7D8D, array index: 0x0B22 */
-	0x5371,INVALC,0x5372,0x5373,0x5374,INVALC,0x5375,0x5376,
-	INVALC,0x5377,INVALC,INVALC,0x5378,0x5379,0x537A,
-	/* Range 0x7DC2 - 0x7DC6, array index: 0x0B31 */
-	0x5429,0x542A,0x542B,0x542C,0x542D,
-	/* Range 0x7DCC - 0x7DCE, array index: 0x0B36 */
-	0x542E,0x542F,0x5430,
-	/* Range 0x7F3B - 0x7F3F, array index: 0x0B39 */
-	0x546C,0x546B,0x546D,0x546E,0x546F,
-	/* Range 0x7F5B - 0x7F5D, array index: 0x0B3E */
-	0x5476,0x5477,0x5478,
-	/* Range 0x7F61 - 0x7F66, array index: 0x0B41 */
-	0x5479,INVALC,0x547A,0x547B,0x547C,0x547D,
-	/* Range 0x7F7D - 0x7F80, array index: 0x0B47 */
-	0x5522,0x5523,0x5524,0x5525,
-	/* Range 0x7F8D - 0x7F91, array index: 0x0B4B */
-	0x5527,INVALC,0x5528,0x5529,0x552A,
-	/* Range 0x7FFD - 0x7FFF, array index: 0x0B50 */
-	0x5545,0x5546,0x5547,
-	/* Range 0x800D - 0x8016, array index: 0x0B53 */
-	0x554B,0x554C,0x554D,INVALC,0x554E,INVALC,0x554F,0x5550,
-	INVALC,0x5551,
-	/* Range 0x801D - 0x8020, array index: 0x0B5D */
-	0x5552,0x5553,0x5554,0x5555,
-	/* Range 0x80D4 - 0x80D8, array index: 0x0B61 */
-	0x5578,0x5579,INVALC,0x557A,0x557B,
-	/* Range 0x8116 - 0x8118, array index: 0x0B66 */
-	0x562A,0x562B,0x562C,
-	/* Range 0x8167 - 0x8169, array index: 0x0B69 */
-	0x563F,0x5640,0x5641,
-	/* Range 0x8184 - 0x8186, array index: 0x0B6C */
-	0x5647,0x5648,0x5649,
-	/* Range 0x81F0 - 0x81F9, array index: 0x0B6F */
-	0x5664,0x5665,0x5666,INVALC,INVALC,0x5667,0x5668,INVALC,
-	0x5669,0x566A,
-	/* Range 0x8243 - 0x8246, array index: 0x0B79 */
-	0x567B,0x567C,0x567D,0x567E,
-	/* Range 0x827D - 0x8284, array index: 0x0B7D */
-	0x572D,INVALC,0x572E,0x572F,0x5730,INVALC,0x5731,0x5732,
-	/* Range 0x82A0 - 0x82AA, array index: 0x0B85 */
-	0x573D,0x573E,INVALC,0x573F,0x5740,INVALC,INVALC,0x5741,
-	0x5742,0x5743,0x5744,
-	/* Range 0x82FD - 0x8301, array index: 0x0B90 */
-	0x575B,0x575C,INVALC,0x575D,0x575E,
-	/* Range 0x8307 - 0x830B, array index: 0x0B95 */
-	0x575F,0x5760,INVALC,0x5761,0x5762,
-	/* Range 0x831B - 0x8322, array index: 0x0B9A */
-	0x5764,INVALC,0x5765,0x5766,0x5767,INVALC,0x5768,0x5769,
-	/* Range 0x832C - 0x8330, array index: 0x0BA2 */
-	0x576A,0x576B,0x576C,INVALC,0x576D,
-	/* Range 0x8342 - 0x8344, array index: 0x0BA7 */
-	0x5773,0x5774,0x5775,
-	/* Range 0x8351 - 0x8357, array index: 0x0BAA */
-	0x5779,INVALC,0x583E,0x5763,0x577A,0x577B,0x577C,
-	/* Range 0x8398 - 0x839D, array index: 0x0BB1 */
-	0x582B,0x582C,INVALC,0x582D,0x582E,0x582F,
-	/* Range 0x83BE - 0x83C0, array index: 0x0BB7 */
-	0x5834,0x5835,0x5836,
-	/* Range 0x83CF - 0x83D1, array index: 0x0BBA */
-	0x5839,0x583A,0x583B,
-	/* Range 0x8456 - 0x845C, array index: 0x0BBD */
-	0x5857,INVALC,0x5858,0x5859,0x585A,INVALC,0x585B,
-	/* Range 0x84A6 - 0x84AA, array index: 0x0BC4 */
-	0x586E,INVALC,0x586F,0x5870,0x5871,
-	/* Range 0x84EF - 0x84F2, array index: 0x0BC9 */
-	0x5924,0x5925,0x5926,0x5927,
-	/* Range 0x8522 - 0x852B, array index: 0x0BCD */
-	0x5935,0x5936,0x5937,0x5938,INVALC,0x5939,INVALC,INVALC,
-	0x593A,0x593B,
-	/* Range 0x8532 - 0x8536, array index: 0x0BD7 */
-	0x5929,0x593D,0x593E,INVALC,0x593F,
-	/* Range 0x854F - 0x8553, array index: 0x0BDC */
-	0x5942,0x5943,0x5944,0x5945,0x5946,
-	/* Range 0x855C - 0x8564, array index: 0x0BE1 */
-	0x5949,0x594A,0x594B,0x594C,0x594D,0x594E,0x594F,INVALC,
-	0x5950,
-	/* Range 0x8579 - 0x8581, array index: 0x0BEA */
-	0x5953,0x5954,0x5955,INVALC,0x5956,INVALC,0x5957,INVALC,
-	0x5958,
-	/* Range 0x85B4 - 0x85BF, array index: 0x0BF3 */
-	0x5967,INVALC,0x5968,0x5969,0x596A,INVALC,INVALC,INVALC,
-	0x596B,0x596C,0x596D,0x596E,
-	/* Range 0x860D - 0x8612, array index: 0x0BFF */
-	0x5A25,0x5A26,INVALC,0x5A27,0x5A28,0x5A29,
-	/* Range 0x863C - 0x8642, array index: 0x0C05 */
-	0x5A34,0x5A35,INVALC,INVALC,0x5A36,0x3866,0x5A37,
-	/* Range 0x8652 - 0x8659, array index: 0x0C0C */
-	0x5A39,0x5A3A,INVALC,INVALC,0x5A3B,0x5A3C,0x5A3D,0x5A3E,
-	/* Range 0x8660 - 0x8664, array index: 0x0C14 */
-	0x5A40,0x5A41,0x5A42,0x5A43,0x5A44,
-	/* Range 0x8675 - 0x8677, array index: 0x0C19 */
-	0x5A48,0x5A49,0x5A4A,
-	/* Range 0x86A6 - 0x86A8, array index: 0x0C1C */
-	0x5A53,0x5A54,0x5A55,
-	/* Range 0x86B1 - 0x86B9, array index: 0x0C1F */
-	0x5A57,INVALC,0x5A58,0x5A59,0x5A5A,INVALC,0x5A5B,0x5A5C,
-	0x5A5D,
-	/* Range 0x86BF - 0x86C5, array index: 0x0C28 */
-	0x5A5E,0x5A5F,0x5A60,INVALC,0x5A61,INVALC,0x5A62,
-	/* Range 0x870E - 0x8714, array index: 0x0C2F */
-	0x5A75,0x5A76,0x5A77,INVALC,INVALC,0x5A78,0x5A79,
-	/* Range 0x872E - 0x8732, array index: 0x0C36 */
-	0x5B22,0x5B23,INVALC,0x5B24,0x5B25,
-	/* Range 0x8739 - 0x8740, array index: 0x0C3B */
-	0x5B26,0x5B27,INVALC,0x5B28,0x5B29,0x5B2A,INVALC,0x5B2B,
-	/* Range 0x8783 - 0x878C, array index: 0x0C43 */
-	0x5B38,0x5B39,0x5B3A,0x5B3B,0x5B3C,0x5B3D,0x5B3E,INVALC,
-	0x5B3F,0x5B40,
-	/* Range 0x8795 - 0x8799, array index: 0x0C4D */
-	0x5B43,INVALC,0x5B44,0x5B45,0x5B46,
-	/* Range 0x87AC - 0x87AE, array index: 0x0C52 */
-	0x5B4B,0x5B4C,0x5B4D,
-	/* Range 0x87C8 - 0x87CA, array index: 0x0C55 */
-	0x5B53,0x5B54,0x5B55,
-	/* Range 0x87E2 - 0x87E4, array index: 0x0C58 */
-	0x5B5D,0x5B5E,0x5B5F,
-	/* Range 0x8809 - 0x880B, array index: 0x0C5B */
-	0x5B6B,0x5B6C,0x5B6D,
-	/* Range 0x8810 - 0x881F, array index: 0x0C5E */
-	0x5B6E,INVALC,0x5B70,0x5B71,0x5B72,INVALC,INVALC,INVALC,
-	0x5B73,0x5B6F,0x5B74,0x5B75,0x5B76,INVALC,0x5B77,0x5B78,
-	/* Range 0x8848 - 0x884B, array index: 0x0C6E */
-	0x5C26,0x5C27,0x5C28,0x5C29,
-	/* Range 0x8898 - 0x88A0, array index: 0x0C72 */
-	0x5C39,INVALC,0x5C3A,0x5C3B,0x5C3C,INVALC,INVALC,0x5C3D,
-	0x5C3E,
-	/* Range 0x88CA - 0x88D3, array index: 0x0C7B */
-	0x5C45,0x5C46,0x5C47,0x5C48,0x5C49,INVALC,INVALC,0x5C4A,
-	0x5C4B,0x5C4C,
-	/* Range 0x88EF - 0x88F1, array index: 0x0C85 */
-	0x5C50,0x5C51,0x5C52,
-	/* Range 0x890D - 0x890F, array index: 0x0C88 */
-	0x5C57,0x5C58,0x5C59,
-	/* Range 0x8915 - 0x891C, array index: 0x0C8B */
-	0x5C5A,0x5C5B,INVALC,0x5C5C,0x5C5D,0x5C5E,INVALC,0x5C5F,
-	/* Range 0x8926 - 0x8928, array index: 0x0C93 */
-	0x5C61,0x5C62,0x5C63,
-	/* Range 0x8930 - 0x8932, array index: 0x0C96 */
-	0x5C64,0x5C65,0x5C66,
-	/* Range 0x895A - 0x895C, array index: 0x0C99 */
-	0x5C73,0x5C74,0x5C75,
-	/* Range 0x8961 - 0x8963, array index: 0x0C9C */
-	0x5C76,0x5C77,0x5C78,
-	/* Range 0x897A - 0x897D, array index: 0x0C9F */
-	0x5C7E,0x5D21,0x5D22,0x5D23,
-	/* Range 0x89B4 - 0x89B7, array index: 0x0CA3 */
-	0x5D2F,0x5D30,0x5D31,0x5D32,
-	/* Range 0x89D4 - 0x89D8, array index: 0x0CA7 */
-	0x5D34,0x5D35,0x5D36,0x5D37,0x5D38,
-	/* Range 0x8A11 - 0x8A15, array index: 0x0CAC */
-	0x5D47,0x5D48,INVALC,0x5D49,0x5D4A,
-	/* Range 0x8A56 - 0x8A58, array index: 0x0CB1 */
-	0x5D5F,0x5D60,0x5D61,
-	/* Range 0x8A75 - 0x8A80, array index: 0x0CB4 */
-	0x5D67,0x5D68,0x5D69,INVALC,0x5D6A,0x5D6B,0x5D6C,INVALC,
-	INVALC,0x5D6D,0x5D6E,0x5D6F,
-	/* Range 0x8AC6 - 0x8ACA, array index: 0x0CC0 */
-	0x5E26,INVALC,0x5E27,0x5E28,0x5E29,
-	/* Range 0x8AD1 - 0x8AD7, array index: 0x0CC5 */
-	0x5E2A,INVALC,0x5E2B,0x5E2C,0x5E2D,INVALC,0x5E2E,
-	/* Range 0x8AF4 - 0x8AF6, array index: 0x0CCC */
-	0x5E33,0x5E34,0x5E35,
-	/* Range 0x8B42 - 0x8B48, array index: 0x0CCF */
-	0x5E44,0x5E45,0x5E46,0x5E47,0x5E48,INVALC,0x5E49,
-	/* Range 0x8B52 - 0x8B54, array index: 0x0CD6 */
-	0x5E4A,0x5E4B,0x5E4C,
-	/* Range 0x8C53 - 0x8C5D, array index: 0x0CD9 */
-	0x5E6C,0x5E6D,INVALC,INVALC,0x5E6E,0x5E6F,0x5E72,INVALC,
-	0x5E70,INVALC,0x5E71,
-	/* Range 0x8D9E - 0x8DA0, array index: 0x0CE4 */
-	0x5F52,0x5F53,0x5F54,
-	/* Range 0x8DC5 - 0x8DCA, array index: 0x0CE7 */
-	0x5F5F,0x5F60,0x5F61,0x5F62,INVALC,0x5F63,
-	/* Range 0x8DF0 - 0x8DF4, array index: 0x0CED */
-	0x5F6E,0x5F70,0x5F71,INVALC,0x5F72,
-	/* Range 0x8E04 - 0x8E06, array index: 0x0CF2 */
-	0x5F75,0x5F76,0x5F77,
-	/* Range 0x8E20 - 0x8E27, array index: 0x0CF5 */
-	0x5F7C,0x5F7D,0x5F7E,0x6021,INVALC,INVALC,0x6022,0x6023,
-	/* Range 0x8E36 - 0x8E39, array index: 0x0CFD */
-	0x6026,0x6027,0x6028,0x6029,
-	/* Range 0x8E4B - 0x8E4F, array index: 0x0D01 */
-	0x602D,INVALC,0x602E,0x602F,0x6030,
-	/* Range 0x8E5B - 0x8E62, array index: 0x0D06 */
-	0x6032,0x6033,0x6034,0x6035,INVALC,INVALC,0x6036,0x6037,
-	/* Range 0x8E6C - 0x8E71, array index: 0x0D0E */
-	0x6039,0x603A,INVALC,0x603B,0x603C,0x603D,
-	/* Range 0x8E79 - 0x8E7B, array index: 0x0D14 */
-	0x603E,0x603F,0x6040,
-	/* Range 0x8E9A - 0x8E9E, array index: 0x0D17 */
-	0x6047,0x6048,INVALC,0x6049,0x604A,
-	/* Range 0x8EC0 - 0x8EC4, array index: 0x0D1C */
-	0x6054,0x6055,INVALC,0x6056,0x6057,
-	/* Range 0x8EED - 0x8EF1, array index: 0x0D21 */
-	0x6064,0x605E,INVALC,0x605F,0x6060,
-	/* Range 0x8F16 - 0x8F18, array index: 0x0D26 */
-	0x606B,0x606C,0x606D,
-	/* Range 0x8F2C - 0x8F2E, array index: 0x0D29 */
-	0x6075,0x6076,0x6077,
-	/* Range 0x8F34 - 0x8F37, array index: 0x0D2C */
-	0x6078,0x6079,0x607A,0x607B,
-	/* Range 0x8F4F - 0x8F55, array index: 0x0D30 */
-	0x6123,INVALC,0x6124,0x6125,0x6126,0x6127,0x6128,
-	/* Range 0x8FA0 - 0x8FA6, array index: 0x0D37 */
-	0x612E,0x612F,INVALC,INVALC,0x6130,0x6131,0x6132,
-	/* Range 0x9028 - 0x902F, array index: 0x0D3E */
-	0x6151,0x6152,0x6154,INVALC,0x6155,0x6156,INVALC,0x6153,
-	/* Range 0x9095 - 0x909B, array index: 0x0D46 */
-	0x616D,INVALC,0x616E,0x616F,0x6170,INVALC,0x6171,
-	/* Range 0x90A0 - 0x90A2, array index: 0x0D4D */
-	0x6172,0x6173,0x6174,
-	/* Range 0x90B0 - 0x90B6, array index: 0x0D50 */
-	0x6176,INVALC,0x6177,0x6178,0x6179,INVALC,0x617A,
-	/* Range 0x90C3 - 0x90C8, array index: 0x0D57 */
-	0x617E,0x6221,0x6222,INVALC,0x6223,0x6224,
-	/* Range 0x90D5 - 0x90DF, array index: 0x0D5D */
-	0x6225,INVALC,0x6226,0x6227,0x6228,INVALC,INVALC,0x6229,
-	0x622A,INVALC,0x622B,
-	/* Range 0x90FE - 0x9108, array index: 0x0D68 */
-	0x6233,0x6234,0x6235,INVALC,INVALC,INVALC,0x6236,0x6237,
-	0x6238,INVALC,0x6239,
-	/* Range 0x9114 - 0x9129, array index: 0x0D73 */
-	0x623C,INVALC,0x623D,0x623E,0x623F,INVALC,0x6240,INVALC,
-	0x6241,INVALC,0x6242,INVALC,0x6243,INVALC,0x6245,0x6246,
-	INVALC,0x6244,INVALC,0x6247,INVALC,0x6248,
-	/* Range 0x9136 - 0x913D, array index: 0x0D89 */
-	0x624D,0x624E,INVALC,0x624F,0x6250,INVALC,0x6251,0x6252,
-	/* Range 0x9157 - 0x915B, array index: 0x0D91 */
-	0x6258,INVALC,0x6259,0x625A,0x625B,
-	/* Range 0x9179 - 0x917B, array index: 0x0D96 */
-	0x6261,0x6262,0x6263,
-	/* Range 0x9191 - 0x9195, array index: 0x0D99 */
-	0x626A,INVALC,0x626B,0x626C,0x626D,
-	/* Range 0x91AC - 0x91B3, array index: 0x0D9E */
-	0x6273,0x6274,0x6275,INVALC,0x6276,0x6277,0x6278,0x6279,
-	/* Range 0x91BB - 0x91C5, array index: 0x0DA6 */
-	0x627B,0x627C,0x627D,INVALC,0x627E,INVALC,INVALC,0x6321,
-	0x6322,INVALC,0x6323,
-	/* Range 0x91E9 - 0x91F1, array index: 0x0DB1 */
-	0x632C,0x632D,INVALC,0x632E,0x632F,0x6330,0x6331,0x6332,
-	0x6333,
-	/* Range 0x9200 - 0x920C, array index: 0x0DBA */
-	0x6338,0x6339,INVALC,INVALC,0x633A,0x633B,0x633C,0x633D,
-	INVALC,0x633E,0x633F,INVALC,0x6340,
-	/* Range 0x9223 - 0x9228, array index: 0x0DC7 */
-	0x6348,0x6349,0x634A,0x634B,INVALC,0x634C,
-	/* Range 0x922E - 0x9230, array index: 0x0DCD */
-	0x634D,0x634E,0x634F,
-	/* Range 0x9235 - 0x9247, array index: 0x0DD0 */
-	0x6351,0x6352,INVALC,0x6353,0x6354,0x6355,INVALC,0x6356,
-	INVALC,0x6357,INVALC,0x6358,INVALC,0x6359,0x635A,INVALC,
-	INVALC,0x635B,0x635C,
-	/* Range 0x924D - 0x9251, array index: 0x0DE3 */
-	0x635E,0x635F,0x6360,INVALC,0x6361,
-	/* Range 0x9265 - 0x9269, array index: 0x0DE8 */
-	0x6368,INVALC,0x6369,0x636A,0x636B,
-	/* Range 0x926E - 0x9270, array index: 0x0DED */
-	0x636C,0x636D,0x636E,
-	/* Range 0x9275 - 0x927F, array index: 0x0DF0 */
-	0x636F,0x6370,0x6371,0x6372,0x6373,INVALC,0x6374,0x6375,
-	0x6376,INVALC,0x6377,
-	/* Range 0x9288 - 0x928E, array index: 0x0DFB */
-	0x6378,0x6379,0x637A,INVALC,INVALC,0x637B,0x637C,
-	/* Range 0x92A4 - 0x92A8, array index: 0x0E02 */
-	0x6424,0x6425,INVALC,0x6426,0x6427,
-	/* Range 0x92B8 - 0x92D0, array index: 0x0E07 */
-	0x642C,INVALC,0x642D,0x642E,0x642F,0x6430,INVALC,0x6431,
-	0x6432,0x6433,0x6434,0x6435,INVALC,0x6436,0x6437,0x6438,
-	0x6439,INVALC,INVALC,0x643A,0x643B,0x643C,0x643D,INVALC,
-	0x643E,
-	/* Range 0x92D5 - 0x92E8, array index: 0x0E20 */
-	0x6440,INVALC,0x6441,0x6442,0x6443,INVALC,INVALC,0x6444,
-	0x6445,INVALC,0x6446,0x6447,0x6448,INVALC,0x6449,INVALC,
-	0x644A,INVALC,0x644B,0x644C,
-	/* Range 0x931C - 0x932A, array index: 0x0E34 */
-	0x645A,0x645B,0x645C,0x645D,INVALC,0x645E,INVALC,INVALC,
-	0x645F,0x6460,INVALC,0x6461,INVALC,0x6462,0x6463,
-	/* Range 0x9333 - 0x9337, array index: 0x0E43 */
-	0x6464,0x6465,INVALC,0x6466,0x6467,
-	/* Range 0x9347 - 0x9349, array index: 0x0E48 */
-	0x6468,0x6469,0x646A,
-	/* Range 0x9350 - 0x9352, array index: 0x0E4B */
-	0x646B,0x646C,0x646D,
-	/* Range 0x936D - 0x9376, array index: 0x0E4E */
-	0x6478,INVALC,0x6479,0x647A,0x647B,INVALC,0x647C,0x647D,
-	INVALC,0x647E,
-	/* Range 0x937D - 0x9382, array index: 0x0E58 */
-	0x6522,INVALC,0x6523,0x6524,0x6525,0x6526,
-	/* Range 0x93B4 - 0x93B6, array index: 0x0E5E */
-	0x6537,0x6538,0x6539,
-	/* Range 0x93C4 - 0x93CD, array index: 0x0E61 */
-	0x653D,0x653E,0x653F,0x6540,INVALC,0x6541,0x6542,0x6543,
-	0x6544,0x6545,
-	/* Range 0x93F7 - 0x93FD, array index: 0x0E6B */
-	0x654F,0x6550,0x654E,0x6551,0x6552,INVALC,0x6553,
-	/* Range 0x940D - 0x940F, array index: 0x0E72 */
-	0x6559,0x655A,0x655B,
-	/* Range 0x9415 - 0x9417, array index: 0x0E75 */
-	0x655C,0x655D,0x655E,
-	/* Range 0x942E - 0x9434, array index: 0x0E78 */
-	0x6560,0x6561,INVALC,0x6562,0x6563,0x6564,0x6565,
-	/* Range 0x946B - 0x9472, array index: 0x0E7F */
-	0x6575,INVALC,0x6576,0x6577,0x6578,INVALC,0x6579,0x657A,
-	/* Range 0x958C - 0x958E, array index: 0x0E87 */
-	0x6624,0x6625,0x6626,
-	/* Range 0x959D - 0x95A1, array index: 0x0E8A */
-	0x6627,0x6628,0x6629,INVALC,0x662A,
-	/* Range 0x95D0 - 0x95D3, array index: 0x0E8F */
-	0x6638,0x6639,0x663A,0x663B,
-	/* Range 0x95D9 - 0x95E0, array index: 0x0E93 */
-	0x663C,0x663D,INVALC,INVALC,0x663E,0x663F,0x6640,0x6641,
-	/* Range 0x9622 - 0x9626, array index: 0x0E9B */
-	0x6646,INVALC,0x6647,0x6648,0x6649,
-	/* Range 0x9637 - 0x963D, array index: 0x0EA0 */
-	0x664D,0x664E,0x664F,0x6650,INVALC,0x6651,0x6652,
-	/* Range 0x9654 - 0x9658, array index: 0x0EA7 */
-	0x6655,INVALC,0x6656,0x6657,0x6658,
-	/* Range 0x967B - 0x9684, array index: 0x0EAC */
-	0x665C,0x665D,INVALC,0x665E,0x665F,INVALC,0x6660,0x6661,
-	0x6662,0x6663,
-	/* Range 0x96A4 - 0x96A6, array index: 0x0EB6 */
-	0x666A,0x666B,0x666C,
-	/* Range 0x96DD - 0x96DF, array index: 0x0EB9 */
-	0x6677,0x6678,0x6679,
-	/* Range 0x9721 - 0x9723, array index: 0x0EBC */
-	0x6727,0x6728,0x6729,
-	/* Range 0x9757 - 0x975B, array index: 0x0EBF */
-	0x6733,0x6734,INVALC,0x6735,0x6736,
-	/* Range 0x9776 - 0x9778, array index: 0x0EC4 */
-	0x673C,0x673D,0x673E,
-	/* Range 0x9795 - 0x979A, array index: 0x0EC7 */
-	0x6744,0x6745,0x6746,INVALC,0x6747,0x6748,
-	/* Range 0x97B5 - 0x97D1, array index: 0x0ECD */
-	0x6750,0x6751,INVALC,0x6752,0x6753,0x6754,INVALC,0x6755,
-	INVALC,0x6756,0x6757,INVALC,0x6758,INVALC,INVALC,0x6759,
-	0x675A,INVALC,0x675B,INVALC,0x675C,0x675D,INVALC,0x675E,
-	0x675F,0x6760,INVALC,0x6761,0x6762,
-	/* Range 0x97D7 - 0x97E1, array index: 0x0EEA */
-	0x6764,0x6765,0x6766,INVALC,0x676A,INVALC,0x6767,0x6768,
-	INVALC,0x6769,0x676B,
-	/* Range 0x982E - 0x9835, array index: 0x0EF5 */
-	0x6822,0x6823,0x6824,INVALC,0x6825,0x6826,INVALC,0x6827,
-	/* Range 0x9851 - 0x985A, array index: 0x0EFD */
-	0x682D,0x682E,0x682F,INVALC,INVALC,0x6830,0x6831,INVALC,
-	0x6832,0x6833,
-	/* Range 0x9862 - 0x9866, array index: 0x0F07 */
-	0x6834,0x6835,INVALC,0x6836,0x6837,
-	/* Range 0x98B7 - 0x98BB, array index: 0x0F0C */
-	0x683F,0x6840,INVALC,0x6841,0x6842,
-	/* Range 0x98E3 - 0x98E7, array index: 0x0F11 */
-	0x6849,INVALC,0x684A,0x684B,0x684C,
-	/* Range 0x9915 - 0x991C, array index: 0x0F16 */
-	0x6854,0x6855,0x6856,INVALC,INVALC,0x6857,0x6858,0x6859,
-	/* Range 0x9931 - 0x993C, array index: 0x0F1E */
-	0x685F,0x6860,0x6861,0x6862,0x6863,INVALC,INVALC,INVALC,
-	0x6864,0x6865,0x6866,0x6867,
-	/* Range 0x9946 - 0x9948, array index: 0x0F2A */
-	0x686A,0x686B,0x686C,
-	/* Range 0x9958 - 0x9960, array index: 0x0F2D */
-	0x6870,0x6871,INVALC,0x6872,0x6873,INVALC,0x6874,0x6875,
-	0x6876,
-	/* Range 0x99B0 - 0x99B2, array index: 0x0F36 */
-	0x687B,0x687C,0x687D,
-	/* Range 0x99EA - 0x99EC, array index: 0x0F39 */
-	0x692E,0x692F,0x6930,
-	/* Range 0x9A02 - 0x9A04, array index: 0x0F3C */
-	0x6937,0x6938,0x6939,
-	/* Range 0x9A20 - 0x9A24, array index: 0x0F3F */
-	0x6940,INVALC,0x6941,0x6942,0x6943,
-	/* Range 0x9A4A - 0x9A4E, array index: 0x0F44 */
-	0x694E,0x694F,0x6950,INVALC,0x6951,
-	/* Range 0x9AB2 - 0x9AB6, array index: 0x0F49 */
-	0x695A,INVALC,0x695B,0x695C,0x695D,
-	/* Range 0x9AD5 - 0x9AD7, array index: 0x0F4E */
-	0x6969,0x696A,0x696B,
-	/* Range 0x9AFD - 0x9B12, array index: 0x0F51 */
-	0x6979,INVALC,0x697A,0x697B,0x697C,0x697D,0x697E,0x6A21,
-	0x6A22,INVALC,INVALC,0x6A23,0x6A24,INVALC,0x6A25,0x6A26,
-	0x6A27,0x6A28,INVALC,0x6A29,INVALC,0x6A2A,
-	/* Range 0x9B33 - 0x9B3A, array index: 0x0F67 */
-	0x6A33,0x6A34,0x6A35,INVALC,0x6A36,INVALC,0x6A37,0x6A38,
-	/* Range 0x9B55 - 0x9B57, array index: 0x0F6F */
-	0x6A3D,0x6A3E,0x6A3F,
-	/* Range 0x9B68 - 0x9B6E, array index: 0x0F72 */
-	0x6A46,INVALC,0x6A47,0x6A48,0x6A49,0x6A4A,0x6A4B,
-	/* Range 0x9B75 - 0x9B79, array index: 0x0F79 */
-	0x6A4D,INVALC,0x6A4E,0x6A4F,0x6A50,
-	/* Range 0x9B84 - 0x9B90, array index: 0x0F7E */
-	0x6A53,0x6A54,0x6A55,0x6A56,INVALC,0x6A57,0x6A58,0x6A59,
-	INVALC,0x6A5A,INVALC,0x6A5B,0x6A5C,
-	/* Range 0x9BB0 - 0x9BB2, array index: 0x0F8B */
-	0x6A65,0x6A66,0x6A67,
-	/* Range 0x9BBB - 0x9BC1, array index: 0x0F8E */
-	0x6A6A,0x6A6B,INVALC,0x6A6C,0x6A6D,INVALC,0x6A6E,
-	/* Range 0x9BF7 - 0x9BFA, array index: 0x0F95 */
-	0x6A7D,0x6A7E,0x6B21,0x6B22,
-	/* Range 0x9C16 - 0x9C1E, array index: 0x0F99 */
-	0x6B2A,INVALC,0x6B2B,0x6B2C,0x6B2D,INVALC,0x6B2E,INVALC,
-	0x6B2F,
-	/* Range 0x9C22 - 0x9C2A, array index: 0x0FA2 */
-	0x6B30,0x6B31,INVALC,INVALC,0x6B32,0x6B33,0x6B34,0x6B35,
-	0x6B36,
-	/* Range 0x9C35 - 0x9C37, array index: 0x0FAB */
-	0x6B38,0x6B39,0x6B3A,
-	/* Range 0x9C41 - 0x9C45, array index: 0x0FAE */
-	0x6B3C,INVALC,0x6B3D,0x6B3E,0x6B3F,
-	/* Range 0x9C4E - 0x9C5F, array index: 0x0FB3 */
-	0x6B42,0x6B43,0x6B44,INVALC,INVALC,0x6B45,0x6B46,INVALC,
-	0x6B47,INVALC,0x6B48,INVALC,INVALC,0x6B49,0x6B50,0x6B4A,
-	0x6B4B,0x6B4C,
-	/* Range 0x9C68 - 0x9C6B, array index: 0x0FC5 */
-	0x6B52,0x6B4E,0x6B4F,0x6B51,
-	/* Range 0x9D1C - 0x9D1E, array index: 0x0FC9 */
-	0x6B62,0x6B63,0x6B64,
-	/* Range 0x9D2F - 0x9D34, array index: 0x0FCC */
-	0x6B65,0x6B66,INVALC,0x6B67,0x6B68,0x6B69,
-	/* Range 0x9D69 - 0x9D6B, array index: 0x0FD2 */
-	0x6B78,0x6B79,0x6B7A,
-	/* Range 0x9D92 - 0x9D98, array index: 0x0FD5 */
-	0x6C29,0x6C2A,INVALC,0x6C2B,0x6C2C,0x6C2D,0x6C2E,
-	/* Range 0x9DD4 - 0x9DD7, array index: 0x0FDC */
-	0x6C3C,0x6C3D,0x6C3E,0x6C3F,
-	/* Range 0x9DDE - 0x9DE0, array index: 0x0FE0 */
-	0x6C41,0x6C42,0x6C43,
-	/* Range 0x9E0E - 0x9E16, array index: 0x0FE3 */
-	0x6C50,INVALC,0x6C51,0x6C52,0x6C53,INVALC,INVALC,0x6C54,
-	0x6C55,
-	/* Range 0x9E7A - 0x9E7C, array index: 0x0FEC */
-	0x6C59,0x6C5A,0x6C5B,
-	/* Range 0x9E80 - 0x9E87, array index: 0x0FEF */
-	0x6C5C,INVALC,0x6C5D,0x6C5E,0x6C5F,0x6C60,INVALC,0x6C61,
-	/* Range 0x9EAC - 0x9EB5, array index: 0x0FF7 */
-	0x6C6A,INVALC,0x6C6B,0x6C6C,0x6C6D,INVALC,INVALC,0x6C6E,
-	0x6C6F,0x6C70,
-	/* Range 0x9EEC - 0x9EF2, array index: 0x1001 */
-	0x6C78,0x6C79,0x6C7A,INVALC,0x6C7B,0x6C7C,0x6C7D,
-	/* Range 0x9F0F - 0x9F1B, array index: 0x1008 */
-	0x6D26,0x6D27,0x6D28,0x6D29,INVALC,0x6D2A,INVALC,0x6D2B,
-	0x6D2C,INVALC,0x6D2D,0x6D2E,0x6D2F,
-	/* Range 0x9F39 - 0x9F47, array index: 0x1015 */
-	0x6D3A,0x6D3B,INVALC,0x6D3C,0x6D3D,INVALC,0x6D3E,INVALC,
-	0x6D3F,INVALC,0x6D40,0x6D41,0x6D42,0x6D43,0x6D44,
-	/* Range 0x9F53 - 0x9F5E, array index: 0x1024 */
-	0x6D45,INVALC,0x6D46,0x6D47,0x6D48,0x6D49,INVALC,0x6D4A,
-	INVALC,INVALC,0x6D4B,0x6D4C,
-	/* Range 0x9F6D - 0x9F75, array index: 0x1030 */
-	0x6D4F,0x6D50,0x6D51,0x6D52,0x6D53,INVALC,0x6D54,INVALC,
-	0x6D55,
-	/* Range 0x9F8F - 0x9F97, array index: 0x1039 */
-	0x6D58,0x6D59,0x6D5A,0x6D5B,INVALC,0x6D5C,INVALC,0x6D5D,
-	0x6D5E,
-	/* Range 0x9FA1 - 0x9FA5, array index: 0x1042 */
-	0x6D60,0x6D61,0x6D62,INVALC,0x6D63,
-	/* Unranged codes (426 codes) */
-	/* Array index: 0x1047 */ 0x007E,0x2237,
-	/* Array index: 0x1047 */ 0x00A1,0x2242,
-	/* Array index: 0x1047 */ 0x00A4,0x2270,
-	/* Array index: 0x1047 */ 0x00A6,0x2243,
-	/* Array index: 0x1047 */ 0x00A9,0x226D,
-	/* Array index: 0x1047 */ 0x00AA,0x226C,
-	/* Array index: 0x1047 */ 0x00AE,0x226E,
-	/* Array index: 0x1047 */ 0x00AF,0x2234,
-	/* Array index: 0x1047 */ 0x00B8,0x2231,
-	/* Array index: 0x1047 */ 0x00BA,0x226B,
-	/* Array index: 0x1047 */ 0x01F5,0x2B39,
-	/* Array index: 0x1047 */ 0x02C7,0x2230,
-	/* Array index: 0x1047 */ 0x03C2,0x2678,
-	/* Array index: 0x1047 */ 0x2116,0x2271,
-	/* Array index: 0x1047 */ 0x2122,0x226F,
-	/* Array index: 0x1047 */ 0x4E02,0x3021,
-	/* Array index: 0x1047 */ 0x4E04,0x3022,
-	/* Array index: 0x1047 */ 0x4E05,0x3023,
-	/* Array index: 0x1047 */ 0x4E0C,0x3024,
-	/* Array index: 0x1047 */ 0x4E12,0x3025,
-	/* Array index: 0x1047 */ 0x4E1F,0x3026,
-	/* Array index: 0x1047 */ 0x4E23,0x3027,
-	/* Array index: 0x1047 */ 0x4E24,0x3028,
-	/* Array index: 0x1047 */ 0x4E28,0x3029,
-	/* Array index: 0x1047 */ 0x4E2B,0x302A,
-	/* Array index: 0x1047 */ 0x4E35,0x302E,
-	/* Array index: 0x1047 */ 0x4E40,0x302F,
-	/* Array index: 0x1047 */ 0x4E41,0x3030,
-	/* Array index: 0x1047 */ 0x4E44,0x3031,
-	/* Array index: 0x1047 */ 0x4E47,0x3032,
-	/* Array index: 0x1047 */ 0x4E51,0x3033,
-	/* Array index: 0x1047 */ 0x4E5A,0x3034,
-	/* Array index: 0x1047 */ 0x4E5C,0x3035,
-	/* Array index: 0x1047 */ 0x4E63,0x3036,
-	/* Array index: 0x1047 */ 0x4E68,0x3037,
-	/* Array index: 0x1047 */ 0x4E69,0x3038,
-	/* Array index: 0x1047 */ 0x4E74,0x3039,
-	/* Array index: 0x1047 */ 0x4E75,0x303A,
-	/* Array index: 0x1047 */ 0x4E79,0x303B,
-	/* Array index: 0x1047 */ 0x4E7F,0x303C,
-	/* Array index: 0x1047 */ 0x4E8D,0x303D,
-	/* Array index: 0x1047 */ 0x4E96,0x303E,
-	/* Array index: 0x1047 */ 0x4E97,0x303F,
-	/* Array index: 0x1047 */ 0x4E9D,0x3040,
-	/* Array index: 0x1047 */ 0x4EAF,0x3041,
-	/* Array index: 0x1047 */ 0x4EB9,0x3042,
-	/* Array index: 0x1047 */ 0x4EC3,0x3043,
-	/* Array index: 0x1047 */ 0x4ED0,0x3044,
-	/* Array index: 0x1047 */ 0x4EDA,0x3045,
-	/* Array index: 0x1047 */ 0x4EDB,0x3046,
-	/* Array index: 0x1047 */ 0x4EE8,0x304A,
-	/* Array index: 0x1047 */ 0x4EEF,0x304B,
-	/* Array index: 0x1047 */ 0x4EF1,0x304C,
-	/* Array index: 0x1047 */ 0x4EF3,0x304D,
-	/* Array index: 0x1047 */ 0x4EF5,0x304E,
-	/* Array index: 0x1047 */ 0x4F08,0x3055,
-	/* Array index: 0x1047 */ 0x4F0B,0x3056,
-	/* Array index: 0x1047 */ 0x4F0C,0x3057,
-	/* Array index: 0x1047 */ 0x4F12,0x3058,
-	/* Array index: 0x1047 */ 0x4F2E,0x305D,
-	/* Array index: 0x1047 */ 0x4F31,0x305E,
-	/* Array index: 0x1047 */ 0x4F33,0x3060,
-	/* Array index: 0x1047 */ 0x4F35,0x3061,
-	/* Array index: 0x1047 */ 0x4F37,0x3062,
-	/* Array index: 0x1047 */ 0x4F39,0x3063,
-	/* Array index: 0x1047 */ 0x4F3B,0x3064,
-	/* Array index: 0x1047 */ 0x4F3E,0x3065,
-	/* Array index: 0x1047 */ 0x4F40,0x3066,
-	/* Array index: 0x1047 */ 0x4F42,0x3067,
-	/* Array index: 0x1047 */ 0x4F52,0x306C,
-	/* Array index: 0x1047 */ 0x4F54,0x306D,
-	/* Array index: 0x1047 */ 0x4F56,0x306E,
-	/* Array index: 0x1047 */ 0x4F58,0x306F,
-	/* Array index: 0x1047 */ 0x4F5F,0x3070,
-	/* Array index: 0x1047 */ 0x4F60,0x305F,
-	/* Array index: 0x1047 */ 0x4F63,0x3071,
-	/* Array index: 0x1047 */ 0x4F6A,0x3072,
-	/* Array index: 0x1047 */ 0x4F6C,0x3073,
-	/* Array index: 0x1047 */ 0x4F6E,0x3074,
-	/* Array index: 0x1047 */ 0x4F71,0x3075,
-	/* Array index: 0x1047 */ 0x4F89,0x3122,
-	/* Array index: 0x1047 */ 0x4F8A,0x3123,
-	/* Array index: 0x1047 */ 0x4F8C,0x3124,
-	/* Array index: 0x1047 */ 0x4F8E,0x3125,
-	/* Array index: 0x1047 */ 0x4F97,0x312A,
-	/* Array index: 0x1047 */ 0x4F99,0x312B,
-	/* Array index: 0x1047 */ 0x4F9A,0x312C,
-	/* Array index: 0x1047 */ 0x4F9E,0x312D,
-	/* Array index: 0x1047 */ 0x4F9F,0x312E,
-	/* Array index: 0x1047 */ 0x4FB2,0x312F,
-	/* Array index: 0x1047 */ 0x4FB7,0x3130,
-	/* Array index: 0x1047 */ 0x4FD2,0x3140,
-	/* Array index: 0x1047 */ 0x4FDC,0x3141,
-	/* Array index: 0x1047 */ 0x4FE0,0x3142,
-	/* Array index: 0x1047 */ 0x4FE2,0x3143,
-	/* Array index: 0x1047 */ 0x4FF0,0x3144,
-	/* Array index: 0x1047 */ 0x4FF2,0x3145,
-	/* Array index: 0x1047 */ 0x5004,0x314B,
-	/* Array index: 0x1047 */ 0x5007,0x314C,
-	/* Array index: 0x1047 */ 0x500A,0x314D,
-	/* Array index: 0x1047 */ 0x500C,0x314E,
-	/* Array index: 0x1047 */ 0x500E,0x314F,
-	/* Array index: 0x1047 */ 0x5010,0x3150,
-	/* Array index: 0x1047 */ 0x5013,0x3151,
-	/* Array index: 0x1047 */ 0x5022,0x3158,
-	/* Array index: 0x1047 */ 0x5027,0x3159,
-	/* Array index: 0x1047 */ 0x502E,0x315A,
-	/* Array index: 0x1047 */ 0x5030,0x315B,
-	/* Array index: 0x1047 */ 0x5032,0x315C,
-	/* Array index: 0x1047 */ 0x5033,0x315D,
-	/* Array index: 0x1047 */ 0x5035,0x315E,
-	/* Array index: 0x1047 */ 0x503B,0x3176,
-	/* Array index: 0x1047 */ 0x504A,0x3164,
-	/* Array index: 0x1047 */ 0x504C,0x3165,
-	/* Array index: 0x1047 */ 0x504E,0x3166,
-	/* Array index: 0x1047 */ 0x5057,0x316A,
-	/* Array index: 0x1047 */ 0x5059,0x316B,
-	/* Array index: 0x1047 */ 0x506A,0x3172,
-	/* Array index: 0x1047 */ 0x506D,0x3173,
-	/* Array index: 0x1047 */ 0x5070,0x3174,
-	/* Array index: 0x1047 */ 0x5071,0x3175,
-	/* Array index: 0x1047 */ 0x5081,0x3177,
-	/* Array index: 0x1047 */ 0x5083,0x3178,
-	/* Array index: 0x1047 */ 0x5084,0x3179,
-	/* Array index: 0x1047 */ 0x5086,0x317A,
-	/* Array index: 0x1047 */ 0x508A,0x317B,
-	/* Array index: 0x1047 */ 0x50AA,0x322C,
-	/* Array index: 0x1047 */ 0x50AF,0x322D,
-	/* Array index: 0x1047 */ 0x50B0,0x322E,
-	/* Array index: 0x1047 */ 0x50B9,0x322F,
-	/* Array index: 0x1047 */ 0x50BA,0x3230,
-	/* Array index: 0x1047 */ 0x50BD,0x3231,
-	/* Array index: 0x1047 */ 0x50C0,0x3232,
-	/* Array index: 0x1047 */ 0x50C3,0x3233,
-	/* Array index: 0x1047 */ 0x50C4,0x3234,
-	/* Array index: 0x1047 */ 0x50C7,0x3235,
-	/* Array index: 0x1047 */ 0x50CC,0x3236,
-	/* Array index: 0x1047 */ 0x50CE,0x3237,
-	/* Array index: 0x1047 */ 0x50D0,0x3238,
-	/* Array index: 0x1047 */ 0x50D3,0x3239,
-	/* Array index: 0x1047 */ 0x50D4,0x323A,
-	/* Array index: 0x1047 */ 0x50D8,0x323B,
-	/* Array index: 0x1047 */ 0x50DC,0x323C,
-	/* Array index: 0x1047 */ 0x50DD,0x323D,
-	/* Array index: 0x1047 */ 0x50DF,0x323E,
-	/* Array index: 0x1047 */ 0x50E2,0x323F,
-	/* Array index: 0x1047 */ 0x50E4,0x3240,
-	/* Array index: 0x1047 */ 0x50E6,0x3241,
-	/* Array index: 0x1047 */ 0x50E8,0x3242,
-	/* Array index: 0x1047 */ 0x50E9,0x3243,
-	/* Array index: 0x1047 */ 0x50EF,0x3244,
-	/* Array index: 0x1047 */ 0x50F1,0x3245,
-	/* Array index: 0x1047 */ 0x50F2,0x3251,
-	/* Array index: 0x1047 */ 0x50F6,0x3246,
-	/* Array index: 0x1047 */ 0x50FA,0x3247,
-	/* Array index: 0x1047 */ 0x50FE,0x3248,
-	/* Array index: 0x1047 */ 0x5103,0x3249,
-	/* Array index: 0x1047 */ 0x5117,0x3253,
-	/* Array index: 0x1047 */ 0x5123,0x3259,
-	/* Array index: 0x1047 */ 0x5127,0x325A,
-	/* Array index: 0x1047 */ 0x5128,0x325B,
-	/* Array index: 0x1047 */ 0x512C,0x325C,
-	/* Array index: 0x1047 */ 0x512D,0x325D,
-	/* Array index: 0x1047 */ 0x512F,0x325E,
-	/* Array index: 0x1047 */ 0x5142,0x3265,
-	/* Array index: 0x1047 */ 0x514A,0x3266,
-	/* Array index: 0x1047 */ 0x514F,0x3267,
-	/* Array index: 0x1047 */ 0x5153,0x3268,
-	/* Array index: 0x1047 */ 0x5155,0x3269,
-	/* Array index: 0x1047 */ 0x5157,0x326A,
-	/* Array index: 0x1047 */ 0x5158,0x326B,
-	/* Array index: 0x1047 */ 0x515F,0x326C,
-	/* Array index: 0x1047 */ 0x5164,0x326D,
-	/* Array index: 0x1047 */ 0x5166,0x326E,
-	/* Array index: 0x1047 */ 0x517E,0x326F,
-	/* Array index: 0x1047 */ 0x5183,0x3270,
-	/* Array index: 0x1047 */ 0x5184,0x3271,
-	/* Array index: 0x1047 */ 0x518B,0x3272,
-	/* Array index: 0x1047 */ 0x518E,0x3273,
-	/* Array index: 0x1047 */ 0x5198,0x3274,
-	/* Array index: 0x1047 */ 0x519D,0x3275,
-	/* Array index: 0x1047 */ 0x51A1,0x3276,
-	/* Array index: 0x1047 */ 0x51A3,0x3277,
-	/* Array index: 0x1047 */ 0x51AD,0x3278,
-	/* Array index: 0x1047 */ 0x51B8,0x3279,
-	/* Array index: 0x1047 */ 0x51BA,0x327A,
-	/* Array index: 0x1047 */ 0x51BC,0x327B,
-	/* Array index: 0x1047 */ 0x51BE,0x327C,
-	/* Array index: 0x1047 */ 0x51BF,0x327D,
-	/* Array index: 0x1047 */ 0x51C2,0x327E,
-	/* Array index: 0x1047 */ 0x51C8,0x3321,
-	/* Array index: 0x1047 */ 0x51D8,0x3327,
-	/* Array index: 0x1047 */ 0x51DE,0x3328,
-	/* Array index: 0x1047 */ 0x51E2,0x3329,
-	/* Array index: 0x1047 */ 0x51E5,0x332A,
-	/* Array index: 0x1047 */ 0x51EE,0x332B,
-	/* Array index: 0x1047 */ 0x51F7,0x332F,
-	/* Array index: 0x1047 */ 0x5201,0x3330,
-	/* Array index: 0x1047 */ 0x5202,0x3331,
-	/* Array index: 0x1047 */ 0x5205,0x3332,
-	/* Array index: 0x1047 */ 0x5222,0x3338,
-	/* Array index: 0x1047 */ 0x5228,0x3339,
-	/* Array index: 0x1047 */ 0x5231,0x333A,
-	/* Array index: 0x1047 */ 0x5232,0x333B,
-	/* Array index: 0x1047 */ 0x5235,0x333C,
-	/* Array index: 0x1047 */ 0x523C,0x333D,
-	/* Array index: 0x1047 */ 0x5245,0x333E,
-	/* Array index: 0x1047 */ 0x5249,0x333F,
-	/* Array index: 0x1047 */ 0x5255,0x3340,
-	/* Array index: 0x1047 */ 0x5257,0x3341,
-	/* Array index: 0x1047 */ 0x5258,0x3342,
-	/* Array index: 0x1047 */ 0x525A,0x3343,
-	/* Array index: 0x1047 */ 0x525C,0x3344,
-	/* Array index: 0x1047 */ 0x5266,0x3348,
-	/* Array index: 0x1047 */ 0x526E,0x3349,
-	/* Array index: 0x1047 */ 0x5280,0x334D,
-	/* Array index: 0x1047 */ 0x5282,0x334E,
-	/* Array index: 0x1047 */ 0x5285,0x334F,
-	/* Array index: 0x1047 */ 0x528A,0x3350,
-	/* Array index: 0x1047 */ 0x528C,0x3351,
-	/* Array index: 0x1047 */ 0x52AF,0x335D,
-	/* Array index: 0x1047 */ 0x52B0,0x335E,
-	/* Array index: 0x1047 */ 0x52C0,0x3365,
-	/* Array index: 0x1047 */ 0x52C4,0x3366,
-	/* Array index: 0x1047 */ 0x52C6,0x3367,
-	/* Array index: 0x1047 */ 0x52C8,0x3368,
-	/* Array index: 0x1047 */ 0x52CC,0x3369,
-	/* Array index: 0x1047 */ 0x52CF,0x336A,
-	/* Array index: 0x1047 */ 0x52D1,0x336B,
-	/* Array index: 0x1047 */ 0x52D4,0x336C,
-	/* Array index: 0x1047 */ 0x52D6,0x336D,
-	/* Array index: 0x1047 */ 0x52DB,0x336E,
-	/* Array index: 0x1047 */ 0x52DC,0x336F,
-	/* Array index: 0x1047 */ 0x52E1,0x3370,
-	/* Array index: 0x1047 */ 0x52E5,0x3371,
-	/* Array index: 0x1047 */ 0x52F0,0x3376,
-	/* Array index: 0x1047 */ 0x52F1,0x3377,
-	/* Array index: 0x1047 */ 0x52F4,0x3378,
-	/* Array index: 0x1047 */ 0x52F6,0x3379,
-	/* Array index: 0x1047 */ 0x52F7,0x337A,
-	/* Array index: 0x1047 */ 0x5300,0x337B,
-	/* Array index: 0x1047 */ 0x5303,0x337C,
-	/* Array index: 0x1047 */ 0x5311,0x3422,
-	/* Array index: 0x1047 */ 0x5313,0x3423,
-	/* Array index: 0x1047 */ 0x5318,0x3424,
-	/* Array index: 0x1047 */ 0x5330,0x3430,
-	/* Array index: 0x1047 */ 0x5332,0x3431,
-	/* Array index: 0x1047 */ 0x5335,0x3432,
-	/* Array index: 0x1047 */ 0x5342,0x3436,
-	/* Array index: 0x1047 */ 0x534B,0x3438,
-	/* Array index: 0x1047 */ 0x534C,0x3437,
-	/* Array index: 0x1047 */ 0x5359,0x3439,
-	/* Array index: 0x1047 */ 0x535B,0x343A,
-	/* Array index: 0x1047 */ 0x5361,0x343B,
-	/* Array index: 0x1047 */ 0x5363,0x343C,
-	/* Array index: 0x1047 */ 0x5365,0x343D,
-	/* Array index: 0x1047 */ 0x536C,0x343E,
-	/* Array index: 0x1047 */ 0x536D,0x343F,
-	/* Array index: 0x1047 */ 0x5372,0x3440,
-	/* Array index: 0x1047 */ 0x5379,0x3441,
-	/* Array index: 0x1047 */ 0x537E,0x3442,
-	/* Array index: 0x1047 */ 0x5383,0x3443,
-	/* Array index: 0x1047 */ 0x5387,0x3444,
-	/* Array index: 0x1047 */ 0x5388,0x3445,
-	/* Array index: 0x1047 */ 0x538E,0x3446,
-	/* Array index: 0x1047 */ 0x5393,0x3447,
-	/* Array index: 0x1047 */ 0x5394,0x3448,
-	/* Array index: 0x1047 */ 0x5399,0x3449,
-	/* Array index: 0x1047 */ 0x539D,0x344A,
-	/* Array index: 0x1047 */ 0x53A1,0x344B,
-	/* Array index: 0x1047 */ 0x53A4,0x344C,
-	/* Array index: 0x1047 */ 0x53AA,0x344D,
-	/* Array index: 0x1047 */ 0x53AB,0x344E,
-	/* Array index: 0x1047 */ 0x53AF,0x344F,
-	/* Array index: 0x1047 */ 0x53B2,0x3450,
-	/* Array index: 0x1047 */ 0x53BD,0x3456,
-	/* Array index: 0x1047 */ 0x53C0,0x3457,
-	/* Array index: 0x1047 */ 0x53C5,0x3458,
-	/* Array index: 0x1047 */ 0x53CF,0x3459,
-	/* Array index: 0x1047 */ 0x53D2,0x345A,
-	/* Array index: 0x1047 */ 0x53D3,0x345B,
-	/* Array index: 0x1047 */ 0x53D5,0x345C,
-	/* Array index: 0x1047 */ 0x53DA,0x345D,
-	/* Array index: 0x1047 */ 0x53DD,0x345E,
-	/* Array index: 0x1047 */ 0x53DE,0x345F,
-	/* Array index: 0x1047 */ 0x53E0,0x3460,
-	/* Array index: 0x1047 */ 0x53E6,0x3461,
-	/* Array index: 0x1047 */ 0x53E7,0x3462,
-	/* Array index: 0x1047 */ 0x53F5,0x3463,
-	/* Array index: 0x1047 */ 0x5402,0x3464,
-	/* Array index: 0x1047 */ 0x5413,0x3465,
-	/* Array index: 0x1047 */ 0x541A,0x3466,
-	/* Array index: 0x1047 */ 0x5421,0x3467,
-	/* Array index: 0x1047 */ 0x5427,0x3468,
-	/* Array index: 0x1047 */ 0x5428,0x3469,
-	/* Array index: 0x1047 */ 0x542A,0x346A,
-	/* Array index: 0x1047 */ 0x542F,0x346B,
-	/* Array index: 0x1047 */ 0x5431,0x346C,
-	/* Array index: 0x1047 */ 0x5434,0x346D,
-	/* Array index: 0x1047 */ 0x5435,0x346E,
-	/* Array index: 0x1047 */ 0x5443,0x346F,
-	/* Array index: 0x1047 */ 0x5444,0x3470,
-	/* Array index: 0x1047 */ 0x5447,0x3471,
-	/* Array index: 0x1047 */ 0x544D,0x3472,
-	/* Array index: 0x1047 */ 0x544F,0x3473,
-	/* Array index: 0x1047 */ 0x545E,0x3474,
-	/* Array index: 0x1047 */ 0x5462,0x3475,
-	/* Array index: 0x1047 */ 0x5464,0x3476,
-	/* Array index: 0x1047 */ 0x5466,0x3477,
-	/* Array index: 0x1047 */ 0x5467,0x3478,
-	/* Array index: 0x1047 */ 0x5469,0x3479,
-	/* Array index: 0x1047 */ 0x546B,0x347A,
-	/* Array index: 0x1047 */ 0x546D,0x347B,
-	/* Array index: 0x1047 */ 0x546E,0x347C,
-	/* Array index: 0x1047 */ 0x5474,0x347D,
-	/* Array index: 0x1047 */ 0x547F,0x347E,
-	/* Array index: 0x1047 */ 0x5481,0x3521,
-	/* Array index: 0x1047 */ 0x5483,0x3522,
-	/* Array index: 0x1047 */ 0x5485,0x3523,
-	/* Array index: 0x1047 */ 0x5488,0x3524,
-	/* Array index: 0x1047 */ 0x5489,0x3525,
-	/* Array index: 0x1047 */ 0x548D,0x3526,
-	/* Array index: 0x1047 */ 0x5491,0x3527,
-	/* Array index: 0x1047 */ 0x5495,0x3528,
-	/* Array index: 0x1047 */ 0x5496,0x3529,
-	/* Array index: 0x1047 */ 0x549C,0x352A,
-	/* Array index: 0x1047 */ 0x549F,0x352B,
-	/* Array index: 0x1047 */ 0x54A1,0x352C,
-	/* Array index: 0x1047 */ 0x54B1,0x3533,
-	/* Array index: 0x1047 */ 0x54BF,0x3538,
-	/* Array index: 0x1047 */ 0x54C6,0x3539,
-	/* Array index: 0x1047 */ 0x54CA,0x353A,
-	/* Array index: 0x1047 */ 0x54CD,0x353B,
-	/* Array index: 0x1047 */ 0x54CE,0x353C,
-	/* Array index: 0x1047 */ 0x54E0,0x353D,
-	/* Array index: 0x1047 */ 0x54EA,0x353E,
-	/* Array index: 0x1047 */ 0x54EC,0x353F,
-	/* Array index: 0x1047 */ 0x54EF,0x3540,
-	/* Array index: 0x1047 */ 0x54F6,0x3541,
-	/* Array index: 0x1047 */ 0x5505,0x3547,
-	/* Array index: 0x1047 */ 0x5515,0x354D,
-	/* Array index: 0x1047 */ 0x552A,0x354E,
-	/* Array index: 0x1047 */ 0x552B,0x354F,
-	/* Array index: 0x1047 */ 0x5532,0x3550,
-	/* Array index: 0x1047 */ 0x5535,0x3551,
-	/* Array index: 0x1047 */ 0x5536,0x3552,
-	/* Array index: 0x1047 */ 0x5541,0x3556,
-	/* Array index: 0x1047 */ 0x5547,0x3557,
-	/* Array index: 0x1047 */ 0x5549,0x3558,
-	/* Array index: 0x1047 */ 0x554A,0x3559,
-	/* Array index: 0x1047 */ 0x554D,0x355A,
-	/* Array index: 0x1047 */ 0x5550,0x355B,
-	/* Array index: 0x1047 */ 0x5551,0x355C,
-	/* Array index: 0x1047 */ 0x5558,0x355D,
-	/* Array index: 0x1047 */ 0x555A,0x355E,
-	/* Array index: 0x1047 */ 0x555B,0x355F,
-	/* Array index: 0x1047 */ 0x555E,0x3560,
-	/* Array index: 0x1047 */ 0x5560,0x3561,
-	/* Array index: 0x1047 */ 0x5561,0x3562,
-	/* Array index: 0x1047 */ 0x5564,0x3563,
-	/* Array index: 0x1047 */ 0x5566,0x3564,
-	/* Array index: 0x1047 */ 0x557F,0x3565,
-	/* Array index: 0x1047 */ 0x5581,0x3566,
-	/* Array index: 0x1047 */ 0x5582,0x3567,
-	/* Array index: 0x1047 */ 0x5586,0x3568,
-	/* Array index: 0x1047 */ 0x5588,0x3569,
-	/* Array index: 0x1047 */ 0x5597,0x3570,
-	/* Array index: 0x1047 */ 0x55A3,0x3571,
-	/* Array index: 0x1047 */ 0x55A4,0x3572,
-	/* Array index: 0x1047 */ 0x55AD,0x3573,
-	/* Array index: 0x1047 */ 0x55B2,0x3574,
-	/* Array index: 0x1047 */ 0x55BF,0x3575,
-	/* Array index: 0x1047 */ 0x55C1,0x3576,
-	/* Array index: 0x1047 */ 0x55C3,0x3577,
-	/* Array index: 0x1047 */ 0x55C6,0x3578,
-	/* Array index: 0x1047 */ 0x55C9,0x3579,
-	/* Array index: 0x1047 */ 0x55CB,0x357A,
-	/* Array index: 0x1047 */ 0x55CC,0x357B,
-	/* Array index: 0x1047 */ 0x55CE,0x357C,
-	/* Array index: 0x1047 */ 0x55D7,0x3622,
-	/* Array index: 0x1047 */ 0x55D8,0x3623,
-	/* Array index: 0x1047 */ 0x55DB,0x3624,
-	/* Array index: 0x1047 */ 0x55DE,0x3625,
-	/* Array index: 0x1047 */ 0x55E2,0x3626,
-	/* Array index: 0x1047 */ 0x55E9,0x3627,
-	/* Array index: 0x1047 */ 0x55F6,0x3628,
-	/* Array index: 0x1047 */ 0x55FF,0x3629,
-	/* Array index: 0x1047 */ 0x5605,0x362A,
-	/* Array index: 0x1047 */ 0x5608,0x362B,
-	/* Array index: 0x1047 */ 0x560A,0x362C,
-	/* Array index: 0x1047 */ 0x5619,0x3633,
-	/* Array index: 0x1047 */ 0x562C,0x3634,
-	/* Array index: 0x1047 */ 0x5630,0x3635,
-	/* Array index: 0x1047 */ 0x5633,0x3636,
-	/* Array index: 0x1047 */ 0x5635,0x3637,
-	/* Array index: 0x1047 */ 0x5637,0x3638,
-	/* Array index: 0x1047 */ 0x5649,0x3643,
-	/* Array index: 0x1047 */ 0x564B,0x3644,
-	/* Array index: 0x1047 */ 0x564D,0x3645,
-	/* Array index: 0x1047 */ 0x564F,0x3646,
-	/* Array index: 0x1047 */ 0x5654,0x3647,
-	/* Array index: 0x1047 */ 0x5666,0x364D,
-	/* Array index: 0x1047 */ 0x5669,0x364E,
-	/* Array index: 0x1047 */ 0x566D,0x364F,
-	/* Array index: 0x1047 */ 0x566F,0x3650,
-	/* Array index: 0x1047 */ 0x5671,0x3651,
-	/* Array index: 0x1047 */ 0x5672,0x3652,
-	/* Array index: 0x1047 */ 0x5675,0x3653,
-	/* Array index: 0x1047 */ 0x5684,0x3654,
-	/* Array index: 0x1047 */ 0x5685,0x3655,
-	/* Array index: 0x1047 */ 0x5688,0x3656,
-	/* Array index: 0x1047 */ 0x568B,0x3657,
-	/* Array index: 0x1047 */ 0x568C,0x3658,
-	/* Array index: 0x1047 */ 0x5695,0x3659,
-	/* Array index: 0x1047 */ 0x56B1,0x3666,
-	/* Array index: 0x1047 */ 0x56B3,0x3667,
-	/* Array index: 0x1047 */ 0x56B7,0x3668,
-	/* Array index: 0x1047 */ 0x56BE,0x3669,
-	/* Array index: 0x1047 */ 0x56C5,0x366A,
-	/* Array index: 0x1047 */ 0x56D9,0x3672,
-	/* Array index: 0x1047 */ 0x56DC,0x3673,
-	/* Array index: 0x1047 */ 0x56DD,0x3674,
-	/* Array index: 0x1047 */ 0x56DF,0x3675,
-	/* Array index: 0x1047 */ 0x56E1,0x3676,
-	/* Array index: 0x1047 */ 0x56EB,0x367D,
-	/* Array index: 0x1047 */ 0x56ED,0x367E,
-	/* Array index: 0x1047 */ 0x56F1,0x367C,
-	/* Array index: 0x1047 */ 0x56F6,0x3721,
-	/* Array index: 0x1047 */ 0x56F7,0x3722,
-	/* Array index: 0x1047 */ 0x5701,0x3723,
-	/* Array index: 0x1047 */ 0x5702,0x3724,
-	/* Array index: 0x1047 */ 0x5707,0x3725,
-	/* Array index: 0x1047 */ 0x570A,0x3726,
-	/* Array index: 0x1047 */ 0x570C,0x3727,
-	/* Array index: 0x1047 */ 0x5711,0x3728,
-	/* Array index: 0x1047 */ 0x5715,0x3729,
-	/* Array index: 0x1047 */ 0x571A,0x372A,
-	/* Array index: 0x1047 */ 0x571B,0x372B,
-	/* Array index: 0x1047 */ 0x571D,0x372C,
-	/* Array index: 0x1047 */ 0x5729,0x3732,
-	/* Array index: 0x1047 */ 0x572A,0x3733,
-	/* Array index: 0x1047 */ 0x572C,0x3734,
-	/* Array index: 0x1047 */ 0x572E,0x3735,
-	/* Array index: 0x1047 */ 0x572F,0x3736,
-	/* Array index: 0x1047 */ 0x5733,0x3737,
-	/* Array index: 0x1047 */ 0x5734,0x3738,
-	/* Array index: 0x1047 */ 0x5745,0x373C,
-	/* Array index: 0x1047 */ 0x5746,0x373D,
-	/* Array index: 0x1047 */ 0x574C,0x373E,
-	/* Array index: 0x1047 */ 0x574D,0x373F,
-	/* Array index: 0x1047 */ 0x5752,0x3740,
-	/* Array index: 0x1047 */ 0x5762,0x3741,
-	/* Array index: 0x1047 */ 0x5765,0x3742,
-	/* Array index: 0x1047 */ 0x5767,0x3743,
-	/* Array index: 0x1047 */ 0x5768,0x3744,
-	/* Array index: 0x1047 */ 0x5781,0x3754,
-	/* Array index: 0x1047 */ 0x5783,0x3755,
-	/* Array index: 0x1047 */ 0x578C,0x3756,
-	/* Array index: 0x1047 */ 0x5794,0x3757,
-	/* Array index: 0x1047 */ 0x5795,0x3760,
-	/* Array index: 0x1047 */ 0x5797,0x3758,
-	/* Array index: 0x1047 */ 0x57AC,0x3764,
-	/* Array index: 0x1047 */ 0x57B8,0x3765,
-	/* Array index: 0x1047 */ 0x57BD,0x3766,
-	/* Array index: 0x1047 */ 0x57C7,0x3767,
-	/* Array index: 0x1047 */ 0x57C8,0x3768,
-	/* Array index: 0x1047 */ 0x57CC,0x3769,
-	/* Array index: 0x1047 */ 0x57CF,0x376A,
-	/* Array index: 0x1047 */ 0x57D5,0x376B,
-	/* Array index: 0x1047 */ 0x57DD,0x376C,
-	/* Array index: 0x1047 */ 0x57DE,0x376D,
-	/* Array index: 0x1047 */ 0x57E1,0x377E,
-	/* Array index: 0x1047 */ 0x57E4,0x376E,
-	/* Array index: 0x1047 */ 0x57E6,0x376F,
-	/* Array index: 0x1047 */ 0x57E7,0x3770,
-	/* Array index: 0x1047 */ 0x57E9,0x3771,
-	/* Array index: 0x1047 */ 0x57ED,0x3772,
-	/* Array index: 0x1047 */ 0x57F0,0x3773,
-	/* Array index: 0x1047 */ 0x57F5,0x3774,
-	/* Array index: 0x1047 */ 0x57F6,0x3775,
-	/* Array index: 0x1047 */ 0x57F8,0x3776,
-	/* Array index: 0x1047 */ 0x5803,0x377A,
-	/* Array index: 0x1047 */ 0x5804,0x377B,
-	/* Array index: 0x1047 */ 0x5808,0x377C,
-	/* Array index: 0x1047 */ 0x5809,0x377D,
-	/* Array index: 0x1047 */ 0x580C,0x3821,
-	/* Array index: 0x1047 */ 0x580D,0x3822,
-	/* Array index: 0x1047 */ 0x581B,0x3823,
-	/* Array index: 0x1047 */ 0x5826,0x3827,
-	/* Array index: 0x1047 */ 0x5827,0x3828,
-	/* Array index: 0x1047 */ 0x582D,0x3829,
-	/* Array index: 0x1047 */ 0x5832,0x382A,
-	/* Array index: 0x1047 */ 0x5839,0x382B,
-	/* Array index: 0x1047 */ 0x583F,0x382C,
-	/* Array index: 0x1047 */ 0x5849,0x382D,
-	/* Array index: 0x1047 */ 0x5855,0x3832,
-	/* Array index: 0x1047 */ 0x585F,0x3833,
-	/* Array index: 0x1047 */ 0x5861,0x3834,
-	/* Array index: 0x1047 */ 0x5864,0x3835,
-	/* Array index: 0x1047 */ 0x5867,0x3836,
-	/* Array index: 0x1047 */ 0x5868,0x3837,
-	/* Array index: 0x1047 */ 0x5878,0x3838,
-	/* Array index: 0x1047 */ 0x587C,0x3839,
-	/* Array index: 0x1047 */ 0x5894,0x3845,
-	/* Array index: 0x1047 */ 0x5896,0x3846,
-	/* Array index: 0x1047 */ 0x589D,0x3847,
-	/* Array index: 0x1047 */ 0x58A6,0x384B,
-	/* Array index: 0x1047 */ 0x58A9,0x384C,
-	/* Array index: 0x1047 */ 0x58B1,0x384D,
-	/* Array index: 0x1047 */ 0x58B2,0x384E,
-	/* Array index: 0x1047 */ 0x58BC,0x3850,
-	/* Array index: 0x1047 */ 0x58C2,0x3851,
-	/* Array index: 0x1047 */ 0x58C4,0x384F,
-	/* Array index: 0x1047 */ 0x58C8,0x3852,
-	/* Array index: 0x1047 */ 0x58CD,0x3853,
-	/* Array index: 0x1047 */ 0x58CE,0x3854,
-	/* Array index: 0x1047 */ 0x58D0,0x3855,
-	/* Array index: 0x1047 */ 0x58D2,0x3856,
-	/* Array index: 0x1047 */ 0x58D4,0x3857,
-	/* Array index: 0x1047 */ 0x58D6,0x3858,
-	/* Array index: 0x1047 */ 0x58DA,0x3859,
-	/* Array index: 0x1047 */ 0x58DD,0x385A,
-	/* Array index: 0x1047 */ 0x58E1,0x385B,
-	/* Array index: 0x1047 */ 0x58E2,0x385C,
-	/* Array index: 0x1047 */ 0x58E9,0x385D,
-	/* Array index: 0x1047 */ 0x58F3,0x385E,
-	/* Array index: 0x1047 */ 0x5905,0x385F,
-	/* Array index: 0x1047 */ 0x5906,0x3860,
-	/* Array index: 0x1047 */ 0x590B,0x3861,
-	/* Array index: 0x1047 */ 0x590C,0x3862,
-	/* Array index: 0x1047 */ 0x591D,0x3867,
-	/* Array index: 0x1047 */ 0x5921,0x3868,
-	/* Array index: 0x1047 */ 0x5923,0x3869,
-	/* Array index: 0x1047 */ 0x5924,0x386A,
-	/* Array index: 0x1047 */ 0x5928,0x386B,
-	/* Array index: 0x1047 */ 0x592F,0x386C,
-	/* Array index: 0x1047 */ 0x5930,0x386D,
-	/* Array index: 0x1047 */ 0x5933,0x386E,
-	/* Array index: 0x1047 */ 0x5935,0x386F,
-	/* Array index: 0x1047 */ 0x5936,0x3870,
-	/* Array index: 0x1047 */ 0x593F,0x3871,
-	/* Array index: 0x1047 */ 0x5943,0x3872,
-	/* Array index: 0x1047 */ 0x5946,0x3873,
-	/* Array index: 0x1047 */ 0x5952,0x3874,
-	/* Array index: 0x1047 */ 0x5953,0x3875,
-	/* Array index: 0x1047 */ 0x5959,0x3876,
-	/* Array index: 0x1047 */ 0x596B,0x387D,
-	/* Array index: 0x1047 */ 0x596D,0x387E,
-	/* Array index: 0x1047 */ 0x596F,0x3921,
-	/* Array index: 0x1047 */ 0x5972,0x3922,
-	/* Array index: 0x1047 */ 0x5975,0x3923,
-	/* Array index: 0x1047 */ 0x5976,0x3924,
-	/* Array index: 0x1047 */ 0x5979,0x3925,
-	/* Array index: 0x1047 */ 0x597B,0x3926,
-	/* Array index: 0x1047 */ 0x597C,0x3927,
-	/* Array index: 0x1047 */ 0x598B,0x3928,
-	/* Array index: 0x1047 */ 0x598C,0x3929,
-	/* Array index: 0x1047 */ 0x598E,0x392A,
-	/* Array index: 0x1047 */ 0x5992,0x392B,
-	/* Array index: 0x1047 */ 0x5995,0x392C,
-	/* Array index: 0x1047 */ 0x5997,0x392D,
-	/* Array index: 0x1047 */ 0x599F,0x392E,
-	/* Array index: 0x1047 */ 0x59A4,0x392F,
-	/* Array index: 0x1047 */ 0x59A7,0x3930,
-	/* Array index: 0x1047 */ 0x59B3,0x3935,
-	/* Array index: 0x1047 */ 0x59B7,0x3936,
-	/* Array index: 0x1047 */ 0x59BA,0x3937,
-	/* Array index: 0x1047 */ 0x59BC,0x3938,
-	/* Array index: 0x1047 */ 0x59C1,0x3939,
-	/* Array index: 0x1047 */ 0x59C3,0x393A,
-	/* Array index: 0x1047 */ 0x59C4,0x393B,
-	/* Array index: 0x1047 */ 0x59C8,0x393C,
-	/* Array index: 0x1047 */ 0x59CA,0x393D,
-	/* Array index: 0x1047 */ 0x59CD,0x393E,
-	/* Array index: 0x1047 */ 0x59D2,0x393F,
-	/* Array index: 0x1047 */ 0x59E3,0x3943,
-	/* Array index: 0x1047 */ 0x59E4,0x3944,
-	/* Array index: 0x1047 */ 0x59E7,0x3945,
-	/* Array index: 0x1047 */ 0x59F7,0x394B,
-	/* Array index: 0x1047 */ 0x5A00,0x394C,
-	/* Array index: 0x1047 */ 0x5A04,0x394D,
-	/* Array index: 0x1047 */ 0x5A12,0x3951,
-	/* Array index: 0x1047 */ 0x5A13,0x3952,
-	/* Array index: 0x1047 */ 0x5A1E,0x3953,
-	/* Array index: 0x1047 */ 0x5A23,0x3954,
-	/* Array index: 0x1047 */ 0x5A24,0x3955,
-	/* Array index: 0x1047 */ 0x5A27,0x3956,
-	/* Array index: 0x1047 */ 0x5A28,0x3957,
-	/* Array index: 0x1047 */ 0x5A2A,0x3958,
-	/* Array index: 0x1047 */ 0x5A2D,0x3959,
-	/* Array index: 0x1047 */ 0x5A30,0x395A,
-	/* Array index: 0x1047 */ 0x5A4C,0x395F,
-	/* Array index: 0x1047 */ 0x5A50,0x3960,
-	/* Array index: 0x1047 */ 0x5A55,0x3961,
-	/* Array index: 0x1047 */ 0x5A5E,0x3962,
-	/* Array index: 0x1047 */ 0x5A63,0x3963,
-	/* Array index: 0x1047 */ 0x5A65,0x3964,
-	/* Array index: 0x1047 */ 0x5A67,0x3965,
-	/* Array index: 0x1047 */ 0x5A6D,0x3966,
-	/* Array index: 0x1047 */ 0x5A77,0x3967,
-	/* Array index: 0x1047 */ 0x5A7A,0x3968,
-	/* Array index: 0x1047 */ 0x5A7B,0x3969,
-	/* Array index: 0x1047 */ 0x5A7E,0x396A,
-	/* Array index: 0x1047 */ 0x5A8B,0x396B,
-	/* Array index: 0x1047 */ 0x5A90,0x396C,
-	/* Array index: 0x1047 */ 0x5A93,0x396D,
-	/* Array index: 0x1047 */ 0x5A96,0x396E,
-	/* Array index: 0x1047 */ 0x5A99,0x396F,
-	/* Array index: 0x1047 */ 0x5AA7,0x3975,
-	/* Array index: 0x1047 */ 0x5AAC,0x3976,
-	/* Array index: 0x1047 */ 0x5AB8,0x397B,
-	/* Array index: 0x1047 */ 0x5ABA,0x397C,
-	/* Array index: 0x1047 */ 0x5ABB,0x397D,
-	/* Array index: 0x1047 */ 0x5ABF,0x397E,
-	/* Array index: 0x1047 */ 0x5AC4,0x3A21,
-	/* Array index: 0x1047 */ 0x5AC6,0x3A22,
-	/* Array index: 0x1047 */ 0x5AC8,0x3A23,
-	/* Array index: 0x1047 */ 0x5ACF,0x3A24,
-	/* Array index: 0x1047 */ 0x5ADA,0x3A25,
-	/* Array index: 0x1047 */ 0x5ADC,0x3A26,
-	/* Array index: 0x1047 */ 0x5AE0,0x3A27,
-	/* Array index: 0x1047 */ 0x5AE5,0x3A28,
-	/* Array index: 0x1047 */ 0x5AEA,0x3A29,
-	/* Array index: 0x1047 */ 0x5AEE,0x3A2A,
-	/* Array index: 0x1047 */ 0x5AF5,0x3A2B,
-	/* Array index: 0x1047 */ 0x5AF6,0x3A2C,
-	/* Array index: 0x1047 */ 0x5AFD,0x3A2D,
-	/* Array index: 0x1047 */ 0x5B00,0x3A2E,
-	/* Array index: 0x1047 */ 0x5B01,0x3A2F,
-	/* Array index: 0x1047 */ 0x5B08,0x3A30,
-	/* Array index: 0x1047 */ 0x5B17,0x3A31,
-	/* Array index: 0x1047 */ 0x5B19,0x3A33,
-	/* Array index: 0x1047 */ 0x5B1B,0x3A34,
-	/* Array index: 0x1047 */ 0x5B1D,0x3A35,
-	/* Array index: 0x1047 */ 0x5B21,0x3A36,
-	/* Array index: 0x1047 */ 0x5B25,0x3A37,
-	/* Array index: 0x1047 */ 0x5B2D,0x3A38,
-	/* Array index: 0x1047 */ 0x5B34,0x3A32,
-	/* Array index: 0x1047 */ 0x5B38,0x3A39,
-	/* Array index: 0x1047 */ 0x5B41,0x3A3A,
-	/* Array index: 0x1047 */ 0x5B4B,0x3A3B,
-	/* Array index: 0x1047 */ 0x5B4C,0x3A3C,
-	/* Array index: 0x1047 */ 0x5B52,0x3A3D,
-	/* Array index: 0x1047 */ 0x5B56,0x3A3E,
-	/* Array index: 0x1047 */ 0x5B5E,0x3A3F,
-	/* Array index: 0x1047 */ 0x5B68,0x3A40,
-	/* Array index: 0x1047 */ 0x5B6E,0x3A41,
-	/* Array index: 0x1047 */ 0x5B6F,0x3A42,
-	/* Array index: 0x1047 */ 0x5B84,0x3A48,
-	/* Array index: 0x1047 */ 0x5B86,0x3A49,
-	/* Array index: 0x1047 */ 0x5B8A,0x3A4A,
-	/* Array index: 0x1047 */ 0x5B8E,0x3A4B,
-	/* Array index: 0x1047 */ 0x5BA8,0x3A51,
-	/* Array index: 0x1047 */ 0x5BA9,0x3A52,
-	/* Array index: 0x1047 */ 0x5BAC,0x3A53,
-	/* Array index: 0x1047 */ 0x5BAD,0x3A54,
-	/* Array index: 0x1047 */ 0x5BAF,0x3A55,
-	/* Array index: 0x1047 */ 0x5BB1,0x3A56,
-	/* Array index: 0x1047 */ 0x5BB2,0x3A57,
-	/* Array index: 0x1047 */ 0x5BB7,0x3A58,
-	/* Array index: 0x1047 */ 0x5BBA,0x3A59,
-	/* Array index: 0x1047 */ 0x5BBC,0x3A5A,
-	/* Array index: 0x1047 */ 0x5BC0,0x3A5B,
-	/* Array index: 0x1047 */ 0x5BC1,0x3A5C,
-	/* Array index: 0x1047 */ 0x5BCD,0x3A5D,
-	/* Array index: 0x1047 */ 0x5BCF,0x3A5E,
-	/* Array index: 0x1047 */ 0x5BE0,0x3A64,
-	/* Array index: 0x1047 */ 0x5BEF,0x3A65,
-	/* Array index: 0x1047 */ 0x5BF1,0x3A66,
-	/* Array index: 0x1047 */ 0x5BF4,0x3A67,
-	/* Array index: 0x1047 */ 0x5BFD,0x3A68,
-	/* Array index: 0x1047 */ 0x5C0C,0x3A69,
-	/* Array index: 0x1047 */ 0x5C17,0x3A6A,
-	/* Array index: 0x1047 */ 0x5C1E,0x3A6B,
-	/* Array index: 0x1047 */ 0x5C1F,0x3A6C,
-	/* Array index: 0x1047 */ 0x5C23,0x3A6D,
-	/* Array index: 0x1047 */ 0x5C26,0x3A6E,
-	/* Array index: 0x1047 */ 0x5C29,0x3A6F,
-	/* Array index: 0x1047 */ 0x5C2B,0x3A70,
-	/* Array index: 0x1047 */ 0x5C2C,0x3A71,
-	/* Array index: 0x1047 */ 0x5C2E,0x3A72,
-	/* Array index: 0x1047 */ 0x5C30,0x3A73,
-	/* Array index: 0x1047 */ 0x5C32,0x3A74,
-	/* Array index: 0x1047 */ 0x5C35,0x3A75,
-	/* Array index: 0x1047 */ 0x5C36,0x3A76,
-	/* Array index: 0x1047 */ 0x5C59,0x3A77,
-	/* Array index: 0x1047 */ 0x5C5A,0x3A78,
-	/* Array index: 0x1047 */ 0x5C5C,0x3A79,
-	/* Array index: 0x1047 */ 0x5C62,0x3A7A,
-	/* Array index: 0x1047 */ 0x5C63,0x3A7B,
-	/* Array index: 0x1047 */ 0x5C6D,0x3B21,
-	/* Array index: 0x1047 */ 0x5C70,0x3B22,
-	/* Array index: 0x1047 */ 0x5C74,0x3B23,
-	/* Array index: 0x1047 */ 0x5C75,0x3B24,
-	/* Array index: 0x1047 */ 0x5C87,0x3B29,
-	/* Array index: 0x1047 */ 0x5C88,0x3B2A,
-	/* Array index: 0x1047 */ 0x5C8A,0x3B2B,
-	/* Array index: 0x1047 */ 0x5C8F,0x3B2C,
-	/* Array index: 0x1047 */ 0x5C92,0x3B2D,
-	/* Array index: 0x1047 */ 0x5C9D,0x3B2E,
-	/* Array index: 0x1047 */ 0x5CA6,0x3B33,
-	/* Array index: 0x1047 */ 0x5CAA,0x3B34,
-	/* Array index: 0x1047 */ 0x5CB2,0x3B35,
-	/* Array index: 0x1047 */ 0x5CB4,0x3B36,
-	/* Array index: 0x1047 */ 0x5CB5,0x3B37,
-	/* Array index: 0x1047 */ 0x5CBA,0x3B38,
-	/* Array index: 0x1047 */ 0x5CC9,0x3B39,
-	/* Array index: 0x1047 */ 0x5CCB,0x3B3A,
-	/* Array index: 0x1047 */ 0x5CD2,0x3B3B,
-	/* Array index: 0x1047 */ 0x5CD7,0x3B3D,
-	/* Array index: 0x1047 */ 0x5CDD,0x3B3C,
-	/* Array index: 0x1047 */ 0x5CEE,0x3B3E,
-	/* Array index: 0x1047 */ 0x5CF1,0x3B3F,
-	/* Array index: 0x1047 */ 0x5CF2,0x3B40,
-	/* Array index: 0x1047 */ 0x5CF4,0x3B41,
-	/* Array index: 0x1047 */ 0x5D01,0x3B42,
-	/* Array index: 0x1047 */ 0x5D06,0x3B43,
-	/* Array index: 0x1047 */ 0x5D0D,0x3B44,
-	/* Array index: 0x1047 */ 0x5D12,0x3B45,
-	/* Array index: 0x1047 */ 0x5D2B,0x3B46,
-	/* Array index: 0x1047 */ 0x5D31,0x3B4B,
-	/* Array index: 0x1047 */ 0x5D34,0x3B4C,
-	/* Array index: 0x1047 */ 0x5D39,0x3B4D,
-	/* Array index: 0x1047 */ 0x5D3D,0x3B4E,
-	/* Array index: 0x1047 */ 0x5D3F,0x3B4F,
-	/* Array index: 0x1047 */ 0x5D42,0x3B50,
-	/* Array index: 0x1047 */ 0x5D43,0x3B51,
-	/* Array index: 0x1047 */ 0x5D46,0x3B52,
-	/* Array index: 0x1047 */ 0x5D48,0x3B53,
-	/* Array index: 0x1047 */ 0x5D4A,0x3B57,
-	/* Array index: 0x1047 */ 0x5D51,0x3B55,
-	/* Array index: 0x1047 */ 0x5D55,0x3B54,
-	/* Array index: 0x1047 */ 0x5D59,0x3B56,
-	/* Array index: 0x1047 */ 0x5D6A,0x3B5D,
-	/* Array index: 0x1047 */ 0x5D6D,0x3B5E,
-	/* Array index: 0x1047 */ 0x5D70,0x3B5F,
-	/* Array index: 0x1047 */ 0x5D79,0x3B60,
-	/* Array index: 0x1047 */ 0x5D7A,0x3B61,
-	/* Array index: 0x1047 */ 0x5D7E,0x3B62,
-	/* Array index: 0x1047 */ 0x5D7F,0x3B63,
-	/* Array index: 0x1047 */ 0x5D81,0x3B64,
-	/* Array index: 0x1047 */ 0x5D83,0x3B65,
-	/* Array index: 0x1047 */ 0x5D88,0x3B66,
-	/* Array index: 0x1047 */ 0x5D8A,0x3B67,
-	/* Array index: 0x1047 */ 0x5D99,0x3B6C,
-	/* Array index: 0x1047 */ 0x5D9B,0x3B6D,
-	/* Array index: 0x1047 */ 0x5D9F,0x3B6E,
-	/* Array index: 0x1047 */ 0x5DA0,0x3B6F,
-	/* Array index: 0x1047 */ 0x5DA7,0x3B70,
-	/* Array index: 0x1047 */ 0x5DAB,0x3B71,
-	/* Array index: 0x1047 */ 0x5DB0,0x3B72,
-	/* Array index: 0x1047 */ 0x5DB2,0x6674,
-	/* Array index: 0x1047 */ 0x5DB4,0x3B73,
-	/* Array index: 0x1047 */ 0x5DB8,0x3B74,
-	/* Array index: 0x1047 */ 0x5DB9,0x3B75,
-	/* Array index: 0x1047 */ 0x5DC3,0x3B76,
-	/* Array index: 0x1047 */ 0x5DC7,0x3B77,
-	/* Array index: 0x1047 */ 0x5DCB,0x3B78,
-	/* Array index: 0x1047 */ 0x5DCE,0x3B7A,
-	/* Array index: 0x1047 */ 0x5DD0,0x3B79,
-	/* Array index: 0x1047 */ 0x5DD8,0x3B7B,
-	/* Array index: 0x1047 */ 0x5DD9,0x3B7C,
-	/* Array index: 0x1047 */ 0x5DE0,0x3B7D,
-	/* Array index: 0x1047 */ 0x5DE4,0x3B7E,
-	/* Array index: 0x1047 */ 0x5DE9,0x3C21,
-	/* Array index: 0x1047 */ 0x5DF8,0x3C22,
-	/* Array index: 0x1047 */ 0x5DF9,0x3C23,
-	/* Array index: 0x1047 */ 0x5E00,0x3C24,
-	/* Array index: 0x1047 */ 0x5E07,0x3C25,
-	/* Array index: 0x1047 */ 0x5E0D,0x3C26,
-	/* Array index: 0x1047 */ 0x5E12,0x3C27,
-	/* Array index: 0x1047 */ 0x5E14,0x3C28,
-	/* Array index: 0x1047 */ 0x5E15,0x3C29,
-	/* Array index: 0x1047 */ 0x5E18,0x3C2A,
-	/* Array index: 0x1047 */ 0x5E1F,0x3C2B,
-	/* Array index: 0x1047 */ 0x5E20,0x3C2C,
-	/* Array index: 0x1047 */ 0x5E28,0x3C2E,
-	/* Array index: 0x1047 */ 0x5E2E,0x3C2D,
-	/* Array index: 0x1047 */ 0x5E32,0x3C2F,
-	/* Array index: 0x1047 */ 0x5E35,0x3C30,
-	/* Array index: 0x1047 */ 0x5E3E,0x3C31,
-	/* Array index: 0x1047 */ 0x5E49,0x3C34,
-	/* Array index: 0x1047 */ 0x5E4B,0x3C32,
-	/* Array index: 0x1047 */ 0x5E50,0x3C33,
-	/* Array index: 0x1047 */ 0x5E51,0x3C35,
-	/* Array index: 0x1047 */ 0x5E56,0x3C36,
-	/* Array index: 0x1047 */ 0x5E58,0x3C37,
-	/* Array index: 0x1047 */ 0x5E5B,0x3C38,
-	/* Array index: 0x1047 */ 0x5E5C,0x3C39,
-	/* Array index: 0x1047 */ 0x5E5E,0x3C3A,
-	/* Array index: 0x1047 */ 0x5E80,0x3C42,
-	/* Array index: 0x1047 */ 0x5E8B,0x3C43,
-	/* Array index: 0x1047 */ 0x5E8E,0x3C44,
-	/* Array index: 0x1047 */ 0x5EA2,0x3C45,
-	/* Array index: 0x1047 */ 0x5EA4,0x3C46,
-	/* Array index: 0x1047 */ 0x5EA5,0x3C47,
-	/* Array index: 0x1047 */ 0x5EA8,0x3C48,
-	/* Array index: 0x1047 */ 0x5EAA,0x3C49,
-	/* Array index: 0x1047 */ 0x5EAC,0x3C4A,
-	/* Array index: 0x1047 */ 0x5EB1,0x3C4B,
-	/* Array index: 0x1047 */ 0x5EB3,0x3C4C,
-	/* Array index: 0x1047 */ 0x5EC6,0x3C50,
-	/* Array index: 0x1047 */ 0x5ECB,0x3C52,
-	/* Array index: 0x1047 */ 0x5ECC,0x3C51,
-	/* Array index: 0x1047 */ 0x5ECE,0x3C53,
-	/* Array index: 0x1047 */ 0x5EDC,0x3C58,
-	/* Array index: 0x1047 */ 0x5EDE,0x3C59,
-	/* Array index: 0x1047 */ 0x5EE5,0x3C5A,
-	/* Array index: 0x1047 */ 0x5EEB,0x3C5B,
-	/* Array index: 0x1047 */ 0x5F02,0x3C5C,
-	/* Array index: 0x1047 */ 0x5F0E,0x3C60,
-	/* Array index: 0x1047 */ 0x5F19,0x3C61,
-	/* Array index: 0x1047 */ 0x5F1C,0x3C62,
-	/* Array index: 0x1047 */ 0x5F1D,0x3C63,
-	/* Array index: 0x1047 */ 0x5F28,0x3C68,
-	/* Array index: 0x1047 */ 0x5F2B,0x3C69,
-	/* Array index: 0x1047 */ 0x5F2C,0x3C6A,
-	/* Array index: 0x1047 */ 0x5F2E,0x3C6B,
-	/* Array index: 0x1047 */ 0x5F30,0x3C6C,
-	/* Array index: 0x1047 */ 0x5F34,0x3C6D,
-	/* Array index: 0x1047 */ 0x5F36,0x3C6E,
-	/* Array index: 0x1047 */ 0x5F3B,0x3C6F,
-	/* Array index: 0x1047 */ 0x5F3D,0x3C70,
-	/* Array index: 0x1047 */ 0x5F3F,0x3C71,
-	/* Array index: 0x1047 */ 0x5F40,0x3C72,
-	/* Array index: 0x1047 */ 0x5F44,0x3C73,
-	/* Array index: 0x1047 */ 0x5F45,0x3C74,
-	/* Array index: 0x1047 */ 0x5F47,0x3C75,
-	/* Array index: 0x1047 */ 0x5F4D,0x3C76,
-	/* Array index: 0x1047 */ 0x5F50,0x3C77,
-	/* Array index: 0x1047 */ 0x5F54,0x3C78,
-	/* Array index: 0x1047 */ 0x5F58,0x3C79,
-	/* Array index: 0x1047 */ 0x5F5B,0x3C7A,
-	/* Array index: 0x1047 */ 0x5F60,0x3C7B,
-	/* Array index: 0x1047 */ 0x5F63,0x3C7C,
-	/* Array index: 0x1047 */ 0x5F64,0x3C7D,
-	/* Array index: 0x1047 */ 0x5F67,0x3C7E,
-	/* Array index: 0x1047 */ 0x5F6F,0x3D21,
-	/* Array index: 0x1047 */ 0x5F72,0x3D22,
-	/* Array index: 0x1047 */ 0x5F74,0x3D23,
-	/* Array index: 0x1047 */ 0x5F75,0x3D24,
-	/* Array index: 0x1047 */ 0x5F78,0x3D25,
-	/* Array index: 0x1047 */ 0x5F7A,0x3D26,
-	/* Array index: 0x1047 */ 0x5F7D,0x3D27,
-	/* Array index: 0x1047 */ 0x5F7E,0x3D28,
-	/* Array index: 0x1047 */ 0x5F89,0x3D29,
-	/* Array index: 0x1047 */ 0x5F8D,0x3D2A,
-	/* Array index: 0x1047 */ 0x5F8F,0x3D2B,
-	/* Array index: 0x1047 */ 0x5F96,0x3D2C,
-	/* Array index: 0x1047 */ 0x5F9C,0x3D2D,
-	/* Array index: 0x1047 */ 0x5F9D,0x3D2E,
-	/* Array index: 0x1047 */ 0x5FA2,0x3D2F,
-	/* Array index: 0x1047 */ 0x5FA4,0x3D32,
-	/* Array index: 0x1047 */ 0x5FA7,0x3D30,
-	/* Array index: 0x1047 */ 0x5FB8,0x3D37,
-	/* Array index: 0x1047 */ 0x5FC4,0x3D38,
-	/* Array index: 0x1047 */ 0x5FDE,0x3D42,
-	/* Array index: 0x1047 */ 0x5FE1,0x3D43,
-	/* Array index: 0x1047 */ 0x5FE2,0x3D44,
-	/* Array index: 0x1047 */ 0x5FF6,0x3D4E,
-	/* Array index: 0x1047 */ 0x5FFA,0x3D4F,
-	/* Array index: 0x1047 */ 0x5FFC,0x3D50,
-	/* Array index: 0x1047 */ 0x6007,0x3D51,
-	/* Array index: 0x1047 */ 0x600A,0x3D52,
-	/* Array index: 0x1047 */ 0x600D,0x3D53,
-	/* Array index: 0x1047 */ 0x6013,0x3D54,
-	/* Array index: 0x1047 */ 0x6014,0x3D55,
-	/* Array index: 0x1047 */ 0x6017,0x3D56,
-	/* Array index: 0x1047 */ 0x6018,0x3D57,
-	/* Array index: 0x1047 */ 0x601A,0x3D58,
-	/* Array index: 0x1047 */ 0x601F,0x3D59,
-	/* Array index: 0x1047 */ 0x6024,0x3D5A,
-	/* Array index: 0x1047 */ 0x602D,0x3D5B,
-	/* Array index: 0x1047 */ 0x6033,0x3D5C,
-	/* Array index: 0x1047 */ 0x6035,0x3D5D,
-	/* Array index: 0x1047 */ 0x6040,0x3D5E,
-	/* Array index: 0x1047 */ 0x604C,0x3D62,
-	/* Array index: 0x1047 */ 0x6051,0x3D63,
-	/* Array index: 0x1047 */ 0x6054,0x3D64,
-	/* Array index: 0x1047 */ 0x6056,0x3D65,
-	/* Array index: 0x1047 */ 0x6057,0x3D66,
-	/* Array index: 0x1047 */ 0x605D,0x3D67,
-	/* Array index: 0x1047 */ 0x6061,0x3D68,
-	/* Array index: 0x1047 */ 0x6067,0x3D69,
-	/* Array index: 0x1047 */ 0x6071,0x3D6A,
-	/* Array index: 0x1047 */ 0x607E,0x3D6B,
-	/* Array index: 0x1047 */ 0x607F,0x3D6C,
-	/* Array index: 0x1047 */ 0x6082,0x3D6D,
-	/* Array index: 0x1047 */ 0x6086,0x3D6E,
-	/* Array index: 0x1047 */ 0x6088,0x3D6F,
-	/* Array index: 0x1047 */ 0x608A,0x3D70,
-	/* Array index: 0x1047 */ 0x608E,0x3D71,
-	/* Array index: 0x1047 */ 0x6091,0x3D72,
-	/* Array index: 0x1047 */ 0x6093,0x3D73,
-	/* Array index: 0x1047 */ 0x6095,0x3D74,
-	/* Array index: 0x1047 */ 0x6098,0x3D75,
-	/* Array index: 0x1047 */ 0x609D,0x3D76,
-	/* Array index: 0x1047 */ 0x609E,0x3D77,
-	/* Array index: 0x1047 */ 0x60A2,0x3D78,
-	/* Array index: 0x1047 */ 0x60A4,0x3D79,
-	/* Array index: 0x1047 */ 0x60A5,0x3D7A,
-	/* Array index: 0x1047 */ 0x60A8,0x3D7B,
-	/* Array index: 0x1047 */ 0x60B0,0x3D7C,
-	/* Array index: 0x1047 */ 0x60B1,0x3D7D,
-	/* Array index: 0x1047 */ 0x60B7,0x3D7E,
-	/* Array index: 0x1047 */ 0x60BB,0x3E21,
-	/* Array index: 0x1047 */ 0x60BE,0x3E22,
-	/* Array index: 0x1047 */ 0x60C2,0x3E23,
-	/* Array index: 0x1047 */ 0x60C4,0x3E24,
-	/* Array index: 0x1047 */ 0x60D4,0x3E2B,
-	/* Array index: 0x1047 */ 0x60D5,0x3E2C,
-	/* Array index: 0x1047 */ 0x60D9,0x3E2D,
-	/* Array index: 0x1047 */ 0x60DB,0x3E2E,
-	/* Array index: 0x1047 */ 0x60DD,0x3E2F,
-	/* Array index: 0x1047 */ 0x60DE,0x3E30,
-	/* Array index: 0x1047 */ 0x60E2,0x3E31,
-	/* Array index: 0x1047 */ 0x60E5,0x3E32,
-	/* Array index: 0x1047 */ 0x60F2,0x3E33,
-	/* Array index: 0x1047 */ 0x60F5,0x3E34,
-	/* Array index: 0x1047 */ 0x60F8,0x3E35,
-	/* Array index: 0x1047 */ 0x60FC,0x3E36,
-	/* Array index: 0x1047 */ 0x60FD,0x3E37,
-	/* Array index: 0x1047 */ 0x6102,0x3E38,
-	/* Array index: 0x1047 */ 0x6107,0x3E39,
-	/* Array index: 0x1047 */ 0x610A,0x3E3A,
-	/* Array index: 0x1047 */ 0x610C,0x3E3B,
-	/* Array index: 0x1047 */ 0x611C,0x3E44,
-	/* Array index: 0x1047 */ 0x611E,0x3E45,
-	/* Array index: 0x1047 */ 0x6122,0x3E46,
-	/* Array index: 0x1047 */ 0x612A,0x3E47,
-	/* Array index: 0x1047 */ 0x612B,0x3E48,
-	/* Array index: 0x1047 */ 0x6130,0x3E49,
-	/* Array index: 0x1047 */ 0x6131,0x3E4A,
-	/* Array index: 0x1047 */ 0x6141,0x3E4F,
-	/* Array index: 0x1047 */ 0x6145,0x3E50,
-	/* Array index: 0x1047 */ 0x6146,0x3E51,
-	/* Array index: 0x1047 */ 0x6149,0x3E52,
-	/* Array index: 0x1047 */ 0x615E,0x3E53,
-	/* Array index: 0x1047 */ 0x6160,0x3E54,
-	/* Array index: 0x1047 */ 0x616C,0x3E55,
-	/* Array index: 0x1047 */ 0x6172,0x3E56,
-	/* Array index: 0x1047 */ 0x6178,0x3E57,
-	/* Array index: 0x1047 */ 0x618B,0x3E5F,
-	/* Array index: 0x1047 */ 0x618D,0x3E60,
-	/* Array index: 0x1047 */ 0x6192,0x3E61,
-	/* Array index: 0x1047 */ 0x6193,0x3E62,
-	/* Array index: 0x1047 */ 0x6197,0x3E63,
-	/* Array index: 0x1047 */ 0x6198,0x3E64,
-	/* Array index: 0x1047 */ 0x61A5,0x3E69,
-	/* Array index: 0x1047 */ 0x61A8,0x3E6A,
-	/* Array index: 0x1047 */ 0x61AA,0x3E6B,
-	/* Array index: 0x1047 */ 0x61AD,0x3E6C,
-	/* Array index: 0x1047 */ 0x61B8,0x3E6D,
-	/* Array index: 0x1047 */ 0x61B9,0x3E6E,
-	/* Array index: 0x1047 */ 0x61BC,0x3E6F,
-	/* Array index: 0x1047 */ 0x61CE,0x3E73,
-	/* Array index: 0x1047 */ 0x61CF,0x3E74,
-	/* Array index: 0x1047 */ 0x61D5,0x3E75,
-	/* Array index: 0x1047 */ 0x61E5,0x3E7E,
-	/* Array index: 0x1047 */ 0x61E7,0x3E7C,
-	/* Array index: 0x1047 */ 0x61E9,0x3E7D,
-	/* Array index: 0x1047 */ 0x61EC,0x3F21,
-	/* Array index: 0x1047 */ 0x61ED,0x3F22,
-	/* Array index: 0x1047 */ 0x61EF,0x3F23,
-	/* Array index: 0x1047 */ 0x6201,0x3F24,
-	/* Array index: 0x1047 */ 0x6203,0x3F25,
-	/* Array index: 0x1047 */ 0x6204,0x3F26,
-	/* Array index: 0x1047 */ 0x6207,0x3F27,
-	/* Array index: 0x1047 */ 0x6213,0x3F28,
-	/* Array index: 0x1047 */ 0x6215,0x3F29,
-	/* Array index: 0x1047 */ 0x621C,0x3F2A,
-	/* Array index: 0x1047 */ 0x6220,0x3F2B,
-	/* Array index: 0x1047 */ 0x6222,0x3F2C,
-	/* Array index: 0x1047 */ 0x6223,0x3F2D,
-	/* Array index: 0x1047 */ 0x6227,0x3F2E,
-	/* Array index: 0x1047 */ 0x6229,0x3F2F,
-	/* Array index: 0x1047 */ 0x622B,0x3F30,
-	/* Array index: 0x1047 */ 0x6239,0x3F31,
-	/* Array index: 0x1047 */ 0x623D,0x3F32,
-	/* Array index: 0x1047 */ 0x624C,0x3F37,
-	/* Array index: 0x1047 */ 0x625A,0x3F3D,
-	/* Array index: 0x1047 */ 0x625C,0x3F3E,
-	/* Array index: 0x1047 */ 0x6264,0x3F3F,
-	/* Array index: 0x1047 */ 0x626D,0x3F40,
-	/* Array index: 0x1047 */ 0x626F,0x3F41,
-	/* Array index: 0x1047 */ 0x6273,0x3F42,
-	/* Array index: 0x1047 */ 0x627A,0x3F43,
-	/* Array index: 0x1047 */ 0x627D,0x3F44,
-	/* Array index: 0x1047 */ 0x62A6,0x3F49,
-	/* Array index: 0x1047 */ 0x62A8,0x3F4A,
-	/* Array index: 0x1047 */ 0x62B3,0x3F4B,
-	/* Array index: 0x1047 */ 0x62B6,0x3F4C,
-	/* Array index: 0x1047 */ 0x62B7,0x3F4D,
-	/* Array index: 0x1047 */ 0x62BA,0x3F4E,
-	/* Array index: 0x1047 */ 0x62BE,0x3F4F,
-	/* Array index: 0x1047 */ 0x62BF,0x3F50,
-	/* Array index: 0x1047 */ 0x62C4,0x3F51,
-	/* Array index: 0x1047 */ 0x62CE,0x3F52,
-	/* Array index: 0x1047 */ 0x62D5,0x3F53,
-	/* Array index: 0x1047 */ 0x62D6,0x3F54,
-	/* Array index: 0x1047 */ 0x62DA,0x3F55,
-	/* Array index: 0x1047 */ 0x62EA,0x3F56,
-	/* Array index: 0x1047 */ 0x62F2,0x3F57,
-	/* Array index: 0x1047 */ 0x62F4,0x3F58,
-	/* Array index: 0x1047 */ 0x62FC,0x3F59,
-	/* Array index: 0x1047 */ 0x62FD,0x3F5A,
-	/* Array index: 0x1047 */ 0x6303,0x3F5B,
-	/* Array index: 0x1047 */ 0x6304,0x3F5C,
-	/* Array index: 0x1047 */ 0x630A,0x3F5D,
-	/* Array index: 0x1047 */ 0x630B,0x3F5E,
-	/* Array index: 0x1047 */ 0x630D,0x3F5F,
-	/* Array index: 0x1047 */ 0x6310,0x3F60,
-	/* Array index: 0x1047 */ 0x6313,0x3F61,
-	/* Array index: 0x1047 */ 0x6316,0x3F62,
-	/* Array index: 0x1047 */ 0x6318,0x3F63,
-	/* Array index: 0x1047 */ 0x6329,0x3F64,
-	/* Array index: 0x1047 */ 0x632A,0x3F65,
-	/* Array index: 0x1047 */ 0x632D,0x3F66,
-	/* Array index: 0x1047 */ 0x6335,0x3F67,
-	/* Array index: 0x1047 */ 0x6336,0x3F68,
-	/* Array index: 0x1047 */ 0x6339,0x3F69,
-	/* Array index: 0x1047 */ 0x633C,0x3F6A,
-	/* Array index: 0x1047 */ 0x634A,0x3F70,
-	/* Array index: 0x1047 */ 0x634B,0x3F71,
-	/* Array index: 0x1047 */ 0x634E,0x3F72,
-	/* Array index: 0x1047 */ 0x6358,0x3F76,
-	/* Array index: 0x1047 */ 0x635B,0x3F77,
-	/* Array index: 0x1047 */ 0x6365,0x3F78,
-	/* Array index: 0x1047 */ 0x6366,0x3F79,
-	/* Array index: 0x1047 */ 0x636C,0x3F7A,
-	/* Array index: 0x1047 */ 0x636D,0x3F7B,
-	/* Array index: 0x1047 */ 0x6371,0x3F7C,
-	/* Array index: 0x1047 */ 0x6374,0x3F7D,
-	/* Array index: 0x1047 */ 0x6375,0x3F7E,
-	/* Array index: 0x1047 */ 0x6378,0x4021,
-	/* Array index: 0x1047 */ 0x637C,0x4022,
-	/* Array index: 0x1047 */ 0x637D,0x4023,
-	/* Array index: 0x1047 */ 0x637F,0x4024,
-	/* Array index: 0x1047 */ 0x6382,0x4025,
-	/* Array index: 0x1047 */ 0x6384,0x4026,
-	/* Array index: 0x1047 */ 0x6387,0x4027,
-	/* Array index: 0x1047 */ 0x638A,0x4028,
-	/* Array index: 0x1047 */ 0x6390,0x4029,
-	/* Array index: 0x1047 */ 0x6394,0x402A,
-	/* Array index: 0x1047 */ 0x6395,0x402B,
-	/* Array index: 0x1047 */ 0x6399,0x402C,
-	/* Array index: 0x1047 */ 0x639A,0x402D,
-	/* Array index: 0x1047 */ 0x639E,0x402E,
-	/* Array index: 0x1047 */ 0x63A4,0x402F,
-	/* Array index: 0x1047 */ 0x63A6,0x4030,
-	/* Array index: 0x1047 */ 0x63BD,0x4034,
-	/* Array index: 0x1047 */ 0x63C1,0x4035,
-	/* Array index: 0x1047 */ 0x63C5,0x4036,
-	/* Array index: 0x1047 */ 0x63C8,0x4037,
-	/* Array index: 0x1047 */ 0x63CE,0x4038,
-	/* Array index: 0x1047 */ 0x63DC,0x403D,
-	/* Array index: 0x1047 */ 0x63E0,0x403E,
-	/* Array index: 0x1047 */ 0x63E5,0x403F,
-	/* Array index: 0x1047 */ 0x63EA,0x4040,
-	/* Array index: 0x1047 */ 0x63EC,0x4041,
-	/* Array index: 0x1047 */ 0x63F2,0x4042,
-	/* Array index: 0x1047 */ 0x63F3,0x4043,
-	/* Array index: 0x1047 */ 0x63F5,0x4044,
-	/* Array index: 0x1047 */ 0x63F8,0x4045,
-	/* Array index: 0x1047 */ 0x63F9,0x4046,
-	/* Array index: 0x1047 */ 0x6409,0x4047,
-	/* Array index: 0x1047 */ 0x640A,0x4048,
-	/* Array index: 0x1047 */ 0x6410,0x4049,
-	/* Array index: 0x1047 */ 0x6412,0x404A,
-	/* Array index: 0x1047 */ 0x6414,0x404B,
-	/* Array index: 0x1047 */ 0x6418,0x404C,
-	/* Array index: 0x1047 */ 0x641E,0x404D,
-	/* Array index: 0x1047 */ 0x6420,0x404E,
-	/* Array index: 0x1047 */ 0x6422,0x404F,
-	/* Array index: 0x1047 */ 0x6424,0x4050,
-	/* Array index: 0x1047 */ 0x6425,0x4051,
-	/* Array index: 0x1047 */ 0x6429,0x4052,
-	/* Array index: 0x1047 */ 0x642A,0x4053,
-	/* Array index: 0x1047 */ 0x642F,0x4054,
-	/* Array index: 0x1047 */ 0x6430,0x4055,
-	/* Array index: 0x1047 */ 0x6435,0x4056,
-	/* Array index: 0x1047 */ 0x643D,0x4057,
-	/* Array index: 0x1047 */ 0x643F,0x4058,
-	/* Array index: 0x1047 */ 0x644B,0x4059,
-	/* Array index: 0x1047 */ 0x646D,0x4067,
-	/* Array index: 0x1047 */ 0x6473,0x4068,
-	/* Array index: 0x1047 */ 0x6474,0x4069,
-	/* Array index: 0x1047 */ 0x647B,0x406A,
-	/* Array index: 0x1047 */ 0x647D,0x406B,
-	/* Array index: 0x1047 */ 0x6485,0x406C,
-	/* Array index: 0x1047 */ 0x6487,0x406D,
-	/* Array index: 0x1047 */ 0x6498,0x4071,
-	/* Array index: 0x1047 */ 0x6499,0x4072,
-	/* Array index: 0x1047 */ 0x649B,0x4073,
-	/* Array index: 0x1047 */ 0x649D,0x4074,
-	/* Array index: 0x1047 */ 0x649F,0x4075,
-	/* Array index: 0x1047 */ 0x64A1,0x4076,
-	/* Array index: 0x1047 */ 0x64A3,0x4077,
-	/* Array index: 0x1047 */ 0x64A6,0x4078,
-	/* Array index: 0x1047 */ 0x64A8,0x4079,
-	/* Array index: 0x1047 */ 0x64AC,0x407A,
-	/* Array index: 0x1047 */ 0x64B3,0x407B,
-	/* Array index: 0x1047 */ 0x64C4,0x4121,
-	/* Array index: 0x1047 */ 0x64D5,0x4129,
-	/* Array index: 0x1047 */ 0x64D7,0x412A,
-	/* Array index: 0x1047 */ 0x64E4,0x412B,
-	/* Array index: 0x1047 */ 0x64E5,0x412C,
-	/* Array index: 0x1047 */ 0x64E9,0x412D,
-	/* Array index: 0x1047 */ 0x64EA,0x412E,
-	/* Array index: 0x1047 */ 0x64ED,0x412F,
-	/* Array index: 0x1047 */ 0x64F0,0x4130,
-	/* Array index: 0x1047 */ 0x64F5,0x4131,
-	/* Array index: 0x1047 */ 0x64F7,0x4132,
-	/* Array index: 0x1047 */ 0x64FB,0x4133,
-	/* Array index: 0x1047 */ 0x64FF,0x4134,
-	/* Array index: 0x1047 */ 0x6501,0x4135,
-	/* Array index: 0x1047 */ 0x6504,0x4136,
-	/* Array index: 0x1047 */ 0x650F,0x413A,
-	/* Array index: 0x1047 */ 0x6513,0x413B,
-	/* Array index: 0x1047 */ 0x6514,0x413C,
-	/* Array index: 0x1047 */ 0x6516,0x413D,
-	/* Array index: 0x1047 */ 0x6519,0x413E,
-	/* Array index: 0x1047 */ 0x651B,0x413F,
-	/* Array index: 0x1047 */ 0x651E,0x4140,
-	/* Array index: 0x1047 */ 0x651F,0x4141,
-	/* Array index: 0x1047 */ 0x6522,0x4142,
-	/* Array index: 0x1047 */ 0x6526,0x4143,
-	/* Array index: 0x1047 */ 0x6529,0x4144,
-	/* Array index: 0x1047 */ 0x652E,0x4145,
-	/* Array index: 0x1047 */ 0x6531,0x4146,
-	/* Array index: 0x1047 */ 0x653A,0x4147,
-	/* Array index: 0x1047 */ 0x653C,0x4148,
-	/* Array index: 0x1047 */ 0x653D,0x4149,
-	/* Array index: 0x1047 */ 0x6543,0x414A,
-	/* Array index: 0x1047 */ 0x6547,0x414B,
-	/* Array index: 0x1047 */ 0x6549,0x414C,
-	/* Array index: 0x1047 */ 0x6550,0x414D,
-	/* Array index: 0x1047 */ 0x6552,0x414E,
-	/* Array index: 0x1047 */ 0x6554,0x414F,
-	/* Array index: 0x1047 */ 0x655F,0x4150,
-	/* Array index: 0x1047 */ 0x6560,0x4151,
-	/* Array index: 0x1047 */ 0x6567,0x4152,
-	/* Array index: 0x1047 */ 0x656B,0x4153,
-	/* Array index: 0x1047 */ 0x657A,0x4154,
-	/* Array index: 0x1047 */ 0x657D,0x4155,
-	/* Array index: 0x1047 */ 0x6581,0x4156,
-	/* Array index: 0x1047 */ 0x6585,0x4157,
-	/* Array index: 0x1047 */ 0x658A,0x4158,
-	/* Array index: 0x1047 */ 0x6592,0x4159,
-	/* Array index: 0x1047 */ 0x6595,0x415A,
-	/* Array index: 0x1047 */ 0x6598,0x415B,
-	/* Array index: 0x1047 */ 0x659D,0x415C,
-	/* Array index: 0x1047 */ 0x65A0,0x415D,
-	/* Array index: 0x1047 */ 0x65A3,0x415E,
-	/* Array index: 0x1047 */ 0x65A6,0x415F,
-	/* Array index: 0x1047 */ 0x65AE,0x4160,
-	/* Array index: 0x1047 */ 0x65BF,0x4164,
-	/* Array index: 0x1047 */ 0x65C2,0x4165,
-	/* Array index: 0x1047 */ 0x65C8,0x4166,
-	/* Array index: 0x1047 */ 0x65C9,0x4167,
-	/* Array index: 0x1047 */ 0x65CE,0x4168,
-	/* Array index: 0x1047 */ 0x65D0,0x4169,
-	/* Array index: 0x1047 */ 0x65D4,0x416A,
-	/* Array index: 0x1047 */ 0x65D6,0x416B,
-	/* Array index: 0x1047 */ 0x65D8,0x416C,
-	/* Array index: 0x1047 */ 0x65DF,0x416D,
-	/* Array index: 0x1047 */ 0x65F0,0x416E,
-	/* Array index: 0x1047 */ 0x65F2,0x416F,
-	/* Array index: 0x1047 */ 0x65F4,0x4170,
-	/* Array index: 0x1047 */ 0x65F5,0x4171,
-	/* Array index: 0x1047 */ 0x65F9,0x4172,
-	/* Array index: 0x1047 */ 0x6604,0x4176,
-	/* Array index: 0x1047 */ 0x6608,0x4177,
-	/* Array index: 0x1047 */ 0x6609,0x4178,
-	/* Array index: 0x1047 */ 0x660D,0x4179,
-	/* Array index: 0x1047 */ 0x6611,0x417A,
-	/* Array index: 0x1047 */ 0x6612,0x417B,
-	/* Array index: 0x1047 */ 0x6615,0x417C,
-	/* Array index: 0x1047 */ 0x6616,0x417D,
-	/* Array index: 0x1047 */ 0x6637,0x4230,
-	/* Array index: 0x1047 */ 0x6639,0x422F,
-	/* Array index: 0x1047 */ 0x6640,0x4231,
-	/* Array index: 0x1047 */ 0x6645,0x4232,
-	/* Array index: 0x1047 */ 0x6646,0x4233,
-	/* Array index: 0x1047 */ 0x664A,0x4234,
-	/* Array index: 0x1047 */ 0x664C,0x4235,
-	/* Array index: 0x1047 */ 0x664E,0x4237,
-	/* Array index: 0x1047 */ 0x6651,0x4236,
-	/* Array index: 0x1047 */ 0x6660,0x423D,
-	/* Array index: 0x1047 */ 0x6661,0x423E,
-	/* Array index: 0x1047 */ 0x6673,0x4244,
-	/* Array index: 0x1047 */ 0x6690,0x4250,
-	/* Array index: 0x1047 */ 0x6692,0x4251,
-	/* Array index: 0x1047 */ 0x66A4,0x4258,
-	/* Array index: 0x1047 */ 0x66AD,0x4259,
-	/* Array index: 0x1047 */ 0x66B1,0x425A,
-	/* Array index: 0x1047 */ 0x66B2,0x425B,
-	/* Array index: 0x1047 */ 0x66B5,0x425C,
-	/* Array index: 0x1047 */ 0x66BB,0x425D,
-	/* Array index: 0x1047 */ 0x66C8,0x4262,
-	/* Array index: 0x1047 */ 0x66CC,0x4263,
-	/* Array index: 0x1047 */ 0x66CE,0x4264,
-	/* Array index: 0x1047 */ 0x66CF,0x4265,
-	/* Array index: 0x1047 */ 0x66D4,0x4266,
-	/* Array index: 0x1047 */ 0x66DB,0x4267,
-	/* Array index: 0x1047 */ 0x66DF,0x4268,
-	/* Array index: 0x1047 */ 0x66E8,0x4269,
-	/* Array index: 0x1047 */ 0x66EB,0x426A,
-	/* Array index: 0x1047 */ 0x66EC,0x426B,
-	/* Array index: 0x1047 */ 0x66EE,0x426C,
-	/* Array index: 0x1047 */ 0x66FA,0x426D,
-	/* Array index: 0x1047 */ 0x66FB,0x423F,
-	/* Array index: 0x1047 */ 0x6705,0x426E,
-	/* Array index: 0x1047 */ 0x6707,0x426F,
-	/* Array index: 0x1047 */ 0x670E,0x4270,
-	/* Array index: 0x1047 */ 0x6713,0x4271,
-	/* Array index: 0x1047 */ 0x6719,0x4272,
-	/* Array index: 0x1047 */ 0x671C,0x4273,
-	/* Array index: 0x1047 */ 0x6720,0x4274,
-	/* Array index: 0x1047 */ 0x6722,0x4275,
-	/* Array index: 0x1047 */ 0x6733,0x4276,
-	/* Array index: 0x1047 */ 0x673E,0x4277,
-	/* Array index: 0x1047 */ 0x6745,0x4278,
-	/* Array index: 0x1047 */ 0x6747,0x4279,
-	/* Array index: 0x1047 */ 0x6748,0x427A,
-	/* Array index: 0x1047 */ 0x674C,0x427B,
-	/* Array index: 0x1047 */ 0x6754,0x427C,
-	/* Array index: 0x1047 */ 0x6755,0x427D,
-	/* Array index: 0x1047 */ 0x675D,0x427E,
-	/* Array index: 0x1047 */ 0x6766,0x4321,
-	/* Array index: 0x1047 */ 0x676C,0x4322,
-	/* Array index: 0x1047 */ 0x676E,0x4323,
-	/* Array index: 0x1047 */ 0x6774,0x4324,
-	/* Array index: 0x1047 */ 0x6776,0x4325,
-	/* Array index: 0x1047 */ 0x677B,0x4326,
-	/* Array index: 0x1047 */ 0x6781,0x4327,
-	/* Array index: 0x1047 */ 0x6784,0x4328,
-	/* Array index: 0x1047 */ 0x678E,0x4329,
-	/* Array index: 0x1047 */ 0x678F,0x432A,
-	/* Array index: 0x1047 */ 0x6791,0x432B,
-	/* Array index: 0x1047 */ 0x6793,0x432C,
-	/* Array index: 0x1047 */ 0x6796,0x432D,
-	/* Array index: 0x1047 */ 0x6798,0x432E,
-	/* Array index: 0x1047 */ 0x6799,0x432F,
-	/* Array index: 0x1047 */ 0x679B,0x4330,
-	/* Array index: 0x1047 */ 0x67B5,0x4334,
-	/* Array index: 0x1047 */ 0x67C0,0x4339,
-	/* Array index: 0x1047 */ 0x67C2,0x433A,
-	/* Array index: 0x1047 */ 0x67C3,0x433B,
-	/* Array index: 0x1047 */ 0x67C5,0x433C,
-	/* Array index: 0x1047 */ 0x67C8,0x433D,
-	/* Array index: 0x1047 */ 0x67C9,0x433E,
-	/* Array index: 0x1047 */ 0x67D2,0x433F,
-	/* Array index: 0x1047 */ 0x67D7,0x4340,
-	/* Array index: 0x1047 */ 0x67D9,0x4341,
-	/* Array index: 0x1047 */ 0x67DC,0x4342,
-	/* Array index: 0x1047 */ 0x67E1,0x4343,
-	/* Array index: 0x1047 */ 0x67E6,0x4344,
-	/* Array index: 0x1047 */ 0x67F0,0x4345,
-	/* Array index: 0x1047 */ 0x67F2,0x4346,
-	/* Array index: 0x1047 */ 0x67F6,0x4347,
-	/* Array index: 0x1047 */ 0x67F7,0x4348,
-	/* Array index: 0x1047 */ 0x67F9,0x4338,
-	/* Array index: 0x1047 */ 0x6814,0x434A,
-	/* Array index: 0x1047 */ 0x6819,0x434B,
-	/* Array index: 0x1047 */ 0x681D,0x434C,
-	/* Array index: 0x1047 */ 0x681F,0x434D,
-	/* Array index: 0x1047 */ 0x6827,0x434F,
-	/* Array index: 0x1047 */ 0x6828,0x434E,
-	/* Array index: 0x1047 */ 0x683B,0x4356,
-	/* Array index: 0x1047 */ 0x683F,0x4357,
-	/* Array index: 0x1047 */ 0x6844,0x4358,
-	/* Array index: 0x1047 */ 0x6845,0x4359,
-	/* Array index: 0x1047 */ 0x684A,0x435A,
-	/* Array index: 0x1047 */ 0x684C,0x435B,
-	/* Array index: 0x1047 */ 0x6852,0x4349,
-	/* Array index: 0x1047 */ 0x6855,0x435C,
-	/* Array index: 0x1047 */ 0x6857,0x435D,
-	/* Array index: 0x1047 */ 0x6858,0x435E,
-	/* Array index: 0x1047 */ 0x685B,0x435F,
-	/* Array index: 0x1047 */ 0x686B,0x4360,
-	/* Array index: 0x1047 */ 0x6875,0x4366,
-	/* Array index: 0x1047 */ 0x6882,0x436B,
-	/* Array index: 0x1047 */ 0x6884,0x436C,
-	/* Array index: 0x1047 */ 0x6886,0x436D,
-	/* Array index: 0x1047 */ 0x6888,0x436E,
-	/* Array index: 0x1047 */ 0x6896,0x436F,
-	/* Array index: 0x1047 */ 0x6898,0x4370,
-	/* Array index: 0x1047 */ 0x689A,0x4371,
-	/* Array index: 0x1047 */ 0x689C,0x4372,
-	/* Array index: 0x1047 */ 0x68A1,0x4373,
-	/* Array index: 0x1047 */ 0x68A3,0x4374,
-	/* Array index: 0x1047 */ 0x68A5,0x4375,
-	/* Array index: 0x1047 */ 0x68A9,0x4376,
-	/* Array index: 0x1047 */ 0x68AA,0x4377,
-	/* Array index: 0x1047 */ 0x68AE,0x4378,
-	/* Array index: 0x1047 */ 0x68B2,0x4379,
-	/* Array index: 0x1047 */ 0x68BB,0x437A,
-	/* Array index: 0x1047 */ 0x68C5,0x437B,
-	/* Array index: 0x1047 */ 0x68C8,0x437C,
-	/* Array index: 0x1047 */ 0x68CC,0x437D,
-	/* Array index: 0x1047 */ 0x68D6,0x4424,
-	/* Array index: 0x1047 */ 0x68D9,0x4425,
-	/* Array index: 0x1047 */ 0x68DC,0x4426,
-	/* Array index: 0x1047 */ 0x68DD,0x4427,
-	/* Array index: 0x1047 */ 0x68E5,0x4428,
-	/* Array index: 0x1047 */ 0x68F5,0x4430,
-	/* Array index: 0x1047 */ 0x68F6,0x4431,
-	/* Array index: 0x1047 */ 0x6906,0x4435,
-	/* Array index: 0x1047 */ 0x6909,0x4436,
-	/* Array index: 0x1047 */ 0x690A,0x4437,
-	/* Array index: 0x1047 */ 0x6910,0x4438,
-	/* Array index: 0x1047 */ 0x6911,0x4439,
-	/* Array index: 0x1047 */ 0x6913,0x443A,
-	/* Array index: 0x1047 */ 0x6916,0x443B,
-	/* Array index: 0x1047 */ 0x6917,0x443C,
-	/* Array index: 0x1047 */ 0x6931,0x443D,
-	/* Array index: 0x1047 */ 0x6933,0x443E,
-	/* Array index: 0x1047 */ 0x6935,0x443F,
-	/* Array index: 0x1047 */ 0x6938,0x4440,
-	/* Array index: 0x1047 */ 0x693B,0x4441,
-	/* Array index: 0x1047 */ 0x6942,0x4442,
-	/* Array index: 0x1047 */ 0x6945,0x4443,
-	/* Array index: 0x1047 */ 0x6949,0x4444,
-	/* Array index: 0x1047 */ 0x694E,0x4445,
-	/* Array index: 0x1047 */ 0x6957,0x4446,
-	/* Array index: 0x1047 */ 0x695B,0x4447,
-	/* Array index: 0x1047 */ 0x696C,0x444E,
-	/* Array index: 0x1047 */ 0x697A,0x4452,
-	/* Array index: 0x1047 */ 0x697B,0x4453,
-	/* Array index: 0x1047 */ 0x697F,0x4454,
-	/* Array index: 0x1047 */ 0x6980,0x4455,
-	/* Array index: 0x1047 */ 0x698D,0x4456,
-	/* Array index: 0x1047 */ 0x6992,0x4457,
-	/* Array index: 0x1047 */ 0x6996,0x4458,
-	/* Array index: 0x1047 */ 0x6998,0x4459,
-	/* Array index: 0x1047 */ 0x69A1,0x445A,
-	/* Array index: 0x1047 */ 0x69A5,0x445B,
-	/* Array index: 0x1047 */ 0x69A6,0x445C,
-	/* Array index: 0x1047 */ 0x69A8,0x445D,
-	/* Array index: 0x1047 */ 0x69AB,0x445E,
-	/* Array index: 0x1047 */ 0x69AD,0x445F,
-	/* Array index: 0x1047 */ 0x69AF,0x4460,
-	/* Array index: 0x1047 */ 0x69B7,0x4461,
-	/* Array index: 0x1047 */ 0x69B8,0x4462,
-	/* Array index: 0x1047 */ 0x69BA,0x4463,
-	/* Array index: 0x1047 */ 0x69BC,0x4464,
-	/* Array index: 0x1047 */ 0x69C5,0x4465,
-	/* Array index: 0x1047 */ 0x69C8,0x4466,
-	/* Array index: 0x1047 */ 0x69D1,0x4467,
-	/* Array index: 0x1047 */ 0x69D6,0x4468,
-	/* Array index: 0x1047 */ 0x69D7,0x4469,
-	/* Array index: 0x1047 */ 0x69E2,0x446A,
-	/* Array index: 0x1047 */ 0x69E5,0x446B,
-	/* Array index: 0x1047 */ 0x69EE,0x446C,
-	/* Array index: 0x1047 */ 0x69EF,0x446D,
-	/* Array index: 0x1047 */ 0x69F1,0x446E,
-	/* Array index: 0x1047 */ 0x69F3,0x446F,
-	/* Array index: 0x1047 */ 0x69F5,0x4470,
-	/* Array index: 0x1047 */ 0x69FE,0x4471,
-	/* Array index: 0x1047 */ 0x6A00,0x4472,
-	/* Array index: 0x1047 */ 0x6A01,0x4473,
-	/* Array index: 0x1047 */ 0x6A03,0x4474,
-	/* Array index: 0x1047 */ 0x6A0F,0x4475,
-	/* Array index: 0x1047 */ 0x6A11,0x4476,
-	/* Array index: 0x1047 */ 0x6A15,0x4477,
-	/* Array index: 0x1047 */ 0x6A1A,0x4478,
-	/* Array index: 0x1047 */ 0x6A1D,0x4479,
-	/* Array index: 0x1047 */ 0x6A20,0x447A,
-	/* Array index: 0x1047 */ 0x6A24,0x447B,
-	/* Array index: 0x1047 */ 0x6A28,0x447C,
-	/* Array index: 0x1047 */ 0x6A30,0x447D,
-	/* Array index: 0x1047 */ 0x6A32,0x447E,
-	/* Array index: 0x1047 */ 0x6A34,0x4521,
-	/* Array index: 0x1047 */ 0x6A37,0x4522,
-	/* Array index: 0x1047 */ 0x6A3B,0x4523,
-	/* Array index: 0x1047 */ 0x6A3E,0x4524,
-	/* Array index: 0x1047 */ 0x6A3F,0x4525,
-	/* Array index: 0x1047 */ 0x6A45,0x4526,
-	/* Array index: 0x1047 */ 0x6A46,0x4527,
-	/* Array index: 0x1047 */ 0x6A49,0x4528,
-	/* Array index: 0x1047 */ 0x6A4A,0x4529,
-	/* Array index: 0x1047 */ 0x6A5B,0x4530,
-	/* Array index: 0x1047 */ 0x6A64,0x4531,
-	/* Array index: 0x1047 */ 0x6A67,0x4532,
-	/* Array index: 0x1047 */ 0x6A6A,0x4533,
-	/* Array index: 0x1047 */ 0x6A71,0x4534,
-	/* Array index: 0x1047 */ 0x6A73,0x4535,
-	/* Array index: 0x1047 */ 0x6A7E,0x4536,
-	/* Array index: 0x1047 */ 0x6A81,0x4537,
-	/* Array index: 0x1047 */ 0x6A83,0x4538,
-	/* Array index: 0x1047 */ 0x6A86,0x4539,
-	/* Array index: 0x1047 */ 0x6A87,0x453A,
-	/* Array index: 0x1047 */ 0x6A89,0x453B,
-	/* Array index: 0x1047 */ 0x6A8B,0x453C,
-	/* Array index: 0x1047 */ 0x6A91,0x453D,
-	/* Array index: 0x1047 */ 0x6AA5,0x4542,
-	/* Array index: 0x1047 */ 0x6AAB,0x4543,
-	/* Array index: 0x1047 */ 0x6AB4,0x4547,
-	/* Array index: 0x1047 */ 0x6AC6,0x454B,
-	/* Array index: 0x1047 */ 0x6AC8,0x454D,
-	/* Array index: 0x1047 */ 0x6AC9,0x454C,
-	/* Array index: 0x1047 */ 0x6ACC,0x454E,
-	/* Array index: 0x1047 */ 0x6AD0,0x454F,
-	/* Array index: 0x1047 */ 0x6ADC,0x4553,
-	/* Array index: 0x1047 */ 0x6ADD,0x4554,
-	/* Array index: 0x1047 */ 0x6AE4,0x4555,
-	/* Array index: 0x1047 */ 0x6AE7,0x4556,
-	/* Array index: 0x1047 */ 0x6AEC,0x4557,
-	/* Array index: 0x1047 */ 0x6AFC,0x455B,
-	/* Array index: 0x1047 */ 0x6AFD,0x455C,
-	/* Array index: 0x1047 */ 0x6B02,0x455D,
-	/* Array index: 0x1047 */ 0x6B03,0x455E,
-	/* Array index: 0x1047 */ 0x6B06,0x455F,
-	/* Array index: 0x1047 */ 0x6B07,0x4560,
-	/* Array index: 0x1047 */ 0x6B09,0x4561,
-	/* Array index: 0x1047 */ 0x6B17,0x4565,
-	/* Array index: 0x1047 */ 0x6B1B,0x4566,
-	/* Array index: 0x1047 */ 0x6B1E,0x4567,
-	/* Array index: 0x1047 */ 0x6B24,0x4568,
-	/* Array index: 0x1047 */ 0x6B28,0x4569,
-	/* Array index: 0x1047 */ 0x6B2B,0x456A,
-	/* Array index: 0x1047 */ 0x6B2C,0x456B,
-	/* Array index: 0x1047 */ 0x6B2F,0x456C,
-	/* Array index: 0x1047 */ 0x6B35,0x456D,
-	/* Array index: 0x1047 */ 0x6B36,0x456E,
-	/* Array index: 0x1047 */ 0x6B3B,0x456F,
-	/* Array index: 0x1047 */ 0x6B3F,0x4570,
-	/* Array index: 0x1047 */ 0x6B46,0x4571,
-	/* Array index: 0x1047 */ 0x6B4A,0x4572,
-	/* Array index: 0x1047 */ 0x6B4D,0x4573,
-	/* Array index: 0x1047 */ 0x6B52,0x4574,
-	/* Array index: 0x1047 */ 0x6B56,0x4575,
-	/* Array index: 0x1047 */ 0x6B58,0x4576,
-	/* Array index: 0x1047 */ 0x6B5D,0x4577,
-	/* Array index: 0x1047 */ 0x6B60,0x4578,
-	/* Array index: 0x1047 */ 0x6B67,0x4579,
-	/* Array index: 0x1047 */ 0x6B6B,0x457A,
-	/* Array index: 0x1047 */ 0x6B6E,0x457B,
-	/* Array index: 0x1047 */ 0x6B70,0x457C,
-	/* Array index: 0x1047 */ 0x6B75,0x457D,
-	/* Array index: 0x1047 */ 0x6B7D,0x457E,
-	/* Array index: 0x1047 */ 0x6B7E,0x4621,
-	/* Array index: 0x1047 */ 0x6B82,0x4622,
-	/* Array index: 0x1047 */ 0x6B85,0x4623,
-	/* Array index: 0x1047 */ 0x6B97,0x4624,
-	/* Array index: 0x1047 */ 0x6B9B,0x4625,
-	/* Array index: 0x1047 */ 0x6BB8,0x4630,
-	/* Array index: 0x1047 */ 0x6BB9,0x4631,
-	/* Array index: 0x1047 */ 0x6BBD,0x4632,
-	/* Array index: 0x1047 */ 0x6BBE,0x4633,
-	/* Array index: 0x1047 */ 0x6BC3,0x4634,
-	/* Array index: 0x1047 */ 0x6BC4,0x4635,
-	/* Array index: 0x1047 */ 0x6BC9,0x4636,
-	/* Array index: 0x1047 */ 0x6BCC,0x4637,
-	/* Array index: 0x1047 */ 0x6BD6,0x4638,
-	/* Array index: 0x1047 */ 0x6BDA,0x4639,
-	/* Array index: 0x1047 */ 0x6BE1,0x463A,
-	/* Array index: 0x1047 */ 0x6BE3,0x463B,
-	/* Array index: 0x1047 */ 0x6BE6,0x463C,
-	/* Array index: 0x1047 */ 0x6BE7,0x463D,
-	/* Array index: 0x1047 */ 0x6BEE,0x463E,
-	/* Array index: 0x1047 */ 0x6BF1,0x463F,
-	/* Array index: 0x1047 */ 0x6BF7,0x4640,
-	/* Array index: 0x1047 */ 0x6BF9,0x4641,
-	/* Array index: 0x1047 */ 0x6BFF,0x4642,
-	/* Array index: 0x1047 */ 0x6C02,0x4643,
-	/* Array index: 0x1047 */ 0x6C04,0x4644,
-	/* Array index: 0x1047 */ 0x6C05,0x4645,
-	/* Array index: 0x1047 */ 0x6C09,0x4646,
-	/* Array index: 0x1047 */ 0x6C0D,0x4647,
-	/* Array index: 0x1047 */ 0x6C0E,0x4648,
-	/* Array index: 0x1047 */ 0x6C10,0x4649,
-	/* Array index: 0x1047 */ 0x6C12,0x464A,
-	/* Array index: 0x1047 */ 0x6C19,0x464B,
-	/* Array index: 0x1047 */ 0x6C1F,0x464C,
-	/* Array index: 0x1047 */ 0x6C2C,0x4650,
-	/* Array index: 0x1047 */ 0x6C2E,0x4651,
-	/* Array index: 0x1047 */ 0x6C33,0x4652,
-	/* Array index: 0x1047 */ 0x6C35,0x4653,
-	/* Array index: 0x1047 */ 0x6C36,0x4654,
-	/* Array index: 0x1047 */ 0x6C3A,0x4655,
-	/* Array index: 0x1047 */ 0x6C3B,0x4656,
-	/* Array index: 0x1047 */ 0x6C3F,0x4657,
-	/* Array index: 0x1047 */ 0x6C4A,0x4658,
-	/* Array index: 0x1047 */ 0x6C4B,0x4659,
-	/* Array index: 0x1047 */ 0x6C4D,0x465A,
-	/* Array index: 0x1047 */ 0x6C4F,0x465B,
-	/* Array index: 0x1047 */ 0x6C52,0x465C,
-	/* Array index: 0x1047 */ 0x6C54,0x465D,
-	/* Array index: 0x1047 */ 0x6C59,0x465E,
-	/* Array index: 0x1047 */ 0x6C5B,0x465F,
-	/* Array index: 0x1047 */ 0x6C5C,0x4660,
-	/* Array index: 0x1047 */ 0x6C67,0x4736,
-	/* Array index: 0x1047 */ 0x6C6B,0x4661,
-	/* Array index: 0x1047 */ 0x6C6D,0x4662,
-	/* Array index: 0x1047 */ 0x6C6F,0x4663,
-	/* Array index: 0x1047 */ 0x6C74,0x4664,
-	/* Array index: 0x1047 */ 0x6C76,0x4665,
-	/* Array index: 0x1047 */ 0x6C78,0x4666,
-	/* Array index: 0x1047 */ 0x6C79,0x4667,
-	/* Array index: 0x1047 */ 0x6C7B,0x4668,
-	/* Array index: 0x1047 */ 0x6C9C,0x4671,
-	/* Array index: 0x1047 */ 0x6C9F,0x4672,
-	/* Array index: 0x1047 */ 0x6CB0,0x4673,
-	/* Array index: 0x1047 */ 0x6CB2,0x4674,
-	/* Array index: 0x1047 */ 0x6CB4,0x4675,
-	/* Array index: 0x1047 */ 0x6CC2,0x4676,
-	/* Array index: 0x1047 */ 0x6CC6,0x4677,
-	/* Array index: 0x1047 */ 0x6CDA,0x4721,
-	/* Array index: 0x1047 */ 0x6CDC,0x4722,
-	/* Array index: 0x1047 */ 0x6CE0,0x4723,
-	/* Array index: 0x1047 */ 0x6CE7,0x4724,
-	/* Array index: 0x1047 */ 0x6CE9,0x4725,
-	/* Array index: 0x1047 */ 0x6CEB,0x4726,
-	/* Array index: 0x1047 */ 0x6CEC,0x4727,
-	/* Array index: 0x1047 */ 0x6CEE,0x4728,
-	/* Array index: 0x1047 */ 0x6CF2,0x4729,
-	/* Array index: 0x1047 */ 0x6CF4,0x472A,
-	/* Array index: 0x1047 */ 0x6D04,0x472B,
-	/* Array index: 0x1047 */ 0x6D07,0x472C,
-	/* Array index: 0x1047 */ 0x6D0A,0x472D,
-	/* Array index: 0x1047 */ 0x6D0E,0x472E,
-	/* Array index: 0x1047 */ 0x6D0F,0x472F,
-	/* Array index: 0x1047 */ 0x6D11,0x4730,
-	/* Array index: 0x1047 */ 0x6D13,0x4731,
-	/* Array index: 0x1047 */ 0x6D1A,0x4732,
-	/* Array index: 0x1047 */ 0x6D2E,0x4737,
-	/* Array index: 0x1047 */ 0x6D2F,0x4738,
-	/* Array index: 0x1047 */ 0x6D31,0x4739,
-	/* Array index: 0x1047 */ 0x6D39,0x473A,
-	/* Array index: 0x1047 */ 0x6D3C,0x473B,
-	/* Array index: 0x1047 */ 0x6D3F,0x473C,
-	/* Array index: 0x1047 */ 0x6D57,0x473D,
-	/* Array index: 0x1047 */ 0x6D5E,0x473E,
-	/* Array index: 0x1047 */ 0x6D5F,0x473F,
-	/* Array index: 0x1047 */ 0x6D61,0x4740,
-	/* Array index: 0x1047 */ 0x6D65,0x4741,
-	/* Array index: 0x1047 */ 0x6D67,0x4742,
-	/* Array index: 0x1047 */ 0x6D6F,0x4743,
-	/* Array index: 0x1047 */ 0x6D70,0x4744,
-	/* Array index: 0x1047 */ 0x6D7C,0x4745,
-	/* Array index: 0x1047 */ 0x6D82,0x4746,
-	/* Array index: 0x1047 */ 0x6D87,0x4747,
-	/* Array index: 0x1047 */ 0x6D91,0x4748,
-	/* Array index: 0x1047 */ 0x6D92,0x4749,
-	/* Array index: 0x1047 */ 0x6DAA,0x474E,
-	/* Array index: 0x1047 */ 0x6DAC,0x474F,
-	/* Array index: 0x1047 */ 0x6DB4,0x4750,
-	/* Array index: 0x1047 */ 0x6DB7,0x4751,
-	/* Array index: 0x1047 */ 0x6DB9,0x4752,
-	/* Array index: 0x1047 */ 0x6DBD,0x4753,
-	/* Array index: 0x1047 */ 0x6DBF,0x4754,
-	/* Array index: 0x1047 */ 0x6DC4,0x4755,
-	/* Array index: 0x1047 */ 0x6DC8,0x4756,
-	/* Array index: 0x1047 */ 0x6DCA,0x4757,
-	/* Array index: 0x1047 */ 0x6DCE,0x4758,
-	/* Array index: 0x1047 */ 0x6DCF,0x4759,
-	/* Array index: 0x1047 */ 0x6DD6,0x475A,
-	/* Array index: 0x1047 */ 0x6DDB,0x475B,
-	/* Array index: 0x1047 */ 0x6DDD,0x475C,
-	/* Array index: 0x1047 */ 0x6DDF,0x475D,
-	/* Array index: 0x1047 */ 0x6DE0,0x475E,
-	/* Array index: 0x1047 */ 0x6DE2,0x475F,
-	/* Array index: 0x1047 */ 0x6DE5,0x4760,
-	/* Array index: 0x1047 */ 0x6DE9,0x4761,
-	/* Array index: 0x1047 */ 0x6DEF,0x4762,
-	/* Array index: 0x1047 */ 0x6DF0,0x4763,
-	/* Array index: 0x1047 */ 0x6DF4,0x4764,
-	/* Array index: 0x1047 */ 0x6DF6,0x4765,
-	/* Array index: 0x1047 */ 0x6DFC,0x4766,
-	/* Array index: 0x1047 */ 0x6E00,0x4767,
-	/* Array index: 0x1047 */ 0x6E04,0x4768,
-	/* Array index: 0x1047 */ 0x6E1E,0x4769,
-	/* Array index: 0x1047 */ 0x6E22,0x476A,
-	/* Array index: 0x1047 */ 0x6E27,0x476B,
-	/* Array index: 0x1047 */ 0x6E32,0x476C,
-	/* Array index: 0x1047 */ 0x6E36,0x476D,
-	/* Array index: 0x1047 */ 0x6E39,0x476E,
-	/* Array index: 0x1047 */ 0x6E3B,0x476F,
-	/* Array index: 0x1047 */ 0x6E3C,0x4770,
-	/* Array index: 0x1047 */ 0x6E44,0x4771,
-	/* Array index: 0x1047 */ 0x6E45,0x4772,
-	/* Array index: 0x1047 */ 0x6E48,0x4773,
-	/* Array index: 0x1047 */ 0x6E49,0x4774,
-	/* Array index: 0x1047 */ 0x6E4B,0x4775,
-	/* Array index: 0x1047 */ 0x6E57,0x477B,
-	/* Array index: 0x1047 */ 0x6E62,0x4821,
-	/* Array index: 0x1047 */ 0x6E63,0x4822,
-	/* Array index: 0x1047 */ 0x6E68,0x4823,
-	/* Array index: 0x1047 */ 0x6E73,0x4824,
-	/* Array index: 0x1047 */ 0x6E7B,0x4825,
-	/* Array index: 0x1047 */ 0x6E7D,0x4826,
-	/* Array index: 0x1047 */ 0x6E8D,0x4827,
-	/* Array index: 0x1047 */ 0x6E93,0x4828,
-	/* Array index: 0x1047 */ 0x6E99,0x4829,
-	/* Array index: 0x1047 */ 0x6EA0,0x482A,
-	/* Array index: 0x1047 */ 0x6EA7,0x482B,
-	/* Array index: 0x1047 */ 0x6EAD,0x482C,
-	/* Array index: 0x1047 */ 0x6EAE,0x482D,
-	/* Array index: 0x1047 */ 0x6EB1,0x482E,
-	/* Array index: 0x1047 */ 0x6EB3,0x482F,
-	/* Array index: 0x1047 */ 0x6EBB,0x4830,
-	/* Array index: 0x1047 */ 0x6EC7,0x4835,
-	/* Array index: 0x1047 */ 0x6EC8,0x4836,
-	/* Array index: 0x1047 */ 0x6ECA,0x4837,
-	/* Array index: 0x1047 */ 0x6EEB,0x483B,
-	/* Array index: 0x1047 */ 0x6EED,0x483C,
-	/* Array index: 0x1047 */ 0x6EEE,0x483D,
-	/* Array index: 0x1047 */ 0x6EF9,0x483E,
-	/* Array index: 0x1047 */ 0x6EFB,0x483F,
-	/* Array index: 0x1047 */ 0x6EFD,0x4840,
-	/* Array index: 0x1047 */ 0x6F04,0x4841,
-	/* Array index: 0x1047 */ 0x6F08,0x4842,
-	/* Array index: 0x1047 */ 0x6F0A,0x4843,
-	/* Array index: 0x1047 */ 0x6F0C,0x4844,
-	/* Array index: 0x1047 */ 0x6F0D,0x4845,
-	/* Array index: 0x1047 */ 0x6F16,0x4846,
-	/* Array index: 0x1047 */ 0x6F18,0x4847,
-	/* Array index: 0x1047 */ 0x6F1A,0x4848,
-	/* Array index: 0x1047 */ 0x6F1B,0x4849,
-	/* Array index: 0x1047 */ 0x6F26,0x484A,
-	/* Array index: 0x1047 */ 0x6F29,0x484B,
-	/* Array index: 0x1047 */ 0x6F2A,0x484C,
-	/* Array index: 0x1047 */ 0x6F2D,0x4853,
-	/* Array index: 0x1047 */ 0x6F2F,0x484D,
-	/* Array index: 0x1047 */ 0x6F30,0x484E,
-	/* Array index: 0x1047 */ 0x6F33,0x484F,
-	/* Array index: 0x1047 */ 0x6F36,0x4850,
-	/* Array index: 0x1047 */ 0x6F3B,0x4851,
-	/* Array index: 0x1047 */ 0x6F3C,0x4852,
-	/* Array index: 0x1047 */ 0x6F57,0x4858,
-	/* Array index: 0x1047 */ 0x6F59,0x4859,
-	/* Array index: 0x1047 */ 0x6F5A,0x485A,
-	/* Array index: 0x1047 */ 0x6F5D,0x485B,
-	/* Array index: 0x1047 */ 0x6F5E,0x485C,
-	/* Array index: 0x1047 */ 0x6F61,0x485D,
-	/* Array index: 0x1047 */ 0x6F62,0x485E,
-	/* Array index: 0x1047 */ 0x6F68,0x485F,
-	/* Array index: 0x1047 */ 0x6F6C,0x4860,
-	/* Array index: 0x1047 */ 0x6F7D,0x4861,
-	/* Array index: 0x1047 */ 0x6F7E,0x4862,
-	/* Array index: 0x1047 */ 0x6F83,0x4863,
-	/* Array index: 0x1047 */ 0x6F9A,0x486E,
-	/* Array index: 0x1047 */ 0x6F9F,0x486F,
-	/* Array index: 0x1047 */ 0x6FA0,0x4870,
-	/* Array index: 0x1047 */ 0x6FB5,0x4878,
-	/* Array index: 0x1047 */ 0x6FB6,0x4879,
-	/* Array index: 0x1047 */ 0x6FBC,0x487A,
-	/* Array index: 0x1047 */ 0x6FC5,0x487B,
-	/* Array index: 0x1047 */ 0x6FC7,0x487C,
-	/* Array index: 0x1047 */ 0x6FC8,0x487D,
-	/* Array index: 0x1047 */ 0x6FCA,0x487E,
-	/* Array index: 0x1047 */ 0x6FDA,0x4921,
-	/* Array index: 0x1047 */ 0x6FDE,0x4922,
-	/* Array index: 0x1047 */ 0x6FE8,0x4923,
-	/* Array index: 0x1047 */ 0x6FE9,0x4924,
-	/* Array index: 0x1047 */ 0x6FF0,0x4925,
-	/* Array index: 0x1047 */ 0x6FF5,0x4926,
-	/* Array index: 0x1047 */ 0x6FF9,0x4927,
-	/* Array index: 0x1047 */ 0x6FFC,0x4928,
-	/* Array index: 0x1047 */ 0x6FFD,0x4929,
-	/* Array index: 0x1047 */ 0x7000,0x492A,
-	/* Array index: 0x1047 */ 0x700D,0x492E,
-	/* Array index: 0x1047 */ 0x7017,0x492F,
-	/* Array index: 0x1047 */ 0x7020,0x4930,
-	/* Array index: 0x1047 */ 0x7023,0x4931,
-	/* Array index: 0x1047 */ 0x702F,0x4932,
-	/* Array index: 0x1047 */ 0x7034,0x4933,
-	/* Array index: 0x1047 */ 0x7037,0x4934,
-	/* Array index: 0x1047 */ 0x7039,0x4935,
-	/* Array index: 0x1047 */ 0x703C,0x4936,
-	/* Array index: 0x1047 */ 0x7043,0x4937,
-	/* Array index: 0x1047 */ 0x7044,0x4938,
-	/* Array index: 0x1047 */ 0x704E,0x4941,
-	/* Array index: 0x1047 */ 0x7054,0x493D,
-	/* Array index: 0x1047 */ 0x7055,0x493E,
-	/* Array index: 0x1047 */ 0x705D,0x493F,
-	/* Array index: 0x1047 */ 0x705E,0x4940,
-	/* Array index: 0x1047 */ 0x7064,0x4942,
-	/* Array index: 0x1047 */ 0x7065,0x4943,
-	/* Array index: 0x1047 */ 0x706C,0x4944,
-	/* Array index: 0x1047 */ 0x706E,0x4945,
-	/* Array index: 0x1047 */ 0x7075,0x4946,
-	/* Array index: 0x1047 */ 0x7076,0x4947,
-	/* Array index: 0x1047 */ 0x707E,0x4948,
-	/* Array index: 0x1047 */ 0x7081,0x4949,
-	/* Array index: 0x1047 */ 0x7085,0x494A,
-	/* Array index: 0x1047 */ 0x7086,0x494B,
-	/* Array index: 0x1047 */ 0x709B,0x4951,
-	/* Array index: 0x1047 */ 0x70A4,0x4952,
-	/* Array index: 0x1047 */ 0x70AB,0x4953,
-	/* Array index: 0x1047 */ 0x70B0,0x4954,
-	/* Array index: 0x1047 */ 0x70B1,0x4955,
-	/* Array index: 0x1047 */ 0x70B4,0x4956,
-	/* Array index: 0x1047 */ 0x70B7,0x4957,
-	/* Array index: 0x1047 */ 0x70CA,0x4958,
-	/* Array index: 0x1047 */ 0x70DC,0x495F,
-	/* Array index: 0x1047 */ 0x70E4,0x4960,
-	/* Array index: 0x1047 */ 0x70FA,0x4961,
-	/* Array index: 0x1047 */ 0x710B,0x4967,
-	/* Array index: 0x1047 */ 0x710C,0x4968,
-	/* Array index: 0x1047 */ 0x710F,0x4969,
-	/* Array index: 0x1047 */ 0x711E,0x496A,
-	/* Array index: 0x1047 */ 0x7120,0x496B,
-	/* Array index: 0x1047 */ 0x712B,0x496C,
-	/* Array index: 0x1047 */ 0x7138,0x4971,
-	/* Array index: 0x1047 */ 0x7141,0x4972,
-	/* Array index: 0x1047 */ 0x7150,0x4978,
-	/* Array index: 0x1047 */ 0x7152,0x4979,
-	/* Array index: 0x1047 */ 0x7157,0x497A,
-	/* Array index: 0x1047 */ 0x715A,0x497B,
-	/* Array index: 0x1047 */ 0x715C,0x497C,
-	/* Array index: 0x1047 */ 0x715E,0x497D,
-	/* Array index: 0x1047 */ 0x7160,0x497E,
-	/* Array index: 0x1047 */ 0x7168,0x4A21,
-	/* Array index: 0x1047 */ 0x7179,0x4A22,
-	/* Array index: 0x1047 */ 0x7180,0x4A23,
-	/* Array index: 0x1047 */ 0x7185,0x4A24,
-	/* Array index: 0x1047 */ 0x7187,0x4A25,
-	/* Array index: 0x1047 */ 0x718C,0x4A26,
-	/* Array index: 0x1047 */ 0x7192,0x4A27,
-	/* Array index: 0x1047 */ 0x719A,0x4A28,
-	/* Array index: 0x1047 */ 0x719B,0x4A29,
-	/* Array index: 0x1047 */ 0x71A0,0x4A2A,
-	/* Array index: 0x1047 */ 0x71A2,0x4A2B,
-	/* Array index: 0x1047 */ 0x71BA,0x4A30,
-	/* Array index: 0x1047 */ 0x71C4,0x4A34,
-	/* Array index: 0x1047 */ 0x71CB,0x4A35,
-	/* Array index: 0x1047 */ 0x71CC,0x4A36,
-	/* Array index: 0x1047 */ 0x71D3,0x4A37,
-	/* Array index: 0x1047 */ 0x71D6,0x4A38,
-	/* Array index: 0x1047 */ 0x71D9,0x4A39,
-	/* Array index: 0x1047 */ 0x71DA,0x4A3A,
-	/* Array index: 0x1047 */ 0x71DC,0x4A3B,
-	/* Array index: 0x1047 */ 0x71F8,0x4A3C,
-	/* Array index: 0x1047 */ 0x71FE,0x4A3D,
-	/* Array index: 0x1047 */ 0x7200,0x4A3E,
-	/* Array index: 0x1047 */ 0x7213,0x4A42,
-	/* Array index: 0x1047 */ 0x7217,0x4A43,
-	/* Array index: 0x1047 */ 0x721A,0x4A44,
-	/* Array index: 0x1047 */ 0x721D,0x4A45,
-	/* Array index: 0x1047 */ 0x721F,0x4A46,
-	/* Array index: 0x1047 */ 0x7224,0x4A47,
-	/* Array index: 0x1047 */ 0x722B,0x4A48,
-	/* Array index: 0x1047 */ 0x722F,0x4A49,
-	/* Array index: 0x1047 */ 0x7234,0x4A4A,
-	/* Array index: 0x1047 */ 0x7238,0x4A4B,
-	/* Array index: 0x1047 */ 0x7239,0x4A4C,
-	/* Array index: 0x1047 */ 0x7253,0x4A54,
-	/* Array index: 0x1047 */ 0x7255,0x4A55,
-	/* Array index: 0x1047 */ 0x7256,0x4A56,
-	/* Array index: 0x1047 */ 0x725A,0x4A57,
-	/* Array index: 0x1047 */ 0x725C,0x4A58,
-	/* Array index: 0x1047 */ 0x725E,0x4A59,
-	/* Array index: 0x1047 */ 0x7260,0x4A5A,
-	/* Array index: 0x1047 */ 0x7263,0x4A5B,
-	/* Array index: 0x1047 */ 0x7268,0x4A5C,
-	/* Array index: 0x1047 */ 0x726B,0x4A5D,
-	/* Array index: 0x1047 */ 0x726E,0x4A5E,
-	/* Array index: 0x1047 */ 0x726F,0x4A5F,
-	/* Array index: 0x1047 */ 0x7271,0x4A60,
-	/* Array index: 0x1047 */ 0x7277,0x4A61,
-	/* Array index: 0x1047 */ 0x7278,0x4A62,
-	/* Array index: 0x1047 */ 0x727B,0x4A63,
-	/* Array index: 0x1047 */ 0x727C,0x4A64,
-	/* Array index: 0x1047 */ 0x727F,0x4A65,
-	/* Array index: 0x1047 */ 0x7284,0x4A66,
-	/* Array index: 0x1047 */ 0x7289,0x4A67,
-	/* Array index: 0x1047 */ 0x728D,0x4A68,
-	/* Array index: 0x1047 */ 0x728E,0x4A69,
-	/* Array index: 0x1047 */ 0x7293,0x4A6A,
-	/* Array index: 0x1047 */ 0x729B,0x4A6B,
-	/* Array index: 0x1047 */ 0x72A8,0x4A6C,
-	/* Array index: 0x1047 */ 0x72AD,0x4A6D,
-	/* Array index: 0x1047 */ 0x72AE,0x4A6E,
-	/* Array index: 0x1047 */ 0x72B1,0x4A6F,
-	/* Array index: 0x1047 */ 0x72B4,0x4A70,
-	/* Array index: 0x1047 */ 0x72BE,0x4A71,
-	/* Array index: 0x1047 */ 0x72C1,0x4A72,
-	/* Array index: 0x1047 */ 0x72C7,0x4A73,
-	/* Array index: 0x1047 */ 0x72C9,0x4A74,
-	/* Array index: 0x1047 */ 0x72CC,0x4A75,
-	/* Array index: 0x1047 */ 0x72D5,0x4A76,
-	/* Array index: 0x1047 */ 0x72D6,0x4A77,
-	/* Array index: 0x1047 */ 0x72D8,0x4A78,
-	/* Array index: 0x1047 */ 0x72DF,0x4A79,
-	/* Array index: 0x1047 */ 0x72E5,0x4A7A,
-	/* Array index: 0x1047 */ 0x72F3,0x4A7B,
-	/* Array index: 0x1047 */ 0x72F4,0x4A7C,
-	/* Array index: 0x1047 */ 0x72FA,0x4A7D,
-	/* Array index: 0x1047 */ 0x72FB,0x4A7E,
-	/* Array index: 0x1047 */ 0x72FE,0x4B21,
-	/* Array index: 0x1047 */ 0x7302,0x4B22,
-	/* Array index: 0x1047 */ 0x7304,0x4B23,
-	/* Array index: 0x1047 */ 0x7305,0x4B24,
-	/* Array index: 0x1047 */ 0x7307,0x4B25,
-	/* Array index: 0x1047 */ 0x730B,0x4B26,
-	/* Array index: 0x1047 */ 0x730D,0x4B27,
-	/* Array index: 0x1047 */ 0x7312,0x4B28,
-	/* Array index: 0x1047 */ 0x7313,0x4B29,
-	/* Array index: 0x1047 */ 0x7318,0x4B2A,
-	/* Array index: 0x1047 */ 0x7319,0x4B2B,
-	/* Array index: 0x1047 */ 0x731E,0x4B2C,
-	/* Array index: 0x1047 */ 0x7322,0x4B2D,
-	/* Array index: 0x1047 */ 0x7324,0x4B2E,
-	/* Array index: 0x1047 */ 0x7327,0x4B2F,
-	/* Array index: 0x1047 */ 0x7328,0x4B30,
-	/* Array index: 0x1047 */ 0x732C,0x4B31,
-	/* Array index: 0x1047 */ 0x7331,0x4B32,
-	/* Array index: 0x1047 */ 0x7332,0x4B33,
-	/* Array index: 0x1047 */ 0x7335,0x4B34,
-	/* Array index: 0x1047 */ 0x733A,0x4B35,
-	/* Array index: 0x1047 */ 0x733B,0x4B36,
-	/* Array index: 0x1047 */ 0x733D,0x4B37,
-	/* Array index: 0x1047 */ 0x7343,0x4B38,
-	/* Array index: 0x1047 */ 0x734D,0x4B39,
-	/* Array index: 0x1047 */ 0x7350,0x4B3A,
-	/* Array index: 0x1047 */ 0x7352,0x4B3B,
-	/* Array index: 0x1047 */ 0x7356,0x4B3C,
-	/* Array index: 0x1047 */ 0x7358,0x4B3D,
-	/* Array index: 0x1047 */ 0x7366,0x4B42,
-	/* Array index: 0x1047 */ 0x7367,0x4B43,
-	/* Array index: 0x1047 */ 0x7369,0x4B44,
-	/* Array index: 0x1047 */ 0x7377,0x4B4A,
-	/* Array index: 0x1047 */ 0x7379,0x4B4B,
-	/* Array index: 0x1047 */ 0x737C,0x4B4C,
-	/* Array index: 0x1047 */ 0x7380,0x4B4D,
-	/* Array index: 0x1047 */ 0x7381,0x4B4E,
-	/* Array index: 0x1047 */ 0x7383,0x4B4F,
-	/* Array index: 0x1047 */ 0x7385,0x4B50,
-	/* Array index: 0x1047 */ 0x7386,0x4B51,
-	/* Array index: 0x1047 */ 0x738E,0x4B52,
-	/* Array index: 0x1047 */ 0x7390,0x4B53,
-	/* Array index: 0x1047 */ 0x7393,0x4B54,
-	/* Array index: 0x1047 */ 0x7395,0x4B55,
-	/* Array index: 0x1047 */ 0x7397,0x4B56,
-	/* Array index: 0x1047 */ 0x7398,0x4B57,
-	/* Array index: 0x1047 */ 0x73AA,0x4B5F,
-	/* Array index: 0x1047 */ 0x73AB,0x4B60,
-	/* Array index: 0x1047 */ 0x73AD,0x4B61,
-	/* Array index: 0x1047 */ 0x73B5,0x4B62,
-	/* Array index: 0x1047 */ 0x73B7,0x4B63,
-	/* Array index: 0x1047 */ 0x73B9,0x4B64,
-	/* Array index: 0x1047 */ 0x73BC,0x4B65,
-	/* Array index: 0x1047 */ 0x73BD,0x4B66,
-	/* Array index: 0x1047 */ 0x73BF,0x4B67,
-	/* Array index: 0x1047 */ 0x73C5,0x4B68,
-	/* Array index: 0x1047 */ 0x73C6,0x4B69,
-	/* Array index: 0x1047 */ 0x73C9,0x4B6A,
-	/* Array index: 0x1047 */ 0x73CB,0x4B6B,
-	/* Array index: 0x1047 */ 0x73CC,0x4B6C,
-	/* Array index: 0x1047 */ 0x73CF,0x4B6D,
-	/* Array index: 0x1047 */ 0x73D2,0x4B6E,
-	/* Array index: 0x1047 */ 0x73D3,0x4B6F,
-	/* Array index: 0x1047 */ 0x73D6,0x4B70,
-	/* Array index: 0x1047 */ 0x73D9,0x4B71,
-	/* Array index: 0x1047 */ 0x73DD,0x4B72,
-	/* Array index: 0x1047 */ 0x73E1,0x4B73,
-	/* Array index: 0x1047 */ 0x73E3,0x4B74,
-	/* Array index: 0x1047 */ 0x73E6,0x4B75,
-	/* Array index: 0x1047 */ 0x73E7,0x4B76,
-	/* Array index: 0x1047 */ 0x73E9,0x4B77,
-	/* Array index: 0x1047 */ 0x73F4,0x4B78,
-	/* Array index: 0x1047 */ 0x73F5,0x4B79,
-	/* Array index: 0x1047 */ 0x7404,0x4C24,
-	/* Array index: 0x1047 */ 0x7407,0x4C25,
-	/* Array index: 0x1047 */ 0x740A,0x4C26,
-	/* Array index: 0x1047 */ 0x7411,0x4C27,
-	/* Array index: 0x1047 */ 0x741A,0x4C28,
-	/* Array index: 0x1047 */ 0x741B,0x4C29,
-	/* Array index: 0x1047 */ 0x7424,0x4C2A,
-	/* Array index: 0x1047 */ 0x7439,0x4C36,
-	/* Array index: 0x1047 */ 0x7440,0x4C37,
-	/* Array index: 0x1047 */ 0x744B,0x4C3C,
-	/* Array index: 0x1047 */ 0x744D,0x4C3D,
-	/* Array index: 0x1047 */ 0x7451,0x4C3E,
-	/* Array index: 0x1047 */ 0x7452,0x4C3F,
-	/* Array index: 0x1047 */ 0x7457,0x4C40,
-	/* Array index: 0x1047 */ 0x745D,0x4C41,
-	/* Array index: 0x1047 */ 0x7462,0x4C42,
-	/* Array index: 0x1047 */ 0x746B,0x4C46,
-	/* Array index: 0x1047 */ 0x746D,0x4C47,
-	/* Array index: 0x1047 */ 0x746E,0x4C48,
-	/* Array index: 0x1047 */ 0x7471,0x4C49,
-	/* Array index: 0x1047 */ 0x7472,0x4C4A,
-	/* Array index: 0x1047 */ 0x7480,0x4C4B,
-	/* Array index: 0x1047 */ 0x7481,0x4C4C,
-	/* Array index: 0x1047 */ 0x74B5,0x4C66,
-	/* Array index: 0x1047 */ 0x74B9,0x4C67,
-	/* Array index: 0x1047 */ 0x74BB,0x4C68,
-	/* Array index: 0x1047 */ 0x74BF,0x4C69,
-	/* Array index: 0x1047 */ 0x74C8,0x4C6A,
-	/* Array index: 0x1047 */ 0x74C9,0x4C6B,
-	/* Array index: 0x1047 */ 0x74CC,0x4C6C,
-	/* Array index: 0x1047 */ 0x74D0,0x4C6D,
-	/* Array index: 0x1047 */ 0x74D3,0x4C6E,
-	/* Array index: 0x1047 */ 0x74D8,0x4C6F,
-	/* Array index: 0x1047 */ 0x74DA,0x4C70,
-	/* Array index: 0x1047 */ 0x74DB,0x4C71,
-	/* Array index: 0x1047 */ 0x74DE,0x4C72,
-	/* Array index: 0x1047 */ 0x74DF,0x4C73,
-	/* Array index: 0x1047 */ 0x74E4,0x4C74,
-	/* Array index: 0x1047 */ 0x74E8,0x4C75,
-	/* Array index: 0x1047 */ 0x74EA,0x4C76,
-	/* Array index: 0x1047 */ 0x74EB,0x4C77,
-	/* Array index: 0x1047 */ 0x74EF,0x4C78,
-	/* Array index: 0x1047 */ 0x74F4,0x4C79,
-	/* Array index: 0x1047 */ 0x74FF,0x4C7D,
-	/* Array index: 0x1047 */ 0x7506,0x4C7E,
-	/* Array index: 0x1047 */ 0x7512,0x4D21,
-	/* Array index: 0x1047 */ 0x7516,0x4D22,
-	/* Array index: 0x1047 */ 0x7517,0x4D23,
-	/* Array index: 0x1047 */ 0x7520,0x4D24,
-	/* Array index: 0x1047 */ 0x7521,0x4D25,
-	/* Array index: 0x1047 */ 0x7524,0x4D26,
-	/* Array index: 0x1047 */ 0x7527,0x4D27,
-	/* Array index: 0x1047 */ 0x7529,0x4D28,
-	/* Array index: 0x1047 */ 0x752A,0x4D29,
-	/* Array index: 0x1047 */ 0x752F,0x4D2A,
-	/* Array index: 0x1047 */ 0x7536,0x4D2B,
-	/* Array index: 0x1047 */ 0x7539,0x4D2C,
-	/* Array index: 0x1047 */ 0x7543,0x4D31,
-	/* Array index: 0x1047 */ 0x7547,0x4D32,
-	/* Array index: 0x1047 */ 0x7548,0x4D33,
-	/* Array index: 0x1047 */ 0x754E,0x4D34,
-	/* Array index: 0x1047 */ 0x7550,0x4D35,
-	/* Array index: 0x1047 */ 0x7552,0x4D36,
-	/* Array index: 0x1047 */ 0x7557,0x4D37,
-	/* Array index: 0x1047 */ 0x755E,0x4D38,
-	/* Array index: 0x1047 */ 0x755F,0x4D39,
-	/* Array index: 0x1047 */ 0x7561,0x4D3A,
-	/* Array index: 0x1047 */ 0x756F,0x4D3B,
-	/* Array index: 0x1047 */ 0x7571,0x4D3C,
-	/* Array index: 0x1047 */ 0x7581,0x4D43,
-	/* Array index: 0x1047 */ 0x7585,0x4D44,
-	/* Array index: 0x1047 */ 0x7590,0x4D45,
-	/* Array index: 0x1047 */ 0x7592,0x4D46,
-	/* Array index: 0x1047 */ 0x7593,0x4D47,
-	/* Array index: 0x1047 */ 0x7595,0x4D48,
-	/* Array index: 0x1047 */ 0x7599,0x4D49,
-	/* Array index: 0x1047 */ 0x759C,0x4D4A,
-	/* Array index: 0x1047 */ 0x75A2,0x4D4B,
-	/* Array index: 0x1047 */ 0x75A4,0x4D4C,
-	/* Array index: 0x1047 */ 0x75B4,0x4D4D,
-	/* Array index: 0x1047 */ 0x75BA,0x4D4E,
-	/* Array index: 0x1047 */ 0x75C4,0x4D52,
-	/* Array index: 0x1047 */ 0x75C6,0x4D53,
-	/* Array index: 0x1047 */ 0x75CC,0x4D54,
-	/* Array index: 0x1047 */ 0x75CE,0x4D55,
-	/* Array index: 0x1047 */ 0x75CF,0x4D56,
-	/* Array index: 0x1047 */ 0x75D7,0x4D57,
-	/* Array index: 0x1047 */ 0x75DC,0x4D58,
-	/* Array index: 0x1047 */ 0x75E4,0x4D5C,
-	/* Array index: 0x1047 */ 0x75E7,0x4D5D,
-	/* Array index: 0x1047 */ 0x75EC,0x4D5E,
-	/* Array index: 0x1047 */ 0x75EE,0x4D5F,
-	/* Array index: 0x1047 */ 0x75EF,0x4D60,
-	/* Array index: 0x1047 */ 0x75F1,0x4D61,
-	/* Array index: 0x1047 */ 0x75F9,0x4D62,
-	/* Array index: 0x1047 */ 0x760F,0x4D6B,
-	/* Array index: 0x1047 */ 0x7623,0x4D75,
-	/* Array index: 0x1047 */ 0x7625,0x4D76,
-	/* Array index: 0x1047 */ 0x7626,0x4D77,
-	/* Array index: 0x1047 */ 0x7629,0x4D78,
-	/* Array index: 0x1047 */ 0x762D,0x4D79,
-	/* Array index: 0x1047 */ 0x7632,0x4D7A,
-	/* Array index: 0x1047 */ 0x7633,0x4D7B,
-	/* Array index: 0x1047 */ 0x7635,0x4D7C,
-	/* Array index: 0x1047 */ 0x7655,0x4E2B,
-	/* Array index: 0x1047 */ 0x7659,0x4E2C,
-	/* Array index: 0x1047 */ 0x765F,0x4E2D,
-	/* Array index: 0x1047 */ 0x7664,0x4E2E,
-	/* Array index: 0x1047 */ 0x7665,0x4E2F,
-	/* Array index: 0x1047 */ 0x7674,0x4E34,
-	/* Array index: 0x1047 */ 0x7681,0x4E35,
-	/* Array index: 0x1047 */ 0x7685,0x4E36,
-	/* Array index: 0x1047 */ 0x768C,0x4E37,
-	/* Array index: 0x1047 */ 0x768D,0x4E38,
-	/* Array index: 0x1047 */ 0x7695,0x4E39,
-	/* Array index: 0x1047 */ 0x76AD,0x4E47,
-	/* Array index: 0x1047 */ 0x76BD,0x4E48,
-	/* Array index: 0x1047 */ 0x76C1,0x4E49,
-	/* Array index: 0x1047 */ 0x76C5,0x4E4A,
-	/* Array index: 0x1047 */ 0x76C9,0x4E4B,
-	/* Array index: 0x1047 */ 0x76CB,0x4E4C,
-	/* Array index: 0x1047 */ 0x76CC,0x4E4D,
-	/* Array index: 0x1047 */ 0x76CE,0x4E4E,
-	/* Array index: 0x1047 */ 0x76D4,0x4E4F,
-	/* Array index: 0x1047 */ 0x76D9,0x4E50,
-	/* Array index: 0x1047 */ 0x76E0,0x4E51,
-	/* Array index: 0x1047 */ 0x76E6,0x4E52,
-	/* Array index: 0x1047 */ 0x76E8,0x4E53,
-	/* Array index: 0x1047 */ 0x76EC,0x4E54,
-	/* Array index: 0x1047 */ 0x76F0,0x4E55,
-	/* Array index: 0x1047 */ 0x76F1,0x4E56,
-	/* Array index: 0x1047 */ 0x76F6,0x4E57,
-	/* Array index: 0x1047 */ 0x76F9,0x4E58,
-	/* Array index: 0x1047 */ 0x76FC,0x4E59,
-	/* Array index: 0x1047 */ 0x7700,0x4E5A,
-	/* Array index: 0x1047 */ 0x7706,0x4E5B,
-	/* Array index: 0x1047 */ 0x770A,0x4E5C,
-	/* Array index: 0x1047 */ 0x770E,0x4E5D,
-	/* Array index: 0x1047 */ 0x7712,0x4E5E,
-	/* Array index: 0x1047 */ 0x7714,0x4E5F,
-	/* Array index: 0x1047 */ 0x7715,0x4E60,
-	/* Array index: 0x1047 */ 0x7717,0x4E61,
-	/* Array index: 0x1047 */ 0x7719,0x4E62,
-	/* Array index: 0x1047 */ 0x771A,0x4E63,
-	/* Array index: 0x1047 */ 0x771C,0x4E64,
-	/* Array index: 0x1047 */ 0x7722,0x4E65,
-	/* Array index: 0x1047 */ 0x7728,0x4E66,
-	/* Array index: 0x1047 */ 0x7739,0x4E6D,
-	/* Array index: 0x1047 */ 0x773D,0x4E6E,
-	/* Array index: 0x1047 */ 0x773E,0x4E6F,
-	/* Array index: 0x1047 */ 0x7742,0x4E70,
-	/* Array index: 0x1047 */ 0x7745,0x4E71,
-	/* Array index: 0x1047 */ 0x7746,0x4E72,
-	/* Array index: 0x1047 */ 0x774A,0x4E73,
-	/* Array index: 0x1047 */ 0x7752,0x4E77,
-	/* Array index: 0x1047 */ 0x7756,0x4E78,
-	/* Array index: 0x1047 */ 0x7757,0x4E79,
-	/* Array index: 0x1047 */ 0x7767,0x4F22,
-	/* Array index: 0x1047 */ 0x776A,0x4F23,
-	/* Array index: 0x1047 */ 0x776C,0x4F24,
-	/* Array index: 0x1047 */ 0x777A,0x4F29,
-	/* Array index: 0x1047 */ 0x777D,0x4F2A,
-	/* Array index: 0x1047 */ 0x7780,0x4F2B,
-	/* Array index: 0x1047 */ 0x7784,0x4F2C,
-	/* Array index: 0x1047 */ 0x778C,0x4F2D,
-	/* Array index: 0x1047 */ 0x778D,0x4F2E,
-	/* Array index: 0x1047 */ 0x779A,0x4F32,
-	/* Array index: 0x1047 */ 0x779F,0x4F33,
-	/* Array index: 0x1047 */ 0x77A2,0x4F34,
-	/* Array index: 0x1047 */ 0x77A7,0x4F35,
-	/* Array index: 0x1047 */ 0x77AA,0x4F36,
-	/* Array index: 0x1047 */ 0x77AE,0x4F37,
-	/* Array index: 0x1047 */ 0x77AF,0x4F38,
-	/* Array index: 0x1047 */ 0x77B1,0x4F39,
-	/* Array index: 0x1047 */ 0x77B5,0x4F3A,
-	/* Array index: 0x1047 */ 0x77BE,0x4F3B,
-	/* Array index: 0x1047 */ 0x77C3,0x4F3C,
-	/* Array index: 0x1047 */ 0x77C9,0x4F3D,
-	/* Array index: 0x1047 */ 0x77D1,0x4F3E,
-	/* Array index: 0x1047 */ 0x77D2,0x4F3F,
-	/* Array index: 0x1047 */ 0x77D5,0x4F40,
-	/* Array index: 0x1047 */ 0x77D9,0x4F41,
-	/* Array index: 0x1047 */ 0x77E4,0x4F45,
-	/* Array index: 0x1047 */ 0x77E6,0x4F46,
-	/* Array index: 0x1047 */ 0x77EA,0x4F47,
-	/* Array index: 0x1047 */ 0x77EC,0x4F48,
-	/* Array index: 0x1047 */ 0x77F0,0x4F49,
-	/* Array index: 0x1047 */ 0x77F1,0x4F4A,
-	/* Array index: 0x1047 */ 0x77F4,0x4F4B,
-	/* Array index: 0x1047 */ 0x77F8,0x4F4C,
-	/* Array index: 0x1047 */ 0x77FB,0x4F4D,
-	/* Array index: 0x1047 */ 0x7805,0x4F4E,
-	/* Array index: 0x1047 */ 0x7806,0x4F4F,
-	/* Array index: 0x1047 */ 0x7809,0x4F50,
-	/* Array index: 0x1047 */ 0x780D,0x4F51,
-	/* Array index: 0x1047 */ 0x780E,0x4F52,
-	/* Array index: 0x1047 */ 0x7811,0x4F53,
-	/* Array index: 0x1047 */ 0x781D,0x4F54,
-	/* Array index: 0x1047 */ 0x782D,0x4F58,
-	/* Array index: 0x1047 */ 0x782E,0x4F59,
-	/* Array index: 0x1047 */ 0x7830,0x4F5A,
-	/* Array index: 0x1047 */ 0x7835,0x4F5B,
-	/* Array index: 0x1047 */ 0x7837,0x4F5C,
-	/* Array index: 0x1047 */ 0x7843,0x4F5D,
-	/* Array index: 0x1047 */ 0x7844,0x4F5E,
-	/* Array index: 0x1047 */ 0x7847,0x4F5F,
-	/* Array index: 0x1047 */ 0x7848,0x4F60,
-	/* Array index: 0x1047 */ 0x784C,0x4F61,
-	/* Array index: 0x1047 */ 0x784E,0x4F62,
-	/* Array index: 0x1047 */ 0x7852,0x4F63,
-	/* Array index: 0x1047 */ 0x785C,0x4F64,
-	/* Array index: 0x1047 */ 0x785E,0x4F65,
-	/* Array index: 0x1047 */ 0x7868,0x4F6A,
-	/* Array index: 0x1047 */ 0x786A,0x4F6B,
-	/* Array index: 0x1047 */ 0x786E,0x4F6C,
-	/* Array index: 0x1047 */ 0x787A,0x4F6D,
-	/* Array index: 0x1047 */ 0x787E,0x4F6E,
-	/* Array index: 0x1047 */ 0x788A,0x4F6F,
-	/* Array index: 0x1047 */ 0x788F,0x4F70,
-	/* Array index: 0x1047 */ 0x7894,0x4F71,
-	/* Array index: 0x1047 */ 0x7898,0x4F72,
-	/* Array index: 0x1047 */ 0x78A4,0x4F77,
-	/* Array index: 0x1047 */ 0x78A8,0x4F78,
-	/* Array index: 0x1047 */ 0x78BB,0x5021,
-	/* Array index: 0x1047 */ 0x78BD,0x5022,
-	/* Array index: 0x1047 */ 0x78BF,0x5023,
-	/* Array index: 0x1047 */ 0x78CC,0x5027,
-	/* Array index: 0x1047 */ 0x78CE,0x5028,
-	/* Array index: 0x1047 */ 0x78DB,0x502E,
-	/* Array index: 0x1047 */ 0x78E4,0x502D,
-	/* Array index: 0x1047 */ 0x78E6,0x5032,
-	/* Array index: 0x1047 */ 0x78EA,0x5033,
-	/* Array index: 0x1047 */ 0x78F2,0x5034,
-	/* Array index: 0x1047 */ 0x78F3,0x5035,
-	/* Array index: 0x1047 */ 0x78F6,0x5037,
-	/* Array index: 0x1047 */ 0x78F7,0x5038,
-	/* Array index: 0x1047 */ 0x78FA,0x5039,
-	/* Array index: 0x1047 */ 0x78FB,0x503A,
-	/* Array index: 0x1047 */ 0x78FF,0x503B,
-	/* Array index: 0x1047 */ 0x7900,0x5036,
-	/* Array index: 0x1047 */ 0x7906,0x503C,
-	/* Array index: 0x1047 */ 0x790C,0x503D,
-	/* Array index: 0x1047 */ 0x7910,0x503E,
-	/* Array index: 0x1047 */ 0x791A,0x503F,
-	/* Array index: 0x1047 */ 0x7925,0x5044,
-	/* Array index: 0x1047 */ 0x7927,0x5045,
-	/* Array index: 0x1047 */ 0x7929,0x5046,
-	/* Array index: 0x1047 */ 0x792D,0x5047,
-	/* Array index: 0x1047 */ 0x7931,0x5048,
-	/* Array index: 0x1047 */ 0x7934,0x5049,
-	/* Array index: 0x1047 */ 0x7935,0x504A,
-	/* Array index: 0x1047 */ 0x793B,0x504B,
-	/* Array index: 0x1047 */ 0x793D,0x504C,
-	/* Array index: 0x1047 */ 0x793F,0x504D,
-	/* Array index: 0x1047 */ 0x794A,0x5051,
-	/* Array index: 0x1047 */ 0x794B,0x5052,
-	/* Array index: 0x1047 */ 0x794F,0x5053,
-	/* Array index: 0x1047 */ 0x7951,0x5054,
-	/* Array index: 0x1047 */ 0x7954,0x5055,
-	/* Array index: 0x1047 */ 0x7958,0x5056,
-	/* Array index: 0x1047 */ 0x795B,0x5057,
-	/* Array index: 0x1047 */ 0x795C,0x5058,
-	/* Array index: 0x1047 */ 0x7967,0x5059,
-	/* Array index: 0x1047 */ 0x7969,0x505A,
-	/* Array index: 0x1047 */ 0x796B,0x505B,
-	/* Array index: 0x1047 */ 0x7972,0x505C,
-	/* Array index: 0x1047 */ 0x7979,0x505D,
-	/* Array index: 0x1047 */ 0x797B,0x505E,
-	/* Array index: 0x1047 */ 0x797C,0x505F,
-	/* Array index: 0x1047 */ 0x797E,0x5060,
-	/* Array index: 0x1047 */ 0x798B,0x5061,
-	/* Array index: 0x1047 */ 0x798C,0x5062,
-	/* Array index: 0x1047 */ 0x79A1,0x506B,
-	/* Array index: 0x1047 */ 0x79A8,0x506C,
-	/* Array index: 0x1047 */ 0x79A9,0x506D,
-	/* Array index: 0x1047 */ 0x79AB,0x506E,
-	/* Array index: 0x1047 */ 0x79AF,0x506F,
-	/* Array index: 0x1047 */ 0x79B1,0x5070,
-	/* Array index: 0x1047 */ 0x79B4,0x5071,
-	/* Array index: 0x1047 */ 0x79B8,0x5072,
-	/* Array index: 0x1047 */ 0x79BB,0x5073,
-	/* Array index: 0x1047 */ 0x79C2,0x5074,
-	/* Array index: 0x1047 */ 0x79C4,0x5075,
-	/* Array index: 0x1047 */ 0x79C7,0x5076,
-	/* Array index: 0x1047 */ 0x79C8,0x5077,
-	/* Array index: 0x1047 */ 0x79CA,0x5078,
-	/* Array index: 0x1047 */ 0x79CF,0x5079,
-	/* Array index: 0x1047 */ 0x79D4,0x507A,
-	/* Array index: 0x1047 */ 0x79D6,0x507B,
-	/* Array index: 0x1047 */ 0x79DA,0x507C,
-	/* Array index: 0x1047 */ 0x79DD,0x507D,
-	/* Array index: 0x1047 */ 0x79DE,0x507E,
-	/* Array index: 0x1047 */ 0x79E0,0x5121,
-	/* Array index: 0x1047 */ 0x79E2,0x5122,
-	/* Array index: 0x1047 */ 0x79E5,0x5123,
-	/* Array index: 0x1047 */ 0x79EA,0x5124,
-	/* Array index: 0x1047 */ 0x79EB,0x5125,
-	/* Array index: 0x1047 */ 0x79ED,0x5126,
-	/* Array index: 0x1047 */ 0x79F1,0x5127,
-	/* Array index: 0x1047 */ 0x79F8,0x5128,
-	/* Array index: 0x1047 */ 0x79FC,0x5129,
-	/* Array index: 0x1047 */ 0x7A02,0x512A,
-	/* Array index: 0x1047 */ 0x7A03,0x512B,
-	/* Array index: 0x1047 */ 0x7A07,0x512C,
-	/* Array index: 0x1047 */ 0x7A09,0x512D,
-	/* Array index: 0x1047 */ 0x7A0A,0x512E,
-	/* Array index: 0x1047 */ 0x7A0C,0x512F,
-	/* Array index: 0x1047 */ 0x7A11,0x5130,
-	/* Array index: 0x1047 */ 0x7A15,0x5131,
-	/* Array index: 0x1047 */ 0x7A1B,0x5132,
-	/* Array index: 0x1047 */ 0x7A1E,0x5133,
-	/* Array index: 0x1047 */ 0x7A21,0x5134,
-	/* Array index: 0x1047 */ 0x7A27,0x5135,
-	/* Array index: 0x1047 */ 0x7A2B,0x5136,
-	/* Array index: 0x1047 */ 0x7A2D,0x5137,
-	/* Array index: 0x1047 */ 0x7A2F,0x5138,
-	/* Array index: 0x1047 */ 0x7A30,0x5139,
-	/* Array index: 0x1047 */ 0x7A4C,0x5143,
-	/* Array index: 0x1047 */ 0x7A55,0x5144,
-	/* Array index: 0x1047 */ 0x7A56,0x5145,
-	/* Array index: 0x1047 */ 0x7A59,0x5146,
-	/* Array index: 0x1047 */ 0x7A65,0x514B,
-	/* Array index: 0x1047 */ 0x7A67,0x514C,
-	/* Array index: 0x1047 */ 0x7A6A,0x514D,
-	/* Array index: 0x1047 */ 0x7A6D,0x514E,
-	/* Array index: 0x1047 */ 0x7A75,0x514F,
-	/* Array index: 0x1047 */ 0x7A78,0x5150,
-	/* Array index: 0x1047 */ 0x7A7E,0x5151,
-	/* Array index: 0x1047 */ 0x7A80,0x5152,
-	/* Array index: 0x1047 */ 0x7A82,0x5153,
-	/* Array index: 0x1047 */ 0x7A85,0x5154,
-	/* Array index: 0x1047 */ 0x7A86,0x5155,
-	/* Array index: 0x1047 */ 0x7A8A,0x5156,
-	/* Array index: 0x1047 */ 0x7A8B,0x5157,
-	/* Array index: 0x1047 */ 0x7A90,0x5158,
-	/* Array index: 0x1047 */ 0x7A91,0x5159,
-	/* Array index: 0x1047 */ 0x7A94,0x515A,
-	/* Array index: 0x1047 */ 0x7A9E,0x515B,
-	/* Array index: 0x1047 */ 0x7AA0,0x515C,
-	/* Array index: 0x1047 */ 0x7AA3,0x515D,
-	/* Array index: 0x1047 */ 0x7AAC,0x515E,
-	/* Array index: 0x1047 */ 0x7AB3,0x515F,
-	/* Array index: 0x1047 */ 0x7AB5,0x5160,
-	/* Array index: 0x1047 */ 0x7AB9,0x5161,
-	/* Array index: 0x1047 */ 0x7ABB,0x5162,
-	/* Array index: 0x1047 */ 0x7ABC,0x5163,
-	/* Array index: 0x1047 */ 0x7AC6,0x5164,
-	/* Array index: 0x1047 */ 0x7AC9,0x5165,
-	/* Array index: 0x1047 */ 0x7ACC,0x5166,
-	/* Array index: 0x1047 */ 0x7ACE,0x5167,
-	/* Array index: 0x1047 */ 0x7AD1,0x5168,
-	/* Array index: 0x1047 */ 0x7ADB,0x5169,
-	/* Array index: 0x1047 */ 0x7AF1,0x516E,
-	/* Array index: 0x1047 */ 0x7AF4,0x516F,
-	/* Array index: 0x1047 */ 0x7AFB,0x5170,
-	/* Array index: 0x1047 */ 0x7AFD,0x5171,
-	/* Array index: 0x1047 */ 0x7AFE,0x5172,
-	/* Array index: 0x1047 */ 0x7B07,0x5173,
-	/* Array index: 0x1047 */ 0x7B14,0x5174,
-	/* Array index: 0x1047 */ 0x7B1F,0x5175,
-	/* Array index: 0x1047 */ 0x7B23,0x5176,
-	/* Array index: 0x1047 */ 0x7B34,0x5222,
-	/* Array index: 0x1047 */ 0x7B47,0x5227,
-	/* Array index: 0x1047 */ 0x7B4E,0x5228,
-	/* Array index: 0x1047 */ 0x7B55,0x5229,
-	/* Array index: 0x1047 */ 0x7B60,0x522A,
-	/* Array index: 0x1047 */ 0x7B64,0x522B,
-	/* Array index: 0x1047 */ 0x7B66,0x522C,
-	/* Array index: 0x1047 */ 0x7B69,0x522D,
-	/* Array index: 0x1047 */ 0x7B6A,0x522E,
-	/* Array index: 0x1047 */ 0x7B6D,0x522F,
-	/* Array index: 0x1047 */ 0x7B6F,0x5230,
-	/* Array index: 0x1047 */ 0x7B72,0x5231,
-	/* Array index: 0x1047 */ 0x7B73,0x5232,
-	/* Array index: 0x1047 */ 0x7B77,0x5233,
-	/* Array index: 0x1047 */ 0x7B84,0x5234,
-	/* Array index: 0x1047 */ 0x7B89,0x5235,
-	/* Array index: 0x1047 */ 0x7B8E,0x5236,
-	/* Array index: 0x1047 */ 0x7B90,0x5237,
-	/* Array index: 0x1047 */ 0x7B91,0x5238,
-	/* Array index: 0x1047 */ 0x7B96,0x5239,
-	/* Array index: 0x1047 */ 0x7B9B,0x523A,
-	/* Array index: 0x1047 */ 0x7B9E,0x523B,
-	/* Array index: 0x1047 */ 0x7BA0,0x523C,
-	/* Array index: 0x1047 */ 0x7BA5,0x523D,
-	/* Array index: 0x1047 */ 0x7BAC,0x523E,
-	/* Array index: 0x1047 */ 0x7BAF,0x523F,
-	/* Array index: 0x1047 */ 0x7BB0,0x5240,
-	/* Array index: 0x1047 */ 0x7BB2,0x5241,
-	/* Array index: 0x1047 */ 0x7BB5,0x5242,
-	/* Array index: 0x1047 */ 0x7BB6,0x5243,
-	/* Array index: 0x1047 */ 0x7BC2,0x5248,
-	/* Array index: 0x1047 */ 0x7BC5,0x5249,
-	/* Array index: 0x1047 */ 0x7BC8,0x524A,
-	/* Array index: 0x1047 */ 0x7BCA,0x524B,
-	/* Array index: 0x1047 */ 0x7BD4,0x524C,
-	/* Array index: 0x1047 */ 0x7BE8,0x5252,
-	/* Array index: 0x1047 */ 0x7BEA,0x5253,
-	/* Array index: 0x1047 */ 0x7BF2,0x5254,
-	/* Array index: 0x1047 */ 0x7C09,0x5261,
-	/* Array index: 0x1047 */ 0x7C19,0x5266,
-	/* Array index: 0x1047 */ 0x7C1B,0x5267,
-	/* Array index: 0x1047 */ 0x7C20,0x5268,
-	/* Array index: 0x1047 */ 0x7C25,0x5269,
-	/* Array index: 0x1047 */ 0x7C26,0x526A,
-	/* Array index: 0x1047 */ 0x7C28,0x526B,
-	/* Array index: 0x1047 */ 0x7C2C,0x526C,
-	/* Array index: 0x1047 */ 0x7C31,0x526D,
-	/* Array index: 0x1047 */ 0x7C33,0x526E,
-	/* Array index: 0x1047 */ 0x7C34,0x526F,
-	/* Array index: 0x1047 */ 0x7C36,0x5270,
-	/* Array index: 0x1047 */ 0x7C39,0x5271,
-	/* Array index: 0x1047 */ 0x7C3A,0x5272,
-	/* Array index: 0x1047 */ 0x7C46,0x5273,
-	/* Array index: 0x1047 */ 0x7C4A,0x5274,
-	/* Array index: 0x1047 */ 0x7C61,0x5321,
-	/* Array index: 0x1047 */ 0x7C63,0x5322,
-	/* Array index: 0x1047 */ 0x7C67,0x5323,
-	/* Array index: 0x1047 */ 0x7C69,0x5324,
-	/* Array index: 0x1047 */ 0x7C6D,0x5325,
-	/* Array index: 0x1047 */ 0x7C6E,0x5326,
-	/* Array index: 0x1047 */ 0x7C70,0x5327,
-	/* Array index: 0x1047 */ 0x7C72,0x5328,
-	/* Array index: 0x1047 */ 0x7C79,0x5329,
-	/* Array index: 0x1047 */ 0x7C7C,0x532A,
-	/* Array index: 0x1047 */ 0x7C7D,0x532B,
-	/* Array index: 0x1047 */ 0x7C86,0x532C,
-	/* Array index: 0x1047 */ 0x7C87,0x532D,
-	/* Array index: 0x1047 */ 0x7C8F,0x532E,
-	/* Array index: 0x1047 */ 0x7C94,0x532F,
-	/* Array index: 0x1047 */ 0x7C9E,0x5330,
-	/* Array index: 0x1047 */ 0x7CA0,0x5331,
-	/* Array index: 0x1047 */ 0x7CA6,0x5332,
-	/* Array index: 0x1047 */ 0x7CB0,0x5333,
-	/* Array index: 0x1047 */ 0x7CBF,0x5339,
-	/* Array index: 0x1047 */ 0x7CC4,0x533A,
-	/* Array index: 0x1047 */ 0x7CCD,0x533E,
-	/* Array index: 0x1047 */ 0x7CCF,0x533F,
-	/* Array index: 0x1047 */ 0x7CDD,0x5346,
-	/* Array index: 0x1047 */ 0x7CE6,0x5347,
-	/* Array index: 0x1047 */ 0x7CE9,0x5348,
-	/* Array index: 0x1047 */ 0x7CEB,0x5349,
-	/* Array index: 0x1047 */ 0x7CF5,0x534A,
-	/* Array index: 0x1047 */ 0x7D03,0x534B,
-	/* Array index: 0x1047 */ 0x7D16,0x5353,
-	/* Array index: 0x1047 */ 0x7D1D,0x5354,
-	/* Array index: 0x1047 */ 0x7D1E,0x5355,
-	/* Array index: 0x1047 */ 0x7D23,0x5356,
-	/* Array index: 0x1047 */ 0x7D26,0x5357,
-	/* Array index: 0x1047 */ 0x7D2A,0x5358,
-	/* Array index: 0x1047 */ 0x7D2D,0x5359,
-	/* Array index: 0x1047 */ 0x7D31,0x535A,
-	/* Array index: 0x1047 */ 0x7D47,0x5360,
-	/* Array index: 0x1047 */ 0x7D48,0x5361,
-	/* Array index: 0x1047 */ 0x7D4D,0x5362,
-	/* Array index: 0x1047 */ 0x7D51,0x5363,
-	/* Array index: 0x1047 */ 0x7D53,0x5364,
-	/* Array index: 0x1047 */ 0x7D57,0x5365,
-	/* Array index: 0x1047 */ 0x7D65,0x536A,
-	/* Array index: 0x1047 */ 0x7D67,0x536B,
-	/* Array index: 0x1047 */ 0x7D6A,0x536C,
-	/* Array index: 0x1047 */ 0x7D70,0x536D,
-	/* Array index: 0x1047 */ 0x7D78,0x536E,
-	/* Array index: 0x1047 */ 0x7D7A,0x536F,
-	/* Array index: 0x1047 */ 0x7D7B,0x5370,
-	/* Array index: 0x1047 */ 0x7D91,0x537B,
-	/* Array index: 0x1047 */ 0x7D96,0x537C,
-	/* Array index: 0x1047 */ 0x7D97,0x537D,
-	/* Array index: 0x1047 */ 0x7D9D,0x537E,
-	/* Array index: 0x1047 */ 0x7D9E,0x5421,
-	/* Array index: 0x1047 */ 0x7DA6,0x5422,
-	/* Array index: 0x1047 */ 0x7DA7,0x5423,
-	/* Array index: 0x1047 */ 0x7DAA,0x5424,
-	/* Array index: 0x1047 */ 0x7DB3,0x5425,
-	/* Array index: 0x1047 */ 0x7DB6,0x5426,
-	/* Array index: 0x1047 */ 0x7DB7,0x5427,
-	/* Array index: 0x1047 */ 0x7DB9,0x5428,
-	/* Array index: 0x1047 */ 0x7DD7,0x5431,
-	/* Array index: 0x1047 */ 0x7DD9,0x5432,
-	/* Array index: 0x1047 */ 0x7DE2,0x5434,
-	/* Array index: 0x1047 */ 0x7DE5,0x5435,
-	/* Array index: 0x1047 */ 0x7DE6,0x5436,
-	/* Array index: 0x1047 */ 0x7DEA,0x5437,
-	/* Array index: 0x1047 */ 0x7DEB,0x5438,
-	/* Array index: 0x1047 */ 0x7DED,0x5439,
-	/* Array index: 0x1047 */ 0x7DF1,0x543A,
-	/* Array index: 0x1047 */ 0x7DF5,0x543B,
-	/* Array index: 0x1047 */ 0x7DF6,0x543C,
-	/* Array index: 0x1047 */ 0x7DF9,0x543D,
-	/* Array index: 0x1047 */ 0x7DFA,0x543E,
-	/* Array index: 0x1047 */ 0x7E00,0x5433,
-	/* Array index: 0x1047 */ 0x7E08,0x543F,
-	/* Array index: 0x1047 */ 0x7E10,0x5440,
-	/* Array index: 0x1047 */ 0x7E11,0x5441,
-	/* Array index: 0x1047 */ 0x7E15,0x5442,
-	/* Array index: 0x1047 */ 0x7E17,0x5443,
-	/* Array index: 0x1047 */ 0x7E1C,0x5444,
-	/* Array index: 0x1047 */ 0x7E1D,0x5445,
-	/* Array index: 0x1047 */ 0x7E20,0x5446,
-	/* Array index: 0x1047 */ 0x7E27,0x5447,
-	/* Array index: 0x1047 */ 0x7E28,0x5448,
-	/* Array index: 0x1047 */ 0x7E2C,0x5449,
-	/* Array index: 0x1047 */ 0x7E2D,0x544A,
-	/* Array index: 0x1047 */ 0x7E2F,0x544B,
-	/* Array index: 0x1047 */ 0x7E33,0x544C,
-	/* Array index: 0x1047 */ 0x7E36,0x544D,
-	/* Array index: 0x1047 */ 0x7E3F,0x544E,
-	/* Array index: 0x1047 */ 0x7E44,0x544F,
-	/* Array index: 0x1047 */ 0x7E45,0x5450,
-	/* Array index: 0x1047 */ 0x7E47,0x5451,
-	/* Array index: 0x1047 */ 0x7E4E,0x5452,
-	/* Array index: 0x1047 */ 0x7E50,0x5453,
-	/* Array index: 0x1047 */ 0x7E52,0x5454,
-	/* Array index: 0x1047 */ 0x7E58,0x5455,
-	/* Array index: 0x1047 */ 0x7E5F,0x5456,
-	/* Array index: 0x1047 */ 0x7E61,0x5457,
-	/* Array index: 0x1047 */ 0x7E62,0x5458,
-	/* Array index: 0x1047 */ 0x7E65,0x5459,
-	/* Array index: 0x1047 */ 0x7E6B,0x545A,
-	/* Array index: 0x1047 */ 0x7E6E,0x545B,
-	/* Array index: 0x1047 */ 0x7E6F,0x545C,
-	/* Array index: 0x1047 */ 0x7E73,0x545D,
-	/* Array index: 0x1047 */ 0x7E78,0x545E,
-	/* Array index: 0x1047 */ 0x7E7E,0x545F,
-	/* Array index: 0x1047 */ 0x7E81,0x5460,
-	/* Array index: 0x1047 */ 0x7E86,0x5461,
-	/* Array index: 0x1047 */ 0x7E87,0x5462,
-	/* Array index: 0x1047 */ 0x7E8A,0x5463,
-	/* Array index: 0x1047 */ 0x7E8D,0x5464,
-	/* Array index: 0x1047 */ 0x7E91,0x5465,
-	/* Array index: 0x1047 */ 0x7E95,0x5466,
-	/* Array index: 0x1047 */ 0x7E98,0x5467,
-	/* Array index: 0x1047 */ 0x7E9A,0x5468,
-	/* Array index: 0x1047 */ 0x7E9D,0x5469,
-	/* Array index: 0x1047 */ 0x7E9E,0x546A,
-	/* Array index: 0x1047 */ 0x7F43,0x5470,
-	/* Array index: 0x1047 */ 0x7F44,0x5471,
-	/* Array index: 0x1047 */ 0x7F47,0x5472,
-	/* Array index: 0x1047 */ 0x7F4F,0x5473,
-	/* Array index: 0x1047 */ 0x7F52,0x5474,
-	/* Array index: 0x1047 */ 0x7F53,0x5475,
-	/* Array index: 0x1047 */ 0x7F6D,0x547E,
-	/* Array index: 0x1047 */ 0x7F71,0x5521,
-	/* Array index: 0x1047 */ 0x7F8B,0x5526,
-	/* Array index: 0x1047 */ 0x7F96,0x552B,
-	/* Array index: 0x1047 */ 0x7F97,0x552C,
-	/* Array index: 0x1047 */ 0x7F9C,0x552D,
-	/* Array index: 0x1047 */ 0x7FA1,0x552E,
-	/* Array index: 0x1047 */ 0x7FA2,0x552F,
-	/* Array index: 0x1047 */ 0x7FA6,0x5530,
-	/* Array index: 0x1047 */ 0x7FAA,0x5531,
-	/* Array index: 0x1047 */ 0x7FAD,0x5532,
-	/* Array index: 0x1047 */ 0x7FB4,0x5533,
-	/* Array index: 0x1047 */ 0x7FBC,0x5534,
-	/* Array index: 0x1047 */ 0x7FBF,0x5535,
-	/* Array index: 0x1047 */ 0x7FC0,0x5536,
-	/* Array index: 0x1047 */ 0x7FC3,0x5537,
-	/* Array index: 0x1047 */ 0x7FC8,0x5538,
-	/* Array index: 0x1047 */ 0x7FCE,0x5539,
-	/* Array index: 0x1047 */ 0x7FCF,0x553A,
-	/* Array index: 0x1047 */ 0x7FDB,0x553B,
-	/* Array index: 0x1047 */ 0x7FDF,0x553C,
-	/* Array index: 0x1047 */ 0x7FE3,0x553D,
-	/* Array index: 0x1047 */ 0x7FE5,0x553E,
-	/* Array index: 0x1047 */ 0x7FE8,0x553F,
-	/* Array index: 0x1047 */ 0x7FEC,0x5540,
-	/* Array index: 0x1047 */ 0x7FEE,0x5541,
-	/* Array index: 0x1047 */ 0x7FEF,0x5542,
-	/* Array index: 0x1047 */ 0x7FF2,0x5543,
-	/* Array index: 0x1047 */ 0x7FFA,0x5544,
-	/* Array index: 0x1047 */ 0x8007,0x5548,
-	/* Array index: 0x1047 */ 0x8008,0x5549,
-	/* Array index: 0x1047 */ 0x800A,0x554A,
-	/* Array index: 0x1047 */ 0x8024,0x5556,
-	/* Array index: 0x1047 */ 0x8026,0x5557,
-	/* Array index: 0x1047 */ 0x802C,0x5558,
-	/* Array index: 0x1047 */ 0x802E,0x5559,
-	/* Array index: 0x1047 */ 0x8030,0x555A,
-	/* Array index: 0x1047 */ 0x8034,0x555B,
-	/* Array index: 0x1047 */ 0x8035,0x555C,
-	/* Array index: 0x1047 */ 0x8037,0x555D,
-	/* Array index: 0x1047 */ 0x8039,0x555E,
-	/* Array index: 0x1047 */ 0x803A,0x555F,
-	/* Array index: 0x1047 */ 0x803C,0x5560,
-	/* Array index: 0x1047 */ 0x803E,0x5561,
-	/* Array index: 0x1047 */ 0x8040,0x5562,
-	/* Array index: 0x1047 */ 0x8044,0x5563,
-	/* Array index: 0x1047 */ 0x8060,0x5564,
-	/* Array index: 0x1047 */ 0x8064,0x5565,
-	/* Array index: 0x1047 */ 0x8066,0x5566,
-	/* Array index: 0x1047 */ 0x806D,0x5567,
-	/* Array index: 0x1047 */ 0x8071,0x5568,
-	/* Array index: 0x1047 */ 0x8075,0x5569,
-	/* Array index: 0x1047 */ 0x8081,0x556A,
-	/* Array index: 0x1047 */ 0x8088,0x556B,
-	/* Array index: 0x1047 */ 0x808E,0x556C,
-	/* Array index: 0x1047 */ 0x809C,0x556D,
-	/* Array index: 0x1047 */ 0x809E,0x556E,
-	/* Array index: 0x1047 */ 0x80A6,0x556F,
-	/* Array index: 0x1047 */ 0x80A7,0x5570,
-	/* Array index: 0x1047 */ 0x80AB,0x5571,
-	/* Array index: 0x1047 */ 0x80B8,0x5572,
-	/* Array index: 0x1047 */ 0x80B9,0x5573,
-	/* Array index: 0x1047 */ 0x80C8,0x5574,
-	/* Array index: 0x1047 */ 0x80CD,0x5575,
-	/* Array index: 0x1047 */ 0x80CF,0x5576,
-	/* Array index: 0x1047 */ 0x80D2,0x5577,
-	/* Array index: 0x1047 */ 0x80E0,0x557C,
-	/* Array index: 0x1047 */ 0x80ED,0x557D,
-	/* Array index: 0x1047 */ 0x80EE,0x557E,
-	/* Array index: 0x1047 */ 0x80F0,0x5621,
-	/* Array index: 0x1047 */ 0x80F2,0x5622,
-	/* Array index: 0x1047 */ 0x80F3,0x5623,
-	/* Array index: 0x1047 */ 0x80F6,0x5624,
-	/* Array index: 0x1047 */ 0x80F9,0x5625,
-	/* Array index: 0x1047 */ 0x80FA,0x5626,
-	/* Array index: 0x1047 */ 0x80FE,0x5627,
-	/* Array index: 0x1047 */ 0x8103,0x5628,
-	/* Array index: 0x1047 */ 0x810B,0x5629,
-	/* Array index: 0x1047 */ 0x811C,0x562D,
-	/* Array index: 0x1047 */ 0x811E,0x562E,
-	/* Array index: 0x1047 */ 0x8120,0x562F,
-	/* Array index: 0x1047 */ 0x8124,0x5630,
-	/* Array index: 0x1047 */ 0x8127,0x5631,
-	/* Array index: 0x1047 */ 0x812C,0x5632,
-	/* Array index: 0x1047 */ 0x8130,0x5633,
-	/* Array index: 0x1047 */ 0x8135,0x5634,
-	/* Array index: 0x1047 */ 0x813A,0x5635,
-	/* Array index: 0x1047 */ 0x813C,0x5636,
-	/* Array index: 0x1047 */ 0x8145,0x5637,
-	/* Array index: 0x1047 */ 0x8147,0x5638,
-	/* Array index: 0x1047 */ 0x814A,0x5639,
-	/* Array index: 0x1047 */ 0x814C,0x563A,
-	/* Array index: 0x1047 */ 0x8152,0x563B,
-	/* Array index: 0x1047 */ 0x8157,0x563C,
-	/* Array index: 0x1047 */ 0x8160,0x563D,
-	/* Array index: 0x1047 */ 0x8161,0x563E,
-	/* Array index: 0x1047 */ 0x816D,0x5642,
-	/* Array index: 0x1047 */ 0x816F,0x5643,
-	/* Array index: 0x1047 */ 0x8177,0x5644,
-	/* Array index: 0x1047 */ 0x8181,0x5645,
-	/* Array index: 0x1047 */ 0x818B,0x564A,
-	/* Array index: 0x1047 */ 0x818E,0x564B,
-	/* Array index: 0x1047 */ 0x8190,0x5646,
-	/* Array index: 0x1047 */ 0x8196,0x564C,
-	/* Array index: 0x1047 */ 0x8198,0x564D,
-	/* Array index: 0x1047 */ 0x819B,0x564E,
-	/* Array index: 0x1047 */ 0x819E,0x564F,
-	/* Array index: 0x1047 */ 0x81A2,0x5650,
-	/* Array index: 0x1047 */ 0x81AE,0x5651,
-	/* Array index: 0x1047 */ 0x81B2,0x5652,
-	/* Array index: 0x1047 */ 0x81B4,0x5653,
-	/* Array index: 0x1047 */ 0x81BB,0x5654,
-	/* Array index: 0x1047 */ 0x81C3,0x5656,
-	/* Array index: 0x1047 */ 0x81C5,0x5657,
-	/* Array index: 0x1047 */ 0x81CA,0x5658,
-	/* Array index: 0x1047 */ 0x81CB,0x5655,
-	/* Array index: 0x1047 */ 0x81CE,0x5659,
-	/* Array index: 0x1047 */ 0x81CF,0x565A,
-	/* Array index: 0x1047 */ 0x81D5,0x565B,
-	/* Array index: 0x1047 */ 0x81D7,0x565C,
-	/* Array index: 0x1047 */ 0x81DB,0x565D,
-	/* Array index: 0x1047 */ 0x81DD,0x565E,
-	/* Array index: 0x1047 */ 0x81DE,0x565F,
-	/* Array index: 0x1047 */ 0x81E1,0x5660,
-	/* Array index: 0x1047 */ 0x81E4,0x5661,
-	/* Array index: 0x1047 */ 0x81EB,0x5662,
-	/* Array index: 0x1047 */ 0x81EC,0x5663,
-	/* Array index: 0x1047 */ 0x81FD,0x566B,
-	/* Array index: 0x1047 */ 0x81FF,0x566C,
-	/* Array index: 0x1047 */ 0x8200,0x566D,
-	/* Array index: 0x1047 */ 0x8203,0x566E,
-	/* Array index: 0x1047 */ 0x820F,0x566F,
-	/* Array index: 0x1047 */ 0x8213,0x5670,
-	/* Array index: 0x1047 */ 0x8214,0x5671,
-	/* Array index: 0x1047 */ 0x8219,0x5672,
-	/* Array index: 0x1047 */ 0x821A,0x5673,
-	/* Array index: 0x1047 */ 0x821D,0x5674,
-	/* Array index: 0x1047 */ 0x8221,0x5675,
-	/* Array index: 0x1047 */ 0x8222,0x5676,
-	/* Array index: 0x1047 */ 0x8228,0x5677,
-	/* Array index: 0x1047 */ 0x8232,0x5678,
-	/* Array index: 0x1047 */ 0x8234,0x5679,
-	/* Array index: 0x1047 */ 0x823A,0x567A,
-	/* Array index: 0x1047 */ 0x824B,0x5721,
-	/* Array index: 0x1047 */ 0x824E,0x5722,
-	/* Array index: 0x1047 */ 0x824F,0x5723,
-	/* Array index: 0x1047 */ 0x8251,0x5724,
-	/* Array index: 0x1047 */ 0x8256,0x5725,
-	/* Array index: 0x1047 */ 0x825C,0x5726,
-	/* Array index: 0x1047 */ 0x8260,0x5727,
-	/* Array index: 0x1047 */ 0x8263,0x5728,
-	/* Array index: 0x1047 */ 0x8267,0x5729,
-	/* Array index: 0x1047 */ 0x826D,0x572A,
-	/* Array index: 0x1047 */ 0x8274,0x572B,
-	/* Array index: 0x1047 */ 0x827B,0x572C,
-	/* Array index: 0x1047 */ 0x8287,0x5733,
-	/* Array index: 0x1047 */ 0x8289,0x5734,
-	/* Array index: 0x1047 */ 0x828A,0x5735,
-	/* Array index: 0x1047 */ 0x828E,0x5736,
-	/* Array index: 0x1047 */ 0x8291,0x5737,
-	/* Array index: 0x1047 */ 0x8294,0x5738,
-	/* Array index: 0x1047 */ 0x8296,0x5739,
-	/* Array index: 0x1047 */ 0x8298,0x573A,
-	/* Array index: 0x1047 */ 0x829A,0x573B,
-	/* Array index: 0x1047 */ 0x829B,0x573C,
-	/* Array index: 0x1047 */ 0x82AE,0x5745,
-	/* Array index: 0x1047 */ 0x82B0,0x5746,
-	/* Array index: 0x1047 */ 0x82B2,0x5747,
-	/* Array index: 0x1047 */ 0x82B4,0x5748,
-	/* Array index: 0x1047 */ 0x82B7,0x5749,
-	/* Array index: 0x1047 */ 0x82BA,0x574A,
-	/* Array index: 0x1047 */ 0x82BC,0x574B,
-	/* Array index: 0x1047 */ 0x82BE,0x574C,
-	/* Array index: 0x1047 */ 0x82BF,0x574D,
-	/* Array index: 0x1047 */ 0x82C6,0x574E,
-	/* Array index: 0x1047 */ 0x82D0,0x574F,
-	/* Array index: 0x1047 */ 0x82D5,0x5750,
-	/* Array index: 0x1047 */ 0x82DA,0x5751,
-	/* Array index: 0x1047 */ 0x82E0,0x5752,
-	/* Array index: 0x1047 */ 0x82E2,0x5753,
-	/* Array index: 0x1047 */ 0x82E4,0x5754,
-	/* Array index: 0x1047 */ 0x82E8,0x5755,
-	/* Array index: 0x1047 */ 0x82EA,0x5756,
-	/* Array index: 0x1047 */ 0x82ED,0x5757,
-	/* Array index: 0x1047 */ 0x82EF,0x5758,
-	/* Array index: 0x1047 */ 0x82F6,0x5759,
-	/* Array index: 0x1047 */ 0x82F7,0x575A,
-	/* Array index: 0x1047 */ 0x8333,0x576E,
-	/* Array index: 0x1047 */ 0x8337,0x576F,
-	/* Array index: 0x1047 */ 0x833A,0x5770,
-	/* Array index: 0x1047 */ 0x833C,0x5771,
-	/* Array index: 0x1047 */ 0x833D,0x5772,
-	/* Array index: 0x1047 */ 0x8347,0x5776,
-	/* Array index: 0x1047 */ 0x834D,0x5777,
-	/* Array index: 0x1047 */ 0x834E,0x5778,
-	/* Array index: 0x1047 */ 0x8370,0x577D,
-	/* Array index: 0x1047 */ 0x8378,0x577E,
-	/* Array index: 0x1047 */ 0x837D,0x5821,
-	/* Array index: 0x1047 */ 0x837F,0x5822,
-	/* Array index: 0x1047 */ 0x8380,0x5823,
-	/* Array index: 0x1047 */ 0x8382,0x5824,
-	/* Array index: 0x1047 */ 0x8384,0x5825,
-	/* Array index: 0x1047 */ 0x8386,0x5826,
-	/* Array index: 0x1047 */ 0x838D,0x5827,
-	/* Array index: 0x1047 */ 0x8392,0x5828,
-	/* Array index: 0x1047 */ 0x8394,0x5829,
-	/* Array index: 0x1047 */ 0x8395,0x582A,
-	/* Array index: 0x1047 */ 0x83A6,0x5830,
-	/* Array index: 0x1047 */ 0x83A7,0x5831,
-	/* Array index: 0x1047 */ 0x83A9,0x5832,
-	/* Array index: 0x1047 */ 0x83AC,0x5833,
-	/* Array index: 0x1047 */ 0x83AD,0x584C,
-	/* Array index: 0x1047 */ 0x83C7,0x5837,
-	/* Array index: 0x1047 */ 0x83C9,0x5838,
-	/* Array index: 0x1047 */ 0x83D4,0x583C,
-	/* Array index: 0x1047 */ 0x83DD,0x583D,
-	/* Array index: 0x1047 */ 0x83E8,0x583F,
-	/* Array index: 0x1047 */ 0x83EA,0x5840,
-	/* Array index: 0x1047 */ 0x83F6,0x5841,
-	/* Array index: 0x1047 */ 0x83F8,0x5842,
-	/* Array index: 0x1047 */ 0x83F9,0x5843,
-	/* Array index: 0x1047 */ 0x83FC,0x5844,
-	/* Array index: 0x1047 */ 0x8401,0x5845,
-	/* Array index: 0x1047 */ 0x8406,0x5846,
-	/* Array index: 0x1047 */ 0x840A,0x5847,
-	/* Array index: 0x1047 */ 0x840F,0x5848,
-	/* Array index: 0x1047 */ 0x8411,0x5849,
-	/* Array index: 0x1047 */ 0x8415,0x584A,
-	/* Array index: 0x1047 */ 0x8419,0x584B,
-	/* Array index: 0x1047 */ 0x842F,0x584D,
-	/* Array index: 0x1047 */ 0x8439,0x584E,
-	/* Array index: 0x1047 */ 0x8445,0x584F,
-	/* Array index: 0x1047 */ 0x8447,0x5850,
-	/* Array index: 0x1047 */ 0x8448,0x5851,
-	/* Array index: 0x1047 */ 0x844A,0x5852,
-	/* Array index: 0x1047 */ 0x844D,0x5853,
-	/* Array index: 0x1047 */ 0x844F,0x5854,
-	/* Array index: 0x1047 */ 0x8451,0x5855,
-	/* Array index: 0x1047 */ 0x8452,0x5856,
-	/* Array index: 0x1047 */ 0x8460,0x585C,
-	/* Array index: 0x1047 */ 0x8464,0x585D,
-	/* Array index: 0x1047 */ 0x8465,0x585E,
-	/* Array index: 0x1047 */ 0x8467,0x585F,
-	/* Array index: 0x1047 */ 0x846A,0x5860,
-	/* Array index: 0x1047 */ 0x8470,0x5861,
-	/* Array index: 0x1047 */ 0x8473,0x5862,
-	/* Array index: 0x1047 */ 0x8474,0x5863,
-	/* Array index: 0x1047 */ 0x8476,0x5864,
-	/* Array index: 0x1047 */ 0x8478,0x5865,
-	/* Array index: 0x1047 */ 0x847C,0x5866,
-	/* Array index: 0x1047 */ 0x847D,0x5867,
-	/* Array index: 0x1047 */ 0x8481,0x5868,
-	/* Array index: 0x1047 */ 0x8485,0x5869,
-	/* Array index: 0x1047 */ 0x8492,0x586A,
-	/* Array index: 0x1047 */ 0x8493,0x586B,
-	/* Array index: 0x1047 */ 0x8495,0x586C,
-	/* Array index: 0x1047 */ 0x849E,0x586D,
-	/* Array index: 0x1047 */ 0x84AF,0x5872,
-	/* Array index: 0x1047 */ 0x84B1,0x5873,
-	/* Array index: 0x1047 */ 0x84B4,0x5874,
-	/* Array index: 0x1047 */ 0x84BA,0x5875,
-	/* Array index: 0x1047 */ 0x84BD,0x5876,
-	/* Array index: 0x1047 */ 0x84BE,0x5877,
-	/* Array index: 0x1047 */ 0x84C0,0x5878,
-	/* Array index: 0x1047 */ 0x84C2,0x5879,
-	/* Array index: 0x1047 */ 0x84C7,0x587A,
-	/* Array index: 0x1047 */ 0x84C8,0x587B,
-	/* Array index: 0x1047 */ 0x84CC,0x587C,
-	/* Array index: 0x1047 */ 0x84CF,0x587D,
-	/* Array index: 0x1047 */ 0x84D3,0x587E,
-	/* Array index: 0x1047 */ 0x84DC,0x5921,
-	/* Array index: 0x1047 */ 0x84E7,0x5922,
-	/* Array index: 0x1047 */ 0x84EA,0x5923,
-	/* Array index: 0x1047 */ 0x84F7,0x5928,
-	/* Array index: 0x1047 */ 0x84FA,0x592A,
-	/* Array index: 0x1047 */ 0x84FB,0x592B,
-	/* Array index: 0x1047 */ 0x84FD,0x592C,
-	/* Array index: 0x1047 */ 0x8502,0x592D,
-	/* Array index: 0x1047 */ 0x8503,0x592E,
-	/* Array index: 0x1047 */ 0x8507,0x592F,
-	/* Array index: 0x1047 */ 0x850C,0x5930,
-	/* Array index: 0x1047 */ 0x850E,0x5931,
-	/* Array index: 0x1047 */ 0x8510,0x5932,
-	/* Array index: 0x1047 */ 0x851C,0x5933,
-	/* Array index: 0x1047 */ 0x851E,0x5934,
-	/* Array index: 0x1047 */ 0x852F,0x593C,
-	/* Array index: 0x1047 */ 0x853F,0x5940,
-	/* Array index: 0x1047 */ 0x8546,0x5941,
-	/* Array index: 0x1047 */ 0x8556,0x5947,
-	/* Array index: 0x1047 */ 0x8559,0x5948,
-	/* Array index: 0x1047 */ 0x856B,0x5951,
-	/* Array index: 0x1047 */ 0x856F,0x5952,
-	/* Array index: 0x1047 */ 0x8585,0x5959,
-	/* Array index: 0x1047 */ 0x8586,0x595A,
-	/* Array index: 0x1047 */ 0x8589,0x595B,
-	/* Array index: 0x1047 */ 0x858B,0x595C,
-	/* Array index: 0x1047 */ 0x858C,0x595D,
-	/* Array index: 0x1047 */ 0x858F,0x595E,
-	/* Array index: 0x1047 */ 0x8593,0x595F,
-	/* Array index: 0x1047 */ 0x8598,0x5960,
-	/* Array index: 0x1047 */ 0x859D,0x5961,
-	/* Array index: 0x1047 */ 0x859F,0x5962,
-	/* Array index: 0x1047 */ 0x85A0,0x5963,
-	/* Array index: 0x1047 */ 0x85A2,0x5964,
-	/* Array index: 0x1047 */ 0x85A5,0x5965,
-	/* Array index: 0x1047 */ 0x85A7,0x5966,
-	/* Array index: 0x1047 */ 0x85AD,0x5974,
-	/* Array index: 0x1047 */ 0x85C2,0x596F,
-	/* Array index: 0x1047 */ 0x85C7,0x5970,
-	/* Array index: 0x1047 */ 0x85CA,0x5971,
-	/* Array index: 0x1047 */ 0x85CB,0x5972,
-	/* Array index: 0x1047 */ 0x85CE,0x5973,
-	/* Array index: 0x1047 */ 0x85D8,0x5975,
-	/* Array index: 0x1047 */ 0x85DA,0x5976,
-	/* Array index: 0x1047 */ 0x85DF,0x5977,
-	/* Array index: 0x1047 */ 0x85E0,0x5978,
-	/* Array index: 0x1047 */ 0x85E6,0x5979,
-	/* Array index: 0x1047 */ 0x85E8,0x597A,
-	/* Array index: 0x1047 */ 0x85ED,0x597B,
-	/* Array index: 0x1047 */ 0x85F3,0x597C,
-	/* Array index: 0x1047 */ 0x85F6,0x597D,
-	/* Array index: 0x1047 */ 0x85FC,0x597E,
-	/* Array index: 0x1047 */ 0x85FF,0x5A21,
-	/* Array index: 0x1047 */ 0x8600,0x5A22,
-	/* Array index: 0x1047 */ 0x8604,0x5A23,
-	/* Array index: 0x1047 */ 0x8605,0x5A24,
-	/* Array index: 0x1047 */ 0x8618,0x5A2A,
-	/* Array index: 0x1047 */ 0x8619,0x5A2B,
-	/* Array index: 0x1047 */ 0x861B,0x5A2C,
-	/* Array index: 0x1047 */ 0x861E,0x5A2D,
-	/* Array index: 0x1047 */ 0x8621,0x5A2E,
-	/* Array index: 0x1047 */ 0x8627,0x5A2F,
-	/* Array index: 0x1047 */ 0x8629,0x5A30,
-	/* Array index: 0x1047 */ 0x8636,0x5A31,
-	/* Array index: 0x1047 */ 0x8638,0x5A32,
-	/* Array index: 0x1047 */ 0x863A,0x5A33,
-	/* Array index: 0x1047 */ 0x8646,0x5A38,
-	/* Array index: 0x1047 */ 0x865D,0x5A3F,
-	/* Array index: 0x1047 */ 0x8669,0x5A45,
-	/* Array index: 0x1047 */ 0x866C,0x5A46,
-	/* Array index: 0x1047 */ 0x866F,0x5A47,
-	/* Array index: 0x1047 */ 0x867A,0x5A4B,
-	/* Array index: 0x1047 */ 0x8688,0x5A6D,
-	/* Array index: 0x1047 */ 0x868D,0x5A4C,
-	/* Array index: 0x1047 */ 0x8691,0x5A4D,
-	/* Array index: 0x1047 */ 0x8696,0x5A4E,
-	/* Array index: 0x1047 */ 0x8698,0x5A4F,
-	/* Array index: 0x1047 */ 0x869A,0x5A50,
-	/* Array index: 0x1047 */ 0x869C,0x5A51,
-	/* Array index: 0x1047 */ 0x86A1,0x5A52,
-	/* Array index: 0x1047 */ 0x86AD,0x5A56,
-	/* Array index: 0x1047 */ 0x86D1,0x5A63,
-	/* Array index: 0x1047 */ 0x86D2,0x5A64,
-	/* Array index: 0x1047 */ 0x86D5,0x5A65,
-	/* Array index: 0x1047 */ 0x86D7,0x5A66,
-	/* Array index: 0x1047 */ 0x86DA,0x5A67,
-	/* Array index: 0x1047 */ 0x86DC,0x5A68,
-	/* Array index: 0x1047 */ 0x86E0,0x5A69,
-	/* Array index: 0x1047 */ 0x86E3,0x5A6A,
-	/* Array index: 0x1047 */ 0x86E5,0x5A6B,
-	/* Array index: 0x1047 */ 0x86E7,0x5A6C,
-	/* Array index: 0x1047 */ 0x86FA,0x5A6E,
-	/* Array index: 0x1047 */ 0x86FC,0x5A6F,
-	/* Array index: 0x1047 */ 0x86FD,0x5A70,
-	/* Array index: 0x1047 */ 0x8704,0x5A71,
-	/* Array index: 0x1047 */ 0x8705,0x5A72,
-	/* Array index: 0x1047 */ 0x8707,0x5A73,
-	/* Array index: 0x1047 */ 0x870B,0x5A74,
-	/* Array index: 0x1047 */ 0x8719,0x5A7A,
-	/* Array index: 0x1047 */ 0x871E,0x5A7B,
-	/* Array index: 0x1047 */ 0x871F,0x5A7C,
-	/* Array index: 0x1047 */ 0x8721,0x5A7D,
-	/* Array index: 0x1047 */ 0x8723,0x5A7E,
-	/* Array index: 0x1047 */ 0x8728,0x5B21,
-	/* Array index: 0x1047 */ 0x8743,0x5B2C,
-	/* Array index: 0x1047 */ 0x8745,0x5B2D,
-	/* Array index: 0x1047 */ 0x874D,0x5B2E,
-	/* Array index: 0x1047 */ 0x8758,0x5B2F,
-	/* Array index: 0x1047 */ 0x875D,0x5B30,
-	/* Array index: 0x1047 */ 0x8761,0x5B31,
-	/* Array index: 0x1047 */ 0x8764,0x5B32,
-	/* Array index: 0x1047 */ 0x8765,0x5B33,
-	/* Array index: 0x1047 */ 0x876F,0x5B34,
-	/* Array index: 0x1047 */ 0x8771,0x5B35,
-	/* Array index: 0x1047 */ 0x8772,0x5B36,
-	/* Array index: 0x1047 */ 0x877B,0x5B37,
-	/* Array index: 0x1047 */ 0x8790,0x5B41,
-	/* Array index: 0x1047 */ 0x8793,0x5B42,
-	/* Array index: 0x1047 */ 0x879E,0x5B47,
-	/* Array index: 0x1047 */ 0x87A0,0x5B48,
-	/* Array index: 0x1047 */ 0x87A3,0x5B49,
-	/* Array index: 0x1047 */ 0x87A7,0x5B4A,
-	/* Array index: 0x1047 */ 0x87B1,0x5B4E,
-	/* Array index: 0x1047 */ 0x87B5,0x5B4F,
-	/* Array index: 0x1047 */ 0x87BE,0x5B50,
-	/* Array index: 0x1047 */ 0x87BF,0x5B51,
-	/* Array index: 0x1047 */ 0x87C1,0x5B52,
-	/* Array index: 0x1047 */ 0x87CE,0x5B56,
-	/* Array index: 0x1047 */ 0x87D5,0x5B57,
-	/* Array index: 0x1047 */ 0x87D6,0x5B58,
-	/* Array index: 0x1047 */ 0x87D9,0x5B59,
-	/* Array index: 0x1047 */ 0x87DA,0x5B5A,
-	/* Array index: 0x1047 */ 0x87DC,0x5B5B,
-	/* Array index: 0x1047 */ 0x87DF,0x5B5C,
-	/* Array index: 0x1047 */ 0x87EA,0x5B60,
-	/* Array index: 0x1047 */ 0x87EB,0x5B61,
-	/* Array index: 0x1047 */ 0x87ED,0x5B62,
-	/* Array index: 0x1047 */ 0x87F1,0x5B63,
-	/* Array index: 0x1047 */ 0x87F3,0x5B64,
-	/* Array index: 0x1047 */ 0x87F8,0x5B65,
-	/* Array index: 0x1047 */ 0x87FA,0x5B66,
-	/* Array index: 0x1047 */ 0x87FF,0x5B67,
-	/* Array index: 0x1047 */ 0x8801,0x5B68,
-	/* Array index: 0x1047 */ 0x8803,0x5B69,
-	/* Array index: 0x1047 */ 0x8806,0x5B6A,
-	/* Array index: 0x1047 */ 0x8828,0x5B79,
-	/* Array index: 0x1047 */ 0x882D,0x5B7A,
-	/* Array index: 0x1047 */ 0x882E,0x5B7B,
-	/* Array index: 0x1047 */ 0x8830,0x5B7C,
-	/* Array index: 0x1047 */ 0x8832,0x5B7D,
-	/* Array index: 0x1047 */ 0x8835,0x5B7E,
-	/* Array index: 0x1047 */ 0x883A,0x5C21,
-	/* Array index: 0x1047 */ 0x883C,0x5C22,
-	/* Array index: 0x1047 */ 0x8841,0x5C23,
-	/* Array index: 0x1047 */ 0x8843,0x5C24,
-	/* Array index: 0x1047 */ 0x8845,0x5C25,
-	/* Array index: 0x1047 */ 0x884E,0x5C2A,
-	/* Array index: 0x1047 */ 0x8851,0x5C2B,
-	/* Array index: 0x1047 */ 0x8855,0x5C2C,
-	/* Array index: 0x1047 */ 0x8856,0x5C2D,
-	/* Array index: 0x1047 */ 0x8858,0x5C2E,
-	/* Array index: 0x1047 */ 0x885A,0x5C2F,
-	/* Array index: 0x1047 */ 0x885C,0x5C30,
-	/* Array index: 0x1047 */ 0x885F,0x5C31,
-	/* Array index: 0x1047 */ 0x8860,0x5C32,
-	/* Array index: 0x1047 */ 0x8864,0x5C33,
-	/* Array index: 0x1047 */ 0x8869,0x5C34,
-	/* Array index: 0x1047 */ 0x8871,0x5C35,
-	/* Array index: 0x1047 */ 0x8879,0x5C36,
-	/* Array index: 0x1047 */ 0x887B,0x5C37,
-	/* Array index: 0x1047 */ 0x8880,0x5C38,
-	/* Array index: 0x1047 */ 0x88A8,0x5C3F,
-	/* Array index: 0x1047 */ 0x88AA,0x5C40,
-	/* Array index: 0x1047 */ 0x88BA,0x5C41,
-	/* Array index: 0x1047 */ 0x88BD,0x5C42,
-	/* Array index: 0x1047 */ 0x88BE,0x5C43,
-	/* Array index: 0x1047 */ 0x88C0,0x5C44,
-	/* Array index: 0x1047 */ 0x88DB,0x5C4D,
-	/* Array index: 0x1047 */ 0x88DE,0x5C4E,
-	/* Array index: 0x1047 */ 0x88E7,0x5C4F,
-	/* Array index: 0x1047 */ 0x88F5,0x5C53,
-	/* Array index: 0x1047 */ 0x88F7,0x5C54,
-	/* Array index: 0x1047 */ 0x8901,0x5C55,
-	/* Array index: 0x1047 */ 0x8906,0x5C56,
-	/* Array index: 0x1047 */ 0x8920,0x5C60,
-	/* Array index: 0x1047 */ 0x8935,0x5C67,
-	/* Array index: 0x1047 */ 0x8939,0x5C68,
-	/* Array index: 0x1047 */ 0x893A,0x5C69,
-	/* Array index: 0x1047 */ 0x893E,0x5C6A,
-	/* Array index: 0x1047 */ 0x8940,0x5C6B,
-	/* Array index: 0x1047 */ 0x8942,0x5C6C,
-	/* Array index: 0x1047 */ 0x8945,0x5C6D,
-	/* Array index: 0x1047 */ 0x8946,0x5C6E,
-	/* Array index: 0x1047 */ 0x8949,0x5C6F,
-	/* Array index: 0x1047 */ 0x894F,0x5C70,
-	/* Array index: 0x1047 */ 0x8952,0x5C71,
-	/* Array index: 0x1047 */ 0x8957,0x5C72,
-	/* Array index: 0x1047 */ 0x896B,0x5C79,
-	/* Array index: 0x1047 */ 0x896E,0x5C7A,
-	/* Array index: 0x1047 */ 0x8970,0x5C7B,
-	/* Array index: 0x1047 */ 0x8973,0x5C7C,
-	/* Array index: 0x1047 */ 0x8975,0x5C7D,
-	/* Array index: 0x1047 */ 0x8989,0x5D24,
-	/* Array index: 0x1047 */ 0x898D,0x5D25,
-	/* Array index: 0x1047 */ 0x8990,0x5D26,
-	/* Array index: 0x1047 */ 0x8994,0x5D27,
-	/* Array index: 0x1047 */ 0x8995,0x5D28,
-	/* Array index: 0x1047 */ 0x899B,0x5D29,
-	/* Array index: 0x1047 */ 0x899C,0x5D2A,
-	/* Array index: 0x1047 */ 0x899F,0x5D2B,
-	/* Array index: 0x1047 */ 0x89A0,0x5D2C,
-	/* Array index: 0x1047 */ 0x89A5,0x5D2D,
-	/* Array index: 0x1047 */ 0x89B0,0x5D2E,
-	/* Array index: 0x1047 */ 0x89BC,0x5D33,
-	/* Array index: 0x1047 */ 0x89E5,0x5D39,
-	/* Array index: 0x1047 */ 0x89E9,0x5D3A,
-	/* Array index: 0x1047 */ 0x89EB,0x5D3B,
-	/* Array index: 0x1047 */ 0x89ED,0x5D3C,
-	/* Array index: 0x1047 */ 0x89F1,0x5D3D,
-	/* Array index: 0x1047 */ 0x89F3,0x5D3E,
-	/* Array index: 0x1047 */ 0x89F6,0x5D3F,
-	/* Array index: 0x1047 */ 0x89F9,0x5D40,
-	/* Array index: 0x1047 */ 0x89FD,0x5D41,
-	/* Array index: 0x1047 */ 0x89FF,0x5D42,
-	/* Array index: 0x1047 */ 0x8A04,0x5D43,
-	/* Array index: 0x1047 */ 0x8A05,0x5D44,
-	/* Array index: 0x1047 */ 0x8A07,0x5D45,
-	/* Array index: 0x1047 */ 0x8A0F,0x5D46,
-	/* Array index: 0x1047 */ 0x8A1E,0x5D4B,
-	/* Array index: 0x1047 */ 0x8A20,0x5D4C,
-	/* Array index: 0x1047 */ 0x8A22,0x5D4D,
-	/* Array index: 0x1047 */ 0x8A24,0x5D4E,
-	/* Array index: 0x1047 */ 0x8A26,0x5D4F,
-	/* Array index: 0x1047 */ 0x8A2B,0x5D50,
-	/* Array index: 0x1047 */ 0x8A2C,0x5D51,
-	/* Array index: 0x1047 */ 0x8A2F,0x5D52,
-	/* Array index: 0x1047 */ 0x8A35,0x5D53,
-	/* Array index: 0x1047 */ 0x8A37,0x5D54,
-	/* Array index: 0x1047 */ 0x8A3D,0x5D55,
-	/* Array index: 0x1047 */ 0x8A3E,0x5D56,
-	/* Array index: 0x1047 */ 0x8A40,0x5D57,
-	/* Array index: 0x1047 */ 0x8A43,0x5D58,
-	/* Array index: 0x1047 */ 0x8A45,0x5D59,
-	/* Array index: 0x1047 */ 0x8A47,0x5D5A,
-	/* Array index: 0x1047 */ 0x8A49,0x5D5B,
-	/* Array index: 0x1047 */ 0x8A4D,0x5D5C,
-	/* Array index: 0x1047 */ 0x8A4E,0x5D5D,
-	/* Array index: 0x1047 */ 0x8A53,0x5D5E,
-	/* Array index: 0x1047 */ 0x8A5C,0x5D62,
-	/* Array index: 0x1047 */ 0x8A5D,0x5D63,
-	/* Array index: 0x1047 */ 0x8A61,0x5D64,
-	/* Array index: 0x1047 */ 0x8A65,0x5D65,
-	/* Array index: 0x1047 */ 0x8A67,0x5D66,
-	/* Array index: 0x1047 */ 0x8A83,0x5D70,
-	/* Array index: 0x1047 */ 0x8A86,0x5D71,
-	/* Array index: 0x1047 */ 0x8A8B,0x5D72,
-	/* Array index: 0x1047 */ 0x8A8F,0x5D73,
-	/* Array index: 0x1047 */ 0x8A90,0x5D74,
-	/* Array index: 0x1047 */ 0x8A92,0x5D75,
-	/* Array index: 0x1047 */ 0x8A96,0x5D76,
-	/* Array index: 0x1047 */ 0x8A97,0x5D77,
-	/* Array index: 0x1047 */ 0x8A99,0x5D78,
-	/* Array index: 0x1047 */ 0x8A9F,0x5D79,
-	/* Array index: 0x1047 */ 0x8AA7,0x5D7A,
-	/* Array index: 0x1047 */ 0x8AA9,0x5D7B,
-	/* Array index: 0x1047 */ 0x8AAE,0x5D7C,
-	/* Array index: 0x1047 */ 0x8AAF,0x5D7D,
-	/* Array index: 0x1047 */ 0x8AB3,0x5D7E,
-	/* Array index: 0x1047 */ 0x8AB6,0x5E21,
-	/* Array index: 0x1047 */ 0x8AB7,0x5E22,
-	/* Array index: 0x1047 */ 0x8ABB,0x5E23,
-	/* Array index: 0x1047 */ 0x8ABE,0x5E24,
-	/* Array index: 0x1047 */ 0x8AC3,0x5E25,
-	/* Array index: 0x1047 */ 0x8ADD,0x5E2F,
-	/* Array index: 0x1047 */ 0x8ADF,0x5E30,
-	/* Array index: 0x1047 */ 0x8AEC,0x5E31,
-	/* Array index: 0x1047 */ 0x8AF0,0x5E32,
-	/* Array index: 0x1047 */ 0x8AFC,0x5E36,
-	/* Array index: 0x1047 */ 0x8AFF,0x5E37,
-	/* Array index: 0x1047 */ 0x8B05,0x5E38,
-	/* Array index: 0x1047 */ 0x8B06,0x5E39,
-	/* Array index: 0x1047 */ 0x8B0A,0x5E3F,
-	/* Array index: 0x1047 */ 0x8B0B,0x5E3A,
-	/* Array index: 0x1047 */ 0x8B11,0x5E3B,
-	/* Array index: 0x1047 */ 0x8B1C,0x5E3C,
-	/* Array index: 0x1047 */ 0x8B1E,0x5E3D,
-	/* Array index: 0x1047 */ 0x8B1F,0x5E3E,
-	/* Array index: 0x1047 */ 0x8B2D,0x5E40,
-	/* Array index: 0x1047 */ 0x8B30,0x5E41,
-	/* Array index: 0x1047 */ 0x8B37,0x5E42,
-	/* Array index: 0x1047 */ 0x8B3C,0x5E43,
-	/* Array index: 0x1047 */ 0x8B4D,0x5E4E,
-	/* Array index: 0x1047 */ 0x8B59,0x5E4D,
-	/* Array index: 0x1047 */ 0x8B5E,0x5E4F,
-	/* Array index: 0x1047 */ 0x8B63,0x5E50,
-	/* Array index: 0x1047 */ 0x8B6D,0x5E51,
-	/* Array index: 0x1047 */ 0x8B76,0x5E52,
-	/* Array index: 0x1047 */ 0x8B78,0x5E53,
-	/* Array index: 0x1047 */ 0x8B79,0x5E54,
-	/* Array index: 0x1047 */ 0x8B7C,0x5E55,
-	/* Array index: 0x1047 */ 0x8B7E,0x5E56,
-	/* Array index: 0x1047 */ 0x8B81,0x5E57,
-	/* Array index: 0x1047 */ 0x8B84,0x5E58,
-	/* Array index: 0x1047 */ 0x8B85,0x5E59,
-	/* Array index: 0x1047 */ 0x8B8B,0x5E5A,
-	/* Array index: 0x1047 */ 0x8B8D,0x5E5B,
-	/* Array index: 0x1047 */ 0x8B8F,0x5E5C,
-	/* Array index: 0x1047 */ 0x8B94,0x5E5D,
-	/* Array index: 0x1047 */ 0x8B95,0x5E5E,
-	/* Array index: 0x1047 */ 0x8B9C,0x5E5F,
-	/* Array index: 0x1047 */ 0x8B9E,0x5E60,
-	/* Array index: 0x1047 */ 0x8B9F,0x5E61,
-	/* Array index: 0x1047 */ 0x8C38,0x5E62,
-	/* Array index: 0x1047 */ 0x8C39,0x5E63,
-	/* Array index: 0x1047 */ 0x8C3D,0x5E64,
-	/* Array index: 0x1047 */ 0x8C3E,0x5E65,
-	/* Array index: 0x1047 */ 0x8C45,0x5E66,
-	/* Array index: 0x1047 */ 0x8C47,0x5E67,
-	/* Array index: 0x1047 */ 0x8C49,0x5E68,
-	/* Array index: 0x1047 */ 0x8C4B,0x5E69,
-	/* Array index: 0x1047 */ 0x8C4F,0x5E6A,
-	/* Array index: 0x1047 */ 0x8C51,0x5E6B,
-	/* Array index: 0x1047 */ 0x8C63,0x5E73,
-	/* Array index: 0x1047 */ 0x8C64,0x5E74,
-	/* Array index: 0x1047 */ 0x8C66,0x5E75,
-	/* Array index: 0x1047 */ 0x8C68,0x5E76,
-	/* Array index: 0x1047 */ 0x8C69,0x5E77,
-	/* Array index: 0x1047 */ 0x8C6D,0x5E78,
-	/* Array index: 0x1047 */ 0x8C73,0x5E79,
-	/* Array index: 0x1047 */ 0x8C75,0x5E7A,
-	/* Array index: 0x1047 */ 0x8C76,0x5E7B,
-	/* Array index: 0x1047 */ 0x8C7B,0x5E7C,
-	/* Array index: 0x1047 */ 0x8C7E,0x5E7D,
-	/* Array index: 0x1047 */ 0x8C86,0x5E7E,
-	/* Array index: 0x1047 */ 0x8C87,0x5F21,
-	/* Array index: 0x1047 */ 0x8C8B,0x5F22,
-	/* Array index: 0x1047 */ 0x8C90,0x5F23,
-	/* Array index: 0x1047 */ 0x8C92,0x5F24,
-	/* Array index: 0x1047 */ 0x8C93,0x5F25,
-	/* Array index: 0x1047 */ 0x8C99,0x5F26,
-	/* Array index: 0x1047 */ 0x8C9B,0x5F27,
-	/* Array index: 0x1047 */ 0x8C9C,0x5F28,
-	/* Array index: 0x1047 */ 0x8CA4,0x5F29,
-	/* Array index: 0x1047 */ 0x8CB9,0x5F2A,
-	/* Array index: 0x1047 */ 0x8CBA,0x5F2B,
-	/* Array index: 0x1047 */ 0x8CC5,0x5F2C,
-	/* Array index: 0x1047 */ 0x8CC6,0x5F2D,
-	/* Array index: 0x1047 */ 0x8CC9,0x5F2E,
-	/* Array index: 0x1047 */ 0x8CCB,0x5F2F,
-	/* Array index: 0x1047 */ 0x8CCF,0x5F30,
-	/* Array index: 0x1047 */ 0x8CD5,0x5F32,
-	/* Array index: 0x1047 */ 0x8CD6,0x5F31,
-	/* Array index: 0x1047 */ 0x8CD9,0x5F33,
-	/* Array index: 0x1047 */ 0x8CDD,0x5F34,
-	/* Array index: 0x1047 */ 0x8CE1,0x5F35,
-	/* Array index: 0x1047 */ 0x8CE8,0x5F36,
-	/* Array index: 0x1047 */ 0x8CEC,0x5F37,
-	/* Array index: 0x1047 */ 0x8CEF,0x5F38,
-	/* Array index: 0x1047 */ 0x8CF0,0x5F39,
-	/* Array index: 0x1047 */ 0x8CF2,0x5F3A,
-	/* Array index: 0x1047 */ 0x8CF5,0x5F3B,
-	/* Array index: 0x1047 */ 0x8CF7,0x5F3C,
-	/* Array index: 0x1047 */ 0x8CF8,0x5F3D,
-	/* Array index: 0x1047 */ 0x8CFE,0x5F3E,
-	/* Array index: 0x1047 */ 0x8CFF,0x5F3F,
-	/* Array index: 0x1047 */ 0x8D01,0x5F40,
-	/* Array index: 0x1047 */ 0x8D03,0x5F41,
-	/* Array index: 0x1047 */ 0x8D09,0x5F42,
-	/* Array index: 0x1047 */ 0x8D12,0x5F43,
-	/* Array index: 0x1047 */ 0x8D17,0x5F44,
-	/* Array index: 0x1047 */ 0x8D1B,0x5F45,
-	/* Array index: 0x1047 */ 0x8D65,0x5F46,
-	/* Array index: 0x1047 */ 0x8D69,0x5F47,
-	/* Array index: 0x1047 */ 0x8D6C,0x5F48,
-	/* Array index: 0x1047 */ 0x8D6E,0x5F49,
-	/* Array index: 0x1047 */ 0x8D7F,0x5F4A,
-	/* Array index: 0x1047 */ 0x8D82,0x5F4B,
-	/* Array index: 0x1047 */ 0x8D84,0x5F4C,
-	/* Array index: 0x1047 */ 0x8D88,0x5F4D,
-	/* Array index: 0x1047 */ 0x8D8D,0x5F4E,
-	/* Array index: 0x1047 */ 0x8D90,0x5F4F,
-	/* Array index: 0x1047 */ 0x8D91,0x5F50,
-	/* Array index: 0x1047 */ 0x8D95,0x5F51,
-	/* Array index: 0x1047 */ 0x8DA6,0x5F55,
-	/* Array index: 0x1047 */ 0x8DAB,0x5F56,
-	/* Array index: 0x1047 */ 0x8DAC,0x5F57,
-	/* Array index: 0x1047 */ 0x8DAF,0x5F58,
-	/* Array index: 0x1047 */ 0x8DB2,0x5F59,
-	/* Array index: 0x1047 */ 0x8DB5,0x5F5A,
-	/* Array index: 0x1047 */ 0x8DB7,0x5F5B,
-	/* Array index: 0x1047 */ 0x8DB9,0x5F5C,
-	/* Array index: 0x1047 */ 0x8DBB,0x5F5D,
-	/* Array index: 0x1047 */ 0x8DBC,0x5F6F,
-	/* Array index: 0x1047 */ 0x8DC0,0x5F5E,
-	/* Array index: 0x1047 */ 0x8DCE,0x5F64,
-	/* Array index: 0x1047 */ 0x8DD1,0x5F65,
-	/* Array index: 0x1047 */ 0x8DD4,0x5F66,
-	/* Array index: 0x1047 */ 0x8DD5,0x5F67,
-	/* Array index: 0x1047 */ 0x8DD7,0x5F68,
-	/* Array index: 0x1047 */ 0x8DD9,0x5F69,
-	/* Array index: 0x1047 */ 0x8DE4,0x5F6A,
-	/* Array index: 0x1047 */ 0x8DE5,0x5F6B,
-	/* Array index: 0x1047 */ 0x8DE7,0x5F6C,
-	/* Array index: 0x1047 */ 0x8DEC,0x5F6D,
-	/* Array index: 0x1047 */ 0x8DFD,0x5F73,
-	/* Array index: 0x1047 */ 0x8E01,0x5F74,
-	/* Array index: 0x1047 */ 0x8E0B,0x5F78,
-	/* Array index: 0x1047 */ 0x8E11,0x5F79,
-	/* Array index: 0x1047 */ 0x8E14,0x5F7A,
-	/* Array index: 0x1047 */ 0x8E16,0x5F7B,
-	/* Array index: 0x1047 */ 0x8E31,0x6024,
-	/* Array index: 0x1047 */ 0x8E33,0x6025,
-	/* Array index: 0x1047 */ 0x8E3D,0x602A,
-	/* Array index: 0x1047 */ 0x8E40,0x602B,
-	/* Array index: 0x1047 */ 0x8E41,0x602C,
-	/* Array index: 0x1047 */ 0x8E54,0x6031,
-	/* Array index: 0x1047 */ 0x8E69,0x6038,
-	/* Array index: 0x1047 */ 0x8E82,0x6041,
-	/* Array index: 0x1047 */ 0x8E83,0x6042,
-	/* Array index: 0x1047 */ 0x8E89,0x6043,
-	/* Array index: 0x1047 */ 0x8E90,0x6044,
-	/* Array index: 0x1047 */ 0x8E92,0x6045,
-	/* Array index: 0x1047 */ 0x8E95,0x6046,
-	/* Array index: 0x1047 */ 0x8EA2,0x604B,
-	/* Array index: 0x1047 */ 0x8EA7,0x604C,
-	/* Array index: 0x1047 */ 0x8EA9,0x604D,
-	/* Array index: 0x1047 */ 0x8EAD,0x604E,
-	/* Array index: 0x1047 */ 0x8EAE,0x604F,
-	/* Array index: 0x1047 */ 0x8EB3,0x6050,
-	/* Array index: 0x1047 */ 0x8EB5,0x6051,
-	/* Array index: 0x1047 */ 0x8EBA,0x6052,
-	/* Array index: 0x1047 */ 0x8EBB,0x6053,
-	/* Array index: 0x1047 */ 0x8EC7,0x6058,
-	/* Array index: 0x1047 */ 0x8ECF,0x6059,
-	/* Array index: 0x1047 */ 0x8ED1,0x605A,
-	/* Array index: 0x1047 */ 0x8ED4,0x605B,
-	/* Array index: 0x1047 */ 0x8EDC,0x605C,
-	/* Array index: 0x1047 */ 0x8EE8,0x605D,
-	/* Array index: 0x1047 */ 0x8EF7,0x6061,
-	/* Array index: 0x1047 */ 0x8EF9,0x6062,
-	/* Array index: 0x1047 */ 0x8EFA,0x6063,
-	/* Array index: 0x1047 */ 0x8F00,0x6065,
-	/* Array index: 0x1047 */ 0x8F02,0x6066,
-	/* Array index: 0x1047 */ 0x8F07,0x6067,
-	/* Array index: 0x1047 */ 0x8F08,0x6068,
-	/* Array index: 0x1047 */ 0x8F0F,0x6069,
-	/* Array index: 0x1047 */ 0x8F10,0x606A,
-	/* Array index: 0x1047 */ 0x8F1E,0x606E,
-	/* Array index: 0x1047 */ 0x8F20,0x606F,
-	/* Array index: 0x1047 */ 0x8F21,0x6070,
-	/* Array index: 0x1047 */ 0x8F23,0x6071,
-	/* Array index: 0x1047 */ 0x8F25,0x6072,
-	/* Array index: 0x1047 */ 0x8F27,0x6073,
-	/* Array index: 0x1047 */ 0x8F28,0x6074,
-	/* Array index: 0x1047 */ 0x8F3A,0x607C,
-	/* Array index: 0x1047 */ 0x8F40,0x607D,
-	/* Array index: 0x1047 */ 0x8F41,0x607E,
-	/* Array index: 0x1047 */ 0x8F43,0x6121,
-	/* Array index: 0x1047 */ 0x8F47,0x6122,
-	/* Array index: 0x1047 */ 0x8F58,0x6129,
-	/* Array index: 0x1047 */ 0x8F5D,0x612A,
-	/* Array index: 0x1047 */ 0x8F5E,0x612B,
-	/* Array index: 0x1047 */ 0x8F65,0x612C,
-	/* Array index: 0x1047 */ 0x8F9D,0x612D,
-	/* Array index: 0x1047 */ 0x8FB5,0x6133,
-	/* Array index: 0x1047 */ 0x8FB6,0x6134,
-	/* Array index: 0x1047 */ 0x8FB8,0x6135,
-	/* Array index: 0x1047 */ 0x8FBE,0x6136,
-	/* Array index: 0x1047 */ 0x8FC0,0x6137,
-	/* Array index: 0x1047 */ 0x8FC1,0x6138,
-	/* Array index: 0x1047 */ 0x8FC6,0x6139,
-	/* Array index: 0x1047 */ 0x8FCA,0x613A,
-	/* Array index: 0x1047 */ 0x8FCB,0x613B,
-	/* Array index: 0x1047 */ 0x8FCD,0x613C,
-	/* Array index: 0x1047 */ 0x8FD0,0x613D,
-	/* Array index: 0x1047 */ 0x8FD2,0x613E,
-	/* Array index: 0x1047 */ 0x8FD3,0x613F,
-	/* Array index: 0x1047 */ 0x8FD5,0x6140,
-	/* Array index: 0x1047 */ 0x8FE0,0x6141,
-	/* Array index: 0x1047 */ 0x8FE3,0x6142,
-	/* Array index: 0x1047 */ 0x8FE4,0x6143,
-	/* Array index: 0x1047 */ 0x8FE8,0x6144,
-	/* Array index: 0x1047 */ 0x8FEE,0x6145,
-	/* Array index: 0x1047 */ 0x8FF1,0x6146,
-	/* Array index: 0x1047 */ 0x8FF5,0x6147,
-	/* Array index: 0x1047 */ 0x8FF6,0x6148,
-	/* Array index: 0x1047 */ 0x8FFB,0x6149,
-	/* Array index: 0x1047 */ 0x8FFE,0x614A,
-	/* Array index: 0x1047 */ 0x9002,0x614B,
-	/* Array index: 0x1047 */ 0x9004,0x614C,
-	/* Array index: 0x1047 */ 0x9008,0x614D,
-	/* Array index: 0x1047 */ 0x900C,0x614E,
-	/* Array index: 0x1047 */ 0x9018,0x614F,
-	/* Array index: 0x1047 */ 0x901B,0x6150,
-	/* Array index: 0x1047 */ 0x9033,0x6157,
-	/* Array index: 0x1047 */ 0x9034,0x6158,
-	/* Array index: 0x1047 */ 0x9037,0x6159,
-	/* Array index: 0x1047 */ 0x903F,0x615A,
-	/* Array index: 0x1047 */ 0x9043,0x615B,
-	/* Array index: 0x1047 */ 0x9044,0x615C,
-	/* Array index: 0x1047 */ 0x904C,0x615D,
-	/* Array index: 0x1047 */ 0x905B,0x615E,
-	/* Array index: 0x1047 */ 0x905D,0x615F,
-	/* Array index: 0x1047 */ 0x9062,0x6160,
-	/* Array index: 0x1047 */ 0x9066,0x6161,
-	/* Array index: 0x1047 */ 0x9067,0x6162,
-	/* Array index: 0x1047 */ 0x906C,0x6163,
-	/* Array index: 0x1047 */ 0x9070,0x6164,
-	/* Array index: 0x1047 */ 0x9074,0x6165,
-	/* Array index: 0x1047 */ 0x9079,0x6166,
-	/* Array index: 0x1047 */ 0x9085,0x6167,
-	/* Array index: 0x1047 */ 0x9088,0x6168,
-	/* Array index: 0x1047 */ 0x908B,0x6169,
-	/* Array index: 0x1047 */ 0x908C,0x616A,
-	/* Array index: 0x1047 */ 0x908E,0x616B,
-	/* Array index: 0x1047 */ 0x9090,0x616C,
-	/* Array index: 0x1047 */ 0x90A5,0x6175,
-	/* Array index: 0x1047 */ 0x90BD,0x617B,
-	/* Array index: 0x1047 */ 0x90BE,0x617D,
-	/* Array index: 0x1047 */ 0x90CC,0x617C,
-	/* Array index: 0x1047 */ 0x90D2,0x622D,
-	/* Array index: 0x1047 */ 0x90E5,0x622C,
-	/* Array index: 0x1047 */ 0x90EB,0x622F,
-	/* Array index: 0x1047 */ 0x90EF,0x6230,
-	/* Array index: 0x1047 */ 0x90F0,0x6231,
-	/* Array index: 0x1047 */ 0x90F4,0x6232,
-	/* Array index: 0x1047 */ 0x90F6,0x622E,
-	/* Array index: 0x1047 */ 0x910D,0x623A,
-	/* Array index: 0x1047 */ 0x9110,0x623B,
-	/* Array index: 0x1047 */ 0x912E,0x6249,
-	/* Array index: 0x1047 */ 0x912F,0x624A,
-	/* Array index: 0x1047 */ 0x9131,0x624B,
-	/* Array index: 0x1047 */ 0x9134,0x624C,
-	/* Array index: 0x1047 */ 0x9143,0x6253,
-	/* Array index: 0x1047 */ 0x9147,0x6254,
-	/* Array index: 0x1047 */ 0x9148,0x6255,
-	/* Array index: 0x1047 */ 0x914F,0x6256,
-	/* Array index: 0x1047 */ 0x9153,0x6257,
-	/* Array index: 0x1047 */ 0x9161,0x625C,
-	/* Array index: 0x1047 */ 0x9164,0x625D,
-	/* Array index: 0x1047 */ 0x9167,0x625E,
-	/* Array index: 0x1047 */ 0x916D,0x625F,
-	/* Array index: 0x1047 */ 0x9174,0x6260,
-	/* Array index: 0x1047 */ 0x9181,0x6264,
-	/* Array index: 0x1047 */ 0x9183,0x6265,
-	/* Array index: 0x1047 */ 0x9185,0x6266,
-	/* Array index: 0x1047 */ 0x9186,0x6267,
-	/* Array index: 0x1047 */ 0x918A,0x6268,
-	/* Array index: 0x1047 */ 0x918E,0x6269,
-	/* Array index: 0x1047 */ 0x9198,0x626E,
-	/* Array index: 0x1047 */ 0x919E,0x626F,
-	/* Array index: 0x1047 */ 0x91A1,0x6270,
-	/* Array index: 0x1047 */ 0x91A6,0x6271,
-	/* Array index: 0x1047 */ 0x91A8,0x6272,
-	/* Array index: 0x1047 */ 0x91B6,0x627A,
-	/* Array index: 0x1047 */ 0x91D3,0x6324,
-	/* Array index: 0x1047 */ 0x91D4,0x6325,
-	/* Array index: 0x1047 */ 0x91D7,0x6326,
-	/* Array index: 0x1047 */ 0x91D9,0x6327,
-	/* Array index: 0x1047 */ 0x91DA,0x6328,
-	/* Array index: 0x1047 */ 0x91DE,0x6329,
-	/* Array index: 0x1047 */ 0x91E4,0x632A,
-	/* Array index: 0x1047 */ 0x91E5,0x632B,
-	/* Array index: 0x1047 */ 0x91F7,0x6334,
-	/* Array index: 0x1047 */ 0x91F9,0x6335,
-	/* Array index: 0x1047 */ 0x91FB,0x6336,
-	/* Array index: 0x1047 */ 0x91FD,0x6337,
-	/* Array index: 0x1047 */ 0x9210,0x6341,
-	/* Array index: 0x1047 */ 0x9212,0x6342,
-	/* Array index: 0x1047 */ 0x9213,0x6343,
-	/* Array index: 0x1047 */ 0x9216,0x6344,
-	/* Array index: 0x1047 */ 0x9218,0x6345,
-	/* Array index: 0x1047 */ 0x921C,0x6346,
-	/* Array index: 0x1047 */ 0x921D,0x6347,
-	/* Array index: 0x1047 */ 0x9233,0x6350,
-	/* Array index: 0x1047 */ 0x924A,0x635D,
-	/* Array index: 0x1047 */ 0x9258,0x6362,
-	/* Array index: 0x1047 */ 0x9259,0x6363,
-	/* Array index: 0x1047 */ 0x925C,0x6364,
-	/* Array index: 0x1047 */ 0x925D,0x6365,
-	/* Array index: 0x1047 */ 0x9260,0x6366,
-	/* Array index: 0x1047 */ 0x9261,0x6367,
-	/* Array index: 0x1047 */ 0x9292,0x637D,
-	/* Array index: 0x1047 */ 0x9297,0x637E,
-	/* Array index: 0x1047 */ 0x9299,0x6421,
-	/* Array index: 0x1047 */ 0x929F,0x6422,
-	/* Array index: 0x1047 */ 0x92A0,0x6423,
-	/* Array index: 0x1047 */ 0x92AB,0x6428,
-	/* Array index: 0x1047 */ 0x92AF,0x6429,
-	/* Array index: 0x1047 */ 0x92B2,0x642A,
-	/* Array index: 0x1047 */ 0x92B6,0x642B,
-	/* Array index: 0x1047 */ 0x92D3,0x643F,
-	/* Array index: 0x1047 */ 0x92EC,0x644D,
-	/* Array index: 0x1047 */ 0x92EE,0x644E,
-	/* Array index: 0x1047 */ 0x92F0,0x644F,
-	/* Array index: 0x1047 */ 0x92F9,0x6450,
-	/* Array index: 0x1047 */ 0x92FB,0x6451,
-	/* Array index: 0x1047 */ 0x92FF,0x6452,
-	/* Array index: 0x1047 */ 0x9300,0x6453,
-	/* Array index: 0x1047 */ 0x9302,0x6454,
-	/* Array index: 0x1047 */ 0x9308,0x6455,
-	/* Array index: 0x1047 */ 0x930D,0x6456,
-	/* Array index: 0x1047 */ 0x9311,0x6457,
-	/* Array index: 0x1047 */ 0x9314,0x6458,
-	/* Array index: 0x1047 */ 0x9315,0x6459,
-	/* Array index: 0x1047 */ 0x9355,0x646E,
-	/* Array index: 0x1047 */ 0x9357,0x646F,
-	/* Array index: 0x1047 */ 0x9358,0x6470,
-	/* Array index: 0x1047 */ 0x935A,0x6471,
-	/* Array index: 0x1047 */ 0x935E,0x6472,
-	/* Array index: 0x1047 */ 0x9364,0x6473,
-	/* Array index: 0x1047 */ 0x9365,0x6474,
-	/* Array index: 0x1047 */ 0x9367,0x6475,
-	/* Array index: 0x1047 */ 0x9369,0x6476,
-	/* Array index: 0x1047 */ 0x936A,0x6477,
-	/* Array index: 0x1047 */ 0x937A,0x6521,
-	/* Array index: 0x1047 */ 0x9388,0x6527,
-	/* Array index: 0x1047 */ 0x938A,0x6528,
-	/* Array index: 0x1047 */ 0x938B,0x6529,
-	/* Array index: 0x1047 */ 0x938D,0x652A,
-	/* Array index: 0x1047 */ 0x938F,0x652B,
-	/* Array index: 0x1047 */ 0x9392,0x652C,
-	/* Array index: 0x1047 */ 0x9395,0x652D,
-	/* Array index: 0x1047 */ 0x9398,0x652E,
-	/* Array index: 0x1047 */ 0x939B,0x652F,
-	/* Array index: 0x1047 */ 0x939E,0x6530,
-	/* Array index: 0x1047 */ 0x93A1,0x6531,
-	/* Array index: 0x1047 */ 0x93A3,0x6532,
-	/* Array index: 0x1047 */ 0x93A4,0x6533,
-	/* Array index: 0x1047 */ 0x93A6,0x6534,
-	/* Array index: 0x1047 */ 0x93A8,0x6535,
-	/* Array index: 0x1047 */ 0x93A9,0x653B,
-	/* Array index: 0x1047 */ 0x93AB,0x6536,
-	/* Array index: 0x1047 */ 0x93BA,0x653A,
-	/* Array index: 0x1047 */ 0x93C1,0x653C,
-	/* Array index: 0x1047 */ 0x93D3,0x6546,
-	/* Array index: 0x1047 */ 0x93D9,0x6547,
-	/* Array index: 0x1047 */ 0x93DC,0x6548,
-	/* Array index: 0x1047 */ 0x93DE,0x6549,
-	/* Array index: 0x1047 */ 0x93DF,0x654A,
-	/* Array index: 0x1047 */ 0x93E2,0x654B,
-	/* Array index: 0x1047 */ 0x93E6,0x654C,
-	/* Array index: 0x1047 */ 0x93E7,0x654D,
-	/* Array index: 0x1047 */ 0x9401,0x6554,
-	/* Array index: 0x1047 */ 0x9402,0x6555,
-	/* Array index: 0x1047 */ 0x9404,0x6556,
-	/* Array index: 0x1047 */ 0x9408,0x6557,
-	/* Array index: 0x1047 */ 0x9409,0x6558,
-	/* Array index: 0x1047 */ 0x941F,0x655F,
-	/* Array index: 0x1047 */ 0x943B,0x6566,
-	/* Array index: 0x1047 */ 0x943D,0x6568,
-	/* Array index: 0x1047 */ 0x943F,0x6567,
-	/* Array index: 0x1047 */ 0x9443,0x6569,
-	/* Array index: 0x1047 */ 0x9445,0x656A,
-	/* Array index: 0x1047 */ 0x9448,0x656B,
-	/* Array index: 0x1047 */ 0x944A,0x656C,
-	/* Array index: 0x1047 */ 0x944C,0x656D,
-	/* Array index: 0x1047 */ 0x9455,0x656E,
-	/* Array index: 0x1047 */ 0x9459,0x656F,
-	/* Array index: 0x1047 */ 0x945C,0x6570,
-	/* Array index: 0x1047 */ 0x945F,0x6571,
-	/* Array index: 0x1047 */ 0x9461,0x6572,
-	/* Array index: 0x1047 */ 0x9463,0x6573,
-	/* Array index: 0x1047 */ 0x9468,0x6574,
-	/* Array index: 0x1047 */ 0x9483,0x657C,
-	/* Array index: 0x1047 */ 0x9484,0x657B,
-	/* Array index: 0x1047 */ 0x9578,0x657D,
-	/* Array index: 0x1047 */ 0x9579,0x657E,
-	/* Array index: 0x1047 */ 0x957E,0x6621,
-	/* Array index: 0x1047 */ 0x9584,0x6622,
-	/* Array index: 0x1047 */ 0x9588,0x6623,
-	/* Array index: 0x1047 */ 0x95A6,0x662B,
-	/* Array index: 0x1047 */ 0x95A9,0x662C,
-	/* Array index: 0x1047 */ 0x95AB,0x662D,
-	/* Array index: 0x1047 */ 0x95AC,0x662E,
-	/* Array index: 0x1047 */ 0x95B4,0x662F,
-	/* Array index: 0x1047 */ 0x95B6,0x6630,
-	/* Array index: 0x1047 */ 0x95BA,0x6631,
-	/* Array index: 0x1047 */ 0x95BD,0x6632,
-	/* Array index: 0x1047 */ 0x95BF,0x6633,
-	/* Array index: 0x1047 */ 0x95C6,0x6634,
-	/* Array index: 0x1047 */ 0x95C8,0x6635,
-	/* Array index: 0x1047 */ 0x95C9,0x6636,
-	/* Array index: 0x1047 */ 0x95CB,0x6637,
-	/* Array index: 0x1047 */ 0x95E4,0x6642,
-	/* Array index: 0x1047 */ 0x95E6,0x6643,
-	/* Array index: 0x1047 */ 0x961D,0x6644,
-	/* Array index: 0x1047 */ 0x961E,0x6645,
-	/* Array index: 0x1047 */ 0x962C,0x664A,
-	/* Array index: 0x1047 */ 0x9631,0x664B,
-	/* Array index: 0x1047 */ 0x9633,0x664C,
-	/* Array index: 0x1047 */ 0x9641,0x6653,
-	/* Array index: 0x1047 */ 0x9652,0x6654,
-	/* Array index: 0x1047 */ 0x9661,0x6659,
-	/* Array index: 0x1047 */ 0x966E,0x665A,
-	/* Array index: 0x1047 */ 0x9674,0x665B,
-	/* Array index: 0x1047 */ 0x9689,0x6664,
-	/* Array index: 0x1047 */ 0x9691,0x6665,
-	/* Array index: 0x1047 */ 0x9696,0x6666,
-	/* Array index: 0x1047 */ 0x969A,0x6667,
-	/* Array index: 0x1047 */ 0x969D,0x6668,
-	/* Array index: 0x1047 */ 0x969F,0x6669,
-	/* Array index: 0x1047 */ 0x96A9,0x666D,
-	/* Array index: 0x1047 */ 0x96AE,0x666E,
-	/* Array index: 0x1047 */ 0x96AF,0x666F,
-	/* Array index: 0x1047 */ 0x96B3,0x6670,
-	/* Array index: 0x1047 */ 0x96BA,0x6671,
-	/* Array index: 0x1047 */ 0x96CA,0x6672,
-	/* Array index: 0x1047 */ 0x96D2,0x6673,
-	/* Array index: 0x1047 */ 0x96D8,0x6675,
-	/* Array index: 0x1047 */ 0x96DA,0x6676,
-	/* Array index: 0x1047 */ 0x96E9,0x667A,
-	/* Array index: 0x1047 */ 0x96EF,0x667B,
-	/* Array index: 0x1047 */ 0x96F1,0x667C,
-	/* Array index: 0x1047 */ 0x96FA,0x667D,
-	/* Array index: 0x1047 */ 0x9702,0x667E,
-	/* Array index: 0x1047 */ 0x9703,0x6721,
-	/* Array index: 0x1047 */ 0x9705,0x6722,
-	/* Array index: 0x1047 */ 0x9709,0x6723,
-	/* Array index: 0x1047 */ 0x971A,0x6724,
-	/* Array index: 0x1047 */ 0x971B,0x6725,
-	/* Array index: 0x1047 */ 0x971D,0x6726,
-	/* Array index: 0x1047 */ 0x9728,0x672A,
-	/* Array index: 0x1047 */ 0x9731,0x672B,
-	/* Array index: 0x1047 */ 0x9733,0x672C,
-	/* Array index: 0x1047 */ 0x9741,0x672D,
-	/* Array index: 0x1047 */ 0x9743,0x672E,
-	/* Array index: 0x1047 */ 0x974A,0x672F,
-	/* Array index: 0x1047 */ 0x974E,0x6730,
-	/* Array index: 0x1047 */ 0x974F,0x6731,
-	/* Array index: 0x1047 */ 0x9755,0x6732,
-	/* Array index: 0x1047 */ 0x9763,0x6737,
-	/* Array index: 0x1047 */ 0x9767,0x6738,
-	/* Array index: 0x1047 */ 0x976A,0x6739,
-	/* Array index: 0x1047 */ 0x976E,0x673A,
-	/* Array index: 0x1047 */ 0x9773,0x673B,
-	/* Array index: 0x1047 */ 0x977B,0x673F,
-	/* Array index: 0x1047 */ 0x977D,0x6740,
-	/* Array index: 0x1047 */ 0x977F,0x6741,
-	/* Array index: 0x1047 */ 0x9780,0x6742,
-	/* Array index: 0x1047 */ 0x9789,0x6743,
-	/* Array index: 0x1047 */ 0x979E,0x6749,
-	/* Array index: 0x1047 */ 0x979F,0x674A,
-	/* Array index: 0x1047 */ 0x97A2,0x674B,
-	/* Array index: 0x1047 */ 0x97AC,0x674C,
-	/* Array index: 0x1047 */ 0x97AE,0x674D,
-	/* Array index: 0x1047 */ 0x97B1,0x674E,
-	/* Array index: 0x1047 */ 0x97B2,0x674F,
-	/* Array index: 0x1047 */ 0x97D4,0x6763,
-	/* Array index: 0x1047 */ 0x97E4,0x676C,
-	/* Array index: 0x1047 */ 0x97EF,0x676D,
-	/* Array index: 0x1047 */ 0x97F1,0x676E,
-	/* Array index: 0x1047 */ 0x97F4,0x676F,
-	/* Array index: 0x1047 */ 0x97F7,0x6770,
-	/* Array index: 0x1047 */ 0x97F8,0x6771,
-	/* Array index: 0x1047 */ 0x97FA,0x6772,
-	/* Array index: 0x1047 */ 0x9807,0x6773,
-	/* Array index: 0x1047 */ 0x980A,0x6774,
-	/* Array index: 0x1047 */ 0x980D,0x6776,
-	/* Array index: 0x1047 */ 0x980E,0x6777,
-	/* Array index: 0x1047 */ 0x9814,0x6778,
-	/* Array index: 0x1047 */ 0x9816,0x6779,
-	/* Array index: 0x1047 */ 0x9819,0x6775,
-	/* Array index: 0x1047 */ 0x981C,0x677A,
-	/* Array index: 0x1047 */ 0x981E,0x677B,
-	/* Array index: 0x1047 */ 0x9820,0x677C,
-	/* Array index: 0x1047 */ 0x9823,0x677D,
-	/* Array index: 0x1047 */ 0x9825,0x6828,
-	/* Array index: 0x1047 */ 0x9826,0x677E,
-	/* Array index: 0x1047 */ 0x982B,0x6821,
-	/* Array index: 0x1047 */ 0x983E,0x6829,
-	/* Array index: 0x1047 */ 0x9844,0x682A,
-	/* Array index: 0x1047 */ 0x9847,0x682B,
-	/* Array index: 0x1047 */ 0x984A,0x682C,
-	/* Array index: 0x1047 */ 0x986A,0x6838,
-	/* Array index: 0x1047 */ 0x986C,0x6839,
-	/* Array index: 0x1047 */ 0x98AB,0x683A,
-	/* Array index: 0x1047 */ 0x98AD,0x683B,
-	/* Array index: 0x1047 */ 0x98AE,0x683C,
-	/* Array index: 0x1047 */ 0x98B0,0x683D,
-	/* Array index: 0x1047 */ 0x98B4,0x683E,
-	/* Array index: 0x1047 */ 0x98BF,0x6843,
-	/* Array index: 0x1047 */ 0x98C2,0x6844,
-	/* Array index: 0x1047 */ 0x98C5,0x6845,
-	/* Array index: 0x1047 */ 0x98C8,0x6846,
-	/* Array index: 0x1047 */ 0x98CC,0x6847,
-	/* Array index: 0x1047 */ 0x98E1,0x6848,
-	/* Array index: 0x1047 */ 0x98EA,0x684D,
-	/* Array index: 0x1047 */ 0x98F3,0x684E,
-	/* Array index: 0x1047 */ 0x98F6,0x684F,
-	/* Array index: 0x1047 */ 0x9902,0x6850,
-	/* Array index: 0x1047 */ 0x9907,0x6851,
-	/* Array index: 0x1047 */ 0x9908,0x6852,
-	/* Array index: 0x1047 */ 0x9911,0x6853,
-	/* Array index: 0x1047 */ 0x991F,0x685A,
-	/* Array index: 0x1047 */ 0x9922,0x685B,
-	/* Array index: 0x1047 */ 0x9926,0x685C,
-	/* Array index: 0x1047 */ 0x9927,0x685D,
-	/* Array index: 0x1047 */ 0x992B,0x685E,
-	/* Array index: 0x1047 */ 0x9940,0x6868,
-	/* Array index: 0x1047 */ 0x9941,0x6869,
-	/* Array index: 0x1047 */ 0x994D,0x686D,
-	/* Array index: 0x1047 */ 0x994E,0x686E,
-	/* Array index: 0x1047 */ 0x9954,0x686F,
-	/* Array index: 0x1047 */ 0x999B,0x6877,
-	/* Array index: 0x1047 */ 0x999D,0x6878,
-	/* Array index: 0x1047 */ 0x999F,0x6879,
-	/* Array index: 0x1047 */ 0x99A6,0x687A,
-	/* Array index: 0x1047 */ 0x99B5,0x687E,
-	/* Array index: 0x1047 */ 0x99B9,0x6921,
-	/* Array index: 0x1047 */ 0x99BA,0x6922,
-	/* Array index: 0x1047 */ 0x99BD,0x6923,
-	/* Array index: 0x1047 */ 0x99BF,0x6924,
-	/* Array index: 0x1047 */ 0x99C3,0x6925,
-	/* Array index: 0x1047 */ 0x99C9,0x6926,
-	/* Array index: 0x1047 */ 0x99D3,0x6927,
-	/* Array index: 0x1047 */ 0x99D4,0x6928,
-	/* Array index: 0x1047 */ 0x99D9,0x6929,
-	/* Array index: 0x1047 */ 0x99DA,0x692A,
-	/* Array index: 0x1047 */ 0x99DC,0x692B,
-	/* Array index: 0x1047 */ 0x99DE,0x692C,
-	/* Array index: 0x1047 */ 0x99E7,0x692D,
-	/* Array index: 0x1047 */ 0x99F0,0x6931,
-	/* Array index: 0x1047 */ 0x99F4,0x6932,
-	/* Array index: 0x1047 */ 0x99F5,0x6933,
-	/* Array index: 0x1047 */ 0x99F9,0x6934,
-	/* Array index: 0x1047 */ 0x99FD,0x6935,
-	/* Array index: 0x1047 */ 0x99FE,0x6936,
-	/* Array index: 0x1047 */ 0x9A0B,0x693A,
-	/* Array index: 0x1047 */ 0x9A0C,0x693B,
-	/* Array index: 0x1047 */ 0x9A10,0x693C,
-	/* Array index: 0x1047 */ 0x9A11,0x693D,
-	/* Array index: 0x1047 */ 0x9A16,0x693E,
-	/* Array index: 0x1047 */ 0x9A1E,0x693F,
-	/* Array index: 0x1047 */ 0x9A27,0x6944,
-	/* Array index: 0x1047 */ 0x9A2D,0x6945,
-	/* Array index: 0x1047 */ 0x9A2E,0x6946,
-	/* Array index: 0x1047 */ 0x9A33,0x6947,
-	/* Array index: 0x1047 */ 0x9A35,0x6948,
-	/* Array index: 0x1047 */ 0x9A36,0x6949,
-	/* Array index: 0x1047 */ 0x9A38,0x694A,
-	/* Array index: 0x1047 */ 0x9A41,0x694C,
-	/* Array index: 0x1047 */ 0x9A44,0x694D,
-	/* Array index: 0x1047 */ 0x9A47,0x694B,
-	/* Array index: 0x1047 */ 0x9A51,0x6952,
-	/* Array index: 0x1047 */ 0x9A54,0x6953,
-	/* Array index: 0x1047 */ 0x9A56,0x6954,
-	/* Array index: 0x1047 */ 0x9A5D,0x6955,
-	/* Array index: 0x1047 */ 0x9AAA,0x6956,
-	/* Array index: 0x1047 */ 0x9AAC,0x6957,
-	/* Array index: 0x1047 */ 0x9AAE,0x6958,
-	/* Array index: 0x1047 */ 0x9AAF,0x6959,
-	/* Array index: 0x1047 */ 0x9AB9,0x695E,
-	/* Array index: 0x1047 */ 0x9ABB,0x695F,
-	/* Array index: 0x1047 */ 0x9ABE,0x6960,
-	/* Array index: 0x1047 */ 0x9ABF,0x6961,
-	/* Array index: 0x1047 */ 0x9AC1,0x6962,
-	/* Array index: 0x1047 */ 0x9AC3,0x6963,
-	/* Array index: 0x1047 */ 0x9AC6,0x6964,
-	/* Array index: 0x1047 */ 0x9AC8,0x6965,
-	/* Array index: 0x1047 */ 0x9ACE,0x6966,
-	/* Array index: 0x1047 */ 0x9AD0,0x6967,
-	/* Array index: 0x1047 */ 0x9AD2,0x6968,
-	/* Array index: 0x1047 */ 0x9ADB,0x696C,
-	/* Array index: 0x1047 */ 0x9ADC,0x696D,
-	/* Array index: 0x1047 */ 0x9AE0,0x696E,
-	/* Array index: 0x1047 */ 0x9AE4,0x696F,
-	/* Array index: 0x1047 */ 0x9AE5,0x6970,
-	/* Array index: 0x1047 */ 0x9AE7,0x6971,
-	/* Array index: 0x1047 */ 0x9AE9,0x6972,
-	/* Array index: 0x1047 */ 0x9AEC,0x6973,
-	/* Array index: 0x1047 */ 0x9AF2,0x6974,
-	/* Array index: 0x1047 */ 0x9AF3,0x6975,
-	/* Array index: 0x1047 */ 0x9AF5,0x6976,
-	/* Array index: 0x1047 */ 0x9AF9,0x6977,
-	/* Array index: 0x1047 */ 0x9AFA,0x6978,
-	/* Array index: 0x1047 */ 0x9B16,0x6A2B,
-	/* Array index: 0x1047 */ 0x9B19,0x6A2C,
-	/* Array index: 0x1047 */ 0x9B1B,0x6A2D,
-	/* Array index: 0x1047 */ 0x9B1C,0x6A2E,
-	/* Array index: 0x1047 */ 0x9B20,0x6A2F,
-	/* Array index: 0x1047 */ 0x9B26,0x6A30,
-	/* Array index: 0x1047 */ 0x9B2B,0x6A31,
-	/* Array index: 0x1047 */ 0x9B2D,0x6A32,
-	/* Array index: 0x1047 */ 0x9B3D,0x6A39,
-	/* Array index: 0x1047 */ 0x9B48,0x6A3A,
-	/* Array index: 0x1047 */ 0x9B4B,0x6A3B,
-	/* Array index: 0x1047 */ 0x9B4C,0x6A3C,
-	/* Array index: 0x1047 */ 0x9B5B,0x6A40,
-	/* Array index: 0x1047 */ 0x9B5E,0x6A41,
-	/* Array index: 0x1047 */ 0x9B61,0x6A42,
-	/* Array index: 0x1047 */ 0x9B63,0x6A43,
-	/* Array index: 0x1047 */ 0x9B65,0x6A44,
-	/* Array index: 0x1047 */ 0x9B66,0x6A45,
-	/* Array index: 0x1047 */ 0x9B73,0x6A4C,
-	/* Array index: 0x1047 */ 0x9B7F,0x6A51,
-	/* Array index: 0x1047 */ 0x9B80,0x6A52,
-	/* Array index: 0x1047 */ 0x9B94,0x6A5D,
-	/* Array index: 0x1047 */ 0x9B9A,0x6A5E,
-	/* Array index: 0x1047 */ 0x9B9D,0x6A5F,
-	/* Array index: 0x1047 */ 0x9B9E,0x6A60,
-	/* Array index: 0x1047 */ 0x9BA6,0x6A61,
-	/* Array index: 0x1047 */ 0x9BA7,0x6A62,
-	/* Array index: 0x1047 */ 0x9BA9,0x6A63,
-	/* Array index: 0x1047 */ 0x9BAC,0x6A64,
-	/* Array index: 0x1047 */ 0x9BB7,0x6A68,
-	/* Array index: 0x1047 */ 0x9BB8,0x6A69,
-	/* Array index: 0x1047 */ 0x9BC7,0x6A6F,
-	/* Array index: 0x1047 */ 0x9BC8,0x6A70,
-	/* Array index: 0x1047 */ 0x9BCE,0x6A71,
-	/* Array index: 0x1047 */ 0x9BD0,0x6A72,
-	/* Array index: 0x1047 */ 0x9BD7,0x6A73,
-	/* Array index: 0x1047 */ 0x9BD8,0x6A74,
-	/* Array index: 0x1047 */ 0x9BDD,0x6A75,
-	/* Array index: 0x1047 */ 0x9BDF,0x6A76,
-	/* Array index: 0x1047 */ 0x9BE5,0x6A77,
-	/* Array index: 0x1047 */ 0x9BE7,0x6A78,
-	/* Array index: 0x1047 */ 0x9BEA,0x6A79,
-	/* Array index: 0x1047 */ 0x9BEB,0x6A7A,
-	/* Array index: 0x1047 */ 0x9BEF,0x6A7B,
-	/* Array index: 0x1047 */ 0x9BF3,0x6A7C,
-	/* Array index: 0x1047 */ 0x9BFD,0x6B23,
-	/* Array index: 0x1047 */ 0x9BFF,0x6B24,
-	/* Array index: 0x1047 */ 0x9C00,0x6B25,
-	/* Array index: 0x1047 */ 0x9C02,0x6B26,
-	/* Array index: 0x1047 */ 0x9C0B,0x6B27,
-	/* Array index: 0x1047 */ 0x9C0F,0x6B28,
-	/* Array index: 0x1047 */ 0x9C11,0x6B29,
-	/* Array index: 0x1047 */ 0x9C31,0x6B37,
-	/* Array index: 0x1047 */ 0x9C3D,0x6B3B,
-	/* Array index: 0x1047 */ 0x9C49,0x6B40,
-	/* Array index: 0x1047 */ 0x9C4A,0x6B41,
-	/* Array index: 0x1047 */ 0x9C63,0x6B4D,
-	/* Array index: 0x1047 */ 0x9C6E,0x6B53,
-	/* Array index: 0x1047 */ 0x9C70,0x6B54,
-	/* Array index: 0x1047 */ 0x9C72,0x6B55,
-	/* Array index: 0x1047 */ 0x9C75,0x6B56,
-	/* Array index: 0x1047 */ 0x9C77,0x6B57,
-	/* Array index: 0x1047 */ 0x9C7B,0x6B58,
-	/* Array index: 0x1047 */ 0x9CE6,0x6B59,
-	/* Array index: 0x1047 */ 0x9CF2,0x6B5A,
-	/* Array index: 0x1047 */ 0x9CF7,0x6B5B,
-	/* Array index: 0x1047 */ 0x9CF9,0x6B5C,
-	/* Array index: 0x1047 */ 0x9D02,0x6B5E,
-	/* Array index: 0x1047 */ 0x9D0B,0x6B5D,
-	/* Array index: 0x1047 */ 0x9D11,0x6B5F,
-	/* Array index: 0x1047 */ 0x9D17,0x6B60,
-	/* Array index: 0x1047 */ 0x9D18,0x6B61,
-	/* Array index: 0x1047 */ 0x9D3A,0x6B6A,
-	/* Array index: 0x1047 */ 0x9D3C,0x6B6B,
-	/* Array index: 0x1047 */ 0x9D3D,0x6B6D,
-	/* Array index: 0x1047 */ 0x9D42,0x6B6E,
-	/* Array index: 0x1047 */ 0x9D43,0x6B6F,
-	/* Array index: 0x1047 */ 0x9D45,0x6B6C,
-	/* Array index: 0x1047 */ 0x9D47,0x6B70,
-	/* Array index: 0x1047 */ 0x9D4A,0x6B71,
-	/* Array index: 0x1047 */ 0x9D53,0x6B72,
-	/* Array index: 0x1047 */ 0x9D54,0x6B73,
-	/* Array index: 0x1047 */ 0x9D5F,0x6B74,
-	/* Array index: 0x1047 */ 0x9D62,0x6B76,
-	/* Array index: 0x1047 */ 0x9D63,0x6B75,
-	/* Array index: 0x1047 */ 0x9D65,0x6B77,
-	/* Array index: 0x1047 */ 0x9D70,0x6B7B,
-	/* Array index: 0x1047 */ 0x9D76,0x6B7C,
-	/* Array index: 0x1047 */ 0x9D77,0x6B7D,
-	/* Array index: 0x1047 */ 0x9D7B,0x6B7E,
-	/* Array index: 0x1047 */ 0x9D7C,0x6C21,
-	/* Array index: 0x1047 */ 0x9D7E,0x6C22,
-	/* Array index: 0x1047 */ 0x9D83,0x6C23,
-	/* Array index: 0x1047 */ 0x9D84,0x6C24,
-	/* Array index: 0x1047 */ 0x9D86,0x6C25,
-	/* Array index: 0x1047 */ 0x9D8A,0x6C26,
-	/* Array index: 0x1047 */ 0x9D8D,0x6C27,
-	/* Array index: 0x1047 */ 0x9D8E,0x6C28,
-	/* Array index: 0x1047 */ 0x9DA1,0x6C2F,
-	/* Array index: 0x1047 */ 0x9DAA,0x6C30,
-	/* Array index: 0x1047 */ 0x9DAC,0x6C31,
-	/* Array index: 0x1047 */ 0x9DAE,0x6C32,
-	/* Array index: 0x1047 */ 0x9DB1,0x6C33,
-	/* Array index: 0x1047 */ 0x9DB5,0x6C34,
-	/* Array index: 0x1047 */ 0x9DB9,0x6C35,
-	/* Array index: 0x1047 */ 0x9DBC,0x6C36,
-	/* Array index: 0x1047 */ 0x9DBF,0x6C37,
-	/* Array index: 0x1047 */ 0x9DC3,0x6C38,
-	/* Array index: 0x1047 */ 0x9DC7,0x6C39,
-	/* Array index: 0x1047 */ 0x9DC9,0x6C3A,
-	/* Array index: 0x1047 */ 0x9DCA,0x6C3B,
-	/* Array index: 0x1047 */ 0x9DDA,0x6C40,
-	/* Array index: 0x1047 */ 0x9DE5,0x6C44,
-	/* Array index: 0x1047 */ 0x9DE7,0x6C45,
-	/* Array index: 0x1047 */ 0x9DE9,0x6C46,
-	/* Array index: 0x1047 */ 0x9DEB,0x6C47,
-	/* Array index: 0x1047 */ 0x9DEE,0x6C48,
-	/* Array index: 0x1047 */ 0x9DF0,0x6C49,
-	/* Array index: 0x1047 */ 0x9DF3,0x6C4A,
-	/* Array index: 0x1047 */ 0x9DF4,0x6C4B,
-	/* Array index: 0x1047 */ 0x9DFE,0x6C4C,
-	/* Array index: 0x1047 */ 0x9E02,0x6C4E,
-	/* Array index: 0x1047 */ 0x9E07,0x6C4F,
-	/* Array index: 0x1047 */ 0x9E0A,0x6C4D,
-	/* Array index: 0x1047 */ 0x9E19,0x6C56,
-	/* Array index: 0x1047 */ 0x9E1C,0x6C57,
-	/* Array index: 0x1047 */ 0x9E1D,0x6C58,
-	/* Array index: 0x1047 */ 0x9E8E,0x6C62,
-	/* Array index: 0x1047 */ 0x9E8F,0x6C63,
-	/* Array index: 0x1047 */ 0x9E96,0x6C64,
-	/* Array index: 0x1047 */ 0x9E98,0x6C65,
-	/* Array index: 0x1047 */ 0x9E9B,0x6C66,
-	/* Array index: 0x1047 */ 0x9E9E,0x6C67,
-	/* Array index: 0x1047 */ 0x9EA4,0x6C68,
-	/* Array index: 0x1047 */ 0x9EA8,0x6C69,
-	/* Array index: 0x1047 */ 0x9EC6,0x6C71,
-	/* Array index: 0x1047 */ 0x9EC8,0x6C72,
-	/* Array index: 0x1047 */ 0x9ECB,0x6C73,
-	/* Array index: 0x1047 */ 0x9ED5,0x6C74,
-	/* Array index: 0x1047 */ 0x9EDF,0x6C75,
-	/* Array index: 0x1047 */ 0x9EE4,0x6C76,
-	/* Array index: 0x1047 */ 0x9EE7,0x6C77,
-	/* Array index: 0x1047 */ 0x9EF5,0x6C7E,
-	/* Array index: 0x1047 */ 0x9EF8,0x6D21,
-	/* Array index: 0x1047 */ 0x9EFF,0x6D22,
-	/* Array index: 0x1047 */ 0x9F02,0x6D23,
-	/* Array index: 0x1047 */ 0x9F03,0x6D24,
-	/* Array index: 0x1047 */ 0x9F09,0x6D25,
-	/* Array index: 0x1047 */ 0x9F1F,0x6D30,
-	/* Array index: 0x1047 */ 0x9F22,0x6D31,
-	/* Array index: 0x1047 */ 0x9F26,0x6D32,
-	/* Array index: 0x1047 */ 0x9F2A,0x6D33,
-	/* Array index: 0x1047 */ 0x9F2B,0x6D34,
-	/* Array index: 0x1047 */ 0x9F2F,0x6D35,
-	/* Array index: 0x1047 */ 0x9F31,0x6D36,
-	/* Array index: 0x1047 */ 0x9F32,0x6D37,
-	/* Array index: 0x1047 */ 0x9F34,0x6D38,
-	/* Array index: 0x1047 */ 0x9F37,0x6D39,
-	/* Array index: 0x1047 */ 0x9F68,0x6D4D,
-	/* Array index: 0x1047 */ 0x9F69,0x6D4E,
-	/* Array index: 0x1047 */ 0x9F7A,0x6D56,
-	/* Array index: 0x1047 */ 0x9F7D,0x6D57,
-	/* Array index: 0x1047 */ 0x9F9E,0x6D5F,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_JIS_X0212_1990 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * jis_x0212_1990 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_jis_x0212_1990 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_JIS_X0212_1990, /* CCS name */
-	TABLE_16BIT, /* Table bits */
-#if defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&from_ucs_size_jis_x0212_1990, /* UCS -> jis_x0212_1990 table size-optimized table */
-#elif defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&from_ucs_speed_jis_x0212_1990, /* UCS -> jis_x0212_1990 table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-#if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&to_ucs_size_jis_x0212_1990 /* jis_x0212_1990 -> UCS table speed-optimized table */
-#elif defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&to_ucs_speed_jis_x0212_1990 /* jis_x0212_1990 -> UCS table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_JIS_X0212_1990) || ... */
-
diff --git a/newlib/libc/iconv/ccs/koi8_r.c b/newlib/libc/iconv/ccs/koi8_r.c
deleted file mode 100644
index cccb7c1..0000000
--- a/newlib/libc/iconv/ccs/koi8_r.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for koi8_r encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_KOI8_R) \
- || defined (ICONV_FROM_UCS_CCS_KOI8_R)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit koi8_r -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_KOI8_R)
-
-static _CONST __uint16_t
-to_ucs_speed_koi8_r[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x2500,0x2502,0x250C,0x2510,0x2514,0x2518,0x251C,0x2524,
-	0x252C,0x2534,0x253C,0x2580,0x2584,0x2588,0x258C,0x2590,
-	0x2591,0x2592,0x2593,0x2320,0x25A0,0x2219,0x221A,0x2248,
-	0x2264,0x2265,0x00A0,0x2321,0x00B0,0x00B2,0x00B7,0x00F7,
-	0x2550,0x2551,0x2552,0x0451,0x2553,0x2554,0x2555,0x2556,
-	0x2557,0x2558,0x2559,0x255A,0x255B,0x255C,0x255D,0x255E,
-	0x255F,0x2560,0x2561,0x0401,0x2562,0x2563,0x2564,0x2565,
-	0x2566,0x2567,0x2568,0x2569,0x256A,0x256B,0x256C,0x00A9,
-	0x044E,0x0430,0x0431,0x0446,0x0434,0x0435,0x0444,0x0433,
-	0x0445,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,
-	0x043F,0x044F,0x0440,0x0441,0x0442,0x0443,0x0436,0x0432,
-	0x044C,0x044B,0x0437,0x0448,0x044D,0x0449,0x0447,0x044A,
-	0x042E,0x0410,0x0411,0x0426,0x0414,0x0415,0x0424,0x0413,
-	0x0425,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,
-	0x041F,0x042F,0x0420,0x0421,0x0422,0x0423,0x0416,0x0412,
-	0x042C,0x042B,0x0417,0x0428,0x042D,0x0429,0x0427,0x042A,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_KOI8_R */
-
-/*
- * 8-bit UCS -> koi8_r speed-optimized table (1794 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_KOI8_R)
-
-static _CONST unsigned char
-from_ucs_speed_koi8_r[] =
-{
-	W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0302),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(0x0402),W(0x0502),
-	W(INVBLK),W(0x0602),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x9A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xBF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x9C,0xFF,0x9D,0xFF,0xFF,0xFF,0xFF,0x9E,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x9F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 5, Array index 0x0302 */
-	0xFF,0xB3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xE1,0xE2,0xF7,0xE7,0xE4,0xE5,0xF6,0xFA,
-	0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,
-	0xF2,0xF3,0xF4,0xF5,0xE6,0xE8,0xE3,0xFE,
-	0xFB,0xFD,0xFF,0xF9,0xF8,0xFC,0xE0,0xF1,
-	0xC1,0xC2,0xD7,0xC7,0xC4,0xC5,0xD6,0xDA,
-	0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,
-	0xD2,0xD3,0xD4,0xD5,0xC6,0xC8,0xC3,0xDE,
-	0xDB,0xDD,0xDF,0xD9,0xD8,0xDC,0xC0,0xD1,
-	0xFF,0xA3,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 35, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x95,0x96,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x97,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x98,0x99,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 36, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x93,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 38, Array index 0x0602 */
-	0x80,0xFF,0x81,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x82,0xFF,0xFF,0xFF,
-	0x83,0xFF,0xFF,0xFF,0x84,0xFF,0xFF,0xFF,
-	0x85,0xFF,0xFF,0xFF,0x86,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x87,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x88,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x89,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x8A,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA0,0xA1,0xA2,0xA4,0xA5,0xA6,0xA7,0xA8,
-	0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,
-	0xB1,0xB2,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,
-	0xBA,0xBB,0xBC,0xBD,0xBE,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x8B,0xFF,0xFF,0xFF,0x8C,0xFF,0xFF,0xFF,
-	0x8D,0xFF,0xFF,0xFF,0x8E,0xFF,0xFF,0xFF,
-	0x8F,0x90,0x91,0x92,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x94,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_KOI8_R */
-
-/*
- * koi8_r CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_koi8_r =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_KOI8_R, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_KOI8_R)
-	(__uint16_t *)&from_ucs_speed_koi8_r, /* UCS -> koi8_r table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_KOI8_R)
-	(__uint16_t *)&to_ucs_speed_koi8_r /* koi8_r -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_KOI8_R) || ... */
-
diff --git a/newlib/libc/iconv/ccs/koi8_ru.c b/newlib/libc/iconv/ccs/koi8_ru.c
deleted file mode 100644
index 704ce95..0000000
--- a/newlib/libc/iconv/ccs/koi8_ru.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for koi8_ru encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_KOI8_RU) \
- || defined (ICONV_FROM_UCS_CCS_KOI8_RU)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit koi8_ru -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_KOI8_RU)
-
-static _CONST __uint16_t
-to_ucs_speed_koi8_ru[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x2500,0x2502,0x250C,0x2510,0x2514,0x2518,0x251C,0x2524,
-	0x252C,0x2534,0x253C,0x2580,0x2584,0x2588,0x258C,0x2590,
-	0x2591,0x2592,0x2593,0x201C,0x25A0,0x2219,0x201D,0x2014,
-	0x2116,0x2122,0x00A0,0x00BB,0x00AE,0x00AB,0x00B7,0x00A4,
-	0x2550,0x2551,0x2552,0x0451,0x0454,0x2554,0x0456,0x0457,
-	0x2557,0x2558,0x2559,0x255A,0x255B,0x0491,0x045E,0x255E,
-	0x255F,0x2560,0x2561,0x0401,0x0404,0x2563,0x0406,0x0407,
-	0x2566,0x2567,0x2568,0x2569,0x256A,0x0490,0x040E,0x00A9,
-	0x044E,0x0430,0x0431,0x0446,0x0434,0x0435,0x0444,0x0433,
-	0x0445,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,
-	0x043F,0x044F,0x0440,0x0441,0x0442,0x0443,0x0436,0x0432,
-	0x044C,0x044B,0x0437,0x0448,0x044D,0x0449,0x0447,0x044A,
-	0x042E,0x0410,0x0411,0x0426,0x0414,0x0415,0x0424,0x0413,
-	0x0425,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,
-	0x041F,0x042F,0x0420,0x0421,0x0422,0x0423,0x0416,0x0412,
-	0x042C,0x042B,0x0417,0x0428,0x042D,0x0429,0x0427,0x042A,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_KOI8_RU */
-
-/*
- * 8-bit UCS -> koi8_ru speed-optimized table (2050 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_KOI8_RU)
-
-static _CONST unsigned char
-from_ucs_speed_koi8_ru[] =
-{
-	W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0302),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0402),W(0x0502),W(0x0602),W(INVBLK),
-	W(INVBLK),W(0x0702),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x9A,0xFF,0xFF,0xFF,0x9F,0xFF,0xFF,0xFF,
-	0xFF,0xBF,0xFF,0x9D,0xFF,0xFF,0x9C,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x9E,
-	0xFF,0xFF,0xFF,0x9B,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 5, Array index 0x0302 */
-	0xFF,0xB3,0xFF,0xFF,0xB4,0xFF,0xB6,0xB7,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xBE,0xFF,
-	0xE1,0xE2,0xF7,0xE7,0xE4,0xE5,0xF6,0xFA,
-	0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,
-	0xF2,0xF3,0xF4,0xF5,0xE6,0xE8,0xE3,0xFE,
-	0xFB,0xFD,0xFF,0xF9,0xF8,0xFC,0xE0,0xF1,
-	0xC1,0xC2,0xD7,0xC7,0xC4,0xC5,0xD6,0xDA,
-	0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,
-	0xD2,0xD3,0xD4,0xD5,0xC6,0xC8,0xC3,0xDE,
-	0xDB,0xDD,0xDF,0xD9,0xD8,0xDC,0xC0,0xD1,
-	0xFF,0xA3,0xFF,0xFF,0xA4,0xFF,0xA6,0xA7,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xBD,0xAD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x97,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x93,0x96,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x98,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x99,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 35, Array index 0x0602 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x95,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 38, Array index 0x0702 */
-	0x80,0xFF,0x81,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x82,0xFF,0xFF,0xFF,
-	0x83,0xFF,0xFF,0xFF,0x84,0xFF,0xFF,0xFF,
-	0x85,0xFF,0xFF,0xFF,0x86,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x87,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x88,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x89,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x8A,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA0,0xA1,0xA2,0xFF,0xA5,0xFF,0xFF,0xA8,
-	0xA9,0xAA,0xAB,0xAC,0xFF,0xFF,0xAF,0xB0,
-	0xB1,0xB2,0xFF,0xB5,0xFF,0xFF,0xB8,0xB9,
-	0xBA,0xBB,0xBC,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x8B,0xFF,0xFF,0xFF,0x8C,0xFF,0xFF,0xFF,
-	0x8D,0xFF,0xFF,0xFF,0x8E,0xFF,0xFF,0xFF,
-	0x8F,0x90,0x91,0x92,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x94,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_KOI8_RU */
-
-/*
- * koi8_ru CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_koi8_ru =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_KOI8_RU, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_KOI8_RU)
-	(__uint16_t *)&from_ucs_speed_koi8_ru, /* UCS -> koi8_ru table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_KOI8_RU)
-	(__uint16_t *)&to_ucs_speed_koi8_ru /* koi8_ru -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_KOI8_RU) || ... */
-
diff --git a/newlib/libc/iconv/ccs/koi8_u.c b/newlib/libc/iconv/ccs/koi8_u.c
deleted file mode 100644
index ebe0c91..0000000
--- a/newlib/libc/iconv/ccs/koi8_u.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for koi8_u encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_KOI8_U) \
- || defined (ICONV_FROM_UCS_CCS_KOI8_U)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit koi8_u -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_KOI8_U)
-
-static _CONST __uint16_t
-to_ucs_speed_koi8_u[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x2500,0x2502,0x250C,0x2510,0x2514,0x2518,0x251C,0x2524,
-	0x252C,0x2534,0x253C,0x2580,0x2584,0x2588,0x258C,0x2590,
-	0x2591,0x2592,0x2593,0x2320,0x25A0,0x2219,0x221A,0x2248,
-	0x2264,0x2265,0x00A0,0x2321,0x00B0,0x00B2,0x00B7,0x00F7,
-	0x2550,0x2551,0x2552,0x0451,0x0454,0x2554,0x0456,0x0457,
-	0x2557,0x2558,0x2559,0x255A,0x255B,0x0491,0x255D,0x255E,
-	0x255F,0x2560,0x2561,0x0401,0x0404,0x2563,0x0406,0x0407,
-	0x2566,0x2567,0x2568,0x2569,0x256A,0x0490,0x256C,0x00A9,
-	0x044E,0x0430,0x0431,0x0446,0x0434,0x0435,0x0444,0x0433,
-	0x0445,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,
-	0x043F,0x044F,0x0440,0x0441,0x0442,0x0443,0x0436,0x0432,
-	0x044C,0x044B,0x0437,0x0448,0x044D,0x0449,0x0447,0x044A,
-	0x042E,0x0410,0x0411,0x0426,0x0414,0x0415,0x0424,0x0413,
-	0x0425,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,
-	0x041F,0x042F,0x0420,0x0421,0x0422,0x0423,0x0416,0x0412,
-	0x042C,0x042B,0x0417,0x0428,0x042D,0x0429,0x0427,0x042A,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_KOI8_U */
-
-/*
- * 8-bit UCS -> koi8_u speed-optimized table (1794 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_KOI8_U)
-
-static _CONST unsigned char
-from_ucs_speed_koi8_u[] =
-{
-	W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0302),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(0x0402),W(0x0502),
-	W(INVBLK),W(0x0602),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x9A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xBF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x9C,0xFF,0x9D,0xFF,0xFF,0xFF,0xFF,0x9E,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x9F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 5, Array index 0x0302 */
-	0xFF,0xB3,0xFF,0xFF,0xB4,0xFF,0xB6,0xB7,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xE1,0xE2,0xF7,0xE7,0xE4,0xE5,0xF6,0xFA,
-	0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,
-	0xF2,0xF3,0xF4,0xF5,0xE6,0xE8,0xE3,0xFE,
-	0xFB,0xFD,0xFF,0xF9,0xF8,0xFC,0xE0,0xF1,
-	0xC1,0xC2,0xD7,0xC7,0xC4,0xC5,0xD6,0xDA,
-	0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,
-	0xD2,0xD3,0xD4,0xD5,0xC6,0xC8,0xC3,0xDE,
-	0xDB,0xDD,0xDF,0xD9,0xD8,0xDC,0xC0,0xD1,
-	0xFF,0xA3,0xFF,0xFF,0xA4,0xFF,0xA6,0xA7,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xBD,0xAD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 35, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x95,0x96,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x97,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x98,0x99,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 36, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x93,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 38, Array index 0x0602 */
-	0x80,0xFF,0x81,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x82,0xFF,0xFF,0xFF,
-	0x83,0xFF,0xFF,0xFF,0x84,0xFF,0xFF,0xFF,
-	0x85,0xFF,0xFF,0xFF,0x86,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x87,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x88,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x89,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x8A,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA0,0xA1,0xA2,0xFF,0xA5,0xFF,0xFF,0xA8,
-	0xA9,0xAA,0xAB,0xAC,0xFF,0xAE,0xAF,0xB0,
-	0xB1,0xB2,0xFF,0xB5,0xFF,0xFF,0xB8,0xB9,
-	0xBA,0xBB,0xBC,0xFF,0xBE,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x8B,0xFF,0xFF,0xFF,0x8C,0xFF,0xFF,0xFF,
-	0x8D,0xFF,0xFF,0xFF,0x8E,0xFF,0xFF,0xFF,
-	0x8F,0x90,0x91,0x92,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x94,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_KOI8_U */
-
-/*
- * koi8_u CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_koi8_u =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_KOI8_U, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_KOI8_U)
-	(__uint16_t *)&from_ucs_speed_koi8_u, /* UCS -> koi8_u table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_KOI8_U)
-	(__uint16_t *)&to_ucs_speed_koi8_u /* koi8_u -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_KOI8_U) || ... */
-
diff --git a/newlib/libc/iconv/ccs/koi8_uni.c b/newlib/libc/iconv/ccs/koi8_uni.c
deleted file mode 100644
index 5596c2d..0000000
--- a/newlib/libc/iconv/ccs/koi8_uni.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for koi8_uni encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_KOI8_UNI) \
- || defined (ICONV_FROM_UCS_CCS_KOI8_UNI)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit koi8_uni -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_KOI8_UNI)
-
-static _CONST __uint16_t
-to_ucs_speed_koi8_uni[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x2500,0x2502,0x250C,0x2510,0x2514,0x2518,0x251C,0x2524,
-	0x252C,0x2534,0x253C,0x2580,0x2584,0x2588,0x258C,0x2590,
-	0x2591,0x2018,0x2019,0x201C,0x201D,0x2219,0x2013,0x2014,
-	0x00A9,0x2122,0x00A0,0x00BB,0x00AE,0x00AB,0x00B7,0x00A4,
-	0x00A0,0x0452,0x0453,0x0451,0x0454,0x0455,0x0456,0x0457,
-	0x0458,0x0459,0x045A,0x045B,0x045C,0x0491,0x045E,0x045F,
-	0x2116,0x0402,0x0403,0x0401,0x0404,0x0405,0x0406,0x0407,
-	0x0408,0x0409,0x040A,0x040B,0x040C,0x0490,0x040E,0x040F,
-	0x044E,0x0430,0x0431,0x0446,0x0434,0x0435,0x0444,0x0433,
-	0x0445,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,
-	0x043F,0x044F,0x0440,0x0441,0x0442,0x0443,0x0436,0x0432,
-	0x044C,0x044B,0x0437,0x0448,0x044D,0x0449,0x0447,0x044A,
-	0x042E,0x0410,0x0411,0x0426,0x0414,0x0415,0x0424,0x0413,
-	0x0425,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,
-	0x041F,0x042F,0x0420,0x0421,0x0422,0x0423,0x0416,0x0412,
-	0x042C,0x042B,0x0417,0x0428,0x042D,0x0429,0x0427,0x042A,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_KOI8_UNI */
-
-/*
- * 8-bit UCS -> koi8_uni speed-optimized table (2050 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_KOI8_UNI)
-
-static _CONST unsigned char
-from_ucs_speed_koi8_uni[] =
-{
-	W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0302),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0402),W(0x0502),W(0x0602),W(INVBLK),
-	W(INVBLK),W(0x0702),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x9A,0xFF,0xFF,0xFF,0x9F,0xFF,0xFF,0xFF,
-	0xFF,0x98,0xFF,0x9D,0xFF,0xFF,0x9C,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x9E,
-	0xFF,0xFF,0xFF,0x9B,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 5, Array index 0x0302 */
-	0xFF,0xB3,0xB1,0xB2,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xBA,0xBB,0xBC,0xFF,0xBE,0xBF,
-	0xE1,0xE2,0xF7,0xE7,0xE4,0xE5,0xF6,0xFA,
-	0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,
-	0xF2,0xF3,0xF4,0xF5,0xE6,0xE8,0xE3,0xFE,
-	0xFB,0xFD,0xFF,0xF9,0xF8,0xFC,0xE0,0xF1,
-	0xC1,0xC2,0xD7,0xC7,0xC4,0xC5,0xD6,0xDA,
-	0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,
-	0xD2,0xD3,0xD4,0xD5,0xC6,0xC8,0xC3,0xDE,
-	0xDB,0xDD,0xDF,0xD9,0xD8,0xDC,0xC0,0xD1,
-	0xFF,0xA3,0xA1,0xA2,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xAA,0xAB,0xAC,0xFF,0xAE,0xAF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xBD,0xAD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0x96,0x97,0xFF,0xFF,0xFF,
-	0x91,0x92,0xFF,0xFF,0x93,0x94,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB0,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x99,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 35, Array index 0x0602 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x95,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 38, Array index 0x0702 */
-	0x80,0xFF,0x81,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x82,0xFF,0xFF,0xFF,
-	0x83,0xFF,0xFF,0xFF,0x84,0xFF,0xFF,0xFF,
-	0x85,0xFF,0xFF,0xFF,0x86,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x87,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x88,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x89,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x8A,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x8B,0xFF,0xFF,0xFF,0x8C,0xFF,0xFF,0xFF,
-	0x8D,0xFF,0xFF,0xFF,0x8E,0xFF,0xFF,0xFF,
-	0x8F,0x90,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_KOI8_UNI */
-
-/*
- * koi8_uni CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_koi8_uni =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_KOI8_UNI, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_KOI8_UNI)
-	(__uint16_t *)&from_ucs_speed_koi8_uni, /* UCS -> koi8_uni table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_KOI8_UNI)
-	(__uint16_t *)&to_ucs_speed_koi8_uni /* koi8_uni -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_KOI8_UNI) || ... */
-
diff --git a/newlib/libc/iconv/ccs/ksx1001.c b/newlib/libc/iconv/ccs/ksx1001.c
deleted file mode 100644
index ad2c30d..0000000
--- a/newlib/libc/iconv/ccs/ksx1001.c
+++ /dev/null
@@ -1,15612 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for ksx1001 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_KSX1001) \
- || defined (ICONV_FROM_UCS_CCS_KSX1001)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-/*
- * 16-bit ksx1001 -> UCS speed-optimized table (46080 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_KSX1001) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_speed_ksx1001[] =
-{
-	/* Heading Block */
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,0x0100,0x0200,0x0300,0x0400,0x0500,0x0600,0x0700,
-	0x0800,0x0900,0x0A00,0x0B00,0x0C00,INVBLK,INVBLK,INVBLK,
-	0x0D00,0x0E00,0x0F00,0x1000,0x1100,0x1200,0x1300,0x1400,
-	0x1500,0x1600,0x1700,0x1800,0x1900,0x1A00,0x1B00,0x1C00,
-	0x1D00,0x1E00,0x1F00,0x2000,0x2100,0x2200,0x2300,0x2400,
-	0x2500,INVBLK,0x2600,0x2700,0x2800,0x2900,0x2A00,0x2B00,
-	0x2C00,0x2D00,0x2E00,0x2F00,0x3000,0x3100,0x3200,0x3300,
-	0x3400,0x3500,0x3600,0x3700,0x3800,0x3900,0x3A00,0x3B00,
-	0x3C00,0x3D00,0x3E00,0x3F00,0x4000,0x4100,0x4200,0x4300,
-	0x4400,0x4500,0x4600,0x4700,0x4800,0x4900,0x4A00,0x4B00,
-	0x4C00,0x4D00,0x4E00,0x4F00,0x5000,0x5100,0x5200,0x5300,
-	0x5400,0x5500,0x5600,0x5700,0x5800,0x5900,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	/* Block 34, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3000,0x3001,0x3002,0x00B7,0x2025,0x2026,0x00A8,
-	0x3003,0x00AD,0x2015,0x2225,0xFF3C,0x223C,0x2018,0x2019,
-	0x201C,0x201D,0x3014,0x3015,0x3008,0x3009,0x300A,0x300B,
-	0x300C,0x300D,0x300E,0x300F,0x3010,0x3011,0x00B1,0x00D7,
-	0x00F7,0x2260,0x2264,0x2265,0x221E,0x2234,0x00B0,0x2032,
-	0x2033,0x2103,0x212B,0xFFE0,0xFFE1,0xFFE5,0x2642,0x2640,
-	0x2220,0x22A5,0x2312,0x2202,0x2207,0x2261,0x2252,0x00A7,
-	0x203B,0x2606,0x2605,0x25CB,0x25CF,0x25CE,0x25C7,0x25C6,
-	0x25A1,0x25A0,0x25B3,0x25B2,0x25BD,0x25BC,0x2192,0x2190,
-	0x2191,0x2193,0x2194,0x3013,0x226A,0x226B,0x221A,0x223D,
-	0x221D,0x2235,0x222B,0x222C,0x2208,0x220B,0x2286,0x2287,
-	0x2282,0x2283,0x222A,0x2229,0x2227,0x2228,0xFFE2,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 35, Array index 0x0200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x21D2,0x21D4,0x2200,0x2203,0x00B4,0xFF5E,0x02C7,
-	0x02D8,0x02DD,0x02DA,0x02D9,0x00B8,0x02DB,0x00A1,0x00BF,
-	0x02D0,0x222E,0x2211,0x220F,0x00A4,0x2109,0x2030,0x25C1,
-	0x25C0,0x25B7,0x25B6,0x2664,0x2660,0x2661,0x2665,0x2667,
-	0x2663,0x2299,0x25C8,0x25A3,0x25D0,0x25D1,0x2592,0x25A4,
-	0x25A5,0x25A8,0x25A7,0x25A6,0x25A9,0x2668,0x260F,0x260E,
-	0x261C,0x261E,0x00B6,0x2020,0x2021,0x2195,0x2197,0x2199,
-	0x2196,0x2198,0x266D,0x2669,0x266A,0x266C,0x327F,0x321C,
-	0x2116,0x33C7,0x2122,0x33C2,0x33D8,0x2121,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 36, Array index 0x0300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xFF01,0xFF02,0xFF03,0xFF04,0xFF05,0xFF06,0xFF07,
-	0xFF08,0xFF09,0xFF0A,0xFF0B,0xFF0C,0xFF0D,0xFF0E,0xFF0F,
-	0xFF10,0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17,
-	0xFF18,0xFF19,0xFF1A,0xFF1B,0xFF1C,0xFF1D,0xFF1E,0xFF1F,
-	0xFF20,0xFF21,0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27,
-	0xFF28,0xFF29,0xFF2A,0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,
-	0xFF30,0xFF31,0xFF32,0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,
-	0xFF38,0xFF39,0xFF3A,0xFF3B,0xFFE6,0xFF3D,0xFF3E,0xFF3F,
-	0xFF40,0xFF41,0xFF42,0xFF43,0xFF44,0xFF45,0xFF46,0xFF47,
-	0xFF48,0xFF49,0xFF4A,0xFF4B,0xFF4C,0xFF4D,0xFF4E,0xFF4F,
-	0xFF50,0xFF51,0xFF52,0xFF53,0xFF54,0xFF55,0xFF56,0xFF57,
-	0xFF58,0xFF59,0xFF5A,0xFF5B,0xFF5C,0xFF5D,0xFFE3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 37, Array index 0x0400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3131,0x3132,0x3133,0x3134,0x3135,0x3136,0x3137,
-	0x3138,0x3139,0x313A,0x313B,0x313C,0x313D,0x313E,0x313F,
-	0x3140,0x3141,0x3142,0x3143,0x3144,0x3145,0x3146,0x3147,
-	0x3148,0x3149,0x314A,0x314B,0x314C,0x314D,0x314E,0x314F,
-	0x3150,0x3151,0x3152,0x3153,0x3154,0x3155,0x3156,0x3157,
-	0x3158,0x3159,0x315A,0x315B,0x315C,0x315D,0x315E,0x315F,
-	0x3160,0x3161,0x3162,0x3163,0x3164,0x3165,0x3166,0x3167,
-	0x3168,0x3169,0x316A,0x316B,0x316C,0x316D,0x316E,0x316F,
-	0x3170,0x3171,0x3172,0x3173,0x3174,0x3175,0x3176,0x3177,
-	0x3178,0x3179,0x317A,0x317B,0x317C,0x317D,0x317E,0x317F,
-	0x3180,0x3181,0x3182,0x3183,0x3184,0x3185,0x3186,0x3187,
-	0x3188,0x3189,0x318A,0x318B,0x318C,0x318D,0x318E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 38, Array index 0x0500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2170,0x2171,0x2172,0x2173,0x2174,0x2175,0x2176,
-	0x2177,0x2178,0x2179,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2160,0x2161,0x2162,0x2163,0x2164,0x2165,0x2166,0x2167,
-	0x2168,0x2169,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,
-	0x0398,0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F,
-	0x03A0,0x03A1,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,
-	0x03A9,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x03B1,0x03B2,0x03B3,0x03B4,0x03B5,0x03B6,0x03B7,
-	0x03B8,0x03B9,0x03BA,0x03BB,0x03BC,0x03BD,0x03BE,0x03BF,
-	0x03C0,0x03C1,0x03C3,0x03C4,0x03C5,0x03C6,0x03C7,0x03C8,
-	0x03C9,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 39, Array index 0x0600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2500,0x2502,0x250C,0x2510,0x2518,0x2514,0x251C,
-	0x252C,0x2524,0x2534,0x253C,0x2501,0x2503,0x250F,0x2513,
-	0x251B,0x2517,0x2523,0x2533,0x252B,0x253B,0x254B,0x2520,
-	0x252F,0x2528,0x2537,0x253F,0x251D,0x2530,0x2525,0x2538,
-	0x2542,0x2512,0x2511,0x251A,0x2519,0x2516,0x2515,0x250E,
-	0x250D,0x251E,0x251F,0x2521,0x2522,0x2526,0x2527,0x2529,
-	0x252A,0x252D,0x252E,0x2531,0x2532,0x2535,0x2536,0x2539,
-	0x253A,0x253D,0x253E,0x2540,0x2541,0x2543,0x2544,0x2545,
-	0x2546,0x2547,0x2548,0x2549,0x254A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 40, Array index 0x0700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3395,0x3396,0x3397,0x2113,0x3398,0x33C4,0x33A3,
-	0x33A4,0x33A5,0x33A6,0x3399,0x339A,0x339B,0x339C,0x339D,
-	0x339E,0x339F,0x33A0,0x33A1,0x33A2,0x33CA,0x338D,0x338E,
-	0x338F,0x33CF,0x3388,0x3389,0x33C8,0x33A7,0x33A8,0x33B0,
-	0x33B1,0x33B2,0x33B3,0x33B4,0x33B5,0x33B6,0x33B7,0x33B8,
-	0x33B9,0x3380,0x3381,0x3382,0x3383,0x3384,0x33BA,0x33BB,
-	0x33BC,0x33BD,0x33BE,0x33BF,0x3390,0x3391,0x3392,0x3393,
-	0x3394,0x2126,0x33C0,0x33C1,0x338A,0x338B,0x338C,0x33D6,
-	0x33C5,0x33AD,0x33AE,0x33AF,0x33DB,0x33A9,0x33AA,0x33AB,
-	0x33AC,0x33DD,0x33D0,0x33D3,0x33C3,0x33C9,0x33DC,0x33C6,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 41, Array index 0x0800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x00C6,0x00D0,0x00AA,0x0126,INVALC,0x0132,INVALC,
-	0x013F,0x0141,0x00D8,0x0152,0x00BA,0x00DE,0x0166,0x014A,
-	INVALC,0x3260,0x3261,0x3262,0x3263,0x3264,0x3265,0x3266,
-	0x3267,0x3268,0x3269,0x326A,0x326B,0x326C,0x326D,0x326E,
-	0x326F,0x3270,0x3271,0x3272,0x3273,0x3274,0x3275,0x3276,
-	0x3277,0x3278,0x3279,0x327A,0x327B,0x24D0,0x24D1,0x24D2,
-	0x24D3,0x24D4,0x24D5,0x24D6,0x24D7,0x24D8,0x24D9,0x24DA,
-	0x24DB,0x24DC,0x24DD,0x24DE,0x24DF,0x24E0,0x24E1,0x24E2,
-	0x24E3,0x24E4,0x24E5,0x24E6,0x24E7,0x24E8,0x24E9,0x2460,
-	0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467,0x2468,
-	0x2469,0x246A,0x246B,0x246C,0x246D,0x246E,0x00BD,0x2153,
-	0x2154,0x00BC,0x00BE,0x215B,0x215C,0x215D,0x215E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 42, Array index 0x0900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x00E6,0x0111,0x00F0,0x0127,0x0131,0x0133,0x0138,
-	0x0140,0x0142,0x00F8,0x0153,0x00DF,0x00FE,0x0167,0x014B,
-	0x0149,0x3200,0x3201,0x3202,0x3203,0x3204,0x3205,0x3206,
-	0x3207,0x3208,0x3209,0x320A,0x320B,0x320C,0x320D,0x320E,
-	0x320F,0x3210,0x3211,0x3212,0x3213,0x3214,0x3215,0x3216,
-	0x3217,0x3218,0x3219,0x321A,0x321B,0x249C,0x249D,0x249E,
-	0x249F,0x24A0,0x24A1,0x24A2,0x24A3,0x24A4,0x24A5,0x24A6,
-	0x24A7,0x24A8,0x24A9,0x24AA,0x24AB,0x24AC,0x24AD,0x24AE,
-	0x24AF,0x24B0,0x24B1,0x24B2,0x24B3,0x24B4,0x24B5,0x2474,
-	0x2475,0x2476,0x2477,0x2478,0x2479,0x247A,0x247B,0x247C,
-	0x247D,0x247E,0x247F,0x2480,0x2481,0x2482,0x00B9,0x00B2,
-	0x00B3,0x2074,0x207F,0x2081,0x2082,0x2083,0x2084,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 43, Array index 0x0A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3041,0x3042,0x3043,0x3044,0x3045,0x3046,0x3047,
-	0x3048,0x3049,0x304A,0x304B,0x304C,0x304D,0x304E,0x304F,
-	0x3050,0x3051,0x3052,0x3053,0x3054,0x3055,0x3056,0x3057,
-	0x3058,0x3059,0x305A,0x305B,0x305C,0x305D,0x305E,0x305F,
-	0x3060,0x3061,0x3062,0x3063,0x3064,0x3065,0x3066,0x3067,
-	0x3068,0x3069,0x306A,0x306B,0x306C,0x306D,0x306E,0x306F,
-	0x3070,0x3071,0x3072,0x3073,0x3074,0x3075,0x3076,0x3077,
-	0x3078,0x3079,0x307A,0x307B,0x307C,0x307D,0x307E,0x307F,
-	0x3080,0x3081,0x3082,0x3083,0x3084,0x3085,0x3086,0x3087,
-	0x3088,0x3089,0x308A,0x308B,0x308C,0x308D,0x308E,0x308F,
-	0x3090,0x3091,0x3092,0x3093,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 44, Array index 0x0B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x30A1,0x30A2,0x30A3,0x30A4,0x30A5,0x30A6,0x30A7,
-	0x30A8,0x30A9,0x30AA,0x30AB,0x30AC,0x30AD,0x30AE,0x30AF,
-	0x30B0,0x30B1,0x30B2,0x30B3,0x30B4,0x30B5,0x30B6,0x30B7,
-	0x30B8,0x30B9,0x30BA,0x30BB,0x30BC,0x30BD,0x30BE,0x30BF,
-	0x30C0,0x30C1,0x30C2,0x30C3,0x30C4,0x30C5,0x30C6,0x30C7,
-	0x30C8,0x30C9,0x30CA,0x30CB,0x30CC,0x30CD,0x30CE,0x30CF,
-	0x30D0,0x30D1,0x30D2,0x30D3,0x30D4,0x30D5,0x30D6,0x30D7,
-	0x30D8,0x30D9,0x30DA,0x30DB,0x30DC,0x30DD,0x30DE,0x30DF,
-	0x30E0,0x30E1,0x30E2,0x30E3,0x30E4,0x30E5,0x30E6,0x30E7,
-	0x30E8,0x30E9,0x30EA,0x30EB,0x30EC,0x30ED,0x30EE,0x30EF,
-	0x30F0,0x30F1,0x30F2,0x30F3,0x30F4,0x30F5,0x30F6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 45, Array index 0x0C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0401,
-	0x0416,0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,
-	0x041E,0x041F,0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,
-	0x0426,0x0427,0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,
-	0x042E,0x042F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0451,
-	0x0436,0x0437,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,
-	0x043E,0x043F,0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,
-	0x0446,0x0447,0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,
-	0x044E,0x044F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 49, Array index 0x0D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xAC00,0xAC01,0xAC04,0xAC07,0xAC08,0xAC09,0xAC0A,
-	0xAC10,0xAC11,0xAC12,0xAC13,0xAC14,0xAC15,0xAC16,0xAC17,
-	0xAC19,0xAC1A,0xAC1B,0xAC1C,0xAC1D,0xAC20,0xAC24,0xAC2C,
-	0xAC2D,0xAC2F,0xAC30,0xAC31,0xAC38,0xAC39,0xAC3C,0xAC40,
-	0xAC4B,0xAC4D,0xAC54,0xAC58,0xAC5C,0xAC70,0xAC71,0xAC74,
-	0xAC77,0xAC78,0xAC7A,0xAC80,0xAC81,0xAC83,0xAC84,0xAC85,
-	0xAC86,0xAC89,0xAC8A,0xAC8B,0xAC8C,0xAC90,0xAC94,0xAC9C,
-	0xAC9D,0xAC9F,0xACA0,0xACA1,0xACA8,0xACA9,0xACAA,0xACAC,
-	0xACAF,0xACB0,0xACB8,0xACB9,0xACBB,0xACBC,0xACBD,0xACC1,
-	0xACC4,0xACC8,0xACCC,0xACD5,0xACD7,0xACE0,0xACE1,0xACE4,
-	0xACE7,0xACE8,0xACEA,0xACEC,0xACEF,0xACF0,0xACF1,0xACF3,
-	0xACF5,0xACF6,0xACFC,0xACFD,0xAD00,0xAD04,0xAD06,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 50, Array index 0x0E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xAD0C,0xAD0D,0xAD0F,0xAD11,0xAD18,0xAD1C,0xAD20,
-	0xAD29,0xAD2C,0xAD2D,0xAD34,0xAD35,0xAD38,0xAD3C,0xAD44,
-	0xAD45,0xAD47,0xAD49,0xAD50,0xAD54,0xAD58,0xAD61,0xAD63,
-	0xAD6C,0xAD6D,0xAD70,0xAD73,0xAD74,0xAD75,0xAD76,0xAD7B,
-	0xAD7C,0xAD7D,0xAD7F,0xAD81,0xAD82,0xAD88,0xAD89,0xAD8C,
-	0xAD90,0xAD9C,0xAD9D,0xADA4,0xADB7,0xADC0,0xADC1,0xADC4,
-	0xADC8,0xADD0,0xADD1,0xADD3,0xADDC,0xADE0,0xADE4,0xADF8,
-	0xADF9,0xADFC,0xADFF,0xAE00,0xAE01,0xAE08,0xAE09,0xAE0B,
-	0xAE0D,0xAE14,0xAE30,0xAE31,0xAE34,0xAE37,0xAE38,0xAE3A,
-	0xAE40,0xAE41,0xAE43,0xAE45,0xAE46,0xAE4A,0xAE4C,0xAE4D,
-	0xAE4E,0xAE50,0xAE54,0xAE56,0xAE5C,0xAE5D,0xAE5F,0xAE60,
-	0xAE61,0xAE65,0xAE68,0xAE69,0xAE6C,0xAE70,0xAE78,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 51, Array index 0x0F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xAE79,0xAE7B,0xAE7C,0xAE7D,0xAE84,0xAE85,0xAE8C,
-	0xAEBC,0xAEBD,0xAEBE,0xAEC0,0xAEC4,0xAECC,0xAECD,0xAECF,
-	0xAED0,0xAED1,0xAED8,0xAED9,0xAEDC,0xAEE8,0xAEEB,0xAEED,
-	0xAEF4,0xAEF8,0xAEFC,0xAF07,0xAF08,0xAF0D,0xAF10,0xAF2C,
-	0xAF2D,0xAF30,0xAF32,0xAF34,0xAF3C,0xAF3D,0xAF3F,0xAF41,
-	0xAF42,0xAF43,0xAF48,0xAF49,0xAF50,0xAF5C,0xAF5D,0xAF64,
-	0xAF65,0xAF79,0xAF80,0xAF84,0xAF88,0xAF90,0xAF91,0xAF95,
-	0xAF9C,0xAFB8,0xAFB9,0xAFBC,0xAFC0,0xAFC7,0xAFC8,0xAFC9,
-	0xAFCB,0xAFCD,0xAFCE,0xAFD4,0xAFDC,0xAFE8,0xAFE9,0xAFF0,
-	0xAFF1,0xAFF4,0xAFF8,0xB000,0xB001,0xB004,0xB00C,0xB010,
-	0xB014,0xB01C,0xB01D,0xB028,0xB044,0xB045,0xB048,0xB04A,
-	0xB04C,0xB04E,0xB053,0xB054,0xB055,0xB057,0xB059,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 52, Array index 0x1000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xB05D,0xB07C,0xB07D,0xB080,0xB084,0xB08C,0xB08D,
-	0xB08F,0xB091,0xB098,0xB099,0xB09A,0xB09C,0xB09F,0xB0A0,
-	0xB0A1,0xB0A2,0xB0A8,0xB0A9,0xB0AB,0xB0AC,0xB0AD,0xB0AE,
-	0xB0AF,0xB0B1,0xB0B3,0xB0B4,0xB0B5,0xB0B8,0xB0BC,0xB0C4,
-	0xB0C5,0xB0C7,0xB0C8,0xB0C9,0xB0D0,0xB0D1,0xB0D4,0xB0D8,
-	0xB0E0,0xB0E5,0xB108,0xB109,0xB10B,0xB10C,0xB110,0xB112,
-	0xB113,0xB118,0xB119,0xB11B,0xB11C,0xB11D,0xB123,0xB124,
-	0xB125,0xB128,0xB12C,0xB134,0xB135,0xB137,0xB138,0xB139,
-	0xB140,0xB141,0xB144,0xB148,0xB150,0xB151,0xB154,0xB155,
-	0xB158,0xB15C,0xB160,0xB178,0xB179,0xB17C,0xB180,0xB182,
-	0xB188,0xB189,0xB18B,0xB18D,0xB192,0xB193,0xB194,0xB198,
-	0xB19C,0xB1A8,0xB1CC,0xB1D0,0xB1D4,0xB1DC,0xB1DD,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 53, Array index 0x1100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xB1DF,0xB1E8,0xB1E9,0xB1EC,0xB1F0,0xB1F9,0xB1FB,
-	0xB1FD,0xB204,0xB205,0xB208,0xB20B,0xB20C,0xB214,0xB215,
-	0xB217,0xB219,0xB220,0xB234,0xB23C,0xB258,0xB25C,0xB260,
-	0xB268,0xB269,0xB274,0xB275,0xB27C,0xB284,0xB285,0xB289,
-	0xB290,0xB291,0xB294,0xB298,0xB299,0xB29A,0xB2A0,0xB2A1,
-	0xB2A3,0xB2A5,0xB2A6,0xB2AA,0xB2AC,0xB2B0,0xB2B4,0xB2C8,
-	0xB2C9,0xB2CC,0xB2D0,0xB2D2,0xB2D8,0xB2D9,0xB2DB,0xB2DD,
-	0xB2E2,0xB2E4,0xB2E5,0xB2E6,0xB2E8,0xB2EB,0xB2EC,0xB2ED,
-	0xB2EE,0xB2EF,0xB2F3,0xB2F4,0xB2F5,0xB2F7,0xB2F8,0xB2F9,
-	0xB2FA,0xB2FB,0xB2FF,0xB300,0xB301,0xB304,0xB308,0xB310,
-	0xB311,0xB313,0xB314,0xB315,0xB31C,0xB354,0xB355,0xB356,
-	0xB358,0xB35B,0xB35C,0xB35E,0xB35F,0xB364,0xB365,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 54, Array index 0x1200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xB367,0xB369,0xB36B,0xB36E,0xB370,0xB371,0xB374,
-	0xB378,0xB380,0xB381,0xB383,0xB384,0xB385,0xB38C,0xB390,
-	0xB394,0xB3A0,0xB3A1,0xB3A8,0xB3AC,0xB3C4,0xB3C5,0xB3C8,
-	0xB3CB,0xB3CC,0xB3CE,0xB3D0,0xB3D4,0xB3D5,0xB3D7,0xB3D9,
-	0xB3DB,0xB3DD,0xB3E0,0xB3E4,0xB3E8,0xB3FC,0xB410,0xB418,
-	0xB41C,0xB420,0xB428,0xB429,0xB42B,0xB434,0xB450,0xB451,
-	0xB454,0xB458,0xB460,0xB461,0xB463,0xB465,0xB46C,0xB480,
-	0xB488,0xB49D,0xB4A4,0xB4A8,0xB4AC,0xB4B5,0xB4B7,0xB4B9,
-	0xB4C0,0xB4C4,0xB4C8,0xB4D0,0xB4D5,0xB4DC,0xB4DD,0xB4E0,
-	0xB4E3,0xB4E4,0xB4E6,0xB4EC,0xB4ED,0xB4EF,0xB4F1,0xB4F8,
-	0xB514,0xB515,0xB518,0xB51B,0xB51C,0xB524,0xB525,0xB527,
-	0xB528,0xB529,0xB52A,0xB530,0xB531,0xB534,0xB538,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 55, Array index 0x1300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xB540,0xB541,0xB543,0xB544,0xB545,0xB54B,0xB54C,
-	0xB54D,0xB550,0xB554,0xB55C,0xB55D,0xB55F,0xB560,0xB561,
-	0xB5A0,0xB5A1,0xB5A4,0xB5A8,0xB5AA,0xB5AB,0xB5B0,0xB5B1,
-	0xB5B3,0xB5B4,0xB5B5,0xB5BB,0xB5BC,0xB5BD,0xB5C0,0xB5C4,
-	0xB5CC,0xB5CD,0xB5CF,0xB5D0,0xB5D1,0xB5D8,0xB5EC,0xB610,
-	0xB611,0xB614,0xB618,0xB625,0xB62C,0xB634,0xB648,0xB664,
-	0xB668,0xB69C,0xB69D,0xB6A0,0xB6A4,0xB6AB,0xB6AC,0xB6B1,
-	0xB6D4,0xB6F0,0xB6F4,0xB6F8,0xB700,0xB701,0xB705,0xB728,
-	0xB729,0xB72C,0xB72F,0xB730,0xB738,0xB739,0xB73B,0xB744,
-	0xB748,0xB74C,0xB754,0xB755,0xB760,0xB764,0xB768,0xB770,
-	0xB771,0xB773,0xB775,0xB77C,0xB77D,0xB780,0xB784,0xB78C,
-	0xB78D,0xB78F,0xB790,0xB791,0xB792,0xB796,0xB797,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 56, Array index 0x1400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xB798,0xB799,0xB79C,0xB7A0,0xB7A8,0xB7A9,0xB7AB,
-	0xB7AC,0xB7AD,0xB7B4,0xB7B5,0xB7B8,0xB7C7,0xB7C9,0xB7EC,
-	0xB7ED,0xB7F0,0xB7F4,0xB7FC,0xB7FD,0xB7FF,0xB800,0xB801,
-	0xB807,0xB808,0xB809,0xB80C,0xB810,0xB818,0xB819,0xB81B,
-	0xB81D,0xB824,0xB825,0xB828,0xB82C,0xB834,0xB835,0xB837,
-	0xB838,0xB839,0xB840,0xB844,0xB851,0xB853,0xB85C,0xB85D,
-	0xB860,0xB864,0xB86C,0xB86D,0xB86F,0xB871,0xB878,0xB87C,
-	0xB88D,0xB8A8,0xB8B0,0xB8B4,0xB8B8,0xB8C0,0xB8C1,0xB8C3,
-	0xB8C5,0xB8CC,0xB8D0,0xB8D4,0xB8DD,0xB8DF,0xB8E1,0xB8E8,
-	0xB8E9,0xB8EC,0xB8F0,0xB8F8,0xB8F9,0xB8FB,0xB8FD,0xB904,
-	0xB918,0xB920,0xB93C,0xB93D,0xB940,0xB944,0xB94C,0xB94F,
-	0xB951,0xB958,0xB959,0xB95C,0xB960,0xB968,0xB969,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 57, Array index 0x1500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xB96B,0xB96D,0xB974,0xB975,0xB978,0xB97C,0xB984,
-	0xB985,0xB987,0xB989,0xB98A,0xB98D,0xB98E,0xB9AC,0xB9AD,
-	0xB9B0,0xB9B4,0xB9BC,0xB9BD,0xB9BF,0xB9C1,0xB9C8,0xB9C9,
-	0xB9CC,0xB9CE,0xB9CF,0xB9D0,0xB9D1,0xB9D2,0xB9D8,0xB9D9,
-	0xB9DB,0xB9DD,0xB9DE,0xB9E1,0xB9E3,0xB9E4,0xB9E5,0xB9E8,
-	0xB9EC,0xB9F4,0xB9F5,0xB9F7,0xB9F8,0xB9F9,0xB9FA,0xBA00,
-	0xBA01,0xBA08,0xBA15,0xBA38,0xBA39,0xBA3C,0xBA40,0xBA42,
-	0xBA48,0xBA49,0xBA4B,0xBA4D,0xBA4E,0xBA53,0xBA54,0xBA55,
-	0xBA58,0xBA5C,0xBA64,0xBA65,0xBA67,0xBA68,0xBA69,0xBA70,
-	0xBA71,0xBA74,0xBA78,0xBA83,0xBA84,0xBA85,0xBA87,0xBA8C,
-	0xBAA8,0xBAA9,0xBAAB,0xBAAC,0xBAB0,0xBAB2,0xBAB8,0xBAB9,
-	0xBABB,0xBABD,0xBAC4,0xBAC8,0xBAD8,0xBAD9,0xBAFC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 58, Array index 0x1600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xBB00,0xBB04,0xBB0D,0xBB0F,0xBB11,0xBB18,0xBB1C,
-	0xBB20,0xBB29,0xBB2B,0xBB34,0xBB35,0xBB36,0xBB38,0xBB3B,
-	0xBB3C,0xBB3D,0xBB3E,0xBB44,0xBB45,0xBB47,0xBB49,0xBB4D,
-	0xBB4F,0xBB50,0xBB54,0xBB58,0xBB61,0xBB63,0xBB6C,0xBB88,
-	0xBB8C,0xBB90,0xBBA4,0xBBA8,0xBBAC,0xBBB4,0xBBB7,0xBBC0,
-	0xBBC4,0xBBC8,0xBBD0,0xBBD3,0xBBF8,0xBBF9,0xBBFC,0xBBFF,
-	0xBC00,0xBC02,0xBC08,0xBC09,0xBC0B,0xBC0C,0xBC0D,0xBC0F,
-	0xBC11,0xBC14,0xBC15,0xBC16,0xBC17,0xBC18,0xBC1B,0xBC1C,
-	0xBC1D,0xBC1E,0xBC1F,0xBC24,0xBC25,0xBC27,0xBC29,0xBC2D,
-	0xBC30,0xBC31,0xBC34,0xBC38,0xBC40,0xBC41,0xBC43,0xBC44,
-	0xBC45,0xBC49,0xBC4C,0xBC4D,0xBC50,0xBC5D,0xBC84,0xBC85,
-	0xBC88,0xBC8B,0xBC8C,0xBC8E,0xBC94,0xBC95,0xBC97,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 59, Array index 0x1700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xBC99,0xBC9A,0xBCA0,0xBCA1,0xBCA4,0xBCA7,0xBCA8,
-	0xBCB0,0xBCB1,0xBCB3,0xBCB4,0xBCB5,0xBCBC,0xBCBD,0xBCC0,
-	0xBCC4,0xBCCD,0xBCCF,0xBCD0,0xBCD1,0xBCD5,0xBCD8,0xBCDC,
-	0xBCF4,0xBCF5,0xBCF6,0xBCF8,0xBCFC,0xBD04,0xBD05,0xBD07,
-	0xBD09,0xBD10,0xBD14,0xBD24,0xBD2C,0xBD40,0xBD48,0xBD49,
-	0xBD4C,0xBD50,0xBD58,0xBD59,0xBD64,0xBD68,0xBD80,0xBD81,
-	0xBD84,0xBD87,0xBD88,0xBD89,0xBD8A,0xBD90,0xBD91,0xBD93,
-	0xBD95,0xBD99,0xBD9A,0xBD9C,0xBDA4,0xBDB0,0xBDB8,0xBDD4,
-	0xBDD5,0xBDD8,0xBDDC,0xBDE9,0xBDF0,0xBDF4,0xBDF8,0xBE00,
-	0xBE03,0xBE05,0xBE0C,0xBE0D,0xBE10,0xBE14,0xBE1C,0xBE1D,
-	0xBE1F,0xBE44,0xBE45,0xBE48,0xBE4C,0xBE4E,0xBE54,0xBE55,
-	0xBE57,0xBE59,0xBE5A,0xBE5B,0xBE60,0xBE61,0xBE64,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 60, Array index 0x1800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xBE68,0xBE6A,0xBE70,0xBE71,0xBE73,0xBE74,0xBE75,
-	0xBE7B,0xBE7C,0xBE7D,0xBE80,0xBE84,0xBE8C,0xBE8D,0xBE8F,
-	0xBE90,0xBE91,0xBE98,0xBE99,0xBEA8,0xBED0,0xBED1,0xBED4,
-	0xBED7,0xBED8,0xBEE0,0xBEE3,0xBEE4,0xBEE5,0xBEEC,0xBF01,
-	0xBF08,0xBF09,0xBF18,0xBF19,0xBF1B,0xBF1C,0xBF1D,0xBF40,
-	0xBF41,0xBF44,0xBF48,0xBF50,0xBF51,0xBF55,0xBF94,0xBFB0,
-	0xBFC5,0xBFCC,0xBFCD,0xBFD0,0xBFD4,0xBFDC,0xBFDF,0xBFE1,
-	0xC03C,0xC051,0xC058,0xC05C,0xC060,0xC068,0xC069,0xC090,
-	0xC091,0xC094,0xC098,0xC0A0,0xC0A1,0xC0A3,0xC0A5,0xC0AC,
-	0xC0AD,0xC0AF,0xC0B0,0xC0B3,0xC0B4,0xC0B5,0xC0B6,0xC0BC,
-	0xC0BD,0xC0BF,0xC0C0,0xC0C1,0xC0C5,0xC0C8,0xC0C9,0xC0CC,
-	0xC0D0,0xC0D8,0xC0D9,0xC0DB,0xC0DC,0xC0DD,0xC0E4,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 61, Array index 0x1900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xC0E5,0xC0E8,0xC0EC,0xC0F4,0xC0F5,0xC0F7,0xC0F9,
-	0xC100,0xC104,0xC108,0xC110,0xC115,0xC11C,0xC11D,0xC11E,
-	0xC11F,0xC120,0xC123,0xC124,0xC126,0xC127,0xC12C,0xC12D,
-	0xC12F,0xC130,0xC131,0xC136,0xC138,0xC139,0xC13C,0xC140,
-	0xC148,0xC149,0xC14B,0xC14C,0xC14D,0xC154,0xC155,0xC158,
-	0xC15C,0xC164,0xC165,0xC167,0xC168,0xC169,0xC170,0xC174,
-	0xC178,0xC185,0xC18C,0xC18D,0xC18E,0xC190,0xC194,0xC196,
-	0xC19C,0xC19D,0xC19F,0xC1A1,0xC1A5,0xC1A8,0xC1A9,0xC1AC,
-	0xC1B0,0xC1BD,0xC1C4,0xC1C8,0xC1CC,0xC1D4,0xC1D7,0xC1D8,
-	0xC1E0,0xC1E4,0xC1E8,0xC1F0,0xC1F1,0xC1F3,0xC1FC,0xC1FD,
-	0xC200,0xC204,0xC20C,0xC20D,0xC20F,0xC211,0xC218,0xC219,
-	0xC21C,0xC21F,0xC220,0xC228,0xC229,0xC22B,0xC22D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 62, Array index 0x1A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xC22F,0xC231,0xC232,0xC234,0xC248,0xC250,0xC251,
-	0xC254,0xC258,0xC260,0xC265,0xC26C,0xC26D,0xC270,0xC274,
-	0xC27C,0xC27D,0xC27F,0xC281,0xC288,0xC289,0xC290,0xC298,
-	0xC29B,0xC29D,0xC2A4,0xC2A5,0xC2A8,0xC2AC,0xC2AD,0xC2B4,
-	0xC2B5,0xC2B7,0xC2B9,0xC2DC,0xC2DD,0xC2E0,0xC2E3,0xC2E4,
-	0xC2EB,0xC2EC,0xC2ED,0xC2EF,0xC2F1,0xC2F6,0xC2F8,0xC2F9,
-	0xC2FB,0xC2FC,0xC300,0xC308,0xC309,0xC30C,0xC30D,0xC313,
-	0xC314,0xC315,0xC318,0xC31C,0xC324,0xC325,0xC328,0xC329,
-	0xC345,0xC368,0xC369,0xC36C,0xC370,0xC372,0xC378,0xC379,
-	0xC37C,0xC37D,0xC384,0xC388,0xC38C,0xC3C0,0xC3D8,0xC3D9,
-	0xC3DC,0xC3DF,0xC3E0,0xC3E2,0xC3E8,0xC3E9,0xC3ED,0xC3F4,
-	0xC3F5,0xC3F8,0xC408,0xC410,0xC424,0xC42C,0xC430,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 63, Array index 0x1B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xC434,0xC43C,0xC43D,0xC448,0xC464,0xC465,0xC468,
-	0xC46C,0xC474,0xC475,0xC479,0xC480,0xC494,0xC49C,0xC4B8,
-	0xC4BC,0xC4E9,0xC4F0,0xC4F1,0xC4F4,0xC4F8,0xC4FA,0xC4FF,
-	0xC500,0xC501,0xC50C,0xC510,0xC514,0xC51C,0xC528,0xC529,
-	0xC52C,0xC530,0xC538,0xC539,0xC53B,0xC53D,0xC544,0xC545,
-	0xC548,0xC549,0xC54A,0xC54C,0xC54D,0xC54E,0xC553,0xC554,
-	0xC555,0xC557,0xC558,0xC559,0xC55D,0xC55E,0xC560,0xC561,
-	0xC564,0xC568,0xC570,0xC571,0xC573,0xC574,0xC575,0xC57C,
-	0xC57D,0xC580,0xC584,0xC587,0xC58C,0xC58D,0xC58F,0xC591,
-	0xC595,0xC597,0xC598,0xC59C,0xC5A0,0xC5A9,0xC5B4,0xC5B5,
-	0xC5B8,0xC5B9,0xC5BB,0xC5BC,0xC5BD,0xC5BE,0xC5C4,0xC5C5,
-	0xC5C6,0xC5C7,0xC5C8,0xC5C9,0xC5CA,0xC5CC,0xC5CE,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 64, Array index 0x1C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xC5D0,0xC5D1,0xC5D4,0xC5D8,0xC5E0,0xC5E1,0xC5E3,
-	0xC5E5,0xC5EC,0xC5ED,0xC5EE,0xC5F0,0xC5F4,0xC5F6,0xC5F7,
-	0xC5FC,0xC5FD,0xC5FE,0xC5FF,0xC600,0xC601,0xC605,0xC606,
-	0xC607,0xC608,0xC60C,0xC610,0xC618,0xC619,0xC61B,0xC61C,
-	0xC624,0xC625,0xC628,0xC62C,0xC62D,0xC62E,0xC630,0xC633,
-	0xC634,0xC635,0xC637,0xC639,0xC63B,0xC640,0xC641,0xC644,
-	0xC648,0xC650,0xC651,0xC653,0xC654,0xC655,0xC65C,0xC65D,
-	0xC660,0xC66C,0xC66F,0xC671,0xC678,0xC679,0xC67C,0xC680,
-	0xC688,0xC689,0xC68B,0xC68D,0xC694,0xC695,0xC698,0xC69C,
-	0xC6A4,0xC6A5,0xC6A7,0xC6A9,0xC6B0,0xC6B1,0xC6B4,0xC6B8,
-	0xC6B9,0xC6BA,0xC6C0,0xC6C1,0xC6C3,0xC6C5,0xC6CC,0xC6CD,
-	0xC6D0,0xC6D4,0xC6DC,0xC6DD,0xC6E0,0xC6E1,0xC6E8,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 65, Array index 0x1D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xC6E9,0xC6EC,0xC6F0,0xC6F8,0xC6F9,0xC6FD,0xC704,
-	0xC705,0xC708,0xC70C,0xC714,0xC715,0xC717,0xC719,0xC720,
-	0xC721,0xC724,0xC728,0xC730,0xC731,0xC733,0xC735,0xC737,
-	0xC73C,0xC73D,0xC740,0xC744,0xC74A,0xC74C,0xC74D,0xC74F,
-	0xC751,0xC752,0xC753,0xC754,0xC755,0xC756,0xC757,0xC758,
-	0xC75C,0xC760,0xC768,0xC76B,0xC774,0xC775,0xC778,0xC77C,
-	0xC77D,0xC77E,0xC783,0xC784,0xC785,0xC787,0xC788,0xC789,
-	0xC78A,0xC78E,0xC790,0xC791,0xC794,0xC796,0xC797,0xC798,
-	0xC79A,0xC7A0,0xC7A1,0xC7A3,0xC7A4,0xC7A5,0xC7A6,0xC7AC,
-	0xC7AD,0xC7B0,0xC7B4,0xC7BC,0xC7BD,0xC7BF,0xC7C0,0xC7C1,
-	0xC7C8,0xC7C9,0xC7CC,0xC7CE,0xC7D0,0xC7D8,0xC7DD,0xC7E4,
-	0xC7E8,0xC7EC,0xC800,0xC801,0xC804,0xC808,0xC80A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 66, Array index 0x1E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xC810,0xC811,0xC813,0xC815,0xC816,0xC81C,0xC81D,
-	0xC820,0xC824,0xC82C,0xC82D,0xC82F,0xC831,0xC838,0xC83C,
-	0xC840,0xC848,0xC849,0xC84C,0xC84D,0xC854,0xC870,0xC871,
-	0xC874,0xC878,0xC87A,0xC880,0xC881,0xC883,0xC885,0xC886,
-	0xC887,0xC88B,0xC88C,0xC88D,0xC894,0xC89D,0xC89F,0xC8A1,
-	0xC8A8,0xC8BC,0xC8BD,0xC8C4,0xC8C8,0xC8CC,0xC8D4,0xC8D5,
-	0xC8D7,0xC8D9,0xC8E0,0xC8E1,0xC8E4,0xC8F5,0xC8FC,0xC8FD,
-	0xC900,0xC904,0xC905,0xC906,0xC90C,0xC90D,0xC90F,0xC911,
-	0xC918,0xC92C,0xC934,0xC950,0xC951,0xC954,0xC958,0xC960,
-	0xC961,0xC963,0xC96C,0xC970,0xC974,0xC97C,0xC988,0xC989,
-	0xC98C,0xC990,0xC998,0xC999,0xC99B,0xC99D,0xC9C0,0xC9C1,
-	0xC9C4,0xC9C7,0xC9C8,0xC9CA,0xC9D0,0xC9D1,0xC9D3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 67, Array index 0x1F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xC9D5,0xC9D6,0xC9D9,0xC9DA,0xC9DC,0xC9DD,0xC9E0,
-	0xC9E2,0xC9E4,0xC9E7,0xC9EC,0xC9ED,0xC9EF,0xC9F0,0xC9F1,
-	0xC9F8,0xC9F9,0xC9FC,0xCA00,0xCA08,0xCA09,0xCA0B,0xCA0C,
-	0xCA0D,0xCA14,0xCA18,0xCA29,0xCA4C,0xCA4D,0xCA50,0xCA54,
-	0xCA5C,0xCA5D,0xCA5F,0xCA60,0xCA61,0xCA68,0xCA7D,0xCA84,
-	0xCA98,0xCABC,0xCABD,0xCAC0,0xCAC4,0xCACC,0xCACD,0xCACF,
-	0xCAD1,0xCAD3,0xCAD8,0xCAD9,0xCAE0,0xCAEC,0xCAF4,0xCB08,
-	0xCB10,0xCB14,0xCB18,0xCB20,0xCB21,0xCB41,0xCB48,0xCB49,
-	0xCB4C,0xCB50,0xCB58,0xCB59,0xCB5D,0xCB64,0xCB78,0xCB79,
-	0xCB9C,0xCBB8,0xCBD4,0xCBE4,0xCBE7,0xCBE9,0xCC0C,0xCC0D,
-	0xCC10,0xCC14,0xCC1C,0xCC1D,0xCC21,0xCC22,0xCC27,0xCC28,
-	0xCC29,0xCC2C,0xCC2E,0xCC30,0xCC38,0xCC39,0xCC3B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 68, Array index 0x2000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xCC3C,0xCC3D,0xCC3E,0xCC44,0xCC45,0xCC48,0xCC4C,
-	0xCC54,0xCC55,0xCC57,0xCC58,0xCC59,0xCC60,0xCC64,0xCC66,
-	0xCC68,0xCC70,0xCC75,0xCC98,0xCC99,0xCC9C,0xCCA0,0xCCA8,
-	0xCCA9,0xCCAB,0xCCAC,0xCCAD,0xCCB4,0xCCB5,0xCCB8,0xCCBC,
-	0xCCC4,0xCCC5,0xCCC7,0xCCC9,0xCCD0,0xCCD4,0xCCE4,0xCCEC,
-	0xCCF0,0xCD01,0xCD08,0xCD09,0xCD0C,0xCD10,0xCD18,0xCD19,
-	0xCD1B,0xCD1D,0xCD24,0xCD28,0xCD2C,0xCD39,0xCD5C,0xCD60,
-	0xCD64,0xCD6C,0xCD6D,0xCD6F,0xCD71,0xCD78,0xCD88,0xCD94,
-	0xCD95,0xCD98,0xCD9C,0xCDA4,0xCDA5,0xCDA7,0xCDA9,0xCDB0,
-	0xCDC4,0xCDCC,0xCDD0,0xCDE8,0xCDEC,0xCDF0,0xCDF8,0xCDF9,
-	0xCDFB,0xCDFD,0xCE04,0xCE08,0xCE0C,0xCE14,0xCE19,0xCE20,
-	0xCE21,0xCE24,0xCE28,0xCE30,0xCE31,0xCE33,0xCE35,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 69, Array index 0x2100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xCE58,0xCE59,0xCE5C,0xCE5F,0xCE60,0xCE61,0xCE68,
-	0xCE69,0xCE6B,0xCE6D,0xCE74,0xCE75,0xCE78,0xCE7C,0xCE84,
-	0xCE85,0xCE87,0xCE89,0xCE90,0xCE91,0xCE94,0xCE98,0xCEA0,
-	0xCEA1,0xCEA3,0xCEA4,0xCEA5,0xCEAC,0xCEAD,0xCEC1,0xCEE4,
-	0xCEE5,0xCEE8,0xCEEB,0xCEEC,0xCEF4,0xCEF5,0xCEF7,0xCEF8,
-	0xCEF9,0xCF00,0xCF01,0xCF04,0xCF08,0xCF10,0xCF11,0xCF13,
-	0xCF15,0xCF1C,0xCF20,0xCF24,0xCF2C,0xCF2D,0xCF2F,0xCF30,
-	0xCF31,0xCF38,0xCF54,0xCF55,0xCF58,0xCF5C,0xCF64,0xCF65,
-	0xCF67,0xCF69,0xCF70,0xCF71,0xCF74,0xCF78,0xCF80,0xCF85,
-	0xCF8C,0xCFA1,0xCFA8,0xCFB0,0xCFC4,0xCFE0,0xCFE1,0xCFE4,
-	0xCFE8,0xCFF0,0xCFF1,0xCFF3,0xCFF5,0xCFFC,0xD000,0xD004,
-	0xD011,0xD018,0xD02D,0xD034,0xD035,0xD038,0xD03C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 70, Array index 0x2200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xD044,0xD045,0xD047,0xD049,0xD050,0xD054,0xD058,
-	0xD060,0xD06C,0xD06D,0xD070,0xD074,0xD07C,0xD07D,0xD081,
-	0xD0A4,0xD0A5,0xD0A8,0xD0AC,0xD0B4,0xD0B5,0xD0B7,0xD0B9,
-	0xD0C0,0xD0C1,0xD0C4,0xD0C8,0xD0C9,0xD0D0,0xD0D1,0xD0D3,
-	0xD0D4,0xD0D5,0xD0DC,0xD0DD,0xD0E0,0xD0E4,0xD0EC,0xD0ED,
-	0xD0EF,0xD0F0,0xD0F1,0xD0F8,0xD10D,0xD130,0xD131,0xD134,
-	0xD138,0xD13A,0xD140,0xD141,0xD143,0xD144,0xD145,0xD14C,
-	0xD14D,0xD150,0xD154,0xD15C,0xD15D,0xD15F,0xD161,0xD168,
-	0xD16C,0xD17C,0xD184,0xD188,0xD1A0,0xD1A1,0xD1A4,0xD1A8,
-	0xD1B0,0xD1B1,0xD1B3,0xD1B5,0xD1BA,0xD1BC,0xD1C0,0xD1D8,
-	0xD1F4,0xD1F8,0xD207,0xD209,0xD210,0xD22C,0xD22D,0xD230,
-	0xD234,0xD23C,0xD23D,0xD23F,0xD241,0xD248,0xD25C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 71, Array index 0x2300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xD264,0xD280,0xD281,0xD284,0xD288,0xD290,0xD291,
-	0xD295,0xD29C,0xD2A0,0xD2A4,0xD2AC,0xD2B1,0xD2B8,0xD2B9,
-	0xD2BC,0xD2BF,0xD2C0,0xD2C2,0xD2C8,0xD2C9,0xD2CB,0xD2D4,
-	0xD2D8,0xD2DC,0xD2E4,0xD2E5,0xD2F0,0xD2F1,0xD2F4,0xD2F8,
-	0xD300,0xD301,0xD303,0xD305,0xD30C,0xD30D,0xD30E,0xD310,
-	0xD314,0xD316,0xD31C,0xD31D,0xD31F,0xD320,0xD321,0xD325,
-	0xD328,0xD329,0xD32C,0xD330,0xD338,0xD339,0xD33B,0xD33C,
-	0xD33D,0xD344,0xD345,0xD37C,0xD37D,0xD380,0xD384,0xD38C,
-	0xD38D,0xD38F,0xD390,0xD391,0xD398,0xD399,0xD39C,0xD3A0,
-	0xD3A8,0xD3A9,0xD3AB,0xD3AD,0xD3B4,0xD3B8,0xD3BC,0xD3C4,
-	0xD3C5,0xD3C8,0xD3C9,0xD3D0,0xD3D8,0xD3E1,0xD3E3,0xD3EC,
-	0xD3ED,0xD3F0,0xD3F4,0xD3FC,0xD3FD,0xD3FF,0xD401,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 72, Array index 0x2400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xD408,0xD41D,0xD440,0xD444,0xD45C,0xD460,0xD464,
-	0xD46D,0xD46F,0xD478,0xD479,0xD47C,0xD47F,0xD480,0xD482,
-	0xD488,0xD489,0xD48B,0xD48D,0xD494,0xD4A9,0xD4CC,0xD4D0,
-	0xD4D4,0xD4DC,0xD4DF,0xD4E8,0xD4EC,0xD4F0,0xD4F8,0xD4FB,
-	0xD4FD,0xD504,0xD508,0xD50C,0xD514,0xD515,0xD517,0xD53C,
-	0xD53D,0xD540,0xD544,0xD54C,0xD54D,0xD54F,0xD551,0xD558,
-	0xD559,0xD55C,0xD560,0xD565,0xD568,0xD569,0xD56B,0xD56D,
-	0xD574,0xD575,0xD578,0xD57C,0xD584,0xD585,0xD587,0xD588,
-	0xD589,0xD590,0xD5A5,0xD5C8,0xD5C9,0xD5CC,0xD5D0,0xD5D2,
-	0xD5D8,0xD5D9,0xD5DB,0xD5DD,0xD5E4,0xD5E5,0xD5E8,0xD5EC,
-	0xD5F4,0xD5F5,0xD5F7,0xD5F9,0xD600,0xD601,0xD604,0xD608,
-	0xD610,0xD611,0xD613,0xD614,0xD615,0xD61C,0xD620,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 73, Array index 0x2500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xD624,0xD62D,0xD638,0xD639,0xD63C,0xD640,0xD645,
-	0xD648,0xD649,0xD64B,0xD64D,0xD651,0xD654,0xD655,0xD658,
-	0xD65C,0xD667,0xD669,0xD670,0xD671,0xD674,0xD683,0xD685,
-	0xD68C,0xD68D,0xD690,0xD694,0xD69D,0xD69F,0xD6A1,0xD6A8,
-	0xD6AC,0xD6B0,0xD6B9,0xD6BB,0xD6C4,0xD6C5,0xD6C8,0xD6CC,
-	0xD6D1,0xD6D4,0xD6D7,0xD6D9,0xD6E0,0xD6E4,0xD6E8,0xD6F0,
-	0xD6F5,0xD6FC,0xD6FD,0xD700,0xD704,0xD711,0xD718,0xD719,
-	0xD71C,0xD720,0xD728,0xD729,0xD72B,0xD72D,0xD734,0xD735,
-	0xD738,0xD73C,0xD744,0xD747,0xD749,0xD750,0xD751,0xD754,
-	0xD756,0xD757,0xD758,0xD759,0xD760,0xD761,0xD763,0xD765,
-	0xD769,0xD76C,0xD770,0xD774,0xD77C,0xD77D,0xD781,0xD788,
-	0xD789,0xD78C,0xD790,0xD798,0xD799,0xD79B,0xD79D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 75, Array index 0x2600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F3D,0x4F73,0x5047,0x50F9,0x52A0,0x53EF,0x5475,
-	0x54E5,0x5609,0x5AC1,0x5BB6,0x6687,0x67B6,0x67B7,0x67EF,
-	0x6B4C,0x73C2,0x75C2,0x7A3C,0x82DB,0x8304,0x8857,0x8888,
-	0x8A36,0x8CC8,0x8DCF,0x8EFB,0x8FE6,0x99D5,0x523B,0x5374,
-	0x5404,0x606A,0x6164,0x6BBC,0x73CF,0x811A,0x89BA,0x89D2,
-	0x95A3,0x4F83,0x520A,0x58BE,0x5978,0x59E6,0x5E72,0x5E79,
-	0x61C7,0x63C0,0x6746,0x67EC,0x687F,0x6F97,0x764E,0x770B,
-	0x78F5,0x7A08,0x7AFF,0x7C21,0x809D,0x826E,0x8271,0x8AEB,
-	0x9593,0x4E6B,0x559D,0x66F7,0x6E34,0x78A3,0x7AED,0x845B,
-	0x8910,0x874E,0x97A8,0x52D8,0x574E,0x582A,0x5D4C,0x611F,
-	0x61BE,0x6221,0x6562,0x67D1,0x6A44,0x6E1B,0x7518,0x75B3,
-	0x76E3,0x77B0,0x7D3A,0x90AF,0x9451,0x9452,0x9F95,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 76, Array index 0x2700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5323,0x5CAC,0x7532,0x80DB,0x9240,0x9598,0x525B,
-	0x5808,0x59DC,0x5CA1,0x5D17,0x5EB7,0x5F3A,0x5F4A,0x6177,
-	0x6C5F,0x757A,0x7586,0x7CE0,0x7D73,0x7DB1,0x7F8C,0x8154,
-	0x8221,0x8591,0x8941,0x8B1B,0x92FC,0x964D,0x9C47,0x4ECB,
-	0x4EF7,0x500B,0x51F1,0x584F,0x6137,0x613E,0x6168,0x6539,
-	0x69EA,0x6F11,0x75A5,0x7686,0x76D6,0x7B87,0x82A5,0x84CB,
-	0xF900,0x93A7,0x958B,0x5580,0x5BA2,0x5751,0xF901,0x7CB3,
-	0x7FB9,0x91B5,0x5028,0x53BB,0x5C45,0x5DE8,0x62D2,0x636E,
-	0x64DA,0x64E7,0x6E20,0x70AC,0x795B,0x8DDD,0x8E1E,0xF902,
-	0x907D,0x9245,0x92F8,0x4E7E,0x4EF6,0x5065,0x5DFE,0x5EFA,
-	0x6106,0x6957,0x8171,0x8654,0x8E47,0x9375,0x9A2B,0x4E5E,
-	0x5091,0x6770,0x6840,0x5109,0x528D,0x5292,0x6AA2,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 77, Array index 0x2800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x77BC,0x9210,0x9ED4,0x52AB,0x602F,0x8FF2,0x5048,
-	0x61A9,0x63ED,0x64CA,0x683C,0x6A84,0x6FC0,0x8188,0x89A1,
-	0x9694,0x5805,0x727D,0x72AC,0x7504,0x7D79,0x7E6D,0x80A9,
-	0x898B,0x8B74,0x9063,0x9D51,0x6289,0x6C7A,0x6F54,0x7D50,
-	0x7F3A,0x8A23,0x517C,0x614A,0x7B9D,0x8B19,0x9257,0x938C,
-	0x4EAC,0x4FD3,0x501E,0x50BE,0x5106,0x52C1,0x52CD,0x537F,
-	0x5770,0x5883,0x5E9A,0x5F91,0x6176,0x61AC,0x64CE,0x656C,
-	0x666F,0x66BB,0x66F4,0x6897,0x6D87,0x7085,0x70F1,0x749F,
-	0x74A5,0x74CA,0x75D9,0x786C,0x78EC,0x7ADF,0x7AF6,0x7D45,
-	0x7D93,0x8015,0x803F,0x811B,0x8396,0x8B66,0x8F15,0x9015,
-	0x93E1,0x9803,0x9838,0x9A5A,0x9BE8,0x4FC2,0x5553,0x583A,
-	0x5951,0x5B63,0x5C46,0x60B8,0x6212,0x6842,0x68B0,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 78, Array index 0x2900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x68E8,0x6EAA,0x754C,0x7678,0x78CE,0x7A3D,0x7CFB,
-	0x7E6B,0x7E7C,0x8A08,0x8AA1,0x8C3F,0x968E,0x9DC4,0x53E4,
-	0x53E9,0x544A,0x5471,0x56FA,0x59D1,0x5B64,0x5C3B,0x5EAB,
-	0x62F7,0x6537,0x6545,0x6572,0x66A0,0x67AF,0x69C1,0x6CBD,
-	0x75FC,0x7690,0x777E,0x7A3F,0x7F94,0x8003,0x80A1,0x818F,
-	0x82E6,0x82FD,0x83F0,0x85C1,0x8831,0x88B4,0x8AA5,0xF903,
-	0x8F9C,0x932E,0x96C7,0x9867,0x9AD8,0x9F13,0x54ED,0x659B,
-	0x66F2,0x688F,0x7A40,0x8C37,0x9D60,0x56F0,0x5764,0x5D11,
-	0x6606,0x68B1,0x68CD,0x6EFE,0x7428,0x889E,0x9BE4,0x6C68,
-	0xF904,0x9AA8,0x4F9B,0x516C,0x5171,0x529F,0x5B54,0x5DE5,
-	0x6050,0x606D,0x62F1,0x63A7,0x653B,0x73D9,0x7A7A,0x86A3,
-	0x8CA2,0x978F,0x4E32,0x5BE1,0x6208,0x679C,0x74DC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 79, Array index 0x2A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x79D1,0x83D3,0x8A87,0x8AB2,0x8DE8,0x904E,0x934B,
-	0x9846,0x5ED3,0x69E8,0x85FF,0x90ED,0xF905,0x51A0,0x5B98,
-	0x5BEC,0x6163,0x68FA,0x6B3E,0x704C,0x742F,0x74D8,0x7BA1,
-	0x7F50,0x83C5,0x89C0,0x8CAB,0x95DC,0x9928,0x522E,0x605D,
-	0x62EC,0x9002,0x4F8A,0x5149,0x5321,0x58D9,0x5EE3,0x66E0,
-	0x6D38,0x709A,0x72C2,0x73D6,0x7B50,0x80F1,0x945B,0x5366,
-	0x639B,0x7F6B,0x4E56,0x5080,0x584A,0x58DE,0x602A,0x6127,
-	0x62D0,0x69D0,0x9B41,0x5B8F,0x7D18,0x80B1,0x8F5F,0x4EA4,
-	0x50D1,0x54AC,0x55AC,0x5B0C,0x5DA0,0x5DE7,0x652A,0x654E,
-	0x6821,0x6A4B,0x72E1,0x768E,0x77EF,0x7D5E,0x7FF9,0x81A0,
-	0x854E,0x86DF,0x8F03,0x8F4E,0x90CA,0x9903,0x9A55,0x9BAB,
-	0x4E18,0x4E45,0x4E5D,0x4EC7,0x4FF1,0x5177,0x52FE,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 80, Array index 0x2B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5340,0x53E3,0x53E5,0x548E,0x5614,0x5775,0x57A2,
-	0x5BC7,0x5D87,0x5ED0,0x61FC,0x62D8,0x6551,0x67B8,0x67E9,
-	0x69CB,0x6B50,0x6BC6,0x6BEC,0x6C42,0x6E9D,0x7078,0x72D7,
-	0x7396,0x7403,0x77BF,0x77E9,0x7A76,0x7D7F,0x8009,0x81FC,
-	0x8205,0x820A,0x82DF,0x8862,0x8B33,0x8CFC,0x8EC0,0x9011,
-	0x90B1,0x9264,0x92B6,0x99D2,0x9A45,0x9CE9,0x9DD7,0x9F9C,
-	0x570B,0x5C40,0x83CA,0x97A0,0x97AB,0x9EB4,0x541B,0x7A98,
-	0x7FA4,0x88D9,0x8ECD,0x90E1,0x5800,0x5C48,0x6398,0x7A9F,
-	0x5BAE,0x5F13,0x7A79,0x7AAE,0x828E,0x8EAC,0x5026,0x5238,
-	0x52F8,0x5377,0x5708,0x62F3,0x6372,0x6B0A,0x6DC3,0x7737,
-	0x53A5,0x7357,0x8568,0x8E76,0x95D5,0x673A,0x6AC3,0x6F70,
-	0x8A6D,0x8ECC,0x994B,0xF906,0x6677,0x6B78,0x8CB4,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 81, Array index 0x2C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9B3C,0xF907,0x53EB,0x572D,0x594E,0x63C6,0x69FB,
-	0x73EA,0x7845,0x7ABA,0x7AC5,0x7CFE,0x8475,0x898F,0x8D73,
-	0x9035,0x95A8,0x52FB,0x5747,0x7547,0x7B60,0x83CC,0x921E,
-	0xF908,0x6A58,0x514B,0x524B,0x5287,0x621F,0x68D8,0x6975,
-	0x9699,0x50C5,0x52A4,0x52E4,0x61C3,0x65A4,0x6839,0x69FF,
-	0x747E,0x7B4B,0x82B9,0x83EB,0x89B2,0x8B39,0x8FD1,0x9949,
-	0xF909,0x4ECA,0x5997,0x64D2,0x6611,0x6A8E,0x7434,0x7981,
-	0x79BD,0x82A9,0x887E,0x887F,0x895F,0xF90A,0x9326,0x4F0B,
-	0x53CA,0x6025,0x6271,0x6C72,0x7D1A,0x7D66,0x4E98,0x5162,
-	0x77DC,0x80AF,0x4F01,0x4F0E,0x5176,0x5180,0x55DC,0x5668,
-	0x573B,0x57FA,0x57FC,0x5914,0x5947,0x5993,0x5BC4,0x5C90,
-	0x5D0E,0x5DF1,0x5E7E,0x5FCC,0x6280,0x65D7,0x65E3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 82, Array index 0x2D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x671E,0x671F,0x675E,0x68CB,0x68C4,0x6A5F,0x6B3A,
-	0x6C23,0x6C7D,0x6C82,0x6DC7,0x7398,0x7426,0x742A,0x7482,
-	0x74A3,0x7578,0x757F,0x7881,0x78EF,0x7941,0x7947,0x7948,
-	0x797A,0x7B95,0x7D00,0x7DBA,0x7F88,0x8006,0x802D,0x808C,
-	0x8A18,0x8B4F,0x8C48,0x8D77,0x9321,0x9324,0x98E2,0x9951,
-	0x9A0E,0x9A0F,0x9A65,0x9E92,0x7DCA,0x4F76,0x5409,0x62EE,
-	0x6854,0x91D1,0x55AB,0x513A,0xF90B,0xF90C,0x5A1C,0x61E6,
-	0xF90D,0x62CF,0x62FF,0xF90E,0xF90F,0xF910,0xF911,0xF912,
-	0xF913,0x90A3,0xF914,0xF915,0xF916,0xF917,0xF918,0x8AFE,
-	0xF919,0xF91A,0xF91B,0xF91C,0x6696,0xF91D,0x7156,0xF91E,
-	0xF91F,0x96E3,0xF920,0x634F,0x637A,0x5357,0xF921,0x678F,
-	0x6960,0x6E73,0xF922,0x7537,0xF923,0xF924,0xF925,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 83, Array index 0x2E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7D0D,0xF926,0xF927,0x8872,0x56CA,0x5A18,0xF928,
-	0xF929,0xF92A,0xF92B,0xF92C,0x4E43,0xF92D,0x5167,0x5948,
-	0x67F0,0x8010,0xF92E,0x5973,0x5E74,0x649A,0x79CA,0x5FF5,
-	0x606C,0x62C8,0x637B,0x5BE7,0x5BD7,0x52AA,0xF92F,0x5974,
-	0x5F29,0x6012,0xF930,0xF931,0xF932,0x7459,0xF933,0xF934,
-	0xF935,0xF936,0xF937,0xF938,0x99D1,0xF939,0xF93A,0xF93B,
-	0xF93C,0xF93D,0xF93E,0xF93F,0xF940,0xF941,0xF942,0xF943,
-	0x6FC3,0xF944,0xF945,0x81BF,0x8FB2,0x60F1,0xF946,0xF947,
-	0x8166,0xF948,0xF949,0x5C3F,0xF94A,0xF94B,0xF94C,0xF94D,
-	0xF94E,0xF94F,0xF950,0xF951,0x5AE9,0x8A25,0x677B,0x7D10,
-	0xF952,0xF953,0xF954,0xF955,0xF956,0xF957,0x80FD,0xF958,
-	0xF959,0x5C3C,0x6CE5,0x533F,0x6EBA,0x591A,0x8336,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 84, Array index 0x2F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E39,0x4EB6,0x4F46,0x55AE,0x5718,0x58C7,0x5F56,
-	0x65B7,0x65E6,0x6A80,0x6BB5,0x6E4D,0x77ED,0x7AEF,0x7C1E,
-	0x7DDE,0x86CB,0x8892,0x9132,0x935B,0x64BB,0x6FBE,0x737A,
-	0x75B8,0x9054,0x5556,0x574D,0x61BA,0x64D4,0x66C7,0x6DE1,
-	0x6E5B,0x6F6D,0x6FB9,0x75F0,0x8043,0x81BD,0x8541,0x8983,
-	0x8AC7,0x8B5A,0x931F,0x6C93,0x7553,0x7B54,0x8E0F,0x905D,
-	0x5510,0x5802,0x5858,0x5E62,0x6207,0x649E,0x68E0,0x7576,
-	0x7CD6,0x87B3,0x9EE8,0x4EE3,0x5788,0x576E,0x5927,0x5C0D,
-	0x5CB1,0x5E36,0x5F85,0x6234,0x64E1,0x73B3,0x81FA,0x888B,
-	0x8CB8,0x968A,0x9EDB,0x5B85,0x5FB7,0x60B3,0x5012,0x5200,
-	0x5230,0x5716,0x5835,0x5857,0x5C0E,0x5C60,0x5CF6,0x5D8B,
-	0x5EA6,0x5F92,0x60BC,0x6311,0x6389,0x6417,0x6843,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 85, Array index 0x3000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x68F9,0x6AC2,0x6DD8,0x6E21,0x6ED4,0x6FE4,0x71FE,
-	0x76DC,0x7779,0x79B1,0x7A3B,0x8404,0x89A9,0x8CED,0x8DF3,
-	0x8E48,0x9003,0x9014,0x9053,0x90FD,0x934D,0x9676,0x97DC,
-	0x6BD2,0x7006,0x7258,0x72A2,0x7368,0x7763,0x79BF,0x7BE4,
-	0x7E9B,0x8B80,0x58A9,0x60C7,0x6566,0x65FD,0x66BE,0x6C8C,
-	0x711E,0x71C9,0x8C5A,0x9813,0x4E6D,0x7A81,0x4EDD,0x51AC,
-	0x51CD,0x52D5,0x540C,0x61A7,0x6771,0x6850,0x68DF,0x6D1E,
-	0x6F7C,0x75BC,0x77B3,0x7AE5,0x80F4,0x8463,0x9285,0x515C,
-	0x6597,0x675C,0x6793,0x75D8,0x7AC7,0x8373,0xF95A,0x8C46,
-	0x9017,0x982D,0x5C6F,0x81C0,0x829A,0x9041,0x906F,0x920D,
-	0x5F97,0x5D9D,0x6A59,0x71C8,0x767B,0x7B49,0x85E4,0x8B04,
-	0x9127,0x9A30,0x5587,0x61F6,0xF95B,0x7669,0x7F85,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 86, Array index 0x3100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x863F,0x87BA,0x88F8,0x908F,0xF95C,0x6D1B,0x70D9,
-	0x73DE,0x7D61,0x843D,0xF95D,0x916A,0x99F1,0xF95E,0x4E82,
-	0x5375,0x6B04,0x6B12,0x703E,0x721B,0x862D,0x9E1E,0x524C,
-	0x8FA3,0x5D50,0x64E5,0x652C,0x6B16,0x6FEB,0x7C43,0x7E9C,
-	0x85CD,0x8964,0x89BD,0x62C9,0x81D8,0x881F,0x5ECA,0x6717,
-	0x6D6A,0x72FC,0x7405,0x746F,0x8782,0x90DE,0x4F86,0x5D0D,
-	0x5FA0,0x840A,0x51B7,0x63A0,0x7565,0x4EAE,0x5006,0x5169,
-	0x51C9,0x6881,0x6A11,0x7CAE,0x7CB1,0x7CE7,0x826F,0x8AD2,
-	0x8F1B,0x91CF,0x4FB6,0x5137,0x52F5,0x5442,0x5EEC,0x616E,
-	0x623E,0x65C5,0x6ADA,0x6FFE,0x792A,0x85DC,0x8823,0x95AD,
-	0x9A62,0x9A6A,0x9E97,0x9ECE,0x529B,0x66C6,0x6B77,0x701D,
-	0x792B,0x8F62,0x9742,0x6190,0x6200,0x6523,0x6F23,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 87, Array index 0x3200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7149,0x7489,0x7DF4,0x806F,0x84EE,0x8F26,0x9023,
-	0x934A,0x51BD,0x5217,0x52A3,0x6D0C,0x70C8,0x88C2,0x5EC9,
-	0x6582,0x6BAE,0x6FC2,0x7C3E,0x7375,0x4EE4,0x4F36,0x56F9,
-	0xF95F,0x5CBA,0x5DBA,0x601C,0x73B2,0x7B2D,0x7F9A,0x7FCE,
-	0x8046,0x901E,0x9234,0x96F6,0x9748,0x9818,0x9F61,0x4F8B,
-	0x6FA7,0x79AE,0x91B4,0x96B7,0x52DE,0xF960,0x6488,0x64C4,
-	0x6AD3,0x6F5E,0x7018,0x7210,0x76E7,0x8001,0x8606,0x865C,
-	0x8DEF,0x8F05,0x9732,0x9B6F,0x9DFA,0x9E75,0x788C,0x797F,
-	0x7DA0,0x83C9,0x9304,0x9E7F,0x9E93,0x8AD6,0x58DF,0x5F04,
-	0x6727,0x7027,0x74CF,0x7C60,0x807E,0x5121,0x7028,0x7262,
-	0x78CA,0x8CC2,0x8CDA,0x8CF4,0x96F7,0x4E86,0x50DA,0x5BEE,
-	0x5ED6,0x6599,0x71CE,0x7642,0x77AD,0x804A,0x84FC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 88, Array index 0x3300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x907C,0x9B27,0x9F8D,0x58D8,0x5A41,0x5C62,0x6A13,
-	0x6DDA,0x6F0F,0x763B,0x7D2F,0x7E37,0x851E,0x8938,0x93E4,
-	0x964B,0x5289,0x65D2,0x67F3,0x69B4,0x6D41,0x6E9C,0x700F,
-	0x7409,0x7460,0x7559,0x7624,0x786B,0x8B2C,0x985E,0x516D,
-	0x622E,0x9678,0x4F96,0x502B,0x5D19,0x6DEA,0x7DB8,0x8F2A,
-	0x5F8B,0x6144,0x6817,0xF961,0x9686,0x52D2,0x808B,0x51DC,
-	0x51CC,0x695E,0x7A1C,0x7DBE,0x83F1,0x9675,0x4FDA,0x5229,
-	0x5398,0x540F,0x550E,0x5C65,0x60A7,0x674E,0x68A8,0x6D6C,
-	0x7281,0x72F8,0x7406,0x7483,0xF962,0x75E2,0x7C6C,0x7F79,
-	0x7FB8,0x8389,0x88CF,0x88E1,0x91CC,0x91D0,0x96E2,0x9BC9,
-	0x541D,0x6F7E,0x71D0,0x7498,0x85FA,0x8EAA,0x96A3,0x9C57,
-	0x9E9F,0x6797,0x6DCB,0x7433,0x81E8,0x9716,0x782C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 89, Array index 0x3400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7ACB,0x7B20,0x7C92,0x6469,0x746A,0x75F2,0x78BC,
-	0x78E8,0x99AC,0x9B54,0x9EBB,0x5BDE,0x5E55,0x6F20,0x819C,
-	0x83AB,0x9088,0x4E07,0x534D,0x5A29,0x5DD2,0x5F4E,0x6162,
-	0x633D,0x6669,0x66FC,0x6EFF,0x6F2B,0x7063,0x779E,0x842C,
-	0x8513,0x883B,0x8F13,0x9945,0x9C3B,0x551C,0x62B9,0x672B,
-	0x6CAB,0x8309,0x896A,0x977A,0x4EA1,0x5984,0x5FD8,0x5FD9,
-	0x671B,0x7DB2,0x7F54,0x8292,0x832B,0x83BD,0x8F1E,0x9099,
-	0x57CB,0x59B9,0x5A92,0x5BD0,0x6627,0x679A,0x6885,0x6BCF,
-	0x7164,0x7F75,0x8CB7,0x8CE3,0x9081,0x9B45,0x8108,0x8C8A,
-	0x964C,0x9A40,0x9EA5,0x5B5F,0x6C13,0x731B,0x76F2,0x76DF,
-	0x840C,0x51AA,0x8993,0x514D,0x5195,0x52C9,0x68C9,0x6C94,
-	0x7704,0x7720,0x7DBF,0x7DEC,0x9762,0x9EB5,0x6EC5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 90, Array index 0x3500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8511,0x51A5,0x540D,0x547D,0x660E,0x669D,0x6927,
-	0x6E9F,0x76BF,0x7791,0x8317,0x84C2,0x879F,0x9169,0x9298,
-	0x9CF4,0x8882,0x4FAE,0x5192,0x52DF,0x59C6,0x5E3D,0x6155,
-	0x6478,0x6479,0x66AE,0x67D0,0x6A21,0x6BCD,0x6BDB,0x725F,
-	0x7261,0x7441,0x7738,0x77DB,0x8017,0x82BC,0x8305,0x8B00,
-	0x8B28,0x8C8C,0x6728,0x6C90,0x7267,0x76EE,0x7766,0x7A46,
-	0x9DA9,0x6B7F,0x6C92,0x5922,0x6726,0x8499,0x536F,0x5893,
-	0x5999,0x5EDF,0x63CF,0x6634,0x6773,0x6E3A,0x732B,0x7AD7,
-	0x82D7,0x9328,0x52D9,0x5DEB,0x61AE,0x61CB,0x620A,0x62C7,
-	0x64AB,0x65E0,0x6959,0x6B66,0x6BCB,0x7121,0x73F7,0x755D,
-	0x7E46,0x821E,0x8302,0x856A,0x8AA3,0x8CBF,0x9727,0x9D61,
-	0x58A8,0x9ED8,0x5011,0x520E,0x543B,0x554F,0x6587,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 91, Array index 0x3600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6C76,0x7D0A,0x7D0B,0x805E,0x868A,0x9580,0x96EF,
-	0x52FF,0x6C95,0x7269,0x5473,0x5A9A,0x5C3E,0x5D4B,0x5F4C,
-	0x5FAE,0x672A,0x68B6,0x6963,0x6E3C,0x6E44,0x7709,0x7C73,
-	0x7F8E,0x8587,0x8B0E,0x8FF7,0x9761,0x9EF4,0x5CB7,0x60B6,
-	0x610D,0x61AB,0x654F,0x65FB,0x65FC,0x6C11,0x6CEF,0x739F,
-	0x73C9,0x7DE1,0x9594,0x5BC6,0x871C,0x8B10,0x525D,0x535A,
-	0x62CD,0x640F,0x64B2,0x6734,0x6A38,0x6CCA,0x73C0,0x749E,
-	0x7B94,0x7C95,0x7E1B,0x818A,0x8236,0x8584,0x8FEB,0x96F9,
-	0x99C1,0x4F34,0x534A,0x53CD,0x53DB,0x62CC,0x642C,0x6500,
-	0x6591,0x69C3,0x6CEE,0x6F58,0x73ED,0x7554,0x7622,0x76E4,
-	0x76FC,0x78D0,0x78FB,0x792C,0x7D46,0x822C,0x87E0,0x8FD4,
-	0x9812,0x98EF,0x52C3,0x62D4,0x64A5,0x6E24,0x6F51,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 92, Array index 0x3700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x767C,0x8DCB,0x91B1,0x9262,0x9AEE,0x9B43,0x5023,
-	0x508D,0x574A,0x59A8,0x5C28,0x5E47,0x5F77,0x623F,0x653E,
-	0x65B9,0x65C1,0x6609,0x678B,0x699C,0x6EC2,0x78C5,0x7D21,
-	0x80AA,0x8180,0x822B,0x82B3,0x84A1,0x868C,0x8A2A,0x8B17,
-	0x90A6,0x9632,0x9F90,0x500D,0x4FF3,0xF963,0x57F9,0x5F98,
-	0x62DC,0x6392,0x676F,0x6E43,0x7119,0x76C3,0x80CC,0x80DA,
-	0x88F4,0x88F5,0x8919,0x8CE0,0x8F29,0x914D,0x966A,0x4F2F,
-	0x4F70,0x5E1B,0x67CF,0x6822,0x767D,0x767E,0x9B44,0x5E61,
-	0x6A0A,0x7169,0x71D4,0x756A,0xF964,0x7E41,0x8543,0x85E9,
-	0x98DC,0x4F10,0x7B4F,0x7F70,0x95A5,0x51E1,0x5E06,0x68B5,
-	0x6C3E,0x6C4E,0x6CDB,0x72AF,0x7BC4,0x8303,0x6CD5,0x743A,
-	0x50FB,0x5288,0x58C1,0x64D8,0x6A97,0x74A7,0x7656,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 93, Array index 0x3800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x78A7,0x8617,0x95E2,0x9739,0xF965,0x535E,0x5F01,
-	0x8B8A,0x8FA8,0x8FAF,0x908A,0x5225,0x77A5,0x9C49,0x9F08,
-	0x4E19,0x5002,0x5175,0x5C5B,0x5E77,0x661E,0x663A,0x67C4,
-	0x68C5,0x70B3,0x7501,0x75C5,0x79C9,0x7ADD,0x8F27,0x9920,
-	0x9A08,0x4FDD,0x5821,0x5831,0x5BF6,0x666E,0x6B65,0x6D11,
-	0x6E7A,0x6F7D,0x73E4,0x752B,0x83E9,0x88DC,0x8913,0x8B5C,
-	0x8F14,0x4F0F,0x50D5,0x5310,0x535C,0x5B93,0x5FA9,0x670D,
-	0x798F,0x8179,0x832F,0x8514,0x8907,0x8986,0x8F39,0x8F3B,
-	0x99A5,0x9C12,0x672C,0x4E76,0x4FF8,0x5949,0x5C01,0x5CEF,
-	0x5CF0,0x6367,0x68D2,0x70FD,0x71A2,0x742B,0x7E2B,0x84EC,
-	0x8702,0x9022,0x92D2,0x9CF3,0x4E0D,0x4ED8,0x4FEF,0x5085,
-	0x5256,0x526F,0x5426,0x5490,0x57E0,0x592B,0x5A66,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 94, Array index 0x3900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5B5A,0x5B75,0x5BCC,0x5E9C,0xF966,0x6276,0x6577,
-	0x65A7,0x6D6E,0x6EA5,0x7236,0x7B26,0x7C3F,0x7F36,0x8150,
-	0x8151,0x819A,0x8240,0x8299,0x83A9,0x8A03,0x8CA0,0x8CE6,
-	0x8CFB,0x8D74,0x8DBA,0x90E8,0x91DC,0x961C,0x9644,0x99D9,
-	0x9CE7,0x5317,0x5206,0x5429,0x5674,0x58B3,0x5954,0x596E,
-	0x5FFF,0x61A4,0x626E,0x6610,0x6C7E,0x711A,0x76C6,0x7C89,
-	0x7CDE,0x7D1B,0x82AC,0x8CC1,0x96F0,0xF967,0x4F5B,0x5F17,
-	0x5F7F,0x62C2,0x5D29,0x670B,0x68DA,0x787C,0x7E43,0x9D6C,
-	0x4E15,0x5099,0x5315,0x532A,0x5351,0x5983,0x5A62,0x5E87,
-	0x60B2,0x618A,0x6249,0x6279,0x6590,0x6787,0x69A7,0x6BD4,
-	0x6BD6,0x6BD7,0x6BD8,0x6CB8,0xF968,0x7435,0x75FA,0x7812,
-	0x7891,0x79D5,0x79D8,0x7C83,0x7DCB,0x7FE1,0x80A5,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 95, Array index 0x3A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x813E,0x81C2,0x83F2,0x871A,0x88E8,0x8AB9,0x8B6C,
-	0x8CBB,0x9119,0x975E,0x98DB,0x9F3B,0x56AC,0x5B2A,0x5F6C,
-	0x658C,0x6AB3,0x6BAF,0x6D5C,0x6FF1,0x7015,0x725D,0x73AD,
-	0x8CA7,0x8CD3,0x983B,0x6191,0x6C37,0x8058,0x9A01,0x4E4D,
-	0x4E8B,0x4E9B,0x4ED5,0x4F3A,0x4F3C,0x4F7F,0x4FDF,0x50FF,
-	0x53F2,0x53F8,0x5506,0x55E3,0x56DB,0x58EB,0x5962,0x5A11,
-	0x5BEB,0x5BFA,0x5C04,0x5DF3,0x5E2B,0x5F99,0x601D,0x6368,
-	0x659C,0x65AF,0x67F6,0x67FB,0x68AD,0x6B7B,0x6C99,0x6CD7,
-	0x6E23,0x7009,0x7345,0x7802,0x793E,0x7940,0x7960,0x79C1,
-	0x7BE9,0x7D17,0x7D72,0x8086,0x820D,0x838E,0x84D1,0x86C7,
-	0x88DF,0x8A50,0x8A5E,0x8B1D,0x8CDC,0x8D66,0x8FAD,0x90AA,
-	0x98FC,0x99DF,0x9E9D,0x524A,0xF969,0x6714,0xF96A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 96, Array index 0x3B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5098,0x522A,0x5C71,0x6563,0x6C55,0x73CA,0x7523,
-	0x759D,0x7B97,0x849C,0x9178,0x9730,0x4E77,0x6492,0x6BBA,
-	0x715E,0x85A9,0x4E09,0xF96B,0x6749,0x68EE,0x6E17,0x829F,
-	0x8518,0x886B,0x63F7,0x6F81,0x9212,0x98AF,0x4E0A,0x50B7,
-	0x50CF,0x511F,0x5546,0x55AA,0x5617,0x5B40,0x5C19,0x5CE0,
-	0x5E38,0x5E8A,0x5EA0,0x5EC2,0x60F3,0x6851,0x6A61,0x6E58,
-	0x723D,0x7240,0x72C0,0x76F8,0x7965,0x7BB1,0x7FD4,0x88F3,
-	0x89F4,0x8A73,0x8C61,0x8CDE,0x971C,0x585E,0x74BD,0x8CFD,
-	0x55C7,0xF96C,0x7A61,0x7D22,0x8272,0x7272,0x751F,0x7525,
-	0xF96D,0x7B19,0x5885,0x58FB,0x5DBC,0x5E8F,0x5EB6,0x5F90,
-	0x6055,0x6292,0x637F,0x654D,0x6691,0x66D9,0x66F8,0x6816,
-	0x68F2,0x7280,0x745E,0x7B6E,0x7D6E,0x7DD6,0x7F72,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 97, Array index 0x3C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x80E5,0x8212,0x85AF,0x897F,0x8A93,0x901D,0x92E4,
-	0x9ECD,0x9F20,0x5915,0x596D,0x5E2D,0x60DC,0x6614,0x6673,
-	0x6790,0x6C50,0x6DC5,0x6F5F,0x77F3,0x78A9,0x84C6,0x91CB,
-	0x932B,0x4ED9,0x50CA,0x5148,0x5584,0x5B0B,0x5BA3,0x6247,
-	0x657E,0x65CB,0x6E32,0x717D,0x7401,0x7444,0x7487,0x74BF,
-	0x766C,0x79AA,0x7DDA,0x7E55,0x7FA8,0x817A,0x81B3,0x8239,
-	0x861A,0x87EC,0x8A75,0x8DE3,0x9078,0x9291,0x9425,0x994D,
-	0x9BAE,0x5368,0x5C51,0x6954,0x6CC4,0x6D29,0x6E2B,0x820C,
-	0x859B,0x893B,0x8A2D,0x8AAA,0x96EA,0x9F67,0x5261,0x66B9,
-	0x6BB2,0x7E96,0x87FE,0x8D0D,0x9583,0x965D,0x651D,0x6D89,
-	0x71EE,0xF96E,0x57CE,0x59D3,0x5BAC,0x6027,0x60FA,0x6210,
-	0x661F,0x665F,0x7329,0x73F9,0x76DB,0x7701,0x7B6C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 98, Array index 0x3D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8056,0x8072,0x8165,0x8AA0,0x9192,0x4E16,0x52E2,
-	0x6B72,0x6D17,0x7A05,0x7B39,0x7D30,0xF96F,0x8CB0,0x53EC,
-	0x562F,0x5851,0x5BB5,0x5C0F,0x5C11,0x5DE2,0x6240,0x6383,
-	0x6414,0x662D,0x68B3,0x6CBC,0x6D88,0x6EAF,0x701F,0x70A4,
-	0x71D2,0x7526,0x758F,0x758E,0x7619,0x7B11,0x7BE0,0x7C2B,
-	0x7D20,0x7D39,0x852C,0x856D,0x8607,0x8A34,0x900D,0x9061,
-	0x90B5,0x92B7,0x97F6,0x9A37,0x4FD7,0x5C6C,0x675F,0x6D91,
-	0x7C9F,0x7E8C,0x8B16,0x8D16,0x901F,0x5B6B,0x5DFD,0x640D,
-	0x84C0,0x905C,0x98E1,0x7387,0x5B8B,0x609A,0x677E,0x6DDE,
-	0x8A1F,0x8AA6,0x9001,0x980C,0x5237,0xF970,0x7051,0x788E,
-	0x9396,0x8870,0x91D7,0x4FEE,0x53D7,0x55FD,0x56DA,0x5782,
-	0x58FD,0x5AC2,0x5B88,0x5CAB,0x5CC0,0x5E25,0x6101,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 99, Array index 0x3E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x620D,0x624B,0x6388,0x641C,0x6536,0x6578,0x6A39,
-	0x6B8A,0x6C34,0x6D19,0x6F31,0x71E7,0x72E9,0x7378,0x7407,
-	0x74B2,0x7626,0x7761,0x79C0,0x7A57,0x7AEA,0x7CB9,0x7D8F,
-	0x7DAC,0x7E61,0x7F9E,0x8129,0x8331,0x8490,0x84DA,0x85EA,
-	0x8896,0x8AB0,0x8B90,0x8F38,0x9042,0x9083,0x916C,0x9296,
-	0x92B9,0x968B,0x96A7,0x96A8,0x96D6,0x9700,0x9808,0x9996,
-	0x9AD3,0x9B1A,0x53D4,0x587E,0x5919,0x5B70,0x5BBF,0x6DD1,
-	0x6F5A,0x719F,0x7421,0x74B9,0x8085,0x83FD,0x5DE1,0x5F87,
-	0x5FAA,0x6042,0x65EC,0x6812,0x696F,0x6A53,0x6B89,0x6D35,
-	0x6DF3,0x73E3,0x76FE,0x77AC,0x7B4D,0x7D14,0x8123,0x821C,
-	0x8340,0x84F4,0x8563,0x8A62,0x8AC4,0x9187,0x931E,0x9806,
-	0x99B4,0x620C,0x8853,0x8FF0,0x9265,0x5D07,0x5D27,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 100, Array index 0x3F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D69,0x745F,0x819D,0x8768,0x6FD5,0x62FE,0x7FD2,
-	0x8936,0x8972,0x4E1E,0x4E58,0x50E7,0x52DD,0x5347,0x627F,
-	0x6607,0x7E69,0x8805,0x965E,0x4F8D,0x5319,0x5636,0x59CB,
-	0x5AA4,0x5C38,0x5C4E,0x5C4D,0x5E02,0x5F11,0x6043,0x65BD,
-	0x662F,0x6642,0x67BE,0x67F4,0x731C,0x77E2,0x793A,0x7FC5,
-	0x8494,0x84CD,0x8996,0x8A66,0x8A69,0x8AE1,0x8C55,0x8C7A,
-	0x57F4,0x5BD4,0x5F0F,0x606F,0x62ED,0x690D,0x6B96,0x6E5C,
-	0x7184,0x7BD2,0x8755,0x8B58,0x8EFE,0x98DF,0x98FE,0x4F38,
-	0x4F81,0x4FE1,0x547B,0x5A20,0x5BB8,0x613C,0x65B0,0x6668,
-	0x71FC,0x7533,0x795E,0x7D33,0x814E,0x81E3,0x8398,0x85AA,
-	0x85CE,0x8703,0x8A0A,0x8EAB,0x8F9B,0xF971,0x8FC5,0x5931,
-	0x5BA4,0x5BE6,0x6089,0x5BE9,0x5C0B,0x5FC3,0x6C81,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 101, Array index 0x4000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xF972,0x6DF1,0x700B,0x751A,0x82AF,0x8AF6,0x4EC0,
-	0x5341,0xF973,0x96D9,0x6C0F,0x4E9E,0x4FC4,0x5152,0x555E,
-	0x5A25,0x5CE8,0x6211,0x7259,0x82BD,0x83AA,0x86FE,0x8859,
-	0x8A1D,0x963F,0x96C5,0x9913,0x9D09,0x9D5D,0x580A,0x5CB3,
-	0x5DBD,0x5E44,0x60E1,0x6115,0x63E1,0x6A02,0x6E25,0x9102,
-	0x9354,0x984E,0x9C10,0x9F77,0x5B89,0x5CB8,0x6309,0x664F,
-	0x6848,0x773C,0x96C1,0x978D,0x9854,0x9B9F,0x65A1,0x8B01,
-	0x8ECB,0x95BC,0x5535,0x5CA9,0x5DD6,0x5EB5,0x6697,0x764C,
-	0x83F4,0x95C7,0x58D3,0x62BC,0x72CE,0x9D28,0x4EF0,0x592E,
-	0x600F,0x663B,0x6B83,0x79E7,0x9D26,0x5393,0x54C0,0x57C3,
-	0x5D16,0x611B,0x66D6,0x6DAF,0x788D,0x827E,0x9698,0x9744,
-	0x5384,0x627C,0x6396,0x6DB2,0x7E0A,0x814B,0x984D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 102, Array index 0x4100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6AFB,0x7F4C,0x9DAF,0x9E1A,0x4E5F,0x503B,0x51B6,
-	0x591C,0x60F9,0x63F6,0x6930,0x723A,0x8036,0xF974,0x91CE,
-	0x5F31,0xF975,0xF976,0x7D04,0x82E5,0x846F,0x84BB,0x85E5,
-	0x8E8D,0xF977,0x4F6F,0xF978,0xF979,0x58E4,0x5B43,0x6059,
-	0x63DA,0x6518,0x656D,0x6698,0xF97A,0x694A,0x6A23,0x6D0B,
-	0x7001,0x716C,0x75D2,0x760D,0x79B3,0x7A70,0xF97B,0x7F8A,
-	0xF97C,0x8944,0xF97D,0x8B93,0x91C0,0x967D,0xF97E,0x990A,
-	0x5704,0x5FA1,0x65BC,0x6F01,0x7600,0x79A6,0x8A9E,0x99AD,
-	0x9B5A,0x9F6C,0x5104,0x61B6,0x6291,0x6A8D,0x81C6,0x5043,
-	0x5830,0x5F66,0x7109,0x8A00,0x8AFA,0x5B7C,0x8616,0x4FFA,
-	0x513C,0x56B4,0x5944,0x63A9,0x6DF9,0x5DAA,0x696D,0x5186,
-	0x4E88,0x4F59,0xF97F,0xF980,0xF981,0x5982,0xF982,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 103, Array index 0x4200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xF983,0x6B5F,0x6C5D,0xF984,0x74B5,0x7916,0xF985,
-	0x8207,0x8245,0x8339,0x8F3F,0x8F5D,0xF986,0x9918,0xF987,
-	0xF988,0xF989,0x4EA6,0xF98A,0x57DF,0x5F79,0x6613,0xF98B,
-	0xF98C,0x75AB,0x7E79,0x8B6F,0xF98D,0x9006,0x9A5B,0x56A5,
-	0x5827,0x59F8,0x5A1F,0x5BB4,0xF98E,0x5EF6,0xF98F,0xF990,
-	0x6350,0x633B,0xF991,0x693D,0x6C87,0x6CBF,0x6D8E,0x6D93,
-	0x6DF5,0x6F14,0xF992,0x70DF,0x7136,0x7159,0xF993,0x71C3,
-	0x71D5,0xF994,0x784F,0x786F,0xF995,0x7B75,0x7DE3,0xF996,
-	0x7E2F,0xF997,0x884D,0x8EDF,0xF998,0xF999,0xF99A,0x925B,
-	0xF99B,0x9CF6,0xF99C,0xF99D,0xF99E,0x6085,0x6D85,0xF99F,
-	0x71B1,0xF9A0,0xF9A1,0x95B1,0x53AD,0xF9A2,0xF9A3,0xF9A4,
-	0x67D3,0xF9A5,0x708E,0x7130,0x7430,0x8276,0x82D2,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 104, Array index 0x4300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xF9A6,0x95BB,0x9AE5,0x9E7D,0x66C4,0xF9A7,0x71C1,
-	0x8449,0xF9A8,0xF9A9,0x584B,0xF9AA,0xF9AB,0x5DB8,0x5F71,
-	0xF9AC,0x6620,0x668E,0x6979,0x69AE,0x6C38,0x6CF3,0x6E36,
-	0x6F41,0x6FDA,0x701B,0x702F,0x7150,0x71DF,0x7370,0xF9AD,
-	0x745B,0xF9AE,0x74D4,0x76C8,0x7A4E,0x7E93,0xF9AF,0xF9B0,
-	0x82F1,0x8A60,0x8FCE,0xF9B1,0x9348,0xF9B2,0x9719,0xF9B3,
-	0xF9B4,0x4E42,0x502A,0xF9B5,0x5208,0x53E1,0x66F3,0x6C6D,
-	0x6FCA,0x730A,0x777F,0x7A62,0x82AE,0x85DD,0x8602,0xF9B6,
-	0x88D4,0x8A63,0x8B7D,0x8C6B,0xF9B7,0x92B3,0xF9B8,0x9713,
-	0x9810,0x4E94,0x4F0D,0x4FC9,0x50B2,0x5348,0x543E,0x5433,
-	0x55DA,0x5862,0x58BA,0x5967,0x5A1B,0x5BE4,0x609F,0xF9B9,
-	0x61CA,0x6556,0x65FF,0x6664,0x68A7,0x6C5A,0x6FB3,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 105, Array index 0x4400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x70CF,0x71AC,0x7352,0x7B7D,0x8708,0x8AA4,0x9C32,
-	0x9F07,0x5C4B,0x6C83,0x7344,0x7389,0x923A,0x6EAB,0x7465,
-	0x761F,0x7A69,0x7E15,0x860A,0x5140,0x58C5,0x64C1,0x74EE,
-	0x7515,0x7670,0x7FC1,0x9095,0x96CD,0x9954,0x6E26,0x74E6,
-	0x7AA9,0x7AAA,0x81E5,0x86D9,0x8778,0x8A1B,0x5A49,0x5B8C,
-	0x5B9B,0x68A1,0x6900,0x6D63,0x73A9,0x7413,0x742C,0x7897,
-	0x7DE9,0x7FEB,0x8118,0x8155,0x839E,0x8C4C,0x962E,0x9811,
-	0x66F0,0x5F80,0x65FA,0x6789,0x6C6A,0x738B,0x502D,0x5A03,
-	0x6B6A,0x77EE,0x5916,0x5D6C,0x5DCD,0x7325,0x754F,0xF9BA,
-	0xF9BB,0x50E5,0x51F9,0x582F,0x592D,0x5996,0x59DA,0x5BE5,
-	0xF9BC,0xF9BD,0x5DA2,0x62D7,0x6416,0x6493,0x64FE,0xF9BE,
-	0x66DC,0xF9BF,0x6A48,0xF9C0,0x71FF,0x7464,0xF9C1,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 106, Array index 0x4500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7A88,0x7AAF,0x7E47,0x7E5E,0x8000,0x8170,0xF9C2,
-	0x87EF,0x8981,0x8B20,0x9059,0xF9C3,0x9080,0x9952,0x617E,
-	0x6B32,0x6D74,0x7E1F,0x8925,0x8FB1,0x4FD1,0x50AD,0x5197,
-	0x52C7,0x57C7,0x5889,0x5BB9,0x5EB8,0x6142,0x6995,0x6D8C,
-	0x6E67,0x6EB6,0x7194,0x7462,0x7528,0x752C,0x8073,0x8338,
-	0x84C9,0x8E0A,0x9394,0x93DE,0xF9C4,0x4E8E,0x4F51,0x5076,
-	0x512A,0x53C8,0x53CB,0x53F3,0x5B87,0x5BD3,0x5C24,0x611A,
-	0x6182,0x65F4,0x725B,0x7397,0x7440,0x76C2,0x7950,0x7991,
-	0x79B9,0x7D06,0x7FBD,0x828B,0x85D5,0x865E,0x8FC2,0x9047,
-	0x90F5,0x91EA,0x9685,0x96E8,0x96E9,0x52D6,0x5F67,0x65ED,
-	0x6631,0x682F,0x715C,0x7A36,0x90C1,0x980A,0x4E91,0xF9C5,
-	0x6A52,0x6B9E,0x6F90,0x7189,0x8018,0x82B8,0x8553,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 107, Array index 0x4600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x904B,0x9695,0x96F2,0x97FB,0x851A,0x9B31,0x4E90,
-	0x718A,0x96C4,0x5143,0x539F,0x54E1,0x5713,0x5712,0x57A3,
-	0x5A9B,0x5AC4,0x5BC3,0x6028,0x613F,0x63F4,0x6C85,0x6D39,
-	0x6E72,0x6E90,0x7230,0x733F,0x7457,0x82D1,0x8881,0x8F45,
-	0x9060,0xF9C6,0x9662,0x9858,0x9D1B,0x6708,0x8D8A,0x925E,
-	0x4F4D,0x5049,0x50DE,0x5371,0x570D,0x59D4,0x5A01,0x5C09,
-	0x6170,0x6690,0x6E2D,0x7232,0x744B,0x7DEF,0x80C3,0x840E,
-	0x8466,0x853F,0x875F,0x885B,0x8918,0x8B02,0x9055,0x97CB,
-	0x9B4F,0x4E73,0x4F91,0x5112,0x516A,0xF9C7,0x552F,0x55A9,
-	0x5B7A,0x5BA5,0x5E7C,0x5E7D,0x5EBE,0x60A0,0x60DF,0x6108,
-	0x6109,0x63C4,0x6538,0x6709,0xF9C8,0x67D4,0x67DA,0xF9C9,
-	0x6961,0x6962,0x6CB9,0x6D27,0xF9CA,0x6E38,0xF9CB,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 108, Array index 0x4700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6FE1,0x7336,0x7337,0xF9CC,0x745C,0x7531,0xF9CD,
-	0x7652,0xF9CE,0xF9CF,0x7DAD,0x81FE,0x8438,0x88D5,0x8A98,
-	0x8ADB,0x8AED,0x8E30,0x8E42,0x904A,0x903E,0x907A,0x9149,
-	0x91C9,0x936E,0xF9D0,0xF9D1,0x5809,0xF9D2,0x6BD3,0x8089,
-	0x80B2,0xF9D3,0xF9D4,0x5141,0x596B,0x5C39,0xF9D5,0xF9D6,
-	0x6F64,0x73A7,0x80E4,0x8D07,0xF9D7,0x9217,0x958F,0xF9D8,
-	0xF9D9,0xF9DA,0xF9DB,0x807F,0x620E,0x701C,0x7D68,0x878D,
-	0xF9DC,0x57A0,0x6069,0x6147,0x6BB7,0x8ABE,0x9280,0x96B1,
-	0x4E59,0x541F,0x6DEB,0x852D,0x9670,0x97F3,0x98EE,0x63D6,
-	0x6CE3,0x9091,0x51DD,0x61C9,0x81BA,0x9DF9,0x4F9D,0x501A,
-	0x5100,0x5B9C,0x610F,0x61FF,0x64EC,0x6905,0x6BC5,0x7591,
-	0x77E3,0x7FA9,0x8264,0x858F,0x87FB,0x8863,0x8ABC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 109, Array index 0x4800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8B70,0x91AB,0x4E8C,0x4EE5,0x4F0A,0xF9DD,0xF9DE,
-	0x5937,0x59E8,0xF9DF,0x5DF2,0x5F1B,0x5F5B,0x6021,0xF9E0,
-	0xF9E1,0xF9E2,0xF9E3,0x723E,0x73E5,0xF9E4,0x7570,0x75CD,
-	0xF9E5,0x79FB,0xF9E6,0x800C,0x8033,0x8084,0x82E1,0x8351,
-	0xF9E7,0xF9E8,0x8CBD,0x8CB3,0x9087,0xF9E9,0xF9EA,0x98F4,
-	0x990C,0xF9EB,0xF9EC,0x7037,0x76CA,0x7FCA,0x7FCC,0x7FFC,
-	0x8B1A,0x4EBA,0x4EC1,0x5203,0x5370,0xF9ED,0x54BD,0x56E0,
-	0x59FB,0x5BC5,0x5F15,0x5FCD,0x6E6E,0xF9EE,0xF9EF,0x7D6A,
-	0x8335,0xF9F0,0x8693,0x8A8D,0xF9F1,0x976D,0x9777,0xF9F2,
-	0xF9F3,0x4E00,0x4F5A,0x4F7E,0x58F9,0x65E5,0x6EA2,0x9038,
-	0x93B0,0x99B9,0x4EFB,0x58EC,0x598A,0x59D9,0x6041,0xF9F4,
-	0xF9F5,0x7A14,0xF9F6,0x834F,0x8CC3,0x5165,0x5344,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 110, Array index 0x4900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xF9F7,0xF9F8,0xF9F9,0x4ECD,0x5269,0x5B55,0x82BF,
-	0x4ED4,0x523A,0x54A8,0x59C9,0x59FF,0x5B50,0x5B57,0x5B5C,
-	0x6063,0x6148,0x6ECB,0x7099,0x716E,0x7386,0x74F7,0x75B5,
-	0x78C1,0x7D2B,0x8005,0x81EA,0x8328,0x8517,0x85C9,0x8AEE,
-	0x8CC7,0x96CC,0x4F5C,0x52FA,0x56BC,0x65AB,0x6628,0x707C,
-	0x70B8,0x7235,0x7DBD,0x828D,0x914C,0x96C0,0x9D72,0x5B71,
-	0x68E7,0x6B98,0x6F7A,0x76DE,0x5C91,0x66AB,0x6F5B,0x7BB4,
-	0x7C2A,0x8836,0x96DC,0x4E08,0x4ED7,0x5320,0x5834,0x58BB,
-	0x58EF,0x596C,0x5C07,0x5E33,0x5E84,0x5F35,0x638C,0x66B2,
-	0x6756,0x6A1F,0x6AA3,0x6B0C,0x6F3F,0x7246,0xF9FA,0x7350,
-	0x748B,0x7AE0,0x7CA7,0x8178,0x81DF,0x81E7,0x838A,0x846C,
-	0x8523,0x8594,0x85CF,0x88DD,0x8D13,0x91AC,0x9577,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 111, Array index 0x4A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x969C,0x518D,0x54C9,0x5728,0x5BB0,0x624D,0x6750,
-	0x683D,0x6893,0x6E3D,0x6ED3,0x707D,0x7E21,0x88C1,0x8CA1,
-	0x8F09,0x9F4B,0x9F4E,0x722D,0x7B8F,0x8ACD,0x931A,0x4F47,
-	0x4F4E,0x5132,0x5480,0x59D0,0x5E95,0x62B5,0x6775,0x696E,
-	0x6A17,0x6CAE,0x6E1A,0x72D9,0x732A,0x75BD,0x7BB8,0x7D35,
-	0x82E7,0x83F9,0x8457,0x85F7,0x8A5B,0x8CAF,0x8E87,0x9019,
-	0x90B8,0x96CE,0x9F5F,0x52E3,0x540A,0x5AE1,0x5BC2,0x6458,
-	0x6575,0x6EF4,0x72C4,0xF9FB,0x7684,0x7A4D,0x7B1B,0x7C4D,
-	0x7E3E,0x7FDF,0x837B,0x8B2B,0x8CCA,0x8D64,0x8DE1,0x8E5F,
-	0x8FEA,0x8FF9,0x9069,0x93D1,0x4F43,0x4F7A,0x50B3,0x5168,
-	0x5178,0x524D,0x526A,0x5861,0x587C,0x5960,0x5C08,0x5C55,
-	0x5EDB,0x609B,0x6230,0x6813,0x6BBF,0x6C08,0x6FB1,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 112, Array index 0x4B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x714E,0x7420,0x7530,0x7538,0x7551,0x7672,0x7B4C,
-	0x7B8B,0x7BAD,0x7BC6,0x7E8F,0x8A6E,0x8F3E,0x8F49,0x923F,
-	0x9293,0x9322,0x942B,0x96FB,0x985A,0x986B,0x991E,0x5207,
-	0x622A,0x6298,0x6D59,0x7664,0x7ACA,0x7BC0,0x7D76,0x5360,
-	0x5CBE,0x5E97,0x6F38,0x70B9,0x7C98,0x9711,0x9B8E,0x9EDE,
-	0x63A5,0x647A,0x8776,0x4E01,0x4E95,0x4EAD,0x505C,0x5075,
-	0x5448,0x59C3,0x5B9A,0x5E40,0x5EAD,0x5EF7,0x5F81,0x60C5,
-	0x633A,0x653F,0x6574,0x65CC,0x6676,0x6678,0x67FE,0x6968,
-	0x6A89,0x6B63,0x6C40,0x6DC0,0x6DE8,0x6E1F,0x6E5E,0x701E,
-	0x70A1,0x738E,0x73FD,0x753A,0x775B,0x7887,0x798E,0x7A0B,
-	0x7A7D,0x7CBE,0x7D8E,0x8247,0x8A02,0x8AEA,0x8C9E,0x912D,
-	0x914A,0x91D8,0x9266,0x92CC,0x9320,0x9706,0x9756,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 113, Array index 0x4C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x975C,0x9802,0x9F0E,0x5236,0x5291,0x557C,0x5824,
-	0x5E1D,0x5F1F,0x608C,0x63D0,0x68AF,0x6FDF,0x796D,0x7B2C,
-	0x81CD,0x85BA,0x88FD,0x8AF8,0x8E44,0x918D,0x9664,0x969B,
-	0x973D,0x984C,0x9F4A,0x4FCE,0x5146,0x51CB,0x52A9,0x5632,
-	0x5F14,0x5F6B,0x63AA,0x64CD,0x65E9,0x6641,0x66FA,0x66F9,
-	0x671D,0x689D,0x68D7,0x69FD,0x6F15,0x6F6E,0x7167,0x71E5,
-	0x722A,0x74AA,0x773A,0x7956,0x795A,0x79DF,0x7A20,0x7A95,
-	0x7C97,0x7CDF,0x7D44,0x7E70,0x8087,0x85FB,0x86A4,0x8A54,
-	0x8ABF,0x8D99,0x8E81,0x9020,0x906D,0x91E3,0x963B,0x96D5,
-	0x9CE5,0x65CF,0x7C07,0x8DB3,0x93C3,0x5B58,0x5C0A,0x5352,
-	0x62D9,0x731D,0x5027,0x5B97,0x5F9E,0x60B0,0x616B,0x68D5,
-	0x6DD9,0x742E,0x7A2E,0x7D42,0x7D9C,0x7E31,0x816B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 114, Array index 0x4D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8E2A,0x8E35,0x937E,0x9418,0x4F50,0x5750,0x5DE6,
-	0x5EA7,0x632B,0x7F6A,0x4E3B,0x4F4F,0x4F8F,0x505A,0x59DD,
-	0x80C4,0x546A,0x5468,0x55FE,0x594F,0x5B99,0x5DDE,0x5EDA,
-	0x665D,0x6731,0x67F1,0x682A,0x6CE8,0x6D32,0x6E4A,0x6F8D,
-	0x70B7,0x73E0,0x7587,0x7C4C,0x7D02,0x7D2C,0x7DA2,0x821F,
-	0x86DB,0x8A3B,0x8A85,0x8D70,0x8E8A,0x8F33,0x9031,0x914E,
-	0x9152,0x9444,0x99D0,0x7AF9,0x7CA5,0x4FCA,0x5101,0x51C6,
-	0x57C8,0x5BEF,0x5CFB,0x6659,0x6A3D,0x6D5A,0x6E96,0x6FEC,
-	0x710C,0x756F,0x7AE3,0x8822,0x9021,0x9075,0x96CB,0x99FF,
-	0x8301,0x4E2D,0x4EF2,0x8846,0x91CD,0x537D,0x6ADB,0x696B,
-	0x6C41,0x847A,0x589E,0x618E,0x66FE,0x62EF,0x70DD,0x7511,
-	0x75C7,0x7E52,0x84B8,0x8B49,0x8D08,0x4E4B,0x53EA,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 115, Array index 0x4E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x54AB,0x5730,0x5740,0x5FD7,0x6301,0x6307,0x646F,
-	0x652F,0x65E8,0x667A,0x679D,0x67B3,0x6B62,0x6C60,0x6C9A,
-	0x6F2C,0x77E5,0x7825,0x7949,0x7957,0x7D19,0x80A2,0x8102,
-	0x81F3,0x829D,0x82B7,0x8718,0x8A8C,0xF9FC,0x8D04,0x8DBE,
-	0x9072,0x76F4,0x7A19,0x7A37,0x7E54,0x8077,0x5507,0x55D4,
-	0x5875,0x632F,0x6422,0x6649,0x664B,0x686D,0x699B,0x6B84,
-	0x6D25,0x6EB1,0x73CD,0x7468,0x74A1,0x755B,0x75B9,0x76E1,
-	0x771E,0x778B,0x79E6,0x7E09,0x7E1D,0x81FB,0x852F,0x8897,
-	0x8A3A,0x8CD1,0x8EEB,0x8FB0,0x9032,0x93AD,0x9663,0x9673,
-	0x9707,0x4F84,0x53F1,0x59EA,0x5AC9,0x5E19,0x684E,0x74C6,
-	0x75BE,0x79E9,0x7A92,0x81A3,0x86ED,0x8CEA,0x8DCC,0x8FED,
-	0x659F,0x6715,0xF9FD,0x57F7,0x6F57,0x7DDD,0x8F2F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 116, Array index 0x4F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x93F6,0x96C6,0x5FB5,0x61F2,0x6F84,0x4E14,0x4F98,
-	0x501F,0x53C9,0x55DF,0x5D6F,0x5DEE,0x6B21,0x6B64,0x78CB,
-	0x7B9A,0xF9FE,0x8E49,0x8ECA,0x906E,0x6349,0x643E,0x7740,
-	0x7A84,0x932F,0x947F,0x9F6A,0x64B0,0x6FAF,0x71E6,0x74A8,
-	0x74DA,0x7AC4,0x7C12,0x7E82,0x7CB2,0x7E98,0x8B9A,0x8D0A,
-	0x947D,0x9910,0x994C,0x5239,0x5BDF,0x64E6,0x672D,0x7D2E,
-	0x50ED,0x53C3,0x5879,0x6158,0x6159,0x61FA,0x65AC,0x7AD9,
-	0x8B92,0x8B96,0x5009,0x5021,0x5275,0x5531,0x5A3C,0x5EE0,
-	0x5F70,0x6134,0x655E,0x660C,0x6636,0x66A2,0x69CD,0x6EC4,
-	0x6F32,0x7316,0x7621,0x7A93,0x8139,0x8259,0x83D6,0x84BC,
-	0x50B5,0x57F0,0x5BC0,0x5BE8,0x5F69,0x63A1,0x7826,0x7DB5,
-	0x83DC,0x8521,0x91C7,0x91F5,0x518A,0x67F5,0x7B56,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 117, Array index 0x5000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8CAC,0x51C4,0x59BB,0x60BD,0x8655,0x501C,0xF9FF,
-	0x5254,0x5C3A,0x617D,0x621A,0x62D3,0x64F2,0x65A5,0x6ECC,
-	0x7620,0x810A,0x8E60,0x965F,0x96BB,0x4EDF,0x5343,0x5598,
-	0x5929,0x5DDD,0x64C5,0x6CC9,0x6DFA,0x7394,0x7A7F,0x821B,
-	0x85A6,0x8CE4,0x8E10,0x9077,0x91E7,0x95E1,0x9621,0x97C6,
-	0x51F8,0x54F2,0x5586,0x5FB9,0x64A4,0x6F88,0x7DB4,0x8F1F,
-	0x8F4D,0x9435,0x50C9,0x5C16,0x6CBE,0x6DFB,0x751B,0x77BB,
-	0x7C3D,0x7C64,0x8A79,0x8AC2,0x581E,0x59BE,0x5E16,0x6377,
-	0x7252,0x758A,0x776B,0x8ADC,0x8CBC,0x8F12,0x5EF3,0x6674,
-	0x6DF8,0x807D,0x83C1,0x8ACB,0x9751,0x9BD6,0xFA00,0x5243,
-	0x66FF,0x6D95,0x6EEF,0x7DE0,0x8AE6,0x902E,0x905E,0x9AD4,
-	0x521D,0x527F,0x54E8,0x6194,0x6284,0x62DB,0x68A2,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 118, Array index 0x5100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6912,0x695A,0x6A35,0x7092,0x7126,0x785D,0x7901,
-	0x790E,0x79D2,0x7A0D,0x8096,0x8278,0x82D5,0x8349,0x8549,
-	0x8C82,0x8D85,0x9162,0x918B,0x91AE,0x4FC3,0x56D1,0x71ED,
-	0x77D7,0x8700,0x89F8,0x5BF8,0x5FD6,0x6751,0x90A8,0x53E2,
-	0x585A,0x5BF5,0x60A4,0x6181,0x6460,0x7E3D,0x8070,0x8525,
-	0x9283,0x64AE,0x50AC,0x5D14,0x6700,0x589C,0x62BD,0x63A8,
-	0x690E,0x6978,0x6A1E,0x6E6B,0x76BA,0x79CB,0x82BB,0x8429,
-	0x8ACF,0x8DA8,0x8FFD,0x9112,0x914B,0x919C,0x9310,0x9318,
-	0x939A,0x96DB,0x9A36,0x9C0D,0x4E11,0x755C,0x795D,0x7AFA,
-	0x7B51,0x7BC9,0x7E2E,0x84C4,0x8E59,0x8E74,0x8EF8,0x9010,
-	0x6625,0x693F,0x7443,0x51FA,0x672E,0x9EDC,0x5145,0x5FE0,
-	0x6C96,0x87F2,0x885D,0x8877,0x60B4,0x81B5,0x8403,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 119, Array index 0x5200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x8D05,0x53D6,0x5439,0x5634,0x5A36,0x5C31,0x708A,
-	0x7FE0,0x805A,0x8106,0x81ED,0x8DA3,0x9189,0x9A5F,0x9DF2,
-	0x5074,0x4EC4,0x53A0,0x60FB,0x6E2C,0x5C64,0x4F88,0x5024,
-	0x55E4,0x5CD9,0x5E5F,0x6065,0x6894,0x6CBB,0x6DC4,0x71BE,
-	0x75D4,0x75F4,0x7661,0x7A1A,0x7A49,0x7DC7,0x7DFB,0x7F6E,
-	0x81F4,0x86A9,0x8F1C,0x96C9,0x99B3,0x9F52,0x5247,0x52C5,
-	0x98ED,0x89AA,0x4E03,0x67D2,0x6F06,0x4FB5,0x5BE2,0x6795,
-	0x6C88,0x6D78,0x741B,0x7827,0x91DD,0x937C,0x87C4,0x79E4,
-	0x7A31,0x5FEB,0x4ED6,0x54A4,0x553E,0x58AE,0x59A5,0x60F0,
-	0x6253,0x62D6,0x6736,0x6955,0x8235,0x9640,0x99B1,0x99DD,
-	0x502C,0x5353,0x5544,0x577C,0xFA01,0x6258,0xFA02,0x64E2,
-	0x666B,0x67DD,0x6FC1,0x6FEF,0x7422,0x7438,0x8A17,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 120, Array index 0x5300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x9438,0x5451,0x5606,0x5766,0x5F48,0x619A,0x6B4E,
-	0x7058,0x70AD,0x7DBB,0x8A95,0x596A,0x812B,0x63A2,0x7708,
-	0x803D,0x8CAA,0x5854,0x642D,0x69BB,0x5B95,0x5E11,0x6E6F,
-	0xFA03,0x8569,0x514C,0x53F0,0x592A,0x6020,0x614B,0x6B86,
-	0x6C70,0x6CF0,0x7B1E,0x80CE,0x82D4,0x8DC6,0x90B0,0x98B1,
-	0xFA04,0x64C7,0x6FA4,0x6491,0x6504,0x514E,0x5410,0x571F,
-	0x8A0E,0x615F,0x6876,0xFA05,0x75DB,0x7B52,0x7D71,0x901A,
-	0x5806,0x69CC,0x817F,0x892A,0x9000,0x9839,0x5078,0x5957,
-	0x59AC,0x6295,0x900F,0x9B2A,0x615D,0x7279,0x95D6,0x5761,
-	0x5A46,0x5DF4,0x628A,0x64AD,0x64FA,0x6777,0x6CE2,0x6D3E,
-	0x722C,0x7436,0x7834,0x7F77,0x82AD,0x8DDB,0x9817,0x5224,
-	0x5742,0x677F,0x7248,0x74E3,0x8CA9,0x8FA6,0x9211,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 121, Array index 0x5400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x962A,0x516B,0x53ED,0x634C,0x4F69,0x5504,0x6096,
-	0x6557,0x6C9B,0x6D7F,0x724C,0x72FD,0x7A17,0x8987,0x8C9D,
-	0x5F6D,0x6F8E,0x70F9,0x81A8,0x610E,0x4FBF,0x504F,0x6241,
-	0x7247,0x7BC7,0x7DE8,0x7FE9,0x904D,0x97AD,0x9A19,0x8CB6,
-	0x576A,0x5E73,0x67B0,0x840D,0x8A55,0x5420,0x5B16,0x5E63,
-	0x5EE2,0x5F0A,0x6583,0x80BA,0x853D,0x9589,0x965B,0x4F48,
-	0x5305,0x530D,0x530F,0x5486,0x54FA,0x5703,0x5E03,0x6016,
-	0x629B,0x62B1,0x6355,0xFA06,0x6CE1,0x6D66,0x75B1,0x7832,
-	0x80DE,0x812F,0x82DE,0x8461,0x84B2,0x888D,0x8912,0x900B,
-	0x92EA,0x98FD,0x9B91,0x5E45,0x66B4,0x66DD,0x7011,0x7206,
-	0xFA07,0x4FF5,0x527D,0x5F6A,0x6153,0x6753,0x6A19,0x6F02,
-	0x74E2,0x7968,0x8868,0x8C79,0x98C7,0x98C4,0x9A43,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 122, Array index 0x5500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x54C1,0x7A1F,0x6953,0x8AF7,0x8C4A,0x98A8,0x99AE,
-	0x5F7C,0x62AB,0x75B2,0x76AE,0x88AB,0x907F,0x9642,0x5339,
-	0x5F3C,0x5FC5,0x6CCC,0x73CC,0x7562,0x758B,0x7B46,0x82FE,
-	0x999D,0x4E4F,0x903C,0x4E0B,0x4F55,0x53A6,0x590F,0x5EC8,
-	0x6630,0x6CB3,0x7455,0x8377,0x8766,0x8CC0,0x9050,0x971E,
-	0x9C15,0x58D1,0x5B78,0x8650,0x8B14,0x9DB4,0x5BD2,0x6068,
-	0x608D,0x65F1,0x6C57,0x6F22,0x6FA3,0x701A,0x7F55,0x7FF0,
-	0x9591,0x9592,0x9650,0x97D3,0x5272,0x8F44,0x51FD,0x542B,
-	0x54B8,0x5563,0x558A,0x6ABB,0x6DB5,0x7DD8,0x8266,0x929C,
-	0x9677,0x9E79,0x5408,0x54C8,0x76D2,0x86E4,0x95A4,0x95D4,
-	0x965C,0x4EA2,0x4F09,0x59EE,0x5AE6,0x5DF7,0x6052,0x6297,
-	0x676D,0x6841,0x6C86,0x6E2F,0x7F38,0x809B,0x822A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 123, Array index 0x5600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0xFA08,0xFA09,0x9805,0x4EA5,0x5055,0x54B3,0x5793,
-	0x595A,0x5B69,0x5BB3,0x61C8,0x6977,0x6D77,0x7023,0x87F9,
-	0x89E3,0x8A72,0x8AE7,0x9082,0x99ED,0x9AB8,0x52BE,0x6838,
-	0x5016,0x5E78,0x674F,0x8347,0x884C,0x4EAB,0x5411,0x56AE,
-	0x73E6,0x9115,0x97FF,0x9909,0x9957,0x9999,0x5653,0x589F,
-	0x865B,0x8A31,0x61B2,0x6AF6,0x737B,0x8ED2,0x6B47,0x96AA,
-	0x9A57,0x5955,0x7200,0x8D6B,0x9769,0x4FD4,0x5CF4,0x5F26,
-	0x61F8,0x665B,0x6CEB,0x70AB,0x7384,0x73B9,0x73FE,0x7729,
-	0x774D,0x7D43,0x7D62,0x7E23,0x8237,0x8852,0xFA0A,0x8CE2,
-	0x9249,0x986F,0x5B51,0x7A74,0x8840,0x9801,0x5ACC,0x4FE0,
-	0x5354,0x593E,0x5CFD,0x633E,0x6D79,0x72F9,0x8105,0x8107,
-	0x83A2,0x92CF,0x9830,0x4EA8,0x5144,0x5211,0x578B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 124, Array index 0x5700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F62,0x6CC2,0x6ECE,0x7005,0x7050,0x70AF,0x7192,
-	0x73E9,0x7469,0x834A,0x87A2,0x8861,0x9008,0x90A2,0x93A3,
-	0x99A8,0x516E,0x5F57,0x60E0,0x6167,0x66B3,0x8559,0x8E4A,
-	0x91AF,0x978B,0x4E4E,0x4E92,0x547C,0x58D5,0x58FA,0x597D,
-	0x5CB5,0x5F27,0x6236,0x6248,0x660A,0x6667,0x6BEB,0x6D69,
-	0x6DCF,0x6E56,0x6EF8,0x6F94,0x6FE0,0x6FE9,0x705D,0x72D0,
-	0x7425,0x745A,0x74E0,0x7693,0x795C,0x7CCA,0x7E1E,0x80E1,
-	0x82A6,0x846B,0x84BF,0x864E,0x865F,0x8774,0x8B77,0x8C6A,
-	0x93AC,0x9800,0x9865,0x60D1,0x6216,0x9177,0x5A5A,0x660F,
-	0x6DF7,0x6E3E,0x743F,0x9B42,0x5FFD,0x60DA,0x7B0F,0x54C4,
-	0x5F18,0x6C5E,0x6CD3,0x6D2A,0x70D8,0x7D05,0x8679,0x8A0C,
-	0x9D3B,0x5316,0x548C,0x5B05,0x6A3A,0x706B,0x7575,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 125, Array index 0x5800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x798D,0x79BE,0x82B1,0x83EF,0x8A71,0x8B41,0x8CA8,
-	0x9774,0xFA0B,0x64F4,0x652B,0x78BA,0x78BB,0x7A6B,0x4E38,
-	0x559A,0x5950,0x5BA6,0x5E7B,0x60A3,0x63DB,0x6B61,0x6665,
-	0x6853,0x6E19,0x7165,0x74B0,0x7D08,0x9084,0x9A69,0x9C25,
-	0x6D3B,0x6ED1,0x733E,0x8C41,0x95CA,0x51F0,0x5E4C,0x5FA8,
-	0x604D,0x60F6,0x6130,0x614C,0x6643,0x6644,0x69A5,0x6CC1,
-	0x6E5F,0x6EC9,0x6F62,0x714C,0x749C,0x7687,0x7BC1,0x7C27,
-	0x8352,0x8757,0x9051,0x968D,0x9EC3,0x532F,0x56DE,0x5EFB,
-	0x5F8A,0x6062,0x6094,0x61F7,0x6666,0x6703,0x6A9C,0x6DEE,
-	0x6FAE,0x7070,0x736A,0x7E6A,0x81BE,0x8334,0x86D4,0x8AA8,
-	0x8CC4,0x5283,0x7372,0x5B96,0x6A6B,0x9404,0x54EE,0x5686,
-	0x5B5D,0x6548,0x6585,0x66C9,0x689F,0x6D8D,0x6DC6,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 126, Array index 0x5900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x723B,0x80B4,0x9175,0x9A4D,0x4FAF,0x5019,0x539A,
-	0x540E,0x543C,0x5589,0x55C5,0x5E3F,0x5F8C,0x673D,0x7166,
-	0x73DD,0x9005,0x52DB,0x52F3,0x5864,0x58CE,0x7104,0x718F,
-	0x71FB,0x85B0,0x8A13,0x6688,0x85A8,0x55A7,0x6684,0x714A,
-	0x8431,0x5349,0x5599,0x6BC1,0x5F59,0x5FBD,0x63EE,0x6689,
-	0x7147,0x8AF1,0x8F1D,0x9EBE,0x4F11,0x643A,0x70CB,0x7566,
-	0x8667,0x6064,0x8B4E,0x9DF8,0x5147,0x51F6,0x5308,0x6D36,
-	0x80F8,0x9ED1,0x6615,0x6B23,0x7098,0x75D5,0x5403,0x5C79,
-	0x7D07,0x8A16,0x6B20,0x6B3D,0x6B46,0x5438,0x6070,0x6D3D,
-	0x7FD5,0x8208,0x50D6,0x51DE,0x559C,0x566B,0x56CD,0x59EC,
-	0x5B09,0x5E0C,0x6199,0x6198,0x6231,0x665E,0x66E6,0x7199,
-	0x71B9,0x71BA,0x72A7,0x79A7,0x7A00,0x7FB2,0x8A70,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_TO_UCS_CCS_KSX1001 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit ksx1001 -> UCS size-optimized table (17018 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_KSX1001) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-to_ucs_size_ksx1001[] =
-{
-	0x005D, /* Ranges number */
-	0x0000, /* Unranged codes number */
-	0x213D, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x2121, 0x217E, 0x011A,
-	/* Array index: 0x0006 */ 0x2221, 0x2265, 0x0178,
-	/* Array index: 0x0009 */ 0x2321, 0x237E, 0x01BD,
-	/* Array index: 0x000C */ 0x2421, 0x247E, 0x021B,
-	/* Array index: 0x000F */ 0x2521, 0x252A, 0x0279,
-	/* Array index: 0x0012 */ 0x2530, 0x2539, 0x0283,
-	/* Array index: 0x0015 */ 0x2541, 0x2558, 0x028D,
-	/* Array index: 0x0018 */ 0x2561, 0x2578, 0x02A5,
-	/* Array index: 0x001B */ 0x2621, 0x2664, 0x02BD,
-	/* Array index: 0x001E */ 0x2721, 0x276F, 0x0301,
-	/* Array index: 0x0021 */ 0x2821, 0x287E, 0x0350,
-	/* Array index: 0x0024 */ 0x2921, 0x297E, 0x03AE,
-	/* Array index: 0x0027 */ 0x2A21, 0x2A73, 0x040C,
-	/* Array index: 0x002A */ 0x2B21, 0x2B76, 0x045F,
-	/* Array index: 0x002D */ 0x2C21, 0x2C41, 0x04B5,
-	/* Array index: 0x0030 */ 0x2C51, 0x2C71, 0x04D6,
-	/* Array index: 0x0033 */ 0x3021, 0x307E, 0x04F7,
-	/* Array index: 0x0036 */ 0x3121, 0x317E, 0x0555,
-	/* Array index: 0x0039 */ 0x3221, 0x327E, 0x05B3,
-	/* Array index: 0x003C */ 0x3321, 0x337E, 0x0611,
-	/* Array index: 0x003F */ 0x3421, 0x347E, 0x066F,
-	/* Array index: 0x0042 */ 0x3521, 0x357E, 0x06CD,
-	/* Array index: 0x0045 */ 0x3621, 0x367E, 0x072B,
-	/* Array index: 0x0048 */ 0x3721, 0x377E, 0x0789,
-	/* Array index: 0x004B */ 0x3821, 0x387E, 0x07E7,
-	/* Array index: 0x004E */ 0x3921, 0x397E, 0x0845,
-	/* Array index: 0x0051 */ 0x3A21, 0x3A7E, 0x08A3,
-	/* Array index: 0x0054 */ 0x3B21, 0x3B7E, 0x0901,
-	/* Array index: 0x0057 */ 0x3C21, 0x3C7E, 0x095F,
-	/* Array index: 0x005A */ 0x3D21, 0x3D7E, 0x09BD,
-	/* Array index: 0x005D */ 0x3E21, 0x3E7E, 0x0A1B,
-	/* Array index: 0x0060 */ 0x3F21, 0x3F7E, 0x0A79,
-	/* Array index: 0x0063 */ 0x4021, 0x407E, 0x0AD7,
-	/* Array index: 0x0066 */ 0x4121, 0x417E, 0x0B35,
-	/* Array index: 0x0069 */ 0x4221, 0x427E, 0x0B93,
-	/* Array index: 0x006C */ 0x4321, 0x437E, 0x0BF1,
-	/* Array index: 0x006F */ 0x4421, 0x447E, 0x0C4F,
-	/* Array index: 0x0072 */ 0x4521, 0x457E, 0x0CAD,
-	/* Array index: 0x0075 */ 0x4621, 0x467E, 0x0D0B,
-	/* Array index: 0x0078 */ 0x4721, 0x477E, 0x0D69,
-	/* Array index: 0x007B */ 0x4821, 0x487E, 0x0DC7,
-	/* Array index: 0x007E */ 0x4A21, 0x4A7E, 0x0E25,
-	/* Array index: 0x0081 */ 0x4B21, 0x4B7E, 0x0E83,
-	/* Array index: 0x0084 */ 0x4C21, 0x4C7E, 0x0EE1,
-	/* Array index: 0x0087 */ 0x4D21, 0x4D7E, 0x0F3F,
-	/* Array index: 0x008A */ 0x4E21, 0x4E7E, 0x0F9D,
-	/* Array index: 0x008D */ 0x4F21, 0x4F7E, 0x0FFB,
-	/* Array index: 0x0090 */ 0x5021, 0x507E, 0x1059,
-	/* Array index: 0x0093 */ 0x5121, 0x517E, 0x10B7,
-	/* Array index: 0x0096 */ 0x5221, 0x527E, 0x1115,
-	/* Array index: 0x0099 */ 0x5321, 0x537E, 0x1173,
-	/* Array index: 0x009C */ 0x5421, 0x547E, 0x11D1,
-	/* Array index: 0x009F */ 0x5521, 0x557E, 0x122F,
-	/* Array index: 0x00A2 */ 0x5621, 0x567E, 0x128D,
-	/* Array index: 0x00A5 */ 0x5721, 0x577E, 0x12EB,
-	/* Array index: 0x00A8 */ 0x5821, 0x587E, 0x1349,
-	/* Array index: 0x00AB */ 0x5921, 0x597E, 0x13A7,
-	/* Array index: 0x00AE */ 0x5A21, 0x5A7E, 0x1405,
-	/* Array index: 0x00B1 */ 0x5B21, 0x5B7E, 0x1463,
-	/* Array index: 0x00B4 */ 0x5C21, 0x5C7E, 0x14C1,
-	/* Array index: 0x00B7 */ 0x5D21, 0x5D7E, 0x151F,
-	/* Array index: 0x00BA */ 0x5E21, 0x5E7E, 0x157D,
-	/* Array index: 0x00BD */ 0x5F21, 0x5F7E, 0x15DB,
-	/* Array index: 0x00C0 */ 0x6021, 0x607E, 0x1639,
-	/* Array index: 0x00C3 */ 0x6121, 0x617E, 0x1697,
-	/* Array index: 0x00C6 */ 0x6221, 0x627E, 0x16F5,
-	/* Array index: 0x00C9 */ 0x6321, 0x637E, 0x1753,
-	/* Array index: 0x00CC */ 0x6421, 0x647E, 0x17B1,
-	/* Array index: 0x00CF */ 0x6521, 0x657E, 0x180F,
-	/* Array index: 0x00D2 */ 0x6621, 0x667E, 0x186D,
-	/* Array index: 0x00D5 */ 0x6721, 0x677E, 0x18CB,
-	/* Array index: 0x00D8 */ 0x6821, 0x687E, 0x1929,
-	/* Array index: 0x00DB */ 0x6921, 0x697E, 0x1987,
-	/* Array index: 0x00DE */ 0x6A21, 0x6A7E, 0x19E5,
-	/* Array index: 0x00E1 */ 0x6B21, 0x6B7E, 0x1A43,
-	/* Array index: 0x00E4 */ 0x6C21, 0x6C7E, 0x1AA1,
-	/* Array index: 0x00E7 */ 0x6D21, 0x6D7E, 0x1AFF,
-	/* Array index: 0x00EA */ 0x6E21, 0x6E7E, 0x1B5D,
-	/* Array index: 0x00ED */ 0x6F21, 0x6F7E, 0x1BBB,
-	/* Array index: 0x00F0 */ 0x7021, 0x707E, 0x1C19,
-	/* Array index: 0x00F3 */ 0x7121, 0x717E, 0x1C77,
-	/* Array index: 0x00F6 */ 0x7221, 0x727E, 0x1CD5,
-	/* Array index: 0x00F9 */ 0x7321, 0x737E, 0x1D33,
-	/* Array index: 0x00FC */ 0x7421, 0x747E, 0x1D91,
-	/* Array index: 0x00FF */ 0x7521, 0x757E, 0x1DEF,
-	/* Array index: 0x0102 */ 0x7621, 0x767E, 0x1E4D,
-	/* Array index: 0x0105 */ 0x7721, 0x777E, 0x1EAB,
-	/* Array index: 0x0108 */ 0x7821, 0x787E, 0x1F09,
-	/* Array index: 0x010B */ 0x7921, 0x797E, 0x1F67,
-	/* Array index: 0x010E */ 0x7A21, 0x7A7E, 0x1FC5,
-	/* Array index: 0x0111 */ 0x7B21, 0x7B7E, 0x2023,
-	/* Array index: 0x0114 */ 0x7C21, 0x7C7E, 0x2081,
-	/* Array index: 0x0117 */ 0x7D21, 0x7D7E, 0x20DF,
-	/* Ranges content */
-	/* Range 0x2121 - 0x217E, array index: 0x011A */
-	0x3000,0x3001,0x3002,0x00B7,0x2025,0x2026,0x00A8,0x3003,
-	0x00AD,0x2015,0x2225,0xFF3C,0x223C,0x2018,0x2019,0x201C,
-	0x201D,0x3014,0x3015,0x3008,0x3009,0x300A,0x300B,0x300C,
-	0x300D,0x300E,0x300F,0x3010,0x3011,0x00B1,0x00D7,0x00F7,
-	0x2260,0x2264,0x2265,0x221E,0x2234,0x00B0,0x2032,0x2033,
-	0x2103,0x212B,0xFFE0,0xFFE1,0xFFE5,0x2642,0x2640,0x2220,
-	0x22A5,0x2312,0x2202,0x2207,0x2261,0x2252,0x00A7,0x203B,
-	0x2606,0x2605,0x25CB,0x25CF,0x25CE,0x25C7,0x25C6,0x25A1,
-	0x25A0,0x25B3,0x25B2,0x25BD,0x25BC,0x2192,0x2190,0x2191,
-	0x2193,0x2194,0x3013,0x226A,0x226B,0x221A,0x223D,0x221D,
-	0x2235,0x222B,0x222C,0x2208,0x220B,0x2286,0x2287,0x2282,
-	0x2283,0x222A,0x2229,0x2227,0x2228,0xFFE2,
-	/* Range 0x2221 - 0x2265, array index: 0x0178 */
-	0x21D2,0x21D4,0x2200,0x2203,0x00B4,0xFF5E,0x02C7,0x02D8,
-	0x02DD,0x02DA,0x02D9,0x00B8,0x02DB,0x00A1,0x00BF,0x02D0,
-	0x222E,0x2211,0x220F,0x00A4,0x2109,0x2030,0x25C1,0x25C0,
-	0x25B7,0x25B6,0x2664,0x2660,0x2661,0x2665,0x2667,0x2663,
-	0x2299,0x25C8,0x25A3,0x25D0,0x25D1,0x2592,0x25A4,0x25A5,
-	0x25A8,0x25A7,0x25A6,0x25A9,0x2668,0x260F,0x260E,0x261C,
-	0x261E,0x00B6,0x2020,0x2021,0x2195,0x2197,0x2199,0x2196,
-	0x2198,0x266D,0x2669,0x266A,0x266C,0x327F,0x321C,0x2116,
-	0x33C7,0x2122,0x33C2,0x33D8,0x2121,
-	/* Range 0x2321 - 0x237E, array index: 0x01BD */
-	0xFF01,0xFF02,0xFF03,0xFF04,0xFF05,0xFF06,0xFF07,0xFF08,
-	0xFF09,0xFF0A,0xFF0B,0xFF0C,0xFF0D,0xFF0E,0xFF0F,0xFF10,
-	0xFF11,0xFF12,0xFF13,0xFF14,0xFF15,0xFF16,0xFF17,0xFF18,
-	0xFF19,0xFF1A,0xFF1B,0xFF1C,0xFF1D,0xFF1E,0xFF1F,0xFF20,
-	0xFF21,0xFF22,0xFF23,0xFF24,0xFF25,0xFF26,0xFF27,0xFF28,
-	0xFF29,0xFF2A,0xFF2B,0xFF2C,0xFF2D,0xFF2E,0xFF2F,0xFF30,
-	0xFF31,0xFF32,0xFF33,0xFF34,0xFF35,0xFF36,0xFF37,0xFF38,
-	0xFF39,0xFF3A,0xFF3B,0xFFE6,0xFF3D,0xFF3E,0xFF3F,0xFF40,
-	0xFF41,0xFF42,0xFF43,0xFF44,0xFF45,0xFF46,0xFF47,0xFF48,
-	0xFF49,0xFF4A,0xFF4B,0xFF4C,0xFF4D,0xFF4E,0xFF4F,0xFF50,
-	0xFF51,0xFF52,0xFF53,0xFF54,0xFF55,0xFF56,0xFF57,0xFF58,
-	0xFF59,0xFF5A,0xFF5B,0xFF5C,0xFF5D,0xFFE3,
-	/* Range 0x2421 - 0x247E, array index: 0x021B */
-	0x3131,0x3132,0x3133,0x3134,0x3135,0x3136,0x3137,0x3138,
-	0x3139,0x313A,0x313B,0x313C,0x313D,0x313E,0x313F,0x3140,
-	0x3141,0x3142,0x3143,0x3144,0x3145,0x3146,0x3147,0x3148,
-	0x3149,0x314A,0x314B,0x314C,0x314D,0x314E,0x314F,0x3150,
-	0x3151,0x3152,0x3153,0x3154,0x3155,0x3156,0x3157,0x3158,
-	0x3159,0x315A,0x315B,0x315C,0x315D,0x315E,0x315F,0x3160,
-	0x3161,0x3162,0x3163,0x3164,0x3165,0x3166,0x3167,0x3168,
-	0x3169,0x316A,0x316B,0x316C,0x316D,0x316E,0x316F,0x3170,
-	0x3171,0x3172,0x3173,0x3174,0x3175,0x3176,0x3177,0x3178,
-	0x3179,0x317A,0x317B,0x317C,0x317D,0x317E,0x317F,0x3180,
-	0x3181,0x3182,0x3183,0x3184,0x3185,0x3186,0x3187,0x3188,
-	0x3189,0x318A,0x318B,0x318C,0x318D,0x318E,
-	/* Range 0x2521 - 0x252A, array index: 0x0279 */
-	0x2170,0x2171,0x2172,0x2173,0x2174,0x2175,0x2176,0x2177,
-	0x2178,0x2179,
-	/* Range 0x2530 - 0x2539, array index: 0x0283 */
-	0x2160,0x2161,0x2162,0x2163,0x2164,0x2165,0x2166,0x2167,
-	0x2168,0x2169,
-	/* Range 0x2541 - 0x2558, array index: 0x028D */
-	0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,0x0398,
-	0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F,0x03A0,
-	0x03A1,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,0x03A9,
-	/* Range 0x2561 - 0x2578, array index: 0x02A5 */
-	0x03B1,0x03B2,0x03B3,0x03B4,0x03B5,0x03B6,0x03B7,0x03B8,
-	0x03B9,0x03BA,0x03BB,0x03BC,0x03BD,0x03BE,0x03BF,0x03C0,
-	0x03C1,0x03C3,0x03C4,0x03C5,0x03C6,0x03C7,0x03C8,0x03C9,
-	/* Range 0x2621 - 0x2664, array index: 0x02BD */
-	0x2500,0x2502,0x250C,0x2510,0x2518,0x2514,0x251C,0x252C,
-	0x2524,0x2534,0x253C,0x2501,0x2503,0x250F,0x2513,0x251B,
-	0x2517,0x2523,0x2533,0x252B,0x253B,0x254B,0x2520,0x252F,
-	0x2528,0x2537,0x253F,0x251D,0x2530,0x2525,0x2538,0x2542,
-	0x2512,0x2511,0x251A,0x2519,0x2516,0x2515,0x250E,0x250D,
-	0x251E,0x251F,0x2521,0x2522,0x2526,0x2527,0x2529,0x252A,
-	0x252D,0x252E,0x2531,0x2532,0x2535,0x2536,0x2539,0x253A,
-	0x253D,0x253E,0x2540,0x2541,0x2543,0x2544,0x2545,0x2546,
-	0x2547,0x2548,0x2549,0x254A,
-	/* Range 0x2721 - 0x276F, array index: 0x0301 */
-	0x3395,0x3396,0x3397,0x2113,0x3398,0x33C4,0x33A3,0x33A4,
-	0x33A5,0x33A6,0x3399,0x339A,0x339B,0x339C,0x339D,0x339E,
-	0x339F,0x33A0,0x33A1,0x33A2,0x33CA,0x338D,0x338E,0x338F,
-	0x33CF,0x3388,0x3389,0x33C8,0x33A7,0x33A8,0x33B0,0x33B1,
-	0x33B2,0x33B3,0x33B4,0x33B5,0x33B6,0x33B7,0x33B8,0x33B9,
-	0x3380,0x3381,0x3382,0x3383,0x3384,0x33BA,0x33BB,0x33BC,
-	0x33BD,0x33BE,0x33BF,0x3390,0x3391,0x3392,0x3393,0x3394,
-	0x2126,0x33C0,0x33C1,0x338A,0x338B,0x338C,0x33D6,0x33C5,
-	0x33AD,0x33AE,0x33AF,0x33DB,0x33A9,0x33AA,0x33AB,0x33AC,
-	0x33DD,0x33D0,0x33D3,0x33C3,0x33C9,0x33DC,0x33C6,
-	/* Range 0x2821 - 0x287E, array index: 0x0350 */
-	0x00C6,0x00D0,0x00AA,0x0126,INVALC,0x0132,INVALC,0x013F,
-	0x0141,0x00D8,0x0152,0x00BA,0x00DE,0x0166,0x014A,INVALC,
-	0x3260,0x3261,0x3262,0x3263,0x3264,0x3265,0x3266,0x3267,
-	0x3268,0x3269,0x326A,0x326B,0x326C,0x326D,0x326E,0x326F,
-	0x3270,0x3271,0x3272,0x3273,0x3274,0x3275,0x3276,0x3277,
-	0x3278,0x3279,0x327A,0x327B,0x24D0,0x24D1,0x24D2,0x24D3,
-	0x24D4,0x24D5,0x24D6,0x24D7,0x24D8,0x24D9,0x24DA,0x24DB,
-	0x24DC,0x24DD,0x24DE,0x24DF,0x24E0,0x24E1,0x24E2,0x24E3,
-	0x24E4,0x24E5,0x24E6,0x24E7,0x24E8,0x24E9,0x2460,0x2461,
-	0x2462,0x2463,0x2464,0x2465,0x2466,0x2467,0x2468,0x2469,
-	0x246A,0x246B,0x246C,0x246D,0x246E,0x00BD,0x2153,0x2154,
-	0x00BC,0x00BE,0x215B,0x215C,0x215D,0x215E,
-	/* Range 0x2921 - 0x297E, array index: 0x03AE */
-	0x00E6,0x0111,0x00F0,0x0127,0x0131,0x0133,0x0138,0x0140,
-	0x0142,0x00F8,0x0153,0x00DF,0x00FE,0x0167,0x014B,0x0149,
-	0x3200,0x3201,0x3202,0x3203,0x3204,0x3205,0x3206,0x3207,
-	0x3208,0x3209,0x320A,0x320B,0x320C,0x320D,0x320E,0x320F,
-	0x3210,0x3211,0x3212,0x3213,0x3214,0x3215,0x3216,0x3217,
-	0x3218,0x3219,0x321A,0x321B,0x249C,0x249D,0x249E,0x249F,
-	0x24A0,0x24A1,0x24A2,0x24A3,0x24A4,0x24A5,0x24A6,0x24A7,
-	0x24A8,0x24A9,0x24AA,0x24AB,0x24AC,0x24AD,0x24AE,0x24AF,
-	0x24B0,0x24B1,0x24B2,0x24B3,0x24B4,0x24B5,0x2474,0x2475,
-	0x2476,0x2477,0x2478,0x2479,0x247A,0x247B,0x247C,0x247D,
-	0x247E,0x247F,0x2480,0x2481,0x2482,0x00B9,0x00B2,0x00B3,
-	0x2074,0x207F,0x2081,0x2082,0x2083,0x2084,
-	/* Range 0x2A21 - 0x2A73, array index: 0x040C */
-	0x3041,0x3042,0x3043,0x3044,0x3045,0x3046,0x3047,0x3048,
-	0x3049,0x304A,0x304B,0x304C,0x304D,0x304E,0x304F,0x3050,
-	0x3051,0x3052,0x3053,0x3054,0x3055,0x3056,0x3057,0x3058,
-	0x3059,0x305A,0x305B,0x305C,0x305D,0x305E,0x305F,0x3060,
-	0x3061,0x3062,0x3063,0x3064,0x3065,0x3066,0x3067,0x3068,
-	0x3069,0x306A,0x306B,0x306C,0x306D,0x306E,0x306F,0x3070,
-	0x3071,0x3072,0x3073,0x3074,0x3075,0x3076,0x3077,0x3078,
-	0x3079,0x307A,0x307B,0x307C,0x307D,0x307E,0x307F,0x3080,
-	0x3081,0x3082,0x3083,0x3084,0x3085,0x3086,0x3087,0x3088,
-	0x3089,0x308A,0x308B,0x308C,0x308D,0x308E,0x308F,0x3090,
-	0x3091,0x3092,0x3093,
-	/* Range 0x2B21 - 0x2B76, array index: 0x045F */
-	0x30A1,0x30A2,0x30A3,0x30A4,0x30A5,0x30A6,0x30A7,0x30A8,
-	0x30A9,0x30AA,0x30AB,0x30AC,0x30AD,0x30AE,0x30AF,0x30B0,
-	0x30B1,0x30B2,0x30B3,0x30B4,0x30B5,0x30B6,0x30B7,0x30B8,
-	0x30B9,0x30BA,0x30BB,0x30BC,0x30BD,0x30BE,0x30BF,0x30C0,
-	0x30C1,0x30C2,0x30C3,0x30C4,0x30C5,0x30C6,0x30C7,0x30C8,
-	0x30C9,0x30CA,0x30CB,0x30CC,0x30CD,0x30CE,0x30CF,0x30D0,
-	0x30D1,0x30D2,0x30D3,0x30D4,0x30D5,0x30D6,0x30D7,0x30D8,
-	0x30D9,0x30DA,0x30DB,0x30DC,0x30DD,0x30DE,0x30DF,0x30E0,
-	0x30E1,0x30E2,0x30E3,0x30E4,0x30E5,0x30E6,0x30E7,0x30E8,
-	0x30E9,0x30EA,0x30EB,0x30EC,0x30ED,0x30EE,0x30EF,0x30F0,
-	0x30F1,0x30F2,0x30F3,0x30F4,0x30F5,0x30F6,
-	/* Range 0x2C21 - 0x2C41, array index: 0x04B5 */
-	0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0401,0x0416,
-	0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,
-	0x041F,0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,
-	0x0427,0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,
-	0x042F,
-	/* Range 0x2C51 - 0x2C71, array index: 0x04D6 */
-	0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0451,0x0436,
-	0x0437,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,
-	0x043F,0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,
-	0x0447,0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,
-	0x044F,
-	/* Range 0x3021 - 0x307E, array index: 0x04F7 */
-	0xAC00,0xAC01,0xAC04,0xAC07,0xAC08,0xAC09,0xAC0A,0xAC10,
-	0xAC11,0xAC12,0xAC13,0xAC14,0xAC15,0xAC16,0xAC17,0xAC19,
-	0xAC1A,0xAC1B,0xAC1C,0xAC1D,0xAC20,0xAC24,0xAC2C,0xAC2D,
-	0xAC2F,0xAC30,0xAC31,0xAC38,0xAC39,0xAC3C,0xAC40,0xAC4B,
-	0xAC4D,0xAC54,0xAC58,0xAC5C,0xAC70,0xAC71,0xAC74,0xAC77,
-	0xAC78,0xAC7A,0xAC80,0xAC81,0xAC83,0xAC84,0xAC85,0xAC86,
-	0xAC89,0xAC8A,0xAC8B,0xAC8C,0xAC90,0xAC94,0xAC9C,0xAC9D,
-	0xAC9F,0xACA0,0xACA1,0xACA8,0xACA9,0xACAA,0xACAC,0xACAF,
-	0xACB0,0xACB8,0xACB9,0xACBB,0xACBC,0xACBD,0xACC1,0xACC4,
-	0xACC8,0xACCC,0xACD5,0xACD7,0xACE0,0xACE1,0xACE4,0xACE7,
-	0xACE8,0xACEA,0xACEC,0xACEF,0xACF0,0xACF1,0xACF3,0xACF5,
-	0xACF6,0xACFC,0xACFD,0xAD00,0xAD04,0xAD06,
-	/* Range 0x3121 - 0x317E, array index: 0x0555 */
-	0xAD0C,0xAD0D,0xAD0F,0xAD11,0xAD18,0xAD1C,0xAD20,0xAD29,
-	0xAD2C,0xAD2D,0xAD34,0xAD35,0xAD38,0xAD3C,0xAD44,0xAD45,
-	0xAD47,0xAD49,0xAD50,0xAD54,0xAD58,0xAD61,0xAD63,0xAD6C,
-	0xAD6D,0xAD70,0xAD73,0xAD74,0xAD75,0xAD76,0xAD7B,0xAD7C,
-	0xAD7D,0xAD7F,0xAD81,0xAD82,0xAD88,0xAD89,0xAD8C,0xAD90,
-	0xAD9C,0xAD9D,0xADA4,0xADB7,0xADC0,0xADC1,0xADC4,0xADC8,
-	0xADD0,0xADD1,0xADD3,0xADDC,0xADE0,0xADE4,0xADF8,0xADF9,
-	0xADFC,0xADFF,0xAE00,0xAE01,0xAE08,0xAE09,0xAE0B,0xAE0D,
-	0xAE14,0xAE30,0xAE31,0xAE34,0xAE37,0xAE38,0xAE3A,0xAE40,
-	0xAE41,0xAE43,0xAE45,0xAE46,0xAE4A,0xAE4C,0xAE4D,0xAE4E,
-	0xAE50,0xAE54,0xAE56,0xAE5C,0xAE5D,0xAE5F,0xAE60,0xAE61,
-	0xAE65,0xAE68,0xAE69,0xAE6C,0xAE70,0xAE78,
-	/* Range 0x3221 - 0x327E, array index: 0x05B3 */
-	0xAE79,0xAE7B,0xAE7C,0xAE7D,0xAE84,0xAE85,0xAE8C,0xAEBC,
-	0xAEBD,0xAEBE,0xAEC0,0xAEC4,0xAECC,0xAECD,0xAECF,0xAED0,
-	0xAED1,0xAED8,0xAED9,0xAEDC,0xAEE8,0xAEEB,0xAEED,0xAEF4,
-	0xAEF8,0xAEFC,0xAF07,0xAF08,0xAF0D,0xAF10,0xAF2C,0xAF2D,
-	0xAF30,0xAF32,0xAF34,0xAF3C,0xAF3D,0xAF3F,0xAF41,0xAF42,
-	0xAF43,0xAF48,0xAF49,0xAF50,0xAF5C,0xAF5D,0xAF64,0xAF65,
-	0xAF79,0xAF80,0xAF84,0xAF88,0xAF90,0xAF91,0xAF95,0xAF9C,
-	0xAFB8,0xAFB9,0xAFBC,0xAFC0,0xAFC7,0xAFC8,0xAFC9,0xAFCB,
-	0xAFCD,0xAFCE,0xAFD4,0xAFDC,0xAFE8,0xAFE9,0xAFF0,0xAFF1,
-	0xAFF4,0xAFF8,0xB000,0xB001,0xB004,0xB00C,0xB010,0xB014,
-	0xB01C,0xB01D,0xB028,0xB044,0xB045,0xB048,0xB04A,0xB04C,
-	0xB04E,0xB053,0xB054,0xB055,0xB057,0xB059,
-	/* Range 0x3321 - 0x337E, array index: 0x0611 */
-	0xB05D,0xB07C,0xB07D,0xB080,0xB084,0xB08C,0xB08D,0xB08F,
-	0xB091,0xB098,0xB099,0xB09A,0xB09C,0xB09F,0xB0A0,0xB0A1,
-	0xB0A2,0xB0A8,0xB0A9,0xB0AB,0xB0AC,0xB0AD,0xB0AE,0xB0AF,
-	0xB0B1,0xB0B3,0xB0B4,0xB0B5,0xB0B8,0xB0BC,0xB0C4,0xB0C5,
-	0xB0C7,0xB0C8,0xB0C9,0xB0D0,0xB0D1,0xB0D4,0xB0D8,0xB0E0,
-	0xB0E5,0xB108,0xB109,0xB10B,0xB10C,0xB110,0xB112,0xB113,
-	0xB118,0xB119,0xB11B,0xB11C,0xB11D,0xB123,0xB124,0xB125,
-	0xB128,0xB12C,0xB134,0xB135,0xB137,0xB138,0xB139,0xB140,
-	0xB141,0xB144,0xB148,0xB150,0xB151,0xB154,0xB155,0xB158,
-	0xB15C,0xB160,0xB178,0xB179,0xB17C,0xB180,0xB182,0xB188,
-	0xB189,0xB18B,0xB18D,0xB192,0xB193,0xB194,0xB198,0xB19C,
-	0xB1A8,0xB1CC,0xB1D0,0xB1D4,0xB1DC,0xB1DD,
-	/* Range 0x3421 - 0x347E, array index: 0x066F */
-	0xB1DF,0xB1E8,0xB1E9,0xB1EC,0xB1F0,0xB1F9,0xB1FB,0xB1FD,
-	0xB204,0xB205,0xB208,0xB20B,0xB20C,0xB214,0xB215,0xB217,
-	0xB219,0xB220,0xB234,0xB23C,0xB258,0xB25C,0xB260,0xB268,
-	0xB269,0xB274,0xB275,0xB27C,0xB284,0xB285,0xB289,0xB290,
-	0xB291,0xB294,0xB298,0xB299,0xB29A,0xB2A0,0xB2A1,0xB2A3,
-	0xB2A5,0xB2A6,0xB2AA,0xB2AC,0xB2B0,0xB2B4,0xB2C8,0xB2C9,
-	0xB2CC,0xB2D0,0xB2D2,0xB2D8,0xB2D9,0xB2DB,0xB2DD,0xB2E2,
-	0xB2E4,0xB2E5,0xB2E6,0xB2E8,0xB2EB,0xB2EC,0xB2ED,0xB2EE,
-	0xB2EF,0xB2F3,0xB2F4,0xB2F5,0xB2F7,0xB2F8,0xB2F9,0xB2FA,
-	0xB2FB,0xB2FF,0xB300,0xB301,0xB304,0xB308,0xB310,0xB311,
-	0xB313,0xB314,0xB315,0xB31C,0xB354,0xB355,0xB356,0xB358,
-	0xB35B,0xB35C,0xB35E,0xB35F,0xB364,0xB365,
-	/* Range 0x3521 - 0x357E, array index: 0x06CD */
-	0xB367,0xB369,0xB36B,0xB36E,0xB370,0xB371,0xB374,0xB378,
-	0xB380,0xB381,0xB383,0xB384,0xB385,0xB38C,0xB390,0xB394,
-	0xB3A0,0xB3A1,0xB3A8,0xB3AC,0xB3C4,0xB3C5,0xB3C8,0xB3CB,
-	0xB3CC,0xB3CE,0xB3D0,0xB3D4,0xB3D5,0xB3D7,0xB3D9,0xB3DB,
-	0xB3DD,0xB3E0,0xB3E4,0xB3E8,0xB3FC,0xB410,0xB418,0xB41C,
-	0xB420,0xB428,0xB429,0xB42B,0xB434,0xB450,0xB451,0xB454,
-	0xB458,0xB460,0xB461,0xB463,0xB465,0xB46C,0xB480,0xB488,
-	0xB49D,0xB4A4,0xB4A8,0xB4AC,0xB4B5,0xB4B7,0xB4B9,0xB4C0,
-	0xB4C4,0xB4C8,0xB4D0,0xB4D5,0xB4DC,0xB4DD,0xB4E0,0xB4E3,
-	0xB4E4,0xB4E6,0xB4EC,0xB4ED,0xB4EF,0xB4F1,0xB4F8,0xB514,
-	0xB515,0xB518,0xB51B,0xB51C,0xB524,0xB525,0xB527,0xB528,
-	0xB529,0xB52A,0xB530,0xB531,0xB534,0xB538,
-	/* Range 0x3621 - 0x367E, array index: 0x072B */
-	0xB540,0xB541,0xB543,0xB544,0xB545,0xB54B,0xB54C,0xB54D,
-	0xB550,0xB554,0xB55C,0xB55D,0xB55F,0xB560,0xB561,0xB5A0,
-	0xB5A1,0xB5A4,0xB5A8,0xB5AA,0xB5AB,0xB5B0,0xB5B1,0xB5B3,
-	0xB5B4,0xB5B5,0xB5BB,0xB5BC,0xB5BD,0xB5C0,0xB5C4,0xB5CC,
-	0xB5CD,0xB5CF,0xB5D0,0xB5D1,0xB5D8,0xB5EC,0xB610,0xB611,
-	0xB614,0xB618,0xB625,0xB62C,0xB634,0xB648,0xB664,0xB668,
-	0xB69C,0xB69D,0xB6A0,0xB6A4,0xB6AB,0xB6AC,0xB6B1,0xB6D4,
-	0xB6F0,0xB6F4,0xB6F8,0xB700,0xB701,0xB705,0xB728,0xB729,
-	0xB72C,0xB72F,0xB730,0xB738,0xB739,0xB73B,0xB744,0xB748,
-	0xB74C,0xB754,0xB755,0xB760,0xB764,0xB768,0xB770,0xB771,
-	0xB773,0xB775,0xB77C,0xB77D,0xB780,0xB784,0xB78C,0xB78D,
-	0xB78F,0xB790,0xB791,0xB792,0xB796,0xB797,
-	/* Range 0x3721 - 0x377E, array index: 0x0789 */
-	0xB798,0xB799,0xB79C,0xB7A0,0xB7A8,0xB7A9,0xB7AB,0xB7AC,
-	0xB7AD,0xB7B4,0xB7B5,0xB7B8,0xB7C7,0xB7C9,0xB7EC,0xB7ED,
-	0xB7F0,0xB7F4,0xB7FC,0xB7FD,0xB7FF,0xB800,0xB801,0xB807,
-	0xB808,0xB809,0xB80C,0xB810,0xB818,0xB819,0xB81B,0xB81D,
-	0xB824,0xB825,0xB828,0xB82C,0xB834,0xB835,0xB837,0xB838,
-	0xB839,0xB840,0xB844,0xB851,0xB853,0xB85C,0xB85D,0xB860,
-	0xB864,0xB86C,0xB86D,0xB86F,0xB871,0xB878,0xB87C,0xB88D,
-	0xB8A8,0xB8B0,0xB8B4,0xB8B8,0xB8C0,0xB8C1,0xB8C3,0xB8C5,
-	0xB8CC,0xB8D0,0xB8D4,0xB8DD,0xB8DF,0xB8E1,0xB8E8,0xB8E9,
-	0xB8EC,0xB8F0,0xB8F8,0xB8F9,0xB8FB,0xB8FD,0xB904,0xB918,
-	0xB920,0xB93C,0xB93D,0xB940,0xB944,0xB94C,0xB94F,0xB951,
-	0xB958,0xB959,0xB95C,0xB960,0xB968,0xB969,
-	/* Range 0x3821 - 0x387E, array index: 0x07E7 */
-	0xB96B,0xB96D,0xB974,0xB975,0xB978,0xB97C,0xB984,0xB985,
-	0xB987,0xB989,0xB98A,0xB98D,0xB98E,0xB9AC,0xB9AD,0xB9B0,
-	0xB9B4,0xB9BC,0xB9BD,0xB9BF,0xB9C1,0xB9C8,0xB9C9,0xB9CC,
-	0xB9CE,0xB9CF,0xB9D0,0xB9D1,0xB9D2,0xB9D8,0xB9D9,0xB9DB,
-	0xB9DD,0xB9DE,0xB9E1,0xB9E3,0xB9E4,0xB9E5,0xB9E8,0xB9EC,
-	0xB9F4,0xB9F5,0xB9F7,0xB9F8,0xB9F9,0xB9FA,0xBA00,0xBA01,
-	0xBA08,0xBA15,0xBA38,0xBA39,0xBA3C,0xBA40,0xBA42,0xBA48,
-	0xBA49,0xBA4B,0xBA4D,0xBA4E,0xBA53,0xBA54,0xBA55,0xBA58,
-	0xBA5C,0xBA64,0xBA65,0xBA67,0xBA68,0xBA69,0xBA70,0xBA71,
-	0xBA74,0xBA78,0xBA83,0xBA84,0xBA85,0xBA87,0xBA8C,0xBAA8,
-	0xBAA9,0xBAAB,0xBAAC,0xBAB0,0xBAB2,0xBAB8,0xBAB9,0xBABB,
-	0xBABD,0xBAC4,0xBAC8,0xBAD8,0xBAD9,0xBAFC,
-	/* Range 0x3921 - 0x397E, array index: 0x0845 */
-	0xBB00,0xBB04,0xBB0D,0xBB0F,0xBB11,0xBB18,0xBB1C,0xBB20,
-	0xBB29,0xBB2B,0xBB34,0xBB35,0xBB36,0xBB38,0xBB3B,0xBB3C,
-	0xBB3D,0xBB3E,0xBB44,0xBB45,0xBB47,0xBB49,0xBB4D,0xBB4F,
-	0xBB50,0xBB54,0xBB58,0xBB61,0xBB63,0xBB6C,0xBB88,0xBB8C,
-	0xBB90,0xBBA4,0xBBA8,0xBBAC,0xBBB4,0xBBB7,0xBBC0,0xBBC4,
-	0xBBC8,0xBBD0,0xBBD3,0xBBF8,0xBBF9,0xBBFC,0xBBFF,0xBC00,
-	0xBC02,0xBC08,0xBC09,0xBC0B,0xBC0C,0xBC0D,0xBC0F,0xBC11,
-	0xBC14,0xBC15,0xBC16,0xBC17,0xBC18,0xBC1B,0xBC1C,0xBC1D,
-	0xBC1E,0xBC1F,0xBC24,0xBC25,0xBC27,0xBC29,0xBC2D,0xBC30,
-	0xBC31,0xBC34,0xBC38,0xBC40,0xBC41,0xBC43,0xBC44,0xBC45,
-	0xBC49,0xBC4C,0xBC4D,0xBC50,0xBC5D,0xBC84,0xBC85,0xBC88,
-	0xBC8B,0xBC8C,0xBC8E,0xBC94,0xBC95,0xBC97,
-	/* Range 0x3A21 - 0x3A7E, array index: 0x08A3 */
-	0xBC99,0xBC9A,0xBCA0,0xBCA1,0xBCA4,0xBCA7,0xBCA8,0xBCB0,
-	0xBCB1,0xBCB3,0xBCB4,0xBCB5,0xBCBC,0xBCBD,0xBCC0,0xBCC4,
-	0xBCCD,0xBCCF,0xBCD0,0xBCD1,0xBCD5,0xBCD8,0xBCDC,0xBCF4,
-	0xBCF5,0xBCF6,0xBCF8,0xBCFC,0xBD04,0xBD05,0xBD07,0xBD09,
-	0xBD10,0xBD14,0xBD24,0xBD2C,0xBD40,0xBD48,0xBD49,0xBD4C,
-	0xBD50,0xBD58,0xBD59,0xBD64,0xBD68,0xBD80,0xBD81,0xBD84,
-	0xBD87,0xBD88,0xBD89,0xBD8A,0xBD90,0xBD91,0xBD93,0xBD95,
-	0xBD99,0xBD9A,0xBD9C,0xBDA4,0xBDB0,0xBDB8,0xBDD4,0xBDD5,
-	0xBDD8,0xBDDC,0xBDE9,0xBDF0,0xBDF4,0xBDF8,0xBE00,0xBE03,
-	0xBE05,0xBE0C,0xBE0D,0xBE10,0xBE14,0xBE1C,0xBE1D,0xBE1F,
-	0xBE44,0xBE45,0xBE48,0xBE4C,0xBE4E,0xBE54,0xBE55,0xBE57,
-	0xBE59,0xBE5A,0xBE5B,0xBE60,0xBE61,0xBE64,
-	/* Range 0x3B21 - 0x3B7E, array index: 0x0901 */
-	0xBE68,0xBE6A,0xBE70,0xBE71,0xBE73,0xBE74,0xBE75,0xBE7B,
-	0xBE7C,0xBE7D,0xBE80,0xBE84,0xBE8C,0xBE8D,0xBE8F,0xBE90,
-	0xBE91,0xBE98,0xBE99,0xBEA8,0xBED0,0xBED1,0xBED4,0xBED7,
-	0xBED8,0xBEE0,0xBEE3,0xBEE4,0xBEE5,0xBEEC,0xBF01,0xBF08,
-	0xBF09,0xBF18,0xBF19,0xBF1B,0xBF1C,0xBF1D,0xBF40,0xBF41,
-	0xBF44,0xBF48,0xBF50,0xBF51,0xBF55,0xBF94,0xBFB0,0xBFC5,
-	0xBFCC,0xBFCD,0xBFD0,0xBFD4,0xBFDC,0xBFDF,0xBFE1,0xC03C,
-	0xC051,0xC058,0xC05C,0xC060,0xC068,0xC069,0xC090,0xC091,
-	0xC094,0xC098,0xC0A0,0xC0A1,0xC0A3,0xC0A5,0xC0AC,0xC0AD,
-	0xC0AF,0xC0B0,0xC0B3,0xC0B4,0xC0B5,0xC0B6,0xC0BC,0xC0BD,
-	0xC0BF,0xC0C0,0xC0C1,0xC0C5,0xC0C8,0xC0C9,0xC0CC,0xC0D0,
-	0xC0D8,0xC0D9,0xC0DB,0xC0DC,0xC0DD,0xC0E4,
-	/* Range 0x3C21 - 0x3C7E, array index: 0x095F */
-	0xC0E5,0xC0E8,0xC0EC,0xC0F4,0xC0F5,0xC0F7,0xC0F9,0xC100,
-	0xC104,0xC108,0xC110,0xC115,0xC11C,0xC11D,0xC11E,0xC11F,
-	0xC120,0xC123,0xC124,0xC126,0xC127,0xC12C,0xC12D,0xC12F,
-	0xC130,0xC131,0xC136,0xC138,0xC139,0xC13C,0xC140,0xC148,
-	0xC149,0xC14B,0xC14C,0xC14D,0xC154,0xC155,0xC158,0xC15C,
-	0xC164,0xC165,0xC167,0xC168,0xC169,0xC170,0xC174,0xC178,
-	0xC185,0xC18C,0xC18D,0xC18E,0xC190,0xC194,0xC196,0xC19C,
-	0xC19D,0xC19F,0xC1A1,0xC1A5,0xC1A8,0xC1A9,0xC1AC,0xC1B0,
-	0xC1BD,0xC1C4,0xC1C8,0xC1CC,0xC1D4,0xC1D7,0xC1D8,0xC1E0,
-	0xC1E4,0xC1E8,0xC1F0,0xC1F1,0xC1F3,0xC1FC,0xC1FD,0xC200,
-	0xC204,0xC20C,0xC20D,0xC20F,0xC211,0xC218,0xC219,0xC21C,
-	0xC21F,0xC220,0xC228,0xC229,0xC22B,0xC22D,
-	/* Range 0x3D21 - 0x3D7E, array index: 0x09BD */
-	0xC22F,0xC231,0xC232,0xC234,0xC248,0xC250,0xC251,0xC254,
-	0xC258,0xC260,0xC265,0xC26C,0xC26D,0xC270,0xC274,0xC27C,
-	0xC27D,0xC27F,0xC281,0xC288,0xC289,0xC290,0xC298,0xC29B,
-	0xC29D,0xC2A4,0xC2A5,0xC2A8,0xC2AC,0xC2AD,0xC2B4,0xC2B5,
-	0xC2B7,0xC2B9,0xC2DC,0xC2DD,0xC2E0,0xC2E3,0xC2E4,0xC2EB,
-	0xC2EC,0xC2ED,0xC2EF,0xC2F1,0xC2F6,0xC2F8,0xC2F9,0xC2FB,
-	0xC2FC,0xC300,0xC308,0xC309,0xC30C,0xC30D,0xC313,0xC314,
-	0xC315,0xC318,0xC31C,0xC324,0xC325,0xC328,0xC329,0xC345,
-	0xC368,0xC369,0xC36C,0xC370,0xC372,0xC378,0xC379,0xC37C,
-	0xC37D,0xC384,0xC388,0xC38C,0xC3C0,0xC3D8,0xC3D9,0xC3DC,
-	0xC3DF,0xC3E0,0xC3E2,0xC3E8,0xC3E9,0xC3ED,0xC3F4,0xC3F5,
-	0xC3F8,0xC408,0xC410,0xC424,0xC42C,0xC430,
-	/* Range 0x3E21 - 0x3E7E, array index: 0x0A1B */
-	0xC434,0xC43C,0xC43D,0xC448,0xC464,0xC465,0xC468,0xC46C,
-	0xC474,0xC475,0xC479,0xC480,0xC494,0xC49C,0xC4B8,0xC4BC,
-	0xC4E9,0xC4F0,0xC4F1,0xC4F4,0xC4F8,0xC4FA,0xC4FF,0xC500,
-	0xC501,0xC50C,0xC510,0xC514,0xC51C,0xC528,0xC529,0xC52C,
-	0xC530,0xC538,0xC539,0xC53B,0xC53D,0xC544,0xC545,0xC548,
-	0xC549,0xC54A,0xC54C,0xC54D,0xC54E,0xC553,0xC554,0xC555,
-	0xC557,0xC558,0xC559,0xC55D,0xC55E,0xC560,0xC561,0xC564,
-	0xC568,0xC570,0xC571,0xC573,0xC574,0xC575,0xC57C,0xC57D,
-	0xC580,0xC584,0xC587,0xC58C,0xC58D,0xC58F,0xC591,0xC595,
-	0xC597,0xC598,0xC59C,0xC5A0,0xC5A9,0xC5B4,0xC5B5,0xC5B8,
-	0xC5B9,0xC5BB,0xC5BC,0xC5BD,0xC5BE,0xC5C4,0xC5C5,0xC5C6,
-	0xC5C7,0xC5C8,0xC5C9,0xC5CA,0xC5CC,0xC5CE,
-	/* Range 0x3F21 - 0x3F7E, array index: 0x0A79 */
-	0xC5D0,0xC5D1,0xC5D4,0xC5D8,0xC5E0,0xC5E1,0xC5E3,0xC5E5,
-	0xC5EC,0xC5ED,0xC5EE,0xC5F0,0xC5F4,0xC5F6,0xC5F7,0xC5FC,
-	0xC5FD,0xC5FE,0xC5FF,0xC600,0xC601,0xC605,0xC606,0xC607,
-	0xC608,0xC60C,0xC610,0xC618,0xC619,0xC61B,0xC61C,0xC624,
-	0xC625,0xC628,0xC62C,0xC62D,0xC62E,0xC630,0xC633,0xC634,
-	0xC635,0xC637,0xC639,0xC63B,0xC640,0xC641,0xC644,0xC648,
-	0xC650,0xC651,0xC653,0xC654,0xC655,0xC65C,0xC65D,0xC660,
-	0xC66C,0xC66F,0xC671,0xC678,0xC679,0xC67C,0xC680,0xC688,
-	0xC689,0xC68B,0xC68D,0xC694,0xC695,0xC698,0xC69C,0xC6A4,
-	0xC6A5,0xC6A7,0xC6A9,0xC6B0,0xC6B1,0xC6B4,0xC6B8,0xC6B9,
-	0xC6BA,0xC6C0,0xC6C1,0xC6C3,0xC6C5,0xC6CC,0xC6CD,0xC6D0,
-	0xC6D4,0xC6DC,0xC6DD,0xC6E0,0xC6E1,0xC6E8,
-	/* Range 0x4021 - 0x407E, array index: 0x0AD7 */
-	0xC6E9,0xC6EC,0xC6F0,0xC6F8,0xC6F9,0xC6FD,0xC704,0xC705,
-	0xC708,0xC70C,0xC714,0xC715,0xC717,0xC719,0xC720,0xC721,
-	0xC724,0xC728,0xC730,0xC731,0xC733,0xC735,0xC737,0xC73C,
-	0xC73D,0xC740,0xC744,0xC74A,0xC74C,0xC74D,0xC74F,0xC751,
-	0xC752,0xC753,0xC754,0xC755,0xC756,0xC757,0xC758,0xC75C,
-	0xC760,0xC768,0xC76B,0xC774,0xC775,0xC778,0xC77C,0xC77D,
-	0xC77E,0xC783,0xC784,0xC785,0xC787,0xC788,0xC789,0xC78A,
-	0xC78E,0xC790,0xC791,0xC794,0xC796,0xC797,0xC798,0xC79A,
-	0xC7A0,0xC7A1,0xC7A3,0xC7A4,0xC7A5,0xC7A6,0xC7AC,0xC7AD,
-	0xC7B0,0xC7B4,0xC7BC,0xC7BD,0xC7BF,0xC7C0,0xC7C1,0xC7C8,
-	0xC7C9,0xC7CC,0xC7CE,0xC7D0,0xC7D8,0xC7DD,0xC7E4,0xC7E8,
-	0xC7EC,0xC800,0xC801,0xC804,0xC808,0xC80A,
-	/* Range 0x4121 - 0x417E, array index: 0x0B35 */
-	0xC810,0xC811,0xC813,0xC815,0xC816,0xC81C,0xC81D,0xC820,
-	0xC824,0xC82C,0xC82D,0xC82F,0xC831,0xC838,0xC83C,0xC840,
-	0xC848,0xC849,0xC84C,0xC84D,0xC854,0xC870,0xC871,0xC874,
-	0xC878,0xC87A,0xC880,0xC881,0xC883,0xC885,0xC886,0xC887,
-	0xC88B,0xC88C,0xC88D,0xC894,0xC89D,0xC89F,0xC8A1,0xC8A8,
-	0xC8BC,0xC8BD,0xC8C4,0xC8C8,0xC8CC,0xC8D4,0xC8D5,0xC8D7,
-	0xC8D9,0xC8E0,0xC8E1,0xC8E4,0xC8F5,0xC8FC,0xC8FD,0xC900,
-	0xC904,0xC905,0xC906,0xC90C,0xC90D,0xC90F,0xC911,0xC918,
-	0xC92C,0xC934,0xC950,0xC951,0xC954,0xC958,0xC960,0xC961,
-	0xC963,0xC96C,0xC970,0xC974,0xC97C,0xC988,0xC989,0xC98C,
-	0xC990,0xC998,0xC999,0xC99B,0xC99D,0xC9C0,0xC9C1,0xC9C4,
-	0xC9C7,0xC9C8,0xC9CA,0xC9D0,0xC9D1,0xC9D3,
-	/* Range 0x4221 - 0x427E, array index: 0x0B93 */
-	0xC9D5,0xC9D6,0xC9D9,0xC9DA,0xC9DC,0xC9DD,0xC9E0,0xC9E2,
-	0xC9E4,0xC9E7,0xC9EC,0xC9ED,0xC9EF,0xC9F0,0xC9F1,0xC9F8,
-	0xC9F9,0xC9FC,0xCA00,0xCA08,0xCA09,0xCA0B,0xCA0C,0xCA0D,
-	0xCA14,0xCA18,0xCA29,0xCA4C,0xCA4D,0xCA50,0xCA54,0xCA5C,
-	0xCA5D,0xCA5F,0xCA60,0xCA61,0xCA68,0xCA7D,0xCA84,0xCA98,
-	0xCABC,0xCABD,0xCAC0,0xCAC4,0xCACC,0xCACD,0xCACF,0xCAD1,
-	0xCAD3,0xCAD8,0xCAD9,0xCAE0,0xCAEC,0xCAF4,0xCB08,0xCB10,
-	0xCB14,0xCB18,0xCB20,0xCB21,0xCB41,0xCB48,0xCB49,0xCB4C,
-	0xCB50,0xCB58,0xCB59,0xCB5D,0xCB64,0xCB78,0xCB79,0xCB9C,
-	0xCBB8,0xCBD4,0xCBE4,0xCBE7,0xCBE9,0xCC0C,0xCC0D,0xCC10,
-	0xCC14,0xCC1C,0xCC1D,0xCC21,0xCC22,0xCC27,0xCC28,0xCC29,
-	0xCC2C,0xCC2E,0xCC30,0xCC38,0xCC39,0xCC3B,
-	/* Range 0x4321 - 0x437E, array index: 0x0BF1 */
-	0xCC3C,0xCC3D,0xCC3E,0xCC44,0xCC45,0xCC48,0xCC4C,0xCC54,
-	0xCC55,0xCC57,0xCC58,0xCC59,0xCC60,0xCC64,0xCC66,0xCC68,
-	0xCC70,0xCC75,0xCC98,0xCC99,0xCC9C,0xCCA0,0xCCA8,0xCCA9,
-	0xCCAB,0xCCAC,0xCCAD,0xCCB4,0xCCB5,0xCCB8,0xCCBC,0xCCC4,
-	0xCCC5,0xCCC7,0xCCC9,0xCCD0,0xCCD4,0xCCE4,0xCCEC,0xCCF0,
-	0xCD01,0xCD08,0xCD09,0xCD0C,0xCD10,0xCD18,0xCD19,0xCD1B,
-	0xCD1D,0xCD24,0xCD28,0xCD2C,0xCD39,0xCD5C,0xCD60,0xCD64,
-	0xCD6C,0xCD6D,0xCD6F,0xCD71,0xCD78,0xCD88,0xCD94,0xCD95,
-	0xCD98,0xCD9C,0xCDA4,0xCDA5,0xCDA7,0xCDA9,0xCDB0,0xCDC4,
-	0xCDCC,0xCDD0,0xCDE8,0xCDEC,0xCDF0,0xCDF8,0xCDF9,0xCDFB,
-	0xCDFD,0xCE04,0xCE08,0xCE0C,0xCE14,0xCE19,0xCE20,0xCE21,
-	0xCE24,0xCE28,0xCE30,0xCE31,0xCE33,0xCE35,
-	/* Range 0x4421 - 0x447E, array index: 0x0C4F */
-	0xCE58,0xCE59,0xCE5C,0xCE5F,0xCE60,0xCE61,0xCE68,0xCE69,
-	0xCE6B,0xCE6D,0xCE74,0xCE75,0xCE78,0xCE7C,0xCE84,0xCE85,
-	0xCE87,0xCE89,0xCE90,0xCE91,0xCE94,0xCE98,0xCEA0,0xCEA1,
-	0xCEA3,0xCEA4,0xCEA5,0xCEAC,0xCEAD,0xCEC1,0xCEE4,0xCEE5,
-	0xCEE8,0xCEEB,0xCEEC,0xCEF4,0xCEF5,0xCEF7,0xCEF8,0xCEF9,
-	0xCF00,0xCF01,0xCF04,0xCF08,0xCF10,0xCF11,0xCF13,0xCF15,
-	0xCF1C,0xCF20,0xCF24,0xCF2C,0xCF2D,0xCF2F,0xCF30,0xCF31,
-	0xCF38,0xCF54,0xCF55,0xCF58,0xCF5C,0xCF64,0xCF65,0xCF67,
-	0xCF69,0xCF70,0xCF71,0xCF74,0xCF78,0xCF80,0xCF85,0xCF8C,
-	0xCFA1,0xCFA8,0xCFB0,0xCFC4,0xCFE0,0xCFE1,0xCFE4,0xCFE8,
-	0xCFF0,0xCFF1,0xCFF3,0xCFF5,0xCFFC,0xD000,0xD004,0xD011,
-	0xD018,0xD02D,0xD034,0xD035,0xD038,0xD03C,
-	/* Range 0x4521 - 0x457E, array index: 0x0CAD */
-	0xD044,0xD045,0xD047,0xD049,0xD050,0xD054,0xD058,0xD060,
-	0xD06C,0xD06D,0xD070,0xD074,0xD07C,0xD07D,0xD081,0xD0A4,
-	0xD0A5,0xD0A8,0xD0AC,0xD0B4,0xD0B5,0xD0B7,0xD0B9,0xD0C0,
-	0xD0C1,0xD0C4,0xD0C8,0xD0C9,0xD0D0,0xD0D1,0xD0D3,0xD0D4,
-	0xD0D5,0xD0DC,0xD0DD,0xD0E0,0xD0E4,0xD0EC,0xD0ED,0xD0EF,
-	0xD0F0,0xD0F1,0xD0F8,0xD10D,0xD130,0xD131,0xD134,0xD138,
-	0xD13A,0xD140,0xD141,0xD143,0xD144,0xD145,0xD14C,0xD14D,
-	0xD150,0xD154,0xD15C,0xD15D,0xD15F,0xD161,0xD168,0xD16C,
-	0xD17C,0xD184,0xD188,0xD1A0,0xD1A1,0xD1A4,0xD1A8,0xD1B0,
-	0xD1B1,0xD1B3,0xD1B5,0xD1BA,0xD1BC,0xD1C0,0xD1D8,0xD1F4,
-	0xD1F8,0xD207,0xD209,0xD210,0xD22C,0xD22D,0xD230,0xD234,
-	0xD23C,0xD23D,0xD23F,0xD241,0xD248,0xD25C,
-	/* Range 0x4621 - 0x467E, array index: 0x0D0B */
-	0xD264,0xD280,0xD281,0xD284,0xD288,0xD290,0xD291,0xD295,
-	0xD29C,0xD2A0,0xD2A4,0xD2AC,0xD2B1,0xD2B8,0xD2B9,0xD2BC,
-	0xD2BF,0xD2C0,0xD2C2,0xD2C8,0xD2C9,0xD2CB,0xD2D4,0xD2D8,
-	0xD2DC,0xD2E4,0xD2E5,0xD2F0,0xD2F1,0xD2F4,0xD2F8,0xD300,
-	0xD301,0xD303,0xD305,0xD30C,0xD30D,0xD30E,0xD310,0xD314,
-	0xD316,0xD31C,0xD31D,0xD31F,0xD320,0xD321,0xD325,0xD328,
-	0xD329,0xD32C,0xD330,0xD338,0xD339,0xD33B,0xD33C,0xD33D,
-	0xD344,0xD345,0xD37C,0xD37D,0xD380,0xD384,0xD38C,0xD38D,
-	0xD38F,0xD390,0xD391,0xD398,0xD399,0xD39C,0xD3A0,0xD3A8,
-	0xD3A9,0xD3AB,0xD3AD,0xD3B4,0xD3B8,0xD3BC,0xD3C4,0xD3C5,
-	0xD3C8,0xD3C9,0xD3D0,0xD3D8,0xD3E1,0xD3E3,0xD3EC,0xD3ED,
-	0xD3F0,0xD3F4,0xD3FC,0xD3FD,0xD3FF,0xD401,
-	/* Range 0x4721 - 0x477E, array index: 0x0D69 */
-	0xD408,0xD41D,0xD440,0xD444,0xD45C,0xD460,0xD464,0xD46D,
-	0xD46F,0xD478,0xD479,0xD47C,0xD47F,0xD480,0xD482,0xD488,
-	0xD489,0xD48B,0xD48D,0xD494,0xD4A9,0xD4CC,0xD4D0,0xD4D4,
-	0xD4DC,0xD4DF,0xD4E8,0xD4EC,0xD4F0,0xD4F8,0xD4FB,0xD4FD,
-	0xD504,0xD508,0xD50C,0xD514,0xD515,0xD517,0xD53C,0xD53D,
-	0xD540,0xD544,0xD54C,0xD54D,0xD54F,0xD551,0xD558,0xD559,
-	0xD55C,0xD560,0xD565,0xD568,0xD569,0xD56B,0xD56D,0xD574,
-	0xD575,0xD578,0xD57C,0xD584,0xD585,0xD587,0xD588,0xD589,
-	0xD590,0xD5A5,0xD5C8,0xD5C9,0xD5CC,0xD5D0,0xD5D2,0xD5D8,
-	0xD5D9,0xD5DB,0xD5DD,0xD5E4,0xD5E5,0xD5E8,0xD5EC,0xD5F4,
-	0xD5F5,0xD5F7,0xD5F9,0xD600,0xD601,0xD604,0xD608,0xD610,
-	0xD611,0xD613,0xD614,0xD615,0xD61C,0xD620,
-	/* Range 0x4821 - 0x487E, array index: 0x0DC7 */
-	0xD624,0xD62D,0xD638,0xD639,0xD63C,0xD640,0xD645,0xD648,
-	0xD649,0xD64B,0xD64D,0xD651,0xD654,0xD655,0xD658,0xD65C,
-	0xD667,0xD669,0xD670,0xD671,0xD674,0xD683,0xD685,0xD68C,
-	0xD68D,0xD690,0xD694,0xD69D,0xD69F,0xD6A1,0xD6A8,0xD6AC,
-	0xD6B0,0xD6B9,0xD6BB,0xD6C4,0xD6C5,0xD6C8,0xD6CC,0xD6D1,
-	0xD6D4,0xD6D7,0xD6D9,0xD6E0,0xD6E4,0xD6E8,0xD6F0,0xD6F5,
-	0xD6FC,0xD6FD,0xD700,0xD704,0xD711,0xD718,0xD719,0xD71C,
-	0xD720,0xD728,0xD729,0xD72B,0xD72D,0xD734,0xD735,0xD738,
-	0xD73C,0xD744,0xD747,0xD749,0xD750,0xD751,0xD754,0xD756,
-	0xD757,0xD758,0xD759,0xD760,0xD761,0xD763,0xD765,0xD769,
-	0xD76C,0xD770,0xD774,0xD77C,0xD77D,0xD781,0xD788,0xD789,
-	0xD78C,0xD790,0xD798,0xD799,0xD79B,0xD79D,
-	/* Range 0x4A21 - 0x4A7E, array index: 0x0E25 */
-	0x4F3D,0x4F73,0x5047,0x50F9,0x52A0,0x53EF,0x5475,0x54E5,
-	0x5609,0x5AC1,0x5BB6,0x6687,0x67B6,0x67B7,0x67EF,0x6B4C,
-	0x73C2,0x75C2,0x7A3C,0x82DB,0x8304,0x8857,0x8888,0x8A36,
-	0x8CC8,0x8DCF,0x8EFB,0x8FE6,0x99D5,0x523B,0x5374,0x5404,
-	0x606A,0x6164,0x6BBC,0x73CF,0x811A,0x89BA,0x89D2,0x95A3,
-	0x4F83,0x520A,0x58BE,0x5978,0x59E6,0x5E72,0x5E79,0x61C7,
-	0x63C0,0x6746,0x67EC,0x687F,0x6F97,0x764E,0x770B,0x78F5,
-	0x7A08,0x7AFF,0x7C21,0x809D,0x826E,0x8271,0x8AEB,0x9593,
-	0x4E6B,0x559D,0x66F7,0x6E34,0x78A3,0x7AED,0x845B,0x8910,
-	0x874E,0x97A8,0x52D8,0x574E,0x582A,0x5D4C,0x611F,0x61BE,
-	0x6221,0x6562,0x67D1,0x6A44,0x6E1B,0x7518,0x75B3,0x76E3,
-	0x77B0,0x7D3A,0x90AF,0x9451,0x9452,0x9F95,
-	/* Range 0x4B21 - 0x4B7E, array index: 0x0E83 */
-	0x5323,0x5CAC,0x7532,0x80DB,0x9240,0x9598,0x525B,0x5808,
-	0x59DC,0x5CA1,0x5D17,0x5EB7,0x5F3A,0x5F4A,0x6177,0x6C5F,
-	0x757A,0x7586,0x7CE0,0x7D73,0x7DB1,0x7F8C,0x8154,0x8221,
-	0x8591,0x8941,0x8B1B,0x92FC,0x964D,0x9C47,0x4ECB,0x4EF7,
-	0x500B,0x51F1,0x584F,0x6137,0x613E,0x6168,0x6539,0x69EA,
-	0x6F11,0x75A5,0x7686,0x76D6,0x7B87,0x82A5,0x84CB,0xF900,
-	0x93A7,0x958B,0x5580,0x5BA2,0x5751,0xF901,0x7CB3,0x7FB9,
-	0x91B5,0x5028,0x53BB,0x5C45,0x5DE8,0x62D2,0x636E,0x64DA,
-	0x64E7,0x6E20,0x70AC,0x795B,0x8DDD,0x8E1E,0xF902,0x907D,
-	0x9245,0x92F8,0x4E7E,0x4EF6,0x5065,0x5DFE,0x5EFA,0x6106,
-	0x6957,0x8171,0x8654,0x8E47,0x9375,0x9A2B,0x4E5E,0x5091,
-	0x6770,0x6840,0x5109,0x528D,0x5292,0x6AA2,
-	/* Range 0x4C21 - 0x4C7E, array index: 0x0EE1 */
-	0x77BC,0x9210,0x9ED4,0x52AB,0x602F,0x8FF2,0x5048,0x61A9,
-	0x63ED,0x64CA,0x683C,0x6A84,0x6FC0,0x8188,0x89A1,0x9694,
-	0x5805,0x727D,0x72AC,0x7504,0x7D79,0x7E6D,0x80A9,0x898B,
-	0x8B74,0x9063,0x9D51,0x6289,0x6C7A,0x6F54,0x7D50,0x7F3A,
-	0x8A23,0x517C,0x614A,0x7B9D,0x8B19,0x9257,0x938C,0x4EAC,
-	0x4FD3,0x501E,0x50BE,0x5106,0x52C1,0x52CD,0x537F,0x5770,
-	0x5883,0x5E9A,0x5F91,0x6176,0x61AC,0x64CE,0x656C,0x666F,
-	0x66BB,0x66F4,0x6897,0x6D87,0x7085,0x70F1,0x749F,0x74A5,
-	0x74CA,0x75D9,0x786C,0x78EC,0x7ADF,0x7AF6,0x7D45,0x7D93,
-	0x8015,0x803F,0x811B,0x8396,0x8B66,0x8F15,0x9015,0x93E1,
-	0x9803,0x9838,0x9A5A,0x9BE8,0x4FC2,0x5553,0x583A,0x5951,
-	0x5B63,0x5C46,0x60B8,0x6212,0x6842,0x68B0,
-	/* Range 0x4D21 - 0x4D7E, array index: 0x0F3F */
-	0x68E8,0x6EAA,0x754C,0x7678,0x78CE,0x7A3D,0x7CFB,0x7E6B,
-	0x7E7C,0x8A08,0x8AA1,0x8C3F,0x968E,0x9DC4,0x53E4,0x53E9,
-	0x544A,0x5471,0x56FA,0x59D1,0x5B64,0x5C3B,0x5EAB,0x62F7,
-	0x6537,0x6545,0x6572,0x66A0,0x67AF,0x69C1,0x6CBD,0x75FC,
-	0x7690,0x777E,0x7A3F,0x7F94,0x8003,0x80A1,0x818F,0x82E6,
-	0x82FD,0x83F0,0x85C1,0x8831,0x88B4,0x8AA5,0xF903,0x8F9C,
-	0x932E,0x96C7,0x9867,0x9AD8,0x9F13,0x54ED,0x659B,0x66F2,
-	0x688F,0x7A40,0x8C37,0x9D60,0x56F0,0x5764,0x5D11,0x6606,
-	0x68B1,0x68CD,0x6EFE,0x7428,0x889E,0x9BE4,0x6C68,0xF904,
-	0x9AA8,0x4F9B,0x516C,0x5171,0x529F,0x5B54,0x5DE5,0x6050,
-	0x606D,0x62F1,0x63A7,0x653B,0x73D9,0x7A7A,0x86A3,0x8CA2,
-	0x978F,0x4E32,0x5BE1,0x6208,0x679C,0x74DC,
-	/* Range 0x4E21 - 0x4E7E, array index: 0x0F9D */
-	0x79D1,0x83D3,0x8A87,0x8AB2,0x8DE8,0x904E,0x934B,0x9846,
-	0x5ED3,0x69E8,0x85FF,0x90ED,0xF905,0x51A0,0x5B98,0x5BEC,
-	0x6163,0x68FA,0x6B3E,0x704C,0x742F,0x74D8,0x7BA1,0x7F50,
-	0x83C5,0x89C0,0x8CAB,0x95DC,0x9928,0x522E,0x605D,0x62EC,
-	0x9002,0x4F8A,0x5149,0x5321,0x58D9,0x5EE3,0x66E0,0x6D38,
-	0x709A,0x72C2,0x73D6,0x7B50,0x80F1,0x945B,0x5366,0x639B,
-	0x7F6B,0x4E56,0x5080,0x584A,0x58DE,0x602A,0x6127,0x62D0,
-	0x69D0,0x9B41,0x5B8F,0x7D18,0x80B1,0x8F5F,0x4EA4,0x50D1,
-	0x54AC,0x55AC,0x5B0C,0x5DA0,0x5DE7,0x652A,0x654E,0x6821,
-	0x6A4B,0x72E1,0x768E,0x77EF,0x7D5E,0x7FF9,0x81A0,0x854E,
-	0x86DF,0x8F03,0x8F4E,0x90CA,0x9903,0x9A55,0x9BAB,0x4E18,
-	0x4E45,0x4E5D,0x4EC7,0x4FF1,0x5177,0x52FE,
-	/* Range 0x4F21 - 0x4F7E, array index: 0x0FFB */
-	0x5340,0x53E3,0x53E5,0x548E,0x5614,0x5775,0x57A2,0x5BC7,
-	0x5D87,0x5ED0,0x61FC,0x62D8,0x6551,0x67B8,0x67E9,0x69CB,
-	0x6B50,0x6BC6,0x6BEC,0x6C42,0x6E9D,0x7078,0x72D7,0x7396,
-	0x7403,0x77BF,0x77E9,0x7A76,0x7D7F,0x8009,0x81FC,0x8205,
-	0x820A,0x82DF,0x8862,0x8B33,0x8CFC,0x8EC0,0x9011,0x90B1,
-	0x9264,0x92B6,0x99D2,0x9A45,0x9CE9,0x9DD7,0x9F9C,0x570B,
-	0x5C40,0x83CA,0x97A0,0x97AB,0x9EB4,0x541B,0x7A98,0x7FA4,
-	0x88D9,0x8ECD,0x90E1,0x5800,0x5C48,0x6398,0x7A9F,0x5BAE,
-	0x5F13,0x7A79,0x7AAE,0x828E,0x8EAC,0x5026,0x5238,0x52F8,
-	0x5377,0x5708,0x62F3,0x6372,0x6B0A,0x6DC3,0x7737,0x53A5,
-	0x7357,0x8568,0x8E76,0x95D5,0x673A,0x6AC3,0x6F70,0x8A6D,
-	0x8ECC,0x994B,0xF906,0x6677,0x6B78,0x8CB4,
-	/* Range 0x5021 - 0x507E, array index: 0x1059 */
-	0x9B3C,0xF907,0x53EB,0x572D,0x594E,0x63C6,0x69FB,0x73EA,
-	0x7845,0x7ABA,0x7AC5,0x7CFE,0x8475,0x898F,0x8D73,0x9035,
-	0x95A8,0x52FB,0x5747,0x7547,0x7B60,0x83CC,0x921E,0xF908,
-	0x6A58,0x514B,0x524B,0x5287,0x621F,0x68D8,0x6975,0x9699,
-	0x50C5,0x52A4,0x52E4,0x61C3,0x65A4,0x6839,0x69FF,0x747E,
-	0x7B4B,0x82B9,0x83EB,0x89B2,0x8B39,0x8FD1,0x9949,0xF909,
-	0x4ECA,0x5997,0x64D2,0x6611,0x6A8E,0x7434,0x7981,0x79BD,
-	0x82A9,0x887E,0x887F,0x895F,0xF90A,0x9326,0x4F0B,0x53CA,
-	0x6025,0x6271,0x6C72,0x7D1A,0x7D66,0x4E98,0x5162,0x77DC,
-	0x80AF,0x4F01,0x4F0E,0x5176,0x5180,0x55DC,0x5668,0x573B,
-	0x57FA,0x57FC,0x5914,0x5947,0x5993,0x5BC4,0x5C90,0x5D0E,
-	0x5DF1,0x5E7E,0x5FCC,0x6280,0x65D7,0x65E3,
-	/* Range 0x5121 - 0x517E, array index: 0x10B7 */
-	0x671E,0x671F,0x675E,0x68CB,0x68C4,0x6A5F,0x6B3A,0x6C23,
-	0x6C7D,0x6C82,0x6DC7,0x7398,0x7426,0x742A,0x7482,0x74A3,
-	0x7578,0x757F,0x7881,0x78EF,0x7941,0x7947,0x7948,0x797A,
-	0x7B95,0x7D00,0x7DBA,0x7F88,0x8006,0x802D,0x808C,0x8A18,
-	0x8B4F,0x8C48,0x8D77,0x9321,0x9324,0x98E2,0x9951,0x9A0E,
-	0x9A0F,0x9A65,0x9E92,0x7DCA,0x4F76,0x5409,0x62EE,0x6854,
-	0x91D1,0x55AB,0x513A,0xF90B,0xF90C,0x5A1C,0x61E6,0xF90D,
-	0x62CF,0x62FF,0xF90E,0xF90F,0xF910,0xF911,0xF912,0xF913,
-	0x90A3,0xF914,0xF915,0xF916,0xF917,0xF918,0x8AFE,0xF919,
-	0xF91A,0xF91B,0xF91C,0x6696,0xF91D,0x7156,0xF91E,0xF91F,
-	0x96E3,0xF920,0x634F,0x637A,0x5357,0xF921,0x678F,0x6960,
-	0x6E73,0xF922,0x7537,0xF923,0xF924,0xF925,
-	/* Range 0x5221 - 0x527E, array index: 0x1115 */
-	0x7D0D,0xF926,0xF927,0x8872,0x56CA,0x5A18,0xF928,0xF929,
-	0xF92A,0xF92B,0xF92C,0x4E43,0xF92D,0x5167,0x5948,0x67F0,
-	0x8010,0xF92E,0x5973,0x5E74,0x649A,0x79CA,0x5FF5,0x606C,
-	0x62C8,0x637B,0x5BE7,0x5BD7,0x52AA,0xF92F,0x5974,0x5F29,
-	0x6012,0xF930,0xF931,0xF932,0x7459,0xF933,0xF934,0xF935,
-	0xF936,0xF937,0xF938,0x99D1,0xF939,0xF93A,0xF93B,0xF93C,
-	0xF93D,0xF93E,0xF93F,0xF940,0xF941,0xF942,0xF943,0x6FC3,
-	0xF944,0xF945,0x81BF,0x8FB2,0x60F1,0xF946,0xF947,0x8166,
-	0xF948,0xF949,0x5C3F,0xF94A,0xF94B,0xF94C,0xF94D,0xF94E,
-	0xF94F,0xF950,0xF951,0x5AE9,0x8A25,0x677B,0x7D10,0xF952,
-	0xF953,0xF954,0xF955,0xF956,0xF957,0x80FD,0xF958,0xF959,
-	0x5C3C,0x6CE5,0x533F,0x6EBA,0x591A,0x8336,
-	/* Range 0x5321 - 0x537E, array index: 0x1173 */
-	0x4E39,0x4EB6,0x4F46,0x55AE,0x5718,0x58C7,0x5F56,0x65B7,
-	0x65E6,0x6A80,0x6BB5,0x6E4D,0x77ED,0x7AEF,0x7C1E,0x7DDE,
-	0x86CB,0x8892,0x9132,0x935B,0x64BB,0x6FBE,0x737A,0x75B8,
-	0x9054,0x5556,0x574D,0x61BA,0x64D4,0x66C7,0x6DE1,0x6E5B,
-	0x6F6D,0x6FB9,0x75F0,0x8043,0x81BD,0x8541,0x8983,0x8AC7,
-	0x8B5A,0x931F,0x6C93,0x7553,0x7B54,0x8E0F,0x905D,0x5510,
-	0x5802,0x5858,0x5E62,0x6207,0x649E,0x68E0,0x7576,0x7CD6,
-	0x87B3,0x9EE8,0x4EE3,0x5788,0x576E,0x5927,0x5C0D,0x5CB1,
-	0x5E36,0x5F85,0x6234,0x64E1,0x73B3,0x81FA,0x888B,0x8CB8,
-	0x968A,0x9EDB,0x5B85,0x5FB7,0x60B3,0x5012,0x5200,0x5230,
-	0x5716,0x5835,0x5857,0x5C0E,0x5C60,0x5CF6,0x5D8B,0x5EA6,
-	0x5F92,0x60BC,0x6311,0x6389,0x6417,0x6843,
-	/* Range 0x5421 - 0x547E, array index: 0x11D1 */
-	0x68F9,0x6AC2,0x6DD8,0x6E21,0x6ED4,0x6FE4,0x71FE,0x76DC,
-	0x7779,0x79B1,0x7A3B,0x8404,0x89A9,0x8CED,0x8DF3,0x8E48,
-	0x9003,0x9014,0x9053,0x90FD,0x934D,0x9676,0x97DC,0x6BD2,
-	0x7006,0x7258,0x72A2,0x7368,0x7763,0x79BF,0x7BE4,0x7E9B,
-	0x8B80,0x58A9,0x60C7,0x6566,0x65FD,0x66BE,0x6C8C,0x711E,
-	0x71C9,0x8C5A,0x9813,0x4E6D,0x7A81,0x4EDD,0x51AC,0x51CD,
-	0x52D5,0x540C,0x61A7,0x6771,0x6850,0x68DF,0x6D1E,0x6F7C,
-	0x75BC,0x77B3,0x7AE5,0x80F4,0x8463,0x9285,0x515C,0x6597,
-	0x675C,0x6793,0x75D8,0x7AC7,0x8373,0xF95A,0x8C46,0x9017,
-	0x982D,0x5C6F,0x81C0,0x829A,0x9041,0x906F,0x920D,0x5F97,
-	0x5D9D,0x6A59,0x71C8,0x767B,0x7B49,0x85E4,0x8B04,0x9127,
-	0x9A30,0x5587,0x61F6,0xF95B,0x7669,0x7F85,
-	/* Range 0x5521 - 0x557E, array index: 0x122F */
-	0x863F,0x87BA,0x88F8,0x908F,0xF95C,0x6D1B,0x70D9,0x73DE,
-	0x7D61,0x843D,0xF95D,0x916A,0x99F1,0xF95E,0x4E82,0x5375,
-	0x6B04,0x6B12,0x703E,0x721B,0x862D,0x9E1E,0x524C,0x8FA3,
-	0x5D50,0x64E5,0x652C,0x6B16,0x6FEB,0x7C43,0x7E9C,0x85CD,
-	0x8964,0x89BD,0x62C9,0x81D8,0x881F,0x5ECA,0x6717,0x6D6A,
-	0x72FC,0x7405,0x746F,0x8782,0x90DE,0x4F86,0x5D0D,0x5FA0,
-	0x840A,0x51B7,0x63A0,0x7565,0x4EAE,0x5006,0x5169,0x51C9,
-	0x6881,0x6A11,0x7CAE,0x7CB1,0x7CE7,0x826F,0x8AD2,0x8F1B,
-	0x91CF,0x4FB6,0x5137,0x52F5,0x5442,0x5EEC,0x616E,0x623E,
-	0x65C5,0x6ADA,0x6FFE,0x792A,0x85DC,0x8823,0x95AD,0x9A62,
-	0x9A6A,0x9E97,0x9ECE,0x529B,0x66C6,0x6B77,0x701D,0x792B,
-	0x8F62,0x9742,0x6190,0x6200,0x6523,0x6F23,
-	/* Range 0x5621 - 0x567E, array index: 0x128D */
-	0x7149,0x7489,0x7DF4,0x806F,0x84EE,0x8F26,0x9023,0x934A,
-	0x51BD,0x5217,0x52A3,0x6D0C,0x70C8,0x88C2,0x5EC9,0x6582,
-	0x6BAE,0x6FC2,0x7C3E,0x7375,0x4EE4,0x4F36,0x56F9,0xF95F,
-	0x5CBA,0x5DBA,0x601C,0x73B2,0x7B2D,0x7F9A,0x7FCE,0x8046,
-	0x901E,0x9234,0x96F6,0x9748,0x9818,0x9F61,0x4F8B,0x6FA7,
-	0x79AE,0x91B4,0x96B7,0x52DE,0xF960,0x6488,0x64C4,0x6AD3,
-	0x6F5E,0x7018,0x7210,0x76E7,0x8001,0x8606,0x865C,0x8DEF,
-	0x8F05,0x9732,0x9B6F,0x9DFA,0x9E75,0x788C,0x797F,0x7DA0,
-	0x83C9,0x9304,0x9E7F,0x9E93,0x8AD6,0x58DF,0x5F04,0x6727,
-	0x7027,0x74CF,0x7C60,0x807E,0x5121,0x7028,0x7262,0x78CA,
-	0x8CC2,0x8CDA,0x8CF4,0x96F7,0x4E86,0x50DA,0x5BEE,0x5ED6,
-	0x6599,0x71CE,0x7642,0x77AD,0x804A,0x84FC,
-	/* Range 0x5721 - 0x577E, array index: 0x12EB */
-	0x907C,0x9B27,0x9F8D,0x58D8,0x5A41,0x5C62,0x6A13,0x6DDA,
-	0x6F0F,0x763B,0x7D2F,0x7E37,0x851E,0x8938,0x93E4,0x964B,
-	0x5289,0x65D2,0x67F3,0x69B4,0x6D41,0x6E9C,0x700F,0x7409,
-	0x7460,0x7559,0x7624,0x786B,0x8B2C,0x985E,0x516D,0x622E,
-	0x9678,0x4F96,0x502B,0x5D19,0x6DEA,0x7DB8,0x8F2A,0x5F8B,
-	0x6144,0x6817,0xF961,0x9686,0x52D2,0x808B,0x51DC,0x51CC,
-	0x695E,0x7A1C,0x7DBE,0x83F1,0x9675,0x4FDA,0x5229,0x5398,
-	0x540F,0x550E,0x5C65,0x60A7,0x674E,0x68A8,0x6D6C,0x7281,
-	0x72F8,0x7406,0x7483,0xF962,0x75E2,0x7C6C,0x7F79,0x7FB8,
-	0x8389,0x88CF,0x88E1,0x91CC,0x91D0,0x96E2,0x9BC9,0x541D,
-	0x6F7E,0x71D0,0x7498,0x85FA,0x8EAA,0x96A3,0x9C57,0x9E9F,
-	0x6797,0x6DCB,0x7433,0x81E8,0x9716,0x782C,
-	/* Range 0x5821 - 0x587E, array index: 0x1349 */
-	0x7ACB,0x7B20,0x7C92,0x6469,0x746A,0x75F2,0x78BC,0x78E8,
-	0x99AC,0x9B54,0x9EBB,0x5BDE,0x5E55,0x6F20,0x819C,0x83AB,
-	0x9088,0x4E07,0x534D,0x5A29,0x5DD2,0x5F4E,0x6162,0x633D,
-	0x6669,0x66FC,0x6EFF,0x6F2B,0x7063,0x779E,0x842C,0x8513,
-	0x883B,0x8F13,0x9945,0x9C3B,0x551C,0x62B9,0x672B,0x6CAB,
-	0x8309,0x896A,0x977A,0x4EA1,0x5984,0x5FD8,0x5FD9,0x671B,
-	0x7DB2,0x7F54,0x8292,0x832B,0x83BD,0x8F1E,0x9099,0x57CB,
-	0x59B9,0x5A92,0x5BD0,0x6627,0x679A,0x6885,0x6BCF,0x7164,
-	0x7F75,0x8CB7,0x8CE3,0x9081,0x9B45,0x8108,0x8C8A,0x964C,
-	0x9A40,0x9EA5,0x5B5F,0x6C13,0x731B,0x76F2,0x76DF,0x840C,
-	0x51AA,0x8993,0x514D,0x5195,0x52C9,0x68C9,0x6C94,0x7704,
-	0x7720,0x7DBF,0x7DEC,0x9762,0x9EB5,0x6EC5,
-	/* Range 0x5921 - 0x597E, array index: 0x13A7 */
-	0x8511,0x51A5,0x540D,0x547D,0x660E,0x669D,0x6927,0x6E9F,
-	0x76BF,0x7791,0x8317,0x84C2,0x879F,0x9169,0x9298,0x9CF4,
-	0x8882,0x4FAE,0x5192,0x52DF,0x59C6,0x5E3D,0x6155,0x6478,
-	0x6479,0x66AE,0x67D0,0x6A21,0x6BCD,0x6BDB,0x725F,0x7261,
-	0x7441,0x7738,0x77DB,0x8017,0x82BC,0x8305,0x8B00,0x8B28,
-	0x8C8C,0x6728,0x6C90,0x7267,0x76EE,0x7766,0x7A46,0x9DA9,
-	0x6B7F,0x6C92,0x5922,0x6726,0x8499,0x536F,0x5893,0x5999,
-	0x5EDF,0x63CF,0x6634,0x6773,0x6E3A,0x732B,0x7AD7,0x82D7,
-	0x9328,0x52D9,0x5DEB,0x61AE,0x61CB,0x620A,0x62C7,0x64AB,
-	0x65E0,0x6959,0x6B66,0x6BCB,0x7121,0x73F7,0x755D,0x7E46,
-	0x821E,0x8302,0x856A,0x8AA3,0x8CBF,0x9727,0x9D61,0x58A8,
-	0x9ED8,0x5011,0x520E,0x543B,0x554F,0x6587,
-	/* Range 0x5A21 - 0x5A7E, array index: 0x1405 */
-	0x6C76,0x7D0A,0x7D0B,0x805E,0x868A,0x9580,0x96EF,0x52FF,
-	0x6C95,0x7269,0x5473,0x5A9A,0x5C3E,0x5D4B,0x5F4C,0x5FAE,
-	0x672A,0x68B6,0x6963,0x6E3C,0x6E44,0x7709,0x7C73,0x7F8E,
-	0x8587,0x8B0E,0x8FF7,0x9761,0x9EF4,0x5CB7,0x60B6,0x610D,
-	0x61AB,0x654F,0x65FB,0x65FC,0x6C11,0x6CEF,0x739F,0x73C9,
-	0x7DE1,0x9594,0x5BC6,0x871C,0x8B10,0x525D,0x535A,0x62CD,
-	0x640F,0x64B2,0x6734,0x6A38,0x6CCA,0x73C0,0x749E,0x7B94,
-	0x7C95,0x7E1B,0x818A,0x8236,0x8584,0x8FEB,0x96F9,0x99C1,
-	0x4F34,0x534A,0x53CD,0x53DB,0x62CC,0x642C,0x6500,0x6591,
-	0x69C3,0x6CEE,0x6F58,0x73ED,0x7554,0x7622,0x76E4,0x76FC,
-	0x78D0,0x78FB,0x792C,0x7D46,0x822C,0x87E0,0x8FD4,0x9812,
-	0x98EF,0x52C3,0x62D4,0x64A5,0x6E24,0x6F51,
-	/* Range 0x5B21 - 0x5B7E, array index: 0x1463 */
-	0x767C,0x8DCB,0x91B1,0x9262,0x9AEE,0x9B43,0x5023,0x508D,
-	0x574A,0x59A8,0x5C28,0x5E47,0x5F77,0x623F,0x653E,0x65B9,
-	0x65C1,0x6609,0x678B,0x699C,0x6EC2,0x78C5,0x7D21,0x80AA,
-	0x8180,0x822B,0x82B3,0x84A1,0x868C,0x8A2A,0x8B17,0x90A6,
-	0x9632,0x9F90,0x500D,0x4FF3,0xF963,0x57F9,0x5F98,0x62DC,
-	0x6392,0x676F,0x6E43,0x7119,0x76C3,0x80CC,0x80DA,0x88F4,
-	0x88F5,0x8919,0x8CE0,0x8F29,0x914D,0x966A,0x4F2F,0x4F70,
-	0x5E1B,0x67CF,0x6822,0x767D,0x767E,0x9B44,0x5E61,0x6A0A,
-	0x7169,0x71D4,0x756A,0xF964,0x7E41,0x8543,0x85E9,0x98DC,
-	0x4F10,0x7B4F,0x7F70,0x95A5,0x51E1,0x5E06,0x68B5,0x6C3E,
-	0x6C4E,0x6CDB,0x72AF,0x7BC4,0x8303,0x6CD5,0x743A,0x50FB,
-	0x5288,0x58C1,0x64D8,0x6A97,0x74A7,0x7656,
-	/* Range 0x5C21 - 0x5C7E, array index: 0x14C1 */
-	0x78A7,0x8617,0x95E2,0x9739,0xF965,0x535E,0x5F01,0x8B8A,
-	0x8FA8,0x8FAF,0x908A,0x5225,0x77A5,0x9C49,0x9F08,0x4E19,
-	0x5002,0x5175,0x5C5B,0x5E77,0x661E,0x663A,0x67C4,0x68C5,
-	0x70B3,0x7501,0x75C5,0x79C9,0x7ADD,0x8F27,0x9920,0x9A08,
-	0x4FDD,0x5821,0x5831,0x5BF6,0x666E,0x6B65,0x6D11,0x6E7A,
-	0x6F7D,0x73E4,0x752B,0x83E9,0x88DC,0x8913,0x8B5C,0x8F14,
-	0x4F0F,0x50D5,0x5310,0x535C,0x5B93,0x5FA9,0x670D,0x798F,
-	0x8179,0x832F,0x8514,0x8907,0x8986,0x8F39,0x8F3B,0x99A5,
-	0x9C12,0x672C,0x4E76,0x4FF8,0x5949,0x5C01,0x5CEF,0x5CF0,
-	0x6367,0x68D2,0x70FD,0x71A2,0x742B,0x7E2B,0x84EC,0x8702,
-	0x9022,0x92D2,0x9CF3,0x4E0D,0x4ED8,0x4FEF,0x5085,0x5256,
-	0x526F,0x5426,0x5490,0x57E0,0x592B,0x5A66,
-	/* Range 0x5D21 - 0x5D7E, array index: 0x151F */
-	0x5B5A,0x5B75,0x5BCC,0x5E9C,0xF966,0x6276,0x6577,0x65A7,
-	0x6D6E,0x6EA5,0x7236,0x7B26,0x7C3F,0x7F36,0x8150,0x8151,
-	0x819A,0x8240,0x8299,0x83A9,0x8A03,0x8CA0,0x8CE6,0x8CFB,
-	0x8D74,0x8DBA,0x90E8,0x91DC,0x961C,0x9644,0x99D9,0x9CE7,
-	0x5317,0x5206,0x5429,0x5674,0x58B3,0x5954,0x596E,0x5FFF,
-	0x61A4,0x626E,0x6610,0x6C7E,0x711A,0x76C6,0x7C89,0x7CDE,
-	0x7D1B,0x82AC,0x8CC1,0x96F0,0xF967,0x4F5B,0x5F17,0x5F7F,
-	0x62C2,0x5D29,0x670B,0x68DA,0x787C,0x7E43,0x9D6C,0x4E15,
-	0x5099,0x5315,0x532A,0x5351,0x5983,0x5A62,0x5E87,0x60B2,
-	0x618A,0x6249,0x6279,0x6590,0x6787,0x69A7,0x6BD4,0x6BD6,
-	0x6BD7,0x6BD8,0x6CB8,0xF968,0x7435,0x75FA,0x7812,0x7891,
-	0x79D5,0x79D8,0x7C83,0x7DCB,0x7FE1,0x80A5,
-	/* Range 0x5E21 - 0x5E7E, array index: 0x157D */
-	0x813E,0x81C2,0x83F2,0x871A,0x88E8,0x8AB9,0x8B6C,0x8CBB,
-	0x9119,0x975E,0x98DB,0x9F3B,0x56AC,0x5B2A,0x5F6C,0x658C,
-	0x6AB3,0x6BAF,0x6D5C,0x6FF1,0x7015,0x725D,0x73AD,0x8CA7,
-	0x8CD3,0x983B,0x6191,0x6C37,0x8058,0x9A01,0x4E4D,0x4E8B,
-	0x4E9B,0x4ED5,0x4F3A,0x4F3C,0x4F7F,0x4FDF,0x50FF,0x53F2,
-	0x53F8,0x5506,0x55E3,0x56DB,0x58EB,0x5962,0x5A11,0x5BEB,
-	0x5BFA,0x5C04,0x5DF3,0x5E2B,0x5F99,0x601D,0x6368,0x659C,
-	0x65AF,0x67F6,0x67FB,0x68AD,0x6B7B,0x6C99,0x6CD7,0x6E23,
-	0x7009,0x7345,0x7802,0x793E,0x7940,0x7960,0x79C1,0x7BE9,
-	0x7D17,0x7D72,0x8086,0x820D,0x838E,0x84D1,0x86C7,0x88DF,
-	0x8A50,0x8A5E,0x8B1D,0x8CDC,0x8D66,0x8FAD,0x90AA,0x98FC,
-	0x99DF,0x9E9D,0x524A,0xF969,0x6714,0xF96A,
-	/* Range 0x5F21 - 0x5F7E, array index: 0x15DB */
-	0x5098,0x522A,0x5C71,0x6563,0x6C55,0x73CA,0x7523,0x759D,
-	0x7B97,0x849C,0x9178,0x9730,0x4E77,0x6492,0x6BBA,0x715E,
-	0x85A9,0x4E09,0xF96B,0x6749,0x68EE,0x6E17,0x829F,0x8518,
-	0x886B,0x63F7,0x6F81,0x9212,0x98AF,0x4E0A,0x50B7,0x50CF,
-	0x511F,0x5546,0x55AA,0x5617,0x5B40,0x5C19,0x5CE0,0x5E38,
-	0x5E8A,0x5EA0,0x5EC2,0x60F3,0x6851,0x6A61,0x6E58,0x723D,
-	0x7240,0x72C0,0x76F8,0x7965,0x7BB1,0x7FD4,0x88F3,0x89F4,
-	0x8A73,0x8C61,0x8CDE,0x971C,0x585E,0x74BD,0x8CFD,0x55C7,
-	0xF96C,0x7A61,0x7D22,0x8272,0x7272,0x751F,0x7525,0xF96D,
-	0x7B19,0x5885,0x58FB,0x5DBC,0x5E8F,0x5EB6,0x5F90,0x6055,
-	0x6292,0x637F,0x654D,0x6691,0x66D9,0x66F8,0x6816,0x68F2,
-	0x7280,0x745E,0x7B6E,0x7D6E,0x7DD6,0x7F72,
-	/* Range 0x6021 - 0x607E, array index: 0x1639 */
-	0x80E5,0x8212,0x85AF,0x897F,0x8A93,0x901D,0x92E4,0x9ECD,
-	0x9F20,0x5915,0x596D,0x5E2D,0x60DC,0x6614,0x6673,0x6790,
-	0x6C50,0x6DC5,0x6F5F,0x77F3,0x78A9,0x84C6,0x91CB,0x932B,
-	0x4ED9,0x50CA,0x5148,0x5584,0x5B0B,0x5BA3,0x6247,0x657E,
-	0x65CB,0x6E32,0x717D,0x7401,0x7444,0x7487,0x74BF,0x766C,
-	0x79AA,0x7DDA,0x7E55,0x7FA8,0x817A,0x81B3,0x8239,0x861A,
-	0x87EC,0x8A75,0x8DE3,0x9078,0x9291,0x9425,0x994D,0x9BAE,
-	0x5368,0x5C51,0x6954,0x6CC4,0x6D29,0x6E2B,0x820C,0x859B,
-	0x893B,0x8A2D,0x8AAA,0x96EA,0x9F67,0x5261,0x66B9,0x6BB2,
-	0x7E96,0x87FE,0x8D0D,0x9583,0x965D,0x651D,0x6D89,0x71EE,
-	0xF96E,0x57CE,0x59D3,0x5BAC,0x6027,0x60FA,0x6210,0x661F,
-	0x665F,0x7329,0x73F9,0x76DB,0x7701,0x7B6C,
-	/* Range 0x6121 - 0x617E, array index: 0x1697 */
-	0x8056,0x8072,0x8165,0x8AA0,0x9192,0x4E16,0x52E2,0x6B72,
-	0x6D17,0x7A05,0x7B39,0x7D30,0xF96F,0x8CB0,0x53EC,0x562F,
-	0x5851,0x5BB5,0x5C0F,0x5C11,0x5DE2,0x6240,0x6383,0x6414,
-	0x662D,0x68B3,0x6CBC,0x6D88,0x6EAF,0x701F,0x70A4,0x71D2,
-	0x7526,0x758F,0x758E,0x7619,0x7B11,0x7BE0,0x7C2B,0x7D20,
-	0x7D39,0x852C,0x856D,0x8607,0x8A34,0x900D,0x9061,0x90B5,
-	0x92B7,0x97F6,0x9A37,0x4FD7,0x5C6C,0x675F,0x6D91,0x7C9F,
-	0x7E8C,0x8B16,0x8D16,0x901F,0x5B6B,0x5DFD,0x640D,0x84C0,
-	0x905C,0x98E1,0x7387,0x5B8B,0x609A,0x677E,0x6DDE,0x8A1F,
-	0x8AA6,0x9001,0x980C,0x5237,0xF970,0x7051,0x788E,0x9396,
-	0x8870,0x91D7,0x4FEE,0x53D7,0x55FD,0x56DA,0x5782,0x58FD,
-	0x5AC2,0x5B88,0x5CAB,0x5CC0,0x5E25,0x6101,
-	/* Range 0x6221 - 0x627E, array index: 0x16F5 */
-	0x620D,0x624B,0x6388,0x641C,0x6536,0x6578,0x6A39,0x6B8A,
-	0x6C34,0x6D19,0x6F31,0x71E7,0x72E9,0x7378,0x7407,0x74B2,
-	0x7626,0x7761,0x79C0,0x7A57,0x7AEA,0x7CB9,0x7D8F,0x7DAC,
-	0x7E61,0x7F9E,0x8129,0x8331,0x8490,0x84DA,0x85EA,0x8896,
-	0x8AB0,0x8B90,0x8F38,0x9042,0x9083,0x916C,0x9296,0x92B9,
-	0x968B,0x96A7,0x96A8,0x96D6,0x9700,0x9808,0x9996,0x9AD3,
-	0x9B1A,0x53D4,0x587E,0x5919,0x5B70,0x5BBF,0x6DD1,0x6F5A,
-	0x719F,0x7421,0x74B9,0x8085,0x83FD,0x5DE1,0x5F87,0x5FAA,
-	0x6042,0x65EC,0x6812,0x696F,0x6A53,0x6B89,0x6D35,0x6DF3,
-	0x73E3,0x76FE,0x77AC,0x7B4D,0x7D14,0x8123,0x821C,0x8340,
-	0x84F4,0x8563,0x8A62,0x8AC4,0x9187,0x931E,0x9806,0x99B4,
-	0x620C,0x8853,0x8FF0,0x9265,0x5D07,0x5D27,
-	/* Range 0x6321 - 0x637E, array index: 0x1753 */
-	0x5D69,0x745F,0x819D,0x8768,0x6FD5,0x62FE,0x7FD2,0x8936,
-	0x8972,0x4E1E,0x4E58,0x50E7,0x52DD,0x5347,0x627F,0x6607,
-	0x7E69,0x8805,0x965E,0x4F8D,0x5319,0x5636,0x59CB,0x5AA4,
-	0x5C38,0x5C4E,0x5C4D,0x5E02,0x5F11,0x6043,0x65BD,0x662F,
-	0x6642,0x67BE,0x67F4,0x731C,0x77E2,0x793A,0x7FC5,0x8494,
-	0x84CD,0x8996,0x8A66,0x8A69,0x8AE1,0x8C55,0x8C7A,0x57F4,
-	0x5BD4,0x5F0F,0x606F,0x62ED,0x690D,0x6B96,0x6E5C,0x7184,
-	0x7BD2,0x8755,0x8B58,0x8EFE,0x98DF,0x98FE,0x4F38,0x4F81,
-	0x4FE1,0x547B,0x5A20,0x5BB8,0x613C,0x65B0,0x6668,0x71FC,
-	0x7533,0x795E,0x7D33,0x814E,0x81E3,0x8398,0x85AA,0x85CE,
-	0x8703,0x8A0A,0x8EAB,0x8F9B,0xF971,0x8FC5,0x5931,0x5BA4,
-	0x5BE6,0x6089,0x5BE9,0x5C0B,0x5FC3,0x6C81,
-	/* Range 0x6421 - 0x647E, array index: 0x17B1 */
-	0xF972,0x6DF1,0x700B,0x751A,0x82AF,0x8AF6,0x4EC0,0x5341,
-	0xF973,0x96D9,0x6C0F,0x4E9E,0x4FC4,0x5152,0x555E,0x5A25,
-	0x5CE8,0x6211,0x7259,0x82BD,0x83AA,0x86FE,0x8859,0x8A1D,
-	0x963F,0x96C5,0x9913,0x9D09,0x9D5D,0x580A,0x5CB3,0x5DBD,
-	0x5E44,0x60E1,0x6115,0x63E1,0x6A02,0x6E25,0x9102,0x9354,
-	0x984E,0x9C10,0x9F77,0x5B89,0x5CB8,0x6309,0x664F,0x6848,
-	0x773C,0x96C1,0x978D,0x9854,0x9B9F,0x65A1,0x8B01,0x8ECB,
-	0x95BC,0x5535,0x5CA9,0x5DD6,0x5EB5,0x6697,0x764C,0x83F4,
-	0x95C7,0x58D3,0x62BC,0x72CE,0x9D28,0x4EF0,0x592E,0x600F,
-	0x663B,0x6B83,0x79E7,0x9D26,0x5393,0x54C0,0x57C3,0x5D16,
-	0x611B,0x66D6,0x6DAF,0x788D,0x827E,0x9698,0x9744,0x5384,
-	0x627C,0x6396,0x6DB2,0x7E0A,0x814B,0x984D,
-	/* Range 0x6521 - 0x657E, array index: 0x180F */
-	0x6AFB,0x7F4C,0x9DAF,0x9E1A,0x4E5F,0x503B,0x51B6,0x591C,
-	0x60F9,0x63F6,0x6930,0x723A,0x8036,0xF974,0x91CE,0x5F31,
-	0xF975,0xF976,0x7D04,0x82E5,0x846F,0x84BB,0x85E5,0x8E8D,
-	0xF977,0x4F6F,0xF978,0xF979,0x58E4,0x5B43,0x6059,0x63DA,
-	0x6518,0x656D,0x6698,0xF97A,0x694A,0x6A23,0x6D0B,0x7001,
-	0x716C,0x75D2,0x760D,0x79B3,0x7A70,0xF97B,0x7F8A,0xF97C,
-	0x8944,0xF97D,0x8B93,0x91C0,0x967D,0xF97E,0x990A,0x5704,
-	0x5FA1,0x65BC,0x6F01,0x7600,0x79A6,0x8A9E,0x99AD,0x9B5A,
-	0x9F6C,0x5104,0x61B6,0x6291,0x6A8D,0x81C6,0x5043,0x5830,
-	0x5F66,0x7109,0x8A00,0x8AFA,0x5B7C,0x8616,0x4FFA,0x513C,
-	0x56B4,0x5944,0x63A9,0x6DF9,0x5DAA,0x696D,0x5186,0x4E88,
-	0x4F59,0xF97F,0xF980,0xF981,0x5982,0xF982,
-	/* Range 0x6621 - 0x667E, array index: 0x186D */
-	0xF983,0x6B5F,0x6C5D,0xF984,0x74B5,0x7916,0xF985,0x8207,
-	0x8245,0x8339,0x8F3F,0x8F5D,0xF986,0x9918,0xF987,0xF988,
-	0xF989,0x4EA6,0xF98A,0x57DF,0x5F79,0x6613,0xF98B,0xF98C,
-	0x75AB,0x7E79,0x8B6F,0xF98D,0x9006,0x9A5B,0x56A5,0x5827,
-	0x59F8,0x5A1F,0x5BB4,0xF98E,0x5EF6,0xF98F,0xF990,0x6350,
-	0x633B,0xF991,0x693D,0x6C87,0x6CBF,0x6D8E,0x6D93,0x6DF5,
-	0x6F14,0xF992,0x70DF,0x7136,0x7159,0xF993,0x71C3,0x71D5,
-	0xF994,0x784F,0x786F,0xF995,0x7B75,0x7DE3,0xF996,0x7E2F,
-	0xF997,0x884D,0x8EDF,0xF998,0xF999,0xF99A,0x925B,0xF99B,
-	0x9CF6,0xF99C,0xF99D,0xF99E,0x6085,0x6D85,0xF99F,0x71B1,
-	0xF9A0,0xF9A1,0x95B1,0x53AD,0xF9A2,0xF9A3,0xF9A4,0x67D3,
-	0xF9A5,0x708E,0x7130,0x7430,0x8276,0x82D2,
-	/* Range 0x6721 - 0x677E, array index: 0x18CB */
-	0xF9A6,0x95BB,0x9AE5,0x9E7D,0x66C4,0xF9A7,0x71C1,0x8449,
-	0xF9A8,0xF9A9,0x584B,0xF9AA,0xF9AB,0x5DB8,0x5F71,0xF9AC,
-	0x6620,0x668E,0x6979,0x69AE,0x6C38,0x6CF3,0x6E36,0x6F41,
-	0x6FDA,0x701B,0x702F,0x7150,0x71DF,0x7370,0xF9AD,0x745B,
-	0xF9AE,0x74D4,0x76C8,0x7A4E,0x7E93,0xF9AF,0xF9B0,0x82F1,
-	0x8A60,0x8FCE,0xF9B1,0x9348,0xF9B2,0x9719,0xF9B3,0xF9B4,
-	0x4E42,0x502A,0xF9B5,0x5208,0x53E1,0x66F3,0x6C6D,0x6FCA,
-	0x730A,0x777F,0x7A62,0x82AE,0x85DD,0x8602,0xF9B6,0x88D4,
-	0x8A63,0x8B7D,0x8C6B,0xF9B7,0x92B3,0xF9B8,0x9713,0x9810,
-	0x4E94,0x4F0D,0x4FC9,0x50B2,0x5348,0x543E,0x5433,0x55DA,
-	0x5862,0x58BA,0x5967,0x5A1B,0x5BE4,0x609F,0xF9B9,0x61CA,
-	0x6556,0x65FF,0x6664,0x68A7,0x6C5A,0x6FB3,
-	/* Range 0x6821 - 0x687E, array index: 0x1929 */
-	0x70CF,0x71AC,0x7352,0x7B7D,0x8708,0x8AA4,0x9C32,0x9F07,
-	0x5C4B,0x6C83,0x7344,0x7389,0x923A,0x6EAB,0x7465,0x761F,
-	0x7A69,0x7E15,0x860A,0x5140,0x58C5,0x64C1,0x74EE,0x7515,
-	0x7670,0x7FC1,0x9095,0x96CD,0x9954,0x6E26,0x74E6,0x7AA9,
-	0x7AAA,0x81E5,0x86D9,0x8778,0x8A1B,0x5A49,0x5B8C,0x5B9B,
-	0x68A1,0x6900,0x6D63,0x73A9,0x7413,0x742C,0x7897,0x7DE9,
-	0x7FEB,0x8118,0x8155,0x839E,0x8C4C,0x962E,0x9811,0x66F0,
-	0x5F80,0x65FA,0x6789,0x6C6A,0x738B,0x502D,0x5A03,0x6B6A,
-	0x77EE,0x5916,0x5D6C,0x5DCD,0x7325,0x754F,0xF9BA,0xF9BB,
-	0x50E5,0x51F9,0x582F,0x592D,0x5996,0x59DA,0x5BE5,0xF9BC,
-	0xF9BD,0x5DA2,0x62D7,0x6416,0x6493,0x64FE,0xF9BE,0x66DC,
-	0xF9BF,0x6A48,0xF9C0,0x71FF,0x7464,0xF9C1,
-	/* Range 0x6921 - 0x697E, array index: 0x1987 */
-	0x7A88,0x7AAF,0x7E47,0x7E5E,0x8000,0x8170,0xF9C2,0x87EF,
-	0x8981,0x8B20,0x9059,0xF9C3,0x9080,0x9952,0x617E,0x6B32,
-	0x6D74,0x7E1F,0x8925,0x8FB1,0x4FD1,0x50AD,0x5197,0x52C7,
-	0x57C7,0x5889,0x5BB9,0x5EB8,0x6142,0x6995,0x6D8C,0x6E67,
-	0x6EB6,0x7194,0x7462,0x7528,0x752C,0x8073,0x8338,0x84C9,
-	0x8E0A,0x9394,0x93DE,0xF9C4,0x4E8E,0x4F51,0x5076,0x512A,
-	0x53C8,0x53CB,0x53F3,0x5B87,0x5BD3,0x5C24,0x611A,0x6182,
-	0x65F4,0x725B,0x7397,0x7440,0x76C2,0x7950,0x7991,0x79B9,
-	0x7D06,0x7FBD,0x828B,0x85D5,0x865E,0x8FC2,0x9047,0x90F5,
-	0x91EA,0x9685,0x96E8,0x96E9,0x52D6,0x5F67,0x65ED,0x6631,
-	0x682F,0x715C,0x7A36,0x90C1,0x980A,0x4E91,0xF9C5,0x6A52,
-	0x6B9E,0x6F90,0x7189,0x8018,0x82B8,0x8553,
-	/* Range 0x6A21 - 0x6A7E, array index: 0x19E5 */
-	0x904B,0x9695,0x96F2,0x97FB,0x851A,0x9B31,0x4E90,0x718A,
-	0x96C4,0x5143,0x539F,0x54E1,0x5713,0x5712,0x57A3,0x5A9B,
-	0x5AC4,0x5BC3,0x6028,0x613F,0x63F4,0x6C85,0x6D39,0x6E72,
-	0x6E90,0x7230,0x733F,0x7457,0x82D1,0x8881,0x8F45,0x9060,
-	0xF9C6,0x9662,0x9858,0x9D1B,0x6708,0x8D8A,0x925E,0x4F4D,
-	0x5049,0x50DE,0x5371,0x570D,0x59D4,0x5A01,0x5C09,0x6170,
-	0x6690,0x6E2D,0x7232,0x744B,0x7DEF,0x80C3,0x840E,0x8466,
-	0x853F,0x875F,0x885B,0x8918,0x8B02,0x9055,0x97CB,0x9B4F,
-	0x4E73,0x4F91,0x5112,0x516A,0xF9C7,0x552F,0x55A9,0x5B7A,
-	0x5BA5,0x5E7C,0x5E7D,0x5EBE,0x60A0,0x60DF,0x6108,0x6109,
-	0x63C4,0x6538,0x6709,0xF9C8,0x67D4,0x67DA,0xF9C9,0x6961,
-	0x6962,0x6CB9,0x6D27,0xF9CA,0x6E38,0xF9CB,
-	/* Range 0x6B21 - 0x6B7E, array index: 0x1A43 */
-	0x6FE1,0x7336,0x7337,0xF9CC,0x745C,0x7531,0xF9CD,0x7652,
-	0xF9CE,0xF9CF,0x7DAD,0x81FE,0x8438,0x88D5,0x8A98,0x8ADB,
-	0x8AED,0x8E30,0x8E42,0x904A,0x903E,0x907A,0x9149,0x91C9,
-	0x936E,0xF9D0,0xF9D1,0x5809,0xF9D2,0x6BD3,0x8089,0x80B2,
-	0xF9D3,0xF9D4,0x5141,0x596B,0x5C39,0xF9D5,0xF9D6,0x6F64,
-	0x73A7,0x80E4,0x8D07,0xF9D7,0x9217,0x958F,0xF9D8,0xF9D9,
-	0xF9DA,0xF9DB,0x807F,0x620E,0x701C,0x7D68,0x878D,0xF9DC,
-	0x57A0,0x6069,0x6147,0x6BB7,0x8ABE,0x9280,0x96B1,0x4E59,
-	0x541F,0x6DEB,0x852D,0x9670,0x97F3,0x98EE,0x63D6,0x6CE3,
-	0x9091,0x51DD,0x61C9,0x81BA,0x9DF9,0x4F9D,0x501A,0x5100,
-	0x5B9C,0x610F,0x61FF,0x64EC,0x6905,0x6BC5,0x7591,0x77E3,
-	0x7FA9,0x8264,0x858F,0x87FB,0x8863,0x8ABC,
-	/* Range 0x6C21 - 0x6C7E, array index: 0x1AA1 */
-	0x8B70,0x91AB,0x4E8C,0x4EE5,0x4F0A,0xF9DD,0xF9DE,0x5937,
-	0x59E8,0xF9DF,0x5DF2,0x5F1B,0x5F5B,0x6021,0xF9E0,0xF9E1,
-	0xF9E2,0xF9E3,0x723E,0x73E5,0xF9E4,0x7570,0x75CD,0xF9E5,
-	0x79FB,0xF9E6,0x800C,0x8033,0x8084,0x82E1,0x8351,0xF9E7,
-	0xF9E8,0x8CBD,0x8CB3,0x9087,0xF9E9,0xF9EA,0x98F4,0x990C,
-	0xF9EB,0xF9EC,0x7037,0x76CA,0x7FCA,0x7FCC,0x7FFC,0x8B1A,
-	0x4EBA,0x4EC1,0x5203,0x5370,0xF9ED,0x54BD,0x56E0,0x59FB,
-	0x5BC5,0x5F15,0x5FCD,0x6E6E,0xF9EE,0xF9EF,0x7D6A,0x8335,
-	0xF9F0,0x8693,0x8A8D,0xF9F1,0x976D,0x9777,0xF9F2,0xF9F3,
-	0x4E00,0x4F5A,0x4F7E,0x58F9,0x65E5,0x6EA2,0x9038,0x93B0,
-	0x99B9,0x4EFB,0x58EC,0x598A,0x59D9,0x6041,0xF9F4,0xF9F5,
-	0x7A14,0xF9F6,0x834F,0x8CC3,0x5165,0x5344,
-	/* Range 0x6D21 - 0x6D7E, array index: 0x1AFF */
-	0xF9F7,0xF9F8,0xF9F9,0x4ECD,0x5269,0x5B55,0x82BF,0x4ED4,
-	0x523A,0x54A8,0x59C9,0x59FF,0x5B50,0x5B57,0x5B5C,0x6063,
-	0x6148,0x6ECB,0x7099,0x716E,0x7386,0x74F7,0x75B5,0x78C1,
-	0x7D2B,0x8005,0x81EA,0x8328,0x8517,0x85C9,0x8AEE,0x8CC7,
-	0x96CC,0x4F5C,0x52FA,0x56BC,0x65AB,0x6628,0x707C,0x70B8,
-	0x7235,0x7DBD,0x828D,0x914C,0x96C0,0x9D72,0x5B71,0x68E7,
-	0x6B98,0x6F7A,0x76DE,0x5C91,0x66AB,0x6F5B,0x7BB4,0x7C2A,
-	0x8836,0x96DC,0x4E08,0x4ED7,0x5320,0x5834,0x58BB,0x58EF,
-	0x596C,0x5C07,0x5E33,0x5E84,0x5F35,0x638C,0x66B2,0x6756,
-	0x6A1F,0x6AA3,0x6B0C,0x6F3F,0x7246,0xF9FA,0x7350,0x748B,
-	0x7AE0,0x7CA7,0x8178,0x81DF,0x81E7,0x838A,0x846C,0x8523,
-	0x8594,0x85CF,0x88DD,0x8D13,0x91AC,0x9577,
-	/* Range 0x6E21 - 0x6E7E, array index: 0x1B5D */
-	0x969C,0x518D,0x54C9,0x5728,0x5BB0,0x624D,0x6750,0x683D,
-	0x6893,0x6E3D,0x6ED3,0x707D,0x7E21,0x88C1,0x8CA1,0x8F09,
-	0x9F4B,0x9F4E,0x722D,0x7B8F,0x8ACD,0x931A,0x4F47,0x4F4E,
-	0x5132,0x5480,0x59D0,0x5E95,0x62B5,0x6775,0x696E,0x6A17,
-	0x6CAE,0x6E1A,0x72D9,0x732A,0x75BD,0x7BB8,0x7D35,0x82E7,
-	0x83F9,0x8457,0x85F7,0x8A5B,0x8CAF,0x8E87,0x9019,0x90B8,
-	0x96CE,0x9F5F,0x52E3,0x540A,0x5AE1,0x5BC2,0x6458,0x6575,
-	0x6EF4,0x72C4,0xF9FB,0x7684,0x7A4D,0x7B1B,0x7C4D,0x7E3E,
-	0x7FDF,0x837B,0x8B2B,0x8CCA,0x8D64,0x8DE1,0x8E5F,0x8FEA,
-	0x8FF9,0x9069,0x93D1,0x4F43,0x4F7A,0x50B3,0x5168,0x5178,
-	0x524D,0x526A,0x5861,0x587C,0x5960,0x5C08,0x5C55,0x5EDB,
-	0x609B,0x6230,0x6813,0x6BBF,0x6C08,0x6FB1,
-	/* Range 0x6F21 - 0x6F7E, array index: 0x1BBB */
-	0x714E,0x7420,0x7530,0x7538,0x7551,0x7672,0x7B4C,0x7B8B,
-	0x7BAD,0x7BC6,0x7E8F,0x8A6E,0x8F3E,0x8F49,0x923F,0x9293,
-	0x9322,0x942B,0x96FB,0x985A,0x986B,0x991E,0x5207,0x622A,
-	0x6298,0x6D59,0x7664,0x7ACA,0x7BC0,0x7D76,0x5360,0x5CBE,
-	0x5E97,0x6F38,0x70B9,0x7C98,0x9711,0x9B8E,0x9EDE,0x63A5,
-	0x647A,0x8776,0x4E01,0x4E95,0x4EAD,0x505C,0x5075,0x5448,
-	0x59C3,0x5B9A,0x5E40,0x5EAD,0x5EF7,0x5F81,0x60C5,0x633A,
-	0x653F,0x6574,0x65CC,0x6676,0x6678,0x67FE,0x6968,0x6A89,
-	0x6B63,0x6C40,0x6DC0,0x6DE8,0x6E1F,0x6E5E,0x701E,0x70A1,
-	0x738E,0x73FD,0x753A,0x775B,0x7887,0x798E,0x7A0B,0x7A7D,
-	0x7CBE,0x7D8E,0x8247,0x8A02,0x8AEA,0x8C9E,0x912D,0x914A,
-	0x91D8,0x9266,0x92CC,0x9320,0x9706,0x9756,
-	/* Range 0x7021 - 0x707E, array index: 0x1C19 */
-	0x975C,0x9802,0x9F0E,0x5236,0x5291,0x557C,0x5824,0x5E1D,
-	0x5F1F,0x608C,0x63D0,0x68AF,0x6FDF,0x796D,0x7B2C,0x81CD,
-	0x85BA,0x88FD,0x8AF8,0x8E44,0x918D,0x9664,0x969B,0x973D,
-	0x984C,0x9F4A,0x4FCE,0x5146,0x51CB,0x52A9,0x5632,0x5F14,
-	0x5F6B,0x63AA,0x64CD,0x65E9,0x6641,0x66FA,0x66F9,0x671D,
-	0x689D,0x68D7,0x69FD,0x6F15,0x6F6E,0x7167,0x71E5,0x722A,
-	0x74AA,0x773A,0x7956,0x795A,0x79DF,0x7A20,0x7A95,0x7C97,
-	0x7CDF,0x7D44,0x7E70,0x8087,0x85FB,0x86A4,0x8A54,0x8ABF,
-	0x8D99,0x8E81,0x9020,0x906D,0x91E3,0x963B,0x96D5,0x9CE5,
-	0x65CF,0x7C07,0x8DB3,0x93C3,0x5B58,0x5C0A,0x5352,0x62D9,
-	0x731D,0x5027,0x5B97,0x5F9E,0x60B0,0x616B,0x68D5,0x6DD9,
-	0x742E,0x7A2E,0x7D42,0x7D9C,0x7E31,0x816B,
-	/* Range 0x7121 - 0x717E, array index: 0x1C77 */
-	0x8E2A,0x8E35,0x937E,0x9418,0x4F50,0x5750,0x5DE6,0x5EA7,
-	0x632B,0x7F6A,0x4E3B,0x4F4F,0x4F8F,0x505A,0x59DD,0x80C4,
-	0x546A,0x5468,0x55FE,0x594F,0x5B99,0x5DDE,0x5EDA,0x665D,
-	0x6731,0x67F1,0x682A,0x6CE8,0x6D32,0x6E4A,0x6F8D,0x70B7,
-	0x73E0,0x7587,0x7C4C,0x7D02,0x7D2C,0x7DA2,0x821F,0x86DB,
-	0x8A3B,0x8A85,0x8D70,0x8E8A,0x8F33,0x9031,0x914E,0x9152,
-	0x9444,0x99D0,0x7AF9,0x7CA5,0x4FCA,0x5101,0x51C6,0x57C8,
-	0x5BEF,0x5CFB,0x6659,0x6A3D,0x6D5A,0x6E96,0x6FEC,0x710C,
-	0x756F,0x7AE3,0x8822,0x9021,0x9075,0x96CB,0x99FF,0x8301,
-	0x4E2D,0x4EF2,0x8846,0x91CD,0x537D,0x6ADB,0x696B,0x6C41,
-	0x847A,0x589E,0x618E,0x66FE,0x62EF,0x70DD,0x7511,0x75C7,
-	0x7E52,0x84B8,0x8B49,0x8D08,0x4E4B,0x53EA,
-	/* Range 0x7221 - 0x727E, array index: 0x1CD5 */
-	0x54AB,0x5730,0x5740,0x5FD7,0x6301,0x6307,0x646F,0x652F,
-	0x65E8,0x667A,0x679D,0x67B3,0x6B62,0x6C60,0x6C9A,0x6F2C,
-	0x77E5,0x7825,0x7949,0x7957,0x7D19,0x80A2,0x8102,0x81F3,
-	0x829D,0x82B7,0x8718,0x8A8C,0xF9FC,0x8D04,0x8DBE,0x9072,
-	0x76F4,0x7A19,0x7A37,0x7E54,0x8077,0x5507,0x55D4,0x5875,
-	0x632F,0x6422,0x6649,0x664B,0x686D,0x699B,0x6B84,0x6D25,
-	0x6EB1,0x73CD,0x7468,0x74A1,0x755B,0x75B9,0x76E1,0x771E,
-	0x778B,0x79E6,0x7E09,0x7E1D,0x81FB,0x852F,0x8897,0x8A3A,
-	0x8CD1,0x8EEB,0x8FB0,0x9032,0x93AD,0x9663,0x9673,0x9707,
-	0x4F84,0x53F1,0x59EA,0x5AC9,0x5E19,0x684E,0x74C6,0x75BE,
-	0x79E9,0x7A92,0x81A3,0x86ED,0x8CEA,0x8DCC,0x8FED,0x659F,
-	0x6715,0xF9FD,0x57F7,0x6F57,0x7DDD,0x8F2F,
-	/* Range 0x7321 - 0x737E, array index: 0x1D33 */
-	0x93F6,0x96C6,0x5FB5,0x61F2,0x6F84,0x4E14,0x4F98,0x501F,
-	0x53C9,0x55DF,0x5D6F,0x5DEE,0x6B21,0x6B64,0x78CB,0x7B9A,
-	0xF9FE,0x8E49,0x8ECA,0x906E,0x6349,0x643E,0x7740,0x7A84,
-	0x932F,0x947F,0x9F6A,0x64B0,0x6FAF,0x71E6,0x74A8,0x74DA,
-	0x7AC4,0x7C12,0x7E82,0x7CB2,0x7E98,0x8B9A,0x8D0A,0x947D,
-	0x9910,0x994C,0x5239,0x5BDF,0x64E6,0x672D,0x7D2E,0x50ED,
-	0x53C3,0x5879,0x6158,0x6159,0x61FA,0x65AC,0x7AD9,0x8B92,
-	0x8B96,0x5009,0x5021,0x5275,0x5531,0x5A3C,0x5EE0,0x5F70,
-	0x6134,0x655E,0x660C,0x6636,0x66A2,0x69CD,0x6EC4,0x6F32,
-	0x7316,0x7621,0x7A93,0x8139,0x8259,0x83D6,0x84BC,0x50B5,
-	0x57F0,0x5BC0,0x5BE8,0x5F69,0x63A1,0x7826,0x7DB5,0x83DC,
-	0x8521,0x91C7,0x91F5,0x518A,0x67F5,0x7B56,
-	/* Range 0x7421 - 0x747E, array index: 0x1D91 */
-	0x8CAC,0x51C4,0x59BB,0x60BD,0x8655,0x501C,0xF9FF,0x5254,
-	0x5C3A,0x617D,0x621A,0x62D3,0x64F2,0x65A5,0x6ECC,0x7620,
-	0x810A,0x8E60,0x965F,0x96BB,0x4EDF,0x5343,0x5598,0x5929,
-	0x5DDD,0x64C5,0x6CC9,0x6DFA,0x7394,0x7A7F,0x821B,0x85A6,
-	0x8CE4,0x8E10,0x9077,0x91E7,0x95E1,0x9621,0x97C6,0x51F8,
-	0x54F2,0x5586,0x5FB9,0x64A4,0x6F88,0x7DB4,0x8F1F,0x8F4D,
-	0x9435,0x50C9,0x5C16,0x6CBE,0x6DFB,0x751B,0x77BB,0x7C3D,
-	0x7C64,0x8A79,0x8AC2,0x581E,0x59BE,0x5E16,0x6377,0x7252,
-	0x758A,0x776B,0x8ADC,0x8CBC,0x8F12,0x5EF3,0x6674,0x6DF8,
-	0x807D,0x83C1,0x8ACB,0x9751,0x9BD6,0xFA00,0x5243,0x66FF,
-	0x6D95,0x6EEF,0x7DE0,0x8AE6,0x902E,0x905E,0x9AD4,0x521D,
-	0x527F,0x54E8,0x6194,0x6284,0x62DB,0x68A2,
-	/* Range 0x7521 - 0x757E, array index: 0x1DEF */
-	0x6912,0x695A,0x6A35,0x7092,0x7126,0x785D,0x7901,0x790E,
-	0x79D2,0x7A0D,0x8096,0x8278,0x82D5,0x8349,0x8549,0x8C82,
-	0x8D85,0x9162,0x918B,0x91AE,0x4FC3,0x56D1,0x71ED,0x77D7,
-	0x8700,0x89F8,0x5BF8,0x5FD6,0x6751,0x90A8,0x53E2,0x585A,
-	0x5BF5,0x60A4,0x6181,0x6460,0x7E3D,0x8070,0x8525,0x9283,
-	0x64AE,0x50AC,0x5D14,0x6700,0x589C,0x62BD,0x63A8,0x690E,
-	0x6978,0x6A1E,0x6E6B,0x76BA,0x79CB,0x82BB,0x8429,0x8ACF,
-	0x8DA8,0x8FFD,0x9112,0x914B,0x919C,0x9310,0x9318,0x939A,
-	0x96DB,0x9A36,0x9C0D,0x4E11,0x755C,0x795D,0x7AFA,0x7B51,
-	0x7BC9,0x7E2E,0x84C4,0x8E59,0x8E74,0x8EF8,0x9010,0x6625,
-	0x693F,0x7443,0x51FA,0x672E,0x9EDC,0x5145,0x5FE0,0x6C96,
-	0x87F2,0x885D,0x8877,0x60B4,0x81B5,0x8403,
-	/* Range 0x7621 - 0x767E, array index: 0x1E4D */
-	0x8D05,0x53D6,0x5439,0x5634,0x5A36,0x5C31,0x708A,0x7FE0,
-	0x805A,0x8106,0x81ED,0x8DA3,0x9189,0x9A5F,0x9DF2,0x5074,
-	0x4EC4,0x53A0,0x60FB,0x6E2C,0x5C64,0x4F88,0x5024,0x55E4,
-	0x5CD9,0x5E5F,0x6065,0x6894,0x6CBB,0x6DC4,0x71BE,0x75D4,
-	0x75F4,0x7661,0x7A1A,0x7A49,0x7DC7,0x7DFB,0x7F6E,0x81F4,
-	0x86A9,0x8F1C,0x96C9,0x99B3,0x9F52,0x5247,0x52C5,0x98ED,
-	0x89AA,0x4E03,0x67D2,0x6F06,0x4FB5,0x5BE2,0x6795,0x6C88,
-	0x6D78,0x741B,0x7827,0x91DD,0x937C,0x87C4,0x79E4,0x7A31,
-	0x5FEB,0x4ED6,0x54A4,0x553E,0x58AE,0x59A5,0x60F0,0x6253,
-	0x62D6,0x6736,0x6955,0x8235,0x9640,0x99B1,0x99DD,0x502C,
-	0x5353,0x5544,0x577C,0xFA01,0x6258,0xFA02,0x64E2,0x666B,
-	0x67DD,0x6FC1,0x6FEF,0x7422,0x7438,0x8A17,
-	/* Range 0x7721 - 0x777E, array index: 0x1EAB */
-	0x9438,0x5451,0x5606,0x5766,0x5F48,0x619A,0x6B4E,0x7058,
-	0x70AD,0x7DBB,0x8A95,0x596A,0x812B,0x63A2,0x7708,0x803D,
-	0x8CAA,0x5854,0x642D,0x69BB,0x5B95,0x5E11,0x6E6F,0xFA03,
-	0x8569,0x514C,0x53F0,0x592A,0x6020,0x614B,0x6B86,0x6C70,
-	0x6CF0,0x7B1E,0x80CE,0x82D4,0x8DC6,0x90B0,0x98B1,0xFA04,
-	0x64C7,0x6FA4,0x6491,0x6504,0x514E,0x5410,0x571F,0x8A0E,
-	0x615F,0x6876,0xFA05,0x75DB,0x7B52,0x7D71,0x901A,0x5806,
-	0x69CC,0x817F,0x892A,0x9000,0x9839,0x5078,0x5957,0x59AC,
-	0x6295,0x900F,0x9B2A,0x615D,0x7279,0x95D6,0x5761,0x5A46,
-	0x5DF4,0x628A,0x64AD,0x64FA,0x6777,0x6CE2,0x6D3E,0x722C,
-	0x7436,0x7834,0x7F77,0x82AD,0x8DDB,0x9817,0x5224,0x5742,
-	0x677F,0x7248,0x74E3,0x8CA9,0x8FA6,0x9211,
-	/* Range 0x7821 - 0x787E, array index: 0x1F09 */
-	0x962A,0x516B,0x53ED,0x634C,0x4F69,0x5504,0x6096,0x6557,
-	0x6C9B,0x6D7F,0x724C,0x72FD,0x7A17,0x8987,0x8C9D,0x5F6D,
-	0x6F8E,0x70F9,0x81A8,0x610E,0x4FBF,0x504F,0x6241,0x7247,
-	0x7BC7,0x7DE8,0x7FE9,0x904D,0x97AD,0x9A19,0x8CB6,0x576A,
-	0x5E73,0x67B0,0x840D,0x8A55,0x5420,0x5B16,0x5E63,0x5EE2,
-	0x5F0A,0x6583,0x80BA,0x853D,0x9589,0x965B,0x4F48,0x5305,
-	0x530D,0x530F,0x5486,0x54FA,0x5703,0x5E03,0x6016,0x629B,
-	0x62B1,0x6355,0xFA06,0x6CE1,0x6D66,0x75B1,0x7832,0x80DE,
-	0x812F,0x82DE,0x8461,0x84B2,0x888D,0x8912,0x900B,0x92EA,
-	0x98FD,0x9B91,0x5E45,0x66B4,0x66DD,0x7011,0x7206,0xFA07,
-	0x4FF5,0x527D,0x5F6A,0x6153,0x6753,0x6A19,0x6F02,0x74E2,
-	0x7968,0x8868,0x8C79,0x98C7,0x98C4,0x9A43,
-	/* Range 0x7921 - 0x797E, array index: 0x1F67 */
-	0x54C1,0x7A1F,0x6953,0x8AF7,0x8C4A,0x98A8,0x99AE,0x5F7C,
-	0x62AB,0x75B2,0x76AE,0x88AB,0x907F,0x9642,0x5339,0x5F3C,
-	0x5FC5,0x6CCC,0x73CC,0x7562,0x758B,0x7B46,0x82FE,0x999D,
-	0x4E4F,0x903C,0x4E0B,0x4F55,0x53A6,0x590F,0x5EC8,0x6630,
-	0x6CB3,0x7455,0x8377,0x8766,0x8CC0,0x9050,0x971E,0x9C15,
-	0x58D1,0x5B78,0x8650,0x8B14,0x9DB4,0x5BD2,0x6068,0x608D,
-	0x65F1,0x6C57,0x6F22,0x6FA3,0x701A,0x7F55,0x7FF0,0x9591,
-	0x9592,0x9650,0x97D3,0x5272,0x8F44,0x51FD,0x542B,0x54B8,
-	0x5563,0x558A,0x6ABB,0x6DB5,0x7DD8,0x8266,0x929C,0x9677,
-	0x9E79,0x5408,0x54C8,0x76D2,0x86E4,0x95A4,0x95D4,0x965C,
-	0x4EA2,0x4F09,0x59EE,0x5AE6,0x5DF7,0x6052,0x6297,0x676D,
-	0x6841,0x6C86,0x6E2F,0x7F38,0x809B,0x822A,
-	/* Range 0x7A21 - 0x7A7E, array index: 0x1FC5 */
-	0xFA08,0xFA09,0x9805,0x4EA5,0x5055,0x54B3,0x5793,0x595A,
-	0x5B69,0x5BB3,0x61C8,0x6977,0x6D77,0x7023,0x87F9,0x89E3,
-	0x8A72,0x8AE7,0x9082,0x99ED,0x9AB8,0x52BE,0x6838,0x5016,
-	0x5E78,0x674F,0x8347,0x884C,0x4EAB,0x5411,0x56AE,0x73E6,
-	0x9115,0x97FF,0x9909,0x9957,0x9999,0x5653,0x589F,0x865B,
-	0x8A31,0x61B2,0x6AF6,0x737B,0x8ED2,0x6B47,0x96AA,0x9A57,
-	0x5955,0x7200,0x8D6B,0x9769,0x4FD4,0x5CF4,0x5F26,0x61F8,
-	0x665B,0x6CEB,0x70AB,0x7384,0x73B9,0x73FE,0x7729,0x774D,
-	0x7D43,0x7D62,0x7E23,0x8237,0x8852,0xFA0A,0x8CE2,0x9249,
-	0x986F,0x5B51,0x7A74,0x8840,0x9801,0x5ACC,0x4FE0,0x5354,
-	0x593E,0x5CFD,0x633E,0x6D79,0x72F9,0x8105,0x8107,0x83A2,
-	0x92CF,0x9830,0x4EA8,0x5144,0x5211,0x578B,
-	/* Range 0x7B21 - 0x7B7E, array index: 0x2023 */
-	0x5F62,0x6CC2,0x6ECE,0x7005,0x7050,0x70AF,0x7192,0x73E9,
-	0x7469,0x834A,0x87A2,0x8861,0x9008,0x90A2,0x93A3,0x99A8,
-	0x516E,0x5F57,0x60E0,0x6167,0x66B3,0x8559,0x8E4A,0x91AF,
-	0x978B,0x4E4E,0x4E92,0x547C,0x58D5,0x58FA,0x597D,0x5CB5,
-	0x5F27,0x6236,0x6248,0x660A,0x6667,0x6BEB,0x6D69,0x6DCF,
-	0x6E56,0x6EF8,0x6F94,0x6FE0,0x6FE9,0x705D,0x72D0,0x7425,
-	0x745A,0x74E0,0x7693,0x795C,0x7CCA,0x7E1E,0x80E1,0x82A6,
-	0x846B,0x84BF,0x864E,0x865F,0x8774,0x8B77,0x8C6A,0x93AC,
-	0x9800,0x9865,0x60D1,0x6216,0x9177,0x5A5A,0x660F,0x6DF7,
-	0x6E3E,0x743F,0x9B42,0x5FFD,0x60DA,0x7B0F,0x54C4,0x5F18,
-	0x6C5E,0x6CD3,0x6D2A,0x70D8,0x7D05,0x8679,0x8A0C,0x9D3B,
-	0x5316,0x548C,0x5B05,0x6A3A,0x706B,0x7575,
-	/* Range 0x7C21 - 0x7C7E, array index: 0x2081 */
-	0x798D,0x79BE,0x82B1,0x83EF,0x8A71,0x8B41,0x8CA8,0x9774,
-	0xFA0B,0x64F4,0x652B,0x78BA,0x78BB,0x7A6B,0x4E38,0x559A,
-	0x5950,0x5BA6,0x5E7B,0x60A3,0x63DB,0x6B61,0x6665,0x6853,
-	0x6E19,0x7165,0x74B0,0x7D08,0x9084,0x9A69,0x9C25,0x6D3B,
-	0x6ED1,0x733E,0x8C41,0x95CA,0x51F0,0x5E4C,0x5FA8,0x604D,
-	0x60F6,0x6130,0x614C,0x6643,0x6644,0x69A5,0x6CC1,0x6E5F,
-	0x6EC9,0x6F62,0x714C,0x749C,0x7687,0x7BC1,0x7C27,0x8352,
-	0x8757,0x9051,0x968D,0x9EC3,0x532F,0x56DE,0x5EFB,0x5F8A,
-	0x6062,0x6094,0x61F7,0x6666,0x6703,0x6A9C,0x6DEE,0x6FAE,
-	0x7070,0x736A,0x7E6A,0x81BE,0x8334,0x86D4,0x8AA8,0x8CC4,
-	0x5283,0x7372,0x5B96,0x6A6B,0x9404,0x54EE,0x5686,0x5B5D,
-	0x6548,0x6585,0x66C9,0x689F,0x6D8D,0x6DC6,
-	/* Range 0x7D21 - 0x7D7E, array index: 0x20DF */
-	0x723B,0x80B4,0x9175,0x9A4D,0x4FAF,0x5019,0x539A,0x540E,
-	0x543C,0x5589,0x55C5,0x5E3F,0x5F8C,0x673D,0x7166,0x73DD,
-	0x9005,0x52DB,0x52F3,0x5864,0x58CE,0x7104,0x718F,0x71FB,
-	0x85B0,0x8A13,0x6688,0x85A8,0x55A7,0x6684,0x714A,0x8431,
-	0x5349,0x5599,0x6BC1,0x5F59,0x5FBD,0x63EE,0x6689,0x7147,
-	0x8AF1,0x8F1D,0x9EBE,0x4F11,0x643A,0x70CB,0x7566,0x8667,
-	0x6064,0x8B4E,0x9DF8,0x5147,0x51F6,0x5308,0x6D36,0x80F8,
-	0x9ED1,0x6615,0x6B23,0x7098,0x75D5,0x5403,0x5C79,0x7D07,
-	0x8A16,0x6B20,0x6B3D,0x6B46,0x5438,0x6070,0x6D3D,0x7FD5,
-	0x8208,0x50D6,0x51DE,0x559C,0x566B,0x56CD,0x59EC,0x5B09,
-	0x5E0C,0x6199,0x6198,0x6231,0x665E,0x66E6,0x7199,0x71B9,
-	0x71BA,0x72A7,0x79A7,0x7A00,0x7FB2,0x8A70,
-	/* Unranged codes (93 codes) */
-};
-
-#endif /* ICONV_TO_UCS_CCS_KSX1001 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> ksx1001 speed-optimized table (74752 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_KSX1001) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_speed_ksx1001[] =
-{
-	/* Heading Block */
-	0x0100,0x0200,0x0300,0x0400,0x0500,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	0x0600,0x0700,0x0800,0x0900,0x0A00,0x0B00,0x0C00,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	0x0D00,0x0E00,0x0F00,0x1000,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,0x1100,0x1200,
-	0x1300,0x1400,0x1500,0x1600,0x1700,0x1800,0x1900,0x1A00,
-	0x1B00,0x1C00,0x1D00,0x1E00,0x1F00,0x2000,0x2100,0x2200,
-	0x2300,0x2400,0x2500,0x2600,0x2700,0x2800,0x2900,0x2A00,
-	0x2B00,0x2C00,0x2D00,0x2E00,0x2F00,0x3000,0x3100,0x3200,
-	0x3300,0x3400,0x3500,0x3600,0x3700,0x3800,0x3900,0x3A00,
-	0x3B00,0x3C00,0x3D00,0x3E00,0x3F00,0x4000,0x4100,0x4200,
-	0x4300,0x4400,0x4500,0x4600,0x4700,0x4800,0x4900,0x4A00,
-	0x4B00,0x4C00,0x4D00,0x4E00,0x4F00,0x5000,0x5100,0x5200,
-	0x5300,0x5400,0x5500,0x5600,0x5700,0x5800,0x5900,0x5A00,
-	0x5B00,0x5C00,0x5D00,0x5E00,0x5F00,0x6000,0x6100,0x6200,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,0x6300,0x6400,0x6500,0x6600,
-	0x6700,0x6800,0x6900,0x6A00,0x6B00,0x6C00,0x6D00,0x6E00,
-	0x6F00,0x7000,0x7100,0x7200,0x7300,0x7400,0x7500,0x7600,
-	0x7700,0x7800,0x7900,0x7A00,0x7B00,0x7C00,0x7D00,0x7E00,
-	0x7F00,0x8000,0x8100,0x8200,0x8300,0x8400,0x8500,0x8600,
-	0x8700,0x8800,0x8900,0x8A00,0x8B00,0x8C00,0x8D00,0x8E00,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,INVBLK,
-	INVBLK,0x8F00,0x9000,INVBLK,INVBLK,INVBLK,INVBLK,0x9100,
-	/* Block 1, Array index 0x0100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x222E,INVALC,INVALC,0x2234,INVALC,INVALC,0x2157,
-	0x2127,INVALC,0x2823,INVALC,INVALC,0x2129,INVALC,INVALC,
-	0x2146,0x213E,0x2977,0x2978,0x2225,INVALC,0x2252,0x2124,
-	0x222C,0x2976,0x282C,INVALC,0x2879,0x2876,0x287A,0x222F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2821,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2822,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x213F,
-	0x282A,INVALC,INVALC,INVALC,INVALC,INVALC,0x282D,0x292C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2921,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2923,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2140,
-	0x292A,INVALC,INVALC,INVALC,INVALC,INVALC,0x292D,INVALC,
-	/* Block 2, Array index 0x0200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2922,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2824,0x2924,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2925,0x2826,0x2926,INVALC,INVALC,INVALC,INVALC,
-	0x2927,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2828,
-	0x2928,0x2829,0x2929,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2930,0x282F,0x292F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x282B,0x292B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x282E,0x292E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 3, Array index 0x0300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x2227,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2230,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2228,0x222B,0x222A,0x222D,INVALC,0x2229,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 4, Array index 0x0400 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2541,0x2542,0x2543,0x2544,0x2545,0x2546,0x2547,
-	0x2548,0x2549,0x254A,0x254B,0x254C,0x254D,0x254E,0x254F,
-	0x2550,0x2551,INVALC,0x2552,0x2553,0x2554,0x2555,0x2556,
-	0x2557,0x2558,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2561,0x2562,0x2563,0x2564,0x2565,0x2566,0x2567,
-	0x2568,0x2569,0x256A,0x256B,0x256C,0x256D,0x256E,0x256F,
-	0x2570,0x2571,INVALC,0x2572,0x2573,0x2574,0x2575,0x2576,
-	0x2577,0x2578,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 5, Array index 0x0500 */
-	INVALC,0x2C27,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2C21,0x2C22,0x2C23,0x2C24,0x2C25,0x2C26,0x2C28,0x2C29,
-	0x2C2A,0x2C2B,0x2C2C,0x2C2D,0x2C2E,0x2C2F,0x2C30,0x2C31,
-	0x2C32,0x2C33,0x2C34,0x2C35,0x2C36,0x2C37,0x2C38,0x2C39,
-	0x2C3A,0x2C3B,0x2C3C,0x2C3D,0x2C3E,0x2C3F,0x2C40,0x2C41,
-	0x2C51,0x2C52,0x2C53,0x2C54,0x2C55,0x2C56,0x2C58,0x2C59,
-	0x2C5A,0x2C5B,0x2C5C,0x2C5D,0x2C5E,0x2C5F,0x2C60,0x2C61,
-	0x2C62,0x2C63,0x2C64,0x2C65,0x2C66,0x2C67,0x2C68,0x2C69,
-	0x2C6A,0x2C6B,0x2C6C,0x2C6D,0x2C6E,0x2C6F,0x2C70,0x2C71,
-	INVALC,0x2C57,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 33, Array index 0x0600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x212A,INVALC,INVALC,
-	0x212E,0x212F,INVALC,INVALC,0x2130,0x2131,INVALC,INVALC,
-	0x2253,0x2254,INVALC,INVALC,INVALC,0x2125,0x2126,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2236,INVALC,0x2147,0x2148,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2158,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2979,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x297A,
-	INVALC,0x297B,0x297C,0x297D,0x297E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 34, Array index 0x0700 */
-	INVALC,INVALC,INVALC,0x2149,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2235,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2724,INVALC,INVALC,0x2260,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2265,0x2262,INVALC,INVALC,INVALC,0x2759,INVALC,
-	INVALC,INVALC,INVALC,0x214A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x2877,0x2878,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x287B,0x287C,0x287D,0x287E,INVALC,
-	0x2530,0x2531,0x2532,0x2533,0x2534,0x2535,0x2536,0x2537,
-	0x2538,0x2539,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2521,0x2522,0x2523,0x2524,0x2525,0x2526,0x2527,0x2528,
-	0x2529,0x252A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2167,0x2168,0x2166,0x2169,0x216A,0x2255,0x2258,0x2256,
-	0x2259,0x2257,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2221,INVALC,0x2222,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 35, Array index 0x0800 */
-	0x2223,INVALC,0x2153,0x2224,INVALC,INVALC,INVALC,0x2154,
-	0x2174,INVALC,INVALC,0x2175,INVALC,INVALC,INVALC,0x2233,
-	INVALC,0x2232,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x216E,INVALC,INVALC,0x2170,0x2144,INVALC,
-	0x2150,INVALC,INVALC,INVALC,INVALC,0x212B,INVALC,0x217C,
-	0x217D,0x217B,0x217A,0x2172,0x2173,INVALC,0x2231,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2145,0x2171,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x212D,0x216F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2156,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2141,0x2155,INVALC,INVALC,0x2142,0x2143,INVALC,INVALC,
-	INVALC,INVALC,0x216C,0x216D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2178,0x2179,INVALC,INVALC,0x2176,0x2177,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2241,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x2151,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 36, Array index 0x0900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2152,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 37, Array index 0x0A00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2867,0x2868,0x2869,0x286A,0x286B,0x286C,0x286D,0x286E,
-	0x286F,0x2870,0x2871,0x2872,0x2873,0x2874,0x2875,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2967,0x2968,0x2969,0x296A,
-	0x296B,0x296C,0x296D,0x296E,0x296F,0x2970,0x2971,0x2972,
-	0x2973,0x2974,0x2975,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x294D,0x294E,0x294F,0x2950,
-	0x2951,0x2952,0x2953,0x2954,0x2955,0x2956,0x2957,0x2958,
-	0x2959,0x295A,0x295B,0x295C,0x295D,0x295E,0x295F,0x2960,
-	0x2961,0x2962,0x2963,0x2964,0x2965,0x2966,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x284D,0x284E,0x284F,0x2850,0x2851,0x2852,0x2853,0x2854,
-	0x2855,0x2856,0x2857,0x2858,0x2859,0x285A,0x285B,0x285C,
-	0x285D,0x285E,0x285F,0x2860,0x2861,0x2862,0x2863,0x2864,
-	0x2865,0x2866,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 38, Array index 0x0B00 */
-	0x2621,0x262C,0x2622,0x262D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2623,0x2648,0x2647,0x262E,
-	0x2624,0x2642,0x2641,0x262F,0x2626,0x2646,0x2645,0x2631,
-	0x2625,0x2644,0x2643,0x2630,0x2627,0x263C,0x2649,0x264A,
-	0x2637,0x264B,0x264C,0x2632,0x2629,0x263E,0x264D,0x264E,
-	0x2639,0x264F,0x2650,0x2634,0x2628,0x2651,0x2652,0x2638,
-	0x263D,0x2653,0x2654,0x2633,0x262A,0x2655,0x2656,0x263A,
-	0x263F,0x2657,0x2658,0x2635,0x262B,0x2659,0x265A,0x263B,
-	0x265B,0x265C,0x2640,0x265D,0x265E,0x265F,0x2660,0x2661,
-	0x2662,0x2663,0x2664,0x2636,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2246,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2161,0x2160,INVALC,0x2243,0x2247,0x2248,0x224B,0x224A,
-	0x2249,0x224C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x2163,0x2162,INVALC,INVALC,0x223A,0x2239,
-	INVALC,INVALC,INVALC,INVALC,0x2165,0x2164,INVALC,INVALC,
-	0x2238,0x2237,INVALC,INVALC,INVALC,INVALC,0x215F,0x215E,
-	0x2242,INVALC,INVALC,0x215B,INVALC,INVALC,0x215D,0x215C,
-	0x2244,0x2245,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 39, Array index 0x0C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x215A,0x2159,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x224F,0x224E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x2250,INVALC,0x2251,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x214F,INVALC,0x214E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x223C,0x223D,INVALC,0x2240,0x223B,0x223E,INVALC,0x223F,
-	0x224D,0x225B,0x225C,INVALC,0x225D,0x225A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 49, Array index 0x0D00 */
-	0x2121,0x2122,0x2123,0x2128,INVALC,INVALC,INVALC,INVALC,
-	0x2134,0x2135,0x2136,0x2137,0x2138,0x2139,0x213A,0x213B,
-	0x213C,0x213D,INVALC,0x216B,0x2132,0x2133,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2A21,0x2A22,0x2A23,0x2A24,0x2A25,0x2A26,0x2A27,
-	0x2A28,0x2A29,0x2A2A,0x2A2B,0x2A2C,0x2A2D,0x2A2E,0x2A2F,
-	0x2A30,0x2A31,0x2A32,0x2A33,0x2A34,0x2A35,0x2A36,0x2A37,
-	0x2A38,0x2A39,0x2A3A,0x2A3B,0x2A3C,0x2A3D,0x2A3E,0x2A3F,
-	0x2A40,0x2A41,0x2A42,0x2A43,0x2A44,0x2A45,0x2A46,0x2A47,
-	0x2A48,0x2A49,0x2A4A,0x2A4B,0x2A4C,0x2A4D,0x2A4E,0x2A4F,
-	0x2A50,0x2A51,0x2A52,0x2A53,0x2A54,0x2A55,0x2A56,0x2A57,
-	0x2A58,0x2A59,0x2A5A,0x2A5B,0x2A5C,0x2A5D,0x2A5E,0x2A5F,
-	0x2A60,0x2A61,0x2A62,0x2A63,0x2A64,0x2A65,0x2A66,0x2A67,
-	0x2A68,0x2A69,0x2A6A,0x2A6B,0x2A6C,0x2A6D,0x2A6E,0x2A6F,
-	0x2A70,0x2A71,0x2A72,0x2A73,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2B21,0x2B22,0x2B23,0x2B24,0x2B25,0x2B26,0x2B27,
-	0x2B28,0x2B29,0x2B2A,0x2B2B,0x2B2C,0x2B2D,0x2B2E,0x2B2F,
-	0x2B30,0x2B31,0x2B32,0x2B33,0x2B34,0x2B35,0x2B36,0x2B37,
-	0x2B38,0x2B39,0x2B3A,0x2B3B,0x2B3C,0x2B3D,0x2B3E,0x2B3F,
-	0x2B40,0x2B41,0x2B42,0x2B43,0x2B44,0x2B45,0x2B46,0x2B47,
-	0x2B48,0x2B49,0x2B4A,0x2B4B,0x2B4C,0x2B4D,0x2B4E,0x2B4F,
-	0x2B50,0x2B51,0x2B52,0x2B53,0x2B54,0x2B55,0x2B56,0x2B57,
-	0x2B58,0x2B59,0x2B5A,0x2B5B,0x2B5C,0x2B5D,0x2B5E,0x2B5F,
-	0x2B60,0x2B61,0x2B62,0x2B63,0x2B64,0x2B65,0x2B66,0x2B67,
-	0x2B68,0x2B69,0x2B6A,0x2B6B,0x2B6C,0x2B6D,0x2B6E,0x2B6F,
-	0x2B70,0x2B71,0x2B72,0x2B73,0x2B74,0x2B75,0x2B76,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 50, Array index 0x0E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2421,0x2422,0x2423,0x2424,0x2425,0x2426,0x2427,
-	0x2428,0x2429,0x242A,0x242B,0x242C,0x242D,0x242E,0x242F,
-	0x2430,0x2431,0x2432,0x2433,0x2434,0x2435,0x2436,0x2437,
-	0x2438,0x2439,0x243A,0x243B,0x243C,0x243D,0x243E,0x243F,
-	0x2440,0x2441,0x2442,0x2443,0x2444,0x2445,0x2446,0x2447,
-	0x2448,0x2449,0x244A,0x244B,0x244C,0x244D,0x244E,0x244F,
-	0x2450,0x2451,0x2452,0x2453,0x2454,0x2455,0x2456,0x2457,
-	0x2458,0x2459,0x245A,0x245B,0x245C,0x245D,0x245E,0x245F,
-	0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467,
-	0x2468,0x2469,0x246A,0x246B,0x246C,0x246D,0x246E,0x246F,
-	0x2470,0x2471,0x2472,0x2473,0x2474,0x2475,0x2476,0x2477,
-	0x2478,0x2479,0x247A,0x247B,0x247C,0x247D,0x247E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 51, Array index 0x0F00 */
-	0x2931,0x2932,0x2933,0x2934,0x2935,0x2936,0x2937,0x2938,
-	0x2939,0x293A,0x293B,0x293C,0x293D,0x293E,0x293F,0x2940,
-	0x2941,0x2942,0x2943,0x2944,0x2945,0x2946,0x2947,0x2948,
-	0x2949,0x294A,0x294B,0x294C,0x225F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2831,0x2832,0x2833,0x2834,0x2835,0x2836,0x2837,0x2838,
-	0x2839,0x283A,0x283B,0x283C,0x283D,0x283E,0x283F,0x2840,
-	0x2841,0x2842,0x2843,0x2844,0x2845,0x2846,0x2847,0x2848,
-	0x2849,0x284A,0x284B,0x284C,INVALC,INVALC,INVALC,0x225E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 52, Array index 0x1000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x2749,0x274A,0x274B,0x274C,0x274D,INVALC,INVALC,INVALC,
-	0x273A,0x273B,0x275C,0x275D,0x275E,0x2736,0x2737,0x2738,
-	0x2754,0x2755,0x2756,0x2757,0x2758,0x2721,0x2722,0x2723,
-	0x2725,0x272B,0x272C,0x272D,0x272E,0x272F,0x2730,0x2731,
-	0x2732,0x2733,0x2734,0x2727,0x2728,0x2729,0x272A,0x273D,
-	0x273E,0x2765,0x2766,0x2767,0x2768,0x2761,0x2762,0x2763,
-	0x273F,0x2740,0x2741,0x2742,0x2743,0x2744,0x2745,0x2746,
-	0x2747,0x2748,0x274E,0x274F,0x2750,0x2751,0x2752,0x2753,
-	0x275A,0x275B,0x2263,0x276C,0x2726,0x2760,0x276F,0x2261,
-	0x273C,0x276D,0x2735,INVALC,INVALC,INVALC,INVALC,0x2739,
-	0x276A,INVALC,INVALC,0x276B,INVALC,INVALC,0x275F,INVALC,
-	0x2264,INVALC,INVALC,0x2764,0x276E,0x2769,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 79, Array index 0x1100 */
-	0x6C69,0x6F4B,INVALC,0x7652,INVALC,INVALC,INVALC,0x5832,
-	0x6D5B,0x5F32,0x5F3E,0x793B,INVALC,0x5C74,INVALC,INVALC,
-	INVALC,0x7564,INVALC,INVALC,0x7326,0x5D60,0x6126,INVALC,
-	0x4E78,0x5C30,INVALC,INVALC,INVALC,INVALC,0x632A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7169,INVALC,INVALC,
-	INVALC,INVALC,0x4D7A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7C2F,0x5321,INVALC,0x712B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6751,0x522C,INVALC,0x4E79,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x717D,INVALC,0x5E3F,0x7B3A,0x7939,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E52,INVALC,
-	0x632B,0x6B60,INVALC,INVALC,INVALC,0x4E7A,0x4B77,0x6525,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A61,INVALC,0x544C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6A61,INVALC,INVALC,0x5C63,0x5F2D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B6B,INVALC,
-	INVALC,INVALC,0x552F,INVALC,INVALC,INVALC,0x5675,INVALC,
-	0x6578,INVALC,INVALC,0x5E40,0x6C23,INVALC,0x694D,INVALC,
-	0x6A27,0x6976,0x7B3B,INVALC,0x6769,0x6F4C,INVALC,INVALC,
-	0x5066,INVALC,INVALC,0x5E41,INVALC,INVALC,0x642C,INVALC,
-	INVALC,0x584C,0x7971,INVALC,0x4E5F,0x7A24,0x6632,INVALC,
-	0x7A7B,INVALC,INVALC,0x7A3D,0x4C48,0x6F4D,0x5555,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5322,INVALC,
-	INVALC,INVALC,0x6C51,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6427,0x6C52,INVALC,INVALC,0x7631,INVALC,INVALC,0x4E7B,
-	INVALC,INVALC,0x5051,0x4B3F,INVALC,0x6D24,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6D28,0x5E42,0x7662,0x6D5C,
-	0x5C75,0x6039,INVALC,INVALC,INVALC,0x544E,INVALC,0x7435,
-	INVALC,INVALC,INVALC,0x535B,0x5635,0x6C24,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6466,INVALC,0x716A,INVALC,INVALC,INVALC,0x4B6C,0x4B40,
-	INVALC,INVALC,INVALC,0x6C72,INVALC,INVALC,INVALC,INVALC,
-	/* Block 80, Array index 0x1200 */
-	INVALC,0x506A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7972,0x6C25,0x505F,INVALC,0x676A,0x506B,0x5C51,
-	0x5B69,0x7D4C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B57,
-	INVALC,INVALC,INVALC,INVALC,0x5A61,INVALC,0x5636,INVALC,
-	0x635F,INVALC,0x5E43,INVALC,0x5E44,0x4A21,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6E6C,INVALC,INVALC,0x5323,0x6E37,
-	0x784F,INVALC,INVALC,INVALC,INVALC,0x6A48,0x6E38,0x712C,
-	0x7125,0x694E,INVALC,INVALC,INVALC,0x793C,INVALC,INVALC,
-	INVALC,0x6579,0x6C6A,0x5D56,0x6D42,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7825,INVALC,INVALC,INVALC,INVALC,INVALC,0x653A,
-	0x5B58,INVALC,INVALC,0x4A22,INVALC,INVALC,0x514D,INVALC,
-	INVALC,INVALC,0x6E6D,INVALC,INVALC,INVALC,0x6C6B,0x5E45,
-	INVALC,0x6360,INVALC,0x4A49,0x7269,INVALC,0x554E,INVALC,
-	0x7636,INVALC,0x4E42,0x5647,INVALC,0x6334,INVALC,0x712D,
-	INVALC,0x6A62,INVALC,INVALC,INVALC,INVALC,0x5742,INVALC,
-	0x7327,INVALC,INVALC,0x4D6A,INVALC,0x6B6E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5932,0x7D25,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7655,0x5562,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7835,
-	INVALC,INVALC,0x4C75,0x7535,0x642D,INVALC,INVALC,INVALC,
-	INVALC,0x676B,0x7155,INVALC,INVALC,INVALC,0x703B,INVALC,
-	INVALC,0x6935,INVALC,0x4C49,0x7A55,INVALC,INVALC,0x6154,
-	INVALC,INVALC,0x5756,INVALC,INVALC,0x5C41,INVALC,0x5E46,
-	0x7A6F,0x6361,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6173,0x5C76,
-	INVALC,0x4E7C,INVALC,0x5B44,INVALC,0x7871,INVALC,INVALC,
-	0x5C64,INVALC,0x656F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 81, Array index 0x1300 */
-	INVALC,INVALC,0x5C31,INVALC,INVALC,INVALC,0x5556,INVALC,
-	INVALC,0x735A,INVALC,0x4B41,INVALC,0x5B43,INVALC,INVALC,
-	INVALC,0x597A,0x536E,INVALC,INVALC,INVALC,0x7A38,INVALC,
-	INVALC,0x7D26,0x6B6F,INVALC,0x7426,INVALC,0x4C4A,0x7328,
-	INVALC,0x735B,INVALC,0x5B27,0x7637,INVALC,0x4F66,0x7072,
-	0x4B5A,INVALC,0x6752,0x5743,0x7670,0x685E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6526,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6567,INVALC,INVALC,INVALC,0x4A23,
-	0x4C27,0x6A49,INVALC,INVALC,INVALC,INVALC,INVALC,0x7836,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7A25,INVALC,INVALC,
-	INVALC,INVALC,0x712E,INVALC,0x6F4E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B6D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7630,0x6F4F,0x694F,INVALC,
-	0x775E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4E53,INVALC,INVALC,INVALC,INVALC,0x5C77,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5B28,INVALC,INVALC,
-	INVALC,0x4B78,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F21,0x5D61,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x754A,0x6936,INVALC,INVALC,
-	INVALC,INVALC,0x676C,0x6E6E,INVALC,0x7370,INVALC,0x5F3F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C4B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5041,INVALC,INVALC,
-	INVALC,0x7452,0x603A,INVALC,INVALC,INVALC,INVALC,0x5F40,
-	INVALC,0x4E60,INVALC,INVALC,INVALC,0x5C52,0x7D6A,INVALC,
-	INVALC,INVALC,0x5676,INVALC,INVALC,INVALC,0x6A4A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6869,INVALC,0x632C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7350,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A24,INVALC,0x5B78,INVALC,INVALC,INVALC,0x5E47,
-	/* Block 82, Array index 0x1400 */
-	0x6B70,0x7156,INVALC,INVALC,0x6562,INVALC,0x4C4C,INVALC,
-	INVALC,0x4B7B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6A63,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F41,
-	INVALC,0x566D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6950,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6E39,INVALC,INVALC,INVALC,INVALC,0x5563,
-	INVALC,INVALC,0x5153,INVALC,0x6570,INVALC,INVALC,INVALC,
-	0x6834,0x6B43,INVALC,0x6A2A,0x7A7C,0x7576,0x703C,0x7D54,
-	0x603B,0x4E43,INVALC,0x503A,0x773A,0x5873,0x774D,INVALC,
-	INVALC,INVALC,0x642E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x545F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5067,INVALC,INVALC,0x6C7D,INVALC,0x522E,
-	0x6E6F,0x5557,0x6A64,0x7822,0x4D6B,0x573F,0x7B31,INVALC,
-	INVALC,0x4D6C,INVALC,INVALC,INVALC,0x5C32,0x506C,0x4E7D,
-	0x6E70,INVALC,INVALC,INVALC,0x4C42,INVALC,INVALC,INVALC,
-	0x506D,INVALC,INVALC,INVALC,INVALC,INVALC,0x6577,INVALC,
-	INVALC,INVALC,0x737C,INVALC,INVALC,0x6E22,INVALC,INVALC,
-	INVALC,INVALC,0x5933,INVALC,INVALC,0x5874,INVALC,0x6937,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4E2E,INVALC,INVALC,INVALC,INVALC,0x5922,INVALC,INVALC,
-	INVALC,INVALC,0x5871,INVALC,0x544F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6527,0x5552,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5629,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7422,INVALC,0x7157,INVALC,
-	INVALC,0x5558,INVALC,0x703D,0x5750,0x5450,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x574F,0x6B6A,0x7D6B,INVALC,
-	INVALC,0x5B6D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7C45,0x4B42,INVALC,INVALC,INVALC,INVALC,0x7D55,INVALC,
-	0x7448,0x686A,0x7573,INVALC,INVALC,0x795E,INVALC,INVALC,
-	/* Block 83, Array index 0x1500 */
-	0x536F,INVALC,INVALC,0x6C53,INVALC,INVALC,0x5D42,0x6F37,
-	0x6754,INVALC,0x4A4A,INVALC,INVALC,INVALC,0x597B,INVALC,
-	INVALC,0x7A7D,INVALC,INVALC,INVALC,INVALC,INVALC,0x562A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7478,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7777,0x5C2C,INVALC,INVALC,
-	INVALC,0x5757,0x5F22,INVALC,INVALC,INVALC,0x4E3E,INVALC,
-	0x5370,INVALC,INVALC,INVALC,INVALC,INVALC,0x7024,0x616C,
-	0x4F67,0x734B,0x6D29,0x4A3E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x746F,INVALC,INVALC,INVALC,0x764E,
-	INVALC,INVALC,0x5E7B,0x503B,0x5537,0x6E71,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7428,INVALC,0x5C78,INVALC,
-	INVALC,INVALC,INVALC,0x4B27,INVALC,0x5A4E,INVALC,INVALC,
-	INVALC,0x6066,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6D25,0x6E72,INVALC,INVALC,INVALC,INVALC,0x5C79,
-	INVALC,INVALC,0x795C,INVALC,INVALC,0x735C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7872,INVALC,0x7479,
-	INVALC,INVALC,INVALC,0x7C71,INVALC,INVALC,INVALC,0x503C,
-	0x5B79,0x5731,INVALC,INVALC,INVALC,0x4B7C,INVALC,INVALC,
-	INVALC,0x7025,0x4B7D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5574,INVALC,INVALC,INVALC,0x4D6D,
-	0x4A25,INVALC,INVALC,0x562B,0x5042,INVALC,INVALC,INVALC,
-	INVALC,0x703E,0x523D,0x4C24,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7A36,INVALC,
-	INVALC,0x4C4D,INVALC,0x5A7A,INVALC,0x764F,INVALC,0x6938,
-	INVALC,0x5875,INVALC,INVALC,INVALC,0x4C4E,INVALC,INVALC,
-	INVALC,INVALC,0x574D,INVALC,INVALC,0x5451,0x696D,INVALC,
-	0x4A6B,0x5962,INVALC,0x7D32,INVALC,0x632D,0x564C,0x5934,
-	INVALC,INVALC,0x6127,0x6E53,0x5043,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7D33,INVALC,0x5564,INVALC,INVALC,
-	0x4F68,INVALC,0x6D43,0x5032,INVALC,INVALC,0x4E7E,0x5A28,
-	/* Block 84, Array index 0x1600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7850,INVALC,INVALC,
-	0x7D56,INVALC,INVALC,INVALC,INVALC,0x7851,INVALC,0x7852,
-	0x5C53,INVALC,INVALC,INVALC,INVALC,0x5D62,0x7B79,0x5D41,
-	INVALC,0x6335,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6D5D,0x4E44,INVALC,0x4B21,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D63,INVALC,INVALC,INVALC,INVALC,0x7C5D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x792F,INVALC,INVALC,INVALC,INVALC,INVALC,0x527B,
-	0x4F21,0x6428,INVALC,0x7436,0x6C7E,INVALC,INVALC,0x632E,
-	0x676D,0x7D41,0x5A62,INVALC,INVALC,0x5833,INVALC,INVALC,
-	INVALC,0x5D64,0x706F,0x7671,0x7A70,INVALC,INVALC,0x5175,
-	INVALC,INVALC,0x5A4F,INVALC,0x5C54,INVALC,0x5C26,INVALC,
-	0x6F3F,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E4F,INVALC,
-	0x6059,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5956,
-	0x6C54,0x6A4B,INVALC,INVALC,0x4A3F,0x5530,INVALC,0x4F69,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x716D,INVALC,0x4C4F,
-	INVALC,INVALC,INVALC,INVALC,0x6478,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x646D,INVALC,INVALC,INVALC,INVALC,
-	0x5758,INVALC,0x7D27,INVALC,INVALC,INVALC,INVALC,0x6A2B,
-	0x7632,INVALC,INVALC,INVALC,INVALC,0x4F70,0x793D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6674,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4B5B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7351,INVALC,INVALC,INVALC,INVALC,
-	0x6951,0x7329,0x5060,0x6952,INVALC,0x5A63,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6252,INVALC,0x7622,0x6174,
-	INVALC,INVALC,INVALC,0x5A64,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6755,0x753F,0x4F22,0x4D2F,0x4F23,INVALC,INVALC,
-	INVALC,0x4D30,0x717E,0x5023,0x612F,0x7823,INVALC,0x4A26,
-	0x773B,0x726A,0x5E48,0x6953,INVALC,INVALC,INVALC,INVALC,
-	0x5E49,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 85, Array index 0x1700 */
-	INVALC,INVALC,INVALC,0x7D5E,0x4A40,INVALC,INVALC,INVALC,
-	0x796A,0x514E,0x6E54,INVALC,0x5452,0x5923,0x7D28,0x5759,
-	0x774E,0x7A3E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4F56,INVALC,0x5770,INVALC,0x6B61,
-	0x7845,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C7A,INVALC,
-	INVALC,0x5D43,INVALC,0x795F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x676F,INVALC,INVALC,INVALC,INVALC,
-	0x7D65,0x7623,INVALC,0x597C,0x7D29,INVALC,0x676E,INVALC,
-	INVALC,INVALC,0x5565,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F50,INVALC,0x4D31,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7722,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7132,INVALC,0x7131,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D32,INVALC,0x5A2B,INVALC,0x4A27,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6362,0x7B3C,0x5924,INVALC,INVALC,
-	0x6E3A,INVALC,INVALC,INVALC,INVALC,INVALC,0x7853,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7B7A,INVALC,0x4F24,INVALC,
-	0x5C7B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7663,INVALC,INVALC,INVALC,
-	0x6D2A,INVALC,INVALC,0x7221,0x4E61,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7A26,INVALC,INVALC,INVALC,INVALC,
-	0x7960,INVALC,INVALC,INVALC,INVALC,0x6C56,INVALC,INVALC,
-	0x646E,0x7921,INVALC,INVALC,0x7B6F,INVALC,INVALC,INVALC,
-	0x796B,0x6E23,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A2C,INVALC,INVALC,INVALC,0x4A28,INVALC,INVALC,
-	0x747A,INVALC,INVALC,INVALC,INVALC,0x4D56,0x7C76,INVALC,
-	INVALC,INVALC,0x7449,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7854,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 86, Array index 0x1800 */
-	INVALC,INVALC,INVALC,INVALC,0x7826,INVALC,0x5E4A,0x7246,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x575A,INVALC,
-	0x5350,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5845,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A66,
-	INVALC,0x735D,INVALC,INVALC,INVALC,0x645A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7664,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7672,INVALC,0x5F42,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x597D,
-	INVALC,INVALC,INVALC,0x4C76,INVALC,INVALC,0x533A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x642F,INVALC,
-	INVALC,INVALC,INVALC,0x7961,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7026,INVALC,INVALC,INVALC,
-	0x4B53,INVALC,INVALC,INVALC,0x603C,INVALC,0x744A,0x547A,
-	INVALC,0x7D2A,0x7962,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7437,0x7D42,0x7C30,INVALC,0x7D6C,0x4A62,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7D3D,
-	INVALC,0x6A67,0x5F43,0x5152,0x4E62,INVALC,0x5324,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7D2B,INVALC,0x5F60,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7247,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6770,INVALC,0x506E,INVALC,INVALC,0x732A,
-	INVALC,INVALC,INVALC,0x5E4B,0x7638,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6175,0x7133,INVALC,
-	/* Block 87, Array index 0x1900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7723,INVALC,
-	INVALC,0x4A29,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4F25,INVALC,INVALC,0x5F44,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6130,
-	INVALC,INVALC,0x703F,INVALC,0x7624,INVALC,0x6336,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7A46,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x506F,INVALC,INVALC,0x7D6D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5D44,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7C77,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x663F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E2D,INVALC,0x7A3F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6571,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6D44,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5225,INVALC,INVALC,0x7D6E,INVALC,INVALC,
-	INVALC,0x7536,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6176,0x5E4C,INVALC,INVALC,0x7C5E,INVALC,
-	0x6C57,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4D5D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5637,0x4D33,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 88, Array index 0x1A00 */
-	INVALC,INVALC,INVALC,0x7855,0x6558,INVALC,INVALC,INVALC,
-	0x4F6A,INVALC,INVALC,0x4F50,INVALC,0x6A4C,INVALC,INVALC,
-	INVALC,INVALC,0x6A2E,0x6A2D,INVALC,INVALC,0x5371,INVALC,
-	0x5325,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x774F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6E24,INVALC,INVALC,INVALC,INVALC,0x5024,INVALC,INVALC,
-	0x7222,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5070,INVALC,INVALC,INVALC,INVALC,
-	0x7223,INVALC,0x7778,INVALC,INVALC,INVALC,INVALC,0x5033,
-	INVALC,INVALC,0x5B29,INVALC,INVALC,0x533B,0x4A6C,INVALC,
-	0x7126,0x4B55,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7767,INVALC,INVALC,0x4D5E,INVALC,0x7724,INVALC,
-	INVALC,INVALC,0x7840,INVALC,INVALC,INVALC,0x535D,INVALC,
-	0x4C50,INVALC,INVALC,INVALC,INVALC,0x4F26,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7673,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6177,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x535C,INVALC,INVALC,0x7A7E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7A27,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6B59,INVALC,0x4F27,0x6A2F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x646F,INVALC,INVALC,INVALC,0x6939,
-	0x7158,INVALC,INVALC,0x5858,INVALC,INVALC,0x6072,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6634,
-	0x5C7C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7371,INVALC,INVALC,INVALC,0x6350,INVALC,INVALC,0x727B,
-	INVALC,0x5B46,0x5071,INVALC,0x5072,INVALC,INVALC,INVALC,
-	/* Block 89, Array index 0x1B00 */
-	0x4F5C,INVALC,0x5351,INVALC,INVALC,0x4C31,0x7758,INVALC,
-	0x4B28,0x6B3C,0x643E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x745C,INVALC,
-	INVALC,0x5C42,INVALC,INVALC,0x7027,INVALC,INVALC,0x6640,
-	INVALC,INVALC,0x4A6D,INVALC,INVALC,INVALC,INVALC,0x686B,
-	0x6568,0x5C43,INVALC,INVALC,0x6D5E,0x5372,INVALC,INVALC,
-	INVALC,INVALC,0x4C77,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4E54,0x672B,INVALC,INVALC,INVALC,0x4B43,
-	INVALC,0x6131,INVALC,INVALC,0x7732,INVALC,INVALC,0x5373,
-	0x5352,INVALC,0x7540,INVALC,INVALC,INVALC,0x5F5D,INVALC,
-	INVALC,0x6E73,0x6771,INVALC,0x7D34,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7248,INVALC,INVALC,
-	INVALC,0x7352,INVALC,INVALC,0x6E74,INVALC,0x6253,INVALC,
-	INVALC,INVALC,INVALC,0x4C51,INVALC,0x5F6A,INVALC,INVALC,
-	INVALC,0x693A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5957,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x754D,INVALC,0x7172,0x7A47,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5978,0x5442,INVALC,INVALC,INVALC,INVALC,0x7665,INVALC,
-	INVALC,INVALC,INVALC,0x5D45,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6772,0x6D5F,INVALC,INVALC,0x4A4B,INVALC,
-	INVALC,0x5B7A,INVALC,INVALC,INVALC,0x6835,INVALC,0x5326,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7D35,INVALC,
-	INVALC,0x7949,INVALC,0x6462,INVALC,0x7B3D,INVALC,INVALC,
-	0x5724,0x4E45,INVALC,INVALC,INVALC,INVALC,0x4E55,0x5666,
-	INVALC,INVALC,INVALC,INVALC,0x653D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E4D,0x6C73,INVALC,INVALC,0x6D60,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6C6C,0x7B3E,0x5F6B,INVALC,0x6178,INVALC,INVALC,
-	/* Block 90, Array index 0x1C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x793E,
-	INVALC,INVALC,INVALC,INVALC,0x5073,0x602A,0x6862,INVALC,
-	INVALC,0x6254,0x527D,INVALC,0x6528,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5953,INVALC,INVALC,INVALC,INVALC,0x535E,
-	INVALC,0x7438,0x773C,0x5C7D,INVALC,0x686C,0x6467,INVALC,
-	INVALC,0x6377,INVALC,INVALC,INVALC,INVALC,INVALC,0x6C28,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7A71,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6572,INVALC,INVALC,0x5074,
-	0x522F,0x5C65,INVALC,INVALC,INVALC,INVALC,0x5025,0x7134,
-	0x7C31,0x4C78,INVALC,INVALC,0x5D46,0x7A51,INVALC,0x775F,
-	INVALC,INVALC,0x7A28,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6E75,INVALC,0x5E4E,INVALC,INVALC,INVALC,INVALC,0x6773,
-	INVALC,INVALC,0x772C,0x6B44,0x6D61,0x602B,0x5D47,INVALC,
-	INVALC,INVALC,INVALC,0x5233,0x523F,INVALC,INVALC,INVALC,
-	0x4A4C,INVALC,INVALC,INVALC,INVALC,0x7B3F,INVALC,INVALC,
-	INVALC,INVALC,0x657D,0x5D65,0x584D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6C74,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5075,INVALC,INVALC,0x686D,0x5052,
-	INVALC,0x5958,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7666,INVALC,INVALC,
-	0x5B2A,INVALC,INVALC,INVALC,0x7760,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5859,INVALC,0x7423,INVALC,INVALC,0x745D,INVALC,
-	INVALC,INVALC,INVALC,0x6F51,INVALC,INVALC,0x5935,INVALC,
-	INVALC,0x6D2B,INVALC,0x6337,INVALC,INVALC,INVALC,INVALC,
-	0x6E3B,0x4D34,INVALC,0x6073,0x6A4D,INVALC,INVALC,INVALC,
-	INVALC,0x6C75,0x686E,INVALC,0x4B29,0x712F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A4D,INVALC,
-	0x6C29,INVALC,0x726B,INVALC,0x7D6F,INVALC,0x7973,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6641,INVALC,INVALC,0x6C58,INVALC,INVALC,INVALC,0x6D2C,
-	/* Block 91, Array index 0x1D00 */
-	INVALC,0x6A4E,INVALC,0x685F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5E4F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5226,INVALC,INVALC,0x6774,0x5156,INVALC,INVALC,0x6642,
-	0x6363,INVALC,INVALC,INVALC,INVALC,0x6430,INVALC,INVALC,
-	INVALC,0x5834,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7625,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x735E,INVALC,INVALC,INVALC,
-	INVALC,0x5725,INVALC,INVALC,INVALC,INVALC,0x7768,INVALC,
-	INVALC,0x6846,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7B66,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D66,INVALC,INVALC,INVALC,0x5C7E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x585A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5A2C,0x6A30,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6338,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A2A,0x6179,INVALC,0x6A31,INVALC,INVALC,INVALC,
-	INVALC,0x726C,INVALC,INVALC,0x7A6E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6E55,INVALC,INVALC,INVALC,INVALC,0x7974,INVALC,
-	INVALC,0x526C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 92, Array index 0x1E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7B7B,INVALC,INVALC,
-	INVALC,0x7D70,INVALC,0x603D,0x4E63,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7846,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5E2E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F45,INVALC,INVALC,0x653E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6D2D,0x7A6A,INVALC,INVALC,0x4D6E,0x6D26,INVALC,0x6D2E,
-	0x706D,INVALC,0x5D21,INVALC,0x6D2F,0x7C78,INVALC,0x586B,
-	INVALC,INVALC,INVALC,0x4C79,0x4D35,INVALC,INVALC,INVALC,
-	INVALC,0x7A29,INVALC,0x615D,INVALC,INVALC,INVALC,INVALC,
-	0x6255,0x6D4F,INVALC,INVALC,INVALC,0x5D22,INVALC,INVALC,
-	0x794A,INVALC,0x6A68,INVALC,0x656D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x536B,INVALC,0x6954,
-	0x617A,0x644C,INVALC,0x6164,0x6847,INVALC,INVALC,0x4E5B,
-	INVALC,INVALC,INVALC,0x5C55,INVALC,0x7735,0x7C73,0x7073,
-	0x4E2F,0x7135,0x6F52,0x6848,0x6B71,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B54,0x603E,0x6378,0x6A69,0x7C32,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6074,INVALC,0x4F60,INVALC,
-	0x6E25,INVALC,INVALC,0x7A2A,0x6643,0x6132,0x4A2B,INVALC,
-	0x6364,0x693B,INVALC,INVALC,INVALC,INVALC,INVALC,0x6256,
-	0x7372,INVALC,0x6E56,0x6A32,0x5076,0x6C59,0x5A4B,0x4F28,
-	INVALC,INVALC,INVALC,INVALC,0x5D23,INVALC,INVALC,INVALC,
-	0x585B,INVALC,0x794E,0x6955,0x6351,INVALC,INVALC,0x523C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x582C,0x734C,
-	INVALC,0x4D7B,0x7656,INVALC,0x6775,0x686F,0x6379,0x523B,
-	0x7373,0x637B,INVALC,0x5E50,0x4E30,INVALC,0x5677,0x7159,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7541,0x5C44,INVALC,
-	0x753B,INVALC,0x5E51,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 93, Array index 0x1F00 */
-	INVALC,0x5C66,INVALC,INVALC,0x5E52,INVALC,INVALC,0x6D62,
-	0x6E76,0x6A4F,0x706E,0x637C,INVALC,0x535F,0x5374,0x6133,
-	INVALC,0x6134,INVALC,INVALC,INVALC,INVALC,0x7453,INVALC,
-	INVALC,0x5F46,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6956,INVALC,INVALC,INVALC,
-	0x5B2B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7626,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6339,0x6B45,0x7429,0x4D36,0x5279,INVALC,0x5A2D,0x5263,
-	0x4F51,INVALC,INVALC,INVALC,INVALC,0x4B5C,0x4C7A,INVALC,
-	0x4F5D,INVALC,INVALC,0x6829,INVALC,0x633B,0x633A,INVALC,
-	INVALC,0x605A,INVALC,INVALC,INVALC,0x6E77,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C33,INVALC,INVALC,INVALC,INVALC,
-	0x5375,INVALC,0x5726,INVALC,0x7635,0x575B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6155,INVALC,INVALC,0x546A,
-	INVALC,0x5F23,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7D5F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5077,0x6D54,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4B2A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x645B,INVALC,0x617B,0x4B22,INVALC,INVALC,INVALC,
-	INVALC,0x5360,INVALC,0x643F,INVALC,0x7B40,INVALC,0x5A3E,
-	0x644D,INVALC,0x5639,INVALC,INVALC,INVALC,0x6F40,INVALC,
-	0x617C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7639,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F47,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6431,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C67,
-	0x5C68,INVALC,INVALC,INVALC,0x7A56,INVALC,0x5376,INVALC,
-	INVALC,INVALC,INVALC,0x715A,INVALC,0x7A72,INVALC,INVALC,
-	/* Block 94, Array index 0x2000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x627D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x554F,0x5078,INVALC,
-	INVALC,0x4D5F,INVALC,INVALC,0x754B,INVALC,0x6470,0x4B2B,
-	INVALC,0x5744,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x627E,
-	INVALC,0x5D5A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5A2E,0x4A6E,INVALC,INVALC,INVALC,
-	0x5539,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6321,INVALC,INVALC,0x6863,INVALC,INVALC,0x732B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F29,
-	INVALC,INVALC,INVALC,0x5377,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5471,INVALC,INVALC,
-	0x4E64,INVALC,0x6872,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6575,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x672E,INVALC,0x563A,INVALC,0x5F6C,0x6440,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6864,INVALC,INVALC,
-	INVALC,INVALC,0x5835,INVALC,INVALC,INVALC,0x645C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7439,0x7136,INVALC,
-	INVALC,0x625E,0x6135,INVALC,INVALC,0x4D6F,0x7127,0x4E65,
-	0x4B5D,INVALC,INVALC,0x5963,INVALC,INVALC,0x732C,INVALC,
-	INVALC,0x5079,0x6C2B,0x5E53,0x7769,INVALC,INVALC,0x7975,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x615E,0x4B6E,INVALC,
-	/* Block 95, Array index 0x2100 */
-	INVALC,INVALC,0x633C,0x7856,INVALC,INVALC,0x5B6E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7D71,INVALC,INVALC,INVALC,
-	INVALC,0x7736,INVALC,INVALC,INVALC,INVALC,0x745E,INVALC,
-	INVALC,0x726D,INVALC,0x5B59,INVALC,0x7028,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x617D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E54,INVALC,0x602C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6D63,INVALC,INVALC,0x5361,INVALC,
-	0x5F48,INVALC,INVALC,INVALC,INVALC,0x5936,INVALC,0x7D2C,
-	0x6F53,INVALC,INVALC,INVALC,0x6441,0x786B,INVALC,0x5B2C,
-	INVALC,INVALC,INVALC,INVALC,0x7C46,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x582D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x763A,
-	INVALC,0x5B5F,0x5353,0x7847,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4A4E,0x7841,0x5234,INVALC,INVALC,0x5C34,
-	0x7A39,0x4A4F,INVALC,0x7C33,0x6A6A,0x6A6B,0x507A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6D64,INVALC,INVALC,0x5D67,
-	INVALC,INVALC,0x5F49,INVALC,INVALC,INVALC,INVALC,0x5F6D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6E3C,INVALC,0x6F41,
-	INVALC,INVALC,0x4C52,INVALC,0x5D24,INVALC,INVALC,INVALC,
-	0x5F4A,INVALC,INVALC,INVALC,INVALC,INVALC,0x5378,0x7128,
-	INVALC,INVALC,INVALC,0x4D37,INVALC,0x6F54,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x645D,0x5F6E,0x4B2C,
-	0x693C,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A6C,INVALC,
-	INVALC,INVALC,0x5F4B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x793F,0x562F,0x5546,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F2A,INVALC,INVALC,0x4E29,INVALC,INVALC,0x5678,INVALC,
-	INVALC,INVALC,0x7137,0x6E78,INVALC,INVALC,INVALC,0x5959,
-	0x735F,INVALC,0x7848,0x4E46,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5566,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7466,INVALC,INVALC,0x6645,0x6F55,
-	INVALC,INVALC,0x4B6F,0x7C5F,INVALC,INVALC,INVALC,INVALC,
-	/* Block 96, Array index 0x2200 */
-	INVALC,0x5C27,INVALC,INVALC,0x5667,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7849,INVALC,INVALC,INVALC,INVALC,0x6352,
-	INVALC,0x633D,INVALC,0x4F61,0x7040,0x6C5A,INVALC,0x5D57,
-	0x7B70,INVALC,INVALC,0x6C2C,INVALC,INVALC,INVALC,0x7029,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7A57,0x7B41,
-	INVALC,0x5240,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6530,INVALC,INVALC,INVALC,0x6D65,INVALC,INVALC,
-	INVALC,INVALC,0x4B2D,INVALC,0x7930,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7725,INVALC,0x4B2E,INVALC,0x5A2F,INVALC,0x5836,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5327,0x7B32,
-	INVALC,0x7D44,INVALC,0x6C2D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7B21,INVALC,INVALC,INVALC,0x6569,0x696E,
-	INVALC,0x7374,0x7873,0x7041,0x5E2F,0x7830,INVALC,INVALC,
-	0x7360,0x672F,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B2D,
-	INVALC,0x6635,INVALC,INVALC,0x7928,INVALC,INVALC,0x5D58,
-	0x6859,0x6F56,INVALC,INVALC,INVALC,0x5362,INVALC,0x625F,
-	INVALC,INVALC,0x7C60,0x5748,0x7D2D,INVALC,INVALC,INVALC,
-	0x5F6F,0x4C53,0x5379,INVALC,INVALC,INVALC,INVALC,0x5470,
-	0x5B47,0x5E55,INVALC,INVALC,INVALC,INVALC,0x7074,INVALC,
-	0x5550,0x6559,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7C47,0x5C56,0x6260,INVALC,INVALC,INVALC,0x5A30,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7323,INVALC,0x536C,
-	INVALC,0x744B,INVALC,INVALC,INVALC,0x7D45,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x637D,INVALC,0x7931,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x507B,0x6C5B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x753C,0x7224,
-	0x584E,0x584F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7577,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7661,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5237,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7B6C,INVALC,0x5D48,
-	/* Block 97, Array index 0x2300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6468,
-	INVALC,INVALC,0x5241,INVALC,INVALC,INVALC,0x7857,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x563B,0x5E56,INVALC,INVALC,
-	0x773D,0x6C2E,INVALC,INVALC,INVALC,0x5061,INVALC,0x6075,
-	0x6A33,INVALC,0x4E56,INVALC,INVALC,INVALC,INVALC,0x4C25,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6C76,0x6261,0x633E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7C48,INVALC,INVALC,
-	0x4D70,INVALC,0x7976,INVALC,INVALC,0x5F70,INVALC,INVALC,
-	INVALC,0x653F,INVALC,INVALC,INVALC,0x4E3F,INVALC,INVALC,
-	INVALC,INVALC,0x7C61,0x6D30,0x7D51,0x763B,INVALC,INVALC,
-	0x794F,0x6B5A,0x4A41,INVALC,0x5238,0x4D71,INVALC,0x6353,
-	0x7D66,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x666D,INVALC,INVALC,
-	INVALC,0x637A,INVALC,INVALC,0x702A,0x7950,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7C62,INVALC,0x7827,INVALC,
-	INVALC,INVALC,0x6165,0x6E79,INVALC,INVALC,INVALC,0x6776,
-	0x6A6D,INVALC,INVALC,0x7C34,0x7542,INVALC,INVALC,0x575C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7075,INVALC,0x5D68,0x536D,0x757C,INVALC,0x5A3F,INVALC,
-	0x4C7B,INVALC,INVALC,INVALC,0x537A,0x7424,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6F57,INVALC,0x5443,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7B63,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7B6D,INVALC,0x602D,INVALC,INVALC,0x6A6E,
-	0x7B33,0x6442,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7667,0x525D,INVALC,0x5F4C,INVALC,INVALC,0x7C49,INVALC,
-	INVALC,0x6529,0x6076,0x7633,INVALC,INVALC,INVALC,INVALC,
-	/* Block 98, Array index 0x2400 */
-	INVALC,0x617E,INVALC,INVALC,INVALC,INVALC,0x4B70,INVALC,
-	0x6A6F,0x6A70,INVALC,INVALC,INVALC,0x5A40,0x7834,0x6B72,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6443,INVALC,INVALC,
-	INVALC,INVALC,0x6957,0x6471,INVALC,INVALC,INVALC,0x4A6F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E57,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7C4A,INVALC,INVALC,INVALC,0x7361,INVALC,INVALC,0x4B44,
-	INVALC,INVALC,INVALC,INVALC,0x6365,INVALC,0x4B45,0x6A34,
-	INVALC,INVALC,0x693D,INVALC,0x5749,INVALC,INVALC,0x6B5B,
-	0x6D31,INVALC,0x4C43,0x773E,0x7C4B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7874,INVALC,0x5937,INVALC,INVALC,
-	0x7353,0x7354,INVALC,INVALC,INVALC,0x7764,INVALC,0x7751,
-	INVALC,INVALC,0x5837,0x4E31,0x4A42,INVALC,INVALC,0x7B34,
-	0x4B46,INVALC,INVALC,0x7076,INVALC,INVALC,0x5567,INVALC,
-	0x6A50,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C54,0x4B2F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x742A,0x692F,INVALC,
-	INVALC,0x7543,0x6958,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D69,INVALC,INVALC,INVALC,0x7173,INVALC,
-	0x557B,0x5E3B,INVALC,INVALC,0x747B,INVALC,INVALC,INVALC,
-	0x7D73,0x7D72,0x7726,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5D49,INVALC,INVALC,0x5453,
-	INVALC,0x4C28,INVALC,0x5A41,0x4C55,INVALC,0x5964,INVALC,
-	INVALC,INVALC,0x7A4A,INVALC,INVALC,INVALC,0x6563,INVALC,
-	INVALC,INVALC,0x533C,INVALC,INVALC,INVALC,0x4A70,INVALC,
-	INVALC,INVALC,INVALC,0x5044,INVALC,INVALC,INVALC,0x4A50,
-	0x7A2B,0x6B6B,0x6778,0x5965,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5157,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7324,INVALC,INVALC,INVALC,0x547B,0x7C63,
-	0x7A58,INVALC,0x7355,INVALC,0x4F2B,INVALC,INVALC,0x6B73,
-	/* Block 99, Array index 0x2500 */
-	0x557C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5354,
-	0x4D7C,INVALC,0x5966,INVALC,0x6279,0x6221,0x6B54,INVALC,
-	0x6077,0x6432,0x4C7C,INVALC,INVALC,INVALC,0x7B64,INVALC,
-	INVALC,INVALC,0x742B,INVALC,INVALC,INVALC,INVALC,0x503D,
-	INVALC,0x4A71,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6F38,INVALC,INVALC,INVALC,0x5740,INVALC,
-	0x6E7A,0x7D74,INVALC,INVALC,0x5363,INVALC,0x7B42,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5568,0x5B2E,
-	0x6136,0x7837,INVALC,INVALC,INVALC,INVALC,INVALC,0x603F,
-	0x7B43,0x5D6A,INVALC,0x6222,INVALC,0x6E26,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7668,INVALC,INVALC,INVALC,INVALC,
-	0x7675,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D4A,INVALC,
-	INVALC,0x5062,INVALC,INVALC,INVALC,INVALC,0x5D26,INVALC,
-	INVALC,0x5D6B,INVALC,INVALC,0x6479,INVALC,INVALC,0x632F,
-	0x507C,INVALC,INVALC,INVALC,0x747C,INVALC,INVALC,INVALC,
-	INVALC,0x4C3C,0x776A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6564,0x5F71,INVALC,INVALC,0x7761,INVALC,0x7977,
-	0x6F39,INVALC,INVALC,0x7858,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7929,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7859,INVALC,INVALC,INVALC,0x6E3D,INVALC,INVALC,
-	INVALC,0x5846,INVALC,INVALC,0x6463,0x754E,INVALC,INVALC,
-	INVALC,INVALC,0x5D59,INVALC,INVALC,INVALC,INVALC,0x5967,
-	0x5239,0x5543,INVALC,INVALC,0x5A65,0x5A50,INVALC,0x5159,
-	0x4E58,INVALC,0x4B5E,0x742C,0x5A7B,INVALC,0x7669,0x6873,
-	0x4F2C,0x7070,INVALC,0x747D,0x5B48,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4E40,0x6354,0x514F,0x7175,
-	INVALC,0x4D72,INVALC,0x4F6B,INVALC,INVALC,INVALC,0x4D38,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6326,0x515A,
-	/* Block 100, Array index 0x2600 */
-	INVALC,0x7225,INVALC,INVALC,INVALC,INVALC,INVALC,0x7226,
-	INVALC,0x644E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x537B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7129,INVALC,INVALC,INVALC,0x7249,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6F58,0x6649,INVALC,0x5838,0x7A73,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7335,INVALC,INVALC,0x7824,INVALC,INVALC,0x5173,
-	0x6648,INVALC,INVALC,INVALC,INVALC,0x785A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C69,
-	0x5E57,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B5F,INVALC,
-	INVALC,INVALC,0x4F6C,INVALC,INVALC,INVALC,INVALC,0x745F,
-	INVALC,INVALC,0x5174,0x523A,INVALC,INVALC,INVALC,0x5F72,
-	INVALC,INVALC,INVALC,0x6137,INVALC,INVALC,INVALC,INVALC,
-	0x6223,0x537C,INVALC,INVALC,0x6D66,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5B49,INVALC,INVALC,INVALC,0x647A,INVALC,
-	0x4F5E,INVALC,INVALC,0x4E50,INVALC,INVALC,INVALC,INVALC,
-	0x5553,0x7375,0x772E,INVALC,INVALC,0x6F48,INVALC,0x4D73,
-	0x754F,0x6573,0x7042,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A51,INVALC,INVALC,INVALC,0x6A71,INVALC,0x5026,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x595A,
-	0x702B,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B67,INVALC,
-	INVALC,INVALC,0x6540,0x7C35,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6444,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4C29,0x7D46,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6A35,INVALC,0x652A,0x5F3A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 101, Array index 0x2700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x615F,INVALC,0x5A51,
-	INVALC,INVALC,INVALC,INVALC,0x6138,INVALC,0x6874,0x537D,
-	INVALC,INVALC,INVALC,INVALC,0x6224,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x724A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5A66,0x7733,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7D4D,INVALC,INVALC,INVALC,0x7336,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6E57,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7544,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5824,INVALC,INVALC,INVALC,INVALC,INVALC,0x7227,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5938,0x5939,0x6F49,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x564E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x774B,0x5F2E,0x6875,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5235,INVALC,INVALC,INVALC,0x5355,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x744C,0x5A7C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5968,INVALC,0x776B,0x7549,INVALC,
-	0x733C,INVALC,0x5A52,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5335,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6836,INVALC,INVALC,0x564F,0x743A,INVALC,0x7749,
-	INVALC,INVALC,0x4C2A,INVALC,INVALC,0x7043,0x4C56,INVALC,
-	INVALC,INVALC,0x5053,INVALC,0x533D,INVALC,INVALC,INVALC,
-	0x5B7B,INVALC,0x4B60,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5364,0x7677,INVALC,INVALC,0x553A,0x734D,0x4B61,
-	INVALC,INVALC,INVALC,INVALC,0x6B74,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x742D,INVALC,0x7C2A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x776C,INVALC,INVALC,INVALC,0x6876,INVALC,
-	/* Block 102, Array index 0x2800 */
-	0x5A67,INVALC,INVALC,INVALC,0x774C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6541,INVALC,INVALC,INVALC,INVALC,0x606E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x557D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4E66,0x7C2B,0x553B,INVALC,INVALC,0x7228,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6225,0x4D39,
-	0x6A72,0x4B47,INVALC,0x4D74,INVALC,INVALC,0x5B2F,0x6F59,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4D3A,INVALC,INVALC,
-	0x7C79,INVALC,INVALC,INVALC,INVALC,0x5F73,0x4E67,0x5A42,
-	INVALC,0x4F2D,INVALC,INVALC,INVALC,INVALC,0x6779,0x7828,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7362,INVALC,
-	INVALC,INVALC,0x4A72,0x5F24,INVALC,INVALC,0x5444,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4C57,0x6542,INVALC,INVALC,
-	INVALC,INVALC,0x4D3B,INVALC,0x6F5A,0x6E58,INVALC,0x5D27,
-	0x6226,INVALC,INVALC,INVALC,INVALC,INVALC,0x6040,INVALC,
-	INVALC,INVALC,0x5630,0x784A,INVALC,0x7C7A,INVALC,0x597E,
-	INVALC,INVALC,INVALC,INVALC,0x5E30,INVALC,INVALC,INVALC,
-	0x5D6C,0x5A68,INVALC,INVALC,INVALC,INVALC,INVALC,0x5460,
-	INVALC,0x5679,INVALC,0x4D57,0x5E58,INVALC,INVALC,0x7278,
-	INVALC,0x6456,INVALC,INVALC,0x5045,0x742E,INVALC,0x5D28,
-	INVALC,INVALC,INVALC,0x6D45,0x7356,INVALC,INVALC,0x5E59,
-	0x6366,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5328,
-	INVALC,0x5B30,INVALC,INVALC,0x655A,0x633F,INVALC,INVALC,
-	INVALC,0x5B31,INVALC,INVALC,INVALC,0x5569,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6041,0x6F5B,INVALC,INVALC,0x7069,
-	INVALC,INVALC,0x5732,INVALC,INVALC,INVALC,INVALC,0x507D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5969,INVALC,INVALC,0x507E,INVALC,0x6C6D,0x5329,INVALC,
-	0x7229,0x7044,INVALC,INVALC,0x6262,0x696F,INVALC,INVALC,
-	INVALC,0x7951,INVALC,INVALC,0x6959,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x685A,0x5A43,0x5A44,0x5445,INVALC,0x677A,
-	/* Block 103, Array index 0x2900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D60,0x6330,
-	INVALC,0x5B32,0x7B44,INVALC,0x7363,INVALC,0x5925,0x7B67,
-	0x5D4B,0x5054,INVALC,0x6636,0x602E,0x7D5A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C35,0x6078,
-	0x6731,INVALC,INVALC,INVALC,INVALC,0x7570,INVALC,0x585C,
-	0x6D46,INVALC,INVALC,INVALC,INVALC,0x6139,INVALC,0x6340,
-	0x7940,0x6970,INVALC,INVALC,0x595B,INVALC,0x7364,INVALC,
-	INVALC,INVALC,0x5C36,0x6469,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7045,0x6341,0x7C4C,0x7C4D,INVALC,INVALC,INVALC,
-	INVALC,0x724B,INVALC,0x724C,INVALC,INVALC,INVALC,0x644F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x715B,INVALC,0x7A59,INVALC,0x7138,0x7D75,0x6079,
-	INVALC,INVALC,INVALC,INVALC,0x677B,0x7C37,0x7C64,0x7B45,
-	0x6367,0x5839,INVALC,0x7678,INVALC,INVALC,0x5C45,0x4C58,
-	INVALC,INVALC,INVALC,0x602F,0x7467,INVALC,0x6F5C,0x4F7C,
-	0x6F5D,INVALC,0x722A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7D3E,INVALC,INVALC,0x4A2C,
-	0x7D3B,0x7D47,INVALC,INVALC,INVALC,INVALC,0x6732,INVALC,
-	0x6A51,0x5F74,INVALC,INVALC,INVALC,INVALC,0x516C,0x645E,
-	0x6543,INVALC,INVALC,INVALC,INVALC,0x5926,INVALC,INVALC,
-	0x4D3C,INVALC,0x7365,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6D55,INVALC,INVALC,0x593A,INVALC,
-	INVALC,INVALC,0x6D67,0x7B35,0x786C,INVALC,INVALC,INVALC,
-	INVALC,0x6067,INVALC,0x4C59,INVALC,INVALC,0x5446,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6725,INVALC,0x5575,0x533E,
-	INVALC,0x7C7B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6472,INVALC,
-	INVALC,0x5F75,INVALC,INVALC,0x6878,0x786D,INVALC,INVALC,
-	0x4E47,INVALC,INVALC,INVALC,INVALC,INVALC,0x7D76,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6858,INVALC,0x4D58,0x6756,0x4C5A,INVALC,INVALC,0x4A63,
-	0x5F76,0x7047,0x7046,INVALC,0x583A,INVALC,0x7174,0x7470,
-	/* Block 104, Array index 0x2A00 */
-	0x754C,INVALC,INVALC,0x7C65,INVALC,INVALC,INVALC,INVALC,
-	0x6A45,0x6A73,INVALC,0x5D5B,INVALC,0x5C57,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E7D,0x7279,INVALC,0x5547,
-	INVALC,INVALC,INVALC,0x5850,INVALC,0x7048,0x5121,0x5122,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5954,0x5668,
-	0x594A,INVALC,0x5A31,0x5847,0x5C62,0x734E,0x7574,INVALC,
-	INVALC,0x7139,INVALC,INVALC,0x5A53,INVALC,0x766A,INVALC,
-	INVALC,INVALC,0x4F75,INVALC,INVALC,0x7D2E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A52,INVALC,
-	INVALC,0x5F34,INVALC,INVALC,INVALC,INVALC,0x575D,0x7A3A,
-	0x6E27,0x753D,INVALC,0x7875,INVALC,INVALC,0x6D68,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5461,INVALC,0x5123,0x6156,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7978,INVALC,0x5B4A,
-	0x4B79,0x5454,INVALC,0x595C,INVALC,0x6E3E,INVALC,0x776D,
-	INVALC,INVALC,INVALC,0x526E,INVALC,INVALC,0x6166,0x7779,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D6D,
-	INVALC,0x685B,INVALC,0x5B33,INVALC,INVALC,INVALC,0x5177,
-	0x6030,INVALC,INVALC,0x5462,INVALC,0x7657,INVALC,0x5779,
-	INVALC,INVALC,0x585D,INVALC,0x4D7D,0x722B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D3D,
-	0x7842,INVALC,INVALC,0x722C,INVALC,INVALC,0x4A2D,0x4A2E,
-	0x4F2E,INVALC,INVALC,INVALC,INVALC,INVALC,0x6342,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5C37,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B5A,
-	0x593B,0x4A73,0x7653,0x6678,0x6A75,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6A76,INVALC,INVALC,0x7679,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4F2F,INVALC,INVALC,0x4A53,INVALC,INVALC,0x4A2F,
-	0x5230,0x713A,INVALC,0x5733,0x6343,0x737D,0x5E5A,INVALC,
-	INVALC,INVALC,INVALC,0x5E5B,INVALC,INVALC,0x6F5E,INVALC,
-	/* Block 105, Array index 0x2B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6263,0x6E7B,INVALC,INVALC,0x5F77,0x574A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E68,0x5B5B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x713B,INVALC,INVALC,INVALC,INVALC,0x6971,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7A37,0x5046,INVALC,INVALC,0x4C2B,0x6E28,INVALC,INVALC,
-	0x4B7A,0x7979,0x4C7D,0x537E,INVALC,INVALC,INVALC,INVALC,
-	0x6450,INVALC,INVALC,INVALC,INVALC,INVALC,0x726E,INVALC,
-	0x5455,0x5F4D,INVALC,0x7C38,0x5150,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x724D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7752,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A54,
-	INVALC,0x5559,INVALC,INVALC,INVALC,0x585E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D59,
-	INVALC,INVALC,INVALC,0x6E29,0x763C,INVALC,INVALC,0x4C5B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7049,INVALC,0x7C7C,
-	INVALC,0x6849,0x747E,INVALC,INVALC,INVALC,INVALC,0x677C,
-	0x575E,INVALC,INVALC,INVALC,INVALC,0x5E5C,INVALC,0x702C,
-	0x4C7E,0x4D61,INVALC,0x613A,INVALC,0x5B6F,0x5A32,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5125,0x5C38,INVALC,INVALC,
-	INVALC,0x5876,INVALC,0x5124,INVALC,0x4D62,INVALC,INVALC,
-	INVALC,INVALC,0x5C6A,INVALC,INVALC,0x7077,INVALC,0x704A,
-	0x503E,INVALC,0x5D5C,INVALC,INVALC,INVALC,INVALC,0x5456,
-	0x5356,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D50,
-	0x4D21,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F35,INVALC,
-	INVALC,INVALC,0x5F78,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5421,0x4E32,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 106, Array index 0x2C00 */
-	0x684A,INVALC,INVALC,INVALC,INVALC,0x6B75,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6355,0x7550,INVALC,
-	INVALC,INVALC,0x7521,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5927,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x652B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x664B,INVALC,0x7571,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6545,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7923,0x605B,0x766B,INVALC,0x4B71,
-	INVALC,0x596A,0x7522,INVALC,INVALC,INVALC,0x5751,INVALC,
-	0x5178,0x6A78,0x6A79,0x5A33,INVALC,INVALC,INVALC,INVALC,
-	0x6F5F,INVALC,INVALC,0x716F,INVALC,0x6576,0x6E3F,0x6264,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x503F,INVALC,0x7A2C,
-	0x7551,0x6733,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x693E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x724E,0x5B34,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7C4E,INVALC,0x5D6E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6734,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5734,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7734,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D3E,INVALC,0x5A69,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4F30,0x7759,0x7366,INVALC,INVALC,
-	0x4E59,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4E2A,INVALC,0x4B48,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5027,INVALC,0x704B,INVALC,0x5047,
-	/* Block 107, Array index 0x2D00 */
-	INVALC,INVALC,0x6445,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5B60,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x555A,INVALC,0x5727,INVALC,INVALC,INVALC,0x6E40,
-	INVALC,0x7876,INVALC,INVALC,INVALC,INVALC,0x7552,0x6D69,
-	INVALC,0x593C,INVALC,0x6546,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7523,INVALC,INVALC,
-	0x5A54,0x6227,0x7B7C,INVALC,INVALC,0x715C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4A74,INVALC,INVALC,INVALC,
-	0x687A,INVALC,INVALC,0x4E69,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6978,0x6265,INVALC,INVALC,INVALC,INVALC,
-	0x5039,0x5472,INVALC,INVALC,INVALC,INVALC,INVALC,0x5126,
-	INVALC,0x5F4E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7C74,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x532A,INVALC,INVALC,INVALC,0x4C2C,INVALC,INVALC,INVALC,
-	INVALC,0x6F60,INVALC,INVALC,INVALC,0x6565,0x5055,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B7C,
-	INVALC,INVALC,INVALC,INVALC,0x7C66,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4B7E,0x6D6A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E31,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7963,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5422,0x4F76,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5650,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x556A,0x716E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7A4B,INVALC,
-	INVALC,INVALC,INVALC,0x6521,INVALC,INVALC,INVALC,INVALC,
-	/* Block 108, Array index 0x2E00 */
-	INVALC,INVALC,INVALC,INVALC,0x5531,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4F6D,INVALC,0x6D6B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5532,INVALC,INVALC,INVALC,0x553C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7D62,0x732D,INVALC,0x7D5B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6930,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5127,INVALC,INVALC,0x7D63,0x4E33,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7D64,0x7A4E,
-	INVALC,INVALC,INVALC,INVALC,0x4A30,INVALC,0x7727,INVALC,
-	0x4F31,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6622,
-	INVALC,0x7C36,0x722D,0x6F61,0x732E,0x5C46,0x596B,INVALC,
-	INVALC,INVALC,0x6860,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6128,INVALC,INVALC,INVALC,INVALC,0x5576,
-	0x4F7D,INVALC,INVALC,0x5E5D,INVALC,INVALC,INVALC,0x5951,
-	INVALC,INVALC,INVALC,0x646A,0x724F,INVALC,0x773F,INVALC,
-	INVALC,0x6266,0x6228,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6356,INVALC,
-	0x6D51,INVALC,INVALC,INVALC,INVALC,INVALC,0x6979,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5631,0x5E32,
-	INVALC,INVALC,0x6068,INVALC,INVALC,0x532B,INVALC,0x6B5C,
-	INVALC,INVALC,0x5F2F,INVALC,0x4A43,INVALC,INVALC,0x6E7C,
-	INVALC,0x7D43,INVALC,INVALC,INVALC,0x6B76,0x4F32,INVALC,
-	INVALC,INVALC,INVALC,0x596C,INVALC,0x593D,INVALC,0x585F,
-	INVALC,INVALC,0x5438,0x6B3E,0x5D6F,INVALC,0x5D70,0x5D71,
-	0x5D72,INVALC,INVALC,0x593E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7B46,0x4F33,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 109, Array index 0x2F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6E7D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x642B,
-	INVALC,0x5A45,INVALC,0x586C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5128,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6229,INVALC,INVALC,0x5E3C,
-	0x6735,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B70,INVALC,
-	0x6F62,0x7170,0x4F34,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B71,INVALC,
-	0x6031,INVALC,INVALC,INVALC,INVALC,0x5F25,INVALC,0x7952,
-	INVALC,INVALC,0x677D,INVALC,INVALC,0x6623,0x7B71,0x4B30,
-	0x722E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4D67,INVALC,0x685C,INVALC,INVALC,0x6757,INVALC,INVALC,
-	0x7740,INVALC,0x5063,INVALC,INVALC,INVALC,0x5A21,INVALC,
-	INVALC,INVALC,0x4C3D,INVALC,INVALC,0x5129,0x5D4C,INVALC,
-	INVALC,0x637E,0x512A,0x682A,INVALC,0x6A36,0x797A,0x664C,
-	0x7658,INVALC,INVALC,INVALC,0x5447,INVALC,INVALC,INVALC,
-	0x594B,INVALC,0x5952,0x534B,0x5877,0x5A29,0x7578,INVALC,
-	INVALC,0x5E5E,0x722F,0x7829,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5848,INVALC,INVALC,0x6E41,INVALC,
-	INVALC,INVALC,INVALC,0x7941,INVALC,INVALC,INVALC,INVALC,
-	0x5D73,0x6A7A,INVALC,0x763D,0x613B,0x4D3F,0x7454,0x664D,
-	INVALC,0x7C4F,0x7B22,INVALC,0x605C,INVALC,INVALC,INVALC,
-	INVALC,0x743B,0x5A55,INVALC,0x7932,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7B72,INVALC,0x5B76,INVALC,0x5E5F,
-	INVALC,INVALC,INVALC,0x5B72,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x785C,0x776E,0x6B68,INVALC,0x527A,INVALC,INVALC,
-	0x713C,INVALC,INVALC,0x7A5A,INVALC,INVALC,0x5A6A,0x5A46,
-	0x7741,INVALC,INVALC,0x6736,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 110, Array index 0x3000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6547,0x562C,INVALC,INVALC,INVALC,
-	INVALC,0x5C47,INVALC,INVALC,INVALC,INVALC,INVALC,0x6129,
-	INVALC,0x622A,INVALC,0x5526,INVALC,INVALC,0x5457,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7250,INVALC,0x6A7B,
-	INVALC,0x605D,0x7B73,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x713D,INVALC,INVALC,0x6267,0x7D57,INVALC,
-	0x4E48,0x6A37,INVALC,0x7C40,INVALC,0x7D67,0x776F,INVALC,
-	INVALC,0x5735,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F3A,0x715D,INVALC,0x5E33,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x684B,INVALC,INVALC,0x785D,INVALC,
-	INVALC,0x7B47,0x5548,INVALC,0x575F,INVALC,0x5D29,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6931,INVALC,INVALC,0x7A2D,
-	0x7659,0x7A74,INVALC,INVALC,INVALC,INVALC,INVALC,0x782A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x666E,INVALC,0x4C5C,
-	0x613C,0x606F,INVALC,INVALC,0x693F,0x7C7D,0x664E,INVALC,
-	INVALC,0x6157,INVALC,0x664F,INVALC,0x7471,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6473,
-	INVALC,INVALC,0x647B,INVALC,INVALC,0x7964,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F63,INVALC,INVALC,0x4F6E,0x763E,0x6032,0x7C7E,0x512B,
-	INVALC,INVALC,INVALC,0x577A,INVALC,INVALC,INVALC,0x7B48,
-	INVALC,0x6257,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5423,0x7078,0x5728,INVALC,INVALC,INVALC,0x6167,INVALC,
-	INVALC,0x533F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F64,INVALC,0x5745,0x6B62,INVALC,INVALC,0x7C67,INVALC,
-	INVALC,0x6422,INVALC,0x6268,INVALC,0x6650,INVALC,0x7B68,
-	0x7468,0x6574,0x743C,0x7455,INVALC,INVALC,INVALC,INVALC,
-	/* Block 111, Array index 0x3100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F36,
-	INVALC,0x7C39,0x6E42,0x4A75,INVALC,INVALC,INVALC,0x6F65,
-	0x4B62,0x5424,INVALC,0x5E60,0x5A7D,0x6446,0x683E,INVALC,
-	INVALC,INVALC,INVALC,0x605E,0x7634,0x6A52,INVALC,0x797B,
-	INVALC,INVALC,0x6042,INVALC,0x4A64,INVALC,0x6737,INVALC,
-	0x6A7D,INVALC,0x595D,INVALC,0x5A34,0x6E2A,0x7B69,INVALC,
-	INVALC,INVALC,INVALC,0x5B4B,0x5A35,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x713E,INVALC,INVALC,0x532C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7B49,INVALC,
-	0x5F4F,INVALC,INVALC,0x5340,0x6357,INVALC,0x6F66,0x7C50,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6940,
-	INVALC,INVALC,INVALC,0x7553,INVALC,INVALC,0x6C5C,0x7737,
-	INVALC,INVALC,0x6A38,0x5179,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C48,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6A39,INVALC,INVALC,INVALC,INVALC,INVALC,0x715E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5736,0x4F35,INVALC,0x5928,
-	INVALC,INVALC,0x6C6E,INVALC,INVALC,0x5D2A,INVALC,INVALC,
-	INVALC,INVALC,0x4D22,0x682E,INVALC,INVALC,INVALC,0x613D,
-	INVALC,0x7251,INVALC,INVALC,INVALC,INVALC,0x6941,INVALC,
-	INVALC,INVALC,0x527C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5B35,INVALC,0x7367,0x587E,INVALC,INVALC,
-	INVALC,0x7C51,INVALC,0x6D32,0x742F,INVALC,0x7B23,INVALC,
-	INVALC,0x7C41,INVALC,0x6E2B,0x5425,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7472,
-	INVALC,INVALC,INVALC,INVALC,0x6E59,INVALC,INVALC,INVALC,
-	0x7B4A,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D63,0x583B,
-	/* Block 112, Array index 0x3200 */
-	INVALC,0x655B,0x7877,INVALC,INVALC,INVALC,0x7654,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5729,
-	INVALC,0x4B49,INVALC,INVALC,0x6651,0x704C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x582E,INVALC,0x7953,0x557E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x583C,0x7230,INVALC,INVALC,INVALC,
-	INVALC,0x622B,0x7368,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F42,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D6C,
-	INVALC,0x6738,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5A7E,INVALC,INVALC,0x4C3E,INVALC,INVALC,0x727C,
-	0x5A6B,INVALC,0x6258,0x6D56,INVALC,INVALC,0x5651,0x6033,
-	INVALC,INVALC,0x7C52,INVALC,0x6B48,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5341,0x704D,INVALC,
-	0x4F77,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6D52,INVALC,0x5458,0x5C49,0x5771,INVALC,
-	INVALC,0x5F3B,INVALC,INVALC,0x7325,INVALC,INVALC,INVALC,
-	0x744D,INVALC,INVALC,INVALC,INVALC,0x713F,0x7831,INVALC,
-	0x697A,INVALC,INVALC,INVALC,0x7B4B,INVALC,INVALC,0x4A55,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7954,0x774A,INVALC,INVALC,0x5648,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7C68,0x733D,
-	INVALC,0x6E7E,INVALC,0x677E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5342,INVALC,INVALC,INVALC,INVALC,0x5336,INVALC,
-	0x4C2D,0x767A,0x5632,0x5258,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6758,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6325,INVALC,INVALC,
-	INVALC,INVALC,0x6739,INVALC,INVALC,INVALC,INVALC,0x702D,
-	0x7B4C,0x6B21,INVALC,INVALC,0x5426,INVALC,INVALC,INVALC,
-	INVALC,0x7B4D,INVALC,0x553D,0x715F,INVALC,INVALC,0x767B,
-	INVALC,0x5E34,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x556B,INVALC,
-	/* Block 113, Array index 0x3300 */
-	INVALC,0x6548,INVALC,INVALC,INVALC,0x7B24,0x5439,INVALC,
-	INVALC,0x5E61,INVALC,0x6423,INVALC,INVALC,INVALC,0x5737,
-	INVALC,0x786E,INVALC,INVALC,INVALC,0x5E35,INVALC,INVALC,
-	0x5652,INVALC,0x7955,0x673A,0x6B55,0x5577,0x6F67,0x613E,
-	INVALC,INVALC,INVALC,0x7A2E,INVALC,INVALC,INVALC,0x5669,
-	0x566E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x673B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6C4B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5533,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4E34,INVALC,INVALC,INVALC,
-	0x7B25,0x616E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7728,INVALC,INVALC,INVALC,INVALC,0x7B4E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x583D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7B7D,INVALC,INVALC,INVALC,INVALC,
-	0x7C69,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F36,INVALC,INVALC,INVALC,0x6D47,0x6E2C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4C5D,INVALC,INVALC,
-	INVALC,INVALC,0x7627,INVALC,INVALC,INVALC,0x667A,INVALC,
-	INVALC,INVALC,0x7524,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7D5C,0x6D33,0x4E49,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F68,INVALC,INVALC,0x613F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7A5B,0x4B63,0x7729,INVALC,0x7B26,
-	INVALC,INVALC,INVALC,0x5C39,INVALC,INVALC,INVALC,0x7140,
-	0x6D48,0x6F43,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x562D,INVALC,INVALC,0x7D4E,INVALC,INVALC,INVALC,0x6821,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7B74,0x5527,INVALC,INVALC,INVALC,0x7176,INVALC,0x6653,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C5E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7832,INVALC,INVALC,INVALC,0x5C6B,INVALC,INVALC,
-	/* Block 114, Array index 0x3400 */
-	INVALC,INVALC,INVALC,INVALC,0x7D36,INVALC,INVALC,INVALC,
-	INVALC,0x656A,INVALC,INVALC,0x7160,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5B4C,0x5D4D,INVALC,INVALC,INVALC,0x5448,INVALC,
-	INVALC,0x596D,INVALC,INVALC,INVALC,INVALC,0x7525,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x667B,INVALC,INVALC,INVALC,INVALC,INVALC,0x6654,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7D48,
-	INVALC,0x5621,0x7D3F,INVALC,0x7C53,INVALC,0x6F21,INVALC,
-	0x673C,INVALC,INVALC,INVALC,INVALC,INVALC,0x516E,INVALC,
-	INVALC,0x6655,INVALC,INVALC,0x6972,INVALC,0x5F30,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5860,0x7C3A,0x7D2F,0x704E,
-	INVALC,0x5B61,INVALC,INVALC,0x6549,INVALC,0x6D34,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6043,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6358,INVALC,INVALC,INVALC,
-	INVALC,0x697B,0x6A28,INVALC,INVALC,INVALC,INVALC,0x7D37,
-	INVALC,INVALC,0x7B27,INVALC,0x6942,INVALC,INVALC,INVALC,
-	INVALC,0x7D77,INVALC,INVALC,INVALC,INVALC,INVALC,0x6259,
-	INVALC,INVALC,0x5C6C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6822,INVALC,INVALC,INVALC,
-	INVALC,0x6670,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7D78,0x7D79,INVALC,INVALC,INVALC,0x763F,INVALC,
-	INVALC,0x6727,INVALC,0x6657,INVALC,INVALC,INVALC,INVALC,
-	0x5473,0x5449,INVALC,INVALC,INVALC,INVALC,0x567A,INVALC,
-	0x5772,INVALC,0x6140,INVALC,0x5B62,0x6658,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x673D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x704F,0x733E,0x622C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7537,0x6070,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7D38,0x6368,INVALC,0x5427,0x687C,
-	/* Block 115, Array index 0x3500 */
-	0x7A52,INVALC,INVALC,INVALC,INVALC,INVALC,0x786F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5653,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5534,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7050,INVALC,0x7770,0x6E33,INVALC,INVALC,
-	0x6A3A,INVALC,0x6A53,INVALC,INVALC,0x6D49,0x5D2B,INVALC,
-	INVALC,INVALC,0x652C,0x7D21,INVALC,0x5F50,0x6C33,INVALC,
-	0x5F51,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D6D,0x7838,
-	0x777A,INVALC,INVALC,INVALC,0x782B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7460,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x543A,0x6433,INVALC,0x695A,INVALC,0x5E36,INVALC,0x593F,
-	INVALC,0x5940,0x566F,INVALC,INVALC,INVALC,INVALC,0x594C,
-	INVALC,0x5A2A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5F65,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7765,INVALC,INVALC,INVALC,0x4C32,INVALC,INVALC,
-	0x5F79,0x5760,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x543B,INVALC,INVALC,INVALC,INVALC,0x7D7A,
-	INVALC,INVALC,INVALC,INVALC,0x4C33,INVALC,INVALC,0x5B73,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F52,INVALC,0x4E4A,INVALC,0x6E5A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6464,INVALC,
-	0x7B4F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F37,
-	INVALC,0x6E43,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E6A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x622D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5761,0x7A75,INVALC,INVALC,0x5549,0x782C,INVALC,INVALC,
-	/* Block 116, Array index 0x3600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6759,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7369,INVALC,
-	INVALC,INVALC,INVALC,0x586D,0x6344,0x7071,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6865,INVALC,INVALC,
-	INVALC,0x607A,0x6E44,0x595E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B22,0x6B23,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7C42,0x6A3B,
-	INVALC,INVALC,INVALC,INVALC,0x682B,0x5E62,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6D6F,INVALC,0x6823,INVALC,INVALC,INVALC,INVALC,0x4F71,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x543C,INVALC,0x7C6A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x673E,INVALC,0x7C72,INVALC,INVALC,0x5634,INVALC,INVALC,
-	0x622E,INVALC,0x5337,0x7A4C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7A5C,INVALC,0x6D35,0x6163,
-	INVALC,0x682C,INVALC,0x685D,INVALC,INVALC,0x6F69,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x743D,INVALC,0x4F38,0x695B,
-	0x512C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A47,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B49,
-	INVALC,0x684C,INVALC,INVALC,INVALC,0x5E37,INVALC,INVALC,
-	INVALC,INVALC,0x563C,0x5365,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7A5D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5A56,INVALC,0x4A31,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5A48,0x5F26,INVALC,0x7933,0x7252,INVALC,0x4A44,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E4B,INVALC,
-	INVALC,0x4D75,INVALC,INVALC,INVALC,0x7D30,0x5528,INVALC,
-	0x7141,INVALC,INVALC,0x6269,0x5C4A,0x6C34,0x7A40,INVALC,
-	INVALC,0x7B28,0x5028,INVALC,INVALC,0x5A6C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x596E,
-	INVALC,0x607B,INVALC,INVALC,INVALC,0x6F6A,0x7A5E,INVALC,
-	/* Block 117, Array index 0x3700 */
-	INVALC,0x6044,INVALC,0x4F39,INVALC,0x554A,0x5762,0x622F,
-	INVALC,0x5738,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x684D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x765A,INVALC,INVALC,INVALC,INVALC,
-	0x6F22,0x625A,0x767C,INVALC,INVALC,0x7B50,0x512D,INVALC,
-	0x4D64,INVALC,0x512E,0x5C6D,0x684E,INVALC,0x7079,0x4E35,
-	0x667C,INVALC,INVALC,0x577B,0x5056,0x5D75,0x7771,INVALC,
-	0x767D,INVALC,0x5B77,INVALC,INVALC,INVALC,INVALC,0x7B6A,
-	0x695C,0x5941,INVALC,0x7572,0x6045,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6A54,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7942,INVALC,0x6A3C,
-	INVALC,0x5245,0x7B51,0x6740,0x6B25,INVALC,0x5F7A,0x6322,
-	0x5739,INVALC,0x6943,INVALC,0x687D,0x682F,INVALC,INVALC,
-	0x7253,0x7B29,0x5825,INVALC,INVALC,INVALC,INVALC,0x554B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5048,INVALC,
-	INVALC,INVALC,0x512F,0x5763,INVALC,INVALC,INVALC,0x6046,
-	INVALC,0x5622,INVALC,0x6D70,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5773,INVALC,INVALC,INVALC,0x7C54,INVALC,0x5A57,0x4C5F,
-	INVALC,0x7254,INVALC,0x5130,INVALC,0x4C60,INVALC,0x5B7D,
-	0x733F,INVALC,0x7051,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7C3B,INVALC,0x6230,INVALC,INVALC,0x6625,INVALC,INVALC,
-	INVALC,0x625B,INVALC,INVALC,INVALC,0x5F5E,INVALC,0x6047,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x726F,INVALC,
-	INVALC,INVALC,0x4C61,INVALC,INVALC,INVALC,INVALC,0x566A,
-	INVALC,INVALC,INVALC,INVALC,0x6742,INVALC,INVALC,INVALC,
-	0x4E36,INVALC,0x7340,INVALC,0x4D7E,INVALC,INVALC,INVALC,
-	0x7B52,INVALC,0x7878,0x777B,INVALC,INVALC,0x683F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6837,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D36,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 118, Array index 0x3800 */
-	INVALC,0x5C3A,INVALC,INVALC,0x4C34,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7177,INVALC,INVALC,INVALC,0x6838,INVALC,INVALC,
-	0x4A76,INVALC,0x6424,0x7456,INVALC,INVALC,INVALC,0x5F66,
-	INVALC,INVALC,INVALC,0x5F27,INVALC,0x5F67,0x6141,INVALC,
-	0x6944,INVALC,INVALC,0x5C4B,0x6945,INVALC,INVALC,INVALC,
-	0x6F23,0x6B26,0x4B23,0x6369,INVALC,INVALC,INVALC,0x517B,
-	0x6F24,INVALC,0x6F6B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5034,
-	INVALC,INVALC,INVALC,INVALC,0x4D23,INVALC,INVALC,0x6866,
-	INVALC,0x6F25,INVALC,0x534C,0x5A6D,INVALC,INVALC,INVALC,
-	INVALC,0x573A,INVALC,0x7255,0x7565,0x596F,INVALC,INVALC,
-	INVALC,INVALC,0x7934,INVALC,INVALC,0x5554,0x7D4F,INVALC,
-	INVALC,INVALC,0x5B63,INVALC,INVALC,INVALC,INVALC,0x7161,
-	0x6C36,INVALC,INVALC,INVALC,INVALC,0x7B7E,0x5357,INVALC,
-	0x5131,INVALC,0x4B31,INVALC,INVALC,INVALC,INVALC,0x5132,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B32,0x7142,
-	INVALC,INVALC,0x7461,0x7935,INVALC,INVALC,0x6143,0x6142,
-	INVALC,0x6B77,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5F28,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B4A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6639,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x785E,0x792A,0x4A77,INVALC,0x6D37,INVALC,INVALC,
-	0x5338,0x7256,INVALC,INVALC,0x5459,0x6E45,0x7270,INVALC,
-	INVALC,INVALC,0x4A32,INVALC,INVALC,0x5C3B,INVALC,0x7178,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6C37,INVALC,INVALC,
-	INVALC,INVALC,0x654A,INVALC,0x7640,0x7D5D,INVALC,INVALC,
-	0x5463,0x4C62,INVALC,0x7754,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5765,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5343,INVALC,0x5826,INVALC,0x7641,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D76,INVALC,0x4D40,INVALC,INVALC,INVALC,
-	/* Block 119, Array index 0x3900 */
-	0x655C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x654B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6144,INVALC,INVALC,INVALC,INVALC,INVALC,0x6830,
-	0x7430,0x736A,0x5A6E,INVALC,0x573B,INVALC,0x6231,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x572A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x567B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x645F,INVALC,0x4A56,INVALC,
-	INVALC,INVALC,0x6B28,INVALC,INVALC,INVALC,0x5B7E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7642,INVALC,INVALC,0x6F3B,INVALC,INVALC,INVALC,
-	INVALC,0x547D,INVALC,INVALC,0x6048,INVALC,INVALC,INVALC,
-	0x6839,INVALC,0x6F26,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4D24,INVALC,INVALC,0x5474,0x5B21,0x5B5C,0x5B5D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6E5C,INVALC,0x4B4B,0x7C55,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E6B,INVALC,
-	0x4D41,INVALC,INVALC,0x7B53,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x792B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7554,INVALC,INVALC,INVALC,INVALC,0x5929,
-	INVALC,INVALC,0x695D,0x5B4D,INVALC,INVALC,0x5D4E,INVALC,
-	0x6743,INVALC,0x6C4C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x796C,INVALC,INVALC,INVALC,0x4B4C,INVALC,
-	INVALC,INVALC,INVALC,0x607C,0x5428,INVALC,0x6D53,0x586F,
-	INVALC,0x7257,INVALC,0x4A78,0x5A6F,INVALC,INVALC,0x5654,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x594D,INVALC,
-	INVALC,INVALC,0x586E,INVALC,0x7241,INVALC,INVALC,INVALC,
-	0x5F53,INVALC,INVALC,INVALC,0x5A70,INVALC,0x626A,INVALC,
-	/* Block 120, Array index 0x3A00 */
-	INVALC,0x607D,INVALC,INVALC,0x5878,INVALC,INVALC,INVALC,
-	0x772F,0x5A36,INVALC,0x4A57,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7258,INVALC,
-	0x5879,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7A5F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F6F,
-	0x5942,INVALC,0x7052,INVALC,0x6451,INVALC,INVALC,INVALC,
-	0x7337,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7A60,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6F6C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6232,INVALC,0x543D,INVALC,INVALC,0x594E,INVALC,
-	INVALC,INVALC,INVALC,0x7462,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5429,INVALC,INVALC,INVALC,INVALC,0x4D42,0x675A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7259,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x592A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x583E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5C2D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x626B,0x567C,INVALC,INVALC,
-	0x4A79,INVALC,INVALC,0x545A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7457,0x4C21,INVALC,INVALC,0x4F3A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7538,
-	INVALC,INVALC,INVALC,0x5943,0x5068,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6345,0x6B78,INVALC,0x7231,INVALC,INVALC,
-	INVALC,0x4F3B,INVALC,INVALC,INVALC,0x532D,0x6861,0x4E6C,
-	INVALC,INVALC,INVALC,0x6034,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 121, Array index 0x3B00 */
-	INVALC,INVALC,0x5E63,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D77,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7232,0x7376,0x765B,
-	INVALC,INVALC,INVALC,INVALC,0x577E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x785F,INVALC,0x7772,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5029,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x665A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7526,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x573C,0x4C63,INVALC,INVALC,0x665B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5D5D,INVALC,INVALC,INVALC,
-	INVALC,0x5133,INVALC,INVALC,INVALC,INVALC,INVALC,0x6F6D,
-	INVALC,INVALC,INVALC,INVALC,0x565E,0x6474,0x616F,INVALC,
-	INVALC,0x5D78,INVALC,INVALC,INVALC,INVALC,INVALC,0x684F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A65,INVALC,INVALC,INVALC,0x5C21,
-	INVALC,0x6035,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7C2C,0x7C2D,0x5827,INVALC,INVALC,INVALC,
-	INVALC,0x6D38,INVALC,INVALC,INVALC,0x5B36,INVALC,INVALC,
-	INVALC,INVALC,0x5670,0x732F,INVALC,INVALC,0x4D25,INVALC,
-	0x5A71,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5828,INVALC,INVALC,INVALC,0x4C64,INVALC,INVALC,0x5134,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4A58,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5A72,INVALC,INVALC,INVALC,INVALC,
-	/* Block 122, Array index 0x3C00 */
-	INVALC,0x7527,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7528,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6626,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x556C,0x5578,0x5A73,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6346,INVALC,INVALC,INVALC,0x5E64,INVALC,
-	0x5E65,0x5135,INVALC,INVALC,INVALC,INVALC,INVALC,0x5136,
-	0x5137,0x7233,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x695E,INVALC,INVALC,INVALC,INVALC,INVALC,0x7053,0x7234,
-	INVALC,INVALC,0x7054,0x4B64,0x7B54,0x7566,0x636A,INVALC,
-	0x5E66,INVALC,INVALC,INVALC,INVALC,0x5F54,INVALC,INVALC,
-	0x7879,INVALC,INVALC,INVALC,INVALC,0x702E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5138,INVALC,INVALC,INVALC,INVALC,0x565F,
-	INVALC,0x5057,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7C21,0x6F6E,0x5C58,
-	INVALC,0x695F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x655D,0x7D7B,
-	INVALC,INVALC,0x6049,INVALC,INVALC,INVALC,0x5649,INVALC,
-	INVALC,0x542A,INVALC,0x654C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6960,INVALC,INVALC,INVALC,0x5058,0x7C22,0x543E,
-	0x6233,0x5E67,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C3C,0x5236,0x7555,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E21,0x7529,INVALC,INVALC,0x5D79,INVALC,INVALC,
-	0x5D7A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7055,
-	INVALC,INVALC,INVALC,INVALC,0x765F,INVALC,0x725A,0x646B,
-	INVALC,0x7271,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6C39,INVALC,INVALC,INVALC,INVALC,
-	/* Block 123, Array index 0x3D00 */
-	0x7D7C,INVALC,INVALC,INVALC,INVALC,0x612A,INVALC,INVALC,
-	0x4A59,INVALC,INVALC,0x6F6F,INVALC,0x752A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6C79,INVALC,INVALC,0x782D,
-	INVALC,0x7242,0x7643,INVALC,0x5752,INVALC,INVALC,0x7922,
-	0x7056,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x707A,INVALC,
-	INVALC,0x7660,INVALC,INVALC,INVALC,INVALC,0x6973,0x7243,
-	INVALC,INVALC,INVALC,0x542B,0x4A33,0x4D26,INVALC,0x4D43,
-	0x4D5A,INVALC,INVALC,INVALC,INVALC,INVALC,0x594F,INVALC,
-	INVALC,0x7644,INVALC,INVALC,INVALC,0x6E5D,0x6744,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6234,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F62,0x675B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6831,INVALC,0x7C2E,INVALC,INVALC,INVALC,INVALC,
-	0x654D,INVALC,INVALC,INVALC,0x7A6B,INVALC,0x4F3C,INVALC,
-	INVALC,0x4F62,0x4D76,INVALC,INVALC,0x6F70,INVALC,0x743E,
-	INVALC,0x544D,INVALC,INVALC,0x7338,INVALC,INVALC,INVALC,
-	0x6921,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7272,0x736B,INVALC,0x7057,INVALC,INVALC,
-	0x4F57,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F5F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6840,0x6841,INVALC,INVALC,INVALC,0x4F63,0x6922,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x502A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7341,0x502B,INVALC,0x5464,
-	INVALC,INVALC,0x6F3C,0x5821,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x595F,
-	INVALC,0x7357,INVALC,INVALC,INVALC,0x5C3D,INVALC,0x4C65,
-	0x6D71,INVALC,INVALC,0x7162,INVALC,0x545B,INVALC,INVALC,
-	INVALC,INVALC,0x6235,INVALC,INVALC,0x4A66,INVALC,0x532E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C66,INVALC,
-	INVALC,0x7153,0x7567,INVALC,INVALC,INVALC,INVALC,0x4A5A,
-	/* Block 124, Array index 0x3E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7B6E,
-	INVALC,0x6145,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F69,INVALC,0x6E5E,INVALC,INVALC,0x7742,INVALC,
-	0x5822,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D2C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x702F,0x563D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x612B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7936,INVALC,
-	INVALC,0x5475,INVALC,0x5049,0x6F27,0x626C,INVALC,0x5B6A,
-	0x4E4C,0x7568,0x7755,INVALC,0x534D,INVALC,0x737E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5035,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x607E,INVALC,0x5F7B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x665D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6824,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B4D,
-	INVALC,INVALC,INVALC,0x6F28,INVALC,INVALC,INVALC,0x6E34,
-	INVALC,INVALC,INVALC,INVALC,0x5A58,0x5139,INVALC,0x5F29,
-	INVALC,INVALC,0x7330,INVALC,INVALC,0x4C44,INVALC,INVALC,
-	INVALC,0x4E37,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6F29,INVALC,INVALC,
-	INVALC,0x5F55,INVALC,INVALC,0x6D57,INVALC,INVALC,INVALC,
-	0x6E46,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6F3D,0x7C56,INVALC,INVALC,0x5B74,INVALC,0x6F2A,0x7839,
-	INVALC,0x7569,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6359,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6146,INVALC,INVALC,INVALC,0x543F,INVALC,INVALC,INVALC,
-	INVALC,0x5E68,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 125, Array index 0x3F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x706A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7342,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x532F,INVALC,
-	INVALC,0x4A5B,INVALC,INVALC,INVALC,INVALC,INVALC,0x7C57,
-	INVALC,INVALC,0x6D58,0x6147,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7458,0x5633,0x5D2D,
-	INVALC,INVALC,INVALC,0x553E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7143,0x6E5F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x566B,INVALC,INVALC,INVALC,0x7459,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5766,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5A37,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D7B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D4F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5823,INVALC,INVALC,0x5A59,INVALC,0x7058,
-	0x6F44,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6158,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7154,INVALC,0x6D72,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x555B,INVALC,
-	INVALC,0x555C,0x7344,0x4B57,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6236,INVALC,INVALC,INVALC,INVALC,0x6F71,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7B55,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5358,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D50,0x7059,
-	0x4B33,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x555D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4D27,INVALC,INVALC,0x502C,INVALC,
-	/* Block 126, Array index 0x4000 */
-	0x513A,INVALC,0x7144,INVALC,0x6533,0x7B75,0x6961,0x7D60,
-	0x7C3C,INVALC,0x5A22,0x5A23,INVALC,0x5221,INVALC,INVALC,
-	0x526F,INVALC,INVALC,INVALC,0x626D,INVALC,INVALC,0x5E69,
-	0x4E5C,0x7235,0x5064,0x5D51,INVALC,INVALC,INVALC,INVALC,
-	0x6148,0x5B37,0x5F63,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6D39,0x7145,INVALC,0x734F,0x572B,
-	0x612C,INVALC,INVALC,0x636B,INVALC,0x6E47,INVALC,INVALC,
-	INVALC,0x6149,0x4A7A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x707B,0x7A61,0x705A,0x4C67,0x5A74,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C3F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E6D,INVALC,
-	INVALC,0x5529,0x7A62,INVALC,INVALC,INVALC,0x5065,INVALC,
-	0x6B56,INVALC,0x6C5F,INVALC,INVALC,INVALC,0x5F7C,INVALC,
-	INVALC,0x7756,0x5E6A,0x4B34,INVALC,INVALC,0x6F3E,INVALC,
-	INVALC,0x4C35,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F3D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6F72,0x6237,
-	INVALC,INVALC,INVALC,0x4C68,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x707C,INVALC,INVALC,INVALC,
-	0x5660,INVALC,0x7146,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6238,0x6B2B,INVALC,INVALC,
-	INVALC,0x4B35,0x5851,INVALC,0x744E,0x7377,INVALC,INVALC,
-	0x5746,INVALC,0x513B,0x772A,INVALC,0x6D4A,0x5753,0x587A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7645,
-	INVALC,INVALC,0x514C,0x5D7C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F7D,INVALC,
-	0x7965,INVALC,0x604A,INVALC,INVALC,0x727D,0x5330,INVALC,
-	0x7473,0x5A49,INVALC,0x665E,INVALC,INVALC,INVALC,INVALC,
-	0x783A,0x6850,INVALC,INVALC,0x587B,INVALC,INVALC,0x6A55,
-	INVALC,INVALC,INVALC,INVALC,0x5623,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7646,INVALC,INVALC,INVALC,INVALC,
-	/* Block 127, Array index 0x4100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x725B,0x647C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6832,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5A5A,INVALC,0x725C,0x7B56,0x6932,
-	INVALC,0x6E2D,INVALC,0x7A63,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C6E,INVALC,INVALC,0x756A,0x6660,
-	INVALC,0x707D,INVALC,INVALC,INVALC,INVALC,INVALC,0x572C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7545,0x6E60,INVALC,
-	INVALC,0x5B65,INVALC,0x5D5E,INVALC,INVALC,0x5970,0x6923,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7179,INVALC,0x7244,0x604B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6924,INVALC,
-	INVALC,0x6239,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6331,0x7C6B,0x4D28,INVALC,0x4C36,INVALC,INVALC,
-	0x705B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x663A,INVALC,INVALC,0x4D29,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7343,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6159,INVALC,INVALC,0x6F2B,
-	INVALC,INVALC,INVALC,0x6745,INVALC,INVALC,0x6069,INVALC,
-	0x7345,INVALC,INVALC,0x5440,0x553F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 128, Array index 0x4200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5D2E,INVALC,
-	0x797C,INVALC,0x4C40,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6522,INVALC,INVALC,INVALC,
-	0x4E38,INVALC,INVALC,INVALC,0x5852,0x7956,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x712A,0x4E51,INVALC,INVALC,0x7647,INVALC,
-	0x5B6B,INVALC,0x5F7E,INVALC,INVALC,0x5861,INVALC,0x7773,
-	INVALC,0x5767,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x547E,INVALC,INVALC,
-	0x513C,INVALC,0x654F,INVALC,0x4B36,INVALC,0x5A38,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4D44,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x563E,INVALC,INVALC,INVALC,0x623A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4F58,INVALC,INVALC,INVALC,
-	0x604C,0x6B79,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7D7D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5768,0x4B58,INVALC,INVALC,INVALC,0x6962,INVALC,INVALC,
-	INVALC,0x683A,INVALC,INVALC,INVALC,0x6347,INVALC,INVALC,
-	INVALC,INVALC,0x6C4D,INVALC,0x6C4E,INVALC,0x563F,INVALC,
-	INVALC,INVALC,0x6327,INVALC,0x5F56,0x7D68,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E61,
-	0x7628,0x5D7D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x783B,INVALC,0x6851,INVALC,INVALC,INVALC,INVALC,
-	0x7957,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E6E,INVALC,INVALC,0x6C4F,INVALC,INVALC,INVALC,
-	/* Block 129, Array index 0x4300 */
-	0x6925,0x5655,INVALC,0x4D45,INVALC,0x6D3A,0x513D,INVALC,
-	INVALC,0x4F3E,INVALC,INVALC,0x6C3B,INVALC,INVALC,INVALC,
-	0x5231,INVALC,INVALC,INVALC,INVALC,0x4C69,INVALC,0x5944,
-	0x697C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x513E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6C3C,INVALC,INVALC,0x652D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7730,INVALC,0x4C6A,
-	INVALC,INVALC,INVALC,0x5344,INVALC,INVALC,0x5640,INVALC,
-	INVALC,INVALC,0x567D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6121,INVALC,
-	0x5E3D,INVALC,0x7629,INVALC,INVALC,INVALC,0x5A24,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5624,
-	0x7546,INVALC,0x6122,0x6946,INVALC,INVALC,INVALC,0x7245,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7469,0x566C,0x6B53,
-	INVALC,INVALC,INVALC,INVALC,0x6C3D,0x625C,0x5E6B,0x705C,
-	INVALC,0x6B3F,INVALC,0x574E,0x513F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x752B,INVALC,
-	INVALC,INVALC,INVALC,0x797D,INVALC,0x4A5C,INVALC,INVALC,
-	INVALC,0x4D46,0x7236,INVALC,INVALC,0x5D7E,INVALC,INVALC,
-	INVALC,0x4C37,0x5B38,INVALC,INVALC,INVALC,INVALC,0x5069,
-	INVALC,0x4E5D,0x6B40,INVALC,0x7D22,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x784B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6A56,0x7130,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5B4E,INVALC,0x7743,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5B4F,0x4B24,INVALC,INVALC,0x7860,INVALC,
-	INVALC,0x7B57,INVALC,INVALC,0x6B4A,0x6021,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4E4D,INVALC,INVALC,0x545C,INVALC,INVALC,INVALC,
-	0x7D58,INVALC,INVALC,INVALC,INVALC,0x5276,INVALC,INVALC,
-	/* Block 130, Array index 0x4400 */
-	INVALC,INVALC,0x7237,INVALC,INVALC,0x7A76,0x762A,0x7A77,
-	0x5866,INVALC,0x7431,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6852,INVALC,0x4A45,0x4C6B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x626E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x623B,INVALC,0x772D,INVALC,INVALC,INVALC,0x7861,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x736C,INVALC,INVALC,INVALC,INVALC,0x5E21,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x647D,INVALC,INVALC,0x636C,INVALC,
-	0x5D2F,0x5D30,INVALC,INVALC,0x4B37,0x6853,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6123,0x5260,INVALC,
-	INVALC,INVALC,INVALC,0x707E,INVALC,INVALC,INVALC,INVALC,
-	0x6926,0x4B72,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6D73,0x5C59,0x604D,INVALC,INVALC,INVALC,INVALC,0x775A,
-	0x5B39,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C2E,INVALC,0x5A5B,INVALC,INVALC,INVALC,INVALC,0x4D47,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D31,INVALC,0x582F,0x6323,INVALC,INVALC,
-	0x4E6F,INVALC,INVALC,0x7273,INVALC,INVALC,INVALC,INVALC,
-	0x7833,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x604E,INVALC,0x757D,INVALC,INVALC,
-	INVALC,INVALC,0x6B6C,INVALC,INVALC,0x5345,0x7C6C,0x525B,
-	0x546B,INVALC,0x5E22,INVALC,INVALC,INVALC,0x6566,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7030,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5544,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D74,
-	INVALC,INVALC,INVALC,0x636D,INVALC,0x6842,INVALC,0x6D75,
-	0x577C,INVALC,0x6D3B,INVALC,INVALC,0x762B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7238,0x7648,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5366,0x725D,0x4F3F,INVALC,0x6B2C,INVALC,
-	/* Block 131, Array index 0x4500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4F40,INVALC,0x6628,
-	0x7D69,INVALC,0x4F41,INVALC,0x605F,0x5E6C,INVALC,INVALC,
-	INVALC,INVALC,0x6022,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x743F,0x626F,INVALC,0x5971,0x7147,
-	INVALC,0x4B38,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x797E,0x5B3A,0x5A75,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x766C,0x5A5C,0x7A64,
-	INVALC,0x604F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D32,INVALC,INVALC,INVALC,INVALC,0x6629,INVALC,0x6F73,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x736D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6B7A,INVALC,0x7966,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A5D,0x555E,
-	INVALC,0x4A5E,0x5F64,INVALC,INVALC,INVALC,0x667D,INVALC,
-	0x752C,INVALC,INVALC,INVALC,INVALC,INVALC,0x6475,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6963,INVALC,0x6D4B,0x4F64,INVALC,
-	INVALC,INVALC,0x5853,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D33,0x546C,INVALC,INVALC,0x7239,INVALC,0x5F37,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B4E,0x7B58,INVALC,
-	INVALC,0x5059,INVALC,INVALC,0x5D52,0x7774,0x675C,0x6425,
-	INVALC,0x7C23,INVALC,0x5B3B,INVALC,INVALC,INVALC,0x723A,
-	0x697D,0x504A,INVALC,0x7556,0x5945,0x6434,INVALC,0x6D27,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A3D,0x667E,INVALC,0x7744,0x752D,INVALC,0x5960,
-	INVALC,INVALC,INVALC,0x4A34,INVALC,INVALC,0x7862,0x4F42,
-	INVALC,0x6C3E,INVALC,INVALC,INVALC,0x6534,0x4D48,0x6E48,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6748,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4D49,0x7937,INVALC,
-	/* Block 132, Array index 0x4600 */
-	INVALC,0x7168,0x5972,0x5B75,0x4A35,0x5946,INVALC,INVALC,
-	INVALC,0x5849,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x592B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6D3C,INVALC,INVALC,0x5854,INVALC,INVALC,INVALC,0x5C5A,
-	INVALC,0x623C,INVALC,INVALC,0x7C6D,0x6C60,0x527E,INVALC,
-	0x6947,0x662A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6270,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7A3B,
-	INVALC,0x752E,0x7B2A,INVALC,INVALC,INVALC,INVALC,0x6C7B,
-	INVALC,0x6C3F,0x7C58,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5465,INVALC,INVALC,INVALC,0x7943,
-	INVALC,INVALC,INVALC,0x6E62,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5769,0x6D76,INVALC,INVALC,INVALC,0x5E6D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C6C,INVALC,
-	0x636E,INVALC,INVALC,INVALC,INVALC,INVALC,0x6854,INVALC,
-	INVALC,INVALC,0x7A78,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5D34,0x6435,0x5830,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5855,INVALC,INVALC,
-	INVALC,0x746A,INVALC,INVALC,INVALC,0x4E39,INVALC,INVALC,
-	INVALC,0x5661,0x4F52,INVALC,0x5036,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E22,INVALC,INVALC,0x736E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7378,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C4C,INVALC,0x504B,INVALC,INVALC,INVALC,0x7C24,
-	0x4D4A,0x5754,0x5E23,INVALC,0x6460,INVALC,INVALC,INVALC,
-	INVALC,0x6E49,INVALC,INVALC,INVALC,0x625D,INVALC,INVALC,
-	/* Block 133, Array index 0x4700 */
-	INVALC,INVALC,INVALC,0x757E,0x542C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5551,INVALC,0x5870,0x7843,0x6A57,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7557,INVALC,INVALC,0x583F,INVALC,INVALC,INVALC,
-	INVALC,0x7D40,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6B2D,INVALC,INVALC,INVALC,INVALC,0x552A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6728,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E4A,
-	INVALC,INVALC,INVALC,0x4A67,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7863,INVALC,0x545D,INVALC,INVALC,0x6A58,INVALC,
-	INVALC,INVALC,INVALC,0x7B59,0x6D77,INVALC,INVALC,0x6535,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x502D,INVALC,INVALC,
-	INVALC,INVALC,0x7171,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x623D,INVALC,INVALC,INVALC,0x6348,INVALC,INVALC,INVALC,
-	INVALC,0x5955,INVALC,INVALC,0x5F2A,INVALC,INVALC,INVALC,
-	INVALC,0x5B3C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7864,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x717A,INVALC,INVALC,0x6536,0x736F,INVALC,INVALC,0x7B5A,
-	0x6160,INVALC,0x592C,INVALC,0x756B,INVALC,0x6036,INVALC,
-	INVALC,0x6948,INVALC,0x4B4F,INVALC,0x6349,INVALC,INVALC,
-	INVALC,0x5E6E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x623E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5C6F,INVALC,0x5625,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6271,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x567E,INVALC,INVALC,INVALC,
-	/* Block 134, Array index 0x4800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5921,INVALC,0x5840,0x5C5B,INVALC,INVALC,0x6D3D,
-	0x5F38,INVALC,0x6A25,INVALC,INVALC,INVALC,0x572D,INVALC,
-	INVALC,0x7379,INVALC,0x6D78,INVALC,0x7547,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x614A,0x6B63,INVALC,0x725E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x784C,INVALC,0x6A59,
-	INVALC,0x5346,INVALC,0x5B66,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x752F,INVALC,INVALC,INVALC,INVALC,0x4E70,INVALC,
-	INVALC,INVALC,INVALC,0x697E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7B36,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6272,INVALC,INVALC,INVALC,INVALC,
-	0x4F72,0x7739,0x5973,INVALC,INVALC,0x614B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5A5D,INVALC,INVALC,0x5A39,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B7B,
-	INVALC,0x4B39,INVALC,INVALC,0x6D79,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6060,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7440,INVALC,
-	0x7D3C,0x5F31,0x636F,INVALC,INVALC,INVALC,INVALC,0x6023,
-	0x7D39,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7031,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D4B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6D3E,INVALC,INVALC,INVALC,0x5540,0x6370,0x6D7A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6964,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x556D,0x675D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5476,0x6537,INVALC,INVALC,
-	INVALC,0x5B67,0x623F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E4B,
-	INVALC,INVALC,0x5774,0x705D,INVALC,INVALC,INVALC,0x4E2B,
-	/* Block 135, Array index 0x4900 */
-	INVALC,INVALC,0x675E,INVALC,INVALC,INVALC,0x5656,0x614C,
-	INVALC,INVALC,0x6833,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x656E,0x5C22,
-	INVALC,INVALC,0x6050,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5535,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5521,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7B5B,INVALC,
-	0x794B,INVALC,INVALC,INVALC,0x4B73,0x7425,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7A48,0x5657,INVALC,0x6965,0x7B5C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7D50,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7B76,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5A25,INVALC,0x5B3D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6C62,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4D77,0x705E,INVALC,INVALC,INVALC,
-	INVALC,0x7649,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5E6F,
-	INVALC,INVALC,INVALC,0x5331,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7C6E,INVALC,INVALC,INVALC,
-	INVALC,0x6843,INVALC,0x7148,INVALC,INVALC,INVALC,0x4E71,
-	INVALC,INVALC,INVALC,INVALC,0x796D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7274,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6436,INVALC,
-	/* Block 136, Array index 0x4A00 */
-	0x7539,INVALC,0x5C70,0x6371,INVALC,INVALC,INVALC,INVALC,
-	0x6825,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x723B,INVALC,0x5E24,INVALC,0x5A4C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A69,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x635A,INVALC,0x7C59,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A5A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7944,INVALC,
-	0x6324,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7B5D,INVALC,0x6F4A,INVALC,
-	0x6844,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x554C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6B57,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x592D,
-	INVALC,INVALC,0x7B2B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5359,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5522,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x765E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5A76,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6051,INVALC,INVALC,0x6928,
-	INVALC,INVALC,0x7579,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7A2F,INVALC,0x6B7C,INVALC,INVALC,0x606A,INVALC,
-	/* Block 137, Array index 0x4B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6332,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5545,
-	INVALC,INVALC,0x7163,0x556E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4D4C,INVALC,INVALC,INVALC,INVALC,0x6D59,INVALC,
-	INVALC,INVALC,INVALC,0x5841,INVALC,INVALC,INVALC,INVALC,
-	0x7A6C,INVALC,INVALC,INVALC,INVALC,INVALC,0x716B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7A3C,0x6662,INVALC,INVALC,
-	INVALC,INVALC,0x7A65,0x627A,INVALC,INVALC,INVALC,0x4A36,
-	INVALC,0x6437,INVALC,0x6A5B,INVALC,0x757A,INVALC,INVALC,
-	INVALC,0x7B2C,0x4F43,0x6B7D,INVALC,INVALC,INVALC,INVALC,
-	0x787A,INVALC,INVALC,0x5F39,INVALC,INVALC,INVALC,INVALC,
-	0x6171,INVALC,0x5224,INVALC,INVALC,INVALC,INVALC,0x757B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x505A,0x505B,
-	INVALC,0x6A3E,0x5931,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A37,INVALC,INVALC,0x5367,INVALC,0x7865,INVALC,INVALC,
-	INVALC,INVALC,0x5332,INVALC,INVALC,INVALC,0x6240,0x725F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D65,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x792C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4D4D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6E2E,0x562E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x576A,
-	INVALC,INVALC,INVALC,INVALC,0x6760,0x6B2E,INVALC,INVALC,
-	INVALC,0x4F59,INVALC,INVALC,0x5C4D,0x6D7B,INVALC,0x5E70,
-	INVALC,0x576B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5E25,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5F57,0x5B50,0x5B51,INVALC,INVALC,
-	0x5523,INVALC,INVALC,INVALC,INVALC,0x7032,INVALC,INVALC,
-	/* Block 138, Array index 0x4C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5C5C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A68,INVALC,0x7866,0x5C4E,INVALC,INVALC,INVALC,INVALC,
-	0x6A5C,0x5B52,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6933,INVALC,INVALC,
-	INVALC,INVALC,0x775B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6328,INVALC,
-	0x572E,INVALC,INVALC,0x6061,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4B3A,INVALC,INVALC,0x6551,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x505C,
-	INVALC,INVALC,INVALC,INVALC,0x5541,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x584A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6329,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6024,
-	INVALC,0x6929,INVALC,0x5347,INVALC,INVALC,0x5C5D,0x782E,
-	INVALC,INVALC,INVALC,0x4C38,INVALC,INVALC,INVALC,0x502E,
-	INVALC,INVALC,INVALC,0x5872,INVALC,INVALC,0x634A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C2F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x542D,0x7651,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x504C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4A46,INVALC,INVALC,0x5542,INVALC,INVALC,
-	0x4E3A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4A47,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7A30,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5F58,INVALC,INVALC,INVALC,
-	0x753A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 139, Array index 0x4D00 */
-	0x656B,INVALC,0x6F74,0x5D35,INVALC,INVALC,INVALC,INVALC,
-	0x4D2A,INVALC,0x6372,INVALC,0x7B77,INVALC,0x7750,INVALC,
-	INVALC,INVALC,INVALC,0x7D3A,INVALC,INVALC,0x7D61,0x767E,
-	0x5140,INVALC,INVALC,0x6845,INVALC,0x6438,INVALC,0x6168,
-	INVALC,INVALC,INVALC,0x4C41,INVALC,0x526D,INVALC,INVALC,
-	INVALC,INVALC,0x5B3E,INVALC,INVALC,0x6062,INVALC,INVALC,
-	INVALC,0x7A49,INVALC,INVALC,0x614D,INVALC,0x4A38,INVALC,
-	INVALC,INVALC,0x7260,0x7149,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5E71,INVALC,INVALC,INVALC,0x705F,0x7844,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6E4C,INVALC,INVALC,0x5E72,INVALC,
-	0x6749,INVALC,0x6273,0x6761,INVALC,INVALC,0x634B,INVALC,
-	INVALC,0x634C,INVALC,INVALC,INVALC,0x4F78,0x6F2C,INVALC,
-	0x7D7E,0x7C25,0x7A31,0x5F59,INVALC,0x6052,INVALC,INVALC,
-	INVALC,0x745A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x714A,INVALC,0x4E23,
-	INVALC,INVALC,INVALC,INVALC,0x723C,0x6C63,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6025,INVALC,0x772B,INVALC,INVALC,
-	0x6B2F,INVALC,INVALC,INVALC,INVALC,INVALC,0x655E,INVALC,
-	0x6124,0x4D2B,INVALC,0x5974,0x6826,0x4D4E,0x6169,INVALC,
-	0x7C6F,INVALC,0x6063,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6241,INVALC,0x4E24,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5E26,INVALC,INVALC,0x6B7E,INVALC,0x6B5D,0x7060,
-	INVALC,INVALC,0x745B,INVALC,0x6274,INVALC,INVALC,0x5348,
-	INVALC,INVALC,INVALC,0x746B,INVALC,0x6E35,INVALC,0x7558,
-	INVALC,INVALC,0x555F,INVALC,INVALC,INVALC,0x5665,INVALC,
-	INVALC,INVALC,INVALC,0x6B30,0x7463,INVALC,INVALC,INVALC,
-	INVALC,0x634D,INVALC,INVALC,INVALC,INVALC,0x7474,0x7A32,
-	INVALC,INVALC,0x6F75,0x4A5F,INVALC,0x6B31,0x6D3F,INVALC,
-	INVALC,0x7D49,INVALC,INVALC,INVALC,INVALC,0x6426,0x7924,
-	0x7033,INVALC,0x656C,INVALC,INVALC,INVALC,0x5167,INVALC,
-	/* Block 140, Array index 0x4E00 */
-	0x5947,0x6457,0x6A5D,INVALC,0x5477,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5A3A,INVALC,
-	0x5A4D,INVALC,INVALC,INVALC,0x794C,INVALC,0x615A,0x5B3F,
-	INVALC,0x4C45,0x6C50,0x4B3B,INVALC,0x5E73,INVALC,INVALC,
-	0x692A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5948,INVALC,INVALC,0x6E63,0x573D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4F44,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x504D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7C26,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x717B,INVALC,INVALC,INVALC,INVALC,0x7D52,0x5141,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x635B,INVALC,0x5349,INVALC,0x5C4F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C6D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E27,INVALC,INVALC,0x663B,
-	0x6C21,INVALC,INVALC,INVALC,0x4C39,INVALC,INVALC,0x7B5E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6762,INVALC,INVALC,
-	0x5441,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5C28,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6242,INVALC,0x7358,0x6553,INVALC,INVALC,0x7359,INVALC,
-	INVALC,INVALC,0x7346,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 141, Array index 0x4F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D5B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4D2C,
-	INVALC,0x7C43,INVALC,INVALC,INVALC,INVALC,0x5467,INVALC,
-	0x5142,INVALC,0x7925,INVALC,0x6855,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x634E,INVALC,INVALC,
-	INVALC,INVALC,0x544A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5F5A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7B5F,0x6763,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x787B,0x634F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7530,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5867,INVALC,0x5949,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x782F,0x6F76,INVALC,
-	0x5D36,0x6E2F,0x4D78,INVALC,INVALC,INVALC,INVALC,0x5E38,
-	0x7C27,0x777C,0x7731,0x4E3B,0x7421,INVALC,INVALC,0x6E4D,
-	0x612E,INVALC,INVALC,0x6C43,0x4F7E,INVALC,0x783F,0x5862,
-	0x5368,INVALC,INVALC,0x5E28,0x7464,0x6C42,INVALC,0x5975,
-	0x7945,0x5D53,0x5671,0x6C7C,0x7C70,INVALC,INVALC,0x6D40,
-	0x4A39,INVALC,0x6E64,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7261,INVALC,0x5E39,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5672,INVALC,0x5E74,INVALC,0x5F5B,INVALC,
-	0x5B53,INVALC,0x7A67,0x5863,0x7441,INVALC,0x5D37,INVALC,
-	INVALC,INVALC,0x7275,INVALC,INVALC,0x542E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5673,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5D38,0x4F45,0x5F5F,INVALC,INVALC,
-	/* Block 142, Array index 0x5000 */
-	INVALC,INVALC,INVALC,INVALC,0x723E,0x7621,INVALC,0x6B4B,
-	0x717C,INVALC,0x7347,INVALC,INVALC,0x606B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6D7C,INVALC,INVALC,0x615B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6E65,INVALC,0x5E75,INVALC,
-	INVALC,INVALC,INVALC,0x7A53,INVALC,INVALC,INVALC,INVALC,
-	0x714B,INVALC,INVALC,0x502F,0x5D39,INVALC,INVALC,0x5143,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7531,INVALC,INVALC,
-	INVALC,INVALC,0x6A46,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7061,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x762C,INVALC,INVALC,INVALC,INVALC,
-	0x7559,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x706B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5D3A,INVALC,INVALC,INVALC,0x723F,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7745,INVALC,
-	INVALC,INVALC,INVALC,0x5B22,0x7276,INVALC,INVALC,0x4A3A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7775,INVALC,0x4B65,INVALC,INVALC,
-	INVALC,0x6E66,INVALC,0x6053,INVALC,INVALC,INVALC,INVALC,
-	0x4E25,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5658,
-	INVALC,INVALC,INVALC,0x542F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 143, Array index 0x5100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6949,INVALC,INVALC,INVALC,INVALC,0x534E,
-	0x7442,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B66,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7121,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6B32,INVALC,INVALC,INVALC,INVALC,0x7122,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6B33,INVALC,0x7034,INVALC,INVALC,0x4B74,
-	0x5430,0x7332,0x7B37,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x756C,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E67,
-	0x7432,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x756D,INVALC,0x4F73,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7062,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E4E,
-	INVALC,INVALC,0x714C,INVALC,INVALC,0x6538,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5775,0x6373,0x4F65,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F46,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7333,0x6458,0x4F79,0x4F5A,INVALC,INVALC,
-	INVALC,INVALC,0x7A4D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6663,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7262,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x756E,INVALC,INVALC,0x4A3B,INVALC,INVALC,0x635C,INVALC,
-	/* Block 144, Array index 0x5200 */
-	INVALC,INVALC,INVALC,0x4E72,INVALC,0x5659,INVALC,INVALC,
-	INVALC,0x6E30,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7465,0x5842,0x5C50,0x4C6E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5560,0x764A,0x7D4A,0x5856,0x744F,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5626,0x5C3E,
-	INVALC,0x5B54,0x5747,INVALC,INVALC,INVALC,INVALC,0x727E,
-	INVALC,INVALC,INVALC,0x714D,INVALC,INVALC,INVALC,INVALC,
-	0x6243,0x5C5E,INVALC,0x5C5F,INVALC,INVALC,0x6F2D,0x662B,
-	INVALC,INVALC,INVALC,INVALC,0x795D,0x6A3F,INVALC,INVALC,
-	INVALC,0x6F2E,INVALC,INVALC,INVALC,0x7450,0x4E73,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x662C,INVALC,0x4E5E,
-	INVALC,INVALC,0x5579,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6374,0x4D50,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5538,INVALC,INVALC,0x777D,INVALC,
-	0x5C29,INVALC,INVALC,INVALC,INVALC,0x5E76,INVALC,0x5C2A,
-	0x7263,0x6934,0x525C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6966,INVALC,INVALC,0x6376,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x674A,INVALC,
-	INVALC,0x504E,INVALC,INVALC,0x5A77,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4A3C,INVALC,
-	INVALC,INVALC,0x6E68,0x5A5E,INVALC,0x7277,INVALC,INVALC,
-	0x627B,INVALC,0x4C26,INVALC,INVALC,INVALC,INVALC,0x5A3B,
-	INVALC,0x6E69,INVALC,INVALC,INVALC,0x755A,INVALC,INVALC,
-	/* Block 145, Array index 0x5300 */
-	0x775C,0x616A,0x4E41,0x5431,INVALC,0x7D31,0x663D,INVALC,
-	0x7B2D,INVALC,INVALC,0x7867,INVALC,0x614E,INVALC,0x7762,
-	0x756F,0x4F47,INVALC,INVALC,0x5432,0x4C6F,INVALC,0x5468,
-	INVALC,0x6E4F,0x7757,INVALC,INVALC,0x6026,0x5641,0x615C,
-	0x7063,0x7164,0x5C71,0x5627,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7475,INVALC,
-	INVALC,0x714E,0x7264,INVALC,INVALC,0x5030,INVALC,INVALC,
-	0x6C6F,INVALC,INVALC,INVALC,0x793A,INVALC,0x6B35,INVALC,
-	INVALC,0x546D,0x6244,INVALC,INVALC,INVALC,INVALC,0x6967,
-	INVALC,INVALC,0x6B34,0x6A21,INVALC,0x783C,0x4E26,INVALC,
-	0x7946,0x7C5A,INVALC,0x5433,0x5339,0x6A5E,INVALC,INVALC,
-	INVALC,0x692B,INVALC,INVALC,0x6161,0x534F,0x7476,INVALC,
-	0x6A40,0x614F,INVALC,0x4C3A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6E6A,INVALC,INVALC,INVALC,0x7064,0x7334,0x546E,
-	INVALC,INVALC,0x7240,INVALC,INVALC,0x7165,INVALC,0x7443,
-	0x6054,INVALC,0x6B36,INVALC,0x5721,0x4B68,INVALC,0x792D,
-	0x692D,0x5864,0x7A33,0x6245,0x7C3D,INVALC,INVALC,0x6C44,
-	0x5831,INVALC,0x5C2B,INVALC,INVALC,INVALC,INVALC,0x5524,
-	INVALC,0x6B69,INVALC,INVALC,INVALC,0x683B,INVALC,INVALC,
-	INVALC,0x5857,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7B2E,0x5161,INVALC,INVALC,0x5B40,INVALC,
-	0x753E,INVALC,0x5E77,INVALC,INVALC,INVALC,INVALC,0x4A7B,
-	0x7746,0x4F48,INVALC,INVALC,INVALC,0x6150,INVALC,INVALC,
-	0x6E50,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6974,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x4E74,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x554D,INVALC,
-	INVALC,0x4F5B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5D3B,INVALC,INVALC,INVALC,INVALC,0x4E2C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6968,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5434,INVALC,INVALC,
-	/* Block 146, Array index 0x5400 */
-	INVALC,INVALC,0x6447,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x755B,INVALC,INVALC,0x7A41,INVALC,INVALC,
-	INVALC,0x5E29,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5478,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6F77,INVALC,INVALC,
-	INVALC,INVALC,0x5333,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B37,0x6F78,0x755C,0x6D4C,0x5B55,0x714F,INVALC,
-	INVALC,INVALC,0x7150,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7532,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x592E,0x552C,INVALC,0x6246,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7D23,INVALC,0x7B65,
-	0x5F2B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6275,
-	INVALC,0x762D,INVALC,0x7533,INVALC,0x7035,INVALC,INVALC,
-	INVALC,INVALC,0x6125,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x755D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6C22,0x6D7D,INVALC,0x7534,0x7B38,
-	INVALC,0x5B23,INVALC,INVALC,0x564A,0x4B59,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6554,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x737A,
-	INVALC,0x6B38,INVALC,0x6037,0x576C,0x716C,0x652F,0x5561,
-	0x576D,0x5151,INVALC,INVALC,INVALC,INVALC,INVALC,0x6172,
-	0x6F79,INVALC,INVALC,INVALC,0x5D3C,0x765C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7065,INVALC,INVALC,INVALC,0x7444,
-	INVALC,INVALC,0x6969,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x737B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 147, Array index 0x5500 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x546F,INVALC,INVALC,
-	0x4C22,0x777E,0x5F3C,INVALC,INVALC,INVALC,INVALC,0x6B4D,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5037,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5642,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x682D,INVALC,INVALC,INVALC,INVALC,0x6F2F,
-	0x4B25,INVALC,INVALC,INVALC,INVALC,0x4B69,INVALC,INVALC,
-	INVALC,0x7A68,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4C46,
-	INVALC,INVALC,INVALC,0x6667,INVALC,INVALC,0x6A47,INVALC,
-	INVALC,INVALC,0x5B24,INVALC,0x4F49,0x627C,0x6F7A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6B5E,INVALC,INVALC,0x7548,INVALC,0x545E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6055,INVALC,0x6F30,INVALC,INVALC,0x6247,INVALC,
-	0x592F,INVALC,INVALC,INVALC,0x7967,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6765,INVALC,INVALC,0x4F4A,0x6151,
-	INVALC,0x6248,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6F7B,INVALC,INVALC,0x7A79,
-	INVALC,INVALC,0x5C72,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6027,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7868,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4B6A,INVALC,INVALC,INVALC,0x4B3C,INVALC,INVALC,INVALC,
-	/* Block 148, Array index 0x5600 */
-	INVALC,INVALC,INVALC,INVALC,0x5662,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x755E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x755F,INVALC,0x6E36,INVALC,INVALC,INVALC,0x6276,0x534A,
-	0x6F7C,0x5144,0x6F31,INVALC,0x5145,INVALC,0x505E,INVALC,
-	0x5961,INVALC,INVALC,0x6038,INVALC,INVALC,0x4D51,0x7339,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x674C,INVALC,0x5628,0x4E27,INVALC,0x5435,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6448,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5334,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6B39,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4B75,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x765D,INVALC,0x7123,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4C47,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x694A,INVALC,0x6170,INVALC,
-	INVALC,INVALC,0x7560,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7B2F,INVALC,INVALC,INVALC,0x4B51,
-	INVALC,INVALC,INVALC,INVALC,0x7B60,0x7265,INVALC,INVALC,
-	0x6C70,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x706C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6E6B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x694B,INVALC,
-	INVALC,0x4C70,INVALC,INVALC,0x572F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7321,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 149, Array index 0x5700 */
-	INVALC,INVALC,INVALC,INVALC,0x7C75,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7124,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6056,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6F32,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7451,INVALC,INVALC,
-	0x7721,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7151,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4A7C,0x4A7D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E4E,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7348,INVALC,0x733A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 150, Array index 0x5800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6D7E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5A26,INVALC,INVALC,0x606C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x784D,INVALC,0x4B52,INVALC,INVALC,INVALC,0x6B4E,
-	INVALC,0x7958,0x7959,0x4A60,0x5A4A,INVALC,INVALC,INVALC,
-	0x4B26,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4A48,0x796E,0x5B6C,INVALC,INVALC,
-	0x5031,INVALC,INVALC,INVALC,INVALC,0x556F,INVALC,INVALC,
-	INVALC,0x6673,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6722,0x6459,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6461,
-	INVALC,INVALC,0x7C44,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x796F,0x4F74,0x7766,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4E3C,INVALC,INVALC,INVALC,
-	INVALC,0x7445,0x5C23,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 151, Array index 0x5900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5D3D,INVALC,INVALC,INVALC,
-	INVALC,0x7446,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x7821,INVALC,INVALC,INVALC,0x6856,INVALC,
-	INVALC,INVALC,0x5B41,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7066,INVALC,INVALC,INVALC,0x6439,
-	0x766D,INVALC,0x792E,INVALC,0x5D3E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5730,0x5868,0x4B3D,INVALC,INVALC,
-	0x795A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x784E,0x7970,0x606D,0x6333,0x7433,
-	INVALC,INVALC,0x6A42,0x7266,0x7036,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x5B56,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6B64,INVALC,INVALC,0x7267,INVALC,0x5755,0x5436,0x7968,
-	0x5741,INVALC,INVALC,INVALC,INVALC,0x6555,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x696A,0x574C,INVALC,
-	INVALC,INVALC,0x5369,0x6249,INVALC,0x7C5B,0x4D2D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4C30,0x6A22,INVALC,INVALC,
-	0x6476,0x5040,INVALC,0x7037,0x6E21,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5776,INVALC,INVALC,INVALC,0x624A,
-	0x624B,INVALC,0x7A4F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6B5F,INVALC,INVALC,INVALC,INVALC,INVALC,0x564B,
-	INVALC,INVALC,INVALC,0x7434,INVALC,INVALC,INVALC,INVALC,
-	0x6D4D,0x6452,INVALC,INVALC,0x6A29,0x643A,0x7322,0x4D52,
-	INVALC,0x764B,INVALC,0x7166,0x6D41,0x683C,0x6E51,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7067,0x624C,INVALC,
-	INVALC,0x642A,INVALC,0x7561,0x6D5A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x576E,0x5171,INVALC,INVALC,INVALC,INVALC,
-	0x696B,0x696C,0x6064,INVALC,INVALC,INVALC,INVALC,0x5A27,
-	0x5D54,INVALC,0x6A23,INVALC,INVALC,INVALC,0x5643,0x5674,
-	INVALC,0x5A5F,INVALC,0x6F33,INVALC,INVALC,INVALC,INVALC,
-	/* Block 152, Array index 0x5A00 */
-	0x624D,INVALC,INVALC,INVALC,INVALC,INVALC,0x6F7D,0x7268,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6F45,INVALC,0x6767,INVALC,INVALC,0x577D,INVALC,
-	INVALC,0x674E,INVALC,INVALC,0x5F5C,INVALC,0x7947,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5976,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5F2C,INVALC,0x565A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5C24,INVALC,INVALC,INVALC,0x7038,INVALC,INVALC,
-	INVALC,INVALC,0x557A,INVALC,0x6477,INVALC,INVALC,INVALC,
-	0x5644,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x746C,INVALC,INVALC,INVALC,INVALC,0x6F7E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7021,INVALC,0x5E2A,INVALC,
-	INVALC,0x5A3C,0x587C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7A54,INVALC,INVALC,INVALC,0x6C65,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7C28,INVALC,INVALC,0x6C66,
-	INVALC,INVALC,0x584B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7B39,INVALC,0x6453,INVALC,0x4D79,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4F53,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4A6A,INVALC,INVALC,0x4F54,INVALC,0x783D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7447,INVALC,
-	INVALC,INVALC,INVALC,0x6A5F,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x795B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5437,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6B65,INVALC,INVALC,0x6152,INVALC,
-	INVALC,INVALC,INVALC,0x6A24,INVALC,INVALC,INVALC,0x7A42,
-	/* Block 153, Array index 0x5B00 */
-	0x7B61,0x7A6D,0x7022,0x4C71,INVALC,0x7A23,0x6277,INVALC,
-	0x624E,INVALC,0x6975,INVALC,0x616B,INVALC,INVALC,INVALC,
-	0x6768,0x6857,0x5A78,0x544B,INVALC,INVALC,INVALC,0x7776,
-	0x5645,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5469,INVALC,INVALC,
-	0x7A7A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4C72,0x775D,INVALC,0x5E3A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4E28,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x7039,0x647E,0x6449,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x6454,INVALC,INVALC,INVALC,
-	0x6A43,INVALC,0x6F34,INVALC,INVALC,INVALC,0x573E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7B62,INVALC,0x4D53,
-	INVALC,INVALC,INVALC,0x6F35,INVALC,INVALC,INVALC,0x7A69,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7926,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5F3D,
-	INVALC,0x7747,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x787D,INVALC,INVALC,0x787C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E2B,0x5B68,INVALC,INVALC,0x635D,
-	INVALC,0x6162,0x5146,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7650,0x6B66,0x5A79,
-	INVALC,INVALC,INVALC,INVALC,0x6C47,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5E78,0x7869,0x635E,INVALC,
-	/* Block 154, Array index 0x5C00 */
-	INVALC,INVALC,INVALC,0x4E75,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x7A43,0x6557,INVALC,0x6C48,INVALC,INVALC,INVALC,
-	0x7349,INVALC,INVALC,0x643B,INVALC,INVALC,INVALC,INVALC,
-	0x662E,INVALC,INVALC,INVALC,INVALC,INVALC,0x6F36,INVALC,
-	0x5C3F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4E3D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5843,INVALC,INVALC,
-	INVALC,0x504F,INVALC,0x4F7A,0x734A,0x6057,INVALC,INVALC,
-	INVALC,0x5147,0x692E,INVALC,0x683D,INVALC,INVALC,0x7A44,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x624F,INVALC,
-	INVALC,0x7A45,INVALC,INVALC,INVALC,0x7938,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5C60,INVALC,INVALC,
-	0x7B30,INVALC,INVALC,INVALC,0x5829,0x655F,0x7927,INVALC,
-	INVALC,0x766E,INVALC,0x764C,0x6278,INVALC,INVALC,INVALC,
-	INVALC,0x6C71,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5A60,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7152,0x524C,0x4F4B,INVALC,INVALC,0x4A3D,INVALC,INVALC,
-	INVALC,0x5D3F,INVALC,INVALC,INVALC,0x766F,INVALC,0x5E79,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7A34,INVALC,INVALC,
-	INVALC,0x552D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x7167,
-	/* Block 155, Array index 0x5D00 */
-	INVALC,0x5E3E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5C40,INVALC,INVALC,INVALC,INVALC,INVALC,0x5148,0x5149,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x783E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4B76,INVALC,INVALC,INVALC,INVALC,
-	0x5479,INVALC,INVALC,INVALC,INVALC,INVALC,0x7562,0x6153,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x5869,INVALC,INVALC,0x787E,INVALC,0x4F4C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7D24,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4E76,INVALC,0x7A50,
-	INVALC,INVALC,0x4C73,0x663E,INVALC,INVALC,INVALC,0x762E,
-	INVALC,INVALC,0x5570,INVALC,INVALC,0x514A,INVALC,INVALC,
-	INVALC,0x7C3E,0x5571,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4D69,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7A35,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6250,0x7477,INVALC,INVALC,INVALC,
-	0x4D54,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6723,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5B25,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 156, Array index 0x5E00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6251,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5722,
-	INVALC,INVALC,0x7763,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x6A26,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5021,INVALC,INVALC,INVALC,
-	INVALC,0x4E5A,0x7B6B,0x5B26,0x5B5E,0x5865,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6A60,
-	INVALC,INVALC,INVALC,INVALC,0x582A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6560,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x565B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6F46,INVALC,
-	INVALC,0x786A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6455,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4E77,INVALC,INVALC,0x6058,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x576F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x746D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4D66,INVALC,INVALC,INVALC,
-	0x4C74,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 157, Array index 0x5F00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7563,INVALC,INVALC,
-	0x644A,INVALC,0x5C61,INVALC,INVALC,0x7948,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7C3F,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6827,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5844,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4B3E,
-	INVALC,0x5C2E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x5777,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x7068,INVALC,0x5D40,
-	INVALC,0x4F4D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5C73,0x5930,INVALC,0x6669,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 158, Array index 0x6000 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x643C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x6A44,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x646C,INVALC,
-	0x6465,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x7B78,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4C3B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x643D,INVALC,INVALC,
-	0x4D5C,0x5977,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5D5F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6D4E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x5950,INVALC,INVALC,INVALC,INVALC,INVALC,0x6523,
-	INVALC,INVALC,INVALC,INVALC,0x794D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4D2E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4F4E,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x762F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x7D53,0x6B6D,0x565C,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 159, Array index 0x6100 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x6524,INVALC,INVALC,INVALC,0x5536,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x565D,INVALC,INVALC,
-	INVALC,0x7969,INVALC,INVALC,INVALC,0x6724,INVALC,0x5663,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x514B,0x5664,INVALC,INVALC,INVALC,0x5572,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5E7A,INVALC,0x5778,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x586A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4F55,0x587D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x582B,INVALC,INVALC,0x7D4B,INVALC,
-	INVALC,INVALC,INVALC,0x7C5C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x6028,0x5573,INVALC,
-	INVALC,0x7D59,INVALC,INVALC,0x4C23,INVALC,INVALC,INVALC,
-	0x5979,INVALC,INVALC,0x536A,0x7575,INVALC,0x6F47,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x535A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x5A3D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 160, Array index 0x6200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6828,
-	0x5C2F,INVALC,INVALC,INVALC,INVALC,INVALC,0x7023,INVALC,
-	INVALC,INVALC,INVALC,0x4D55,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x6029,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x5E2C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x703A,0x6E31,INVALC,INVALC,0x6E32,INVALC,
-	INVALC,INVALC,0x764D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x6E52,
-	INVALC,0x5646,INVALC,INVALC,INVALC,INVALC,INVALC,0x6065,
-	INVALC,INVALC,0x733B,INVALC,0x6561,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x644B,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x5723,INVALC,INVALC,
-	0x5B42,INVALC,INVALC,INVALC,INVALC,0x4A7E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4F4F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 173, Array index 0x6300 */
-	0x3021,0x3022,INVALC,INVALC,0x3023,INVALC,INVALC,0x3024,
-	0x3025,0x3026,0x3027,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3028,0x3029,0x302A,0x302B,0x302C,0x302D,0x302E,0x302F,
-	INVALC,0x3030,0x3031,0x3032,0x3033,0x3034,INVALC,INVALC,
-	0x3035,INVALC,INVALC,INVALC,0x3036,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3037,0x3038,INVALC,0x3039,
-	0x303A,0x303B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x303C,0x303D,INVALC,INVALC,0x303E,INVALC,INVALC,INVALC,
-	0x303F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3040,INVALC,0x3041,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3042,INVALC,INVALC,INVALC,
-	0x3043,INVALC,INVALC,INVALC,0x3044,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3045,0x3046,INVALC,INVALC,0x3047,INVALC,INVALC,0x3048,
-	0x3049,INVALC,0x304A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x304B,0x304C,INVALC,0x304D,0x304E,0x304F,0x3050,INVALC,
-	INVALC,0x3051,0x3052,0x3053,0x3054,INVALC,INVALC,INVALC,
-	0x3055,INVALC,INVALC,INVALC,0x3056,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3057,0x3058,INVALC,0x3059,
-	0x305A,0x305B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x305C,0x305D,0x305E,INVALC,0x305F,INVALC,INVALC,0x3060,
-	0x3061,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3062,0x3063,INVALC,0x3064,0x3065,0x3066,INVALC,INVALC,
-	INVALC,0x3067,INVALC,INVALC,0x3068,INVALC,INVALC,INVALC,
-	0x3069,INVALC,INVALC,INVALC,0x306A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x306B,INVALC,0x306C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x306D,0x306E,INVALC,INVALC,0x306F,INVALC,INVALC,0x3070,
-	0x3071,INVALC,0x3072,INVALC,0x3073,INVALC,INVALC,0x3074,
-	0x3075,0x3076,INVALC,0x3077,INVALC,0x3078,0x3079,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x307A,0x307B,INVALC,INVALC,
-	/* Block 174, Array index 0x6400 */
-	0x307C,INVALC,INVALC,INVALC,0x307D,INVALC,0x307E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3121,0x3122,INVALC,0x3123,
-	INVALC,0x3124,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3125,INVALC,INVALC,INVALC,0x3126,INVALC,INVALC,INVALC,
-	0x3127,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3128,INVALC,INVALC,0x3129,0x312A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x312B,0x312C,INVALC,INVALC,
-	0x312D,INVALC,INVALC,INVALC,0x312E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x312F,0x3130,INVALC,0x3131,
-	INVALC,0x3132,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3133,INVALC,INVALC,INVALC,0x3134,INVALC,INVALC,INVALC,
-	0x3135,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3136,INVALC,0x3137,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3138,0x3139,INVALC,INVALC,
-	0x313A,INVALC,INVALC,0x313B,0x313C,0x313D,0x313E,INVALC,
-	INVALC,INVALC,INVALC,0x313F,0x3140,0x3141,INVALC,0x3142,
-	INVALC,0x3143,0x3144,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3145,0x3146,INVALC,INVALC,0x3147,INVALC,INVALC,INVALC,
-	0x3148,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3149,0x314A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x314B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x314C,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x314D,0x314E,INVALC,INVALC,0x314F,INVALC,INVALC,INVALC,
-	0x3150,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3151,0x3152,INVALC,0x3153,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3154,INVALC,INVALC,INVALC,
-	0x3155,INVALC,INVALC,INVALC,0x3156,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3157,0x3158,INVALC,INVALC,0x3159,INVALC,INVALC,0x315A,
-	/* Block 175, Array index 0x6500 */
-	0x315B,0x315C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x315D,0x315E,INVALC,0x315F,INVALC,0x3160,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3161,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3162,0x3163,INVALC,INVALC,0x3164,INVALC,INVALC,0x3165,
-	0x3166,INVALC,0x3167,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3168,0x3169,INVALC,0x316A,INVALC,0x316B,0x316C,INVALC,
-	INVALC,INVALC,0x316D,INVALC,0x316E,0x316F,0x3170,INVALC,
-	0x3171,INVALC,INVALC,INVALC,0x3172,INVALC,0x3173,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3174,0x3175,INVALC,0x3176,
-	0x3177,0x3178,INVALC,INVALC,INVALC,0x3179,INVALC,INVALC,
-	0x317A,0x317B,INVALC,INVALC,0x317C,INVALC,INVALC,INVALC,
-	0x317D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x317E,0x3221,INVALC,0x3222,0x3223,0x3224,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3225,0x3226,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3227,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3228,0x3229,0x322A,INVALC,
-	0x322B,INVALC,INVALC,INVALC,0x322C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x322D,0x322E,INVALC,0x322F,
-	0x3230,0x3231,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3232,0x3233,INVALC,INVALC,0x3234,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3235,INVALC,INVALC,0x3236,INVALC,0x3237,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3238,INVALC,INVALC,INVALC,
-	0x3239,INVALC,INVALC,INVALC,0x323A,INVALC,INVALC,INVALC,
-	/* Block 176, Array index 0x6600 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x323B,
-	0x323C,INVALC,INVALC,INVALC,INVALC,0x323D,INVALC,INVALC,
-	0x323E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x323F,0x3240,INVALC,INVALC,
-	0x3241,INVALC,0x3242,INVALC,0x3243,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3244,0x3245,INVALC,0x3246,
-	INVALC,0x3247,0x3248,0x3249,INVALC,INVALC,INVALC,INVALC,
-	0x324A,0x324B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x324C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x324D,0x324E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x324F,0x3250,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3251,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3252,INVALC,INVALC,INVALC,0x3253,INVALC,INVALC,INVALC,
-	0x3254,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3255,0x3256,INVALC,INVALC,INVALC,0x3257,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3258,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3259,0x325A,INVALC,INVALC,0x325B,INVALC,INVALC,INVALC,
-	0x325C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x325D,
-	0x325E,0x325F,INVALC,0x3260,INVALC,0x3261,0x3262,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3263,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3264,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3265,0x3266,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3267,0x3268,INVALC,INVALC,0x3269,INVALC,INVALC,INVALC,
-	0x326A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 177, Array index 0x6700 */
-	0x326B,0x326C,INVALC,INVALC,0x326D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x326E,INVALC,INVALC,INVALC,
-	0x326F,INVALC,INVALC,INVALC,0x3270,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3271,0x3272,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3273,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3274,0x3275,INVALC,INVALC,
-	0x3276,INVALC,0x3277,INVALC,0x3278,INVALC,0x3279,INVALC,
-	INVALC,INVALC,INVALC,0x327A,0x327B,0x327C,INVALC,0x327D,
-	INVALC,0x327E,INVALC,INVALC,INVALC,0x3321,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3322,0x3323,INVALC,INVALC,
-	0x3324,INVALC,INVALC,INVALC,0x3325,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3326,0x3327,INVALC,0x3328,
-	INVALC,0x3329,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x332A,0x332B,0x332C,INVALC,0x332D,INVALC,INVALC,0x332E,
-	0x332F,0x3330,0x3331,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3332,0x3333,INVALC,0x3334,0x3335,0x3336,0x3337,0x3338,
-	INVALC,0x3339,INVALC,0x333A,0x333B,0x333C,INVALC,INVALC,
-	0x333D,INVALC,INVALC,INVALC,0x333E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x333F,0x3340,INVALC,0x3341,
-	0x3342,0x3343,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3344,0x3345,INVALC,INVALC,0x3346,INVALC,INVALC,INVALC,
-	0x3347,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3348,INVALC,INVALC,INVALC,INVALC,0x3349,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 178, Array index 0x6800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x334A,0x334B,INVALC,0x334C,0x334D,INVALC,INVALC,INVALC,
-	0x334E,INVALC,0x334F,0x3350,INVALC,INVALC,INVALC,INVALC,
-	0x3351,0x3352,INVALC,0x3353,0x3354,0x3355,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3356,0x3357,0x3358,INVALC,INVALC,
-	0x3359,INVALC,INVALC,INVALC,0x335A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x335B,0x335C,INVALC,0x335D,
-	0x335E,0x335F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3360,0x3361,INVALC,INVALC,0x3362,INVALC,INVALC,INVALC,
-	0x3363,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3364,0x3365,INVALC,INVALC,0x3366,0x3367,INVALC,INVALC,
-	0x3368,INVALC,INVALC,INVALC,0x3369,INVALC,INVALC,INVALC,
-	0x336A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x336B,0x336C,INVALC,INVALC,0x336D,INVALC,INVALC,INVALC,
-	0x336E,INVALC,0x336F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3370,0x3371,INVALC,0x3372,INVALC,0x3373,INVALC,INVALC,
-	INVALC,INVALC,0x3374,0x3375,0x3376,INVALC,INVALC,INVALC,
-	0x3377,INVALC,INVALC,INVALC,0x3378,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3379,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x337A,INVALC,INVALC,INVALC,
-	0x337B,INVALC,INVALC,INVALC,0x337C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x337D,0x337E,INVALC,0x3421,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3422,0x3423,INVALC,INVALC,0x3424,INVALC,INVALC,INVALC,
-	0x3425,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3426,INVALC,0x3427,INVALC,0x3428,INVALC,INVALC,
-	/* Block 179, Array index 0x6900 */
-	INVALC,INVALC,INVALC,INVALC,0x3429,0x342A,INVALC,INVALC,
-	0x342B,INVALC,INVALC,0x342C,0x342D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x342E,0x342F,INVALC,0x3430,
-	INVALC,0x3431,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3432,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3433,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3434,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3435,INVALC,INVALC,INVALC,0x3436,INVALC,INVALC,INVALC,
-	0x3437,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3438,0x3439,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x343A,0x343B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x343C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x343D,0x343E,INVALC,INVALC,
-	INVALC,0x343F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3440,0x3441,INVALC,INVALC,0x3442,INVALC,INVALC,INVALC,
-	0x3443,0x3444,0x3445,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3446,0x3447,INVALC,0x3448,INVALC,0x3449,0x344A,INVALC,
-	INVALC,INVALC,0x344B,INVALC,0x344C,INVALC,INVALC,INVALC,
-	0x344D,INVALC,INVALC,INVALC,0x344E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x344F,0x3450,INVALC,INVALC,0x3451,INVALC,INVALC,INVALC,
-	0x3452,INVALC,0x3453,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3454,0x3455,INVALC,0x3456,INVALC,0x3457,INVALC,INVALC,
-	INVALC,INVALC,0x3458,INVALC,0x3459,0x345A,0x345B,INVALC,
-	0x345C,INVALC,INVALC,0x345D,0x345E,0x345F,0x3460,0x3461,
-	INVALC,INVALC,INVALC,0x3462,0x3463,0x3464,INVALC,0x3465,
-	0x3466,0x3467,0x3468,0x3469,INVALC,INVALC,INVALC,0x346A,
-	/* Block 180, Array index 0x6A00 */
-	0x346B,0x346C,INVALC,INVALC,0x346D,INVALC,INVALC,INVALC,
-	0x346E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x346F,0x3470,INVALC,0x3471,0x3472,0x3473,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3474,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3475,0x3476,0x3477,INVALC,
-	0x3478,INVALC,INVALC,0x3479,0x347A,INVALC,0x347B,0x347C,
-	INVALC,INVALC,INVALC,INVALC,0x347D,0x347E,INVALC,0x3521,
-	INVALC,0x3522,INVALC,0x3523,INVALC,INVALC,0x3524,INVALC,
-	0x3525,0x3526,INVALC,INVALC,0x3527,INVALC,INVALC,INVALC,
-	0x3528,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3529,0x352A,INVALC,0x352B,0x352C,0x352D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x352E,INVALC,INVALC,INVALC,
-	0x352F,INVALC,INVALC,INVALC,0x3530,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3531,0x3532,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3533,INVALC,INVALC,INVALC,0x3534,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3535,0x3536,INVALC,INVALC,
-	0x3537,INVALC,INVALC,0x3538,0x3539,INVALC,0x353A,INVALC,
-	0x353B,INVALC,INVALC,INVALC,0x353C,0x353D,INVALC,0x353E,
-	INVALC,0x353F,INVALC,0x3540,INVALC,0x3541,INVALC,INVALC,
-	0x3542,INVALC,INVALC,INVALC,0x3543,INVALC,INVALC,INVALC,
-	0x3544,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3545,INVALC,INVALC,INVALC,
-	/* Block 181, Array index 0x6B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3546,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3547,INVALC,INVALC,INVALC,0x3548,INVALC,INVALC,INVALC,
-	0x3549,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x354A,0x354B,INVALC,0x354C,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x354D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x354E,0x354F,INVALC,INVALC,0x3550,INVALC,INVALC,INVALC,
-	0x3551,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3552,0x3553,INVALC,0x3554,INVALC,0x3555,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3556,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3557,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3558,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3559,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x355A,INVALC,INVALC,INVALC,
-	0x355B,INVALC,INVALC,INVALC,0x355C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x355D,INVALC,0x355E,
-	INVALC,0x355F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3560,INVALC,INVALC,INVALC,0x3561,INVALC,INVALC,INVALC,
-	0x3562,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3563,INVALC,INVALC,INVALC,INVALC,0x3564,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3565,0x3566,INVALC,INVALC,
-	0x3567,INVALC,INVALC,0x3568,0x3569,INVALC,0x356A,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x356B,0x356C,INVALC,0x356D,
-	INVALC,0x356E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x356F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 182, Array index 0x6C00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3570,0x3571,INVALC,INVALC,
-	0x3572,INVALC,INVALC,0x3573,0x3574,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3575,0x3576,INVALC,0x3577,
-	0x3578,0x3579,0x357A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x357B,0x357C,INVALC,INVALC,0x357D,INVALC,INVALC,INVALC,
-	0x357E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3621,0x3622,INVALC,0x3623,0x3624,0x3625,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3626,0x3627,0x3628,INVALC,INVALC,
-	0x3629,INVALC,INVALC,INVALC,0x362A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x362B,0x362C,INVALC,0x362D,
-	0x362E,0x362F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3630,0x3631,INVALC,INVALC,0x3632,INVALC,INVALC,INVALC,
-	0x3633,INVALC,0x3634,0x3635,INVALC,INVALC,INVALC,INVALC,
-	0x3636,0x3637,INVALC,0x3638,0x3639,0x363A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x363B,0x363C,0x363D,INVALC,INVALC,
-	0x363E,INVALC,INVALC,INVALC,0x363F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3640,0x3641,INVALC,0x3642,
-	0x3643,0x3644,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3645,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3646,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 183, Array index 0x6D00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3647,0x3648,INVALC,INVALC,0x3649,INVALC,INVALC,INVALC,
-	0x364A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x364B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x364C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x364D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x364E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x364F,INVALC,INVALC,INVALC,
-	0x3650,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3651,0x3652,INVALC,INVALC,
-	0x3653,INVALC,INVALC,INVALC,0x3654,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3655,0x3656,INVALC,INVALC,INVALC,
-	INVALC,0x3657,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3658,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3659,INVALC,INVALC,INVALC,0x365A,INVALC,INVALC,INVALC,
-	0x365B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 184, Array index 0x6E00 */
-	0x365C,0x365D,INVALC,INVALC,INVALC,0x365E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x365F,0x3660,INVALC,INVALC,0x3661,INVALC,INVALC,0x3662,
-	0x3663,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3664,0x3665,INVALC,0x3666,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3667,INVALC,INVALC,INVALC,
-	0x3668,INVALC,INVALC,INVALC,0x3669,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x366A,0x366B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x366C,INVALC,INVALC,INVALC,0x366D,INVALC,INVALC,INVALC,
-	0x366E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x366F,0x3670,INVALC,0x3671,INVALC,0x3672,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3673,0x3674,INVALC,INVALC,
-	0x3675,INVALC,INVALC,INVALC,0x3676,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3677,0x3678,INVALC,0x3679,
-	0x367A,0x367B,0x367C,INVALC,INVALC,INVALC,0x367D,0x367E,
-	0x3721,0x3722,INVALC,INVALC,0x3723,INVALC,INVALC,INVALC,
-	0x3724,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3725,0x3726,INVALC,0x3727,0x3728,0x3729,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x372A,0x372B,INVALC,INVALC,
-	0x372C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x372D,
-	INVALC,0x372E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x372F,0x3730,INVALC,INVALC,
-	0x3731,INVALC,INVALC,INVALC,0x3732,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3733,0x3734,INVALC,0x3735,
-	/* Block 185, Array index 0x6F00 */
-	0x3736,0x3737,INVALC,INVALC,INVALC,INVALC,INVALC,0x3738,
-	0x3739,0x373A,INVALC,INVALC,0x373B,INVALC,INVALC,INVALC,
-	0x373C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x373D,0x373E,INVALC,0x373F,INVALC,0x3740,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3741,0x3742,INVALC,INVALC,
-	0x3743,INVALC,INVALC,INVALC,0x3744,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3745,0x3746,INVALC,0x3747,
-	0x3748,0x3749,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x374A,INVALC,INVALC,INVALC,0x374B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x374C,INVALC,0x374D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x374E,0x374F,INVALC,INVALC,
-	0x3750,INVALC,INVALC,INVALC,0x3751,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3752,0x3753,INVALC,0x3754,
-	INVALC,0x3755,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3756,INVALC,INVALC,INVALC,0x3757,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3758,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3759,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x375A,INVALC,INVALC,INVALC,0x375B,INVALC,INVALC,INVALC,
-	0x375C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x375D,0x375E,INVALC,0x375F,INVALC,0x3760,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3761,INVALC,INVALC,INVALC,
-	0x3762,INVALC,INVALC,INVALC,0x3763,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3764,INVALC,0x3765,
-	INVALC,0x3766,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3767,0x3768,INVALC,INVALC,0x3769,INVALC,INVALC,INVALC,
-	0x376A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x376B,0x376C,INVALC,0x376D,INVALC,0x376E,INVALC,INVALC,
-	/* Block 186, Array index 0x7000 */
-	INVALC,INVALC,INVALC,INVALC,0x376F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3770,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3771,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3772,0x3773,INVALC,INVALC,
-	0x3774,INVALC,INVALC,INVALC,0x3775,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3776,INVALC,INVALC,0x3777,
-	INVALC,0x3778,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3779,0x377A,INVALC,INVALC,0x377B,INVALC,INVALC,INVALC,
-	0x377C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x377D,0x377E,INVALC,0x3821,INVALC,0x3822,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3823,0x3824,INVALC,INVALC,
-	0x3825,INVALC,INVALC,INVALC,0x3826,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3827,0x3828,INVALC,0x3829,
-	INVALC,0x382A,0x382B,INVALC,INVALC,0x382C,0x382D,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x382E,0x382F,INVALC,INVALC,
-	0x3830,INVALC,INVALC,INVALC,0x3831,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3832,0x3833,INVALC,0x3834,
-	INVALC,0x3835,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3836,0x3837,INVALC,INVALC,0x3838,INVALC,0x3839,0x383A,
-	0x383B,0x383C,0x383D,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x383E,0x383F,INVALC,0x3840,INVALC,0x3841,0x3842,INVALC,
-	INVALC,0x3843,INVALC,0x3844,0x3845,0x3846,INVALC,INVALC,
-	0x3847,INVALC,INVALC,INVALC,0x3848,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3849,0x384A,INVALC,0x384B,
-	0x384C,0x384D,0x384E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 187, Array index 0x7100 */
-	0x384F,0x3850,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3851,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3852,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3853,0x3854,INVALC,INVALC,0x3855,INVALC,INVALC,INVALC,
-	0x3856,INVALC,0x3857,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3858,0x3859,INVALC,0x385A,INVALC,0x385B,0x385C,INVALC,
-	INVALC,INVALC,INVALC,0x385D,0x385E,0x385F,INVALC,INVALC,
-	0x3860,INVALC,INVALC,INVALC,0x3861,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3862,0x3863,INVALC,0x3864,
-	0x3865,0x3866,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3867,0x3868,INVALC,INVALC,0x3869,INVALC,INVALC,INVALC,
-	0x386A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x386B,0x386C,0x386D,INVALC,0x386E,
-	INVALC,INVALC,INVALC,INVALC,0x386F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3870,0x3871,INVALC,0x3872,0x3873,INVALC,INVALC,INVALC,
-	0x3874,INVALC,0x3875,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3876,0x3877,INVALC,0x3878,INVALC,0x3879,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x387A,INVALC,INVALC,INVALC,
-	0x387B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x387C,0x387D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x387E,INVALC,INVALC,INVALC,
-	/* Block 188, Array index 0x7200 */
-	0x3921,INVALC,INVALC,INVALC,0x3922,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3923,INVALC,0x3924,
-	INVALC,0x3925,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3926,INVALC,INVALC,INVALC,0x3927,INVALC,INVALC,INVALC,
-	0x3928,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3929,INVALC,0x392A,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x392B,0x392C,0x392D,INVALC,
-	0x392E,INVALC,INVALC,0x392F,0x3930,0x3931,0x3932,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3933,0x3934,INVALC,0x3935,
-	INVALC,0x3936,INVALC,INVALC,INVALC,0x3937,INVALC,0x3938,
-	0x3939,INVALC,INVALC,INVALC,0x393A,INVALC,INVALC,INVALC,
-	0x393B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x393C,INVALC,0x393D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x393E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x393F,INVALC,INVALC,INVALC,0x3940,INVALC,INVALC,INVALC,
-	0x3941,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3942,INVALC,INVALC,INVALC,
-	0x3943,INVALC,INVALC,INVALC,0x3944,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3945,INVALC,INVALC,0x3946,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3947,INVALC,INVALC,INVALC,0x3948,INVALC,INVALC,INVALC,
-	0x3949,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x394A,INVALC,INVALC,0x394B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x394C,0x394D,INVALC,INVALC,0x394E,INVALC,INVALC,0x394F,
-	/* Block 189, Array index 0x7300 */
-	0x3950,INVALC,0x3951,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3952,0x3953,INVALC,0x3954,0x3955,0x3956,INVALC,0x3957,
-	INVALC,0x3958,INVALC,INVALC,0x3959,0x395A,0x395B,0x395C,
-	0x395D,INVALC,INVALC,0x395E,0x395F,0x3960,0x3961,0x3962,
-	INVALC,INVALC,INVALC,INVALC,0x3963,0x3964,INVALC,0x3965,
-	INVALC,0x3966,INVALC,INVALC,INVALC,0x3967,INVALC,INVALC,
-	0x3968,0x3969,INVALC,INVALC,0x396A,INVALC,INVALC,INVALC,
-	0x396B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x396C,0x396D,INVALC,0x396E,0x396F,0x3970,INVALC,INVALC,
-	INVALC,0x3971,INVALC,INVALC,0x3972,0x3973,INVALC,INVALC,
-	0x3974,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3975,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3976,0x3977,INVALC,INVALC,
-	0x3978,INVALC,INVALC,0x3979,0x397A,INVALC,0x397B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x397C,0x397D,INVALC,0x397E,
-	INVALC,0x3A21,0x3A22,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A23,0x3A24,INVALC,INVALC,0x3A25,INVALC,INVALC,0x3A26,
-	0x3A27,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A28,0x3A29,INVALC,0x3A2A,0x3A2B,0x3A2C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A2D,0x3A2E,INVALC,INVALC,
-	0x3A2F,INVALC,INVALC,INVALC,0x3A30,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3A31,INVALC,0x3A32,
-	0x3A33,0x3A34,INVALC,INVALC,INVALC,0x3A35,INVALC,INVALC,
-	0x3A36,INVALC,INVALC,INVALC,0x3A37,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A38,0x3A39,0x3A3A,INVALC,
-	0x3A3B,INVALC,INVALC,INVALC,0x3A3C,INVALC,INVALC,INVALC,
-	/* Block 190, Array index 0x7400 */
-	INVALC,INVALC,INVALC,INVALC,0x3A3D,0x3A3E,INVALC,0x3A3F,
-	INVALC,0x3A40,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A41,INVALC,INVALC,INVALC,0x3A42,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A43,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A44,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A45,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A46,0x3A47,INVALC,INVALC,0x3A48,INVALC,INVALC,INVALC,
-	0x3A49,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A4A,0x3A4B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A4C,INVALC,INVALC,INVALC,
-	0x3A4D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A4E,0x3A4F,INVALC,INVALC,0x3A50,INVALC,INVALC,0x3A51,
-	0x3A52,0x3A53,0x3A54,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A55,0x3A56,INVALC,0x3A57,INVALC,0x3A58,INVALC,INVALC,
-	INVALC,0x3A59,0x3A5A,INVALC,0x3A5B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A5C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A5D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A5E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A5F,0x3A60,INVALC,INVALC,
-	0x3A61,INVALC,INVALC,INVALC,0x3A62,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3A63,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3A64,INVALC,INVALC,INVALC,0x3A65,INVALC,INVALC,INVALC,
-	0x3A66,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 191, Array index 0x7500 */
-	0x3A67,INVALC,INVALC,0x3A68,INVALC,0x3A69,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A6A,0x3A6B,INVALC,INVALC,
-	0x3A6C,INVALC,INVALC,INVALC,0x3A6D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A6E,0x3A6F,INVALC,0x3A70,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A71,0x3A72,INVALC,INVALC,
-	0x3A73,INVALC,INVALC,INVALC,0x3A74,INVALC,0x3A75,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3A76,0x3A77,INVALC,0x3A78,
-	INVALC,0x3A79,0x3A7A,0x3A7B,INVALC,INVALC,INVALC,INVALC,
-	0x3A7C,0x3A7D,INVALC,INVALC,0x3A7E,INVALC,INVALC,INVALC,
-	0x3B21,INVALC,0x3B22,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B23,0x3B24,INVALC,0x3B25,0x3B26,0x3B27,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3B28,0x3B29,0x3B2A,INVALC,INVALC,
-	0x3B2B,INVALC,INVALC,INVALC,0x3B2C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3B2D,0x3B2E,INVALC,0x3B2F,
-	0x3B30,0x3B31,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B32,0x3B33,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B34,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B35,0x3B36,INVALC,INVALC,0x3B37,INVALC,INVALC,0x3B38,
-	0x3B39,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B3A,INVALC,INVALC,0x3B3B,0x3B3C,0x3B3D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3B3E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 192, Array index 0x7600 */
-	INVALC,0x3B3F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B40,0x3B41,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B42,0x3B43,INVALC,0x3B44,0x3B45,0x3B46,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B47,0x3B48,INVALC,INVALC,0x3B49,INVALC,INVALC,INVALC,
-	0x3B4A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B4B,0x3B4C,INVALC,INVALC,INVALC,0x3B4D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3B4E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B4F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3B50,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3B51,0x3B52,INVALC,INVALC,
-	0x3B53,INVALC,INVALC,INVALC,0x3B54,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3B55,INVALC,INVALC,0x3B56,
-	INVALC,0x3B57,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 193, Array index 0x7700 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3B58,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3B59,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B5A,INVALC,INVALC,INVALC,0x3B5B,INVALC,INVALC,INVALC,
-	0x3B5C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B5D,0x3B5E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B5F,0x3B60,INVALC,INVALC,0x3B61,INVALC,INVALC,INVALC,
-	0x3B62,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B63,0x3B64,INVALC,0x3B65,INVALC,0x3B66,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3B67,0x3B68,INVALC,0x3B69,
-	0x3B6A,INVALC,INVALC,0x3B6B,0x3B6C,0x3B6D,0x3B6E,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3B6F,0x3B70,INVALC,0x3B71,
-	0x3B72,0x3B73,INVALC,INVALC,INVALC,0x3B74,INVALC,INVALC,
-	0x3B75,0x3B76,INVALC,INVALC,0x3B77,INVALC,INVALC,INVALC,
-	0x3B78,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3B79,0x3B7A,INVALC,0x3B7B,0x3B7C,0x3B7D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3B7E,0x3C21,INVALC,INVALC,
-	0x3C22,INVALC,INVALC,INVALC,0x3C23,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C24,0x3C25,INVALC,0x3C26,
-	INVALC,0x3C27,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 194, Array index 0x7800 */
-	0x3C28,INVALC,INVALC,INVALC,0x3C29,INVALC,INVALC,INVALC,
-	0x3C2A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C2B,INVALC,INVALC,INVALC,INVALC,0x3C2C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C2D,0x3C2E,0x3C2F,0x3C30,
-	0x3C31,INVALC,INVALC,0x3C32,0x3C33,INVALC,0x3C34,0x3C35,
-	INVALC,INVALC,INVALC,INVALC,0x3C36,0x3C37,INVALC,0x3C38,
-	0x3C39,0x3C3A,INVALC,INVALC,INVALC,INVALC,0x3C3B,INVALC,
-	0x3C3C,0x3C3D,INVALC,INVALC,0x3C3E,INVALC,INVALC,INVALC,
-	0x3C3F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C40,0x3C41,INVALC,0x3C42,0x3C43,0x3C44,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C45,0x3C46,INVALC,INVALC,
-	0x3C47,INVALC,INVALC,INVALC,0x3C48,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C49,0x3C4A,INVALC,0x3C4B,
-	0x3C4C,0x3C4D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C4E,INVALC,INVALC,INVALC,0x3C4F,INVALC,INVALC,INVALC,
-	0x3C50,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3C51,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C52,0x3C53,0x3C54,INVALC,
-	0x3C55,INVALC,INVALC,INVALC,0x3C56,INVALC,0x3C57,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C58,0x3C59,INVALC,0x3C5A,
-	INVALC,0x3C5B,INVALC,INVALC,INVALC,0x3C5C,INVALC,INVALC,
-	0x3C5D,0x3C5E,INVALC,INVALC,0x3C5F,INVALC,INVALC,INVALC,
-	0x3C60,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3C61,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C62,INVALC,INVALC,INVALC,
-	0x3C63,INVALC,INVALC,INVALC,0x3C64,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C65,INVALC,INVALC,0x3C66,
-	0x3C67,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C68,INVALC,INVALC,INVALC,0x3C69,INVALC,INVALC,INVALC,
-	0x3C6A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C6B,0x3C6C,INVALC,0x3C6D,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C6E,0x3C6F,INVALC,INVALC,
-	/* Block 195, Array index 0x7900 */
-	0x3C70,INVALC,INVALC,INVALC,0x3C71,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3C72,0x3C73,INVALC,0x3C74,
-	INVALC,0x3C75,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C76,0x3C77,INVALC,INVALC,0x3C78,INVALC,INVALC,0x3C79,
-	0x3C7A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3C7B,0x3C7C,INVALC,0x3C7D,INVALC,0x3C7E,INVALC,0x3D21,
-	INVALC,0x3D22,0x3D23,INVALC,0x3D24,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D25,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D26,0x3D27,INVALC,INVALC,0x3D28,INVALC,INVALC,INVALC,
-	0x3D29,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D2A,INVALC,INVALC,INVALC,INVALC,0x3D2B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D2C,0x3D2D,INVALC,INVALC,
-	0x3D2E,INVALC,INVALC,INVALC,0x3D2F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D30,0x3D31,INVALC,0x3D32,
-	INVALC,0x3D33,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D34,0x3D35,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D36,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D37,INVALC,INVALC,0x3D38,INVALC,0x3D39,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D3A,0x3D3B,INVALC,INVALC,
-	0x3D3C,INVALC,INVALC,INVALC,0x3D3D,0x3D3E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D3F,0x3D40,INVALC,0x3D41,
-	INVALC,0x3D42,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D43,0x3D44,INVALC,INVALC,
-	0x3D45,INVALC,INVALC,0x3D46,0x3D47,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3D48,0x3D49,0x3D4A,INVALC,0x3D4B,
-	INVALC,0x3D4C,INVALC,INVALC,INVALC,INVALC,0x3D4D,INVALC,
-	0x3D4E,0x3D4F,INVALC,0x3D50,0x3D51,INVALC,INVALC,INVALC,
-	/* Block 196, Array index 0x7A00 */
-	0x3D52,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D53,0x3D54,INVALC,INVALC,0x3D55,0x3D56,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x3D57,0x3D58,0x3D59,INVALC,INVALC,
-	0x3D5A,INVALC,INVALC,INVALC,0x3D5B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D5C,0x3D5D,INVALC,INVALC,
-	0x3D5E,0x3D5F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x3D60,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D61,0x3D62,INVALC,INVALC,0x3D63,INVALC,INVALC,INVALC,
-	0x3D64,INVALC,0x3D65,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D66,0x3D67,INVALC,INVALC,0x3D68,0x3D69,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D6A,INVALC,INVALC,INVALC,
-	0x3D6B,INVALC,INVALC,INVALC,0x3D6C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D6D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D6E,0x3D6F,INVALC,INVALC,0x3D70,INVALC,INVALC,0x3D71,
-	0x3D72,INVALC,0x3D73,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D74,0x3D75,INVALC,INVALC,INVALC,0x3D76,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D77,0x3D78,INVALC,INVALC,
-	0x3D79,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 197, Array index 0x7B00 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D7A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3D7B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D7C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3D7D,INVALC,INVALC,INVALC,
-	0x3D7E,INVALC,INVALC,INVALC,0x3E21,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E22,0x3E23,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E24,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E25,0x3E26,INVALC,INVALC,
-	0x3E27,INVALC,INVALC,INVALC,0x3E28,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E29,0x3E2A,INVALC,INVALC,
-	INVALC,0x3E2B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E2C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E2D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E2E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E2F,INVALC,INVALC,INVALC,0x3E30,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3E31,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E32,0x3E33,INVALC,INVALC,0x3E34,INVALC,INVALC,INVALC,
-	0x3E35,INVALC,0x3E36,INVALC,INVALC,INVALC,INVALC,0x3E37,
-	/* Block 198, Array index 0x7C00 */
-	0x3E38,0x3E39,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E3A,INVALC,INVALC,INVALC,
-	0x3E3B,INVALC,INVALC,INVALC,0x3E3C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E3D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E3E,0x3E3F,INVALC,INVALC,0x3E40,INVALC,INVALC,INVALC,
-	0x3E41,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E42,0x3E43,INVALC,0x3E44,INVALC,0x3E45,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E46,0x3E47,INVALC,INVALC,
-	0x3E48,0x3E49,0x3E4A,INVALC,0x3E4B,0x3E4C,0x3E4D,INVALC,
-	INVALC,INVALC,INVALC,0x3E4E,0x3E4F,0x3E50,INVALC,0x3E51,
-	0x3E52,0x3E53,INVALC,INVALC,INVALC,0x3E54,0x3E55,INVALC,
-	0x3E56,0x3E57,INVALC,INVALC,0x3E58,INVALC,INVALC,INVALC,
-	0x3E59,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3E5A,0x3E5B,INVALC,0x3E5C,0x3E5D,0x3E5E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E5F,0x3E60,INVALC,INVALC,
-	0x3E61,INVALC,INVALC,INVALC,0x3E62,INVALC,INVALC,0x3E63,
-	INVALC,INVALC,INVALC,INVALC,0x3E64,0x3E65,INVALC,0x3E66,
-	INVALC,0x3E67,INVALC,INVALC,INVALC,0x3E68,INVALC,0x3E69,
-	0x3E6A,INVALC,INVALC,INVALC,0x3E6B,INVALC,INVALC,INVALC,
-	0x3E6C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x3E6D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E6E,0x3E6F,INVALC,INVALC,
-	0x3E70,0x3E71,INVALC,0x3E72,0x3E73,0x3E74,0x3E75,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3E76,0x3E77,0x3E78,0x3E79,
-	0x3E7A,0x3E7B,0x3E7C,INVALC,0x3E7D,INVALC,0x3E7E,INVALC,
-	0x3F21,0x3F22,INVALC,INVALC,0x3F23,INVALC,INVALC,INVALC,
-	0x3F24,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3F25,0x3F26,INVALC,0x3F27,INVALC,0x3F28,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F29,0x3F2A,0x3F2B,INVALC,
-	0x3F2C,INVALC,INVALC,INVALC,0x3F2D,INVALC,0x3F2E,0x3F2F,
-	INVALC,INVALC,INVALC,INVALC,0x3F30,0x3F31,0x3F32,0x3F33,
-	/* Block 199, Array index 0x7D00 */
-	0x3F34,0x3F35,INVALC,INVALC,INVALC,0x3F36,0x3F37,0x3F38,
-	0x3F39,INVALC,INVALC,INVALC,0x3F3A,INVALC,INVALC,INVALC,
-	0x3F3B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3F3C,0x3F3D,INVALC,0x3F3E,0x3F3F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F40,0x3F41,INVALC,INVALC,
-	0x3F42,INVALC,INVALC,INVALC,0x3F43,0x3F44,0x3F45,INVALC,
-	0x3F46,INVALC,INVALC,0x3F47,0x3F48,0x3F49,INVALC,0x3F4A,
-	INVALC,0x3F4B,INVALC,0x3F4C,INVALC,INVALC,INVALC,INVALC,
-	0x3F4D,0x3F4E,INVALC,INVALC,0x3F4F,INVALC,INVALC,INVALC,
-	0x3F50,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3F51,0x3F52,INVALC,0x3F53,0x3F54,0x3F55,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F56,0x3F57,INVALC,INVALC,
-	0x3F58,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F59,INVALC,INVALC,0x3F5A,
-	INVALC,0x3F5B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3F5C,0x3F5D,INVALC,INVALC,0x3F5E,INVALC,INVALC,INVALC,
-	0x3F5F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3F60,0x3F61,INVALC,0x3F62,INVALC,0x3F63,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F64,0x3F65,INVALC,INVALC,
-	0x3F66,INVALC,INVALC,INVALC,0x3F67,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F68,0x3F69,INVALC,0x3F6A,
-	INVALC,0x3F6B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3F6C,0x3F6D,INVALC,INVALC,0x3F6E,INVALC,INVALC,INVALC,
-	0x3F6F,0x3F70,0x3F71,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3F72,0x3F73,INVALC,0x3F74,INVALC,0x3F75,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F76,0x3F77,INVALC,INVALC,
-	0x3F78,INVALC,INVALC,INVALC,0x3F79,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x3F7A,0x3F7B,INVALC,INVALC,
-	0x3F7C,0x3F7D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x3F7E,0x4021,INVALC,INVALC,0x4022,INVALC,INVALC,INVALC,
-	0x4023,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4024,0x4025,INVALC,INVALC,INVALC,0x4026,INVALC,INVALC,
-	/* Block 200, Array index 0x7E00 */
-	INVALC,INVALC,INVALC,INVALC,0x4027,0x4028,INVALC,INVALC,
-	0x4029,INVALC,INVALC,INVALC,0x402A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x402B,0x402C,INVALC,0x402D,
-	INVALC,0x402E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x402F,0x4030,INVALC,INVALC,0x4031,INVALC,INVALC,INVALC,
-	0x4032,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4033,0x4034,INVALC,0x4035,INVALC,0x4036,INVALC,0x4037,
-	INVALC,INVALC,INVALC,INVALC,0x4038,0x4039,INVALC,INVALC,
-	0x403A,INVALC,INVALC,INVALC,0x403B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,0x403C,INVALC,0x403D,0x403E,INVALC,0x403F,
-	INVALC,0x4040,0x4041,0x4042,0x4043,0x4044,0x4045,0x4046,
-	0x4047,INVALC,INVALC,INVALC,0x4048,INVALC,INVALC,INVALC,
-	0x4049,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x404A,INVALC,INVALC,0x404B,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x404C,0x404D,INVALC,INVALC,
-	0x404E,INVALC,INVALC,INVALC,0x404F,0x4050,0x4051,INVALC,
-	INVALC,INVALC,INVALC,0x4052,0x4053,0x4054,INVALC,0x4055,
-	0x4056,0x4057,0x4058,INVALC,INVALC,INVALC,0x4059,INVALC,
-	0x405A,0x405B,INVALC,INVALC,0x405C,INVALC,0x405D,0x405E,
-	0x405F,INVALC,0x4060,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4061,0x4062,INVALC,0x4063,0x4064,0x4065,0x4066,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4067,0x4068,INVALC,INVALC,
-	0x4069,INVALC,INVALC,INVALC,0x406A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x406B,0x406C,INVALC,0x406D,
-	0x406E,0x406F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4070,0x4071,INVALC,INVALC,0x4072,INVALC,0x4073,INVALC,
-	0x4074,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4075,INVALC,INVALC,INVALC,INVALC,0x4076,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4077,INVALC,INVALC,INVALC,
-	0x4078,INVALC,INVALC,INVALC,0x4079,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 201, Array index 0x7F00 */
-	0x407A,0x407B,INVALC,INVALC,0x407C,INVALC,INVALC,INVALC,
-	0x407D,INVALC,0x407E,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4121,0x4122,INVALC,0x4123,INVALC,0x4124,0x4125,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4126,0x4127,INVALC,INVALC,
-	0x4128,INVALC,INVALC,INVALC,0x4129,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x412A,0x412B,INVALC,0x412C,
-	INVALC,0x412D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x412E,INVALC,INVALC,INVALC,0x412F,INVALC,INVALC,INVALC,
-	0x4130,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4131,0x4132,INVALC,INVALC,0x4133,0x4134,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4135,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4136,0x4137,INVALC,INVALC,0x4138,INVALC,INVALC,INVALC,
-	0x4139,INVALC,0x413A,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x413B,0x413C,INVALC,0x413D,INVALC,0x413E,0x413F,0x4140,
-	INVALC,INVALC,INVALC,0x4141,0x4142,0x4143,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4144,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4145,INVALC,0x4146,
-	INVALC,0x4147,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4148,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4149,0x414A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x414B,INVALC,INVALC,INVALC,
-	0x414C,INVALC,INVALC,INVALC,0x414D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x414E,0x414F,INVALC,0x4150,
-	INVALC,0x4151,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4152,0x4153,INVALC,INVALC,0x4154,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4155,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4156,0x4157,INVALC,INVALC,
-	/* Block 202, Array index 0x8000 */
-	0x4158,INVALC,INVALC,INVALC,0x4159,0x415A,0x415B,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x415C,0x415D,INVALC,0x415E,
-	INVALC,0x415F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4160,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4161,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4162,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4163,0x4164,INVALC,INVALC,0x4165,INVALC,INVALC,INVALC,
-	0x4166,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4167,0x4168,INVALC,0x4169,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x416A,INVALC,INVALC,INVALC,
-	0x416B,INVALC,INVALC,INVALC,0x416C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x416D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x416E,0x416F,INVALC,INVALC,0x4170,INVALC,INVALC,INVALC,
-	0x4171,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4172,0x4173,INVALC,0x4174,INVALC,0x4175,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4176,0x4177,INVALC,INVALC,0x4178,INVALC,INVALC,0x4179,
-	0x417A,INVALC,0x417B,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x417C,0x417D,INVALC,0x417E,INVALC,0x4221,0x4222,INVALC,
-	INVALC,0x4223,0x4224,INVALC,0x4225,0x4226,INVALC,INVALC,
-	0x4227,INVALC,0x4228,INVALC,0x4229,INVALC,INVALC,0x422A,
-	INVALC,INVALC,INVALC,INVALC,0x422B,0x422C,INVALC,0x422D,
-	0x422E,0x422F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4230,0x4231,INVALC,INVALC,0x4232,INVALC,INVALC,INVALC,
-	/* Block 203, Array index 0x8100 */
-	0x4233,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4234,0x4235,INVALC,0x4236,0x4237,0x4238,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4239,INVALC,INVALC,INVALC,
-	0x423A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x423B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x423C,0x423D,INVALC,INVALC,
-	0x423E,INVALC,INVALC,INVALC,0x423F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4240,0x4241,INVALC,0x4242,
-	0x4243,0x4244,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4245,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4246,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4247,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4248,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4249,0x424A,INVALC,INVALC,
-	0x424B,INVALC,INVALC,INVALC,0x424C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x424D,0x424E,INVALC,0x424F,
-	INVALC,0x4250,INVALC,0x4251,INVALC,INVALC,INVALC,INVALC,
-	0x4252,0x4253,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4254,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4255,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4256,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 204, Array index 0x8200 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4257,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4258,INVALC,INVALC,INVALC,0x4259,INVALC,INVALC,INVALC,
-	0x425A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x425B,0x425C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x425D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x425E,0x425F,INVALC,INVALC,0x4260,INVALC,INVALC,INVALC,
-	0x4261,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4262,0x4263,INVALC,INVALC,INVALC,0x4264,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4265,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4266,0x4267,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4268,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4269,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x426A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x426B,INVALC,INVALC,0x426C,
-	INVALC,0x426D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 205, Array index 0x8300 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x426E,0x426F,INVALC,INVALC,
-	0x4270,INVALC,INVALC,INVALC,0x4271,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4272,0x4273,INVALC,INVALC,
-	INVALC,0x4274,0x4275,INVALC,INVALC,INVALC,INVALC,0x4276,
-	0x4277,0x4278,INVALC,INVALC,0x4279,INVALC,0x427A,INVALC,
-	0x427B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x427C,0x427D,INVALC,0x427E,0x4321,0x4322,0x4323,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4324,0x4325,INVALC,INVALC,
-	0x4326,INVALC,INVALC,INVALC,0x4327,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4328,0x4329,INVALC,0x432A,
-	0x432B,0x432C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x432D,INVALC,INVALC,INVALC,0x432E,INVALC,0x432F,INVALC,
-	0x4330,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4331,INVALC,INVALC,INVALC,INVALC,0x4332,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4333,0x4334,INVALC,INVALC,0x4335,INVALC,INVALC,INVALC,
-	0x4336,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4337,0x4338,INVALC,0x4339,0x433A,0x433B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x433C,0x433D,INVALC,INVALC,
-	0x433E,INVALC,INVALC,INVALC,0x433F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4340,0x4341,INVALC,0x4342,
-	INVALC,0x4343,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4344,INVALC,INVALC,INVALC,0x4345,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4346,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4347,INVALC,INVALC,INVALC,
-	0x4348,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 206, Array index 0x8400 */
-	INVALC,0x4349,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x434A,0x434B,INVALC,INVALC,0x434C,INVALC,INVALC,INVALC,
-	0x434D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x434E,0x434F,INVALC,0x4350,INVALC,0x4351,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4352,INVALC,INVALC,INVALC,
-	0x4353,INVALC,INVALC,INVALC,0x4354,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4355,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4356,INVALC,INVALC,INVALC,
-	0x4357,INVALC,INVALC,INVALC,0x4358,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4359,0x435A,INVALC,0x435B,
-	INVALC,0x435C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x435D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x435E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x435F,0x4360,INVALC,INVALC,
-	0x4361,INVALC,INVALC,INVALC,0x4362,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4363,0x4364,INVALC,0x4365,
-	INVALC,0x4366,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4367,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4368,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4369,INVALC,INVALC,INVALC,
-	0x436A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x436B,INVALC,INVALC,INVALC,0x436C,INVALC,INVALC,INVALC,
-	0x436D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x436E,0x436F,INVALC,0x4370,INVALC,0x4371,INVALC,INVALC,
-	/* Block 207, Array index 0x8500 */
-	INVALC,INVALC,INVALC,INVALC,0x4372,INVALC,INVALC,INVALC,
-	0x4373,INVALC,INVALC,INVALC,0x4374,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4375,INVALC,INVALC,INVALC,
-	INVALC,0x4376,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4377,0x4378,INVALC,INVALC,0x4379,INVALC,INVALC,INVALC,
-	0x437A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x437B,0x437C,INVALC,0x437D,INVALC,0x437E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4421,0x4422,INVALC,INVALC,0x4423,INVALC,INVALC,0x4424,
-	0x4425,0x4426,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4427,0x4428,INVALC,0x4429,INVALC,0x442A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x442B,0x442C,INVALC,INVALC,
-	0x442D,INVALC,INVALC,INVALC,0x442E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x442F,0x4430,INVALC,0x4431,
-	INVALC,0x4432,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4433,0x4434,INVALC,INVALC,0x4435,INVALC,INVALC,INVALC,
-	0x4436,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4437,0x4438,INVALC,0x4439,0x443A,0x443B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x443C,0x443D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x443E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x443F,0x4440,INVALC,INVALC,
-	0x4441,INVALC,INVALC,0x4442,0x4443,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4444,0x4445,INVALC,0x4446,
-	0x4447,0x4448,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 208, Array index 0x8600 */
-	0x4449,0x444A,INVALC,INVALC,0x444B,INVALC,INVALC,INVALC,
-	0x444C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x444D,0x444E,INVALC,0x444F,INVALC,0x4450,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4451,INVALC,INVALC,INVALC,
-	0x4452,INVALC,INVALC,INVALC,0x4453,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4454,0x4455,INVALC,0x4456,
-	0x4457,0x4458,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4459,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x445A,0x445B,INVALC,INVALC,
-	0x445C,INVALC,INVALC,INVALC,0x445D,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x445E,0x445F,INVALC,0x4460,
-	INVALC,0x4461,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4462,0x4463,INVALC,INVALC,0x4464,INVALC,INVALC,INVALC,
-	0x4465,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4466,INVALC,INVALC,INVALC,INVALC,0x4467,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4468,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4469,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x446A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x446B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x446C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x446D,0x446E,INVALC,INVALC,0x446F,INVALC,INVALC,INVALC,
-	0x4470,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4471,0x4472,INVALC,0x4473,INVALC,0x4474,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4475,INVALC,INVALC,INVALC,
-	/* Block 209, Array index 0x8700 */
-	0x4476,INVALC,INVALC,INVALC,0x4477,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4478,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4479,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x447A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x447B,0x447C,INVALC,INVALC,
-	0x447D,INVALC,INVALC,INVALC,0x447E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4521,0x4522,INVALC,0x4523,
-	INVALC,0x4524,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4525,INVALC,INVALC,INVALC,0x4526,INVALC,INVALC,INVALC,
-	0x4527,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4528,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4529,0x452A,INVALC,INVALC,
-	0x452B,INVALC,INVALC,INVALC,0x452C,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x452D,0x452E,INVALC,INVALC,
-	INVALC,0x452F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4530,0x4531,INVALC,INVALC,
-	0x4532,INVALC,INVALC,INVALC,0x4533,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4534,0x4535,INVALC,0x4536,
-	INVALC,0x4537,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4538,0x4539,INVALC,INVALC,0x453A,INVALC,INVALC,INVALC,
-	0x453B,0x453C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x453D,0x453E,INVALC,0x453F,0x4540,0x4541,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4542,0x4543,INVALC,INVALC,
-	0x4544,INVALC,INVALC,INVALC,0x4545,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4546,0x4547,INVALC,0x4548,
-	0x4549,0x454A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x454B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 210, Array index 0x8800 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x454C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x454D,0x454E,INVALC,INVALC,0x454F,INVALC,INVALC,INVALC,
-	0x4550,INVALC,0x4551,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4552,0x4553,INVALC,0x4554,0x4555,0x4556,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4557,0x4558,INVALC,INVALC,
-	0x4559,INVALC,INVALC,INVALC,0x455A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x455B,0x455C,INVALC,0x455D,
-	INVALC,0x455E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x455F,INVALC,INVALC,INVALC,0x4560,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4561,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4562,INVALC,INVALC,INVALC,
-	0x4563,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4564,0x4565,INVALC,INVALC,0x4566,INVALC,INVALC,INVALC,
-	0x4567,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4568,0x4569,INVALC,0x456A,INVALC,0x456B,INVALC,INVALC,
-	INVALC,INVALC,0x456C,INVALC,0x456D,INVALC,INVALC,INVALC,
-	0x456E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x456F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4570,INVALC,INVALC,INVALC,
-	0x4571,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 211, Array index 0x8900 */
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4572,
-	INVALC,0x4573,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4574,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4575,0x4576,INVALC,INVALC,
-	0x4577,INVALC,INVALC,INVALC,0x4578,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4579,0x457A,INVALC,0x457B,
-	INVALC,0x457C,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x457D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x457E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4621,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4622,0x4623,INVALC,INVALC,0x4624,INVALC,INVALC,INVALC,
-	0x4625,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4626,0x4627,INVALC,INVALC,INVALC,0x4628,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4629,INVALC,INVALC,INVALC,
-	0x462A,INVALC,INVALC,INVALC,0x462B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x462C,INVALC,INVALC,INVALC,
-	INVALC,0x462D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x462E,0x462F,INVALC,INVALC,0x4630,INVALC,INVALC,0x4631,
-	0x4632,INVALC,0x4633,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4634,0x4635,INVALC,0x4636,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4637,INVALC,INVALC,INVALC,
-	0x4638,INVALC,INVALC,INVALC,0x4639,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x463A,0x463B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x463C,0x463D,INVALC,INVALC,0x463E,INVALC,INVALC,INVALC,
-	0x463F,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 212, Array index 0x8A00 */
-	0x4640,0x4641,INVALC,0x4642,INVALC,0x4643,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4644,0x4645,0x4646,INVALC,
-	0x4647,INVALC,INVALC,INVALC,0x4648,INVALC,0x4649,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x464A,0x464B,INVALC,0x464C,
-	0x464D,0x464E,INVALC,INVALC,INVALC,0x464F,INVALC,INVALC,
-	0x4650,0x4651,INVALC,INVALC,0x4652,INVALC,INVALC,INVALC,
-	0x4653,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4654,0x4655,INVALC,0x4656,0x4657,0x4658,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4659,0x465A,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x465B,0x465C,INVALC,INVALC,
-	0x465D,INVALC,INVALC,INVALC,0x465E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x465F,0x4660,INVALC,0x4661,
-	0x4662,0x4663,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4664,0x4665,INVALC,INVALC,0x4666,INVALC,INVALC,INVALC,
-	0x4667,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4668,0x4669,INVALC,0x466A,INVALC,0x466B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x466C,INVALC,INVALC,INVALC,
-	0x466D,INVALC,INVALC,INVALC,0x466E,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x466F,0x4670,INVALC,INVALC,
-	0x4671,0x4672,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4673,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4674,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4675,INVALC,0x4676,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4677,0x4678,INVALC,INVALC,
-	0x4679,INVALC,INVALC,INVALC,0x467A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x467B,0x467C,INVALC,0x467D,
-	/* Block 213, Array index 0x8B00 */
-	INVALC,0x467E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4721,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4722,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4723,INVALC,INVALC,INVALC,0x4724,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4725,INVALC,INVALC,INVALC,
-	0x4726,INVALC,INVALC,INVALC,0x4727,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4728,INVALC,0x4729,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x472A,0x472B,INVALC,INVALC,0x472C,INVALC,INVALC,0x472D,
-	0x472E,INVALC,0x472F,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4730,0x4731,INVALC,0x4732,INVALC,0x4733,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4734,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4735,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4736,INVALC,INVALC,INVALC,
-	0x4737,INVALC,INVALC,INVALC,0x4738,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4739,INVALC,INVALC,0x473A,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x473B,INVALC,INVALC,INVALC,0x473C,INVALC,INVALC,INVALC,
-	0x473D,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x473E,INVALC,INVALC,0x473F,INVALC,0x4740,INVALC,INVALC,
-	/* Block 214, Array index 0x8C00 */
-	INVALC,INVALC,INVALC,INVALC,0x4741,INVALC,INVALC,INVALC,
-	0x4742,INVALC,INVALC,INVALC,0x4743,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4744,0x4745,INVALC,0x4746,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4747,0x4748,INVALC,INVALC,
-	0x4749,INVALC,INVALC,INVALC,0x474A,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x474B,0x474C,INVALC,0x474D,
-	INVALC,0x474E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x474F,0x4750,INVALC,INVALC,0x4751,INVALC,INVALC,INVALC,
-	0x4752,INVALC,INVALC,INVALC,INVALC,0x4753,INVALC,INVALC,
-	0x4754,0x4755,INVALC,0x4756,INVALC,0x4757,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4758,0x4759,INVALC,INVALC,
-	0x475A,INVALC,INVALC,INVALC,0x475B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x475C,0x475D,INVALC,0x475E,
-	0x475F,0x4760,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4761,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4762,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4763,0x4764,INVALC,INVALC,0x4765,INVALC,INVALC,INVALC,
-	0x4766,INVALC,0x4767,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4768,0x4769,INVALC,0x476A,INVALC,0x476B,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x476C,0x476D,INVALC,INVALC,
-	0x476E,INVALC,INVALC,INVALC,0x476F,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4770,0x4771,INVALC,0x4772,
-	INVALC,0x4773,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 215, Array index 0x8D00 */
-	0x4774,0x4775,INVALC,INVALC,0x4776,INVALC,INVALC,INVALC,
-	0x4777,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4778,0x4779,INVALC,0x477A,0x477B,0x477C,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x477D,INVALC,INVALC,INVALC,
-	0x477E,INVALC,INVALC,INVALC,0x4821,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x4822,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4823,0x4824,INVALC,INVALC,0x4825,INVALC,INVALC,INVALC,
-	0x4826,INVALC,INVALC,INVALC,INVALC,0x4827,INVALC,INVALC,
-	0x4828,0x4829,INVALC,0x482A,INVALC,0x482B,INVALC,INVALC,
-	INVALC,0x482C,INVALC,INVALC,0x482D,0x482E,INVALC,INVALC,
-	0x482F,INVALC,INVALC,INVALC,0x4830,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,0x4831,
-	INVALC,0x4832,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4833,0x4834,INVALC,INVALC,0x4835,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,0x4836,INVALC,0x4837,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4838,0x4839,INVALC,INVALC,
-	0x483A,INVALC,INVALC,INVALC,0x483B,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,0x483C,INVALC,0x483D,
-	INVALC,0x483E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x483F,INVALC,INVALC,INVALC,0x4840,INVALC,INVALC,INVALC,
-	0x4841,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4842,INVALC,0x4843,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4844,0x4845,INVALC,INVALC,
-	0x4846,INVALC,INVALC,INVALC,0x4847,INVALC,INVALC,INVALC,
-	INVALC,0x4848,INVALC,INVALC,0x4849,INVALC,INVALC,0x484A,
-	INVALC,0x484B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x484C,INVALC,INVALC,INVALC,0x484D,INVALC,INVALC,INVALC,
-	0x484E,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x484F,INVALC,INVALC,INVALC,INVALC,0x4850,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4851,0x4852,INVALC,INVALC,
-	/* Block 216, Array index 0x8E00 */
-	0x4853,INVALC,INVALC,INVALC,0x4854,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x4855,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4856,0x4857,INVALC,INVALC,0x4858,INVALC,INVALC,INVALC,
-	0x4859,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x485A,0x485B,INVALC,0x485C,INVALC,0x485D,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x485E,0x485F,INVALC,INVALC,
-	0x4860,INVALC,INVALC,INVALC,0x4861,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4862,INVALC,INVALC,0x4863,
-	INVALC,0x4864,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4865,0x4866,INVALC,INVALC,0x4867,INVALC,0x4868,0x4869,
-	0x486A,0x486B,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x486C,0x486D,INVALC,0x486E,INVALC,0x486F,INVALC,INVALC,
-	INVALC,0x4870,INVALC,INVALC,0x4871,INVALC,INVALC,INVALC,
-	0x4872,INVALC,INVALC,INVALC,0x4873,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,0x4874,0x4875,INVALC,INVALC,
-	INVALC,0x4876,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x4877,0x4878,INVALC,INVALC,0x4879,INVALC,INVALC,INVALC,
-	0x487A,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x487B,0x487C,INVALC,0x487D,INVALC,0x487E,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 250, Array index 0x8F00 */
-	0x4B50,0x4B56,0x4B67,0x4D4F,0x4D68,0x4E2D,0x4F7B,0x5022,
-	0x5038,0x5050,0x505D,0x5154,0x5155,0x5158,0x515B,0x515C,
-	0x515D,0x515E,0x515F,0x5160,0x5162,0x5163,0x5164,0x5165,
-	0x5166,0x5168,0x5169,0x516A,0x516B,0x516D,0x516F,0x5170,
-	0x5172,0x5176,0x517A,0x517C,0x517D,0x517E,0x5222,0x5223,
-	0x5227,0x5228,0x5229,0x522A,0x522B,0x522D,0x5232,0x523E,
-	0x5242,0x5243,0x5244,0x5246,0x5247,0x5248,0x5249,0x524A,
-	0x524B,0x524D,0x524E,0x524F,0x5250,0x5251,0x5252,0x5253,
-	0x5254,0x5255,0x5256,0x5257,0x5259,0x525A,0x525E,0x525F,
-	0x5261,0x5262,0x5264,0x5265,0x5266,0x5267,0x5268,0x5269,
-	0x526A,0x526B,0x5270,0x5271,0x5272,0x5273,0x5274,0x5275,
-	0x5277,0x5278,0x5466,0x547C,0x5525,0x552B,0x552E,0x5638,
-	0x564D,0x574B,0x5764,0x5B45,0x5B64,0x5C25,0x5D25,0x5D55,
-	0x5D74,0x5E7C,0x5E7E,0x5F33,0x5F61,0x5F68,0x6071,0x612D,
-	0x616D,0x6375,0x6421,0x6429,0x652E,0x6531,0x6532,0x6539,
-	0x653B,0x653C,0x6544,0x654E,0x6550,0x6552,0x6556,0x657A,
-	0x657B,0x657C,0x657E,0x6621,0x6624,0x6627,0x662D,0x662F,
-	0x6630,0x6631,0x6633,0x6637,0x6638,0x663C,0x6644,0x6646,
-	0x6647,0x664A,0x6652,0x6656,0x6659,0x665C,0x665F,0x6661,
-	0x6664,0x6665,0x6666,0x6668,0x666A,0x666B,0x666C,0x666F,
-	0x6671,0x6672,0x6675,0x6676,0x6677,0x6679,0x6721,0x6726,
-	0x6729,0x672A,0x672C,0x672D,0x6730,0x673F,0x6741,0x6746,
-	0x6747,0x674B,0x674D,0x674F,0x6750,0x6753,0x675F,0x6764,
-	0x6766,0x6777,0x6867,0x6868,0x6870,0x6871,0x6877,0x6879,
-	0x687B,0x687E,0x6927,0x692C,0x694C,0x6977,0x6A41,0x6A65,
-	0x6A74,0x6A77,0x6A7C,0x6A7E,0x6B24,0x6B27,0x6B29,0x6B2A,
-	0x6B3A,0x6B3B,0x6B3D,0x6B41,0x6B42,0x6B46,0x6B47,0x6B4C,
-	0x6B4F,0x6B50,0x6B51,0x6B52,0x6B58,0x6C26,0x6C27,0x6C2A,
-	0x6C2F,0x6C30,0x6C31,0x6C32,0x6C35,0x6C38,0x6C3A,0x6C40,
-	0x6C41,0x6C45,0x6C46,0x6C49,0x6C4A,0x6C55,0x6C5D,0x6C5E,
-	0x6C61,0x6C64,0x6C67,0x6C68,0x6C77,0x6C78,0x6C7A,0x6D21,
-	0x6D22,0x6D23,0x6D6E,0x6E5B,0x723D,0x727A,0x7331,0x7427,
-	/* Block 251, Array index 0x9000 */
-	0x746E,0x7674,0x7676,0x7738,0x7748,0x7753,0x785B,0x7870,
-	0x7A21,0x7A22,0x7A66,0x7C29,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	/* Block 256, Array index 0x9100 */
-	INVALC,0x2321,0x2322,0x2323,0x2324,0x2325,0x2326,0x2327,
-	0x2328,0x2329,0x232A,0x232B,0x232C,0x232D,0x232E,0x232F,
-	0x2330,0x2331,0x2332,0x2333,0x2334,0x2335,0x2336,0x2337,
-	0x2338,0x2339,0x233A,0x233B,0x233C,0x233D,0x233E,0x233F,
-	0x2340,0x2341,0x2342,0x2343,0x2344,0x2345,0x2346,0x2347,
-	0x2348,0x2349,0x234A,0x234B,0x234C,0x234D,0x234E,0x234F,
-	0x2350,0x2351,0x2352,0x2353,0x2354,0x2355,0x2356,0x2357,
-	0x2358,0x2359,0x235A,0x235B,0x212C,0x235D,0x235E,0x235F,
-	0x2360,0x2361,0x2362,0x2363,0x2364,0x2365,0x2366,0x2367,
-	0x2368,0x2369,0x236A,0x236B,0x236C,0x236D,0x236E,0x236F,
-	0x2370,0x2371,0x2372,0x2373,0x2374,0x2375,0x2376,0x2377,
-	0x2378,0x2379,0x237A,0x237B,0x237C,0x237D,0x2226,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x214B,0x214C,0x217E,0x237E,INVALC,0x214D,0x235C,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_KSX1001 && !defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * 16-bit UCS -> ksx1001 size-optimized table (29992 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_KSX1001) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-
-static _CONST __uint16_t
-from_ucs_size_ksx1001[] =
-{
-	0x01B6, /* Ranges number */
-	0x1338, /* Unranged codes number */
-	0x1424, /* First unranged code index */
-	/* Ranges list: first code, last Code, array index. */
-	/* Array index: 0x0003 */ 0x00B0, 0x00BF, 0x0525,
-	/* Array index: 0x0006 */ 0x0131, 0x0133, 0x0535,
-	/* Array index: 0x0009 */ 0x013F, 0x0142, 0x0538,
-	/* Array index: 0x000C */ 0x0149, 0x014B, 0x053C,
-	/* Array index: 0x000F */ 0x02D8, 0x02DD, 0x053F,
-	/* Array index: 0x0012 */ 0x0391, 0x03A9, 0x0545,
-	/* Array index: 0x0015 */ 0x03B1, 0x03C9, 0x055E,
-	/* Array index: 0x0018 */ 0x0410, 0x0451, 0x0577,
-	/* Array index: 0x001B */ 0x207F, 0x2084, 0x05B9,
-	/* Array index: 0x001E */ 0x215B, 0x2169, 0x05BF,
-	/* Array index: 0x0021 */ 0x2170, 0x2179, 0x05CE,
-	/* Array index: 0x0024 */ 0x2190, 0x2199, 0x05D8,
-	/* Array index: 0x0027 */ 0x2225, 0x222E, 0x05E2,
-	/* Array index: 0x002A */ 0x2460, 0x246E, 0x05EC,
-	/* Array index: 0x002D */ 0x2474, 0x2482, 0x05FB,
-	/* Array index: 0x0030 */ 0x249C, 0x24B5, 0x060A,
-	/* Array index: 0x0033 */ 0x24D0, 0x24E9, 0x0624,
-	/* Array index: 0x0036 */ 0x2500, 0x2503, 0x063E,
-	/* Array index: 0x0039 */ 0x250C, 0x254B, 0x0642,
-	/* Array index: 0x003C */ 0x25A0, 0x25A9, 0x0682,
-	/* Array index: 0x003F */ 0x25C6, 0x25C8, 0x068C,
-	/* Array index: 0x0042 */ 0x25CE, 0x25D1, 0x068F,
-	/* Array index: 0x0045 */ 0x2660, 0x266D, 0x0693,
-	/* Array index: 0x0048 */ 0x3000, 0x3003, 0x06A1,
-	/* Array index: 0x004B */ 0x3008, 0x3015, 0x06A5,
-	/* Array index: 0x004E */ 0x3041, 0x3093, 0x06B3,
-	/* Array index: 0x0051 */ 0x30A1, 0x30F6, 0x0706,
-	/* Array index: 0x0054 */ 0x3131, 0x318E, 0x075C,
-	/* Array index: 0x0057 */ 0x3200, 0x321C, 0x07BA,
-	/* Array index: 0x005A */ 0x3260, 0x327B, 0x07D7,
-	/* Array index: 0x005D */ 0x3380, 0x33CA, 0x07F3,
-	/* Array index: 0x0060 */ 0x33DB, 0x33DD, 0x083E,
-	/* Array index: 0x0063 */ 0x4E07, 0x4E0D, 0x0841,
-	/* Array index: 0x0066 */ 0x4E14, 0x4E19, 0x0848,
-	/* Array index: 0x0069 */ 0x4E4B, 0x4E4F, 0x084E,
-	/* Array index: 0x006C */ 0x4E5D, 0x4E5F, 0x0853,
-	/* Array index: 0x006F */ 0x4E8E, 0x4E95, 0x0856,
-	/* Array index: 0x0072 */ 0x4EA1, 0x4EAE, 0x085E,
-	/* Array index: 0x0075 */ 0x4ED4, 0x4ED9, 0x086C,
-	/* Array index: 0x0078 */ 0x4EE3, 0x4EE5, 0x0872,
-	/* Array index: 0x007B */ 0x4F09, 0x4F11, 0x0875,
-	/* Array index: 0x007E */ 0x4F46, 0x4F48, 0x087E,
-	/* Array index: 0x0081 */ 0x4F4D, 0x4F51, 0x0881,
-	/* Array index: 0x0084 */ 0x4F59, 0x4F5C, 0x0886,
-	/* Array index: 0x0087 */ 0x4FC2, 0x4FC4, 0x088A,
-	/* Array index: 0x008A */ 0x4FDD, 0x4FE1, 0x088D,
-	/* Array index: 0x008D */ 0x5023, 0x502D, 0x0892,
-	/* Array index: 0x0090 */ 0x5047, 0x5049, 0x089D,
-	/* Array index: 0x0093 */ 0x5074, 0x5078, 0x08A0,
-	/* Array index: 0x0096 */ 0x50FF, 0x5101, 0x08A5,
-	/* Array index: 0x0099 */ 0x5140, 0x514E, 0x08A8,
-	/* Array index: 0x009C */ 0x5165, 0x516E, 0x08B7,
-	/* Array index: 0x009F */ 0x5175, 0x5178, 0x08C1,
-	/* Array index: 0x00A2 */ 0x51C9, 0x51CD, 0x08C5,
-	/* Array index: 0x00A5 */ 0x51DC, 0x51DE, 0x08CA,
-	/* Array index: 0x00A8 */ 0x51F6, 0x51FA, 0x08CD,
-	/* Array index: 0x00AB */ 0x5206, 0x520A, 0x08D2,
-	/* Array index: 0x00AE */ 0x5236, 0x523B, 0x08D7,
-	/* Array index: 0x00B1 */ 0x524A, 0x524D, 0x08DD,
-	/* Array index: 0x00B4 */ 0x5287, 0x5289, 0x08E1,
-	/* Array index: 0x00B7 */ 0x52A9, 0x52AB, 0x08E4,
-	/* Array index: 0x00BA */ 0x52D5, 0x52E4, 0x08E7,
-	/* Array index: 0x00BD */ 0x5315, 0x5319, 0x08F7,
-	/* Array index: 0x00C0 */ 0x533F, 0x534A, 0x08FC,
-	/* Array index: 0x00C3 */ 0x5351, 0x5354, 0x0908,
-	/* Array index: 0x00C6 */ 0x536F, 0x5377, 0x090C,
-	/* Array index: 0x00C9 */ 0x53C8, 0x53CD, 0x0915,
-	/* Array index: 0x00CC */ 0x53E1, 0x53F3, 0x091B,
-	/* Array index: 0x00CF */ 0x5408, 0x5411, 0x092E,
-	/* Array index: 0x00D2 */ 0x5438, 0x543E, 0x0938,
-	/* Array index: 0x00D5 */ 0x547B, 0x547D, 0x093F,
-	/* Array index: 0x00D8 */ 0x5586, 0x558A, 0x0942,
-	/* Array index: 0x00DB */ 0x5598, 0x559D, 0x0947,
-	/* Array index: 0x00DE */ 0x55A7, 0x55AE, 0x094D,
-	/* Array index: 0x00E1 */ 0x574D, 0x5751, 0x0955,
-	/* Array index: 0x00E4 */ 0x5805, 0x580A, 0x095A,
-	/* Array index: 0x00E7 */ 0x582F, 0x5835, 0x0960,
-	/* Array index: 0x00EA */ 0x58F9, 0x58FD, 0x0967,
-	/* Array index: 0x00ED */ 0x5914, 0x591C, 0x096C,
-	/* Array index: 0x00F0 */ 0x5927, 0x592E, 0x0975,
-	/* Array index: 0x00F3 */ 0x5947, 0x5949, 0x097D,
-	/* Array index: 0x00F6 */ 0x594E, 0x5957, 0x0980,
-	/* Array index: 0x00F9 */ 0x596A, 0x596E, 0x098A,
-	/* Array index: 0x00FC */ 0x5982, 0x5984, 0x098F,
-	/* Array index: 0x00FF */ 0x59D0, 0x59D4, 0x0992,
-	/* Array index: 0x0102 */ 0x59D9, 0x59DD, 0x0997,
-	/* Array index: 0x0105 */ 0x5B54, 0x5B5F, 0x099C,
-	/* Array index: 0x0108 */ 0x5B85, 0x5B8C, 0x09A8,
-	/* Array index: 0x010B */ 0x5B93, 0x5B9C, 0x09B0,
-	/* Array index: 0x010E */ 0x5BA2, 0x5BA6, 0x09BA,
-	/* Array index: 0x0111 */ 0x5BB3, 0x5BB9, 0x09BF,
-	/* Array index: 0x0114 */ 0x5BBF, 0x5BC7, 0x09C6,
-	/* Array index: 0x0117 */ 0x5BD0, 0x5BD4, 0x09CF,
-	/* Array index: 0x011A */ 0x5BDE, 0x5BEF, 0x09D4,
-	/* Array index: 0x011D */ 0x5C07, 0x5C11, 0x09E6,
-	/* Array index: 0x0120 */ 0x5C38, 0x5C40, 0x09F1,
-	/* Array index: 0x0123 */ 0x5DE1, 0x5DE8, 0x09FA,
-	/* Array index: 0x0126 */ 0x5DF1, 0x5DF4, 0x0A02,
-	/* Array index: 0x0129 */ 0x5E5F, 0x5E63, 0x0A06,
-	/* Array index: 0x012C */ 0x5E72, 0x5E7E, 0x0A0B,
-	/* Array index: 0x012F */ 0x5EB5, 0x5EB8, 0x0A18,
-	/* Array index: 0x0132 */ 0x5EC8, 0x5ECA, 0x0A1C,
-	/* Array index: 0x0135 */ 0x5EDF, 0x5EE3, 0x0A1F,
-	/* Array index: 0x0138 */ 0x5F11, 0x5F18, 0x0A24,
-	/* Array index: 0x013B */ 0x5F66, 0x5F71, 0x0A2C,
-	/* Array index: 0x013E */ 0x5F7F, 0x5F81, 0x0A38,
-	/* Array index: 0x0141 */ 0x5F8A, 0x5F92, 0x0A3B,
-	/* Array index: 0x0144 */ 0x5F97, 0x5F99, 0x0A44,
-	/* Array index: 0x0147 */ 0x5FA8, 0x5FAA, 0x0A47,
-	/* Array index: 0x014A */ 0x5FD6, 0x5FD9, 0x0A4A,
-	/* Array index: 0x014D */ 0x6041, 0x6043, 0x0A4E,
-	/* Array index: 0x0150 */ 0x6062, 0x6070, 0x0A51,
-	/* Array index: 0x0153 */ 0x60B0, 0x60B8, 0x0A60,
-	/* Array index: 0x0156 */ 0x60DF, 0x60E1, 0x0A69,
-	/* Array index: 0x0159 */ 0x60F9, 0x60FB, 0x0A6C,
-	/* Array index: 0x015C */ 0x610D, 0x610F, 0x0A6F,
-	/* Array index: 0x015F */ 0x6147, 0x614C, 0x0A72,
-	/* Array index: 0x0162 */ 0x6162, 0x6168, 0x0A78,
-	/* Array index: 0x0165 */ 0x6198, 0x619A, 0x0A7F,
-	/* Array index: 0x0168 */ 0x61C7, 0x61CB, 0x0A82,
-	/* Array index: 0x016B */ 0x61F6, 0x6200, 0x0A87,
-	/* Array index: 0x016E */ 0x620A, 0x6212, 0x0A92,
-	/* Array index: 0x0171 */ 0x623E, 0x6241, 0x0A9B,
-	/* Array index: 0x0174 */ 0x6247, 0x624D, 0x0A9F,
-	/* Array index: 0x0177 */ 0x62C7, 0x62DC, 0x0AA6,
-	/* Array index: 0x017A */ 0x62EC, 0x62F3, 0x0ABC,
-	/* Array index: 0x017D */ 0x633A, 0x633E, 0x0AC4,
-	/* Array index: 0x0180 */ 0x63A0, 0x63A2, 0x0AC9,
-	/* Array index: 0x0183 */ 0x63A5, 0x63AA, 0x0ACC,
-	/* Array index: 0x0186 */ 0x6478, 0x647A, 0x0AD2,
-	/* Array index: 0x0189 */ 0x6491, 0x6493, 0x0AD5,
-	/* Array index: 0x018C */ 0x64E1, 0x64E7, 0x0AD8,
-	/* Array index: 0x018F */ 0x652A, 0x652C, 0x0ADF,
-	/* Array index: 0x0192 */ 0x6536, 0x653F, 0x0AE2,
-	/* Array index: 0x0195 */ 0x654D, 0x6551, 0x0AEC,
-	/* Array index: 0x0198 */ 0x6574, 0x6578, 0x0AF1,
-	/* Array index: 0x019B */ 0x65E5, 0x65ED, 0x0AF6,
-	/* Array index: 0x019E */ 0x65FA, 0x65FF, 0x0AFF,
-	/* Array index: 0x01A1 */ 0x6606, 0x6615, 0x0B05,
-	/* Array index: 0x01A4 */ 0x661E, 0x6620, 0x0B15,
-	/* Array index: 0x01A7 */ 0x662D, 0x6631, 0x0B18,
-	/* Array index: 0x01AA */ 0x6641, 0x6644, 0x0B1D,
-	/* Array index: 0x01AD */ 0x665B, 0x665F, 0x0B21,
-	/* Array index: 0x01B0 */ 0x6664, 0x666F, 0x0B26,
-	/* Array index: 0x01B3 */ 0x6673, 0x667A, 0x0B32,
-	/* Array index: 0x01B6 */ 0x6687, 0x6689, 0x0B3A,
-	/* Array index: 0x01B9 */ 0x6696, 0x6698, 0x0B3D,
-	/* Array index: 0x01BC */ 0x66B2, 0x66B4, 0x0B40,
-	/* Array index: 0x01BF */ 0x66F0, 0x6700, 0x0B43,
-	/* Array index: 0x01C2 */ 0x671B, 0x671F, 0x0B54,
-	/* Array index: 0x01C5 */ 0x6726, 0x672E, 0x0B59,
-	/* Array index: 0x01C8 */ 0x674E, 0x6753, 0x0B62,
-	/* Array index: 0x01CB */ 0x676D, 0x6777, 0x0B68,
-	/* Array index: 0x01CE */ 0x67B6, 0x67B8, 0x0B73,
-	/* Array index: 0x01D1 */ 0x67CF, 0x67D4, 0x0B76,
-	/* Array index: 0x01D4 */ 0x67EF, 0x67F6, 0x0B7C,
-	/* Array index: 0x01D7 */ 0x683C, 0x6843, 0x0B84,
-	/* Array index: 0x01DA */ 0x6850, 0x6854, 0x0B8C,
-	/* Array index: 0x01DD */ 0x68AD, 0x68B6, 0x0B91,
-	/* Array index: 0x01E0 */ 0x6953, 0x695A, 0x0B9B,
-	/* Array index: 0x01E3 */ 0x695E, 0x6963, 0x0BA3,
-	/* Array index: 0x01E6 */ 0x696B, 0x696F, 0x0BA9,
-	/* Array index: 0x01E9 */ 0x6975, 0x6979, 0x0BAE,
-	/* Array index: 0x01EC */ 0x69CB, 0x69CD, 0x0BB3,
-	/* Array index: 0x01EF */ 0x6A38, 0x6A3A, 0x0BB6,
-	/* Array index: 0x01F2 */ 0x6B5F, 0x6B66, 0x0BB9,
-	/* Array index: 0x01F5 */ 0x6BD2, 0x6BD8, 0x0BC1,
-	/* Array index: 0x01F8 */ 0x6C3E, 0x6C42, 0x0BC8,
-	/* Array index: 0x01FB */ 0x6C5D, 0x6C60, 0x0BCD,
-	/* Array index: 0x01FE */ 0x6C7D, 0x6C88, 0x0BD1,
-	/* Array index: 0x0201 */ 0x6C90, 0x6C9B, 0x0BDD,
-	/* Array index: 0x0204 */ 0x6CB8, 0x6CC4, 0x0BE9,
-	/* Array index: 0x0207 */ 0x6CE1, 0x6CE5, 0x0BF6,
-	/* Array index: 0x020A */ 0x6CEE, 0x6CF0, 0x0BFB,
-	/* Array index: 0x020D */ 0x6D35, 0x6D3E, 0x0BFE,
-	/* Array index: 0x0210 */ 0x6D77, 0x6D79, 0x0C08,
-	/* Array index: 0x0213 */ 0x6D85, 0x6D8E, 0x0C0B,
-	/* Array index: 0x0216 */ 0x6DC3, 0x6DC7, 0x0C15,
-	/* Array index: 0x0219 */ 0x6DD8, 0x6DDA, 0x0C1A,
-	/* Array index: 0x021C */ 0x6DF5, 0x6DFB, 0x0C1D,
-	/* Array index: 0x021F */ 0x6E17, 0x6E26, 0x0C24,
-	/* Array index: 0x0222 */ 0x6E2B, 0x6E2F, 0x0C34,
-	/* Array index: 0x0225 */ 0x6E3A, 0x6E3E, 0x0C39,
-	/* Array index: 0x0228 */ 0x6E5B, 0x6E5F, 0x0C3E,
-	/* Array index: 0x022B */ 0x6EFE, 0x6F02, 0x0C43,
-	/* Array index: 0x022E */ 0x6F57, 0x6F5F, 0x0C48,
-	/* Array index: 0x0231 */ 0x6F7A, 0x6F7E, 0x0C51,
-	/* Array index: 0x0234 */ 0x6FBE, 0x6FC3, 0x0C56,
-	/* Array index: 0x0237 */ 0x6FDF, 0x6FE1, 0x0C5C,
-	/* Array index: 0x023A */ 0x7018, 0x701F, 0x0C5F,
-	/* Array index: 0x023D */ 0x7098, 0x709A, 0x0C67,
-	/* Array index: 0x0240 */ 0x70AB, 0x70AF, 0x0C6A,
-	/* Array index: 0x0243 */ 0x70B7, 0x70B9, 0x0C6F,
-	/* Array index: 0x0246 */ 0x7164, 0x7169, 0x0C72,
-	/* Array index: 0x0249 */ 0x71E5, 0x71E7, 0x0C78,
-	/* Array index: 0x024C */ 0x71FB, 0x7200, 0x0C7B,
-	/* Array index: 0x024F */ 0x723A, 0x7240, 0x0C81,
-	/* Array index: 0x0252 */ 0x7246, 0x7248, 0x0C88,
-	/* Array index: 0x0255 */ 0x731B, 0x731D, 0x0C8B,
-	/* Array index: 0x0258 */ 0x7329, 0x732B, 0x0C8E,
-	/* Array index: 0x025B */ 0x7394, 0x7398, 0x0C91,
-	/* Array index: 0x025E */ 0x73C9, 0x73CF, 0x0C96,
-	/* Array index: 0x0261 */ 0x73E3, 0x73EA, 0x0C9D,
-	/* Array index: 0x0264 */ 0x7403, 0x7409, 0x0CA5,
-	/* Array index: 0x0267 */ 0x7420, 0x743A, 0x0CAC,
-	/* Array index: 0x026A */ 0x743F, 0x7444, 0x0CC7,
-	/* Array index: 0x026D */ 0x7457, 0x746A, 0x0CCD,
-	/* Array index: 0x0270 */ 0x7530, 0x7533, 0x0CE1,
-	/* Array index: 0x0273 */ 0x7559, 0x755D, 0x0CE5,
-	/* Array index: 0x0276 */ 0x75B1, 0x75BE, 0x0CEA,
-	/* Array index: 0x0279 */ 0x761F, 0x7626, 0x0CF8,
-	/* Array index: 0x027C */ 0x767B, 0x767E, 0x0D00,
-	/* Array index: 0x027F */ 0x76DB, 0x76E4, 0x0D04,
-	/* Array index: 0x0282 */ 0x77ED, 0x77EF, 0x0D0E,
-	/* Array index: 0x0285 */ 0x7825, 0x7827, 0x0D11,
-	/* Array index: 0x0288 */ 0x788C, 0x788E, 0x0D14,
-	/* Array index: 0x028B */ 0x78BA, 0x78BC, 0x0D17,
-	/* Array index: 0x028E */ 0x792A, 0x792C, 0x0D1A,
-	/* Array index: 0x0291 */ 0x7947, 0x7949, 0x0D1D,
-	/* Array index: 0x0294 */ 0x7956, 0x7960, 0x0D20,
-	/* Array index: 0x0297 */ 0x798D, 0x7991, 0x0D2B,
-	/* Array index: 0x029A */ 0x79BD, 0x79C1, 0x0D30,
-	/* Array index: 0x029D */ 0x79C9, 0x79CB, 0x0D35,
-	/* Array index: 0x02A0 */ 0x7A3B, 0x7A40, 0x0D38,
-	/* Array index: 0x02A3 */ 0x7B49, 0x7B56, 0x0D3E,
-	/* Array index: 0x02A6 */ 0x7C3D, 0x7C3F, 0x0D4C,
-	/* Array index: 0x02A9 */ 0x7CB1, 0x7CB3, 0x0D4F,
-	/* Array index: 0x02AC */ 0x7CDE, 0x7CE0, 0x0D52,
-	/* Array index: 0x02AF */ 0x7D02, 0x7D0D, 0x0D55,
-	/* Array index: 0x02B2 */ 0x7D17, 0x7D1B, 0x0D61,
-	/* Array index: 0x02B5 */ 0x7D20, 0x7D22, 0x0D66,
-	/* Array index: 0x02B8 */ 0x7D2B, 0x7D30, 0x0D69,
-	/* Array index: 0x02BB */ 0x7D42, 0x7D46, 0x0D6F,
-	/* Array index: 0x02BE */ 0x7D71, 0x7D73, 0x0D74,
-	/* Array index: 0x02C1 */ 0x7DB1, 0x7DB5, 0x0D77,
-	/* Array index: 0x02C4 */ 0x7DBA, 0x7DBF, 0x0D7C,
-	/* Array index: 0x02C7 */ 0x7DDD, 0x7DE3, 0x0D82,
-	/* Array index: 0x02CA */ 0x7E1B, 0x7E23, 0x0D89,
-	/* Array index: 0x02CD */ 0x7E69, 0x7E6D, 0x0D92,
-	/* Array index: 0x02D0 */ 0x7FDF, 0x7FE1, 0x0D97,
-	/* Array index: 0x02D3 */ 0x806F, 0x8073, 0x0D9A,
-	/* Array index: 0x02D6 */ 0x807D, 0x807F, 0x0D9F,
-	/* Array index: 0x02D9 */ 0x8084, 0x808C, 0x0DA2,
-	/* Array index: 0x02DC */ 0x8105, 0x810A, 0x0DAB,
-	/* Array index: 0x02DF */ 0x8178, 0x817A, 0x0DB1,
-	/* Array index: 0x02E2 */ 0x81BD, 0x81C2, 0x0DB4,
-	/* Array index: 0x02E5 */ 0x81FA, 0x81FE, 0x0DBA,
-	/* Array index: 0x02E8 */ 0x821B, 0x8221, 0x0DBF,
-	/* Array index: 0x02EB */ 0x822A, 0x822C, 0x0DC6,
-	/* Array index: 0x02EE */ 0x8235, 0x8239, 0x0DC9,
-	/* Array index: 0x02F1 */ 0x826E, 0x8272, 0x0DCE,
-	/* Array index: 0x02F4 */ 0x82AC, 0x82BF, 0x0DD3,
-	/* Array index: 0x02F7 */ 0x82D1, 0x82D7, 0x0DE7,
-	/* Array index: 0x02FA */ 0x82E5, 0x82E7, 0x0DEE,
-	/* Array index: 0x02FD */ 0x82FD, 0x8305, 0x0DF1,
-	/* Array index: 0x0300 */ 0x8334, 0x8339, 0x0DFA,
-	/* Array index: 0x0303 */ 0x83A9, 0x83AB, 0x0E00,
-	/* Array index: 0x0306 */ 0x83EF, 0x83F4, 0x0E03,
-	/* Array index: 0x0309 */ 0x840A, 0x840E, 0x0E09,
-	/* Array index: 0x030C */ 0x8568, 0x856A, 0x0E0E,
-	/* Array index: 0x030F */ 0x85A6, 0x85AA, 0x0E11,
-	/* Array index: 0x0312 */ 0x85CD, 0x85CF, 0x0E16,
-	/* Array index: 0x0315 */ 0x865B, 0x865F, 0x0E19,
-	/* Array index: 0x0318 */ 0x8861, 0x8863, 0x0E1E,
-	/* Array index: 0x031B */ 0x887E, 0x8882, 0x0E21,
-	/* Array index: 0x031E */ 0x88F3, 0x88F5, 0x0E26,
-	/* Array index: 0x0321 */ 0x8A16, 0x8A18, 0x0E29,
-	/* Array index: 0x0324 */ 0x8A6D, 0x8A75, 0x0E2C,
-	/* Array index: 0x0327 */ 0x8AA0, 0x8AAA, 0x0E35,
-	/* Array index: 0x032A */ 0x8AEA, 0x8AEE, 0x0E40,
-	/* Array index: 0x032D */ 0x8AF6, 0x8AFA, 0x0E45,
-	/* Array index: 0x0330 */ 0x8AFE, 0x8B04, 0x0E4A,
-	/* Array index: 0x0333 */ 0x8B16, 0x8B1D, 0x0E51,
-	/* Array index: 0x0336 */ 0x8C9D, 0x8CA2, 0x0E59,
-	/* Array index: 0x0339 */ 0x8CA7, 0x8CCA, 0x0E5F,
-	/* Array index: 0x033C */ 0x8CE0, 0x8CE6, 0x0E83,
-	/* Array index: 0x033F */ 0x8CFB, 0x8CFD, 0x0E8A,
-	/* Array index: 0x0342 */ 0x8D04, 0x8D0A, 0x0E8D,
-	/* Array index: 0x0345 */ 0x8E47, 0x8E4A, 0x0E94,
-	/* Array index: 0x0348 */ 0x8EAA, 0x8EAC, 0x0E98,
-	/* Array index: 0x034B */ 0x8ECA, 0x8ECD, 0x0E9B,
-	/* Array index: 0x034E */ 0x8F12, 0x8F15, 0x0E9F,
-	/* Array index: 0x0351 */ 0x8F1B, 0x8F1F, 0x0EA3,
-	/* Array index: 0x0354 */ 0x8F26, 0x8F2A, 0x0EA8,
-	/* Array index: 0x0357 */ 0x8FAD, 0x8FB2, 0x0EAD,
-	/* Array index: 0x035A */ 0x9000, 0x9008, 0x0EB3,
-	/* Array index: 0x035D */ 0x900D, 0x9023, 0x0EBC,
-	/* Array index: 0x0360 */ 0x904A, 0x9055, 0x0ED3,
-	/* Array index: 0x0363 */ 0x905C, 0x9063, 0x0EDF,
-	/* Array index: 0x0366 */ 0x906D, 0x906F, 0x0EE7,
-	/* Array index: 0x0369 */ 0x907C, 0x908A, 0x0EEA,
-	/* Array index: 0x036C */ 0x90AF, 0x90B1, 0x0EF9,
-	/* Array index: 0x036F */ 0x9149, 0x914E, 0x0EFC,
-	/* Array index: 0x0372 */ 0x91AB, 0x91B5, 0x0F02,
-	/* Array index: 0x0375 */ 0x91C9, 0x91D1, 0x0F0D,
-	/* Array index: 0x0378 */ 0x9210, 0x9212, 0x0F16,
-	/* Array index: 0x037B */ 0x9262, 0x9266, 0x0F19,
-	/* Array index: 0x037E */ 0x931E, 0x9328, 0x0F1E,
-	/* Array index: 0x0381 */ 0x958F, 0x9594, 0x0F29,
-	/* Array index: 0x0384 */ 0x95A3, 0x95A5, 0x0F2F,
-	/* Array index: 0x0387 */ 0x95D4, 0x95D6, 0x0F32,
-	/* Array index: 0x038A */ 0x964B, 0x964D, 0x0F35,
-	/* Array index: 0x038D */ 0x965B, 0x9664, 0x0F38,
-	/* Array index: 0x0390 */ 0x9673, 0x9678, 0x0F42,
-	/* Array index: 0x0393 */ 0x968A, 0x968E, 0x0F48,
-	/* Array index: 0x0396 */ 0x9698, 0x969C, 0x0F4D,
-	/* Array index: 0x0399 */ 0x96C0, 0x96CE, 0x0F52,
-	/* Array index: 0x039C */ 0x96E8, 0x96EA, 0x0F61,
-	/* Array index: 0x039F */ 0x97FF, 0x9813, 0x0F64,
-	/* Array index: 0x03A2 */ 0x984C, 0x984E, 0x0F79,
-	/* Array index: 0x03A5 */ 0x98ED, 0x98EF, 0x0F7C,
-	/* Array index: 0x03A8 */ 0x98FC, 0x98FE, 0x0F7F,
-	/* Array index: 0x03AB */ 0x9949, 0x994D, 0x0F82,
-	/* Array index: 0x03AE */ 0x99AC, 0x99AE, 0x0F87,
-	/* Array index: 0x03B1 */ 0x99D0, 0x99D2, 0x0F8A,
-	/* Array index: 0x03B4 */ 0x9B41, 0x9B45, 0x0F8D,
-	/* Array index: 0x03B7 */ 0x9DF8, 0x9DFA, 0x0F92,
-	/* Array index: 0x03BA */ 0xAC07, 0xAC0A, 0x0F95,
-	/* Array index: 0x03BD */ 0xAC10, 0xAC1D, 0x0F99,
-	/* Array index: 0x03C0 */ 0xAC2C, 0xAC31, 0x0FA7,
-	/* Array index: 0x03C3 */ 0xAC80, 0xAC8C, 0x0FAD,
-	/* Array index: 0x03C6 */ 0xAC9C, 0xACA1, 0x0FBA,
-	/* Array index: 0x03C9 */ 0xACA8, 0xACB0, 0x0FC0,
-	/* Array index: 0x03CC */ 0xACB8, 0xACBD, 0x0FC9,
-	/* Array index: 0x03CF */ 0xACEF, 0xACF6, 0x0FCF,
-	/* Array index: 0x03D2 */ 0xAD73, 0xAD76, 0x0FD7,
-	/* Array index: 0x03D5 */ 0xAD7B, 0xAD82, 0x0FDB,
-	/* Array index: 0x03D8 */ 0xADFF, 0xAE01, 0x0FE3,
-	/* Array index: 0x03DB */ 0xAE4A, 0xAE50, 0x0FE6,
-	/* Array index: 0x03DE */ 0xAE5C, 0xAE61, 0x0FED,
-	/* Array index: 0x03E1 */ 0xAE78, 0xAE7D, 0x0FF3,
-	/* Array index: 0x03E4 */ 0xAEBC, 0xAEC0, 0x0FF9,
-	/* Array index: 0x03E7 */ 0xAECC, 0xAED1, 0x0FFE,
-	/* Array index: 0x03EA */ 0xAF3F, 0xAF43, 0x1004,
-	/* Array index: 0x03ED */ 0xAFC7, 0xAFCE, 0x1009,
-	/* Array index: 0x03F0 */ 0xB053, 0xB059, 0x1011,
-	/* Array index: 0x03F3 */ 0xB098, 0xB0A2, 0x1018,
-	/* Array index: 0x03F6 */ 0xB0A8, 0xB0B5, 0x1023,
-	/* Array index: 0x03F9 */ 0xB0C4, 0xB0C9, 0x1031,
-	/* Array index: 0x03FC */ 0xB108, 0xB10C, 0x1037,
-	/* Array index: 0x03FF */ 0xB118, 0xB11D, 0x103C,
-	/* Array index: 0x0402 */ 0xB123, 0xB125, 0x1042,
-	/* Array index: 0x0405 */ 0xB134, 0xB139, 0x1045,
-	/* Array index: 0x0408 */ 0xB192, 0xB194, 0x104B,
-	/* Array index: 0x040B */ 0xB298, 0xB29A, 0x104E,
-	/* Array index: 0x040E */ 0xB2E2, 0xB301, 0x1051,
-	/* Array index: 0x0411 */ 0xB310, 0xB315, 0x1071,
-	/* Array index: 0x0414 */ 0xB354, 0xB35F, 0x1077,
-	/* Array index: 0x0417 */ 0xB380, 0xB385, 0x1083,
-	/* Array index: 0x041A */ 0xB524, 0xB52A, 0x1089,
-	/* Array index: 0x041D */ 0xB540, 0xB545, 0x1090,
-	/* Array index: 0x0420 */ 0xB54B, 0xB54D, 0x1096,
-	/* Array index: 0x0423 */ 0xB55C, 0xB561, 0x1099,
-	/* Array index: 0x0426 */ 0xB5B0, 0xB5B5, 0x109F,
-	/* Array index: 0x0429 */ 0xB5BB, 0xB5BD, 0x10A5,
-	/* Array index: 0x042C */ 0xB5CC, 0xB5D1, 0x10A8,
-	/* Array index: 0x042F */ 0xB78C, 0xB799, 0x10AE,
-	/* Array index: 0x0432 */ 0xB7A8, 0xB7AD, 0x10BC,
-	/* Array index: 0x0435 */ 0xB7FC, 0xB801, 0x10C2,
-	/* Array index: 0x0438 */ 0xB807, 0xB809, 0x10C8,
-	/* Array index: 0x043B */ 0xB834, 0xB839, 0x10CB,
-	/* Array index: 0x043E */ 0xB9CC, 0xB9D2, 0x10D1,
-	/* Array index: 0x0441 */ 0xB9E1, 0xB9E5, 0x10D8,
-	/* Array index: 0x0444 */ 0xB9F4, 0xB9FA, 0x10DD,
-	/* Array index: 0x0447 */ 0xBA53, 0xBA55, 0x10E4,
-	/* Array index: 0x044A */ 0xBA64, 0xBA69, 0x10E7,
-	/* Array index: 0x044D */ 0xBA83, 0xBA87, 0x10ED,
-	/* Array index: 0x0450 */ 0xBAA8, 0xBAAC, 0x10F2,
-	/* Array index: 0x0453 */ 0xBB34, 0xBB3E, 0x10F7,
-	/* Array index: 0x0456 */ 0xBC08, 0xBC1F, 0x1102,
-	/* Array index: 0x0459 */ 0xBC40, 0xBC45, 0x111A,
-	/* Array index: 0x045C */ 0xBCB0, 0xBCB5, 0x1120,
-	/* Array index: 0x045F */ 0xBCCD, 0xBCD1, 0x1126,
-	/* Array index: 0x0462 */ 0xBCF4, 0xBCF8, 0x112B,
-	/* Array index: 0x0465 */ 0xBD87, 0xBD8A, 0x1130,
-	/* Array index: 0x0468 */ 0xBE57, 0xBE5B, 0x1134,
-	/* Array index: 0x046B */ 0xBE70, 0xBE75, 0x1139,
-	/* Array index: 0x046E */ 0xBE7B, 0xBE7D, 0x113F,
-	/* Array index: 0x0471 */ 0xBE8C, 0xBE91, 0x1142,
-	/* Array index: 0x0474 */ 0xBEE3, 0xBEE5, 0x1148,
-	/* Array index: 0x0477 */ 0xBF18, 0xBF1D, 0x114B,
-	/* Array index: 0x047A */ 0xC0AC, 0xC0B6, 0x1151,
-	/* Array index: 0x047D */ 0xC0BC, 0xC0C1, 0x115C,
-	/* Array index: 0x0480 */ 0xC0D8, 0xC0DD, 0x1162,
-	/* Array index: 0x0483 */ 0xC11C, 0xC127, 0x1168,
-	/* Array index: 0x0486 */ 0xC12C, 0xC131, 0x1174,
-	/* Array index: 0x0489 */ 0xC148, 0xC14D, 0x117A,
-	/* Array index: 0x048C */ 0xC164, 0xC169, 0x1180,
-	/* Array index: 0x048F */ 0xC18C, 0xC190, 0x1186,
-	/* Array index: 0x0492 */ 0xC2EB, 0xC2F1, 0x118B,
-	/* Array index: 0x0495 */ 0xC2F8, 0xC2FC, 0x1192,
-	/* Array index: 0x0498 */ 0xC313, 0xC315, 0x1197,
-	/* Array index: 0x049B */ 0xC4FF, 0xC501, 0x119A,
-	/* Array index: 0x049E */ 0xC544, 0xC54E, 0x119D,
-	/* Array index: 0x04A1 */ 0xC553, 0xC559, 0x11A8,
-	/* Array index: 0x04A4 */ 0xC55D, 0xC561, 0x11AF,
-	/* Array index: 0x04A7 */ 0xC570, 0xC575, 0x11B4,
-	/* Array index: 0x04AA */ 0xC5B8, 0xC5BE, 0x11BA,
-	/* Array index: 0x04AD */ 0xC5C4, 0xC5D1, 0x11C1,
-	/* Array index: 0x04B0 */ 0xC5EC, 0xC5F0, 0x11CF,
-	/* Array index: 0x04B3 */ 0xC5FC, 0xC608, 0x11D4,
-	/* Array index: 0x04B6 */ 0xC618, 0xC61C, 0x11E1,
-	/* Array index: 0x04B9 */ 0xC62C, 0xC63B, 0x11E6,
-	/* Array index: 0x04BC */ 0xC650, 0xC655, 0x11F6,
-	/* Array index: 0x04BF */ 0xC6B8, 0xC6BA, 0x11FC,
-	/* Array index: 0x04C2 */ 0xC74F, 0xC758, 0x11FF,
-	/* Array index: 0x04C5 */ 0xC77C, 0xC77E, 0x1209,
-	/* Array index: 0x04C8 */ 0xC783, 0xC78A, 0x120C,
-	/* Array index: 0x04CB */ 0xC794, 0xC79A, 0x1214,
-	/* Array index: 0x04CE */ 0xC7A0, 0xC7A6, 0x121B,
-	/* Array index: 0x04D1 */ 0xC7BC, 0xC7C1, 0x1222,
-	/* Array index: 0x04D4 */ 0xC883, 0xC88D, 0x1228,
-	/* Array index: 0x04D7 */ 0xC904, 0xC906, 0x1233,
-	/* Array index: 0x04DA */ 0xC9D9, 0xC9DD, 0x1236,
-	/* Array index: 0x04DD */ 0xC9EC, 0xC9F1, 0x123B,
-	/* Array index: 0x04E0 */ 0xCA08, 0xCA0D, 0x1241,
-	/* Array index: 0x04E3 */ 0xCA5C, 0xCA61, 0x1247,
-	/* Array index: 0x04E6 */ 0xCC27, 0xCC29, 0x124D,
-	/* Array index: 0x04E9 */ 0xCC38, 0xCC3E, 0x1250,
-	/* Array index: 0x04EC */ 0xCC54, 0xCC59, 0x1257,
-	/* Array index: 0x04EF */ 0xCCA8, 0xCCAD, 0x125D,
-	/* Array index: 0x04F2 */ 0xCE5F, 0xCE61, 0x1263,
-	/* Array index: 0x04F5 */ 0xCEA0, 0xCEA5, 0x1266,
-	/* Array index: 0x04F8 */ 0xCEF4, 0xCEF9, 0x126C,
-	/* Array index: 0x04FB */ 0xCF2C, 0xCF31, 0x1272,
-	/* Array index: 0x04FE */ 0xD0D0, 0xD0D5, 0x1278,
-	/* Array index: 0x0501 */ 0xD0EC, 0xD0F1, 0x127E,
-	/* Array index: 0x0504 */ 0xD140, 0xD145, 0x1284,
-	/* Array index: 0x0507 */ 0xD30C, 0xD310, 0x128A,
-	/* Array index: 0x050A */ 0xD31C, 0xD321, 0x128F,
-	/* Array index: 0x050D */ 0xD338, 0xD33D, 0x1295,
-	/* Array index: 0x0510 */ 0xD38C, 0xD391, 0x129B,
-	/* Array index: 0x0513 */ 0xD584, 0xD589, 0x12A1,
-	/* Array index: 0x0516 */ 0xD610, 0xD615, 0x12A7,
-	/* Array index: 0x0519 */ 0xD754, 0xD759, 0x12AD,
-	/* Array index: 0x051C */ 0xF900, 0xFA0B, 0x12B3,
-	/* Array index: 0x051F */ 0xFF01, 0xFF5E, 0x13BF,
-	/* Array index: 0x0522 */ 0xFFE0, 0xFFE6, 0x141D,
-	/* Ranges content */
-	/* Range 0x00B0 - 0x00BF, array index: 0x0525 */
-	0x2146,0x213E,0x2977,0x2978,0x2225,INVALC,0x2252,0x2124,
-	0x222C,0x2976,0x282C,INVALC,0x2879,0x2876,0x287A,0x222F,
-	/* Range 0x0131 - 0x0133, array index: 0x0535 */
-	0x2925,0x2826,0x2926,
-	/* Range 0x013F - 0x0142, array index: 0x0538 */
-	0x2828,0x2928,0x2829,0x2929,
-	/* Range 0x0149 - 0x014B, array index: 0x053C */
-	0x2930,0x282F,0x292F,
-	/* Range 0x02D8 - 0x02DD, array index: 0x053F */
-	0x2228,0x222B,0x222A,0x222D,INVALC,0x2229,
-	/* Range 0x0391 - 0x03A9, array index: 0x0545 */
-	0x2541,0x2542,0x2543,0x2544,0x2545,0x2546,0x2547,0x2548,
-	0x2549,0x254A,0x254B,0x254C,0x254D,0x254E,0x254F,0x2550,
-	0x2551,INVALC,0x2552,0x2553,0x2554,0x2555,0x2556,0x2557,
-	0x2558,
-	/* Range 0x03B1 - 0x03C9, array index: 0x055E */
-	0x2561,0x2562,0x2563,0x2564,0x2565,0x2566,0x2567,0x2568,
-	0x2569,0x256A,0x256B,0x256C,0x256D,0x256E,0x256F,0x2570,
-	0x2571,INVALC,0x2572,0x2573,0x2574,0x2575,0x2576,0x2577,
-	0x2578,
-	/* Range 0x0410 - 0x0451, array index: 0x0577 */
-	0x2C21,0x2C22,0x2C23,0x2C24,0x2C25,0x2C26,0x2C28,0x2C29,
-	0x2C2A,0x2C2B,0x2C2C,0x2C2D,0x2C2E,0x2C2F,0x2C30,0x2C31,
-	0x2C32,0x2C33,0x2C34,0x2C35,0x2C36,0x2C37,0x2C38,0x2C39,
-	0x2C3A,0x2C3B,0x2C3C,0x2C3D,0x2C3E,0x2C3F,0x2C40,0x2C41,
-	0x2C51,0x2C52,0x2C53,0x2C54,0x2C55,0x2C56,0x2C58,0x2C59,
-	0x2C5A,0x2C5B,0x2C5C,0x2C5D,0x2C5E,0x2C5F,0x2C60,0x2C61,
-	0x2C62,0x2C63,0x2C64,0x2C65,0x2C66,0x2C67,0x2C68,0x2C69,
-	0x2C6A,0x2C6B,0x2C6C,0x2C6D,0x2C6E,0x2C6F,0x2C70,0x2C71,
-	INVALC,0x2C57,
-	/* Range 0x207F - 0x2084, array index: 0x05B9 */
-	0x297A,INVALC,0x297B,0x297C,0x297D,0x297E,
-	/* Range 0x215B - 0x2169, array index: 0x05BF */
-	0x287B,0x287C,0x287D,0x287E,INVALC,0x2530,0x2531,0x2532,
-	0x2533,0x2534,0x2535,0x2536,0x2537,0x2538,0x2539,
-	/* Range 0x2170 - 0x2179, array index: 0x05CE */
-	0x2521,0x2522,0x2523,0x2524,0x2525,0x2526,0x2527,0x2528,
-	0x2529,0x252A,
-	/* Range 0x2190 - 0x2199, array index: 0x05D8 */
-	0x2167,0x2168,0x2166,0x2169,0x216A,0x2255,0x2258,0x2256,
-	0x2259,0x2257,
-	/* Range 0x2225 - 0x222E, array index: 0x05E2 */
-	0x212B,INVALC,0x217C,0x217D,0x217B,0x217A,0x2172,0x2173,
-	INVALC,0x2231,
-	/* Range 0x2460 - 0x246E, array index: 0x05EC */
-	0x2867,0x2868,0x2869,0x286A,0x286B,0x286C,0x286D,0x286E,
-	0x286F,0x2870,0x2871,0x2872,0x2873,0x2874,0x2875,
-	/* Range 0x2474 - 0x2482, array index: 0x05FB */
-	0x2967,0x2968,0x2969,0x296A,0x296B,0x296C,0x296D,0x296E,
-	0x296F,0x2970,0x2971,0x2972,0x2973,0x2974,0x2975,
-	/* Range 0x249C - 0x24B5, array index: 0x060A */
-	0x294D,0x294E,0x294F,0x2950,0x2951,0x2952,0x2953,0x2954,
-	0x2955,0x2956,0x2957,0x2958,0x2959,0x295A,0x295B,0x295C,
-	0x295D,0x295E,0x295F,0x2960,0x2961,0x2962,0x2963,0x2964,
-	0x2965,0x2966,
-	/* Range 0x24D0 - 0x24E9, array index: 0x0624 */
-	0x284D,0x284E,0x284F,0x2850,0x2851,0x2852,0x2853,0x2854,
-	0x2855,0x2856,0x2857,0x2858,0x2859,0x285A,0x285B,0x285C,
-	0x285D,0x285E,0x285F,0x2860,0x2861,0x2862,0x2863,0x2864,
-	0x2865,0x2866,
-	/* Range 0x2500 - 0x2503, array index: 0x063E */
-	0x2621,0x262C,0x2622,0x262D,
-	/* Range 0x250C - 0x254B, array index: 0x0642 */
-	0x2623,0x2648,0x2647,0x262E,0x2624,0x2642,0x2641,0x262F,
-	0x2626,0x2646,0x2645,0x2631,0x2625,0x2644,0x2643,0x2630,
-	0x2627,0x263C,0x2649,0x264A,0x2637,0x264B,0x264C,0x2632,
-	0x2629,0x263E,0x264D,0x264E,0x2639,0x264F,0x2650,0x2634,
-	0x2628,0x2651,0x2652,0x2638,0x263D,0x2653,0x2654,0x2633,
-	0x262A,0x2655,0x2656,0x263A,0x263F,0x2657,0x2658,0x2635,
-	0x262B,0x2659,0x265A,0x263B,0x265B,0x265C,0x2640,0x265D,
-	0x265E,0x265F,0x2660,0x2661,0x2662,0x2663,0x2664,0x2636,
-	/* Range 0x25A0 - 0x25A9, array index: 0x0682 */
-	0x2161,0x2160,INVALC,0x2243,0x2247,0x2248,0x224B,0x224A,
-	0x2249,0x224C,
-	/* Range 0x25C6 - 0x25C8, array index: 0x068C */
-	0x215F,0x215E,0x2242,
-	/* Range 0x25CE - 0x25D1, array index: 0x068F */
-	0x215D,0x215C,0x2244,0x2245,
-	/* Range 0x2660 - 0x266D, array index: 0x0693 */
-	0x223C,0x223D,INVALC,0x2240,0x223B,0x223E,INVALC,0x223F,
-	0x224D,0x225B,0x225C,INVALC,0x225D,0x225A,
-	/* Range 0x3000 - 0x3003, array index: 0x06A1 */
-	0x2121,0x2122,0x2123,0x2128,
-	/* Range 0x3008 - 0x3015, array index: 0x06A5 */
-	0x2134,0x2135,0x2136,0x2137,0x2138,0x2139,0x213A,0x213B,
-	0x213C,0x213D,INVALC,0x216B,0x2132,0x2133,
-	/* Range 0x3041 - 0x3093, array index: 0x06B3 */
-	0x2A21,0x2A22,0x2A23,0x2A24,0x2A25,0x2A26,0x2A27,0x2A28,
-	0x2A29,0x2A2A,0x2A2B,0x2A2C,0x2A2D,0x2A2E,0x2A2F,0x2A30,
-	0x2A31,0x2A32,0x2A33,0x2A34,0x2A35,0x2A36,0x2A37,0x2A38,
-	0x2A39,0x2A3A,0x2A3B,0x2A3C,0x2A3D,0x2A3E,0x2A3F,0x2A40,
-	0x2A41,0x2A42,0x2A43,0x2A44,0x2A45,0x2A46,0x2A47,0x2A48,
-	0x2A49,0x2A4A,0x2A4B,0x2A4C,0x2A4D,0x2A4E,0x2A4F,0x2A50,
-	0x2A51,0x2A52,0x2A53,0x2A54,0x2A55,0x2A56,0x2A57,0x2A58,
-	0x2A59,0x2A5A,0x2A5B,0x2A5C,0x2A5D,0x2A5E,0x2A5F,0x2A60,
-	0x2A61,0x2A62,0x2A63,0x2A64,0x2A65,0x2A66,0x2A67,0x2A68,
-	0x2A69,0x2A6A,0x2A6B,0x2A6C,0x2A6D,0x2A6E,0x2A6F,0x2A70,
-	0x2A71,0x2A72,0x2A73,
-	/* Range 0x30A1 - 0x30F6, array index: 0x0706 */
-	0x2B21,0x2B22,0x2B23,0x2B24,0x2B25,0x2B26,0x2B27,0x2B28,
-	0x2B29,0x2B2A,0x2B2B,0x2B2C,0x2B2D,0x2B2E,0x2B2F,0x2B30,
-	0x2B31,0x2B32,0x2B33,0x2B34,0x2B35,0x2B36,0x2B37,0x2B38,
-	0x2B39,0x2B3A,0x2B3B,0x2B3C,0x2B3D,0x2B3E,0x2B3F,0x2B40,
-	0x2B41,0x2B42,0x2B43,0x2B44,0x2B45,0x2B46,0x2B47,0x2B48,
-	0x2B49,0x2B4A,0x2B4B,0x2B4C,0x2B4D,0x2B4E,0x2B4F,0x2B50,
-	0x2B51,0x2B52,0x2B53,0x2B54,0x2B55,0x2B56,0x2B57,0x2B58,
-	0x2B59,0x2B5A,0x2B5B,0x2B5C,0x2B5D,0x2B5E,0x2B5F,0x2B60,
-	0x2B61,0x2B62,0x2B63,0x2B64,0x2B65,0x2B66,0x2B67,0x2B68,
-	0x2B69,0x2B6A,0x2B6B,0x2B6C,0x2B6D,0x2B6E,0x2B6F,0x2B70,
-	0x2B71,0x2B72,0x2B73,0x2B74,0x2B75,0x2B76,
-	/* Range 0x3131 - 0x318E, array index: 0x075C */
-	0x2421,0x2422,0x2423,0x2424,0x2425,0x2426,0x2427,0x2428,
-	0x2429,0x242A,0x242B,0x242C,0x242D,0x242E,0x242F,0x2430,
-	0x2431,0x2432,0x2433,0x2434,0x2435,0x2436,0x2437,0x2438,
-	0x2439,0x243A,0x243B,0x243C,0x243D,0x243E,0x243F,0x2440,
-	0x2441,0x2442,0x2443,0x2444,0x2445,0x2446,0x2447,0x2448,
-	0x2449,0x244A,0x244B,0x244C,0x244D,0x244E,0x244F,0x2450,
-	0x2451,0x2452,0x2453,0x2454,0x2455,0x2456,0x2457,0x2458,
-	0x2459,0x245A,0x245B,0x245C,0x245D,0x245E,0x245F,0x2460,
-	0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467,0x2468,
-	0x2469,0x246A,0x246B,0x246C,0x246D,0x246E,0x246F,0x2470,
-	0x2471,0x2472,0x2473,0x2474,0x2475,0x2476,0x2477,0x2478,
-	0x2479,0x247A,0x247B,0x247C,0x247D,0x247E,
-	/* Range 0x3200 - 0x321C, array index: 0x07BA */
-	0x2931,0x2932,0x2933,0x2934,0x2935,0x2936,0x2937,0x2938,
-	0x2939,0x293A,0x293B,0x293C,0x293D,0x293E,0x293F,0x2940,
-	0x2941,0x2942,0x2943,0x2944,0x2945,0x2946,0x2947,0x2948,
-	0x2949,0x294A,0x294B,0x294C,0x225F,
-	/* Range 0x3260 - 0x327B, array index: 0x07D7 */
-	0x2831,0x2832,0x2833,0x2834,0x2835,0x2836,0x2837,0x2838,
-	0x2839,0x283A,0x283B,0x283C,0x283D,0x283E,0x283F,0x2840,
-	0x2841,0x2842,0x2843,0x2844,0x2845,0x2846,0x2847,0x2848,
-	0x2849,0x284A,0x284B,0x284C,
-	/* Range 0x3380 - 0x33CA, array index: 0x07F3 */
-	0x2749,0x274A,0x274B,0x274C,0x274D,INVALC,INVALC,INVALC,
-	0x273A,0x273B,0x275C,0x275D,0x275E,0x2736,0x2737,0x2738,
-	0x2754,0x2755,0x2756,0x2757,0x2758,0x2721,0x2722,0x2723,
-	0x2725,0x272B,0x272C,0x272D,0x272E,0x272F,0x2730,0x2731,
-	0x2732,0x2733,0x2734,0x2727,0x2728,0x2729,0x272A,0x273D,
-	0x273E,0x2765,0x2766,0x2767,0x2768,0x2761,0x2762,0x2763,
-	0x273F,0x2740,0x2741,0x2742,0x2743,0x2744,0x2745,0x2746,
-	0x2747,0x2748,0x274E,0x274F,0x2750,0x2751,0x2752,0x2753,
-	0x275A,0x275B,0x2263,0x276C,0x2726,0x2760,0x276F,0x2261,
-	0x273C,0x276D,0x2735,
-	/* Range 0x33DB - 0x33DD, array index: 0x083E */
-	0x2764,0x276E,0x2769,
-	/* Range 0x4E07 - 0x4E0D, array index: 0x0841 */
-	0x5832,0x6D5B,0x5F32,0x5F3E,0x793B,INVALC,0x5C74,
-	/* Range 0x4E14 - 0x4E19, array index: 0x0848 */
-	0x7326,0x5D60,0x6126,INVALC,0x4E78,0x5C30,
-	/* Range 0x4E4B - 0x4E4F, array index: 0x084E */
-	0x717D,INVALC,0x5E3F,0x7B3A,0x7939,
-	/* Range 0x4E5D - 0x4E5F, array index: 0x0853 */
-	0x4E7A,0x4B77,0x6525,
-	/* Range 0x4E8E - 0x4E95, array index: 0x0856 */
-	0x694D,INVALC,0x6A27,0x6976,0x7B3B,INVALC,0x6769,0x6F4C,
-	/* Range 0x4EA1 - 0x4EAE, array index: 0x085E */
-	0x584C,0x7971,INVALC,0x4E5F,0x7A24,0x6632,INVALC,0x7A7B,
-	INVALC,INVALC,0x7A3D,0x4C48,0x6F4D,0x5555,
-	/* Range 0x4ED4 - 0x4ED9, array index: 0x086C */
-	0x6D28,0x5E42,0x7662,0x6D5C,0x5C75,0x6039,
-	/* Range 0x4EE3 - 0x4EE5, array index: 0x0872 */
-	0x535B,0x5635,0x6C24,
-	/* Range 0x4F09 - 0x4F11, array index: 0x0875 */
-	0x7972,0x6C25,0x505F,INVALC,0x676A,0x506B,0x5C51,0x5B69,
-	0x7D4C,
-	/* Range 0x4F46 - 0x4F48, array index: 0x087E */
-	0x5323,0x6E37,0x784F,
-	/* Range 0x4F4D - 0x4F51, array index: 0x0881 */
-	0x6A48,0x6E38,0x712C,0x7125,0x694E,
-	/* Range 0x4F59 - 0x4F5C, array index: 0x0886 */
-	0x6579,0x6C6A,0x5D56,0x6D42,
-	/* Range 0x4FC2 - 0x4FC4, array index: 0x088A */
-	0x4C75,0x7535,0x642D,
-	/* Range 0x4FDD - 0x4FE1, array index: 0x088D */
-	0x5C41,INVALC,0x5E46,0x7A6F,0x6361,
-	/* Range 0x5023 - 0x502D, array index: 0x0892 */
-	0x5B27,0x7637,INVALC,0x4F66,0x7072,0x4B5A,INVALC,0x6752,
-	0x5743,0x7670,0x685E,
-	/* Range 0x5047 - 0x5049, array index: 0x089D */
-	0x4A23,0x4C27,0x6A49,
-	/* Range 0x5074 - 0x5078, array index: 0x08A0 */
-	0x7630,0x6F4F,0x694F,INVALC,0x775E,
-	/* Range 0x50FF - 0x5101, array index: 0x08A5 */
-	0x5E47,0x6B70,0x7156,
-	/* Range 0x5140 - 0x514E, array index: 0x08A8 */
-	0x6834,0x6B43,INVALC,0x6A2A,0x7A7C,0x7576,0x703C,0x7D54,
-	0x603B,0x4E43,INVALC,0x503A,0x773A,0x5873,0x774D,
-	/* Range 0x5165 - 0x516E, array index: 0x08B7 */
-	0x6C7D,INVALC,0x522E,0x6E6F,0x5557,0x6A64,0x7822,0x4D6B,
-	0x573F,0x7B31,
-	/* Range 0x5175 - 0x5178, array index: 0x08C1 */
-	0x5C32,0x506C,0x4E7D,0x6E70,
-	/* Range 0x51C9 - 0x51CD, array index: 0x08C5 */
-	0x5558,INVALC,0x703D,0x5750,0x5450,
-	/* Range 0x51DC - 0x51DE, array index: 0x08CA */
-	0x574F,0x6B6A,0x7D6B,
-	/* Range 0x51F6 - 0x51FA, array index: 0x08CD */
-	0x7D55,INVALC,0x7448,0x686A,0x7573,
-	/* Range 0x5206 - 0x520A, array index: 0x08D2 */
-	0x5D42,0x6F37,0x6754,INVALC,0x4A4A,
-	/* Range 0x5236 - 0x523B, array index: 0x08D7 */
-	0x7024,0x616C,0x4F67,0x734B,0x6D29,0x4A3E,
-	/* Range 0x524A - 0x524D, array index: 0x08DD */
-	0x5E7B,0x503B,0x5537,0x6E71,
-	/* Range 0x5287 - 0x5289, array index: 0x08E1 */
-	0x503C,0x5B79,0x5731,
-	/* Range 0x52A9 - 0x52AB, array index: 0x08E4 */
-	0x703E,0x523D,0x4C24,
-	/* Range 0x52D5 - 0x52E4, array index: 0x08E7 */
-	0x5451,0x696D,INVALC,0x4A6B,0x5962,INVALC,0x7D32,INVALC,
-	0x632D,0x564C,0x5934,INVALC,INVALC,0x6127,0x6E53,0x5043,
-	/* Range 0x5315 - 0x5319, array index: 0x08F7 */
-	0x5D62,0x7B79,0x5D41,INVALC,0x6335,
-	/* Range 0x533F - 0x534A, array index: 0x08FC */
-	0x527B,0x4F21,0x6428,INVALC,0x7436,0x6C7E,INVALC,INVALC,
-	0x632E,0x676D,0x7D41,0x5A62,
-	/* Range 0x5351 - 0x5354, array index: 0x0908 */
-	0x5D64,0x706F,0x7671,0x7A70,
-	/* Range 0x536F - 0x5377, array index: 0x090C */
-	0x5956,0x6C54,0x6A4B,INVALC,INVALC,0x4A3F,0x5530,INVALC,
-	0x4F69,
-	/* Range 0x53C8 - 0x53CD, array index: 0x0915 */
-	0x6951,0x7329,0x5060,0x6952,INVALC,0x5A63,
-	/* Range 0x53E1 - 0x53F3, array index: 0x091B */
-	0x6755,0x753F,0x4F22,0x4D2F,0x4F23,INVALC,INVALC,INVALC,
-	0x4D30,0x717E,0x5023,0x612F,0x7823,INVALC,0x4A26,0x773B,
-	0x726A,0x5E48,0x6953,
-	/* Range 0x5408 - 0x5411, array index: 0x092E */
-	0x796A,0x514E,0x6E54,INVALC,0x5452,0x5923,0x7D28,0x5759,
-	0x774E,0x7A3E,
-	/* Range 0x5438 - 0x543E, array index: 0x0938 */
-	0x7D65,0x7623,INVALC,0x597C,0x7D29,INVALC,0x676E,
-	/* Range 0x547B - 0x547D, array index: 0x093F */
-	0x6362,0x7B3C,0x5924,
-	/* Range 0x5586 - 0x558A, array index: 0x0942 */
-	0x744A,0x547A,INVALC,0x7D2A,0x7962,
-	/* Range 0x5598 - 0x559D, array index: 0x0947 */
-	0x7437,0x7D42,0x7C30,INVALC,0x7D6C,0x4A62,
-	/* Range 0x55A7 - 0x55AE, array index: 0x094D */
-	0x7D3D,INVALC,0x6A67,0x5F43,0x5152,0x4E62,INVALC,0x5324,
-	/* Range 0x574D - 0x5751, array index: 0x0955 */
-	0x533B,0x4A6C,INVALC,0x7126,0x4B55,
-	/* Range 0x5805 - 0x580A, array index: 0x095A */
-	0x4C31,0x7758,INVALC,0x4B28,0x6B3C,0x643E,
-	/* Range 0x582F - 0x5835, array index: 0x0960 */
-	0x686B,0x6568,0x5C43,INVALC,INVALC,0x6D5E,0x5372,
-	/* Range 0x58F9 - 0x58FD, array index: 0x0967 */
-	0x6C6C,0x7B3E,0x5F6B,INVALC,0x6178,
-	/* Range 0x5914 - 0x591C, array index: 0x096C */
-	0x5073,0x602A,0x6862,INVALC,INVALC,0x6254,0x527D,INVALC,
-	0x6528,
-	/* Range 0x5927 - 0x592E, array index: 0x0975 */
-	0x535E,INVALC,0x7438,0x773C,0x5C7D,INVALC,0x686C,0x6467,
-	/* Range 0x5947 - 0x5949, array index: 0x097D */
-	0x5074,0x522F,0x5C65,
-	/* Range 0x594E - 0x5957, array index: 0x0980 */
-	0x5025,0x7134,0x7C31,0x4C78,INVALC,INVALC,0x5D46,0x7A51,
-	INVALC,0x775F,
-	/* Range 0x596A - 0x596E, array index: 0x098A */
-	0x772C,0x6B44,0x6D61,0x602B,0x5D47,
-	/* Range 0x5982 - 0x5984, array index: 0x098F */
-	0x657D,0x5D65,0x584D,
-	/* Range 0x59D0 - 0x59D4, array index: 0x0992 */
-	0x6E3B,0x4D34,INVALC,0x6073,0x6A4D,
-	/* Range 0x59D9 - 0x59DD, array index: 0x0997 */
-	0x6C75,0x686E,INVALC,0x4B29,0x712F,
-	/* Range 0x5B54 - 0x5B5F, array index: 0x099C */
-	0x4D6E,0x6D26,INVALC,0x6D2E,0x706D,INVALC,0x5D21,INVALC,
-	0x6D2F,0x7C78,INVALC,0x586B,
-	/* Range 0x5B85 - 0x5B8C, array index: 0x09A8 */
-	0x536B,INVALC,0x6954,0x617A,0x644C,INVALC,0x6164,0x6847,
-	/* Range 0x5B93 - 0x5B9C, array index: 0x09B0 */
-	0x5C55,INVALC,0x7735,0x7C73,0x7073,0x4E2F,0x7135,0x6F52,
-	0x6848,0x6B71,
-	/* Range 0x5BA2 - 0x5BA6, array index: 0x09BA */
-	0x4B54,0x603E,0x6378,0x6A69,0x7C32,
-	/* Range 0x5BB3 - 0x5BB9, array index: 0x09BF */
-	0x7A2A,0x6643,0x6132,0x4A2B,INVALC,0x6364,0x693B,
-	/* Range 0x5BBF - 0x5BC7, array index: 0x09C6 */
-	0x6256,0x7372,INVALC,0x6E56,0x6A32,0x5076,0x6C59,0x5A4B,
-	0x4F28,
-	/* Range 0x5BD0 - 0x5BD4, array index: 0x09CF */
-	0x585B,INVALC,0x794E,0x6955,0x6351,
-	/* Range 0x5BDE - 0x5BEF, array index: 0x09D4 */
-	0x582C,0x734C,INVALC,0x4D7B,0x7656,INVALC,0x6775,0x686F,
-	0x6379,0x523B,0x7373,0x637B,INVALC,0x5E50,0x4E30,INVALC,
-	0x5677,0x7159,
-	/* Range 0x5C07 - 0x5C11, array index: 0x09E6 */
-	0x6D62,0x6E76,0x6A4F,0x706E,0x637C,INVALC,0x535F,0x5374,
-	0x6133,INVALC,0x6134,
-	/* Range 0x5C38 - 0x5C40, array index: 0x09F1 */
-	0x6339,0x6B45,0x7429,0x4D36,0x5279,INVALC,0x5A2D,0x5263,
-	0x4F51,
-	/* Range 0x5DE1 - 0x5DE8, array index: 0x09FA */
-	0x625E,0x6135,INVALC,INVALC,0x4D6F,0x7127,0x4E65,0x4B5D,
-	/* Range 0x5DF1 - 0x5DF4, array index: 0x0A02 */
-	0x5079,0x6C2B,0x5E53,0x7769,
-	/* Range 0x5E5F - 0x5E63, array index: 0x0A06 */
-	0x763A,INVALC,0x5B5F,0x5353,0x7847,
-	/* Range 0x5E72 - 0x5E7E, array index: 0x0A0B */
-	0x4A4E,0x7841,0x5234,INVALC,INVALC,0x5C34,0x7A39,0x4A4F,
-	INVALC,0x7C33,0x6A6A,0x6A6B,0x507A,
-	/* Range 0x5EB5 - 0x5EB8, array index: 0x0A18 */
-	0x645D,0x5F6E,0x4B2C,0x693C,
-	/* Range 0x5EC8 - 0x5ECA, array index: 0x0A1C */
-	0x793F,0x562F,0x5546,
-	/* Range 0x5EDF - 0x5EE3, array index: 0x0A1F */
-	0x5959,0x735F,INVALC,0x7848,0x4E46,
-	/* Range 0x5F11 - 0x5F18, array index: 0x0A24 */
-	0x633D,INVALC,0x4F61,0x7040,0x6C5A,INVALC,0x5D57,0x7B70,
-	/* Range 0x5F66 - 0x5F71, array index: 0x0A2C */
-	0x6569,0x696E,INVALC,0x7374,0x7873,0x7041,0x5E2F,0x7830,
-	INVALC,INVALC,0x7360,0x672F,
-	/* Range 0x5F7F - 0x5F81, array index: 0x0A38 */
-	0x5D58,0x6859,0x6F56,
-	/* Range 0x5F8A - 0x5F92, array index: 0x0A3B */
-	0x7C60,0x5748,0x7D2D,INVALC,INVALC,INVALC,0x5F6F,0x4C53,
-	0x5379,
-	/* Range 0x5F97 - 0x5F99, array index: 0x0A44 */
-	0x5470,0x5B47,0x5E55,
-	/* Range 0x5FA8 - 0x5FAA, array index: 0x0A47 */
-	0x7C47,0x5C56,0x6260,
-	/* Range 0x5FD6 - 0x5FD9, array index: 0x0A4A */
-	0x753C,0x7224,0x584E,0x584F,
-	/* Range 0x6041 - 0x6043, array index: 0x0A4E */
-	0x6C76,0x6261,0x633E,
-	/* Range 0x6062 - 0x6070, array index: 0x0A51 */
-	0x7C61,0x6D30,0x7D51,0x763B,INVALC,INVALC,0x794F,0x6B5A,
-	0x4A41,INVALC,0x5238,0x4D71,INVALC,0x6353,0x7D66,
-	/* Range 0x60B0 - 0x60B8, array index: 0x0A60 */
-	0x7075,INVALC,0x5D68,0x536D,0x757C,INVALC,0x5A3F,INVALC,
-	0x4C7B,
-	/* Range 0x60DF - 0x60E1, array index: 0x0A69 */
-	0x6A6E,0x7B33,0x6442,
-	/* Range 0x60F9 - 0x60FB, array index: 0x0A6C */
-	0x6529,0x6076,0x7633,
-	/* Range 0x610D - 0x610F, array index: 0x0A6F */
-	0x5A40,0x7834,0x6B72,
-	/* Range 0x6147 - 0x614C, array index: 0x0A72 */
-	0x6B5B,0x6D31,INVALC,0x4C43,0x773E,0x7C4B,
-	/* Range 0x6162 - 0x6168, array index: 0x0A78 */
-	0x5837,0x4E31,0x4A42,INVALC,INVALC,0x7B34,0x4B46,
-	/* Range 0x6198 - 0x619A, array index: 0x0A7F */
-	0x7D73,0x7D72,0x7726,
-	/* Range 0x61C7 - 0x61CB, array index: 0x0A82 */
-	0x4A50,0x7A2B,0x6B6B,0x6778,0x5965,
-	/* Range 0x61F6 - 0x6200, array index: 0x0A87 */
-	0x547B,0x7C63,0x7A58,INVALC,0x7355,INVALC,0x4F2B,INVALC,
-	INVALC,0x6B73,0x557C,
-	/* Range 0x620A - 0x6212, array index: 0x0A92 */
-	0x5966,INVALC,0x6279,0x6221,0x6B54,INVALC,0x6077,0x6432,
-	0x4C7C,
-	/* Range 0x623E - 0x6241, array index: 0x0A9B */
-	0x5568,0x5B2E,0x6136,0x7837,
-	/* Range 0x6247 - 0x624D, array index: 0x0A9F */
-	0x603F,0x7B43,0x5D6A,INVALC,0x6222,INVALC,0x6E26,
-	/* Range 0x62C7 - 0x62DC, array index: 0x0AA6 */
-	0x5967,0x5239,0x5543,INVALC,INVALC,0x5A65,0x5A50,INVALC,
-	0x5159,0x4E58,INVALC,0x4B5E,0x742C,0x5A7B,INVALC,0x7669,
-	0x6873,0x4F2C,0x7070,INVALC,0x747D,0x5B48,
-	/* Range 0x62EC - 0x62F3, array index: 0x0ABC */
-	0x4E40,0x6354,0x514F,0x7175,INVALC,0x4D72,INVALC,0x4F6B,
-	/* Range 0x633A - 0x633E, array index: 0x0AC4 */
-	0x6F58,0x6649,INVALC,0x5838,0x7A73,
-	/* Range 0x63A0 - 0x63A2, array index: 0x0AC9 */
-	0x5553,0x7375,0x772E,
-	/* Range 0x63A5 - 0x63AA, array index: 0x0ACC */
-	0x6F48,INVALC,0x4D73,0x754F,0x6573,0x7042,
-	/* Range 0x6478 - 0x647A, array index: 0x0AD2 */
-	0x5938,0x5939,0x6F49,
-	/* Range 0x6491 - 0x6493, array index: 0x0AD5 */
-	0x774B,0x5F2E,0x6875,
-	/* Range 0x64E1 - 0x64E7, array index: 0x0AD8 */
-	0x5364,0x7677,INVALC,INVALC,0x553A,0x734D,0x4B61,
-	/* Range 0x652A - 0x652C, array index: 0x0ADF */
-	0x4E66,0x7C2B,0x553B,
-	/* Range 0x6536 - 0x653F, array index: 0x0AE2 */
-	0x6225,0x4D39,0x6A72,0x4B47,INVALC,0x4D74,INVALC,INVALC,
-	0x5B2F,0x6F59,
-	/* Range 0x654D - 0x6551, array index: 0x0AEC */
-	0x5F73,0x4E67,0x5A42,INVALC,0x4F2D,
-	/* Range 0x6574 - 0x6578, array index: 0x0AF1 */
-	0x6F5A,0x6E58,INVALC,0x5D27,0x6226,
-	/* Range 0x65E5 - 0x65ED, array index: 0x0AF6 */
-	0x6C6D,0x5329,INVALC,0x7229,0x7044,INVALC,INVALC,0x6262,
-	0x696F,
-	/* Range 0x65FA - 0x65FF, array index: 0x0AFF */
-	0x685A,0x5A43,0x5A44,0x5445,INVALC,0x677A,
-	/* Range 0x6606 - 0x6615, array index: 0x0B05 */
-	0x4D60,0x6330,INVALC,0x5B32,0x7B44,INVALC,0x7363,INVALC,
-	0x5925,0x7B67,0x5D4B,0x5054,INVALC,0x6636,0x602E,0x7D5A,
-	/* Range 0x661E - 0x6620, array index: 0x0B15 */
-	0x5C35,0x6078,0x6731,
-	/* Range 0x662D - 0x6631, array index: 0x0B18 */
-	0x6139,INVALC,0x6340,0x7940,0x6970,
-	/* Range 0x6641 - 0x6644, array index: 0x0B1D */
-	0x7045,0x6341,0x7C4C,0x7C4D,
-	/* Range 0x665B - 0x665F, array index: 0x0B21 */
-	0x7A59,INVALC,0x7138,0x7D75,0x6079,
-	/* Range 0x6664 - 0x666F, array index: 0x0B26 */
-	0x677B,0x7C37,0x7C64,0x7B45,0x6367,0x5839,INVALC,0x7678,
-	INVALC,INVALC,0x5C45,0x4C58,
-	/* Range 0x6673 - 0x667A, array index: 0x0B32 */
-	0x602F,0x7467,INVALC,0x6F5C,0x4F7C,0x6F5D,INVALC,0x722A,
-	/* Range 0x6687 - 0x6689, array index: 0x0B3A */
-	0x4A2C,0x7D3B,0x7D47,
-	/* Range 0x6696 - 0x6698, array index: 0x0B3D */
-	0x516C,0x645E,0x6543,
-	/* Range 0x66B2 - 0x66B4, array index: 0x0B40 */
-	0x6D67,0x7B35,0x786C,
-	/* Range 0x66F0 - 0x6700, array index: 0x0B43 */
-	0x6858,INVALC,0x4D58,0x6756,0x4C5A,INVALC,INVALC,0x4A63,
-	0x5F76,0x7047,0x7046,INVALC,0x583A,INVALC,0x7174,0x7470,
-	0x754C,
-	/* Range 0x671B - 0x671F, array index: 0x0B54 */
-	0x5850,INVALC,0x7048,0x5121,0x5122,
-	/* Range 0x6726 - 0x672E, array index: 0x0B59 */
-	0x5954,0x5668,0x594A,INVALC,0x5A31,0x5847,0x5C62,0x734E,
-	0x7574,
-	/* Range 0x674E - 0x6753, array index: 0x0B62 */
-	0x575D,0x7A3A,0x6E27,0x753D,INVALC,0x7875,
-	/* Range 0x676D - 0x6777, array index: 0x0B68 */
-	0x7978,INVALC,0x5B4A,0x4B79,0x5454,INVALC,0x595C,INVALC,
-	0x6E3E,INVALC,0x776D,
-	/* Range 0x67B6 - 0x67B8, array index: 0x0B73 */
-	0x4A2D,0x4A2E,0x4F2E,
-	/* Range 0x67CF - 0x67D4, array index: 0x0B76 */
-	0x5B5A,0x593B,0x4A73,0x7653,0x6678,0x6A75,
-	/* Range 0x67EF - 0x67F6, array index: 0x0B7C */
-	0x4A2F,0x5230,0x713A,INVALC,0x5733,0x6343,0x737D,0x5E5A,
-	/* Range 0x683C - 0x6843, array index: 0x0B84 */
-	0x4C2B,0x6E28,INVALC,INVALC,0x4B7A,0x7979,0x4C7D,0x537E,
-	/* Range 0x6850 - 0x6854, array index: 0x0B8C */
-	0x5455,0x5F4D,INVALC,0x7C38,0x5150,
-	/* Range 0x68AD - 0x68B6, array index: 0x0B91 */
-	0x5E5C,INVALC,0x702C,0x4C7E,0x4D61,INVALC,0x613A,INVALC,
-	0x5B6F,0x5A32,
-	/* Range 0x6953 - 0x695A, array index: 0x0B9B */
-	0x7923,0x605B,0x766B,INVALC,0x4B71,INVALC,0x596A,0x7522,
-	/* Range 0x695E - 0x6963, array index: 0x0BA3 */
-	0x5751,INVALC,0x5178,0x6A78,0x6A79,0x5A33,
-	/* Range 0x696B - 0x696F, array index: 0x0BA9 */
-	0x716F,INVALC,0x6576,0x6E3F,0x6264,
-	/* Range 0x6975 - 0x6979, array index: 0x0BAE */
-	0x503F,INVALC,0x7A2C,0x7551,0x6733,
-	/* Range 0x69CB - 0x69CD, array index: 0x0BB3 */
-	0x4F30,0x7759,0x7366,
-	/* Range 0x6A38 - 0x6A3A, array index: 0x0BB6 */
-	0x5A54,0x6227,0x7B7C,
-	/* Range 0x6B5F - 0x6B66, array index: 0x0BB9 */
-	0x6622,INVALC,0x7C36,0x722D,0x6F61,0x732E,0x5C46,0x596B,
-	/* Range 0x6BD2 - 0x6BD8, array index: 0x0BC1 */
-	0x5438,0x6B3E,0x5D6F,INVALC,0x5D70,0x5D71,0x5D72,
-	/* Range 0x6C3E - 0x6C42, array index: 0x0BC8 */
-	0x5B70,INVALC,0x6F62,0x7170,0x4F34,
-	/* Range 0x6C5D - 0x6C60, array index: 0x0BCD */
-	0x6623,0x7B71,0x4B30,0x722E,
-	/* Range 0x6C7D - 0x6C88, array index: 0x0BD1 */
-	0x5129,0x5D4C,INVALC,INVALC,0x637E,0x512A,0x682A,INVALC,
-	0x6A36,0x797A,0x664C,0x7658,
-	/* Range 0x6C90 - 0x6C9B, array index: 0x0BDD */
-	0x594B,INVALC,0x5952,0x534B,0x5877,0x5A29,0x7578,INVALC,
-	INVALC,0x5E5E,0x722F,0x7829,
-	/* Range 0x6CB8 - 0x6CC4, array index: 0x0BE9 */
-	0x5D73,0x6A7A,INVALC,0x763D,0x613B,0x4D3F,0x7454,0x664D,
-	INVALC,0x7C4F,0x7B22,INVALC,0x605C,
-	/* Range 0x6CE1 - 0x6CE5, array index: 0x0BF6 */
-	0x785C,0x776E,0x6B68,INVALC,0x527A,
-	/* Range 0x6CEE - 0x6CF0, array index: 0x0BFB */
-	0x5A6A,0x5A46,0x7741,
-	/* Range 0x6D35 - 0x6D3E, array index: 0x0BFE */
-	0x6267,0x7D57,INVALC,0x4E48,0x6A37,INVALC,0x7C40,INVALC,
-	0x7D67,0x776F,
-	/* Range 0x6D77 - 0x6D79, array index: 0x0C08 */
-	0x7A2D,0x7659,0x7A74,
-	/* Range 0x6D85 - 0x6D8E, array index: 0x0C0B */
-	0x666E,INVALC,0x4C5C,0x613C,0x606F,INVALC,INVALC,0x693F,
-	0x7C7D,0x664E,
-	/* Range 0x6DC3 - 0x6DC7, array index: 0x0C15 */
-	0x4F6E,0x763E,0x6032,0x7C7E,0x512B,
-	/* Range 0x6DD8 - 0x6DDA, array index: 0x0C1A */
-	0x5423,0x7078,0x5728,
-	/* Range 0x6DF5 - 0x6DFB, array index: 0x0C1D */
-	0x6650,INVALC,0x7B68,0x7468,0x6574,0x743C,0x7455,
-	/* Range 0x6E17 - 0x6E26, array index: 0x0C24 */
-	0x5F36,INVALC,0x7C39,0x6E42,0x4A75,INVALC,INVALC,INVALC,
-	0x6F65,0x4B62,0x5424,INVALC,0x5E60,0x5A7D,0x6446,0x683E,
-	/* Range 0x6E2B - 0x6E2F, array index: 0x0C34 */
-	0x605E,0x7634,0x6A52,INVALC,0x797B,
-	/* Range 0x6E3A - 0x6E3E, array index: 0x0C39 */
-	0x595D,INVALC,0x5A34,0x6E2A,0x7B69,
-	/* Range 0x6E5B - 0x6E5F, array index: 0x0C3E */
-	0x5340,0x6357,INVALC,0x6F66,0x7C50,
-	/* Range 0x6EFE - 0x6F02, array index: 0x0C43 */
-	0x4D63,0x583B,INVALC,0x655B,0x7877,
-	/* Range 0x6F57 - 0x6F5F, array index: 0x0C48 */
-	0x727C,0x5A6B,INVALC,0x6258,0x6D56,INVALC,INVALC,0x5651,
-	0x6033,
-	/* Range 0x6F7A - 0x6F7E, array index: 0x0C51 */
-	0x6D52,INVALC,0x5458,0x5C49,0x5771,
-	/* Range 0x6FBE - 0x6FC3, array index: 0x0C56 */
-	0x5336,INVALC,0x4C2D,0x767A,0x5632,0x5258,
-	/* Range 0x6FDF - 0x6FE1, array index: 0x0C5C */
-	0x702D,0x7B4C,0x6B21,
-	/* Range 0x7018 - 0x701F, array index: 0x0C5F */
-	0x5652,INVALC,0x7955,0x673A,0x6B55,0x5577,0x6F67,0x613E,
-	/* Range 0x7098 - 0x709A, array index: 0x0C67 */
-	0x7D5C,0x6D33,0x4E49,
-	/* Range 0x70AB - 0x70AF, array index: 0x0C6A */
-	0x7A5B,0x4B63,0x7729,INVALC,0x7B26,
-	/* Range 0x70B7 - 0x70B9, array index: 0x0C6F */
-	0x7140,0x6D48,0x6F43,
-	/* Range 0x7164 - 0x7169, array index: 0x0C72 */
-	0x5860,0x7C3A,0x7D2F,0x704E,INVALC,0x5B61,
-	/* Range 0x71E5 - 0x71E7, array index: 0x0C78 */
-	0x704F,0x733E,0x622C,
-	/* Range 0x71FB - 0x7200, array index: 0x0C7B */
-	0x7D38,0x6368,INVALC,0x5427,0x687C,0x7A52,
-	/* Range 0x723A - 0x7240, array index: 0x0C81 */
-	0x652C,0x7D21,INVALC,0x5F50,0x6C33,INVALC,0x5F51,
-	/* Range 0x7246 - 0x7248, array index: 0x0C88 */
-	0x6D6D,0x7838,0x777A,
-	/* Range 0x731B - 0x731D, array index: 0x0C8B */
-	0x586D,0x6344,0x7071,
-	/* Range 0x7329 - 0x732B, array index: 0x0C8E */
-	0x607A,0x6E44,0x595E,
-	/* Range 0x7394 - 0x7398, array index: 0x0C91 */
-	0x743D,INVALC,0x4F38,0x695B,0x512C,
-	/* Range 0x73C9 - 0x73CF, array index: 0x0C96 */
-	0x5A48,0x5F26,INVALC,0x7933,0x7252,INVALC,0x4A44,
-	/* Range 0x73E3 - 0x73EA, array index: 0x0C9D */
-	0x6269,0x5C4A,0x6C34,0x7A40,INVALC,INVALC,0x7B28,0x5028,
-	/* Range 0x7403 - 0x7409, array index: 0x0CA5 */
-	0x4F39,INVALC,0x554A,0x5762,0x622F,INVALC,0x5738,
-	/* Range 0x7420 - 0x743A, array index: 0x0CAC */
-	0x6F22,0x625A,0x767C,INVALC,INVALC,0x7B50,0x512D,INVALC,
-	0x4D64,INVALC,0x512E,0x5C6D,0x684E,INVALC,0x7079,0x4E35,
-	0x667C,INVALC,INVALC,0x577B,0x5056,0x5D75,0x7771,INVALC,
-	0x767D,INVALC,0x5B77,
-	/* Range 0x743F - 0x7444, array index: 0x0CC7 */
-	0x7B6A,0x695C,0x5941,INVALC,0x7572,0x6045,
-	/* Range 0x7457 - 0x746A, array index: 0x0CCD */
-	0x6A3C,INVALC,0x5245,0x7B51,0x6740,0x6B25,INVALC,0x5F7A,
-	0x6322,0x5739,INVALC,0x6943,INVALC,0x687D,0x682F,INVALC,
-	INVALC,0x7253,0x7B29,0x5825,
-	/* Range 0x7530 - 0x7533, array index: 0x0CE1 */
-	0x6F23,0x6B26,0x4B23,0x6369,
-	/* Range 0x7559 - 0x755D, array index: 0x0CE5 */
-	0x573A,INVALC,0x7255,0x7565,0x596F,
-	/* Range 0x75B1 - 0x75BE, array index: 0x0CEA */
-	0x785E,0x792A,0x4A77,INVALC,0x6D37,INVALC,INVALC,0x5338,
-	0x7256,INVALC,INVALC,0x5459,0x6E45,0x7270,
-	/* Range 0x761F - 0x7626, array index: 0x0CF8 */
-	0x6830,0x7430,0x736A,0x5A6E,INVALC,0x573B,INVALC,0x6231,
-	/* Range 0x767B - 0x767E, array index: 0x0D00 */
-	0x5474,0x5B21,0x5B5C,0x5B5D,
-	/* Range 0x76DB - 0x76E4, array index: 0x0D04 */
-	0x607C,0x5428,INVALC,0x6D53,0x586F,INVALC,0x7257,INVALC,
-	0x4A78,0x5A6F,
-	/* Range 0x77ED - 0x77EF, array index: 0x0D0E */
-	0x532D,0x6861,0x4E6C,
-	/* Range 0x7825 - 0x7827, array index: 0x0D11 */
-	0x7232,0x7376,0x765B,
-	/* Range 0x788C - 0x788E, array index: 0x0D14 */
-	0x565E,0x6474,0x616F,
-	/* Range 0x78BA - 0x78BC, array index: 0x0D17 */
-	0x7C2C,0x7C2D,0x5827,
-	/* Range 0x792A - 0x792C, array index: 0x0D1A */
-	0x556C,0x5578,0x5A73,
-	/* Range 0x7947 - 0x7949, array index: 0x0D1D */
-	0x5136,0x5137,0x7233,
-	/* Range 0x7956 - 0x7960, array index: 0x0D20 */
-	0x7053,0x7234,INVALC,INVALC,0x7054,0x4B64,0x7B54,0x7566,
-	0x636A,INVALC,0x5E66,
-	/* Range 0x798D - 0x7991, array index: 0x0D2B */
-	0x7C21,0x6F6E,0x5C58,INVALC,0x695F,
-	/* Range 0x79BD - 0x79C1, array index: 0x0D30 */
-	0x5058,0x7C22,0x543E,0x6233,0x5E67,
-	/* Range 0x79C9 - 0x79CB, array index: 0x0D35 */
-	0x5C3C,0x5236,0x7555,
-	/* Range 0x7A3B - 0x7A40, array index: 0x0D38 */
-	0x542B,0x4A33,0x4D26,INVALC,0x4D43,0x4D5A,
-	/* Range 0x7B49 - 0x7B56, array index: 0x0D3E */
-	0x5475,INVALC,0x5049,0x6F27,0x626C,INVALC,0x5B6A,0x4E4C,
-	0x7568,0x7755,INVALC,0x534D,INVALC,0x737E,
-	/* Range 0x7C3D - 0x7C3F, array index: 0x0D4C */
-	0x7458,0x5633,0x5D2D,
-	/* Range 0x7CB1 - 0x7CB3, array index: 0x0D4F */
-	0x555C,0x7344,0x4B57,
-	/* Range 0x7CDE - 0x7CE0, array index: 0x0D52 */
-	0x5D50,0x7059,0x4B33,
-	/* Range 0x7D02 - 0x7D0D, array index: 0x0D55 */
-	0x7144,INVALC,0x6533,0x7B75,0x6961,0x7D60,0x7C3C,INVALC,
-	0x5A22,0x5A23,INVALC,0x5221,
-	/* Range 0x7D17 - 0x7D1B, array index: 0x0D61 */
-	0x5E69,0x4E5C,0x7235,0x5064,0x5D51,
-	/* Range 0x7D20 - 0x7D22, array index: 0x0D66 */
-	0x6148,0x5B37,0x5F63,
-	/* Range 0x7D2B - 0x7D30, array index: 0x0D69 */
-	0x6D39,0x7145,INVALC,0x734F,0x572B,0x612C,
-	/* Range 0x7D42 - 0x7D46, array index: 0x0D6F */
-	0x707B,0x7A61,0x705A,0x4C67,0x5A74,
-	/* Range 0x7D71 - 0x7D73, array index: 0x0D74 */
-	0x7756,0x5E6A,0x4B34,
-	/* Range 0x7DB1 - 0x7DB5, array index: 0x0D77 */
-	0x4B35,0x5851,INVALC,0x744E,0x7377,
-	/* Range 0x7DBA - 0x7DBF, array index: 0x0D7C */
-	0x513B,0x772A,INVALC,0x6D4A,0x5753,0x587A,
-	/* Range 0x7DDD - 0x7DE3, array index: 0x0D82 */
-	0x727D,0x5330,INVALC,0x7473,0x5A49,INVALC,0x665E,
-	/* Range 0x7E1B - 0x7E23, array index: 0x0D89 */
-	0x5A5A,INVALC,0x725C,0x7B56,0x6932,INVALC,0x6E2D,INVALC,
-	0x7A63,
-	/* Range 0x7E69 - 0x7E6D, array index: 0x0D92 */
-	0x6331,0x7C6B,0x4D28,INVALC,0x4C36,
-	/* Range 0x7FDF - 0x7FE1, array index: 0x0D97 */
-	0x6E61,0x7628,0x5D7D,
-	/* Range 0x806F - 0x8073, array index: 0x0D9A */
-	0x5624,0x7546,INVALC,0x6122,0x6946,
-	/* Range 0x807D - 0x807F, array index: 0x0D9F */
-	0x7469,0x566C,0x6B53,
-	/* Range 0x8084 - 0x808C, array index: 0x0DA2 */
-	0x6C3D,0x625C,0x5E6B,0x705C,INVALC,0x6B3F,INVALC,0x574E,
-	0x513F,
-	/* Range 0x8105 - 0x810A, array index: 0x0DAB */
-	0x7A76,0x762A,0x7A77,0x5866,INVALC,0x7431,
-	/* Range 0x8178 - 0x817A, array index: 0x0DB1 */
-	0x6D73,0x5C59,0x604D,
-	/* Range 0x81BD - 0x81C2, array index: 0x0DB4 */
-	0x5345,0x7C6C,0x525B,0x546B,INVALC,0x5E22,
-	/* Range 0x81FA - 0x81FE, array index: 0x0DBA */
-	0x5366,0x725D,0x4F3F,INVALC,0x6B2C,
-	/* Range 0x821B - 0x8221, array index: 0x0DBF */
-	0x743F,0x626F,INVALC,0x5971,0x7147,INVALC,0x4B38,
-	/* Range 0x822A - 0x822C, array index: 0x0DC6 */
-	0x797E,0x5B3A,0x5A75,
-	/* Range 0x8235 - 0x8239, array index: 0x0DC9 */
-	0x766C,0x5A5C,0x7A64,INVALC,0x604F,
-	/* Range 0x826E - 0x8272, array index: 0x0DCE */
-	0x4A5D,0x555E,INVALC,0x4A5E,0x5F64,
-	/* Range 0x82AC - 0x82BF, array index: 0x0DD3 */
-	0x5D52,0x7774,0x675C,0x6425,INVALC,0x7C23,INVALC,0x5B3B,
-	INVALC,INVALC,INVALC,0x723A,0x697D,0x504A,INVALC,0x7556,
-	0x5945,0x6434,INVALC,0x6D27,
-	/* Range 0x82D1 - 0x82D7, array index: 0x0DE7 */
-	0x6A3D,0x667E,INVALC,0x7744,0x752D,INVALC,0x5960,
-	/* Range 0x82E5 - 0x82E7, array index: 0x0DEE */
-	0x6534,0x4D48,0x6E48,
-	/* Range 0x82FD - 0x8305, array index: 0x0DF1 */
-	0x4D49,0x7937,INVALC,INVALC,0x7168,0x5972,0x5B75,0x4A35,
-	0x5946,
-	/* Range 0x8334 - 0x8339, array index: 0x0DFA */
-	0x7C6D,0x6C60,0x527E,INVALC,0x6947,0x662A,
-	/* Range 0x83A9 - 0x83AB, array index: 0x0E00 */
-	0x5D34,0x6435,0x5830,
-	/* Range 0x83EF - 0x83F4, array index: 0x0E03 */
-	0x7C24,0x4D4A,0x5754,0x5E23,INVALC,0x6460,
-	/* Range 0x840A - 0x840E, array index: 0x0E09 */
-	0x5551,INVALC,0x5870,0x7843,0x6A57,
-	/* Range 0x8568 - 0x856A, array index: 0x0E0E */
-	0x4F72,0x7739,0x5973,
-	/* Range 0x85A6 - 0x85AA, array index: 0x0E11 */
-	0x7440,INVALC,0x7D3C,0x5F31,0x636F,
-	/* Range 0x85CD - 0x85CF, array index: 0x0E16 */
-	0x5540,0x6370,0x6D7A,
-	/* Range 0x865B - 0x865F, array index: 0x0E19 */
-	0x7A48,0x5657,INVALC,0x6965,0x7B5C,
-	/* Range 0x8861 - 0x8863, array index: 0x0E1E */
-	0x7B2C,0x4F43,0x6B7D,
-	/* Range 0x887E - 0x8882, array index: 0x0E21 */
-	0x505A,0x505B,INVALC,0x6A3E,0x5931,
-	/* Range 0x88F3 - 0x88F5, array index: 0x0E26 */
-	0x5F57,0x5B50,0x5B51,
-	/* Range 0x8A16 - 0x8A18, array index: 0x0E29 */
-	0x7D61,0x767E,0x5140,
-	/* Range 0x8A6D - 0x8A75, array index: 0x0E2C */
-	0x4F78,0x6F2C,INVALC,0x7D7E,0x7C25,0x7A31,0x5F59,INVALC,
-	0x6052,
-	/* Range 0x8AA0 - 0x8AAA, array index: 0x0E35 */
-	0x6124,0x4D2B,INVALC,0x5974,0x6826,0x4D4E,0x6169,INVALC,
-	0x7C6F,INVALC,0x6063,
-	/* Range 0x8AEA - 0x8AEE, array index: 0x0E40 */
-	0x6F75,0x4A5F,INVALC,0x6B31,0x6D3F,
-	/* Range 0x8AF6 - 0x8AFA, array index: 0x0E45 */
-	0x6426,0x7924,0x7033,INVALC,0x656C,
-	/* Range 0x8AFE - 0x8B04, array index: 0x0E4A */
-	0x5167,INVALC,0x5947,0x6457,0x6A5D,INVALC,0x5477,
-	/* Range 0x8B16 - 0x8B1D, array index: 0x0E51 */
-	0x615A,0x5B3F,INVALC,0x4C45,0x6C50,0x4B3B,INVALC,0x5E73,
-	/* Range 0x8C9D - 0x8CA2, array index: 0x0E59 */
-	0x782F,0x6F76,INVALC,0x5D36,0x6E2F,0x4D78,
-	/* Range 0x8CA7 - 0x8CCA, array index: 0x0E5F */
-	0x5E38,0x7C27,0x777C,0x7731,0x4E3B,0x7421,INVALC,INVALC,
-	0x6E4D,0x612E,INVALC,INVALC,0x6C43,0x4F7E,INVALC,0x783F,
-	0x5862,0x5368,INVALC,INVALC,0x5E28,0x7464,0x6C42,INVALC,
-	0x5975,0x7945,0x5D53,0x5671,0x6C7C,0x7C70,INVALC,INVALC,
-	0x6D40,0x4A39,INVALC,0x6E64,
-	/* Range 0x8CE0 - 0x8CE6, array index: 0x0E83 */
-	0x5B53,INVALC,0x7A67,0x5863,0x7441,INVALC,0x5D37,
-	/* Range 0x8CFB - 0x8CFD, array index: 0x0E8A */
-	0x5D38,0x4F45,0x5F5F,
-	/* Range 0x8D04 - 0x8D0A, array index: 0x0E8D */
-	0x723E,0x7621,INVALC,0x6B4B,0x717C,INVALC,0x7347,
-	/* Range 0x8E47 - 0x8E4A, array index: 0x0E94 */
-	0x4B74,0x5430,0x7332,0x7B37,
-	/* Range 0x8EAA - 0x8EAC, array index: 0x0E98 */
-	0x5775,0x6373,0x4F65,
-	/* Range 0x8ECA - 0x8ECD, array index: 0x0E9B */
-	0x7333,0x6458,0x4F79,0x4F5A,
-	/* Range 0x8F12 - 0x8F15, array index: 0x0E9F */
-	0x7465,0x5842,0x5C50,0x4C6E,
-	/* Range 0x8F1B - 0x8F1F, array index: 0x0EA3 */
-	0x5560,0x764A,0x7D4A,0x5856,0x744F,
-	/* Range 0x8F26 - 0x8F2A, array index: 0x0EA8 */
-	0x5626,0x5C3E,INVALC,0x5B54,0x5747,
-	/* Range 0x8FAD - 0x8FB2, array index: 0x0EAD */
-	0x5E76,INVALC,0x5C2A,0x7263,0x6934,0x525C,
-	/* Range 0x9000 - 0x9008, array index: 0x0EB3 */
-	0x775C,0x616A,0x4E41,0x5431,INVALC,0x7D31,0x663D,INVALC,
-	0x7B2D,
-	/* Range 0x900D - 0x9023, array index: 0x0EBC */
-	0x614E,INVALC,0x7762,0x756F,0x4F47,INVALC,INVALC,0x5432,
-	0x4C6F,INVALC,0x5468,INVALC,0x6E4F,0x7757,INVALC,INVALC,
-	0x6026,0x5641,0x615C,0x7063,0x7164,0x5C71,0x5627,
-	/* Range 0x904A - 0x9055, array index: 0x0ED3 */
-	0x6B34,0x6A21,INVALC,0x783C,0x4E26,INVALC,0x7946,0x7C5A,
-	INVALC,0x5433,0x5339,0x6A5E,
-	/* Range 0x905C - 0x9063, array index: 0x0EDF */
-	0x6161,0x534F,0x7476,INVALC,0x6A40,0x614F,INVALC,0x4C3A,
-	/* Range 0x906D - 0x906F, array index: 0x0EE7 */
-	0x7064,0x7334,0x546E,
-	/* Range 0x907C - 0x908A, array index: 0x0EEA */
-	0x5721,0x4B68,INVALC,0x792D,0x692D,0x5864,0x7A33,0x6245,
-	0x7C3D,INVALC,INVALC,0x6C44,0x5831,INVALC,0x5C2B,
-	/* Range 0x90AF - 0x90B1, array index: 0x0EF9 */
-	0x4A7B,0x7746,0x4F48,
-	/* Range 0x9149 - 0x914E, array index: 0x0EFC */
-	0x6B37,0x6F78,0x755C,0x6D4C,0x5B55,0x714F,
-	/* Range 0x91AB - 0x91B5, array index: 0x0F02 */
-	0x6C22,0x6D7D,INVALC,0x7534,0x7B38,INVALC,0x5B23,INVALC,
-	INVALC,0x564A,0x4B59,
-	/* Range 0x91C9 - 0x91D1, array index: 0x0F0D */
-	0x6B38,INVALC,0x6037,0x576C,0x716C,0x652F,0x5561,0x576D,
-	0x5151,
-	/* Range 0x9210 - 0x9212, array index: 0x0F16 */
-	0x4C22,0x777E,0x5F3C,
-	/* Range 0x9262 - 0x9266, array index: 0x0F19 */
-	0x5B24,INVALC,0x4F49,0x627C,0x6F7A,
-	/* Range 0x931E - 0x9328, array index: 0x0F1E */
-	0x6276,0x534A,0x6F7C,0x5144,0x6F31,INVALC,0x5145,INVALC,
-	0x505E,INVALC,0x5961,
-	/* Range 0x958F - 0x9594, array index: 0x0F29 */
-	0x6B4E,INVALC,0x7958,0x7959,0x4A60,0x5A4A,
-	/* Range 0x95A3 - 0x95A5, array index: 0x0F2F */
-	0x4A48,0x796E,0x5B6C,
-	/* Range 0x95D4 - 0x95D6, array index: 0x0F32 */
-	0x796F,0x4F74,0x7766,
-	/* Range 0x964B - 0x964D, array index: 0x0F35 */
-	0x5730,0x5868,0x4B3D,
-	/* Range 0x965B - 0x9664, array index: 0x0F38 */
-	0x784E,0x7970,0x606D,0x6333,0x7433,INVALC,INVALC,0x6A42,
-	0x7266,0x7036,
-	/* Range 0x9673 - 0x9678, array index: 0x0F42 */
-	0x7267,INVALC,0x5755,0x5436,0x7968,0x5741,
-	/* Range 0x968A - 0x968E, array index: 0x0F48 */
-	0x5369,0x6249,INVALC,0x7C5B,0x4D2D,
-	/* Range 0x9698 - 0x969C, array index: 0x0F4D */
-	0x6476,0x5040,INVALC,0x7037,0x6E21,
-	/* Range 0x96C0 - 0x96CE, array index: 0x0F52 */
-	0x6D4D,0x6452,INVALC,INVALC,0x6A29,0x643A,0x7322,0x4D52,
-	INVALC,0x764B,INVALC,0x7166,0x6D41,0x683C,0x6E51,
-	/* Range 0x96E8 - 0x96EA, array index: 0x0F61 */
-	0x696B,0x696C,0x6064,
-	/* Range 0x97FF - 0x9813, array index: 0x0F64 */
-	0x7A42,0x7B61,0x7A6D,0x7022,0x4C71,INVALC,0x7A23,0x6277,
-	INVALC,0x624E,INVALC,0x6975,INVALC,0x616B,INVALC,INVALC,
-	INVALC,0x6768,0x6857,0x5A78,0x544B,
-	/* Range 0x984C - 0x984E, array index: 0x0F79 */
-	0x7039,0x647E,0x6449,
-	/* Range 0x98ED - 0x98EF, array index: 0x0F7C */
-	0x7650,0x6B66,0x5A79,
-	/* Range 0x98FC - 0x98FE, array index: 0x0F7F */
-	0x5E78,0x7869,0x635E,
-	/* Range 0x9949 - 0x994D, array index: 0x0F82 */
-	0x504F,INVALC,0x4F7A,0x734A,0x6057,
-	/* Range 0x99AC - 0x99AE, array index: 0x0F87 */
-	0x5829,0x655F,0x7927,
-	/* Range 0x99D0 - 0x99D2, array index: 0x0F8A */
-	0x7152,0x524C,0x4F4B,
-	/* Range 0x9B41 - 0x9B45, array index: 0x0F8D */
-	0x4E5A,0x7B6B,0x5B26,0x5B5E,0x5865,
-	/* Range 0x9DF8 - 0x9DFA, array index: 0x0F92 */
-	0x7D53,0x6B6D,0x565C,
-	/* Range 0xAC07 - 0xAC0A, array index: 0x0F95 */
-	0x3024,0x3025,0x3026,0x3027,
-	/* Range 0xAC10 - 0xAC1D, array index: 0x0F99 */
-	0x3028,0x3029,0x302A,0x302B,0x302C,0x302D,0x302E,0x302F,
-	INVALC,0x3030,0x3031,0x3032,0x3033,0x3034,
-	/* Range 0xAC2C - 0xAC31, array index: 0x0FA7 */
-	0x3037,0x3038,INVALC,0x3039,0x303A,0x303B,
-	/* Range 0xAC80 - 0xAC8C, array index: 0x0FAD */
-	0x304B,0x304C,INVALC,0x304D,0x304E,0x304F,0x3050,INVALC,
-	INVALC,0x3051,0x3052,0x3053,0x3054,
-	/* Range 0xAC9C - 0xACA1, array index: 0x0FBA */
-	0x3057,0x3058,INVALC,0x3059,0x305A,0x305B,
-	/* Range 0xACA8 - 0xACB0, array index: 0x0FC0 */
-	0x305C,0x305D,0x305E,INVALC,0x305F,INVALC,INVALC,0x3060,
-	0x3061,
-	/* Range 0xACB8 - 0xACBD, array index: 0x0FC9 */
-	0x3062,0x3063,INVALC,0x3064,0x3065,0x3066,
-	/* Range 0xACEF - 0xACF6, array index: 0x0FCF */
-	0x3074,0x3075,0x3076,INVALC,0x3077,INVALC,0x3078,0x3079,
-	/* Range 0xAD73 - 0xAD76, array index: 0x0FD7 */
-	0x313B,0x313C,0x313D,0x313E,
-	/* Range 0xAD7B - 0xAD82, array index: 0x0FDB */
-	0x313F,0x3140,0x3141,INVALC,0x3142,INVALC,0x3143,0x3144,
-	/* Range 0xADFF - 0xAE01, array index: 0x0FE3 */
-	0x315A,0x315B,0x315C,
-	/* Range 0xAE4A - 0xAE50, array index: 0x0FE6 */
-	0x316D,INVALC,0x316E,0x316F,0x3170,INVALC,0x3171,
-	/* Range 0xAE5C - 0xAE61, array index: 0x0FED */
-	0x3174,0x3175,INVALC,0x3176,0x3177,0x3178,
-	/* Range 0xAE78 - 0xAE7D, array index: 0x0FF3 */
-	0x317E,0x3221,INVALC,0x3222,0x3223,0x3224,
-	/* Range 0xAEBC - 0xAEC0, array index: 0x0FF9 */
-	0x3228,0x3229,0x322A,INVALC,0x322B,
-	/* Range 0xAECC - 0xAED1, array index: 0x0FFE */
-	0x322D,0x322E,INVALC,0x322F,0x3230,0x3231,
-	/* Range 0xAF3F - 0xAF43, array index: 0x1004 */
-	0x3246,INVALC,0x3247,0x3248,0x3249,
-	/* Range 0xAFC7 - 0xAFCE, array index: 0x1009 */
-	0x325D,0x325E,0x325F,INVALC,0x3260,INVALC,0x3261,0x3262,
-	/* Range 0xB053 - 0xB059, array index: 0x1011 */
-	0x327A,0x327B,0x327C,INVALC,0x327D,INVALC,0x327E,
-	/* Range 0xB098 - 0xB0A2, array index: 0x1018 */
-	0x332A,0x332B,0x332C,INVALC,0x332D,INVALC,INVALC,0x332E,
-	0x332F,0x3330,0x3331,
-	/* Range 0xB0A8 - 0xB0B5, array index: 0x1023 */
-	0x3332,0x3333,INVALC,0x3334,0x3335,0x3336,0x3337,0x3338,
-	INVALC,0x3339,INVALC,0x333A,0x333B,0x333C,
-	/* Range 0xB0C4 - 0xB0C9, array index: 0x1031 */
-	0x333F,0x3340,INVALC,0x3341,0x3342,0x3343,
-	/* Range 0xB108 - 0xB10C, array index: 0x1037 */
-	0x334A,0x334B,INVALC,0x334C,0x334D,
-	/* Range 0xB118 - 0xB11D, array index: 0x103C */
-	0x3351,0x3352,INVALC,0x3353,0x3354,0x3355,
-	/* Range 0xB123 - 0xB125, array index: 0x1042 */
-	0x3356,0x3357,0x3358,
-	/* Range 0xB134 - 0xB139, array index: 0x1045 */
-	0x335B,0x335C,INVALC,0x335D,0x335E,0x335F,
-	/* Range 0xB192 - 0xB194, array index: 0x104B */
-	0x3374,0x3375,0x3376,
-	/* Range 0xB298 - 0xB29A, array index: 0x104E */
-	0x3443,0x3444,0x3445,
-	/* Range 0xB2E2 - 0xB301, array index: 0x1051 */
-	0x3458,INVALC,0x3459,0x345A,0x345B,INVALC,0x345C,INVALC,
-	INVALC,0x345D,0x345E,0x345F,0x3460,0x3461,INVALC,INVALC,
-	INVALC,0x3462,0x3463,0x3464,INVALC,0x3465,0x3466,0x3467,
-	0x3468,0x3469,INVALC,INVALC,INVALC,0x346A,0x346B,0x346C,
-	/* Range 0xB310 - 0xB315, array index: 0x1071 */
-	0x346F,0x3470,INVALC,0x3471,0x3472,0x3473,
-	/* Range 0xB354 - 0xB35F, array index: 0x1077 */
-	0x3475,0x3476,0x3477,INVALC,0x3478,INVALC,INVALC,0x3479,
-	0x347A,INVALC,0x347B,0x347C,
-	/* Range 0xB380 - 0xB385, array index: 0x1083 */
-	0x3529,0x352A,INVALC,0x352B,0x352C,0x352D,
-	/* Range 0xB524 - 0xB52A, array index: 0x1089 */
-	0x3575,0x3576,INVALC,0x3577,0x3578,0x3579,0x357A,
-	/* Range 0xB540 - 0xB545, array index: 0x1090 */
-	0x3621,0x3622,INVALC,0x3623,0x3624,0x3625,
-	/* Range 0xB54B - 0xB54D, array index: 0x1096 */
-	0x3626,0x3627,0x3628,
-	/* Range 0xB55C - 0xB561, array index: 0x1099 */
-	0x362B,0x362C,INVALC,0x362D,0x362E,0x362F,
-	/* Range 0xB5B0 - 0xB5B5, array index: 0x109F */
-	0x3636,0x3637,INVALC,0x3638,0x3639,0x363A,
-	/* Range 0xB5BB - 0xB5BD, array index: 0x10A5 */
-	0x363B,0x363C,0x363D,
-	/* Range 0xB5CC - 0xB5D1, array index: 0x10A8 */
-	0x3640,0x3641,INVALC,0x3642,0x3643,0x3644,
-	/* Range 0xB78C - 0xB799, array index: 0x10AE */
-	0x3677,0x3678,INVALC,0x3679,0x367A,0x367B,0x367C,INVALC,
-	INVALC,INVALC,0x367D,0x367E,0x3721,0x3722,
-	/* Range 0xB7A8 - 0xB7AD, array index: 0x10BC */
-	0x3725,0x3726,INVALC,0x3727,0x3728,0x3729,
-	/* Range 0xB7FC - 0xB801, array index: 0x10C2 */
-	0x3733,0x3734,INVALC,0x3735,0x3736,0x3737,
-	/* Range 0xB807 - 0xB809, array index: 0x10C8 */
-	0x3738,0x3739,0x373A,
-	/* Range 0xB834 - 0xB839, array index: 0x10CB */
-	0x3745,0x3746,INVALC,0x3747,0x3748,0x3749,
-	/* Range 0xB9CC - 0xB9D2, array index: 0x10D1 */
-	0x3838,INVALC,0x3839,0x383A,0x383B,0x383C,0x383D,
-	/* Range 0xB9E1 - 0xB9E5, array index: 0x10D8 */
-	0x3843,INVALC,0x3844,0x3845,0x3846,
-	/* Range 0xB9F4 - 0xB9FA, array index: 0x10DD */
-	0x3849,0x384A,INVALC,0x384B,0x384C,0x384D,0x384E,
-	/* Range 0xBA53 - 0xBA55, array index: 0x10E4 */
-	0x385D,0x385E,0x385F,
-	/* Range 0xBA64 - 0xBA69, array index: 0x10E7 */
-	0x3862,0x3863,INVALC,0x3864,0x3865,0x3866,
-	/* Range 0xBA83 - 0xBA87, array index: 0x10ED */
-	0x386B,0x386C,0x386D,INVALC,0x386E,
-	/* Range 0xBAA8 - 0xBAAC, array index: 0x10F2 */
-	0x3870,0x3871,INVALC,0x3872,0x3873,
-	/* Range 0xBB34 - 0xBB3E, array index: 0x10F7 */
-	0x392B,0x392C,0x392D,INVALC,0x392E,INVALC,INVALC,0x392F,
-	0x3930,0x3931,0x3932,
-	/* Range 0xBC08 - 0xBC1F, array index: 0x1102 */
-	0x3952,0x3953,INVALC,0x3954,0x3955,0x3956,INVALC,0x3957,
-	INVALC,0x3958,INVALC,INVALC,0x3959,0x395A,0x395B,0x395C,
-	0x395D,INVALC,INVALC,0x395E,0x395F,0x3960,0x3961,0x3962,
-	/* Range 0xBC40 - 0xBC45, array index: 0x111A */
-	0x396C,0x396D,INVALC,0x396E,0x396F,0x3970,
-	/* Range 0xBCB0 - 0xBCB5, array index: 0x1120 */
-	0x3A28,0x3A29,INVALC,0x3A2A,0x3A2B,0x3A2C,
-	/* Range 0xBCCD - 0xBCD1, array index: 0x1126 */
-	0x3A31,INVALC,0x3A32,0x3A33,0x3A34,
-	/* Range 0xBCF4 - 0xBCF8, array index: 0x112B */
-	0x3A38,0x3A39,0x3A3A,INVALC,0x3A3B,
-	/* Range 0xBD87 - 0xBD8A, array index: 0x1130 */
-	0x3A51,0x3A52,0x3A53,0x3A54,
-	/* Range 0xBE57 - 0xBE5B, array index: 0x1134 */
-	0x3A78,INVALC,0x3A79,0x3A7A,0x3A7B,
-	/* Range 0xBE70 - 0xBE75, array index: 0x1139 */
-	0x3B23,0x3B24,INVALC,0x3B25,0x3B26,0x3B27,
-	/* Range 0xBE7B - 0xBE7D, array index: 0x113F */
-	0x3B28,0x3B29,0x3B2A,
-	/* Range 0xBE8C - 0xBE91, array index: 0x1142 */
-	0x3B2D,0x3B2E,INVALC,0x3B2F,0x3B30,0x3B31,
-	/* Range 0xBEE3 - 0xBEE5, array index: 0x1148 */
-	0x3B3B,0x3B3C,0x3B3D,
-	/* Range 0xBF18 - 0xBF1D, array index: 0x114B */
-	0x3B42,0x3B43,INVALC,0x3B44,0x3B45,0x3B46,
-	/* Range 0xC0AC - 0xC0B6, array index: 0x1151 */
-	0x3B67,0x3B68,INVALC,0x3B69,0x3B6A,INVALC,INVALC,0x3B6B,
-	0x3B6C,0x3B6D,0x3B6E,
-	/* Range 0xC0BC - 0xC0C1, array index: 0x115C */
-	0x3B6F,0x3B70,INVALC,0x3B71,0x3B72,0x3B73,
-	/* Range 0xC0D8 - 0xC0DD, array index: 0x1162 */
-	0x3B79,0x3B7A,INVALC,0x3B7B,0x3B7C,0x3B7D,
-	/* Range 0xC11C - 0xC127, array index: 0x1168 */
-	0x3C2D,0x3C2E,0x3C2F,0x3C30,0x3C31,INVALC,INVALC,0x3C32,
-	0x3C33,INVALC,0x3C34,0x3C35,
-	/* Range 0xC12C - 0xC131, array index: 0x1174 */
-	0x3C36,0x3C37,INVALC,0x3C38,0x3C39,0x3C3A,
-	/* Range 0xC148 - 0xC14D, array index: 0x117A */
-	0x3C40,0x3C41,INVALC,0x3C42,0x3C43,0x3C44,
-	/* Range 0xC164 - 0xC169, array index: 0x1180 */
-	0x3C49,0x3C4A,INVALC,0x3C4B,0x3C4C,0x3C4D,
-	/* Range 0xC18C - 0xC190, array index: 0x1186 */
-	0x3C52,0x3C53,0x3C54,INVALC,0x3C55,
-	/* Range 0xC2EB - 0xC2F1, array index: 0x118B */
-	0x3D48,0x3D49,0x3D4A,INVALC,0x3D4B,INVALC,0x3D4C,
-	/* Range 0xC2F8 - 0xC2FC, array index: 0x1192 */
-	0x3D4E,0x3D4F,INVALC,0x3D50,0x3D51,
-	/* Range 0xC313 - 0xC315, array index: 0x1197 */
-	0x3D57,0x3D58,0x3D59,
-	/* Range 0xC4FF - 0xC501, array index: 0x119A */
-	0x3E37,0x3E38,0x3E39,
-	/* Range 0xC544 - 0xC54E, array index: 0x119D */
-	0x3E46,0x3E47,INVALC,INVALC,0x3E48,0x3E49,0x3E4A,INVALC,
-	0x3E4B,0x3E4C,0x3E4D,
-	/* Range 0xC553 - 0xC559, array index: 0x11A8 */
-	0x3E4E,0x3E4F,0x3E50,INVALC,0x3E51,0x3E52,0x3E53,
-	/* Range 0xC55D - 0xC561, array index: 0x11AF */
-	0x3E54,0x3E55,INVALC,0x3E56,0x3E57,
-	/* Range 0xC570 - 0xC575, array index: 0x11B4 */
-	0x3E5A,0x3E5B,INVALC,0x3E5C,0x3E5D,0x3E5E,
-	/* Range 0xC5B8 - 0xC5BE, array index: 0x11BA */
-	0x3E70,0x3E71,INVALC,0x3E72,0x3E73,0x3E74,0x3E75,
-	/* Range 0xC5C4 - 0xC5D1, array index: 0x11C1 */
-	0x3E76,0x3E77,0x3E78,0x3E79,0x3E7A,0x3E7B,0x3E7C,INVALC,
-	0x3E7D,INVALC,0x3E7E,INVALC,0x3F21,0x3F22,
-	/* Range 0xC5EC - 0xC5F0, array index: 0x11CF */
-	0x3F29,0x3F2A,0x3F2B,INVALC,0x3F2C,
-	/* Range 0xC5FC - 0xC608, array index: 0x11D4 */
-	0x3F30,0x3F31,0x3F32,0x3F33,0x3F34,0x3F35,INVALC,INVALC,
-	INVALC,0x3F36,0x3F37,0x3F38,0x3F39,
-	/* Range 0xC618 - 0xC61C, array index: 0x11E1 */
-	0x3F3C,0x3F3D,INVALC,0x3F3E,0x3F3F,
-	/* Range 0xC62C - 0xC63B, array index: 0x11E6 */
-	0x3F43,0x3F44,0x3F45,INVALC,0x3F46,INVALC,INVALC,0x3F47,
-	0x3F48,0x3F49,INVALC,0x3F4A,INVALC,0x3F4B,INVALC,0x3F4C,
-	/* Range 0xC650 - 0xC655, array index: 0x11F6 */
-	0x3F51,0x3F52,INVALC,0x3F53,0x3F54,0x3F55,
-	/* Range 0xC6B8 - 0xC6BA, array index: 0x11FC */
-	0x3F6F,0x3F70,0x3F71,
-	/* Range 0xC74F - 0xC758, array index: 0x11FF */
-	0x403F,INVALC,0x4040,0x4041,0x4042,0x4043,0x4044,0x4045,
-	0x4046,0x4047,
-	/* Range 0xC77C - 0xC77E, array index: 0x1209 */
-	0x404F,0x4050,0x4051,
-	/* Range 0xC783 - 0xC78A, array index: 0x120C */
-	0x4052,0x4053,0x4054,INVALC,0x4055,0x4056,0x4057,0x4058,
-	/* Range 0xC794 - 0xC79A, array index: 0x1214 */
-	0x405C,INVALC,0x405D,0x405E,0x405F,INVALC,0x4060,
-	/* Range 0xC7A0 - 0xC7A6, array index: 0x121B */
-	0x4061,0x4062,INVALC,0x4063,0x4064,0x4065,0x4066,
-	/* Range 0xC7BC - 0xC7C1, array index: 0x1222 */
-	0x406B,0x406C,INVALC,0x406D,0x406E,0x406F,
-	/* Range 0xC883 - 0xC88D, array index: 0x1228 */
-	0x413D,INVALC,0x413E,0x413F,0x4140,INVALC,INVALC,INVALC,
-	0x4141,0x4142,0x4143,
-	/* Range 0xC904 - 0xC906, array index: 0x1233 */
-	0x4159,0x415A,0x415B,
-	/* Range 0xC9D9 - 0xC9DD, array index: 0x1236 */
-	0x4223,0x4224,INVALC,0x4225,0x4226,
-	/* Range 0xC9EC - 0xC9F1, array index: 0x123B */
-	0x422B,0x422C,INVALC,0x422D,0x422E,0x422F,
-	/* Range 0xCA08 - 0xCA0D, array index: 0x1241 */
-	0x4234,0x4235,INVALC,0x4236,0x4237,0x4238,
-	/* Range 0xCA5C - 0xCA61, array index: 0x1247 */
-	0x4240,0x4241,INVALC,0x4242,0x4243,0x4244,
-	/* Range 0xCC27 - 0xCC29, array index: 0x124D */
-	0x4276,0x4277,0x4278,
-	/* Range 0xCC38 - 0xCC3E, array index: 0x1250 */
-	0x427C,0x427D,INVALC,0x427E,0x4321,0x4322,0x4323,
-	/* Range 0xCC54 - 0xCC59, array index: 0x1257 */
-	0x4328,0x4329,INVALC,0x432A,0x432B,0x432C,
-	/* Range 0xCCA8 - 0xCCAD, array index: 0x125D */
-	0x4337,0x4338,INVALC,0x4339,0x433A,0x433B,
-	/* Range 0xCE5F - 0xCE61, array index: 0x1263 */
-	0x4424,0x4425,0x4426,
-	/* Range 0xCEA0 - 0xCEA5, array index: 0x1266 */
-	0x4437,0x4438,INVALC,0x4439,0x443A,0x443B,
-	/* Range 0xCEF4 - 0xCEF9, array index: 0x126C */
-	0x4444,0x4445,INVALC,0x4446,0x4447,0x4448,
-	/* Range 0xCF2C - 0xCF31, array index: 0x1272 */
-	0x4454,0x4455,INVALC,0x4456,0x4457,0x4458,
-	/* Range 0xD0D0 - 0xD0D5, array index: 0x1278 */
-	0x453D,0x453E,INVALC,0x453F,0x4540,0x4541,
-	/* Range 0xD0EC - 0xD0F1, array index: 0x127E */
-	0x4546,0x4547,INVALC,0x4548,0x4549,0x454A,
-	/* Range 0xD140 - 0xD145, array index: 0x1284 */
-	0x4552,0x4553,INVALC,0x4554,0x4555,0x4556,
-	/* Range 0xD30C - 0xD310, array index: 0x128A */
-	0x4644,0x4645,0x4646,INVALC,0x4647,
-	/* Range 0xD31C - 0xD321, array index: 0x128F */
-	0x464A,0x464B,INVALC,0x464C,0x464D,0x464E,
-	/* Range 0xD338 - 0xD33D, array index: 0x1295 */
-	0x4654,0x4655,INVALC,0x4656,0x4657,0x4658,
-	/* Range 0xD38C - 0xD391, array index: 0x129B */
-	0x465F,0x4660,INVALC,0x4661,0x4662,0x4663,
-	/* Range 0xD584 - 0xD589, array index: 0x12A1 */
-	0x475C,0x475D,INVALC,0x475E,0x475F,0x4760,
-	/* Range 0xD610 - 0xD615, array index: 0x12A7 */
-	0x4778,0x4779,INVALC,0x477A,0x477B,0x477C,
-	/* Range 0xD754 - 0xD759, array index: 0x12AD */
-	0x4867,INVALC,0x4868,0x4869,0x486A,0x486B,
-	/* Range 0xF900 - 0xFA0B, array index: 0x12B3 */
-	0x4B50,0x4B56,0x4B67,0x4D4F,0x4D68,0x4E2D,0x4F7B,0x5022,
-	0x5038,0x5050,0x505D,0x5154,0x5155,0x5158,0x515B,0x515C,
-	0x515D,0x515E,0x515F,0x5160,0x5162,0x5163,0x5164,0x5165,
-	0x5166,0x5168,0x5169,0x516A,0x516B,0x516D,0x516F,0x5170,
-	0x5172,0x5176,0x517A,0x517C,0x517D,0x517E,0x5222,0x5223,
-	0x5227,0x5228,0x5229,0x522A,0x522B,0x522D,0x5232,0x523E,
-	0x5242,0x5243,0x5244,0x5246,0x5247,0x5248,0x5249,0x524A,
-	0x524B,0x524D,0x524E,0x524F,0x5250,0x5251,0x5252,0x5253,
-	0x5254,0x5255,0x5256,0x5257,0x5259,0x525A,0x525E,0x525F,
-	0x5261,0x5262,0x5264,0x5265,0x5266,0x5267,0x5268,0x5269,
-	0x526A,0x526B,0x5270,0x5271,0x5272,0x5273,0x5274,0x5275,
-	0x5277,0x5278,0x5466,0x547C,0x5525,0x552B,0x552E,0x5638,
-	0x564D,0x574B,0x5764,0x5B45,0x5B64,0x5C25,0x5D25,0x5D55,
-	0x5D74,0x5E7C,0x5E7E,0x5F33,0x5F61,0x5F68,0x6071,0x612D,
-	0x616D,0x6375,0x6421,0x6429,0x652E,0x6531,0x6532,0x6539,
-	0x653B,0x653C,0x6544,0x654E,0x6550,0x6552,0x6556,0x657A,
-	0x657B,0x657C,0x657E,0x6621,0x6624,0x6627,0x662D,0x662F,
-	0x6630,0x6631,0x6633,0x6637,0x6638,0x663C,0x6644,0x6646,
-	0x6647,0x664A,0x6652,0x6656,0x6659,0x665C,0x665F,0x6661,
-	0x6664,0x6665,0x6666,0x6668,0x666A,0x666B,0x666C,0x666F,
-	0x6671,0x6672,0x6675,0x6676,0x6677,0x6679,0x6721,0x6726,
-	0x6729,0x672A,0x672C,0x672D,0x6730,0x673F,0x6741,0x6746,
-	0x6747,0x674B,0x674D,0x674F,0x6750,0x6753,0x675F,0x6764,
-	0x6766,0x6777,0x6867,0x6868,0x6870,0x6871,0x6877,0x6879,
-	0x687B,0x687E,0x6927,0x692C,0x694C,0x6977,0x6A41,0x6A65,
-	0x6A74,0x6A77,0x6A7C,0x6A7E,0x6B24,0x6B27,0x6B29,0x6B2A,
-	0x6B3A,0x6B3B,0x6B3D,0x6B41,0x6B42,0x6B46,0x6B47,0x6B4C,
-	0x6B4F,0x6B50,0x6B51,0x6B52,0x6B58,0x6C26,0x6C27,0x6C2A,
-	0x6C2F,0x6C30,0x6C31,0x6C32,0x6C35,0x6C38,0x6C3A,0x6C40,
-	0x6C41,0x6C45,0x6C46,0x6C49,0x6C4A,0x6C55,0x6C5D,0x6C5E,
-	0x6C61,0x6C64,0x6C67,0x6C68,0x6C77,0x6C78,0x6C7A,0x6D21,
-	0x6D22,0x6D23,0x6D6E,0x6E5B,0x723D,0x727A,0x7331,0x7427,
-	0x746E,0x7674,0x7676,0x7738,0x7748,0x7753,0x785B,0x7870,
-	0x7A21,0x7A22,0x7A66,0x7C29,
-	/* Range 0xFF01 - 0xFF5E, array index: 0x13BF */
-	0x2321,0x2322,0x2323,0x2324,0x2325,0x2326,0x2327,0x2328,
-	0x2329,0x232A,0x232B,0x232C,0x232D,0x232E,0x232F,0x2330,
-	0x2331,0x2332,0x2333,0x2334,0x2335,0x2336,0x2337,0x2338,
-	0x2339,0x233A,0x233B,0x233C,0x233D,0x233E,0x233F,0x2340,
-	0x2341,0x2342,0x2343,0x2344,0x2345,0x2346,0x2347,0x2348,
-	0x2349,0x234A,0x234B,0x234C,0x234D,0x234E,0x234F,0x2350,
-	0x2351,0x2352,0x2353,0x2354,0x2355,0x2356,0x2357,0x2358,
-	0x2359,0x235A,0x235B,0x212C,0x235D,0x235E,0x235F,0x2360,
-	0x2361,0x2362,0x2363,0x2364,0x2365,0x2366,0x2367,0x2368,
-	0x2369,0x236A,0x236B,0x236C,0x236D,0x236E,0x236F,0x2370,
-	0x2371,0x2372,0x2373,0x2374,0x2375,0x2376,0x2377,0x2378,
-	0x2379,0x237A,0x237B,0x237C,0x237D,0x2226,
-	/* Range 0xFFE0 - 0xFFE6, array index: 0x141D */
-	0x214B,0x214C,0x217E,0x237E,INVALC,0x214D,0x235C,
-	/* Unranged codes (438 codes) */
-	/* Array index: 0x1424 */ 0x00A1,0x222E,
-	/* Array index: 0x1424 */ 0x00A4,0x2234,
-	/* Array index: 0x1424 */ 0x00A7,0x2157,
-	/* Array index: 0x1424 */ 0x00A8,0x2127,
-	/* Array index: 0x1424 */ 0x00AA,0x2823,
-	/* Array index: 0x1424 */ 0x00AD,0x2129,
-	/* Array index: 0x1424 */ 0x00C6,0x2821,
-	/* Array index: 0x1424 */ 0x00D0,0x2822,
-	/* Array index: 0x1424 */ 0x00D7,0x213F,
-	/* Array index: 0x1424 */ 0x00D8,0x282A,
-	/* Array index: 0x1424 */ 0x00DE,0x282D,
-	/* Array index: 0x1424 */ 0x00DF,0x292C,
-	/* Array index: 0x1424 */ 0x00E6,0x2921,
-	/* Array index: 0x1424 */ 0x00F0,0x2923,
-	/* Array index: 0x1424 */ 0x00F7,0x2140,
-	/* Array index: 0x1424 */ 0x00F8,0x292A,
-	/* Array index: 0x1424 */ 0x00FE,0x292D,
-	/* Array index: 0x1424 */ 0x0111,0x2922,
-	/* Array index: 0x1424 */ 0x0126,0x2824,
-	/* Array index: 0x1424 */ 0x0127,0x2924,
-	/* Array index: 0x1424 */ 0x0138,0x2927,
-	/* Array index: 0x1424 */ 0x0152,0x282B,
-	/* Array index: 0x1424 */ 0x0153,0x292B,
-	/* Array index: 0x1424 */ 0x0166,0x282E,
-	/* Array index: 0x1424 */ 0x0167,0x292E,
-	/* Array index: 0x1424 */ 0x02C7,0x2227,
-	/* Array index: 0x1424 */ 0x02D0,0x2230,
-	/* Array index: 0x1424 */ 0x0401,0x2C27,
-	/* Array index: 0x1424 */ 0x2015,0x212A,
-	/* Array index: 0x1424 */ 0x2018,0x212E,
-	/* Array index: 0x1424 */ 0x2019,0x212F,
-	/* Array index: 0x1424 */ 0x201C,0x2130,
-	/* Array index: 0x1424 */ 0x201D,0x2131,
-	/* Array index: 0x1424 */ 0x2020,0x2253,
-	/* Array index: 0x1424 */ 0x2021,0x2254,
-	/* Array index: 0x1424 */ 0x2025,0x2125,
-	/* Array index: 0x1424 */ 0x2026,0x2126,
-	/* Array index: 0x1424 */ 0x2030,0x2236,
-	/* Array index: 0x1424 */ 0x2032,0x2147,
-	/* Array index: 0x1424 */ 0x2033,0x2148,
-	/* Array index: 0x1424 */ 0x203B,0x2158,
-	/* Array index: 0x1424 */ 0x2074,0x2979,
-	/* Array index: 0x1424 */ 0x2103,0x2149,
-	/* Array index: 0x1424 */ 0x2109,0x2235,
-	/* Array index: 0x1424 */ 0x2113,0x2724,
-	/* Array index: 0x1424 */ 0x2116,0x2260,
-	/* Array index: 0x1424 */ 0x2121,0x2265,
-	/* Array index: 0x1424 */ 0x2122,0x2262,
-	/* Array index: 0x1424 */ 0x2126,0x2759,
-	/* Array index: 0x1424 */ 0x212B,0x214A,
-	/* Array index: 0x1424 */ 0x2153,0x2877,
-	/* Array index: 0x1424 */ 0x2154,0x2878,
-	/* Array index: 0x1424 */ 0x21D2,0x2221,
-	/* Array index: 0x1424 */ 0x21D4,0x2222,
-	/* Array index: 0x1424 */ 0x2200,0x2223,
-	/* Array index: 0x1424 */ 0x2202,0x2153,
-	/* Array index: 0x1424 */ 0x2203,0x2224,
-	/* Array index: 0x1424 */ 0x2207,0x2154,
-	/* Array index: 0x1424 */ 0x2208,0x2174,
-	/* Array index: 0x1424 */ 0x220B,0x2175,
-	/* Array index: 0x1424 */ 0x220F,0x2233,
-	/* Array index: 0x1424 */ 0x2211,0x2232,
-	/* Array index: 0x1424 */ 0x221A,0x216E,
-	/* Array index: 0x1424 */ 0x221D,0x2170,
-	/* Array index: 0x1424 */ 0x221E,0x2144,
-	/* Array index: 0x1424 */ 0x2220,0x2150,
-	/* Array index: 0x1424 */ 0x2234,0x2145,
-	/* Array index: 0x1424 */ 0x2235,0x2171,
-	/* Array index: 0x1424 */ 0x223C,0x212D,
-	/* Array index: 0x1424 */ 0x223D,0x216F,
-	/* Array index: 0x1424 */ 0x2252,0x2156,
-	/* Array index: 0x1424 */ 0x2260,0x2141,
-	/* Array index: 0x1424 */ 0x2261,0x2155,
-	/* Array index: 0x1424 */ 0x2264,0x2142,
-	/* Array index: 0x1424 */ 0x2265,0x2143,
-	/* Array index: 0x1424 */ 0x226A,0x216C,
-	/* Array index: 0x1424 */ 0x226B,0x216D,
-	/* Array index: 0x1424 */ 0x2282,0x2178,
-	/* Array index: 0x1424 */ 0x2283,0x2179,
-	/* Array index: 0x1424 */ 0x2286,0x2176,
-	/* Array index: 0x1424 */ 0x2287,0x2177,
-	/* Array index: 0x1424 */ 0x2299,0x2241,
-	/* Array index: 0x1424 */ 0x22A5,0x2151,
-	/* Array index: 0x1424 */ 0x2312,0x2152,
-	/* Array index: 0x1424 */ 0x2592,0x2246,
-	/* Array index: 0x1424 */ 0x25B2,0x2163,
-	/* Array index: 0x1424 */ 0x25B3,0x2162,
-	/* Array index: 0x1424 */ 0x25B6,0x223A,
-	/* Array index: 0x1424 */ 0x25B7,0x2239,
-	/* Array index: 0x1424 */ 0x25BC,0x2165,
-	/* Array index: 0x1424 */ 0x25BD,0x2164,
-	/* Array index: 0x1424 */ 0x25C0,0x2238,
-	/* Array index: 0x1424 */ 0x25C1,0x2237,
-	/* Array index: 0x1424 */ 0x25CB,0x215B,
-	/* Array index: 0x1424 */ 0x2605,0x215A,
-	/* Array index: 0x1424 */ 0x2606,0x2159,
-	/* Array index: 0x1424 */ 0x260E,0x224F,
-	/* Array index: 0x1424 */ 0x260F,0x224E,
-	/* Array index: 0x1424 */ 0x261C,0x2250,
-	/* Array index: 0x1424 */ 0x261E,0x2251,
-	/* Array index: 0x1424 */ 0x2640,0x214F,
-	/* Array index: 0x1424 */ 0x2642,0x214E,
-	/* Array index: 0x1424 */ 0x327F,0x225E,
-	/* Array index: 0x1424 */ 0x33CF,0x2739,
-	/* Array index: 0x1424 */ 0x33D0,0x276A,
-	/* Array index: 0x1424 */ 0x33D3,0x276B,
-	/* Array index: 0x1424 */ 0x33D6,0x275F,
-	/* Array index: 0x1424 */ 0x33D8,0x2264,
-	/* Array index: 0x1424 */ 0x4E00,0x6C69,
-	/* Array index: 0x1424 */ 0x4E01,0x6F4B,
-	/* Array index: 0x1424 */ 0x4E03,0x7652,
-	/* Array index: 0x1424 */ 0x4E11,0x7564,
-	/* Array index: 0x1424 */ 0x4E1E,0x632A,
-	/* Array index: 0x1424 */ 0x4E2D,0x7169,
-	/* Array index: 0x1424 */ 0x4E32,0x4D7A,
-	/* Array index: 0x1424 */ 0x4E38,0x7C2F,
-	/* Array index: 0x1424 */ 0x4E39,0x5321,
-	/* Array index: 0x1424 */ 0x4E3B,0x712B,
-	/* Array index: 0x1424 */ 0x4E42,0x6751,
-	/* Array index: 0x1424 */ 0x4E43,0x522C,
-	/* Array index: 0x1424 */ 0x4E45,0x4E79,
-	/* Array index: 0x1424 */ 0x4E56,0x4E52,
-	/* Array index: 0x1424 */ 0x4E58,0x632B,
-	/* Array index: 0x1424 */ 0x4E59,0x6B60,
-	/* Array index: 0x1424 */ 0x4E6B,0x4A61,
-	/* Array index: 0x1424 */ 0x4E6D,0x544C,
-	/* Array index: 0x1424 */ 0x4E73,0x6A61,
-	/* Array index: 0x1424 */ 0x4E76,0x5C63,
-	/* Array index: 0x1424 */ 0x4E77,0x5F2D,
-	/* Array index: 0x1424 */ 0x4E7E,0x4B6B,
-	/* Array index: 0x1424 */ 0x4E82,0x552F,
-	/* Array index: 0x1424 */ 0x4E86,0x5675,
-	/* Array index: 0x1424 */ 0x4E88,0x6578,
-	/* Array index: 0x1424 */ 0x4E8B,0x5E40,
-	/* Array index: 0x1424 */ 0x4E8C,0x6C23,
-	/* Array index: 0x1424 */ 0x4E98,0x5066,
-	/* Array index: 0x1424 */ 0x4E9B,0x5E41,
-	/* Array index: 0x1424 */ 0x4E9E,0x642C,
-	/* Array index: 0x1424 */ 0x4EB6,0x5322,
-	/* Array index: 0x1424 */ 0x4EBA,0x6C51,
-	/* Array index: 0x1424 */ 0x4EC0,0x6427,
-	/* Array index: 0x1424 */ 0x4EC1,0x6C52,
-	/* Array index: 0x1424 */ 0x4EC4,0x7631,
-	/* Array index: 0x1424 */ 0x4EC7,0x4E7B,
-	/* Array index: 0x1424 */ 0x4ECA,0x5051,
-	/* Array index: 0x1424 */ 0x4ECB,0x4B3F,
-	/* Array index: 0x1424 */ 0x4ECD,0x6D24,
-	/* Array index: 0x1424 */ 0x4EDD,0x544E,
-	/* Array index: 0x1424 */ 0x4EDF,0x7435,
-	/* Array index: 0x1424 */ 0x4EF0,0x6466,
-	/* Array index: 0x1424 */ 0x4EF2,0x716A,
-	/* Array index: 0x1424 */ 0x4EF6,0x4B6C,
-	/* Array index: 0x1424 */ 0x4EF7,0x4B40,
-	/* Array index: 0x1424 */ 0x4EFB,0x6C72,
-	/* Array index: 0x1424 */ 0x4F01,0x506A,
-	/* Array index: 0x1424 */ 0x4F2F,0x5B57,
-	/* Array index: 0x1424 */ 0x4F34,0x5A61,
-	/* Array index: 0x1424 */ 0x4F36,0x5636,
-	/* Array index: 0x1424 */ 0x4F38,0x635F,
-	/* Array index: 0x1424 */ 0x4F3A,0x5E43,
-	/* Array index: 0x1424 */ 0x4F3C,0x5E44,
-	/* Array index: 0x1424 */ 0x4F3D,0x4A21,
-	/* Array index: 0x1424 */ 0x4F43,0x6E6C,
-	/* Array index: 0x1424 */ 0x4F55,0x793C,
-	/* Array index: 0x1424 */ 0x4F69,0x7825,
-	/* Array index: 0x1424 */ 0x4F6F,0x653A,
-	/* Array index: 0x1424 */ 0x4F70,0x5B58,
-	/* Array index: 0x1424 */ 0x4F73,0x4A22,
-	/* Array index: 0x1424 */ 0x4F76,0x514D,
-	/* Array index: 0x1424 */ 0x4F7A,0x6E6D,
-	/* Array index: 0x1424 */ 0x4F7E,0x6C6B,
-	/* Array index: 0x1424 */ 0x4F7F,0x5E45,
-	/* Array index: 0x1424 */ 0x4F81,0x6360,
-	/* Array index: 0x1424 */ 0x4F83,0x4A49,
-	/* Array index: 0x1424 */ 0x4F84,0x7269,
-	/* Array index: 0x1424 */ 0x4F86,0x554E,
-	/* Array index: 0x1424 */ 0x4F88,0x7636,
-	/* Array index: 0x1424 */ 0x4F8A,0x4E42,
-	/* Array index: 0x1424 */ 0x4F8B,0x5647,
-	/* Array index: 0x1424 */ 0x4F8D,0x6334,
-	/* Array index: 0x1424 */ 0x4F8F,0x712D,
-	/* Array index: 0x1424 */ 0x4F91,0x6A62,
-	/* Array index: 0x1424 */ 0x4F96,0x5742,
-	/* Array index: 0x1424 */ 0x4F98,0x7327,
-	/* Array index: 0x1424 */ 0x4F9B,0x4D6A,
-	/* Array index: 0x1424 */ 0x4F9D,0x6B6E,
-	/* Array index: 0x1424 */ 0x4FAE,0x5932,
-	/* Array index: 0x1424 */ 0x4FAF,0x7D25,
-	/* Array index: 0x1424 */ 0x4FB5,0x7655,
-	/* Array index: 0x1424 */ 0x4FB6,0x5562,
-	/* Array index: 0x1424 */ 0x4FBF,0x7835,
-	/* Array index: 0x1424 */ 0x4FC9,0x676B,
-	/* Array index: 0x1424 */ 0x4FCA,0x7155,
-	/* Array index: 0x1424 */ 0x4FCE,0x703B,
-	/* Array index: 0x1424 */ 0x4FD1,0x6935,
-	/* Array index: 0x1424 */ 0x4FD3,0x4C49,
-	/* Array index: 0x1424 */ 0x4FD4,0x7A55,
-	/* Array index: 0x1424 */ 0x4FD7,0x6154,
-	/* Array index: 0x1424 */ 0x4FDA,0x5756,
-	/* Array index: 0x1424 */ 0x4FEE,0x6173,
-	/* Array index: 0x1424 */ 0x4FEF,0x5C76,
-	/* Array index: 0x1424 */ 0x4FF1,0x4E7C,
-	/* Array index: 0x1424 */ 0x4FF3,0x5B44,
-	/* Array index: 0x1424 */ 0x4FF5,0x7871,
-	/* Array index: 0x1424 */ 0x4FF8,0x5C64,
-	/* Array index: 0x1424 */ 0x4FFA,0x656F,
-	/* Array index: 0x1424 */ 0x5002,0x5C31,
-	/* Array index: 0x1424 */ 0x5006,0x5556,
-	/* Array index: 0x1424 */ 0x5009,0x735A,
-	/* Array index: 0x1424 */ 0x500B,0x4B41,
-	/* Array index: 0x1424 */ 0x500D,0x5B43,
-	/* Array index: 0x1424 */ 0x5011,0x597A,
-	/* Array index: 0x1424 */ 0x5012,0x536E,
-	/* Array index: 0x1424 */ 0x5016,0x7A38,
-	/* Array index: 0x1424 */ 0x5019,0x7D26,
-	/* Array index: 0x1424 */ 0x501A,0x6B6F,
-	/* Array index: 0x1424 */ 0x501C,0x7426,
-	/* Array index: 0x1424 */ 0x501E,0x4C4A,
-	/* Array index: 0x1424 */ 0x501F,0x7328,
-	/* Array index: 0x1424 */ 0x5021,0x735B,
-	/* Array index: 0x1424 */ 0x503B,0x6526,
-	/* Array index: 0x1424 */ 0x5043,0x6567,
-	/* Array index: 0x1424 */ 0x504F,0x7836,
-	/* Array index: 0x1424 */ 0x5055,0x7A25,
-	/* Array index: 0x1424 */ 0x505A,0x712E,
-	/* Array index: 0x1424 */ 0x505C,0x6F4E,
-	/* Array index: 0x1424 */ 0x5065,0x4B6D,
-	/* Array index: 0x1424 */ 0x5080,0x4E53,
-	/* Array index: 0x1424 */ 0x5085,0x5C77,
-	/* Array index: 0x1424 */ 0x508D,0x5B28,
-	/* Array index: 0x1424 */ 0x5091,0x4B78,
-	/* Array index: 0x1424 */ 0x5098,0x5F21,
-	/* Array index: 0x1424 */ 0x5099,0x5D61,
-	/* Array index: 0x1424 */ 0x50AC,0x754A,
-	/* Array index: 0x1424 */ 0x50AD,0x6936,
-	/* Array index: 0x1424 */ 0x50B2,0x676C,
-	/* Array index: 0x1424 */ 0x50B3,0x6E6E,
-	/* Array index: 0x1424 */ 0x50B5,0x7370,
-	/* Array index: 0x1424 */ 0x50B7,0x5F3F,
-	/* Array index: 0x1424 */ 0x50BE,0x4C4B,
-	/* Array index: 0x1424 */ 0x50C5,0x5041,
-	/* Array index: 0x1424 */ 0x50C9,0x7452,
-	/* Array index: 0x1424 */ 0x50CA,0x603A,
-	/* Array index: 0x1424 */ 0x50CF,0x5F40,
-	/* Array index: 0x1424 */ 0x50D1,0x4E60,
-	/* Array index: 0x1424 */ 0x50D5,0x5C52,
-	/* Array index: 0x1424 */ 0x50D6,0x7D6A,
-	/* Array index: 0x1424 */ 0x50DA,0x5676,
-	/* Array index: 0x1424 */ 0x50DE,0x6A4A,
-	/* Array index: 0x1424 */ 0x50E5,0x6869,
-	/* Array index: 0x1424 */ 0x50E7,0x632C,
-	/* Array index: 0x1424 */ 0x50ED,0x7350,
-	/* Array index: 0x1424 */ 0x50F9,0x4A24,
-	/* Array index: 0x1424 */ 0x50FB,0x5B78,
-	/* Array index: 0x1424 */ 0x5104,0x6562,
-	/* Array index: 0x1424 */ 0x5106,0x4C4C,
-	/* Array index: 0x1424 */ 0x5109,0x4B7B,
-	/* Array index: 0x1424 */ 0x5112,0x6A63,
-	/* Array index: 0x1424 */ 0x511F,0x5F41,
-	/* Array index: 0x1424 */ 0x5121,0x566D,
-	/* Array index: 0x1424 */ 0x512A,0x6950,
-	/* Array index: 0x1424 */ 0x5132,0x6E39,
-	/* Array index: 0x1424 */ 0x5137,0x5563,
-	/* Array index: 0x1424 */ 0x513A,0x5153,
-	/* Array index: 0x1424 */ 0x513C,0x6570,
-	/* Array index: 0x1424 */ 0x5152,0x642E,
-	/* Array index: 0x1424 */ 0x515C,0x545F,
-	/* Array index: 0x1424 */ 0x5162,0x5067,
-	/* Array index: 0x1424 */ 0x5171,0x4D6C,
-	/* Array index: 0x1424 */ 0x517C,0x4C42,
-	/* Array index: 0x1424 */ 0x5180,0x506D,
-	/* Array index: 0x1424 */ 0x5186,0x6577,
-	/* Array index: 0x1424 */ 0x518A,0x737C,
-	/* Array index: 0x1424 */ 0x518D,0x6E22,
-	/* Array index: 0x1424 */ 0x5192,0x5933,
-	/* Array index: 0x1424 */ 0x5195,0x5874,
-	/* Array index: 0x1424 */ 0x5197,0x6937,
-	/* Array index: 0x1424 */ 0x51A0,0x4E2E,
-	/* Array index: 0x1424 */ 0x51A5,0x5922,
-	/* Array index: 0x1424 */ 0x51AA,0x5871,
-	/* Array index: 0x1424 */ 0x51AC,0x544F,
-	/* Array index: 0x1424 */ 0x51B6,0x6527,
-	/* Array index: 0x1424 */ 0x51B7,0x5552,
-	/* Array index: 0x1424 */ 0x51BD,0x5629,
-	/* Array index: 0x1424 */ 0x51C4,0x7422,
-	/* Array index: 0x1424 */ 0x51C6,0x7157,
-	/* Array index: 0x1424 */ 0x51E1,0x5B6D,
-	/* Array index: 0x1424 */ 0x51F0,0x7C45,
-	/* Array index: 0x1424 */ 0x51F1,0x4B42,
-	/* Array index: 0x1424 */ 0x51FD,0x795E,
-	/* Array index: 0x1424 */ 0x5200,0x536F,
-	/* Array index: 0x1424 */ 0x5203,0x6C53,
-	/* Array index: 0x1424 */ 0x520E,0x597B,
-	/* Array index: 0x1424 */ 0x5211,0x7A7D,
-	/* Array index: 0x1424 */ 0x5217,0x562A,
-	/* Array index: 0x1424 */ 0x521D,0x7478,
-	/* Array index: 0x1424 */ 0x5224,0x7777,
-	/* Array index: 0x1424 */ 0x5225,0x5C2C,
-	/* Array index: 0x1424 */ 0x5229,0x5757,
-	/* Array index: 0x1424 */ 0x522A,0x5F22,
-	/* Array index: 0x1424 */ 0x522E,0x4E3E,
-	/* Array index: 0x1424 */ 0x5230,0x5370,
-	/* Array index: 0x1424 */ 0x5243,0x746F,
-	/* Array index: 0x1424 */ 0x5247,0x764E,
-	/* Array index: 0x1424 */ 0x5254,0x7428,
-	/* Array index: 0x1424 */ 0x5256,0x5C78,
-	/* Array index: 0x1424 */ 0x525B,0x4B27,
-	/* Array index: 0x1424 */ 0x525D,0x5A4E,
-	/* Array index: 0x1424 */ 0x5261,0x6066,
-	/* Array index: 0x1424 */ 0x5269,0x6D25,
-	/* Array index: 0x1424 */ 0x526A,0x6E72,
-	/* Array index: 0x1424 */ 0x526F,0x5C79,
-	/* Array index: 0x1424 */ 0x5272,0x795C,
-	/* Array index: 0x1424 */ 0x5275,0x735C,
-	/* Array index: 0x1424 */ 0x527D,0x7872,
-	/* Array index: 0x1424 */ 0x527F,0x7479,
-	/* Array index: 0x1424 */ 0x5283,0x7C71,
-	/* Array index: 0x1424 */ 0x528D,0x4B7C,
-	/* Array index: 0x1424 */ 0x5291,0x7025,
-	/* Array index: 0x1424 */ 0x5292,0x4B7D,
-	/* Array index: 0x1424 */ 0x529B,0x5574,
-	/* Array index: 0x1424 */ 0x529F,0x4D6D,
-	/* Array index: 0x1424 */ 0x52A0,0x4A25,
-	/* Array index: 0x1424 */ 0x52A3,0x562B,
-	/* Array index: 0x1424 */ 0x52A4,0x5042,
-	/* Array index: 0x1424 */ 0x52BE,0x7A36,
-	/* Array index: 0x1424 */ 0x52C1,0x4C4D,
-	/* Array index: 0x1424 */ 0x52C3,0x5A7A,
-	/* Array index: 0x1424 */ 0x52C5,0x764F,
-	/* Array index: 0x1424 */ 0x52C7,0x6938,
-	/* Array index: 0x1424 */ 0x52C9,0x5875,
-	/* Array index: 0x1424 */ 0x52CD,0x4C4E,
-	/* Array index: 0x1424 */ 0x52D2,0x574D,
-	/* Array index: 0x1424 */ 0x52F3,0x7D33,
-	/* Array index: 0x1424 */ 0x52F5,0x5564,
-	/* Array index: 0x1424 */ 0x52F8,0x4F68,
-	/* Array index: 0x1424 */ 0x52FA,0x6D43,
-	/* Array index: 0x1424 */ 0x52FB,0x5032,
-	/* Array index: 0x1424 */ 0x52FE,0x4E7E,
-	/* Array index: 0x1424 */ 0x52FF,0x5A28,
-	/* Array index: 0x1424 */ 0x5305,0x7850,
-	/* Array index: 0x1424 */ 0x5308,0x7D56,
-	/* Array index: 0x1424 */ 0x530D,0x7851,
-	/* Array index: 0x1424 */ 0x530F,0x7852,
-	/* Array index: 0x1424 */ 0x5310,0x5C53,
-	/* Array index: 0x1424 */ 0x5320,0x6D5D,
-	/* Array index: 0x1424 */ 0x5321,0x4E44,
-	/* Array index: 0x1424 */ 0x5323,0x4B21,
-	/* Array index: 0x1424 */ 0x532A,0x5D63,
-	/* Array index: 0x1424 */ 0x532F,0x7C5D,
-	/* Array index: 0x1424 */ 0x5339,0x792F,
-	/* Array index: 0x1424 */ 0x534D,0x5833,
-	/* Array index: 0x1424 */ 0x5357,0x5175,
-	/* Array index: 0x1424 */ 0x535A,0x5A4F,
-	/* Array index: 0x1424 */ 0x535C,0x5C54,
-	/* Array index: 0x1424 */ 0x535E,0x5C26,
-	/* Array index: 0x1424 */ 0x5360,0x6F3F,
-	/* Array index: 0x1424 */ 0x5366,0x4E4F,
-	/* Array index: 0x1424 */ 0x5368,0x6059,
-	/* Array index: 0x1424 */ 0x537D,0x716D,
-	/* Array index: 0x1424 */ 0x537F,0x4C4F,
-	/* Array index: 0x1424 */ 0x5384,0x6478,
-	/* Array index: 0x1424 */ 0x5393,0x646D,
-	/* Array index: 0x1424 */ 0x5398,0x5758,
-	/* Array index: 0x1424 */ 0x539A,0x7D27,
-	/* Array index: 0x1424 */ 0x539F,0x6A2B,
-	/* Array index: 0x1424 */ 0x53A0,0x7632,
-	/* Array index: 0x1424 */ 0x53A5,0x4F70,
-	/* Array index: 0x1424 */ 0x53A6,0x793D,
-	/* Array index: 0x1424 */ 0x53AD,0x6674,
-	/* Array index: 0x1424 */ 0x53BB,0x4B5B,
-	/* Array index: 0x1424 */ 0x53C3,0x7351,
-	/* Array index: 0x1424 */ 0x53D4,0x6252,
-	/* Array index: 0x1424 */ 0x53D6,0x7622,
-	/* Array index: 0x1424 */ 0x53D7,0x6174,
-	/* Array index: 0x1424 */ 0x53DB,0x5A64,
-	/* Array index: 0x1424 */ 0x53F8,0x5E49,
-	/* Array index: 0x1424 */ 0x5403,0x7D5E,
-	/* Array index: 0x1424 */ 0x5404,0x4A40,
-	/* Array index: 0x1424 */ 0x541B,0x4F56,
-	/* Array index: 0x1424 */ 0x541D,0x5770,
-	/* Array index: 0x1424 */ 0x541F,0x6B61,
-	/* Array index: 0x1424 */ 0x5420,0x7845,
-	/* Array index: 0x1424 */ 0x5426,0x5C7A,
-	/* Array index: 0x1424 */ 0x5429,0x5D43,
-	/* Array index: 0x1424 */ 0x542B,0x795F,
-	/* Array index: 0x1424 */ 0x5433,0x676F,
-	/* Array index: 0x1424 */ 0x5442,0x5565,
-	/* Array index: 0x1424 */ 0x5448,0x6F50,
-	/* Array index: 0x1424 */ 0x544A,0x4D31,
-	/* Array index: 0x1424 */ 0x5451,0x7722,
-	/* Array index: 0x1424 */ 0x5468,0x7132,
-	/* Array index: 0x1424 */ 0x546A,0x7131,
-	/* Array index: 0x1424 */ 0x5471,0x4D32,
-	/* Array index: 0x1424 */ 0x5473,0x5A2B,
-	/* Array index: 0x1424 */ 0x5475,0x4A27,
-	/* Array index: 0x1424 */ 0x5480,0x6E3A,
-	/* Array index: 0x1424 */ 0x5486,0x7853,
-	/* Array index: 0x1424 */ 0x548C,0x7B7A,
-	/* Array index: 0x1424 */ 0x548E,0x4F24,
-	/* Array index: 0x1424 */ 0x5490,0x5C7B,
-	/* Array index: 0x1424 */ 0x54A4,0x7663,
-	/* Array index: 0x1424 */ 0x54A8,0x6D2A,
-	/* Array index: 0x1424 */ 0x54AB,0x7221,
-	/* Array index: 0x1424 */ 0x54AC,0x4E61,
-	/* Array index: 0x1424 */ 0x54B3,0x7A26,
-	/* Array index: 0x1424 */ 0x54B8,0x7960,
-	/* Array index: 0x1424 */ 0x54BD,0x6C56,
-	/* Array index: 0x1424 */ 0x54C0,0x646E,
-	/* Array index: 0x1424 */ 0x54C1,0x7921,
-	/* Array index: 0x1424 */ 0x54C4,0x7B6F,
-	/* Array index: 0x1424 */ 0x54C8,0x796B,
-	/* Array index: 0x1424 */ 0x54C9,0x6E23,
-	/* Array index: 0x1424 */ 0x54E1,0x6A2C,
-	/* Array index: 0x1424 */ 0x54E5,0x4A28,
-	/* Array index: 0x1424 */ 0x54E8,0x747A,
-	/* Array index: 0x1424 */ 0x54ED,0x4D56,
-	/* Array index: 0x1424 */ 0x54EE,0x7C76,
-	/* Array index: 0x1424 */ 0x54F2,0x7449,
-	/* Array index: 0x1424 */ 0x54FA,0x7854,
-	/* Array index: 0x1424 */ 0x5504,0x7826,
-	/* Array index: 0x1424 */ 0x5506,0x5E4A,
-	/* Array index: 0x1424 */ 0x5507,0x7246,
-	/* Array index: 0x1424 */ 0x550E,0x575A,
-	/* Array index: 0x1424 */ 0x5510,0x5350,
-	/* Array index: 0x1424 */ 0x551C,0x5845,
-	/* Array index: 0x1424 */ 0x552F,0x6A66,
-	/* Array index: 0x1424 */ 0x5531,0x735D,
-	/* Array index: 0x1424 */ 0x5535,0x645A,
-	/* Array index: 0x1424 */ 0x553E,0x7664,
-	/* Array index: 0x1424 */ 0x5544,0x7672,
-	/* Array index: 0x1424 */ 0x5546,0x5F42,
-	/* Array index: 0x1424 */ 0x554F,0x597D,
-	/* Array index: 0x1424 */ 0x5553,0x4C76,
-	/* Array index: 0x1424 */ 0x5556,0x533A,
-	/* Array index: 0x1424 */ 0x555E,0x642F,
-	/* Array index: 0x1424 */ 0x5563,0x7961,
-	/* Array index: 0x1424 */ 0x557C,0x7026,
-	/* Array index: 0x1424 */ 0x5580,0x4B53,
-	/* Array index: 0x1424 */ 0x5584,0x603C,
-	/* Array index: 0x1424 */ 0x55C5,0x7D2B,
-	/* Array index: 0x1424 */ 0x55C7,0x5F60,
-	/* Array index: 0x1424 */ 0x55D4,0x7247,
-	/* Array index: 0x1424 */ 0x55DA,0x6770,
-	/* Array index: 0x1424 */ 0x55DC,0x506E,
-	/* Array index: 0x1424 */ 0x55DF,0x732A,
-	/* Array index: 0x1424 */ 0x55E3,0x5E4B,
-	/* Array index: 0x1424 */ 0x55E4,0x7638,
-	/* Array index: 0x1424 */ 0x55FD,0x6175,
-	/* Array index: 0x1424 */ 0x55FE,0x7133,
-	/* Array index: 0x1424 */ 0x5606,0x7723,
-	/* Array index: 0x1424 */ 0x5609,0x4A29,
-	/* Array index: 0x1424 */ 0x5614,0x4F25,
-	/* Array index: 0x1424 */ 0x5617,0x5F44,
-	/* Array index: 0x1424 */ 0x562F,0x6130,
-	/* Array index: 0x1424 */ 0x5632,0x703F,
-	/* Array index: 0x1424 */ 0x5634,0x7624,
-	/* Array index: 0x1424 */ 0x5636,0x6336,
-	/* Array index: 0x1424 */ 0x5653,0x7A46,
-	/* Array index: 0x1424 */ 0x5668,0x506F,
-	/* Array index: 0x1424 */ 0x566B,0x7D6D,
-	/* Array index: 0x1424 */ 0x5674,0x5D44,
-	/* Array index: 0x1424 */ 0x5686,0x7C77,
-	/* Array index: 0x1424 */ 0x56A5,0x663F,
-	/* Array index: 0x1424 */ 0x56AC,0x5E2D,
-	/* Array index: 0x1424 */ 0x56AE,0x7A3F,
-	/* Array index: 0x1424 */ 0x56B4,0x6571,
-	/* Array index: 0x1424 */ 0x56BC,0x6D44,
-	/* Array index: 0x1424 */ 0x56CA,0x5225,
-	/* Array index: 0x1424 */ 0x56CD,0x7D6E,
-	/* Array index: 0x1424 */ 0x56D1,0x7536,
-	/* Array index: 0x1424 */ 0x56DA,0x6176,
-	/* Array index: 0x1424 */ 0x56DB,0x5E4C,
-	/* Array index: 0x1424 */ 0x56DE,0x7C5E,
-	/* Array index: 0x1424 */ 0x56E0,0x6C57,
-	/* Array index: 0x1424 */ 0x56F0,0x4D5D,
-	/* Array index: 0x1424 */ 0x56F9,0x5637,
-	/* Array index: 0x1424 */ 0x56FA,0x4D33,
-	/* Array index: 0x1424 */ 0x5703,0x7855,
-	/* Array index: 0x1424 */ 0x5704,0x6558,
-	/* Array index: 0x1424 */ 0x5708,0x4F6A,
-	/* Array index: 0x1424 */ 0x570B,0x4F50,
-	/* Array index: 0x1424 */ 0x570D,0x6A4C,
-	/* Array index: 0x1424 */ 0x5712,0x6A2E,
-	/* Array index: 0x1424 */ 0x5713,0x6A2D,
-	/* Array index: 0x1424 */ 0x5716,0x5371,
-	/* Array index: 0x1424 */ 0x5718,0x5325,
-	/* Array index: 0x1424 */ 0x571F,0x774F,
-	/* Array index: 0x1424 */ 0x5728,0x6E24,
-	/* Array index: 0x1424 */ 0x572D,0x5024,
-	/* Array index: 0x1424 */ 0x5730,0x7222,
-	/* Array index: 0x1424 */ 0x573B,0x5070,
-	/* Array index: 0x1424 */ 0x5740,0x7223,
-	/* Array index: 0x1424 */ 0x5742,0x7778,
-	/* Array index: 0x1424 */ 0x5747,0x5033,
-	/* Array index: 0x1424 */ 0x574A,0x5B29,
-	/* Array index: 0x1424 */ 0x5761,0x7767,
-	/* Array index: 0x1424 */ 0x5764,0x4D5E,
-	/* Array index: 0x1424 */ 0x5766,0x7724,
-	/* Array index: 0x1424 */ 0x576A,0x7840,
-	/* Array index: 0x1424 */ 0x576E,0x535D,
-	/* Array index: 0x1424 */ 0x5770,0x4C50,
-	/* Array index: 0x1424 */ 0x5775,0x4F26,
-	/* Array index: 0x1424 */ 0x577C,0x7673,
-	/* Array index: 0x1424 */ 0x5782,0x6177,
-	/* Array index: 0x1424 */ 0x5788,0x535C,
-	/* Array index: 0x1424 */ 0x578B,0x7A7E,
-	/* Array index: 0x1424 */ 0x5793,0x7A27,
-	/* Array index: 0x1424 */ 0x57A0,0x6B59,
-	/* Array index: 0x1424 */ 0x57A2,0x4F27,
-	/* Array index: 0x1424 */ 0x57A3,0x6A2F,
-	/* Array index: 0x1424 */ 0x57C3,0x646F,
-	/* Array index: 0x1424 */ 0x57C7,0x6939,
-	/* Array index: 0x1424 */ 0x57C8,0x7158,
-	/* Array index: 0x1424 */ 0x57CB,0x5858,
-	/* Array index: 0x1424 */ 0x57CE,0x6072,
-	/* Array index: 0x1424 */ 0x57DF,0x6634,
-	/* Array index: 0x1424 */ 0x57E0,0x5C7C,
-	/* Array index: 0x1424 */ 0x57F0,0x7371,
-	/* Array index: 0x1424 */ 0x57F4,0x6350,
-	/* Array index: 0x1424 */ 0x57F7,0x727B,
-	/* Array index: 0x1424 */ 0x57F9,0x5B46,
-	/* Array index: 0x1424 */ 0x57FA,0x5071,
-	/* Array index: 0x1424 */ 0x57FC,0x5072,
-	/* Array index: 0x1424 */ 0x5800,0x4F5C,
-	/* Array index: 0x1424 */ 0x5802,0x5351,
-	/* Array index: 0x1424 */ 0x581E,0x745C,
-	/* Array index: 0x1424 */ 0x5821,0x5C42,
-	/* Array index: 0x1424 */ 0x5824,0x7027,
-	/* Array index: 0x1424 */ 0x5827,0x6640,
-	/* Array index: 0x1424 */ 0x582A,0x4A6D,
-	/* Array index: 0x1424 */ 0x583A,0x4C77,
-	/* Array index: 0x1424 */ 0x584A,0x4E54,
-	/* Array index: 0x1424 */ 0x584B,0x672B,
-	/* Array index: 0x1424 */ 0x584F,0x4B43,
-	/* Array index: 0x1424 */ 0x5851,0x6131,
-	/* Array index: 0x1424 */ 0x5854,0x7732,
-	/* Array index: 0x1424 */ 0x5857,0x5373,
-	/* Array index: 0x1424 */ 0x5858,0x5352,
-	/* Array index: 0x1424 */ 0x585A,0x7540,
-	/* Array index: 0x1424 */ 0x585E,0x5F5D,
-	/* Array index: 0x1424 */ 0x5861,0x6E73,
-	/* Array index: 0x1424 */ 0x5862,0x6771,
-	/* Array index: 0x1424 */ 0x5864,0x7D34,
-	/* Array index: 0x1424 */ 0x5875,0x7248,
-	/* Array index: 0x1424 */ 0x5879,0x7352,
-	/* Array index: 0x1424 */ 0x587C,0x6E74,
-	/* Array index: 0x1424 */ 0x587E,0x6253,
-	/* Array index: 0x1424 */ 0x5883,0x4C51,
-	/* Array index: 0x1424 */ 0x5885,0x5F6A,
-	/* Array index: 0x1424 */ 0x5889,0x693A,
-	/* Array index: 0x1424 */ 0x5893,0x5957,
-	/* Array index: 0x1424 */ 0x589C,0x754D,
-	/* Array index: 0x1424 */ 0x589E,0x7172,
-	/* Array index: 0x1424 */ 0x589F,0x7A47,
-	/* Array index: 0x1424 */ 0x58A8,0x5978,
-	/* Array index: 0x1424 */ 0x58A9,0x5442,
-	/* Array index: 0x1424 */ 0x58AE,0x7665,
-	/* Array index: 0x1424 */ 0x58B3,0x5D45,
-	/* Array index: 0x1424 */ 0x58BA,0x6772,
-	/* Array index: 0x1424 */ 0x58BB,0x6D5F,
-	/* Array index: 0x1424 */ 0x58BE,0x4A4B,
-	/* Array index: 0x1424 */ 0x58C1,0x5B7A,
-	/* Array index: 0x1424 */ 0x58C5,0x6835,
-	/* Array index: 0x1424 */ 0x58C7,0x5326,
-	/* Array index: 0x1424 */ 0x58CE,0x7D35,
-	/* Array index: 0x1424 */ 0x58D1,0x7949,
-	/* Array index: 0x1424 */ 0x58D3,0x6462,
-	/* Array index: 0x1424 */ 0x58D5,0x7B3D,
-	/* Array index: 0x1424 */ 0x58D8,0x5724,
-	/* Array index: 0x1424 */ 0x58D9,0x4E45,
-	/* Array index: 0x1424 */ 0x58DE,0x4E55,
-	/* Array index: 0x1424 */ 0x58DF,0x5666,
-	/* Array index: 0x1424 */ 0x58E4,0x653D,
-	/* Array index: 0x1424 */ 0x58EB,0x5E4D,
-	/* Array index: 0x1424 */ 0x58EC,0x6C73,
-	/* Array index: 0x1424 */ 0x58EF,0x6D60,
-	/* Array index: 0x1424 */ 0x590F,0x793E,
-	/* Array index: 0x1424 */ 0x5922,0x5953,
-	/* Array index: 0x1424 */ 0x5931,0x6377,
-	/* Array index: 0x1424 */ 0x5937,0x6C28,
-	/* Array index: 0x1424 */ 0x593E,0x7A71,
-	/* Array index: 0x1424 */ 0x5944,0x6572,
-	/* Array index: 0x1424 */ 0x595A,0x7A28,
-	/* Array index: 0x1424 */ 0x5960,0x6E75,
-	/* Array index: 0x1424 */ 0x5962,0x5E4E,
-	/* Array index: 0x1424 */ 0x5967,0x6773,
-	/* Array index: 0x1424 */ 0x5973,0x5233,
-	/* Array index: 0x1424 */ 0x5974,0x523F,
-	/* Array index: 0x1424 */ 0x5978,0x4A4C,
-	/* Array index: 0x1424 */ 0x597D,0x7B3F,
-	/* Array index: 0x1424 */ 0x598A,0x6C74,
-	/* Array index: 0x1424 */ 0x5993,0x5075,
-	/* Array index: 0x1424 */ 0x5996,0x686D,
-	/* Array index: 0x1424 */ 0x5997,0x5052,
-	/* Array index: 0x1424 */ 0x5999,0x5958,
-	/* Array index: 0x1424 */ 0x59A5,0x7666,
-	/* Array index: 0x1424 */ 0x59A8,0x5B2A,
-	/* Array index: 0x1424 */ 0x59AC,0x7760,
-	/* Array index: 0x1424 */ 0x59B9,0x5859,
-	/* Array index: 0x1424 */ 0x59BB,0x7423,
-	/* Array index: 0x1424 */ 0x59BE,0x745D,
-	/* Array index: 0x1424 */ 0x59C3,0x6F51,
-	/* Array index: 0x1424 */ 0x59C6,0x5935,
-	/* Array index: 0x1424 */ 0x59C9,0x6D2B,
-	/* Array index: 0x1424 */ 0x59CB,0x6337,
-	/* Array index: 0x1424 */ 0x59E6,0x4A4D,
-	/* Array index: 0x1424 */ 0x59E8,0x6C29,
-	/* Array index: 0x1424 */ 0x59EA,0x726B,
-	/* Array index: 0x1424 */ 0x59EC,0x7D6F,
-	/* Array index: 0x1424 */ 0x59EE,0x7973,
-	/* Array index: 0x1424 */ 0x59F8,0x6641,
-	/* Array index: 0x1424 */ 0x59FB,0x6C58,
-	/* Array index: 0x1424 */ 0x59FF,0x6D2C,
-	/* Array index: 0x1424 */ 0x5A01,0x6A4E,
-	/* Array index: 0x1424 */ 0x5A03,0x685F,
-	/* Array index: 0x1424 */ 0x5A11,0x5E4F,
-	/* Array index: 0x1424 */ 0x5A18,0x5226,
-	/* Array index: 0x1424 */ 0x5A1B,0x6774,
-	/* Array index: 0x1424 */ 0x5A1C,0x5156,
-	/* Array index: 0x1424 */ 0x5A1F,0x6642,
-	/* Array index: 0x1424 */ 0x5A20,0x6363,
-	/* Array index: 0x1424 */ 0x5A25,0x6430,
-	/* Array index: 0x1424 */ 0x5A29,0x5834,
-	/* Array index: 0x1424 */ 0x5A36,0x7625,
-	/* Array index: 0x1424 */ 0x5A3C,0x735E,
-	/* Array index: 0x1424 */ 0x5A41,0x5725,
-	/* Array index: 0x1424 */ 0x5A46,0x7768,
-	/* Array index: 0x1424 */ 0x5A49,0x6846,
-	/* Array index: 0x1424 */ 0x5A5A,0x7B66,
-	/* Array index: 0x1424 */ 0x5A62,0x5D66,
-	/* Array index: 0x1424 */ 0x5A66,0x5C7E,
-	/* Array index: 0x1424 */ 0x5A92,0x585A,
-	/* Array index: 0x1424 */ 0x5A9A,0x5A2C,
-	/* Array index: 0x1424 */ 0x5A9B,0x6A30,
-	/* Array index: 0x1424 */ 0x5AA4,0x6338,
-	/* Array index: 0x1424 */ 0x5AC1,0x4A2A,
-	/* Array index: 0x1424 */ 0x5AC2,0x6179,
-	/* Array index: 0x1424 */ 0x5AC4,0x6A31,
-	/* Array index: 0x1424 */ 0x5AC9,0x726C,
-	/* Array index: 0x1424 */ 0x5ACC,0x7A6E,
-	/* Array index: 0x1424 */ 0x5AE1,0x6E55,
-	/* Array index: 0x1424 */ 0x5AE6,0x7974,
-	/* Array index: 0x1424 */ 0x5AE9,0x526C,
-	/* Array index: 0x1424 */ 0x5B05,0x7B7B,
-	/* Array index: 0x1424 */ 0x5B09,0x7D70,
-	/* Array index: 0x1424 */ 0x5B0B,0x603D,
-	/* Array index: 0x1424 */ 0x5B0C,0x4E63,
-	/* Array index: 0x1424 */ 0x5B16,0x7846,
-	/* Array index: 0x1424 */ 0x5B2A,0x5E2E,
-	/* Array index: 0x1424 */ 0x5B40,0x5F45,
-	/* Array index: 0x1424 */ 0x5B43,0x653E,
-	/* Array index: 0x1424 */ 0x5B50,0x6D2D,
-	/* Array index: 0x1424 */ 0x5B51,0x7A6A,
-	/* Array index: 0x1424 */ 0x5B63,0x4C79,
-	/* Array index: 0x1424 */ 0x5B64,0x4D35,
-	/* Array index: 0x1424 */ 0x5B69,0x7A29,
-	/* Array index: 0x1424 */ 0x5B6B,0x615D,
-	/* Array index: 0x1424 */ 0x5B70,0x6255,
-	/* Array index: 0x1424 */ 0x5B71,0x6D4F,
-	/* Array index: 0x1424 */ 0x5B75,0x5D22,
-	/* Array index: 0x1424 */ 0x5B78,0x794A,
-	/* Array index: 0x1424 */ 0x5B7A,0x6A68,
-	/* Array index: 0x1424 */ 0x5B7C,0x656D,
-	/* Array index: 0x1424 */ 0x5B8F,0x4E5B,
-	/* Array index: 0x1424 */ 0x5BAC,0x6074,
-	/* Array index: 0x1424 */ 0x5BAE,0x4F60,
-	/* Array index: 0x1424 */ 0x5BB0,0x6E25,
-	/* Array index: 0x1424 */ 0x5BCC,0x5D23,
-	/* Array index: 0x1424 */ 0x5BD7,0x523C,
-	/* Array index: 0x1424 */ 0x5BF5,0x7541,
-	/* Array index: 0x1424 */ 0x5BF6,0x5C44,
-	/* Array index: 0x1424 */ 0x5BF8,0x753B,
-	/* Array index: 0x1424 */ 0x5BFA,0x5E51,
-	/* Array index: 0x1424 */ 0x5C01,0x5C66,
-	/* Array index: 0x1424 */ 0x5C04,0x5E52,
-	/* Array index: 0x1424 */ 0x5C16,0x7453,
-	/* Array index: 0x1424 */ 0x5C19,0x5F46,
-	/* Array index: 0x1424 */ 0x5C24,0x6956,
-	/* Array index: 0x1424 */ 0x5C28,0x5B2B,
-	/* Array index: 0x1424 */ 0x5C31,0x7626,
-	/* Array index: 0x1424 */ 0x5C45,0x4B5C,
-	/* Array index: 0x1424 */ 0x5C46,0x4C7A,
-	/* Array index: 0x1424 */ 0x5C48,0x4F5D,
-	/* Array index: 0x1424 */ 0x5C4B,0x6829,
-	/* Array index: 0x1424 */ 0x5C4D,0x633B,
-	/* Array index: 0x1424 */ 0x5C4E,0x633A,
-	/* Array index: 0x1424 */ 0x5C51,0x605A,
-	/* Array index: 0x1424 */ 0x5C55,0x6E77,
-	/* Array index: 0x1424 */ 0x5C5B,0x5C33,
-	/* Array index: 0x1424 */ 0x5C60,0x5375,
-	/* Array index: 0x1424 */ 0x5C62,0x5726,
-	/* Array index: 0x1424 */ 0x5C64,0x7635,
-	/* Array index: 0x1424 */ 0x5C65,0x575B,
-	/* Array index: 0x1424 */ 0x5C6C,0x6155,
-	/* Array index: 0x1424 */ 0x5C6F,0x546A,
-	/* Array index: 0x1424 */ 0x5C71,0x5F23,
-	/* Array index: 0x1424 */ 0x5C79,0x7D5F,
-	/* Array index: 0x1424 */ 0x5C90,0x5077,
-	/* Array index: 0x1424 */ 0x5C91,0x6D54,
-	/* Array index: 0x1424 */ 0x5CA1,0x4B2A,
-	/* Array index: 0x1424 */ 0x5CA9,0x645B,
-	/* Array index: 0x1424 */ 0x5CAB,0x617B,
-	/* Array index: 0x1424 */ 0x5CAC,0x4B22,
-	/* Array index: 0x1424 */ 0x5CB1,0x5360,
-	/* Array index: 0x1424 */ 0x5CB3,0x643F,
-	/* Array index: 0x1424 */ 0x5CB5,0x7B40,
-	/* Array index: 0x1424 */ 0x5CB7,0x5A3E,
-	/* Array index: 0x1424 */ 0x5CB8,0x644D,
-	/* Array index: 0x1424 */ 0x5CBA,0x5639,
-	/* Array index: 0x1424 */ 0x5CBE,0x6F40,
-	/* Array index: 0x1424 */ 0x5CC0,0x617C,
-	/* Array index: 0x1424 */ 0x5CD9,0x7639,
-	/* Array index: 0x1424 */ 0x5CE0,0x5F47,
-	/* Array index: 0x1424 */ 0x5CE8,0x6431,
-	/* Array index: 0x1424 */ 0x5CEF,0x5C67,
-	/* Array index: 0x1424 */ 0x5CF0,0x5C68,
-	/* Array index: 0x1424 */ 0x5CF4,0x7A56,
-	/* Array index: 0x1424 */ 0x5CF6,0x5376,
-	/* Array index: 0x1424 */ 0x5CFB,0x715A,
-	/* Array index: 0x1424 */ 0x5CFD,0x7A72,
-	/* Array index: 0x1424 */ 0x5D07,0x627D,
-	/* Array index: 0x1424 */ 0x5D0D,0x554F,
-	/* Array index: 0x1424 */ 0x5D0E,0x5078,
-	/* Array index: 0x1424 */ 0x5D11,0x4D5F,
-	/* Array index: 0x1424 */ 0x5D14,0x754B,
-	/* Array index: 0x1424 */ 0x5D16,0x6470,
-	/* Array index: 0x1424 */ 0x5D17,0x4B2B,
-	/* Array index: 0x1424 */ 0x5D19,0x5744,
-	/* Array index: 0x1424 */ 0x5D27,0x627E,
-	/* Array index: 0x1424 */ 0x5D29,0x5D5A,
-	/* Array index: 0x1424 */ 0x5D4B,0x5A2E,
-	/* Array index: 0x1424 */ 0x5D4C,0x4A6E,
-	/* Array index: 0x1424 */ 0x5D50,0x5539,
-	/* Array index: 0x1424 */ 0x5D69,0x6321,
-	/* Array index: 0x1424 */ 0x5D6C,0x6863,
-	/* Array index: 0x1424 */ 0x5D6F,0x732B,
-	/* Array index: 0x1424 */ 0x5D87,0x4F29,
-	/* Array index: 0x1424 */ 0x5D8B,0x5377,
-	/* Array index: 0x1424 */ 0x5D9D,0x5471,
-	/* Array index: 0x1424 */ 0x5DA0,0x4E64,
-	/* Array index: 0x1424 */ 0x5DA2,0x6872,
-	/* Array index: 0x1424 */ 0x5DAA,0x6575,
-	/* Array index: 0x1424 */ 0x5DB8,0x672E,
-	/* Array index: 0x1424 */ 0x5DBA,0x563A,
-	/* Array index: 0x1424 */ 0x5DBC,0x5F6C,
-	/* Array index: 0x1424 */ 0x5DBD,0x6440,
-	/* Array index: 0x1424 */ 0x5DCD,0x6864,
-	/* Array index: 0x1424 */ 0x5DD2,0x5835,
-	/* Array index: 0x1424 */ 0x5DD6,0x645C,
-	/* Array index: 0x1424 */ 0x5DDD,0x7439,
-	/* Array index: 0x1424 */ 0x5DDE,0x7136,
-	/* Array index: 0x1424 */ 0x5DEB,0x5963,
-	/* Array index: 0x1424 */ 0x5DEE,0x732C,
-	/* Array index: 0x1424 */ 0x5DF7,0x7975,
-	/* Array index: 0x1424 */ 0x5DFD,0x615E,
-	/* Array index: 0x1424 */ 0x5DFE,0x4B6E,
-	/* Array index: 0x1424 */ 0x5E02,0x633C,
-	/* Array index: 0x1424 */ 0x5E03,0x7856,
-	/* Array index: 0x1424 */ 0x5E06,0x5B6E,
-	/* Array index: 0x1424 */ 0x5E0C,0x7D71,
-	/* Array index: 0x1424 */ 0x5E11,0x7736,
-	/* Array index: 0x1424 */ 0x5E16,0x745E,
-	/* Array index: 0x1424 */ 0x5E19,0x726D,
-	/* Array index: 0x1424 */ 0x5E1B,0x5B59,
-	/* Array index: 0x1424 */ 0x5E1D,0x7028,
-	/* Array index: 0x1424 */ 0x5E25,0x617D,
-	/* Array index: 0x1424 */ 0x5E2B,0x5E54,
-	/* Array index: 0x1424 */ 0x5E2D,0x602C,
-	/* Array index: 0x1424 */ 0x5E33,0x6D63,
-	/* Array index: 0x1424 */ 0x5E36,0x5361,
-	/* Array index: 0x1424 */ 0x5E38,0x5F48,
-	/* Array index: 0x1424 */ 0x5E3D,0x5936,
-	/* Array index: 0x1424 */ 0x5E3F,0x7D2C,
-	/* Array index: 0x1424 */ 0x5E40,0x6F53,
-	/* Array index: 0x1424 */ 0x5E44,0x6441,
-	/* Array index: 0x1424 */ 0x5E45,0x786B,
-	/* Array index: 0x1424 */ 0x5E47,0x5B2C,
-	/* Array index: 0x1424 */ 0x5E4C,0x7C46,
-	/* Array index: 0x1424 */ 0x5E55,0x582D,
-	/* Array index: 0x1424 */ 0x5E84,0x6D64,
-	/* Array index: 0x1424 */ 0x5E87,0x5D67,
-	/* Array index: 0x1424 */ 0x5E8A,0x5F49,
-	/* Array index: 0x1424 */ 0x5E8F,0x5F6D,
-	/* Array index: 0x1424 */ 0x5E95,0x6E3C,
-	/* Array index: 0x1424 */ 0x5E97,0x6F41,
-	/* Array index: 0x1424 */ 0x5E9A,0x4C52,
-	/* Array index: 0x1424 */ 0x5E9C,0x5D24,
-	/* Array index: 0x1424 */ 0x5EA0,0x5F4A,
-	/* Array index: 0x1424 */ 0x5EA6,0x5378,
-	/* Array index: 0x1424 */ 0x5EA7,0x7128,
-	/* Array index: 0x1424 */ 0x5EAB,0x4D37,
-	/* Array index: 0x1424 */ 0x5EAD,0x6F54,
-	/* Array index: 0x1424 */ 0x5EBE,0x6A6C,
-	/* Array index: 0x1424 */ 0x5EC2,0x5F4B,
-	/* Array index: 0x1424 */ 0x5ED0,0x4F2A,
-	/* Array index: 0x1424 */ 0x5ED3,0x4E29,
-	/* Array index: 0x1424 */ 0x5ED6,0x5678,
-	/* Array index: 0x1424 */ 0x5EDA,0x7137,
-	/* Array index: 0x1424 */ 0x5EDB,0x6E78,
-	/* Array index: 0x1424 */ 0x5EEC,0x5566,
-	/* Array index: 0x1424 */ 0x5EF3,0x7466,
-	/* Array index: 0x1424 */ 0x5EF6,0x6645,
-	/* Array index: 0x1424 */ 0x5EF7,0x6F55,
-	/* Array index: 0x1424 */ 0x5EFA,0x4B6F,
-	/* Array index: 0x1424 */ 0x5EFB,0x7C5F,
-	/* Array index: 0x1424 */ 0x5F01,0x5C27,
-	/* Array index: 0x1424 */ 0x5F04,0x5667,
-	/* Array index: 0x1424 */ 0x5F0A,0x7849,
-	/* Array index: 0x1424 */ 0x5F0F,0x6352,
-	/* Array index: 0x1424 */ 0x5F1B,0x6C2C,
-	/* Array index: 0x1424 */ 0x5F1F,0x7029,
-	/* Array index: 0x1424 */ 0x5F26,0x7A57,
-	/* Array index: 0x1424 */ 0x5F27,0x7B41,
-	/* Array index: 0x1424 */ 0x5F29,0x5240,
-	/* Array index: 0x1424 */ 0x5F31,0x6530,
-	/* Array index: 0x1424 */ 0x5F35,0x6D65,
-	/* Array index: 0x1424 */ 0x5F3A,0x4B2D,
-	/* Array index: 0x1424 */ 0x5F3C,0x7930,
-	/* Array index: 0x1424 */ 0x5F48,0x7725,
-	/* Array index: 0x1424 */ 0x5F4A,0x4B2E,
-	/* Array index: 0x1424 */ 0x5F4C,0x5A2F,
-	/* Array index: 0x1424 */ 0x5F4E,0x5836,
-	/* Array index: 0x1424 */ 0x5F56,0x5327,
-	/* Array index: 0x1424 */ 0x5F57,0x7B32,
-	/* Array index: 0x1424 */ 0x5F59,0x7D44,
-	/* Array index: 0x1424 */ 0x5F5B,0x6C2D,
-	/* Array index: 0x1424 */ 0x5F62,0x7B21,
-	/* Array index: 0x1424 */ 0x5F77,0x5B2D,
-	/* Array index: 0x1424 */ 0x5F79,0x6635,
-	/* Array index: 0x1424 */ 0x5F7C,0x7928,
-	/* Array index: 0x1424 */ 0x5F85,0x5362,
-	/* Array index: 0x1424 */ 0x5F87,0x625F,
-	/* Array index: 0x1424 */ 0x5F9E,0x7074,
-	/* Array index: 0x1424 */ 0x5FA0,0x5550,
-	/* Array index: 0x1424 */ 0x5FA1,0x6559,
-	/* Array index: 0x1424 */ 0x5FAE,0x5A30,
-	/* Array index: 0x1424 */ 0x5FB5,0x7323,
-	/* Array index: 0x1424 */ 0x5FB7,0x536C,
-	/* Array index: 0x1424 */ 0x5FB9,0x744B,
-	/* Array index: 0x1424 */ 0x5FBD,0x7D45,
-	/* Array index: 0x1424 */ 0x5FC3,0x637D,
-	/* Array index: 0x1424 */ 0x5FC5,0x7931,
-	/* Array index: 0x1424 */ 0x5FCC,0x507B,
-	/* Array index: 0x1424 */ 0x5FCD,0x6C5B,
-	/* Array index: 0x1424 */ 0x5FE0,0x7577,
-	/* Array index: 0x1424 */ 0x5FEB,0x7661,
-	/* Array index: 0x1424 */ 0x5FF5,0x5237,
-	/* Array index: 0x1424 */ 0x5FFD,0x7B6C,
-	/* Array index: 0x1424 */ 0x5FFF,0x5D48,
-	/* Array index: 0x1424 */ 0x600F,0x6468,
-	/* Array index: 0x1424 */ 0x6012,0x5241,
-	/* Array index: 0x1424 */ 0x6016,0x7857,
-	/* Array index: 0x1424 */ 0x601C,0x563B,
-	/* Array index: 0x1424 */ 0x601D,0x5E56,
-	/* Array index: 0x1424 */ 0x6020,0x773D,
-	/* Array index: 0x1424 */ 0x6021,0x6C2E,
-	/* Array index: 0x1424 */ 0x6025,0x5061,
-	/* Array index: 0x1424 */ 0x6027,0x6075,
-	/* Array index: 0x1424 */ 0x6028,0x6A33,
-	/* Array index: 0x1424 */ 0x602A,0x4E56,
-	/* Array index: 0x1424 */ 0x602F,0x4C25,
-	/* Array index: 0x1424 */ 0x604D,0x7C48,
-	/* Array index: 0x1424 */ 0x6050,0x4D70,
-	/* Array index: 0x1424 */ 0x6052,0x7976,
-	/* Array index: 0x1424 */ 0x6055,0x5F70,
-	/* Array index: 0x1424 */ 0x6059,0x653F,
-	/* Array index: 0x1424 */ 0x605D,0x4E3F,
-	/* Array index: 0x1424 */ 0x6085,0x666D,
-	/* Array index: 0x1424 */ 0x6089,0x637A,
-	/* Array index: 0x1424 */ 0x608C,0x702A,
-	/* Array index: 0x1424 */ 0x608D,0x7950,
-	/* Array index: 0x1424 */ 0x6094,0x7C62,
-	/* Array index: 0x1424 */ 0x6096,0x7827,
-	/* Array index: 0x1424 */ 0x609A,0x6165,
-	/* Array index: 0x1424 */ 0x609B,0x6E79,
-	/* Array index: 0x1424 */ 0x609F,0x6776,
-	/* Array index: 0x1424 */ 0x60A0,0x6A6D,
-	/* Array index: 0x1424 */ 0x60A3,0x7C34,
-	/* Array index: 0x1424 */ 0x60A4,0x7542,
-	/* Array index: 0x1424 */ 0x60A7,0x575C,
-	/* Array index: 0x1424 */ 0x60BC,0x537A,
-	/* Array index: 0x1424 */ 0x60BD,0x7424,
-	/* Array index: 0x1424 */ 0x60C5,0x6F57,
-	/* Array index: 0x1424 */ 0x60C7,0x5443,
-	/* Array index: 0x1424 */ 0x60D1,0x7B63,
-	/* Array index: 0x1424 */ 0x60DA,0x7B6D,
-	/* Array index: 0x1424 */ 0x60DC,0x602D,
-	/* Array index: 0x1424 */ 0x60F0,0x7667,
-	/* Array index: 0x1424 */ 0x60F1,0x525D,
-	/* Array index: 0x1424 */ 0x60F3,0x5F4C,
-	/* Array index: 0x1424 */ 0x60F6,0x7C49,
-	/* Array index: 0x1424 */ 0x6101,0x617E,
-	/* Array index: 0x1424 */ 0x6106,0x4B70,
-	/* Array index: 0x1424 */ 0x6108,0x6A6F,
-	/* Array index: 0x1424 */ 0x6109,0x6A70,
-	/* Array index: 0x1424 */ 0x6115,0x6443,
-	/* Array index: 0x1424 */ 0x611A,0x6957,
-	/* Array index: 0x1424 */ 0x611B,0x6471,
-	/* Array index: 0x1424 */ 0x611F,0x4A6F,
-	/* Array index: 0x1424 */ 0x6127,0x4E57,
-	/* Array index: 0x1424 */ 0x6130,0x7C4A,
-	/* Array index: 0x1424 */ 0x6134,0x7361,
-	/* Array index: 0x1424 */ 0x6137,0x4B44,
-	/* Array index: 0x1424 */ 0x613C,0x6365,
-	/* Array index: 0x1424 */ 0x613E,0x4B45,
-	/* Array index: 0x1424 */ 0x613F,0x6A34,
-	/* Array index: 0x1424 */ 0x6142,0x693D,
-	/* Array index: 0x1424 */ 0x6144,0x5749,
-	/* Array index: 0x1424 */ 0x6153,0x7874,
-	/* Array index: 0x1424 */ 0x6155,0x5937,
-	/* Array index: 0x1424 */ 0x6158,0x7353,
-	/* Array index: 0x1424 */ 0x6159,0x7354,
-	/* Array index: 0x1424 */ 0x615D,0x7764,
-	/* Array index: 0x1424 */ 0x615F,0x7751,
-	/* Array index: 0x1424 */ 0x616B,0x7076,
-	/* Array index: 0x1424 */ 0x616E,0x5567,
-	/* Array index: 0x1424 */ 0x6170,0x6A50,
-	/* Array index: 0x1424 */ 0x6176,0x4C54,
-	/* Array index: 0x1424 */ 0x6177,0x4B2F,
-	/* Array index: 0x1424 */ 0x617D,0x742A,
-	/* Array index: 0x1424 */ 0x617E,0x692F,
-	/* Array index: 0x1424 */ 0x6181,0x7543,
-	/* Array index: 0x1424 */ 0x6182,0x6958,
-	/* Array index: 0x1424 */ 0x618A,0x5D69,
-	/* Array index: 0x1424 */ 0x618E,0x7173,
-	/* Array index: 0x1424 */ 0x6190,0x557B,
-	/* Array index: 0x1424 */ 0x6191,0x5E3B,
-	/* Array index: 0x1424 */ 0x6194,0x747B,
-	/* Array index: 0x1424 */ 0x61A4,0x5D49,
-	/* Array index: 0x1424 */ 0x61A7,0x5453,
-	/* Array index: 0x1424 */ 0x61A9,0x4C28,
-	/* Array index: 0x1424 */ 0x61AB,0x5A41,
-	/* Array index: 0x1424 */ 0x61AC,0x4C55,
-	/* Array index: 0x1424 */ 0x61AE,0x5964,
-	/* Array index: 0x1424 */ 0x61B2,0x7A4A,
-	/* Array index: 0x1424 */ 0x61B6,0x6563,
-	/* Array index: 0x1424 */ 0x61BA,0x533C,
-	/* Array index: 0x1424 */ 0x61BE,0x4A70,
-	/* Array index: 0x1424 */ 0x61C3,0x5044,
-	/* Array index: 0x1424 */ 0x61E6,0x5157,
-	/* Array index: 0x1424 */ 0x61F2,0x7324,
-	/* Array index: 0x1424 */ 0x6207,0x5354,
-	/* Array index: 0x1424 */ 0x6208,0x4D7C,
-	/* Array index: 0x1424 */ 0x6216,0x7B64,
-	/* Array index: 0x1424 */ 0x621A,0x742B,
-	/* Array index: 0x1424 */ 0x621F,0x503D,
-	/* Array index: 0x1424 */ 0x6221,0x4A71,
-	/* Array index: 0x1424 */ 0x622A,0x6F38,
-	/* Array index: 0x1424 */ 0x622E,0x5740,
-	/* Array index: 0x1424 */ 0x6230,0x6E7A,
-	/* Array index: 0x1424 */ 0x6231,0x7D74,
-	/* Array index: 0x1424 */ 0x6234,0x5363,
-	/* Array index: 0x1424 */ 0x6236,0x7B42,
-	/* Array index: 0x1424 */ 0x6253,0x7668,
-	/* Array index: 0x1424 */ 0x6258,0x7675,
-	/* Array index: 0x1424 */ 0x626E,0x5D4A,
-	/* Array index: 0x1424 */ 0x6271,0x5062,
-	/* Array index: 0x1424 */ 0x6276,0x5D26,
-	/* Array index: 0x1424 */ 0x6279,0x5D6B,
-	/* Array index: 0x1424 */ 0x627C,0x6479,
-	/* Array index: 0x1424 */ 0x627F,0x632F,
-	/* Array index: 0x1424 */ 0x6280,0x507C,
-	/* Array index: 0x1424 */ 0x6284,0x747C,
-	/* Array index: 0x1424 */ 0x6289,0x4C3C,
-	/* Array index: 0x1424 */ 0x628A,0x776A,
-	/* Array index: 0x1424 */ 0x6291,0x6564,
-	/* Array index: 0x1424 */ 0x6292,0x5F71,
-	/* Array index: 0x1424 */ 0x6295,0x7761,
-	/* Array index: 0x1424 */ 0x6297,0x7977,
-	/* Array index: 0x1424 */ 0x6298,0x6F39,
-	/* Array index: 0x1424 */ 0x629B,0x7858,
-	/* Array index: 0x1424 */ 0x62AB,0x7929,
-	/* Array index: 0x1424 */ 0x62B1,0x7859,
-	/* Array index: 0x1424 */ 0x62B5,0x6E3D,
-	/* Array index: 0x1424 */ 0x62B9,0x5846,
-	/* Array index: 0x1424 */ 0x62BC,0x6463,
-	/* Array index: 0x1424 */ 0x62BD,0x754E,
-	/* Array index: 0x1424 */ 0x62C2,0x5D59,
-	/* Array index: 0x1424 */ 0x62F7,0x4D38,
-	/* Array index: 0x1424 */ 0x62FE,0x6326,
-	/* Array index: 0x1424 */ 0x62FF,0x515A,
-	/* Array index: 0x1424 */ 0x6301,0x7225,
-	/* Array index: 0x1424 */ 0x6307,0x7226,
-	/* Array index: 0x1424 */ 0x6309,0x644E,
-	/* Array index: 0x1424 */ 0x6311,0x537B,
-	/* Array index: 0x1424 */ 0x632B,0x7129,
-	/* Array index: 0x1424 */ 0x632F,0x7249,
-	/* Array index: 0x1424 */ 0x6349,0x7335,
-	/* Array index: 0x1424 */ 0x634C,0x7824,
-	/* Array index: 0x1424 */ 0x634F,0x5173,
-	/* Array index: 0x1424 */ 0x6350,0x6648,
-	/* Array index: 0x1424 */ 0x6355,0x785A,
-	/* Array index: 0x1424 */ 0x6367,0x5C69,
-	/* Array index: 0x1424 */ 0x6368,0x5E57,
-	/* Array index: 0x1424 */ 0x636E,0x4B5F,
-	/* Array index: 0x1424 */ 0x6372,0x4F6C,
-	/* Array index: 0x1424 */ 0x6377,0x745F,
-	/* Array index: 0x1424 */ 0x637A,0x5174,
-	/* Array index: 0x1424 */ 0x637B,0x523A,
-	/* Array index: 0x1424 */ 0x637F,0x5F72,
-	/* Array index: 0x1424 */ 0x6383,0x6137,
-	/* Array index: 0x1424 */ 0x6388,0x6223,
-	/* Array index: 0x1424 */ 0x6389,0x537C,
-	/* Array index: 0x1424 */ 0x638C,0x6D66,
-	/* Array index: 0x1424 */ 0x6392,0x5B49,
-	/* Array index: 0x1424 */ 0x6396,0x647A,
-	/* Array index: 0x1424 */ 0x6398,0x4F5E,
-	/* Array index: 0x1424 */ 0x639B,0x4E50,
-	/* Array index: 0x1424 */ 0x63C0,0x4A51,
-	/* Array index: 0x1424 */ 0x63C4,0x6A71,
-	/* Array index: 0x1424 */ 0x63C6,0x5026,
-	/* Array index: 0x1424 */ 0x63CF,0x595A,
-	/* Array index: 0x1424 */ 0x63D0,0x702B,
-	/* Array index: 0x1424 */ 0x63D6,0x6B67,
-	/* Array index: 0x1424 */ 0x63DA,0x6540,
-	/* Array index: 0x1424 */ 0x63DB,0x7C35,
-	/* Array index: 0x1424 */ 0x63E1,0x6444,
-	/* Array index: 0x1424 */ 0x63ED,0x4C29,
-	/* Array index: 0x1424 */ 0x63EE,0x7D46,
-	/* Array index: 0x1424 */ 0x63F4,0x6A35,
-	/* Array index: 0x1424 */ 0x63F6,0x652A,
-	/* Array index: 0x1424 */ 0x63F7,0x5F3A,
-	/* Array index: 0x1424 */ 0x640D,0x615F,
-	/* Array index: 0x1424 */ 0x640F,0x5A51,
-	/* Array index: 0x1424 */ 0x6414,0x6138,
-	/* Array index: 0x1424 */ 0x6416,0x6874,
-	/* Array index: 0x1424 */ 0x6417,0x537D,
-	/* Array index: 0x1424 */ 0x641C,0x6224,
-	/* Array index: 0x1424 */ 0x6422,0x724A,
-	/* Array index: 0x1424 */ 0x642C,0x5A66,
-	/* Array index: 0x1424 */ 0x642D,0x7733,
-	/* Array index: 0x1424 */ 0x643A,0x7D4D,
-	/* Array index: 0x1424 */ 0x643E,0x7336,
-	/* Array index: 0x1424 */ 0x6458,0x6E57,
-	/* Array index: 0x1424 */ 0x6460,0x7544,
-	/* Array index: 0x1424 */ 0x6469,0x5824,
-	/* Array index: 0x1424 */ 0x646F,0x7227,
-	/* Array index: 0x1424 */ 0x6488,0x564E,
-	/* Array index: 0x1424 */ 0x649A,0x5235,
-	/* Array index: 0x1424 */ 0x649E,0x5355,
-	/* Array index: 0x1424 */ 0x64A4,0x744C,
-	/* Array index: 0x1424 */ 0x64A5,0x5A7C,
-	/* Array index: 0x1424 */ 0x64AB,0x5968,
-	/* Array index: 0x1424 */ 0x64AD,0x776B,
-	/* Array index: 0x1424 */ 0x64AE,0x7549,
-	/* Array index: 0x1424 */ 0x64B0,0x733C,
-	/* Array index: 0x1424 */ 0x64B2,0x5A52,
-	/* Array index: 0x1424 */ 0x64BB,0x5335,
-	/* Array index: 0x1424 */ 0x64C1,0x6836,
-	/* Array index: 0x1424 */ 0x64C4,0x564F,
-	/* Array index: 0x1424 */ 0x64C5,0x743A,
-	/* Array index: 0x1424 */ 0x64C7,0x7749,
-	/* Array index: 0x1424 */ 0x64CA,0x4C2A,
-	/* Array index: 0x1424 */ 0x64CD,0x7043,
-	/* Array index: 0x1424 */ 0x64CE,0x4C56,
-	/* Array index: 0x1424 */ 0x64D2,0x5053,
-	/* Array index: 0x1424 */ 0x64D4,0x533D,
-	/* Array index: 0x1424 */ 0x64D8,0x5B7B,
-	/* Array index: 0x1424 */ 0x64DA,0x4B60,
-	/* Array index: 0x1424 */ 0x64EC,0x6B74,
-	/* Array index: 0x1424 */ 0x64F2,0x742D,
-	/* Array index: 0x1424 */ 0x64F4,0x7C2A,
-	/* Array index: 0x1424 */ 0x64FA,0x776C,
-	/* Array index: 0x1424 */ 0x64FE,0x6876,
-	/* Array index: 0x1424 */ 0x6500,0x5A67,
-	/* Array index: 0x1424 */ 0x6504,0x774C,
-	/* Array index: 0x1424 */ 0x6518,0x6541,
-	/* Array index: 0x1424 */ 0x651D,0x606E,
-	/* Array index: 0x1424 */ 0x6523,0x557D,
-	/* Array index: 0x1424 */ 0x652F,0x7228,
-	/* Array index: 0x1424 */ 0x6545,0x4D3A,
-	/* Array index: 0x1424 */ 0x6548,0x7C79,
-	/* Array index: 0x1424 */ 0x6556,0x6779,
-	/* Array index: 0x1424 */ 0x6557,0x7828,
-	/* Array index: 0x1424 */ 0x655E,0x7362,
-	/* Array index: 0x1424 */ 0x6562,0x4A72,
-	/* Array index: 0x1424 */ 0x6563,0x5F24,
-	/* Array index: 0x1424 */ 0x6566,0x5444,
-	/* Array index: 0x1424 */ 0x656C,0x4C57,
-	/* Array index: 0x1424 */ 0x656D,0x6542,
-	/* Array index: 0x1424 */ 0x6572,0x4D3B,
-	/* Array index: 0x1424 */ 0x657E,0x6040,
-	/* Array index: 0x1424 */ 0x6582,0x5630,
-	/* Array index: 0x1424 */ 0x6583,0x784A,
-	/* Array index: 0x1424 */ 0x6585,0x7C7A,
-	/* Array index: 0x1424 */ 0x6587,0x597E,
-	/* Array index: 0x1424 */ 0x658C,0x5E30,
-	/* Array index: 0x1424 */ 0x6590,0x5D6C,
-	/* Array index: 0x1424 */ 0x6591,0x5A68,
-	/* Array index: 0x1424 */ 0x6597,0x5460,
-	/* Array index: 0x1424 */ 0x6599,0x5679,
-	/* Array index: 0x1424 */ 0x659B,0x4D57,
-	/* Array index: 0x1424 */ 0x659C,0x5E58,
-	/* Array index: 0x1424 */ 0x659F,0x7278,
-	/* Array index: 0x1424 */ 0x65A1,0x6456,
-	/* Array index: 0x1424 */ 0x65A4,0x5045,
-	/* Array index: 0x1424 */ 0x65A5,0x742E,
-	/* Array index: 0x1424 */ 0x65A7,0x5D28,
-	/* Array index: 0x1424 */ 0x65AB,0x6D45,
-	/* Array index: 0x1424 */ 0x65AC,0x7356,
-	/* Array index: 0x1424 */ 0x65AF,0x5E59,
-	/* Array index: 0x1424 */ 0x65B0,0x6366,
-	/* Array index: 0x1424 */ 0x65B7,0x5328,
-	/* Array index: 0x1424 */ 0x65B9,0x5B30,
-	/* Array index: 0x1424 */ 0x65BC,0x655A,
-	/* Array index: 0x1424 */ 0x65BD,0x633F,
-	/* Array index: 0x1424 */ 0x65C1,0x5B31,
-	/* Array index: 0x1424 */ 0x65C5,0x5569,
-	/* Array index: 0x1424 */ 0x65CB,0x6041,
-	/* Array index: 0x1424 */ 0x65CC,0x6F5B,
-	/* Array index: 0x1424 */ 0x65CF,0x7069,
-	/* Array index: 0x1424 */ 0x65D2,0x5732,
-	/* Array index: 0x1424 */ 0x65D7,0x507D,
-	/* Array index: 0x1424 */ 0x65E0,0x5969,
-	/* Array index: 0x1424 */ 0x65E3,0x507E,
-	/* Array index: 0x1424 */ 0x65F1,0x7951,
-	/* Array index: 0x1424 */ 0x65F4,0x6959,
-	/* Array index: 0x1424 */ 0x6625,0x7570,
-	/* Array index: 0x1424 */ 0x6627,0x585C,
-	/* Array index: 0x1424 */ 0x6628,0x6D46,
-	/* Array index: 0x1424 */ 0x6634,0x595B,
-	/* Array index: 0x1424 */ 0x6636,0x7364,
-	/* Array index: 0x1424 */ 0x663A,0x5C36,
-	/* Array index: 0x1424 */ 0x663B,0x6469,
-	/* Array index: 0x1424 */ 0x6649,0x724B,
-	/* Array index: 0x1424 */ 0x664B,0x724C,
-	/* Array index: 0x1424 */ 0x664F,0x644F,
-	/* Array index: 0x1424 */ 0x6659,0x715B,
-	/* Array index: 0x1424 */ 0x6684,0x7D3E,
-	/* Array index: 0x1424 */ 0x668E,0x6732,
-	/* Array index: 0x1424 */ 0x6690,0x6A51,
-	/* Array index: 0x1424 */ 0x6691,0x5F74,
-	/* Array index: 0x1424 */ 0x669D,0x5926,
-	/* Array index: 0x1424 */ 0x66A0,0x4D3C,
-	/* Array index: 0x1424 */ 0x66A2,0x7365,
-	/* Array index: 0x1424 */ 0x66AB,0x6D55,
-	/* Array index: 0x1424 */ 0x66AE,0x593A,
-	/* Array index: 0x1424 */ 0x66B9,0x6067,
-	/* Array index: 0x1424 */ 0x66BB,0x4C59,
-	/* Array index: 0x1424 */ 0x66BE,0x5446,
-	/* Array index: 0x1424 */ 0x66C4,0x6725,
-	/* Array index: 0x1424 */ 0x66C6,0x5575,
-	/* Array index: 0x1424 */ 0x66C7,0x533E,
-	/* Array index: 0x1424 */ 0x66C9,0x7C7B,
-	/* Array index: 0x1424 */ 0x66D6,0x6472,
-	/* Array index: 0x1424 */ 0x66D9,0x5F75,
-	/* Array index: 0x1424 */ 0x66DC,0x6878,
-	/* Array index: 0x1424 */ 0x66DD,0x786D,
-	/* Array index: 0x1424 */ 0x66E0,0x4E47,
-	/* Array index: 0x1424 */ 0x66E6,0x7D76,
-	/* Array index: 0x1424 */ 0x6703,0x7C65,
-	/* Array index: 0x1424 */ 0x6708,0x6A45,
-	/* Array index: 0x1424 */ 0x6709,0x6A73,
-	/* Array index: 0x1424 */ 0x670B,0x5D5B,
-	/* Array index: 0x1424 */ 0x670D,0x5C57,
-	/* Array index: 0x1424 */ 0x6714,0x5E7D,
-	/* Array index: 0x1424 */ 0x6715,0x7279,
-	/* Array index: 0x1424 */ 0x6717,0x5547,
-	/* Array index: 0x1424 */ 0x6731,0x7139,
-	/* Array index: 0x1424 */ 0x6734,0x5A53,
-	/* Array index: 0x1424 */ 0x6736,0x766A,
-	/* Array index: 0x1424 */ 0x673A,0x4F75,
-	/* Array index: 0x1424 */ 0x673D,0x7D2E,
-	/* Array index: 0x1424 */ 0x6746,0x4A52,
-	/* Array index: 0x1424 */ 0x6749,0x5F34,
-	/* Array index: 0x1424 */ 0x6756,0x6D68,
-	/* Array index: 0x1424 */ 0x675C,0x5461,
-	/* Array index: 0x1424 */ 0x675E,0x5123,
-	/* Array index: 0x1424 */ 0x675F,0x6156,
-	/* Array index: 0x1424 */ 0x677B,0x526E,
-	/* Array index: 0x1424 */ 0x677E,0x6166,
-	/* Array index: 0x1424 */ 0x677F,0x7779,
-	/* Array index: 0x1424 */ 0x6787,0x5D6D,
-	/* Array index: 0x1424 */ 0x6789,0x685B,
-	/* Array index: 0x1424 */ 0x678B,0x5B33,
-	/* Array index: 0x1424 */ 0x678F,0x5177,
-	/* Array index: 0x1424 */ 0x6790,0x6030,
-	/* Array index: 0x1424 */ 0x6793,0x5462,
-	/* Array index: 0x1424 */ 0x6795,0x7657,
-	/* Array index: 0x1424 */ 0x6797,0x5779,
-	/* Array index: 0x1424 */ 0x679A,0x585D,
-	/* Array index: 0x1424 */ 0x679C,0x4D7D,
-	/* Array index: 0x1424 */ 0x679D,0x722B,
-	/* Array index: 0x1424 */ 0x67AF,0x4D3D,
-	/* Array index: 0x1424 */ 0x67B0,0x7842,
-	/* Array index: 0x1424 */ 0x67B3,0x722C,
-	/* Array index: 0x1424 */ 0x67BE,0x6342,
-	/* Array index: 0x1424 */ 0x67C4,0x5C37,
-	/* Array index: 0x1424 */ 0x67DA,0x6A76,
-	/* Array index: 0x1424 */ 0x67DD,0x7679,
-	/* Array index: 0x1424 */ 0x67E9,0x4F2F,
-	/* Array index: 0x1424 */ 0x67EC,0x4A53,
-	/* Array index: 0x1424 */ 0x67FB,0x5E5B,
-	/* Array index: 0x1424 */ 0x67FE,0x6F5E,
-	/* Array index: 0x1424 */ 0x6812,0x6263,
-	/* Array index: 0x1424 */ 0x6813,0x6E7B,
-	/* Array index: 0x1424 */ 0x6816,0x5F77,
-	/* Array index: 0x1424 */ 0x6817,0x574A,
-	/* Array index: 0x1424 */ 0x6821,0x4E68,
-	/* Array index: 0x1424 */ 0x6822,0x5B5B,
-	/* Array index: 0x1424 */ 0x682A,0x713B,
-	/* Array index: 0x1424 */ 0x682F,0x6971,
-	/* Array index: 0x1424 */ 0x6838,0x7A37,
-	/* Array index: 0x1424 */ 0x6839,0x5046,
-	/* Array index: 0x1424 */ 0x6848,0x6450,
-	/* Array index: 0x1424 */ 0x684E,0x726E,
-	/* Array index: 0x1424 */ 0x686D,0x724D,
-	/* Array index: 0x1424 */ 0x6876,0x7752,
-	/* Array index: 0x1424 */ 0x687F,0x4A54,
-	/* Array index: 0x1424 */ 0x6881,0x5559,
-	/* Array index: 0x1424 */ 0x6885,0x585E,
-	/* Array index: 0x1424 */ 0x688F,0x4D59,
-	/* Array index: 0x1424 */ 0x6893,0x6E29,
-	/* Array index: 0x1424 */ 0x6894,0x763C,
-	/* Array index: 0x1424 */ 0x6897,0x4C5B,
-	/* Array index: 0x1424 */ 0x689D,0x7049,
-	/* Array index: 0x1424 */ 0x689F,0x7C7C,
-	/* Array index: 0x1424 */ 0x68A1,0x6849,
-	/* Array index: 0x1424 */ 0x68A2,0x747E,
-	/* Array index: 0x1424 */ 0x68A7,0x677C,
-	/* Array index: 0x1424 */ 0x68A8,0x575E,
-	/* Array index: 0x1424 */ 0x68C4,0x5125,
-	/* Array index: 0x1424 */ 0x68C5,0x5C38,
-	/* Array index: 0x1424 */ 0x68C9,0x5876,
-	/* Array index: 0x1424 */ 0x68CB,0x5124,
-	/* Array index: 0x1424 */ 0x68CD,0x4D62,
-	/* Array index: 0x1424 */ 0x68D2,0x5C6A,
-	/* Array index: 0x1424 */ 0x68D5,0x7077,
-	/* Array index: 0x1424 */ 0x68D7,0x704A,
-	/* Array index: 0x1424 */ 0x68D8,0x503E,
-	/* Array index: 0x1424 */ 0x68DA,0x5D5C,
-	/* Array index: 0x1424 */ 0x68DF,0x5456,
-	/* Array index: 0x1424 */ 0x68E0,0x5356,
-	/* Array index: 0x1424 */ 0x68E7,0x6D50,
-	/* Array index: 0x1424 */ 0x68E8,0x4D21,
-	/* Array index: 0x1424 */ 0x68EE,0x5F35,
-	/* Array index: 0x1424 */ 0x68F2,0x5F78,
-	/* Array index: 0x1424 */ 0x68F9,0x5421,
-	/* Array index: 0x1424 */ 0x68FA,0x4E32,
-	/* Array index: 0x1424 */ 0x6900,0x684A,
-	/* Array index: 0x1424 */ 0x6905,0x6B75,
-	/* Array index: 0x1424 */ 0x690D,0x6355,
-	/* Array index: 0x1424 */ 0x690E,0x7550,
-	/* Array index: 0x1424 */ 0x6912,0x7521,
-	/* Array index: 0x1424 */ 0x6927,0x5927,
-	/* Array index: 0x1424 */ 0x6930,0x652B,
-	/* Array index: 0x1424 */ 0x693D,0x664B,
-	/* Array index: 0x1424 */ 0x693F,0x7571,
-	/* Array index: 0x1424 */ 0x694A,0x6545,
-	/* Array index: 0x1424 */ 0x6968,0x6F5F,
-	/* Array index: 0x1424 */ 0x6995,0x693E,
-	/* Array index: 0x1424 */ 0x699B,0x724E,
-	/* Array index: 0x1424 */ 0x699C,0x5B34,
-	/* Array index: 0x1424 */ 0x69A5,0x7C4E,
-	/* Array index: 0x1424 */ 0x69A7,0x5D6E,
-	/* Array index: 0x1424 */ 0x69AE,0x6734,
-	/* Array index: 0x1424 */ 0x69B4,0x5734,
-	/* Array index: 0x1424 */ 0x69BB,0x7734,
-	/* Array index: 0x1424 */ 0x69C1,0x4D3E,
-	/* Array index: 0x1424 */ 0x69C3,0x5A69,
-	/* Array index: 0x1424 */ 0x69D0,0x4E59,
-	/* Array index: 0x1424 */ 0x69E8,0x4E2A,
-	/* Array index: 0x1424 */ 0x69EA,0x4B48,
-	/* Array index: 0x1424 */ 0x69FB,0x5027,
-	/* Array index: 0x1424 */ 0x69FD,0x704B,
-	/* Array index: 0x1424 */ 0x69FF,0x5047,
-	/* Array index: 0x1424 */ 0x6A02,0x6445,
-	/* Array index: 0x1424 */ 0x6A0A,0x5B60,
-	/* Array index: 0x1424 */ 0x6A11,0x555A,
-	/* Array index: 0x1424 */ 0x6A13,0x5727,
-	/* Array index: 0x1424 */ 0x6A17,0x6E40,
-	/* Array index: 0x1424 */ 0x6A19,0x7876,
-	/* Array index: 0x1424 */ 0x6A1E,0x7552,
-	/* Array index: 0x1424 */ 0x6A1F,0x6D69,
-	/* Array index: 0x1424 */ 0x6A21,0x593C,
-	/* Array index: 0x1424 */ 0x6A23,0x6546,
-	/* Array index: 0x1424 */ 0x6A35,0x7523,
-	/* Array index: 0x1424 */ 0x6A3D,0x715C,
-	/* Array index: 0x1424 */ 0x6A44,0x4A74,
-	/* Array index: 0x1424 */ 0x6A48,0x687A,
-	/* Array index: 0x1424 */ 0x6A4B,0x4E69,
-	/* Array index: 0x1424 */ 0x6A52,0x6978,
-	/* Array index: 0x1424 */ 0x6A53,0x6265,
-	/* Array index: 0x1424 */ 0x6A58,0x5039,
-	/* Array index: 0x1424 */ 0x6A59,0x5472,
-	/* Array index: 0x1424 */ 0x6A5F,0x5126,
-	/* Array index: 0x1424 */ 0x6A61,0x5F4E,
-	/* Array index: 0x1424 */ 0x6A6B,0x7C74,
-	/* Array index: 0x1424 */ 0x6A80,0x532A,
-	/* Array index: 0x1424 */ 0x6A84,0x4C2C,
-	/* Array index: 0x1424 */ 0x6A89,0x6F60,
-	/* Array index: 0x1424 */ 0x6A8D,0x6565,
-	/* Array index: 0x1424 */ 0x6A8E,0x5055,
-	/* Array index: 0x1424 */ 0x6A97,0x5B7C,
-	/* Array index: 0x1424 */ 0x6A9C,0x7C66,
-	/* Array index: 0x1424 */ 0x6AA2,0x4B7E,
-	/* Array index: 0x1424 */ 0x6AA3,0x6D6A,
-	/* Array index: 0x1424 */ 0x6AB3,0x5E31,
-	/* Array index: 0x1424 */ 0x6ABB,0x7963,
-	/* Array index: 0x1424 */ 0x6AC2,0x5422,
-	/* Array index: 0x1424 */ 0x6AC3,0x4F76,
-	/* Array index: 0x1424 */ 0x6AD3,0x5650,
-	/* Array index: 0x1424 */ 0x6ADA,0x556A,
-	/* Array index: 0x1424 */ 0x6ADB,0x716E,
-	/* Array index: 0x1424 */ 0x6AF6,0x7A4B,
-	/* Array index: 0x1424 */ 0x6AFB,0x6521,
-	/* Array index: 0x1424 */ 0x6B04,0x5531,
-	/* Array index: 0x1424 */ 0x6B0A,0x4F6D,
-	/* Array index: 0x1424 */ 0x6B0C,0x6D6B,
-	/* Array index: 0x1424 */ 0x6B12,0x5532,
-	/* Array index: 0x1424 */ 0x6B16,0x553C,
-	/* Array index: 0x1424 */ 0x6B20,0x7D62,
-	/* Array index: 0x1424 */ 0x6B21,0x732D,
-	/* Array index: 0x1424 */ 0x6B23,0x7D5B,
-	/* Array index: 0x1424 */ 0x6B32,0x6930,
-	/* Array index: 0x1424 */ 0x6B3A,0x5127,
-	/* Array index: 0x1424 */ 0x6B3D,0x7D63,
-	/* Array index: 0x1424 */ 0x6B3E,0x4E33,
-	/* Array index: 0x1424 */ 0x6B46,0x7D64,
-	/* Array index: 0x1424 */ 0x6B47,0x7A4E,
-	/* Array index: 0x1424 */ 0x6B4C,0x4A30,
-	/* Array index: 0x1424 */ 0x6B4E,0x7727,
-	/* Array index: 0x1424 */ 0x6B50,0x4F31,
-	/* Array index: 0x1424 */ 0x6B6A,0x6860,
-	/* Array index: 0x1424 */ 0x6B72,0x6128,
-	/* Array index: 0x1424 */ 0x6B77,0x5576,
-	/* Array index: 0x1424 */ 0x6B78,0x4F7D,
-	/* Array index: 0x1424 */ 0x6B7B,0x5E5D,
-	/* Array index: 0x1424 */ 0x6B7F,0x5951,
-	/* Array index: 0x1424 */ 0x6B83,0x646A,
-	/* Array index: 0x1424 */ 0x6B84,0x724F,
-	/* Array index: 0x1424 */ 0x6B86,0x773F,
-	/* Array index: 0x1424 */ 0x6B89,0x6266,
-	/* Array index: 0x1424 */ 0x6B8A,0x6228,
-	/* Array index: 0x1424 */ 0x6B96,0x6356,
-	/* Array index: 0x1424 */ 0x6B98,0x6D51,
-	/* Array index: 0x1424 */ 0x6B9E,0x6979,
-	/* Array index: 0x1424 */ 0x6BAE,0x5631,
-	/* Array index: 0x1424 */ 0x6BAF,0x5E32,
-	/* Array index: 0x1424 */ 0x6BB2,0x6068,
-	/* Array index: 0x1424 */ 0x6BB5,0x532B,
-	/* Array index: 0x1424 */ 0x6BB7,0x6B5C,
-	/* Array index: 0x1424 */ 0x6BBA,0x5F2F,
-	/* Array index: 0x1424 */ 0x6BBC,0x4A43,
-	/* Array index: 0x1424 */ 0x6BBF,0x6E7C,
-	/* Array index: 0x1424 */ 0x6BC1,0x7D43,
-	/* Array index: 0x1424 */ 0x6BC5,0x6B76,
-	/* Array index: 0x1424 */ 0x6BC6,0x4F32,
-	/* Array index: 0x1424 */ 0x6BCB,0x596C,
-	/* Array index: 0x1424 */ 0x6BCD,0x593D,
-	/* Array index: 0x1424 */ 0x6BCF,0x585F,
-	/* Array index: 0x1424 */ 0x6BDB,0x593E,
-	/* Array index: 0x1424 */ 0x6BEB,0x7B46,
-	/* Array index: 0x1424 */ 0x6BEC,0x4F33,
-	/* Array index: 0x1424 */ 0x6C08,0x6E7D,
-	/* Array index: 0x1424 */ 0x6C0F,0x642B,
-	/* Array index: 0x1424 */ 0x6C11,0x5A45,
-	/* Array index: 0x1424 */ 0x6C13,0x586C,
-	/* Array index: 0x1424 */ 0x6C23,0x5128,
-	/* Array index: 0x1424 */ 0x6C34,0x6229,
-	/* Array index: 0x1424 */ 0x6C37,0x5E3C,
-	/* Array index: 0x1424 */ 0x6C38,0x6735,
-	/* Array index: 0x1424 */ 0x6C4E,0x5B71,
-	/* Array index: 0x1424 */ 0x6C50,0x6031,
-	/* Array index: 0x1424 */ 0x6C55,0x5F25,
-	/* Array index: 0x1424 */ 0x6C57,0x7952,
-	/* Array index: 0x1424 */ 0x6C5A,0x677D,
-	/* Array index: 0x1424 */ 0x6C68,0x4D67,
-	/* Array index: 0x1424 */ 0x6C6A,0x685C,
-	/* Array index: 0x1424 */ 0x6C6D,0x6757,
-	/* Array index: 0x1424 */ 0x6C70,0x7740,
-	/* Array index: 0x1424 */ 0x6C72,0x5063,
-	/* Array index: 0x1424 */ 0x6C76,0x5A21,
-	/* Array index: 0x1424 */ 0x6C7A,0x4C3D,
-	/* Array index: 0x1424 */ 0x6C8C,0x5447,
-	/* Array index: 0x1424 */ 0x6CAB,0x5848,
-	/* Array index: 0x1424 */ 0x6CAE,0x6E41,
-	/* Array index: 0x1424 */ 0x6CB3,0x7941,
-	/* Array index: 0x1424 */ 0x6CC9,0x743B,
-	/* Array index: 0x1424 */ 0x6CCA,0x5A55,
-	/* Array index: 0x1424 */ 0x6CCC,0x7932,
-	/* Array index: 0x1424 */ 0x6CD3,0x7B72,
-	/* Array index: 0x1424 */ 0x6CD5,0x5B76,
-	/* Array index: 0x1424 */ 0x6CD7,0x5E5F,
-	/* Array index: 0x1424 */ 0x6CDB,0x5B72,
-	/* Array index: 0x1424 */ 0x6CE8,0x713C,
-	/* Array index: 0x1424 */ 0x6CEB,0x7A5A,
-	/* Array index: 0x1424 */ 0x6CF3,0x6736,
-	/* Array index: 0x1424 */ 0x6D0B,0x6547,
-	/* Array index: 0x1424 */ 0x6D0C,0x562C,
-	/* Array index: 0x1424 */ 0x6D11,0x5C47,
-	/* Array index: 0x1424 */ 0x6D17,0x6129,
-	/* Array index: 0x1424 */ 0x6D19,0x622A,
-	/* Array index: 0x1424 */ 0x6D1B,0x5526,
-	/* Array index: 0x1424 */ 0x6D1E,0x5457,
-	/* Array index: 0x1424 */ 0x6D25,0x7250,
-	/* Array index: 0x1424 */ 0x6D27,0x6A7B,
-	/* Array index: 0x1424 */ 0x6D29,0x605D,
-	/* Array index: 0x1424 */ 0x6D2A,0x7B73,
-	/* Array index: 0x1424 */ 0x6D32,0x713D,
-	/* Array index: 0x1424 */ 0x6D41,0x5735,
-	/* Array index: 0x1424 */ 0x6D59,0x6F3A,
-	/* Array index: 0x1424 */ 0x6D5A,0x715D,
-	/* Array index: 0x1424 */ 0x6D5C,0x5E33,
-	/* Array index: 0x1424 */ 0x6D63,0x684B,
-	/* Array index: 0x1424 */ 0x6D66,0x785D,
-	/* Array index: 0x1424 */ 0x6D69,0x7B47,
-	/* Array index: 0x1424 */ 0x6D6A,0x5548,
-	/* Array index: 0x1424 */ 0x6D6C,0x575F,
-	/* Array index: 0x1424 */ 0x6D6E,0x5D29,
-	/* Array index: 0x1424 */ 0x6D74,0x6931,
-	/* Array index: 0x1424 */ 0x6D7F,0x782A,
-	/* Array index: 0x1424 */ 0x6D91,0x6157,
-	/* Array index: 0x1424 */ 0x6D93,0x664F,
-	/* Array index: 0x1424 */ 0x6D95,0x7471,
-	/* Array index: 0x1424 */ 0x6DAF,0x6473,
-	/* Array index: 0x1424 */ 0x6DB2,0x647B,
-	/* Array index: 0x1424 */ 0x6DB5,0x7964,
-	/* Array index: 0x1424 */ 0x6DC0,0x6F63,
-	/* Array index: 0x1424 */ 0x6DCB,0x577A,
-	/* Array index: 0x1424 */ 0x6DCF,0x7B48,
-	/* Array index: 0x1424 */ 0x6DD1,0x6257,
-	/* Array index: 0x1424 */ 0x6DDE,0x6167,
-	/* Array index: 0x1424 */ 0x6DE1,0x533F,
-	/* Array index: 0x1424 */ 0x6DE8,0x6F64,
-	/* Array index: 0x1424 */ 0x6DEA,0x5745,
-	/* Array index: 0x1424 */ 0x6DEB,0x6B62,
-	/* Array index: 0x1424 */ 0x6DEE,0x7C67,
-	/* Array index: 0x1424 */ 0x6DF1,0x6422,
-	/* Array index: 0x1424 */ 0x6DF3,0x6268,
-	/* Array index: 0x1424 */ 0x6E32,0x6042,
-	/* Array index: 0x1424 */ 0x6E34,0x4A64,
-	/* Array index: 0x1424 */ 0x6E36,0x6737,
-	/* Array index: 0x1424 */ 0x6E38,0x6A7D,
-	/* Array index: 0x1424 */ 0x6E43,0x5B4B,
-	/* Array index: 0x1424 */ 0x6E44,0x5A35,
-	/* Array index: 0x1424 */ 0x6E4A,0x713E,
-	/* Array index: 0x1424 */ 0x6E4D,0x532C,
-	/* Array index: 0x1424 */ 0x6E56,0x7B49,
-	/* Array index: 0x1424 */ 0x6E58,0x5F4F,
-	/* Array index: 0x1424 */ 0x6E67,0x6940,
-	/* Array index: 0x1424 */ 0x6E6B,0x7553,
-	/* Array index: 0x1424 */ 0x6E6E,0x6C5C,
-	/* Array index: 0x1424 */ 0x6E6F,0x7737,
-	/* Array index: 0x1424 */ 0x6E72,0x6A38,
-	/* Array index: 0x1424 */ 0x6E73,0x5179,
-	/* Array index: 0x1424 */ 0x6E7A,0x5C48,
-	/* Array index: 0x1424 */ 0x6E90,0x6A39,
-	/* Array index: 0x1424 */ 0x6E96,0x715E,
-	/* Array index: 0x1424 */ 0x6E9C,0x5736,
-	/* Array index: 0x1424 */ 0x6E9D,0x4F35,
-	/* Array index: 0x1424 */ 0x6E9F,0x5928,
-	/* Array index: 0x1424 */ 0x6EA2,0x6C6E,
-	/* Array index: 0x1424 */ 0x6EA5,0x5D2A,
-	/* Array index: 0x1424 */ 0x6EAA,0x4D22,
-	/* Array index: 0x1424 */ 0x6EAB,0x682E,
-	/* Array index: 0x1424 */ 0x6EAF,0x613D,
-	/* Array index: 0x1424 */ 0x6EB1,0x7251,
-	/* Array index: 0x1424 */ 0x6EB6,0x6941,
-	/* Array index: 0x1424 */ 0x6EBA,0x527C,
-	/* Array index: 0x1424 */ 0x6EC2,0x5B35,
-	/* Array index: 0x1424 */ 0x6EC4,0x7367,
-	/* Array index: 0x1424 */ 0x6EC5,0x587E,
-	/* Array index: 0x1424 */ 0x6EC9,0x7C51,
-	/* Array index: 0x1424 */ 0x6ECB,0x6D32,
-	/* Array index: 0x1424 */ 0x6ECC,0x742F,
-	/* Array index: 0x1424 */ 0x6ECE,0x7B23,
-	/* Array index: 0x1424 */ 0x6ED1,0x7C41,
-	/* Array index: 0x1424 */ 0x6ED3,0x6E2B,
-	/* Array index: 0x1424 */ 0x6ED4,0x5425,
-	/* Array index: 0x1424 */ 0x6EEF,0x7472,
-	/* Array index: 0x1424 */ 0x6EF4,0x6E59,
-	/* Array index: 0x1424 */ 0x6EF8,0x7B4A,
-	/* Array index: 0x1424 */ 0x6F06,0x7654,
-	/* Array index: 0x1424 */ 0x6F0F,0x5729,
-	/* Array index: 0x1424 */ 0x6F11,0x4B49,
-	/* Array index: 0x1424 */ 0x6F14,0x6651,
-	/* Array index: 0x1424 */ 0x6F15,0x704C,
-	/* Array index: 0x1424 */ 0x6F20,0x582E,
-	/* Array index: 0x1424 */ 0x6F22,0x7953,
-	/* Array index: 0x1424 */ 0x6F23,0x557E,
-	/* Array index: 0x1424 */ 0x6F2B,0x583C,
-	/* Array index: 0x1424 */ 0x6F2C,0x7230,
-	/* Array index: 0x1424 */ 0x6F31,0x622B,
-	/* Array index: 0x1424 */ 0x6F32,0x7368,
-	/* Array index: 0x1424 */ 0x6F38,0x6F42,
-	/* Array index: 0x1424 */ 0x6F3F,0x6D6C,
-	/* Array index: 0x1424 */ 0x6F41,0x6738,
-	/* Array index: 0x1424 */ 0x6F51,0x5A7E,
-	/* Array index: 0x1424 */ 0x6F54,0x4C3E,
-	/* Array index: 0x1424 */ 0x6F62,0x7C52,
-	/* Array index: 0x1424 */ 0x6F64,0x6B48,
-	/* Array index: 0x1424 */ 0x6F6D,0x5341,
-	/* Array index: 0x1424 */ 0x6F6E,0x704D,
-	/* Array index: 0x1424 */ 0x6F70,0x4F77,
-	/* Array index: 0x1424 */ 0x6F81,0x5F3B,
-	/* Array index: 0x1424 */ 0x6F84,0x7325,
-	/* Array index: 0x1424 */ 0x6F88,0x744D,
-	/* Array index: 0x1424 */ 0x6F8D,0x713F,
-	/* Array index: 0x1424 */ 0x6F8E,0x7831,
-	/* Array index: 0x1424 */ 0x6F90,0x697A,
-	/* Array index: 0x1424 */ 0x6F94,0x7B4B,
-	/* Array index: 0x1424 */ 0x6F97,0x4A55,
-	/* Array index: 0x1424 */ 0x6FA3,0x7954,
-	/* Array index: 0x1424 */ 0x6FA4,0x774A,
-	/* Array index: 0x1424 */ 0x6FA7,0x5648,
-	/* Array index: 0x1424 */ 0x6FAE,0x7C68,
-	/* Array index: 0x1424 */ 0x6FAF,0x733D,
-	/* Array index: 0x1424 */ 0x6FB1,0x6E7E,
-	/* Array index: 0x1424 */ 0x6FB3,0x677E,
-	/* Array index: 0x1424 */ 0x6FB9,0x5342,
-	/* Array index: 0x1424 */ 0x6FCA,0x6758,
-	/* Array index: 0x1424 */ 0x6FD5,0x6325,
-	/* Array index: 0x1424 */ 0x6FDA,0x6739,
-	/* Array index: 0x1424 */ 0x6FE4,0x5426,
-	/* Array index: 0x1424 */ 0x6FE9,0x7B4D,
-	/* Array index: 0x1424 */ 0x6FEB,0x553D,
-	/* Array index: 0x1424 */ 0x6FEC,0x715F,
-	/* Array index: 0x1424 */ 0x6FEF,0x767B,
-	/* Array index: 0x1424 */ 0x6FF1,0x5E34,
-	/* Array index: 0x1424 */ 0x6FFE,0x556B,
-	/* Array index: 0x1424 */ 0x7001,0x6548,
-	/* Array index: 0x1424 */ 0x7005,0x7B24,
-	/* Array index: 0x1424 */ 0x7006,0x5439,
-	/* Array index: 0x1424 */ 0x7009,0x5E61,
-	/* Array index: 0x1424 */ 0x700B,0x6423,
-	/* Array index: 0x1424 */ 0x700F,0x5737,
-	/* Array index: 0x1424 */ 0x7011,0x786E,
-	/* Array index: 0x1424 */ 0x7015,0x5E35,
-	/* Array index: 0x1424 */ 0x7023,0x7A2E,
-	/* Array index: 0x1424 */ 0x7027,0x5669,
-	/* Array index: 0x1424 */ 0x7028,0x566E,
-	/* Array index: 0x1424 */ 0x702F,0x673B,
-	/* Array index: 0x1424 */ 0x7037,0x6C4B,
-	/* Array index: 0x1424 */ 0x703E,0x5533,
-	/* Array index: 0x1424 */ 0x704C,0x4E34,
-	/* Array index: 0x1424 */ 0x7050,0x7B25,
-	/* Array index: 0x1424 */ 0x7051,0x616E,
-	/* Array index: 0x1424 */ 0x7058,0x7728,
-	/* Array index: 0x1424 */ 0x705D,0x7B4E,
-	/* Array index: 0x1424 */ 0x7063,0x583D,
-	/* Array index: 0x1424 */ 0x706B,0x7B7D,
-	/* Array index: 0x1424 */ 0x7070,0x7C69,
-	/* Array index: 0x1424 */ 0x7078,0x4F36,
-	/* Array index: 0x1424 */ 0x707C,0x6D47,
-	/* Array index: 0x1424 */ 0x707D,0x6E2C,
-	/* Array index: 0x1424 */ 0x7085,0x4C5D,
-	/* Array index: 0x1424 */ 0x708A,0x7627,
-	/* Array index: 0x1424 */ 0x708E,0x667A,
-	/* Array index: 0x1424 */ 0x7092,0x7524,
-	/* Array index: 0x1424 */ 0x70A1,0x6F68,
-	/* Array index: 0x1424 */ 0x70A4,0x613F,
-	/* Array index: 0x1424 */ 0x70B3,0x5C39,
-	/* Array index: 0x1424 */ 0x70C8,0x562D,
-	/* Array index: 0x1424 */ 0x70CB,0x7D4E,
-	/* Array index: 0x1424 */ 0x70CF,0x6821,
-	/* Array index: 0x1424 */ 0x70D8,0x7B74,
-	/* Array index: 0x1424 */ 0x70D9,0x5527,
-	/* Array index: 0x1424 */ 0x70DD,0x7176,
-	/* Array index: 0x1424 */ 0x70DF,0x6653,
-	/* Array index: 0x1424 */ 0x70F1,0x4C5E,
-	/* Array index: 0x1424 */ 0x70F9,0x7832,
-	/* Array index: 0x1424 */ 0x70FD,0x5C6B,
-	/* Array index: 0x1424 */ 0x7104,0x7D36,
-	/* Array index: 0x1424 */ 0x7109,0x656A,
-	/* Array index: 0x1424 */ 0x710C,0x7160,
-	/* Array index: 0x1424 */ 0x7119,0x5B4C,
-	/* Array index: 0x1424 */ 0x711A,0x5D4D,
-	/* Array index: 0x1424 */ 0x711E,0x5448,
-	/* Array index: 0x1424 */ 0x7121,0x596D,
-	/* Array index: 0x1424 */ 0x7126,0x7525,
-	/* Array index: 0x1424 */ 0x7130,0x667B,
-	/* Array index: 0x1424 */ 0x7136,0x6654,
-	/* Array index: 0x1424 */ 0x7147,0x7D48,
-	/* Array index: 0x1424 */ 0x7149,0x5621,
-	/* Array index: 0x1424 */ 0x714A,0x7D3F,
-	/* Array index: 0x1424 */ 0x714C,0x7C53,
-	/* Array index: 0x1424 */ 0x714E,0x6F21,
-	/* Array index: 0x1424 */ 0x7150,0x673C,
-	/* Array index: 0x1424 */ 0x7156,0x516E,
-	/* Array index: 0x1424 */ 0x7159,0x6655,
-	/* Array index: 0x1424 */ 0x715C,0x6972,
-	/* Array index: 0x1424 */ 0x715E,0x5F30,
-	/* Array index: 0x1424 */ 0x716C,0x6549,
-	/* Array index: 0x1424 */ 0x716E,0x6D34,
-	/* Array index: 0x1424 */ 0x717D,0x6043,
-	/* Array index: 0x1424 */ 0x7184,0x6358,
-	/* Array index: 0x1424 */ 0x7189,0x697B,
-	/* Array index: 0x1424 */ 0x718A,0x6A28,
-	/* Array index: 0x1424 */ 0x718F,0x7D37,
-	/* Array index: 0x1424 */ 0x7192,0x7B27,
-	/* Array index: 0x1424 */ 0x7194,0x6942,
-	/* Array index: 0x1424 */ 0x7199,0x7D77,
-	/* Array index: 0x1424 */ 0x719F,0x6259,
-	/* Array index: 0x1424 */ 0x71A2,0x5C6C,
-	/* Array index: 0x1424 */ 0x71AC,0x6822,
-	/* Array index: 0x1424 */ 0x71B1,0x6670,
-	/* Array index: 0x1424 */ 0x71B9,0x7D78,
-	/* Array index: 0x1424 */ 0x71BA,0x7D79,
-	/* Array index: 0x1424 */ 0x71BE,0x763F,
-	/* Array index: 0x1424 */ 0x71C1,0x6727,
-	/* Array index: 0x1424 */ 0x71C3,0x6657,
-	/* Array index: 0x1424 */ 0x71C8,0x5473,
-	/* Array index: 0x1424 */ 0x71C9,0x5449,
-	/* Array index: 0x1424 */ 0x71CE,0x567A,
-	/* Array index: 0x1424 */ 0x71D0,0x5772,
-	/* Array index: 0x1424 */ 0x71D2,0x6140,
-	/* Array index: 0x1424 */ 0x71D4,0x5B62,
-	/* Array index: 0x1424 */ 0x71D5,0x6658,
-	/* Array index: 0x1424 */ 0x71DF,0x673D,
-	/* Array index: 0x1424 */ 0x71ED,0x7537,
-	/* Array index: 0x1424 */ 0x71EE,0x6070,
-	/* Array index: 0x1424 */ 0x7206,0x786F,
-	/* Array index: 0x1424 */ 0x7210,0x5653,
-	/* Array index: 0x1424 */ 0x721B,0x5534,
-	/* Array index: 0x1424 */ 0x722A,0x7050,
-	/* Array index: 0x1424 */ 0x722C,0x7770,
-	/* Array index: 0x1424 */ 0x722D,0x6E33,
-	/* Array index: 0x1424 */ 0x7230,0x6A3A,
-	/* Array index: 0x1424 */ 0x7232,0x6A53,
-	/* Array index: 0x1424 */ 0x7235,0x6D49,
-	/* Array index: 0x1424 */ 0x7236,0x5D2B,
-	/* Array index: 0x1424 */ 0x724C,0x782B,
-	/* Array index: 0x1424 */ 0x7252,0x7460,
-	/* Array index: 0x1424 */ 0x7258,0x543A,
-	/* Array index: 0x1424 */ 0x7259,0x6433,
-	/* Array index: 0x1424 */ 0x725B,0x695A,
-	/* Array index: 0x1424 */ 0x725D,0x5E36,
-	/* Array index: 0x1424 */ 0x725F,0x593F,
-	/* Array index: 0x1424 */ 0x7261,0x5940,
-	/* Array index: 0x1424 */ 0x7262,0x566F,
-	/* Array index: 0x1424 */ 0x7267,0x594C,
-	/* Array index: 0x1424 */ 0x7269,0x5A2A,
-	/* Array index: 0x1424 */ 0x7272,0x5F65,
-	/* Array index: 0x1424 */ 0x7279,0x7765,
-	/* Array index: 0x1424 */ 0x727D,0x4C32,
-	/* Array index: 0x1424 */ 0x7280,0x5F79,
-	/* Array index: 0x1424 */ 0x7281,0x5760,
-	/* Array index: 0x1424 */ 0x72A2,0x543B,
-	/* Array index: 0x1424 */ 0x72A7,0x7D7A,
-	/* Array index: 0x1424 */ 0x72AC,0x4C33,
-	/* Array index: 0x1424 */ 0x72AF,0x5B73,
-	/* Array index: 0x1424 */ 0x72C0,0x5F52,
-	/* Array index: 0x1424 */ 0x72C2,0x4E4A,
-	/* Array index: 0x1424 */ 0x72C4,0x6E5A,
-	/* Array index: 0x1424 */ 0x72CE,0x6464,
-	/* Array index: 0x1424 */ 0x72D0,0x7B4F,
-	/* Array index: 0x1424 */ 0x72D7,0x4F37,
-	/* Array index: 0x1424 */ 0x72D9,0x6E43,
-	/* Array index: 0x1424 */ 0x72E1,0x4E6A,
-	/* Array index: 0x1424 */ 0x72E9,0x622D,
-	/* Array index: 0x1424 */ 0x72F8,0x5761,
-	/* Array index: 0x1424 */ 0x72F9,0x7A75,
-	/* Array index: 0x1424 */ 0x72FC,0x5549,
-	/* Array index: 0x1424 */ 0x72FD,0x782C,
-	/* Array index: 0x1424 */ 0x730A,0x6759,
-	/* Array index: 0x1424 */ 0x7316,0x7369,
-	/* Array index: 0x1424 */ 0x7325,0x6865,
-	/* Array index: 0x1424 */ 0x7336,0x6B22,
-	/* Array index: 0x1424 */ 0x7337,0x6B23,
-	/* Array index: 0x1424 */ 0x733E,0x7C42,
-	/* Array index: 0x1424 */ 0x733F,0x6A3B,
-	/* Array index: 0x1424 */ 0x7344,0x682B,
-	/* Array index: 0x1424 */ 0x7345,0x5E62,
-	/* Array index: 0x1424 */ 0x7350,0x6D6F,
-	/* Array index: 0x1424 */ 0x7352,0x6823,
-	/* Array index: 0x1424 */ 0x7357,0x4F71,
-	/* Array index: 0x1424 */ 0x7368,0x543C,
-	/* Array index: 0x1424 */ 0x736A,0x7C6A,
-	/* Array index: 0x1424 */ 0x7370,0x673E,
-	/* Array index: 0x1424 */ 0x7372,0x7C72,
-	/* Array index: 0x1424 */ 0x7375,0x5634,
-	/* Array index: 0x1424 */ 0x7378,0x622E,
-	/* Array index: 0x1424 */ 0x737A,0x5337,
-	/* Array index: 0x1424 */ 0x737B,0x7A4C,
-	/* Array index: 0x1424 */ 0x7384,0x7A5C,
-	/* Array index: 0x1424 */ 0x7386,0x6D35,
-	/* Array index: 0x1424 */ 0x7387,0x6163,
-	/* Array index: 0x1424 */ 0x7389,0x682C,
-	/* Array index: 0x1424 */ 0x738B,0x685D,
-	/* Array index: 0x1424 */ 0x738E,0x6F69,
-	/* Array index: 0x1424 */ 0x739F,0x5A47,
-	/* Array index: 0x1424 */ 0x73A7,0x6B49,
-	/* Array index: 0x1424 */ 0x73A9,0x684C,
-	/* Array index: 0x1424 */ 0x73AD,0x5E37,
-	/* Array index: 0x1424 */ 0x73B2,0x563C,
-	/* Array index: 0x1424 */ 0x73B3,0x5365,
-	/* Array index: 0x1424 */ 0x73B9,0x7A5D,
-	/* Array index: 0x1424 */ 0x73C0,0x5A56,
-	/* Array index: 0x1424 */ 0x73C2,0x4A31,
-	/* Array index: 0x1424 */ 0x73D6,0x4E4B,
-	/* Array index: 0x1424 */ 0x73D9,0x4D75,
-	/* Array index: 0x1424 */ 0x73DD,0x7D30,
-	/* Array index: 0x1424 */ 0x73DE,0x5528,
-	/* Array index: 0x1424 */ 0x73E0,0x7141,
-	/* Array index: 0x1424 */ 0x73ED,0x5A6C,
-	/* Array index: 0x1424 */ 0x73F7,0x596E,
-	/* Array index: 0x1424 */ 0x73F9,0x607B,
-	/* Array index: 0x1424 */ 0x73FD,0x6F6A,
-	/* Array index: 0x1424 */ 0x73FE,0x7A5E,
-	/* Array index: 0x1424 */ 0x7401,0x6044,
-	/* Array index: 0x1424 */ 0x7413,0x684D,
-	/* Array index: 0x1424 */ 0x741B,0x765A,
-	/* Array index: 0x1424 */ 0x744B,0x6A54,
-	/* Array index: 0x1424 */ 0x7455,0x7942,
-	/* Array index: 0x1424 */ 0x746F,0x554B,
-	/* Array index: 0x1424 */ 0x747E,0x5048,
-	/* Array index: 0x1424 */ 0x7482,0x512F,
-	/* Array index: 0x1424 */ 0x7483,0x5763,
-	/* Array index: 0x1424 */ 0x7487,0x6046,
-	/* Array index: 0x1424 */ 0x7489,0x5622,
-	/* Array index: 0x1424 */ 0x748B,0x6D70,
-	/* Array index: 0x1424 */ 0x7498,0x5773,
-	/* Array index: 0x1424 */ 0x749C,0x7C54,
-	/* Array index: 0x1424 */ 0x749E,0x5A57,
-	/* Array index: 0x1424 */ 0x749F,0x4C5F,
-	/* Array index: 0x1424 */ 0x74A1,0x7254,
-	/* Array index: 0x1424 */ 0x74A3,0x5130,
-	/* Array index: 0x1424 */ 0x74A5,0x4C60,
-	/* Array index: 0x1424 */ 0x74A7,0x5B7D,
-	/* Array index: 0x1424 */ 0x74A8,0x733F,
-	/* Array index: 0x1424 */ 0x74AA,0x7051,
-	/* Array index: 0x1424 */ 0x74B0,0x7C3B,
-	/* Array index: 0x1424 */ 0x74B2,0x6230,
-	/* Array index: 0x1424 */ 0x74B5,0x6625,
-	/* Array index: 0x1424 */ 0x74B9,0x625B,
-	/* Array index: 0x1424 */ 0x74BD,0x5F5E,
-	/* Array index: 0x1424 */ 0x74BF,0x6047,
-	/* Array index: 0x1424 */ 0x74C6,0x726F,
-	/* Array index: 0x1424 */ 0x74CA,0x4C61,
-	/* Array index: 0x1424 */ 0x74CF,0x566A,
-	/* Array index: 0x1424 */ 0x74D4,0x6742,
-	/* Array index: 0x1424 */ 0x74D8,0x4E36,
-	/* Array index: 0x1424 */ 0x74DA,0x7340,
-	/* Array index: 0x1424 */ 0x74DC,0x4D7E,
-	/* Array index: 0x1424 */ 0x74E0,0x7B52,
-	/* Array index: 0x1424 */ 0x74E2,0x7878,
-	/* Array index: 0x1424 */ 0x74E3,0x777B,
-	/* Array index: 0x1424 */ 0x74E6,0x683F,
-	/* Array index: 0x1424 */ 0x74EE,0x6837,
-	/* Array index: 0x1424 */ 0x74F7,0x6D36,
-	/* Array index: 0x1424 */ 0x7501,0x5C3A,
-	/* Array index: 0x1424 */ 0x7504,0x4C34,
-	/* Array index: 0x1424 */ 0x7511,0x7177,
-	/* Array index: 0x1424 */ 0x7515,0x6838,
-	/* Array index: 0x1424 */ 0x7518,0x4A76,
-	/* Array index: 0x1424 */ 0x751A,0x6424,
-	/* Array index: 0x1424 */ 0x751B,0x7456,
-	/* Array index: 0x1424 */ 0x751F,0x5F66,
-	/* Array index: 0x1424 */ 0x7523,0x5F27,
-	/* Array index: 0x1424 */ 0x7525,0x5F67,
-	/* Array index: 0x1424 */ 0x7526,0x6141,
-	/* Array index: 0x1424 */ 0x7528,0x6944,
-	/* Array index: 0x1424 */ 0x752B,0x5C4B,
-	/* Array index: 0x1424 */ 0x752C,0x6945,
-	/* Array index: 0x1424 */ 0x7537,0x517B,
-	/* Array index: 0x1424 */ 0x7538,0x6F24,
-	/* Array index: 0x1424 */ 0x753A,0x6F6B,
-	/* Array index: 0x1424 */ 0x7547,0x5034,
-	/* Array index: 0x1424 */ 0x754C,0x4D23,
-	/* Array index: 0x1424 */ 0x754F,0x6866,
-	/* Array index: 0x1424 */ 0x7551,0x6F25,
-	/* Array index: 0x1424 */ 0x7553,0x534C,
-	/* Array index: 0x1424 */ 0x7554,0x5A6D,
-	/* Array index: 0x1424 */ 0x7562,0x7934,
-	/* Array index: 0x1424 */ 0x7565,0x5554,
-	/* Array index: 0x1424 */ 0x7566,0x7D4F,
-	/* Array index: 0x1424 */ 0x756A,0x5B63,
-	/* Array index: 0x1424 */ 0x756F,0x7161,
-	/* Array index: 0x1424 */ 0x7570,0x6C36,
-	/* Array index: 0x1424 */ 0x7575,0x7B7E,
-	/* Array index: 0x1424 */ 0x7576,0x5357,
-	/* Array index: 0x1424 */ 0x7578,0x5131,
-	/* Array index: 0x1424 */ 0x757A,0x4B31,
-	/* Array index: 0x1424 */ 0x757F,0x5132,
-	/* Array index: 0x1424 */ 0x7586,0x4B32,
-	/* Array index: 0x1424 */ 0x7587,0x7142,
-	/* Array index: 0x1424 */ 0x758A,0x7461,
-	/* Array index: 0x1424 */ 0x758B,0x7935,
-	/* Array index: 0x1424 */ 0x758E,0x6143,
-	/* Array index: 0x1424 */ 0x758F,0x6142,
-	/* Array index: 0x1424 */ 0x7591,0x6B77,
-	/* Array index: 0x1424 */ 0x759D,0x5F28,
-	/* Array index: 0x1424 */ 0x75A5,0x4B4A,
-	/* Array index: 0x1424 */ 0x75AB,0x6639,
-	/* Array index: 0x1424 */ 0x75C2,0x4A32,
-	/* Array index: 0x1424 */ 0x75C5,0x5C3B,
-	/* Array index: 0x1424 */ 0x75C7,0x7178,
-	/* Array index: 0x1424 */ 0x75CD,0x6C37,
-	/* Array index: 0x1424 */ 0x75D2,0x654A,
-	/* Array index: 0x1424 */ 0x75D4,0x7640,
-	/* Array index: 0x1424 */ 0x75D5,0x7D5D,
-	/* Array index: 0x1424 */ 0x75D8,0x5463,
-	/* Array index: 0x1424 */ 0x75D9,0x4C62,
-	/* Array index: 0x1424 */ 0x75DB,0x7754,
-	/* Array index: 0x1424 */ 0x75E2,0x5765,
-	/* Array index: 0x1424 */ 0x75F0,0x5343,
-	/* Array index: 0x1424 */ 0x75F2,0x5826,
-	/* Array index: 0x1424 */ 0x75F4,0x7641,
-	/* Array index: 0x1424 */ 0x75FA,0x5D76,
-	/* Array index: 0x1424 */ 0x75FC,0x4D40,
-	/* Array index: 0x1424 */ 0x7600,0x655C,
-	/* Array index: 0x1424 */ 0x760D,0x654B,
-	/* Array index: 0x1424 */ 0x7619,0x6144,
-	/* Array index: 0x1424 */ 0x763B,0x572A,
-	/* Array index: 0x1424 */ 0x7642,0x567B,
-	/* Array index: 0x1424 */ 0x764C,0x645F,
-	/* Array index: 0x1424 */ 0x764E,0x4A56,
-	/* Array index: 0x1424 */ 0x7652,0x6B28,
-	/* Array index: 0x1424 */ 0x7656,0x5B7E,
-	/* Array index: 0x1424 */ 0x7661,0x7642,
-	/* Array index: 0x1424 */ 0x7664,0x6F3B,
-	/* Array index: 0x1424 */ 0x7669,0x547D,
-	/* Array index: 0x1424 */ 0x766C,0x6048,
-	/* Array index: 0x1424 */ 0x7670,0x6839,
-	/* Array index: 0x1424 */ 0x7672,0x6F26,
-	/* Array index: 0x1424 */ 0x7678,0x4D24,
-	/* Array index: 0x1424 */ 0x7684,0x6E5C,
-	/* Array index: 0x1424 */ 0x7686,0x4B4B,
-	/* Array index: 0x1424 */ 0x7687,0x7C55,
-	/* Array index: 0x1424 */ 0x768E,0x4E6B,
-	/* Array index: 0x1424 */ 0x7690,0x4D41,
-	/* Array index: 0x1424 */ 0x7693,0x7B53,
-	/* Array index: 0x1424 */ 0x76AE,0x792B,
-	/* Array index: 0x1424 */ 0x76BA,0x7554,
-	/* Array index: 0x1424 */ 0x76BF,0x5929,
-	/* Array index: 0x1424 */ 0x76C2,0x695D,
-	/* Array index: 0x1424 */ 0x76C3,0x5B4D,
-	/* Array index: 0x1424 */ 0x76C6,0x5D4E,
-	/* Array index: 0x1424 */ 0x76C8,0x6743,
-	/* Array index: 0x1424 */ 0x76CA,0x6C4C,
-	/* Array index: 0x1424 */ 0x76D2,0x796C,
-	/* Array index: 0x1424 */ 0x76D6,0x4B4C,
-	/* Array index: 0x1424 */ 0x76E7,0x5654,
-	/* Array index: 0x1424 */ 0x76EE,0x594D,
-	/* Array index: 0x1424 */ 0x76F2,0x586E,
-	/* Array index: 0x1424 */ 0x76F4,0x7241,
-	/* Array index: 0x1424 */ 0x76F8,0x5F53,
-	/* Array index: 0x1424 */ 0x76FC,0x5A70,
-	/* Array index: 0x1424 */ 0x76FE,0x626A,
-	/* Array index: 0x1424 */ 0x7701,0x607D,
-	/* Array index: 0x1424 */ 0x7704,0x5878,
-	/* Array index: 0x1424 */ 0x7708,0x772F,
-	/* Array index: 0x1424 */ 0x7709,0x5A36,
-	/* Array index: 0x1424 */ 0x770B,0x4A57,
-	/* Array index: 0x1424 */ 0x771E,0x7258,
-	/* Array index: 0x1424 */ 0x7720,0x5879,
-	/* Array index: 0x1424 */ 0x7729,0x7A5F,
-	/* Array index: 0x1424 */ 0x7737,0x4F6F,
-	/* Array index: 0x1424 */ 0x7738,0x5942,
-	/* Array index: 0x1424 */ 0x773A,0x7052,
-	/* Array index: 0x1424 */ 0x773C,0x6451,
-	/* Array index: 0x1424 */ 0x7740,0x7337,
-	/* Array index: 0x1424 */ 0x774D,0x7A60,
-	/* Array index: 0x1424 */ 0x775B,0x6F6C,
-	/* Array index: 0x1424 */ 0x7761,0x6232,
-	/* Array index: 0x1424 */ 0x7763,0x543D,
-	/* Array index: 0x1424 */ 0x7766,0x594E,
-	/* Array index: 0x1424 */ 0x776B,0x7462,
-	/* Array index: 0x1424 */ 0x7779,0x5429,
-	/* Array index: 0x1424 */ 0x777E,0x4D42,
-	/* Array index: 0x1424 */ 0x777F,0x675A,
-	/* Array index: 0x1424 */ 0x778B,0x7259,
-	/* Array index: 0x1424 */ 0x7791,0x592A,
-	/* Array index: 0x1424 */ 0x779E,0x583E,
-	/* Array index: 0x1424 */ 0x77A5,0x5C2D,
-	/* Array index: 0x1424 */ 0x77AC,0x626B,
-	/* Array index: 0x1424 */ 0x77AD,0x567C,
-	/* Array index: 0x1424 */ 0x77B0,0x4A79,
-	/* Array index: 0x1424 */ 0x77B3,0x545A,
-	/* Array index: 0x1424 */ 0x77BB,0x7457,
-	/* Array index: 0x1424 */ 0x77BC,0x4C21,
-	/* Array index: 0x1424 */ 0x77BF,0x4F3A,
-	/* Array index: 0x1424 */ 0x77D7,0x7538,
-	/* Array index: 0x1424 */ 0x77DB,0x5943,
-	/* Array index: 0x1424 */ 0x77DC,0x5068,
-	/* Array index: 0x1424 */ 0x77E2,0x6345,
-	/* Array index: 0x1424 */ 0x77E3,0x6B78,
-	/* Array index: 0x1424 */ 0x77E5,0x7231,
-	/* Array index: 0x1424 */ 0x77E9,0x4F3B,
-	/* Array index: 0x1424 */ 0x77F3,0x6034,
-	/* Array index: 0x1424 */ 0x7802,0x5E63,
-	/* Array index: 0x1424 */ 0x7812,0x5D77,
-	/* Array index: 0x1424 */ 0x782C,0x577E,
-	/* Array index: 0x1424 */ 0x7832,0x785F,
-	/* Array index: 0x1424 */ 0x7834,0x7772,
-	/* Array index: 0x1424 */ 0x7845,0x5029,
-	/* Array index: 0x1424 */ 0x784F,0x665A,
-	/* Array index: 0x1424 */ 0x785D,0x7526,
-	/* Array index: 0x1424 */ 0x786B,0x573C,
-	/* Array index: 0x1424 */ 0x786C,0x4C63,
-	/* Array index: 0x1424 */ 0x786F,0x665B,
-	/* Array index: 0x1424 */ 0x787C,0x5D5D,
-	/* Array index: 0x1424 */ 0x7881,0x5133,
-	/* Array index: 0x1424 */ 0x7887,0x6F6D,
-	/* Array index: 0x1424 */ 0x7891,0x5D78,
-	/* Array index: 0x1424 */ 0x7897,0x684F,
-	/* Array index: 0x1424 */ 0x78A3,0x4A65,
-	/* Array index: 0x1424 */ 0x78A7,0x5C21,
-	/* Array index: 0x1424 */ 0x78A9,0x6035,
-	/* Array index: 0x1424 */ 0x78C1,0x6D38,
-	/* Array index: 0x1424 */ 0x78C5,0x5B36,
-	/* Array index: 0x1424 */ 0x78CA,0x5670,
-	/* Array index: 0x1424 */ 0x78CB,0x732F,
-	/* Array index: 0x1424 */ 0x78CE,0x4D25,
-	/* Array index: 0x1424 */ 0x78D0,0x5A71,
-	/* Array index: 0x1424 */ 0x78E8,0x5828,
-	/* Array index: 0x1424 */ 0x78EC,0x4C64,
-	/* Array index: 0x1424 */ 0x78EF,0x5134,
-	/* Array index: 0x1424 */ 0x78F5,0x4A58,
-	/* Array index: 0x1424 */ 0x78FB,0x5A72,
-	/* Array index: 0x1424 */ 0x7901,0x7527,
-	/* Array index: 0x1424 */ 0x790E,0x7528,
-	/* Array index: 0x1424 */ 0x7916,0x6626,
-	/* Array index: 0x1424 */ 0x793A,0x6346,
-	/* Array index: 0x1424 */ 0x793E,0x5E64,
-	/* Array index: 0x1424 */ 0x7940,0x5E65,
-	/* Array index: 0x1424 */ 0x7941,0x5135,
-	/* Array index: 0x1424 */ 0x7950,0x695E,
-	/* Array index: 0x1424 */ 0x7965,0x5F54,
-	/* Array index: 0x1424 */ 0x7968,0x7879,
-	/* Array index: 0x1424 */ 0x796D,0x702E,
-	/* Array index: 0x1424 */ 0x797A,0x5138,
-	/* Array index: 0x1424 */ 0x797F,0x565F,
-	/* Array index: 0x1424 */ 0x7981,0x5057,
-	/* Array index: 0x1424 */ 0x79A6,0x655D,
-	/* Array index: 0x1424 */ 0x79A7,0x7D7B,
-	/* Array index: 0x1424 */ 0x79AA,0x6049,
-	/* Array index: 0x1424 */ 0x79AE,0x5649,
-	/* Array index: 0x1424 */ 0x79B1,0x542A,
-	/* Array index: 0x1424 */ 0x79B3,0x654C,
-	/* Array index: 0x1424 */ 0x79B9,0x6960,
-	/* Array index: 0x1424 */ 0x79D1,0x4E21,
-	/* Array index: 0x1424 */ 0x79D2,0x7529,
-	/* Array index: 0x1424 */ 0x79D5,0x5D79,
-	/* Array index: 0x1424 */ 0x79D8,0x5D7A,
-	/* Array index: 0x1424 */ 0x79DF,0x7055,
-	/* Array index: 0x1424 */ 0x79E4,0x765F,
-	/* Array index: 0x1424 */ 0x79E6,0x725A,
-	/* Array index: 0x1424 */ 0x79E7,0x646B,
-	/* Array index: 0x1424 */ 0x79E9,0x7271,
-	/* Array index: 0x1424 */ 0x79FB,0x6C39,
-	/* Array index: 0x1424 */ 0x7A00,0x7D7C,
-	/* Array index: 0x1424 */ 0x7A05,0x612A,
-	/* Array index: 0x1424 */ 0x7A08,0x4A59,
-	/* Array index: 0x1424 */ 0x7A0B,0x6F6F,
-	/* Array index: 0x1424 */ 0x7A0D,0x752A,
-	/* Array index: 0x1424 */ 0x7A14,0x6C79,
-	/* Array index: 0x1424 */ 0x7A17,0x782D,
-	/* Array index: 0x1424 */ 0x7A19,0x7242,
-	/* Array index: 0x1424 */ 0x7A1A,0x7643,
-	/* Array index: 0x1424 */ 0x7A1C,0x5752,
-	/* Array index: 0x1424 */ 0x7A1F,0x7922,
-	/* Array index: 0x1424 */ 0x7A20,0x7056,
-	/* Array index: 0x1424 */ 0x7A2E,0x707A,
-	/* Array index: 0x1424 */ 0x7A31,0x7660,
-	/* Array index: 0x1424 */ 0x7A36,0x6973,
-	/* Array index: 0x1424 */ 0x7A37,0x7243,
-	/* Array index: 0x1424 */ 0x7A46,0x594F,
-	/* Array index: 0x1424 */ 0x7A49,0x7644,
-	/* Array index: 0x1424 */ 0x7A4D,0x6E5D,
-	/* Array index: 0x1424 */ 0x7A4E,0x6744,
-	/* Array index: 0x1424 */ 0x7A57,0x6234,
-	/* Array index: 0x1424 */ 0x7A61,0x5F62,
-	/* Array index: 0x1424 */ 0x7A62,0x675B,
-	/* Array index: 0x1424 */ 0x7A69,0x6831,
-	/* Array index: 0x1424 */ 0x7A6B,0x7C2E,
-	/* Array index: 0x1424 */ 0x7A70,0x654D,
-	/* Array index: 0x1424 */ 0x7A74,0x7A6B,
-	/* Array index: 0x1424 */ 0x7A76,0x4F3C,
-	/* Array index: 0x1424 */ 0x7A79,0x4F62,
-	/* Array index: 0x1424 */ 0x7A7A,0x4D76,
-	/* Array index: 0x1424 */ 0x7A7D,0x6F70,
-	/* Array index: 0x1424 */ 0x7A7F,0x743E,
-	/* Array index: 0x1424 */ 0x7A81,0x544D,
-	/* Array index: 0x1424 */ 0x7A84,0x7338,
-	/* Array index: 0x1424 */ 0x7A88,0x6921,
-	/* Array index: 0x1424 */ 0x7A92,0x7272,
-	/* Array index: 0x1424 */ 0x7A93,0x736B,
-	/* Array index: 0x1424 */ 0x7A95,0x7057,
-	/* Array index: 0x1424 */ 0x7A98,0x4F57,
-	/* Array index: 0x1424 */ 0x7A9F,0x4F5F,
-	/* Array index: 0x1424 */ 0x7AA9,0x6840,
-	/* Array index: 0x1424 */ 0x7AAA,0x6841,
-	/* Array index: 0x1424 */ 0x7AAE,0x4F63,
-	/* Array index: 0x1424 */ 0x7AAF,0x6922,
-	/* Array index: 0x1424 */ 0x7ABA,0x502A,
-	/* Array index: 0x1424 */ 0x7AC4,0x7341,
-	/* Array index: 0x1424 */ 0x7AC5,0x502B,
-	/* Array index: 0x1424 */ 0x7AC7,0x5464,
-	/* Array index: 0x1424 */ 0x7ACA,0x6F3C,
-	/* Array index: 0x1424 */ 0x7ACB,0x5821,
-	/* Array index: 0x1424 */ 0x7AD7,0x595F,
-	/* Array index: 0x1424 */ 0x7AD9,0x7357,
-	/* Array index: 0x1424 */ 0x7ADD,0x5C3D,
-	/* Array index: 0x1424 */ 0x7ADF,0x4C65,
-	/* Array index: 0x1424 */ 0x7AE0,0x6D71,
-	/* Array index: 0x1424 */ 0x7AE3,0x7162,
-	/* Array index: 0x1424 */ 0x7AE5,0x545B,
-	/* Array index: 0x1424 */ 0x7AEA,0x6235,
-	/* Array index: 0x1424 */ 0x7AED,0x4A66,
-	/* Array index: 0x1424 */ 0x7AEF,0x532E,
-	/* Array index: 0x1424 */ 0x7AF6,0x4C66,
-	/* Array index: 0x1424 */ 0x7AF9,0x7153,
-	/* Array index: 0x1424 */ 0x7AFA,0x7567,
-	/* Array index: 0x1424 */ 0x7AFF,0x4A5A,
-	/* Array index: 0x1424 */ 0x7B0F,0x7B6E,
-	/* Array index: 0x1424 */ 0x7B11,0x6145,
-	/* Array index: 0x1424 */ 0x7B19,0x5F69,
-	/* Array index: 0x1424 */ 0x7B1B,0x6E5E,
-	/* Array index: 0x1424 */ 0x7B1E,0x7742,
-	/* Array index: 0x1424 */ 0x7B20,0x5822,
-	/* Array index: 0x1424 */ 0x7B26,0x5D2C,
-	/* Array index: 0x1424 */ 0x7B2C,0x702F,
-	/* Array index: 0x1424 */ 0x7B2D,0x563D,
-	/* Array index: 0x1424 */ 0x7B39,0x612B,
-	/* Array index: 0x1424 */ 0x7B46,0x7936,
-	/* Array index: 0x1424 */ 0x7B60,0x5035,
-	/* Array index: 0x1424 */ 0x7B6C,0x607E,
-	/* Array index: 0x1424 */ 0x7B6E,0x5F7B,
-	/* Array index: 0x1424 */ 0x7B75,0x665D,
-	/* Array index: 0x1424 */ 0x7B7D,0x6824,
-	/* Array index: 0x1424 */ 0x7B87,0x4B4D,
-	/* Array index: 0x1424 */ 0x7B8B,0x6F28,
-	/* Array index: 0x1424 */ 0x7B8F,0x6E34,
-	/* Array index: 0x1424 */ 0x7B94,0x5A58,
-	/* Array index: 0x1424 */ 0x7B95,0x5139,
-	/* Array index: 0x1424 */ 0x7B97,0x5F29,
-	/* Array index: 0x1424 */ 0x7B9A,0x7330,
-	/* Array index: 0x1424 */ 0x7B9D,0x4C44,
-	/* Array index: 0x1424 */ 0x7BA1,0x4E37,
-	/* Array index: 0x1424 */ 0x7BAD,0x6F29,
-	/* Array index: 0x1424 */ 0x7BB1,0x5F55,
-	/* Array index: 0x1424 */ 0x7BB4,0x6D57,
-	/* Array index: 0x1424 */ 0x7BB8,0x6E46,
-	/* Array index: 0x1424 */ 0x7BC0,0x6F3D,
-	/* Array index: 0x1424 */ 0x7BC1,0x7C56,
-	/* Array index: 0x1424 */ 0x7BC4,0x5B74,
-	/* Array index: 0x1424 */ 0x7BC6,0x6F2A,
-	/* Array index: 0x1424 */ 0x7BC7,0x7839,
-	/* Array index: 0x1424 */ 0x7BC9,0x7569,
-	/* Array index: 0x1424 */ 0x7BD2,0x6359,
-	/* Array index: 0x1424 */ 0x7BE0,0x6146,
-	/* Array index: 0x1424 */ 0x7BE4,0x543F,
-	/* Array index: 0x1424 */ 0x7BE9,0x5E68,
-	/* Array index: 0x1424 */ 0x7C07,0x706A,
-	/* Array index: 0x1424 */ 0x7C12,0x7342,
-	/* Array index: 0x1424 */ 0x7C1E,0x532F,
-	/* Array index: 0x1424 */ 0x7C21,0x4A5B,
-	/* Array index: 0x1424 */ 0x7C27,0x7C57,
-	/* Array index: 0x1424 */ 0x7C2A,0x6D58,
-	/* Array index: 0x1424 */ 0x7C2B,0x6147,
-	/* Array index: 0x1424 */ 0x7C43,0x553E,
-	/* Array index: 0x1424 */ 0x7C4C,0x7143,
-	/* Array index: 0x1424 */ 0x7C4D,0x6E5F,
-	/* Array index: 0x1424 */ 0x7C60,0x566B,
-	/* Array index: 0x1424 */ 0x7C64,0x7459,
-	/* Array index: 0x1424 */ 0x7C6C,0x5766,
-	/* Array index: 0x1424 */ 0x7C73,0x5A37,
-	/* Array index: 0x1424 */ 0x7C83,0x5D7B,
-	/* Array index: 0x1424 */ 0x7C89,0x5D4F,
-	/* Array index: 0x1424 */ 0x7C92,0x5823,
-	/* Array index: 0x1424 */ 0x7C95,0x5A59,
-	/* Array index: 0x1424 */ 0x7C97,0x7058,
-	/* Array index: 0x1424 */ 0x7C98,0x6F44,
-	/* Array index: 0x1424 */ 0x7C9F,0x6158,
-	/* Array index: 0x1424 */ 0x7CA5,0x7154,
-	/* Array index: 0x1424 */ 0x7CA7,0x6D72,
-	/* Array index: 0x1424 */ 0x7CAE,0x555B,
-	/* Array index: 0x1424 */ 0x7CB9,0x6236,
-	/* Array index: 0x1424 */ 0x7CBE,0x6F71,
-	/* Array index: 0x1424 */ 0x7CCA,0x7B55,
-	/* Array index: 0x1424 */ 0x7CD6,0x5358,
-	/* Array index: 0x1424 */ 0x7CE7,0x555D,
-	/* Array index: 0x1424 */ 0x7CFB,0x4D27,
-	/* Array index: 0x1424 */ 0x7CFE,0x502C,
-	/* Array index: 0x1424 */ 0x7D00,0x513A,
-	/* Array index: 0x1424 */ 0x7D10,0x526F,
-	/* Array index: 0x1424 */ 0x7D14,0x626D,
-	/* Array index: 0x1424 */ 0x7D33,0x636B,
-	/* Array index: 0x1424 */ 0x7D35,0x6E47,
-	/* Array index: 0x1424 */ 0x7D39,0x6149,
-	/* Array index: 0x1424 */ 0x7D3A,0x4A7A,
-	/* Array index: 0x1424 */ 0x7D50,0x4C3F,
-	/* Array index: 0x1424 */ 0x7D5E,0x4E6D,
-	/* Array index: 0x1424 */ 0x7D61,0x5529,
-	/* Array index: 0x1424 */ 0x7D62,0x7A62,
-	/* Array index: 0x1424 */ 0x7D66,0x5065,
-	/* Array index: 0x1424 */ 0x7D68,0x6B56,
-	/* Array index: 0x1424 */ 0x7D6A,0x6C5F,
-	/* Array index: 0x1424 */ 0x7D6E,0x5F7C,
-	/* Array index: 0x1424 */ 0x7D76,0x6F3E,
-	/* Array index: 0x1424 */ 0x7D79,0x4C35,
-	/* Array index: 0x1424 */ 0x7D7F,0x4F3D,
-	/* Array index: 0x1424 */ 0x7D8E,0x6F72,
-	/* Array index: 0x1424 */ 0x7D8F,0x6237,
-	/* Array index: 0x1424 */ 0x7D93,0x4C68,
-	/* Array index: 0x1424 */ 0x7D9C,0x707C,
-	/* Array index: 0x1424 */ 0x7DA0,0x5660,
-	/* Array index: 0x1424 */ 0x7DA2,0x7146,
-	/* Array index: 0x1424 */ 0x7DAC,0x6238,
-	/* Array index: 0x1424 */ 0x7DAD,0x6B2B,
-	/* Array index: 0x1424 */ 0x7DB8,0x5746,
-	/* Array index: 0x1424 */ 0x7DC7,0x7645,
-	/* Array index: 0x1424 */ 0x7DCA,0x514C,
-	/* Array index: 0x1424 */ 0x7DCB,0x5D7C,
-	/* Array index: 0x1424 */ 0x7DD6,0x5F7D,
-	/* Array index: 0x1424 */ 0x7DD8,0x7965,
-	/* Array index: 0x1424 */ 0x7DDA,0x604A,
-	/* Array index: 0x1424 */ 0x7DE8,0x783A,
-	/* Array index: 0x1424 */ 0x7DE9,0x6850,
-	/* Array index: 0x1424 */ 0x7DEC,0x587B,
-	/* Array index: 0x1424 */ 0x7DEF,0x6A55,
-	/* Array index: 0x1424 */ 0x7DF4,0x5623,
-	/* Array index: 0x1424 */ 0x7DFB,0x7646,
-	/* Array index: 0x1424 */ 0x7E09,0x725B,
-	/* Array index: 0x1424 */ 0x7E0A,0x647C,
-	/* Array index: 0x1424 */ 0x7E15,0x6832,
-	/* Array index: 0x1424 */ 0x7E2B,0x5C6E,
-	/* Array index: 0x1424 */ 0x7E2E,0x756A,
-	/* Array index: 0x1424 */ 0x7E2F,0x6660,
-	/* Array index: 0x1424 */ 0x7E31,0x707D,
-	/* Array index: 0x1424 */ 0x7E37,0x572C,
-	/* Array index: 0x1424 */ 0x7E3D,0x7545,
-	/* Array index: 0x1424 */ 0x7E3E,0x6E60,
-	/* Array index: 0x1424 */ 0x7E41,0x5B65,
-	/* Array index: 0x1424 */ 0x7E43,0x5D5E,
-	/* Array index: 0x1424 */ 0x7E46,0x5970,
-	/* Array index: 0x1424 */ 0x7E47,0x6923,
-	/* Array index: 0x1424 */ 0x7E52,0x7179,
-	/* Array index: 0x1424 */ 0x7E54,0x7244,
-	/* Array index: 0x1424 */ 0x7E55,0x604B,
-	/* Array index: 0x1424 */ 0x7E5E,0x6924,
-	/* Array index: 0x1424 */ 0x7E61,0x6239,
-	/* Array index: 0x1424 */ 0x7E70,0x705B,
-	/* Array index: 0x1424 */ 0x7E79,0x663A,
-	/* Array index: 0x1424 */ 0x7E7C,0x4D29,
-	/* Array index: 0x1424 */ 0x7E82,0x7343,
-	/* Array index: 0x1424 */ 0x7E8C,0x6159,
-	/* Array index: 0x1424 */ 0x7E8F,0x6F2B,
-	/* Array index: 0x1424 */ 0x7E93,0x6745,
-	/* Array index: 0x1424 */ 0x7E96,0x6069,
-	/* Array index: 0x1424 */ 0x7E98,0x7345,
-	/* Array index: 0x1424 */ 0x7E9B,0x5440,
-	/* Array index: 0x1424 */ 0x7E9C,0x553F,
-	/* Array index: 0x1424 */ 0x7F36,0x5D2E,
-	/* Array index: 0x1424 */ 0x7F38,0x797C,
-	/* Array index: 0x1424 */ 0x7F3A,0x4C40,
-	/* Array index: 0x1424 */ 0x7F4C,0x6522,
-	/* Array index: 0x1424 */ 0x7F50,0x4E38,
-	/* Array index: 0x1424 */ 0x7F54,0x5852,
-	/* Array index: 0x1424 */ 0x7F55,0x7956,
-	/* Array index: 0x1424 */ 0x7F6A,0x712A,
-	/* Array index: 0x1424 */ 0x7F6B,0x4E51,
-	/* Array index: 0x1424 */ 0x7F6E,0x7647,
-	/* Array index: 0x1424 */ 0x7F70,0x5B6B,
-	/* Array index: 0x1424 */ 0x7F72,0x5F7E,
-	/* Array index: 0x1424 */ 0x7F75,0x5861,
-	/* Array index: 0x1424 */ 0x7F77,0x7773,
-	/* Array index: 0x1424 */ 0x7F79,0x5767,
-	/* Array index: 0x1424 */ 0x7F85,0x547E,
-	/* Array index: 0x1424 */ 0x7F88,0x513C,
-	/* Array index: 0x1424 */ 0x7F8A,0x654F,
-	/* Array index: 0x1424 */ 0x7F8C,0x4B36,
-	/* Array index: 0x1424 */ 0x7F8E,0x5A38,
-	/* Array index: 0x1424 */ 0x7F94,0x4D44,
-	/* Array index: 0x1424 */ 0x7F9A,0x563E,
-	/* Array index: 0x1424 */ 0x7F9E,0x623A,
-	/* Array index: 0x1424 */ 0x7FA4,0x4F58,
-	/* Array index: 0x1424 */ 0x7FA8,0x604C,
-	/* Array index: 0x1424 */ 0x7FA9,0x6B79,
-	/* Array index: 0x1424 */ 0x7FB2,0x7D7D,
-	/* Array index: 0x1424 */ 0x7FB8,0x5768,
-	/* Array index: 0x1424 */ 0x7FB9,0x4B58,
-	/* Array index: 0x1424 */ 0x7FBD,0x6962,
-	/* Array index: 0x1424 */ 0x7FC1,0x683A,
-	/* Array index: 0x1424 */ 0x7FC5,0x6347,
-	/* Array index: 0x1424 */ 0x7FCA,0x6C4D,
-	/* Array index: 0x1424 */ 0x7FCC,0x6C4E,
-	/* Array index: 0x1424 */ 0x7FCE,0x563F,
-	/* Array index: 0x1424 */ 0x7FD2,0x6327,
-	/* Array index: 0x1424 */ 0x7FD4,0x5F56,
-	/* Array index: 0x1424 */ 0x7FD5,0x7D68,
-	/* Array index: 0x1424 */ 0x7FE9,0x783B,
-	/* Array index: 0x1424 */ 0x7FEB,0x6851,
-	/* Array index: 0x1424 */ 0x7FF0,0x7957,
-	/* Array index: 0x1424 */ 0x7FF9,0x4E6E,
-	/* Array index: 0x1424 */ 0x7FFC,0x6C4F,
-	/* Array index: 0x1424 */ 0x8000,0x6925,
-	/* Array index: 0x1424 */ 0x8001,0x5655,
-	/* Array index: 0x1424 */ 0x8003,0x4D45,
-	/* Array index: 0x1424 */ 0x8005,0x6D3A,
-	/* Array index: 0x1424 */ 0x8006,0x513D,
-	/* Array index: 0x1424 */ 0x8009,0x4F3E,
-	/* Array index: 0x1424 */ 0x800C,0x6C3B,
-	/* Array index: 0x1424 */ 0x8010,0x5231,
-	/* Array index: 0x1424 */ 0x8015,0x4C69,
-	/* Array index: 0x1424 */ 0x8017,0x5944,
-	/* Array index: 0x1424 */ 0x8018,0x697C,
-	/* Array index: 0x1424 */ 0x802D,0x513E,
-	/* Array index: 0x1424 */ 0x8033,0x6C3C,
-	/* Array index: 0x1424 */ 0x8036,0x652D,
-	/* Array index: 0x1424 */ 0x803D,0x7730,
-	/* Array index: 0x1424 */ 0x803F,0x4C6A,
-	/* Array index: 0x1424 */ 0x8043,0x5344,
-	/* Array index: 0x1424 */ 0x8046,0x5640,
-	/* Array index: 0x1424 */ 0x804A,0x567D,
-	/* Array index: 0x1424 */ 0x8056,0x6121,
-	/* Array index: 0x1424 */ 0x8058,0x5E3D,
-	/* Array index: 0x1424 */ 0x805A,0x7629,
-	/* Array index: 0x1424 */ 0x805E,0x5A24,
-	/* Array index: 0x1424 */ 0x8077,0x7245,
-	/* Array index: 0x1424 */ 0x8096,0x752B,
-	/* Array index: 0x1424 */ 0x809B,0x797D,
-	/* Array index: 0x1424 */ 0x809D,0x4A5C,
-	/* Array index: 0x1424 */ 0x80A1,0x4D46,
-	/* Array index: 0x1424 */ 0x80A2,0x7236,
-	/* Array index: 0x1424 */ 0x80A5,0x5D7E,
-	/* Array index: 0x1424 */ 0x80A9,0x4C37,
-	/* Array index: 0x1424 */ 0x80AA,0x5B38,
-	/* Array index: 0x1424 */ 0x80AF,0x5069,
-	/* Array index: 0x1424 */ 0x80B1,0x4E5D,
-	/* Array index: 0x1424 */ 0x80B2,0x6B40,
-	/* Array index: 0x1424 */ 0x80B4,0x7D22,
-	/* Array index: 0x1424 */ 0x80BA,0x784B,
-	/* Array index: 0x1424 */ 0x80C3,0x6A56,
-	/* Array index: 0x1424 */ 0x80C4,0x7130,
-	/* Array index: 0x1424 */ 0x80CC,0x5B4E,
-	/* Array index: 0x1424 */ 0x80CE,0x7743,
-	/* Array index: 0x1424 */ 0x80DA,0x5B4F,
-	/* Array index: 0x1424 */ 0x80DB,0x4B24,
-	/* Array index: 0x1424 */ 0x80DE,0x7860,
-	/* Array index: 0x1424 */ 0x80E1,0x7B57,
-	/* Array index: 0x1424 */ 0x80E4,0x6B4A,
-	/* Array index: 0x1424 */ 0x80E5,0x6021,
-	/* Array index: 0x1424 */ 0x80F1,0x4E4D,
-	/* Array index: 0x1424 */ 0x80F4,0x545C,
-	/* Array index: 0x1424 */ 0x80F8,0x7D58,
-	/* Array index: 0x1424 */ 0x80FD,0x5276,
-	/* Array index: 0x1424 */ 0x8102,0x7237,
-	/* Array index: 0x1424 */ 0x8118,0x6852,
-	/* Array index: 0x1424 */ 0x811A,0x4A45,
-	/* Array index: 0x1424 */ 0x811B,0x4C6B,
-	/* Array index: 0x1424 */ 0x8123,0x626E,
-	/* Array index: 0x1424 */ 0x8129,0x623B,
-	/* Array index: 0x1424 */ 0x812B,0x772D,
-	/* Array index: 0x1424 */ 0x812F,0x7861,
-	/* Array index: 0x1424 */ 0x8139,0x736C,
-	/* Array index: 0x1424 */ 0x813E,0x5E21,
-	/* Array index: 0x1424 */ 0x814B,0x647D,
-	/* Array index: 0x1424 */ 0x814E,0x636C,
-	/* Array index: 0x1424 */ 0x8150,0x5D2F,
-	/* Array index: 0x1424 */ 0x8151,0x5D30,
-	/* Array index: 0x1424 */ 0x8154,0x4B37,
-	/* Array index: 0x1424 */ 0x8155,0x6853,
-	/* Array index: 0x1424 */ 0x8165,0x6123,
-	/* Array index: 0x1424 */ 0x8166,0x5260,
-	/* Array index: 0x1424 */ 0x816B,0x707E,
-	/* Array index: 0x1424 */ 0x8170,0x6926,
-	/* Array index: 0x1424 */ 0x8171,0x4B72,
-	/* Array index: 0x1424 */ 0x817F,0x775A,
-	/* Array index: 0x1424 */ 0x8180,0x5B39,
-	/* Array index: 0x1424 */ 0x8188,0x4C2E,
-	/* Array index: 0x1424 */ 0x818A,0x5A5B,
-	/* Array index: 0x1424 */ 0x818F,0x4D47,
-	/* Array index: 0x1424 */ 0x819A,0x5D31,
-	/* Array index: 0x1424 */ 0x819C,0x582F,
-	/* Array index: 0x1424 */ 0x819D,0x6323,
-	/* Array index: 0x1424 */ 0x81A0,0x4E6F,
-	/* Array index: 0x1424 */ 0x81A3,0x7273,
-	/* Array index: 0x1424 */ 0x81A8,0x7833,
-	/* Array index: 0x1424 */ 0x81B3,0x604E,
-	/* Array index: 0x1424 */ 0x81B5,0x757D,
-	/* Array index: 0x1424 */ 0x81BA,0x6B6C,
-	/* Array index: 0x1424 */ 0x81C6,0x6566,
-	/* Array index: 0x1424 */ 0x81CD,0x7030,
-	/* Array index: 0x1424 */ 0x81D8,0x5544,
-	/* Array index: 0x1424 */ 0x81DF,0x6D74,
-	/* Array index: 0x1424 */ 0x81E3,0x636D,
-	/* Array index: 0x1424 */ 0x81E5,0x6842,
-	/* Array index: 0x1424 */ 0x81E7,0x6D75,
-	/* Array index: 0x1424 */ 0x81E8,0x577C,
-	/* Array index: 0x1424 */ 0x81EA,0x6D3B,
-	/* Array index: 0x1424 */ 0x81ED,0x762B,
-	/* Array index: 0x1424 */ 0x81F3,0x7238,
-	/* Array index: 0x1424 */ 0x81F4,0x7648,
-	/* Array index: 0x1424 */ 0x8205,0x4F40,
-	/* Array index: 0x1424 */ 0x8207,0x6628,
-	/* Array index: 0x1424 */ 0x8208,0x7D69,
-	/* Array index: 0x1424 */ 0x820A,0x4F41,
-	/* Array index: 0x1424 */ 0x820C,0x605F,
-	/* Array index: 0x1424 */ 0x820D,0x5E6C,
-	/* Array index: 0x1424 */ 0x8212,0x6022,
-	/* Array index: 0x1424 */ 0x8240,0x5D32,
-	/* Array index: 0x1424 */ 0x8245,0x6629,
-	/* Array index: 0x1424 */ 0x8247,0x6F73,
-	/* Array index: 0x1424 */ 0x8259,0x736D,
-	/* Array index: 0x1424 */ 0x8264,0x6B7A,
-	/* Array index: 0x1424 */ 0x8266,0x7966,
-	/* Array index: 0x1424 */ 0x8276,0x667D,
-	/* Array index: 0x1424 */ 0x8278,0x752C,
-	/* Array index: 0x1424 */ 0x827E,0x6475,
-	/* Array index: 0x1424 */ 0x828B,0x6963,
-	/* Array index: 0x1424 */ 0x828D,0x6D4B,
-	/* Array index: 0x1424 */ 0x828E,0x4F64,
-	/* Array index: 0x1424 */ 0x8292,0x5853,
-	/* Array index: 0x1424 */ 0x8299,0x5D33,
-	/* Array index: 0x1424 */ 0x829A,0x546C,
-	/* Array index: 0x1424 */ 0x829D,0x7239,
-	/* Array index: 0x1424 */ 0x829F,0x5F37,
-	/* Array index: 0x1424 */ 0x82A5,0x4B4E,
-	/* Array index: 0x1424 */ 0x82A6,0x7B58,
-	/* Array index: 0x1424 */ 0x82A9,0x5059,
-	/* Array index: 0x1424 */ 0x82DB,0x4A34,
-	/* Array index: 0x1424 */ 0x82DE,0x7862,
-	/* Array index: 0x1424 */ 0x82DF,0x4F42,
-	/* Array index: 0x1424 */ 0x82E1,0x6C3E,
-	/* Array index: 0x1424 */ 0x82F1,0x6748,
-	/* Array index: 0x1424 */ 0x8309,0x5849,
-	/* Array index: 0x1424 */ 0x8317,0x592B,
-	/* Array index: 0x1424 */ 0x8328,0x6D3C,
-	/* Array index: 0x1424 */ 0x832B,0x5854,
-	/* Array index: 0x1424 */ 0x832F,0x5C5A,
-	/* Array index: 0x1424 */ 0x8331,0x623C,
-	/* Array index: 0x1424 */ 0x8340,0x6270,
-	/* Array index: 0x1424 */ 0x8347,0x7A3B,
-	/* Array index: 0x1424 */ 0x8349,0x752E,
-	/* Array index: 0x1424 */ 0x834A,0x7B2A,
-	/* Array index: 0x1424 */ 0x834F,0x6C7B,
-	/* Array index: 0x1424 */ 0x8351,0x6C3F,
-	/* Array index: 0x1424 */ 0x8352,0x7C58,
-	/* Array index: 0x1424 */ 0x8373,0x5465,
-	/* Array index: 0x1424 */ 0x8377,0x7943,
-	/* Array index: 0x1424 */ 0x837B,0x6E62,
-	/* Array index: 0x1424 */ 0x8389,0x5769,
-	/* Array index: 0x1424 */ 0x838A,0x6D76,
-	/* Array index: 0x1424 */ 0x838E,0x5E6D,
-	/* Array index: 0x1424 */ 0x8396,0x4C6C,
-	/* Array index: 0x1424 */ 0x8398,0x636E,
-	/* Array index: 0x1424 */ 0x839E,0x6854,
-	/* Array index: 0x1424 */ 0x83A2,0x7A78,
-	/* Array index: 0x1424 */ 0x83BD,0x5855,
-	/* Array index: 0x1424 */ 0x83C1,0x746A,
-	/* Array index: 0x1424 */ 0x83C5,0x4E39,
-	/* Array index: 0x1424 */ 0x83C9,0x5661,
-	/* Array index: 0x1424 */ 0x83CA,0x4F52,
-	/* Array index: 0x1424 */ 0x83CC,0x5036,
-	/* Array index: 0x1424 */ 0x83D3,0x4E22,
-	/* Array index: 0x1424 */ 0x83D6,0x736E,
-	/* Array index: 0x1424 */ 0x83DC,0x7378,
-	/* Array index: 0x1424 */ 0x83E9,0x5C4C,
-	/* Array index: 0x1424 */ 0x83EB,0x504B,
-	/* Array index: 0x1424 */ 0x83F9,0x6E49,
-	/* Array index: 0x1424 */ 0x83FD,0x625D,
-	/* Array index: 0x1424 */ 0x8403,0x757E,
-	/* Array index: 0x1424 */ 0x8404,0x542C,
-	/* Array index: 0x1424 */ 0x8429,0x7557,
-	/* Array index: 0x1424 */ 0x842C,0x583F,
-	/* Array index: 0x1424 */ 0x8431,0x7D40,
-	/* Array index: 0x1424 */ 0x8438,0x6B2D,
-	/* Array index: 0x1424 */ 0x843D,0x552A,
-	/* Array index: 0x1424 */ 0x8449,0x6728,
-	/* Array index: 0x1424 */ 0x8457,0x6E4A,
-	/* Array index: 0x1424 */ 0x845B,0x4A67,
-	/* Array index: 0x1424 */ 0x8461,0x7863,
-	/* Array index: 0x1424 */ 0x8463,0x545D,
-	/* Array index: 0x1424 */ 0x8466,0x6A58,
-	/* Array index: 0x1424 */ 0x846B,0x7B59,
-	/* Array index: 0x1424 */ 0x846C,0x6D77,
-	/* Array index: 0x1424 */ 0x846F,0x6535,
-	/* Array index: 0x1424 */ 0x8475,0x502D,
-	/* Array index: 0x1424 */ 0x847A,0x7171,
-	/* Array index: 0x1424 */ 0x8490,0x623D,
-	/* Array index: 0x1424 */ 0x8494,0x6348,
-	/* Array index: 0x1424 */ 0x8499,0x5955,
-	/* Array index: 0x1424 */ 0x849C,0x5F2A,
-	/* Array index: 0x1424 */ 0x84A1,0x5B3C,
-	/* Array index: 0x1424 */ 0x84B2,0x7864,
-	/* Array index: 0x1424 */ 0x84B8,0x717A,
-	/* Array index: 0x1424 */ 0x84BB,0x6536,
-	/* Array index: 0x1424 */ 0x84BC,0x736F,
-	/* Array index: 0x1424 */ 0x84BF,0x7B5A,
-	/* Array index: 0x1424 */ 0x84C0,0x6160,
-	/* Array index: 0x1424 */ 0x84C2,0x592C,
-	/* Array index: 0x1424 */ 0x84C4,0x756B,
-	/* Array index: 0x1424 */ 0x84C6,0x6036,
-	/* Array index: 0x1424 */ 0x84C9,0x6948,
-	/* Array index: 0x1424 */ 0x84CB,0x4B4F,
-	/* Array index: 0x1424 */ 0x84CD,0x6349,
-	/* Array index: 0x1424 */ 0x84D1,0x5E6E,
-	/* Array index: 0x1424 */ 0x84DA,0x623E,
-	/* Array index: 0x1424 */ 0x84EC,0x5C6F,
-	/* Array index: 0x1424 */ 0x84EE,0x5625,
-	/* Array index: 0x1424 */ 0x84F4,0x6271,
-	/* Array index: 0x1424 */ 0x84FC,0x567E,
-	/* Array index: 0x1424 */ 0x8511,0x5921,
-	/* Array index: 0x1424 */ 0x8513,0x5840,
-	/* Array index: 0x1424 */ 0x8514,0x5C5B,
-	/* Array index: 0x1424 */ 0x8517,0x6D3D,
-	/* Array index: 0x1424 */ 0x8518,0x5F38,
-	/* Array index: 0x1424 */ 0x851A,0x6A25,
-	/* Array index: 0x1424 */ 0x851E,0x572D,
-	/* Array index: 0x1424 */ 0x8521,0x7379,
-	/* Array index: 0x1424 */ 0x8523,0x6D78,
-	/* Array index: 0x1424 */ 0x8525,0x7547,
-	/* Array index: 0x1424 */ 0x852C,0x614A,
-	/* Array index: 0x1424 */ 0x852D,0x6B63,
-	/* Array index: 0x1424 */ 0x852F,0x725E,
-	/* Array index: 0x1424 */ 0x853D,0x784C,
-	/* Array index: 0x1424 */ 0x853F,0x6A59,
-	/* Array index: 0x1424 */ 0x8541,0x5346,
-	/* Array index: 0x1424 */ 0x8543,0x5B66,
-	/* Array index: 0x1424 */ 0x8549,0x752F,
-	/* Array index: 0x1424 */ 0x854E,0x4E70,
-	/* Array index: 0x1424 */ 0x8553,0x697E,
-	/* Array index: 0x1424 */ 0x8559,0x7B36,
-	/* Array index: 0x1424 */ 0x8563,0x6272,
-	/* Array index: 0x1424 */ 0x856D,0x614B,
-	/* Array index: 0x1424 */ 0x8584,0x5A5D,
-	/* Array index: 0x1424 */ 0x8587,0x5A39,
-	/* Array index: 0x1424 */ 0x858F,0x6B7B,
-	/* Array index: 0x1424 */ 0x8591,0x4B39,
-	/* Array index: 0x1424 */ 0x8594,0x6D79,
-	/* Array index: 0x1424 */ 0x859B,0x6060,
-	/* Array index: 0x1424 */ 0x85AF,0x6023,
-	/* Array index: 0x1424 */ 0x85B0,0x7D39,
-	/* Array index: 0x1424 */ 0x85BA,0x7031,
-	/* Array index: 0x1424 */ 0x85C1,0x4D4B,
-	/* Array index: 0x1424 */ 0x85C9,0x6D3E,
-	/* Array index: 0x1424 */ 0x85D5,0x6964,
-	/* Array index: 0x1424 */ 0x85DC,0x556D,
-	/* Array index: 0x1424 */ 0x85DD,0x675D,
-	/* Array index: 0x1424 */ 0x85E4,0x5476,
-	/* Array index: 0x1424 */ 0x85E5,0x6537,
-	/* Array index: 0x1424 */ 0x85E9,0x5B67,
-	/* Array index: 0x1424 */ 0x85EA,0x623F,
-	/* Array index: 0x1424 */ 0x85F7,0x6E4B,
-	/* Array index: 0x1424 */ 0x85FA,0x5774,
-	/* Array index: 0x1424 */ 0x85FB,0x705D,
-	/* Array index: 0x1424 */ 0x85FF,0x4E2B,
-	/* Array index: 0x1424 */ 0x8602,0x675E,
-	/* Array index: 0x1424 */ 0x8606,0x5656,
-	/* Array index: 0x1424 */ 0x8607,0x614C,
-	/* Array index: 0x1424 */ 0x860A,0x6833,
-	/* Array index: 0x1424 */ 0x8616,0x656E,
-	/* Array index: 0x1424 */ 0x8617,0x5C22,
-	/* Array index: 0x1424 */ 0x861A,0x6050,
-	/* Array index: 0x1424 */ 0x862D,0x5535,
-	/* Array index: 0x1424 */ 0x863F,0x5521,
-	/* Array index: 0x1424 */ 0x864E,0x7B5B,
-	/* Array index: 0x1424 */ 0x8650,0x794B,
-	/* Array index: 0x1424 */ 0x8654,0x4B73,
-	/* Array index: 0x1424 */ 0x8655,0x7425,
-	/* Array index: 0x1424 */ 0x8667,0x7D50,
-	/* Array index: 0x1424 */ 0x8679,0x7B76,
-	/* Array index: 0x1424 */ 0x868A,0x5A25,
-	/* Array index: 0x1424 */ 0x868C,0x5B3D,
-	/* Array index: 0x1424 */ 0x8693,0x6C62,
-	/* Array index: 0x1424 */ 0x86A3,0x4D77,
-	/* Array index: 0x1424 */ 0x86A4,0x705E,
-	/* Array index: 0x1424 */ 0x86A9,0x7649,
-	/* Array index: 0x1424 */ 0x86C7,0x5E6F,
-	/* Array index: 0x1424 */ 0x86CB,0x5331,
-	/* Array index: 0x1424 */ 0x86D4,0x7C6E,
-	/* Array index: 0x1424 */ 0x86D9,0x6843,
-	/* Array index: 0x1424 */ 0x86DB,0x7148,
-	/* Array index: 0x1424 */ 0x86DF,0x4E71,
-	/* Array index: 0x1424 */ 0x86E4,0x796D,
-	/* Array index: 0x1424 */ 0x86ED,0x7274,
-	/* Array index: 0x1424 */ 0x86FE,0x6436,
-	/* Array index: 0x1424 */ 0x8700,0x7539,
-	/* Array index: 0x1424 */ 0x8702,0x5C70,
-	/* Array index: 0x1424 */ 0x8703,0x6371,
-	/* Array index: 0x1424 */ 0x8708,0x6825,
-	/* Array index: 0x1424 */ 0x8718,0x723B,
-	/* Array index: 0x1424 */ 0x871A,0x5E24,
-	/* Array index: 0x1424 */ 0x871C,0x5A4C,
-	/* Array index: 0x1424 */ 0x874E,0x4A69,
-	/* Array index: 0x1424 */ 0x8755,0x635A,
-	/* Array index: 0x1424 */ 0x8757,0x7C59,
-	/* Array index: 0x1424 */ 0x875F,0x6A5A,
-	/* Array index: 0x1424 */ 0x8766,0x7944,
-	/* Array index: 0x1424 */ 0x8768,0x6324,
-	/* Array index: 0x1424 */ 0x8774,0x7B5D,
-	/* Array index: 0x1424 */ 0x8776,0x6F4A,
-	/* Array index: 0x1424 */ 0x8778,0x6844,
-	/* Array index: 0x1424 */ 0x8782,0x554C,
-	/* Array index: 0x1424 */ 0x878D,0x6B57,
-	/* Array index: 0x1424 */ 0x879F,0x592D,
-	/* Array index: 0x1424 */ 0x87A2,0x7B2B,
-	/* Array index: 0x1424 */ 0x87B3,0x5359,
-	/* Array index: 0x1424 */ 0x87BA,0x5522,
-	/* Array index: 0x1424 */ 0x87C4,0x765E,
-	/* Array index: 0x1424 */ 0x87E0,0x5A76,
-	/* Array index: 0x1424 */ 0x87EC,0x6051,
-	/* Array index: 0x1424 */ 0x87EF,0x6928,
-	/* Array index: 0x1424 */ 0x87F2,0x7579,
-	/* Array index: 0x1424 */ 0x87F9,0x7A2F,
-	/* Array index: 0x1424 */ 0x87FB,0x6B7C,
-	/* Array index: 0x1424 */ 0x87FE,0x606A,
-	/* Array index: 0x1424 */ 0x8805,0x6332,
-	/* Array index: 0x1424 */ 0x881F,0x5545,
-	/* Array index: 0x1424 */ 0x8822,0x7163,
-	/* Array index: 0x1424 */ 0x8823,0x556E,
-	/* Array index: 0x1424 */ 0x8831,0x4D4C,
-	/* Array index: 0x1424 */ 0x8836,0x6D59,
-	/* Array index: 0x1424 */ 0x883B,0x5841,
-	/* Array index: 0x1424 */ 0x8840,0x7A6C,
-	/* Array index: 0x1424 */ 0x8846,0x716B,
-	/* Array index: 0x1424 */ 0x884C,0x7A3C,
-	/* Array index: 0x1424 */ 0x884D,0x6662,
-	/* Array index: 0x1424 */ 0x8852,0x7A65,
-	/* Array index: 0x1424 */ 0x8853,0x627A,
-	/* Array index: 0x1424 */ 0x8857,0x4A36,
-	/* Array index: 0x1424 */ 0x8859,0x6437,
-	/* Array index: 0x1424 */ 0x885B,0x6A5B,
-	/* Array index: 0x1424 */ 0x885D,0x757A,
-	/* Array index: 0x1424 */ 0x8868,0x787A,
-	/* Array index: 0x1424 */ 0x886B,0x5F39,
-	/* Array index: 0x1424 */ 0x8870,0x6171,
-	/* Array index: 0x1424 */ 0x8872,0x5224,
-	/* Array index: 0x1424 */ 0x8877,0x757B,
-	/* Array index: 0x1424 */ 0x8888,0x4A37,
-	/* Array index: 0x1424 */ 0x888B,0x5367,
-	/* Array index: 0x1424 */ 0x888D,0x7865,
-	/* Array index: 0x1424 */ 0x8892,0x5332,
-	/* Array index: 0x1424 */ 0x8896,0x6240,
-	/* Array index: 0x1424 */ 0x8897,0x725F,
-	/* Array index: 0x1424 */ 0x889E,0x4D65,
-	/* Array index: 0x1424 */ 0x88AB,0x792C,
-	/* Array index: 0x1424 */ 0x88B4,0x4D4D,
-	/* Array index: 0x1424 */ 0x88C1,0x6E2E,
-	/* Array index: 0x1424 */ 0x88C2,0x562E,
-	/* Array index: 0x1424 */ 0x88CF,0x576A,
-	/* Array index: 0x1424 */ 0x88D4,0x6760,
-	/* Array index: 0x1424 */ 0x88D5,0x6B2E,
-	/* Array index: 0x1424 */ 0x88D9,0x4F59,
-	/* Array index: 0x1424 */ 0x88DC,0x5C4D,
-	/* Array index: 0x1424 */ 0x88DD,0x6D7B,
-	/* Array index: 0x1424 */ 0x88DF,0x5E70,
-	/* Array index: 0x1424 */ 0x88E1,0x576B,
-	/* Array index: 0x1424 */ 0x88E8,0x5E25,
-	/* Array index: 0x1424 */ 0x88F8,0x5523,
-	/* Array index: 0x1424 */ 0x88FD,0x7032,
-	/* Array index: 0x1424 */ 0x8907,0x5C5C,
-	/* Array index: 0x1424 */ 0x8910,0x4A68,
-	/* Array index: 0x1424 */ 0x8912,0x7866,
-	/* Array index: 0x1424 */ 0x8913,0x5C4E,
-	/* Array index: 0x1424 */ 0x8918,0x6A5C,
-	/* Array index: 0x1424 */ 0x8919,0x5B52,
-	/* Array index: 0x1424 */ 0x8925,0x6933,
-	/* Array index: 0x1424 */ 0x892A,0x775B,
-	/* Array index: 0x1424 */ 0x8936,0x6328,
-	/* Array index: 0x1424 */ 0x8938,0x572E,
-	/* Array index: 0x1424 */ 0x893B,0x6061,
-	/* Array index: 0x1424 */ 0x8941,0x4B3A,
-	/* Array index: 0x1424 */ 0x8944,0x6551,
-	/* Array index: 0x1424 */ 0x895F,0x505C,
-	/* Array index: 0x1424 */ 0x8964,0x5541,
-	/* Array index: 0x1424 */ 0x896A,0x584A,
-	/* Array index: 0x1424 */ 0x8972,0x6329,
-	/* Array index: 0x1424 */ 0x897F,0x6024,
-	/* Array index: 0x1424 */ 0x8981,0x6929,
-	/* Array index: 0x1424 */ 0x8983,0x5347,
-	/* Array index: 0x1424 */ 0x8986,0x5C5D,
-	/* Array index: 0x1424 */ 0x8987,0x782E,
-	/* Array index: 0x1424 */ 0x898B,0x4C38,
-	/* Array index: 0x1424 */ 0x898F,0x502E,
-	/* Array index: 0x1424 */ 0x8993,0x5872,
-	/* Array index: 0x1424 */ 0x8996,0x634A,
-	/* Array index: 0x1424 */ 0x89A1,0x4C2F,
-	/* Array index: 0x1424 */ 0x89A9,0x542D,
-	/* Array index: 0x1424 */ 0x89AA,0x7651,
-	/* Array index: 0x1424 */ 0x89B2,0x504C,
-	/* Array index: 0x1424 */ 0x89BA,0x4A46,
-	/* Array index: 0x1424 */ 0x89BD,0x5542,
-	/* Array index: 0x1424 */ 0x89C0,0x4E3A,
-	/* Array index: 0x1424 */ 0x89D2,0x4A47,
-	/* Array index: 0x1424 */ 0x89E3,0x7A30,
-	/* Array index: 0x1424 */ 0x89F4,0x5F58,
-	/* Array index: 0x1424 */ 0x89F8,0x753A,
-	/* Array index: 0x1424 */ 0x8A00,0x656B,
-	/* Array index: 0x1424 */ 0x8A02,0x6F74,
-	/* Array index: 0x1424 */ 0x8A03,0x5D35,
-	/* Array index: 0x1424 */ 0x8A08,0x4D2A,
-	/* Array index: 0x1424 */ 0x8A0A,0x6372,
-	/* Array index: 0x1424 */ 0x8A0C,0x7B77,
-	/* Array index: 0x1424 */ 0x8A0E,0x7750,
-	/* Array index: 0x1424 */ 0x8A13,0x7D3A,
-	/* Array index: 0x1424 */ 0x8A1B,0x6845,
-	/* Array index: 0x1424 */ 0x8A1D,0x6438,
-	/* Array index: 0x1424 */ 0x8A1F,0x6168,
-	/* Array index: 0x1424 */ 0x8A23,0x4C41,
-	/* Array index: 0x1424 */ 0x8A25,0x526D,
-	/* Array index: 0x1424 */ 0x8A2A,0x5B3E,
-	/* Array index: 0x1424 */ 0x8A2D,0x6062,
-	/* Array index: 0x1424 */ 0x8A31,0x7A49,
-	/* Array index: 0x1424 */ 0x8A34,0x614D,
-	/* Array index: 0x1424 */ 0x8A36,0x4A38,
-	/* Array index: 0x1424 */ 0x8A3A,0x7260,
-	/* Array index: 0x1424 */ 0x8A3B,0x7149,
-	/* Array index: 0x1424 */ 0x8A50,0x5E71,
-	/* Array index: 0x1424 */ 0x8A54,0x705F,
-	/* Array index: 0x1424 */ 0x8A55,0x7844,
-	/* Array index: 0x1424 */ 0x8A5B,0x6E4C,
-	/* Array index: 0x1424 */ 0x8A5E,0x5E72,
-	/* Array index: 0x1424 */ 0x8A60,0x6749,
-	/* Array index: 0x1424 */ 0x8A62,0x6273,
-	/* Array index: 0x1424 */ 0x8A63,0x6761,
-	/* Array index: 0x1424 */ 0x8A66,0x634B,
-	/* Array index: 0x1424 */ 0x8A69,0x634C,
-	/* Array index: 0x1424 */ 0x8A79,0x745A,
-	/* Array index: 0x1424 */ 0x8A85,0x714A,
-	/* Array index: 0x1424 */ 0x8A87,0x4E23,
-	/* Array index: 0x1424 */ 0x8A8C,0x723C,
-	/* Array index: 0x1424 */ 0x8A8D,0x6C63,
-	/* Array index: 0x1424 */ 0x8A93,0x6025,
-	/* Array index: 0x1424 */ 0x8A95,0x772B,
-	/* Array index: 0x1424 */ 0x8A98,0x6B2F,
-	/* Array index: 0x1424 */ 0x8A9E,0x655E,
-	/* Array index: 0x1424 */ 0x8AB0,0x6241,
-	/* Array index: 0x1424 */ 0x8AB2,0x4E24,
-	/* Array index: 0x1424 */ 0x8AB9,0x5E26,
-	/* Array index: 0x1424 */ 0x8ABC,0x6B7E,
-	/* Array index: 0x1424 */ 0x8ABE,0x6B5D,
-	/* Array index: 0x1424 */ 0x8ABF,0x7060,
-	/* Array index: 0x1424 */ 0x8AC2,0x745B,
-	/* Array index: 0x1424 */ 0x8AC4,0x6274,
-	/* Array index: 0x1424 */ 0x8AC7,0x5348,
-	/* Array index: 0x1424 */ 0x8ACB,0x746B,
-	/* Array index: 0x1424 */ 0x8ACD,0x6E35,
-	/* Array index: 0x1424 */ 0x8ACF,0x7558,
-	/* Array index: 0x1424 */ 0x8AD2,0x555F,
-	/* Array index: 0x1424 */ 0x8AD6,0x5665,
-	/* Array index: 0x1424 */ 0x8ADB,0x6B30,
-	/* Array index: 0x1424 */ 0x8ADC,0x7463,
-	/* Array index: 0x1424 */ 0x8AE1,0x634D,
-	/* Array index: 0x1424 */ 0x8AE6,0x7474,
-	/* Array index: 0x1424 */ 0x8AE7,0x7A32,
-	/* Array index: 0x1424 */ 0x8AF1,0x7D49,
-	/* Array index: 0x1424 */ 0x8B0E,0x5A3A,
-	/* Array index: 0x1424 */ 0x8B10,0x5A4D,
-	/* Array index: 0x1424 */ 0x8B14,0x794C,
-	/* Array index: 0x1424 */ 0x8B20,0x692A,
-	/* Array index: 0x1424 */ 0x8B28,0x5948,
-	/* Array index: 0x1424 */ 0x8B2B,0x6E63,
-	/* Array index: 0x1424 */ 0x8B2C,0x573D,
-	/* Array index: 0x1424 */ 0x8B33,0x4F44,
-	/* Array index: 0x1424 */ 0x8B39,0x504D,
-	/* Array index: 0x1424 */ 0x8B41,0x7C26,
-	/* Array index: 0x1424 */ 0x8B49,0x717B,
-	/* Array index: 0x1424 */ 0x8B4E,0x7D52,
-	/* Array index: 0x1424 */ 0x8B4F,0x5141,
-	/* Array index: 0x1424 */ 0x8B58,0x635B,
-	/* Array index: 0x1424 */ 0x8B5A,0x5349,
-	/* Array index: 0x1424 */ 0x8B5C,0x5C4F,
-	/* Array index: 0x1424 */ 0x8B66,0x4C6D,
-	/* Array index: 0x1424 */ 0x8B6C,0x5E27,
-	/* Array index: 0x1424 */ 0x8B6F,0x663B,
-	/* Array index: 0x1424 */ 0x8B70,0x6C21,
-	/* Array index: 0x1424 */ 0x8B74,0x4C39,
-	/* Array index: 0x1424 */ 0x8B77,0x7B5E,
-	/* Array index: 0x1424 */ 0x8B7D,0x6762,
-	/* Array index: 0x1424 */ 0x8B80,0x5441,
-	/* Array index: 0x1424 */ 0x8B8A,0x5C28,
-	/* Array index: 0x1424 */ 0x8B90,0x6242,
-	/* Array index: 0x1424 */ 0x8B92,0x7358,
-	/* Array index: 0x1424 */ 0x8B93,0x6553,
-	/* Array index: 0x1424 */ 0x8B96,0x7359,
-	/* Array index: 0x1424 */ 0x8B9A,0x7346,
-	/* Array index: 0x1424 */ 0x8C37,0x4D5B,
-	/* Array index: 0x1424 */ 0x8C3F,0x4D2C,
-	/* Array index: 0x1424 */ 0x8C41,0x7C43,
-	/* Array index: 0x1424 */ 0x8C46,0x5467,
-	/* Array index: 0x1424 */ 0x8C48,0x5142,
-	/* Array index: 0x1424 */ 0x8C4A,0x7925,
-	/* Array index: 0x1424 */ 0x8C4C,0x6855,
-	/* Array index: 0x1424 */ 0x8C55,0x634E,
-	/* Array index: 0x1424 */ 0x8C5A,0x544A,
-	/* Array index: 0x1424 */ 0x8C61,0x5F5A,
-	/* Array index: 0x1424 */ 0x8C6A,0x7B5F,
-	/* Array index: 0x1424 */ 0x8C6B,0x6763,
-	/* Array index: 0x1424 */ 0x8C79,0x787B,
-	/* Array index: 0x1424 */ 0x8C7A,0x634F,
-	/* Array index: 0x1424 */ 0x8C82,0x7530,
-	/* Array index: 0x1424 */ 0x8C8A,0x5867,
-	/* Array index: 0x1424 */ 0x8C8C,0x5949,
-	/* Array index: 0x1424 */ 0x8CD1,0x7261,
-	/* Array index: 0x1424 */ 0x8CD3,0x5E39,
-	/* Array index: 0x1424 */ 0x8CDA,0x5672,
-	/* Array index: 0x1424 */ 0x8CDC,0x5E74,
-	/* Array index: 0x1424 */ 0x8CDE,0x5F5B,
-	/* Array index: 0x1424 */ 0x8CEA,0x7275,
-	/* Array index: 0x1424 */ 0x8CED,0x542E,
-	/* Array index: 0x1424 */ 0x8CF4,0x5673,
-	/* Array index: 0x1424 */ 0x8D0D,0x606B,
-	/* Array index: 0x1424 */ 0x8D13,0x6D7C,
-	/* Array index: 0x1424 */ 0x8D16,0x615B,
-	/* Array index: 0x1424 */ 0x8D64,0x6E65,
-	/* Array index: 0x1424 */ 0x8D66,0x5E75,
-	/* Array index: 0x1424 */ 0x8D6B,0x7A53,
-	/* Array index: 0x1424 */ 0x8D70,0x714B,
-	/* Array index: 0x1424 */ 0x8D73,0x502F,
-	/* Array index: 0x1424 */ 0x8D74,0x5D39,
-	/* Array index: 0x1424 */ 0x8D77,0x5143,
-	/* Array index: 0x1424 */ 0x8D85,0x7531,
-	/* Array index: 0x1424 */ 0x8D8A,0x6A46,
-	/* Array index: 0x1424 */ 0x8D99,0x7061,
-	/* Array index: 0x1424 */ 0x8DA3,0x762C,
-	/* Array index: 0x1424 */ 0x8DA8,0x7559,
-	/* Array index: 0x1424 */ 0x8DB3,0x706B,
-	/* Array index: 0x1424 */ 0x8DBA,0x5D3A,
-	/* Array index: 0x1424 */ 0x8DBE,0x723F,
-	/* Array index: 0x1424 */ 0x8DC6,0x7745,
-	/* Array index: 0x1424 */ 0x8DCB,0x5B22,
-	/* Array index: 0x1424 */ 0x8DCC,0x7276,
-	/* Array index: 0x1424 */ 0x8DCF,0x4A3A,
-	/* Array index: 0x1424 */ 0x8DDB,0x7775,
-	/* Array index: 0x1424 */ 0x8DDD,0x4B65,
-	/* Array index: 0x1424 */ 0x8DE1,0x6E66,
-	/* Array index: 0x1424 */ 0x8DE3,0x6053,
-	/* Array index: 0x1424 */ 0x8DE8,0x4E25,
-	/* Array index: 0x1424 */ 0x8DEF,0x5658,
-	/* Array index: 0x1424 */ 0x8DF3,0x542F,
-	/* Array index: 0x1424 */ 0x8E0A,0x6949,
-	/* Array index: 0x1424 */ 0x8E0F,0x534E,
-	/* Array index: 0x1424 */ 0x8E10,0x7442,
-	/* Array index: 0x1424 */ 0x8E1E,0x4B66,
-	/* Array index: 0x1424 */ 0x8E2A,0x7121,
-	/* Array index: 0x1424 */ 0x8E30,0x6B32,
-	/* Array index: 0x1424 */ 0x8E35,0x7122,
-	/* Array index: 0x1424 */ 0x8E42,0x6B33,
-	/* Array index: 0x1424 */ 0x8E44,0x7034,
-	/* Array index: 0x1424 */ 0x8E59,0x756C,
-	/* Array index: 0x1424 */ 0x8E5F,0x6E67,
-	/* Array index: 0x1424 */ 0x8E60,0x7432,
-	/* Array index: 0x1424 */ 0x8E74,0x756D,
-	/* Array index: 0x1424 */ 0x8E76,0x4F73,
-	/* Array index: 0x1424 */ 0x8E81,0x7062,
-	/* Array index: 0x1424 */ 0x8E87,0x6E4E,
-	/* Array index: 0x1424 */ 0x8E8A,0x714C,
-	/* Array index: 0x1424 */ 0x8E8D,0x6538,
-	/* Array index: 0x1424 */ 0x8EC0,0x4F46,
-	/* Array index: 0x1424 */ 0x8ED2,0x7A4D,
-	/* Array index: 0x1424 */ 0x8EDF,0x6663,
-	/* Array index: 0x1424 */ 0x8EEB,0x7262,
-	/* Array index: 0x1424 */ 0x8EF8,0x756E,
-	/* Array index: 0x1424 */ 0x8EFB,0x4A3B,
-	/* Array index: 0x1424 */ 0x8EFE,0x635C,
-	/* Array index: 0x1424 */ 0x8F03,0x4E72,
-	/* Array index: 0x1424 */ 0x8F05,0x5659,
-	/* Array index: 0x1424 */ 0x8F09,0x6E30,
-	/* Array index: 0x1424 */ 0x8F2F,0x727E,
-	/* Array index: 0x1424 */ 0x8F33,0x714D,
-	/* Array index: 0x1424 */ 0x8F38,0x6243,
-	/* Array index: 0x1424 */ 0x8F39,0x5C5E,
-	/* Array index: 0x1424 */ 0x8F3B,0x5C5F,
-	/* Array index: 0x1424 */ 0x8F3E,0x6F2D,
-	/* Array index: 0x1424 */ 0x8F3F,0x662B,
-	/* Array index: 0x1424 */ 0x8F44,0x795D,
-	/* Array index: 0x1424 */ 0x8F45,0x6A3F,
-	/* Array index: 0x1424 */ 0x8F49,0x6F2E,
-	/* Array index: 0x1424 */ 0x8F4D,0x7450,
-	/* Array index: 0x1424 */ 0x8F4E,0x4E73,
-	/* Array index: 0x1424 */ 0x8F5D,0x662C,
-	/* Array index: 0x1424 */ 0x8F5F,0x4E5E,
-	/* Array index: 0x1424 */ 0x8F62,0x5579,
-	/* Array index: 0x1424 */ 0x8F9B,0x6374,
-	/* Array index: 0x1424 */ 0x8F9C,0x4D50,
-	/* Array index: 0x1424 */ 0x8FA3,0x5538,
-	/* Array index: 0x1424 */ 0x8FA6,0x777D,
-	/* Array index: 0x1424 */ 0x8FA8,0x5C29,
-	/* Array index: 0x1424 */ 0x8FC2,0x6966,
-	/* Array index: 0x1424 */ 0x8FC5,0x6376,
-	/* Array index: 0x1424 */ 0x8FCE,0x674A,
-	/* Array index: 0x1424 */ 0x8FD1,0x504E,
-	/* Array index: 0x1424 */ 0x8FD4,0x5A77,
-	/* Array index: 0x1424 */ 0x8FE6,0x4A3C,
-	/* Array index: 0x1424 */ 0x8FEA,0x6E68,
-	/* Array index: 0x1424 */ 0x8FEB,0x5A5E,
-	/* Array index: 0x1424 */ 0x8FED,0x7277,
-	/* Array index: 0x1424 */ 0x8FF0,0x627B,
-	/* Array index: 0x1424 */ 0x8FF2,0x4C26,
-	/* Array index: 0x1424 */ 0x8FF7,0x5A3B,
-	/* Array index: 0x1424 */ 0x8FF9,0x6E69,
-	/* Array index: 0x1424 */ 0x8FFD,0x755A,
-	/* Array index: 0x1424 */ 0x900B,0x7867,
-	/* Array index: 0x1424 */ 0x902E,0x7475,
-	/* Array index: 0x1424 */ 0x9031,0x714E,
-	/* Array index: 0x1424 */ 0x9032,0x7264,
-	/* Array index: 0x1424 */ 0x9035,0x5030,
-	/* Array index: 0x1424 */ 0x9038,0x6C6F,
-	/* Array index: 0x1424 */ 0x903C,0x793A,
-	/* Array index: 0x1424 */ 0x903E,0x6B35,
-	/* Array index: 0x1424 */ 0x9041,0x546D,
-	/* Array index: 0x1424 */ 0x9042,0x6244,
-	/* Array index: 0x1424 */ 0x9047,0x6967,
-	/* Array index: 0x1424 */ 0x9059,0x692B,
-	/* Array index: 0x1424 */ 0x9069,0x6E6A,
-	/* Array index: 0x1424 */ 0x9072,0x7240,
-	/* Array index: 0x1424 */ 0x9075,0x7165,
-	/* Array index: 0x1424 */ 0x9077,0x7443,
-	/* Array index: 0x1424 */ 0x9078,0x6054,
-	/* Array index: 0x1424 */ 0x907A,0x6B36,
-	/* Array index: 0x1424 */ 0x908F,0x5524,
-	/* Array index: 0x1424 */ 0x9091,0x6B69,
-	/* Array index: 0x1424 */ 0x9095,0x683B,
-	/* Array index: 0x1424 */ 0x9099,0x5857,
-	/* Array index: 0x1424 */ 0x90A2,0x7B2E,
-	/* Array index: 0x1424 */ 0x90A3,0x5161,
-	/* Array index: 0x1424 */ 0x90A6,0x5B40,
-	/* Array index: 0x1424 */ 0x90A8,0x753E,
-	/* Array index: 0x1424 */ 0x90AA,0x5E77,
-	/* Array index: 0x1424 */ 0x90B5,0x6150,
-	/* Array index: 0x1424 */ 0x90B8,0x6E50,
-	/* Array index: 0x1424 */ 0x90C1,0x6974,
-	/* Array index: 0x1424 */ 0x90CA,0x4E74,
-	/* Array index: 0x1424 */ 0x90DE,0x554D,
-	/* Array index: 0x1424 */ 0x90E1,0x4F5B,
-	/* Array index: 0x1424 */ 0x90E8,0x5D3B,
-	/* Array index: 0x1424 */ 0x90ED,0x4E2C,
-	/* Array index: 0x1424 */ 0x90F5,0x6968,
-	/* Array index: 0x1424 */ 0x90FD,0x5434,
-	/* Array index: 0x1424 */ 0x9102,0x6447,
-	/* Array index: 0x1424 */ 0x9112,0x755B,
-	/* Array index: 0x1424 */ 0x9115,0x7A41,
-	/* Array index: 0x1424 */ 0x9119,0x5E29,
-	/* Array index: 0x1424 */ 0x9127,0x5478,
-	/* Array index: 0x1424 */ 0x912D,0x6F77,
-	/* Array index: 0x1424 */ 0x9132,0x5333,
-	/* Array index: 0x1424 */ 0x9152,0x7150,
-	/* Array index: 0x1424 */ 0x9162,0x7532,
-	/* Array index: 0x1424 */ 0x9169,0x592E,
-	/* Array index: 0x1424 */ 0x916A,0x552C,
-	/* Array index: 0x1424 */ 0x916C,0x6246,
-	/* Array index: 0x1424 */ 0x9175,0x7D23,
-	/* Array index: 0x1424 */ 0x9177,0x7B65,
-	/* Array index: 0x1424 */ 0x9178,0x5F2B,
-	/* Array index: 0x1424 */ 0x9187,0x6275,
-	/* Array index: 0x1424 */ 0x9189,0x762D,
-	/* Array index: 0x1424 */ 0x918B,0x7533,
-	/* Array index: 0x1424 */ 0x918D,0x7035,
-	/* Array index: 0x1424 */ 0x9192,0x6125,
-	/* Array index: 0x1424 */ 0x919C,0x755D,
-	/* Array index: 0x1424 */ 0x91C0,0x6554,
-	/* Array index: 0x1424 */ 0x91C7,0x737A,
-	/* Array index: 0x1424 */ 0x91D7,0x6172,
-	/* Array index: 0x1424 */ 0x91D8,0x6F79,
-	/* Array index: 0x1424 */ 0x91DC,0x5D3C,
-	/* Array index: 0x1424 */ 0x91DD,0x765C,
-	/* Array index: 0x1424 */ 0x91E3,0x7065,
-	/* Array index: 0x1424 */ 0x91E7,0x7444,
-	/* Array index: 0x1424 */ 0x91EA,0x6969,
-	/* Array index: 0x1424 */ 0x91F5,0x737B,
-	/* Array index: 0x1424 */ 0x920D,0x546F,
-	/* Array index: 0x1424 */ 0x9217,0x6B4D,
-	/* Array index: 0x1424 */ 0x921E,0x5037,
-	/* Array index: 0x1424 */ 0x9234,0x5642,
-	/* Array index: 0x1424 */ 0x923A,0x682D,
-	/* Array index: 0x1424 */ 0x923F,0x6F2F,
-	/* Array index: 0x1424 */ 0x9240,0x4B25,
-	/* Array index: 0x1424 */ 0x9245,0x4B69,
-	/* Array index: 0x1424 */ 0x9249,0x7A68,
-	/* Array index: 0x1424 */ 0x9257,0x4C46,
-	/* Array index: 0x1424 */ 0x925B,0x6667,
-	/* Array index: 0x1424 */ 0x925E,0x6A47,
-	/* Array index: 0x1424 */ 0x9280,0x6B5E,
-	/* Array index: 0x1424 */ 0x9283,0x7548,
-	/* Array index: 0x1424 */ 0x9285,0x545E,
-	/* Array index: 0x1424 */ 0x9291,0x6055,
-	/* Array index: 0x1424 */ 0x9293,0x6F30,
-	/* Array index: 0x1424 */ 0x9296,0x6247,
-	/* Array index: 0x1424 */ 0x9298,0x592F,
-	/* Array index: 0x1424 */ 0x929C,0x7967,
-	/* Array index: 0x1424 */ 0x92B3,0x6765,
-	/* Array index: 0x1424 */ 0x92B6,0x4F4A,
-	/* Array index: 0x1424 */ 0x92B7,0x6151,
-	/* Array index: 0x1424 */ 0x92B9,0x6248,
-	/* Array index: 0x1424 */ 0x92CC,0x6F7B,
-	/* Array index: 0x1424 */ 0x92CF,0x7A79,
-	/* Array index: 0x1424 */ 0x92D2,0x5C72,
-	/* Array index: 0x1424 */ 0x92E4,0x6027,
-	/* Array index: 0x1424 */ 0x92EA,0x7868,
-	/* Array index: 0x1424 */ 0x92F8,0x4B6A,
-	/* Array index: 0x1424 */ 0x92FC,0x4B3C,
-	/* Array index: 0x1424 */ 0x9304,0x5662,
-	/* Array index: 0x1424 */ 0x9310,0x755E,
-	/* Array index: 0x1424 */ 0x9318,0x755F,
-	/* Array index: 0x1424 */ 0x931A,0x6E36,
-	/* Array index: 0x1424 */ 0x932B,0x6038,
-	/* Array index: 0x1424 */ 0x932E,0x4D51,
-	/* Array index: 0x1424 */ 0x932F,0x7339,
-	/* Array index: 0x1424 */ 0x9348,0x674C,
-	/* Array index: 0x1424 */ 0x934A,0x5628,
-	/* Array index: 0x1424 */ 0x934B,0x4E27,
-	/* Array index: 0x1424 */ 0x934D,0x5435,
-	/* Array index: 0x1424 */ 0x9354,0x6448,
-	/* Array index: 0x1424 */ 0x935B,0x5334,
-	/* Array index: 0x1424 */ 0x936E,0x6B39,
-	/* Array index: 0x1424 */ 0x9375,0x4B75,
-	/* Array index: 0x1424 */ 0x937C,0x765D,
-	/* Array index: 0x1424 */ 0x937E,0x7123,
-	/* Array index: 0x1424 */ 0x938C,0x4C47,
-	/* Array index: 0x1424 */ 0x9394,0x694A,
-	/* Array index: 0x1424 */ 0x9396,0x6170,
-	/* Array index: 0x1424 */ 0x939A,0x7560,
-	/* Array index: 0x1424 */ 0x93A3,0x7B2F,
-	/* Array index: 0x1424 */ 0x93A7,0x4B51,
-	/* Array index: 0x1424 */ 0x93AC,0x7B60,
-	/* Array index: 0x1424 */ 0x93AD,0x7265,
-	/* Array index: 0x1424 */ 0x93B0,0x6C70,
-	/* Array index: 0x1424 */ 0x93C3,0x706C,
-	/* Array index: 0x1424 */ 0x93D1,0x6E6B,
-	/* Array index: 0x1424 */ 0x93DE,0x694B,
-	/* Array index: 0x1424 */ 0x93E1,0x4C70,
-	/* Array index: 0x1424 */ 0x93E4,0x572F,
-	/* Array index: 0x1424 */ 0x93F6,0x7321,
-	/* Array index: 0x1424 */ 0x9404,0x7C75,
-	/* Array index: 0x1424 */ 0x9418,0x7124,
-	/* Array index: 0x1424 */ 0x9425,0x6056,
-	/* Array index: 0x1424 */ 0x942B,0x6F32,
-	/* Array index: 0x1424 */ 0x9435,0x7451,
-	/* Array index: 0x1424 */ 0x9438,0x7721,
-	/* Array index: 0x1424 */ 0x9444,0x7151,
-	/* Array index: 0x1424 */ 0x9451,0x4A7C,
-	/* Array index: 0x1424 */ 0x9452,0x4A7D,
-	/* Array index: 0x1424 */ 0x945B,0x4E4E,
-	/* Array index: 0x1424 */ 0x947D,0x7348,
-	/* Array index: 0x1424 */ 0x947F,0x733A,
-	/* Array index: 0x1424 */ 0x9577,0x6D7E,
-	/* Array index: 0x1424 */ 0x9580,0x5A26,
-	/* Array index: 0x1424 */ 0x9583,0x606C,
-	/* Array index: 0x1424 */ 0x9589,0x784D,
-	/* Array index: 0x1424 */ 0x958B,0x4B52,
-	/* Array index: 0x1424 */ 0x9598,0x4B26,
-	/* Array index: 0x1424 */ 0x95A8,0x5031,
-	/* Array index: 0x1424 */ 0x95AD,0x556F,
-	/* Array index: 0x1424 */ 0x95B1,0x6673,
-	/* Array index: 0x1424 */ 0x95BB,0x6722,
-	/* Array index: 0x1424 */ 0x95BC,0x6459,
-	/* Array index: 0x1424 */ 0x95C7,0x6461,
-	/* Array index: 0x1424 */ 0x95CA,0x7C44,
-	/* Array index: 0x1424 */ 0x95DC,0x4E3C,
-	/* Array index: 0x1424 */ 0x95E1,0x7445,
-	/* Array index: 0x1424 */ 0x95E2,0x5C23,
-	/* Array index: 0x1424 */ 0x961C,0x5D3D,
-	/* Array index: 0x1424 */ 0x9621,0x7446,
-	/* Array index: 0x1424 */ 0x962A,0x7821,
-	/* Array index: 0x1424 */ 0x962E,0x6856,
-	/* Array index: 0x1424 */ 0x9632,0x5B41,
-	/* Array index: 0x1424 */ 0x963B,0x7066,
-	/* Array index: 0x1424 */ 0x963F,0x6439,
-	/* Array index: 0x1424 */ 0x9640,0x766D,
-	/* Array index: 0x1424 */ 0x9642,0x792E,
-	/* Array index: 0x1424 */ 0x9644,0x5D3E,
-	/* Array index: 0x1424 */ 0x9650,0x795A,
-	/* Array index: 0x1424 */ 0x966A,0x5B56,
-	/* Array index: 0x1424 */ 0x9670,0x6B64,
-	/* Array index: 0x1424 */ 0x967D,0x6555,
-	/* Array index: 0x1424 */ 0x9685,0x696A,
-	/* Array index: 0x1424 */ 0x9686,0x574C,
-	/* Array index: 0x1424 */ 0x9694,0x4C30,
-	/* Array index: 0x1424 */ 0x9695,0x6A22,
-	/* Array index: 0x1424 */ 0x96A3,0x5776,
-	/* Array index: 0x1424 */ 0x96A7,0x624A,
-	/* Array index: 0x1424 */ 0x96A8,0x624B,
-	/* Array index: 0x1424 */ 0x96AA,0x7A4F,
-	/* Array index: 0x1424 */ 0x96B1,0x6B5F,
-	/* Array index: 0x1424 */ 0x96B7,0x564B,
-	/* Array index: 0x1424 */ 0x96BB,0x7434,
-	/* Array index: 0x1424 */ 0x96D5,0x7067,
-	/* Array index: 0x1424 */ 0x96D6,0x624C,
-	/* Array index: 0x1424 */ 0x96D9,0x642A,
-	/* Array index: 0x1424 */ 0x96DB,0x7561,
-	/* Array index: 0x1424 */ 0x96DC,0x6D5A,
-	/* Array index: 0x1424 */ 0x96E2,0x576E,
-	/* Array index: 0x1424 */ 0x96E3,0x5171,
-	/* Array index: 0x1424 */ 0x96EF,0x5A27,
-	/* Array index: 0x1424 */ 0x96F0,0x5D54,
-	/* Array index: 0x1424 */ 0x96F2,0x6A23,
-	/* Array index: 0x1424 */ 0x96F6,0x5643,
-	/* Array index: 0x1424 */ 0x96F7,0x5674,
-	/* Array index: 0x1424 */ 0x96F9,0x5A5F,
-	/* Array index: 0x1424 */ 0x96FB,0x6F33,
-	/* Array index: 0x1424 */ 0x9700,0x624D,
-	/* Array index: 0x1424 */ 0x9706,0x6F7D,
-	/* Array index: 0x1424 */ 0x9707,0x7268,
-	/* Array index: 0x1424 */ 0x9711,0x6F45,
-	/* Array index: 0x1424 */ 0x9713,0x6767,
-	/* Array index: 0x1424 */ 0x9716,0x577D,
-	/* Array index: 0x1424 */ 0x9719,0x674E,
-	/* Array index: 0x1424 */ 0x971C,0x5F5C,
-	/* Array index: 0x1424 */ 0x971E,0x7947,
-	/* Array index: 0x1424 */ 0x9727,0x5976,
-	/* Array index: 0x1424 */ 0x9730,0x5F2C,
-	/* Array index: 0x1424 */ 0x9732,0x565A,
-	/* Array index: 0x1424 */ 0x9739,0x5C24,
-	/* Array index: 0x1424 */ 0x973D,0x7038,
-	/* Array index: 0x1424 */ 0x9742,0x557A,
-	/* Array index: 0x1424 */ 0x9744,0x6477,
-	/* Array index: 0x1424 */ 0x9748,0x5644,
-	/* Array index: 0x1424 */ 0x9751,0x746C,
-	/* Array index: 0x1424 */ 0x9756,0x6F7E,
-	/* Array index: 0x1424 */ 0x975C,0x7021,
-	/* Array index: 0x1424 */ 0x975E,0x5E2A,
-	/* Array index: 0x1424 */ 0x9761,0x5A3C,
-	/* Array index: 0x1424 */ 0x9762,0x587C,
-	/* Array index: 0x1424 */ 0x9769,0x7A54,
-	/* Array index: 0x1424 */ 0x976D,0x6C65,
-	/* Array index: 0x1424 */ 0x9774,0x7C28,
-	/* Array index: 0x1424 */ 0x9777,0x6C66,
-	/* Array index: 0x1424 */ 0x977A,0x584B,
-	/* Array index: 0x1424 */ 0x978B,0x7B39,
-	/* Array index: 0x1424 */ 0x978D,0x6453,
-	/* Array index: 0x1424 */ 0x978F,0x4D79,
-	/* Array index: 0x1424 */ 0x97A0,0x4F53,
-	/* Array index: 0x1424 */ 0x97A8,0x4A6A,
-	/* Array index: 0x1424 */ 0x97AB,0x4F54,
-	/* Array index: 0x1424 */ 0x97AD,0x783D,
-	/* Array index: 0x1424 */ 0x97C6,0x7447,
-	/* Array index: 0x1424 */ 0x97CB,0x6A5F,
-	/* Array index: 0x1424 */ 0x97D3,0x795B,
-	/* Array index: 0x1424 */ 0x97DC,0x5437,
-	/* Array index: 0x1424 */ 0x97F3,0x6B65,
-	/* Array index: 0x1424 */ 0x97F6,0x6152,
-	/* Array index: 0x1424 */ 0x97FB,0x6A24,
-	/* Array index: 0x1424 */ 0x9817,0x7776,
-	/* Array index: 0x1424 */ 0x9818,0x5645,
-	/* Array index: 0x1424 */ 0x982D,0x5469,
-	/* Array index: 0x1424 */ 0x9830,0x7A7A,
-	/* Array index: 0x1424 */ 0x9838,0x4C72,
-	/* Array index: 0x1424 */ 0x9839,0x775D,
-	/* Array index: 0x1424 */ 0x983B,0x5E3A,
-	/* Array index: 0x1424 */ 0x9846,0x4E28,
-	/* Array index: 0x1424 */ 0x9854,0x6454,
-	/* Array index: 0x1424 */ 0x9858,0x6A43,
-	/* Array index: 0x1424 */ 0x985A,0x6F34,
-	/* Array index: 0x1424 */ 0x985E,0x573E,
-	/* Array index: 0x1424 */ 0x9865,0x7B62,
-	/* Array index: 0x1424 */ 0x9867,0x4D53,
-	/* Array index: 0x1424 */ 0x986B,0x6F35,
-	/* Array index: 0x1424 */ 0x986F,0x7A69,
-	/* Array index: 0x1424 */ 0x98A8,0x7926,
-	/* Array index: 0x1424 */ 0x98AF,0x5F3D,
-	/* Array index: 0x1424 */ 0x98B1,0x7747,
-	/* Array index: 0x1424 */ 0x98C4,0x787D,
-	/* Array index: 0x1424 */ 0x98C7,0x787C,
-	/* Array index: 0x1424 */ 0x98DB,0x5E2B,
-	/* Array index: 0x1424 */ 0x98DC,0x5B68,
-	/* Array index: 0x1424 */ 0x98DF,0x635D,
-	/* Array index: 0x1424 */ 0x98E1,0x6162,
-	/* Array index: 0x1424 */ 0x98E2,0x5146,
-	/* Array index: 0x1424 */ 0x98F4,0x6C47,
-	/* Array index: 0x1424 */ 0x9903,0x4E75,
-	/* Array index: 0x1424 */ 0x9909,0x7A43,
-	/* Array index: 0x1424 */ 0x990A,0x6557,
-	/* Array index: 0x1424 */ 0x990C,0x6C48,
-	/* Array index: 0x1424 */ 0x9910,0x7349,
-	/* Array index: 0x1424 */ 0x9913,0x643B,
-	/* Array index: 0x1424 */ 0x9918,0x662E,
-	/* Array index: 0x1424 */ 0x991E,0x6F36,
-	/* Array index: 0x1424 */ 0x9920,0x5C3F,
-	/* Array index: 0x1424 */ 0x9928,0x4E3D,
-	/* Array index: 0x1424 */ 0x9945,0x5843,
-	/* Array index: 0x1424 */ 0x9951,0x5147,
-	/* Array index: 0x1424 */ 0x9952,0x692E,
-	/* Array index: 0x1424 */ 0x9954,0x683D,
-	/* Array index: 0x1424 */ 0x9957,0x7A44,
-	/* Array index: 0x1424 */ 0x9996,0x624F,
-	/* Array index: 0x1424 */ 0x9999,0x7A45,
-	/* Array index: 0x1424 */ 0x999D,0x7938,
-	/* Array index: 0x1424 */ 0x99A5,0x5C60,
-	/* Array index: 0x1424 */ 0x99A8,0x7B30,
-	/* Array index: 0x1424 */ 0x99B1,0x766E,
-	/* Array index: 0x1424 */ 0x99B3,0x764C,
-	/* Array index: 0x1424 */ 0x99B4,0x6278,
-	/* Array index: 0x1424 */ 0x99B9,0x6C71,
-	/* Array index: 0x1424 */ 0x99C1,0x5A60,
-	/* Array index: 0x1424 */ 0x99D5,0x4A3D,
-	/* Array index: 0x1424 */ 0x99D9,0x5D3F,
-	/* Array index: 0x1424 */ 0x99DD,0x766F,
-	/* Array index: 0x1424 */ 0x99DF,0x5E79,
-	/* Array index: 0x1424 */ 0x99ED,0x7A34,
-	/* Array index: 0x1424 */ 0x99F1,0x552D,
-	/* Array index: 0x1424 */ 0x99FF,0x7167,
-	/* Array index: 0x1424 */ 0x9A01,0x5E3E,
-	/* Array index: 0x1424 */ 0x9A08,0x5C40,
-	/* Array index: 0x1424 */ 0x9A0E,0x5148,
-	/* Array index: 0x1424 */ 0x9A0F,0x5149,
-	/* Array index: 0x1424 */ 0x9A19,0x783E,
-	/* Array index: 0x1424 */ 0x9A2B,0x4B76,
-	/* Array index: 0x1424 */ 0x9A30,0x5479,
-	/* Array index: 0x1424 */ 0x9A36,0x7562,
-	/* Array index: 0x1424 */ 0x9A37,0x6153,
-	/* Array index: 0x1424 */ 0x9A40,0x5869,
-	/* Array index: 0x1424 */ 0x9A43,0x787E,
-	/* Array index: 0x1424 */ 0x9A45,0x4F4C,
-	/* Array index: 0x1424 */ 0x9A4D,0x7D24,
-	/* Array index: 0x1424 */ 0x9A55,0x4E76,
-	/* Array index: 0x1424 */ 0x9A57,0x7A50,
-	/* Array index: 0x1424 */ 0x9A5A,0x4C73,
-	/* Array index: 0x1424 */ 0x9A5B,0x663E,
-	/* Array index: 0x1424 */ 0x9A5F,0x762E,
-	/* Array index: 0x1424 */ 0x9A62,0x5570,
-	/* Array index: 0x1424 */ 0x9A65,0x514A,
-	/* Array index: 0x1424 */ 0x9A69,0x7C3E,
-	/* Array index: 0x1424 */ 0x9A6A,0x5571,
-	/* Array index: 0x1424 */ 0x9AA8,0x4D69,
-	/* Array index: 0x1424 */ 0x9AB8,0x7A35,
-	/* Array index: 0x1424 */ 0x9AD3,0x6250,
-	/* Array index: 0x1424 */ 0x9AD4,0x7477,
-	/* Array index: 0x1424 */ 0x9AD8,0x4D54,
-	/* Array index: 0x1424 */ 0x9AE5,0x6723,
-	/* Array index: 0x1424 */ 0x9AEE,0x5B25,
-	/* Array index: 0x1424 */ 0x9B1A,0x6251,
-	/* Array index: 0x1424 */ 0x9B27,0x5722,
-	/* Array index: 0x1424 */ 0x9B2A,0x7763,
-	/* Array index: 0x1424 */ 0x9B31,0x6A26,
-	/* Array index: 0x1424 */ 0x9B3C,0x5021,
-	/* Array index: 0x1424 */ 0x9B4F,0x6A60,
-	/* Array index: 0x1424 */ 0x9B54,0x582A,
-	/* Array index: 0x1424 */ 0x9B5A,0x6560,
-	/* Array index: 0x1424 */ 0x9B6F,0x565B,
-	/* Array index: 0x1424 */ 0x9B8E,0x6F46,
-	/* Array index: 0x1424 */ 0x9B91,0x786A,
-	/* Array index: 0x1424 */ 0x9B9F,0x6455,
-	/* Array index: 0x1424 */ 0x9BAB,0x4E77,
-	/* Array index: 0x1424 */ 0x9BAE,0x6058,
-	/* Array index: 0x1424 */ 0x9BC9,0x576F,
-	/* Array index: 0x1424 */ 0x9BD6,0x746D,
-	/* Array index: 0x1424 */ 0x9BE4,0x4D66,
-	/* Array index: 0x1424 */ 0x9BE8,0x4C74,
-	/* Array index: 0x1424 */ 0x9C0D,0x7563,
-	/* Array index: 0x1424 */ 0x9C10,0x644A,
-	/* Array index: 0x1424 */ 0x9C12,0x5C61,
-	/* Array index: 0x1424 */ 0x9C15,0x7948,
-	/* Array index: 0x1424 */ 0x9C25,0x7C3F,
-	/* Array index: 0x1424 */ 0x9C32,0x6827,
-	/* Array index: 0x1424 */ 0x9C3B,0x5844,
-	/* Array index: 0x1424 */ 0x9C47,0x4B3E,
-	/* Array index: 0x1424 */ 0x9C49,0x5C2E,
-	/* Array index: 0x1424 */ 0x9C57,0x5777,
-	/* Array index: 0x1424 */ 0x9CE5,0x7068,
-	/* Array index: 0x1424 */ 0x9CE7,0x5D40,
-	/* Array index: 0x1424 */ 0x9CE9,0x4F4D,
-	/* Array index: 0x1424 */ 0x9CF3,0x5C73,
-	/* Array index: 0x1424 */ 0x9CF4,0x5930,
-	/* Array index: 0x1424 */ 0x9CF6,0x6669,
-	/* Array index: 0x1424 */ 0x9D09,0x643C,
-	/* Array index: 0x1424 */ 0x9D1B,0x6A44,
-	/* Array index: 0x1424 */ 0x9D26,0x646C,
-	/* Array index: 0x1424 */ 0x9D28,0x6465,
-	/* Array index: 0x1424 */ 0x9D3B,0x7B78,
-	/* Array index: 0x1424 */ 0x9D51,0x4C3B,
-	/* Array index: 0x1424 */ 0x9D5D,0x643D,
-	/* Array index: 0x1424 */ 0x9D60,0x4D5C,
-	/* Array index: 0x1424 */ 0x9D61,0x5977,
-	/* Array index: 0x1424 */ 0x9D6C,0x5D5F,
-	/* Array index: 0x1424 */ 0x9D72,0x6D4E,
-	/* Array index: 0x1424 */ 0x9DA9,0x5950,
-	/* Array index: 0x1424 */ 0x9DAF,0x6523,
-	/* Array index: 0x1424 */ 0x9DB4,0x794D,
-	/* Array index: 0x1424 */ 0x9DC4,0x4D2E,
-	/* Array index: 0x1424 */ 0x9DD7,0x4F4E,
-	/* Array index: 0x1424 */ 0x9DF2,0x762F,
-	/* Array index: 0x1424 */ 0x9E1A,0x6524,
-	/* Array index: 0x1424 */ 0x9E1E,0x5536,
-	/* Array index: 0x1424 */ 0x9E75,0x565D,
-	/* Array index: 0x1424 */ 0x9E79,0x7969,
-	/* Array index: 0x1424 */ 0x9E7D,0x6724,
-	/* Array index: 0x1424 */ 0x9E7F,0x5663,
-	/* Array index: 0x1424 */ 0x9E92,0x514B,
-	/* Array index: 0x1424 */ 0x9E93,0x5664,
-	/* Array index: 0x1424 */ 0x9E97,0x5572,
-	/* Array index: 0x1424 */ 0x9E9D,0x5E7A,
-	/* Array index: 0x1424 */ 0x9E9F,0x5778,
-	/* Array index: 0x1424 */ 0x9EA5,0x586A,
-	/* Array index: 0x1424 */ 0x9EB4,0x4F55,
-	/* Array index: 0x1424 */ 0x9EB5,0x587D,
-	/* Array index: 0x1424 */ 0x9EBB,0x582B,
-	/* Array index: 0x1424 */ 0x9EBE,0x7D4B,
-	/* Array index: 0x1424 */ 0x9EC3,0x7C5C,
-	/* Array index: 0x1424 */ 0x9ECD,0x6028,
-	/* Array index: 0x1424 */ 0x9ECE,0x5573,
-	/* Array index: 0x1424 */ 0x9ED1,0x7D59,
-	/* Array index: 0x1424 */ 0x9ED4,0x4C23,
-	/* Array index: 0x1424 */ 0x9ED8,0x5979,
-	/* Array index: 0x1424 */ 0x9EDB,0x536A,
-	/* Array index: 0x1424 */ 0x9EDC,0x7575,
-	/* Array index: 0x1424 */ 0x9EDE,0x6F47,
-	/* Array index: 0x1424 */ 0x9EE8,0x535A,
-	/* Array index: 0x1424 */ 0x9EF4,0x5A3D,
-	/* Array index: 0x1424 */ 0x9F07,0x6828,
-	/* Array index: 0x1424 */ 0x9F08,0x5C2F,
-	/* Array index: 0x1424 */ 0x9F0E,0x7023,
-	/* Array index: 0x1424 */ 0x9F13,0x4D55,
-	/* Array index: 0x1424 */ 0x9F20,0x6029,
-	/* Array index: 0x1424 */ 0x9F3B,0x5E2C,
-	/* Array index: 0x1424 */ 0x9F4A,0x703A,
-	/* Array index: 0x1424 */ 0x9F4B,0x6E31,
-	/* Array index: 0x1424 */ 0x9F4E,0x6E32,
-	/* Array index: 0x1424 */ 0x9F52,0x764D,
-	/* Array index: 0x1424 */ 0x9F5F,0x6E52,
-	/* Array index: 0x1424 */ 0x9F61,0x5646,
-	/* Array index: 0x1424 */ 0x9F67,0x6065,
-	/* Array index: 0x1424 */ 0x9F6A,0x733B,
-	/* Array index: 0x1424 */ 0x9F6C,0x6561,
-	/* Array index: 0x1424 */ 0x9F77,0x644B,
-	/* Array index: 0x1424 */ 0x9F8D,0x5723,
-	/* Array index: 0x1424 */ 0x9F90,0x5B42,
-	/* Array index: 0x1424 */ 0x9F95,0x4A7E,
-	/* Array index: 0x1424 */ 0x9F9C,0x4F4F,
-	/* Array index: 0x1424 */ 0xAC00,0x3021,
-	/* Array index: 0x1424 */ 0xAC01,0x3022,
-	/* Array index: 0x1424 */ 0xAC04,0x3023,
-	/* Array index: 0x1424 */ 0xAC20,0x3035,
-	/* Array index: 0x1424 */ 0xAC24,0x3036,
-	/* Array index: 0x1424 */ 0xAC38,0x303C,
-	/* Array index: 0x1424 */ 0xAC39,0x303D,
-	/* Array index: 0x1424 */ 0xAC3C,0x303E,
-	/* Array index: 0x1424 */ 0xAC40,0x303F,
-	/* Array index: 0x1424 */ 0xAC4B,0x3040,
-	/* Array index: 0x1424 */ 0xAC4D,0x3041,
-	/* Array index: 0x1424 */ 0xAC54,0x3042,
-	/* Array index: 0x1424 */ 0xAC58,0x3043,
-	/* Array index: 0x1424 */ 0xAC5C,0x3044,
-	/* Array index: 0x1424 */ 0xAC70,0x3045,
-	/* Array index: 0x1424 */ 0xAC71,0x3046,
-	/* Array index: 0x1424 */ 0xAC74,0x3047,
-	/* Array index: 0x1424 */ 0xAC77,0x3048,
-	/* Array index: 0x1424 */ 0xAC78,0x3049,
-	/* Array index: 0x1424 */ 0xAC7A,0x304A,
-	/* Array index: 0x1424 */ 0xAC90,0x3055,
-	/* Array index: 0x1424 */ 0xAC94,0x3056,
-	/* Array index: 0x1424 */ 0xACC1,0x3067,
-	/* Array index: 0x1424 */ 0xACC4,0x3068,
-	/* Array index: 0x1424 */ 0xACC8,0x3069,
-	/* Array index: 0x1424 */ 0xACCC,0x306A,
-	/* Array index: 0x1424 */ 0xACD5,0x306B,
-	/* Array index: 0x1424 */ 0xACD7,0x306C,
-	/* Array index: 0x1424 */ 0xACE0,0x306D,
-	/* Array index: 0x1424 */ 0xACE1,0x306E,
-	/* Array index: 0x1424 */ 0xACE4,0x306F,
-	/* Array index: 0x1424 */ 0xACE7,0x3070,
-	/* Array index: 0x1424 */ 0xACE8,0x3071,
-	/* Array index: 0x1424 */ 0xACEA,0x3072,
-	/* Array index: 0x1424 */ 0xACEC,0x3073,
-	/* Array index: 0x1424 */ 0xACFC,0x307A,
-	/* Array index: 0x1424 */ 0xACFD,0x307B,
-	/* Array index: 0x1424 */ 0xAD00,0x307C,
-	/* Array index: 0x1424 */ 0xAD04,0x307D,
-	/* Array index: 0x1424 */ 0xAD06,0x307E,
-	/* Array index: 0x1424 */ 0xAD0C,0x3121,
-	/* Array index: 0x1424 */ 0xAD0D,0x3122,
-	/* Array index: 0x1424 */ 0xAD0F,0x3123,
-	/* Array index: 0x1424 */ 0xAD11,0x3124,
-	/* Array index: 0x1424 */ 0xAD18,0x3125,
-	/* Array index: 0x1424 */ 0xAD1C,0x3126,
-	/* Array index: 0x1424 */ 0xAD20,0x3127,
-	/* Array index: 0x1424 */ 0xAD29,0x3128,
-	/* Array index: 0x1424 */ 0xAD2C,0x3129,
-	/* Array index: 0x1424 */ 0xAD2D,0x312A,
-	/* Array index: 0x1424 */ 0xAD34,0x312B,
-	/* Array index: 0x1424 */ 0xAD35,0x312C,
-	/* Array index: 0x1424 */ 0xAD38,0x312D,
-	/* Array index: 0x1424 */ 0xAD3C,0x312E,
-	/* Array index: 0x1424 */ 0xAD44,0x312F,
-	/* Array index: 0x1424 */ 0xAD45,0x3130,
-	/* Array index: 0x1424 */ 0xAD47,0x3131,
-	/* Array index: 0x1424 */ 0xAD49,0x3132,
-	/* Array index: 0x1424 */ 0xAD50,0x3133,
-	/* Array index: 0x1424 */ 0xAD54,0x3134,
-	/* Array index: 0x1424 */ 0xAD58,0x3135,
-	/* Array index: 0x1424 */ 0xAD61,0x3136,
-	/* Array index: 0x1424 */ 0xAD63,0x3137,
-	/* Array index: 0x1424 */ 0xAD6C,0x3138,
-	/* Array index: 0x1424 */ 0xAD6D,0x3139,
-	/* Array index: 0x1424 */ 0xAD70,0x313A,
-	/* Array index: 0x1424 */ 0xAD88,0x3145,
-	/* Array index: 0x1424 */ 0xAD89,0x3146,
-	/* Array index: 0x1424 */ 0xAD8C,0x3147,
-	/* Array index: 0x1424 */ 0xAD90,0x3148,
-	/* Array index: 0x1424 */ 0xAD9C,0x3149,
-	/* Array index: 0x1424 */ 0xAD9D,0x314A,
-	/* Array index: 0x1424 */ 0xADA4,0x314B,
-	/* Array index: 0x1424 */ 0xADB7,0x314C,
-	/* Array index: 0x1424 */ 0xADC0,0x314D,
-	/* Array index: 0x1424 */ 0xADC1,0x314E,
-	/* Array index: 0x1424 */ 0xADC4,0x314F,
-	/* Array index: 0x1424 */ 0xADC8,0x3150,
-	/* Array index: 0x1424 */ 0xADD0,0x3151,
-	/* Array index: 0x1424 */ 0xADD1,0x3152,
-	/* Array index: 0x1424 */ 0xADD3,0x3153,
-	/* Array index: 0x1424 */ 0xADDC,0x3154,
-	/* Array index: 0x1424 */ 0xADE0,0x3155,
-	/* Array index: 0x1424 */ 0xADE4,0x3156,
-	/* Array index: 0x1424 */ 0xADF8,0x3157,
-	/* Array index: 0x1424 */ 0xADF9,0x3158,
-	/* Array index: 0x1424 */ 0xADFC,0x3159,
-	/* Array index: 0x1424 */ 0xAE08,0x315D,
-	/* Array index: 0x1424 */ 0xAE09,0x315E,
-	/* Array index: 0x1424 */ 0xAE0B,0x315F,
-	/* Array index: 0x1424 */ 0xAE0D,0x3160,
-	/* Array index: 0x1424 */ 0xAE14,0x3161,
-	/* Array index: 0x1424 */ 0xAE30,0x3162,
-	/* Array index: 0x1424 */ 0xAE31,0x3163,
-	/* Array index: 0x1424 */ 0xAE34,0x3164,
-	/* Array index: 0x1424 */ 0xAE37,0x3165,
-	/* Array index: 0x1424 */ 0xAE38,0x3166,
-	/* Array index: 0x1424 */ 0xAE3A,0x3167,
-	/* Array index: 0x1424 */ 0xAE40,0x3168,
-	/* Array index: 0x1424 */ 0xAE41,0x3169,
-	/* Array index: 0x1424 */ 0xAE43,0x316A,
-	/* Array index: 0x1424 */ 0xAE45,0x316B,
-	/* Array index: 0x1424 */ 0xAE46,0x316C,
-	/* Array index: 0x1424 */ 0xAE54,0x3172,
-	/* Array index: 0x1424 */ 0xAE56,0x3173,
-	/* Array index: 0x1424 */ 0xAE65,0x3179,
-	/* Array index: 0x1424 */ 0xAE68,0x317A,
-	/* Array index: 0x1424 */ 0xAE69,0x317B,
-	/* Array index: 0x1424 */ 0xAE6C,0x317C,
-	/* Array index: 0x1424 */ 0xAE70,0x317D,
-	/* Array index: 0x1424 */ 0xAE84,0x3225,
-	/* Array index: 0x1424 */ 0xAE85,0x3226,
-	/* Array index: 0x1424 */ 0xAE8C,0x3227,
-	/* Array index: 0x1424 */ 0xAEC4,0x322C,
-	/* Array index: 0x1424 */ 0xAED8,0x3232,
-	/* Array index: 0x1424 */ 0xAED9,0x3233,
-	/* Array index: 0x1424 */ 0xAEDC,0x3234,
-	/* Array index: 0x1424 */ 0xAEE8,0x3235,
-	/* Array index: 0x1424 */ 0xAEEB,0x3236,
-	/* Array index: 0x1424 */ 0xAEED,0x3237,
-	/* Array index: 0x1424 */ 0xAEF4,0x3238,
-	/* Array index: 0x1424 */ 0xAEF8,0x3239,
-	/* Array index: 0x1424 */ 0xAEFC,0x323A,
-	/* Array index: 0x1424 */ 0xAF07,0x323B,
-	/* Array index: 0x1424 */ 0xAF08,0x323C,
-	/* Array index: 0x1424 */ 0xAF0D,0x323D,
-	/* Array index: 0x1424 */ 0xAF10,0x323E,
-	/* Array index: 0x1424 */ 0xAF2C,0x323F,
-	/* Array index: 0x1424 */ 0xAF2D,0x3240,
-	/* Array index: 0x1424 */ 0xAF30,0x3241,
-	/* Array index: 0x1424 */ 0xAF32,0x3242,
-	/* Array index: 0x1424 */ 0xAF34,0x3243,
-	/* Array index: 0x1424 */ 0xAF3C,0x3244,
-	/* Array index: 0x1424 */ 0xAF3D,0x3245,
-	/* Array index: 0x1424 */ 0xAF48,0x324A,
-	/* Array index: 0x1424 */ 0xAF49,0x324B,
-	/* Array index: 0x1424 */ 0xAF50,0x324C,
-	/* Array index: 0x1424 */ 0xAF5C,0x324D,
-	/* Array index: 0x1424 */ 0xAF5D,0x324E,
-	/* Array index: 0x1424 */ 0xAF64,0x324F,
-	/* Array index: 0x1424 */ 0xAF65,0x3250,
-	/* Array index: 0x1424 */ 0xAF79,0x3251,
-	/* Array index: 0x1424 */ 0xAF80,0x3252,
-	/* Array index: 0x1424 */ 0xAF84,0x3253,
-	/* Array index: 0x1424 */ 0xAF88,0x3254,
-	/* Array index: 0x1424 */ 0xAF90,0x3255,
-	/* Array index: 0x1424 */ 0xAF91,0x3256,
-	/* Array index: 0x1424 */ 0xAF95,0x3257,
-	/* Array index: 0x1424 */ 0xAF9C,0x3258,
-	/* Array index: 0x1424 */ 0xAFB8,0x3259,
-	/* Array index: 0x1424 */ 0xAFB9,0x325A,
-	/* Array index: 0x1424 */ 0xAFBC,0x325B,
-	/* Array index: 0x1424 */ 0xAFC0,0x325C,
-	/* Array index: 0x1424 */ 0xAFD4,0x3263,
-	/* Array index: 0x1424 */ 0xAFDC,0x3264,
-	/* Array index: 0x1424 */ 0xAFE8,0x3265,
-	/* Array index: 0x1424 */ 0xAFE9,0x3266,
-	/* Array index: 0x1424 */ 0xAFF0,0x3267,
-	/* Array index: 0x1424 */ 0xAFF1,0x3268,
-	/* Array index: 0x1424 */ 0xAFF4,0x3269,
-	/* Array index: 0x1424 */ 0xAFF8,0x326A,
-	/* Array index: 0x1424 */ 0xB000,0x326B,
-	/* Array index: 0x1424 */ 0xB001,0x326C,
-	/* Array index: 0x1424 */ 0xB004,0x326D,
-	/* Array index: 0x1424 */ 0xB00C,0x326E,
-	/* Array index: 0x1424 */ 0xB010,0x326F,
-	/* Array index: 0x1424 */ 0xB014,0x3270,
-	/* Array index: 0x1424 */ 0xB01C,0x3271,
-	/* Array index: 0x1424 */ 0xB01D,0x3272,
-	/* Array index: 0x1424 */ 0xB028,0x3273,
-	/* Array index: 0x1424 */ 0xB044,0x3274,
-	/* Array index: 0x1424 */ 0xB045,0x3275,
-	/* Array index: 0x1424 */ 0xB048,0x3276,
-	/* Array index: 0x1424 */ 0xB04A,0x3277,
-	/* Array index: 0x1424 */ 0xB04C,0x3278,
-	/* Array index: 0x1424 */ 0xB04E,0x3279,
-	/* Array index: 0x1424 */ 0xB05D,0x3321,
-	/* Array index: 0x1424 */ 0xB07C,0x3322,
-	/* Array index: 0x1424 */ 0xB07D,0x3323,
-	/* Array index: 0x1424 */ 0xB080,0x3324,
-	/* Array index: 0x1424 */ 0xB084,0x3325,
-	/* Array index: 0x1424 */ 0xB08C,0x3326,
-	/* Array index: 0x1424 */ 0xB08D,0x3327,
-	/* Array index: 0x1424 */ 0xB08F,0x3328,
-	/* Array index: 0x1424 */ 0xB091,0x3329,
-	/* Array index: 0x1424 */ 0xB0B8,0x333D,
-	/* Array index: 0x1424 */ 0xB0BC,0x333E,
-	/* Array index: 0x1424 */ 0xB0D0,0x3344,
-	/* Array index: 0x1424 */ 0xB0D1,0x3345,
-	/* Array index: 0x1424 */ 0xB0D4,0x3346,
-	/* Array index: 0x1424 */ 0xB0D8,0x3347,
-	/* Array index: 0x1424 */ 0xB0E0,0x3348,
-	/* Array index: 0x1424 */ 0xB0E5,0x3349,
-	/* Array index: 0x1424 */ 0xB110,0x334E,
-	/* Array index: 0x1424 */ 0xB112,0x334F,
-	/* Array index: 0x1424 */ 0xB113,0x3350,
-	/* Array index: 0x1424 */ 0xB128,0x3359,
-	/* Array index: 0x1424 */ 0xB12C,0x335A,
-	/* Array index: 0x1424 */ 0xB140,0x3360,
-	/* Array index: 0x1424 */ 0xB141,0x3361,
-	/* Array index: 0x1424 */ 0xB144,0x3362,
-	/* Array index: 0x1424 */ 0xB148,0x3363,
-	/* Array index: 0x1424 */ 0xB150,0x3364,
-	/* Array index: 0x1424 */ 0xB151,0x3365,
-	/* Array index: 0x1424 */ 0xB154,0x3366,
-	/* Array index: 0x1424 */ 0xB155,0x3367,
-	/* Array index: 0x1424 */ 0xB158,0x3368,
-	/* Array index: 0x1424 */ 0xB15C,0x3369,
-	/* Array index: 0x1424 */ 0xB160,0x336A,
-	/* Array index: 0x1424 */ 0xB178,0x336B,
-	/* Array index: 0x1424 */ 0xB179,0x336C,
-	/* Array index: 0x1424 */ 0xB17C,0x336D,
-	/* Array index: 0x1424 */ 0xB180,0x336E,
-	/* Array index: 0x1424 */ 0xB182,0x336F,
-	/* Array index: 0x1424 */ 0xB188,0x3370,
-	/* Array index: 0x1424 */ 0xB189,0x3371,
-	/* Array index: 0x1424 */ 0xB18B,0x3372,
-	/* Array index: 0x1424 */ 0xB18D,0x3373,
-	/* Array index: 0x1424 */ 0xB198,0x3377,
-	/* Array index: 0x1424 */ 0xB19C,0x3378,
-	/* Array index: 0x1424 */ 0xB1A8,0x3379,
-	/* Array index: 0x1424 */ 0xB1CC,0x337A,
-	/* Array index: 0x1424 */ 0xB1D0,0x337B,
-	/* Array index: 0x1424 */ 0xB1D4,0x337C,
-	/* Array index: 0x1424 */ 0xB1DC,0x337D,
-	/* Array index: 0x1424 */ 0xB1DD,0x337E,
-	/* Array index: 0x1424 */ 0xB1DF,0x3421,
-	/* Array index: 0x1424 */ 0xB1E8,0x3422,
-	/* Array index: 0x1424 */ 0xB1E9,0x3423,
-	/* Array index: 0x1424 */ 0xB1EC,0x3424,
-	/* Array index: 0x1424 */ 0xB1F0,0x3425,
-	/* Array index: 0x1424 */ 0xB1F9,0x3426,
-	/* Array index: 0x1424 */ 0xB1FB,0x3427,
-	/* Array index: 0x1424 */ 0xB1FD,0x3428,
-	/* Array index: 0x1424 */ 0xB204,0x3429,
-	/* Array index: 0x1424 */ 0xB205,0x342A,
-	/* Array index: 0x1424 */ 0xB208,0x342B,
-	/* Array index: 0x1424 */ 0xB20B,0x342C,
-	/* Array index: 0x1424 */ 0xB20C,0x342D,
-	/* Array index: 0x1424 */ 0xB214,0x342E,
-	/* Array index: 0x1424 */ 0xB215,0x342F,
-	/* Array index: 0x1424 */ 0xB217,0x3430,
-	/* Array index: 0x1424 */ 0xB219,0x3431,
-	/* Array index: 0x1424 */ 0xB220,0x3432,
-	/* Array index: 0x1424 */ 0xB234,0x3433,
-	/* Array index: 0x1424 */ 0xB23C,0x3434,
-	/* Array index: 0x1424 */ 0xB258,0x3435,
-	/* Array index: 0x1424 */ 0xB25C,0x3436,
-	/* Array index: 0x1424 */ 0xB260,0x3437,
-	/* Array index: 0x1424 */ 0xB268,0x3438,
-	/* Array index: 0x1424 */ 0xB269,0x3439,
-	/* Array index: 0x1424 */ 0xB274,0x343A,
-	/* Array index: 0x1424 */ 0xB275,0x343B,
-	/* Array index: 0x1424 */ 0xB27C,0x343C,
-	/* Array index: 0x1424 */ 0xB284,0x343D,
-	/* Array index: 0x1424 */ 0xB285,0x343E,
-	/* Array index: 0x1424 */ 0xB289,0x343F,
-	/* Array index: 0x1424 */ 0xB290,0x3440,
-	/* Array index: 0x1424 */ 0xB291,0x3441,
-	/* Array index: 0x1424 */ 0xB294,0x3442,
-	/* Array index: 0x1424 */ 0xB2A0,0x3446,
-	/* Array index: 0x1424 */ 0xB2A1,0x3447,
-	/* Array index: 0x1424 */ 0xB2A3,0x3448,
-	/* Array index: 0x1424 */ 0xB2A5,0x3449,
-	/* Array index: 0x1424 */ 0xB2A6,0x344A,
-	/* Array index: 0x1424 */ 0xB2AA,0x344B,
-	/* Array index: 0x1424 */ 0xB2AC,0x344C,
-	/* Array index: 0x1424 */ 0xB2B0,0x344D,
-	/* Array index: 0x1424 */ 0xB2B4,0x344E,
-	/* Array index: 0x1424 */ 0xB2C8,0x344F,
-	/* Array index: 0x1424 */ 0xB2C9,0x3450,
-	/* Array index: 0x1424 */ 0xB2CC,0x3451,
-	/* Array index: 0x1424 */ 0xB2D0,0x3452,
-	/* Array index: 0x1424 */ 0xB2D2,0x3453,
-	/* Array index: 0x1424 */ 0xB2D8,0x3454,
-	/* Array index: 0x1424 */ 0xB2D9,0x3455,
-	/* Array index: 0x1424 */ 0xB2DB,0x3456,
-	/* Array index: 0x1424 */ 0xB2DD,0x3457,
-	/* Array index: 0x1424 */ 0xB304,0x346D,
-	/* Array index: 0x1424 */ 0xB308,0x346E,
-	/* Array index: 0x1424 */ 0xB31C,0x3474,
-	/* Array index: 0x1424 */ 0xB364,0x347D,
-	/* Array index: 0x1424 */ 0xB365,0x347E,
-	/* Array index: 0x1424 */ 0xB367,0x3521,
-	/* Array index: 0x1424 */ 0xB369,0x3522,
-	/* Array index: 0x1424 */ 0xB36B,0x3523,
-	/* Array index: 0x1424 */ 0xB36E,0x3524,
-	/* Array index: 0x1424 */ 0xB370,0x3525,
-	/* Array index: 0x1424 */ 0xB371,0x3526,
-	/* Array index: 0x1424 */ 0xB374,0x3527,
-	/* Array index: 0x1424 */ 0xB378,0x3528,
-	/* Array index: 0x1424 */ 0xB38C,0x352E,
-	/* Array index: 0x1424 */ 0xB390,0x352F,
-	/* Array index: 0x1424 */ 0xB394,0x3530,
-	/* Array index: 0x1424 */ 0xB3A0,0x3531,
-	/* Array index: 0x1424 */ 0xB3A1,0x3532,
-	/* Array index: 0x1424 */ 0xB3A8,0x3533,
-	/* Array index: 0x1424 */ 0xB3AC,0x3534,
-	/* Array index: 0x1424 */ 0xB3C4,0x3535,
-	/* Array index: 0x1424 */ 0xB3C5,0x3536,
-	/* Array index: 0x1424 */ 0xB3C8,0x3537,
-	/* Array index: 0x1424 */ 0xB3CB,0x3538,
-	/* Array index: 0x1424 */ 0xB3CC,0x3539,
-	/* Array index: 0x1424 */ 0xB3CE,0x353A,
-	/* Array index: 0x1424 */ 0xB3D0,0x353B,
-	/* Array index: 0x1424 */ 0xB3D4,0x353C,
-	/* Array index: 0x1424 */ 0xB3D5,0x353D,
-	/* Array index: 0x1424 */ 0xB3D7,0x353E,
-	/* Array index: 0x1424 */ 0xB3D9,0x353F,
-	/* Array index: 0x1424 */ 0xB3DB,0x3540,
-	/* Array index: 0x1424 */ 0xB3DD,0x3541,
-	/* Array index: 0x1424 */ 0xB3E0,0x3542,
-	/* Array index: 0x1424 */ 0xB3E4,0x3543,
-	/* Array index: 0x1424 */ 0xB3E8,0x3544,
-	/* Array index: 0x1424 */ 0xB3FC,0x3545,
-	/* Array index: 0x1424 */ 0xB410,0x3546,
-	/* Array index: 0x1424 */ 0xB418,0x3547,
-	/* Array index: 0x1424 */ 0xB41C,0x3548,
-	/* Array index: 0x1424 */ 0xB420,0x3549,
-	/* Array index: 0x1424 */ 0xB428,0x354A,
-	/* Array index: 0x1424 */ 0xB429,0x354B,
-	/* Array index: 0x1424 */ 0xB42B,0x354C,
-	/* Array index: 0x1424 */ 0xB434,0x354D,
-	/* Array index: 0x1424 */ 0xB450,0x354E,
-	/* Array index: 0x1424 */ 0xB451,0x354F,
-	/* Array index: 0x1424 */ 0xB454,0x3550,
-	/* Array index: 0x1424 */ 0xB458,0x3551,
-	/* Array index: 0x1424 */ 0xB460,0x3552,
-	/* Array index: 0x1424 */ 0xB461,0x3553,
-	/* Array index: 0x1424 */ 0xB463,0x3554,
-	/* Array index: 0x1424 */ 0xB465,0x3555,
-	/* Array index: 0x1424 */ 0xB46C,0x3556,
-	/* Array index: 0x1424 */ 0xB480,0x3557,
-	/* Array index: 0x1424 */ 0xB488,0x3558,
-	/* Array index: 0x1424 */ 0xB49D,0x3559,
-	/* Array index: 0x1424 */ 0xB4A4,0x355A,
-	/* Array index: 0x1424 */ 0xB4A8,0x355B,
-	/* Array index: 0x1424 */ 0xB4AC,0x355C,
-	/* Array index: 0x1424 */ 0xB4B5,0x355D,
-	/* Array index: 0x1424 */ 0xB4B7,0x355E,
-	/* Array index: 0x1424 */ 0xB4B9,0x355F,
-	/* Array index: 0x1424 */ 0xB4C0,0x3560,
-	/* Array index: 0x1424 */ 0xB4C4,0x3561,
-	/* Array index: 0x1424 */ 0xB4C8,0x3562,
-	/* Array index: 0x1424 */ 0xB4D0,0x3563,
-	/* Array index: 0x1424 */ 0xB4D5,0x3564,
-	/* Array index: 0x1424 */ 0xB4DC,0x3565,
-	/* Array index: 0x1424 */ 0xB4DD,0x3566,
-	/* Array index: 0x1424 */ 0xB4E0,0x3567,
-	/* Array index: 0x1424 */ 0xB4E3,0x3568,
-	/* Array index: 0x1424 */ 0xB4E4,0x3569,
-	/* Array index: 0x1424 */ 0xB4E6,0x356A,
-	/* Array index: 0x1424 */ 0xB4EC,0x356B,
-	/* Array index: 0x1424 */ 0xB4ED,0x356C,
-	/* Array index: 0x1424 */ 0xB4EF,0x356D,
-	/* Array index: 0x1424 */ 0xB4F1,0x356E,
-	/* Array index: 0x1424 */ 0xB4F8,0x356F,
-	/* Array index: 0x1424 */ 0xB514,0x3570,
-	/* Array index: 0x1424 */ 0xB515,0x3571,
-	/* Array index: 0x1424 */ 0xB518,0x3572,
-	/* Array index: 0x1424 */ 0xB51B,0x3573,
-	/* Array index: 0x1424 */ 0xB51C,0x3574,
-	/* Array index: 0x1424 */ 0xB530,0x357B,
-	/* Array index: 0x1424 */ 0xB531,0x357C,
-	/* Array index: 0x1424 */ 0xB534,0x357D,
-	/* Array index: 0x1424 */ 0xB538,0x357E,
-	/* Array index: 0x1424 */ 0xB550,0x3629,
-	/* Array index: 0x1424 */ 0xB554,0x362A,
-	/* Array index: 0x1424 */ 0xB5A0,0x3630,
-	/* Array index: 0x1424 */ 0xB5A1,0x3631,
-	/* Array index: 0x1424 */ 0xB5A4,0x3632,
-	/* Array index: 0x1424 */ 0xB5A8,0x3633,
-	/* Array index: 0x1424 */ 0xB5AA,0x3634,
-	/* Array index: 0x1424 */ 0xB5AB,0x3635,
-	/* Array index: 0x1424 */ 0xB5C0,0x363E,
-	/* Array index: 0x1424 */ 0xB5C4,0x363F,
-	/* Array index: 0x1424 */ 0xB5D8,0x3645,
-	/* Array index: 0x1424 */ 0xB5EC,0x3646,
-	/* Array index: 0x1424 */ 0xB610,0x3647,
-	/* Array index: 0x1424 */ 0xB611,0x3648,
-	/* Array index: 0x1424 */ 0xB614,0x3649,
-	/* Array index: 0x1424 */ 0xB618,0x364A,
-	/* Array index: 0x1424 */ 0xB625,0x364B,
-	/* Array index: 0x1424 */ 0xB62C,0x364C,
-	/* Array index: 0x1424 */ 0xB634,0x364D,
-	/* Array index: 0x1424 */ 0xB648,0x364E,
-	/* Array index: 0x1424 */ 0xB664,0x364F,
-	/* Array index: 0x1424 */ 0xB668,0x3650,
-	/* Array index: 0x1424 */ 0xB69C,0x3651,
-	/* Array index: 0x1424 */ 0xB69D,0x3652,
-	/* Array index: 0x1424 */ 0xB6A0,0x3653,
-	/* Array index: 0x1424 */ 0xB6A4,0x3654,
-	/* Array index: 0x1424 */ 0xB6AB,0x3655,
-	/* Array index: 0x1424 */ 0xB6AC,0x3656,
-	/* Array index: 0x1424 */ 0xB6B1,0x3657,
-	/* Array index: 0x1424 */ 0xB6D4,0x3658,
-	/* Array index: 0x1424 */ 0xB6F0,0x3659,
-	/* Array index: 0x1424 */ 0xB6F4,0x365A,
-	/* Array index: 0x1424 */ 0xB6F8,0x365B,
-	/* Array index: 0x1424 */ 0xB700,0x365C,
-	/* Array index: 0x1424 */ 0xB701,0x365D,
-	/* Array index: 0x1424 */ 0xB705,0x365E,
-	/* Array index: 0x1424 */ 0xB728,0x365F,
-	/* Array index: 0x1424 */ 0xB729,0x3660,
-	/* Array index: 0x1424 */ 0xB72C,0x3661,
-	/* Array index: 0x1424 */ 0xB72F,0x3662,
-	/* Array index: 0x1424 */ 0xB730,0x3663,
-	/* Array index: 0x1424 */ 0xB738,0x3664,
-	/* Array index: 0x1424 */ 0xB739,0x3665,
-	/* Array index: 0x1424 */ 0xB73B,0x3666,
-	/* Array index: 0x1424 */ 0xB744,0x3667,
-	/* Array index: 0x1424 */ 0xB748,0x3668,
-	/* Array index: 0x1424 */ 0xB74C,0x3669,
-	/* Array index: 0x1424 */ 0xB754,0x366A,
-	/* Array index: 0x1424 */ 0xB755,0x366B,
-	/* Array index: 0x1424 */ 0xB760,0x366C,
-	/* Array index: 0x1424 */ 0xB764,0x366D,
-	/* Array index: 0x1424 */ 0xB768,0x366E,
-	/* Array index: 0x1424 */ 0xB770,0x366F,
-	/* Array index: 0x1424 */ 0xB771,0x3670,
-	/* Array index: 0x1424 */ 0xB773,0x3671,
-	/* Array index: 0x1424 */ 0xB775,0x3672,
-	/* Array index: 0x1424 */ 0xB77C,0x3673,
-	/* Array index: 0x1424 */ 0xB77D,0x3674,
-	/* Array index: 0x1424 */ 0xB780,0x3675,
-	/* Array index: 0x1424 */ 0xB784,0x3676,
-	/* Array index: 0x1424 */ 0xB79C,0x3723,
-	/* Array index: 0x1424 */ 0xB7A0,0x3724,
-	/* Array index: 0x1424 */ 0xB7B4,0x372A,
-	/* Array index: 0x1424 */ 0xB7B5,0x372B,
-	/* Array index: 0x1424 */ 0xB7B8,0x372C,
-	/* Array index: 0x1424 */ 0xB7C7,0x372D,
-	/* Array index: 0x1424 */ 0xB7C9,0x372E,
-	/* Array index: 0x1424 */ 0xB7EC,0x372F,
-	/* Array index: 0x1424 */ 0xB7ED,0x3730,
-	/* Array index: 0x1424 */ 0xB7F0,0x3731,
-	/* Array index: 0x1424 */ 0xB7F4,0x3732,
-	/* Array index: 0x1424 */ 0xB80C,0x373B,
-	/* Array index: 0x1424 */ 0xB810,0x373C,
-	/* Array index: 0x1424 */ 0xB818,0x373D,
-	/* Array index: 0x1424 */ 0xB819,0x373E,
-	/* Array index: 0x1424 */ 0xB81B,0x373F,
-	/* Array index: 0x1424 */ 0xB81D,0x3740,
-	/* Array index: 0x1424 */ 0xB824,0x3741,
-	/* Array index: 0x1424 */ 0xB825,0x3742,
-	/* Array index: 0x1424 */ 0xB828,0x3743,
-	/* Array index: 0x1424 */ 0xB82C,0x3744,
-	/* Array index: 0x1424 */ 0xB840,0x374A,
-	/* Array index: 0x1424 */ 0xB844,0x374B,
-	/* Array index: 0x1424 */ 0xB851,0x374C,
-	/* Array index: 0x1424 */ 0xB853,0x374D,
-	/* Array index: 0x1424 */ 0xB85C,0x374E,
-	/* Array index: 0x1424 */ 0xB85D,0x374F,
-	/* Array index: 0x1424 */ 0xB860,0x3750,
-	/* Array index: 0x1424 */ 0xB864,0x3751,
-	/* Array index: 0x1424 */ 0xB86C,0x3752,
-	/* Array index: 0x1424 */ 0xB86D,0x3753,
-	/* Array index: 0x1424 */ 0xB86F,0x3754,
-	/* Array index: 0x1424 */ 0xB871,0x3755,
-	/* Array index: 0x1424 */ 0xB878,0x3756,
-	/* Array index: 0x1424 */ 0xB87C,0x3757,
-	/* Array index: 0x1424 */ 0xB88D,0x3758,
-	/* Array index: 0x1424 */ 0xB8A8,0x3759,
-	/* Array index: 0x1424 */ 0xB8B0,0x375A,
-	/* Array index: 0x1424 */ 0xB8B4,0x375B,
-	/* Array index: 0x1424 */ 0xB8B8,0x375C,
-	/* Array index: 0x1424 */ 0xB8C0,0x375D,
-	/* Array index: 0x1424 */ 0xB8C1,0x375E,
-	/* Array index: 0x1424 */ 0xB8C3,0x375F,
-	/* Array index: 0x1424 */ 0xB8C5,0x3760,
-	/* Array index: 0x1424 */ 0xB8CC,0x3761,
-	/* Array index: 0x1424 */ 0xB8D0,0x3762,
-	/* Array index: 0x1424 */ 0xB8D4,0x3763,
-	/* Array index: 0x1424 */ 0xB8DD,0x3764,
-	/* Array index: 0x1424 */ 0xB8DF,0x3765,
-	/* Array index: 0x1424 */ 0xB8E1,0x3766,
-	/* Array index: 0x1424 */ 0xB8E8,0x3767,
-	/* Array index: 0x1424 */ 0xB8E9,0x3768,
-	/* Array index: 0x1424 */ 0xB8EC,0x3769,
-	/* Array index: 0x1424 */ 0xB8F0,0x376A,
-	/* Array index: 0x1424 */ 0xB8F8,0x376B,
-	/* Array index: 0x1424 */ 0xB8F9,0x376C,
-	/* Array index: 0x1424 */ 0xB8FB,0x376D,
-	/* Array index: 0x1424 */ 0xB8FD,0x376E,
-	/* Array index: 0x1424 */ 0xB904,0x376F,
-	/* Array index: 0x1424 */ 0xB918,0x3770,
-	/* Array index: 0x1424 */ 0xB920,0x3771,
-	/* Array index: 0x1424 */ 0xB93C,0x3772,
-	/* Array index: 0x1424 */ 0xB93D,0x3773,
-	/* Array index: 0x1424 */ 0xB940,0x3774,
-	/* Array index: 0x1424 */ 0xB944,0x3775,
-	/* Array index: 0x1424 */ 0xB94C,0x3776,
-	/* Array index: 0x1424 */ 0xB94F,0x3777,
-	/* Array index: 0x1424 */ 0xB951,0x3778,
-	/* Array index: 0x1424 */ 0xB958,0x3779,
-	/* Array index: 0x1424 */ 0xB959,0x377A,
-	/* Array index: 0x1424 */ 0xB95C,0x377B,
-	/* Array index: 0x1424 */ 0xB960,0x377C,
-	/* Array index: 0x1424 */ 0xB968,0x377D,
-	/* Array index: 0x1424 */ 0xB969,0x377E,
-	/* Array index: 0x1424 */ 0xB96B,0x3821,
-	/* Array index: 0x1424 */ 0xB96D,0x3822,
-	/* Array index: 0x1424 */ 0xB974,0x3823,
-	/* Array index: 0x1424 */ 0xB975,0x3824,
-	/* Array index: 0x1424 */ 0xB978,0x3825,
-	/* Array index: 0x1424 */ 0xB97C,0x3826,
-	/* Array index: 0x1424 */ 0xB984,0x3827,
-	/* Array index: 0x1424 */ 0xB985,0x3828,
-	/* Array index: 0x1424 */ 0xB987,0x3829,
-	/* Array index: 0x1424 */ 0xB989,0x382A,
-	/* Array index: 0x1424 */ 0xB98A,0x382B,
-	/* Array index: 0x1424 */ 0xB98D,0x382C,
-	/* Array index: 0x1424 */ 0xB98E,0x382D,
-	/* Array index: 0x1424 */ 0xB9AC,0x382E,
-	/* Array index: 0x1424 */ 0xB9AD,0x382F,
-	/* Array index: 0x1424 */ 0xB9B0,0x3830,
-	/* Array index: 0x1424 */ 0xB9B4,0x3831,
-	/* Array index: 0x1424 */ 0xB9BC,0x3832,
-	/* Array index: 0x1424 */ 0xB9BD,0x3833,
-	/* Array index: 0x1424 */ 0xB9BF,0x3834,
-	/* Array index: 0x1424 */ 0xB9C1,0x3835,
-	/* Array index: 0x1424 */ 0xB9C8,0x3836,
-	/* Array index: 0x1424 */ 0xB9C9,0x3837,
-	/* Array index: 0x1424 */ 0xB9D8,0x383E,
-	/* Array index: 0x1424 */ 0xB9D9,0x383F,
-	/* Array index: 0x1424 */ 0xB9DB,0x3840,
-	/* Array index: 0x1424 */ 0xB9DD,0x3841,
-	/* Array index: 0x1424 */ 0xB9DE,0x3842,
-	/* Array index: 0x1424 */ 0xB9E8,0x3847,
-	/* Array index: 0x1424 */ 0xB9EC,0x3848,
-	/* Array index: 0x1424 */ 0xBA00,0x384F,
-	/* Array index: 0x1424 */ 0xBA01,0x3850,
-	/* Array index: 0x1424 */ 0xBA08,0x3851,
-	/* Array index: 0x1424 */ 0xBA15,0x3852,
-	/* Array index: 0x1424 */ 0xBA38,0x3853,
-	/* Array index: 0x1424 */ 0xBA39,0x3854,
-	/* Array index: 0x1424 */ 0xBA3C,0x3855,
-	/* Array index: 0x1424 */ 0xBA40,0x3856,
-	/* Array index: 0x1424 */ 0xBA42,0x3857,
-	/* Array index: 0x1424 */ 0xBA48,0x3858,
-	/* Array index: 0x1424 */ 0xBA49,0x3859,
-	/* Array index: 0x1424 */ 0xBA4B,0x385A,
-	/* Array index: 0x1424 */ 0xBA4D,0x385B,
-	/* Array index: 0x1424 */ 0xBA4E,0x385C,
-	/* Array index: 0x1424 */ 0xBA58,0x3860,
-	/* Array index: 0x1424 */ 0xBA5C,0x3861,
-	/* Array index: 0x1424 */ 0xBA70,0x3867,
-	/* Array index: 0x1424 */ 0xBA71,0x3868,
-	/* Array index: 0x1424 */ 0xBA74,0x3869,
-	/* Array index: 0x1424 */ 0xBA78,0x386A,
-	/* Array index: 0x1424 */ 0xBA8C,0x386F,
-	/* Array index: 0x1424 */ 0xBAB0,0x3874,
-	/* Array index: 0x1424 */ 0xBAB2,0x3875,
-	/* Array index: 0x1424 */ 0xBAB8,0x3876,
-	/* Array index: 0x1424 */ 0xBAB9,0x3877,
-	/* Array index: 0x1424 */ 0xBABB,0x3878,
-	/* Array index: 0x1424 */ 0xBABD,0x3879,
-	/* Array index: 0x1424 */ 0xBAC4,0x387A,
-	/* Array index: 0x1424 */ 0xBAC8,0x387B,
-	/* Array index: 0x1424 */ 0xBAD8,0x387C,
-	/* Array index: 0x1424 */ 0xBAD9,0x387D,
-	/* Array index: 0x1424 */ 0xBAFC,0x387E,
-	/* Array index: 0x1424 */ 0xBB00,0x3921,
-	/* Array index: 0x1424 */ 0xBB04,0x3922,
-	/* Array index: 0x1424 */ 0xBB0D,0x3923,
-	/* Array index: 0x1424 */ 0xBB0F,0x3924,
-	/* Array index: 0x1424 */ 0xBB11,0x3925,
-	/* Array index: 0x1424 */ 0xBB18,0x3926,
-	/* Array index: 0x1424 */ 0xBB1C,0x3927,
-	/* Array index: 0x1424 */ 0xBB20,0x3928,
-	/* Array index: 0x1424 */ 0xBB29,0x3929,
-	/* Array index: 0x1424 */ 0xBB2B,0x392A,
-	/* Array index: 0x1424 */ 0xBB44,0x3933,
-	/* Array index: 0x1424 */ 0xBB45,0x3934,
-	/* Array index: 0x1424 */ 0xBB47,0x3935,
-	/* Array index: 0x1424 */ 0xBB49,0x3936,
-	/* Array index: 0x1424 */ 0xBB4D,0x3937,
-	/* Array index: 0x1424 */ 0xBB4F,0x3938,
-	/* Array index: 0x1424 */ 0xBB50,0x3939,
-	/* Array index: 0x1424 */ 0xBB54,0x393A,
-	/* Array index: 0x1424 */ 0xBB58,0x393B,
-	/* Array index: 0x1424 */ 0xBB61,0x393C,
-	/* Array index: 0x1424 */ 0xBB63,0x393D,
-	/* Array index: 0x1424 */ 0xBB6C,0x393E,
-	/* Array index: 0x1424 */ 0xBB88,0x393F,
-	/* Array index: 0x1424 */ 0xBB8C,0x3940,
-	/* Array index: 0x1424 */ 0xBB90,0x3941,
-	/* Array index: 0x1424 */ 0xBBA4,0x3942,
-	/* Array index: 0x1424 */ 0xBBA8,0x3943,
-	/* Array index: 0x1424 */ 0xBBAC,0x3944,
-	/* Array index: 0x1424 */ 0xBBB4,0x3945,
-	/* Array index: 0x1424 */ 0xBBB7,0x3946,
-	/* Array index: 0x1424 */ 0xBBC0,0x3947,
-	/* Array index: 0x1424 */ 0xBBC4,0x3948,
-	/* Array index: 0x1424 */ 0xBBC8,0x3949,
-	/* Array index: 0x1424 */ 0xBBD0,0x394A,
-	/* Array index: 0x1424 */ 0xBBD3,0x394B,
-	/* Array index: 0x1424 */ 0xBBF8,0x394C,
-	/* Array index: 0x1424 */ 0xBBF9,0x394D,
-	/* Array index: 0x1424 */ 0xBBFC,0x394E,
-	/* Array index: 0x1424 */ 0xBBFF,0x394F,
-	/* Array index: 0x1424 */ 0xBC00,0x3950,
-	/* Array index: 0x1424 */ 0xBC02,0x3951,
-	/* Array index: 0x1424 */ 0xBC24,0x3963,
-	/* Array index: 0x1424 */ 0xBC25,0x3964,
-	/* Array index: 0x1424 */ 0xBC27,0x3965,
-	/* Array index: 0x1424 */ 0xBC29,0x3966,
-	/* Array index: 0x1424 */ 0xBC2D,0x3967,
-	/* Array index: 0x1424 */ 0xBC30,0x3968,
-	/* Array index: 0x1424 */ 0xBC31,0x3969,
-	/* Array index: 0x1424 */ 0xBC34,0x396A,
-	/* Array index: 0x1424 */ 0xBC38,0x396B,
-	/* Array index: 0x1424 */ 0xBC49,0x3971,
-	/* Array index: 0x1424 */ 0xBC4C,0x3972,
-	/* Array index: 0x1424 */ 0xBC4D,0x3973,
-	/* Array index: 0x1424 */ 0xBC50,0x3974,
-	/* Array index: 0x1424 */ 0xBC5D,0x3975,
-	/* Array index: 0x1424 */ 0xBC84,0x3976,
-	/* Array index: 0x1424 */ 0xBC85,0x3977,
-	/* Array index: 0x1424 */ 0xBC88,0x3978,
-	/* Array index: 0x1424 */ 0xBC8B,0x3979,
-	/* Array index: 0x1424 */ 0xBC8C,0x397A,
-	/* Array index: 0x1424 */ 0xBC8E,0x397B,
-	/* Array index: 0x1424 */ 0xBC94,0x397C,
-	/* Array index: 0x1424 */ 0xBC95,0x397D,
-	/* Array index: 0x1424 */ 0xBC97,0x397E,
-	/* Array index: 0x1424 */ 0xBC99,0x3A21,
-	/* Array index: 0x1424 */ 0xBC9A,0x3A22,
-	/* Array index: 0x1424 */ 0xBCA0,0x3A23,
-	/* Array index: 0x1424 */ 0xBCA1,0x3A24,
-	/* Array index: 0x1424 */ 0xBCA4,0x3A25,
-	/* Array index: 0x1424 */ 0xBCA7,0x3A26,
-	/* Array index: 0x1424 */ 0xBCA8,0x3A27,
-	/* Array index: 0x1424 */ 0xBCBC,0x3A2D,
-	/* Array index: 0x1424 */ 0xBCBD,0x3A2E,
-	/* Array index: 0x1424 */ 0xBCC0,0x3A2F,
-	/* Array index: 0x1424 */ 0xBCC4,0x3A30,
-	/* Array index: 0x1424 */ 0xBCD5,0x3A35,
-	/* Array index: 0x1424 */ 0xBCD8,0x3A36,
-	/* Array index: 0x1424 */ 0xBCDC,0x3A37,
-	/* Array index: 0x1424 */ 0xBCFC,0x3A3C,
-	/* Array index: 0x1424 */ 0xBD04,0x3A3D,
-	/* Array index: 0x1424 */ 0xBD05,0x3A3E,
-	/* Array index: 0x1424 */ 0xBD07,0x3A3F,
-	/* Array index: 0x1424 */ 0xBD09,0x3A40,
-	/* Array index: 0x1424 */ 0xBD10,0x3A41,
-	/* Array index: 0x1424 */ 0xBD14,0x3A42,
-	/* Array index: 0x1424 */ 0xBD24,0x3A43,
-	/* Array index: 0x1424 */ 0xBD2C,0x3A44,
-	/* Array index: 0x1424 */ 0xBD40,0x3A45,
-	/* Array index: 0x1424 */ 0xBD48,0x3A46,
-	/* Array index: 0x1424 */ 0xBD49,0x3A47,
-	/* Array index: 0x1424 */ 0xBD4C,0x3A48,
-	/* Array index: 0x1424 */ 0xBD50,0x3A49,
-	/* Array index: 0x1424 */ 0xBD58,0x3A4A,
-	/* Array index: 0x1424 */ 0xBD59,0x3A4B,
-	/* Array index: 0x1424 */ 0xBD64,0x3A4C,
-	/* Array index: 0x1424 */ 0xBD68,0x3A4D,
-	/* Array index: 0x1424 */ 0xBD80,0x3A4E,
-	/* Array index: 0x1424 */ 0xBD81,0x3A4F,
-	/* Array index: 0x1424 */ 0xBD84,0x3A50,
-	/* Array index: 0x1424 */ 0xBD90,0x3A55,
-	/* Array index: 0x1424 */ 0xBD91,0x3A56,
-	/* Array index: 0x1424 */ 0xBD93,0x3A57,
-	/* Array index: 0x1424 */ 0xBD95,0x3A58,
-	/* Array index: 0x1424 */ 0xBD99,0x3A59,
-	/* Array index: 0x1424 */ 0xBD9A,0x3A5A,
-	/* Array index: 0x1424 */ 0xBD9C,0x3A5B,
-	/* Array index: 0x1424 */ 0xBDA4,0x3A5C,
-	/* Array index: 0x1424 */ 0xBDB0,0x3A5D,
-	/* Array index: 0x1424 */ 0xBDB8,0x3A5E,
-	/* Array index: 0x1424 */ 0xBDD4,0x3A5F,
-	/* Array index: 0x1424 */ 0xBDD5,0x3A60,
-	/* Array index: 0x1424 */ 0xBDD8,0x3A61,
-	/* Array index: 0x1424 */ 0xBDDC,0x3A62,
-	/* Array index: 0x1424 */ 0xBDE9,0x3A63,
-	/* Array index: 0x1424 */ 0xBDF0,0x3A64,
-	/* Array index: 0x1424 */ 0xBDF4,0x3A65,
-	/* Array index: 0x1424 */ 0xBDF8,0x3A66,
-	/* Array index: 0x1424 */ 0xBE00,0x3A67,
-	/* Array index: 0x1424 */ 0xBE03,0x3A68,
-	/* Array index: 0x1424 */ 0xBE05,0x3A69,
-	/* Array index: 0x1424 */ 0xBE0C,0x3A6A,
-	/* Array index: 0x1424 */ 0xBE0D,0x3A6B,
-	/* Array index: 0x1424 */ 0xBE10,0x3A6C,
-	/* Array index: 0x1424 */ 0xBE14,0x3A6D,
-	/* Array index: 0x1424 */ 0xBE1C,0x3A6E,
-	/* Array index: 0x1424 */ 0xBE1D,0x3A6F,
-	/* Array index: 0x1424 */ 0xBE1F,0x3A70,
-	/* Array index: 0x1424 */ 0xBE44,0x3A71,
-	/* Array index: 0x1424 */ 0xBE45,0x3A72,
-	/* Array index: 0x1424 */ 0xBE48,0x3A73,
-	/* Array index: 0x1424 */ 0xBE4C,0x3A74,
-	/* Array index: 0x1424 */ 0xBE4E,0x3A75,
-	/* Array index: 0x1424 */ 0xBE54,0x3A76,
-	/* Array index: 0x1424 */ 0xBE55,0x3A77,
-	/* Array index: 0x1424 */ 0xBE60,0x3A7C,
-	/* Array index: 0x1424 */ 0xBE61,0x3A7D,
-	/* Array index: 0x1424 */ 0xBE64,0x3A7E,
-	/* Array index: 0x1424 */ 0xBE68,0x3B21,
-	/* Array index: 0x1424 */ 0xBE6A,0x3B22,
-	/* Array index: 0x1424 */ 0xBE80,0x3B2B,
-	/* Array index: 0x1424 */ 0xBE84,0x3B2C,
-	/* Array index: 0x1424 */ 0xBE98,0x3B32,
-	/* Array index: 0x1424 */ 0xBE99,0x3B33,
-	/* Array index: 0x1424 */ 0xBEA8,0x3B34,
-	/* Array index: 0x1424 */ 0xBED0,0x3B35,
-	/* Array index: 0x1424 */ 0xBED1,0x3B36,
-	/* Array index: 0x1424 */ 0xBED4,0x3B37,
-	/* Array index: 0x1424 */ 0xBED7,0x3B38,
-	/* Array index: 0x1424 */ 0xBED8,0x3B39,
-	/* Array index: 0x1424 */ 0xBEE0,0x3B3A,
-	/* Array index: 0x1424 */ 0xBEEC,0x3B3E,
-	/* Array index: 0x1424 */ 0xBF01,0x3B3F,
-	/* Array index: 0x1424 */ 0xBF08,0x3B40,
-	/* Array index: 0x1424 */ 0xBF09,0x3B41,
-	/* Array index: 0x1424 */ 0xBF40,0x3B47,
-	/* Array index: 0x1424 */ 0xBF41,0x3B48,
-	/* Array index: 0x1424 */ 0xBF44,0x3B49,
-	/* Array index: 0x1424 */ 0xBF48,0x3B4A,
-	/* Array index: 0x1424 */ 0xBF50,0x3B4B,
-	/* Array index: 0x1424 */ 0xBF51,0x3B4C,
-	/* Array index: 0x1424 */ 0xBF55,0x3B4D,
-	/* Array index: 0x1424 */ 0xBF94,0x3B4E,
-	/* Array index: 0x1424 */ 0xBFB0,0x3B4F,
-	/* Array index: 0x1424 */ 0xBFC5,0x3B50,
-	/* Array index: 0x1424 */ 0xBFCC,0x3B51,
-	/* Array index: 0x1424 */ 0xBFCD,0x3B52,
-	/* Array index: 0x1424 */ 0xBFD0,0x3B53,
-	/* Array index: 0x1424 */ 0xBFD4,0x3B54,
-	/* Array index: 0x1424 */ 0xBFDC,0x3B55,
-	/* Array index: 0x1424 */ 0xBFDF,0x3B56,
-	/* Array index: 0x1424 */ 0xBFE1,0x3B57,
-	/* Array index: 0x1424 */ 0xC03C,0x3B58,
-	/* Array index: 0x1424 */ 0xC051,0x3B59,
-	/* Array index: 0x1424 */ 0xC058,0x3B5A,
-	/* Array index: 0x1424 */ 0xC05C,0x3B5B,
-	/* Array index: 0x1424 */ 0xC060,0x3B5C,
-	/* Array index: 0x1424 */ 0xC068,0x3B5D,
-	/* Array index: 0x1424 */ 0xC069,0x3B5E,
-	/* Array index: 0x1424 */ 0xC090,0x3B5F,
-	/* Array index: 0x1424 */ 0xC091,0x3B60,
-	/* Array index: 0x1424 */ 0xC094,0x3B61,
-	/* Array index: 0x1424 */ 0xC098,0x3B62,
-	/* Array index: 0x1424 */ 0xC0A0,0x3B63,
-	/* Array index: 0x1424 */ 0xC0A1,0x3B64,
-	/* Array index: 0x1424 */ 0xC0A3,0x3B65,
-	/* Array index: 0x1424 */ 0xC0A5,0x3B66,
-	/* Array index: 0x1424 */ 0xC0C5,0x3B74,
-	/* Array index: 0x1424 */ 0xC0C8,0x3B75,
-	/* Array index: 0x1424 */ 0xC0C9,0x3B76,
-	/* Array index: 0x1424 */ 0xC0CC,0x3B77,
-	/* Array index: 0x1424 */ 0xC0D0,0x3B78,
-	/* Array index: 0x1424 */ 0xC0E4,0x3B7E,
-	/* Array index: 0x1424 */ 0xC0E5,0x3C21,
-	/* Array index: 0x1424 */ 0xC0E8,0x3C22,
-	/* Array index: 0x1424 */ 0xC0EC,0x3C23,
-	/* Array index: 0x1424 */ 0xC0F4,0x3C24,
-	/* Array index: 0x1424 */ 0xC0F5,0x3C25,
-	/* Array index: 0x1424 */ 0xC0F7,0x3C26,
-	/* Array index: 0x1424 */ 0xC0F9,0x3C27,
-	/* Array index: 0x1424 */ 0xC100,0x3C28,
-	/* Array index: 0x1424 */ 0xC104,0x3C29,
-	/* Array index: 0x1424 */ 0xC108,0x3C2A,
-	/* Array index: 0x1424 */ 0xC110,0x3C2B,
-	/* Array index: 0x1424 */ 0xC115,0x3C2C,
-	/* Array index: 0x1424 */ 0xC136,0x3C3B,
-	/* Array index: 0x1424 */ 0xC138,0x3C3C,
-	/* Array index: 0x1424 */ 0xC139,0x3C3D,
-	/* Array index: 0x1424 */ 0xC13C,0x3C3E,
-	/* Array index: 0x1424 */ 0xC140,0x3C3F,
-	/* Array index: 0x1424 */ 0xC154,0x3C45,
-	/* Array index: 0x1424 */ 0xC155,0x3C46,
-	/* Array index: 0x1424 */ 0xC158,0x3C47,
-	/* Array index: 0x1424 */ 0xC15C,0x3C48,
-	/* Array index: 0x1424 */ 0xC170,0x3C4E,
-	/* Array index: 0x1424 */ 0xC174,0x3C4F,
-	/* Array index: 0x1424 */ 0xC178,0x3C50,
-	/* Array index: 0x1424 */ 0xC185,0x3C51,
-	/* Array index: 0x1424 */ 0xC194,0x3C56,
-	/* Array index: 0x1424 */ 0xC196,0x3C57,
-	/* Array index: 0x1424 */ 0xC19C,0x3C58,
-	/* Array index: 0x1424 */ 0xC19D,0x3C59,
-	/* Array index: 0x1424 */ 0xC19F,0x3C5A,
-	/* Array index: 0x1424 */ 0xC1A1,0x3C5B,
-	/* Array index: 0x1424 */ 0xC1A5,0x3C5C,
-	/* Array index: 0x1424 */ 0xC1A8,0x3C5D,
-	/* Array index: 0x1424 */ 0xC1A9,0x3C5E,
-	/* Array index: 0x1424 */ 0xC1AC,0x3C5F,
-	/* Array index: 0x1424 */ 0xC1B0,0x3C60,
-	/* Array index: 0x1424 */ 0xC1BD,0x3C61,
-	/* Array index: 0x1424 */ 0xC1C4,0x3C62,
-	/* Array index: 0x1424 */ 0xC1C8,0x3C63,
-	/* Array index: 0x1424 */ 0xC1CC,0x3C64,
-	/* Array index: 0x1424 */ 0xC1D4,0x3C65,
-	/* Array index: 0x1424 */ 0xC1D7,0x3C66,
-	/* Array index: 0x1424 */ 0xC1D8,0x3C67,
-	/* Array index: 0x1424 */ 0xC1E0,0x3C68,
-	/* Array index: 0x1424 */ 0xC1E4,0x3C69,
-	/* Array index: 0x1424 */ 0xC1E8,0x3C6A,
-	/* Array index: 0x1424 */ 0xC1F0,0x3C6B,
-	/* Array index: 0x1424 */ 0xC1F1,0x3C6C,
-	/* Array index: 0x1424 */ 0xC1F3,0x3C6D,
-	/* Array index: 0x1424 */ 0xC1FC,0x3C6E,
-	/* Array index: 0x1424 */ 0xC1FD,0x3C6F,
-	/* Array index: 0x1424 */ 0xC200,0x3C70,
-	/* Array index: 0x1424 */ 0xC204,0x3C71,
-	/* Array index: 0x1424 */ 0xC20C,0x3C72,
-	/* Array index: 0x1424 */ 0xC20D,0x3C73,
-	/* Array index: 0x1424 */ 0xC20F,0x3C74,
-	/* Array index: 0x1424 */ 0xC211,0x3C75,
-	/* Array index: 0x1424 */ 0xC218,0x3C76,
-	/* Array index: 0x1424 */ 0xC219,0x3C77,
-	/* Array index: 0x1424 */ 0xC21C,0x3C78,
-	/* Array index: 0x1424 */ 0xC21F,0x3C79,
-	/* Array index: 0x1424 */ 0xC220,0x3C7A,
-	/* Array index: 0x1424 */ 0xC228,0x3C7B,
-	/* Array index: 0x1424 */ 0xC229,0x3C7C,
-	/* Array index: 0x1424 */ 0xC22B,0x3C7D,
-	/* Array index: 0x1424 */ 0xC22D,0x3C7E,
-	/* Array index: 0x1424 */ 0xC22F,0x3D21,
-	/* Array index: 0x1424 */ 0xC231,0x3D22,
-	/* Array index: 0x1424 */ 0xC232,0x3D23,
-	/* Array index: 0x1424 */ 0xC234,0x3D24,
-	/* Array index: 0x1424 */ 0xC248,0x3D25,
-	/* Array index: 0x1424 */ 0xC250,0x3D26,
-	/* Array index: 0x1424 */ 0xC251,0x3D27,
-	/* Array index: 0x1424 */ 0xC254,0x3D28,
-	/* Array index: 0x1424 */ 0xC258,0x3D29,
-	/* Array index: 0x1424 */ 0xC260,0x3D2A,
-	/* Array index: 0x1424 */ 0xC265,0x3D2B,
-	/* Array index: 0x1424 */ 0xC26C,0x3D2C,
-	/* Array index: 0x1424 */ 0xC26D,0x3D2D,
-	/* Array index: 0x1424 */ 0xC270,0x3D2E,
-	/* Array index: 0x1424 */ 0xC274,0x3D2F,
-	/* Array index: 0x1424 */ 0xC27C,0x3D30,
-	/* Array index: 0x1424 */ 0xC27D,0x3D31,
-	/* Array index: 0x1424 */ 0xC27F,0x3D32,
-	/* Array index: 0x1424 */ 0xC281,0x3D33,
-	/* Array index: 0x1424 */ 0xC288,0x3D34,
-	/* Array index: 0x1424 */ 0xC289,0x3D35,
-	/* Array index: 0x1424 */ 0xC290,0x3D36,
-	/* Array index: 0x1424 */ 0xC298,0x3D37,
-	/* Array index: 0x1424 */ 0xC29B,0x3D38,
-	/* Array index: 0x1424 */ 0xC29D,0x3D39,
-	/* Array index: 0x1424 */ 0xC2A4,0x3D3A,
-	/* Array index: 0x1424 */ 0xC2A5,0x3D3B,
-	/* Array index: 0x1424 */ 0xC2A8,0x3D3C,
-	/* Array index: 0x1424 */ 0xC2AC,0x3D3D,
-	/* Array index: 0x1424 */ 0xC2AD,0x3D3E,
-	/* Array index: 0x1424 */ 0xC2B4,0x3D3F,
-	/* Array index: 0x1424 */ 0xC2B5,0x3D40,
-	/* Array index: 0x1424 */ 0xC2B7,0x3D41,
-	/* Array index: 0x1424 */ 0xC2B9,0x3D42,
-	/* Array index: 0x1424 */ 0xC2DC,0x3D43,
-	/* Array index: 0x1424 */ 0xC2DD,0x3D44,
-	/* Array index: 0x1424 */ 0xC2E0,0x3D45,
-	/* Array index: 0x1424 */ 0xC2E3,0x3D46,
-	/* Array index: 0x1424 */ 0xC2E4,0x3D47,
-	/* Array index: 0x1424 */ 0xC2F6,0x3D4D,
-	/* Array index: 0x1424 */ 0xC300,0x3D52,
-	/* Array index: 0x1424 */ 0xC308,0x3D53,
-	/* Array index: 0x1424 */ 0xC309,0x3D54,
-	/* Array index: 0x1424 */ 0xC30C,0x3D55,
-	/* Array index: 0x1424 */ 0xC30D,0x3D56,
-	/* Array index: 0x1424 */ 0xC318,0x3D5A,
-	/* Array index: 0x1424 */ 0xC31C,0x3D5B,
-	/* Array index: 0x1424 */ 0xC324,0x3D5C,
-	/* Array index: 0x1424 */ 0xC325,0x3D5D,
-	/* Array index: 0x1424 */ 0xC328,0x3D5E,
-	/* Array index: 0x1424 */ 0xC329,0x3D5F,
-	/* Array index: 0x1424 */ 0xC345,0x3D60,
-	/* Array index: 0x1424 */ 0xC368,0x3D61,
-	/* Array index: 0x1424 */ 0xC369,0x3D62,
-	/* Array index: 0x1424 */ 0xC36C,0x3D63,
-	/* Array index: 0x1424 */ 0xC370,0x3D64,
-	/* Array index: 0x1424 */ 0xC372,0x3D65,
-	/* Array index: 0x1424 */ 0xC378,0x3D66,
-	/* Array index: 0x1424 */ 0xC379,0x3D67,
-	/* Array index: 0x1424 */ 0xC37C,0x3D68,
-	/* Array index: 0x1424 */ 0xC37D,0x3D69,
-	/* Array index: 0x1424 */ 0xC384,0x3D6A,
-	/* Array index: 0x1424 */ 0xC388,0x3D6B,
-	/* Array index: 0x1424 */ 0xC38C,0x3D6C,
-	/* Array index: 0x1424 */ 0xC3C0,0x3D6D,
-	/* Array index: 0x1424 */ 0xC3D8,0x3D6E,
-	/* Array index: 0x1424 */ 0xC3D9,0x3D6F,
-	/* Array index: 0x1424 */ 0xC3DC,0x3D70,
-	/* Array index: 0x1424 */ 0xC3DF,0x3D71,
-	/* Array index: 0x1424 */ 0xC3E0,0x3D72,
-	/* Array index: 0x1424 */ 0xC3E2,0x3D73,
-	/* Array index: 0x1424 */ 0xC3E8,0x3D74,
-	/* Array index: 0x1424 */ 0xC3E9,0x3D75,
-	/* Array index: 0x1424 */ 0xC3ED,0x3D76,
-	/* Array index: 0x1424 */ 0xC3F4,0x3D77,
-	/* Array index: 0x1424 */ 0xC3F5,0x3D78,
-	/* Array index: 0x1424 */ 0xC3F8,0x3D79,
-	/* Array index: 0x1424 */ 0xC408,0x3D7A,
-	/* Array index: 0x1424 */ 0xC410,0x3D7B,
-	/* Array index: 0x1424 */ 0xC424,0x3D7C,
-	/* Array index: 0x1424 */ 0xC42C,0x3D7D,
-	/* Array index: 0x1424 */ 0xC430,0x3D7E,
-	/* Array index: 0x1424 */ 0xC434,0x3E21,
-	/* Array index: 0x1424 */ 0xC43C,0x3E22,
-	/* Array index: 0x1424 */ 0xC43D,0x3E23,
-	/* Array index: 0x1424 */ 0xC448,0x3E24,
-	/* Array index: 0x1424 */ 0xC464,0x3E25,
-	/* Array index: 0x1424 */ 0xC465,0x3E26,
-	/* Array index: 0x1424 */ 0xC468,0x3E27,
-	/* Array index: 0x1424 */ 0xC46C,0x3E28,
-	/* Array index: 0x1424 */ 0xC474,0x3E29,
-	/* Array index: 0x1424 */ 0xC475,0x3E2A,
-	/* Array index: 0x1424 */ 0xC479,0x3E2B,
-	/* Array index: 0x1424 */ 0xC480,0x3E2C,
-	/* Array index: 0x1424 */ 0xC494,0x3E2D,
-	/* Array index: 0x1424 */ 0xC49C,0x3E2E,
-	/* Array index: 0x1424 */ 0xC4B8,0x3E2F,
-	/* Array index: 0x1424 */ 0xC4BC,0x3E30,
-	/* Array index: 0x1424 */ 0xC4E9,0x3E31,
-	/* Array index: 0x1424 */ 0xC4F0,0x3E32,
-	/* Array index: 0x1424 */ 0xC4F1,0x3E33,
-	/* Array index: 0x1424 */ 0xC4F4,0x3E34,
-	/* Array index: 0x1424 */ 0xC4F8,0x3E35,
-	/* Array index: 0x1424 */ 0xC4FA,0x3E36,
-	/* Array index: 0x1424 */ 0xC50C,0x3E3A,
-	/* Array index: 0x1424 */ 0xC510,0x3E3B,
-	/* Array index: 0x1424 */ 0xC514,0x3E3C,
-	/* Array index: 0x1424 */ 0xC51C,0x3E3D,
-	/* Array index: 0x1424 */ 0xC528,0x3E3E,
-	/* Array index: 0x1424 */ 0xC529,0x3E3F,
-	/* Array index: 0x1424 */ 0xC52C,0x3E40,
-	/* Array index: 0x1424 */ 0xC530,0x3E41,
-	/* Array index: 0x1424 */ 0xC538,0x3E42,
-	/* Array index: 0x1424 */ 0xC539,0x3E43,
-	/* Array index: 0x1424 */ 0xC53B,0x3E44,
-	/* Array index: 0x1424 */ 0xC53D,0x3E45,
-	/* Array index: 0x1424 */ 0xC564,0x3E58,
-	/* Array index: 0x1424 */ 0xC568,0x3E59,
-	/* Array index: 0x1424 */ 0xC57C,0x3E5F,
-	/* Array index: 0x1424 */ 0xC57D,0x3E60,
-	/* Array index: 0x1424 */ 0xC580,0x3E61,
-	/* Array index: 0x1424 */ 0xC584,0x3E62,
-	/* Array index: 0x1424 */ 0xC587,0x3E63,
-	/* Array index: 0x1424 */ 0xC58C,0x3E64,
-	/* Array index: 0x1424 */ 0xC58D,0x3E65,
-	/* Array index: 0x1424 */ 0xC58F,0x3E66,
-	/* Array index: 0x1424 */ 0xC591,0x3E67,
-	/* Array index: 0x1424 */ 0xC595,0x3E68,
-	/* Array index: 0x1424 */ 0xC597,0x3E69,
-	/* Array index: 0x1424 */ 0xC598,0x3E6A,
-	/* Array index: 0x1424 */ 0xC59C,0x3E6B,
-	/* Array index: 0x1424 */ 0xC5A0,0x3E6C,
-	/* Array index: 0x1424 */ 0xC5A9,0x3E6D,
-	/* Array index: 0x1424 */ 0xC5B4,0x3E6E,
-	/* Array index: 0x1424 */ 0xC5B5,0x3E6F,
-	/* Array index: 0x1424 */ 0xC5D4,0x3F23,
-	/* Array index: 0x1424 */ 0xC5D8,0x3F24,
-	/* Array index: 0x1424 */ 0xC5E0,0x3F25,
-	/* Array index: 0x1424 */ 0xC5E1,0x3F26,
-	/* Array index: 0x1424 */ 0xC5E3,0x3F27,
-	/* Array index: 0x1424 */ 0xC5E5,0x3F28,
-	/* Array index: 0x1424 */ 0xC5F4,0x3F2D,
-	/* Array index: 0x1424 */ 0xC5F6,0x3F2E,
-	/* Array index: 0x1424 */ 0xC5F7,0x3F2F,
-	/* Array index: 0x1424 */ 0xC60C,0x3F3A,
-	/* Array index: 0x1424 */ 0xC610,0x3F3B,
-	/* Array index: 0x1424 */ 0xC624,0x3F40,
-	/* Array index: 0x1424 */ 0xC625,0x3F41,
-	/* Array index: 0x1424 */ 0xC628,0x3F42,
-	/* Array index: 0x1424 */ 0xC640,0x3F4D,
-	/* Array index: 0x1424 */ 0xC641,0x3F4E,
-	/* Array index: 0x1424 */ 0xC644,0x3F4F,
-	/* Array index: 0x1424 */ 0xC648,0x3F50,
-	/* Array index: 0x1424 */ 0xC65C,0x3F56,
-	/* Array index: 0x1424 */ 0xC65D,0x3F57,
-	/* Array index: 0x1424 */ 0xC660,0x3F58,
-	/* Array index: 0x1424 */ 0xC66C,0x3F59,
-	/* Array index: 0x1424 */ 0xC66F,0x3F5A,
-	/* Array index: 0x1424 */ 0xC671,0x3F5B,
-	/* Array index: 0x1424 */ 0xC678,0x3F5C,
-	/* Array index: 0x1424 */ 0xC679,0x3F5D,
-	/* Array index: 0x1424 */ 0xC67C,0x3F5E,
-	/* Array index: 0x1424 */ 0xC680,0x3F5F,
-	/* Array index: 0x1424 */ 0xC688,0x3F60,
-	/* Array index: 0x1424 */ 0xC689,0x3F61,
-	/* Array index: 0x1424 */ 0xC68B,0x3F62,
-	/* Array index: 0x1424 */ 0xC68D,0x3F63,
-	/* Array index: 0x1424 */ 0xC694,0x3F64,
-	/* Array index: 0x1424 */ 0xC695,0x3F65,
-	/* Array index: 0x1424 */ 0xC698,0x3F66,
-	/* Array index: 0x1424 */ 0xC69C,0x3F67,
-	/* Array index: 0x1424 */ 0xC6A4,0x3F68,
-	/* Array index: 0x1424 */ 0xC6A5,0x3F69,
-	/* Array index: 0x1424 */ 0xC6A7,0x3F6A,
-	/* Array index: 0x1424 */ 0xC6A9,0x3F6B,
-	/* Array index: 0x1424 */ 0xC6B0,0x3F6C,
-	/* Array index: 0x1424 */ 0xC6B1,0x3F6D,
-	/* Array index: 0x1424 */ 0xC6B4,0x3F6E,
-	/* Array index: 0x1424 */ 0xC6C0,0x3F72,
-	/* Array index: 0x1424 */ 0xC6C1,0x3F73,
-	/* Array index: 0x1424 */ 0xC6C3,0x3F74,
-	/* Array index: 0x1424 */ 0xC6C5,0x3F75,
-	/* Array index: 0x1424 */ 0xC6CC,0x3F76,
-	/* Array index: 0x1424 */ 0xC6CD,0x3F77,
-	/* Array index: 0x1424 */ 0xC6D0,0x3F78,
-	/* Array index: 0x1424 */ 0xC6D4,0x3F79,
-	/* Array index: 0x1424 */ 0xC6DC,0x3F7A,
-	/* Array index: 0x1424 */ 0xC6DD,0x3F7B,
-	/* Array index: 0x1424 */ 0xC6E0,0x3F7C,
-	/* Array index: 0x1424 */ 0xC6E1,0x3F7D,
-	/* Array index: 0x1424 */ 0xC6E8,0x3F7E,
-	/* Array index: 0x1424 */ 0xC6E9,0x4021,
-	/* Array index: 0x1424 */ 0xC6EC,0x4022,
-	/* Array index: 0x1424 */ 0xC6F0,0x4023,
-	/* Array index: 0x1424 */ 0xC6F8,0x4024,
-	/* Array index: 0x1424 */ 0xC6F9,0x4025,
-	/* Array index: 0x1424 */ 0xC6FD,0x4026,
-	/* Array index: 0x1424 */ 0xC704,0x4027,
-	/* Array index: 0x1424 */ 0xC705,0x4028,
-	/* Array index: 0x1424 */ 0xC708,0x4029,
-	/* Array index: 0x1424 */ 0xC70C,0x402A,
-	/* Array index: 0x1424 */ 0xC714,0x402B,
-	/* Array index: 0x1424 */ 0xC715,0x402C,
-	/* Array index: 0x1424 */ 0xC717,0x402D,
-	/* Array index: 0x1424 */ 0xC719,0x402E,
-	/* Array index: 0x1424 */ 0xC720,0x402F,
-	/* Array index: 0x1424 */ 0xC721,0x4030,
-	/* Array index: 0x1424 */ 0xC724,0x4031,
-	/* Array index: 0x1424 */ 0xC728,0x4032,
-	/* Array index: 0x1424 */ 0xC730,0x4033,
-	/* Array index: 0x1424 */ 0xC731,0x4034,
-	/* Array index: 0x1424 */ 0xC733,0x4035,
-	/* Array index: 0x1424 */ 0xC735,0x4036,
-	/* Array index: 0x1424 */ 0xC737,0x4037,
-	/* Array index: 0x1424 */ 0xC73C,0x4038,
-	/* Array index: 0x1424 */ 0xC73D,0x4039,
-	/* Array index: 0x1424 */ 0xC740,0x403A,
-	/* Array index: 0x1424 */ 0xC744,0x403B,
-	/* Array index: 0x1424 */ 0xC74A,0x403C,
-	/* Array index: 0x1424 */ 0xC74C,0x403D,
-	/* Array index: 0x1424 */ 0xC74D,0x403E,
-	/* Array index: 0x1424 */ 0xC75C,0x4048,
-	/* Array index: 0x1424 */ 0xC760,0x4049,
-	/* Array index: 0x1424 */ 0xC768,0x404A,
-	/* Array index: 0x1424 */ 0xC76B,0x404B,
-	/* Array index: 0x1424 */ 0xC774,0x404C,
-	/* Array index: 0x1424 */ 0xC775,0x404D,
-	/* Array index: 0x1424 */ 0xC778,0x404E,
-	/* Array index: 0x1424 */ 0xC78E,0x4059,
-	/* Array index: 0x1424 */ 0xC790,0x405A,
-	/* Array index: 0x1424 */ 0xC791,0x405B,
-	/* Array index: 0x1424 */ 0xC7AC,0x4067,
-	/* Array index: 0x1424 */ 0xC7AD,0x4068,
-	/* Array index: 0x1424 */ 0xC7B0,0x4069,
-	/* Array index: 0x1424 */ 0xC7B4,0x406A,
-	/* Array index: 0x1424 */ 0xC7C8,0x4070,
-	/* Array index: 0x1424 */ 0xC7C9,0x4071,
-	/* Array index: 0x1424 */ 0xC7CC,0x4072,
-	/* Array index: 0x1424 */ 0xC7CE,0x4073,
-	/* Array index: 0x1424 */ 0xC7D0,0x4074,
-	/* Array index: 0x1424 */ 0xC7D8,0x4075,
-	/* Array index: 0x1424 */ 0xC7DD,0x4076,
-	/* Array index: 0x1424 */ 0xC7E4,0x4077,
-	/* Array index: 0x1424 */ 0xC7E8,0x4078,
-	/* Array index: 0x1424 */ 0xC7EC,0x4079,
-	/* Array index: 0x1424 */ 0xC800,0x407A,
-	/* Array index: 0x1424 */ 0xC801,0x407B,
-	/* Array index: 0x1424 */ 0xC804,0x407C,
-	/* Array index: 0x1424 */ 0xC808,0x407D,
-	/* Array index: 0x1424 */ 0xC80A,0x407E,
-	/* Array index: 0x1424 */ 0xC810,0x4121,
-	/* Array index: 0x1424 */ 0xC811,0x4122,
-	/* Array index: 0x1424 */ 0xC813,0x4123,
-	/* Array index: 0x1424 */ 0xC815,0x4124,
-	/* Array index: 0x1424 */ 0xC816,0x4125,
-	/* Array index: 0x1424 */ 0xC81C,0x4126,
-	/* Array index: 0x1424 */ 0xC81D,0x4127,
-	/* Array index: 0x1424 */ 0xC820,0x4128,
-	/* Array index: 0x1424 */ 0xC824,0x4129,
-	/* Array index: 0x1424 */ 0xC82C,0x412A,
-	/* Array index: 0x1424 */ 0xC82D,0x412B,
-	/* Array index: 0x1424 */ 0xC82F,0x412C,
-	/* Array index: 0x1424 */ 0xC831,0x412D,
-	/* Array index: 0x1424 */ 0xC838,0x412E,
-	/* Array index: 0x1424 */ 0xC83C,0x412F,
-	/* Array index: 0x1424 */ 0xC840,0x4130,
-	/* Array index: 0x1424 */ 0xC848,0x4131,
-	/* Array index: 0x1424 */ 0xC849,0x4132,
-	/* Array index: 0x1424 */ 0xC84C,0x4133,
-	/* Array index: 0x1424 */ 0xC84D,0x4134,
-	/* Array index: 0x1424 */ 0xC854,0x4135,
-	/* Array index: 0x1424 */ 0xC870,0x4136,
-	/* Array index: 0x1424 */ 0xC871,0x4137,
-	/* Array index: 0x1424 */ 0xC874,0x4138,
-	/* Array index: 0x1424 */ 0xC878,0x4139,
-	/* Array index: 0x1424 */ 0xC87A,0x413A,
-	/* Array index: 0x1424 */ 0xC880,0x413B,
-	/* Array index: 0x1424 */ 0xC881,0x413C,
-	/* Array index: 0x1424 */ 0xC894,0x4144,
-	/* Array index: 0x1424 */ 0xC89D,0x4145,
-	/* Array index: 0x1424 */ 0xC89F,0x4146,
-	/* Array index: 0x1424 */ 0xC8A1,0x4147,
-	/* Array index: 0x1424 */ 0xC8A8,0x4148,
-	/* Array index: 0x1424 */ 0xC8BC,0x4149,
-	/* Array index: 0x1424 */ 0xC8BD,0x414A,
-	/* Array index: 0x1424 */ 0xC8C4,0x414B,
-	/* Array index: 0x1424 */ 0xC8C8,0x414C,
-	/* Array index: 0x1424 */ 0xC8CC,0x414D,
-	/* Array index: 0x1424 */ 0xC8D4,0x414E,
-	/* Array index: 0x1424 */ 0xC8D5,0x414F,
-	/* Array index: 0x1424 */ 0xC8D7,0x4150,
-	/* Array index: 0x1424 */ 0xC8D9,0x4151,
-	/* Array index: 0x1424 */ 0xC8E0,0x4152,
-	/* Array index: 0x1424 */ 0xC8E1,0x4153,
-	/* Array index: 0x1424 */ 0xC8E4,0x4154,
-	/* Array index: 0x1424 */ 0xC8F5,0x4155,
-	/* Array index: 0x1424 */ 0xC8FC,0x4156,
-	/* Array index: 0x1424 */ 0xC8FD,0x4157,
-	/* Array index: 0x1424 */ 0xC900,0x4158,
-	/* Array index: 0x1424 */ 0xC90C,0x415C,
-	/* Array index: 0x1424 */ 0xC90D,0x415D,
-	/* Array index: 0x1424 */ 0xC90F,0x415E,
-	/* Array index: 0x1424 */ 0xC911,0x415F,
-	/* Array index: 0x1424 */ 0xC918,0x4160,
-	/* Array index: 0x1424 */ 0xC92C,0x4161,
-	/* Array index: 0x1424 */ 0xC934,0x4162,
-	/* Array index: 0x1424 */ 0xC950,0x4163,
-	/* Array index: 0x1424 */ 0xC951,0x4164,
-	/* Array index: 0x1424 */ 0xC954,0x4165,
-	/* Array index: 0x1424 */ 0xC958,0x4166,
-	/* Array index: 0x1424 */ 0xC960,0x4167,
-	/* Array index: 0x1424 */ 0xC961,0x4168,
-	/* Array index: 0x1424 */ 0xC963,0x4169,
-	/* Array index: 0x1424 */ 0xC96C,0x416A,
-	/* Array index: 0x1424 */ 0xC970,0x416B,
-	/* Array index: 0x1424 */ 0xC974,0x416C,
-	/* Array index: 0x1424 */ 0xC97C,0x416D,
-	/* Array index: 0x1424 */ 0xC988,0x416E,
-	/* Array index: 0x1424 */ 0xC989,0x416F,
-	/* Array index: 0x1424 */ 0xC98C,0x4170,
-	/* Array index: 0x1424 */ 0xC990,0x4171,
-	/* Array index: 0x1424 */ 0xC998,0x4172,
-	/* Array index: 0x1424 */ 0xC999,0x4173,
-	/* Array index: 0x1424 */ 0xC99B,0x4174,
-	/* Array index: 0x1424 */ 0xC99D,0x4175,
-	/* Array index: 0x1424 */ 0xC9C0,0x4176,
-	/* Array index: 0x1424 */ 0xC9C1,0x4177,
-	/* Array index: 0x1424 */ 0xC9C4,0x4178,
-	/* Array index: 0x1424 */ 0xC9C7,0x4179,
-	/* Array index: 0x1424 */ 0xC9C8,0x417A,
-	/* Array index: 0x1424 */ 0xC9CA,0x417B,
-	/* Array index: 0x1424 */ 0xC9D0,0x417C,
-	/* Array index: 0x1424 */ 0xC9D1,0x417D,
-	/* Array index: 0x1424 */ 0xC9D3,0x417E,
-	/* Array index: 0x1424 */ 0xC9D5,0x4221,
-	/* Array index: 0x1424 */ 0xC9D6,0x4222,
-	/* Array index: 0x1424 */ 0xC9E0,0x4227,
-	/* Array index: 0x1424 */ 0xC9E2,0x4228,
-	/* Array index: 0x1424 */ 0xC9E4,0x4229,
-	/* Array index: 0x1424 */ 0xC9E7,0x422A,
-	/* Array index: 0x1424 */ 0xC9F8,0x4230,
-	/* Array index: 0x1424 */ 0xC9F9,0x4231,
-	/* Array index: 0x1424 */ 0xC9FC,0x4232,
-	/* Array index: 0x1424 */ 0xCA00,0x4233,
-	/* Array index: 0x1424 */ 0xCA14,0x4239,
-	/* Array index: 0x1424 */ 0xCA18,0x423A,
-	/* Array index: 0x1424 */ 0xCA29,0x423B,
-	/* Array index: 0x1424 */ 0xCA4C,0x423C,
-	/* Array index: 0x1424 */ 0xCA4D,0x423D,
-	/* Array index: 0x1424 */ 0xCA50,0x423E,
-	/* Array index: 0x1424 */ 0xCA54,0x423F,
-	/* Array index: 0x1424 */ 0xCA68,0x4245,
-	/* Array index: 0x1424 */ 0xCA7D,0x4246,
-	/* Array index: 0x1424 */ 0xCA84,0x4247,
-	/* Array index: 0x1424 */ 0xCA98,0x4248,
-	/* Array index: 0x1424 */ 0xCABC,0x4249,
-	/* Array index: 0x1424 */ 0xCABD,0x424A,
-	/* Array index: 0x1424 */ 0xCAC0,0x424B,
-	/* Array index: 0x1424 */ 0xCAC4,0x424C,
-	/* Array index: 0x1424 */ 0xCACC,0x424D,
-	/* Array index: 0x1424 */ 0xCACD,0x424E,
-	/* Array index: 0x1424 */ 0xCACF,0x424F,
-	/* Array index: 0x1424 */ 0xCAD1,0x4250,
-	/* Array index: 0x1424 */ 0xCAD3,0x4251,
-	/* Array index: 0x1424 */ 0xCAD8,0x4252,
-	/* Array index: 0x1424 */ 0xCAD9,0x4253,
-	/* Array index: 0x1424 */ 0xCAE0,0x4254,
-	/* Array index: 0x1424 */ 0xCAEC,0x4255,
-	/* Array index: 0x1424 */ 0xCAF4,0x4256,
-	/* Array index: 0x1424 */ 0xCB08,0x4257,
-	/* Array index: 0x1424 */ 0xCB10,0x4258,
-	/* Array index: 0x1424 */ 0xCB14,0x4259,
-	/* Array index: 0x1424 */ 0xCB18,0x425A,
-	/* Array index: 0x1424 */ 0xCB20,0x425B,
-	/* Array index: 0x1424 */ 0xCB21,0x425C,
-	/* Array index: 0x1424 */ 0xCB41,0x425D,
-	/* Array index: 0x1424 */ 0xCB48,0x425E,
-	/* Array index: 0x1424 */ 0xCB49,0x425F,
-	/* Array index: 0x1424 */ 0xCB4C,0x4260,
-	/* Array index: 0x1424 */ 0xCB50,0x4261,
-	/* Array index: 0x1424 */ 0xCB58,0x4262,
-	/* Array index: 0x1424 */ 0xCB59,0x4263,
-	/* Array index: 0x1424 */ 0xCB5D,0x4264,
-	/* Array index: 0x1424 */ 0xCB64,0x4265,
-	/* Array index: 0x1424 */ 0xCB78,0x4266,
-	/* Array index: 0x1424 */ 0xCB79,0x4267,
-	/* Array index: 0x1424 */ 0xCB9C,0x4268,
-	/* Array index: 0x1424 */ 0xCBB8,0x4269,
-	/* Array index: 0x1424 */ 0xCBD4,0x426A,
-	/* Array index: 0x1424 */ 0xCBE4,0x426B,
-	/* Array index: 0x1424 */ 0xCBE7,0x426C,
-	/* Array index: 0x1424 */ 0xCBE9,0x426D,
-	/* Array index: 0x1424 */ 0xCC0C,0x426E,
-	/* Array index: 0x1424 */ 0xCC0D,0x426F,
-	/* Array index: 0x1424 */ 0xCC10,0x4270,
-	/* Array index: 0x1424 */ 0xCC14,0x4271,
-	/* Array index: 0x1424 */ 0xCC1C,0x4272,
-	/* Array index: 0x1424 */ 0xCC1D,0x4273,
-	/* Array index: 0x1424 */ 0xCC21,0x4274,
-	/* Array index: 0x1424 */ 0xCC22,0x4275,
-	/* Array index: 0x1424 */ 0xCC2C,0x4279,
-	/* Array index: 0x1424 */ 0xCC2E,0x427A,
-	/* Array index: 0x1424 */ 0xCC30,0x427B,
-	/* Array index: 0x1424 */ 0xCC44,0x4324,
-	/* Array index: 0x1424 */ 0xCC45,0x4325,
-	/* Array index: 0x1424 */ 0xCC48,0x4326,
-	/* Array index: 0x1424 */ 0xCC4C,0x4327,
-	/* Array index: 0x1424 */ 0xCC60,0x432D,
-	/* Array index: 0x1424 */ 0xCC64,0x432E,
-	/* Array index: 0x1424 */ 0xCC66,0x432F,
-	/* Array index: 0x1424 */ 0xCC68,0x4330,
-	/* Array index: 0x1424 */ 0xCC70,0x4331,
-	/* Array index: 0x1424 */ 0xCC75,0x4332,
-	/* Array index: 0x1424 */ 0xCC98,0x4333,
-	/* Array index: 0x1424 */ 0xCC99,0x4334,
-	/* Array index: 0x1424 */ 0xCC9C,0x4335,
-	/* Array index: 0x1424 */ 0xCCA0,0x4336,
-	/* Array index: 0x1424 */ 0xCCB4,0x433C,
-	/* Array index: 0x1424 */ 0xCCB5,0x433D,
-	/* Array index: 0x1424 */ 0xCCB8,0x433E,
-	/* Array index: 0x1424 */ 0xCCBC,0x433F,
-	/* Array index: 0x1424 */ 0xCCC4,0x4340,
-	/* Array index: 0x1424 */ 0xCCC5,0x4341,
-	/* Array index: 0x1424 */ 0xCCC7,0x4342,
-	/* Array index: 0x1424 */ 0xCCC9,0x4343,
-	/* Array index: 0x1424 */ 0xCCD0,0x4344,
-	/* Array index: 0x1424 */ 0xCCD4,0x4345,
-	/* Array index: 0x1424 */ 0xCCE4,0x4346,
-	/* Array index: 0x1424 */ 0xCCEC,0x4347,
-	/* Array index: 0x1424 */ 0xCCF0,0x4348,
-	/* Array index: 0x1424 */ 0xCD01,0x4349,
-	/* Array index: 0x1424 */ 0xCD08,0x434A,
-	/* Array index: 0x1424 */ 0xCD09,0x434B,
-	/* Array index: 0x1424 */ 0xCD0C,0x434C,
-	/* Array index: 0x1424 */ 0xCD10,0x434D,
-	/* Array index: 0x1424 */ 0xCD18,0x434E,
-	/* Array index: 0x1424 */ 0xCD19,0x434F,
-	/* Array index: 0x1424 */ 0xCD1B,0x4350,
-	/* Array index: 0x1424 */ 0xCD1D,0x4351,
-	/* Array index: 0x1424 */ 0xCD24,0x4352,
-	/* Array index: 0x1424 */ 0xCD28,0x4353,
-	/* Array index: 0x1424 */ 0xCD2C,0x4354,
-	/* Array index: 0x1424 */ 0xCD39,0x4355,
-	/* Array index: 0x1424 */ 0xCD5C,0x4356,
-	/* Array index: 0x1424 */ 0xCD60,0x4357,
-	/* Array index: 0x1424 */ 0xCD64,0x4358,
-	/* Array index: 0x1424 */ 0xCD6C,0x4359,
-	/* Array index: 0x1424 */ 0xCD6D,0x435A,
-	/* Array index: 0x1424 */ 0xCD6F,0x435B,
-	/* Array index: 0x1424 */ 0xCD71,0x435C,
-	/* Array index: 0x1424 */ 0xCD78,0x435D,
-	/* Array index: 0x1424 */ 0xCD88,0x435E,
-	/* Array index: 0x1424 */ 0xCD94,0x435F,
-	/* Array index: 0x1424 */ 0xCD95,0x4360,
-	/* Array index: 0x1424 */ 0xCD98,0x4361,
-	/* Array index: 0x1424 */ 0xCD9C,0x4362,
-	/* Array index: 0x1424 */ 0xCDA4,0x4363,
-	/* Array index: 0x1424 */ 0xCDA5,0x4364,
-	/* Array index: 0x1424 */ 0xCDA7,0x4365,
-	/* Array index: 0x1424 */ 0xCDA9,0x4366,
-	/* Array index: 0x1424 */ 0xCDB0,0x4367,
-	/* Array index: 0x1424 */ 0xCDC4,0x4368,
-	/* Array index: 0x1424 */ 0xCDCC,0x4369,
-	/* Array index: 0x1424 */ 0xCDD0,0x436A,
-	/* Array index: 0x1424 */ 0xCDE8,0x436B,
-	/* Array index: 0x1424 */ 0xCDEC,0x436C,
-	/* Array index: 0x1424 */ 0xCDF0,0x436D,
-	/* Array index: 0x1424 */ 0xCDF8,0x436E,
-	/* Array index: 0x1424 */ 0xCDF9,0x436F,
-	/* Array index: 0x1424 */ 0xCDFB,0x4370,
-	/* Array index: 0x1424 */ 0xCDFD,0x4371,
-	/* Array index: 0x1424 */ 0xCE04,0x4372,
-	/* Array index: 0x1424 */ 0xCE08,0x4373,
-	/* Array index: 0x1424 */ 0xCE0C,0x4374,
-	/* Array index: 0x1424 */ 0xCE14,0x4375,
-	/* Array index: 0x1424 */ 0xCE19,0x4376,
-	/* Array index: 0x1424 */ 0xCE20,0x4377,
-	/* Array index: 0x1424 */ 0xCE21,0x4378,
-	/* Array index: 0x1424 */ 0xCE24,0x4379,
-	/* Array index: 0x1424 */ 0xCE28,0x437A,
-	/* Array index: 0x1424 */ 0xCE30,0x437B,
-	/* Array index: 0x1424 */ 0xCE31,0x437C,
-	/* Array index: 0x1424 */ 0xCE33,0x437D,
-	/* Array index: 0x1424 */ 0xCE35,0x437E,
-	/* Array index: 0x1424 */ 0xCE58,0x4421,
-	/* Array index: 0x1424 */ 0xCE59,0x4422,
-	/* Array index: 0x1424 */ 0xCE5C,0x4423,
-	/* Array index: 0x1424 */ 0xCE68,0x4427,
-	/* Array index: 0x1424 */ 0xCE69,0x4428,
-	/* Array index: 0x1424 */ 0xCE6B,0x4429,
-	/* Array index: 0x1424 */ 0xCE6D,0x442A,
-	/* Array index: 0x1424 */ 0xCE74,0x442B,
-	/* Array index: 0x1424 */ 0xCE75,0x442C,
-	/* Array index: 0x1424 */ 0xCE78,0x442D,
-	/* Array index: 0x1424 */ 0xCE7C,0x442E,
-	/* Array index: 0x1424 */ 0xCE84,0x442F,
-	/* Array index: 0x1424 */ 0xCE85,0x4430,
-	/* Array index: 0x1424 */ 0xCE87,0x4431,
-	/* Array index: 0x1424 */ 0xCE89,0x4432,
-	/* Array index: 0x1424 */ 0xCE90,0x4433,
-	/* Array index: 0x1424 */ 0xCE91,0x4434,
-	/* Array index: 0x1424 */ 0xCE94,0x4435,
-	/* Array index: 0x1424 */ 0xCE98,0x4436,
-	/* Array index: 0x1424 */ 0xCEAC,0x443C,
-	/* Array index: 0x1424 */ 0xCEAD,0x443D,
-	/* Array index: 0x1424 */ 0xCEC1,0x443E,
-	/* Array index: 0x1424 */ 0xCEE4,0x443F,
-	/* Array index: 0x1424 */ 0xCEE5,0x4440,
-	/* Array index: 0x1424 */ 0xCEE8,0x4441,
-	/* Array index: 0x1424 */ 0xCEEB,0x4442,
-	/* Array index: 0x1424 */ 0xCEEC,0x4443,
-	/* Array index: 0x1424 */ 0xCF00,0x4449,
-	/* Array index: 0x1424 */ 0xCF01,0x444A,
-	/* Array index: 0x1424 */ 0xCF04,0x444B,
-	/* Array index: 0x1424 */ 0xCF08,0x444C,
-	/* Array index: 0x1424 */ 0xCF10,0x444D,
-	/* Array index: 0x1424 */ 0xCF11,0x444E,
-	/* Array index: 0x1424 */ 0xCF13,0x444F,
-	/* Array index: 0x1424 */ 0xCF15,0x4450,
-	/* Array index: 0x1424 */ 0xCF1C,0x4451,
-	/* Array index: 0x1424 */ 0xCF20,0x4452,
-	/* Array index: 0x1424 */ 0xCF24,0x4453,
-	/* Array index: 0x1424 */ 0xCF38,0x4459,
-	/* Array index: 0x1424 */ 0xCF54,0x445A,
-	/* Array index: 0x1424 */ 0xCF55,0x445B,
-	/* Array index: 0x1424 */ 0xCF58,0x445C,
-	/* Array index: 0x1424 */ 0xCF5C,0x445D,
-	/* Array index: 0x1424 */ 0xCF64,0x445E,
-	/* Array index: 0x1424 */ 0xCF65,0x445F,
-	/* Array index: 0x1424 */ 0xCF67,0x4460,
-	/* Array index: 0x1424 */ 0xCF69,0x4461,
-	/* Array index: 0x1424 */ 0xCF70,0x4462,
-	/* Array index: 0x1424 */ 0xCF71,0x4463,
-	/* Array index: 0x1424 */ 0xCF74,0x4464,
-	/* Array index: 0x1424 */ 0xCF78,0x4465,
-	/* Array index: 0x1424 */ 0xCF80,0x4466,
-	/* Array index: 0x1424 */ 0xCF85,0x4467,
-	/* Array index: 0x1424 */ 0xCF8C,0x4468,
-	/* Array index: 0x1424 */ 0xCFA1,0x4469,
-	/* Array index: 0x1424 */ 0xCFA8,0x446A,
-	/* Array index: 0x1424 */ 0xCFB0,0x446B,
-	/* Array index: 0x1424 */ 0xCFC4,0x446C,
-	/* Array index: 0x1424 */ 0xCFE0,0x446D,
-	/* Array index: 0x1424 */ 0xCFE1,0x446E,
-	/* Array index: 0x1424 */ 0xCFE4,0x446F,
-	/* Array index: 0x1424 */ 0xCFE8,0x4470,
-	/* Array index: 0x1424 */ 0xCFF0,0x4471,
-	/* Array index: 0x1424 */ 0xCFF1,0x4472,
-	/* Array index: 0x1424 */ 0xCFF3,0x4473,
-	/* Array index: 0x1424 */ 0xCFF5,0x4474,
-	/* Array index: 0x1424 */ 0xCFFC,0x4475,
-	/* Array index: 0x1424 */ 0xD000,0x4476,
-	/* Array index: 0x1424 */ 0xD004,0x4477,
-	/* Array index: 0x1424 */ 0xD011,0x4478,
-	/* Array index: 0x1424 */ 0xD018,0x4479,
-	/* Array index: 0x1424 */ 0xD02D,0x447A,
-	/* Array index: 0x1424 */ 0xD034,0x447B,
-	/* Array index: 0x1424 */ 0xD035,0x447C,
-	/* Array index: 0x1424 */ 0xD038,0x447D,
-	/* Array index: 0x1424 */ 0xD03C,0x447E,
-	/* Array index: 0x1424 */ 0xD044,0x4521,
-	/* Array index: 0x1424 */ 0xD045,0x4522,
-	/* Array index: 0x1424 */ 0xD047,0x4523,
-	/* Array index: 0x1424 */ 0xD049,0x4524,
-	/* Array index: 0x1424 */ 0xD050,0x4525,
-	/* Array index: 0x1424 */ 0xD054,0x4526,
-	/* Array index: 0x1424 */ 0xD058,0x4527,
-	/* Array index: 0x1424 */ 0xD060,0x4528,
-	/* Array index: 0x1424 */ 0xD06C,0x4529,
-	/* Array index: 0x1424 */ 0xD06D,0x452A,
-	/* Array index: 0x1424 */ 0xD070,0x452B,
-	/* Array index: 0x1424 */ 0xD074,0x452C,
-	/* Array index: 0x1424 */ 0xD07C,0x452D,
-	/* Array index: 0x1424 */ 0xD07D,0x452E,
-	/* Array index: 0x1424 */ 0xD081,0x452F,
-	/* Array index: 0x1424 */ 0xD0A4,0x4530,
-	/* Array index: 0x1424 */ 0xD0A5,0x4531,
-	/* Array index: 0x1424 */ 0xD0A8,0x4532,
-	/* Array index: 0x1424 */ 0xD0AC,0x4533,
-	/* Array index: 0x1424 */ 0xD0B4,0x4534,
-	/* Array index: 0x1424 */ 0xD0B5,0x4535,
-	/* Array index: 0x1424 */ 0xD0B7,0x4536,
-	/* Array index: 0x1424 */ 0xD0B9,0x4537,
-	/* Array index: 0x1424 */ 0xD0C0,0x4538,
-	/* Array index: 0x1424 */ 0xD0C1,0x4539,
-	/* Array index: 0x1424 */ 0xD0C4,0x453A,
-	/* Array index: 0x1424 */ 0xD0C8,0x453B,
-	/* Array index: 0x1424 */ 0xD0C9,0x453C,
-	/* Array index: 0x1424 */ 0xD0DC,0x4542,
-	/* Array index: 0x1424 */ 0xD0DD,0x4543,
-	/* Array index: 0x1424 */ 0xD0E0,0x4544,
-	/* Array index: 0x1424 */ 0xD0E4,0x4545,
-	/* Array index: 0x1424 */ 0xD0F8,0x454B,
-	/* Array index: 0x1424 */ 0xD10D,0x454C,
-	/* Array index: 0x1424 */ 0xD130,0x454D,
-	/* Array index: 0x1424 */ 0xD131,0x454E,
-	/* Array index: 0x1424 */ 0xD134,0x454F,
-	/* Array index: 0x1424 */ 0xD138,0x4550,
-	/* Array index: 0x1424 */ 0xD13A,0x4551,
-	/* Array index: 0x1424 */ 0xD14C,0x4557,
-	/* Array index: 0x1424 */ 0xD14D,0x4558,
-	/* Array index: 0x1424 */ 0xD150,0x4559,
-	/* Array index: 0x1424 */ 0xD154,0x455A,
-	/* Array index: 0x1424 */ 0xD15C,0x455B,
-	/* Array index: 0x1424 */ 0xD15D,0x455C,
-	/* Array index: 0x1424 */ 0xD15F,0x455D,
-	/* Array index: 0x1424 */ 0xD161,0x455E,
-	/* Array index: 0x1424 */ 0xD168,0x455F,
-	/* Array index: 0x1424 */ 0xD16C,0x4560,
-	/* Array index: 0x1424 */ 0xD17C,0x4561,
-	/* Array index: 0x1424 */ 0xD184,0x4562,
-	/* Array index: 0x1424 */ 0xD188,0x4563,
-	/* Array index: 0x1424 */ 0xD1A0,0x4564,
-	/* Array index: 0x1424 */ 0xD1A1,0x4565,
-	/* Array index: 0x1424 */ 0xD1A4,0x4566,
-	/* Array index: 0x1424 */ 0xD1A8,0x4567,
-	/* Array index: 0x1424 */ 0xD1B0,0x4568,
-	/* Array index: 0x1424 */ 0xD1B1,0x4569,
-	/* Array index: 0x1424 */ 0xD1B3,0x456A,
-	/* Array index: 0x1424 */ 0xD1B5,0x456B,
-	/* Array index: 0x1424 */ 0xD1BA,0x456C,
-	/* Array index: 0x1424 */ 0xD1BC,0x456D,
-	/* Array index: 0x1424 */ 0xD1C0,0x456E,
-	/* Array index: 0x1424 */ 0xD1D8,0x456F,
-	/* Array index: 0x1424 */ 0xD1F4,0x4570,
-	/* Array index: 0x1424 */ 0xD1F8,0x4571,
-	/* Array index: 0x1424 */ 0xD207,0x4572,
-	/* Array index: 0x1424 */ 0xD209,0x4573,
-	/* Array index: 0x1424 */ 0xD210,0x4574,
-	/* Array index: 0x1424 */ 0xD22C,0x4575,
-	/* Array index: 0x1424 */ 0xD22D,0x4576,
-	/* Array index: 0x1424 */ 0xD230,0x4577,
-	/* Array index: 0x1424 */ 0xD234,0x4578,
-	/* Array index: 0x1424 */ 0xD23C,0x4579,
-	/* Array index: 0x1424 */ 0xD23D,0x457A,
-	/* Array index: 0x1424 */ 0xD23F,0x457B,
-	/* Array index: 0x1424 */ 0xD241,0x457C,
-	/* Array index: 0x1424 */ 0xD248,0x457D,
-	/* Array index: 0x1424 */ 0xD25C,0x457E,
-	/* Array index: 0x1424 */ 0xD264,0x4621,
-	/* Array index: 0x1424 */ 0xD280,0x4622,
-	/* Array index: 0x1424 */ 0xD281,0x4623,
-	/* Array index: 0x1424 */ 0xD284,0x4624,
-	/* Array index: 0x1424 */ 0xD288,0x4625,
-	/* Array index: 0x1424 */ 0xD290,0x4626,
-	/* Array index: 0x1424 */ 0xD291,0x4627,
-	/* Array index: 0x1424 */ 0xD295,0x4628,
-	/* Array index: 0x1424 */ 0xD29C,0x4629,
-	/* Array index: 0x1424 */ 0xD2A0,0x462A,
-	/* Array index: 0x1424 */ 0xD2A4,0x462B,
-	/* Array index: 0x1424 */ 0xD2AC,0x462C,
-	/* Array index: 0x1424 */ 0xD2B1,0x462D,
-	/* Array index: 0x1424 */ 0xD2B8,0x462E,
-	/* Array index: 0x1424 */ 0xD2B9,0x462F,
-	/* Array index: 0x1424 */ 0xD2BC,0x4630,
-	/* Array index: 0x1424 */ 0xD2BF,0x4631,
-	/* Array index: 0x1424 */ 0xD2C0,0x4632,
-	/* Array index: 0x1424 */ 0xD2C2,0x4633,
-	/* Array index: 0x1424 */ 0xD2C8,0x4634,
-	/* Array index: 0x1424 */ 0xD2C9,0x4635,
-	/* Array index: 0x1424 */ 0xD2CB,0x4636,
-	/* Array index: 0x1424 */ 0xD2D4,0x4637,
-	/* Array index: 0x1424 */ 0xD2D8,0x4638,
-	/* Array index: 0x1424 */ 0xD2DC,0x4639,
-	/* Array index: 0x1424 */ 0xD2E4,0x463A,
-	/* Array index: 0x1424 */ 0xD2E5,0x463B,
-	/* Array index: 0x1424 */ 0xD2F0,0x463C,
-	/* Array index: 0x1424 */ 0xD2F1,0x463D,
-	/* Array index: 0x1424 */ 0xD2F4,0x463E,
-	/* Array index: 0x1424 */ 0xD2F8,0x463F,
-	/* Array index: 0x1424 */ 0xD300,0x4640,
-	/* Array index: 0x1424 */ 0xD301,0x4641,
-	/* Array index: 0x1424 */ 0xD303,0x4642,
-	/* Array index: 0x1424 */ 0xD305,0x4643,
-	/* Array index: 0x1424 */ 0xD314,0x4648,
-	/* Array index: 0x1424 */ 0xD316,0x4649,
-	/* Array index: 0x1424 */ 0xD325,0x464F,
-	/* Array index: 0x1424 */ 0xD328,0x4650,
-	/* Array index: 0x1424 */ 0xD329,0x4651,
-	/* Array index: 0x1424 */ 0xD32C,0x4652,
-	/* Array index: 0x1424 */ 0xD330,0x4653,
-	/* Array index: 0x1424 */ 0xD344,0x4659,
-	/* Array index: 0x1424 */ 0xD345,0x465A,
-	/* Array index: 0x1424 */ 0xD37C,0x465B,
-	/* Array index: 0x1424 */ 0xD37D,0x465C,
-	/* Array index: 0x1424 */ 0xD380,0x465D,
-	/* Array index: 0x1424 */ 0xD384,0x465E,
-	/* Array index: 0x1424 */ 0xD398,0x4664,
-	/* Array index: 0x1424 */ 0xD399,0x4665,
-	/* Array index: 0x1424 */ 0xD39C,0x4666,
-	/* Array index: 0x1424 */ 0xD3A0,0x4667,
-	/* Array index: 0x1424 */ 0xD3A8,0x4668,
-	/* Array index: 0x1424 */ 0xD3A9,0x4669,
-	/* Array index: 0x1424 */ 0xD3AB,0x466A,
-	/* Array index: 0x1424 */ 0xD3AD,0x466B,
-	/* Array index: 0x1424 */ 0xD3B4,0x466C,
-	/* Array index: 0x1424 */ 0xD3B8,0x466D,
-	/* Array index: 0x1424 */ 0xD3BC,0x466E,
-	/* Array index: 0x1424 */ 0xD3C4,0x466F,
-	/* Array index: 0x1424 */ 0xD3C5,0x4670,
-	/* Array index: 0x1424 */ 0xD3C8,0x4671,
-	/* Array index: 0x1424 */ 0xD3C9,0x4672,
-	/* Array index: 0x1424 */ 0xD3D0,0x4673,
-	/* Array index: 0x1424 */ 0xD3D8,0x4674,
-	/* Array index: 0x1424 */ 0xD3E1,0x4675,
-	/* Array index: 0x1424 */ 0xD3E3,0x4676,
-	/* Array index: 0x1424 */ 0xD3EC,0x4677,
-	/* Array index: 0x1424 */ 0xD3ED,0x4678,
-	/* Array index: 0x1424 */ 0xD3F0,0x4679,
-	/* Array index: 0x1424 */ 0xD3F4,0x467A,
-	/* Array index: 0x1424 */ 0xD3FC,0x467B,
-	/* Array index: 0x1424 */ 0xD3FD,0x467C,
-	/* Array index: 0x1424 */ 0xD3FF,0x467D,
-	/* Array index: 0x1424 */ 0xD401,0x467E,
-	/* Array index: 0x1424 */ 0xD408,0x4721,
-	/* Array index: 0x1424 */ 0xD41D,0x4722,
-	/* Array index: 0x1424 */ 0xD440,0x4723,
-	/* Array index: 0x1424 */ 0xD444,0x4724,
-	/* Array index: 0x1424 */ 0xD45C,0x4725,
-	/* Array index: 0x1424 */ 0xD460,0x4726,
-	/* Array index: 0x1424 */ 0xD464,0x4727,
-	/* Array index: 0x1424 */ 0xD46D,0x4728,
-	/* Array index: 0x1424 */ 0xD46F,0x4729,
-	/* Array index: 0x1424 */ 0xD478,0x472A,
-	/* Array index: 0x1424 */ 0xD479,0x472B,
-	/* Array index: 0x1424 */ 0xD47C,0x472C,
-	/* Array index: 0x1424 */ 0xD47F,0x472D,
-	/* Array index: 0x1424 */ 0xD480,0x472E,
-	/* Array index: 0x1424 */ 0xD482,0x472F,
-	/* Array index: 0x1424 */ 0xD488,0x4730,
-	/* Array index: 0x1424 */ 0xD489,0x4731,
-	/* Array index: 0x1424 */ 0xD48B,0x4732,
-	/* Array index: 0x1424 */ 0xD48D,0x4733,
-	/* Array index: 0x1424 */ 0xD494,0x4734,
-	/* Array index: 0x1424 */ 0xD4A9,0x4735,
-	/* Array index: 0x1424 */ 0xD4CC,0x4736,
-	/* Array index: 0x1424 */ 0xD4D0,0x4737,
-	/* Array index: 0x1424 */ 0xD4D4,0x4738,
-	/* Array index: 0x1424 */ 0xD4DC,0x4739,
-	/* Array index: 0x1424 */ 0xD4DF,0x473A,
-	/* Array index: 0x1424 */ 0xD4E8,0x473B,
-	/* Array index: 0x1424 */ 0xD4EC,0x473C,
-	/* Array index: 0x1424 */ 0xD4F0,0x473D,
-	/* Array index: 0x1424 */ 0xD4F8,0x473E,
-	/* Array index: 0x1424 */ 0xD4FB,0x473F,
-	/* Array index: 0x1424 */ 0xD4FD,0x4740,
-	/* Array index: 0x1424 */ 0xD504,0x4741,
-	/* Array index: 0x1424 */ 0xD508,0x4742,
-	/* Array index: 0x1424 */ 0xD50C,0x4743,
-	/* Array index: 0x1424 */ 0xD514,0x4744,
-	/* Array index: 0x1424 */ 0xD515,0x4745,
-	/* Array index: 0x1424 */ 0xD517,0x4746,
-	/* Array index: 0x1424 */ 0xD53C,0x4747,
-	/* Array index: 0x1424 */ 0xD53D,0x4748,
-	/* Array index: 0x1424 */ 0xD540,0x4749,
-	/* Array index: 0x1424 */ 0xD544,0x474A,
-	/* Array index: 0x1424 */ 0xD54C,0x474B,
-	/* Array index: 0x1424 */ 0xD54D,0x474C,
-	/* Array index: 0x1424 */ 0xD54F,0x474D,
-	/* Array index: 0x1424 */ 0xD551,0x474E,
-	/* Array index: 0x1424 */ 0xD558,0x474F,
-	/* Array index: 0x1424 */ 0xD559,0x4750,
-	/* Array index: 0x1424 */ 0xD55C,0x4751,
-	/* Array index: 0x1424 */ 0xD560,0x4752,
-	/* Array index: 0x1424 */ 0xD565,0x4753,
-	/* Array index: 0x1424 */ 0xD568,0x4754,
-	/* Array index: 0x1424 */ 0xD569,0x4755,
-	/* Array index: 0x1424 */ 0xD56B,0x4756,
-	/* Array index: 0x1424 */ 0xD56D,0x4757,
-	/* Array index: 0x1424 */ 0xD574,0x4758,
-	/* Array index: 0x1424 */ 0xD575,0x4759,
-	/* Array index: 0x1424 */ 0xD578,0x475A,
-	/* Array index: 0x1424 */ 0xD57C,0x475B,
-	/* Array index: 0x1424 */ 0xD590,0x4761,
-	/* Array index: 0x1424 */ 0xD5A5,0x4762,
-	/* Array index: 0x1424 */ 0xD5C8,0x4763,
-	/* Array index: 0x1424 */ 0xD5C9,0x4764,
-	/* Array index: 0x1424 */ 0xD5CC,0x4765,
-	/* Array index: 0x1424 */ 0xD5D0,0x4766,
-	/* Array index: 0x1424 */ 0xD5D2,0x4767,
-	/* Array index: 0x1424 */ 0xD5D8,0x4768,
-	/* Array index: 0x1424 */ 0xD5D9,0x4769,
-	/* Array index: 0x1424 */ 0xD5DB,0x476A,
-	/* Array index: 0x1424 */ 0xD5DD,0x476B,
-	/* Array index: 0x1424 */ 0xD5E4,0x476C,
-	/* Array index: 0x1424 */ 0xD5E5,0x476D,
-	/* Array index: 0x1424 */ 0xD5E8,0x476E,
-	/* Array index: 0x1424 */ 0xD5EC,0x476F,
-	/* Array index: 0x1424 */ 0xD5F4,0x4770,
-	/* Array index: 0x1424 */ 0xD5F5,0x4771,
-	/* Array index: 0x1424 */ 0xD5F7,0x4772,
-	/* Array index: 0x1424 */ 0xD5F9,0x4773,
-	/* Array index: 0x1424 */ 0xD600,0x4774,
-	/* Array index: 0x1424 */ 0xD601,0x4775,
-	/* Array index: 0x1424 */ 0xD604,0x4776,
-	/* Array index: 0x1424 */ 0xD608,0x4777,
-	/* Array index: 0x1424 */ 0xD61C,0x477D,
-	/* Array index: 0x1424 */ 0xD620,0x477E,
-	/* Array index: 0x1424 */ 0xD624,0x4821,
-	/* Array index: 0x1424 */ 0xD62D,0x4822,
-	/* Array index: 0x1424 */ 0xD638,0x4823,
-	/* Array index: 0x1424 */ 0xD639,0x4824,
-	/* Array index: 0x1424 */ 0xD63C,0x4825,
-	/* Array index: 0x1424 */ 0xD640,0x4826,
-	/* Array index: 0x1424 */ 0xD645,0x4827,
-	/* Array index: 0x1424 */ 0xD648,0x4828,
-	/* Array index: 0x1424 */ 0xD649,0x4829,
-	/* Array index: 0x1424 */ 0xD64B,0x482A,
-	/* Array index: 0x1424 */ 0xD64D,0x482B,
-	/* Array index: 0x1424 */ 0xD651,0x482C,
-	/* Array index: 0x1424 */ 0xD654,0x482D,
-	/* Array index: 0x1424 */ 0xD655,0x482E,
-	/* Array index: 0x1424 */ 0xD658,0x482F,
-	/* Array index: 0x1424 */ 0xD65C,0x4830,
-	/* Array index: 0x1424 */ 0xD667,0x4831,
-	/* Array index: 0x1424 */ 0xD669,0x4832,
-	/* Array index: 0x1424 */ 0xD670,0x4833,
-	/* Array index: 0x1424 */ 0xD671,0x4834,
-	/* Array index: 0x1424 */ 0xD674,0x4835,
-	/* Array index: 0x1424 */ 0xD683,0x4836,
-	/* Array index: 0x1424 */ 0xD685,0x4837,
-	/* Array index: 0x1424 */ 0xD68C,0x4838,
-	/* Array index: 0x1424 */ 0xD68D,0x4839,
-	/* Array index: 0x1424 */ 0xD690,0x483A,
-	/* Array index: 0x1424 */ 0xD694,0x483B,
-	/* Array index: 0x1424 */ 0xD69D,0x483C,
-	/* Array index: 0x1424 */ 0xD69F,0x483D,
-	/* Array index: 0x1424 */ 0xD6A1,0x483E,
-	/* Array index: 0x1424 */ 0xD6A8,0x483F,
-	/* Array index: 0x1424 */ 0xD6AC,0x4840,
-	/* Array index: 0x1424 */ 0xD6B0,0x4841,
-	/* Array index: 0x1424 */ 0xD6B9,0x4842,
-	/* Array index: 0x1424 */ 0xD6BB,0x4843,
-	/* Array index: 0x1424 */ 0xD6C4,0x4844,
-	/* Array index: 0x1424 */ 0xD6C5,0x4845,
-	/* Array index: 0x1424 */ 0xD6C8,0x4846,
-	/* Array index: 0x1424 */ 0xD6CC,0x4847,
-	/* Array index: 0x1424 */ 0xD6D1,0x4848,
-	/* Array index: 0x1424 */ 0xD6D4,0x4849,
-	/* Array index: 0x1424 */ 0xD6D7,0x484A,
-	/* Array index: 0x1424 */ 0xD6D9,0x484B,
-	/* Array index: 0x1424 */ 0xD6E0,0x484C,
-	/* Array index: 0x1424 */ 0xD6E4,0x484D,
-	/* Array index: 0x1424 */ 0xD6E8,0x484E,
-	/* Array index: 0x1424 */ 0xD6F0,0x484F,
-	/* Array index: 0x1424 */ 0xD6F5,0x4850,
-	/* Array index: 0x1424 */ 0xD6FC,0x4851,
-	/* Array index: 0x1424 */ 0xD6FD,0x4852,
-	/* Array index: 0x1424 */ 0xD700,0x4853,
-	/* Array index: 0x1424 */ 0xD704,0x4854,
-	/* Array index: 0x1424 */ 0xD711,0x4855,
-	/* Array index: 0x1424 */ 0xD718,0x4856,
-	/* Array index: 0x1424 */ 0xD719,0x4857,
-	/* Array index: 0x1424 */ 0xD71C,0x4858,
-	/* Array index: 0x1424 */ 0xD720,0x4859,
-	/* Array index: 0x1424 */ 0xD728,0x485A,
-	/* Array index: 0x1424 */ 0xD729,0x485B,
-	/* Array index: 0x1424 */ 0xD72B,0x485C,
-	/* Array index: 0x1424 */ 0xD72D,0x485D,
-	/* Array index: 0x1424 */ 0xD734,0x485E,
-	/* Array index: 0x1424 */ 0xD735,0x485F,
-	/* Array index: 0x1424 */ 0xD738,0x4860,
-	/* Array index: 0x1424 */ 0xD73C,0x4861,
-	/* Array index: 0x1424 */ 0xD744,0x4862,
-	/* Array index: 0x1424 */ 0xD747,0x4863,
-	/* Array index: 0x1424 */ 0xD749,0x4864,
-	/* Array index: 0x1424 */ 0xD750,0x4865,
-	/* Array index: 0x1424 */ 0xD751,0x4866,
-	/* Array index: 0x1424 */ 0xD760,0x486C,
-	/* Array index: 0x1424 */ 0xD761,0x486D,
-	/* Array index: 0x1424 */ 0xD763,0x486E,
-	/* Array index: 0x1424 */ 0xD765,0x486F,
-	/* Array index: 0x1424 */ 0xD769,0x4870,
-	/* Array index: 0x1424 */ 0xD76C,0x4871,
-	/* Array index: 0x1424 */ 0xD770,0x4872,
-	/* Array index: 0x1424 */ 0xD774,0x4873,
-	/* Array index: 0x1424 */ 0xD77C,0x4874,
-	/* Array index: 0x1424 */ 0xD77D,0x4875,
-	/* Array index: 0x1424 */ 0xD781,0x4876,
-	/* Array index: 0x1424 */ 0xD788,0x4877,
-	/* Array index: 0x1424 */ 0xD789,0x4878,
-	/* Array index: 0x1424 */ 0xD78C,0x4879,
-	/* Array index: 0x1424 */ 0xD790,0x487A,
-	/* Array index: 0x1424 */ 0xD798,0x487B,
-	/* Array index: 0x1424 */ 0xD799,0x487C,
-	/* Array index: 0x1424 */ 0xD79B,0x487D,
-	/* Array index: 0x1424 */ 0xD79D,0x487E,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_KSX1001 && defined (TABLE_USE_SIZE_OPTIMIZATION) */
-
-/*
- * ksx1001 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_ksx1001 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_KSX1001, /* CCS name */
-	TABLE_16BIT, /* Table bits */
-#if defined (ICONV_FROM_UCS_CCS_KSX1001) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&from_ucs_size_ksx1001, /* UCS -> ksx1001 table size-optimized table */
-#elif defined (ICONV_FROM_UCS_CCS_KSX1001) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&from_ucs_speed_ksx1001, /* UCS -> ksx1001 table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-#if defined (ICONV_TO_UCS_CCS_KSX1001) \
- && (defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SIZE_OPTIMIZED,
-	(__uint16_t *)&to_ucs_size_ksx1001 /* ksx1001 -> UCS table speed-optimized table */
-#elif defined (ICONV_TO_UCS_CCS_KSX1001) \
- && !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)&to_ucs_speed_ksx1001 /* ksx1001 -> UCS table speed-optimized table */
-#else
-	TABLE_SPEED_OPTIMIZED,
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_KSX1001) || ... */
-
diff --git a/newlib/libc/iconv/ccs/mktbl.pl b/newlib/libc/iconv/ccs/mktbl.pl
deleted file mode 100755
index c3b8793..0000000
--- a/newlib/libc/iconv/ccs/mktbl.pl
+++ /dev/null
@@ -1,1505 +0,0 @@
-#!/usr/bin/perl -w
-#
-#  Copyright (c) 2003-2004, Artem B. Bityuckiy, SoftMine Corporation.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#  1. Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-#  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-#  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-#  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-#  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-#  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-#  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-#  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#  SUCH DAMAGE.
-#
-use integer;
-use Getopt::Std;
-use IO::Seekable;
-use strict;
-
-
-# ##############################################################################
-#
-# FUNCTION PROTOTYPES AND GLOBAL DATA DECLARATION SECTION
-#
-# ##############################################################################
-
-
-# SUPPLEMENTARY FUNCTIONS FORWARD DECLARATIONS
-sub ProcessOptions();
-sub Err($;$);
-sub Generate8bitToUCS();
-sub GenerateSpeed($);
-sub Generate16bitSize($);
-sub Output8bitToUCS(;$);
-sub Output8bitFromUCS(;$);
-sub OutputSpeed($;$);
-sub OutputSize($;$);
-
-# VARIABLES RELATING TO COMMAND-LINE OPTIONS
-my $Verbose;  # Be verbose if true
-my $Source;   # Output C source code instead of binary .cct file if true
-my $Plane;    # Use this plane if defined
-my $InFile;   # Use this file for input
-my $OutFile;  # Use this file for output
-my $CCSName;  # Use this CCS name
-my $NoSpeed;  # Don't generate speed-optimized tables (binary files only)
-my $NoSize;   # Don't generate size-optimized tables (binary files only)
-my $NoBE;     # Don't generate big-endian tables (binary files only)
-my $NoLE;     # Don't generate big-endian tables (binary files only)
-my $NoTo;     # Don't generate "to_ucs" table (binary files only)
-my $NoFrom;   # Don't generate "from_ucs" table (binary files only)
-my $CCSCol;   # CCS column number in source file
-my $UCSCol;   # UCS column number in source file
-
-
-# DATA STRUCTURES WITH "TO_UCS" AND "FROM_UCS" SPEED/SIZE -OPTIMIZED TABLES
-my (@FromSpeedTbl, @ToSpeedTbl, @FromSizeTbl, @ToSizeTbl);
-# "TO_UCS" AND "FROM_UCS" SPEED/SIZE -OPTIMIZED TABLES SIZE IN BYTES
-my ($FromSpeedBytes, $ToSpeedBytes, $FromSizeBytes, $ToSizeBytes) =
-   (0, 0, 0, 0);
-
-my (%CCSUCS, %UCSCCS); # CCS->UCS and UCS->CCS mappings
-my $Bits = 8;          # Table bits (8 or 16);
-
-# SPECIAL MARKER CODES
-my $InvCode  = 0xFFFF; # FFFF indicates 18 bit invalid codes
-my $InvBlock = 0xFFFF; # FFFF also mark empty blocks in speed-optimized tables
-my $LostCode = 0x3F;   # ASCII '?' marks codes lost during CCS->UCS mapping
-# To mark invalid codes in 8bit encodings 0xFF is used CCS's 0xFF mapping is saved
-# separately. $FFMap variable stores real 0xFF mapping if defined.
-my $InvCode8bit = 0xFF;
-my $FFMap;
-
-# 8 Bit "From UCS" table header size (bytes)
-my $Hdr8bitFromUCS = 2;
-# Binary table header size (bytes)
-my $HdrBinary = 8;
-
-# At first all lost CCS codes are marked by $TmpLost to distinguish between
-# code which is equivalent to $LostCode and lost codes. This is done in order to
-# output $MacroLostCode instead of $LostCode in source file.
-my $TmpLost = 0x1FFFF;
-
-# VARIABLES RELATING TO C SOURCE CODE
-my $MacroInvCode      = 'INVALC';
-my $MacroInvBlock     = 'INVBLK';
-my $MacroLostCode     = 'LOST_C';
-my $MacroCCSName      = 'ICONV_CCS_%s';
-my $GuardSize       = 'defined (TABLE_USE_SIZE_OPTIMIZATION)';
-my $GuardToUCS      = "ICONV_TO_UCS_CCS_%s";
-my $GuardFromUCS    = "ICONV_FROM_UCS_CCS_%s";
-my $MacroSpeedTable = 'TABLE_SPEED_OPTIMIZED';
-my $MacroSizeTable  = 'TABLE_SIZE_OPTIMIZED';  
-my $Macro8bitTable  = 'TABLE_8BIT';
-my $Macro16bitTable = 'TABLE_16BIT';
-my $MacroVer1Table  = 'TABLE_VERSION_1';
-my $TypeBICCS       = 'iconv_ccs_t';
-my $VarToUCSSize    = "to_ucs_size_%s";
-my $VarToUCSSpeed   = "to_ucs_speed_%s";
-my $VarFromUCSSize  = "from_ucs_size_%s";
-my $VarFromUCSSpeed = "from_ucs_speed_%s";
-my $VarBICCS             = "_iconv_ccs_%s";
-# Text block that visually separates tables.
-my $Separator = '=' x 70;
-
-# ##############################################################################
-#
-# SCRIPT ENTRY POINT
-#
-# ##############################################################################
-
-
-# Parse command-line options, check them and set correspondent global variables
-ProcessOptions();
-
-# Initialize global variables tat depend on CCS name.
-$_ = sprintf $_, $CCSName foreach +($VarToUCSSpeed,
-                                    $VarToUCSSize,
-                                    $VarToUCSSpeed,
-                                    $VarFromUCSSpeed,
-                                    $VarFromUCSSize,
-                                    $VarBICCS);
-$_ = sprintf $_, "\U$CCSName" foreach +($GuardToUCS,
-                                        $GuardFromUCS,
-                                        $MacroCCSName);
-
-# Open input and output files
-Err "Can't open \"$InFile\" file for reading: $!.\n", 1
-unless open(INFILE, '<', $InFile);
-Err "Can't open \"$OutFile\" file for writing: $!.\n", 1
-unless open(OUTFILE, '>', $OutFile);
-
-# ==============================================================================
-# EXTRACT CODES MAP FROM INPUT FILE
-# ==============================================================================
-
-for (my $ln = 1; my $l = <INFILE>; $ln += 1)
-{
-  # Skip comment and empty lines, remove ending CR symbol
-  next if $l =~ /^#.*$/ or $l =~ /^\s*$/;
-  $l =~ s/^(.*)\n$/$1/, $l =~ s/^(.*)\r$/$1/;
- 
-  # Remove comment and extra spaces
-  $l =~ s/(.*)\s*#.*/$1/;
-  $l =~ s/\s+/ /g;
-  $l =~ s/(.*)\s*$/$1/;
-
-  # Split line into individual codes
-  my @codes = split / /, $l;
-
-  # Skip line if there is no needed columns
-  unless (defined $codes[$CCSCol])
-  {
-    print("Warning (line $ln): no CCS column, skip.\n") if $Verbose;
-    next;
-  }
-  unless (defined $codes[$UCSCol])
-  {
-    print("Warning (line $ln): no UCS column, skip.\n") if $Verbose;
-    next;
-  }
-
-  # Extract codes strings from needed columns
-  my ($ccs, $ucs) = ($codes[$CCSCol], $codes[$UCSCol]);
-  my $patt = qr/(0[xX])?[0-9a-fA-F]{1,8}/; # HEX digit regexp pattern.
-
-  # Check that CCS and UCS code strings has right format.
-  unless ($ccs =~ m/^$patt$/)
-  {
-    print("Warning (line $ln): $ccs CCS code isn't recognized, skip.\n")
-    if $Verbose;
-    next;
-  }
-  unless ($ucs =~ m/^($patt(,|\+))*$patt$/)
-  {
-    print("Warning (line $ln): $ucs UCS code isn't recognized, skip.\n")
-    if $Verbose;
-    next;
-  }
-
-  # Convert code to numeric format (assume hex).
-  $ccs = hex $ccs;
-
-  if ($ucs =~ m/,/ or $ucs =~ m/\+/)
-  {
-    # Mark CCS codes with "one to many" mappings as lost
-    printf "Warning (line $ln): only one to one mapping is supported, "
-         . "mark 0x%.4X CCS code as lost.\n", hex $ccs if $Verbose;
-    $ucs = $TmpLost;
-  }
-  else
-  {
-    # Convert code to numeric format
-    $ucs = hex $ucs;
-
-    # Check that UCS code isn't longer than 16 bits.
-    if ($ucs > 0xFFFF)
-    {
-      printf("Warning (line $ln): UCS code should fit 16 bits, "
-           . "mark 0x%.4X CCS code as lost.\n", hex $ccs) if $Verbose;
-      $ucs = $TmpLost;
-    }
-  }
-
-  # If CCS value > 0xFFFF user should specify plane number.
-  if ($ccs > 0xFFFF && !defined $Plane)
-  {
-    print("Warning (line $ln): $ccs is > 16 bit, plane number should be specified,"
-        . " skip this mapping.\n") if $Verbose;
-    next;
-  }
-  
-  if (defined $Plane)
-  {
-    next if (($ccs & 0xFFFF0000) >> 16) != hex $Plane; # Skip alien plane.
-    $ccs &= 0xFFFF;
-  }
-
-  # Check that reserved codes aren't used.
-  if ($ccs == $InvCode or $ucs == $InvCode)
-  {
-    print("Warning (line $ln): $InvCode is reserved to mark invalid codes and "
-       . "shouldn't be used in mappings, skip.\n") if $Verbose;
-    next;
-  }
-
-  # Save mapping in UCSCCS and CCSUCS hash arrays.
-  $UCSCCS{$ucs} = $ccs if $ucs != $TmpLost && !defined $UCSCCS{$ucs};
-  $CCSUCS{$ccs} = $ucs if !defined $CCSUCS{$ccs};
-
-  $Bits = 16 if $ccs > 0xFF;
-}
-
-if (not %CCSUCS)
-{
-  Err "Error: there is no plane $Plane in \"$0\".\n" if defined $Plane;
-  Err "Error: mapping wasn't found.\n";
-}
-
-
-# ==============================================================================
-# GENERATE TABLE DATA
-# ==============================================================================
-
-if ($Bits == 8)
-{
-  $FFMap = $CCSUCS{0xFF};
-  $FFMap = $InvCode if !defined $FFMap; 
-}
-
-if ($Bits == 8)
-{
-  Generate8bitToUCS() unless $NoTo;
-}
-else
-{
-  GenerateSpeed("to_ucs") unless $NoTo || $NoSpeed;
-  Generate16bitSize("to_ucs")  unless $NoTo || $NoSize;
-}
-
-GenerateSpeed("from_ucs") unless $NoFrom || $NoSpeed;
-Generate16bitSize("from_ucs")  unless $NoFrom || $NoSize;
-
-# ==============================================================================
-# OUTPUT ARRAYS
-# ==============================================================================
-
-if ($Source)
-{
-  # OUTPUT SOURCE
-  print OUTFILE
-"/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for $CCSName encoding.
- */
-
-#include \"ccsbi.h\"
-
-#if defined ($GuardToUCS) \\
- || defined ($GuardFromUCS)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include \"ccs.h\"
-#include \"ccsnames.h\"
-
-";
-
-  if ($Bits == 8)
-  {
-    print OUTFILE
-"#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error \"Unknown byte order.\"
-#endif
-
-";
-  }
-
-  unless ($NoTo)
-  {
-    if ($Bits == 8) 
-    {
-      Output8bitToUCS();
-    }
-    else
-    {
-      OutputSpeed("to_ucs") unless $NoSpeed;
-      OutputSize("to_ucs")  unless $NoSize;
-    }
-  }
-  unless ($NoFrom)
-  {
-    if ($Bits == 8) 
-    {
-      Output8bitFromUCS();
-    }
-    else
-    {
-      OutputSpeed("from_ucs") unless $NoSpeed;
-      OutputSize("from_ucs")  unless $NoSize;
-    }
-  }
-
-  # OUTPUT TABLE DESCRIPTION STRUCTURE 
-  print OUTFILE  
-"/*
- * $CCSName CCS description table.
- * $Separator
- */
-_CONST $TypeBICCS
-$VarBICCS =
-{
-\t$MacroVer1Table, /* Table version */
-\t$MacroCCSName, /* CCS name */
-";
-  if ($Bits == 8)
-  {
-    print OUTFILE
-"\t$Macro8bitTable, /* Table bits */
-\t0, /* Not Used */
-#if defined ($GuardFromUCS)
-\t(__uint16_t *)&$VarFromUCSSpeed, /* UCS -> $CCSName table */
-#else
-\t(__uint16_t *)NULL,
-#endif
-\t0, /* Not Used */
-#if defined ($GuardToUCS)
-\t(__uint16_t *)&$VarToUCSSpeed /* $CCSName -> UCS table */
-#else
-\t(__uint16_t *)NULL,
-#endif
-};\n";
-  }
-  else
-  {
-    print OUTFILE
-"\t$Macro16bitTable, /* Table bits */
-#if defined ($GuardFromUCS) \\
- && ($GuardSize)
-\t$MacroSizeTable,
-\t(__uint16_t *)&$VarFromUCSSize, /* UCS -> $CCSName table size-optimized table */
-#elif defined ($GuardFromUCS) \\
- && !($GuardSize)
-\t$MacroSpeedTable,
-\t(__uint16_t *)&$VarFromUCSSpeed, /* UCS -> $CCSName table speed-optimized table */
-#else
-\t$MacroSpeedTable,
-\t(__uint16_t *)NULL,
-#endif
-#if defined ($GuardToUCS) \\
- && ($GuardSize)
-\t$MacroSizeTable,
-\t(__uint16_t *)&$VarToUCSSize /* $CCSName -> UCS table speed-optimized table */
-#elif defined ($GuardToUCS) \\
- && !($GuardSize)
-\t$MacroSpeedTable,
-\t(__uint16_t *)&$VarToUCSSpeed /* $CCSName -> UCS table speed-optimized table */
-#else
-\t$MacroSpeedTable,
-\t(__uint16_t *)NULL,
-#endif
-};\n";
-  }
-  print OUTFILE "\n#endif /* $GuardToUCS) || ... */\n\n";
-}
-else
-{
-  # OUTPUT BINARY TABLES DESCRIPTION STRUCTURE (ALWAYS BIG ENDIAN)
-  print OUTFILE pack "n", 1;
-  print OUTFILE pack "n", $Bits;
-  my $len = length $CCSName;
-  print OUTFILE pack "N", $len;
-  print OUTFILE pack "a$len", $CCSName;
-  
-  my $pos = $HdrBinary + $len;
-  if ($pos & 3)
-  {
-    my $l = 4 - ($pos & 3);
-    print OUTFILE pack "a$l", 'XXX';
-    $pos += $l;
-  }
-  
-  $pos += 16*4;
-
-  my @tables;
-  for (my $i = 0; $i < 16; $i++)
-  {
-    $tables[$i] = 0;
-  }
-  
-  $tables[0] = $pos, $tables[1] = $FromSpeedBytes, $pos += $FromSpeedBytes
-  unless $NoFrom || $NoSpeed || $NoBE;
-  $tables[2] = $pos, $tables[3] = $FromSpeedBytes, $pos += $FromSpeedBytes
-  unless $NoFrom || $NoSpeed || $NoLE;
-  if ($Bits == 16)
-  {
-    $tables[4] = $pos, $tables[5] = $FromSizeBytes, $pos += $FromSizeBytes
-    unless $NoFrom || $NoSize || $NoBE;
-    $tables[6] = $pos, $tables[7] = $FromSizeBytes, $pos += $FromSizeBytes
-    unless $NoFrom || $NoSize || $NoLE;
-  }
-  $tables[8] = $pos, $tables[9] = $ToSpeedBytes, $pos += $ToSpeedBytes
-  unless $NoTo || $NoSpeed || $NoBE;
-  $tables[10] = $pos, $tables[11] = $ToSpeedBytes, $pos += $ToSpeedBytes
-  unless $NoTo || $NoSpeed || $NoLE;
-  if ($Bits == 16)
-  {
-    $tables[12] = $pos, $tables[13] = $ToSizeBytes, $pos += $ToSizeBytes
-    unless $NoTo || $NoSize || $NoBE;
-    $tables[14] = $pos, $tables[15] = $ToSizeBytes, $pos += $ToSizeBytes
-    unless $NoTo || $NoSize || $NoLE;
-  }
-
-  print OUTFILE pack("N", $_) foreach @tables;
-
-  print "Total bytes for output: $pos.\n" if $Verbose;
-  
-  # OUTPUT BINARY TABLES
-  unless ($NoFrom)
-  {
-    if ($Bits == 8) 
-    {
-      Output8bitFromUCS("n") unless $NoBE;
-      Output8bitFromUCS("v") unless $NoLE;
-    }
-    else
-    {
-      unless ($NoSpeed)
-      {
-        OutputSpeed("from_ucs", "n") unless $NoBE;
-        OutputSpeed("from_ucs", "v") unless $NoLE;
-      }
-      unless ($NoSize)
-      {
-        OutputSize("from_ucs", "n") unless $NoBE;
-        OutputSize("from_ucs", "v") unless $NoLE;
-      }
-    }
-  }
-  unless ($NoTo)
-  {
-    if ($Bits == 8) 
-    {
-      Output8bitToUCS("n") unless $NoBE;
-      Output8bitToUCS("v") unless $NoLE;
-    }
-    else
-    {
-      unless ($NoSpeed)
-      {
-        OutputSpeed("to_ucs", "n") unless $NoBE;
-        OutputSpeed("to_ucs", "v") unless $NoLE;
-      }
-      unless ($NoSize)
-      {
-        OutputSize("to_ucs", "n") unless $NoBE;
-        OutputSize("to_ucs", "v") unless $NoLE;
-      }
-    }
-  }
-}
-
-close INFILE;
-close OUTFILE;
-exit 0;
-
-
-# ##############################################################################
-#
-# SUPPLEMENTARY FUNCTIONS
-#
-# ##############################################################################
-
-
-# =============================================================================
-#
-# Generate 8bit "to_ucs" table. Store table data in %ToSpeedTbl hash.
-# Store table size in $ToSpeedBytes scalar.
-#
-# =============================================================================
-sub Generate8bitToUCS()
-{
-  for (my $i = 0; $i <= 255; $i++)
-  {
-    $ToSpeedTbl[$i] = defined $CCSUCS{$i} ? $CCSUCS{$i} : $InvCode;
-  }
-  $ToSpeedBytes = 256*2;
-}
-
-
-# =============================================================================
-#
-# Generate speed-optimized table.
-#
-# Parameter 1: 
-#    "to_ucs"   - generate "to_ucs" table, store table data in @ToSpeedTbl
-#                 array, store table size in $ToSpeedBytes scalar.
-#    "from_ucs" - generate "from_ucs" table, store table data in @FromSpeedTbl
-#                 array, store table size in $FromSpeedBytes scalar.
-#
-# Data is written to @ToSpeedTbl or @FromSpeedTbl (@map) table and has the
-# following format:
-# $table[0] - 256-element array (control block);
-# $table[1 .. $#table] - 256-element arrays (data blocks).
-#
-# =============================================================================
-sub GenerateSpeed($)
-{
-  my $map;
-  my $tbl;
-  my $bytes;
-  
-  if ($_[0] eq "to_ucs")
-  {
-    $map = \%CCSUCS;
-    $tbl = \@ToSpeedTbl;
-    $bytes = \$ToSpeedBytes;
-  }
-  elsif ($_[0] eq "from_ucs")
-  {
-    $map = \%UCSCCS;
-    $tbl = \@FromSpeedTbl;
-    $bytes = \$FromSpeedBytes;
-  }
-  else
-  {
-    Err "Internal script error in GenerateSpeed()\n";
-  }
-  
-  # Identify unused blocks
-  my @busy_blocks;
-  $busy_blocks[$_ >> 8] = 1 foreach (keys %$map);
-
-  # GENERATE FIRST 256-ELEMENT CONTROL BLOCK
-  for (my $i = 0,
-       my $idx = $Bits == 16 ? 0 : 256 + $Hdr8bitFromUCS;
-       $i <= 0xFF; $i++)
-  {
-    $tbl->[0]->[$i] = $busy_blocks[$i] ? $idx += 256 : undef;
-  }
-
-  # GENERATE DATA BLOCKS
-  $$bytes = 0;
-  for (my $i = 0; $i <= 0xFF; $i++)
-  {
-    next unless $busy_blocks[$i];
-    $$bytes += 256;
-    for (my $j = 0; $j <= 0xFF; $j++)
-    {
-      $tbl->[$i+1]->[$j] = $map->{($i << 8) | $j};
-    }
-  } 
-  $$bytes *= 2 if $Bits == 16;
-  $$bytes += $Hdr8bitFromUCS if $Bits == 8;
-  $$bytes += 512;
-}
-
-
-# =============================================================================
-#
-# Generate 16bit size-optimized table.
-#
-# Parameter 1: 
-#    "to_ucs"   - generate "to_ucs" table, store table data in @ToSizeTbl
-#                 array, store table size in $ToSizeBytes scalar.
-#    "from_ucs" - generate "from_ucs" table, store table data in @FromSizeTbl
-#                 array, store table size in $FromSizeBytes scalar.
-#
-# Data is written to @ToSizeTbl or @FromSizeTbl (@map) table and has the
-# following format:
-# $table[0] - number of ranges;
-# $table[1] - number of unranged codes;
-# $table[2] - unranged codes index in resulting array;
-# $table[3]->[0 .. $table[0]] - array of arrays of ranges:
-#     $table[3]->[x]->[0] - first code;
-#     $table[3]->[x]->[1] - last code;
-#     $table[3]->[x]->[2] - range index in resulting array;
-# $table[4]->[0 .. $table[0]] - array of arrays of ranges content;
-# $table[5]->[0 .. $table[1]] - array of arrays of unranged codes;
-#     $table[5]->[x]->[0] - CCS code;
-#     $table[5]->[x]->[0] - UCS code;
-#
-# =============================================================================
-sub Generate16bitSize($)
-{
-  my $map;
-  my $tbl;
-  my $bytes;
-  
-  if ($_[0] eq "to_ucs")
-  {
-    $map = \%CCSUCS;
-    $tbl = \@ToSizeTbl;
-    $bytes = \$ToSizeBytes;
-  }
-  elsif ($_[0] eq "from_ucs")
-  {
-    $map = \%UCSCCS;
-    $tbl = \@FromSizeTbl;
-    $bytes = \$FromSizeBytes;
-  }
-  else
-  {
-    Err "Internal script error  Generate16bitSize()\n";
-  }
-
-  # CREATE LIST OF RANGES.
-  my @codes = sort {$a <=> $b} keys %$map;
-  my @ranges;  # Code ranges
-  my @range;   # Current working range
-  foreach (@codes)
-  {
-    if (not @range or $_ - 1 == $range[$#range])
-    {
-      push @range, $_;
-    }
-    else
-    {
-      my @tmp = @range;
-      push @ranges, \@tmp;
-      undef @range;
-      redo;
-    }
-  }
-  # Add Last range too
-  if (@range)
-  {
-    my @tmp = @range;
-    push @ranges, \@tmp;
-  }
-
-  # OPTIMIZE LIST OF RANGES.
-  my $r = 0; # Working range number
-  while (1)
-  {
-    last if ($r == $#ranges);
-
-    my @r1 = @{$ranges[$r]};
-    my @r2 = @{$ranges[$r + 1]};
-
-    # Calculate how many array entries two ranges need
-    my ($s1, $s2);
-
-    if ($#r1 == 0)
-    { $s1 = 2; }
-    elsif ($#r1 == 1)
-    { $s1 = 4; }
-    else
-    { $s1 = $#r1 + 1 + 3; }
-    
-    if ($#r2 == 0)
-    { $s2 = 2; }
-    elsif ($#r2 == 1)
-    { $s2 = 4; }
-    else
-    { $s2 = $#r2 + 1 + 3; }
-
-    my $two = $s1 + $s2;
-
-    # Calculate how many array entries will be needed if we join them
-    my $one = $r2[$#r2] - $r1[0] + 1 + 3;
-
-    $r += 1, next if ($one > $two);
-    
-    # Join ranges
-    my @r; # New range.
-    push @r, $_ foreach (@r1);
-    for (my $i = $r1[$#r1]+1; $i < $r2[0]; $i++)
-    {
-      push @r, undef; 
-    }
-    push @r, $_ foreach (@r2);
-    $ranges[$r] = \@r;
-    splice @ranges, $r+1, 1;
-  }
-
-  # SEPARATE RANGED AND UNRANGED CODES. SPLIT 2-CODES RANGES ON 2 UNRANGED.
-  my @unranged;
-  foreach (@ranges)
-  {
-    if ($#$_ == 0)
-    {
-      push @unranged, $$_[0];
-      undef $_;
-    }
-    elsif ($#$_ == 1)
-    {
-      push @unranged, $$_[0];
-      push @unranged, $$_[1];
-      undef $_;
-    }
-  }
-
-  # DELETE UNUSED ELEMENTS
-  for (my $i = 0; $i <= $#ranges; $i++)
-  {
-    splice @ranges, $i--, 1 unless defined $ranges[$i];
-  }
-
-  # CALCULATE UNRANGED CODES ARRAY INDEX
-  my $idx = 3 + ($#ranges + 1)*3;
-  $idx += $#$_ + 1 foreach @ranges;
-
-  # COMPOSE TABLE
-  $tbl->[0] = $#ranges + 1;   # Number of ranges
-  $tbl->[1] = $#unranged + 1; # Number of unranged codes
-  $tbl->[2] = $idx;           # Array index of unranged codes
-  
-  # Generate ranges list
-  $idx = 3 + ($#ranges + 1)*3; # First range data index
-  $$bytes = $idx*2;
-  my $num = 0;
-  foreach (@ranges)
-  {
-    $tbl->[3]->[$num]->[0] = $_->[0];
-    $tbl->[3]->[$num]->[1] = $_->[$#$_];
-    $tbl->[3]->[$num]->[2] = $idx;
-    $idx += $#$_ + 1;
-    $num += 1;
-  }
-
-  # Generate ranges content
-  $num = 0;
-  foreach (@ranges)
-  {
-    for (my $i = 0; $i <= $#$_; $i++)
-    {
-      $tbl->[4]->[$num]->[$i] = defined $_->[$i] ? $map->{$_->[$i]} : undef;
-    }
-    $num += 1;
-    $$bytes += ($#$_ + 1)*2;
-  }
-
-  # Generate unranged codes list
-  $num = 0;
-  foreach (@unranged)
-  {
-    $tbl->[5]->[$num]->[0] = $_;
-    $tbl->[5]->[$num]->[1] = $map->{$_};
-    $num += 1;
-  }
-
-  $$bytes += ($#unranged + 1)*4;
-}  
-
-
-# =============================================================================
-#
-# Output 8bit "to UCS" table. Output table's source code if $Source
-# and table's binary data if !$Source.
-# 
-# Parameter 1: Not used when sources are output. Output BE binary if 'n' and
-#              LE binary if 'v'.
-#
-# =============================================================================
-sub Output8bitToUCS(;$)
-{
-  my $endian = $_[0];
-  my $br = 0;
-
-  printf "Output%s 8-bit UCS -> $CCSName table ($ToSpeedBytes bytes).\n",
-         defined $endian ? ($endian eq 'n' ? 
-                 " Big Endian" : " Little Endian") : "" if $Verbose;
-  if ($Source)
-  {
-    # Output heading information
-    printf OUTFILE
-"/*
- * 8-bit $CCSName -> UCS table ($ToSpeedBytes bytes).
- * $Separator
- */
-#if defined ($GuardToUCS)
-
-static _CONST __uint16_t
-${VarToUCSSpeed}\[] =
-{\n\t";
-  }
-
-  if ($Source)
-  {
-    foreach (@ToSpeedTbl)
-    {
-      $br += 1;
-      if ($_ != $InvCode)
-      {
-        if ($_ != $TmpLost)
-        {
-          printf OUTFILE "0x%.4X,", $_;
-        }
-        else
-        {
-          print OUTFILE "$MacroLostCode,";
-        }
-      }
-      else
-      {
-        print OUTFILE "$MacroInvCode,";
-      }
-      print(OUTFILE "\n\t"), $br = 0 unless $br % 8;
-    }
-    print OUTFILE "\n};\n\n#endif /* $GuardToUCS */\n\n";
-  }
-  else
-  {
-    foreach (@ToSpeedTbl)
-    {
-      print OUTFILE pack($endian, $_ == $TmpLost ? $LostCode : $_);
-    }
-  }
-}
-
-
-# =============================================================================
-#
-# Output 8bit "from UCS" table. Output table's source code if $Source
-# and table's binary data if !$Source.
-# 
-# Parameter 1: Not used when sources are output. Output BE binary if 'n' and
-#              LE binary if 'v'.
-#
-# =============================================================================
-sub Output8bitFromUCS(;$)
-{
-  my $endian = $_[0];
-
-  printf "Output%s 8-bit $CCSName -> UCS table ($FromSpeedBytes bytes).\n",
-         defined $endian ? ($endian eq 'n' ? 
-                 " Big Endian" : " Little Endian") : "" if $Verbose;
-  if ($Source)
-  {
-    print OUTFILE
-"/*
- * 8-bit UCS -> $CCSName speed-optimized table ($FromSpeedBytes bytes).
- * $Separator
- */
-
-#if defined ($GuardFromUCS)
-
-static _CONST unsigned char
-${VarFromUCSSpeed}\[] =
-{
-";
-  }
-
-  # SAVE 0xFF MAPPING.
-  if ($Source)
-  {
-    printf OUTFILE "\tW(0x%.4X), /* Real 0xFF mapping. 0xFF is used "
-                 . "to mark invalid codes */\n", $FFMap;
-  }
-  else
-  {
-    print OUTFILE pack($endian, $FFMap);
-  }
-
-  # OUTPUT HEADING BLOCK (ALWAYS 16 BIT)
-  if ($Source)
-  {
-    my $count = 0;
-    print OUTFILE "\t/* Heading Block */";
-    for (my $i = 0, my $br = 0; $i < 256; $br = ++$i % 4)
-    {
-      print OUTFILE "\n\t" unless $br;
-      if (defined $FromSpeedTbl[0]->[$i])
-      {
-        printf OUTFILE "W(0x%.4X),", $FromSpeedTbl[0]->[$i];
-      }
-      else
-      {
-        print OUTFILE "W($MacroInvBlock),";
-      }
-    }
-  }
-  else
-  {
-    print OUTFILE pack($endian, defined $_ ? $_ : $InvBlock)
-    foreach @{$FromSpeedTbl[0]};
-  }
-
-  if ($Source)
-  {
-    my $index = 512 + $Hdr8bitFromUCS;
-    for (my $blk = 1; $blk <= $#FromSpeedTbl; $blk++)
-    {
-      next unless defined $FromSpeedTbl[$blk];
-      printf OUTFILE "\n\t/* Block $blk, Array index 0x%.4X */", $index;
-      $index += 256;
-      for (my $i = 0, my $br = 0; $i < 256; $i++, $br = $i % 8)
-      {
-        print OUTFILE "\n\t" unless $br;
-        my $code = $FromSpeedTbl[$blk]->[$i];
-        if (!defined $code)
-        {
-          printf OUTFILE "0x%.2X,", $InvCode8bit;
-        }
-        else
-        {
-          printf OUTFILE "0x%.2X,", $code == $TmpLost ? $LostCode : $code;
-        }
-      }
-    }
-    print OUTFILE "\n};\n\n#endif /* $GuardFromUCS */\n\n";
-  }
-  else
-  {
-    for (my $blk = 1; $blk <= $#FromSpeedTbl; $blk++)
-    {
-      next unless defined $FromSpeedTbl[$blk];
-      for (my $i = 0, my $br = 0; $i < 256; $br = ++$i % 8)
-      {
-        my $code = $FromSpeedTbl[$blk]->[$i];
-        if (!defined $code)
-        {
-          printf OUTFILE pack 'C', $InvCode8bit;
-        }
-        else
-        {
-          print OUTFILE $code == $TmpLost ? pack('C', $LostCode) 
-                                          : pack('C', $code);
-        }
-      }
-    }
-  }
-}
-
-
-# =============================================================================
-#
-# Output 16bit Speed-optimized table. Output table's source code if $Source
-# and table's binary data if !$Source.
-# 
-# Parameter 1: 
-#    "to_ucs"   - Output "to_ucs" table.
-#    "from_ucs" - Output "from_ucs" table.
-# Parameter 2:    Not used when sources are output. Output BE binary if 'n' and
-#                 LE binary if 'v'.
-#
-# =============================================================================
-sub OutputSpeed($;$)
-{
-  my $endian = $_[1];
-  my $tbl;
-  my ($direction, $optimiz, $e, $bytes);
-  $optimiz = $Bits == 16 ? " speed-optimized" : "";
-  $e = $endian ? ($endian eq 'n' ? " Big Endian" : " Little Endian") : "";
-  if ($_[0] eq "to_ucs")
-  {
-    $tbl = \@ToSpeedTbl;
-    $direction = " $CCSName -> UCS";
-    $bytes = $ToSpeedBytes;
-
-    if ($Source)
-    {
-      print OUTFILE
-"/*
- * 16-bit $CCSName -> UCS speed-optimized table ($ToSpeedBytes bytes).
- * $Separator
- */
-#if defined ($GuardToUCS) \\
- && !($GuardSize)
-
-static _CONST __uint16_t
-${VarToUCSSpeed}\[] =
-{
-";
-    }
-  }
-  elsif ($_[0] eq "from_ucs")
-  {
-    $tbl = \@FromSpeedTbl;
-    $direction = " UCS -> $CCSName";
-    $bytes = $FromSpeedBytes;
-    
-    if ($Source)
-    {
-      print OUTFILE
-"/*
- * 16-bit UCS -> $CCSName speed-optimized table ($FromSpeedBytes bytes).
- * $Separator
- */
-
-#if defined ($GuardFromUCS) \\
- && !($GuardSize)
-
-static _CONST __uint16_t
-${VarFromUCSSpeed}\[] =
-{
-";
-    }
-  }
-  else
-  {
-    Err "Internal script error  Output16bitSpeed()\n";
-  }
-
-  printf "Output%s 16-bit%s%s table (%d bytes).\n",
-  $e, $direction, $optimiz, $bytes if $Verbose;
-
-  # OUTPUT HEADING BLOCK (ALWAYS 16 BIT)
-  if ($Source)
-  {
-    my $count = 0;
-    print OUTFILE "\t/* Heading Block */";
-    for (my $i = 0, my $br = 0; $i < 256; $br = ++$i % 8)
-    {
-      print OUTFILE "\n\t" unless $br;
-      if (defined $tbl->[0]->[$i])
-      {
-        printf OUTFILE "0x%.4X,", $tbl->[0]->[$i];
-      }
-      else
-      {
-        print OUTFILE "$MacroInvBlock,";
-      }
-    }
-  }
-  else
-  {
-    print OUTFILE pack($endian, defined $_ ? $_ : $InvBlock)
-    foreach @{$tbl->[0]};
-  }
-
-  # OUTPUT OTHER BLOCKS
-  if ($Source)
-  {
-    my $index = 256;
-    for (my $blk = 1; $blk <= $#$tbl; $blk++)
-    {
-      next unless defined $tbl->[$blk];
-      printf OUTFILE "\n\t/* Block $blk, Array index 0x%.4X */", $index;
-      $index += 256;
-      for (my $i = 0, my $br = 0; $i < 256; $br = ++$i % 8)
-      {
-        print OUTFILE "\n\t" unless $br;
-        my $code = $tbl->[$blk]->[$i];
-        print OUTFILE defined $code ? 
-            ($code == $TmpLost ? $MacroLostCode : sprintf "0x%.4X", $code)
-                                     : $MacroInvCode, ",";
-      }
-    }
-  }
-  else
-  {
-    for (my $blk = 1; $blk <= $#$tbl; $blk++)
-    {
-      next unless defined $tbl->[$blk];
-      for (my $i = 0, my $br = 0; $i < 256; $br = ++$i % 8)
-      {
-        my $code = $tbl->[$blk]->[$i];
-        print OUTFILE pack($endian, 
-          defined $code ? ($code == $TmpLost ? $LostCode : $code) : $InvCode);
-      }
-    }
-  }
-
-  if ($Source)
-  {
-    if ($_[0] eq "to_ucs")
-    {
-      print OUTFILE
-"
-};
-
-#endif /* $GuardToUCS && !$GuardSize */
-
-";
-    }
-    else
-    {
-      print OUTFILE
-"
-};
-
-#endif /* $GuardFromUCS && !$GuardSize */
-
-";
-    }
-  }
-}
-
-# =============================================================================
-#
-# Output 16bit Size-optimized table. Output table's source code if $Source
-# and table's binary data if !$Source.
-# 
-# Parameter 1: 
-#    "to_ucs"   - Output "to_ucs" table.
-#    "from_ucs" - Output "from_ucs" table.
-# Parameter 2:    Not used when sources are output. Output BE binary if 'n' and
-#                 LE binary if 'v'.
-#
-# =============================================================================
-sub OutputSize($;$)
-{
-  my $endian = $_[1];
-  my $tbl;
-  my ($direction, $optimiz, $e, $bytes);
-  $optimiz = $Bits == 16 ? " size-optimized" : "";
-  $e = $endian ? ($endian eq 'n' ? " Big Endian" : " Little Endian") : "";
-  if ($_[0] eq "to_ucs")
-  {
-    $tbl = \@ToSizeTbl;
-    $direction = " $CCSName -> UCS";
-    $bytes = $ToSizeBytes;
-
-    if ($Source)
-    {
-      print OUTFILE
-"/*
- * 16-bit $CCSName -> UCS size-optimized table ($ToSizeBytes bytes).
- * $Separator
- */
-#if defined ($GuardToUCS) \\
- && ($GuardSize)
-
-static _CONST __uint16_t
-${VarToUCSSize}\[] =
-{
-";
-    }
-  }
-  elsif ($_[0] eq "from_ucs")
-  {
-    $tbl = \@FromSizeTbl;
-    $direction = " UCS -> $CCSName";
-    $bytes = $FromSizeBytes;
-    if ($Source)
-    {
-      print OUTFILE
-"/*
- * 16-bit UCS -> $CCSName size-optimized table ($FromSizeBytes bytes).
- * $Separator
- */
-
-#if defined ($GuardFromUCS) \\
- && ($GuardSize)
-
-static _CONST __uint16_t
-${VarFromUCSSize}\[] =
-{
-";
-    }
-  }
-  else
-  {
-    Err "Internal script error  Output16bitSize()\n";
-  }
-
-  printf "Output%s 16-bit%s%s table (%d bytes).\n",
-  $e, $direction, $optimiz, $bytes if $Verbose;
-
-  # OUTPUT FIRST 3 ELEMENTS
-  if ($Source)
-  {
-    printf OUTFILE "\t0x%.4X, /* Ranges number */\n", $tbl->[0];
-    printf OUTFILE "\t0x%.4X, /* Unranged codes number */\n", $tbl->[1];
-    printf OUTFILE "\t0x%.4X, /* First unranged code index */\n", $tbl->[2];
-  }
-  else
-  {
-    printf OUTFILE pack $endian, $tbl->[0];
-    printf OUTFILE pack $endian, $tbl->[1];
-    printf OUTFILE pack $endian, $tbl->[2];
-  }
-
-  my $idx = 0;
-  # OUTPUT RANGES
-  if ($Source)
-  {
-    print OUTFILE "\t/* Ranges list: first code, last Code, array index. */\n";
-    for (my $range = 0; $range <= $#{$tbl->[3]}; $range++)
-    {
-      printf OUTFILE "\t/* Array index: 0x%.4X */ 0x%.4X, 0x%.4X, 0x%.4X,\n",
-             $idx += 3,
-             $tbl->[3]->[$range]->[0],
-             $tbl->[3]->[$range]->[1],
-             $tbl->[3]->[$range]->[2];
-    }
-  }
-  else
-  {
-    for (my $range = 0; $range <= $#{$tbl->[3]}; $range++)
-    {
-      print OUTFILE pack($endian, $tbl->[3]->[$range]->[0]),
-                    pack($endian, $tbl->[3]->[$range]->[1]),
-                    pack($endian, $tbl->[3]->[$range]->[2]);
-    }
-  }
-  $idx += 3;
-
-  # OUTPUT RANGES CONTENT
-  if ($Source)
-  {
-    print OUTFILE "\t/* Ranges content */";
-    for (my $range = 0; $range <= $#{$tbl->[3]}; $range++)
-    {
-      printf OUTFILE "\n\t/* Range 0x%.4X - 0x%.4X, array index: 0x%.4X */",
-             $tbl->[3]->[$range]->[0], $tbl->[3]->[$range]->[1], $idx;
-             $idx += $tbl->[3]->[$range]->[1] - $tbl->[3]->[$range]->[0] + 1;
-      for (my $elt = 0, my $br = 0;
-           $elt <= $#{$tbl->[4]->[$range]};
-           $br = ++$elt % 8)
-      {
-        print OUTFILE "\n\t" unless $br;
-        if (defined $tbl->[4]->[$range]->[$elt])
-        {
-          if ($tbl->[4]->[$range]->[$elt] != $TmpLost)
-          {
-            printf OUTFILE "0x%.4X,", $tbl->[4]->[$range]->[$elt];
-          }
-          else
-          {
-            print OUTFILE "$MacroLostCode,";
-          }
-        }
-        else
-        {
-          print OUTFILE "$MacroInvCode,";
-        }
-      }
-    }
-  }
-  else
-  {
-    for (my $range = 0; $range <= $#{$tbl->[3]}; $range++)
-    {
-      for (my $elt = 0; $elt <= $#{$tbl->[4]->[$range]}; $elt++)
-      {
-        if (defined $tbl->[4]->[$range]->[$elt])
-        {
-          if ($tbl->[4]->[$range]->[$elt] != $TmpLost)
-          {
-            print OUTFILE pack $endian, $tbl->[4]->[$range]->[$elt];
-          }
-          else
-          {
-            print OUTFILE pack $endian, $LostCode;
-          }
-        }
-        else
-        {
-          print OUTFILE pack $endian, $InvCode;
-        }
-      }
-    }
-  }
-
-  # OUTPUT UNRANGED CODES
-  if ($Source)
-  {
-    printf OUTFILE "\n\t/* Unranged codes (%d codes) */", $#{$tbl->[4]} + 1;
-    for (my $i = 0; $i <= $#{$tbl->[5]}; $i++)
-    {
-      printf OUTFILE "\n\t/* Array index: 0x%.4X */ 0x%.4X,0x%.4X,",
-             $idx, $tbl->[5]->[$i]->[0], $tbl->[5]->[$i]->[1];
-    }
-  }
-  else
-  {
-    for (my $i = 0; $i <= $#{$tbl->[5]}; $i++)
-    {
-      print OUTFILE pack($endian, $tbl->[5]->[$i]->[0]),
-                    pack($endian, $tbl->[5]->[$i]->[1]);
-    }
-  }
-
-  if ($Source)
-  {
-    if ($_[0] eq "to_ucs")
-    {
-      print OUTFILE
-"
-};
-
-#endif /* $GuardToUCS && $GuardSize */
-
-";
-    }
-    else
-    {
-      print OUTFILE
-"
-};
-
-#endif /* $GuardFromUCS && $GuardSize */
-
-";
-    }
-  }
-}
-
-
-# =============================================================================
-#
-# Parse command line options
-#
-# =============================================================================
-sub ProcessOptions()
-{
-  my $help_opt    = 'h'; # Print help option
-  my $input_opt   = 'i'; # Input file name option
-  my $output_opt  = 'o'; # Output file name option
-  my $source_opt  = 'S'; # Generate C source file option
-  my $enc_opt     = 'N'; # Encoding name
-  my $plane_opt   = 'p'; # Plane number
-  my $verbose_opt = 'v'; # Verbose output
-  my $ccscol_opt  = 'x'; # Encoding's column number
-  my $ucscol_opt  = 'y'; # UCS column number
-  my $nosize_opt  = 'l'; # Don't generate size-optimized tables
-  my $nospeed_opt = 'b'; # Don't generate speed-optimized tables
-  my $nobe_opt    = 'B'; # Don't generate big-endian tables
-  my $nole_opt    = 'L'; # Don't generate big-endian tables
-  my $noto_opt    = 't'; # Don't generate "to_ucs" table
-  my $nofrom_opt  = 'f'; # Don't generate "from_ucs" table
-
-  my %args;              # Command line arguments found by getopts()
-
-  my $getopts_string = 
-     "$help_opt$source_opt$enc_opt:$verbose_opt$input_opt:$output_opt:$plane_opt:"
-   . "$nosize_opt$nospeed_opt$nobe_opt$nole_opt$noto_opt$nofrom_opt$ccscol_opt:"
-   . "$ucscol_opt:";
-
-  getopts($getopts_string, \%args) || Err "getopts() failed: $!.\n", 1;
-
-  # Print usage rules and exit.
-  if ($args{$help_opt})
-  {
-    print<<END
-Usage:
-     -$help_opt - this help message;
-     -$input_opt - input file name (required);
-     -$output_opt - output file name;
-     -$enc_opt - CCS or encoding name;
-     -$plane_opt - plane number (high 16 bits) to use (in hex);
-     -$source_opt - generate C source file;
-     -$nospeed_opt - don't generate speed-optimized tables (binary files only);
-     -$nosize_opt - don't generate size-optimized tables (binary files only);
-     -$nobe_opt - don't generate Big Endian tables (binary files only);
-     -$nole_opt - don't generate Little Endian tables (binary files only);
-     -$noto_opt - don't generate "to_ucs" table;
-     -$nofrom_opt - don't generate "from_ucs" table;
-     -$ccscol_opt - encoding's column number;
-     -$ucscol_opt - UCS column number;
-     -$verbose_opt - verbose output.
-
-If output file name isn't specified, <infile>.c (for sources) or
-<infile>.cct (for binaries) is assumed.
-If encoding name isn't specified <infile> is assumed.
-<infile> is normalized (small letters, "-" are substituted by "_") input file
-name base (no extension). For example, for Koi8-r.txt input file, <infile>
-is koi8_r.            
-END
-;
-    exit 0;
-  }
-
-  $Verbose   = $args{$verbose_opt};
-  $Source    = $args{$source_opt};
-  $NoSpeed   = $args{$nospeed_opt};
-  $NoSize    = $args{$nosize_opt};
-  $NoBE      = $args{$nobe_opt};
-  $NoLE      = $args{$nole_opt};  
-  $NoFrom    = $args{$nofrom_opt};
-  $NoTo      = $args{$noto_opt};
-  $CCSCol    = $args{$ccscol_opt};
-  $UCSCol    = $args{$ucscol_opt};
-  $Plane     = $args{$plane_opt};
-  $InFile    = $args{$input_opt};
-  $OutFile   = $args{$output_opt};
-  $CCSName   = $args{$enc_opt};
-
-  Err "Error: input file isn't defined. Use -$help_opt for help.\n", 1
-  unless $InFile;
-  
-  unless ($OutFile)
-  {
-    # Construct output file name
-    $OutFile = $InFile;
-    $OutFile =~ s/(.*\/)*([0-9a-zA-Z-_]*)(\..*)$/\L$2/;
-    $OutFile =~ tr/-/_/;
-    if ($Source)
-    {
-      $OutFile = "$OutFile.c";
-    }
-    else
-    {
-      $OutFile = "$OutFile.cct"
-    }
-  }
-  
-  unless ($CCSName)
-  {
-    # Construct CCS name
-    $CCSName = $InFile;
-    $CCSName =~ s/(.*\/)*([0-9a-zA-Z-_]*)(\..*)$/\L$2/;
-    $CCSName =~ tr/-/_/;
-  }
-
-  Err "-$nosize_opt option can't be used with -$nospeed_opt option "
-    . "simultaniously.\n", 1 if $NoSpeed && $NoSize;
-
-  Err "-$nobe_opt option can't be used with -$nole_opt option "
-    . "simultaniously.\n", 1 if $NoBE && $NoLE;
-  
-  Err "-$noto_opt option can't be used with -$nofrom_opt option"
-    . "simultaniously.\n", 1 if $NoTo && $NoFrom;
-
-  Err "-$nosize_opt, -$nospeed_opt, -$nobe_opt -$nole_opt "
-    . "-$noto_opt and -$nofrom_opt "
-    . "options can't be used with -$source_opt option.\n"
-    . "Source code always contains both speed- and size-optimized "
-    . "tables in System Endian. Use -$help_opt for help.\n", 1
-  if $Source and $NoSpeed || $NoSize || $NoBE || $NoLE || $NoTo || $NoFrom;
-  
-  if (!$CCSCol && !$UCSCol)
-  {
-    $CCSCol = 0;
-    $UCSCol = 1;
-  }
-  elsif ($CCSCol && $UCSCol)
-  {
-    Err "Column number should be >= 0\n", 1 if ($CCSCol <= 0 or $UCSCol <= 0);
-    $CCSCol -= 1;
-    $UCSCol -= 1;
-  }
-  else
-  {
-    Err "Please, define both CCS and UCS column numbers\n", 1;
-  }
-
-  if ($Verbose)
-  {
-    print  "Use $InFile file for input.\n",
-           "Use $OutFile file for output.\n",
-           "Use $CCSName as CCS name.\n";
-    print  "Generate C source file.\n"                if $Source;
-    print  "Generate binary file.\n"                  if !$Source;
-    printf "Use plane N 0x%.4X.\n", hex $Plane if defined $Plane;
-    printf "Use column N $CCSCol for $CCSName.\n";
-    printf "Use column N $UCSCol for UCS.\n";
-    print  "Don't generate size-optimized tables.\n"  if $NoSize;
-    print  "Don't generate speed-optimized tables.\n" if $NoSpeed;
-    print  "Don't generate big-endian tables.\n"      if $NoBE;
-    print  "Don't generate little-endian tables.\n"   if $NoLE;
-    print  "Don't generate \"to_ucs\" table.\n"       if $NoTo;
-    print  "Don't generate \"from_ucs\" table.\n"     if $NoFrom;
-  }
-  
-  return;
-}
-
-
-# =============================================================================
-#
-# Print error message, close all and exit
-#
-# Parameter 1: error message
-# Parameter 2: don't delete output file if > 1
-#
-# =============================================================================
-sub Err($;$)
-{
-  print STDERR "$_[0]";
-  close INFILE;
-  close OUTFILE;
-  unlink $OutFile unless $_[1];
-  
-  exit 1;
-}
\ No newline at end of file
diff --git a/newlib/libc/iconv/ccs/win_1250.c b/newlib/libc/iconv/ccs/win_1250.c
deleted file mode 100644
index e43eb8d..0000000
--- a/newlib/libc/iconv/ccs/win_1250.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for win_1250 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_WIN_1250) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1250)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit win_1250 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_WIN_1250)
-
-static _CONST __uint16_t
-to_ucs_speed_win_1250[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x20AC,INVALC,0x201A,INVALC,0x201E,0x2026,0x2020,0x2021,
-	INVALC,0x2030,0x0160,0x2039,0x015A,0x0164,0x017D,0x0179,
-	INVALC,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,
-	INVALC,0x2122,0x0161,0x203A,0x015B,0x0165,0x017E,0x017A,
-	0x00A0,0x02C7,0x02D8,0x0141,0x00A4,0x0104,0x00A6,0x00A7,
-	0x00A8,0x00A9,0x015E,0x00AB,0x00AC,0x00AD,0x00AE,0x017B,
-	0x00B0,0x00B1,0x02DB,0x0142,0x00B4,0x00B5,0x00B6,0x00B7,
-	0x00B8,0x0105,0x015F,0x00BB,0x013D,0x02DD,0x013E,0x017C,
-	0x0154,0x00C1,0x00C2,0x0102,0x00C4,0x0139,0x0106,0x00C7,
-	0x010C,0x00C9,0x0118,0x00CB,0x011A,0x00CD,0x00CE,0x010E,
-	0x0110,0x0143,0x0147,0x00D3,0x00D4,0x0150,0x00D6,0x00D7,
-	0x0158,0x016E,0x00DA,0x0170,0x00DC,0x00DD,0x0162,0x00DF,
-	0x0155,0x00E1,0x00E2,0x0103,0x00E4,0x013A,0x0107,0x00E7,
-	0x010D,0x00E9,0x0119,0x00EB,0x011B,0x00ED,0x00EE,0x010F,
-	0x0111,0x0144,0x0148,0x00F3,0x00F4,0x0151,0x00F6,0x00F7,
-	0x0159,0x016F,0x00FA,0x0171,0x00FC,0x00FD,0x0163,0x02D9,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1250 */
-
-/*
- * 8-bit UCS -> win_1250 speed-optimized table (1794 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_WIN_1250)
-
-static _CONST unsigned char
-from_ucs_speed_win_1250[] =
-{
-	W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(0x0402),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0502),W(0x0602),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA0,0xFF,0xFF,0xFF,0xA4,0xFF,0xA6,0xA7,
-	0xA8,0xA9,0xFF,0xAB,0xAC,0xAD,0xAE,0xFF,
-	0xB0,0xB1,0xFF,0xFF,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xFF,0xFF,0xBB,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xC1,0xC2,0xFF,0xC4,0xFF,0xFF,0xC7,
-	0xFF,0xC9,0xFF,0xCB,0xFF,0xCD,0xCE,0xFF,
-	0xFF,0xFF,0xFF,0xD3,0xD4,0xFF,0xD6,0xD7,
-	0xFF,0xFF,0xDA,0xFF,0xDC,0xDD,0xFF,0xDF,
-	0xFF,0xE1,0xE2,0xFF,0xE4,0xFF,0xFF,0xE7,
-	0xFF,0xE9,0xFF,0xEB,0xFF,0xED,0xEE,0xFF,
-	0xFF,0xFF,0xFF,0xF3,0xF4,0xFF,0xF6,0xF7,
-	0xFF,0xFF,0xFA,0xFF,0xFC,0xFD,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xC3,0xE3,0xA5,0xB9,0xC6,0xE6,
-	0xFF,0xFF,0xFF,0xFF,0xC8,0xE8,0xCF,0xEF,
-	0xD0,0xF0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xCA,0xEA,0xCC,0xEC,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xC5,0xE5,0xFF,0xFF,0xBC,0xBE,0xFF,
-	0xFF,0xA3,0xB3,0xD1,0xF1,0xFF,0xFF,0xD2,
-	0xF2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xD5,0xF5,0xFF,0xFF,0xC0,0xE0,0xFF,0xFF,
-	0xD8,0xF8,0x8C,0x9C,0xFF,0xFF,0xAA,0xBA,
-	0x8A,0x9A,0xDE,0xFE,0x8D,0x9D,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD9,0xF9,
-	0xDB,0xFB,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8F,0x9F,0xAF,0xBF,0x8E,0x9E,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 3, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xA1,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA2,0xFF,0xFF,0xB2,0xFF,0xBD,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0x96,0x97,0xFF,0xFF,0xFF,
-	0x91,0x92,0x82,0xFF,0x93,0x94,0x84,0xFF,
-	0x86,0x87,0x95,0xFF,0xFF,0xFF,0x85,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x89,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8B,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x80,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0602 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x99,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_WIN_1250 */
-
-/*
- * win_1250 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_win_1250 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_WIN_1250, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_WIN_1250)
-	(__uint16_t *)&from_ucs_speed_win_1250, /* UCS -> win_1250 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_WIN_1250)
-	(__uint16_t *)&to_ucs_speed_win_1250 /* win_1250 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1250) || ... */
-
diff --git a/newlib/libc/iconv/ccs/win_1251.c b/newlib/libc/iconv/ccs/win_1251.c
deleted file mode 100644
index 7e9b4c3..0000000
--- a/newlib/libc/iconv/ccs/win_1251.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for win_1251 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_WIN_1251) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1251)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit win_1251 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_WIN_1251)
-
-static _CONST __uint16_t
-to_ucs_speed_win_1251[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x0402,0x0403,0x201A,0x0453,0x201E,0x2026,0x2020,0x2021,
-	0x20AC,0x2030,0x0409,0x2039,0x040A,0x040C,0x040B,0x040F,
-	0x0452,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,
-	INVALC,0x2122,0x0459,0x203A,0x045A,0x045C,0x045B,0x045F,
-	0x00A0,0x040E,0x045E,0x0408,0x00A4,0x0490,0x00A6,0x00A7,
-	0x0401,0x00A9,0x0404,0x00AB,0x00AC,0x00AD,0x00AE,0x0407,
-	0x00B0,0x00B1,0x0406,0x0456,0x0491,0x00B5,0x00B6,0x00B7,
-	0x0451,0x2116,0x0454,0x00BB,0x0458,0x0405,0x0455,0x0457,
-	0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417,
-	0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,0x041F,
-	0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427,
-	0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,
-	0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437,
-	0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,
-	0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,
-	0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1251 */
-
-/*
- * 8-bit UCS -> win_1251 speed-optimized table (1538 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_WIN_1251)
-
-static _CONST unsigned char
-from_ucs_speed_win_1251[] =
-{
-	W(0x044F), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0302),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0402),W(0x0502),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA0,0xFF,0xFF,0xFF,0xA4,0xFF,0xA6,0xA7,
-	0xFF,0xA9,0xFF,0xAB,0xAC,0xAD,0xAE,0xFF,
-	0xB0,0xB1,0xFF,0xFF,0xFF,0xB5,0xB6,0xB7,
-	0xFF,0xFF,0xFF,0xBB,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 5, Array index 0x0302 */
-	0xFF,0xA8,0x80,0x81,0xAA,0xBD,0xB2,0xAF,
-	0xA3,0x8A,0x8C,0x8E,0x8D,0xFF,0xA1,0x8F,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
-	0xFF,0xB8,0x90,0x83,0xBA,0xBE,0xB3,0xBF,
-	0xBC,0x9A,0x9C,0x9E,0x9D,0xFF,0xA2,0x9F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA5,0xB4,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0x96,0x97,0xFF,0xFF,0xFF,
-	0x91,0x92,0x82,0xFF,0x93,0x94,0x84,0xFF,
-	0x86,0x87,0x95,0xFF,0xFF,0xFF,0x85,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x89,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8B,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x88,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xB9,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x99,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_WIN_1251 */
-
-/*
- * win_1251 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_win_1251 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_WIN_1251, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_WIN_1251)
-	(__uint16_t *)&from_ucs_speed_win_1251, /* UCS -> win_1251 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_WIN_1251)
-	(__uint16_t *)&to_ucs_speed_win_1251 /* win_1251 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1251) || ... */
-
diff --git a/newlib/libc/iconv/ccs/win_1252.c b/newlib/libc/iconv/ccs/win_1252.c
deleted file mode 100644
index 659054f..0000000
--- a/newlib/libc/iconv/ccs/win_1252.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for win_1252 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_WIN_1252) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1252)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit win_1252 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_WIN_1252)
-
-static _CONST __uint16_t
-to_ucs_speed_win_1252[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x20AC,INVALC,0x201A,0x0192,0x201E,0x2026,0x2020,0x2021,
-	0x02C6,0x2030,0x0160,0x2039,0x0152,INVALC,0x017D,INVALC,
-	INVALC,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,
-	0x02DC,0x2122,0x0161,0x203A,0x0153,INVALC,0x017E,0x0178,
-	0x00A0,0x00A1,0x00A2,0x00A3,0x00A4,0x00A5,0x00A6,0x00A7,
-	0x00A8,0x00A9,0x00AA,0x00AB,0x00AC,0x00AD,0x00AE,0x00AF,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x00B4,0x00B5,0x00B6,0x00B7,
-	0x00B8,0x00B9,0x00BA,0x00BB,0x00BC,0x00BD,0x00BE,0x00BF,
-	0x00C0,0x00C1,0x00C2,0x00C3,0x00C4,0x00C5,0x00C6,0x00C7,
-	0x00C8,0x00C9,0x00CA,0x00CB,0x00CC,0x00CD,0x00CE,0x00CF,
-	0x00D0,0x00D1,0x00D2,0x00D3,0x00D4,0x00D5,0x00D6,0x00D7,
-	0x00D8,0x00D9,0x00DA,0x00DB,0x00DC,0x00DD,0x00DE,0x00DF,
-	0x00E0,0x00E1,0x00E2,0x00E3,0x00E4,0x00E5,0x00E6,0x00E7,
-	0x00E8,0x00E9,0x00EA,0x00EB,0x00EC,0x00ED,0x00EE,0x00EF,
-	0x00F0,0x00F1,0x00F2,0x00F3,0x00F4,0x00F5,0x00F6,0x00F7,
-	0x00F8,0x00F9,0x00FA,0x00FB,0x00FC,0x00FD,0x00FE,0x00FF,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1252 */
-
-/*
- * 8-bit UCS -> win_1252 speed-optimized table (1794 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_WIN_1252)
-
-static _CONST unsigned char
-from_ucs_speed_win_1252[] =
-{
-	W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(0x0402),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0502),W(0x0602),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
-	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x8C,0x9C,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x8A,0x9A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x9F,0xFF,0xFF,0xFF,0xFF,0x8E,0x9E,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x83,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 3, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x88,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x98,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0x96,0x97,0xFF,0xFF,0xFF,
-	0x91,0x92,0x82,0xFF,0x93,0x94,0x84,0xFF,
-	0x86,0x87,0x95,0xFF,0xFF,0xFF,0x85,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x89,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8B,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x80,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0602 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x99,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_WIN_1252 */
-
-/*
- * win_1252 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_win_1252 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_WIN_1252, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_WIN_1252)
-	(__uint16_t *)&from_ucs_speed_win_1252, /* UCS -> win_1252 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_WIN_1252)
-	(__uint16_t *)&to_ucs_speed_win_1252 /* win_1252 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1252) || ... */
-
diff --git a/newlib/libc/iconv/ccs/win_1253.c b/newlib/libc/iconv/ccs/win_1253.c
deleted file mode 100644
index 4508133..0000000
--- a/newlib/libc/iconv/ccs/win_1253.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for win_1253 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_WIN_1253) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1253)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit win_1253 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_WIN_1253)
-
-static _CONST __uint16_t
-to_ucs_speed_win_1253[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x20AC,INVALC,0x201A,0x0192,0x201E,0x2026,0x2020,0x2021,
-	INVALC,0x2030,INVALC,0x2039,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,
-	INVALC,0x2122,INVALC,0x203A,INVALC,INVALC,INVALC,INVALC,
-	0x00A0,0x0385,0x0386,0x00A3,0x00A4,0x00A5,0x00A6,0x00A7,
-	0x00A8,0x00A9,INVALC,0x00AB,0x00AC,0x00AD,0x00AE,0x2015,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x0384,0x00B5,0x00B6,0x00B7,
-	0x0388,0x0389,0x038A,0x00BB,0x038C,0x00BD,0x038E,0x038F,
-	0x0390,0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,
-	0x0398,0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F,
-	0x03A0,0x03A1,INVALC,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,
-	0x03A8,0x03A9,0x03AA,0x03AB,0x03AC,0x03AD,0x03AE,0x03AF,
-	0x03B0,0x03B1,0x03B2,0x03B3,0x03B4,0x03B5,0x03B6,0x03B7,
-	0x03B8,0x03B9,0x03BA,0x03BB,0x03BC,0x03BD,0x03BE,0x03BF,
-	0x03C0,0x03C1,0x03C2,0x03C3,0x03C4,0x03C5,0x03C6,0x03C7,
-	0x03C8,0x03C9,0x03CA,0x03CB,0x03CC,0x03CD,0x03CE,INVALC,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1253 */
-
-/*
- * 8-bit UCS -> win_1253 speed-optimized table (1794 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_WIN_1253)
-
-static _CONST unsigned char
-from_ucs_speed_win_1253[] =
-{
-	W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(INVBLK),W(0x0402),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0502),W(0x0602),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA0,0xFF,0xFF,0xA3,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xFF,0xAB,0xAC,0xAD,0xAE,0xFF,
-	0xB0,0xB1,0xB2,0xB3,0xFF,0xB5,0xB6,0xB7,
-	0xFF,0xFF,0xFF,0xBB,0xFF,0xBD,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x83,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 4, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xB4,0xA1,0xA2,0xFF,
-	0xB8,0xB9,0xBA,0xFF,0xBC,0xFF,0xBE,0xBF,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xD0,0xD1,0xFF,0xD3,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0x96,0x97,0xAF,0xFF,0xFF,
-	0x91,0x92,0x82,0xFF,0x93,0x94,0x84,0xFF,
-	0x86,0x87,0x95,0xFF,0xFF,0xFF,0x85,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x89,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8B,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x80,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0602 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x99,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_WIN_1253 */
-
-/*
- * win_1253 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_win_1253 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_WIN_1253, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_WIN_1253)
-	(__uint16_t *)&from_ucs_speed_win_1253, /* UCS -> win_1253 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_WIN_1253)
-	(__uint16_t *)&to_ucs_speed_win_1253 /* win_1253 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1253) || ... */
-
diff --git a/newlib/libc/iconv/ccs/win_1254.c b/newlib/libc/iconv/ccs/win_1254.c
deleted file mode 100644
index 3c1599a..0000000
--- a/newlib/libc/iconv/ccs/win_1254.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for win_1254 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_WIN_1254) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1254)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit win_1254 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_WIN_1254)
-
-static _CONST __uint16_t
-to_ucs_speed_win_1254[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x20AC,INVALC,0x201A,0x0192,0x201E,0x2026,0x2020,0x2021,
-	0x02C6,0x2030,0x0160,0x2039,0x0152,INVALC,INVALC,INVALC,
-	INVALC,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,
-	0x02DC,0x2122,0x0161,0x203A,0x0153,INVALC,INVALC,0x0178,
-	0x00A0,0x00A1,0x00A2,0x00A3,0x00A4,0x00A5,0x00A6,0x00A7,
-	0x00A8,0x00A9,0x00AA,0x00AB,0x00AC,0x00AD,0x00AE,0x00AF,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x00B4,0x00B5,0x00B6,0x00B7,
-	0x00B8,0x00B9,0x00BA,0x00BB,0x00BC,0x00BD,0x00BE,0x00BF,
-	0x00C0,0x00C1,0x00C2,0x00C3,0x00C4,0x00C5,0x00C6,0x00C7,
-	0x00C8,0x00C9,0x00CA,0x00CB,0x00CC,0x00CD,0x00CE,0x00CF,
-	0x011E,0x00D1,0x00D2,0x00D3,0x00D4,0x00D5,0x00D6,0x00D7,
-	0x00D8,0x00D9,0x00DA,0x00DB,0x00DC,0x0130,0x015E,0x00DF,
-	0x00E0,0x00E1,0x00E2,0x00E3,0x00E4,0x00E5,0x00E6,0x00E7,
-	0x00E8,0x00E9,0x00EA,0x00EB,0x00EC,0x00ED,0x00EE,0x00EF,
-	0x011F,0x00F1,0x00F2,0x00F3,0x00F4,0x00F5,0x00F6,0x00F7,
-	0x00F8,0x00F9,0x00FA,0x00FB,0x00FC,0x0131,0x015F,0x00FF,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1254 */
-
-/*
- * 8-bit UCS -> win_1254 speed-optimized table (1794 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_WIN_1254)
-
-static _CONST unsigned char
-from_ucs_speed_win_1254[] =
-{
-	W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(0x0402),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0502),W(0x0602),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
-	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xFF,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xDB,0xDC,0xFF,0xFF,0xDF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xFF,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFB,0xFC,0xFF,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD0,0xF0,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xDD,0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x8C,0x9C,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDE,0xFE,
-	0x8A,0x9A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x9F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x83,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 3, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x88,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x98,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0x96,0x97,0xFF,0xFF,0xFF,
-	0x91,0x92,0x82,0xFF,0x93,0x94,0x84,0xFF,
-	0x86,0x87,0x95,0xFF,0xFF,0xFF,0x85,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x89,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8B,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x80,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0602 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x99,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_WIN_1254 */
-
-/*
- * win_1254 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_win_1254 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_WIN_1254, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_WIN_1254)
-	(__uint16_t *)&from_ucs_speed_win_1254, /* UCS -> win_1254 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_WIN_1254)
-	(__uint16_t *)&to_ucs_speed_win_1254 /* win_1254 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1254) || ... */
-
diff --git a/newlib/libc/iconv/ccs/win_1255.c b/newlib/libc/iconv/ccs/win_1255.c
deleted file mode 100644
index 937afca..0000000
--- a/newlib/libc/iconv/ccs/win_1255.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for win_1255 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_WIN_1255) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1255)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit win_1255 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_WIN_1255)
-
-static _CONST __uint16_t
-to_ucs_speed_win_1255[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x20AC,INVALC,0x201A,0x0192,0x201E,0x2026,0x2020,0x2021,
-	0x02C6,0x2030,INVALC,0x2039,INVALC,INVALC,INVALC,INVALC,
-	INVALC,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,
-	0x02DC,0x2122,INVALC,0x203A,INVALC,INVALC,INVALC,INVALC,
-	0x00A0,0x00A1,0x00A2,0x00A3,0x20AA,0x00A5,0x00A6,0x00A7,
-	0x00A8,0x00A9,0x00D7,0x00AB,0x00AC,0x00AD,0x00AE,0x00AF,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x00B4,0x00B5,0x00B6,0x00B7,
-	0x00B8,0x00B9,0x00F7,0x00BB,0x00BC,0x00BD,0x00BE,0x00BF,
-	0x05B0,0x05B1,0x05B2,0x05B3,0x05B4,0x05B5,0x05B6,0x05B7,
-	0x05B8,0x05B9,INVALC,0x05BB,0x05BC,0x05BD,0x05BE,0x05BF,
-	0x05C0,0x05C1,0x05C2,0x05C3,0x05F0,0x05F1,0x05F2,0x05F3,
-	0x05F4,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
-	0x05D0,0x05D1,0x05D2,0x05D3,0x05D4,0x05D5,0x05D6,0x05D7,
-	0x05D8,0x05D9,0x05DA,0x05DB,0x05DC,0x05DD,0x05DE,0x05DF,
-	0x05E0,0x05E1,0x05E2,0x05E3,0x05E4,0x05E5,0x05E6,0x05E7,
-	0x05E8,0x05E9,0x05EA,INVALC,INVALC,0x200E,0x200F,INVALC,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1255 */
-
-/*
- * 8-bit UCS -> win_1255 speed-optimized table (2050 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_WIN_1255)
-
-static _CONST unsigned char
-from_ucs_speed_win_1255[] =
-{
-	W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(0x0402),W(INVBLK),
-	W(INVBLK),W(0x0502),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0602),W(0x0702),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA0,0xA1,0xA2,0xA3,0xFF,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xFF,0xAB,0xAC,0xAD,0xAE,0xAF,
-	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xFF,0xBB,0xBC,0xBD,0xBE,0xBF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAA,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xBA,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x83,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 3, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x88,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x98,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 6, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xFF,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xD0,0xD1,0xD2,0xD3,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
-	0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xD4,0xD5,0xD6,0xD7,0xD8,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0602 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,0xFE,
-	0xFF,0xFF,0xFF,0x96,0x97,0xFF,0xFF,0xFF,
-	0x91,0x92,0x82,0xFF,0x93,0x94,0x84,0xFF,
-	0x86,0x87,0x95,0xFF,0xFF,0xFF,0x85,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x89,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8B,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xA4,0xFF,0x80,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0702 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x99,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_WIN_1255 */
-
-/*
- * win_1255 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_win_1255 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_WIN_1255, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_WIN_1255)
-	(__uint16_t *)&from_ucs_speed_win_1255, /* UCS -> win_1255 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_WIN_1255)
-	(__uint16_t *)&to_ucs_speed_win_1255 /* win_1255 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1255) || ... */
-
diff --git a/newlib/libc/iconv/ccs/win_1256.c b/newlib/libc/iconv/ccs/win_1256.c
deleted file mode 100644
index 44d4519..0000000
--- a/newlib/libc/iconv/ccs/win_1256.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for win_1256 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_WIN_1256) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1256)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit win_1256 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_WIN_1256)
-
-static _CONST __uint16_t
-to_ucs_speed_win_1256[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x20AC,0x067E,0x201A,0x0192,0x201E,0x2026,0x2020,0x2021,
-	0x02C6,0x2030,0x0679,0x2039,0x0152,0x0686,0x0698,0x0688,
-	0x06AF,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,
-	0x06A9,0x2122,0x0691,0x203A,0x0153,0x200C,0x200D,0x06BA,
-	0x00A0,0x060C,0x00A2,0x00A3,0x00A4,0x00A5,0x00A6,0x00A7,
-	0x00A8,0x00A9,0x06BE,0x00AB,0x00AC,0x00AD,0x00AE,0x00AF,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x00B4,0x00B5,0x00B6,0x00B7,
-	0x00B8,0x00B9,0x061B,0x00BB,0x00BC,0x00BD,0x00BE,0x061F,
-	0x06C1,0x0621,0x0622,0x0623,0x0624,0x0625,0x0626,0x0627,
-	0x0628,0x0629,0x062A,0x062B,0x062C,0x062D,0x062E,0x062F,
-	0x0630,0x0631,0x0632,0x0633,0x0634,0x0635,0x0636,0x00D7,
-	0x0637,0x0638,0x0639,0x063A,0x0640,0x0641,0x0642,0x0643,
-	0x00E0,0x0644,0x00E2,0x0645,0x0646,0x0647,0x0648,0x00E7,
-	0x00E8,0x00E9,0x00EA,0x00EB,0x0649,0x064A,0x00EE,0x00EF,
-	0x064B,0x064C,0x064D,0x064E,0x00F4,0x064F,0x0650,0x00F7,
-	0x0651,0x00F9,0x0652,0x00FB,0x00FC,0x200E,0x200F,0x06D2,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1256 */
-
-/*
- * 8-bit UCS -> win_1256 speed-optimized table (2050 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_WIN_1256)
-
-static _CONST unsigned char
-from_ucs_speed_win_1256[] =
-{
-	W(0x06D2), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(0x0402),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(0x0502),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0602),W(0x0702),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA0,0xFF,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xFF,0xAB,0xAC,0xAD,0xAE,0xAF,
-	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xFF,0xBB,0xBC,0xBD,0xBE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xD7,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xE0,0xFF,0xE2,0xFF,0xFF,0xFF,0xFF,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xFF,0xFF,0xEE,0xEF,
-	0xFF,0xFF,0xFF,0xFF,0xF4,0xFF,0xFF,0xF7,
-	0xFF,0xF9,0xFF,0xFB,0xFC,0xFF,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x8C,0x9C,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x83,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 3, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x88,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 7, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xA1,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xBA,0xFF,0xFF,0xFF,0xBF,
-	0xFF,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
-	0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD8,
-	0xD9,0xDA,0xDB,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xDC,0xDD,0xDE,0xDF,0xE1,0xE3,0xE4,0xE5,
-	0xE6,0xEC,0xED,0xF0,0xF1,0xF2,0xF3,0xF5,
-	0xF6,0xF8,0xFA,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8A,0xFF,0xFF,0xFF,0xFF,0x81,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8D,0xFF,
-	0x8F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x9A,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x8E,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x98,0xFF,0xFF,0xFF,0xFF,0xFF,0x90,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x9F,0xFF,0xFF,0xFF,0xAA,0xFF,
-	0xFF,0xC0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0602 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x9D,0x9E,0xFD,0xFE,
-	0xFF,0xFF,0xFF,0x96,0x97,0xFF,0xFF,0xFF,
-	0x91,0x92,0x82,0xFF,0x93,0x94,0x84,0xFF,
-	0x86,0x87,0x95,0xFF,0xFF,0xFF,0x85,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x89,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8B,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x80,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0702 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x99,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_WIN_1256 */
-
-/*
- * win_1256 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_win_1256 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_WIN_1256, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_WIN_1256)
-	(__uint16_t *)&from_ucs_speed_win_1256, /* UCS -> win_1256 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_WIN_1256)
-	(__uint16_t *)&to_ucs_speed_win_1256 /* win_1256 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1256) || ... */
-
diff --git a/newlib/libc/iconv/ccs/win_1257.c b/newlib/libc/iconv/ccs/win_1257.c
deleted file mode 100644
index ad497cb..0000000
--- a/newlib/libc/iconv/ccs/win_1257.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for win_1257 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_WIN_1257) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1257)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit win_1257 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_WIN_1257)
-
-static _CONST __uint16_t
-to_ucs_speed_win_1257[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x20AC,INVALC,0x201A,INVALC,0x201E,0x2026,0x2020,0x2021,
-	INVALC,0x2030,INVALC,0x2039,INVALC,0x00A8,0x02C7,0x00B8,
-	INVALC,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,
-	INVALC,0x2122,INVALC,0x203A,INVALC,0x00AF,0x02DB,INVALC,
-	0x00A0,INVALC,0x00A2,0x00A3,0x00A4,INVALC,0x00A6,0x00A7,
-	0x00D8,0x00A9,0x0156,0x00AB,0x00AC,0x00AD,0x00AE,0x00C6,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x00B4,0x00B5,0x00B6,0x00B7,
-	0x00F8,0x00B9,0x0157,0x00BB,0x00BC,0x00BD,0x00BE,0x00E6,
-	0x0104,0x012E,0x0100,0x0106,0x00C4,0x00C5,0x0118,0x0112,
-	0x010C,0x00C9,0x0179,0x0116,0x0122,0x0136,0x012A,0x013B,
-	0x0160,0x0143,0x0145,0x00D3,0x014C,0x00D5,0x00D6,0x00D7,
-	0x0172,0x0141,0x015A,0x016A,0x00DC,0x017B,0x017D,0x00DF,
-	0x0105,0x012F,0x0101,0x0107,0x00E4,0x00E5,0x0119,0x0113,
-	0x010D,0x00E9,0x017A,0x0117,0x0123,0x0137,0x012B,0x013C,
-	0x0161,0x0144,0x0146,0x00F3,0x014D,0x00F5,0x00F6,0x00F7,
-	0x0173,0x0142,0x015B,0x016B,0x00FC,0x017C,0x017E,0x02D9,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1257 */
-
-/*
- * 8-bit UCS -> win_1257 speed-optimized table (1794 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_WIN_1257)
-
-static _CONST unsigned char
-from_ucs_speed_win_1257[] =
-{
-	W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(0x0402),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0502),W(0x0602),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA0,0xFF,0xA2,0xA3,0xA4,0xFF,0xA6,0xA7,
-	0x8D,0xA9,0xFF,0xAB,0xAC,0xAD,0xAE,0x9D,
-	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
-	0x8F,0xB9,0xFF,0xBB,0xBC,0xBD,0xBE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xC4,0xC5,0xAF,0xFF,
-	0xFF,0xC9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xD3,0xFF,0xD5,0xD6,0xD7,
-	0xA8,0xFF,0xFF,0xFF,0xDC,0xFF,0xFF,0xDF,
-	0xFF,0xFF,0xFF,0xFF,0xE4,0xE5,0xBF,0xFF,
-	0xFF,0xE9,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xF3,0xFF,0xF5,0xF6,0xF7,
-	0xB8,0xFF,0xFF,0xFF,0xFC,0xFF,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xC2,0xE2,0xFF,0xFF,0xC0,0xE0,0xC3,0xE3,
-	0xFF,0xFF,0xFF,0xFF,0xC8,0xE8,0xFF,0xFF,
-	0xFF,0xFF,0xC7,0xE7,0xFF,0xFF,0xCB,0xEB,
-	0xC6,0xE6,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xCC,0xEC,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xCE,0xEE,0xFF,0xFF,0xC1,0xE1,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xCD,0xED,
-	0xFF,0xFF,0xFF,0xCF,0xEF,0xFF,0xFF,0xFF,
-	0xFF,0xD9,0xF9,0xD1,0xF1,0xD2,0xF2,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xD4,0xF4,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xAA,0xBA,
-	0xFF,0xFF,0xDA,0xFA,0xFF,0xFF,0xFF,0xFF,
-	0xD0,0xF0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xDB,0xFB,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xD8,0xF8,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xCA,0xEA,0xDD,0xFD,0xDE,0xFE,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 3, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x8E,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0x9E,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0502 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0x96,0x97,0xFF,0xFF,0xFF,
-	0x91,0x92,0x82,0xFF,0x93,0x94,0x84,0xFF,
-	0x86,0x87,0x95,0xFF,0xFF,0xFF,0x85,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x89,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8B,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x80,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0602 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x99,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_WIN_1257 */
-
-/*
- * win_1257 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_win_1257 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_WIN_1257, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_WIN_1257)
-	(__uint16_t *)&from_ucs_speed_win_1257, /* UCS -> win_1257 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_WIN_1257)
-	(__uint16_t *)&to_ucs_speed_win_1257 /* win_1257 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1257) || ... */
-
diff --git a/newlib/libc/iconv/ccs/win_1258.c b/newlib/libc/iconv/ccs/win_1258.c
deleted file mode 100644
index 7331d78..0000000
--- a/newlib/libc/iconv/ccs/win_1258.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * This file was generated automatically - don't edit it.
- * File contains iconv CCS tables for win_1258 encoding.
- */
-
-#include "ccsbi.h"
-
-#if defined (ICONV_TO_UCS_CCS_WIN_1258) \
- || defined (ICONV_FROM_UCS_CCS_WIN_1258)
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include "ccs.h"
-#include "ccsnames.h"
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#  define W(word) (word) & 0xFF, (word) >> 8
-#elif (BYTE_ORDER == BIG_ENDIAN)
-#  define W(word) (word) >> 8, (word) & 0xFF
-#else
-#  error "Unknown byte order."
-#endif
-
-/*
- * 8-bit win_1258 -> UCS table (512 bytes).
- * ======================================================================
- */
-#if defined (ICONV_TO_UCS_CCS_WIN_1258)
-
-static _CONST __uint16_t
-to_ucs_speed_win_1258[] =
-{
-	0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
-	0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F,
-	0x0010,0x0011,0x0012,0x0013,0x0014,0x0015,0x0016,0x0017,
-	0x0018,0x0019,0x001A,0x001B,0x001C,0x001D,0x001E,0x001F,
-	0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,
-	0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,
-	0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,
-	0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,
-	0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,
-	0x0048,0x0049,0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,
-	0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,
-	0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,
-	0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,
-	0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,
-	0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,
-	0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x007F,
-	0x20AC,INVALC,0x201A,0x0192,0x201E,0x2026,0x2020,0x2021,
-	0x02C6,0x2030,INVALC,0x2039,0x0152,INVALC,INVALC,INVALC,
-	INVALC,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,
-	0x02DC,0x2122,INVALC,0x203A,0x0153,INVALC,INVALC,0x0178,
-	0x00A0,0x00A1,0x00A2,0x00A3,0x00A4,0x00A5,0x00A6,0x00A7,
-	0x00A8,0x00A9,0x00AA,0x00AB,0x00AC,0x00AD,0x00AE,0x00AF,
-	0x00B0,0x00B1,0x00B2,0x00B3,0x00B4,0x00B5,0x00B6,0x00B7,
-	0x00B8,0x00B9,0x00BA,0x00BB,0x00BC,0x00BD,0x00BE,0x00BF,
-	0x00C0,0x00C1,0x00C2,0x0102,0x00C4,0x00C5,0x00C6,0x00C7,
-	0x00C8,0x00C9,0x00CA,0x00CB,0x0300,0x00CD,0x00CE,0x00CF,
-	0x0110,0x00D1,0x0309,0x00D3,0x00D4,0x01A0,0x00D6,0x00D7,
-	0x00D8,0x00D9,0x00DA,0x00DB,0x00DC,0x01AF,0x0303,0x00DF,
-	0x00E0,0x00E1,0x00E2,0x0103,0x00E4,0x00E5,0x00E6,0x00E7,
-	0x00E8,0x00E9,0x00EA,0x00EB,0x0301,0x00ED,0x00EE,0x00EF,
-	0x0111,0x00F1,0x0323,0x00F3,0x00F4,0x01A1,0x00F6,0x00F7,
-	0x00F8,0x00F9,0x00FA,0x00FB,0x00FC,0x01B0,0x20AB,0x00FF,
-	
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1258 */
-
-/*
- * 8-bit UCS -> win_1258 speed-optimized table (2050 bytes).
- * ======================================================================
- */
-
-#if defined (ICONV_FROM_UCS_CCS_WIN_1258)
-
-static _CONST unsigned char
-from_ucs_speed_win_1258[] =
-{
-	W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
-	/* Heading Block */
-	W(0x0202),W(0x0302),W(0x0402),W(0x0502),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(0x0602),W(0x0702),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	W(INVBLK),W(INVBLK),W(INVBLK),W(INVBLK),
-	/* Block 1, Array index 0x0202 */
-	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-	0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
-	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-	0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
-	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,
-	0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,
-	0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-	0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,
-	0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-	0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,
-	0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,
-	0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-	0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,
-	0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,
-	0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
-	0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,
-	0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
-	0xC0,0xC1,0xC2,0xFF,0xC4,0xC5,0xC6,0xC7,
-	0xC8,0xC9,0xCA,0xCB,0xFF,0xCD,0xCE,0xCF,
-	0xFF,0xD1,0xFF,0xD3,0xD4,0xFF,0xD6,0xD7,
-	0xD8,0xD9,0xDA,0xDB,0xDC,0xFF,0xFF,0xDF,
-	0xE0,0xE1,0xE2,0xFF,0xE4,0xE5,0xE6,0xE7,
-	0xE8,0xE9,0xEA,0xEB,0xFF,0xED,0xEE,0xEF,
-	0xFF,0xF1,0xFF,0xF3,0xF4,0xFF,0xF6,0xF7,
-	0xF8,0xF9,0xFA,0xFB,0xFC,0xFF,0xFF,0xFF,
-	/* Block 2, Array index 0x0302 */
-	0xFF,0xFF,0xC3,0xE3,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xD0,0xF0,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x8C,0x9C,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x9F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x83,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xD5,0xF5,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xDD,
-	0xFD,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 3, Array index 0x0402 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x88,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0x98,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 4, Array index 0x0502 */
-	0xCC,0xEC,0xFF,0xDE,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xD2,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xF2,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 33, Array index 0x0602 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0x96,0x97,0xFF,0xFF,0xFF,
-	0x91,0x92,0x82,0xFF,0x93,0x94,0x84,0xFF,
-	0x86,0x87,0x95,0xFF,0xFF,0xFF,0x85,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0x89,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0x8B,0x9B,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFE,0x80,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	/* Block 34, Array index 0x0702 */
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0x99,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
-};
-
-#endif /* ICONV_FROM_UCS_CCS_WIN_1258 */
-
-/*
- * win_1258 CCS description table.
- * ======================================================================
- */
-_CONST iconv_ccs_t
-_iconv_ccs_win_1258 =
-{
-	TABLE_VERSION_1, /* Table version */
-	ICONV_CCS_WIN_1258, /* CCS name */
-	TABLE_8BIT, /* Table bits */
-	0, /* Not Used */
-#if defined (ICONV_FROM_UCS_CCS_WIN_1258)
-	(__uint16_t *)&from_ucs_speed_win_1258, /* UCS -> win_1258 table */
-#else
-	(__uint16_t *)NULL,
-#endif
-	0, /* Not Used */
-#if defined (ICONV_TO_UCS_CCS_WIN_1258)
-	(__uint16_t *)&to_ucs_speed_win_1258 /* win_1258 -> UCS table */
-#else
-	(__uint16_t *)NULL,
-#endif
-};
-
-#endif /* ICONV_TO_UCS_CCS_WIN_1258) || ... */
-
diff --git a/newlib/libc/iconv/ces/Makefile.am b/newlib/libc/iconv/ces/Makefile.am
deleted file mode 100644
index 977d500..0000000
--- a/newlib/libc/iconv/ces/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-GENERAL_SOURCES = \
-	utf-8.c \
-	utf-16.c \
-	ucs-2.c \
-	us-ascii.c \
-	ucs-4.c \
-	ucs-2-internal.c \
-	ucs-4-internal.c \
-	cesbi.c \
-	table.c \
-	table-pcs.c \
-	euc.c
-
-## The following interfaces are EL/IX level 2
-if ELIX_LEVEL_1
-LIB_OBJS = \
-	utf-8.$(oext) \
-	utf-16.$(oext) \
-	ucs-2.$(oext) \
-	us-ascii.$(oext) \
-	ucs-4.$(oext) \
-	ucs-2-internal.$(oext) \
-	ucs-4-internal.$(oext) \
-	cesbi.$(oext) \
-	table.$(oext) \
-	table-pcs.$(oext) \
-	euc.$(oext)
-else
-LIB_OBJS = 
-endif
-
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
-
-CHEWOUT_FILES = ces.def
-
-SUFFIXES = .def
-
-CHEW = ../../../doc/makedoc -f $(srcdir)/../../../doc/doc.str
-
-.c.def:
-	$(CHEW) < $< > $*.def 2> $*.ref
-	touch stmp-def
-
-TARGETDOC = ../tmp.texi
-
-doc: $(CHEWOUT_FILES)
-	cat $(srcdir)/ces.tex >> $(TARGETDOC)
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-
diff --git a/newlib/libc/iconv/ces/Makefile.in b/newlib/libc/iconv/ces/Makefile.in
deleted file mode 100644
index c51b74f..0000000
--- a/newlib/libc/iconv/ces/Makefile.in
+++ /dev/null
@@ -1,369 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
-LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
-LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
-LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
-LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
-LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
-LIBC_SYS_LIB = @LIBC_SYS_LIB@
-LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-extra_dir = @extra_dir@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-GENERAL_SOURCES =  	utf-8.c 	utf-16.c 	ucs-2.c 	us-ascii.c 	ucs-4.c 	ucs-2-internal.c 	ucs-4-internal.c 	cesbi.c 	table.c 	table-pcs.c 	euc.c
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 	utf-8.$(oext) 	utf-16.$(oext) 	ucs-2.$(oext) 	us-ascii.$(oext) 	ucs-4.$(oext) 	ucs-2-internal.$(oext) 	ucs-4-internal.$(oext) 	cesbi.$(oext) 	table.$(oext) 	table-pcs.$(oext) 	euc.$(oext)
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = 
-
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
-noinst_DATA = 
-
-CHEWOUT_FILES = ces.def
-
-SUFFIXES = .def
-
-CHEW = ../../../doc/makedoc -f $(srcdir)/../../../doc/doc.str
-
-TARGETDOC = ../tmp.texi
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_OBJECTS =  utf-8.$(OBJEXT) utf-16.$(OBJEXT) ucs-2.$(OBJEXT) \
-us-ascii.$(OBJEXT) ucs-4.$(OBJEXT) ucs-2-internal.$(OBJEXT) \
-ucs-4-internal.$(OBJEXT) cesbi.$(OBJEXT) table.$(OBJEXT) \
-table-pcs.$(OBJEXT) euc.$(OBJEXT)
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus iconv/ces/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = iconv/ces
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-.c.def:
-	$(CHEW) < $< > $*.def 2> $*.ref
-	touch stmp-def
-
-doc: $(CHEWOUT_FILES)
-	cat $(srcdir)/ces.tex >> $(TARGETDOC)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/iconv/ces/cesbi.c b/newlib/libc/iconv/ces/cesbi.c
deleted file mode 100644
index c2e6520..0000000
--- a/newlib/libc/iconv/ces/cesbi.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * This file was automatically generated mkdeps.pl script. Don't edit.
- */
-
-#include <_ansi.h>
-#include <newlib.h>
-#include "../lib/ucsconv.h"
-#include "cesbi.h"
-
-/*
- * Each CES converter provides the list of supported encodings.
- */
-#if defined (ICONV_TO_UCS_CES_EUC) \
- || defined (ICONV_FROM_UCS_CES_EUC)
-static _CONST char *
-iconv_ces_names_euc[] =
-{
-# if defined (_ICONV_FROM_ENCODING_EUC_JP) \
-  || defined (_ICONV_TO_ENCODING_EUC_JP)
-  ICONV_ENCODING_EUC_JP,
-#endif
-# if defined (_ICONV_FROM_ENCODING_EUC_KR) \
-  || defined (_ICONV_TO_ENCODING_EUC_KR)
-  ICONV_ENCODING_EUC_KR,
-#endif
-# if defined (_ICONV_FROM_ENCODING_EUC_TW) \
-  || defined (_ICONV_TO_ENCODING_EUC_TW)
-  ICONV_ENCODING_EUC_TW,
-#endif
-  NULL
-};
-#endif
-
-#if defined (ICONV_TO_UCS_CES_TABLE) \
- || defined (ICONV_FROM_UCS_CES_TABLE)
-static _CONST char *
-iconv_ces_names_table[] =
-{
-# if defined (_ICONV_FROM_ENCODING_CP775) \
-  || defined (_ICONV_TO_ENCODING_CP775)
-  ICONV_ENCODING_CP775,
-#endif
-# if defined (_ICONV_FROM_ENCODING_CP850) \
-  || defined (_ICONV_TO_ENCODING_CP850)
-  ICONV_ENCODING_CP850,
-#endif
-# if defined (_ICONV_FROM_ENCODING_CP852) \
-  || defined (_ICONV_TO_ENCODING_CP852)
-  ICONV_ENCODING_CP852,
-#endif
-# if defined (_ICONV_FROM_ENCODING_CP855) \
-  || defined (_ICONV_TO_ENCODING_CP855)
-  ICONV_ENCODING_CP855,
-#endif
-# if defined (_ICONV_FROM_ENCODING_CP866) \
-  || defined (_ICONV_TO_ENCODING_CP866)
-  ICONV_ENCODING_CP866,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_1) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_1)
-  ICONV_ENCODING_ISO_8859_1,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_10) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_10)
-  ICONV_ENCODING_ISO_8859_10,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_11) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_11)
-  ICONV_ENCODING_ISO_8859_11,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_13) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_13)
-  ICONV_ENCODING_ISO_8859_13,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_14) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_14)
-  ICONV_ENCODING_ISO_8859_14,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_15) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_15)
-  ICONV_ENCODING_ISO_8859_15,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_2) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_2)
-  ICONV_ENCODING_ISO_8859_2,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_3) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_3)
-  ICONV_ENCODING_ISO_8859_3,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_4) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_4)
-  ICONV_ENCODING_ISO_8859_4,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_5) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_5)
-  ICONV_ENCODING_ISO_8859_5,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_6) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_6)
-  ICONV_ENCODING_ISO_8859_6,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_7) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_7)
-  ICONV_ENCODING_ISO_8859_7,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_8) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_8)
-  ICONV_ENCODING_ISO_8859_8,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_8859_9) \
-  || defined (_ICONV_TO_ENCODING_ISO_8859_9)
-  ICONV_ENCODING_ISO_8859_9,
-#endif
-# if defined (_ICONV_FROM_ENCODING_ISO_IR_111) \
-  || defined (_ICONV_TO_ENCODING_ISO_IR_111)
-  ICONV_ENCODING_ISO_IR_111,
-#endif
-# if defined (_ICONV_FROM_ENCODING_KOI8_R) \
-  || defined (_ICONV_TO_ENCODING_KOI8_R)
-  ICONV_ENCODING_KOI8_R,
-#endif
-# if defined (_ICONV_FROM_ENCODING_KOI8_RU) \
-  || defined (_ICONV_TO_ENCODING_KOI8_RU)
-  ICONV_ENCODING_KOI8_RU,
-#endif
-# if defined (_ICONV_FROM_ENCODING_KOI8_U) \
-  || defined (_ICONV_TO_ENCODING_KOI8_U)
-  ICONV_ENCODING_KOI8_U,
-#endif
-# if defined (_ICONV_FROM_ENCODING_KOI8_UNI) \
-  || defined (_ICONV_TO_ENCODING_KOI8_UNI)
-  ICONV_ENCODING_KOI8_UNI,
-#endif
-# if defined (_ICONV_FROM_ENCODING_WIN_1250) \
-  || defined (_ICONV_TO_ENCODING_WIN_1250)
-  ICONV_ENCODING_WIN_1250,
-#endif
-# if defined (_ICONV_FROM_ENCODING_WIN_1251) \
-  || defined (_ICONV_TO_ENCODING_WIN_1251)
-  ICONV_ENCODING_WIN_1251,
-#endif
-# if defined (_ICONV_FROM_ENCODING_WIN_1252) \
-  || defined (_ICONV_TO_ENCODING_WIN_1252)
-  ICONV_ENCODING_WIN_1252,
-#endif
-# if defined (_ICONV_FROM_ENCODING_WIN_1253) \
-  || defined (_ICONV_TO_ENCODING_WIN_1253)
-  ICONV_ENCODING_WIN_1253,
-#endif
-# if defined (_ICONV_FROM_ENCODING_WIN_1254) \
-  || defined (_ICONV_TO_ENCODING_WIN_1254)
-  ICONV_ENCODING_WIN_1254,
-#endif
-# if defined (_ICONV_FROM_ENCODING_WIN_1255) \
-  || defined (_ICONV_TO_ENCODING_WIN_1255)
-  ICONV_ENCODING_WIN_1255,
-#endif
-# if defined (_ICONV_FROM_ENCODING_WIN_1256) \
-  || defined (_ICONV_TO_ENCODING_WIN_1256)
-  ICONV_ENCODING_WIN_1256,
-#endif
-# if defined (_ICONV_FROM_ENCODING_WIN_1257) \
-  || defined (_ICONV_TO_ENCODING_WIN_1257)
-  ICONV_ENCODING_WIN_1257,
-#endif
-# if defined (_ICONV_FROM_ENCODING_WIN_1258) \
-  || defined (_ICONV_TO_ENCODING_WIN_1258)
-  ICONV_ENCODING_WIN_1258,
-#endif
-  NULL
-};
-#endif
-
-#if defined (ICONV_TO_UCS_CES_TABLE_PCS) \
- || defined (ICONV_FROM_UCS_CES_TABLE_PCS)
-static _CONST char *
-iconv_ces_names_table_pcs[] =
-{
-# if defined (_ICONV_FROM_ENCODING_BIG5) \
-  || defined (_ICONV_TO_ENCODING_BIG5)
-  ICONV_ENCODING_BIG5,
-#endif
-  NULL
-};
-#endif
-
-#if defined (ICONV_TO_UCS_CES_UCS_2) \
- || defined (ICONV_FROM_UCS_CES_UCS_2)
-static _CONST char *
-iconv_ces_names_ucs_2[] =
-{
-# if defined (_ICONV_FROM_ENCODING_UCS_2) \
-  || defined (_ICONV_TO_ENCODING_UCS_2)
-  ICONV_ENCODING_UCS_2,
-#endif
-# if defined (_ICONV_FROM_ENCODING_UCS_2BE) \
-  || defined (_ICONV_TO_ENCODING_UCS_2BE)
-  ICONV_ENCODING_UCS_2BE,
-#endif
-# if defined (_ICONV_FROM_ENCODING_UCS_2LE) \
-  || defined (_ICONV_TO_ENCODING_UCS_2LE)
-  ICONV_ENCODING_UCS_2LE,
-#endif
-  NULL
-};
-#endif
-
-#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL) \
- || defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
-static _CONST char *
-iconv_ces_names_ucs_2_internal[] =
-{
-# if defined (_ICONV_FROM_ENCODING_UCS_2_INTERNAL) \
-  || defined (_ICONV_TO_ENCODING_UCS_2_INTERNAL)
-  ICONV_ENCODING_UCS_2_INTERNAL,
-#endif
-  NULL
-};
-#endif
-
-#if defined (ICONV_TO_UCS_CES_UCS_4) \
- || defined (ICONV_FROM_UCS_CES_UCS_4)
-static _CONST char *
-iconv_ces_names_ucs_4[] =
-{
-# if defined (_ICONV_FROM_ENCODING_UCS_4) \
-  || defined (_ICONV_TO_ENCODING_UCS_4)
-  ICONV_ENCODING_UCS_4,
-#endif
-# if defined (_ICONV_FROM_ENCODING_UCS_4BE) \
-  || defined (_ICONV_TO_ENCODING_UCS_4BE)
-  ICONV_ENCODING_UCS_4BE,
-#endif
-# if defined (_ICONV_FROM_ENCODING_UCS_4LE) \
-  || defined (_ICONV_TO_ENCODING_UCS_4LE)
-  ICONV_ENCODING_UCS_4LE,
-#endif
-  NULL
-};
-#endif
-
-#if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL) \
- || defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
-static _CONST char *
-iconv_ces_names_ucs_4_internal[] =
-{
-# if defined (_ICONV_FROM_ENCODING_UCS_4_INTERNAL) \
-  || defined (_ICONV_TO_ENCODING_UCS_4_INTERNAL)
-  ICONV_ENCODING_UCS_4_INTERNAL,
-#endif
-  NULL
-};
-#endif
-
-#if defined (ICONV_TO_UCS_CES_US_ASCII) \
- || defined (ICONV_FROM_UCS_CES_US_ASCII)
-static _CONST char *
-iconv_ces_names_us_ascii[] =
-{
-# if defined (_ICONV_FROM_ENCODING_US_ASCII) \
-  || defined (_ICONV_TO_ENCODING_US_ASCII)
-  ICONV_ENCODING_US_ASCII,
-#endif
-  NULL
-};
-#endif
-
-#if defined (ICONV_TO_UCS_CES_UTF_16) \
- || defined (ICONV_FROM_UCS_CES_UTF_16)
-static _CONST char *
-iconv_ces_names_utf_16[] =
-{
-# if defined (_ICONV_FROM_ENCODING_UTF_16) \
-  || defined (_ICONV_TO_ENCODING_UTF_16)
-  ICONV_ENCODING_UTF_16,
-#endif
-# if defined (_ICONV_FROM_ENCODING_UTF_16BE) \
-  || defined (_ICONV_TO_ENCODING_UTF_16BE)
-  ICONV_ENCODING_UTF_16BE,
-#endif
-# if defined (_ICONV_FROM_ENCODING_UTF_16LE) \
-  || defined (_ICONV_TO_ENCODING_UTF_16LE)
-  ICONV_ENCODING_UTF_16LE,
-#endif
-  NULL
-};
-#endif
-
-#if defined (ICONV_TO_UCS_CES_UTF_8) \
- || defined (ICONV_FROM_UCS_CES_UTF_8)
-static _CONST char *
-iconv_ces_names_utf_8[] =
-{
-# if defined (_ICONV_FROM_ENCODING_UTF_8) \
-  || defined (_ICONV_TO_ENCODING_UTF_8)
-  ICONV_ENCODING_UTF_8,
-#endif
-  NULL
-};
-#endif
-
-/*
- * The following structure contains the list of "to UCS" linked-in CES converters.
- */
-_CONST iconv_to_ucs_ces_t
-_iconv_to_ucs_ces[] =
-{
-#ifdef ICONV_TO_UCS_CES_EUC
-  {(_CONST char **)iconv_ces_names_euc,
-   &_iconv_to_ucs_ces_handlers_euc},
-#endif
-#ifdef ICONV_TO_UCS_CES_TABLE
-  {(_CONST char **)iconv_ces_names_table,
-   &_iconv_to_ucs_ces_handlers_table},
-#endif
-#ifdef ICONV_TO_UCS_CES_TABLE_PCS
-  {(_CONST char **)iconv_ces_names_table_pcs,
-   &_iconv_to_ucs_ces_handlers_table_pcs},
-#endif
-#ifdef ICONV_TO_UCS_CES_UCS_2
-  {(_CONST char **)iconv_ces_names_ucs_2,
-   &_iconv_to_ucs_ces_handlers_ucs_2},
-#endif
-#ifdef ICONV_TO_UCS_CES_UCS_2_INTERNAL
-  {(_CONST char **)iconv_ces_names_ucs_2_internal,
-   &_iconv_to_ucs_ces_handlers_ucs_2_internal},
-#endif
-#ifdef ICONV_TO_UCS_CES_UCS_4
-  {(_CONST char **)iconv_ces_names_ucs_4,
-   &_iconv_to_ucs_ces_handlers_ucs_4},
-#endif
-#ifdef ICONV_TO_UCS_CES_UCS_4_INTERNAL
-  {(_CONST char **)iconv_ces_names_ucs_4_internal,
-   &_iconv_to_ucs_ces_handlers_ucs_4_internal},
-#endif
-#ifdef ICONV_TO_UCS_CES_US_ASCII
-  {(_CONST char **)iconv_ces_names_us_ascii,
-   &_iconv_to_ucs_ces_handlers_us_ascii},
-#endif
-#ifdef ICONV_TO_UCS_CES_UTF_16
-  {(_CONST char **)iconv_ces_names_utf_16,
-   &_iconv_to_ucs_ces_handlers_utf_16},
-#endif
-#ifdef ICONV_TO_UCS_CES_UTF_8
-  {(_CONST char **)iconv_ces_names_utf_8,
-   &_iconv_to_ucs_ces_handlers_utf_8},
-#endif
-  {(_CONST char **)NULL,
-  (iconv_to_ucs_ces_handlers_t *)NULL}
-};
-
-/*
- * The following structure contains the list of "from UCS" linked-in CES converters.
- */
-_CONST iconv_from_ucs_ces_t
-_iconv_from_ucs_ces[] =
-{
-#ifdef ICONV_FROM_UCS_CES_EUC
-  {(_CONST char **)iconv_ces_names_euc,
-   &_iconv_from_ucs_ces_handlers_euc},
-#endif
-#ifdef ICONV_FROM_UCS_CES_TABLE
-  {(_CONST char **)iconv_ces_names_table,
-   &_iconv_from_ucs_ces_handlers_table},
-#endif
-#ifdef ICONV_FROM_UCS_CES_TABLE_PCS
-  {(_CONST char **)iconv_ces_names_table_pcs,
-   &_iconv_from_ucs_ces_handlers_table_pcs},
-#endif
-#ifdef ICONV_FROM_UCS_CES_UCS_2
-  {(_CONST char **)iconv_ces_names_ucs_2,
-   &_iconv_from_ucs_ces_handlers_ucs_2},
-#endif
-#ifdef ICONV_FROM_UCS_CES_UCS_2_INTERNAL
-  {(_CONST char **)iconv_ces_names_ucs_2_internal,
-   &_iconv_from_ucs_ces_handlers_ucs_2_internal},
-#endif
-#ifdef ICONV_FROM_UCS_CES_UCS_4
-  {(_CONST char **)iconv_ces_names_ucs_4,
-   &_iconv_from_ucs_ces_handlers_ucs_4},
-#endif
-#ifdef ICONV_FROM_UCS_CES_UCS_4_INTERNAL
-  {(_CONST char **)iconv_ces_names_ucs_4_internal,
-   &_iconv_from_ucs_ces_handlers_ucs_4_internal},
-#endif
-#ifdef ICONV_FROM_UCS_CES_US_ASCII
-  {(_CONST char **)iconv_ces_names_us_ascii,
-   &_iconv_from_ucs_ces_handlers_us_ascii},
-#endif
-#ifdef ICONV_FROM_UCS_CES_UTF_16
-  {(_CONST char **)iconv_ces_names_utf_16,
-   &_iconv_from_ucs_ces_handlers_utf_16},
-#endif
-#ifdef ICONV_FROM_UCS_CES_UTF_8
-  {(_CONST char **)iconv_ces_names_utf_8,
-   &_iconv_from_ucs_ces_handlers_utf_8},
-#endif
-  {(_CONST char **)NULL,
-  (iconv_from_ucs_ces_handlers_t *)NULL}
-};
diff --git a/newlib/libc/iconv/ces/cesbi.h b/newlib/libc/iconv/ces/cesbi.h
deleted file mode 100644
index 67e85ef..0000000
--- a/newlib/libc/iconv/ces/cesbi.h
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * This file was automatically generated mkdeps.pl script. Don't edit.
- */
-
-#ifndef __CESBI_H__
-#define __CESBI_H__
-
-#include <newlib.h>
-#include <_ansi.h>
-#include "../lib/encnames.h"
-#include "../lib/ucsconv.h"
-
-/*
- * Enable CES converter if correspondent encoding is requested.
- * Defining ICONV_TO_UCS_CES_XXX macro or ICONV_FROM_UCS_CES_XXX
- * macro is needed to enable "XXX encoding -> UCS" or "UCS -> XXX encoding"
- * part of UCS-based CES converter.
- */
-#if defined (_ICONV_FROM_ENCODING_EUC_JP) \
- || defined (_ICONV_FROM_ENCODING_EUC_KR) \
- || defined (_ICONV_FROM_ENCODING_EUC_TW)
-#  define ICONV_TO_UCS_CES_EUC
-#endif
-#if defined (_ICONV_TO_ENCODING_EUC_JP) \
- || defined (_ICONV_TO_ENCODING_EUC_KR) \
- || defined (_ICONV_TO_ENCODING_EUC_TW)
-#  define ICONV_FROM_UCS_CES_EUC
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_CP775) \
- || defined (_ICONV_FROM_ENCODING_CP850) \
- || defined (_ICONV_FROM_ENCODING_CP852) \
- || defined (_ICONV_FROM_ENCODING_CP855) \
- || defined (_ICONV_FROM_ENCODING_CP866) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_1) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_10) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_11) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_13) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_14) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_15) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_2) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_3) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_4) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_5) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_6) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_7) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_8) \
- || defined (_ICONV_FROM_ENCODING_ISO_8859_9) \
- || defined (_ICONV_FROM_ENCODING_ISO_IR_111) \
- || defined (_ICONV_FROM_ENCODING_KOI8_R) \
- || defined (_ICONV_FROM_ENCODING_KOI8_RU) \
- || defined (_ICONV_FROM_ENCODING_KOI8_U) \
- || defined (_ICONV_FROM_ENCODING_KOI8_UNI) \
- || defined (_ICONV_FROM_ENCODING_WIN_1250) \
- || defined (_ICONV_FROM_ENCODING_WIN_1251) \
- || defined (_ICONV_FROM_ENCODING_WIN_1252) \
- || defined (_ICONV_FROM_ENCODING_WIN_1253) \
- || defined (_ICONV_FROM_ENCODING_WIN_1254) \
- || defined (_ICONV_FROM_ENCODING_WIN_1255) \
- || defined (_ICONV_FROM_ENCODING_WIN_1256) \
- || defined (_ICONV_FROM_ENCODING_WIN_1257) \
- || defined (_ICONV_FROM_ENCODING_WIN_1258)
-#  define ICONV_TO_UCS_CES_TABLE
-#endif
-#if defined (_ICONV_TO_ENCODING_CP775) \
- || defined (_ICONV_TO_ENCODING_CP850) \
- || defined (_ICONV_TO_ENCODING_CP852) \
- || defined (_ICONV_TO_ENCODING_CP855) \
- || defined (_ICONV_TO_ENCODING_CP866) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_1) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_10) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_11) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_13) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_14) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_15) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_2) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_3) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_4) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_5) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_6) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_7) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_8) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_9) \
- || defined (_ICONV_TO_ENCODING_ISO_IR_111) \
- || defined (_ICONV_TO_ENCODING_KOI8_R) \
- || defined (_ICONV_TO_ENCODING_KOI8_RU) \
- || defined (_ICONV_TO_ENCODING_KOI8_U) \
- || defined (_ICONV_TO_ENCODING_KOI8_UNI) \
- || defined (_ICONV_TO_ENCODING_WIN_1250) \
- || defined (_ICONV_TO_ENCODING_WIN_1251) \
- || defined (_ICONV_TO_ENCODING_WIN_1252) \
- || defined (_ICONV_TO_ENCODING_WIN_1253) \
- || defined (_ICONV_TO_ENCODING_WIN_1254) \
- || defined (_ICONV_TO_ENCODING_WIN_1255) \
- || defined (_ICONV_TO_ENCODING_WIN_1256) \
- || defined (_ICONV_TO_ENCODING_WIN_1257) \
- || defined (_ICONV_TO_ENCODING_WIN_1258)
-#  define ICONV_FROM_UCS_CES_TABLE
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_BIG5)
-#  define ICONV_TO_UCS_CES_TABLE_PCS
-#endif
-#if defined (_ICONV_TO_ENCODING_BIG5)
-#  define ICONV_FROM_UCS_CES_TABLE_PCS
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_UCS_2) \
- || defined (_ICONV_FROM_ENCODING_UCS_2BE) \
- || defined (_ICONV_FROM_ENCODING_UCS_2LE)
-#  define ICONV_TO_UCS_CES_UCS_2
-#endif
-#if defined (_ICONV_TO_ENCODING_UCS_2) \
- || defined (_ICONV_TO_ENCODING_UCS_2BE) \
- || defined (_ICONV_TO_ENCODING_UCS_2LE)
-#  define ICONV_FROM_UCS_CES_UCS_2
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_UCS_2_INTERNAL)
-#  define ICONV_TO_UCS_CES_UCS_2_INTERNAL
-#endif
-#if defined (_ICONV_TO_ENCODING_UCS_2_INTERNAL)
-#  define ICONV_FROM_UCS_CES_UCS_2_INTERNAL
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_UCS_4) \
- || defined (_ICONV_FROM_ENCODING_UCS_4BE) \
- || defined (_ICONV_FROM_ENCODING_UCS_4LE)
-#  define ICONV_TO_UCS_CES_UCS_4
-#endif
-#if defined (_ICONV_TO_ENCODING_UCS_4) \
- || defined (_ICONV_TO_ENCODING_UCS_4BE) \
- || defined (_ICONV_TO_ENCODING_UCS_4LE)
-#  define ICONV_FROM_UCS_CES_UCS_4
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_UCS_4_INTERNAL)
-#  define ICONV_TO_UCS_CES_UCS_4_INTERNAL
-#endif
-#if defined (_ICONV_TO_ENCODING_UCS_4_INTERNAL)
-#  define ICONV_FROM_UCS_CES_UCS_4_INTERNAL
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_US_ASCII)
-#  define ICONV_TO_UCS_CES_US_ASCII
-#endif
-#if defined (_ICONV_TO_ENCODING_US_ASCII)
-#  define ICONV_FROM_UCS_CES_US_ASCII
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_UTF_16) \
- || defined (_ICONV_FROM_ENCODING_UTF_16BE) \
- || defined (_ICONV_FROM_ENCODING_UTF_16LE)
-#  define ICONV_TO_UCS_CES_UTF_16
-#endif
-#if defined (_ICONV_TO_ENCODING_UTF_16) \
- || defined (_ICONV_TO_ENCODING_UTF_16BE) \
- || defined (_ICONV_TO_ENCODING_UTF_16LE)
-#  define ICONV_FROM_UCS_CES_UTF_16
-#endif
-
-#if defined (_ICONV_FROM_ENCODING_UTF_8)
-#  define ICONV_TO_UCS_CES_UTF_8
-#endif
-#if defined (_ICONV_TO_ENCODING_UTF_8)
-#  define ICONV_FROM_UCS_CES_UTF_8
-#endif
-
-/*
- * Some encodings require another encodings to be enabled.
- * These dependencies are handled in cesdeps.h header file.
- */
-#include "cesdeps.h"
-
-/*
- * NLS uses iconv's capabilities and require one of encodings
- * to be enabled for internal wchar_t representation.
- */
-#include "../lib/iconvnls.h"
-
-/*
- * Forward declarations of CES converter handlers.
- * These handlers are actually defined in correspondent CES converter files.
- */
-#ifdef ICONV_TO_UCS_CES_EUC
-extern _CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_euc;
-#endif
-#ifdef ICONV_FROM_UCS_CES_EUC
-extern _CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_euc;
-#endif
-
-#ifdef ICONV_TO_UCS_CES_TABLE
-extern _CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_table;
-#endif
-#ifdef ICONV_FROM_UCS_CES_TABLE
-extern _CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_table;
-#endif
-
-#ifdef ICONV_TO_UCS_CES_TABLE_PCS
-extern _CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_table_pcs;
-#endif
-#ifdef ICONV_FROM_UCS_CES_TABLE_PCS
-extern _CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_table_pcs;
-#endif
-
-#ifdef ICONV_TO_UCS_CES_UCS_2
-extern _CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_ucs_2;
-#endif
-#ifdef ICONV_FROM_UCS_CES_UCS_2
-extern _CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_ucs_2;
-#endif
-
-#ifdef ICONV_TO_UCS_CES_UCS_2_INTERNAL
-extern _CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_ucs_2_internal;
-#endif
-#ifdef ICONV_FROM_UCS_CES_UCS_2_INTERNAL
-extern _CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_ucs_2_internal;
-#endif
-
-#ifdef ICONV_TO_UCS_CES_UCS_4
-extern _CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_ucs_4;
-#endif
-#ifdef ICONV_FROM_UCS_CES_UCS_4
-extern _CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_ucs_4;
-#endif
-
-#ifdef ICONV_TO_UCS_CES_UCS_4_INTERNAL
-extern _CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_ucs_4_internal;
-#endif
-#ifdef ICONV_FROM_UCS_CES_UCS_4_INTERNAL
-extern _CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_ucs_4_internal;
-#endif
-
-#ifdef ICONV_TO_UCS_CES_US_ASCII
-extern _CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_us_ascii;
-#endif
-#ifdef ICONV_FROM_UCS_CES_US_ASCII
-extern _CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_us_ascii;
-#endif
-
-#ifdef ICONV_TO_UCS_CES_UTF_16
-extern _CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_utf_16;
-#endif
-#ifdef ICONV_FROM_UCS_CES_UTF_16
-extern _CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_utf_16;
-#endif
-
-#ifdef ICONV_TO_UCS_CES_UTF_8
-extern _CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_utf_8;
-#endif
-#ifdef ICONV_FROM_UCS_CES_UTF_8
-extern _CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_utf_8;
-#endif
-
-#endif /* !__CESBI_H__ */
-
diff --git a/newlib/libc/iconv/ces/cesdeps.h b/newlib/libc/iconv/ces/cesdeps.h
deleted file mode 100644
index e6aec45..0000000
--- a/newlib/libc/iconv/ces/cesdeps.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file was automatically generated mkdeps.pl script. Don't edit.
- */
-
-#ifndef __CESDEPS_H__
-#define __CESDEPS_H__
-
-/*
- * Some CES converters use another CES converters and the following
- * is such dependencies description.
- */
-#ifdef ICONV_TO_UCS_CES_EUC
-#  ifndef ICONV_TO_UCS_CES_TABLE
-#    define ICONV_TO_UCS_CES_TABLE
-#  endif
-#  ifndef ICONV_TO_UCS_CES_US_ASCII
-#    define ICONV_TO_UCS_CES_US_ASCII
-#  endif
-#endif
-#ifdef ICONV_FROM_UCS_CES_EUC
-#  ifndef ICONV_FROM_UCS_CES_TABLE
-#    define ICONV_FROM_UCS_CES_TABLE
-#  endif
-#  ifndef ICONV_FROM_UCS_CES_US_ASCII
-#    define ICONV_FROM_UCS_CES_US_ASCII
-#  endif
-#endif
-#ifdef ICONV_TO_UCS_CES_TABLE_PCS
-#  ifndef ICONV_TO_UCS_CES_TABLE
-#    define ICONV_TO_UCS_CES_TABLE
-#  endif
-#endif
-#ifdef ICONV_FROM_UCS_CES_TABLE_PCS
-#  ifndef ICONV_FROM_UCS_CES_TABLE
-#    define ICONV_FROM_UCS_CES_TABLE
-#  endif
-#endif
-
-#endif /* !__CESDEPS_H__ */
-
diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
deleted file mode 100644
index 7492697..0000000
--- a/newlib/libc/iconv/ces/euc.c
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "cesbi.h"
-
-#if defined (ICONV_TO_UCS_CES_EUC) \
- || defined (ICONV_FROM_UCS_CES_EUC)
-
-#include <_ansi.h>
-#include <reent.h>
-#include <newlib.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <sys/types.h>
-#include "../lib/local.h"
-#include "../lib/ucsconv.h"
-#include "../lib/encnames.h"
-#include "../ccs/ccsnames.h"
-
-#define TYPE_EUC_JP 0
-#define TYPE_EUC_KR 1
-#define TYPE_EUC_TW 2
-
-#define MAX_CS_NUM 3
-  
-/* CS  description structure */ 
-typedef struct
-{
-  char *csname;
-  char *prefix;
-  int bytes;
-  int prefixbytes;
-  int touchmsb; /* If 1, msb will be set by euc converter */
-} euc_cs_desc_t;
-
-typedef struct
-{ 
-  int type;
-  int mb_cur_max;
-  euc_cs_desc_t *desc;
-  
-  _VOID_PTR data[MAX_CS_NUM];
-} euc_data_t;
-
-#if defined (_ICONV_TO_ENCODING_EUC_JP) \
- || defined (_ICONV_FROM_ENCODING_EUC_JP) \
- || defined (_ICONV_ENABLE_EXTERNAL_CCS)
-static euc_cs_desc_t euc_jp_cs_desc[] =
-{
-  {ICONV_CCS_JIS_X0208_1990, "",     2, 0, 1},
-  {ICONV_CCS_JIS_X0201_1976, "\x8e", 1, 1, 0},
-  {ICONV_CCS_JIS_X0212_1990, "\x8f", 2, 1, 1},
-  {NULL, NULL, 0, 0}
-};
-#endif
-
-#if defined (_ICONV_TO_ENCODING_EUC_TW) \
- || defined (_ICONV_FROM_ENCODING_EUC_TW) \
- || defined (_ICONV_ENABLE_EXTERNAL_CCS)
-static euc_cs_desc_t euc_tw_cs_desc [] =
-{
-  {ICONV_CCS_CNS11643_PLANE1,  "",         2, 0, 1},
-  {ICONV_CCS_CNS11643_PLANE2,  "\x8e\xa2", 2, 2, 1},
-  {ICONV_CCS_CNS11643_PLANE14, "\x8e\xae", 2, 2, 1},
-  {NULL, NULL, 0, 0}
-};
-#endif
-
-#if defined (_ICONV_TO_ENCODING_EUC_KR) \
- || defined (_ICONV_FROM_ENCODING_EUC_KR) \
- || defined (_ICONV_ENABLE_EXTERNAL_CCS)
-static euc_cs_desc_t euc_kr_cs_desc [] =
-{
-  {ICONV_CCS_KSX1001,  "", 2, 0, 1},
-  {NULL, NULL, 0, 0}
-};
-#endif
-
-#if defined (ICONV_FROM_UCS_CES_EUC)
-static _VOID_PTR
-_DEFUN(euc_from_ucs_init, (rptr, encoding),
-                          struct _reent *rptr _AND
-                          _CONST char *encoding)
-{
-  int i;
-  euc_data_t *data;
-
-  if ((data = (euc_data_t *)_calloc_r (rptr, 1, sizeof (euc_data_t))) == NULL)
-    return 0;
-  
-#if defined (_ICONV_TO_ENCODING_EUC_JP) \
- || defined (_ICONV_ENABLE_EXTERNAL_CCS)
-  if (strcmp (encoding, ICONV_ENCODING_EUC_JP) == 0)
-    {
-      data->type = TYPE_EUC_JP;
-      data->mb_cur_max = 3;
-      data->desc = &euc_jp_cs_desc[0];
-      goto ok;
-    }
-#endif
-#if defined (_ICONV_TO_ENCODING_EUC_KR) \
- || defined (_ICONV_ENABLE_EXTERNAL_CCS)
-  if (strcmp (encoding, ICONV_ENCODING_EUC_KR) == 0)
-    {
-      data->type = TYPE_EUC_KR;
-      data->mb_cur_max = 2;
-      data->desc = &euc_kr_cs_desc[0];
-      goto ok;
-    }
-#endif
-#if defined (_ICONV_TO_ENCODING_EUC_TW) \
- || defined (_ICONV_ENABLE_EXTERNAL_CCS)
-  if (strcmp (encoding, ICONV_ENCODING_EUC_TW) == 0)
-    {
-      data->type = TYPE_EUC_TW;
-      data->mb_cur_max = 4;
-      data->desc = &euc_tw_cs_desc[0];
-      goto ok;
-    }
-#endif
- 
-  goto error1;
-
-ok:
-  for (i = 0; data->desc[i].csname != NULL; i++)
-    {
-      data->data[i] = _iconv_from_ucs_ces_handlers_table.init (
-                                                        rptr,
-                                                        data->desc[i].csname);
-      if (data->data == NULL)
-        goto error;
-    } 
-
-  return data;
-    
-error:
-  _iconv_from_ucs_ces_handlers_table.close (rptr, data);
-  return NULL;
-error1:
-  _free_r (rptr, (_VOID_PTR)data);
-  return NULL;
-}
-
-static size_t
-_DEFUN(euc_from_ucs_close, (rptr, data),
-                           struct _reent *rptr _AND
-                           _VOID_PTR data)
-{
-  int i;
-  size_t res = 0;
-  
-  for (i = 0; i < MAX_CS_NUM; i++)
-    {
-      if (((euc_data_t *)data)->data[i] != NULL)
-        res |= _iconv_from_ucs_ces_handlers_table.close (
-                                                rptr,
-                                                ((euc_data_t *)data)->data[i]);
-    }
-  _free_r(rptr, data);
-
-  return res;
-}
-
-static size_t
-_DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                             _VOID_PTR data         _AND
-                             register ucs4_t in     _AND
-                             unsigned char **outbuf _AND
-                             size_t *outbytesleft)
-{
-  int i;
-  int j;
-  int res;
-  unsigned char *outbuf1;
-  size_t outbytesleft1;
-  euc_data_t *d = (euc_data_t *)data;
-
-  if (in < 0x80) /* CS0 ASCII */
-    return _iconv_from_ucs_ces_handlers_us_ascii.convert_from_ucs (
-                                                 NULL,
-                                                 in,
-                                                 outbuf,
-                                                 outbytesleft);
-      
-  /* Try other CS */
-  for (i = 0; d->desc[i].csname != NULL; i++) 
-    {
-      
-      if (((int)*outbytesleft - d->desc[i].prefixbytes - d->desc[i].bytes) < 0)
-        {
-          char buf[ICONV_MB_LEN_MAX];
-          outbytesleft1 = ICONV_MB_LEN_MAX;
-          outbuf1 = &buf[0];
-          /* See wether this is right sequence */
-          res = 
-            (int)_iconv_from_ucs_ces_handlers_table.convert_from_ucs (
-                                                         d->data[i],
-                                                         in,
-                                                         &outbuf1,
-                                                         &outbytesleft1);
-          if (res > 0)
-            return (size_t)ICONV_CES_NOSPACE;
-
-          continue;
-        }
-      
-      outbuf1 = *outbuf + d->desc[i].prefixbytes;
-      outbytesleft1 = *outbytesleft - d->desc[i].prefixbytes;
-      
-      res = (int)_iconv_from_ucs_ces_handlers_table.convert_from_ucs (
-                                                     d->data[i],
-                                                     in,
-                                                     &outbuf1,
-                                                     &outbytesleft1);
-      if (res == d->desc[i].bytes)
-        {
-          for (j = 0; j < d->desc[i].prefixbytes; j++)
-            (*outbuf)[j] = d->desc[i].prefix[j];
-
-          if (d->desc[i].touchmsb)
-            for (j = 0; j < d->desc[i].bytes; j++)
-              {
-                if ((*outbuf)[j + d->desc[i].prefixbytes] & 0x80)
-                  return (size_t)ICONV_CES_INVALID_CHARACTER;
-                (*outbuf)[j + d->desc[i].prefixbytes] |= 0x80;
-              }
-
-          *outbuf = outbuf1;
-          *outbytesleft = outbytesleft1;
-          
-          return (size_t)(res + d->desc[i].bytes);
-        }
-    }
-
-  return (size_t)ICONV_CES_INVALID_CHARACTER;
-}
-#endif /* ICONV_FROM_UCS_CES_EUC */
-
-#if defined (ICONV_TO_UCS_CES_EUC)
-static _VOID_PTR
-_DEFUN(euc_to_ucs_init, (rptr, encoding),
-                        struct _reent *rptr _AND
-                        _CONST char *encoding)
-{
-  int i;
-  euc_data_t *data;
-
-  if ((data = (euc_data_t *)_calloc_r (rptr, 1, sizeof (euc_data_t))) == NULL)
-    return 0;
-  
-#if defined (_ICONV_TO_ENCODING_EUC_JP) \
- || defined (_ICONV_ENABLE_EXTERNAL_CCS)
-  if (strcmp (encoding, ICONV_ENCODING_EUC_JP) == 0)
-    {
-      data->type = TYPE_EUC_JP;
-      data->mb_cur_max = 3;
-      data->desc = &euc_jp_cs_desc[0];
-      goto ok;
-    }
-#endif
-#if defined (_ICONV_TO_ENCODING_EUC_KR) \
- || defined (_ICONV_ENABLE_EXTERNAL_CCS)
-  if (strcmp (encoding, ICONV_ENCODING_EUC_KR) == 0)
-    {
-      data->type = TYPE_EUC_KR;
-      data->mb_cur_max = 2;
-      data->desc = &euc_kr_cs_desc[0];
-      goto ok;
-    }
-#endif
-#if defined (_ICONV_TO_ENCODING_EUC_TW) \
- || defined (_ICONV_ENABLE_EXTERNAL_CCS)
-  if (strcmp (encoding, ICONV_ENCODING_EUC_TW) == 0)
-    {
-      data->type = TYPE_EUC_TW;
-      data->mb_cur_max = 4;
-      data->desc = &euc_tw_cs_desc[0];
-      goto ok;
-    }
-#endif
- 
-  goto error1;
-
-ok:
-  for (i = 0; data->desc[i].csname != NULL; i++)
-    {
-      data->data[i] = _iconv_to_ucs_ces_handlers_table.init (
-                                                        rptr,
-                                                        data->desc[i].csname);
-      if (data->data == NULL)
-        goto error;
-    } 
-
-  return data;
-    
-error:
-  _iconv_to_ucs_ces_handlers_table.close (rptr, data);
-  return NULL;
-error1:
-  _free_r (rptr, (_VOID_PTR)data);
-  return NULL;
-}
-
-static size_t
-_DEFUN(euc_to_ucs_close, (rptr, data),
-                         struct _reent *rptr _AND
-                         _VOID_PTR data)
-{
-  int i;
-  size_t res = 0;
-  
-  for (i = 0; i < MAX_CS_NUM; i++)
-    {
-      if (((euc_data_t *)data)->data[i] != NULL)
-        res |= _iconv_to_ucs_ces_handlers_table.close (
-                                                rptr,
-                                                ((euc_data_t *)data)->data[i]);
-    }
-  _free_r(rptr, data);
-
-  return res;
-}
-
-static ucs4_t
-_DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
-                           _VOID_PTR data               _AND
-                           _CONST unsigned char **inbuf _AND
-                           size_t *inbytesleft)
-{
-  int i;
-  int j;
-  ucs4_t res;
-  unsigned char buf[ICONV_MB_LEN_MAX];
-  size_t inbytesleft1;
-  euc_data_t *d = (euc_data_t *)data;
-  unsigned char *inbuf1 = &buf[0];
-  
-  if (**inbuf < 0x80) /* CS0 is always ASCII */
-    return _iconv_to_ucs_ces_handlers_us_ascii.convert_to_ucs (
-                                                         NULL,
-                                                         inbuf,
-                                                         inbytesleft);
- 
-  for (i = 1; d->desc[i].csname != NULL; i++)
-    {
-      if (memcmp((_CONST _VOID_PTR)(*inbuf),
-                 (_CONST _VOID_PTR)d->desc[i].prefix,
-                 d->desc[i].prefixbytes) == 0)
-        {
-          if (((int)*inbytesleft - d->desc[i].prefixbytes - d->desc[i].bytes) < 0)
-            return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-
-          if (d->desc[i].touchmsb)
-            for (j = 0; j < d->desc[i].bytes; j++)
-              {
-                if (!((*inbuf)[j + d->desc[i].prefixbytes] & 0x80))
-                  return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-                inbuf1[j] = (*inbuf)[j + d->desc[i].prefixbytes] & 0x7F;
-              }
-          else
-            for (j = 0; j < d->desc[i].bytes; j++)
-              inbuf1[j] = (*inbuf)[j + d->desc[i].prefixbytes];
-          
-          inbytesleft1 = d->desc[i].bytes;
-          
-          res = _iconv_to_ucs_ces_handlers_table.convert_to_ucs (
-                                             d->data[i],
-                                             (_CONST unsigned char **)&inbuf1,
-                                             &inbytesleft1);
-          if (((__int32_t)res) > 0)
-            {
-              *inbuf += d->desc[i].bytes +  d->desc[i].prefixbytes;
-              *inbytesleft -= d->desc[i].bytes + d->desc[i].prefixbytes;
-            }
-
-          return res;
-        }
-    }
-
-  /* Process CS1 */
-  if (((int)(*inbytesleft - d->desc[0].prefixbytes - d->desc[0].bytes)) < 0)
-    return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-  
-  if (d->desc[0].touchmsb)
-    for (j = 0; j < d->desc[0].bytes; j++)
-      {
-        if (!((*inbuf)[j + d->desc[0].prefixbytes] & 0x80))
-          return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-        inbuf1[j] = (*inbuf)[j] & 0x7F;
-      }
-  else
-    for (j = 0; j < d->desc[0].bytes; j++)
-      inbuf1[j] = (*inbuf)[j];
-
-  inbytesleft1 = d->desc[0].bytes;
-  
-  res = _iconv_to_ucs_ces_handlers_table.convert_to_ucs (
-                                        d->data[0],
-                                        (_CONST unsigned char **)&inbuf1,
-                                        &inbytesleft1);
-  if (((__int32_t)res) > 0)
-    {
-      *inbuf += d->desc[0].bytes;
-      *inbytesleft -= d->desc[0].bytes;
-    }
-
-  return res;
-}
-#endif /* ICONV_TO_UCS_CES_EUC */
-
-static int
-_DEFUN(euc_get_mb_cur_max, (data),
-                           _VOID_PTR data)
-{
-  return ((euc_data_t *)data)->mb_cur_max;
-}
-
-#if defined (ICONV_FROM_UCS_CES_EUC)
-_CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_euc =
-{
-  euc_from_ucs_init,
-  euc_from_ucs_close,
-  euc_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  euc_convert_from_ucs
-};
-#endif
-
-#if defined (ICONV_TO_UCS_CES_EUC)
-_CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_euc = 
-{
-  euc_to_ucs_init,
-  euc_to_ucs_close,
-  euc_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  euc_convert_to_ucs
-};
-#endif
-
-#endif /* ICONV_TO_UCS_CES_EUC || ICONV_FROM_UCS_CES_EUC */
-
-
diff --git a/newlib/libc/iconv/ces/mkdeps.pl b/newlib/libc/iconv/ces/mkdeps.pl
deleted file mode 100755
index 92dd20d..0000000
--- a/newlib/libc/iconv/ces/mkdeps.pl
+++ /dev/null
@@ -1,930 +0,0 @@
-#!/usr/bin/perl -w
-#
-#  Copyright (c) 2003-2004, Artem B. Bityuckiy, SoftMine Corporation.
-#
-#  Redistribution and use in source and binary forms, with or without
-#  modification, are permitted provided that the following conditions
-#  are met:
-#  1. Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-#  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-#  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-#  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-#  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-#  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-#  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-#  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-#  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#  SUCH DAMAGE.
-#
-use integer;
-use Getopt::Std;
-use strict;
-
-sub err($);
-sub process_section_encodings($);
-sub process_section_cesdeps($);
-sub next_entry($$$);
-
-sub generate_cesbi_h($$);
-sub generate_encnames_h(@);
-sub generate_aliasesbi_c($);
-sub generate_encoding_aliases_c($);
-sub generate_cesdeps_h($);
-sub generate_ccsbi_h($);
-sub generate_cesbi_c($);
-sub generate_ccsnames_h($);
-
-# ==============================================================================
-#
-# GLOBAL VARIABLES
-#
-# ==============================================================================
-
-my $comment_automatic =
-"/*
- * This file was automatically generated mkdeps.pl script. Don't edit.
- */";
-
-my $macro_from_enc     = '_ICONV_FROM_ENCODING_';
-my $macro_to_enc       = '_ICONV_TO_ENCODING_';
-my $macro_from_ucs_ces = 'ICONV_FROM_UCS_CES_';
-my $macro_to_ucs_ces   = 'ICONV_TO_UCS_CES_';
-my $macro_from_ucs_ccs = 'ICONV_FROM_UCS_CCS_';
-my $macro_to_ucs_ccs   = 'ICONV_TO_UCS_CCS_';
-my $macro_enc_name     = 'ICONV_ENCODING_';
-my $macro_ccs_name     = 'ICONV_CCS_';
-
-my $var_from_ucs_handlers = '_iconv_from_ucs_ces_handlers_';
-my $var_to_ucs_handlers   = '_iconv_to_ucs_ces_handlers_';
-my $var_ccs       = '_iconv_ccs_';
-my $var_aliases   = '_iconv_aliases';
-my $var_ces_names = 'iconv_ces_names_';
-
-# ==============================================================================
-#
-# PARSE COMMAND-LINE OPTIONS.
-#
-# ==============================================================================
-
-my %options;
-
-# SUPPORTED OPTIONS.
-my $help_opt    = 'h';
-my $infile_opt  = 'i';
-my $verbose_opt = 'v';
-
-# Default input configuration file name
-my $default_infile = '../lib/encoding.deps';
-# Real input configuration file name
-my $infile;
-# Verbose flag (be verbose if not zero)
-my $verbose;
-
-{
-getopts ("${help_opt}${verbose_opt}${infile_opt}:", \%options)
-or err "getopts() failed: $!.";
-
-if ($options{$help_opt})
-{
-  # Output help message and exit.
-  print "Usage: $0 [-$infile_opt depfile] [-$help_opt]\n";
-  print "\t-$infile_opt - input file with configuration ($default_infile ";
-  print "file will be used by default)\n";
-  print "\t-$help_opt - this help message\n";
-  exit 0;
-}
-
-# Input file name.
-$infile = $options{$infile_opt} ? $options{$infile_opt} : $default_infile;
-$verbose = $options{$verbose_opt} ? 1 : 0;
-
-print "Debug: -$verbose_opt option found.\n" if $verbose;
-
-# ==============================================================================
-#
-# Find and fetch sections from input file
-#
-# ==============================================================================
-
-# Opening input file
-print "Debug: open \"$infile\" input file.\n" if $verbose;
-open (INFILE, '<', $infile) or err "Can't open \"$infile\" file for reading.\n"
-                                 . "System error message: $!.\n";
-
-# Configuration file markers
-my $marker_section = 'SECTION';
-my $marker_section_end = 'SECTION END';
-
-# File sections. Hash values are references to arrays with section contents
-my %sections;
-
-# Extract sections from file
-for (my $ln = 1; my $l = <INFILE>; $ln += 1)
-{
-  # Skip comments and empty lines
-  next if $l =~ m/^#.*$/ or $l =~ m/^\s*$/;
-
-  # Remove last CR symbol
-  $l =~ s/^(.*)\n$/$1/, $l =~ s/^(.*)\r$/$1/;
-
-  # Generate error if line isn't section begin marker
-  err "(input file line $ln) Unexpected marker: \"$l\". ${marker_section} "
-    . "is expected."
-  if $l !~ m/^$marker_section(\s+(\S*)\s*)?$/;
-  
-  # Generate error if there is no section name
-  err "(input file line $ln) Section name isn't found"
-  if !$1 or !$2;
-  
-  # Generate error if this is section end marker
-  err "(input file line $ln) Unexpected \"${marker_section_end}\" marker "
-    . "in input file."
-  if $2 eq $marker_section_end;
-
-  my $sect_name = $2;
-
-  # Extract section content
-  for (; $l = <INFILE>; $ln += 1)
-  {
-    # Skip comments and empty lines
-    next if $l =~ m/^#.*$/ or $l =~ m/^$/;
-    # Remove last CR symbol
-    $l =~ s/^(.*)\n$/$1/, $l =~ s/^(.*)\r$/$1/;
-    
-    last if $l =~ m/^$marker_section_end$/;
-
-    push @{$sections{$sect_name}}, $l;
-  }
-
-  # Generate error if section wasn't ended
-  err "(input file line $ln) \"No $marker_section_end\" marker found"
-  if $l !~ m/^$marker_section_end$/;
-}
-
-close INFILE or err "Error while closing input file.";
-
-# =============================================================================
-#
-# Now sections are fetched. Each section is processed by separate function.
-# There are only three supported sections now: ENCODINGS, CES_DEPENDENCIES
-# and ENCODING_CCS_DEPENDENCIES.
-#
-# =============================================================================
-
-my $section_encodings = 'ENCODINGS';
-my $section_cesdeps   = 'CES_DEPENDENCIES';
-
-my $section;
-
-err "$section_encodings not found."
-if !defined $sections{$section_encodings};
-err "$section_cesdeps not found."
-if !defined $sections{$section_cesdeps};
-
-# Process sections
-print "Debug: process $section_encodings section.\n" if $verbose;
-process_section_encodings ($sections{$section_encodings});
-delete $sections{$section_encodings};
-
-print "Debug: process $section_cesdeps section.\n" if $verbose;
-process_section_cesdeps ($sections{$section_cesdeps});
-delete $sections{$section_cesdeps};
-
-print STDERR "Warning: section \"$_\" was ignored!\n"
-foreach (keys %sections);
-
-exit 1;
-}
-
-# =============================================================================
-#
-# Print error message and exit.
-#
-# Parameter 1: error message.
-#
-# =============================================================================
-sub err($)
-{
-  print STDERR "Error while running script.\n$_[0]\n";
-  exit 0;
-}
-
-
-# =============================================================================
-#
-# Process ENCODINGS section.
-#
-# Parameter 1 (input):  array reference with section content;
-#
-# =============================================================================
-sub process_section_encodings($)
-{
-  my $sect = $_[0];
-  my $lineidx = 0;
-  my @entry;
-  my $marker_encoding = 'ENCODING';
-  my $marker_ces      = 'CES';
-  my $marker_ccs      = 'CCS';
-  my $marker_aliases  = 'ALIASES';
-
-  # Keys: CES names. Values: array reference with encodings list.
-  my %cesenc;
-  # Keys: encodings. Values: CES converter names.
-  my %encces;
-  # Keys: CCS tables names. Values: array reference with encodings.
-  my %ccsenc;
-  # Keys: encodings. Values: aliases list.
-  my %encalias;
-
-  while (next_entry ($sect, \@entry, \$lineidx))
-  {
-    my $encoding;
-    my $ces;
-    my $ccs;
-    my $aliases;
-    
-    foreach my $l (@entry)
-    {
-      if ($l =~ m/^($marker_encoding):\s*(\S*)\s*$/)
-      {
-        err "(process_section_encodings()) More than one $marker_encoding "
-          . "records found ($l)"
-        if defined $encoding;
-        
-        $encoding = $2; 
-      }
-      elsif ($l =~ m/^($marker_ces):\s*(\S*)\s*$/)
-      {
-        err "(process_section_encodings()) More than one $marker_ces "
-          . "records found ($l)"
-        if defined $ces;
-
-        $ces = $2;
-      }
-      elsif ($l =~ m/^($marker_aliases):\s*(.*)\s*$/)
-      {
-        err "(process_section_encodings()) More than one "
-          . "$marker_aliases records found ($l)"
-        if defined $aliases;
-
-        $aliases = $2;
-      }
-      elsif ($l =~ m/^($marker_ccs):\s*(.*)\s*$/)
-      {
-        err "(process_section_encodings()) More than one "
-          . "$marker_ccs records found ($l)"
-        if defined $ccs;
-
-        $ccs = $2;
-      }
-      else
-      {
-        err "(process_section_encodings()) Can't parse \"$l\"";
-      }
-    }
-  
-    err "(process_section_encodings()) $encoding is defined twice"
-    if (defined $encces{$encoding});
-    err "(process_section_encodings()) ENCODING: field isn't found"
-    if not defined $encoding;
-
-    if (defined $ces)
-    {
-      push @{$cesenc{$ces}}, $encoding;
-      $encces{$encoding} = $ces;
-    }
-    
-    if (defined $ccs)
-    {
-      my @ccs = split / /, $ccs;
-      push @{$ccsenc{$_}}, $encoding foreach (@ccs);
-    }
-    $encalias{$encoding} = $aliases;
-  }
-
-  # Generate cesbi.h header file
-  generate_cesbi_h (\%cesenc, \%encces);
-
-  # Generate encnames.h header file
-  generate_encnames_h (keys %encces);
-
-  # Generate aliasesbi.c file
-  generate_aliasesbi_c (\%encalias);
-  
-  # Generate encoding.aliases file
-  generate_encoding_aliases (\%encalias);
-
-  # Generate ccsbi.h header file
-  generate_ccsbi_h (\%ccsenc);
-
-  # Generate cesbi.c file
-  generate_cesbi_c (\%cesenc);
-
-  # Generate ccsbi.c file
-  my @ccs = keys %ccsenc;
-  generate_ccsbi_c (\@ccs);
-  
-  # Generate ccsnames.h header file
-  generate_ccsnames_h (\%ccsenc);
-
-}
-
-# ==============================================================================
-#
-# Process CES_DEPENDENCIES section.
-#
-# Parameter 1: array reference with section content.
-#
-# ==============================================================================
-sub process_section_cesdeps($)
-{
-  my $sect = $_[0];
-  my $lineidx = 0;
-  my @entry;
-  my $marker_ces      = 'CES';
-  my $marker_used_ces = 'USED_CES';
-  my %cesdeps;
-
-  while (next_entry ($sect, \@entry, \$lineidx))
-  {
-    my $ces;
-    my $used_ces;
-
-    foreach my $l (@entry)
-    {
-      if ($l =~ m/^($marker_ces):\s*(\S*)\s*$/)
-      {
-        err "(process_section_cesdeps()) More than one $marker_ces "
-          . "records found ($l)"
-        if $ces;
-        
-        $ces = $2; 
-      }
-      elsif ($l =~ m/^($marker_used_ces):\s*(.*)\s*$/)
-      {
-        err "(process_section_cesdeps()) More than one $marker_used_ces "
-          . "records found ($l)"
-        if $used_ces;
-
-        $used_ces = $2;
-      }
-      else
-      {
-        err "(process_section_cesdeps()) Can't parse \"$l\"";
-      }
-    }
-  
-    err "(process_section_esdeps()) $ces dependecties are defined twice"
-    if (defined $cesdeps{$ces});
-
-    # Split string
-    my @used_ces = split / /, $used_ces;
-
-    $cesdeps{$ces} = \@used_ces;
-  }
-
-  # Generate cesdeps.h header file
-  generate_cesdeps_h (\%cesdeps);
-}
-
-# ==============================================================================
-#
-# Extract next entry.
-#
-# Parameter 1 (input): array reference with entries;
-# Parameter 2 (output): array reference with entry content;
-# Parameter 3 (input/output): scalar reference with line index to process.
-#
-# Returns 1 is entry was found, 0 if thee is no more entries;
-#
-# ==============================================================================
-sub next_entry($$$)
-{
-  my $entries = $_[0];
-  my $entry   = $_[1];
-  my $idx     = $_[2];
-  my $marker_entry = 'ENTRY';
-  my $marker_entry_end = 'ENTRY END';
-  my $entry_flag = 0;
-
-  return 0 if not defined ${$entries}[${$idx}];
-
-  undef @{$entry};
-
-  for (; my $l = ${$entries}[${$idx}++];)
-  {
-    # Skip comments and empty lines
-    next if $l =~ m/^#.*$/ or $l =~ m/^\s*$/;
-    
-    if ($l =~ m/^$marker_entry$/)
-    {
-      err "(next_entry()) $marker_entry marker appears twice"
-      if ($entry_flag == 1);
-      $entry_flag = 1;
-      $l = ${$entries}[${$idx}++]
-    }
-    else
-    {
-      # Generate error if line isn't entry begin marker
-      err "(next_entry()) Unexpected marker: \"$l\". ${marker_entry} "
-        . "is expected."
-      if ($entry_flag == 0)
-    }
-        
-    last if $l =~ m/^$marker_entry_end$/;
-
-    push @{$entry}, $l;
-  }
-
-  return 1;
-}
-
-# ==============================================================================
-#
-# Generate cesbi.h file.
-#
-# Parameter 1 (input): hash reference with keys = CES Converters names and
-# values = array references with list of supported encodings.
-# Parameter 2 (input): hash reference with keys = encodings names and
-# values = CES converter names.
-#
-# ==============================================================================
-sub generate_cesbi_h($$)
-{
-  my %cesenc = %{$_[0]};
-  my %encces = %{$_[1]};
-  my @ces = sort keys %cesenc;
-  
-  print "Debug: create \"cesbi.h\" file.\n" if $verbose;
-  open (CESBI_H, '>', "cesbi.h")
-  or err "Can't create \"cesbi.h\" file for writing.\nSystem error message: $!.\n";
-
-  print CESBI_H "$comment_automatic\n\n";
-  print CESBI_H "#ifndef __CESBI_H__\n";
-  print CESBI_H "#define __CESBI_H__\n\n";
-  print CESBI_H "#include <newlib.h>\n";
-  print CESBI_H "#include <_ansi.h>\n";
-  print CESBI_H "#include \"../lib/encnames.h\"\n";
-  print CESBI_H "#include \"../lib/ucsconv.h\"\n\n";
-  print CESBI_H "/*\n";
-  print CESBI_H " * Enable CES converter if correspondent encoding is requested.\n";
-  print CESBI_H " * Defining ${macro_to_ucs_ces}XXX macro or ${macro_from_ucs_ces}XXX\n";
-  print CESBI_H " * macro is needed to enable \"XXX encoding -> UCS\" or \"UCS -> XXX encoding\"\n";
-  print CESBI_H " * part of UCS-based CES converter.\n";
-  print CESBI_H " */\n";
-    
-  foreach my $ces (@ces)
-  {
-    my @encs = sort @{$cesenc{$ces}};
-    foreach my $encoding (@encs)
-    {
-      print CESBI_H $encoding eq $encs[0] ? "#if " : " || ";
-      print CESBI_H "defined ($macro_from_enc\U$encoding)";
-      print CESBI_H " \\" if $encoding ne $encs[$#encs];
-      print CESBI_H "\n";
-    }
-    print CESBI_H "#  define $macro_to_ucs_ces\U$ces\n";
-    print CESBI_H "#endif\n";
-    
-    foreach my $encoding (@encs)
-    {
-      print CESBI_H $encoding eq $encs[0] ? "#if " : " || ";
-      print CESBI_H "defined ($macro_to_enc\U$encoding)";
-      print CESBI_H " \\" if $encoding ne $encs[$#encs];
-      print CESBI_H "\n";
-    }
-    print CESBI_H "#  define $macro_from_ucs_ces\U$ces\n";
-    print CESBI_H "#endif\n\n";
-  }
-  
-  print CESBI_H "/*\n";
-  print CESBI_H " * Some encodings require another encodings to be enabled.\n";
-  print CESBI_H " * These dependencies are handled in cesdeps.h header file.\n";
-  print CESBI_H " */\n";
-  print CESBI_H "#include \"cesdeps.h\"\n\n";
-
-  print CESBI_H "/*\n";
-  print CESBI_H " * NLS uses iconv's capabilities and require one of encodings\n";
-  print CESBI_H " * to be enabled for internal wchar_t representation.\n";
-  print CESBI_H " */\n";
-  print CESBI_H "#include \"../lib/iconvnls.h\"\n\n";
-
-  print CESBI_H "/*\n";
-  print CESBI_H " * Forward declarations of CES converter handlers.\n";
-  print CESBI_H " * These handlers are actually defined in correspondent CES converter files.\n";
-  print CESBI_H " */\n";
-
-  foreach my $ces (@ces)
-  {
-    print CESBI_H "#ifdef $macro_to_ucs_ces\U$ces\n";
-    print CESBI_H "extern _CONST iconv_to_ucs_ces_handlers_t\n";
-    print CESBI_H "$var_to_ucs_handlers$ces;\n";
-    print CESBI_H "#endif\n";
-
-    print CESBI_H "#ifdef $macro_from_ucs_ces\U$ces\n";
-    print CESBI_H "extern _CONST iconv_from_ucs_ces_handlers_t\n";
-    print CESBI_H "$var_from_ucs_handlers$ces;\n";
-    print CESBI_H "#endif\n\n";
-  }
-
-  print CESBI_H "#endif /* !__CESBI_H__ */\n\n";
-  close CESBI_H or err "Error while closing cesbi.h file.";
-}
-
-# ==============================================================================
-#
-# Generate encnames.h header file.
-#
-# Parameters: array of supported encodings.
-#
-# ==============================================================================
-sub generate_encnames_h(@)
-{
-  print "Debug: create \"../lib/encnames.h\" file.\n" if $verbose;
-  open (ENCNAMES_H, '>', "../lib/encnames.h")
-  or err "Can't create \"../lib/encnames.h\" file for writing.\nSystem error message: $!.\n";
-
-  print ENCNAMES_H "$comment_automatic\n\n";
-  print ENCNAMES_H "#ifndef __ENCNAMES_H__\n";
-  print ENCNAMES_H "#define __ENCNAMES_H__\n\n";
-
-  print ENCNAMES_H "/*\n";
-  print ENCNAMES_H " * Encodings name macros.\n";
-  print ENCNAMES_H " */\n";
-  
-  foreach my $enc (sort @_)
-  {
-    print ENCNAMES_H "#define $macro_enc_name\U$enc\E \"$enc\"\n";
-  }
-
-  print ENCNAMES_H "\n#endif /* !__ENCNAMES_H__ */\n\n";
-  close ENCNAMES_H or err "Error while closing ../lib/encnames.h file.";
-}
-
-# ==============================================================================
-#
-# Generate aliasesbi.c C source file.
-#
-# Parameters: hash reference with keys = encodings and values = aliases string.
-#
-# ==============================================================================
-sub generate_aliasesbi_c($)
-{
-  print "Debug: create \"../lib/aliasesbi.c\" file.\n" if $verbose;
-  open (ALIASESBI_C, '>', "../lib/aliasesbi.c")
-  or err "Can't create \"../lib/aliasesbi.c\" file for writing.\nSystem error message: $!.\n";
-
-  print ALIASESBI_C "$comment_automatic\n\n";
-  print ALIASESBI_C "#include <_ansi.h>\n";
-  print ALIASESBI_C "#include \"encnames.h\"\n\n";
-  print ALIASESBI_C "_CONST char *\n";
-  print ALIASESBI_C "$var_aliases =\n";
-  print ALIASESBI_C "{\n";
-
-  foreach my $enc (sort keys %{$_[0]})
-  {
-    print ALIASESBI_C "#if defined ($macro_from_enc\U$enc) \\\n";
-    print ALIASESBI_C " || defined ($macro_to_enc\U$enc)\n";
-    print ALIASESBI_C "  $macro_enc_name\U$enc\E";
-    print ALIASESBI_C " \" ${$_[0]}{$enc}\\n\"" if defined ${$_[0]}{$enc};
-    print ALIASESBI_C "\n";
-    print ALIASESBI_C "#endif\n";
-  }
-  print ALIASESBI_C "  \"\"\n";
-  print ALIASESBI_C "};\n\n";
-  
-  close ALIASESBI_C or err "Error while closing ../lib/aliasesbi.c file.";
-}
-
-# ==============================================================================
-#
-# Generate encoding.aliases file.
-#
-# Parameter 1: hash reference with keys = encodings and values = aliases string.
-#
-# ==============================================================================
-sub generate_encoding_aliases($)
-{
-  print "Debug: create \"../encoding.aliases\" file.\n" if $verbose;
-  open (ALIASES, '>', "../encoding.aliases")
-  or err "Can't create \"../encoding.aliases\" file for writing.\nSystem error message: $!.\n";
-
-  print ALIASES "#\n# This file was automatically generated. Don't edit.\n#\n\n";
-
-  foreach my $enc (sort keys %{$_[0]})
-  {
-    print ALIASES "$enc";
-    print ALIASES " ${$_[0]}{$enc}" if defined ${$_[0]}{$enc};
-    print ALIASES "\n";
-  }
-  
-  print ALIASES "\n";
-  
-  close ALIASES or err "Error while closing ./encoding.aliases file.";
-}
-
-# ==============================================================================
-#
-# Generate cesdeps.h header file.
-#
-# Parameter 1: hash reference with keys = CES converters and values = references
-# to arrays with list of CES converters which are needed by that CES converter
-# (defined by key).
-#
-# ==============================================================================
-sub generate_cesdeps_h($)
-{
-  my %cesdeps = %{$_[0]};
-  
-  print "Debug: create \"cesdeps.h\" file.\n" if $verbose;
-  open (CESDEPS_H, '>', "cesdeps.h")
-  or err "Can't create \"cesdeps.h\" file for writing.\nSystem error message: $!.\n";
-
-  print CESDEPS_H "$comment_automatic\n\n";
-  print CESDEPS_H "#ifndef __CESDEPS_H__\n";
-  print CESDEPS_H "#define __CESDEPS_H__\n\n";
-
-  print CESDEPS_H "/*\n";
-  print CESDEPS_H " * Some CES converters use another CES converters and the following\n";
-  print CESDEPS_H " * is such dependencies description.\n";
-  print CESDEPS_H " */\n";
-  
-  foreach my $ces (sort keys %cesdeps)
-  {
-    my @deps = sort @{$cesdeps{$ces}};
-
-    print CESDEPS_H "#ifdef $macro_to_ucs_ces\U$ces\n";
-    
-    foreach my $dep (@deps)
-    {
-      print CESDEPS_H "#  ifndef $macro_to_ucs_ces\U$dep\n";
-      print CESDEPS_H "#    define $macro_to_ucs_ces\U$dep\n";
-      print CESDEPS_H "#  endif\n";
-    }
-    print CESDEPS_H "#endif\n";
-    
-    print CESDEPS_H "#ifdef $macro_from_ucs_ces\U$ces\n";
-    foreach my $dep (@deps)
-    {
-      print CESDEPS_H "#  ifndef $macro_from_ucs_ces\U$dep\n";
-      print CESDEPS_H "#    define $macro_from_ucs_ces\U$dep\n";
-      print CESDEPS_H "#  endif\n";
-    }
-    print CESDEPS_H "#endif\n";
-  }
-
-  print CESDEPS_H "\n#endif /* !__CESDEPS_H__ */\n\n";
-  close CESDEPS_H or err "Error while closing cesdeps.h file.";
-}
-
-# ==============================================================================
-#
-# Generate ccsbi.h file.
-#
-# Parameter 1 (input): hash reference with keys = CCS tables names and
-# values = array references with list of encodings which need this CCS table.
-#
-# ==============================================================================
-sub generate_ccsbi_h($)
-{
-  my %ccsenc = %{$_[0]};
-  my @ccs = sort keys %ccsenc;
-  
-  print "Debug: create \"../ccs/ccsbi.h\" file.\n" if $verbose;
-  open (CCSBI_H, '>', "../ccs/ccsbi.h")
-  or err "Can't create \"../ccs/ccsbi.h\" file for writing.\nSystem error message: $!.\n";
-
-  print CCSBI_H "$comment_automatic\n\n";
-  print CCSBI_H "#ifndef __CCSBI_H__\n";
-  print CCSBI_H "#define __CCSBI_H__\n\n";
-  print CCSBI_H "#include <newlib.h>\n";
-  print CCSBI_H "#include <_ansi.h>\n";
-  print CCSBI_H "#include \"ccs.h\"\n\n";
-  print CCSBI_H "/*\n";
-  print CCSBI_H " * Enable CCS tables if encoding needs them.\n";
-  print CCSBI_H " * Defining ${macro_to_ucs_ccs}XXX macro or ${macro_from_ucs_ccs}XXX\n";
-  print CCSBI_H " * macro is needed to enable \"XXX encoding -> UCS\" or \"UCS -> XXX encoding\"\n";
-  print CCSBI_H " * part of CCS table.\n";
-  print CCSBI_H " * CCS tables aren't linked if Newlib was configuted to use external CCS tables.\n";
-  print CCSBI_H " */\n";
-  
-  print CCSBI_H "#ifndef _ICONV_ENABLE_EXTERNAL_CCS\n\n";
-
-  foreach my $ccs (@ccs)
-  {
-    my @encs = sort @{$ccsenc{$ccs}};
-    foreach my $encoding (@encs)
-    {
-      print CCSBI_H $encoding eq $encs[0] ? "#if " : " || ";
-      print CCSBI_H "defined ($macro_from_enc\U$encoding)";
-      print CCSBI_H " \\" if $encoding ne $encs[$#encs];
-      print CCSBI_H "\n";
-    }
-    print CCSBI_H "#  define $macro_to_ucs_ccs\U$ccs\n";
-    print CCSBI_H "#endif\n";
-    
-    foreach my $encoding (@encs)
-    {
-      print CCSBI_H $encoding eq $encs[0] ? "#if " : " || ";
-      print CCSBI_H "defined ($macro_to_enc\U$encoding)";
-      print CCSBI_H " \\" if $encoding ne $encs[$#encs];
-      print CCSBI_H "\n";
-    }
-    print CCSBI_H "#  define $macro_from_ucs_ccs\U$ccs\n";
-    print CCSBI_H "#endif\n\n";
-  }
-
-  print CCSBI_H "/*\n";
-  print CCSBI_H " * CCS table description structures forward declarations.\n";
-  print CCSBI_H " */\n";
-
-  foreach my $ccs (@ccs)
-  {
-    print CCSBI_H "#if defined ($macro_to_ucs_ccs\U$ccs) \\\n";
-    print CCSBI_H " || defined ($macro_from_ucs_ccs\U$ccs)\n";
-    print CCSBI_H "extern _CONST iconv_ccs_t\n";
-    print CCSBI_H "$var_ccs$ccs;\n";
-    print CCSBI_H "#endif\n";
-  }
-
-  print CCSBI_H "\n#endif /* !_ICONV_ENABLE_EXTERNAL_CCS */\n\n";
-  print CCSBI_H "\n#endif /* __CCSBI_H__ */\n\n";
-  close CCSBI_H or err "Error while closing ../ccs/ccsbi.h file.";
-}
-
-# ==============================================================================
-#
-# Generate cesbi.c file.
-#
-# Parameter 1 (input): hash reference with keys = CES Converters names and
-# values = array references with list of supported encodings.
-#
-# ==============================================================================
-sub generate_cesbi_c($)
-{
-  my %cesenc = %{$_[0]};
-  my @ces = sort keys %cesenc;
-
-  print "Debug: create \"cesbi.c\" file.\n" if $verbose;
-  open (CESBI_C, '>', "cesbi.c")
-  or err "Can't create \"cesbi.c\" file for writing.\nSystem error message: $!.\n";
-
-  print CESBI_C "$comment_automatic\n\n";
-  print CESBI_C "#include <_ansi.h>\n";
-  print CESBI_C "#include <newlib.h>\n";
-  print CESBI_C "#include \"../lib/ucsconv.h\"\n";
-  print CESBI_C "#include \"cesbi.h\"\n\n";
-  print CESBI_C "/*\n";
-  print CESBI_C " * Each CES converter provides the list of supported encodings.\n";
-  print CESBI_C " */\n";
-
-  foreach my $ces (@ces)
-  {
-    print CESBI_C "#if defined ($macro_to_ucs_ces\U$ces) \\\n";
-    print CESBI_C " || defined ($macro_from_ucs_ces\U$ces)\n";
-    print CESBI_C "static _CONST char *\n";
-    print CESBI_C "$var_ces_names${ces}\[] =\n";
-    print CESBI_C "{\n";
-    my @encodings = sort @{$cesenc{$ces}};
-    foreach my $encoding (@encodings)
-    {
-      print CESBI_C "# if defined ($macro_from_enc\U$encoding) \\\n";
-      print CESBI_C "  || defined ($macro_to_enc\U$encoding)\n";
-      print CESBI_C "  $macro_enc_name\U$encoding,\n";
-      print CESBI_C "#endif\n";
-    }
-    print CESBI_C "  NULL\n";
-    print CESBI_C "};\n";
-    print CESBI_C "#endif\n\n";
-  }
-
-  print CESBI_C "/*\n";
-  print CESBI_C " * The following structure contains the list of \"to UCS\" linked-in CES converters.\n";
-  print CESBI_C " */\n";
-  print CESBI_C "_CONST iconv_to_ucs_ces_t\n";
-  print CESBI_C "_iconv_to_ucs_ces[] =\n";
-  print CESBI_C "{\n";
-  
-  foreach my $ces (@ces)
-  {
-    print CESBI_C "#ifdef $macro_to_ucs_ces\U$ces\n";
-    print CESBI_C "  {(_CONST char **)$var_ces_names$ces,\n";
-    print CESBI_C "   &$var_to_ucs_handlers$ces},\n";
-    print CESBI_C "#endif\n";
-  }
-  print CESBI_C "  {(_CONST char **)NULL,\n";
-  print CESBI_C "  (iconv_to_ucs_ces_handlers_t *)NULL}\n";
-  print CESBI_C "};\n\n";
-
-  print CESBI_C "/*\n";
-  print CESBI_C " * The following structure contains the list of \"from UCS\" linked-in CES converters.\n";
-  print CESBI_C " */\n";
-  print CESBI_C "_CONST iconv_from_ucs_ces_t\n";
-  print CESBI_C "_iconv_from_ucs_ces[] =\n";
-  print CESBI_C "{\n";
-  
-  foreach my $ces (@ces)
-  {
-    print CESBI_C "#ifdef $macro_from_ucs_ces\U$ces\n";
-    print CESBI_C "  {(_CONST char **)$var_ces_names$ces,\n";
-    print CESBI_C "   &$var_from_ucs_handlers$ces},\n";
-    print CESBI_C "#endif\n";
-  }
-  print CESBI_C "  {(_CONST char **)NULL,\n";
-  print CESBI_C "  (iconv_from_ucs_ces_handlers_t *)NULL}\n";
-  print CESBI_C "};\n";
-
-  close CESBI_C or err "Error while closing cesbi.c file.";
-}
-
-# ==============================================================================
-#
-# Generate ccsbi.c file.
-#
-# Parameter 1 (input): array reference with CCS tables names
-#
-# ==============================================================================
-sub generate_ccsbi_c($)
-{
-  my @ccs = @{$_[0]};
-  
-  print "Debug: create \"../ccs/ccsbi.c\" file.\n" if $verbose;
-  open (CESBI_C, '>', "../ccs/ccsbi.c")
-  or err "Can't create \"../ccs/ccsbi.c\" file for writing.\nSystem error message: $!.\n";
-
-  print CESBI_C "$comment_automatic\n\n";
-  print CESBI_C "#include <_ansi.h>\n";
-  print CESBI_C "#include \"ccsbi.h\"\n\n";
-  print CESBI_C "/*\n";
-  print CESBI_C " * The following array contains the list of built-in CCS tables.\n";
-  print CESBI_C " */\n";
-
-  print CESBI_C "_CONST iconv_ccs_t *\n";
-  print CESBI_C "_iconv_ccs[] =\n";
-  print CESBI_C "{\n";
-
-  foreach my $ccs (@ccs)
-  {
-    print CESBI_C "#if defined ($macro_to_ucs_ccs\U$ccs) \\\n";
-    print CESBI_C " || defined ($macro_from_ucs_ccs\U$ccs)\n";
-    print CESBI_C "  &$var_ccs$ccs,\n";
-    print CESBI_C "#endif\n";
-  }
-  print CESBI_C "  NULL\n";
-  print CESBI_C "};\n";
-
-  close CESBI_C or err "Error while closing ../ccs/ccsbi.c file.";
-}
-
-# ==============================================================================
-#
-# Generate ccsnames.h file.
-#
-# Parameter 1 (input): hash reference with keys = CCS tables names and
-# values = array references with list of encodings which need this CCS table.
-#
-# ==============================================================================
-sub generate_ccsnames_h($)
-{
-  my %ccsenc = %{$_[0]};
-  my @ccs = sort keys %ccsenc;
-  
-  print "Debug: create \"../ccs/ccsnames.h\" file.\n" if $verbose;
-  open (CCSNAMES_H, '>', "../ccs/ccsnames.h")
-  or err "Can't create \"../ccs/ccsnames.h\" file for writing.\nSystem error message: $!.\n";
-
-  print CCSNAMES_H "$comment_automatic\n\n";
-  print CCSNAMES_H "#ifndef __CCSNAMES_H__\n";
-  print CCSNAMES_H "#define __CCSNAMES_H__\n\n";
-  print CCSNAMES_H "#include \"../lib/encnames.h\"\n\n";
-  print CCSNAMES_H "/*\n";
-  print CCSNAMES_H " * CCS tables names macros.\n";
-  print CCSNAMES_H " */\n";
-
-  foreach my $ccs (@ccs)
-  {
-    my @encs = @{$ccsenc{$ccs}};
-    my $flag;
-    foreach my $encoding (@encs)
-    {
-      print CCSNAMES_H "#define $macro_ccs_name\U$ccs ";
-      if ($encoding eq $ccs)
-      {
-        $flag = 1;
-        print CCSNAMES_H "$macro_enc_name\U$encoding\n";
-        last;
-      }
-    }
-    print CCSNAMES_H "\"$ccs\"\n" if !$flag;
-  }
-
-  print CCSNAMES_H "\n#endif /* !__CCSNAMES_H__ */\n\n";
-  close CCSNAMES_H or err "Error while closing ../ccs/ccsnames.h file.";
-}
diff --git a/newlib/libc/iconv/ces/table-pcs.c b/newlib/libc/iconv/ces/table-pcs.c
deleted file mode 100644
index fc46e27..0000000
--- a/newlib/libc/iconv/ces/table-pcs.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * This CES converter is just an simple extension of table CES converter.
- * This CES converter is used for 16 bit CCSes which include 7bit
- * Portable Characters Set (PCS) (equivalent to ASCII) (example: BIG5).
- */
-
-#include "cesbi.h"
-
-#if defined (ICONV_TO_UCS_CES_TABLE_PCS) \
- || defined (ICONV_FROM_UCS_CES_TABLE_PCS)
-
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/types.h>
-#include "../lib/local.h"
-#include "../lib/ucsconv.h"
-
-#if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
-static size_t
-_DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               _VOID_PTR data         _AND
-                               ucs4_t in              _AND
-                               unsigned char **outbuf _AND
-                               size_t *outbytesleft)
-{
-  if (*outbytesleft < 1)
-    return (size_t)ICONV_CES_NOSPACE;
-    
-  if (in  < 0x80)
-    {
-      **outbuf = (unsigned char)in;
-      *outbuf += 1;
-      *outbytesleft -= 1;
-      return 1;
-    }
-
-  return _iconv_from_ucs_ces_handlers_table.convert_from_ucs (
-                                                    data,
-                                                    in,
-                                                    outbuf,
-                                                    outbytesleft);
-}
-
-static _VOID_PTR
-_DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
-                                struct _reent *rptr _AND
-                                _CONST char *encoding)
-{
-  return _iconv_from_ucs_ces_handlers_table.init (rptr, encoding);
-}
-
-static size_t
-_DEFUN(table_pcs_from_ucs_close, (rptr, data),
-                                 struct _reent *rptr _AND
-                                 _VOID_PTR data)
-{
-  return _iconv_from_ucs_ces_handlers_table.close (rptr, data);
-}
-
-static int
-_DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
-                                           _VOID_PTR data)
-{
-  return _iconv_from_ucs_ces_handlers_table.get_mb_cur_max (data);
-}
-
-#endif /* ICONV_FROM_UCS_CES_TABLE_PCS */
-
-#if defined (ICONV_TO_UCS_CES_TABLE_PCS)
-static ucs4_t
-_DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
-                             _VOID_PTR data               _AND
-                             _CONST unsigned char **inbuf _AND
-                             size_t *inbytesleft)
-{
-  if (*inbytesleft < 1)
-    return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-
-  if (**inbuf < 0x80)
-    {
-      *inbytesleft -= 1;
-      *inbuf += 1;
-      return (ucs4_t)(*(*inbuf - 1));
-    }
-    
-  return _iconv_to_ucs_ces_handlers_table.convert_to_ucs (
-                                                             data,
-                                                             inbuf,
-                                                             inbytesleft);
-}
-
-static _VOID_PTR
-_DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
-                              struct _reent *rptr _AND
-                              _CONST char *encoding)
-{
-  return _iconv_to_ucs_ces_handlers_table.init (rptr, encoding);
-}
-
-static size_t
-_DEFUN(table_pcs_to_ucs_close, (rptr, data),
-                               struct _reent *rptr _AND
-                               _VOID_PTR data)
-{
-  return _iconv_to_ucs_ces_handlers_table.close (rptr, data);
-}
-
-static int
-_DEFUN(table_pcs_to_ucs_get_mb_cur_max, (data),
-                                         _VOID_PTR data)
-{
-  return _iconv_to_ucs_ces_handlers_table.get_mb_cur_max (data);
-}
-
-#endif /* ICONV_TO_UCS_CES_TABLE_PCS */
-
-#if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
-_CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_table_pcs =
-{
-  table_pcs_from_ucs_init,
-  table_pcs_from_ucs_close,
-  table_pcs_from_ucs_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  table_pcs_convert_from_ucs
-};
-#endif
-
-#if defined (ICONV_TO_UCS_CES_TABLE_PCS)
-_CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_table_pcs = 
-{
-  table_pcs_to_ucs_init,
-  table_pcs_to_ucs_close,
-  table_pcs_to_ucs_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  table_pcs_convert_to_ucs
-};
-#endif
-
-#endif /* ICONV_TO_UCS_CES_TABLE_PCS || ICONV_FROM_UCS_CES_TABLE_PCS */
-
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
deleted file mode 100644
index e43e23f..0000000
--- a/newlib/libc/iconv/ces/table.c
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "cesbi.h"
-
-#if defined (ICONV_TO_UCS_CES_TABLE) \
- || defined (ICONV_FROM_UCS_CES_TABLE)
- 
-#include <_ansi.h>
-#include <reent.h>
-#include <newlib.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/iconvnls.h>
-#include "../lib/endian.h"
-#include "../lib/local.h"
-#include "../lib/ucsconv.h"
-#include "../ccs/ccs.h"
-
-/*
- * Table-based CES converter is implemented here.  Table-based CES converter
- * deals with encodings with "null" CES, like KOI8-R. In this case it is
- * possible to implement one generic algorithm which works with different
- * CCS tables.
- *
- * Table-based CES converter deals with CCS tables placed into iconv/ccs
- * subdirectory. First, converter tries to find needed CCS table among
- * linked-in tables. If not found, it tries to load it from external file
- * (only if corespondent capability was enabled in Newlib configuration). 
- *
- * 16 bit encodings are assumed to be Big Endian.
- */
-
-static ucs2_t
-_EXFUN(find_code_size, (ucs2_t code, _CONST __uint16_t *tblp));
-
-static __inline ucs2_t
-_EXFUN(find_code_speed, (ucs2_t code, _CONST __uint16_t *tblp));
-
-static __inline ucs2_t
-_EXFUN(find_code_speed_8bit, (ucs2_t code, _CONST unsigned char *tblp));
-
-#ifdef _ICONV_ENABLE_EXTERNAL_CCS
-static _CONST iconv_ccs_desc_t *
-_EXFUN(load_file, (struct _reent *rptr, _CONST char *name, int direction));
-#endif
-
-/*
- * Interface data and functions implementation.
- */
-static size_t
-_DEFUN(table_close, (rptr, data),
-                    struct _reent *rptr _AND
-                    _VOID_PTR data)
-{
-  _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
-
-  if (ccsp->type == TABLE_EXTERNAL)
-    _free_r (rptr, (_VOID_PTR)ccsp->tbl);
-
-  _free_r( rptr, (_VOID_PTR)ccsp);
-  return 0;
-}
-
-#if defined (ICONV_FROM_UCS_CES_TABLE)
-static _VOID_PTR
-_DEFUN(table_init_from_ucs, (rptr, encoding),
-                            struct _reent *rptr _AND
-                            _CONST char *encoding)
-{
-  int i;
-  _CONST iconv_ccs_t *biccsp = NULL;
-  iconv_ccs_desc_t *ccsp;
-  
-  for (i = 0; _iconv_ccs[i] != NULL; i++)
-    if (strcmp (_iconv_ccs[i]->name, encoding) == 0)
-      {
-        biccsp = _iconv_ccs[i]; 
-        break;
-      }
-
-  if (biccsp != NULL)
-    {
-      if (biccsp->from_ucs == NULL
-          || (ccsp = (iconv_ccs_desc_t *)
-                     _malloc_r (rptr, sizeof (iconv_ccs_desc_t))) == NULL)
-        return NULL;
-
-      ccsp->type = TABLE_BUILTIN;
-      ccsp->bits = biccsp->bits;
-      ccsp->optimization = biccsp->from_ucs_type;
-      ccsp->tbl = biccsp->from_ucs;
-      
-      return (_VOID_PTR)ccsp;
-    }
-    
-#ifdef _ICONV_ENABLE_EXTERNAL_CCS
-  return (_VOID_PTR)load_file (rptr, encoding, 1);
-#else
-  return NULL;
-#endif
-}
-
-static size_t
-_DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               _VOID_PTR data         _AND
-                               ucs4_t in              _AND
-                               unsigned char **outbuf _AND
-                               size_t *outbytesleft)
-{
-  _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
-  ucs2_t code;
-
-  if (in > 0xFFFF || in == INVALC)
-    return (size_t)ICONV_CES_INVALID_CHARACTER;
-
-  if (ccsp->bits == TABLE_8BIT)
-    {
-      code = find_code_speed_8bit ((ucs2_t)in,
-                                  (_CONST unsigned char *)ccsp->tbl);
-      if (code == INVALC)
-        return (size_t)ICONV_CES_INVALID_CHARACTER;
-      **outbuf = (unsigned char)code;
-      *outbuf += 1;
-      *outbytesleft -= 1;
-      return 1; 
-    }
-  else if (ccsp->optimization == TABLE_SPEED_OPTIMIZED)
-    code = find_code_speed ((ucs2_t)in, ccsp->tbl);
-  else
-    code = find_code_size ((ucs2_t)in, ccsp->tbl);
-
-  if (code == INVALC)
-    return (size_t)ICONV_CES_INVALID_CHARACTER;
-
-  if (*outbytesleft < 2)
-    return (size_t)ICONV_CES_NOSPACE;
-  
-  /* We can't store whole word since **outbuf may be not 2-byte aligned */
-  **outbuf = (unsigned char)((ucs2_t)code >> 8);
-  *(*outbuf + 1) = (unsigned char)code;
-  *outbuf += 2;
-  *outbytesleft -= 2;
-  return 2; 
-}
-#endif /* ICONV_FROM_UCS_CES_TABLE */
-
-#if defined (ICONV_TO_UCS_CES_TABLE)
-static _VOID_PTR
-_DEFUN(table_init_to_ucs, (rptr, encoding),
-                          struct _reent *rptr _AND
-                          _CONST char *encoding)
-{
-  int i;
-  _CONST iconv_ccs_t *biccsp = NULL;
-  iconv_ccs_desc_t *ccsp;
-  
-  for (i = 0; _iconv_ccs[i] != NULL; i++)
-    if (strcmp (_iconv_ccs[i]->name, encoding) == 0)
-      {
-        biccsp = _iconv_ccs[i]; 
-        break;
-      }
-
-  if (biccsp != NULL)
-    {
-      if (biccsp->to_ucs == NULL
-          || (ccsp = (iconv_ccs_desc_t *)
-                     _malloc_r (rptr, sizeof (iconv_ccs_desc_t))) == NULL)
-        return NULL;
-
-      ccsp->type = TABLE_BUILTIN;
-      ccsp->bits = biccsp->bits;
-      ccsp->optimization = biccsp->to_ucs_type;
-      ccsp->tbl = biccsp->to_ucs;
-      
-      return (_VOID_PTR)ccsp;
-    }
-  
-#ifdef _ICONV_ENABLE_EXTERNAL_CCS
-  return (_VOID_PTR)load_file (rptr, encoding, 0);
-#else
-  return NULL;
-#endif
-}
-
-static ucs4_t
-_DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
-                             _VOID_PTR data               _AND
-                             _CONST unsigned char **inbuf _AND
-                             size_t *inbytesleft)
-{
-  _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
-  ucs2_t ucs;
-  
-  if (ccsp->bits == TABLE_8BIT)
-    {
-      if (*inbytesleft < 1)
-        return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-  
-      ucs = (ucs2_t)ccsp->tbl[**inbuf];
-      
-      if (ucs == INVALC)
-        return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-         
-      *inbytesleft -= 1;
-      *inbuf += 1;
-      return (ucs4_t)ucs; 
-    }
-
-  if (*inbytesleft < 2)
-    return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-
-  if (ccsp->optimization == TABLE_SIZE_OPTIMIZED)
-    ucs = find_code_size((ucs2_t)**inbuf << 8 | (ucs2_t)*(*inbuf + 1),
-                         ccsp->tbl);
-  else
-    ucs = find_code_speed((ucs2_t)**inbuf << 8 | (ucs2_t)*(*inbuf + 1),
-                          ccsp->tbl);
-
-  if (ucs == INVALC)
-    return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-
-  *inbuf += 2;
-  *inbytesleft -= 2;
-  return (ucs4_t)ucs; 
-}
-#endif /* ICONV_TO_UCS_CES_TABLE */
-
-static int
-_DEFUN(table_get_mb_cur_max, (data),
-                             _VOID_PTR data)
-{
-  return ((iconv_ccs_desc_t *)data)->bits/8;
-}
-
-
-#if defined (ICONV_TO_UCS_CES_TABLE)
-_CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_table = 
-{
-  table_init_to_ucs,
-  table_close,
-  table_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  table_convert_to_ucs
-};
-#endif /* ICONV_FROM_UCS_CES_TABLE */
-
-#if defined (ICONV_FROM_UCS_CES_TABLE)
-_CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_table =
-{
-  table_init_from_ucs,
-  table_close,
-  table_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  table_convert_from_ucs
-};
-#endif /* ICONV_TO_UCS_CES_TABLE */
-
-/*
- * Supplementary functions.
- */
-
-/*
- * find_code_speed - find code in 16 bit speed-optimized table.
- *
- * PARAMETERS:
- *     ucs2_t code - code whose mapping to find.
- *     _CONST __uint16_t *tblp - table pointer.
- *
- * RETURN:
- *     Code that corresponds to 'code'.
- */
-static __inline ucs2_t
-_DEFUN(find_code_speed, (code, tblp),
-                        ucs2_t code _AND
-                        _CONST __uint16_t *tblp)
-{
-  int idx = tblp[code >> 8];
-
-  if (idx == INVBLK)
-    return (ucs2_t)INVALC;
-
-  return (ucs2_t)tblp[(code & 0x00FF) + idx];
-}
-
-/*
- * find_code_speed_8bit - find code in 8 bit speed-optimized table.
- *
- * PARAMETERS:
- *     ucs2_t code - code whose mapping to find.
- *     _CONST __uint16_t *tblp - table pointer.
- *
- * RETURN:
- *     Code that corresponds to 'code'.
- */
-static __inline ucs2_t
-_DEFUN(find_code_speed_8bit, (code, tblp),
-                             ucs2_t code _AND
-                             _CONST unsigned char *tblp)
-{
-  int idx;
-  unsigned char ccs;
-
-  if (code == ((ucs2_t *)tblp)[0])
-    return (ucs2_t)0xFF;
- 
-  idx = ((ucs2_t *)tblp)[1 + (code >> 8)];
-  
-  if (idx == INVBLK)
-    return (ucs2_t)INVALC;
-
-  ccs = tblp[(code & 0x00FF) + idx];
-
-  return ccs == 0xFF ? (ucs2_t)INVALC : (ucs2_t)ccs;
-}
-
-/* Left range boundary */
-#define RANGE_LEFT(n)     (tblp[FIRST_RANGE_INDEX + (n)*3 + 0])
-/* Right range boundary */
-#define RANGE_RIGHT(n)    (tblp[FIRST_RANGE_INDEX + (n)*3 + 1])
-/* Range offset */
-#define RANGE_INDEX(n)    (tblp[FIRST_RANGE_INDEX + (n)*3 + 2])
-/* Un-ranged offset */
-#define UNRANGED_INDEX(n) (tblp[FIRST_UNRANGED_INDEX_INDEX] + (n)*2)
-
-/*
- * find_code_size - find code in 16 bit size-optimized table.
- *
- * PARAMETERS:
- *     ucs2_t code - code whose mapping to find.
- *     _CONST __uint16_t *tblp - table pointer.
- *
- * RETURN:
- *     Code that corresponds to 'code'.
- */
-static ucs2_t
-_DEFUN(find_code_size, (code, tblp),
-                       ucs2_t code _AND
-                       _CONST __uint16_t *tblp)
-{
-  int first, last, cur, center;
-
-  if (tblp[RANGES_NUM_INDEX] > 0)
-    {
-      first = 0;
-      last = tblp[RANGES_NUM_INDEX] - 1;
- 
-      do
-        {
-          center = (last - first)/2;
-          cur = center + first;
-          
-          if (code > RANGE_RIGHT (cur))
-            first = cur;
-          else if (code < RANGE_LEFT (cur))
-            last = cur;
-          else
-            return (ucs2_t)tblp[RANGE_INDEX (cur) + code - RANGE_LEFT (cur)];
-        } while (center > 0);
-
-        if (last - first == 1)
-          {
-            if (code >= RANGE_LEFT (first) && code <= RANGE_RIGHT (first))
-              return (ucs2_t)tblp[RANGE_INDEX (first)
-                                  + code - RANGE_LEFT (first)];
-            if (code >= RANGE_LEFT (last) && code <= RANGE_RIGHT (last))
-              return (ucs2_t)tblp[RANGE_INDEX (last)
-                                  + code - RANGE_LEFT (last)];
-          }
-    }
-  
-  if (tblp[UNRANGED_NUM_INDEX] > 0)
-    {
-      first = 0;
-      last = tblp[UNRANGED_NUM_INDEX] - 1;
- 
-      do
-        {
-          int c;
-
-          center = (last - first)/2;
-          cur = center + first;
-          c = tblp[UNRANGED_INDEX (cur)];
- 
-          if (code > c)
-            first = cur;
-          else if (code < c)
-            last = cur;
-          else
-            return (ucs2_t)tblp[UNRANGED_INDEX (cur) + 1];
-        } while (center > 0);
-
-        if (last - first == 1)
-          {
-            if (code == tblp[UNRANGED_INDEX (first)])
-              return (ucs2_t)tblp[UNRANGED_INDEX (first) + 1];
-            if (code == tblp[UNRANGED_INDEX (last)])
-              return (ucs2_t)tblp[UNRANGED_INDEX (last) + 1];
-          }
-    }
-
-  return (ucs2_t)INVALC;
-}
-
-#ifdef _ICONV_ENABLE_EXTERNAL_CCS
-
-#define _16BIT_ELT(offset) \
-    ICONV_BETOHS(*((__uint16_t *)(buf + (offset))))
-#define _32BIT_ELT(offset) \
-    ICONV_BETOHL(*((__uint32_t *)(buf + (offset))))
-
-/*
- * load_file - load conversion table from external file and initialize
- *             iconv_ccs_desc_t object.
- *
- * PARAMETERS:
- *    struct _reent *rptr - reent structure of current thread/process.
- *    _CONST char *name - encoding name.
- *    int direction - conversion direction.
- *
- * DESCRIPTION:
- *    Loads conversion table of appropriate endianess from external file
- *    and initializes 'iconv_ccs_desc_t' table description structure.
- *    If 'direction' is 0 - load "To UCS" table, else load "From UCS"
- *    table.
- *
- * RETURN:
- *    iconv_ccs_desc_t * pointer is success, NULL if failure.
- */
-static _CONST iconv_ccs_desc_t *
-_DEFUN(load_file, (rptr, name, direction), 
-                  struct _reent *rptr _AND
-                  _CONST char *name   _AND
-                  int direction)
-{
-  int fd;
-  _CONST unsigned char *buf;
-  int tbllen, hdrlen;
-  off_t off;
-  _CONST char *fname;
-  iconv_ccs_desc_t *ccsp = NULL;
-  int nmlen = strlen(name);
-  /* Since CCS table name length can vary - it is aligned (by adding extra
-   * bytes to it's end) to 4-byte boundary. */
-  int alignment = nmlen & 3 ? 4 - (nmlen & 3) : 0;
-  
-  nmlen = strlen(name);
-  
-  hdrlen = nmlen + EXTTABLE_HEADER_LEN + alignment;
-
-  if ((fname = _iconv_nls_construct_filename (rptr, name, ICONV_SUBDIR,
-                                              ICONV_DATA_EXT)) == NULL)
-    return NULL;
-  
-  if ((fd = _open_r (rptr, fname, O_RDONLY, S_IRUSR)) == -1)
-    goto error1;
-  
-  if ((buf = (_CONST unsigned char *)_malloc_r (rptr, hdrlen)) == NULL)
-    goto error2;
-
-  if (_read_r (rptr, fd, (_VOID_PTR)buf, hdrlen) != hdrlen)
-    goto error3;
-
-  if (_16BIT_ELT (EXTTABLE_VERSION_OFF) != TABLE_VERSION_1
-      || _32BIT_ELT (EXTTABLE_CCSNAME_LEN_OFF) != nmlen
-      || strncmp (buf + EXTTABLE_CCSNAME_OFF, name, nmlen) != 0)
-    goto error3; /* Bad file */
-
-  if ((ccsp = (iconv_ccs_desc_t *)
-           _calloc_r (rptr, 1, sizeof (iconv_ccs_desc_t))) == NULL)
-    goto error3;
-  
-  ccsp->bits = _16BIT_ELT (EXTTABLE_BITS_OFF);
-  ccsp->type = TABLE_EXTERNAL;
-
-  /* Add 4-byte alignment to name length */
-  nmlen += alignment;
-
-  if (ccsp->bits == TABLE_8BIT)
-    {
-      if (direction == 0) /* Load "To UCS" table */
-        {
-          off = (off_t)_32BIT_ELT (nmlen + EXTTABLE_TO_SPEED_OFF);
-          tbllen = _32BIT_ELT (nmlen + EXTTABLE_TO_SPEED_LEN_OFF);
-        }
-      else /* Load "From UCS" table */
-        {
-          off = (off_t)_32BIT_ELT (nmlen + EXTTABLE_FROM_SPEED_OFF);
-          tbllen = _32BIT_ELT (nmlen + EXTTABLE_FROM_SPEED_LEN_OFF);
-        }
-    }
-  else if (ccsp->bits == TABLE_16BIT)
-    {
-      if (direction == 0) /* Load "To UCS" table */
-        {
-#ifdef TABLE_USE_SIZE_OPTIMIZATION
-          off = (off_t)_32BIT_ELT (nmlen + EXTTABLE_TO_SIZE_OFF);
-          tbllen = _32BIT_ELT (nmlen + EXTTABLE_TO_SIZE_LEN_OFF);
-#else
-          off = (off_t)_32BIT_ELT (nmlen + EXTTABLE_TO_SPEED_OFF);
-          tbllen = _32BIT_ELT (nmlen + EXTTABLE_TO_SPEED_LEN_OFF);
-#endif
-        }
-      else /* Load "From UCS" table */
-        {
-#ifdef TABLE_USE_SIZE_OPTIMIZATION
-          off = (off_t)_32BIT_ELT (nmlen + EXTTABLE_FROM_SIZE_OFF);
-          tbllen = _32BIT_ELT (nmlen + EXTTABLE_FROM_SIZE_LEN_OFF);
-#else
-          off = (off_t)_32BIT_ELT (nmlen + EXTTABLE_FROM_SPEED_OFF);
-          tbllen = _32BIT_ELT (nmlen + EXTTABLE_FROM_SPEED_LEN_OFF);
-#endif
-        }
-#ifdef TABLE_USE_SIZE_OPTIMIZATION
-      ccsp->optimization = TABLE_SIZE_OPTIMIZED; 
-#else
-      ccsp->optimization = TABLE_SPEED_OPTIMIZED;
-#endif
-    }
-  else
-    goto error4; /* Bad file */
-
-  if (off == EXTTABLE_NO_TABLE)
-    goto error4; /* No correspondent table in file */
-
-  if ((ccsp->tbl = (ucs2_t *)_malloc_r (rptr, tbllen)) == NULL)
-    goto error4;
-
-  if (_lseek_r (rptr, fd, off, SEEK_SET) == (off_t)-1
-      || _read_r (rptr, fd, (_VOID_PTR)ccsp->tbl, tbllen) != tbllen)
-    goto error5;
-
-  goto normal_exit;
-
-error5:
-  _free_r (rptr, (_VOID_PTR)ccsp->tbl);
-  ccsp->tbl = NULL;
-error4:
-  _free_r (rptr, (_VOID_PTR)ccsp);
-  ccsp = NULL;
-error3:
-normal_exit:
-  _free_r (rptr, (_VOID_PTR)buf);
-error2:
-  if (_close_r (rptr, fd) == -1)
-    {
-      if (ccsp != NULL)
-        {
-          if (ccsp->tbl != NULL)
-            _free_r (rptr, (_VOID_PTR)ccsp->tbl);
-          _free_r (rptr, (_VOID_PTR)ccsp);
-        }
-      ccsp = NULL;
-    }
-error1:
-  _free_r (rptr, (_VOID_PTR)fname);
-  return ccsp;
-}
-#endif
-
-#endif /* ICONV_TO_UCS_CES_TABLE || ICONV_FROM_UCS_CES_TABLE */
-
diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c
deleted file mode 100644
index 893bdd4..0000000
--- a/newlib/libc/iconv/ces/ucs-2-internal.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "cesbi.h"
-
-#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL) \
- || defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include "../lib/local.h"
-#include "../lib/ucsconv.h"
-#include "../lib/endian.h"
-
-/*
- * Internal 2-byte representation of UCS-2 codes without restrictions and
- * without BOM support.
- */
- 
-#if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
-static size_t
-_DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                        _VOID_PTR data         _AND
-                                        register ucs4_t in     _AND
-                                        unsigned char **outbuf _AND
-                                        size_t *outbytesleft)
-{
-  if (in > 0x0000FFFF)
-    return (size_t)ICONV_CES_INVALID_CHARACTER;
-  
-  if (*outbytesleft < sizeof (ucs2_t))
-    return (size_t)ICONV_CES_NOSPACE;
-
-  *((ucs2_t *)(*outbuf)) = (ucs2_t)in;
-  *outbuf += sizeof (ucs2_t);
-  *outbytesleft -= sizeof (ucs2_t);
-
-  return sizeof (ucs2_t);
-}
-#endif /* ICONV_FROM_UCS_CES_UCS_2_INTERNAL */
-
-#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL)
-static ucs4_t
-_DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
-                                      _VOID_PTR data               _AND
-                                      _CONST unsigned char **inbuf _AND
-                                      size_t *inbytesleft)
-{
-  register ucs4_t res;
-  
-  if (*inbytesleft < sizeof (ucs2_t))
-    return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-
-  res = (ucs4_t)*((ucs2_t *)(*inbuf));
-  
-  if (res > 0x0000FFFF)
-    return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-    
-  *inbuf += sizeof (ucs2_t);
-  *inbytesleft -= sizeof (ucs2_t);
-
-  return res;
-}
-#endif /* ICONV_TO_UCS_CES_UCS_2_INTERNAL */
-
-static int
-_DEFUN(ucs_2_internal_get_mb_cur_max, (data),
-                                      _VOID_PTR data)
-{
-  return 2;
-}
-
-#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL)
-_CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_ucs_2_internal = 
-{
-  NULL,
-  NULL,
-  ucs_2_internal_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  ucs_2_internal_convert_to_ucs
-};
-#endif
-
-#if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
-_CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_ucs_2_internal =
-{
-  NULL,
-  NULL,
-  ucs_2_internal_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  ucs_2_internal_convert_from_ucs
-};
-#endif
-
-#endif /* ICONV_TO_UCS_CES_UCS_2_INTERNAL || ICONV_FROM_UCS_CES_UCS_2_INTERNAL */
-
diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c
deleted file mode 100644
index 6f796ca..0000000
--- a/newlib/libc/iconv/ces/ucs-2.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "cesbi.h"
-
-#if defined (ICONV_TO_UCS_CES_UCS_2) \
- || defined (ICONV_FROM_UCS_CES_UCS_2)
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include "../lib/local.h"
-#include "../lib/ucsconv.h"
-#include "../lib/endian.h"
-
-/*
- * BOM isn't supported. UCS-2 is Big Endian. Bad codes are rejected.
- * Bad codes: 0xFFFF, 0xFFFE, 0xD800-0xDFFF.
- */
-
-#define UCS_2_BIG_ENDIAN     0
-#define UCS_2_LITTLE_ENDIAN  1
-
-#define UCS_2   "ucs_2"
-#define UCS_2BE "ucs_2be"
-#define UCS_2LE "ucs_2le"
-
-static _VOID_PTR
-_DEFUN(ucs_2_init, (rptr, encoding),
-                   struct _reent *rptr _AND
-                   _CONST char *encoding)
-{
-  int *data;
-  
-  if ((data = (int *) _malloc_r(rptr, sizeof (int))) == NULL)
-    return (_VOID_PTR)NULL;
-  
-  if (strcmp (encoding, UCS_2LE) == 0)
-    *data = UCS_2_LITTLE_ENDIAN;
-  else
-    *data = UCS_2_BIG_ENDIAN;
-     
-  return (_VOID_PTR)data;
-}
-
-static size_t
-_DEFUN(ucs_2_close, (rptr, data),
-                    struct _reent *rptr _AND
-                    _VOID_PTR data)
-{
-  _free_r (rptr, data);
-  return 0;
-}
-
-#if defined (ICONV_FROM_UCS_CES_UCS_2)
-static size_t
-_DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               _VOID_PTR data         _AND
-                               ucs4_t in              _AND
-                               unsigned char **outbuf _AND
-                               size_t *outbytesleft)
-{
-  if ((in  >= 0x0000D800 && in <= 0x0000DFFF) /* Surrogate character */
-      || in >= 0x0000FFFE)
-    return (size_t)ICONV_CES_INVALID_CHARACTER;
-
-  if (*outbytesleft < sizeof (ucs2_t))
-    return (size_t)ICONV_CES_NOSPACE;
-
-  if (*((int *)data) == UCS_2_BIG_ENDIAN)
-    *((ucs2_t *)(*outbuf)) = ICONV_HTOBES ((ucs2_t)in);
-  else
-    *((ucs2_t *)(*outbuf)) = ICONV_HTOLES ((ucs2_t)in);
-    
-  *outbuf += sizeof (ucs2_t);
-  *outbytesleft -= sizeof (ucs2_t);
-
-  return sizeof (ucs2_t);
-}
-#endif /* ICONV_FROM_UCS_CES_UCS_2 */
-
-#if defined (ICONV_TO_UCS_CES_UCS_2)
-static ucs4_t
-_DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
-                             _VOID_PTR data               _AND
-                             _CONST unsigned char **inbuf _AND
-                             size_t *inbytesleft)
-{
-  ucs4_t res;
-  
-  if (*inbytesleft < sizeof (ucs2_t))
-    return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-
-  if (*((int *)data) == UCS_2_BIG_ENDIAN)
-    res = (ucs4_t)ICONV_BETOHS (*((ucs2_t *)(*inbuf)));
-  else
-    res = (ucs4_t)ICONV_LETOHS (*((ucs2_t *)(*inbuf)));
-
-  if ((res  >= 0x0000D800 && res <= 0x0000DFFF) /* Surrogate character */
-      || res >= 0x0000FFFE)
-    return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-    
-  *inbytesleft -= sizeof (ucs2_t);
-  *inbuf += sizeof (ucs2_t);
-
-  return res;
-}
-#endif /* ICONV_TO_UCS_CES_UCS_2 */
-
-static int
-_DEFUN(ucs_2_get_mb_cur_max, (data),
-                             _VOID_PTR data)
-{
-  return 2;
-}
-
-#if defined (ICONV_TO_UCS_CES_UCS_2)
-_CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_ucs_2 = 
-{
-  ucs_2_init,
-  ucs_2_close,
-  ucs_2_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  ucs_2_convert_to_ucs
-};
-#endif
-
-#if defined (ICONV_FROM_UCS_CES_UCS_2)
-_CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_ucs_2 =
-{
-  ucs_2_init,
-  ucs_2_close,
-  ucs_2_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  ucs_2_convert_from_ucs
-};
-#endif
-
-#endif /* ICONV_TO_UCS_CES_UCS_2 || ICONV_FROM_UCS_CES_UCS_2 */
-
diff --git a/newlib/libc/iconv/ces/ucs-4-internal.c b/newlib/libc/iconv/ces/ucs-4-internal.c
deleted file mode 100644
index d8df9b1..0000000
--- a/newlib/libc/iconv/ces/ucs-4-internal.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "cesbi.h"
-
-#if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL) \
- || defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include "../lib/local.h"
-#include "../lib/ucsconv.h"
-#include "../lib/endian.h"
-
-/*
- * Internal 4-byte representation of UCS-2 codes without restrictions and
- * without BOM support.
- */
-
-#if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
-static size_t
-_DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                        _VOID_PTR data         _AND
-                                        register ucs4_t in     _AND
-                                        unsigned char **outbuf _AND
-                                        size_t *outbytesleft)
-{
-  if (in > 0x7FFFFFFF)
-    return (size_t)ICONV_CES_INVALID_CHARACTER;
-    
-  if (*outbytesleft < sizeof (ucs4_t))
-    return (size_t)ICONV_CES_NOSPACE;
-
-  *((ucs4_t *)(*outbuf)) = in;
-  *outbytesleft -= sizeof (ucs4_t);
-  *outbuf += sizeof (ucs4_t);
-
-  return sizeof (ucs4_t);
-}
-#endif /* ICONV_FROM_UCS_CES_UCS_4_INTERNAL */
-
-#if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL)
-static ucs4_t
-_DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
-                                      _VOID_PTR data               _AND
-                                      _CONST unsigned char **inbuf _AND
-                                      size_t *inbytesleft)
-{
-  register ucs4_t res;
-
-  if (*inbytesleft < sizeof (ucs4_t))
-    return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-
-  res = *((ucs4_t *)(*inbuf));
-
-  if (res > 0x7FFFFFFF)
-    return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-    
-  *inbytesleft -= sizeof (ucs4_t);
-  *inbuf += sizeof (ucs4_t);
-  
-  return res;
-}
-#endif /* ICONV_TO_UCS_CES_UCS_4_INTERNAL */
-
-static int
-_DEFUN(ucs_4_internal_get_mb_cur_max, (data),
-                                      _VOID_PTR data)
-{
-  return 2;
-}
-
-#if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL)
-_CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_ucs_4_internal = 
-{
-  NULL,
-  NULL,
-  ucs_4_internal_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  ucs_4_internal_convert_to_ucs
-};
-#endif
-
-#if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
-_CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_ucs_4_internal =
-{
-  NULL,
-  NULL,
-  ucs_4_internal_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  ucs_4_internal_convert_from_ucs
-};
-#endif
-
-#endif /* ICONV_TO_UCS_CES_UCS_4_INTERNAL || ICONV_FROM_UCS_CES_UCS_4_INTERNAL */
-
diff --git a/newlib/libc/iconv/ces/ucs-4.c b/newlib/libc/iconv/ces/ucs-4.c
deleted file mode 100644
index cfa7b36..0000000
--- a/newlib/libc/iconv/ces/ucs-4.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "cesbi.h"
-
-#if defined (ICONV_TO_UCS_CES_UCS_4) \
- || defined (ICONV_FROM_UCS_CES_UCS_4)
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include "../lib/local.h"
-#include "../lib/ucsconv.h"
-#include "../lib/endian.h"
-
-/*
- * BOM isn't supported. UCS-4 is Big Endian. Bad codes are rejected.
- * Bad codes: 0x0000FFFF, 0x0000FFFE, 0x0000D800-0x0000DFFF, 
- * 0x7FFFFFFF-0xFFFFFFFF.
- */
-
-#define UCS_4_BIG_ENDIAN     0
-#define UCS_4_LITTLE_ENDIAN  1
-
-#define UCS_4   "ucs_4"
-#define UCS_4BE "ucs_4be"
-#define UCS_4LE "ucs_4le"
-
-static _VOID_PTR
-_DEFUN(ucs_4_init, (rptr, encoding),
-                   struct _reent *rptr _AND
-                   _CONST char *encoding)
-{
-  int *data;
-  
-  if ((data = (int *)_malloc_r (rptr, sizeof(int))) == NULL)
-    return (_VOID_PTR)NULL;
-  
-  if (strcmp (encoding, UCS_4LE) == 0)
-    *data = UCS_4_LITTLE_ENDIAN;
-  else
-    *data = UCS_4_BIG_ENDIAN;
-     
-  return (_VOID_PTR)data;
-}
-
-static size_t
-_DEFUN(ucs_4_close, (rptr, data),
-                    struct _reent *rptr _AND
-                    _VOID_PTR data)
-{
-  _free_r(rptr, data);
-  return 0;
-}
-
-
-#if defined (ICONV_FROM_UCS_CES_UCS_4)
-static size_t
-_DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                               _VOID_PTR data         _AND
-                               ucs4_t in              _AND
-                               unsigned char **outbuf _AND
-                               size_t *outbytesleft)
-{
-  if ((in  >= 0x0000D800 && in <= 0x0000DFFF) /* Surrogate character */
-      || in > 0x7FFFFFFF || in == 0x0000FFFF || in == 0x0000FFFE)
-    return (size_t)ICONV_CES_INVALID_CHARACTER; 
-
-  if (*outbytesleft < sizeof (ucs4_t))
-    return (size_t)ICONV_CES_NOSPACE;
-
-  if (*((int *)data) == UCS_4_BIG_ENDIAN)
-    *((ucs4_t *)(*outbuf)) = ICONV_HTOBEL (in);
-  else
-    *((ucs4_t *)(*outbuf)) = ICONV_HTOLEL (in);
-
-  *outbuf += sizeof (ucs4_t);
-  *outbytesleft -= sizeof (ucs4_t);
-
-  return sizeof (ucs4_t);
-}
-#endif /* ICONV_FROM_UCS_CES_UCS_4 */
-
-#if defined (ICONV_TO_UCS_CES_UCS_4)
-static ucs4_t
-_DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
-                             _VOID_PTR data               _AND
-                             _CONST unsigned char **inbuf _AND
-                             size_t *inbytesleft)
-{
-  ucs4_t res;
-  
-  if (*inbytesleft < sizeof (ucs4_t))
-    return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-
-  if (*((int *)data) == UCS_4_BIG_ENDIAN)
-    res = ICONV_BETOHL (*((ucs4_t *)(*inbuf)));
-  else
-    res = ICONV_LETOHL (*((ucs4_t *)(*inbuf)));
-
-  if ((res  >= 0x0000D800 && res <= 0x0000DFFF) /* Surrogate character */
-      || res > 0x7FFFFFFF || res == 0x0000FFFF || res == 0x0000FFFE)
-    return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-
-  *inbytesleft -= sizeof (ucs4_t);
-  *inbuf += sizeof(ucs4_t);
-  
-  return res;
-}
-#endif /* ICONV_TO_UCS_CES_UCS_4 */
-
-static int
-_DEFUN(ucs_4_get_mb_cur_max, (data),
-                             _VOID_PTR data)
-{
-  return 4;
-}
-
-#if defined (ICONV_TO_UCS_CES_UCS_4)
-_CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_ucs_4 = 
-{
-  ucs_4_init,
-  ucs_4_close,
-  ucs_4_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  ucs_4_convert_to_ucs
-};
-#endif
-
-#if defined (ICONV_FROM_UCS_CES_UCS_4)
-_CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_ucs_4 =
-{
-  ucs_4_init,
-  ucs_4_close,
-  ucs_4_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  ucs_4_convert_from_ucs
-};
-#endif
-
-#endif /* ICONV_TO_UCS_CES_UCS_4 || ICONV_FROM_UCS_CES_UCS_4 */
-
diff --git a/newlib/libc/iconv/ces/us-ascii.c b/newlib/libc/iconv/ces/us-ascii.c
deleted file mode 100644
index 2f213a7..0000000
--- a/newlib/libc/iconv/ces/us-ascii.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "cesbi.h"
-
-#if defined (ICONV_TO_UCS_CES_US_ASCII) \
- || defined (ICONV_FROM_UCS_CES_US_ASCII)
-
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/types.h>
-#include "../lib/local.h"
-#include "../lib/ucsconv.h"
-
-/*
- * For optimization purposes us_ascii is implemented as separate CES converter.
- * Another possible way is to add us_ascii CCS and use table-based CES converter.
- */
-
-#if defined (ICONV_FROM_UCS_CES_US_ASCII)
-static size_t
-_DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                  _VOID_PTR data         _AND
-                                  ucs4_t in              _AND
-                                  unsigned char **outbuf _AND
-                                  size_t *outbytesleft)
-{
-  if (in  > 0x7F)
-    return (size_t)ICONV_CES_INVALID_CHARACTER;
-
-  *((char *)(*outbuf)) = (char)in;
-    
-  *outbuf += 1;
-  *outbytesleft -= 1;
-
-  return 1;
-}
-#endif /* ICONV_FROM_UCS_CES_US_ASCII */
-
-#if defined (ICONV_TO_UCS_CES_US_ASCII)
-static ucs4_t
-_DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
-                                _VOID_PTR data               _AND
-                                _CONST unsigned char **inbuf _AND
-                                size_t *inbytesleft)
-{
-  ucs4_t res;
-
-  if (*inbytesleft < 1)
-    return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-
-  res = (ucs4_t)**inbuf;
-
-  if (res  > 0x7F)
-    return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-    
-  *inbytesleft -= 1;
-  *inbuf += 1;
-
-  return res;
-}
-#endif /* ICONV_TO_UCS_CES_US_ASCII */
-
-static int
-_DEFUN(us_ascii_get_mb_cur_max, (data),
-                                _VOID_PTR data)
-{
-  return 2;
-}
-
-#if defined (ICONV_TO_UCS_CES_US_ASCII)
-_CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_us_ascii = 
-{
-  NULL,
-  NULL,
-  us_ascii_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  us_ascii_convert_to_ucs
-};
-#endif
-
-#if defined (ICONV_FROM_UCS_CES_US_ASCII)
-_CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_us_ascii =
-{
-  NULL,
-  NULL,
-  us_ascii_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  us_ascii_convert_from_ucs
-};
-#endif
-
-#endif /* ICONV_TO_UCS_CES_US_ASCII || ICONV_FROM_UCS_CES_US_ASCII */
-
diff --git a/newlib/libc/iconv/ces/utf-16.c b/newlib/libc/iconv/ces/utf-16.c
deleted file mode 100644
index 4b2ff77..0000000
--- a/newlib/libc/iconv/ces/utf-16.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "cesbi.h"
-
-#if defined (ICONV_TO_UCS_CES_UTF_16) \
- || defined (ICONV_FROM_UCS_CES_UTF_16)
-
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "../lib/local.h"
-#include "../lib/ucsconv.h"
-#include "../lib/endian.h"
-
-/*
- * On input UTF-16 converter interpret BOM and uses Big Endian byte order if BOM
- * is absent. UTF-16 converter outputs in System Endian and adds correspondent
- * BOM as first code. UTF-16LE and UTF-16BE converters ignore BOM on input and
- * don't output BOM.
- */
-
-#define UTF16_UNDEFINED     0x00
-#define UTF16_BIG_ENDIAN    0x01
-#define UTF16_LITTLE_ENDIAN 0x02
-#define UTF16_SYSTEM_ENDIAN 0x04
-#define UTF16_BOM_WRITTEN   0x08
-
-#define UTF16_BOM 0xFEFF
-
-#define UTF_16   "utf_16"
-#define UTF_16BE "utf_16be"
-#define UTF_16LE "utf_16le"
-
-static size_t
-_DEFUN(utf_16_close, (rptr, data),
-                     struct _reent *rptr _AND
-                     _VOID_PTR data)
-{
-  _free_r(rptr, data);
-  return 0;
-}
-
-#if defined (ICONV_FROM_UCS_CES_UTF_16)
-static _VOID_PTR
-_DEFUN(utf_16_init_from_ucs, (rptr, encoding),
-                             struct _reent *rptr _AND
-                             _CONST char *encoding)
-{
-  int *data;
-  
-  if ((data = (int *)_malloc_r (rptr, sizeof (int))) == NULL)
-    return (_VOID_PTR)NULL;
-  
-  if (strcmp (encoding, UTF_16LE) == 0)
-    *data = UTF16_LITTLE_ENDIAN;
-  else if (strcmp (encoding, UTF_16BE) == 0)
-    *data = UTF16_BIG_ENDIAN;
-  else
-    *data = UTF16_SYSTEM_ENDIAN;
-     
-  return (_VOID_PTR)data;
-}
-
-static size_t
-_DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
-                                _VOID_PTR data         _AND
-                                register ucs4_t in     _AND
-                                unsigned char **outbuf _AND
-                                size_t *outbytesleft)
-{
-  register ucs2_t *cp;
-  register size_t bytes;
-  register int *state;
-  
-  if (in > 0x0010FFFF || (in >= 0x0000D800 && in <= 0x0000DFFF)
-      || in == 0x0000FFFF || in == 0x0000FFFE)
-    return (size_t)ICONV_CES_INVALID_CHARACTER; 
-
-  state = (int *)data;
-  bytes = (*state == UTF16_SYSTEM_ENDIAN) ? sizeof (ucs2_t) * 2 
-                                          : sizeof (ucs2_t);
-
-  if (in > 0x0000FFFF)
-    bytes += sizeof (ucs2_t);
-
-  if (*outbytesleft < bytes)
-    return (size_t)ICONV_CES_NOSPACE;
-
-  cp = (ucs2_t *)*outbuf;
-
-  if (*state == UTF16_SYSTEM_ENDIAN)
-    {
-      *cp++ = UTF16_BOM;
-      *state |= UTF16_BOM_WRITTEN;
-    }
-
-  if (in < 0x00010000)
-    {
-      switch (*state)
-        {
-          case UTF16_LITTLE_ENDIAN:
-            *cp = ICONV_HTOLES ((ucs2_t)in);
-            break;
-          case UTF16_BIG_ENDIAN:
-            *cp = ICONV_HTOBES ((ucs2_t)in);
-            break;
-          case (UTF16_SYSTEM_ENDIAN | UTF16_BOM_WRITTEN):
-            *cp = (ucs2_t)in;
-            break;
-        }
-    }
-  else
-    {
-      ucs2_t w1, w2;
-      
-      /* Process surrogate pair */
-      in -= 0x00010000;
-      w1 = ((ucs2_t)((in >> 10)) & 0x03FF) | 0xD800;
-      w2 = (ucs2_t)(in & 0x000003FF) | 0xDC00;
-
-      switch (*state)
-        {
-          case UTF16_LITTLE_ENDIAN:
-            *cp++ = ICONV_HTOLES (w1);
-            *cp = ICONV_HTOLES (w2);
-            break;
-          case UTF16_BIG_ENDIAN:
-            *cp++ = ICONV_HTOBES (w1);
-            *cp = ICONV_HTOBES (w2);
-            break;
-          case (UTF16_SYSTEM_ENDIAN | UTF16_BOM_WRITTEN):
-            *cp++ = w1;
-            *cp = w2;
-            break;
-        }
-    }
-  
-  *outbuf += bytes;
-  *outbytesleft -= bytes;
-
-  return bytes;
-}
-#endif /* ICONV_FROM_UCS_CES_UTF_16 */
-
-#if defined (ICONV_TO_UCS_CES_UTF_16)
-static _VOID_PTR
-_DEFUN(utf_16_init_to_ucs, (rptr, encoding),
-                           struct _reent *rptr _AND
-                           _CONST char *encoding)
-{
-  int *data;
-  
-  if ((data = (int *)_malloc_r (rptr, sizeof (int))) == NULL)
-    return (_VOID_PTR)NULL;
-  
-  if (strcmp (encoding, UTF_16BE) == 0)
-    *data = UTF16_BIG_ENDIAN;
-  else if (strcmp (encoding, UTF_16LE) == 0)
-    *data = UTF16_LITTLE_ENDIAN;
-  else
-    *data = UTF16_UNDEFINED;
-     
-  return (_VOID_PTR)data;
-}
-
-static ucs4_t
-_DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
-                              _VOID_PTR data               _AND
-                              _CONST unsigned char **inbuf _AND
-                              size_t *inbytesleft)
-{
-  register ucs2_t w1;
-  register ucs2_t w2;
-  register ucs2_t *cp;
-  int *state;
-  ucs4_t res;
-  int bytes = sizeof (ucs2_t);
-
-  if (*inbytesleft < bytes)
-    return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-  
-  state = (int *)data;
-  cp = ((ucs2_t *)*inbuf);
-
-  if (*state == UTF16_UNDEFINED)
-    {
-      if (*cp == ICONV_HTOLES(UTF16_BOM))
-        *state = UTF16_LITTLE_ENDIAN;
-      else
-        *state = UTF16_BIG_ENDIAN;
-
-     if (   *cp == ICONV_HTOBES (UTF16_BOM)
-         || *cp == ICONV_HTOLES (UTF16_BOM))
-       {
-         if (*inbytesleft < (bytes += sizeof (ucs2_t)))
-           return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-         cp += 1;
-       }
-    }
-    
-  if (*state == UTF16_LITTLE_ENDIAN)      
-    w1 = ICONV_LETOHS (*cp);
-  else
-    w1 = ICONV_BETOHS (*cp);
-
-  if (w1  < 0xD800 || w1 > 0xDFFF)
-    {
-      if (w1 == 0xFFFF || w1 == 0xFFFE)
-        return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-      res = (ucs4_t)w1;
-    }
-  else
-    {
-      /* Process surrogate pair */
-      if (*inbytesleft < (bytes += 2))
-        return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-    
-      if (w1 > 0xDBFF)
-        /* Broken surrogate character */
-        return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-        
-      cp += 1;
-
-      if (*state == UTF16_LITTLE_ENDIAN)      
-        w2 = ICONV_LETOHS (*cp);
-      else
-        w2 = ICONV_BETOHS (*cp);
-  
-      if (w2 < 0xDC00 || w2 > 0xDFFF)
-        /* Broken surrogate character */
-        return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-    
-      res = (ucs4_t)(w2 & 0x03FF) | ((ucs4_t)(w1 & 0x03FF) << 10);
-      res += 0x00010000;
-    }
-
-  *inbuf += bytes;
-  *inbytesleft -= bytes;
-  
-  return res;
-}
-#endif /* ICONV_TO_UCS_CES_UTF_16 */
-
-static int
-_DEFUN(utf_16_get_mb_cur_max, (data),
-                              _VOID_PTR data)
-{
-  return 6;
-}
-
-#if defined (ICONV_TO_UCS_CES_UTF_16)
-_CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_utf_16 = 
-{
-  utf_16_init_to_ucs,
-  utf_16_close,
-  utf_16_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  utf_16_convert_to_ucs
-};
-#endif
-
-#if defined (ICONV_FROM_UCS_CES_UTF_16)
-_CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_utf_16 =
-{
-  utf_16_init_from_ucs,
-  utf_16_close,
-  utf_16_get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  utf_16_convert_from_ucs
-};
-#endif
-
-#endif /* ICONV_TO_UCS_CES_UTF_16 || ICONV_FROM_UCS_CES_UTF_16 */
-
diff --git a/newlib/libc/iconv/ces/utf-8.c b/newlib/libc/iconv/ces/utf-8.c
deleted file mode 100644
index fda1e6e..0000000
--- a/newlib/libc/iconv/ces/utf-8.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include "cesbi.h"
-
-#if defined (ICONV_TO_UCS_CES_UTF_8) \
- || defined (ICONV_FROM_UCS_CES_UTF_8)
-
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/types.h>
-#include "../lib/local.h"
-#include "../lib/ucsconv.h"
-
-#define UTF8_MB_CUR_MAX 6
-
-/*
- * UTF-8 CES converter doesn't interpret BOM. Reject overlong sequences, 
- * U'FFFF, U'FFFE codes, UTF-16 surrogate codes and all codes > 0x7FFFFFFF.
- */
-
-#if defined (ICONV_FROM_UCS_CES_UTF_8)
-static size_t
-_DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
-                         _VOID_PTR data         _AND
-                         register ucs4_t in     _AND
-                         unsigned char **outbuf _AND
-                         size_t *outbytesleft)
-{
-  register unsigned char *cp;
-  register size_t bytes;
-
-  if ((in  >= 0x0000D800 && in <= 0x0000DFFF)
-      || in > 0x7FFFFFFF || in == 0x0000FFFF || in == 0x0000FFFE)
-    return (size_t)ICONV_CES_INVALID_CHARACTER;
-
-  if (in < 0x80)
-    bytes = 1;
-  else if (in < 0x800)
-    bytes = 2;
-  else if (in < 0x10000)
-    bytes = 3;
-  else if (in < 0x200000)
-    bytes = 4;
-  else if (in < 0x4000000)
-    bytes = 5;
-  else
-    bytes = 6;
-
-  if (*outbytesleft < bytes)
-    return (size_t)ICONV_CES_NOSPACE;
-
-  cp = *outbuf;
-  
-  switch (bytes)
-    {
-      case 1:
-        *cp = (unsigned char)in;
-        break;
-
-      case 2:
-        *cp++ = (unsigned char)((in >> 6) | 0x000000C0);
-        *cp++ = (unsigned char)((in & 0x0000003F) | 0x00000080);
-        break;
-
-      case 3:
-        *cp++ = (unsigned char)((in >> 12) | 0x000000E0);
-        *cp++ = (unsigned char)(((in >> 6) & 0x0000003F) | 0x00000080);
-        *cp++ = (unsigned char)((in        & 0x0000003F) | 0x00000080);
-        break;
-
-      case 4:
-        *cp++ = (unsigned char)((in >> 18)  | 0x000000F0);
-        *cp++ = (unsigned char)(((in >> 12) & 0x0000003F) | 0x00000080);
-        *cp++ = (unsigned char)(((in >> 6)  & 0x0000003F) | 0x00000080);
-        *cp++ = (unsigned char)((in         & 0x0000003F) | 0x00000080);
-        break;
-
-      case 5:
-        *cp++ = (unsigned char)((in >> 24)  | 0x000000F8);
-        *cp++ = (unsigned char)(((in >> 18) & 0x0000003F) | 0x00000080);
-        *cp++ = (unsigned char)(((in >> 12) & 0x0000003F) | 0x00000080);
-        *cp++ = (unsigned char)(((in >> 6)  & 0x0000003F) | 0x00000080);
-        *cp++ = (unsigned char)((in         & 0x0000003F) | 0x00000080);
-        break;
-
-      case 6:
-        *cp++ = (unsigned char)((in >> 30)  | 0x000000FC);
-        *cp++ = (unsigned char)(((in >> 24) & 0x0000003F) | 0x00000080);
-        *cp++ = (unsigned char)(((in >> 18) & 0x0000003F) | 0x00000080);
-        *cp++ = (unsigned char)(((in >> 12) & 0x0000003F) | 0x00000080);
-        *cp++ = (unsigned char)(((in >> 6)  & 0x0000003F) | 0x00000080);
-        *cp++ = (unsigned char)((in         & 0x0000003F) | 0x00000080);
-        break;
-    }
-
-  *outbytesleft -= bytes;
-  *outbuf += bytes;
-  
-  return bytes;
-}
-#endif /* ICONV_FROM_UCS_CES_UTF_8 */
-
-#if defined (ICONV_TO_UCS_CES_UTF_8)
-static ucs4_t
-_DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
-                       _VOID_PTR data               _AND
-                       _CONST unsigned char **inbuf _AND
-                       size_t *inbytesleft)
-{
-  register _CONST unsigned char *in = *inbuf;
-  register size_t bytes;
-  ucs4_t res;
-
-  if (in[0] >= 0xC0)
-    {
-      if (in[0] < 0xE0)
-        {
-          if (*inbytesleft < (bytes = 2))
-            return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-
-          if (   ((in[0] & ~0x1F) == 0xC0)
-              && ((in[1] & 0xC0)  == 0x80))
-            res = ((ucs4_t)(in[0] & 0x1F) << 6)
-                | ((ucs4_t)(in[1] & 0x3F));
-          else
-            return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-
-          if (res < 0x00000080) /* Overlong sequence */
-            return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-        }
-        
-      else if (in[0] < 0xF0)
-        {
-          if (*inbytesleft < (bytes = 3))
-            return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-
-          if (   ((in[0] & ~0x0F) == 0xE0)
-              && ((in[1] & 0xC0)  == 0x80)
-              && ((in[2] & 0xC0)  == 0x80))
-            res = ((ucs4_t)(in[0] & 0x0F) << 12)
-                | ((ucs4_t)(in[1] & 0x3F) << 6)
-                | ((ucs4_t)(in[2] & 0x3F));
-          else
-            return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-
-          if (res < 0x00000800) /* Overlong sequence */
-            return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-        }
-      
-      else if (in[0] < 0xF8)
-        {
-          if (*inbytesleft < (bytes = 4))
-            return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-            
-          if (   ((in[0] & ~0x07) == 0xF0)
-              && ((in[1] & 0xC0)  == 0x80)
-              && ((in[2] & 0xC0)  == 0x80)
-              && ((in[3] & 0xC0)  == 0x80))
-            res = ((ucs4_t)(in[0] & 0x07) << 18)
-                | ((ucs4_t)(in[1] & 0x3F) << 12)
-                | ((ucs4_t)(in[2] & 0x3F) << 6)
-                | ((ucs4_t)(in[3] & 0x3F));
-          else
-            return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-            
-          if (res < 0x00010000) /* Overlong sequence */
-            return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-        }
-      
-      else if (in[0] < 0xFC)
-        {
-          if (*inbytesleft < (bytes = 5))
-            return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-            
-          if (   ((in[0] & ~0x03) == 0xF8)
-              && ((in[1] & 0xC0)  == 0x80)
-              && ((in[2] & 0xC0)  == 0x80)
-              && ((in[3] & 0xC0)  == 0x80)
-              && ((in[4] & 0xC0)  == 0x80))
-            res = ((ucs4_t)(in[0] & 0x03) << 24)
-                | ((ucs4_t)(in[1] & 0x3F) << 18)
-                | ((ucs4_t)(in[2] & 0x3F) << 12)
-                | ((ucs4_t)(in[3] & 0x3F) << 6)
-                | ((ucs4_t)(in[4] & 0x3F));
-          else
-            return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-            
-          if (res < 0x00200000) /* Overlong sequence */
-            return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-        }
-
-      else if (in[0] <= 0xFD)
-        {
-          if (*inbytesleft < (bytes = 6))
-            return (ucs4_t)ICONV_CES_BAD_SEQUENCE;
-            
-          if (   ((in[0] & ~0x01) == 0xFC)
-              && ((in[1] & 0xC0)  == 0x80)
-              && ((in[2] & 0xC0)  == 0x80)
-              && ((in[3] & 0xC0)  == 0x80)
-              && ((in[4] & 0xC0)  == 0x80)
-              && ((in[5] & 0xC0)  == 0x80))
-              res = ((ucs4_t)(in[0] & 0x1)  << 30)
-                  | ((ucs4_t)(in[1] & 0x3F) << 24)
-                  | ((ucs4_t)(in[2] & 0x3F) << 18)
-                  | ((ucs4_t)(in[3] & 0x3F) << 12)
-                  | ((ucs4_t)(in[4] & 0x3F) << 6)
-                  | ((ucs4_t)(in[5] & 0x3F));
-          else
-            return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-            
-          if (res < 0x04000000) /* Overlong sequence */
-            return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-        }
-        
-      else
-        return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-    }
-  else if (in[0] & 0x80)
-    return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-  else
-    {
-      res = (ucs4_t)in[0];
-      bytes = 1;
-    }
-
-  if (  (res  >= 0x0000D800 && res <= 0x0000DFFF)
-      || res > 0x7FFFFFFF || res == 0x0000FFFF || res == 0x0000FFFE)
-    return (ucs4_t)ICONV_CES_INVALID_CHARACTER;
-
-  *inbytesleft -= bytes;
-  *inbuf += bytes;
-
-  return res;
-}
-#endif /* ICONV_TO_UCS_CES_UTF_8 */
-
-static int
-_DEFUN(get_mb_cur_max, (data),
-                       _VOID_PTR data)
-{
-  return UTF8_MB_CUR_MAX;
-}
-
-#if defined (ICONV_TO_UCS_CES_UTF_8)
-_CONST iconv_to_ucs_ces_handlers_t
-_iconv_to_ucs_ces_handlers_utf_8 = 
-{
-  NULL,
-  NULL,
-  get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  convert_to_ucs
-};
-#endif
-
-#if defined (ICONV_FROM_UCS_CES_UTF_8)
-_CONST iconv_from_ucs_ces_handlers_t
-_iconv_from_ucs_ces_handlers_utf_8 =
-{
-  NULL,
-  NULL,
-  get_mb_cur_max,
-  NULL,
-  NULL,
-  NULL,
-  convert_from_ucs
-};
-#endif
-
-#endif /* ICONV_TO_UCS_CES_UTF_8 || ICONV_FROM_UCS_CES_UTF_8 */
-
diff --git a/newlib/libc/iconv/encoding.aliases b/newlib/libc/iconv/encoding.aliases
deleted file mode 100644
index c127a41..0000000
--- a/newlib/libc/iconv/encoding.aliases
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# This file was automatically generated. Don't edit.
-#
-
-big5 csbig5 big_five bigfive cn_big5 cp950
-cp775 ibm775 cspc775baltic
-cp850 ibm850 850 cspc850multilingual
-cp852 ibm852 852 cspcp852
-cp855 ibm855 855 csibm855
-cp866 866 IBM866 CSIBM866
-euc_jp eucjp
-euc_kr euckr
-euc_tw euctw
-iso_8859_1 iso8859_1 iso88591 iso_8859_1:1987 iso_ir_100 latin1 l1 ibm819 cp819 csisolatin1
-iso_8859_10 iso_8859_10:1992 iso_ir_157 iso885910 latin6 l6 csisolatin6 iso8859_10
-iso_8859_11 iso8859_11 iso885911
-iso_8859_13 iso_8859_13:1998 iso8859_13 iso885913
-iso_8859_14 iso_8859_14:1998 iso885914 iso8859_14
-iso_8859_15 iso885915 iso_8859_15:1998 iso8859_15 
-iso_8859_2 iso8859_2 iso88592 iso_8859_2:1987 iso_ir_101 latin2 l2 csisolatin2
-iso_8859_3 iso_8859_3:1988 iso_ir_109 iso8859_3 latin3 l3 csisolatin3 iso88593
-iso_8859_4 iso8859_4 iso88594 iso_8859_4:1988 iso_ir_110 latin4 l4 csisolatin4
-iso_8859_5 iso8859_5 iso88595 iso_8859_5:1988 iso_ir_144 cyrillic csisolatincyrillic
-iso_8859_6 iso_8859_6:1987 iso_ir_127 iso8859_6 ecma_114 asmo_708 arabic csisolatinarabic iso88596
-iso_8859_7 iso_8859_7:1987 iso_ir_126 iso8859_7 elot_928 ecma_118 greek greek8 csisolatingreek iso88597
-iso_8859_8 iso_8859_8:1988 iso_ir_138 iso8859_8 hebrew csisolatinhebrew iso88598
-iso_8859_9 iso_8859_9:1989 iso_ir_148 iso8859_9 latin5 l5 csisolatin5 iso88599
-iso_ir_111 ecma_cyrillic koi8_e koi8e csiso111ecmacyrillic
-koi8_r cskoi8r koi8r koi8
-koi8_ru koi8ru
-koi8_u koi8u
-koi8_uni koi8uni
-ucs_2 ucs2 iso_10646_ucs_2 iso10646_ucs_2 iso_10646_ucs2 iso10646_ucs2 iso10646ucs2 csUnicode
-ucs_2_internal ucs2_internal ucs_2internal ucs2internal
-ucs_2be ucs2be
-ucs_2le ucs2le
-ucs_4 ucs4 iso_10646_ucs_4 iso10646_ucs_4 iso_10646_ucs4 iso10646_ucs4 iso10646ucs4
-ucs_4_internal ucs4_internal ucs_4internal ucs4internal
-ucs_4be ucs4be
-ucs_4le ucs4le
-us_ascii ansi_x3.4_1968 ansi_x3.4_1986 iso_646.irv:1991 ascii iso646_us us ibm367 cp367 csascii 
-utf_16 utf16
-utf_16be utf16be
-utf_16le utf16le
-utf_8 utf8
-win_1250 cp1250
-win_1251 cp1251
-win_1252 cp1252
-win_1253 cp1253
-win_1254 cp1254
-win_1255 cp1255
-win_1256 cp1256
-win_1257 cp1257
-win_1258 cp1258
-
diff --git a/newlib/libc/iconv/iconv.tex b/newlib/libc/iconv/iconv.tex
deleted file mode 100644
index 305c3ce..0000000
--- a/newlib/libc/iconv/iconv.tex
+++ /dev/null
@@ -1,1710 +0,0 @@
-@node Iconv
-@chapter Encoding conversions (@file{iconv.h})
-
-This chapter describes the Newlib iconv library.
-The iconv functions declarations are in
-@file{iconv.h}.
-
-@menu
-* iconv::                           Encoding conversion routines
-* Introduction::                    Introduction to iconv and encodings
-* Supported encodings::             The list of currently supported encodings
-* iconv design decisions::          General iconv library design issues
-* iconv configuration::             iconv-related configure script options
-* Encoding names::                  How encodings are named.
-* CCS tables::                      CCS tables format and 'mktbl.pl' Perl script
-* CES converters::                  CES converters description
-* The encodings description file::  The 'encoding.deps' file and 'mkdeps.pl'
-* How to add new encoding::         The steps to add new encoding support
-* The locale support interfaces::   Locale-related iconv interfaces
-* Contact::                         The author contact
-@end menu
-
-@page
-@include iconv/iconv.def
-
-@page
-@node Introduction
-@section Introduction
-@findex encoding
-@findex character set
-@findex charset
-@findex CES
-@findex CCS
-@*
-The iconv library is intended to convert characters from one encoding to
-another. It implements iconv(), iconv_open() and iconv_close()
-calls, which are defined by the Single Unix Specification.
-
-@*
-In addition to these user-level interfaces, the iconv library also has
-several useful interfaces which are needed to support coding
-capabilities of the Newlib Locale infrastructure.  Since Locale 
-support also needs to
-convert various character sets to and from the @emph{wide characters
-set}, the iconv library shares it's capabilities with the Newlib Locale
-subsystem. Moreover, the iconv library supports several features which are
-only needed for the Locale infrastructure (for example, the MB_CUR_MAX value).
-
-@*
-The Newlib iconv library was created using concepts from another iconv
-library implemented by Konstantin Chuguev (ver 2.0). The Newlib iconv library
-was rewritten from scratch and contains a lot of improvements with respect to
-the original iconv library. 
-
-@*
-Terms like @dfn{encoding} or @dfn{character set} aren't well defined and
-are often used with various meanings. The following are the definitions of terms
-which are used in this documentation as well as in the iconv library
-implementation:
-
-@itemize @bullet
-@item
-@dfn{encoding} - a machine representation of characters by means of bits;
-
-@item
-@dfn{Character Set} or @dfn{Charset} - just a collection of
-characters, i.e. the encoding is the machine representation of the character set; 
-
-@item
-@dfn{CCS} (@dfn{Coded Character Set}) - a mapping from an character set to a
-set of integers @dfn{character codes};
-
-@item
-@dfn{CES} (@dfn{Character Encoding Scheme}) - a mapping from a set of character
-codes to a sequence of bytes;
-@end itemize
-
-@*
-Users usually deal with encodings, for example, KOI8-R, Unicode, UTF-8,
-ASCII, etc. Encodings are formed by the following chain of steps:
-
-@enumerate
-@item
-User has a set of characters which are specific to his or her language (character set).
-
-@item
-Each character from this set is uniquely numbered, resulting in an CCS.
-
-@item
-Each number from the CCS is converted to a sequence of bits or bytes by means
-of a CES and form some encoding. Thus, CES may be considered as a
-function of CCS which produces some encoding. Note, that CES may be
-applied to more than one CCS.
-@end enumerate
-
-@*
-Thus, an encoding may be considered as one or more CCS + CES.
-
-@*
-Sometimes, there is no CES and in such cases encoding is equivalent
-to CCS, e.g. KOI8-R or ASCII.
-
-@*
-An example of a more complicated encoding is UTF-8 which is the UCS
-(or Unicode) CCS plus the UTF-8 CES.
-
-@*
-The following is a brief list of iconv library features:
-@itemize
-@item
-Generic architecture;
-@item
-Locale infrastructure support;
-@item
-Automatic generation of the program code which handles
-CES/CCS/Encoding/Names/Aliases dependencies;
-@item
-The ability to choose size- or speed-optimazed
-configuration;
-@item
-The ability to exclude a lot of unneeded code and data from the linking step.
-@end itemize
-
-
-
-
-@page
-@node Supported encodings
-@section Supported encodings
-@findex big5
-@findex cp775
-@findex cp850
-@findex cp852
-@findex cp855
-@findex cp866
-@findex euc_jp
-@findex euc_kr
-@findex euc_tw
-@findex iso_8859_1
-@findex iso_8859_10
-@findex iso_8859_11
-@findex iso_8859_13
-@findex iso_8859_14
-@findex iso_8859_15
-@findex iso_8859_2
-@findex iso_8859_3
-@findex iso_8859_4
-@findex iso_8859_5
-@findex iso_8859_6
-@findex iso_8859_7
-@findex iso_8859_8
-@findex iso_8859_9
-@findex iso_ir_111
-@findex koi8_r
-@findex koi8_ru
-@findex koi8_u
-@findex koi8_uni
-@findex ucs_2
-@findex ucs_2_internal
-@findex ucs_2be
-@findex ucs_2le
-@findex ucs_4
-@findex ucs_4_internal
-@findex ucs_4be
-@findex ucs_4le
-@findex us_ascii
-@findex utf_16
-@findex utf_16be
-@findex utf_16le
-@findex utf_8
-@findex win_1250
-@findex win_1251
-@findex win_1252
-@findex win_1253
-@findex win_1254
-@findex win_1255
-@findex win_1256
-@findex win_1257
-@findex win_1258
-@*
-The following is the list of currently supported encodings. The first column
-corresponds to the encoding name, the second column is the list of aliases,
-the third column is its CES and CCS components names, and the fourth column
-is a short description.
-
-@multitable @columnfractions .20 .26 .24 .30
-@item
-Name
-@tab
-Aliases
-@tab
-CES/CCS
-@tab
-Short description
-@item
-@tab
-@tab
-@tab
-
-
-@item
-big5
-@tab
-csbig5, big_five, bigfive, cn_big5, cp950
-@tab
-table_pcs / big5, us_ascii 
-@tab
-The encoding for the Traditional Chinese.
-
-
-@item
-cp775
-@tab
-ibm775, cspc775baltic
-@tab
-table / cp775
-@tab
-The updated version of CP 437 that supports the balitic languages.
-
-
-@item
-cp850
-@tab
-ibm850, 850, cspc850multilingual
-@tab
-table / cp850
-@tab
-IBM 850 - the updated version of CP 437 where several Latin 1 characters have been
-added instead of some less-often used characters like the line-drawing
-and the greek ones.
-
-
-@item
-cp852
-@tab
-ibm852, 852, cspcp852
-@tab
-@tab
-IBM 852 - the updated version of CP 437 where several Latin 2 characters have been added
-instead of some less-often used characters like the line-drawing and the greek ones.
-
-
-@item
-cp855
-@tab
-ibm855, 855, csibm855
-@tab
-table / cp855
-@tab
-IBM 855 - the updated version of CP 437 that supports Cyrillic.
-
-
-@item
-cp866
-@tab
-866, IBM866, CSIBM866
-@tab
-table / cp866
-@tab
-IBM 866 - the updated version of CP 855 which follows more the logical Russian alphabet 
-ordering of the alternative variant that is preferred by many Russian users.
-
-
-@item
-euc_jp
-@tab
-eucjp
-@tab
-euc / jis_x0208_1990, jis_x0201_1976, jis_x0212_1990
-@tab
-EUC-JP - The EUC for Japanese.
-
-
-@item
-euc_kr
-@tab
-euckr
-@tab
-euc / ksx1001
-@tab
-EUC-KR - The EUC for Korean.
-
-
-@item
-euc_tw
-@tab
-euctw
-@tab
-euc / cns11643_plane1, cns11643_plane2, cns11643_plane14
-@tab
-EUC-TW - The EUC for Traditional Chinese.
-
-
-@item
-iso_8859_1
-@tab
-iso8859_1, iso88591, iso_8859_1:1987, iso_ir_100, latin1, l1, ibm819, cp819, csisolatin1
-@tab
-table / iso_8859_1
-@tab
-ISO 8859-1:1987 - Latin 1, West European.
-
-
-@item
-iso_8859_10
-@tab
-iso_8859_10:1992, iso_ir_157, iso885910, latin6, l6, csisolatin6, iso8859_10
-@tab
-table / iso_8859_10
-@tab
-ISO 8859-10:1992 - Latin 6, Nordic.
-
-
-@item
-iso_8859_11
-@tab
-iso8859_11, iso885911
-@tab
-table / iso_8859_11
-@tab
-ISO 8859-11 - Thai.
-
-
-@item
-iso_8859_13
-@tab
-iso_8859_13:1998, iso8859_13, iso885913
-@tab
-table / iso_8859_13
-@tab
-ISO 8859-13:1998 - Latin 7, Baltic Rim.
-
-
-@item
-iso_8859_14
-@tab
-iso_8859_14:1998, iso885914, iso8859_14
-@tab
-table / iso_8859_14
-@tab
-ISO 8859-14:1998 - Latin 8, Celtic.
-
-
-@item
-iso_8859_15
-@tab
-iso885915, iso_8859_15:1998, iso8859_15, 
-@tab
-table / iso_8859_15
-@tab
-ISO 8859-15:1998 - Latin 9, West Europe, successor of Latin 1.
-
-
-@item
-iso_8859_2
-@tab
-iso8859_2, iso88592, iso_8859_2:1987, iso_ir_101, latin2, l2, csisolatin2
-@tab
-table / iso_8859_2
-@tab
-ISO 8859-2:1987 - Latin 2, East European.
-
-
-@item
-iso_8859_3
-@tab
-iso_8859_3:1988, iso_ir_109, iso8859_3, latin3, l3, csisolatin3, iso88593
-@tab
-table / iso_8859_3
-@tab
-ISO 8859-3:1988 - Latin 3, South European.
-
-
-@item
-iso_8859_4
-@tab
-iso8859_4, iso88594, iso_8859_4:1988, iso_ir_110, latin4, l4, csisolatin4
-@tab
-table / iso_8859_4
-@tab
-ISO 8859-4:1988 - Latin 4, North European.
-
-
-@item
-iso_8859_5
-@tab
-iso8859_5, iso88595, iso_8859_5:1988, iso_ir_144, cyrillic, csisolatincyrillic
-@tab
-table / iso_8859_5
-@tab
-ISO 8859-5:1988 - Cyrillic.
-
-
-@item
-iso_8859_6
-@tab
-iso_8859_6:1987, iso_ir_127, iso8859_6, ecma_114, asmo_708, arabic, csisolatinarabic, iso88596
-@tab
-table / iso_8859_6
-@tab
-ISO i8859-6:1987 - Arabic.
-
-
-@item
-iso_8859_7
-@tab
-iso_8859_7:1987, iso_ir_126, iso8859_7, elot_928, ecma_118, greek, greek8, csisolatingreek, iso88597
-@tab
-table / iso_8859_7
-@tab
-ISO 8859-7:1987 - Greek.
-
-
-@item
-iso_8859_8
-@tab
-iso_8859_8:1988, iso_ir_138, iso8859_8, hebrew, csisolatinhebrew, iso88598
-@tab
-table / iso_8859_8
-@tab
-ISO 8859-8:1988 - Hebrew.
-
-
-@item
-iso_8859_9
-@tab
-iso_8859_9:1989, iso_ir_148, iso8859_9, latin5, l5, csisolatin5, iso88599
-@tab
-table / iso_8859_9
-@tab
-ISO 8859-9:1989 - Latin 5, Turkish.
-
-
-@item
-iso_ir_111
-@tab
-ecma_cyrillic, koi8_e, koi8e, csiso111ecmacyrillic
-@tab
-table / iso_ir_111
-@tab
-ISO IR 111/ECMA Cyrillic.
-
-
-@item
-koi8_r
-@tab
-cskoi8r, koi8r, koi8
-@tab
-table / koi8_r
-@tab
-RFC 1489 Cyrillic.
-
-
-@item
-koi8_ru
-@tab
-koi8ru
-@tab
-table / koi8_ru
-@tab
-The obsolete Ukrainian.
-
-
-@item
-koi8_u
-@tab
-koi8u
-@tab
-table / koi8_u
-@tab
-RFC 2319 Ukrainian.
-
-
-@item
-koi8_uni
-@tab
-koi8uni
-@tab
-table / koi8_uni
-@tab
-KOI8 Unified.
-
-
-@item
-ucs_2
-@tab
-ucs2, iso_10646_ucs_2, iso10646_ucs_2, iso_10646_ucs2, iso10646_ucs2, iso10646ucs2, csUnicode
-@tab
-ucs_2 / (UCS)
-@tab
-ISO-10646-UCS-2. Big Endian, NBSP is always interpreted as NBSP (BOM isn't supported).
-
-
-@item
-ucs_2_internal
-@tab
-ucs2_internal, ucs_2internal, ucs2internal
-@tab
-ucs_2_internal / (UCS)
-@tab
-ISO-10646-UCS-2 in system byte order.
-NBSP is always interpreted as NBSP (BOM isn't supported).
-
-
-@item
-ucs_2be
-@tab
-ucs2be
-@tab
-ucs_2 / (UCS)
-@tab
-Big Endian version of ISO-10646-UCS-2 (in fact, equivalent to ucs_2).
-Big Endian, NBSP is always interpreted as NBSP (BOM isn't supported).
-
-
-@item
-ucs_2le
-@tab
-ucs2le
-@tab
-ucs_2 / (UCS)
-@tab
-Little Endian version of ISO-10646-UCS-2.
-Little Endian, NBSP is always interpreted as NBSP (BOM isn't supported).
-
-
-@item
-ucs_4
-@tab
-ucs4, iso_10646_ucs_4, iso10646_ucs_4, iso_10646_ucs4, iso10646_ucs4, iso10646ucs4
-@tab
-ucs_4 / (UCS)
-@tab
-ISO-10646-UCS-4. Big Endian, NBSP is always interpreted as NBSP (BOM isn't supported).
-
-
-@item
-ucs_4_internal
-@tab
-ucs4_internal, ucs_4internal, ucs4internal
-@tab
-ucs_4_internal / (UCS)
-@tab
-ISO-10646-UCS-4 in system byte order.
-NBSP is always interpreted as NBSP (BOM isn't supported).
-
-
-@item
-ucs_4be
-@tab
-ucs4be
-@tab
-ucs_4 / (UCS)
-@tab
-Big Endian version of ISO-10646-UCS-4 (in fact, equivalent to ucs_4).
-Big Endian, NBSP is always interpreted as NBSP (BOM isn't supported).
-
-
-@item
-ucs_4le
-@tab
-ucs4le
-@tab
-ucs_4 / (UCS)
-@tab
-Little Endian version of ISO-10646-UCS-4.
-Little Endian, NBSP is always interpreted as NBSP (BOM isn't supported).
-
-
-@item
-us_ascii
-@tab
-ansi_x3.4_1968, ansi_x3.4_1986, iso_646.irv:1991, ascii, iso646_us, us, ibm367, cp367, csascii
-@tab
-us_ascii / (ASCII)
-@tab
-7-bit ASCII.
-
-
-@item
-utf_16
-@tab
-utf16
-@tab
-utf_16 / (UCS)
-@tab
-RFC 2781 UTF-16. The very first NBSP code in stream is interpreted as BOM.
-
-
-@item
-utf_16be
-@tab
-utf16be
-@tab
-utf_16 / (UCS)
-@tab
-Big Endian version of RFC 2781 UTF-16.
-NBSP is always interpreted as NBSP (BOM isn't supported).
-
-
-@item
-utf_16le
-@tab
-utf16le
-@tab
-utf_16 / (UCS)
-@tab
-Little Endian version of RFC 2781 UTF-16.
-NBSP is always interpreted as NBSP (BOM isn't supported).
-
-
-@item
-utf_8
-@tab
-utf8
-@tab
-utf_8 / (UCS)
-@tab
-RFC 3629 UTF-8.
-
-
-@item
-win_1250
-@tab
-cp1250
-@tab
-@tab
-Win-1250 Croatian.
-
-
-@item
-win_1251
-@tab
-cp1251
-@tab
-table / win_1251
-@tab
-Win-1251 - Cyrillic.
-
-
-@item
-win_1252
-@tab
-cp1252
-@tab
-table / win_1252
-@tab
-Win-1252 - Latin 1.
-
-
-@item
-win_1253
-@tab
-cp1253
-@tab
-table / win_1253
-@tab
-Win-1253 - Greek.
-
-
-@item
-win_1254
-@tab
-cp1254
-@tab
-table / win_1254
-@tab
-Win-1254 - Turkish.
-
-
-@item
-win_1255
-@tab
-cp1255
-@tab
-table / win_1255
-@tab
-Win-1255 - Hebrew.
-
-
-@item
-win_1256
-@tab
-cp1256
-@tab
-table / win_1256
-@tab
-Win-1256 - Arabic.
-
-
-@item
-win_1257
-@tab
-cp1257
-@tab
-table / win_1257
-@tab
-Win-1257 - Baltic.
-
-
-@item
-win_1258
-@tab
-cp1258
-@tab
-table / win_1258
-@tab
-Win-1258 - Vietnamese7 that supports Cyrillic.
-@end multitable
-
-
-
-
-
-@page
-@node iconv design decisions
-@section iconv design decisions
-@findex CCS table
-@findex CES converter
-@findex Speed-optimized tables
-@findex Size-optimized tables
-@*
-The first iconv library design issue arises when considering the
-following two design approaches:
-
-@enumerate
-@item
-Have modules which implement conversion from the encoding A to the encoding B
-and vice versa i.e., one conversion module relates to any two encodings.
-@item
-Have modules which implement conversion from the encoding A to the fixed
-encoding C and vice versa i.e., one conversion module relates to any
-one encoding A and one fixed encoding C. In this case, to convert from
-the encoding A to the encoding B, two modules are needed (in order to convert
-from A to C and then from C to B).
-@end enumerate
-
-@*
-It's obvious, that we have tradeoff between commonality/flexibility and
-efficiency: the first method is more efficient since it converts
-directly; however, it isn't so flexible since for each
-encoding pair a distinct module is needed.
-
-@*
-The Newlib iconv model uses the second method and always converts through the 32-bit
-UCS but its design also allows one to write specialized conversion
-modules if the conversion speed is critical.
-
-@*
-The second design issue is how to break down (decompose) encodings.
-The Newlib iconv library uses the fact that any encoding may be
-considered as one or more CCS plus a CES. It also decomposes its
-conversion modules on @dfn{CES converter} plus one or more @dfn{CCS
-tables}. CCS tables map CCS to UCS and vice versa; the CES converters
-map CCS to the encoding and vice versa.
-
-@*
-As the example, let's consider the conversion from the big5 encoding to
-the EUC-TW encoding. The big5 encoding may be decomposed to the ASCII and BIG5
-CCS-es plus the BIG5 CES. EUC-TW may be decomposed on the CNS11643_PLANE1, CNS11643_PLANE2,
-and CNS11643_PLANE14 CCS-es plus the EUC CES.
-
-@*
-The euc_jp -> big5 conversion is performed as follows:
-
-@enumerate
-@item
-The EUC converter performs the EUC-TW encoding to the corresponding CCS-es
-transformation (CNS11643_PLANE1, CNS11643_PLANE2 and CNS11643_PLANE14
-CCS-es);
-@item
-The obtained CCS codes are transformed to the UCS codes using the CNS11643_PLANE1,
-CNS11643_PLANE2 and CNS11643_PLANE14 CCS tables;
-@item
-The resulting UCS codes are transformed to the ASCII and BIG5 codes using
-the corresponding CCS tables;
-@item
-The obtained CCS codes are transformed to the big5 encoding using the corresponding
-CES converter.
-@end enumerate
-
-@*
-Analogously, the backward conversion is performed as follows:
-
-@enumerate
-@item
-The BIG5 converter performs the big5 encoding to the corresponding CCS-es transformation
-(the ASCII and BIG5 CCS-es);
-@item
-The obtained CCS codes are transformed to the UCS codes using the ASCII and BIG5 CCS tables;
-@item
-The resulting UCS codes are transformed to the ASCII and BIG5 codes using
-the corresponding CCS tables;
-@item
-The obtained CCS codes are transformed to the EUC-TW encoding using the corresponding
-CES converter.
-@end enumerate
-
-@*
-Note, the above is just an example and real names (which are implemented
-in the Newlib iconv) of the CES converters and the CCS tables are slightly different.
-
-@*
-The third design issue also relates to flexibility. Obviously, it isn't
-desirable to always link all the CES converters and the CCS tables to the library
-but instead, we want to be able to load the needed converters and tables
-dynamically on demand. This isn't a problem on "big" machines such as
-a PC, but it may be very problematical within "small" embedded systems.
-
-@*
-Since the CCS tables are just data, it is possible to load them
-dynamically from external files.  The CES converters, on the other hand
-are algorithms with some code so a dynamic library loading 
-capability is required.
-
-@*
-Apart from possible restrictions applied by embedded systems (small
-RAM for example), Newlib itself has no dynamic library support and
-therefore, all the CES converters which will ever be used must be linked into
-the library.   However, loading of the dynamic CCS tables is possible and is
-implemented in the Newlib iconv library.  It may be enabled via the Newlib
-configure script options.
-
-@*
-The next design issue is fine-tuning the iconv library
-configuration.  One important ability is for iconv to not link all it's
-converters and tables (if dynamic loading is not enabled) but instead,
-enable only those encodings which are specified at configuration
-time (see the section about the configure script options).
-
-@*
-In addition, the Newlib iconv library configure options distinguish between
-conversion directions. This means that not only are supported encodings
-selectable, the conversion direction is as well. For example, if user wants
-the configuration which allows conversions from UTF-8 to UTF-16 and
-doesn't plan using the "UTF-16 to UTF-8" conversions, he or she can 
-enable only
-this conversion direction (i.e., no "UTF-16 -> UTF-8"-related code will
-be included) thus, saving some memory (note, that such technique allows to
-exclude one half of a CCS table from linking which may be big enough).
-
-@*
-One more design aspect are the speed- and size- optimized tables. Users can
-select between them using configure script options. The
-speed-optimized CCS tables are the same as the size-optimized ones in
-case of 8-bit CCS (e.g.m KOI8-R), but for 16-bit CCS-es the size-optimized
-CCS tables may be 1.5 to 2 times less then the speed-optimized ones. On the
-other hand, conversion with speed tables is several times faster.
-
-@*
-Its worth to stress that the new encoding support can't be
-dynamically added into an already compiled Newlib library, even if it
-needs only an additional CCS table and iconv is configured to use
-the external files with CCS tables (this isn't the fundamental restriction
-and the possibility to add new Table-based encoding support dynamically, by
-means of just adding new .cct file, may be easily added).
-
-@*
-Theoretically, the compiled-in CCS tables should be more appropriate for
-embedded systems than dynamically loaded CCS tables.  This is because the compiled-in tables are read-only and can be placed in ROM
-whereas dynamic loading requires RAM.  Moreover, in the current iconv
-implementation, a distinct copy of the dynamic CCS file is loaded for each opened iconv descriptor even in case of the same encoding.
-This means, for example, that if two iconv descriptors for
-"KOI8-R -> UCS-4BE" and "KOI8-R -> UTF-16BE" are opened, two copies of
-koi8-r .cct file will be loaded (actually, iconv loads only the needed part
-of these files).  On the other hand, in the case of compiled-in CCS tables, there will always be only one copy.
-
-@page
-@node iconv configuration
-@section iconv configuration
-@findex iconv configuration
-@findex --enable-newlib-iconv-encodings
-@findex --enable-newlib-iconv-from-encodings
-@findex --enable-newlib-iconv-to-encodings
-@findex --enable-newlib-iconv-external-ccs
-@findex NLSPATH
-@*
-To enable an encoding, the @emph{--enable-newlib-iconv-encodings} configure
-script option should be used. This option accepts a comma-separated list
-of @emph{encodings} that should be enabled. The option enables each encoding in both
-("to" and "from") directions.
-
-@*
-The @option{--enable-newlib-iconv-from-encodings} configure script option enables
-"from" support for each encoding that was passed to it.
-
-@*
-The @option{--enable-newlib-iconv-to-encodings} configure script option enables
-"to" support for each encoding that was passed to it.
-
-@*
-Example: if user plans only the "KOI8-R -> UTF-8", "UTF-8 -> ISO-8859-5" and
-"KOI8-R -> UCS-2" conversions, the most optimal way (minimal iconv
-code and data will be linked) is to configure Newlib with the following
-options:
-@*
-@code{--enable-newlib-iconv-encodings=UTF-8
---enable-newlib-iconv-from-encodings=KOI8-R
---enable-newlib-iconv-to-encodings=UCS-2,ISO-8859-5}
-@*
-which is the same as
-@*
-@code{--enable-newlib-iconv-from-encodings=KOI8-R,UTF-8
---enable-newlib-iconv-to-encodings=UCS-2,ISO-8859-5,UTF-8}
-@*
-User may also just use the
-@*
-@code{--enable-newlib-iconv-encodings=KOI8-R,ISO-8859-5,UTF-8,UCS-2}
-@*
-configure script option, but it isn't so optimal since there will be
-some unneeded data and code.
-
-@*
-The @option{--enable-newlib-iconv-external-ccs} option enables iconv's
-capabilities to work with the external CCS files.
-
-@*
-The @option{--enable-target-optspace} Newlib configure script option also affects
-the iconv library. If this option is present, the library uses the size
-optimized CCS tables. This means, that only the size-optimized CCS
-tables will be linked or, if the
-@option{--enable-newlib-iconv-external-ccs} configure script option was used,
-the iconv library will load the size-optimized tables. If the
-@option{--enable-target-optspace}configure script option is disabled,
-the speed-optimized CCS tables are used.
-
-@*
-Note: .cct files are searched by iconv_open in the $NLSPATH/iconv_data/ directory.
-Thus, the NLSPATH environment variable should be set.
-
-
-
-
-
-@page
-@node Encoding names
-@section Encoding names
-@findex encoding name
-@findex encoding alias
-@findex normalized name
-@*
-Each encoding has one @dfn{name} and a number of @dfn{aliases}. When
-user works with the iconv library (i.e., when the @code{iconv_open} call
-is used) both name or aliases may be used. The same is when encoding
-names are used in configure script options.
-
-@*
-Names and aliases may be specified in any case (small or capital
-letters) and the @kbd{-} symbol is equivalent to the @kbd{_} symbol.
-Also, when working with the iconv library,
-
-@*
-Internally the Newlib iconv library always converts aliases to names. It
-also converts names and aliases in the @dfn{normalized} form which means
-that all capital letters are converted to small letters and the @kbd{-}
-symbols are converted to @kbd{_} symbols.
-
-
-
-
-@page
-@node CCS tables
-@section CCS tables
-@findex Size-optimized CCS table
-@findex Speed-optimized CCS table
-@findex mktbl.pl Perl script
-@findex .cct files
-@findex The CCT tables source files
-@findex CCS source files
-@*
-The iconv library stores files with CCS tables in the the @emph{ccs/}
-subdirectory. The CCS tables for any CCS may be kept in two forms - in the binary form
-(@dfn{.cct files}, see the @emph{ccs/binary/} subdirectory) and in form
-of compilable .c source files. The .cct files are only used when the
-@option{--enable-newlib-iconv-external-ccs} configure script option is enabled.
-The .c files are linked to the Newlib library if the corresponding
-encoding is enabled.
-
-@*
-As stated earlier, the Newlib iconv library performs all
-conversions through the 32-bit UCS, but the codes which are used
-in most CCS-es, fit into the first 16-bit subset of the 32-bit UCS set.
-Thus, in order to make the CCS tables more compact, the 16-bit UCS-2 is
-used instead of the 32-bit UCS-4.
-
-@*
-CCS tables may be 8- or 16-bit wide. 8-bit CCS tables map 8-bit CCS to
-16-bit UCS-2 and vice versa while 16-bit CCS tables map
-16-bit CCS to 16-bit UCS-2 and vice versa.
-8-bit tables are small (in size) while 16-bit tables may be big enough.
-Because of this, 16-bit CCS tables may be
-either speed- or size-optimized. Size-optimized CCS tables are
-smaller then speed-optimized ones, but the conversion process is
-slower if the size-optimized CCS tables are used. 8-bit CCS tables have only
-size-optimized variant.
-
-Each CCS table (both speed- and size-optimized) consists of
-@dfn{from_ucs} and @dfn{to_ucs} subtables. "from_ucs" subtable maps
-UCS-2 codes to CCS codes, while "to_ucs" subtable maps CCS codes to
-UCS-2 codes.
-
-@*
-Almost all 16-bit CCS tables contain less then 0xFFFF codes and
-a lot of gaps exist.
-
-@subsection Speed-optimized tables format
-@*
-In case of 8-bit speed-optimized CCS tables the "to_ucs" subtables format is
-trivial - it is just the array of 256 16-bit UCS codes. Therefore, an
-UCS-2 code @emph{Y} corresponding to a @emph{X} CCS code is calculates
-as @emph{Y = to_ucs[X]}.
-
-@*
-Obviously, the simplest way to create the "from_ucs" table or the
-16-bit "to_ucs" table is to use the huge 16-bit array like in case
-of the 8-bit "to_ucs" table. But almost all the 16-bit CCS tables contain
-less then 0xFFFF code maps and this fact may be exploited to reduce
-the size of the CCS tables.
-
-@*
-In this chapter the "UCS-2 -> CCS" 8-bit CCS table format is described. The
-16-bit "CCS -> UCS-2" CCS table format is the same, except the mapping
-direction and the CCS bits number.
-
-@*
-In case of the 8-bit speed-optimized table the "from_ucs" subtable
-corresponds the "from_ucs" array and has the following layout:
-
-@*
-from_ucs array:
-@*
--------------------------------------
-@*
-0xFF mapping (2 bytes) (only for
-8-bit table).
-@*
--------------------------------------
-@*
-Heading block
-@*
--------------------------------------
-@*
-Block 1
-@*
--------------------------------------
-@*
-Block 2
-@*
--------------------------------------
-@*
-  ...
-@*
--------------------------------------
-@*
-Block N
-@*
--------------------------------------
-
-@*
-The 0x0000-0xFFFF 16-bit code range is divided to 256 code subranges. Each
-subrange is represented by an 256-element @dfn{block} (256 1-byte
-elements or 256 2-byte element in case of 16-bit CCS table) with
-elements which are equivalent to the CCS codes of this subrange.
-If the "UCS-2 -> CCS" mapping has big enough gaps, some blocks will be
-absent and there will be less then 256 blocks.
-
-@*
-Any element number @emph{m} of @dfn{the heading block} (which contains
-256 2-byte elements) corresponds to the @emph{m}-th 256-element subrange.
-If the subrange contains some codes, the value of the @emph{m}-th element of
-the heading block contains the offset of the corresponding block in the
-"from_ucs" array. If there is no codes in the subrange, the heading
-block element contains 0xFFFF.
-
-@*
-If there are some gaps in a block, the corresponding block elements have
-the 0xFF value. If there is an 0xFF code present in the CCS, it's mapping
-is defined in the first 2-byte element of the "from_ucs" array.
-
-@*
-Having such a table format, the algorithm of searching the CCS code
-@emph{X} which corresponds to the UCS-2 code @emph{Y} is as follows.
-
-@*
-@enumerate
-@item If @emph{Y} is equivalent to the value of the first 2-byte element
-of the "from_ucs" array, @emph{X} is 0xFF. Else, continue to search.
-
-@item Calculate the block number: @emph{BlkN = (Y & 0xFF00) >> 8}.
-
-@item If the heading block element with number @emph{BlkN} is 0xFFFF, there
-is no corresponding CCS code (error, wrong input data). Else, fetch the
-"flom_ucs" array index of the @emph{BlkN}-th block.
-
-@item Calculate the offset of the @emph{X} code in its block: 
-@emph{Xindex = Y & 0xFF}
-
-@item If the @emph{Xintex}-th element of the block (which is equivalent to
-@emph{from_ucs[BlkN+Xindex]}) value is 0xFF, there is no corresponding
-CCS code (error, wrong input data). Else, @emph{X = from_ucs[BlkN+Xindex]}.
-@end enumerate
-
-@subsection Size-optimized tables format
-@*
-As it is stated above, size-optimized tables exist only for 16-bit CCS-es.
-This is because there is too small difference between the speed-optimized
-and the size-optimized table sizes in case of 8-bit CCS-es.
-
-@*
-Formats of the "to_ucs" and "from_ucs" subtables are equivalent in case of
-size-optimized tables.
-
-This sections describes the format of the "UCS-2 -> CCS" size-optimized
-CCS table. The format of "CCS -> UCS-2" table is the same.
-
-The idea of the size-optimized tables is to split the UCS-2 codes
-("from" codes) on @dfn{ranges} (@dfn{range} is a number of consecutive UCS-2 codes).
-Then CCS codes ("to" codes) are stored only for the codes from these
-ranges. Distinct "from" codes, which have no range (@dfn{unranged codes}, are stored
-together with the corresponding "to" codes.
-
-@*
-The following is the layout of the size-optimized table array:
-
-@*
-size_arr array:
-@*
--------------------------------------
-@*
-Ranges number (2 bytes)
-@*
--------------------------------------
-@*
-Unranged codes number (2 bytes)
-@*
--------------------------------------
-@*
-Unranged codes array index (2 bytes)
-@*
--------------------------------------
-@*
-Ranges indexes (triads)
-@*
--------------------------------------
-@*
-Ranges
-@*
--------------------------------------
-@*
-Unranged codes array
-@*
--------------------------------------
-
-@*
-The @dfn{Unranged codes array index} @emph{size_arr} section helps to find
-the offset of the needed range in the @emph{size_arr} and has
-the following format (triads):
-@*
-the first code in range, the last code in range, range offset.
-
-@*
-The array of these triads is sorted by the firs element, therefore it is
-possible to quickly find the needed range index.
-
-@*
-Each range has the corresponding sub-array containing the "to" codes. These
-sub-arrays are stored in the place marked as "Ranges" in the layout
-diagram. 
-
-@*
-The "Unranged codes array" contains pairs ("from" code, "to" code") for
-each unranged code. The array of these pairs is sorted by "from" code
-values, therefore it is possible to find the needed pair quickly.
-
-@*
-Note, that each range requires 6 bytes to form its index. If, for
-example, there are two ranges (1 - 5 and 9 - 10), and one unranged code
-(7), 12 bytes are needed for two range indexes and 4 bytes for the unranged
-code (total 16). But it is better to join both ranges as 1 - 10 and
-mark codes 6 and 8 as absent. In this case, only 6 additional bytes for the
-range index and 4 bytes to mark codes 6 and 8 as absent are needed
-(total 10 bytes). This optimization is done in the size-optimized tables.
-Thus, ranges may contain small gaps. The absent codes in ranges are marked
-as 0xFFFF.
-
-@*
-Note, a pair of "from" codes is stored by means of unranged codes since
-the number of bytes which are needed to form the range is greater than
-the number of bytes to store two unranged codes (5 against 4).
-
-@*
-The algorithm of searching of the CCS code
-@emph{X} which corresponds to the UCS-2 code @emph{Y} (input) in the "UCS-2 ->
-CCS" size-optimized table is as follows.
-
-@*
-@enumerate
-@item Try to find the corresponding triad in the "Unranged codes array
-index". Since we are searching in the sorted array, we can do it quickly
-(divide by 2, compare, etc).
-
-@item If the triad is found, fetch the @emph{X} code from the corresponding
-range array. If it is 0xFFFF, return an error.
-
-@item If there is no corresponding triad, search the @emph{X} code among the
-sorted unranged codes. Return error, if noting was found.
-@end enumerate
-
-@subsection .cct ant .c CCS Table files
-@*
-The .c source files for 8-bit CCS tables have "to_ucs" and "from_ucs"
-speed-optimized tables. The .c source files for 16-bit CCS tables have
-"to_ucs_speed", "to_ucs_size", "from_ucs_speed" and "from_ucs_size"
-tables.
-
-@*
-When .c files are compiled and used, all the 16-bit and 32-bit values
-have the native endian format (Big Endian for the BE systems and Little
-Endian for the LE systems) since they are compile for the system before
-they are used.
-
-@*
-In case of .cct files, which are intended for dynamic CCS tables
-loading, the CCS tables are stored either in LE or BE format. Since the
-.cct files are generated by the 'mktbl.pl' Perl script, it is possible
-to choose the endianess of the tables. It is also possible to store two
-copies (both LE and BE) of the CCS tables in one .cct file. The default
-.cct files (which come with the Newlib sources) have both LE and BE CCS
-tables. The Newlib iconv library automatically chooses the needed CCS tables
-(with appropriate endianess).
-
-@*
-Note, the .cct files are only used when the
-@option{--enable-newlib-iconv-external-ccs} is used.
-
-@subsection The 'mktbl.pl' Perl script
-@*
-The 'mktbl.pl' script is intended to generate .cct and .c CCS table
-files from the @dfn{CCS source files}.
-
-@*
-The CCS source files are just text files which has one or more colons
-with CCS <-> UCS-2 codes mapping. To see an example of the CCS table
-source files see one of them using URL-s which will be given bellow.
-
-@*
-The following table describes where the source files for CCS table files
-provided by the Newlib distribution are located.
-
-@multitable @columnfractions .25 .75
-@item
-Name
-@tab
-URL
-
-@item
-@tab
-
-@item
-big5
-@tab
-http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/OTHER/BIG5.TXT
-
-@item
-cns11643_plane1
-cns11643_plane14
-cns11643_plane2
-@tab
-http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/OTHER/CNS11643.TXT
-
-@item
-cp775
-cp850
-cp852
-cp855
-cp866
-@tab
-http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/
-
-@item
-iso_8859_1
-iso_8859_2
-iso_8859_3
-iso_8859_4
-iso_8859_5
-iso_8859_6
-iso_8859_7
-iso_8859_8
-iso_8859_9
-iso_8859_10
-iso_8859_11
-iso_8859_13
-iso_8859_14
-iso_8859_15
-@tab
-http://www.unicode.org/Public/MAPPINGS/ISO8859/
-
-@item
-iso_ir_111
-@tab
-http://crl.nmsu.edu/~mleisher/csets/ISOIR111.TXT
-
-@item
-jis_x0201_1976
-jis_x0208_1990
-jis_x0212_1990
-@tab
-http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0201.TXT
-
-@item
-koi8_r
-@tab
-http://www.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT
-
-@item
-koi8_ru
-@tab
-http://crl.nmsu.edu/~mleisher/csets/KOI8RU.TXT
-
-@item
-koi8_u
-@tab
-http://crl.nmsu.edu/~mleisher/csets/KOI8U.TXT
-
-@item
-koi8_uni
-@tab
-http://crl.nmsu.edu/~mleisher/csets/KOI8UNI.TXT
-
-@item
-ksx1001
-@tab
-http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/KSC/KSX1001.TXT
-
-@item
-win_1250
-win_1251
-win_1252
-win_1253
-win_1254
-win_1255
-win_1256
-win_1257
-win_1258
-@tab
-http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/
-@end multitable
-
-The CCS source files aren't distributed with Newlib because of License
-restrictions in most Unicode.org's files.
-
-The following are 'mktbl.pl' options which were used to generate .cct
-files. Note, to generate CCS tables source files @option{-s} option
-should be added.
-
-@enumerate
-@item For the iso_8859_10.cct, iso_8859_13.cct, iso_8859_14.cct, iso_8859_15.cct,
-iso_8859_1.cct, iso_8859_2.cct, iso_8859_3.cct, iso_8859_4.cct,
-iso_8859_5.cct, iso_8859_6.cct, iso_8859_7.cct, iso_8859_8.cct,
-iso_8859_9.cct, iso_8859_11.cct, win_1250.cct, win_1252.cct, win_1254.cct
-win_1256.cct, win_1258.cct, win_1251.cct,
-win_1253.cct, win_1255.cct, win_1257.cct,
-koi8_r.cct, koi8_ru.cct, koi8_u.cct, koi8_uni.cct, iso_ir_111.cct,
-big5.cct, cp775.cct, cp850.cct, cp852.cct, cp855.cct, cp866.cct, cns11643.cct
-files, only the @option{-i <SRC_FILE_NAME>} option were used.
-
-@item To generate the jis_x0208_1990.cct file, the
-@option{-i jis_x0208_1990.txt -x 2 -y 3} options were used.
-
-@item To generate the cns11643_plane1.cct file, the
-@option{-i cns11643.txt -p1 -N cns11643_plane1  -o cns11643_plane1.cct}
-options were used.
-
-@item To generate the cns11643_plane2.cct file, the
-@option{-i cns11643.txt -p2 -N cns11643_plane2  -o cns11643_plane2.cct}
-options were used.
-
-@item To generate the cns11643_plane14.cct file, the
-@option{-i cns11643.txt -p0xE -N cns11643_plane14  -o cns11643_plane14.cct}
-options were used.
-@end enumerate
-
-@*
-For more info about the 'mktbl.pl' options, see the 'mktbl.pl -h' output.
-
-@*
-It is assumed that CCS codes are 16 or less bits wide. If there are wider CCS codes
-in the CCS source file, the bits which are higher then 16 defines plane (see the
-cns11643.txt CCS source file).
-
-@*
-Sometimes, it is impossible to map some CCS codes to the 16-bit UCS if, for example,
-several different CCS codes are mapped to one UCS-2 code or one CCS code is mapped to
-the pair of UCS-2 codes. In these cases, such CCS codes (@dfn{lost
-codes}) aren't just rejected but instead, they are mapped to the default
-UCS-2 code (which is currently the @kbd{?} character's code).
-
-
-
-
-
-@page
-@node CES converters
-@section CES converters
-@findex PCS
-@*
-Similar to the CCS tables, CES converters are also split into "from UCS"
-and "to UCS" parts. Depending on the iconv library configuration, these
-parts are enabled or disabled. 
-
-@*
-The following it the list of CES converters which are currently present
-in the Newlib iconv library.
-
-@itemize @bullet
-@item
-@emph{euc} - supports the @emph{euc_jp}, @emph{euc_kr} and @emph{euc_tw}
-encodings. The @emph{euc} CES converter uses the @emph{table} and the
-@emph{us_ascii} CES converters.
-
-@item
-@emph{table} - this CES converter corresponds to "null" and just performs 
-tables-based conversion using 8- and 16-bit CCS tables. This converter
-is also used by any other CES converter which needs the CCS table-based
-conversions. The @emph{table} converter is also responsible for .cct files
-loading.
-
-@item
-@emph{table_pcs} - this is the wrapper over the @emph{table} converter
-which is intended for 16-bit encodings which also use the @dfn{Portable
-Character Set} (@dfn{PCS}) which is the same as the @emph{US-ASCII}.
-This means, that if the first byte the CCS code is in range of [0x00-0x7f],
-this is the 7-bit PCS code. Else, this is the 16-bit CCS code. Of course,
-the 16-bit codes must not contain bytes in the range of [0x00-0x7f].
-The @emph{big5} encoding uses the @emph{table_pcs} CES converter and the
-@emph{table_pcs} CES converter depends on the @emph{table} CES converter.
-
-@item
-@emph{ucs_2} - intended for the @emph{ucs_2}, @emph{ucs_2be} and
-@emph{ucs_2le} encodings support.
-
-@item
-@emph{ucs_4} - intended for the @emph{ucs_4}, @emph{ucs_4be} and
-@emph{ucs_4le} encodings support.
-
-@item
-@emph{ucs_2_internal} - intended for the @emph{ucs_2_internal} encoding support.
-
-@item
-@emph{ucs_4_internal} - intended for the @emph{ucs_4_internal} encoding support.
-
-@item
-@emph{us_ascii} - intended for the @emph{us_ascii} encoding support. In
-principle, the most natural way to support the @emph{us_ascii} encoding
-is to define the @emph{us_ascii} CCS and use the @emph{table} CES
-converter. But for the optimization purposes, the specialized
-@emph{us_ascii} CES converter was created.
-
-@item
-@emph{utf_16} - intended for the @emph{utf_16}, @emph{utf_16be} and
-@emph{utf_16le} encodings support.
-
-@item
-@emph{utf_8} - intended for the @emph{utf_8} encoding support.
-@end itemize
-
-
-
-
-
-@page
-@node The encodings description file
-@section The encodings description file
-@findex encoding.deps description file
-@findex mkdeps.pl Perl script
-@*
-To simplify the process of adding new encodings support allowing to
-automatically generate a lot of "glue" files.
-
-@*
-There is the 'encoding.deps' file in the @emph{lib/} subdirectory which
-is used to describe encoding's properties. The 'mkdeps.pl' Perl script
-uses 'encoding.deps' to generates the "glue" files.
-
-@*
-The 'encoding.deps' file is composed of sections, each section consists
-of entries, each entry contains some encoding/CES/CCS description. 
-
-@*
-The 'encoding.deps' file's syntax is very simple. Currently only two
-sections are defined: @emph{ENCODINGS} and @emph{CES_DEPENDENCIES}.
-
-@*
-Each @emph{ENCODINGS} section's entry describes one encoding and
-contains the following information.
-
-@itemize @bullet
-@item
-Encoding name (the @emph{ENCODING} field). The name should
-be unique and only one name is possible.
-
-@item
-The encoding's CES converter name (the @emph{CES} field). Only one CES
-converter is allowed.
-
-@item
-The whitespace-separated list of CCS table names which are used by the
-encoding (the @emph{CCS} field).
-
-@item
-The whitespace-separated list of aliases names (the @emph{ENCODING}
-field).
-@end itemize
-
-@*
-Note all names in the 'encoding.deps' file have to have the normalized
-form.
-
-@*
-Each @emph{CES_DEPENDENCIES} section's entry describes dependencies of
-one CES converted. For example, the @emph{euc} CES converter depends on
-the @emph{table} and the @emph{us_ascii} CES converter since the
-@emph{euc} CES converter uses them. This means, that both @emph{table}
-and @emph{us_ascii} CES converters should be linked if the @emph{euc}
-CES converter is enabled.
-
-@*
-The @emph{CES_DEPENDENCIES} section defines the following:
-
-@itemize @bullet
-@item
-the CES converter name for which the dependencies are defined in this
-entry (the @emph{CES} field);
-
-@item
-the whitespace-separated list of CES converters which are needed for
-this CES converter (the @emph{USED_CES} field).
-@end itemize
-
-@*
-The 'mktbl.pl' Perl script automatically solves the following tasks.
-
-@itemize @bullet
-@item
-User works with the iconv library in terms of encodings and doesn't know
-anything about CES converters and CCS tables. The script automatically
-generates code which enables all needed CES converters and CCS tables
-for all encodings, which were enabled by the user.
-
-@item
-The CES converters may have dependencies and the script automatically
-generates the code which handles these dependencies.
-
-@item
-The list of encoding's aliases is also automatically generated.
-
-@item
-The script uses a lot of macros in order to enable only the minimum set
-of code/data which is needed to support the requested encodings in the
-requested directions.
-@end itemize
-
-@*
-The 'mktbl.pl' Perl script is intended to interpret the 'encoding.deps'
-file and generates the following files.
-
-@itemize @bullet
-@item
-@emph{lib/encnames.h} - this header files contains macro definitions for all
-encoding names
-
-@item
-@emph{lib/aliasesbi.c} - the array of encoding names and aliases. The array
-is used to find the name of requested encoding by it's alias.
-
-@item
-@emph{ces/cesbi.c} - this file defines two arrays
-(@code{_iconv_from_ucs_ces} and @code{_iconv_to_ucs_ces}) which contain
-description of enabled "to UCS" and "from UCS" CES converters and the
-names of encodings which are supported by these CES converters.
-
-@item
-@emph{ces/cesbi.h} - this file contains the set of macros which defines
-the set of CES converters which should be enabled if only the set of
-enabled encodings is given (through macros defined in the
-@emph{newlib.h} file). Note, that one CES converter may handle several
-encodings.
-
-@item
-@emph{ces/cesdeps.h} - the CES converters dependencies are handled in
-this file.
-
-@item
-@emph{ccs/ccsdeps.h} - the array of linked-in CCS tables is defined
-here.
-
-@item
-@emph{ccs/ccsnames.h} - this header files contains macro definitions for all
-CCS names.
-
-@item
-@emph{encoding.aliases} - the list of supported encodings and their
-aliases which is intended for the Newlib configure scripts in order to
-handle the iconv-related configure script options.
-@end itemize
-
-
-
-
-
-@page
-@node How to add new encoding
-@section How to add new encoding
-@*
-At first, the new encoding should be broken down to CCS and CES. Then,
-the process of adding new encoding is split to the following activities.
-
-@enumerate
-@item Generate the .cct CCS file and the .c source file for the new
-encoding's CCS (if it isn't already present). To do this, the CCS source
-file should be had and the 'mktbl.pl' script should be used.
-
-@item Write the corresponding CES converter (if it isn't already
-present). Use the existing CES converters as an example.
-
-@item
-Add the corresponding entries to the 'encoding.deps' file and regenerate
-the autogenerated "glue" files using the 'mkdeps.pl' script.
-
-@item
-Don't forget to add entries to the newlib/newlib.hin file.
-
-@item
-Of course, the 'Makefile.am'-s should also be updated (if new files were
-added) and the 'Makefile.in'-s should be regenerated using the correct
-version of 'automake'.
-
-@item
-Don't forget to update the documentation (the list of
-supported encodings and CES converters).
-@end enumerate
-
-In case a new encoding doesn't fit to the CES/CCS decomposition model or
-it is desired to add the specialized (non UCS-based) conversion support,
-the Newlib iconv library code should be upgraded.
-
-
-
-
-
-@page
-@node The locale support interfaces
-@section The locale support interfaces
-@*
-The newlib iconv library also has some interface functions (besides the
-@code{iconv}, @code{iconv_open} and @code{iconv_close} interfaces) which
-are intended for the Locale subsystem. All the locale-related code is
-placed in the @emph{lib/iconvnls.c} file.
-
-@*
-The following is the description of the locale-related interfaces:
-
-@itemize @bullet
-@item
-@code{_iconv_nls_open} - opens two iconv descriptors for "CCS ->
-wchar_t" and "wchar_t -> CCS" conversions. The normalized CCS name is
-passed in the function parameters. The @emph{wchar_t} characters encoding is
-either ucs_2_internal or ucs_4_internal depending on size of
-@emph{wchar_t}.
-
-@item
-@code{_iconv_nls_conv} - the function is similar to the @code{iconv}
-functions, but if there is no character in the output encoding which
-corresponds to the character in the input encoding, the default
-conversion isn't performed (the @code{iconv} function sets such output
-characters to the @kbd{?} symbol and this is the behavior, which is
-specified in SUSv3).
-
-@item
-@code{_iconv_nls_get_state} - returns the current encoding's shift state
-(the @code{mbstate_t} object).
-
-@item
-@code{_iconv_nls_set_state} sets the current encoding's shift state (the
-@code{mbstate_t} object).
-
-@item
-@code{_iconv_nls_is_stateful} - checks whether the encoding is stateful
-or stateless.
-
-@item
-@code{_iconv_nls_get_mb_cur_max} - returns the maximum length (the
-maximum bytes number) of the encoding's characters.
-@end itemize
-
-
-
-
-@page
-@node Contact
-@section Contact
-@*
-The author of the original BSD iconv library (Alexander Chuguev) no longer
-supports that code.
-
-@*
-Any questions regarding the iconv library may be forwarded to
-Artem B. Bityuckiy (dedekind@@oktetlabs.ru or dedekind@@mail.ru) as
-well as to the public Newlib mailing list.
-
diff --git a/newlib/libc/iconv/lib/Makefile.am b/newlib/libc/iconv/lib/Makefile.am
deleted file mode 100644
index e138ddd..0000000
--- a/newlib/libc/iconv/lib/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-GENERAL_SOURCES = \
-aliasesi.c \
-ucsconv.c \
-nullconv.c \
-iconv.c \
-aliasesbi.c \
-iconvnls.c
-
-
-## The following interfaces are EL/IX level 2
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-LIB_OBJS = \
-aliasesi.$(oext) \
-ucsconv.$(oext) \
-nullconv.$(oext) \
-iconv.$(oext) \
-aliasesbi.$(oext) \
-iconvnls.$(oext)
-endif
-
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
-noinst_DATA =
-
-include $(srcdir)/../../../Makefile.shared
-
-CHEWOUT_FILES = iconv.def
-
-SUFFIXES = .def
-
-CHEW = ../../../doc/makedoc -f $(srcdir)/../../../doc/doc.str
-
-.c.def:
-	$(CHEW) < $< > $*.def 2> $*.ref
-	touch stmp-def
-
-doc: $(CHEWOUT_FILES)
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-
diff --git a/newlib/libc/iconv/lib/Makefile.in b/newlib/libc/iconv/lib/Makefile.in
deleted file mode 100644
index 7b9d597..0000000
--- a/newlib/libc/iconv/lib/Makefile.in
+++ /dev/null
@@ -1,364 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
-LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
-LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
-LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
-LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
-LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
-LIBC_SYS_LIB = @LIBC_SYS_LIB@
-LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-extra_dir = @extra_dir@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-GENERAL_SOURCES =  aliasesi.c ucsconv.c nullconv.c iconv.c aliasesbi.c iconvnls.c
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = aliasesi.$(oext) ucsconv.$(oext) nullconv.$(oext) iconv.$(oext) aliasesbi.$(oext) iconvnls.$(oext)
-
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
-noinst_DATA = 
-
-CHEWOUT_FILES = iconv.def
-
-SUFFIXES = .def
-
-CHEW = ../../../doc/makedoc -f $(srcdir)/../../../doc/doc.str
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_OBJECTS =  aliasesi.$(OBJEXT) ucsconv.$(OBJEXT) nullconv.$(OBJEXT) \
-iconv.$(OBJEXT) aliasesbi.$(OBJEXT) iconvnls.$(OBJEXT)
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus iconv/lib/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = iconv/lib
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-.c.def:
-	$(CHEW) < $< > $*.def 2> $*.ref
-	touch stmp-def
-
-doc: $(CHEWOUT_FILES)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/iconv/lib/aliasesbi.c b/newlib/libc/iconv/lib/aliasesbi.c
deleted file mode 100644
index 36c434e..0000000
--- a/newlib/libc/iconv/lib/aliasesbi.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * This file was automatically generated mkdeps.pl script. Don't edit.
- */
-
-#include <_ansi.h>
-#include "encnames.h"
-
-_CONST char *
-_iconv_aliases =
-{
-#if defined (_ICONV_FROM_ENCODING_BIG5) \
- || defined (_ICONV_TO_ENCODING_BIG5)
-  ICONV_ENCODING_BIG5 " csbig5 big_five bigfive cn_big5 cp950\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_CP775) \
- || defined (_ICONV_TO_ENCODING_CP775)
-  ICONV_ENCODING_CP775 " ibm775 cspc775baltic\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_CP850) \
- || defined (_ICONV_TO_ENCODING_CP850)
-  ICONV_ENCODING_CP850 " ibm850 850 cspc850multilingual\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_CP852) \
- || defined (_ICONV_TO_ENCODING_CP852)
-  ICONV_ENCODING_CP852 " ibm852 852 cspcp852\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_CP855) \
- || defined (_ICONV_TO_ENCODING_CP855)
-  ICONV_ENCODING_CP855 " ibm855 855 csibm855\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_CP866) \
- || defined (_ICONV_TO_ENCODING_CP866)
-  ICONV_ENCODING_CP866 " 866 IBM866 CSIBM866\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_EUC_JP) \
- || defined (_ICONV_TO_ENCODING_EUC_JP)
-  ICONV_ENCODING_EUC_JP " eucjp\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_EUC_KR) \
- || defined (_ICONV_TO_ENCODING_EUC_KR)
-  ICONV_ENCODING_EUC_KR " euckr\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_EUC_TW) \
- || defined (_ICONV_TO_ENCODING_EUC_TW)
-  ICONV_ENCODING_EUC_TW " euctw\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_1) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_1)
-  ICONV_ENCODING_ISO_8859_1 " iso8859_1 iso88591 iso_8859_1:1987 iso_ir_100 latin1 l1 ibm819 cp819 csisolatin1\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_10) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_10)
-  ICONV_ENCODING_ISO_8859_10 " iso_8859_10:1992 iso_ir_157 iso885910 latin6 l6 csisolatin6 iso8859_10\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_11) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_11)
-  ICONV_ENCODING_ISO_8859_11 " iso8859_11 iso885911\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_13) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_13)
-  ICONV_ENCODING_ISO_8859_13 " iso_8859_13:1998 iso8859_13 iso885913\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_14) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_14)
-  ICONV_ENCODING_ISO_8859_14 " iso_8859_14:1998 iso885914 iso8859_14\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_15) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_15)
-  ICONV_ENCODING_ISO_8859_15 " iso885915 iso_8859_15:1998 iso8859_15 \n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_2) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_2)
-  ICONV_ENCODING_ISO_8859_2 " iso8859_2 iso88592 iso_8859_2:1987 iso_ir_101 latin2 l2 csisolatin2\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_3) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_3)
-  ICONV_ENCODING_ISO_8859_3 " iso_8859_3:1988 iso_ir_109 iso8859_3 latin3 l3 csisolatin3 iso88593\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_4) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_4)
-  ICONV_ENCODING_ISO_8859_4 " iso8859_4 iso88594 iso_8859_4:1988 iso_ir_110 latin4 l4 csisolatin4\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_5) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_5)
-  ICONV_ENCODING_ISO_8859_5 " iso8859_5 iso88595 iso_8859_5:1988 iso_ir_144 cyrillic csisolatincyrillic\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_6) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_6)
-  ICONV_ENCODING_ISO_8859_6 " iso_8859_6:1987 iso_ir_127 iso8859_6 ecma_114 asmo_708 arabic csisolatinarabic iso88596\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_7) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_7)
-  ICONV_ENCODING_ISO_8859_7 " iso_8859_7:1987 iso_ir_126 iso8859_7 elot_928 ecma_118 greek greek8 csisolatingreek iso88597\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_8) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_8)
-  ICONV_ENCODING_ISO_8859_8 " iso_8859_8:1988 iso_ir_138 iso8859_8 hebrew csisolatinhebrew iso88598\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_8859_9) \
- || defined (_ICONV_TO_ENCODING_ISO_8859_9)
-  ICONV_ENCODING_ISO_8859_9 " iso_8859_9:1989 iso_ir_148 iso8859_9 latin5 l5 csisolatin5 iso88599\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_ISO_IR_111) \
- || defined (_ICONV_TO_ENCODING_ISO_IR_111)
-  ICONV_ENCODING_ISO_IR_111 " ecma_cyrillic koi8_e koi8e csiso111ecmacyrillic\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_KOI8_R) \
- || defined (_ICONV_TO_ENCODING_KOI8_R)
-  ICONV_ENCODING_KOI8_R " cskoi8r koi8r koi8\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_KOI8_RU) \
- || defined (_ICONV_TO_ENCODING_KOI8_RU)
-  ICONV_ENCODING_KOI8_RU " koi8ru\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_KOI8_U) \
- || defined (_ICONV_TO_ENCODING_KOI8_U)
-  ICONV_ENCODING_KOI8_U " koi8u\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_KOI8_UNI) \
- || defined (_ICONV_TO_ENCODING_KOI8_UNI)
-  ICONV_ENCODING_KOI8_UNI " koi8uni\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_UCS_2) \
- || defined (_ICONV_TO_ENCODING_UCS_2)
-  ICONV_ENCODING_UCS_2 " ucs2 iso_10646_ucs_2 iso10646_ucs_2 iso_10646_ucs2 iso10646_ucs2 iso10646ucs2 csUnicode\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_UCS_2_INTERNAL) \
- || defined (_ICONV_TO_ENCODING_UCS_2_INTERNAL)
-  ICONV_ENCODING_UCS_2_INTERNAL " ucs2_internal ucs_2internal ucs2internal\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_UCS_2BE) \
- || defined (_ICONV_TO_ENCODING_UCS_2BE)
-  ICONV_ENCODING_UCS_2BE " ucs2be\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_UCS_2LE) \
- || defined (_ICONV_TO_ENCODING_UCS_2LE)
-  ICONV_ENCODING_UCS_2LE " ucs2le\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_UCS_4) \
- || defined (_ICONV_TO_ENCODING_UCS_4)
-  ICONV_ENCODING_UCS_4 " ucs4 iso_10646_ucs_4 iso10646_ucs_4 iso_10646_ucs4 iso10646_ucs4 iso10646ucs4\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_UCS_4_INTERNAL) \
- || defined (_ICONV_TO_ENCODING_UCS_4_INTERNAL)
-  ICONV_ENCODING_UCS_4_INTERNAL " ucs4_internal ucs_4internal ucs4internal\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_UCS_4BE) \
- || defined (_ICONV_TO_ENCODING_UCS_4BE)
-  ICONV_ENCODING_UCS_4BE " ucs4be\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_UCS_4LE) \
- || defined (_ICONV_TO_ENCODING_UCS_4LE)
-  ICONV_ENCODING_UCS_4LE " ucs4le\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_US_ASCII) \
- || defined (_ICONV_TO_ENCODING_US_ASCII)
-  ICONV_ENCODING_US_ASCII " ansi_x3.4_1968 ansi_x3.4_1986 iso_646.irv:1991 ascii iso646_us us ibm367 cp367 csascii \n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_UTF_16) \
- || defined (_ICONV_TO_ENCODING_UTF_16)
-  ICONV_ENCODING_UTF_16 " utf16\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_UTF_16BE) \
- || defined (_ICONV_TO_ENCODING_UTF_16BE)
-  ICONV_ENCODING_UTF_16BE " utf16be\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_UTF_16LE) \
- || defined (_ICONV_TO_ENCODING_UTF_16LE)
-  ICONV_ENCODING_UTF_16LE " utf16le\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_UTF_8) \
- || defined (_ICONV_TO_ENCODING_UTF_8)
-  ICONV_ENCODING_UTF_8 " utf8\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_WIN_1250) \
- || defined (_ICONV_TO_ENCODING_WIN_1250)
-  ICONV_ENCODING_WIN_1250 " cp1250\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_WIN_1251) \
- || defined (_ICONV_TO_ENCODING_WIN_1251)
-  ICONV_ENCODING_WIN_1251 " cp1251\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_WIN_1252) \
- || defined (_ICONV_TO_ENCODING_WIN_1252)
-  ICONV_ENCODING_WIN_1252 " cp1252\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_WIN_1253) \
- || defined (_ICONV_TO_ENCODING_WIN_1253)
-  ICONV_ENCODING_WIN_1253 " cp1253\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_WIN_1254) \
- || defined (_ICONV_TO_ENCODING_WIN_1254)
-  ICONV_ENCODING_WIN_1254 " cp1254\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_WIN_1255) \
- || defined (_ICONV_TO_ENCODING_WIN_1255)
-  ICONV_ENCODING_WIN_1255 " cp1255\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_WIN_1256) \
- || defined (_ICONV_TO_ENCODING_WIN_1256)
-  ICONV_ENCODING_WIN_1256 " cp1256\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_WIN_1257) \
- || defined (_ICONV_TO_ENCODING_WIN_1257)
-  ICONV_ENCODING_WIN_1257 " cp1257\n"
-#endif
-#if defined (_ICONV_FROM_ENCODING_WIN_1258) \
- || defined (_ICONV_TO_ENCODING_WIN_1258)
-  ICONV_ENCODING_WIN_1258 " cp1258\n"
-#endif
-  ""
-};
-
diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c
deleted file mode 100644
index f94ac8f..0000000
--- a/newlib/libc/iconv/lib/aliasesi.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include <_ansi.h>
-#include <reent.h>
-#include <newlib.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <ctype.h>
-#include <sys/iconvnls.h>
-#include "local.h"
-
-/*
- * strnstr - locate a substring in a fixed-size string.
- *
- * PARAMETERS:
- *   _CONST char *haystack - the string in which to search.
- *   _CONST char *needle   - the string which to search.
- *   int length            - the maximum 'haystack' string length.
- *
- * DESCRIPTION:
- *   The  strstr() function finds the first occurrence of the substring 
- *   'needle' in the string 'haystack'. At most 'length' bytes are searched.
- *
- * RETURN:
- *   Returns a pointer to the beginning of substring, or NULL if substring
- *   was not found.
- */
-static char *
-_DEFUN(strnstr, (haystack, needle, length),
-                _CONST char *haystack _AND
-                _CONST char *needle   _AND
-                int length)
-{
-  _CONST char *max = haystack + length;
-
-  if (*haystack == '\0')
-    return *needle == '\0' ? (char *)haystack : (char *)NULL;
-
-  while (haystack < max)
-    {
-      int i = 0;
-      while (1)
-        {
-          if (needle[i] == '\0')
-            return (char *)haystack;
-          if (needle[i] != haystack[i])
-            break;
-          i += 1;
-        }
-      haystack += 1;
-    }
-  return (char *)NULL;
-}
-
-/*
- * canonical_form - canonize 'str'.
- *
- * PARAMETERS:
- *   struct _reent *rptr - reent structure of current thread/process.
- *   _CONST char *str    - string to canonize. 
- *
- * DESCRIPTION:
- *   Converts all letters to small and substitute all '-' characters by '_'
- *   characters.
- *
- * RETURN:
- *   Returns canonical form of 'str' if success, NULL if failure.
- */
-static _CONST char *
-_DEFUN(canonical_form, (rptr, str), 
-                       struct _reent *rptr _AND
-                       _CONST char *str)
-{
-  char *p, *p1;
-
-  if (str == NULL || (p = p1 = _strdup_r (rptr, str)) == NULL)
-    return (_CONST char *)NULL;
-
-  for (; *str; str++, p++)
-    {
-      if (*str == '-')
-        *p = '_';
-      else
-        *p = tolower (*str);
-    }
-
-  return (_CONST char *)p1;
-}
-
-/*
- * find_alias - find encoding name name by it's alias. 
- *
- * PARAMETERS:
- *   struct _reent *rptr - reent structure of current thread/process.
- *   _CONST char *alias  - alias by which "official" name should be found.
- *   _CONST char *table  - aliases table.
- *   int len             - aliases table length.
- *
- * DESCRIPTION:
- *   'table' contains the list of encoding names and aliases. 
- *    Names go first, e.g.:
- *
- *   name1 alias11 alias12 alias1N
- *   name2 alias21 alias22 alias2N
- *   nameM aliasM1 aliasM2 aliasMN
- *
- *   If line begins with backspace it is considered as the continuation of
- *   previous line.
- *
- * RETURN:
- *   Returns pointer to name found if success. In case of error returns NULL
- *   and sets current thread's/process's errno.
- */
-static char *
-_DEFUN(find_alias, (rptr, alias, table, len),
-                   struct _reent *rptr _AND
-                   _CONST char *alias  _AND
-                   _CONST char *table  _AND
-                   int len)
-{
-  _CONST char *end;
-  _CONST char *p;
-  int l = strlen (alias);
-  _CONST char *ptable = table;
-  _CONST char *table_end = table + len;
-
-  if (table == NULL || alias == NULL || *table == '\0' || *alias == '\0')
-    return NULL;
-
-search_again:
-  if (len < l || (p = strnstr (ptable, alias, len)) == NULL)
-    return NULL;
-  
-  /* Check that substring is segregated by '\n', '\t' or ' ' */
-  if (!((p == table || isspace (*(p-1)) || *(p-1) == '\n')
-     && (p+l == table_end || isspace (*(p+l)) || *(p+l) == '\n')))
-    {
-      ptable = p + l;
-      len -= table - p;
-      goto search_again;
-    }
-
-  while(--p > table && *p != '\n');
-
-  if (*(++p) == '#')
-    return NULL;
-
-  for (end = p + 1; !isspace (*end) && *end != '\n' && *end != '\0'; end++);
-
-  return _strndup_r (rptr, p, (size_t)(end - p));
-}
-
-/*
- * _iconv_resolve_encoding_name - resolves encoding's name by given alias. 
- *
- * PARAMETERS:
- *   struct _reent *rptr - reent structure of current thread/process.
- *   _CONST char *ca     - encoding alias to resolve.
- *
- * DESCRIPTION: 
- *   First, tries to find 'ca' among built-in aliases. If not found, tries to 
- *   find it external file.
- *
- * RETURN:
- *   Encoding name if found. In case of error returns NULL
- *   and sets current thread's/process's errno.
- */
-char *
-_DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path), 
-                                     struct _reent *rptr _AND
-                                     _CONST char *ca)
-{
-  char *p = (char *)ca;
-
-  /* Alias shouldn't contain white spaces, '\n' and '\r' symbols */ 
-  while (*p)
-    if (*p == ' ' || *p == '\r' || *p++ == '\n')
-      return NULL;
-    
-  if ((ca = canonical_form (rptr, ca)) == NULL)
-    return NULL;
-
-  p = find_alias (rptr, ca, _iconv_aliases, strlen (_iconv_aliases));
-  
-  _free_r (rptr, (_VOID_PTR)ca);
-  return p;
-}
-
diff --git a/newlib/libc/iconv/lib/conv.h b/newlib/libc/iconv/lib/conv.h
deleted file mode 100644
index 03c7c11..0000000
--- a/newlib/libc/iconv/lib/conv.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef __ICONV_CONVERSION_H__
-#define __ICONV_CONVERSION_H__
-
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/types.h>
-#include <wchar.h>
-
-/* Bits for 'flags' parameter of 'convert' call */
-#define ICONV_DONT_SAVE_BIT 1
-#define ICONV_FAIL_BIT      2
-
-/*
- * iconv_conversion_handlers_t - keeps iconv conversion handlers.
- *
- * Keeps 6 interface function handlers:
- * open(), close(), convert(), get_mb_cur_max(), get_state(), set_state(),
- * get_mb_cur_max() and is_stateful(). Last 5 interface functions are needed to
- * support locale subsystem.
- *
- * ============================================================================
- */
-typedef struct
-{
-  /*
-   * open - open and initialize conversion.
-   *
-   * PARAMETERS:
-   *   struct _reent *rptr - reent structure of current thread/process;
-   *   _CONST char *to     - output encoding's normalized name;
-   *   _CONST char *from   - input encoding's normalized name.
-   * 
-   * DESCRIPTION:
-   *   This function is called from iconv_open() to open conversion. Returns
-   *   a pointer to conversion-specific data.
-   *
-   * RETURN:
-   *   Pointer to conversion-specific data if success. In case of error
-   *   returns NULL and sets current thread's/process's errno.
-   */
-  _VOID_PTR _EXPARM(open, (struct _reent *rptr,
-                          _CONST char *to,
-                          _CONST char *from));
-  
-  /*
-   * close - close conversion.
-   *
-   * PARAMETRS:
-   *   struct _reent *rptr - reent structure of current thread/process;
-   *   _VOID_PTR data      - conversion-specific data.
-   *
-   * DESCRIPTION:
-   *   This function is called from iconv_close() to close conversion.
-   *
-   * RETURN:
-   *   When successful, returns (size_t)0. In case of error, sets current
-   *   thread's/process's errno and returns (size_t)-1 (same as iconv_open()).
-   */
-  size_t _EXPARM(close, (struct _reent *rptr,
-                        _VOID_PTR data));
-  
-  /* convert - perform encoding conversion.
-   *
-   * PARAMETERS:
-   *   struct _reent *rptr - reent structure of current thread/process.
-   *   _VOID_PTR data      - conversion-specific data;
-   *   _CONST unsigned char **inbuf - input data buffer;
-   *   size_t *inbytesleft          - input buffer's length;
-   *   unsigned char **outbuf       - output data buffer;
-   *   size_t *outbytesleft         - output buffer free space;
-   *   int flags                    - conversion options.
-   *
-   * DESCRIPTION:
-   *   This function is called from iconv() to perform conversion and, if 'flags'
-   *   is 0, behaves similarly to iconv(). 'inbuf', 'inbytesleft', 'outbuf' and
-   *   'outbytesleft' are same as in case of iconv() function.
-   *
-   *   When flags & 1 isn't 0, 'outbuf' value is ignored and result isn't saved.
-   *   Another conversion aspects aren't changed.
-   *
-   *   When flags & 2 isn't 0, function changes it's behavior in situations,
-   *   when there is no character in "to" encoding that corresponds to valid
-   *   character from "from" encoding. iconv() specification stands to perform
-   *   implimentation-spacific default conversion. If flag & 2 isn't 0,
-   *   function generates error.
-   *
-   * RETURN:
-   *   Returns the number of characters converted in a non-reversible way.
-   *   Reversible conversions are not counted. In case of error, sets current
-   *   thread's/process's errno and returns (size_t)-1 (same as iconv()).
-   */
-  size_t _EXPARM(convert, (struct _reent *rptr,
-                           _VOID_PTR data,
-                           _CONST unsigned char **inbuf,
-                           size_t *inbytesleft,
-                           unsigned char **outbuf,
-                           size_t *outbytesleft,
-                           int flags));
-  
-  /*
-   * get_state - get current shift state.
-   *
-   * PARAMETERS:
-   *   _VOID_PTR data   - conversion-specific data;
-   *   mbstate_t *state - mbstate_t object where shift state will be written;
-   *   int direction      - 0-"from", 1-"to".
-   *
-   * DESCRIPTION:
-   *   Returns encoding's current shift sequence.
-   *   If 'direction' is 0, "from" encoding is tested, else
-   *   "to" encoding is tested.
-   */
-  _VOID _EXPARM(get_state, (_VOID_PTR data,
-                           mbstate_t *state,
-                           int direction));
-
-  /*
-   * set_state - set shift state.
-   *
-   * PARAMETERS:
-   *   _VOID_PTR data   - conversion-specific data;
-   *   mbstate_t *state - mbstate_t object to which shift state will be set.
-   *   int direction     - 0-"from", 1-"to".
-   *
-   * DESCRIPTION:
-   *   Sets encoding's current shift state to 'state'. if 'state'
-   *   object is zero-object - reset current shift state.
-   *   If 'direction' is 0, "from" encoding is set, else
-   *   "to" encoding is set.
-   *   Returns 0 if '*state' object has right format, -1 else.
-   */
-  int _EXPARM(set_state, (_VOID_PTR data,
-                         mbstate_t *state,
-                         int direction));
-  
-  /*
-   * get_mb_cur_max - get maximum character length in bytes.
-   *
-   * PARAMETERS:
-   *   _VOID_PTR data     - conversion-specific data;
-   *   int direction      - 0-"from", 1-"to".
-   *
-   * DESCRIPTION:
-   *   Returns encoding's maximum character length.
-   *   If 'direction' is 0, "from" encoding is tested, else
-   *   "to" encoding is tested.
-   */
-  int _EXPARM(get_mb_cur_max, (_VOID_PTR data,
-                              int direction));
-  
-  /*
-   * is_stateful - is encoding stateful or stateless.
-   *
-   * PARAMETERS:
-   *   _VOID_PTR data - conversion-specific data;
-   *   int direction  - 0-"from", 1-"to".
-   *
-   * DESCRIPTION:
-   *   Returns 0 if encoding is stateless and 1 if stateful.
-   *   If 'direction' is 0, "from" encoding is tested, else
-   *   "to" encoding is tested.
-   */
-  int _EXPARM(is_stateful, (_VOID_PTR data,
-                           int direction));
-  
-} iconv_conversion_handlers_t;
-
-
-/*
- * iconv_conversion_t - iconv conversion definition structure.
- *
- * ============================================================================
- */
-typedef struct
-{
-  /* Iconv conversion handlers. */
-  _CONST iconv_conversion_handlers_t *handlers;
-  
-  /*
-   * Conversion-specific data (e.g., points to iconv_ucs_conversion_t
-   * object if UCS-based conversion is used).
-   */
-  _VOID_PTR data;
-} iconv_conversion_t;
-
-
-/* UCS-based conversion handlers */
-extern _CONST iconv_conversion_handlers_t
-_iconv_ucs_conversion_handlers;
-
-/* Null conversion handlers */
-extern _CONST iconv_conversion_handlers_t
-_iconv_null_conversion_handlers;
-
-#endif /* !__ICONV_CONVERSION_H__ */
-
diff --git a/newlib/libc/iconv/lib/encnames.h b/newlib/libc/iconv/lib/encnames.h
deleted file mode 100644
index 9ca16ad..0000000
--- a/newlib/libc/iconv/lib/encnames.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * This file was automatically generated mkdeps.pl script. Don't edit.
- */
-
-#ifndef __ENCNAMES_H__
-#define __ENCNAMES_H__
-
-/*
- * Encodings name macros.
- */
-#define ICONV_ENCODING_BIG5 "big5"
-#define ICONV_ENCODING_CP775 "cp775"
-#define ICONV_ENCODING_CP850 "cp850"
-#define ICONV_ENCODING_CP852 "cp852"
-#define ICONV_ENCODING_CP855 "cp855"
-#define ICONV_ENCODING_CP866 "cp866"
-#define ICONV_ENCODING_EUC_JP "euc_jp"
-#define ICONV_ENCODING_EUC_KR "euc_kr"
-#define ICONV_ENCODING_EUC_TW "euc_tw"
-#define ICONV_ENCODING_ISO_8859_1 "iso_8859_1"
-#define ICONV_ENCODING_ISO_8859_10 "iso_8859_10"
-#define ICONV_ENCODING_ISO_8859_11 "iso_8859_11"
-#define ICONV_ENCODING_ISO_8859_13 "iso_8859_13"
-#define ICONV_ENCODING_ISO_8859_14 "iso_8859_14"
-#define ICONV_ENCODING_ISO_8859_15 "iso_8859_15"
-#define ICONV_ENCODING_ISO_8859_2 "iso_8859_2"
-#define ICONV_ENCODING_ISO_8859_3 "iso_8859_3"
-#define ICONV_ENCODING_ISO_8859_4 "iso_8859_4"
-#define ICONV_ENCODING_ISO_8859_5 "iso_8859_5"
-#define ICONV_ENCODING_ISO_8859_6 "iso_8859_6"
-#define ICONV_ENCODING_ISO_8859_7 "iso_8859_7"
-#define ICONV_ENCODING_ISO_8859_8 "iso_8859_8"
-#define ICONV_ENCODING_ISO_8859_9 "iso_8859_9"
-#define ICONV_ENCODING_ISO_IR_111 "iso_ir_111"
-#define ICONV_ENCODING_KOI8_R "koi8_r"
-#define ICONV_ENCODING_KOI8_RU "koi8_ru"
-#define ICONV_ENCODING_KOI8_U "koi8_u"
-#define ICONV_ENCODING_KOI8_UNI "koi8_uni"
-#define ICONV_ENCODING_UCS_2 "ucs_2"
-#define ICONV_ENCODING_UCS_2_INTERNAL "ucs_2_internal"
-#define ICONV_ENCODING_UCS_2BE "ucs_2be"
-#define ICONV_ENCODING_UCS_2LE "ucs_2le"
-#define ICONV_ENCODING_UCS_4 "ucs_4"
-#define ICONV_ENCODING_UCS_4_INTERNAL "ucs_4_internal"
-#define ICONV_ENCODING_UCS_4BE "ucs_4be"
-#define ICONV_ENCODING_UCS_4LE "ucs_4le"
-#define ICONV_ENCODING_US_ASCII "us_ascii"
-#define ICONV_ENCODING_UTF_16 "utf_16"
-#define ICONV_ENCODING_UTF_16BE "utf_16be"
-#define ICONV_ENCODING_UTF_16LE "utf_16le"
-#define ICONV_ENCODING_UTF_8 "utf_8"
-#define ICONV_ENCODING_WIN_1250 "win_1250"
-#define ICONV_ENCODING_WIN_1251 "win_1251"
-#define ICONV_ENCODING_WIN_1252 "win_1252"
-#define ICONV_ENCODING_WIN_1253 "win_1253"
-#define ICONV_ENCODING_WIN_1254 "win_1254"
-#define ICONV_ENCODING_WIN_1255 "win_1255"
-#define ICONV_ENCODING_WIN_1256 "win_1256"
-#define ICONV_ENCODING_WIN_1257 "win_1257"
-#define ICONV_ENCODING_WIN_1258 "win_1258"
-
-#endif /* !__ENCNAMES_H__ */
-
diff --git a/newlib/libc/iconv/lib/encoding.deps b/newlib/libc/iconv/lib/encoding.deps
deleted file mode 100644
index 280cffd..0000000
--- a/newlib/libc/iconv/lib/encoding.deps
+++ /dev/null
@@ -1,441 +0,0 @@
-#
-# This file describes dependencies between encodings, CES, CCS, etc.
-# File relates only to UCS-based conversions and is needed for automatic
-# generation of C source files and C header files.
-#
-# This configuration file consists of sections, each section consists of
-# entries.
-#
-# Use only normalized names.
-#
-
-#
-# The first section named "ENCODINGS" describes:
-# 1. CES converter corresponding for each enoding;
-# 2. Each encoding's aliases;
-# 3. CCS tables corresponding for each enoding.
-#
-SECTION ENCODINGS
-
-# ISO-10646-UCS-2. Big Endian, NBSP is always interpreted as NBSP (BOM isn't supported).
-ENTRY
-ENCODING: ucs_2
-CES: ucs_2
-ALIASES: ucs2 iso_10646_ucs_2 iso10646_ucs_2 iso_10646_ucs2 iso10646_ucs2 iso10646ucs2 csUnicode
-ENTRY END
-
-# Big Endian version of ISO-10646-UCS-2 (in fact, equivalent to ucs_2).
-# Big Endian, NBSP is always interpreted as NBSP (BOM isn't supported).
-ENTRY
-ENCODING: ucs_2be
-CES: ucs_2
-ALIASES: ucs2be
-ENTRY END
-
-# Little Endian version of ISO-10646-UCS-2.
-# Little Endian, NBSP is always interpreted as NBSP (BOM isn't supported).
-ENTRY
-ENCODING: ucs_2le
-CES: ucs_2
-ALIASES: ucs2le
-ENTRY END
-
-# ISO-10646-UCS-2 in system byte order.
-# NBSP is always interpreted as NBSP (BOM isn't supported).
-# NOTE: Dont delete and rename this since it is used as widechar's
-# encoding when sizeof(wchar_t) == 2
-ENTRY
-ENCODING: ucs_2_internal
-CES: ucs_2_internal
-ALIASES: ucs2_internal ucs_2internal ucs2internal
-ENTRY END
-
-# ISO-10646-UCS-4. Big Endian, NBSP is always interpreted as NBSP (BOM isn't supported).
-ENTRY
-ENCODING: ucs_4
-CES: ucs_4
-ALIASES: ucs4 iso_10646_ucs_4 iso10646_ucs_4 iso_10646_ucs4 iso10646_ucs4 iso10646ucs4
-ENTRY END
-
-# Big Endian version of ISO-10646-UCS-4 (in fact, equivalent to ucs_4).
-# Big Endian, NBSP is always interpreted as NBSP (BOM isn't supported).
-ENTRY
-ENCODING: ucs_4be
-CES: ucs_4
-ALIASES: ucs4be
-ENTRY END
-
-# Little Endian version of ISO-10646-UCS-4.
-# Little Endian, NBSP is always interpreted as NBSP (BOM isn't supported).
-ENTRY
-ENCODING: ucs_4le
-CES: ucs_4
-ALIASES: ucs4le
-ENTRY END
-
-# ISO-10646-UCS-4 in system byte order.
-# NBSP is always interpreted as NBSP (BOM isn't supported).
-# NOTE: Dont delete and rename this since it is used as widechar's
-# encoding when sizeof(wchar_t) == 4
-ENTRY
-ENCODING: ucs_4_internal
-CES: ucs_4_internal
-ALIASES: ucs4_internal ucs_4internal ucs4internal
-ENTRY END
-
-# RFC 3629 UTF-8
-ENTRY
-ENCODING: utf_8
-CES: utf_8
-ALIASES: utf8
-ENTRY END
-
-# RFC 2781 UTF-16. The very first NBSP code in stream is interpreted as BOM.
-ENTRY
-ENCODING: utf_16
-CES: utf_16
-ALIASES: utf16
-ENTRY END
-
-# Big Endian version of RFC 2781 UTF-16.
-# NBSP is always interpreted as NBSP (BOM isn't supported).
-ENTRY
-ENCODING: utf_16be
-CES: utf_16
-ALIASES: utf16be
-ENTRY END
-
-# Little Endian version of RFC 2781 UTF-16.
-# NBSP is always interpreted as NBSP (BOM isn't supported).
-ENTRY
-ENCODING: utf_16le
-CES: utf_16
-ALIASES: utf16le
-ENTRY END
-
-# 7-bit ASCII.
-ENTRY
-ENCODING: us_ascii
-CES: us_ascii
-ALIASES: ansi_x3.4_1968 ansi_x3.4_1986 iso_646.irv:1991 ascii iso646_us us ibm367 cp367 csascii 
-ENTRY END
-
-# RFC 1489 Cyrillic
-ENTRY
-ENCODING: koi8_r
-CES: table
-CCS: koi8_r
-ALIASES: cskoi8r koi8r koi8
-ENTRY END
-
-# Obsoleted Ukrainian
-ENTRY
-ENCODING: koi8_ru
-CES: table
-CCS: koi8_ru
-ALIASES: koi8ru
-ENTRY END
-
-# RFC 2319 Ukrainian
-ENTRY
-ENCODING: koi8_u
-CES: table
-CCS: koi8_u
-ALIASES: koi8u
-ENTRY END
-
-# KOI8 Unified
-ENTRY
-ENCODING: koi8_uni
-CES: table
-CCS: koi8_uni
-ALIASES: koi8uni
-ENTRY END
-
-# ISO IR 111/ECMA Cyrillic.
-ENTRY
-ENCODING: iso_ir_111
-CES: table
-CCS: iso_ir_111
-ALIASES: ecma_cyrillic koi8_e koi8e csiso111ecmacyrillic
-ENTRY END
-
-# ISO 8859-1:1987 - Latin 1, West European
-ENTRY
-ENCODING: iso_8859_1
-CES: table
-CCS: iso_8859_1
-ALIASES: iso8859_1 iso88591 iso_8859_1:1987 iso_ir_100 latin1 l1 ibm819 cp819 csisolatin1
-ENTRY END
-
-# ISO 8859-2:1987 - Latin 2, East European
-ENTRY
-ENCODING: iso_8859_2
-CES: table
-CCS: iso_8859_2
-ALIASES: iso8859_2 iso88592 iso_8859_2:1987 iso_ir_101 latin2 l2 csisolatin2
-ENTRY END
-
-# ISO 8859-3:1988 - Latin 3, South European
-ENTRY
-ENCODING: iso_8859_3
-CES: table
-CCS: iso_8859_3
-ALIASES: iso_8859_3:1988 iso_ir_109 iso8859_3 latin3 l3 csisolatin3 iso88593
-ENTRY END
-
-# ISO 8859-4:1988 - Latin 4, North European
-ENTRY
-ENCODING: iso_8859_4
-CES: table
-CCS: iso_8859_4
-ALIASES: iso8859_4 iso88594 iso_8859_4:1988 iso_ir_110 latin4 l4 csisolatin4
-ENTRY END
-
-# ISO 8859-5:1988 - Cyrillic
-ENTRY
-ENCODING: iso_8859_5
-CES: table
-CCS: iso_8859_5
-ALIASES: iso8859_5 iso88595 iso_8859_5:1988 iso_ir_144 cyrillic csisolatincyrillic
-ENTRY END
-
-# ISO i8859-6:1987 - Arabic
-ENTRY
-ENCODING: iso_8859_6
-CES: table
-CCS: iso_8859_6
-ALIASES: iso_8859_6:1987 iso_ir_127 iso8859_6 ecma_114 asmo_708 arabic csisolatinarabic iso88596
-ENTRY END
-
-# ISO 8859-7:1987 - Greek
-ENTRY
-ENCODING: iso_8859_7
-CES: table
-CCS: iso_8859_7
-ALIASES: iso_8859_7:1987 iso_ir_126 iso8859_7 elot_928 ecma_118 greek greek8 csisolatingreek iso88597
-ENTRY END
-
-# ISO 8859-8:1988 - Hebrew
-ENTRY
-ENCODING: iso_8859_8
-CES: table
-CCS: iso_8859_8
-ALIASES: iso_8859_8:1988 iso_ir_138 iso8859_8 hebrew csisolatinhebrew iso88598
-ENTRY END
-
-# ISO 8859-9:1989 - Latin 5, Turkish
-ENTRY
-ENCODING: iso_8859_9
-CES: table
-CCS: iso_8859_9
-ALIASES: iso_8859_9:1989 iso_ir_148 iso8859_9 latin5 l5 csisolatin5 iso88599
-ENTRY END
-
-# ISO 8859-10:1992 - Latin 6, Nordic
-ENTRY
-ENCODING: iso_8859_10
-CES: table
-CCS: iso_8859_10
-ALIASES: iso_8859_10:1992 iso_ir_157 iso885910 latin6 l6 csisolatin6 iso8859_10
-ENTRY END
-
-# ISO 8859-11 - Thai
-ENTRY
-ENCODING: iso_8859_11
-CES: table
-CCS: iso_8859_11
-ALIASES: iso8859_11 iso885911
-ENTRY END
-
-# ISO 8859-13:1998 - Latin 7, Baltic Rim
-ENTRY
-ENCODING: iso_8859_13
-CES: table
-CCS: iso_8859_13
-ALIASES: iso_8859_13:1998 iso8859_13 iso885913
-ENTRY END
-
-# ISO 8859-14:1998 - Latin 8, Celtic
-ENTRY
-ENCODING: iso_8859_14
-CES: table
-CCS: iso_8859_14
-ALIASES: iso_8859_14:1998 iso885914 iso8859_14
-ENTRY END
-
-# ISO 8859-15:1998 - Latin 9, West Europe, successor of Latin 1
-ENTRY
-ENCODING: iso_8859_15
-CES: table
-CCS: iso_8859_15
-ALIASES: iso885915 iso_8859_15:1998 iso8859_15 
-ENTRY END
-
-# Win-1250
-ENTRY
-ENCODING: win_1250
-CES: table
-CCS: win_1250
-ALIASES: cp1250
-ENTRY END
-
-# Win-1251 - Cyrillic
-ENTRY
-ENCODING: win_1251
-CES: table
-CCS: win_1251
-ALIASES: cp1251
-ENTRY END
-
-# Win-1252 - Latin 1
-ENTRY
-ENCODING: win_1252
-CES: table
-CCS: win_1252
-ALIASES: cp1252
-ENTRY END
-
-# Win-1253 - Greek
-ENTRY
-ENCODING: win_1253
-CES: table
-CCS: win_1253
-ALIASES: cp1253
-ENTRY END
-
-# Win-1254 - Turkish
-ENTRY
-ENCODING: win_1254
-CES: table
-CCS: win_1254
-ALIASES: cp1254
-ENTRY END
-
-# Win-1255 - Hebrew
-ENTRY
-ENCODING: win_1255
-CES: table
-CCS: win_1255
-ALIASES: cp1255
-ENTRY END
-
-# Win-1256 - Arabic
-ENTRY
-ENCODING: win_1256
-CES: table
-CCS: win_1256
-ALIASES: cp1256
-ENTRY END
-
-# Win-1257 - Baltic
-ENTRY
-ENCODING: win_1257
-CES: table
-CCS: win_1257
-ALIASES: cp1257
-ENTRY END
-
-# Win-1258 - Vietnamese7 that supports Cyrillic
-ENTRY
-ENCODING: win_1258
-CES: table
-CCS: win_1258
-ALIASES: cp1258
-ENTRY END
-
-# big5 - an encoding for Traditional Chinese
-ENTRY
-ENCODING: big5
-CES: table_pcs
-CCS: big5
-ALIASES: csbig5 big_five bigfive cn_big5 cp950
-ENTRY END
-
-# IBM 775 - an updated version of CP 437 that supports balitic languages.
-ENTRY
-ENCODING: cp775
-CES: table
-CCS: cp775
-ALIASES: ibm775 cspc775baltic
-ENTRY END
-
-# IBM 850 - an updated version of CP 437 where several Latin 1 characters have been
-# added instead of some less-often used characters like line-drawing and greek ones.
-ENTRY
-ENCODING: cp850
-CES: table
-CCS: cp850
-ALIASES: ibm850 850 cspc850multilingual
-ENTRY END
-
-# IBM 852 - an updated version of CP 437 where several Latin 2 characters have been added
-# instead of some less-often used characters like line-drawing and greek ones.
-ENTRY
-ENCODING: cp852
-CES: table
-CCS: cp852
-ALIASES: ibm852 852 cspcp852
-ENTRY END
-
-# IBM 855 - an updated version of CP 437 that supports Cyrillic.
-ENTRY
-ENCODING: cp855
-CES: table
-CCS: cp855
-ALIASES: ibm855 855 csibm855
-ENTRY END
-
-# IBM 866 - an updated version of CP 855 which followes the more logical Russian alphabet 
-# ordering of the alternativny variant that is preferred by many Russian users.
-ENTRY
-ENCODING: cp866
-CES: table
-CCS: cp866
-ALIASES: 866 IBM866 CSIBM866
-ENTRY END
-
-# EUC-JP - The EUC for Japanese
-ENTRY
-ENCODING: euc_jp
-CES: euc
-CCS: jis_x0208_1990 jis_x0201_1976 jis_x0212_1990
-ALIASES: eucjp
-ENTRY END
-
-# EUC-KR - The EUC for Korean
-ENTRY
-ENCODING: euc_kr
-CES: euc
-CCS: ksx1001
-ALIASES: euckr
-ENTRY END
-
-# EUC-TW - The EUC for Traditional Chinese
-ENTRY
-ENCODING: euc_tw
-CES: euc
-CCS: cns11643_plane1 cns11643_plane2 cns11643_plane14
-ALIASES: euctw
-ENTRY END
-
-SECTION END
-
-#
-# This section is named "CES_DEPENDENCIES" and describes dependencies
-# between CES converters (some CES converters may use another CES converters).
-#
-SECTION CES_DEPENDENCIES
- 
-ENTRY
-CES: table_pcs
-USED_CES: table
-ENTRY END
-
-ENTRY
-CES: euc
-USED_CES: table us_ascii
-ENTRY END
-
-SECTION END
-
diff --git a/newlib/libc/iconv/lib/endian.h b/newlib/libc/iconv/lib/endian.h
deleted file mode 100644
index 2db6c6d..0000000
--- a/newlib/libc/iconv/lib/endian.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef __ICONV_CES_ENDIAN_H__
-#define __ICONV_CES_ENDIAN_H__
-
-#include <sys/param.h>
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-
-#  define ICONV_BETOHS(s) \
-     ((((s) << 8) & 0xFF00) | (((s) >> 8) & 0x00FF))
-
-#  define ICONV_BETOHL(l) \
-     ((((l) << 24) & 0xFF000000) | \
-      (((l) <<  8) & 0x00FF0000) | \
-      (((l) >>  8) & 0x0000FF00) | \
-      (((l) >> 24) & 0x000000FF))
-
-#  define ICONV_LETOHS(s) (s)
-#  define ICONV_LETOHL(l) (l)
-
-#  define ICONV_HTOLES(s) ICONV_LETOHS (s)
-#  define ICONV_HTOLEL(l) ICONV_LETOHL (l)
-#  define ICONV_HTOBES(s) ICONV_BETOHS (s)
-#  define ICONV_HTOBEL(l) ICONV_BETOHL (l)
-
-#elif (BYTE_ORDER == BIG_ENDIAN)
-
-#  define ICONV_BETOHS(s) (s)
-#  define ICONV_BETOHL(l) (l)
-  
-#  define ICONV_LETOHS(s) \
-     ((((s) << 8) & 0xFF00) | (((s) >> 8) & 0x00FF))
-
-#  define ICONV_LETOHL(l) \
-     ((((l) << 24) & 0xFF000000) | \
-      (((l) <<  8) & 0x00FF0000) | \
-      (((l) >>  8) & 0x0000FF00) | \
-      (((l) >> 24) & 0x000000FF))
-
-#  define ICONV_HTOBES(s) ICONV_BETOHS (s)
-#  define ICONV_HTOBEL(l) ICONV_BETOHL (l)
-#  define ICONV_HTOLES(s) ICONV_LETOHS (s)
-#  define ICONV_HTOLEL(l) ICONV_LETOHL (l)
-
-#else
-#  error "Unknown byte order."
-#endif
-
-#endif /* !__ICONV_CES_ENDIAN_H__ */
-
diff --git a/newlib/libc/iconv/lib/iconv.c b/newlib/libc/iconv/lib/iconv.c
deleted file mode 100644
index ee7124b..0000000
--- a/newlib/libc/iconv/lib/iconv.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
-FUNCTION
-<<iconv>>, <<iconv_open>>, <<iconv_close>>---charset conversion routines
-
-INDEX
-	iconv
-INDEX
-	iconv_open
-INDEX
-	iconv_close
-INDEX
-	_iconv_r
-INDEX
-	_iconv_open_r
-INDEX
-	_iconv_close_r
-
-ANSI_SYNOPSIS
-	#include <iconv.h>
-	iconv_t iconv_open (const char *<[to]>, const char *<[from]>);
-	int iconv_close (iconv_t <[cd]>);
-        size_t iconv (iconv_t <[cd]>, const char **<[inbuf]>, 
-	              size_t *<[inbytesleft]>, 
-		      char **<[outbuf]>, size_t *<[outbytesleft]>),
-
-	iconv_t _iconv_open_r (struct _reent *<[rptr]>, 
-			       const char *<[to]>, const char *<[from]>);
-	int _iconv_close_r (struct _reent *<[rptr]>, iconv_t <[cd]>);
-        size_t _iconv_r (struct _reent *<[rptr]>,
-			 iconv_t <[cd]>, const char **<[inbuf]>, 
-	                 size_t *<[inbytesleft]>, 
-		         char **<[outbuf]>, size_t *<[outbytesleft]>),
-
-TRAD_SYNOPSIS
-	#include <iconv.h>
-        size_t iconv (<[cd]>, <[in]>, <[inleft]>, <[out]>, <[outleft]>)
-	iconv_t <[cd]>;
-	const char **<[in]>;
-	size_t *<[inleft]>; 
-        char **<[out]>;
-       	size_t *<[outleft]>);
-
-	#include <iconv.h>
-	iconv_t iconv_open (<[to]>, <[from]>);
-	const char *<[to]>;
-       	const char *<[from]>;
-
-	#include <iconv.h>
-	int iconv_close (<[cd]>);
-	iconv_t <[cd]>;
-
-	#include <iconv.h>
-        size_t _iconv_r (<[rptr]>, <[cd]>, <[in]>, <[inleft]>, <[out]>, <[outleft]>)
-	struct _reent *<[rptr]>;
-	iconv_t <[cd]>;
-	const char **<[in]>;
-	size_t *<[inleft]>; 
-        char **<[out]>;
-       	size_t *<[outleft]>);
-
-	#include <iconv.h>
-	iconv_t _iconv_open_r (<[rptr]>, <[to]>, <[from]>);
-	struct _reent *<[rptr]>;
-	const char *<[to]>;
-       	const char *<[from]>;
-
-	#include <iconv.h>
-	int iconv_close (<[rptr]>, <[cd]>);
-	struct _reent *<[rptr]>;
-	iconv_t <[cd]>;
-
-DESCRIPTION
-The function <<iconv>> converts characters from <[in]> which are in one
-encoding to characters of another encoding, outputting them to <[out]>.
-The value <[inleft]> specifies the number of input bytes to convert whereas
-the value <[outleft]> specifies the size remaining in the <[out]> buffer. 
-The conversion descriptor <[cd]> specifies the conversion being performed
-and is created via <<iconv_open>>.
-
-An <<iconv>> conversion stops if: the input bytes are exhausted, the output
-buffer is full, an invalid input character sequence occurs, or the
-conversion specifier is invalid.
-
-The function <<iconv_open>> is used to specify a conversion from one
-encoding: <[from]> to another: <[to]>.  The result of the call is
-to create a conversion specifier that can be used with <<iconv>>.
-
-The function <<iconv_close>> is used to close a conversion specifier after
-it is no longer needed.
-
-The <<_iconv_r>>, <<_iconv_open_r>>, and <<_iconv_close_r>> functions are
-reentrant versions of <<iconv>>, <<iconv_open>>, and <<iconv_close>>,
-respectively.  An additional reentrancy struct pointer: <[rptr]> is passed
-to properly set <<errno>>.
-
-RETURNS
-The <<iconv>> function returns the number of non-identical conversions
-performed.  If an error occurs, (size_t)-1 is returned and <<errno>>
-is set appropriately.  The values of <[inleft]>, <[in]>, <[out]>,
-and <[outleft]> are modified to indicate how much input was processed
-and how much output was created.
-
-The <<iconv_open>> function returns either a valid conversion specifier
-or (iconv_t)-1 to indicate failure.  If failure occurs, <<errno>> is set
-appropriately.
-
-The <<iconv_close>> function returns 0 on success or -1 on failure.
-If failure occurs <<errno>> is set appropriately.
-
-PORTABILITY
-<<iconv>>, <<iconv_open>>, and <<iconv_close>> are non-ANSI and are specified
-by the Single Unix specification.
-
-No supporting OS subroutine calls are required.
-*/
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <iconv.h>
-#include <wchar.h>
-#include <sys/iconvnls.h>
-#include "local.h"
-#include "conv.h"
-#include "ucsconv.h"
-
-/*
- * iconv interface functions as specified by Single Unix specification.
- */
-
-iconv_t
-_DEFUN(iconv_open, (to, from), 
-                   _CONST char *to _AND
-                   _CONST char *from)
-{
-  return _iconv_open_r (_REENT, to, from);
-}
-
-
-size_t
-_DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
-              iconv_t cd          _AND
-              _CONST char **inbuf _AND
-              size_t *inbytesleft _AND
-              char **outbuf       _AND
-              size_t *outbytesleft)
-{
-    return _iconv_r (_REENT, cd, inbuf, inbytesleft, outbuf, outbytesleft);
-}
-
-
-int
-_DEFUN(iconv_close, (cd), iconv_t cd)
-{
-    return _iconv_close_r (_REENT, cd);
-}
-
-
-#ifndef _REENT_ONLY
-iconv_t
-_DEFUN(_iconv_open_r, (rptr, to, from),
-                      struct _reent *rptr _AND
-                      _CONST char *to     _AND
-                      _CONST char *from)
-{
-  iconv_conversion_t *ic;
-    
-  if (to == NULL || from == NULL || *to == '\0' || *from == '\0')
-    return (iconv_t)-1;
-
-  if ((to = (_CONST char *)_iconv_resolve_encoding_name (rptr, to)) == NULL)
-    return (iconv_t)-1;
-
-  if ((from = (_CONST char *)_iconv_resolve_encoding_name (rptr, from)) == NULL)
-    {
-      _free_r (rptr, (_VOID_PTR)to);
-      return (iconv_t)-1;
-    }
-
-  ic = (iconv_conversion_t *)_malloc_r (rptr, sizeof (iconv_conversion_t));
-  if (ic == NULL)
-    return (iconv_t)-1;
-
-  /* Select which conversion type to use */
-  if (strcmp (from, to) == 0)
-    {
-      /* Use null conversion */
-      ic->handlers = &_iconv_null_conversion_handlers;
-      ic->data = ic->handlers->open (rptr, to, from);
-    }
-  else  
-    {
-      /* Use UCS-based conversion */
-      ic->handlers = &_iconv_ucs_conversion_handlers;
-      ic->data = ic->handlers->open (rptr, to, from);
-    }
-
-  _free_r (rptr, (_VOID_PTR)to);
-  _free_r (rptr, (_VOID_PTR)from);
-
-  if (ic->data == NULL)
-    {
-      _free_r (rptr, (_VOID_PTR)ic);
-      return (iconv_t)-1;
-    }
-
-  return (_VOID_PTR)ic;
-}
-
-
-size_t
-_DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
-                 struct _reent *rptr _AND
-                 iconv_t cd          _AND
-                 _CONST char **inbuf _AND
-                 size_t *inbytesleft _AND
-                 char **outbuf       _AND
-                 size_t *outbytesleft)
-{
-  iconv_conversion_t *ic = (iconv_conversion_t *)cd;
-
-  if ((_VOID_PTR)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
-       || (ic->handlers != &_iconv_null_conversion_handlers
-           && ic->handlers != &_iconv_ucs_conversion_handlers))
-    {
-      __errno_r (rptr) = EBADF;
-      return (size_t)-1;
-    }
-
-  if (inbuf == NULL || *inbuf == NULL)
-    {
-      mbstate_t state_null = ICONV_ZERO_MB_STATE_T;
-      
-      if (!ic->handlers->is_stateful(ic->data, 1))
-        return (size_t)0;
-      
-      if (outbuf == NULL || *outbuf == NULL)
-        {
-          /* Reset shift state */
-          ic->handlers->set_state (ic->data, &state_null, 1);
-          
-          return (size_t)0;
-        }
-       
-      if (outbytesleft != NULL)
-        {
-          mbstate_t state_save = ICONV_ZERO_MB_STATE_T;
-          
-          /* Save current shift state */          
-          ic->handlers->get_state (ic->data, &state_save, 1);
-          
-          /* Reset shift state */
-          ic->handlers->set_state (ic->data, &state_null, 1);
-
-          /* Get initial shift state sequence and it's length */
-          ic->handlers->get_state (ic->data, &state_null, 1);
-          
-          if (*outbytesleft >= state_null.__count)
-            {
-              memcpy ((_VOID_PTR)(*outbuf), (_VOID_PTR)&state_null, state_null.__count);
-              
-              *outbuf += state_null.__count;
-              *outbytesleft -= state_null.__count;
-
-              return (size_t)0;
-            }
-
-           /* Restore shift state if output buffer is too small */
-           ic->handlers->set_state (ic->data, &state_save, 1);
-        }
-       
-      __errno_r (rptr) = E2BIG;
-      return (size_t)-1;
-    }
-  
-  if (*inbytesleft == 0)
-    {
-      __errno_r (rptr) = EINVAL;
-      return (size_t)-1;
-    }
-   
-  if (*outbytesleft == 0 || *outbuf == NULL)
-    {
-      __errno_r (rptr) = E2BIG;
-      return (size_t)-1;
-    }
-
-  return ic->handlers->convert (rptr,
-                                ic->data,
-                                (_CONST unsigned char**)inbuf,
-                                inbytesleft,
-                                (unsigned char**)outbuf,
-                                outbytesleft,
-                                0);
-}
-
-
-int
-_DEFUN(_iconv_close_r, (rptr, cd),
-                       struct _reent *rptr _AND
-                       iconv_t cd)
-{
-  int res;
-  iconv_conversion_t *ic = (iconv_conversion_t *)cd;
-  
-  if ((_VOID_PTR)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
-       || (ic->handlers != &_iconv_null_conversion_handlers
-           && ic->handlers != &_iconv_ucs_conversion_handlers))
-    {
-      __errno_r (rptr) = EBADF;
-      return -1;
-    }
-
-  res = (int)ic->handlers->close (rptr, ic->data);
-  
-  _free_r (rptr, (_VOID_PTR)cd);
-
-  return res;
-}
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c
deleted file mode 100644
index 1b42f2c..0000000
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include <_ansi.h>
-#include <reent.h>
-#include <newlib.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/iconvnls.h>
-#ifdef _MB_CAPABLE
-#include <wchar.h>
-#include <iconv.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include "local.h"
-#include "conv.h"
-#include "ucsconv.h"
-#include "iconvnls.h"
-#endif
-
-/*
- * _iconv_nls_construct_filename -- constructs full file name. 
- *
- * PARAMETERS:
- *   struct _reent *rptr - reent structure of current thread/process.  
- *   _CONST char *file   - the name of file.
- *   _CONST char *dir    - the name of subdirectory;
- *   _CONST char *ext    - file extension.
- *
- * DESCRIPTION:
- *   Function constructs patch to icionv-related file.
- *   'file' shouldn't be NULL. Doesn't use extension if 'ext' is NULL.
- *
- * RETURN:
- *   The pointer to file name if success, In case of error returns NULL
- *   and sets current thread's/process's errno.
- */
-_CONST char *
-_DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
-                                      struct _reent *rptr _AND
-                                      _CONST char *file   _AND
-                                      _CONST char *dir    _AND
-                                      _CONST char *ext)
-{
-  int len1, len2, len3;
-  char *path;
-  char *p;
-  int dirlen = strlen (dir);
-    
-  if ((path = _getenv_r (rptr, NLS_ENVVAR_NAME)) == NULL || *path == '\0')
-    path = ICONV_DEFAULT_NLSPATH;
-
-  len1 = strlen (path);
-  len2 = strlen (file);
-  len3 = strlen (ext);
-
-  if ((p = _malloc_r (rptr, len1 + dirlen + len2 + len3 + 3)) == NULL)
-    return (_CONST char *)NULL;
-
-  memcpy (p, path, len1);
-  if (p[len1 - 1] != '/')
-    p[len1++] = '/';
-  memcpy (p + len1, dir, dirlen);
-  len1 += dirlen;
-  p[len1++] = '/';
-  memcpy (p + len1, file, len2);
-  len1 += len2;
-  if (ext != NULL)
-  {
-    memcpy (p + len1, ext, len3);
-    len1 += len3;
-  }
-  p[len1] = '\0';
- 
-  return (_CONST char *)p;
-}
-
-
-#ifdef _MB_CAPABLE
-/*
- * _iconv_nls_get_mb_cur_max -- return encoding's maximum length
- *                              of a multi-byte character.
- *
- * PARAMETERS:
- *    iconv_t cd - opened iconv conversion descriptor;
- *    int direction - "from encoding" or "to encoding" direction.
- *
- * DESCRIPTION:
- *    Return maximum  length  of a multi-byte character in one of 'cd's
- *    encoding. Return "from" encoding's value if 'direction' is 0 and
- *    "to" encoding's value if 'direction' isn't 0.
- */
-int
-_DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
-                                  iconv_t cd _AND
-                                  int direction)
-{
-  iconv_conversion_t *ic = (iconv_conversion_t *)cd;
-  
-  return ic->handlers->get_mb_cur_max (ic->data, direction);
-}
-
-/*
- * _iconv_nls_is_stateful -- is encoding stateful?
- *
- * PARAMETERS:
- *    iconv_t cd - opened iconv conversion descriptor;
- *    int direction - "from encoding" or "to encoding" direction.
- *
- * DESCRIPTION:
- *    Returns 0 if encoding is stateless or 1 if stateful.
- *    Tests "from" encoding if 'direction' is 0 and
- *    "to" encoding's value if 'direction' isn't 0.
-
- */
-int
-_DEFUN(_iconv_nls_is_stateful, (cd, direction),
-                               iconv_t cd _AND
-                               int direction)
-{
-  iconv_conversion_t *ic = (iconv_conversion_t *)cd;
-  
-  return ic->handlers->is_stateful (ic->data, direction);
-}
-
-/*
- * _iconv_nls_conv - special version of iconv for NLS.
- *
- * PARAMETERS:
- *    Same as _iconv_r.
- *
- * DESCRIPTION:
- *    Function behaves as _iconv_r but:
- *    1.  Don't handle reset/return shift states queries
- *        (like iconv does when 'inbuf' == NULL, etc);
- *    2. Don't save result if 'outbuf' == NULL or
- *       '*outbuf' == NULL;
- *    3. Don't perform default conversion if there is no character
- *       in "to" encoding that corresponds to character from "from"
- *       encoding.
- *
- * RETURN:
- *    Same as _iconv_r.
- */
-size_t
-_DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
-                        struct _reent *rptr _AND
-                        iconv_t cd          _AND
-                        _CONST char **inbuf _AND
-                        size_t *inbytesleft _AND
-                        char **outbuf       _AND
-                        size_t *outbytesleft)
-{
-  iconv_conversion_t *ic = (iconv_conversion_t *)cd;
-  int flags = ICONV_FAIL_BIT;
-
-  if ((_VOID_PTR)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
-       || (ic->handlers != &_iconv_null_conversion_handlers
-           && ic->handlers != &_iconv_ucs_conversion_handlers))
-    {
-      __errno_r (rptr) = EBADF;
-      return (size_t)-1;
-    }
-  
-  if (inbytesleft == NULL || *inbytesleft == 0)
-    return (size_t)0;
-  
-  if (outbuf == NULL || *outbuf == NULL)
-    flags |= ICONV_DONT_SAVE_BIT;
-  
-  if (outbytesleft == NULL || *outbytesleft == 0)
-    {
-      __errno_r (rptr) = E2BIG;
-      return (size_t)-1;
-    }
-
-  return ic->handlers->convert (rptr,
-                                ic->data,
-                                (_CONST unsigned char**)inbuf,
-                                inbytesleft,
-                                (unsigned char**)outbuf,
-                                outbytesleft,
-                                flags);
-}
-
-/*
- * _iconv_nls_get_state -- get encoding's current shift state value.
- *
- * PARAMETERS:
- *    iconv_t cd - iconv descriptor; 
- *    mbstate_t *ps - where to save shift state;
- *    int direction - "from" encoding if 0, "to" encoding if 1.
- *
- * DESCRIPTION:
- *    Save encoding's current shift state to 'ps'. Save "from" encoding's
- *    shift state if 'direction' is 0 and "to" encodings's shift state
- *    if 'direction' isn't 0.
- */
-_VOID
-_DEFUN(_iconv_nls_get_state, (cd, ps, direction),
-                             iconv_t cd    _AND
-                             mbstate_t *ps _AND
-                             int direction)
-{
-  iconv_conversion_t *ic = (iconv_conversion_t *)cd;
-  
-  ic->handlers->get_state (ic->data, ps, direction);
-
-  return;
-}
-
-/*
- * _iconv_nls_set_state -- set encoding's current shift state value.
- *
- * PARAMETERS:
- *    iconv_t cd    - iconv descriptor; 
- *    mbstate_t *ps - where to save shift state.
- *    int direction - "from" encoding if 0, "to" encoding if 1.
- *
- * DESCRIPTION:
- *    Set encoding's current shift state.
- *
- * RETURN:
- *    0 if success, -1 if failure.
- */
-int
-_DEFUN(_iconv_nls_set_state, (cd, ps, direction),
-                             iconv_t cd    _AND
-                             mbstate_t *ps _AND
-                             int direction)
-{
-  iconv_conversion_t *ic = (iconv_conversion_t *)cd;
-  
-  return ic->handlers->set_state (ic->data, ps, direction);
-}
-
-/* Same as iconv_open() but don't perform name resolving */
-static iconv_t
-_DEFUN(iconv_open1, (rptr, to, from),
-                     struct _reent *rptr _AND
-                     _CONST char *to     _AND
-                     _CONST char *from)
-{
-  iconv_conversion_t *ic;
-    
-  if (to == NULL || from == NULL || *to == '\0' || *from == '\0')
-    return (iconv_t)-1;
-
-  ic = (iconv_conversion_t *)_malloc_r (rptr, sizeof (iconv_conversion_t));
-  if (ic == NULL)
-    return (iconv_t)-1;
-
-  /* Select which conversion type to use */
-  if (strcmp (from, to) == 0)
-    {
-      /* Use null conversion */
-      ic->handlers = &_iconv_null_conversion_handlers;
-      ic->data = ic->handlers->open (rptr, to, from);
-    }
-  else  
-    {
-      /* Use UCS-based conversion */
-      ic->handlers = &_iconv_ucs_conversion_handlers;
-      ic->data = ic->handlers->open (rptr, to, from);
-    }
-
-  if (ic->data == NULL)
-    {
-      _free_r (rptr, (_VOID_PTR)ic);
-      return (iconv_t)-1;
-    }
-
-  return (_VOID_PTR)ic;
-}
-
-/*
- * _iconv_nls_open - open iconv descriptors for NLS.
- *
- * PARAMETERS:
- *     struct _reent *rptr - process's reent structure;
- *     _CONST char *encoding - encoding name;
- *     iconv_t *tomb - wchar -> encoding iconv descriptor pointer;
- *     iconv_t *towc - encoding -> wchar iconv descriptor pointer;
- *     int flag - perform encoding name resolving flag.
- *
- * DESCRIPTION:
- *     Opens two iconv descriptors for 'encoding' -> wchar and 
- *     wchar -> 'encoding' iconv conversions. Function is used when locale or
- *     wide-oriented stream is opened. If 'flag' is 0, don't perform encoding
- *     name resolving ('encoding' must not be alias in this case).
- *
- * RETURN:
- *     If successful - return 0, else set errno and return -1.
- */
-int
-_DEFUN(_iconv_nls_open, (rptr, encoding, towc, tomb),
-                        struct _reent *rptr   _AND
-                        _CONST char *encoding _AND
-                        iconv_t *tomb         _AND
-                        iconv_t *towc         _AND
-                        int flag)
-{
-  _CONST char *wchar_encoding;
-
-  if (sizeof (wchar_t) > 2 && WCHAR_MAX > 0xFFFF)
-    wchar_encoding = "ucs_4_internal";
-  else if (sizeof (wchar_t) > 1 && WCHAR_MAX > 0xFF)
-    wchar_encoding = "ucs_2_internal";
-  else
-    wchar_encoding = ""; /* This shuldn't happen */
-
-  if (flag)
-    {
-      if ((*towc = _iconv_open_r (rptr, wchar_encoding, encoding)) == (iconv_t)-1)
-        return -1;
-    
-      if ((*tomb = _iconv_open_r (rptr, encoding, wchar_encoding)) == (iconv_t)-1)
-      {
-        _iconv_close_r (rptr, *towc);
-        return -1;
-      }
-    }
-  else
-    {
-      if ((*towc = iconv_open1 (rptr, wchar_encoding, encoding)) == (iconv_t)-1)
-        return -1;
-    
-      if ((*tomb = iconv_open1 (rptr, encoding, wchar_encoding)) == (iconv_t)-1)
-      {
-        _iconv_close_r (rptr, *towc);
-        return -1;
-      }
-    }
-
-  return 0;
-}
-
-#endif /* _MB_CAPABLE */
-
diff --git a/newlib/libc/iconv/lib/iconvnls.h b/newlib/libc/iconv/lib/iconvnls.h
deleted file mode 100644
index f6d4866..0000000
--- a/newlib/libc/iconv/lib/iconvnls.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef __ICONV_ICONVNLS_H__
-#define __ICONV_ICONVNLS_H__
-
-#include <newlib.h>
-
-/*
- * Include ucs-2-internal or ucs-4-internal if Newlib is configured as
- * "multibyte-capable".
- * ============================================================================
- */
-#ifdef _MB_CAPABLE
-/*
- * Determine size of wchar_t. If size of wchar_t is 2, UCS-2-INTERNAL is used
- * as widechar's encoding. If size of wchar_t is 4, UCS-4-INTERNAL is used as
- * widechar's encoding.
- */
-# if WCHAR_MAX > 0xFFFF
-#  ifndef _ICONV_FROM_ENCODING_UCS_4_INTERNAL
-#   define _ICONV_FROM_ENCODING_UCS_4_INTERNAL
-#  endif
-#  ifndef _ICONV_TO_ENCODING_UCS_4_INTERNAL
-#   define _ICONV_TO_ENCODING_UCS_4_INTERNAL
-#  endif
-# elif WCHAR_MAX > 0xFF
-#  ifndef _ICONV_FROM_ENCODING_UCS_2_INTERNAL
-#   define _ICONV_FROM_ENCODING_UCS_2_INTERNAL
-#  endif
-#  ifndef _ICONV_TO_ENCODING_UCS_2_INTERNAL
-#   define _ICONV_TO_ENCODING_UCS_2_INTERNAL
-#  endif
-# else
-#  error Do not know how to work with 1 byte widechars.
-# endif
-#endif /* _MB_CAPABLE */
-
-#endif /* !__ICONV_ICONVNLS_H__ */
-
diff --git a/newlib/libc/iconv/lib/local.h b/newlib/libc/iconv/lib/local.h
deleted file mode 100644
index 85f2263..0000000
--- a/newlib/libc/iconv/lib/local.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef __ICONV_LIB_LOCAL_H__
-#define __ICONV_LIB_LOCAL_H__
-
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/types.h>
-#include <limits.h>
-
-/* void* type for K&R compilers compatibility */
-#define _VOID_PTR _PTR
-
-/* Encodings aliases file */
-#define ICONV_ALIASES_FNAME   "encoding.aliases"
-/* iconv CCS data path */
-#define ICONV_SUBDIR          "iconv_data"
-/* iconv data files extension */
-#define ICONV_DATA_EXT        ".cct"
-
-/* This macro is used to zero mbstate_t objects */
-#define ICONV_ZERO_MB_STATE_T ((mbstate_t){0, {0}})
-
-/* Define the maximum multi-byte character length produced by iconv library */
-#if MB_LEN_MAX < 6
-#  define ICONV_MB_LEN_MAX 6
-#else
-#  define ICONV_MB_LEN_MAX MB_LEN_MAX
-#endif
-
-/* 16-bit UCS-2 type */
-typedef __uint16_t ucs2_t;
-
-/* 32-bit UCS-4 type */
-typedef __uint32_t ucs4_t;
-
-
-/* The list of built-in encoding names and aliases */
-extern _CONST char *
-_iconv_aliases;
-
-#endif /* !__ICONV_LIB_LOCAL_H__ */
-
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
deleted file mode 100644
index d35027f..0000000
--- a/newlib/libc/iconv/lib/nullconv.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include "local.h"
-#include "conv.h"
-
-static int null_conversion_dummy_data;
-
-
-static _VOID_PTR
-_DEFUN(null_conversion_open, (rptr, to, from),
-                             struct _reent *rptr _AND
-                             _CONST char *to     _AND
-                             _CONST char *from)
-{
-  return (_VOID_PTR)&null_conversion_dummy_data;
-}
-
-
-static size_t
-_DEFUN(null_conversion_close, (rptr, data),
-                              struct _reent *rptr _AND
-                              _VOID_PTR data)
-{
-  return 0;
-}
-
-
-static size_t
-_DEFUN(null_conversion_convert,
-                     (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft),
-                     struct _reent *rptr          _AND
-                     _VOID_PTR data               _AND
-                     _CONST unsigned char **inbuf _AND
-                     size_t *inbytesleft          _AND
-                     unsigned char **outbuf       _AND
-                     size_t *outbytesleft         _AND
-                     int flags)
-{
-  size_t result;
-  size_t len;
-  
-  if (*inbytesleft < *outbytesleft)
-    {
-      result = 0;
-      len = *inbytesleft;
-    }
-  else
-    {
-      result = (size_t)-1;
-      len = *outbytesleft;
-      __errno_r (rptr) = E2BIG;
-    }
-  
-  if ((flags & 1) == 0)
-    memcpy (*outbuf, *inbuf, len);
-
-  *inbuf        += len;
-  *outbuf       += len;
-  *inbytesleft  -= len;
-  *outbytesleft -= len;
-
-  return result;
-}
-
-
-static int
-_DEFUN(null_conversion_get_mb_cur_max, (data, direction),
-                                       _VOID_PTR data     _AND
-                                       int direction)
-{
-  return ICONV_MB_LEN_MAX;
-}
-
-
-static _VOID
-_DEFUN(null_conversion_get_state, (data, state, size),
-                                  _VOID_PTR data   _AND
-                                  mbstate_t *state _AND
-                                  int direction)
-{
-  return;
-}
-
-
-static int
-_DEFUN(null_conversion_set_state, (data, state, direction),
-                                  _VOID_PTR data   _AND
-                                  mbstate_t *state _AND
-                                  int direction)
-{
-  return 0;
-}
-
-static int
-_DEFUN(null_conversion_is_stateful, (data, direction),
-                                    _VOID_PTR data _AND
-                                    int direction)
-{
-  return 0;
-}
-
-/* Null conversion definition object */
-_CONST iconv_conversion_handlers_t
-_iconv_null_conversion_handlers =
-{
-  null_conversion_open,
-  null_conversion_close,
-  null_conversion_convert,
-  null_conversion_get_state,
-  null_conversion_set_state,
-  null_conversion_get_mb_cur_max,
-  null_conversion_is_stateful
-};
-
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
deleted file mode 100644
index 4dab2e1..0000000
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include "local.h"
-#include "conv.h"
-#include "ucsconv.h"
-
-static int fake_data;
-
-static int 
-_EXFUN(find_encoding_name, (_CONST char *searchee,
-                            _CONST char **names));
-
-
-/*
- * UCS-based conversion interface functions implementation.
- */
-
-static _VOID_PTR
-_DEFUN(ucs_based_conversion_open, (rptr, to, from),
-                                  struct _reent *rptr _AND
-                                  _CONST char *to     _AND
-                                  _CONST char *from)
-{
-  iconv_ucs_conversion_t *uc;
-  _CONST iconv_to_ucs_ces_t   *to_ucs_bices;
-  _CONST iconv_from_ucs_ces_t *from_ucs_bices;
-  
-  uc = (iconv_ucs_conversion_t *)
-             _calloc_r (rptr, 1, sizeof (iconv_ucs_conversion_t));
-  if (uc == NULL)
-    return NULL;
-
-  /* 
-   * Find CES converter for "from" encoding ("from" source encoding corresponds
-   * to "to_ucs" CES converter).
-   */
-  for (to_ucs_bices = &_iconv_to_ucs_ces[0];
-       to_ucs_bices->names != NULL;
-       to_ucs_bices++)
-    {
-      if (find_encoding_name (from, to_ucs_bices->names) == 0)
-        break;
-    }
-  
-  /* 
-   * Find CES converter for "to" encoding ("to" source encoding corresponds
-   * to "from_ucs" CES converter).
-   */
-  for (from_ucs_bices = &_iconv_from_ucs_ces[0];
-       from_ucs_bices->names != NULL;
-       from_ucs_bices++)
-    {
-      if (find_encoding_name (to, from_ucs_bices->names) == 0)
-        break;
-    }
-
-  if (to_ucs_bices->names == NULL || from_ucs_bices->names == NULL)
-    goto error;
-
-  uc->to_ucs.handlers = to_ucs_bices->handlers;
-  uc->from_ucs.handlers = from_ucs_bices->handlers;
-  
-  /* Initialize "to UCS" CES converter */
-  if (to_ucs_bices->handlers->init != NULL)
-    {
-      uc->to_ucs.data = to_ucs_bices->handlers->init (rptr, from);
-      if (uc->to_ucs.data == NULL)
-        goto error;
-    }
-  else
-    uc->to_ucs.data = (_VOID_PTR)&fake_data;
-    
-
-  /* Initialize "from UCS" CES converter */
-  if (from_ucs_bices->handlers->init != NULL)
-    {
-      uc->from_ucs.data = from_ucs_bices->handlers->init (rptr, to);
-      if (uc->from_ucs.data == NULL)
-        goto error;
-    }
-  else
-    uc->from_ucs.data = (_VOID_PTR)&fake_data;
-
-  return uc;
-
-error:
-  if (uc->to_ucs.data != NULL && uc->to_ucs.handlers->close != NULL)
-    uc->to_ucs.handlers->close (rptr, uc->to_ucs.data);
-
-  _free_r (rptr, (_VOID_PTR)uc);
-
-  return NULL;
-}
-
-
-static size_t
-_DEFUN(ucs_based_conversion_close, (rptr, data),
-                                   struct _reent *rptr _AND
-                                   _VOID_PTR data)
-{
-  iconv_ucs_conversion_t *uc;
-  size_t res = 0;
-
-  uc = (iconv_ucs_conversion_t *)data;
-
-  if (uc->from_ucs.handlers->close != NULL)  
-    res = uc->from_ucs.handlers->close (rptr, uc->from_ucs.data);
-  if (uc->to_ucs.handlers->close != NULL)
-    res |= uc->to_ucs.handlers->close (rptr, uc->to_ucs.data);
-
-  _free_r (rptr, (_VOID_PTR)data);
-
-  return res;
-}
-
-
-static size_t
-_DEFUN(ucs_based_conversion_convert,
-                 (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft, flags),
-                 struct _reent *rptr          _AND
-                 _VOID_PTR data               _AND
-                 _CONST unsigned char **inbuf _AND
-                 size_t *inbytesleft          _AND
-                 unsigned char **outbuf       _AND
-                 size_t *outbytesleft         _AND
-                 int flags)
-{
-  unsigned char outbuf1[ICONV_MB_LEN_MAX];
-  unsigned char *poutbuf1;
-  size_t res = 0;
-  iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
-
-  while (*inbytesleft > 0)
-    {
-      register size_t bytes;
-      register ucs4_t ch;
-      _CONST unsigned char *inbuf_save = *inbuf;
-      size_t inbyteslef_save = *inbytesleft;
-
-      if (*outbytesleft == 0)
-        {
-          __errno_r (rptr) = E2BIG;
-          return (size_t)-1;
-        }
-
-      ch = uc->to_ucs.handlers->convert_to_ucs (uc->to_ucs.data,
-                                                inbuf, inbytesleft);
-
-      if (ch == (ucs4_t)ICONV_CES_BAD_SEQUENCE)
-        {
-          __errno_r (rptr) = EINVAL;
-          return (size_t)-1;
-        }
-
-      if (ch == (ucs4_t)ICONV_CES_INVALID_CHARACTER)
-        {
-          __errno_r (rptr) = EILSEQ;
-          return (size_t)-1;
-        }
-
-      if (flags & ICONV_DONT_SAVE_BIT)
-        {
-          poutbuf1 = &outbuf1[0];
-          outbuf = &poutbuf1;
-        }
-
-      bytes = uc->from_ucs.handlers->convert_from_ucs (uc->from_ucs.data, ch,
-                                                       outbuf, outbytesleft); 
-
-      if (bytes == (size_t)ICONV_CES_NOSPACE)
-        {
-          *inbuf = inbuf_save;
-          *inbytesleft = inbyteslef_save;
-          __errno_r (rptr) = E2BIG;
-          return (size_t)-1;
-        }
-      else if (bytes == (size_t)ICONV_CES_INVALID_CHARACTER)
-        {
-          if (flags & ICONV_FAIL_BIT)
-            {
-              /* Generate error */
-              __errno_r (rptr) = EILSEQ;
-              return (size_t)-1;
-            }
-          /*
-           * For this case SUSv3 stands: "if iconv() encounters a character in the
-           * input buffer that is valid, but for which an identical character does
-           * not exist in the target encoding, iconv() shall perform an
-           * implementation-defined conversion on this character".
-           * Don't generate error, just write default character.
-           */
-          bytes = uc->from_ucs.handlers->convert_from_ucs (
-                                         uc->from_ucs.data,
-                                         (ucs4_t)DEFAULT_CHARACTER,
-                                         outbuf,
-                                         outbytesleft);
-          if ((__int32_t)bytes < 0)
-            {
-              __errno_r (rptr) = E2BIG;
-              return (size_t)-1;
-            }
-      
-          res += 1;
-        }
-    }
-
-  return res;
-}
-
-
-static int
-_DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
-                                            _VOID_PTR data _AND
-                                            int direction)
-{
-  iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
-  
-  if (direction == 0)
-    return uc->to_ucs.handlers->get_mb_cur_max (uc->to_ucs.data);
-  else
-    return uc->from_ucs.handlers->get_mb_cur_max (uc->from_ucs.data);
-}
-
-
-static _VOID
-_DEFUN(ucs_based_conversion_get_state, (data, state, direction),
-                                       _VOID_PTR data   _AND
-                                       mbstate_t *state _AND
-                                       int direction)
-{
-  iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
- 
-  if (direction == 0)
-    {
-      if (uc->to_ucs.handlers->get_state != NULL)
-        uc->to_ucs.handlers->get_state (uc->to_ucs.data, state);
-      else
-        *state = ICONV_ZERO_MB_STATE_T;
-    }
-  else
-    {
-      if (uc->from_ucs.handlers->get_state != NULL)
-        uc->from_ucs.handlers->get_state (uc->from_ucs.data, state);
-      else
-        *state = ICONV_ZERO_MB_STATE_T;
-    }
-
-  return;
-}
-
-
-static int
-_DEFUN(ucs_based_conversion_set_state, (data, state, direction),
-                                       _VOID_PTR data   _AND
-                                       mbstate_t *state _AND
-                                       int direction)
-{
-  iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
-
-  if (direction == 0)
-    {
-      if (uc->to_ucs.handlers->set_state != NULL)
-        return uc->to_ucs.handlers->set_state (uc->to_ucs.data, state);
-    }
-  else
-    {
-      if (uc->from_ucs.handlers->set_state != NULL)
-        return uc->from_ucs.handlers->set_state (uc->from_ucs.data, state);
-    }
-
-  return 0;
-}
-
-static int
-_DEFUN(ucs_based_conversion_is_stateful, (data, direction),
-                                         _VOID_PTR data _AND
-                                         int direction)
-{
-  iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
-
-  if (direction == 0)
-    {
-      if (uc->to_ucs.handlers->is_stateful != NULL)
-        return uc->to_ucs.handlers->is_stateful (uc->to_ucs.data);
-    }
-  else
-    {
-      if (uc->from_ucs.handlers->is_stateful != NULL)
-        return uc->from_ucs.handlers->is_stateful (uc->from_ucs.data);
-    }
-
-  return 0;
-}
-
-
-/* UCS-based conversion definition object */
-_CONST iconv_conversion_handlers_t 
-_iconv_ucs_conversion_handlers =
-{
-  ucs_based_conversion_open,
-  ucs_based_conversion_close,
-  ucs_based_conversion_convert,
-  ucs_based_conversion_get_state,
-  ucs_based_conversion_set_state,
-  ucs_based_conversion_get_mb_cur_max,
-  ucs_based_conversion_is_stateful
-};
-
-
-/*
- * Supplementary functions.
- */
-
-static int
-_DEFUN(find_encoding_name, (searchee, names),
-                           _CONST char *searchee _AND
-                           _CONST char **names)
-{
-  _CONST char *p;
-
-  for (p = *names; p != NULL; p = *(names++))
-    if (strcmp (p, searchee) == 0)
-      return 0;
-
-  return -1;
-}
-
diff --git a/newlib/libc/iconv/lib/ucsconv.h b/newlib/libc/iconv/lib/ucsconv.h
deleted file mode 100644
index 3c39f39..0000000
--- a/newlib/libc/iconv/lib/ucsconv.h
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy
- * Copyright (c) 1999,2000, Konstantin Chuguev. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef __ICONV_UCS_CONVERSION_H__
-#define __ICONV_UCS_CONVERSION_H__
-
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/types.h>
-#include <wchar.h>
-#include "local.h"
-
-/* No enough space in output buffer */
-#define ICONV_CES_NOSPACE 0
-/* Invalid input character */
-#define ICONV_CES_INVALID_CHARACTER -1
-/* No corespondent character in destination encoding */
-#define ICONV_CES_BAD_SEQUENCE -2
-/* All unknown characters are marked by this code */
-#define DEFAULT_CHARACTER 0x3f /* ASCII '?' */
-
-
-/*
- * iconv_to_ucs_ces_handlers_t - "to UCS" CES converter handlers.
- *
- * Structure contains function pointers which should be provided by
- * "to_ucs" CES converter.
- *
- * ============================================================================
- */
-typedef struct
-{
-  /*
-   * init - initialize CES converter.
-   *
-   * PARAMETERS:
-   *   struct _reent *rptr   - reent structure of current thread/process;
-   *   _CONST char *encoding - encoding name.
-   *
-   * DESCRIPTION:
-   *  Initializes CES converter. CES converter may deal with a series of
-   *  encodings, such as Table or EUC CES converters. 'encoding' parameter
-   *  indicates which encoding CES converter should use.
-   *
-   * RETURN:
-   *   Returns CES-specific data pointer if success. In case of error returns
-   *   NULL and sets current thread's/process's errno.
-   */
-  _VOID_PTR _EXPARM(init, (struct _reent *rptr,
-                          _CONST char *encoding));
-
-  /*
-   * close - close CES converter.
-   *
-   * PARAMETERS:
-   *   struct _reent *rptr - reent structure of current thread/process;
-   *   _VOID_PTR data      - CES converter-specific data.
-   *
-   * DESCRIPTION:
-   *     Preforms CES converter closing.   *
-   * RETURN:
-   *   Returns (size_t)0 if success. In case of error returns (size_t)-1 and
-   *   sets current thread's/process's errno.
-   */
-  size_t _EXPARM(close, (struct _reent *rptr,
-                        _VOID_PTR data));
-
-  /*
-   * get_mb_cur_max - get maximum character length in bytes.
-   *
-   * PARAMETERS:
-   *   _VOID_PTR data     - conversion-specific data;
-   *
-   * DESCRIPTION:
-   *   Returns encoding's maximum character length.
-   */
-  int _EXPARM(get_mb_cur_max, (_VOID_PTR data));
-  
-  /*
-   * get_state - get current shift state.
-   *
-   * PARAMETERS:
-   *   _VOID_PTR data   - conversion-specific data;
-   *   mbstate_t *state - mbstate_t object where shift state will be stored;
-   *
-   * DESCRIPTION:
-   *   Returns encoding's current shift sequence.
-   */
-  _VOID _EXPARM(get_state, (_VOID_PTR data,
-                           mbstate_t *state));
-
-  /*
-   * set_state - set shift state.
-   *
-   * PARAMETERS:
-   *   _VOID_PTR data   - conversion-specific data;
-   *   mbstate_t *state - mbstate_t value to which shift state will be set.
-   *
-   * DESCRIPTION:
-   *   Sets encoding's current shift state to 'state'. if 'state'
-   *   object is zero-object - reset current shift state.
-   *   Returns 0 if '*state' object has right format, -1 else.
-   */
-  int _EXPARM(set_state, (_VOID_PTR data,
-                         mbstate_t *state));
-
-  /*
-   * is_stateful - is encoding stateful state.
-   *
-   * PARAMETERS:
-   *   _VOID_PTR data   - conversion-specific data;
-   *
-   * DESCRIPTION:
-   *   Returns 0 if encoding is stateless, else returns 1.
-   */
-  int _EXPARM(is_stateful, (_VOID_PTR data));
-  
-  /*
-   * convert_to_ucs - convert character to UCS.
-   *
-   * PARAMETERS:
-   *   _VOID_PTR data               - CES converter-specific data;
-   *   _CONST unsigned char **inbuf - buffer with input character byte sequence;
-   *   size_t *inbytesleft          - output buffer bytes count.
-   *
-   * DESCRIPTION:
-   *   Converts input characters into UCS encoding. 'inbuf' is
-   *   incremented accordingly. 'bytesleft' is decremented accordingly. Should
-   *   be provided by correspondent CES module.
-   *
-   * RETURN:
-   *   Returns resulting UCS code if success. If input character is invalid,
-   *   returns ICONV_CES_INVALID_CHARACTER. If invalid or incomplete bytes
-   *   sequence was met, returns ICONV_CES_BAD_SEQUENCE.
-   */
-  ucs4_t _EXPARM(convert_to_ucs, (_VOID_PTR data,
-                                 _CONST unsigned char **inbuf,
-                                 size_t *inbytesleft));
-} iconv_to_ucs_ces_handlers_t;
-
-
-/*
- * iconv_from_ucs_ces_handlers_t - "from UCS" CES converter handlers.
- *
- * Structure contains function pointers which should be provided by
- * "from_ucs" CES converter.
- *
- * ============================================================================
- */
-typedef struct
-{
-  /* Same as in iconv_to_ucs_ces_handlers_t */
-  _VOID_PTR _EXPARM(init, (struct _reent *rptr,
-                          _CONST char *encoding));
-
-  /* Same as in iconv_to_ucs_ces_handlers_t */
-  size_t _EXPARM(close, (struct _reent *rptr,
-                        _VOID_PTR data));
-
-  /* Same as in iconv_to_ucs_ces_handlers_t */
-  int _EXPARM(get_mb_cur_max, (_VOID_PTR data));
-
-  /* Same as in iconv_to_ucs_ces_handlers_t */
-  _VOID _EXPARM(get_state, (_VOID_PTR data,
-                           mbstate_t *state));
-
-  /* Same as in iconv_to_ucs_ces_handlers_t */
-  int _EXPARM(set_state, (_VOID_PTR data,
-                         mbstate_t *state));
-
-  /* Same as in iconv_to_ucs_ces_handlers_t */
-  int _EXPARM(is_stateful, (_VOID_PTR data));
-  
-  /*
-   * convert_from_ucs - convert UCS character to destination encoding.
-   *
-   * PARAMETERS:
-   *   _VOID_PTR data         - CES converter-specific data;
-   *   ucs4_t in              - input UCS-4 character;
-   *   unsigned char **outbuf - output buffer for the result;
-   *   size_t *outbytesleft   - output buffer bytes count.
-   *
-   * DESCRIPTION:
-   *   Converts input UCS characters to destination encoding and stores result
-   *   in 'outbuf' if there is sufficient free space present. 'outbuf' is
-   *   incremented accordingly. 'outbytesleft' is decremented accordingly. Should
-   *   be provided by correspondent CES module.
-   *   Output buffer always has at least 1 byte.
-   *
-   * RETURN:
-   *   Returns number of bytes that was written into output buffer if success.
-   *   If there is no enough space in output buffer, returns ICONV_CES_NOSPACE.
-   *   If there is no corresponding character in destination encoding, returns
-   *   ICONV_CES_INVALID_CHARACTER.
-   */
-  size_t _EXPARM(convert_from_ucs, (_VOID_PTR data,
-                                   ucs4_t in,
-                                   unsigned char **outbuf,
-                                   size_t *outbytesleft));
-} iconv_from_ucs_ces_handlers_t;
-
-
-/*
- * iconv_to_ucs_ces_desc_t - "to UCS" CES converter definition structure for
- * usage in iconv_ucs_conversion_t conversion description structure.
- *
- * ============================================================================
- */
-typedef struct
-{
-  /* CES converter handlers */
-  _CONST iconv_to_ucs_ces_handlers_t *handlers;
-  
-  /* "to_ucs" CES converter-specific data. */
-  _VOID_PTR data;
-} iconv_to_ucs_ces_desc_t;
-
-
-/*
- * iconv_from_ucs_ces_desc_t - "from UCS" CES converter definition structure for
- * usage in iconv_ucs_conversion_t conversion description structure.
- *
- * ============================================================================
- */
-typedef struct
-{
-  /* CES converter handlers */
-  _CONST iconv_from_ucs_ces_handlers_t *handlers;
-  
-  /* "from_ucs" CES converter-specific data. */
-  _VOID_PTR data;
-} iconv_from_ucs_ces_desc_t;
-
-
-/*
- * iconv_ucs_conversion_t - UCS-based conversion definition structure.
- *
- * Defines special type of conversion where every character is first
- * converted into UCS-4 (UCS-2 for table-driven), and after this the
- * resulting UCS character is converted to destination encoding. 
- * UCS-based conversion is composed of two *converters*, defined by 
- * iconv_ces_t structure. The iconv_ucs_conversion_t object is referred
- * from iconv_conversion_t object using 'data' field.
- *
- * Structure contains two objects - 'to_ucs' and 'from_ucs' which define
- * "source encoding to UCS" and "UCS to destination encoding" converters.
- *
- * ============================================================================
- */
-typedef struct
-{
-  /* Source encoding -> CES converter. */
-  iconv_to_ucs_ces_desc_t to_ucs;
-
-  /* UCS -> destination encoding CES converter. */
-  iconv_from_ucs_ces_desc_t from_ucs;
-} iconv_ucs_conversion_t;
-
-
-/*
- * iconv_to_ucs_ces_t - defines "to UCS" CES converter.
- *
- * ============================================================================
- */
-typedef struct
-{
-  /* 
-   * An array of encodings names, supported by CES converter.
-   * The end of array should be marked by NULL pointer.
-   */
-  _CONST char **names;
-
-  /* CES converter description structure */
-  _CONST iconv_to_ucs_ces_handlers_t *handlers;
-} iconv_to_ucs_ces_t;
-
-
-/*
- * iconv_from_ucs_ces_t - defines "from UCS" CES converter.
- *
- * ============================================================================
- */
-typedef struct
-{
-  /* 
-   * An array of encodings names, supported by CES converter.
-   * The end of array should be marked by NULL pointer.
-   */
-  _CONST char **names;
-
-  /* CES converter description structure */
-  _CONST iconv_from_ucs_ces_handlers_t *handlers;
-} iconv_from_ucs_ces_t;
- 
-
-/* List of "to UCS" linked-in CES converters. */
-extern _CONST iconv_to_ucs_ces_t
-_iconv_to_ucs_ces[];
-
-/* List of "from UCS" linked-in CES converters. */
-extern _CONST iconv_from_ucs_ces_t
-_iconv_from_ucs_ces[];
-
-#endif /* !__ICONV_UCS_CONVERSION_H__ */
-
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index 07bfd88..8bebd14 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -12,7 +12,6 @@
 #ifndef	_ANSIDECL_H_
 #define	_ANSIDECL_H_
 
-#include <newlib.h>
 #include <sys/config.h>
 
 /* First try to figure out whether we really are in an ANSI C environment.  */
@@ -75,21 +74,4 @@
 #define _ATTRIBUTE(attrs)
 #endif
 
-/*  ISO C++.  */
-
-#ifdef __cplusplus
-#if !(defined(_BEGIN_STD_C) && defined(_END_STD_C))
-#ifdef _HAVE_STD_CXX
-#define _BEGIN_STD_C namespace std { extern "C" {
-#define _END_STD_C  } }
-#else
-#define _BEGIN_STD_C extern "C" {
-#define _END_STD_C  }
-#endif
-#endif
-#else
-#define _BEGIN_STD_C
-#define _END_STD_C
-#endif
-
 #endif /* _ANSIDECL_H_ */
diff --git a/newlib/libc/include/_syslist.h b/newlib/libc/include/_syslist.h
index 0bf76e1..fa552fb 100644
--- a/newlib/libc/include/_syslist.h
+++ b/newlib/libc/include/_syslist.h
@@ -2,7 +2,6 @@
    and only provide C names, so that we end up in violation of ANSI */
 #ifndef __SYSLIST_H
 #define __SYSLIST_H
-
 #ifdef MISSING_SYSCALL_NAMES
 #define _close close
 #define _execve execve
@@ -22,17 +21,9 @@
 #define _unlink unlink
 #define _wait wait
 #define _write write
-#endif /* MISSING_SYSCALL_NAMES */
-
-#if defined MISSING_SYSCALL_NAMES || !defined HAVE_OPENDIR
-/* If the system call interface is missing opendir, readdir, and
-   closedir, there is an implementation of these functions in
-   libc/posix that is implemented using open, getdents, and close. 
-   Note, these functions are currently not in the libc/syscalls
-   directory.  */
+/* functions not yet sysfaked */
 #define _opendir opendir
 #define _readdir readdir
 #define _closedir closedir
-#endif /* MISSING_SYSCALL_NAMES || !HAVE_OPENDIR */
-
-#endif /* !__SYSLIST_H_ */
+#endif
+#endif
diff --git a/newlib/libc/include/argz.h b/newlib/libc/include/argz.h
deleted file mode 100644
index 76afc06..0000000
--- a/newlib/libc/include/argz.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-
-/* The newlib implementation of these functions assumes that sizeof(char) == 1. */
-error_t argz_create (char *const argv[], char **argz, size_t *argz_len);
-error_t argz_create_sep (const char *string, int sep, char **argz, size_t *argz_len);
-size_t argz_count (const char *argz, size_t argz_len);
-void argz_extract (char *argz, size_t argz_len, char **argv);
-void argz_stringify (char *argz, size_t argz_len, int sep);
-error_t argz_add (char **argz, size_t *argz_len, const char *str);
-error_t argz_add_sep (char **argz, size_t *argz_len, const char *str, int sep);
-error_t argz_append (char **argz, size_t *argz_len, const char *buf, size_t buf_len);
-error_t argz_delete (char **argz, size_t *argz_len, char *entry);
-error_t argz_insert (char **argz, size_t *argz_len, char *before, const char *entry);
-char * argz_next (char *argz, size_t argz_len, const char *entry);
-error_t argz_replace (char **argz, size_t *argz_len, const char *str, const char *with, unsigned *replace_count);
diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h
index c1ace50..18dd02f 100644
--- a/newlib/libc/include/ctype.h
+++ b/newlib/libc/include/ctype.h
@@ -1,10 +1,11 @@
 #ifndef _CTYPE_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 #define _CTYPE_H_
 
 #include "_ansi.h"
 
-_BEGIN_STD_C
-
 int _EXFUN(isalnum, (int __c));
 int _EXFUN(isalpha, (int __c));
 int _EXFUN(iscntrl, (int __c));
@@ -20,7 +21,6 @@ int _EXFUN(tolower, (int __c));
 int _EXFUN(toupper, (int __c));
 
 #ifndef __STRICT_ANSI__
-int _EXFUN(isblank, (int __c));
 int _EXFUN(isascii, (int __c));
 int _EXFUN(toascii, (int __c));
 int _EXFUN(_tolower, (int __c));
@@ -36,23 +36,20 @@ int _EXFUN(_toupper, (int __c));
 #define _X	0100
 #define	_B	0200
 
-extern	__IMPORT _CONST char	*__ctype_ptr;
-extern	__IMPORT _CONST char	_ctype_[];  /* For backward compatibility.  */
+extern	__IMPORT _CONST char	_ctype_[];
 
 #ifndef __cplusplus
-#define	isalpha(c)	((__ctype_ptr)[(unsigned)(c)]&(_U|_L))
-#define	isupper(c)	((__ctype_ptr)[(unsigned)(c)]&_U)
-#define	islower(c)	((__ctype_ptr)[(unsigned)(c)]&_L)
-#define	isdigit(c)	((__ctype_ptr)[(unsigned)(c)]&_N)
-#define	isxdigit(c)	((__ctype_ptr)[(unsigned)(c)]&(_X|_N))
-#define	isspace(c)	((__ctype_ptr)[(unsigned)(c)]&_S)
-#define ispunct(c)	((__ctype_ptr)[(unsigned)(c)]&_P)
-#define isalnum(c)	((__ctype_ptr)[(unsigned)(c)]&(_U|_L|_N))
-#define isprint(c)	((__ctype_ptr)[(unsigned)(c)]&(_P|_U|_L|_N|_B))
-#define	isgraph(c)	((__ctype_ptr)[(unsigned)(c)]&(_P|_U|_L|_N))
-#define iscntrl(c)	((__ctype_ptr)[(unsigned)(c)]&_C)
-
-
+#define	isalpha(c)	((_ctype_+1)[(unsigned)(c)]&(_U|_L))
+#define	isupper(c)	((_ctype_+1)[(unsigned)(c)]&_U)
+#define	islower(c)	((_ctype_+1)[(unsigned)(c)]&_L)
+#define	isdigit(c)	((_ctype_+1)[(unsigned)(c)]&_N)
+#define	isxdigit(c)	((_ctype_+1)[(unsigned)(c)]&(_X|_N))
+#define	isspace(c)	((_ctype_+1)[(unsigned)(c)]&_S)
+#define ispunct(c)	((_ctype_+1)[(unsigned)(c)]&_P)
+#define isalnum(c)	((_ctype_+1)[(unsigned)(c)]&(_U|_L|_N))
+#define isprint(c)	((_ctype_+1)[(unsigned)(c)]&(_P|_U|_L|_N|_B))
+#define	isgraph(c)	((_ctype_+1)[(unsigned)(c)]&(_P|_U|_L|_N))
+#define iscntrl(c)	((_ctype_+1)[(unsigned)(c)]&_C)
 /* Non-gcc versions will get the library versions, and will be
    slightly slower */
 #ifdef __GNUC__
@@ -68,6 +65,7 @@ extern	__IMPORT _CONST char	_ctype_[];  /* For backward compatibility.  */
 #define toascii(c)	((c)&0177)
 #endif
 
-_END_STD_C
-
+#ifdef __cplusplus
+}
+#endif
 #endif /* _CTYPE_H_ */
diff --git a/newlib/libc/include/envz.h b/newlib/libc/include/envz.h
deleted file mode 100644
index e6a31c3..0000000
--- a/newlib/libc/include/envz.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <errno.h>
-#include <sys/types.h>
-
-/* The newlib implementation of these functions assumes that sizeof(char) == 1. */
-char * envz_entry (const char *envz, size_t envz_len, const char *name);
-char * envz_get (const char *envz, size_t envz_len, const char *name);
-error_t envz_add (char **envz, size_t *envz_len, const char *name, const char *value);
-error_t envz_merge (char **envz, size_t *envz_len, const char *envz2, size_t envz2_len, int override);
-void envz_remove(char **envz, size_t *envz_len, const char *name);
-void envz_strip (char **envz, size_t *envz_len);
diff --git a/newlib/libc/include/errno.h b/newlib/libc/include/errno.h
index 7cc2ca8..fa8efb7 100644
--- a/newlib/libc/include/errno.h
+++ b/newlib/libc/include/errno.h
@@ -1,11 +1 @@
-#ifndef __ERRNO_H__
-#define __ERRNO_H__
-
-#ifndef __error_t_defined
-typedef int error_t;
-#define __error_t_defined 1
-#endif
-
 #include <sys/errno.h>
-
-#endif /* !__ERRNO_H__ */
diff --git a/newlib/libc/include/getopt.h b/newlib/libc/include/getopt.h
deleted file mode 100644
index 7179298..0000000
--- a/newlib/libc/include/getopt.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/****************************************************************************
-
-getopt.h - Read command line options
-
-AUTHOR: Gregory Pietsch
-CREATED Thu Jan 09 22:37:00 1997
-
-DESCRIPTION:
-
-The getopt() function parses the command line arguments.  Its arguments argc
-and argv are the argument count and array as passed to the main() function
-on program invocation.  The argument optstring is a list of available option
-characters.  If such a character is followed by a colon (`:'), the option
-takes an argument, which is placed in optarg.  If such a character is
-followed by two colons, the option takes an optional argument, which is
-placed in optarg.  If the option does not take an argument, optarg is NULL.
-
-The external variable optind is the index of the next array element of argv
-to be processed; it communicates from one call to the next which element to
-process.
-
-The getopt_long() function works like getopt() except that it also accepts
-long options started by two dashes `--'.  If these take values, it is either
-in the form
-
---arg=value
-
- or
-
---arg value
-
-It takes the additional arguments longopts which is a pointer to the first
-element of an array of type GETOPT_LONG_OPTION_T, defined below.  The last
-element of the array has to be filled with NULL for the name field.
-
-The longind pointer points to the index of the current long option relative
-to longopts if it is non-NULL.
-
-The getopt() function returns the option character if the option was found
-successfully, `:' if there was a missing parameter for one of the options,
-`?' for an unknown option character, and EOF for the end of the option list.
-
-The getopt_long() function's return value is described below.
-
-The function getopt_long_only() is identical to getopt_long(), except that a
-plus sign `+' can introduce long options as well as `--'.
-
-Describe how to deal with options that follow non-option ARGV-elements.
-
-If the caller did not specify anything, the default is REQUIRE_ORDER if the
-environment variable POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-REQUIRE_ORDER means don't recognize them as options; stop option processing
-when the first non-option is seen.  This is what Unix does.  This mode of
-operation is selected by either setting the environment variable
-POSIXLY_CORRECT, or using `+' as the first character of the optstring
-parameter.
-
-PERMUTE is the default.  We permute the contents of ARGV as we scan, so that
-eventually all the non-options are at the end.  This allows options to be
-given in any order, even with programs that were not written to expect this.
-
-RETURN_IN_ORDER is an option available to programs that were written to
-expect options and other ARGV-elements in any order and that care about the
-ordering of the two.  We describe each non-option ARGV-element as if it were
-the argument of an option with character code 1.  Using `-' as the first
-character of the optstring parameter selects this mode of operation.
-
-The special argument `--' forces an end of option-scanning regardless of the
-value of `ordering'.  In the case of RETURN_IN_ORDER, only `--' can cause
-getopt() and friends to return EOF with optind != argc.
-
-COPYRIGHT NOTICE AND DISCLAIMER:
-
-Copyright (C) 1997 Gregory Pietsch
-
-This file and the accompanying getopt.c implementation file are hereby 
-placed in the public domain without restrictions.  Just give the author 
-credit, don't claim you wrote it or prevent anyone else from using it.
-
-Gregory Pietsch's current e-mail address:
-gpietsch@comcast.net
-****************************************************************************/
-
-#ifndef GETOPT_H
-#define GETOPT_H
-
-#include <_ansi.h>
-
-/* include files needed by this include file */
-
-/* macros defined by this include file */
-#define NO_ARG          0
-#define REQUIRED_ARG    1
-#define OPTIONAL_ARG    2
-
-/* types defined by this include file */
-
-struct option
-{
-  char *name;                   /* the name of the long option */
-  int has_arg;                  /* one of the above macros */
-  int *flag;                    /* determines if getopt_long() returns a
-                                 * value for a long option; if it is
-                                 * non-NULL, 0 is returned as a function
-                                 * value and the value of val is stored in
-                                 * the area pointed to by flag.  Otherwise,
-                                 * val is returned. */
-  int val;                      /* determines the value to return if flag is
-                                 * NULL. */
-};
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-  /* externally-defined variables */
-  extern char *optarg;
-  extern int optind;
-  extern int opterr;
-  extern int optopt;
-
-  /* function prototypes */
-  int _EXFUN (getopt, (int __argc, char *const __argv[], const char *__optstring));
-  int _EXFUN (getopt_long, (int __argc, char *const __argv[], const char *__shortopts, const struct option *__longopts, int *__longind));
-  int _EXFUN (getopt_long_only, (int __argc, char *const __argv[], const char *__shortopts, const struct option *__longopts, int *__longind));
-
-#ifdef __cplusplus
-};
-
-#endif
-
-#endif /* GETOPT_H */
-
-/* END OF FILE getopt.h */
diff --git a/newlib/libc/include/grp.h b/newlib/libc/include/grp.h
index 1273e39..2e676f3 100644
--- a/newlib/libc/include/grp.h
+++ b/newlib/libc/include/grp.h
@@ -44,9 +44,6 @@
 #define	_GRP_H_
 
 #include <sys/types.h>
-#ifdef __CYGWIN__
-#include <cygwin/grp.h>
-#endif
 
 #if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 #define	_PATH_GROUP		"/etc/group"
@@ -59,11 +56,11 @@ struct group {
 	char	**gr_mem;		/* group members */
 };
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef __INSIDE_CYGWIN__
 struct group	*getgrgid (gid_t);
 struct group	*getgrnam (const char *);
 int		 getgrnam_r (const char *, struct group *,
@@ -74,18 +71,13 @@ int		 getgrgid_r (gid_t, struct group *,
 struct group	*getgrent (void);
 void		 setgrent (void);
 void		 endgrent (void);
-#ifndef __CYGWIN__
 void		 setgrfile (const char *);
-#endif /* !__CYGWIN__ */
 #ifndef _XOPEN_SOURCE
-#ifndef __CYGWIN__
 char		*group_from_gid (gid_t, int);
 int		 setgroupent (int);
-#endif /* !__CYGWIN__ */
 int		 initgroups (const char *, gid_t);
 #endif /* !_XOPEN_SOURCE */
 #endif /* !_POSIX_SOURCE */
-#endif /* !__INSIDE_CYGWIN__ */
 
 #ifdef __cplusplus
 }
diff --git a/newlib/libc/include/iconv.h b/newlib/libc/include/iconv.h
deleted file mode 100644
index 5b8fcec..0000000
--- a/newlib/libc/include/iconv.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy, SoftMine Corporation.
- * Rights transferred to Franklin Electronic Publishers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef _ICONV_H_
-#define _ICONV_H_
-
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/types.h>
-#include <sys/_types.h>
-
-/* iconv_t: charset conversion descriptor type */
-typedef _iconv_t iconv_t;
-
-_BEGIN_STD_C
-
-#ifndef _REENT_ONLY
-iconv_t 
-_EXFUN(iconv_open, (_CONST char *, _CONST char *));
-
-size_t
-_EXFUN(iconv, (iconv_t, _CONST char **, size_t *, char **, size_t *));
-
-int
-_EXFUN(iconv_close, (iconv_t));
-#endif
-
-iconv_t
-_EXFUN(_iconv_open_r, (struct _reent *, _CONST char *, _CONST char *));
-
-size_t
-_EXFUN(_iconv_r, (struct _reent *, iconv_t, _CONST char **, 
-                  size_t *, char **, size_t *));
-
-int
-_EXFUN(_iconv_close_r, (struct _reent *, iconv_t));
-
-_END_STD_C
-
-#endif /* #ifndef _ICONV_H_ */
diff --git a/newlib/libc/include/ieeefp.h b/newlib/libc/include/ieeefp.h
index e08fd08..78bb5bf 100644
--- a/newlib/libc/include/ieeefp.h
+++ b/newlib/libc/include/ieeefp.h
@@ -5,8 +5,6 @@
 
 #include <machine/ieeefp.h>
 
-_BEGIN_STD_C
-
 /* FIXME FIXME FIXME:
    Neither of __ieee_{float,double}_shape_tape seem to be used anywhere
    except in libm/test.  If that is the case, please delete these from here.
@@ -184,9 +182,6 @@ typedef int fp_rdi;
 fp_rdi _EXFUN(fpgetroundtoi,(void));
 fp_rdi _EXFUN(fpsetroundtoi,(fp_rdi));
 
-#undef isnan
-#undef isinf
-
 int _EXFUN(isnan, (double));
 int _EXFUN(isinf, (double));
 int _EXFUN(finite, (double));
@@ -243,6 +238,4 @@ int _EXFUN(finitef, (float));
 
 #endif /* _DOUBLE_IS_32BITS */
 
-_END_STD_C
-
 #endif /* _IEEE_FP_H_ */
diff --git a/newlib/libc/include/inttypes.h b/newlib/libc/include/inttypes.h
deleted file mode 100644
index 0bcbd31..0000000
--- a/newlib/libc/include/inttypes.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Copyright (c) 2004, 2005 by
- * Ralf Corsepius, Ulm/Germany. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-/**
- *  @file  inttypes.h
- */
-
-#ifndef _INTTYPES_H
-#define _INTTYPES_H
-
-#include <stdint.h>
-#define __need_wchar_t
-#include <stddef.h>
-
-#define __STRINGIFY(a) #a
-
-/* 8-bit types */
-#define __PRI8(x) __STRINGIFY(x)
-#define __SCN8(x) __STRINGIFY(hh##x)
-
-
-#define PRId8		__PRI8(d)
-#define PRIi8		__PRI8(i)
-#define PRIo8		__PRI8(o)
-#define PRIu8		__PRI8(u)
-#define PRIx8		__PRI8(x)
-#define PRIX8		__PRI8(X)
-
-#define SCNd8		__SCN8(d)
-#define SCNi8		__SCN8(i)
-#define SCNo8		__SCN8(o)
-#define SCNu8		__SCN8(u)
-#define SCNx8		__SCN8(x)
-
-
-#define PRIdLEAST8	__PRI8(d)
-#define PRIiLEAST8	__PRI8(i)
-#define PRIoLEAST8	__PRI8(o)
-#define PRIuLEAST8	__PRI8(u)
-#define PRIxLEAST8	__PRI8(x)
-#define PRIXLEAST8	__PRI8(X)
-
-#define SCNdLEAST8	__SCN8(d)
-#define SCNiLEAST8	__SCN8(i)
-#define SCNoLEAST8	__SCN8(o)
-#define SCNuLEAST8	__SCN8(u)
-#define SCNxLEAST8	__SCN8(x)
-
-
-#define PRIdFAST8	__PRI8(d)
-#define PRIiFAST8	__PRI8(i)
-#define PRIoFAST8	__PRI8(o)
-#define PRIuFAST8	__PRI8(u)
-#define PRIxFAST8	__PRI8(x)
-#define PRIXFAST8	__PRI8(X)
-
-#define SCNdFAST8	__SCN8(d)
-#define SCNiFAST8	__SCN8(i)
-#define SCNoFAST8	__SCN8(o)
-#define SCNuFAST8	__SCN8(u)
-#define SCNxFAST8	__SCN8(x)
-
-/* 16-bit types */
-#define __PRI16(x) __STRINGIFY(x)
-#define __SCN16(x) __STRINGIFY(h##x)
-
-
-#define PRId16		__PRI16(d)
-#define PRIi16		__PRI16(i)
-#define PRIo16		__PRI16(o)
-#define PRIu16		__PRI16(u)
-#define PRIx16		__PRI16(x)
-#define PRIX16		__PRI16(X)
-
-#define SCNd16		__SCN16(d)
-#define SCNi16		__SCN16(i)
-#define SCNo16		__SCN16(o)
-#define SCNu16		__SCN16(u)
-#define SCNx16		__SCN16(x)
-
-
-#define PRIdLEAST16	__PRI16(d)
-#define PRIiLEAST16	__PRI16(i)
-#define PRIoLEAST16	__PRI16(o)
-#define PRIuLEAST16	__PRI16(u)
-#define PRIxLEAST16	__PRI16(x)
-#define PRIXLEAST16	__PRI16(X)
-
-#define SCNdLEAST16	__SCN16(d)
-#define SCNiLEAST16	__SCN16(i)
-#define SCNoLEAST16	__SCN16(o)
-#define SCNuLEAST16	__SCN16(u)
-#define SCNxLEAST16	__SCN16(x)
-
-
-#define PRIdFAST16	__PRI16(d)
-#define PRIiFAST16	__PRI16(i)
-#define PRIoFAST16	__PRI16(o)
-#define PRIuFAST16	__PRI16(u)
-#define PRIxFAST16	__PRI16(x)
-#define PRIXFAST16	__PRI16(X)
-
-#define SCNdFAST16	__SCN16(d)
-#define SCNiFAST16	__SCN16(i)
-#define SCNoFAST16	__SCN16(o)
-#define SCNuFAST16	__SCN16(u)
-#define SCNxFAST16	__SCN16(x)
-
-/* 32-bit types */
-#if __have_long32
-#define __PRI32(x) __STRINGIFY(l##x)
-#define __SCN32(x) __STRINGIFY(l##x)
-#else
-#define __PRI32(x) __STRINGIFY(x)
-#define __SCN32(x) __STRINGIFY(x)
-#endif
-
-#define PRId32		__PRI32(d)
-#define PRIi32		__PRI32(i)
-#define PRIo32		__PRI32(o)
-#define PRIu32		__PRI32(u)
-#define PRIx32		__PRI32(x)
-#define PRIX32		__PRI32(X)
-
-#define SCNd32		__SCN32(d)
-#define SCNi32		__SCN32(i)
-#define SCNo32		__SCN32(o)
-#define SCNu32		__SCN32(u)
-#define SCNx32		__SCN32(x)
-
-
-#define PRIdLEAST32	__PRI32(d)
-#define PRIiLEAST32	__PRI32(i)
-#define PRIoLEAST32	__PRI32(o)
-#define PRIuLEAST32	__PRI32(u)
-#define PRIxLEAST32	__PRI32(x)
-#define PRIXLEAST32	__PRI32(X)
-
-#define SCNdLEAST32	__SCN32(d)
-#define SCNiLEAST32	__SCN32(i)
-#define SCNoLEAST32	__SCN32(o)
-#define SCNuLEAST32	__SCN32(u)
-#define SCNxLEAST32	__SCN32(x)
-
-
-#define PRIdFAST32	__PRI32(d)
-#define PRIiFAST32	__PRI32(i)
-#define PRIoFAST32	__PRI32(o)
-#define PRIuFAST32	__PRI32(u)
-#define PRIxFAST32	__PRI32(x)
-#define PRIXFAST32	__PRI32(X)
-
-#define SCNdFAST32	__SCN32(d)
-#define SCNiFAST32	__SCN32(i)
-#define SCNoFAST32	__SCN32(o)
-#define SCNuFAST32	__SCN32(u)
-#define SCNxFAST32	__SCN32(x)
-
-
-/* 64-bit types */
-#if __have_longlong64
-#define __PRI64(x) __STRINGIFY(ll##x)
-#define __SCN64(x) __STRINGIFY(ll##x)
-#elif __have_long64
-#define __PRI64(x) __STRINGIFY(l##x)
-#define __SCN64(x) __STRINGIFY(l##x)
-#else
-#define __PRI64(x) __STRINGIFY(x)
-#define __SCN64(x) __STRINGIFY(x)
-#endif
-
-#define PRId64		__PRI64(d)
-#define PRIi64		__PRI64(i)
-#define PRIo64		__PRI64(o)
-#define PRIu64		__PRI64(u)
-#define PRIx64		__PRI64(x)
-#define PRIX64		__PRI64(X)
-
-#define SCNd64		__SCN64(d)
-#define SCNi64		__SCN64(i)
-#define SCNo64		__SCN64(o)
-#define SCNu64		__SCN64(u)
-#define SCNx64		__SCN64(x)
-
-#if __int64_t_defined
-#define PRIdLEAST64	__PRI64(d)
-#define PRIiLEAST64	__PRI64(i)
-#define PRIoLEAST64	__PRI64(o)
-#define PRIuLEAST64	__PRI64(u)
-#define PRIxLEAST64	__PRI64(x)
-#define PRIXLEAST64	__PRI64(X)
-
-#define SCNdLEAST64	__SCN64(d)
-#define SCNiLEAST64	__SCN64(i)
-#define SCNoLEAST64	__SCN64(o)
-#define SCNuLEAST64	__SCN64(u)
-#define SCNxLEAST64	__SCN64(x)
-
-
-#define PRIdFAST64	__PRI64(d)
-#define PRIiFAST64	__PRI64(i)
-#define PRIoFAST64	__PRI64(o)
-#define PRIuFAST64	__PRI64(u)
-#define PRIxFAST64	__PRI64(x)
-#define PRIXFAST64	__PRI64(X)
-
-#define SCNdFAST64	__SCN64(d)
-#define SCNiFAST64	__SCN64(i)
-#define SCNoFAST64	__SCN64(o)
-#define SCNuFAST64	__SCN64(u)
-#define SCNxFAST64	__SCN64(x)
-#endif
-
-/* max-bit types */
-#if __have_longlong64
-#define __PRIMAX(x) __STRINGIFY(ll##x)
-#define __SCNMAX(x) __STRINGIFY(ll##x)
-#elif __have_long64
-#define __PRIMAX(x) __STRINGIFY(l##x)
-#define __SCNMAX(x) __STRINGIFY(l##x)
-#else
-#define __PRIMAX(x) __STRINGIFY(x)
-#define __SCNMAX(x) __STRINGIFY(x)
-#endif
-
-#define PRIdMAX		__PRIMAX(d)
-#define PRIiMAX		__PRIMAX(i)
-#define PRIoMAX		__PRIMAX(o)
-#define PRIuMAX		__PRIMAX(u)
-#define PRIxMAX		__PRIMAX(x)
-#define PRIXMAX		__PRIMAX(X)
-
-#define SCNdMAX		__SCNMAX(d)
-#define SCNiMAX		__SCNMAX(i)
-#define SCNoMAX		__SCNMAX(o)
-#define SCNuMAX		__SCNMAX(u)
-#define SCNxMAX		__SCNMAX(x)
-
-/* ptr types */
-#if __have_longlong64
-#define __PRIPTR(x) __STRINGIFY(ll##x)
-#define __SCNPTR(x) __STRINGIFY(ll##x)
-#elif __have_long64
-#define __PRIPTR(x) __STRINGIFY(l##x)
-#define __SCNPTR(x) __STRINGIFY(l##x)
-#else
-#define __PRIPTR(x) __STRINGIFY(x)
-#define __SCNPTR(x) __STRINGIFY(x)
-#endif
-
-#define PRIdPTR		__PRIPTR(d)
-#define PRIiPTR		__PRIPTR(i)
-#define PRIoPTR		__PRIPTR(o)
-#define PRIuPTR		__PRIPTR(u)
-#define PRIxPTR		__PRIPTR(x)
-#define PRIXPTR		__PRIPTR(X)
-
-#define SCNdPTR		__SCNPTR(d)
-#define SCNiPTR		__SCNPTR(i)
-#define SCNoPTR		__SCNPTR(o)
-#define SCNuPTR		__SCNPTR(u)
-#define SCNxPTR		__SCNPTR(x)
-
-
-typedef struct {
-  intmax_t	quot;
-  intmax_t	rem;
-} imaxdiv_t;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern intmax_t  imaxabs(intmax_t j);
-extern imaxdiv_t imaxdiv(intmax_t numer, intmax_t denomer);
-extern intmax_t  strtoimax(const char *__restrict, char **__restrict, int);
-extern uintmax_t strtoumax(const char *__restrict, char **__restrict, int);
-extern intmax_t  wcstoimax(const wchar_t *__restrict, wchar_t **__restrict, int);
-extern uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/newlib/libc/include/langinfo.h b/newlib/libc/include/langinfo.h
deleted file mode 100644
index 33ae8d0..0000000
--- a/newlib/libc/include/langinfo.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-
- * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/include/langinfo.h,v 1.5 2002/03/23 17:24:53 imp Exp $
- */
-
-#ifndef _LANGINFO_H_
-#define	_LANGINFO_H_
-
-#include <sys/cdefs.h>
-
-typedef int nl_item;
-
-/* Extract the category and item index from a constructed `nl_item' value.  */
-#define _NL_ITEM_CATEGORY(item)		((int) (item) >> 16)
-#define _NL_ITEM_INDEX(item)		((int) (item) & 0xffff)
-
-#define	CODESET		0	/* codeset name */
-#define	D_T_FMT		1	/* string for formatting date and time */
-#define	D_FMT		2	/* date format string */
-#define	T_FMT		3	/* time format string */
-#define	T_FMT_AMPM	4	/* a.m. or p.m. time formatting string */
-#define	AM_STR		5	/* Ante Meridian affix */
-#define	PM_STR		6	/* Post Meridian affix */
-
-/* week day names */
-#define	DAY_1		7
-#define	DAY_2		8
-#define	DAY_3		9
-#define	DAY_4		10
-#define	DAY_5		11
-#define	DAY_6		12
-#define	DAY_7		13
-
-/* abbreviated week day names */
-#define	ABDAY_1		14
-#define	ABDAY_2		15
-#define	ABDAY_3		16
-#define	ABDAY_4		17
-#define	ABDAY_5		18
-#define	ABDAY_6		19
-#define	ABDAY_7		20
-
-/* month names */
-#define	MON_1		21
-#define	MON_2		22
-#define	MON_3		23
-#define	MON_4		24
-#define	MON_5		25
-#define	MON_6		26
-#define	MON_7		27
-#define	MON_8		28
-#define	MON_9		29
-#define	MON_10		30
-#define	MON_11		31
-#define	MON_12		32
-
-/* abbreviated month names */
-#define	ABMON_1		33
-#define	ABMON_2		34
-#define	ABMON_3		35
-#define	ABMON_4		36
-#define	ABMON_5		37
-#define	ABMON_6		38
-#define	ABMON_7		39
-#define	ABMON_8		40
-#define	ABMON_9		41
-#define	ABMON_10	42
-#define	ABMON_11	43
-#define	ABMON_12	44
-
-#define	ERA		45	/* era description segments */
-#define	ERA_D_FMT	46	/* era date format string */
-#define	ERA_D_T_FMT	47	/* era date and time format string */
-#define	ERA_T_FMT	48	/* era time format string */
-#define	ALT_DIGITS	49	/* alternative symbols for digits */
-
-#define	RADIXCHAR	50	/* radix char */
-#define	THOUSEP		51	/* separator for thousands */
-
-#define	YESEXPR		52	/* affirmative response expression */
-#define	NOEXPR		53	/* negative response expression */
-#define	YESSTR		54	/* affirmative response for yes/no queries */
-#define	NOSTR		55	/* negative response for yes/no queries */
-
-#define	CRNCYSTR	56	/* currency symbol */
-
-#define	D_MD_ORDER	57	/* month/day order (local extension) */
-
-#define _NL_CTYPE_TRANSLIT_TAB_SIZE 58
-#define _NL_CTYPE_TRANSLIT_FROM_IDX 59
-#define _NL_CTYPE_TRANSLIT_FROM_TBL 60
-#define _NL_CTYPE_TRANSLIT_TO_IDX 61
-#define _NL_CTYPE_TRANSLIT_TO_TBL 62
-#define _NL_CTYPE_TRANSLIT_DEFAULT_MISSING_LEN 63
-#define _NL_CTYPE_TRANSLIT_DEFAULT_MISSING 64
-#define _NL_CTYPE_TRANSLIT_IGNORE_LEN 65
-#define _NL_CTYPE_TRANSLIT_IGNORE 66
-#define _NL_CTYPE_EXTRA_MAP_1 70
-#define _NL_CTYPE_EXTRA_MAP_2 71
-#define _NL_CTYPE_EXTRA_MAP_3 72
-#define _NL_CTYPE_EXTRA_MAP_4 73
-#define _NL_CTYPE_EXTRA_MAP_5 74
-#define _NL_CTYPE_EXTRA_MAP_6 75
-#define _NL_CTYPE_EXTRA_MAP_7 76
-#define _NL_CTYPE_EXTRA_MAP_8 77
-#define _NL_CTYPE_EXTRA_MAP_9 78
-#define _NL_CTYPE_EXTRA_MAP_10 79
-#define _NL_CTYPE_EXTRA_MAP_11 80
-#define _NL_CTYPE_EXTRA_MAP_12 81
-#define _NL_CTYPE_EXTRA_MAP_13 82
-#define _NL_CTYPE_EXTRA_MAP_14 83
-
-__BEGIN_DECLS
-char	*nl_langinfo(nl_item);
-__END_DECLS
-
-#endif /* !_LANGINFO_H_ */
diff --git a/newlib/libc/include/libgen.h b/newlib/libc/include/libgen.h
deleted file mode 100644
index abfab0e..0000000
--- a/newlib/libc/include/libgen.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * libgen.h - defined by XPG4
- */
-
-#ifndef _LIBGEN_H_
-#define _LIBGEN_H_
-
-#include "_ansi.h"
-#include <sys/reent.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-char      *_EXFUN(basename,     (char *));
-char      *_EXFUN(dirname,     (char *));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _LIBGEN_H_ */
-
diff --git a/newlib/libc/include/limits.h b/newlib/libc/include/limits.h
deleted file mode 100644
index 53a7a41..0000000
--- a/newlib/libc/include/limits.h
+++ /dev/null
@@ -1,127 +0,0 @@
-#ifndef _LIBC_LIMITS_H_
-# define _LIBC_LIMITS_H_	1
-
-#include <newlib.h>
-
-# ifdef _MB_LEN_MAX
-#  define MB_LEN_MAX	_MB_LEN_MAX
-# else
-#  define MB_LEN_MAX    1
-# endif
-
-/* if do not have #include_next support, then we
-   have to define the limits here. */
-# if !defined __GNUC__ || __GNUC__ < 2
-
-#  ifndef _LIMITS_H
-#   define _LIMITS_H	1
-
-#   include <sys/config.h>
-
-/* Number of bits in a `char'.  */
-#   undef CHAR_BIT
-#   define CHAR_BIT 8
-
-/* Minimum and maximum values a `signed char' can hold.  */
-#   undef SCHAR_MIN
-#   define SCHAR_MIN (-128)
-#   undef SCHAR_MAX
-#   define SCHAR_MAX 127
-
-/* Maximum value an `unsigned char' can hold.  (Minimum is 0).  */
-#   undef UCHAR_MAX
-#   define UCHAR_MAX 255
-
-/* Minimum and maximum values a `char' can hold.  */
-#   ifdef __CHAR_UNSIGNED__
-#    undef CHAR_MIN
-#    define CHAR_MIN 0
-#    undef CHAR_MAX
-#    define CHAR_MAX 255
-#   else
-#    undef CHAR_MIN
-#    define CHAR_MIN (-128)
-#    undef CHAR_MAX
-#    define CHAR_MAX 127
-#   endif
-
-/* Minimum and maximum values a `signed short int' can hold.  */
-#   undef SHRT_MIN
-/* For the sake of 16 bit hosts, we may not use -32768 */
-#   define SHRT_MIN (-32767-1)
-#   undef SHRT_MAX
-#   define SHRT_MAX 32767
-
-/* Maximum value an `unsigned short int' can hold.  (Minimum is 0).  */
-#   undef USHRT_MAX
-#   define USHRT_MAX 65535
-
-/* Minimum and maximum values a `signed int' can hold.  */
-#   ifndef __INT_MAX__
-#    define __INT_MAX__ 2147483647
-#   endif
-#   undef INT_MIN
-#   define INT_MIN (-INT_MAX-1)
-#   undef INT_MAX
-#   define INT_MAX __INT_MAX__
-
-/* Maximum value an `unsigned int' can hold.  (Minimum is 0).  */
-#   undef UINT_MAX
-#   define UINT_MAX (INT_MAX * 2U + 1)
-
-/* Minimum and maximum values a `signed long int' can hold.
-   (Same as `int').  */
-#   ifndef __LONG_MAX__
-#    if defined (__alpha__) || (defined (__sparc__) && defined(__arch64__)) || defined (__sparcv9)
-#     define __LONG_MAX__ 9223372036854775807L
-#    else
-#     define __LONG_MAX__ 2147483647L
-#    endif /* __alpha__ || sparc64 */
-#   endif
-#   undef LONG_MIN
-#   define LONG_MIN (-LONG_MAX-1)
-#   undef LONG_MAX
-#   define LONG_MAX __LONG_MAX__
-
-/* Maximum value an `unsigned long int' can hold.  (Minimum is 0).  */
-#   undef ULONG_MAX
-#   define ULONG_MAX (LONG_MAX * 2UL + 1)
-
-#   ifndef __LONG_LONG_MAX__
-#    define __LONG_LONG_MAX__ 9223372036854775807LL
-#   endif
-
-#   if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-/* Minimum and maximum values a `signed long long int' can hold.  */
-#    undef LLONG_MIN
-#    define LLONG_MIN (-LLONG_MAX-1)
-#    undef LLONG_MAX
-#    define LLONG_MAX __LONG_LONG_MAX__
-
-/* Maximum value an `unsigned long long int' can hold.  (Minimum is 0).  */
-#    undef ULLONG_MAX
-#    define ULLONG_MAX (LLONG_MAX * 2ULL + 1)
-#   endif
-
-#  if defined (__GNU_LIBRARY__) ? defined (__USE_GNU) : !defined (__STRICT_ANSI__)
-/* Minimum and maximum values a `signed long long int' can hold.  */
-#    undef LONG_LONG_MIN
-#    define LONG_LONG_MIN (-LONG_LONG_MAX-1)
-#    undef LONG_LONG_MAX
-#    define LONG_LONG_MAX __LONG_LONG_MAX__
-
-/* Maximum value an `unsigned long long int' can hold.  (Minimum is 0).  */
-#    undef ULONG_LONG_MAX
-#    define ULONG_LONG_MAX (LONG_LONG_MAX * 2ULL + 1)
-#   endif
-
-#  endif /* _LIMITS_H  */
-# endif	 /* GCC 2.  */
-
-#endif	 /* !_LIBC_LIMITS_H_ */
-
-#if defined __GNUC__ && !defined _GCC_LIMITS_H_
-/* `_GCC_LIMITS_H_' is what GCC's file defines.  */
-# include_next <limits.h>
-#endif /* __GNUC__ && !_GCC_LIMITS_H_ */
-
diff --git a/newlib/libc/include/locale.h b/newlib/libc/include/locale.h
index ebe1422..4718248 100644
--- a/newlib/libc/include/locale.h
+++ b/newlib/libc/include/locale.h
@@ -5,6 +5,9 @@
 */
 
 #ifndef _LOCALE_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 #define _LOCALE_H_
 
 #include "_ansi.h"
@@ -21,8 +24,6 @@
 #define LC_TIME     5
 #define LC_MESSAGES 6
 
-_BEGIN_STD_C
-
 struct lconv
 {
   char *decimal_point;
@@ -54,6 +55,7 @@ struct _reent;
 char *_EXFUN(_setlocale_r,(struct _reent *, int category, const char *locale));
 struct lconv *_EXFUN(_localeconv_r,(struct _reent *));
 
-_END_STD_C
-
+#ifdef __cplusplus
+}
+#endif
 #endif /* _LOCALE_H_ */
diff --git a/newlib/libc/include/machine/_types.h b/newlib/libc/include/machine/_types.h
deleted file mode 100644
index 450ad4a..0000000
--- a/newlib/libc/include/machine/_types.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef _MACHINE__TYPES_H
-#define _MACHINE__TYPES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Guess on types by examining *_MIN / *_MAX defines.
- */
-#if defined(__GNUC__) && (__GNUC__ >= 3 ) \
-  && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ > 2 ) 
-/* GCC >= 3.3.0 has __<val>__ implicitly defined. */
-#define __EXP(x) __##x##__
-#else
-/* Fall back to POSIX versions from <limits.h> */
-#define __EXP(x) x
-#include <limits.h>
-#endif
-
-#if __EXP(SCHAR_MAX) == 0x7f
-typedef signed char __int8_t ;
-typedef unsigned char __uint8_t ;
-#define ___int8_t_defined 1
-#endif
-
-#if __EXP(INT_MAX) == 0x7fff
-typedef signed int __int16_t;
-typedef unsigned int __uint16_t;
-#define ___int16_t_defined 1
-#elif __EXP(SHRT_MAX) == 0x7fff
-typedef signed short __int16_t;
-typedef unsigned short __uint16_t;
-#define ___int16_t_defined 1
-#elif __EXP(SCHAR_MAX) == 0x7fff
-typedef signed char __int16_t;
-typedef unsigned char __uint16_t;
-#define ___int16_t_defined 1
-#endif
-
-#if ___int16_t_defined
-typedef __int16_t __int_least16_t;
-typedef __uint16_t __uint_least16_t;
-#define ___int_least16_t_defined 1
-
-#if !___int8_t_defined
-typedef __int16_t __int_least8_t;
-typedef __uint16_t __uint_least8_t;
-#define ___int_least8_t_defined 1
-#endif
-#endif
-
-#if __EXP(INT_MAX) == 0x7fffffffL
-typedef signed int __int32_t;
-typedef unsigned int __uint32_t;
-#define ___int32_t_defined 1
-#elif __EXP(LONG_MAX) == 0x7fffffffL
-typedef signed long __int32_t;
-typedef unsigned long __uint32_t;
-#define ___int32_t_defined 1
-#elif __EXP(SHRT_MAX) == 0x7fffffffL
-typedef signed short __int32_t;
-typedef unsigned short __uint32_t;
-#define ___int32_t_defined 1
-#elif __EXP(SCHAR_MAX) == 0x7fffffffL
-typedef signed char __int32_t;
-typedef unsigned char __uint32_t;
-#define ___int32_t_defined 1
-#endif
-
-#if ___int32_t_defined
-typedef __int32_t __int_least32_t;
-typedef __uint32_t __uint_least32_t;
-#define ___int_least32_t_defined 1
-
-#if !___int8_t_defined
-typedef __int32_t __int_least8_t;
-typedef __uint32_t __uint_least8_t;
-#define ___int_least8_t_defined 1
-#endif
-#if !___int16_t_defined
-typedef __int32_t __int_least16_t;
-typedef __uint32_t __uint_least16_t;
-#define ___int_least16_t_defined 1
-#endif
-#endif
-
-#if __EXP(LONG_MAX) > 0x7fffffff
-typedef signed long __int64_t;
-typedef unsigned long __uint64_t;
-#define ___int64_t_defined 1
-
-/* GCC has __LONG_LONG_MAX__ */
-#elif  defined(__LONG_LONG_MAX__) && (__LONG_LONG_MAX__ > 0x7fffffff)
-typedef signed long long __int64_t;
-typedef unsigned long long __uint64_t;
-#define ___int64_t_defined 1
-
-/* POSIX mandates LLONG_MAX in <limits.h> */
-#elif  defined(LLONG_MAX) && (LLONG_MAX > 0x7fffffff)
-typedef signed long long __int64_t;
-typedef unsigned long long __uint64_t;
-#define ___int64_t_defined 1
-
-#elif  __EXP(INT_MAX) > 0x7fffffff
-typedef signed int __int64_t;
-typedef unsigned int __uint64_t;
-#define ___int64_t_defined 1
-#endif
-
-#undef __EXP
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MACHINE__TYPES_H */
diff --git a/newlib/libc/include/machine/endian.h b/newlib/libc/include/machine/endian.h
deleted file mode 100644
index c1e8599..0000000
--- a/newlib/libc/include/machine/endian.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __MACHINE_ENDIAN_H__
-
-#include <sys/config.h>
-
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN 4321
-#endif
-#ifndef LITTLE_ENDIAN
-#define LITTLE_ENDIAN 1234
-#endif
-
-#ifndef BYTE_ORDER
-#ifdef __IEEE_LITTLE_ENDIAN
-#define BYTE_ORDER LITTLE_ENDIAN
-#else
-#define BYTE_ORDER BIG_ENDIAN
-#endif
-#endif
-
-#endif /* __MACHINE_ENDIAN_H__ */
diff --git a/newlib/libc/include/machine/ieeefp.h b/newlib/libc/include/machine/ieeefp.h
index dcd6cdf..42a6cf0 100644
--- a/newlib/libc/include/machine/ieeefp.h
+++ b/newlib/libc/include/machine/ieeefp.h
@@ -15,57 +15,16 @@
 
 	Defined if the float format does not support IEEE denormals.  Every
 	float with a zero exponent is taken to be a zero representation.
- 
-   ??? At the moment, there are no equivalent macros above for doubles and
-   the macros are not fully supported by --enable-newlib-hw-fp.
 
-   __IEEE_BIG_ENDIAN
+   ??? At the moment, there are no equivalent macros for doubles and
+   the macros are not fully supported by --enable-newlib-hw-fp.  */
 
-        Defined if the float format is big endian.  This is mutually exclusive
-        with __IEEE_LITTLE_ENDIAN.
-
-   __IEEE_LITTLE_ENDIAN
- 
-        Defined if the float format is little endian.  This is mutually exclusive
-        with __IEEE_BIG_ENDIAN.
-
-   Note that one of __IEEE_BIG_ENDIAN or __IEEE_LITTLE_ENDIAN must be specified for a
-   platform or error will occur.
-
-   __IEEE_BYTES_LITTLE_ENDIAN
-
-        This flag is used in conjunction with __IEEE_BIG_ENDIAN to describe a situation 
-	whereby multiple words of an IEEE floating point are in big endian order, but the
-	words themselves are little endian with respect to the bytes.
-
-   _DOUBLE_IS_32_BITS 
-
-        This is used on platforms that support double by using the 32-bit IEEE
-        float type.
-
-   _FLOAT_ARG
-
-        This represents what type a float arg is passed as.  It is used when the type is
-        not promoted to double.
-	
-*/
-
-#if (defined(__arm__) || defined(__thumb__)) && !defined(__MAVERICK__)
-/* ARM traditionally used big-endian words; and within those words the
-   byte ordering was big or little endian depending upon the target.
-   Modern floating-point formats are naturally ordered; in this case
-   __VFP_FP__ will be defined, even if soft-float.  */
-#ifdef __VFP_FP__
-# ifdef __ARMEL__
-#  define __IEEE_LITTLE_ENDIAN
-# else
-#  define __IEEE_BIG_ENDIAN
-# endif
-#else
-# define __IEEE_BIG_ENDIAN
-# ifdef __ARMEL__
-#  define __IEEE_BYTES_LITTLE_ENDIAN
-# endif
+#if defined(__arm__) || defined(__thumb__)
+/* ARM always has big-endian words.  Within those words the byte ordering
+   will be big or little endian depending upon the target.  */
+#define __IEEE_BIG_ENDIAN
+#ifdef __ARMEL__
+#define __IEEE_BYTES_LITTLE_ENDIAN
 #endif
 #endif
 
@@ -85,16 +44,15 @@
 #define __IEEE_BIG_ENDIAN
 #endif
 
-#if defined(__mc68hc11__) || defined(__mc68hc12__) || defined(__mc68hc1x__)
+#if defined (__H8300__) || defined (__H8300H__) || defined (__H8300S__)
 #define __IEEE_BIG_ENDIAN
-#ifdef __HAVE_SHORT_DOUBLE__
-# define _DOUBLE_IS_32BITS
-#endif
+#define __SMALL_BITFIELDS
+#define _DOUBLE_IS_32BITS
 #endif
 
-#if defined (__H8300__) || defined (__H8300H__) || defined (__H8300S__) || defined (__H8500__) || defined (__H8300SX__)
+#ifdef __H8500__
 #define __IEEE_BIG_ENDIAN
-#define _FLOAT_ARG float
+#define __SMALL_BITFIELDS
 #define _DOUBLE_IS_32BITS
 #endif
 
@@ -104,7 +62,7 @@
 #else
 #define __IEEE_BIG_ENDIAN
 #endif
-#if defined(__SH2E__) || defined(__SH3E__) || defined(__SH4_SINGLE_ONLY__) || defined(__SH2A_SINGLE_ONLY__)
+#if defined(__SH3E__) || defined(__SH4_SINGLE_ONLY__)
 #define _DOUBLE_IS_32BITS
 #endif
 #endif
@@ -129,11 +87,6 @@
 #define __IEEE_BIG_ENDIAN
 #endif
 
-#if defined(_C4x) || defined(_C3x)
-#define __IEEE_BIG_ENDIAN
-#define _DOUBLE_IS_32BITS
-#endif
-
 #ifdef __TIC80__
 #define __IEEE_LITTLE_ENDIAN
 #endif
@@ -149,14 +102,11 @@
 #define __IEEE_BIG_ENDIAN
 #endif
 
-#ifdef __D30V__
-#define __IEEE_BIG_ENDIAN
-#endif
-
 /* necv70 was __IEEE_LITTLE_ENDIAN. */
 
 #ifdef __W65__
 #define __IEEE_LITTLE_ENDIAN
+#define __SMALL_BITFIELDS
 #define _DOUBLE_IS_32BITS
 #endif
 
@@ -174,6 +124,7 @@
 
 #ifdef __mn10200__
 #define __IEEE_LITTLE_ENDIAN
+#define __SMALL_BITFIELDS
 #define _DOUBLE_IS_32BITS
 #endif
 
@@ -187,9 +138,8 @@
 
 #ifdef __D10V__
 #define __IEEE_BIG_ENDIAN
-#if __DOUBLE__ == 32
 #define _DOUBLE_IS_32BITS
-#endif
+#define __SMALL_BITFIELDS
 #endif
 
 #ifdef __PPC__
@@ -202,10 +152,6 @@
 #endif
 #endif
 
-#ifdef __xstormy16__
-#define __IEEE_LITTLE_ENDIAN
-#endif
-
 #ifdef __arc__
 #ifdef __big_endian__
 #define __IEEE_BIG_ENDIAN
@@ -214,10 +160,6 @@
 #endif
 #endif
 
-#ifdef __CRX__
-#define __IEEE_LITTLE_ENDIAN
-#endif
-
 #ifdef __fr30__
 #define __IEEE_BIG_ENDIAN
 #endif
@@ -226,14 +168,6 @@
 #define __IEEE_BIG_ENDIAN
 #endif
 
-#ifdef __mt__
-#define __IEEE_BIG_ENDIAN
-#endif
-
-#ifdef __frv__
-#define __IEEE_BIG_ENDIAN
-#endif
-
 #ifdef __ia64__
 #ifdef __BIG_ENDIAN__
 #define __IEEE_BIG_ENDIAN
@@ -244,39 +178,14 @@
 
 #ifdef __AVR__
 #define __IEEE_LITTLE_ENDIAN
-#define _DOUBLE_IS_32BITS
-#endif
-
-#if defined(__or32__) || defined(__or1k__) || defined(__or16__)
-#define __IEEE_BIG_ENDIAN
-#endif
-
-#ifdef __IP2K__
-#define __IEEE_BIG_ENDIAN
 #define __SMALL_BITFIELDS
 #define _DOUBLE_IS_32BITS
 #endif
 
-#ifdef __iq2000__
+#if defined(__or32__) || defined(__or1k__) || defined(__or16__)
 #define __IEEE_BIG_ENDIAN
 #endif
 
-#ifdef __MAVERICK__
-#ifdef __ARMEL__
-#  define __IEEE_LITTLE_ENDIAN
-#else  /* must be __ARMEB__ */
-#  define __IEEE_BIG_ENDIAN
-#endif /* __ARMEL__ */
-#endif /* __MAVERICK__ */
-
-#ifdef __m32c__
-#define __IEEE_LITTLE_ENDIAN
-#define __SMALL_BITFIELDS
-#endif
-
-#ifdef __CRIS__
-#define __IEEE_LITTLE_ENDIAN
-#endif
 
 #ifndef __IEEE_BIG_ENDIAN
 #ifndef __IEEE_LITTLE_ENDIAN
diff --git a/newlib/libc/include/machine/malloc.h b/newlib/libc/include/machine/malloc.h
deleted file mode 100644
index fdada9e..0000000
--- a/newlib/libc/include/machine/malloc.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef	_MACHMALLOC_H_
-#define	_MACHMALLOC_H_
-
-/* place holder so platforms may add malloc.h extensions */
-
-#endif	/* _MACHMALLOC_H_ */
-
-
diff --git a/newlib/libc/include/machine/param.h b/newlib/libc/include/machine/param.h
deleted file mode 100644
index bdf8bf7..0000000
--- a/newlib/libc/include/machine/param.h
+++ /dev/null
@@ -1 +0,0 @@
-/* Place holder for machine-specific param.h.  */
diff --git a/newlib/libc/include/machine/setjmp.h b/newlib/libc/include/machine/setjmp.h
index b74808f..0add20f 100644
--- a/newlib/libc/include/machine/setjmp.h
+++ b/newlib/libc/include/machine/setjmp.h
@@ -1,6 +1,3 @@
-
-_BEGIN_STD_C
-
 #if defined(__arm__) || defined(__thumb__)
 /*
  * All callee preserved registers:
@@ -9,10 +6,6 @@ _BEGIN_STD_C
 #define _JBLEN 23
 #endif
 
-#if defined(__AVR__)
-#define _JBLEN 24
-#endif
-
 #ifdef __sparc__
 /*
  * onsstack,sigmask,sp,pc,npc,psr,g1,o0,wbcnt (sigcontext).
@@ -32,14 +25,6 @@ _BEGIN_STD_C
 #define	_JBLEN	34
 #endif
 
-#if defined(__mc68hc11__) || defined(__mc68hc12__) || defined(__mc68hc1x__)
-/*
- * D, X, Y are not saved.
- * Only take into account the pseudo soft registers (max 32).
- */
-#define _JBLEN  32
-#endif
-
 #if defined(__Z8001__) || defined(__Z8002__)
 /* 16 regs + pc */
 #define _JBLEN 20
@@ -56,8 +41,8 @@ _BEGIN_STD_C
 #if defined(__CYGWIN__) && !defined (_JBLEN)
 #define _JBLEN (13 * 4)
 #elif defined (__i386__)
-#if defined(__unix__) || defined(__rtems__)
-# define _JBLEN	9
+#ifdef __unix__
+# define _JBLEN	36
 #else
 #include "setjmp-dj.h"
 #endif
@@ -75,12 +60,10 @@ _BEGIN_STD_C
 
 #ifdef __mips__
 #ifdef __mips64
+#define _JBLEN 23
 #define _JBTYPE long long
-#endif
-#ifdef __mips_soft_float
-#define _JBLEN 11
 #else
-#define _JBLEN 23
+#define _JBLEN 11
 #endif
 #endif
 
@@ -90,7 +73,7 @@ _BEGIN_STD_C
 
 #ifdef __H8300__
 #define _JBLEN 5
-#define _JBTYPE int
+typedef int jmp_buf[_JBLEN];
 #endif
 
 #ifdef __H8300H__
@@ -99,7 +82,7 @@ _BEGIN_STD_C
 #define _JBTYPE long
 #endif
 
-#if defined (__H8300S__) || defined (__H8300SX__)
+#ifdef __H8300S__
 /* same as H8/300 but registers are twice as big */
 #define _JBLEN 5
 #define _JBTYPE long
@@ -110,12 +93,7 @@ _BEGIN_STD_C
 #endif
 
 #ifdef  __sh__
-#if __SH5__
-#define _JBLEN 50
-#define _JBTYPE long long
-#else
 #define _JBLEN 20
-#endif /* __SH5__ */
 #endif
 
 #ifdef  __v800
@@ -123,11 +101,7 @@ _BEGIN_STD_C
 #endif
 
 #ifdef __PPC__
-#ifdef __ALTIVEC__
-#define _JBLEN 64
-#else
 #define _JBLEN 32
-#endif
 #define _JBTYPE double
 #endif
 
@@ -139,13 +113,9 @@ _BEGIN_STD_C
 #endif
 
 #if defined(__mn10300__) || defined(__mn10200__)
-#ifdef __AM33_2__
-#define _JBLEN 26
-#else
 /* A guess */
 #define _JBLEN 10
 #endif
-#endif
 
 #ifdef __v850
 /* I think our setjmp is saving 15 regs at the moment.  Gives us one word
@@ -153,13 +123,6 @@ _BEGIN_STD_C
 #define _JBLEN 16
 #endif
 
-#if defined(_C4x)
-#define _JBLEN 10
-#endif
-#if defined(_C3x)
-#define _JBLEN 9
-#endif
-
 #ifdef __TIC80__
 #define _JBLEN 13
 #endif
@@ -173,23 +136,11 @@ _BEGIN_STD_C
 #define _JBTYPE double
 #endif
 
-#ifdef __frv__
-#define _JBLEN (68/2)  /* room for 68 32-bit regs */
-#define _JBTYPE double
-#endif
-
-#ifdef __CRX__
-#define _JBLEN 9
-#endif
 
 #ifdef __fr30__
 #define _JBLEN 10
 #endif
 
-#ifdef __iq2000__
-#define _JBLEN 32
-#endif
-
 #ifdef __mcore__
 #define _JBLEN 16
 #endif
@@ -200,45 +151,16 @@ _BEGIN_STD_C
 #define _JBTYPE unsigned long
 #endif
 
-#ifdef __mt__
-#define _JBLEN 16
-#endif
-
-#ifdef __xstormy16__
-/* 4 GPRs plus SP plus PC. */
-#define _JBLEN 8
-#endif
-
-#ifdef __CRIS__
-#define _JBLEN 18
-#endif
-
-#ifdef __m32c__
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-#define _JBLEN (22/2)
-#else
-#define _JBLEN (34/2)
-#endif
-#define _JBTYPE unsigned short
-#endif /* __m32c__ */
-
 #ifdef _JBLEN
 #ifdef _JBTYPE
 typedef	_JBTYPE jmp_buf[_JBLEN];
 #else
 typedef	int jmp_buf[_JBLEN];
 #endif
-#endif
-
-_END_STD_C
 
 #if defined(__CYGWIN__) || defined(__rtems__)
 #include <signal.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* POSIX sigsetjmp/siglongjmp macros */
 typedef int sigjmp_buf[_JBLEN+2];
 
@@ -249,27 +171,6 @@ typedef int sigjmp_buf[_JBLEN+2];
 # define _CYGWIN_WORKING_SIGSETJMP
 #endif
 
-#if defined(__GNUC__)
-
-#define sigsetjmp(env, savemask) \
-            ({ \
-              sigjmp_buf *_sjbuf = &(env); \
-              ((*_sjbuf)[_SAVEMASK] = savemask,\
-              sigprocmask (SIG_SETMASK, 0, (sigset_t *)((*_sjbuf) + _SIGMASK)),\
-              setjmp (*_sjbuf)); \
-            })
-
-#define siglongjmp(env, val) \
-            ({ \
-              sigjmp_buf *_sjbuf = &(env); \
-              ((((*_sjbuf)[_SAVEMASK]) ? \
-               sigprocmask (SIG_SETMASK, (sigset_t *)((*_sjbuf) + _SIGMASK), 0)\
-               : 0), \
-               longjmp (*_sjbuf, val)); \
-            })
-
-#else /* !__GNUC__ */
-
 #define sigsetjmp(env, savemask) ((env)[_SAVEMASK] = savemask,\
                sigprocmask (SIG_SETMASK, 0, (sigset_t *) ((env) + _SIGMASK)),\
                setjmp (env))
@@ -278,9 +179,5 @@ typedef int sigjmp_buf[_JBLEN+2];
                sigprocmask (SIG_SETMASK, (sigset_t *) ((env) + _SIGMASK), 0):0),\
                longjmp (env, val))
 
-#endif
-
-#ifdef __cplusplus
-}
-#endif
 #endif /* __CYGWIN__ or __rtems__ */
+#endif
diff --git a/newlib/libc/include/machine/stdlib.h b/newlib/libc/include/machine/stdlib.h
deleted file mode 100644
index fa3f3a1..0000000
--- a/newlib/libc/include/machine/stdlib.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef	_MACHSTDLIB_H_
-#define	_MACHSTDLIB_H_
-
-/* place holder so platforms may add stdlib.h extensions */
-
-#endif	/* _MACHSTDLIB_H_ */
-
-
diff --git a/newlib/libc/include/machine/termios.h b/newlib/libc/include/machine/termios.h
deleted file mode 100644
index 41fd459..0000000
--- a/newlib/libc/include/machine/termios.h
+++ /dev/null
@@ -1 +0,0 @@
-#define __MAX_BAUD  B4000000
diff --git a/newlib/libc/include/machine/types.h b/newlib/libc/include/machine/types.h
index 40a75fa..ad8cc28 100644
--- a/newlib/libc/include/machine/types.h
+++ b/newlib/libc/include/machine/types.h
@@ -1,29 +1,11 @@
 #ifndef	_MACHTYPES_H_
 #define	_MACHTYPES_H_
 
-/*
- *  The following section is RTEMS specific and is needed to more
- *  closely match the types defined in the BSD machine/types.h.
- *  This is needed to let the RTEMS/BSD TCP/IP stack compile.
- */
-#if defined(__rtems__)
-#include <machine/_types.h>
-#endif
-
 #define	_CLOCK_T_	unsigned long		/* clock() */
 #define	_TIME_T_	long			/* time() */
 #define _CLOCKID_T_ 	unsigned long
 #define _TIMER_T_   	unsigned long
 
-#ifndef _HAVE_SYSTYPES
-typedef long int __off_t;
-typedef int __pid_t;
-#ifdef __GNUC__
-__extension__ typedef long long int __loff_t;
-#else
-typedef long int __loff_t;
-#endif
-#endif
 
 #endif	/* _MACHTYPES_H_ */
 
diff --git a/newlib/libc/include/malloc.h b/newlib/libc/include/malloc.h
index c46357c..5ccdda6 100644
--- a/newlib/libc/include/malloc.h
+++ b/newlib/libc/include/malloc.h
@@ -9,9 +9,6 @@
 #define __need_size_t
 #include <stddef.h>
 
-/* include any machine-specific extensions */
-#include <machine/malloc.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -35,113 +32,48 @@ struct mallinfo {
 /* The routines.  */
 
 extern _PTR malloc _PARAMS ((size_t));
-#ifdef __CYGWIN__
-#undef _malloc_r
-#define _malloc_r(r, s) malloc (s)
-#else
 extern _PTR _malloc_r _PARAMS ((struct _reent *, size_t));
-#endif
 
 extern _VOID free _PARAMS ((_PTR));
-#ifdef __CYGWIN__
-#undef _free_r
-#define _free_r(r, p) free (p)
-#else
 extern _VOID _free_r _PARAMS ((struct _reent *, _PTR));
-#endif
 
 extern _PTR realloc _PARAMS ((_PTR, size_t));
-#ifdef __CYGWIN__
-#undef _realloc_r
-#define _realloc_r(r, p, s) realloc (p, s)
-#else
 extern _PTR _realloc_r _PARAMS ((struct _reent *, _PTR, size_t));
-#endif
 
 extern _PTR calloc _PARAMS ((size_t, size_t));
-#ifdef __CYGWIN__
-#undef _calloc_r
-#define _calloc_r(r, s1, s2) calloc (s1, s2);
-#else
 extern _PTR _calloc_r _PARAMS ((struct _reent *, size_t, size_t));
-#endif
 
 extern _PTR memalign _PARAMS ((size_t, size_t));
-#ifdef __CYGWIN__
-#undef _memalign_r
-#define _memalign_r(r, s1, s2) memalign (s1, s2);
-#else
 extern _PTR _memalign_r _PARAMS ((struct _reent *, size_t, size_t));
-#endif
 
 extern struct mallinfo mallinfo _PARAMS ((void));
-#ifdef __CYGWIN__
-#undef _mallinfo_r
-#define _mallinfo_r(r) mallinfo ()
-#else
 extern struct mallinfo _mallinfo_r _PARAMS ((struct _reent *));
-#endif
 
 extern void malloc_stats _PARAMS ((void));
-#ifdef __CYGWIN__
-#undef _malloc_stats_r
-#define _malloc_stats_r(r) malloc_stats ()
-#else
 extern void _malloc_stats_r _PARAMS ((struct _reent *));
-#endif
 
 extern int mallopt _PARAMS ((int, int));
-#ifdef __CYGWIN__
-#undef _mallopt_r
-#define _mallopt_r(i1, i2) mallopt (i1, i2)
-#else
 extern int _mallopt_r _PARAMS ((struct _reent *, int, int));
-#endif
 
 extern size_t malloc_usable_size _PARAMS ((_PTR));
-#ifdef __CYGWIN__
-#undef _malloc_usable_size_r
-#define _malloc_usable_size_r(r, p) malloc_usable_size (p)
-#else
 extern size_t _malloc_usable_size_r _PARAMS ((struct _reent *, _PTR));
-#endif
 
 /* These aren't too useful on an embedded system, but we define them
    anyhow.  */
 
 extern _PTR valloc _PARAMS ((size_t));
-#ifdef __CYGWIN__
-#undef _valloc_r
-#define _valloc_r(r, s) valloc (s)
-#else
 extern _PTR _valloc_r _PARAMS ((struct _reent *, size_t));
-#endif
 
 extern _PTR pvalloc _PARAMS ((size_t));
-#ifdef __CYGWIN__
-#undef _pvalloc_r
-#define _pvalloc_r(r, s) pvalloc (s)
-#else
 extern _PTR _pvalloc_r _PARAMS ((struct _reent *, size_t));
-#endif
 
 extern int malloc_trim _PARAMS ((size_t));
-#ifdef __CYGWIN__
-#undef _malloc_trim_r
-#define _malloc_trim_r(r, s) malloc_trim (s)
-#else
 extern int _malloc_trim_r _PARAMS ((struct _reent *, size_t));
-#endif
 
 /* A compatibility routine for an earlier version of the allocator.  */
 
 extern _VOID mstats _PARAMS ((char *));
-#ifdef __CYGWIN__
-#undef _mstats_r
-#define _mstats_r(r, p) mstats (p)
-#else
 extern _VOID _mstats_r _PARAMS ((struct _reent *, char *));
-#endif
 
 /* SVID2/XPG mallopt options */
 
diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h
index 41ce752..e72d9ca 100644
--- a/newlib/libc/include/math.h
+++ b/newlib/libc/include/math.h
@@ -1,72 +1,34 @@
+/* math.h -- Definitions for the math floating point package.  */
 
 #ifndef  _MATH_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 #define  _MATH_H_
 
 #include <sys/reent.h>
 #include <machine/ieeefp.h>
 #include "_ansi.h"
 
-_BEGIN_STD_C
+#ifndef HUGE_VAL
+
+/* Define HUGE_VAL as infinity, unless HUGE_VAL is already defined
+   (which might have been done by something like math-68881.h).  */
 
 union __dmath
 {
-  __ULong i[2];
+  __uint32_t i[2];
   double d;
 };
- 
-union __fmath
-{
-  __ULong i[1];
-  float f;
-};
- 
-union __ldmath
-{
-  __ULong i[4];
-  _LONG_DOUBLE ld;
-};
-
-#if defined(__GNUC__) && \
-  ( (__GNUC__ >= 4) || \
-    ( (__GNUC__ >= 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ >= 3) ) )
-
- /* gcc >= 3.3 implicitly defines builtins for HUGE_VALx values.  */
-
- #ifndef HUGE_VAL
-  #define HUGE_VAL (__builtin_huge_val())
- #endif
-
- #ifndef HUGE_VALF
-  #define HUGE_VALF (__builtin_huge_valf())
- #endif
-
- #ifndef HUGE_VALL
-  #define HUGE_VALL (__builtin_huge_vall())
- #endif
 
-#else /* !gcc >= 3.3  */
+/* Declare this as an array without bounds so that no matter what small data
+   support a port and/or library has, this reference will be via the general
+   method for accessing globals. */
+extern __IMPORT const union __dmath __infinity[];
 
- /* No builtins.  Use floating-point unions instead.  Declare as an array 
-    without bounds so no matter what small data support a port and/or 
-    library has, the reference will be via the general method for accessing 
-    globals. */
+#define HUGE_VAL (__infinity[0].d)
 
- #ifndef HUGE_VAL
-  extern __IMPORT const union __dmath __infinity[];
-  #define HUGE_VAL (__infinity[0].d)
- #endif
-
- #ifndef HUGE_VALF
-  extern __IMPORT const union __fmath __infinityf[];
-  #define HUGE_VALF (__infinityf[0].f)
- #endif
-
- #ifndef HUGE_VALL
-  extern __IMPORT const union __ldmath __infinityld[];
-  #define HUGE_VALL (__infinityld[0].ld)
- #endif
-
-#endif /* !gcc >= 3.3  */
+#endif /* ! defined (HUGE_VAL) */
 
 /* Reentrant ANSI C functions.  */
 
@@ -104,77 +66,12 @@ extern double fmod _PARAMS((double, double));
 
 #ifndef __STRICT_ANSI__
 
-/* ISO C99 types and macros. */
-
-#ifndef FLT_EVAL_METHOD
-#define FLT_EVAL_METHOD 0
-typedef float float_t;
-typedef double double_t;
-#endif /* FLT_EVAL_METHOD */
-
-#define FP_NAN         0
-#define FP_INFINITE    1
-#define FP_ZERO        2
-#define FP_SUBNORMAL   3
-#define FP_NORMAL      4
-
-extern int __isinff (float x);
-extern int __isinfd (double x);
-extern int __isnanf (float x);
-extern int __isnand (double x);
-extern int __fpclassifyf (float x);
-extern int __fpclassifyd (double x);
-extern int __signbitf (float x);
-extern int __signbitd (double x);
-
-#define fpclassify(x) \
-          (__extension__ ({__typeof__(x) __x = (x); \
-                           (sizeof (__x) == sizeof (float))  ? __fpclassifyf(__x) : __fpclassifyd(__x);}))
-
-#define isfinite(y) \
-          (__extension__ ({__typeof__(y) __y = (y); \
-                           fpclassify(__y) != FP_INFINITE && fpclassify(__y) != FP_NAN;}))
-
-/* Note: isinf and isnan were once functions in newlib that took double
- *       arguments.  C99 specifies that these names are reserved for macros
- *       supporting multiple floating point types.  Thus, they are
- *       now defined as macros.  Implementations of the old functions
- *       taking double arguments still exist for compatibility purposes.  */
-#define isinf(x) \
-          (__extension__ ({__typeof__(x) __x = (x); \
-                           (sizeof (__x) == sizeof (float))  ? __isinff(__x) : __isinfd(__x);}))
-#define isnan(x) \
-          (__extension__ ({__typeof__(x) __x = (x); \
-                           (sizeof (__x) == sizeof (float))  ? __isnanf(__x) : __isnand(__x);}))
-#define isnormal(y) (fpclassify(y) == FP_NORMAL)
-#define signbit(x) \
-          (__extension__ ({__typeof__(x) __x = (x); \
-                           (sizeof(__x) == sizeof(float)) ? __signbitf(__x) : __signbitd(__x);}))
-
-#define isgreater(x,y) \
-          (__extension__ ({__typeof__(x) __x = (x); __typeof__(y) __y = (y); \
-                           !isunordered(__x,__y) && (__x > __y);}))
-#define isgreaterequal(x,y) \
-          (__extension__ ({__typeof__(x) __x = (x); __typeof__(y) __y = (y); \
-                           !isunordered(__x,__y) && (__x >= __y);}))
-#define isless(x,y) \
-          (__extension__ ({__typeof__(x) __x = (x); __typeof__(y) __y = (y); \
-                           !isunordered(__x,__y) && (__x < __y);}))
-#define islessequal(x,y) \
-          (__extension__ ({__typeof__(x) __x = (x); __typeof__(y) __y = (y); \
-                           !isunordered(__x,__y) && (__x <= __y);}))
-#define islessgreater(x,y) \
-          (__extension__ ({__typeof__(x) __x = (x); __typeof__(y) __y = (y); \
-                           !isunordered(__x,__y) && (__x < __y || __x > __y);}))
-
-#define isunordered(a,b) \
-          (__extension__ ({__typeof__(a) __a = (a); __typeof__(b) __b = (b); \
-                           fpclassify(__a) == FP_NAN || fpclassify(__b) == FP_NAN;}))
-
 /* Non ANSI double precision functions.  */
 
 extern double infinity _PARAMS((void));
-extern double nan _PARAMS((const char *));
+extern double nan _PARAMS((void));
+extern int isnan _PARAMS((double));
+extern int isinf _PARAMS((double));
 extern int finite _PARAMS((double));
 extern double copysign _PARAMS((double, double));
 extern int ilogb _PARAMS((double));
@@ -185,22 +82,6 @@ extern double nextafter _PARAMS((double, double));
 extern double rint _PARAMS((double));
 extern double scalbn _PARAMS((double, int));
 
-extern double exp2 _PARAMS((double));
-extern double scalbln _PARAMS((double, long int));
-extern double tgamma _PARAMS((double));
-extern double nearbyint _PARAMS((double));
-extern long int lrint _PARAMS((double));
-extern double round _PARAMS((double));
-extern long int lround _PARAMS((double));
-extern double trunc _PARAMS((double));
-extern double remquo _PARAMS((double, double, int *));
-extern double copysign _PARAMS((double, double));
-extern double fdim _PARAMS((double, double));
-extern double fmax _PARAMS((double, double));
-extern double fmin _PARAMS((double, double));
-extern double fma _PARAMS((double, double, double));
-extern void sincos _PARAMS((double, double *, double *));
-
 #ifndef __math_68881
 extern double log1p _PARAMS((double));
 extern double expm1 _PARAMS((double));
@@ -271,23 +152,8 @@ extern float fmodf _PARAMS((float, float));
 
 /* Other single precision functions.  */
 
-extern float exp2f _PARAMS((float));
-extern float scalblnf _PARAMS((float, long int));
-extern float tgammaf _PARAMS((float));
-extern float nearbyintf _PARAMS((float));
-extern long int lrintf _PARAMS((float));
-extern float roundf _PARAMS((float));
-extern long int lroundf _PARAMS((float));
-extern float truncf _PARAMS((float));
-extern float remquof _PARAMS((float, float, int *));
-extern float copysignf _PARAMS((float, float));
-extern float fdimf _PARAMS((float, float));
-extern float fmaxf _PARAMS((float, float));
-extern float fminf _PARAMS((float, float));
-extern float fmaf _PARAMS((float, float, float));
-
 extern float infinityf _PARAMS((void));
-extern float nanf _PARAMS((const char *));
+extern float nanf _PARAMS((void));
 extern int isnanf _PARAMS((float));
 extern int isinff _PARAMS((float));
 extern int finitef _PARAMS((float));
@@ -301,7 +167,6 @@ extern float rintf _PARAMS((float));
 extern float scalbnf _PARAMS((float, int));
 extern float log1pf _PARAMS((float));
 extern float expm1f _PARAMS((float));
-extern void sincosf _PARAMS((float, float *, float *));
 
 #ifndef _REENT_ONLY
 extern float acoshf _PARAMS((float));
@@ -333,7 +198,7 @@ extern float dremf _PARAMS((float, float));
 extern int *__signgam _PARAMS((void));
 #endif /* ! defined (_REENT_ONLY) */
 
-#define __signgam_r(ptr) _REENT_SIGNGAM(ptr)
+#define __signgam_r(ptr) ((ptr)->_new._reent._gamma_signgam)
 
 /* The exception structure passed to the matherr routine.  */
 
@@ -368,8 +233,6 @@ extern int matherr _PARAMS((struct exception *e));
 
 /* Useful constants.  */
 
-#define MAXFLOAT	3.40282347e+38F
-
 #define M_E		2.7182818284590452354
 #define M_LOG2E		1.4426950408889634074
 #define M_LOG10E	0.43429448190325182765
@@ -415,10 +278,11 @@ extern __IMPORT _CONST _LIB_VERSION_TYPE _LIB_VERSION;
 
 #endif /* ! defined (__STRICT_ANSI__) */
 
-_END_STD_C
-
 #ifdef __FAST_MATH__
 #include <machine/fastmath.h>
 #endif
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* _MATH_H_ */
diff --git a/newlib/libc/include/newlib.h b/newlib/libc/include/newlib.h
deleted file mode 100644
index d4fffb1..0000000
--- a/newlib/libc/include/newlib.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* dummy file for external tools to use.  Real file is created by
-   newlib configuration. */
diff --git a/newlib/libc/include/process.h b/newlib/libc/include/process.h
index a73564a..4f6fe40 100644
--- a/newlib/libc/include/process.h
+++ b/newlib/libc/include/process.h
@@ -23,10 +23,27 @@ int spawnlp(int mode, const char *path, const char *argv0, ...);
 int spawnlpe(int mode, const char *path, const char *argv0, ... /*, char * const *envp */);
 
 int spawnv(int mode, const char *path, const char * const *argv);
-int spawnve(int mode, const char *path, const char * const *argv, const char * const *envp);
+int spawnve(int mode, const char *path, char * const *argv, const char * const *envp);
 int spawnvp(int mode, const char *path, const char * const *argv);
 int spawnvpe(int mode, const char *path, const char * const *argv, const char * const *envp);
 
+#ifdef __CYGWIN__
+/* Secure exec() functions family */
+/* The first arg should really be a HANDLE which is a void *.  But we
+   can't include windows.h here so... */
+#include <sys/types.h>
+pid_t sexecl(void *, const char *path, const char *argv0, ...);
+pid_t sexecle(void *, const char *path, const char *argv0, ... /*, char * const *envp */);
+pid_t sexeclp(void *, const char *path, const char *argv0, ...);
+pid_t sexeclpe(void *, const char *path, const char *argv0, ... /*, char * const *envp */);
+
+pid_t sexecv(void *, const char *path, const char * const *argv);
+pid_t sexecve(void *, const char *path, const char * const *argv, const char * const *envp);
+pid_t sexecvp(void *, const char *path, const char * const *argv);
+pid_t sexecvpe(void *, const char *path, const char * const *argv, const char * const *envp);
+pid_t  getpid(void);
+#endif
+
 int cwait(int *, int, int);
 
 #define _P_WAIT		1
diff --git a/newlib/libc/include/pthread.h b/newlib/libc/include/pthread.h
index 05ff38b..af5d32c 100644
--- a/newlib/libc/include/pthread.h
+++ b/newlib/libc/include/pthread.h
@@ -258,8 +258,6 @@ int	_EXFUN(pthread_key_delete, (pthread_key_t key));
 #define PTHREAD_CANCEL_DEFERRED 0
 #define PTHREAD_CANCEL_ASYNCHRONOUS 1
 
-#define PTHREAD_CANCELED ((void *) -1)
-
 int	_EXFUN(pthread_cancel, (pthread_t thread));
 
 /* Setting Cancelability State, P1003.1c/Draft 10, p. 183 */
diff --git a/newlib/libc/include/pwd.h b/newlib/libc/include/pwd.h
index 1526abf..59d6ab5 100644
--- a/newlib/libc/include/pwd.h
+++ b/newlib/libc/include/pwd.h
@@ -50,15 +50,14 @@ extern "C" {
 struct passwd {
 	char	*pw_name;		/* user name */
 	char	*pw_passwd;		/* encrypted password */
-	uid_t	pw_uid;			/* user uid */
-	gid_t	pw_gid;			/* user gid */
+	int	pw_uid;			/* user uid */
+	int	pw_gid;			/* user gid */
 	char	*pw_comment;		/* comment */
 	char	*pw_gecos;		/* Honeywell login info */
 	char	*pw_dir;		/* home directory */
 	char	*pw_shell;		/* default shell */
 };
 
-#ifndef __INSIDE_CYGWIN__
 struct passwd	*getpwuid (uid_t);
 struct passwd	*getpwnam (const char *);
 int 		 getpwnam_r (const char *, struct passwd *,
@@ -70,7 +69,6 @@ struct passwd	*getpwent (void);
 void		 setpwent (void);
 void		 endpwent (void);
 #endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/newlib/libc/include/reent.h b/newlib/libc/include/reent.h
index 00c2eb4..56fae91 100644
--- a/newlib/libc/include/reent.h
+++ b/newlib/libc/include/reent.h
@@ -14,20 +14,20 @@
 
    1) Define the reentrant versions of the syscalls directly.
       (eg: _open_r, _close_r, etc.).  Please keep the namespace clean.
-      When you do this, set "syscall_dir" to "syscalls" and add
-      -DREENTRANT_SYSCALLS_PROVIDED to newlib_cflags in configure.host.
+      When you do this, set "syscall_dir" to "syscalls" in configure.in,
+      and add -DREENTRANT_SYSCALLS_PROVIDED to target_cflags in configure.in.
 
    2) Define namespace clean versions of the system calls by prefixing
       them with '_' (eg: _open, _close, etc.).  Technically, there won't be
       true reentrancy at the syscall level, but the library will be namespace
       clean.
-      When you do this, set "syscall_dir" to "syscalls" in configure.host.
+      When you do this, set "syscall_dir" to "syscalls" in configure.in.
 
    3) Define or otherwise provide the regular versions of the syscalls
       (eg: open, close, etc.).  The library won't be reentrant nor namespace
       clean, but at least it will work.
-      When you do this, add -DMISSING_SYSCALL_NAMES to newlib_cflags in
-      configure.host.
+      When you do this, add -DMISSING_SYSCALL_NAMES to target_cflags in
+      configure.in.
 
    Stubs of the reentrant versions of the syscalls exist in the libc/reent
    source directory and are used if REENTRANT_SYSCALLS_PROVIDED isn't defined.
@@ -50,7 +50,6 @@ extern "C" {
 #include <machine/types.h>
 
 #define __need_size_t
-#define __need_ptrdiff_t
 #include <stddef.h>
 
 /* FIXME: not namespace clean */
@@ -72,7 +71,7 @@ extern int _link_r _PARAMS ((struct _reent *, const char *, const char *));
 extern _off_t _lseek_r _PARAMS ((struct _reent *, int, _off_t, int));
 extern int _open_r _PARAMS ((struct _reent *, const char *, int, int));
 extern _ssize_t _read_r _PARAMS ((struct _reent *, int, void *, size_t));
-extern void *_sbrk_r _PARAMS ((struct _reent *, ptrdiff_t));
+extern void *_sbrk_r _PARAMS ((struct _reent *, size_t));
 extern int _stat_r _PARAMS ((struct _reent *, const char *, struct stat *));
 extern _CLOCK_T_ _times_r _PARAMS ((struct _reent *, struct tms *));
 extern int _unlink_r _PARAMS ((struct _reent *, const char *));
@@ -82,19 +81,6 @@ extern _ssize_t _write_r _PARAMS ((struct _reent *, int, const void *, size_t));
 /* This one is not guaranteed to be available on all targets.  */
 extern int _gettimeofday_r _PARAMS ((struct _reent *, struct timeval *tp, struct timezone *tzp));
 
-#ifdef __LARGE64_FILES
-
-#if defined(__CYGWIN__) && defined(_COMPILING_NEWLIB)
-#define stat64 __stat64
-#endif
-
-struct stat64;
-
-extern _off64_t _lseek64_r _PARAMS ((struct _reent *, int, _off64_t, int));
-extern int _fstat64_r _PARAMS ((struct _reent *, int, struct stat64 *));
-extern int _open64_r _PARAMS ((struct _reent *, const char *, int, int));
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/newlib/libc/include/search.h b/newlib/libc/include/search.h
deleted file mode 100644
index c78ce18..0000000
--- a/newlib/libc/include/search.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $	*/
-/* $FreeBSD: src/include/search.h,v 1.4 2002/03/23 17:24:53 imp Exp $ */
-
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>
- * Public domain.
- */
-
-#ifndef _SEARCH_H_
-#define _SEARCH_H_
-
-#include <sys/cdefs.h>
-#include <machine/ansi.h>
-#include <sys/types.h>
-
-typedef struct entry {
-	char *key;
-	void *data;
-} ENTRY;
-
-typedef enum {
-	FIND, ENTER
-} ACTION;
-
-typedef enum {
-	preorder,
-	postorder,
-	endorder,
-	leaf
-} VISIT;
-
-#ifdef _SEARCH_PRIVATE
-typedef struct node {
-	char         *key;
-	struct node  *llink, *rlink;
-} node_t;
-#endif
-
-struct hsearch_data
-{
-  struct internal_head *htable;
-  size_t htablesize;
-};
-
-__BEGIN_DECLS
-int	 hcreate(size_t);
-void	 hdestroy(void);
-ENTRY	*hsearch(ENTRY, ACTION);
-int	 hcreate_r(size_t, struct hsearch_data *);
-void	 hdestroy_r(struct hsearch_data *);
-int	hsearch_r(ENTRY, ACTION, ENTRY **, struct hsearch_data *);
-void	*tdelete(const void *, void **, int (*)(const void *, const void *));
-void	tdestroy (void *, void (*)(void *));
-void	*tfind(const void *, void **, int (*)(const void *, const void *));
-void	*tsearch(const void *, void **, int (*)(const void *, const void *));
-void      twalk(const void *, void (*)(const void *, VISIT, int));
-__END_DECLS
-
-#endif /* !_SEARCH_H_ */
diff --git a/newlib/libc/include/setjmp.h b/newlib/libc/include/setjmp.h
index c958d90..53d0223 100644
--- a/newlib/libc/include/setjmp.h
+++ b/newlib/libc/include/setjmp.h
@@ -4,17 +4,19 @@
 */
 
 #ifndef _SETJMP_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 #define _SETJMP_H_
 
 #include "_ansi.h"
 #include <machine/setjmp.h>
 
-_BEGIN_STD_C
-
 void	_EXFUN(longjmp,(jmp_buf __jmpb, int __retval));
 int	_EXFUN(setjmp,(jmp_buf __jmpb));
 
-_END_STD_C
-
+#ifdef __cplusplus
+}
+#endif
 #endif /* _SETJMP_H_ */
 
diff --git a/newlib/libc/include/signal.h b/newlib/libc/include/signal.h
index 1b3b57b..3111491 100644
--- a/newlib/libc/include/signal.h
+++ b/newlib/libc/include/signal.h
@@ -1,16 +1,25 @@
 #ifndef _SIGNAL_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 #define _SIGNAL_H_
 
 #include "_ansi.h"
 #include <sys/signal.h>
 
-_BEGIN_STD_C
-
 typedef int	sig_atomic_t;		/* Atomic entity type (ANSI) */
 
-#define SIG_DFL ((_sig_func_ptr)0)	/* Default action */
-#define SIG_IGN ((_sig_func_ptr)1)	/* Ignore action */
-#define SIG_ERR ((_sig_func_ptr)-1)	/* Error return */
+#if defined(__STDC__) || defined(__cplusplus)
+#define SIG_DFL ((void (*)(int))0)	/* Default action */
+#define SIG_IGN ((void (*)(int))1)	/* Ignore action */
+#define SIG_ERR ((void (*)(int))-1)	/* Error return */
+#else
+#define SIG_DFL ((void (*)())0)		/* Default action */
+#define SIG_IGN ((void (*)())1)		/* Ignore action */
+#define SIG_ERR ((void (*)())-1)	/* Error return */
+#endif
+
+typedef void (*_sig_func_ptr) (int);
 
 struct _reent;
 
@@ -22,6 +31,7 @@ _sig_func_ptr _EXFUN(signal, (int, _sig_func_ptr));
 int	_EXFUN(raise, (int));
 #endif
 
-_END_STD_C
-
+#ifdef __cplusplus
+}
+#endif
 #endif /* _SIGNAL_H_ */
diff --git a/newlib/libc/include/stdint.h b/newlib/libc/include/stdint.h
deleted file mode 100644
index 328b094..0000000
--- a/newlib/libc/include/stdint.h
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * Copyright (c) 2004, 2005 by
- * Ralf Corsepius, Ulm/Germany. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-/*
- * @todo - Add support for wint_t types.
- */
-
-#ifndef _STDINT_H
-#define _STDINT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__GNUC__) && \
-  ( (__GNUC__ >= 4) || \
-    ( (__GNUC__ >= 3) && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ > 2) ) )
-/* gcc > 3.2 implicitly defines the values we are interested */
-#define __STDINT_EXP(x) __##x##__
-#else
-#define __STDINT_EXP(x) x
-#include <limits.h>
-#endif
-
-/* Check if "long long" is 64bit wide */
-/* Modern GCCs provide __LONG_LONG_MAX__, SUSv3 wants LLONG_MAX */
-#if ( defined(__LONG_LONG_MAX__) && (__LONG_LONG_MAX__ > 0x7fffffff) ) \
-  || ( defined(LLONG_MAX) && (LLONG_MAX > 0x7fffffff) )
-#define __have_longlong64 1
-#endif
-
-/* Check if "long" is 64bit or 32bit wide */
-#if __STDINT_EXP(LONG_MAX) > 0x7fffffff
-#define __have_long64 1
-#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff
-#define __have_long32 1
-#endif
-
-#if __STDINT_EXP(SCHAR_MAX) == 0x7f
-typedef signed char int8_t ;
-typedef unsigned char uint8_t ;
-#define __int8_t_defined 1
-#endif
-
-#if __int8_t_defined
-typedef signed char int_least8_t;
-typedef unsigned char uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-
-#if __STDINT_EXP(SHRT_MAX) == 0x7fff
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-#define __int16_t_defined 1
-#elif __STDINT_EXP(INT_MAX) == 0x7fff
-typedef signed int int16_t;
-typedef unsigned int uint16_t;
-#define __int16_t_defined 1
-#elif __STDINT_EXP(SCHAR_MAX) == 0x7fff
-typedef signed char int16_t;
-typedef unsigned char uint16_t;
-#define __int16_t_defined 1
-#endif
-
-#if __int16_t_defined
-typedef int16_t   	int_least16_t;
-typedef uint16_t 	uint_least16_t;
-#define __int_least16_t_defined 1
-
-#if !__int_least8_t_defined
-typedef int16_t	   	int_least8_t;
-typedef uint16_t  	uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-#endif
-
-#if __have_long32
-typedef signed long int32_t;
-typedef unsigned long uint32_t;
-#define __int32_t_defined 1
-#elif __STDINT_EXP(INT_MAX) == 0x7fffffffL
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-#define __int32_t_defined 1
-#elif __STDINT_EXP(SHRT_MAX) == 0x7fffffffL
-typedef signed short int32_t;
-typedef unsigned short uint32_t;
-#define __int32_t_defined 1
-#elif __STDINT_EXP(SCHAR_MAX) == 0x7fffffffL
-typedef signed char int32_t;
-typedef unsigned char uint32_t;
-#define __int32_t_defined 1
-#endif
-
-#if __int32_t_defined
-typedef int32_t   	int_least32_t;
-typedef uint32_t 	uint_least32_t;
-#define __int_least32_t_defined 1
-
-#if !__int_least8_t_defined
-typedef int32_t	   	int_least8_t;
-typedef uint32_t  	uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-
-#if !__int_least16_t_defined
-typedef int32_t	   	int_least16_t;
-typedef uint32_t  	uint_least16_t;
-#define __int_least16_t_defined 1
-#endif
-#endif
-
-#if __have_long64
-typedef signed long int64_t;
-typedef unsigned long uint64_t;
-#define __int64_t_defined 1
-#elif __have_longlong64
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
-#define __int64_t_defined 1
-#elif  __STDINT_EXP(INT_MAX) > 0x7fffffff
-typedef signed int int64_t;
-typedef unsigned int uint64_t;
-#define __int64_t_defined 1
-#endif
-
-#if __int64_t_defined
-typedef int64_t   	int_least64_t;
-typedef uint64_t 	uint_least64_t;
-#define __int_least64_t_defined 1
-
-#if !__int_least8_t_defined
-typedef int64_t	   	int_least8_t;
-typedef uint64_t  	uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-
-#if !__int_least16_t_defined
-typedef int64_t	   	int_least16_t;
-typedef uint64_t  	uint_least16_t;
-#define __int_least16_t_defined 1
-#endif
-
-#if !__int_least32_t_defined
-typedef int64_t	   	int_least32_t;
-typedef uint64_t  	uint_least32_t;
-#define __int_least32_t_defined 1
-#endif
-#endif
-
-/*
- * Fastest minimum-width integer types
- *
- * Assume int to be the fastest type for all types with a width 
- * less than __INT_MAX__ rsp. INT_MAX
- */
-#if __STDINT_EXP(INT_MAX) >= 0x7f
-  typedef signed int int_fast8_t;
-  typedef unsigned int uint_fast8_t;
-#define __int_fast8_t_defined 1
-#endif
-
-#if __STDINT_EXP(INT_MAX) >= 0x7fff
-  typedef signed int int_fast16_t;
-  typedef unsigned int uint_fast16_t;
-#define __int_fast16_t_defined 1
-#endif
-
-#if __STDINT_EXP(INT_MAX) >= 0x7fffffff
-  typedef signed int int_fast32_t;
-  typedef unsigned int uint_fast32_t;
-#define __int_fast32_t_defined 1
-#endif
-
-#if __STDINT_EXP(INT_MAX) > 0x7fffffff
-  typedef signed int int_fast64_t;
-  typedef unsigned int uint_fast64_t;
-#define __int_fast64_t_defined 1
-#endif
-
-/*
- * Fall back to [u]int_least<N>_t for [u]int_fast<N>_t types
- * not having been defined, yet.
- * Leave undefined, if [u]int_least<N>_t should not be available.
- */
-#if !__int_fast8_t_defined
-#if __int_least8_t_defined
-  typedef int_least8_t int_fast8_t;
-  typedef uint_least8_t uint_fast8_t;
-#define __int_fast8_t_defined 1
-#endif
-#endif
-
-#if !__int_fast16_t_defined
-#if __int_least16_t_defined
-  typedef int_least16_t int_fast16_t;
-  typedef uint_least16_t uint_fast16_t;
-#define __int_fast16_t_defined 1
-#endif
-#endif
-
-#if !__int_fast32_t_defined
-#if __int_least32_t_defined
-  typedef int_least32_t int_fast32_t;
-  typedef uint_least32_t uint_fast32_t;
-#define __int_fast32_t_defined 1
-#endif
-#endif
-
-#if !__int_fast64_t_defined
-#if __int_least64_t_defined
-  typedef int_least64_t int_fast64_t;
-  typedef uint_least64_t uint_fast64_t;
-#define __int_fast64_t_defined 1
-#endif
-#endif
-
-/* Greatest-width integer types */
-/* Modern GCCs provide __INTMAX_TYPE__ */
-#if defined(__INTMAX_TYPE__)
-  typedef __INTMAX_TYPE__ intmax_t;
-#elif __have_longlong64
-  typedef signed long long intmax_t;
-#else
-  typedef signed long intmax_t;
-#endif
-
-/* Modern GCCs provide __UINTMAX_TYPE__ */
-#if defined(__UINTMAX_TYPE__)
-  typedef __UINTMAX_TYPE__ uintmax_t;
-#elif __have_longlong64
-  typedef unsigned long long uintmax_t;
-#else
-  typedef unsigned long uintmax_t;
-#endif
-
-/*
- * GCC doesn't provide an appropriate macro for [u]intptr_t
- * For now, use __PTRDIFF_TYPE__
- */
-#if defined(__PTRDIFF_TYPE__)
-typedef signed __PTRDIFF_TYPE__ intptr_t;
-typedef unsigned __PTRDIFF_TYPE__ uintptr_t;
-#else
-/*
- * Fallback to hardcoded values, 
- * should be valid on cpu's with 32bit int/32bit void*
- */
-typedef signed long intptr_t;
-typedef unsigned long uintptr_t;
-#endif
-
-/* Limits of Specified-Width Integer Types */
-
-#if __int8_t_defined
-#define INT8_MIN 	-128
-#define INT8_MAX 	 127
-#define UINT8_MAX 	 255
-#endif
-
-#if __int_least8_t_defined
-#define INT_LEAST8_MIN 	-128
-#define INT_LEAST8_MAX 	 127
-#define UINT_LEAST8_MAX	 255
-#else
-#error required type int_least8_t missing
-#endif
-
-#if __int16_t_defined
-#define INT16_MIN 	-32768
-#define INT16_MAX 	 32767
-#define UINT16_MAX 	 65535
-#endif
-
-#if __int_least16_t_defined
-#define INT_LEAST16_MIN	-32768
-#define INT_LEAST16_MAX	 32767
-#define UINT_LEAST16_MAX 65535
-#else
-#error required type int_least16_t missing
-#endif
-
-#if __int32_t_defined
-#define INT32_MIN 	 (-2147483647-1)
-#define INT32_MAX 	 2147483647
-#define UINT32_MAX       4294967295U
-#endif
-
-#if __int_least32_t_defined
-#define INT_LEAST32_MIN  (-2147483647-1)
-#define INT_LEAST32_MAX  2147483647
-#define UINT_LEAST32_MAX 4294967295U
-#else
-#error required type int_least32_t missing
-#endif
-
-#if __int64_t_defined
-#if __have_long64
-#define INT64_MIN 	(-9223372036854775807L-1L)
-#define INT64_MAX 	 9223372036854775807L
-#define UINT64_MAX 	18446744073709551615U
-#elif __have_longlong64
-#define INT64_MIN 	(-9223372036854775807LL-1LL)
-#define INT64_MAX 	 9223372036854775807LL
-#define UINT64_MAX 	18446744073709551615ULL
-#endif
-#endif
-
-#if __int_least64_t_defined
-#if __have_long64
-#define INT_LEAST64_MIN  (-9223372036854775807L-1L)
-#define INT_LEAST64_MAX  9223372036854775807L
-#define UINT_LEAST64_MAX 18446744073709551615U
-#elif __have_longlong64
-#define INT_LEAST64_MIN  (-9223372036854775807LL-1LL)
-#define INT_LEAST64_MAX  9223372036854775807LL
-#define UINT_LEAST64_MAX 18446744073709551615ULL
-#endif
-#endif
-
-#if __int_fast8_t_defined
-#define INT_FAST8_MIN	INT8_MIN
-#define INT_FAST8_MAX	INT8_MAX
-#define UINT_FAST8_MAX	UINT8_MAX
-#endif
-
-#if __int_fast16_t_defined
-#define INT_FAST16_MIN	INT16_MIN
-#define INT_FAST16_MAX	INT16_MAX
-#define UINT_FAST16_MAX	UINT16_MAX
-#endif
-
-#if __int_fast32_t_defined
-#define INT_FAST32_MIN	INT32_MIN
-#define INT_FAST32_MAX	INT32_MAX
-#define UINT_FAST32_MAX	UINT32_MAX
-#endif
-
-#if __int_fast64_t_defined
-#define INT_FAST64_MIN	INT64_MIN
-#define INT_FAST64_MAX	INT64_MAX
-#define UINT_FAST64_MAX	UINT64_MAX
-#endif
-
-/* This must match size_t in stddef.h, currently long unsigned int */
-#define SIZE_MIN (-__STDINT_EXP(LONG_MAX) - 1L)
-#define SIZE_MAX __STDINT_EXP(LONG_MAX)
-
-/* This must match sig_atomic_t in <signal.h> (currently int) */
-#define SIG_ATOMIC_MIN (-__STDINT_EXP(INT_MAX) - 1)
-#define SIG_ATOMIC_MAX __STDINT_EXP(INT_MAX)
-
-/* This must match ptrdiff_t  in <stddef.h> (currently long int) */
-#define PTRDIFF_MIN (-__STDINT_EXP(LONG_MAX) - 1L)
-#define PTRDIFF_MAX __STDINT_EXP(LONG_MAX)
-
-/** Macros for minimum-width integer constant expressions */
-#define INT8_C(x)	x
-#define UINT8_C(x)	x##U
-
-#define INT16_C(x)	x
-#define UINT16_C(x)	x##U
-
-#if __have_long32
-#define INT32_C(x)	x##L
-#define UINT32_C(x)	x##UL
-#else
-#define INT32_C(x)	x
-#define UINT32_C(x)	x##U
-#endif
-
-#if __int64_t_defined
-#if __have_longlong64
-#define INT64_C(x)	x##LL
-#define UINT64_C(x)	x##ULL
-#else
-#define INT64_C(x)	x##L
-#define UINT64_C(x)	x##UL
-#endif
-#endif
-
-/** Macros for greatest-width integer constant expression */
-#if __have_longlong64
-#define INTMAX_C(x)	x##LL
-#define UINTMAX_C(x)	x##ULL
-#else
-#define INTMAX_C(x)	x##L
-#define UINTMAX_C(x)	x##UL
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _STDINT_H */
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index ef8c2db..9fb9451 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -24,6 +24,9 @@
  */
 
 #ifndef _STDIO_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 #define	_STDIO_H_
 
 #include "_ansi.h"
@@ -37,32 +40,16 @@
 #include <stdarg.h>
 
 /*
- * <sys/reent.h> defines __FILE, _fpos_t.
+ * <sys/reent.h> defines __sFILE, _fpos_t.
  * They must be defined there because struct _reent needs them (and we don't
  * want reent.h to include this file.
  */
 
 #include <sys/reent.h>
-#include <sys/types.h>
-
-_BEGIN_STD_C
 
-typedef __FILE FILE;
-
-#ifdef __CYGWIN__
-#ifdef __CYGWIN_USE_BIG_TYPES__
-typedef _fpos64_t fpos_t;
-#else
-typedef _fpos_t fpos_t;
-#endif
-#else
 typedef _fpos_t fpos_t;
-#ifdef __LARGE64_FILES
-typedef _fpos64_t fpos64_t;
-#endif
-#endif /* !__CYGWIN__ */
 
-#include <sys/stdio.h>
+typedef struct __sFILE FILE;
 
 #define	__SLBF	0x0001		/* line buffered */
 #define	__SNBF	0x0002		/* unbuffered */
@@ -79,10 +66,9 @@ typedef _fpos64_t fpos64_t;
 #define	__SNPT	0x0800		/* do not do fseek() optimisation */
 #define	__SOFF	0x1000		/* set iff _offset is in fact correct */
 #define	__SMOD	0x2000		/* true => fgetline modified _p text */
-#if defined(__CYGWIN__)
-#  define __SCLE  0x4000        /* convert line endings CR/LF <-> NL */
+#if defined(__CYGWIN__) || defined(__CYGWIN__)
+#define __SCLE        0x4000          /* convert line endings CR/LF <-> NL */
 #endif
-#define	__SL64	0x8000		/* is 64-bit offset large file */
 
 /*
  * The following three definitions are for ANSI C, which took them
@@ -143,15 +129,9 @@ typedef _fpos64_t fpos64_t;
 
 #define	TMP_MAX		26
 
-#ifndef _REENT_ONLY
-#define	stdin	(_REENT->_stdin)
-#define	stdout	(_REENT->_stdout)
-#define	stderr	(_REENT->_stderr)
-#else /* _REENT_ONLY */
 #define	stdin	(_impure_ptr->_stdin)
 #define	stdout	(_impure_ptr->_stdout)
 #define	stderr	(_impure_ptr->_stderr)
-#endif /* _REENT_ONLY */
 
 #define _stdin_r(x)	((x)->_stdin)
 #define _stdout_r(x)	((x)->_stdout)
@@ -195,17 +175,9 @@ int	_EXFUN(puts, (const char *));
 int	_EXFUN(ungetc, (int, FILE *));
 size_t	_EXFUN(fread, (_PTR, size_t _size, size_t _n, FILE *));
 size_t	_EXFUN(fwrite, (const _PTR , size_t _size, size_t _n, FILE *));
-#ifdef _COMPILING_NEWLIB
-int	_EXFUN(fgetpos, (FILE *, _fpos_t *));
-#else
 int	_EXFUN(fgetpos, (FILE *, fpos_t *));
-#endif
 int	_EXFUN(fseek, (FILE *, long, int));
-#ifdef _COMPILING_NEWLIB
-int	_EXFUN(fsetpos, (FILE *, const _fpos_t *));
-#else
 int	_EXFUN(fsetpos, (FILE *, const fpos_t *));
-#endif
 long	_EXFUN(ftell, ( FILE *));
 void	_EXFUN(rewind, (FILE *));
 void	_EXFUN(clearerr, (FILE *));
@@ -219,37 +191,17 @@ int	_EXFUN(remove, (const char *));
 int	_EXFUN(rename, (const char *, const char *));
 #endif
 #ifndef __STRICT_ANSI__
-#ifdef _COMPILING_NEWLIB
-int	_EXFUN(fseeko, (FILE *, _off_t, int));
-_off_t	_EXFUN(ftello, ( FILE *));
-#else
-int	_EXFUN(fseeko, (FILE *, off_t, int));
-off_t	_EXFUN(ftello, ( FILE *));
-#endif
-#ifndef _REENT_ONLY
-int	_EXFUN(asiprintf, (char **, const char *, ...));
-int	_EXFUN(asprintf, (char **, const char *, ...));
-int	_EXFUN(dprintf, (int, const char *, ...));
-int	_EXFUN(fcloseall, (_VOID));
-int	_EXFUN(fiprintf, (FILE *, const char *, ...));
+int	_EXFUN(vfiprintf, (FILE *, const char *, __VALIST));
 int	_EXFUN(iprintf, (const char *, ...));
+int	_EXFUN(fiprintf, (FILE *, const char *, ...));
 int	_EXFUN(siprintf, (char *, const char *, ...));
-int	_EXFUN(snprintf, (char *, size_t, const char *, ...));
-int	_EXFUN(sniprintf, (char *, size_t, const char *, ...));
 char *	_EXFUN(tempnam, (const char *, const char *));
-int	_EXFUN(vasiprintf, (char **, const char *, __VALIST));
-int	_EXFUN(vasprintf, (char **, const char *, __VALIST));
-int	_EXFUN(vdprintf, (int, const char *, __VALIST));
-int	_EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST));
 int	_EXFUN(vsnprintf, (char *, size_t, const char *, __VALIST));
-int	_EXFUN(vfiprintf, (FILE *, const char *, __VALIST));
-int	_EXFUN(vfiscanf, (FILE *, const char *, __VALIST));
 int	_EXFUN(vfscanf, (FILE *, const char *, __VALIST));
-int	_EXFUN(viprintf, (const char *, __VALIST));
-int	_EXFUN(viscanf, (const char *, __VALIST));
 int	_EXFUN(vscanf, (const char *, __VALIST));
-int	_EXFUN(vsiscanf, (const char *, const char *, __VALIST));
 int	_EXFUN(vsscanf, (const char *, const char *, __VALIST));
+#ifndef _REENT_ONLY
+int	_EXFUN(snprintf, (char *, size_t, const char *, ...));
 #endif
 #endif
 
@@ -268,34 +220,18 @@ FILE *  _EXFUN(popen, (const char *, const char *));
 int	_EXFUN(putw, (int, FILE *));
 void    _EXFUN(setbuffer, (FILE *, char *, int));
 int	_EXFUN(setlinebuf, (FILE *));
-int	_EXFUN(getc_unlocked, (FILE *));
-int	_EXFUN(getchar_unlocked, (void));
-void	_EXFUN(flockfile, (FILE *));
-int	_EXFUN(ftrylockfile, (FILE *));
-void	_EXFUN(funlockfile, (FILE *));
-int	_EXFUN(putc_unlocked, (int, FILE *));
-int	_EXFUN(putchar_unlocked, (int));
 #endif
 
 /*
  * Recursive versions of the above.
  */
 
-int	_EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...));
-int	_EXFUN(_asprintf_r, (struct _reent *, char **, const char *, ...));
-int	_EXFUN(_dprintf_r, (struct _reent *, int, const char *, ...));
-int	_EXFUN(_fcloseall_r, (struct _reent *));
 FILE *	_EXFUN(_fdopen_r, (struct _reent *, int, const char *));
 FILE *	_EXFUN(_fopen_r, (struct _reent *, const char *, const char *));
-int	_EXFUN(_fclose_r, (struct _reent *, FILE *));
-int	_EXFUN(_fiscanf_r, (struct _reent *, FILE *, const char *, ...));
 int	_EXFUN(_fscanf_r, (struct _reent *, FILE *, const char *, ...));
-int	_EXFUN(_fseek_r, (struct _reent *, FILE *, long, int));
-long	_EXFUN(_ftell_r, (struct _reent *, FILE *));
 int	_EXFUN(_getchar_r, (struct _reent *));
 char *	_EXFUN(_gets_r, (struct _reent *, char *));
 int	_EXFUN(_iprintf_r, (struct _reent *, const char *, ...));
-int	_EXFUN(_iscanf_r, (struct _reent *, const char *, ...));
 int	_EXFUN(_mkstemp_r, (struct _reent *, char *));
 char *	_EXFUN(_mktemp_r, (struct _reent *, char *));
 void	_EXFUN(_perror_r, (struct _reent *, const char *));
@@ -306,57 +242,20 @@ int	_EXFUN(_remove_r, (struct _reent *, const char *));
 int	_EXFUN(_rename_r, (struct _reent *,
 			   const char *_old, const char *_new));
 int	_EXFUN(_scanf_r, (struct _reent *, const char *, ...));
-int	_EXFUN(_siprintf_r, (struct _reent *, char *, const char *, ...));
-int	_EXFUN(_siscanf_r, (struct _reent *, const char *, const char *, ...));
-int	_EXFUN(_sniprintf_r, (struct _reent *, char *, size_t, const char *, ...));
-int	_EXFUN(_snprintf_r, (struct _reent *, char *, size_t, const char *, ...));
 int	_EXFUN(_sprintf_r, (struct _reent *, char *, const char *, ...));
+int	_EXFUN(_snprintf_r, (struct _reent *, char *, size_t, const char *, ...));
 int	_EXFUN(_sscanf_r, (struct _reent *, const char *, const char *, ...));
 char *	_EXFUN(_tempnam_r, (struct _reent *, const char *, const char *));
 FILE *	_EXFUN(_tmpfile_r, (struct _reent *));
 char *	_EXFUN(_tmpnam_r, (struct _reent *, char *));
-int	_EXFUN(_ungetc_r, (struct _reent *, int, FILE *));
-int	_EXFUN(_vasiprintf_r, (struct _reent *, char **, const char *, __VALIST));
-int	_EXFUN(_vasprintf_r, (struct _reent *, char **, const char *, __VALIST));
-int	_EXFUN(_vdprintf_r, (struct _reent *, int, const char *, __VALIST));
-int	_EXFUN(_vfiprintf_r, (struct _reent *, FILE *, const char *, __VALIST));
 int	_EXFUN(_vfprintf_r, (struct _reent *, FILE *, const char *, __VALIST));
-int	_EXFUN(_viprintf_r, (struct _reent *, const char *, __VALIST));
 int	_EXFUN(_vprintf_r, (struct _reent *, const char *, __VALIST));
-int	_EXFUN(_vsiprintf_r, (struct _reent *, char *, const char *, __VALIST));
 int	_EXFUN(_vsprintf_r, (struct _reent *, char *, const char *, __VALIST));
-int	_EXFUN(_vsniprintf_r, (struct _reent *, char *, size_t, const char *, __VALIST));
 int	_EXFUN(_vsnprintf_r, (struct _reent *, char *, size_t, const char *, __VALIST));
-int	_EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST));
 int	_EXFUN(_vfscanf_r, (struct _reent *, FILE *, const char *, __VALIST));
-int	_EXFUN(_viscanf_r, (struct _reent *, const char *, __VALIST));
 int	_EXFUN(_vscanf_r, (struct _reent *, const char *, __VALIST));
 int	_EXFUN(_vsscanf_r, (struct _reent *, const char *, const char *, __VALIST));
-int	_EXFUN(_vsiscanf_r, (struct _reent *, const char *, const char *, __VALIST));
-
-ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
-ssize_t _EXFUN(__getline, (char **, size_t *, FILE *));
-
-#ifdef __LARGE64_FILES
-#if !defined(__CYGWIN__) || defined(_COMPILING_NEWLIB)
-FILE *	_EXFUN(fdopen64, (int, const char *));
-FILE *  _EXFUN(fopen64, (const char *, const char *));
-_off64_t _EXFUN(ftello64, (FILE *));
-_off64_t _EXFUN(fseeko64, (FILE *, _off64_t, int));
-int     _EXFUN(fgetpos64, (FILE *, _fpos64_t *));
-int     _EXFUN(fsetpos64, (FILE *, const _fpos64_t *));
-FILE *  _EXFUN(tmpfile64, (void));
-
-FILE *	_EXFUN(_fdopen64_r, (struct _reent *, int, const char *));
-FILE *  _EXFUN(_fopen64_r, (struct _reent *,const char *, const char *));
-_off64_t _EXFUN(_ftello64_r, (struct _reent *, FILE *));
-_off64_t _EXFUN(_fseeko64_r, (struct _reent *, FILE *, _off64_t, int));
-int     _EXFUN(_fgetpos64_r, (struct _reent *, FILE *, _fpos64_t *));
-int     _EXFUN(_fsetpos64_r, (struct _reent *, FILE *, const _fpos64_t *));
-FILE *  _EXFUN(_tmpfile64_r, (struct _reent *));
-#endif /* !__CYGWIN__ */
-#endif /* __LARGE64_FILES */
- 
+
 /*
  * Routines internal to the implementation.
  */
@@ -468,6 +367,7 @@ static __inline int __sputc(int _c, FILE *_p) {
 #endif
 #endif
 
-_END_STD_C
-
+#ifdef __cplusplus
+}
+#endif
 #endif /* _STDIO_H_ */
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index 9bee3b1..00a9d1a 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -5,6 +5,9 @@
  */
 
 #ifndef _STDLIB_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 #define _STDLIB_H_
 
 #include "_ansi.h"
@@ -14,17 +17,11 @@
 #include <stddef.h>
 
 #include <sys/reent.h>
-#include <machine/stdlib.h>
+
 #ifndef __STRICT_ANSI__
 #include <alloca.h>
 #endif
 
-#ifdef __CYGWIN__
-#include <cygwin/stdlib.h>
-#endif
-
-_BEGIN_STD_C
-
 typedef struct 
 {
   int quot; /* quotient */
@@ -37,14 +34,6 @@ typedef struct
   long rem; /* remainder */
 } ldiv_t;
 
-#ifndef __STRICT_ANSI__
-typedef struct
-{
-  long long int quot; /* quotient */
-  long long int rem; /* remainder */
-} lldiv_t;
-#endif
-
 #ifndef NULL
 #define NULL 0
 #endif
@@ -66,9 +55,7 @@ double	_EXFUN(atof,(const char *__nptr));
 float	_EXFUN(atoff,(const char *__nptr));
 #endif
 int	_EXFUN(atoi,(const char *__nptr));
-int	_EXFUN(_atoi_r,(struct _reent *, const char *__nptr));
 long	_EXFUN(atol,(const char *__nptr));
-long	_EXFUN(_atol_r,(struct _reent *, const char *__nptr));
 _PTR	_EXFUN(bsearch,(const _PTR __key,
 		       const _PTR __base,
 		       size_t __nmemb,
@@ -86,15 +73,15 @@ long	_EXFUN(labs,(long));
 ldiv_t	_EXFUN(ldiv,(long __numer, long __denom));
 _PTR	_EXFUN(malloc,(size_t __size));
 int	_EXFUN(mblen,(const char *, size_t));
-int	_EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *));
+int	_EXFUN(_mblen_r,(struct _reent *, const char *, size_t, int *));
 int	_EXFUN(mbtowc,(wchar_t *, const char *, size_t));
-int	_EXFUN(_mbtowc_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
+int	_EXFUN(_mbtowc_r,(struct _reent *, wchar_t *, const char *, size_t, int *));
 int	_EXFUN(wctomb,(char *, wchar_t));
-int	_EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *));
+int	_EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, int *));
 size_t	_EXFUN(mbstowcs,(wchar_t *, const char *, size_t));
-size_t	_EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *, const char *, size_t, _mbstate_t *));
+size_t	_EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *, const char *, size_t, int *));
 size_t	_EXFUN(wcstombs,(char *, const wchar_t *, size_t));
-size_t	_EXFUN(_wcstombs_r,(struct _reent *, char *, const wchar_t *, size_t, _mbstate_t *));
+size_t	_EXFUN(_wcstombs_r,(struct _reent *, char *, const wchar_t *, size_t, int *));
 #ifndef __STRICT_ANSI__
 #ifndef _REENT_ONLY
 int     _EXFUN(mkstemp,(char *));
@@ -107,12 +94,8 @@ _PTR	_EXFUN(realloc,(_PTR __r, size_t __size));
 _VOID	_EXFUN(srand,(unsigned __seed));
 double	_EXFUN(strtod,(const char *__n, char **__end_PTR));
 double	_EXFUN(_strtod_r,(struct _reent *,const char *__n, char **__end_PTR));
-float	_EXFUN(strtof,(const char *__n, char **__end_PTR));
 #ifndef __STRICT_ANSI__
-/* the following strtodf interface is deprecated...use strtof instead */
-# ifndef strtodf 
-#  define strtodf strtof
-# endif
+float	_EXFUN(strtodf,(const char *__n, char **__end_PTR));
 #endif
 long	_EXFUN(strtol,(const char *__n, char **__end_PTR, int __base));
 long	_EXFUN(_strtol_r,(struct _reent *,const char *__n, char **__end_PTR, int __base));
@@ -122,13 +105,8 @@ unsigned long _EXFUN(_strtoul_r,(struct _reent *,const char *__n, char **__end_P
 int	_EXFUN(system,(const char *__string));
 
 #ifndef __STRICT_ANSI__
-long    _EXFUN(a64l,(const char *__input));
-char *  _EXFUN(l64a,(long __input));
-char *  _EXFUN(_l64a_r,(struct _reent *,long __input));
-int	_EXFUN(on_exit,(_VOID (*__func)(int, _PTR),_PTR __arg));
-_VOID	_EXFUN(_Exit,(int __status) _ATTRIBUTE ((noreturn)));
-int	_EXFUN(putenv,(char *__string));
-int	_EXFUN(_putenv_r,(struct _reent *, char *__string));
+int	_EXFUN(putenv,(const char *__string));
+int	_EXFUN(_putenv_r,(struct _reent *, const char *__string));
 int	_EXFUN(setenv,(const char *__string, const char *__value, int __overwrite));
 int	_EXFUN(_setenv_r,(struct _reent *, const char *__string, const char *__value, int __overwrite));
 
@@ -163,10 +141,6 @@ unsigned short *
        _EXFUN(_seed48_r,(struct _reent *, unsigned short [3]));
 _VOID  _EXFUN(srand48,(long));
 _VOID  _EXFUN(_srand48_r,(struct _reent *, long));
-long long _EXFUN(atoll,(const char *__nptr));
-long long _EXFUN(_atoll_r,(struct _reent *, const char *__nptr));
-long long _EXFUN(llabs,(long long));
-lldiv_t	_EXFUN(lldiv,(long long __numer, long long __denom));
 long long _EXFUN(strtoll,(const char *__n, char **__end_PTR, int __base));
 long long _EXFUN(_strtoll_r,(struct _reent *, const char *__n, char **__end_PTR, int __base));
 unsigned long long _EXFUN(strtoull,(const char *__n, char **__end_PTR, int __base));
@@ -174,24 +148,30 @@ unsigned long long _EXFUN(_strtoull_r,(struct _reent *, const char *__n, char **
 
 #ifndef __CYGWIN__
 _VOID	_EXFUN(cfree,(_PTR));
+#else
+char *	_EXFUN(realpath,(const char *, char *));
 void	_EXFUN(unsetenv,(const char *__string));
 void	_EXFUN(_unsetenv_r,(struct _reent *, const char *__string));
+int	_EXFUN(random,(_VOID));
+long	_EXFUN(srandom,(unsigned __seed));
+char *  _EXFUN(ptsname, (int));
+int     _EXFUN(grantpt, (int));
+int     _EXFUN(unlockpt,(int));
 #endif
 
 #endif /* ! __STRICT_ANSI__ */
 
 char *	_EXFUN(_dtoa_r,(struct _reent *, double, int, int, int *, int*, char**));
-#ifndef __CYGWIN__
 _PTR	_EXFUN(_malloc_r,(struct _reent *, size_t));
 _PTR	_EXFUN(_calloc_r,(struct _reent *, size_t, size_t));
 _VOID	_EXFUN(_free_r,(struct _reent *, _PTR));
 _PTR	_EXFUN(_realloc_r,(struct _reent *, _PTR, size_t));
 _VOID	_EXFUN(_mstats_r,(struct _reent *, char *));
-#endif
 int	_EXFUN(_system_r,(struct _reent *, const char *));
 
 _VOID	_EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *));
 
-_END_STD_C
-
+#ifdef __cplusplus
+}
+#endif
 #endif /* _STDLIB_H_ */
diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index 55a86b3..e85dac3 100644
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -7,6 +7,10 @@
 #ifndef _STRING_H_
 #define	_STRING_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "_ansi.h"
 #include <sys/reent.h>
 
@@ -17,8 +21,6 @@
 #define NULL 0
 #endif
 
-_BEGIN_STD_C
-
 _PTR 	 _EXFUN(memchr,(const _PTR, int, size_t));
 int 	 _EXFUN(memcmp,(const _PTR, const _PTR, size_t));
 _PTR 	 _EXFUN(memcpy,(_PTR, const _PTR, size_t));
@@ -49,27 +51,17 @@ size_t	 _EXFUN(strxfrm,(char *, const char *, size_t));
 #ifndef __STRICT_ANSI__
 char 	*_EXFUN(strtok_r,(char *, const char *, char **));
 
-int	 _EXFUN(bcmp,(const void *, const void *, size_t));
-void	 _EXFUN(bcopy,(const void *, void *, size_t));
-void	 _EXFUN(bzero,(void *, size_t));
+int	 _EXFUN(bcmp,(const char *, const char *, size_t));
+void	 _EXFUN(bcopy,(const char *, char *, size_t));
+void	 _EXFUN(bzero,(char *, size_t));
 int	 _EXFUN(ffs,(int));
 char 	*_EXFUN(index,(const char *, int));
 _PTR	 _EXFUN(memccpy,(_PTR, const _PTR, int, size_t));
-_PTR	 _EXFUN(mempcpy,(_PTR, const _PTR, size_t));
-#ifdef __CYGWIN__
-extern void *memmem (__const void *, size_t,  __const void *, size_t);
-#endif
 char 	*_EXFUN(rindex,(const char *, int));
 int	 _EXFUN(strcasecmp,(const char *, const char *));
 char 	*_EXFUN(strdup,(const char *));
 char 	*_EXFUN(_strdup_r,(struct _reent *, const char *));
-char 	*_EXFUN(strndup,(const char *, size_t));
-char 	*_EXFUN(_strndup_r,(struct _reent *, const char *, size_t));
-char 	*_EXFUN(strerror_r,(int, char *, size_t));
-size_t	 _EXFUN(strlcat,(char *, const char *, size_t));
-size_t	 _EXFUN(strlcpy,(char *, const char *, size_t));
 int	 _EXFUN(strncasecmp,(const char *, const char *, size_t));
-size_t	 _EXFUN(strnlen,(const char *, size_t));
 char 	*_EXFUN(strsep,(char **, const char *));
 char	*_EXFUN(strlwr,(char *));
 char	*_EXFUN(strupr,(char *));
@@ -96,8 +88,7 @@ int     _EXFUN(strtosigno, (const char *__name));
 
 #endif /* ! __STRICT_ANSI__ */
 
-#include <sys/string.h>
-
-_END_STD_C
-
+#ifdef __cplusplus
+}
+#endif
 #endif /* _STRING_H_ */
diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h
index d3f68ce..8186f2d 100644
--- a/newlib/libc/include/sys/_types.h
+++ b/newlib/libc/include/sys/_types.h
@@ -9,34 +9,7 @@
 #ifndef	_SYS__TYPES_H
 #define _SYS__TYPES_H
 
-#include <sys/lock.h>
-
 typedef long _off_t;
-__extension__ typedef long long _off64_t;
-
-#if defined(__INT_MAX__) && __INT_MAX__ == 2147483647
-typedef int _ssize_t;
-#else
 typedef long _ssize_t;
-#endif
-
-#define __need_wint_t
-#include <stddef.h>
-
-/* Conversion state information.  */
-typedef struct
-{
-  int __count;
-  union
-  {
-    wint_t __wch;
-    unsigned char __wchb[4];
-  } __value;		/* Value so far.  */
-} _mbstate_t;
-
-typedef _LOCK_RECURSIVE_T _flock_t;
-
-/* Iconv descriptor type */
-typedef void *_iconv_t;
 
 #endif	/* _SYS__TYPES_H */
diff --git a/newlib/libc/include/sys/cdefs.h b/newlib/libc/include/sys/cdefs.h
deleted file mode 100644
index f0b6a27..0000000
--- a/newlib/libc/include/sys/cdefs.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* libc/sys/linux/sys/cdefs.h - Helper macros for K&R vs. ANSI C compat. */
-
-/* Written 2000 by Werner Almesberger */
-
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Berkeley Software Design, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/cdefs.h,v 1.54 2002/05/11 03:58:24 alfred Exp $
- */
-
-#ifndef _SYS_CDEFS_H
-#define _SYS_CDEFS_H
-
-#define __FBSDID(x) /* nothing */
-/*
- * Note: the goal here is not compatibility to K&R C. Since we know that we
- * have GCC which understands ANSI C perfectly well, we make use of this.
- */
-
-#define __P(args)	args
-#define __PMT(args)	args
-#define __const		const
-#define __signed	signed
-#define __volatile	volatile
-#define __DOTS    	, ...
-#define __THROW
-
-#define __ptr_t void *
-#define __long_double_t  long double
-
-#define __attribute_malloc__
-#define __attribute_pure__
-#define __attribute_format_strfmon__(a,b)
-#define __flexarr      [0]
-
-#ifdef  __cplusplus
-# define __BEGIN_DECLS  extern "C" {
-# define __END_DECLS    }
-#else
-# define __BEGIN_DECLS
-# define __END_DECLS
-#endif
-
-#ifndef __BOUNDED_POINTERS__
-# define __bounded      /* nothing */
-# define __unbounded    /* nothing */
-# define __ptrvalue     /* nothing */
-#endif
-
-#ifdef __GNUC__
-#define	__strong_reference(sym,aliassym)	\
-	extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)));
-#ifdef __ELF__
-#ifdef __STDC__
-#define	__weak_reference(sym,alias)	\
-	__asm__(".weak " #alias);	\
-	__asm__(".equ "  #alias ", " #sym)
-#define	__warn_references(sym,msg)	\
-	__asm__(".section .gnu.warning." #sym);	\
-	__asm__(".asciz \"" msg "\"");	\
-	__asm__(".previous")
-#else
-#define	__weak_reference(sym,alias)	\
-	__asm__(".weak alias");		\
-	__asm__(".equ alias, sym")
-#define	__warn_references(sym,msg)	\
-	__asm__(".section .gnu.warning.sym"); \
-	__asm__(".asciz \"msg\"");	\
-	__asm__(".previous")
-#endif	/* __STDC__ */
-#else	/* !__ELF__ */
-#ifdef __STDC__
-#define	__weak_reference(sym,alias)	\
-	__asm__(".stabs \"_" #alias "\",11,0,0,0");	\
-	__asm__(".stabs \"_" #sym "\",1,0,0,0")
-#define	__warn_references(sym,msg)	\
-	__asm__(".stabs \"" msg "\",30,0,0,0");		\
-	__asm__(".stabs \"_" #sym "\",1,0,0,0")
-#else
-#define	__weak_reference(sym,alias)	\
-	__asm__(".stabs \"_/**/alias\",11,0,0,0");	\
-	__asm__(".stabs \"_/**/sym\",1,0,0,0")
-#define	__warn_references(sym,msg)	\
-	__asm__(".stabs msg,30,0,0,0");			\
-	__asm__(".stabs \"_/**/sym\",1,0,0,0")
-#endif	/* __STDC__ */
-#endif	/* __ELF__ */
-#endif	/* __GNUC__ */
-
-#endif /* _SYS_CDEFS_H */
diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h
index c4e4dba..a0741dc 100644
--- a/newlib/libc/include/sys/config.h
+++ b/newlib/libc/include/sys/config.h
@@ -1,53 +1,46 @@
 #ifndef __SYS_CONFIG_H__
 #define __SYS_CONFIG_H__
 
-#include <machine/ieeefp.h>  /* floating point macros */
-
 /* exceptions first */
-#if defined(__H8500__) || defined(__W65__)
+/* ??? Why is much of this stuff duplicated with machine/ieeefp.h?  */
+#if defined(__H8300__) || defined(__H8500__) || defined (__H8300H__) ||  defined(__W65__) || defined (__H8300S__)
+#define _FLOAT_ARG float
 #define __SMALL_BITFIELDS
+#define _DOUBLE_IS_32BITS
+#define __IEEE_BIG_ENDIAN
 /* ???  This conditional is true for the h8500 and the w65, defining H8300
    in those cases probably isn't the right thing to do.  */
 #define H8300 1
 #endif
 
-/* 16 bit integer machines */
-#if defined(__Z8001__) || defined(__Z8002__) || defined(__H8500__) || defined(__W65__) || defined (__mn10200__) || defined (__AVR__)
-
+#ifdef __W65__
+#define _DOUBLE_IS_32BITS
+#define __SMALL_BITFIELDS
+#define __IEEE_BIG_ENDIAN
 #undef INT_MAX
 #undef UINT_MAX
 #define INT_MAX 32767
 #define UINT_MAX 65535
-#endif
 
-#if defined (__H8300__) || defined (__H8300H__) || defined(__H8300S__) || defined (__H8300SX__)
-#define __SMALL_BITFIELDS
-#define H8300 1
-#undef INT_MAX
-#undef UINT_MAX
-#define INT_MAX __INT_MAX__
-#define UINT_MAX (__INT_MAX__ * 2U + 1)
 #endif
 
-#ifdef __W65__
-#define __SMALL_BITFIELDS
-#endif
+/* 16 bit integer machines */
+#if defined(__Z8001__) || defined(__Z8002__) || defined(__H8300__) || defined(__H8500__) || defined(__W65__) || defined (__H8300H__) || defined (__H8300S__) || defined (__mn10200__) || defined (__AVR__)
 
-#if defined(__D10V__)
-#define __SMALL_BITFIELDS
 #undef INT_MAX
 #undef UINT_MAX
-#define INT_MAX __INT_MAX__
-#define UINT_MAX (__INT_MAX__ * 2U + 1)
-#define _POINTER_INT short
+#define INT_MAX 32767
+#define UINT_MAX 65535
 #endif
 
-#if defined(__mc68hc11__) || defined(__mc68hc12__) || defined(__mc68hc1x__)
+#if defined(__D10V__)
 #undef INT_MAX
 #undef UINT_MAX
 #define INT_MAX __INT_MAX__
 #define UINT_MAX (__INT_MAX__ * 2U + 1)
+#define _DOUBLE_IS_32BITS
 #define _POINTER_INT short
+#define __IEEE_BIG_ENDIAN
 #endif
 
 #ifdef ___AM29K__
@@ -59,112 +52,92 @@
 /* in other words, go32 */
 #define _FLOAT_RET double
 #endif
-#if defined(__linux__) || defined(__RDOS__)
-/* we want the reentrancy structure to be returned by a function */
-#define __DYNAMIC_REENT__
-#define HAVE_GETDATE
-#define _HAVE_SYSTYPES
-#define _READ_WRITE_RETURN_TYPE _ssize_t
-#define __LARGE64_FILES 1
-/* we use some glibc header files so turn on glibc large file feature */
-#define _LARGEFILE64_SOURCE 1
 #endif
+
+#ifdef __M32R__
+#define __IEEE_BIG_ENDIAN
+#endif
+
+#ifdef __m68k__
+/* This is defined in machine/ieeefp.h; need to check is it redundant here? */
+#define __IEEE_BIG_ENDIAN
+#endif
+
+#ifdef __mn10300__
+#define __IEEE_LITTLE_ENDIAN
 #endif
 
 #ifdef __mn10200__
+#define _DOUBLE_IS_32BITS
 #define __SMALL_BITFIELDS
+#define __IEEE_LITTLE_ENDIAN
+#endif
+
+#ifdef __MMIX__
+#define __IEEE_BIG_ENDIAN
 #endif
 
 #ifdef __AVR__
+#define _DOUBLE_IS_32BITS
 #define __SMALL_BITFIELDS
+#define __IEEE_LITTLE_ENDIAN
 #define _POINTER_INT short
 #endif
 
+#ifdef __TIC80__
+#define __IEEE_LITTLE_ENDIAN
+#endif
+
 #ifdef __v850
+#define __IEEE_LITTLE_ENDIAN
 #define __ATTRIBUTE_IMPURE_PTR__ __attribute__((__sda__))
 #endif
 
+#ifdef __D30V__
+#define __IEEE_BIG_ENDIAN
+#endif
+
 /* For the PowerPC eabi, force the _impure_ptr to be in .sdata */
-#if defined(__PPC__)
-#if defined(_CALL_SYSV)
+#if defined(__PPC__) && defined(_CALL_SYSV)
 #define __ATTRIBUTE_IMPURE_PTR__ __attribute__((__section__(".sdata")))
 #endif
-#ifdef __SPE__
-#define _LONG_DOUBLE double
+
+#ifdef __sparc__
+#ifdef __LITTLE_ENDIAN_DATA__
+#define __IEEE_LITTLE_ENDIAN
+#else
+#define __IEEE_BIG_ENDIAN
 #endif
 #endif
 
-#ifdef __xstormy16__
-#define __SMALL_BITFIELDS
-#undef INT_MAX
-#undef UINT_MAX
-#define INT_MAX __INT_MAX__
-#define UINT_MAX (__INT_MAX__ * 2U + 1)
-#define MALLOC_ALIGNMENT 8
-#define _POINTER_INT short
-#define __BUFSIZ__ 16
-#define _REENT_SMALL
-#endif
-#ifdef __m32c__
-#define __SMALL_BITFIELDS
-#undef INT_MAX
-#undef UINT_MAX
-#define INT_MAX __INT_MAX__
-#define UINT_MAX (__INT_MAX__ * 2U + 1)
-#define MALLOC_ALIGNMENT 8
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-#define _POINTER_INT short
+#if INT_MAX == 32767
+typedef long int __int32_t;
+typedef unsigned long int __uint32_t;
 #else
-#define _POINTER_INT long
+typedef int __int32_t;
+typedef unsigned int __uint32_t;
 #endif
-#define __BUFSIZ__ 16
-#define _REENT_SMALL
-#endif /* __m32c__ */
-
-
-/* This block should be kept in sync with GCC's limits.h.  The point
-   of having these definitions here is to not include limits.h, which
-   would pollute the user namespace, while still using types of the
-   the correct widths when deciding how to define __int32_t and
-   __int64_t.  */
-#ifndef __INT_MAX__
-# ifdef INT_MAX
-#  define __INT_MAX__ INT_MAX
-# else
-#  define __INT_MAX__ 2147483647
-# endif
-#endif
-
-#ifndef __LONG_MAX__
-# ifdef LONG_MAX
-#  define __LONG_MAX__ LONG_MAX
-# else
-#  if defined (__alpha__) || (defined (__sparc__) && defined(__arch64__)) \
-      || defined (__sparcv9)
-#   define __LONG_MAX__ 9223372036854775807L
-#  else
-#   define __LONG_MAX__ 2147483647L
-#  endif /* __alpha__ || sparc64 */
-# endif
-#endif
-/* End of block that should be kept in sync with GCC's limits.h.  */
 
 #ifndef _POINTER_INT
 #define _POINTER_INT long
 #endif
 
-#ifdef __frv__
-#define __ATTRIBUTE_IMPURE_PTR__ __attribute__((__section__(".sdata")))
-#endif
 #undef __RAND_MAX
-#if __INT_MAX__ == 32767
+#if INT_MAX == 32767
 #define __RAND_MAX 32767
 #else
 #define __RAND_MAX 0x7fffffff
 #endif
 
-#if defined(__CYGWIN__)
-#include <cygwin/config.h>
+
+#if defined(__CYGWIN32__) || defined(__CYGWIN__)
+#define __FILENAME_MAX__ (260 - 1 /* NUL */)
+#define _READ_WRITE_RETURN_TYPE _ssize_t
+#if defined(__INSIDE_CYGWIN__) || defined(_COMPILING_NEWLIB)
+#define __IMPORT
+#else
+#define __IMPORT __declspec(dllimport)
+#endif
 #endif
 
 #if defined(__rtems__)
@@ -183,10 +156,4 @@
 #define _READ_WRITE_RETURN_TYPE int
 #endif
 
-#ifndef __WCHAR_MAX__
-#if __INT_MAX__ == 32767 || defined (_WIN32)
-#define __WCHAR_MAX__ 0xffffu
-#endif
-#endif
-
 #endif /* __SYS_CONFIG_H__ */
diff --git a/newlib/libc/include/sys/dirent.h b/newlib/libc/include/sys/dirent.h
index a3fb5c0..f2f2342 100644
--- a/newlib/libc/include/sys/dirent.h
+++ b/newlib/libc/include/sys/dirent.h
@@ -1,13 +1,15 @@
 /* <dirent.h> includes <sys/dirent.h>, which is this file.  On a
    system which supports <dirent.h>, this file is overridden by
    dirent.h in the libc/sys/.../sys directory.  On a system which does
-   not support <dirent.h>, we will get this file which uses #error to force
-   an error.  */
+   not support <dirent.h>, we will get this file which tries to find
+   any other <dirent.h> which may be lurking around.  If there isn't
+   one, the user will get an error indicating that there is no
+   <dirent.h>.  */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-#error "<dirent.h> not supported"
+#include_next <dirent.h>
 #ifdef __cplusplus
 }
 #endif
diff --git a/newlib/libc/include/sys/errno.h b/newlib/libc/include/sys/errno.h
index e0c43de..26b5692 100644
--- a/newlib/libc/include/sys/errno.h
+++ b/newlib/libc/include/sys/errno.h
@@ -96,7 +96,6 @@ extern __IMPORT int sys_nerr;
 #define	ELBIN 75	/* Inode is remote (not really error) */
 #define	EDOTDOT 76	/* Cross mount point (not really error) */
 #define EBADMSG 77	/* Trying to read unreadable message */
-#define EFTYPE 79	/* Inappropriate file type or format */
 #define ENOTUNIQ 80	/* Given log. name not unique */
 #define EBADFD 81	/* f.d. invalid for this operation */
 #define EREMCHG 82	/* Remote address changed */
@@ -146,8 +145,6 @@ extern __IMPORT int sys_nerr;
 #define ENOMEDIUM 135   /* No medium (in tape drive) */
 #define ENOSHARE 136    /* No such host or network path */
 #define ECASECLASH 137  /* Filename exists with different case */
-#define EILSEQ 138
-#define EOVERFLOW 139	/* Value too large for defined data type */
 
 /* From cygwin32.  */
 #define EWOULDBLOCK EAGAIN	/* Operation would block */
diff --git a/newlib/libc/include/sys/fcntl.h b/newlib/libc/include/sys/fcntl.h
index fd8917d..5f3137e 100644
--- a/newlib/libc/include/sys/fcntl.h
+++ b/newlib/libc/include/sys/fcntl.h
@@ -37,9 +37,9 @@ extern "C" {
 #define	O_CREAT		_FCREAT
 #define	O_TRUNC		_FTRUNC
 #define	O_EXCL		_FEXCL
-#define O_SYNC		_FSYNC
+/*	O_SYNC		_FSYNC		not posix, defined below */
 /*	O_NDELAY	_FNDELAY 	set in include/fcntl.h */
-/*	O_NDELAY	_FNBIO 		set in include/fcntl.h */
+/*	O_NDELAY	_FNBIO 		set in 5include/fcntl.h */
 #define	O_NONBLOCK	_FNONBLOCK
 #define	O_NOCTTY	_FNOCTTY
 /* For machines which care - */
@@ -68,6 +68,8 @@ extern "C" {
 
 #ifndef	_POSIX_SOURCE
 
+#define	O_SYNC		_FSYNC
+
 /*
  * Flags that work for fcntl(fd, F_SETFL, FXXXX)
  */
@@ -133,7 +135,6 @@ extern "C" {
 
 /*#include <sys/stdtypes.h>*/
 
-#ifndef __CYGWIN__
 /* file segment locking set data type - information passed to system by user */
 struct flock {
 	short	l_type;		/* F_RDLCK, F_WRLCK, or F_UNLCK */
@@ -143,7 +144,6 @@ struct flock {
 	short	l_pid;		/* returned with F_GETLK */
 	short	l_xxx;		/* reserved for future use */
 };
-#endif /* __CYGWIN__ */
 
 #ifndef	_POSIX_SOURCE
 /* extended file segment locking set data type */
@@ -169,13 +169,8 @@ extern int fcntl _PARAMS ((int, int, ...));
 
 /* Provide _<systemcall> prototypes for functions provided by some versions
    of newlib.  */
-#ifdef _COMPILING_NEWLIB
 extern int _open _PARAMS ((const char *, int, ...));
 extern int _fcntl _PARAMS ((int, int, ...));
-#ifdef __LARGE64_FILES
-extern int _open64 _PARAMS ((const char *, int, ...));
-#endif
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/newlib/libc/include/sys/features.h b/newlib/libc/include/sys/features.h
index 6754f1e..e86ce13 100644
--- a/newlib/libc/include/sys/features.h
+++ b/newlib/libc/include/sys/features.h
@@ -78,17 +78,14 @@ extern "C" {
 #endif
 
 #ifdef __CYGWIN__
-# define _POSIX_JOB_CONTROL			1
-# define _POSIX_SAVED_IDS			0
-# define _POSIX_VERSION				199009L
-# define _POSIX_THREADS                         1
-# define _POSIX_THREAD_PROCESS_SHARED           1
-# define _POSIX_THREAD_SAFE_FUNCTIONS           1
-# define _POSIX_THREAD_PRIORITY_SCHEDULING      1
-# define _POSIX_THREAD_ATTR_STACKSIZE           1
-# define _POSIX_SEMAPHORES                      1
-# define _POSIX_TIMERS				1
-# define _POSIX_MEMLOCK_RANGE			1
+# define _POSIX_JOB_CONTROL	1
+# define _POSIX_SAVED_IDS	0
+# define _POSIX_VERSION		199009L
+# define _POSIX_THREADS                          1
+# define _POSIX_THREAD_PROCESS_SHARED            1
+# define _POSIX_THREAD_SAFE_FUNCTIONS            1
+# define _POSIX_THREAD_PRIORITY_SCHEDULING       1
+# define _POSIX_THREAD_ATTR_STACKSIZE            1
 #endif
 
 #ifdef __cplusplus
diff --git a/newlib/libc/include/sys/iconvnls.h b/newlib/libc/include/sys/iconvnls.h
deleted file mode 100644
index 09ea183..0000000
--- a/newlib/libc/include/sys/iconvnls.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2003-2004, Artem B. Bityuckiy.
- * Rights transferred to Franklin Electronic Publishers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Funtions, macros, etc implimented in iconv library but used by other
- * NLS-related subsystems too.
- */
-#ifndef __SYS_ICONVNLS_H__
-#define __SYS_ICONVNLS_H__
-
-#include <_ansi.h>
-#include <reent.h>
-#include <wchar.h>
-#include <iconv.h>
-
-/* Iconv data path environment variable name */
-#define NLS_ENVVAR_NAME  "NLSPATH"
-/* Default NLSPATH value */
-#define ICONV_DEFAULT_NLSPATH "/usr/locale"
-/* Direction markers */
-#define ICONV_NLS_FROM 0
-#define ICONV_NLS_TO   1
-
-_VOID
-_EXFUN(_iconv_nls_get_state, (iconv_t cd, mbstate_t *ps, int direction));
-
-int
-_EXFUN(_iconv_nls_set_state, (iconv_t cd, mbstate_t *ps, int direction));
-
-int
-_EXFUN(_iconv_nls_is_stateful, (iconv_t cd, int direction));
-
-int
-_EXFUN(_iconv_nls_get_mb_cur_max, (iconv_t cd, int direction));
-
-size_t
-_EXFUN(_iconv_nls_conv, (struct _reent *rptr, iconv_t cd,
-                        _CONST char **inbuf, size_t *inbytesleft,
-                        char **outbuf, size_t *outbytesleft));
-
-_CONST char *
-_EXFUN(_iconv_nls_construct_filename, (struct _reent *rptr, _CONST char *file,
-                                      _CONST char *dir, _CONST char *ext));
-
-
-int
-_EXFUN(_iconv_nls_open, (struct _reent *rptr, _CONST char *encoding,
-                        iconv_t *towc, iconv_t *fromwc, int flag));
-
-char *
-_EXFUN(_iconv_resolve_encoding_name, (struct _reent *rptr, _CONST char *ca));
-
-#endif /* __SYS_ICONVNLS_H__ */
-
diff --git a/newlib/libc/include/sys/lock.h b/newlib/libc/include/sys/lock.h
deleted file mode 100644
index c05814a..0000000
--- a/newlib/libc/include/sys/lock.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __SYS_LOCK_H__
-#define __SYS_LOCK_H__
-
-/* dummy lock routines for single-threaded aps */
-
-typedef int _LOCK_T;
-typedef int _LOCK_RECURSIVE_T;
-
-#define __LOCK_INIT(class,lock) static int lock = 0;
-#define __LOCK_INIT_RECURSIVE(class,lock) static int lock = 0;
-#define __lock_init(lock) (0)
-#define __lock_init_recursive(lock) (0)
-#define __lock_close(lock) (0)
-#define __lock_close_recursive(lock) (0)
-#define __lock_acquire(lock) (0)
-#define __lock_acquire_recursive(lock) (0)
-#define __lock_try_acquire(lock) (0)
-#define __lock_try_acquire_recursive(lock) (0)
-#define __lock_release(lock) (0)
-#define __lock_release_recursive(lock) (0)
-
-#endif /* __SYS_LOCK_H__ */
diff --git a/newlib/libc/include/sys/param.h b/newlib/libc/include/sys/param.h
index 7e8762a..3470ef5 100644
--- a/newlib/libc/include/sys/param.h
+++ b/newlib/libc/include/sys/param.h
@@ -5,21 +5,14 @@
 #ifndef _SYS_PARAM_H
 # define _SYS_PARAM_H
 
-#include <sys/config.h>
-#include <machine/endian.h>
-#include <machine/param.h>
-
-#ifndef HZ
 # define HZ (60)
-#endif
-#ifndef NOFILE
 # define NOFILE	(60)
-#endif
-#ifndef PATHSIZE
 # define PATHSIZE (1024)
-#endif
 
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#ifdef __i386__
+#define BIG_ENDIAN 4321
+#define LITTLE_ENDIAN 1234
+#define BYTE_ORDER LITTLE_ENDIAN
+#endif
 
 #endif
diff --git a/newlib/libc/include/sys/queue.h b/newlib/libc/include/sys/queue.h
deleted file mode 100644
index af637ca..0000000
--- a/newlib/libc/include/sys/queue.h
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD: src/sys/sys/queue.h,v 1.48 2002/04/17 14:00:37 tmm Exp $
- */
-
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
-
-#include <machine/ansi.h>	/* for __offsetof */
-
-/*
- * This file defines four types of data structures: singly-linked lists,
- * singly-linked tail queues, lists and tail queues.
- *
- * A singly-linked list is headed by a single forward pointer. The elements
- * are singly linked for minimum space and pointer manipulation overhead at
- * the expense of O(n) removal for arbitrary elements. New elements can be
- * added to the list after an existing element or at the head of the list.
- * Elements being removed from the head of the list should use the explicit
- * macro for this purpose for optimum efficiency. A singly-linked list may
- * only be traversed in the forward direction.  Singly-linked lists are ideal
- * for applications with large datasets and few or no removals or for
- * implementing a LIFO queue.
- *
- * A singly-linked tail queue is headed by a pair of pointers, one to the
- * head of the list and the other to the tail of the list. The elements are
- * singly linked for minimum space and pointer manipulation overhead at the
- * expense of O(n) removal for arbitrary elements. New elements can be added
- * to the list after an existing element, at the head of the list, or at the
- * end of the list. Elements being removed from the head of the tail queue
- * should use the explicit macro for this purpose for optimum efficiency.
- * A singly-linked tail queue may only be traversed in the forward direction.
- * Singly-linked tail queues are ideal for applications with large datasets
- * and few or no removals or for implementing a FIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may be traversed in either direction.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- *
- *
- *			SLIST	LIST	STAILQ	TAILQ
- * _HEAD		+	+	+	+
- * _HEAD_INITIALIZER	+	+	+	+
- * _ENTRY		+	+	+	+
- * _INIT		+	+	+	+
- * _EMPTY		+	+	+	+
- * _FIRST		+	+	+	+
- * _NEXT		+	+	+	+
- * _PREV		-	-	-	+
- * _LAST		-	-	+	+
- * _FOREACH		+	+	+	+
- * _FOREACH_REVERSE	-	-	-	+
- * _INSERT_HEAD		+	+	+	+
- * _INSERT_BEFORE	-	+	-	+
- * _INSERT_AFTER	+	+	+	+
- * _INSERT_TAIL		-	-	+	+
- * _CONCAT		-	-	+	+
- * _REMOVE_HEAD		+	-	+	-
- * _REMOVE		+	+	+	+
- *
- */
-
-/*
- * Singly-linked List declarations.
- */
-#define	SLIST_HEAD(name, type)						\
-struct name {								\
-	struct type *slh_first;	/* first element */			\
-}
-
-#define	SLIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
- 
-#define	SLIST_ENTRY(type)						\
-struct {								\
-	struct type *sle_next;	/* next element */			\
-}
- 
-/*
- * Singly-linked List functions.
- */
-#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
-
-#define	SLIST_FIRST(head)	((head)->slh_first)
-
-#define	SLIST_FOREACH(var, head, field)					\
-	for ((var) = SLIST_FIRST((head));				\
-	    (var);							\
-	    (var) = SLIST_NEXT((var), field))
-
-#define	SLIST_INIT(head) do {						\
-	SLIST_FIRST((head)) = NULL;					\
-} while (0)
-
-#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
-	SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field);	\
-	SLIST_NEXT((slistelm), field) = (elm);				\
-} while (0)
-
-#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
-	SLIST_NEXT((elm), field) = SLIST_FIRST((head));			\
-	SLIST_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
-
-#define	SLIST_REMOVE(head, elm, type, field) do {			\
-	if (SLIST_FIRST((head)) == (elm)) {				\
-		SLIST_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = SLIST_FIRST((head));		\
-		while (SLIST_NEXT(curelm, field) != (elm))		\
-			curelm = SLIST_NEXT(curelm, field);		\
-		SLIST_NEXT(curelm, field) =				\
-		    SLIST_NEXT(SLIST_NEXT(curelm, field), field);	\
-	}								\
-} while (0)
-
-#define	SLIST_REMOVE_HEAD(head, field) do {				\
-	SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field);	\
-} while (0)
-
-/*
- * Singly-linked Tail queue declarations.
- */
-#define	STAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *stqh_first;/* first element */			\
-	struct type **stqh_last;/* addr of last next element */		\
-}
-
-#define	STAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).stqh_first }
-
-#define	STAILQ_ENTRY(type)						\
-struct {								\
-	struct type *stqe_next;	/* next element */			\
-}
-
-/*
- * Singly-linked Tail queue functions.
- */
-#define	STAILQ_CONCAT(head1, head2) do {				\
-	if (!STAILQ_EMPTY((head2))) {					\
-		*(head1)->stqh_last = (head2)->stqh_first;		\
-		(head1)->stqh_last = (head2)->stqh_last;		\
-		STAILQ_INIT((head2));					\
-	}								\
-} while (0)
-
-#define	STAILQ_EMPTY(head)	((head)->stqh_first == NULL)
-
-#define	STAILQ_FIRST(head)	((head)->stqh_first)
-
-#define	STAILQ_FOREACH(var, head, field)				\
-	for((var) = STAILQ_FIRST((head));				\
-	   (var);							\
-	   (var) = STAILQ_NEXT((var), field))
-
-#define	STAILQ_INIT(head) do {						\
-	STAILQ_FIRST((head)) = NULL;					\
-	(head)->stqh_last = &STAILQ_FIRST((head));			\
-} while (0)
-
-#define	STAILQ_INSERT_AFTER(head, tqelm, elm, field) do {		\
-	if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-	STAILQ_NEXT((tqelm), field) = (elm);				\
-} while (0)
-
-#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL)	\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-	STAILQ_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
-	STAILQ_NEXT((elm), field) = NULL;				\
-	*(head)->stqh_last = (elm);					\
-	(head)->stqh_last = &STAILQ_NEXT((elm), field);			\
-} while (0)
-
-#define	STAILQ_LAST(head, type, field)					\
-	(STAILQ_EMPTY((head)) ?						\
-		NULL :							\
-	        ((struct type *)					\
-		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-
-#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
-
-#define	STAILQ_REMOVE(head, elm, type, field) do {			\
-	if (STAILQ_FIRST((head)) == (elm)) {				\
-		STAILQ_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = STAILQ_FIRST((head));		\
-		while (STAILQ_NEXT(curelm, field) != (elm))		\
-			curelm = STAILQ_NEXT(curelm, field);		\
-		if ((STAILQ_NEXT(curelm, field) =			\
-		     STAILQ_NEXT(STAILQ_NEXT(curelm, field), field)) == NULL)\
-			(head)->stqh_last = &STAILQ_NEXT((curelm), field);\
-	}								\
-} while (0)
-
-#define	STAILQ_REMOVE_HEAD(head, field) do {				\
-	if ((STAILQ_FIRST((head)) =					\
-	     STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL)		\
-		(head)->stqh_last = &STAILQ_FIRST((head));		\
-} while (0)
-
-#define	STAILQ_REMOVE_HEAD_UNTIL(head, elm, field) do {			\
-	if ((STAILQ_FIRST((head)) = STAILQ_NEXT((elm), field)) == NULL)	\
-		(head)->stqh_last = &STAILQ_FIRST((head));		\
-} while (0)
-
-/*
- * List declarations.
- */
-#define	LIST_HEAD(name, type)						\
-struct name {								\
-	struct type *lh_first;	/* first element */			\
-}
-
-#define	LIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#define	LIST_ENTRY(type)						\
-struct {								\
-	struct type *le_next;	/* next element */			\
-	struct type **le_prev;	/* address of previous next element */	\
-}
-
-/*
- * List functions.
- */
-
-#define	LIST_EMPTY(head)	((head)->lh_first == NULL)
-
-#define	LIST_FIRST(head)	((head)->lh_first)
-
-#define	LIST_FOREACH(var, head, field)					\
-	for ((var) = LIST_FIRST((head));				\
-	    (var);							\
-	    (var) = LIST_NEXT((var), field))
-
-#define	LIST_INIT(head) do {						\
-	LIST_FIRST((head)) = NULL;					\
-} while (0)
-
-#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
-	if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\
-		LIST_NEXT((listelm), field)->field.le_prev =		\
-		    &LIST_NEXT((elm), field);				\
-	LIST_NEXT((listelm), field) = (elm);				\
-	(elm)->field.le_prev = &LIST_NEXT((listelm), field);		\
-} while (0)
-
-#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-	LIST_NEXT((elm), field) = (listelm);				\
-	*(listelm)->field.le_prev = (elm);				\
-	(listelm)->field.le_prev = &LIST_NEXT((elm), field);		\
-} while (0)
-
-#define	LIST_INSERT_HEAD(head, elm, field) do {				\
-	if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL)	\
-		LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\
-	LIST_FIRST((head)) = (elm);					\
-	(elm)->field.le_prev = &LIST_FIRST((head));			\
-} while (0)
-
-#define	LIST_NEXT(elm, field)	((elm)->field.le_next)
-
-#define	LIST_REMOVE(elm, field) do {					\
-	if (LIST_NEXT((elm), field) != NULL)				\
-		LIST_NEXT((elm), field)->field.le_prev = 		\
-		    (elm)->field.le_prev;				\
-	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
-} while (0)
-
-/*
- * Tail queue declarations.
- */
-#define	TAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *tqh_first;	/* first element */			\
-	struct type **tqh_last;	/* addr of last next element */		\
-}
-
-#define	TAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).tqh_first }
-
-#define	TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-}
-
-/*
- * Tail queue functions.
- */
-#define	TAILQ_CONCAT(head1, head2, field) do {				\
-	if (!TAILQ_EMPTY(head2)) {					\
-		*(head1)->tqh_last = (head2)->tqh_first;		\
-		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
-		(head1)->tqh_last = (head2)->tqh_last;			\
-		TAILQ_INIT((head2));					\
-	}								\
-} while (0)
-
-#define	TAILQ_EMPTY(head)	((head)->tqh_first == NULL)
-
-#define	TAILQ_FIRST(head)	((head)->tqh_first)
-
-#define	TAILQ_FOREACH(var, head, field)					\
-	for ((var) = TAILQ_FIRST((head));				\
-	    (var);							\
-	    (var) = TAILQ_NEXT((var), field))
-
-#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
-	for ((var) = TAILQ_LAST((head), headname);			\
-	    (var);							\
-	    (var) = TAILQ_PREV((var), headname, field))
-
-#define	TAILQ_INIT(head) do {						\
-	TAILQ_FIRST((head)) = NULL;					\
-	(head)->tqh_last = &TAILQ_FIRST((head));			\
-} while (0)
-
-#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\
-		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-		    &TAILQ_NEXT((elm), field);				\
-	else								\
-		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-	TAILQ_NEXT((listelm), field) = (elm);				\
-	(elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field);		\
-} while (0)
-
-#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	TAILQ_NEXT((elm), field) = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field);		\
-} while (0)
-
-#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL)	\
-		TAILQ_FIRST((head))->field.tqe_prev =			\
-		    &TAILQ_NEXT((elm), field);				\
-	else								\
-		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-	TAILQ_FIRST((head)) = (elm);					\
-	(elm)->field.tqe_prev = &TAILQ_FIRST((head));			\
-} while (0)
-
-#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
-	TAILQ_NEXT((elm), field) = NULL;				\
-	(elm)->field.tqe_prev = (head)->tqh_last;			\
-	*(head)->tqh_last = (elm);					\
-	(head)->tqh_last = &TAILQ_NEXT((elm), field);			\
-} while (0)
-
-#define	TAILQ_LAST(head, headname)					\
-	(*(((struct headname *)((head)->tqh_last))->tqh_last))
-
-#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-
-#define	TAILQ_PREV(elm, headname, field)				\
-	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-
-#define	TAILQ_REMOVE(head, elm, field) do {				\
-	if ((TAILQ_NEXT((elm), field)) != NULL)				\
-		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-		    (elm)->field.tqe_prev;				\
-	else								\
-		(head)->tqh_last = (elm)->field.tqe_prev;		\
-	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
-} while (0)
-
-
-#ifdef _KERNEL
-
-/*
- * XXX insque() and remque() are an old way of handling certain queues.
- * They bogusly assumes that all queue heads look alike.
- */
-
-struct quehead {
-	struct quehead *qh_link;
-	struct quehead *qh_rlink;
-};
-
-#ifdef	__GNUC__
-
-static __inline void
-insque(void *a, void *b)
-{
-	struct quehead *element = (struct quehead *)a,
-		 *head = (struct quehead *)b;
-
-	element->qh_link = head->qh_link;
-	element->qh_rlink = head;
-	head->qh_link = element;
-	element->qh_link->qh_rlink = element;
-}
-
-static __inline void
-remque(void *a)
-{
-	struct quehead *element = (struct quehead *)a;
-
-	element->qh_link->qh_rlink = element->qh_rlink;
-	element->qh_rlink->qh_link = element->qh_link;
-	element->qh_rlink = 0;
-}
-
-#else /* !__GNUC__ */
-
-void	insque(void *a, void *b);
-void	remque(void *a);
-
-#endif /* __GNUC__ */
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_QUEUE_H_ */
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 7911b6c..65417f8 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -23,19 +23,17 @@ typedef unsigned __Long __ULong;
 #endif
 #endif
 
-#if !defined( __Long)
-#include <sys/types.h>
-#endif
-
 #ifndef __Long
 #define __Long __int32_t
 typedef __uint32_t __ULong;
 #endif
 
-/*
- * If _REENT_SMALL is defined, we make struct _reent as small as possible,
- * by having nearly everything possible allocated at first use.
- */
+struct _glue 
+{
+  struct _glue *_next;
+  int _niobs;
+  struct __sFILE *_iobs;
+};
 
 struct _Bigint 
 {
@@ -59,42 +57,21 @@ struct __tm
 };
 
 /*
- * atexit() support.
+ * atexit() support
  */
 
 #define	_ATEXIT_SIZE 32	/* must be at least 32 to guarantee ANSI conformance */
 
-struct _on_exit_args {
-	void *  _fnargs[_ATEXIT_SIZE];	        /* user fn args */
-	void *	_dso_handle[_ATEXIT_SIZE];
-	/* Bitmask is set if user function takes arguments.  */
-	__ULong _fntypes;           	        /* type of exit routine -
-				   Must have at least _ATEXIT_SIZE bits */
-	/* Bitmask is set if function was registered via __cxa_atexit.  */
-	__ULong _is_cxa;
-};
-
-#ifdef _REENT_SMALL
 struct _atexit {
 	struct	_atexit *_next;			/* next in list */
 	int	_ind;				/* next index in this table */
 	void	(*_fns[_ATEXIT_SIZE])(void);	/* the table itself */
-        struct _on_exit_args * _on_exit_args_ptr;
 };
-#else
-struct _atexit {
-	struct	_atexit *_next;			/* next in list */
-	int	_ind;				/* next index in this table */
-	/* Some entries may already have been called, and will be NULL.  */
-	void	(*_fns[_ATEXIT_SIZE])(void);	/* the table itself */
-        struct _on_exit_args _on_exit_args;
-};
-#endif
 
 /*
  * Stdio buffers.
  *
- * This and __FILE are defined here because we need them for struct _reent,
+ * This and __sFILE are defined here because we need them for struct _reent,
  * but we don't want stdio.h included when stdlib.h is.
  */
 
@@ -111,10 +88,6 @@ struct __sbuf {
 typedef long _fpos_t;		/* XXX must match off_t in <sys/types.h> */
 				/* (and must be `long' for now) */
 
-#ifdef __LARGE64_FILES
-typedef _off64_t _fpos64_t;
-#endif
-
 /*
  * Stdio state variables.
  *
@@ -140,29 +113,6 @@ typedef _off64_t _fpos64_t;
  * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
  */
 
-#ifdef _REENT_SMALL
-/*
- * struct __sFILE_fake is the start of a struct __sFILE, with only the
- * minimal fields allocated.  In __sinit() we really allocate the 3
- * standard streams, etc., and point away from this fake.
- */
-struct __sFILE_fake {
-  unsigned char *_p;	/* current position in (some) buffer */
-  int	_r;		/* read space left for getc() */
-  int	_w;		/* write space left for putc() */
-  short	_flags;		/* flags, below; this FILE is free if 0 */
-  short	_file;		/* fileno, if Unix descriptor, else -1 */
-  struct __sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
-  int	_lbfsize;	/* 0 or -_bf._size, for inline putc */
-
-  struct _reent *_data;
-};
-/* CHECK_INIT() comes from stdio/local.h; be sure to include that.  */
-# define _REENT_SMALL_CHECK_INIT(ptr) CHECK_INIT(ptr)
-#else
-# define _REENT_SMALL_CHECK_INIT(ptr) /* nothing */
-#endif
-
 struct __sFILE {
   unsigned char *_p;	/* current position in (some) buffer */
   int	_r;		/* read space left for getc() */
@@ -172,10 +122,6 @@ struct __sFILE {
   struct __sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
   int	_lbfsize;	/* 0 or -_bf._size, for inline putc */
 
-#ifdef _REENT_SMALL
-  struct _reent *_data;
-#endif
-
   /* operations */
   _PTR	_cookie;	/* cookie passed to io functions */
 
@@ -201,69 +147,7 @@ struct __sFILE {
   int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
   int	_offset;	/* current lseek offset */
 
-#ifndef _REENT_SMALL
-  struct _reent *_data;	/* Here for binary compatibility? Remove? */
-#endif
-
-#ifndef __SINGLE_THREAD__
-  _flock_t _lock;	/* for thread-safety locking */
-#endif
-};
-
-#ifdef __LARGE64_FILES
-struct __sFILE64 {
-  unsigned char *_p;	/* current position in (some) buffer */
-  int	_r;		/* read space left for getc() */
-  int	_w;		/* write space left for putc() */
-  short	_flags;		/* flags, below; this FILE is free if 0 */
-  short	_file;		/* fileno, if Unix descriptor, else -1 */
-  struct __sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
-  int	_lbfsize;	/* 0 or -_bf._size, for inline putc */
-
   struct _reent *_data;
-
-  /* operations */
-  _PTR	_cookie;	/* cookie passed to io functions */
-
-  _READ_WRITE_RETURN_TYPE _EXFUN((*_read),(_PTR _cookie, char *_buf, int _n));
-  _READ_WRITE_RETURN_TYPE _EXFUN((*_write),(_PTR _cookie, const char *_buf,
-					    int _n));
-  _fpos_t _EXFUN((*_seek),(_PTR _cookie, _fpos_t _offset, int _whence));
-  int	_EXFUN((*_close),(_PTR _cookie));
-
-  /* separate buffer for long sequences of ungetc() */
-  struct __sbuf _ub;	/* ungetc buffer */
-  unsigned char *_up;	/* saved _p when _p is doing ungetc data */
-  int	_ur;		/* saved _r when _r is counting ungetc data */
-
-  /* tricks to meet minimum requirements even when malloc() fails */
-  unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
-  unsigned char _nbuf[1];	/* guarantee a getc() buffer */
-
-  /* separate buffer for fgetline() when line crosses buffer boundary */
-  struct __sbuf _lb;	/* buffer for fgetline() */
-
-  /* Unix stdio files get aligned to block boundaries on fseek() */
-  int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
-  int   _flags2;        /* for future use */
-
-  _off64_t _offset;     /* current lseek offset */
-  _fpos64_t _EXFUN((*_seek64),(_PTR _cookie, _fpos64_t _offset, int _whence));
-
-#ifndef __SINGLE_THREAD__
-  _flock_t _lock;	/* for thread-safety locking */
-#endif
-};
-typedef struct __sFILE64 __FILE;
-#else
-typedef struct __sFILE   __FILE;
-#endif /* __LARGE64_FILES */
-
-struct _glue 
-{
-  struct _glue *_next;
-  int _niobs;
-  __FILE *_iobs;
 };
 
 /*
@@ -291,17 +175,8 @@ struct _rand48 {
   unsigned short _seed[3];
   unsigned short _mult[3];
   unsigned short _add;
-#ifdef _REENT_SMALL
-  /* Put this in here as well, for good luck.  */
-  __extension__ unsigned long long _rand_next;
-#endif
 };
 
-/* How big the some arrays are.  */
-#define _REENT_EMERGENCY_SIZE 25
-#define _REENT_ASCTIME_SIZE 26
-#define _REENT_SIGNAL_SIZE 24
-
 /*
  * struct _reent
  *
@@ -310,269 +185,18 @@ struct _rand48 {
  * reentrant.  IE: All state information is contained here.
  */
 
-#ifdef _REENT_SMALL
-
-struct _mprec
-{
-  /* used by mprec routines */
-  struct _Bigint *_result;
-  int _result_k;
-  struct _Bigint *_p5s;
-  struct _Bigint **_freelist;
-};
-
-
-struct _misc_reent
-{
-  /* miscellaneous reentrant data */
-  char *_strtok_last;
-  _mbstate_t _mblen_state;
-  _mbstate_t _wctomb_state;
-  _mbstate_t _mbtowc_state;
-  char _l64a_buf[8];
-  int _getdate_err;
-  _mbstate_t _mbrlen_state;
-  _mbstate_t _mbrtowc_state;
-  _mbstate_t _mbsrtowcs_state;
-  _mbstate_t _wcrtomb_state;
-  _mbstate_t _wcsrtombs_state;
-};
-
-/* This version of _reent is layed our with "int"s in pairs, to help
- * ports with 16-bit int's but 32-bit pointers, align nicely.  */
 struct _reent
 {
+  /* local copy of errno */
+  int _errno;
 
   /* FILE is a big struct and may change over time.  To try to achieve binary
      compatibility with future versions, put stdin,stdout,stderr here.
      These are pointers into member __sf defined below.  */
-  __FILE *_stdin, *_stdout, *_stderr;	/* XXX */
-
-  int _errno;			/* local copy of errno */
+  struct __sFILE *_stdin, *_stdout, *_stderr;
 
   int  _inc;			/* used by tmpnam */
-
-  char *_emergency;
- 
-  int __sdidinit;		/* 1 means stdio has been init'd */
-
-  int _current_category;	/* used by setlocale */
-  _CONST char *_current_locale;
-
-  struct _mprec *_mp;
-
-  void _EXFUN((*__cleanup),(struct _reent *));
-
-  int _gamma_signgam;
-
-  /* used by some fp conversion routines */
-  int _cvtlen;			/* should be size_t */
-  char *_cvtbuf;
-
-  struct _rand48 *_r48;
-  struct __tm *_localtime_buf;
-  char *_asctime_buf;
-
-  /* signal info */
-  void (**(_sig_func))(int);
-
-  /* atexit stuff */
-  struct _atexit *_atexit;
-  struct _atexit _atexit0;
-
-  struct _glue __sglue;			/* root of glue chain */
-  __FILE *__sf;			        /* file descriptors */
-  struct __sFILE_fake __sf_fake;	/* fake initial stdin/out/err */
-  struct _misc_reent *_misc;            /* strtok, multibyte states */
-  char *_signal_buf;                    /* strsignal */
-};
-
-#define _REENT_INIT(var) \
-  { (__FILE *)&var.__sf_fake, \
-    (__FILE *)&var.__sf_fake, \
-    (__FILE *)&var.__sf_fake, \
-    0, \
-    0, \
-    _NULL, \
-    0, \
-    0, \
-    "C", \
-    _NULL, \
-    _NULL, \
-    0, \
-    0, \
-    _NULL, \
-    _NULL, \
-    _NULL, \
-    _NULL, \
-    _NULL, \
-    _NULL, \
-    {_NULL, 0, {_NULL}, _NULL}, \
-    {_NULL, 0, _NULL}, \
-    _NULL, \
-    {_NULL, 0, 0, 0, 0, {_NULL, 0}, 0, _NULL}, \
-    _NULL, \
-    _NULL \
-  }
-
-#define _REENT_INIT_PTR(var) \
-  { var->_stdin = (__FILE *)&var->__sf_fake; \
-    var->_stdout = (__FILE *)&var->__sf_fake; \
-    var->_stderr = (__FILE *)&var->__sf_fake; \
-    var->_errno = 0; \
-    var->_inc = 0; \
-    var->_emergency = _NULL; \
-    var->__sdidinit = 0; \
-    var->_current_category = 0; \
-    var->_current_locale = "C"; \
-    var->_mp = _NULL; \
-    var->__cleanup = _NULL; \
-    var->_gamma_signgam = 0; \
-    var->_cvtlen = 0; \
-    var->_cvtbuf = _NULL; \
-    var->_r48 = _NULL; \
-    var->_localtime_buf = _NULL; \
-    var->_asctime_buf = _NULL; \
-    var->_sig_func = _NULL; \
-    var->_atexit = _NULL; \
-    var->_atexit0._next = _NULL; \
-    var->_atexit0._ind = 0; \
-    var->_atexit0._fns[0] = _NULL; \
-    var->_atexit0._on_exit_args_ptr = _NULL; \
-    var->__sglue._next = _NULL; \
-    var->__sglue._niobs = 0; \
-    var->__sglue._iobs = _NULL; \
-    var->__sf = 0; \
-    var->__sf_fake._p = _NULL; \
-    var->__sf_fake._r = 0; \
-    var->__sf_fake._w = 0; \
-    var->__sf_fake._flags = 0; \
-    var->__sf_fake._file = 0; \
-    var->__sf_fake._bf._base = _NULL; \
-    var->__sf_fake._bf._size = 0; \
-    var->__sf_fake._lbfsize = 0; \
-    var->__sf_fake._data = _NULL; \
-    var->_misc = _NULL; \
-    var->_signal_buf = _NULL; \
-  }
-
-/* Only built the assert() calls if we are built with debugging.  */
-#if DEBUG 
-#include <assert.h>
-#else
-#define assert(x) ((void)0)
-#endif
-
-/* Generic _REENT check macro.  */
-#define _REENT_CHECK(var, what, type, size, init) do { \
-  struct _reent *_r = (var); \
-  if (_r->what == NULL) { \
-    _r->what = (type)malloc(size); \
-    assert(_r->what); \
-    init; \
-  } \
-} while (0)
-
-#define _REENT_CHECK_TM(var) \
-  _REENT_CHECK(var, _localtime_buf, struct __tm *, sizeof *((var)->_localtime_buf), \
-    /* nothing */)
-
-#define _REENT_CHECK_ASCTIME_BUF(var) \
-  _REENT_CHECK(var, _asctime_buf, char *, _REENT_ASCTIME_SIZE, \
-    memset((var)->_asctime_buf, 0, _REENT_ASCTIME_SIZE))
-
-/* Handle the dynamically allocated rand48 structure. */
-#define _REENT_INIT_RAND48(var) do { \
-  struct _reent *_r = (var); \
-  _r->_r48->_seed[0] = _RAND48_SEED_0; \
-  _r->_r48->_seed[1] = _RAND48_SEED_1; \
-  _r->_r48->_seed[2] = _RAND48_SEED_2; \
-  _r->_r48->_mult[0] = _RAND48_MULT_0; \
-  _r->_r48->_mult[1] = _RAND48_MULT_1; \
-  _r->_r48->_mult[2] = _RAND48_MULT_2; \
-  _r->_r48->_add = _RAND48_ADD; \
-} while (0)
-#define _REENT_CHECK_RAND48(var) \
-  _REENT_CHECK(var, _r48, struct _rand48 *, sizeof *((var)->_r48), _REENT_INIT_RAND48((var)))
-
-#define _REENT_INIT_MP(var) do { \
-  struct _reent *_r = (var); \
-  _r->_mp->_result_k = 0; \
-  _r->_mp->_result = _r->_mp->_p5s = _NULL; \
-  _r->_mp->_freelist = _NULL; \
-} while (0)
-#define _REENT_CHECK_MP(var) \
-  _REENT_CHECK(var, _mp, struct _mprec *, sizeof *((var)->_mp), _REENT_INIT_MP(var))
-
-#define _REENT_CHECK_EMERGENCY(var) \
-  _REENT_CHECK(var, _emergency, char *, _REENT_EMERGENCY_SIZE, /* nothing */)
-
-#define _REENT_INIT_MISC(var) do { \
-  struct _reent *_r = (var); \
-  _r->_misc->_strtok_last = _NULL; \
-  _r->_misc->_mblen_state.__count = 0; \
-  _r->_misc->_mblen_state.__value.__wch = 0; \
-  _r->_misc->_wctomb_state.__count = 0; \
-  _r->_misc->_wctomb_state.__value.__wch = 0; \
-  _r->_misc->_mbtowc_state.__count = 0; \
-  _r->_misc->_mbtowc_state.__value.__wch = 0; \
-  _r->_misc->_mbrlen_state.__count = 0; \
-  _r->_misc->_mbrlen_state.__value.__wch = 0; \
-  _r->_misc->_mbrtowc_state.__count = 0; \
-  _r->_misc->_mbrtowc_state.__value.__wch = 0; \
-  _r->_misc->_mbsrtowcs_state.__count = 0; \
-  _r->_misc->_mbsrtowcs_state.__value.__wch = 0; \
-  _r->_misc->_wcrtomb_state.__count = 0; \
-  _r->_misc->_wcrtomb_state.__value.__wch = 0; \
-  _r->_misc->_wcsrtombs_state.__count = 0; \
-  _r->_misc->_wcsrtombs_state.__value.__wch = 0; \
-  _r->_misc->_l64a_buf[0] = '\0'; \
-  _r->_misc->_getdate_err = 0; \
-} while (0)
-#define _REENT_CHECK_MISC(var) \
-  _REENT_CHECK(var, _misc, struct _misc_reent *, sizeof *((var)->_misc), _REENT_INIT_MISC(var))
-
-#define _REENT_CHECK_SIGNAL_BUF(var) \
-  _REENT_CHECK(var, _signal_buf, char *, _REENT_SIGNAL_SIZE, /* nothing */)
-
-#define _REENT_SIGNGAM(ptr)	((ptr)->_gamma_signgam)
-#define _REENT_RAND_NEXT(ptr)	((ptr)->_r48->_rand_next)
-#define _REENT_RAND48_SEED(ptr)	((ptr)->_r48->_seed)
-#define _REENT_RAND48_MULT(ptr)	((ptr)->_r48->_mult)
-#define _REENT_RAND48_ADD(ptr)	((ptr)->_r48->_add)
-#define _REENT_MP_RESULT(ptr)	((ptr)->_mp->_result)
-#define _REENT_MP_RESULT_K(ptr)	((ptr)->_mp->_result_k)
-#define _REENT_MP_P5S(ptr)	((ptr)->_mp->_p5s)
-#define _REENT_MP_FREELIST(ptr)	((ptr)->_mp->_freelist)
-#define _REENT_ASCTIME_BUF(ptr)	((ptr)->_asctime_buf)
-#define _REENT_TM(ptr)		((ptr)->_localtime_buf)
-#define _REENT_EMERGENCY(ptr)	((ptr)->_emergency)
-#define _REENT_STRTOK_LAST(ptr)	((ptr)->_misc->_strtok_last)
-#define _REENT_MBLEN_STATE(ptr)	((ptr)->_misc->_mblen_state)
-#define _REENT_MBTOWC_STATE(ptr)((ptr)->_misc->_mbtowc_state)
-#define _REENT_WCTOMB_STATE(ptr)((ptr)->_misc->_wctomb_state)
-#define _REENT_MBRLEN_STATE(ptr) ((ptr)->_misc->_mbrlen_state)
-#define _REENT_MBRTOWC_STATE(ptr) ((ptr)->_misc->_mbrtowc_state)
-#define _REENT_MBSRTOWCS_STATE(ptr) ((ptr)->_misc->_mbsrtowcs_state)
-#define _REENT_WCRTOMB_STATE(ptr) ((ptr)->_misc->_wcrtomb_state)
-#define _REENT_WCSRTOMBS_STATE(ptr) ((ptr)->_misc->_wcsrtombs_state)
-#define _REENT_L64A_BUF(ptr)    ((ptr)->_misc->_l64a_buf)
-#define _REENT_GETDATE_ERR_P(ptr) (&((ptr)->_misc->_getdate_err))
-#define _REENT_SIGNAL_BUF(ptr)  ((ptr)->_signal_buf)
-
-#else /* !_REENT_SMALL */
-
-struct _reent
-{
-  int _errno;			/* local copy of errno */
-
-  /* FILE is a big struct and may change over time.  To try to achieve binary
-     compatibility with future versions, put stdin,stdout,stderr here.
-     These are pointers into member __sf defined below.  */
-  __FILE *_stdin, *_stdout, *_stderr;
-
-  int  _inc;			/* used by tmpnam */
-  char _emergency[_REENT_EMERGENCY_SIZE];
+  char _emergency[25];
  
   int _current_category;	/* used by setlocale */
   _CONST char *_current_locale;
@@ -597,22 +221,11 @@ struct _reent
         {
           unsigned int _unused_rand;
           char * _strtok_last;
-          char _asctime_buf[_REENT_ASCTIME_SIZE];
+          char _asctime_buf[26];
           struct __tm _localtime_buf;
           int _gamma_signgam;
           __extension__ unsigned long long _rand_next;
           struct _rand48 _r48;
-          _mbstate_t _mblen_state;
-          _mbstate_t _mbtowc_state;
-          _mbstate_t _wctomb_state;
-          char _l64a_buf[8];
-          char _signal_buf[_REENT_SIGNAL_SIZE];
-          int _getdate_err;  
-          _mbstate_t _mbrlen_state;
-          _mbstate_t _mbrtowc_state;
-          _mbstate_t _mbsrtowcs_state;
-          _mbstate_t _wcrtomb_state;
-          _mbstate_t _wcsrtombs_state;
         } _reent;
   /* Two next two fields were once used by malloc.  They are no longer
      used. They are used to preserve the space used before so as to
@@ -632,161 +245,22 @@ struct _reent
   /* signal info */
   void (**(_sig_func))(int);
 
-  /* These are here last so that __FILE can grow without changing the offsets
+  /* These are here last so that __sFILE can grow without changing the offsets
      of the above members (on the off chance that future binary compatibility
      would be broken otherwise).  */
-  struct _glue __sglue;		/* root of glue chain */
-  __FILE __sf[3];  		/* first three file descriptors */
+  struct _glue __sglue;			/* root of glue chain */
+  struct __sFILE __sf[3];		/* first three file descriptors */
 };
 
-#define _REENT_INIT(var) \
-  { 0, \
-    &var.__sf[0], \
-    &var.__sf[1], \
-    &var.__sf[2], \
-    0, \
-    "", \
-    0, \
-    "C", \
-    0, \
-    _NULL, \
-    _NULL, \
-    0, \
-    _NULL, \
-    _NULL, \
-    0, \
-    _NULL, \
-    { \
-      { \
-        0, \
-        _NULL, \
-        "", \
-        {0, 0, 0, 0, 0, 0, 0, 0, 0}, \
-        0, \
-        1, \
-        { \
-          {_RAND48_SEED_0, _RAND48_SEED_1, _RAND48_SEED_2}, \
-          {_RAND48_MULT_0, _RAND48_MULT_1, _RAND48_MULT_2}, \
-          _RAND48_ADD \
-        }, \
-        {0, {0}}, \
-        {0, {0}}, \
-        {0, {0}}, \
-        "", \
-        "", \
-        0, \
-        {0, {0}}, \
-        {0, {0}}, \
-        {0, {0}}, \
-        {0, {0}}, \
-        {0, {0}} \
-      } \
-    }, \
-    _NULL, \
-    {_NULL, 0, {_NULL}, {{_NULL}, {_NULL}, 0, 0}}, \
-    _NULL, \
-    {_NULL, 0, _NULL} \
-  }
-
-#define _REENT_INIT_PTR(var) \
-  { var->_errno = 0; \
-    var->_stdin = &var->__sf[0]; \
-    var->_stdout = &var->__sf[1]; \
-    var->_stderr = &var->__sf[2]; \
-    var->_inc = 0; \
-    memset(&var->_emergency, 0, sizeof(var->_emergency)); \
-    var->_current_category = 0; \
-    var->_current_locale = "C"; \
-    var->__sdidinit = 0; \
-    var->__cleanup = _NULL; \
-    var->_result = _NULL; \
-    var->_result_k = 0; \
-    var->_p5s = _NULL; \
-    var->_freelist = _NULL; \
-    var->_cvtlen = 0; \
-    var->_cvtbuf = _NULL; \
-    var->_new._reent._unused_rand = 0; \
-    var->_new._reent._strtok_last = _NULL; \
-    var->_new._reent._asctime_buf[0] = 0; \
-    memset(&var->_new._reent._localtime_buf, 0, sizeof(var->_new._reent._localtime_buf)); \
-    var->_new._reent._gamma_signgam = 0; \
-    var->_new._reent._rand_next = 1; \
-    var->_new._reent._r48._seed[0] = _RAND48_SEED_0; \
-    var->_new._reent._r48._seed[1] = _RAND48_SEED_1; \
-    var->_new._reent._r48._seed[2] = _RAND48_SEED_2; \
-    var->_new._reent._r48._mult[0] = _RAND48_MULT_0; \
-    var->_new._reent._r48._mult[1] = _RAND48_MULT_1; \
-    var->_new._reent._r48._mult[2] = _RAND48_MULT_2; \
-    var->_new._reent._r48._add = _RAND48_ADD; \
-    var->_new._reent._mblen_state.__count = 0; \
-    var->_new._reent._mblen_state.__value.__wch = 0; \
-    var->_new._reent._mbtowc_state.__count = 0; \
-    var->_new._reent._mbtowc_state.__value.__wch = 0; \
-    var->_new._reent._wctomb_state.__count = 0; \
-    var->_new._reent._wctomb_state.__value.__wch = 0; \
-    var->_new._reent._mbrlen_state.__count = 0; \
-    var->_new._reent._mbrlen_state.__value.__wch = 0; \
-    var->_new._reent._mbrtowc_state.__count = 0; \
-    var->_new._reent._mbrtowc_state.__value.__wch = 0; \
-    var->_new._reent._mbsrtowcs_state.__count = 0; \
-    var->_new._reent._mbsrtowcs_state.__value.__wch = 0; \
-    var->_new._reent._wcrtomb_state.__count = 0; \
-    var->_new._reent._wcrtomb_state.__value.__wch = 0; \
-    var->_new._reent._wcsrtombs_state.__count = 0; \
-    var->_new._reent._wcsrtombs_state.__value.__wch = 0; \
-    var->_new._reent._l64a_buf[0] = '\0'; \
-    var->_new._reent._signal_buf[0] = '\0'; \
-    var->_new._reent._getdate_err = 0; \
-    var->_atexit = _NULL; \
-    var->_atexit0._next = _NULL; \
-    var->_atexit0._ind = 0; \
-    var->_atexit0._fns[0] = _NULL; \
-    var->_atexit0._on_exit_args._fntypes = 0; \
-    var->_atexit0._on_exit_args._fnargs[0] = _NULL; \
-    var->_sig_func = _NULL; \
-    var->__sglue._next = _NULL; \
-    var->__sglue._niobs = 0; \
-    var->__sglue._iobs = _NULL; \
-    memset(&var->__sf, 0, sizeof(var->__sf)); \
-  }
-
-#define _REENT_CHECK_RAND48(ptr)	/* nothing */
-#define _REENT_CHECK_MP(ptr)		/* nothing */
-#define _REENT_CHECK_TM(ptr)		/* nothing */
-#define _REENT_CHECK_ASCTIME_BUF(ptr)	/* nothing */
-#define _REENT_CHECK_EMERGENCY(ptr)	/* nothing */
-#define _REENT_CHECK_MISC(ptr)	        /* nothing */
-#define _REENT_CHECK_SIGNAL_BUF(ptr)	/* nothing */
-
-#define _REENT_SIGNGAM(ptr)	((ptr)->_new._reent._gamma_signgam)
-#define _REENT_RAND_NEXT(ptr)	((ptr)->_new._reent._rand_next)
-#define _REENT_RAND48_SEED(ptr)	((ptr)->_new._reent._r48._seed)
-#define _REENT_RAND48_MULT(ptr)	((ptr)->_new._reent._r48._mult)
-#define _REENT_RAND48_ADD(ptr)	((ptr)->_new._reent._r48._add)
-#define _REENT_MP_RESULT(ptr)	((ptr)->_result)
-#define _REENT_MP_RESULT_K(ptr)	((ptr)->_result_k)
-#define _REENT_MP_P5S(ptr)	((ptr)->_p5s)
-#define _REENT_MP_FREELIST(ptr)	((ptr)->_freelist)
-#define _REENT_ASCTIME_BUF(ptr)	((ptr)->_new._reent._asctime_buf)
-#define _REENT_TM(ptr)		(&(ptr)->_new._reent._localtime_buf)
-#define _REENT_EMERGENCY(ptr)	((ptr)->_emergency)
-#define _REENT_STRTOK_LAST(ptr)	((ptr)->_new._reent._strtok_last)
-#define _REENT_MBLEN_STATE(ptr)	((ptr)->_new._reent._mblen_state)
-#define _REENT_MBTOWC_STATE(ptr)((ptr)->_new._reent._mbtowc_state)
-#define _REENT_WCTOMB_STATE(ptr)((ptr)->_new._reent._wctomb_state)
-#define _REENT_MBRLEN_STATE(ptr)((ptr)->_new._reent._mbrlen_state)
-#define _REENT_MBRTOWC_STATE(ptr)((ptr)->_new._reent._mbrtowc_state)
-#define _REENT_MBSRTOWCS_STATE(ptr)((ptr)->_new._reent._mbsrtowcs_state)
-#define _REENT_WCRTOMB_STATE(ptr)((ptr)->_new._reent._wcrtomb_state)
-#define _REENT_WCSRTOMBS_STATE(ptr)((ptr)->_new._reent._wcsrtombs_state)
-#define _REENT_L64A_BUF(ptr)    ((ptr)->_new._reent._l64a_buf)
-#define _REENT_SIGNAL_BUF(ptr)  ((ptr)->_new._reent._signal_buf)
-#define _REENT_GETDATE_ERR_P(ptr) (&((ptr)->_new._reent._getdate_err))
-
-#endif /* !_REENT_SMALL */
-
 #define _NULL 0
 
+#define _REENT_INIT(var) \
+  { 0, &var.__sf[0], &var.__sf[1], &var.__sf[2], 0, "", 0, "C", \
+    0, _NULL, _NULL, 0, _NULL, _NULL, 0, _NULL, { {0, _NULL, "", \
+    { 0,0,0,0,0,0,0,0}, 0, 1, \
+    {{_RAND48_SEED_0, _RAND48_SEED_1, _RAND48_SEED_2}, \
+     {_RAND48_MULT_0, _RAND48_MULT_1, _RAND48_MULT_2}, _RAND48_ADD}} } }
+
 /*
  * All references to struct _reent are via this pointer.
  * Internally, newlib routines that need to reference it should use _REENT.
@@ -797,26 +271,14 @@ struct _reent
 #endif
 
 extern struct _reent *_impure_ptr __ATTRIBUTE_IMPURE_PTR__;
-extern struct _reent *_CONST _global_impure_ptr __ATTRIBUTE_IMPURE_PTR__;
 
 void _reclaim_reent _PARAMS ((struct _reent *));
 
 /* #define _REENT_ONLY define this to get only reentrant routines */
 
 #ifndef _REENT_ONLY
-
-#if defined(__DYNAMIC_REENT__) && !defined(__SINGLE_THREAD__)
-#ifndef __getreent
-  struct _reent * _EXFUN(__getreent, (void));
+#define _REENT _impure_ptr
 #endif
-# define _REENT (__getreent())
-#else /* __SINGLE_THREAD__ || !__DYNAMIC_REENT__ */
-# define _REENT _impure_ptr
-#endif /* __SINGLE_THREAD__ || !__DYNAMIC_REENT__ */
-
-#endif /* !_REENT_ONLY */
-
-#define _GLOBAL_REENT _global_impure_ptr
 
 #ifdef __cplusplus
 }
diff --git a/newlib/libc/include/sys/signal.h b/newlib/libc/include/sys/signal.h
index 78f0695..11d370a 100644
--- a/newlib/libc/include/sys/signal.h
+++ b/newlib/libc/include/sys/signal.h
@@ -2,6 +2,7 @@
 
 #ifndef _SYS_SIGNAL_H
 #define _SYS_SIGNAL_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -78,20 +79,18 @@ typedef struct {
 /* struct sigaction notes from POSIX:
  *
  *  (1) Routines stored in sa_handler should take a single int as
- *      their argument although the POSIX standard does not require this.
+ *      there argument although the POSIX standard does not require this.
  *  (2) The fields sa_handler and sa_sigaction may overlap, and a conforming
  *      application should not use both simultaneously.
  */
 
-typedef void (*_sig_func_ptr)();
-
 struct sigaction {
   int         sa_flags;       /* Special flags to affect behavior of signal */
   sigset_t    sa_mask;        /* Additional set of signals to be blocked */
                               /*   during execution of signal-catching */
                               /*   function. */
   union {
-    _sig_func_ptr _handler;  /* SIG_DFL, SIG_IGN, or pointer to a function */
+    void      (*_handler)();  /* SIG_DFL, SIG_IGN, or pointer to a function */
 #if defined(_POSIX_REALTIME_SIGNALS)
     void      (*_sigaction)( int, siginfo_t *, void * );
 #endif
@@ -103,19 +102,24 @@ struct sigaction {
 #define sa_sigaction  _signal_handlers._sigaction
 #endif
 
-#elif defined(__CYGWIN__)
-#include <cygwin/signal.h>
 #else
-#define SA_NOCLDSTOP 1  /* only value supported now for sa_flags */
-
-typedef void (*_sig_func_ptr)(int);
 
 struct sigaction 
 {
-	_sig_func_ptr sa_handler;
+	void (*sa_handler)(int);
 	sigset_t sa_mask;
 	int sa_flags;
 };
+
+#define SA_NOCLDSTOP 1  /* only value supported now for sa_flags */
+
+#ifdef __CYGWIN__
+# define SA_RESTART   0x10000000 /* Restart syscall on signal return.  */
+# define SA_NODEFER   0x40000000 /* Don't automatically block the signal when
+                                    its handler is being executed.  */
+# define SA_RESETHAND 0x80000000 /* Reset to SIG_DFL on entry to handler.  */
+#endif
+
 #endif /* defined(__rtems__) */
 
 #define SIG_SETMASK 0	/* set mask with sigprocmask() */
@@ -217,14 +221,13 @@ int _EXFUN(sigqueue, (pid_t pid, int signo, const union sigval value));
 #define SIGUSR1	18
 #define SIGUSR2	19
 #define NSIG    20
-#elif !defined(SIGTRAP)
+#elif defined(__CYGWIN__)	/* BSD signals semantics */
 #define	SIGHUP	1	/* hangup */
 #define	SIGINT	2	/* interrupt */
 #define	SIGQUIT	3	/* quit */
 #define	SIGILL	4	/* illegal instruction (not reset when caught) */
 #define	SIGTRAP	5	/* trace trap (not reset when caught) */
-#define	SIGIOT	6	/* IOT instruction */
-#define	SIGABRT 6	/* used by abort, replace SIGIOT in the future */
+#define	SIGABRT 6	/* used by abort */
 #define	SIGEMT	7	/* EMT instruction */
 #define	SIGFPE	8	/* floating point exception */
 #define	SIGKILL	9	/* kill (cannot be caught or ignored) */
@@ -234,8 +237,6 @@ int _EXFUN(sigqueue, (pid_t pid, int signo, const union sigval value));
 #define	SIGPIPE	13	/* write on a pipe with no one to read it */
 #define	SIGALRM	14	/* alarm clock */
 #define	SIGTERM	15	/* software termination signal from kill */
-
-#if defined(__rtems__)
 #define	SIGURG	16	/* urgent condition on IO channel */
 #define	SIGSTOP	17	/* sendable stop signal not from tty */
 #define	SIGTSTP	18	/* stop signal from tty */
@@ -246,20 +247,53 @@ int _EXFUN(sigqueue, (pid_t pid, int signo, const union sigval value));
 #define	SIGTTOU	22	/* like TTIN for output if (tp->t_local&LTOSTOP) */
 #define	SIGIO	23	/* input/output possible signal */
 #define	SIGPOLL	SIGIO	/* System V name for SIGIO */
-#define	SIGWINCH 24	/* window changed */
-#define	SIGUSR1 25	/* user defined signal 1 */
-#define	SIGUSR2 26	/* user defined signal 2 */
+#define	SIGXCPU	24	/* exceeded CPU time limit */
+#define	SIGXFSZ	25	/* exceeded file size limit */
+#define	SIGVTALRM 26	/* virtual time alarm */
+#define	SIGPROF	27	/* profiling time alarm */
+#define	SIGWINCH 28	/* window changed */
+#define	SIGLOST 29	/* resource lost (eg, record-lock lost) */
+#define	SIGUSR1 30	/* user defined signal 1 */
+#define	SIGUSR2 31	/* user defined signal 2 */
+#define NSIG	32      /* signal 0 implied */
+#else
+#define	SIGHUP	1	/* hangup */
+#define	SIGINT	2	/* interrupt */
+#define	SIGQUIT	3	/* quit */
+#define	SIGILL	4	/* illegal instruction (not reset when caught) */
+#define	SIGTRAP	5	/* trace trap (not reset when caught) */
+#define	SIGIOT	6	/* IOT instruction */
+#define	SIGABRT 6	/* used by abort, replace SIGIOT in the future */
+#define	SIGEMT	7	/* EMT instruction */
+#define	SIGFPE	8	/* floating point exception */
+#define	SIGKILL	9	/* kill (cannot be caught or ignored) */
+#define	SIGBUS	10	/* bus error */
+#define	SIGSEGV	11	/* segmentation violation */
+#define	SIGSYS	12	/* bad argument to system call */
+#define	SIGPIPE	13	/* write on a pipe with no one to read it */
+#define	SIGALRM	14	/* alarm clock */
+#define	SIGTERM	15	/* software termination signal from kill */
+
+#if defined(__rtems__)
+#define SIGUSR1 16  /* reserved as application defined signal 1 */
+#define SIGUSR2 17  /* reserved as application defined signal 2 */
+
+#define __SIGFIRSTNOTRT SIGHUP
+#define __SIGLASTNOTRT  SIGUSR2
+
+/* RTEMS does not support job control, hence no Job Control Signals are
+   defined per P1003.1b-1993, p. 60-61.
+
+   RTEMS does not support memory protection, hence no Memory Protection
+   Signals are defined per P1003.1b-1993, p. 60-61. */
 
 /* Real-Time Signals Range, P1003.1b-1993, p. 61
    NOTE: By P1003.1b-1993, this should be at least RTSIG_MAX
          (which is a minimum of 8) signals.
  */
-#define SIGRTMIN 27
-#define SIGRTMAX 31
-#define __SIGFIRSTNOTRT SIGHUP
-#define __SIGLASTNOTRT  SIGUSR2
 
-#define NSIG	32      /* signal 0 implied */
+#define SIGRTMIN 18
+#define SIGRTMAX 32
 
 #elif defined(__svr4__)
 /* svr4 specifics. different signals above 15, and sigaction. */
@@ -301,10 +335,4 @@ int _EXFUN(sigqueue, (pid_t pid, int signo, const union sigval value));
 #ifdef __cplusplus
 }
 #endif
-
-#ifndef _SIGNAL_H_
-/* Some applications take advantage of the fact that <sys/signal.h>
- * and <signal.h> are equivalent in glibc.  Allow for that here.  */
-#include <signal.h>
-#endif
 #endif /* _SYS_SIGNAL_H */
diff --git a/newlib/libc/include/sys/stat-dj.h b/newlib/libc/include/sys/stat-dj.h
new file mode 100644
index 0000000..5ecc84e
--- /dev/null
+++ b/newlib/libc/include/sys/stat-dj.h
@@ -0,0 +1,58 @@
+/* This is file STAT.H */
+/*
+ * Copyright (C) 1991 DJ Delorie
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms is permitted
+ * provided that the above copyright notice and following paragraph are
+ * duplicated in all such forms.
+ *
+ * This file is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef _STAT_H_
+#define _STAT_H_
+
+struct	stat {
+	short st_dev;
+	short st_ino;
+	unsigned short st_mode;
+	short st_nlink;
+	short st_uid;
+	short st_gid;
+	short st_rdev;
+	short st_align_for_word32;
+	long  st_size;
+	long  st_atime;
+	long  st_mtime;
+	long  st_ctime;
+	long  st_blksize;
+};
+
+#define S_IFMT	0xF000	/* file type mask */
+#define S_IFDIR	0x4000	/* directory */
+#define S_IFIFO	0x1000	/* FIFO special */
+#define S_IFCHR	0x2000	/* character special */
+#define S_IFBLK	0x3000	/* block special */
+#define S_IFREG	0x8000	/* or just 0x0000, regular */
+#define S_IREAD	0x0100	/* owner may read */
+#define S_IWRITE 0x0080	/* owner may write */
+#define S_IEXEC	0x0040	/* owner may execute <directory search> */
+
+#define	S_ISBLK(m)	(((m) & S_IFMT) == S_IFBLK)
+#define	S_ISCHR(m)	(((m) & S_IFMT) == S_IFCHR)
+#define	S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
+#define	S_ISFIFO(m)	(((m) & S_IFMT) == S_IFIFO)
+#define	S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+int stat(const char *, struct stat *);
+int fstat(int, struct stat *);
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
index 5163244..bca4377 100644
--- a/newlib/libc/include/sys/stat.h
+++ b/newlib/libc/include/sys/stat.h
@@ -9,6 +9,12 @@ extern "C" {
 #include <time.h>
 #include <sys/types.h>
 
+#ifdef __i386__
+#ifdef __MSDOS__
+#include "stat-dj.h"
+#endif
+#endif
+
 /* dj's stat defines _STAT_H_ */
 #ifndef _STAT_H_
 
@@ -16,12 +22,6 @@ extern "C" {
    sizes of any of the basic types change (short, int, long) [via a compile
    time option].  */
 
-#ifdef __CYGWIN__
-#include <cygwin/stat.h>
-#ifdef _COMPILING_NEWLIB
-#define stat64 __stat64
-#endif
-#else
 struct	stat 
 {
   dev_t		st_dev;
@@ -49,7 +49,6 @@ struct	stat
   long	st_spare4[2];
 #endif
 };
-#endif
 
 #define	_IFMT		0170000	/* type of file */
 #define		_IFDIR	0040000	/* directory */
@@ -124,21 +123,15 @@ int	_EXFUN(mkfifo,( const char *__path, mode_t __mode ));
 int	_EXFUN(stat,( const char *__path, struct stat *__sbuf ));
 mode_t	_EXFUN(umask,( mode_t __mask ));
 
-#if defined(__rtems__) || defined(__CYGWIN__) && !defined(__INSIDE_CYGWIN__)
+#if defined(__rtems__) || defined(__CYGWIN__)
 int	_EXFUN(lstat,( const char *__path, struct stat *__buf ));
 int	_EXFUN(mknod,( const char *__path, mode_t __mode, dev_t __dev ));
 #endif
 
 /* Provide prototypes for most of the _<systemcall> names that are
    provided in newlib for some compilers.  */
-#ifdef _COMPILING_NEWLIB
 int	_EXFUN(_fstat,( int __fd, struct stat *__sbuf ));
 int	_EXFUN(_stat,( const char *__path, struct stat *__sbuf ));
-#ifdef __LARGE64_FILES
-struct stat64;
-int	_EXFUN(_fstat64,( int __fd, struct stat64 *__sbuf ));
-#endif
-#endif
 
 #endif /* !_STAT_H_ */
 #ifdef __cplusplus
diff --git a/newlib/libc/include/sys/stdio.h b/newlib/libc/include/sys/stdio.h
deleted file mode 100644
index fa9cd5d..0000000
--- a/newlib/libc/include/sys/stdio.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _NEWLIB_STDIO_H
-#define _NEWLIB_STDIO_H
-
-#include <sys/lock.h>
-#include <sys/reent.h>
-
-/* Internal locking macros, used to protect stdio functions.  In the
-   general case, expand to nothing. Use __SSTR flag in FILE _flags to
-   detect if FILE is private to sprintf/sscanf class of functions; if
-   set then do nothing as lock is not initialised. */
-#if !defined(_flockfile)
-#ifndef __SINGLE_THREAD__
-#  define _flockfile(fp) (((fp)->_flags & __SSTR) ? 0 : __lock_acquire_recursive((fp)->_lock))
-#else
-#  define _flockfile(fp)
-#endif
-#endif
-
-#if !defined(_funlockfile)
-#ifndef __SINGLE_THREAD__
-#  define _funlockfile(fp) (((fp)->_flags & __SSTR) ? 0 : __lock_release_recursive((fp)->_lock))
-#else
-#  define _funlockfile(fp)
-#endif
-#endif
-
-#endif /* _NEWLIB_STDIO_H */
diff --git a/newlib/libc/include/sys/string.h b/newlib/libc/include/sys/string.h
deleted file mode 100644
index ceedf4b..0000000
--- a/newlib/libc/include/sys/string.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* This is a dummy <sys/string.h> used as a placeholder for
-   systems that need to have a special header file.  */
diff --git a/newlib/libc/include/sys/syslimits.h b/newlib/libc/include/sys/syslimits.h
deleted file mode 100644
index ba9dbd6..0000000
--- a/newlib/libc/include/sys/syslimits.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/sys/sys/syslimits.h,v 1.10 2001/06/18 20:24:54 wollman Exp $
- */
-
-#ifndef _SYS_SYSLIMITS_H_
-#define _SYS_SYSLIMITS_H_
-
-#define	ARG_MAX			65536	/* max bytes for an exec function */
-#ifndef CHILD_MAX
-#define	CHILD_MAX		   40	/* max simultaneous processes */
-#endif
-#define	LINK_MAX		32767	/* max file link count */
-#define	MAX_CANON		  255	/* max bytes in term canon input line */
-#define	MAX_INPUT		  255	/* max bytes in terminal input */
-#define	NAME_MAX		  255	/* max bytes in a file name */
-#define	NGROUPS_MAX		   16	/* max supplemental group id's */
-#ifndef OPEN_MAX
-#define	OPEN_MAX		   64	/* max open files per process */
-#endif
-#define	PATH_MAX		 1024	/* max bytes in pathname */
-#define	PIPE_BUF		  512	/* max bytes for atomic pipe writes */
-#define	IOV_MAX			 1024	/* max elements in i/o vector */
-
-#define	BC_BASE_MAX		   99	/* max ibase/obase values in bc(1) */
-#define	BC_DIM_MAX		 2048	/* max array elements in bc(1) */
-#define	BC_SCALE_MAX		   99	/* max scale value in bc(1) */
-#define	BC_STRING_MAX		 1000	/* max const string length in bc(1) */
-#define	COLL_WEIGHTS_MAX	    0	/* max weights for order keyword */
-#define	EXPR_NEST_MAX		   32	/* max expressions nested in expr(1) */
-#define	LINE_MAX		 2048	/* max bytes in an input line */
-#define	RE_DUP_MAX		  255	/* max RE's in interval notation */
-
-#endif
diff --git a/newlib/libc/include/sys/time.h b/newlib/libc/include/sys/time.h
index df31649..20f2903 100644
--- a/newlib/libc/include/sys/time.h
+++ b/newlib/libc/include/sys/time.h
@@ -14,8 +14,8 @@ extern "C" {
 
 #ifndef _WINSOCK_H
 struct timeval {
-  time_t      tv_sec;
-  suseconds_t tv_usec;
+  long tv_sec;
+  long tv_usec;
 };
 
 struct timezone {
@@ -24,7 +24,7 @@ struct timezone {
 };
 
 #ifdef __CYGWIN__
-#include <cygwin/sys_time.h>
+#include <sys/select.h>
 #endif /* __CYGWIN__ */
 
 #endif /* _WINSOCK_H */
@@ -72,7 +72,7 @@ struct  itimerval {
 
 int _EXFUN(gettimeofday, (struct timeval *__p, struct timezone *__z));
 int _EXFUN(settimeofday, (const struct timeval *, const struct timezone *));
-int _EXFUN(utimes, (const char *__path, const struct timeval *__tvp));
+int _EXFUN(utimes, (const char *__path, struct timeval *__tvp));
 int _EXFUN(getitimer, (int __which, struct itimerval *__value));
 int _EXFUN(setitimer, (int __which, const struct itimerval *__value,
 					struct itimerval *__ovalue));
diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index bf08616..96d25c4 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -16,50 +16,12 @@
  */
 
 #ifndef _SYS_TYPES_H
+#define _SYS_TYPES_H
 
-#include <_ansi.h>
-
-#ifndef __INTTYPES_DEFINED__
-#define __INTTYPES_DEFINED__
-
-#include <machine/_types.h>
-
-#if defined(__rtems__)
-/*
- *  The following section is RTEMS specific and is needed to more
- *  closely match the types defined in the BSD sys/types.h.
- *  This is needed to let the RTEMS/BSD TCP/IP stack compile.
- */
-
-/* deprecated */
-#if ___int8_t_defined
-typedef __uint8_t	u_int8_t;
-#endif
-#if ___int16_t_defined
-typedef __uint16_t	u_int16_t;
-#endif 
-#if ___int32_t_defined
-typedef __uint32_t	u_int32_t;
-#endif
-
-#if ___int64_t_defined
-typedef __uint64_t	u_int64_t;
-
-/* deprecated */
-typedef	__uint64_t	u_quad_t;
-typedef	__int64_t	quad_t;
-typedef	quad_t *	qaddr_t;
-#endif
-
+#if defined (_WIN32) || defined (__CYGWIN__)
+#define __MS_types__
 #endif
 
-#endif /* ! __INTTYPES_DEFINED */
-
-#ifndef __need_inttypes
-
-#define _SYS_TYPES_H
-#include <sys/_types.h>
-
 #ifdef __i386__
 #if defined (GO32) || defined (__MSDOS__)
 #define __MS_types__
@@ -125,7 +87,6 @@ struct itimerspec {
 typedef	long	daddr_t;
 typedef	char *	caddr_t;
 
-#ifndef __CYGWIN__
 #if defined(__MS_types__) || defined(__rtems__)
 typedef	unsigned long	ino_t;
 #else
@@ -135,7 +96,6 @@ typedef	unsigned long	ino_t;
 typedef	unsigned short	ino_t;
 #endif
 #endif
-#endif /*__CYGWIN__*/
 
 #ifdef __MS_types__
 typedef unsigned long vm_offset_t;
@@ -143,7 +103,7 @@ typedef unsigned long vm_size_t;
 
 #define __BIT_TYPES_DEFINED__
 
-typedef signed char int8_t;
+typedef char int8_t;
 typedef unsigned char u_int8_t;
 typedef short int16_t;
 typedef unsigned short u_int16_t;
@@ -165,25 +125,17 @@ typedef int32_t register_t;
 /* device numbers are 32-bit major and and 32-bit minor */
 typedef unsigned long long dev_t;
 #else
-#ifndef __CYGWIN__
 typedef	short	dev_t;
 #endif
-#endif
 
-#ifndef __CYGWIN__	/* which defines these types in it's own types.h. */
-typedef long		off_t;
+typedef	long	off_t;
 
 typedef	unsigned short	uid_t;
 typedef	unsigned short	gid_t;
-#endif
-
 typedef int pid_t;
-#ifndef __CYGWIN__
 typedef	long key_t;
-#endif
-typedef _ssize_t ssize_t;
+typedef long ssize_t;
 
-#ifndef __CYGWIN__
 #ifdef __MS_types__
 typedef	char *	addr_t;
 typedef int mode_t;
@@ -198,7 +150,6 @@ typedef unsigned short mode_t;
 typedef unsigned int mode_t _ST_INT32;
 #endif
 #endif /* ! __MS_types__ */
-#endif /*__CYGWIN__*/
 
 typedef unsigned short nlink_t;
 
@@ -251,6 +202,11 @@ typedef	struct _types_fd_set {
 #undef __MS_types__
 #undef _ST_INT32
 
+/* The following are actually standard POSIX 1003.1b-1993 threads, mutexes,
+   condition variables, and keys.  But since RTEMS is currently the only
+   newlib user of these, the ifdef is just on RTEMS. */
+
+#if defined(__rtems__) || defined(__CYGWIN__)
 
 #ifndef __clockid_t_defined
 typedef _CLOCKID_T_ clockid_t;
@@ -262,8 +218,9 @@ typedef _TIMER_T_ timer_t;
 #define __timer_t_defined
 #endif
 
-typedef unsigned long useconds_t;
-typedef long suseconds_t;
+#if defined(__CYGWIN__) || defined(__rtems__)
+typedef long useconds_t;
+#endif
 
 #include <sys/features.h>
 
@@ -374,8 +331,6 @@ typedef struct {
 #endif
 #endif /* defined(_POSIX_THREADS) */
 
-#endif  /* !__need_inttypes */
-
-#undef __need_inttypes
+#endif  /* defined(__rtems__) */
 
 #endif	/* _SYS_TYPES_H */
diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index a670dd7..d7e46a7 100644
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -20,18 +20,13 @@ int	_EXFUN(access,(const char *__path, int __amode ));
 unsigned  _EXFUN(alarm, (unsigned __secs ));
 int     _EXFUN(chdir, (const char *__path ));
 int     _EXFUN(chmod, (const char *__path, mode_t __mode ));
-#if !defined(__INSIDE_CYGWIN__)
 int     _EXFUN(chown, (const char *__path, uid_t __owner, gid_t __group ));
-#endif
 #if defined(__CYGWIN__) || defined(__rtems__)
 int     _EXFUN(chroot, (const char *__path ));
 #endif
 int     _EXFUN(close, (int __fildes ));
 char    _EXFUN(*ctermid, (char *__s ));
 char    _EXFUN(*cuserid, (char *__s ));
-#if defined(__CYGWIN__)
-int	_EXFUN(daemon, (int nochdir, int noclose));
-#endif
 int     _EXFUN(dup, (int __fildes ));
 int     _EXFUN(dup2, (int __fildes, int __fildes2 ));
 #if defined(__CYGWIN__)
@@ -47,97 +42,64 @@ int     _EXFUN(execvp, (const char *__file, char * const __argv[] ));
 int     _EXFUN(fchdir, (int __fildes));
 #endif
 int     _EXFUN(fchmod, (int __fildes, mode_t __mode ));
-#if !defined(__INSIDE_CYGWIN__)
 int     _EXFUN(fchown, (int __fildes, uid_t __owner, gid_t __group ));
-#endif
 pid_t   _EXFUN(fork, (void ));
 long    _EXFUN(fpathconf, (int __fd, int __name ));
 int     _EXFUN(fsync, (int __fd));
-int     _EXFUN(fdatasync, (int __fd));
 char    _EXFUN(*getcwd, (char *__buf, size_t __size ));
-#if defined(__CYGWIN__)
-int	_EXFUN(getdomainname ,(char *__name, size_t __len));
-#endif
-#if !defined(__INSIDE_CYGWIN__)
 gid_t   _EXFUN(getegid, (void ));
 uid_t   _EXFUN(geteuid, (void ));
 gid_t   _EXFUN(getgid, (void ));
-#endif
 int     _EXFUN(getgroups, (int __gidsetsize, gid_t __grouplist[] ));
-#if defined(__CYGWIN__)
-long    _EXFUN(gethostid, (void));
-#endif
 char    _EXFUN(*getlogin, (void ));
 #if defined(_POSIX_THREAD_SAFE_FUNCTIONS)
 int _EXFUN(getlogin_r, (char *name, size_t namesize) );
 #endif
-char 	_EXFUN(*getpass, (const char *__prompt));
+char 	_EXFUN(*getpass, (__const char *__prompt));
 size_t  _EXFUN(getpagesize, (void));
-#if defined(__CYGWIN__)
-int    _EXFUN(getpeereid, (int, uid_t *, gid_t *));
-#endif
 pid_t   _EXFUN(getpgid, (pid_t));
 pid_t   _EXFUN(getpgrp, (void ));
 pid_t   _EXFUN(getpid, (void ));
 pid_t   _EXFUN(getppid, (void ));
-#ifdef __CYGWIN__
-pid_t   _EXFUN(getsid, (pid_t));
-#endif
-#if !defined(__INSIDE_CYGWIN__)
 uid_t   _EXFUN(getuid, (void ));
-#endif
 #ifdef __CYGWIN__
 char *	_EXFUN(getusershell, (void));
 char    _EXFUN(*getwd, (char *__buf ));
 int	_EXFUN(iruserok, (unsigned long raddr, int superuser, const char *ruser, const char *luser));
 #endif
 int     _EXFUN(isatty, (int __fildes ));
-#if !defined(__INSIDE_CYGWIN__)
 int     _EXFUN(lchown, (const char *__path, uid_t __owner, gid_t __group ));
-#endif
 int     _EXFUN(link, (const char *__path1, const char *__path2 ));
 int	_EXFUN(nice, (int __nice_value ));
-#if !defined(__INSIDE_CYGWIN__)
 off_t   _EXFUN(lseek, (int __fildes, off_t __offset, int __whence ));
-#endif
 long    _EXFUN(pathconf, (const char *__path, int __name ));
 int     _EXFUN(pause, (void ));
 #ifdef __CYGWIN__
 int	_EXFUN(pthread_atfork, (void (*)(void), void (*)(void), void (*)(void)));
 #endif
 int     _EXFUN(pipe, (int __fildes[2] ));
-ssize_t _EXFUN(pread, (int __fd, void *__buf, size_t __nbytes, off_t __offset));
-ssize_t _EXFUN(pwrite, (int __fd, const void *__buf, size_t __nbytes, off_t __offset));
 _READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte ));
 #if defined(__CYGWIN__)
-int	_EXFUN(rresvport, (int *__alport));
-int	_EXFUN(revoke, (char *__path));
+int	_EXFUN(revoke, (char *path));
 #endif
 int     _EXFUN(rmdir, (const char *__path ));
 #if defined(__CYGWIN__)
 int	_EXFUN(ruserok, (const char *rhost, int superuser, const char *ruser, const char *luser));
 #endif
+#if defined(__rtems__)
 void *  _EXFUN(sbrk,  (ptrdiff_t __incr));
-#if !defined(__INSIDE_CYGWIN__)
+#else
+void *  _EXFUN(sbrk,  (size_t __incr));
+#endif
 #if defined(__CYGWIN__)
 int     _EXFUN(setegid, (gid_t __gid ));
 int     _EXFUN(seteuid, (uid_t __uid ));
 #endif
 int     _EXFUN(setgid, (gid_t __gid ));
-#endif
-#if defined(__CYGWIN__)
-int	_EXFUN(setgroups, (int ngroups, const gid_t *grouplist ));
-#endif
 int     _EXFUN(setpgid, (pid_t __pid, pid_t __pgid ));
 int     _EXFUN(setpgrp, (void ));
-#if defined(__CYGWIN__) && !defined(__INSIDE_CYGWIN__)
-int	_EXFUN(setregid, (gid_t __rgid, gid_t __egid));
-int	_EXFUN(setreuid, (uid_t __ruid, uid_t __euid));
-#endif
 pid_t   _EXFUN(setsid, (void ));
-#if !defined(__INSIDE_CYGWIN__)
 int     _EXFUN(setuid, (uid_t __uid ));
-#endif
 #if defined(__CYGWIN__)
 void	_EXFUN(setusershell, (void));
 #endif
@@ -147,73 +109,43 @@ long    _EXFUN(sysconf, (int __name ));
 pid_t   _EXFUN(tcgetpgrp, (int __fildes ));
 int     _EXFUN(tcsetpgrp, (int __fildes, pid_t __pgrp_id ));
 char    _EXFUN(*ttyname, (int __fildes ));
-#if defined(__CYGWIN__)
-int     _EXFUN(ttyname_r, (int, char *, size_t)); 
-#endif
 int     _EXFUN(unlink, (const char *__path ));
 int     _EXFUN(vhangup, (void ));
 _READ_WRITE_RETURN_TYPE _EXFUN(write, (int __fd, const void *__buf, size_t __nbyte ));
 
-#ifdef __CYGWIN__
-# define __UNISTD_GETOPT__
-# include <getopt.h>
-# undef __UNISTD_GETOPT__
-#else
-extern char *optarg;			/* getopt(3) external variables */
-extern int optind, opterr, optopt;
-int	 getopt(int, char * const [], const char *);
-extern int optreset;			/* getopt(3) external variable */
-#endif
-
 #ifndef        _POSIX_SOURCE
 pid_t   _EXFUN(vfork, (void ));
-
-extern char *suboptarg;			/* getsubopt(3) external variable */
-int	 getsubopt(char **, char * const *, char **);
 #endif /* _POSIX_SOURCE */
 
-#ifdef _COMPILING_NEWLIB
 /* Provide prototypes for most of the _<systemcall> names that are
    provided in newlib for some compilers.  */
 int     _EXFUN(_close, (int __fildes ));
 pid_t   _EXFUN(_fork, (void ));
 pid_t   _EXFUN(_getpid, (void ));
 int     _EXFUN(_link, (const char *__path1, const char *__path2 ));
-_off_t   _EXFUN(_lseek, (int __fildes, _off_t __offset, int __whence ));
-#ifdef __LARGE64_FILES
-_off64_t _EXFUN(_lseek64, (int __filedes, _off64_t __offset, int __whence ));
-#endif
+off_t   _EXFUN(_lseek, (int __fildes, off_t __offset, int __whence ));
 _READ_WRITE_RETURN_TYPE _EXFUN(_read, (int __fd, void *__buf, size_t __nbyte ));
-void *  _EXFUN(_sbrk,  (ptrdiff_t __incr));
+void *  _EXFUN(_sbrk,  (size_t __incr));
 int     _EXFUN(_unlink, (const char *__path ));
 _READ_WRITE_RETURN_TYPE _EXFUN(_write, (int __fd, const void *__buf, size_t __nbyte ));
 int     _EXFUN(_execve, (const char *__path, char * const __argv[], char * const __envp[] ));
-#endif
 
-#if defined(__CYGWIN__) || defined(__rtems__) || defined(__sh__)
-#if !defined(__INSIDE_CYGWIN__)
-int     _EXFUN(ftruncate, (int __fd, off_t __length));
-int     _EXFUN(truncate, (const char *, off_t __length));
-#endif
-#endif
 #if defined(__CYGWIN__) || defined(__rtems__)
 int	_EXFUN(getdtablesize, (void));
 int	_EXFUN(setdtablesize, (int));
 useconds_t _EXFUN(ualarm, (useconds_t __useconds, useconds_t __interval));
 unsigned _EXFUN(usleep, (unsigned int __useconds));
+int     _EXFUN(ftruncate, (int __fd, off_t __length));
+int     _EXFUN(truncate, (const char *, off_t __length));
 #if !(defined  (_WINSOCK_H) || defined (__USE_W32_SOCKETS))
 /* winsock[2].h defines as __stdcall, and with int as 2nd arg */
  int	_EXFUN(gethostname, (char *__name, size_t __len));
 #endif
 char *	_EXFUN(mktemp, (char *));
-#if defined(__CYGWIN__)
-void    _EXFUN(sync, (void));
-#else /* defined(__rtems__) */
 int     _EXFUN(sync, (void));
-#endif
-#endif
 int     _EXFUN(readlink, (const char *__path, char *__buf, int __buflen));
 int     _EXFUN(symlink, (const char *__name1, const char *__name2));
+#endif
 
 #define	F_OK	0
 #define	R_OK	4
@@ -302,11 +234,6 @@ int     _EXFUN(symlink, (const char *__name1, const char *__name2));
 #define _SC_GETPW_R_SIZE_MAX             51
 #define _SC_LOGIN_NAME_MAX               52
 #define _SC_THREAD_DESTRUCTOR_ITERATIONS 53
-
-#if !defined(__CYGWIN__) && !defined(__rtems__)
-#define _SC_STREAM_MAX			100
-#define _SC_PRIORITY_SCHEDULING		101
-#endif
   
 # define	_PC_LINK_MAX	        0
 # define	_PC_MAX_CANON	        1
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h
index 8d3a30c..f8bb53e 100644
--- a/newlib/libc/include/time.h
+++ b/newlib/libc/include/time.h
@@ -8,7 +8,10 @@
 #define _TIME_H_
 
 #include "_ansi.h"
-#include <sys/reent.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #ifndef NULL
 #define	NULL	0
@@ -28,8 +31,6 @@
 
 #include <sys/types.h>
 
-_BEGIN_STD_C
-
 struct tm
 {
   int	tm_sec;
@@ -60,89 +61,36 @@ char	  *_EXFUN(ctime_r,	(const time_t *, char *));
 struct tm *_EXFUN(gmtime_r,	(const time_t *, struct tm *));
 struct tm *_EXFUN(localtime_r,	(const time_t *, struct tm *));
 
-_END_STD_C
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#ifdef __CYGWIN__
 #ifndef __STRICT_ANSI__
-char      *_EXFUN(strptime,     (const char *, const char *, struct tm *));
-_VOID      _EXFUN(tzset,	(_VOID));
-_VOID      _EXFUN(_tzset_r,	(struct _reent *));
-
-typedef struct __tzrule_struct
-{
-  char ch;
-  int m;
-  int n;
-  int d;
-  int s;
-  time_t change;
-  long offset; /* Match type of _timezone. */
-} __tzrule_type;
-
-typedef struct __tzinfo_struct
-{
-  int __tznorth;
-  int __tzyear;
-  __tzrule_type __tzrule[2];
-} __tzinfo_type;
-
-__tzinfo_type *_EXFUN (__gettzinfo, (_VOID));
-
-/* getdate functions */
-
-#ifdef HAVE_GETDATE
-#ifndef _REENT_ONLY
-#define getdate_err (*__getdate_err())
-int *_EXFUN(__getdate_err,(_VOID));
-
-struct tm *	_EXFUN(getdate, (const char *));
-/* getdate_err is set to one of the following values to indicate the error.
-     1  the DATEMSK environment variable is null or undefined,
-     2  the template file cannot be opened for reading,
-     3  failed to get file status information,
-     4  the template file is not a regular file,
-     5  an error is encountered while reading the template file,
-     6  memory allication failed (not enough memory available),
-     7  there is no line in the template that matches the input,
-     8  invalid input specification  */
-#endif /* !_REENT_ONLY */
-
-/* getdate_r returns the error code as above */
-int		_EXFUN(getdate_r, (const char *, struct tm *));
-#endif /* HAVE_GETDATE */
-
-/* defines for the opengroup specifications Derived from Issue 1 of the SVID.  */
-extern __IMPORT long _timezone;
+extern __IMPORT time_t _timezone;
 extern __IMPORT int _daylight;
 extern __IMPORT char *_tzname[2];
-
-/* POSIX defines the external tzname being defined in time.h */
+/* defines for the opengroup specifications Derived from Issue 1 of the SVID.  */
 #ifndef tzname
 #define tzname _tzname
 #endif
-#endif /* !__STRICT_ANSI__ */
-
-#ifdef __cplusplus
-}
+#ifndef daylight
+#define daylight _daylight
+#endif
+#if timezonevar
+#ifndef timezone
+#define timezone ((long int) _timezone)
 #endif
+#else
+char *_EXFUN(timezone, (void));
+#endif
+void _EXFUN(tzset, (void));
+#endif
+#endif /* __CYGWIN__ */
 
 #include <sys/features.h>
 
-#ifdef __CYGWIN__
-#include <cygwin/time.h>
-#endif /*__CYGWIN__*/
 
 #if defined(_POSIX_TIMERS)
 
 #include <signal.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Clocks, P1003.1b-1993, p. 263 */
 
 int _EXFUN(clock_settime, (clockid_t clock_id, const struct timespec *tp));
@@ -170,15 +118,8 @@ int _EXFUN(timer_getoverrun, (timer_t timerid));
 
 int _EXFUN(nanosleep, (const struct timespec  *rqtp, struct timespec *rmtp));
 
-#ifdef __cplusplus
-}
-#endif
 #endif /* _POSIX_TIMERS */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CPU-time Clock Attributes, P1003.4b/D8, p. 54 */
 
 /* values for the clock enable attribute */
@@ -202,7 +143,7 @@ extern "C" {
 /* Flag indicating time is "absolute" with respect to the clock
    associated with a time.  */
 
-#define TIMER_ABSTIME	4
+#define TIMER_ABSTIME  4
 
 /* Manifest Constants, P1003.4b/D8, p. 55 */
 
@@ -246,6 +187,5 @@ int _EXFUN(clock_getenable_attr, (clockid_t clock_id, int *attr));
 #ifdef __cplusplus
 }
 #endif
-
 #endif /* _TIME_H_ */
 
diff --git a/newlib/libc/include/utime.h b/newlib/libc/include/utime.h
index 652891a..c05e08e 100644
--- a/newlib/libc/include/utime.h
+++ b/newlib/libc/include/utime.h
@@ -2,8 +2,6 @@
 extern "C" {
 #endif
 
-#include <_ansi.h>
-
 /* The utime function is defined in libc/sys/<arch>/sys if it exists. */
 #include <sys/utime.h>
 
diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
deleted file mode 100644
index eeabd35..0000000
--- a/newlib/libc/include/wchar.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef _WCHAR_H_
-#define _WCHAR_H_
-
-#include <_ansi.h>
-
-#include <sys/reent.h>
-
-#define __need_size_t
-#define __need_wchar_t
-#define __need_wint_t
-#include <stddef.h>
-
-/* For _mbstate_t definition. */
-#include <sys/_types.h>
-
-#ifndef NULL
-#define NULL	0
-#endif
-
-#ifndef WEOF
-# define WEOF ((wint_t)-1)
-#endif
-
-#ifndef WCHAR_MIN
-#define WCHAR_MIN 0
-#endif
-
-#ifndef WCHAR_MAX
-#ifdef __WCHAR_MAX__
-#define WCHAR_MAX __WCHAR_MAX__
-#else
-#define WCHAR_MAX 0x7fffffffu
-#endif
-#endif
-
-_BEGIN_STD_C
-
-#ifndef _MBSTATE_T
-#define _MBSTATE_T
-typedef _mbstate_t mbstate_t;
-#endif /* _MBSTATE_T */
-
-wint_t	_EXFUN(btowc, (int));
-int	_EXFUN(wctob, (wint_t));
-size_t	_EXFUN(mbrlen, (const char * , size_t, mbstate_t *));
-size_t	_EXFUN(mbrtowc, (wchar_t * , const char * , size_t, mbstate_t *));
-size_t	_EXFUN(_mbrtowc_r, (struct _reent *, wchar_t * , const char * , 
-			size_t, mbstate_t *));
-int	_EXFUN(mbsinit, (const mbstate_t *));
-size_t	_EXFUN(mbsrtowcs, (wchar_t * , const char ** , size_t, mbstate_t *));
-size_t	_EXFUN(wcrtomb, (char * , wchar_t, mbstate_t *));
-size_t	_EXFUN(_wcrtomb_r, (struct _reent *, char * , wchar_t, mbstate_t *));
-size_t	_EXFUN(wcsrtombs, (char * , const wchar_t ** , size_t, mbstate_t *));
-size_t	_EXFUN(_wcsrtombs_r, (struct _reent *, char * , const wchar_t ** , 
-			size_t, mbstate_t *));
-wchar_t	*_EXFUN(wcscat, (wchar_t * , const wchar_t *));
-wchar_t	*_EXFUN(wcschr, (const wchar_t *, wchar_t));
-int	_EXFUN(wcscmp, (const wchar_t *, const wchar_t *));
-int	_EXFUN(wcscoll, (const wchar_t *, const wchar_t *));
-wchar_t	*_EXFUN(wcscpy, (wchar_t * , const wchar_t *));
-size_t	_EXFUN(wcscspn, (const wchar_t *, const wchar_t *));
-size_t	_EXFUN(wcslcat, (wchar_t *, const wchar_t *, size_t));
-size_t	_EXFUN(wcslcpy, (wchar_t *, const wchar_t *, size_t));
-size_t	_EXFUN(wcslen, (const wchar_t *));
-wchar_t	*_EXFUN(wcsncat, (wchar_t * , const wchar_t * , size_t));
-int	_EXFUN(wcsncmp, (const wchar_t *, const wchar_t *, size_t));
-wchar_t	*_EXFUN(wcsncpy, (wchar_t *  , const wchar_t * , size_t));
-size_t	_EXFUN(wcsnlen, (const wchar_t *, size_t));
-wchar_t	*_EXFUN(wcspbrk, (const wchar_t *, const wchar_t *));
-wchar_t	*_EXFUN(wcsrchr, (const wchar_t *, wchar_t));
-size_t	_EXFUN(wcsspn, (const wchar_t *, const wchar_t *));
-wchar_t	*_EXFUN(wcsstr, (const wchar_t *, const wchar_t *));
-int	_EXFUN(wcswidth, (const wchar_t *, size_t));
-int	_EXFUN(wcwidth, (const wchar_t));
-wchar_t	*_EXFUN(wmemchr, (const wchar_t *, wchar_t, size_t));
-int	_EXFUN(wmemcmp, (const wchar_t *, const wchar_t *, size_t));
-wchar_t	*_EXFUN(wmemcpy, (wchar_t * , const wchar_t * , size_t));
-wchar_t	*_EXFUN(wmemmove, (wchar_t *, const wchar_t *, size_t));
-wchar_t	*_EXFUN(wmemset, (wchar_t *, wchar_t, size_t));
-
-_END_STD_C
-
-#endif /* _WCHAR_H_ */
diff --git a/newlib/libc/include/wctype.h b/newlib/libc/include/wctype.h
deleted file mode 100644
index c72c9de..0000000
--- a/newlib/libc/include/wctype.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _WCTYPE_H_
-#define _WCTYPE_H_
-
-#include <_ansi.h>
-#include <sys/_types.h>
-
-#define __need_wint_t
-#include <stddef.h>
-
-#ifndef WEOF
-# define WEOF ((wint_t)-1)
-#endif
-
-_BEGIN_STD_C
-
-#ifndef _WCTYPE_T
-#define _WCTYPE_T
-typedef int wctype_t;
-#endif
-
-#ifndef _WCTRANS_T
-#define _WCTRANS_T
-typedef int wctrans_t;
-#endif
-
-int	_EXFUN(iswalpha, (wint_t));
-int	_EXFUN(iswalnum, (wint_t));
-int	_EXFUN(iswblank, (wint_t));
-int	_EXFUN(iswcntrl, (wint_t));
-int	_EXFUN(iswctype, (wint_t, wctype_t));
-int	_EXFUN(iswdigit, (wint_t));
-int	_EXFUN(iswgraph, (wint_t));
-int	_EXFUN(iswlower, (wint_t));
-int	_EXFUN(iswprint, (wint_t));
-int	_EXFUN(iswpunct, (wint_t));
-int	_EXFUN(iswspace, (wint_t));
-int	_EXFUN(iswupper, (wint_t));
-int	_EXFUN(iswxdigit, (wint_t));
-wint_t	_EXFUN(towctrans, (wint_t, wctrans_t));
-wint_t	_EXFUN(towupper, (wint_t));
-wint_t	_EXFUN(towlower, (wint_t));
-wctrans_t _EXFUN(wctrans, (const char *));
-wctype_t _EXFUN(wctype, (const char *));
-
-_END_STD_C
-
-#endif /* _WCTYPE_H_ */
diff --git a/newlib/libc/libc.texinfo b/newlib/libc/libc.texinfo
index b3ce3e9..b1ca8f9 100644
--- a/newlib/libc/libc.texinfo
+++ b/newlib/libc/libc.texinfo
@@ -28,7 +28,7 @@ END-INFO-DIR-ENTRY
 @ifinfo
 This file documents the ANSI C library.
 
-Copyright (C) 1992, 1993, 1994-2004 Red Hat, Inc.
+Copyright (C) 1992, 1993 Cygnus Support
 
 @file{libc} includes software developed by the
 University of California, Berkeley and its contributors.
@@ -36,7 +36,7 @@ University of California, Berkeley and its contributors.
 libc includes software developed by Martin Jackson, Graham Haley
 and Steve Chamberlain of Tadpole Technology and released to Cygnus.
 
-libc uses floating-point conversion software developed at AT&T, which
+libc uses floating point converstion software developed at AT&T, which
 includes this copyright information:
 
  The author of this software is David M. Gay.
@@ -79,23 +79,22 @@ into another language, under the above conditions for modified versions.
 @c @cropmarks
 @finalout
 @setchapternewpage odd
-@settitle Red Hat newlib C Library, Full
+@settitle Cygnus C Support Library, Full
 @titlepage
-@title The Red Hat newlib C Library
+@title The Cygnus C Support Library
 @subtitle Full Configuration
 @sp 1
-@subtitle @code{libc} 1.14.0
-@subtitle December 2005
+@subtitle @code{libc} 1.4
+@subtitle May 1993
 @author {Steve Chamberlain}
 @author {Roland Pesch}
-@author {Red Hat Support}
-@author {Jeff Johnston}
+@author {Cygnus Support}
 @page
 
 @tex
 {\parskip=0pt
-sac@@cygnus.com, pesch@@cygnus.com, jjohnstn@@redhat.com\hfill {\it The Red Hat newlib C Library}\par
-Copyright \copyright{} 1992, 1993, 1994-2004 Red Hat Inc. 
+sac@@cygnus.com, pesch@@cygnus.com\hfill {\it The Cygnus C Support Library}\par
+Copyright \copyright{} 1992, 1993 Cygnus Support
 }
 \global\parindent=0pt % Steve likes it this way
 @end tex
@@ -106,7 +105,7 @@ University of California, Berkeley and its contributors.
 @file{libc} includes software developed by Martin Jackson, Graham Haley
 and Steve Chamberlain of Tadpole Technology and released to Cygnus.
 
-@file{libc} uses floating-point conversion software developed at AT&T,
+@file{libc} uses floating point converstion software developed at AT&T,
 which includes this copyright information:
 
 @cartouche
@@ -143,9 +142,9 @@ into another language, under the above conditions for modified versions.
 @end titlepage
 @end iftex
 
-@ifnottex
+@ifinfo
 @node Top
-@top The Red Hat newlib C Library
+@top The Cygnus C Support Library
 
 @c The menu contents depend on the configuration, so we include them
 @c as a separate file
@@ -153,57 +152,25 @@ into another language, under the above conditions for modified versions.
 @c switch to set SIGNALS on or off, according to whether config picks up
 @c signal subdirectory:
 @include sigset.texi
-@include extra.texi
-@include stdio64.texi
-@include iconvset.texi
 
 @menu
-* Introduction::
 * Stdlib::
 * Ctype::
 * Stdio::
-@ifset STDIO64
-* Stdio64::
-@end ifset
-
 * Strings::
-* Wchar strings::
 @ifset SIGNALS
 * Signals::
 @end ifset
 
 * Timefns::
 * Locale::
-* Reentrancy::
-
-* Misc::
 * Syscalls::
+* Misc::
 * Arglists::
-@ifset ICONV
-* Iconv::
-@end ifset
-
+* Reentrancy::
 * Library Index::
 @end menu
-@end ifnottex
-
-@node Introduction
-@chapter Introduction
-
-This reference manual describes the functions provided by the Red Hat
-``newlib'' version of the standard ANSI C library.  This document is not
-intended as an overview or a tutorial for the C library.  Each library
-function is listed with a synopsis of its use, a brief description,
-return values (including error handling), and portability issues.
-
-Some of the library functions depend on support from the underlying
-operating system and may not be available on every platform.  For
-embedded systems in particular, many of these underlying operating
-system services may not be available or may not be fully functional.
-The specific operating system subroutines required for a particular
-library function are listed in the ``Portability'' section of the
-function description.  @xref{Syscalls}, for a description of the
-relevant operating system calls.
+@end ifinfo
 
 @include targetdep.tex
 
diff --git a/newlib/libc/locale/Makefile.am b/newlib/libc/locale/Makefile.am
index 31229b1..71a400a 100644
--- a/newlib/libc/locale/Makefile.am
+++ b/newlib/libc/locale/Makefile.am
@@ -4,35 +4,17 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES = timelocal.h ldpart.h locale.c lnumeric.h lmonetary.h lmessages.h 
-
-## The following interfaces are EL/IX level 2
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-LIB_OBJS = \
-	fix_grouping.$(oext) \
-	ldpart.$(oext) \
-	lmessages.$(oext) \
-	lnumeric.$(oext) \
-	lmonetary.$(oext) \
-	nl_langinfo.$(oext) \
-	timelocal.$(oext)
-endif
+LIB_SOURCES = locale.c
 
 liblocale_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = liblocale.la
-liblocale_la_SOURCES = $(GENERAL_SOURCES)
-liblocale_la_LIBADD = $(LIB_OBJS)
-liblocale_la_DEPENDENCIES = $(LIB_OBJS)
+liblocale_la_SOURCES = $(LIB_SOURCES)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
+lib_a_SOURCES = $(LIB_SOURCES)
 noinst_DATA =
 endif # USE_LIBTOOL
 
@@ -54,4 +36,3 @@ doc: $(CHEWOUT_FILES)
 	cat $(srcdir)/locale.tex >> $(TARGETDOC)
 
 CLEANFILES = $(CHEWOUT_FILES) *.ref
-
diff --git a/newlib/libc/locale/Makefile.in b/newlib/libc/locale/Makefile.in
index c1e8480..dbc5380 100644
--- a/newlib/libc/locale/Makefile.in
+++ b/newlib/libc/locale/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -110,22 +95,16 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES = timelocal.h ldpart.h locale.c lnumeric.h lmonetary.h lmessages.h 
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = 	fix_grouping.$(oext) 	ldpart.$(oext) 	lmessages.$(oext) 	lnumeric.$(oext) 	lmonetary.$(oext) 	nl_langinfo.$(oext) 	timelocal.$(oext)
+LIB_SOURCES = locale.c
 
 liblocale_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = liblocale.la
-@USE_LIBTOOL_TRUE@liblocale_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@liblocale_la_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@liblocale_la_DEPENDENCIES = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@liblocale.la
+@USE_LIBTOOL_TRUE@liblocale_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
 
 CHEWOUT_FILES = locale.def
 
@@ -144,9 +123,11 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  locale.$(OBJEXT)
+lib_a_LIBADD = 
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  locale.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
+liblocale_la_LIBADD = 
 @USE_LIBTOOL_TRUE@liblocale_la_OBJECTS =  locale.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -167,7 +148,7 @@ OBJECTS = $(lib_a_OBJECTS) $(liblocale_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus locale/Makefile
 
@@ -188,11 +169,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -201,7 +177,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libc/locale/fix_grouping.c b/newlib/libc/locale/fix_grouping.c
deleted file mode 100644
index c44fc33..0000000
--- a/newlib/libc/locale/fix_grouping.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#include <ctype.h>
-#include <limits.h>
-#include <stddef.h>
-
-static const char nogrouping[] = { CHAR_MAX, '\0' };
-
-/*
- * "3;3;-1" -> "\003\003\177"
- */
-
-const char *
-__fix_locale_grouping_str(const char *str) {
-
-	char *src, *dst;
-	char n;
-
-	if (str == NULL || *str == '\0') {
-		return nogrouping;
-	}
-
-	for (src = (char*)str, dst = (char*)str; *src != '\0'; src++) {
-
-		/* input string examples: "3;3", "3;2;-1" */
-		if (*src == ';')
-			continue;
-	
-		if (*src == '-' && *(src+1) == '1') {
-			*dst++ = CHAR_MAX;
-			src++;
-			continue;
-		}
-
-		if (!isdigit((unsigned char)*src)) {
-			/* broken grouping string */
-			return nogrouping;
-		}
-
-		/* assume all numbers <= 99 */
-		n = *src - '0';
-		if (isdigit((unsigned char)*(src+1))) {
-			src++;
-			n *= 10;
-			n += *src - '0';
-		}
-
-		*dst = n;
-		/* NOTE: assume all input started with "0" as 'no grouping' */
-		if (*dst == '\0')
-			return (dst == (char*)str) ? nogrouping : str;
-		dst++;
-	}
-	*dst = '\0';
-	return str;
-}
diff --git a/newlib/libc/locale/ldpart.c b/newlib/libc/locale/ldpart.c
deleted file mode 100644
index a284b9d..0000000
--- a/newlib/libc/locale/ldpart.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/syslimits.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "setlocale.h"
-#include "ldpart.h"
-
-static int split_lines(char *, const char *);
-static void set_from_buf(const char *, int, const char **);
-
-int
-__part_load_locale(const char *name,
-		int *using_locale,
-		char *locale_buf,
-		const char *category_filename,
-		int locale_buf_size_max,
-		int locale_buf_size_min,
-		const char **dst_localebuf) {
-
-	static char		locale_buf_C[] = "C";
-	static int		num_lines;
-
-	int			 fd;
-	char			*lbuf;
-	char			*p;
-	const char 		*plim;
-	char                     filename[PATH_MAX];
-	struct stat		 st;
-	size_t			 namesize;
-	size_t			 bufsize;
-	int                      save_using_locale;
-        char *nptr;
-
-	save_using_locale = *using_locale;
-	*using_locale = 0;
-
-	if (name == NULL)
-		goto no_locale;
-
-	if (!strcmp(name, "C") || !strcmp(name, "POSIX"))
-		return 0;
-
-	/*
-	 * If the locale name is the same as our cache, use the cache.
-	 */
-	lbuf = locale_buf;
-	if (lbuf != NULL && strcmp(name, lbuf) == 0) {
-		set_from_buf(lbuf, num_lines, dst_localebuf);
-		*using_locale = 1;
-		return 0;
-	}
-
-	/*
-	 * Slurp the locale file into the cache.
-	 */
-	namesize = strlen(name) + 1;
-
-	if (!_PathLocale)
-		goto no_locale;
-	/* Range checking not needed, 'name' size is limited */
-	strcpy(filename, _PathLocale);
-	strcat(filename, "/");
-	strcat(filename, name);
-	strcat(filename, "/");
-	strcat(filename, category_filename);
-	fd = open(filename, O_RDONLY);
-	if (fd < 0)
-		goto no_locale;
-#ifdef __USE_INTERNAL_STAT64
-	if (fstat64(fd, &st) != 0)
-#else
-	if (fstat(fd, &st) != 0)
-#endif
-		goto bad_locale;
-	if (st.st_size <= 0)
-		goto bad_locale;
-	bufsize = namesize + st.st_size;
-	locale_buf = NULL;
-
-        if (lbuf == NULL || lbuf == locale_buf_C)
-          {
-            lbuf = malloc(bufsize);
-          }
-        else
-          { 
-            nptr = realloc(lbuf, bufsize);
-            if (!nptr && lbuf)
-              free (lbuf);
-            lbuf = nptr;
-          }
-
-	if (lbuf == NULL)
-		goto bad_locale;
-	(void) strcpy(lbuf, name);
-	p = lbuf + namesize;
-	plim = p + st.st_size;
-	if (read(fd, p, (size_t) st.st_size) != st.st_size)
-		goto bad_lbuf;
-	if (close(fd) != 0)
-		goto bad_lbuf;
-	/*
-	 * Parse the locale file into localebuf.
-	 */
-	if (plim[-1] != '\n')
-		goto bad_lbuf;
-	num_lines = split_lines(p, plim);
-	if (num_lines >= locale_buf_size_max)
-		num_lines = locale_buf_size_max;
-	else if (num_lines >= locale_buf_size_min)
-		num_lines = locale_buf_size_min;
-	else
-		goto reset_locale;
-	set_from_buf(lbuf, num_lines, dst_localebuf);
-	/*
-	 * Record the successful parse in the cache.
-	 */
-	locale_buf = lbuf;
-
-	*using_locale = 1;
-	return 0;
-
-reset_locale:
-	locale_buf = locale_buf_C;
-	save_using_locale = 0;
-bad_lbuf:
-	free(lbuf);
-bad_locale:
-	(void)close(fd);
-no_locale:
-	*using_locale = save_using_locale;
-	return -1;
-}
-
-static int
-split_lines(char *p, const char *plim) {
-
-	int i;
-
-	for (i = 0; p < plim; i++) {
-		p = strchr(p, '\n');
-		*p++ = '\0';
-	}
-	return i;
-}
-
-static void
-set_from_buf(const char *p, int num_lines, const char **dst_localebuf) {
-
-	const char **ap;
-	int i;
-
-	for (ap = dst_localebuf, i = 0; i < num_lines; ++ap, ++i)
-		*ap = p += strlen(p) + 1;
-}
-
diff --git a/newlib/libc/locale/ldpart.h b/newlib/libc/locale/ldpart.h
deleted file mode 100644
index 86031fd..0000000
--- a/newlib/libc/locale/ldpart.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/locale/ldpart.h,v 1.4 2001/12/20 18:28:52 phantom Exp $
- */
-
-#ifndef _LDPART_H_
-#define	_LDPART_H_
-
-int	__part_load_locale(const char *, int*, char *, const char *,
-		    int, int, const char **);
-
-#endif /* !_LDPART_H_ */
diff --git a/newlib/libc/locale/lmessages.c b/newlib/libc/locale/lmessages.c
deleted file mode 100644
index 9a4bb79..0000000
--- a/newlib/libc/locale/lmessages.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#include <stddef.h>
-
-#include "lmessages.h"
-#include "ldpart.h"
-
-#define LCMESSAGES_SIZE_FULL (sizeof(struct lc_messages_T) / sizeof(char *))
-#define LCMESSAGES_SIZE_MIN \
-		(offsetof(struct lc_messages_T, yesstr) / sizeof(char *))
-
-static char empty[] = "";
-
-static const struct lc_messages_T _C_messages_locale = {
-	"^[yY]" ,	/* yesexpr */
-	"^[nN]" ,	/* noexpr */
-	"yes" , 	/* yesstr */
-	"no"		/* nostr */
-};
-
-static struct lc_messages_T _messages_locale;
-static int	_messages_using_locale;
-static char	*_messages_locale_buf;
-
-int
-__messages_load_locale(const char *name) {
-
-	/*
-	 * Propose that we can have incomplete locale file (w/o "{yes,no}str").
-	 * Initialize them before loading.  In case of complete locale, they'll
-	 * be initialized to loaded value, otherwise they'll not be touched.
-	 */
-	_messages_locale.yesstr = empty;
-	_messages_locale.nostr = empty;
-
-	return __part_load_locale(name, &_messages_using_locale,
-		_messages_locale_buf, "LC_MESSAGES",
-		LCMESSAGES_SIZE_FULL, LCMESSAGES_SIZE_MIN,
-		(const char **)&_messages_locale);
-}
-
-struct lc_messages_T *
-__get_current_messages_locale(void) {
-
-	return (_messages_using_locale
-		? &_messages_locale
-		: (struct lc_messages_T *)&_C_messages_locale);
-}
-
-#ifdef LOCALE_DEBUG
-void
-msgdebug() {
-printf(	"yesexpr = %s\n"
-	"noexpr = %s\n"
-	"yesstr = %s\n"
-	"nostr = %s\n",
-	_messages_locale.yesexpr,
-	_messages_locale.noexpr,
-	_messages_locale.yesstr,
-	_messages_locale.nostr
-);
-}
-#endif /* LOCALE_DEBUG */
diff --git a/newlib/libc/locale/lmessages.h b/newlib/libc/locale/lmessages.h
deleted file mode 100644
index ee690ae..0000000
--- a/newlib/libc/locale/lmessages.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/locale/lmessages.h,v 1.3 2001/12/20 18:28:52 phantom Exp $
- */
-
-#ifndef _LMESSAGES_H_
-#define	_LMESSAGES_H_
-
-struct	lc_messages_T {
-	const char	*yesexpr;
-	const char	*noexpr;
-	const char	*yesstr;
-	const char	*nostr;
-};
-
-struct lc_messages_T *__get_current_messages_locale(void);
-int	__messages_load_locale(const char *);
-
-#endif /* !_LMESSAGES_H_ */
diff --git a/newlib/libc/locale/lmonetary.c b/newlib/libc/locale/lmonetary.c
deleted file mode 100644
index d31e88c..0000000
--- a/newlib/libc/locale/lmonetary.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#include <limits.h>
-#include <stdlib.h>
-#include "lmonetary.h"
-#include "ldpart.h"
-
-extern int __mlocale_changed;
-extern const char * __fix_locale_grouping_str(const char *);
-
-#define LCMONETARY_SIZE (sizeof(struct lc_monetary_T) / sizeof(char *))
-
-static char	empty[] = "";
-static char	numempty[] = { CHAR_MAX, '\0'};
-
-static const struct lc_monetary_T _C_monetary_locale = {
-	empty,		/* int_curr_symbol */
-	empty,		/* currency_symbol */
-	empty,		/* mon_decimal_point */
-	empty,		/* mon_thousands_sep */
-	numempty,	/* mon_grouping */
-	empty,		/* positive_sign */
-	empty,		/* negative_sign */
-	numempty,	/* int_frac_digits */
-	numempty,	/* frac_digits */
-	numempty,	/* p_cs_precedes */
-	numempty,	/* p_sep_by_space */
-	numempty,	/* n_cs_precedes */
-	numempty,	/* n_sep_by_space */
-	numempty,	/* p_sign_posn */
-	numempty	/* n_sign_posn */
-};
-
-static struct lc_monetary_T _monetary_locale;
-static int	_monetary_using_locale;
-static char	*_monetary_locale_buf;
-
-static char
-cnv(const char *str) {
-	int i = strtol(str, NULL, 10);
-	if (i == -1)
-		i = CHAR_MAX;
-	return (char)i;
-}
-
-int
-__monetary_load_locale(const char *name) {
-
-	int ret;
-	__mlocale_changed = 1;
-	ret = __part_load_locale(name, &_monetary_using_locale,
-		_monetary_locale_buf, "LC_MONETARY",
-		LCMONETARY_SIZE, LCMONETARY_SIZE,
-		(const char **)&_monetary_locale);
-	if (ret == 0 && _monetary_using_locale) {
-		_monetary_locale.mon_grouping =
-		     __fix_locale_grouping_str(_monetary_locale.mon_grouping);
-
-#define M_ASSIGN_CHAR(NAME) (((char *)_monetary_locale.NAME)[0] = \
-			     cnv(_monetary_locale.NAME))
-
-		M_ASSIGN_CHAR(int_frac_digits);
-		M_ASSIGN_CHAR(frac_digits);
-		M_ASSIGN_CHAR(p_cs_precedes);
-		M_ASSIGN_CHAR(p_sep_by_space);
-		M_ASSIGN_CHAR(n_cs_precedes);
-		M_ASSIGN_CHAR(n_sep_by_space);
-		M_ASSIGN_CHAR(p_sign_posn);
-		M_ASSIGN_CHAR(n_sign_posn);
-	}
-	return ret;
-}
-
-struct lc_monetary_T *
-__get_current_monetary_locale(void) {
-
-	return (_monetary_using_locale
-		? &_monetary_locale
-		: (struct lc_monetary_T *)&_C_monetary_locale);
-}
-
-#ifdef LOCALE_DEBUG
-void
-monetdebug() {
-printf(	"int_curr_symbol = %s\n"
-	"currency_symbol = %s\n"
-	"mon_decimal_point = %s\n"
-	"mon_thousands_sep = %s\n"
-	"mon_grouping = %s\n"
-	"positive_sign = %s\n"
-	"negative_sign = %s\n"
-	"int_frac_digits = %d\n"
-	"frac_digits = %d\n"
-	"p_cs_precedes = %d\n"
-	"p_sep_by_space = %d\n"
-	"n_cs_precedes = %d\n"
-	"n_sep_by_space = %d\n"
-	"p_sign_posn = %d\n"
-	"n_sign_posn = %d\n",
-	_monetary_locale.int_curr_symbol,
-	_monetary_locale.currency_symbol,
-	_monetary_locale.mon_decimal_point,
-	_monetary_locale.mon_thousands_sep,
-	_monetary_locale.mon_grouping,
-	_monetary_locale.positive_sign,
-	_monetary_locale.negative_sign,
-	_monetary_locale.int_frac_digits[0],
-	_monetary_locale.frac_digits[0],
-	_monetary_locale.p_cs_precedes[0],
-	_monetary_locale.p_sep_by_space[0],
-	_monetary_locale.n_cs_precedes[0],
-	_monetary_locale.n_sep_by_space[0],
-	_monetary_locale.p_sign_posn[0],
-	_monetary_locale.n_sign_posn[0]
-);
-}
-#endif /* LOCALE_DEBUG */
diff --git a/newlib/libc/locale/lmonetary.h b/newlib/libc/locale/lmonetary.h
deleted file mode 100644
index bbe77db..0000000
--- a/newlib/libc/locale/lmonetary.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/locale/lmonetary.h,v 1.3 2001/12/20 18:28:52 phantom Exp $
- */
-
-#ifndef _LMONETARY_H_
-#define	_LMONETARY_H_
-
-struct lc_monetary_T {
-	const char	*int_curr_symbol;
-	const char	*currency_symbol;
-	const char	*mon_decimal_point;
-	const char	*mon_thousands_sep;
-	const char	*mon_grouping;
-	const char	*positive_sign;
-	const char	*negative_sign;
-	const char	*int_frac_digits;
-	const char	*frac_digits;
-	const char	*p_cs_precedes;
-	const char	*p_sep_by_space;
-	const char	*n_cs_precedes;
-	const char	*n_sep_by_space;
-	const char	*p_sign_posn;
-	const char	*n_sign_posn;
-};
-
-struct lc_monetary_T *__get_current_monetary_locale(void);
-int	__monetary_load_locale(const char *);
-
-#endif /* !_LMONETARY_H_ */
diff --git a/newlib/libc/locale/lnumeric.c b/newlib/libc/locale/lnumeric.c
deleted file mode 100644
index 90b404c..0000000
--- a/newlib/libc/locale/lnumeric.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#include <limits.h>
-#include "lnumeric.h"
-#include "ldpart.h"
-
-extern int __nlocale_changed;
-extern const char *__fix_locale_grouping_str(const char *);
-
-#define LCNUMERIC_SIZE (sizeof(struct lc_numeric_T) / sizeof(char *))
-
-static char	numempty[] = { CHAR_MAX, '\0' };
-
-static const struct lc_numeric_T _C_numeric_locale = {
-	".",     	/* decimal_point */
-	"",     	/* thousands_sep */
-	numempty	/* grouping */
-};
-
-static struct lc_numeric_T _numeric_locale;
-static int	_numeric_using_locale;
-static char	*_numeric_locale_buf;
-
-int
-__numeric_load_locale(const char *name) {
-
-	int ret;
-
-	__nlocale_changed = 1;
-	ret = __part_load_locale(name, &_numeric_using_locale,
-		_numeric_locale_buf, "LC_NUMERIC",
-		LCNUMERIC_SIZE, LCNUMERIC_SIZE,
-		(const char **)&_numeric_locale);
-	if (ret == 0 && _numeric_using_locale)
-		_numeric_locale.grouping =
-			__fix_locale_grouping_str(_numeric_locale.grouping);
-	return ret;
-}
-
-struct lc_numeric_T *
-__get_current_numeric_locale(void) {
-
-	return (_numeric_using_locale
-		? &_numeric_locale
-		: (struct lc_numeric_T *)&_C_numeric_locale);
-}
-
-#ifdef LOCALE_DEBUG
-void
-numericdebug(void) {
-printf(	"decimal_point = %s\n"
-	"thousands_sep = %s\n"
-	"grouping = %s\n",
-	_numeric_locale.decimal_point,
-	_numeric_locale.thousands_sep,
-	_numeric_locale.grouping
-);
-}
-#endif /* LOCALE_DEBUG */
diff --git a/newlib/libc/locale/lnumeric.h b/newlib/libc/locale/lnumeric.h
deleted file mode 100644
index 9678c1f..0000000
--- a/newlib/libc/locale/lnumeric.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/locale/lnumeric.h,v 1.3 2001/12/20 18:28:52 phantom Exp $
- */
-
-#ifndef _LNUMERIC_H_
-#define	_LNUMERIC_H_
-
-struct lc_numeric_T {
-	const char	*decimal_point;
-	const char	*thousands_sep;
-	const char	*grouping;
-};
-
-struct lc_numeric_T *__get_current_numeric_locale(void);
-int	__numeric_load_locale(const char *);
-
-#endif /* !_LNUMERIC_H_ */
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index d48a53a..e1f4533 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -42,17 +42,16 @@ execution environment for international collating and formatting
 information; <<localeconv>> reports on the settings of the current
 locale.
 
-This is a minimal implementation, supporting only the required <<"C">>
+This is a minimal implementation, supporting only the required <<``C''>>
 value for <[locale]>; strings representing other locales are not
-honored unless _MB_CAPABLE is defined in which case three new
-extensions are allowed for LC_CTYPE or LC_MESSAGES only: <<"C-JIS">>, 
-<<"C-EUCJP">>, <<"C-SJIS">>, or <<"C-ISO-8859-1">>.  (<<"">> is 
-also accepted; it represents the default locale
-for an implementation, here equivalent to <<"C">>.)
+honored unless MB_CAPABLE is defined in which case three new
+extensions are allowed for LC_CTYPE only: <<''C-JIS''>>, <<''C-EUCJP''>>,
+and <<''C-SJIS''>>.  (<<``''>> is also accepted; it represents the default locale
+for an implementation, here equivalent to <<``C''>>.)
 
 If you use <<NULL>> as the <[locale]> argument, <<setlocale>> returns
 a pointer to the string representing the current locale (always
-<<"C">> in this implementation).  The acceptable values for
+<<``C''>> in this implementation).  The acceptable values for
 <[category]> are defined in `<<locale.h>>' as macros beginning with
 <<"LC_">>, but this implementation does not check the values you pass
 in the <[category]> argument.
@@ -67,7 +66,7 @@ in effect.
 
 RETURNS
 <<setlocale>> returns either a pointer to a string naming the locale
-currently in effect (always <<"C">> for this implementation, or, if
+currently in effect (always <<``C''>> for this implementation, or, if
 the locale request cannot be honored, <<NULL>>.
 
 <<localeconv>> returns a pointer to a structure of type <<lconv>>,
@@ -86,7 +85,6 @@ No supporting OS subroutines are required.
  *                         (Only "C" or null supported).
  */
 
-#include <newlib.h>
 #include <locale.h>
 #include <string.h>
 #include <limits.h>
@@ -98,10 +96,6 @@ int __declspec(dllexport) __mb_cur_max = 1;
 int __mb_cur_max = 1;
 #endif
 
-int __nlocale_changed = 0;
-int __mlocale_changed = 0;
-char *_PathLocale = NULL;
-
 static _CONST struct lconv lconv = 
 {
   ".", "", "", "", "", "", "", "", "", "",
@@ -110,18 +104,13 @@ static _CONST struct lconv lconv =
 };
 
 
-char * _EXFUN(__locale_charset,(_VOID));
-
-static char *charset = "ISO-8859-1";
-char __lc_ctype[12] = "C";
-
 char *
 _DEFUN(_setlocale_r, (p, category, locale),
        struct _reent *p _AND
        int category _AND
        _CONST char *locale)
 {
-#ifndef _MB_CAPABLE
+#ifndef MB_CAPABLE
   if (locale)
     { 
       if (strcmp (locale, "C") && strcmp (locale, ""))
@@ -131,136 +120,49 @@ _DEFUN(_setlocale_r, (p, category, locale),
     }
   return "C";
 #else
-  static char last_lc_ctype[12] = "C";
-  static char lc_messages[12] = "C";
-  static char last_lc_messages[12] = "C";
+  static char lc_ctype[8] = "C";
+  static char last_lc_ctype[8] = "C";
 
   if (locale)
     {
-      char *locale_name = (char *)locale;
-      if (category != LC_CTYPE && category != LC_MESSAGES) 
+      if (category != LC_CTYPE) 
         { 
           if (strcmp (locale, "C") && strcmp (locale, ""))
             return 0;
           if (category == LC_ALL)
             {
-              strcpy (last_lc_ctype, __lc_ctype);
-              strcpy (__lc_ctype, "C");
-              strcpy (last_lc_messages, lc_messages);
-              strcpy (lc_messages, "C");
+              strcpy (last_lc_ctype, lc_ctype);
+              strcpy (lc_ctype, locale);
               __mb_cur_max = 1;
             }
         }
       else
-        {
-          if (locale[0] == 'C' && locale[1] == '-')
-            {
-              switch (locale[2])
-                {
-                case 'U':
-                  if (strcmp (locale, "C-UTF-8"))
-                    return 0;
-                break;
-                case 'J':
-                  if (strcmp (locale, "C-JIS"))
-                    return 0;
-                break;
-                case 'E':
-                  if (strcmp (locale, "C-EUCJP"))
-                    return 0;
-                break;
-                case 'S':
-                  if (strcmp (locale, "C-SJIS"))
-                    return 0;
-                break;
-                case 'I':
-                  if (strcmp (locale, "C-ISO-8859-1"))
-                    return 0;
-                break;
-                default:
-                  return 0;
-                }
-            }
-          else 
-            {
-              if (strcmp (locale, "C") && strcmp (locale, ""))
-                return 0;
-              locale_name = "C"; /* C is always the default locale */
-            }
+        { 
+          if (strcmp (locale, "C") && strcmp (locale, "") &&
+              strcmp (locale, "C") && strcmp (locale, "C-JIS") && 
+              strcmp (locale, "C-EUCJP") && strcmp (locale, "C-SJIS"))
+            return 0;
 
-          if (category == LC_CTYPE)
-            {
-              strcpy (last_lc_ctype, __lc_ctype);
-              strcpy (__lc_ctype, locale_name);
+          strcpy (last_lc_ctype, lc_ctype);
+          strcpy (lc_ctype, locale);
 
-              __mb_cur_max = 1;
-              if (locale[1] == '-')
-                {
-                  switch (locale[2])
-                    {
-                    case 'U':
-                      __mb_cur_max = 6;
-                    break;
-                    case 'J':
-                      __mb_cur_max = 8;
-                    break;
-                    case 'E':
-                      __mb_cur_max = 2;
-                    break;
-                    case 'S':
-                      __mb_cur_max = 2;
-                    break;
-                    case 'I':
-                    default:
-                      __mb_cur_max = 1;
-                    }
-                }
-            }
+          if (!strcmp (locale, "C-JIS"))
+            __mb_cur_max = 8;
+          else if (strlen (locale) > 1)
+            __mb_cur_max = 2;
           else
-            {
-              strcpy (last_lc_messages, lc_messages);
-              strcpy (lc_messages, locale_name);
-
-              charset = "ISO-8859-1";
-              if (locale[1] == '-')
-                {
-                  switch (locale[2])
-                    {
-                    case 'U':
-                      charset = "UTF-8";
-                    break;
-                    case 'J':
-                      charset = "JIS";
-                    break;
-                    case 'E':
-                      charset = "EUCJP";
-                    break;
-                    case 'S':
-                      charset = "SJIS";
-                    break;
-                    case 'I':
-                      charset = "ISO-8859-1";
-                    break;
-                    default:
-                      return 0;
-                    }
-                }
-            }
+            __mb_cur_max = 1; 
         }
       p->_current_category = category;  
       p->_current_locale = locale;
 
       if (category == LC_CTYPE)
         return last_lc_ctype;
-      else if (category == LC_MESSAGES)
-        return last_lc_messages;
     }
   else
     {
       if (category == LC_CTYPE)
-        return __lc_ctype;
-      else if (category == LC_MESSAGES)
-        return lc_messages;
+        return lc_ctype;
     }
  
   return "C";
@@ -268,11 +170,6 @@ _DEFUN(_setlocale_r, (p, category, locale),
   
 }
 
-char *
-_DEFUN_VOID(__locale_charset)
-{
-  return charset;
-}
 
 struct lconv *
 _DEFUN(_localeconv_r, (data), 
diff --git a/newlib/libc/locale/locale.tex b/newlib/libc/locale/locale.tex
index 20dc5d2..7958a98 100644
--- a/newlib/libc/locale/locale.tex
+++ b/newlib/libc/locale/locale.tex
@@ -6,10 +6,10 @@ collating sequences and formatting conventions) that may be different
 depending on location or culture.  The @code{"C"} locale is the only
 one defined in the ANSI C standard.
 
-This is a minimal implementation, supporting only the required @code{"C"}
+This is a minimal implementation, supporting only the required @code{``C''}
 value for locale; strings representing other locales are not
-honored.  (@code{""} is also accepted; it represents the default locale
-for an implementation, here equivalent to @code{"C"}.
+honored.  (@code{``''} is also accepted; it represents the default locale
+for an implementation, here equivalent to  @code{``C''}.
 
 
 @file{locale.h} defines the structure @code{lconv} to collect the
@@ -18,13 +18,13 @@ information on a locale, with the following fields:
 @table @code
 @item char *decimal_point
 The decimal point character used to format ``ordinary'' numbers (all
-numbers except those referring to amounts of money).  @code{"."} in the
+numbers except those referring to amounts of money).  @code{``.''} in the
 C locale. 
 
 @item char *thousands_sep
 The character (if any) used to separate groups of digits, when
 formatting ordinary numbers.
-@code{""} in the C locale.
+@code{``''} in the C locale.
 
 @item char *grouping
 Specifications for how many digits to group (if any grouping is done at
@@ -33,36 +33,36 @@ character in the string represents the number of digits for the next
 group, and a value of @code{0} (that is, the string's trailing
 @code{NULL}) means to continue grouping digits using the last value
 specified.  Use @code{CHAR_MAX} to indicate that no further grouping is
-desired.  @code{""} in the C locale. 
+desired.  @code{``''} in the C locale. 
 
 @item char *int_curr_symbol
 The international currency symbol (first three characters), if any, and
 the character used to separate it from numbers.
-@code{""} in the C locale.
+@code{``''} in the C locale.
 
 @item char *currency_symbol
 The local currency symbol, if any.
-@code{""} in the C locale.
+@code{``''} in the C locale.
 
 @item char *mon_decimal_point
 The symbol used to delimit fractions in amounts of money.
-@code{""} in the C locale.
+@code{``''} in the C locale.
 
 @item char *mon_thousands_sep
 Similar to @code{thousands_sep}, but used for amounts of money.
-@code{""} in the C locale.
+@code{``''} in the C locale.
 
 @item char *mon_grouping
 Similar to @code{grouping}, but used for amounts of money.
-@code{""} in the C locale.
+@code{``''} in the C locale.
 
 @item char *positive_sign
 A string to flag positive amounts of money when formatting.
-@code{""} in the C locale.
+@code{``''} in the C locale.
 
 @item char *negative_sign
 A string to flag negative amounts of money when formatting.
-@code{""} in the C locale.
+@code{``''} in the C locale.
 
 @item char int_frac_digits
 The number of digits to display when formatting amounts of money to
diff --git a/newlib/libc/locale/nl_langinfo.3 b/newlib/libc/locale/nl_langinfo.3
deleted file mode 100644
index 96819e1..0000000
--- a/newlib/libc/locale/nl_langinfo.3
+++ /dev/null
@@ -1,90 +0,0 @@
-.\" Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/lib/libc/locale/nl_langinfo.3,v 1.4 2002/04/13 04:25:56 dd Exp $
-.\"
-.Dd May 3, 2001
-.Dt NL_LANGINFO 3
-.Os
-.Sh NAME
-.Nm nl_langinfo
-.Nd language information
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In langinfo.h
-.Ft char *
-.Fn nl_langinfo "nl_item item"
-.Sh DESCRIPTION
-The
-.Fn nl_langinfo
-function returns a pointer to a string containing information relevant to
-the particular language or cultural area defined in the program's locale.
-The manifest constant names and values of
-.Fa item
-are defined in
-.Aq Pa langinfo.h .
-.Pp
-Calls to
-.Fn setlocale
-with a category corresponding to the category of
-.Fa item ,
-or to the
-category
-.Dv LC_ALL ,
-may overwrite buffer pointed by the return value.
-.Sh EXAMPLES
-For example:
-.Pp
-.Dl nl_langinfo(ABDAY_1)
-.Pp
-would return a pointer to the string
-.Qq Li Dom
-if the identified language was
-Portuguese, and
-.Qq Li Sun
-if the identified language was English.
-.Sh RETURN VALUES
-In a locale where langinfo data is not defined,
-.Fn nl_langinfo
-returns a pointer to the corresponding string in the
-.Tn POSIX
-locale.
-In all locales,
-.Fn nl_langinfo
-returns a pointer to an empty string if
-.Fa item
-contains an invalid setting.
-.Sh SEE ALSO
-.Xr setlocale 3
-.Sh STANDARDS
-The
-.Fn nl_langinfo
-function conforms to
-.St -susv2 .
-.Sh HISTORY
-The
-.Fn nl_langinfo
-function first appeared in
-.Fx 4.6 .
diff --git a/newlib/libc/locale/nl_langinfo.c b/newlib/libc/locale/nl_langinfo.c
deleted file mode 100644
index b2923bd..0000000
--- a/newlib/libc/locale/nl_langinfo.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*-
- * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#include <locale.h>
-#include <langinfo.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "timelocal.h"
-#include "lnumeric.h"
-#include "lmonetary.h"
-#include "lmessages.h"
-
-#define TRANSITION_PERIOD_HACK
-
-#define _REL(BASE) ((int)item-BASE)
-
-char *
-_DEFUN(nl_langinfo, (item), 
-       nl_item item) {
-
-   char *ret, *s, *cs;
-   static char *csym = NULL;
-#ifdef TRANSITION_PERIOD_HACK
-   static char *cset = NULL;
-#endif /* TRANSITION_PERIOD_HACK */
-   char *nptr;
-
-   switch (item) {
-	case CODESET:
-		ret = "";
-		if ((s = setlocale(LC_CTYPE, NULL)) != NULL) {
-			if ((cs = strchr(s, '.')) != NULL) {
-				ret = cs + 1;
-#ifdef TRANSITION_PERIOD_HACK
-				if (strncmp(ret, "ISO_", 4) == 0) {
-					int slen = strlen(ret);
-
-                                        nptr = realloc(cset, slen);
-
-                                        if (!nptr && cset)
-                                          free (cset);
-
-                                        cset = nptr;
-					if (cset != NULL) {
-						strcpy(cset, "ISO");
-						strcat(cset, ret + 4);
-						ret = cset;
-					} else
-						ret = "";
-				} else if (strcmp(ret, "EUC") == 0) {
-					if (strncmp(s, "ja_JP", 5) == 0)
-						ret = "eucJP";
-					else if (strncmp(s, "ko_KR", 5) == 0)
-						ret = "eucKR";
-					else if (strncmp(s, "zh_CN", 5) == 0)
-						ret = "eucCN";
-				} else if (strcmp(ret, "ASCII") == 0)
-					ret = "US-ASCII";
-#endif /* TRANSITION_PERIOD_HACK */
-			} else if (strcmp(s, "C") == 0 ||
-				   strcmp(s, "POSIX") == 0
-#ifdef TRANSITION_PERIOD_HACK
-				   || strstr(s, "ASCII") != NULL
-#endif /* TRANSITION_PERIOD_HACK */
-				  )
-				ret = "US-ASCII";
-		}
-		break;
-	case D_T_FMT:
-		ret = (char *) __get_current_time_locale()->c_fmt;
-		break;
-	case D_FMT:
-		ret = (char *) __get_current_time_locale()->x_fmt;
-		break;
-	case T_FMT:
-		ret = (char *) __get_current_time_locale()->X_fmt;
-		break;
-	case T_FMT_AMPM:
-		ret = (char *) __get_current_time_locale()->ampm_fmt;
-		break;
-	case AM_STR:
-		ret = (char *) __get_current_time_locale()->am;
-		break;
-	case PM_STR:
-		ret = (char *) __get_current_time_locale()->pm;
-		break;
-	case DAY_1: case DAY_2: case DAY_3:
-	case DAY_4: case DAY_5: case DAY_6: case DAY_7:
-		ret = (char*) __get_current_time_locale()->weekday[_REL(DAY_1)];
-		break;
-	case ABDAY_1: case ABDAY_2: case ABDAY_3:
-	case ABDAY_4: case ABDAY_5: case ABDAY_6: case ABDAY_7:
-		ret = (char*) __get_current_time_locale()->wday[_REL(ABDAY_1)];
-		break;
-	case MON_1: case MON_2: case MON_3: case MON_4:
-	case MON_5: case MON_6: case MON_7: case MON_8:
-	case MON_9: case MON_10: case MON_11: case MON_12:
-		ret = (char*) __get_current_time_locale()->month[_REL(MON_1)];
-		break;
-	case ABMON_1: case ABMON_2: case ABMON_3: case ABMON_4:
-	case ABMON_5: case ABMON_6: case ABMON_7: case ABMON_8:
-	case ABMON_9: case ABMON_10: case ABMON_11: case ABMON_12:
-		ret = (char*) __get_current_time_locale()->mon[_REL(ABMON_1)];
-		break;
-	case ERA:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case ERA_D_FMT:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case ERA_D_T_FMT:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case ERA_T_FMT:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case ALT_DIGITS:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case RADIXCHAR:
-		ret = (char*) __get_current_numeric_locale()->decimal_point;
-		break;
-	case THOUSEP:
-		ret = (char*) __get_current_numeric_locale()->thousands_sep;
-		break;
-	case YESEXPR:
-		ret = (char*) __get_current_messages_locale()->yesexpr;
-		break;
-	case NOEXPR:
-		ret = (char*) __get_current_messages_locale()->noexpr;
-		break;
-	/*
-	 * All items marked with LEGACY are available, but not recomended
-	 * by SUSv2 to be used in portable applications since they're subject
-	 * to remove in future specification editions
-	 */
-	case YESSTR:            /* LEGACY  */
-		ret = (char*) __get_current_messages_locale()->yesstr;
-		break;
-	case NOSTR:             /* LEGACY  */
-		ret = (char*) __get_current_messages_locale()->nostr;
-		break;
-	case CRNCYSTR:
-		ret = "";
-		cs = (char*) __get_current_monetary_locale()->currency_symbol;
-		if (*cs != '\0') {
-			char pos = localeconv()->p_cs_precedes;
-
-			if (pos == localeconv()->n_cs_precedes) {
-				char psn = '\0';
-
-				if (pos == CHAR_MAX) {
-					if (strcmp(cs, __get_current_monetary_locale()->mon_decimal_point) == 0)
-						psn = '.';
-				} else
-					psn = pos ? '-' : '+';
-				if (psn != '\0') {
-					int clen = strlen(cs);
-
-                                        nptr = realloc(csym, clen + 2);
-                                        if (!nptr && csym)
-                                          free (csym);
-
-                                        csym = nptr;
-
-					if (csym != NULL) {
-						*csym = psn;
-						strcpy(csym + 1, cs);
-						ret = csym;
-					}
-				}
-			}
-		}
-		break;
-	case D_MD_ORDER:        /* local extension */
-		ret = (char *) __get_current_time_locale()->md_order;
-		break;
-	default:
-		ret = "";
-   }
-   return (ret);
-}
diff --git a/newlib/libc/locale/setlocale.h b/newlib/libc/locale/setlocale.h
deleted file mode 100644
index 3eb7698..0000000
--- a/newlib/libc/locale/setlocale.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (C) 1997 by Andrey A. Chernov, Moscow, Russia.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/locale/setlocale.h,v 1.4 2001/12/20 18:28:52 phantom Exp $
- */
-
-#ifndef _SETLOCALE_H_
-#define	_SETLOCALE_H_
-
-#define ENCODING_LEN 31
-#define CATEGORY_LEN 11
-
-extern char *_PathLocale;
-
-#endif /* !_SETLOCALE_H_ */
diff --git a/newlib/libc/locale/timelocal.c b/newlib/libc/locale/timelocal.c
deleted file mode 100644
index 5b097ad..0000000
--- a/newlib/libc/locale/timelocal.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * Copyright (c) 1997 FreeBSD Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-#include <stddef.h>
-
-#include "ldpart.h"
-#include "timelocal.h"
-
-static struct lc_time_T _time_locale;
-static int _time_using_locale;
-static char *time_locale_buf;
-
-#define LCTIME_SIZE (sizeof(struct lc_time_T) / sizeof(char *))
-
-static const struct lc_time_T	_C_time_locale = {
-	{
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-	}, {
-		"January", "February", "March", "April", "May", "June",
-		"July", "August", "September", "October", "November", "December"
-	}, {
-		"Sun", "Mon", "Tue", "Wed",
-		"Thu", "Fri", "Sat"
-	}, {
-		"Sunday", "Monday", "Tuesday", "Wednesday",
-		"Thursday", "Friday", "Saturday"
-	},
-
-	/* X_fmt */
-	"%H:%M:%S",
-
-	/*
-	 * x_fmt
-	 * Since the C language standard calls for
-	 * "date, using locale's date format," anything goes.
-	 * Using just numbers (as here) makes Quakers happier;
-	 * it's also compatible with SVR4.
-	 */
-	"%m/%d/%y",
-
-	/*
-	 * c_fmt
-	 */
-	"%a %b %e %H:%M:%S %Y",
-
-	/* am */
-	"AM",
-
-	/* pm */
-	"PM",
-
-	/* date_fmt */
-	"%a %b %e %H:%M:%S %Z %Y",
-	
-	/* alt_month
-	 * Standalone months forms for %OB
-	 */
-	{
-		"January", "February", "March", "April", "May", "June",
-		"July", "August", "September", "October", "November", "December"
-	},
-
-	/* md_order
-	 * Month / day order in dates
-	 */
-	"md",
-
-	/* ampm_fmt
-	 * To determine 12-hour clock format time (empty, if N/A)
-	 */
-	"%I:%M:%S %p"
-};
-
-struct lc_time_T *
-__get_current_time_locale(void) {
-	return (_time_using_locale
-		? &_time_locale
-		: (struct lc_time_T *)&_C_time_locale);
-}
-
-int
-__time_load_locale(const char *name) {
-
-	int	ret;
-
-	ret = __part_load_locale(name, &_time_using_locale,
-			time_locale_buf, "LC_TIME",
-			LCTIME_SIZE, LCTIME_SIZE,
-			(const char **)&_time_locale);
-
-	return (ret);
-}
diff --git a/newlib/libc/locale/timelocal.h b/newlib/libc/locale/timelocal.h
deleted file mode 100644
index 0b0a59a..0000000
--- a/newlib/libc/locale/timelocal.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1997-2002 FreeBSD Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/stdtime/timelocal.h,v 1.11 2002/01/24 15:07:44 phantom Exp $
- */
-
-#ifndef _TIMELOCAL_H_
-#define	_TIMELOCAL_H_
-
-/*
- * Private header file for the strftime and strptime localization
- * stuff.
- */
-struct lc_time_T {
-	const char	*mon[12];
-	const char	*month[12];
-	const char	*wday[7];
-	const char	*weekday[7];
-	const char	*X_fmt;
-	const char	*x_fmt;
-	const char	*c_fmt;
-	const char	*am;
-	const char	*pm;
-	const char	*date_fmt;
-	const char	*alt_month[12];
-	const char	*md_order;
-	const char	*ampm_fmt;
-};
-
-struct lc_time_T *__get_current_time_locale(void);
-int	__time_load_locale(const char *);
-
-#endif /* !_TIMELOCAL_H_ */
diff --git a/newlib/libc/machine/Makefile.in b/newlib/libc/machine/Makefile.in
index ecdf7ba..20b0547 100644
--- a/newlib/libc/machine/Makefile.in
+++ b/newlib/libc/machine/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,22 +57,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
@@ -80,10 +72,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
 libm_machine_dir = @libm_machine_dir@
@@ -96,9 +86,9 @@ AUTOMAKE_OPTIONS = cygnus
 
 SUBDIRS = $(machine_dir) .
 
-@HAVE_MACHINE_DIR_TRUE@MACHLIB = lib.a
+@HAVE_MACHINE_DIR_TRUE@MACHLIB = @HAVE_MACHINE_DIR_TRUE@lib.a
 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = $(MACHLIB)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@$(MACHLIB)
 
 ACLOCAL_AMFLAGS = -I ../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@@ -113,7 +103,7 @@ CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
 lib_a_SOURCES = lib.a.c
-lib_a_OBJECTS =  lib.a.$(OBJEXT)
+lib_a_OBJECTS =  lib.a.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -127,11 +117,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = gtar
 GZIP_ENV = --best
 SOURCES = lib.a.c
-OBJECTS = lib.a.$(OBJEXT)
+OBJECTS = lib.a.o
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
+.SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
 
@@ -140,7 +130,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  ../../acinclude.m4 \
-		../../aclocal.m4 ../../libtool.m4
+		../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -160,11 +150,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -173,7 +158,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -237,7 +221,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
+	  test "$$subdir" = "." && dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
diff --git a/newlib/libc/machine/a29k/Makefile.in b/newlib/libc/machine/a29k/Makefile.in
index 527ea0a..5513a8f 100644
--- a/newlib/libc/machine/a29k/Makefile.in
+++ b/newlib/libc/machine/a29k/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -125,8 +120,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/a29k/aclocal.m4 b/newlib/libc/machine/a29k/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/a29k/aclocal.m4
+++ b/newlib/libc/machine/a29k/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/a29k/configure b/newlib/libc/machine/a29k/configure
index 028b7b4..1802ae6 100755
--- a/newlib/libc/machine/a29k/configure
+++ b/newlib/libc/machine/a29k/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/aclocal.m4 b/newlib/libc/machine/aclocal.m4
index 35519ac..a5208f1 100644
--- a/newlib/libc/machine/aclocal.m4
+++ b/newlib/libc/machine/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,60 +284,41 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
 
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
+
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
 # Save cache, so that ltconfig can load it
 AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
 AC_CACHE_LOAD
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -431,43 +329,27 @@ AC_SUBST(LIBTOOL)dnl
 exec 5>>./config.log
 ])
 
-AC_DEFUN([AC_LIBTOOL_SETUP],
+AC_DEFUN(AC_LIBTOOL_SETUP,
 [AC_PREREQ(2.13)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 AC_REQUIRE([AC_PROG_NM])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
 [libtool_flags="$libtool_flags --enable-dlopen"])
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
@@ -477,20 +359,14 @@ AC_ARG_ENABLE(libtool-lock,
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -505,31 +381,12 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -537,56 +394,33 @@ ia64-*-hpux*)
   ;;
 
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+[*-*-cygwin* | *-*-mingw*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  ])
+])
 esac
 ])
 
 # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
 
 # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
 
 # AC_ENABLE_SHARED - implement the --enable-shared flag
 # Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
 <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -605,21 +439,21 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
 # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)])
 
 # AC_ENABLE_STATIC - implement the --enable-static flag
 # Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
 <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -638,8 +472,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])
 
 # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_STATIC(no)])
 
 
@@ -647,14 +480,14 @@ AC_ENABLE_STATIC(no)])
 # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(fast-install,
 changequote(<<, >>)dnl
 <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -672,98 +505,12 @@ esac],
 enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_FAST_INSTALL(no)])
 
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
 # AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -771,20 +518,16 @@ AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
+changequote(,)dnl
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
@@ -806,17 +549,17 @@ elif test "$with_gnu_ld" = yes; then
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL(lt_cv_path_LD,
+AC_CACHE_VAL(ac_cv_path_LD,
 [if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -825,9 +568,9 @@ AC_CACHE_VAL(lt_cv_path_LD,
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -837,240 +580,56 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_PROG_LD_GNU
 ])
 
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
 ])
 
-
 # AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
+AC_CACHE_VAL(ac_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi])
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
 ])
 
 # AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
+AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
+case "$host" in
+*-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
@@ -1084,39 +643,33 @@ esac
 ])
 
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case "$enable_ltdl_convenience" in
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   AC_CHECK_LIB(ltdl, main,
   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
   [if test x"$enable_ltdl_install" = xno; then
@@ -1127,8 +680,8 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
@@ -1136,91 +689,15 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   fi
 ])
 
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
 dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
 
 dnl This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])dnl
 
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libc/machine/arm/Makefile.am b/newlib/libc/machine/arm/Makefile.am
index 9d54813..ec5ca63 100644
--- a/newlib/libc/machine/arm/Makefile.am
+++ b/newlib/libc/machine/arm/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = setjmp.S access.c
+lib_a_SOURCES =
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/arm/Makefile.in b/newlib/libc/machine/arm/Makefile.in
index 6e84cc0..5513a8f 100644
--- a/newlib/libc/machine/arm/Makefile.in
+++ b/newlib/libc/machine/arm/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = setjmp.S access.c
+lib_a_SOURCES = 
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@@ -103,11 +98,7 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o access.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+lib_a_OBJECTS = 
 DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
 
 
@@ -129,8 +120,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -170,35 +160,9 @@ lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
 	-rm -f lib.a
 	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
 	$(RANLIB) lib.a
-
 tags: TAGS
+TAGS:
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
 
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -286,24 +250,24 @@ distclean-generic:
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
+clean-am:  clean-noinstLIBRARIES clean-compile clean-generic \
 		mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-generic clean-am
 
 distclean: distclean-am
 	-rm -f config.status
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-compile maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -313,8 +277,7 @@ maintainer-clean: maintainer-clean-am
 .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+maintainer-clean-compile tags distdir info-am info dvi-am dvi check \
 check-am installcheck-am installcheck install-info-am install-info \
 install-exec-am install-exec install-data-am install-data install-am \
 install uninstall-am uninstall all-redirect all-am all installdirs \
diff --git a/newlib/libc/machine/arm/access.c b/newlib/libc/machine/arm/access.c
deleted file mode 100644
index 8e08b3a..0000000
--- a/newlib/libc/machine/arm/access.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* This is file ACCESS.C */
-/*
- * Copyright (C) 1993 DJ Delorie
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms is permitted
- * provided that the above copyright notice and following paragraph are
- * duplicated in all such forms.
- *
- * This file is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-int access(const char *fn, int flags)
-{
-  struct stat s;
-  if (stat(fn, &s))
-    return -1;
-  if (s.st_mode & S_IFDIR)
-    return 0;
-  if (flags & W_OK)
-  {
-    if (s.st_mode & S_IWRITE)
-      return 0;
-    return -1;
-  }
-  return 0;
-}
-	
diff --git a/newlib/libc/machine/arm/aclocal.m4 b/newlib/libc/machine/arm/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/arm/aclocal.m4
+++ b/newlib/libc/machine/arm/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/arm/configure b/newlib/libc/machine/arm/configure
index 028b7b4..1802ae6 100755
--- a/newlib/libc/machine/arm/configure
+++ b/newlib/libc/machine/arm/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/arm/machine/endian.h b/newlib/libc/machine/arm/machine/endian.h
deleted file mode 100644
index 5484427..0000000
--- a/newlib/libc/machine/arm/machine/endian.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* ARM configuration file */
-
-#ifndef _MACHINE_ENDIAN_H
-# define _MACHINE_ENDIAN_H
-
-#ifdef __ARMEB__
-#define BYTE_ORDER BIG_ENDIAN
-#else
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
-#endif
diff --git a/newlib/libc/machine/arm/machine/param.h b/newlib/libc/machine/arm/machine/param.h
deleted file mode 100644
index 595294c..0000000
--- a/newlib/libc/machine/arm/machine/param.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* ARM configuration file; HZ is 100 rather than the default 60 */
-
-#ifndef _MACHINE_PARAM_H
-# define _MACHINE_PARAM_H
-
-# define HZ (100)
-
-#ifdef __ARMEB__
-#define BYTE_ORDER BIG_ENDIAN
-#else
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
-#endif
diff --git a/newlib/libc/machine/arm/setjmp.S b/newlib/libc/machine/arm/setjmp.S
deleted file mode 100644
index 84e7cd7..0000000
--- a/newlib/libc/machine/arm/setjmp.S
+++ /dev/null
@@ -1,162 +0,0 @@
-/* This is a simple version of setjmp and longjmp.
-
-   Nick Clifton, Cygnus Solutions, 13 June 1997.  */
-
-/* ANSI concatenation macros.  */
-#define CONCAT(a, b)  CONCAT2(a, b)
-#define CONCAT2(a, b) a##b
-
-#ifndef __USER_LABEL_PREFIX__
-#error  __USER_LABEL_PREFIX__ not defined
-#endif
-
-#define SYM(x) CONCAT (__USER_LABEL_PREFIX__, x)
-
-#ifdef __ELF__
-#define TYPE(x) .type SYM(x),function
-#define SIZE(x) .size SYM(x), . - SYM(x)
-#else
-#define TYPE(x)
-#define SIZE(x)
-#endif
-
-/* Arm/Thumb interworking support:
-
-   The interworking scheme expects functions to use a BX instruction
-   to return control to their parent.  Since we need this code to work
-   in both interworked and non-interworked environments as well as with
-   older processors which do not have the BX instruction we do the 
-   following:
-	Test the return address.
-	If the bottom bit is clear perform an "old style" function exit.
-	(We know that we are in ARM mode and returning to an ARM mode caller).
-	Otherwise use the BX instruction to perform the function exit.
-
-   We know that we will never attempt to perform the BX instruction on 
-   an older processor, because that kind of processor will never be 
-   interworked, and a return address with the bottom bit set will never 
-   be generated.
-
-   In addition, we do not actually assemble the BX instruction as this would
-   require us to tell the assembler that the processor is an ARM7TDMI and
-   it would store this information in the binary.  We want this binary to be
-   able to be linked with binaries compiled for older processors however, so
-   we do not want such information stored there.  
-
-   If we are running using the APCS-26 convention however, then we never
-   test the bottom bit, because this is part of the processor status.  
-   Instead we just do a normal return, since we know that we cannot be 
-   returning to a Thumb caller - the Thumb does not support APCS-26.
-	
-   Function entry is much simpler.  If we are compiling for the Thumb we 
-   just switch into ARM mode and then drop through into the rest of the
-   function.  The function exit code will take care of the restore to
-   Thumb mode.
-   
-   For Thumb-2 do everything in Thumb mode.  */
-
-#ifdef __APCS_26__
-#define RET	movs		pc, lr
-#elif defined(__thumb2__)
-#define RET	bx lr
-#else
-#define RET	tst		lr, #1; \
-	        moveq		pc, lr ; \
-.word           0xe12fff1e	/* bx lr */
-#endif
-
-#ifdef __thumb2__
-.macro COND where when 
-	i\where	\when
-.endm
-#else
-.macro COND where when 
-.endm
-#endif
-
-#if defined(__thumb2__)
-.syntax unified
-.macro MODE
-	.thumb
-	.thumb_func
-.endm
-.macro PROLOGUE name
-.endm
-
-#elif defined(__thumb__)
-#define	MODE		.thumb_func
-.macro PROLOGUE name
-	.code 16
-	bx	pc
-	nop	
-	.code 32
-SYM (.arm_start_of.\name):
-.endm
-#else /* Arm */
-#define	MODE		.code 32
-.macro PROLOGUE name
-.endm
-#endif
-	
-.macro FUNC_START name
-	.text
-	.align 2
-	MODE
-	.globl SYM (\name)
-	TYPE (\name)
-SYM (\name):
-	PROLOGUE \name
-.endm
-
-.macro FUNC_END name
-	RET
-	SIZE (\name)
-.endm
-	
-/* --------------------------------------------------------------------
-                 int setjmp (jmp_buf); 
-   -------------------------------------------------------------------- */
-	
-	FUNC_START setjmp
-
-	/* Save all the callee-preserved registers into the jump buffer.  */
-	stmea		a1!, { v1-v7, fp, ip, sp, lr }
-	
-#if 0	/* Simulator does not cope with FP instructions yet.  */
-#ifndef __SOFTFP__
-	/* Save the floating point registers.  */
-	sfmea		f4, 4, [a1]
-#endif
-#endif		
-	/* When setting up the jump buffer return 0.  */
-	mov		a1, #0
-
-	FUNC_END setjmp
-	
-/* --------------------------------------------------------------------
-		volatile void longjmp (jmp_buf, int);
-   -------------------------------------------------------------------- */
-	
-	FUNC_START longjmp
-
-	/* If we have stack extension code it ought to be handled here.  */
-	
-	/* Restore the registers, retrieving the state when setjmp() was called.  */
-	ldmfd		a1!, { v1-v7, fp, ip, sp, lr }
-	
-#if 0	/* Simulator does not cope with FP instructions yet.  */
-#ifndef __SOFTFP__
-	/* Restore floating point registers as well.  */
-	lfmfd		f4, 4, [a1]
-#endif
-#endif	
-	/* Put the return value into the integer result register.
-	   But if it is zero then return 1 instead.  */	
-	movs		a1, a2
-#ifdef __thumb2__
-	it		eq
-#endif
-	moveq		a1, #1
-
-	FUNC_END longjmp
-
diff --git a/newlib/libc/machine/configure b/newlib/libc/machine/configure
index 7283568..90a077a 100755
--- a/newlib/libc/machine/configure
+++ b/newlib/libc/machine/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -40,8 +32,6 @@ ac_help="$ac_help
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -59,6 +49,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -173,6 +164,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -343,6 +335,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -508,12 +505,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -573,7 +574,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -827,79 +827,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -917,34 +854,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:948: checking host system type" >&5
+echo "configure:864: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -964,52 +880,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:969: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:987: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1025,21 +900,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1030: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:905: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1043: checking for working autoconf" >&5
+echo "configure:918: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1051,21 +926,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1056: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:931: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1069: checking for working autoheader" >&5
+echo "configure:944: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1078,7 +953,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1082: checking for working makeinfo" >&5
+echo "configure:957: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1103,7 +978,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
+echo "configure:982: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1133,7 +1008,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
+echo "configure:1012: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1182,7 +1057,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1186: checking whether we are using GNU C" >&5
+echo "configure:1061: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1191,7 +1066,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1206,7 +1081,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1210: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1085: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1234,10 +1109,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1118: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_word" >&5
+echo "configure:1139: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1269,7 +1167,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_word" >&5
+echo "configure:1171: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1301,7 +1199,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
+echo "configure:1203: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1333,7 +1231,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1337: checking for $ac_word" >&5
+echo "configure:1235: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1378,7 +1276,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1382: checking for a BSD compatible install" >&5
+echo "configure:1280: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1431,11 +1329,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1334: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1364,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1368: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,10 +1374,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1503,6 +1398,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1513,52 +1420,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1567,12 +1428,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1587,7 +1442,7 @@ if test "${use_libtool}" = "yes"; then
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -1610,7 +1465,7 @@ fi
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -1633,7 +1488,7 @@ fi
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -1652,10 +1507,40 @@ else
   enable_fast_install=yes
 fi
 
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1514: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1544: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1570,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1574: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1621,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1625: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1653,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1657: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1664,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1668 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1695,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1704: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1709,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1728,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1732: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1883,18 +1768,12 @@ else
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+echo "configure:1775: checking for ld used by GCC" >&5
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
@@ -1916,12 +1795,12 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1799: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1802: checking for non-GNU ld" >&5
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -z "$LD"; then
@@ -1929,11 +1808,11 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -1942,11 +1821,11 @@ else
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   echo "$ac_t""$LD" 1>&6
 else
@@ -1954,74 +1833,59 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
+echo "configure:1837: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi
 fi
 
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
+echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
 
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
+echo "configure:1853: checking for BSD-compatible nm" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi
 fi
 
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:1889: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2041,482 +1905,14 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
 
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 
 libtool_flags="$libtool_flags --enable-win32-dll"
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
@@ -2528,25 +1924,14 @@ fi
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
+  echo '#line 1933 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -2561,48 +1946,24 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:1955: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1960 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2612,13 +1973,6 @@ else
   lt_cv_cc_needs_belf=no
 fi
 rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
 fi
 
 echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
@@ -2628,11 +1982,11 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   fi
   ;;
 
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+*-*-cygwin* | *-*-mingw*)
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:1990: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2018,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2022: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2053,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2057: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2085,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2089: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2120,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2124: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2152,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2156: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2830,77 +2184,8 @@ else
 fi
 fi
 
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  
+
 esac
 
 
@@ -2954,14 +2239,12 @@ rm -f confcache
 
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -2975,7 +2258,7 @@ fi
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -2984,11 +2267,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 # clobbered by the next message.
 exec 5>>./config.log
 
-  
-
-  
-	 
-	 
 fi
 
 if test -n "${machine_dir}"; then
@@ -3151,24 +2429,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -3181,6 +2447,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -3189,26 +2460,14 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
 s%@machine_dir@%$machine_dir%g
 s%@sys_dir@%$sys_dir%g
 s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@OBJDUMP@%$OBJDUMP%g
 s%@LIBTOOL@%$LIBTOOL%g
@@ -3223,7 +2482,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/cris/Makefile.am b/newlib/libc/machine/cris/Makefile.am
deleted file mode 100644
index 2c746fa..0000000
--- a/newlib/libc/machine/cris/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-# We also make a library with just the useful
-# machine-but-not-system-specific functions, usable as an add-on
-# by itself together with e.g. uclibc.
-toollib_LIBRARIES = libic.a
-
-lib_a_SOURCES = setjmp.c memcpy.c memset.c memmove.c libcdtor.c
-
-libic_a_SOURCES = setjmp.c memcpy.c memset.c memmove.c libcdtor.c
-tooldir = $(exec_prefix)/$(host_alias)
-toollibdir = $(tooldir)/lib$(MULTISUBDIR)
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/cris/Makefile.in b/newlib/libc/machine/cris/Makefile.in
deleted file mode 100644
index 97d7ece..0000000
--- a/newlib/libc/machine/cris/Makefile.in
+++ /dev/null
@@ -1,382 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-# We also make a library with just the useful
-# machine-but-not-system-specific functions, usable as an add-on
-# by itself together with e.g. uclibc.
-toollib_LIBRARIES = libic.a
-
-lib_a_SOURCES = setjmp.c memcpy.c memset.c memmove.c libcdtor.c
-
-libic_a_SOURCES = setjmp.c memcpy.c memset.c memmove.c libcdtor.c
-tooldir = $(exec_prefix)/$(host_alias)
-toollibdir = $(tooldir)/lib$(MULTISUBDIR)
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES) $(toollib_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o memcpy.o memset.o memmove.o libcdtor.o
-libic_a_LIBADD = 
-libic_a_OBJECTS =  setjmp.o memcpy.o memset.o memmove.o libcdtor.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(libic_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(libic_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-mostlyclean-toollibLIBRARIES:
-
-clean-toollibLIBRARIES:
-	-test -z "$(toollib_LIBRARIES)" || rm -f $(toollib_LIBRARIES)
-
-distclean-toollibLIBRARIES:
-
-maintainer-clean-toollibLIBRARIES:
-
-install-toollibLIBRARIES: $(toollib_LIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(toollibdir)
-	@list='$(toollib_LIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(toollibdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(toollibdir)/$$p; \
-	  else :; fi; \
-	done
-	@$(POST_INSTALL)
-	@list='$(toollib_LIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(RANLIB) $(DESTDIR)$(toollibdir)/$$p"; \
-	    $(RANLIB) $(DESTDIR)$(toollibdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-toollibLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(toollib_LIBRARIES)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(toollibdir)/$$p; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-libic.a: $(libic_a_OBJECTS) $(libic_a_DEPENDENCIES)
-	-rm -f libic.a
-	$(AR) cru libic.a $(libic_a_OBJECTS) $(libic_a_LIBADD)
-	$(RANLIB) libic.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-toollibLIBRARIES
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-toollibLIBRARIES
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(toollibdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES \
-		mostlyclean-toollibLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-toollibLIBRARIES clean-compile \
-		clean-tags clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-toollibLIBRARIES \
-		distclean-compile distclean-tags distclean-generic \
-		clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-toollibLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-toollibLIBRARIES distclean-toollibLIBRARIES \
-clean-toollibLIBRARIES maintainer-clean-toollibLIBRARIES \
-uninstall-toollibLIBRARIES install-toollibLIBRARIES mostlyclean-compile \
-distclean-compile clean-compile maintainer-clean-compile tags \
-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-distdir info-am info dvi-am dvi check check-am installcheck-am \
-installcheck install-info-am install-info install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/cris/aclocal.m4 b/newlib/libc/machine/cris/aclocal.m4
deleted file mode 100644
index 55d5e67..0000000
--- a/newlib/libc/machine/cris/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/cris/configure b/newlib/libc/machine/cris/configure
deleted file mode 100755
index 55475a5..0000000
--- a/newlib/libc/machine/cris/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=setjmp.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/cris/configure.in b/newlib/libc/machine/cris/configure.in
deleted file mode 100644
index 7764a7a..0000000
--- a/newlib/libc/machine/cris/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/cris configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(setjmp.c)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/cris/include/pthread.h b/newlib/libc/machine/cris/include/pthread.h
deleted file mode 100644
index d872d04..0000000
--- a/newlib/libc/machine/cris/include/pthread.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* pthread.h dummy.
-   Copyright (C) 2001, 2004, 2005 Axis Communications AB.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* Simple fallback-include to enable thread-enabled exception support
-   for libgcc, but with posix-interface to a default-dummy, so a posix
-   library can optionally be linked in, which isn't possible if
-   gthr-single.h is used.  No other use is supported; *DO NOT* think
-   this gives you a valid pthread interface to use in your applications.  */
-
-#ifndef _PTHREAD_FAKE
-#define _PTHREAD_FAKE
-
-#ifdef __cplusplus
-extern "C" {
-# ifndef __THROW
-#  define __THROW throw ()
-# endif
-#else
-# ifndef __THROW
-#  define __THROW
-# endif
-#endif
-
-typedef int pthread_once_t;
-typedef unsigned int pthread_key_t;
-
-/* This must be layout-compatible with the linuxthreads type.  */
-typedef struct
-{
-  int a, b;
-  void *c;
-  int d;
-  struct { long int e; int f; } g;
-} pthread_mutex_t;
-
-/* This give bits equal to the linuxthreads initializer.  */
-#define PTHREAD_MUTEX_INITIALIZER \
-  {0, 0, 0, 0, {0, 0}}
-
-#define PTHREAD_ONCE_INIT 0
-
-/* This isn't the right prototype, but it let's us get away with not
-   defining a lot of datatypes.  */
-extern int pthread_create (void) __THROW;
-
-extern int pthread_once (pthread_once_t *, void (*) (void)) __THROW;
-
-extern int pthread_key_create (pthread_key_t *, void (*) (void *)) __THROW;
-
-extern int pthread_setspecific (pthread_key_t, const void *) __THROW;
-
-extern void *pthread_getspecific (pthread_key_t) __THROW;
-
-extern int pthread_mutex_lock (pthread_mutex_t *) __THROW;
-
-extern int pthread_key_delete (pthread_key_t) __THROW;
-
-extern int pthread_mutex_trylock (pthread_mutex_t *) __THROW;
-
-extern int pthread_mutex_unlock (pthread_mutex_t *) __THROW;
-
-#ifdef __cplusplus
-}
-#endif
-
-#undef __THROW
-
-#endif /* not _PTHREAD_FAKE */
diff --git a/newlib/libc/machine/cris/libcdtor.c b/newlib/libc/machine/cris/libcdtor.c
deleted file mode 100644
index 3273477..0000000
--- a/newlib/libc/machine/cris/libcdtor.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Call ctors and dtors from elinux a.out shared libraries.
-   Copyright (C) 1999, 2000, 2003, 2004, 2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-typedef void (*vfnp) (void);
-
-/* The guts of the _Libctors and _Libdtors is "optimized" away into
-   empty functions when the definition is visible as well.  Simplest
-   solution is to emit the definitions as asm.  We have no .previous
-   directive in a.out, so we rely on the fact that everything in this
-   file goes into the .text section.  */
-__asm__
-(
- ".text\n\t.global .$global.lib.ctors\n.$global.lib.ctors:\n\t.dword 0"
-);
-__asm__
-(
- ".text\n\t.global .$global.lib.dtors\n.$global.lib.dtors:\n\t.dword 0"
-);
-
-extern vfnp * const _Ctors asm(".$global.lib.ctors");
-extern vfnp * const _Dtors asm(".$global.lib.dtors");
-
-/* We better provide weak empty ctor and dtor lists, since they are
-   not created if the main program does not have ctor/dtors.  Because
-   it's otherwise not used, GCC trunk "Mon Jul 25 22:33:14 UTC 2005"
-   thinks it can remove defaultors, so we need to artificially mark it
-   as used.  FIXME: Perhaps a GCC bug.  */
-
-static vfnp const defaultors[] __attribute__ ((__used__)) = {0, 0};
-
-extern vfnp * __CTOR_LIST__ __attribute__ ((weak, alias ("defaultors")));
-extern vfnp * __DTOR_LIST__ __attribute__ ((weak, alias ("defaultors")));
-
-void
-_Libctors (void)
-{
-  const vfnp *firstor = _Ctors;
-  const vfnp *ctors;
-
-  /* Have to find the last ctor; they will run in opposite order as in
-     the table. */
-  if (firstor != 0 && *firstor != 0)
-    {
-      for (ctors = firstor; *ctors != 0; ctors++)
-	;
-
-      while (--ctors != firstor)
-	{
-	  (**ctors)();
-	}
-
-      (**ctors)();
-    }
-}
-
-void
-_Libdtors(void)
-{
-  const vfnp *dtors = _Dtors;
-
-  if (dtors)
-    while (*dtors != 0)
-      {
-	(**dtors++) ();
-      }
-}
diff --git a/newlib/libc/machine/cris/memcpy.c b/newlib/libc/machine/cris/memcpy.c
deleted file mode 100644
index c7bd6eb..0000000
--- a/newlib/libc/machine/cris/memcpy.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* A memcpy for CRIS.
-   Copyright (C) 1994-2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* FIXME: This file should really only be used for reference, as the
-   result is somewhat depending on gcc generating what we expect rather
-   than what we describe.  An assembly file should be used instead.  */
-
-#include <stddef.h>
-
-/* Break even between movem and move16 is really at 38.7 * 2, but
-   modulo 44, so up to the next multiple of 44, we use ordinary code.  */
-#define MEMCPY_BY_BLOCK_THRESHOLD (44 * 2)
-
-/* No name ambiguities in this file.  */
-__asm__ (".syntax no_register_prefix");
-
-void *
-memcpy(void *pdst, const void *psrc, size_t pn)
-{
-  /* Now we want the parameters put in special registers.
-     Make sure the compiler is able to make something useful of this.
-     As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
-
-     If gcc was allright, it really would need no temporaries, and no
-     stack space to save stuff on.  */
-
-  register void *return_dst __asm__ ("r10") = pdst;
-  register unsigned char *dst __asm__ ("r13") = pdst;
-  register unsigned const char *src __asm__ ("r11") = psrc;
-  register int n __asm__ ("r12") = pn;
-
-  /* When src is aligned but not dst, this makes a few extra needless
-     cycles.  I believe it would take as many to check that the
-     re-alignment was unnecessary.  */
-  if (((unsigned long) dst & 3) != 0
-      /* Don't align if we wouldn't copy more than a few bytes; so we
-	 don't have to check further for overflows.  */
-      && n >= 3)
-  {
-    if ((unsigned long) dst & 1)
-      {
-	n--;
-	*dst = *src;
-	src++;
-	dst++;
-      }
-
-    if ((unsigned long) dst & 2)
-      {
-	n -= 2;
-	*(short *) dst = *(short *) src;
-	src += 2;
-	dst += 2;
-      }
-  }
-
-  /* Decide which copying method to use.  */
-  if (n >= MEMCPY_BY_BLOCK_THRESHOLD)
-    {
-      /* It is not optimal to tell the compiler about clobbering any
-	 registers; that will move the saving/restoring of those registers
-	 to the function prologue/epilogue, and make non-movem sizes
-	 suboptimal.  */
-      __asm__ volatile
-	("\
-	 ;; GCC does promise correct register allocations, but let's	\n\
-	 ;; make sure it keeps its promises.				\n\
-	 .ifnc %0-%1-%2,$r13-$r11-$r12					\n\
-	 .error \"GCC reg alloc bug: %0-%1-%4 != $r13-$r12-$r11\"	\n\
-	 .endif								\n\
-									\n\
-	 ;; Save the registers we'll use in the movem process		\n\
-	 ;; on the stack.						\n\
-	 subq	11*4,sp							\n\
-	 movem	r10,[sp]						\n\
-									\n\
-	 ;; Now we've got this:						\n\
-	 ;; r11 - src							\n\
-	 ;; r13 - dst							\n\
-	 ;; r12 - n							\n\
-									\n\
-	 ;; Update n for the first loop.				\n\
-	 subq	 44,r12							\n\
-0:									\n\
-"
-#ifdef __arch_common_v10_v32
-	 /* Cater to branch offset difference between v32 and v10.  We
-	    assume the branch below has an 8-bit offset.  */
-"	 setf\n"
-#endif
-"	 movem	[r11+],r10						\n\
-	 subq	44,r12							\n\
-	 bge	 0b							\n\
-	 movem	r10,[r13+]						\n\
-									\n\
-	 ;; Compensate for last loop underflowing n.			\n\
-	 addq	44,r12							\n\
-									\n\
-	 ;; Restore registers from stack.				\n\
-	 movem [sp+],r10"
-
-	 /* Outputs.  */
-	 : "=r" (dst), "=r" (src), "=r" (n)
-
-	 /* Inputs.  */
-	 : "0" (dst), "1" (src), "2" (n));
-    }
-
-  while (n >= 16)
-    {
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-
-      n -= 16;
-    }
-
-  switch (n)
-    {
-    case 0:
-      break;
-
-    case 1:
-      *dst = *src;
-      break;
-
-    case 2:
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 3:
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-
-    case 4:
-      *(long *) dst = *(long *) src;
-      break;
-
-    case 5:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *dst = *src;
-      break;
-
-    case 6:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 7:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-
-    case 8:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src;
-      break;
-
-    case 9:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *dst = *src;
-      break;
-
-    case 10:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 11:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-
-    case 12:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src;
-      break;
-
-    case 13:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *dst = *src;
-      break;
-
-    case 14:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 15:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-    }
-
-  return return_dst;
-}
diff --git a/newlib/libc/machine/cris/memmove.c b/newlib/libc/machine/cris/memmove.c
deleted file mode 100644
index b022eaa..0000000
--- a/newlib/libc/machine/cris/memmove.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* A memmove for CRIS.
-   Copyright (C) 2000-2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* FIXME: This file should really only be used for reference, as the
-   result is somewhat depending on gcc generating what we expect rather
-   than what we describe.  An assembly file should be used instead.
-
-   Even worse, we base it on memcpy, on the assumption that overlapping
-   moves are rare, and we will do no worse than the generic memmove.  */
-
-#include <stddef.h>
-
-/* Break even between movem and move16 is really at 38.7 * 2, but
-   modulo 44, so up to the next multiple of 44, we use ordinary code.  */
-#define MEMMOVE_BY_BLOCK_THRESHOLD (44 * 2)
-
-/* No name ambiguities in this file.  */
-__asm__ (".syntax no_register_prefix");
-
-void *
-memmove(void *pdst, const void *psrc, size_t pn)
-{
-  /* Now we want the parameters put in special registers.
-     Make sure the compiler is able to make something useful of this.
-     As it is now: r10 -> r13; r11 -> r11 (nop); r12 -> r12 (nop).
-
-     If gcc was allright, it really would need no temporaries, and no
-     stack space to save stuff on.  */
-
-  register void *return_dst __asm__ ("r10") = pdst;
-  register unsigned char *dst __asm__ ("r13") = pdst;
-  register unsigned const char *src __asm__ ("r11") = psrc;
-  register int n __asm__ ("r12") = pn;
-
-  /* Check and handle overlap.  */
-  if (src < dst && dst < src + n)
-    {
-      /* Destructive overlap.  We could optimize this, but we don't (for
-	 the moment).  */
-      src += n;
-      dst += n;
-      while (n--)
-	{
-	  *--dst = *--src;
-	}
-
-      return return_dst;
-    }
-  /* Whew, no overlap.  Proceed as with memcpy.  We could call it instead
-     of having a copy here.  That would spoil some of the optimization, so
-     we take the trouble with having two copies.  */
-
-  /* When src is aligned but not dst, this makes a few extra needless
-     cycles.  I believe it would take as many to check that the
-     re-alignment was unnecessary.  */
-  if (((unsigned long) dst & 3) != 0
-      /* Don't align if we wouldn't copy more than a few bytes; so we
-	 don't have to check further for overflows.  */
-      && n >= 3)
-  {
-    if ((unsigned long) dst & 1)
-      {
-	n--;
-	*dst = *src;
-	src++;
-	dst++;
-      }
-
-    if ((unsigned long) dst & 2)
-      {
-	n -= 2;
-	*(short *) dst = *(short *) src;
-	src += 2;
-	dst += 2;
-      }
-  }
-
-  /* Decide which copying method to use.  */
-  if (n >= MEMMOVE_BY_BLOCK_THRESHOLD)
-    {
-      /* It is not optimal to tell the compiler about clobbering any
-	 registers; that will move the saving/restoring of those registers
-	 to the function prologue/epilogue, and make non-movem sizes
-	 suboptimal.  */
-      __asm__ volatile
-	("\
-	 ;; GCC does promise correct register allocations, but let's	\n\
-	 ;; make sure it keeps its promises.				\n\
-	 .ifnc %0-%1-%2,$r13-$r11-$r12					\n\
-	 .error \"GCC reg alloc bug: %0-%1-%4 != $r13-$r12-$r11\"	\n\
-	 .endif								\n\
-									\n\
-	 ;; Save the registers we'll use in the movem process		\n\
-	 ;; on the stack.						\n\
-	 subq	11*4,sp							\n\
-	 movem	r10,[sp]						\n\
-									\n\
-	 ;; Now we've got this:						\n\
-	 ;; r11 - src							\n\
-	 ;; r13 - dst							\n\
-	 ;; r12 - n							\n\
-									\n\
-	 ;; Update n for the first loop.				\n\
-	 subq	 44,r12							\n\
-0:									\n\
-"
-#ifdef __arch_common_v10_v32
-	 /* Cater to branch offset difference between v32 and v10.  We
-	    assume the branch below has an 8-bit offset.  */
-"	 setf\n"
-#endif
-"	 movem	[r11+],r10						\n\
-	 subq	44,r12							\n\
-	 bge	 0b							\n\
-	 movem	r10,[r13+]						\n\
-									\n\
-	 ;; Compensate for last loop underflowing n.			\n\
-	 addq	44,r12							\n\
-									\n\
-	 ;; Restore registers from stack.				\n\
-	 movem [sp+],r10"
-
-	 /* Outputs.  */
-	 : "=r" (dst), "=r" (src), "=r" (n)
-
-	 /* Inputs.  */
-	 : "0" (dst), "1" (src), "2" (n));
-    }
-
-  while (n >= 16)
-    {
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-
-      n -= 16;
-    }
-
-  switch (n)
-    {
-    case 0:
-      break;
-
-    case 1:
-      *dst = *src;
-      break;
-
-    case 2:
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 3:
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-
-    case 4:
-      *(long *) dst = *(long *) src;
-      break;
-
-    case 5:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *dst = *src;
-      break;
-
-    case 6:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 7:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-
-    case 8:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src;
-      break;
-
-    case 9:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *dst = *src;
-      break;
-
-    case 10:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 11:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-
-    case 12:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src;
-      break;
-
-    case 13:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *dst = *src;
-      break;
-
-    case 14:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src;
-      break;
-
-    case 15:
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(long *) dst = *(long *) src; dst += 4; src += 4;
-      *(short *) dst = *(short *) src; dst += 2; src += 2;
-      *dst = *src;
-      break;
-    }
-
-  return return_dst;
-}
diff --git a/newlib/libc/machine/cris/memset.c b/newlib/libc/machine/cris/memset.c
deleted file mode 100644
index c94ea9b..0000000
--- a/newlib/libc/machine/cris/memset.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/* A memset for CRIS.
-   Copyright (C) 1999-2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* FIXME: This file should really only be used for reference, as the
-   result is somewhat depending on gcc generating what we expect rather
-   than what we describe.  An assembly file should be used instead.  */
-
-/* Note the multiple occurrence of the expression "12*4", including the
-   asm.  It is hard to get it into the asm in a good way.  Thus better to
-   expose the problem everywhere: no macro.  */
-
-/* Assuming one cycle per dword written or read (ok, not really true; the
-   world is not ideal), and one cycle per instruction, then 43+3*(n/48-1)
-   <= 24+24*(n/48-1) so n >= 45.7; n >= 0.9; we win on the first full
-   48-byte block to set.  */
-
-#define MEMSET_BY_BLOCK_THRESHOLD (1 * 48)
-
-/* No name ambiguities in this file.  */
-__asm__ (".syntax no_register_prefix");
-
-void *memset(void *pdst, int c, unsigned int plen)
-{
-  /* Now we want the parameters in special registers.  Make sure the
-     compiler does something usable with this.  */
-
-  register char *return_dst __asm__ ("r10") = pdst;
-  register int n __asm__ ("r12") = plen;
-  register int lc __asm__ ("r11") = c;
-
-  /* Most apps use memset sanely.  Memsetting about 3..4 bytes or less get
-     penalized here compared to the generic implementation.  */
-
-  /* This is fragile performancewise at best.  Check with newer GCC
-     releases, if they compile cascaded "x |= x << 8" to sane code.  */
-  __asm__("movu.b %0,r13						\n\
-	   lslq 8,r13							\n\
-	   move.b %0,r13						\n\
-	   move.d r13,%0						\n\
-	   lslq 16,r13							\n\
-	   or.d r13,%0"
-          : "=r" (lc)		/* Inputs.  */
-	  : "0" (lc)		/* Outputs.  */
-	  : "r13");		/* Trash.  */
-
-  {
-    register char *dst __asm__ ("r13") = pdst;
-
-    if (((unsigned long) pdst & 3) != 0
-	/* Oops! n = 0 must be a valid call, regardless of alignment.  */
-	&& n >= 3)
-      {
-	if ((unsigned long) dst & 1)
-	  {
-	    *dst = (char) lc;
-	    n--;
-	    dst++;
-	  }
-
-	if ((unsigned long) dst & 2)
-	  {
-	    *(short *) dst = lc;
-	    n -= 2;
-	    dst += 2;
-	  }
-      }
-
-    /* Decide which setting method to use.  */
-    if (n >= MEMSET_BY_BLOCK_THRESHOLD)
-      {
-	/* It is not optimal to tell the compiler about clobbering any
-	   registers; that will move the saving/restoring of those registers
-	   to the function prologue/epilogue, and make non-block sizes
-	   suboptimal.  */
-	__asm__ volatile
-	  ("\
-	   ;; GCC does promise correct register allocations, but let's	\n\
-	   ;; make sure it keeps its promises.				\n\
-	   .ifnc %0-%1-%4,$r13-$r12-$r11				\n\
-	   .error \"GCC reg alloc bug: %0-%1-%4 != $r13-$r12-$r11\"	\n\
-	   .endif							\n\
-									\n\
-	   ;; Save the registers we'll clobber in the movem process	\n\
-	   ;; on the stack.  Don't mention them to gcc, it will only be	\n\
-	   ;; upset.							\n\
-	   subq	   11*4,sp						\n\
-	   movem   r10,[sp]						\n\
-									\n\
-	   move.d  r11,r0						\n\
-	   move.d  r11,r1						\n\
-	   move.d  r11,r2						\n\
-	   move.d  r11,r3						\n\
-	   move.d  r11,r4						\n\
-	   move.d  r11,r5						\n\
-	   move.d  r11,r6						\n\
-	   move.d  r11,r7						\n\
-	   move.d  r11,r8						\n\
-	   move.d  r11,r9						\n\
-	   move.d  r11,r10						\n\
-									\n\
-	   ;; Now we've got this:					\n\
-	   ;; r13 - dst							\n\
-	   ;; r12 - n							\n\
-									\n\
-	   ;; Update n for the first loop				\n\
-	   subq	   12*4,r12						\n\
-0:									\n\
-"
-#ifdef __arch_common_v10_v32
-	   /* Cater to branch offset difference between v32 and v10.  We
-	      assume the branch below has an 8-bit offset.  */
-"	   setf\n"
-#endif
-"	   subq	  12*4,r12						\n\
-	   bge	   0b							\n\
-	   movem	r11,[r13+]					\n\
-									\n\
-	   ;; Compensate for last loop underflowing n.			\n\
-	   addq	  12*4,r12						\n\
-									\n\
-	   ;; Restore registers from stack.				\n\
-	   movem [sp+],r10"
-
-	   /* Outputs.	*/
-	   : "=r" (dst), "=r" (n)
-
-	   /* Inputs.  */
-	   : "0" (dst), "1" (n), "r" (lc));
-      }
-
-    /* An ad-hoc unroll, used for 4*12-1..16 bytes. */
-    while (n >= 16)
-      {
-	*(long *) dst = lc; dst += 4;
-	*(long *) dst = lc; dst += 4;
-	*(long *) dst = lc; dst += 4;
-	*(long *) dst = lc; dst += 4;
-	n -= 16;
-      }
-
-    switch (n)
-      {
-      case 0:
-        break;
-
-      case 1:
-        *dst = (char) lc;
-        break;
-
-      case 2:
-        *(short *) dst = (short) lc;
-        break;
-
-      case 3:
-        *(short *) dst = (short) lc; dst += 2;
-        *dst = (char) lc;
-        break;
-
-      case 4:
-        *(long *) dst = lc;
-        break;
-
-      case 5:
-        *(long *) dst = lc; dst += 4;
-        *dst = (char) lc;
-        break;
-
-      case 6:
-        *(long *) dst = lc; dst += 4;
-        *(short *) dst = (short) lc;
-        break;
-
-      case 7:
-        *(long *) dst = lc; dst += 4;
-        *(short *) dst = (short) lc; dst += 2;
-        *dst = (char) lc;
-        break;
-
-      case 8:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc;
-        break;
-
-      case 9:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *dst = (char) lc;
-        break;
-
-      case 10:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(short *) dst = (short) lc;
-        break;
-
-      case 11:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(short *) dst = (short) lc; dst += 2;
-        *dst = (char) lc;
-        break;
-
-      case 12:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc;
-        break;
-
-      case 13:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *dst = (char) lc;
-        break;
-
-      case 14:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(short *) dst = (short) lc;
-        break;
-
-      case 15:
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(long *) dst = lc; dst += 4;
-        *(short *) dst = (short) lc; dst += 2;
-        *dst = (char) lc;
-        break;
-      }
-  }
-
-  return return_dst;
-}
diff --git a/newlib/libc/machine/cris/setjmp.c b/newlib/libc/machine/cris/setjmp.c
deleted file mode 100644
index ca54494..0000000
--- a/newlib/libc/machine/cris/setjmp.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* A setjmp.c for CRIS
-   Copyright (C) 1993-2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* For benefit of CRIS v0..v3, we save and restore CCR to be able to
-   correctly handle DI/EI; otherwise there would be no reason to save it.
-   Note also that the "move x,ccr" does NOT affect
-   the DMA enable bits (E and D) of v0..v3.
-
-   We do not save mof; it is call-clobbered.  It also does not exist in
-   v0..v8; it should be safe to read or write to it there, but better not.
-
-   jmp_buf[0] - PC
-   jmp_buf[1] - SP (R14)
-   jmp_buf[2] - R13
-   jmp_buf[3] - R12
-   jmp_buf[4] - R11
-   jmp_buf[5] - R10
-   jmp_buf[6] - R9
-   jmp_buf[7] - R8
-   jmp_buf[8] - R7
-   jmp_buf[9] - R6
-   jmp_buf[10] - R5
-   jmp_buf[11] - R4
-   jmp_buf[12] - R3
-   jmp_buf[13] - R2
-   jmp_buf[14] - R1
-   jmp_buf[15] - R0
-   jmp_buf[16] - SRP
-   jmp_buf[17] - CCR
-   */
-
-#include <setjmp.h>
-
-int
-setjmp (jmp_buf buf)
-{
-  int ret;
-#if defined (__arch_common_v10_v32) || defined (__arch_v32)
-  /* No offsets in the compatibility mode.  Also, movem saves in
-     different order on v10 than on v32, so we use single move
-     instructions instead, this not being a speed-prioritized operation.
-     And we don't save CCR or CCS; since long unuseful.  */
-  __asm__ __volatile__
-    ("move.d %1,$r13							\n\
-      move 0f,$mof							\n\
-      move $mof,[$r13+]							\n\
-      move.d $sp,[$r13+]						\n\
-      clear.d [$r13+]							\n\
-      move.d $r12,[$r13+]						\n\
-      move.d $r11,[$r13+]						\n\
-      move.d $r10,[$r13+]						\n\
-      moveq 1,$r9							\n\
-      move.d $r9,[$r13+]						\n\
-      move.d $r8,[$r13+]						\n\
-      move.d $r7,[$r13+]						\n\
-      move.d $r6,[$r13+]						\n\
-      move.d $r5,[$r13+]						\n\
-      move.d $r4,[$r13+]						\n\
-      move.d $r3,[$r13+]						\n\
-      move.d $r2,[$r13+]						\n\
-      move.d $r1,[$r13+]						\n\
-      move.d $r0,[$r13+]						\n\
-      move $srp,[$r13+]							\n\
-      clear.d [$r13+]							\n\
-      clear.d $r9							\n\
-0:									\n\
-      move.d $r9,%0"
-
-     /* Output.  */
-     : "=&r" (ret)
-
-     /* Input.  */
-     : "r" (buf)
-
-     /* Clobber.  */
-     : "r9", "r13", "memory");
-#else /* not __arch_common_v10_v32 or __arch_v32 */
-#ifdef __PIC__
-  __asm__ __volatile__
-    ("moveq 1,$r9							\n\
-      movem $sp,[%1+1*4]						\n\
-      move.d $pc,$r9							\n\
-      addq 0f-.,$r9							\n\
-      move.d $r9,[%1]							\n\
-      move $srp,[%1+16*4]						\n\
-      move $ccr,[%1+17*4]						\n\
-      clear.d $r9							\n\
-0:									\n\
-      move.d $r9,%0"
-
-     /* Output.  */
-     : "=&r" (ret)
-
-     /* Input.  */
-     : "r" (buf)
-
-     /* Clobber.  */
-     : "r9", "memory");
-#else  /* not PIC */
-  __asm__ __volatile__
-    ("moveq 1,$r9							\n\
-      movem $sp,[%1+1*4]						\n\
-      move.d 0f,$r9							\n\
-      move.d $r9,[%1]							\n\
-      move $srp,[%1+16*4]						\n\
-      move $ccr,[%1+17*4]						\n\
-      clear.d $r9							\n\
-0:									\n\
-      move.d $r9,%0"
-
-     /* Output.  */
-     : "=&r" (ret)
-
-     /* Input.  */
-     : "r" (buf)
-
-     /* Clobber.  */
-     : "r9");
-#endif /* not PIC */
-#endif /* not __arch_common_v10_v32 or __arch_v32 */
-  return ret;
-}
-
-void
-longjmp(jmp_buf buf, int val)
-{
-#if defined (__arch_common_v10_v32) || defined (__arch_v32)
-  __asm__ __volatile__
-    ("cmpq 0,%1								\n\
-      beq 0f								\n\
-      move.d %0,$r13	; In delay-slot.				\n\
-      addq 6*4,$r13							\n\
-      move.d %1,[$r13]							\n\
-      subq 6*4,$r13							\n\
-0:\n"
-#ifdef __arch_common_v10_v32
-     /* Cater to branch offset difference between v32 and v10.  We
-	assume the branch above is 8-bit.  */
-"     setf\n"
-#endif
-"     move [$r13+],$mof							\n\
-      move.d [$r13+],$sp						\n\
-      addq 4,$r13							\n\
-      move.d [$r13+],$r12						\n\
-      move.d [$r13+],$r11						\n\
-      move.d [$r13+],$r10						\n\
-      move.d [$r13+],$r9						\n\
-      move.d [$r13+],$r8						\n\
-      move.d [$r13+],$r7						\n\
-      move.d [$r13+],$r6						\n\
-      move.d [$r13+],$r5						\n\
-      move.d [$r13+],$r4						\n\
-      move.d [$r13+],$r3						\n\
-      move.d [$r13+],$r2						\n\
-      move.d [$r13+],$r1						\n\
-      move.d [$r13+],$r0						\n\
-      move [$r13+],$srp							\n\
-      move $mof,$r13							\n\
-      jump $r13								\n\
-      setf"
-
-     /* No outputs.  */
-     :
-
-     /* Inputs.  */
-     : "r" (buf), "r" (val)
-     : "r13", "memory");
-
-#else /* not __arch_common_v10_v32 or __arch_v32 */
-  __asm__ __volatile__
-    ("move [%0+17*4],$ccr						\n\
-      move [%0+16*4],$srp						\n\
-      test.d %1								\n\
-      beq 0f								\n\
-      nop								\n\
-      move.d %1,[%0+6*4]	; Offset for r9.			\n\
-0:									\n\
-      movem [%0],$pc"
-
-     /* No outputs.  */
-     :
-
-     /* Inputs.  */
-     : "r" (buf), "r" (val)
-     : "memory");
-#endif /* not __arch_common_v10_v32 or __arch_v32 */
-}
diff --git a/newlib/libc/machine/cris/sys/errno.h b/newlib/libc/machine/cris/sys/errno.h
deleted file mode 100644
index d352975..0000000
--- a/newlib/libc/machine/cris/sys/errno.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/* This file is to be kept in sync with newlib/libc/include/sys/errno.h
-   on which it is based, except values used or returned by syscalls must
-   be those of the Linux/CRIS kernel.  */
-
-/* errno is not a global variable, because that would make using it
-   non-reentrant.  Instead, its address is returned by the function
-   __errno.  */
-
-#ifndef _SYS_ERRNO_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define _SYS_ERRNO_H_
-
-#include <sys/reent.h>
-
-#ifndef _REENT_ONLY
-#define errno (*__errno())
-extern int *__errno _PARAMS ((void));
-#endif
-
-/* Please don't use these variables directly.
-   Use strerror instead. */
-extern _CONST char * _CONST _sys_errlist[];
-extern int _sys_nerr;
-
-#define __errno_r(ptr) ((ptr)->_errno)
-
-/* Adjusted to the linux asm/errno.h */
-#define	EPERM		 1	/* Operation not permitted */
-#define	ENOENT		 2	/* No such file or directory */
-#define	ESRCH		 3	/* No such process */
-#define	EINTR		 4	/* Interrupted system call */
-#define	EIO		 5	/* I/O error */
-#define	ENXIO		 6	/* No such device or address */
-#define	E2BIG		 7	/* Arg list too long */
-#define	ENOEXEC		 8	/* Exec format error */
-#define	EBADF		 9	/* Bad file number */
-#define	ECHILD		10	/* No child processes */
-#define	EAGAIN		11	/* Try again */
-#define	ENOMEM		12	/* Out of memory */
-#define	EACCES		13	/* Permission denied */
-#define	EFAULT		14	/* Bad address */
-#define	ENOTBLK		15	/* Block device required */
-#define	EBUSY		16	/* Device or resource busy */
-#define	EEXIST		17	/* File exists */
-#define	EXDEV		18	/* Cross-device link */
-#define	ENODEV		19	/* No such device */
-#define	ENOTDIR		20	/* Not a directory */
-#define	EISDIR		21	/* Is a directory */
-#define	EINVAL		22	/* Invalid argument */
-#define	ENFILE		23	/* File table overflow */
-#define	EMFILE		24	/* Too many open files */
-#define	ENOTTY		25	/* Not a typewriter */
-#define	ETXTBSY		26	/* Text file busy */
-#define	EFBIG		27	/* File too large */
-#define	ENOSPC		28	/* No space left on device */
-#define	ESPIPE		29	/* Illegal seek */
-#define	EROFS		30	/* Read-only file system */
-#define	EMLINK		31	/* Too many links */
-#define	EPIPE		32	/* Broken pipe */
-#define	EDOM		33	/* Math argument out of domain of func */
-#define	ERANGE		34	/* Math result not representable */
-#define	EDEADLK		35	/* Resource deadlock would occur */
-#define	ENAMETOOLONG	36	/* File name too long */
-#define	ENOLCK		37	/* No record locks available */
-#define	ENOSYS		38	/* Function not implemented */
-#define	ENOTEMPTY	39	/* Directory not empty */
-#define	ELOOP		40	/* Too many symbolic links encountered */
-#define	EWOULDBLOCK	EAGAIN	/* Operation would block */
-#define	ENOMSG		42	/* No message of desired type */
-#define	EIDRM		43	/* Identifier removed */
-#define	ECHRNG		44	/* Channel number out of range */
-#define	EL2NSYNC	45	/* Level 2 not synchronized */
-#define	EL3HLT		46	/* Level 3 halted */
-#define	EL3RST		47	/* Level 3 reset */
-#define	ELNRNG		48	/* Link number out of range */
-#define	EUNATCH		49	/* Protocol driver not attached */
-#define	ENOCSI		50	/* No CSI structure available */
-#define	EL2HLT		51	/* Level 2 halted */
-#define	EBADE		52	/* Invalid exchange */
-#define	EBADR		53	/* Invalid request descriptor */
-#define	EXFULL		54	/* Exchange full */
-#define	ENOANO		55	/* No anode */
-#define	EBADRQC		56	/* Invalid request code */
-#define	EBADSLT		57	/* Invalid slot */
-
-#define	EDEADLOCK	EDEADLK
-
-#define	EBFONT		59	/* Bad font file format */
-/* This is only used internally in newlib; not returned by the kernel.
-   EBFONT seems the closest match for a "bad file format" error.  */
-#define EFTYPE		EBFONT	/* Inappropriate file type or format */
-#define	ENOSTR		60	/* Device not a stream */
-#define	ENODATA		61	/* No data available */
-#define	ETIME		62	/* Timer expired */
-#define	ENOSR		63	/* Out of streams resources */
-#define	ENONET		64	/* Machine is not on the network */
-#define	ENOPKG		65	/* Package not installed */
-#define	EREMOTE		66	/* Object is remote */
-#define	ENOLINK		67	/* Link has been severed */
-#define	EADV		68	/* Advertise error */
-#define	ESRMNT		69	/* Srmount error */
-#define	ECOMM		70	/* Communication error on send */
-#define	EPROTO		71	/* Protocol error */
-#define	EMULTIHOP	72	/* Multihop attempted */
-#define	EDOTDOT		73	/* RFS specific error */
-#define	EBADMSG		74	/* Not a data message */
-#define	EOVERFLOW	75	/* Value too large for defined data type */
-#define	ENOTUNIQ	76	/* Name not unique on network */
-#define	EBADFD		77	/* File descriptor in bad state */
-#define	EREMCHG		78	/* Remote address changed */
-#define	ELIBACC		79	/* Can not access a needed shared library */
-#define	ELIBBAD		80	/* Accessing a corrupted shared library */
-#define	ELIBSCN		81	/* .lib section in a.out corrupted */
-#define	ELIBMAX		82	/* Attempting to link in too many shared libraries */
-#define	ELIBEXEC	83	/* Cannot exec a shared library directly */
-#define	EILSEQ		84	/* Illegal byte sequence */
-#define	ERESTART	85	/* Interrupted system call should be restarted */
-#define	ESTRPIPE	86	/* Streams pipe error */
-#define	EUSERS		87	/* Too many users */
-#define	ENOTSOCK	88	/* Socket operation on non-socket */
-#define	EDESTADDRREQ	89	/* Destination address required */
-#define	EMSGSIZE	90	/* Message too long */
-#define	EPROTOTYPE	91	/* Protocol wrong type for socket */
-#define	ENOPROTOOPT	92	/* Protocol not available */
-#define	EPROTONOSUPPORT	93	/* Protocol not supported */
-#define	ESOCKTNOSUPPORT	94	/* Socket type not supported */
-#define	EOPNOTSUPP	95	/* Operation not supported on transport endpoint */
-#define	EPFNOSUPPORT	96	/* Protocol family not supported */
-#define	EAFNOSUPPORT	97	/* Address family not supported by protocol */
-#define	EADDRINUSE	98	/* Address already in use */
-#define	EADDRNOTAVAIL	99	/* Cannot assign requested address */
-#define	ENETDOWN	100	/* Network is down */
-#define	ENETUNREACH	101	/* Network is unreachable */
-#define	ENETRESET	102	/* Network dropped connection because of reset */
-#define	ECONNABORTED	103	/* Software caused connection abort */
-#define	ECONNRESET	104	/* Connection reset by peer */
-#define	ENOBUFS		105	/* No buffer space available */
-#define	EISCONN		106	/* Transport endpoint is already connected */
-#define	ENOTCONN	107	/* Transport endpoint is not connected */
-#define	ESHUTDOWN	108	/* Cannot send after transport endpoint shutdown */
-#define	ETOOMANYREFS	109	/* Too many references: cannot splice */
-#define	ETIMEDOUT	110	/* Connection timed out */
-#define	ECONNREFUSED	111	/* Connection refused */
-#define	EHOSTDOWN	112	/* Host is down */
-#define	EHOSTUNREACH	113	/* No route to host */
-#define	EALREADY	114	/* Operation already in progress */
-#define	EINPROGRESS	115	/* Operation now in progress */
-#define	ESTALE		116	/* Stale NFS file handle */
-#define	EUCLEAN		117	/* Structure needs cleaning */
-#define	ENOTNAM		118	/* Not a XENIX named type file */
-#define	ENAVAIL		119	/* No XENIX semaphores available */
-#define	EISNAM		120	/* Is a named type file */
-#define	EREMOTEIO	121	/* Remote I/O error */
-#define	EDQUOT		122	/* Quota exceeded */
-
-#define	ENOMEDIUM	123	/* No medium found */
-#define	EMEDIUMTYPE	124	/* Wrong medium type */
-
-#define __ELASTERROR 2000	/* Users can add values starting here */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _SYS_ERRNO_H */
diff --git a/newlib/libc/machine/cris/sys/fcntl.h b/newlib/libc/machine/cris/sys/fcntl.h
deleted file mode 100644
index 6017a19..0000000
--- a/newlib/libc/machine/cris/sys/fcntl.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* This file is to be kept in sync with newlib/libc/include/sys/fcntl.h,
-   on which it is based, except values used or returned by syscalls must
-   be those of the Linux/CRIS kernel.  */
-
-#ifndef	_FCNTL_
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define	_FCNTL_
-#include <_ansi.h>
-#define	_FOPEN		(-1)	/* from sys/file.h, kernel use only */
-#define	_FREAD		0x0001	/* read enabled */
-#define	_FWRITE		0x0002	/* write enabled */
-#define	_FNDELAY	0x0800	/* non blocking I/O (4.2 style) */
-#define	_FAPPEND	0x0400	/* append (writes guaranteed at the end) */
-#define	_FMARK		0x0010	/* internal; mark during gc() */
-#define	_FDEFER		0x0020	/* internal; defer for next gc pass */
-#define	_FASYNC		0x2000	/* signal pgrp when data ready */
-#define	_FCREAT		0x0040	/* open with file create */
-#define	_FTRUNC		0x0200	/* open with truncation */
-#define	_FEXCL		0x0080	/* error on open if file exists */
-#define	_FNBIO	    _FNONBLOCK	/* non blocking I/O (sys5 style) */
-#define	_FSYNC		0x1000	/* do all writes synchronously */
-#define	_FNONBLOCK	0x0800	/* non blocking I/O (POSIX style) */
-#define	_FNOCTTY	0x0100	/* don't assign a ctty on this open */
-
-#define	O_ACCMODE	(O_RDONLY|O_WRONLY|O_RDWR)
-
-/*
- * Flag values for open(2) and fcntl(2)
- * The kernel adds 1 to the open modes to turn it into some
- * combination of FREAD and FWRITE.
- */
-#define	O_RDONLY	0		/* +1 == FREAD */
-#define	O_WRONLY	1		/* +1 == FWRITE */
-#define	O_RDWR		2		/* +1 == FREAD|FWRITE */
-#define	O_APPEND	_FAPPEND
-#define	O_CREAT		_FCREAT
-#define	O_TRUNC		_FTRUNC
-#define	O_EXCL		_FEXCL
-/*	O_SYNC		_FSYNC		not posix, defined below */
-/*	O_NDELAY	_FNDELAY 	set in include/fcntl.h */
-/*	O_NDELAY	_FNBIO 		set in 5include/fcntl.h */
-#define	O_NONBLOCK	_FNONBLOCK
-#define	O_NOCTTY	_FNOCTTY
-
-#ifndef	_POSIX_SOURCE
-
-#define	O_SYNC		_FSYNC
-
-/*
- * Flags that work for fcntl(fd, F_SETFL, FXXXX)
- */
-#define	FAPPEND		_FAPPEND
-#define	FSYNC		_FSYNC
-#define	FASYNC		_FASYNC
-#define	FNBIO		_FNBIO
-#define	FNONBIO		_FNONBLOCK	/* XXX fix to be NONBLOCK everywhere */
-#define	FNDELAY		_FNDELAY
-
-/*
- * Flags that are disallowed for fcntl's (FCNTLCANT);
- * used for opens, internal state, or locking.
- */
-#define	FREAD		_FREAD
-#define	FWRITE		_FWRITE
-#define	FMARK		_FMARK
-#define	FDEFER		_FDEFER
-#define	FSHLOCK		_FSHLOCK
-#define	FEXLOCK		_FEXLOCK
-
-/*
- * The rest of the flags, used only for opens
- */
-#define	FOPEN		_FOPEN
-#define	FCREAT		_FCREAT
-#define	FTRUNC		_FTRUNC
-#define	FEXCL		_FEXCL
-#define	FNOCTTY		_FNOCTTY
-
-#endif	/* !_POSIX_SOURCE */
-
-/* XXX close on exec request; must match UF_EXCLOSE in user.h */
-#define	FD_CLOEXEC	1	/* posix */
-
-/* fcntl(2) requests */
-#define F_DUPFD		0	/* dup */
-#define F_GETFD		1	/* get f_flags */
-#define F_SETFD		2	/* set f_flags */
-#define F_GETFL		3	/* more flags (cloexec) */
-#define F_SETFL		4
-#define F_GETLK		5
-#define F_SETLK		6
-#define F_SETLKW	7
-
-#define F_SETOWN	8	/*  for sockets. */
-#define F_GETOWN	9	/*  for sockets. */
-
-/* for F_[GET|SET]FL */
-#define FD_CLOEXEC	1	/* actually anything with low bit set goes */
-
-/* for posix fcntl() and lockf() */
-#define F_RDLCK		0
-#define F_WRLCK		1
-#define F_UNLCK		2
-
-/* for old implementation of bsd flock () */
-#define F_EXLCK		4	/* or 3 */
-#define F_SHLCK		8	/* or 4 */
-
-/* operations for bsd flock(), also used by the kernel implementation */
-#define LOCK_SH		1	/* shared lock */
-#define LOCK_EX		2	/* exclusive lock */
-#define LOCK_NB		4	/* or'd with one of the above to prevent
-				   blocking */
-#define LOCK_UN		8	/* remove lock */
-
-/* file segment locking set data type - information passed to system by user */
-struct flock {
-	short	l_type;		/* F_RDLCK, F_WRLCK, or F_UNLCK */
-	short	l_whence;	/* flag to choose starting offset */
-	long	l_start;	/* relative offset, in bytes */
-	long	l_len;		/* length, in bytes; 0 means lock to EOF */
-	short	l_pid;		/* returned with F_GETLK */
-	short	l_xxx;		/* reserved for future use */
-};
-
-#ifndef	_POSIX_SOURCE
-/* extended file segment locking set data type */
-struct eflock {
-	short	l_type;		/* F_RDLCK, F_WRLCK, or F_UNLCK */
-	short	l_whence;	/* flag to choose starting offset */
-	long	l_start;	/* relative offset, in bytes */
-	long	l_len;		/* length, in bytes; 0 means lock to EOF */
-	short	l_pid;		/* returned with F_GETLK */
-	short	l_xxx;		/* reserved for future use */
-	long	l_rpid;		/* Remote process id wanting this lock */
-	long	l_rsys;		/* Remote system id wanting this lock */
-};
-#endif	/* !_POSIX_SOURCE */
-
-
-#include <sys/types.h>
-#include <sys/stat.h>		/* sigh. for the mode bits for open/creat */
-
-extern int open _PARAMS ((const char *, int, ...));
-extern int creat _PARAMS ((const char *, mode_t));
-extern int fcntl _PARAMS ((int, int, ...));
-
-/* Provide _<systemcall> prototypes for functions provided by some versions
-   of newlib.  */
-#ifdef _COMPILING_NEWLIB
-extern int _open _PARAMS ((const char *, int, ...));
-extern int _fcntl _PARAMS ((int, int, ...));
-#ifdef __LARGE64_FILES
-extern int _open64 _PARAMS ((const char *, int, ...));
-#endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif	/* !_FCNTL_ */
diff --git a/newlib/libc/machine/cris/sys/signal.h b/newlib/libc/machine/cris/sys/signal.h
deleted file mode 100644
index 081a75f..0000000
--- a/newlib/libc/machine/cris/sys/signal.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* This file is to be kept in sync (well, reasonably so, it's quite
-   different) with newlib/libc/include/sys/signal.h on which it is
-   based, except values used or returned by syscalls must be those of
-   the Linux/CRIS kernel.  */
-
-/* sys/signal.h */
-
-#ifndef _SYS_SIGNAL_H
-#define _SYS_SIGNAL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "_ansi.h"
-
-typedef unsigned long sigset_t;
-
-/* Adjusted to linux, has unused sa_restorer field and unsigned long
-   sa_flags; relatively unimportant though.  */
-/* Type of a signal handler.  */
-typedef void (*__sighandler_t)(int);
-
-/* The type used in newlib sources.  */
-typedef __sighandler_t _sig_func_ptr;
-
-struct sigaction {
-	__sighandler_t sa_handler;
-	sigset_t sa_mask;
-	unsigned long sa_flags;
-	void (*sa_restorer)(void);
-};
-
-/* Adjusted to glibc; other values.  */
-#define SA_NOCLDSTOP 1	/* only value supported now for sa_flags */
-#define SIG_SETMASK 2	/* set mask with sigprocmask() */
-#define SIG_BLOCK 0	/* set of signals to block */
-#define SIG_UNBLOCK 1	/* set of signals to, well, unblock */
-
-/* These depend upon the type of sigset_t, which right now
-   is always a long.. They're in the POSIX namespace, but
-   are not ANSI. */
-#define sigaddset(what,sig) (*(what) |= (1<<(sig)))
-#define sigemptyset(what)   (*(what) = 0)
-
-int sigprocmask (int __how, const sigset_t *__a, sigset_t *__b);
-
-#define SIGHUP		 1
-#define SIGINT		 2
-#define SIGQUIT		 3
-#define SIGILL		 4
-#define SIGTRAP		 5
-#define SIGABRT		 6
-#define SIGIOT		 6
-#define SIGBUS		 7
-#define SIGFPE		 8
-#define SIGKILL		 9
-#define SIGUSR1		10
-#define SIGSEGV		11
-#define SIGUSR2		12
-#define SIGPIPE		13
-#define SIGALRM		14
-#define SIGTERM		15
-#define SIGSTKFLT	16
-#define SIGCHLD		17
-#define SIGCONT		18
-#define SIGSTOP		19
-#define SIGTSTP		20
-#define SIGTTIN		21
-#define SIGTTOU		22
-#define SIGURG		23
-#define SIGXCPU		24
-#define SIGXFSZ		25
-#define SIGVTALRM	26
-#define SIGPROF		27
-#define SIGWINCH	28
-#define SIGIO		29
-#define SIGPOLL		SIGIO
-#define SIGPWR		30
-#define	NSIG 31
-
-#ifdef __cplusplus
-}
-#endif
-#ifndef _SIGNAL_H_
-/* Some applications take advantage of the fact that <sys/signal.h>
- * and <signal.h> are equivalent in glibc.  Allow for that here.  */
-#include <signal.h>
-#endif
-#endif /* _SYS_SIGNAL_H */
diff --git a/newlib/libc/machine/crx/Makefile.am b/newlib/libc/machine/crx/Makefile.am
deleted file mode 100644
index 7892271..0000000
--- a/newlib/libc/machine/crx/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S getenv.c
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/crx/Makefile.in b/newlib/libc/machine/crx/Makefile.in
deleted file mode 100644
index 1c319a4..0000000
--- a/newlib/libc/machine/crx/Makefile.in
+++ /dev/null
@@ -1,327 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S getenv.c
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o getenv.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/crx/aclocal.m4 b/newlib/libc/machine/crx/aclocal.m4
deleted file mode 100644
index 55d5e67..0000000
--- a/newlib/libc/machine/crx/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/crx/configure b/newlib/libc/machine/crx/configure
deleted file mode 100755
index 028b7b4..0000000
--- a/newlib/libc/machine/crx/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.am
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/crx/configure.in b/newlib/libc/machine/crx/configure.in
deleted file mode 100644
index a5384f6..0000000
--- a/newlib/libc/machine/crx/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/arm configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(Makefile.am)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/crx/getenv.c b/newlib/libc/machine/crx/getenv.c
deleted file mode 100644
index 75ef1cc..0000000
--- a/newlib/libc/machine/crx/getenv.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* getenv.c -- Implementation of the getenv() routine
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-/* getenv() is implemented as a low-level function, 
-   thus we only invoke here the system call.  */
-char * getenv (const char *name)
-{
-  char *_getenv(const char *);
-
-  return (_getenv (name));
-}
-
diff --git a/newlib/libc/machine/crx/setjmp.S b/newlib/libc/machine/crx/setjmp.S
deleted file mode 100644
index 19b7d6c..0000000
--- a/newlib/libc/machine/crx/setjmp.S
+++ /dev/null
@@ -1,51 +0,0 @@
- ##############################################################################
- # setjmp.S -- CRX setjmp routine                                             #
- #                                                                            #
- # Copyright (c) 2004 National Semiconductor Corporation                      #
- #                                                                            #
- # The authors hereby grant permission to use, copy, modify, distribute,      #
- # and license this software and its documentation for any purpose, provided  #
- # that existing copyright notices are retained in all copies and that this   #
- # notice is included verbatim in any distributions. No written agreement,    #
- # license, or royalty fee is required for any of the authorized uses.        #
- # Modifications to this software may be copyrighted by their authors         #
- # and need not follow the licensing terms described here, provided that      #
- # the new terms are clearly indicated on the first page of each file where   #
- # they apply.                                                                #
- #                                                                            #
- # C library -- setjmp, longjmp                                               #
- # longjmp(a,v)                                                               #
- # will generate a "return(v)"                                                #
- # from the last call to                                                      #
- # setjmp(a)                                                                  #
- # by restoring r7-ra, sp,                                                    #
- # and pc from 'a'                                                            #
- # and doing a return. (Makes sure that longjmp never returns 0).             #
- ##############################################################################
-
-	.text
-	.file	"setjmp.s"
-        .align 4
-
-        .globl _setjmp
-        .align 4
-_setjmp:
-        #r2: .blkw
-        storm r2,{r7,r8,r9,r10,r11,r12,r13,r14}
-	stord sp,0(r2)
-        movd  $0,r0
-        jump  ra
-
-        .globl _longjmp
-_longjmp:
-        #r2: .blkw # pointer save area
-        #r3: .blkw # ret vlaue
-        loadm r2, {r7,r8,r9,r10,r11,r12,r13,ra}
-        loadd 0(r2), sp
-        movd r3, r0
-        cmpd $0, r3
-        bne end1
-        movd $1, r0
-end1:
-        jump ra
-        .align 4
diff --git a/newlib/libc/machine/crx/sys/asm.h b/newlib/libc/machine/crx/sys/asm.h
deleted file mode 100644
index a8226d1..0000000
--- a/newlib/libc/machine/crx/sys/asm.h
+++ /dev/null
@@ -1,421 +0,0 @@
-/* asm.h -- CRX architecture intrinsic functions
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#ifndef	_ASM
-#define _ASM
-
-/* Note that immediate input values are not checked for validity. It is 
-   the user's responsibility to use the intrinsic functions with appropriate
-   immediate values. */
-
-/* Absolute Instructions */
-#define _absb_(src, dest)  	__asm__("absb %1, %0" : "=r" (dest) : \
-                                   "r" ((char)src) , "0" (dest))
-#define _absw_(src, dest)  	__asm__("absw %1,%0" : "=r" (dest) : \
-                                    "r" ((short)src) , "0" (dest))
-#define _absd_(src, dest)  	__asm__("absd %1, %0" : "=r" (dest)  : \
-                                    "r" ((int)src) , "0" (dest))
-
-/* Addition Instructions */
-#define _addb_(src, dest)	__asm__("addb %1, %0" : "=r" (dest) : \
-					"ri" ((unsigned char)src), "0" (dest) : "cc")
-#define _addub_(src, dest)	__asm__("addub	%1, %0" : "=r" (dest) : \
-					"ri" ((unsigned char)src), "0" (dest) : "cc")
-#define _addw_(src, dest)	__asm__("addw %1, %0" : "=r" (dest) : \
-					"ri" ((unsigned short)src), "0" (dest) : "cc")
-#define _adduw_(src, dest)	__asm__("adduw	%1, %0" : "=r" (dest) : \
-					"ri" ((unsigned short)src), "0" (dest) : "cc")
-#define _addd_(src, dest)	__asm__("addd %1, %0" : "=r" (dest) : \
-					"ri" ((unsigned int)src), "0" (dest) : "cc")
-#define _addud_(src, dest)	__asm__("addud	%1, %0" : "=r" (dest) : \
-					"ri" ((unsigned int)src), "0" (dest) : "cc")
-/* Add with Carry */
-#define _addcb_(src, dest)	__asm__("addcb	%1, %0" : "=r" (dest) : \
-					"ri" ((unsigned char)src), "0" (dest) : "cc")
-#define _addcw_(src, dest)	__asm__("addcw	%1, %0" : "=r" (dest) : \
-					"ri" ((unsigned short)src), "0" (dest) : "cc")
-#define _addcd_(src, dest)	__asm__("addcd	%1, %0" : "=r" (dest) : \
-					"ri" ((unsigned int)src), "0" (dest) : "cc")
-/* Q-format Add */
-#define _addqb_(src, dest)	__asm__("addqb %1, %0" : "=r" (dest) : \
-					"r" ((unsigned char)src), "0" (dest) : "cc")
-#define _addqw_(src, dest)	__asm__("addqw %1, %0" : "=r" (dest) : \
-					"r" ((unsigned short)src), "0" (dest) : "cc")
-#define _addqd_(src, dest)	__asm__("addqd %1, %0" : "=r" (dest) : \
-					"r" ((unsigned int)src), "0" (dest) : "cc")
-
-/* Bitwise Logical AND */
-
-#define _andb_(src, dest)  __asm__("andb %1,%0" : "=r" (dest) : \
-				   "ri" ((unsigned char)src) , "0" (dest))
-#define _andw_(src, dest)  __asm__("andw %1,%0" : "=r" (dest) : \
-				   "ri" ((unsigned short)src) , "0" (dest))
-#define _andd_(src, dest)  __asm__("andd %1,%0" : "=r" (dest) : \
-		 		  "ri" ((unsigned int)src) , "0" (dest))
-
-/* bswap Instruction */
-#define _bswap_(src, dest)  	__asm__("bswap %1,%0" : "=r" (dest) : \
-                                        "r" ((unsigned int)src) , "0" (dest))
-/* cbit (clear bit) Instructions */
-#define _cbitb_(pos, dest)  	__asm__("cbitb %1,%0" : "=mr" (dest) : \
-                                     	"i" ((unsigned char)pos) , "0" (dest) : "cc")
-#define _cbitw_(pos, dest)  	__asm__("cbitw %1,%0" : "=mr" (dest) : \
-                                     	"i" ((unsigned char)pos) , "0" (dest) : "cc")
-#define _cbitd_(pos, dest)  	__asm__("cbitd %1,%0" : "=r" (dest) : \
-				    	"i" ((unsigned char)pos) , "0" (dest) : "cc")
-
-/* Compare Instructions */
-#define _cmpb_(src1, src2)  __asm__("cmpb %0,%1" : /* no output */  : \
-				    "ri" ((unsigned char)src1) , "r" (src2) : "cc")
-#define _cmpw_(src1,src2)  __asm__("cmpw %0,%1" : /* no output */  \
-				   : "ri" ((unsigned short)src1) , "r" (src2) : "cc")
-#define _cmpd_(src1,src2)  __asm__("cmpd %0,%1" : /* no output */  \
-				   : "ri" ((unsigned int)src1) , "r" (src2) : "cc")
-
-/* cntl Count Leading Ones Instructions */
-#define _cntl1b_(src, dest)  	__asm__("cntl1b %1,%0" : "=r" (dest) : \
-                                        "r" ((char)src) , "0" (dest))
-#define _cntl1w_(src, dest)  	__asm__("cntl1w %1,%0" : "=r" (dest) : \
-                                        "r" ((short)src) , "0" (dest))
-#define _cntl1d_(src, dest)  	__asm__("cntl1d %1,%0" : "=r" (dest)  : \
-                                        "r" ((int)src) , "0" (dest))
-
-/* cntl Count Leading Zeros Instructions */
-#define _cntl0b_(src, dest)  	__asm__("cntl0b %1,%0" : "=r" (dest) : \
-                                        "r" ((char)src) , "0" (dest))
-#define _cntl0w_(src, dest)  	__asm__("cntl0w %1,%0" : "=r" (dest) : \
-                                        "r" ((short)src) , "0" (dest))
-#define _cntl0d_(src, dest)  	__asm__("cntl0d %1,%0" : "=r" (dest)  : \
-                                         "r" ((int)src) , "0" (dest))
-
-/* cntl Count Leading Signs Instructions */
-#define _cntlsb_(src, dest)  	__asm__("cntlsb %1,%0" : "=r" (dest) : \
-                                        "r" ((char)src) , "0" (dest))
-#define _cntlsw_(src, dest)  	__asm__("cntlsw %1,%0" : "=r" (dest) : \
-                                        "r" ((short)src) , "0" (dest))
-#define _cntlsd_(src, dest)  	__asm__("cntlsd %1,%0" : "=r" (dest)  : \
-                                         "r" ((int)src) , "0" (dest))
-
-/* Disable Inerrupts instructions */
-#define _di_()       __asm__ volatile ("di\n" :  :  : "cc")
-#define _disable_()  __asm__ volatile ("di\n" :  :  : "cc")
-
-/* Enable Inerrupts instructions */
-#define _ei_()			__asm__ volatile ("ei\n" :  :  : "cc")
-#define _enable_()		__asm__ volatile ("ei\n" :  :  : "cc")
-
-/* Enable Inerrupts instructions and Wait */
-#define _eiwait_()  		__asm__ volatile ("eiwait" :  :  : "cc")
-
-/* excp Instructions */
-#define _excp_(vector)  	__asm__ volatile ("excp " # vector)
-
-/* getpid Instruction */
-#define _getrfid_(dest) 	__asm__("getrfid %0" : "=r" (dest)  : \
-                                     	/* No input */ : "cc")
-
-/* Load Instructions */
-#define _loadb_(base,dest)	__asm__("loadb %1,%0" : "=r" (dest) : \
-					"m" (base) , "0" (dest))
-#define _loadw_(base,dest)	__asm__("loadw %1,%0" : "=r" (dest) : \
-				        "m" (base) , "0" (dest))
-#define _loadd_(base,dest)	__asm__("loadd %1,%0" : "=r" (dest) : \
-					"m" (base) , "0" (dest))
-
-/* Load Multiple Instructions */
-#define _loadm_(src, mask)  	__asm__("loadm %0,%1" : /* No output */ : \
-					"r" ((unsigned int)src) , "i" (mask))
-#define _loadmp_(src, mask)  	__asm__("loadmp %0,%1" : /* No output */ : \
-					"r" ((unsigned int)src) , "i" (mask))
-
-/* Multiply Accumulate Instrutions */
-#define _macsb_(hi, lo, src1, src2)  	__asm__("macsb %1,%0" \
-					: =l (lo), =h (hi) \
-					: "r" ((char)src1) , "r" (src2))
-#define _macsw_(hi, lo, src1, src2)  	__asm__("macsw %1,%0" \
-					: =l (lo), =h (hi) \
-					: "r" ((short)src1) , "r" (src2))
-#define _macsd_(hi, lo, src1, src2)  	__asm__("macsd %1,%0" \
-					: =l (lo), =h (hi) \
-					: "r" ((int)src1) , "r" (src2))
-#define _macub_(hi, lo, src1, src2)  	__asm__("macub %1,%0" \
-  					: =l (lo), =h (hi) \
-					:"r" ((unsigned char)src1) , "r" (src2))
-#define _macuw_(hi, lo, src1, src2)  	__asm__("macuw %1,%0" \
-  					: =l (lo), =h (hi) \
-					: "r" ((unsigned short)src1) , "r" (src2))
-#define _macud_(hi, lo, src1, src2)  	__asm__("macud %1,%0" \
-  					: =l (lo), =h (hi) \
-					: "r" ((unsigned int)src1) , "r" (src2))
-
-/* Q-Format Multiply Accumulate Instrutions */
-#define _macqb_(src1, src2)  	__asm__("macqb %1,%0" \
-  					: =l (lo), =h (hi) \
-					:"r" ((char)src1) , "r" (src2))
-#define _macqw_(src1, src2)  	__asm__("macqw %1,%0" \
-  					: =l (lo), =h (hi) \
-					:"r" ((short)src1) , "r" (src2))
-#define _macqd_(src1, src2)  	__asm__("macqd %1,%0" \
-  					: =l (lo), =h (hi) \
-					:"r" ((int)src1) , "r" (src2))
-
-/* Maximum Instructions */
-#define _maxsb_(src, dest)  	__asm__("maxsb %1,%0" : "=r" (dest) : \
-					"r" ((char)src) , "0" (dest))
-#define _maxsw_(src, dest)  	__asm__("maxsw %1,%0" : "=r" (dest) : \
-					"r" ((short)src) , "0" (dest))
-#define _maxsd_(src, dest)  	__asm__("maxsd %1,%0" : "=r" (dest)  : \
-					"r" ((int)src) , "0" (dest))
-#define _maxub_(src, dest)  	__asm__("maxub %1,%0" : "=r" (dest) : \
-					"r" ((unsigned char)src) , "0" (dest))
-#define _maxuw_(src, dest)  	__asm__("maxuw %1,%0" : "=r" (dest) : \
-					"r" ((unsigned short)src) , "0" (dest))
-#define _maxud_(src, dest)  	__asm__("maxud %1,%0" : "=r" (dest)  : \
-					"r" ((unsigned int)src) , "0" (dest))
-
-/* Minimum Instructions */
-#define _minsb_(src, dest)  	__asm__("minsb %1,%0" : "=r" (dest) : \
-					"r" ((char)src) , "0" (dest))
-#define _minsw_(src, dest)  	__asm__("minsw %1,%0" : "=r" (dest) : \
-					"r" ((short)src) , "0" (dest))
-#define _minsd_(src, dest)  	__asm__("minsd %1,%0" : "=r" (dest)  : \
-					"r" ((int)src) , "0" (dest))
-#define _minub_(src, dest)  	__asm__("minub %1,%0" : "=r" (dest) : \
-					"r" ((unsigned char)src) , "0" (dest))
-#define _minuw_(src, dest)  	__asm__("minuw %1,%0" : "=r" (dest) : \
-					"r" ((unsigned short)src) , "0" (dest))
-#define _minud_(src, dest)  	__asm__("minud %1,%0" : "=r" (dest)  : \
-					"r" ((unsigned int)src) , "0" (dest))
-
-/* Move Instructions */
-#define _movb_(src, dest)  	__asm__("movb %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _movw_(src, dest)  	__asm__("movw %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned short)src) , "0" (dest))
-#define _movd_(src, dest)  	__asm__("movd %1,%0" : "=r" (dest)  : \
-					"ri" ((unsigned int)src) , "0" (dest))
-
-/* mtpr and mfpr Insturctions */
-#define _mtpr_(procregd, src)  __asm__("mtpr\t%0," procregd : /* no output */ : \
-				       "r" (src) : "cc")
-#define _mfpr_(procregd, dest) __asm__("mfpr\t" procregd ",%0" : "=r" (dest) : \
-				       /* no input */ "0" (dest) : "cc")
-
-/* Multiplication Instructions */
-#define _mulsbw_(src, dest)  	__asm__("mulsbw %1,%0" : "=r" (dest) : \
-                                   	"r" ((char)src) , "0" (dest))
-#define _mulubw_(src, dest)  	__asm__("mulubw %1,%0" : "=r" (dest) : \
-                                   	"r" ((unsigned char)src) , "0" (dest))
-#define _mulswd_(src, dest)  	__asm__("mulswd %1,%0" : "=r" (dest) : \
-                                   	"r" ((short)src) , "0" (dest))
-#define _muluwd_(src, dest)  	__asm__("muluwd %1,%0" : "=r" (dest) : \
-                                   	"r" ((unsigned short)src) , "0" (dest))
-#define _mulb_(src, dest)  	__asm__("mulb %1,%0" : "=r" (dest) : \
-					"ri" ((char)src) , "0" (dest))
-#define _mulw_(src, dest)  	__asm__("mulw %1,%0" : "=r" (dest) : \
-					"ri" ((short)src) , "0" (dest))
-#define _muld_(src, dest)  	__asm__("muld %1,%0" : "=r" (dest)  : \
-					"ri" ((int)src) , "0" (dest))
-#define _mullsd_(hi, lo, src1, src2)  	__asm__("mullsd %2,%3" \
-  					: =l (lo), =h (hi) \
-					: "r" ((unsigned int)src1) , "r" ((unsigned int)src2))
-#define _mullud_(hi, lo, src1, src2)  	__asm__("mullud %2,%3" \
-  					: =l (lo), =h (hi) \
-					: "r" ((int)src1) , "r" ((int)src2))
-
-/* Q-Format Multiplication Instructions */
-#define _mulqb_(src, dest)  	__asm__("mulqb %1,%0" : "=r" (dest) : \
-					"r" ((char)src) , "0" (dest))
-#define _mulqw_(src, dest)  	__asm__("mulqw %1,%0" : "=r" (dest) : \
-					"r" ((short)src) , "0" (dest))
-
-/* nop Instruction */
-#define _nop_()  __asm__("nop")
-
-/* Negate Instructions */
-#define _negb_(src, dest)  	__asm__("negb %1,%0" : "=r" (dest) : \
-					"r" ((char)src) , "0" (dest))
-#define _negw_(src, dest)  	__asm__("negw %1,%0" : "=r" (dest) : \
-					"r" ((short)src) , "0" (dest))
-#define _negd_(src, dest)  	__asm__("negd %1,%0" : "=r" (dest) : \
-					"r" ((int)src) , "0" (dest))
-
-/* or Instructions */
-#define _orb_(src, dest)  	__asm__("orb %1,%0" : "=r" (dest) : \
-                                   "ri" ((unsigned char)src) , "0" (dest))
-#define _orw_(src, dest)  	__asm__("orw %1,%0" : "=r" (dest) : \
-                                    "ri" ((unsigned short)src) , "0" (dest))
-#define _ord_(src, dest)  	__asm__("ord %1,%0" : "=r" (dest)  : \
-                                    "ri" ((unsigned int)src) , "0" (dest))
-
-/* Pop 1's Count Instructions */
-#define _popcntb_(src, dest)  	__asm__("popcntb %1,%0" : "=r" (dest) : \
-					"r" ((char)src) , "0" (dest))
-#define _popcntw_(src, dest)  	__asm__("popcntw %1,%0" : "=r" (dest) : \
-					"r" ((short)src) , "0" (dest))
-#define _popcntd_(src, dest)  	__asm__("popcntd %1,%0" : "=r" (dest)  : \
-                                    "r" ((int)src) , "0" (dest))
-
-/* Rotate and Mask Instructions */ 
-#define _ram_(shift, end, begin, dest, src) __asm__("ram %1, %2, %3, %0, %4" : \
-						    "=r" (dest) : \
-						    "i" ((unsigned char) shift), \
-						    "i" (end), "i" (begin), \
-						    "r" (src), "0" (dest))
-#define _rim_(shift, end, begin, dest, src) __asm__("rim %1, %2, %3, %0, %4" : \
-						    "=r" (dest) : \
-						    "i" ((unsigned char) shift), \
-						    "i" (end), "i" (begin), \
-						    "r" (src), "0" (dest))
-
-/* retx Instruction */
-#define _retx_()  __asm__("retx")
-
-/* Rotate Instructions */
-#define _rotb_(shift, dest)  __asm__("rotb %1,%0" : "=r" (dest) : \
-				     "i" ((unsigned char)shift) , "0" (dest))
-#define _rotw_(shift, dest)  __asm__("rotw %1,%0" : "=r" (dest) : \
-				     "i" ((unsigned char)shift) , "0" (dest))
-#define _rotd_(shift, dest)  __asm__("rotd %1,%0" : "=r" (dest)  : \
-				     "i" ((unsigned char)shift) , "0" (dest))
-#define _rotlb_(shift, dest) __asm__("rotlb %1,%0" : "=r" (dest) : \
-				     "r" ((unsigned char)shift) , "0" (dest))
-#define _rotlw_(shift, dest) __asm__("rotlw %1,%0" : "=r" (dest) : \
-				     "r" ((unsigned char)shift) , "0" (dest))
-#define _rotld_(shift, dest) __asm__("rotld %1,%0" : "=r" (dest)  : \
-				     "r" ((unsigned char)shift) , "0" (dest))
-#define _rotrb_(shift, dest) __asm__("rotrb %1,%0" : "=r" (dest) : \
-				     "r" ((unsigned char)shift) , "0" (dest))
-#define _rotrw_(shift, dest) __asm__("rotrw %1,%0" : "=r" (dest) : \
-				     "r" ((unsigned char)shift) , "0" (dest))
-#define _rotrd_(shift, dest) __asm__("rotrd %1,%0" : "=r" (dest)  : \
-				     "r" ((unsigned char)shift) , "0" (dest))
-
-/* Set Bit Instructions */
-#define _sbitb_(pos,dest)  __asm__("sbitb %1,%0" : "=mr" (dest) : \
-				   "i" ((unsigned char)pos) , "0" (dest) : "cc")
-#define _sbitw_(pos,dest)  __asm__("sbitw %1,%0" : "=mr" (dest) : \
-                                   "i" ((unsigned char)pos) , "0" (dest) : "cc")
-#define _sbitd_(pos,dest)  __asm__("sbitd %1,%0" : "=mr" (dest) : \
-                                   "i" ((unsigned char)pos) , "0" (dest) : "cc")
-
-/* setrfid Instruction */
-#define _setrfid_(src)		__asm__("setrfid %0" : /* No output */  : \
-					"r" (src) : "cc")
-
-/* Sign Extend Instructions */
-#define _sextbw_(src, dest)  	__asm__("sextbw %1,%0" : "=r" (dest) : \
-                                   "r" ((char)src) , "0" (dest) )
-#define _sextbd_(src, dest)  	__asm__("sextbd %1,%0" : "=r" (dest) : \
-                                    "r" ((char)src) , "0" (dest) )
-#define _sextwd_(src, dest)  	__asm__("sextwd %1,%0" : "=r" (dest) : \
-                                    "r" ((short)src) , "0" (dest) )
-
-/* Shift Left Logical Instructions */
-#define _sllb_(src, dest)  	__asm__("sllb %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _sllw_(src, dest)  	__asm__("sllw %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _slld_(src, dest)  	__asm__("slld %1,%0" : "=r" (dest)  : \
-					"ri" ((unsigned char)src) , "0" (dest))
-/* Shift Right Arithmetic Instructions */
-#define _srab_(src, dest)  	__asm__("srab %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _sraw_(src, dest)  	__asm__("sraw %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _srad_(src, dest)  	__asm__("srad %1,%0" : "=r" (dest)  : \
-					"ri" ((unsigned char)src) , "0" (dest))
-
-/* Shift Right Logical Instructions */
-#define _srlb_(src, dest)  	__asm__("srlb %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _srlw_(src, dest)  	__asm__("srlw %1,%0" : "=r" (dest) : \
-					"ri" ((unsigned char)src) , "0" (dest))
-#define _srld_(src, dest)  	__asm__("srld %1,%0" : "=r" (dest)  : \
-					"ri" ((unsigned char)src) , "0" (dest))
-				
-/* Store Instructions */
-#define _storb_(src,address)  	__asm__("storb %1,%0" : "=m" (address) : \
-					"ri" ((unsigned int)src))
-#define _storw_(src,address)  	__asm__("storw %1,%0" : "=m" (address) : \
-					"ri" ((unsigned int)src))
-#define _stord_(src,address)  	__asm__("stord %1,%0" : "=m" (address) : \
-					"ri" ((unsigned int)src))
-
-/* Store Multiple Instructions */
-#define _storm_(mask, src)  	__asm__("storm %1,%0" : /* No output here */ : \
-					"i" (mask) , "r" ((unsigned int)src))
-#define _stormp_(mask, src)  	__asm__("stormp %1,%0" : /* No output here */ : \
-					"i" (mask) , "r" ((unsigned int)src))
-
-/* Substruct Instructions */
-#define _subb_(src, dest)  __asm__("subb	%1, %0" : "=r" (dest) : \
-			           "ri" ((unsigned char)src), "0" (dest) : "cc")
-#define _subw_(src, dest)  __asm__("subw	%1, %0" : "=r" (dest) : \
-			           "ri" ((unsigned short)src), "0" (dest) : "cc")
-#define _subd_(src, dest)  __asm__("subd	%1, %0" : "=r" (dest) : \
-				   "ri" ((unsigned int)src), "0" (dest) : "cc")
-
-/* Substruct with Carry Instructions */
-#define _subcb_(src, dest) __asm__("subcb	%1, %0" : "=r" (dest) : \
-			           "ri" ((unsigned char)src), "0" (dest) : "cc")
-#define _subcw_(src, dest) __asm__("subcw	%1, %0" : "=r" (dest) : \
-				   "ri" ((unsigned short)src), "0" (dest) : "cc")
-#define _subcd_(src, dest) __asm__("subcd	%1, %0" : "=r" (dest) : \
-			           "ri" ((unsigned int)src), "0" (dest) : "cc")
-
-/* Q-Format Substruct Instructions */
-#define _subqb_(src, dest)  	__asm__("subqw %1,%0" : "=r" (dest)  : \
-                                        "r" ((char)src) , "0" (dest))
-#define _subqw_(src, dest)  	__asm__("subqw %1,%0" : "=r" (dest)  : \
-                                        "r" ((short)src) , "0" (dest))
-#define _subqd_(src, dest)  	__asm__("subqd %1,%0" : "=r" (dest)  : \
-                                        "r" ((short)src) , "0" (dest))
-
-/* Test Bit Instructions */
-#define _tbitb_(pos,dest)  __asm__("tbitb %0,%1" : /* No output */ : \
-                                   "i" ((unsigned char)pos) , "rm" (dest) : "cc")
-#define _tbitw_(pos,dest)  __asm__("tbitw %0,%1" : /* No output */ : \
-                                   "i" ((unsigned char)pos) , "rm" (dest) : "cc")
-#define _tbitd_(pos,dest)  __asm__("tbitd %0,%1" : /* No output */ : \
-                                   "i" ((unsigned char)pos) , "rm" (dest) : "cc")
-
-/* wait Instruction*/
-#define _wait_()  		__asm__ volatile ("wait" :  :  : "cc")
-
-/* xor Instructions */
-#define _xorb_(src, dest)  	__asm__("xorb %1,%0" : "=r" (dest) : \
-                                   "ri" ((unsigned char)src) , "0" (dest))
-#define _xorw_(src, dest)  	__asm__("xorw %1,%0" : "=r" (dest) : \
-                                    "ri" ((unsigned short)src) , "0" (dest))
-#define _xord_(src, dest)  	__asm__("xord %1,%0" : "=r" (dest)  : \
-                                    "ri" ((unsigned int)src) , "0" (dest))
-
-/* Zero Extend Instructions */
-#define _zextbw_(src, dest)  	__asm__("zextbw %1,%0" : "=r" (dest) : \
-					"r" ((unsigned char)src) , "0" (dest))
-#define _zextbd_(src, dest)  	__asm__("zextbd %1,%0" : "=r" (dest) : \
-					"r" ((unsigned char)src) , "0" (dest))
-#define _zextwd_(src, dest)  	__asm__("zextwd %1,%0" : "=r" (dest) : \
-					"r" ((unsigned short)src) , "0" (dest))
-
-#define _save_asm_(x) \
-  __asm__ volatile (x ::: "memory","cc", \
-		    "r0","r1","r2","r3","r4","r5","r6","r7", \
-		    "r8","r9","r10","r11","r12","r13")
-
-#endif  /* _ASM */
-
-
diff --git a/newlib/libc/machine/crx/sys/libh.h b/newlib/libc/machine/crx/sys/libh.h
deleted file mode 100644
index a7ac54b..0000000
--- a/newlib/libc/machine/crx/sys/libh.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* libh.h -- CRX default handlers
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#ifndef	_LIBH
-#define _LIBH
-
-/* These are the first 16 entries of the default dispatch table as defined
-   in the CompactRISC architecture:
-
-   Entry    Function
-   -----    --------
-    0	    NULL
-    1	    nmi
-    2	    NULL
-    3	    NULL
-    4	    NULL
-    5	    svc
-    6	    dvz
-    7	    flg
-    8	    bpt
-    9	    trc
-   10	    und
-   11	    NULL
-   12	    iad
-   13	    NULL
-   14	    dbg
-   15	    ise
-*/
-
-extern void (* const _dispatch_table[])(void);
-
-/* Function prototypes */
-void svc_handler(void);
-void dvz_handler(void);
-void flg_handler(void);
-void und_handler(void);
-void iad_handler(void);
-
-#endif  /* _LIBH */
diff --git a/newlib/libc/machine/crx/sys/syscall.h b/newlib/libc/machine/crx/sys/syscall.h
deleted file mode 100644
index f775fbb..0000000
--- a/newlib/libc/machine/crx/sys/syscall.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* syscall.h -- CRX virtual I/O and trap service codes
- *
- * Copyright (c) 2004 National Semiconductor Corporation
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#ifndef _SYSCALL_H
-#define _SYSCALL_H
-
-#include <sys/asm.h>
-
-/* SVC codes to pass to the debugger */
-
-/* Virtual I/O services */
-#define SVC_OPEN	0x401
-#define SVC_CLOSE	0x402
-#define SVC_READ	0x403
-#define SVC_WRITE	0x404
-#define SVC_LSEEK	0x405
-#define SVC_RENAME	0x406
-#define SVC_UNLINK	0x407
-#define SVC_GETENV	0x408
-
-/* Time service */
-#define SVC_TIME        0x300
-
-/* Start/end of program services */
-#define SVC_EOP		0x410
-
-/* Trap services */
-#define SVC_SVC		0x505
-#define SVC_DVZ		0x506
-#define SVC_FLG		0x507
-#define SVC_UND		0x50a
-#define SVC_IAD		0x50c
-
-
-/* Places the code of the requested service in R0, then transfers control
-   to the debugger using the BPT exception.
-   It is called from the start routine, VIO functions and the trap
-   handlers.  */
-
-#define STRINGIFY(x)	#x
-#define HOST_SERVICE(service) \
-  do { \
-    __asm__("movd\t$" STRINGIFY(service) ",r0"); \
-    _excp_(bpt); \
-    __asm__(".short\t0xFFFF"); \
-  } while (0)
-
-#endif  /* _SYSCALL_H */
-
diff --git a/newlib/libc/machine/d10v/Makefile.in b/newlib/libc/machine/d10v/Makefile.in
index 9736912..ace6f06 100644
--- a/newlib/libc/machine/d10v/Makefile.in
+++ b/newlib/libc/machine/d10v/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/d10v/aclocal.m4 b/newlib/libc/machine/d10v/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/d10v/aclocal.m4
+++ b/newlib/libc/machine/d10v/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/d10v/configure b/newlib/libc/machine/d10v/configure
index 98bab64..867ded9 100755
--- a/newlib/libc/machine/d10v/configure
+++ b/newlib/libc/machine/d10v/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/d30v/Makefile.in b/newlib/libc/machine/d30v/Makefile.in
index 9736912..ace6f06 100644
--- a/newlib/libc/machine/d30v/Makefile.in
+++ b/newlib/libc/machine/d30v/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/d30v/aclocal.m4 b/newlib/libc/machine/d30v/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/d30v/aclocal.m4
+++ b/newlib/libc/machine/d30v/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/d30v/configure b/newlib/libc/machine/d30v/configure
index 98bab64..867ded9 100755
--- a/newlib/libc/machine/d30v/configure
+++ b/newlib/libc/machine/d30v/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/fr30/Makefile.in b/newlib/libc/machine/fr30/Makefile.in
index 9736912..ace6f06 100644
--- a/newlib/libc/machine/fr30/Makefile.in
+++ b/newlib/libc/machine/fr30/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/fr30/aclocal.m4 b/newlib/libc/machine/fr30/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/fr30/aclocal.m4
+++ b/newlib/libc/machine/fr30/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/fr30/configure b/newlib/libc/machine/fr30/configure
index 028b7b4..1802ae6 100755
--- a/newlib/libc/machine/fr30/configure
+++ b/newlib/libc/machine/fr30/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/frv/Makefile.am b/newlib/libc/machine/frv/Makefile.am
deleted file mode 100644
index 1c65b9f..0000000
--- a/newlib/libc/machine/frv/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/frv/Makefile.in b/newlib/libc/machine/frv/Makefile.in
deleted file mode 100644
index 9736912..0000000
--- a/newlib/libc/machine/frv/Makefile.in
+++ /dev/null
@@ -1,327 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/frv/aclocal.m4 b/newlib/libc/machine/frv/aclocal.m4
deleted file mode 100644
index 55d5e67..0000000
--- a/newlib/libc/machine/frv/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/frv/configure b/newlib/libc/machine/frv/configure
deleted file mode 100755
index 028b7b4..0000000
--- a/newlib/libc/machine/frv/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.am
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/frv/configure.in b/newlib/libc/machine/frv/configure.in
deleted file mode 100644
index a5384f6..0000000
--- a/newlib/libc/machine/frv/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/arm configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(Makefile.am)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/frv/setjmp.S b/newlib/libc/machine/frv/setjmp.S
deleted file mode 100644
index 296eff7..0000000
--- a/newlib/libc/machine/frv/setjmp.S
+++ /dev/null
@@ -1,126 +0,0 @@
-# setjmp/longjmp for Frv.  The jmpbuf looks like this:
-#	
-# Register	jmpbuf offset
-# R16-R31	0x0-0x03c
-# R48-R63	0x40-0x7c
-# FR16-FR31     0x80-0xbc
-# FR48-FR63     0xc0-0xfc
-# LR            0x100
-# SP            0x104
-# FP            0x108
-#
-# R8 contains the pointer to jmpbuf
-
-#include <frv-asm.h>
-
-	.text
-	.global	EXT(setjmp)
-	.type	EXT(setjmp),@function
-EXT(setjmp):
-	stdi	gr16, @(gr8,0)
-	stdi	gr18, @(gr8,8)
-	stdi 	gr20, @(gr8,16)
-	stdi	gr22, @(gr8,24)
-	stdi	gr24, @(gr8,32)
-	stdi	gr26, @(gr8,40)
-	stdi	gr28, @(gr8,48)
-	stdi	gr30, @(gr8,56)
-#if __FRV_GPR__ != 32
-	stdi	gr48, @(gr8,64)
-	stdi	gr50, @(gr8,72)
-	stdi	gr52, @(gr8,80)
-	stdi	gr54, @(gr8,88)
-	stdi	gr56, @(gr8,96)
-	stdi	gr58, @(gr8,104)
-	stdi	gr60, @(gr8,112)
-	stdi	gr62, @(gr8,120)
-#endif
-
-#if __FRV_FPR__ != 0
-	stdfi	fr16, @(gr8,128)
-	stdfi	fr18, @(gr8,136)
-	stdfi 	fr20, @(gr8,144)
-	stdfi	fr22, @(gr8,152)
-	stdfi	fr24, @(gr8,160)
-	stdfi	fr26, @(gr8,168)
-	stdfi	fr28, @(gr8,176)
-	stdfi	fr30, @(gr8,184)
-#if __FRV_FPR__ != 32
-	stdfi	fr48, @(gr8,192)
-	stdfi	fr50, @(gr8,200)
-	stdfi	fr52, @(gr8,208)
-	stdfi	fr54, @(gr8,216)
-	stdfi	fr56, @(gr8,224)
-	stdfi	fr58, @(gr8,232)
-	stdfi	fr60, @(gr8,240)
-	stdfi	fr62, @(gr8,248)
-#endif
-#endif
-
-        movsg	lr, gr4
-	sti     gr4, @(gr8,256)
-	sti     sp, @(gr8,260)
-	sti     fp, @(gr8,264)
-	
-	mov     gr0,gr8
-	ret
-.Lend1:
-	.size	EXT(setjmp),.Lend1-EXT(setjmp)
-
-	.global	EXT(longjmp)
-	.type	EXT(longjmp),@function
-EXT(longjmp):
-	lddi	@(gr8,0), gr16
-	lddi	@(gr8,8), gr18
-	lddi 	@(gr8,16), gr20
-	lddi	@(gr8,24), gr22
-	lddi	@(gr8,32), gr24
-	lddi	@(gr8,40), gr26
-	lddi	@(gr8,48), gr28
-	lddi	@(gr8,56), gr30
-#if __FRV_GPR__ != 32
-	lddi	@(gr8,64), gr48
-	lddi	@(gr8,72), gr50
-	lddi	@(gr8,80), gr52
-	lddi	@(gr8,88), gr54
-	lddi	@(gr8,96), gr56
-	lddi	@(gr8,104), gr58
-	lddi	@(gr8,112), gr60
-	lddi	@(gr8,120), gr62
-#endif
-
-#if __FRV_FPR__ != 0
-	lddfi	@(gr8,128), fr16
-	lddfi	@(gr8,136), fr18
-	lddfi 	@(gr8,144), fr20
-	lddfi	@(gr8,152), fr22
-	lddfi	@(gr8,160), fr24
-	lddfi	@(gr8,168), fr26
-	lddfi	@(gr8,176), fr28
-	lddfi	@(gr8,184), fr30
-#if __FRV_FPR__ != 32
-	lddfi	@(gr8,192), fr48
-	lddfi	@(gr8,200), fr50
-	lddfi	@(gr8,208), fr52
-	lddfi	@(gr8,216), fr54
-	lddfi	@(gr8,224), fr56
-	lddfi	@(gr8,232), fr58
-	lddfi	@(gr8,240), fr60
-	lddfi	@(gr8,248), fr62
-#endif
-#endif
-
-        ldi     @(gr8,256), gr4
-	movgs   gr4,lr
-
-        ldi     @(gr8,260), sp
-        ldi     @(gr8,264), fp
-	
-# Value to return is in r9.  If zero, return 1
-	cmp	gr9, gr0, icc0
-	setlos	#1, gr8
-	ckne	icc0, cc4
-	cmov	gr9, gr8, cc4, 1
-	ret
-.Lend2:
-	.size	EXT(longjmp),.Lend2-EXT(longjmp2)
diff --git a/newlib/libc/machine/h8300/Makefile.am b/newlib/libc/machine/h8300/Makefile.am
index b0165eb..2ce8319 100644
--- a/newlib/libc/machine/h8300/Makefile.am
+++ b/newlib/libc/machine/h8300/Makefile.am
@@ -7,9 +7,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 noinst_LIBRARIES = lib.a
 
 lib_a_SOURCES = reg_memcpy.S reg_memset.S strcmp.S memcpy.S memset.S \
-	setjmp.S h8sx_strcpy.S
-lib_a_LIBADD = 
-lib_a_DEPENDENCIES = 
+	setjmp.S
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/h8300/Makefile.in b/newlib/libc/machine/h8300/Makefile.in
index 9599c92..ee3a9fc 100644
--- a/newlib/libc/machine/h8300/Makefile.in
+++ b/newlib/libc/machine/h8300/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,10 +84,9 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = reg_memcpy.S reg_memset.S strcmp.S memcpy.S memset.S 	setjmp.S h8sx_strcpy.S
+lib_a_SOURCES = reg_memcpy.S reg_memset.S strcmp.S memcpy.S memset.S \
+	setjmp.S
 
-lib_a_LIBADD = 
-lib_a_DEPENDENCIES = 
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@@ -105,8 +99,9 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
+lib_a_LIBADD = 
 lib_a_OBJECTS =  reg_memcpy.o reg_memset.o strcmp.o memcpy.o memset.o \
-setjmp.o h8sx_strcpy.o
+setjmp.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -132,8 +127,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/h8300/aclocal.m4 b/newlib/libc/machine/h8300/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/h8300/aclocal.m4
+++ b/newlib/libc/machine/h8300/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/h8300/configure b/newlib/libc/machine/h8300/configure
index 4a3c8cf..1cf9e4f 100755
--- a/newlib/libc/machine/h8300/configure
+++ b/newlib/libc/machine/h8300/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/h8300/defines.h b/newlib/libc/machine/h8300/defines.h
index 7ec12c4..c6ae3df 100644
--- a/newlib/libc/machine/h8300/defines.h
+++ b/newlib/libc/machine/h8300/defines.h
@@ -28,7 +28,6 @@
 #define S2H r6h
 
 #ifdef __H8300__
-
 #define MOVP	mov.w	/* pointers are 16 bits */
 #define ADDP	add.w
 #define CMPP	cmp.w
@@ -42,29 +41,9 @@
 #define S0P	r4
 #define S1P	r5
 #define S2P	r6
-
-#endif /* __H8300__ */
+#endif
 
 #ifdef __H8300H__
-
-#ifdef __NORMAL_MODE__
-
-#define MOVP	mov.w	/* pointers are 16 bits */
-#define ADDP	add.w
-#define CMPP	cmp.w
-#define PUSHP	push
-#define POPP	pop
-
-#define A0P	r0
-#define A1P	r1
-#define A2P	r2
-#define A3P	r3
-#define S0P	r4
-#define S1P	r5
-#define S2P	r6
-
-#else /* !__NORMAL_MODE__ */
-
 #define MOVP	mov.l	/* pointers are 32 bits */
 #define ADDP	add.l
 #define CMPP	cmp.l
@@ -79,35 +58,13 @@
 #define S1P	er5
 #define S2P	er6
 
-#endif /* !__NORMAL_MODE__ */
-
 #define A0E	e0
 #define A1E	e1
 #define A2E	e2
 #define A3E	e3
+#endif
 
-#endif /* __H8300H__ */
-
-#if defined (__H8300S__) || defined (__H8300SX__)
-
-#ifdef __NORMAL_MODE__
-
-#define MOVP	mov.w	/* pointers are 16 bits */
-#define ADDP	add.w
-#define CMPP	cmp.w
-#define PUSHP	push
-#define POPP	pop
-
-#define A0P	r0
-#define A1P	r1
-#define A2P	r2
-#define A3P	r3
-#define S0P	r4
-#define S1P	r5
-#define S2P	r6
-
-#else /* !__NORMAL_MODE__ */
-
+#ifdef __H8300S__
 #define MOVP	mov.l	/* pointers are 32 bits */
 #define ADDP	add.l
 #define CMPP	cmp.l
@@ -122,17 +79,8 @@
 #define S1P	er5
 #define S2P	er6
 
-#endif /* !__NORMAL_MODE__ */
-
 #define A0E	e0
 #define A1E	e1
 #define A2E	e2
 #define A3E	e3
-
-
-#ifdef __NORMAL_MODE__
-#define LEN(X) X
-#else
-#define LEN(X) e##X
 #endif
-#endif /* __H8300S__ */
diff --git a/newlib/libc/machine/h8300/h8sx_strcpy.S b/newlib/libc/machine/h8300/h8sx_strcpy.S
deleted file mode 100644
index db84771..0000000
--- a/newlib/libc/machine/h8300/h8sx_strcpy.S
+++ /dev/null
@@ -1,14 +0,0 @@
-; This file exists to provide a movsd implementation of strcpy().
-; Continue to use the generic version for targets other than h8sx.
-#ifdef __H8300SX__
-#include "setarch.h"
-
-	.global _strcpy
-_strcpy:
-	stm.l	er4-er6,@-er7
-	mov.l	er0,er6
-	mov.l	er1,er5
-1:	movsd	2f
-	bra	1b
-2:	rts/l	er4-er6
-#endif
diff --git a/newlib/libc/machine/h8300/memcpy.S b/newlib/libc/machine/h8300/memcpy.S
index 6af5a99..3465ce5 100644
--- a/newlib/libc/machine/h8300/memcpy.S
+++ b/newlib/libc/machine/h8300/memcpy.S
@@ -1,104 +1,12 @@
-#include "setarch.h"
-
 #include "defines.h"
 
-#ifdef __H8300SX__
-
-	.global _memcpy
-_memcpy:
-	stm.l	er4-er6,@-er7
-
-	; Set up source and destination pointers for movmd.
-	mov.l	er0,er6
-	mov.l	er1,er5
-
-	; See whether the copy is long enough to use the movmd.l code.
-	; Although the code can handle anything longer than 6 bytes,
-	; it can be more expensive than movmd.b for small moves.
-	; It's better to use a higher threshold to account for this.
-	;
-	; Note that the exact overhead of the movmd.l checks depends on
-	; the alignments of the length and pointers.  They are faster when
-	; er0 & 3 == er1 & 3 == er2 & 3, faster still when these values
-	; are 0.  This threshold is a compromise between the various cases.
-	cmp	#16,LEN(r2)
-	blo	simple
-
-	; movmd.l only works for even addresses.  If one of the addresses
-	; is odd and the other is not, fall back on a simple move.
-	bld	#0,r5l
-	bxor	#0,r6l
-	bcs	simple
-
-	; Make the addresses even.
-	bld	#0,r5l
-	bcc	word_aligned
-	mov.b	@er5+,@er6+
-	sub	#1,LEN(r2)
-
-word_aligned:
-	; See if copying one word would make the first operand longword
-	; aligned.  Although this is only really worthwhile if it aligns
-	; the second operand as well, it's no worse if doesn't, so it
-	; hardly seems worth the overhead of a "band" check.
-	bld	#1,r6l
-	bcc	fast_copy
-	mov.w	@er5+,@er6+
-	sub	#2,LEN(r2)
-
-fast_copy:
-	; Set (e)r4 to the number of longwords to copy.
-	mov	LEN(r2),LEN(r4)
-	shlr	#2,LEN(r4)
-
-#ifdef __NORMAL_MODE__
-	; 16-bit pointers and size_ts: one movmd.l is enough.  This code
-	; is never reached with r4 == 0.
-	movmd.l
-	and.w	#3,r2
-simple:
-	mov.w	r2,r4
-	beq	quit
-	movmd.b
-quit:
-	rts/l	er4-er6
-#else
-	; Skip the first iteration if the number of longwords is divisible
-	; by 0x10000.
-	mov.w	r4,r4
-	beq	fast_loop_next
-
-	; This loop copies r4 (!= 0) longwords the first time round and 65536
-	; longwords on each iteration after that.
-fast_loop:
-	movmd.l
-fast_loop_next:
-	sub.w	#1,e4
-	bhs	fast_loop
-
-	; Mop up any left-over bytes.  We could just fall through to the
-	; simple code after the "and" but the version below is quicker
-	; and only takes 10 more bytes.
-	and.w	#3,r2
-	beq	quit
-	mov.w	r2,r4
-	movmd.b
-quit:
-	rts/l	er4-er6
-
-simple:
-	; Simple bytewise copy.  We need to handle all lengths, including zero.
-	mov.w	r2,r4
-	beq	simple_loop_next
-simple_loop:
-	movmd.b
-simple_loop_next:
-	sub.w	#1,e2
-	bhs	simple_loop
-	rts/l	er4-er6
+#ifdef __H8300H__
+	.h8300h
 #endif
 
-#else
+#ifdef __H8300S__
+	.h8300s
+#endif
 
 	.global _memcpy
 _memcpy:
@@ -121,11 +29,7 @@ _memcpy:
 	bne	byteloop
 
 wordloop:
-#ifdef __NORMAL_MODE__
-	sub	#2,A1P
-#else
 	subs	#2,A1P		; point to word
-#endif
 	mov.w	@A1P,A2		; get word
 	mov.w	A2,@-A0P	; save word
 	CMPP	A0P,A3P		; at the front again ?
@@ -133,11 +37,7 @@ wordloop:
 	rts
 
 byteloop:
-#ifdef __NORMAL_MODE__
-	sub	#1,A1P
-#else
 	subs	#1,A1P		; point to byte
-#endif
 	mov.b	@A1P,A2L	; get byte
 	mov.b	A2L,@-A0P	; save byte
 	CMPP	A0P,A3P 	; at the front again ?
@@ -146,4 +46,3 @@ byteloop:
 	; return with A0 pointing to dst
 quit:	rts
 
-#endif
diff --git a/newlib/libc/machine/h8300/memset.S b/newlib/libc/machine/h8300/memset.S
index c92169c..c12f17b 100644
--- a/newlib/libc/machine/h8300/memset.S
+++ b/newlib/libc/machine/h8300/memset.S
@@ -1,63 +1,13 @@
-#include "setarch.h"
-
 #include "defines.h"
 
-#if defined (__H8300SX__)
-
-	.global	_memset
-_memset:
-	; Use er3 is a temporary since er0 must remain unchanged on exit.
-	mov.l	er0,er3
-
-	; Fill er1 with the byte to copy.
-	mov.b	r1l,r1h
-	mov.w	r1,e1
-
-	; Account for any excess bytes and words that will be copied after
-	; the main loop.  r2 >= 0 if there is a longword to copy.
-	sub	#4,LEN(r2)
-	blo	longs_done
-
-	; Copy one byte if doing so will make er3 word-aligned.
-	; This isn't needed for correctness but it makes the main loop
-	; slightly faster.
-	bld	#0,r3l
-	bcc	word_aligned
-	mov.b	r1l,@er3+
-	sub	#1,LEN(r2)
-	blo	longs_done
-
-word_aligned:
-	; Likewise one word for longword alignment.
-	bld	#1,r3l
-	bcc	long_copy
-	mov.w	r1,@er3+
-	sub	#2,LEN(r2)
-	blo	longs_done
-
-long_copy:
-	; Copy longwords.
-	mov.l	er1,@er3+
-	sub	#4,LEN(r2)
-	bhs	long_copy
-
-longs_done:
-	; At this point, we need to copy r2 & 3 bytes.  Copy a word
-	; if necessary.
-	bld	#1,r2l
-	bcc	words_done
-	mov.w	r1,@er3+
-
-words_done:
-	; Copy a byte.
-	bld	#0,r2l
-	bcc	bytes_done
-	mov.b	r1l,@er3+
+#ifdef __H8300H__
+	.h8300h
+#endif
 
-bytes_done:
-	rts
+#ifdef __H8300S__
+	.h8300s
+#endif
 
-#else
 
 ; A0P pointer to cursor
 ; A1P thing to copy
@@ -99,4 +49,3 @@ byteloop:
 	bne	byteloop
 	rts
 
-#endif
diff --git a/newlib/libc/machine/h8300/reg_memcpy.S b/newlib/libc/machine/h8300/reg_memcpy.S
index 5402fc4..772a43c 100644
--- a/newlib/libc/machine/h8300/reg_memcpy.S
+++ b/newlib/libc/machine/h8300/reg_memcpy.S
@@ -1,7 +1,14 @@
-#include "setarch.h"
-
 #include "defines.h"
 
+#ifdef __H8300H__
+	.h8300h
+#endif
+
+#ifdef __H8300S__
+	.h8300s
+#endif
+
+
 	; dst A0
 	; src A1
 	; len A2
@@ -14,12 +21,8 @@ ___reg_memcpy:
 	CMPP	A0P,A3P	; see if anything to do
 	beq	quit
 
-loop:
-#ifdef __NORMAL_MODE__
-	sub     #1,A1P		; point to byte
-#else
-	subs    #1,A1P          ; point to byte
-#endif
+
+loop:	subs	#1,A1P		; point to byte
 	mov.b	@A1P,A2L	; get byte
 	mov.b	A2L,@-A0P	; save byte
 	CMPP	A0P,A3P 	; at the front again ?
diff --git a/newlib/libc/machine/h8300/reg_memset.S b/newlib/libc/machine/h8300/reg_memset.S
index ce4f5ca..8e58c5e 100644
--- a/newlib/libc/machine/h8300/reg_memset.S
+++ b/newlib/libc/machine/h8300/reg_memset.S
@@ -1,7 +1,14 @@
-#include "setarch.h"
-
 #include "defines.h"
 
+#ifdef __H8300H__
+	.h8300h
+#endif
+
+#ifdef __H8300S__
+	.h8300s
+#endif
+
+
 	; dst A0
 	; src A1
 	; len A2
@@ -14,13 +21,8 @@ ___reg_memset:
 
 memloop:
 	mov.b	A1L,@A0P
-#ifdef __NORMAL_MODE__
-	add	#1,A0P
-	sub	#1,A2P
-#else
 	adds	#1,A0P
 	subs	#1,A2P
-#endif
 	MOVP	A2P,A2P
 	bne	memloop
 
diff --git a/newlib/libc/machine/h8300/setarch.h b/newlib/libc/machine/h8300/setarch.h
deleted file mode 100644
index 56bdaaf..0000000
--- a/newlib/libc/machine/h8300/setarch.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifdef __H8300H__
-#ifdef __NORMAL_MODE__
-	.h8300hn
-#else
-	.h8300h
-#endif
-#endif
-#ifdef __H8300S__
-#ifdef __NORMAL_MODE__
-	.h8300sn
-#else
-	.h8300s
-#endif
-#endif
-#ifdef __H8300SX__
-#ifdef __NORMAL_MODE__
-	.h8300sxn
-#else
-	.h8300sx
-#endif
-#endif
diff --git a/newlib/libc/machine/h8300/setjmp.S b/newlib/libc/machine/h8300/setjmp.S
index cb79e49..9e71640 100644
--- a/newlib/libc/machine/h8300/setjmp.S
+++ b/newlib/libc/machine/h8300/setjmp.S
@@ -1,26 +1,32 @@
-#include "setarch.h"
-
 	.file "setjmp.S"
 
+#ifdef __H8300H__
+	.h8300h
+#endif
+
+#ifdef __H8300S__
+	.h8300s
+#endif
+
 	.section .text
 	.align	2
 	.global	_setjmp
 _setjmp:
-#if defined(__H8300SX__)
-	mov.l	er7,@er0+
-	mov.l	er6,@er0+
-	mov.l	er5,@er0+
-	mov.l	er4,@er0+
-	mov.l	@sp,@er0
-	sub.l   er0,er0
-#elif defined(__H8300H__) || defined(__H8300S__)
+#ifdef __H8300H__
+	mov.l	er7,@er0
+	mov.l	er6,@(4,er0)
+	mov.l	er5,@(8,er0)
+	mov.l	er4,@(12,er0)
+	mov.l	@sp,er1
+	mov.l	er1,@(16,er0)
+#else
+#ifdef __H8300S__
 	mov.l	er7,@er0
 	mov.l	er6,@(4,er0)
 	mov.l	er5,@(8,er0)
 	mov.l	er4,@(12,er0)
 	mov.l	@sp,er1
 	mov.l	er1,@(16,er0)
-	sub.l   er0,er0
 #else
 	mov.w	r7,@r0
 	mov.w	r6,@(2,r0)
@@ -28,31 +34,28 @@ _setjmp:
 	mov.w	r4,@(6,r0)
 	mov.w   @sp,r1
 	mov.w	r1,@(8,r0)
-	sub.w	r0,r0
 #endif
+#endif
+	sub.w	r0,r0
 	rts
 
 	.global	_longjmp
 _longjmp:
-#if defined(__H8300H__) || defined (__H8300S__) || defined (__H8300SX__)
+#ifdef __H8300H__
 	mov.l	@er0+,er7
 	mov.l	@er0+,er6
 	mov.l	@er0+,er5
 	mov.l	@er0+,er4
-#if defined(__H8300SX__)
-	mov.l	@er0,@sp
-#else
 	mov.l	@er0,er2
 	mov.l	er2,@sp
-#endif
-#if (__INT_MAX__ <= 32767)
-	mov.w	r1,r0
 #else
-	mov.l   er1,er0
-#endif
-	bne	.L1
-	sub	er0,er0
-	adds	#1,er0
+#ifdef __H8300S__
+	mov.l	@er0+,er7
+	mov.l	@er0+,er6
+	mov.l	@er0+,er5
+	mov.l	@er0+,er4
+	mov.l	@er0,er2
+	mov.l	er2,@sp
 #else
 	mov.w	@r0+,r7
 	mov.w	@r0+,r6
@@ -60,9 +63,10 @@ _longjmp:
 	mov.w	@r0+,r4
 	mov.w	@r0,r2
 	mov.w	r2,@sp
+#endif
+#endif
 	mov.w	r1,r0
 	bne	.L1
 	mov.w	#1,r0
-#endif
 .L1:
 	rts
diff --git a/newlib/libc/machine/h8300/strcmp.S b/newlib/libc/machine/h8300/strcmp.S
index c5d7094..8dec7c0 100644
--- a/newlib/libc/machine/h8300/strcmp.S
+++ b/newlib/libc/machine/h8300/strcmp.S
@@ -1,23 +1,13 @@
-#include "setarch.h"
-
 #include "defines.h"
 
-#if defined (__H8300SX__)
-	.global _strcmp
-_strcmp:
-	mov.l	er0,er2
-loop:
-	mov.b	@er2+,r0l
-	beq	eos
-	sub.b	@er1+,r0l
-	beq	loop
-	exts.l	#2,er0
-	rts
-eos:
-	sub.b	@er1,r0l
-	exts.l	#2,er0
-	rts
-#else
+#ifdef __H8300H__
+	.h8300h
+#endif
+
+#ifdef __H8300S__
+	.h8300s
+#endif
+
 	.section .text
 	.align 2
 	.global _strcmp
@@ -30,11 +20,7 @@ _strcmp:
 	mov.b	@A3P+,A0L
 	cmp.b	A0L,A1L
 	beq	.L5
-#ifdef __NORMAL_MODE__
-	sub	#1,A3P
-#else
 	subs	#1,A3P
-#endif
 .L3:
 	mov.b	@(-1,A2P),A0L
 	mov.b	@A3P,A1L
@@ -57,4 +43,3 @@ _strcmp:
 #endif
 	rts
 	.end
-#endif
diff --git a/newlib/libc/machine/h8500/Makefile.in b/newlib/libc/machine/h8500/Makefile.in
index 9dbadf7..2c2a17e 100644
--- a/newlib/libc/machine/h8500/Makefile.in
+++ b/newlib/libc/machine/h8500/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -130,8 +125,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/h8500/aclocal.m4 b/newlib/libc/machine/h8500/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/h8500/aclocal.m4
+++ b/newlib/libc/machine/h8500/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/h8500/configure b/newlib/libc/machine/h8500/configure
index ec4e3cf..d1b4138 100755
--- a/newlib/libc/machine/h8500/configure
+++ b/newlib/libc/machine/h8500/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/hppa/DEFS.h b/newlib/libc/machine/hppa/DEFS.h
index a8b19b5..9c0aa1e 100644
--- a/newlib/libc/machine/hppa/DEFS.h
+++ b/newlib/libc/machine/hppa/DEFS.h
@@ -24,29 +24,6 @@
 #define	EXIT(Name)	BLANK	M_EXIT	(Name,PROF_/**/Name)
 #define	EXITC(Name)	BLANK	M_EXITC	(Name,PROF_/**/Name)
 
-#if 0
-#define TEXT_SEGMENT \
-        .SPACE  $TEXT$          !\
-        .SUBSPA $CODE$
-#define RO_SEGMENT \
-        .SPACE  $TEXT$          !\
-        .SUBSPA $lit$
-#define DATA_SEGMENT \
-        .SPACE  $PRIVATE$          !\
-        .SUBSPA $data$
-#define BSS_SEGMENT \
-        .SPACE  $PRIVATE$          !\
-        .SUBSPA $bss$
-#else
-#define TEXT_SEGMENT .text
-#define RO_SEGMENT .rodata
-#define DATA_SEGMENT .data
-#define BSS_SEGMENT .bss
-#endif
-
-
-
-
 #ifdef PROF
 
 ;
@@ -59,7 +36,8 @@
 ; profile data).
 ;
 #define M_ENTRY(name,prof)	\
-	TEXT_SEGMENT		!\
+	.SPACE	$TEXT$		!\
+	.SUBSPA	$CODE$		!\
         .label name		!\
         .PROC			!\
 	.CALLINFO CALLER,SAVE_RP !\
@@ -85,7 +63,8 @@
 
 
 #define M_ENTRYC(name,prof)	\
-	TEXT_SEGMENT		!\
+	.SPACE	$TEXT$		!\
+	.SUBSPA	$CODE$		!\
         .label name		!\
         .PROC			!\
 	.CALLINFO CALLER,SAVE_RP !\
@@ -118,7 +97,8 @@
 	.EXIT			!\
         .PROCEND		!\
         .EXPORT	name,ENTRY	!\
-	DATA_SEGMENT		!\
+	.SPACE	$PRIVATE$	!\
+	.SUBSPA	$DATA$		!\
 	.label prof		!\
 	.WORD	0		!\
 	.IMPORT	$global$,DATA	!\
@@ -130,7 +110,8 @@
 	.EXIT			!\
         .PROCEND		!\
         .EXPORT	name,ENTRY	!\
-	DATA_SEGMENT		!\
+	.SPACE	$PRIVATE$	!\
+	.SUBSPA	$DATA$		!\
 	.label prof		!\
 	.WORD	0		!\
 	.IMPORT	$global$,DATA	!\
@@ -139,14 +120,16 @@
 #else	/* NOT profiling */
 
 #define M_ENTRY(name,prof)	\
-	TEXT_SEGMENT		!\
+        .SPACE $TEXT$	!\
+        .SUBSPA $CODE$	!\
         .label name	!\
         .PROC		!\
         .CALLINFO	!\
 	.ENTRY
 
 #define M_ENTRYC(name,prof)	\
-	TEXT_SEGMENT		!\
+        .SPACE	$TEXT$	!\
+        .SUBSPA	$CODE$	!\
         .label name	!\
         .PROC		!\
         .CALLINFO CALLER,SAVE_RP	!\
@@ -175,4 +158,3 @@
 
 
 #endif
-
diff --git a/newlib/libc/machine/hppa/Makefile.in b/newlib/libc/machine/hppa/Makefile.in
index 6c154d9..aa07c2f 100644
--- a/newlib/libc/machine/hppa/Makefile.in
+++ b/newlib/libc/machine/hppa/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,9 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES =  	memchr.S memcmp.S memcpy.S memset.S setjmp.S strcat.S strcmp.S 	strcpy.S strlen.S strncat.S strncmp.S strncpy.S
+lib_a_SOURCES = \
+	memchr.S memcmp.S memcpy.S memset.S setjmp.S strcat.S strcmp.S \
+	strcpy.S strlen.S strncat.S strncmp.S strncpy.S
 
 
 ACLOCAL_AMFLAGS = -I ../../..
@@ -131,8 +128,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/hppa/aclocal.m4 b/newlib/libc/machine/hppa/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/hppa/aclocal.m4
+++ b/newlib/libc/machine/hppa/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/hppa/configure b/newlib/libc/machine/hppa/configure
index ec6b96e..95db997 100755
--- a/newlib/libc/machine/hppa/configure
+++ b/newlib/libc/machine/hppa/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/hppa/pcc_prefix.s b/newlib/libc/machine/hppa/pcc_prefix.s
index 61bf9c9..24d5254 100644
--- a/newlib/libc/machine/hppa/pcc_prefix.s
+++ b/newlib/libc/machine/hppa/pcc_prefix.s
@@ -334,7 +334,6 @@ sarg: .equ	sr1	; argument
 ; Software Architecture Pseudo Registers
 previous_sp: .equ	64	; old stack pointer (locates previous frame)
 
-#if 0
 ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ;~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ; Standard space and subspace definitions.  version A.08.06
@@ -386,8 +385,5 @@ previous_sp: .equ	64	; old stack pointer (locates previous frame)
 ; message to be brought in from libgloss/hp-milli.s
         .space $PRIVATE$
         .subspa $DATA$
-#else
-	.data
-#endif
         .import ___hp_free_copyright,data
 L$copyright .word ___hp_free_copyright
diff --git a/newlib/libc/machine/hppa/setjmp.S b/newlib/libc/machine/hppa/setjmp.S
index 7dd7c74..6f3668e 100644
--- a/newlib/libc/machine/hppa/setjmp.S
+++ b/newlib/libc/machine/hppa/setjmp.S
@@ -1,40 +1,23 @@
-/* Copyright (c) 1995, 2002 Red Hat Incorporated.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *    Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- *    Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- *    The name of Red Hat Incorporated may not be used to endorse
- *    or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+/* Copyright (c) 1995 Cygnus Support.
+   All rights reserved.
+
+   Redistribution and use in source and binary forms are permitted
+   provided that the above copyright notice and this paragraph are
+   duplicated in all such forms and that any documentation,
+   advertising materials, and other materials related to such
+   distribution and use acknowledge that the software was developed
+   at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
+   endorse or promote products derived from this software without
+   specific prior written permission.
+   THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  */
 
 /* Note I don't know an easy way to get the FP version into the
    traditional C library and the non-FP version into the soft-float
    library.  Maybe we'll have to have -msoft-float trigger something
    like -DSOFT_FLOAT if this issue ever arises.  */
 
-#include "DEFS.h"
-
-#if 0
 	.SPACE $PRIVATE$
 	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
 	.SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
@@ -44,8 +27,8 @@
 	.IMPORT $global$,DATA
 	.IMPORT $$dyncall,MILLICODE
 ; gcc_compiled.:
-#endif
-	TEXT_SEGMENT
+	.SPACE $TEXT$
+	.SUBSPA $CODE$
 
 	.align 4
 	.EXPORT setjmp,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR
diff --git a/newlib/libc/machine/i386/Makefile.am b/newlib/libc/machine/i386/Makefile.am
index d48f3ae..100d8c4 100644
--- a/newlib/libc/machine/i386/Makefile.am
+++ b/newlib/libc/machine/i386/Makefile.am
@@ -5,30 +5,24 @@ AUTOMAKE_OPTIONS = cygnus
 INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 if MACH_ADD_SETJMP
-mach_add_obj=setjmp.$(oext)
+mach_add_src=setjmp.S
 else
-mach_add_obj=
+mach_add_src=
 endif
 
 LIB_SOURCES = \
 	memchr.S memcmp.S memcpy.S memset.S strchr.S \
-	memmove.S strlen.S i386mach.h
+	memmove.S strlen.S $(mach_add_src) i386mach.h
 
 libi386_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libi386.la
 libi386_la_SOURCES = $(LIB_SOURCES)
-EXTRA_libi386_la_SOURCES = setjmp.S
-libi386_la_LIBADD = $(mach_add_obj)
-libi386_la_DEPENDENCIES = $(mach_add_obj)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = $(LIB_SOURCES)
-lib_a_LIBADD = $(mach_add_obj)
-lib_a_DEPENDENCIES = $(mach_add_obj)
-EXTRA_lib_a_SOURCES = setjmp.S
 noinst_DATA =
 endif # USE_LIBTOOL
 
diff --git a/newlib/libc/machine/i386/Makefile.in b/newlib/libc/machine/i386/Makefile.in
index 064418b..7866af9 100644
--- a/newlib/libc/machine/i386/Makefile.in
+++ b/newlib/libc/machine/i386/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,22 +58,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
@@ -81,10 +73,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
 libm_machine_dir = @libm_machine_dir@
@@ -96,26 +86,22 @@ sys_dir = @sys_dir@
 AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-@MACH_ADD_SETJMP_TRUE@mach_add_obj = setjmp.$(oext)
-@MACH_ADD_SETJMP_FALSE@mach_add_obj = 
+@MACH_ADD_SETJMP_TRUE@mach_add_src = @MACH_ADD_SETJMP_TRUE@setjmp.S
+@MACH_ADD_SETJMP_FALSE@mach_add_src = 
 
-LIB_SOURCES =  	memchr.S memcmp.S memcpy.S memset.S strchr.S 	memmove.S strlen.S i386mach.h
+LIB_SOURCES = \
+	memchr.S memcmp.S memcpy.S memset.S strchr.S \
+	memmove.S strlen.S $(mach_add_src) i386mach.h
 
 
 libi386_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libi386.la
-@USE_LIBTOOL_TRUE@libi386_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@EXTRA_libi386_la_SOURCES = setjmp.S
-@USE_LIBTOOL_TRUE@libi386_la_LIBADD = $(mach_add_obj)
-@USE_LIBTOOL_TRUE@libi386_la_DEPENDENCIES = $(mach_add_obj)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libi386.la
+@USE_LIBTOOL_TRUE@libi386_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(mach_add_obj)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(mach_add_obj)
-@USE_LIBTOOL_FALSE@EXTRA_lib_a_SOURCES = setjmp.S
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@@ -128,11 +114,12 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  memchr.$(OBJEXT) memcmp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@memcpy.$(OBJEXT) memset.$(OBJEXT) strchr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@memmove.$(OBJEXT) strlen.$(OBJEXT)
+lib_a_LIBADD = 
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  memchr.o memcmp.o memcpy.o memset.o \
+@USE_LIBTOOL_FALSE@strchr.o memmove.o strlen.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
+libi386_la_LIBADD = 
 @USE_LIBTOOL_TRUE@libi386_la_OBJECTS =  memchr.lo memcmp.lo memcpy.lo \
 @USE_LIBTOOL_TRUE@memset.lo strchr.lo memmove.lo strlen.lo
 CFLAGS = @CFLAGS@
@@ -149,12 +136,12 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(EXTRA_lib_a_SOURCES) $(libi386_la_SOURCES) $(EXTRA_libi386_la_SOURCES)
+SOURCES = $(lib_a_SOURCES) $(libi386_la_SOURCES)
 OBJECTS = $(lib_a_OBJECTS) $(libi386_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
+.SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
 
@@ -163,8 +150,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -184,11 +170,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -197,7 +178,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libc/machine/i386/aclocal.m4 b/newlib/libc/machine/i386/aclocal.m4
index 35519ac..a5208f1 100644
--- a/newlib/libc/machine/i386/aclocal.m4
+++ b/newlib/libc/machine/i386/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,60 +284,41 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
 
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
+
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
 # Save cache, so that ltconfig can load it
 AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
 AC_CACHE_LOAD
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -431,43 +329,27 @@ AC_SUBST(LIBTOOL)dnl
 exec 5>>./config.log
 ])
 
-AC_DEFUN([AC_LIBTOOL_SETUP],
+AC_DEFUN(AC_LIBTOOL_SETUP,
 [AC_PREREQ(2.13)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 AC_REQUIRE([AC_PROG_NM])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
 [libtool_flags="$libtool_flags --enable-dlopen"])
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
@@ -477,20 +359,14 @@ AC_ARG_ENABLE(libtool-lock,
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -505,31 +381,12 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -537,56 +394,33 @@ ia64-*-hpux*)
   ;;
 
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+[*-*-cygwin* | *-*-mingw*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  ])
+])
 esac
 ])
 
 # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
 
 # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
 
 # AC_ENABLE_SHARED - implement the --enable-shared flag
 # Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
 <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -605,21 +439,21 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
 # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)])
 
 # AC_ENABLE_STATIC - implement the --enable-static flag
 # Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
 <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -638,8 +472,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])
 
 # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_STATIC(no)])
 
 
@@ -647,14 +480,14 @@ AC_ENABLE_STATIC(no)])
 # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(fast-install,
 changequote(<<, >>)dnl
 <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -672,98 +505,12 @@ esac],
 enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_FAST_INSTALL(no)])
 
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
 # AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -771,20 +518,16 @@ AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
+changequote(,)dnl
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
@@ -806,17 +549,17 @@ elif test "$with_gnu_ld" = yes; then
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL(lt_cv_path_LD,
+AC_CACHE_VAL(ac_cv_path_LD,
 [if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -825,9 +568,9 @@ AC_CACHE_VAL(lt_cv_path_LD,
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -837,240 +580,56 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_PROG_LD_GNU
 ])
 
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
 ])
 
-
 # AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
+AC_CACHE_VAL(ac_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi])
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
 ])
 
 # AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
+AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
+case "$host" in
+*-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
@@ -1084,39 +643,33 @@ esac
 ])
 
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case "$enable_ltdl_convenience" in
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   AC_CHECK_LIB(ltdl, main,
   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
   [if test x"$enable_ltdl_install" = xno; then
@@ -1127,8 +680,8 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
@@ -1136,91 +689,15 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   fi
 ])
 
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
 dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
 
 dnl This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])dnl
 
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libc/machine/i386/configure b/newlib/libc/machine/i386/configure
index 60bb861..6bd150b 100755
--- a/newlib/libc/machine/i386/configure
+++ b/newlib/libc/machine/i386/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -40,8 +32,6 @@ ac_help="$ac_help
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -59,6 +49,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -173,6 +164,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -343,6 +335,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -508,12 +505,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -573,7 +574,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -827,79 +827,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -917,34 +854,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:948: checking host system type" >&5
+echo "configure:864: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -964,52 +880,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:969: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:987: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1025,21 +900,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1030: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:905: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1043: checking for working autoconf" >&5
+echo "configure:918: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1051,21 +926,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1056: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:931: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1069: checking for working autoheader" >&5
+echo "configure:944: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1078,7 +953,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1082: checking for working makeinfo" >&5
+echo "configure:957: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1103,7 +978,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
+echo "configure:982: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1133,7 +1008,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
+echo "configure:1012: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1182,7 +1057,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1186: checking whether we are using GNU C" >&5
+echo "configure:1061: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1191,7 +1066,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1206,7 +1081,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1210: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1085: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1234,10 +1109,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1118: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_word" >&5
+echo "configure:1139: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1269,7 +1167,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_word" >&5
+echo "configure:1171: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1301,7 +1199,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
+echo "configure:1203: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1333,7 +1231,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1337: checking for $ac_word" >&5
+echo "configure:1235: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1378,7 +1276,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1382: checking for a BSD compatible install" >&5
+echo "configure:1280: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1431,11 +1329,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1334: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1364,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1368: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,10 +1374,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1503,6 +1398,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1513,52 +1420,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1567,12 +1428,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1587,7 +1442,7 @@ if test "${use_libtool}" = "yes"; then
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -1610,7 +1465,7 @@ fi
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -1633,7 +1488,7 @@ fi
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -1652,10 +1507,40 @@ else
   enable_fast_install=yes
 fi
 
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1514: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1544: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1570,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1574: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1621,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1625: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1653,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1657: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1664,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1668 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1695,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1704: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1709,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1728,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1732: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1883,18 +1768,12 @@ else
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+echo "configure:1775: checking for ld used by GCC" >&5
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
@@ -1916,12 +1795,12 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1799: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1802: checking for non-GNU ld" >&5
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -z "$LD"; then
@@ -1929,11 +1808,11 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -1942,11 +1821,11 @@ else
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   echo "$ac_t""$LD" 1>&6
 else
@@ -1954,74 +1833,59 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
+echo "configure:1837: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi
 fi
 
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
+echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
 
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
+echo "configure:1853: checking for BSD-compatible nm" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi
 fi
 
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:1889: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2041,482 +1905,14 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
 
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 
 libtool_flags="$libtool_flags --enable-win32-dll"
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
@@ -2528,25 +1924,14 @@ fi
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
+  echo '#line 1933 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -2561,48 +1946,24 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:1955: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1960 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2612,13 +1973,6 @@ else
   lt_cv_cc_needs_belf=no
 fi
 rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
 fi
 
 echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
@@ -2628,11 +1982,11 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   fi
   ;;
 
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+*-*-cygwin* | *-*-mingw*)
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:1990: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2018,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2022: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2053,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2057: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2085,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2089: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2120,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2124: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2152,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2156: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2830,77 +2184,8 @@ else
 fi
 fi
 
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  
+
 esac
 
 
@@ -2954,14 +2239,12 @@ rm -f confcache
 
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -2975,7 +2258,7 @@ fi
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -2984,11 +2267,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 # clobbered by the next message.
 exec 5>>./config.log
 
-  
-
-  
-	 
-	 
 fi
 
 
@@ -3146,24 +2424,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -3176,6 +2442,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -3184,26 +2455,14 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
 s%@machine_dir@%$machine_dir%g
 s%@sys_dir@%$sys_dir%g
 s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@OBJDUMP@%$OBJDUMP%g
 s%@LIBTOOL@%$LIBTOOL%g
@@ -3217,7 +2476,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/i386/f_atan2.S b/newlib/libc/machine/i386/f_atan2.S
deleted file mode 100644
index 5bb074f..0000000
--- a/newlib/libc/machine/i386/f_atan2.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/* 
-Fast version of atan2 using Intel float instructions.
-
-   double _f_atan2 (double y, double x);
-
-Function computes arctan ( y / x ).
-There is no error checking or setting of errno.
-*/
-	
-	#include "i386mach.h"
-
-	.global SYM (_f_atan2)
-       SOTYPE_FUNCTION(_f_atan2)
-
-SYM (_f_atan2):
-	pushl ebp
-	movl esp,ebp
-	fldl 8(ebp)
-	fldl 16(ebp)
-	fpatan
-
-	leave
-	ret
-
-#endif
diff --git a/newlib/libc/machine/i386/f_atan2f.S b/newlib/libc/machine/i386/f_atan2f.S
deleted file mode 100644
index 6df0c75..0000000
--- a/newlib/libc/machine/i386/f_atan2f.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of atan2f using Intel float instructions.
-
-   float _f_atan2f (float y, float x);
-
-Function computes arctan ( y / x ).
-There is no error checking or setting of errno.
-*/
-
-	#include "i386mach.h"
-
-	.global SYM (_f_atan2f)
-       SOTYPE_FUNCTION(_f_atan2f)
-
-SYM (_f_atan2f):
-	pushl ebp
-	movl esp,ebp
-	flds 8(ebp)
-	flds 12(ebp)
-	fpatan
-
-	leave
-	ret
-
-#endif
diff --git a/newlib/libc/machine/i386/f_exp.c b/newlib/libc/machine/i386/f_exp.c
deleted file mode 100644
index 0ec721b..0000000
--- a/newlib/libc/machine/i386/f_exp.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1998,2002 by Red Hat Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of exp using Intel float instructions.
-
-   double _f_exp (double x);
-
-Function computes e ** x.  The following special cases exist:
-   1. if x is 0.0 ==> return 1.0
-   2. if x is infinity ==> return infinity
-   3. if x is -infinity ==> return 0.0
-   4. if x is NaN ==> return x
-There is no error checking or setting of errno.
-*/
-
-
-#include <math.h>
-#include <ieeefp.h>
-#include "f_math.h"
-
-double _f_exp (double x)
-{
-   if (check_finite(x))
-     {
-       double result;
-       asm ("fldl2e; fmulp; fld %%st; frndint; fsub %%st,%%st(1); fxch;" \
-          "fchs; f2xm1; fld1; faddp; fxch; fld1; fscale; fstp %%st(1); fmulp" :
-          "=t"(result) : "0"(x));
-       return result;
-     }
-   else if (x == -infinity())
-     return 0.0;
-
-   return x;
-}
-
-#endif
diff --git a/newlib/libc/machine/i386/f_expf.c b/newlib/libc/machine/i386/f_expf.c
deleted file mode 100644
index b32d1f2..0000000
--- a/newlib/libc/machine/i386/f_expf.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of exp using Intel float instructions.
-
-   float _f_expf (float x);
-
-Function computes e ** x.  The following special cases exist:
-   1. if x is 0.0 ==> return 1.0
-   2. if x is infinity ==> return infinity
-   3. if x is -infinity ==> return 0.0
-   4. if x is NaN ==> return x
-There is no error checking or setting of errno.
-*/
-
-
-#include <math.h>
-#include <ieeefp.h>
-#include "f_math.h"
-
-float _f_expf (float x)
-{
-   if (check_finitef(x))
-     {
-       float result;
-       asm ("fldl2e; fmulp; fld %%st; frndint; fsub %%st,%%st(1); fxch;" \
-          "fchs; f2xm1; fld1; faddp; fxch; fld1; fscale; fstp %%st(1); fmulp" :
-          "=t"(result) : "0"(x));
-       return result;
-     }
-   else if (x == -infinityf())
-     return 0.0;
-
-   return x;
-}
-
-#endif
diff --git a/newlib/libc/machine/i386/f_frexp.S b/newlib/libc/machine/i386/f_frexp.S
deleted file mode 100644
index febe115..0000000
--- a/newlib/libc/machine/i386/f_frexp.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of frexp using Intel float instructions.
-
-   double _f_frexp (double x, int *exp);
-
-Function splits x into y * 2 ** z.  It then
-returns the value of y and updates *exp with z.
-There is no error checking or setting of errno.
-*/
-
-	#include "i386mach.h"
-
-	.global SYM (_f_frexp)
-       SOTYPE_FUNCTION(_f_frexp)
-
-SYM (_f_frexp):
-	pushl ebp
-	movl esp,ebp
-	fldl 8(ebp)
-	movl 16(ebp),eax
-
-	fxtract
-	fld1
-	fchs
-	fxch
-	fscale
-	fstp st1
-	fxch
-	fld1
-	faddp
-	fistpl 0(eax)
-
-	leave
-	ret
-
-#endif
diff --git a/newlib/libc/machine/i386/f_frexpf.S b/newlib/libc/machine/i386/f_frexpf.S
deleted file mode 100644
index 909026d..0000000
--- a/newlib/libc/machine/i386/f_frexpf.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of frexpf using Intel float instructions.
-
-   float _f_frexpf (float x, int *exp);
-
-Function splits x into y * 2 ** z.  It then
-returns the value of y and updates *exp with z.
-There is no error checking or setting of errno.
-*/
-
-	#include "i386mach.h"
-
-	.global SYM (_f_frexpf)
-       SOTYPE_FUNCTION(_f_frexpf)
-
-SYM (_f_frexpf):
-	pushl ebp
-	movl esp,ebp
-	flds 8(ebp)
-	movl 12(ebp),eax
-
-	fxtract
-	fld1
-	fchs
-	fxch
-	fscale
-	fstp st1
-	fxch
-	fld1
-	faddp
-	fistpl 0(eax)
-
-	leave
-	ret
-
-#endif
diff --git a/newlib/libc/machine/i386/f_ldexp.S b/newlib/libc/machine/i386/f_ldexp.S
deleted file mode 100644
index e7b83c4..0000000
--- a/newlib/libc/machine/i386/f_ldexp.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of ldexp using Intel float instructions.
-
-   double _f_ldexp (double x, int exp);
-
-Function calculates x * 2 ** exp.
-There is no error checking or setting of errno.
-*/
-
-	#include "i386mach.h"
-
-	.global SYM (_f_ldexp)
-       SOTYPE_FUNCTION(_f_ldexp)
-
-SYM (_f_ldexp):
-	pushl ebp
-	movl esp,ebp
-	fild 16(ebp)
-	fldl 8(ebp)
-	fscale
-	fstp st1
-
-	leave
-	ret
-
-#endif
diff --git a/newlib/libc/machine/i386/f_ldexpf.S b/newlib/libc/machine/i386/f_ldexpf.S
deleted file mode 100644
index 59d5354..0000000
--- a/newlib/libc/machine/i386/f_ldexpf.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * ==================================================== 
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved. 
- *      
- * Permission to use, copy, modify, and distribute this 
- * software is freely granted, provided that this notice
- * is preserved.        
- * ==================================================== 
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of ldexpf using Intel float instructions.
-
-   float _f_ldexpf (float x, int exp);
-
-Function calculates x * 2 ** exp.
-There is no error checking or setting of errno. 
-*/
-
-	#include "i386mach.h"
-
-	.global SYM (_f_ldexpf)
-       SOTYPE_FUNCTION(_f_ldexpf)
-
-SYM (_f_ldexpf):
-	pushl ebp
-	movl esp,ebp
-	fild 12(ebp)
-	flds 8(ebp)
-	fscale
-	fstp st1
-
-	leave
-	ret
-
-#endif
diff --git a/newlib/libc/machine/i386/f_log.S b/newlib/libc/machine/i386/f_log.S
deleted file mode 100644
index 70e62cb..0000000
--- a/newlib/libc/machine/i386/f_log.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * ==================================================== 
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved. 
- *      
- * Permission to use, copy, modify, and distribute this 
- * software is freely granted, provided that this notice
- * is preserved.        
- * ==================================================== 
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of log using Intel float instructions.
-
-   double _f_log (double x);
-
-Function calculates the log base e of x.
-There is no error checking or setting of errno. 
-*/
-
-	#include "i386mach.h"
-
-	.global SYM (_f_log)
-       SOTYPE_FUNCTION(_f_log)
-
-SYM (_f_log):
-	pushl ebp
-	movl esp,ebp
-
-	fld1
-	fldl2e
-	fdivrp
-	fldl 8(ebp)
-	fyl2x
-
-	leave
-	ret
-
-#endif
diff --git a/newlib/libc/machine/i386/f_log10.S b/newlib/libc/machine/i386/f_log10.S
deleted file mode 100644
index 8d1b873..0000000
--- a/newlib/libc/machine/i386/f_log10.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * ==================================================== 
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved. 
- *      
- * Permission to use, copy, modify, and distribute this 
- * software is freely granted, provided that this notice
- * is preserved.        
- * ==================================================== 
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of log10 using Intel float instructions.
-
-   double _f_log10 (double x);
-
-Function calculates the log base 10 of x.
-There is no error checking or setting of errno. 
-*/
-
-	#include "i386mach.h"
-
-	.global SYM (_f_log10)
-       SOTYPE_FUNCTION(_f_log10)
-
-SYM (_f_log10):
-	pushl ebp
-	movl esp,ebp
-
-	fld1
-	fldl2t
-	fdivrp
-	fldl 8(ebp)
-	fyl2x
-
-	leave
-	ret
-
-#endif
diff --git a/newlib/libc/machine/i386/f_log10f.S b/newlib/libc/machine/i386/f_log10f.S
deleted file mode 100644
index 66ec506..0000000
--- a/newlib/libc/machine/i386/f_log10f.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * ==================================================== 
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved. 
- *      
- * Permission to use, copy, modify, and distribute this 
- * software is freely granted, provided that this notice
- * is preserved.        
- * ==================================================== 
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of logf using Intel float instructions.
-
-   float _f_log10f (float x);
-
-Function calculates the log base 10 of x.
-There is no error checking or setting of errno. 
-*/
-
-	#include "i386mach.h"
-
-	.global SYM (_f_log10f)
-       SOTYPE_FUNCTION(_f_log10f)
-
-SYM (_f_log10f):
-	pushl ebp
-	movl esp,ebp
-
-	fld1
-	fldl2t
-	fdivrp
-	flds 8(ebp)
-	fyl2x
-
-	leave
-	ret
-
-#endif
diff --git a/newlib/libc/machine/i386/f_logf.S b/newlib/libc/machine/i386/f_logf.S
deleted file mode 100644
index 3fafa8d..0000000
--- a/newlib/libc/machine/i386/f_logf.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * ==================================================== 
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved. 
- *      
- * Permission to use, copy, modify, and distribute this 
- * software is freely granted, provided that this notice
- * is preserved.        
- * ==================================================== 
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of logf using Intel float instructions.
-
-   float _f_logf (float x);
-
-Function calculates the log base e of x.
-There is no error checking or setting of errno. 
-*/
-
-	#include "i386mach.h"
-
-	.global SYM (_f_logf)
-       SOTYPE_FUNCTION(_f_logf)
-
-SYM (_f_logf):
-	pushl ebp
-	movl esp,ebp
-
-	fld1
-	fldl2e
-	fdivrp
-	flds 8(ebp)
-	fyl2x
-
-	leave
-	ret
-
-#endif
diff --git a/newlib/libc/machine/i386/f_math.h b/newlib/libc/machine/i386/f_math.h
deleted file mode 100644
index bd44b1e..0000000
--- a/newlib/libc/machine/i386/f_math.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __F_MATH_H__
-#define __F_MATH_H__
-
-#include <_ansi.h>
-#include "fdlibm.h"
-
-__inline__
-static 
-int 
-_DEFUN (check_finite, (x),
-         double x)
-{  
-  __int32_t hx;
-  GET_HIGH_WORD(hx,x);
-  return  (int)((__uint32_t)((hx&0x7fffffff)-0x7ff00000)>>31);
-}
-
-__inline__
-static 
-int 
-_DEFUN (check_finitef, (x),
-         float x)
-{  
-  __int32_t ix;
-  GET_FLOAT_WORD(ix,x);
-  return  (int)((__uint32_t)((ix&0x7fffffff)-0x7f800000)>>31);
-}
-
-#endif /* __F_MATH_H__ */
diff --git a/newlib/libc/machine/i386/f_pow.c b/newlib/libc/machine/i386/f_pow.c
deleted file mode 100644
index 050faa3..0000000
--- a/newlib/libc/machine/i386/f_pow.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of pow using Intel float instructions.
-
-   double _f_pow (double x, double y);
-
-Function calculates x to power of y.
-The function optimizes the case where x is >0.0 and y is finite.
-In such a case, there is no error checking or setting of errno.
-All other cases defer to normal pow() function which will
-set errno as normal.
-*/
-
-#include <math.h>
-#include <ieeefp.h>
-#include "f_math.h"
-
-double _f_pow (double x, double y)
-{
-  /* following sequence handles the majority of cases for pow() */
-  if (x > 0.0 && check_finite(y))
-    {
-      double result;
-      /* calculate x ** y as 2 ** (y log2(x)).  On Intel, can only
-         raise 2 to an integer or a small fraction, thus, we have
-         to perform two steps 2**integer portion * 2**fraction. */
-      asm ("fldl 8(%%ebp); fyl2x; fld %%st; frndint; fsub %%st,%%st(1);" \
-           "fxch; fchs; f2xm1; fld1; faddp; fxch; fld1; fscale; fstp %%st(1);"\
-           "fmulp" : "=t" (result) : "0" (y));
-      return result;
-    }
-  else /* all other strange cases, defer to normal pow() */
-    return pow (x,y);
-}
-
-#endif
diff --git a/newlib/libc/machine/i386/f_powf.c b/newlib/libc/machine/i386/f_powf.c
deleted file mode 100644
index ca3ef60..0000000
--- a/newlib/libc/machine/i386/f_powf.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of pow using Intel float instructions.
-
-   float _f_powf (float x, float y);
-
-Function calculates x to power of y.
-The function optimizes the case where x is >0.0 and y is finite.
-In such a case, there is no error checking or setting of errno.
-All other cases defer to normal powf() function which will
-set errno as normal.
-*/
-
-#include <math.h>
-#include <ieeefp.h>
-#include "f_math.h"
-
-float _f_powf (float x, float y)
-{
-  /* following sequence handles the majority of cases for pow() */
-  if (x > 0.0 && check_finitef(y))
-    {
-      float result;
-      /* calculate x ** y as 2 ** (y log2(x)).  On Intel, can only
-         raise 2 to an integer or a small fraction, thus, we have
-         to perform two steps 2**integer portion * 2**fraction. */
-      asm ("flds 8(%%ebp); fyl2x; fld %%st; frndint; fsub %%st,%%st(1);" \
-           "fxch; fchs; f2xm1; fld1; faddp; fxch; fld1; fscale; fstp %%st(1);"\
-           "fmulp" : "=t" (result) : "0" (y));
-      return result;
-    }
-  else /* all other strange cases, defer to normal pow() */
-    return powf (x,y);
-}
-
-#endif
diff --git a/newlib/libc/machine/i386/f_tan.S b/newlib/libc/machine/i386/f_tan.S
deleted file mode 100644
index c7c3704..0000000
--- a/newlib/libc/machine/i386/f_tan.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * ==================================================== 
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved. 
- *                      
- * Permission to use, copy, modify, and distribute this 
- * software is freely granted, provided that this notice
- * is preserved.             
- * ==================================================== 
- */             
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of tan using Intel float instructions.
-
-   double _f_tan (double x);
-
-Function calculates the tangent of x.
-There is no error checking or setting of errno. 
-*/
-
-	#include "i386mach.h"
-
-	.global SYM (_f_tan)
-       SOTYPE_FUNCTION(_f_tan)
-
-SYM (_f_tan):
-	pushl ebp
-	movl esp,ebp
-	fldl 8(ebp)
-	fptan
-	fincstp
-
-	leave
-	ret
-
-#endif
diff --git a/newlib/libc/machine/i386/f_tanf.S b/newlib/libc/machine/i386/f_tanf.S
deleted file mode 100644
index 6afda9e..0000000
--- a/newlib/libc/machine/i386/f_tanf.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
- *                              
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.                
- * ====================================================
- */                     
-
-#if !defined(_SOFT_FLOAT)
-
-/*
-Fast version of tanf using Intel float instructions.
-
-   float _f_tanf (float x);
-
-Function calculates the tangent of x.
-There is no error checking or setting of errno.
-*/
-
-	#include "i386mach.h"
-
-	.global SYM (_f_tanf)
-       SOTYPE_FUNCTION(_f_tanf)
-
-SYM (_f_tanf):
-	pushl ebp
-	movl esp,ebp
-	flds 8(ebp)
-	fptan
-	fincstp
-
-	leave
-	ret
-
-#endif
diff --git a/newlib/libc/machine/i386/memchr.S b/newlib/libc/machine/i386/memchr.S
index d29a045..e950a24 100644
--- a/newlib/libc/machine/i386/memchr.S
+++ b/newlib/libc/machine/i386/memchr.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libc/machine/i386/memcmp.S b/newlib/libc/machine/i386/memcmp.S
index 26b8ef1..a8589c0 100644
--- a/newlib/libc/machine/i386/memcmp.S
+++ b/newlib/libc/machine/i386/memcmp.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libc/machine/i386/memcpy.S b/newlib/libc/machine/i386/memcpy.S
index b53e2a1..488290f 100644
--- a/newlib/libc/machine/i386/memcpy.S
+++ b/newlib/libc/machine/i386/memcpy.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libc/machine/i386/memmove.S b/newlib/libc/machine/i386/memmove.S
index 1ea2f6d..04eaf14 100644
--- a/newlib/libc/machine/i386/memmove.S
+++ b/newlib/libc/machine/i386/memmove.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libc/machine/i386/memset.S b/newlib/libc/machine/i386/memset.S
index ce40820..9ba2272 100644
--- a/newlib/libc/machine/i386/memset.S
+++ b/newlib/libc/machine/i386/memset.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libc/machine/i386/strchr.S b/newlib/libc/machine/i386/strchr.S
index fe425d2..736f307 100644
--- a/newlib/libc/machine/i386/strchr.S
+++ b/newlib/libc/machine/i386/strchr.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libc/machine/i386/strlen.S b/newlib/libc/machine/i386/strlen.S
index 459b3a9..10d393a 100644
--- a/newlib/libc/machine/i386/strlen.S
+++ b/newlib/libc/machine/i386/strlen.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libc/machine/i960/Makefile.in b/newlib/libc/machine/i960/Makefile.in
index 527ea0a..5513a8f 100644
--- a/newlib/libc/machine/i960/Makefile.in
+++ b/newlib/libc/machine/i960/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -125,8 +120,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/i960/aclocal.m4 b/newlib/libc/machine/i960/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/i960/aclocal.m4
+++ b/newlib/libc/machine/i960/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/i960/configure b/newlib/libc/machine/i960/configure
index 554de7e..ab7e894 100755
--- a/newlib/libc/machine/i960/configure
+++ b/newlib/libc/machine/i960/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/iq2000/Makefile.am b/newlib/libc/machine/iq2000/Makefile.am
deleted file mode 100644
index 1c65b9f..0000000
--- a/newlib/libc/machine/iq2000/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/iq2000/Makefile.in b/newlib/libc/machine/iq2000/Makefile.in
deleted file mode 100644
index 9736912..0000000
--- a/newlib/libc/machine/iq2000/Makefile.in
+++ /dev/null
@@ -1,327 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/iq2000/aclocal.m4 b/newlib/libc/machine/iq2000/aclocal.m4
deleted file mode 100644
index 55d5e67..0000000
--- a/newlib/libc/machine/iq2000/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/iq2000/configure b/newlib/libc/machine/iq2000/configure
deleted file mode 100755
index 028b7b4..0000000
--- a/newlib/libc/machine/iq2000/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.am
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/iq2000/configure.in b/newlib/libc/machine/iq2000/configure.in
deleted file mode 100644
index c6aa0d1..0000000
--- a/newlib/libc/machine/iq2000/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/iq2000 configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(Makefile.am)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/iq2000/setjmp.S b/newlib/libc/machine/iq2000/setjmp.S
deleted file mode 100644
index cb09463..0000000
--- a/newlib/libc/machine/iq2000/setjmp.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/* This is a simple version of setjmp and longjmp for iq2000. */
-
-
-/* int setjmp (jmp_buf);  */
-	.globl	setjmp
-	.ent	setjmp
-setjmp:
-	sw	r16,0(r4)	/* rs0 */
-	sw	r17,4(r4)	/* rs1 */
-	sw	r18,8(r4)	/* rs2 */
-	sw	r19,12(r4)	/* rs3 */
-	sw	r20,16(r4)	/* rs4 */
-	sw	r21,20(r4)	/* rs5 */
-	sw	r22,24(r4)	/* rs6 */
-	sw	r23,28(r4)	/* rs7 */
-	sw	r30,32(r4)	/* rs8 */
-
-	sw	r29,36(r4)
-	sw	r31,40(r4)
-
-	move	r2,r0
-
-	j	r31
-
-	.end	setjmp
-
-/* volatile void longjmp (jmp_buf, int);  */
-	.globl	longjmp
-	.ent	longjmp
-longjmp:
-	lw	r16,0(r4)	/* rs0 */
-	lw	r17,4(r4)	/* rs1 */
-	lw	r18,8(r4)	/* rs2 */
-	lw	r19,12(r4)	/* rs3 */
-	lw	r20,16(r4)	/* rs4 */
-	lw	r21,20(r4)	/* rs5 */
-	lw	r22,24(r4)	/* rs6 */
-	lw	r23,28(r4)	/* rs7 */
-	lw	r30,32(r4)	/* rs8 */
-
-	lw	r29,36(r4)
-	lw	r31,40(r4)
-
-	bne	r5,r0,1f
-	li	r5,1
-1:
-	move	r2,r5
-
-	j	r31
-
-	.end longjmp
diff --git a/newlib/libc/machine/m32c/Makefile.am b/newlib/libc/machine/m32c/Makefile.am
deleted file mode 100644
index 1c65b9f..0000000
--- a/newlib/libc/machine/m32c/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/m32c/Makefile.in b/newlib/libc/machine/m32c/Makefile.in
deleted file mode 100644
index 9736912..0000000
--- a/newlib/libc/machine/m32c/Makefile.in
+++ /dev/null
@@ -1,327 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/m32c/aclocal.m4 b/newlib/libc/machine/m32c/aclocal.m4
deleted file mode 100644
index 55d5e67..0000000
--- a/newlib/libc/machine/m32c/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/m32c/configure b/newlib/libc/machine/m32c/configure
deleted file mode 100755
index 98bab64..0000000
--- a/newlib/libc/machine/m32c/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=setjmp.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/m32c/configure.in b/newlib/libc/machine/m32c/configure.in
deleted file mode 100644
index e53227d..0000000
--- a/newlib/libc/machine/m32c/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/m32r configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(setjmp.S)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/m32c/setjmp.S b/newlib/libc/machine/m32c/setjmp.S
deleted file mode 100644
index 96cd0f2..0000000
--- a/newlib/libc/machine/m32c/setjmp.S
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-
-Copyright (c) 2005 Red Hat Incorporated.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are met: 
-
-    Redistributions of source code must retain the above copyright 
-    notice, this list of conditions and the following disclaimer.
-
-    Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    The name of Red Hat Incorporated may not be used to endorse 
-    or promote products derived from this software without specific 
-    prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-*/
-
-#if defined(__r8c_cpu__) || defined(__m16c_cpu__)
-#define A16 1
-#endif
-
-/* We implement setjmp/longjmp much like the way gcc implements
-   exceptions - we create new stack frames, then switch to them and
-   return.  Thus, the two setjmp's below each push all the relevent
-   registers, then copy the whole frame into the buffer (first $sp is
-   moved, then smovf copies the frame itself), and the two longjmps
-   restore $sp, copy the frame back into place, and issue the same
-   return as the setjmp would have used.
-
-   Since the sizes of registers differs between the 16 and 24 bit
-   models, we provide separate implementations for each rather than
-   trying to parameterize them.
-
-   Jump buffer sizes: 21 bytes for 16 bit, 34 bytes for 24 bit.
-*/
-
-	.text
-
-#ifdef A16	/* 16 bit versions */
-
-	.global	_setjmp
-_setjmp:
-	enter	#0
-	pushm	r1,r2,r3,a0,a1,sb,fb
-
-; At this point, the stack looks like this:
-; ... [pc:3] [oldfb:2] <fb> [r1:2] [r2:2] [r3:2] [a0:2] [a1:2] [sb:2] [fb:2] <sp> */
-
-	mov.w	r1,a1		;  a1 is the destination of smovf
-	mov.b	#0,r1h
-	stc	sp,a0		;  r1h:a0 is the source of smovf
-	mov.w	a0,[a1]
-	add.w	#2,a1
-	mov.w	#19,r3		;  plus two for sp later
-	smovf.b
-
-	; Return 0 to caller.
-	mov.w	#0,r0
-	popm	r1,r2,r3,a0,a1,sb,fb
-	exitd
-
-	.global	_longjmp
-_longjmp:
-	enter	#0
-	mov.w	r1,a0		;  pointer to jump buf
-	mov.w	r2,r0		;  setjmp's "new" return value
-
-	mov.b	#0,r1h		;  r1h:	a0 is the source, now jmpbuf
-	mov.w	[a0],a1		;  dest is new stack
-	ldc	a1,sp
-	add.w	#2,a0
-	mov.w	#19,r3
-	smovf.b
-
-	;; now return to our caller with this newly restored frame
-	popm	r1,r2,r3,a0,a1,sb,fb
-	exitd
-
-#else	/* 24 bit versions */
-
-	.global	_setjmp
-_setjmp:
-	enter	#0
-	pushm	r1,r2,r3,a0,a1,sb,fb
-
-; At this point, the stack looks like this:
-; ... [jbuf:4] [pc:4] [oldfb:4] <fb> [r1:2] [r2:2] [r3:2] [a0:4] [a1:4] [sb:4] [fb:4] <sp> */
-
-	mov.l	8[fb],a1	;  a1 is the destination of smovf
-	stc	sp,a0		;  r1h:a0 is the source of smovf
-	mov.l	a0,[a1]
-	add.l	#4,a1
-	mov.w	#30,r3		;  plus two for sp later
-	smovf.b
-
-	; Return 0 to caller.
-	mov.w	#0,r0
-	popm	r1,r2,r3,a0,a1,sb,fb
-	exitd
-
-	.global	_longjmp
-_longjmp:
-	enter	#0
-; ... [rv:2] [jbuf:4] [pc:4] [oldfb:4] <fb>
-	mov.l	8[fb],a0	;  pointer to jump buf
-	mov.w	12[fb],r0	;  setjmp's "new" return value
-
-	mov.l	[a0],a1		;  dest is new stack
-	ldc	a1,sp
-	add.l	#4,a0
-	mov.w	#30,r3
-	smovf.b
-
-	;; now return to our caller with this newly restored frame
-	popm	r1,r2,r3,a0,a1,sb,fb
-	exitd
-#endif
-
diff --git a/newlib/libc/machine/m32r/Makefile.in b/newlib/libc/machine/m32r/Makefile.in
index 9736912..ace6f06 100644
--- a/newlib/libc/machine/m32r/Makefile.in
+++ b/newlib/libc/machine/m32r/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/m32r/aclocal.m4 b/newlib/libc/machine/m32r/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/m32r/aclocal.m4
+++ b/newlib/libc/machine/m32r/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/m32r/configure b/newlib/libc/machine/m32r/configure
index 98bab64..867ded9 100755
--- a/newlib/libc/machine/m32r/configure
+++ b/newlib/libc/machine/m32r/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/m68hc11/Makefile.am b/newlib/libc/machine/m68hc11/Makefile.am
deleted file mode 100644
index 1c65b9f..0000000
--- a/newlib/libc/machine/m68hc11/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/m68hc11/Makefile.in b/newlib/libc/machine/m68hc11/Makefile.in
deleted file mode 100644
index 9736912..0000000
--- a/newlib/libc/machine/m68hc11/Makefile.in
+++ /dev/null
@@ -1,327 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/m68hc11/aclocal.m4 b/newlib/libc/machine/m68hc11/aclocal.m4
deleted file mode 100644
index 55d5e67..0000000
--- a/newlib/libc/machine/m68hc11/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/m68hc11/configure b/newlib/libc/machine/m68hc11/configure
deleted file mode 100755
index 98bab64..0000000
--- a/newlib/libc/machine/m68hc11/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=setjmp.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/m68hc11/configure.in b/newlib/libc/machine/m68hc11/configure.in
deleted file mode 100644
index 0a78711..0000000
--- a/newlib/libc/machine/m68hc11/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/m68hc11 configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(setjmp.S)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/m68hc11/setjmp.S b/newlib/libc/machine/m68hc11/setjmp.S
deleted file mode 100644
index 38d1188..0000000
--- a/newlib/libc/machine/m68hc11/setjmp.S
+++ /dev/null
@@ -1,141 +0,0 @@
-/* setjmp/longjmp routines for M68HC11 & M68HC12.
- * Copyright (C) 1999, 2000, 2001, 2002 Stephane Carrez (stcarrez@nerim.fr)	
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#if __INT__ == 32
-# define val 4
-# define INT32(X) X
-#else
-# define val 2
-# define INT32(X)
-#endif
-
-#ifdef mc6811
-# define REG(X) *X
-#else
-# define REG(X) X
-#endif
-
-	.sect .text
-	.global setjmp
-	.global longjmp
-
-#ifdef mc6811
-setjmp:
-	xgdx
-	tsy
-	ldd	0,y
-	std	0,x
-	sty	2,x
-	ldd	REG(_.frame)
-	std	4,x
-	ldd	REG(_.d1)
-	std	6,x
-	ldd	REG(_.d2)
-	std	8,x
-	ldd	REG(_.d3)
-	std	10,x
-	ldd	REG(_.d4)
-	std	12,x
-	ldd	REG(_.d5)
-	std	14,x
-	ldd	REG(_.d6)
-	std	16,x
-	ldd	REG(_.d7)
-	std	18,x
-	ldd	REG(_.d8)
-	std	20,x
-INT32(	ldx	#0)
-	clra
-	clrb
-	rts
-#else
-setjmp:
-	xgdx
-	movw	0,sp,2,x+
-	sts	2,x+
-	movw	_.frame,2,x+
-	movw	_.d1,2,x+
-	movw	_.d2,2,x+
-	movw	_.d3,2,x+
-	movw	_.d4,2,x+
-	movw	_.d5,2,x+
-	movw	_.d6,2,x+
-	movw	_.d7,2,x+
-	movw	_.d8,2,x+
-INT32(	ldx	#0)
-	clra
-	clrb
-	rts
-#endif
-
-#ifdef mc6811
-longjmp:
-	xgdx
-	tsy
-	ldd	val,y
-	bne	do_jump
-	ldd	#1
-do_jump:
-	xgdy
-	ldd	4,x
-	std	REG(_.frame)
-	ldd	6,x
-	std	REG(_.d1)
-	ldd	8,x
-	std	REG(_.d2)
-	ldd	10,x
-	std	REG(_.d3)
-	ldd	12,x
-	std	REG(_.d4)
-	ldd	14,x
-	std	REG(_.d5)
-	ldd	16,x
-	std	REG(_.d6)
-	ldd	18,x
-	std	REG(_.d7)
-	ldd	20,x
-	std	REG(_.d8)
-	ldd	0,x
-	ldx	2,x
-	txs
-	std	0,x
-INT32(	ldx	#0)
-	xgdy
-	rts
-#else
-
-longjmp:
-	xgdx
-	ldy	val,sp
-	bne	do_jump
-	ldy	#1
-do_jump:
-	ldd	4,x+
-	movw	2,x+,_.frame
-	movw	0,x,_.d1
-	movw	2,x,_.d2
-	movw	4,x,_.d3
-	movw	6,x,_.d4
-	movw	8,x,_.d5
-	movw	10,x,_.d6
-	movw	12,x,_.d7
-	movw	14,x,_.d8
-	ldx	-4,x
-	txs
-	std	0,x
-INT32(	ldx	#0)
-	xgdy
-	rts
-#endif
-	
diff --git a/newlib/libc/machine/m68k/Makefile.in b/newlib/libc/machine/m68k/Makefile.in
index 4d0df64..2084a31 100644
--- a/newlib/libc/machine/m68k/Makefile.in
+++ b/newlib/libc/machine/m68k/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/m68k/aclocal.m4 b/newlib/libc/machine/m68k/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/m68k/aclocal.m4
+++ b/newlib/libc/machine/m68k/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/m68k/configure b/newlib/libc/machine/m68k/configure
index 98bab64..867ded9 100755
--- a/newlib/libc/machine/m68k/configure
+++ b/newlib/libc/machine/m68k/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/m88k/Makefile.in b/newlib/libc/machine/m88k/Makefile.in
index 9736912..ace6f06 100644
--- a/newlib/libc/machine/m88k/Makefile.in
+++ b/newlib/libc/machine/m88k/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/m88k/aclocal.m4 b/newlib/libc/machine/m88k/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/m88k/aclocal.m4
+++ b/newlib/libc/machine/m88k/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/m88k/configure b/newlib/libc/machine/m88k/configure
index 98bab64..867ded9 100755
--- a/newlib/libc/machine/m88k/configure
+++ b/newlib/libc/machine/m88k/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/mips/Makefile.am b/newlib/libc/machine/mips/Makefile.am
index 74c08bc..1c65b9f 100644
--- a/newlib/libc/machine/mips/Makefile.am
+++ b/newlib/libc/machine/mips/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = setjmp.S strlen.c strcmp.c strncpy.c memset.c memcpy.c
+lib_a_SOURCES = setjmp.S
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/mips/Makefile.in b/newlib/libc/machine/mips/Makefile.in
index c992f3b..ace6f06 100644
--- a/newlib/libc/machine/mips/Makefile.in
+++ b/newlib/libc/machine/mips/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = setjmp.S strlen.c strcmp.c strncpy.c memset.c memcpy.c
+lib_a_SOURCES = setjmp.S
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@@ -103,7 +98,7 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o strlen.o strcmp.o strncpy.o memset.o memcpy.o
+lib_a_OBJECTS =  setjmp.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/mips/aclocal.m4 b/newlib/libc/machine/mips/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/mips/aclocal.m4
+++ b/newlib/libc/machine/mips/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/mips/configure b/newlib/libc/machine/mips/configure
index 98bab64..867ded9 100755
--- a/newlib/libc/machine/mips/configure
+++ b/newlib/libc/machine/mips/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/mips/memcpy.c b/newlib/libc/machine/mips/memcpy.c
deleted file mode 100644
index 761f7e9..0000000
--- a/newlib/libc/machine/mips/memcpy.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-FUNCTION
-        <<memcpy>>---copy memory regions, optimized for the mips processors
-
-ANSI_SYNOPSIS
-        #include <string.h>
-        void* memcpy(void *<[out]>, const void *<[in]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-        void *memcpy(<[out]>, <[in]>, <[n]>
-        void *<[out]>;
-        void *<[in]>;
-        size_t <[n]>;
-
-DESCRIPTION
-        This function copies <[n]> bytes from the memory region
-        pointed to by <[in]> to the memory region pointed to by
-        <[out]>.
-
-        If the regions overlap, the behavior is undefined.
-
-RETURNS
-        <<memcpy>> returns a pointer to the first byte of the <[out]>
-        region.
-
-PORTABILITY
-<<memcpy>> is ANSI C.
-
-<<memcpy>> requires no supporting OS subroutines.
-
-QUICKREF
-        memcpy ansi pure
-	*/
-
-#include <_ansi.h>
-#include <stddef.h>
-#include <limits.h>
-
-#ifdef __mips64
-#define wordtype long long
-#else
-#define wordtype long
-#endif
-
-/* Nonzero if either X or Y is not aligned on a "long" boundary.  */
-#define UNALIGNED(X, Y) \
-  (((long)X & (sizeof (wordtype) - 1)) | ((long)Y & (sizeof (wordtype) - 1)))
-
-/* How many bytes are copied each iteration of the 4X unrolled loop.  */
-#define BIGBLOCKSIZE    (sizeof (wordtype) << 2)
-
-/* How many bytes are copied each iteration of the word copy loop.  */
-#define LITTLEBLOCKSIZE (sizeof (wordtype))
-
-/* Threshhold for punting to the byte copier.  */
-#define TOO_SMALL(LEN)  ((LEN) < BIGBLOCKSIZE)
-
-_PTR
-_DEFUN (memcpy, (dst0, src0, len0),
-	_PTR dst0 _AND
-	_CONST _PTR src0 _AND
-	size_t len0)
-{
-#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) || defined(__mips16)
-  char *dst = (char *) dst0;
-  char *src = (char *) src0;
-
-  _PTR save = dst0;
-
-  while (len0--)
-    {
-      *dst++ = *src++;
-    }
-
-  return save;
-#else
-  char *dst = dst0;
-  _CONST char *src = src0;
-  wordtype *aligned_dst;
-  _CONST wordtype *aligned_src;
-  int   len =  len0;
-  size_t iter;
-
-  /* Handle aligned moves here.  */
-  if (!UNALIGNED (src, dst))
-    {
-      iter = len / BIGBLOCKSIZE;
-      len = len % BIGBLOCKSIZE;
-      aligned_dst = (wordtype *)dst;
-      aligned_src = (wordtype *)src;
-
-	  /* Copy 4X long or long long words at a time if possible.  */
-      while (iter > 0)
-	{
-	  wordtype tmp0 = aligned_src[0];
-	  wordtype tmp1 = aligned_src[1];
-	  wordtype tmp2 = aligned_src[2];
-	  wordtype tmp3 = aligned_src[3];
-
-	  aligned_dst[0] = tmp0;
-	  aligned_dst[1] = tmp1;
-	  aligned_dst[2] = tmp2;
-	  aligned_dst[3] = tmp3;
-	  aligned_src += 4;
-	  aligned_dst += 4;
-	  iter--;
-	}
-
-      /* Copy one long or long long word at a time if possible.  */
-      iter = len / LITTLEBLOCKSIZE;
-      len = len % LITTLEBLOCKSIZE;
-
-      while (iter > 0)
-	{
-	  *aligned_dst++ = *aligned_src++;
-	  iter--;
-	}
-
-      /* Pick up any residual with a byte copier.  */
-      dst = (char*)aligned_dst;
-      src = (char*)aligned_src;
-
-      while (len > 0)
-	{
-	  *dst++ = *src++;
-	  len--;
-	}
-
-      return dst0;
-    }
-
-  /* Handle unaligned moves here, using lwr/lwl and swr/swl where possible */
-  else
-    {
-#ifndef NO_UNALIGNED_LOADSTORE
-      int tmp;
-      int *int_src = (int *)src;
-      int *int_dst = (int *)dst;
-      iter = len / 4;
-      len = len % 4;
-      while (iter > 0)
-	{
-	  __asm__ ("ulw %0,%1" : "=r" (tmp) : "m" (*int_src));
-	  iter--;
-	  int_src++;
-	  __asm__ ("usw %1,%0" : "=m" (*int_dst) : "r" (tmp));
-	  int_dst++;
-	}
-
-      /* Pick up any residual with a byte copier.  */
-      dst = (char*)int_dst;
-      src = (char*)int_src;
-#endif
-
-      while (len > 0)
-	{
-	  *dst++ = *src++;
-	  len--;
-	}
-
-      return dst0;
-    }
-#endif /* not PREFER_SIZE_OVER_SPEED */
-}
diff --git a/newlib/libc/machine/mips/memset.c b/newlib/libc/machine/mips/memset.c
deleted file mode 100644
index 786ba79..0000000
--- a/newlib/libc/machine/mips/memset.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-FUNCTION
-	<<memset>>---set an area of memory, optimized for the MIPS processors
-
-INDEX
-	memset
-
-ANSI_SYNOPSIS
-	#include <string.h>
-	void *memset(const void *<[dst]>, int <[c]>, size_t <[length]>);
-
-TRAD_SYNOPSIS
-	#include <string.h>
-	void *memset(<[dst]>, <[c]>, <[length]>)
-	void *<[dst]>;
-	int <[c]>;
-	size_t <[length]>;
-
-DESCRIPTION
-	This function converts the argument <[c]> into an unsigned
-	char and fills the first <[length]> characters of the array
-	pointed to by <[dst]> to the value.
-
-RETURNS
-	<<memset>> returns the value of <[m]>.
-
-PORTABILITY
-<<memset>> is ANSI C.
-
-    <<memset>> requires no supporting OS subroutines.
-
-QUICKREF
-	memset ansi pure
-*/
-
-#include <string.h>
-
-#ifdef __mips64
-#define wordtype long long
-#else
-#define wordtype long
-#endif
-
-#define LBLOCKSIZE     (sizeof(wordtype))
-#define UNALIGNED(X)   ((long)(X) & (LBLOCKSIZE - 1))
-#define TOO_SMALL(LEN) ((LEN) < LBLOCKSIZE * 4)
-
-_PTR 
-_DEFUN (memset, (m, c, n),
-	_PTR m _AND
-	int c _AND
-	size_t n)
-{
-#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) || defined(__mips16)
-  char *s = (char *) m;
-
-  while (n-- != 0)
-    {
-      *s++ = (char) c;
-    }
-
-  return m;
-#else
-  char *s = (char *) m;
-  int i;
-  unsigned wordtype buffer;
-  unsigned wordtype *aligned_addr;
-  unsigned short *short_addr;
-  size_t iter;
-
-  if (!TOO_SMALL (n))
-    {
-      int unaligned = UNALIGNED (s);
-
-      /* We know that N is >= LBLOCKSIZE so we can just word
-         align the S without having to check the length. */
-
-      if (unaligned)
-	{
-	  while (unaligned++ < LBLOCKSIZE)
-	    *s++ = (char)c, n--;
-	}
-
-      /* S is now word-aligned so we can process the remainder
-         in word sized chunks except for a few (< LBLOCKSIZE)
-         bytes which might be left over at the end. */
-
-      aligned_addr = (unsigned wordtype *)s;
-
-      /* Store C into each char sized location in BUFFER so that
-         we can set large blocks quickly.  */
-      c &= 0xff;
-      buffer = c;
-      if (buffer != 0)
-	{
-	  if (LBLOCKSIZE == 4)
-	    {
-	       buffer |= (buffer << 8);
-	       buffer |= (buffer << 16);
-	    }
-	  else if (LBLOCKSIZE == 8)
-	    {
-	      buffer |= (buffer << 8);
-	      buffer |= (buffer << 16);
-	      buffer |= ((buffer << 31) << 1);
-	    }
-	  else
-	    {
-	      for (i = 1; i < LBLOCKSIZE; i++)
-		buffer = (buffer << 8) | c;
-	    }
-        }
-
-      iter = n / (2*LBLOCKSIZE);
-      n = n % (2*LBLOCKSIZE);
-      while (iter > 0)
-	{
-	  aligned_addr[0] = buffer;
-	  aligned_addr[1] = buffer;
-	  aligned_addr += 2;
-	  iter--;
-	}
-
-      if (n >= LBLOCKSIZE)
-	{
-	  *aligned_addr++ = buffer;
-	  n -= LBLOCKSIZE;
-	}
-
-      /* Pick up the remainder with a bytewise loop.  */
-      s = (char*)aligned_addr;
-    }
-
-  while (n > 0)
-    {
-      *s++ = (char)c;
-      n--;
-    }
-
-  return m;
-#endif /* not PREFER_SIZE_OVER_SPEED */
-}
diff --git a/newlib/libc/machine/mips/setjmp.S b/newlib/libc/machine/mips/setjmp.S
index 268cb18..9778394 100644
--- a/newlib/libc/machine/mips/setjmp.S
+++ b/newlib/libc/machine/mips/setjmp.S
@@ -1,76 +1,72 @@
 /* This is a simple version of setjmp and longjmp for MIPS 32 and 64.
 
-   Ian Lance Taylor, Cygnus Support, 13 May 1993.  */
+   The MIPS 32 version does NOT save the floating point register, which is
+   wrong, but I don't know how to cleanly handle machines without a
+   floating point coprocessor.
+
+   Ian Lance Taylor, Cygnus Support, 13 May 1993.
+
+   The MIPS 64 version saves registers fp20 to fp31.  23 registers
+   are saved in all.  */
 
 #ifdef __mips16
 /* This file contains 32 bit assembly code.  */
 	.set nomips16
 #endif
 
-#define GPR_LAYOUT		\
-	GPR_OFFSET ($16, 0);	\
-	GPR_OFFSET ($17, 1);	\
-	GPR_OFFSET ($18, 2);	\
-	GPR_OFFSET ($19, 3);	\
-	GPR_OFFSET ($20, 4);	\
-	GPR_OFFSET ($21, 5);	\
-	GPR_OFFSET ($22, 6);	\
-	GPR_OFFSET ($23, 7);	\
-	GPR_OFFSET ($29, 8);	\
-	GPR_OFFSET ($30, 9);	\
-	GPR_OFFSET ($31, 10)
-
-#define NUM_GPRS_SAVED 11
-
-#ifdef __mips_hard_float
-#define FPR_LAYOUT		\
-	FPR_OFFSET ($f20, 0);	\
-	FPR_OFFSET ($f21, 1);	\
-	FPR_OFFSET ($f22, 2);	\
-	FPR_OFFSET ($f23, 3);	\
-	FPR_OFFSET ($f24, 4);	\
-	FPR_OFFSET ($f25, 5);	\
-	FPR_OFFSET ($f26, 6);	\
-	FPR_OFFSET ($f27, 7);	\
-	FPR_OFFSET ($f28, 8);	\
-	FPR_OFFSET ($f29, 9);	\
-	FPR_OFFSET ($f30, 10);	\
-	FPR_OFFSET ($f31, 11)
-#else
-#define FPR_LAYOUT
-#endif
-
-#ifdef __mips64
-#define BYTES_PER_WORD 8
-#define LOAD_GPR ld
-#define LOAD_FPR ldc1
-#define STORE_GPR sd
-#define STORE_FPR sdc1
-#else
-#define BYTES_PER_WORD 4
-#define LOAD_GPR lw
-#define LOAD_FPR lwc1
-#define STORE_GPR sw
-#define STORE_FPR swc1
-#endif
-
-#define GPOFF(INDEX) (INDEX * BYTES_PER_WORD)
-#define FPOFF(INDEX) ((INDEX + NUM_GPRS_SAVED) * BYTES_PER_WORD)
-
 /* int setjmp (jmp_buf);  */
 	.globl	setjmp
 	.ent	setjmp
 setjmp:
 	.frame	$sp,0,$31
 
-#define GPR_OFFSET(REG, INDEX) STORE_GPR REG,GPOFF(INDEX)($4)
-#define FPR_OFFSET(REG, INDEX) STORE_FPR REG,FPOFF(INDEX)($4)
-	GPR_LAYOUT
-	FPR_LAYOUT
-#undef GPR_OFFSET
-#undef FPR_OFFSET
+#ifdef __mips64
+
+	sd      $16, 000($4)    /* s0 */
+	sd      $17, 010($4)    /* s1 */
+	sd      $18, 020($4)    /* s2 */
+	sd      $19, 030($4)    /* s3 */
+	sd      $20, 040($4)    /* s4 */
+	sd      $21, 050($4)    /* s5 */
+	sd      $22, 060($4)    /* s6 */
+	sd      $23, 070($4)    /* s7 */
+
+	sdc1    $f20, 0100($4)
+	sdc1    $f21, 0110($4)
+	sdc1    $f22, 0120($4)
+	sdc1    $f23, 0130($4)
+	sdc1    $f24, 0140($4)
+	sdc1    $f25, 0150($4)
+	sdc1    $f26, 0160($4)
+	sdc1    $f27, 0170($4)
+	sdc1    $f28, 0200($4)
+	sdc1    $f29, 0210($4)
+	sdc1    $f30, 0220($4)
+	sdc1    $f31, 0230($4)
+
+	sd      $29, 0240($4)   /* sp */
+	sd      $30, 0250($4)   /* fp */
+	sd      $31, 0260($4)   /* ra */
+
+#else /* not __mips64 */
+
+	sw	$16,0($4)	/* $s0 */
+	sw	$17,4($4)	/* $s1 */
+	sw	$18,8($4)	/* $s2 */
+	sw	$19,12($4)	/* $s3 */
+	sw	$20,16($4)	/* $s4 */
+	sw	$21,20($4)	/* $s5 */
+	sw	$22,24($4)	/* $s6 */
+	sw	$23,28($4)	/* $s7 */
+	sw	$30,32($4)	/* $s8 */
+
+	sw	$sp,36($4)
+	sw	$31,40($4)
+
+#endif /* not __mips64 */
 
 	move	$2,$0
+
 	j	$31
 
 	.end	setjmp
@@ -81,17 +77,56 @@ setjmp:
 longjmp:
 	.frame	$sp,0,$31
 
-#define GPR_OFFSET(REG, INDEX) LOAD_GPR REG,GPOFF(INDEX)($4)
-#define FPR_OFFSET(REG, INDEX) LOAD_FPR REG,FPOFF(INDEX)($4)
-	GPR_LAYOUT
-	FPR_LAYOUT
-#undef GPR_OFFSET
-#undef FPR_OFFSET
+#ifdef __mips64
+
+	ld      $16, 000($4)    /* s0 */
+	ld      $17, 010($4)    /* s1 */
+	ld      $18, 020($4)    /* s2 */
+	ld      $19, 030($4)    /* s3 */
+	ld      $20, 040($4)    /* s4 */
+	ld      $21, 050($4)    /* s5 */
+	ld      $22, 060($4)    /* s6 */
+	ld      $23, 070($4)    /* s7 */
+
+	ldc1    $f20, 0100($4)
+	ldc1    $f21, 0110($4)
+	ldc1    $f22, 0120($4)
+	ldc1    $f23, 0130($4)
+	ldc1    $f24, 0140($4)
+	ldc1    $f25, 0150($4)
+	ldc1    $f26, 0160($4)
+	ldc1    $f27, 0170($4)
+	ldc1    $f28, 0200($4)
+	ldc1    $f29, 0210($4)
+	ldc1    $f30, 0220($4)
+	ldc1    $f31, 0230($4)
+
+	ld      $29, 0240($4)   /* sp */
+	ld      $30, 0250($4)   /* fp */
+	ld      $31, 0260($4)   /* ra */
+
+#else /* not __mips64 */
+
+	lw	$16,0($4)	/* $s0 */
+	lw	$17,4($4)	/* $s1 */
+	lw	$18,8($4)	/* $s2 */
+	lw	$19,12($4)	/* $s3 */
+	lw	$20,16($4)	/* $s4 */
+	lw	$21,20($4)	/* $s5 */
+	lw	$22,24($4)	/* $s6 */
+	lw	$23,28($4)	/* $s7 */
+	lw	$30,32($4)	/* $s8 */
+
+	lw	$sp,36($4)
+	lw	$31,40($4)
+
+#endif /* not __mips64 */
 
 	bne	$5,$0,1f
 	li	$5,1
 1:
 	move	$2,$5
+
 	j	$31
 
 	.end longjmp
diff --git a/newlib/libc/machine/mips/strcmp.c b/newlib/libc/machine/mips/strcmp.c
deleted file mode 100644
index c9c1c65..0000000
--- a/newlib/libc/machine/mips/strcmp.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * strcmp.c -- strcmp function.  On at least some MIPS chips, a strcmp that is
- * unrolled twice is faster than the 'optimized' C version in newlib.
- *
- * Copyright (c) 2001 Red Hat, Inc.
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.  */
-
-#include <stddef.h>
-#include <string.h>
-#include <stdlib.h>
-
-int
-strcmp (const char *s1, const char *s2)
-{ 
-  unsigned const char *us1 = (unsigned const char *)s1;
-  unsigned const char *us2 = (unsigned const char *)s2;
-  int c1a, c1b;
-  int c2a, c2b;
-
-  /* If the pointers aren't both aligned to a 16-byte boundary, do the
-     comparison byte by byte, so that we don't get an invalid page fault if we
-     are comparing a string whose null byte is at the last byte on the last
-     valid page.  */
-  if (((((long)us1) | ((long)us2)) & 1) == 0)
-    {
-      c1a = *us1;
-      for (;;)
-	{
-	  c1b = *us2;
-	  us1 += 2;
-	  if (c1a == '\0')
-	    goto ret1;
-
-	  c2a = us1[-1];
-	  if (c1a != c1b)
-	    goto ret1;
-
-	  c2b = us2[1];
-	  us2 += 2;
-	  if (c2a == '\0')
-	    break;
-
-	  c1a = *us1;
-	  if (c2a != c2b)
-	    break;
-	}
-
-      return c2a - c2b;
-    }
-  else
-    {
-      do
-	{
-	  c1a = *us1++;
-	  c1b = *us2++;
-	}
-      while (c1a != '\0' && c1a == c1b);
-    }
-
- ret1:
-  return c1a - c1b;
-}
diff --git a/newlib/libc/machine/mips/strlen.c b/newlib/libc/machine/mips/strlen.c
deleted file mode 100644
index 158fb9f..0000000
--- a/newlib/libc/machine/mips/strlen.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * strlen.c -- strlen function.  On at least some MIPS chips, a simple
- * strlen is faster than the 'optimized' C version.
- *
- * Copyright (c) 2001, 2002 Red Hat, Inc.
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-#include <stddef.h>
-#include <string.h>
-
-/* MIPS16 needs to come first.  */
-
-#if defined(__mips16)
-size_t
-strlen (const char *str)
-{
-  const char *start = str;
-
-  while (*str++ != '\0')
-    ;
-
-  return str - start - 1;
-}
-#elif defined(__mips64)
-__asm__(""			/* 64-bit MIPS targets */
-	"	.set	noreorder\n"
-	"	.set	nomacro\n"
-	"	.globl	strlen\n"
-	"	.ent	strlen\n"
-	"strlen:\n"
-	"	daddiu	$2,$4,1\n"
-	"\n"
-	"1:	lbu	$3,0($4)\n"
-	"	bnez	$3,1b\n"
-	"	daddiu	$4,$4,1\n"
-	"\n"
-	"	jr	$31\n"
-	"	dsubu	$2,$4,$2\n"
-	"	.end	strlen\n"
-	"	.set	macro\n"
-	"	.set	reorder\n");
-
-#else
-__asm__(""			/* 32-bit MIPS targets */
-	"	.set	noreorder\n"
-	"	.set	nomacro\n"
-	"	.globl	strlen\n"
-	"	.ent	strlen\n"
-	"strlen:\n"
-	"	addiu	$2,$4,1\n"
-	"\n"
-	"1:	lbu	$3,0($4)\n"
-	"	bnez	$3,1b\n"
-	"	addiu	$4,$4,1\n"
-	"\n"
-	"	jr	$31\n"
-	"	subu	$2,$4,$2\n"
-	"	.end	strlen\n"
-	"	.set	macro\n"
-	"	.set	reorder\n");
-#endif
diff --git a/newlib/libc/machine/mips/strncpy.c b/newlib/libc/machine/mips/strncpy.c
deleted file mode 100644
index a2ceb2c..0000000
--- a/newlib/libc/machine/mips/strncpy.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * strncpy.S -- strncmp function.  On at least some MIPS chips, you get better
- * code by hand unrolling the loops, and by using store words to zero the
- * remainder of the buffer than the default newlib C version.
- *
- * Copyright (c) 2001 Red Hat, Inc.
- *
- * The authors hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.  */
-
-#include <string.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#if !defined(__GNUC__) || (__GNUC__ < 3)
-#define __builtin_expect(a,b) a
-
-#else
-#ifdef __mips64
-/* Don't use limits test for the size of long, in order to allow the use of
-   64-bit stores on MIPS3 machines, even if -mlong32 was used.  */
-typedef unsigned word_type __attribute__ ((mode (DI)));
-#else
-typedef unsigned word_type __attribute__ ((mode (SI)));
-#endif
-
-typedef unsigned si_type __attribute__ ((mode (SI)));
-typedef unsigned hi_type __attribute__ ((mode (HI)));
-
-#ifndef UNROLL_FACTOR
-#define UNROLL_FACTOR 4
-
-#elif (UNROLL_FACTOR != 2) && (UNROLL_FACTOR != 4)
-#error "UNROLL_FACTOR must be 2 or 4"
-#endif
-#endif
-
-char *
-strncpy (char *dst0, const char *src0, size_t count)
-{
-#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) || defined(__mips16) || !defined(__GNUC__) || (__GNUC__ < 3)
-  char *dst, *end;
-  const char *src;
-  int ch;
-
-  dst = dst0;
-  src = src0;
-  end = dst + count;
-  while (dst != end)
-    {
-      *dst++ = ch = *src++;
-      if (__builtin_expect (ch == '\0', 0))
-	{
-	  while (dst != end)
-	    *dst++ = '\0';
-
-	  break;
-	}
-    }
-
-  return dst0;
-
-#else
-  unsigned char *dst;
-  unsigned char *dst_end;
-  unsigned char *end;
-  const unsigned char *src;
-  int ch0, ch1;
-#if UNROLL_FACTOR > 2
-  int ch2, ch3;
-#endif
-  int ch;
-  int odd_bytes;
-  size_t long_count;
-
-  dst = (unsigned char *)dst0;
-  src = (unsigned const char *)src0;
-  if (__builtin_expect (count >= 4, 1))
-    {
-      odd_bytes = (count & (UNROLL_FACTOR - 1));
-      count -= odd_bytes;
-
-      do
-	{
-	  ch0 = src[0];
-	  ch1 = src[1];
-#if UNROLL_FACTOR > 2
-	  ch2 = src[2];
-	  ch3 = src[3];
-#endif
-	  src += UNROLL_FACTOR;
-	  count -= UNROLL_FACTOR;
-
-	  dst[0] = ch0;
-	  if (ch0 == '\0')
-	    goto found_null0;
-
-	  dst[1] = ch1;
-	  if (ch1 == '\0')
-	    goto found_null1;
-
-#if UNROLL_FACTOR > 2
-	  dst[2] = ch2;
-	  if (ch2 == '\0')
-	    goto found_null2;
-
-	  dst[3] = ch3;
-	  if (ch3 == '\0')
-	    goto found_null3;
-#endif
-
-	  dst += UNROLL_FACTOR;
-	}
-      while (count);
-
-      /* fall through, count == 0, no null found, deal with last bytes */
-      count = odd_bytes;
-    }
-
-  end = dst + count;
-  while (dst != end)
-    {
-      *dst++ = ch = *src++;
-      if (ch == '\0')
-	{
-	  while (dst != end)
-	    *dst++ = '\0';
-
-	  break;
-	}
-    }
-
-  return dst0;
-
-  /* Found null byte in first byte, count has been decremented by 4, null has
-     been stored in dst[0].  */
- found_null0:
-  count++;			/* add 1 to cover remaining byte */
-  dst -= 1;			/* adjust dst += 4 gets correct ptr */
-  /* fall through */
-
-  /* Found null byte in second byte, count has been decremented by 4, null has
-     been stored in dst[1].  */
- found_null1:
-#if UNROLL_FACTOR > 2
-  count++;			/* add 1 to cover remaining byte */
-  dst -= 1;			/* adjust dst += 4 gets correct ptr */
-  /* fall through */
-
-  /* Found null byte in third byte, count has been decremented by 4, null has
-     been stored in dst[2].  */
- found_null2:
-  count++;			/* add 1 to cover remaining byte */
-  dst -= 1;			/* adjust dst += 4 gets correct ptr */
-  /* fall through */
-
-  /* Found null byte in fourth byte, count is accurate, dst has not been
-     updated yet.  */
- found_null3:
-#endif
-  count += odd_bytes;		/* restore odd byte count */
-  dst += UNROLL_FACTOR;
-
-  /* Zero fill remainder of the array.  Unroll the loop, and use word/dword
-     stores where we can.  */
-  while (count && (((long)dst) & (sizeof (word_type) - 1)) != 0)
-    {
-      count--;
-      *dst++ = 0;
-    }
-
-  while (count >= UNROLL_FACTOR*sizeof (word_type))
-    {
-      count -= UNROLL_FACTOR*sizeof (word_type);
-      dst += UNROLL_FACTOR*sizeof (word_type);
-#if UNROLL_FACTOR > 2
-      ((word_type *)(void *)dst)[-4] = 0;
-      ((word_type *)(void *)dst)[-3] = 0;
-#endif
-      ((word_type *)(void *)dst)[-2] = 0;
-      ((word_type *)(void *)dst)[-1] = 0;
-    }
-
-#if UNROLL_FACTOR > 2
-  if (count >= 2*sizeof (word_type))
-    {
-      count -= 2*sizeof (word_type);
-      ((word_type *)(void *)dst)[0] = 0;
-      ((word_type *)(void *)dst)[1] = 0;
-      dst += 2*sizeof (word_type);
-    }
-#endif 
-
-  if (count >= sizeof (word_type))
-    {
-      count -= sizeof (word_type);
-      ((word_type *)(void *)dst)[0] = 0;
-      dst += sizeof (word_type);
-    }
-
-#ifdef __mips64
-  if (count >= sizeof (si_type))
-    {
-      count -= sizeof (si_type);
-      ((si_type *)(void *)dst)[0] = 0;
-      dst += sizeof (si_type);
-    }
-#endif
-
-  if (count >= sizeof (hi_type))
-    {
-      count -= sizeof (hi_type);
-      ((hi_type *)(void *)dst)[0] = 0;
-      dst += sizeof (hi_type);
-    }
-
-  if (count)
-    *dst = '\0';
-
-  return dst0;
-#endif
-}
diff --git a/newlib/libc/machine/mn10200/Makefile.in b/newlib/libc/machine/mn10200/Makefile.in
index 9736912..ace6f06 100644
--- a/newlib/libc/machine/mn10200/Makefile.in
+++ b/newlib/libc/machine/mn10200/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/mn10200/aclocal.m4 b/newlib/libc/machine/mn10200/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/mn10200/aclocal.m4
+++ b/newlib/libc/machine/mn10200/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/mn10200/configure b/newlib/libc/machine/mn10200/configure
index 98bab64..867ded9 100755
--- a/newlib/libc/machine/mn10200/configure
+++ b/newlib/libc/machine/mn10200/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/mn10300/Makefile.in b/newlib/libc/machine/mn10300/Makefile.in
index 159c4ad..e6b92d7 100644
--- a/newlib/libc/machine/mn10300/Makefile.in
+++ b/newlib/libc/machine/mn10300/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,8 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = setjmp.S memchr.S memcmp.S memcpy.S memset.S strchr.S 	strcmp.S strcpy.S strlen.S
+lib_a_SOURCES = setjmp.S memchr.S memcmp.S memcpy.S memset.S strchr.S \
+	strcmp.S strcpy.S strlen.S
 
 
 ACLOCAL_AMFLAGS = -I ../../..
@@ -131,8 +127,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/mn10300/aclocal.m4 b/newlib/libc/machine/mn10300/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/mn10300/aclocal.m4
+++ b/newlib/libc/machine/mn10300/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/mn10300/configure b/newlib/libc/machine/mn10300/configure
index ec6b96e..95db997 100755
--- a/newlib/libc/machine/mn10300/configure
+++ b/newlib/libc/machine/mn10300/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/mn10300/setjmp.S b/newlib/libc/machine/mn10300/setjmp.S
index 1444449..a95f12c 100644
--- a/newlib/libc/machine/mn10300/setjmp.S
+++ b/newlib/libc/machine/mn10300/setjmp.S
@@ -4,12 +4,8 @@
 	.align 1
 	.global _setjmp
 #ifdef __AM33__
-#ifdef __AM33_2__
-	.am33_2
-#else
 	.am33
 #endif
-#endif
 _setjmp:
         mov d0,a0
         mov d2,(0,a0)
@@ -26,24 +22,6 @@ _setjmp:
 	mov r5,(a0+)
 	mov r6,(a0+)
 	mov r7,(a0+)
-#ifdef __AM33_2__
-	fmov fs4,(a0+)
-	fmov fs5,(a0+)
-	fmov fs6,(a0+)
-	fmov fs7,(a0+)
-	fmov fs8,(a0+)
-	fmov fs9,(a0+)
-	fmov fs10,(a0+)
-	fmov fs11,(a0+)
-	fmov fs12,(a0+)
-	fmov fs13,(a0+)
-	fmov fs14,(a0+)
-	fmov fs15,(a0+)
-	fmov fs16,(a0+)
-	fmov fs17,(a0+)
-	fmov fs18,(a0+)
-	fmov fs19,(a0+)
-#endif
 #endif
         sub d0,d0
 	rets
@@ -65,24 +43,6 @@ _longjmp:
 	mov (a0+),r5
 	mov (a0+),r6
 	mov (a0+),r7
-#ifdef __AM33_2__
-	fmov (a0+),fs4
-	fmov (a0+),fs5
-	fmov (a0+),fs6
-	fmov (a0+),fs7
-	fmov (a0+),fs8
-	fmov (a0+),fs9
-	fmov (a0+),fs10
-	fmov (a0+),fs11
-	fmov (a0+),fs12
-	fmov (a0+),fs13
-	fmov (a0+),fs14
-	fmov (a0+),fs15
-	fmov (a0+),fs16
-	fmov (a0+),fs17
-	fmov (a0+),fs18
-	fmov (a0+),fs19
-#endif
 #endif
 	cmp 0,d1
 	bne L1
diff --git a/newlib/libc/machine/mt/Makefile.am b/newlib/libc/machine/mt/Makefile.am
deleted file mode 100644
index 1c65b9f..0000000
--- a/newlib/libc/machine/mt/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/mt/Makefile.in b/newlib/libc/machine/mt/Makefile.in
deleted file mode 100644
index 9736912..0000000
--- a/newlib/libc/machine/mt/Makefile.in
+++ /dev/null
@@ -1,327 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/mt/aclocal.m4 b/newlib/libc/machine/mt/aclocal.m4
deleted file mode 100644
index 55d5e67..0000000
--- a/newlib/libc/machine/mt/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/mt/configure b/newlib/libc/machine/mt/configure
deleted file mode 100755
index 028b7b4..0000000
--- a/newlib/libc/machine/mt/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.am
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/mt/configure.in b/newlib/libc/machine/mt/configure.in
deleted file mode 100644
index d6898f5..0000000
--- a/newlib/libc/machine/mt/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/mt configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(Makefile.am)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/mt/setjmp.S b/newlib/libc/machine/mt/setjmp.S
deleted file mode 100644
index e93bd33..0000000
--- a/newlib/libc/machine/mt/setjmp.S
+++ /dev/null
@@ -1,99 +0,0 @@
-# setjmp/longjmp for mt.
-# 
-# The jmpbuf looks like this:
-#	
-# Register	jmpbuf offset
-# R0		---		--
-# R1		0x4		 4
-# R2		0x8		 8
-# R3		0xc		12
-# R4		0x10		16
-# R5		0x14		20
-# R6		0x18		24
-# R7		0x1c		28
-# R8		0x20		32
-# R9		----		--
-# R10		----		--
-# R11		0x2c		44
-# R12		0x30		48
-# R13		0x34		52
-# R14		0x38		56
-# R15		0x3c		60
-#
-# R1 contains the pointer to jmpbuf
-	.text
-	.global	setjmp
-	.type	setjmp ,@function
-setjmp:
-
-	stw	r1, r1, #4
-	or	r0, r0, r0
-	stw	r2, r1, #8
-	or	r0, r0, r0
-	stw	r3, r1, #12
-	or	r0, r0, r0
-	stw	r4, r1, #16
-	or	r0, r0, r0
-	stw	r5, r1, #20
-	or	r0, r0, r0
-	stw	r6, r1, #24
-	or	r0, r0, r0
-	stw	r7, r1, #28
-	or	r0, r0, r0
-	stw	r8, r1, #32
-	or	r0, r0, r0
-	stw	r11, r1, #44
-	or	r0, r0, r0
-	stw	r12, r1, #48
-	or	r0, r0, r0
-	stw	r13, r1, #52
-	or	r0, r0, r0
-	stw	r14, r1, #56
-	or	r0, r0, r0
-	stw	r15, r1, #60
-
-	jal	r0, r14
-	addi	r11, r0, #0
-.Lend1:
-	.size	setjmp,.Lend1-setjmp
-
-	.global	longjmp
-	.type	longjmp,@function
-longjmp:
-	or	r9, r1, r1
-	or	r11, r2, r2
-	ldw	r1, r1, #4
-	or	r0, r0, r0
-	ldw	r2, r1, #8
-	or	r0, r0, r0
-	ldw	r3, r1, #12
-	or	r0, r0, r0
-	ldw	r4, r1, #16
-	or	r0, r0, r0
-	ldw	r5, r1, #20
-	or	r0, r0, r0
-	ldw	r6, r1, #24
-	or	r0, r0, r0
-	ldw	r7, r1, #28
-	or	r0, r0, r0
-	ldw	r8, r1, #32
-	or	r0, r0, r0
-
-
-	ldw	r12, r1, #48
-	or	r0, r0, r0
-	ldw	r13, r1, #52
-	or	r0, r0, r0
-	ldw	r14, r1, #56
-	or	r0, r0, r0
-	ldw	r15, r1, #60
-
-	brne	r0, r11, .L01
-	or	r0, r0, r0
-
-	addi	r11, r0, #1
-.L01:
-	jal	r0, r14
-	or	r0, r0, r0
-.Lend2:
-	.size	longjmp,.Lend2-longjmp2
diff --git a/newlib/libc/machine/necv70/Makefile.in b/newlib/libc/machine/necv70/Makefile.in
index 458ac9f..f470671 100644
--- a/newlib/libc/machine/necv70/Makefile.in
+++ b/newlib/libc/machine/necv70/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/necv70/aclocal.m4 b/newlib/libc/machine/necv70/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/necv70/aclocal.m4
+++ b/newlib/libc/machine/necv70/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/necv70/configure b/newlib/libc/machine/necv70/configure
index 58653d8..6af411b 100755
--- a/newlib/libc/machine/necv70/configure
+++ b/newlib/libc/machine/necv70/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/necv70/necv70.tex b/newlib/libc/machine/necv70/necv70.tex
index 9c15304..be5397f 100644
--- a/newlib/libc/machine/necv70/necv70.tex
+++ b/newlib/libc/machine/necv70/necv70.tex
@@ -1,8 +1,8 @@
 @node machine,,syscalls,Top
 @chapter NEC V70 Specific Functions
 
-The NEC V70 has machine instructions for fast IEEE floating-point
-arithmetic, including operations normally provided by the library.  
+The NEC V70 has machine instructions for fast IEEE floating point,
+including operations normally provided by the library.  
 
 When you use the @file{/usr/include/fastmath.h} header file, the
 names of several library math functions are redefined to call the
@@ -43,7 +43,7 @@ Also, the library provides true @code{float} entry points.  The
 @code{fast_sinf} entry point really performs a @code{fsin.s}
 operation.  Because of this, the instructions are only useful when
 using code compiled with an ANSI C compiler.  The prototypes
-and definitions for the floating-point versions of the math library
+and definitions for the floating point versions of the math library
 routines are only defined if compiling a module with an ANSI C
 compiler.
 
diff --git a/newlib/libc/machine/powerpc/Makefile.am b/newlib/libc/machine/powerpc/Makefile.am
index 917f79e..1c65b9f 100644
--- a/newlib/libc/machine/powerpc/Makefile.am
+++ b/newlib/libc/machine/powerpc/Makefile.am
@@ -6,20 +6,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = setjmp.S times.c
-lib_a_LIBADD = @extra_objs@
-EXTRA_lib_a_SOURCES = @extra_sources@
-lib_a_DEPENDENCIES = @extra_objs@
+lib_a_SOURCES = setjmp.S
 
-ACLOCAL_AMFLAGS = -I ../../.. 
-AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
+ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
-VEC_MALLOC_COMPILE = $(COMPILE) -DINTERNAL_NEWLIB
-
-vec_reallocr.o: vec_mallocr.c
-	$(VEC_MALLOC_COMPILE) -DDEFINE_VECREALLOC -c $(srcdir)/vec_mallocr.c -o $@
-
-vec_callocr.o: vec_mallocr.c
-	$(VEC_MALLOC_COMPILE) -DDEFINE_VECCALLOC -c $(srcdir)/vec_mallocr.c -o $@
-
diff --git a/newlib/libc/machine/powerpc/Makefile.in b/newlib/libc/machine/powerpc/Makefile.in
index 99efd53..ace6f06 100644
--- a/newlib/libc/machine/powerpc/Makefile.in
+++ b/newlib/libc/machine/powerpc/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,13 +68,10 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 aext = @aext@
-extra_objs = @extra_objs@
-extra_sources = @extra_sources@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -91,16 +84,10 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = setjmp.S times.c
-lib_a_LIBADD = @extra_objs@
-EXTRA_lib_a_SOURCES = @extra_sources@
-lib_a_DEPENDENCIES = @extra_objs@
+lib_a_SOURCES = setjmp.S
 
-ACLOCAL_AMFLAGS = -I ../../.. 
-AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib
+ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
-VEC_MALLOC_COMPILE = $(COMPILE) -DINTERNAL_NEWLIB
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
 CONFIG_CLEAN_FILES = 
@@ -110,7 +97,8 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-lib_a_OBJECTS =  setjmp.o times.o
+lib_a_LIBADD = 
+lib_a_OBJECTS =  setjmp.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -122,7 +110,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(EXTRA_lib_a_SOURCES)
+SOURCES = $(lib_a_SOURCES)
 OBJECTS = $(lib_a_OBJECTS)
 
 all: all-redirect
@@ -136,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -329,12 +316,6 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-vec_reallocr.o: vec_mallocr.c
-	$(VEC_MALLOC_COMPILE) -DDEFINE_VECREALLOC -c $(srcdir)/vec_mallocr.c -o $@
-
-vec_callocr.o: vec_mallocr.c
-	$(VEC_MALLOC_COMPILE) -DDEFINE_VECCALLOC -c $(srcdir)/vec_mallocr.c -o $@
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/newlib/libc/machine/powerpc/aclocal.m4 b/newlib/libc/machine/powerpc/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/powerpc/aclocal.m4
+++ b/newlib/libc/machine/powerpc/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/powerpc/atosfix16.c b/newlib/libc/machine/powerpc/atosfix16.c
deleted file mode 100644
index 501c0f1..0000000
--- a/newlib/libc/machine/powerpc/atosfix16.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-FUNCTION
-   <<atosfix16>>, <<atosfix32>>, <<atosfix64>>---string to signed fixed-point
-
-INDEX
-	atosfix16
-INDEX
-	atosfix32
-INDEX
-	atosfix64
-INDEX
-	_atosfix16_r
-INDEX
-	_atosfix32_r
-INDEX
-	_atosfix64_r
-
-ANSI_SYNOPSIS
-	#include <stdlib.h>
-        __int16_t atosfix16(const char *<[s]>);
-	__int32_t atosfix32(const char *<[s]>);
-	__int64_t atosfix32(const char *<[s]>);
-
-        __int16_t _atosfix16_r(struct __reent *, const char *<[s]>);
-	__int32_t _atosfix32_r(struct __reent *, const char *<[s]>);
-	__int64_t _atosfix32_r(struct __reent *, const char *<[s]>);
-
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	__int16_t atosfix16(<[s]>)
-	const char *<[s]>;
-	
-	__int32_t atosfix32(<[s]>)
-	const char *<[s]>;
-
-	__int64_t atosfix64(<[s]>)
-	const char *<[s]>;
-
-	__int16_t _atosfix16_r(<reent>, <[s]>)
-	struct _reent *<[reent]>;
-	const char *<[s]>;
-	
-	__int32_t _atosfix32_r(<reent>, <[s]>)
-	struct _reent *<[reent]>;
-	const char *<[s]>;
-	
-	__int64_t _atosfix64_r(<reent>, <[s]>)
-	struct _reent *<[reent]>;
-	const char *<[s]>;
-	
-DESCRIPTION
-	<<atosfix16>> converts the initial portion of a string to a sign
-	+ 15-bit fraction fixed point value.
-	<<atosfix32>> converts the initial portion of a string to a sign
-	+ 31-bit fraction fixed point value.
-	<<atosfix64>> converts the initial portion of a string to a sign
-	+ 63-bit fraction fixed point value.
-	<<atosfix16(s)>> is implemented as <<strtosfix16(s, NULL).>>
-	<<atosfix32(s)>> is implemented as <<strtosfix32(s, NULL).>>
-	<<atosfix64(s)>> is implemented as <<strtosfix64(s, NULL).>>
-
-	The alternate functions <<_atosfix16_r>>, <<_atosfix32_r>>,
-	and <<_atosfix64_r>> are reentrant versions.
-	The extra argument <[reent]> is a pointer to a reentrancy structure.
-
-RETURNS
-	The functions return the converted value, if any. If no conversion was
-	made, <<0>> is returned.  If saturation occurs, <<ERANGE>> is stored
-	in errno.
-
-PORTABILITY
-	<<atosfix16>>, <<atosfix32>>, and <<atosfix64>> are non-standard.
-
-	No supporting OS subroutines are directly required.  The
-	OS subroutines required by <<strtod>> are used.
-*/
-
-/*
- * Jeff Johnston - 02/13/2002
- */
-
-#ifdef __SPE__
-
-#include <stdlib.h>
-#include <_ansi.h>
-
-__int16_t
-_DEFUN (_atosfix16_r, (reent, s),
-	struct _reent *reent _AND
-	_CONST char *s)
-{
-  return _strtosfix16_r (reent, s, NULL);
-}
-
-#ifndef _REENT_ONLY
-__int16_t
-_DEFUN (atosfix16, (s),
-	_CONST char *s)
-{
-  return strtosfix16 (s, NULL);
-}
-
-#endif /* !_REENT_ONLY */
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/atosfix32.c b/newlib/libc/machine/powerpc/atosfix32.c
deleted file mode 100644
index dbcac7e..0000000
--- a/newlib/libc/machine/powerpc/atosfix32.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Jeff Johnston - 02/13/2002
- */
-
-#ifdef __SPE__
-
-#include <stdlib.h>
-#include <_ansi.h>
-
-__int32_t
-_DEFUN (_atosfix32_r, (reent, s),
-	struct _reent *reent _AND
-	_CONST char *s)
-{
-  return _strtosfix32_r (reent, s, NULL);
-}
-
-#ifndef _REENT_ONLY
-__int32_t
-_DEFUN (atosfix32, (s),
-	_CONST char *s)
-{
-  return strtosfix32 (s, NULL);
-}
-
-#endif /* !_REENT_ONLY */
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/atosfix64.c b/newlib/libc/machine/powerpc/atosfix64.c
deleted file mode 100644
index 109baf7..0000000
--- a/newlib/libc/machine/powerpc/atosfix64.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Jeff Johnston - 02/13/2002
- */
-
-#ifdef __SPE__ 
-
-#include <stdlib.h>
-#include <_ansi.h>
-
-__int64_t
-_DEFUN (_atosfix64_r, (reent, s),
-	struct _reent *reent _AND
-	_CONST char *s)
-{
-  return _strtosfix64_r (reent, s, NULL);
-}
-
-#ifndef _REENT_ONLY
-__int64_t
-_DEFUN (atosfix64, (s),
-	_CONST char *s)
-{
-  return strtosfix64 (s, NULL);
-}
-
-#endif /* !_REENT_ONLY */
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/atoufix16.c b/newlib/libc/machine/powerpc/atoufix16.c
deleted file mode 100644
index 53db137..0000000
--- a/newlib/libc/machine/powerpc/atoufix16.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-FUNCTION
-   <<atoufix16>>, <<atoufix32>>, <<atoufix64>>---string to unsigned fixed-point
-
-INDEX
-	atoufix16
-INDEX
-	atoufix32
-INDEX
-	atoufix64
-INDEX
-	_atoufix16_r
-INDEX
-	_atoufix32_r
-INDEX
-	_atoufix64_r
-
-ANSI_SYNOPSIS
-	#include <stdlib.h>
-        __uint16_t atoufix16(const char *<[s]>);
-	__uint32_t atoufix32(const char *<[s]>);
-	__uint64_t atoufix32(const char *<[s]>);
-
-        __uint16_t _atoufix16_r(struct __reent *, const char *<[s]>);
-	__uint32_t _atoufix32_r(struct __reent *, const char *<[s]>);
-	__uint64_t _atoufix32_r(struct __reent *, const char *<[s]>);
-
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	__uint16_t atoufix16(<[s]>)
-	const char *<[s]>;
-	
-	__uint32_t atoufix32(<[s]>)
-	const char *<[s]>;
-
-	__uint64_t atoufix64(<[s]>)
-	const char *<[s]>;
-
-	__uint16_t _atoufix16_r(<reent>, <[s]>)
-	struct _reent *<[reent]>;
-	const char *<[s]>;
-	
-	__uint32_t _atoufix32_r(<reent>, <[s]>)
-	struct _reent *<[reent]>;
-	const char *<[s]>;
-	
-	__uint64_t _atoufix64_r(<reent>, <[s]>)
-	struct _reent *<[reent]>;
-	const char *<[s]>;
-	
-DESCRIPTION
-	<<atoufix16>> converts the initial portion of a string to a
-	16-bit fraction unsigned fixed point value.
-	<<atoufix32>> converts the initial portion of a string to a
-	32-bit fraction unsigned fixed point value.
-	<<atoufix64>> converts the initial portion of a string to a
-	64-bit fraction unsigned fixed point value.
-	<<atoufix16(s)>> is implemented as <<strtoufix16(s, NULL).>>
-	<<atoufix32(s)>> is implemented as <<strtoufix32(s, NULL).>>
-	<<atoufix64(s)>> is implemented as <<strtoufix64(s, NULL).>>
-
-	The alternate functions <<_atoufix16_r>>, <<_atoufix32_r>>,
-	and <<_atoufix64_r>> are reentrant versions.
-	The extra argument <[reent]> is a pointer to a reentrancy structure.
-
-RETURNS
-	The functions return the converted value, if any. If no conversion was
-	made, <<0>> is returned.  If saturation occurs, <<ERANGE>> is stored
-	in errno.
-
-PORTABILITY
-	<<atoufix16>>, <<atoufix32>>, and <<atoufix64>> are non-standard.
-
-	No supporting OS subroutines are directly required.  The
-	OS subroutines required by <<strtod>> are used.
-*/
-
-/*
- * Jeff Johnston - 02/13/2002
- */
-
-#ifdef __SPE__
-
-#include <stdlib.h>
-#include <_ansi.h>
-
-__uint16_t
-_DEFUN (_atoufix16_r, (reent, s),
-	struct _reent *reent _AND
-	_CONST char *s)
-{
-  return _strtoufix16_r (reent, s, NULL);
-}
-
-#ifndef _REENT_ONLY
-__uint16_t
-_DEFUN (atoufix16, (s),
-	_CONST char *s)
-{
-  return strtoufix16 (s, NULL);
-}
-
-#endif /* !_REENT_ONLY */
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/atoufix32.c b/newlib/libc/machine/powerpc/atoufix32.c
deleted file mode 100644
index ee29ac5..0000000
--- a/newlib/libc/machine/powerpc/atoufix32.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Jeff Johnston - 02/13/2002
- */
-
-#ifdef __SPE__ 
-
-#include <stdlib.h>
-#include <_ansi.h>
-
-__uint32_t
-_DEFUN (_atoufix32_r, (reent, s),
-	struct _reent *reent _AND
-	_CONST char *s)
-{
-  return _strtoufix32_r (reent, s, NULL);
-}
-
-#ifndef _REENT_ONLY
-__uint32_t
-_DEFUN (atoufix32, (s),
-	_CONST char *s)
-{
-  return strtoufix32 (s, NULL);
-}
-
-#endif /* !_REENT_ONLY */
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/atoufix64.c b/newlib/libc/machine/powerpc/atoufix64.c
deleted file mode 100644
index e5eefc4..0000000
--- a/newlib/libc/machine/powerpc/atoufix64.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Jeff Johnston - 02/13/2002
- */
-
-#ifdef __SPE__
-
-#include <stdlib.h>
-#include <_ansi.h>
-
-__uint64_t
-_DEFUN (_atoufix64_r, (reent, s),
-	struct _reent *reent _AND
-	_CONST char *s)
-{
-  return _strtoufix64_r (reent, s, NULL);
-}
-
-#ifndef _REENT_ONLY
-__uint64_t
-_DEFUN (atoufix64, (s),
-	_CONST char *s)
-{
-  return strtoufix64 (s, NULL);
-}
-
-#endif /* !_REENT_ONLY */
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/configure b/newlib/libc/machine/powerpc/configure
index e74aa97..867ded9 100755
--- a/newlib/libc/machine/powerpc/configure
+++ b/newlib/libc/machine/powerpc/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,11 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
 
 
 
@@ -1567,22 +1425,6 @@ OBJEXT=${oext}
 
 
 
-
-extra_objs=
-extra_sources=
-case $host in
-  powerpc*-*altivec*)
-	extra_objs="vfprintf.o vfscanf.o vec_malloc.o vec_calloc.o vec_free.o vec_realloc.o vec_reallocr.o vec_callocr.o"
-	extra_sources="vfprintf.c vfscanf.c vec_malloc.c vec_calloc.c vec_free.c vec_realloc.c vec_mallocr.c"
-	;;
-  powerpc*-*spe*)
-	extra_objs="atosfix16.o atosfix32.o atosfix64.o atoufix16.o atoufix32.o atoufix64.o simdldtoa.o strtosfix16.o strtosfix32.o strtosfix64.o strtoufix16.o strtoufix32.o strtoufix64.o ufix64toa.o vfprintf.o vfscanf.o"
-	extra_sources="atosfix16.c atosfix32.c atosfix64.c atoufix16.c atoufix32.c atoufix64.c simdldtoa.c strtosfix16.c strtosfix32.c strtosfix64.c strtoufix16.c strtoufix32.c strtoufix64.c ufix64toa.c vfprintf.c vfscanf.c"
-	;;
-esac
-
-
-
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -1728,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1758,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1766,26 +1601,13 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
 s%@machine_dir@%$machine_dir%g
 s%@sys_dir@%$sys_dir%g
-s%@extra_objs@%$extra_objs%g
-s%@extra_sources@%$extra_sources%g
 
 CEOF
 EOF
@@ -1794,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/powerpc/configure.in b/newlib/libc/machine/powerpc/configure.in
index b1c4734..47b9eab 100644
--- a/newlib/libc/machine/powerpc/configure.in
+++ b/newlib/libc/machine/powerpc/configure.in
@@ -9,19 +9,4 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 NEWLIB_CONFIGURE(../../..)
 
-extra_objs=
-extra_sources=
-case $host in
-  powerpc*-*altivec*)
-	extra_objs="vfprintf.o vfscanf.o vec_malloc.o vec_calloc.o vec_free.o vec_realloc.o vec_reallocr.o vec_callocr.o"
-	extra_sources="vfprintf.c vfscanf.c vec_malloc.c vec_calloc.c vec_free.c vec_realloc.c vec_mallocr.c"
-	;;
-  powerpc*-*spe*)
-	extra_objs="atosfix16.o atosfix32.o atosfix64.o atoufix16.o atoufix32.o atoufix64.o simdldtoa.o strtosfix16.o strtosfix32.o strtosfix64.o strtoufix16.o strtoufix32.o strtoufix64.o ufix64toa.o vfprintf.o vfscanf.o"
-	extra_sources="atosfix16.c atosfix32.c atosfix64.c atoufix16.c atoufix32.c atoufix64.c simdldtoa.c strtosfix16.c strtosfix32.c strtosfix64.c strtoufix16.c strtoufix32.c strtoufix64.c ufix64toa.c vfprintf.c vfscanf.c"
-	;;
-esac
-AC_SUBST(extra_objs)
-AC_SUBST(extra_sources)
-
 AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/powerpc/fix64.h b/newlib/libc/machine/powerpc/fix64.h
deleted file mode 100644
index ce94820..0000000
--- a/newlib/libc/machine/powerpc/fix64.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef _FIX64_H_
-
-#define _FIX64_H_
-
-#include <ieeefp.h>
-#include <math.h>
-#include <float.h>
-#include <errno.h>
-#include <sys/config.h>
-
-#ifdef __IEEE_LITTLE_ENDIAN
-#define IEEE_8087
-#endif
-
-#ifdef __IEEE_BIG_ENDIAN
-#define IEEE_MC68k
-#endif
-
-#ifdef __Z8000__
-#define Just_16
-#endif
-
-#if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
-Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
-#endif
-
-union long_double_union
-{
-  long double ld;
-  __uint32_t i[4];
-};
-
-typedef union long_double_union LONG_DOUBLE_UNION;
-
-extern void _simdstrtold (char *, char **, LONG_DOUBLE_UNION *);
-extern int  _simdldcheck (LONG_DOUBLE_UNION *);
-
-#define SIMD_LDBL_MANT_DIG 113
-
-#ifdef IEEE_8087
-# define word0(x) (x.i[3])
-# define word1(x) (x.i[2])
-# define word2(x) (x.i[1])
-# define word3(x) (x.i[0])
-#else /* !IEEE_8087 */
-# define word0(x) (x.i[0])
-# define word1(x) (x.i[1])
-# define word2(x) (x.i[2])
-# define word3(x) (x.i[3])
-#endif /* !IEEE_8087 */
-
-#undef  Exp_shift
-#define Exp_shift   16
-#undef  Exp_mask
-#define Exp_mask    ((__uint32_t)0x7fff0000L)
-#undef  Exp_msk1
-#define Exp_msk1    ((__uint32_t)0x00010000L)
-#undef  Bias
-#define Bias 	     16383
-#undef  Ebits
-#define Ebits 	     15
-#undef  Sign_bit
-#define Sign_bit    ((__uint32_t)0x80000000L)
-#define init(x) {} 
-
-union fix64_union
-{
-  __uint64_t ll;
-  __uint32_t j[2];
-};
-
-#ifdef __LITTLE_ENDIAN__
-# define hiword(y) (y.j[1])
-# define loword(y) (y.j[0])
-#else /* __BIG_ENDIAN__ */
-# define hiword(y) (y.j[0])
-# define loword(y) (y.j[1])
-#endif /* __BIG_ENDIAN__ */
-
-#endif /* _FIX64_H_ */
diff --git a/newlib/libc/machine/powerpc/machine/malloc.h b/newlib/libc/machine/powerpc/machine/malloc.h
deleted file mode 100644
index 945a965..0000000
--- a/newlib/libc/machine/powerpc/machine/malloc.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef	_MACHMALLOC_H_
-#define	_MACHMALLOC_H_
-
-# if defined(__ALTIVEC__)
-
-_PTR    _EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
-_PTR    _EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
-_VOID   _EXFUN(vec_free,(_PTR));
-#define _vec_freer _freer
-_PTR    _EXFUN(vec_malloc,(size_t __size));
-#define _vec_mallocr _memalign_r
-_PTR    _EXFUN(vec_realloc,(_PTR __r, size_t __size));
-_PTR    _EXFUN(_vec_realloc_r,(struct _reent *, _PTR __r, size_t __size));
-
-# endif /* __ALTIVEC__ */
-
-
-#endif	/* _MACHMALLOC_H_ */
-
-
diff --git a/newlib/libc/machine/powerpc/machine/stdlib.h b/newlib/libc/machine/powerpc/machine/stdlib.h
deleted file mode 100644
index 1cf1837..0000000
--- a/newlib/libc/machine/powerpc/machine/stdlib.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef	_MACHSTDLIB_H_
-#define	_MACHSTDLIB_H_
-
-#ifndef __STRICT_ANSI__
-
-# if defined(__ALTIVEC__)
-
-_PTR    _EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
-_PTR    _EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
-_VOID   _EXFUN(vec_free,(_PTR));
-#define _vec_freer _freer
-_PTR    _EXFUN(vec_malloc,(size_t __size));
-#define _vec_mallocr _memalign_r
-_PTR    _EXFUN(vec_realloc,(_PTR __r, size_t __size));
-_PTR    _EXFUN(_vec_realloc_r,(struct _reent *, _PTR __r, size_t __size));
-
-# endif /* __ALTIVEC__ */
-
-# if defined(__SPE__)
-
-#define __need_inttypes
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-__int16_t   _EXFUN(atosfix16,(const char *__str));
-__int16_t   _EXFUN(_atosfix16_r,(struct _reent *, const char *__str));
-__int32_t   _EXFUN(atosfix32,(const char *__str));
-__int32_t   _EXFUN(_atosfix32_r,(struct _reent *, const char *__str));
-__int64_t   _EXFUN(atosfix64,(const char *__str));
-__int64_t   _EXFUN(_atosfix64_r,(struct _reent *, const char *__str));
-
-__uint16_t _EXFUN(atoufix16,(const char *__str));
-__uint16_t _EXFUN(_atoufix16_r,(struct _reent *, const char *__str));
-__uint32_t _EXFUN(atoufix32,(const char *__str));
-__uint32_t _EXFUN(_atoufix32_r,(struct _reent *, const char *__str));
-__uint64_t _EXFUN(atoufix64,(const char *__str));
-__uint64_t _EXFUN(_atoufix64_r,(struct _reent *, const char *__str));
-
-__int16_t   _EXFUN(strtosfix16,(const char *__str, char **__endptr));
-__int16_t   _EXFUN(_strtosfix16_r,(struct _reent *, const char *__str, 
-                 char **__endptr));
-__int32_t   _EXFUN(strtosfix32,(const char *__str, char **__endptr));
-__int32_t   _EXFUN(_strtosfix32_r,(struct _reent *, const char *__str, 
-                 char **__endptr));
-__int64_t   _EXFUN(strtosfix64,(const char *__str, char **__endptr));
-__int64_t   _EXFUN(_strtosfix64_r,(struct _reent *, const char *__str, 
-                 char **__endptr));
-
-__uint16_t _EXFUN(strtoufix16,(const char *__str, char **__endptr));
-__uint16_t _EXFUN(_strtoufix16_r,(struct _reent *, const char *__str, 
-                 char **__endptr));
-__uint32_t _EXFUN(strtoufix32,(const char *__str, char **__endptr));
-__uint32_t _EXFUN(_strtoufix32_r,(struct _reent *, const char *__str, 
-                 char **__endptr));
-__uint64_t _EXFUN(strtoufix64,(const char *__str, char **__endptr));
-__uint64_t _EXFUN(_strtoufix64_r,(struct _reent *, const char *__str, 
-                 char **__endptr));
-#ifdef __cplusplus
-}
-#endif
-
-# endif /* __SPE__ */
-
-#endif /* !__STRICT_ANSI__ */
-
-
-#endif	/* _MACHSTDLIB_H_ */
-
-
diff --git a/newlib/libc/machine/powerpc/setjmp.S b/newlib/libc/machine/powerpc/setjmp.S
index ec3a443..c137691 100644
--- a/newlib/libc/machine/powerpc/setjmp.S
+++ b/newlib/libc/machine/powerpc/setjmp.S
@@ -1,17 +1,11 @@
 /* This is a simple version of setjmp and longjmp for the PowerPC.
-   Ian Lance Taylor, Cygnus Support, 9 Feb 1994.  
-   Modified by Jeff Johnston, Red Hat Inc. 2 Oct 2001. */
+   Ian Lance Taylor, Cygnus Support, 9 Feb 1994.  */
 
 #include "ppc-asm.h"
 
 FUNC_START(setjmp)
-#ifdef __ALTIVEC__
-	addi	3,3,15		# align Altivec to 16 byte boundary
-	rlwinm	3,3,0,0,27
-#else
 	addi	3,3,7		# align to 8 byte boundary
 	rlwinm	3,3,0,0,28
-#endif
 	stw	1,0(3)		# offset 0
 	stwu	2,4(3)		# offset 4
 	stwu	13,4(3)		# offset 8
@@ -62,50 +56,14 @@ FUNC_START(setjmp)
 	/* This requires a total of 21 * 4 + 18 * 8 + 4 + 4 + 4
 	   bytes == 60 * 4 bytes == 240 bytes.  */
 
-#ifdef __ALTIVEC__
-	/* save Altivec vrsave and vr20-vr31 registers */
-	mfspr	4,256		# vrsave register
-	stwu	4,16(3)		# offset 248
-	addi	3,3,8
-	stvx	20,0,3		# offset 256
-	addi	3,3,16
-	stvx	21,0,3		# offset 272
-	addi	3,3,16
-	stvx	22,0,3		# offset 288
-	addi	3,3,16
-	stvx	23,0,3		# offset 304
-	addi	3,3,16
-	stvx	24,0,3		# offset 320
-	addi	3,3,16
-	stvx	25,0,3		# offset 336
-	addi	3,3,16
-	stvx	26,0,3		# offset 352
-	addi	3,3,16
-	stvx	27,0,3		# offset 368
-	addi	3,3,16
-	stvx	28,0,3		# offset 384
-	addi	3,3,16
-	stvx	29,0,3		# offset 400
-	addi	3,3,16
-	stvx	30,0,3		# offset 416
-	addi	3,3,16
-	stvx	31,0,3		# offset 432
-
-	/* This requires a total of 240 + 8 + 8 + 12 * 16 == 448 bytes. */
-#endif
 	li	3,0
 	blr
 FUNC_END(setjmp)
 
 
 FUNC_START(longjmp)
-#ifdef __ALTIVEC__
-	addi	3,3,15		# align Altivec to 16 byte boundary
-	rlwinm	3,3,0,0,27
-#else
 	addi	3,3,7		# align to 8 byte boundary
 	rlwinm	3,3,0,0,28
-#endif
 	lwz	1,0(3)		# offset 0 
 	lwzu	2,4(3)		# offset 4 
 	lwzu	13,4(3)		# offset 8 
@@ -153,36 +111,6 @@ FUNC_START(longjmp)
 	lfdu	31,8(3)         # offset 232
 #endif
 
-#ifdef __ALTIVEC__
-	/* restore Altivec vrsave and v20-v31 registers */
-	lwzu	5,16(3)		# offset 248
-	mtspr	256,5		# vrsave
-	addi	3,3,8
-	lvx	20,0,3		# offset 256
-	addi	3,3,16
-	lvx	21,0,3		# offset 272
-	addi	3,3,16
-	lvx	22,0,3		# offset 288
-	addi	3,3,16
-	lvx	23,0,3		# offset 304
-	addi	3,3,16
-	lvx	24,0,3		# offset 320
-	addi	3,3,16
-	lvx	25,0,3		# offset 336
-	addi	3,3,16
-	lvx	26,0,3		# offset 352
-	addi	3,3,16
-	lvx	27,0,3		# offset 368
-	addi	3,3,16
-	lvx	28,0,3		# offset 384
-	addi	3,3,16
-	lvx	29,0,3		# offset 400
-	addi	3,3,16
-	lvx	30,0,3		# offset 416
-	addi	3,3,16
-	lvx	31,0,3		# offset 432
-#endif
-
 	mr.	3,4
 	bclr+	4,2
 	li	3,1
diff --git a/newlib/libc/machine/powerpc/simdldtoa.c b/newlib/libc/machine/powerpc/simdldtoa.c
deleted file mode 100644
index 9a90e64..0000000
--- a/newlib/libc/machine/powerpc/simdldtoa.c
+++ /dev/null
@@ -1,3722 +0,0 @@
-
- /* Extended precision arithmetic functions for long double I/O.
-  * This program has been placed in the public domain.
-  */
-
-#ifdef __SPE__
-
-#include <_ansi.h>
-#include <reent.h>
-#include <string.h>
-#include <stdlib.h>
-#include "mprec.h"
-#include "fix64.h"
-
-/* These are the externally visible entries. */
-/* linux name:  long double _IO_strtold (char *, char **); */
-void _simdstrtold (char *, char **, LONG_DOUBLE_UNION *);
-char * _simdldtoa_r (struct _reent *, LONG_DOUBLE_UNION *, int, int, int *, int *, char **);
-
- /* Number of 16 bit words in external x type format */
- #define NE 10
-
- /* Number of 16 bit words in internal format */
- #define NI (NE+3)
-
- /* Array offset to exponent */
- #define E 1
-
- /* Array offset to high guard word */
- #define M 2
-
- /* Number of bits of precision */
- #define NBITS ((NI-4)*16)
-
- /* Maximum number of decimal digits in ASCII conversion
-  * = NBITS*log10(2)
-  */
- #define NDEC (NBITS*8/27)
-
- /* The exponent of 1.0 */
- #define EXONE (0x3fff)
-
- /* Maximum exponent digits - base 10 */
- #define MAX_EXP_DIGITS 5
-
-/* Control structure for long doublue conversion including rounding precision values.
- * rndprc can be set to 80 (if NE=6), 64, 56, 53, or 24 bits.
- */
-typedef struct
-{
-  int rlast;
-  int rndprc;
-  int rw;
-  int re;
-  int outexpon;
-  unsigned short rmsk;
-  unsigned short rmbit;
-  unsigned short rebit;
-  unsigned short rbit[NI];
-  unsigned short equot[NI];
-} LDPARMS;
-
-static void esub(short unsigned int *a, short unsigned int *b, short unsigned int *c, LDPARMS *ldp);
-static void emul(short unsigned int *a, short unsigned int *b, short unsigned int *c, LDPARMS *ldp);
-static void ediv(short unsigned int *a, short unsigned int *b, short unsigned int *c, LDPARMS *ldp);
-static int ecmp(short unsigned int *a, short unsigned int *b);
-static int enormlz(short unsigned int *x);
-static int eshift(short unsigned int *x, int sc);
-static void eshup1(register short unsigned int *x);
-static void eshup8(register short unsigned int *x);
-static void eshup6(register short unsigned int *x);
-static void eshdn1(register short unsigned int *x);
-static void eshdn8(register short unsigned int *x);
-static void eshdn6(register short unsigned int *x);
-static void eneg(short unsigned int *x);
-static void emov(register short unsigned int *a, register short unsigned int *b);
-static void eclear(register short unsigned int *x);
-static void einfin(register short unsigned int *x, register LDPARMS *ldp);
-static void efloor(short unsigned int *x, short unsigned int *y, LDPARMS *ldp);
-static void etoasc(short unsigned int *x, char *string, int ndigs, int outformat, LDPARMS *ldp);
-
-#if SIMD_LDBL_MANT_DIG == 24
-static void e24toe(short unsigned int *pe, short unsigned int *y, LDPARMS *ldp);
-#elif SIMD_LDBL_MANT_DIG == 53
-static void e53toe(short unsigned int *pe, short unsigned int *y, LDPARMS *ldp);
-#elif SIMD_LDBL_MANT_DIG == 64
-static void e64toe(short unsigned int *pe, short unsigned int *y, LDPARMS *ldp);
-#else
-static void e113toe(short unsigned int *pe, short unsigned int *y, LDPARMS *ldp);
-#endif
-
-/*							econst.c	*/
-/*  e type constants used by high precision check routines */
-
-#if NE == 10
-/* 0.0 */
-static unsigned short ezero[NE] =
- {0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,};
-
-/* 1.0E0 */
-static unsigned short eone[NE] =
- {0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x3fff,};
-
-#else
-
-/* 0.0 */
-static unsigned short ezero[NE] = {
-0, 0000000,0000000,0000000,0000000,0000000,};
-/* 1.0E0 */
-static unsigned short eone[NE] = {
-0, 0000000,0000000,0000000,0100000,0x3fff,};
-
-#endif
-
-/* Debugging routine for displaying errors */
-#ifdef DEBUG
-/* Notice: the order of appearance of the following
- * messages is bound to the error codes defined
- * in mconf.h.
- */
-static char *ermsg[7] = {
-"unknown",      /* error code 0 */
-"domain",       /* error code 1 */
-"singularity",  /* et seq.      */
-"overflow",
-"underflow",
-"total loss of precision",
-"partial loss of precision"
-};
-#define mtherr(name, code) printf( "\n%s %s error\n", name, ermsg[code] );
-#else
-#define mtherr(name, code)
-#endif
-
-/*							ieee.c
- *
- *    Extended precision IEEE binary floating point arithmetic routines
- *
- * Numbers are stored in C language as arrays of 16-bit unsigned
- * short integers.  The arguments of the routines are pointers to
- * the arrays.
- *
- *
- * External e type data structure, simulates Intel 8087 chip
- * temporary real format but possibly with a larger significand:
- *
- *	NE-1 significand words	(least significant word first,
- *				 most significant bit is normally set)
- *	exponent		(value = EXONE for 1.0,
- *				top bit is the sign)
- *
- *
- * Internal data structure of a number (a "word" is 16 bits):
- *
- * ei[0]	sign word	(0 for positive, 0xffff for negative)
- * ei[1]	biased exponent	(value = EXONE for the number 1.0)
- * ei[2]	high guard word	(always zero after normalization)
- * ei[3]
- * to ei[NI-2]	significand	(NI-4 significand words,
- *				 most significant word first,
- *				 most significant bit is set)
- * ei[NI-1]	low guard word	(0x8000 bit is rounding place)
- *
- *
- *
- *		Routines for external format numbers
- *
- *	asctoe( string, e )	ASCII string to extended double e type
- *	asctoe64( string, &d )	ASCII string to long double
- *	asctoe53( string, &d )	ASCII string to double
- *	asctoe24( string, &f )	ASCII string to single
- *	asctoeg( string, e, prec, ldp ) ASCII string to specified precision
- *	e24toe( &f, e, ldp )	IEEE single precision to e type
- *	e53toe( &d, e, ldp )	IEEE double precision to e type
- *	e64toe( &d, e, ldp )	IEEE long double precision to e type
- *	e113toe( &d, e, ldp )	IEEE long double precision to e type
- *	eabs(e)			absolute value
- *	eadd( a, b, c )		c = b + a
- *	eclear(e)		e = 0
- *	ecmp (a, b)		Returns 1 if a > b, 0 if a == b,
- *				-1 if a < b, -2 if either a or b is a NaN.
- *	ediv( a, b, c, ldp )	c = b / a
- *	efloor( a, b, ldp )	truncate to integer, toward -infinity
- *	efrexp( a, exp, s )	extract exponent and significand
- *	eifrac( e, &l, frac )   e to long integer and e type fraction
- *	euifrac( e, &l, frac )  e to unsigned long integer and e type fraction
- *	einfin( e, ldp )	set e to infinity, leaving its sign alone
- *	eldexp( a, n, b )	multiply by 2**n
- *	emov( a, b )		b = a
- *	emul( a, b, c, ldp )	c = b * a
- *	eneg(e)			e = -e
- *	eround( a, b )		b = nearest integer value to a
- *	esub( a, b, c, ldp )	c = b - a
- *	e24toasc( &f, str, n )	single to ASCII string, n digits after decimal
- *	e53toasc( &d, str, n )	double to ASCII string, n digits after decimal
- *	e64toasc( &d, str, n )	long double to ASCII string
- *	etoasc(e,str,n,fmt,ldp)e to ASCII string, n digits after decimal
- *	etoe24( e, &f )		convert e type to IEEE single precision
- *	etoe53( e, &d )		convert e type to IEEE double precision
- *	etoe64( e, &d )		convert e type to IEEE long double precision
- *	ltoe( &l, e )		long (32 bit) integer to e type
- *	ultoe( &l, e )		unsigned long (32 bit) integer to e type
- *      eisneg( e )             1 if sign bit of e != 0, else 0
- *      eisinf( e )             1 if e has maximum exponent (non-IEEE)
- *				or is infinite (IEEE)
- *      eisnan( e )             1 if e is a NaN
- *	esqrt( a, b )		b = square root of a
- *
- *
- *		Routines for internal format numbers
- *
- *	eaddm( ai, bi )		add significands, bi = bi + ai
- *	ecleaz(ei)		ei = 0
- *	ecleazs(ei)		set ei = 0 but leave its sign alone
- *	ecmpm( ai, bi )		compare significands, return 1, 0, or -1
- *	edivm( ai, bi, ldp )	divide  significands, bi = bi / ai
- *	emdnorm(ai,l,s,exp,ldp) normalize and round off
- *	emovi( a, ai )		convert external a to internal ai
- *	emovo( ai, a, ldp )	convert internal ai to external a
- *	emovz( ai, bi )		bi = ai, low guard word of bi = 0
- *	emulm( ai, bi, ldp )	multiply significands, bi = bi * ai
- *	enormlz(ei)		left-justify the significand
- *	eshdn1( ai )		shift significand and guards down 1 bit
- *	eshdn8( ai )		shift down 8 bits
- *	eshdn6( ai )		shift down 16 bits
- *	eshift( ai, n )		shift ai n bits up (or down if n < 0)
- *	eshup1( ai )		shift significand and guards up 1 bit
- *	eshup8( ai )		shift up 8 bits
- *	eshup6( ai )		shift up 16 bits
- *	esubm( ai, bi )		subtract significands, bi = bi - ai
- *
- *
- * The result is always normalized and rounded to NI-4 word precision
- * after each arithmetic operation.
- *
- * Exception flags are NOT fully supported.
- *
- * Define INFINITY in mconf.h for support of infinity; otherwise a
- * saturation arithmetic is implemented.
- *
- * Define NANS for support of Not-a-Number items; otherwise the
- * arithmetic will never produce a NaN output, and might be confused
- * by a NaN input.
- * If NaN's are supported, the output of ecmp(a,b) is -2 if
- * either a or b is a NaN. This means asking if(ecmp(a,b) < 0)
- * may not be legitimate. Use if(ecmp(a,b) == -1) for less-than
- * if in doubt.
- * Signaling NaN's are NOT supported; they are treated the same
- * as quiet NaN's.
- *
- * Denormals are always supported here where appropriate (e.g., not
- * for conversion to DEC numbers).
- */
-
-/*
- * Revision history:
- *
- *  5 Jan 84	PDP-11 assembly language version
- *  6 Dec 86	C language version
- * 30 Aug 88	100 digit version, improved rounding
- * 15 May 92    80-bit long double support
- * 22 Nov 00    Revised to fit into newlib by Jeff Johnston <jjohnstn@redhat.com>
- *
- * Author:  S. L. Moshier.
- *
- * Copyright (c) 1984,2000 S.L. Moshier
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose without fee is hereby granted, provided that this entire notice
- * is included in all copies of any software which is or includes a copy
- * or modification of this software and in all copies of the supporting
- * documentation for such software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTY.  IN PARTICULAR,  THE AUTHOR MAKES NO REPRESENTATION
- * OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY OF THIS
- * SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
- *
- */
-
-#include <stdio.h>
-/* #include "\usr\include\stdio.h" */
-/*#include "ehead.h"*/
-/*#include "mconf.h"*/
-/*							mconf.h
- *
- *	Common include file for math routines
- *
- *
- *
- * SYNOPSIS:
- *
- * #include "mconf.h"
- *
- *
- *
- * DESCRIPTION:
- *
- * This file contains definitions for error codes that are
- * passed to the common error handling routine mtherr()
- * (which see).
- *
- * The file also includes a conditional assembly definition
- * for the type of computer arithmetic (IEEE, DEC, Motorola
- * IEEE, or UNKnown).
- *
- * For Digital Equipment PDP-11 and VAX computers, certain
- * IBM systems, and others that use numbers with a 56-bit
- * significand, the symbol DEC should be defined.  In this
- * mode, most floating point constants are given as arrays
- * of octal integers to eliminate decimal to binary conversion
- * errors that might be introduced by the compiler.
- *
- * For computers, such as IBM PC, that follow the IEEE 
- * Standard for Binary Floating Point Arithmetic (ANSI/IEEE
- * Std 754-1985), the symbol IBMPC should be defined.  These
- * numbers have 53-bit significands.  In this mode, constants
- * are provided as arrays of hexadecimal 16 bit integers.
- *
- * To accommodate other types of computer arithmetic, all
- * constants are also provided in a normal decimal radix
- * which one can hope are correctly converted to a suitable
- * format by the available C language compiler.  To invoke
- * this mode, the symbol UNK is defined.
- *
- * An important difference among these modes is a predefined
- * set of machine arithmetic constants for each.  The numbers
- * MACHEP (the machine roundoff error), MAXNUM (largest number
- * represented), and several other parameters are preset by
- * the configuration symbol.  Check the file const.c to
- * ensure that these values are correct for your computer.
- *
- * For ANSI C compatibility, define ANSIC equal to 1.  Currently
- * this affects only the atan2() function and others that use it.
- */
-
-/* Constant definitions for math error conditions
- */
-
-#define DOMAIN		1	/* argument domain error */
-#define SING		2	/* argument singularity */
-#define OVERFLOW	3	/* overflow range error */
-#define UNDERFLOW	4	/* underflow range error */
-#define TLOSS		5	/* total loss of precision */
-#define PLOSS		6	/* partial loss of precision */
-
-#define EDOM		33
-#define ERANGE		34
-
-typedef struct
-	{
-	double r;
-	double i;
-	}cmplx;
-
-/* Type of computer arithmetic */
-
-#ifndef DEC
-#ifdef __IEEE_LITTLE_ENDIAN
-#define IBMPC 1
-#else  /* !__IEEE_LITTLE_ENDIAN */
-#define MIEEE 1
-#endif /* !__IEEE_LITTLE_ENDIAN */
-#endif /* !DEC */
-
-/* Define 1 for ANSI C atan2() function
- * See atan.c and clog.c.
- */
-#define ANSIC 1
-
-/*define VOLATILE volatile*/
-#define VOLATILE 
-
-#define NANS
-#define INFINITY
-
-/* NaN's require infinity support. */
-#ifdef NANS
-#ifndef INFINITY
-#define INFINITY
-#endif
-#endif
-
-/* This handles 64-bit long ints. */
-#define LONGBITS (8 * sizeof(long))
-
-
-static void eaddm(short unsigned int *x, short unsigned int *y);
-static void esubm(short unsigned int *x, short unsigned int *y);
-static void emdnorm(short unsigned int *s, int lost, int subflg, long int exp, int rcntrl, LDPARMS *ldp);
-static int  asctoeg(char *ss, short unsigned int *y, int oprec, LDPARMS *ldp);
-static void enan(short unsigned int *nan, int size);
-#if SIMD_LDBL_MANT_DIG == 24
-static void toe24(short unsigned int *x, short unsigned int *y);
-#elif SIMD_LDBL_MANT_DIG == 53
-static void toe53(short unsigned int *x, short unsigned int *y);
-#elif SIMD_LDBL_MANT_DIG == 64
-static void toe64(short unsigned int *a, short unsigned int *b);
-#else
-static void toe113(short unsigned int *a, short unsigned int *b);
-#endif
-static void eiremain(short unsigned int *den, short unsigned int *num, LDPARMS *ldp);
-static int ecmpm(register short unsigned int *a, register short unsigned int *b);
-static int edivm(short unsigned int *den, short unsigned int *num, LDPARMS *ldp);
-static int emulm(short unsigned int *a, short unsigned int *b, LDPARMS *ldp);
-static int eisneg(short unsigned int *x);
-static int eisinf(short unsigned int *x);
-static void emovi(short unsigned int *a, short unsigned int *b);
-static void emovo(short unsigned int *a, short unsigned int *b, LDPARMS *ldp);
-static void emovz(register short unsigned int *a, register short unsigned int *b);
-static void ecleaz(register short unsigned int *xi);
-static void eadd1(short unsigned int *a, short unsigned int *b, short unsigned int *c, int subflg, LDPARMS *ldp);
-static int eisnan(short unsigned int *x);
-static int eiisnan(short unsigned int *x);
-
-#ifdef DEC
-static void etodec(), todec(), dectoe();
-#endif
-
-/*
-; Clear out entire external format number.
-;
-; unsigned short x[];
-; eclear( x );
-*/
-
-static void eclear(register short unsigned int *x)
-{
-register int i;
-
-for( i=0; i<NE; i++ )
-	*x++ = 0;
-}
-
-
-
-/* Move external format number from a to b.
- *
- * emov( a, b );
- */
-
-static void emov(register short unsigned int *a, register short unsigned int *b)
-{
-register int i;
-
-for( i=0; i<NE; i++ )
-	*b++ = *a++;
-}
-
-
-/*
-;	Negate external format number
-;
-;	unsigned short x[NE];
-;	eneg( x );
-*/
-
-static void eneg(short unsigned int *x)
-{
-
-#ifdef NANS
-if( eisnan(x) )
-	return;
-#endif
-x[NE-1] ^= 0x8000; /* Toggle the sign bit */
-}
-
-
-
-/* Return 1 if external format number is negative,
- * else return zero.
- */
-static int eisneg(short unsigned int *x)
-{
-
-#ifdef NANS
-if( eisnan(x) )
-	return( 0 );
-#endif
-if( x[NE-1] & 0x8000 )
-	return( 1 );
-else
-	return( 0 );
-}
-
-
-/* Return 1 if external format number has maximum possible exponent,
- * else return zero.
- */
-static int eisinf(short unsigned int *x)
-{
-
-if( (x[NE-1] & 0x7fff) == 0x7fff )
-	{
-#ifdef NANS
-	if( eisnan(x) )
-		return( 0 );
-#endif
-	return( 1 );
-	}
-else
-	return( 0 );
-}
-
-/* Check if e-type number is not a number.
- */
-static int eisnan(short unsigned int *x)
-{
-
-#ifdef NANS
-int i;
-/* NaN has maximum exponent */
-if( (x[NE-1] & 0x7fff) != 0x7fff )
-	return (0);
-/* ... and non-zero significand field. */
-for( i=0; i<NE-1; i++ )
-	{
-	if( *x++ != 0 )
-		return (1);
-	}
-#endif
-return (0);
-}
-
-/*
-; Fill entire number, including exponent and significand, with
-; largest possible number.  These programs implement a saturation
-; value that is an ordinary, legal number.  A special value
-; "infinity" may also be implemented; this would require tests
-; for that value and implementation of special rules for arithmetic
-; operations involving inifinity.
-*/
-
-static void einfin(register short unsigned int *x, register LDPARMS *ldp)
-{
-register int i;
-
-#ifdef INFINITY
-for( i=0; i<NE-1; i++ )
-	*x++ = 0;
-*x |= 32767;
-ldp = ldp;
-#else
-for( i=0; i<NE-1; i++ )
-	*x++ = 0xffff;
-*x |= 32766;
-if( ldp->rndprc < NBITS )
-	{
-	if (ldp->rndprc == 113)
-		{
-		*(x - 9) = 0;
-		*(x - 8) = 0;
-		}
-	if( ldp->rndprc == 64 )
-		{
-		*(x-5) = 0;
-		}
-	if( ldp->rndprc == 53 )
-		{
-		*(x-4) = 0xf800;
-		}
-	else
-		{
-		*(x-4) = 0;
-		*(x-3) = 0;
-		*(x-2) = 0xff00;
-		}
-	}
-#endif
-}
-
-/* Move in external format number,
- * converting it to internal format.
- */
-static void emovi(short unsigned int *a, short unsigned int *b)
-{
-register unsigned short *p, *q;
-int i;
-
-q = b;
-p = a + (NE-1);	/* point to last word of external number */
-/* get the sign bit */
-if( *p & 0x8000 )
-	*q++ = 0xffff;
-else
-	*q++ = 0;
-/* get the exponent */
-*q = *p--;
-*q++ &= 0x7fff;	/* delete the sign bit */
-#ifdef INFINITY
-if( (*(q-1) & 0x7fff) == 0x7fff )
-	{
-#ifdef NANS
-	if( eisnan(a) )
-		{
-		*q++ = 0;
-		for( i=3; i<NI; i++ )
-			*q++ = *p--;
-		return;
-		}
-#endif
-	for( i=2; i<NI; i++ )
-		*q++ = 0;
-	return;
-	}
-#endif
-/* clear high guard word */
-*q++ = 0;
-/* move in the significand */
-for( i=0; i<NE-1; i++ )
-	*q++ = *p--;
-/* clear low guard word */
-*q = 0;
-}
-
-
-/* Move internal format number out,
- * converting it to external format.
- */
-static void emovo(short unsigned int *a, short unsigned int *b, LDPARMS *ldp)
-{
-register unsigned short *p, *q;
-unsigned short i;
-
-p = a;
-q = b + (NE-1); /* point to output exponent */
-/* combine sign and exponent */
-i = *p++;
-if( i )
-	*q-- = *p++ | 0x8000;
-else
-	*q-- = *p++;
-#ifdef INFINITY
-if( *(p-1) == 0x7fff )
-	{
-#ifdef NANS
-	if( eiisnan(a) )
-		{
-		enan( b, NBITS );
-		return;
-		}
-#endif
-	einfin(b, ldp);
-	return;
-	}
-#endif
-/* skip over guard word */
-++p;
-/* move the significand */
-for( i=0; i<NE-1; i++ )
-	*q-- = *p++;
-}
-
-
-/* Clear out internal format number.
- */
-
-static void ecleaz(register short unsigned int *xi)
-{
-register int i;
-
-for( i=0; i<NI; i++ )
-	*xi++ = 0;
-}
-
-/* same, but don't touch the sign. */
-
-static void ecleazs(register short unsigned int *xi)
-{
-register int i;
-
-++xi;
-for(i=0; i<NI-1; i++)
-	*xi++ = 0;
-}
-
-
-
-
-/* Move internal format number from a to b.
- */
-static void emovz(register short unsigned int *a, register short unsigned int *b)
-{
-register int i;
-
-for( i=0; i<NI-1; i++ )
-	*b++ = *a++;
-/* clear low guard word */
-*b = 0;
-}
-
-/* Return nonzero if internal format number is a NaN.
- */
-
-static int eiisnan (short unsigned int *x)
-{
-int i;
-
-if( (x[E] & 0x7fff) == 0x7fff )
-	{
-	for( i=M+1; i<NI; i++ )
-		{
-		if( x[i] != 0 )
-			return(1);
-		}
-	}
-return(0);
-}
-
-#if SIMD_LDBL_MANT_DIG == 64
-
-/* Return nonzero if internal format number is infinite. */
-static int 
-eiisinf (x)
-     unsigned short x[];
-{
-
-#ifdef NANS
-  if (eiisnan (x))
-    return (0);
-#endif
-  if ((x[E] & 0x7fff) == 0x7fff)
-    return (1);
-  return (0);
-}
-#endif /* SIMD_LDBL_MANT_DIG == 64 */
-
-/*
-;	Compare significands of numbers in internal format.
-;	Guard words are included in the comparison.
-;
-;	unsigned short a[NI], b[NI];
-;	cmpm( a, b );
-;
-;	for the significands:
-;	returns	+1 if a > b
-;		 0 if a == b
-;		-1 if a < b
-*/
-static int ecmpm(register short unsigned int *a, register short unsigned int *b)
-{
-int i;
-
-a += M; /* skip up to significand area */
-b += M;
-for( i=M; i<NI; i++ )
-	{
-	if( *a++ != *b++ )
-		goto difrnt;
-	}
-return(0);
-
-difrnt:
-if( *(--a) > *(--b) )
-	return(1);
-else
-	return(-1);
-}
-
-
-/*
-;	Shift significand down by 1 bit
-*/
-
-static void eshdn1(register short unsigned int *x)
-{
-register unsigned short bits;
-int i;
-
-x += M;	/* point to significand area */
-
-bits = 0;
-for( i=M; i<NI; i++ )
-	{
-	if( *x & 1 )
-		bits |= 1;
-	*x >>= 1;
-	if( bits & 2 )
-		*x |= 0x8000;
-	bits <<= 1;
-	++x;
-	}	
-}
-
-
-
-/*
-;	Shift significand up by 1 bit
-*/
-
-static void eshup1(register short unsigned int *x)
-{
-register unsigned short bits;
-int i;
-
-x += NI-1;
-bits = 0;
-
-for( i=M; i<NI; i++ )
-	{
-	if( *x & 0x8000 )
-		bits |= 1;
-	*x <<= 1;
-	if( bits & 2 )
-		*x |= 1;
-	bits <<= 1;
-	--x;
-	}
-}
-
-
-
-/*
-;	Shift significand down by 8 bits
-*/
-
-static void eshdn8(register short unsigned int *x)
-{
-register unsigned short newbyt, oldbyt;
-int i;
-
-x += M;
-oldbyt = 0;
-for( i=M; i<NI; i++ )
-	{
-	newbyt = *x << 8;
-	*x >>= 8;
-	*x |= oldbyt;
-	oldbyt = newbyt;
-	++x;
-	}
-}
-
-/*
-;	Shift significand up by 8 bits
-*/
-
-static void eshup8(register short unsigned int *x)
-{
-int i;
-register unsigned short newbyt, oldbyt;
-
-x += NI-1;
-oldbyt = 0;
-
-for( i=M; i<NI; i++ )
-	{
-	newbyt = *x >> 8;
-	*x <<= 8;
-	*x |= oldbyt;
-	oldbyt = newbyt;
-	--x;
-	}
-}
-
-/*
-;	Shift significand up by 16 bits
-*/
-
-static void eshup6(register short unsigned int *x)
-{
-int i;
-register unsigned short *p;
-
-p = x + M;
-x += M + 1;
-
-for( i=M; i<NI-1; i++ )
-	*p++ = *x++;
-
-*p = 0;
-}
-
-/*
-;	Shift significand down by 16 bits
-*/
-
-static void eshdn6(register short unsigned int *x)
-{
-int i;
-register unsigned short *p;
-
-x += NI-1;
-p = x + 1;
-
-for( i=M; i<NI-1; i++ )
-	*(--p) = *(--x);
-
-*(--p) = 0;
-}
-
-/*
-;	Add significands
-;	x + y replaces y
-*/
-
-static void eaddm(short unsigned int *x, short unsigned int *y)
-{
-register unsigned long a;
-int i;
-unsigned int carry;
-
-x += NI-1;
-y += NI-1;
-carry = 0;
-for( i=M; i<NI; i++ )
-	{
-	a = (unsigned long )(*x) + (unsigned long )(*y) + carry;
-	if( a & 0x10000 )
-		carry = 1;
-	else
-		carry = 0;
-	*y = (unsigned short )a;
-	--x;
-	--y;
-	}
-}
-
-/*
-;	Subtract significands
-;	y - x replaces y
-*/
-
-static void esubm(short unsigned int *x, short unsigned int *y)
-{
-unsigned long a;
-int i;
-unsigned int carry;
-
-x += NI-1;
-y += NI-1;
-carry = 0;
-for( i=M; i<NI; i++ )
-	{
-	a = (unsigned long )(*y) - (unsigned long )(*x) - carry;
-	if( a & 0x10000 )
-		carry = 1;
-	else
-		carry = 0;
-	*y = (unsigned short )a;
-	--x;
-	--y;
-	}
-}
-
-
-/* Divide significands */
-
-
-/* Multiply significand of e-type number b
-by 16-bit quantity a, e-type result to c. */
-
-static void m16m(short unsigned int a, short unsigned int *b, short unsigned int *c)
-{
-register unsigned short *pp;
-register unsigned long carry;
-unsigned short *ps;
-unsigned short p[NI];
-unsigned long aa, m;
-int i;
-
-aa = a;
-pp = &p[NI-2];
-*pp++ = 0;
-*pp = 0;
-ps = &b[NI-1];
-
-for( i=M+1; i<NI; i++ )
-	{
-	if( *ps == 0 )
-		{
-		--ps;
-		--pp;
-		*(pp-1) = 0;
-		}
-	else
-		{
-		m = (unsigned long) aa * *ps--;
-		carry = (m & 0xffff) + *pp;
-		*pp-- = (unsigned short )carry;
-		carry = (carry >> 16) + (m >> 16) + *pp;
-		*pp = (unsigned short )carry;
-		*(pp-1) = carry >> 16;
-		}
-	}
-for( i=M; i<NI; i++ )
-	c[i] = p[i];
-}
-
-
-/* Divide significands. Neither the numerator nor the denominator
-is permitted to have its high guard word nonzero.  */
-
-
-static int edivm(short unsigned int *den, short unsigned int *num, LDPARMS *ldp)
-{
-int i;
-register unsigned short *p;
-unsigned long tnum;
-unsigned short j, tdenm, tquot;
-unsigned short tprod[NI+1];
-unsigned short *equot = ldp->equot;
-
-p = &equot[0];
-*p++ = num[0];
-*p++ = num[1];
-
-for( i=M; i<NI; i++ )
-	{
-	*p++ = 0;
-	}
-eshdn1( num );
-tdenm = den[M+1];
-for( i=M; i<NI; i++ )
-	{
-	/* Find trial quotient digit (the radix is 65536). */
-	tnum = (((unsigned long) num[M]) << 16) + num[M+1];
-
-	/* Do not execute the divide instruction if it will overflow. */
-        if( (tdenm * 0xffffUL) < tnum )
-		tquot = 0xffff;
-	else
-		tquot = tnum / tdenm;
-
-		/* Prove that the divide worked. */
-/*
-	tcheck = (unsigned long )tquot * tdenm;
-	if( tnum - tcheck > tdenm )
-		tquot = 0xffff;
-*/
-	/* Multiply denominator by trial quotient digit. */
-	m16m( tquot, den, tprod );
-	/* The quotient digit may have been overestimated. */
-	if( ecmpm( tprod, num ) > 0 )
-		{
-		tquot -= 1;
-		esubm( den, tprod );
-		if( ecmpm( tprod, num ) > 0 )
-			{
-			tquot -= 1;
-			esubm( den, tprod );
-			}
-		}
-/*
-	if( ecmpm( tprod, num ) > 0 )
-		{
-		eshow( "tprod", tprod );
-		eshow( "num  ", num );
-		printf( "tnum = %08lx, tden = %04x, tquot = %04x\n",
-			 tnum, den[M+1], tquot );
-		}
-*/
-	esubm( tprod, num );
-/*
-	if( ecmpm( num, den ) >= 0 )
-		{
-		eshow( "num  ", num );
-		eshow( "den  ", den );
-		printf( "tnum = %08lx, tden = %04x, tquot = %04x\n",
-			 tnum, den[M+1], tquot );
-		}
-*/
-	equot[i] = tquot;
-	eshup6(num);
-	}
-/* test for nonzero remainder after roundoff bit */
-p = &num[M];
-j = 0;
-for( i=M; i<NI; i++ )
-	{
-	j |= *p++;
-	}
-if( j )
-	j = 1;
-
-for( i=0; i<NI; i++ )
-	num[i] = equot[i];
-
-return( (int )j );
-}
-
-
-
-/* Multiply significands */
-static int emulm(short unsigned int *a, short unsigned int *b, LDPARMS *ldp) 
-{
-unsigned short *p, *q;
-unsigned short pprod[NI];
-unsigned short j;
-int i;
-unsigned short *equot = ldp->equot;
-
-equot[0] = b[0];
-equot[1] = b[1];
-for( i=M; i<NI; i++ )
-	equot[i] = 0;
-
-j = 0;
-p = &a[NI-1];
-q = &equot[NI-1];
-for( i=M+1; i<NI; i++ )
-	{
-	if( *p == 0 )
-		{
-		--p;
-		}
-	else
-		{
-		m16m( *p--, b, pprod );
-		eaddm(pprod, equot);
-		}
-	j |= *q;
-	eshdn6(equot);
-	}
-
-for( i=0; i<NI; i++ )
-	b[i] = equot[i];
-
-/* return flag for lost nonzero bits */
-return( (int)j );
-}
-
-
-/*
-static void eshow(str, x)
-char *str;
-unsigned short *x;
-{
-int i;
-
-printf( "%s ", str );
-for( i=0; i<NI; i++ )
-	printf( "%04x ", *x++ );
-printf( "\n" );
-}
-*/
-
-
-/*
- * Normalize and round off.
- *
- * The internal format number to be rounded is "s".
- * Input "lost" indicates whether the number is exact.
- * This is the so-called sticky bit.
- *
- * Input "subflg" indicates whether the number was obtained
- * by a subtraction operation.  In that case if lost is nonzero
- * then the number is slightly smaller than indicated.
- *
- * Input "exp" is the biased exponent, which may be negative.
- * the exponent field of "s" is ignored but is replaced by
- * "exp" as adjusted by normalization and rounding.
- *
- * Input "rcntrl" is the rounding control.
- */
-
-
-static void emdnorm(short unsigned int *s, int lost, int subflg, long int exp, int rcntrl, LDPARMS *ldp)
-{
-int i, j;
-unsigned short r;
-
-/* Normalize */
-j = enormlz( s );
-
-/* a blank significand could mean either zero or infinity. */
-#ifndef INFINITY
-if( j > NBITS )
-	{
-	ecleazs( s );
-	return;
-	}
-#endif
-exp -= j;
-#ifndef INFINITY
-if( exp >= 32767L )
-	goto overf;
-#else
-if( (j > NBITS) && (exp < 32767L) )
-	{
-	ecleazs( s );
-	return;
-	}
-#endif
-if( exp < 0L )
-	{
-	if( exp > (long )(-NBITS-1) )
-		{
-		j = (int )exp;
-		i = eshift( s, j );
-		if( i )
-			lost = 1;
-		}
-	else
-		{
-		ecleazs( s );
-		return;
-		}
-	}
-/* Round off, unless told not to by rcntrl. */
-if( rcntrl == 0 )
-	goto mdfin;
-/* Set up rounding parameters if the control register changed. */
-if( ldp->rndprc != ldp->rlast )
-	{
-	ecleaz( ldp->rbit );
-	switch( ldp->rndprc )
-		{
-		default:
-		case NBITS:
-			ldp->rw = NI-1; /* low guard word */
-			ldp->rmsk = 0xffff;
-			ldp->rmbit = 0x8000;
-			ldp->rebit = 1;
-			ldp->re = ldp->rw - 1;
-			break;
-		case 113:
-			ldp->rw = 10;
-			ldp->rmsk = 0x7fff;
-			ldp->rmbit = 0x4000;
-			ldp->rebit = 0x8000;
-			ldp->re = ldp->rw;
-			break;
-		case 64:
-			ldp->rw = 7;
-			ldp->rmsk = 0xffff;
-			ldp->rmbit = 0x8000;
-			ldp->rebit = 1;
-			ldp->re = ldp->rw-1;
-			break;
-/* For DEC arithmetic */
-		case 56:
-			ldp->rw = 6;
-			ldp->rmsk = 0xff;
-			ldp->rmbit = 0x80;
-			ldp->rebit = 0x100;
-			ldp->re = ldp->rw;
-			break;
-		case 53:
-			ldp->rw = 6;
-			ldp->rmsk = 0x7ff;
-			ldp->rmbit = 0x0400;
-			ldp->rebit = 0x800;
-			ldp->re = ldp->rw;
-			break;
-		case 24:
-			ldp->rw = 4;
-			ldp->rmsk = 0xff;
-			ldp->rmbit = 0x80;
-			ldp->rebit = 0x100;
-			ldp->re = ldp->rw;
-			break;
-		}
-	ldp->rbit[ldp->re] = ldp->rebit;
-	ldp->rlast = ldp->rndprc;
-	}
-
-/* Shift down 1 temporarily if the data structure has an implied
- * most significant bit and the number is denormal.
- * For rndprc = 64 or NBITS, there is no implied bit.
- * But Intel long double denormals lose one bit of significance even so.
- */
-#if IBMPC
-if( (exp <= 0) && (ldp->rndprc != NBITS) )
-#else
-if( (exp <= 0) && (ldp->rndprc != 64) && (ldp->rndprc != NBITS) )
-#endif
-	{
-	lost |= s[NI-1] & 1;
-	eshdn1(s);
-	}
-/* Clear out all bits below the rounding bit,
- * remembering in r if any were nonzero.
- */
-r = s[ldp->rw] & ldp->rmsk;
-if( ldp->rndprc < NBITS )
-	{
-	i = ldp->rw + 1;
-	while( i < NI )
-		{
-		if( s[i] )
-			r |= 1;
-		s[i] = 0;
-		++i;
-		}
-	}
-s[ldp->rw] &= ~ldp->rmsk;
-if( (r & ldp->rmbit) != 0 )
-	{
-	if( r == ldp->rmbit )
-		{
-		if( lost == 0 )
-			{ /* round to even */
-			if( (s[ldp->re] & ldp->rebit) == 0 )
-				goto mddone;
-			}
-		else
-			{
-			if( subflg != 0 )
-				goto mddone;
-			}
-		}
-	eaddm( ldp->rbit, s );
-	}
-mddone:
-#if IBMPC
-if( (exp <= 0) && (ldp->rndprc != NBITS) )
-#else
-if( (exp <= 0) && (ldp->rndprc != 64) && (ldp->rndprc != NBITS) )
-#endif
-	{
-	eshup1(s);
-	}
-if( s[2] != 0 )
-	{ /* overflow on roundoff */
-	eshdn1(s);
-	exp += 1;
-	}
-mdfin:
-s[NI-1] = 0;
-if( exp >= 32767L )
-	{
-#ifndef INFINITY
-overf:
-#endif
-#ifdef INFINITY
-	s[1] = 32767;
-	for( i=2; i<NI-1; i++ )
-		s[i] = 0;
-#else
-	s[1] = 32766;
-	s[2] = 0;
-	for( i=M+1; i<NI-1; i++ )
-		s[i] = 0xffff;
-	s[NI-1] = 0;
-	if( (ldp->rndprc < 64) || (ldp->rndprc == 113) )
-		{
-		s[ldp->rw] &= ~ldp->rmsk;
-		if( ldp->rndprc == 24 )
-			{
-			s[5] = 0;
-			s[6] = 0;
-			}
-		}
-#endif
-	return;
-	}
-if( exp < 0 )
-	s[1] = 0;
-else
-	s[1] = (unsigned short )exp;
-}
-
-
-
-/*
-;	Subtract external format numbers.
-;
-;	unsigned short a[NE], b[NE], c[NE];
-;       LDPARMS *ldp;
-;	esub( a, b, c, ldp );	 c = b - a
-*/
-
-static void esub(short unsigned int *a, short unsigned int *b, short unsigned int *c, LDPARMS *ldp)
-{
-
-#ifdef NANS
-if( eisnan(a) )
-	{
-	emov (a, c);
-	return;
-	}
-if( eisnan(b) )
-	{
-	emov(b,c);
-	return;
-	}
-/* Infinity minus infinity is a NaN.
- * Test for subtracting infinities of the same sign.
- */
-if( eisinf(a) && eisinf(b) && ((eisneg (a) ^ eisneg (b)) == 0))
-	{
-	mtherr( "esub", DOMAIN );
-	enan( c, NBITS );
-	return;
-	}
-#endif
-eadd1( a, b, c, 1, ldp );
-}
-
-
-
-static void eadd1(short unsigned int *a, short unsigned int *b, short unsigned int *c, int subflg, LDPARMS *ldp)
-{
-unsigned short ai[NI], bi[NI], ci[NI];
-int i, lost, j, k;
-long lt, lta, ltb;
-
-#ifdef INFINITY
-if( eisinf(a) )
-	{
-	emov(a,c);
-	if( subflg )
-		eneg(c);
-	return;
-	}
-if( eisinf(b) )
-	{
-	emov(b,c);
-	return;
-	}
-#endif
-emovi( a, ai );
-emovi( b, bi );
-if( subflg )
-	ai[0] = ~ai[0];
-
-/* compare exponents */
-lta = ai[E];
-ltb = bi[E];
-lt = lta - ltb;
-if( lt > 0L )
-	{	/* put the larger number in bi */
-	emovz( bi, ci );
-	emovz( ai, bi );
-	emovz( ci, ai );
-	ltb = bi[E];
-	lt = -lt;
-	}
-lost = 0;
-if( lt != 0L )
-	{
-	if( lt < (long )(-NBITS-1) )
-		goto done;	/* answer same as larger addend */
-	k = (int )lt;
-	lost = eshift( ai, k ); /* shift the smaller number down */
-	}
-else
-	{
-/* exponents were the same, so must compare significands */
-	i = ecmpm( ai, bi );
-	if( i == 0 )
-		{ /* the numbers are identical in magnitude */
-		/* if different signs, result is zero */
-		if( ai[0] != bi[0] )
-			{
-			eclear(c);
-			return;
-			}
-		/* if same sign, result is double */
-		/* double denomalized tiny number */
-		if( (bi[E] == 0) && ((bi[3] & 0x8000) == 0) )
-			{
-			eshup1( bi );
-			goto done;
-			}
-		/* add 1 to exponent unless both are zero! */
-		for( j=1; j<NI-1; j++ )
-			{
-			if( bi[j] != 0 )
-				{
-/* This could overflow, but let emovo take care of that. */
-				ltb += 1;
-				break;
-				}
-			}
-		bi[E] = (unsigned short )ltb;
-		goto done;
-		}
-	if( i > 0 )
-		{	/* put the larger number in bi */
-		emovz( bi, ci );
-		emovz( ai, bi );
-		emovz( ci, ai );
-		}
-	}
-if( ai[0] == bi[0] )
-	{
-	eaddm( ai, bi );
-	subflg = 0;
-	}
-else
-	{
-	esubm( ai, bi );
-	subflg = 1;
-	}
-emdnorm( bi, lost, subflg, ltb, 64, ldp );
-
-done:
-emovo( bi, c, ldp );
-}
-
-
-
-/*
-;	Divide.
-;
-;	unsigned short a[NE], b[NE], c[NE];
-;       LDPARMS *ldp;
-;	ediv( a, b, c, ldp );	c = b / a
-*/
-static void ediv(short unsigned int *a, short unsigned int *b, short unsigned int *c, LDPARMS *ldp)
-{
-unsigned short ai[NI], bi[NI];
-int i;
-long lt, lta, ltb;
-
-#ifdef NANS
-/* Return any NaN input. */
-if( eisnan(a) )
-	{
-	emov(a,c);
-	return;
-	}
-if( eisnan(b) )
-	{
-	emov(b,c);
-	return;
-	}
-/* Zero over zero, or infinity over infinity, is a NaN. */
-if( ((ecmp(a,ezero) == 0) && (ecmp(b,ezero) == 0))
-	|| (eisinf (a) && eisinf (b)) )
-	{
-	mtherr( "ediv", DOMAIN );
-	enan( c, NBITS );
-	return;
-	}
-#endif
-/* Infinity over anything else is infinity. */
-#ifdef INFINITY
-if( eisinf(b) )
-	{
-	if( eisneg(a) ^ eisneg(b) )
-		*(c+(NE-1)) = 0x8000;
-	else
-		*(c+(NE-1)) = 0;
-	einfin(c, ldp);
-	return;
-	}
-if( eisinf(a) )
-	{
-	eclear(c);
-	return;
-	}
-#endif
-emovi( a, ai );
-emovi( b, bi );
-lta = ai[E];
-ltb = bi[E];
-if( bi[E] == 0 )
-	{ /* See if numerator is zero. */
-	for( i=1; i<NI-1; i++ )
-		{
-		if( bi[i] != 0 )
-			{
-			ltb -= enormlz( bi );
-			goto dnzro1;
-			}
-		}
-	eclear(c);
-	return;
-	}
-dnzro1:
-
-if( ai[E] == 0 )
-	{	/* possible divide by zero */
-	for( i=1; i<NI-1; i++ )
-		{
-		if( ai[i] != 0 )
-			{
-			lta -= enormlz( ai );
-			goto dnzro2;
-			}
-		}
-	if( ai[0] == bi[0] )
-		*(c+(NE-1)) = 0;
-	else
-		*(c+(NE-1)) = 0x8000;
-	einfin(c, ldp);
-	mtherr( "ediv", SING );
-	return;
-	}
-dnzro2:
-
-i = edivm( ai, bi, ldp );
-/* calculate exponent */
-lt = ltb - lta + EXONE;
-emdnorm( bi, i, 0, lt, 64, ldp );
-/* set the sign */
-if( ai[0] == bi[0] )
-	bi[0] = 0;
-else
-	bi[0] = 0Xffff;
-emovo( bi, c, ldp );
-}
-
-
-
-/*
-;	Multiply.
-;
-;	unsigned short a[NE], b[NE], c[NE];
-;       LDPARMS *ldp
-;	emul( a, b, c, ldp );	c = b * a
-*/
-static void emul(short unsigned int *a, short unsigned int *b, short unsigned int *c, LDPARMS *ldp)
-{
-unsigned short ai[NI], bi[NI];
-int i, j;
-long lt, lta, ltb;
-
-#ifdef NANS
-/* NaN times anything is the same NaN. */
-if( eisnan(a) )
-	{
-	emov(a,c);
-	return;
-	}
-if( eisnan(b) )
-	{
-	emov(b,c);
-	return;
-	}
-/* Zero times infinity is a NaN. */
-if( (eisinf(a) && (ecmp(b,ezero) == 0))
-	|| (eisinf(b) && (ecmp(a,ezero) == 0)) )
-	{
-	mtherr( "emul", DOMAIN );
-	enan( c, NBITS );
-	return;
-	}
-#endif
-/* Infinity times anything else is infinity. */
-#ifdef INFINITY
-if( eisinf(a) || eisinf(b) )
-	{
-	if( eisneg(a) ^ eisneg(b) )
-		*(c+(NE-1)) = 0x8000;
-	else
-		*(c+(NE-1)) = 0;
-	einfin(c, ldp);
-	return;
-	}
-#endif
-emovi( a, ai );
-emovi( b, bi );
-lta = ai[E];
-ltb = bi[E];
-if( ai[E] == 0 )
-	{
-	for( i=1; i<NI-1; i++ )
-		{
-		if( ai[i] != 0 )
-			{
-			lta -= enormlz( ai );
-			goto mnzer1;
-			}
-		}
-	eclear(c);
-	return;
-	}
-mnzer1:
-
-if( bi[E] == 0 )
-	{
-	for( i=1; i<NI-1; i++ )
-		{
-		if( bi[i] != 0 )
-			{
-			ltb -= enormlz( bi );
-			goto mnzer2;
-			}
-		}
-	eclear(c);
-	return;
-	}
-mnzer2:
-
-/* Multiply significands */
-j = emulm( ai, bi, ldp );
-/* calculate exponent */
-lt = lta + ltb - (EXONE - 1);
-emdnorm( bi, j, 0, lt, 64, ldp );
-/* calculate sign of product */
-if( ai[0] == bi[0] )
-	bi[0] = 0;
-else
-	bi[0] = 0xffff;
-emovo( bi, c, ldp );
-}
-
-
-
-#if SIMD_LDBL_MANT_DIG > 64
-static void e113toe(short unsigned int *pe, short unsigned int *y, LDPARMS *ldp)
-{
-register unsigned short r;
-unsigned short *e, *p;
-unsigned short yy[NI];
-int denorm, i;
-
-e = pe;
-denorm = 0;
-ecleaz(yy);
-#ifdef IBMPC
-e += 7;
-#endif
-r = *e;
-yy[0] = 0;
-if( r & 0x8000 )
-	yy[0] = 0xffff;
-r &= 0x7fff;
-#ifdef INFINITY
-if( r == 0x7fff )
-	{
-#ifdef NANS
-#ifdef IBMPC
-	for( i=0; i<7; i++ )
-		{
-		if( pe[i] != 0 )
-			{
-			enan( y, NBITS );
-			return;
-			}
-		}
-#else  /* !IBMPC */
-	for( i=1; i<8; i++ )
-		{
-		if( pe[i] != 0 )
-			{
-			enan( y, NBITS );
-			return;
-			}
-		}
-#endif /* !IBMPC */
-#endif /* NANS */
-	eclear( y );
-	einfin( y, ldp );
-	if( *e & 0x8000 )
-		eneg(y);
-	return;
-	}
-#endif  /* INFINITY */
-yy[E] = r;
-p = &yy[M + 1];
-#ifdef IBMPC
-for( i=0; i<7; i++ )
-	*p++ = *(--e);
-#else  /* IBMPC */
-++e;
-for( i=0; i<7; i++ )
-	*p++ = *e++;
-#endif /* IBMPC */ 
-/* If denormal, remove the implied bit; else shift down 1. */
-if( r == 0 )
-	{
-	yy[M] = 0;
-	}
-else
-	{
-	yy[M] = 1;
-	eshift( yy, -1 );
-	}
-emovo(yy,y,ldp);
-}
-
-/* move out internal format to ieee long double */
-static void toe113(short unsigned int *a, short unsigned int *b)
-{
-register unsigned short *p, *q;
-unsigned short i;
-
-#ifdef NANS
-if( eiisnan(a) )
-	{
-	enan( b, 113 );
-	return;
-	}
-#endif
-p = a;
-#ifdef MIEEE
-q = b;
-#else
-q = b + 7;			/* point to output exponent */
-#endif
-
-/* If not denormal, delete the implied bit. */
-if( a[E] != 0 )
-	{
-	eshup1 (a);
-	}
-/* combine sign and exponent */
-i = *p++;
-#ifdef MIEEE
-if( i )
-	*q++ = *p++ | 0x8000;
-else
-	*q++ = *p++;
-#else
-if( i )
-	*q-- = *p++ | 0x8000;
-else
-	*q-- = *p++;
-#endif
-/* skip over guard word */
-++p;
-/* move the significand */
-#ifdef MIEEE
-for (i = 0; i < 7; i++)
-	*q++ = *p++;
-#else
-for (i = 0; i < 7; i++)
-	*q-- = *p++;
-#endif
-}
-#endif /* SIMD_LDBL_MANT_DIG > 64 */
-
-
-#if SIMD_LDBL_MANT_DIG == 64
-static void e64toe(short unsigned int *pe, short unsigned int *y, LDPARMS *ldp)
-{
-unsigned short yy[NI];
-unsigned short *p, *q, *e;
-int i;
-
-e = pe;
-p = yy;
-
-for( i=0; i<NE-5; i++ )
-	*p++ = 0;
-#ifdef IBMPC
-for( i=0; i<5; i++ )
-	*p++ = *e++;
-#endif
-#ifdef DEC
-for( i=0; i<5; i++ )
-	*p++ = *e++;
-#endif
-#ifdef MIEEE
-p = &yy[0] + (NE-1);
-*p-- = *e++;
-++e;  /* MIEEE skips over 2nd short */
-for( i=0; i<4; i++ )
-	*p-- = *e++;
-#endif
-
-#ifdef IBMPC
-/* For Intel long double, shift denormal significand up 1
-   -- but only if the top significand bit is zero.  */
-if((yy[NE-1] & 0x7fff) == 0 && (yy[NE-2] & 0x8000) == 0)
-  {
-    unsigned short temp[NI+1];
-    emovi(yy, temp);
-    eshup1(temp);
-    emovo(temp,y,ldp);
-    return;
-  }
-#endif
-#ifdef INFINITY
-/* Point to the exponent field.  */
-p = &yy[NE-1];
-if( *p == 0x7fff )
-	{
-#ifdef NANS
-#ifdef IBMPC
-	for( i=0; i<4; i++ )
-		{
-		if((i != 3 && pe[i] != 0)
-		   /* Check for Intel long double infinity pattern.  */
-		   || (i == 3 && pe[i] != 0x8000))
-			{
-			enan( y, NBITS );
-			return;
-			}
-		}
-#endif
-#ifdef MIEEE
-	for( i=2; i<=5; i++ )
-		{
-		if( pe[i] != 0 )
-			{
-			enan( y, NBITS );
-			return;
-			}
-		}
-#endif
-#endif /* NANS */
-	eclear( y );
-	einfin( y, ldp );
-	if( *p & 0x8000 )
-		eneg(y);
-	return;
-	}
-#endif /* INFINITY */
-p = yy;
-q = y;
-for( i=0; i<NE; i++ )
-	*q++ = *p++;
-}
-
-/* move out internal format to ieee long double */
-static void toe64(short unsigned int *a, short unsigned int *b)
-{
-register unsigned short *p, *q;
-unsigned short i;
-
-#ifdef NANS
-if( eiisnan(a) )
-	{
-	enan( b, 64 );
-	return;
-	}
-#endif
-#ifdef IBMPC
-/* Shift Intel denormal significand down 1.  */
-if( a[E] == 0 )
-  eshdn1(a);
-#endif
-p = a;
-#ifdef MIEEE
-q = b;
-#else
-q = b + 4; /* point to output exponent */
-/* NOTE: Intel data type is 96 bits wide, clear the last word here. */
-*(q+1)= 0;
-#endif
-
-/* combine sign and exponent */
-i = *p++;
-#ifdef MIEEE
-if( i )
-	*q++ = *p++ | 0x8000;
-else
-	*q++ = *p++;
-*q++ = 0; /* leave 2nd short blank */
-#else
-if( i )
-	*q-- = *p++ | 0x8000;
-else
-	*q-- = *p++;
-#endif
-/* skip over guard word */
-++p;
-/* move the significand */
-#ifdef MIEEE
-for( i=0; i<4; i++ )
-	*q++ = *p++;
-#else
-#ifdef INFINITY
-#ifdef IBMPC
-if (eiisinf (a))
-        {
-	/* Intel long double infinity.  */
-	*q-- = 0x8000;
-	*q-- = 0;
-	*q-- = 0;
-	*q = 0;
-	return;
-	}
-#endif /* IBMPC */
-#endif /* INFINITY */
-for( i=0; i<4; i++ )
-	*q-- = *p++;
-#endif
-}
-
-#endif /* SIMD_LDBL_MANT_DIG == 64 */
-
-#if SIMD_LDBL_MANT_DIG == 53
-/*
-; Convert IEEE double precision to e type
-;	double d;
-;	unsigned short x[N+2];
-;	e53toe( &d, x );
-*/
-static void e53toe(short unsigned int *pe, short unsigned int *y, LDPARMS *ldp)
-{
-#ifdef DEC
-
-dectoe( pe, y ); /* see etodec.c */
-
-#else
-
-register unsigned short r;
-register unsigned short *p, *e;
-unsigned short yy[NI];
-int denorm, k;
-
-e = pe;
-denorm = 0;	/* flag if denormalized number */
-ecleaz(yy);
-#ifdef IBMPC
-e += 3;
-#endif
-#ifdef DEC
-e += 3;
-#endif 
-r = *e;
-yy[0] = 0;
-if( r & 0x8000 )
-	yy[0] = 0xffff;
-yy[M] = (r & 0x0f) | 0x10;
-r &= ~0x800f;	/* strip sign and 4 significand bits */
-#ifdef INFINITY
-if( r == 0x7ff0 )
-	{
-#ifdef NANS
-#ifdef IBMPC
-	if( ((pe[3] & 0xf) != 0) || (pe[2] != 0)
-		|| (pe[1] != 0) || (pe[0] != 0) )
-		{
-		enan( y, NBITS );
-		return;
-		}
-#else  /* !IBMPC */
-	if( ((pe[0] & 0xf) != 0) || (pe[1] != 0)
-		 || (pe[2] != 0) || (pe[3] != 0) )
-		{
-		enan( y, NBITS );
-		return;
-		}
-#endif /* !IBMPC */
-#endif  /* NANS */
-	eclear( y );
-	einfin( y, ldp );
-	if( yy[0] )
-		eneg(y);
-	return;
-	}
-#endif
-r >>= 4;
-/* If zero exponent, then the significand is denormalized.
- * So, take back the understood high significand bit. */ 
-if( r == 0 )
-	{
-	denorm = 1;
-	yy[M] &= ~0x10;
-	}
-r += EXONE - 01777;
-yy[E] = r;
-p = &yy[M+1];
-#ifdef IBMPC
-*p++ = *(--e);
-*p++ = *(--e);
-*p++ = *(--e);
-#else  /* !IBMPC */
-++e;
-*p++ = *e++;
-*p++ = *e++;
-*p++ = *e++;
-#endif /* !IBMPC */
-(void )eshift( yy, -5 );
-if( denorm )
-	{ /* if zero exponent, then normalize the significand */
-	if( (k = enormlz(yy)) > NBITS )
-		ecleazs(yy);
-	else
-		yy[E] -= (unsigned short )(k-1);
-	}
-emovo( yy, y, ldp );
-#endif /* !DEC */
-}
-
-/*
-; e type to IEEE double precision
-;	double d;
-;	unsigned short x[NE];
-;	etoe53( x, &d );
-*/
-
-#ifdef DEC
-
-static void etoe53( x, e )
-unsigned short *x, *e;
-{
-etodec( x, e ); /* see etodec.c */
-}
-
-static void toe53( x, y )
-unsigned short *x, *y;
-{
-todec( x, y );
-}
-
-#else
-
-static void toe53(short unsigned int *x, short unsigned int *y)
-{
-unsigned short i;
-unsigned short *p;
-
-
-#ifdef NANS
-if( eiisnan(x) )
-	{
-	enan( y, 53 );
-	return;
-	}
-#endif
-p = &x[0];
-#ifdef IBMPC
-y += 3;
-#endif
-#ifdef DEC
-y += 3;
-#endif
-*y = 0;	/* output high order */
-if( *p++ )
-	*y = 0x8000;	/* output sign bit */
-
-i = *p++;
-if( i >= (unsigned int )2047 )
-	{	/* Saturate at largest number less than infinity. */
-#ifdef INFINITY
-	*y |= 0x7ff0;
-#ifdef IBMPC
-	*(--y) = 0;
-	*(--y) = 0;
-	*(--y) = 0;
-#else /* !IBMPC */
-	++y;
-	*y++ = 0;
-	*y++ = 0;
-	*y++ = 0;
-#endif /* IBMPC */
-#else /* !INFINITY */
-	*y |= (unsigned short )0x7fef;
-#ifdef IBMPC
-	*(--y) = 0xffff;
-	*(--y) = 0xffff;
-	*(--y) = 0xffff;
-#else /* !IBMPC */
-	++y;
-	*y++ = 0xffff;
-	*y++ = 0xffff;
-	*y++ = 0xffff;
-#endif
-#endif /* !INFINITY */
-	return;
-	}
-if( i == 0 )
-	{
-	(void )eshift( x, 4 );
-	}
-else
-	{
-	i <<= 4;
-	(void )eshift( x, 5 );
-	}
-i |= *p++ & (unsigned short )0x0f;	/* *p = xi[M] */
-*y |= (unsigned short )i; /* high order output already has sign bit set */
-#ifdef IBMPC
-*(--y) = *p++;
-*(--y) = *p++;
-*(--y) = *p;
-#else /* !IBMPC */
-++y;
-*y++ = *p++;
-*y++ = *p++;
-*y++ = *p++;
-#endif /* !IBMPC */
-}
-
-#endif /* not DEC */
-#endif /* SIMD_LDBL_MANT_DIG == 53 */
-
-#if SIMD_LDBL_MANT_DIG == 24
-/*
-; Convert IEEE single precision to e type
-;	float d;
-;	unsigned short x[N+2];
-;	dtox( &d, x );
-*/
-void e24toe( short unsigned int *pe, short unsigned int *y, LDPARMS *ldp )
-{
-register unsigned short r;
-register unsigned short *p, *e;
-unsigned short yy[NI];
-int denorm, k;
-
-e = pe;
-denorm = 0;	/* flag if denormalized number */
-ecleaz(yy);
-#ifdef IBMPC
-e += 1;
-#endif
-#ifdef DEC
-e += 1;
-#endif
-r = *e;
-yy[0] = 0;
-if( r & 0x8000 )
-	yy[0] = 0xffff;
-yy[M] = (r & 0x7f) | 0200;
-r &= ~0x807f;	/* strip sign and 7 significand bits */
-#ifdef INFINITY
-if( r == 0x7f80 )
-	{
-#ifdef NANS
-#ifdef MIEEE
-	if( ((pe[0] & 0x7f) != 0) || (pe[1] != 0) )
-		{
-		enan( y, NBITS );
-		return;
-		}
-#else  /* !MIEEE */
-	if( ((pe[1] & 0x7f) != 0) || (pe[0] != 0) )
-		{
-		enan( y, NBITS );
-		return;
-		}
-#endif /* !MIEEE */
-#endif  /* NANS */
-	eclear( y );
-	einfin( y, ldp );
-	if( yy[0] )
-		eneg(y);
-	return;
-	}
-#endif
-r >>= 7;
-/* If zero exponent, then the significand is denormalized.
- * So, take back the understood high significand bit. */ 
-if( r == 0 )
-	{
-	denorm = 1;
-	yy[M] &= ~0200;
-	}
-r += EXONE - 0177;
-yy[E] = r;
-p = &yy[M+1];
-#ifdef IBMPC
-*p++ = *(--e);
-#endif
-#ifdef DEC
-*p++ = *(--e);
-#endif
-#ifdef MIEEE
-++e;
-*p++ = *e++;
-#endif
-(void )eshift( yy, -8 );
-if( denorm )
-	{ /* if zero exponent, then normalize the significand */
-	if( (k = enormlz(yy)) > NBITS )
-		ecleazs(yy);
-	else
-		yy[E] -= (unsigned short )(k-1);
-	}
-emovo( yy, y, ldp );
-}
-
-static void toe24(short unsigned int *x, short unsigned int *y)
-{
-unsigned short i;
-unsigned short *p;
-
-#ifdef NANS
-if( eiisnan(x) )
-	{
-	enan( y, 24 );
-	return;
-	}
-#endif
-p = &x[0];
-#ifdef IBMPC
-y += 1;
-#endif
-#ifdef DEC
-y += 1;
-#endif
-*y = 0;	/* output high order */
-if( *p++ )
-	*y = 0x8000;	/* output sign bit */
-
-i = *p++;
-if( i >= 255 )
-	{	/* Saturate at largest number less than infinity. */
-#ifdef INFINITY
-	*y |= (unsigned short )0x7f80;
-#ifdef IBMPC
-	*(--y) = 0;
-#endif
-#ifdef DEC
-	*(--y) = 0;
-#endif
-#ifdef MIEEE
-	++y;
-	*y = 0;
-#endif
-#else /* !INFINITY */
-	*y |= (unsigned short )0x7f7f;
-#ifdef IBMPC
-	*(--y) = 0xffff;
-#endif
-#ifdef DEC
-	*(--y) = 0xffff;
-#endif
-#ifdef MIEEE
-	++y;
-	*y = 0xffff;
-#endif
-#endif /* !INFINITY */
-	return;
-	}
-if( i == 0 )
-	{
-	(void )eshift( x, 7 );
-	}
-else
-	{
-	i <<= 7;
-	(void )eshift( x, 8 );
-	}
-i |= *p++ & (unsigned short )0x7f;	/* *p = xi[M] */
-*y |= i;	/* high order output already has sign bit set */
-#ifdef IBMPC
-*(--y) = *p;
-#endif
-#ifdef DEC
-*(--y) = *p;
-#endif
-#ifdef MIEEE
-++y;
-*y = *p;
-#endif
-}
-#endif /* SIMD_LDBL_MANT_DIG == 24 */
-
-/* Compare two e type numbers.
- *
- * unsigned short a[NE], b[NE];
- * ecmp( a, b );
- *
- *  returns +1 if a > b
- *           0 if a == b
- *          -1 if a < b
- *          -2 if either a or b is a NaN.
- */
-static int ecmp(short unsigned int *a, short unsigned int *b)
-{
-unsigned short ai[NI], bi[NI];
-register unsigned short *p, *q;
-register int i;
-int msign;
-
-#ifdef NANS
-if (eisnan (a)  || eisnan (b))
-	return( -2 );
-#endif
-emovi( a, ai );
-p = ai;
-emovi( b, bi );
-q = bi;
-
-if( *p != *q )
-	{ /* the signs are different */
-/* -0 equals + 0 */
-	for( i=1; i<NI-1; i++ )
-		{
-		if( ai[i] != 0 )
-			goto nzro;
-		if( bi[i] != 0 )
-			goto nzro;
-		}
-	return(0);
-nzro:
-	if( *p == 0 )
-		return( 1 );
-	else
-		return( -1 );
-	}
-/* both are the same sign */
-if( *p == 0 )
-	msign = 1;
-else
-	msign = -1;
-i = NI-1;
-do
-	{
-	if( *p++ != *q++ )
-		{
-		goto diff;
-		}
-	}
-while( --i > 0 );
-
-return(0);	/* equality */
-
-
-
-diff:
-
-if( *(--p) > *(--q) )
-	return( msign );		/* p is bigger */
-else
-	return( -msign );	/* p is littler */
-}
-
-
-/*
-;	Shift significand
-;
-;	Shifts significand area up or down by the number of bits
-;	given by the variable sc.
-*/
-static int eshift(short unsigned int *x, int sc)
-{
-unsigned short lost;
-unsigned short *p;
-
-if( sc == 0 )
-	return( 0 );
-
-lost = 0;
-p = x + NI-1;
-
-if( sc < 0 )
-	{
-	sc = -sc;
-	while( sc >= 16 )
-		{
-		lost |= *p;	/* remember lost bits */
-		eshdn6(x);
-		sc -= 16;
-		}
-
-	while( sc >= 8 )
-		{
-		lost |= *p & 0xff;
-		eshdn8(x);
-		sc -= 8;
-		}
-
-	while( sc > 0 )
-		{
-		lost |= *p & 1;
-		eshdn1(x);
-		sc -= 1;
-		}
-	}
-else
-	{
-	while( sc >= 16 )
-		{
-		eshup6(x);
-		sc -= 16;
-		}
-
-	while( sc >= 8 )
-		{
-		eshup8(x);
-		sc -= 8;
-		}
-
-	while( sc > 0 )
-		{
-		eshup1(x);
-		sc -= 1;
-		}
-	}
-if( lost )
-	lost = 1;
-return( (int )lost );
-}
-
-
-
-/*
-;	normalize
-;
-; Shift normalizes the significand area pointed to by argument
-; shift count (up = positive) is returned.
-*/
-static int enormlz(short unsigned int *x)
-{
-register unsigned short *p;
-int sc;
-
-sc = 0;
-p = &x[M];
-if( *p != 0 )
-	goto normdn;
-++p;
-if( *p & 0x8000 )
-	return( 0 );	/* already normalized */
-while( *p == 0 )
-	{
-	eshup6(x);
-	sc += 16;
-/* With guard word, there are NBITS+16 bits available.
- * return true if all are zero.
- */
-	if( sc > NBITS )
-		return( sc );
-	}
-/* see if high byte is zero */
-while( (*p & 0xff00) == 0 )
-	{
-	eshup8(x);
-	sc += 8;
-	}
-/* now shift 1 bit at a time */
-while( (*p  & 0x8000) == 0)
-	{
-	eshup1(x);
-	sc += 1;
-	if( sc > (NBITS+16) )
-		{
-		mtherr( "enormlz", UNDERFLOW );
-		return( sc );
-		}
-	}
-return( sc );
-
-/* Normalize by shifting down out of the high guard word
-   of the significand */
-normdn:
-
-if( *p & 0xff00 )
-	{
-	eshdn8(x);
-	sc -= 8;
-	}
-while( *p != 0 )
-	{
-	eshdn1(x);
-	sc -= 1;
-
-	if( sc < -NBITS )
-		{
-		mtherr( "enormlz", OVERFLOW );
-		return( sc );
-		}
-	}
-return( sc );
-}
-
-
-
-
-/* Convert e type number to decimal format ASCII string.
- * The constants are for 64 bit precision.
- */
-
-#define NTEN 12
-#define MAXP 4096
-
-#if NE == 10
-static unsigned short etens[NTEN + 1][NE] =
-{
-  {0x6576, 0x4a92, 0x804a, 0x153f,
-   0xc94c, 0x979a, 0x8a20, 0x5202, 0xc460, 0x7525,},	/* 10**4096 */
-  {0x6a32, 0xce52, 0x329a, 0x28ce,
-   0xa74d, 0x5de4, 0xc53d, 0x3b5d, 0x9e8b, 0x5a92,},	/* 10**2048 */
-  {0x526c, 0x50ce, 0xf18b, 0x3d28,
-   0x650d, 0x0c17, 0x8175, 0x7586, 0xc976, 0x4d48,},
-  {0x9c66, 0x58f8, 0xbc50, 0x5c54,
-   0xcc65, 0x91c6, 0xa60e, 0xa0ae, 0xe319, 0x46a3,},
-  {0x851e, 0xeab7, 0x98fe, 0x901b,
-   0xddbb, 0xde8d, 0x9df9, 0xebfb, 0xaa7e, 0x4351,},
-  {0x0235, 0x0137, 0x36b1, 0x336c,
-   0xc66f, 0x8cdf, 0x80e9, 0x47c9, 0x93ba, 0x41a8,},
-  {0x50f8, 0x25fb, 0xc76b, 0x6b71,
-   0x3cbf, 0xa6d5, 0xffcf, 0x1f49, 0xc278, 0x40d3,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0xf020, 0xb59d, 0x2b70, 0xada8, 0x9dc5, 0x4069,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0400, 0xc9bf, 0x8e1b, 0x4034,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x2000, 0xbebc, 0x4019,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x0000, 0x9c40, 0x400c,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x0000, 0xc800, 0x4005,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x0000, 0xa000, 0x4002,},	/* 10**1 */
-};
-
-static unsigned short emtens[NTEN + 1][NE] =
-{
-  {0x2030, 0xcffc, 0xa1c3, 0x8123,
-   0x2de3, 0x9fde, 0xd2ce, 0x04c8, 0xa6dd, 0x0ad8,},	/* 10**-4096 */
-  {0x8264, 0xd2cb, 0xf2ea, 0x12d4,
-   0x4925, 0x2de4, 0x3436, 0x534f, 0xceae, 0x256b,},	/* 10**-2048 */
-  {0xf53f, 0xf698, 0x6bd3, 0x0158,
-   0x87a6, 0xc0bd, 0xda57, 0x82a5, 0xa2a6, 0x32b5,},
-  {0xe731, 0x04d4, 0xe3f2, 0xd332,
-   0x7132, 0xd21c, 0xdb23, 0xee32, 0x9049, 0x395a,},
-  {0xa23e, 0x5308, 0xfefb, 0x1155,
-   0xfa91, 0x1939, 0x637a, 0x4325, 0xc031, 0x3cac,},
-  {0xe26d, 0xdbde, 0xd05d, 0xb3f6,
-   0xac7c, 0xe4a0, 0x64bc, 0x467c, 0xddd0, 0x3e55,},
-  {0x2a20, 0x6224, 0x47b3, 0x98d7,
-   0x3f23, 0xe9a5, 0xa539, 0xea27, 0xa87f, 0x3f2a,},
-  {0x0b5b, 0x4af2, 0xa581, 0x18ed,
-   0x67de, 0x94ba, 0x4539, 0x1ead, 0xcfb1, 0x3f94,},
-  {0xbf71, 0xa9b3, 0x7989, 0xbe68,
-   0x4c2e, 0xe15b, 0xc44d, 0x94be, 0xe695, 0x3fc9,},
-  {0x3d4d, 0x7c3d, 0x36ba, 0x0d2b,
-   0xfdc2, 0xcefc, 0x8461, 0x7711, 0xabcc, 0x3fe4,},
-  {0xc155, 0xa4a8, 0x404e, 0x6113,
-   0xd3c3, 0x652b, 0xe219, 0x1758, 0xd1b7, 0x3ff1,},
-  {0xd70a, 0x70a3, 0x0a3d, 0xa3d7,
-   0x3d70, 0xd70a, 0x70a3, 0x0a3d, 0xa3d7, 0x3ff8,},
-  {0xcccd, 0xcccc, 0xcccc, 0xcccc,
-   0xcccc, 0xcccc, 0xcccc, 0xcccc, 0xcccc, 0x3ffb,},	/* 10**-1 */
-};
-#else
-static unsigned short etens[NTEN+1][NE] = {
-{0xc94c,0x979a,0x8a20,0x5202,0xc460,0x7525,},/* 10**4096 */
-{0xa74d,0x5de4,0xc53d,0x3b5d,0x9e8b,0x5a92,},/* 10**2048 */
-{0x650d,0x0c17,0x8175,0x7586,0xc976,0x4d48,},
-{0xcc65,0x91c6,0xa60e,0xa0ae,0xe319,0x46a3,},
-{0xddbc,0xde8d,0x9df9,0xebfb,0xaa7e,0x4351,},
-{0xc66f,0x8cdf,0x80e9,0x47c9,0x93ba,0x41a8,},
-{0x3cbf,0xa6d5,0xffcf,0x1f49,0xc278,0x40d3,},
-{0xf020,0xb59d,0x2b70,0xada8,0x9dc5,0x4069,},
-{0x0000,0x0000,0x0400,0xc9bf,0x8e1b,0x4034,},
-{0x0000,0x0000,0x0000,0x2000,0xbebc,0x4019,},
-{0x0000,0x0000,0x0000,0x0000,0x9c40,0x400c,},
-{0x0000,0x0000,0x0000,0x0000,0xc800,0x4005,},
-{0x0000,0x0000,0x0000,0x0000,0xa000,0x4002,}, /* 10**1 */
-};
-
-static unsigned short emtens[NTEN+1][NE] = {
-{0x2de4,0x9fde,0xd2ce,0x04c8,0xa6dd,0x0ad8,}, /* 10**-4096 */
-{0x4925,0x2de4,0x3436,0x534f,0xceae,0x256b,}, /* 10**-2048 */
-{0x87a6,0xc0bd,0xda57,0x82a5,0xa2a6,0x32b5,},
-{0x7133,0xd21c,0xdb23,0xee32,0x9049,0x395a,},
-{0xfa91,0x1939,0x637a,0x4325,0xc031,0x3cac,},
-{0xac7d,0xe4a0,0x64bc,0x467c,0xddd0,0x3e55,},
-{0x3f24,0xe9a5,0xa539,0xea27,0xa87f,0x3f2a,},
-{0x67de,0x94ba,0x4539,0x1ead,0xcfb1,0x3f94,},
-{0x4c2f,0xe15b,0xc44d,0x94be,0xe695,0x3fc9,},
-{0xfdc2,0xcefc,0x8461,0x7711,0xabcc,0x3fe4,},
-{0xd3c3,0x652b,0xe219,0x1758,0xd1b7,0x3ff1,},
-{0x3d71,0xd70a,0x70a3,0x0a3d,0xa3d7,0x3ff8,},
-{0xcccd,0xcccc,0xcccc,0xcccc,0xcccc,0x3ffb,}, /* 10**-1 */
-};
-#endif
-
-
-
-/* ASCII string outputs for unix */
-
-
-#if 0
-void _IO_ldtostr(x, string, ndigs, flags, fmt)
-long double *x;
-char *string;
-int ndigs;
-int flags;
-char fmt;
-{
-unsigned short w[NI];
-char *t, *u;
-LDPARMS rnd;
-LDPARMS *ldp = &rnd;
-
-rnd.rlast = -1;
-rnd.rndprc = NBITS;
-
-if (sizeof(long double) == 16)
-  e113toe( (unsigned short *)x, w, ldp );
-else
-  e64toe( (unsigned short *)x, w, ldp );
-
-etoasc( w, string, ndigs, -1, ldp );
-if( ndigs == 0 && flags == 0 )
-	{
-	/* Delete the decimal point unless alternate format.  */
-	t = string;	
-	while( *t != '.' )
-		++t;
-	u = t +  1;
-	while( *t != '\0' )
-		*t++ = *u++;
-	}
-if (*string == ' ')
-	{
-	t = string;	
-	u = t + 1;
-	while( *t != '\0' )
-		*t++ = *u++;
-	}
-if (fmt == 'E')
-	{
-	t = string;	
-	while( *t != 'e' )
-		++t;
-	*t = 'E';
-	}
-}
-
-#endif
-
-/* This routine will not return more than NDEC+1 digits. */
-
-char *
-_simdldtoa_r (struct _reent *ptr, LONG_DOUBLE_UNION *d, int mode, int ndigits, int *decpt, 
-          int *sign, char **rve)
-{
-unsigned short e[NI];
-char *s, *p;
-int i, j, k;
-LDPARMS rnd;
-LDPARMS *ldp = &rnd;
-char *outstr;
-
-rnd.rlast = -1;
-rnd.rndprc = NBITS;
-
-  _REENT_CHECK_MP(ptr);
-
-/* reentrancy addition to use mprec storage pool */
-if (_REENT_MP_RESULT(ptr))
-  {
-    _REENT_MP_RESULT(ptr)->_k = _REENT_MP_RESULT_K(ptr);
-    _REENT_MP_RESULT(ptr)->_maxwds = 1 << _REENT_MP_RESULT_K(ptr);
-    Bfree (ptr, _REENT_MP_RESULT(ptr));
-    _REENT_MP_RESULT(ptr) = 0;
-  }
-
-#if SIMD_LDBL_MANT_DIG == 24
-e24toe( (unsigned short *)d, e, ldp );
-#elif SIMD_LDBL_MANT_DIG == 53
-e53toe( (unsigned short *)d, e, ldp );
-#elif SIMD_LDBL_MANT_DIG == 64
-e64toe( (unsigned short *)d, e, ldp );
-#else
-e113toe( (unsigned short *)d, e, ldp );
-#endif
-
-if( eisneg(e) )
-        *sign = 1;
-else
-        *sign = 0;
-/* Mode 3 is "f" format.  */
-if( mode != 3 )
-        ndigits -= 1;
-/* Mode 0 is for %.999 format, which is supposed to give a
-   minimum length string that will convert back to the same binary value.
-   For now, just ask for 20 digits which is enough but sometimes too many.  */
-if( mode == 0 )
-        ndigits = 20;
-
-/* reentrancy addition to use mprec storage pool */
-/* we want to have enough space to hold the formatted result */
-i = ndigits + (mode == 3 ? (MAX_EXP_DIGITS + 1) : 1);
-j = sizeof (__ULong);
-for (_REENT_MP_RESULT_K(ptr) = 0; sizeof (_Bigint) - sizeof (__ULong) + j <= (unsigned)i; j <<= 1)
-  _REENT_MP_RESULT_K(ptr)++;
-_REENT_MP_RESULT(ptr) = Balloc (ptr, _REENT_MP_RESULT_K(ptr));
-outstr = (char *)_REENT_MP_RESULT(ptr);
-
-/* This sanity limit must agree with the corresponding one in etoasc, to
-   keep straight the returned value of outexpon.  */
-if( ndigits > NDEC )
-        ndigits = NDEC;
-
-etoasc( e, outstr, ndigits, mode, ldp );
-s =  outstr;
-if( eisinf(e) || eisnan(e) )
-        {
-        *decpt = 9999;
-        goto stripspaces;
-        }
-*decpt = ldp->outexpon + 1;
-
-/* Transform the string returned by etoasc into what the caller wants.  */
-
-/* Look for decimal point and delete it from the string. */
-s = outstr;
-while( *s != '\0' )
-        {
-        if( *s == '.' )
-               goto yesdecpt;
-        ++s;
-        }
-goto nodecpt;
-
-yesdecpt:
-
-/* Delete the decimal point.  */
-while( *s != '\0' )
-        {
-        *s = *(s+1);
-        ++s;
-        }
-
-nodecpt:
-
-/* Back up over the exponent field. */
-while( *s != 'E' && s > outstr)
-        --s;
-*s = '\0';
-
-stripspaces:
-
-/* Strip leading spaces and sign. */
-p = outstr;
-while( *p == ' ' || *p == '-')
-        ++p;
-
-/* Find new end of string.  */
-s = outstr;
-while( (*s++ = *p++) != '\0' )
-        ;
---s;
-
-/* Strip trailing zeros.  */
-if( mode == 2 )
-        k = 1;
-else if( ndigits > ldp->outexpon )
-        k = ndigits;
-else
-        k = ldp->outexpon;
-
-while( *(s-1) == '0' && ((s - outstr) > k))
-        *(--s) = '\0';
-
-/* In f format, flush small off-scale values to zero.
-   Rounding has been taken care of by etoasc. */
-if( mode == 3 && ((ndigits + ldp->outexpon) < 0))
-        {
-        s = outstr;
-        *s = '\0';
-        *decpt = 0;
-        }
-
-if( rve )
-        *rve = s;
-return outstr;
-}
-
-/* Routine used to tell if long double is NaN or Infinity or regular number. 
-   Returns:  0 = regular number
-             1 = Nan
-             2 = Infinity
-*/
-int
-_simdldcheck (LONG_DOUBLE_UNION *d)
-{
-unsigned short e[NI];
-LDPARMS rnd;
-LDPARMS *ldp = &rnd;
-
-rnd.rlast = -1;
-rnd.rndprc = NBITS;
-
-#if SIMD_LDBL_MANT_DIG == 24
-e24toe( (unsigned short *)d, e, ldp );
-#elif SIMD_LDBL_MANT_DIG == 53
-e53toe( (unsigned short *)d, e, ldp );
-#elif SIMD_LDBL_MANT_DIG == 64
-e64toe( (unsigned short *)d, e, ldp );
-#else
-e113toe( (unsigned short *)d, e, ldp );
-#endif
-
-if( (e[NE-1] & 0x7fff) == 0x7fff )
-	{
-#ifdef NANS
-	if( eisnan(e) )
-		return( 1 );
-#endif
-	return( 2 );
-	}
-else
-	return( 0 );
-} /* _ldcheck */
-
-static void etoasc(short unsigned int *x, char *string, int ndigits, int outformat, LDPARMS *ldp)
-{
-long digit;
-unsigned short y[NI], t[NI], u[NI], w[NI];
-unsigned short *p, *r, *ten;
-unsigned short sign;
-int i, j, k, expon, rndsav, ndigs;
-char *s, *ss;
-unsigned short m;
-unsigned short *equot = ldp->equot;
-
-ndigs = ndigits;
-rndsav = ldp->rndprc;
-#ifdef NANS
-if( eisnan(x) )
-	{
-	sprintf( string, " NaN " );
-	expon = 9999;
-	goto bxit;
-	}
-#endif
-ldp->rndprc = NBITS;		/* set to full precision */
-emov( x, y ); /* retain external format */
-if( y[NE-1] & 0x8000 )
-	{
-	sign = 0xffff;
-	y[NE-1] &= 0x7fff;
-	}
-else
-	{
-	sign = 0;
-	}
-expon = 0;
-ten = &etens[NTEN][0];
-emov( eone, t );
-/* Test for zero exponent */
-if( y[NE-1] == 0 )
-	{
-	for( k=0; k<NE-1; k++ )
-		{
-		if( y[k] != 0 )
-			goto tnzro; /* denormalized number */
-		}
-	goto isone; /* legal all zeros */
-	}
-tnzro:
-
-/* Test for infinity.
- */
-if( y[NE-1] == 0x7fff )
-	{
-	if( sign )
-		sprintf( string, " -Infinity " );
-	else
-		sprintf( string, " Infinity " );
-	expon = 9999;
-	goto bxit;
-	}
-
-/* Test for exponent nonzero but significand denormalized.
- * This is an error condition.
- */
-if( (y[NE-1] != 0) && ((y[NE-2] & 0x8000) == 0) )
-	{
-	mtherr( "etoasc", DOMAIN );
-	sprintf( string, "NaN" );
-	expon = 9999;
-	goto bxit;
-	}
-
-/* Compare to 1.0 */
-i = ecmp( eone, y );
-if( i == 0 )
-	goto isone;
-
-if( i < 0 )
-	{ /* Number is greater than 1 */
-/* Convert significand to an integer and strip trailing decimal zeros. */
-	emov( y, u );
-	u[NE-1] = EXONE + NBITS - 1;
-
-	p = &etens[NTEN-4][0];
-	m = 16;
-do
-	{
-	ediv( p, u, t, ldp );
-	efloor( t, w, ldp );
-	for( j=0; j<NE-1; j++ )
-		{
-		if( t[j] != w[j] )
-			goto noint;
-		}
-	emov( t, u );
-	expon += (int )m;
-noint:
-	p += NE;
-	m >>= 1;
-	}
-while( m != 0 );
-
-/* Rescale from integer significand */
-	u[NE-1] += y[NE-1] - (unsigned int )(EXONE + NBITS - 1);
-	emov( u, y );
-/* Find power of 10 */
-	emov( eone, t );
-	m = MAXP;
-	p = &etens[0][0];
-	while( ecmp( ten, u ) <= 0 )
-		{
-		if( ecmp( p, u ) <= 0 )
-			{
-			ediv( p, u, u, ldp );
-			emul( p, t, t, ldp );
-			expon += (int )m;
-			}
-		m >>= 1;
-		if( m == 0 )
-			break;
-		p += NE;
-		}
-	}
-else
-	{ /* Number is less than 1.0 */
-/* Pad significand with trailing decimal zeros. */
-	if( y[NE-1] == 0 )
-		{
-		while( (y[NE-2] & 0x8000) == 0 )
-			{
-			emul( ten, y, y, ldp );
-			expon -= 1;
-			}
-		}
-	else
-		{
-		emovi( y, w );
-		for( i=0; i<NDEC+1; i++ )
-			{
-			if( (w[NI-1] & 0x7) != 0 )
-				break;
-/* multiply by 10 */
-			emovz( w, u );
-			eshdn1( u );
-			eshdn1( u );
-			eaddm( w, u );
-			u[1] += 3;
-			while( u[2] != 0 )
-				{
-				eshdn1(u);
-				u[1] += 1;
-				}
-			if( u[NI-1] != 0 )
-				break;
-			if( eone[NE-1] <= u[1] )
-				break;
-			emovz( u, w );
-			expon -= 1;
-			}
-		emovo( w, y, ldp );
-		}
-	k = -MAXP;
-	p = &emtens[0][0];
-	r = &etens[0][0];
-	emov( y, w );
-	emov( eone, t );
-	while( ecmp( eone, w ) > 0 )
-		{
-		if( ecmp( p, w ) >= 0 )
-			{
-			emul( r, w, w, ldp );
-			emul( r, t, t, ldp );
-			expon += k;
-			}
-		k /= 2;
-		if( k == 0 )
-			break;
-		p += NE;
-		r += NE;
-		}
-	ediv( t, eone, t, ldp );
-	}
-isone:
-/* Find the first (leading) digit. */
-emovi( t, w );
-emovz( w, t );
-emovi( y, w );
-emovz( w, y );
-eiremain( t, y, ldp );
-digit = equot[NI-1];
-while( (digit == 0) && (ecmp(y,ezero) != 0) )
-	{
-	eshup1( y );
-	emovz( y, u );
-	eshup1( u );
-	eshup1( u );
-	eaddm( u, y );
-	eiremain( t, y, ldp );
-	digit = equot[NI-1];
-	expon -= 1;
-	}
-s = string;
-if( sign )
-	*s++ = '-';
-else
-	*s++ = ' ';
-/* Examine number of digits requested by caller. */
-if( outformat == 3 )
-        ndigs += expon;
-/*
-else if( ndigs < 0 )
-        ndigs = 0;
-*/
-if( ndigs > NDEC )
-	ndigs = NDEC;
-if( digit == 10 )
-	{
-	*s++ = '1';
-	*s++ = '.';
-	if( ndigs > 0 )
-		{
-		*s++ = '0';
-		ndigs -= 1;
-		}
-	expon += 1;
-	if( ndigs < 0 )
-	        {
-	        ss = s;
-	        goto doexp;
-	        }
-	}
-else
-	{
-	*s++ = (char )digit + '0';
-	*s++ = '.';
-	}
-/* Generate digits after the decimal point. */
-for( k=0; k<=ndigs; k++ )
-	{
-/* multiply current number by 10, without normalizing */
-	eshup1( y );
-	emovz( y, u );
-	eshup1( u );
-	eshup1( u );
-	eaddm( u, y );
-	eiremain( t, y, ldp );
-	*s++ = (char )equot[NI-1] + '0';
-	}
-digit = equot[NI-1];
---s;
-ss = s;
-/* round off the ASCII string */
-if( digit > 4 )
-	{
-/* Test for critical rounding case in ASCII output. */
-	if( digit == 5 )
-		{
-		emovo( y, t, ldp );
-		if( ecmp(t,ezero) != 0 )
-			goto roun;	/* round to nearest */
-		if( (*(s-1) & 1) == 0 )
-			goto doexp;	/* round to even */
-		}
-/* Round up and propagate carry-outs */
-roun:
-	--s;
-	k = *s & 0x7f;
-/* Carry out to most significant digit? */
-	if( ndigs < 0 )
-		{
-	        /* This will print like "1E-6". */
-		*s = '1';
-		expon += 1;
-		goto doexp;
-		}
-	else if( k == '.' )
-		{
-		--s;
-		k = *s;
-		k += 1;
-		*s = (char )k;
-/* Most significant digit carries to 10? */
-		if( k > '9' )
-			{
-			expon += 1;
-			*s = '1';
-			}
-		goto doexp;
-		}
-/* Round up and carry out from less significant digits */
-	k += 1;
-	*s = (char )k;
-	if( k > '9' )
-		{
-		*s = '0';
-		goto roun;
-		}
-	}
-doexp:
-#ifdef __GO32__
-if( expon >= 0 )
-	sprintf( ss, "e+%02d", expon );
-else
-	sprintf( ss, "e-%02d", -expon );
-#else
-	sprintf( ss, "E%d", expon );
-#endif
-bxit:
-ldp->rndprc = rndsav;
-ldp->outexpon =  expon;
-}
-
-
-
-
-/*
-;								ASCTOQ
-;		ASCTOQ.MAC		LATEST REV: 11 JAN 84
-;					SLM, 3 JAN 78
-;
-;	Convert ASCII string to quadruple precision floating point
-;
-;		Numeric input is free field decimal number
-;		with max of 15 digits with or without 
-;		decimal point entered as ASCII from teletype.
-;	Entering E after the number followed by a second
-;	number causes the second number to be interpreted
-;	as a power of 10 to be multiplied by the first number
-;	(i.e., "scientific" notation).
-;
-;	Usage:
-;		asctoq( string, q );
-*/
-
-void _simdstrtold (char *s, char **se, LONG_DOUBLE_UNION *x)
-{
-  LDPARMS rnd;
-  LDPARMS *ldp = &rnd;
-  int lenldstr;
-
-  rnd.rlast = -1;
-  rnd.rndprc = NBITS;
-
-  lenldstr = asctoeg( s, (unsigned short *)x, SIMD_LDBL_MANT_DIG, ldp );
-  if (se)
-    *se = s + lenldstr;
-}
-
-#define REASONABLE_LEN 200
-
-static int
-asctoeg(char *ss, short unsigned int *y, int oprec, LDPARMS *ldp)
-{
-unsigned short yy[NI], xt[NI], tt[NI];
-int esign, decflg, sgnflg, nexp, exp, prec, lost;
-int k, trail, c, rndsav;
-long lexp;
-unsigned short nsign, *p;
-char *sp, *s, *lstr;
-int lenldstr;
-int mflag = 0;
-char tmpstr[REASONABLE_LEN];
-
-/* Copy the input string. */
-c = strlen (ss) + 2;
-if (c <= REASONABLE_LEN)
-  lstr = tmpstr;
-else
-  {
-    lstr = (char *) calloc (c, 1);
-    mflag = 1;
-  }
-s = ss;
-lenldstr = 0;
-while( *s == ' ' ) /* skip leading spaces */
-  {
-    ++s;
-    ++lenldstr;
-  }
-sp = lstr;
-for( k=0; k<c; k++ )
-	{
-	if( (*sp++ = *s++) == '\0' )
-		break;
-	}
-*sp = '\0';
-s = lstr;
-
-rndsav = ldp->rndprc;
-ldp->rndprc = NBITS; /* Set to full precision */
-lost = 0;
-nsign = 0;
-decflg = 0;
-sgnflg = 0;
-nexp = 0;
-exp = 0;
-prec = 0;
-ecleaz( yy );
-trail = 0;
-
-nxtcom:
-k = *s - '0';
-if( (k >= 0) && (k <= 9) )
-	{
-/* Ignore leading zeros */
-	if( (prec == 0) && (decflg == 0) && (k == 0) )
-		goto donchr;
-/* Identify and strip trailing zeros after the decimal point. */
-	if( (trail == 0) && (decflg != 0) )
-		{
-		sp = s;
-		while( (*sp >= '0') && (*sp <= '9') )
-			++sp;
-/* Check for syntax error */
-		c = *sp & 0x7f;
-		if( (c != 'e') && (c != 'E') && (c != '\0')
-			&& (c != '\n') && (c != '\r') && (c != ' ')
-			&& (c != ',') )
-			goto error;
-		--sp;
-		while( *sp == '0' )
-			*sp-- = 'z';
-		trail = 1;
-		if( *s == 'z' )
-			goto donchr;
-		}
-/* If enough digits were given to more than fill up the yy register,
- * continuing until overflow into the high guard word yy[2]
- * guarantees that there will be a roundoff bit at the top
- * of the low guard word after normalization.
- */
-	if( yy[2] == 0 )
-		{
-		if( decflg )
-			nexp += 1; /* count digits after decimal point */
-		eshup1( yy );	/* multiply current number by 10 */
-		emovz( yy, xt );
-		eshup1( xt );
-		eshup1( xt );
-		eaddm( xt, yy );
-		ecleaz( xt );
-		xt[NI-2] = (unsigned short )k;
-		eaddm( xt, yy );
-		}
-	else
-		{
-		/* Mark any lost non-zero digit.  */
-		lost |= k;
-		/* Count lost digits before the decimal point.  */
-		if (decflg == 0)
-		        nexp -= 1;
-		}
-	prec += 1;
-	goto donchr;
-	}
-
-switch( *s )
-	{
-	case 'z':
-		break;
-	case 'E':
-	case 'e':
-		goto expnt;
-	case '.':	/* decimal point */
-		if( decflg )
-			goto error;
-		++decflg;
-		break;
-	case '-':
-		nsign = 0xffff;
-		if( sgnflg )
-			goto error;
-		++sgnflg;
-		break;
-	case '+':
-		if( sgnflg )
-			goto error;
-		++sgnflg;
-		break;
-	case ',':
-	case ' ':
-	case '\0':
-	case '\n':
-	case '\r':
-		goto daldone;
-	case 'i':
-	case 'I':
-		goto infinite;
-	default:
-	error:
-#ifdef NANS
-		enan( yy, NI*16 );
-#else
-		mtherr( "asctoe", DOMAIN );
-		ecleaz(yy);
-#endif
-		goto aexit;
-	}
-donchr:
-++s;
-goto nxtcom;
-
-/* Exponent interpretation */
-expnt:
-
-esign = 1;
-exp = 0;
-++s;
-/* check for + or - */
-if( *s == '-' )
-	{
-	esign = -1;
-	++s;
-	}
-if( *s == '+' )
-	++s;
-while( (*s >= '0') && (*s <= '9') )
-	{
-	exp *= 10;
-	exp += *s++ - '0';
-	if (exp > 4977)
-		{
-		if (esign < 0)
-			goto zero;
-		else
-			goto infinite;
-		}
-	}
-if( esign < 0 )
-	exp = -exp;
-if( exp > 4932 )
-	{
-infinite:
-	ecleaz(yy);
-	yy[E] = 0x7fff;  /* infinity */
-	goto aexit;
-	}
-if( exp < -4977 )
-	{
-zero:
-	ecleaz(yy);
-	goto aexit;
-	}
-
-daldone:
-nexp = exp - nexp;
-/* Pad trailing zeros to minimize power of 10, per IEEE spec. */
-while( (nexp > 0) && (yy[2] == 0) )
-	{
-	emovz( yy, xt );
-	eshup1( xt );
-	eshup1( xt );
-	eaddm( yy, xt );
-	eshup1( xt );
-	if( xt[2] != 0 )
-		break;
-	nexp -= 1;
-	emovz( xt, yy );
-	}
-if( (k = enormlz(yy)) > NBITS )
-	{
-	ecleaz(yy);
-	goto aexit;
-	}
-lexp = (EXONE - 1 + NBITS) - k;
-emdnorm( yy, lost, 0, lexp, 64, ldp );
-/* convert to external format */
-
-
-/* Multiply by 10**nexp.  If precision is 64 bits,
- * the maximum relative error incurred in forming 10**n
- * for 0 <= n <= 324 is 8.2e-20, at 10**180.
- * For 0 <= n <= 999, the peak relative error is 1.4e-19 at 10**947.
- * For 0 >= n >= -999, it is -1.55e-19 at 10**-435.
- */
-lexp = yy[E];
-if( nexp == 0 )
-	{
-	k = 0;
-	goto expdon;
-	}
-esign = 1;
-if( nexp < 0 )
-	{
-	nexp = -nexp;
-	esign = -1;
-	if( nexp > 4096 )
-		{ /* Punt.  Can't handle this without 2 divides. */
-		emovi( etens[0], tt );
-		lexp -= tt[E];
-		k = edivm( tt, yy, ldp );
-		lexp += EXONE;
-		nexp -= 4096;
-		}
-	}
-p = &etens[NTEN][0];
-emov( eone, xt );
-exp = 1;
-do
-	{
-	if( exp & nexp )
-		emul( p, xt, xt, ldp );
-	p -= NE;
-	exp = exp + exp;
-	}
-while( exp <= MAXP );
-
-emovi( xt, tt );
-if( esign < 0 )
-	{
-	lexp -= tt[E];
-	k = edivm( tt, yy, ldp );
-	lexp += EXONE;
-	}
-else
-	{
-	lexp += tt[E];
-	k = emulm( tt, yy, ldp );
-	lexp -= EXONE - 1;
-	}
-
-expdon:
-
-/* Round and convert directly to the destination type */
-if( oprec == 53 )
-	lexp -= EXONE - 0x3ff;
-else if( oprec == 24 )
-	lexp -= EXONE - 0177;
-#ifdef DEC
-else if( oprec == 56 )
-	lexp -= EXONE - 0201;
-#endif
-ldp->rndprc = oprec;
-emdnorm( yy, k, 0, lexp, 64, ldp );
-
-aexit:
-
-ldp->rndprc = rndsav;
-yy[0] = nsign;
-switch( oprec )
-	{
-#ifdef DEC
-	case 56:
-		todec( yy, y ); /* see etodec.c */
-		break;
-#endif
-#if SIMD_LDBL_MANT_DIG == 53
-	case 53:
-		toe53( yy, y );
-		break;
-#elif SIMD_LDBL_MANT_DIG == 24
-	case 24:
-		toe24( yy, y );
-		break;
-#elif SIMD_LDBL_MANT_DIG == 64
-	case 64:
-		toe64( yy, y );
-		break;
-#elif SIMD_LDBL_MANT_DIG == 113
-	case 113:
-		toe113( yy, y );
-		break;
-#else
-	case NBITS:
-		emovo( yy, y, ldp );
-		break;
-#endif
-	}
-lenldstr += s - lstr;
-if (mflag)
-  free (lstr);
-return lenldstr;
-}
-
-
- 
-/* y = largest integer not greater than x
- * (truncated toward minus infinity)
- *
- * unsigned short x[NE], y[NE]
- * LDPARMS *ldp
- *
- * efloor( x, y, ldp );
- */
-static unsigned short bmask[] = {
-0xffff,
-0xfffe,
-0xfffc,
-0xfff8,
-0xfff0,
-0xffe0,
-0xffc0,
-0xff80,
-0xff00,
-0xfe00,
-0xfc00,
-0xf800,
-0xf000,
-0xe000,
-0xc000,
-0x8000,
-0x0000,
-};
-
-static void efloor(short unsigned int *x, short unsigned int *y, LDPARMS *ldp)
-{
-register unsigned short *p;
-int e, expon, i;
-unsigned short f[NE];
-
-emov( x, f ); /* leave in external format */
-expon = (int )f[NE-1];
-e = (expon & 0x7fff) - (EXONE - 1);
-if( e <= 0 )
-	{
-	eclear(y);
-	goto isitneg;
-	}
-/* number of bits to clear out */
-e = NBITS - e;
-emov( f, y );
-if( e <= 0 )
-	return;
-
-p = &y[0];
-while( e >= 16 )
-	{
-	*p++ = 0;
-	e -= 16;
-	}
-/* clear the remaining bits */
-*p &= bmask[e];
-/* truncate negatives toward minus infinity */
-isitneg:
-
-if( (unsigned short )expon & (unsigned short )0x8000 )
-	{
-	for( i=0; i<NE-1; i++ )
-		{
-		if( f[i] != y[i] )
-			{
-			esub( eone, y, y, ldp );
-			break;
-			}
-		}
-	}
-}
-
-
-
-static void eiremain(short unsigned int *den, short unsigned int *num, LDPARMS *ldp)
-{
-long ld, ln;
-unsigned short j;
- unsigned short *equot = ldp->equot;
-
-ld = den[E];
-ld -= enormlz( den );
-ln = num[E];
-ln -= enormlz( num );
-ecleaz( equot );
-while( ln >= ld )
-	{
-	if( ecmpm(den,num) <= 0 )
-		{
-		esubm(den, num);
-		j = 1;
-		}
-	else
-		{
-		j = 0;
-		}
-	eshup1(equot);
-	equot[NI-1] |= j;
-	eshup1(num);
-	ln -= 1;
-	}
-emdnorm( num, 0, 0, ln, 0, ldp );
-}
-
-/* NaN bit patterns
- */
-#ifdef MIEEE
-static unsigned short nan113[8] = {
-  0x7fff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff};
-static unsigned short nan64[6] = {0x7fff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff};
-static unsigned short nan53[4] = {0x7fff, 0xffff, 0xffff, 0xffff};
-static unsigned short nan24[2] = {0x7fff, 0xffff};
-#else /* !MIEEE */
-static unsigned short nan113[8] = {0, 0, 0, 0, 0, 0, 0x8000, 0x7fff};
-static unsigned short nan64[6] = {0, 0, 0, 0, 0xc000, 0x7fff};
-static unsigned short nan53[4] = {0, 0, 0, 0x7ff8};
-static unsigned short nan24[2] = {0, 0x7fc0};
-#endif /* !MIEEE */
-
-
-static void enan (short unsigned int *nan, int size)
-{
-int i, n;
-unsigned short *p;
-
-switch( size )
-	{
-#ifndef DEC
-	case 113:
-	n = 8;
-	p = nan113;
-	break;
-
-	case 64:
-	n = 6;
-	p = nan64;
-	break;
-
-	case 53:
-	n = 4;
-	p = nan53;
-	break;
-
-	case 24:
-	n = 2;
-	p = nan24;
-	break;
-
-	case NBITS:
-	for( i=0; i<NE-2; i++ )
-		*nan++ = 0;
-	*nan++ = 0xc000;
-	*nan++ = 0x7fff;
-	return;
-
-	case NI*16:
-	*nan++ = 0;
-	*nan++ = 0x7fff;
-	*nan++ = 0;
-	*nan++ = 0xc000;
-	for( i=4; i<NI; i++ )
-		*nan++ = 0;
-	return;
-#endif
-	default:
-	mtherr( "enan", DOMAIN );
-	return;
-	}
-for (i=0; i < n; i++)
-	*nan++ = *p++;
-}
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/strtosfix16.c b/newlib/libc/machine/powerpc/strtosfix16.c
deleted file mode 100644
index d3cfe07..0000000
--- a/newlib/libc/machine/powerpc/strtosfix16.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-FUNCTION
-        <<strtosfix16>>, <<strtosfix32>>, <<strtosfix64>>---string to signed fixed point
-
-INDEX
-	strtosfix16
-INDEX
-	strtosfix32
-INDEX
-	strtosfix64
-INDEX
-	_strtosfix16_r
-INDEX
-	_strtosfix32_r
-INDEX
-	_strtosfix64_r
-
-ANSI_SYNOPSIS
-	#include <stdlib.h>
-        __int16 strtosfix16 (const char *<[s]>, char **<[ptr]>);
-
-        __int32 strtosfix32 (const char *<[s]>, char **<[ptr]>);
-
-        __int64 strtosfix64 (const char *<[s]>, char **<[ptr]>);
-
-        __int16 _strtosfix16_r (void *<[reent]>, 
-                       const char *<[s]>, char **<[ptr]>);
-
-        __int32 _strtosfix32_r (void *<[reent]>, 
-                       const char *<[s]>, char **<[ptr]>);
-
-        __int64 _strtosfix64_r (void *<[reent]>, 
-                       const char *<[s]>, char **<[ptr]>);
-
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	__int16 strtosfix16 (<[s]>, <[ptr]>)
-        char *<[s]>;
-        char **<[ptr]>;
-
-	__int32 strtosfix32 (<[s]>, <[ptr]>)
-        char *<[s]>;
-        char **<[ptr]>;
-
-	__int64 strtosfix64 (<[s]>, <[ptr]>)
-        char *<[s]>;
-        char **<[ptr]>;
-
-	__int16 _strtosfix16_r (<[reent]>, <[s]>, <[ptr]>)
-	char *<[reent]>;
-        char *<[s]>;
-        char **<[ptr]>;
-
-	__int32 _strtosfix32_r (<[reent]>, <[s]>, <[ptr]>)
-	char *<[reent]>;
-        char *<[s]>;
-        char **<[ptr]>;
-
-	__int64 _strtosfix64_r (<[reent]>, <[s]>, <[ptr]>)
-	char *<[reent]>;
-        char *<[s]>;
-        char **<[ptr]>;
-
-DESCRIPTION
-        The function <<strtosfix16>> converts the string <<*<[s]>>> to
-	a fixed-point sign + 15-bits fraction representation.  The function 
-	follows the same rules as <<strtod>>.
-
-	The substring converted is the longest initial
-	subsequence of <[s]>, beginning with the first
-	non-whitespace character, that has the format:
-	.[+|-]<[digits]>[.][<[digits]>][(e|E)[+|-]<[digits]>] 
-	The substring contains no characters if <[s]> is empty, consists
-	entirely of whitespace, or if the first non-whitespace
-	character is something other than <<+>>, <<->>, <<.>>, or a
-	digit. If the substring is empty, no conversion is done, and
-	the value of <[s]> is stored in <<*<[ptr]>>>.  Otherwise,
-	the substring is converted, and a pointer to the final string
-	(which will contain at least the terminating null character of
-	<[s]>) is stored in <<*<[ptr]>>>.  If you want no
-	assignment to <<*<[ptr]>>>, pass a null pointer as <[ptr]>.
-
-	<<strtosfix32>> is identical to <<strtosfix16>> except that it 
-	converts to fixed-point sign + 31-bits fraction representation.
-	<<strtosfix64>> is also similar, except that it converts
-	to fixed-point sign + 63-bit fraction format.
-
-	The alternate functions <<_strtosfix16_r>>, <<_strtosfix32_r>>,
-	and <<_strtosfix64_r>> are reentrant versions.
-	The extra argument <[reent]> is a pointer to a reentrancy structure.
-
-RETURNS
-	The functions return the converted substring value, if any.  If
-	no conversion can be performed, then 0 is returned.  If the converted
-	value is a NaN, 0 is returned and errno is set to <<EDOM>>.
-	If the converted value exceeds the maximum positive fixed-point value, 
-	the output value is saturated to the maximum value and <<ERANGE>> is stored in 
-	errno.  If the converted value is less than the minimum fixed-point negative
-	value, then the output is saturated to the minimum value  and <<ERANGE>> is stored
-	in errno.  Otherwise, the converted value is returned in the
-	specified fixed-point format.
-
-PORTABILITY
-        <<strtosfix16>>, <<strtosfix32>>, and <<strtosfix64>> are non-standard.
-
-        The OS subroutines of <<strtod>> are required.
-*/
-
-#ifdef __SPE__ 
-
-#include <_ansi.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <reent.h>
-#include "vfieeefp.h"
-
-/*
- * Convert a string to a fixed-point (sign + 15-bits) value.
- *
- * Ignores `locale' stuff.
- */
-__int16_t
-_DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
-	struct _reent *rptr _AND
-	_CONST char *nptr _AND
-	char **endptr)
-{
-  union double_union dbl;
-  unsigned long tmp, tmp2;
-  int exp, negexp, sign;
-  __int16_t result;
-
-  dbl.d = _strtod_r (rptr, nptr, endptr);
-
-  /* treat NAN as domain error, +/- infinity as saturation */
-  if (!finite(dbl.d))
-    {
-      if (isnan (dbl.d))
-	{
-	  rptr->_errno = EDOM;
-	  return 0;
-	}
-      rptr->_errno = ERANGE;
-      if (word0(dbl) & Sign_bit)
-	return SHRT_MIN;
-      return SHRT_MAX;
-    }
-
-  /* check for normal saturation */
-  if (dbl.d >= 1.0)
-    {
-      rptr->_errno = ERANGE;
-      return SHRT_MAX;
-    }
-  else if (dbl.d < -1.0)
-    {
-      rptr->_errno = ERANGE;
-      return SHRT_MIN;
-    }
-
-  /* otherwise we have normal number in range */
-
-  /* strip off sign and exponent */
-  sign = word0(dbl) & Sign_bit;
-  exp = ((word0(dbl) & Exp_mask) >> Exp_shift) - Bias;
-  negexp = -exp;
-  if (negexp > 15)
-    return 0;
-  /* add in implicit normalized bit */
-  tmp = word0(dbl) | Exp_msk1;
-  /* remove exponent and sign */
-  tmp <<= Ebits;
-  if (negexp != 0)
-    {
-      /* perform rounding */
-      tmp2 = tmp + (1 << (negexp - 1));
-      result = (short)(tmp2 >> (negexp + 16));
-      /* check if rounding caused carry bit which must be added into result */
-      if (tmp2 < tmp)
-	result |= (1 << (16 - negexp));
-      /* check if positive saturation has occurred because of rounding */
-      if (!sign && result < 0)
-	{
-	  rptr->_errno = ERANGE;
-	  return SHRT_MAX;
-	}
-    }
-  else
-    {
-      /* we have -1.0, no rounding necessary */
-      return SHRT_MIN;
-    }
-
-  return  sign ? -result : result;
-}
-
-#ifndef _REENT_ONLY
-
-__int16_t
-_DEFUN (strtosfix16, (s, ptr, base),
-	_CONST char *s _AND
-	char **ptr)
-{
-  return _strtosfix16_r (_REENT, s, ptr);
-}
-
-#endif
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/strtosfix32.c b/newlib/libc/machine/powerpc/strtosfix32.c
deleted file mode 100644
index 2e22c14..0000000
--- a/newlib/libc/machine/powerpc/strtosfix32.c
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifdef __SPE__
-
-#include <_ansi.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <reent.h>
-#include "vfieeefp.h"
-
-/*
- * Convert a string to a fixed-point (sign + 31-bits) value.
- *
- * Ignores `locale' stuff.
- */
-__int32_t
-_DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
-	struct _reent *rptr _AND
-	_CONST char *nptr _AND
-	char **endptr)
-{
-  union double_union dbl;
-  int exp, negexp, sign;
-  unsigned long tmp, tmp2;
-  long result = 0;
-
-  dbl.d = _strtod_r (rptr, nptr, endptr);
-
-  /* treat NAN as domain error, +/- infinity as saturation */
-  if (!finite(dbl.d))
-    {
-      if (isnan (dbl.d))
-	{
-	  rptr->_errno = EDOM;
-	  return 0;
-	}
-      rptr->_errno = ERANGE;
-      if (word0(dbl) & Sign_bit)
-	return LONG_MIN;
-      return LONG_MAX;
-    }
-
-  /* check for normal saturation */
-  if (dbl.d >= 1.0)
-    {
-      rptr->_errno = ERANGE;
-      return LONG_MAX;
-    }
-  else if (dbl.d < -1.0)
-    {
-      rptr->_errno = ERANGE;
-      return LONG_MIN;
-    }
-
-  /* otherwise we have normal number in range */
-
-  /* strip off sign and exponent */
-  sign = word0(dbl) & Sign_bit;
-  exp = ((word0(dbl) & Exp_mask) >> Exp_shift) - Bias;
-  negexp = -exp;
-  if (negexp > 31)
-    return 0;
-  word0(dbl) &= ~(Exp_mask | Sign_bit);
-  /* add in implicit normalized bit */
-  word0(dbl) |= Exp_msk1;
-  /* shift so result is contained in single word */
-  tmp = word0(dbl) << Ebits;
-  tmp |= ((unsigned long)word1(dbl) >> (32 - Ebits));
-  if (negexp != 0)
-    {
-      /* perform rounding */
-      tmp2 = tmp + (1 << (negexp - 1));
-      result = (long)(tmp2 >> negexp);
-      /* check if rounding caused carry bit which must be added into result */
-      if (tmp2 < tmp)
-	result |= (1 << (32 - negexp));
-      /* check if positive saturation has occurred because of rounding */
-      if (!sign && result < 0)
-	{
-	  rptr->_errno = ERANGE;
-	  return LONG_MAX;
-	}
-    }
-  else
-    {
-      /* we have -1.0, no rounding necessary */
-      return LONG_MIN;
-    }
-
-  return sign ? -result : result;
-}
-
-#ifndef _REENT_ONLY
-
-__int32_t
-_DEFUN (strtosfix32, (s, ptr, base),
-	_CONST char *s _AND
-	char **ptr)
-{
-  return _strtosfix32_r (_REENT, s, ptr);
-}
-
-#endif
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/strtosfix64.c b/newlib/libc/machine/powerpc/strtosfix64.c
deleted file mode 100644
index 3006632..0000000
--- a/newlib/libc/machine/powerpc/strtosfix64.c
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifdef __SPE__
-
-#include <_ansi.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <reent.h>
-#include "fix64.h"
-
-/*
- * Convert a string to a fixed-point (sign + 63-bits) value.
- *
- * Ignores `locale' stuff.
- */
-__int64_t
-_DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
-	struct _reent *rptr _AND
-	_CONST char *nptr _AND
-	char **endptr)
-{
-  union long_double_union ldbl;
-  int exp, negexp, sign, ld_type;
-  __uint64_t tmp, tmp2;
-  __int64_t result = 0;
-
-  init(ldbl);
-
-  _simdstrtold ((char *)nptr, endptr, &ldbl);
-
-  /* treat NAN as domain error, +/- infinity as saturation */
-  ld_type = _simdldcheck (&ldbl);
-  if (ld_type != 0)
-    {
-      if (ld_type == 1)
-	{
-	  rptr->_errno = EDOM;
-	  return 0;
-	}
-      rptr->_errno = ERANGE;
-      if (word0(ldbl) & Sign_bit)
-	return LONG_LONG_MIN;
-      return LONG_LONG_MAX;
-    }
-
-  /* strip off sign and exponent */
-  sign = word0(ldbl) & Sign_bit;
-  exp = ((word0(ldbl) & Exp_mask) >> Exp_shift) - Bias;
-  negexp = -exp;
-  if (negexp > 63)
-    return 0;
-  word0(ldbl) &= ~(Exp_mask | Sign_bit);
-  /* add in implicit normalized bit */
-  word0(ldbl) |= Exp_msk1;
-  /* shift so result is contained in single word */
-  tmp = word0(ldbl) << Ebits;
-  tmp |= ((unsigned long)word1(ldbl) >> (32 - Ebits));
-  tmp <<= 32;
-  if (Ebits < 32)
-    tmp |= ((unsigned long)word1(ldbl) << Ebits);
-  tmp |= ((unsigned long)word2(ldbl) >> (32 - Ebits));
-
-  /* check for saturation */
-  if (sign)
-    {
-      if (exp > 0 || (exp == 0 && tmp != 0x8000000000000000LL))
-	{
-	  rptr->_errno = ERANGE;
-	  return LONG_LONG_MIN;
-	}
-    }
-  else
-    {
-      if (exp >= 0)
-	{
-	  rptr->_errno = ERANGE;
-	  return LONG_LONG_MAX;
-	}
-    }
-
-  /* otherwise we have normal number in range */
-  if (negexp != 0)
-    {
-      /* perform rounding */
-      tmp2 = tmp + (1 << (negexp - 1));
-      result = (long long)(tmp2 >> negexp);
-      /* check if rounding caused carry bit which must be added into result */
-      if (tmp2 < tmp)
-	result |= (1 << (64 - negexp));
-      /* check if positive saturation has occurred because of rounding */
-      if (!sign && result < 0)
-	{
-	  rptr->_errno = ERANGE;
-	  return LONG_LONG_MAX;
-	}
-    }
-  else
-    {
-      /* we have -1.0, no rounding necessary */
-      return LONG_LONG_MIN;
-    }
-
-  return sign ? -result : result;
-}
-
-#ifndef _REENT_ONLY
-
-__int64_t
-_DEFUN (strtosfix64, (s, ptr, base),
-	_CONST char *s _AND
-	char **ptr)
-{
-  return _strtosfix64_r (_REENT, s, ptr);
-}
-
-#endif
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/strtoufix16.c b/newlib/libc/machine/powerpc/strtoufix16.c
deleted file mode 100644
index d90255c..0000000
--- a/newlib/libc/machine/powerpc/strtoufix16.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-FUNCTION
-        <<strtoufix16>>, <<strtoufix32>>, <<strtoufix64>>---string to signed fixed point
-
-INDEX
-	strtoufix16
-INDEX
-	strtoufix32
-INDEX
-	strtoufix64
-INDEX
-	_strtoufix16_r
-INDEX
-	_strtoufix32_r
-INDEX
-	_strtoufix64_r
-
-ANSI_SYNOPSIS
-	#include <stdlib.h>
-        __uint16_t strtoufix16 (const char *<[s]>, char **<[ptr]>);
-
-        __uint32_t strtoufix32 (const char *<[s]>, char **<[ptr]>);
-
-        __uint64_t strtoufix64 (const char *<[s]>, char **<[ptr]>);
-
-        __uint16_t _strtoufix16_r (void *<[reent]>, 
-                       const char *<[s]>, char **<[ptr]>);
-
-        __uint32_t _strtoufix32_r (void *<[reent]>, 
-                       const char *<[s]>, char **<[ptr]>);
-
-        __uint64_t _strtoufix64_r (void *<[reent]>, 
-                       const char *<[s]>, char **<[ptr]>);
-
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	__uint16_t strtoufix16 (<[s]>, <[ptr]>)
-        char *<[s]>;
-        char **<[ptr]>;
-
-	__uint32_t strtoufix32 (<[s]>, <[ptr]>)
-        char *<[s]>;
-        char **<[ptr]>;
-
-	__uint64_t strtoufix64 (<[s]>, <[ptr]>)
-        char *<[s]>;
-        char **<[ptr]>;
-
-	__uint16_t _strtoufix16_r (<[reent]>, <[s]>, <[ptr]>)
-	char *<[reent]>;
-        char *<[s]>;
-        char **<[ptr]>;
-
-	__uint32_t _strtoufix32_r (<[reent]>, <[s]>, <[ptr]>)
-	char *<[reent]>;
-        char *<[s]>;
-        char **<[ptr]>;
-
-	__uint64_t _strtoufix64_r (<[reent]>, <[s]>, <[ptr]>)
-	char *<[reent]>;
-        char *<[s]>;
-        char **<[ptr]>;
-
-DESCRIPTION
-        The function <<strtoufix16>> converts the string <<*<[s]>>> to
-	a fixed-point 16-bits fraction representation.  The function 
-	follows the same rules as <<strtod>>.
-
-	The substring converted is the longest initial
-	subsequence of <[s]>, beginning with the first
-	non-whitespace character, that has the format:
-	.[+|-]<[digits]>[.][<[digits]>][(e|E)[+|-]<[digits]>] 
-	The substring contains no characters if <[s]> is empty, consists
-	entirely of whitespace, or if the first non-whitespace
-	character is something other than <<+>>, <<->>, <<.>>, or a
-	digit. If the substring is empty, no conversion is done, and
-	the value of <[s]> is stored in <<*<[ptr]>>>.  Otherwise,
-	the substring is converted, and a pointer to the final string
-	(which will contain at least the terminating null character of
-	<[s]>) is stored in <<*<[ptr]>>>.  If you want no
-	assignment to <<*<[ptr]>>>, pass a null pointer as <[ptr]>.
-
-	<<strtoufix32>> is identical to <<strtoufix16>> except that it 
-	converts to fixed-point 32-bit fraction representation.
-	<<strtoufix64>> is also similar, except that it converts
-	to fixed-point 64-bit fraction.
-
-	The alternate functions <<_strtoufix16_r>>, <<_strtoufix32_r>>,
-	and <<_strtoufix64_r>> are reentrant versions.
-	The extra argument <[reent]> is a pointer to a reentrancy structure.
-
-RETURNS
-	The functions return the converted substring value, if any.  If
-	no conversion can be performed, then 0 is returned.  If the converted
-	value is a NaN, 0 is returned and errno is set to <<EDOM>>.
-	If the converted value exceeds the maximum positive unsigned fixed-point value, 
-	the output value is saturated to the maximum value and <<ERANGE>> is stored in 
-	errno.  If the converted value is less than 0, then the output is saturated to 0
-	and <<ERANGE>> is stored in errno.  Otherwise, the converted value is returned in the
-	specified fixed-point format.
-
-PORTABILITY
-        <<strtoufix16>>, <<strtoufix32>>, and <<strtoufix64>> are non-standard.
-
-        The OS subroutines of <<strtod>> are required.
-*/
-
-#ifdef __SPE__
-
-#include <_ansi.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <reent.h>
-#include "vfieeefp.h"
-
-/*
- * Convert a string to a fixed-point 16-bit value.
- *
- * Ignores `locale' stuff.
- */
-__uint16_t
-_DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
-	struct _reent *rptr _AND
-	_CONST char *nptr _AND
-	char **endptr)
-{
-  union double_union dbl;
-  unsigned long tmp, tmp2, result;
-  int exp, negexp;
-
-  dbl.d = _strtod_r (rptr, nptr, endptr);
-
-  /* treat NAN as domain error, +/- infinity as saturation */
-  if (!finite(dbl.d))
-    {
-      if (isnan (dbl.d))
-	{
-	  rptr->_errno = EDOM;
-	  return 0;
-	}
-      rptr->_errno = ERANGE;
-      if (word0(dbl) & Sign_bit)
-	return 0;
-      return USHRT_MAX;
-    }
-
-  /* check for normal saturation */
-  if (dbl.d >= 1.0)
-    {
-      rptr->_errno = ERANGE;
-      return USHRT_MAX;
-    }
-  else if (dbl.d < 0)
-    {
-      rptr->_errno = ERANGE;
-      return 0;
-    }
-
-  /* otherwise we have normal postive number in range */
-
-  /* strip off exponent */
-  exp = ((word0(dbl) & Exp_mask) >> Exp_shift) - Bias;
-  negexp = -exp;
-  if (negexp > 16)
-    return 0;
-  /* add in implicit normalized bit */
-  tmp = word0(dbl) | Exp_msk1;
-  /* remove exponent and sign */
-  tmp <<= Ebits;
-  /* perform rounding */
-  tmp2 = tmp + (1 << (negexp + 14));
-  result = tmp2 >> (negexp + 15);
-  /* if rounding causes carry, must add carry bit in */
-  if (tmp2 < tmp)
-    {
-      if (negexp == 0)
-	{
-	  /* we have overflow which means saturation */
-	  rptr->_errno = ERANGE;
-	  return USHRT_MAX;
-	}
-      result |= (1 << (16 - negexp));
-    }
-
-  return (__uint16_t)result;
-}
-
-#ifndef _REENT_ONLY
-
-__uint16_t
-_DEFUN (strtoufix16, (s, ptr, base),
-	_CONST char *s _AND
-	char **ptr)
-{
-  return _strtoufix16_r (_REENT, s, ptr);
-}
-
-#endif
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/strtoufix32.c b/newlib/libc/machine/powerpc/strtoufix32.c
deleted file mode 100644
index 6a8e081..0000000
--- a/newlib/libc/machine/powerpc/strtoufix32.c
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifdef __SPE__ 
-
-#include <_ansi.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <reent.h>
-#include "vfieeefp.h"
-
-/*
- * Convert a string to a fixed-point 32-bit value.
- *
- * Ignores `locale' stuff.
- */
-__uint32_t
-_DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
-	struct _reent *rptr _AND
-	_CONST char *nptr _AND
-	char **endptr)
-{
-  union double_union dbl;
-  int exp, negexp;
-  __uint32_t tmp, tmp2, result = 0;
-
-  dbl.d = _strtod_r (rptr, nptr, endptr);
-
-  /* treat NAN as domain error, +/- infinity as saturation */
-  if (!finite(dbl.d))
-    {
-      if (isnan (dbl.d))
-	{
-	  rptr->_errno = EDOM;
-	  return 0;
-	}
-      rptr->_errno = ERANGE;
-      if (word0(dbl) & Sign_bit)
-	return 0;
-      return ULONG_MAX;
-    }
-
-  /* check for normal saturation */
-  if (dbl.d >= 1.0)
-    {
-      rptr->_errno = ERANGE;
-      return ULONG_MAX;
-    }
-  else if (dbl.d < 0)
-    {
-      rptr->_errno = ERANGE;
-      return 0;
-    }
-
-  /* otherwise we have normal positive number in range */
-
-  /* strip off exponent */
-  exp = ((word0(dbl) & Exp_mask) >> Exp_shift) - Bias;
-  negexp = -exp;
-  if (negexp > 32)
-    return 0;
-  word0(dbl) &= ~(Exp_mask | Sign_bit);
-  /* add in implicit normalized bit */
-  word0(dbl) |= Exp_msk1;
-  /* shift so result is contained left-justified in word */
-  tmp = word0(dbl) << Ebits;
-  tmp |= ((unsigned long)word1(dbl) >> (32 - Ebits));
-  /* perform rounding */
-  if (negexp > 1)
-    {
-      tmp2 = tmp + (1 << (negexp - 2));
-      result = (tmp2 >> (negexp - 1));
-      /* if rounding causes carry, add carry bit in */
-      if (tmp2 < tmp)
-	result += 1 << (32 - negexp);
-    }
-  else
-    {
-      result = tmp + ((word1(dbl) & (1 << (32 - Ebits - 1))) != 0);
-      /* if rounding causes carry, then saturation has occurred */
-      if (result < tmp)
-	{
-	  rptr->_errno = ERANGE;
-	  return ULONG_MAX;
-	}
-    }
-
-  return result;
-}
-
-#ifndef _REENT_ONLY
-
-__uint32_t
-_DEFUN (strtoufix32, (s, ptr, base),
-	_CONST char *s _AND
-	char **ptr)
-{
-  return _strtoufix32_r (_REENT, s, ptr);
-}
-
-#endif
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/strtoufix64.c b/newlib/libc/machine/powerpc/strtoufix64.c
deleted file mode 100644
index 539f953..0000000
--- a/newlib/libc/machine/powerpc/strtoufix64.c
+++ /dev/null
@@ -1,116 +0,0 @@
-#ifdef __SPE__
-
-#include <_ansi.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <reent.h>
-#include "fix64.h"
-
-/*
- * Convert a string to a fixed-point 64-bit unsigned value.
- *
- * Ignores `locale' stuff.
- */
-__uint64_t
-_DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
-	struct _reent *rptr _AND
-	_CONST char *nptr _AND
-	char **endptr)
-{
-  union long_double_union ldbl;
-  int exp, sign, negexp, ld_type;
-  __uint64_t tmp, tmp2, result = 0;
-
-  init(ldbl);
-
-  _simdstrtold ((char *)nptr, endptr, &ldbl);
-
-  /* treat NAN as domain error, +/- infinity as saturation */
-  ld_type = _simdldcheck (&ldbl);
-  if (ld_type != 0)
-    {
-      if (ld_type == 1)
-	{
-	  rptr->_errno = EDOM;
-	  return 0;
-	}
-      rptr->_errno = ERANGE;
-      if (word0(ldbl) & Sign_bit)
-	return 0;
-      return ULONG_LONG_MAX;
-    }
-
-  /* strip off sign and exponent */
-  sign = word0(ldbl) & Sign_bit;
-  exp = ((word0(ldbl) & Exp_mask) >> Exp_shift) - Bias;
-  negexp = -exp;
-  if (negexp > 63)
-    return 0;
-  word0(ldbl) &= ~(Exp_mask | Sign_bit);
-  /* add in implicit normalized bit */
-  word0(ldbl) |= Exp_msk1;
-  /* shift so result is contained in single word */
-  tmp = word0(ldbl) << Ebits;
-  tmp |= ((unsigned long)word1(ldbl) >> (32 - Ebits));
-  tmp <<= 32;
-  if (Ebits < 32)
-    tmp |= ((unsigned long)word1(ldbl) << Ebits);
-  tmp |= ((unsigned long)word2(ldbl) >> (32 - Ebits));
-
-  /* check for saturation */
-  if (sign)
-    {
-      rptr->_errno = ERANGE;
-      return 0;
-    }
-  else
-    {
-      if (exp > 0 || (exp == 0 && tmp >= 0x8000000000000000LL))
-	{
-	  rptr->_errno = ERANGE;
-	  return ULONG_LONG_MAX;
-	}
-    }
-
-  /* otherwise we have normal number in range */
-  if (negexp > 1)
-    {
-      tmp2 = tmp + (1 << (negexp - 2));
-      result = (tmp2 >> (negexp - 1));
-      /* if rounding causes carry, add carry bit in */
-      if (tmp2 < tmp)
-	result += 1 << (64 - negexp);
-    }
-  else
-    {
-      if (Ebits < 32)
-	{
-	  result = tmp + ((word2(ldbl) & (1 << (32 - Ebits - 1))) != 0);
-	  /* if rounding causes carry, then saturation has occurred */
-	  if (result < tmp)
-	    {
-	      rptr->_errno = ERANGE;
-	      return ULONG_LONG_MAX;
-	    }
-	}
-      else
-	result = tmp;
-    }
-
-  return result;
-}
-
-#ifndef _REENT_ONLY
-
-__uint64_t
-_DEFUN (strtoufix64, (s, ptr, base),
-	_CONST char *s _AND
-	char **ptr)
-{
-  return _strtoufix64_r (_REENT, s, ptr);
-}
-
-#endif
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/times.c b/newlib/libc/machine/powerpc/times.c
deleted file mode 100644
index 64f4ddc..0000000
--- a/newlib/libc/machine/powerpc/times.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Time support routines for PowerPC.
- *
- * Written by Aldy Hernandez.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/resource.h>
-
-clock_t
-times (struct tms *tp)
-{
-  struct rusage usage;
-  union {
-    struct rusage r;
-    /* Newlib's rusage has only 2 fields.  We need to make room for
-       when we call the system's rusage.  This should be enough.  */
-    int filler[32];
-  } host_ru;
-
-  getrusage (RUSAGE_SELF, (void *)&host_ru);
-
-  if (tp)
-    {
-      tp->tms_utime = host_ru.r.ru_utime.tv_sec * 1000
-	+ host_ru.r.ru_utime.tv_usec;
-      tp->tms_stime = host_ru.r.ru_stime.tv_sec * 1000
-	+ host_ru.r.ru_stime.tv_usec;
-      tp->tms_cutime = 0;	/* user time, children */
-      tp->tms_cstime = 0;	/* system time, children */
-    }
-
-  return tp->tms_utime;
-}
diff --git a/newlib/libc/machine/powerpc/ufix64toa.c b/newlib/libc/machine/powerpc/ufix64toa.c
deleted file mode 100644
index 450e0a3..0000000
--- a/newlib/libc/machine/powerpc/ufix64toa.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* _ufix64toa_r: convert unsigned 64-bit fixed point to ASCII string.
- *
- * This routine converts an unsigned fixed-point number to long double format and
- * then calls _ldtoa_r to do the conversion.
- *
- * Written by Jeff Johnston.
- */
-
-#ifdef __SPE__
-
-#include <_ansi.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <reent.h>
-#include "fix64.h"
-
-extern char *_simdldtoa_r _PARAMS((struct _reent *, LONG_DOUBLE_UNION *, int,
-			       int, int *, int *, char **));
-
-/*
- * Convert an unsigned fixed-point 64-bit value to string.
- *
- * Ignores `locale' stuff.
- */
-
-char *
-_DEFUN (_ufix64toa_r, (rptr, value, mode, ndigits, decpt, sign, rve),
-	struct _reent *rptr _AND
-	__uint64_t value _AND
-	int mode _AND
-	int ndigits _AND
-	int *decpt _AND
-	int *sign _AND
-	char **rve)
-{
-  union long_double_union ldbl;
-  union fix64_union fix64;
-  unsigned long tmp;
-  int exp, negexp;
-
-  /* if input is 0, no additional work is needed */
-  if (value == 0)
-    {
-      ldbl.i[0] = ldbl.i[1] = ldbl.i[2] = ldbl.i[3] = 0;
-    }
-  else /* otherwise, we calculate long double equivalent of value */
-    {
-      /* find exponent by locating most-significant one-bit */
-      fix64.ll = value;
-      negexp = 1;
-      if (hiword(fix64) == 0)
-	{
-	  tmp = loword(fix64);
-	  negexp = 33;
-	}
-      else
-	{
-	  tmp = hiword(fix64);
-	  negexp = 1;
-	}
-
-      while (negexp < 65)
-	{
-	  if (tmp & 0x80000000)
-	    break;
-	  ++negexp;
-	  tmp <<= 1;
-	}
-      
-      /* shift input appropriately */
-      fix64.ll = value << (negexp - 1 + (Exp_msk1 != 0));
-      
-      /* build long double */
-      exp = -negexp + Bias;
-      word0(ldbl) = (exp << Exp_shift);
-      word1(ldbl) = hiword(fix64) << (32-Ebits-1);
-      word2(ldbl) = loword(fix64) << (32-Ebits-1);
-      word3(ldbl) = 0;
-      if (Ebits+1 < 32)
-	{
-	  word0(ldbl) |= hiword(fix64) >> (Ebits + 1);
-	  word1(ldbl) |= loword(fix64) >> (Ebits + 1);
-	}
-    }
-
-  /* convert long double to character */
-  return _simdldtoa_r (rptr, &ldbl, mode, ndigits, decpt, sign, rve);
-}
-
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/vec_calloc.c b/newlib/libc/machine/powerpc/vec_calloc.c
deleted file mode 100644
index 5efe910..0000000
--- a/newlib/libc/machine/powerpc/vec_calloc.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-FUNCTION
-<<vec_calloc>>---allocate space for arrays
-
-INDEX
-	vec_calloc
-
-INDEX
-	_vec_calloc_r
-
-ANSI_SYNOPSIS
-	#include <stdlib.h>
-	void *vec_calloc(size_t <[n]>, size_t <[s]>);
-	void *vec_calloc_r(void *<[reent]>, size_t <n>, <size_t> <[s]>);
-	
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	char *vec_calloc(<[n]>, <[s]>)
-	size_t <[n]>, <[s]>;
-
-	char *_vec_calloc_r(<[reent]>, <[n]>, <[s]>)
-	char *<[reent]>;
-	size_t <[n]>;
-	size_t <[s]>;
-
-
-
-DESCRIPTION
-Use <<vec_calloc>> to request a block of memory sufficient to hold an
-array of <[n]> elements, each of which has size <[s]>.
-
-The memory allocated by <<vec_calloc>> comes out of the same memory pool
-used by <<vec_malloc>>, but the memory block is initialized to all zero
-bytes.  (To avoid the overhead of initializing the space, use
-<<vec_malloc>> instead.)
-
-The alternate function <<_vec_calloc_r>> is reentrant.
-The extra argument <[reent]> is a pointer to a reentrancy structure.
-
-RETURNS
-If successful, a pointer to the newly allocated space.
-
-If unsuccessful, <<NULL>>.
-
-PORTABILITY
-<<vec_calloc>> is an non-ANSI extension described in the AltiVec Programming
-Interface Manual.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-*/
-
-#include <string.h>
-#include <stdlib.h>
-
-#ifndef _REENT_ONLY
-
-_PTR
-_DEFUN (vec_calloc, (n, size),
-	size_t n _AND
-	size_t size)
-{
-  return _vec_calloc_r (_REENT, n, size);
-}
-
-#endif
diff --git a/newlib/libc/machine/powerpc/vec_free.c b/newlib/libc/machine/powerpc/vec_free.c
deleted file mode 100644
index b55c52d..0000000
--- a/newlib/libc/machine/powerpc/vec_free.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* vec_free.c - a wrapper for _free_r */
-#include <_ansi.h>
-#include <reent.h>
-#include <stdlib.h>
-
-#ifndef _REENT_ONLY
-
-void
-_DEFUN (vec_free, (aptr),
-        _PTR aptr)
-{
-  _free_r (_REENT, aptr);
-}
-
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/machine/powerpc/vec_malloc.c b/newlib/libc/machine/powerpc/vec_malloc.c
deleted file mode 100644
index 6bcad59..0000000
--- a/newlib/libc/machine/powerpc/vec_malloc.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-FUNCTION
-<<vec_malloc>>, <<vec_realloc>>, <<vec_free>>---manage vector memory
-
-INDEX
-	vec_malloc
-INDEX
-	vec_realloc
-INDEX
-	vec_free
-INDEX
-	_vec_malloc_r
-INDEX
-	_vec_realloc_r
-INDEX
-	_vec_free_r
-
-ANSI_SYNOPSIS
-	#include <stdlib.h>
-	void *vec_malloc(size_t <[nbytes]>);
-	void *vec_realloc(void *<[aptr]>, size_t <[nbytes]>);
-	void vec_free(void *<[aptr]>);
-
-
-	void *_vec_malloc_r(void *<[reent]>, size_t <[nbytes]>);
-	void *_vec_realloc_r(void *<[reent]>, 
-                         void *<[aptr]>, size_t <[nbytes]>);
-	void _vec_free_r(void *<[reent]>, void *<[aptr]>);
-
-
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	char *vec_malloc(<[nbytes]>)
-	size_t <[nbytes]>;
-
-	char *vec_realloc(<[aptr]>, <[nbytes]>)
-	char *<[aptr]>;
-	size_t <[nbytes]>;
-
-	void vec_free(<[aptr]>)
-	char *<[aptr]>;
-
-	char *_vec_malloc_r(<[reent]>,<[nbytes]>)
-	char *<[reent]>;
-	size_t <[nbytes]>;
-
-	char *_vec_realloc_r(<[reent]>, <[aptr]>, <[nbytes]>)
-	char *<[reent]>;
-	char *<[aptr]>;
-	size_t <[nbytes]>;
-
-	void _vec_free_r(<[reent]>, <[aptr]>)
-	char *<[reent]>;
-	char *<[aptr]>;
-
-DESCRIPTION
-These functions manage a pool of system memory that is 16-byte aligned..
-
-Use <<vec_malloc>> to request allocation of an object with at least
-<[nbytes]> bytes of storage available and is 16-byte aligned.  If the space is 
-available, <<vec_malloc>> returns a pointer to a newly allocated block as its result.
-
-If you already have a block of storage allocated by <<vec_malloc>>, but
-you no longer need all the space allocated to it, you can make it
-smaller by calling <<vec_realloc>> with both the object pointer and the
-new desired size as arguments.  <<vec_realloc>> guarantees that the
-contents of the smaller object match the beginning of the original object.
-
-Similarly, if you need more space for an object, use <<vec_realloc>> to
-request the larger size; again, <<vec_realloc>> guarantees that the
-beginning of the new, larger object matches the contents of the
-original object.
-
-When you no longer need an object originally allocated by <<vec_malloc>>
-or <<vec_realloc>> (or the related function <<vec_calloc>>), return it to the
-memory storage pool by calling <<vec_free>> with the address of the object
-as the argument.  You can also use <<vec_realloc>> for this purpose by
-calling it with <<0>> as the <[nbytes]> argument.
-
-The alternate functions <<_vec_malloc_r>>, <<_vec_realloc_r>>, <<_vec_free_r>>,
-are reentrant versions.  The extra argument <[reent]> is a pointer to a reentrancy 
-structure.
-
-If you have multiple threads of execution which may call any of these
-routines, or if any of these routines may be called reentrantly, then
-you must provide implementations of the <<__vec_malloc_lock>> and
-<<__vec_malloc_unlock>> functions for your system.  See the documentation
-for those functions.
-
-These functions operate by calling the function <<_sbrk_r>> or
-<<sbrk>>, which allocates space.  You may need to provide one of these
-functions for your system.  <<_sbrk_r>> is called with a positive
-value to allocate more space, and with a negative value to release
-previously allocated space if it is no longer required.
-@xref{Stubs}.
-
-RETURNS
-<<vec_malloc>> returns a pointer to the newly allocated space, if
-successful; otherwise it returns <<NULL>>.  If your application needs
-to generate empty objects, you may use <<vec_malloc(0)>> for this purpose.
-
-<<vec_realloc>> returns a pointer to the new block of memory, or <<NULL>>
-if a new block could not be allocated.  <<NULL>> is also the result
-when you use `<<vec_realloc(<[aptr]>,0)>>' (which has the same effect as
-`<<vec_free(<[aptr]>)>>').  You should always check the result of
-<<vec_realloc>>; successful vec_reallocation is not guaranteed even when
-you request a smaller object.
-
-<<vec_free>> does not return a result.
-
-PORTABILITY
-<<vec_malloc>>, <<vec_realloc>>, and <<vec_free>> are all extensions
-specified in the AltiVec Programming Interface Manual.
-
-Supporting OS subroutines required: <<sbrk>>.  */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdlib.h>
-#include <malloc.h>
-
-#ifndef _REENT_ONLY
-
-_PTR
-_DEFUN (vec_malloc, (nbytes),
-	size_t nbytes)		/* get a block */
-{
-  return _memalign_r (_REENT, 16, nbytes);
-}
-
-#endif
-
diff --git a/newlib/libc/machine/powerpc/vec_mallocr.c b/newlib/libc/machine/powerpc/vec_mallocr.c
deleted file mode 100644
index c375c8b..0000000
--- a/newlib/libc/machine/powerpc/vec_mallocr.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/* This code is based on mallocr.c written by Doug Lea which is released
-   to the public domain.  Any changes to libc/stdlib/mallocr.c
-   should be reflected here as well.    */
-
-/* Preliminaries */
-
-#ifndef __STD_C
-#ifdef __STDC__
-#define __STD_C     1
-#else
-#if __cplusplus
-#define __STD_C     1
-#else
-#define __STD_C     0
-#endif /*__cplusplus*/
-#endif /*__STDC__*/
-#endif /*__STD_C*/
-
-#ifndef Void_t
-#if __STD_C
-#define Void_t      void
-#else
-#define Void_t      char
-#endif
-#endif /*Void_t*/
-
-#if __STD_C
-#include <stddef.h>   /* for size_t */
-#else
-#include <sys/types.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/config.h>
-
-/*
-  In newlib, all the publically visible routines take a reentrancy
-  pointer.  We don't currently do anything much with it, but we do
-  pass it to the lock routine.
- */
-
-#include <reent.h>
-#include <string.h>
-#include <malloc.h>
-
-#define MALLOC_LOCK __malloc_lock(reent_ptr)
-#define MALLOC_UNLOCK __malloc_unlock(reent_ptr)
-
-#ifdef SMALL_MEMORY
-#define malloc_getpagesize (128)
-#else
-#define malloc_getpagesize (4096)
-#endif
-
-#if __STD_C
-extern void __malloc_lock(struct _reent *);
-extern void __malloc_unlock(struct _reent *);
-#else
-extern void __malloc_lock();
-extern void __malloc_unlock();
-#endif
-
-#if __STD_C
-#define RARG struct _reent *reent_ptr,
-#define RONEARG struct _reent *reent_ptr
-#else
-#define RARG reent_ptr
-#define RONEARG reent_ptr
-#define RDECL struct _reent *reent_ptr;
-#endif
-
-#define RCALL reent_ptr,
-#define RONECALL reent_ptr
-
-/*
-   Define MALLOC_LOCK and MALLOC_UNLOCK to C expressions to run to
-   lock and unlock the malloc data structures.  MALLOC_LOCK may be
-   called recursively.
- */
-
-#ifndef MALLOC_LOCK
-#define MALLOC_LOCK
-#endif
-
-#ifndef MALLOC_UNLOCK
-#define MALLOC_UNLOCK
-#endif
-
-/*
-  INTERNAL_SIZE_T is the word-size used for internal bookkeeping
-  of chunk sizes. On a 64-bit machine, you can reduce malloc
-  overhead by defining INTERNAL_SIZE_T to be a 32 bit `unsigned int'
-  at the expense of not being able to handle requests greater than
-  2^31. This limitation is hardly ever a concern; you are encouraged
-  to set this. However, the default version is the same as size_t.
-*/
-
-#ifndef INTERNAL_SIZE_T
-#define INTERNAL_SIZE_T size_t
-#endif
-
-/*
-  Following is needed on implementations whereby long > size_t.
-  The problem is caused because the code performs subtractions of
-  size_t values and stores the result in long values.  In the case
-  where long > size_t and the first value is actually less than
-  the second value, the resultant value is positive.  For example,
-  (long)(x - y) where x = 0 and y is 1 ends up being 0x00000000FFFFFFFF
-  which is 2*31 - 1 instead of 0xFFFFFFFFFFFFFFFF.  This is due to the
-  fact that assignment from unsigned to signed won't sign extend.
-*/
-
-#ifdef SIZE_T_SMALLER_THAN_LONG
-#define long_sub_size_t(x, y) ( (x < y) ? -((long)(y - x)) : (x - y) );
-#else
-#define long_sub_size_t(x, y) ( (long)(x - y) )
-#endif
-
-/*
-  REALLOC_ZERO_BYTES_FREES should be set if a call to
-  realloc with zero bytes should be the same as a call to free.
-  Some people think it should. Otherwise, since this malloc
-  returns a unique pointer for malloc(0), so does realloc(p, 0). 
-*/
-
-/* The following macros are only invoked with (2n+1)-multiples of
-   INTERNAL_SIZE_T units, with a positive integer n. This is exploited
-   for fast inline execution when n is small. */
-
-#define MALLOC_ZERO(charp, nbytes)                                            \
-do {                                                                          \
-  INTERNAL_SIZE_T mzsz = (nbytes);                                            \
-  if(mzsz <= 9*sizeof(mzsz)) {                                                \
-    INTERNAL_SIZE_T* mz = (INTERNAL_SIZE_T*) (charp);                         \
-    if(mzsz >= 5*sizeof(mzsz)) {     *mz++ = 0;                               \
-                                     *mz++ = 0;                               \
-      if(mzsz >= 7*sizeof(mzsz)) {   *mz++ = 0;                               \
-                                     *mz++ = 0;                               \
-        if(mzsz >= 9*sizeof(mzsz)) { *mz++ = 0;                               \
-                                     *mz++ = 0; }}}                           \
-                                     *mz++ = 0;                               \
-                                     *mz++ = 0;                               \
-                                     *mz   = 0;                               \
-  } else memset((charp), 0, mzsz);                                            \
-} while(0)
-
-#define MALLOC_COPY(dest,src,nbytes)                                          \
-do {                                                                          \
-  INTERNAL_SIZE_T mcsz = (nbytes);                                            \
-  if(mcsz <= 9*sizeof(mcsz)) {                                                \
-    INTERNAL_SIZE_T* mcsrc = (INTERNAL_SIZE_T*) (src);                        \
-    INTERNAL_SIZE_T* mcdst = (INTERNAL_SIZE_T*) (dest);                       \
-    if(mcsz >= 5*sizeof(mcsz)) {     *mcdst++ = *mcsrc++;                     \
-                                     *mcdst++ = *mcsrc++;                     \
-      if(mcsz >= 7*sizeof(mcsz)) {   *mcdst++ = *mcsrc++;                     \
-                                     *mcdst++ = *mcsrc++;                     \
-        if(mcsz >= 9*sizeof(mcsz)) { *mcdst++ = *mcsrc++;                     \
-                                     *mcdst++ = *mcsrc++; }}}                 \
-                                     *mcdst++ = *mcsrc++;                     \
-                                     *mcdst++ = *mcsrc++;                     \
-                                     *mcdst   = *mcsrc  ;                     \
-  } else memcpy(dest, src, mcsz);                                             \
-} while(0)
-
-#define vECCALLOc	_vec_calloc_r
-#define fREe		_free_r
-#define mEMALIGn	_memalign_r
-#define vECREALLOc	_vec_realloc_r
-#
-#if __STD_C
-
-Void_t* vECREALLOc(RARG Void_t*, size_t);
-Void_t* vECCALLOc(RARG size_t, size_t);
-#else
-Void_t* vECREALLOc();
-Void_t* vECCALLOc();
-#endif
-
-
-#ifdef __cplusplus
-};  /* end of extern "C" */
-#endif
-
-/*
-  Type declarations
-*/
-
-struct malloc_chunk
-{
-  INTERNAL_SIZE_T prev_size; /* Size of previous chunk (if free). */
-  INTERNAL_SIZE_T size;      /* Size in bytes, including overhead. */
-  struct malloc_chunk* fd;   /* double links -- used only if free. */
-  struct malloc_chunk* bk;
-};
-
-typedef struct malloc_chunk* mchunkptr;
-
-/*  sizes, alignments */
-
-#define SIZE_SZ                (sizeof(INTERNAL_SIZE_T))
-#define MALLOC_ALIGN           16
-#define MALLOC_ALIGNMENT       16
-#define MALLOC_ALIGN_MASK      (MALLOC_ALIGNMENT - 1)
-#define MINSIZE                (sizeof(struct malloc_chunk))
-
-/* conversion from malloc headers to user pointers, and back */
-
-#define chunk2mem(p)   ((Void_t*)((char*)(p) + 2*SIZE_SZ))
-#define mem2chunk(mem) ((mchunkptr)((char*)(mem) - 2*SIZE_SZ))
-/* pad request bytes into a usable size */
-
-#define request2size(req) \
- (((long)((req) + (SIZE_SZ + MALLOC_ALIGN_MASK)) < \
-  (long)(MINSIZE + MALLOC_ALIGN_MASK)) ? ((MINSIZE + MALLOC_ALIGN_MASK) & ~(MALLOC_ALIGN_MASK)) : \
-   (((req) + (SIZE_SZ + MALLOC_ALIGN_MASK)) & ~(MALLOC_ALIGN_MASK)))
-
-
-/* Check if m has acceptable alignment */
-
-#define aligned_OK(m)    (((unsigned long)((m)) & (MALLOC_ALIGN_MASK)) == 0)
-
-/* 
-  Physical chunk operations  
-*/
-
-
-/* size field is or'ed with PREV_INUSE when previous adjacent chunk in use */
-
-#define PREV_INUSE 0x1 
-
-/* size field is or'ed with IS_MMAPPED if the chunk was obtained with mmap() */
-
-#define IS_MMAPPED 0x2
-
-/* Bits to mask off when extracting size */
-
-#define SIZE_BITS (PREV_INUSE|IS_MMAPPED)
-
-
-/* Ptr to next physical malloc_chunk. */
-
-#define next_chunk(p) ((mchunkptr)( ((char*)(p)) + ((p)->size & ~PREV_INUSE) ))
-
-/* Ptr to previous physical malloc_chunk */
-
-#define prev_chunk(p)\
-   ((mchunkptr)( ((char*)(p)) - ((p)->prev_size) ))
-
-
-/* Treat space at ptr + offset as a chunk */
-
-#define chunk_at_offset(p, s)  ((mchunkptr)(((char*)(p)) + (s)))
-
-
-
-
-/* 
-  Dealing with use bits 
-*/
-
-/* extract p's inuse bit */
-
-#define inuse(p)\
-((((mchunkptr)(((char*)(p))+((p)->size & ~PREV_INUSE)))->size) & PREV_INUSE)
-
-/* extract inuse bit of previous chunk */
-
-#define prev_inuse(p)  ((p)->size & PREV_INUSE)
-
-/* check for mmap()'ed chunk */
-
-#define chunk_is_mmapped(p) ((p)->size & IS_MMAPPED)
-
-/* set/clear chunk as in use without otherwise disturbing */
-
-#define set_inuse(p)\
-((mchunkptr)(((char*)(p)) + ((p)->size & ~PREV_INUSE)))->size |= PREV_INUSE
-
-#define clear_inuse(p)\
-((mchunkptr)(((char*)(p)) + ((p)->size & ~PREV_INUSE)))->size &= ~(PREV_INUSE)
-
-/* check/set/clear inuse bits in known places */
-
-#define inuse_bit_at_offset(p, s)\
- (((mchunkptr)(((char*)(p)) + (s)))->size & PREV_INUSE)
-
-#define set_inuse_bit_at_offset(p, s)\
- (((mchunkptr)(((char*)(p)) + (s)))->size |= PREV_INUSE)
-
-#define clear_inuse_bit_at_offset(p, s)\
- (((mchunkptr)(((char*)(p)) + (s)))->size &= ~(PREV_INUSE))
-
-
-
-/* 
-  Dealing with size fields 
-*/
-
-/* Get size, ignoring use bits */
-
-#define chunksize(p)          ((p)->size & ~(SIZE_BITS))
-
-/* Set size at head, without disturbing its use bit */
-
-#define set_head_size(p, s)   ((p)->size = (((p)->size & PREV_INUSE) | (s)))
-
-/* Set size/use ignoring previous bits in header */
-
-#define set_head(p, s)        ((p)->size = (s))
-
-
-
-#ifdef DEFINE_VECREALLOC
-
-
-#if __STD_C
-Void_t* vECREALLOc(RARG Void_t* oldmem, size_t bytes)
-#else
-Void_t* vECREALLOc(RARG oldmem, bytes) RDECL Void_t* oldmem; size_t bytes;
-#endif
-{
-  INTERNAL_SIZE_T    nb;      /* padded request size */
-
-  mchunkptr oldp;             /* chunk corresponding to oldmem */
-  INTERNAL_SIZE_T    oldsize; /* its size */
-
-  mchunkptr newp;             /* chunk to return */
-  INTERNAL_SIZE_T    newsize; /* its size */
-  Void_t*   newmem;           /* corresponding user mem */
-
-  mchunkptr remainder;        /* holds split off extra space from newp */
-  INTERNAL_SIZE_T  remainder_size;   /* its size */
-
-#ifdef REALLOC_ZERO_BYTES_FREES
-  if (bytes == 0) { fREe(RCALL oldmem); return 0; }
-#endif
-
-
-  /* realloc of null is supposed to be same as malloc */
-  if (oldmem == 0) return mEMALIGn(RCALL 16, bytes);
-
-  MALLOC_LOCK;
-
-  newp    = oldp    = mem2chunk(oldmem);
-  newsize = oldsize = chunksize(oldp);
-
-  nb = request2size(bytes);
-
-  if ((long)(oldsize) < (long)(nb))  
-  {
-    /* Must allocate */
-
-    newmem = mEMALIGn (RCALL 16, bytes);
-
-    if (newmem == 0)  /* propagate failure */
-    {
-      MALLOC_UNLOCK;
-      return 0;
-    }
-
-    /* copy, free, and exit */
-    MALLOC_COPY(newmem, oldmem, oldsize - SIZE_SZ);
-    fREe(RCALL oldmem);
-    MALLOC_UNLOCK;
-    return newmem;
-  }
-
-  remainder_size = long_sub_size_t(newsize, nb);
-
-  if (remainder_size >= (long)MINSIZE) /* split off remainder */
-  {
-    remainder = chunk_at_offset(newp, nb);
-    set_head_size(newp, nb);
-    set_head(remainder, remainder_size | PREV_INUSE);
-    set_inuse_bit_at_offset(remainder, remainder_size);
-    fREe(RCALL chunk2mem(remainder)); /* let free() deal with it */
-  }
-  else
-  {
-    set_head_size(newp, newsize);
-    set_inuse_bit_at_offset(newp, newsize);
-  }
-
-  MALLOC_UNLOCK;
-  return chunk2mem(newp);
-}
-
-#endif /* DEFINE_VECREALLOC */
-
-
-#ifdef DEFINE_VECCALLOC
-
-/*
-
-  calloc calls malloc, then zeroes out the allocated chunk.
-
-*/
-
-#if __STD_C
-Void_t* vECCALLOc(RARG size_t n, size_t elem_size)
-#else
-Void_t* vECCALLOc(RARG n, elem_size) RDECL size_t n; size_t elem_size;
-#endif
-{
-  INTERNAL_SIZE_T sz = n * elem_size;
-
-  Void_t* mem;
-
-  mem = mEMALIGn (RCALL 16, sz);
-
-  if (mem == 0) 
-  {
-    return 0;
-  }
-
-  MALLOC_ZERO(mem, sz);
-  return mem;
-}
-
-#endif /* DEFINE_VECCALLOC */
-
diff --git a/newlib/libc/machine/powerpc/vec_realloc.c b/newlib/libc/machine/powerpc/vec_realloc.c
deleted file mode 100644
index e192e39..0000000
--- a/newlib/libc/machine/powerpc/vec_realloc.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* vec_realloc.c -- a wrapper for _vec_realloc_r.  */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdlib.h>
-
-#ifndef _REENT_ONLY
-
-_PTR
-_DEFUN (vec_realloc, (ap, nbytes),
-	_PTR ap _AND
-	size_t nbytes)
-{
-  return _vec_realloc_r (_REENT, ap, nbytes);
-}
-
-#endif
diff --git a/newlib/libc/machine/powerpc/vfprintf.c b/newlib/libc/machine/powerpc/vfprintf.c
deleted file mode 100644
index 8aadb4b..0000000
--- a/newlib/libc/machine/powerpc/vfprintf.c
+++ /dev/null
@@ -1,1429 +0,0 @@
-/*
-FUNCTION
-<<vprintf>>, <<vfprintf>>, <<vsprintf>>---format argument list
-
-INDEX
-	vprintf
-INDEX
-	vfprintf
-INDEX
-	vsprintf
-INDEX
-	vsnprintf
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	#include <stdarg.h>
-	int vprintf(const char *<[fmt]>, va_list <[list]>);
-	int vfprintf(FILE *<[fp]>, const char *<[fmt]>, va_list <[list]>);
-	int vsprintf(char *<[str]>, const char *<[fmt]>, va_list <[list]>);
-	int vsnprintf(char *<[str]>, size_t <[size]>, const char *<[fmt]>, va_list <[list]>);
-
-	int _vprintf_r(void *<[reent]>, const char *<[fmt]>,
-                        va_list <[list]>);
-	int _vfprintf_r(void *<[reent]>, FILE *<[fp]>, const char *<[fmt]>,
-                        va_list <[list]>);
-	int _vsprintf_r(void *<[reent]>, char *<[str]>, const char *<[fmt]>,
-                        va_list <[list]>);
-	int _vsnprintf_r(void *<[reent]>, char *<[str]>, size_t <[size]>, const char *<[fmt]>,
-                        va_list <[list]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	#include <varargs.h>
-	int vprintf( <[fmt]>, <[list]>)
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vfprintf(<[fp]>, <[fmt]>, <[list]>)
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vsprintf(<[str]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vsnprintf(<[str]>, <[size]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-        size_t <[size]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vprintf_r(<[reent]>, <[fmt]>, <[list]>)
-	char *<[reent]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vfprintf_r(<[reent]>, <[fp]>, <[fmt]>, <[list]>)
-	char *<[reent]>;
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vsprintf_r(<[reent]>, <[str]>, <[fmt]>, <[list]>)
-	char *<[reent]>;
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vsnprintf_r(<[reent]>, <[str]>, <[size]>, <[fmt]>, <[list]>)
-	char *<[reent]>;
-	char *<[str]>;
-        size_t <[size]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-DESCRIPTION
-<<vprintf>>, <<vfprintf>>, <<vsprintf>> and <<vsnprintf>> are (respectively)
-variants of <<printf>>, <<fprintf>>, <<sprintf>> and <<snprintf>>.  They differ
-only in allowing their caller to pass the variable argument list as a
-<<va_list>> object (initialized by <<va_start>>) rather than directly
-accepting a variable number of arguments.
-
-RETURNS
-The return values are consistent with the corresponding functions:
-<<vsprintf>> returns the number of bytes in the output string,
-save that the concluding <<NULL>> is not counted.
-<<vprintf>> and <<vfprintf>> return the number of characters transmitted.
-If an error occurs, <<vprintf>> and <<vfprintf>> return <<EOF>>. No
-error returns occur for <<vsprintf>>.
-
-PORTABILITY
-ANSI C requires all three functions.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)vfprintf.c	5.50 (Berkeley) 12/16/92";*/
-static char *rcsid = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Actual printf innards.
- *
- * This code is large and complicated...
- */
-
-#ifdef INTEGER_ONLY
-#define VFPRINTF vfiprintf
-#define _VFPRINTF_R _vfiprintf_r
-#else
-#define VFPRINTF vfprintf
-#define _VFPRINTF_R _vfprintf_r
-#ifndef NO_FLOATING_POINT
-#define FLOATING_POINT
-#endif
-#endif
-
-#include <_ansi.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <reent.h>
-#include <wchar.h>
-#include <string.h>
-#ifdef __ALTIVEC__
-#include <altivec.h>
-#endif
-
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#include "local.h"
-#include "fvwrite.h"
-#include "vfieeefp.h"
-
-/* Currently a test is made to see if long double processing is warranted.
-   This could be changed in the future should the _ldtoa_r code be
-   preferred over _dtoa_r.  */
-#define _NO_LONGDBL
-#if defined _WANT_IO_LONG_DOUBLE && (LDBL_MANT_DIG > DBL_MANT_DIG)
-#undef _NO_LONGDBL
-#endif
-
-#define _NO_LONGLONG
-#if defined _WANT_IO_LONG_LONG && defined __GNUC__
-# undef _NO_LONGLONG
-#endif
-
-#ifdef __ALTIVEC__
-typedef union
-{
-  vector int v;
-  float f[4];
-  int   i[16 / sizeof(int)];
-  long  l[4];
-  short s[8];
-  signed char c[16];
-} vec_16_byte_union;
-#endif /* __ALTIVEC__ */
-
-/*
- * Flush out all the vectors defined by the given uio,
- * then reset it so that it can be reused.
- */
-static int
-__sprint(fp, uio)
-	FILE *fp;
-	register struct __suio *uio;
-{
-	register int err;
-
-	if (uio->uio_resid == 0) {
-		uio->uio_iovcnt = 0;
-		return (0);
-	}
-	err = __sfvwrite(fp, uio);
-	uio->uio_resid = 0;
-	uio->uio_iovcnt = 0;
-	return (err);
-}
-
-/*
- * Helper function for `fprintf to unbuffered unix file': creates a
- * temporary buffer.  We only work on write-only files; this avoids
- * worries about ungetc buffers and so forth.
- */
-static int
-__sbprintf(fp, fmt, ap)
-	register FILE *fp;
-	const char *fmt;
-	va_list ap;
-{
-	int ret;
-	FILE fake;
-	unsigned char buf[BUFSIZ];
-
-	/* copy the important variables */
-	fake._flags = fp->_flags & ~__SNBF;
-	fake._file = fp->_file;
-	fake._cookie = fp->_cookie;
-	fake._write = fp->_write;
-
-	/* set up the buffer */
-	fake._bf._base = fake._p = buf;
-	fake._bf._size = fake._w = sizeof(buf);
-	fake._lbfsize = 0;	/* not actually used, but Just In Case */
-
-	/* do the work, then copy any error status */
-	ret = VFPRINTF(&fake, fmt, ap);
-	if (ret >= 0 && fflush(&fake))
-		ret = EOF;
-	if (fake._flags & __SERR)
-		fp->_flags |= __SERR;
-	return (ret);
-}
-
-
-#ifdef FLOATING_POINT
-#include <locale.h>
-#include <math.h>
-#include "floatio.h"
-
-#define	BUF		(MAXEXP+MAXFRACT+1)	/* + decimal point */
-#define	DEFPREC		6
-
-#ifdef _NO_LONGDBL
-static char *cvt _PARAMS((struct _reent *, double, int, int, char *, int *, int, int *));
-#else
-static char *cvt _PARAMS((struct _reent *, _LONG_DOUBLE, int, int, char *, int *, int, int *));
-extern int  _ldcheck _PARAMS((_LONG_DOUBLE *));
-#endif
-
-static int exponent _PARAMS((char *, int, int));
-
-#ifdef __SPE__
-static char *cvt_ufix64 _PARAMS((struct _reent *, unsigned long long, int,  int *, int *));
-#endif /* __SPE__ */
-
-#else /* no FLOATING_POINT */
-
-#define	BUF		40
-
-#endif /* FLOATING_POINT */
-
-
-/*
- * Macros for converting digits to letters and vice versa
- */
-#define	to_digit(c)	((c) - '0')
-#define is_digit(c)	((unsigned)to_digit(c) <= 9)
-#define	to_char(n)	((n) + '0')
-
-/*
- * Flags used during conversion.
- */
-#define	ALT		0x001		/* alternate form */
-#define	HEXPREFIX	0x002		/* add 0x or 0X prefix */
-#define	LADJUST		0x004		/* left adjustment */
-#define	LONGDBL		0x008		/* long double */
-#define	LONGINT		0x010		/* long integer */
-#ifndef _NO_LONGLONG
-#define	QUADINT		0x020		/* quad integer */
-#else /* ifdef _NO_LONGLONG, make QUADINT equivalent to LONGINT, so
-	 that %lld behaves the same as %ld, not as %d, as expected if:
-	 sizeof (long long) = sizeof long > sizeof int  */
-#define	QUADINT		LONGINT
-#endif
-#define	SHORTINT	0x040		/* short integer */
-#define	ZEROPAD		0x080		/* zero (as opposed to blank) pad */
-#define FPT		0x100		/* Floating point number */
-#define VECTOR		0x200		/* vector */
-#define FIXEDPOINT	0x400		/* fixed-point */
-
-int 
-_DEFUN (VFPRINTF, (fp, fmt0, ap),
-	FILE * fp _AND
-	_CONST char *fmt0 _AND
-	va_list ap)
-{
-  CHECK_INIT (_REENT);
-  return _VFPRINTF_R (_REENT, fp, fmt0, ap);
-}
-
-int 
-_DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
-	struct _reent *data _AND
-	FILE * fp _AND
-	_CONST char *fmt0 _AND
-	va_list ap)
-{
-	register char *fmt;	/* format string */
-	register int ch;	/* character from fmt */
-	register int n, m;	/* handy integers (short term usage) */
-	register char *cp;	/* handy char pointer (short term usage) */
-	register struct __siov *iovp;/* for PRINT macro */
-	register int flags;	/* flags as above */
-	int ret;		/* return value accumulator */
-	int width;		/* width from format (%8d), or 0 */
-	int prec;		/* precision from format (%.3d), or -1 */
-	char sign;		/* sign prefix (' ', '+', '-', or \0) */
-	char old_sign;		/* saved value of sign when looping for vectors */
-	int old_ch;		/* saved value of ch when looping for vectors */
-	char *format_anchor;    /* start of format to process */
-	wchar_t wc;
-#ifdef FLOATING_POINT
-	char *decimal_point = localeconv()->decimal_point;
-	char softsign;		/* temporary negative sign for floats */
-#ifdef _NO_LONGDBL
-	union { int i; double d; } _double_ = {0};
-	#define _fpvalue (_double_.d)
-#else
-	union { int i; _LONG_DOUBLE ld; } _long_double_ = {0};
-	#define _fpvalue (_long_double_.ld)
-	int tmp;  
-#endif
-	int expt;		/* integer value of exponent */
-	int expsize = 0;	/* character count for expstr */
-	int ndig;		/* actual number of digits returned by cvt */
-	char expstr[7];		/* buffer for exponent string */
-#endif
-
-#ifndef _NO_LONGLONG
-#define	quad_t	  long long
-#define	u_quad_t  unsigned long long
-#endif
-
-#ifndef _NO_LONGLONG
-	u_quad_t _uquad;	/* integer arguments %[diouxX] */
-#else
-	u_long _uquad;
-#endif
-	enum { OCT, DEC, HEX } base;/* base for [diouxX] conversion */
-	int dprec;		/* a copy of prec if [diouxX], 0 otherwise */
-	int realsz;		/* field size expanded by dprec */
-	int size;		/* size of converted field or string */
-	char *xdigs = NULL;	/* digits for [xX] conversion */
-#define NIOV 8
-	struct __suio uio;	/* output information: summary */
-	struct __siov iov[NIOV];/* ... and individual io vectors */
-	char buf[BUF];		/* space for %c, %[diouxX], %[eEfgG] */
-	char ox[2];		/* space for 0x hex-prefix */
-#ifdef __ALTIVEC__
-	char vec_sep;           /* vector separator char */
-	int vec_print_count;    /* number of vector chunks remaining */
-	vec_16_byte_union vec_tmp;
-#endif /* __ALTIVEC__ */ 
-        mbstate_t state;          /* mbtowc calls from library must not change state */
-
-	/*
-	 * Choose PADSIZE to trade efficiency vs. size.  If larger printf
-	 * fields occur frequently, increase PADSIZE and make the initialisers
-	 * below longer.
-	 */
-#define	PADSIZE	16		/* pad chunk size */
-	static _CONST char blanks[PADSIZE] =
-	 {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
-	static _CONST char zeroes[PADSIZE] =
-	 {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
-
-	/*
-	 * BEWARE, these `goto error' on error, and PAD uses `n'.
-	 */
-#define	PRINT(ptr, len) { \
-	iovp->iov_base = (ptr); \
-	iovp->iov_len = (len); \
-	uio.uio_resid += (len); \
-	iovp++; \
-	if (++uio.uio_iovcnt >= NIOV) { \
-		if (__sprint(fp, &uio)) \
-			goto error; \
-		iovp = iov; \
-	} \
-}
-#define	PAD(howmany, with) { \
-	if ((n = (howmany)) > 0) { \
-		while (n > PADSIZE) { \
-			PRINT(with, PADSIZE); \
-			n -= PADSIZE; \
-		} \
-		PRINT(with, n); \
-	} \
-}
-#define	FLUSH() { \
-	if (uio.uio_resid && __sprint(fp, &uio)) \
-		goto error; \
-	uio.uio_iovcnt = 0; \
-	iovp = iov; \
-}
-
-#ifdef __ALTIVEC__
-#define GET_SHORT(ap) \
-	(flags&VECTOR ? \
-	    (vec_print_count < 8 ? (short)vec_tmp.s[8 - vec_print_count] : \
-	        (vec_tmp.v = va_arg(ap, vector int), (short)vec_tmp.s[0])) : \
-	    (short)va_arg(ap, int))
-#define GET_USHORT(ap) \
-	(flags&VECTOR ? \
-	    (vec_print_count < 8 ? (u_short)vec_tmp.s[8 - vec_print_count] : \
-	        (vec_tmp.v = va_arg(ap, vector int), (u_short)vec_tmp.s[0])) : \
-	    (u_short)va_arg(ap, int))
-
-#define GET_LONG(ap) \
-	(flags&VECTOR ? \
-	    (vec_print_count < 4 ? (long)vec_tmp.l[4 - vec_print_count] : \
-	        (vec_tmp.v = va_arg(ap, vector int), vec_tmp.l[0])) : \
-	    va_arg(ap, long int))
-#define GET_ULONG(ap) \
-	(flags&VECTOR ? \
-	    (vec_print_count < 4 ? (u_long)vec_tmp.l[4 - vec_print_count] : \
-	        (vec_tmp.v = va_arg(ap, vector int), (u_long)vec_tmp.l[0])) : \
-	    (u_long)va_arg(ap, unsigned long int))
-
-#define GET_INT(ap) \
-	(flags&VECTOR ? \
-	    (vec_print_count < 16 ? \
-                vec_tmp.c[16 - vec_print_count] : \
-	        (vec_tmp.v = va_arg(ap, vector int), (int)vec_tmp.c[0])) : \
-	    va_arg(ap, int))
-#define GET_UINT(ap) \
-	(flags&VECTOR ? \
-	    (vec_print_count < 16 ? \
-                (u_int)((unsigned char)vec_tmp.c[16 - vec_print_count]) : \
-	        (vec_tmp.v = va_arg(ap, vector int), (u_int)((unsigned char)vec_tmp.c[0]))) : \
-	    (u_int)va_arg(ap, unsigned int))
-#else /* !__ALTIVEC__ */
-#define GET_SHORT(ap) ((short)va_arg(ap, int))
-#define GET_USHORT(ap) ((u_short)va_arg(ap, int))
-#define GET_LONG(ap) (va_arg(ap, long int))
-#define GET_ULONG(ap) ((u_long)va_arg(ap, unsigned long int))
-#define GET_INT(ap) ((int)va_arg(ap, int))
-#define GET_UINT(ap) ((u_int)va_arg(ap, unsigned int))
-#endif /* !__ALTIVEC__ */
-
-#ifndef _NO_LONGLONG
-#define	SARG() \
-	(flags&QUADINT ? va_arg(ap, quad_t) : \
-	    flags&LONGINT ? GET_LONG(ap) : \
-	    flags&SHORTINT ? (long)GET_SHORT(ap) : \
-	    (long)GET_INT(ap))
-#define	UARG() \
-	(flags&QUADINT ? va_arg(ap, u_quad_t) : \
-	    flags&LONGINT ? GET_ULONG(ap) : \
-	    flags&SHORTINT ? (u_long)GET_USHORT(ap) : \
-	    (u_long)GET_UINT(ap))
-#ifdef __SPE__
-#define	SFPARG() \
-	(flags&LONGINT ? va_arg(ap, quad_t) : \
-	    flags&SHORTINT ? (long)GET_SHORT(ap) : \
-	    (long)va_arg(ap, int))
-#define	UFPARG() \
-	(flags&LONGINT ? va_arg(ap, u_quad_t) : \
-	    flags&SHORTINT ? (u_long)GET_USHORT(ap) : \
-	    (u_long)va_arg(ap, u_int))
-#endif /* __SPE__ */
-#else
-#define	SARG() \
-	(flags&LONGINT ? GET_LONG(ap) : \
-	    flags&SHORTINT ? (long)GET_SHORT(ap) : \
-	    (long)GET_INT(ap))
-#define	UARG() \
-	(flags&LONGINT ? GET_ULONG(ap) : \
-	    flags&SHORTINT ? (u_long)GET_USHORT(ap) : \
-	    (u_long)GET_UINT(ap))
-#ifdef __SPE__
-#define	SFPARG() \
-	(flags&LONGINT ? (va_arg(ap, long) << 32) : \
-	    flags&SHORTINT ? (long)GET_SHORT(ap) : \
-	    (long)va_arg(ap, int))
-#define	UFPARG() \
-	(flags&LONGINT ? (va_arg(ap, u_long) <<32) : \
-	    flags&SHORTINT ? (u_long)GET_USHORT(ap) : \
-	    (u_long)va_arg(ap, u_int))
-#endif /* __SPE__ */
-#endif
-
-        memset (&state, '\0', sizeof (state));
-
-	/* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
-	if (cantwrite(fp))
-		return (EOF);
-
-	/* optimise fprintf(stderr) (and other unbuffered Unix files) */
-	if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
-	    fp->_file >= 0)
-		return (__sbprintf(fp, fmt0, ap));
-
-	fmt = (char *)fmt0;
-	uio.uio_iov = iovp = iov;
-	uio.uio_resid = 0;
-	uio.uio_iovcnt = 0;
-	ret = 0;
-
-	/*
-	 * Scan the format for conversions (`%' character).
-	 */
-	for (;;) {
-	        cp = fmt;
-	        while ((n = _mbtowc_r(_REENT, &wc, fmt, MB_CUR_MAX, &state)) > 0) {
-			fmt += n;
-			if (wc == '%') {
-				fmt--;
-				break;
-			}
-		}
-		if ((m = fmt - cp) != 0) {
-			PRINT(cp, m);
-			ret += m;
-		}
-		if (n <= 0)
-			goto done;
-		fmt++;		/* skip over '%' */
-
-		flags = 0;
-		dprec = 0;
-		width = 0;
-		prec = -1;
-		sign = '\0';
-		old_sign = '\0';
-#ifdef __ALTIVEC__
-		vec_print_count = 0;
-		vec_sep = ' ';
-#endif /* __ALTIVEC__ */
-
-		format_anchor = fmt;
-rflag:		ch = *fmt++;
-		old_ch = ch;
-reswitch:	switch (ch) {
-		case ' ':
-			/*
-			 * ``If the space and + flags both appear, the space
-			 * flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-			if (!sign)
-				sign = ' ';
-			goto rflag;
-		case '#':
-			flags |= ALT;
-			goto rflag;
-		case '*':
-			/*
-			 * ``A negative field width argument is taken as a
-			 * - flag followed by a positive field width.''
-			 *	-- ANSI X3J11
-			 * They don't exclude field widths read from args.
-			 */
-			if ((width = va_arg(ap, int)) >= 0)
-				goto rflag;
-			width = -width;
-			/* FALLTHROUGH */
-		case '-':
-			flags |= LADJUST;
-			goto rflag;
-		case '+':
-			sign = '+';
-			goto rflag;
-#ifdef __ALTIVEC__
-		case ',':
-		case ';':
-		case ':':
-		case '_':
-		        if (vec_sep != ' ')
-		          {
-		            fmt = format_anchor;
-		            continue;
-		          }
-			vec_sep = ch;
-			goto rflag;
-#endif /* __ALTIVEC__ */
-		case '.':
-			if ((ch = *fmt++) == '*') {
-				n = va_arg(ap, int);
-				prec = n < 0 ? -1 : n;
-				goto rflag;
-			}
-			n = 0;
-			while (is_digit(ch)) {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			}
-			prec = n < 0 ? -1 : n;
-			goto reswitch;
-		case '0':
-			/*
-			 * ``Note that 0 is taken as a flag, not as the
-			 * beginning of a field width.''
-			 *	-- ANSI X3J11
-			 */
-			flags |= ZEROPAD;
-			goto rflag;
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			n = 0;
-			do {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			} while (is_digit(ch));
-			width = n;
-			goto reswitch;
-#ifdef FLOATING_POINT
-		case 'L':
-#ifdef __ALTIVEC__
-		        if (flags & VECTOR) 
-			  {
-			    fmt = format_anchor;
-			    continue;
-			  }
-#endif /* __ALTIVEC__ */
-			flags |= LONGDBL;
-			goto rflag;
-#endif
-		case 'h':
-		        if (flags & LONGINT)
-		          {
-		            fmt = format_anchor;
-		            continue;
-		          }
-			flags |= SHORTINT;
-#ifdef __ALTIVEC__
-			if (flags & VECTOR)
-			  vec_print_count = 8;
-#endif
-			goto rflag;
-		case 'l':
-		        if (flags & SHORTINT)
-		          {
-		            fmt = format_anchor;
-		            continue;
-		          }
-			if (*fmt == 'l') {
-				fmt++;
-				flags |= QUADINT;
-				flags &= ~VECTOR;
-			} else {
-				flags |= LONGINT;
-#ifdef __ALTIVEC__
-				if (flags & VECTOR)
-				  vec_print_count = 4;
-#endif
-			}
-			goto rflag;
-#ifdef __ALTIVEC__
-		case 'v':
-		        if (flags & VECTOR) 
-			  {
-			    fmt = format_anchor;
-			    continue;
-			  }
-			flags |= VECTOR;
-			vec_print_count = (flags & SHORTINT) ? 8 : 
-			  ((flags & LONGINT) ? 4 : 16);
-			goto rflag;
-#endif
-                case 'q':
-#ifdef __ALTIVEC__
-		        if (flags & VECTOR) 
-			  {
-			    fmt = format_anchor;
-			    continue;
-			  }
-#endif /* __ALTIVEC__ */
-			flags |= QUADINT;
-			goto rflag;
-		case 'c':
-#ifdef __ALTIVEC__
-			if (flags & VECTOR)
-			  {
-			    int k;
-			    vec_16_byte_union tmp;
-		            if (flags & (SHORTINT | LONGINT))
-		              {
-		                fmt = format_anchor;
-		                continue;
-		              }
-			    tmp.v = va_arg(ap, vector int);
-			    cp = buf;
-			    for (k = 0; k < 15; ++k)
-			      {
-			        *cp++ = tmp.c[k];
-			        if (vec_sep != ' ')
-			          *cp++ = vec_sep;
-			      }
-			    *cp++ = tmp.c[15];
-			    size = cp - buf;
-			    cp = buf;
-			    vec_print_count = 0;
-			  }
-			else
-#endif /* __ALTIVEC__ */
-			  {
-			    *(cp = buf) = va_arg(ap, int);
-			    size = 1;
-			  }
-			sign = '\0';
-			break;
-		case 'D':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'd':
-		case 'i':
-#ifdef __ALTIVEC__
-		        if (!(flags & VECTOR) && vec_sep != ' ') 
-			  {
-			    fmt = format_anchor;
-			    continue;
-			  }
-#endif /* __ALTIVEC__ */
-			_uquad = SARG();
-#ifndef _NO_LONGLONG
-			if ((quad_t)_uquad < 0)
-#else
-			if ((long) _uquad < 0)
-#endif
-			{
-
-				_uquad = -_uquad;
-				old_sign = sign;
-				sign = '-';
-			}
-			base = DEC;
-			goto number;
-#ifdef FLOATING_POINT
-		case 'e':
-		case 'E':
-		case 'f':
-		case 'g':
-		case 'G':
-			if (prec == -1) {
-				prec = DEFPREC;
-			} else if ((ch == 'g' || ch == 'G') && prec == 0) {
-				prec = 1;
-			}
-
-#ifdef _NO_LONGDBL
-			if (flags & LONGDBL) {
-				_fpvalue = (double) va_arg(ap, _LONG_DOUBLE);
-#ifdef __ALTIVEC__
-			} else if (flags & VECTOR) {
-				if (vec_print_count >= 4)
-                                  {
-                                    vec_print_count = 4;
-				    vec_tmp.v = va_arg(ap, vector int);
-                                  }
-				_fpvalue = (double)vec_tmp.f[4 - vec_print_count];
-			} else if (vec_sep != ' ') {
-			         fmt = format_anchor;
-			         continue;
-			
-#endif /* __ALTIVEC__ */
-			} else {
-				_fpvalue = va_arg(ap, double);
-			}
-
-			/* do this before tricky precision changes */
-			if (isinf(_fpvalue)) {
-				if (_fpvalue < 0)
-				  {
-				    old_sign = sign;
-				    sign = '-';
-				  }
-				    
-				cp = "Inf";
-				size = 3;
-				break;
-			}
-			if (isnan(_fpvalue)) {
-				cp = "NaN";
-				size = 3;
-				break;
-			}
-
-#else /* !_NO_LONGDBL */
-			
-			if (flags & LONGDBL) {
-				_fpvalue = va_arg(ap, _LONG_DOUBLE);
-#ifdef __ALTIVEC__
-			} else if (flags & VECTOR) {
-				if (vec_print_count >= 4)
-                                  {
-                                    vec_print_count = 4;
-				    vec_tmp.v = va_arg(ap, vector int);
-                                  }
-				_fpvalue = (_LONG_DOUBLE)k.f[4 - vec_print_count];
-#endif /* __ALTIVEC__ */
-			} else {
-				_fpvalue = (_LONG_DOUBLE)va_arg(ap, double);
-			}
-
-			/* do this before tricky precision changes */
-			tmp = _ldcheck (&_fpvalue);
-			if (tmp == 2) {
-				if (_fpvalue < 0)
-				  {
-				    old_sign = sign;
-				    sign = '-';
-				  }
-				cp = "Inf";
-				size = 3;
-				break;
-			}
-			if (tmp == 1) {
-				cp = "NaN";
-				size = 3;
-				break;
-			}
-#endif /* !_NO_LONGDBL */
-
-			flags |= FPT;
-
-			cp = cvt(data, _fpvalue, prec, flags, &softsign,
-				&expt, ch, &ndig);
-
-			if (ch == 'g' || ch == 'G') {
-				if (expt <= -4 || expt > prec)
-				  {
-				    old_ch = ch;
-				    ch = (ch == 'g') ? 'e' : 'E';
-				  }
-				else
-					ch = 'g';
-			} 
-			if (ch <= 'e') {	/* 'e' or 'E' fmt */
-				--expt;
-				expsize = exponent(expstr, expt, ch);
-				size = expsize + ndig;
-				if (ndig > 1 || flags & ALT)
-					++size;
-			} else if (ch == 'f') {		/* f fmt */
-				if (expt > 0) {
-					size = expt;
-					if (prec || flags & ALT)
-						size += prec + 1;
-				} else	/* "0.X" */
-					size = prec + 2;
-			} else if (expt >= ndig) {	/* fixed g fmt */
-				size = expt;
-				if (flags & ALT)
-					++size;
-			} else
-				size = ndig + (expt > 0 ?
-					1 : 2 - expt);
-
-			if (softsign)
-			  {
-			    old_sign = sign;
-			    sign = '-';
-			  }
-			break;
-#endif /* FLOATING_POINT */
-#ifdef __SPE__
-                case 'r':
-		        flags |= FIXEDPOINT;
-	     	        _uquad = SFPARG();
-			if ((quad_t)_uquad < 0)
-			  {
-			    sign = '-';
-			    _uquad = -(quad_t)_uquad;
-			  }
-			if (flags & SHORTINT)
-			  _uquad <<= 49;
-			else if (flags & LONGINT)
-			  _uquad <<= 1;
-			else
-			  _uquad <<= 33;
-
-			if (_uquad == 0 && sign)
-			  {
-			    /* we have -1.0 which has to be handled special */
-			    cp = "100000";
-			    expt = 1;
-			    ndig = 6;
-			    break;
-			  }
-
-			goto fixed_nosign;
-                case 'R':
-		        flags |= FIXEDPOINT;
-		        _uquad = UFPARG();
-			if (flags & SHORTINT)
-			  _uquad <<= 48;
-			else if (!(flags & LONGINT))
-			  _uquad <<= 32;
-	
-fixed_nosign:
-			if (prec == -1)
-			  prec = DEFPREC;
-
-			cp = cvt_ufix64 (data, _uquad, prec, &expt, &ndig);
-
-			/* act like %f of format "0.X" */
-			size = prec + 2;
-
-                        break;
-#endif /* __SPE__ */
-		case 'n':
-#ifdef __ALTIVEC__
-		        if (flags & VECTOR)
-			  {
-			    fmt = format_anchor;
-			    continue;
-			  }
-#endif /* __ALTIVEC__ */
-#ifndef _NO_LONGLONG
-			if (flags & QUADINT)
-				*va_arg(ap, quad_t *) = ret;
-			else 
-#endif
-			if (flags & LONGINT)
-				*va_arg(ap, long *) = ret;
-			else if (flags & SHORTINT)
-				*va_arg(ap, short *) = ret;
-			else
-				*va_arg(ap, int *) = ret;
-			continue;	/* no output */
-		case 'O':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'o':
-#ifdef __ALTIVEC__
-		        if (!(flags & VECTOR) && vec_sep != ' ') 
-			  {
-			    fmt = format_anchor;
-			    continue;
-			  }
-#endif /* __ALTIVEC__ */
-			_uquad = UARG();
-			base = OCT;
-			goto nosign;
-		case 'p':
-			/*
-			 * ``The argument shall be a pointer to void.  The
-			 * value of the pointer is converted to a sequence
-			 * of printable characters, in an implementation-
-			 * defined manner.''
-			 *	-- ANSI X3J11
-			 */
-			/* NOSTRICT */
-#ifdef __ALTIVEC__
-		        if (flags & VECTOR)
-		          _uquad = UARG();
-		        else if (vec_sep != ' ')
-			  {
-			    fmt = format_anchor;
-			    continue;
-			  }
-			else
-#endif /* __ALTIVEC__ */
-		          _uquad = (u_long)(unsigned _POINTER_INT)va_arg(ap, void *);
-			base = HEX;
-			xdigs = "0123456789abcdef";
-			flags |= HEXPREFIX;
-			ch = 'x';
-			goto nosign;
-		case 's':
-#ifdef __ALTIVEC__
-		        if (flags & VECTOR)
-			  {
-			    fmt = format_anchor;
-			    continue;
-			  }
-#endif /* __ALTIVEC__ */
-			if ((cp = va_arg(ap, char *)) == NULL)
-				cp = "(null)";
-			if (prec >= 0) {
-				/*
-				 * can't use strlen; can only look for the
-				 * NUL in the first `prec' characters, and
-				 * strlen() will go further.
-				 */
-				char *p = memchr(cp, 0, prec);
-
-				if (p != NULL) {
-					size = p - cp;
-					if (size > prec)
-						size = prec;
-				} else
-					size = prec;
-			} else
-				size = strlen(cp);
-			sign = '\0';
-			break;
-		case 'U':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'u':
-#ifdef __ALTIVEC__
-		        if (!(flags & VECTOR) && vec_sep != ' ') 
-			  {
-			    fmt = format_anchor;
-			    continue;
-			  }
-#endif /* __ALTIVEC__ */
-			_uquad = UARG();
-			base = DEC;
-			goto nosign;
-		case 'X':
-			xdigs = "0123456789ABCDEF";
-			goto hex;
-		case 'x':
-			xdigs = "0123456789abcdef";
-#ifdef __ALTIVEC__
-		        if (!(flags & VECTOR) && vec_sep != ' ') 
-			  {
-			    fmt = format_anchor;
-			    continue;
-			  }
-#endif /* __ALTIVEC__ */
-hex:			_uquad = UARG();
-			base = HEX;
-			/* leading 0x/X only if non-zero */
-			if (flags & ALT && _uquad != 0)
-				flags |= HEXPREFIX;
-
-			/* unsigned conversions */
-nosign:			sign = '\0';
-			/*
-			 * ``... diouXx conversions ... if a precision is
-			 * specified, the 0 flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-number:			if ((dprec = prec) >= 0)
-				flags &= ~ZEROPAD;
-
-			/*
-			 * ``The result of converting a zero value with an
-			 * explicit precision of zero is no characters.''
-			 *	-- ANSI X3J11
-			 */
-			cp = buf + BUF;
-			if (_uquad != 0 || prec != 0) {
-				/*
-				 * Unsigned mod is hard, and unsigned mod
-				 * by a constant is easier than that by
-				 * a variable; hence this switch.
-				 */
-				switch (base) {
-				case OCT:
-					do {
-						*--cp = to_char(_uquad & 7);
-						_uquad >>= 3;
-					} while (_uquad);
-					/* handle octal leading 0 */
-					if (flags & ALT && *cp != '0')
-						*--cp = '0';
-					break;
-
-				case DEC:
-					/* many numbers are 1 digit */
-					while (_uquad >= 10) {
-						*--cp = to_char(_uquad % 10);
-						_uquad /= 10;
-					}
-					*--cp = to_char(_uquad);
-					break;
-
-				case HEX:
-					do {
-						*--cp = xdigs[_uquad & 15];
-						_uquad >>= 4;
-					} while (_uquad);
-					break;
-
-				default:
-					cp = "bug in vfprintf: bad base";
-					size = strlen(cp);
-					goto skipsize;
-				}
-			}
-                       /*
-			* ...result is to be converted to an 'alternate form'.
-			* For o conversion, it increases the precision to force
-			* the first digit of the result to be a zero."
-			*     -- ANSI X3J11
-			*
-			* To demonstrate this case, compile and run:
-                        *    printf ("%#.0o",0);
-			*/
-                       else if (base == OCT && (flags & ALT))
-                         *--cp = '0';
-
-			size = buf + BUF - cp;
-		skipsize:
-			break;
-		default:	/* "%?" prints ?, unless ? is NUL */
-			flags &= ~VECTOR;
-			if (ch == '\0')
-				goto done;
-			/* pretend it was %c with argument ch */
-			cp = buf;
-			*cp = ch;
-			size = 1;
-			sign = '\0';
-			break;
-		}
-
-		/*
-		 * All reasonable formats wind up here.  At this point, `cp'
-		 * points to a string which (if not flags&LADJUST) should be
-		 * padded out to `width' places.  If flags&ZEROPAD, it should
-		 * first be prefixed by any sign or other prefix; otherwise,
-		 * it should be blank padded before the prefix is emitted.
-		 * After any left-hand padding and prefixing, emit zeroes
-		 * required by a decimal [diouxX] precision, then print the
-		 * string proper, then emit zeroes required by any leftover
-		 * floating precision; finally, if LADJUST, pad with blanks.
-		 *
-		 * Compute actual size, so we know how much to pad.
-		 * size excludes decimal prec; realsz includes it.
-		 */
-		realsz = dprec > size ? dprec : size;
-		if (sign)
-			realsz++;
-		else if (flags & HEXPREFIX)
-			realsz+= 2;
-
-		/* right-adjusting blank padding */
-		if ((flags & (LADJUST|ZEROPAD)) == 0)
-			PAD(width - realsz, blanks);
-
-		/* prefix */
-		if (sign) {
-			PRINT(&sign, 1);
-		} else if (flags & HEXPREFIX) {
-			ox[0] = '0';
-			ox[1] = ch;
-			PRINT(ox, 2);
-		}
-
-		/* right-adjusting zero padding */
-		if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD)
-			PAD(width - realsz, zeroes);
-
-		/* leading zeroes from decimal precision */
-		PAD(dprec - size, zeroes);
-
-		/* the string or number proper */
-#ifdef FLOATING_POINT
-		if ((flags & FPT) == 0) {
-#ifdef __SPE__
-		        if (flags & FIXEDPOINT) {
-				if (_uquad == 0 && !sign) {
-					/* kludge for __dtoa irregularity */
-					PRINT("0", 1);
-					if (expt < ndig || (flags & ALT) != 0) {
-						PRINT(decimal_point, 1);
-						PAD(ndig - 1, zeroes);
-					}
-				} else if (expt <= 0) {
-					PRINT("0", 1);
-					if(expt || ndig) {
-						PRINT(decimal_point, 1);
-						PAD(-expt, zeroes);
-						PRINT(cp, ndig);
-					}
-				} else if (expt >= ndig) {
-					PRINT(cp, ndig);
-					PAD(expt - ndig, zeroes);
-					if (flags & ALT)
-						PRINT(".", 1);
-				} else {
-					PRINT(cp, expt);
-					cp += expt;
-					PRINT(".", 1);
-					PRINT(cp, ndig-expt);
-				}
-		        } else
-#endif /* __SPE__ */
- 			        PRINT(cp, size);
-		} else {	/* glue together f_p fragments */
-			if (ch >= 'f') {	/* 'f' or 'g' */
-				if (_fpvalue == 0) {
-					/* kludge for __dtoa irregularity */
-					PRINT("0", 1);
-					if (expt < ndig || (flags & ALT) != 0) {
-						PRINT(decimal_point, 1);
-						PAD(ndig - 1, zeroes);
-					}
-				} else if (expt <= 0) {
-					PRINT("0", 1);
-					if(expt || ndig) {
-						PRINT(decimal_point, 1);
-						PAD(-expt, zeroes);
-						PRINT(cp, ndig);
-					}
-				} else if (expt >= ndig) {
-					PRINT(cp, ndig);
-					PAD(expt - ndig, zeroes);
-					if (flags & ALT)
-						PRINT(".", 1);
-				} else {
-					PRINT(cp, expt);
-					cp += expt;
-					PRINT(".", 1);
-					PRINT(cp, ndig-expt);
-				}
-			} else {	/* 'e' or 'E' */
-				if (ndig > 1 || flags & ALT) {
-					ox[0] = *cp++;
-					ox[1] = '.';
-					PRINT(ox, 2);
-                                       if (_fpvalue) {
-						PRINT(cp, ndig-1);
-					} else	/* 0.[0..] */
-						/* __dtoa irregularity */
-						PAD(ndig - 1, zeroes);
-				} else	/* XeYYY */
-					PRINT(cp, 1);
-				PRINT(expstr, expsize);
-			}
-		}
-#else
-		PRINT(cp, size);
-#endif
-		/* left-adjusting padding (always blank) */
-		if (flags & LADJUST)
-			PAD(width - realsz, blanks);
-
-		/* finally, adjust ret */
-		ret += width > realsz ? width : realsz;
-
-#ifdef __ALTIVEC__		
-		if ((flags & VECTOR) && vec_print_count-- > 1)
-		  {
-		    /* add vector separator */
-		    if (ch != 'c' || vec_sep != ' ')
-		      {
-		        PRINT(&vec_sep, 1);
-		        ret += 1;
-		      }
-		    FLUSH();
-		    sign = old_sign;
-		    ch = old_ch;
-		    goto reswitch;
-		  }
-#endif /* __ALTIVEC__ */
-		FLUSH();	/* copy out the I/O vectors */
-	}
-done:
-	FLUSH();
-error:
-	return (__sferror(fp) ? EOF : ret);
-	/* NOTREACHED */
-}
-
-#ifdef FLOATING_POINT
-
-#ifdef _NO_LONGDBL
-extern char *_dtoa_r _PARAMS((struct _reent *, double, int,
-			      int, int *, int *, char **));
-#else
-extern char *_ldtoa_r _PARAMS((struct _reent *, _LONG_DOUBLE, int,
-			      int, int *, int *, char **));
-#undef word0
-#define word0(x) ldword0(x)
-#endif
-
-static char *
-cvt(data, value, ndigits, flags, sign, decpt, ch, length)
-	struct _reent *data;
-#ifdef _NO_LONGDBL
-	double value;
-#else
-	_LONG_DOUBLE value;
-#endif
-	int ndigits, flags, *decpt, ch, *length;
-	char *sign;
-{
-	int mode, dsgn;
-	char *digits, *bp, *rve;
-#ifdef _NO_LONGDBL
-        union double_union tmp;
-#else
-        struct ldieee *ldptr;
-#endif
-
-	if (ch == 'f') {
-		mode = 3;		/* ndigits after the decimal point */
-	} else {
-		/* To obtain ndigits after the decimal point for the 'e' 
-		 * and 'E' formats, round to ndigits + 1 significant 
-		 * figures.
-		 */
-		if (ch == 'e' || ch == 'E') {
-			ndigits++;
-		}
-		mode = 2;		/* ndigits significant digits */
-	}
-
-#ifdef _NO_LONGDBL
-        tmp.d = value;
-
-	if (word0(tmp) & Sign_bit) { /* this will check for < 0 and -0.0 */
-		value = -value;
-		*sign = '-';
-        } else
-		*sign = '\000';
-
-	digits = _dtoa_r(data, value, mode, ndigits, decpt, &dsgn, &rve);
-#else /* !_NO_LONGDBL */
-	ldptr = (struct ldieee *)&value;
-	if (ldptr->sign) { /* this will check for < 0 and -0.0 */
-		value = -value;
-		*sign = '-';
-        } else
-		*sign = '\000';
-
-	digits = _ldtoa_r(data, value, mode, ndigits, decpt, &dsgn, &rve);
-#endif /* !_NO_LONGDBL */
-
-	if ((ch != 'g' && ch != 'G') || flags & ALT) {	/* Print trailing zeros */
-		bp = digits + ndigits;
-		if (ch == 'f') {
-			if (*digits == '0' && value)
-				*decpt = -ndigits + 1;
-			bp += *decpt;
-		}
-		if (value == 0)	/* kludge for __dtoa irregularity */
-			rve = bp;
-		while (rve < bp)
-			*rve++ = '0';
-	}
-	*length = rve - digits;
-	return (digits);
-}
-
-static int
-exponent(p0, exp, fmtch)
-	char *p0;
-	int exp, fmtch;
-{
-	register char *p, *t;
-	char expbuf[40];
-
-	p = p0;
-	*p++ = fmtch;
-	if (exp < 0) {
-		exp = -exp;
-		*p++ = '-';
-	}
-	else
-		*p++ = '+';
-	t = expbuf + 40;
-	if (exp > 9) {
-		do {
-			*--t = to_char(exp % 10);
-		} while ((exp /= 10) > 9);
-		*--t = to_char(exp);
-		for (; t < expbuf + 40; *p++ = *t++);
-	}
-	else {
-		*p++ = '0';
-		*p++ = to_char(exp);
-	}
-	return (p - p0);
-}
-#endif /* FLOATING_POINT */
-
-#ifdef __SPE__
-extern char *_ufix64toa_r _PARAMS((struct _reent *, unsigned long long, int,
-			           int, int *, int *, char **));
-static char *
-cvt_ufix64 (data, value, ndigits, decpt, length)
-	struct _reent *data;
-	unsigned long long value;
-	int ndigits, *decpt, *length;
-{
-	int dsgn;
-	char *digits, *bp, *rve;
-
-	/* treat the same as %f format and use mode=3 */
-	digits = _ufix64toa_r (data, value, 3, ndigits, decpt, &dsgn, &rve);
-
-        /* print trailing zeroes */
-	bp = digits + ndigits;
-	if (*digits == '0' && value)
-	  *decpt = -ndigits + 1;
-	bp += *decpt;
-	if (value == 0)	/* kludge for __dtoa irregularity */
-	  rve = bp;
-	while (rve < bp)
-	  *rve++ = '0';
-	*length = rve - digits;
-	return (digits);
-}
-#endif /* __SPE__ */
diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
deleted file mode 100644
index 47b0d1c..0000000
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ /dev/null
@@ -1,1262 +0,0 @@
-/*
-FUNCTION
-<<vscanf>>, <<vfscanf>>, <<vsscanf>>---format argument list
-
-INDEX
-	vscanf
-INDEX
-	vfscanf
-INDEX
-	vsscanf
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	#include <stdarg.h>
-	int vscanf(const char *<[fmt]>, va_list <[list]>);
-	int vfscanf(FILE *<[fp]>, const char *<[fmt]>, va_list <[list]>);
-	int vsscanf(const char *<[str]>, const char *<[fmt]>, va_list <[list]>);
-
-	int _vscanf_r(void *<[reent]>, const char *<[fmt]>, 
-                       va_list <[list]>);
-	int _vfscanf_r(void *<[reent]>, FILE *<[fp]>, const char *<[fmt]>, 
-                       va_list <[list]>);
-	int _vsscanf_r(void *<[reent]>, const char *<[str]>, const char *<[fmt]>, 
-                       va_list <[list]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	#include <varargs.h>
-	int vscanf( <[fmt]>, <[ist]>)
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vfscanf( <[fp]>, <[fmt]>, <[list]>)
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-	
-	int vsscanf( <[str]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vscanf_r( <[reent]>, <[fmt]>, <[ist]>)
-	char *<[reent]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vfscanf_r( <[reent]>, <[fp]>, <[fmt]>, <[list]>)
-	char *<[reent]>;
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-	
-	int _vsscanf_r( <[reent]>, <[str]>, <[fmt]>, <[list]>)
-	char *<[reent]>;
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-DESCRIPTION
-<<vscanf>>, <<vfscanf>>, and <<vsscanf>> are (respectively) variants
-of <<scanf>>, <<fscanf>>, and <<sscanf>>.  They differ only in 
-allowing their caller to pass the variable argument list as a 
-<<va_list>> object (initialized by <<va_start>>) rather than 
-directly accepting a variable number of arguments.
-
-RETURNS
-The return values are consistent with the corresponding functions:
-<<vscanf>> returns the number of input fields successfully scanned,
-converted, and stored; the return value does not include scanned
-fields which were not stored.  
-
-If <<vscanf>> attempts to read at end-of-file, the return value 
-is <<EOF>>.
-
-If no fields were stored, the return value is <<0>>.
-
-The routines <<_vscanf_r>>, <<_vfscanf_f>>, and <<_vsscanf_r>> are
-reentrant versions which take an additional first parameter which points to the
-reentrancy structure.
-
-PORTABILITY
-These are GNU extensions.
-
-Supporting OS subroutines required:
-*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <newlib.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <wchar.h>
-#include <string.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include "local.h"
-
-#ifndef	NO_FLOATING_POINT
-#define FLOATING_POINT
-#endif
-
-#ifdef FLOATING_POINT
-#include <float.h>
-
-/* Currently a test is made to see if long double processing is warranted.
-   This could be changed in the future should the _ldtoa_r code be
-   preferred over _dtoa_r.  */
-#define _NO_LONGDBL
-#if defined _WANT_IO_LONG_DOUBLE && (LDBL_MANT_DIG > DBL_MANT_DIG)
-#undef _NO_LONGDBL
-extern _LONG_DOUBLE _strtold _PARAMS((char *s, char **sptr));
-#endif
-
-#define _NO_LONGLONG
-#if defined _WANT_IO_LONG_LONG && defined __GNUC__
-# undef _NO_LONGLONG
-#endif
-
-#include "floatio.h"
-#define	BUF	(MAXEXP+MAXFRACT+3)	/* 3 = sign + decimal point + NUL */
-/* An upper bound for how long a long prints in decimal.  4 / 13 approximates
-   log (2).  Add one char for roundoff compensation and one for the sign.  */
-#define MAX_LONG_LEN ((CHAR_BIT * sizeof (long)  - 1) * 4 / 13 + 2)
-#else
-#define	BUF	40
-#endif
-
-/*
- * Flags used during conversion.
- */
-
-#define	LONG		0x01	/* l: long or double */
-#define	LONGDBL		0x02	/* L: long double or long long */
-#define	SHORT		0x04	/* h: short */
-#define	SUPPRESS	0x10	/* suppress assignment */
-#define	POINTER		0x20	/* weird %p pointer (`fake hex') */
-#define	NOSKIP		0x40	/* do not skip blanks */
-
-/*
- * The following are used in numeric conversions only:
- * SIGNOK, NDIGITS, DPTOK, and EXPOK are for floating point;
- * SIGNOK, NDIGITS, PFXOK, and NZDIGITS are for integral.
- */
-
-#define	SIGNOK		0x80	/* +/- is (still) legal */
-#define	NDIGITS		0x100	/* no digits detected */
-
-#define	DPTOK		0x200	/* (float) decimal point is still legal */
-#define	EXPOK		0x400	/* (float) exponent (e+3, etc) still legal */
-
-#define	PFXOK		0x200	/* 0x prefix is (still) legal */
-#define	NZDIGITS	0x400	/* no zero digits detected */
-#define	NNZDIGITS	0x800	/* no non-zero digits detected */
-
-#define	VECTOR		0x2000	/* v: vector */
-#define	FIXEDPOINT	0x4000	/* r/R: fixed-point */
-#define	SIGNED  	0x8000	/* r: signed fixed-point */
-
-/*
- * Conversion types.
- */
-
-#define	CT_CHAR		0	/* %c conversion */
-#define	CT_CCL		1	/* %[...] conversion */
-#define	CT_STRING	2	/* %s conversion */
-#define	CT_INT		3	/* integer, i.e., strtol or strtoul */
-#define	CT_FLOAT	4	/* floating, i.e., strtod */
-
-#if 0
-#define u_char unsigned char
-#endif
-#define u_char char
-#define u_long unsigned long
-
-#ifndef _NO_LONGLONG
-typedef unsigned long long u_long_long;
-#endif
-
-typedef union
-{
-  char c[16] __attribute__ ((__aligned__ (16)));
-  short h[8];
-  long l[4];
-  int i[4];
-  float f[4];
-} vec_union;
-
-/*static*/ u_char *__sccl ();
-
-/*
- * vfscanf
- */
-
-#define BufferEmpty (fp->_r <= 0 && __srefill(fp))
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN (vfscanf, (fp, fmt, ap), 
-    register FILE *fp _AND 
-    _CONST char *fmt _AND 
-    va_list ap)
-{
-  CHECK_INIT(_REENT);
-  return __svfscanf_r (_REENT, fp, fmt, ap);
-}
-
-int
-__svfscanf (fp, fmt0, ap)
-     register FILE *fp;
-     char _CONST *fmt0;
-     va_list ap;
-{
-  return __svfscanf_r (_REENT, fp, fmt0, ap);
-}
-
-#endif /* !_REENT_ONLY */
-
-int
-_DEFUN (_vfscanf_r, (data, fp, fmt, ap),
-    struct _reent *data _AND 
-    register FILE *fp _AND 
-    _CONST char *fmt _AND 
-    va_list ap)
-{
-  return __svfscanf_r (data, fp, fmt, ap);
-}
-
-
-int
-__svfscanf_r (rptr, fp, fmt0, ap)
-     struct _reent *rptr;
-     register FILE *fp;
-     char _CONST *fmt0;
-     va_list ap;
-{
-  register u_char *fmt = (u_char *) fmt0;
-  register int c;		/* character from format, or conversion */
-  register int type;		/* conversion type */
-  register size_t width;	/* field width, or 0 */
-  register char *p;		/* points into all kinds of strings */
-  register int n;		/* handy integer */
-  register int flags;		/* flags as defined above */
-  register char *p0;		/* saves original value of p when necessary */
-  int orig_flags;               /* saved flags used when processing vector */
-  int int_width;                /* tmp area to store width when processing int */
-  int nassigned;		/* number of fields assigned */
-  int nread;			/* number of characters consumed from fp */
-  int base = 0;			/* base argument to strtol/strtoul */
-  int nbytes = 1;               /* number of bytes read from fmt string */
-  wchar_t wc;                   /* wchar to use to read format string */
-  char vec_sep;                 /* vector separator char */
-  char last_space_char;         /* last white-space char eaten - needed for vec support */
-  int vec_read_count;           /* number of vector items to read separately */
-  int looped;                   /* has vector processing looped */
-  u_long (*ccfn) () = 0;	/* conversion function (strtol/strtoul) */
-  char ccltab[256];		/* character class table for %[...] */
-  char buf[BUF];		/* buffer for numeric conversions */
-  vec_union vec_buf;
-  char *lptr;                   /* literal pointer */
-#ifdef _MB_CAPABLE
-  mbstate_t state;                /* value to keep track of multibyte state */
-#endif
-
-  char *ch_dest;
-  short *sp;
-  int *ip;
-  float *flp;
-  _LONG_DOUBLE *ldp;
-  double *dp;
-  long *lp;
-#ifndef _NO_LONGLONG
-  long long *llp;
-#else
-	u_long _uquad;
-#endif
-
-  /* `basefix' is used to avoid `if' tests in the integer scanner */
-  static _CONST short basefix[17] =
-    {10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-
-  nassigned = 0;
-  nread = 0;
-  for (;;)
-    {
-#ifndef _MB_CAPABLE
-      wc = *fmt;
-#else
-      memset (&state, '\0', sizeof (state));
-      nbytes = _mbtowc_r (rptr, &wc, fmt, MB_CUR_MAX, &state);
-#endif
-      fmt += nbytes;
-      if (wc == 0)
-	return nassigned;
-      if (nbytes == 1 && isspace (wc))
-	{
-	  for (;;)
-	    {
-	      if (BufferEmpty)
-		return nassigned;
-	      if (!isspace (*fp->_p))
-		break;
-	      nread++, fp->_r--, fp->_p++;
-	    }
-	  continue;
-	}
-      if (wc != '%')
-	goto literal;
-      width = 0;
-      flags = 0;
-      vec_sep = ' ';
-      vec_read_count = 0;
-      looped = 0;
-
-      /*
-       * switch on the format.  continue if done; break once format
-       * type is derived.
-       */
-
-    again:
-      c = *fmt++;
-
-      switch (c)
-	{
-	case '%':
-	literal:
-          lptr = fmt - nbytes;
-          for (n = 0; n < nbytes; ++n)
-            {
-	      if (BufferEmpty)
-	        goto input_failure;
-	      if (*fp->_p != *lptr)
-	        goto match_failure;
-	      fp->_r--, fp->_p++;
-	      nread++;
-              ++lptr;
-            }
-	  continue;
-
-	case '*':
-	  flags |= SUPPRESS;
-	  goto again;
-	case ',':
-	case ';':
-	case ':':
-	case '_':
-	  if (flags == SUPPRESS || flags == 0)
-	    vec_sep = c;
-	  goto again;
-	case 'l':
-	  if (flags & SHORT)
-	    continue; /* invalid format, don't process any further */
-	  if (flags & LONG)
-	    {
-	      flags &= ~LONG;
-	      flags &= ~VECTOR;
-	      flags |= LONGDBL;
-	    }
-	  else
-	    {
-	      flags |= LONG;
-	      if (flags & VECTOR)
-		vec_read_count = 4;
-	    }
-	  goto again;
-	case 'L':
-	  flags |= LONGDBL;
-	  flags &= ~VECTOR;
-	  goto again;
-	case 'h':
-	  flags |= SHORT;
-	  if (flags & LONG)
-	    continue;  /* invalid format, don't process any further */
-	  if (flags & VECTOR)
-	    vec_read_count = 8;
-	  goto again;
-#ifdef __ALTIVEC__
-	case 'v':
-	  flags |= VECTOR;
-	  vec_read_count = (flags & SHORT) ? 8 : ((flags & LONG) ? 4 : 16);
-	  goto again;
-#endif
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	  width = width * 10 + c - '0';
-	  goto again;
-
-	  /*
-	   * Conversions. Those marked `compat' are for
-	   * 4.[123]BSD compatibility.
-	   *
-	   * (According to ANSI, E and X formats are supposed to
-	   * the same as e and x.  Sorry about that.)
-	   */
-
-	case 'D':		/* compat */
-	  flags |= LONG;
-	  /* FALLTHROUGH */
-	case 'd':
-	  type = CT_INT;
-	  ccfn = (u_long (*)())_strtol_r;
-	  base = 10;
-	  break;
-
-	case 'i':
-	  type = CT_INT;
-	  ccfn = (u_long (*)())_strtol_r;
-	  base = 0;
-	  break;
-
-	case 'O':		/* compat */
-	  flags |= LONG;
-	  /* FALLTHROUGH */
-	case 'o':
-	  type = CT_INT;
-	  ccfn = _strtoul_r;
-	  base = 8;
-	  break;
-
-	case 'u':
-	  type = CT_INT;
-	  ccfn = _strtoul_r;
-	  base = 10;
-	  break;
-
-	case 'X':		/* compat   XXX */
-	case 'x':
-	  flags |= PFXOK;	/* enable 0x prefixing */
-	  type = CT_INT;
-	  ccfn = _strtoul_r;
-	  base = 16;
-	  break;
-
-#ifdef FLOATING_POINT
-	case 'E':		/* compat   XXX */
-	case 'G':		/* compat   XXX */
-/* ANSI says that E,G and X behave the same way as e,g,x */
-	  /* FALLTHROUGH */
-	case 'e':
-	case 'f':
-	case 'g':
-	  type = CT_FLOAT;
-	  if (flags & VECTOR)
-	    vec_read_count = 4;
-	  break;
-       
-# ifdef __SPE__
-	  /* treat fixed-point like %f floating point */
-        case 'r':
-	  flags |= SIGNED;
-	  /* fallthrough */
-        case 'R':
-          flags |= FIXEDPOINT;
-	  type = CT_FLOAT;
-          break;
-# endif
-#endif
-
-	case 's':
-	  flags &= ~VECTOR;
-	  type = CT_STRING;
-	  break;
-
-	case '[':
-	  fmt = __sccl (ccltab, fmt);
-	  flags |= NOSKIP;
-	  flags &= ~VECTOR;
-	  type = CT_CCL;
-	  break;
-
-	case 'c':
-	  flags |= NOSKIP;
-	  type = CT_CHAR;
-	  if (flags & VECTOR)
-	    {
-	      /* not allowed to have h or l with c specifier */
-	      if (flags & (LONG | SHORT))
-		continue;  /* invalid format don't process any further */
-	      width = 0;
-	      vec_read_count = 16;
-	    }
-	  break;
-
-	case 'p':		/* pointer format is like hex */
-	  flags |= POINTER | PFXOK;
-	  type = CT_INT;
-	  ccfn = _strtoul_r;
-	  base = 16;
-	  break;
-
-	case 'n':
-	  if (flags & SUPPRESS)	/* ??? */
-	    continue;
-	  flags &= ~VECTOR;
-	  if (flags & SHORT)
-	    {
-	      sp = va_arg (ap, short *);
-	      *sp = nread;
-	    }
-	  else if (flags & LONG)
-	    {
-	      lp = va_arg (ap, long *);
-	      *lp = nread;
-	    }
-#ifndef _NO_LONGLONG
-	  else if (flags & LONGDBL)
-	    {
-	      llp = va_arg (ap, long long*);
-	      *llp = nread;
-	    }
-#endif
-	  else
-	    {
-	      ip = va_arg (ap, int *);
-	      *ip = nread;
-	    }
-	  continue;
-
-	  /*
-	   * Disgusting backwards compatibility hacks.	XXX
-	   */
-	case '\0':		/* compat */
-	  return EOF;
-
-	default:		/* compat */
-	  if (isupper (c))
-	    flags |= LONG;
-	  type = CT_INT;
-	  ccfn = (u_long (*)())_strtol_r;
-	  base = 10;
-	  break;
-	}
-
-    process:
-      /*
-       * We have a conversion that requires input.
-       */
-      if (BufferEmpty)
-	goto input_failure;
-
-      /*
-       * Consume leading white space, except for formats that
-       * suppress this.
-       */
-      last_space_char = '\0';
-
-      if ((flags & NOSKIP) == 0)
-	{
-	  while (isspace (*fp->_p))
-	    {
-	      last_space_char = *fp->_p;
-	      nread++;
-	      if (--fp->_r > 0)
-		fp->_p++;
-	      else
-#ifndef CYGNUS_NEC
-	      if (__srefill (fp))
-#endif
-		goto input_failure;
-	    }
-	  /*
-	   * Note that there is at least one character in the
-	   * buffer, so conversions that do not set NOSKIP ca
-	   * no longer result in an input failure.
-	   */
-	}
-
-      /* for vector formats process separator characters after first loop */
-      if (looped && (flags & VECTOR))
-	{
-	  flags = orig_flags; 
-	  /* all formats other than default char have a separator char */
-	  if (vec_sep != ' ' || type != CT_CHAR)
-	    {
-	      if (vec_sep == ' ' && last_space_char != ' ' ||
-		  vec_sep != ' ' && *fp->_p != vec_sep)
-		goto match_failure;
-	      if (vec_sep != ' ')
-		{
-		  nread++;
-		  if (--fp->_r > 0)
-		    fp->_p++;
-		  else
-#ifndef CYGNUS_NEC
-		    if (__srefill (fp))
-#endif
-		      goto input_failure;
-		}
-	    }
-	  /* after eating the separator char, we must eat any white-space
-	     after the separator char that precedes the data to convert */
-	  if ((flags & NOSKIP) == 0)
-	    {
-	      while (isspace (*fp->_p))
-		{
-		  last_space_char = *fp->_p;
-		  nread++;
-		  if (--fp->_r > 0)
-		    fp->_p++;
-		  else
-#ifndef CYGNUS_NEC
-		    if (__srefill (fp))
-#endif
-		      goto input_failure;
-		}
-	    }
-
- 	}
-      else /* save to counter-act changes made to flags when processing */
-	orig_flags = flags;
-
-      /*
-       * Do the conversion.
-       */
-      switch (type)
-	{
-
-	case CT_CHAR:
-	  /* scan arbitrary characters (sets NOSKIP) */
-	  if (width == 0)
-	    width = 1;
-	  if (flags & SUPPRESS)
-	    {
-	      size_t sum = 0;
-
-	      for (;;)
-		{
-		  if ((n = fp->_r) < (int)width)
-		    {
-		      sum += n;
-		      width -= n;
-		      fp->_p += n;
-#ifndef CYGNUS_NEC
-		      if (__srefill (fp))
-			{
-#endif
-			  if (sum == 0)
-			    goto input_failure;
-			  break;
-#ifndef CYGNUS_NEC
-			}
-#endif
-		    }
-		  else
-		    {
-		      sum += width;
-		      fp->_r -= width;
-		      fp->_p += width;
-		      break;
-		    }
-		}
-	      nread += sum;
-	    }
-	  else
-	    {
-	      int n = width;
-	      if (!looped)
-		{
-		  if (flags & VECTOR)
-		    ch_dest = vec_buf.c;
-		  else
-		    ch_dest = va_arg (ap, char *);
-		}
-#ifdef CYGNUS_NEC
-	      /* Kludge city for the moment */
-	      if (fp->_r == 0)
-		goto input_failure;
-
-	      while (n && fp->_r)
-		{
-		  *ch_dest++ = *(fp->_p++);
-		  n--;
-		  fp->_r--;
-		  nread++;
-		}
-#else
-	      size_t r = fread (ch_dest, 1, width, fp);
-
-	      if (r == 0)
-		goto input_failure;
-	      nread += r;
-	      ch_dest += r;
-#endif
-	      if (!(flags & VECTOR))
-		nassigned++;
-	    }
-	  break;
-
-	case CT_CCL:
-	  /* scan a (nonempty) character class (sets NOSKIP) */
-	  if (width == 0)
-	    width = ~0;		/* `infinity' */
-	  /* take only those things in the class */
-	  if (flags & SUPPRESS)
-	    {
-	      n = 0;
-	      while (ccltab[*fp->_p])
-		{
-		  n++, fp->_r--, fp->_p++;
-		  if (--width == 0)
-		    break;
-		  if (BufferEmpty)
-		    {
-		      if (n == 0)
-			goto input_failure;
-		      break;
-		    }
-		}
-	      if (n == 0)
-		goto match_failure;
-	    }
-	  else
-	    {
-	      p0 = p = va_arg (ap, char *);
-	      while (ccltab[*fp->_p])
-		{
-		  fp->_r--;
-		  *p++ = *fp->_p++;
-		  if (--width == 0)
-		    break;
-		  if (BufferEmpty)
-		    {
-		      if (p == p0)
-			goto input_failure;
-		      break;
-		    }
-		}
-	      n = p - p0;
-	      if (n == 0)
-		goto match_failure;
-	      *p = 0;
-	      nassigned++;
-	    }
-	  nread += n;
-	  break;
-
-	case CT_STRING:
-	  /* like CCL, but zero-length string OK, & no NOSKIP */
-	  if (width == 0)
-	    width = ~0;
-	  if (flags & SUPPRESS)
-	    {
-	      n = 0;
-	      while (!isspace (*fp->_p))
-		{
-		  n++, fp->_r--, fp->_p++;
-		  if (--width == 0)
-		    break;
-		  if (BufferEmpty)
-		    break;
-		}
-	      nread += n;
-	    }
-	  else
-	    {
-	      p0 = p = va_arg (ap, char *);
-	      while (!isspace (*fp->_p))
-		{
-		  fp->_r--;
-		  *p++ = *fp->_p++;
-		  if (--width == 0)
-		    break;
-		  if (BufferEmpty)
-		    break;
-		}
-	      *p = 0;
-	      nread += p - p0;
-	      nassigned++;
-	    }
-	  continue;
-
-	case CT_INT:
-	  {
-	  unsigned int_width_left = 0;
-	  int skips = 0;
-	  int_width = width;
-#ifdef hardway
-	  if (int_width == 0 || int_width > sizeof (buf) - 1)
-#else
-	  /* size_t is unsigned, hence this optimisation */
-	  if (int_width - 1 > sizeof (buf) - 2)
-#endif
-	    {
-	      int_width_left = width - (sizeof (buf) - 1);
-	      int_width = sizeof (buf) - 1;
-	    }
-	  flags |= SIGNOK | NDIGITS | NZDIGITS | NNZDIGITS;
-	  for (p = buf; int_width; int_width--)
-	    {
-	      c = *fp->_p;
-	      /*
-	       * Switch on the character; `goto ok' if we
-	       * accept it as a part of number.
-	       */
-	      switch (c)
-		{
-		  /*
-		   * The digit 0 is always legal, but is special.
-		   * For %i conversions, if no digits (zero or nonzero)
-		   * have been scanned (only signs), we will have base==0.
-		   * In that case, we should set it to 8 and enable 0x
-		   * prefixing. Also, if we have not scanned zero digits
-		   * before this, do not turn off prefixing (someone else
-		   * will turn it off if we have scanned any nonzero digits).
-		   */
-		case '0':
-		  if (! (flags & NNZDIGITS))
-		    goto ok;
-		  if (base == 0)
-		    {
-		      base = 8;
-		      flags |= PFXOK;
-		    }
-		  if (flags & NZDIGITS)
-		    {
-		      flags &= ~(SIGNOK | NZDIGITS | NDIGITS);
-		      goto ok;
-		    }
-		  flags &= ~(SIGNOK | PFXOK | NDIGITS);
-		  if (int_width_left)
-		    {
-		      int_width_left--;
-		      int_width++;
-		    }
-		  ++skips;
-		  goto skip;
-
-		  /* 1 through 7 always legal */
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		  base = basefix[base];
-		  flags &= ~(SIGNOK | PFXOK | NDIGITS | NNZDIGITS);
-		  goto ok;
-
-		  /* digits 8 and 9 ok iff decimal or hex */
-		case '8':
-		case '9':
-		  base = basefix[base];
-		  if (base <= 8)
-		    break;	/* not legal here */
-		  flags &= ~(SIGNOK | PFXOK | NDIGITS | NNZDIGITS);
-		  goto ok;
-
-		  /* letters ok iff hex */
-		case 'A':
-		case 'B':
-		case 'C':
-		case 'D':
-		case 'E':
-		case 'F':
-		case 'a':
-		case 'b':
-		case 'c':
-		case 'd':
-		case 'e':
-		case 'f':
-		  /* no need to fix base here */
-		  if (base <= 10)
-		    break;	/* not legal here */
-		  flags &= ~(SIGNOK | PFXOK | NDIGITS | NNZDIGITS);
-		  goto ok;
-
-		  /* sign ok only as first character */
-		case '+':
-		case '-':
-		  if (flags & SIGNOK)
-		    {
-		      flags &= ~SIGNOK;
-		      goto ok;
-		    }
-		  break;
-
-		  /* x ok iff flag still set & 2nd char */
-		case 'x':
-		case 'X':
-		  if (flags & PFXOK && p == buf + 1)
-		    {
-		      base = 16;/* if %i */
-		      flags &= ~PFXOK;
-		      /* We must reset the NZDIGITS and NDIGITS
-		         flags that would have been unset by seeing
-		         the zero that preceded the X or x.  */
-		      flags |= NZDIGITS | NDIGITS;
-		      goto ok;
-		    }
-		  break;
-		}
-
-	      /*
-	       * If we got here, c is not a legal character
-	       * for a number.  Stop accumulating digits.
-	       */
-	      break;
-	    ok:
-	      /*
-	       * c is legal: store it and look at the next.
-	       */
-	      *p++ = c;
-	    skip:
-	      if (--fp->_r > 0)
-		fp->_p++;
-	      else
-#ifndef CYGNUS_NEC
-	      if (__srefill (fp))
-#endif
-		break;		/* EOF */
-	    }
-	  /*
-	   * If we had only a sign, it is no good; push back the sign.
-	   * If the number ends in `x', it was [sign] '0' 'x', so push back
-	   * the x and treat it as [sign] '0'.
-	   */
-	  if (flags & NDIGITS)
-	    {
-	      if (p > buf)
-		_CAST_VOID ungetc (*(u_char *)-- p, fp);
-	      goto match_failure;
-	    }
-	  c = ((u_char *) p)[-1];
-	  if (c == 'x' || c == 'X')
-	    {
-	      --p;
-	      /*(void)*/ ungetc (c, fp);
-	    }
-	  if ((flags & SUPPRESS) == 0)
-	    {
-	      u_long res;
-
-	      *p = 0;
-	      res = (*ccfn) (rptr, buf, (char **) NULL, base);
-	      if ((flags & POINTER) && !(flags & VECTOR))
-		*(va_arg (ap, _PTR *)) = (_PTR) (unsigned _POINTER_INT) res;
-	      else if (flags & SHORT)
-		{
-		  if (!(flags & VECTOR))
-		    sp = va_arg (ap, short *);
-		  else if (!looped)
-		    sp = vec_buf.h;
-		  *sp++ = res;
-		}
-	      else if (flags & LONG)
-		{
-		  if (!(flags & VECTOR))
-		    lp = va_arg (ap, long *);
-		  else if (!looped)
-		    lp = vec_buf.l;
-		  *lp++ = res;
-		}
-#ifndef _NO_LONGLONG
-	      else if (flags & LONGDBL)
-		{
-		  u_long_long resll;
-		  if (ccfn == _strtoul_r)
-		    resll = _strtoull_r (rptr, buf, (char **) NULL, base);
-		  else
-		    resll = _strtoll_r (rptr, buf, (char **) NULL, base);
-		  llp = va_arg (ap, long long*);
-		  *llp = resll;
-		}
-#endif
-	      else
-		{
-		  if (!(flags & VECTOR))
-		    {
-		      ip = va_arg (ap, int *);
-		      *ip++ = res;
-		    }
-		  else
-		    {
-		      if (!looped)
-			ch_dest = vec_buf.c;
-		      *ch_dest++ = (char)res;
-		    }
-		}
-	      if (!(flags & VECTOR))
-		nassigned++;
-	    }
-	  nread += p - buf + skips;
-	  break;
-	  }
-
-#ifdef FLOATING_POINT
-	case CT_FLOAT:
-	{
-	  /* scan a floating point number as if by strtod */
-	  /* This code used to assume that the number of digits is reasonable.
-	     However, ANSI / ISO C makes no such stipulation; we have to get
-	     exact results even when there is an unreasonable amount of
-	     leading zeroes.  */
-	  long leading_zeroes = 0;
-	  long zeroes, exp_adjust;
-	  char *exp_start = NULL;
-	  unsigned fl_width = width;
-	  unsigned width_left = 0;
-#ifdef hardway
-	  if (fl_width == 0 || fl_width > sizeof (buf) - 1)
-#else
-	  /* size_t is unsigned, hence this optimisation */
-	  if (fl_width - 1 > sizeof (buf) - 2)
-#endif
-	    {
-	      width_left = fl_width - (sizeof (buf) - 1);
-	      fl_width = sizeof (buf) - 1;
-	    }
-	  flags |= SIGNOK | NDIGITS | DPTOK | EXPOK;
-	  zeroes = 0;
-	  exp_adjust = 0;
-	  for (p = buf; fl_width; )
-	    {
-	      c = *fp->_p;
-	      /*
-	       * This code mimicks the integer conversion
-	       * code, but is much simpler.
-	       */
-	      switch (c)
-		{
-
-		case '0':
-		  if (flags & NDIGITS)
-		    {
-		      flags &= ~SIGNOK;
-		      zeroes++;
-		      if (width_left)
-			{
-			  width_left--;
-			  fl_width++;
-			}
-		      goto fskip;
-		    }
-		  /* Fall through.  */
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':
-		  flags &= ~(SIGNOK | NDIGITS);
-		  goto fok;
-
-		case '+':
-		case '-':
-		  if (flags & SIGNOK)
-		    {
-		      flags &= ~SIGNOK;
-		      goto fok;
-		    }
-		  break;
-		case '.':
-		  if (flags & DPTOK)
-		    {
-		      flags &= ~(SIGNOK | DPTOK);
-		      leading_zeroes = zeroes;
-		      goto fok;
-		    }
-		  break;
-		case 'e':
-		case 'E':
-		  /* no exponent without some digits */
-		  if ((flags & (NDIGITS | EXPOK)) == EXPOK
-		      || ((flags & EXPOK) && zeroes))
-		    {
-		      if (! (flags & DPTOK))
-			{
-			  exp_adjust = zeroes - leading_zeroes;
-			  exp_start = p;
-			}
-		      flags =
-			(flags & ~(EXPOK | DPTOK)) |
-			SIGNOK | NDIGITS;
-		      zeroes = 0;
-		      goto fok;
-		    }
-		  break;
-		}
-	      break;
-	    fok:
-	      *p++ = c;
-	    fskip:
-	      fl_width--;
-              ++nread;
-	      if (--fp->_r > 0)
-		fp->_p++;
-	      else
-#ifndef CYGNUS_NEC
-	      if (__srefill (fp))
-#endif
-		break;		/* EOF */
-	    }
-	  if (zeroes)
-	    flags &= ~NDIGITS;
-	  /*
-	   * If no digits, might be missing exponent digits
-	   * (just give back the exponent) or might be missing
-	   * regular digits, but had sign and/or decimal point.
-	   */
-	  if (flags & NDIGITS)
-	    {
-	      if (flags & EXPOK)
-		{
-		  /* no digits at all */
-		  while (p > buf)
-                    {
-		      ungetc (*(u_char *)-- p, fp);
-                      --nread;
-                    }
-		  goto match_failure;
-		}
-	      /* just a bad exponent (e and maybe sign) */
-	      c = *(u_char *)-- p;
-              --nread;
-	      if (c != 'e' && c != 'E')
-		{
-		  _CAST_VOID ungetc (c, fp);	/* sign */
-		  c = *(u_char *)-- p;
-                  --nread;
-		}
-	      _CAST_VOID ungetc (c, fp);
-	    }
-	  if ((flags & SUPPRESS) == 0)
-	    {
-#ifdef _NO_LONGDBL
-	      double res;
-#else  /* !_NO_LONG_DBL */
-	      long double res;
-#endif /* !_NO_LONG_DBL */
-	      long new_exp = 0;
-
-	      *p = 0;
-	      if ((flags & (DPTOK | EXPOK)) == EXPOK)
-		{
-		  exp_adjust = zeroes - leading_zeroes;
-		  new_exp = -exp_adjust;
-		  exp_start = p;
-		}
-	      else if (exp_adjust)
-                new_exp = _strtol_r (rptr, (exp_start + 1), NULL, 10) - exp_adjust;
-	      if (exp_adjust)
-		{
-
-		  /* If there might not be enough space for the new exponent,
-		     truncate some trailing digits to make room.  */
-		  if (exp_start >= buf + sizeof (buf) - MAX_LONG_LEN)
-		    exp_start = buf + sizeof (buf) - MAX_LONG_LEN - 1;
-                 sprintf (exp_start, "e%ld", new_exp);
-		}
-#ifdef __SPE__
-	      if (flags & FIXEDPOINT)
-		{
-		  __uint64_t ufix64;
-		  if (flags & SIGNED)
-		    ufix64 = (__uint64_t)_strtosfix64_r (rptr, buf, NULL);
-                  else
-		    ufix64 = _strtoufix64_r (rptr, buf, NULL);
-		  if (flags & SHORT)
-		    {
-		      __uint16_t *sp = va_arg (ap, __uint16_t *);
-		      *sp = (__uint16_t)(ufix64 >> 48);
-		    }
-		  else if (flags & LONG)
-		    {
-		      __uint64_t *llp = va_arg (ap, __uint64_t *);
-		      *llp = ufix64;
-		    }
-		  else
-		    {
-		      __uint32_t *lp = va_arg (ap, __uint32_t *);
-		      *lp = (__uint32_t)(ufix64 >> 32);
-		    }
-		  nassigned++;
-		  break;
-		}
-	      
-#endif /* __SPE__ */
-#ifdef _NO_LONGDBL
-	      res = _strtod_r (rptr, buf, NULL);
-#else  /* !_NO_LONGDBL */
-	      res = _strtold (buf, NULL);
-#endif /* !_NO_LONGDBL */
-	      if (flags & LONG)
-		{
-		  dp = va_arg (ap, double *);
-		  *dp = res;
-		}
-	      else if (flags & LONGDBL)
-		{
-		  ldp = va_arg (ap, _LONG_DOUBLE *);
-		  *ldp = res;
-		}
-	      else
-		{
-		  if (!(flags & VECTOR))
-		    flp = va_arg (ap, float *);
-		  else if (!looped)
-		    flp = vec_buf.f;
-		  *flp++ = res;
-		}
-	      if (!(flags & VECTOR))
-		nassigned++;
-	    }
-	  break;
-	}
-#endif /* FLOATING_POINT */
-	}
-      if (vec_read_count-- > 1)
-	{
-	  looped = 1;
-	  goto process;
-	}
-      if (flags & VECTOR)
-	{
-	  int i;
-	  unsigned long *vp = va_arg (ap, unsigned long *);
-	  for (i = 0; i < 4; ++i)
-	    *vp++ = vec_buf.l[i];
-	  nassigned++;
-	}
-    }
-input_failure:
-  return nassigned ? nassigned : -1;
-match_failure:
-  return nassigned;
-}
-
diff --git a/newlib/libc/machine/sh/Makefile.am b/newlib/libc/machine/sh/Makefile.am
index 14cd95a..1aab718 100644
--- a/newlib/libc/machine/sh/Makefile.am
+++ b/newlib/libc/machine/sh/Makefile.am
@@ -6,18 +6,13 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-if SH64
-lib_a_SOURCES = memcpy.S memset.S setjmp.S strcpy.S strlen.S strcmp.S strncpy.S
-else
-lib_a_SOURCES = memcpy.S memset.S setjmp.S strcpy.S strlen.S strcmp.S
-endif
+lib_a_SOURCES = memcpy.S memset.S setjmp.S strcpy.S strcmp.S
 
 memcpy.o: asm.h
 memset.o: asm.h
 setjmp.o: asm.h
 strcpy.o: asm.h
 strcmp.o: asm.h
-strncpy.o: asm.h
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/sh/Makefile.in b/newlib/libc/machine/sh/Makefile.in
index 619a905..5d4b826 100644
--- a/newlib/libc/machine/sh/Makefile.in
+++ b/newlib/libc/machine/sh/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -88,8 +83,8 @@ AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
-@SH64_TRUE@lib_a_SOURCES = memcpy.S memset.S setjmp.S strcpy.S strlen.S strcmp.S strncpy.S
-@SH64_FALSE@lib_a_SOURCES = memcpy.S memset.S setjmp.S strcpy.S strlen.S strcmp.S
+
+lib_a_SOURCES = memcpy.S memset.S setjmp.S strcpy.S strcmp.S
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@@ -103,10 +98,7 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-@SH64_FALSE@lib_a_OBJECTS =  memcpy.o memset.o setjmp.o strcpy.o \
-@SH64_FALSE@strlen.o strcmp.o
-@SH64_TRUE@lib_a_OBJECTS =  memcpy.o memset.o setjmp.o strcpy.o strlen.o \
-@SH64_TRUE@strcmp.o strncpy.o
+lib_a_OBJECTS =  memcpy.o memset.o setjmp.o strcpy.o strcmp.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -132,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -330,7 +321,6 @@ memset.o: asm.h
 setjmp.o: asm.h
 strcpy.o: asm.h
 strcmp.o: asm.h
-strncpy.o: asm.h
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/newlib/libc/machine/sh/aclocal.m4 b/newlib/libc/machine/sh/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/sh/aclocal.m4
+++ b/newlib/libc/machine/sh/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/sh/asm.h b/newlib/libc/machine/sh/asm.h
index db30b14..ed27fdb 100644
--- a/newlib/libc/machine/sh/asm.h
+++ b/newlib/libc/machine/sh/asm.h
@@ -5,26 +5,14 @@
 #endif
 #define _ASM_LABEL(x)   x
 
-#if __SH5__
-# if __SH5__ == 32 && __SHMEDIA__
-#  define TEXT .section .text..SHmedia32, "ax"
-# else
-#  define TEXT .text
-# endif
-
-# define _ENTRY(name)	\
-	TEXT; .balign 8; .globl name; name:
-#else
 #define _ENTRY(name)	\
 	.text; .align 2; .globl name; name:
-#endif /* __SH5__ */
 
 #define ENTRY(name)	\
 	_ENTRY(_C_LABEL(name))
 
-#if (defined (__sh2__) || defined (__SH2E__) || defined (__sh3__) || defined (__SH3E__) \
-     || defined (__SH4_SINGLE__) || defined (__SH4__)) \
-     || defined (__SH4_SINGLE_ONLY__) || defined (__SH5__) || defined (__SH2A__)
+#if (defined (__sh2__) || defined (__sh3__) || defined (__SH3E__) \
+     || defined (__SH4_SINGLE__) || defined (__SH4__)) || defined(__SH4_SINGLE_ONLY__)
 #define DELAYED_BRANCHES
 #define SL(branch, dest, in_slot, in_slot_arg2) \
 	branch##.s dest; in_slot, in_slot_arg2
@@ -32,11 +20,3 @@
 #define SL(branch, dest, in_slot, in_slot_arg2) \
 	in_slot, in_slot_arg2; branch dest
 #endif
-
-#ifdef __LITTLE_ENDIAN__
-#define SHHI shlld
-#define SHLO shlrd
-#else
-#define SHHI shlrd
-#define SHLO shlld
-#endif
diff --git a/newlib/libc/machine/sh/configure b/newlib/libc/machine/sh/configure
index 1eb7514..6d988d6 100755
--- a/newlib/libc/machine/sh/configure
+++ b/newlib/libc/machine/sh/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1568,115 +1425,6 @@ OBJEXT=${oext}
 
 
 
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1573: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1588 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1605 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1622 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-cat > conftest.$ac_ext <<EOF
-#line 1653 "configure"
-#include "confdefs.h"
-
-#if __SH5__
-  sh5
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "sh5" >/dev/null 2>&1; then
-  rm -rf conftest*
-  have_sh64=yes
-else
-  rm -rf conftest*
-  have_sh64=no
-fi
-rm -f conftest*
-
-
-
-if test $have_sh64 = yes; then
-  SH64_TRUE=
-  SH64_FALSE='#'
-else
-  SH64_TRUE='#'
-  SH64_FALSE=
-fi
-
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -1822,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1852,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1860,27 +1601,13 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
 s%@machine_dir@%$machine_dir%g
 s%@sys_dir@%$sys_dir%g
-s%@CPP@%$CPP%g
-s%@SH64_TRUE@%$SH64_TRUE%g
-s%@SH64_FALSE@%$SH64_FALSE%g
 
 CEOF
 EOF
@@ -1889,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/sh/configure.in b/newlib/libc/machine/sh/configure.in
index 7fb5afd..ffd2797 100644
--- a/newlib/libc/machine/sh/configure.in
+++ b/newlib/libc/machine/sh/configure.in
@@ -9,11 +9,4 @@ AC_CONFIG_AUX_DIR(../../../..)
 
 NEWLIB_CONFIGURE(../../..)
 
-AC_EGREP_CPP([sh5], [
-#if __SH5__
-  sh5
-#endif
-], [have_sh64=yes], [have_sh64=no])
-AM_CONDITIONAL(SH64, [test $have_sh64 = yes])
-
 AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/sh/memcpy.S b/newlib/libc/machine/sh/memcpy.S
index 56e6c6f..4df72e3 100644
--- a/newlib/libc/machine/sh/memcpy.S
+++ b/newlib/libc/machine/sh/memcpy.S
@@ -2,15 +2,14 @@
 ! Fast SH memcpy
 !
 ! by Toshiyasu Morita (tm@netcom.com)
-! hacked by J"orn Rernnecke (joern.rennecke@superh.com) ("o for o-umlaut)
-! SH5 code Copyright 2002 SuperH Ltd.
+! hacked by J"orn Rernnecke (amylaar@cygnus.co.uk) ("o for o-umlaut)
 !
-! Entry: ARG0: destination pointer
-!        ARG1: source pointer
-!        ARG3: byte count
+! Entry: r4: destination pointer
+!        r5: source pointer
+!        r6: byte count
 !
-! Exit:  RESULT: destination pointer
-!        any other registers in the range r0-r7: trashed
+! Exit:  r0: destination pointer
+!        r1-r7: trashed
 !
 ! Notes: Usually one wants to do small reads and write a longword, but
 !        unfortunately it is difficult in some cases to concatanate bytes
@@ -24,372 +23,199 @@
 !     be copied.  This could be easily swapped for a signed comparison,
 !     but the algorithm used needs some comparison.
 !
-! 2.: When there are two or three bytes in the last word of an 11-or-more
+! 2.: When there are two or three bytes in the last word of an 11-or-bore
 !     bytes memory chunk to b copied, the rest of the word can be read
-!     without side effects.
+!     without size effects.
 !     This could be easily changed by increasing the minumum size of
 !     a fast memcpy and the amount subtracted from r7 before L_2l_loop be 2,
 !     however, this would cost a few extra cyles on average.
-!     For SHmedia, the assumption is that any quadword can be read in its
-!     enirety if at least one byte is included in the copy.
 !
 
 #include "asm.h"
 
 ENTRY(memcpy)
-
-#if __SHMEDIA__
-
-#define LDUAQ(P,O,D0,D1) ldlo.q P,O,D0; ldhi.q P,O+7,D1
-#define STUAQ(P,O,D0,D1) stlo.q P,O,D0; sthi.q P,O+7,D1
-#define LDUAL(P,O,D0,D1) ldlo.l P,O,D0; ldhi.l P,O+3,D1
-#define STUAL(P,O,D0,D1) stlo.l P,O,D0; sthi.l P,O+3,D1
-
-	ld.b r3,0,r63
-	pta/l Large,tr0
-	movi 25,r0
-	bgeu/u r4,r0,tr0
-	nsb r4,r0
-	shlli r0,5,r0
-	movi (L1-L0+63*32 + 1) & 0xffff,r1
-	sub r1, r0, r0
-L0:	ptrel r0,tr0
-	add r2,r4,r5
-	ptabs r18,tr1
-	add r3,r4,r6
-	blink tr0,r63
-
-	.balign 8
-L1:
-	/* 0 byte memcpy */
-	blink tr1,r63
-
-L4_7:	/* 4..7 byte memcpy cntd. */
-	stlo.l r2, 0, r0
-	or r6, r7, r6
-	sthi.l r5, -1, r6
-	stlo.l r5, -4, r6
-	blink tr1,r63
-
-L2_3:	/* 2 or 3 byte memcpy cntd. */
-	st.b r5,-1,r6
-	blink tr1,r63
-
-	/* 1 byte memcpy */
-	ld.b r3,0,r0
-	st.b r2,0,r0
-	blink tr1,r63
-
-L8_15:	/* 8..15 byte memcpy cntd. */
-	stlo.q r2, 0, r0
-	or r6, r7, r6
-	sthi.q r5, -1, r6
-	stlo.q r5, -8, r6
-	blink tr1,r63
-	
-	/* 2 or 3 byte memcpy */
-	ld.b r3,0,r0
-	ld.b r2,0,r63
-	ld.b r3,1,r1
-	st.b r2,0,r0
-	pta/l L2_3,tr0
-	ld.b r6,-1,r6
-	st.b r2,1,r1
-	blink tr0, r63
-
-	/* 4 .. 7 byte memcpy */
-	LDUAL (r3, 0, r0, r1)
-	pta L4_7, tr0
-	ldlo.l r6, -4, r7
-	or r0, r1, r0
-	sthi.l r2, 3, r0
-	ldhi.l r6, -1, r6
-	blink tr0, r63
-
-	/* 8 .. 15 byte memcpy */
-	LDUAQ (r3, 0, r0, r1)
-	pta L8_15, tr0
-	ldlo.q r6, -8, r7
-	or r0, r1, r0
-	sthi.q r2, 7, r0
-	ldhi.q r6, -1, r6
-	blink tr0, r63
-
-	/* 16 .. 24 byte memcpy */
-	LDUAQ (r3, 0, r0, r1)
-	LDUAQ (r3, 8, r8, r9)
-	or r0, r1, r0
-	sthi.q r2, 7, r0
-	or r8, r9, r8
-	sthi.q r2, 15, r8
-	ldlo.q r6, -8, r7
-	ldhi.q r6, -1, r6
-	stlo.q r2, 8, r8
-	stlo.q r2, 0, r0
-	or r6, r7, r6
-	sthi.q r5, -1, r6
-	stlo.q r5, -8, r6
-	blink tr1,r63
-
-Large:
-	ld.b r2, 0, r63
-	pta/l  Loop_ua, tr1
-	ori r3, -8, r7
-	sub r2, r7, r22
-	sub r3, r2, r6
-	add r2, r4, r5
-	ldlo.q r3, 0, r0
-	addi r5, -16, r5
-	movi 64+8, r27 // could subtract r7 from that.
-	stlo.q r2, 0, r0
-	sthi.q r2, 7, r0
-	ldx.q r22, r6, r0
-	bgtu/l r27, r4, tr1
-
-	addi r5, -48, r27
-	pta/l Loop_line, tr0
-	addi r6, 64, r36
-	addi r6, -24, r19
-	addi r6, -16, r20
-	addi r6, -8, r21
-
-Loop_line:
-	ldx.q r22, r36, r63
-	alloco r22, 32
-	addi r22, 32, r22
-	ldx.q r22, r19, r23
-	sthi.q r22, -25, r0
-	ldx.q r22, r20, r24
-	ldx.q r22, r21, r25
-	stlo.q r22, -32, r0
-	ldx.q r22, r6,  r0
-	sthi.q r22, -17, r23
-	sthi.q r22,  -9, r24
-	sthi.q r22,  -1, r25
-	stlo.q r22, -24, r23
-	stlo.q r22, -16, r24
-	stlo.q r22,  -8, r25
-	bgeu r27, r22, tr0
-
-Loop_ua:
-	addi r22, 8, r22
-	sthi.q r22, -1, r0
-	stlo.q r22, -8, r0
-	ldx.q r22, r6, r0
-	bgtu/l r5, r22, tr1
-
-	add r3, r4, r7
-	ldlo.q r7, -8, r1
-	sthi.q r22, 7, r0
-	ldhi.q r7, -1, r7
-	ptabs r18,tr1
-	stlo.q r22, 0, r0
-	or r1, r7, r1
-	sthi.q r5, 15, r1
-	stlo.q r5, 8, r1
-	blink tr1, r63
-
-#else /* ! SHMEDIA, i.e. SH1 .. SH4 / SHcompact */
-
-#ifdef __SH5__
-#define DST r2
-#define SRC r3
-#define COUNT r4
-#define TMP0 r5
-#define TMP1 r6
-#define RESULT r2
-#else
-#define DST r4
-#define SRC r5
-#define COUNT r6
-#define TMP0 r2
-#define TMP1 r3
-#define RESULT r0
-#endif
-
 #ifdef __LITTLE_ENDIAN__
 	! Little endian version copies with increasing addresses.
-	mov DST,TMP1	! Save return value
+	mov r4,r3	! Save return value
 	mov #11,r0	! Check if small number of bytes
-	cmp/hs r0,COUNT
-			! COUNT becomes src end address
-	SL(bf, L_small, add SRC,COUNT)
+	cmp/hs r0,r6
+			! r6 becomes src end address
+	SL(bf, L_small, add r5,r6)
 	mov #1,r1
-	tst r1,SRC	! check if source even
-	SL(bt, L_even, mov COUNT,r7)
-	mov.b @SRC+,r0	! no, make it even.
-	mov.b r0,@DST
-	add #1,DST
-L_even:	tst r1,DST	! check if destination is even
+	tst r1,r5	! check if source even
+	SL(bt, L_even, mov r6,r7)
+	mov.b @r5+,r0	! no, make it even.
+	mov.b r0,@r4
+	add #1,r4
+L_even:	tst r1,r4	! check if destination is even
 	add #-3,r7
 	SL(bf, L_odddst, mov #2,r1)
-	tst r1,DST	! check if destination is 4-byte aligned
-	mov DST,r0
-	SL(bt, L_al4dst, sub SRC,r0)
-	mov.w @SRC+,TMP0
-	mov.w TMP0,@DST
-	! add #2,DST  DST is dead here.
+	tst r1,r4	! check if destination is 4-byte aligned
+	mov r4,r0
+	SL(bt, L_al4dst, sub r5,r0)
+	mov.w @r5+,r2
+	mov.w r2,@r4
+	! add #2,r4  r4 is dead here.
 L_al4dst:
-	tst r1,SRC
+	tst r1,r5
 	bt L_al4both
-	mov.w @SRC+,r1
+	mov.w @r5+,r1
 	swap.w r1,r1
 	add #-6,r0
 	add #-6,r7	! r7 := src end address minus 9.
 	.align 2
 L_2l_loop:
-	mov.l @SRC+,TMP0 ! Read & write two longwords per iteration
-	xtrct TMP0,r1
-	mov.l r1,@(r0,SRC)
-	cmp/hs r7,SRC
-	mov.l @SRC+,r1
-	xtrct r1,TMP0
-	mov.l TMP0,@(r0,SRC)
+	mov.l @r5+,r2 ! Read & write two longwords per iteration
+	xtrct r2,r1
+	mov.l r1,@(r0,r5)
+	cmp/hs r7,r5
+	mov.l @r5+,r1
+	xtrct r1,r2
+	mov.l r2,@(r0,r5)
 	bf L_2l_loop
-	add #-2,SRC
+	add #-2,r5
 	bra  L_cleanup
 	add #5,r0
 L_al4both:
 	add #-4,r0
 	.align 2
 L_al4both_loop:
-	mov.l @SRC+,DST   ! Read longword, write longword per iteration
-	cmp/hs r7,SRC
-	SL(bf, L_al4both_loop, mov.l DST,@(r0,SRC))
+	mov.l @r5+,r4   ! Read longword, write longword per iteration
+	cmp/hs r7,r5
+	SL(bf, L_al4both_loop, mov.l r4,@(r0,r5))
 
 	bra L_cleanup
 	add #3,r0
 
 L_odddst:
-	tst r1,SRC
-	SL(bt, L_al4src, add #-1,DST)
-	mov.w @SRC+,r0
-	mov.b r0,@(1,DST)
+	tst r1,r5
+	SL(bt, L_al4src, add #-1,r4)
+	mov.w @r5+,r0
+	mov.b r0,@(1,r4)
 	shlr8 r0
-	mov.b r0,@(2,DST)
-	add #2,DST
+	mov.b r0,@(2,r4)
+	add #2,r4
 L_al4src:
 	.align 2
 L_odd_loop:
-	mov.l @SRC+,r0   ! Read longword, write byte, word, byte per iteration
-	cmp/hs r7,SRC
-	mov.b r0,@(1,DST)
+	mov.l @r5+,r0   ! Read longword, write byte, word, byte per iteration
+	cmp/hs r7,r5
+	mov.b r0,@(1,r4)
 	shlr8 r0
-	mov.w r0,@(2,DST)
+	mov.w r0,@(2,r4)
 	shlr16 r0
-	mov.b r0,@(4,DST)
-	SL(bf, L_odd_loop, add #4,DST)
+	mov.b r0,@(4,r4)
+	SL(bf, L_odd_loop, add #4,r4)
 	.align 2 ! avoid nop in more frequently executed code.
 L_cleanup2:
-	mov	DST,r0
-	sub	SRC,r0
+	mov	r4,r0
+	sub	r5,r0
 L_cleanup:
-	cmp/eq	COUNT,SRC
+	cmp/eq	r6,r5
 	bt	L_ready
 	.align 2
 L_cleanup_loop:
-	mov.b	@SRC+,r1
-	cmp/eq	COUNT,SRC
-	mov.b	r1,@(r0,SRC)
+	mov.b	@r5+,r1
+	cmp/eq	r6,r5
+	mov.b	r1,@(r0,r5)
 	bf	L_cleanup_loop
 L_ready:
 	rts
-	mov	TMP1,RESULT
+	mov	r3,r0
 L_small:
 	bra L_cleanup2
-	add #-1,DST
-#else /* ! __LITTLE_ENDIAN__ */
+	add #-1,r4
+#else
 	! Big endian version copies with decreasing addresses.
-	mov DST,r0
-	add COUNT,r0
-	sub DST,SRC
+	mov r4,r0
+	add r6,r0
+	sub r4,r5
 	mov #11,r1
-	cmp/hs r1,COUNT
-	SL(bf, L_small, add #-1,SRC)
-	mov SRC,TMP1
-	add r0,TMP1
-	shlr TMP1
+	cmp/hs r1,r6
+	SL(bf, L_small, add #-1,r5)
+	mov r5,r3
+	add r0,r3
+	shlr r3
 	SL(bt, L_even,
-	mov DST,r7)
-	mov.b @(r0,SRC),TMP0
-	add #-1,TMP1
-	mov.b TMP0,@-r0
+	mov r4,r7)
+	mov.b @(r0,r5),r2
+	add #-1,r3
+	mov.b r2,@-r0
 L_even:
 	tst #1,r0
-	add #-1,SRC
+	add #-1,r5
 	SL(bf, L_odddst, add #8,r7)
 	tst #2,r0
 	bt L_al4dst
-	add #-1,TMP1
-	mov.w @(r0,SRC),r1
+	add #-1,r3
+	mov.w @(r0,r5),r1
 	mov.w r1,@-r0
 L_al4dst:
-	shlr TMP1
+	shlr r3
 	bt L_al4both
-	mov.w @(r0,SRC),r1
+	mov.w @(r0,r5),r1
 	swap.w r1,r1
 	add #4,r7
-	add #-4,SRC
+	add #-4,r5
 	.align 2
 L_2l_loop:
-	mov.l @(r0,SRC),TMP0
-	xtrct TMP0,r1
+	mov.l @(r0,r5),r2
+	xtrct r2,r1
 	mov.l r1,@-r0
 	cmp/hs r7,r0
-	mov.l @(r0,SRC),r1
-	xtrct r1,TMP0
-	mov.l TMP0,@-r0
+	mov.l @(r0,r5),r1
+	xtrct r1,r2
+	mov.l r2,@-r0
 	bt L_2l_loop
 	bra L_cleanup
-	add #5,SRC
+	add #5,r5
 
 	nop ! avoid nop in executed code.
 L_al4both:
-	add #-2,SRC
+	add #-2,r5
 	.align 2
 L_al4both_loop:
-	mov.l @(r0,SRC),r1
+	mov.l @(r0,r5),r1
 	cmp/hs r7,r0
 	SL(bt, L_al4both_loop,
 	mov.l r1,@-r0)
 	bra L_cleanup
-	add #3,SRC
+	add #3,r5
 
 	nop ! avoid nop in executed code.
 L_odddst:
-	shlr TMP1
+	shlr r3
 	bt L_al4src
-	mov.w @(r0,SRC),r1
+	mov.w @(r0,r5),r1
 	mov.b r1,@-r0
 	shlr8 r1
 	mov.b r1,@-r0
 L_al4src:
-	add #-2,SRC
+	add #-2,r5
 	.align 2
 L_odd_loop:
-	mov.l @(r0,SRC),TMP0
+	mov.l @(r0,r5),r2
 	cmp/hs r7,r0
-	mov.b TMP0,@-r0
-	shlr8 TMP0
-	mov.w TMP0,@-r0
-	shlr16 TMP0
-	mov.b TMP0,@-r0
+	mov.b r2,@-r0
+	shlr8 r2
+	mov.w r2,@-r0
+	shlr16 r2
+	mov.b r2,@-r0
 	bt L_odd_loop
 
-	add #3,SRC
+	add #3,r5
 L_cleanup:
 L_small:
-	cmp/eq DST,r0
+	cmp/eq r4,r0
 	bt L_ready
-	add #1,DST
+	add #1,r4
 	.align 2
 L_cleanup_loop:
-	mov.b @(r0,SRC),TMP0
-	cmp/eq DST,r0
-	mov.b TMP0,@-r0
+	mov.b @(r0,r5),r2
+	cmp/eq r4,r0
+	mov.b r2,@-r0
 	bf L_cleanup_loop
 L_ready:
 	rts
-	mov r0,RESULT
-#endif /* ! __LITTLE_ENDIAN__ */
-#endif /* ! SHMEDIA */
+	nop
+#endif
diff --git a/newlib/libc/machine/sh/memset.S b/newlib/libc/machine/sh/memset.S
index 2b45aff..7352b41 100644
--- a/newlib/libc/machine/sh/memset.S
+++ b/newlib/libc/machine/sh/memset.S
@@ -3,97 +3,6 @@
 !
 ! by Toshiyasu Morita (tm@netcom.com)
 !
-! SH5 code by J"orn Rennecke (joern.rennecke@superh.com)
-! Copyright 2002 SuperH Ltd.
-!
-
-#include "asm.h"
-
-ENTRY(memset)
-#if __SHMEDIA__
-	pta/l multiquad, tr0
-	ptabs r18, tr2
-
-	andi r2, -8, r25
-	add r2, r4, r5
-	addi r5, -1, r20    // calculate end address.
-	andi r20, -8, r20
-	cmveq r4, r25, r20
-	bne/u r25, r20, tr0 // multiquad
-
-!	This sequence could clobber volatile objects that are in the same
-!	quadword as a very short char array.
-!	ldlo.q r2, 0, r7
-!	shlli r4, 2, r4
-!	movi -1, r8
-!	SHHI r8, r4, r8
-!	SHHI r8, r4, r8
-!	mcmv r7, r8, r3
-!	stlo.q r2, 0, r3
-
-	pta/l setlongs, tr0
-	movi 4, r8
-	bgeu/u r4, r8, tr0
-	pta/l endset, tr0
-	beqi/u r4, 0, tr0
-	st.b r2, 0, r3
-	beqi/u r4, 1, tr0
-	nop
-	st.b r2, 1, r3
-	beqi/l r4, 2, tr0
-	st.b r2,2,r3
-endset: blink tr2, r63
-setlongs:
-	mshflo.b r3, r3, r3
-	mperm.w r3, r63, r3	// Fill pattern now in every byte of r3
-	stlo.l r2, 0, r3
-	nop
-	nop
-	sthi.l r5, -1, r3
-	blink tr2, r63
-
-multiquad:
-	mshflo.b r3, r3, r3
-	mperm.w r3, r63, r3	// Fill pattern now in every byte of r3
-	pta/l lastquad, tr0
-	stlo.q r2, 0, r3
-	sub r20, r25, r24
-	movi 64, r9
-	beqi/u r24, 8, tr0 // lastquad
-	pta/l loop, tr1
-	addi r20, -7*8, r8 // loop end address; This might overflow, so we need
-	                   // to use a different test before we start the loop
-	bgeu/u r24, r9, tr1// loop
-	st.q r25, 8, r3
-	shlri r24, 4, r24
-	st.q r20, -8, r3
-	beqi/u r24, 1, tr0 // lastquad
-	st.q r25, 16, r3
-	st.q r20, -16, r3
-	beqi/u r24, 2, tr0 // lastquad
-	st.q r25, 24, r3
-	st.q r20, -24, r3
-lastquad:
-	sthi.q r5, -1, r3
-	blink tr2,r63
-
-loop:
-	alloco r25, 32
-	st.q r25, 8, r3
-	st.q r25, 16, r3
-	st.q r25, 24, r3
-	st.q r25, 32, r3
-	addi r25, 32, r25
-	bgeu/l r8, r25, tr1 // loop
-
-	st.q r20, -40, r3
-	st.q r20, -32, r3
-	st.q r20, -24, r3
-	st.q r20, -16, r3
-	st.q r20, -8, r3
-	sthi.q r5, -1, r3
-	blink tr2,r63
-#else /* ! SHMEDIA, i.e. SH1 .. SH4 / SHcompact */
 ! Entry: r4: destination pointer
 !        r5: fill value
 !        r6: byte count
@@ -105,60 +14,51 @@ loop:
 ! reserved - usually by the linker script.  Otherwise, we would had to check
 ! for the case of objects of the size 12..15 at address 0..3 .
 
-#ifdef __SH5__
-#define DST r2
-#define VAL r3
-#define CNT r4
-#define TMP r5
-#else
-#define DST r4
-#define VAL r5
-#define CNT r6
-#define TMP r2
-#endif
+#include "asm.h"
 
+ENTRY(memset)
 	mov	#12,r0	! Check for small number of bytes
-	cmp/gt	CNT,r0
-	mov	DST,r0
-	SL(bt, L_store_byte_loop_check0, add DST,CNT)
+	cmp/gt	r6,r0
+	mov	r4,r0
+	SL(bt, L_store_byte_loop_check0, add r4,r6)
 
 	tst	#3,r0	! Align destination
 	SL(bt,	L_dup_bytes, extu.b r5,r5)
 	.balignw 4,0x0009
 L_align_loop:
-	mov.b	VAL,@r0
+	mov.b	r5,@r0
 	add	#1,r0
 	tst	#3,r0
 	bf	L_align_loop
 
 L_dup_bytes:	
-	swap.b	VAL,TMP	! Duplicate bytes across longword
-	or	TMP,VAL
-	swap.w	VAL,TMP
-	or	TMP,VAL
+	swap.b	r5,r2	! Duplicate bytes across longword
+	or	r2,r5
+	swap.w	r5,r2
+	or	r2,r5
 
-	add	#-16,CNT
+	add	#-16,r6
 
 	.balignw 4,0x0009
 L_store_long_loop:
-	mov.l	VAL,@r0	! Store double longs to memory
-	cmp/hs	CNT,r0
-	mov.l	VAL,@(4,r0)
+	mov.l	r5,@r0	! Store double longs to memory
+	cmp/hs	r6,r0
+	mov.l	r5,@(4,r0)
 	SL(bf, L_store_long_loop, add #8,r0)
 
-	add	#16,CNT
+	add	#16,r6
 
 L_store_byte_loop_check0:
-	cmp/eq	CNT,r0
+	cmp/eq	r6,r0
 	bt	L_exit
 	.balignw 4,0x0009
 L_store_byte_loop:
-	mov.b	VAL,@r0	! Store bytes to memory
+	mov.b	r5,@r0	! Store bytes to memory
 	add	#1,r0
-	cmp/eq	CNT,r0
+	cmp/eq	r6,r0
 	bf	L_store_byte_loop
 
 L_exit:
 	rts
 	mov	r4,r0
-#endif /* ! SHMEDIA */
+
diff --git a/newlib/libc/machine/sh/setjmp.S b/newlib/libc/machine/sh/setjmp.S
index 520218f..363e8f2 100644
--- a/newlib/libc/machine/sh/setjmp.S
+++ b/newlib/libc/machine/sh/setjmp.S
@@ -1,78 +1,7 @@
-/* We want to pretend we're in SHmedia mode, even when assembling for
-   SHcompact.  */
-#if __SH5__ == 32 && ! __SHMEDIA__
-# undef __SHMEDIA__
-# define __SHMEDIA__ 1
-#endif
-
-#if __SHMEDIA__
-	.mode	SHmedia
-#endif
-
 #include "asm.h"
 
 ENTRY(setjmp)
-#if __SH5__
-	ptabs	r18, tr0
-	gettr	tr5, r5
-	gettr	tr6, r6
-	gettr	tr7, r7
-	st.q	r2,  0*8, r18
-	st.q	r2,  1*8, r10
-	st.q	r2,  2*8, r11
-	st.q	r2,  3*8, r12
-	st.q	r2,  4*8, r13
-	st.q	r2,  5*8, r14
-	st.q	r2,  6*8, r15
-	st.q	r2,  7*8, r28
-	st.q	r2,  8*8, r29
-	st.q	r2,  9*8, r30
-	st.q	r2, 10*8, r31
-	st.q	r2, 11*8, r32
-	st.q	r2, 12*8, r33
-	st.q	r2, 13*8, r34
-	st.q	r2, 14*8, r35
-	st.q	r2, 15*8, r44
-	st.q	r2, 16*8, r45
-	st.q	r2, 17*8, r46
-	st.q	r2, 18*8, r47
-	st.q	r2, 19*8, r48
-	st.q	r2, 20*8, r49
-	st.q	r2, 21*8, r50
-	st.q	r2, 22*8, r51
-	st.q	r2, 23*8, r52
-	st.q	r2, 24*8, r53
-	st.q	r2, 25*8, r54
-	st.q	r2, 26*8, r55
-	st.q	r2, 27*8, r56
-	st.q	r2, 28*8, r57
-	st.q	r2, 29*8, r58
-	st.q	r2, 30*8, r59
-	st.q	r2, 31*8, r5
-	st.q	r2, 32*8, r6
-	st.q	r2, 33*8, r7
-#if ! __SH4_NOFPU__
-	fst.d	r2, 34*8, dr12
-	fst.d	r2, 35*8, dr14
-	fst.d	r2, 36*8, dr36
-	fst.d	r2, 37*8, dr38
-	fst.d	r2, 38*8, dr40
-	fst.d	r2, 39*8, dr42
-	fst.d	r2, 40*8, dr44
-	fst.d	r2, 41*8, dr46
-	fst.d	r2, 42*8, dr48
-	fst.d	r2, 43*8, dr50
-	fst.d	r2, 44*8, dr52
-	fst.d	r2, 45*8, dr54
-	fst.d	r2, 46*8, dr56
-	fst.d	r2, 47*8, dr58
-	fst.d	r2, 48*8, dr60
-	fst.d	r2, 49*8, dr62
-#endif
-	movi	0, r2
-	blink	tr0, r63
-#else
-#if defined (__SH2E__) || defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__)
+#if defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__)
 	add	#(13*4),r4
 #else
 	add	#(9*4),r4
@@ -80,7 +9,7 @@ ENTRY(setjmp)
 
 	sts.l	pr,@-r4
 
-#if defined (__SH2E__) || defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__)
+#if defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__)
 	fmov.s	fr15,@-r4	! call saved floating point registers
 	fmov.s	fr14,@-r4
 	fmov.s	fr13,@-r4
@@ -99,70 +28,8 @@ ENTRY(setjmp)
 
 	rts
 	mov    #0,r0
-#endif /* __SH5__ */
 
 ENTRY(longjmp)
-#if __SH5__
-	ld.q	r2,  0*8, r18
-	ptabs	r18, tr0
-	ld.q	r2,  1*8, r10
-	ld.q	r2,  2*8, r11
-	ld.q	r2,  3*8, r12
-	ld.q	r2,  4*8, r13
-	ld.q	r2,  5*8, r14
-	ld.q	r2,  6*8, r15
-	ld.q	r2,  7*8, r28
-	ld.q	r2,  8*8, r29
-	ld.q	r2,  9*8, r30
-	ld.q	r2, 10*8, r31
-	ld.q	r2, 11*8, r32
-	ld.q	r2, 12*8, r33
-	ld.q	r2, 13*8, r34
-	ld.q	r2, 14*8, r35
-	ld.q	r2, 15*8, r44
-	ld.q	r2, 16*8, r45
-	ld.q	r2, 17*8, r46
-	ld.q	r2, 18*8, r47
-	ld.q	r2, 19*8, r48
-	ld.q	r2, 20*8, r49
-	ld.q	r2, 21*8, r50
-	ld.q	r2, 22*8, r51
-	ld.q	r2, 23*8, r52
-	ld.q	r2, 24*8, r53
-	ld.q	r2, 25*8, r54
-	ld.q	r2, 26*8, r55
-	ld.q	r2, 27*8, r56
-	ld.q	r2, 28*8, r57
-	ld.q	r2, 29*8, r58
-	ld.q	r2, 30*8, r59
-	ld.q	r2, 31*8, r5
-	ld.q	r2, 32*8, r6
-	ld.q	r2, 33*8, r7
-	ptabs	r5, tr5
-	ptabs	r6, tr6
-	ptabs	r7, tr7
-#if ! __SH4_NOFPU__
-	fld.d	r2, 34*8, dr12
-	fld.d	r2, 35*8, dr14
-	fld.d	r2, 36*8, dr36
-	fld.d	r2, 37*8, dr38
-	fld.d	r2, 38*8, dr40
-	fld.d	r2, 39*8, dr42
-	fld.d	r2, 40*8, dr44
-	fld.d	r2, 41*8, dr46
-	fld.d	r2, 42*8, dr48
-	fld.d	r2, 43*8, dr50
-	fld.d	r2, 44*8, dr52
-	fld.d	r2, 45*8, dr54
-	fld.d	r2, 46*8, dr56
-	fld.d	r2, 47*8, dr58
-	fld.d	r2, 48*8, dr60
-	fld.d	r2, 49*8, dr62
-#endif
-	movi	1, r2
-	cmvne	r3, r3, r2
-	blink	tr0, r63
-#else
 	mov.l	@r4+,r8
 	mov.l	@r4+,r9
 	mov.l	@r4+,r10
@@ -173,7 +40,7 @@ ENTRY(longjmp)
 	mov.l	@r4+,r14
 	mov.l	@r4+,r15
 
-#if defined (__SH2E__) || defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__)
+#if defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__)
 	fmov.s	@r4+,fr12	! call saved floating point registers
 	fmov.s	@r4+,fr13
 	fmov.s	@r4+,fr14
@@ -188,4 +55,3 @@ ENTRY(longjmp)
 	movt	r0
 retr4:	rts
 	nop
-#endif /* __SH5__ */
diff --git a/newlib/libc/machine/sh/strcmp.S b/newlib/libc/machine/sh/strcmp.S
index 8dcc20b..a112b13 100644
--- a/newlib/libc/machine/sh/strcmp.S
+++ b/newlib/libc/machine/sh/strcmp.S
@@ -1,200 +1,42 @@
-! SH5 code Copyright 2002 SuperH Ltd.
+! Entry: r4: destination
+!        r5: source
+! Exit:  r0: result
+!        r1-r2,r4-r5: clobbered
 
 #include "asm.h"
 
 ENTRY(strcmp)
-
-#if __SHMEDIA__
-	ld.ub	r2,0,r4
-	pt/l	quickret0,tr0
-	ld.ub	r3,0,r5
-	ptabs	r18,tr2
-	beqi/u	r4,0,tr0
-	ld.ub	r2,1,r6
-	bne/u	r4,r5,tr0
-	pt/l	quickret1,tr1
-	ld.ub	r3,1,r7
-	beqi/u	r6,0,tr1
-	ld.ub	r2,2,r4
-	bne/u	r6,r7,tr1
-	ld.ub	r3,2,r5
-	beqi/u	r4,0,tr0
-	ld.ub	r2,3,r6
-	bne/u	r4,r5,tr0
-	ld.ub	r3,3,r7
-	beqi/u	r6,0,tr1
-	ld.ub	r2,4,r4
-	bne/u	r6,r7,tr1
-	ld.ub	r3,4,r5
-	beqi/u	r4,0,tr0
-	ld.ub	r2,5,r6
-	bne/u	r4,r5,tr0
-	ld.ub	r3,5,r7
-	beqi/u	r6,0,tr1
-	ld.ub	r2,6,r4
-	bne/u	r6,r7,tr1
-	ld.ub	r3,6,r5
-	beqi/u	r4,0,tr0
-	ld.ub	r2,7,r6
-	bne/u	r4,r5,tr0
-	ld.ub	r3,7,r7
-	beqi/u	r6,0,tr1
-	sub	r3,r2,r3
-	bne/u	r6,r7,tr1
-
-	andi	r2,-8,r2
-	add	r3,r2,r3
-	ldlo.q	r3,8,r23
-	pt	r23_zero,tr0
-	shlli	r3,3,r22
-	sub	r63,r22,r20
-	movi	0x101,r6
-	mperm.w	r6,r63,r6
-	SHLO	r6,r22,r7
-	msubs.ub r7,r23,r8
-	pt	loop,tr1
-	bnei/u	r8,0,tr0 // r23_zero
-	pt	found_zero,tr0
-	addi	r3,15,r3
-	andi	r3,-8,r3
-	sub	r3,r2,r3
-	bne/l	r7,r6,tr1 // loop
-	/* The strings are aligned to each other.  */
-	/* It is possible to have a loop with six cycles / iteration
-	   by re-ordering the exit conditions, but then it needs extra
-	   time and/or code to sort out the r4 != r5 case.  */
-	pt	al_loop,tr1
-	pt	al_found_zero,tr0
-al_loop:
-	ld.q	r2,8,r4
-	ldx.q	r2,r3,r5
-	addi	r2,8,r2
-	mcmpeq.b r63,r4,r8
-	pt	cmp_quad,tr3
-	bnei/u	r8,0,tr0  // al_found_zero
-	beq/l	r4,r5,tr1 // al_loop
-	blink	tr3,r63   // cmp_quad
-
-	.balign 8
-quickret0:
-	sub	r4,r5,r2
-	blink	tr2,r63
-quickret1:
-	sub	r6,r7,r2
-	blink	tr2,r63
-
-loop:
-	ld.q	r2,8,r4
-	ldx.q	r2,r3,r19
-	addi	r2,8,r2
-	msubs.ub r6,r4,r8
-	mcmpeq.b r63,r19,r9
-	SHHI	r19,r20,r21
-	or	r21,r23,r5
-	SHLO	r19,r22,r23
-	bne/u	r8,r9,tr0 // found_zero
-	beq/l	r4,r5,tr1 // loop
-cmp_quad:
-#ifdef __LITTLE_ENDIAN__
-	byterev r4,r4
-	byterev r5,r5
-#endif
-	cmpgtu	r4,r5,r6
-	cmpgtu	r5,r4,r7
-	sub	r6,r7,r2
-	blink tr2,r63
-found_zero:
-	pt	zero_now,tr0
-	pt	cmp_quad,tr1
-	SHHI	r9,r20,r7
-	bne/u	r8,r7,tr0 // zero_now
-	bne/u	r4,r5,tr1 // cmp_quad
-	SHLO	r9,r22,r8
-r23_zero:
-	ld.q	r2,8,r4
-	add	r23,r63,r5
-zero_now:
-al_found_zero:
-/* We konw that one of the values has at lest one zero, and r8 holds
-   an 0x01 or 0xff mask for every zero found in one of the operands.
-   If both operands have the first zero in the same place, this mask
-   allows us to truncate the comparison to the valid bytes in the
-   strings.  If the first zero is in different places, it doesn't
-   matter if some invalid bytes are included, since the comparison
-   of the zero with the non-zero will determine the outcome.  */
-#ifdef __LITTLE_ENDIAN__
-	shlli	r8,8,r8
-	addi	r8,-1,r9
-	andc	r9,r8,r8
-	and	r8,r4,r4
-	and	r8,r5,r5
-#else
-	shlri r8,1,r8
-	nsb	r8,r8
-	addi	r8,8,r8
-	andi	r8,56,r8
-	sub	r63,r8,r8
-	shlrd	r4,r8,r4
-	shlrd	r5,r8,r5
-#endif
-#ifdef __LITTLE_ENDIAN__
-	byterev r4,r4
-	byterev r5,r5
-#endif
-	cmpgtu	r4,r5,r6
-	cmpgtu	r5,r4,r7
-	sub	r6,r7,r2
-	blink tr2,r63
-
-#else /* ! __SHMEDIA__, i.e. SH 1..4 / SHcompact */
-
-#ifdef __SH5__
-#define STR1 r2
-#define STR2 r3
-#define RESULT r2
-#define TMP r4
-#else
-! Entry: r4: string1
-!        r5: string2
-! Exit:  r0: result
-!        r1-r2,r4-r5: clobbered
-#define STR1 r4
-#define STR2 r5
-#define RESULT r0
-#define TMP r2
-#endif /* __SH5__ */
-
-	mov     STR1,r0
-	or      STR2,r0
+	mov     r4,r0
+	or      r5,r0
 	tst	#3,r0
 	bf	L_setup_char_loop
 	mov	#0,r0
 #ifdef DELAYED_BRANCHES
-	mov.l	@STR1+,r1
+	mov.l	@r4+,r1
 	.align  2
 Longword_loop:
-	mov.l	@STR2+,TMP
+	mov.l	@r5+,r2
 	cmp/str	r0,r1
 	bt	Longword_loop_end
-	cmp/eq	r1,TMP
+	cmp/eq	r1,r2
 	bt.s	Longword_loop
-	mov.l	@STR1+,r1
-	add #-4, STR1
+	mov.l	@r4+,r1
+	add #-4, r4
 Longword_loop_end:
-	add #-4, STR1
-	add #-4, STR2
+	add #-4, r4
+	add #-4, r5
 L_setup_char_loop:
-	mov.b	@STR1+,r0
+	mov.b	@r4+,r0
 	.align  2
 L_char_loop:
-	mov.b	@STR2+,r1
+	mov.b	@r5+,r1
 	tst	r0,r0
 	bt	L_return
 	cmp/eq	r0,r1
 	bt.s L_char_loop
-	mov.b	@STR1+,r0
-	add	#-2,STR1
-	mov.b	@STR1,r0
+	mov.b	@r4+,r0
+	add	#-2,r4
+	mov.b	@r4,r0
 #else /* ! DELAYED_BRANCHES */
 	.align  2
 Longword_loop:
@@ -218,8 +60,7 @@ L_char_loop:
 	bt L_char_loop
 #endif
 L_return:
-	extu.b	r0,RESULT
+	extu.b	r0,r0
 	extu.b	r1,r1
 	rts
-	sub	r1,RESULT
-#endif /* ! __SHMEDIA__ */
+	sub	r1,r0
diff --git a/newlib/libc/machine/sh/strcpy.S b/newlib/libc/machine/sh/strcpy.S
index da951cd..63aa7e7 100644
--- a/newlib/libc/machine/sh/strcpy.S
+++ b/newlib/libc/machine/sh/strcpy.S
@@ -1,134 +1,41 @@
-! Entry: arg0: destination
-!        arg1: source
-! Exit:  result: destination
-!
-! SH5 code Copyright 2002 SuperH Ltd.
+! Entry: r4: destination
+!        r5: source
+! Exit:  r0: destination
+!        r1-r2,r5: clobbered
 
 #include "asm.h"
 
 ENTRY(strcpy)
-
-#if __SHMEDIA__
-
-	pta/l shortstring,tr1
-	ldlo.q r3,0,r4
-	ptabs r18,tr4
-	shlli r3,3,r7
-	addi r2, 8, r0
-	mcmpeq.b r4,r63,r6
-	SHHI r6,r7,r6
-	bnei/u r6,0,tr1 // shortstring
-	pta/l no_lddst, tr2
-	ori r3,-8,r23
-	sub r2, r23, r0
-	sub r3, r2, r21
-	addi r21, 8, r20
-	ldx.q r0, r21, r5
-	pta/l loop, tr0
-	ori r2,-8,r22
-	mcmpeq.b r5, r63, r6
-	bgt/u r22, r23, tr2 // no_lddst
-
-	// r22 < r23 :  Need to do a load from the destination.
-	// r22 == r23 : Doesn't actually need to load from destination,
-	//              but still can be handled here.
-	ldlo.q r2, 0, r9
-	movi -1, r8
-	SHLO r8, r7, r8
-	mcmv r4, r8, r9
-	stlo.q r2, 0, r9
-	beqi/l r6, 0, tr0 // loop
-
-	add r5, r63, r4
-	addi r0, 8, r0
-	blink tr1, r63 // shortstring
-no_lddst:
-	// r22 > r23: note that for r22 == r23 the sthi.q would clobber
-	//            bytes before the destination region.
-	stlo.q r2, 0, r4
-	SHHI r4, r7, r4
-	sthi.q r0, -1, r4
-	beqi/l r6, 0, tr0 // loop
-
-	add r5, r63, r4
-	addi r0, 8, r0
-shortstring:
-#ifndef __LITTLE_ENDIAN__
-	pta/l shortstring2,tr1
-	byterev r4,r4
-#endif
-shortstring2:
-	st.b r0,-8,r4
-	andi r4,0xff,r5
-	shlri r4,8,r4
-	addi r0,1,r0
-	bnei/l r5,0,tr1
-	blink tr4,r63 // return
-	
-	.balign 8
-loop:
-	stlo.q r0, 0, r5
-	ldx.q r0, r20, r4
-	addi r0, 16, r0
-	sthi.q r0, -9, r5
-	mcmpeq.b r4, r63, r6
-	bnei/u r6, 0, tr1 // shortstring
-	ldx.q r0, r21, r5
-	stlo.q r0, -8, r4
-	sthi.q r0, -1, r4
-	mcmpeq.b r5, r63, r6
-	beqi/l r6, 0, tr0 // loop
-
-	add r5, r63, r4
-	addi r0, 8, r0
-	blink tr1, r63 // shortstring
-
-#else /* ! __SHMEDIA__, i.e. SH 1..4 / SHcompact */
-
-#ifdef __SH5__
-#define DST r2
-#define SRC r3
-#define TMP r4
-#define RESULT R2
-!        r0,r1,r3,r4: clobbered
-#else
-#define DST r4
-#define SRC r5
-#define TMP r2
-#define RESULT r0
-!        r1-r2,r5: clobbered
-#endif
-	mov     DST,r0
-	or      SRC,r0
+	mov     r4,r0
+	or      r5,r0
 	tst	#3,r0
-	SL(bf, L_setup_char_loop, mov DST,r0)
-	mov.l   @SRC+,r1
-	mov     #0,TMP
-	cmp/str TMP,r1
-	SL(bt, Longword_loop_end, sub SRC,r0)
+	SL(bf, L_setup_char_loop, mov r4,r0)
+	mov.l   @r5+,r1
+	mov     #0,r2
+	cmp/str r2,r1
+	SL(bt, Longword_loop_end, sub r5,r0)
 	.align  2
 Longword_loop:
-	mov.l   r1,@(r0,SRC)
-	mov.l   @SRC+,r1
-	cmp/str TMP,r1
+	mov.l   r1,@(r0,r5)
+	mov.l   @r5+,r1
+	cmp/str r2,r1
 	bt      Longword_loop_end
-	mov.l   r1,@(r0,SRC)
-	mov.l   @SRC+,r1
-	cmp/str TMP,r1
+	mov.l   r1,@(r0,r5)
+	mov.l   @r5+,r1
+	cmp/str r2,r1
 	bf      Longword_loop
 Longword_loop_end:
-	add	#-4,SRC
+	add	#-4,r5
 	add	#3,r0
 	.align  2
 L_char_loop:
-	mov.b	@SRC+,r1
+	mov.b	@r5+,r1
 L_char_loop_start:
 	tst	r1,r1
-	SL(bf, L_char_loop, mov.b r1,@(r0,SRC))
+	SL(bf, L_char_loop, mov.b r1,@(r0,r5))
 	rts
-	mov DST,RESULT
+	mov r4,r0
 L_setup_char_loop:
-	mov.b	@SRC+,r1
+	mov.b	@r5+,r1
 	bra L_char_loop_start
-	sub SRC,r0
-#endif /* ! __SHMEDIA__ */
+	sub r5,r0
diff --git a/newlib/libc/machine/sh/strlen.S b/newlib/libc/machine/sh/strlen.S
deleted file mode 100644
index b55b86b..0000000
--- a/newlib/libc/machine/sh/strlen.S
+++ /dev/null
@@ -1,87 +0,0 @@
-! Entry: arg0: string start address
-! Exit:  result: length
-!
-! Copyright 2002 SuperH Ltd.
-
-#include "asm.h"
-
-ENTRY(strlen)
-
-#if __SHMEDIA__
-
-	ldlo.q r2,0,r3
-	ptabs/l r18,tr0
-	pta/l loop,tr1
-	andi r2,-8,r0
-	shlli r2,3,r1
-	mcmpeq.b r3,r63,r3
-	SHHI r3,r1,r4
-	beqi/u r4,0,tr1 // loop
-#ifdef __LITTLE_ENDIAN__
-	movi -1,r2
-	addi r3,-1,r4
-	msad.ubq r3,r4,r2
-#else
-	shlri r3,1,r3
-	nsb r3,r3
-	shlri r3,3,r2
-#endif
-	blink tr0,r63
-
-loop:
-	ldlo.q r0,8,r3
-	addi r0,8,r0
-	ldlo.q r0,8,r63
-	mcmpeq.b r3,r63,r3
-	beqi/l r3,0,tr1 // loop
-	sub r0,r2,r2
-#ifdef __LITTLE_ENDIAN__
-	addi r3,-1,r4
-	addi r2,-1,r2
-	msad.ubq r3,r4,r2
-#else
-	shlri r3,1,r3
-	nsb r3,r3
-	shlri r3,3,r3
-	add r2,r3,r2
-#endif
-	blink tr0,r63
-
-#else /* ! __SHMEDIA__, i.e. SH 1..4 / SHcompact */
-
-#ifdef __SH5__
-#define STR_INIT r2
-#define STR_ORIG r0
-#define STR_COPY STR_ORIG
-#define MASK r1
-#define TMP r3
-#define RESULT r2
-!        r0,r1,r3: clobbered
-#else
-#define STR_INIT r4
-#define STR_ORIG STR_INIT
-#define STR_COPY STR
-#define MASK r1
-#define TMP r3
-#define RESULT r0
-!        r1,r3: clobbered
-#endif
-#define STR RESULT
-
-	mov #3,MASK
-	and STR_INIT,MASK
-	tst MASK,MASK
-	SL(bf, L_char_loop, mov STR_INIT, STR_COPY)
-L_word_loop:
-	mov.l @STR+,TMP
-	cmp/str MASK,TMP
-	bf L_word_loop
-	add #-4,STR
-L_char_loop:
-	mov.b @STR+,TMP
-	tst TMP,TMP
-	bf L_char_loop
-	add #-1,STR
-	rts
-	sub STR_ORIG,STR
-#endif /* ! __SHMEDIA__ */
diff --git a/newlib/libc/machine/sh/strncpy.S b/newlib/libc/machine/sh/strncpy.S
deleted file mode 100644
index c22ae66..0000000
--- a/newlib/libc/machine/sh/strncpy.S
+++ /dev/null
@@ -1,209 +0,0 @@
-/* Copyright 2003 SuperH Ltd.  */
-
-#include "asm.h"
-
-#ifdef __SH5__
-#if __SHMEDIA__
-
-#ifdef __LITTLE_ENDIAN__
-#define ZPAD_MASK(src, dst) addi src, -1, dst
-#else
-#define ZPAD_MASK(src, dst) \
- byterev src, dst; addi dst, -1, dst; byterev dst, dst
-#endif
-
-
-/* We assume that the destination is not in the first 16 bytes of memory.
-   A typical linker script will put the text section first, and as
-   this code is longer that 16 bytes, you have to get out of your way
-    to put data there.  */
-ENTRY(strncpy)
- pt L_small, tr2
- ldlo.q r3, 0, r0
- shlli r3, 3, r19
- mcmpeq.b r0, r63, r1
- SHHI r1, r19, r7
- add r2, r4, r20
- addi r20, -8, r5
- /* If the size is greater than 8, we know we can read beyond the first
-    (possibly partial) quadword, and write out a full first and last
-    (possibly unaligned and/or overlapping) quadword.  */
- bge/u r2, r5, tr2 // L_small
- pt L_found0, tr0
- addi r2, 8, r22
- bnei/u r7, 0, tr0  // L_found0
- ori r3, -8, r38
- pt L_end_early, tr1
- sub r2, r38, r22
- stlo.q r2, 0, r0
- sthi.q r2, 7, r0
- sub r3, r2, r6
- ldx.q r22, r6, r0
- /* Before each iteration, check that we can store in full the next quad we
-    are about to fetch.  */
- addi r5, -8, r36
- bgtu/u r22, r36, tr1 // L_end_early
- pt L_scan0, tr1
-L_scan0:
- addi r22, 8, r22
- mcmpeq.b r0, r63, r1
- stlo.q r22, -8, r0
- bnei/u r1, 0, tr0   // L_found0
- sthi.q r22, -1, r0
- ldx.q r22, r6, r0
- bgeu/l r36, r22, tr1 // L_scan0
-L_end:
- // At end; we might re-read a few bytes when we fetch the last quad.
- // branch mispredict, so load is ready now.
- mcmpeq.b r0, r63, r1
- addi r22, 8, r22
- bnei/u r1, 0, tr0   // L_found0
- add r3, r4, r7
- ldlo.q r7, -8, r1
- ldhi.q r7, -1, r7
- ptabs r18, tr0
- stlo.q r22, -8, r0
- or r1, r7, r1
- mcmpeq.b r1, r63, r7
- sthi.q r22, -1, r0
- ZPAD_MASK (r7, r7)
- and r1, r7, r1 // mask out non-zero bytes after first zero byte
- stlo.q r20, -8, r1
- sthi.q r20, -1, r1
- blink tr0, r63
-
-L_end_early:
- /* Check if we can store the current quad in full.  */
- pt L_end, tr1
- add r3, r4, r7
- bgtu/u r5, r22, tr1 // L_end // Not really unlikely, but gap is short.
- /* If not, that means we can just proceed to process the last quad.
-    Two pipeline stalls are unavoidable, as we don't have enough ILP.  */
- ldlo.q r7, -8, r1
- ldhi.q r7, -1, r7
- ptabs r18, tr0
- or r1, r7, r1
- mcmpeq.b r1, r63, r7
- ZPAD_MASK (r7, r7)
- and r1, r7, r1 // mask out non-zero bytes after first zero byte
- stlo.q r20, -8, r1
- sthi.q r20, -1, r1
- blink tr0, r63
-
-L_found0:
- // r0: string to store, not yet zero-padding normalized.
- // r1: result of mcmpeq.b r0, r63, r1.
- // r22: store address plus 8.  I.e. address where zero padding beyond the
- //      string in r0 goes.
- // r20: store end address.
- // r5: store end address minus 8.
- pt L_write0_multiquad, tr0
- ZPAD_MASK (r1, r1)
- and r0, r1, r0 // mask out non-zero bytes after first zero byte
- stlo.q r22, -8, r0
- sthi.q r22, -1, r0
- andi r22, -8, r1 // Check if zeros to write fit in one quad word.
- bgtu/l r5, r1, tr0 // L_write0_multiquad
- ptabs r18, tr1
- sub r20, r22, r1
- shlli r1, 2, r1 // Do shift in two steps so that 64 bit case is
- SHLO r0, r1, r0 // handled correctly.
- SHLO r0, r1, r0
- sthi.q r20, -1, r0
- blink tr1, r63
-
-L_write0_multiquad:
- pt L_write0_loop, tr0
- ptabs r18, tr1
- stlo.q r22, 0, r63
- sthi.q r20, -1, r63
- addi r1, 8, r1
- bgeu/l r5, r1, tr0 // L_write0_loop
- blink tr1, r63
-
-L_write0_loop:
- st.q r1, 0 ,r63
- addi r1, 8, r1
- bgeu/l r5, r1, tr0 // L_write0_loop
- blink tr1, r63
-
-L_small:
- // r0: string to store, not yet zero-padding normalized.
- // r1: result of mcmpeq.b r0, r63, r1.
- // r7: nonzero indicates relevant zero found r0.
- // r2: store address.
- // r3: read address.
- // r4: size, max 8
- // r20: store end address.
- // r5: store end address minus 8.
- pt L_nohi, tr0
- pt L_small_storelong, tr1
- ptabs r18, tr2
- sub r63, r4, r23
- bnei/u r7, 0, tr0  // L_nohi
- ori r3, -8, r7
- bge/l r23, r7, tr0 // L_nohi
- ldhi.q r3, 7, r1
- or r0, r1, r0
- mcmpeq.b r0, r63, r1
-L_nohi:
- ZPAD_MASK (r1, r1)
- and r0, r1, r0
- movi 4, r19
- bge/u r4, r19, tr1 // L_small_storelong
-
- pt L_small_end, tr0
-#ifndef __LITTLE_ENDIAN__
- byterev r0, r0
-#endif
- beqi/u r4, 0, tr0 // L_small_end
- st.b r2, 0, r0
- beqi/u r4, 1, tr0 // L_small_end
- shlri r0, 8, r0
- st.b r2, 1, r0
- beqi/u r4, 2, tr0 // L_small_end
- shlri r0, 8, r0
- st.b r2, 2, r0
-L_small_end:
- blink tr2, r63
-
-L_small_storelong:
- shlli r23, 3, r7
- SHHI r0, r7, r1
-#ifdef __LITTLE_ENDIAN__
- shlri r1, 32, r1
-#else
- shlri r0, 32, r0
-#endif
- stlo.l r2, 0, r0
- sthi.l r2, 3, r0
- stlo.l r20, -4, r1
- sthi.l r20, -1, r1
- blink tr2, r63
-
-#else /* SHcompact */
-
-/* This code is optimized for size.  Instruction selection is SH5 specific.
-   SH4 should use a different version.  */
-ENTRY(strncpy)
- mov #0, r6
- cmp/eq r4, r6
- bt return
- mov r2, r5
- add #-1, r5
- add r5, r4
-loop:
- bt/s found0
- add #1, r5
- mov.b @r3+, r1
-found0:
- cmp/eq r5,r4
- mov.b r1, @r5
- bf/s loop
- cmp/eq r1, r6
-return:
- rts
- nop
- 
-#endif /* SHcompact */
-#endif /* __SH5__ */
diff --git a/newlib/libc/machine/sparc/Makefile.in b/newlib/libc/machine/sparc/Makefile.in
index 0d34f51..6aca793 100644
--- a/newlib/libc/machine/sparc/Makefile.in
+++ b/newlib/libc/machine/sparc/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/sparc/aclocal.m4 b/newlib/libc/machine/sparc/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/sparc/aclocal.m4
+++ b/newlib/libc/machine/sparc/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/sparc/configure b/newlib/libc/machine/sparc/configure
index 934fdab..a6e1b91 100755
--- a/newlib/libc/machine/sparc/configure
+++ b/newlib/libc/machine/sparc/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/tic4x/Makefile.am b/newlib/libc/machine/tic4x/Makefile.am
deleted file mode 100644
index 1c65b9f..0000000
--- a/newlib/libc/machine/tic4x/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/tic4x/Makefile.in b/newlib/libc/machine/tic4x/Makefile.in
deleted file mode 100644
index 9736912..0000000
--- a/newlib/libc/machine/tic4x/Makefile.in
+++ /dev/null
@@ -1,327 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/tic4x/aclocal.m4 b/newlib/libc/machine/tic4x/aclocal.m4
deleted file mode 100644
index 55d5e67..0000000
--- a/newlib/libc/machine/tic4x/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/tic4x/configure b/newlib/libc/machine/tic4x/configure
deleted file mode 100755
index 98bab64..0000000
--- a/newlib/libc/machine/tic4x/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=setjmp.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/tic4x/configure.in b/newlib/libc/machine/tic4x/configure.in
deleted file mode 100644
index df1ed40..0000000
--- a/newlib/libc/machine/tic4x/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/tic4x configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(setjmp.S)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/tic4x/setjmp.S b/newlib/libc/machine/tic4x/setjmp.S
deleted file mode 100644
index d6e8d25..0000000
--- a/newlib/libc/machine/tic4x/setjmp.S
+++ /dev/null
@@ -1,75 +0,0 @@
-/* setjmp/longjmp routines.
- *
- * Written by Michael Hayes <m.hayes@elec.canterbury.ac.nz>.
- *
- * The author hereby grant permission to use, copy, modify, distribute,
- * and license this software and its documentation for any purpose, provided
- * that existing copyright notices are retained in all copies and that this
- * notice is included verbatim in any distributions. No written agreement,
- * license, or royalty fee is required for any of the authorized uses.
- * Modifications to this software may be copyrighted by their authors
- * and need not follow the licensing terms described here, provided that
- * the new terms are clearly indicated on the first page of each file where
- * they apply.
- */
-
-	.sect .text
-	.global setjmp
-	.global longjmp
-
-setjmp:
-	pop	r1	   
-	ldi	sp, ar0
-#ifndef _REGPARM
-	ldi	*ar0, ar2	
-#endif
-
-	sti	r4, *ar2++
-	sti	r5, *ar2++
-	stf	r6, *ar2++
-	stf	r7, *ar2++
-#ifdef _TMS320C4x
-	sti	r8, *ar2++
-#endif
-	sti	ar3, *ar2++
-	sti	ar4, *ar2++
-	sti	ar5, *ar2++
-	sti	ar6, *ar2++
-	sti	ar7, *ar2++
-	bd	r1	
-	sti	r1, *ar2++ 
-	sti	ar0, *ar2  
-	ldi	0, r0	
-
-	
-longjmp:
-#ifndef _REGPARM
-	ldi	sp, ar0
-	ldi	*-ar0(1), ar2  
-	ldi	*-ar0(2), r0   
-	ldiz	1, r0	
-#else
-	ldi	r2, r0	 
-	ldiz	1, r0	
-#endif
- 
-	ldi	*ar2++, r4 
-	ldi	*ar2++, r5 
-	ldf	*ar2++, r6 
-	ldf	*ar2++, r7
-#ifdef _TMS320C4x
-	ldi	*ar2++, r8
-#endif
-	ldi	*ar2++, ar3
-	ldi	*ar2++, ar4 
-	ldi	*ar2++, ar5 
-	ldi	*ar2++, ar6 
-	ldi	*ar2++, ar7 
-	ldi	*ar2++, r1 
-	ldi	*ar2, sp	
-    
-	b	 r1	
-	.end
-	
-	
-
diff --git a/newlib/libc/machine/tic80/Makefile.in b/newlib/libc/machine/tic80/Makefile.in
index 9736912..ace6f06 100644
--- a/newlib/libc/machine/tic80/Makefile.in
+++ b/newlib/libc/machine/tic80/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/tic80/aclocal.m4 b/newlib/libc/machine/tic80/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/tic80/aclocal.m4
+++ b/newlib/libc/machine/tic80/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/tic80/configure b/newlib/libc/machine/tic80/configure
index 98bab64..867ded9 100755
--- a/newlib/libc/machine/tic80/configure
+++ b/newlib/libc/machine/tic80/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/v850/Makefile.in b/newlib/libc/machine/v850/Makefile.in
index 9736912..ace6f06 100644
--- a/newlib/libc/machine/v850/Makefile.in
+++ b/newlib/libc/machine/v850/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/v850/aclocal.m4 b/newlib/libc/machine/v850/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/v850/aclocal.m4
+++ b/newlib/libc/machine/v850/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/v850/configure b/newlib/libc/machine/v850/configure
index 98bab64..867ded9 100755
--- a/newlib/libc/machine/v850/configure
+++ b/newlib/libc/machine/v850/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/w65/Makefile.in b/newlib/libc/machine/w65/Makefile.in
index 01f86c0..f5f060d 100644
--- a/newlib/libc/machine/w65/Makefile.in
+++ b/newlib/libc/machine/w65/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,8 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = udivhi3.s umodhi3.s smulhi3.s lshrhi.s sdivhi3.s mulsi3.c 	divsi3.c cmpsi.c
+lib_a_SOURCES = udivhi3.s umodhi3.s smulhi3.s lshrhi.s sdivhi3.s mulsi3.c \
+	divsi3.c cmpsi.c
 
 
 ACLOCAL_AMFLAGS = -I ../../..
@@ -131,8 +127,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/w65/aclocal.m4 b/newlib/libc/machine/w65/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/w65/aclocal.m4
+++ b/newlib/libc/machine/w65/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/w65/configure b/newlib/libc/machine/w65/configure
index ec4e3cf..d1b4138 100755
--- a/newlib/libc/machine/w65/configure
+++ b/newlib/libc/machine/w65/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/xscale/Makefile.am b/newlib/libc/machine/xscale/Makefile.am
index 9b62482..eaa413a 100644
--- a/newlib/libc/machine/xscale/Makefile.am
+++ b/newlib/libc/machine/xscale/Makefile.am
@@ -8,7 +8,7 @@ noinst_LIBRARIES = lib.a
 
 lib_a_SOURCES = \
 	memchr.c memcmp.c memcpy.c memmove.c memset.c \
-	strchr.c strcmp.c strcpy.c strlen.c setjmp.S
+	strchr.c strcmp.c strcpy.c strlen.c
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/xscale/Makefile.in b/newlib/libc/machine/xscale/Makefile.in
index 5f3c31b..cdb0094 100644
--- a/newlib/libc/machine/xscale/Makefile.in
+++ b/newlib/libc/machine/xscale/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,9 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES =  	memchr.c memcmp.c memcpy.c memmove.c memset.c 	strchr.c strcmp.c strcpy.c strlen.c setjmp.S
+lib_a_SOURCES = \
+	memchr.c memcmp.c memcpy.c memmove.c memset.c \
+	strchr.c strcmp.c strcpy.c strlen.c
 
 
 ACLOCAL_AMFLAGS = -I ../../..
@@ -105,7 +102,7 @@ CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
 lib_a_OBJECTS =  memchr.o memcmp.o memcpy.o memmove.o memset.o strchr.o \
-strcmp.o strcpy.o strlen.o setjmp.o
+strcmp.o strcpy.o strlen.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -131,8 +128,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/xscale/aclocal.m4 b/newlib/libc/machine/xscale/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/xscale/aclocal.m4
+++ b/newlib/libc/machine/xscale/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/xscale/configure b/newlib/libc/machine/xscale/configure
index 028b7b4..1802ae6 100755
--- a/newlib/libc/machine/xscale/configure
+++ b/newlib/libc/machine/xscale/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/xscale/machine/profile.h b/newlib/libc/machine/xscale/machine/profile.h
deleted file mode 100644
index 90198ba..0000000
--- a/newlib/libc/machine/xscale/machine/profile.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* profile.h
-
-   Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- 
-   Permission to use, copy, modify, and distribute this software
-   is freely granted, provided that this notice is preserved.  */
-
-#ifndef __XSCALE_PROFILE_H__
-#define __XSCALE_PROFILE_H__
-
-/* FIXME:
-   We need to create a string version of the CPP predefined
-   __USER_LABEL_PREFIX__ macro.  Ideally we would like to
-   so do something like:
-
-     #if  __USER_LABEL_PREFIX__ == _
-
-   but this fails for arm-elf targets because although
-   __USER_LABEL__PREFIX__ is defined, it is not defined to
-   a specific value (even 0) and so the above test fails
-   with:
-   
-      operator '==' has no left operand
-
-  Instead we have to test the CPP predefined __ELF__ and
-  rely upon the *assumption* that ELF targets will not use
-  an underscore prefix and that COFF targets will.  */
-
-#ifdef __ELF__
-#define FOO ""
-#else
-#define FOO "_"
-#endif
-
-#define _MCOUNT_DECL(frompc, selfpc) \
-void __attribute__ ((no_instrument_function)) \
-mcount_internal (frompc, selfpc)
-
-/* mcount_internal expects two arguments
-   r0 frompc (return address for function that call function that calls mcount)
-   r1 selfpc (return address for function that called mcount)
-
-   The frompc is extracted from the stack frames. If the code does not
-   generate stack frames, then mcount cannot extract this
-   information. Thus, the -fomit-frame-pointer optimization cannot be
-   used if a call graph information is required.
-
-   Due to optimizations mcount doesn't set up a new fp. mcount has the fp
-   of the calling function.
-
-   r0 frompc is from the current frame
-   r1 selfpc can be obtained directly from lr.  */
-
-#ifdef __thumb__
-#define MCOUNT					\
-void __attribute__ ((naked))			\
-     __attribute__ ((no_instrument_function))	\
-mcount (void)					\
-{						\
-  __asm__("push {r0, r1, r2, r3, lr};"		\
-	  "add r0, r7, #0;"			\
-	  "beq 1f;"				\
-	  "sub r0, r0, #4;"			\
-	  "ldr r0, [r0];"			\
-	  "1: mov r1, lr;"			\
-	  "bl " FOO "mcount_internal ;"		\
-	  "pop {r0, r1, r2, r3, pc};"		\
-	);					\
-}
-#else
-#define MCOUNT					\
-void __attribute__ ((naked))			\
-     __attribute__ ((no_instrument_function))	\
-mcount (void)					\
-{						\
-  __asm__("stmdb sp!, {r0, r1, r2, r3, lr};"	\
-	  "movs r0, fp;"			\
-	  "ldrne r0, [r0, #-4];"		\
-	  "mov r1, lr;"				\
-	  "bl " FOO "mcount_internal ;" 	\
-          "ldmia sp!, {r0, r1, r2, r3, pc};"	\
-	);					\
-}
-#endif
-
-#define FUNCTION_ALIGNMENT 2
-
-#endif /* !__XSCALE_PROFILE_H__ */
diff --git a/newlib/libc/machine/xscale/memchr.c b/newlib/libc/machine/xscale/memchr.c
index 9bf1826..fc24bf6 100644
--- a/newlib/libc/machine/xscale/memchr.c
+++ b/newlib/libc/machine/xscale/memchr.c
@@ -42,47 +42,47 @@ memchr (const void *start, int c, size_t len)
          R6 = 0x80808080  */
 
       asm (
-       "mov	r6, #0x80\n\
-	add	r6, r6, #0x8000\n\
-	add	r6, r6, r6, lsl #16\n\
-	mvn	r7, r6, lsl #1\n\
-\n\
-0:\n\
-	cmp	%1, #0x7\n\
-	bls	1f\n\
-\n\
-	ldmia	%0!, { r3, r9 }\n\
-"	PRELOADSTR ("%0") "\n\
-	sub	%1, %1, #8\n\
-	eor	r3, r3, %2\n\
-	eor	r9, r9, %2\n\
-	add	r2, r3, r7\n\
-	add	r8, r9, r7\n\
-	bic	r2, r2, r3\n\
-	bic	r8, r8,	r9\n\
-	and	r1, r2, r6\n\
-	and	r9, r8, r6\n\
-	orrs	r1, r1, r9\n\
-	beq	0b\n\
-\n\
-	add	%1, %1, #8\n\
-	sub	%0, %0, #8\n\
-1:\n\
-	cmp	%1, #0x3\n\
-	bls	2f\n\
-\n\
-	ldr	r3, [%0], #4\n\
-"	PRELOADSTR ("%0") "\n\
-	sub	%1, %1, #4\n\
-	eor	r3, r3, %2\n\
-	add	r2, r3, r7\n\
-	bic	r2, r2, r3\n\
-	ands	r1, r2, r6\n\
-	beq	1b\n\
-\n\
-	sub	%0, %0, #4\n\
-	add	%1, %1, #4\n\
-2:\n\
+       "mov	r6, #0x80
+	add	r6, r6, #0x8000
+	add	r6, r6, r6, lsl #16
+	mvn	r7, r6, lsl #1
+
+0:
+	cmp	%1, #0x7
+	bls	1f
+
+	ldmia	%0!, { r3, r9 }
+"	PRELOADSTR ("%0") "
+	sub	%1, %1, #8
+	eor	r3, r3, %2
+	eor	r9, r9, %2
+	add	r2, r3, r7
+	add	r8, r9, r7
+	bic	r2, r2, r3
+	bic	r8, r8,	r9
+	and	r1, r2, r6
+	and	r9, r8, r6
+	orrs	r1, r1, r9
+	beq	0b
+
+	add	%1, %1, #8
+	sub	%0, %0, #8
+1:
+	cmp	%1, #0x3
+	bls	2f
+
+	ldr	r3, [%0], #4
+"	PRELOADSTR ("%0") "
+	sub	%1, %1, #4
+	eor	r3, r3, %2
+	add	r2, r3, r7
+	bic	r2, r2, r3
+	ands	r1, r2, r6
+	beq	1b
+
+	sub	%0, %0, #4
+	add	%1, %1, #4
+2:
 "
        : "=&r" (str), "=&r" (len)
        : "r" (c2), "0" (str), "1" (len)
diff --git a/newlib/libc/machine/xscale/memcmp.c b/newlib/libc/machine/xscale/memcmp.c
index 1eba4b8..1b85af4 100644
--- a/newlib/libc/machine/xscale/memcmp.c
+++ b/newlib/libc/machine/xscale/memcmp.c
@@ -13,96 +13,96 @@ memcmp (const void * s1, const void * s2, size_t len)
   int result;
   asm (
 #ifndef __OPTIMIZE_SIZE__ 
-"\n\
-	cmp	%2, #0x3	@ Is the length a multiple of four ?\n\
-	bls	6f		@ no  = goto SLOW CHECK\n\
-	and	r2, %0, #0x3	@ get alignment of first pointer\n\
-	and	r3, %1, #0x3	@ get alignment of second pointer\n\
-	cmp	r2, r3		@ Do the two pointers share the same alignment ?\n\
-	bne	6f		@ no = goto SLOW CHECK\n\
-	mov	lr, %0		@ copy first pointer into LR\n\
-	mov	r4, %1		@ copy second pointer into R4\n\
-	cmp	r2, #0x0	@ Are we comparing word aligned pointers ?\n\
-	beq	3f		@ yes = goto START WORD CHECK LOOP\n\
-	b	1f		@ jump to LOOP TEST\n\
-0:			       @ LOOP START\n\
-	ldrb	r2, [lr], #1	@ load byte from LR, post inc.\n\
-"	PRELOADSTR("lr") "	@ preload\n\
-	ldrb	r3, [r4], #1	@ load byte from R4, post inc.\n\
-"	PRELOADSTR("r4") "	@ preload\n\
-	cmp	r2, r3		@ are the two bytes the same ?\n\
-	bne	5f		@ no = goto EXIT\n\
-	tst	lr, #0x3	@ has the LR become word aligned ?\n\
-	bne     1f		@ no = skip the next test\n\
-	cmp     %2, #4		@ is the count >= 4 ?\n\
-	bhs     3f		@ yes = goto START WORD CHECK LOOP\n\
-1:			       @ LOOP TEST\n\
-	sub	%2, %2, #1	@ decrement count by one\n\
-	cmn	%2, #0x1	@ has the count reached -1 ?\n\
-	bne	0b		@ no = loop back to LOOP START\n\
-	b	4f		@ goto PASS END\n\
-\n\
-0:			       @ ??\n\
-	cmp	%2, #0x7	@ Is the count a multiple of 8 ?\n\
-	bls	3f		@ no = goto ???\n\
-	ldmia	lr,{r2, r3}	@ get two words from first pointer, post inc\n\
-	ldmia	r4,{r5, r6}	@ get two words from second pointer, post inc\n\
-	sub	%2, %2, #0x4	@ decrement count by 4\n\
-	cmp	r2, r5		@ has the count reached ????\n\
-	bne	1f		@ no = goto\n\
-	sub	%2, %2, #0x4	@ decrement the count by 4\n\
-	add	lr, lr, #0x4	@ add 4 to first pointer\n\
-	add	r4, r4, #0x4	@ add 4 to second pointer\n\
-	cmp	r3, r6		@ ???\n\
-	beq	0b		@ goto ???\n\
-1:			       @ ??\n\
-	add	%2, %2, #0x4	@ Add four to count\n\
-	sub	%0, lr, #0x4	@ decrement first pointer by 4\n\
-	sub	%1, r4, #0x4	@ decrement second pointer by 4\n\
-	b	6f		@ goto SLOW CHECK\n\
-\n\
-3:			       @ START WORD CHECK LOOP\n\
-	cmp	%2, #0x3	@ is the count <= 3 ?\n\
-	bls	1f		@ yes = goto CHECK BYTES BY HAND\n\
-	ldr	r2, [lr], #4	@ get word from LR, post inc\n\
-	ldr	r3, [r4], #4	@ get word from R4, post inc\n\
-	sub	%2, %2, #4	@ decrement count by 4\n\
-	cmp	r2, r3		@ are the two words the same ?\n\
-	bne	1f		@ no = goto CHECK WORD CONTENTS\n\
-0:			       @ WORD CHECK LOOP\n\
-	cmp	%2, #0x3	@ is the count <= 3 ?\n\
-	bls	1f		@ yes = goto CHECK BYTES BY HAND\n\
-	ldr	r2, [lr], #4	@ load word from LR, post inc\n\
-"	PRELOADSTR("lr") "	@ preload\n\
-	ldr	r3, [r4], #4	@ load word from R4, post inc\n\
-"	PRELOADSTR("r4") "	@ preload\n\
-	sub	%2, %2, #4	@ decrement count by 4\n\
-	cmp	r2, r3		@ are the two words the same ?\n\
-	beq	0b		@ yes = goto WORD CHECK LOOP\n\
-1:			       @ CHECK BYTES BY HAND\n\
-	sub	%0, lr, #0x4	@ move LR back a word and put into first pointer\n\
-	sub	%1, r4, #0x4	@ move R4 back a word and put into second pointer\n\
-	add	%2, %2, #4	@ increment the count by 4\n\
+"		
+	cmp	%2, #0x3	@ Is the length a multiple of four ?
+	bls	6f		@ no  = goto SLOW CHECK
+	and	r2, %0, #0x3	@ get alignment of first pointer
+	and	r3, %1, #0x3	@ get alignment of second pointer
+	cmp	r2, r3		@ Do the two pointers share the same alignment ?
+	bne	6f		@ no = goto SLOW CHECK
+	mov	lr, %0		@ copy first pointer into LR
+	mov	r4, %1		@ copy second pointer into R4
+	cmp	r2, #0x0	@ Are we comparing word aligned pointers ?
+	beq	3f		@ yes = goto START WORD CHECK LOOP
+	b	1f		@ jump to LOOP TEST
+0:			       @ LOOP START
+	ldrb	r2, [lr], #1	@ load byte from LR, post inc.
+"	PRELOADSTR("lr") "	@ preload 
+	ldrb	r3, [r4], #1	@ load byte from R4, post inc.
+"	PRELOADSTR("r4") "	@ preload
+	cmp	r2, r3		@ are the two bytes the same ?
+	bne	5f		@ no = goto EXIT
+	tst	lr, #0x3	@ has the LR become word aligned ?
+	bne     1f		@ no = skip the next test
+	cmp     %2, #4		@ is the count >= 4 ?
+	bhs     3f		@ yes = goto START WORD CHECK LOOP
+1:			       @ LOOP TEST
+	sub	%2, %2, #1	@ decrement count by one
+	cmn	%2, #0x1	@ has the count reached -1 ?
+	bne	0b		@ no = loop back to LOOP START
+	b	4f		@ goto PASS END
+
+0:			       @ ??
+	cmp	%2, #0x7	@ Is the count a multiple of 8 ?
+	bls	3f		@ no = goto ???
+	ldmia	lr,{r2, r3}	@ get two words from first pointer, post inc
+	ldmia	r4,{r5, r6}	@ get two words from second pointer, post inc
+	sub	%2, %2, #0x4	@ decrement count by 4
+	cmp	r2, r5		@ has the count reached ????
+	bne	1f		@ no = goto 
+	sub	%2, %2, #0x4	@ decrement the count by 4
+	add	lr, lr, #0x4	@ add 4 to first pointer
+	add	r4, r4, #0x4	@ add 4 to second pointer
+	cmp	r3, r6		@ ???
+	beq	0b		@ goto ???
+1:			       @ ??
+	add	%2, %2, #0x4	@ Add four to count
+	sub	%0, lr, #0x4	@ decrement first pointer by 4
+	sub	%1, r4, #0x4	@ decrement second pointer by 4
+	b	6f		@ goto SLOW CHECK
+
+3:			       @ START WORD CHECK LOOP
+	cmp	%2, #0x3	@ is the count <= 3 ?
+	bls	1f		@ yes = goto CHECK BYTES BY HAND
+	ldr	r2, [lr], #4	@ get word from LR, post inc
+	ldr	r3, [r4], #4	@ get word from R4, post inc
+	sub	%2, %2, #4	@ decrement count by 4
+	cmp	r2, r3		@ are the two words the same ?
+	bne	1f		@ no = goto CHECK WORD CONTENTS
+0:			       @ WORD CHECK LOOP
+	cmp	%2, #0x3	@ is the count <= 3 ?
+	bls	1f		@ yes = goto CHECK BYTES BY HAND
+	ldr	r2, [lr], #4	@ load word from LR, post inc
+"	PRELOADSTR("lr") "	@ preload
+	ldr	r3, [r4], #4	@ load word from R4, post inc
+"	PRELOADSTR("r4") "	@ preload
+	sub	%2, %2, #4	@ decrement count by 4
+	cmp	r2, r3		@ are the two words the same ?
+	beq	0b		@ yes = goto WORD CHECK LOOP
+1:			       @ CHECK BYTES BY HAND
+	sub	%0, lr, #0x4	@ move LR back a word and put into first pointer
+	sub	%1, r4, #0x4	@ move R4 back a word and put into second pointer
+	add	%2, %2, #4	@ increment the count by 4
 				@ fall through into SLOW CHECK"
 #endif /* !__OPTIMIZE_SIZE__ */
-"\n\
-6:			       @ SLOW CHECK\n\
-	sub	%2, %2, #1	@ Decrement the count by one\n\
-	cmn	%2, #0x1	@ Has the count reached -1 ?\n\
-	beq	4f		@ Yes - we are finished, goto PASS END\n\
-0:			       @ LOOP1\n\
-	ldrb	r2, [%0], #1	@ get byte from first pointer\n\
-"	PRELOADSTR("%0") "	@ preload first pointer\n\
-	ldrb	r3, [%1], #1	@ get byte from second pointer\n\
-"	PRELOADSTR("%1") "	@ preload second pointer\n\
-	cmp	r2, r3		@ compare the two loaded bytes\n\
-	bne	5f		@ if they are not equal goto EXIT\n\
-	sub	%2, %2, #1	@ decremented count by 1\n\
-	cmn	%2, #0x1	@ has the count reached -1 ?\n\
-	bne	0b		@ no = then go back to LOOP1\n\
-4:			       @ PASS END\n\
-	mov	r3, r2		@ Default return value is 0\n\
-5:			       @ EXIT\n\
+"
+6:			       @ SLOW CHECK
+	sub	%2, %2, #1	@ Decrement the count by one
+	cmn	%2, #0x1	@ Has the count reached -1 ?
+	beq	4f		@ Yes - we are finished, goto PASS END
+0:			       @ LOOP1
+	ldrb	r2, [%0], #1	@ get byte from first pointer
+"	PRELOADSTR("%0") "	@ preload first pointer
+	ldrb	r3, [%1], #1	@ get byte from second pointer
+"	PRELOADSTR("%1") "	@ preload second pointer
+	cmp	r2, r3		@ compare the two loaded bytes
+	bne	5f		@ if they are not equal goto EXIT
+	sub	%2, %2, #1	@ decremented count by 1
+	cmn	%2, #0x1	@ has the count reached -1 ?
+	bne	0b		@ no = then go back to LOOP1
+4:			       @ PASS END
+	mov	r3, r2		@ Default return value is 0
+5:			       @ EXIT
 	rsb	%0, r3, r2	@ return difference between last two bytes loaded"
        : "=r" (result), "=&r" (s2), "=&r" (len)
        : "0" (s1), "1" (s2), "2" (len)
diff --git a/newlib/libc/machine/xscale/memcpy.c b/newlib/libc/machine/xscale/memcpy.c
index 1a32977..2799fe2 100644
--- a/newlib/libc/machine/xscale/memcpy.c
+++ b/newlib/libc/machine/xscale/memcpy.c
@@ -13,85 +13,85 @@ memcpy (void *dst0, const void *src0, size_t len)
   int dummy;
   asm volatile (
 #ifndef __OPTIMIZE_SIZE__
-       "cmp	%2, #0x3\n\
-	bls	3f\n\
-	and	lr, %1, #0x3\n\
-	and	r3, %0, #0x3\n\
-	cmp	lr, r3\n\
-	bne	3f\n\
-	cmp	lr, #0x0\n\
-	beq	2f\n\
-	b	1f\n\
-0:\n\
-	ldrb	r3, [%1], #1\n\
+       "cmp	%2, #0x3
+	bls	3f
+	and	lr, %1, #0x3
+	and	r3, %0, #0x3
+	cmp	lr, r3
+	bne	3f
+	cmp	lr, #0x0
+	beq	2f
+	b	1f
+0:
+	ldrb	r3, [%1], #1
 "
 	PRELOADSTR ("%1")
-"\n\
-	tst	%1, #0x3\n\
-	strb	r3, [%0], #1\n\
-	beq	3f\n\
-1:\n\
-	sub	%2, %2, #1\n\
-	cmn	%2, #1\n\
-	bne	0b\n\
-2:\n\
-	cmp	%2, #0xf\n\
-	bls	1f\n\
-0:\n\
-	ldmia	%1!, { r3, r4, r5, lr }\n\
+"
+	tst	%1, #0x3
+	strb	r3, [%0], #1
+	beq	3f
+1:
+	sub	%2, %2, #1
+	cmn	%2, #1
+	bne	0b
+2:
+	cmp	%2, #0xf
+	bls	1f
+0:
+	ldmia	%1!, { r3, r4, r5, lr }
 "
 	PRELOADSTR ("%1")
-"\n\
-\n\
-	sub	%2, %2, #16\n\
-	cmp	%2, #0xf\n\
-	stmia	%0!, { r3, r4, r5, lr }\n\
-	bhi	0b\n\
-1:\n\
-	cmp	%2, #0x7\n\
-	bls	1f\n\
-0:\n\
-	ldmia	%1!, { r3, r4 }\n\
+"
+
+	sub	%2, %2, #16
+	cmp	%2, #0xf
+	stmia	%0!, { r3, r4, r5, lr }
+	bhi	0b
+1:
+	cmp	%2, #0x7
+	bls	1f
+0:
+	ldmia	%1!, { r3, r4 }
 "
 	PRELOADSTR ("%1")
-"\n\
-\n\
-	sub	%2, %2, #8\n\
-	cmp	%2, #0x7\n\
-	stmia	%0!, { r3, r4 }\n\
-	bhi	0b\n\
-1:\n\
-	cmp	%2, #0x3\n\
-	bls	3f\n\
-0:\n\
-	sub	%2, %2, #4\n\
-	ldr	r3, [%1], #4\n\
+"
+
+	sub	%2, %2, #8
+	cmp	%2, #0x7
+	stmia	%0!, { r3, r4 }
+	bhi	0b
+1:
+	cmp	%2, #0x3
+	bls	3f
+0:
+	sub	%2, %2, #4
+	ldr	r3, [%1], #4
 "
 	PRELOADSTR ("%1")
-"\n\
-\n\
-	cmp	%2, #0x3\n\
-	str	r3, [%0], #4\n\
-	bhi	0b\n\
+"
+
+	cmp	%2, #0x3
+	str	r3, [%0], #4
+	bhi	0b
 "
 #endif /* !__OPTIMIZE_SIZE__ */
-"\n\
-3:\n\
+"
+3:
 "
 	PRELOADSTR ("%1")
-"\n\
-	sub	%2, %2, #1\n\
-	cmn	%2, #1\n\
-	beq	1f\n\
-0:\n\
-	sub	%2, %2, #1\n\
-	ldrb	r3, [%1], #1\n\
+"
+	sub	%2, %2, #1
+	cmn	%2, #1
+	beq	1f
+0:
+	sub	%2, %2, #1
+	ldrb	r3, [%1], #1
 "
 	PRELOADSTR ("%1")
-"\n\
-	cmn	%2, #1\n\
-	strb	r3, [%0], #1\n\
-	bne	0b\n\
+"
+	cmn	%2, #1
+	strb	r3, [%0], #1
+	bne	0b
 1:"
        : "=&r" (dummy), "=&r" (src0), "=&r" (len)
        : "0" (dst0), "1" (src0), "2" (len)
diff --git a/newlib/libc/machine/xscale/memmove.c b/newlib/libc/machine/xscale/memmove.c
index 04d1a14..47fbfcc 100644
--- a/newlib/libc/machine/xscale/memmove.c
+++ b/newlib/libc/machine/xscale/memmove.c
@@ -13,85 +13,85 @@ do_memcpy (void *dst0, const void *src0, size_t len)
   int dummy;
   asm volatile (
 #ifndef __OPTIMIZE_SIZE__
-       "cmp	%2, #0x3\n\
-	bls	3f\n\
-	and	lr, %1, #0x3\n\
-	and	r3, %0, #0x3\n\
-	cmp	lr, r3\n\
-	bne	3f\n\
-	cmp	lr, #0x0\n\
-	beq	2f\n\
-	b	1f\n\
-0:\n\
-	ldrb	r3, [%1], #1\n\
+       "cmp	%2, #0x3
+	bls	3f
+	and	lr, %1, #0x3
+	and	r3, %0, #0x3
+	cmp	lr, r3
+	bne	3f
+	cmp	lr, #0x0
+	beq	2f
+	b	1f
+0:
+	ldrb	r3, [%1], #1
 "
 	PRELOADSTR ("%1")
-"\n\
-	tst	%1, #0x3\n\
-	strb	r3, [%0], #1\n\
-	beq	3f\n\
-1:\n\
-	sub	%2, %2, #1\n\
-	cmn	%2, #1\n\
-	bne	0b\n\
-2:\n\
-	cmp	%2, #0xf\n\
-	bls	1f\n\
-0:\n\
-	ldmia	%1!, { r3, r4, r5, lr }\n\
+"
+	tst	%1, #0x3
+	strb	r3, [%0], #1
+	beq	3f
+1:
+	sub	%2, %2, #1
+	cmn	%2, #1
+	bne	0b
+2:
+	cmp	%2, #0xf
+	bls	1f
+0:
+	ldmia	%1!, { r3, r4, r5, lr }
 "
 	PRELOADSTR ("%1")
-"\n\
-\n\
-	sub	%2, %2, #16\n\
-	cmp	%2, #0xf\n\
-	stmia	%0!, { r3, r4, r5, lr }\n\
-	bhi	0b\n\
-1:\n\
-	cmp	%2, #0x7\n\
-	bls	1f\n\
-0:\n\
-	ldmia	%1!, { r3, r4 }\n\
+"
+
+	sub	%2, %2, #16
+	cmp	%2, #0xf
+	stmia	%0!, { r3, r4, r5, lr }
+	bhi	0b
+1:
+	cmp	%2, #0x7
+	bls	1f
+0:
+	ldmia	%1!, { r3, r4 }
 "
 	PRELOADSTR ("%1")
-"\n\
-\n\
-	sub	%2, %2, #8\n\
-	cmp	%2, #0x7\n\
-	stmia	%0!, { r3, r4 }\n\
-	bhi	0b\n\
-1:\n\
-	cmp	%2, #0x3\n\
-	bls	3f\n\
-0:\n\
-	sub	%2, %2, #4\n\
-	ldr	r3, [%1], #4\n\
+"
+
+	sub	%2, %2, #8
+	cmp	%2, #0x7
+	stmia	%0!, { r3, r4 }
+	bhi	0b
+1:
+	cmp	%2, #0x3
+	bls	3f
+0:
+	sub	%2, %2, #4
+	ldr	r3, [%1], #4
 "
 	PRELOADSTR ("%1")
-"\n\
-\n\
-	cmp	%2, #0x3\n\
-	str	r3, [%0], #4\n\
-	bhi	0b\n\
+"
+
+	cmp	%2, #0x3
+	str	r3, [%0], #4
+	bhi	0b
 "
 #endif /* !__OPTIMIZE_SIZE__ */
-"\n\
-3:\n\
+"
+3:
 "
 	PRELOADSTR ("%1")
-"\n\
-	sub	%2, %2, #1\n\
-	cmn	%2, #1\n\
-	beq	1f\n\
-0:\n\
-	sub	%2, %2, #1\n\
-	ldrb	r3, [%1], #1\n\
+"
+	sub	%2, %2, #1
+	cmn	%2, #1
+	beq	1f
+0:
+	sub	%2, %2, #1
+	ldrb	r3, [%1], #1
 "
 	PRELOADSTR ("%1")
-"\n\
-	cmn	%2, #1\n\
-	strb	r3, [%0], #1\n\
-	bne	0b\n\
+"
+	cmn	%2, #1
+	strb	r3, [%0], #1
+	bne	0b
 1:"
        : "=&r" (dummy), "=&r" (src0), "=&r" (len)
        : "0" (dst0), "1" (src0), "2" (len)
diff --git a/newlib/libc/machine/xscale/memset.c b/newlib/libc/machine/xscale/memset.c
index 4ff8d01..bfd0f0d 100644
--- a/newlib/libc/machine/xscale/memset.c
+++ b/newlib/libc/machine/xscale/memset.c
@@ -11,78 +11,69 @@ void *
 memset (void *dst, int c, size_t len)
 {
   int dummy;
-
   asm volatile ("tst	%0, #0x3"
 #ifndef __OPTIMIZE_SIZE__
-"\n\
-	beq	1f\n\
-	b	2f\n\
-0:\n\
-	strb	%1, [%0], #1\n\
-	tst	%0, #0x3\n\
-	beq	1f\n\
-2:\n\
-	movs	r3, %2\n\
-	sub	%2, %2, #1\n\
-	bne	0b\n\
-# At this point we know that %2 == len == -1 (since the SUB has already taken\n\
-# place).  If we fall through to the 1: label (as the code used to do), the\n\
-# CMP will detect this negative value and branch to the 2: label.  This will\n\
-# test %2 again, but this time against 0.  The test will fail and the loop\n\
-# at 2: will go on for (almost) ever.  Hence the explicit branch to the end\n\
-# of the hand written assembly code.\n\
-	b       4f\n\
-1:\n\
-	cmp	%2, #0x3\n\
-	bls	2f\n\
-	and	%1, %1, #0xff\n\
-	orr	lr, %1, %1, asl #8\n\
-	cmp	%2, #0xf\n\
-	orr	lr, lr, lr, asl #16\n\
-	bls	1f\n\
-	mov	r3, lr\n\
-	mov	r4, lr\n\
-	mov	r5, lr\n\
-0:\n\
-	sub	%2, %2, #16\n\
-	stmia	%0!, { r3, r4, r5, lr }\n\
-	cmp	%2, #0xf\n\
-	bhi	0b\n\
-1:\n\
-	cmp	%2, #0x7\n\
-	bls	1f\n\
-	mov	r3, lr\n\
-0:\n\
-	sub	%2, %2, #8\n\
-	stmia	%0!, { r3, lr }\n\
-	cmp	%2, #0x7\n\
-	bhi	0b\n\
-1:\n\
-	cmp	%2, #0x3\n\
-	bls	2f\n\
-0:\n\
-	sub	%2, %2, #4\n\
-	str	lr, [%0], #4\n\
-	cmp	%2, #0x3\n\
-	bhi	0b\n\
+"
+	beq	1f
+	b	2f
+0:
+	strb	%1, [%0], #1
+	tst	%0, #0x3
+	beq	1f
+2:
+	movs	r3, %2
+	sub	%2, %2, #1
+	bne	0b
+1:
+	cmp	%2, #0x3
+	bls	2f
+	and	%1, %1, #0xff
+	orr	lr, %1, %1, asl #8
+	cmp	%2, #0xf
+	orr	lr, lr, lr, asl #16
+	bls	1f
+	mov	r3, lr
+	mov	r4, lr
+	mov	r5, lr
+0:
+	sub	%2, %2, #16
+	stmia	%0!, { r3, r4, r5, lr }
+	cmp	%2, #0xf
+	bhi	0b
+1:
+	cmp	%2, #0x7
+	bls	1f
+	mov	r3, lr
+0:
+	sub	%2, %2, #8
+	stmia	%0!, { r3, lr }
+	cmp	%2, #0x7
+	bhi	0b
+1:
+	cmp	%2, #0x3
+	bls	2f
+0:
+	sub	%2, %2, #4
+	str	lr, [%0], #4
+	cmp	%2, #0x3
+	bhi	0b
 "
 #endif /* !__OPTIMIZE_SIZE__ */
-"\n\
-2:\n\
-	movs	r3, %2\n\
-	sub	%2, %2, #1\n\
-	beq	4f\n\
-0:\n\
-	movs	r3, %2\n\
-	sub	%2, %2, #1\n\
-	strb	%1, [%0], #1\n\
-	bne	0b\n\
-4:"
+"
+2:
+	movs	r3, %2
+	sub	%2, %2, #1
+	beq	1f
+0:
+	movs	r3, %2
+	sub	%2, %2, #1
+	strb	%1, [%0], #1
+	bne	0b
+1:"
 
        : "=&r" (dummy), "=&r" (c), "=&r" (len)
        : "0" (dst), "1" (c), "2" (len)
        : "memory", "r3", "r4", "r5", "lr");
-
   return dst;
 }
  
diff --git a/newlib/libc/machine/xscale/strchr.c b/newlib/libc/machine/xscale/strchr.c
index 3b736c5..6ea5032 100644
--- a/newlib/libc/machine/xscale/strchr.c
+++ b/newlib/libc/machine/xscale/strchr.c
@@ -38,29 +38,29 @@ strchr (const char *s, int c)
      R6 = 0xfefefeff [ == ~(0x80808080 << 1) ]
      R5 = 0x80808080  */
 
-  asm (PRELOADSTR ("%0") "\n\
-	mov	r5, #0x80\n\
-	add	r5, r5, #0x8000\n\
-	add	r5, r5, r5, lsl #16\n\
-	mvn	r6, r5, lsl #1\n\
-\n\
-	sub	%0, %0, #4\n\
-0:\n\
-	ldr	r1, [%0, #4]!\n\
-"	PRELOADSTR ("%0") "\n\
-	add	r3, r1, r6\n\
-	bic	r3, r3, r1\n\
-	ands	r2, r3, r5\n\
-	bne	1f\n\
-	eor	r2, r1, %1\n\
-	add	r3, r2, r6\n\
-	bic	r3, r3, r2\n\
-	ands	r1, r3, r5\n\
-	beq	0b\n\
+  asm (PRELOADSTR ("%0") "
+	mov	r5, #0x80
+	add	r5, r5, #0x8000
+	add	r5, r5, r5, lsl #16
+	mvn	r6, r5, lsl #1
+
+	sub	%0, %0, #4
+0:
+	ldr	r1, [%0, #4]!
+"	PRELOADSTR ("%0") "
+	add	r3, r1, r6
+	bic	r3, r3, r1
+	ands	r2, r3, r5
+	bne	1f
+	eor	r2, r1, %1
+	add	r3, r2, r6
+	bic	r3, r3, r2
+	ands	r1, r3, r5
+	beq	0b
 1:"
        : "=&r" (s)
        : "r" (c2), "0" (s)
-       : "r1", "r2", "r3", "r5", "r6", "cc");
+       : "r2", "r3", "r5", "r6", "cc");
 #endif
 
   while (*s && *s != c)
diff --git a/newlib/libc/machine/xscale/strcmp.c b/newlib/libc/machine/xscale/strcmp.c
index 6c94d12..d9ec99b 100644
--- a/newlib/libc/machine/xscale/strcmp.c
+++ b/newlib/libc/machine/xscale/strcmp.c
@@ -32,58 +32,58 @@ strcmp (const char *s1, const char *s2)
      ip = 0x80808080  */
 
       asm (
-       "ldr	r2, [%1, #0]\n\
-	ldr	r3, [%2, #0]\n\
-	cmp	r2, r3\n\
-	bne	2f\n\
-\n\
-	mov	ip, #0x80\n\
-	add	ip, ip, #0x8000\n\
-	add	ip, ip, ip, lsl #16\n\
-	mvn	lr, ip, lsl #1\n\
-\n\
-0:\n\
-	ldr	r2, [%1, #0]\n\
-	add	r3, r2, lr\n\
-	bic	r3, r3, r2\n\
-	tst	r3, ip\n\
-	beq	1f\n\
-	mov	%0, #0x0\n\
-	b	3f\n\
-1:\n\
-	ldr	r2, [%1, #4]!\n\
-	ldr	r3, [%2, #4]!\n\
-"	PRELOADSTR("%1") "\n\
-"	PRELOADSTR("%2") "\n\
-	cmp	r2, r3\n\
+       "ldr	r2, [%1, #0]
+	ldr	r3, [%2, #0]
+	cmp	r2, r3
+	bne	2f
+
+	mov	ip, #0x80
+	add	ip, ip, #0x8000
+	add	ip, ip, ip, lsl #16
+	mvn	lr, ip, lsl #1
+
+0:
+	ldr	r2, [%1, #0]
+	add	r3, r2, lr
+	bic	r3, r3, r2
+	tst	r3, ip
+	beq	1f
+	mov	%0, #0x0
+	b	3f
+1:
+	ldr	r2, [%1, #4]!
+	ldr	r3, [%2, #4]!
+"	PRELOADSTR("%1") "
+"	PRELOADSTR("%2") "
+	cmp	r2, r3
 	beq	0b"
 
        /* The following part could be done in a C loop as well, but it needs
 	  to be assembler to save some cycles in the case where the optimized
 	  loop above finds the strings to be equal.  */
-"\n\
-2:\n\
-	ldrb	r2, [%1, #0]\n\
-"	PRELOADSTR("%1") "\n\
-"	PRELOADSTR("%2") "\n\
-	cmp	r2, #0x0\n\
-	beq	1f\n\
-	ldrb	r3, [%2, #0]\n\
-	cmp	r2, r3\n\
-	bne	1f\n\
-0:\n\
-	ldrb	r3, [%1, #1]!\n\
-	add	%2, %2, #1\n\
-	ands	ip, r3, #0xff\n\
-	beq	1f\n\
-	ldrb	r3, [%2]\n\
-	cmp	ip, r3\n\
-	beq	0b\n\
-1:\n\
-	ldrb	lr, [%1, #0]\n\
-	ldrb	ip, [%2, #0]\n\
-	rsb	%0, ip, lr\n\
-3:\n\
+"
+2:
+	ldrb	r2, [%1, #0]
+"	PRELOADSTR("%1") "
+"	PRELOADSTR("%2") "
+	cmp	r2, #0x0
+	beq	1f
+	ldrb	r3, [%2, #0]
+	cmp	r2, r3
+	bne	1f
+0:
+	ldrb	r3, [%1, #1]!
+	add	%2, %2, #1
+	ands	ip, r3, #0xff
+	beq	1f
+	ldrb	r3, [%2]
+	cmp	ip, r3
+	beq	0b
+1:
+	ldrb	lr, [%1, #0]
+	ldrb	ip, [%2, #0]
+	rsb	%0, ip, lr
+3:
 "
 
        : "=r" (result), "=&r" (s1), "=&r" (s2)
diff --git a/newlib/libc/machine/xscale/strcpy.c b/newlib/libc/machine/xscale/strcpy.c
index 46db2ba..7079026 100644
--- a/newlib/libc/machine/xscale/strcpy.c
+++ b/newlib/libc/machine/xscale/strcpy.c
@@ -28,25 +28,25 @@ strcpy (char *dest, const char *src)
      R4 = 0xfefefeff [ == ~(0x80808080 << 1) ]
      R5 = 0x80808080  */
 
-  asm ("mov	r5, #0x80\n\
-	ldr	r1, [%1, #0]\n\
-	add	r5, r5, #0x8000\n\
-	add	r5, r5, r5, lsl #16\n\
-	mvn	r4, r5, lsl #1\n\
-\n\
-	add	r3, r1, r5\n\
-	bic	r3, r3, r1\n\
-	ands	r2, r3, r4\n\
-	bne	1f\n\
-0:\n\
-	ldr	r3, [%1, #0]\n\
-	ldr	r1, [%1, #4]!\n\
-"	PRELOADSTR("%1") "\n\
-	str	r3, [%0], #4\n\
-	add	r2, r1, r4\n\
-	bic	r2, r2, r1\n\
-	ands	r3, r2, r5\n\
-	beq	0b\n\
+  asm ("mov	r5, #0x80
+	ldr	r1, [%1, #0]
+	add	r5, r5, #0x8000
+	add	r5, r5, r5, lsl #16
+	mvn	r4, r5, lsl #1
+
+	add	r3, r1, r5
+	bic	r3, r3, r1
+	ands	r2, r3, r4
+	bne	1f
+0:
+	ldr	r3, [%1, #0]
+	ldr	r1, [%1, #4]!
+"	PRELOADSTR("%1") "
+	str	r3, [%0], #4
+	add	r2, r1, r4
+	bic	r2, r2, r1
+	ands	r3, r2, r5
+	beq	0b
 1:"
        : "=&r" (dest), "=&r" (src)
        : "0" (dest), "1" (src)
diff --git a/newlib/libc/machine/xscale/strlen.c b/newlib/libc/machine/xscale/strlen.c
index a8bc085..e113ade 100644
--- a/newlib/libc/machine/xscale/strlen.c
+++ b/newlib/libc/machine/xscale/strlen.c
@@ -28,68 +28,68 @@ strlen (const char *str)
      R4 = 0xfefefeff [ == ~(0x80808080 << 1) ]
      R5 = 0x80808080  */
 
-  asm ("mov	r5, #0x80\n\
-	add	r5, r5, #0x8000\n\
-	add	r5, r5, r5, lsl #16\n\
-	mvn	r4, r5, lsl #1\n\
+  asm ("mov	r5, #0x80
+	add	r5, r5, #0x8000
+	add	r5, r5, r5, lsl #16
+	mvn	r4, r5, lsl #1
 "
 
 #if defined __ARM_ARCH_5__ || defined __ARM_ARCH_5T__ || defined __ARM_ARCH_5E__ || defined __ARM_ARCH_5TE__
 
-"	tst	%0, #0x7\n\
-	ldreqd	r6, [%0]\n\
-	beq	1f\n\
-	ldr	r2, [%0]\n\
-        add     r3, r2, r4\n\
-        bic     r3, r3, r2\n\
-        ands    r2, r3, r5\n\
-	bne	2f\n\
-	sub	%0, %0, #4\n\
-\n\
-0:\n\
-	ldrd	r6, [%0, #8]!\n\
+"	tst	%0, #0x7
+	ldreqd	r6, [%0]
+	beq	1f
+	ldr	r2, [%0]
+        add     r3, r2, r4
+        bic     r3, r3, r2
+        ands    r2, r3, r5
+	bne	2f
+	sub	%0, %0, #4
+
+0:
+	ldrd	r6, [%0, #8]!
 "
 	PRELOADSTR ("%0")
-"\n\
-1:\n\
-	add	r3, r6, r4\n\
-	add	r2, r7, r4\n\
-	bic	r3, r3, r6\n\
-	bic	r2, r2, r7\n\
-	and	r3, r3, r5\n\
-	and	r2, r2, r5\n\
-	orrs	r3, r2, r3\n\
-	beq	0b\n\
+"
+1:
+	add	r3, r6, r4
+	add	r2, r7, r4
+	bic	r3, r3, r6
+	bic	r2, r2, r7
+	and	r3, r3, r5
+	and	r2, r2, r5
+	orrs	r3, r2, r3
+	beq	0b
 "
 #else
 
-"	sub	%0, %0, #4\n\
-\n\
-0:\n\
-	ldr	r6, [%0, #4]!\n\
+"	sub	%0, %0, #4
+
+0:
+	ldr	r6, [%0, #4]!
 "
 	PRELOADSTR ("%0")
-"\n\
-	add	r3, r6, r4\n\
-	bic	r3, r3, r6\n\
-	ands	r3, r3, r5\n\
-	beq	0b\n\
+"
+	add	r3, r6, r4
+	bic	r3, r3, r6
+	ands	r3, r3, r5
+	beq	0b
 "
 #endif /* __ARM_ARCH_5[T][E]__ */
-"\n\
-2:\n\
-	ldrb	r3, [%0]\n\
-	cmp	r3, #0x0\n\
-	beq	1f\n\
-\n\
-0:\n\
-	ldrb	r3, [%0, #1]!\n\
+"
+2:
+	ldrb	r3, [%0]
+	cmp	r3, #0x0
+	beq	1f
+
+0:
+	ldrb	r3, [%0, #1]!
 "
 	PRELOADSTR ("%0")
-"\n\
-	cmp	r3, #0x0\n\
-	bne	0b\n\
-1:\n\
+"
+	cmp	r3, #0x0
+	bne	0b
+1:
 "
        : "=r" (str) : "0" (str) : "r2", "r3", "r4", "r5", "r6", "r7");
 
diff --git a/newlib/libc/machine/xstormy16/Makefile.am b/newlib/libc/machine/xstormy16/Makefile.am
deleted file mode 100644
index fe4e6ab..0000000
--- a/newlib/libc/machine/xstormy16/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-# hack: putting $(newlib_basedir)/libm/common into INCLUDES forces automake
-# to output a definition for newlib_basedir.
-INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
-lib_a_LIBADD = malloc.o free.o realloc.o calloc.o cfree.o malign.o \
-	valloc.o pvalloc.o mallinfo.o mallstats.o msize.o mallopt.o \
-	mallocr.o freer.o reallocr.o callocr.o
-
-MALLOC_COMPILE = $(COMPILE)
-
-malloc.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_MALLOC -c $(srcdir)/tiny-malloc.c -o $@
-
-free.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_FREE -c $(srcdir)/tiny-malloc.c -o $@
-
-realloc.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_REALLOC -c $(srcdir)/tiny-malloc.c -o $@
-
-calloc.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_CALLOC -c $(srcdir)/tiny-malloc.c -o $@
-
-cfree.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_CFREE -c $(srcdir)/tiny-malloc.c -o $@
-
-malign.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_MEMALIGN -c $(srcdir)/tiny-malloc.c -o $@
-
-valloc.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_VALLOC -c $(srcdir)/tiny-malloc.c -o $@
-
-pvalloc.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_PVALLOC -c $(srcdir)/tiny-malloc.c -o $@
-
-mallinfo.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_MALLINFO -c $(srcdir)/tiny-malloc.c -o $@
-
-mallstats.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_MALLOC_STATS -c $(srcdir)/tiny-malloc.c -o $@
-
-msize.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_MALLOC_USABLE_SIZE -c $(srcdir)/tiny-malloc.c -o $@
-
-mallopt.o: mallocr.c
-	$(MALLOC_COMPILE) -DDEFINE_MALLOPT -c $(srcdir)/mallocr.c -o $@
-
-mallocr.o: mallocr.c
-	$(MALLOC_COMPILE) -DDEFINE_MALLOC -c $(srcdir)/mallocr.c -o $@
-
-freer.o: mallocr.c
-	$(MALLOC_COMPILE) -DDEFINE_FREE -c $(srcdir)/mallocr.c -o $@
-
-reallocr.o: mallocr.c
-	$(MALLOC_COMPILE) -DDEFINE_REALLOC -c $(srcdir)/mallocr.c -o $@
-
-callocr.o: mallocr.c
-	$(MALLOC_COMPILE) -DDEFINE_CALLOC -c $(srcdir)/mallocr.c -o $@
-
diff --git a/newlib/libc/machine/xstormy16/Makefile.in b/newlib/libc/machine/xstormy16/Makefile.in
deleted file mode 100644
index bd25f11..0000000
--- a/newlib/libc/machine/xstormy16/Makefile.in
+++ /dev/null
@@ -1,384 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-# hack: putting $(newlib_basedir)/libm/common into INCLUDES forces automake
-# to output a definition for newlib_basedir.
-INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = setjmp.S
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
-lib_a_LIBADD = malloc.o free.o realloc.o calloc.o cfree.o malign.o 	valloc.o pvalloc.o mallinfo.o mallstats.o msize.o mallopt.o 	mallocr.o freer.o reallocr.o callocr.o
-
-
-MALLOC_COMPILE = $(COMPILE)
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_DEPENDENCIES =  malloc.o free.o realloc.o calloc.o cfree.o \
-malign.o valloc.o pvalloc.o mallinfo.o mallstats.o msize.o mallopt.o \
-mallocr.o freer.o reallocr.o callocr.o
-lib_a_OBJECTS =  setjmp.o
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-malloc.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_MALLOC -c $(srcdir)/tiny-malloc.c -o $@
-
-free.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_FREE -c $(srcdir)/tiny-malloc.c -o $@
-
-realloc.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_REALLOC -c $(srcdir)/tiny-malloc.c -o $@
-
-calloc.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_CALLOC -c $(srcdir)/tiny-malloc.c -o $@
-
-cfree.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_CFREE -c $(srcdir)/tiny-malloc.c -o $@
-
-malign.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_MEMALIGN -c $(srcdir)/tiny-malloc.c -o $@
-
-valloc.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_VALLOC -c $(srcdir)/tiny-malloc.c -o $@
-
-pvalloc.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_PVALLOC -c $(srcdir)/tiny-malloc.c -o $@
-
-mallinfo.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_MALLINFO -c $(srcdir)/tiny-malloc.c -o $@
-
-mallstats.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_MALLOC_STATS -c $(srcdir)/tiny-malloc.c -o $@
-
-msize.o: tiny-malloc.c
-	$(MALLOC_COMPILE) -DDEFINE_MALLOC_USABLE_SIZE -c $(srcdir)/tiny-malloc.c -o $@
-
-mallopt.o: mallocr.c
-	$(MALLOC_COMPILE) -DDEFINE_MALLOPT -c $(srcdir)/mallocr.c -o $@
-
-mallocr.o: mallocr.c
-	$(MALLOC_COMPILE) -DDEFINE_MALLOC -c $(srcdir)/mallocr.c -o $@
-
-freer.o: mallocr.c
-	$(MALLOC_COMPILE) -DDEFINE_FREE -c $(srcdir)/mallocr.c -o $@
-
-reallocr.o: mallocr.c
-	$(MALLOC_COMPILE) -DDEFINE_REALLOC -c $(srcdir)/mallocr.c -o $@
-
-callocr.o: mallocr.c
-	$(MALLOC_COMPILE) -DDEFINE_CALLOC -c $(srcdir)/mallocr.c -o $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/machine/xstormy16/aclocal.m4 b/newlib/libc/machine/xstormy16/aclocal.m4
deleted file mode 100644
index 55d5e67..0000000
--- a/newlib/libc/machine/xstormy16/aclocal.m4
+++ /dev/null
@@ -1,369 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
diff --git a/newlib/libc/machine/xstormy16/configure b/newlib/libc/machine/xstormy16/configure
deleted file mode 100755
index 98bab64..0000000
--- a/newlib/libc/machine/xstormy16/configure
+++ /dev/null
@@ -1,1883 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=setjmp.S
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/machine/xstormy16/configure.in b/newlib/libc/machine/xstormy16/configure.in
deleted file mode 100644
index 3bb4386..0000000
--- a/newlib/libc/machine/xstormy16/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/machine/calmrisc16 configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(setjmp.S)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/machine/xstormy16/mallocr.c b/newlib/libc/machine/xstormy16/mallocr.c
deleted file mode 100644
index 23e02f7..0000000
--- a/newlib/libc/machine/xstormy16/mallocr.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <malloc.h>
-
-#ifdef DEFINE_MALLOC
-_PTR 
-_malloc_r (struct _reent *r, size_t sz)
-{
-  return malloc (sz);
-}
-#endif
-
-#ifdef DEFINE_CALLOC
-_PTR 
-_calloc_r (struct _reent *r, size_t a, size_t b)
-{
-  return calloc (a, b);
-}
-#endif
-
-#ifdef DEFINE_FREE
-void
-_free_r (struct _reent *r, _PTR x)
-{
-  free (x);
-}
-#endif
-
-#ifdef DEFINE_REALLOC
-_PTR 
-_realloc_r (struct _reent *r, _PTR x, size_t sz)
-{
-  return realloc (x, sz);
-}
-#endif
diff --git a/newlib/libc/machine/xstormy16/setjmp.S b/newlib/libc/machine/xstormy16/setjmp.S
deleted file mode 100644
index f2f7210..0000000
--- a/newlib/libc/machine/xstormy16/setjmp.S
+++ /dev/null
@@ -1,57 +0,0 @@
-;;  xstormy16
-;;   Copyright (C) 2001 by  Red Hat, Incorporated. All rights reserved.
-;; 
-;; Permission to use, copy, modify, and distribute this software
-;; is freely granted, provided that this notice is preserved.
-;; 
-	.file "setjmp.S"
-
-	.section .text
-	.align 1
-	.global setjmp
-	.type setjmp,@function
-setjmp:
-	mov r0,r10
-	mov (r2++),r0
-	mov r0,r11
-	mov (r2++),r0
-	mov r0,r12
-	mov (r2++),r0
-	mov r0,r13
-	mov (r2++),r0
-	pop r0			; PC high word
-	pop r1			; PC low word
-	mov (r2++), r0
-	mov (r2++), r1
-	mov r3,sp
-	mov (r2++),r3
-	mov.w r2,#0
-	mov r8, r0
-	mov r9, r1
-	jmp r8, r9
-	.size setjmp,.-setjmp
-
-	.global longjmp
-	.type longjmp,@function
-longjmp:
-	mov r0,(r2++)
-	mov r10,r0
-	mov r0,(r2++)
-	mov r11,r0
-	mov r0,(r2++)
-	mov r12,r0
-	mov r0,(r2++)
-	mov r13,r0
-	mov r0,(r2++)
-	mov r8, r0
-	mov r1,(r2++)
-	mov r9, r1
-	mov r4,(r2++)
-	mov sp,r4
-;; status arg (r3) to longjmp is return value
-;; if it's zero, return 1
-	bnz r3, #0, 0f
-	mov.w r3,#1
-0:	mov r2, r3
-	jmp r8,r9
-	.size longjmp,.-longjmp
diff --git a/newlib/libc/machine/xstormy16/tiny-malloc.c b/newlib/libc/machine/xstormy16/tiny-malloc.c
deleted file mode 100644
index 597e389..0000000
--- a/newlib/libc/machine/xstormy16/tiny-malloc.c
+++ /dev/null
@@ -1,598 +0,0 @@
-/* A replacement malloc with:
-   - Much reduced code size;
-   - Smaller RAM footprint;
-   - The ability to handle downward-growing heaps;
-   but
-   - Slower;
-   - Probably higher memory fragmentation;
-   - Doesn't support threads (but, if it did support threads,
-     it wouldn't need a global lock, only a compare-and-swap instruction);
-   - Assumes the maximum alignment required is the alignment of a pointer;
-   - Assumes that memory is already there and doesn't need to be allocated.
-
-* Synopsis of public routines
-
-  malloc(size_t n);
-     Return a pointer to a newly allocated chunk of at least n bytes, or null
-     if no space is available.
-  free(void* p);
-     Release the chunk of memory pointed to by p, or no effect if p is null.
-  realloc(void* p, size_t n);
-     Return a pointer to a chunk of size n that contains the same data
-     as does chunk p up to the minimum of (n, p's size) bytes, or null
-     if no space is available. The returned pointer may or may not be
-     the same as p. If p is null, equivalent to malloc.  Unless the
-     #define REALLOC_ZERO_BYTES_FREES below is set, realloc with a
-     size argument of zero (re)allocates a minimum-sized chunk.
-  memalign(size_t alignment, size_t n);
-     Return a pointer to a newly allocated chunk of n bytes, aligned
-     in accord with the alignment argument, which must be a power of
-     two.  Will fail if 'alignment' is too large.
-  calloc(size_t unit, size_t quantity);
-     Returns a pointer to quantity * unit bytes, with all locations
-     set to zero.
-  cfree(void* p);
-     Equivalent to free(p).
-  malloc_trim(size_t pad);
-     Release all but pad bytes of freed top-most memory back 
-     to the system. Return 1 if successful, else 0.
-  malloc_usable_size(void* p);
-     Report the number usable allocated bytes associated with allocated
-     chunk p. This may or may not report more bytes than were requested,
-     due to alignment and minimum size constraints.
-  malloc_stats();
-     Prints brief summary statistics on stderr.
-  mallinfo()
-     Returns (by copy) a struct containing various summary statistics.
-  mallopt(int parameter_number, int parameter_value)
-     Changes one of the tunable parameters described below. Returns
-     1 if successful in changing the parameter, else 0.  Actually, returns 0
-     always, as no parameter can be changed.
-*/
-
-#ifdef __xstormy16__
-#define MALLOC_DIRECTION -1
-#endif
-
-#ifndef MALLOC_DIRECTION
-#define MALLOC_DIRECTION 1
-#endif
-
-#include <stddef.h>
-
-void* malloc(size_t);
-void    free(void*);
-void* realloc(void*, size_t);
-void* memalign(size_t, size_t);
-void* valloc(size_t);
-void* pvalloc(size_t);
-void* calloc(size_t, size_t);
-void    cfree(void*);
-int     malloc_trim(size_t);
-size_t  malloc_usable_size(void*);
-void    malloc_stats(void);
-int     mallopt(int, int);
-struct mallinfo mallinfo(void);
-
-typedef struct freelist_entry {
-  size_t size;
-  struct freelist_entry *next;
-} *fle;
-
-extern void * __malloc_end;
-extern fle __malloc_freelist;
-
-/* Return the number of bytes that need to be added to X to make it
-   aligned to an ALIGN boundary.  ALIGN must be a power of 2.  */
-#define M_ALIGN(x, align) (-(size_t)(x) & ((align) - 1))
-
-/* Return the number of bytes that need to be subtracted from X to make it
-   aligned to an ALIGN boundary.  ALIGN must be a power of 2.  */
-#define M_ALIGN_SUB(x, align) ((size_t)(x) & ((align) - 1))
-
-extern void __malloc_start;
-
-/* This is the minimum gap allowed between __malloc_end and the top of
-   the stack.  This is only checked for when __malloc_end is
-   decreased; if instead the stack grows into the heap, silent data
-   corruption will result.  */
-#define MALLOC_MINIMUM_GAP 32
-
-#ifdef __xstormy16__
-register void * stack_pointer asm ("r15");
-#define MALLOC_LIMIT stack_pointer
-#else
-#define MALLOC_LIMIT __builtin_frame_address (0)
-#endif
-
-#if MALLOC_DIRECTION < 0
-#define CAN_ALLOC_P(required)				\
-  (((size_t) __malloc_end - (size_t)MALLOC_LIMIT	\
-    - MALLOC_MINIMUM_GAP) >= (required))
-#else
-#define CAN_ALLOC_P(required)				\
-  (((size_t)MALLOC_LIMIT - (size_t) __malloc_end	\
-    - MALLOC_MINIMUM_GAP) >= (required))
-#endif
-
-/* real_size is the size we actually have to allocate, allowing for
-   overhead and alignment.  */
-#define REAL_SIZE(sz)						\
-  ((sz) < sizeof (struct freelist_entry) - sizeof (size_t)	\
-   ? sizeof (struct freelist_entry)				\
-   : sz + sizeof (size_t) + M_ALIGN(sz, sizeof (size_t)))
-
-#ifdef DEFINE_MALLOC
-
-void * __malloc_end = &__malloc_start;
-fle __malloc_freelist;
-
-void *
-malloc (size_t sz)
-{
-  fle *nextfree;
-  fle block;
-
-  /* real_size is the size we actually have to allocate, allowing for
-     overhead and alignment.  */
-  size_t real_size = REAL_SIZE (sz);
-
-  /* Look for the first block on the freelist that is large enough.  */
-  for (nextfree = &__malloc_freelist; 
-       *nextfree; 
-       nextfree = &(*nextfree)->next)  
-    {
-      block = *nextfree;
-      
-      if (block->size >= real_size)
-	{
-	  /* If the block found is just the right size, remove it from
-	     the free list.  Otherwise, split it.  */
-	  if (block->size < real_size + sizeof (struct freelist_entry))
-	    {
-	      *nextfree = block->next;
-	      return (void *)&block->next;
-	    }
-	  else
-	    {
-	      size_t newsize = block->size - real_size;
-	      fle newnext = block->next;
-	      *nextfree = (fle)((size_t)block + real_size);
-	      (*nextfree)->size = newsize;
-	      (*nextfree)->next = newnext;
-	      goto done;
-	    }
-	}
-
-      /* If this is the last block on the freelist, and it was too small,
-	 enlarge it.  */
-      if (! block->next
-	  && __malloc_end == (void *)((size_t)block + block->size))
-	{
-	  size_t moresize = real_size - block->size;
-	  if (! CAN_ALLOC_P (moresize))
-	    return NULL;
-	  
-	  *nextfree = NULL;
-	  if (MALLOC_DIRECTION < 0)
-	    {
-	      block = __malloc_end = (void *)((size_t)block - moresize);
-	    }
-	  else
-	    {
-	      __malloc_end = (void *)((size_t)block + real_size);
-	    }
-
-	  goto done;
-	}
-    }
-
-  /* No free space at the end of the free list.  Allocate new space
-     and use that.  */
-
-  if (! CAN_ALLOC_P (real_size))
-    return NULL;
-
-  if (MALLOC_DIRECTION > 0)
-    {
-      block = __malloc_end;
-      __malloc_end = (void *)((size_t)__malloc_end + real_size);
-    }
-  else
-    {
-      block = __malloc_end = (void *)((size_t)__malloc_end - real_size);
-    }
- done:
-  block->size = real_size;
-  return (void *)&block->next;
-}
-
-#endif
-
-#ifdef DEFINE_FREE
-
-void
-free (void *block_p)
-{
-  fle *nextfree;
-  fle block = (fle)((size_t) block_p - offsetof (struct freelist_entry, next));
-
-  if (block_p == NULL)
-    return;
-  
-  /* Look on the freelist to see if there's a free block just before
-     or just after this block.  */
-  for (nextfree = &__malloc_freelist; 
-       *nextfree; 
-       nextfree = &(*nextfree)->next)
-    {
-      fle thisblock = *nextfree;
-      if ((size_t)thisblock + thisblock->size == (size_t) block)
-	{
-	  thisblock->size += block->size;
-	  if (MALLOC_DIRECTION > 0
-	      && thisblock->next
-	      && (size_t) block + block->size == (size_t) thisblock->next)
-	    {
-	      thisblock->size += thisblock->next->size;
-	      thisblock->next = thisblock->next->next;
-	    }
-	  return;
-	}
-      else if ((size_t) thisblock == (size_t) block + block->size)
-	{
-	  if (MALLOC_DIRECTION < 0
-	      && thisblock->next
-	      && (size_t) block == ((size_t) thisblock->next 
-				    + thisblock->next->size))
-	    {
-	      *nextfree = thisblock->next;
-	      thisblock->next->size += block->size + thisblock->size;
-	    }
-	  else
-	    {
-	      block->size += thisblock->size;
-	      block->next = thisblock->next;
-	      *nextfree = block;
-	    }
-	  return;
-	}
-      else if ((MALLOC_DIRECTION > 0
-		&& (size_t) thisblock > (size_t) block)
-	       || (MALLOC_DIRECTION < 0
-		   && (size_t) thisblock < (size_t) block))
-	break;
-    }
-
-  block->next = *nextfree;
-  *nextfree = block;
-  return;
-}
-#endif
-
-#ifdef DEFINE_REALLOC
-void *
-realloc (void *block_p, size_t sz)
-{
-  fle block = (fle)((size_t) block_p - offsetof (struct freelist_entry, next));
-  size_t real_size = REAL_SIZE (sz);
-  size_t old_real_size;
-
-  if (block_p == NULL)
-    return malloc (sz);
-
-  old_real_size = block->size;
-
-  /* Perhaps we need to allocate more space.  */
-  if (old_real_size < real_size)
-    {
-      void *result;
-      size_t old_size = old_real_size - sizeof (size_t);
-      
-      /* Need to allocate, copy, and free.  */
-      result = malloc (sz);
-      if (result == NULL)
-	return NULL;
-      memcpy (result, block_p, old_size < sz ? old_size : sz);
-      free (block_p);
-      return result;
-    }
-  /* Perhaps we can free some space.  */
-  if (old_real_size - real_size >= sizeof (struct freelist_entry))
-    {
-      fle newblock = (fle)((size_t)block + real_size);
-      block->size = real_size;
-      newblock->size = old_real_size - real_size;
-      free (&newblock->next);
-    }
-  return block_p;
-}
-#endif
-
-#ifdef DEFINE_CALLOC
-void *
-calloc (size_t n, size_t elem_size)
-{
-  void *result;
-  size_t sz = n * elem_size;
-  result = malloc (sz);
-  if (result != NULL)
-    memset (result, 0, sz);
-  return result;
-}
-#endif
-
-#ifdef DEFINE_CFREE
-void
-cfree (void *p)
-{
-  free (p);
-}
-#endif
-
-#ifdef DEFINE_MEMALIGN
-void *
-memalign (size_t align, size_t sz)
-{
-  fle *nextfree;
-  fle block;
-
-  /* real_size is the size we actually have to allocate, allowing for
-     overhead and alignment.  */
-  size_t real_size = REAL_SIZE (sz);
-
-  /* Some sanity checking on 'align'. */
-  if ((align & (align - 1)) != 0
-      || align <= 0)
-    return NULL;
-
-  /* Look for the first block on the freelist that is large enough.  */
-  /* One tricky part is this: We want the result to be a valid pointer
-     to free.  That means that there has to be room for a size_t
-     before the block.  If there's additional space before the block,
-     it should go on the freelist, or it'll be lost---we could add it
-     to the size of the block before it in memory, but finding the
-     previous block is expensive.  */
-  for (nextfree = &__malloc_freelist; 
-       ; 
-       nextfree = &(*nextfree)->next)  
-    {
-      size_t before_size;
-      size_t old_size;
-
-      /* If we've run out of free blocks, allocate more space.  */
-      if (! *nextfree)
-	{
-	  old_size = real_size;
-	  if (MALLOC_DIRECTION < 0)
-	    {
-	      old_size += M_ALIGN_SUB (((size_t)__malloc_end 
-					- old_size + sizeof (size_t)),
-				       align);
-	      if (! CAN_ALLOC_P (old_size))
-		return NULL;
-	      block = __malloc_end = (void *)((size_t)__malloc_end - old_size);
-	    }
-	  else
-	    {
-	      block = __malloc_end;
-	      old_size += M_ALIGN ((size_t)__malloc_end + sizeof (size_t),
-				   align);
-	      if (! CAN_ALLOC_P (old_size))
-		return NULL;
-	      __malloc_end = (void *)((size_t)__malloc_end + old_size);
-	    }
-	  *nextfree = block;
-	  block->size = old_size;
-	  block->next = NULL;
-	}
-      else
-	{
-	  block = *nextfree;
-	  old_size = block->size;
-	}
-      
-
-      before_size = M_ALIGN (&block->next, align);
-      if (before_size != 0)
-	before_size = sizeof (*block) + M_ALIGN (&(block+1)->next, align);
-
-      /* If this is the last block on the freelist, and it is too small,
-	 enlarge it.  */
-      if (! block->next
-	  && old_size < real_size + before_size
-	  && __malloc_end == (void *)((size_t)block + block->size))
-	{
-	  if (MALLOC_DIRECTION < 0)
-	    {
-	      size_t moresize = real_size - block->size;
-	      moresize += M_ALIGN_SUB ((size_t)&block->next - moresize, align);
-	      if (! CAN_ALLOC_P (moresize))
-		return NULL;
-	      block = __malloc_end = (void *)((size_t)block - moresize);
-	      block->next = NULL;
-	      block->size = old_size = old_size + moresize;
-	      before_size = 0;
-	    }
-	  else
-	    {
-	      if (! CAN_ALLOC_P (before_size + real_size - block->size))
-		return NULL;
-	      __malloc_end = (void *)((size_t)block + before_size + real_size);
-	      block->size = old_size = before_size + real_size;
-	    }
-
-	  /* Two out of the four cases below will now be possible; which
-	     two depends on MALLOC_DIRECTION.  */
-	}
-
-      if (old_size >= real_size + before_size)
-	{
-	  /* This block will do.  If there needs to be space before it, 
-	     split the block.  */
-	  if (before_size != 0)
-	    {
-	      fle old_block = block;
-
-	      old_block->size = before_size;
-	      block = (fle)((size_t)block + before_size);
-	      
-	      /* If there's no space after the block, we're now nearly
-                 done; just make a note of the size required.  
-	         Otherwise, we need to create a new free space block.  */
-	      if (old_size - before_size 
-		  <= real_size + sizeof (struct freelist_entry))
-		{
-		  block->size = old_size - before_size;
-		  return (void *)&block->next;
-		}
-	      else 
-		{
-		  fle new_block;
-		  new_block = (fle)((size_t)block + real_size);
-		  new_block->size = old_size - before_size - real_size;
-		  if (MALLOC_DIRECTION > 0)
-		    {
-		      new_block->next = old_block->next;
-		      old_block->next = new_block;
-		    }
-		  else
-		    {
-		      new_block->next = old_block;
-		      *nextfree = new_block;
-		    }
-		  goto done;
-		}
-	    }
-	  else
-	    {
-	      /* If the block found is just the right size, remove it from
-		 the free list.  Otherwise, split it.  */
-	      if (old_size <= real_size + sizeof (struct freelist_entry))
-		{
-		  *nextfree = block->next;
-		  return (void *)&block->next;
-		}
-	      else
-		{
-		  size_t newsize = old_size - real_size;
-		  fle newnext = block->next;
-		  *nextfree = (fle)((size_t)block + real_size);
-		  (*nextfree)->size = newsize;
-		  (*nextfree)->next = newnext;
-		  goto done;
-		}
-	    }
-	}
-    }
-
- done:
-  block->size = real_size;
-  return (void *)&block->next;
-}
-#endif
-
-#ifdef DEFINE_VALLOC
-void *
-valloc (size_t sz)
-{
-  return memalign (128, sz);
-}
-#endif
-#ifdef DEFINE_PVALLOC
-void *
-pvalloc (size_t sz)
-{
-  return memalign (128, sz + M_ALIGN (sz, 128));
-}
-#endif
-
-#ifdef DEFINE_MALLINFO
-#include "malloc.h"
-
-struct mallinfo 
-mallinfo (void)
-{
-  struct mallinfo r;
-  fle fr;
-  size_t free_size;
-  size_t total_size;
-  size_t free_blocks;
-
-  memset (&r, 0, sizeof (r));
-
-  free_size = 0;
-  free_blocks = 0;
-  for (fr = __malloc_freelist; fr; fr = fr->next)
-    {
-      free_size += fr->size;
-      free_blocks++;
-      if (! fr->next)
-	{
-	  int atend;
-	  if (MALLOC_DIRECTION > 0)
-	    atend = (void *)((size_t)fr + fr->size) == __malloc_end;
-	  else
-	    atend = (void *)fr == __malloc_end;
-	  if (atend)
-	    r.keepcost = fr->size;
-	}
-    }
-
-  if (MALLOC_DIRECTION > 0)
-    total_size = (char *)__malloc_end - (char *)&__malloc_start;
-  else
-    total_size = (char *)&__malloc_start - (char *)__malloc_end;
-  
-#ifdef DEBUG
-  /* Fixme: should walk through all the in-use blocks and see if
-     they're valid.  */
-#endif
-
-  r.arena = total_size;
-  r.fordblks = free_size;
-  r.uordblks = total_size - free_size;
-  r.ordblks = free_blocks;
-  return r;
-}
-#endif
-
-#ifdef DEFINE_MALLOC_STATS
-#include "malloc.h"
-#include <stdio.h>
-
-void 
-malloc_stats(void)
-{
-  struct mallinfo i;
-  FILE *fp;
-  
-  fp = stderr;
-  i = mallinfo();
-  fprintf (fp, "malloc has reserved %u bytes between %p and %p\n",
-	   i.arena, &__malloc_start, __malloc_end);
-  fprintf (fp, "there are %u bytes free in %u chunks\n",
-	   i.fordblks, i.ordblks);
-  fprintf (fp, "of which %u bytes are at the end of the reserved space\n",
-	   i.keepcost);
-  fprintf (fp, "and %u bytes are in use.\n", i.uordblks);
-}
-#endif
-
-#ifdef DEFINE_MALLOC_USABLE_SIZE
-size_t 
-malloc_usable_size (void *block_p)
-{
-  fle block = (fle)((size_t) block_p - offsetof (struct freelist_entry, next));
-  return block->size - sizeof (size_t);
-}
-#endif
-
-#ifdef DEFINE_MALLOPT
-int
-mallopt (int n, int v)
-{
-  (void)n; (void)v;
-  return 0;
-}
-#endif
diff --git a/newlib/libc/machine/z8k/Makefile.am b/newlib/libc/machine/z8k/Makefile.am
index eac616a..1c65b9f 100644
--- a/newlib/libc/machine/z8k/Makefile.am
+++ b/newlib/libc/machine/z8k/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = setjmp.S memset.S memcpy.S memmove.S memcmp.S
+lib_a_SOURCES = setjmp.S
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/machine/z8k/Makefile.in b/newlib/libc/machine/z8k/Makefile.in
index 2dced64..ace6f06 100644
--- a/newlib/libc/machine/z8k/Makefile.in
+++ b/newlib/libc/machine/z8k/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = setjmp.S memset.S memcpy.S memmove.S memcmp.S
+lib_a_SOURCES = setjmp.S
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@@ -103,7 +98,7 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-lib_a_OBJECTS =  setjmp.o memset.o memcpy.o memmove.o memcmp.o
+lib_a_OBJECTS =  setjmp.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/machine/z8k/aclocal.m4 b/newlib/libc/machine/z8k/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/machine/z8k/aclocal.m4
+++ b/newlib/libc/machine/z8k/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/machine/z8k/configure b/newlib/libc/machine/z8k/configure
index 8b9a4a1..1d74f6b 100755
--- a/newlib/libc/machine/z8k/configure
+++ b/newlib/libc/machine/z8k/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/machine/z8k/memcmp.S b/newlib/libc/machine/z8k/memcmp.S
deleted file mode 100644
index ae41e63..0000000
--- a/newlib/libc/machine/z8k/memcmp.S
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * memcmp routine for Z8000
- * Copyright (C) 2004 Christian Groessler <chris@groessler.org>
- *
- * Permission to use, copy, modify, and distribute this file
- * for any purpose is hereby granted without fee, provided that
- * the above copyright notice and this notice appears in all
- * copies.
- *
- * This file is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* int memcmp(const void *b1, const void *b2, size_t length);
- */
-
-	name	"memcmp.S"
-
-	.text
-	even
-global	_memcmp
-
-_memcmp:
-
-#ifdef __Z8001__
-	segm
-
-#ifdef __STD_CALL__
-	ldl	rr6,rr14(#4)
-	ldl	rr4,rr14(#8)
-	ldl	rr2,rr14(#12)
-#endif
-
-/* rr2  - length	(high word ignored)
- * rr4  - b2
- * rr6  - b1
- */
-
-	clr	r1		/* initialize return value */
-	testl	rr2
-	jr	z,finish
-
-	bitb	rl7,#0		/* odd b1? */
-	jr	nz,testb2
-	bitb	rl5,#0		/* odd b2? */
-	jr	nz,odd_cmp	/* b1 even, b2 odd */
-	jr	t,even_cmp
-
-testb2:
-	bitb	rl5,#0
-	jr	z,odd_cmp	/* b2 even, b1 odd */
-
-	cpsib	@rr6,@rr4,r3,eq
-	jr	z,beq		/* bytes are the same */
-	jr	t,byte_diff
-
-beq:	jr	ov,finish	/* jump if r3 is zero now */
-
-/* compare words */
-even_cmp:
-	ld	r2,r3		/* remember length */
-	srl	r3,#1
-	jr	z,no_words
-
-	cpsir	@rr6,@rr4,r3,ne
-	jr	nz,no_words
-
-	dec	r7,#2
-	dec	r5,#2		/* point to different bytes */
-	ldk	r3,#2
-	jr	t,odd_cmp
-
-no_words:
-	bitb	rl2,#0		/* odd length? */
-	jr	z,finish
-
-	cpsib	@rr6,@rr4,r3,eq
-	jr	z,finish	/* last bytes are the same */
-	jr	t,byte_diff
-
-/* compare bytes */
-odd_cmp:
-	cpsirb	@rr6,@rr4,r3,ne
-	jr	nz,finish
-
-byte_diff:
-	dec	r7,#1
-	dec	r5,#1		/* point to different bytes */
-
-	ldb	rl1,@rr6
-	clr	r0
-	ldb	rl0,@rr4
-	sub	r1,r0
-
-finish:				/* set return value */
-#ifdef __STD_CALL__
-	ld	r7,r1
-#else
-	ld	r2,r1
-#endif
-
-
-#else		/* above Z8001, below Z8002 */
-
-
-	unsegm
-
-#ifdef __STD_CALL__
-	ld	r7,r15(#2)
-	ld	r6,r15(#4)
-	ld	r5,r15(#6)
-#endif
-
-/* r5  - length
- * r6  - b2
- * r7  - b1
- */
-
-	clr	r1		/* initialize return value */
-	test	r5
-	jr	z,finish
-
-	bitb	rl7,#0		/* odd destination address? */
-	jr	nz,testb2
-	bitb	rl6,#0		/* odd source address? */
-	jr	nz,odd_cmp	/* b1 even, b2 odd */
-	jr	t,even_cmp
-
-testb2:
-	bitb	rl6,#0
-	jr	z,odd_cmp	/* b2 even, b1 odd */
-
-	cpsib	@r7,@r6,r5,eq
-	jr	z,beq		/* bytes are the same */
-	jr	t,byte_diff
-
-beq:	jr	ov,finish	/* jump if r3 is zero now */
-
-/* compare words */
-even_cmp:
-	ld	r4,r5		/* remember length */
-	srl	r5,#1
-	jr	z,no_words
-
-	cpsir	@r7,@r6,r5,ne
-	jr	nz,no_words
-
-	dec	r7,#2
-	dec	r6,#2		/* point to different bytes */
-	ldk	r5,#2
-	jr	t,odd_cmp
-
-no_words:
-	bitb	rl4,#0		/* odd length? */
-	jr	z,finish
-
-	cpsib	@r7,@r6,r4,eq
-	jr	z,finish	/* last bytes are the same */
-	jr	t,byte_diff
-
-/* compare bytes */
-odd_cmp:
-	cpsirb	@r7,@r6,r5,ne
-	jr	nz,finish
-
-byte_diff:
-	dec	r7,#1
-	dec	r6,#1		/* point to different bytes */
-
-	ldb	rl1,@r7
-	clr	r0
-	ldb	rl0,@r6
-	sub	r1,r0
-
-finish:
-#ifdef __STD_CALL__
-	ld	r7,r1
-#else
-	ld	r2,r1
-#endif
-
-#endif	/* Z8002 */
-
-	ret
-	.end
diff --git a/newlib/libc/machine/z8k/memcpy.S b/newlib/libc/machine/z8k/memcpy.S
deleted file mode 100644
index ede6037..0000000
--- a/newlib/libc/machine/z8k/memcpy.S
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * memcpy routine for Z8000
- * Copyright (C) 2004 Christian Groessler <chris@groessler.org>
- *
- * Permission to use, copy, modify, and distribute this file
- * for any purpose is hereby granted without fee, provided that
- * the above copyright notice and this notice appears in all
- * copies.
- *
- * This file is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* void *memcpy(void *dest, const void *src, size_t length);
- */
-
-	name	"memcpy.S"
-
-	.text
-	even
-global	_memcpy
-global	memmove_entry
-
-_memcpy:
-
-#ifdef __Z8001__
-	segm
-
-#ifdef __STD_CALL__
-	ldl	rr6,rr14(#4)
-	ldl	rr4,rr14(#8)
-	ldl	rr2,rr14(#12)
-#else
-	pushl	@rr14,rr6
-#endif
-
-/* rr2  - length	(high word ignored)
- * rr4  - src
- * rr6  - dest
- */
-
-	testl	rr2
-	jr	z,finish
-
-memmove_entry:		/* external entry point from memmove */
-
-	bitb	rl7,#0		/* odd destination address? */
-	jr	nz,testsrc
-	bitb	rl5,#0		/* odd source address? */
-	jr	nz,odd_copy
-	jr	t,even_copy	/* dest even, src odd */
-
-testsrc:
-	bitb	rl5,#0
-	jr	z,odd_copy	/* src even, dest odd */
-	ldib	@rr6,@rr4,r3
-	jr	ov,finish	/* jump if r3 is zero now */
-
-/* copy words */
-even_copy:
-	ld	r2,r3		/* remember length */
-	srl	r3,#1
-	jr	z,no_words
-
-	ldir	@rr6,@rr4,r3
-
-no_words:
-	bitb	rl2,#0		/* odd length? */
-	jr	z,finish
-	ldib	@rr6,@rr4,r2	/* yes, copy last byte */
-	jr	finish
-
-/* copy bytes */
-odd_copy:
-	ldirb	@rr6,@rr4,r3
-
-finish:
-#ifdef __STD_CALL__
-	ldl	rr6,rr14(#4)
-#else
-	popl	rr2,@rr14
-#endif
-
-
-#else		/* above Z8001, below Z8002 */
-
-
-	unsegm
-
-#ifdef __STD_CALL__
-	ld	r7,r15(#2)
-	ld	r6,r15(#4)
-	ld	r5,r15(#6)
-#else
-	ld	r2,r7		/* buffer pointer return value */
-#endif
-
-/* r5  - length
- * r6  - src
- * r7  - dest
- */
-	test	r5
-	jr	z,finish
-
-memmove_entry:		/* external entry point from memmove */
-
-	bitb	rl7,#0		/* odd destination address? */
-	jr	nz,testsrc
-	bitb	rl6,#0		/* odd source address? */
-	jr	nz,odd_copy
-	jr	t,even_copy	/* dest even, src odd */
-
-testsrc:
-	bitb	rl6,#0
-	jr	z,odd_copy	/* src even, dest odd */
-	ldib	@r7,@r6,r5
-	jr	ov,finish	/* jump if r5 is zero now */
-
-/* copy words */
-even_copy:
-	ld	r4,r5		/* remember length */
-	srl	r5,#1
-	jr	z,no_words
-
-	ldir	@r7,@r6,r5
-
-no_words:
-	bitb	rl4,#0		/* odd length? */
-	jr	z,finish
-	ldib	@r7,@r6,r4	/* yes, copy last byte */
-	jr	finish
-
-/* copy bytes */
-odd_copy:
-	ldirb	@r7,@r6,r5
-
-finish:
-#ifdef __STD_CALL__
-	ld	r7,r15(#2)
-#endif
-
-#endif	/* Z8002 */
-
-	ret
-	.end
diff --git a/newlib/libc/machine/z8k/memmove.S b/newlib/libc/machine/z8k/memmove.S
deleted file mode 100644
index c4d0c73..0000000
--- a/newlib/libc/machine/z8k/memmove.S
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * memmove routine for Z8000
- * Copyright (C) 2004 Christian Groessler <chris@groessler.org>
- *
- * Permission to use, copy, modify, and distribute this file
- * for any purpose is hereby granted without fee, provided that
- * the above copyright notice and this notice appears in all
- * copies.
- *
- * This file is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* void *memmove(void *dest, const void *src, size_t length);
- */
-
-	name	"memmove.S"
-
-	.text
-	even
-global	_memmove
-
-_memmove:
-
-#ifdef __Z8001__
-	segm
-
-#ifdef __STD_CALL__
-	ldl	rr6,rr14(#4)
-	ldl	rr4,rr14(#8)
-	ldl	rr2,rr14(#12)
-#else
-	pushl	@rr14,rr6
-#endif
-
-/* rr2  - length	(high word ignored)
- * rr4  - src
- * rr6  - dest
- */
-
-	testl	rr2
-	jr	z,finish
-
-/*  check for destructive overlap (src < dest && dest < src + length) */
-
-	cpl	rr6,rr4
-	jp	ule,memmove_entry	/* non-destructive, let memcpy do the work */
-	ldl	rr0,rr2
-	addl	rr0,rr4			/* rr0 = src + length */
-	cpl	rr0,rr6
-	jp	ult,memmove_entry	/* non-destructive, let memcpy do the work */
-
-/* set-up pointers to copy backwards, add (length - 1) */
-	addl	rr4,rr2			/* src + length */
-	addl	rr6,rr2			/* dest + length */
-	subl	rr4,#1
-	subl	rr6,#1
-
-/* check alignment */
-	bitb	rl7,#0		/* odd destination address? */
-	jr	z,testsrc
-	bitb	rl5,#0		/* odd source address? */
-	jr	z,odd_copy
-	jr	even_copy
-
-testsrc:
-	bitb	rl5,#0
-	jr	nz,odd_copy	/* src even, dest odd */
-	lddb	@rr6,@rr4,r3
-	jr	ov,finish	/* jump if r5 is zero now */
-
-/* copy words */
-even_copy:
-	ld	r2,r3			/* remember length */
-	srl	r3,#1
-/*	jr	z,no_words	   it cannot be zero here */
-
-	dec	r5,#1
-	dec	r7,#1
-	lddr	@rr6,@rr4,r3
-
-no_words:
-	bitb	rl2,#0		/* odd length? */
-	jr	z,finish
-	inc	r5,#1
-	inc	r7,#1
-	lddb	@rr6,@rr4,r2	/* yes, copy last byte */
-	jr	finish
-
-/* copy bytes */
-odd_copy:
-	lddrb	@rr6,@rr4,r3
-
-finish:
-#ifdef __STD_CALL__
-	ldl	rr6,rr14(#4)
-#else
-	popl	rr2,@rr14
-#endif
-
-
-#else		/* above Z8001, below Z8002 */
-
-
-	unsegm
-
-#ifdef __STD_CALL__
-	ld	r7,r15(#2)
-	ld	r6,r15(#4)
-	ld	r5,r15(#6)
-#else
-	ld	r2,r7		/* buffer pointer return value */
-#endif
-
-/* r5  - length
- * r6  - src
- * r7  - dest
- */
-	test	r5
-	jr	z,finish
-
-/*  check for destructive overlap (src < dest && dest < src + length) */
-
-	cp	r7,r6
-	jp	ule,memmove_entry	/* non-destructive, let memcpy do the work */
-	ld	r0,r5
-	add	r0,r6			/* r0 = src + length */
-	cp	r0,r7
-	jp	ult,memmove_entry	/* non-destructive, let memcpy do the work */
-
-/* set-up pointers to copy backwards, add (length - 1) */
-	add	r6,r5			/* src + length */
-	add	r7,r5			/* dest + length */
-	dec	r6,#1
-	dec	r7,#1
-
-/* check alignment */
-	bitb	rl7,#0		/* odd destination address? */
-	jr	z,testsrc
-	bitb	rl6,#0		/* odd source address? */
-	jr	z,odd_copy
-	jr	even_copy
-
-testsrc:
-	bitb	rl6,#0
-	jr	nz,odd_copy	/* src even, dest odd */
-	lddb	@r7,@r6,r5
-	jr	ov,finish	/* jump if r5 is zero now */
-
-/* copy words */
-even_copy:
-	ld	r4,r5		/* remember length */
-	srl	r5,#1
-/*	jr	z,no_words	   it cannot be zero here */
-
-	dec	r6,#1
-	dec	r7,#1
-	lddr	@r7,@r6,r5
-
-no_words:
-	bitb	rl4,#0		/* odd length? */
-	jr	z,finish
-	inc	r6,#1
-	inc	r7,#1
-	lddb	@r7,@r6,r4	/* yes, copy last byte */
-	jr	finish
-
-/* copy bytes */
-odd_copy:
-	lddrb	@r7,@r6,r5
-
-finish:
-#ifdef __STD_CALL__
-	ld	r7,r15(#2)
-#endif
-
-#endif	/* Z8002 */
-
-	ret
-	.end
diff --git a/newlib/libc/machine/z8k/memset.S b/newlib/libc/machine/z8k/memset.S
deleted file mode 100644
index 43184c7..0000000
--- a/newlib/libc/machine/z8k/memset.S
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * memset routine for Z8000
- * Copyright (C) 2004 Christian Groessler <chris@groessler.org>
- *
- * Permission to use, copy, modify, and distribute this file
- * for any purpose is hereby granted without fee, provided that
- * the above copyright notice and this notice appears in all
- * copies.
- *
- * This file is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* void *memset(void *buffer, int value, size_t length);
- */
-
-	name	"memset.S"
-
-	.text
-	even
-global	_memset
-
-_memset:
-
-#ifdef __Z8001__
-	segm
-
-#ifdef __STD_CALL__
-	ldl	rr6,rr14(#4)
-	ld	r5,rr14(#8)
-	ldl	rr2,rr14(#10)
-#else
-	pushl	@rr14,rr6
-#endif
-
-/* rr2  - length
- * rl5  - value
- * rr6  - buffer
- */
-	testl	rr2
-	jr	z,finish
-
-	ldb	rh5,rl5
-	ld	r1,r5		/* r1 contains value */
-	bit	r7,#0
-	jr	z,not_odd
-
-	ldb	@rr6,rl1
-	inc	r7,#1
-	subl	rr2,#1
-	jr	z,finish
-
-not_odd:ld	r0,r3		/* remember length */
-	srl	r3,#1
-	jr	z,no_words
-
-	ldl	rr4,rr6
-	ld	@rr6,r1
-	inc	r7,#2
-	dec	r3,#1
-	jr	z,no_words
-
-	ldir	@rr6,@rr4,r3	/* fill words */
-
-no_words:
-	bit	r0,#0		/* one byte remaining? */
-	jr	z,finish
-
-	ldb	@rr6,rl1
-
-finish:
-#ifdef __STD_CALL__
-	ldl	rr6,rr14(#4)
-#else
-	popl	rr2,@rr14
-#endif
-
-
-#else		/* above Z8001, below Z8002 */
-
-
-	unsegm
-
-#ifdef __STD_CALL__
-	ld	r7,r15(#2)
-	ld	r6,r15(#4)
-	ld	r5,r15(#6)
-#else
-	ld	r2,r7		/* buffer pointer return value */
-#endif
-
-/* r5  - length
- * r6  - value
- * r7  - buffer
- */
-	test	r5
-	jr	z,finish
-
-	ldb	rh6,rl6
-	ld	r1,r6		/* r1 contains value */
-	bit	r7,#0
-	jr	z,not_odd
-
-	ldb	@r7,rl1
-	inc	r7,#1
-	dec	r5,#1
-	jr	z,finish
-
-not_odd:ld	r0,r5		/* remember length */
-	srl	r5,#1
-	jr	z,no_words
-
-	ld	r4,r7
-	ld	@r7,r1
-	inc	r7,#2
-	dec	r5,#1
-	jr	z,no_words
-
-	ldir	@r7,@r4,r5	/* fill words */
-
-no_words:
-	bit	r0,#0		/* one byte remaining? */
-	jr	z,finish
-
-	ldb	@r7,rl1
-
-finish:
-#ifdef __STD_CALL__
-	ld	r7,r15(#2)
-#endif
-
-#endif	/* Z8002 */
-
-	ret
-	.end
diff --git a/newlib/libc/machine/z8k/setjmp.S b/newlib/libc/machine/z8k/setjmp.S
index 30240e1..6a76641 100644
--- a/newlib/libc/machine/z8k/setjmp.S
+++ b/newlib/libc/machine/z8k/setjmp.S
@@ -1,85 +1,30 @@
-	.global	_setjmp
-	.global	_longjmp
 
 #ifdef __Z8001__
 	segm
 
-#ifdef __STD_CALL__
-
-_setjmp:
-	ldl	rr6,rr14(#4)	! get argument
-	ldl	rr2,@rr14	! fetch pc
-	ldl	@rr6,rr2	! save it
-	ldl	rr6(#16),rr8
-	ldl	rr6(#4),rr10
-	ldl	rr6(#8),rr12	! remember frame pointer
-	ldl	rr6(#12),rr14	! remember stack pointer
-	ldk	r7,#0
-	ret	t
-
-_longjmp:
-	ldl	rr4,rr14(#4)	! get first argument
-	ld	r7,rr14(#8)	! get return value
-	ldl	rr8,rr4(#16)
-	ldl	rr10,rr4(#4)
-	ldl	rr12,rr4(#8)	! restore old frame pointer
-	ldl	rr14,rr4(#12)	! restore old stack pointer
-	ldl	rr4,@rr4	! return address
-	inc	r15,#4
-	jp	@rr4
-
-#else /* above __STD_CALL_, below not */
-
+	.global	_setjmp
 _setjmp:
 	ldl	rr2,@rr14	! fetch pc
 	ldl	@rr6,rr2	! save it
-	ldl	rr6(16),rr8
 	ldl	rr6(4),rr10
 	ldl	rr6(8),rr12	! and the other special regs
 	ldl	rr6(12),rr14
 	ldk	r2,#0
 	ret	t
+	
+	.globl	_longjmp
 
 _longjmp:
 	ld	r2,r5		! get return value
 	ldl	rr4,rr6(0)
-	ldl	rr8,rr6(16)
 	ldl	rr10,rr6(4)
 	ldl	rr12,rr6(8)
 	ldl	rr14,rr6(12)
-	inc	r15,#4
 	jp	@rr4
-
-#endif  /* not __STD_CALL__ */
-#else /* above Z8001, below Z8002 */
+#else
 	unseg
 
-#ifdef __STD_CALL__
-
-_setjmp:
-	ld	r7,r15(#2)	! get argument
-	ld	r2,@r15		! fetch pc
-	ld	@r7,r2		! save it
-	ldl	r7(#14),rr8
-	ldl	r7(#2),rr10
-	ldl	r7(#6),rr12	! remember frame pointer
-	ldl	r7(#10),rr14	! remember stack pointer
-	ldk	r7,#0
-	ret	t
-
-_longjmp:
-	ld	r4,r15(#2)	! get first argument (jmp_buf)
-	ld	r7,r15(#4)	! get return value
-	ldl	rr8,r4(#14)
-	ldl	rr10,r4(#2)
-	ldl	rr12,r4(#6)	! restore old frame pointer
-	ldl	rr14,r4(#10)	! restore old stack pointer
-	ld	r4,@r4		! return address
-	inc	r15,#2
-	jp	@r4
-
-#else /* above __STD_CALL_, below not */
-
+	.global	_setjmp
 _setjmp:
 	ld	r2,@r15	! fetch pc
 	ld	@r7,r2	! save it
@@ -89,14 +34,16 @@ _setjmp:
 	ldk	r2,#0
 	ret	t
 	
+	.globl	_longjmp
+
 _longjmp:
 	ld	r2,r6		! get return value
 	ld	r4,@r7
-	ldl	rr10,r7(4)
-	ldl	rr12,r7(8)
-	ldl	rr14,r7(12)
-	inc	r15,#2
-	jp	@r4
+	ldl	rr10,rr7(4)
+	ldl	rr12,rr7(8)
+	ldl	rr14,rr7(12)
+	jp	@rr4
 	
-#endif  /* not __STD_CALL__ */
-#endif  /* Z8002 version */
+#endif
+
+
diff --git a/newlib/libc/misc/Makefile.am b/newlib/libc/misc/Makefile.am
index fa3a8ce..e5ed00b 100644
--- a/newlib/libc/misc/Makefile.am
+++ b/newlib/libc/misc/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-LIB_SOURCES = dprintf.c unctrl.c ffs.c init.c
+LIB_SOURCES = dprintf.c unctrl.c ffs.c
 
 libmisc_la_LDFLAGS = -Xcompiler -nostdlib
 
diff --git a/newlib/libc/misc/Makefile.in b/newlib/libc/misc/Makefile.in
index 22301b8..76c5602 100644
--- a/newlib/libc/misc/Makefile.in
+++ b/newlib/libc/misc/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -110,16 +95,16 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-LIB_SOURCES = dprintf.c unctrl.c ffs.c init.c
+LIB_SOURCES = dprintf.c unctrl.c ffs.c
 
 libmisc_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libmisc.la
-@USE_LIBTOOL_TRUE@libmisc_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libmisc.la
+@USE_LIBTOOL_TRUE@libmisc_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
 
 CHEWOUT_FILES = unctrl.def ffs.def
 
@@ -139,13 +124,11 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  dprintf.$(OBJEXT) unctrl.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ffs.$(OBJEXT) init.$(OBJEXT)
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  dprintf.o unctrl.o ffs.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libmisc_la_LIBADD = 
-@USE_LIBTOOL_TRUE@libmisc_la_OBJECTS =  dprintf.lo unctrl.lo ffs.lo \
-@USE_LIBTOOL_TRUE@init.lo
+@USE_LIBTOOL_TRUE@libmisc_la_OBJECTS =  dprintf.lo unctrl.lo ffs.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -165,7 +148,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libmisc_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus misc/Makefile
 
@@ -186,11 +169,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -199,7 +177,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libc/misc/dprintf.c b/newlib/libc/misc/dprintf.c
index 0b780f5..071d177 100644
--- a/newlib/libc/misc/dprintf.c
+++ b/newlib/libc/misc/dprintf.c
@@ -15,10 +15,7 @@
 #include "varargs.h"
 #endif
 
-#if 0
 static char *parse_number ();
-#endif
-
 static long get_number ();
 static void print_number ();
 static void write_char ();
@@ -150,7 +147,6 @@ __dprintf (fmt, va_alist)
   va_end (args);
 }
 
-#if 0
 /* Parse a positive decimal integer at S.
    FIXME: Was used in earlier version, but not currently used.
    Keep for now.  */
@@ -171,7 +167,6 @@ parse_number (s, p)
   *p = x;
   return s;
 }
-#endif
 
 /* Fetch the number at S of SIZE bytes.  */
 
diff --git a/newlib/libc/misc/ffs.c b/newlib/libc/misc/ffs.c
index 292ffab..e4afe7a 100644
--- a/newlib/libc/misc/ffs.c
+++ b/newlib/libc/misc/ffs.c
@@ -24,11 +24,9 @@ PORTABILITY
 
 No supporting OS subroutines are required.  */
 
-#include <_ansi.h>
-
 int
-_DEFUN(ffs, (word),
-       int word)
+ffs (word)
+     int word;
 {
   int i;
 
diff --git a/newlib/libc/misc/init.c b/newlib/libc/misc/init.c
deleted file mode 100644
index 539fbef..0000000
--- a/newlib/libc/misc/init.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2004 CodeSourcery, LLC
- *
- * Permission to use, copy, modify, and distribute this file
- * for any purpose is hereby granted without fee, provided that
- * the above copyright notice and this notice appears in all
- * copies.
- *
- * This file is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* Handle ELF .{pre_init,init,fini}_array sections.  */
-#include <sys/types.h>
-
-#ifdef HAVE_INITFINI_ARRAY
-
-/* These magic symbols are provided by the linker.  */
-extern void (*__preinit_array_start []) (void) __attribute__((weak));
-extern void (*__preinit_array_end []) (void) __attribute__((weak));
-extern void (*__init_array_start []) (void) __attribute__((weak));
-extern void (*__init_array_end []) (void) __attribute__((weak));
-extern void (*__fini_array_start []) (void) __attribute__((weak));
-extern void (*__fini_array_end []) (void) __attribute__((weak));
-
-extern void _init (void);
-extern void _fini (void);
-
-/* Iterate over all the init routines.  */
-void
-__libc_init_array (void)
-{
-  size_t count;
-  size_t i;
-
-  count = __preinit_array_end - __preinit_array_start;
-  for (i = 0; i < count; i++)
-    __preinit_array_start[i] ();
-
-  _init ();
-
-  count = __init_array_end - __init_array_start;
-  for (i = 0; i < count; i++)
-    __init_array_start[i] ();
-}
-
-/* Run all the cleanup routines.  */
-void
-__libc_fini_array (void)
-{
-  size_t count;
-  size_t i;
-  
-  count = __fini_array_end - __fini_array_start;
-  for (i = 0; i < count; i++)
-    __fini_array_start[i] ();
-
-  _fini ();
-}
-#endif
diff --git a/newlib/libc/misc/misc.tex b/newlib/libc/misc/misc.tex
index 22c313e..ea5599d 100644
--- a/newlib/libc/misc/misc.tex
+++ b/newlib/libc/misc/misc.tex
@@ -3,12 +3,8 @@
 This chapter describes miscellaneous routines not covered elsewhere.
 
 @menu 
-* ffs::      Return first bit set in a word
 * unctrl::   Return printable representation of a character
 @end menu
 
 @page
-@include misc/ffs.def
-
-@page
 @include misc/unctrl.def
diff --git a/newlib/libc/misc/unctrl.c b/newlib/libc/misc/unctrl.c
index fa0b90f..710bf16 100644
--- a/newlib/libc/misc/unctrl.c
+++ b/newlib/libc/misc/unctrl.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<unctrl>>---get printable representation of a character
+	<<unctrl>>---translate characters to upper case
 
 INDEX
 	unctrl
diff --git a/newlib/libc/posix/Makefile.am b/newlib/libc/posix/Makefile.am
index d39aed3..1274137 100644
--- a/newlib/libc/posix/Makefile.am
+++ b/newlib/libc/posix/Makefile.am
@@ -4,48 +4,20 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES = \
-	closedir.c creat.c isatty.c \
-	opendir.c readdir.c \
-	readdir_r.c rewinddir.c telldir.c
-
-ELIX_2_OBJS = \
-        scandir.$(oext) seekdir.$(oext)
-
-ELIX_3_OBJS = \
-	execl.$(oext) execle.$(oext) execlp.$(oext) execv.$(oext) \
-	execve.$(oext) execvp.$(oext)
-
-ELIX_4_OBJS = \
-	popen.$(oext) 
-
-if ELIX_LEVEL_1
-LIB_OBJS =
-else 
-if ELIX_LEVEL_2
-LIB_OBJS = $(ELIX_2_OBJS)
-else 
-if ELIX_LEVEL_3
-LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS)
-else
-LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS)
-endif
-endif
-endif
+LIB_SOURCES = \
+	closedir.c opendir.c readdir.c rewinddir.c scandir.c seekdir.c \
+	telldir.c execl.c execle.c execlp.c execv.c execve.c execvp.c \
+	popen.c creat.c isatty.c
 
 libposix_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libposix.la
-libposix_la_SOURCES = $(GENERAL_SOURCES)
-libposix_la_LIBADD = $(LIB_OBJS)
-libposix_la_DEPENDENCIES = $(LIB_OBJS)
+libposix_la_SOURCES = $(LIB_SOURCES)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
+lib_a_SOURCES = $(LIB_SOURCES)
 noinst_DATA =
 endif # USE_LIBTOOL
 
diff --git a/newlib/libc/posix/Makefile.in b/newlib/libc/posix/Makefile.in
index 8867573..32a7b5d 100644
--- a/newlib/libc/posix/Makefile.in
+++ b/newlib/libc/posix/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -110,34 +95,20 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES =  	closedir.c creat.c isatty.c 	opendir.c readdir.c 	readdir_r.c rewinddir.c telldir.c
+LIB_SOURCES = \
+	closedir.c opendir.c readdir.c rewinddir.c scandir.c seekdir.c \
+	telldir.c execl.c execle.c execlp.c execv.c execve.c execvp.c \
+	popen.c creat.c isatty.c
 
 
-ELIX_2_OBJS =          scandir.$(oext) seekdir.$(oext)
-
-
-ELIX_3_OBJS =  	execl.$(oext) execle.$(oext) execlp.$(oext) execv.$(oext) 	execve.$(oext) execvp.$(oext)
-
-
-ELIX_4_OBJS =  	popen.$(oext) 
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS)
-
 libposix_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libposix.la
-@USE_LIBTOOL_TRUE@libposix_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@libposix_la_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@libposix_la_DEPENDENCIES = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libposix.la
+@USE_LIBTOOL_TRUE@libposix_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
 
 CHEWOUT_FILES = 
 
@@ -156,15 +127,18 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  closedir.$(OBJEXT) creat.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@isatty.$(OBJEXT) opendir.$(OBJEXT) readdir.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@readdir_r.$(OBJEXT) rewinddir.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@telldir.$(OBJEXT)
+lib_a_LIBADD = 
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  closedir.o opendir.o readdir.o \
+@USE_LIBTOOL_FALSE@rewinddir.o scandir.o seekdir.o telldir.o execl.o \
+@USE_LIBTOOL_FALSE@execle.o execlp.o execv.o execve.o execvp.o popen.o \
+@USE_LIBTOOL_FALSE@creat.o isatty.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
-@USE_LIBTOOL_TRUE@libposix_la_OBJECTS =  closedir.lo creat.lo isatty.lo \
-@USE_LIBTOOL_TRUE@opendir.lo readdir.lo readdir_r.lo rewinddir.lo \
-@USE_LIBTOOL_TRUE@telldir.lo
+libposix_la_LIBADD = 
+@USE_LIBTOOL_TRUE@libposix_la_OBJECTS =  closedir.lo opendir.lo \
+@USE_LIBTOOL_TRUE@readdir.lo rewinddir.lo scandir.lo seekdir.lo \
+@USE_LIBTOOL_TRUE@telldir.lo execl.lo execle.lo execlp.lo execv.lo \
+@USE_LIBTOOL_TRUE@execve.lo execvp.lo popen.lo creat.lo isatty.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -184,7 +158,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libposix_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus posix/Makefile
 
@@ -205,11 +179,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -218,7 +187,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libc/posix/closedir.c b/newlib/libc/posix/closedir.c
index 634f5ad..4ad6e4c 100644
--- a/newlib/libc/posix/closedir.c
+++ b/newlib/libc/posix/closedir.c
@@ -41,37 +41,22 @@ static char sccsid[] = "@(#)closedir.c	5.9 (Berkeley) 2/23/91";
 #include <dirent.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/lock.h>
-
-extern void _cleanupdir (DIR *dirp);
 
 /*
  * close a directory.
  */
 int
-_DEFUN(closedir, (dirp),
-       register DIR *dirp)
+closedir(dirp)
+	register DIR *dirp;
 {
-	int fd, rc;
+	int fd;
 
-#ifdef HAVE_DD_LOCK
-	__lock_acquire_recursive(dirp->dd_lock);
-#endif
-	rc = 0;
 	fd = dirp->dd_fd;
-	if (fd != -1) {
-		dirp->dd_fd = -1;
-		dirp->dd_loc = 0;
-		(void)free((void *)dirp->dd_buf);
-		(void)free((void *)dirp);
-		rc = close(fd);
-		_cleanupdir(dirp);
-	}
-#ifdef HAVE_DD_LOCK
-	__lock_release_recursive(dirp->dd_lock);
-	__lock_close_recursive(dirp->dd_lock);
-#endif
-	return rc;
+	dirp->dd_fd = -1;
+	dirp->dd_loc = 0;
+	(void)free((void *)dirp->dd_buf);
+	(void)free((void *)dirp);
+	return(close(fd));
 }
 
 #endif /* ! HAVE_OPENDIR */
diff --git a/newlib/libc/posix/creat.c b/newlib/libc/posix/creat.c
index b8a4f9a..6b11162 100644
--- a/newlib/libc/posix/creat.c
+++ b/newlib/libc/posix/creat.c
@@ -5,9 +5,7 @@
 #include <fcntl.h>
 
 int
-_DEFUN(creat, (path, mode), 
-       const char *path _AND 
-       mode_t mode)
+creat (const char *path, mode_t mode)
 {
   return open (path, O_WRONLY | O_CREAT | O_TRUNC, mode);
 }
diff --git a/newlib/libc/posix/execl.c b/newlib/libc/posix/execl.c
index 6acbe52..0980056 100644
--- a/newlib/libc/posix/execl.c
+++ b/newlib/libc/posix/execl.c
@@ -16,19 +16,17 @@ static char ***p_environ = &environ;
 #include <stdarg.h>
 
 int
-_DEFUN(execl, (path, arg0, ...), 
-      _CONST char *path _AND
-      _CONST char *arg0 _DOTS)
+execl (_CONST char *path, _CONST char *arg0, ...)
 
 #else
 
 #include <varargs.h>
 
 int
-_DEFUN(execl, (path, arg0, va_alist),
-     _CONST char *path _AND
-     _CONST char *arg0 _AND
-     va_dcl)
+execl (path, arg0, va_alist)
+     _CONST char *path;
+     _CONST char *arg0;
+     va_dcl
 
 #endif
 
diff --git a/newlib/libc/posix/execle.c b/newlib/libc/posix/execle.c
index efe204d..4394370 100644
--- a/newlib/libc/posix/execle.c
+++ b/newlib/libc/posix/execle.c
@@ -11,19 +11,17 @@
 #include <stdarg.h>
 
 int
-_DEFUN(execle, (path, arg0, ...),
-      _CONST char *path _AND
-      _CONST char *arg0 _DOTS)
+execle (_CONST char *path, _CONST char *arg0, ...)
 
 #else
 
 #include <varargs.h>
 
 int
-_DEFUN(execle, (path, arg0, va_alist),
-     _CONST char *path _AND
-     _CONST char *arg0 _AND
-     va_dcl)
+execle (path, arg0, va_alist)
+     _CONST char *path;
+     _CONST char *arg0;
+     va_dcl
 
 #endif
 
diff --git a/newlib/libc/posix/execlp.c b/newlib/libc/posix/execlp.c
index 5252cd9..dd04914 100644
--- a/newlib/libc/posix/execlp.c
+++ b/newlib/libc/posix/execlp.c
@@ -11,19 +11,17 @@
 #include <stdarg.h>
 
 int
-_DEFUN(execlp, (path, arg0, ...),
-      _CONST char *path _AND
-      _CONST char *arg0 _DOTS)
+execlp (_CONST char *path, _CONST char *arg0, ...)
 
 #else
 
 #include <varargs.h>
 
 int
-_DEFUN(execlp, (path, arg0, va_alist),
-     _CONST char *path _AND
-     _CONST char *arg0 _AND
-     va_dcl)
+execlp (path, arg0, va_alist)
+     _CONST char *path;
+     _CONST char *arg0;
+     va_dcl
 
 #endif
 
diff --git a/newlib/libc/posix/execve.c b/newlib/libc/posix/execve.c
index 8083c03..1be0ed1 100644
--- a/newlib/libc/posix/execve.c
+++ b/newlib/libc/posix/execve.c
@@ -8,10 +8,7 @@
 
 
 int
-_DEFUN(execve, (path, argv, envp),
-      const char *path _AND
-      char * const argv[] _AND
-      char * const envp[])
+execve (const char *path, char * const argv[], char * const envp[])
 {
   return _execve (path, argv, envp);
 }
diff --git a/newlib/libc/posix/isatty.c b/newlib/libc/posix/isatty.c
index 2732ca2..3c64647 100644
--- a/newlib/libc/posix/isatty.c
+++ b/newlib/libc/posix/isatty.c
@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 
 int
-_DEFUN(isatty, (fd), int fd)
+isatty (int fd)
 {
   struct stat buf;
 
diff --git a/newlib/libc/posix/opendir.c b/newlib/libc/posix/opendir.c
index c9a97db..f924c0b 100644
--- a/newlib/libc/posix/opendir.c
+++ b/newlib/libc/posix/opendir.c
@@ -41,25 +41,20 @@ static char sccsid[] = "@(#)opendir.c	5.11 (Berkeley) 2/23/91";
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/lock.h>
 
 /*
  * open a directory.
  */
 DIR *
-_DEFUN(opendir, (name),
-	const char *name)
+opendir(name)
+	const char *name;
 {
 	register DIR *dirp;
 	register int fd;
-	int rc = 0;
 
 	if ((fd = open(name, 0)) == -1)
 		return NULL;
-#ifdef HAVE_FCNTL
-	rc = fcntl(fd, F_SETFD, 1);
-#endif
-	if (rc == -1 ||
+	if (fcntl(fd, F_SETFD, 1) == -1 ||
 	    (dirp = (DIR *)malloc(sizeof(DIR))) == NULL) {
 		close (fd);
 		return NULL;
@@ -83,12 +78,6 @@ _DEFUN(opendir, (name),
 	/*
 	 * Set up seek point for rewinddir.
 	 */
-
-#ifdef HAVE_DD_LOCK
-	/* if we have a locking mechanism, initialize it */
-	__lock_init_recursive(dirp->dd_lock);
-#endif
-
 	return dirp;
 }
 
diff --git a/newlib/libc/posix/popen.c b/newlib/libc/posix/popen.c
index 0f25a3e..d6d174d 100644
--- a/newlib/libc/posix/popen.c
+++ b/newlib/libc/posix/popen.c
@@ -63,20 +63,15 @@ static struct pid {
 } *pidlist; 
 	
 FILE *
-_DEFUN(popen, (program, type),
-	const char *program _AND
-	const char *type)
+popen(program, type)
+	const char *program;
+	const char *type;
 {
 	struct pid *cur;
 	FILE *iop;
 	int pdes[2], pid;
 
-       if ((*type != 'r' && *type != 'w')
-	   || (type[1]
-#ifdef __CYGWIN__
-	       && (type[2] || (type[1] != 'b' && type[1] != 't'))
-#endif
-			       )) {
+       if ((*type != 'r' && *type != 'w') || type[1]) {
 		errno = EINVAL;
 		return (NULL);
 	}
@@ -144,8 +139,8 @@ _DEFUN(popen, (program, type),
  *	if already `pclosed', or waitpid returns an error.
  */
 int
-_DEFUN(pclose, (iop),
-	FILE *iop)
+pclose(iop)
+	FILE *iop;
 {
 	register struct pid *cur, *last;
 	int pstat;
diff --git a/newlib/libc/posix/readdir.c b/newlib/libc/posix/readdir.c
index da07d5c..308330c 100644
--- a/newlib/libc/posix/readdir.c
+++ b/newlib/libc/posix/readdir.c
@@ -39,61 +39,36 @@ static char sccsid[] = "@(#)readdir.c	5.7 (Berkeley) 6/1/90";
 
 #include <dirent.h>
 
-extern int getdents (int fd, void *dp, int count);
-
 /*
  * get next entry in a directory.
  */
 struct dirent *
-_DEFUN(readdir, (dirp),
-       register DIR *dirp)
-{
+readdir(dirp)
+register DIR *dirp; {
   register struct dirent *dp;
- 
-#ifdef HAVE_DD_LOCK
-  __lock_acquire_recursive(dirp->dd_lock);
-#endif
-
-  if (dirp->dd_fd == -1)
-    return NULL;
- 
+  
   for (;;) {
     if (dirp->dd_loc == 0) {
       dirp->dd_size = getdents (dirp->dd_fd,
 				dirp->dd_buf,
 				dirp->dd_len);
       
-      if (dirp->dd_size <= 0) {
-#ifdef HAVE_DD_LOCK
-        __lock_release_recursive(dirp->dd_lock);
-#endif
+      if (dirp->dd_size <= 0)
 	return NULL;
-      }
     }
     if (dirp->dd_loc >= dirp->dd_size) {
       dirp->dd_loc = 0;
       continue;
     }
     dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
-    if ((int)dp & 03) {	/* bogus pointer check */
-#ifdef HAVE_DD_LOCK
-      __lock_release_recursive(dirp->dd_lock);
-#endif
+    if ((int)dp & 03)	/* bogus pointer check */
       return NULL;
-    }
     if (dp->d_reclen <= 0 ||
-	dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc) {
-#ifdef HAVE_DD_LOCK
-      __lock_release_recursive(dirp->dd_lock);
-#endif
+	dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc)
       return NULL;
-    }
     dirp->dd_loc += dp->d_reclen;
     if (dp->d_ino == 0)
       continue;
-#ifdef HAVE_DD_LOCK
-    __lock_release_recursive(dirp->dd_lock);
-#endif
     return (dp);
   }
 }
diff --git a/newlib/libc/posix/readdir_r.c b/newlib/libc/posix/readdir_r.c
deleted file mode 100644
index 9bc013c..0000000
--- a/newlib/libc/posix/readdir_r.c
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef HAVE_OPENDIR
-
-/*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* this code is modified from readdir.c by Jeff Johnston, June 5, 2002 */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)readdir.c	5.7 (Berkeley) 6/1/90";
-#endif /* LIBC_SCCS and not lint */
-
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
-
-extern int getdents (int fd, void *dp, int count);
-
-/*
- * get next entry in a directory using supplied dirent structure.
- */
-int
-_DEFUN(readdir_r, (dirp, dp, dpp),
-	register DIR *dirp _AND
-	struct dirent *dp _AND
-	struct dirent **dpp) {
-
-struct dirent *tmpdp;
- 
-#ifdef HAVE_DD_LOCK
-  __lock_acquire_recursive(dirp->dd_lock);
-#endif
-
-  if (dirp->dd_fd == -1) {
-    *dpp = NULL;
-    return errno = EBADF;
-  }
- 
-  for (;;) {
-    if (dirp->dd_loc == 0) {
-      dirp->dd_size = getdents (dirp->dd_fd,
-				dirp->dd_buf,
-				dirp->dd_len);
-      
-      if (dirp->dd_size <= 0) {
-#ifdef HAVE_DD_LOCK
-        __lock_release_recursive(dirp->dd_lock);
-#endif
-        *dpp = NULL;
-        return errno;
-      }
-    }
-    if (dirp->dd_loc >= dirp->dd_size) {
-      dirp->dd_loc = 0;
-      continue;
-    }
-    tmpdp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
-    memcpy (dp, tmpdp, sizeof(struct dirent));
-
-    if (dp->d_reclen <= 0 ||
-	dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc) {
-#ifdef HAVE_DD_LOCK
-      __lock_release_recursive(dirp->dd_lock);
-#endif
-      *dpp = NULL;
-      return -1;
-    }
-    dirp->dd_loc += dp->d_reclen;
-    if (dp->d_ino == 0)
-      continue;
-#ifdef HAVE_DD_LOCK
-    __lock_release_recursive(dirp->dd_lock);
-#endif
-    *dpp = dp;
-    return 0;
-  }
-}
-
-#endif /* ! HAVE_OPENDIR */
diff --git a/newlib/libc/posix/rewinddir.c b/newlib/libc/posix/rewinddir.c
index bffad96..6a3814b 100644
--- a/newlib/libc/posix/rewinddir.c
+++ b/newlib/libc/posix/rewinddir.c
@@ -39,19 +39,12 @@ static char sccsid[] = "@(#)rewinddir.c	5.1 (Berkeley) 5/25/90";
 
 #include <sys/types.h>
 #include <dirent.h>
-#include <sys/lock.h>
 
 void
-_DEFUN(rewinddir, (dirp),
-	DIR *dirp)
+rewinddir(dirp)
+	DIR *dirp;
 {
-#ifdef HAVE_DD_LOCK
-	__lock_acquire_recursive(dirp->dd_lock);
-#endif
 	_seekdir((dirp), (off_t)0);
-#ifdef HAVE_DD_LOCK
-	__lock_release_recursive(dirp->dd_lock);
-#endif
 }
 
 #endif /* ! HAVE_OPENDIR */
diff --git a/newlib/libc/posix/scandir.c b/newlib/libc/posix/scandir.c
index 2cd5860..6acaff7 100644
--- a/newlib/libc/posix/scandir.c
+++ b/newlib/libc/posix/scandir.c
@@ -49,7 +49,6 @@ static char sccsid[] = "@(#)scandir.c	5.10 (Berkeley) 2/23/91";
 #include <dirent.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/lock.h>
 
 /*
  * The DIRSIZ macro gives the minimum record length which will hold
@@ -71,11 +70,11 @@ static char sccsid[] = "@(#)scandir.c	5.10 (Berkeley) 2/23/91";
 #endif
 
 int
-_DEFUN(scandir, (dirname, namelist, select, dcomp),
-	const char *dirname _AND
-	struct dirent ***namelist _AND
-	int (*select) __P((const struct dirent *)) _AND
-	int (*dcomp) __P((const struct dirent **, const struct dirent **)))
+scandir(dirname, namelist, select, dcomp)
+	const char *dirname;
+	struct dirent ***namelist;
+	int (*select) __P((struct dirent *));
+	int (*dcomp) __P((const void *, const void *));
 {
 	register struct dirent *d, *p, **names;
 	register size_t nitems;
@@ -85,15 +84,8 @@ _DEFUN(scandir, (dirname, namelist, select, dcomp),
 
 	if ((dirp = opendir(dirname)) == NULL)
 		return(-1);
-#ifdef HAVE_DD_LOCK
-	__lock_acquire_recursive(dirp->dd_lock);
-#endif
-	if (fstat(dirp->dd_fd, &stb) < 0) {
-#ifdef HAVE_DD_LOCK
-		__lock_release_recursive(dirp->dd_lock);
-#endif
+	if (fstat(dirp->dd_fd, &stb) < 0)
 		return(-1);
-	}
 
 	/*
 	 * estimate the array size by taking the size of the directory file
@@ -101,12 +93,8 @@ _DEFUN(scandir, (dirname, namelist, select, dcomp),
 	 */
 	arraysz = (stb.st_size / 24);
 	names = (struct dirent **)malloc(arraysz * sizeof(struct dirent *));
-	if (names == NULL) {
-#ifdef HAVE_DD_LOCK
-		__lock_release_recursive(dirp->dd_lock);
-#endif
+	if (names == NULL)
 		return(-1);
-	}
 
 	nitems = 0;
 	while ((d = readdir(dirp)) != NULL) {
@@ -116,12 +104,8 @@ _DEFUN(scandir, (dirname, namelist, select, dcomp),
 		 * Make a minimum size copy of the data
 		 */
 		p = (struct dirent *)malloc(DIRSIZ(d));
-		if (p == NULL) {
-#ifdef HAVE_DD_LOCK
-			__lock_release_recursive(dirp->dd_lock);
-#endif
+		if (p == NULL)
 			return(-1);
-		}
 		p->d_ino = d->d_ino;
 		p->d_reclen = d->d_reclen;
 #ifdef _DIRENT_HAVE_D_NAMLEN
@@ -135,31 +119,20 @@ _DEFUN(scandir, (dirname, namelist, select, dcomp),
 		 * realloc the maximum size.
 		 */
 		if (++nitems >= arraysz) {
-			if (fstat(dirp->dd_fd, &stb) < 0) {
-#ifdef HAVE_DD_LOCK
-				__lock_release_recursive(dirp->dd_lock);
-#endif
+			if (fstat(dirp->dd_fd, &stb) < 0)
 				return(-1);	/* just might have grown */
-			}
 			arraysz = stb.st_size / 12;
 			names = (struct dirent **)realloc((char *)names,
 				arraysz * sizeof(struct dirent *));
-			if (names == NULL) {
-#ifdef HAVE_DD_LOCK
-				__lock_release_recursive(dirp->dd_lock);
-#endif
+			if (names == NULL)
 				return(-1);
-			}
 		}
 		names[nitems-1] = p;
 	}
 	closedir(dirp);
 	if (nitems && dcomp != NULL)
-		qsort(names, nitems, sizeof(struct dirent *), (void *)dcomp);
+		qsort(names, nitems, sizeof(struct dirent *), dcomp);
 	*namelist = names;
-#ifdef HAVE_DD_LOCK
-	__lock_release_recursive(dirp->dd_lock);
-#endif
 	return(nitems);
 }
 
@@ -167,9 +140,9 @@ _DEFUN(scandir, (dirname, namelist, select, dcomp),
  * Alphabetic order comparison routine for those who want it.
  */
 int
-_DEFUN(alphasort, (d1, d2),
-       const struct dirent **d1 _AND
-       const struct dirent **d2)
+alphasort(d1, d2)
+       const struct dirent **d1;
+       const struct dirent **d2;
 {
        return(strcmp((*d1)->d_name, (*d2)->d_name));
 }
diff --git a/newlib/libc/posix/seekdir.c b/newlib/libc/posix/seekdir.c
index 3965eda..dab3bfb 100644
--- a/newlib/libc/posix/seekdir.c
+++ b/newlib/libc/posix/seekdir.c
@@ -39,24 +39,18 @@ static char sccsid[] = "@(#)seekdir.c	5.7 (Berkeley) 6/1/90";
 
 #include <sys/param.h>
 #include <dirent.h>
-#include <sys/lock.h>
 
 /*
  * Seek to an entry in a directory.
  * _seekdir is in telldir.c so that it can share opaque data structures.
  */
 void
-_DEFUN(seekdir, (dirp, loc),
-	DIR *dirp _AND
-	long loc)
+seekdir(dirp, loc)
+	DIR *dirp;
+	long loc;
 {
-#ifdef HAVE_DD_LOCK
-	__lock_acquire_recursive(dirp->dd_lock);
-#endif
+
 	_seekdir(dirp, loc);
-#ifdef HAVE_DD_LOCK
-	__lock_release_recursive(dirp->dd_lock);
-#endif
 }
 
 #endif /* ! HAVE_OPENDIR */
diff --git a/newlib/libc/posix/telldir.c b/newlib/libc/posix/telldir.c
index a8c5440..30c0037 100644
--- a/newlib/libc/posix/telldir.c
+++ b/newlib/libc/posix/telldir.c
@@ -41,7 +41,6 @@ static char sccsid[] = "@(#)telldir.c	5.9 (Berkeley) 2/23/91";
 #include <dirent.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/lock.h>
 
 /*
  * The option SINGLEUSE may be defined to say that a telldir
@@ -61,7 +60,6 @@ struct ddloc {
 	long	loc_index;	/* key associated with structure */
 	long	loc_seek;	/* magic cookie returned by getdirentries */
 	long	loc_loc;	/* offset of entry in buffer */
-	DIR    *loc_dirp;       /* DIR pointer */
 };
 
 #define	NDIRHASH	32	/* Num of hash lists, must be a power of 2 */
@@ -69,61 +67,42 @@ struct ddloc {
 
 static long	dd_loccnt;	/* Index of entry for sequential readdir's */
 static struct	ddloc *dd_hash[NDIRHASH];   /* Hash list heads for ddlocs */
-__LOCK_INIT(static, dd_hash_lock);
 
 /*
  * return a pointer into a directory
  */
-
-#ifndef _ELIX_LEVEL || _ELIX_LEVEL >= 2
-
 long
-_DEFUN(telldir, (dirp),
-       DIR *dirp)
+telldir(dirp)
+       DIR *dirp;
 {
 	register int index;
 	register struct ddloc *lp;
 
 	if ((lp = (struct ddloc *)malloc(sizeof(struct ddloc))) == NULL)
 		return (-1);
-
-#ifdef HAVE_DD_LOCK
-	__lock_acquire_recursive(dirp->dd_lock);
-	__lock_acquire(dd_hash_lock);
-#endif
 	index = dd_loccnt++;
 	lp->loc_index = index;
 	lp->loc_seek = dirp->dd_seek;
 	lp->loc_loc = dirp->dd_loc;
-	lp->loc_dirp = dirp;
 	lp->loc_next = dd_hash[LOCHASH(index)];
 	dd_hash[LOCHASH(index)] = lp;
-#ifdef HAVE_DD_LOCK
-	__lock_release(dd_hash_lock);
-	__lock_release_recursive(dirp->dd_lock);
-#endif
 	return (index);
 }
 
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 2 */
-
 /*
  * seek to an entry in a directory.
  * Only values returned by "telldir" should be passed to seekdir.
  */
 void
-_DEFUN(_seekdir, (dirp, loc),
-	register DIR *dirp _AND
-	long loc)
+_seekdir(dirp, loc)
+	register DIR *dirp;
+	long loc;
 {
 	register struct ddloc *lp;
 	register struct ddloc **prevlp;
 	struct dirent *dp;
 	extern long lseek();
 
-#ifdef HAVE_DD_LOCK
-	__lock_acquire(dd_hash_lock);
-#endif
 	prevlp = &dd_hash[LOCHASH(loc)];
 	lp = *prevlp;
 	while (lp != NULL) {
@@ -132,12 +111,8 @@ _DEFUN(_seekdir, (dirp, loc),
 		prevlp = &lp->loc_next;
 		lp = lp->loc_next;
 	}
-	if (lp == NULL) {
-#ifdef HAVE_DD_LOCK
-		__lock_release(dd_hash_lock);
-#endif
+	if (lp == NULL)
 		return;
-	}
 	if (lp->loc_loc == dirp->dd_loc && lp->loc_seek == dirp->dd_seek)
 		goto found;
 	(void) lseek(dirp->dd_fd, lp->loc_seek, 0);
@@ -153,46 +128,6 @@ found:
 	*prevlp = lp->loc_next;
 	free((caddr_t)lp);
 #endif
-#ifdef HAVE_DD_LOCK
-	__lock_release(dd_hash_lock);
-#endif
 }
 
-/* clean out any hash entries from a closed directory */
-void
-_DEFUN(_cleanupdir, (dirp),
-	register DIR *dirp)
-{
-	int i;
-
-#ifdef HAVE_DD_LOCK
-	__lock_acquire(dd_hash_lock);
-#endif
-	for (i = 0; i < NDIRHASH; ++i) {
-		register struct ddloc *lp;
-		register struct ddloc *prevlp;
-		lp = dd_hash[i];
-		while (lp != NULL && lp->loc_dirp == dirp) {
-			dd_hash[i] = lp->loc_next;
-			prevlp = lp;
-			free((caddr_t)lp);
-			lp = prevlp->loc_next;
-		}
-		prevlp = lp;
-		while (lp != NULL) {
-			lp = lp->loc_next;
-			if (lp != NULL && lp->loc_dirp == dirp) {
-				prevlp->loc_next = lp->loc_next;
-				free((caddr_t)lp);
-				lp = prevlp;
-			}
-			else
-				prevlp = lp;
-		}
-	}
-#ifdef HAVE_DD_LOCK
-	__lock_release(dd_hash_lock);
-#endif
-
-}
 #endif /* ! HAVE_OPENDIR */
diff --git a/newlib/libc/reent/Makefile.am b/newlib/libc/reent/Makefile.am
index dd396c3..c01ffb5 100644
--- a/newlib/libc/reent/Makefile.am
+++ b/newlib/libc/reent/Makefile.am
@@ -4,38 +4,12 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-if HAVE_STDIO64_DIR
-STDIO64_OBJECTS = \
-	fstat64r.$(oext) \
-	lseek64r.$(oext) \
-	open64r.$(oext)
-
-STDIO64_DEFS = \
-	fstat64r.def \
-	lseek64r.def \
-	open64r.def
-endif
-
-ELIX_2_OBJS = $(STDIO64_OBJECTS)
-ELIX_3_OBJS = execr.$(oext)
-
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-if ELIX_LEVEL_2
-LIB_OBJS = $(ELIX_2_OBJS)
-else
-LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS)
-endif
-endif
-
-GENERAL_SOURCES = \
+LIB_SOURCES = \
 	closer.c \
 	reent.c \
 	impure.c \
-	fcntlr.c \
+	execr.c \
 	fstatr.c \
-	getreent.c \
 	linkr.c \
 	lseekr.c \
 	openr.c \
@@ -52,15 +26,11 @@ libreent_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libreent.la
-libreent_la_SOURCES = $(GENERAL_SOURCES)
-libreent_la_LIBADD = $(LIB_OBJS)
-libreent_la_DEPENDENCIES = $(LIB_OBJS)
+libreent_la_SOURCES = $(LIB_SOURCES)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
+lib_a_SOURCES = $(LIB_SOURCES)
 noinst_DATA =
 endif # USE_LIBTOOL
 
@@ -70,7 +40,6 @@ CHEWOUT_FILES = \
 	closer.def \
 	reent.def \
 	execr.def \
-	fcntlr.def \
 	fstatr.def \
 	linkr.def \
 	lseekr.def \
@@ -81,7 +50,6 @@ CHEWOUT_FILES = \
 	statr.def \
 	timer.def \
 	unlinkr.def \
-	$(STDIO64_DEFS) \
 	writer.def
 
 SUFFIXES = .def .h
diff --git a/newlib/libc/reent/Makefile.in b/newlib/libc/reent/Makefile.in
index ab087bc..dcd9ba7 100644
--- a/newlib/libc/reent/Makefile.in
+++ b/newlib/libc/reent/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -110,33 +95,49 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-@HAVE_STDIO64_DIR_TRUE@STDIO64_OBJECTS = 	fstat64r.$(oext) 	lseek64r.$(oext) 	open64r.$(oext)
-
-@HAVE_STDIO64_DIR_TRUE@STDIO64_DEFS = 	fstat64r.def 	lseek64r.def 	open64r.def
-
-ELIX_2_OBJS = $(STDIO64_OBJECTS)
-ELIX_3_OBJS = execr.$(oext)
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS)
-
-GENERAL_SOURCES =  	closer.c 	reent.c 	impure.c 	fcntlr.c 	fstatr.c 	getreent.c 	linkr.c 	lseekr.c 	openr.c 	readr.c 	signalr.c 	signgam.c 	sbrkr.c 	statr.c 	timer.c 	unlinkr.c 	writer.c
+LIB_SOURCES = \
+	closer.c \
+	reent.c \
+	impure.c \
+	execr.c \
+	fstatr.c \
+	linkr.c \
+	lseekr.c \
+	openr.c \
+	readr.c \
+	signalr.c \
+	signgam.c \
+	sbrkr.c \
+	statr.c \
+	timer.c \
+	unlinkr.c \
+	writer.c
 
 
 libreent_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libreent.la
-@USE_LIBTOOL_TRUE@libreent_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@libreent_la_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@libreent_la_DEPENDENCIES = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libreent.la
+@USE_LIBTOOL_TRUE@libreent_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS)
-
-CHEWOUT_FILES =  	closer.def 	reent.def 	execr.def 	fcntlr.def 	fstatr.def 	linkr.def 	lseekr.def 	openr.def 	readr.def 	signalr.def 	sbrkr.def 	statr.def 	timer.def 	unlinkr.def 	$(STDIO64_DEFS) 	writer.def
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
+
+CHEWOUT_FILES = \
+	closer.def \
+	reent.def \
+	execr.def \
+	fstatr.def \
+	linkr.def \
+	lseekr.def \
+	openr.def \
+	readr.def \
+	signalr.def \
+	sbrkr.def \
+	statr.def \
+	timer.def \
+	unlinkr.def \
+	writer.def
 
 
 SUFFIXES = .def .h
@@ -154,18 +155,17 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  closer.$(OBJEXT) reent.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@impure.$(OBJEXT) fcntlr.$(OBJEXT) fstatr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getreent.$(OBJEXT) linkr.$(OBJEXT) lseekr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@openr.$(OBJEXT) readr.$(OBJEXT) signalr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@signgam.$(OBJEXT) sbrkr.$(OBJEXT) statr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@timer.$(OBJEXT) unlinkr.$(OBJEXT) writer.$(OBJEXT)
+lib_a_LIBADD = 
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  closer.o reent.o impure.o execr.o \
+@USE_LIBTOOL_FALSE@fstatr.o linkr.o lseekr.o openr.o readr.o signalr.o \
+@USE_LIBTOOL_FALSE@signgam.o sbrkr.o statr.o timer.o unlinkr.o writer.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
+libreent_la_LIBADD = 
 @USE_LIBTOOL_TRUE@libreent_la_OBJECTS =  closer.lo reent.lo impure.lo \
-@USE_LIBTOOL_TRUE@fcntlr.lo fstatr.lo getreent.lo linkr.lo lseekr.lo \
-@USE_LIBTOOL_TRUE@openr.lo readr.lo signalr.lo signgam.lo sbrkr.lo \
-@USE_LIBTOOL_TRUE@statr.lo timer.lo unlinkr.lo writer.lo
+@USE_LIBTOOL_TRUE@execr.lo fstatr.lo linkr.lo lseekr.lo openr.lo \
+@USE_LIBTOOL_TRUE@readr.lo signalr.lo signgam.lo sbrkr.lo statr.lo \
+@USE_LIBTOOL_TRUE@timer.lo unlinkr.lo writer.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -185,7 +185,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libreent_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .h .lo .o .obj .s
+.SUFFIXES: .S .c .def .h .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus reent/Makefile
 
@@ -206,11 +206,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -219,7 +214,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libc/reent/execr.c b/newlib/libc/reent/execr.c
index 8bc1208..0fbddb9 100644
--- a/newlib/libc/reent/execr.c
+++ b/newlib/libc/reent/execr.c
@@ -53,11 +53,11 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_execve_r, (ptr, name, argv, env),
-     struct _reent *ptr _AND
-     char *name _AND
-     char **argv _AND
-     char **env)
+_execve_r (ptr, name, argv, env)
+     struct _reent *ptr;
+     char *name;
+     char **argv;
+     char **env;
 {
   int ret;
 
@@ -93,8 +93,8 @@ DESCRIPTION
 #ifndef NO_FORK
 
 int
-_DEFUN (_fork_r, (ptr),
-     struct _reent *ptr)
+_fork_r (ptr)
+     struct _reent *ptr;
 {
   int ret;
 
@@ -130,9 +130,9 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_wait_r, (ptr, status),
-     struct _reent *ptr _AND
-     int *status)
+_wait_r (ptr, status)
+     struct _reent *ptr;
+     int *status;
 {
   int ret;
 
diff --git a/newlib/libc/reent/fcntlr.c b/newlib/libc/reent/fcntlr.c
deleted file mode 100644
index d632d18..0000000
--- a/newlib/libc/reent/fcntlr.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Reentrant versions of fcntl system call.  This implementation just
-   calls the fcntl system call.  */
-
-#include <reent.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <_syslist.h>
-
-/* Some targets provides their own versions of these functions.  Those
-   targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
-
-#ifdef _REENT_ONLY
-#ifndef REENTRANT_SYSCALLS_PROVIDED
-#define REENTRANT_SYSCALLS_PROVIDED
-#endif
-#endif
-
-#ifndef REENTRANT_SYSCALLS_PROVIDED
-
-/* We use the errno variable used by the system dependent layer.  */
-#undef errno
-extern int errno;
-
-/*
-FUNCTION
-	<<_fcntl_r>>---Reentrant version of fcntl
-	
-INDEX
-	_fcntl_r
-
-ANSI_SYNOPSIS
-	#include <reent.h>
-	int _fcntl_r(struct _reent *<[ptr]>,
-		     int <[fd]>, int <[cmd]>, <[arg]>);
-
-TRAD_SYNOPSIS
-	#include <reent.h>
-	int _fcntl_r(<[ptr]>, <[fd]>, <[cmd]>, <[arg]>)
-	struct _reent *<[ptr]>;
-	int <[fd]>;
-	int <[cmd]>;
-	int <[arg]>;
-
-DESCRIPTION
-	This is a reentrant version of <<fcntl>>.  It
-	takes a pointer to the global data block, which holds
-	<<errno>>.
-*/
-
-int
-_DEFUN (_fcntl_r, (ptr, fd, cmd, arg),
-     struct _reent *ptr _AND
-     int fd _AND
-     int cmd _AND
-     int arg)
-{
-  int ret;
-
-  errno = 0;
-  if ((ret = _fcntl (fd, cmd, arg)) == -1 && errno != 0)
-    ptr->_errno = errno;
-  return ret;
-}
-
-#endif /* ! defined (REENTRANT_SYSCALLS_PROVIDED) */
diff --git a/newlib/libc/reent/fstat64r.c b/newlib/libc/reent/fstat64r.c
deleted file mode 100644
index 1c45897..0000000
--- a/newlib/libc/reent/fstat64r.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Reentrant versions of fstat system call.  This implementation just
-   calls the fstat system call.  */
-
-#include <reent.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <_syslist.h>
-
-#ifdef __LARGE64_FILES
-
-/* Some targets provides their own versions of these functions.  Those
-   targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
-
-#ifdef _REENT_ONLY
-#ifndef REENTRANT_SYSCALLS_PROVIDED
-#define REENTRANT_SYSCALLS_PROVIDED
-#endif
-#endif
-
-#ifdef REENTRANT_SYSCALLS_PROVIDED
-
-int _dummy_fstat_syscalls = 1;
-
-#else
-
-/* We use the errno variable used by the system dependent layer.  */
-#undef errno
-extern int errno;
-
-/*
-FUNCTION
-	<<_fstat64_r>>---Reentrant version of fstat64
-	
-INDEX
-	_fstat64_r
-
-ANSI_SYNOPSIS
-	#include <reent.h>
-	int _fstat64_r(struct _reent *<[ptr]>,
-		       int <[fd]>, struct stat64 *<[pstat]>);
-
-TRAD_SYNOPSIS
-	#include <reent.h>
-	int _fstat64_r(<[ptr]>, <[fd]>, <[pstat]>)
-	struct _reent *<[ptr]>;
-	int <[fd]>;
-	struct stat *<[pstat]>;
-
-DESCRIPTION
-	This is a reentrant version of <<fstat64>>.  It
-	takes a pointer to the global data block, which holds
-	<<errno>>.  This function is only enabled on systems
-	that define __LARGE64_FILES.
-*/
-
-int
-_DEFUN (_fstat64_r, (ptr, fd, pstat),
-     struct _reent *ptr _AND
-     int fd _AND
-     struct stat64 *pstat)
-{
-  int ret;
-
-  errno = 0;
-  if ((ret = _fstat64 (fd, pstat)) == -1 && errno != 0)
-    ptr->_errno = errno;
-  return ret;
-}
-
-#endif /* ! defined (REENTRANT_SYSCALLS_PROVIDED) */
-
-#endif /* __LARGE64_FILES */
diff --git a/newlib/libc/reent/getreent.c b/newlib/libc/reent/getreent.c
deleted file mode 100644
index b53ff26..0000000
--- a/newlib/libc/reent/getreent.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* default reentrant pointer when multithread enabled */
-
-#include <_ansi.h>
-#include <reent.h>
-
-struct _reent *
-_DEFUN_VOID(__getreent)
-{
-  return _impure_ptr;
-}
diff --git a/newlib/libc/reent/impure.c b/newlib/libc/reent/impure.c
index 12ee717..a14f5c3 100644
--- a/newlib/libc/reent/impure.c
+++ b/newlib/libc/reent/impure.c
@@ -10,8 +10,4 @@
 #endif
 
 static struct _reent __ATTRIBUTE_IMPURE_DATA__ impure_data = _REENT_INIT (impure_data);
-#ifdef __CYGWIN__
-extern struct _reent reent_data __attribute__ ((alias("impure_data")));
-#endif
 struct _reent *__ATTRIBUTE_IMPURE_PTR__ _impure_ptr = &impure_data;
-struct _reent *_CONST __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &impure_data;
diff --git a/newlib/libc/reent/linkr.c b/newlib/libc/reent/linkr.c
index ded636a..eda8d03 100644
--- a/newlib/libc/reent/linkr.c
+++ b/newlib/libc/reent/linkr.c
@@ -50,10 +50,10 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_link_r, (ptr, old, new),
-     struct _reent *ptr _AND
-     _CONST char *old _AND
-     _CONST char *new)
+_link_r (ptr, old, new)
+     struct _reent *ptr;
+     _CONST char *old;
+     _CONST char *new;
 {
   int ret;
 
diff --git a/newlib/libc/reent/lseek64r.c b/newlib/libc/reent/lseek64r.c
deleted file mode 100644
index 0207a12..0000000
--- a/newlib/libc/reent/lseek64r.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Reentrant versions of lseek system call. */
-
-#include <reent.h>
-#include <unistd.h>
-#include <_syslist.h>
-
-/* Some targets provides their own versions of this functions.  Those
-   targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
-
-#ifdef __LARGE64_FILES
-
-#ifdef _REENT_ONLY
-#ifndef REENTRANT_SYSCALLS_PROVIDED
-#define REENTRANT_SYSCALLS_PROVIDED
-#endif
-#endif
-
-#ifndef REENTRANT_SYSCALLS_PROVIDED
-
-/* We use the errno variable used by the system dependent layer.  */
-#undef errno
-extern int errno;
-
-/*
-FUNCTION
-	<<_lseek64_r>>---Reentrant version of lseek
-	
-INDEX
-	_lseek64_r
-
-ANSI_SYNOPSIS
-	#include <reent.h>
-	off64_t _lseek64_r(struct _reent *<[ptr]>,
-		           int <[fd]>, off64_t <[pos]>, int <[whence]>);
-
-TRAD_SYNOPSIS
-	#include <reent.h>
-	off64_t _lseek64_r(<[ptr]>, <[fd]>, <[pos]>, <[whence]>)
-	struct _reent *<[ptr]>;
-	int <[fd]>;
-	off64_t <[pos]>;
-	int <[whence]>;
-
-DESCRIPTION
-	This is a reentrant version of <<lseek64>>.  It
-	takes a pointer to the global data block, which holds
-	<<errno>>.  This function only exists on a system
-        with large file support.
-*/
-
-_off64_t
-_DEFUN (_lseek64_r, (ptr, fd, pos, whence),
-     struct _reent *ptr _AND
-     int fd _AND
-     _off64_t pos _AND
-     int whence)
-{
-  _off64_t ret;
-
-  errno = 0;
-  if ((ret = _lseek64 (fd, pos, whence)) == (_off64_t) -1 && errno != 0)
-    ptr->_errno = errno;
-  return ret;
-}
-
-#endif /* ! defined (REENTRANT_SYSCALLS_PROVIDED) */
-
-#endif /* __LARGE64_FILES */
diff --git a/newlib/libc/reent/lseekr.c b/newlib/libc/reent/lseekr.c
index fa00695..ed8ba13 100644
--- a/newlib/libc/reent/lseekr.c
+++ b/newlib/libc/reent/lseekr.c
@@ -45,17 +45,17 @@ DESCRIPTION
 	<<errno>>.
 */
 
-_off_t
-_DEFUN (_lseek_r, (ptr, fd, pos, whence),
-     struct _reent *ptr _AND
-     int fd _AND
-     _off_t pos _AND
-     int whence)
+off_t
+_lseek_r (ptr, fd, pos, whence)
+     struct _reent *ptr;
+     int fd;
+     off_t pos;
+     int whence;
 {
-  _off_t ret;
+  off_t ret;
 
   errno = 0;
-  if ((ret = _lseek (fd, pos, whence)) == (_off_t) -1 && errno != 0)
+  if ((ret = _lseek (fd, pos, whence)) == (off_t) -1 && errno != 0)
     ptr->_errno = errno;
   return ret;
 }
diff --git a/newlib/libc/reent/open64r.c b/newlib/libc/reent/open64r.c
deleted file mode 100644
index 30310d3..0000000
--- a/newlib/libc/reent/open64r.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Reentrant versions of open system call. */
-
-#include <reent.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <_syslist.h>
-
-#ifdef __LARGE64_FILES
-
-/* Some targets provides their own versions of this functions.  Those
-   targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
-
-#ifdef _REENT_ONLY
-#ifndef REENTRANT_SYSCALLS_PROVIDED
-#define REENTRANT_SYSCALLS_PROVIDED
-#endif
-#endif
-
-#ifndef REENTRANT_SYSCALLS_PROVIDED
-
-/* We use the errno variable used by the system dependent layer.  */
-#undef errno
-extern int errno;
-
-/*
-FUNCTION
-	<<_open64_r>>---Reentrant version of open64
-	
-INDEX
-	_open64_r
-
-ANSI_SYNOPSIS
-	#include <reent.h>
-	int _open64_r(struct _reent *<[ptr]>,
-  		      const char *<[file]>, int <[flags]>, int <[mode]>);
-
-TRAD_SYNOPSIS
-	#include <reent.h>
-	int _open64_r(<[ptr]>, <[file]>, <[flags]>, <[mode]>)
-	struct _reent *<[ptr]>;
-	char *<[file]>;
-	int <[flags]>;
-	int <[mode]>;
-
-DESCRIPTION
-	This is a reentrant version of <<open64>>.  It
-	takes a pointer to the global data block, which holds
-	<<errno>>.  This function only exists on systems with
-        large file support.
-*/
-
-int
-_open64_r (ptr, file, flags, mode)
-     struct _reent *ptr;
-     _CONST char *file;
-     int flags;
-     int mode;
-{
-  int ret;
-
-  errno = 0;
-  if ((ret = _open64 (file, flags, mode)) == -1 && errno != 0)
-    ptr->_errno = errno;
-  return ret;
-}
-
-#endif /* ! defined (REENTRANT_SYSCALLS_PROVIDED) */
-
-#endif /* __LARGE64_FILES */
diff --git a/newlib/libc/reent/openr.c b/newlib/libc/reent/openr.c
index 35138c6..c773103 100644
--- a/newlib/libc/reent/openr.c
+++ b/newlib/libc/reent/openr.c
@@ -47,11 +47,11 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_open_r, (ptr, file, flags, mode),
-     struct _reent *ptr _AND
-     _CONST char *file _AND
-     int flags _AND
-     int mode)
+_open_r (ptr, file, flags, mode)
+     struct _reent *ptr;
+     _CONST char *file;
+     int flags;
+     int mode;
 {
   int ret;
 
diff --git a/newlib/libc/reent/readr.c b/newlib/libc/reent/readr.c
index 38c1d9e..e3deca9 100644
--- a/newlib/libc/reent/readr.c
+++ b/newlib/libc/reent/readr.c
@@ -28,12 +28,12 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <reent.h>
-	_ssize_t _read_r(struct _reent *<[ptr]>,
-		         int <[fd]>, void *<[buf]>, size_t <[cnt]>);
+	long _read_r(struct _reent *<[ptr]>,
+		     int <[fd]>, void *<[buf]>, size_t <[cnt]>);
 
 TRAD_SYNOPSIS
 	#include <reent.h>
-	_ssize_t _read_r(<[ptr]>, <[fd]>, <[buf]>, <[cnt]>)
+	long _read_r(<[ptr]>, <[fd]>, <[buf]>, <[cnt]>)
 	struct _reent *<[ptr]>;
 	int <[fd]>;
 	char *<[buf]>;
@@ -45,17 +45,17 @@ DESCRIPTION
 	<<errno>>.
 */
 
-_ssize_t
-_DEFUN (_read_r, (ptr, fd, buf, cnt),
-     struct _reent *ptr _AND
-     int fd _AND
-     _PTR buf _AND
-     size_t cnt)
+long
+_read_r (ptr, fd, buf, cnt)
+     struct _reent *ptr;
+     int fd;
+     _PTR buf;
+     size_t cnt;
 {
-  _ssize_t ret;
+  long ret;
 
   errno = 0;
-  if ((ret = (_ssize_t)_read (fd, buf, cnt)) == -1 && errno != 0)
+  if ((ret = _read (fd, buf, cnt)) == -1 && errno != 0)
     ptr->_errno = errno;
   return ret;
 }
diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c
index ddf6a82..f35d957 100644
--- a/newlib/libc/reent/reent.c
+++ b/newlib/libc/reent/reent.c
@@ -30,9 +30,9 @@ int errno;
 /* Interim cleanup code */
 
 void
-_DEFUN (cleanup_glue, (ptr, glue),
-     struct _reent *ptr _AND
-     struct _glue *glue)
+cleanup_glue (ptr, glue)
+     struct _reent *ptr;
+     struct _glue *glue;
 {
   /* Have to reclaim these in reverse order: */
   if (glue->_next)
@@ -42,23 +42,20 @@ _DEFUN (cleanup_glue, (ptr, glue),
 }
 
 void
-_DEFUN (_reclaim_reent, (ptr),
-     struct _reent *ptr)
+_reclaim_reent (ptr)
+     struct _reent *ptr;
 {
   if (ptr != _impure_ptr)
     {
       /* used by mprec routines. */
-#ifdef _REENT_SMALL
-      if (ptr->_mp)	/* don't bother allocating it! */
-#endif
-      if (_REENT_MP_FREELIST(ptr))
+      if (ptr->_freelist)
 	{
 	  int i;
 	  for (i = 0; i < 15 /* _Kmax */; i++) 
 	    {
 	      struct _Bigint *thisone, *nextone;
 	
-	      nextone = _REENT_MP_FREELIST(ptr)[i];
+	      nextone = ptr->_freelist[i];
 	      while (nextone)
 		{
 		  thisone = nextone;
@@ -67,23 +64,9 @@ _DEFUN (_reclaim_reent, (ptr),
 		}
 	    }    
 
-	  _free_r (ptr, _REENT_MP_FREELIST(ptr));
+	  _free_r (ptr, ptr->_freelist);
 	}
 
-#ifdef _REENT_SMALL
-      if (ptr->_emergency)
-	_free_r (ptr, ptr->_emergency);
-      if (ptr->_mp)
-	_free_r (ptr, ptr->_mp);
-      if (ptr->_r48)
-	_free_r (ptr, ptr->_r48);
-      if (ptr->_localtime_buf)
-	_free_r (ptr, ptr->_localtime_buf);
-      if (ptr->_asctime_buf)
-	_free_r (ptr, ptr->_asctime_buf);
-      if (ptr->_atexit->_on_exit_args_ptr)
-	_free_r (ptr, ptr->_atexit->_on_exit_args_ptr);
-#else
       /* atexit stuff */
       if ((ptr->_atexit) && (ptr->_atexit != &ptr->_atexit0))
 	{
@@ -95,7 +78,6 @@ _DEFUN (_reclaim_reent, (ptr),
 	      _free_r (ptr, q);
 	    }
 	}
-#endif
 
       if (ptr->_cvtbuf)
 	_free_r (ptr, ptr->_cvtbuf);
@@ -123,7 +105,7 @@ _DEFUN (_reclaim_reent, (ptr),
  */
 
 void
-_DEFUN (_wrapup_reent, (ptr), struct _reent *ptr)
+_wrapup_reent(struct _reent *ptr)
 {
   register struct _atexit *p;
   register int n;
@@ -131,14 +113,9 @@ _DEFUN (_wrapup_reent, (ptr), struct _reent *ptr)
   if (ptr == 0)
       ptr = _REENT;
 
-#ifdef _REENT_SMALL
-  for (p = &ptr->_atexit, n = p->_ind; --n >= 0;)
-    (*p->_fns[n]) ();
-#else
   for (p = ptr->_atexit; p; p = p->_next)
     for (n = p->_ind; --n >= 0;)
       (*p->_fns[n]) ();
-#endif
   if (ptr->__cleanup)
     (*ptr->__cleanup) (ptr);
 }
diff --git a/newlib/libc/reent/reent.tex b/newlib/libc/reent/reent.tex
index 881c572..71a0a0d 100644
--- a/newlib/libc/reent/reent.tex
+++ b/newlib/libc/reent/reent.tex
@@ -4,8 +4,8 @@
 @cindex reentrancy
 Reentrancy is a characteristic of library functions which allows multiple
 processes to use the same address space with assurance that the values stored
-in those spaces will remain constant between calls. The Red Hat
-newlib implementation of the library functions ensures that 
+in those spaces will remain constant between calls. Cygnus's implementation
+of the library functions ensures that 
 whenever possible, these library functions are reentrant.  However,
 there are some functions that can not be trivially made reentrant.
 Hooks have been provided to allow you to use these functions in a fully
@@ -29,10 +29,6 @@ and @var{mode}, and uses the global reentrancy structure.  The function
 pointer to an instance of the reentrancy structure, @var{file}
 and @var{mode}.	
 
-There are two versions of @samp{struct _reent}, a normal one and one
-for small memory systems, controlled by the @code{_REENT_SMALL}
-definition from the (automatically included) @file{<sys/config.h>}.
-
 @cindex global reentrancy structure
 @findex _impure_ptr
 Each function which uses the global reentrancy structure uses the global
@@ -107,11 +103,6 @@ _fstat_r        _sbrk_r
 _gettimeofday_r _stat_r
 _getpid_r       _times_r
 
-@ifset STDIO64
-@exdent @emph{Additional 64-bit I/O System functions:}
-_fstat64_r	_lseek64_r	_open64_r
-@end ifset
-
 @exdent @emph{Time function:}
 _asctime_r
 @end example
diff --git a/newlib/libc/reent/sbrkr.c b/newlib/libc/reent/sbrkr.c
index b963307..31c9de3 100644
--- a/newlib/libc/reent/sbrkr.c
+++ b/newlib/libc/reent/sbrkr.c
@@ -34,13 +34,13 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <reent.h>
-	void *_sbrk_r(struct _reent *<[ptr]>, ptrdiff_t <[incr]>);
+	void *_sbrk_r(struct _reent *<[ptr]>, size_t <[incr]>);
 
 TRAD_SYNOPSIS
 	#include <reent.h>
 	void *_sbrk_r(<[ptr]>, <[incr]>)
 	struct _reent *<[ptr]>;
-	ptrdiff_t <[incr]>;
+	size_t <[incr]>;
 
 DESCRIPTION
 	This is a reentrant version of <<sbrk>>.  It
@@ -49,12 +49,12 @@ DESCRIPTION
 */
 
 void *
-_DEFUN (_sbrk_r, (ptr, incr),
-     struct _reent *ptr _AND
-     ptrdiff_t incr)
+_sbrk_r (ptr, incr)
+     struct _reent *ptr;
+     size_t incr;
 {
   char *ret;
-  void *_sbrk(ptrdiff_t);
+  void *_sbrk(size_t);
 
   errno = 0;
   if ((ret = (char *)(_sbrk (incr))) == (void *) -1 && errno != 0)
diff --git a/newlib/libc/reent/signalr.c b/newlib/libc/reent/signalr.c
index 7d8aa7d..3ac3e2c 100644
--- a/newlib/libc/reent/signalr.c
+++ b/newlib/libc/reent/signalr.c
@@ -50,10 +50,10 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_kill_r, (ptr, pid, sig),
-     struct _reent *ptr _AND
-     int pid _AND
-     int sig)
+_kill_r (ptr, pid, sig)
+     struct _reent *ptr;
+     int pid;
+     int sig;
 {
   int ret;
 
@@ -89,8 +89,8 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_getpid_r, (ptr),
-     struct _reent *ptr)
+_getpid_r (ptr)
+     struct _reent *ptr;
 {
   int ret;
   ret = _getpid ();
diff --git a/newlib/libc/reent/signgam.c b/newlib/libc/reent/signgam.c
index bfb2dea..9053866 100644
--- a/newlib/libc/reent/signgam.c
+++ b/newlib/libc/reent/signgam.c
@@ -8,9 +8,9 @@
 #ifndef _REENT_ONLY
 
 int *
-_DEFUN_VOID (__signgam)
+__signgam ()
 {
-  return &_REENT_SIGNGAM(_REENT);
+  return &_REENT->_new._reent._gamma_signgam;
 }
 
 #endif
diff --git a/newlib/libc/reent/statr.c b/newlib/libc/reent/statr.c
index 9ad2bb2..48a3773 100644
--- a/newlib/libc/reent/statr.c
+++ b/newlib/libc/reent/statr.c
@@ -52,10 +52,10 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_stat_r, (ptr, file, pstat),
-     struct _reent *ptr _AND
-     _CONST char *file _AND
-     struct stat *pstat)
+_stat_r (ptr, file, pstat)
+     struct _reent *ptr;
+     _CONST char *file;
+     struct stat *pstat;
 {
   int ret;
 
diff --git a/newlib/libc/reent/timer.c b/newlib/libc/reent/timer.c
index b604b90..6895952 100644
--- a/newlib/libc/reent/timer.c
+++ b/newlib/libc/reent/timer.c
@@ -55,9 +55,9 @@ DESCRIPTION
 */
 
 clock_t
-_DEFUN (_times_r, (ptr, ptms),
-     struct _reent *ptr _AND
-     struct tms *ptms)
+_times_r (ptr, ptms)
+     struct _reent *ptr;
+     struct tms *ptms;
 {
   clock_t ret;
 
@@ -97,10 +97,10 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_gettimeofday_r, (ptr, ptimeval, ptimezone),
-     struct _reent *ptr _AND
-     struct timeval *ptimeval _AND
-     struct timezone *ptimezone)
+_gettimeofday_r (ptr, ptimeval, ptimezone)
+     struct _reent *ptr;
+     struct timeval *ptimeval;
+     struct timezone *ptimezone;
 {
   int ret;
 
diff --git a/newlib/libc/reent/unlinkr.c b/newlib/libc/reent/unlinkr.c
index 95b815f..dbfc7e6 100644
--- a/newlib/libc/reent/unlinkr.c
+++ b/newlib/libc/reent/unlinkr.c
@@ -44,9 +44,9 @@ DESCRIPTION
 */
 
 int
-_DEFUN (_unlink_r, (ptr, file),
-     struct _reent *ptr _AND
-     _CONST char *file)
+_unlink_r (ptr, file)
+     struct _reent *ptr;
+     _CONST char *file;
 {
   int ret;
 
diff --git a/newlib/libc/reent/writer.c b/newlib/libc/reent/writer.c
index 128f7f7..ac10286 100644
--- a/newlib/libc/reent/writer.c
+++ b/newlib/libc/reent/writer.c
@@ -28,12 +28,12 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <reent.h>
-	_ssize_t _write_r(struct _reent *<[ptr]>,
-		          int <[fd]>, const void *<[buf]>, size_t <[cnt]>);
+	long _write_r(struct _reent *<[ptr]>,
+		      int <[fd]>, const void *<[buf]>, size_t <[cnt]>);
 
 TRAD_SYNOPSIS
 	#include <reent.h>
-	_ssize_t _write_r(<[ptr]>, <[fd]>, <[buf]>, <[cnt]>)
+	long _write_r(<[ptr]>, <[fd]>, <[buf]>, <[cnt]>)
 	struct _reent *<[ptr]>;
 	int <[fd]>;
 	char *<[buf]>;
@@ -45,17 +45,17 @@ DESCRIPTION
 	<<errno>>.
 */
 
-_ssize_t
-_DEFUN (_write_r, (ptr, fd, buf, cnt),
-     struct _reent *ptr _AND
-     int fd _AND
-     _CONST _PTR buf _AND
-     size_t cnt)
+long
+_write_r (ptr, fd, buf, cnt)
+     struct _reent *ptr;
+     int fd;
+     _CONST _PTR buf;
+     size_t cnt;
 {
-  _ssize_t ret;
+  long ret;
 
   errno = 0;
-  if ((ret = (_ssize_t)_write (fd, buf, cnt)) == -1 && errno != 0)
+  if ((ret = _write (fd, buf, cnt)) == -1 && errno != 0)
     ptr->_errno = errno;
   return ret;
 }
diff --git a/newlib/libc/search/Makefile.am b/newlib/libc/search/Makefile.am
deleted file mode 100644
index d170cfa..0000000
--- a/newlib/libc/search/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-GENERAL_SOURCES = \
-	bsearch.c \
-	db_local.h \
-	extern.h \
-	hash.h \
-	page.h \
-	qsort.c
-
-## Following are EL/IX level 2 interfaces
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-LIB_OBJS = \
-	hash.$(oext) \
-	hash_bigkey.$(oext) \
-	hash_buf.$(oext) \
-	hash_func.$(oext) \
-	hash_log2.$(oext) \
-	hash_page.$(oext) \
-	hcreate.$(oext) \
-	hcreate_r.$(oext) \
-	tdelete.$(oext) \
-	tdestroy.$(oext) \
-	tfind.$(oext) \
-	tsearch.$(oext) \
-	twalk.$(oext)
-endif
-
-libsearch_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libsearch.la
-libsearch_la_SOURCES = $(GENERAL_SOURCES)
-libsearch_la_LIBADD = $(LIB_OBJS)
-libsearch_la_DEPENDENCIES = $(LIB_OBJS)
-noinst_DATA = objectlist.awk.in
-else
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-SUFFIXES = .def
-
-CHEWOUT_FILES =
-
-CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
-
-.c.def:
-	$(CHEW) < $< > $*.def 2> $*.ref
-	touch stmp-def
-
-TARGETDOC = ../tmp.texi
-
-doc: $(CHEWOUT_FILES)
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-
-include $(srcdir)/../../Makefile.shared
diff --git a/newlib/libc/search/Makefile.in b/newlib/libc/search/Makefile.in
deleted file mode 100644
index eff92d4..0000000
--- a/newlib/libc/search/Makefile.in
+++ /dev/null
@@ -1,391 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
-LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
-LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
-LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
-LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
-LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
-LIBC_SYS_LIB = @LIBC_SYS_LIB@
-LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-extra_dir = @extra_dir@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-GENERAL_SOURCES =  	bsearch.c 	db_local.h 	extern.h 	hash.h 	page.h 	qsort.c
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = 	hash.$(oext) 	hash_bigkey.$(oext) 	hash_buf.$(oext) 	hash_func.$(oext) 	hash_log2.$(oext) 	hash_page.$(oext) 	hcreate.$(oext) 	hcreate_r.$(oext) 	tdelete.$(oext) 	tdestroy.$(oext) 	tfind.$(oext) 	tsearch.$(oext) 	twalk.$(oext)
-
-libsearch_la_LDFLAGS = -Xcompiler -nostdlib
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libsearch.la
-@USE_LIBTOOL_TRUE@libsearch_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@libsearch_la_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@libsearch_la_DEPENDENCIES = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS)
-
-SUFFIXES = .def
-
-CHEWOUT_FILES = 
-
-CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
-
-TARGETDOC = ../tmp.texi
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  bsearch.$(OBJEXT) qsort.$(OBJEXT)
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-@USE_LIBTOOL_TRUE@libsearch_la_OBJECTS =  bsearch.lo qsort.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(libsearch_la_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(libsearch_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus search/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-libsearch.la: $(libsearch_la_OBJECTS) $(libsearch_la_DEPENDENCIES)
-	$(LINK)  $(libsearch_la_LDFLAGS) $(libsearch_la_OBJECTS) $(libsearch_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = search
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-noinstLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
-distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-.c.def:
-	$(CHEW) < $< > $*.def 2> $*.ref
-	touch stmp-def
-
-doc: $(CHEWOUT_FILES)
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/search/db_local.h b/newlib/libc/search/db_local.h
deleted file mode 100644
index 53f9d17..0000000
--- a/newlib/libc/search/db_local.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)db.h	8.7 (Berkeley) 6/16/94
- * $FreeBSD: src/include/db.h,v 1.5 2002/03/26 01:35:05 bde Exp $
- */
-
-#ifndef _DB_H_
-#define	_DB_H_
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <sys/config.h>
-
-#include <limits.h>
-
-#define	RET_ERROR	-1		/* Return values. */
-#define	RET_SUCCESS	 0
-#define	RET_SPECIAL	 1
-
-#define	MAX_PAGE_NUMBER	0xffffffff	/* >= # of pages in a file */
-typedef __uint32_t	pgno_t;
-#define	MAX_PAGE_OFFSET	65535		/* >= # of bytes in a page */
-typedef __uint16_t	indx_t;
-#define	MAX_REC_NUMBER	0xffffffff	/* >= # of records in a tree */
-typedef __uint32_t	recno_t;
-
-/* Key/data structure -- a Data-Base Thang. */
-typedef struct {
-	void	*data;			/* data */
-	size_t	 size;			/* data length */
-} DBT;
-
-/* Routine flags. */
-#define	R_CURSOR	1		/* del, put, seq */
-#define	__R_UNUSED	2		/* UNUSED */
-#define	R_FIRST		3		/* seq */
-#define	R_IAFTER	4		/* put (RECNO) */
-#define	R_IBEFORE	5		/* put (RECNO) */
-#define	R_LAST		6		/* seq (BTREE, RECNO) */
-#define	R_NEXT		7		/* seq */
-#define	R_NOOVERWRITE	8		/* put */
-#define	R_PREV		9		/* seq (BTREE, RECNO) */
-#define	R_SETCURSOR	10		/* put (RECNO) */
-#define	R_RECNOSYNC	11		/* sync (RECNO) */
-
-typedef enum { DB_BTREE, DB_HASH, DB_RECNO } DBTYPE;
-
-/*
- * !!!
- * The following flags are included in the dbopen(3) call as part of the
- * open(2) flags.  In order to avoid conflicts with the open flags, start
- * at the top of the 16 or 32-bit number space and work our way down.  If
- * the open flags were significantly expanded in the future, it could be
- * a problem.  Wish I'd left another flags word in the dbopen call.
- *
- * !!!
- * None of this stuff is implemented yet.  The only reason that it's here
- * is so that the access methods can skip copying the key/data pair when
- * the DB_LOCK flag isn't set.
- */
-#if UINT_MAX > 65535
-#define	DB_LOCK		0x20000000	/* Do locking. */
-#define	DB_SHMEM	0x40000000	/* Use shared memory. */
-#define	DB_TXN		0x80000000	/* Do transactions. */
-#else
-#define	DB_LOCK		    0x2000	/* Do locking. */
-#define	DB_SHMEM	    0x4000	/* Use shared memory. */
-#define	DB_TXN		    0x8000	/* Do transactions. */
-#endif
-
-/* Access method description structure. */
-typedef struct __db {
-	DBTYPE type;			/* Underlying db type. */
-	int (*close)(struct __db *);
-	int (*del)(const struct __db *, const DBT *, u_int);
-	int (*get)(const struct __db *, const DBT *, DBT *, u_int);
-	int (*put)(const struct __db *, DBT *, const DBT *, u_int);
-	int (*seq)(const struct __db *, DBT *, DBT *, u_int);
-	int (*sync)(const struct __db *, u_int);
-	void *internal;			/* Access method private. */
-	int (*fd)(const struct __db *);
-} DB;
-
-#define	BTREEMAGIC	0x053162
-#define	BTREEVERSION	3
-
-/* Structure used to pass parameters to the btree routines. */
-typedef struct {
-#define	R_DUP		0x01	/* duplicate keys */
-	u_long	flags;
-	u_int	cachesize;	/* bytes to cache */
-	int	maxkeypage;	/* maximum keys per page */
-	int	minkeypage;	/* minimum keys per page */
-	u_int	psize;		/* page size */
-	int	(*compare)	/* comparison function */
-	    (const DBT *, const DBT *);
-	size_t	(*prefix)	/* prefix function */
-	    (const DBT *, const DBT *);
-	int	lorder;		/* byte order */
-} BTREEINFO;
-
-#define	HASHMAGIC	0x061561
-#define	HASHVERSION	2
-
-/* Structure used to pass parameters to the hashing routines. */
-typedef struct {
-	u_int	bsize;		/* bucket size */
-	u_int	ffactor;	/* fill factor */
-	u_int	nelem;		/* number of elements */
-	u_int	cachesize;	/* bytes to cache */
-	__uint32_t		/* hash function */
-		(*hash)(const void *, size_t);
-	int	lorder;		/* byte order */
-} HASHINFO;
-
-/* Structure used to pass parameters to the record routines. */
-typedef struct {
-#define	R_FIXEDLEN	0x01	/* fixed-length records */
-#define	R_NOKEY		0x02	/* key not required */
-#define	R_SNAPSHOT	0x04	/* snapshot the input */
-	u_long	flags;
-	u_int	cachesize;	/* bytes to cache */
-	u_int	psize;		/* page size */
-	int	lorder;		/* byte order */
-	size_t	reclen;		/* record length (fixed-length records) */
-	u_char	bval;		/* delimiting byte (variable-length records */
-	char	*bfname;	/* btree file name */ 
-} RECNOINFO;
-
-/*
- * Little endian <==> big endian 32-bit swap macros.
- *	M_32_SWAP	swap a memory location
- *	P_32_SWAP	swap a referenced memory location
- *	P_32_COPY	swap from one location to another
- */
-#define	M_32_SWAP(a) {							\
-	__uint32_t _tmp = a;						\
-	((char *)&a)[0] = ((char *)&_tmp)[3];				\
-	((char *)&a)[1] = ((char *)&_tmp)[2];				\
-	((char *)&a)[2] = ((char *)&_tmp)[1];				\
-	((char *)&a)[3] = ((char *)&_tmp)[0];				\
-}
-#define	P_32_SWAP(a) {							\
-	__uint32_t _tmp = *(__uint32_t *)a;				\
-	((char *)a)[0] = ((char *)&_tmp)[3];				\
-	((char *)a)[1] = ((char *)&_tmp)[2];				\
-	((char *)a)[2] = ((char *)&_tmp)[1];				\
-	((char *)a)[3] = ((char *)&_tmp)[0];				\
-}
-#define	P_32_COPY(a, b) {						\
-	((char *)&(b))[0] = ((char *)&(a))[3];				\
-	((char *)&(b))[1] = ((char *)&(a))[2];				\
-	((char *)&(b))[2] = ((char *)&(a))[1];				\
-	((char *)&(b))[3] = ((char *)&(a))[0];				\
-}
-
-/*
- * Little endian <==> big endian 16-bit swap macros.
- *	M_16_SWAP	swap a memory location
- *	P_16_SWAP	swap a referenced memory location
- *	P_16_COPY	swap from one location to another
- */
-#define	M_16_SWAP(a) {							\
-	__uint16_t _tmp = a;						\
-	((char *)&a)[0] = ((char *)&_tmp)[1];				\
-	((char *)&a)[1] = ((char *)&_tmp)[0];				\
-}
-#define	P_16_SWAP(a) {							\
-	__uint16_t _tmp = *(__uint16_t *)a;				\
-	((char *)a)[0] = ((char *)&_tmp)[1];				\
-	((char *)a)[1] = ((char *)&_tmp)[0];				\
-}
-#define	P_16_COPY(a, b) {						\
-	((char *)&(b))[0] = ((char *)&(a))[1];				\
-	((char *)&(b))[1] = ((char *)&(a))[0];				\
-}
-
-__BEGIN_DECLS
-DB *dbopen(const char *, int, int, DBTYPE, const void *);
-
-#ifdef __DBINTERFACE_PRIVATE
-DB	*__bt_open(const char *, int, int, const BTREEINFO *, int);
-DB	*__hash_open(const char *, int, int, const HASHINFO *, int);
-DB	*__rec_open(const char *, int, int, const RECNOINFO *, int);
-void	 __dbpanic(DB *dbp);
-#endif
-__END_DECLS
-#endif /* !_DB_H_ */
diff --git a/newlib/libc/search/extern.h b/newlib/libc/search/extern.h
deleted file mode 100644
index 666a6e5..0000000
--- a/newlib/libc/search/extern.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)extern.h	8.4 (Berkeley) 6/16/94
- * $FreeBSD: src/lib/libc/db/hash/extern.h,v 1.3 2002/03/22 09:18:22 obrien Exp $
- */
-
-BUFHEAD	*__add_ovflpage(HTAB *, BUFHEAD *);
-int	 __addel(HTAB *, BUFHEAD *, const DBT *, const DBT *);
-int	 __big_delete(HTAB *, BUFHEAD *);
-int	 __big_insert(HTAB *, BUFHEAD *, const DBT *, const DBT *);
-int	 __big_keydata(HTAB *, BUFHEAD *, DBT *, DBT *, int);
-int	 __big_return(HTAB *, BUFHEAD *, int, DBT *, int);
-int	 __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
-		int, __uint32_t, SPLIT_RETURN *);
-int	 __buf_free(HTAB *, int, int);
-void	 __buf_init(HTAB *, int);
-__uint32_t	 __call_hash(HTAB *, char *, int);
-int	 __delpair(HTAB *, BUFHEAD *, int);
-int	 __expand_table(HTAB *);
-int	 __find_bigpair(HTAB *, BUFHEAD *, int, char *, int);
-__uint16_t	 __find_last_page(HTAB *, BUFHEAD **);
-void	 __free_ovflpage(HTAB *, BUFHEAD *);
-BUFHEAD	*__get_buf(HTAB *, __uint32_t, BUFHEAD *, int);
-int	 __get_page(HTAB *, char *, __uint32_t, int, int, int);
-int	 __ibitmap(HTAB *, int, int, int);
-__uint32_t	 __log2(__uint32_t);
-int	 __put_page(HTAB *, char *, __uint32_t, int, int);
-void	 __reclaim_buf(HTAB *, BUFHEAD *);
-int	 __split_page(HTAB *, __uint32_t, __uint32_t);
-
-/* Default hash routine. */
-extern __uint32_t (*__default_hash)(const void *, size_t);
-
-#ifdef HASH_STATISTICS
-extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
-#endif
diff --git a/newlib/libc/search/hash.c b/newlib/libc/search/hash.c
deleted file mode 100644
index 3d91928..0000000
--- a/newlib/libc/search/hash.c
+++ /dev/null
@@ -1,1027 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef DEBUG
-#include <assert.h>
-#endif
-
-#include "db_local.h"
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static int   alloc_segs(HTAB *, int);
-static int   flush_meta(HTAB *);
-static int   hash_access(HTAB *, ACTION, DBT *, DBT *);
-static int   hash_close(DB *);
-static int   hash_delete(const DB *, const DBT *, __uint32_t);
-static int   hash_fd(const DB *);
-static int   hash_get(const DB *, const DBT *, DBT *, __uint32_t);
-static int   hash_put(const DB *, DBT *, const DBT *, __uint32_t);
-static void *hash_realloc(SEGMENT **, int, int);
-static int   hash_seq(const DB *, DBT *, DBT *, __uint32_t);
-static int   hash_sync(const DB *, __uint32_t);
-static int   hdestroy(HTAB *);
-static HTAB *init_hash(HTAB *, const char *, HASHINFO *);
-static int   init_htab(HTAB *, int);
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-static void  swap_header(HTAB *);
-static void  swap_header_copy(HASHHDR *, HASHHDR *);
-#endif
-
-/* Macros for min/max.  */
-#ifndef MIN
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-#ifndef MAX
-#define MAX(a,b) (((a)>(b))?(a):(b))
-#endif
-
-/* Fast arithmetic, relying on powers of 2, */
-#define MOD(x, y)		((x) & ((y) - 1))
-
-#define RETURN_ERROR(ERR, LOC)	{ save_errno = ERR; goto LOC; }
-
-/* Return values */
-#define	SUCCESS	 (0)
-#define	ERROR	(-1)
-#define	ABNORMAL (1)
-
-#ifdef HASH_STATISTICS
-int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
-#endif
-
-/************************** INTERFACE ROUTINES ***************************/
-/* OPEN/CLOSE */
-
-extern DB *
-__hash_open(file, flags, mode, info, dflags)
-	const char *file;
-	int flags, mode, dflags;
-	const HASHINFO *info;	/* Special directives for create */
-{
-	HTAB *hashp;
-
-	struct stat statbuf;
-	DB *dbp;
-	int bpages, hdrsize, new_table, nsegs, save_errno;
-
-	if ((flags & O_ACCMODE) == O_WRONLY) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if (!(hashp = (HTAB *)calloc(1, sizeof(HTAB))))
-		return (NULL);
-	hashp->fp = -1;
-
-	/*
-	 * Even if user wants write only, we need to be able to read
-	 * the actual file, so we need to open it read/write. But, the
-	 * field in the hashp structure needs to be accurate so that
-	 * we can check accesses.
-	 */
-	hashp->flags = flags;
-
-	new_table = 0;
-	if (!file || (flags & O_TRUNC) ||
-#ifdef __USE_INTERNAL_STAT64
-	    (stat64(file, &statbuf) && (errno == ENOENT))) {
-#else
-	    (stat(file, &statbuf) && (errno == ENOENT))) {
-#endif
-		if (errno == ENOENT)
-			errno = 0; /* Just in case someone looks at errno */
-		new_table = 1;
-	}
-	if (file) {
-		if ((hashp->fp = open(file, flags, mode)) == -1)
-			RETURN_ERROR(errno, error0);
-
-		/* if the .db file is empty, and we had permission to create
-		   a new .db file, then reinitialize the database */
-		if ((flags & O_CREAT) &&
-#ifdef __USE_INTERNAL_STAT64
-		     fstat64(hashp->fp, &statbuf) == 0 && statbuf.st_size == 0)
-#else
-		     fstat(hashp->fp, &statbuf) == 0 && statbuf.st_size == 0)
-#endif
-			new_table = 1;
-
-#ifdef HAVE_FCNTL
-		(void)fcntl(hashp->fp, F_SETFD, 1);
-#endif
-	}
-	if (new_table) {
-		if (!(hashp = init_hash(hashp, file, (HASHINFO *)info)))
-			RETURN_ERROR(errno, error1);
-	} else {
-		/* Table already exists */
-		if (info && info->hash)
-			hashp->hash = info->hash;
-		else
-			hashp->hash = __default_hash;
-
-		hdrsize = read(hashp->fp, &hashp->hdr, sizeof(HASHHDR));
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-		swap_header(hashp);
-#endif
-		if (hdrsize == -1)
-			RETURN_ERROR(errno, error1);
-		if (hdrsize != sizeof(HASHHDR))
-			RETURN_ERROR(EFTYPE, error1);
-		/* Verify file type, versions and hash function */
-		if (hashp->MAGIC != HASHMAGIC)
-			RETURN_ERROR(EFTYPE, error1);
-#define	OLDHASHVERSION	1
-		if (hashp->HASH_VERSION != HASHVERSION &&
-		    hashp->HASH_VERSION != OLDHASHVERSION)
-			RETURN_ERROR(EFTYPE, error1);
-		if (hashp->hash(CHARKEY, sizeof(CHARKEY)) != hashp->H_CHARKEY)
-			RETURN_ERROR(EFTYPE, error1);
-		/*
-		 * Figure out how many segments we need.  Max_Bucket is the
-		 * maximum bucket number, so the number of buckets is
-		 * max_bucket + 1.
-		 */
-		nsegs = (hashp->MAX_BUCKET + 1 + hashp->SGSIZE - 1) /
-			 hashp->SGSIZE;
-		hashp->nsegs = 0;
-		if (alloc_segs(hashp, nsegs))
-			/*
-			 * If alloc_segs fails, table will have been destroyed
-			 * and errno will have been set.
-			 */
-			return (NULL);
-		/* Read in bitmaps */
-		bpages = (hashp->SPARES[hashp->OVFL_POINT] +
-		    (hashp->BSIZE << BYTE_SHIFT) - 1) >>
-		    (hashp->BSHIFT + BYTE_SHIFT);
-
-		hashp->nmaps = bpages;
-		(void)memset(&hashp->mapp[0], 0, bpages * sizeof(__uint32_t *));
-	}
-
-	/* Initialize Buffer Manager */
-	if (info && info->cachesize)
-		__buf_init(hashp, info->cachesize);
-	else
-		__buf_init(hashp, DEF_BUFSIZE);
-
-	hashp->new_file = new_table;
-	hashp->save_file = file && (hashp->flags & O_RDWR);
-	hashp->cbucket = -1;
-	if (!(dbp = (DB *)malloc(sizeof(DB)))) {
-		save_errno = errno;
-		hdestroy(hashp);
-		errno = save_errno;
-		return (NULL);
-	}
-	dbp->internal = hashp;
-	dbp->close = hash_close;
-	dbp->del = hash_delete;
-	dbp->fd = hash_fd;
-	dbp->get = hash_get;
-	dbp->put = hash_put;
-	dbp->seq = hash_seq;
-	dbp->sync = hash_sync;
-	dbp->type = DB_HASH;
-
-#ifdef DEBUG
-	(void)fprintf(stderr,
-"%s\n%s%x\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%x\n%s%x\n%s%d\n%s%d\n",
-	    "init_htab:",
-	    "TABLE POINTER   ", hashp,
-	    "BUCKET SIZE     ", hashp->BSIZE,
-	    "BUCKET SHIFT    ", hashp->BSHIFT,
-	    "DIRECTORY SIZE  ", hashp->DSIZE,
-	    "SEGMENT SIZE    ", hashp->SGSIZE,
-	    "SEGMENT SHIFT   ", hashp->SSHIFT,
-	    "FILL FACTOR     ", hashp->FFACTOR,
-	    "MAX BUCKET      ", hashp->MAX_BUCKET,
-	    "OVFL POINT	     ", hashp->OVFL_POINT,
-	    "LAST FREED      ", hashp->LAST_FREED,
-	    "HIGH MASK       ", hashp->HIGH_MASK,
-	    "LOW  MASK       ", hashp->LOW_MASK,
-	    "NSEGS           ", hashp->nsegs,
-	    "NKEYS           ", hashp->NKEYS);
-#endif
-#ifdef HASH_STATISTICS
-	hash_overflows = hash_accesses = hash_collisions = hash_expansions = 0;
-#endif
-	return (dbp);
-
-error1:
-	if (hashp != NULL)
-		(void)close(hashp->fp);
-
-error0:
-	free(hashp);
-	errno = save_errno;
-	return (NULL);
-}
-
-static int
-hash_close(dbp)
-	DB *dbp;
-{
-	HTAB *hashp;
-	int retval;
-
-	if (!dbp)
-		return (ERROR);
-
-	hashp = (HTAB *)dbp->internal;
-	retval = hdestroy(hashp);
-	free(dbp);
-	return (retval);
-}
-
-static int
-hash_fd(dbp)
-	const DB *dbp;
-{
-	HTAB *hashp;
-
-	if (!dbp)
-		return (ERROR);
-
-	hashp = (HTAB *)dbp->internal;
-	if (hashp->fp == -1) {
-		errno = ENOENT;
-		return (-1);
-	}
-	return (hashp->fp);
-}
-
-/************************** LOCAL CREATION ROUTINES **********************/
-static HTAB *
-init_hash(hashp, file, info)
-	HTAB *hashp;
-	const char *file;
-	HASHINFO *info;
-{
-	struct stat statbuf;
-	int nelem;
-
-	nelem = 1;
-	hashp->NKEYS = 0;
-       hashp->LORDER = DB_BYTE_ORDER;
-	hashp->BSIZE = DEF_BUCKET_SIZE;
-	hashp->BSHIFT = DEF_BUCKET_SHIFT;
-	hashp->SGSIZE = DEF_SEGSIZE;
-	hashp->SSHIFT = DEF_SEGSIZE_SHIFT;
-	hashp->DSIZE = DEF_DIRSIZE;
-	hashp->FFACTOR = DEF_FFACTOR;
-	hashp->hash = __default_hash;
-	memset(hashp->SPARES, 0, sizeof(hashp->SPARES));
-	memset(hashp->BITMAPS, 0, sizeof (hashp->BITMAPS));
-
-	/* Fix bucket size to be optimal for file system */
-	if (file != NULL) {
-#ifdef __USE_INTERNAL_STAT64
-		if (stat64(file, &statbuf))
-#else
-		if (stat(file, &statbuf))
-#endif
-			return (NULL);
-		hashp->BSIZE = statbuf.st_blksize;
-		hashp->BSHIFT = __log2(hashp->BSIZE);
-	}
-
-	if (info) {
-		if (info->bsize) {
-			/* Round pagesize up to power of 2 */
-			hashp->BSHIFT = __log2(info->bsize);
-			hashp->BSIZE = 1 << hashp->BSHIFT;
-			if (hashp->BSIZE > MAX_BSIZE) {
-				errno = EINVAL;
-				return (NULL);
-			}
-		}
-		if (info->ffactor)
-			hashp->FFACTOR = info->ffactor;
-		if (info->hash)
-			hashp->hash = info->hash;
-		if (info->nelem)
-			nelem = info->nelem;
-		if (info->lorder) {
-                       if (info->lorder != DB_BIG_ENDIAN &&
-                           info->lorder != DB_LITTLE_ENDIAN) {
-				errno = EINVAL;
-				return (NULL);
-			}
-			hashp->LORDER = info->lorder;
-		}
-	}
-	/* init_htab should destroy the table and set errno if it fails */
-	if (init_htab(hashp, nelem))
-		return (NULL);
-	else
-		return (hashp);
-}
-/*
- * This calls alloc_segs which may run out of memory.  Alloc_segs will destroy
- * the table and set errno, so we just pass the error information along.
- *
- * Returns 0 on No Error
- */
-static int
-init_htab(hashp, nelem)
-	HTAB *hashp;
-	int nelem;
-{
-	int nbuckets, nsegs;
-	int l2;
-
-	/*
-	 * Divide number of elements by the fill factor and determine a
-	 * desired number of buckets.  Allocate space for the next greater
-	 * power of two number of buckets.
-	 */
-	nelem = (nelem - 1) / hashp->FFACTOR + 1;
-
-	l2 = __log2(MAX(nelem, 2));
-	nbuckets = 1 << l2;
-
-	hashp->SPARES[l2] = l2 + 1;
-	hashp->SPARES[l2 + 1] = l2 + 1;
-	hashp->OVFL_POINT = l2;
-	hashp->LAST_FREED = 2;
-
-	/* First bitmap page is at: splitpoint l2 page offset 1 */
-	if (__ibitmap(hashp, OADDR_OF(l2, 1), l2 + 1, 0))
-		return (-1);
-
-	hashp->MAX_BUCKET = hashp->LOW_MASK = nbuckets - 1;
-	hashp->HIGH_MASK = (nbuckets << 1) - 1;
-	hashp->HDRPAGES = ((MAX(sizeof(HASHHDR), MINHDRSIZE) - 1) >>
-	    hashp->BSHIFT) + 1;
-
-	nsegs = (nbuckets - 1) / hashp->SGSIZE + 1;
-	nsegs = 1 << __log2(nsegs);
-
-	if (nsegs > hashp->DSIZE)
-		hashp->DSIZE = nsegs;
-	return (alloc_segs(hashp, nsegs));
-}
-
-/********************** DESTROY/CLOSE ROUTINES ************************/
-
-/*
- * Flushes any changes to the file if necessary and destroys the hashp
- * structure, freeing all allocated space.
- */
-static int
-hdestroy(hashp)
-	HTAB *hashp;
-{
-	int i, save_errno;
-
-	save_errno = 0;
-
-#ifdef HASH_STATISTICS
-	(void)fprintf(stderr, "hdestroy: accesses %ld collisions %ld\n",
-	    hash_accesses, hash_collisions);
-	(void)fprintf(stderr, "hdestroy: expansions %ld\n",
-	    hash_expansions);
-	(void)fprintf(stderr, "hdestroy: overflows %ld\n",
-	    hash_overflows);
-	(void)fprintf(stderr, "keys %ld maxp %d segmentcount %d\n",
-	    hashp->NKEYS, hashp->MAX_BUCKET, hashp->nsegs);
-
-	for (i = 0; i < NCACHED; i++)
-		(void)fprintf(stderr,
-		    "spares[%d] = %d\n", i, hashp->SPARES[i]);
-#endif
-	/*
-	 * Call on buffer manager to free buffers, and if required,
-	 * write them to disk.
-	 */
-	if (__buf_free(hashp, 1, hashp->save_file))
-		save_errno = errno;
-	if (hashp->dir) {
-		free(*hashp->dir);	/* Free initial segments */
-		/* Free extra segments */
-		while (hashp->exsegs--)
-			free(hashp->dir[--hashp->nsegs]);
-		free(hashp->dir);
-	}
-	if (flush_meta(hashp) && !save_errno)
-		save_errno = errno;
-	/* Free Bigmaps */
-	for (i = 0; i < hashp->nmaps; i++)
-		if (hashp->mapp[i])
-			free(hashp->mapp[i]);
-
-	if (hashp->fp != -1)
-		(void)close(hashp->fp);
-
-	free(hashp);
-
-	if (save_errno) {
-		errno = save_errno;
-		return (ERROR);
-	}
-	return (SUCCESS);
-}
-/*
- * Write modified pages to disk
- *
- * Returns:
- *	 0 == OK
- *	-1 ERROR
- */
-static int
-hash_sync(dbp, flags)
-	const DB *dbp;
-	__uint32_t flags;
-{
-	HTAB *hashp;
-
-	if (flags != 0) {
-		errno = EINVAL;
-		return (ERROR);
-	}
-
-	if (!dbp)
-		return (ERROR);
-
-	hashp = (HTAB *)dbp->internal;
-	if (!hashp->save_file)
-		return (0);
-	if (__buf_free(hashp, 0, 1) || flush_meta(hashp))
-		return (ERROR);
-	hashp->new_file = 0;
-	return (0);
-}
-
-/*
- * Returns:
- *	 0 == OK
- *	-1 indicates that errno should be set
- */
-static int
-flush_meta(hashp)
-	HTAB *hashp;
-{
-	HASHHDR *whdrp;
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-	HASHHDR whdr;
-#endif
-	int fp, i, wsize;
-
-	if (!hashp->save_file)
-		return (0);
-	hashp->MAGIC = HASHMAGIC;
-	hashp->HASH_VERSION = HASHVERSION;
-	hashp->H_CHARKEY = hashp->hash(CHARKEY, sizeof(CHARKEY));
-
-	fp = hashp->fp;
-	whdrp = &hashp->hdr;
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-	whdrp = &whdr;
-	swap_header_copy(&hashp->hdr, whdrp);
-#endif
-	if ((lseek(fp, (off_t)0, SEEK_SET) == -1) ||
-	    ((wsize = write(fp, whdrp, sizeof(HASHHDR))) == -1))
-		return (-1);
-	else
-		if (wsize != sizeof(HASHHDR)) {
-			errno = EFTYPE;
-			hashp->error = errno;
-			return (-1);
-		}
-	for (i = 0; i < NCACHED; i++)
-		if (hashp->mapp[i])
-			if (__put_page(hashp, (char *)hashp->mapp[i],
-				hashp->BITMAPS[i], 0, 1))
-				return (-1);
-	return (0);
-}
-
-/*******************************SEARCH ROUTINES *****************************/
-/*
- * All the access routines return
- *
- * Returns:
- *	 0 on SUCCESS
- *	 1 to indicate an external ERROR (i.e. key not found, etc)
- *	-1 to indicate an internal ERROR (i.e. out of memory, etc)
- */
-static int
-hash_get(dbp, key, data, flag)
-	const DB *dbp;
-	const DBT *key;
-	DBT *data;
-	__uint32_t flag;
-{
-	HTAB *hashp;
-
-	hashp = (HTAB *)dbp->internal;
-	if (flag) {
-		hashp->error = errno = EINVAL;
-		return (ERROR);
-	}
-	return (hash_access(hashp, HASH_GET, (DBT *)key, data));
-}
-
-static int
-hash_put(dbp, key, data, flag)
-	const DB *dbp;
-	DBT *key;
-	const DBT *data;
-	__uint32_t flag;
-{
-	HTAB *hashp;
-
-	hashp = (HTAB *)dbp->internal;
-	if (flag && flag != R_NOOVERWRITE) {
-		hashp->error = EINVAL;
-		errno = EINVAL;
-		return (ERROR);
-	}
-	if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
-		hashp->error = errno = EPERM;
-		return (ERROR);
-	}
-	return (hash_access(hashp, flag == R_NOOVERWRITE ?
-	    HASH_PUTNEW : HASH_PUT, (DBT *)key, (DBT *)data));
-}
-
-static int
-hash_delete(dbp, key, flag)
-	const DB *dbp;
-	const DBT *key;
-	__uint32_t flag;		/* Ignored */
-{
-	HTAB *hashp;
-
-	hashp = (HTAB *)dbp->internal;
-	if (flag && flag != R_CURSOR) {
-		hashp->error = errno = EINVAL;
-		return (ERROR);
-	}
-	if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
-		hashp->error = errno = EPERM;
-		return (ERROR);
-	}
-	return (hash_access(hashp, HASH_DELETE, (DBT *)key, NULL));
-}
-
-/*
- * Assume that hashp has been set in wrapper routine.
- */
-static int
-hash_access(hashp, action, key, val)
-	HTAB *hashp;
-	ACTION action;
-	DBT *key, *val;
-{
-	BUFHEAD *rbufp;
-	BUFHEAD *bufp, *save_bufp;
-	__uint16_t *bp;
-	int n, ndx, off, size;
-	char *kp;
-	__uint16_t pageno;
-
-#ifdef HASH_STATISTICS
-	hash_accesses++;
-#endif
-
-	off = hashp->BSIZE;
-	size = key->size;
-	kp = (char *)key->data;
-	rbufp = __get_buf(hashp, __call_hash(hashp, kp, size), NULL, 0);
-	if (!rbufp)
-		return (ERROR);
-	save_bufp = rbufp;
-
-	/* Pin the bucket chain */
-	rbufp->flags |= BUF_PIN;
-	for (bp = (__uint16_t *)rbufp->page, n = *bp++, ndx = 1; ndx < n;)
-		if (bp[1] >= REAL_KEY) {
-			/* Real key/data pair */
-			if (size == off - *bp &&
-			    memcmp(kp, rbufp->page + *bp, size) == 0)
-				goto found;
-			off = bp[1];
-#ifdef HASH_STATISTICS
-			hash_collisions++;
-#endif
-			bp += 2;
-			ndx += 2;
-		} else if (bp[1] == OVFLPAGE) {
-			rbufp = __get_buf(hashp, *bp, rbufp, 0);
-			if (!rbufp) {
-				save_bufp->flags &= ~BUF_PIN;
-				return (ERROR);
-			}
-			/* FOR LOOP INIT */
-			bp = (__uint16_t *)rbufp->page;
-			n = *bp++;
-			ndx = 1;
-			off = hashp->BSIZE;
-		} else if (bp[1] < REAL_KEY) {
-			if ((ndx =
-			    __find_bigpair(hashp, rbufp, ndx, kp, size)) > 0)
-				goto found;
-			if (ndx == -2) {
-				bufp = rbufp;
-				if (!(pageno =
-				    __find_last_page(hashp, &bufp))) {
-					ndx = 0;
-					rbufp = bufp;
-					break;	/* FOR */
-				}
-				rbufp = __get_buf(hashp, pageno, bufp, 0);
-				if (!rbufp) {
-					save_bufp->flags &= ~BUF_PIN;
-					return (ERROR);
-				}
-				/* FOR LOOP INIT */
-				bp = (__uint16_t *)rbufp->page;
-				n = *bp++;
-				ndx = 1;
-				off = hashp->BSIZE;
-			} else {
-				save_bufp->flags &= ~BUF_PIN;
-				return (ERROR);
-			}
-		}
-
-	/* Not found */
-	switch (action) {
-	case HASH_PUT:
-	case HASH_PUTNEW:
-		if (__addel(hashp, rbufp, key, val)) {
-			save_bufp->flags &= ~BUF_PIN;
-			return (ERROR);
-		} else {
-			save_bufp->flags &= ~BUF_PIN;
-			return (SUCCESS);
-		}
-	case HASH_GET:
-	case HASH_DELETE:
-	default:
-		save_bufp->flags &= ~BUF_PIN;
-		return (ABNORMAL);
-	}
-
-found:
-	switch (action) {
-	case HASH_PUTNEW:
-		save_bufp->flags &= ~BUF_PIN;
-		return (ABNORMAL);
-	case HASH_GET:
-		bp = (__uint16_t *)rbufp->page;
-		if (bp[ndx + 1] < REAL_KEY) {
-			if (__big_return(hashp, rbufp, ndx, val, 0))
-				return (ERROR);
-		} else {
-			val->data = (u_char *)rbufp->page + (int)bp[ndx + 1];
-			val->size = bp[ndx] - bp[ndx + 1];
-		}
-		break;
-	case HASH_PUT:
-		if ((__delpair(hashp, rbufp, ndx)) ||
-		    (__addel(hashp, rbufp, key, val))) {
-			save_bufp->flags &= ~BUF_PIN;
-			return (ERROR);
-		}
-		break;
-	case HASH_DELETE:
-		if (__delpair(hashp, rbufp, ndx))
-			return (ERROR);
-		break;
-	default:
-		abort();
-	}
-	save_bufp->flags &= ~BUF_PIN;
-	return (SUCCESS);
-}
-
-static int
-hash_seq(dbp, key, data, flag)
-	const DB *dbp;
-	DBT *key, *data;
-	__uint32_t flag;
-{
-	__uint32_t bucket;
-	BUFHEAD *bufp;
-	HTAB *hashp;
-	__uint16_t *bp, ndx;
-
-	hashp = (HTAB *)dbp->internal;
-	if (flag && flag != R_FIRST && flag != R_NEXT) {
-		hashp->error = errno = EINVAL;
-		return (ERROR);
-	}
-#ifdef HASH_STATISTICS
-	hash_accesses++;
-#endif
-	if ((hashp->cbucket < 0) || (flag == R_FIRST)) {
-		hashp->cbucket = 0;
-		hashp->cndx = 1;
-		hashp->cpage = NULL;
-	}
-
-	for (bp = NULL; !bp || !bp[0]; ) {
-		if (!(bufp = hashp->cpage)) {
-			for (bucket = hashp->cbucket;
-			    bucket <= hashp->MAX_BUCKET;
-			    bucket++, hashp->cndx = 1) {
-				bufp = __get_buf(hashp, bucket, NULL, 0);
-				if (!bufp)
-					return (ERROR);
-				hashp->cpage = bufp;
-				bp = (__uint16_t *)bufp->page;
-				if (bp[0])
-					break;
-			}
-			hashp->cbucket = bucket;
-			if (hashp->cbucket > hashp->MAX_BUCKET) {
-				hashp->cbucket = -1;
-				return (ABNORMAL);
-			}
-		} else
-			bp = (__uint16_t *)hashp->cpage->page;
-
-#ifdef DEBUG
-		assert(bp);
-		assert(bufp);
-#endif
-		while (bp[hashp->cndx + 1] == OVFLPAGE) {
-			bufp = hashp->cpage =
-			    __get_buf(hashp, bp[hashp->cndx], bufp, 0);
-			if (!bufp)
-				return (ERROR);
-			bp = (__uint16_t *)(bufp->page);
-			hashp->cndx = 1;
-		}
-		if (!bp[0]) {
-			hashp->cpage = NULL;
-			++hashp->cbucket;
-		}
-	}
-	ndx = hashp->cndx;
-	if (bp[ndx + 1] < REAL_KEY) {
-		if (__big_keydata(hashp, bufp, key, data, 1))
-			return (ERROR);
-	} else {
-		key->data = (u_char *)hashp->cpage->page + bp[ndx];
-		key->size = (ndx > 1 ? bp[ndx - 1] : hashp->BSIZE) - bp[ndx];
-		data->data = (u_char *)hashp->cpage->page + bp[ndx + 1];
-		data->size = bp[ndx] - bp[ndx + 1];
-		ndx += 2;
-		if (ndx > bp[0]) {
-			hashp->cpage = NULL;
-			hashp->cbucket++;
-			hashp->cndx = 1;
-		} else
-			hashp->cndx = ndx;
-	}
-	return (SUCCESS);
-}
-
-/********************************* UTILITIES ************************/
-
-/*
- * Returns:
- *	 0 ==> OK
- *	-1 ==> Error
- */
-extern int
-__expand_table(hashp)
-	HTAB *hashp;
-{
-	__uint32_t old_bucket, new_bucket;
-	int dirsize, new_segnum, spare_ndx;
-
-#ifdef HASH_STATISTICS
-	hash_expansions++;
-#endif
-	new_bucket = ++hashp->MAX_BUCKET;
-	old_bucket = (hashp->MAX_BUCKET & hashp->LOW_MASK);
-
-	new_segnum = new_bucket >> hashp->SSHIFT;
-
-	/* Check if we need a new segment */
-	if (new_segnum >= hashp->nsegs) {
-		/* Check if we need to expand directory */
-		if (new_segnum >= hashp->DSIZE) {
-			/* Reallocate directory */
-			dirsize = hashp->DSIZE * sizeof(SEGMENT *);
-			if (!hash_realloc(&hashp->dir, dirsize, dirsize << 1))
-				return (-1);
-			hashp->DSIZE = dirsize << 1;
-		}
-		if ((hashp->dir[new_segnum] =
-		    (SEGMENT)calloc(hashp->SGSIZE, sizeof(SEGMENT))) == NULL)
-			return (-1);
-		hashp->exsegs++;
-		hashp->nsegs++;
-	}
-	/*
-	 * If the split point is increasing (MAX_BUCKET's log base 2
-	 * * increases), we need to copy the current contents of the spare
-	 * split bucket to the next bucket.
-	 */
-	spare_ndx = __log2(hashp->MAX_BUCKET + 1);
-	if (spare_ndx > hashp->OVFL_POINT) {
-		hashp->SPARES[spare_ndx] = hashp->SPARES[hashp->OVFL_POINT];
-		hashp->OVFL_POINT = spare_ndx;
-	}
-
-	if (new_bucket > hashp->HIGH_MASK) {
-		/* Starting a new doubling */
-		hashp->LOW_MASK = hashp->HIGH_MASK;
-		hashp->HIGH_MASK = new_bucket | hashp->LOW_MASK;
-	}
-	/* Relocate records to the new bucket */
-	return (__split_page(hashp, old_bucket, new_bucket));
-}
-
-/*
- * If realloc guarantees that the pointer is not destroyed if the realloc
- * fails, then this routine can go away.
- */
-static void *
-hash_realloc(p_ptr, oldsize, newsize)
-	SEGMENT **p_ptr;
-	int oldsize, newsize;
-{
-	void *p;
-
-	if ( (p = malloc(newsize)) ) {
-		memmove(p, *p_ptr, oldsize);
-		memset((char *)p + oldsize, 0, newsize - oldsize);
-		free(*p_ptr);
-		*p_ptr = p;
-	}
-	return (p);
-}
-
-extern __uint32_t
-__call_hash(hashp, k, len)
-	HTAB *hashp;
-	char *k;
-	int len;
-{
-	int n, bucket;
-
-	n = hashp->hash(k, len);
-	bucket = n & hashp->HIGH_MASK;
-	if (bucket > hashp->MAX_BUCKET)
-		bucket = bucket & hashp->LOW_MASK;
-	return (bucket);
-}
-
-/*
- * Allocate segment table.  On error, destroy the table and set errno.
- *
- * Returns 0 on success
- */
-static int
-alloc_segs(hashp, nsegs)
-	HTAB *hashp;
-	int nsegs;
-{
-	int i;
-	SEGMENT store;
-
-	int save_errno;
-
-	if ((hashp->dir =
-	    (SEGMENT *)calloc(hashp->DSIZE, sizeof(SEGMENT *))) == NULL) {
-		save_errno = errno;
-		(void)hdestroy(hashp);
-		errno = save_errno;
-		return (-1);
-	}
-	/* Allocate segments */
-	if ((store =
-	    (SEGMENT)calloc(nsegs << hashp->SSHIFT, sizeof(SEGMENT))) == NULL) {
-		save_errno = errno;
-		(void)hdestroy(hashp);
-		errno = save_errno;
-		return (-1);
-	}
-	for (i = 0; i < nsegs; i++, hashp->nsegs++)
-		hashp->dir[i] = &store[i << hashp->SSHIFT];
-	return (0);
-}
-
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-/*
- * Hashp->hdr needs to be byteswapped.
- */
-static void
-swap_header_copy(srcp, destp)
-	HASHHDR *srcp, *destp;
-{
-	int i;
-
-	P_32_COPY(srcp->magic, destp->magic);
-	P_32_COPY(srcp->version, destp->version);
-	P_32_COPY(srcp->lorder, destp->lorder);
-	P_32_COPY(srcp->bsize, destp->bsize);
-	P_32_COPY(srcp->bshift, destp->bshift);
-	P_32_COPY(srcp->dsize, destp->dsize);
-	P_32_COPY(srcp->ssize, destp->ssize);
-	P_32_COPY(srcp->sshift, destp->sshift);
-	P_32_COPY(srcp->ovfl_point, destp->ovfl_point);
-	P_32_COPY(srcp->last_freed, destp->last_freed);
-	P_32_COPY(srcp->max_bucket, destp->max_bucket);
-	P_32_COPY(srcp->high_mask, destp->high_mask);
-	P_32_COPY(srcp->low_mask, destp->low_mask);
-	P_32_COPY(srcp->ffactor, destp->ffactor);
-	P_32_COPY(srcp->nkeys, destp->nkeys);
-	P_32_COPY(srcp->hdrpages, destp->hdrpages);
-	P_32_COPY(srcp->h_charkey, destp->h_charkey);
-	for (i = 0; i < NCACHED; i++) {
-		P_32_COPY(srcp->spares[i], destp->spares[i]);
-		P_16_COPY(srcp->bitmaps[i], destp->bitmaps[i]);
-	}
-}
-
-static void
-swap_header(hashp)
-	HTAB *hashp;
-{
-	HASHHDR *hdrp;
-	int i;
-
-	hdrp = &hashp->hdr;
-
-	M_32_SWAP(hdrp->magic);
-	M_32_SWAP(hdrp->version);
-	M_32_SWAP(hdrp->lorder);
-	M_32_SWAP(hdrp->bsize);
-	M_32_SWAP(hdrp->bshift);
-	M_32_SWAP(hdrp->dsize);
-	M_32_SWAP(hdrp->ssize);
-	M_32_SWAP(hdrp->sshift);
-	M_32_SWAP(hdrp->ovfl_point);
-	M_32_SWAP(hdrp->last_freed);
-	M_32_SWAP(hdrp->max_bucket);
-	M_32_SWAP(hdrp->high_mask);
-	M_32_SWAP(hdrp->low_mask);
-	M_32_SWAP(hdrp->ffactor);
-	M_32_SWAP(hdrp->nkeys);
-	M_32_SWAP(hdrp->hdrpages);
-	M_32_SWAP(hdrp->h_charkey);
-	for (i = 0; i < NCACHED; i++) {
-		M_32_SWAP(hdrp->spares[i]);
-		M_16_SWAP(hdrp->bitmaps[i]);
-	}
-}
-#endif
diff --git a/newlib/libc/search/hash.h b/newlib/libc/search/hash.h
deleted file mode 100644
index db9e96d..0000000
--- a/newlib/libc/search/hash.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)hash.h	8.3 (Berkeley) 5/31/94
- * $FreeBSD: src/lib/libc/db/hash/hash.h,v 1.6 2002/03/21 22:46:26 obrien Exp $
- */
-
-#include <sys/param.h>
-
-/* Check that newlib understands the byte order of its target system.  */
-#ifndef BYTE_ORDER
-#error BYTE_ORDER not defined by sys/param.h
-#endif
-
-/* Define DB endianness constants based on target endianness.  */
-#define DB_LITTLE_ENDIAN 1234
-#define DB_BIG_ENDIAN 4321
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#define DB_BYTE_ORDER DB_LITTLE_ENDIAN
-#else
-#define DB_BYTE_ORDER DB_BIG_ENDIAN
-#endif
-
-/* Operations */
-typedef enum {
-	HASH_GET, HASH_PUT, HASH_PUTNEW, HASH_DELETE, HASH_FIRST, HASH_NEXT
-} ACTION;
-
-/* Buffer Management structures */
-typedef struct _bufhead BUFHEAD;
-
-struct _bufhead {
-	BUFHEAD		*prev;		/* LRU links */
-	BUFHEAD		*next;		/* LRU links */
-	BUFHEAD		*ovfl;		/* Overflow page buffer header */
-	__uint32_t	 addr;		/* Address of this page */
-	char		*page;		/* Actual page data */
-	char	 	flags;
-#define	BUF_MOD		0x0001
-#define BUF_DISK	0x0002
-#define	BUF_BUCKET	0x0004
-#define	BUF_PIN		0x0008
-};
-
-#define IS_BUCKET(X)	((X) & BUF_BUCKET)
-
-typedef BUFHEAD **SEGMENT;
-
-/* Hash Table Information */
-typedef struct hashhdr {		/* Disk resident portion */
-	int		magic;		/* Magic NO for hash tables */
-	int		version;	/* Version ID */
-	__uint32_t	lorder;		/* Byte Order */
-	int		bsize;		/* Bucket/Page Size */
-	int		bshift;		/* Bucket shift */
-	int		dsize;		/* Directory Size */
-	int		ssize;		/* Segment Size */
-	int		sshift;		/* Segment shift */
-	int		ovfl_point;	/* Where overflow pages are being 
-					 * allocated */
-	int		last_freed;	/* Last overflow page freed */
-	int		max_bucket;	/* ID of Maximum bucket in use */
-	int		high_mask;	/* Mask to modulo into entire table */
-	int		low_mask;	/* Mask to modulo into lower half of 
-					 * table */
-	int		ffactor;	/* Fill factor */
-	int		nkeys;		/* Number of keys in hash table */
-	int		hdrpages;	/* Size of table header */
-	int		h_charkey;	/* value of hash(CHARKEY) */
-#define NCACHED	32			/* number of bit maps and spare 
-					 * points */
-	int		spares[NCACHED];/* spare pages for overflow */
-	__uint16_t	bitmaps[NCACHED];	/* address of overflow page 
-						 * bitmaps */
-} HASHHDR;
-
-typedef struct htab	 {		/* Memory resident data structure */
-	HASHHDR 	hdr;		/* Header */
-	int		nsegs;		/* Number of allocated segments */
-	int		exsegs;		/* Number of extra allocated 
-					 * segments */
-	__uint32_t			/* Hash function */
-	    (*hash)(const void *, size_t);
-	int		flags;		/* Flag values */
-	int		fp;		/* File pointer */
-	char		*tmp_buf;	/* Temporary Buffer for BIG data */
-	char		*tmp_key;	/* Temporary Buffer for BIG keys */
-	BUFHEAD 	*cpage;		/* Current page */
-	int		cbucket;	/* Current bucket */
-	int		cndx;		/* Index of next item on cpage */
-	int		error;		/* Error Number -- for DBM 
-					 * compatibility */
-	int		new_file;	/* Indicates if fd is backing store 
-					 * or no */
-	int		save_file;	/* Indicates whether we need to flush 
-					 * file at
-					 * exit */
-	__uint32_t	*mapp[NCACHED];	/* Pointers to page maps */
-	int		nmaps;		/* Initial number of bitmaps */
-	int		nbufs;		/* Number of buffers left to 
-					 * allocate */
-	BUFHEAD 	bufhead;	/* Header of buffer lru list */
-	SEGMENT 	*dir;		/* Hash Bucket directory */
-} HTAB;
-
-/*
- * Constants
- */
-#define	MAX_BSIZE		65536		/* 2^16 */
-#define MIN_BUFFERS		6
-#define MINHDRSIZE		512
-#define DEF_BUFSIZE		65536		/* 64 K */
-#define DEF_BUCKET_SIZE		4096
-#define DEF_BUCKET_SHIFT	12		/* log2(BUCKET) */
-#define DEF_SEGSIZE		256
-#define DEF_SEGSIZE_SHIFT	8		/* log2(SEGSIZE)	 */
-#define DEF_DIRSIZE		256
-#define DEF_FFACTOR		65536
-#define MIN_FFACTOR		4
-#define SPLTMAX			8
-#define CHARKEY			"%$sniglet^&"
-#define NUMKEY			1038583
-#define BYTE_SHIFT		3
-#define INT_TO_BYTE		2
-#define INT_BYTE_SHIFT		5
-#define ALL_SET			((__uint32_t)0xFFFFFFFF)
-#define ALL_CLEAR		0
-
-#define PTROF(X)	((BUFHEAD *)((ptrdiff_t)(X)&~0x3))
-#define ISMOD(X)	((__uint32_t)(ptrdiff_t)(X)&0x1)
-#define DOMOD(X)	((X) = (char *)((ptrdiff_t)(X)|0x1))
-#define ISDISK(X)	((__uint32_t)(ptrdiff_t)(X)&0x2)
-#define DODISK(X)	((X) = (char *)((ptrdiff_t)(X)|0x2))
-
-#define BITS_PER_MAP	32
-
-/* Given the address of the beginning of a big map, clear/set the nth bit */
-#define CLRBIT(A, N)	((A)[(N)/BITS_PER_MAP] &= ~(1<<((N)%BITS_PER_MAP)))
-#define SETBIT(A, N)	((A)[(N)/BITS_PER_MAP] |= (1<<((N)%BITS_PER_MAP)))
-#define ISSET(A, N)	((A)[(N)/BITS_PER_MAP] & (1<<((N)%BITS_PER_MAP)))
-
-/* Overflow management */
-/*
- * Overflow page numbers are allocated per split point.  At each doubling of
- * the table, we can allocate extra pages.  So, an overflow page number has
- * the top 5 bits indicate which split point and the lower 11 bits indicate
- * which page at that split point is indicated (pages within split points are
- * numberered starting with 1).
- */
-
-#define SPLITSHIFT	11
-#define SPLITMASK	0x7FF
-#define SPLITNUM(N)	(((__uint32_t)(N)) >> SPLITSHIFT)
-#define OPAGENUM(N)	((N) & SPLITMASK)
-#define	OADDR_OF(S,O)	((__uint32_t)((__uint32_t)(S) << SPLITSHIFT) + (O))
-
-#define BUCKET_TO_PAGE(B) \
-	(B) + hashp->HDRPAGES + ((B) ? hashp->SPARES[__log2((B)+1)-1] : 0)
-#define OADDR_TO_PAGE(B) 	\
-	BUCKET_TO_PAGE ( (1 << SPLITNUM((B))) -1 ) + OPAGENUM((B));
-
-/*
- * page.h contains a detailed description of the page format.
- *
- * Normally, keys and data are accessed from offset tables in the top of
- * each page which point to the beginning of the key and data.  There are
- * four flag values which may be stored in these offset tables which indicate
- * the following:
- *
- *
- * OVFLPAGE	Rather than a key data pair, this pair contains
- *		the address of an overflow page.  The format of
- *		the pair is:
- *		    OVERFLOW_PAGE_NUMBER OVFLPAGE
- *
- * PARTIAL_KEY	This must be the first key/data pair on a page
- *		and implies that page contains only a partial key.
- *		That is, the key is too big to fit on a single page
- *		so it starts on this page and continues on the next.
- *		The format of the page is:
- *		    KEY_OFF PARTIAL_KEY OVFL_PAGENO OVFLPAGE
- *
- *		    KEY_OFF -- offset of the beginning of the key
- *		    PARTIAL_KEY -- 1
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- * FULL_KEY	This must be the first key/data pair on the page.  It
- *		is used in two cases.
- *
- *		Case 1:
- *		    There is a complete key on the page but no data
- *		    (because it wouldn't fit).  The next page contains
- *		    the data.
- *
- *		    Page format it:
- *		    KEY_OFF FULL_KEY OVFL_PAGENO OVFL_PAGE
- *
- *		    KEY_OFF -- offset of the beginning of the key
- *		    FULL_KEY -- 2
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- *		Case 2:
- *		    This page contains no key, but part of a large
- *		    data field, which is continued on the next page.
- *
- *		    Page format it:
- *		    DATA_OFF FULL_KEY OVFL_PAGENO OVFL_PAGE
- *
- *		    KEY_OFF -- offset of the beginning of the data on
- *				this page
- *		    FULL_KEY -- 2
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- * FULL_KEY_DATA
- *		This must be the first key/data pair on the page.
- *		There are two cases:
- *
- *		Case 1:
- *		    This page contains a key and the beginning of the
- *		    data field, but the data field is continued on the
- *		    next page.
- *
- *		    Page format is:
- *		    KEY_OFF FULL_KEY_DATA OVFL_PAGENO DATA_OFF
- *
- *		    KEY_OFF -- offset of the beginning of the key
- *		    FULL_KEY_DATA -- 3
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    DATA_OFF -- offset of the beginning of the data
- *
- *		Case 2:
- *		    This page contains the last page of a big data pair.
- *		    There is no key, only the  tail end of the data
- *		    on this page.
- *
- *		    Page format is:
- *		    DATA_OFF FULL_KEY_DATA <OVFL_PAGENO> <OVFLPAGE>
- *
- *		    DATA_OFF -- offset of the beginning of the data on
- *				this page
- *		    FULL_KEY_DATA -- 3
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- *		    OVFL_PAGENO and OVFLPAGE are optional (they are
- *		    not present if there is no next page).
- */
-
-#define OVFLPAGE	0
-#define PARTIAL_KEY	1
-#define FULL_KEY	2
-#define FULL_KEY_DATA	3
-#define	REAL_KEY	4
-
-/* Short hands for accessing structure */
-#define BSIZE		hdr.bsize
-#define BSHIFT		hdr.bshift
-#define DSIZE		hdr.dsize
-#define SGSIZE		hdr.ssize
-#define SSHIFT		hdr.sshift
-#define LORDER		hdr.lorder
-#define OVFL_POINT	hdr.ovfl_point
-#define	LAST_FREED	hdr.last_freed
-#define MAX_BUCKET	hdr.max_bucket
-#define FFACTOR		hdr.ffactor
-#define HIGH_MASK	hdr.high_mask
-#define LOW_MASK	hdr.low_mask
-#define NKEYS		hdr.nkeys
-#define HDRPAGES	hdr.hdrpages
-#define SPARES		hdr.spares
-#define BITMAPS		hdr.bitmaps
-#define HASH_VERSION	hdr.version
-#define MAGIC		hdr.magic
-#define NEXT_FREE	hdr.next_free
-#define H_CHARKEY	hdr.h_charkey
diff --git a/newlib/libc/search/hash_bigkey.c b/newlib/libc/search/hash_bigkey.c
deleted file mode 100644
index 821acd0..0000000
--- a/newlib/libc/search/hash_bigkey.c
+++ /dev/null
@@ -1,673 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-/* Macros for min/max.  */
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#define MAX(a,b) (((a)>(b))?(a):(b))
-
-/*
- * PACKAGE: hash
- * DESCRIPTION:
- *	Big key/data handling for the hashing package.
- *
- * ROUTINES:
- * External
- *	__big_keydata
- *	__big_split
- *	__big_insert
- *	__big_return
- *	__big_delete
- *	__find_last_page
- * Internal
- *	collect_key
- *	collect_data
- */
-
-#include <sys/param.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef DEBUG
-#include <assert.h>
-#endif
-
-#include "db_local.h"
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static int collect_key(HTAB *, BUFHEAD *, int, DBT *, int);
-static int collect_data(HTAB *, BUFHEAD *, int, int);
-
-/*
- * Big_insert
- *
- * You need to do an insert and the key/data pair is too big
- *
- * Returns:
- * 0 ==> OK
- *-1 ==> ERROR
- */
-extern int
-__big_insert(hashp, bufp, key, val)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	const DBT *key, *val;
-{
-	__uint16_t *p;
-	int key_size, n, val_size;
-	__uint16_t space, move_bytes, off;
-	char *cp, *key_data, *val_data;
-
-	cp = bufp->page;		/* Character pointer of p. */
-	p = (__uint16_t *)cp;
-
-	key_data = (char *)key->data;
-	key_size = key->size;
-	val_data = (char *)val->data;
-	val_size = val->size;
-
-	/* First move the Key */
-	for (space = FREESPACE(p) - BIGOVERHEAD; key_size;
-	    space = FREESPACE(p) - BIGOVERHEAD) {
-		move_bytes = MIN(space, key_size);
-		off = OFFSET(p) - move_bytes;
-		memmove(cp + off, key_data, move_bytes);
-		key_size -= move_bytes;
-		key_data += move_bytes;
-		n = p[0];
-		p[++n] = off;
-		p[0] = ++n;
-		FREESPACE(p) = off - PAGE_META(n);
-		OFFSET(p) = off;
-		p[n] = PARTIAL_KEY;
-		bufp = __add_ovflpage(hashp, bufp);
-		if (!bufp)
-			return (-1);
-		n = p[0];
-		if (!key_size)
-			if (FREESPACE(p)) {
-				move_bytes = MIN(FREESPACE(p), val_size);
-				off = OFFSET(p) - move_bytes;
-				p[n] = off;
-				memmove(cp + off, val_data, move_bytes);
-				val_data += move_bytes;
-				val_size -= move_bytes;
-				p[n - 2] = FULL_KEY_DATA;
-				FREESPACE(p) = FREESPACE(p) - move_bytes;
-				OFFSET(p) = off;
-			} else
-				p[n - 2] = FULL_KEY;
-		p = (__uint16_t *)bufp->page;
-		cp = bufp->page;
-		bufp->flags |= BUF_MOD;
-	}
-
-	/* Now move the data */
-	for (space = FREESPACE(p) - BIGOVERHEAD; val_size;
-	    space = FREESPACE(p) - BIGOVERHEAD) {
-		move_bytes = MIN(space, val_size);
-		/*
-		 * Here's the hack to make sure that if the data ends on the
-		 * same page as the key ends, FREESPACE is at least one.
-		 */
-		if (space == val_size && val_size == val->size)
-			move_bytes--;
-		off = OFFSET(p) - move_bytes;
-		memmove(cp + off, val_data, move_bytes);
-		val_size -= move_bytes;
-		val_data += move_bytes;
-		n = p[0];
-		p[++n] = off;
-		p[0] = ++n;
-		FREESPACE(p) = off - PAGE_META(n);
-		OFFSET(p) = off;
-		if (val_size) {
-			p[n] = FULL_KEY;
-			bufp = __add_ovflpage(hashp, bufp);
-			if (!bufp)
-				return (-1);
-			cp = bufp->page;
-			p = (__uint16_t *)cp;
-		} else
-			p[n] = FULL_KEY_DATA;
-		bufp->flags |= BUF_MOD;
-	}
-	return (0);
-}
-
-/*
- * Called when bufp's page  contains a partial key (index should be 1)
- *
- * All pages in the big key/data pair except bufp are freed.  We cannot
- * free bufp because the page pointing to it is lost and we can't get rid
- * of its pointer.
- *
- * Returns:
- * 0 => OK
- *-1 => ERROR
- */
-extern int
-__big_delete(hashp, bufp)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-{
-	BUFHEAD *last_bfp, *rbufp;
-	__uint16_t *bp, pageno;
-	int key_done, n;
-
-	rbufp = bufp;
-	last_bfp = NULL;
-	bp = (__uint16_t *)bufp->page;
-	pageno = 0;
-	key_done = 0;
-
-	while (!key_done || (bp[2] != FULL_KEY_DATA)) {
-		if (bp[2] == FULL_KEY || bp[2] == FULL_KEY_DATA)
-			key_done = 1;
-
-		/*
-		 * If there is freespace left on a FULL_KEY_DATA page, then
-		 * the data is short and fits entirely on this page, and this
-		 * is the last page.
-		 */
-		if (bp[2] == FULL_KEY_DATA && FREESPACE(bp))
-			break;
-		pageno = bp[bp[0] - 1];
-		rbufp->flags |= BUF_MOD;
-		rbufp = __get_buf(hashp, pageno, rbufp, 0);
-		if (last_bfp)
-			__free_ovflpage(hashp, last_bfp);
-		last_bfp = rbufp;
-		if (!rbufp)
-			return (-1);		/* Error. */
-		bp = (__uint16_t *)rbufp->page;
-	}
-
-	/*
-	 * If we get here then rbufp points to the last page of the big
-	 * key/data pair.  Bufp points to the first one -- it should now be
-	 * empty pointing to the next page after this pair.  Can't free it
-	 * because we don't have the page pointing to it.
-	 */
-
-	/* This is information from the last page of the pair. */
-	n = bp[0];
-	pageno = bp[n - 1];
-
-	/* Now, bp is the first page of the pair. */
-	bp = (__uint16_t *)bufp->page;
-	if (n > 2) {
-		/* There is an overflow page. */
-		bp[1] = pageno;
-		bp[2] = OVFLPAGE;
-		bufp->ovfl = rbufp->ovfl;
-	} else
-		/* This is the last page. */
-		bufp->ovfl = NULL;
-	n -= 2;
-	bp[0] = n;
-	FREESPACE(bp) = hashp->BSIZE - PAGE_META(n);
-	OFFSET(bp) = hashp->BSIZE - 1;
-
-	bufp->flags |= BUF_MOD;
-	if (rbufp)
-		__free_ovflpage(hashp, rbufp);
-	if (last_bfp != rbufp)
-		__free_ovflpage(hashp, last_bfp);
-
-	hashp->NKEYS--;
-	return (0);
-}
-/*
- * Returns:
- *  0 = key not found
- * -1 = get next overflow page
- * -2 means key not found and this is big key/data
- * -3 error
- */
-extern int
-__find_bigpair(hashp, bufp, ndx, key, size)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	int ndx;
-	char *key;
-	int size;
-{
-	__uint16_t *bp;
-	char *p;
-	int ksize;
-	__uint16_t bytes;
-	char *kkey;
-
-	bp = (__uint16_t *)bufp->page;
-	p = bufp->page;
-	ksize = size;
-	kkey = key;
-
-	for (bytes = hashp->BSIZE - bp[ndx];
-	    bytes <= size && bp[ndx + 1] == PARTIAL_KEY;
-	    bytes = hashp->BSIZE - bp[ndx]) {
-		if (memcmp(p + bp[ndx], kkey, bytes))
-			return (-2);
-		kkey += bytes;
-		ksize -= bytes;
-		bufp = __get_buf(hashp, bp[ndx + 2], bufp, 0);
-		if (!bufp)
-			return (-3);
-		p = bufp->page;
-		bp = (__uint16_t *)p;
-		ndx = 1;
-	}
-
-	if (bytes != ksize || memcmp(p + bp[ndx], kkey, bytes)) {
-#ifdef HASH_STATISTICS
-		++hash_collisions;
-#endif
-		return (-2);
-	} else
-		return (ndx);
-}
-
-/*
- * Given the buffer pointer of the first overflow page of a big pair,
- * find the end of the big pair
- *
- * This will set bpp to the buffer header of the last page of the big pair.
- * It will return the pageno of the overflow page following the last page
- * of the pair; 0 if there isn't any (i.e. big pair is the last key in the
- * bucket)
- */
-extern __uint16_t
-__find_last_page(hashp, bpp)
-	HTAB *hashp;
-	BUFHEAD **bpp;
-{
-	BUFHEAD *bufp;
-	__uint16_t *bp, pageno;
-	int n;
-
-	bufp = *bpp;
-	bp = (__uint16_t *)bufp->page;
-	for (;;) {
-		n = bp[0];
-
-		/*
-		 * This is the last page if: the tag is FULL_KEY_DATA and
-		 * either only 2 entries OVFLPAGE marker is explicit there
-		 * is freespace on the page.
-		 */
-		if (bp[2] == FULL_KEY_DATA &&
-		    ((n == 2) || (bp[n] == OVFLPAGE) || (FREESPACE(bp))))
-			break;
-
-		pageno = bp[n - 1];
-		bufp = __get_buf(hashp, pageno, bufp, 0);
-		if (!bufp)
-			return (0);	/* Need to indicate an error! */
-		bp = (__uint16_t *)bufp->page;
-	}
-
-	*bpp = bufp;
-	if (bp[0] > 2)
-		return (bp[3]);
-	else
-		return (0);
-}
-
-/*
- * Return the data for the key/data pair that begins on this page at this
- * index (index should always be 1).
- */
-extern int
-__big_return(hashp, bufp, ndx, val, set_current)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	int ndx;
-	DBT *val;
-	int set_current;
-{
-	BUFHEAD *save_p;
-	__uint16_t *bp, len, off, save_addr;
-	char *tp;
-
-	bp = (__uint16_t *)bufp->page;
-	while (bp[ndx + 1] == PARTIAL_KEY) {
-		bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-		if (!bufp)
-			return (-1);
-		bp = (__uint16_t *)bufp->page;
-		ndx = 1;
-	}
-
-	if (bp[ndx + 1] == FULL_KEY) {
-		bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-		if (!bufp)
-			return (-1);
-		bp = (__uint16_t *)bufp->page;
-		save_p = bufp;
-		save_addr = save_p->addr;
-		off = bp[1];
-		len = 0;
-	} else
-		if (!FREESPACE(bp)) {
-			/*
-			 * This is a hack.  We can't distinguish between
-			 * FULL_KEY_DATA that contains complete data or
-			 * incomplete data, so we require that if the data
-			 * is complete, there is at least 1 byte of free
-			 * space left.
-			 */
-			off = bp[bp[0]];
-			len = bp[1] - off;
-			save_p = bufp;
-			save_addr = bufp->addr;
-			bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-			if (!bufp)
-				return (-1);
-			bp = (__uint16_t *)bufp->page;
-		} else {
-			/* The data is all on one page. */
-			tp = (char *)bp;
-			off = bp[bp[0]];
-			val->data = (u_char *)tp + off;
-			val->size = bp[1] - off;
-			if (set_current) {
-				if (bp[0] == 2) {	/* No more buckets in
-							 * chain */
-					hashp->cpage = NULL;
-					hashp->cbucket++;
-					hashp->cndx = 1;
-				} else {
-					hashp->cpage = __get_buf(hashp,
-					    bp[bp[0] - 1], bufp, 0);
-					if (!hashp->cpage)
-						return (-1);
-					hashp->cndx = 1;
-					if (!((__uint16_t *)
-					    hashp->cpage->page)[0]) {
-						hashp->cbucket++;
-						hashp->cpage = NULL;
-					}
-				}
-			}
-			return (0);
-		}
-
-	val->size = collect_data(hashp, bufp, (int)len, set_current);
-	if (val->size == -1)
-		return (-1);
-	if (save_p->addr != save_addr) {
-		/* We are pretty short on buffers. */
-		errno = EINVAL;			/* OUT OF BUFFERS */
-		return (-1);
-	}
-	memmove(hashp->tmp_buf, (save_p->page) + off, len);
-	val->data = (u_char *)hashp->tmp_buf;
-	return (0);
-}
-/*
- * Count how big the total datasize is by recursing through the pages.  Then
- * allocate a buffer and copy the data as you recurse up.
- */
-static int
-collect_data(hashp, bufp, len, set)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	int len, set;
-{
-	__uint16_t *bp;
-	char *p;
-	BUFHEAD *xbp;
-	__uint16_t save_addr;
-	int mylen, totlen;
-
-	p = bufp->page;
-	bp = (__uint16_t *)p;
-	mylen = hashp->BSIZE - bp[1];
-	save_addr = bufp->addr;
-
-	if (bp[2] == FULL_KEY_DATA) {		/* End of Data */
-		totlen = len + mylen;
-		if (hashp->tmp_buf)
-			free(hashp->tmp_buf);
-		if ((hashp->tmp_buf = (char *)malloc(totlen)) == NULL)
-			return (-1);
-		if (set) {
-			hashp->cndx = 1;
-			if (bp[0] == 2) {	/* No more buckets in chain */
-				hashp->cpage = NULL;
-				hashp->cbucket++;
-			} else {
-				hashp->cpage =
-				    __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-				if (!hashp->cpage)
-					return (-1);
-				else if (!((__uint16_t *)hashp->cpage->page)[0]) {
-					hashp->cbucket++;
-					hashp->cpage = NULL;
-				}
-			}
-		}
-	} else {
-		xbp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-		if (!xbp || ((totlen =
-		    collect_data(hashp, xbp, len + mylen, set)) < 1))
-			return (-1);
-	}
-	if (bufp->addr != save_addr) {
-		errno = EINVAL;			/* Out of buffers. */
-		return (-1);
-	}
-	memmove(&hashp->tmp_buf[len], (bufp->page) + bp[1], mylen);
-	return (totlen);
-}
-
-/*
- * Fill in the key and data for this big pair.
- */
-extern int
-__big_keydata(hashp, bufp, key, val, set)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	DBT *key, *val;
-	int set;
-{
-	key->size = collect_key(hashp, bufp, 0, val, set);
-	if (key->size == -1)
-		return (-1);
-	key->data = (u_char *)hashp->tmp_key;
-	return (0);
-}
-
-/*
- * Count how big the total key size is by recursing through the pages.  Then
- * collect the data, allocate a buffer and copy the key as you recurse up.
- */
-static int
-collect_key(hashp, bufp, len, val, set)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	int len;
-	DBT *val;
-	int set;
-{
-	BUFHEAD *xbp;
-	char *p;
-	int mylen, totlen;
-	__uint16_t *bp, save_addr;
-
-	p = bufp->page;
-	bp = (__uint16_t *)p;
-	mylen = hashp->BSIZE - bp[1];
-
-	save_addr = bufp->addr;
-	totlen = len + mylen;
-	if (bp[2] == FULL_KEY || bp[2] == FULL_KEY_DATA) {    /* End of Key. */
-		if (hashp->tmp_key != NULL)
-			free(hashp->tmp_key);
-		if ((hashp->tmp_key = (char *)malloc(totlen)) == NULL)
-			return (-1);
-		if (__big_return(hashp, bufp, 1, val, set))
-			return (-1);
-	} else {
-		xbp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-		if (!xbp || ((totlen =
-		    collect_key(hashp, xbp, totlen, val, set)) < 1))
-			return (-1);
-	}
-	if (bufp->addr != save_addr) {
-		errno = EINVAL;		/* MIS -- OUT OF BUFFERS */
-		return (-1);
-	}
-	memmove(&hashp->tmp_key[len], (bufp->page) + bp[1], mylen);
-	return (totlen);
-}
-
-/*
- * Returns:
- *  0 => OK
- * -1 => error
- */
-extern int
-__big_split(hashp, op, np, big_keyp, addr, obucket, ret)
-	HTAB *hashp;
-	BUFHEAD *op;	/* Pointer to where to put keys that go in old bucket */
-	BUFHEAD *np;	/* Pointer to new bucket page */
-			/* Pointer to first page containing the big key/data */
-	BUFHEAD *big_keyp;
-	int addr;	/* Address of big_keyp */
-	__uint32_t   obucket;/* Old Bucket */
-	SPLIT_RETURN *ret;
-{
-	BUFHEAD *tmpp;
-	__uint16_t *tp;
-	BUFHEAD *bp;
-	DBT key, val;
-	__uint32_t change;
-	__uint16_t free_space, n, off;
-
-	bp = big_keyp;
-
-	/* Now figure out where the big key/data goes */
-	if (__big_keydata(hashp, big_keyp, &key, &val, 0))
-		return (-1);
-	change = (__call_hash(hashp, key.data, key.size) != obucket);
-
-	if ( (ret->next_addr = __find_last_page(hashp, &big_keyp)) ) {
-		if (!(ret->nextp =
-		    __get_buf(hashp, ret->next_addr, big_keyp, 0)))
-			return (-1);;
-	} else
-		ret->nextp = NULL;
-
-	/* Now make one of np/op point to the big key/data pair */
-#ifdef DEBUG
-	assert(np->ovfl == NULL);
-#endif
-	if (change)
-		tmpp = np;
-	else
-		tmpp = op;
-
-	tmpp->flags |= BUF_MOD;
-#ifdef DEBUG1
-	(void)fprintf(stderr,
-	    "BIG_SPLIT: %d->ovfl was %d is now %d\n", tmpp->addr,
-	    (tmpp->ovfl ? tmpp->ovfl->addr : 0), (bp ? bp->addr : 0));
-#endif
-	tmpp->ovfl = bp;	/* one of op/np point to big_keyp */
-	tp = (__uint16_t *)tmpp->page;
-#ifdef DEBUG
-	assert(FREESPACE(tp) >= OVFLSIZE);
-#endif
-	n = tp[0];
-	off = OFFSET(tp);
-	free_space = FREESPACE(tp);
-	tp[++n] = (__uint16_t)addr;
-	tp[++n] = OVFLPAGE;
-	tp[0] = n;
-	OFFSET(tp) = off;
-	FREESPACE(tp) = free_space - OVFLSIZE;
-
-	/*
-	 * Finally, set the new and old return values. BIG_KEYP contains a
-	 * pointer to the last page of the big key_data pair. Make sure that
-	 * big_keyp has no following page (2 elements) or create an empty
-	 * following page.
-	 */
-
-	ret->newp = np;
-	ret->oldp = op;
-
-	tp = (__uint16_t *)big_keyp->page;
-	big_keyp->flags |= BUF_MOD;
-	if (tp[0] > 2) {
-		/*
-		 * There may be either one or two offsets on this page.  If
-		 * there is one, then the overflow page is linked on normally
-		 * and tp[4] is OVFLPAGE.  If there are two, tp[4] contains
-		 * the second offset and needs to get stuffed in after the
-		 * next overflow page is added.
-		 */
-		n = tp[4];
-		free_space = FREESPACE(tp);
-		off = OFFSET(tp);
-		tp[0] -= 2;
-		FREESPACE(tp) = free_space + OVFLSIZE;
-		OFFSET(tp) = off;
-		tmpp = __add_ovflpage(hashp, big_keyp);
-		if (!tmpp)
-			return (-1);
-		tp[4] = n;
-	} else
-		tmpp = big_keyp;
-
-	if (change)
-		ret->newp = tmpp;
-	else
-		ret->oldp = tmpp;
-	return (0);
-}
diff --git a/newlib/libc/search/hash_buf.c b/newlib/libc/search/hash_buf.c
deleted file mode 100644
index 3dfc206..0000000
--- a/newlib/libc/search/hash_buf.c
+++ /dev/null
@@ -1,364 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-/*
- * PACKAGE: hash
- *
- * DESCRIPTION:
- *	Contains buffer management
- *
- * ROUTINES:
- * External
- *	__buf_init
- *	__get_buf
- *	__buf_free
- *	__reclaim_buf
- * Internal
- *	newbuf
- */
-
-#include <sys/param.h>
-
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef DEBUG
-#include <assert.h>
-#endif
-
-#include "db_local.h"
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static BUFHEAD *newbuf(HTAB *, __uint32_t, BUFHEAD *);
-
-/* Unlink B from its place in the lru */
-#define BUF_REMOVE(B) { \
-	(B)->prev->next = (B)->next; \
-	(B)->next->prev = (B)->prev; \
-}
-
-/* Insert B after P */
-#define BUF_INSERT(B, P) { \
-	(B)->next = (P)->next; \
-	(B)->prev = (P); \
-	(P)->next = (B); \
-	(B)->next->prev = (B); \
-}
-
-#define	MRU	hashp->bufhead.next
-#define	LRU	hashp->bufhead.prev
-
-#define MRU_INSERT(B)	BUF_INSERT((B), &hashp->bufhead)
-#define LRU_INSERT(B)	BUF_INSERT((B), LRU)
-
-/* Macros for min/max.  */
-#ifndef MIN
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-#ifndef MAX
-#define MAX(a,b) (((a)>(b))?(a):(b))
-#endif
-
-/*
- * We are looking for a buffer with address "addr".  If prev_bp is NULL, then
- * address is a bucket index.  If prev_bp is not NULL, then it points to the
- * page previous to an overflow page that we are trying to find.
- *
- * CAVEAT:  The buffer header accessed via prev_bp's ovfl field may no longer
- * be valid.  Therefore, you must always verify that its address matches the
- * address you are seeking.
- */
-extern BUFHEAD *
-__get_buf(hashp, addr, prev_bp, newpage)
-	HTAB *hashp;
-	__uint32_t addr;
-	BUFHEAD *prev_bp;
-	int newpage;	/* If prev_bp set, indicates a new overflow page. */
-{
-	BUFHEAD *bp;
-	__uint32_t is_disk_mask;
-	int is_disk, segment_ndx;
-	SEGMENT segp;
-
-	is_disk = 0;
-	is_disk_mask = 0;
-	if (prev_bp) {
-		bp = prev_bp->ovfl;
-		if (!bp || (bp->addr != addr))
-			bp = NULL;
-		if (!newpage)
-			is_disk = BUF_DISK;
-	} else {
-		/* Grab buffer out of directory */
-		segment_ndx = addr & (hashp->SGSIZE - 1);
-
-		/* valid segment ensured by __call_hash() */
-		segp = hashp->dir[addr >> hashp->SSHIFT];
-#ifdef DEBUG
-		assert(segp != NULL);
-#endif
-		bp = PTROF(segp[segment_ndx]);
-		is_disk_mask = ISDISK(segp[segment_ndx]);
-		is_disk = is_disk_mask || !hashp->new_file;
-	}
-
-	if (!bp) {
-		bp = newbuf(hashp, addr, prev_bp);
-		if (!bp ||
-		    __get_page(hashp, bp->page, addr, !prev_bp, is_disk, 0))
-			return (NULL);
-		if (!prev_bp)
-			segp[segment_ndx] =
-			    (BUFHEAD *)((ptrdiff_t)bp | is_disk_mask);
-	} else {
-		BUF_REMOVE(bp);
-		MRU_INSERT(bp);
-	}
-	return (bp);
-}
-
-/*
- * We need a buffer for this page. Either allocate one, or evict a resident
- * one (if we have as many buffers as we're allowed) and put this one in.
- *
- * If newbuf finds an error (returning NULL), it also sets errno.
- */
-static BUFHEAD *
-newbuf(hashp, addr, prev_bp)
-	HTAB *hashp;
-	__uint32_t addr;
-	BUFHEAD *prev_bp;
-{
-	BUFHEAD *bp;		/* The buffer we're going to use */
-	BUFHEAD *xbp;		/* Temp pointer */
-	BUFHEAD *next_xbp;
-	SEGMENT segp;
-	int segment_ndx;
-	__uint16_t oaddr, *shortp;
-
-	oaddr = 0;
-	bp = LRU;
-	/*
-	 * If LRU buffer is pinned, the buffer pool is too small. We need to
-	 * allocate more buffers.
-	 */
-	if (hashp->nbufs || (bp->flags & BUF_PIN)) {
-		/* Allocate a new one */
-		if ((bp = (BUFHEAD *)malloc(sizeof(BUFHEAD))) == NULL)
-			return (NULL);
-#ifdef PURIFY
-		memset(bp, 0xff, sizeof(BUFHEAD));
-#endif
-		if ((bp->page = (char *)malloc(hashp->BSIZE)) == NULL) {
-			free(bp);
-			return (NULL);
-		}
-#ifdef PURIFY
-		memset(bp->page, 0xff, hashp->BSIZE);
-#endif
-		if (hashp->nbufs)
-			hashp->nbufs--;
-	} else {
-		/* Kick someone out */
-		BUF_REMOVE(bp);
-		/*
-		 * If this is an overflow page with addr 0, it's already been
-		 * flushed back in an overflow chain and initialized.
-		 */
-		if ((bp->addr != 0) || (bp->flags & BUF_BUCKET)) {
-			/*
-			 * Set oaddr before __put_page so that you get it
-			 * before bytes are swapped.
-			 */
-			shortp = (__uint16_t *)bp->page;
-			if (shortp[0])
-				oaddr = shortp[shortp[0] - 1];
-			if ((bp->flags & BUF_MOD) && __put_page(hashp, bp->page,
-			    bp->addr, (int)IS_BUCKET(bp->flags), 0))
-				return (NULL);
-			/*
-			 * Update the pointer to this page (i.e. invalidate it).
-			 *
-			 * If this is a new file (i.e. we created it at open
-			 * time), make sure that we mark pages which have been
-			 * written to disk so we retrieve them from disk later,
-			 * rather than allocating new pages.
-			 */
-			if (IS_BUCKET(bp->flags)) {
-				segment_ndx = bp->addr & (hashp->SGSIZE - 1);
-				segp = hashp->dir[bp->addr >> hashp->SSHIFT];
-#ifdef DEBUG
-				assert(segp != NULL);
-#endif
-
-				if (hashp->new_file &&
-				    ((bp->flags & BUF_MOD) ||
-				    ISDISK(segp[segment_ndx])))
-					segp[segment_ndx] = (BUFHEAD *)BUF_DISK;
-				else
-					segp[segment_ndx] = NULL;
-			}
-			/*
-			 * Since overflow pages can only be access by means of
-			 * their bucket, free overflow pages associated with
-			 * this bucket.
-			 */
-			for (xbp = bp; xbp->ovfl;) {
-				next_xbp = xbp->ovfl;
-				xbp->ovfl = 0;
-				xbp = next_xbp;
-
-				/* Check that ovfl pointer is up date. */
-				if (IS_BUCKET(xbp->flags) ||
-				    (oaddr != xbp->addr))
-					break;
-
-				shortp = (__uint16_t *)xbp->page;
-				if (shortp[0])
-					/* set before __put_page */
-					oaddr = shortp[shortp[0] - 1];
-				if ((xbp->flags & BUF_MOD) && __put_page(hashp,
-				    xbp->page, xbp->addr, 0, 0))
-					return (NULL);
-				xbp->addr = 0;
-				xbp->flags = 0;
-				BUF_REMOVE(xbp);
-				LRU_INSERT(xbp);
-			}
-		}
-	}
-
-	/* Now assign this buffer */
-	bp->addr = addr;
-#ifdef DEBUG1
-	(void)fprintf(stderr, "NEWBUF1: %d->ovfl was %d is now %d\n",
-	    bp->addr, (bp->ovfl ? bp->ovfl->addr : 0), 0);
-#endif
-	bp->ovfl = NULL;
-	if (prev_bp) {
-		/*
-		 * If prev_bp is set, this is an overflow page, hook it in to
-		 * the buffer overflow links.
-		 */
-#ifdef DEBUG1
-		(void)fprintf(stderr, "NEWBUF2: %d->ovfl was %d is now %d\n",
-		    prev_bp->addr, (prev_bp->ovfl ? bp->ovfl->addr : 0),
-		    (bp ? bp->addr : 0));
-#endif
-		prev_bp->ovfl = bp;
-		bp->flags = 0;
-	} else
-		bp->flags = BUF_BUCKET;
-	MRU_INSERT(bp);
-	return (bp);
-}
-
-extern void
-__buf_init(hashp, nbytes)
-	HTAB *hashp;
-	int nbytes;
-{
-	BUFHEAD *bfp;
-	int npages;
-
-	bfp = &(hashp->bufhead);
-	npages = (nbytes + hashp->BSIZE - 1) >> hashp->BSHIFT;
-	npages = MAX(npages, MIN_BUFFERS);
-
-	hashp->nbufs = npages;
-	bfp->next = bfp;
-	bfp->prev = bfp;
-	/*
-	 * This space is calloc'd so these are already null.
-	 *
-	 * bfp->ovfl = NULL;
-	 * bfp->flags = 0;
-	 * bfp->page = NULL;
-	 * bfp->addr = 0;
-	 */
-}
-
-extern int
-__buf_free(hashp, do_free, to_disk)
-	HTAB *hashp;
-	int do_free, to_disk;
-{
-	BUFHEAD *bp;
-
-	/* Need to make sure that buffer manager has been initialized */
-	if (!LRU)
-		return (0);
-	for (bp = LRU; bp != &hashp->bufhead;) {
-		/* Check that the buffer is valid */
-		if (bp->addr || IS_BUCKET(bp->flags)) {
-			if (to_disk && (bp->flags & BUF_MOD) &&
-			    __put_page(hashp, bp->page,
-			    bp->addr, IS_BUCKET(bp->flags), 0))
-				return (-1);
-		}
-		/* Check if we are freeing stuff */
-		if (do_free) {
-			if (bp->page)
-				free(bp->page);
-			BUF_REMOVE(bp);
-			free(bp);
-			bp = LRU;
-		} else
-			bp = bp->prev;
-	}
-	return (0);
-}
-
-extern void
-__reclaim_buf(hashp, bp)
-	HTAB *hashp;
-	BUFHEAD *bp;
-{
-	bp->ovfl = 0;
-	bp->addr = 0;
-	bp->flags = 0;
-	BUF_REMOVE(bp);
-	LRU_INSERT(bp);
-}
diff --git a/newlib/libc/search/hash_func.c b/newlib/libc/search/hash_func.c
deleted file mode 100644
index 52cb31c..0000000
--- a/newlib/libc/search/hash_func.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_func.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include "db_local.h"
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static __uint32_t hash1(const void *, size_t);
-static __uint32_t hash2(const void *, size_t);
-static __uint32_t hash3(const void *, size_t);
-static __uint32_t hash4(const void *, size_t);
-
-/* Global default hash function */
-__uint32_t (*__default_hash)(const void *, size_t) = hash4;
-
-/*
- * HASH FUNCTIONS
- *
- * Assume that we've already split the bucket to which this key hashes,
- * calculate that bucket, and check that in fact we did already split it.
- *
- * This came from ejb's hsearch.
- */
-
-#define PRIME1		37
-#define PRIME2		1048583
-
-static __uint32_t
-hash1(keyarg, len)
-	const void *keyarg;
-	size_t len;
-{
-	const u_char *key;
-	__uint32_t h;
-
-	/* Convert string to integer */
-	for (key = keyarg, h = 0; len--;)
-		h = h * PRIME1 ^ (*key++ - ' ');
-	h %= PRIME2;
-	return (h);
-}
-
-/*
- * Phong's linear congruential hash
- */
-#define dcharhash(h, c)	((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c))
-
-static __uint32_t
-hash2(keyarg, len)
-	const void *keyarg;
-	size_t len;
-{
-	const u_char *e, *key;
-	__uint32_t h;
-	u_char c;
-
-	key = keyarg;
-	e = key + len;
-	for (h = 0; key != e;) {
-		c = *key++;
-		if (!c && key > e)
-			break;
-		dcharhash(h, c);
-	}
-	return (h);
-}
-
-/*
- * This is INCREDIBLY ugly, but fast.  We break the string up into 8 byte
- * units.  On the first time through the loop we get the "leftover bytes"
- * (strlen % 8).  On every other iteration, we perform 8 HASHC's so we handle
- * all 8 bytes.  Essentially, this saves us 7 cmp & branch instructions.  If
- * this routine is heavily used enough, it's worth the ugly coding.
- *
- * OZ's original sdbm hash
- */
-static __uint32_t
-hash3(keyarg, len)
-	const void *keyarg;
-	size_t len;
-{
-	const u_char *key;
-	size_t loop;
-	__uint32_t h;
-
-#define HASHC   h = *key++ + 65599 * h
-
-	h = 0;
-	key = keyarg;
-	if (len > 0) {
-		loop = (len + 8 - 1) >> 3;
-
-		switch (len & (8 - 1)) {
-		case 0:
-			do {
-				HASHC;
-				/* FALLTHROUGH */
-		case 7:
-				HASHC;
-				/* FALLTHROUGH */
-		case 6:
-				HASHC;
-				/* FALLTHROUGH */
-		case 5:
-				HASHC;
-				/* FALLTHROUGH */
-		case 4:
-				HASHC;
-				/* FALLTHROUGH */
-		case 3:
-				HASHC;
-				/* FALLTHROUGH */
-		case 2:
-				HASHC;
-				/* FALLTHROUGH */
-		case 1:
-				HASHC;
-			} while (--loop);
-		}
-	}
-	return (h);
-}
-
-/* Hash function from Chris Torek. */
-static __uint32_t
-hash4(keyarg, len)
-	const void *keyarg;
-	size_t len;
-{
-	const u_char *key;
-	size_t loop;
-	__uint32_t h;
-
-#define HASH4a   h = (h << 5) - h + *key++;
-#define HASH4b   h = (h << 5) + h + *key++;
-#define HASH4 HASH4b
-
-	h = 0;
-	key = keyarg;
-	if (len > 0) {
-		loop = (len + 8 - 1) >> 3;
-
-		switch (len & (8 - 1)) {
-		case 0:
-			do {
-				HASH4;
-				/* FALLTHROUGH */
-		case 7:
-				HASH4;
-				/* FALLTHROUGH */
-		case 6:
-				HASH4;
-				/* FALLTHROUGH */
-		case 5:
-				HASH4;
-				/* FALLTHROUGH */
-		case 4:
-				HASH4;
-				/* FALLTHROUGH */
-		case 3:
-				HASH4;
-				/* FALLTHROUGH */
-		case 2:
-				HASH4;
-				/* FALLTHROUGH */
-		case 1:
-				HASH4;
-			} while (--loop);
-		}
-	}
-	return (h);
-}
diff --git a/newlib/libc/search/hash_log2.c b/newlib/libc/search/hash_log2.c
deleted file mode 100644
index 9414f26..0000000
--- a/newlib/libc/search/hash_log2.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_log2.c	8.2 (Berkeley) 5/31/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-
-#include "db_local.h"
-
-__uint32_t
-__log2(num)
-	__uint32_t num;
-{
-	__uint32_t i, limit;
-
-	limit = 1;
-	for (i = 0; limit < num; limit = limit << 1, i++);
-	return (i);
-}
diff --git a/newlib/libc/search/hash_page.c b/newlib/libc/search/hash_page.c
deleted file mode 100644
index 68ab9db..0000000
--- a/newlib/libc/search/hash_page.c
+++ /dev/null
@@ -1,948 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_page.c	8.7 (Berkeley) 8/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-/*
- * PACKAGE:  hashing
- *
- * DESCRIPTION:
- *	Page manipulation for hashing package.
- *
- * ROUTINES:
- *
- * External
- *	__get_page
- *	__add_ovflpage
- * Internal
- *	overflow_page
- *	open_temp
- */
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef DEBUG
-#include <assert.h>
-#endif
-
-#include "db_local.h"
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static __uint32_t	*fetch_bitmap(HTAB *, int);
-static __uint32_t	 first_free(__uint32_t);
-static int	 open_temp(HTAB *);
-static __uint16_t	 overflow_page(HTAB *);
-static void	 putpair(char *, const DBT *, const DBT *);
-static void	 squeeze_key(__uint16_t *, const DBT *, const DBT *);
-static int	 ugly_split
-(HTAB *, __uint32_t, BUFHEAD *, BUFHEAD *, int, int);
-
-#define	PAGE_INIT(P) { \
-	((__uint16_t *)(P))[0] = 0; \
-	((__uint16_t *)(P))[1] = hashp->BSIZE - 3 * sizeof(__uint16_t); \
-	((__uint16_t *)(P))[2] = hashp->BSIZE; \
-}
-
-/*
- * This is called AFTER we have verified that there is room on the page for
- * the pair (PAIRFITS has returned true) so we go right ahead and start moving
- * stuff on.
- */
-static void
-putpair(p, key, val)
-	char *p;
-	const DBT *key, *val;
-{
-	__uint16_t *bp, n, off;
-
-	bp = (__uint16_t *)p;
-
-	/* Enter the key first. */
-	n = bp[0];
-
-	off = OFFSET(bp) - key->size;
-	memmove(p + off, key->data, key->size);
-	bp[++n] = off;
-
-	/* Now the data. */
-	off -= val->size;
-	memmove(p + off, val->data, val->size);
-	bp[++n] = off;
-
-	/* Adjust page info. */
-	bp[0] = n;
-	bp[n + 1] = off - ((n + 3) * sizeof(__uint16_t));
-	bp[n + 2] = off;
-}
-
-/*
- * Returns:
- *	 0 OK
- *	-1 error
- */
-extern int
-__delpair(hashp, bufp, ndx)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	int ndx;
-{
-	__uint16_t *bp, newoff;
-	int n;
-	__uint16_t pairlen;
-
-	bp = (__uint16_t *)bufp->page;
-	n = bp[0];
-
-	if (bp[ndx + 1] < REAL_KEY)
-		return (__big_delete(hashp, bufp));
-	if (ndx != 1)
-		newoff = bp[ndx - 1];
-	else
-		newoff = hashp->BSIZE;
-	pairlen = newoff - bp[ndx + 1];
-
-	if (ndx != (n - 1)) {
-		/* Hard Case -- need to shuffle keys */
-		int i;
-		char *src = bufp->page + (int)OFFSET(bp);
-		char *dst = src + (int)pairlen;
-		memmove(dst, src, bp[ndx + 1] - OFFSET(bp));
-
-		/* Now adjust the pointers */
-		for (i = ndx + 2; i <= n; i += 2) {
-			if (bp[i + 1] == OVFLPAGE) {
-				bp[i - 2] = bp[i];
-				bp[i - 1] = bp[i + 1];
-			} else {
-				bp[i - 2] = bp[i] + pairlen;
-				bp[i - 1] = bp[i + 1] + pairlen;
-			}
-		}
-	}
-	/* Finally adjust the page data */
-	bp[n] = OFFSET(bp) + pairlen;
-	bp[n - 1] = bp[n + 1] + pairlen + 2 * sizeof(__uint16_t);
-	bp[0] = n - 2;
-	hashp->NKEYS--;
-
-	bufp->flags |= BUF_MOD;
-	return (0);
-}
-/*
- * Returns:
- *	 0 ==> OK
- *	-1 ==> Error
- */
-extern int
-__split_page(hashp, obucket, nbucket)
-	HTAB *hashp;
-	__uint32_t obucket, nbucket;
-{
-	BUFHEAD *new_bufp, *old_bufp;
-	__uint16_t *ino;
-	char *np;
-	DBT key, val;
-	int n, ndx, retval;
-	__uint16_t copyto, diff, off, moved;
-	char *op;
-
-	copyto = (__uint16_t)hashp->BSIZE;
-	off = (__uint16_t)hashp->BSIZE;
-	old_bufp = __get_buf(hashp, obucket, NULL, 0);
-	if (old_bufp == NULL)
-		return (-1);
-	new_bufp = __get_buf(hashp, nbucket, NULL, 0);
-	if (new_bufp == NULL)
-		return (-1);
-
-	old_bufp->flags |= (BUF_MOD | BUF_PIN);
-	new_bufp->flags |= (BUF_MOD | BUF_PIN);
-
-	ino = (__uint16_t *)(op = old_bufp->page);
-	np = new_bufp->page;
-
-	moved = 0;
-
-	for (n = 1, ndx = 1; n < ino[0]; n += 2) {
-		if (ino[n + 1] < REAL_KEY) {
-			retval = ugly_split(hashp, obucket, old_bufp, new_bufp,
-			    (int)copyto, (int)moved);
-			old_bufp->flags &= ~BUF_PIN;
-			new_bufp->flags &= ~BUF_PIN;
-			return (retval);
-
-		}
-		key.data = (u_char *)op + ino[n];
-		key.size = off - ino[n];
-
-		if (__call_hash(hashp, key.data, key.size) == obucket) {
-			/* Don't switch page */
-			diff = copyto - off;
-			if (diff) {
-				copyto = ino[n + 1] + diff;
-				memmove(op + copyto, op + ino[n + 1],
-				    off - ino[n + 1]);
-				ino[ndx] = copyto + ino[n] - ino[n + 1];
-				ino[ndx + 1] = copyto;
-			} else
-				copyto = ino[n + 1];
-			ndx += 2;
-		} else {
-			/* Switch page */
-			val.data = (u_char *)op + ino[n + 1];
-			val.size = ino[n] - ino[n + 1];
-			putpair(np, &key, &val);
-			moved += 2;
-		}
-
-		off = ino[n + 1];
-	}
-
-	/* Now clean up the page */
-	ino[0] -= moved;
-	FREESPACE(ino) = copyto - sizeof(__uint16_t) * (ino[0] + 3);
-	OFFSET(ino) = copyto;
-
-#ifdef DEBUG3
-	(void)fprintf(stderr, "split %d/%d\n",
-	    ((__uint16_t *)np)[0] / 2,
-	    ((__uint16_t *)op)[0] / 2);
-#endif
-	/* unpin both pages */
-	old_bufp->flags &= ~BUF_PIN;
-	new_bufp->flags &= ~BUF_PIN;
-	return (0);
-}
-
-/*
- * Called when we encounter an overflow or big key/data page during split
- * handling.  This is special cased since we have to begin checking whether
- * the key/data pairs fit on their respective pages and because we may need
- * overflow pages for both the old and new pages.
- *
- * The first page might be a page with regular key/data pairs in which case
- * we have a regular overflow condition and just need to go on to the next
- * page or it might be a big key/data pair in which case we need to fix the
- * big key/data pair.
- *
- * Returns:
- *	 0 ==> success
- *	-1 ==> failure
- */
-static int
-ugly_split(hashp, obucket, old_bufp, new_bufp, copyto, moved)
-	HTAB *hashp;
-	__uint32_t obucket;	/* Same as __split_page. */
-	BUFHEAD *old_bufp, *new_bufp;
-	int copyto;	/* First byte on page which contains key/data values. */
-	int moved;		/* Number of pairs moved to new page. */
-{
-	BUFHEAD *bufp;		/* Buffer header for ino */
-	__uint16_t *ino;		/* Page keys come off of */
-	__uint16_t *np;		/* New page */
-	__uint16_t *op;		/* Page keys go on to if they aren't moving */
-
-	BUFHEAD *last_bfp;	/* Last buf header OVFL needing to be freed */
-	DBT key, val;
-	SPLIT_RETURN ret;
-	__uint16_t n, off, ov_addr, scopyto;
-	char *cino;		/* Character value of ino */
-
-	bufp = old_bufp;
-	ino = (__uint16_t *)old_bufp->page;
-	np = (__uint16_t *)new_bufp->page;
-	op = (__uint16_t *)old_bufp->page;
-	last_bfp = NULL;
-	scopyto = (__uint16_t)copyto;	/* ANSI */
-
-	n = ino[0] - 1;
-	while (n < ino[0]) {
-		if (ino[2] < REAL_KEY && ino[2] != OVFLPAGE) {
-			if (__big_split(hashp, old_bufp,
-			    new_bufp, bufp, bufp->addr, obucket, &ret))
-				return (-1);
-			old_bufp = ret.oldp;
-			if (!old_bufp)
-				return (-1);
-			op = (__uint16_t *)old_bufp->page;
-			new_bufp = ret.newp;
-			if (!new_bufp)
-				return (-1);
-			np = (__uint16_t *)new_bufp->page;
-			bufp = ret.nextp;
-			if (!bufp)
-				return (0);
-			cino = (char *)bufp->page;
-			ino = (__uint16_t *)cino;
-			last_bfp = ret.nextp;
-		} else if (ino[n + 1] == OVFLPAGE) {
-			ov_addr = ino[n];
-			/*
-			 * Fix up the old page -- the extra 2 are the fields
-			 * which contained the overflow information.
-			 */
-			ino[0] -= (moved + 2);
-			FREESPACE(ino) =
-			    scopyto - sizeof(__uint16_t) * (ino[0] + 3);
-			OFFSET(ino) = scopyto;
-
-			bufp = __get_buf(hashp, ov_addr, bufp, 0);
-			if (!bufp)
-				return (-1);
-
-			ino = (__uint16_t *)bufp->page;
-			n = 1;
-			scopyto = hashp->BSIZE;
-			moved = 0;
-
-			if (last_bfp)
-				__free_ovflpage(hashp, last_bfp);
-			last_bfp = bufp;
-		}
-		/* Move regular sized pairs of there are any */
-		off = hashp->BSIZE;
-		for (n = 1; (n < ino[0]) && (ino[n + 1] >= REAL_KEY); n += 2) {
-			cino = (char *)ino;
-			key.data = (u_char *)cino + ino[n];
-			key.size = off - ino[n];
-			val.data = (u_char *)cino + ino[n + 1];
-			val.size = ino[n] - ino[n + 1];
-			off = ino[n + 1];
-
-			if (__call_hash(hashp, key.data, key.size) == obucket) {
-				/* Keep on old page */
-				if (PAIRFITS(op, (&key), (&val)))
-					putpair((char *)op, &key, &val);
-				else {
-					old_bufp =
-					    __add_ovflpage(hashp, old_bufp);
-					if (!old_bufp)
-						return (-1);
-					op = (__uint16_t *)old_bufp->page;
-					putpair((char *)op, &key, &val);
-				}
-				old_bufp->flags |= BUF_MOD;
-			} else {
-				/* Move to new page */
-				if (PAIRFITS(np, (&key), (&val)))
-					putpair((char *)np, &key, &val);
-				else {
-					new_bufp =
-					    __add_ovflpage(hashp, new_bufp);
-					if (!new_bufp)
-						return (-1);
-					np = (__uint16_t *)new_bufp->page;
-					putpair((char *)np, &key, &val);
-				}
-				new_bufp->flags |= BUF_MOD;
-			}
-		}
-	}
-	if (last_bfp)
-		__free_ovflpage(hashp, last_bfp);
-	return (0);
-}
-
-/*
- * Add the given pair to the page
- *
- * Returns:
- *	0 ==> OK
- *	1 ==> failure
- */
-extern int
-__addel(hashp, bufp, key, val)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	const DBT *key, *val;
-{
-	__uint16_t *bp, *sop;
-	int do_expand;
-
-	bp = (__uint16_t *)bufp->page;
-	do_expand = 0;
-	while (bp[0] && (bp[2] < REAL_KEY || bp[bp[0]] < REAL_KEY))
-		/* Exception case */
-		if (bp[2] == FULL_KEY_DATA && bp[0] == 2)
-			/* This is the last page of a big key/data pair
-			   and we need to add another page */
-			break;
-		else if (bp[2] < REAL_KEY && bp[bp[0]] != OVFLPAGE) {
-			bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-			if (!bufp)
-				return (-1);
-			bp = (__uint16_t *)bufp->page;
-		} else
-			/* Try to squeeze key on this page */
-			if (FREESPACE(bp) > PAIRSIZE(key, val)) {
-				squeeze_key(bp, key, val);
-				return (0);
-			} else {
-				bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-				if (!bufp)
-					return (-1);
-				bp = (__uint16_t *)bufp->page;
-			}
-
-	if (PAIRFITS(bp, key, val))
-		putpair(bufp->page, key, val);
-	else {
-		do_expand = 1;
-		bufp = __add_ovflpage(hashp, bufp);
-		if (!bufp)
-			return (-1);
-		sop = (__uint16_t *)bufp->page;
-
-		if (PAIRFITS(sop, key, val))
-			putpair((char *)sop, key, val);
-		else
-			if (__big_insert(hashp, bufp, key, val))
-				return (-1);
-	}
-	bufp->flags |= BUF_MOD;
-	/*
-	 * If the average number of keys per bucket exceeds the fill factor,
-	 * expand the table.
-	 */
-	hashp->NKEYS++;
-	if (do_expand ||
-	    (hashp->NKEYS / (hashp->MAX_BUCKET + 1) > hashp->FFACTOR))
-		return (__expand_table(hashp));
-	return (0);
-}
-
-/*
- *
- * Returns:
- *	pointer on success
- *	NULL on error
- */
-extern BUFHEAD *
-__add_ovflpage(hashp, bufp)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-{
-	__uint16_t *sp;
-	__uint16_t ndx, ovfl_num;
-#ifdef DEBUG1
-	int tmp1, tmp2;
-#endif
-	sp = (__uint16_t *)bufp->page;
-
-	/* Check if we are dynamically determining the fill factor */
-	if (hashp->FFACTOR == DEF_FFACTOR) {
-		hashp->FFACTOR = sp[0] >> 1;
-		if (hashp->FFACTOR < MIN_FFACTOR)
-			hashp->FFACTOR = MIN_FFACTOR;
-	}
-	bufp->flags |= BUF_MOD;
-	ovfl_num = overflow_page(hashp);
-#ifdef DEBUG1
-	tmp1 = bufp->addr;
-	tmp2 = bufp->ovfl ? bufp->ovfl->addr : 0;
-#endif
-	if (!ovfl_num || !(bufp->ovfl = __get_buf(hashp, ovfl_num, bufp, 1)))
-		return (NULL);
-	bufp->ovfl->flags |= BUF_MOD;
-#ifdef DEBUG1
-	(void)fprintf(stderr, "ADDOVFLPAGE: %d->ovfl was %d is now %d\n",
-	    tmp1, tmp2, bufp->ovfl->addr);
-#endif
-	ndx = sp[0];
-	/*
-	 * Since a pair is allocated on a page only if there's room to add
-	 * an overflow page, we know that the OVFL information will fit on
-	 * the page.
-	 */
-	sp[ndx + 4] = OFFSET(sp);
-	sp[ndx + 3] = FREESPACE(sp) - OVFLSIZE;
-	sp[ndx + 1] = ovfl_num;
-	sp[ndx + 2] = OVFLPAGE;
-	sp[0] = ndx + 2;
-#ifdef HASH_STATISTICS
-	hash_overflows++;
-#endif
-	return (bufp->ovfl);
-}
-
-/*
- * Returns:
- *	 0 indicates SUCCESS
- *	-1 indicates FAILURE
- */
-extern int
-__get_page(hashp, p, bucket, is_bucket, is_disk, is_bitmap)
-	HTAB *hashp;
-	char *p;
-	__uint32_t bucket;
-	int is_bucket, is_disk, is_bitmap;
-{
-	int fd, page, size;
-	int rsize;
-	__uint16_t *bp;
-
-	fd = hashp->fp;
-	size = hashp->BSIZE;
-
-	if ((fd == -1) || !is_disk) {
-		PAGE_INIT(p);
-		return (0);
-	}
-	if (is_bucket)
-		page = BUCKET_TO_PAGE(bucket);
-	else
-		page = OADDR_TO_PAGE(bucket);
-	if ((lseek(fd, (off_t)page << hashp->BSHIFT, SEEK_SET) == -1) ||
-	    ((rsize = read(fd, p, size)) == -1))
-		return (-1);
-	bp = (__uint16_t *)p;
-	if (!rsize)
-		bp[0] = 0;	/* We hit the EOF, so initialize a new page */
-	else
-		if (rsize != size) {
-			errno = EFTYPE;
-			return (-1);
-		}
-	if (!is_bitmap && !bp[0]) {
-		PAGE_INIT(p);
-	} else
-               if (hashp->LORDER != DB_BYTE_ORDER) {
-			int i, max;
-
-			if (is_bitmap) {
-				max = hashp->BSIZE >> 2; /* divide by 4 */
-				for (i = 0; i < max; i++)
-					M_32_SWAP(((int *)p)[i]);
-			} else {
-				M_16_SWAP(bp[0]);
-				max = bp[0] + 2;
-				for (i = 1; i <= max; i++)
-					M_16_SWAP(bp[i]);
-			}
-		}
-	return (0);
-}
-
-/*
- * Write page p to disk
- *
- * Returns:
- *	 0 ==> OK
- *	-1 ==>failure
- */
-extern int
-__put_page(hashp, p, bucket, is_bucket, is_bitmap)
-	HTAB *hashp;
-	char *p;
-	__uint32_t bucket;
-	int is_bucket, is_bitmap;
-{
-	int fd, page, size;
-	int wsize;
-
-	size = hashp->BSIZE;
-	if ((hashp->fp == -1) && open_temp(hashp))
-		return (-1);
-	fd = hashp->fp;
-
-       if (hashp->LORDER != DB_BYTE_ORDER) {
-		int i;
-		int max;
-
-		if (is_bitmap) {
-			max = hashp->BSIZE >> 2;	/* divide by 4 */
-			for (i = 0; i < max; i++)
-				M_32_SWAP(((int *)p)[i]);
-		} else {
-			max = ((__uint16_t *)p)[0] + 2;
-			for (i = 0; i <= max; i++)
-				M_16_SWAP(((__uint16_t *)p)[i]);
-		}
-	}
-	if (is_bucket)
-		page = BUCKET_TO_PAGE(bucket);
-	else
-		page = OADDR_TO_PAGE(bucket);
-	if ((lseek(fd, (off_t)page << hashp->BSHIFT, SEEK_SET) == -1) ||
-	    ((wsize = write(fd, p, size)) == -1))
-		/* Errno is set */
-		return (-1);
-	if (wsize != size) {
-		errno = EFTYPE;
-		return (-1);
-	}
-	return (0);
-}
-
-#define BYTE_MASK	((1 << INT_BYTE_SHIFT) -1)
-/*
- * Initialize a new bitmap page.  Bitmap pages are left in memory
- * once they are read in.
- */
-extern int
-__ibitmap(hashp, pnum, nbits, ndx)
-	HTAB *hashp;
-	int pnum, nbits, ndx;
-{
-	__uint32_t *ip;
-	int clearbytes, clearints;
-
-	if ((ip = (__uint32_t *)malloc(hashp->BSIZE)) == NULL)
-		return (1);
-	hashp->nmaps++;
-	clearints = ((nbits - 1) >> INT_BYTE_SHIFT) + 1;
-	clearbytes = clearints << INT_TO_BYTE;
-	(void)memset((char *)ip, 0, clearbytes);
-	(void)memset(((char *)ip) + clearbytes, 0xFF,
-	    hashp->BSIZE - clearbytes);
-	ip[clearints - 1] = ALL_SET << (nbits & BYTE_MASK);
-	SETBIT(ip, 0);
-	hashp->BITMAPS[ndx] = (__uint16_t)pnum;
-	hashp->mapp[ndx] = ip;
-	return (0);
-}
-
-static __uint32_t
-first_free(map)
-	__uint32_t map;
-{
-	__uint32_t i, mask;
-
-	mask = 0x1;
-	for (i = 0; i < BITS_PER_MAP; i++) {
-		if (!(mask & map))
-			return (i);
-		mask = mask << 1;
-	}
-	return (i);
-}
-
-static __uint16_t
-overflow_page(hashp)
-	HTAB *hashp;
-{
-	__uint32_t *freep;
-	int max_free, offset, splitnum;
-	__uint16_t addr;
-	int bit, first_page, free_bit, free_page, i, in_use_bits, j;
-#ifdef DEBUG2
-	int tmp1, tmp2;
-#endif
-	splitnum = hashp->OVFL_POINT;
-	max_free = hashp->SPARES[splitnum];
-
-	free_page = (max_free - 1) >> (hashp->BSHIFT + BYTE_SHIFT);
-	free_bit = (max_free - 1) & ((hashp->BSIZE << BYTE_SHIFT) - 1);
-
-	/* Look through all the free maps to find the first free block */
-	first_page = hashp->LAST_FREED >>(hashp->BSHIFT + BYTE_SHIFT);
-	for ( i = first_page; i <= free_page; i++ ) {
-		if (!(freep = (__uint32_t *)hashp->mapp[i]) &&
-		    !(freep = fetch_bitmap(hashp, i)))
-			return (0);
-		if (i == free_page)
-			in_use_bits = free_bit;
-		else
-			in_use_bits = (hashp->BSIZE << BYTE_SHIFT) - 1;
-
-		if (i == first_page) {
-			bit = hashp->LAST_FREED &
-			    ((hashp->BSIZE << BYTE_SHIFT) - 1);
-			j = bit / BITS_PER_MAP;
-			bit = bit & ~(BITS_PER_MAP - 1);
-		} else {
-			bit = 0;
-			j = 0;
-		}
-		for (; bit <= in_use_bits; j++, bit += BITS_PER_MAP)
-			if (freep[j] != ALL_SET)
-				goto found;
-	}
-
-	/* No Free Page Found */
-	hashp->LAST_FREED = hashp->SPARES[splitnum];
-	hashp->SPARES[splitnum]++;
-	offset = hashp->SPARES[splitnum] -
-	    (splitnum ? hashp->SPARES[splitnum - 1] : 0);
-
-#define	OVMSG	"HASH: Out of overflow pages.  Increase page size\n"
-	if (offset > SPLITMASK) {
-		if (++splitnum >= NCACHED) {
-			(void)write(STDERR_FILENO, OVMSG, sizeof(OVMSG) - 1);
-			return (0);
-		}
-		hashp->OVFL_POINT = splitnum;
-		hashp->SPARES[splitnum] = hashp->SPARES[splitnum-1];
-		hashp->SPARES[splitnum-1]--;
-		offset = 1;
-	}
-
-	/* Check if we need to allocate a new bitmap page */
-	if (free_bit == (hashp->BSIZE << BYTE_SHIFT) - 1) {
-		free_page++;
-		if (free_page >= NCACHED) {
-			(void)write(STDERR_FILENO, OVMSG, sizeof(OVMSG) - 1);
-			return (0);
-		}
-		/*
-		 * This is tricky.  The 1 indicates that you want the new page
-		 * allocated with 1 clear bit.  Actually, you are going to
-		 * allocate 2 pages from this map.  The first is going to be
-		 * the map page, the second is the overflow page we were
-		 * looking for.  The init_bitmap routine automatically, sets
-		 * the first bit of itself to indicate that the bitmap itself
-		 * is in use.  We would explicitly set the second bit, but
-		 * don't have to if we tell init_bitmap not to leave it clear
-		 * in the first place.
-		 */
-		if (__ibitmap(hashp,
-		    (int)OADDR_OF(splitnum, offset), 1, free_page))
-			return (0);
-		hashp->SPARES[splitnum]++;
-#ifdef DEBUG2
-		free_bit = 2;
-#endif
-		offset++;
-		if (offset > SPLITMASK) {
-			if (++splitnum >= NCACHED) {
-				(void)write(STDERR_FILENO, OVMSG,
-				    sizeof(OVMSG) - 1);
-				return (0);
-			}
-			hashp->OVFL_POINT = splitnum;
-			hashp->SPARES[splitnum] = hashp->SPARES[splitnum-1];
-			hashp->SPARES[splitnum-1]--;
-			offset = 0;
-		}
-	} else {
-		/*
-		 * Free_bit addresses the last used bit.  Bump it to address
-		 * the first available bit.
-		 */
-		free_bit++;
-		SETBIT(freep, free_bit);
-	}
-
-	/* Calculate address of the new overflow page */
-	addr = OADDR_OF(splitnum, offset);
-#ifdef DEBUG2
-	(void)fprintf(stderr, "OVERFLOW_PAGE: ADDR: %d BIT: %d PAGE %d\n",
-	    addr, free_bit, free_page);
-#endif
-	return (addr);
-
-found:
-	bit = bit + first_free(freep[j]);
-	SETBIT(freep, bit);
-#ifdef DEBUG2
-	tmp1 = bit;
-	tmp2 = i;
-#endif
-	/*
-	 * Bits are addressed starting with 0, but overflow pages are addressed
-	 * beginning at 1. Bit is a bit addressnumber, so we need to increment
-	 * it to convert it to a page number.
-	 */
-	bit = 1 + bit + (i * (hashp->BSIZE << BYTE_SHIFT));
-	if (bit >= hashp->LAST_FREED)
-		hashp->LAST_FREED = bit - 1;
-
-	/* Calculate the split number for this page */
-	for (i = 0; (i < splitnum) && (bit > hashp->SPARES[i]); i++);
-	offset = (i ? bit - hashp->SPARES[i - 1] : bit);
-	if (offset >= SPLITMASK)
-		return (0);	/* Out of overflow pages */
-	addr = OADDR_OF(i, offset);
-#ifdef DEBUG2
-	(void)fprintf(stderr, "OVERFLOW_PAGE: ADDR: %d BIT: %d PAGE %d\n",
-	    addr, tmp1, tmp2);
-#endif
-
-	/* Allocate and return the overflow page */
-	return (addr);
-}
-
-/*
- * Mark this overflow page as free.
- */
-extern void
-__free_ovflpage(hashp, obufp)
-	HTAB *hashp;
-	BUFHEAD *obufp;
-{
-	__uint16_t addr;
-	__uint32_t *freep;
-	int bit_address, free_page, free_bit;
-	__uint16_t ndx;
-
-	addr = obufp->addr;
-#ifdef DEBUG1
-	(void)fprintf(stderr, "Freeing %d\n", addr);
-#endif
-	ndx = (((__uint16_t)addr) >> SPLITSHIFT);
-	bit_address =
-	    (ndx ? hashp->SPARES[ndx - 1] : 0) + (addr & SPLITMASK) - 1;
-	 if (bit_address < hashp->LAST_FREED)
-		hashp->LAST_FREED = bit_address;
-	free_page = (bit_address >> (hashp->BSHIFT + BYTE_SHIFT));
-	free_bit = bit_address & ((hashp->BSIZE << BYTE_SHIFT) - 1);
-
-	if (!(freep = hashp->mapp[free_page]))
-		freep = fetch_bitmap(hashp, free_page);
-#ifdef DEBUG
-	/*
-	 * This had better never happen.  It means we tried to read a bitmap
-	 * that has already had overflow pages allocated off it, and we
-	 * failed to read it from the file.
-	 */
-	if (!freep)
-		assert(0);
-#endif
-	CLRBIT(freep, free_bit);
-#ifdef DEBUG2
-	(void)fprintf(stderr, "FREE_OVFLPAGE: ADDR: %d BIT: %d PAGE %d\n",
-	    obufp->addr, free_bit, free_page);
-#endif
-	__reclaim_buf(hashp, obufp);
-}
-
-/*
- * Returns:
- *	 0 success
- *	-1 failure
- */
-static int
-open_temp(hashp)
-	HTAB *hashp;
-{
-	sigset_t set, oset;
-	static char namestr[] = "_hashXXXXXX";
-
-	/* Block signals; make sure file goes away at process exit. */
-	(void)sigfillset(&set);
-	(void)sigprocmask(SIG_BLOCK, &set, &oset);
-	if ((hashp->fp = mkstemp(namestr)) != -1) {
-		(void)unlink(namestr);
-#ifdef HAVE_FCNTL
-		(void)fcntl(hashp->fp, F_SETFD, 1);
-#endif
-	}
-	(void)sigprocmask(SIG_SETMASK, &oset, (sigset_t *)NULL);
-	return (hashp->fp != -1 ? 0 : -1);
-}
-
-/*
- * We have to know that the key will fit, but the last entry on the page is
- * an overflow pair, so we need to shift things.
- */
-static void
-squeeze_key(sp, key, val)
-	__uint16_t *sp;
-	const DBT *key, *val;
-{
-	char *p;
-	__uint16_t free_space, n, off, pageno;
-
-	p = (char *)sp;
-	n = sp[0];
-	free_space = FREESPACE(sp);
-	off = OFFSET(sp);
-
-	pageno = sp[n - 1];
-	off -= key->size;
-	sp[n - 1] = off;
-	memmove(p + off, key->data, key->size);
-	off -= val->size;
-	sp[n] = off;
-	memmove(p + off, val->data, val->size);
-	sp[0] = n + 2;
-	sp[n + 1] = pageno;
-	sp[n + 2] = OVFLPAGE;
-	FREESPACE(sp) = free_space - PAIRSIZE(key, val);
-	OFFSET(sp) = off;
-}
-
-static __uint32_t *
-fetch_bitmap(hashp, ndx)
-	HTAB *hashp;
-	int ndx;
-{
-	if (ndx >= hashp->nmaps)
-		return (NULL);
-	if ((hashp->mapp[ndx] = (__uint32_t *)malloc(hashp->BSIZE)) == NULL)
-		return (NULL);
-	if (__get_page(hashp,
-	    (char *)hashp->mapp[ndx], hashp->BITMAPS[ndx], 0, 1, 1)) {
-		free(hashp->mapp[ndx]);
-		return (NULL);
-	}
-	return (hashp->mapp[ndx]);
-}
-
-#ifdef DEBUG4
-int
-print_chain(addr)
-	int addr;
-{
-	BUFHEAD *bufp;
-	short *bp, oaddr;
-
-	(void)fprintf(stderr, "%d ", addr);
-	bufp = __get_buf(hashp, addr, NULL, 0);
-	bp = (short *)bufp->page;
-	while (bp[0] && ((bp[bp[0]] == OVFLPAGE) ||
-		((bp[0] > 2) && bp[2] < REAL_KEY))) {
-		oaddr = bp[bp[0] - 1];
-		(void)fprintf(stderr, "%d ", (int)oaddr);
-		bufp = __get_buf(hashp, (int)oaddr, bufp, 0);
-		bp = (short *)bufp->page;
-	}
-	(void)fprintf(stderr, "\n");
-}
-#endif
diff --git a/newlib/libc/search/hcreate.3 b/newlib/libc/search/hcreate.3
deleted file mode 100644
index 1619c98..0000000
--- a/newlib/libc/search/hcreate.3
+++ /dev/null
@@ -1,206 +0,0 @@
-.\" $FreeBSD: src/lib/libc/stdlib/hcreate.3,v 1.2 2001/07/09 15:54:36 ru Exp $
-.\"
-.Dd May 8, 2001
-.Os
-.Dt HCREATE 3
-.Sh NAME
-.Nm hcreate , hdestroy , hsearch
-.Nd manage hash search table
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In search.h
-.Ft int
-.Fn hcreate "size_t nel"
-.Ft void
-.Fn hdestroy void
-.Ft ENTRY *
-.Fn hsearch "ENTRY item" "ACTION action"
-.Sh DESCRIPTION
-The
-.Fn hcreate ,
-.Fn hdestroy ,
-and
-.Fn hsearch
-functions manage hash search tables.
-.Pp
-The
-.Fn hcreate
-function allocates sufficient space for the table, and the application should
-ensure it is called before
-.Fn hsearch
-is used.
-The
-.Fa nel
-argument is an estimate of the maximum
-number of entries that the table should contain.
-This number may be adjusted upward by the
-algorithm in order to obtain certain mathematically favorable circumstances.
-.Pp
-The
-.Fn hdestroy
-function disposes of the search table, and may be followed by another call to
-.Fn hcreate .
-After the call to
-.Fn hdestroy ,
-the data can no longer be considered accessible.
-.Pp
-The
-.Fn hsearch
-function is a hash-table search routine.
-It returns a pointer into a hash table
-indicating the location at which an entry can be found.
-The
-.Fa item
-argument is a structure of type
-.Vt ENTRY
-(defined in the
-.Aq Pa search.h
-header) containing two pointers:
-.Fa item.key
-points to the comparison key (a
-.Vt "char *" ) ,
-and
-.Fa item.data
-(a
-.Vt "void *" )
-points to any other data to be associated with
-that key.
-The comparison function used by
-.Fn hsearch
-is
-.Xr strcmp 3 .
-The
-.Fa action
-argument is a
-member of an enumeration type
-.Vt ACTION
-indicating the disposition of the entry if it cannot be
-found in the table.
-.Dv ENTER
-indicates that the
-.Fa item
-should be inserted in the table at an
-appropriate point.
-.Dv FIND
-indicates that no entry should be made.
-Unsuccessful resolution is
-indicated by the return of a
-.Dv NULL
-pointer.
-.Sh RETURN VALUES
-The
-.Fn hcreate
-function returns 0 if it cannot allocate sufficient space for the table;
-otherwise, it returns non-zero.
-.Pp
-The
-.Fn hdestroy
-function does not return a value.
-.Pp
-The
-.Fn hsearch
-function returns a
-.Dv NULL
-pointer if either the
-.Fa action
-is
-.Dv FIND
-and the
-.Fa item
-could not be found or the
-.Fa action
-is
-.Dv ENTER
-and the table is full.
-.Sh ERRORS
-The
-.Fn hcreate
-and
-.Fn hsearch
-functions may fail if:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient storage space is available.
-.El
-.Sh EXAMPLES
-The following example reads in strings followed by two numbers
-and stores them in a hash table, discarding duplicates.
-It then reads in strings and finds the matching entry in the hash
-table and prints it out.
-.Bd -literal
-#include <stdio.h>
-#include <search.h>
-#include <string.h>
-
-struct info {			/* This is the info stored in the table */
-	int age, room;		/* other than the key. */
-};
-
-#define NUM_EMPL	5000	/* # of elements in search table. */
-
-int
-main(void)
-{
-	char string_space[NUM_EMPL*20]; /* Space to store strings. */
-	struct info info_space[NUM_EMPL]; /* Space to store employee info. */
-	char *str_ptr = string_space; /* Next space in string_space. */
-	struct info *info_ptr = info_space; /* Next space in info_space. */
-	ENTRY item;
-	ENTRY *found_item; /* Name to look for in table. */
-	char name_to_find[30];
-	int i = 0;
-
-	/* Create table; no error checking is performed. */
-	(void) hcreate(NUM_EMPL);
-
-	while (scanf("%s%d%d", str_ptr, &info_ptr->age,
-	    &info_ptr->room) != EOF && i++ < NUM_EMPL) {
-		/* Put information in structure, and structure in item. */
-		item.key = str_ptr;
-		item.data = info_ptr;
-		str_ptr += strlen(str_ptr) + 1;
-		info_ptr++;
-		/* Put item into table. */
-		(void) hsearch(item, ENTER);
-	}
-
-	/* Access table. */
-	item.key = name_to_find;
-	while (scanf("%s", item.key) != EOF) {
-		if ((found_item = hsearch(item, FIND)) != NULL) {
-			/* If item is in the table. */
-			(void)printf("found %s, age = %d, room = %d\en",
-			    found_item->key,
-			    ((struct info *)found_item->data)->age,
-			    ((struct info *)found_item->data)->room);
-		} else
-			(void)printf("no such employee %s\en", name_to_find);
-	}
-	return 0;
-}
-.Ed
-.Sh SEE ALSO
-.Xr bsearch 3 ,
-.Xr lsearch 3 ,
-.Xr malloc 3 ,
-.Xr strcmp 3 ,
-.Xr tsearch 3
-.Sh STANDARDS
-The
-.Fn hcreate ,
-.Fn hdestroy ,
-and
-.Fn hsearch
-functions conform to
-.St -xpg4.2 .
-.Sh HISTORY
-The
-.Fn hcreate ,
-.Fn hdestroy ,
-and
-.Fn hsearch
-functions first appeared in
-.At V .
-.Sh BUGS
-The interface permits the use of only one hash table at a time.
diff --git a/newlib/libc/search/hcreate.c b/newlib/libc/search/hcreate.c
deleted file mode 100644
index 095e1f2..0000000
--- a/newlib/libc/search/hcreate.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* $NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $ */
-
-/*
- * Copyright (c) 2001 Christopher G. Demetriou
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
- */
-
-/*
- * hcreate() / hsearch() / hdestroy()
- *
- * SysV/XPG4 hash table functions.
- *
- * Implementation done based on NetBSD manual page and Solaris manual page,
- * plus my own personal experience about how they're supposed to work.
- *
- * I tried to look at Knuth (as cited by the Solaris manual page), but
- * nobody had a copy in the office, so...
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <errno.h>
-#include <search.h>
-#include <stdlib.h>
-#include <string.h>
-
-static struct hsearch_data htab;
-
-int
-_DEFUN(hcreate, (nel), size_t nel)
-{
-  return hcreate_r (nel, &htab);
-}
-
-void
-_DEFUN_VOID (hdestroy)
-{
-  hdestroy_r (&htab);
-}
-
-ENTRY *
-_DEFUN(hsearch, (item, action), 
-       ENTRY item _AND
-       ACTION action)
-{
-  ENTRY *retval;
-
-  hsearch_r (item, action, &retval, &htab);
-
-  return retval;
-}
diff --git a/newlib/libc/search/hcreate_r.c b/newlib/libc/search/hcreate_r.c
deleted file mode 100644
index 4ff758f..0000000
--- a/newlib/libc/search/hcreate_r.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* $NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $ */
-
-/*
- * Copyright (c) 2001 Christopher G. Demetriou
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
- */
-
-/*
- * hcreate() / hsearch() / hdestroy()
- *
- * SysV/XPG4 hash table functions.
- *
- * Implementation done based on NetBSD manual page and Solaris manual page,
- * plus my own personal experience about how they're supposed to work.
- *
- * I tried to look at Knuth (as cited by the Solaris manual page), but
- * nobody had a copy in the office, so...
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <errno.h>
-#include <search.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * DO NOT MAKE THIS STRUCTURE LARGER THAN 32 BYTES (4 ptrs on 64-bit
- * ptr machine) without adjusting MAX_BUCKETS_LG2 below.
- */
-struct internal_entry {
-	SLIST_ENTRY(internal_entry) link;
-	ENTRY ent;
-};
-SLIST_HEAD(internal_head, internal_entry);
-
-#define	MIN_BUCKETS_LG2	4
-#define	MIN_BUCKETS	(1 << MIN_BUCKETS_LG2)
-
-/*
- * max * sizeof internal_entry must fit into size_t.
- * assumes internal_entry is <= 32 (2^5) bytes.
- */
-#define	MAX_BUCKETS_LG2	(sizeof (size_t) * 8 - 1 - 5)
-#define	MAX_BUCKETS	((size_t)1 << MAX_BUCKETS_LG2)
-
-/* Default hash function, from db/hash/hash_func.c */
-extern __uint32_t (*__default_hash)(const void *, size_t);
-
-int
-hcreate_r(size_t nel, struct hsearch_data *htab)
-{
-	size_t idx;
-	unsigned int p2;
-
-	/* Make sure this this isn't called when a table already exists. */
-	if (htab->htable != NULL) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	/* If nel is too small, make it min sized. */
-	if (nel < MIN_BUCKETS)
-		nel = MIN_BUCKETS;
-
-	/* If it's too large, cap it. */
-	if (nel > MAX_BUCKETS)
-		nel = MAX_BUCKETS;
-
-	/* If it's is not a power of two in size, round up. */
-	if ((nel & (nel - 1)) != 0) {
-		for (p2 = 0; nel != 0; p2++)
-			nel >>= 1;
-		nel = 1 << p2;
-	}
-	
-	/* Allocate the table. */
-	htab->htablesize = nel;
-	htab->htable = malloc(htab->htablesize * sizeof htab->htable[0]);
-	if (htab->htable == NULL) {
-		errno = ENOMEM;
-		return 0;
-	}
-
-	/* Initialize it. */
-	for (idx = 0; idx < htab->htablesize; idx++)
-		SLIST_INIT(&(htab->htable[idx]));
-
-	return 1;
-}
-
-void
-hdestroy_r(struct hsearch_data *htab)
-{
-	struct internal_entry *ie;
-	size_t idx;
-
-	if (htab->htable == NULL)
-		return;
-
-#if 0
-	for (idx = 0; idx < htab->htablesize; idx++) {
-		while (!SLIST_EMPTY(&(htab->htable[idx]))) {
-			ie = SLIST_FIRST(&(htab->htable[idx]));
-			SLIST_REMOVE_HEAD(&(htab->htable[idx]), link);
-                        free(ie->ent.key);
-			free(ie);
-		}
-	}
-#endif
-	free(htab->htable);
-	htab->htable = NULL;
-}
-
-int
-hsearch_r(ENTRY item, ACTION action, ENTRY **retval, struct hsearch_data *htab)
-{
-	struct internal_head *head;
-	struct internal_entry *ie;
-	__uint32_t hashval;
-	size_t len;
-
-	len = strlen(item.key);
-	hashval = (*__default_hash)(item.key, len);
-
-        head = &(htab->htable[hashval & (htab->htablesize - 1)]);
-	ie = SLIST_FIRST(head);
-	while (ie != NULL) {
-		if (strcmp(ie->ent.key, item.key) == 0)
-			break;
-		ie = SLIST_NEXT(ie, link);
-	}
-
-	if (ie != NULL)
-          {
-            *retval = &ie->ent;
-            return 1;
-          }
-	else if (action == FIND)
-          {
-            *retval = NULL;
-            return 0;
-          }
-
-	ie = malloc(sizeof *ie);
-	if (ie == NULL)
-          {
-            *retval = NULL;
-            return 0;
-          }
-	ie->ent.key = item.key;
-	ie->ent.data = item.data;
-
-	SLIST_INSERT_HEAD(head, ie, link);
-        *retval = &ie->ent;
-	return 1;
-}
diff --git a/newlib/libc/search/page.h b/newlib/libc/search/page.h
deleted file mode 100644
index 9ecabda..0000000
--- a/newlib/libc/search/page.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)page.h	8.2 (Berkeley) 5/31/94
- * $FreeBSD: src/lib/libc/db/hash/page.h,v 1.2 2002/03/22 23:41:40 obrien Exp $
- */
-
-/*
- * Definitions for hashing page file format.
- */
-
-/*
- * routines dealing with a data page
- *
- * page format:
- *	+------------------------------+
- * p	| n | keyoff | datoff | keyoff |
- * 	+------------+--------+--------+
- *	| datoff | free  |  ptr  | --> |
- *	+--------+---------------------+
- *	|	 F R E E A R E A       |
- *	+--------------+---------------+
- *	|  <---- - - - | data          |
- *	+--------+-----+----+----------+
- *	|  key   | data     | key      |
- *	+--------+----------+----------+
- *
- * Pointer to the free space is always:  p[p[0] + 2]
- * Amount of free space on the page is:  p[p[0] + 1]
- */
-
-/*
- * How many bytes required for this pair?
- *	2 shorts in the table at the top of the page + room for the
- *	key and room for the data
- *
- * We prohibit entering a pair on a page unless there is also room to append
- * an overflow page. The reason for this it that you can get in a situation
- * where a single key/data pair fits on a page, but you can't append an
- * overflow page and later you'd have to split the key/data and handle like
- * a big pair.
- * You might as well do this up front.
- */
-
-#define	PAIRSIZE(K,D)	(2*sizeof(__uint16_t) + (K)->size + (D)->size)
-#define BIGOVERHEAD	(4*sizeof(__uint16_t))
-#define KEYSIZE(K)	(4*sizeof(__uint16_t) + (K)->size);
-#define OVFLSIZE	(2*sizeof(__uint16_t))
-#define FREESPACE(P)	((P)[(P)[0]+1])
-#define	OFFSET(P)	((P)[(P)[0]+2])
-#define PAIRFITS(P,K,D) \
-	(((P)[2] >= REAL_KEY) && \
-	    (PAIRSIZE((K),(D)) + OVFLSIZE) <= FREESPACE((P)))
-#define PAGE_META(N)	(((N)+3) * sizeof(__uint16_t))
-
-typedef struct {
-	BUFHEAD *newp;
-	BUFHEAD *oldp;
-	BUFHEAD *nextp;
-	__uint16_t next_addr;
-}       SPLIT_RETURN;
diff --git a/newlib/libc/search/tdelete.c b/newlib/libc/search/tdelete.c
deleted file mode 100644
index e756599..0000000
--- a/newlib/libc/search/tdelete.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <assert.h>
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-
-/* delete node with given key */
-void *
-_DEFUN(tdelete, (vkey, vrootp, compar),
-	const void *vkey _AND	/* key to be deleted */
-	void      **vrootp _AND	/* address of the root of tree */
-	int       (*compar)(const void *, const void *))
-{
-	node_t **rootp = (node_t **)vrootp;
-	node_t *p, *q, *r;
-	int  cmp;
-
-	if (rootp == NULL || (p = *rootp) == NULL)
-		return NULL;
-
-	while ((cmp = (*compar)(vkey, (*rootp)->key)) != 0) {
-		p = *rootp;
-		rootp = (cmp < 0) ?
-		    &(*rootp)->llink :		/* follow llink branch */
-		    &(*rootp)->rlink;		/* follow rlink branch */
-		if (*rootp == NULL)
-			return NULL;		/* key not found */
-	}
-	r = (*rootp)->rlink;			/* D1: */
-	if ((q = (*rootp)->llink) == NULL)	/* Left NULL? */
-		q = r;
-	else if (r != NULL) {			/* Right link is NULL? */
-		if (r->llink == NULL) {		/* D2: Find successor */
-			r->llink = q;
-			q = r;
-		} else {			/* D3: Find NULL link */
-			for (q = r->llink; q->llink != NULL; q = r->llink)
-				r = q;
-			r->llink = q->rlink;
-			q->llink = (*rootp)->llink;
-			q->rlink = (*rootp)->rlink;
-		}
-	}
-	free(*rootp);				/* D4: Free node */
-	*rootp = q;				/* link parent to new node */
-	return p;
-}
diff --git a/newlib/libc/search/tdestroy.c b/newlib/libc/search/tdestroy.c
deleted file mode 100644
index 3e7327c..0000000
--- a/newlib/libc/search/tdestroy.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <assert.h>
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-
-/* Walk the nodes of a tree */
-static void
-trecurse(root, free_action)
-	node_t *root;	/* Root of the tree to be walked */
-	void (*free_action)(void *);
-{
-  if (root->llink != NULL)
-    trecurse(root->llink, free_action);
-  if (root->rlink != NULL)
-    trecurse(root->rlink, free_action);
-
-  (*free_action) ((void *) root->key);
-  free(root);
-}
-
-void
-_DEFUN(tdestroy, (vrootp, freefct),
-       void *vrootp _AND
-       void (*freefct)(void *))
-{
-  node_t *root = (node_t *) vrootp;
-
-  if (root != NULL)
-    trecurse(root, freefct);
-}
diff --git a/newlib/libc/search/tfind.c b/newlib/libc/search/tfind.c
deleted file mode 100644
index 5d7c40c..0000000
--- a/newlib/libc/search/tfind.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <assert.h>
-#define _SEARCH_PRIVATE
-#include <stdlib.h>
-#include <search.h>
-
-/* find a node, or return 0 */
-void *
-_DEFUN(tfind, (vkey, vrootp, compar),
-	const void *vkey _AND		/* key to be found */
-	void **vrootp _AND		/* address of the tree root */
-	int (*compar)(const void *, const void *))
-{
-	node_t **rootp = (node_t **)vrootp;
-
-	if (rootp == NULL)
-		return NULL;
-
-	while (*rootp != NULL) {		/* T1: */
-		int r;
-
-		if ((r = (*compar)(vkey, (*rootp)->key)) == 0)	/* T2: */
-			return *rootp;		/* key found */
-		rootp = (r < 0) ?
-		    &(*rootp)->llink :		/* T3: follow left branch */
-		    &(*rootp)->rlink;		/* T4: follow right branch */
-	}
-	return NULL;
-}
diff --git a/newlib/libc/search/tsearch.3 b/newlib/libc/search/tsearch.3
deleted file mode 100644
index a36fe89..0000000
--- a/newlib/libc/search/tsearch.3
+++ /dev/null
@@ -1,118 +0,0 @@
-.\" $NetBSD$
-.\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-.\" THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-.\" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-.\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-.\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"	OpenBSD: tsearch.3,v 1.2 1998/06/21 22:13:49 millert Exp
-.\" $FreeBSD: src/lib/libc/stdlib/tsearch.3,v 1.7 2001/09/07 14:46:36 asmodai Exp $
-.\"
-.Dd June 15, 1997
-.Dt TSEARCH 3
-.Os
-.Sh NAME
-.Nm tsearch , tfind , tdelete , twalk
-.Nd manipulate binary search trees
-.Sh SYNOPSIS
-.In search.h
-.Ft void *
-.Fn tdelete "const void *key" "void **rootp" "int (*compar) (const void *, const void *)"
-.Ft void *
-.Fn tfind "const void *key" "void **rootp" "int (*compar) (const void *, const void *)"
-.Ft void *
-.Fn tsearch "const void *key" "void **rootp" "int (*compar) (const void *, const void *)"
-.Ft void
-.Fn twalk "const void *root" "void (*compar) (const void *, VISIT, int)"
-.Sh DESCRIPTION
-The
-.Fn tdelete ,
-.Fn tfind ,
-.Fn tsearch ,
-and
-.Fn twalk
-functions manage binary search trees based on algorithms T and D
-from Knuth (6.2.2).  The comparison function passed in by
-the user has the same style of return values as
-.Xr strcmp 3 .
-.Pp
-.Fn Tfind
-searches for the datum matched by the argument
-.Fa key
-in the binary tree rooted at
-.Fa rootp ,
-returning a pointer to the datum if it is found and NULL
-if it is not.
-.Pp
-.Fn Tsearch
-is identical to
-.Fn tfind
-except that if no match is found,
-.Fa key
-is inserted into the tree and a pointer to it is returned.  If
-.Fa rootp
-points to a NULL value a new binary search tree is created.
-.Pp
-.Fn Tdelete
-deletes a node from the specified binary search tree and returns
-a pointer to the parent of the node to be deleted.
-It takes the same arguments as
-.Fn tfind
-and
-.Fn tsearch .
-If the node to be deleted is the root of the binary search tree,
-.Fa rootp
-will be adjusted.
-.Pp
-.Fn Twalk
-walks the binary search tree rooted in
-.Fa root
-and calls the function
-.Fa action
-on each node.
-.Fa Action
-is called with three arguments: a pointer to the current node,
-a value from the enum
-.Sy "typedef enum { preorder, postorder, endorder, leaf } VISIT;"
-specifying the traversal type, and a node level (where level
-zero is the root of the tree).
-.Sh SEE ALSO
-.Xr bsearch 3 ,
-.Xr hsearch 3 ,
-.Xr lsearch 3
-.Sh RETURN VALUES
-The
-.Fn tsearch
-function returns NULL if allocation of a new node fails (usually
-due to a lack of free memory).
-.Pp
-.Fn Tfind ,
-.Fn tsearch ,
-and
-.Fn tdelete
-return NULL if
-.Fa rootp
-is NULL or the datum cannot be found.
-.Pp
-The
-.Fn twalk
-function returns no value.
diff --git a/newlib/libc/search/tsearch.c b/newlib/libc/search/tsearch.c
deleted file mode 100644
index 5f41b40..0000000
--- a/newlib/libc/search/tsearch.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <assert.h>
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-/* find or insert datum into search tree */
-void *
-_DEFUN(tsearch, (vkey, vrootp, compar),
-	const void *vkey _AND		/* key to be located */
-	void **vrootp _AND		/* address of tree root */
-	int (*compar)(const void *, const void *))
-{
-	node_t *q;
-	node_t **rootp = (node_t **)vrootp;
-
-	if (rootp == NULL)
-		return NULL;
-
-	while (*rootp != NULL) {	/* Knuth's T1: */
-		int r;
-
-		if ((r = (*compar)(vkey, (*rootp)->key)) == 0)	/* T2: */
-			return *rootp;		/* we found it! */
-
-		rootp = (r < 0) ?
-		    &(*rootp)->llink :		/* T3: follow left branch */
-		    &(*rootp)->rlink;		/* T4: follow right branch */
-	}
-
-	q = malloc(sizeof(node_t));		/* T5: key not found */
-	if (q != 0) {				/* make new node */
-		*rootp = q;			/* link new node to old */
-		/* LINTED const castaway ok */
-		q->key = (void *)vkey;		/* initialize new node */
-		q->llink = q->rlink = NULL;
-	}
-	return q;
-}
diff --git a/newlib/libc/search/twalk.c b/newlib/libc/search/twalk.c
deleted file mode 100644
index 74ad5a6..0000000
--- a/newlib/libc/search/twalk.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: twalk.c,v 1.1 1999/02/22 10:33:16 christos Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: twalk.c,v 1.1 1999/02/22 10:33:16 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <assert.h>
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-static void trecurse(const node_t *,
-    void (*action)(const void *, VISIT, int), int level);
-
-/* Walk the nodes of a tree */
-static void
-trecurse(root, action, level)
-	const node_t *root;	/* Root of the tree to be walked */
-	void (*action)(const void *, VISIT, int);
-	int level;
-{
-
-	if (root->llink == NULL && root->rlink == NULL)
-		(*action)(root, leaf, level);
-	else {
-		(*action)(root, preorder, level);
-		if (root->llink != NULL)
-			trecurse(root->llink, action, level + 1);
-		(*action)(root, postorder, level);
-		if (root->rlink != NULL)
-			trecurse(root->rlink, action, level + 1);
-		(*action)(root, endorder, level);
-	}
-}
-
-/* Walk the nodes of a tree */
-void
-_DEFUN(twalk, (vroot, action),
-	const void *vroot _AND	/* Root of the tree to be walked */
-	void (*action)(const void *, VISIT, int))
-{
-	if (vroot != NULL && action != NULL)
-		trecurse(vroot, action, 0);
-}
diff --git a/newlib/libc/signal/Makefile.in b/newlib/libc/signal/Makefile.in
index badc21c..e1613eb 100644
--- a/newlib/libc/signal/Makefile.in
+++ b/newlib/libc/signal/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -114,12 +99,12 @@ LIB_SOURCES = raise.c signal.c
 
 libsignal_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libsignal.la
-@USE_LIBTOOL_TRUE@libsignal_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libsignal.la
+@USE_LIBTOOL_TRUE@libsignal_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
 
 CHEWOUT_FILES = raise.def signal.def
 
@@ -139,7 +124,7 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  raise.$(OBJEXT) signal.$(OBJEXT)
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  raise.o signal.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libsignal_la_LIBADD = 
@@ -163,7 +148,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libsignal_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus signal/Makefile
 
@@ -184,11 +169,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -197,7 +177,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libc/signal/signal.c b/newlib/libc/signal/signal.c
index bfb85e6..df005f1 100644
--- a/newlib/libc/signal/signal.c
+++ b/newlib/libc/signal/signal.c
@@ -6,12 +6,21 @@ INDEX
 	signal
 INDEX
 	_signal_r
+INDEX
+	raise
+INDEX
+	_raise_r
 
 ANSI_SYNOPSIS
 	#include <signal.h>
-	void (*signal(int <[sig]>, void(*<[func]>)(int))) (int);
+	void ( * signal(int <[sig]>, void(*<[func]>)(int)) )(int);
+
+	void ( * _signal_r(void *<[reent]>, 
+                           int <[sig]>, void(*<[func]>)(int)) )(int);
 
-	void (*_signal_r(void *<[reent]>, int <[sig]>, void(*<[func]>)(int))) (int);
+	int raise (int <[sig]>);
+
+	int _raise_r (void *<[reent]>, int <[sig]>);
 
 TRAD_SYNOPSIS
 	#include <signal.h>
@@ -24,8 +33,15 @@ TRAD_SYNOPSIS
 	int <[sig]>;
 	char ( * <[func]> )();
 
+	int raise (<[sig]>)()
+	int <[sig]>;
+
+	int _raise_r (<[reent]>, <[sig]>)()
+	char *<[reent]>;
+	int <[sig]>;
+
 DESCRIPTION
-<<signal>> provides a simple signal-handling implementation for embedded
+<<signal, raise>> provide a simple signal/raise implementation for embedded
 targets.
 
 <<signal>> allows you to request changed treatment for a particular
@@ -36,7 +52,7 @@ that identifies a subroutine in your program as the handler for this signal.
 
 Some of the execution environment for signal handlers is
 unpredictable; notably, the only library function required to work
-correctly from within a signal handler is <<signal>> itself, and
+correctly from within a signal handler is @code{signal} itself, and
 only when used to redefine the handler for the current signal value.
 
 Static storage is likewise unreliable for signal handlers, with one
@@ -50,9 +66,13 @@ where it was when the signal was raised (whether by your program
 itself, or by an external event).  Signal handlers can also
 use functions such as <<exit>> and <<abort>> to avoid returning.
 
-The alternate function <<_signal_r>> is the reentrant version.
+<<raise>> sends the signal sig to the executing program.  It returns zero if
+successful, non-zero if unsuccessful.
+
+The alternate functions <<_signal_r, _raise_r>> are the reentrant versions.
 The extra argument <[reent]> is a pointer to a reentrancy structure.
 
+
 @c FIXME: do we have setjmp.h and assoc fns?
 
 RETURNS
@@ -63,7 +83,7 @@ Otherwise, the result is the previous handler (a function pointer or
 one of the predefined macros).
 
 PORTABILITY
-ANSI C requires <<signal>>.
+ANSI C requires <<raise>>, <<signal>>.
 
 No supporting OS subroutines are required to link with <<signal>>, but
 it will not have any useful effects, except for software generated signals,
@@ -142,9 +162,9 @@ _DEFUN (_signal_r, (ptr, sig, func),
 }
 
 int 
-_DEFUN (_raise_r, (ptr, sig),
-     struct _reent *ptr _AND
-     int sig)
+_raise_r (ptr, sig)
+     struct _reent *ptr;
+     int sig;
 {
   _sig_func_ptr func;
 
@@ -176,9 +196,9 @@ _DEFUN (_raise_r, (ptr, sig),
 }
 
 int
-_DEFUN (__sigtramp_r, (ptr, sig),
-     struct _reent *ptr _AND
-     int sig)
+__sigtramp_r (ptr, sig)
+     struct _reent *ptr;
+     int sig;
 {
   _sig_func_ptr func;
 
@@ -208,8 +228,8 @@ _DEFUN (__sigtramp_r, (ptr, sig),
 #ifndef _REENT_ONLY
 
 int 
-_DEFUN (raise, (sig),
-     int sig)
+raise (sig)
+     int sig;
 {
   return _raise_r (_REENT, sig);
 }
@@ -223,13 +243,13 @@ _DEFUN (signal, (sig, func),
 }
 
 int 
-_DEFUN_VOID (_init_signal)
+_init_signal ()
 {
   return _init_signal_r (_REENT);
 }
 
 int
-_DEFUN (__sigtramp, (sig), int sig)
+__sigtramp (int sig)
 {
   return __sigtramp_r (_REENT, sig);
 }
diff --git a/newlib/libc/stdio/Makefile.am b/newlib/libc/stdio/Makefile.am
index 1ae643f..8010c72 100644
--- a/newlib/libc/stdio/Makefile.am
+++ b/newlib/libc/stdio/Makefile.am
@@ -4,9 +4,8 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES = \
+LIB_SOURCES = \
 	clearerr.c 			\
-	dprintf.c			\
 	fclose.c 			\
 	fdopen.c 			\
 	feof.c 				\
@@ -26,7 +25,6 @@ GENERAL_SOURCES = \
 	fread.c 			\
 	freopen.c 			\
 	fscanf.c 			\
-	fiscanf.c 			\
 	fseek.c 			\
 	fsetpos.c 			\
 	ftell.c 			\
@@ -35,35 +33,26 @@ GENERAL_SOURCES = \
 	fwrite.c 			\
 	getc.c 				\
 	getchar.c 			\
-	getc_u.c			\
-	getchar_u.c			\
-	getdelim.c			\
-	getline.c			\
 	gets.c 				\
+	getw.c				\
 	iprintf.c 			\
-	iscanf.c 			\
 	makebuf.c			\
+	mktemp.c 			\
 	perror.c 			\
 	printf.c 			\
 	putc.c 				\
 	putchar.c 			\
-	putc_u.c			\
-	putchar_u.c			\
 	puts.c 				\
+	putw.c				\
 	refill.c 			\
 	remove.c 			\
 	rename.c 			\
 	rewind.c 			\
 	rget.c 				\
 	scanf.c 			\
-	sccl.c	 			\
 	setbuf.c 			\
-	setbuffer.c 			\
-	setlinebuf.c 			\
 	setvbuf.c 			\
 	siprintf.c 			\
-	siscanf.c 			\
-	sniprintf.c			\
 	snprintf.c			\
 	sprintf.c 			\
 	sscanf.c 			\
@@ -71,53 +60,29 @@ GENERAL_SOURCES = \
 	tmpfile.c 			\
 	tmpnam.c 			\
 	ungetc.c 			\
-	vdprintf.c			\
-	viprintf.c 			\
-	viscanf.c			\
+	vfscanf.c 			\
 	vprintf.c 			\
 	vscanf.c			\
-	vsiprintf.c 			\
-	vsiscanf.c			\
 	vsnprintf.c			\
-	vsniprintf.c			\
 	vsprintf.c 			\
 	vsscanf.c			\
 	wbuf.c 				\
 	wsetup.c 
 
-## The following are EL/IX level 2 interfaces
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-LIB_OBJS = \
-	asiprintf.$(oext)		\
-	asprintf.$(oext)		\
-	fcloseall.$(oext)		\
-	fseeko.$(oext) 			\
-	ftello.$(oext) 			\
-	getw.$(oext)			\
-	mktemp.$(oext) 			\
-	putw.$(oext) 			\
-	vasiprintf.$(oext)		\
-	vasprintf.$(oext)
-endif
-
-LIBADD_OBJS = vfiprintf.$(oext) vfprintf.$(oext) vfscanf.$(oext) vfiscanf.$(oext)
+LIBADD_OBJS = vfiprintf.$(oext) vfprintf.$(oext)
 
 libstdio_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libstdio.la
-libstdio_la_SOURCES = $(GENERAL_SOURCES)
-libstdio_la_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS)
-libstdio_la_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS)
+libstdio_la_SOURCES = $(LIB_SOURCES)
+libstdio_la_LIBADD = $(LIBADD_OBJS)
 LIB_COMPILE = $(LTCOMPILE)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS)
+lib_a_SOURCES = $(LIB_SOURCES)
+lib_a_LIBADD = $(LIBADD_OBJS)
 LIB_COMPILE = $(COMPILE)
 noinst_DATA =
 endif # USE_LIBTOOL
@@ -128,22 +93,14 @@ include $(srcdir)/../../Makefile.shared
 # libtool moves vfprintf.o and subsequently can't find it.
 
 vfprintf.$(oext): vfprintf.c
-	$(LIB_COMPILE) -fshort-enums -c $(srcdir)/vfprintf.c
+	$(LIB_COMPILE) -c $(srcdir)/vfprintf.c
 
 vfiprintf.$(oext): vfprintf.c
-	$(LIB_COMPILE) -fshort-enums -DINTEGER_ONLY -c $(srcdir)/vfprintf.c -o $@
-
-vfscanf.$(oext): vfscanf.c
-	$(LIB_COMPILE) -c $(srcdir)/vfscanf.c
-
-vfiscanf.$(oext): vfscanf.c
-	$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfscanf.c -o $@
+	$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfprintf.c -o $@
 
 CHEWOUT_FILES = \
 	clearerr.def		\
-	dprintf.def		\
 	fclose.def		\
-	fcloseall.def		\
 	fdopen.def		\
 	feof.def		\
 	ferror.def		\
@@ -164,37 +121,27 @@ CHEWOUT_FILES = \
 	fwrite.def		\
 	getc.def		\
 	getchar.def		\
-	getc_u.def		\
-	getchar_u.def		\
-	getdelim.def		\
-	getline.def		\
 	gets.def		\
 	getw.def		\
+	iprintf.def		\
 	mktemp.def		\
 	perror.def		\
 	putc.def		\
 	putchar.def		\
-	putc_u.def		\
-	putchar_u.def		\
 	puts.def		\
 	putw.def		\
 	remove.def		\
 	rename.def		\
 	rewind.def		\
 	setbuf.def		\
-	setbuffer.def		\
-	setlinebuf.def		\
 	setvbuf.def		\
 	siprintf.def		\
-	siscanf.def		\
 	sprintf.def		\
 	sscanf.def		\
 	tmpfile.def		\
 	tmpnam.def		\
 	vfprintf.def		\
-	vfscanf.def		\
-	viprintf.def		\
-	viscanf.def
+	vfscanf.def
 
 SUFFIXES = .def
 
@@ -224,7 +171,6 @@ ftell.$(oext): local.h
 fvwrite.$(oext): local.h fvwrite.h
 fwalk.$(oext): local.h
 fwrite.$(oext): local.h fvwrite.h
-iscanf.$(oext): local.h
 makebuf.$(oext): local.h
 puts.$(oext): fvwrite.h
 refill.$(oext): local.h
@@ -232,20 +178,14 @@ scanf.$(oext): local.h
 setbuf.$(oext): local.h
 setvbuf.$(oext): local.h
 siprintf.$(oext): local.h
-sniprintf.$(oext): local.h
 sprintf.$(oext): local.h
-siscanf.$(oext): local.h
 sscanf.$(oext): local.h
 stdio.$(oext): local.h
 ungetc.$(oext): local.h
 vfiprintf.$(oext): local.h
 vfprintf.$(oext): local.h
-vfiscanf.$(oext): local.h floatio.h
 vfscanf.$(oext): local.h floatio.h
-viscanf.$(oext): local.h
 vscanf.$(oext): local.h
-vsniprintf.$(oext): local.h
-vsiscanf.$(oext): local.h
 vsscanf.$(oext): local.h
 wbuf.$(oext): local.h fvwrite.h
 wsetup.$(oext): local.h
diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in
index 49827e3..b8feba4 100644
--- a/newlib/libc/stdio/Makefile.in
+++ b/newlib/libc/stdio/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -110,29 +95,131 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES =  	clearerr.c 				dprintf.c				fclose.c 				fdopen.c 				feof.c 					ferror.c 				fflush.c 				fgetc.c 				fgetpos.c 				fgets.c 				fileno.c				findfp.c 				fiprintf.c 				flags.c 				fopen.c 				fprintf.c 				fputc.c 				fputs.c 				fread.c 				freopen.c 				fscanf.c 				fiscanf.c 				fseek.c 				fsetpos.c 				ftell.c 				fvwrite.c 				fwalk.c 				fwrite.c 				getc.c 					getchar.c 				getc_u.c				getchar_u.c				getdelim.c				getline.c				gets.c 					iprintf.c 				iscanf.c 				makebuf.c				perror.c 				printf.c 				putc.c 					putchar.c 				putc_u.c				putchar_u.c				puts.c 					refill.c 				remove.c 				rename.c 				rewind.c 				rget.c 					scanf.c 				sccl.c	 				setbuf.c 				setbuffer.c 				setlinebuf.c 				setvbuf.c 				siprintf.c 				siscanf.c 				sniprintf.c				snprintf.c				sprintf.c 				sscanf.c 				stdio.c 				tmpfile.c 				tmpnam.c 				ungetc.c 				vdprintf.c				viprintf.c 				viscanf.c				vprintf.c 				vscanf.c				vsiprintf.c 				vsiscanf.c				vsnprintf.c				vsniprintf.c				vsprintf.c 				vsscanf.c				wbuf.c 					wsetup.c 
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = 	asiprintf.$(oext)			asprintf.$(oext)			fcloseall.$(oext)			fseeko.$(oext) 				ftello.$(oext) 				getw.$(oext)				mktemp.$(oext) 				putw.$(oext) 				vasiprintf.$(oext)			vasprintf.$(oext)
-
-LIBADD_OBJS = vfiprintf.$(oext) vfprintf.$(oext) vfscanf.$(oext) vfiscanf.$(oext)
+LIB_SOURCES = \
+	clearerr.c 			\
+	fclose.c 			\
+	fdopen.c 			\
+	feof.c 				\
+	ferror.c 			\
+	fflush.c 			\
+	fgetc.c 			\
+	fgetpos.c 			\
+	fgets.c 			\
+	fileno.c			\
+	findfp.c 			\
+	fiprintf.c 			\
+	flags.c 			\
+	fopen.c 			\
+	fprintf.c 			\
+	fputc.c 			\
+	fputs.c 			\
+	fread.c 			\
+	freopen.c 			\
+	fscanf.c 			\
+	fseek.c 			\
+	fsetpos.c 			\
+	ftell.c 			\
+	fvwrite.c 			\
+	fwalk.c 			\
+	fwrite.c 			\
+	getc.c 				\
+	getchar.c 			\
+	gets.c 				\
+	getw.c				\
+	iprintf.c 			\
+	makebuf.c			\
+	mktemp.c 			\
+	perror.c 			\
+	printf.c 			\
+	putc.c 				\
+	putchar.c 			\
+	puts.c 				\
+	putw.c				\
+	refill.c 			\
+	remove.c 			\
+	rename.c 			\
+	rewind.c 			\
+	rget.c 				\
+	scanf.c 			\
+	setbuf.c 			\
+	setvbuf.c 			\
+	siprintf.c 			\
+	snprintf.c			\
+	sprintf.c 			\
+	sscanf.c 			\
+	stdio.c 			\
+	tmpfile.c 			\
+	tmpnam.c 			\
+	ungetc.c 			\
+	vfscanf.c 			\
+	vprintf.c 			\
+	vscanf.c			\
+	vsnprintf.c			\
+	vsprintf.c 			\
+	vsscanf.c			\
+	wbuf.c 				\
+	wsetup.c 
+
+
+LIBADD_OBJS = vfiprintf.$(oext) vfprintf.$(oext)
 
 libstdio_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libstdio.la
-@USE_LIBTOOL_TRUE@libstdio_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@libstdio_la_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@libstdio_la_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@LIB_COMPILE = $(LTCOMPILE)
-@USE_LIBTOOL_FALSE@LIB_COMPILE = $(COMPILE)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libstdio.la
+@USE_LIBTOOL_TRUE@libstdio_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@libstdio_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIBADD_OBJS)
+@USE_LIBTOOL_TRUE@LIB_COMPILE = @USE_LIBTOOL_TRUE@$(LTCOMPILE)
+@USE_LIBTOOL_FALSE@LIB_COMPILE = @USE_LIBTOOL_FALSE@$(COMPILE)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS)
-
-CHEWOUT_FILES =  	clearerr.def			dprintf.def			fclose.def			fcloseall.def			fdopen.def			feof.def			ferror.def			fflush.def			fgetc.def			fgetpos.def			fgets.def			fileno.def			fiprintf.def			fopen.def			fputc.def			fputs.def			fread.def			freopen.def			fseek.def			fsetpos.def			ftell.def			fwrite.def			getc.def			getchar.def			getc_u.def			getchar_u.def			getdelim.def			getline.def			gets.def			getw.def			mktemp.def			perror.def			putc.def			putchar.def			putc_u.def			putchar_u.def			puts.def			putw.def			remove.def			rename.def			rewind.def			setbuf.def			setbuffer.def			setlinebuf.def			setvbuf.def			siprintf.def			siscanf.def			sprintf.def			sscanf.def			tmpfile.def			tmpnam.def			vfprintf.def			vfscanf.def			viprintf.def			viscanf.def
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
+@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIBADD_OBJS)
+
+CHEWOUT_FILES = \
+	clearerr.def		\
+	fclose.def		\
+	fdopen.def		\
+	feof.def		\
+	ferror.def		\
+	fflush.def		\
+	fgetc.def		\
+	fgetpos.def		\
+	fgets.def		\
+	fileno.def		\
+	fiprintf.def		\
+	fopen.def		\
+	fputc.def		\
+	fputs.def		\
+	fread.def		\
+	freopen.def		\
+	fseek.def		\
+	fsetpos.def		\
+	ftell.def		\
+	fwrite.def		\
+	getc.def		\
+	getchar.def		\
+	gets.def		\
+	getw.def		\
+	iprintf.def		\
+	mktemp.def		\
+	perror.def		\
+	putc.def		\
+	putchar.def		\
+	puts.def		\
+	putw.def		\
+	remove.def		\
+	rename.def		\
+	rewind.def		\
+	setbuf.def		\
+	setvbuf.def		\
+	siprintf.def		\
+	sprintf.def		\
+	sscanf.def		\
+	tmpfile.def		\
+	tmpnam.def		\
+	vfprintf.def		\
+	vfscanf.def
 
 
 SUFFIXES = .def
@@ -150,56 +237,37 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  clearerr.$(OBJEXT) dprintf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fclose.$(OBJEXT) fdopen.$(OBJEXT) feof.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ferror.$(OBJEXT) fflush.$(OBJEXT) fgetc.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fgetpos.$(OBJEXT) fgets.$(OBJEXT) fileno.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@findfp.$(OBJEXT) fiprintf.$(OBJEXT) flags.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fopen.$(OBJEXT) fprintf.$(OBJEXT) fputc.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fputs.$(OBJEXT) fread.$(OBJEXT) freopen.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fscanf.$(OBJEXT) fiscanf.$(OBJEXT) fseek.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fsetpos.$(OBJEXT) ftell.$(OBJEXT) fvwrite.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@fwalk.$(OBJEXT) fwrite.$(OBJEXT) getc.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getchar.$(OBJEXT) getc_u.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getchar_u.$(OBJEXT) getdelim.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getline.$(OBJEXT) gets.$(OBJEXT) iprintf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@iscanf.$(OBJEXT) makebuf.$(OBJEXT) perror.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@printf.$(OBJEXT) putc.$(OBJEXT) putchar.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@putc_u.$(OBJEXT) putchar_u.$(OBJEXT) puts.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@refill.$(OBJEXT) remove.$(OBJEXT) rename.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@rewind.$(OBJEXT) rget.$(OBJEXT) scanf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sccl.$(OBJEXT) setbuf.$(OBJEXT) setbuffer.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@setlinebuf.$(OBJEXT) setvbuf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@siprintf.$(OBJEXT) siscanf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sniprintf.$(OBJEXT) snprintf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sprintf.$(OBJEXT) sscanf.$(OBJEXT) stdio.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@tmpfile.$(OBJEXT) tmpnam.$(OBJEXT) ungetc.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@vdprintf.$(OBJEXT) viprintf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@viscanf.$(OBJEXT) vprintf.$(OBJEXT) vscanf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@vsiprintf.$(OBJEXT) vsiscanf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@vsnprintf.$(OBJEXT) vsniprintf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@vsprintf.$(OBJEXT) vsscanf.$(OBJEXT) wbuf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wsetup.$(OBJEXT)
+@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES =  vfiprintf.$(oext) \
+@USE_LIBTOOL_FALSE@vfprintf.$(oext)
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  clearerr.o fclose.o fdopen.o feof.o \
+@USE_LIBTOOL_FALSE@ferror.o fflush.o fgetc.o fgetpos.o fgets.o fileno.o \
+@USE_LIBTOOL_FALSE@findfp.o fiprintf.o flags.o fopen.o fprintf.o \
+@USE_LIBTOOL_FALSE@fputc.o fputs.o fread.o freopen.o fscanf.o fseek.o \
+@USE_LIBTOOL_FALSE@fsetpos.o ftell.o fvwrite.o fwalk.o fwrite.o getc.o \
+@USE_LIBTOOL_FALSE@getchar.o gets.o getw.o iprintf.o makebuf.o mktemp.o \
+@USE_LIBTOOL_FALSE@perror.o printf.o putc.o putchar.o puts.o putw.o \
+@USE_LIBTOOL_FALSE@refill.o remove.o rename.o rewind.o rget.o scanf.o \
+@USE_LIBTOOL_FALSE@setbuf.o setvbuf.o siprintf.o snprintf.o sprintf.o \
+@USE_LIBTOOL_FALSE@sscanf.o stdio.o tmpfile.o tmpnam.o ungetc.o \
+@USE_LIBTOOL_FALSE@vfscanf.o vprintf.o vscanf.o vsnprintf.o vsprintf.o \
+@USE_LIBTOOL_FALSE@vsscanf.o wbuf.o wsetup.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
-@USE_LIBTOOL_TRUE@libstdio_la_OBJECTS =  clearerr.lo dprintf.lo \
-@USE_LIBTOOL_TRUE@fclose.lo fdopen.lo feof.lo ferror.lo fflush.lo \
-@USE_LIBTOOL_TRUE@fgetc.lo fgetpos.lo fgets.lo fileno.lo findfp.lo \
-@USE_LIBTOOL_TRUE@fiprintf.lo flags.lo fopen.lo fprintf.lo fputc.lo \
-@USE_LIBTOOL_TRUE@fputs.lo fread.lo freopen.lo fscanf.lo fiscanf.lo \
-@USE_LIBTOOL_TRUE@fseek.lo fsetpos.lo ftell.lo fvwrite.lo fwalk.lo \
-@USE_LIBTOOL_TRUE@fwrite.lo getc.lo getchar.lo getc_u.lo getchar_u.lo \
-@USE_LIBTOOL_TRUE@getdelim.lo getline.lo gets.lo iprintf.lo iscanf.lo \
-@USE_LIBTOOL_TRUE@makebuf.lo perror.lo printf.lo putc.lo putchar.lo \
-@USE_LIBTOOL_TRUE@putc_u.lo putchar_u.lo puts.lo refill.lo remove.lo \
-@USE_LIBTOOL_TRUE@rename.lo rewind.lo rget.lo scanf.lo sccl.lo \
-@USE_LIBTOOL_TRUE@setbuf.lo setbuffer.lo setlinebuf.lo setvbuf.lo \
-@USE_LIBTOOL_TRUE@siprintf.lo siscanf.lo sniprintf.lo snprintf.lo \
-@USE_LIBTOOL_TRUE@sprintf.lo sscanf.lo stdio.lo tmpfile.lo tmpnam.lo \
-@USE_LIBTOOL_TRUE@ungetc.lo vdprintf.lo viprintf.lo viscanf.lo \
-@USE_LIBTOOL_TRUE@vprintf.lo vscanf.lo vsiprintf.lo vsiscanf.lo \
-@USE_LIBTOOL_TRUE@vsnprintf.lo vsniprintf.lo vsprintf.lo vsscanf.lo \
-@USE_LIBTOOL_TRUE@wbuf.lo wsetup.lo
+@USE_LIBTOOL_TRUE@libstdio_la_DEPENDENCIES =  vfiprintf.$(oext) \
+@USE_LIBTOOL_TRUE@vfprintf.$(oext)
+@USE_LIBTOOL_TRUE@libstdio_la_OBJECTS =  clearerr.lo fclose.lo fdopen.lo \
+@USE_LIBTOOL_TRUE@feof.lo ferror.lo fflush.lo fgetc.lo fgetpos.lo \
+@USE_LIBTOOL_TRUE@fgets.lo fileno.lo findfp.lo fiprintf.lo flags.lo \
+@USE_LIBTOOL_TRUE@fopen.lo fprintf.lo fputc.lo fputs.lo fread.lo \
+@USE_LIBTOOL_TRUE@freopen.lo fscanf.lo fseek.lo fsetpos.lo ftell.lo \
+@USE_LIBTOOL_TRUE@fvwrite.lo fwalk.lo fwrite.lo getc.lo getchar.lo \
+@USE_LIBTOOL_TRUE@gets.lo getw.lo iprintf.lo makebuf.lo mktemp.lo \
+@USE_LIBTOOL_TRUE@perror.lo printf.lo putc.lo putchar.lo puts.lo \
+@USE_LIBTOOL_TRUE@putw.lo refill.lo remove.lo rename.lo rewind.lo \
+@USE_LIBTOOL_TRUE@rget.lo scanf.lo setbuf.lo setvbuf.lo siprintf.lo \
+@USE_LIBTOOL_TRUE@snprintf.lo sprintf.lo sscanf.lo stdio.lo tmpfile.lo \
+@USE_LIBTOOL_TRUE@tmpnam.lo ungetc.lo vfscanf.lo vprintf.lo vscanf.lo \
+@USE_LIBTOOL_TRUE@vsnprintf.lo vsprintf.lo vsscanf.lo wbuf.lo wsetup.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -219,7 +287,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libstdio_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus stdio/Makefile
 
@@ -240,11 +308,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -253,7 +316,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -435,16 +497,10 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
 # libtool moves vfprintf.o and subsequently can't find it.
 
 vfprintf.$(oext): vfprintf.c
-	$(LIB_COMPILE) -fshort-enums -c $(srcdir)/vfprintf.c
+	$(LIB_COMPILE) -c $(srcdir)/vfprintf.c
 
 vfiprintf.$(oext): vfprintf.c
-	$(LIB_COMPILE) -fshort-enums -DINTEGER_ONLY -c $(srcdir)/vfprintf.c -o $@
-
-vfscanf.$(oext): vfscanf.c
-	$(LIB_COMPILE) -c $(srcdir)/vfscanf.c
-
-vfiscanf.$(oext): vfscanf.c
-	$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfscanf.c -o $@
+	$(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfprintf.c -o $@
 
 .c.def:
 	$(CHEW) < $< > $*.def 2> $*.ref
@@ -466,7 +522,6 @@ ftell.$(oext): local.h
 fvwrite.$(oext): local.h fvwrite.h
 fwalk.$(oext): local.h
 fwrite.$(oext): local.h fvwrite.h
-iscanf.$(oext): local.h
 makebuf.$(oext): local.h
 puts.$(oext): fvwrite.h
 refill.$(oext): local.h
@@ -474,20 +529,14 @@ scanf.$(oext): local.h
 setbuf.$(oext): local.h
 setvbuf.$(oext): local.h
 siprintf.$(oext): local.h
-sniprintf.$(oext): local.h
 sprintf.$(oext): local.h
-siscanf.$(oext): local.h
 sscanf.$(oext): local.h
 stdio.$(oext): local.h
 ungetc.$(oext): local.h
 vfiprintf.$(oext): local.h
 vfprintf.$(oext): local.h
-vfiscanf.$(oext): local.h floatio.h
 vfscanf.$(oext): local.h floatio.h
-viscanf.$(oext): local.h
 vscanf.$(oext): local.h
-vsniprintf.$(oext): local.h
-vsiscanf.$(oext): local.h
 vsscanf.$(oext): local.h
 wbuf.$(oext): local.h fvwrite.h
 wsetup.$(oext): local.h
diff --git a/newlib/libc/stdio/asiprintf.c b/newlib/libc/stdio/asiprintf.c
deleted file mode 100644
index e8e10bf..0000000
--- a/newlib/libc/stdio/asiprintf.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-/* This code was copied from asprintf.c */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include <limits.h>
-#include "local.h"
-
-int
-#ifdef _HAVE_STDC
-_DEFUN(_asiprintf_r, (ptr, strp, fmt),
-       struct _reent *ptr _AND
-       char **strp        _AND
-       _CONST char *fmt _DOTS)
-#else
-_asiprintf_r(ptr, strp, fmt, va_alist)
-           struct _reent *ptr;
-           char **strp;
-           _CONST char *fmt;
-           va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-  FILE f;
-
-  /* mark a zero-length reallocatable buffer */
-  f._flags = __SWR | __SSTR | __SMBF;
-  f._bf._base = f._p = NULL;
-  f._bf._size = f._w = 0;
-  f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = vfiprintf (&f, fmt, ap);
-  va_end (ap);
-  *f._p = 0;
-  *strp = f._bf._base;
-  return (ret);
-}
-
-#ifndef _REENT_ONLY
-
-int
-#ifdef _HAVE_STDC
-_DEFUN(asiprintf, (strp, fmt),
-       char **strp _AND
-       _CONST char *fmt _DOTS)
-#else
-asiprintf(strp, fmt, va_alist)
-        char **strp;
-        _CONST char *fmt;
-        va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-  FILE f;
-  
-  /* mark a zero-length reallocatable buffer */
-  f._flags = __SWR | __SSTR | __SMBF;
-  f._bf._base = f._p = NULL;
-  f._bf._size = f._w = 0;
-  f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = vfiprintf (&f, fmt, ap);
-  va_end (ap);
-  *f._p = 0;
-  *strp = f._bf._base;
-  return (ret);
-}
-
-#endif
diff --git a/newlib/libc/stdio/asprintf.c b/newlib/libc/stdio/asprintf.c
deleted file mode 100644
index 928e849..0000000
--- a/newlib/libc/stdio/asprintf.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-/* This code was copied from sprintf.c */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include <limits.h>
-#include "local.h"
-
-int
-#ifdef _HAVE_STDC
-_DEFUN(_asprintf_r, (ptr, strp, fmt),
-       struct _reent *ptr _AND
-       char **strp        _AND
-       _CONST char *fmt _DOTS)
-#else
-_asprintf_r(ptr, strp, fmt, va_alist)
-           struct _reent *ptr;
-           char **strp;
-           _CONST char *fmt;
-           va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-  FILE f;
-
-  /* mark a zero-length reallocatable buffer */
-  f._flags = __SWR | __SSTR | __SMBF;
-  f._bf._base = f._p = NULL;
-  f._bf._size = f._w = 0;
-  f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = vfprintf (&f, fmt, ap);
-  va_end (ap);
-  *f._p = 0;
-  *strp = f._bf._base;
-  return (ret);
-}
-
-#ifndef _REENT_ONLY
-
-int
-#ifdef _HAVE_STDC
-_DEFUN(asprintf, (strp, fmt),
-       char **strp _AND
-       _CONST char *fmt _DOTS)
-#else
-asprintf(strp, fmt, va_alist)
-        char **strp;
-        _CONST char *fmt;
-        va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-  FILE f;
-  
-  /* mark a zero-length reallocatable buffer */
-  f._flags = __SWR | __SSTR | __SMBF;
-  f._bf._base = f._p = NULL;
-  f._bf._size = f._w = 0;
-  f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = vfprintf (&f, fmt, ap);
-  va_end (ap);
-  *f._p = 0;
-  *strp = f._bf._base;
-  return (ret);
-}
-
-#endif
diff --git a/newlib/libc/stdio/clearerr.c b/newlib/libc/stdio/clearerr.c
index 0923ff8..861d9a2 100644
--- a/newlib/libc/stdio/clearerr.c
+++ b/newlib/libc/stdio/clearerr.c
@@ -52,20 +52,12 @@ ANSI C requires <<clearerr>>.
 No supporting OS subroutines are required.
 */
 
-#include <_ansi.h>
 #include <stdio.h>
-#include "local.h"
-
-/* A subroutine version of the macro clearerr.  */
-
 #undef	clearerr
 
 _VOID
-_DEFUN(clearerr, (fp),
-       FILE * fp)
+_DEFUN (clearerr, (fp),
+	FILE * fp)
 {
-  CHECK_INIT(_REENT);
-  _flockfile (fp);
   __sclearerr (fp);
-  _funlockfile (fp);
 }
diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c
deleted file mode 100644
index 6ebf12e..0000000
--- a/newlib/libc/stdio/dprintf.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright 2005 Shaun Jackman
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-/*
-FUNCTION
-<<dprintf>>, <<vdprintf>>---print to a file descriptor
-
-INDEX
-	dprintf
-INDEX
-	vdprintf
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	#include <stdarg.h>
-	int dprintf(int <[fd]>, const char *<[format]>, ...);
-	int vdprintf(int <[fd]>, const char *<[format]>, va_list <[ap]>);
-	int _dprintf_r(struct _reent *<[ptr]>, int <[fd]>, 
-			const char *<[format]>, ...);
-	int _vdprintf_r(struct _reent *<[ptr]>, int <[fd]>, 
-			const char *<[format]>, va_list <[ap]>);
-
-TRAD_SYNOPSIS
-        #include <stdio.h>
-        #include <varargs.h>
-
-        int dprintf(<[fd]>, <[format]> [, <[arg]>, ...])
-	int <[fd]>;
-        char *<[format]>;
-
-        int vdprintf(<[fd]>, <[fmt]>, <[list]>)
-	int <[fd]>;
-        char *<[fmt]>;
-        va_list <[list]>;
-
-        int _dprintf_r(<[ptr]>, <[fd]>, <[format]> [, <[arg]>, ...])
-	struct _reent *<[ptr]>;
-	int <[fd]>;
-        char *<[format]>;
-
-        int _vdprintf_r(<[ptr]>, <[fd]>, <[fmt]>, <[list]>)
-	struct _reent *<[ptr]>;
-	int <[fd]>;
-        char *<[fmt]>;
-        va_list <[list]>;
-
-DESCRIPTION
-<<dprintf>> and <<vdprintf>> allow printing a format, similarly to
-<<printf>>, but write to a file descriptor instead of to a <<FILE>>
-stream.
-
-The functions <<_dprintf_r>> and <<_vdprintf_r>> are simply
-reentrant versions of the functions above.
-
-RETURNS
-The return value and errors are exactly as for <<write>>, except that
-<<errno>> may also be set to <<ENOMEM>> if the heap is exhausted.
-
-PORTABILITY
-This function is originally a GNU extension in glibc and is not portable.
-
-Supporting OS subroutines required: <<sbrk>>, <<write>>.
-*/
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#include <unistd.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#ifdef _HAVE_STDC
-int
-_dprintf_r(struct _reent *ptr, int fd, _CONST char *format, ...)
-#else
-int
-_dprintf_r(ptr, fd, format, va_alist)
-	struct _reent *ptr;
-	int fd;
-	char *format;
-	va_dcl
-#endif
-{
-	va_list ap;
-	int n;
-	_REENT_SMALL_CHECK_INIT (ptr);
-#ifdef _HAVE_STDC
-  	va_start (ap, format);
-#else
-  	va_start (ap);
-#endif
-	n = _vdprintf_r (ptr, fd, format, ap);
-	va_end (ap);
-	return n;
-}
-
-#ifndef _REENT_ONLY
-
-#ifdef _HAVE_STDC
-int
-dprintf(int fd, _CONST char *format, ...)
-#else
-int
-dprintf(fd, format, va_alist)
-	struct _reent *ptr;
-	int fd;
-	char *format;
-	va_dcl
-#endif
-{
-	va_list ap;
-	int n;
-	_REENT_SMALL_CHECK_INIT (_REENT);
-#ifdef _HAVE_STDC
-  	va_start (ap, format);
-#else
-  	va_start (ap);
-#endif
-	n = _vdprintf_r (_REENT, fd, format, ap);
-	va_end (ap);
-	return n;
-}
-
-#endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/fclose.c b/newlib/libc/stdio/fclose.c
index 66d71c2..3266d8a 100644
--- a/newlib/libc/stdio/fclose.c
+++ b/newlib/libc/stdio/fclose.c
@@ -1,51 +1,24 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
 FUNCTION
 <<fclose>>---close a file
 
 INDEX
 	fclose
-INDEX
-	_fclose_r
 
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	int fclose(FILE *<[fp]>);
-	int _fclose_r(struct _reent *<[reent]>, FILE *<[fp]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
 	int fclose(<[fp]>)
 	FILE *<[fp]>;
-        
-	int fclose(<[fp]>)
-        struct _reent *<[reent]>
-	FILE *<[fp]>;
 
 DESCRIPTION
 If the file or stream identified by <[fp]> is open, <<fclose>> closes
 it, after first ensuring that any pending data is written (by calling
 <<fflush(<[fp]>)>>).
 
-The alternate function <<_fclose_r>> is a reentrant version.
-The extra argument <[reent]> is a pointer to a reentrancy structure.
-
 RETURNS
 <<fclose>> returns <<0>> if successful (including when <[fp]> is
 <<NULL>> or not an open file); otherwise, it returns <<EOF>>.
@@ -57,63 +30,53 @@ Required OS subroutines: <<close>>, <<fstat>>, <<isatty>>, <<lseek>>,
 <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
-#include <reent.h>
+/*
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/lock.h>
 #include "local.h"
 
+/*
+ * Close a file.
+ */
+
 int
-_DEFUN(_fclose_r, (rptr, fp),
-      struct _reent *rptr _AND
-      register FILE * fp)
+_DEFUN (fclose, (fp),
+	register FILE * fp)
 {
   int r;
 
   if (fp == NULL)
     return (0);			/* on NULL */
 
-  __sfp_lock_acquire ();
-
-  CHECK_INIT (rptr);
+  CHECK_INIT (fp);
 
-  _flockfile (fp);
-  
   if (fp->_flags == 0)		/* not open! */
-    {
-      _funlockfile (fp);
-      __sfp_lock_release ();
-      return (0);
-    }
+    return (0);
   r = fp->_flags & __SWR ? fflush (fp) : 0;
   if (fp->_close != NULL && (*fp->_close) (fp->_cookie) < 0)
     r = EOF;
   if (fp->_flags & __SMBF)
-    _free_r (rptr, (char *) fp->_bf._base);
+    _free_r (fp->_data, (char *) fp->_bf._base);
   if (HASUB (fp))
     FREEUB (fp);
   if (HASLB (fp))
     FREELB (fp);
   fp->_flags = 0;		/* release this FILE for reuse */
-  _funlockfile (fp);
-#ifndef __SINGLE_THREAD__
-  __lock_close_recursive (fp->_lock);
-#endif
-
-  __sfp_lock_release ();
-
   return (r);
 }
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN(fclose, (fp),
-       register FILE * fp)
-{
-  return _fclose_r(_REENT, fp);
-}
-
-#endif
-
diff --git a/newlib/libc/stdio/fcloseall.c b/newlib/libc/stdio/fcloseall.c
deleted file mode 100644
index 090f3f2..0000000
--- a/newlib/libc/stdio/fcloseall.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<fcloseall>>---close all files
-
-INDEX
-	fcloseall
-INDEX
-	_fcloseall_r
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	int fcloseall(void);
-	int _fcloseall_r (struct _reent *<[ptr]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fcloseall()
-
-	int _fcloseall_r (<[ptr]>)
-	struct _reent *<[ptr]>;
-
-DESCRIPTION
-<<fcloseall>> closes all files in the current reentrancy struct's domain.
-The function <<_fcloseall_r>> is the same function, except the reentrancy
-struct is passed in as the <[ptr]> argument.
-
-This function is not recommended as it closes all streams, including
-the std streams.
-
-RETURNS
-<<fclose>> returns <<0>> if all closes are successful.  Otherwise,
-EOF is returned.
-
-PORTABILITY
-<<fcloseall>> is a glibc extension.
-
-Required OS subroutines: <<close>>, <<fstat>>, <<isatty>>, <<lseek>>,
-<<read>>, <<sbrk>>, <<write>>.
-*/
-/* This file based upon fwalk.c. */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include "local.h"
-
-int
-_DEFUN(_fcloseall_r, (ptr),
-       struct _reent *ptr)
-{
-  return _fwalk_reent (ptr, _fclose_r);
-}
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN_VOID(fcloseall)
-{
-  return _fcloseall_r (_GLOBAL_REENT);
-}
-
-#endif
diff --git a/newlib/libc/stdio/fdopen.c b/newlib/libc/stdio/fdopen.c
index f4fc551..bd4018b 100644
--- a/newlib/libc/stdio/fdopen.c
+++ b/newlib/libc/stdio/fdopen.c
@@ -1,21 +1,4 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
 FUNCTION
 <<fdopen>>---turn open file into a stream
 
@@ -27,9 +10,9 @@ INDEX
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	FILE *fdopen(int <[fd]>, const char *<[mode]>);
-	FILE *_fdopen_r(struct _reent *<[reent]>,
-                        int <[fd]>, const char *<[mode]>);
-  
+	FILE *_fdopen_r(void *<[reent]>,
+                     int <[fd]>, const char *<[mode]>);
+
 TRAD_SYNOPSIS
 	#include <stdio.h>
 	FILE *fdopen(<[fd]>, <[mode]>)
@@ -37,7 +20,7 @@ TRAD_SYNOPSIS
 	char *<[mode]>;
 
 	FILE *_fdopen_r(<[reent]>, <[fd]>, <[mode]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
         int <[fd]>;
 	char *<[mode]>);
 
@@ -54,20 +37,21 @@ PORTABILITY
 <<fdopen>> is ANSI.
 */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <sys/types.h>
 #include <sys/fcntl.h>
+
 #include <stdio.h>
 #include <errno.h>
 #include "local.h"
 #include <_syslist.h>
 
+extern int __sflags ();
+
 FILE *
-_DEFUN(_fdopen_r, (ptr, fd, mode),
-       struct _reent *ptr _AND
-       int fd             _AND
-       _CONST char *mode)
+_DEFUN (_fdopen_r, (ptr, fd, mode),
+	struct _reent *ptr _AND
+	int fd _AND
+	_CONST char *mode)
 {
   register FILE *fp;
   int flags, oflags;
@@ -80,7 +64,7 @@ _DEFUN(_fdopen_r, (ptr, fd, mode),
 
   /* make sure the mode the user wants is a subset of the actual mode */
 #ifdef HAVE_FCNTL
-  if ((fdflags = _fcntl_r (ptr, fd, F_GETFL, 0)) < 0)
+  if ((fdflags = _fcntl (fd, F_GETFL, 0)) < 0)
     return 0;
   fdmode = fdflags & O_ACCMODE;
   if (fdmode != O_RDWR && (fdmode != (oflags & O_ACCMODE)))
@@ -92,9 +76,6 @@ _DEFUN(_fdopen_r, (ptr, fd, mode),
 
   if ((fp = __sfp (ptr)) == 0)
     return 0;
-
-  _flockfile (fp);
-
   fp->_flags = flags;
   /*
    * If opened for appending, but underlying descriptor
@@ -123,23 +104,22 @@ _DEFUN(_fdopen_r, (ptr, fd, mode),
 #ifdef __SCLE
   /* Explicit given mode results in explicit setting mode on fd */
   if (oflags & O_BINARY)
-    setmode (fp->_file, O_BINARY);
+    setmode(fp->_file, O_BINARY);
   else if (oflags & O_TEXT)
-    setmode (fp->_file, O_TEXT);
-  if (__stextmode (fp->_file))
+    setmode(fp->_file, O_TEXT);
+  if (__stextmode(fp->_file))
     fp->_flags |= __SCLE;
 #endif
 
-  _funlockfile (fp);
   return fp;
 }
 
 #ifndef _REENT_ONLY
 
 FILE *
-_DEFUN(fdopen, (fd, mode),
-       int fd _AND
-       _CONST char *mode)
+_DEFUN (fdopen, (fd, mode),
+	int fd _AND
+	_CONST char *mode)
 {
   return _fdopen_r (_REENT, fd, mode);
 }
diff --git a/newlib/libc/stdio/feof.c b/newlib/libc/stdio/feof.c
index aff4e84..55f151b 100644
--- a/newlib/libc/stdio/feof.c
+++ b/newlib/libc/stdio/feof.c
@@ -1,21 +1,4 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
 FUNCTION
 <<feof>>---test for end of file
 
@@ -46,20 +29,12 @@ No supporting OS subroutines are required.
 */
 
 #include <stdio.h>
-#include "local.h"
-
-/* A subroutine version of the macro feof.  */
 
 #undef feof
 
 int 
-_DEFUN(feof, (fp),
-       FILE * fp)
+_DEFUN (feof, (fp),
+	FILE * fp)
 {
-  int result;
-  CHECK_INIT(_REENT);
-  _flockfile (fp);
-  result = __sfeof (fp);
-  _funlockfile (fp);
-  return result;
+  return __sfeof (fp);
 }
diff --git a/newlib/libc/stdio/ferror.c b/newlib/libc/stdio/ferror.c
index ea701be..19fa78d 100644
--- a/newlib/libc/stdio/ferror.c
+++ b/newlib/libc/stdio/ferror.c
@@ -53,22 +53,15 @@ No supporting OS subroutines are required.
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
-#include <_ansi.h>
 #include <stdio.h>
-#include "local.h"
 
 /* A subroutine version of the macro ferror.  */
 
 #undef ferror
 
 int
-_DEFUN(ferror, (fp),
-       FILE * fp)
+_DEFUN (ferror, (fp),
+	FILE * fp)
 {
-  int result;
-  CHECK_INIT(_REENT);
-  _flockfile (fp);
-  result = __sferror (fp);
-  _funlockfile (fp);
-  return result;
+  return __sferror (fp);
 }
diff --git a/newlib/libc/stdio/fflush.c b/newlib/libc/stdio/fflush.c
index 05084dd..635e5a7 100644
--- a/newlib/libc/stdio/fflush.c
+++ b/newlib/libc/stdio/fflush.c
@@ -51,42 +51,29 @@ ANSI C requires <<fflush>>.
 No supporting OS subroutines are required.
 */
 
-#include <_ansi.h>
 #include <stdio.h>
 #include "local.h"
 
 /* Flush a single file, or (if fp is NULL) all files.  */
 
 int
-_DEFUN(fflush, (fp),
-       register FILE * fp)
+_DEFUN (fflush, (fp),
+	register FILE * fp)
 {
   register unsigned char *p;
   register int n, t;
 
-  if (fp == NULL)
-    return _fwalk (_GLOBAL_REENT, fflush);
 
-  CHECK_INIT (_REENT);
 
-  _flockfile (fp);
+
+  if (fp == NULL)
+    return _fwalk (_REENT, fflush);
+
+  CHECK_INIT (fp);
 
   t = fp->_flags;
-  if ((t & __SWR) == 0)
-    {
-      /* For a read stream, an fflush causes the next seek to be
-         unoptimized (i.e. forces a system-level seek).  This conforms
-         to the POSIX and SUSv3 standards.  */
-      fp->_flags |= __SNPT;
-      _funlockfile (fp);
-      return 0;
-    }
-  if ((p = fp->_bf._base) == NULL)
-    {
-      /* Nothing to flush.  */
-      _funlockfile (fp);
-      return 0;
-    }
+  if ((t & __SWR) == 0 || (p = fp->_bf._base) == NULL)
+    return 0;
   n = fp->_p - p;		/* write this much */
 
   /*
@@ -102,13 +89,11 @@ _DEFUN(fflush, (fp),
       t = (*fp->_write) (fp->_cookie, (char *) p, n);
       if (t <= 0)
 	{
-          fp->_flags |= __SERR;
-          _funlockfile (fp);
-          return EOF;
+	  fp->_flags |= __SERR;
+	  return EOF;
 	}
       p += t;
       n -= t;
     }
-  _funlockfile (fp);
   return 0;
 }
diff --git a/newlib/libc/stdio/fgetc.c b/newlib/libc/stdio/fgetc.c
index 020b2da..3d3d2c4 100644
--- a/newlib/libc/stdio/fgetc.c
+++ b/newlib/libc/stdio/fgetc.c
@@ -1,21 +1,4 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
 FUNCTION
 <<fgetc>>---get a character from a file or stream
 
@@ -53,18 +36,11 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
 #include <stdio.h>
-#include "local.h"
 
 int
-_DEFUN(fgetc, (fp),
-       FILE * fp)
+_DEFUN (fgetc, (fp),
+	FILE * fp)
 {
-  int result;
-  CHECK_INIT(_REENT);
-  _flockfile (fp);
-  result = __sgetc (fp);
-  _funlockfile (fp);
-  return result;
+  return __sgetc (fp);
 }
diff --git a/newlib/libc/stdio/fgetpos.c b/newlib/libc/stdio/fgetpos.c
index 21a6378..214021a 100644
--- a/newlib/libc/stdio/fgetpos.c
+++ b/newlib/libc/stdio/fgetpos.c
@@ -1,33 +1,13 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
 FUNCTION
 <<fgetpos>>---record position in a stream or file
 
 INDEX
 	fgetpos
-INDEX
-	_fgetpos_r
 
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	int fgetpos(FILE *<[fp]>, fpos_t *<[pos]>);
-	int _fgetpos_r(struct _reent *<[ptr]>, FILE *<[fp]>, fpos_t *<[pos]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -35,11 +15,6 @@ TRAD_SYNOPSIS
 	FILE *<[fp]>;
 	fpos_t *<[pos]>;
 
-	int _fgetpos_r(<[ptr]>, <[fp]>, <[pos]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	fpos_t *<[pos]>;
-
 DESCRIPTION
 Objects of type <<FILE>> can have a ``position'' that records how much
 of the file your program has already read.  Many of the <<stdio>> functions
@@ -71,33 +46,16 @@ conforming C implementations may return a different result from
 No supporting OS subroutines are required.
 */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 
 int
-_DEFUN(_fgetpos_r, (ptr, fp, pos),
-       struct _reent * ptr _AND
-       FILE * fp           _AND
-       _fpos_t * pos)
+_DEFUN (fgetpos, (fp, pos),
+	FILE * fp _AND
+	fpos_t * pos)
 {
-  *pos = _ftell_r (ptr, fp);
+  *pos = ftell (fp);
 
   if (*pos != -1)
-    {
-      return 0;
-    }
+    return 0;
   return 1;
 }
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN(fgetpos, (fp, pos),
-       FILE * fp _AND
-       _fpos_t * pos)
-{
-  return _fgetpos_r (_REENT, fp, pos);
-}
-
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c
index f5dde49..d395d33 100644
--- a/newlib/libc/stdio/fgets.c
+++ b/newlib/libc/stdio/fgets.c
@@ -16,9 +16,9 @@
  */
 
 /*
-FUNCTION
-<<fgets>>---get character string from a file or stream
 
+FUNCTION
+        <<fgets>>---get character string from a file or stream
 INDEX
 	fgets
 
@@ -54,10 +54,10 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
 #include <stdio.h>
 #include <string.h>
-#include "local.h"
+
+extern int __srefill ();
 
 /*
  * Read at most n-1 characters from the given file.
@@ -66,10 +66,10 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  */
 
 char *
-_DEFUN(fgets, (buf, n, fp),
-       char *buf _AND
-       int n     _AND
-       FILE * fp)
+_DEFUN (fgets, (buf, n, fp),
+	char *buf _AND
+	int n _AND
+	FILE * fp)
 {
   size_t len;
   char *s;
@@ -80,27 +80,20 @@ _DEFUN(fgets, (buf, n, fp),
 
   s = buf;
 
-  CHECK_INIT(_REENT);
-
-  _flockfile (fp);
 #ifdef __SCLE
   if (fp->_flags & __SCLE)
     {
       int c;
       /* Sorry, have to do it the slow way */
-      while (--n > 0 && (c = __sgetc (fp)) != EOF)
+      while (--n > 0 && (c = __sgetc(fp)) != EOF)
 	{
 	  *s++ = c;
 	  if (c == '\n')
 	    break;
 	}
       if (c == EOF && s == buf)
-        {
-          _funlockfile (fp);
-          return NULL;
-        }
+	return NULL;
       *s = 0;
-      _funlockfile (fp);
       return buf;
     }
 #endif
@@ -117,10 +110,7 @@ _DEFUN(fgets, (buf, n, fp),
 	    {
 	      /* EOF: stop with partial or no line */
 	      if (s == buf)
-                {
-                  _funlockfile (fp);
-                  return 0;
-                }
+		return 0;
 	      break;
 	    }
 	  len = fp->_r;
@@ -141,18 +131,16 @@ _DEFUN(fgets, (buf, n, fp),
 	  len = ++t - p;
 	  fp->_r -= len;
 	  fp->_p = t;
-	  _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len);
+	  (void) memcpy ((_PTR) s, (_PTR) p, len);
 	  s[len] = 0;
-          _funlockfile (fp);
 	  return (buf);
 	}
       fp->_r -= len;
       fp->_p += len;
-      _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len);
+      (void) memcpy ((_PTR) s, (_PTR) p, len);
       s += len;
     }
   while ((n -= len) != 0);
   *s = 0;
-  _funlockfile (fp);
   return buf;
 }
diff --git a/newlib/libc/stdio/fileno.c b/newlib/libc/stdio/fileno.c
index b202cc5..d578c3e 100644
--- a/newlib/libc/stdio/fileno.c
+++ b/newlib/libc/stdio/fileno.c
@@ -1,21 +1,4 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
 FUNCTION
 <<fileno>>---return file descriptor associated with stream
 
@@ -45,18 +28,13 @@ POSIX requires <<fileno>>.
 Supporting OS subroutines required: none.
 */
 
-#include <_ansi.h>
 #include <stdio.h>
 #include "local.h"
 
 int
-_DEFUN(fileno, (f),
-       FILE * f)
+_DEFUN (fileno, (f),
+	FILE * f)
 {
-  int result;
-  CHECK_INIT (_REENT);
-  _flockfile (f);
-  result = __sfileno (f);
-  _funlockfile (f);
-  return result;
+  CHECK_INIT (f);
+  return __sfileno (f);
 }
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index e3270af..c6790c4 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -1,3 +1,5 @@
+/* No user fns here.  Pesch 15apr92. */
+
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,24 +16,20 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* No user fns here.  Pesch 15apr92. */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 #include <fcntl.h>
-#include <sys/lock.h>
 #include "local.h"
 
-static _VOID
-_DEFUN(std, (ptr, flags, file, data),
-            FILE *ptr _AND
-            int flags _AND
-            int file  _AND
-            struct _reent *data)
+static void
+std (ptr, flags, file, data)
+     FILE *ptr;
+     int flags;
+     int file;
+     struct _reent *data;
 {
   ptr->_p = 0;
   ptr->_r = 0;
@@ -46,24 +44,18 @@ _DEFUN(std, (ptr, flags, file, data),
   ptr->_write = __swrite;
   ptr->_seek = __sseek;
   ptr->_close = __sclose;
-#if !defined(__SINGLE_THREAD__) && !defined(_REENT_SMALL)
-  __lock_init_recursive (ptr->_lock);
-  /*
-   * #else
-   * lock is already initialized in __sfp
-   */
-#endif
+  ptr->_data = data;
 
 #ifdef __SCLE
-  if (__stextmode (ptr->_file))
+  if (__stextmode(ptr->_file))
     ptr->_flags |= __SCLE;
 #endif
 }
 
 struct _glue *
-_DEFUN(__sfmoreglue, (d, n),
-       struct _reent *d _AND
-       register int n)
+__sfmoreglue (d, n)
+     struct _reent *d;
+     register int n;
 {
   struct _glue *g;
   FILE *p;
@@ -84,18 +76,16 @@ _DEFUN(__sfmoreglue, (d, n),
  */
 
 FILE *
-_DEFUN(__sfp, (d),
-       struct _reent *d)
+__sfp (d)
+     struct _reent *d;
 {
   FILE *fp;
   int n;
   struct _glue *g;
 
-  __sfp_lock_acquire (); 
-
-  if (!_GLOBAL_REENT->__sdidinit)
-    __sinit (_GLOBAL_REENT);
-  for (g = &_GLOBAL_REENT->__sglue;; g = g->_next)
+  if (!d->__sdidinit)
+    __sinit (d);
+  for (g = &d->__sglue;; g = g->_next)
     {
       for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++)
 	if (fp->_flags == 0)
@@ -104,30 +94,24 @@ _DEFUN(__sfp, (d),
 	  (g->_next = __sfmoreglue (d, NDYNAMIC)) == NULL)
 	break;
     }
-  __sfp_lock_release (); 
   d->_errno = ENOMEM;
   return NULL;
 
 found:
-  fp->_file = -1;		/* no file */
   fp->_flags = 1;		/* reserve this slot; caller sets real flags */
-#ifndef __SINGLE_THREAD__
-  __lock_init_recursive (fp->_lock);
-#endif
-  __sfp_lock_release (); 
-
   fp->_p = NULL;		/* no current pointer */
   fp->_w = 0;			/* nothing to read or write */
   fp->_r = 0;
   fp->_bf._base = NULL;		/* no buffer */
   fp->_bf._size = 0;
   fp->_lbfsize = 0;		/* not line buffered */
+  fp->_file = -1;		/* no file */
   /* fp->_cookie = <any>; */	/* caller sets cookie, _read/_write etc */
   fp->_ub._base = NULL;		/* no ungetc buffer */
   fp->_ub._size = 0;
   fp->_lb._base = NULL;		/* no line buffer */
   fp->_lb._size = 0;
-
+  fp->_data = d;
   return fp;
 }
 
@@ -139,19 +123,19 @@ found:
  * The name `_cleanup' is, alas, fairly well known outside stdio.
  */
 
-_VOID
-_DEFUN(_cleanup_r, (ptr),
-       struct _reent *ptr)
+void
+_cleanup_r (ptr)
+     struct _reent *ptr;
 {
-  _CAST_VOID _fwalk(ptr, fclose);
-  /* _CAST_VOID _fwalk (ptr, fflush); */	/* `cheating' */
+  /* (void) _fwalk(fclose); */
+  (void) _fwalk (ptr, fflush);	/* `cheating' */
 }
 
 #ifndef _REENT_ONLY
-_VOID
-_DEFUN_VOID(_cleanup)
+void
+_cleanup ()
 {
-  _cleanup_r (_GLOBAL_REENT);
+  _cleanup_r (_REENT);
 }
 #endif
 
@@ -159,112 +143,28 @@ _DEFUN_VOID(_cleanup)
  * __sinit() is called whenever stdio's internal variables must be set up.
  */
 
-_VOID
-_DEFUN(__sinit, (s),
-       struct _reent *s)
+void
+__sinit (s)
+     struct _reent *s;
 {
-  __sinit_lock_acquire ();
-
-  if (s->__sdidinit)
-    {
-      __sinit_lock_release ();
-      return;
-    }
-
   /* make sure we clean up on exit */
   s->__cleanup = _cleanup_r;	/* conservative */
   s->__sdidinit = 1;
 
-  s->__sglue._next = NULL;
-#ifndef _REENT_SMALL
-  s->__sglue._niobs = 3;
-  s->__sglue._iobs = &s->__sf[0];
-#else
-  s->__sglue._niobs = 0;
-  s->__sglue._iobs = NULL;
-  s->_stdin = __sfp(s);
-  s->_stdout = __sfp(s);
-  s->_stderr = __sfp(s);
-#endif
-
-  std (s->_stdin,  __SRD, 0, s);
+  std (s->__sf + 0, __SRD, 0, s);
 
   /* on platforms that have true file system I/O, we can verify whether stdout 
      is an interactive terminal or not.  For all other platforms, we will
      default to line buffered mode here.  */
 #ifdef HAVE_FCNTL
-  std (s->_stdout, __SWR, 1, s);
+  std (s->__sf + 1, __SWR, 1, s);
 #else
-  std (s->_stdout, __SWR | __SLBF, 1, s);
+  std (s->__sf + 1, __SWR | __SLBF, 1, s);
 #endif
 
-  std (s->_stderr, __SWR | __SNBF, 2, s);
-
-  __sinit_lock_release ();
-}
-
-#ifndef __SINGLE_THREAD__
-
-__LOCK_INIT_RECURSIVE(static, __sfp_lock);
-__LOCK_INIT_RECURSIVE(static, __sinit_lock);
-
-_VOID
-_DEFUN_VOID(__sfp_lock_acquire)
-{
-  __lock_acquire_recursive (__sfp_lock); 
-}
-
-_VOID
-_DEFUN_VOID(__sfp_lock_release)
-{
-  __lock_release_recursive (__sfp_lock); 
-}
-
-_VOID
-_DEFUN_VOID(__sinit_lock_acquire)
-{
-  __lock_acquire_recursive (__sinit_lock); 
-}
-
-_VOID
-_DEFUN_VOID(__sinit_lock_release)
-{
-  __lock_release_recursive (__sinit_lock); 
-}
-
-/* Walkable file locking routine.  */
-static int
-_DEFUN(__fp_lock, (ptr),
-       FILE * ptr)
-{
-  _flockfile (ptr);
+  std (s->__sf + 2, __SWR | __SNBF, 2, s);
 
-  return 0;
-}
-
-/* Walkable file unlocking routine.  */
-static int
-_DEFUN(__fp_unlock, (ptr),
-       FILE * ptr)
-{
-  _funlockfile (ptr);
-
-  return 0;
-}
-
-_VOID
-_DEFUN_VOID(__fp_lock_all)
-{
-  __sfp_lock_acquire (); 
-
-  _CAST_VOID _fwalk (_REENT, __fp_lock);
-}
-
-_VOID
-_DEFUN_VOID(__fp_unlock_all)
-{
-  _CAST_VOID _fwalk (_REENT, __fp_unlock);
-
-  __sfp_lock_release ();
+  s->__sglue._next = NULL;
+  s->__sglue._niobs = 3;
+  s->__sglue._iobs = &s->__sf[0];
 }
-#endif
diff --git a/newlib/libc/stdio/fiprintf.c b/newlib/libc/stdio/fiprintf.c
index 3529e7f..d490ef4 100644
--- a/newlib/libc/stdio/fiprintf.c
+++ b/newlib/libc/stdio/fiprintf.c
@@ -1,48 +1,77 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
+FUNCTION
+        <<fiprintf>>---format output to file (integer only)
+INDEX
+	fiprintf
+
+ANSI_SYNOPSIS
+        #include <stdio.h>
+
+        int fiprintf(FILE *<[fd]>, const char *<[format]>, ...);
+
+TRAD_SYNOPSIS
+	#include <stdio.h>
+
+	int fiprintf(<[fd]>, <[format]> [, <[arg]>, ...]);
+	FILE *<[fd]>;
+	char *<[format]>;
+
+DESCRIPTION
+<<fiprintf>> is a restricted version of <<fprintf>>: it has the same
+arguments and behavior, save that it cannot perform any floating-point
+formatting---the <<f>>, <<g>>, <<G>>, <<e>>, and <<F>> type specifiers
+are not recognized.
+
+RETURNS
+        <<fiprintf>> returns the number of bytes in the output string,
+        save that the concluding <<NULL>> is not counted.
+        <<fiprintf>> returns when the end of the format string is
+        encountered.  If an error occurs, <<fiprintf>>
+        returns <<EOF>>.
+
+PORTABILITY
+<<fiprintf>> is not required by ANSI C.
+
+Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
+<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
+*/
 
 #include <_ansi.h>
 #include <stdio.h>
+
 #ifdef _HAVE_STDC
+
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
-#ifdef _HAVE_STDC
-int
-fiprintf(FILE * fp, _CONST char *fmt,...)
-#else
 int
-fiprintf(fp, fmt, va_alist)
-         FILE *fp;
-         char *fmt;
-         va_dcl
-#endif
+fiprintf (FILE * fp, const char *fmt,...)
 {
   int ret;
   va_list ap;
 
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
+  ret = vfiprintf (fp, fmt, ap);
+  va_end (ap);
+  return ret;
+}
+
 #else
+
+#include <varargs.h>
+
+int
+fiprintf (fp, fmt, va_alist)
+     FILE *fp;
+     char *fmt;
+     va_dcl
+{
+  int ret;
+  va_list ap;
+
   va_start (ap);
-#endif
   ret = vfiprintf (fp, fmt, ap);
   va_end (ap);
   return ret;
 }
+
+#endif
diff --git a/newlib/libc/stdio/fiscanf.c b/newlib/libc/stdio/fiscanf.c
deleted file mode 100644
index 53fee84..0000000
--- a/newlib/libc/stdio/fiscanf.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include "local.h"
-
-#ifndef _REENT_ONLY
-
-int
-#ifdef _HAVE_STDC
-fiscanf(FILE *fp, _CONST char *fmt, ...)
-#else
-fiscanf(FILE *fp, fmt, va_alist)
-       FILE *fp;
-       char *fmt;
-       va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = __svfiscanf_r (_REENT, fp, fmt, ap);
-  va_end (ap);
-  return ret;
-}
-
-#endif /* !_REENT_ONLY */
-
-int
-#ifdef _HAVE_STDC
-_fiscanf_r(struct _reent *ptr, FILE *fp, _CONST char *fmt, ...)
-#else
-_fiscanf_r(ptr, FILE *fp, fmt, va_alist)
-          struct _reent *ptr;
-          FILE *fp;
-          char *fmt;
-          va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = __svfiscanf_r (ptr, fp, fmt, ap);
-  va_end (ap);
-  return (ret);
-}
-
diff --git a/newlib/libc/stdio/flags.c b/newlib/libc/stdio/flags.c
index d7bf52b..e448cca 100644
--- a/newlib/libc/stdio/flags.c
+++ b/newlib/libc/stdio/flags.c
@@ -1,3 +1,5 @@
+/* No user fns here. Pesch 15apr92 */
+
 /*
  * Copyright (c) 1990 Regents of the University of California.
  * All rights reserved.
@@ -14,12 +16,11 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* No user fns here. Pesch 15apr92 */
 
-#include <_ansi.h>
 #include <stdio.h>
 #include <time.h>
 #include <fcntl.h>
+
 #include <errno.h>
 #include <sys/types.h>
 
@@ -30,10 +31,10 @@
  */
 
 int
-_DEFUN(__sflags, (ptr, mode, optr),
-       struct _reent *ptr  _AND
-       register char *mode _AND
-       int *optr)
+__sflags (ptr, mode, optr)
+     struct _reent *ptr;
+     register char *mode;
+     int *optr;
 {
   register int ret, m, o;
 
diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
index 64c24e7..e470878 100644
--- a/newlib/libc/stdio/fopen.c
+++ b/newlib/libc/stdio/fopen.c
@@ -28,7 +28,7 @@ ANSI_SYNOPSIS
 	#include <stdio.h>
 	FILE *fopen(const char *<[file]>, const char *<[mode]>);
 
-	FILE *_fopen_r(struct _reent *<[reent]>, 
+	FILE *_fopen_r(void *<[reent]>, 
                        const char *<[file]>, const char *<[mode]>);
 
 TRAD_SYNOPSIS
@@ -38,7 +38,7 @@ TRAD_SYNOPSIS
 	char *<[mode]>;
 
 	FILE *_fopen_r(<[reent]>, <[file]>, <[mode]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[file]>;
 	char *<[mode]>;
 
@@ -113,21 +113,18 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #include <errno.h>
-#include <sys/lock.h>
+#include "local.h"
 #ifdef __CYGWIN__
 #include <fcntl.h>
 #endif
-#include "local.h"
 
 FILE *
-_DEFUN(_fopen_r, (ptr, file, mode),
-       struct _reent *ptr _AND
-       _CONST char *file _AND
-       _CONST char *mode)
+_DEFUN (_fopen_r, (ptr, file, mode),
+	struct _reent *ptr _AND
+	_CONST char *file _AND
+	_CONST char *mode)
 {
   register FILE *fp;
   register int f;
@@ -138,19 +135,12 @@ _DEFUN(_fopen_r, (ptr, file, mode),
   if ((fp = __sfp (ptr)) == NULL)
     return NULL;
 
-  if ((f = _open_r (ptr, file, oflags, 0666)) < 0)
+  if ((f = _open_r (fp->_data, file, oflags, 0666)) < 0)
     {
-      __sfp_lock_acquire (); 
       fp->_flags = 0;		/* release */
-#ifndef __SINGLE_THREAD__
-      __lock_close_recursive (fp->_lock);
-#endif
-      __sfp_lock_release (); 
       return NULL;
     }
 
-  _flockfile (fp);
-
   fp->_file = f;
   fp->_flags = flags;
   fp->_cookie = (_PTR) fp;
@@ -160,23 +150,22 @@ _DEFUN(_fopen_r, (ptr, file, mode),
   fp->_close = __sclose;
 
   if (fp->_flags & __SAPP)
-    _fseek_r (ptr, fp, 0, SEEK_END);
+    fseek (fp, 0, SEEK_END);
 
 #ifdef __SCLE
   if (__stextmode (fp->_file))
     fp->_flags |= __SCLE;
 #endif
 
-  _funlockfile (fp);
   return fp;
 }
 
 #ifndef _REENT_ONLY
 
 FILE *
-_DEFUN(fopen, (file, mode),
-       _CONST char *file _AND
-       _CONST char *mode)
+_DEFUN (fopen, (file, mode),
+	_CONST char *file _AND
+	_CONST char *mode)
 {
   return _fopen_r (_REENT, file, mode);
 }
diff --git a/newlib/libc/stdio/fprintf.c b/newlib/libc/stdio/fprintf.c
index 56a0886..de03660 100644
--- a/newlib/libc/stdio/fprintf.c
+++ b/newlib/libc/stdio/fprintf.c
@@ -17,32 +17,40 @@
 
 #include <_ansi.h>
 #include <stdio.h>
+
 #ifdef _HAVE_STDC
+
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
-#ifdef _HAVE_STDC
 int
-fprintf(FILE * fp, _CONST char *fmt,...)
-#else
-int
-fprintf(fp, fmt, va_alist)
-        FILE *fp;
-        char *fmt;
-        va_dcl
-#endif
+fprintf (FILE * fp, const char *fmt,...)
 {
   int ret;
   va_list ap;
 
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
+  ret = vfprintf (fp, fmt, ap);
+  va_end (ap);
+  return ret;
+}
+
 #else
+
+#include <varargs.h>
+
+int
+fprintf (fp, fmt, va_alist)
+     FILE *fp;
+     char *fmt;
+     va_dcl
+{
+  int ret;
+  va_list ap;
+
   va_start (ap);
-#endif
   ret = vfprintf (fp, fmt, ap);
   va_end (ap);
   return ret;
 }
+
+#endif
diff --git a/newlib/libc/stdio/fputc.c b/newlib/libc/stdio/fputc.c
index 422f675..966a0db 100644
--- a/newlib/libc/stdio/fputc.c
+++ b/newlib/libc/stdio/fputc.c
@@ -1,21 +1,4 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
 FUNCTION
 <<fputc>>---write a character on a stream or file
 
@@ -57,19 +40,12 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
 #include <stdio.h>
-#include "local.h"
 
 int
-_DEFUN(fputc, (ch, file),
-       int ch _AND
-       FILE * file)
+_DEFUN (fputc, (ch, file),
+	int ch _AND
+	FILE * file)
 {
-  int result;
-  CHECK_INIT(_REENT);
-   _flockfile (file);
-  result = putc (ch, file);
-  _funlockfile (file);
-  return result;
+  return putc (ch, file);
 }
diff --git a/newlib/libc/stdio/fputs.c b/newlib/libc/stdio/fputs.c
index 8d02107..62ce98f 100644
--- a/newlib/libc/stdio/fputs.c
+++ b/newlib/libc/stdio/fputs.c
@@ -47,22 +47,19 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
 #include <stdio.h>
 #include <string.h>
 #include "fvwrite.h"
-#include "local.h"
 
 /*
  * Write the given string to the given file.
  */
 
 int
-_DEFUN(fputs, (s, fp),
-       char _CONST * s _AND
-       FILE * fp)
+_DEFUN (fputs, (s, fp),
+	char _CONST * s _AND
+	FILE * fp)
 {
-  int result;
   struct __suio uio;
   struct __siov iov;
 
@@ -70,11 +67,5 @@ _DEFUN(fputs, (s, fp),
   iov.iov_len = uio.uio_resid = strlen (s);
   uio.uio_iov = &iov;
   uio.uio_iovcnt = 1;
-
-  CHECK_INIT(_REENT);
-
-  _flockfile (fp);
-  result = __sfvwrite (fp, &uio);
-  _funlockfile (fp);
-  return result;
+  return __sfvwrite (fp, &uio);
 }
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
index 1354c04..c4c66b4 100644
--- a/newlib/libc/stdio/fread.c
+++ b/newlib/libc/stdio/fread.c
@@ -55,19 +55,17 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
 #include "local.h"
 
 #ifdef __SCLE
 static size_t
-_DEFUN(crlf, (fp, buf, count, eof),
-       FILE * fp _AND
-       char * buf _AND
-       size_t count _AND
-       int eof)
+_DEFUN (crlf, (fp, buf, count, eof),
+      FILE * fp _AND
+      char * buf _AND
+      size_t count _AND
+      int eof)
 {
   int newcount = 0, r;
   char *s, *d, *e;
@@ -79,28 +77,28 @@ _DEFUN(crlf, (fp, buf, count, eof),
   for (s=d=buf; s<e-1; s++)
     {
       if (*s == '\r' && s[1] == '\n')
-        s++;
+      s++;
       *d++ = *s;
     }
   if (s < e)
     {
       if (*s == '\r')
-        {
-          int c = __sgetc_raw (fp);
-          if (c == '\n')
-            *s = '\n';
-          else
-            ungetc (c, fp);
-        }
+      {
+        int c = __sgetc_raw(fp);
+        if (c == '\n')
+          *s = '\n';
+        else
+          ungetc(c, fp);
+      }
       *d++ = *s++;
     }
 
 
   while (d < e)
     {
-      r = getc (fp);
+      r = getc(fp);
       if (r == EOF)
-        return count - (e-d);
+      return count - (e-d);
       *d++ = r;
     }
 
@@ -111,11 +109,11 @@ _DEFUN(crlf, (fp, buf, count, eof),
 #endif
 
 size_t
-_DEFUN(fread, (buf, size, count, fp),
-       _PTR buf _AND
-       size_t size _AND
-       size_t count _AND
-       FILE * fp)
+_DEFUN (fread, (buf, size, count, fp),
+	_PTR buf _AND
+	size_t size _AND
+	size_t count _AND
+	FILE * fp)
 {
   register size_t resid;
   register char *p;
@@ -124,103 +122,34 @@ _DEFUN(fread, (buf, size, count, fp),
 
   if ((resid = count * size) == 0)
     return 0;
-
-  CHECK_INIT(_REENT);
-
-  _flockfile (fp);
   if (fp->_r < 0)
     fp->_r = 0;
   total = resid;
   p = buf;
 
-#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
-
-  /* Optimize unbuffered I/O.  */
-  if (fp->_flags & __SNBF)
-    {
-      /* First copy any available characters from ungetc buffer.  */
-      int copy_size = resid > fp->_r ? fp->_r : resid;
-      _CAST_VOID memcpy ((_PTR) p, (_PTR) fp->_p, (size_t) copy_size);
-      fp->_p += copy_size;
-      fp->_r -= copy_size;
-      p += copy_size;
-      resid -= copy_size;
-
-      /* If still more data needed, free any allocated ungetc buffer.  */
-      if (HASUB (fp) && resid > 0)
-	FREEUB (fp);
-
-      /* Finally read directly into user's buffer if needed.  */
-      while (resid > 0)
-	{
-	  int rc = 0;
-	  /* save fp buffering state */
-	  void *old_base = fp->_bf._base;
-	  void * old_p = fp->_p;
-	  int old_size = fp->_bf._size;
-	  /* allow __refill to use user's buffer */
-	  fp->_bf._base = p;
-	  fp->_bf._size = resid;
-	  fp->_p = p;
-	  rc = __srefill (fp);
-	  /* restore fp buffering back to original state */
-	  fp->_bf._base = old_base;
-	  fp->_bf._size = old_size;
-	  fp->_p = old_p;
-	  resid -= fp->_r;
-	  p += fp->_r;
-	  fp->_r = 0;
-	  if (rc)
-	    {
-#ifdef __SCLE
-              if (fp->_flags & __SCLE)
-	        {
-	          _funlockfile (fp);
-	          return crlf (fp, buf, total-resid, 1) / size;
-	        }
-#endif
-	      _funlockfile (fp);
-	      return (total - resid) / size;
-	    }
-	}
-    }
-  else
-#endif /* !PREFER_SIZE_OVER_SPEED && !__OPTIMIZE_SIZE__ */
+  while (resid > (r = fp->_r))
     {
-      while (resid > (r = fp->_r))
+      (void) memcpy ((void *) p, (void *) fp->_p, (size_t) r);
+      fp->_p += r;
+      /* fp->_r = 0 ... done in __srefill */
+      p += r;
+      resid -= r;
+      if (__srefill (fp))
 	{
-	  _CAST_VOID memcpy ((_PTR) p, (_PTR) fp->_p, (size_t) r);
-	  fp->_p += r;
-	  /* fp->_r = 0 ... done in __srefill */
-	  p += r;
-	  resid -= r;
-	  if (__srefill (fp))
-	    {
-	      /* no more input: return partial result */
+	  /* no more input: return partial result */
 #ifdef __SCLE
-	      if (fp->_flags & __SCLE)
-		{
-		  _funlockfile (fp);
-		  return crlf (fp, buf, total-resid, 1) / size;
-		}
+        if (fp->_flags & __SCLE)
+            return crlf(fp, buf, total-resid, 1) / size;
 #endif
-	      _funlockfile (fp);
-	      return (total - resid) / size;
-	    }
+	  return (total - resid) / size;
 	}
-      _CAST_VOID memcpy ((_PTR) p, (_PTR) fp->_p, resid);
-      fp->_r -= resid;
-      fp->_p += resid;
     }
-
-  /* Perform any CR/LF clean-up if necessary.  */
+  (void) memcpy ((void *) p, (void *) fp->_p, resid);
+  fp->_r -= resid;
+  fp->_p += resid;
 #ifdef __SCLE
   if (fp->_flags & __SCLE)
-    {
-      _funlockfile (fp);
-      return crlf(fp, buf, total, 0) / size;
-    }
+    return crlf(fp, buf, total, 0) / size;
 #endif
-  _funlockfile (fp);
   return count;
 }
diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c
index f1fc9da..63f5833 100644
--- a/newlib/libc/stdio/freopen.c
+++ b/newlib/libc/stdio/freopen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1990, 2006 The Regents of the University of California.
+ * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -21,15 +21,11 @@ FUNCTION
 
 INDEX
 	freopen
-INDEX
-	_freopen_r
 
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	FILE *freopen(const char *<[file]>, const char *<[mode]>,
 		      FILE *<[fp]>);
-	FILE *_freopen_r(struct _reent *<[ptr]>, const char *<[file]>, 
-	              const char *<[mode]>, FILE *<[fp]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -38,12 +34,6 @@ TRAD_SYNOPSIS
 	char *<[mode]>;
 	FILE *<[fp]>;
 
-	FILE *_freopen_r(<[ptr]>, <[file]>, <[mode]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	char *<[file]>;
-	char *<[mode]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 Use this variant of <<fopen>> if you wish to specify a particular file
 descriptor <[fp]> (notably <<stdin>>, <<stdout>>, or <<stderr>>) for
@@ -55,12 +45,6 @@ it).
 
 <[file]> and <[mode]> are used just as in <<fopen>>.
 
-If <[file]> is <<NULL>>, the underlying stream is modified rather than
-closed.  The file cannot be given a more permissive access mode (for
-example, a <[mode]> of "w" will fail on a read-only file descriptor),
-but can change status such as append or binary mode.  If modification
-is not possible, failure occurs.
-
 RETURNS
 If successful, the result is the same as the argument <[fp]>.  If the
 file cannot be opened as specified, the result is <<NULL>>.
@@ -72,14 +56,10 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<open>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <time.h>
 #include <stdio.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include <sys/lock.h>
 #include "local.h"
 
 /*
@@ -87,27 +67,21 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  */
 
 FILE *
-_DEFUN(_freopen_r, (ptr, file, mode, fp),
-       struct _reent *ptr _AND
-       _CONST char *file _AND
-       _CONST char *mode _AND
-       register FILE *fp)
+_DEFUN (freopen, (file, mode, fp),
+	_CONST char *file _AND
+	_CONST char *mode _AND
+	register FILE *fp)
 {
   register int f;
-  int flags, oflags;
-  int e = 0;
-
-  __sfp_lock_acquire ();
+  int flags, oflags, e;
+  struct _reent *ptr;
 
-  CHECK_INIT (ptr);
-
-  _flockfile (fp);
+  CHECK_INIT (fp);
+  ptr = fp->_data;
 
   if ((flags = __sflags (ptr, mode, &oflags)) == 0)
     {
-      _funlockfile (fp);
-      _CAST_VOID _fclose_r (ptr, fp);
-      __sfp_lock_release ();
+      (void) fclose (fp);
       return NULL;
     }
 
@@ -124,61 +98,18 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
   else
     {
       if (fp->_flags & __SWR)
-	_CAST_VOID fflush (fp);
-      /*
-       * If close is NULL, closing is a no-op, hence pointless.
-       * If file is NULL, the file should not be closed.
-       */
-      if (fp->_close != NULL && file != NULL)
-	_CAST_VOID (*fp->_close) (fp->_cookie);
+	(void) fflush (fp);
+      /* if close is NULL, closing is a no-op, hence pointless */
+      if (fp->_close != NULL)
+	(void) (*fp->_close) (fp->_cookie);
     }
 
   /*
-   * Now get a new descriptor to refer to the new file, or reuse the
-   * existing file descriptor if file is NULL.
+   * Now get a new descriptor to refer to the new file.
    */
 
-  if (file != NULL)
-    {
-      f = _open_r (ptr, (char *) file, oflags, 0666);
-      e = ptr->_errno;
-    }
-  else
-    {
-#ifdef HAVE_FCNTL
-      int oldflags;
-      /*
-       * Reuse the file descriptor, but only if the new access mode is
-       * equal or less permissive than the old.  F_SETFL correctly
-       * ignores creation flags.
-       */
-      f = fp->_file;
-      if ((oldflags = _fcntl_r (ptr, f, F_GETFL, 0)) == -1
-          || ! ((oldflags & O_ACCMODE) == O_RDWR
-                || ((oldflags ^ oflags) & O_ACCMODE) == 0)
-          || _fcntl_r (ptr, f, F_SETFL, oflags) == -1)
-        f = -1;
-#else
-      /* We cannot modify without fcntl support.  */
-      f = -1;
-#endif
-
-#ifdef __SCLE
-      /*
-       * F_SETFL doesn't change textmode.  Don't mess with modes of ttys.
-       */
-      if (0 <= f && ! isatty (f)
-          && setmode (f, oflags & (O_BINARY | O_TEXT)) == -1)
-        f = -1;
-#endif
-
-      if (f < 0)
-        {
-          e = EBADF;
-          if (fp->_close != NULL)
-            _CAST_VOID (*fp->_close) (fp->_cookie);
-        }
-    }
+  f = _open_r (ptr, (char *) file, oflags, 0666);
+  e = ptr->_errno;
 
   /*
    * Finish closing fp.  Even if the open succeeded above,
@@ -206,11 +137,6 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
     {				/* did not get it after all */
       fp->_flags = 0;		/* set it free */
       ptr->_errno = e;		/* restore in case _close clobbered */
-      _funlockfile (fp);
-#ifndef __SINGLE_THREAD__
-      __lock_close_recursive (fp->_lock);
-#endif
-      __sfp_lock_release ();
       return NULL;
     }
 
@@ -223,24 +149,9 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
   fp->_close = __sclose;
 
 #ifdef __SCLE
-  if (__stextmode (fp->_file))
+  if (__stextmode(fp->_file))
     fp->_flags |= __SCLE;
 #endif
 
-  _funlockfile (fp);
-  __sfp_lock_release ();
   return fp;
 }
-
-#ifndef _REENT_ONLY
-
-FILE *
-_DEFUN(freopen, (file, mode, fp),
-       _CONST char *file _AND
-       _CONST char *mode _AND
-       register FILE *fp)
-{
-  return _freopen_r (_REENT, file, mode, fp);
-}
-
-#endif /*!_REENT_ONLY */
diff --git a/newlib/libc/stdio/fscanf.c b/newlib/libc/stdio/fscanf.c
index c00a469..92fc4ea 100644
--- a/newlib/libc/stdio/fscanf.c
+++ b/newlib/libc/stdio/fscanf.c
@@ -16,25 +16,26 @@
  */
 
 #include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
+
 #ifdef _HAVE_STDC
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
+
 #include "local.h"
 
 #ifndef _REENT_ONLY
 
 int
 #ifdef _HAVE_STDC
-fscanf(FILE *fp, _CONST char *fmt, ...)
+fscanf (FILE *fp, const char *fmt, ...)
 #else
-fscanf(FILE *fp, fmt, va_alist)
-       FILE *fp;
-       char *fmt;
-       va_dcl
+fscanf (FILE *fp, fmt, va_alist)
+     FILE *fp;
+     char *fmt;
+     va_dcl
 #endif
 {
   int ret;
@@ -54,13 +55,13 @@ fscanf(FILE *fp, fmt, va_alist)
 
 int
 #ifdef _HAVE_STDC
-_fscanf_r(struct _reent *ptr, FILE *fp, _CONST char *fmt, ...)
+_fscanf_r (struct _reent *ptr, FILE *fp, const char *fmt, ...)
 #else
-_fscanf_r(ptr, FILE *fp, fmt, va_alist)
-          struct _reent *ptr;
-          FILE *fp;
-          char *fmt;
-          va_dcl
+_fscanf_r (ptr, FILE *fp, fmt, va_alist)
+     struct _reent *ptr;
+     FILE *fp;
+     char *fmt;
+     va_dcl
 #endif
 {
   int ret;
diff --git a/newlib/libc/stdio/fseek.c b/newlib/libc/stdio/fseek.c
index 8b189ba..1b72989 100644
--- a/newlib/libc/stdio/fseek.c
+++ b/newlib/libc/stdio/fseek.c
@@ -17,25 +17,14 @@
 
 /*
 FUNCTION
-<<fseek>>, <<fseeko>>---set file position
+<<fseek>>---set file position
 
 INDEX
 	fseek
-INDEX
-	fseeko
-INDEX
-	_fseek_r
-INDEX
-	_fseeko_r
 
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	int fseek(FILE *<[fp]>, long <[offset]>, int <[whence]>)
-	int fseeko(FILE *<[fp]>, off_t <[offset]>, int <[whence]>)
-	int _fseek_r(struct _reent *<[ptr]>, FILE *<[fp]>, 
-	             long <[offset]>, int <[whence]>)
-	int _fseeko_r(struct _reent *<[ptr]>, FILE *<[fp]>, 
-	             off_t <[offset]>, int <[whence]>)
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -44,29 +33,12 @@ TRAD_SYNOPSIS
 	long <[offset]>;
 	int <[whence]>;
 
-	int fseeko(<[fp]>, <[offset]>, <[whence]>)
-	FILE *<[fp]>;
-	off_t <[offset]>;
-	int <[whence]>;
-
-	int _fseek_r(<[ptr]>, <[fp]>, <[offset]>, <[whence]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	long <[offset]>;
-	int <[whence]>;
-
-	int _fseeko_r(<[ptr]>, <[fp]>, <[offset]>, <[whence]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	off_t <[offset]>;
-	int <[whence]>;
-
 DESCRIPTION
 Objects of type <<FILE>> can have a ``position'' that records how much
 of the file your program has already read.  Many of the <<stdio>> functions
 depend on this position, and many change it as a side effect.
 
-You can use <<fseek>>/<<fseeko>> to set the position for the file identified by
+You can use <<fseek>> to set the position for the file identified by
 <[fp]>.  The value of <[offset]> determines the new position, in one
 of three ways selected by the value of <[whence]> (defined as macros
 in `<<stdio.h>>'):
@@ -81,10 +53,10 @@ from the beginning of the file) desired.  <[offset]> must be positive.
 <[offset]> can meaningfully be either positive (to increase the size
 of the file) or negative.
 
-See <<ftell>>/<<ftello>> to determine the current file position.
+See <<ftell>> to determine the current file position.
 
 RETURNS
-<<fseek>>/<<fseeko>> return <<0>> when successful.  On failure, the
+<<fseek>> returns <<0>> when successful.  If <<fseek>> fails, the
 result is <<EOF>>.  The reason for failure is indicated in <<errno>>:
 either <<ESPIPE>> (the stream identified by <[fp]> doesn't support
 repositioning) or <<EINVAL>> (invalid file position).
@@ -92,14 +64,10 @@ repositioning) or <<EINVAL>> (invalid file position).
 PORTABILITY
 ANSI C requires <<fseek>>.
 
-<<fseeko>> is defined by the Single Unix specification.
-
 Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #include <time.h>
 #include <fcntl.h>
@@ -108,7 +76,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <sys/stat.h>
 #include "local.h"
 
-#define	POS_ERR	(-(_fpos_t)1)
+#define	POS_ERR	(-(fpos_t)1)
 
 /*
  * Seek the given file to the given offset.
@@ -116,24 +84,22 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  */
 
 int
-_DEFUN(_fseek_r, (ptr, fp, offset, whence),
-       struct _reent *ptr _AND
-       register FILE *fp  _AND
-       long offset        _AND
-       int whence)
+fseek (fp, offset, whence)
+     register FILE *fp;
+     long offset;
+     int whence;
 {
-  _fpos_t _EXFUN((*seekfn), (_PTR, _fpos_t, int));
-  _fpos_t target;
-  _fpos_t curoff = 0;
+  struct _reent *ptr;
+  fpos_t _EXFUN ((*seekfn), (void *, fpos_t, int));
+  fpos_t target, curoff;
   size_t n;
   struct stat st;
   int havepos;
 
   /* Make sure stdio is set up.  */
 
-  CHECK_INIT (ptr);
-
-  _flockfile (fp);
+  CHECK_INIT (fp);
+  ptr = fp->_data;
 
   /* If we've been doing some writing, and we're in append mode
      then we don't really know where the filepos is.  */
@@ -149,7 +115,6 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence),
   if ((seekfn = fp->_seek) == NULL)
     {
       ptr->_errno = ESPIPE;	/* ??? */
-      _funlockfile (fp);
       return EOF;
     }
 
@@ -166,17 +131,14 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence),
        * we have to first find the current stream offset a la
        * ftell (see ftell for details).
        */
-      fflush (fp);   /* may adjust seek offset on append stream */
+      fflush(fp);   /* may adjust seek offset on append stream */
       if (fp->_flags & __SOFF)
 	curoff = fp->_offset;
       else
 	{
-	  curoff = (*seekfn) (fp->_cookie, (_fpos_t) 0, SEEK_CUR);
+	  curoff = (*seekfn) (fp->_cookie, (fpos_t) 0, SEEK_CUR);
 	  if (curoff == -1L)
-	    {
-	      _funlockfile (fp);
-	      return EOF;
-	    }
+	    return EOF;
 	}
       if (fp->_flags & __SRD)
 	{
@@ -199,7 +161,6 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence),
 
     default:
       ptr->_errno = EINVAL;
-      _funlockfile (fp);
       return (EOF);
     }
 
@@ -220,11 +181,7 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence),
     {
       if (seekfn != __sseek
 	  || fp->_file < 0
-#ifdef __USE_INTERNAL_STAT64
-	  || _fstat64_r (ptr, fp->_file, &st)
-#else
 	  || _fstat_r (ptr, fp->_file, &st)
-#endif
 	  || (st.st_mode & S_IFMT) != S_IFREG)
 	{
 	  fp->_flags |= __SNPT;
@@ -247,11 +204,7 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence),
     target = offset;
   else
     {
-#ifdef __USE_INTERNAL_STAT64
-      if (_fstat64_r (ptr, fp->_file, &st))
-#else
       if (_fstat_r (ptr, fp->_file, &st))
-#endif
 	goto dumb;
       target = st.st_size + offset;
     }
@@ -309,7 +262,6 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence),
       if (HASUB (fp))
 	FREEUB (fp);
       fp->_flags &= ~__SEOF;
-      _funlockfile (fp);
       return 0;
     }
 
@@ -338,7 +290,6 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence),
       fp->_p += n;
       fp->_r -= n;
     }
-  _funlockfile (fp);
   return 0;
 
   /*
@@ -348,10 +299,7 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence),
 
 dumb:
   if (fflush (fp) || (*seekfn) (fp->_cookie, offset, whence) == POS_ERR)
-    {
-      _funlockfile (fp);
-      return EOF;
-    }
+    return EOF;
   /* success: clear EOF indicator and discard ungetc() data */
   if (HASUB (fp))
     FREEUB (fp);
@@ -359,26 +307,5 @@ dumb:
   fp->_r = 0;
   /* fp->_w = 0; *//* unnecessary (I think...) */
   fp->_flags &= ~__SEOF;
-  /* Reset no-optimization flag after successful seek.  The
-     no-optimization flag may be set in the case of a read
-     stream that is flushed which by POSIX/SUSv3 standards,
-     means that a corresponding seek must not optimize.  The
-     optimization is then allowed if no subsequent flush
-     is performed.  */
-  fp->_flags &= ~__SNPT;
-  _funlockfile (fp);
   return 0;
 }
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN(fseek, (fp, offset, whence),
-       register FILE *fp _AND
-       long offset       _AND
-       int whence)
-{
-  return _fseek_r (_REENT, fp, offset, whence);
-}
-
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdio/fseeko.c b/newlib/libc/stdio/fseeko.c
deleted file mode 100644
index 0d655d0..0000000
--- a/newlib/libc/stdio/fseeko.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2002, Red Hat Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-
-int
-_DEFUN(_fseeko_r, (ptr, fp, offset, whence),
-       struct _reent *ptr _AND
-       register FILE *fp  _AND
-       _off_t offset      _AND
-       int whence)
-{
-  return _fseek_r (ptr, fp, (long)offset, whence);
-}
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN(fseeko, (fp, offset, whence),
-       register FILE *fp _AND
-       _off_t offset     _AND
-       int whence)
-{
-  /* for now we simply cast since off_t should be long */
-  return _fseek_r (_REENT, fp, (long)offset, whence);
-}
-
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdio/fsetpos.c b/newlib/libc/stdio/fsetpos.c
index e2dd39b..28cd69e 100644
--- a/newlib/libc/stdio/fsetpos.c
+++ b/newlib/libc/stdio/fsetpos.c
@@ -1,34 +1,13 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
 FUNCTION
 <<fsetpos>>---restore position of a stream or file
 
 INDEX
 	fsetpos
-INDEX
-	_fsetpos_r
 
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	int fsetpos(FILE *<[fp]>, const fpos_t *<[pos]>);
-	int _fsetpos_r(struct _reent *<[ptr]>, FILE *<[fp]>, l
-	               const fpos_t *<[pos]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -36,11 +15,6 @@ TRAD_SYNOPSIS
 	FILE *<[fp]>;
 	fpos_t *<[pos]>;
 
-	int _fsetpos_r(<[ptr]>, <[fp]>, <[pos]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	fpos_t *<[pos]>;
-
 DESCRIPTION
 Objects of type <<FILE>> can have a ``position'' that records how much
 of the file your program has already read.  Many of the <<stdio>> functions
@@ -65,31 +39,16 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 
 int
-_DEFUN(_fsetpos_r, (ptr, iop, pos),
-       struct _reent * ptr _AND
-       FILE * iop          _AND
-       _CONST _fpos_t * pos)
+_DEFUN (fsetpos, (iop, pos),
+	FILE * iop _AND
+	_CONST fpos_t * pos)
 {
-  int x = _fseek_r (ptr, iop, *pos, SEEK_SET);
+  int x = fseek (iop, *pos, SEEK_SET);
 
   if (x != 0)
     return 1;
   return 0;
 }
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN(fsetpos, (iop, pos),
-       FILE * iop _AND
-       _CONST _fpos_t * pos)
-{
-  return _fsetpos_r (_REENT, iop, pos);
-}
-
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdio/ftell.c b/newlib/libc/stdio/ftell.c
index 74d6d90..6a80618 100644
--- a/newlib/libc/stdio/ftell.c
+++ b/newlib/libc/stdio/ftell.c
@@ -17,58 +17,37 @@
 
 /*
 FUNCTION
-<<ftell>>, <<ftello>>---return position in a stream or file
+<<ftell>>---return position in a stream or file
 
 INDEX
 	ftell
-INDEX
-	ftello
-INDEX
-	_ftell_r
-INDEX
-	_ftello_r
 
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	long ftell(FILE *<[fp]>);
-	off_t ftello(FILE *<[fp]>);
-	long _ftell_r(struct _reent *<[ptr]>, FILE *<[fp]>);
-	off_t _ftello_r(struct _reent *<[ptr]>, FILE *<[fp]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
 	long ftell(<[fp]>)
 	FILE *<[fp]>;
 
-	off_t ftello(<[fp]>)
-	FILE *<[fp]>;
-
-	long _ftell_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
-	off_t _ftello_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 Objects of type <<FILE>> can have a ``position'' that records how much
 of the file your program has already read.  Many of the <<stdio>> functions
 depend on this position, and many change it as a side effect.
 
-The result of <<ftell>>/<<ftello>> is the current position for a file
+The result of <<ftell>> is the current position for a file
 identified by <[fp]>.  If you record this result, you can later
-use it with <<fseek>>/<<fseeko>> to return the file to this
-position.  The difference between <<ftell>> and <<ftello>> is that
-<<ftell>> returns <<long>> and <<ftello>> returns <<off_t>>.
+use it with <<fseek>> to return the file to this
+position.
 
-In the current implementation, <<ftell>>/<<ftello>> simply uses a character
+In the current implementation, <<ftell>> simply uses a character
 count to represent the file position; this is the same number that
 would be recorded by <<fgetpos>>.
 
 RETURNS
-<<ftell>>/<<ftello>> return the file position, if possible.  If they cannot do
-this, they return <<-1L>>.  Failure occurs on streams that do not support
+<<ftell>> returns the file position, if possible.  If it cannot do
+this, it returns <<-1L>>.  Failure occurs on streams that do not support
 positioning; the global <<errno>> indicates this condition with the
 value <<ESPIPE>>.
 
@@ -79,8 +58,6 @@ acceptable as an argument to <<fseek>>.  In particular, other
 conforming C implementations may return a different result from
 <<ftell>> than what <<fgetpos>> records.
 
-<<ftello>> is defined by the Single Unix specification.
-
 No supporting OS subroutines are required.
 */
 
@@ -92,29 +69,24 @@ static char sccsid[] = "%W% (Berkeley) %G%";
  * ftell: return current offset.
  */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #include <errno.h>
+
 #include "local.h"
 
 long
-_DEFUN(_ftell_r, (ptr, fp),
-       struct _reent *ptr _AND
-       register FILE * fp)
+_DEFUN (ftell, (fp),
+	register FILE * fp)
 {
-  _fpos_t pos;
+  fpos_t pos;
 
   /* Ensure stdio is set up.  */
 
-  CHECK_INIT (ptr);
-
-  _flockfile (fp);
+  CHECK_INIT (fp);
 
   if (fp->_seek == NULL)
     {
-      ptr->_errno = ESPIPE;
-      _funlockfile (fp);
+      fp->_data->_errno = ESPIPE;
       return -1L;
     }
 
@@ -125,12 +97,9 @@ _DEFUN(_ftell_r, (ptr, fp),
     pos = fp->_offset;
   else
     {
-      pos = (*fp->_seek) (fp->_cookie, (_fpos_t) 0, SEEK_CUR);
+      pos = (*fp->_seek) (fp->_cookie, (fpos_t) 0, SEEK_CUR);
       if (pos == -1L)
-        {
-          _funlockfile (fp);
-          return pos;
-        }
+	return pos;
     }
   if (fp->_flags & __SRD)
     {
@@ -143,7 +112,7 @@ _DEFUN(_ftell_r, (ptr, fp),
       if (HASUB (fp))
 	pos -= fp->_ur;
     }
-  else if ((fp->_flags & __SWR) && fp->_p != NULL)
+  else if (fp->_flags & __SWR && fp->_p != NULL)
     {
       /*
        * Writing.  Any buffered characters cause the
@@ -153,17 +122,5 @@ _DEFUN(_ftell_r, (ptr, fp),
       pos += fp->_p - fp->_bf._base;
     }
 
-  _funlockfile (fp);
   return pos;
 }
-
-#ifndef _REENT_ONLY
-
-long
-_DEFUN(ftell, (fp),
-       register FILE * fp)
-{
-  return _ftell_r (_REENT, fp);
-}
-
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdio/ftello.c b/newlib/libc/stdio/ftello.c
deleted file mode 100644
index 216d884..0000000
--- a/newlib/libc/stdio/ftello.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2002, Red Hat Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-
-_off_t
-_DEFUN(_ftello_r, (ptr, fp),
-       struct _reent * ptr _AND
-       register FILE * fp)
-{
-  /* for now we simply cast since off_t should be long */
-  return (_off_t)_ftell_r (ptr, fp);
-}
-
-#ifndef _REENT_ONLY
-
-_off_t
-_DEFUN(ftello, (fp),
-       register FILE * fp)
-{
-  return (_off_t)_ftell_r (_REENT, fp);
-}
-
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdio/fvwrite.c b/newlib/libc/stdio/fvwrite.c
index f036d74..8e7d316 100644
--- a/newlib/libc/stdio/fvwrite.c
+++ b/newlib/libc/stdio/fvwrite.c
@@ -1,3 +1,5 @@
+/* No user fns here.  Pesch 15apr92. */
+
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,17 +16,14 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* No user fns here.  Pesch 15apr92. */
 
-#include <_ansi.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
 #include "local.h"
 #include "fvwrite.h"
 
 #define	MIN(a, b) ((a) < (b) ? (a) : (b))
-#define	COPY(n)	  _CAST_VOID memmove ((_PTR) fp->_p, (_PTR) p, (size_t) (n))
+#define	COPY(n)	  (void) memmove((void *) fp->_p, (void *) p, (size_t) (n))
 
 #define GETIOV(extra_work) \
   while (len == 0) \
@@ -43,12 +42,12 @@
  */
 
 int
-_DEFUN(__sfvwrite, (fp, uio),
-       register FILE *fp _AND
-       register struct __suio *uio)
+__sfvwrite (fp, uio)
+     register FILE *fp;
+     register struct __suio *uio;
 {
   register size_t len;
-  register _CONST char *p = NULL;
+  register _CONST char *p;
   register struct __siov *iov;
   register int w, s;
   char *nl;
@@ -68,17 +67,17 @@ _DEFUN(__sfvwrite, (fp, uio),
   if (fp->_flags & __SCLE) /* text mode */
     {
       do
-        {
-          GETIOV (;);
-          while (len > 0)
-            {
-              if (putc (*p, fp) == EOF)
-                return EOF;
-              p++;
-              len--;
-              uio->uio_resid--;
-            }
-        }
+      {
+        GETIOV (;);
+        while (len > 0)
+          {
+            if (putc(*p, fp) == EOF)
+              return EOF;
+            p++;
+            len--;
+            uio->uio_resid--;
+          }
+      }
       while (uio->uio_resid > 0);
       return 0;
     }
@@ -111,9 +110,7 @@ _DEFUN(__sfvwrite, (fp, uio),
        * as fit, but pretend we wrote everything.  This makes
        * snprintf() return the number of bytes needed, rather
        * than the number used, and avoids its write function
-       * (so that the write function can be invalid).  If
-       * we are dealing with the asprintf routines, we will
-       * dynamically increase the buffer size as needed.
+       * (so that the write function can be invalid).
        */
       do
 	{
@@ -121,24 +118,6 @@ _DEFUN(__sfvwrite, (fp, uio),
 	  w = fp->_w;
 	  if (fp->_flags & __SSTR)
 	    {
-	      if (len > w && fp->_flags & __SMBF)
-		{ /* must be asprintf family */
-		  unsigned char *ptr;
-		  int curpos = (fp->_p - fp->_bf._base);
-		  ptr = (unsigned char *)_realloc_r (_REENT, 
-                                                     fp->_bf._base, 
-                                                     curpos + len);
-		  if (!ptr)
-		    {
-		      /* Free buffer which is no longer used.  */
-		      _free_r (_REENT, fp->_bf._base);
-		      goto err;
-		    }
-		  fp->_bf._base = ptr;
-		  fp->_p = ptr + curpos;
-		  fp->_bf._size = curpos + len;
-		  w = fp->_w = len;
-		}
 	      if (len < w)
 		w = len;
 	      COPY (w);		/* copy MIN(fp->_w,len), */
@@ -185,13 +164,12 @@ _DEFUN(__sfvwrite, (fp, uio),
        * that the amount to write is MIN(len,nldist).
        */
       nlknown = 0;
-      nldist = 0;
       do
 	{
 	  GETIOV (nlknown = 0);
 	  if (!nlknown)
 	    {
-	      nl = memchr ((_PTR) p, '\n', len);
+	      nl = memchr ((void *) p, '\n', len);
 	      nldist = nl ? nl + 1 - p : len + 1;
 	      nlknown = 1;
 	    }
diff --git a/newlib/libc/stdio/fwalk.c b/newlib/libc/stdio/fwalk.c
index 376959d..5162834 100644
--- a/newlib/libc/stdio/fwalk.c
+++ b/newlib/libc/stdio/fwalk.c
@@ -1,3 +1,5 @@
+/* No user fns here.  Pesch 15apr92. */
+
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,47 +16,20 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* No user fns here.  Pesch 15apr92. */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include "local.h"
 
-static int
-_DEFUN(__fwalk, (ptr, function),
-       struct _reent *ptr _AND
-       register int (*function) (FILE *))
-{
-  register FILE *fp;
-  register int n, ret = 0;
-  register struct _glue *g;
-
-  for (g = &ptr->__sglue; g != NULL; g = g->_next)
-    for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++)
-      if (fp->_flags != 0)
-        {
-          _flockfile (fp);
-          if (fp->_flags != 0 && fp->_file != -1)
-            ret |= (*function) (fp);
-          _funlockfile (fp);
-        }
-
-  return ret;
-}
-
-/* Special version of __fwalk where the function pointer is a reentrant
-   I/O function (e.g. _fclose_r).  */
-static int
-_DEFUN(__fwalk_reent, (ptr, reent_function),
-       struct _reent *ptr _AND
-       register int (*reent_function) (struct _reent *, FILE *))
+int
+_fwalk (ptr, function)
+     struct _reent *ptr;
+     register int (*function) ();
 {
   register FILE *fp;
   register int n, ret = 0;
@@ -63,50 +38,6 @@ _DEFUN(__fwalk_reent, (ptr, reent_function),
   for (g = &ptr->__sglue; g != NULL; g = g->_next)
     for (fp = g->_iobs, n = g->_niobs; --n >= 0; fp++)
       if (fp->_flags != 0)
-        {
-          _flockfile (fp);
-          if (fp->_flags != 0 && fp->_file != -1)
-            ret |= (*reent_function) (ptr, fp);
-          _funlockfile (fp);
-        }
-
-  return ret;
-}
-
-int
-_DEFUN(_fwalk, (ptr, function),
-       struct _reent *ptr _AND
-       register int (*function)(FILE *))
-{
-  register int ret = 0;
-
-  __sfp_lock_acquire ();
-
-  /* Must traverse given list for streams.  Note that _GLOBAL_REENT
-     only walked once in exit().  */
-  ret |= __fwalk (ptr, function);
-
-  __sfp_lock_release ();
-
-  return ret;
-}
-
-/* Special version of _fwalk which handles a function pointer to a
-   reentrant I/O function (e.g. _fclose_r).  */
-int
-_DEFUN(_fwalk_reent, (ptr, reent_function),
-       struct _reent *ptr _AND
-       register int (*reent_function) (struct _reent *, FILE *))
-{
-  register int ret = 0;
-
-  __sfp_lock_acquire ();
-
-  /* Must traverse given list for streams.  Note that _GLOBAL_REENT
-     only walked once in exit().  */
-  ret |= __fwalk_reent (ptr, reent_function);
-
-  __sfp_lock_release ();
-
+	ret |= (*function) (fp);
   return ret;
 }
diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index 663fff6..642fb27 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/newlib/libc/stdio/fwrite.c
@@ -61,7 +61,6 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
-#include <_ansi.h>
 #include <stdio.h>
 #include <string.h>
 #if 0
@@ -78,11 +77,11 @@ static char sccsid[] = "%W% (Berkeley) %G%";
  */
 
 size_t
-_DEFUN(fwrite, (buf, size, count, fp),
-       _CONST _PTR buf _AND
-       size_t size     _AND
-       size_t count    _AND
-       FILE * fp)
+_DEFUN (fwrite, (buf, size, count, fp),
+	_CONST _PTR buf _AND
+	size_t size _AND
+	size_t count _AND
+	FILE * fp)
 {
   size_t n;
   struct __suio uio;
@@ -99,14 +98,7 @@ _DEFUN(fwrite, (buf, size, count, fp),
    * generally slow and since this occurs whenever size==0.
    */
 
-  CHECK_INIT(_REENT);
-
-  _flockfile (fp);
   if (__sfvwrite (fp, &uio) == 0)
-    {
-      _funlockfile (fp);
-      return count;
-    }
-  _funlockfile (fp);
+    return count;
   return (n - uio.uio_resid) / size;
 }
diff --git a/newlib/libc/stdio/getc.c b/newlib/libc/stdio/getc.c
index 9628a87..4b25097 100644
--- a/newlib/libc/stdio/getc.c
+++ b/newlib/libc/stdio/getc.c
@@ -62,9 +62,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
-#include <_ansi.h>
 #include <stdio.h>
-#include "local.h"
 
 /*
  * A subroutine version of the macro getc.
@@ -73,13 +71,10 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef getc
 
 int
-_DEFUN(getc, (fp),
-       register FILE *fp)
+getc (fp)
+     register FILE *fp;
 {
-  int result;
-  CHECK_INIT (_REENT);
-  _flockfile (fp);
-  result = __sgetc (fp);
-  _funlockfile (fp);
-  return result;
+  /* CHECK_INIT is called (eventually) by __srefill.  */
+
+  return __sgetc (fp);
 }
diff --git a/newlib/libc/stdio/getc_u.c b/newlib/libc/stdio/getc_u.c
deleted file mode 100644
index 9c05fa6..0000000
--- a/newlib/libc/stdio/getc_u.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<getc_unlocked>>---non-thread-safe version of getc (macro)
-
-INDEX
-	getc_unlocked
-
-POSIX_SYNOPSIS
-	#include <stdio.h>
-	int getc_unlocked(FILE *<[fp]>);
-
-DESCRIPTION
-<<getc_unlocked>> is a non-thread-safe version of <<getc>> declared in
-<<stdio.h>>.  <<getc_unlocked>> may only safely be used within a scope
-protected by flockfile() (or ftrylockfile()) and funlockfile().  These
-functions may safely be used in a multi-threaded program if and only
-if they are called while the invoking thread owns the ( FILE *)
-object, as is the case after a successful call to the flockfile() or
-ftrylockfile() functions.  If threads are disabled, then
-<<getc_unlocked>> is equivalent to <<getc>>.
-
-RETURNS
-See <<getc>>.
-
-PORTABILITY
-POSIX 1003.1 requires <<getc_unlocked>>.  <<getc_unlocked>> may be
-implemented as a macro, so arguments should not have side-effects.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.  */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "%W% (Berkeley) %G%";
-#endif /* LIBC_SCCS and not lint */
-
-#include <_ansi.h>
-#include <stdio.h>
-
-/*
- * A subroutine version of the macro getc_unlocked.
- */
-
-#undef getc_unlocked
-
-int
-_DEFUN(getc_unlocked, (fp),
-       register FILE *fp)
-{
-  /* CHECK_INIT is called (eventually) by __srefill.  */
-
-  return __sgetc (fp);
-}
diff --git a/newlib/libc/stdio/getchar.c b/newlib/libc/stdio/getchar.c
index 19301c1..475cd13 100644
--- a/newlib/libc/stdio/getchar.c
+++ b/newlib/libc/stdio/getchar.c
@@ -28,7 +28,7 @@ ANSI_SYNOPSIS
 	#include <stdio.h>
 	int getchar(void);
 
-	int _getchar_r(struct _reent *<[reent]>);
+	int _getchar_r(void *<[reent]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -71,25 +71,22 @@ static char sccsid[] = "%W% (Berkeley) %G%";
  * A subroutine version of the macro getchar.
  */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
-#include "local.h"
+#include <reent.h>
 
 #undef getchar
 
 int
-_DEFUN(_getchar_r, (f),
-       struct _reent *f)
+_getchar_r (f)
+     struct _reent *f;
 {
-  _REENT_SMALL_CHECK_INIT (f);
   return getc (_stdin_r (f));
 }
 
 #ifndef _REENT_ONLY
 
 int
-_DEFUN_VOID(getchar)
+getchar ()
 {
   /* CHECK_INIT is called (eventually) by __srefill.  */
 
diff --git a/newlib/libc/stdio/getchar_u.c b/newlib/libc/stdio/getchar_u.c
deleted file mode 100644
index be566ea..0000000
--- a/newlib/libc/stdio/getchar_u.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<getchar_unlocked>>---non-thread-safe version of getchar (macro)
-
-INDEX
-	getchar_unlocked
-
-POSIX_SYNOPSIS
-	#include <stdio.h>
-	int getchar_unlocked();
-
-DESCRIPTION
-<<getchar_unlocked>> is a non-thread-safe version of <<getchar>>
-declared in <<stdio.h>>.  <<getchar_unlocked>> may only safely be used
-within a scope protected by flockfile() (or ftrylockfile()) and
-funlockfile().  These functions may safely be used in a multi-threaded
-program if and only if they are called while the invoking thread owns
-the ( FILE *) object, as is the case after a successful call to the
-flockfile() or ftrylockfile() functions.  If threads are disabled,
-then <<getchar_unlocked>> is equivalent to <<getchar>>.
-
-RETURNS
-See <<getchar>>.
-
-PORTABILITY
-POSIX 1003.1 requires <<getchar_unlocked>>.  <<getchar_unlocked>> may
-be implemented as a macro.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.  */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "%W% (Berkeley) %G%";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * A subroutine version of the macro getchar_unlocked.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-
-#undef getchar_unlocked
-
-int
-_DEFUN(_getchar_unlocked_r, (f),
-       struct _reent *f)
-{
-  return getc_unlocked (_stdin_r (f));
-}
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN_VOID(getchar_unlocked)
-{
-  /* CHECK_INIT is called (eventually) by __srefill.  */
-
-  return _getchar_unlocked_r (_REENT);
-}
-
-#endif
diff --git a/newlib/libc/stdio/getdelim.c b/newlib/libc/stdio/getdelim.c
deleted file mode 100644
index 0fdfb3a..0000000
--- a/newlib/libc/stdio/getdelim.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright 2002, Red Hat Inc. - all rights reserved */
-/*
-FUNCTION
-<<getdelim>>---read a line up to a specified line delimiter
-
-INDEX
-	getdelim
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	int getdelim(char **<[bufptr]>, size_t *<[n]>,
-                     int <[delim]>, FILE *<[fp]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int getdelim(<[bufptr]>, <[n]>, <[delim]>, <[fp]>)
-	char **<[bufptr]>;
-	size_t *<[n]>;
-	int <[delim]>;
-	FILE *<[fp]>;
-
-DESCRIPTION
-<<getdelim>> reads a file <[fp]> up to and possibly including a specified
-delimiter <[delim]>.  The line is read into a buffer pointed to
-by <[bufptr]> and designated with size *<[n]>.  If the buffer is
-not large enough, it will be dynamically grown by <<getdelim>>.
-As the buffer is grown, the pointer to the size <[n]> will be
-updated.
-
-RETURNS
-<<getdelim>> returns <<-1>> if no characters were successfully read;
-otherwise, it returns the number of bytes successfully read.
-At end of file, the result is nonzero.
-
-PORTABILITY
-<<getdelim>> is a glibc extension.
-
-No supporting OS subroutines are directly required.
-*/
-
-#include <_ansi.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include "local.h"
-
-#define MIN_LINE_SIZE 4
-#define DEFAULT_LINE_SIZE 128
-
-ssize_t
-_DEFUN(__getdelim, (bufptr, n, delim, fp),
-       char **bufptr _AND
-       size_t *n     _AND
-       int delim     _AND 
-       FILE *fp)
-{
-  char *buf;
-  char *ptr;
-  size_t newsize, numbytes;
-  int pos;
-  int ch;
-  int cont;
-
-  if (fp == NULL || bufptr == NULL || n == NULL)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  buf = *bufptr;
-  if (buf == NULL || *n < MIN_LINE_SIZE) 
-    {
-      buf = (char *)realloc (*bufptr, DEFAULT_LINE_SIZE);
-      if (buf == NULL)
-        {
-	  return -1;
-        }
-      *bufptr = buf;
-      *n = DEFAULT_LINE_SIZE;
-    }
-
-  CHECK_INIT (_REENT);
-
-  _flockfile (fp);
-
-  numbytes = *n;
-  ptr = buf;
-
-  cont = 1;
-
-  while (cont)
-    {
-      /* fill buffer - leaving room for nul-terminator */
-      while (--numbytes > 0)
-        {
-          if ((ch = getc_unlocked (fp)) == EOF)
-            {
-	      cont = 0;
-              break;
-            }
-	  else 
-            {
-              *ptr++ = ch;
-              if (ch == delim)
-                {
-                  cont = 0;
-                  break;
-                }
-            }
-        }
-
-      if (cont)
-        {
-          /* Buffer is too small so reallocate a larger buffer.  */
-          pos = ptr - buf;
-          newsize = (*n << 1);
-          buf = realloc (buf, newsize);
-          if (buf == NULL)
-            {
-              cont = 0;
-              break;
-            }
-
-          /* After reallocating, continue in new buffer */          
-          *bufptr = buf;
-          *n = newsize;
-          ptr = buf + pos;
-          numbytes = newsize - pos;
-        }
-    }
-
-  _funlockfile (fp);
-
-  /* if no input data, return failure */
-  if (ptr == buf)
-    return -1;
-
-  /* otherwise, nul-terminate and return number of bytes read */
-  *ptr = '\0';
-  return (ssize_t)(ptr - buf);
-}
-
diff --git a/newlib/libc/stdio/getline.c b/newlib/libc/stdio/getline.c
deleted file mode 100644
index c758ae9..0000000
--- a/newlib/libc/stdio/getline.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2002, Red Hat Inc. - all rights reserved */
-/*
-FUNCTION
-<<getline>>---read a line from a file
-
-INDEX
-        getline
-
-ANSI_SYNOPSIS
-        #include <stdio.h>
-        ssize_t getline(char **<[bufptr]>, size_t *<[n]>, FILE *<[fp]>);
-
-TRAD_SYNOPSIS
-        #include <stdio.h>
-        ssize_t getline(<[bufptr]>, <[n]>, <[fp]>)
-        char **<[bufptr]>;
-        size_t *<[n]>;
-        FILE *<[fp]>;
-
-DESCRIPTION
-<<getline>> reads a file <[fp]> up to and possibly including the
-newline character.  The line is read into a buffer pointed to
-by <[bufptr]> and designated with size *<[n]>.  If the buffer is
-not large enough, it will be dynamically grown by <<getdelim>>.
-As the buffer is grown, the pointer to the size <[n]> will be
-updated.
-
-<<getline>> is equivalent to getdelim(bufptr, n, '\n', fp);
-
-RETURNS
-<<getline>> returns <<-1>> if no characters were successfully read,
-otherwise, it returns the number of bytes successfully read.
-at end of file, the result is nonzero.
-
-PORTABILITY
-<<getline>> is a glibc extension.
-
-No supporting OS subroutines are directly required.
-*/
-
-#include <_ansi.h>
-#include <stdio.h>
-
-extern ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
-
-ssize_t
-_DEFUN(__getline, (lptr, n, fp),
-       char **lptr _AND
-       size_t *n   _AND
-       FILE *fp)
-{
-  return __getdelim (lptr, n, '\n', fp);
-}
-
diff --git a/newlib/libc/stdio/gets.c b/newlib/libc/stdio/gets.c
index b90271f..796100e 100644
--- a/newlib/libc/stdio/gets.c
+++ b/newlib/libc/stdio/gets.c
@@ -15,10 +15,11 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+
 /*
-FUNCTION
-<<gets>>---get character string (obsolete, use <<fgets>> instead)
 
+FUNCTION
+        <<gets>>---get character string (obsolete, use <<fgets>> instead)
 INDEX
 	gets
 INDEX
@@ -29,7 +30,7 @@ ANSI_SYNOPSIS
 
 	char *gets(char *<[buf]>);
 
-	char *_gets_r(struct _reent *<[reent]>, char *<[buf]>);
+	char *_gets_r(void *<[reent]>, char *<[buf]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -38,7 +39,7 @@ TRAD_SYNOPSIS
 	char *<[buf]>;
 
 	char *_gets_r(<[reent]>, <[buf]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[buf]>;
 
 DESCRIPTION
@@ -67,14 +68,12 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 
 char *
-_DEFUN(_gets_r, (ptr, buf),
-       struct _reent *ptr _AND
-       char *buf)
+_gets_r (ptr, buf)
+     struct _reent *ptr;
+     char *buf;
 {
   register int c;
   register char *s = buf;
@@ -94,8 +93,8 @@ _DEFUN(_gets_r, (ptr, buf),
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN(gets, (buf),
-       char *buf)
+gets (buf)
+     char *buf;
 {
   return _gets_r (_REENT, buf);
 }
diff --git a/newlib/libc/stdio/getw.c b/newlib/libc/stdio/getw.c
index 210c593..b6fd873 100644
--- a/newlib/libc/stdio/getw.c
+++ b/newlib/libc/stdio/getw.c
@@ -37,15 +37,14 @@ to get the next word from the file or stream identified by <[fp]>.  As
 a side effect, <<getw>> advances the file's current position
 indicator.
 
-RETURNS
-The next word (read as an <<int>>), unless there is no more
-data or the host system reports a read error; in either of these
+RETURNS The next word (read as an <<int>>), unless there is no more
+data, or the host system reports a read error; in either of these
 situations, <<getw>> returns <<EOF>>.  Since <<EOF>> is a valid
 <<int>>, you must use <<ferror>> or <<feof>> to distinguish these
 situations.
 
 PORTABILITY
-<<getw>> is a remnant of K&R C; it is not part of any ISO C Standard.
+<<getw>> is a remnant of K&R C, it is not part of any ISO C Standard.
 <<fread>> should be used instead.  In fact, this implementation of
 <<getw>> is based upon <<fread>>.
 
@@ -55,15 +54,14 @@ Supporting OS subroutines required: <<fread>>.  */
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
-#include <_ansi.h>
 #include <stdio.h>
 
 int
-_DEFUN(getw, (fp),
-       register FILE *fp)
+getw (fp)
+     register FILE *fp;
 {
   int result;
-  if (fread ((char*)&result, sizeof (result), 1, fp) != 1)
+  if (fread((char*)&result, sizeof(result), 1, fp) != 1)
     return EOF;
   return result;
 }
diff --git a/newlib/libc/stdio/iprintf.c b/newlib/libc/stdio/iprintf.c
index c9a0264..f054043 100644
--- a/newlib/libc/stdio/iprintf.c
+++ b/newlib/libc/stdio/iprintf.c
@@ -1,80 +1,118 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
+FUNCTION
+        <<iprintf>>---write formatted output (integer only)
+INDEX
+	iprintf
+
+ANSI_SYNOPSIS
+        #include <stdio.h>
+
+        int iprintf(const char *<[format]>, ...);
+
+TRAD_SYNOPSIS
+	#include <stdio.h>
+
+	int iprintf(<[format]> [, <[arg]>, ...])
+	char *<[format]>;
+
+DESCRIPTION
+<<iprintf>> is a restricted version of <<printf>>: it has the same
+arguments and behavior, save that it cannot perform any floating-point
+formatting: the <<f>>, <<g>>, <<G>>, <<e>>, and <<F>> type specifiers
+are not recognized.
+
+RETURNS
+        <<iprintf>> returns the number of bytes in the output string,
+        save that the concluding <<NULL>> is not counted.
+        <<iprintf>> returns when the end of the format string is
+        encountered.  If an error occurs, <<iprintf>>
+        returns <<EOF>>.
+
+PORTABILITY
+<<iprintf>> is not required by ANSI C.
+
+Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
+<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
+*/
 
 #include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include "local.h"
 
 #ifndef _REENT_ONLY
 
 #ifdef _HAVE_STDC
+
+#include <stdarg.h>
+
 int
-iprintf(_CONST char *fmt,...)
-#else
-int
-iprintf(fmt, va_alist)
-        char *fmt;
-        va_dcl
-#endif
+iprintf (const char *fmt,...)
 {
   int ret;
   va_list ap;
 
-  _REENT_SMALL_CHECK_INIT (_REENT);
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
+  _stdout_r (_REENT)->_data = _REENT;
+  ret = vfiprintf (stdout, fmt, ap);
+  va_end (ap);
+  return ret;
+}
+
 #else
+
+#include <varargs.h>
+
+int
+iprintf (fmt, va_alist)
+     char *fmt;
+     va_dcl
+{
+  int ret;
+  va_list ap;
+
   va_start (ap);
-#endif
+  _stdout_r (_REENT)->_data = _REENT;
   ret = vfiprintf (stdout, fmt, ap);
   va_end (ap);
   return ret;
 }
 
+#endif /* ! _HAVE_STDC */
 #endif /* ! _REENT_ONLY */
 
 #ifdef _HAVE_STDC
+
+#include <stdarg.h>
+
 int
-_iprintf_r(struct _reent *ptr, _CONST char *fmt, ...)
-#else
-int
-_iprintf_r(ptr, fmt, va_alist)
-           struct _reent *ptr;
-           char *fmt;
-           va_dcl
-#endif
+_iprintf_r (struct _reent *ptr, const char *fmt, ...)
 {
   int ret;
   va_list ap;
 
-  _REENT_SMALL_CHECK_INIT (ptr);
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
+  ret = vfiprintf (_stdout_r (ptr), fmt, ap);
+  va_end (ap);
+  return ret;
+}
+
 #else
+
+#include <varargs.h>
+
+int
+_iprintf_r (data, fmt, va_alist)
+     char *data;
+     char *fmt;
+     va_dcl
+{
+  int ret;
+  struct _reent *ptr = data;
+  va_list ap;
+
   va_start (ap);
-#endif
-  ret = _vfiprintf_r (ptr, _stdout_r (ptr), fmt, ap);
+  ret = vfiprintf (_stdout_r (ptr), fmt, ap);
   va_end (ap);
   return ret;
 }
 
+#endif
diff --git a/newlib/libc/stdio/iscanf.c b/newlib/libc/stdio/iscanf.c
deleted file mode 100644
index f35acd2..0000000
--- a/newlib/libc/stdio/iscanf.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include "local.h"
-
-#ifndef _REENT_ONLY
-
-int
-#ifdef _HAVE_STDC
-iscanf(_CONST char *fmt, ...)
-#else
-iscanf(fmt, va_alist)
-      char *fmt;
-      va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-
-  _REENT_SMALL_CHECK_INIT (_REENT);
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = __svfiscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-  va_end (ap);
-  return ret;
-}
-
-#endif /* !_REENT_ONLY */
-
-int
-#ifdef _HAVE_STDC
-_iscanf_r(struct _reent *ptr, _CONST char *fmt, ...)
-#else
-_iscanf_r(ptr, fmt, va_alist)
-         struct _reent *ptr;
-         char *fmt;
-         va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-
-  _REENT_SMALL_CHECK_INIT (ptr);
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = __svfiscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-  va_end (ap);
-  return (ret);
-}
-
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
index f7093b6..8b55503 100644
--- a/newlib/libc/stdio/local.h
+++ b/newlib/libc/stdio/local.h
@@ -23,38 +23,36 @@
  */
 
 #include <_ansi.h>
-#include <reent.h>
 #include <stdarg.h>
 #include <reent.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 extern int    _EXFUN(__svfscanf_r,(struct _reent *,FILE *, _CONST char *,va_list));
-extern int    _EXFUN(__svfiscanf_r,(struct _reent *,FILE *, _CONST char *,va_list));
 extern FILE  *_EXFUN(__sfp,(struct _reent *));
 extern int    _EXFUN(__sflags,(struct _reent *,_CONST char*, int*));
 extern int    _EXFUN(__srefill,(FILE *));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__sread,(_PTR, char *, int));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite,(_PTR, char _CONST *, int));
-extern _fpos_t _EXFUN(__sseek,(_PTR, _fpos_t, int));
-extern int    _EXFUN(__sclose,(_PTR));
+extern _READ_WRITE_RETURN_TYPE _EXFUN(__sread,(void *, char *, int));
+extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite,(void *, char const *, int));
+extern fpos_t _EXFUN(__sseek,(void *, fpos_t, int));
+extern int    _EXFUN(__sclose,(void *));
 extern int    _EXFUN(__stextmode,(int));
-extern _VOID   _EXFUN(__sinit,(struct _reent *));
-extern _VOID   _EXFUN(_cleanup_r,(struct _reent *));
-extern _VOID   _EXFUN(__smakebuf,(FILE *));
+extern void   _EXFUN(__sinit,(struct _reent *));
+extern void   _EXFUN(_cleanup_r,(struct _reent *));
+extern void   _EXFUN(__smakebuf,(FILE *));
 extern int    _EXFUN(_fwalk,(struct _reent *, int (*)(FILE *)));
-extern int    _EXFUN(_fwalk_reent,(struct _reent *, int (*)(struct _reent *, FILE *)));
 struct _glue * _EXFUN(__sfmoreglue,(struct _reent *,int n));
 extern int   _EXFUN(__srefill,(FILE *fp));
 
 /* Called by the main entry point fns to ensure stdio has been initialized.  */
 
-#define CHECK_INIT(ptr) \
-  do						\
-    {						\
-      if ((ptr) && !(ptr)->__sdidinit)		\
-	__sinit (ptr);				\
-    }						\
+#define CHECK_INIT(fp) \
+  do					\
+    {					\
+      if ((fp)->_data == 0)		\
+	(fp)->_data = _REENT;		\
+      if (!(fp)->_data->__sdidinit)	\
+	__sinit ((fp)->_data);		\
+    }					\
   while (0)
 
 /* Return true iff the given FILE cannot be written now.  */
@@ -69,14 +67,14 @@ extern int   _EXFUN(__srefill,(FILE *fp));
 #define	HASUB(fp) ((fp)->_ub._base != NULL)
 #define	FREEUB(fp) { \
 	if ((fp)->_ub._base != (fp)->_ubuf) \
-		_free_r(_REENT, (char *)(fp)->_ub._base); \
+		_free_r(fp->_data, (char *)(fp)->_ub._base); \
 	(fp)->_ub._base = NULL; \
 }
 
 /* Test for an fgetline() buffer.  */
 
 #define	HASLB(fp) ((fp)->_lb._base != NULL)
-#define	FREELB(fp) { _free_r(_REENT,(char *)(fp)->_lb._base); (fp)->_lb._base = NULL; }
+#define	FREELB(fp) { _free_r(fp->_data,(char *)(fp)->_lb._base); (fp)->_lb._base = NULL; }
 
 /* WARNING: _dcvt is defined in the stdlib directory, not here!  */
 
@@ -91,15 +89,3 @@ char *_EXFUN(_llicvt,(char *, long long, char));
 #define CVT_BUF_SIZE 128
 
 #define	NDYNAMIC 4	/* add four more whenever necessary */
-
-#ifdef __SINGLE_THREAD__
-#define __sfp_lock_acquire()
-#define __sfp_lock_release()
-#define __sinit_lock_acquire()
-#define __sinit_lock_release()
-#else
-_VOID _EXFUN(__sfp_lock_acquire,(_VOID));
-_VOID _EXFUN(__sfp_lock_release,(_VOID));
-_VOID _EXFUN(__sinit_lock_acquire,(_VOID));
-_VOID _EXFUN(__sinit_lock_release,(_VOID));
-#endif
diff --git a/newlib/libc/stdio/makebuf.c b/newlib/libc/stdio/makebuf.c
index c4d03ec..4a09c4d 100644
--- a/newlib/libc/stdio/makebuf.c
+++ b/newlib/libc/stdio/makebuf.c
@@ -1,3 +1,5 @@
+/* No user fns here.  Pesch 15apr92. */
+
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,14 +16,13 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* No user fns here.  Pesch 15apr92. */
 
-#include <_ansi.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/unistd.h>
+
 #include "local.h"
 
 /*
@@ -32,9 +33,9 @@
  * optimization) right after the _fstat() that finds the buffer size.
  */
 
-_VOID
-_DEFUN(__smakebuf, (fp),
-       register FILE *fp)
+void
+__smakebuf (fp)
+     register FILE *fp;
 {
   register size_t size, couldbetty;
   register _PTR p;
@@ -46,11 +47,7 @@ _DEFUN(__smakebuf, (fp),
       fp->_bf._size = 1;
       return;
     }
-#ifdef __USE_INTERNAL_STAT64
-  if (fp->_file < 0 || _fstat64_r (_REENT, fp->_file, &st) < 0)
-#else
-  if (fp->_file < 0 || _fstat_r (_REENT, fp->_file, &st) < 0)
-#endif
+  if (fp->_file < 0 || _fstat_r (fp->_data, fp->_file, &st) < 0)
     {
       couldbetty = 0;
       size = BUFSIZ;
@@ -81,7 +78,7 @@ _DEFUN(__smakebuf, (fp),
       else
 	fp->_flags |= __SNPT;
     }
-  if ((p = _malloc_r (_REENT, size)) == NULL)
+  if ((p = _malloc_r (fp->_data, size)) == NULL)
     {
       fp->_flags |= __SNBF;
       fp->_bf._base = fp->_p = fp->_nbuf;
@@ -89,7 +86,7 @@ _DEFUN(__smakebuf, (fp),
     }
   else
     {
-      _REENT->__cleanup = _cleanup_r;
+      fp->_data->__cleanup = _cleanup_r;
       fp->_flags |= __SMBF;
       fp->_bf._base = fp->_p = (unsigned char *) p;
       fp->_bf._size = size;
diff --git a/newlib/libc/stdio/mktemp.c b/newlib/libc/stdio/mktemp.c
index 59e7a5c..8615908 100644
--- a/newlib/libc/stdio/mktemp.c
+++ b/newlib/libc/stdio/mktemp.c
@@ -1,3 +1,8 @@
+/* This is file MKTEMP.C */
+/* This file may have been modified by DJ Delorie (Jan 1991).  If so,
+** these modifications are Copyright (C) 1991 DJ Delorie
+*/
+
 /*
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
@@ -16,10 +21,6 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* This is file MKTEMP.C */
-/* This file may have been modified by DJ Delorie (Jan 1991).  If so,
-** these modifications are Copyright (C) 1991 DJ Delorie.
-*/
 
 /*
 FUNCTION
@@ -39,8 +40,8 @@ ANSI_SYNOPSIS
 	char *mktemp(char *<[path]>);
 	int mkstemp(char *<[path]>);
 
-	char *_mktemp_r(struct _reent *<[reent]>, char *<[path]>);
-	int *_mkstemp_r(struct _reent *<[reent]>, char *<[path]>);
+	char *_mktemp_r(void *<[reent]>, char *<[path]>);
+	int *_mkstemp_r(void *<[reent]>, char *<[path]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -51,11 +52,11 @@ TRAD_SYNOPSIS
 	char *<[path]>;
 
 	char *_mktemp_r(<[reent]>, <[path]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[path]>;
 
 	int _mkstemp_r(<[reent]>, <[path]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[path]>;
 
 DESCRIPTION
@@ -92,20 +93,19 @@ V Interface Definition requires <<mktemp>> as of Issue 2.
 Supporting OS subroutines required: <<getpid>>, <<open>>, <<stat>>.
 */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <reent.h>
 
 static int
-_DEFUN(_gettemp, (ptr, path, doopen),
-       struct _reent *ptr _AND
-       char *path         _AND
-       register int *doopen)
+_DEFUN (_gettemp, (ptr, path, doopen),
+	struct _reent *ptr _AND
+	char *path _AND
+	register int *doopen)
 {
   register char *start, *trv;
   struct stat sbuf;
@@ -132,11 +132,7 @@ _DEFUN(_gettemp, (ptr, path, doopen),
       if (*trv == '/')
 	{
 	  *trv = '\0';
-#ifdef __USE_INTERNAL_STAT64
-	  if (_stat64_r (ptr, path, &sbuf))
-#else
 	  if (_stat_r (ptr, path, &sbuf))
-#endif
 	    return (0);
 	  if (!(sbuf.st_mode & S_IFDIR))
 	    {
@@ -155,18 +151,14 @@ _DEFUN(_gettemp, (ptr, path, doopen),
 	  if ((*doopen = _open_r (ptr, path, O_CREAT | O_EXCL | O_RDWR, 0600))
 	      >= 0)
 	    return 1;
-#if defined(__CYGWIN__)
+#if defined(__CYGWIN32__) || defined(__CYGWIN__)
 	  if (ptr->_errno != EEXIST && ptr->_errno != EACCES)
 #else
 	  if (ptr->_errno != EEXIST)
 #endif
 	    return 0;
 	}
-#ifdef __USE_INTERNAL_STAT64
-      else if (_stat64_r (ptr, path, &sbuf))
-#else
       else if (_stat_r (ptr, path, &sbuf))
-#endif
 	return (ptr->_errno == ENOENT ? 1 : 0);
 
       /* tricky little algorithm for backward compatibility */
@@ -190,9 +182,9 @@ _DEFUN(_gettemp, (ptr, path, doopen),
 }
 
 int
-_DEFUN(_mkstemp_r, (ptr, path),
-       struct _reent *ptr _AND
-       char *path)
+_DEFUN (_mkstemp_r, (ptr, path),
+	struct _reent *ptr _AND
+	char *path)
 {
   int fd;
 
@@ -200,9 +192,9 @@ _DEFUN(_mkstemp_r, (ptr, path),
 }
 
 char *
-_DEFUN(_mktemp_r, (ptr, path),
-       struct _reent *ptr _AND
-       char *path)
+_DEFUN (_mktemp_r, (ptr, path),
+	struct _reent *ptr _AND
+	char *path)
 {
   return (_gettemp (ptr, path, (int *) NULL) ? path : (char *) NULL);
 }
@@ -210,8 +202,8 @@ _DEFUN(_mktemp_r, (ptr, path),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(mkstemp, (path),
-       char *path)
+_DEFUN (mkstemp, (path),
+	char *path)
 {
   int fd;
 
@@ -219,8 +211,8 @@ _DEFUN(mkstemp, (path),
 }
 
 char *
-_DEFUN(mktemp, (path),
-       char *path)
+_DEFUN (mktemp, (path),
+	char *path)
 {
   return (_gettemp (_REENT, path, (int *) NULL) ? path : (char *) NULL);
 }
diff --git a/newlib/libc/stdio/perror.c b/newlib/libc/stdio/perror.c
index 5dbf332..abb595b 100644
--- a/newlib/libc/stdio/perror.c
+++ b/newlib/libc/stdio/perror.c
@@ -1,21 +1,4 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
 FUNCTION
 <<perror>>---print an error message on standard error
 
@@ -28,7 +11,7 @@ ANSI_SYNOPSIS
 	#include <stdio.h>
 	void perror(char *<[prefix]>);
 
-	void _perror_r(struct _reent *<[reent]>, char *<[prefix]>);
+	void _perror_r(void *<[reent]>, char *<[prefix]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -36,7 +19,7 @@ TRAD_SYNOPSIS
 	char *<[prefix]>;
 
 	void _perror_r(<[reent]>, <[prefix]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[prefix]>;
 
 DESCRIPTION
@@ -50,6 +33,7 @@ of the strings described for <<strerror>>.
 The alternate function <<_perror_r>> is a reentrant version.  The
 extra argument <[reent]> is a pointer to a reentrancy structure.
 
+
 RETURNS
 <<perror>> returns no result.
 
@@ -61,20 +45,17 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
-#include <reent.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
-#include "local.h"
 
-_VOID
-_DEFUN(_perror_r, (ptr, s),
-       struct _reent *ptr _AND
-       _CONST char *s)
+void
+_DEFUN (_perror_r, (ptr, s),
+	struct _reent *ptr _AND
+	_CONST char *s)
 {
   char *error;
 
-  _REENT_SMALL_CHECK_INIT (ptr);
   if (s != NULL && *s != '\0')
     {
       fputs (s, _stderr_r (ptr));
@@ -89,9 +70,9 @@ _DEFUN(_perror_r, (ptr, s),
 
 #ifndef _REENT_ONLY
 
-_VOID
-_DEFUN(perror, (s),
-       _CONST char *s)
+void
+_DEFUN (perror, (s),
+	_CONST char *s)
 {
   _perror_r (_REENT, s);
 }
diff --git a/newlib/libc/stdio/printf.c b/newlib/libc/stdio/printf.c
index 19f465e..81fb8a2 100644
--- a/newlib/libc/stdio/printf.c
+++ b/newlib/libc/stdio/printf.c
@@ -1,79 +1,83 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
 
 #include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
+
 #ifdef _HAVE_STDC
+
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include "local.h"
 
-#ifdef _HAVE_STDC
 int
-_printf_r(struct _reent *ptr, _CONST char *fmt, ...)
-#else
-int
-_printf_r(ptr, fmt, va_alist)
-          struct _reent *ptr;
-          char *fmt;
-          va_dcl
-#endif
+_printf_r (struct _reent *ptr, const char *fmt, ...)
 {
   int ret;
   va_list ap;
 
-  _REENT_SMALL_CHECK_INIT (ptr);
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
+  ret = _vfprintf_r (ptr, _stdout_r (ptr), fmt, ap);
+  va_end (ap);
+  return ret;
+}
+
 #else
+
+#include <varargs.h>
+
+int
+_printf_r (ptr, fmt, va_alist)
+     struct _reent *ptr;
+     char *fmt;
+     va_dcl
+{
+  int ret;
+  va_list ap;
+
   va_start (ap);
-#endif
   ret = _vfprintf_r (ptr, _stdout_r (ptr), fmt, ap);
   va_end (ap);
   return ret;
 }
 
+#endif
+
+
 #ifndef _REENT_ONLY
 
 #ifdef _HAVE_STDC
+
+#include <stdarg.h>
+
 int
-printf(_CONST char *fmt, ...)
-#else
-int
-printf(fmt, va_alist)
-       char *fmt;
-       va_dcl
-#endif
+printf (const char *fmt, ...)
 {
   int ret;
   va_list ap;
 
-  _REENT_SMALL_CHECK_INIT (_REENT);
-#ifdef _HAVE_STDC
   va_start (ap, fmt);
+  _stdout_r (_REENT)->_data = _REENT;
+  ret = vfprintf (_stdout_r (_REENT), fmt, ap);
+  va_end (ap);
+  return ret;
+}
+
 #else
+
+#include <varargs.h>
+
+int
+printf (fmt, va_alist)
+     char *fmt;
+     va_dcl
+{
+  int ret;
+  va_list ap;
+
   va_start (ap);
-#endif
+  _stdout_r (_REENT)->_data = _REENT;
   ret = vfprintf (_stdout_r (_REENT), fmt, ap);
   va_end (ap);
   return ret;
 }
 
+#endif /* ! _HAVE_STDC */
+
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/putc.c b/newlib/libc/stdio/putc.c
index 0973234..27a7a42 100644
--- a/newlib/libc/stdio/putc.c
+++ b/newlib/libc/stdio/putc.c
@@ -65,9 +65,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
-#include <_ansi.h>
 #include <stdio.h>
-#include "local.h"
 
 /*
  * A subroutine version of the macro putc.
@@ -76,14 +74,11 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #undef putc
 
 int
-_DEFUN(putc, (c, fp),
-       int c _AND
-       register FILE *fp)
+putc (c, fp)
+     int c;
+     register FILE *fp;
 {
-  int result;
-  CHECK_INIT (_REENT);
-  _flockfile (fp);
-  result = __sputc (c, fp);
-  _funlockfile (fp);
-  return result;
+  /* CHECK_INIT is (eventually) called by __swbuf.  */
+
+  return __sputc (c, fp);
 }
diff --git a/newlib/libc/stdio/putc_u.c b/newlib/libc/stdio/putc_u.c
deleted file mode 100644
index aee11f4..0000000
--- a/newlib/libc/stdio/putc_u.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<putc_unlocked>>---non-thread-safe version of putc (macro)
-
-INDEX
-	putc_unlocked
-
-POSIX_SYNOPSIS
-	#include <stdio.h>
-	int putc_unlocked(int <[ch]>, FILE *<[fp]>);
-
-DESCRIPTION
-<<putc_unlocked>> is a non-thread-safe version of <<putc>> declared in
-<<stdio.h>>.  <<putc_unlocked>> may only safely be used within a scope
-protected by flockfile() (or ftrylockfile()) and funlockfile().  These
-functions may safely be used in a multi-threaded program if and only
-if they are called while the invoking thread owns the ( FILE *)
-object, as is the case after a successful call to the flockfile() or
-ftrylockfile() functions.  If threads are disabled, then
-<<putc_unlocked>> is equivalent to <<putc>>.
-
-RETURNS
-See <<putc>>.
-
-PORTABILITY
-POSIX 1003.1 requires <<putc_unlocked>>.  <<putc_unlocked>> may be
-implemented as a macro, so arguments should not have side-effects.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-*/
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "%W% (Berkeley) %G%";
-#endif /* LIBC_SCCS and not lint */
-
-#include <_ansi.h>
-#include <stdio.h>
-
-/*
- * A subroutine version of the macro putc_unlocked.
- */
-
-#undef putc_unlocked
-
-int
-_DEFUN(putc_unlocked, (c, fp),
-       int c _AND
-       register FILE *fp)
-{
-  /* CHECK_INIT is (eventually) called by __swbuf.  */
-
-  return __sputc (c, fp);
-}
diff --git a/newlib/libc/stdio/putchar.c b/newlib/libc/stdio/putchar.c
index e1d748a..462393f 100644
--- a/newlib/libc/stdio/putchar.c
+++ b/newlib/libc/stdio/putchar.c
@@ -28,7 +28,7 @@ ANSI_SYNOPSIS
 	#include <stdio.h>
 	int putchar(int <[ch]>);
 
-	int _putchar_r(struct _reent *<[reent]>, int <[ch]>);
+	int _putchar_r(void *<[reent]>, int <[ch]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -36,7 +36,7 @@ TRAD_SYNOPSIS
 	int <[ch]>;
 
 	int _putchar_r(<[reent]>, <[ch]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	int <[ch]>;
 
 DESCRIPTION
@@ -65,30 +65,26 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
 /*
- * A subroutine version of the macro putchar.
+ * A subroutine version of the macro putchar
  */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
-#include "local.h"
 
 #undef putchar
 
 int
-_DEFUN(_putchar_r, (ptr, c),
-       struct _reent *ptr _AND
-       int c)
+_putchar_r (ptr, c)
+     struct _reent *ptr;
+     int c;
 {
-  _REENT_SMALL_CHECK_INIT (ptr);
-  return putc (c, _stdout_r (ptr));
+  return __sputc (c, _stdout_r (ptr));
 }
 
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(putchar, (c),
-       int c)
+putchar (c)
+     int c;
 {
   /* CHECK_INIT is (eventually) called by __swbuf.  */
 
diff --git a/newlib/libc/stdio/putchar_u.c b/newlib/libc/stdio/putchar_u.c
deleted file mode 100644
index 423ad77..0000000
--- a/newlib/libc/stdio/putchar_u.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<putchar_unlocked>>---non-thread-safe version of putchar (macro)
-
-INDEX
-	putchar_unlocked
-
-POSIX_SYNOPSIS
-	#include <stdio.h>
-	int putchar_unlocked(int <[ch]>);
-
-DESCRIPTION
-<<putchar_unlocked>> is a non-thread-safe version of <<putchar>>
-declared in <<stdio.h>>.  <<putchar_unlocked>> may only safely be used
-within a scope protected by flockfile() (or ftrylockfile()) and
-funlockfile().  These functions may safely be used in a multi-threaded
-program if and only if they are called while the invoking thread owns
-the ( FILE *) object, as is the case after a successful call to the
-flockfile() or ftrylockfile() functions.  If threads are disabled,
-then <<putchar_unlocked>> is equivalent to <<putchar>>.
-
-RETURNS
-See <<putchar>>.
-
-PORTABILITY
-POSIX 1003.1 requires <<putchar_unlocked>>.  <<putchar_unlocked>> may
-be implemented as a macro.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.  */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "%W% (Berkeley) %G%";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * A subroutine version of the macro putchar_unlocked.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-
-#undef putchar_unlocked
-
-int
-_DEFUN(_putchar_unlocked_r, (ptr, c),
-       struct _reent *ptr _AND
-       int c)
-{
-  return putc_unlocked (c, _stdout_r (ptr));
-}
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN(putchar_unlocked, (c),
-       int c)
-{
-  /* CHECK_INIT is (eventually) called by __swbuf.  */
-
-  return _putchar_unlocked_r (_REENT, c);
-}
-
-#endif
diff --git a/newlib/libc/stdio/puts.c b/newlib/libc/stdio/puts.c
index bf32d04..44f17cc 100644
--- a/newlib/libc/stdio/puts.c
+++ b/newlib/libc/stdio/puts.c
@@ -28,7 +28,7 @@ ANSI_SYNOPSIS
 	#include <stdio.h>
 	int puts(const char *<[s]>);
 
-	int _puts_r(struct _reent *<[reent]>, const char *<[s]>);
+	int _puts_r(void *<[reent]>, const char *<[s]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -36,7 +36,7 @@ TRAD_SYNOPSIS
 	char *<[s]>;
 
 	int _puts_r(<[reent]>, <[s]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[s]>;
 
 DESCRIPTION
@@ -55,28 +55,24 @@ ANSI C requires <<puts>>, but does not specify that the result on
 success must be <<0>>; any non-negative value is permitted.
 
 Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-*/
+<<lseek>>, <<read>>, <<sbrk>>, <<write>>.  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #include <string.h>
 #include "fvwrite.h"
-#include "local.h"
 
 /*
  * Write the given string to stdout, appending a newline.
  */
 
 int
-_DEFUN(_puts_r, (ptr, s),
-       struct _reent *ptr _AND
-       _CONST char * s)
+_DEFUN (_puts_r, (ptr, s),
+	struct _reent *ptr _AND
+	_CONST char * s)
 {
   size_t c = strlen (s);
   struct __suio uio;
@@ -90,15 +86,14 @@ _DEFUN(_puts_r, (ptr, s),
   uio.uio_iov = &iov[0];
   uio.uio_iovcnt = 2;
 
-  _REENT_SMALL_CHECK_INIT (ptr);
   return (__sfvwrite (_stdout_r (ptr), &uio) ? EOF : '\n');
 }
 
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(puts, (s),
-       char _CONST * s)
+_DEFUN (puts, (s),
+	char _CONST * s)
 {
   return _puts_r (_REENT, s);
 }
diff --git a/newlib/libc/stdio/putw.c b/newlib/libc/stdio/putw.c
index 682015c..19f4abc 100644
--- a/newlib/libc/stdio/putw.c
+++ b/newlib/libc/stdio/putw.c
@@ -37,16 +37,14 @@ DESCRIPTION
 to write a word to the file or stream identified by <[fp]>.  As a side
 effect, <<putw>> advances the file's current position indicator.
 
-RETURNS
-Zero on success, <<EOF>> on failure.
+RETURNS Zero on success, <<EOF>> on failure.
 
 PORTABILITY
-<<putw>> is a remnant of K&R C; it is not part of any ISO C Standard.
+<<putw>> is a remnant of K&R C, it is not part of any ISO C Standard.
 <<fwrite>> should be used instead.  In fact, this implementation of
 <<putw>> is based upon <<fwrite>>.
 
-Supporting OS subroutines required: <<fwrite>>.
-*/
+Supporting OS subroutines required: <<fwrite>>.  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "%W% (Berkeley) %G%";
@@ -55,11 +53,11 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #include <stdio.h>
 
 int
-_DEFUN(putw, (w, fp),
-       int w _AND
-       register FILE *fp)
+putw (w, fp)
+     int w;
+     register FILE *fp;
 {
-  if (fwrite ((_CONST char*)&w, sizeof (w), 1, fp) != 1)
+  if (fwrite((const char*)&w, sizeof(w), 1, fp) != 1)
     return EOF;
   return 0;
 }
diff --git a/newlib/libc/stdio/refill.c b/newlib/libc/stdio/refill.c
index 639ce6e..ca48a45 100644
--- a/newlib/libc/stdio/refill.c
+++ b/newlib/libc/stdio/refill.c
@@ -1,3 +1,5 @@
+/* No user fns here.  Pesch 15apr92. */
+
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,16 +16,14 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* No user fns here.  Pesch 15apr92. */
 
-#include <_ansi.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include "local.h"
+#include <stdlib.h>
 
 static int
-_DEFUN(lflush, (fp),
-       FILE *fp)
+lflush (fp)
+     FILE *fp;
 {
   if ((fp->_flags & (__SLBF | __SWR)) == (__SLBF | __SWR))
     return fflush (fp);
@@ -36,20 +36,18 @@ _DEFUN(lflush, (fp),
  */
 
 int
-_DEFUN(__srefill, (fp),
-       register FILE * fp)
+_DEFUN (__srefill, (fp),
+	register FILE * fp)
 {
   /* make sure stdio is set up */
 
-  CHECK_INIT (_REENT);
+  CHECK_INIT (fp);
 
   fp->_r = 0;			/* largely a convenience for callers */
 
-#ifndef __CYGWIN__
   /* SysV does not make this test; take it out for compatibility */
   if (fp->_flags & __SEOF)
     return EOF;
-#endif
 
   /* if not already reading, have to be reading and writing */
   if ((fp->_flags & __SRD) == 0)
@@ -96,17 +94,11 @@ _DEFUN(__srefill, (fp),
    */
 
   if (fp->_flags & (__SLBF | __SNBF))
-    _CAST_VOID _fwalk (_GLOBAL_REENT, lflush);
+    (void) _fwalk (fp->_data, lflush);
   fp->_p = fp->_bf._base;
   fp->_r = (*fp->_read) (fp->_cookie, (char *) fp->_p, fp->_bf._size);
   fp->_flags &= ~__SMOD;	/* buffer contents are again pristine */
-#ifndef __CYGWIN__
   if (fp->_r <= 0)
-#else
-  if (fp->_r > 0)
-    fp->_flags &= ~__SEOF;
-  else
-#endif
     {
       if (fp->_r == 0)
 	fp->_flags |= __SEOF;
diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
index e026ce5..b24ce71 100644
--- a/newlib/libc/stdio/remove.c
+++ b/newlib/libc/stdio/remove.c
@@ -1,21 +1,4 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
 FUNCTION
 <<remove>>---delete a file's name
 
@@ -26,7 +9,7 @@ ANSI_SYNOPSIS
 	#include <stdio.h>
 	int remove(char *<[filename]>);
 
-	int _remove_r(struct _reent *<[reent]>, char *<[filename]>);
+	int _remove_r(void *<[reent]>, char *<[filename]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -34,7 +17,7 @@ TRAD_SYNOPSIS
 	char *<[filename]>;
 
 	int _remove_r(<[reent]>, <[filename]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[filename]>;
 
 DESCRIPTION
@@ -61,14 +44,13 @@ open file may vary among implementations.
 Supporting OS subroutine required: <<unlink>>.
 */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
+#include <reent.h>
 
 int
-_DEFUN(_remove_r, (ptr, filename),
-       struct _reent *ptr _AND
-       _CONST char *filename)
+_remove_r (ptr, filename)
+     struct _reent *ptr;
+     _CONST char *filename;
 {
   if (_unlink_r (ptr, filename) == -1)
     return -1;
@@ -79,8 +61,8 @@ _DEFUN(_remove_r, (ptr, filename),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(remove, (filename),
-       _CONST char *filename)
+remove (filename)
+     _CONST char *filename;
 {
   return _remove_r (_REENT, filename);
 }
diff --git a/newlib/libc/stdio/rename.c b/newlib/libc/stdio/rename.c
index 4fa8e39..19a6afd 100644
--- a/newlib/libc/stdio/rename.c
+++ b/newlib/libc/stdio/rename.c
@@ -1,21 +1,4 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
 FUNCTION
 <<rename>>---rename a file
 
@@ -28,7 +11,7 @@ ANSI_SYNOPSIS
 	#include <stdio.h>
 	int rename(const char *<[old]>, const char *<[new]>);
 
-	int _rename_r(struct _reent *<[reent]>, 
+	int _rename_r(void *<[reent]>, 
                       const char *<[old]>, const char *<[new]>);
 
 TRAD_SYNOPSIS
@@ -38,7 +21,7 @@ TRAD_SYNOPSIS
 	char *<[new]>;
 
 	int _rename_r(<[reent]>, <[old]>, <[new]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[old]>;
 	char *<[new]>;
 
@@ -65,16 +48,15 @@ as <<*<[new]>>> may vary from one implementation to another.
 Supporting OS subroutines required: <<link>>, <<unlink>>, or <<rename>>.
 */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #include <sys/unistd.h>
+#include <reent.h>
 
 int
-_DEFUN(_rename_r, (ptr, old, new),
-       struct _reent *ptr _AND
-       _CONST char *old   _AND
-       _CONST char *new)
+_rename_r (ptr, old, new)
+     struct _reent *ptr;
+     _CONST char *old;
+     _CONST char *new;
 {
 #ifdef HAVE_RENAME
   return _rename (old,new);
@@ -94,9 +76,9 @@ _DEFUN(_rename_r, (ptr, old, new),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(rename, (old, new),
-       _CONST char *old _AND
-       _CONST char *new)
+rename (old, new)
+     _CONST char *old;
+     _CONST char *new;
 {
   return _rename_r (_REENT, old, new);
 }
diff --git a/newlib/libc/stdio/rewind.c b/newlib/libc/stdio/rewind.c
index 58f4cc3..9052757 100644
--- a/newlib/libc/stdio/rewind.c
+++ b/newlib/libc/stdio/rewind.c
@@ -21,23 +21,16 @@ FUNCTION
 
 INDEX
 	rewind
-INDEX
-	_rewind_r
 
 ANSI_SYNOPSIS
 	#include <stdio.h>
 	void rewind(FILE *<[fp]>);
-	void _rewind_r(struct _reent *<[ptr]>, FILE *<[fp]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
 	void rewind(<[fp]>)
 	FILE *<[fp]>;
 
-	void _rewind_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
 DESCRIPTION
 <<rewind>> returns the file position indicator (if any) for the file
 or stream identified by <[fp]> to the beginning of the file.  It also
@@ -56,26 +49,12 @@ No supporting OS subroutines are required.
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 
-_VOID
-_DEFUN(_rewind_r, (ptr, fp),
-       struct _reent * ptr _AND
-       register FILE * fp)
-{
-  _CAST_VOID _fseek_r (ptr, fp, 0L, SEEK_SET);
-  clearerr (fp);
-}
-
-#ifndef _REENT_ONLY
-
-_VOID
-_DEFUN(rewind, (fp),
-       register FILE * fp)
+void
+_DEFUN (rewind, (fp),
+	register FILE * fp)
 {
-  _CAST_VOID _fseek_r (_REENT, fp, 0L, SEEK_SET);
+	(void) fseek(fp, 0L, SEEK_SET);
+	clearerr(fp);
 }
-
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdio/rget.c b/newlib/libc/stdio/rget.c
index ee4e49e..ea29c2b 100644
--- a/newlib/libc/stdio/rget.c
+++ b/newlib/libc/stdio/rget.c
@@ -1,3 +1,5 @@
+/* No user fns here. Pesch 15apr92. */
+
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,13 +16,11 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* No user fns here. Pesch 15apr92. */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
-#include <_ansi.h>
 #include <stdio.h>
 #include "local.h"
 
@@ -31,8 +31,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
  */
 
 int
-_DEFUN(__srget, (fp),
-       register FILE *fp)
+__srget (fp)
+     register FILE *fp;
 {
   if (__srefill (fp) == 0)
     {
diff --git a/newlib/libc/stdio/scanf.c b/newlib/libc/stdio/scanf.c
index cf1472b..5dd14fd 100644
--- a/newlib/libc/stdio/scanf.c
+++ b/newlib/libc/stdio/scanf.c
@@ -16,30 +16,31 @@
  */
 
 #include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
+#include "local.h"
+
 #ifdef _HAVE_STDC
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
+
 #include "local.h"
 
 #ifndef _REENT_ONLY
 
 int
 #ifdef _HAVE_STDC
-scanf(_CONST char *fmt, ...)
+scanf (const char *fmt, ...)
 #else
-scanf(fmt, va_alist)
-      char *fmt;
-      va_dcl
+scanf (fmt, va_alist)
+     char *fmt;
+     va_dcl
 #endif
 {
   int ret;
   va_list ap;
 
-  _REENT_SMALL_CHECK_INIT (_REENT);
 #ifdef _HAVE_STDC
   va_start (ap, fmt);
 #else
@@ -54,18 +55,17 @@ scanf(fmt, va_alist)
 
 int
 #ifdef _HAVE_STDC
-_scanf_r(struct _reent *ptr, _CONST char *fmt, ...)
+_scanf_r (struct _reent *ptr, const char *fmt, ...)
 #else
-_scanf_r(ptr, fmt, va_alist)
-         struct _reent *ptr;
-         char *fmt;
-         va_dcl
+_scanf_r (ptr, fmt, va_alist)
+     struct _reent *ptr;
+     char *fmt;
+     va_dcl
 #endif
 {
   int ret;
   va_list ap;
 
-  _REENT_SMALL_CHECK_INIT (ptr);
 #ifdef _HAVE_STDC
   va_start (ap, fmt);
 #else
@@ -76,3 +76,4 @@ _scanf_r(ptr, fmt, va_alist)
   return (ret);
 }
 
+
diff --git a/newlib/libc/stdio/sccl.c b/newlib/libc/stdio/sccl.c
deleted file mode 100644
index b018011..0000000
--- a/newlib/libc/stdio/sccl.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* Split from vfscanf.c  */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <newlib.h>
-#include <stdio.h>
-#include "local.h"
-
-/*
- * Fill in the given table from the scanset at the given format
- * (just after `[').  Return a pointer to the character past the
- * closing `]'.  The table has a 1 wherever characters should be
- * considered part of the scanset.
- */
-
-u_char *
-_DEFUN(__sccl, (tab, fmt),
-       register char *tab _AND
-       register u_char *fmt)
-{
-  register int c, n, v;
-
-  /* first `clear' the whole table */
-  c = *fmt++;			/* first char hat => negated scanset */
-  if (c == '^')
-    {
-      v = 1;			/* default => accept */
-      c = *fmt++;		/* get new first char */
-    }
-  else
-    v = 0;			/* default => reject */
-  /* should probably use memset here */
-  for (n = 0; n < 256; n++)
-    tab[n] = v;
-  if (c == 0)
-    return fmt - 1;		/* format ended before closing ] */
-
-  /*
-   * Now set the entries corresponding to the actual scanset to the
-   * opposite of the above.
-   *
-   * The first character may be ']' (or '-') without being special; the
-   * last character may be '-'.
-   */
-
-  v = 1 - v;
-  for (;;)
-    {
-      tab[c] = v;		/* take character c */
-    doswitch:
-      n = *fmt++;		/* and examine the next */
-      switch (n)
-	{
-
-	case 0:		/* format ended too soon */
-	  return fmt - 1;
-
-	case '-':
-	  /*
-	   * A scanset of the form [01+-] is defined as `the digit 0, the
-	   * digit 1, the character +, the character -', but the effect of a
-	   * scanset such as [a-zA-Z0-9] is implementation defined.  The V7
-	   * Unix scanf treats `a-z' as `the letters a through z', but treats
-	   * `a-a' as `the letter a, the character -, and the letter a'.
-	   *
-	   * For compatibility, the `-' is not considerd to define a range if
-	   * the character following it is either a close bracket (required by
-	   * ANSI) or is not numerically greater than the character we just
-	   * stored in the table (c).
-	   */
-	  n = *fmt;
-	  if (n == ']' || n < c)
-	    {
-	      c = '-';
-	      break;		/* resume the for(;;) */
-	    }
-	  fmt++;
-	  do
-	    {			/* fill in the range */
-	      tab[++c] = v;
-	    }
-	  while (c < n);
-#if 1			/* XXX another disgusting compatibility hack */
-	  /*
-	   * Alas, the V7 Unix scanf also treats formats such
-	   * as [a-c-e] as `the letters a through e'. This too
-	   * is permitted by the standard....
-	   */
-	  goto doswitch;
-#else
-	  c = *fmt++;
-	  if (c == 0)
-	    return fmt - 1;
-	  if (c == ']')
-	    return fmt;
-#endif
-
-	  break;
-
-
-	case ']':		/* end of scanset */
-	  return fmt;
-
-	default:		/* just another character */
-	  c = n;
-	  break;
-	}
-    }
-  /* NOTREACHED */
-}
diff --git a/newlib/libc/stdio/setbuf.c b/newlib/libc/stdio/setbuf.c
index 1a8bc6d..15d09e0 100644
--- a/newlib/libc/stdio/setbuf.c
+++ b/newlib/libc/stdio/setbuf.c
@@ -70,10 +70,10 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <stdio.h>
 #include "local.h"
 
-_VOID
-_DEFUN(setbuf, (fp, buf),
-       FILE * fp _AND
-       char *buf)
+void
+_DEFUN (setbuf, (fp, buf),
+	FILE * fp _AND
+	char *buf)
 {
-  _CAST_VOID setvbuf (fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
+  (void) setvbuf (fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
 }
diff --git a/newlib/libc/stdio/setbuffer.c b/newlib/libc/stdio/setbuffer.c
deleted file mode 100644
index e881874..0000000
--- a/newlib/libc/stdio/setbuffer.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-/* 
-Modified copy of setbuf.c to support the setbuffer function
-defined as part of BSD.
-Modifications by Gareth Pearce, 2001.
-*/
-
-/*
-FUNCTION
-<<setbuffer>>---specify full buffering for a file or stream with size
-
-INDEX
-	setbuffer
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	void setbuffer(FILE *<[fp]>, char *<[buf]>, int <[size]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	void setbuffer(<[fp]>, <[buf]>, <[size]>)
-	FILE *<[fp]>;
-	char *<[buf]>;
-	int <[size]>;
-
-DESCRIPTION
-<<setbuffer>> specifies that output to the file or stream identified by
-<[fp]> should be fully buffered.  All output for this file will go to a
-buffer (of size <[size]>).  Output will be passed on to the host system
-only when the buffer is full, or when an input operation intervenes.
-
-You may, if you wish, supply your own buffer by passing a pointer to
-it as the argument <[buf]>.  It must have size <[size]>.  You can
-also use <<NULL>> as the value of <[buf]>, to signal that the
-<<setbuffer>> function is to allocate the buffer.
-
-WARNINGS
-You may only use <<setbuffer>> before performing any file operation
-other than opening the file.
-
-If you supply a non-null <[buf]>, you must ensure that the associated
-storage continues to be available until you close the stream
-identified by <[fp]>.
-
-RETURNS
-<<setbuffer>> does not return a result.
-
-PORTABILITY
-This function comes from BSD not ANSI or POSIX.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-*/
-
-#include <_ansi.h>
-#include <stdio.h>
-#include "local.h"
-
-_VOID
-_DEFUN(setbuffer, (fp, buf, size),
-       FILE * fp _AND
-       char *buf _AND
-       int size)
-{
-  _CAST_VOID setvbuf (fp, buf, buf ? _IOFBF : _IONBF, (size_t) size);
-}
diff --git a/newlib/libc/stdio/setlinebuf.c b/newlib/libc/stdio/setlinebuf.c
deleted file mode 100644
index 0df6a57..0000000
--- a/newlib/libc/stdio/setlinebuf.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-/* 
-Modified copy of setbuf.c to support setlinebuf function
-defined as part of BSD.
-Modifications by Gareth Pearce, 2001.
-*/
-
-/*
-FUNCTION
-<<setlinebuf>>---specify line buffering for a file or stream
-
-INDEX
-	setlinebuf
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	void setlinebuf(FILE *<[fp]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	void setlinebuf(<[fp]>)
-	FILE *<[fp]>;
-
-DESCRIPTION
-<<setlinebuf>> specifies that output to the file or stream identified by
-<[fp]> should be line buffered.  This causes the file or stream to pass
-on output to the host system at every newline, as well as when the
-buffer is full, or when an input operation intervenes.
-
-WARNINGS
-You may only use <<setlinebuf>> before performing any file operation
-other than opening the file.
-
-RETURNS
-<<setlinebuf>> returns as per setvbuf.
-
-PORTABILITY
-This function comes from BSD not ANSI or POSIX.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-*/
-
-#include <_ansi.h>
-#include <stdio.h>
-#include "local.h"
-
-int
-_DEFUN(setlinebuf, (fp),
-       FILE * fp)
-{
-  return (setvbuf (fp, (char *) NULL, _IOLBF, (size_t) 0));
-}
diff --git a/newlib/libc/stdio/setvbuf.c b/newlib/libc/stdio/setvbuf.c
index f6871c5..357ea51 100644
--- a/newlib/libc/stdio/setvbuf.c
+++ b/newlib/libc/stdio/setvbuf.c
@@ -96,17 +96,14 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  */
 
 int
-_DEFUN(setvbuf, (fp, buf, mode, size),
-       register FILE * fp _AND
-       char *buf          _AND
-       register int mode  _AND
-       register size_t size)
+_DEFUN (setvbuf, (fp, buf, mode, size),
+	register FILE * fp _AND
+	char *buf _AND
+	register int mode _AND
+	register size_t size)
 {
   int ret = 0;
-
-  CHECK_INIT (_REENT);
-
-  _flockfile (fp);
+  CHECK_INIT (fp);
 
   /*
    * Verify arguments.  The `int' limit on `size' is due to this
@@ -114,10 +111,7 @@ _DEFUN(setvbuf, (fp, buf, mode, size),
    */
 
   if ((mode != _IOFBF && mode != _IOLBF && mode != _IONBF) || (int)(_POINTER_INT) size < 0)
-    {
-      _funlockfile (fp);
-      return (EOF);
-    }
+    return (EOF);
 
   /*
    * Write current buffer, if any; drop read count, if any.
@@ -126,11 +120,11 @@ _DEFUN(setvbuf, (fp, buf, mode, size),
    * non buffer flags, and clear malloc flag.
    */
 
-  _CAST_VOID fflush (fp);
+  (void) fflush (fp);
   fp->_r = 0;
   fp->_lbfsize = 0;
   if (fp->_flags & __SMBF)
-    _free_r (_REENT, (_PTR) fp->_bf._base);
+    _free_r (fp->_data, (void *) fp->_bf._base);
   fp->_flags &= ~(__SLBF | __SNBF | __SMBF);
 
   if (mode == _IONBF)
@@ -151,16 +145,15 @@ _DEFUN(setvbuf, (fp, buf, mode, size),
 	  size = BUFSIZ;
 	}
       if (buf == NULL)
-        {
-          /* Can't allocate it, let's try another approach */
+	{
+	  /* Can't allocate it, let's try another approach */
 nbf:
-          fp->_flags |= __SNBF;
-          fp->_w = 0;
-          fp->_bf._base = fp->_p = fp->_nbuf;
-          fp->_bf._size = 1;
-          _funlockfile (fp);
-          return (ret);
-        }
+	  fp->_flags |= __SNBF;
+	  fp->_w = 0;
+	  fp->_bf._base = fp->_p = fp->_nbuf;
+	  fp->_bf._size = 1;
+	  return (ret);
+	}
       fp->_flags |= __SMBF;
     }
   /*
@@ -180,7 +173,7 @@ nbf:
 
     case _IOFBF:
       /* no flag */
-      _REENT->__cleanup = _cleanup_r;
+      fp->_data->__cleanup = _cleanup_r;
       fp->_bf._base = fp->_p = (unsigned char *) buf;
       fp->_bf._size = size;
       break;
@@ -193,6 +186,5 @@ nbf:
   if (fp->_flags & __SWR)
     fp->_w = fp->_flags & (__SLBF | __SNBF) ? 0 : size;
 
-  _funlockfile (fp);
   return 0;
 }
diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index 4e8e95a..40bd016 100644
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -1,92 +1,34 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
 FUNCTION
-        <<iprintf>>, <<fiprintf>>, <<asiprintf>>, <<siprintf>>, <<sniprintf>>---format output
-
-INDEX
-	fiprintf
-INDEX
-	iprintf
-INDEX
-	asiprintf
+        <<siprintf>>---write formatted output (integer only)
 INDEX
 	siprintf
-INDEX
-	sniprintf
 
 ANSI_SYNOPSIS
         #include <stdio.h>
 
-        int iprintf(const char *<[format]> [, <[arg]>, ...]);
-        int fiprintf(FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]);
         int siprintf(char *<[str]>, const char *<[format]> [, <[arg]>, ...]);
-        int asiprintf(char **<[strp]>, const char *<[format]> [, <[arg]>, ...]);
-        int sniprintf(char *<[str]>, size_t <[size]>, const char *<[format]>
-                      [, <[arg]>, ...]);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-
-	int iprintf(<[format]> [, <[arg]>, ...])
-	char *<[format]>;
-
-	int fiprintf(<[fd]>, <[format]> [, <[arg]>, ...]);
-	FILE *<[fd]>;
-	char *<[format]>;
-
-	int asiprintf(<[strp]>, <[format]> [, <[arg]>, ...]);
-	char **<[strp]>;
-	char *<[format]>;
 
-	int siprintf(<[str]>, <[format]> [, <[arg]>, ...]);
-	char *<[str]>;
-	char *<[format]>;
-
-	int sniprintf(<[str]>, size_t <[size]>, <[format]> [, <[arg]>, ...]);
-	char *<[str]>;
-        size_t <[size]>;
-	char *<[format]>;
 
 DESCRIPTION
-        <<iprintf>>, <<fiprintf>>, <<siprintf>>, <<sniprintf>>,
-        <<asiprintf>>, are the same as <<printf>>, <<fprintf>>,
-	<<sprintf>>, <<snprintf>>, and <<asprintf>>, respectively,
-	only that they restrict usage to non-floating-point format
-	specifiers.
+<<siprintf>> is a restricted version of <<sprintf>>: it has the same
+arguments and behavior, save that it cannot perform any floating-point
+formatting: the <<f>>, <<g>>, <<G>>, <<e>>, and <<F>> type specifiers
+are not recognized.
 
 RETURNS
-<<siprintf>> and <<asiprintf>> return the number of bytes in the output string,
-save that the concluding <<NULL>> is not counted.
-<<iprintf>> and <<fiprintf>> return the number of characters transmitted.
-If an error occurs, <<iprintf>> and <<fiprintf>> return <<EOF>> and
-<<asiprintf>> returns -1.  No error returns occur for <<siprintf>>.
+        <<siprintf>> returns the number of bytes in the output string,
+        save that the concluding <<NULL>> is not counted.
+        <<siprintf>> returns when the end of the format string is
+        encountered.
 
 PORTABILITY
-<<iprintf>>, <<fiprintf>>, <<siprintf>>, <<sniprintf>>, and <<asprintf>>
-are newlib extensions.
+<<siprintf>> is not required by ANSI C.
 
 Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #ifdef _HAVE_STDC
 #include <stdarg.h>
@@ -94,20 +36,18 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <varargs.h>
 #endif
 #include <limits.h>
+#include <_ansi.h>
+#include <reent.h>
 #include "local.h"
 
 int
 #ifdef _HAVE_STDC
-_DEFUN(_siprintf_r, (ptr, str, fmt),
-       struct _reent *ptr _AND
-       char *str          _AND
-       _CONST char *fmt _DOTS)
+_DEFUN (siprintf, (str, fmt), char *str _AND _CONST char *fmt _DOTS)
 #else
-_siprintf_r(ptr, str, fmt, va_alist)
-           struct _reent *ptr;
-           char *str;
-           _CONST char *fmt;
-           va_dcl
+siprintf (str, fmt, va_alist)
+     char *str;
+     _CONST char *fmt;
+     va_dcl
 #endif
 {
   int ret;
@@ -117,49 +57,14 @@ _siprintf_r(ptr, str, fmt, va_alist)
   f._flags = __SWR | __SSTR;
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = INT_MAX;
-  f._file = -1;  /* No file. */
+  f._data = _REENT;
 #ifdef _HAVE_STDC
   va_start (ap, fmt);
 #else
   va_start (ap);
 #endif
-  ret = _vfiprintf_r (ptr, &f, fmt, ap);
+  ret = vfiprintf (&f, fmt, ap);
   va_end (ap);
   *f._p = 0;
   return (ret);
 }
-
-#ifndef _REENT_ONLY
-
-int
-#ifdef _HAVE_STDC
-_DEFUN(siprintf, (str, fmt),
-       char *str _AND
-       _CONST char *fmt _DOTS)
-#else
-siprintf(str, fmt, va_alist)
-        char *str;
-        _CONST char *fmt;
-        va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-  FILE f;
-
-  f._flags = __SWR | __SSTR;
-  f._bf._base = f._p = (unsigned char *) str;
-  f._bf._size = f._w = INT_MAX;
-  f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = _vfiprintf_r (_REENT, &f, fmt, ap);
-  va_end (ap);
-  *f._p = 0;
-  return (ret);
-}
-
-#endif
diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
deleted file mode 100644
index 694750d..0000000
--- a/newlib/libc/stdio/siscanf.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<iscanf>>, <<fiscanf>>, <<siscanf>>---scan and format non-floating input
-
-INDEX
-	iscanf
-INDEX
-	fiscanf
-INDEX
-	siscanf
-
-ANSI_SYNOPSIS
-        #include <stdio.h>
-
-        int iscanf(const char *<[format]> [, <[arg]>, ...]);
-        int fiscanf(FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]);
-        int siscanf(const char *<[str]>, const char *<[format]> 
-                   [, <[arg]>, ...]);
-
-        int _iscanf_r(struct _reent *<[ptr]>, const char *<[format]>
-                   [, <[arg]>, ...]);
-        int _fiscanf_r(struct _reent *<[ptr]>, FILE *<[fd]>, const char *<[format]>
-                   [, <[arg]>, ...]);
-        int _siscanf_r(struct _reent *<[ptr]>, const char *<[str]>,
-                   const char *<[format]> [, <[arg]>, ...]);
-
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-
-	int iscanf(<[format]> [, <[arg]>, ...])
-	char *<[format]>;
-
-	int fiscanf(<[fd]>, <[format]> [, <[arg]>, ...]);
-	FILE *<[fd]>;
-	char *<[format]>;
-
-	int siscanf(<[str]>, <[format]> [, <[arg]>, ...]);
-	char *<[str]>;
-	char *<[format]>;
-
-	int _iscanf_r(<[ptr]>, <[format]> [, <[arg]>, ...])
-        struct _reent *<[ptr]>;
-	char *<[format]>;
-
-	int _fiscanf_r(<[ptr]>, <[fd]>, <[format]> [, <[arg]>, ...]);
-        struct _reent *<[ptr]>;
-	FILE *<[fd]>;
-	char *<[format]>;
-
-	int _siscanf_r(<[ptr]>, <[str]>, <[format]> [, <[arg]>, ...]);
-        struct _reent *<[ptr]>;
-	char *<[str]>;
-	char *<[format]>;
-
-
-DESCRIPTION
-        <<iscanf>>, <<fiscanf>>, and <<siscanf>> are the same as
-	<<scanf>>, <<fscanf>>, and <<sscanf>> respectively, only that
-	they restrict the available formats to non-floating-point
-	format specifiers.
-
-        The routines <<_iscanf_r>>, <<_fiscanf_r>>, and <<_siscanf_r>> are reentrant
-        versions of <<iscanf>>, <<fiscanf>>, and <<siscanf>> that take an additional
-        first argument pointing to a reentrancy structure.
-
-RETURNS
-        <<iscanf>> returns the number of input fields successfully
-        scanned, converted and stored; the return value does
-        not include scanned fields which were not stored.
-
-        If <<iscanf>> attempts to read at end-of-file, the return
-        value is <<EOF>>.
-
-        If no fields were stored, the return value is <<0>>.
-
-PORTABILITY
-<<iscanf>>, <<fiscanf>>, and <<siscanf>> are newlib extensions.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-*/
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include "local.h"
-
-/* | ARGSUSED */
-/*SUPPRESS 590*/
-static _READ_WRITE_RETURN_TYPE
-_DEFUN(eofread, (cookie, buf, len),
-       _PTR cookie _AND
-       char *buf   _AND
-       int len)
-{
-  return 0;
-}
-
-#ifndef _REENT_ONLY 
-
-#ifdef _HAVE_STDC
-int 
-_DEFUN(siscanf, (str, fmt),
-       _CONST char *str _AND
-       _CONST char *fmt _DOTS)
-#else
-int 
-siscanf(str, fmt, va_alist)
-       _CONST char *str;
-       _CONST char *fmt;
-       va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-  FILE f;
-
-  f._flags = __SRD | __SSTR;
-  f._bf._base = f._p = (unsigned char *) str;
-  f._bf._size = f._r = strlen (str);
-  f._read = eofread;
-  f._ub._base = NULL;
-  f._lb._base = NULL;
-  f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = __svfiscanf_r (_REENT, &f, fmt, ap);
-  va_end (ap);
-  return ret;
-}
-
-#endif /* !_REENT_ONLY */
-
-#ifdef _HAVE_STDC
-int 
-_DEFUN(_siscanf_r, (ptr, str, fmt), 
-       struct _reent *ptr _AND
-       _CONST char *str   _AND
-       _CONST char *fmt _DOTS)
-#else
-int 
-_siscanf_r(ptr, str, fmt, va_alist)
-          struct _reent *ptr;
-          _CONST char *str;
-          _CONST char *fmt;
-          va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-  FILE f;
-
-  f._flags = __SRD | __SSTR;
-  f._bf._base = f._p = (unsigned char *) str;
-  f._bf._size = f._r = strlen (str);
-  f._read = eofread;
-  f._ub._base = NULL;
-  f._lb._base = NULL;
-  f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = __svfiscanf_r (ptr, &f, fmt, ap);
-  va_end (ap);
-  return ret;
-}
diff --git a/newlib/libc/stdio/sniprintf.c b/newlib/libc/stdio/sniprintf.c
deleted file mode 100644
index 7650cd0..0000000
--- a/newlib/libc/stdio/sniprintf.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* This code created by modifying snprintf.c so copyright inherited. */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include <limits.h>
-#include "local.h"
-
-int
-#ifdef _HAVE_STDC
-_DEFUN (_sniprintf_r, (ptr, str, size, fmt), 
-	struct _reent *ptr _AND 
-	char *str _AND 
-	size_t size _AND 
-	_CONST char *fmt _DOTS)
-#else
-_sniprintf_r (ptr, str, size, fmt, va_alist)
-     struct _reent *ptr;
-     char *str;
-     size_t size;
-     _CONST char *fmt;
-     va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-  FILE f;
-
-  f._flags = __SWR | __SSTR;
-  f._bf._base = f._p = (unsigned char *) str;
-  f._bf._size = f._w = (size > 0 ? size - 1 : 0);
-  f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = _vfiprintf_r (ptr, &f, fmt, ap);
-  va_end (ap);
-  if (size > 0)
-    *f._p = 0;
-  return (ret);
-}
-
-#ifndef _REENT_ONLY
-
-int
-#ifdef _HAVE_STDC
-_DEFUN (sniprintf, (str, size, fmt), 
-	char *str _AND 
-	size_t size _AND 
-	_CONST char *fmt _DOTS)
-#else
-sniprintf (str, size, fmt, va_alist)
-     char *str;
-     size_t size;
-     _CONST char *fmt;
-     va_dcl
-#endif
-{
-  int ret;
-  va_list ap;
-  FILE f;
-
-  f._flags = __SWR | __SSTR;
-  f._bf._base = f._p = (unsigned char *) str;
-  f._bf._size = f._w = (size > 0 ? size - 1 : 0);
-  f._file = -1;  /* No file. */
-#ifdef _HAVE_STDC
-  va_start (ap, fmt);
-#else
-  va_start (ap);
-#endif
-  ret = _vfiprintf_r (_REENT, &f, fmt, ap);
-  va_end (ap);
-  if (size > 0)
-    *f._p = 0;
-  return (ret);
-}
-
-#endif
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index 9c5c7cb..c67f8e4 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -1,3 +1,7 @@
+/* doc in sprintf.c */
+
+/* This code created by modifying sprintf.c so copyright inherited. */
+
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,11 +18,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* doc in sprintf.c */
-/* This code created by modifying sprintf.c so copyright inherited. */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #ifdef _HAVE_STDC
 #include <stdarg.h>
@@ -26,22 +26,19 @@
 #include <varargs.h>
 #endif
 #include <limits.h>
+#include <_ansi.h>
 #include "local.h"
 
 int
 #ifdef _HAVE_STDC
-_DEFUN(_snprintf_r, (ptr, str, size, fmt),
-       struct _reent *ptr _AND
-       char *str          _AND
-       size_t size        _AND
-       _CONST char *fmt _DOTS)
+_DEFUN (_snprintf_r, (ptr, str, size, fmt), struct _reent *ptr _AND char *str _AND size_t size _AND _CONST char *fmt _DOTS)
 #else
-_snprintf_r(ptr, str, size, fmt, va_alist)
-            struct _reent *ptr;
-            char *str;
-            size_t size;
-            _CONST char *fmt;
-            va_dcl
+_snprintf_r (ptr, str, size, fmt, va_alist)
+     struct _reent *ptr;
+     char *str;
+     size_t size;
+     _CONST char *fmt;
+     va_dcl
 #endif
 {
   int ret;
@@ -51,13 +48,13 @@ _snprintf_r(ptr, str, size, fmt, va_alist)
   f._flags = __SWR | __SSTR;
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = (size > 0 ? size - 1 : 0);
-  f._file = -1;  /* No file. */
+  f._data = ptr;
 #ifdef _HAVE_STDC
   va_start (ap, fmt);
 #else
   va_start (ap);
 #endif
-  ret = _vfprintf_r (ptr, &f, fmt, ap);
+  ret = vfprintf (&f, fmt, ap);
   va_end (ap);
   if (size > 0)
     *f._p = 0;
@@ -68,16 +65,13 @@ _snprintf_r(ptr, str, size, fmt, va_alist)
 
 int
 #ifdef _HAVE_STDC
-_DEFUN(snprintf, (str, size, fmt),
-       char *str   _AND
-       size_t size _AND
-       _CONST char *fmt _DOTS)
+_DEFUN (snprintf, (str, size, fmt), char *str _AND size_t size _AND _CONST char *fmt _DOTS)
 #else
-snprintf(str, size, fmt, va_alist)
-         char *str;
-         size_t size;
-         _CONST char *fmt;
-         va_dcl
+snprintf (str, size, fmt, va_alist)
+     char *str;
+     size_t size;
+     _CONST char *fmt;
+     va_dcl
 #endif
 {
   int ret;
@@ -87,13 +81,13 @@ snprintf(str, size, fmt, va_alist)
   f._flags = __SWR | __SSTR;
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = (size > 0 ? size - 1 : 0);
-  f._file = -1;  /* No file. */
+  f._data = _REENT;
 #ifdef _HAVE_STDC
   va_start (ap, fmt);
 #else
   va_start (ap);
 #endif
-  ret = _vfprintf_r (_REENT, &f, fmt, ap);
+  ret = vfprintf (&f, fmt, ap);
   va_end (ap);
   if (size > 0)
     *f._p = 0;
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index 346749a..b537632 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -16,16 +16,14 @@
  */
 
 /*
-FUNCTION
-        <<printf>>, <<fprintf>>, <<asprintf>>, <<sprintf>>, <<snprintf>>---format output
 
+FUNCTION
+        <<printf>>, <<fprintf>>, <<sprintf>>, <<snprintf>>---format output
 INDEX
 	fprintf
 INDEX
 	printf
 INDEX
-	asprintf
-INDEX
 	sprintf
 INDEX
 	snprintf
@@ -36,9 +34,7 @@ ANSI_SYNOPSIS
         int printf(const char *<[format]> [, <[arg]>, ...]);
         int fprintf(FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]);
         int sprintf(char *<[str]>, const char *<[format]> [, <[arg]>, ...]);
-        int asprintf(char **<[strp]>, const char *<[format]> [, <[arg]>, ...]);
-        int snprintf(char *<[str]>, size_t <[size]>, const char *<[format]>
-                     [, <[arg]>, ...]);
+        int snprintf(char *<[str]>, size_t <[size]>, const char *<[format]> [, <[arg]>, ...]);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -50,10 +46,6 @@ TRAD_SYNOPSIS
 	FILE *<[fd]>;
 	char *<[format]>;
 
-	int asprintf(<[strp]>, <[format]> [, <[arg]>, ...]);
-	char **<[strp]>;
-	char *<[format]>;
-
 	int sprintf(<[str]>, <[format]> [, <[arg]>, ...]);
 	char *<[str]>;
 	char *<[format]>;
@@ -73,22 +65,19 @@ DESCRIPTION
         If there are more arguments than the format requires, excess
         arguments are ignored.
 
-        <<fprintf>>, <<asprintf>>, <<sprintf>> and <<snprintf>> are identical 
-	to <<printf>>, other than the destination of the formatted output: 
-	<<fprintf>> sends the output to a specified file <[fd]>, while 
-	<<asprintf>> stores the output in a dynamically allocated buffer,
-	while <<sprintf>> stores the output in the specified char array 
-	<[str]> and <<snprintf>> limits number of characters written to 
-	<[str]> to at most <[size]> (including terminating <<0>>).  For 
-	<<sprintf>> and <<snprintf>>, the behavior is undefined if the 
-	output <<*<[str]>>> overlaps with one of the arguments. For
-	<<asprintf>>, <[strp]> points to a pointer to char which is filled
-	in with the dynamically allocated buffer.  <[format]> is a pointer 
-	to a charater string containing two types of objects: ordinary 
-	characters (other than <<%>>), which are copied unchanged to the 
-	output, and conversion specifications, each of which is introduced 
-	by <<%>>. (To include <<%>> in the output, use <<%%>> in the format 
-	string.) A conversion specification has the following form:
+        <<fprintf>>, <<sprintf>> and <<snprintf>> are identical to <<printf>>,
+        other than the destination of the formatted output: <<fprintf>> sends
+        the output to a specified file <[fd]>, while <<sprintf>> stores the
+        output in the specified char array <[str]> and <<snprintf>> limits
+        number of characters written to <[str]> to at most <[size]> (including
+        terminating <<0>>).  For <<sprintf>> and <<snprintf>>, the behavior is
+        also undefined if the output <<*<[str]>>> overlaps with one of the
+        arguments. <[format]> is a pointer to a charater string containing
+        two types of objects: ordinary characters (other than <<%>>), which
+        are copied unchanged to the output, and conversion
+        specifications, each of which is introduced by <<%>>.
+        (To include <<%>> in the output, use <<%%>> in the format string.)
+        A conversion specification has the following form:
 
 .       %[<[flags]>][<[width]>][.<[prec]>][<[size]>][<[type]>]
 
@@ -206,8 +195,7 @@ DESCRIPTION
 		<<l>> forces the following <<d>>, <<i>>, <<o>>, <<u>>,
 		<<x>> or <<X>> conversion <[type]> to apply to a <<long>> or
 		<<unsigned long>>.  <<l>> also forces a following <<n>> <[type]> to
-		apply to a pointer to a <<long>>.  <<l>> with <<c>>, <<s>> is
-		equivalent to <<C>>, <<S>> respectively.  If an <<h>>
+		apply to a pointer to a <<long>>. If an <<h>>
 		or an <<l>> appears with another conversion
 		specifier, the behavior is undefined.  <<L>> forces a
 		following <<e>>, <<E>>, <<f>>, <<g>> or <<G>> conversion <[type]> to
@@ -226,18 +214,10 @@ DESCRIPTION
 		o c
 		prints <[arg]> as single character
 		
-		o C
-		prints wchar_t <[arg]> as single multibyte character
-		
 		o s
 		prints characters until precision is reached or a null terminator
 		is encountered; takes a string pointer
 
-		o S
-		converts wchar_t characters to multibyte output characters until
-		precision is reached or a null wchar_t terminator
-		is encountered; takes a wchar_t pointer
-
 		o d
 		prints a signed decimal integer; takes an <<int>> (same as <<i>>)
 
@@ -260,24 +240,24 @@ DESCRIPTION
 
 		o f
 		prints a signed value of the form <<[-]9999.9999>>; takes
-		a floating-point number
+		a floating point number
 	
 		o e
 		prints a signed	value of the form <<[-]9.9999e[+|-]999>>; takes a
-		floating-point number
+		floating point number
 
 		o E
 		prints the same way as <<e>>, but using <<E>> to introduce the
-		exponent; takes a floating-point number
+		exponent; takes a floating point number
 
 		o g
 		prints a signed value in either <<f>> or <<e>> form, based on given
 		value and precision---trailing zeros and the decimal point are
-		printed only if necessary; takes a floating-point number
+		printed only if necessary; takes a floating point number
 	
 		o G
 		prints the same way as <<g>>, but using <<E>> for the exponent if an
-		exponent is needed; takes a floating-point number
+		exponent is needed; takes a floating point number
 
 		o n
 		stores (in the same object) a count of the characters written;
@@ -292,11 +272,11 @@ O-
 
 
 RETURNS
-<<sprintf>> and <<asprintf>> return the number of bytes in the output string,
+<<sprintf>> returns the number of bytes in the output string,
 save that the concluding <<NULL>> is not counted.
 <<printf>> and <<fprintf>> return the number of characters transmitted.
-If an error occurs, <<printf>> and <<fprintf>> return <<EOF>> and
-<<asprintf>> returns -1.  No error returns occur for <<sprintf>>.
+If an error occurs, <<printf>> and <<fprintf>> return <<EOF>>. No
+error returns occur for <<sprintf>>.
 
 PORTABILITY
         The  ANSI C standard specifies that implementations must
@@ -306,8 +286,6 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #ifdef _HAVE_STDC
 #include <stdarg.h>
@@ -315,20 +293,18 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 #include <varargs.h>
 #endif
 #include <limits.h>
+#include <_ansi.h>
 #include "local.h"
 
 int
 #ifdef _HAVE_STDC
-_DEFUN(_sprintf_r, (ptr, str, fmt),
-       struct _reent *ptr _AND
-       char *str          _AND
-       _CONST char *fmt _DOTS)
+_DEFUN (_sprintf_r, (ptr, str, fmt), struct _reent *ptr _AND char *str _AND _CONST char *fmt _DOTS)
 #else
-_sprintf_r(ptr, str, fmt, va_alist)
-           struct _reent *ptr;
-           char *str;
-           _CONST char *fmt;
-           va_dcl
+_sprintf_r (ptr, str, fmt, va_alist)
+     struct _reent *ptr;
+     char *str;
+     _CONST char *fmt;
+     va_dcl
 #endif
 {
   int ret;
@@ -338,13 +314,13 @@ _sprintf_r(ptr, str, fmt, va_alist)
   f._flags = __SWR | __SSTR;
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = INT_MAX;
-  f._file = -1;  /* No file. */
+  f._data = ptr;
 #ifdef _HAVE_STDC
   va_start (ap, fmt);
 #else
   va_start (ap);
 #endif
-  ret = _vfprintf_r (ptr, &f, fmt, ap);
+  ret = vfprintf (&f, fmt, ap);
   va_end (ap);
   *f._p = 0;
   return (ret);
@@ -354,14 +330,12 @@ _sprintf_r(ptr, str, fmt, va_alist)
 
 int
 #ifdef _HAVE_STDC
-_DEFUN(sprintf, (str, fmt),
-       char *str _AND
-       _CONST char *fmt _DOTS)
+_DEFUN (sprintf, (str, fmt), char *str _AND _CONST char *fmt _DOTS)
 #else
-sprintf(str, fmt, va_alist)
-        char *str;
-        _CONST char *fmt;
-        va_dcl
+sprintf (str, fmt, va_alist)
+     char *str;
+     _CONST char *fmt;
+     va_dcl
 #endif
 {
   int ret;
@@ -371,13 +345,13 @@ sprintf(str, fmt, va_alist)
   f._flags = __SWR | __SSTR;
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = INT_MAX;
-  f._file = -1;  /* No file. */
+  f._data = _REENT;
 #ifdef _HAVE_STDC
   va_start (ap, fmt);
 #else
   va_start (ap);
 #endif
-  ret = _vfprintf_r (_REENT, &f, fmt, ap);
+  ret = vfprintf (&f, fmt, ap);
   va_end (ap);
   *f._p = 0;
   return (ret);
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index 5ad39d8..7cf897c 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -16,8 +16,9 @@
  */
 
 /*
+
 FUNCTION
-<<scanf>>, <<fscanf>>, <<sscanf>>---scan and format input
+	<<scanf>>, <<fscanf>>, <<sscanf>>---scan and format input
 
 INDEX
 	scanf
@@ -34,12 +35,10 @@ ANSI_SYNOPSIS
         int sscanf(const char *<[str]>, const char *<[format]> 
                    [, <[arg]>, ...]);
 
-        int _scanf_r(struct _reent *<[ptr]>, const char *<[format]>
-                     [, <[arg]>, ...]);
-        int _fscanf_r(struct _reent *<[ptr]>, FILE *<[fd]>, const char *<[format]>
-                      [, <[arg]>, ...]);
-        int _sscanf_r(struct _reent *<[ptr]>, const char *<[str]>,
-                      const char *<[format]> [, <[arg]>, ...]);
+        int _scanf_r(struct _reent *<[ptr]>, const char *<[format]> [, <[arg]>, ...]);
+        int _fscanf_r(struct _reent *<[ptr]>, FILE *<[fd]>, const char *<[format]> [, <[arg]>, ...]);
+        int _sscanf_r(struct _reent *<[ptr]>, const char *<[str]>, const char *<[format]> 
+                   [, <[arg]>, ...]);
 
 
 TRAD_SYNOPSIS
@@ -153,31 +152,22 @@ DESCRIPTION
 
 
 .Modifier   Type(s)
-.   hh      d, i, o, u, x, n  convert input to char,
-.                             store in char object
-.
-.   h       d, i, o, u, x, n  convert input to short,
+.   h       d, i, o, u, x     convert input to short,
 .                             store in short object
 .
 .   h       D, I, O, U, X     no effect
-.           e, f, c, s, p
+.           e, f, c, s, n, p
 .
-.   l       d, i, o, u, x, n  convert input to long,
+.   l       d, i, o, u, x     convert input to long,
 .                             store in long object
 .
 .   l       e, f, g           convert input to double
 .                             store in a double object
 .
 .   l       D, I, O, U, X     no effect
-.           c, s, p
-.
-.   ll      d, i, o, u, x, n  convert to long long,
-.                             store in long long
-.
-.   L       d, i, o, u, x, n  convert to long long,
-.                             store in long long
+.           c, s, n, p
 .
-.   L       e, f, g, E, G     convert to long double,
+.   L       d, i, o, u, x     convert to long double,
 .                             store in long double
 .
 .   L      all others         no effect
@@ -235,11 +225,11 @@ DESCRIPTION
 		<<(int *arg)>>.
 
 		o e, f, g
-		Read a floating-point number into the corresponding <[arg]>:
+		Read a floating point number into the corresponding <[arg]>:
 		<<(float *arg)>>.
 
 		o E, F, G
-		Read a floating-point number into the corresponding <[arg]>:
+		Read a floating point number into the corresponding <[arg]>:
 		<<(double *arg)>>.
 
 		o  i
@@ -376,11 +366,12 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 
 /* | ARGSUSED */
 /*SUPPRESS 590*/
-static _READ_WRITE_RETURN_TYPE
-_DEFUN(eofread, (cookie, buf, len),
-       _PTR cookie _AND
-       char *buf   _AND
-       int len)
+static
+_READ_WRITE_RETURN_TYPE
+eofread (cookie, buf, len)
+     _PTR cookie;
+     char *buf;
+     int len;
 {
   return 0;
 }
@@ -389,28 +380,26 @@ _DEFUN(eofread, (cookie, buf, len),
 
 #ifdef _HAVE_STDC
 int 
-_DEFUN(sscanf, (str, fmt),
-       _CONST char *str _AND
-       _CONST char *fmt _DOTS)
+_DEFUN (sscanf, (str, fmt), _CONST char *str _AND _CONST char *fmt _DOTS)
 #else
 int 
-sscanf(str, fmt, va_alist)
-       _CONST char *str;
-       _CONST char *fmt;
-       va_dcl
+sscanf (str, fmt, va_alist)
+     _CONST char *str;
+     _CONST char *fmt;
+     va_dcl
 #endif
 {
   int ret;
   va_list ap;
   FILE f;
 
-  f._flags = __SRD | __SSTR;
+  f._flags = __SRD;
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._r = strlen (str);
   f._read = eofread;
   f._ub._base = NULL;
   f._lb._base = NULL;
-  f._file = -1;  /* No file. */
+  f._data = _REENT;
 #ifdef _HAVE_STDC
   va_start (ap, fmt);
 #else
@@ -425,30 +414,27 @@ sscanf(str, fmt, va_alist)
 
 #ifdef _HAVE_STDC
 int 
-_DEFUN(_sscanf_r, (ptr, str, fmt), 
-       struct _reent *ptr _AND
-       _CONST char *str   _AND
-       _CONST char *fmt _DOTS)
+_DEFUN (_sscanf_r, (ptr, str, fmt), struct _reent *ptr _AND _CONST char *str _AND _CONST char *fmt _DOTS)
 #else
 int 
-_sscanf_r(ptr, str, fmt, va_alist)
-          struct _reent *ptr;
-          _CONST char *str;
-          _CONST char *fmt;
-          va_dcl
+_sscanf_r (ptr, str, fmt, va_alist)
+     struct _reent *ptr;
+     _CONST char *str;
+     _CONST char *fmt;
+     va_dcl
 #endif
 {
   int ret;
   va_list ap;
   FILE f;
 
-  f._flags = __SRD | __SSTR;
+  f._flags = __SRD;
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._r = strlen (str);
   f._read = eofread;
   f._ub._base = NULL;
   f._lb._base = NULL;
-  f._file = -1;  /* No file. */
+  f._data = _REENT;
 #ifdef _HAVE_STDC
   va_start (ap, fmt);
 #else
diff --git a/newlib/libc/stdio/stdio.c b/newlib/libc/stdio/stdio.c
index 8bc7360..b0c759f 100644
--- a/newlib/libc/stdio/stdio.c
+++ b/newlib/libc/stdio/stdio.c
@@ -1,3 +1,5 @@
+/* No user fns here.  Pesch 15apr92. */
+
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,10 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* No user fns here.  Pesch 15apr92. */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -30,10 +29,10 @@
  */
 
 _READ_WRITE_RETURN_TYPE
-_DEFUN(__sread, (cookie, buf, n),
-       _PTR cookie _AND
-       char *buf   _AND
-       int n)
+__sread (cookie, buf, n)
+     _PTR cookie;
+     char *buf;
+     int n;
 {
   register FILE *fp = (FILE *) cookie;
   register int ret;
@@ -41,14 +40,14 @@ _DEFUN(__sread, (cookie, buf, n),
 #ifdef __SCLE
   int oldmode = 0;
   if (fp->_flags & __SCLE)
-    oldmode = setmode (fp->_file, O_BINARY);
+    oldmode = setmode(fp->_file, O_BINARY);
 #endif
 
-  ret = _read_r (_REENT, fp->_file, buf, n);
+  ret = _read_r (fp->_data, fp->_file, buf, n);
 
 #ifdef __SCLE
   if (oldmode)
-    setmode (fp->_file, oldmode);
+    setmode(fp->_file, oldmode);
 #endif
 
   /* If the read succeeded, update the current offset.  */
@@ -61,10 +60,10 @@ _DEFUN(__sread, (cookie, buf, n),
 }
 
 _READ_WRITE_RETURN_TYPE
-_DEFUN(__swrite, (cookie, buf, n),
-       _PTR cookie      _AND
-       char _CONST *buf _AND
-       int n)
+__swrite (cookie, buf, n)
+     _PTR cookie;
+     char _CONST *buf;
+     int n;
 {
   register FILE *fp = (FILE *) cookie;
   int w;
@@ -73,34 +72,34 @@ _DEFUN(__swrite, (cookie, buf, n),
 #endif
 
   if (fp->_flags & __SAPP)
-    _CAST_VOID _lseek_r (_REENT, fp->_file, (_off_t) 0, SEEK_END);
+    (void) _lseek_r (fp->_data, fp->_file, (off_t) 0, SEEK_END);
   fp->_flags &= ~__SOFF;	/* in case O_APPEND mode is set */
 
 #ifdef __SCLE
   if (fp->_flags & __SCLE)
-    oldmode = setmode (fp->_file, O_BINARY);
+    oldmode = setmode(fp->_file, O_BINARY);
 #endif
 
-  w = _write_r (_REENT, fp->_file, buf, n);
+  w = _write_r (fp->_data, fp->_file, buf, n);
 
 #ifdef __SCLE
   if (oldmode)
-    setmode (fp->_file, oldmode);
+    setmode(fp->_file, oldmode);
 #endif
 
   return w;
 }
 
-_fpos_t
-_DEFUN(__sseek, (cookie, offset, whence),
-       _PTR cookie    _AND
-       _fpos_t offset _AND
-       int whence)
+fpos_t
+__sseek (cookie, offset, whence)
+     _PTR cookie;
+     fpos_t offset;
+     int whence;
 {
   register FILE *fp = (FILE *) cookie;
-  register _off_t ret;
+  register off_t ret;
 
-  ret = _lseek_r (_REENT, fp->_file, (_off_t) offset, whence);
+  ret = _lseek_r (fp->_data, fp->_file, (off_t) offset, whence);
   if (ret == -1L)
     fp->_flags &= ~__SOFF;
   else
@@ -112,18 +111,17 @@ _DEFUN(__sseek, (cookie, offset, whence),
 }
 
 int
-_DEFUN(__sclose, (cookie),
-       _PTR cookie)
+__sclose (cookie)
+     _PTR cookie;
 {
   FILE *fp = (FILE *) cookie;
 
-  return _close_r (_REENT, fp->_file);
+  return _close_r (fp->_data, fp->_file);
 }
 
 #ifdef __SCLE
 int
-_DEFUN(__stextmode, (fd), 
-       int fd)
+__stextmode (int fd)
 {
 #ifdef __CYGWIN__
   return _cygwin_istext_for_stdio (fd);
diff --git a/newlib/libc/stdio/stdio.tex b/newlib/libc/stdio/stdio.tex
index 9c2ca0f..725b2f3 100644
--- a/newlib/libc/stdio/stdio.tex
+++ b/newlib/libc/stdio/stdio.tex
@@ -25,16 +25,14 @@ structure.
  
 @menu  
 * clearerr::    Clear file or stream error indicator
-* dprintf::     Print to a file descriptor
 * fclose::      Close a file
-* fcloseall::   Close all files
 * feof::        Test for end of file
 * ferror::      Test whether read/write error has occurred
 * fflush::      Flush buffered file output
 * fgetc::       Get a character from a file or stream
 * fgetpos::     Record position in a stream or file
 * fgets::       Get character string from a file or stream
-* fileno::      Get file descriptor associated with stream
+* fiprintf::    Write formatted output to file (integer only)
 * fopen::       Open a file
 * fdopen::	Turn an open file into a stream
 * fputc::       Write a character on a stream or file
@@ -46,53 +44,36 @@ structure.
 * ftell::       Return position in a stream or file
 * fwrite::      Write array elements from memory to a file or stream
 * getc::        Get a character from a file or stream (macro)
-* getc_unlocked::	Get a character from a file or stream (macro)
 * getchar::     Get a character from standard input (macro)
-* getchar_unlocked::	Get a character from standard input (macro)
-* getdelim::    Get character string from a file or stream
-* getline::     Get character string from a file or stream
 * gets::        Get character string from standard input (obsolete)
 * getw::        Get a word (int) from a file or stream
+* iprintf::     Write formatted output (integer only)
 * mktemp::      Generate unused file name
 * perror::      Print an error message on standard error
 * putc::        Write a character on a stream or file (macro)
-* putc_unlocked::	Write a character on a stream or file (macro)
 * putchar::     Write a character on standard output (macro)
-* putchar_unlocked::	Write a character on standard output (macro)
 * puts::        Write a character string on standard output
 * putw::        Write a word (int) to a file or stream
 * remove::      Delete a file's name
 * rename::      Rename a file
 * rewind::      Reinitialize a file or stream
 * setbuf::      Specify full buffering for a file or stream
-* setbuffer::   Specify full buffering for a file or stream with size
-* setlinebuf::  Specify line buffering for a file or stream
 * setvbuf::     Specify buffering for a file or stream
+* siprintf::    Write formatted output (integer only)
 * printf::      Write formatted output
 * scanf::       Scan and format input
-* iprintf::     Write formatted output (integer only)
-* iscanf::      Scan and format input (integer only)
 * tmpfile::     Create a temporary file
 * tmpnam::      Generate name for a temporary file
-* viprintf::    Format variable argument list for non-floating-point output
-* viscanf::     Scan variable format list for non-floating-point input
 * vprintf::     Format variable argument list
-* vscanf::      Format variable argument list
 @end menu 
 
 @page
 @include stdio/clearerr.def
 
 @page
-@include stdio/dprintf.def
-
-@page
 @include stdio/fclose.def
 
 @page
-@include stdio/fcloseall.def
-
-@page
 @include stdio/feof.def
 
 @page
@@ -111,7 +92,7 @@ structure.
 @include stdio/fgets.def 
 
 @page
-@include stdio/fileno.def
+@include stdio/fiprintf.def
 
 @page
 @include stdio/fopen.def
@@ -147,20 +128,8 @@ structure.
 @include stdio/getc.def 
 
 @page
-@include stdio/getc_u.def
-
-@page
 @include stdio/getchar.def 
 
-@page
-@include stdio/getchar_u.def
-
-@page
-@include stdio/getdelim.def
-
-@page
-@include stdio/getline.def
-
 @page 
 @include stdio/gets.def
 
@@ -168,6 +137,9 @@ structure.
 @include stdio/getw.def 
 
 @page
+@include stdio/iprintf.def 
+
+@page
 @include stdio/mktemp.def
 
 @page
@@ -177,15 +149,9 @@ structure.
 @include stdio/putc.def
 
 @page
-@include stdio/putc_u.def
-
-@page
 @include stdio/putchar.def
 
 @page
-@include stdio/putchar_u.def
-
-@page
 @include stdio/puts.def
 
 @page 
@@ -204,26 +170,17 @@ structure.
 @include stdio/setbuf.def
 
 @page
-@include stdio/setbuffer.def
-
-@page
-@include stdio/setlinebuf.def
-
-@page
 @include stdio/setvbuf.def
 
 @page 
+@include stdio/siprintf.def 
+
+@page 
 @include stdio/sprintf.def 
 
 @page
 @include stdio/sscanf.def 
 
-@page 
-@include stdio/siprintf.def 
-
-@page 
-@include stdio/siscanf.def 
-
 @page
 @include stdio/tmpfile.def
 
@@ -232,13 +189,3 @@ structure.
 
 @page 
 @include stdio/vfprintf.def 
-
-@page
-@include stdio/vfscanf.def
-
-@page 
-@include stdio/viprintf.def 
-
-@page 
-@include stdio/viscanf.def 
-
diff --git a/newlib/libc/stdio/tmpfile.c b/newlib/libc/stdio/tmpfile.c
index a6c2c91..4b31396 100644
--- a/newlib/libc/stdio/tmpfile.c
+++ b/newlib/libc/stdio/tmpfile.c
@@ -11,14 +11,14 @@ ANSI_SYNOPSIS
 	#include <stdio.h>
 	FILE *tmpfile(void);
 
-	FILE *_tmpfile_r(struct _reent *<[reent]>);
+	FILE *_tmpfile_r(void *<[reent]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
 	FILE *tmpfile();
 
 	FILE *_tmpfile_r(<[reent]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 
 DESCRIPTION
 Create a temporary file (a file which will be deleted automatically),
@@ -45,14 +45,12 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<getpid>>,
 <<tmpfile>> also requires the global pointer <<environ>>.
 */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #include <errno.h>
 
 FILE *
-_DEFUN(_tmpfile_r, (ptr),
-       struct _reent *ptr)
+_DEFUN (_tmpfile_r, (ptr),
+	struct _reent *ptr)
 {
   FILE *fp;
   int e;
@@ -61,9 +59,9 @@ _DEFUN(_tmpfile_r, (ptr),
 
   if ((f = _tmpnam_r (ptr, buf)) == NULL)
     return NULL;
-  fp = _fopen_r (ptr, f, "wb+");
+  fp = fopen (f, "wb+");
   e = ptr->_errno;
-  _CAST_VOID _remove_r (ptr, f);
+  _CAST_VOID remove (f);
   ptr->_errno = e;
   return fp;
 }
@@ -71,7 +69,7 @@ _DEFUN(_tmpfile_r, (ptr),
 #ifndef _REENT_ONLY
 
 FILE *
-_DEFUN_VOID(tmpfile)
+_DEFUN_VOID (tmpfile)
 {
   return _tmpfile_r (_REENT);
 }
diff --git a/newlib/libc/stdio/tmpnam.c b/newlib/libc/stdio/tmpnam.c
index ee722e6..28b394f 100644
--- a/newlib/libc/stdio/tmpnam.c
+++ b/newlib/libc/stdio/tmpnam.c
@@ -2,6 +2,7 @@
  * tmpname.c
  * Original Author:	G. Haley
  */
+
 /*
 FUNCTION
 <<tmpnam>>, <<tempnam>>---name for a temporary file
@@ -19,8 +20,8 @@ ANSI_SYNOPSIS
 	#include <stdio.h>
 	char *tmpnam(char *<[s]>);
 	char *tempnam(char *<[dir]>, char *<[pfx]>);
-	char *_tmpnam_r(struct _reent *<[reent]>, char *<[s]>);
-	char *_tempnam_r(struct _reent *<[reent]>, char *<[dir]>, char *<[pfx]>);
+	char *_tmpnam_r(void *<[reent]>, char *<[s]>);
+	char *_tempnam_r(void *<[reent]>, char *<[dir]>, char *<[pfx]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -32,11 +33,11 @@ TRAD_SYNOPSIS
 	char *<[pfx]>;
 
 	char *_tmpnam_r(<[reent]>, <[s]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[s]>;
 
 	char *_tempnam_r(<[reent]>, <[dir]>, <[pfx]>)
-	struct *<[reent]>;
+	char *<[reent]>;
 	char *<[dir]>;
 	char *<[pfx]>;
 
@@ -92,7 +93,6 @@ The global pointer <<environ>> is also required.
 */
 
 #include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -104,13 +104,13 @@ The global pointer <<environ>> is also required.
    another one.  Return nonzero if successful, otherwise zero.  */
 
 static int
-_DEFUN(worker, (ptr, result, part1, part2, part3, part4),
-       struct _reent *ptr _AND
-       char *result       _AND
-       _CONST char *part1 _AND
-       _CONST char *part2 _AND
-       int part3          _AND
-       int *part4)
+worker (ptr, result, part1, part2, part3, part4)
+     struct _reent *ptr;
+     char *result;
+     _CONST char *part1;
+     _CONST char *part2;
+     int part3;
+     int *part4;
 {
   /*  Generate the filename and make sure that there isn't one called
       it already.  */
@@ -136,9 +136,9 @@ _DEFUN(worker, (ptr, result, part1, part2, part3, part4),
 }
 
 char *
-_DEFUN(_tmpnam_r, (p, s),
-       struct _reent *p _AND
-       char *s)
+_DEFUN (_tmpnam_r, (p, s),
+	struct _reent *p _AND
+	char *s)
 {
   char *result;
   int pid;
@@ -146,8 +146,7 @@ _DEFUN(_tmpnam_r, (p, s),
   if (s == NULL)
     {
       /* ANSI states we must use an internal static buffer if s is NULL */
-      _REENT_CHECK_EMERGENCY(p);
-      result = _REENT_EMERGENCY(p);
+      result = p->_emergency;
     }
   else
     {
@@ -165,10 +164,10 @@ _DEFUN(_tmpnam_r, (p, s),
 }
 
 char *
-_DEFUN(_tempnam_r, (p, dir, pfx),
-       struct _reent *p _AND
-       _CONST char *dir _AND
-       _CONST char *pfx)
+_DEFUN (_tempnam_r, (p, dir, pfx),
+	struct _reent *p _AND
+	_CONST char *dir _AND
+	_CONST char *pfx)
 {
   char *filename;
   int length;
@@ -192,16 +191,16 @@ _DEFUN(_tempnam_r, (p, dir, pfx),
 #ifndef _REENT_ONLY
 
 char *
-_DEFUN(tempnam, (dir, pfx),
-       _CONST char *dir _AND
-       _CONST char *pfx)
+_DEFUN (tempnam, (dir, pfx),
+	_CONST char *dir _AND
+	_CONST char *pfx)
 {
   return _tempnam_r (_REENT, dir, pfx);
 }
 
 char *
-_DEFUN(tmpnam, (s),
-       char *s)
+_DEFUN (tmpnam, (s),
+	char *s)
 {
   return _tmpnam_r (_REENT, s);
 }
diff --git a/newlib/libc/stdio/ungetc.c b/newlib/libc/stdio/ungetc.c
index fc6fa31..418717e 100644
--- a/newlib/libc/stdio/ungetc.c
+++ b/newlib/libc/stdio/ungetc.c
@@ -19,8 +19,6 @@
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
-#include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -35,9 +33,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 
 /*static*/
 int
-_DEFUN(__submore, (rptr, fp),
-       struct _reent *rptr _AND
-       register FILE *fp)
+__submore (fp)
+     register FILE *fp;
 {
   register int i;
   register unsigned char *p;
@@ -47,7 +44,7 @@ _DEFUN(__submore, (rptr, fp),
       /*
        * Get a new buffer (rather than expanding the old one).
        */
-      if ((p = (unsigned char *) _malloc_r (rptr, (size_t) BUFSIZ)) == NULL)
+      if ((p = (unsigned char *) _malloc_r (fp->_data, (size_t) BUFSIZ)) == NULL)
 	return EOF;
       fp->_ub._base = p;
       fp->_ub._size = BUFSIZ;
@@ -58,10 +55,10 @@ _DEFUN(__submore, (rptr, fp),
       return 0;
     }
   i = fp->_ub._size;
-  p = (unsigned char *) _realloc_r (rptr, (_PTR) (fp->_ub._base), i << 1);
+  p = (unsigned char *) _realloc_r (fp->_data, (_PTR) (fp->_ub._base), i << 1);
   if (p == NULL)
     return EOF;
-  _CAST_VOID memcpy ((_PTR) (p + i), (_PTR) p, (size_t) i);
+  (void) memcpy ((void *) (p + i), (void *) p, (size_t) i);
   fp->_p = p + i;
   fp->_ub._base = p;
   fp->_ub._size = i << 1;
@@ -69,10 +66,9 @@ _DEFUN(__submore, (rptr, fp),
 }
 
 int
-_DEFUN(_ungetc_r, (rptr, c, fp),
-       struct _reent *rptr _AND
-       int c               _AND
-       register FILE *fp)
+ungetc (c, fp)
+     int c;
+     register FILE *fp;
 {
   if (c == EOF)
     return (EOF);
@@ -81,10 +77,8 @@ _DEFUN(_ungetc_r, (rptr, c, fp),
      ??? Might be able to remove this as some other stdio routine should
      have already been called to get the char we are un-getting.  */
 
-  CHECK_INIT (rptr);
+  CHECK_INIT (fp);
 
-  _flockfile (fp);
-  
   /* After ungetc, we won't be at eof anymore */
   fp->_flags &= ~__SEOF;
 
@@ -95,17 +89,11 @@ _DEFUN(_ungetc_r, (rptr, c, fp),
        * Otherwise, flush any current write stuff.
        */
       if ((fp->_flags & __SRW) == 0)
-        {
-          _funlockfile (fp);
-          return EOF;
-        }
+	return EOF;
       if (fp->_flags & __SWR)
 	{
 	  if (fflush (fp))
-            {
-              _funlockfile (fp);
-              return EOF;
-            }
+	    return EOF;
 	  fp->_flags &= ~__SWR;
 	  fp->_w = 0;
 	  fp->_lbfsize = 0;
@@ -121,14 +109,10 @@ _DEFUN(_ungetc_r, (rptr, c, fp),
 
   if (HASUB (fp))
     {
-      if (fp->_r >= fp->_ub._size && __submore (rptr, fp))
-        {
-          _funlockfile (fp);
-          return EOF;
-        }
+      if (fp->_r >= fp->_ub._size && __submore (fp))
+	return EOF;
       *--fp->_p = c;
       fp->_r++;
-      _funlockfile (fp);
       return c;
     }
 
@@ -142,7 +126,6 @@ _DEFUN(_ungetc_r, (rptr, c, fp),
     {
       fp->_p--;
       fp->_r++;
-      _funlockfile (fp);
       return c;
     }
 
@@ -158,17 +141,5 @@ _DEFUN(_ungetc_r, (rptr, c, fp),
   fp->_ubuf[sizeof (fp->_ubuf) - 1] = c;
   fp->_p = &fp->_ubuf[sizeof (fp->_ubuf) - 1];
   fp->_r = 1;
-  _funlockfile (fp);
   return c;
 }
-
-#ifndef _REENT_ONLY
-int
-_DEFUN(ungetc, (c, fp),
-       int c               _AND
-       register FILE *fp)
-{
-  return _ungetc_r (_REENT, c, fp);
-}
-#endif /* !_REENT_ONLY */
-
diff --git a/newlib/libc/stdio/vasiprintf.c b/newlib/libc/stdio/vasiprintf.c
deleted file mode 100644
index 721d6fb..0000000
--- a/newlib/libc/stdio/vasiprintf.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-/* This code was based on vsiprintf.c */
-/* doc in vfprintf.c */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "%W% (Berkeley) %G%";
-#endif /* LIBC_SCCS and not lint */
-
-#include <_ansi.h>
-#include <stdio.h>
-#include <limits.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN(vasiprintf, (strp, fmt, ap),
-       char **strp      _AND
-       _CONST char *fmt _AND
-       va_list ap)
-{
-  int ret;
-  FILE f;
-
-  f._flags = __SWR | __SSTR | __SMBF;
-  f._bf._base = f._p = NULL;
-  f._bf._size = f._w = 0;
-  f._file = -1;  /* No file. */
-  ret = _vfiprintf_r (_REENT, &f, fmt, ap);
-  *f._p = 0;
-  *strp = f._bf._base;
-  return ret;
-}
-
-#endif /* !_REENT_ONLY */
-
-int
-_DEFUN(_vasiprintf_r, (ptr, strp, fmt, ap),
-       struct _reent *ptr _AND
-       char **strp        _AND
-       _CONST char *fmt   _AND
-       va_list ap)
-{
-  int ret;
-  FILE f;
-
-  f._flags = __SWR | __SSTR | __SMBF ;
-  f._bf._base = f._p = NULL;
-  f._bf._size = f._w = 0;
-  f._file = -1;  /* No file. */
-  ret = _vfiprintf_r (ptr, &f, fmt, ap);
-  *f._p = 0;
-  *strp = f._bf._base;
-  return ret;
-}
-
diff --git a/newlib/libc/stdio/vasprintf.c b/newlib/libc/stdio/vasprintf.c
deleted file mode 100644
index 43197d5..0000000
--- a/newlib/libc/stdio/vasprintf.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-/* This code was based on vsprintf.c */
-/* doc in vfprintf.c */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "%W% (Berkeley) %G%";
-#endif /* LIBC_SCCS and not lint */
-
-#include <_ansi.h>
-#include <stdio.h>
-#include <limits.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN(vasprintf, (strp, fmt, ap),
-       char **strp      _AND
-       _CONST char *fmt _AND
-       va_list ap)
-{
-  int ret;
-  FILE f;
-
-  f._flags = __SWR | __SSTR | __SMBF;
-  f._bf._base = f._p = NULL;
-  f._bf._size = f._w = 0;
-  f._file = -1;  /* No file. */
-  ret = _vfprintf_r (_REENT, &f, fmt, ap);
-  *f._p = 0;
-  *strp = f._bf._base;
-  return ret;
-}
-
-#endif /* !_REENT_ONLY */
-
-int
-_DEFUN(_vasprintf_r, (ptr, strp, fmt, ap),
-       struct _reent *ptr _AND
-       char **strp        _AND
-       _CONST char *fmt   _AND
-       va_list ap)
-{
-  int ret;
-  FILE f;
-
-  f._flags = __SWR | __SSTR | __SMBF ;
-  f._bf._base = f._p = NULL;
-  f._bf._size = f._w = 0;
-  f._file = -1;  /* No file. */
-  ret = _vfprintf_r (ptr, &f, fmt, ap);
-  *f._p = 0;
-  *strp = f._bf._base;
-  return ret;
-}
-
diff --git a/newlib/libc/stdio/vdprintf.c b/newlib/libc/stdio/vdprintf.c
deleted file mode 100644
index acd193a..0000000
--- a/newlib/libc/stdio/vdprintf.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2005 Shaun Jackman
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-int
-_DEFUN (_vdprintf_r, (ptr, fd, format, ap),
-	struct _reent *ptr _AND
-	int fd _AND
-	_CONST char *format _AND
-	va_list ap)
-{
-	char *p;
-	int n;
-	_REENT_SMALL_CHECK_INIT (ptr);
-	n = _vasprintf_r (ptr, &p, format, ap);
-	if (n == -1) return -1;
-	n = _write_r (ptr, fd, p, n);
-	_free_r (ptr, p);
-	return n;
-}
-
-#ifndef _REENT_ONLY
-
-int 
-_DEFUN (vdprintf, (fd, format, ap),
-	int fd _AND
-	_CONST char *format _AND
-	va_list ap)
-{
-	_REENT_SMALL_CHECK_INIT (_REENT);
-	return _vdprintf_r (_REENT, fd, format, ap);
-}
-
-#endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/vfieeefp.h b/newlib/libc/stdio/vfieeefp.h
index 3691ffe..1b240fc 100644
--- a/newlib/libc/stdio/vfieeefp.h
+++ b/newlib/libc/stdio/vfieeefp.h
@@ -29,7 +29,6 @@
 /* This header file is a modification of mprec.h that only contains floating
    point union code. */
 
-#include <newlib.h>
 #include <ieeefp.h>
 #include <math.h>
 #include <float.h>
@@ -58,7 +57,7 @@
 Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
 #endif
 
-#ifdef _WANT_IO_LONG_DOUBLE
+#ifdef WANT_IO_LONG_DBL
 /* If we are going to examine or modify specific bits in a long double using
    the lword0 or lwordx macros, then we must wrap the long double inside
    a union.  This is necessary to avoid undefined behavior according to
@@ -135,7 +134,7 @@ struct ldieee
 };
 #endif /* LDBL_MANT_DIG */
 #endif /* !IEEE_8087 */
-#endif /* _WANT_IO_LONG_DOUBLE */
+#endif /* WANT_IO_LONG_DBL */
 
 /* If we are going to examine or modify specific bits in a double using
    the word0 and/or word1 macros, then we must wrap the double inside
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index a8c1f9b..f6bba49 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -1,40 +1,4 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
 FUNCTION
 <<vprintf>>, <<vfprintf>>, <<vsprintf>>---format argument list
 
@@ -53,20 +17,16 @@ ANSI_SYNOPSIS
 	int vprintf(const char *<[fmt]>, va_list <[list]>);
 	int vfprintf(FILE *<[fp]>, const char *<[fmt]>, va_list <[list]>);
 	int vsprintf(char *<[str]>, const char *<[fmt]>, va_list <[list]>);
-	int vasprintf(char **<[strp]>, const char *<[fmt]>, va_list <[list]>);
-	int vsnprintf(char *<[str]>, size_t <[size]>, const char *<[fmt]>,
-                      va_list <[list]>);
+	int vsnprintf(char *<[str]>, size_t <[size]>, const char *<[fmt]>, va_list <[list]>);
 
-	int _vprintf_r(struct _reent *<[reent]>, const char *<[fmt]>,
+	int _vprintf_r(void *<[reent]>, const char *<[fmt]>,
                         va_list <[list]>);
-	int _vfprintf_r(struct _reent *<[reent]>, FILE *<[fp]>, const char *<[fmt]>,
+	int _vfprintf_r(void *<[reent]>, FILE *<[fp]>, const char *<[fmt]>,
+                        va_list <[list]>);
+	int _vsprintf_r(void *<[reent]>, char *<[str]>, const char *<[fmt]>,
+                        va_list <[list]>);
+	int _vsnprintf_r(void *<[reent]>, char *<[str]>, size_t <[size]>, const char *<[fmt]>,
                         va_list <[list]>);
-	int _vasprintf_r(struct _reent *<[reent]>, char **<[str]>,
-                        const char *<[fmt]>, va_list <[list]>);
-	int _vsprintf_r(struct _reent *<[reent]>, char *<[str]>,
-                        const char *<[fmt]>, va_list <[list]>);
-	int _vsnprintf_r(struct _reent *<[reent]>, char *<[str]>, size_t <[size]>,
-                         const char *<[fmt]>, va_list <[list]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -80,11 +40,6 @@ TRAD_SYNOPSIS
 	char *<[fmt]>;
 	va_list <[list]>;
 
-	int vasprintf(<[strp]>, <[fmt]>, <[list]>)
-	char **<[strp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
 	int vsprintf(<[str]>, <[fmt]>, <[list]>)
 	char *<[str]>;
 	char *<[fmt]>;
@@ -97,49 +52,43 @@ TRAD_SYNOPSIS
 	va_list <[list]>;
 
 	int _vprintf_r(<[reent]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[fmt]>;
 	va_list <[list]>;
 
 	int _vfprintf_r(<[reent]>, <[fp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	FILE *<[fp]>;
 	char *<[fmt]>;
 	va_list <[list]>;
 
-	int _vasprintf_r(<[reent]>, <[strp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char **<[strp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
 	int _vsprintf_r(<[reent]>, <[str]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[str]>;
 	char *<[fmt]>;
 	va_list <[list]>;
 
 	int _vsnprintf_r(<[reent]>, <[str]>, <[size]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[str]>;
         size_t <[size]>;
 	char *<[fmt]>;
 	va_list <[list]>;
 
 DESCRIPTION
-<<vprintf>>, <<vfprintf>>, <<vasprintf>>, <<vsprintf>> and <<vsnprintf>> are 
-(respectively) variants of <<printf>>, <<fprintf>>, <<asprintf>>, <<sprintf>>,
-and <<snprintf>>.  They differ only in allowing their caller to pass the 
-variable argument list as a <<va_list>> object (initialized by <<va_start>>) 
-rather than directly accepting a variable number of arguments.
+<<vprintf>>, <<vfprintf>>, <<vsprintf>> and <<vsnprintf>> are (respectively)
+variants of <<printf>>, <<fprintf>>, <<sprintf>> and <<snprintf>>.  They differ
+only in allowing their caller to pass the variable argument list as a
+<<va_list>> object (initialized by <<va_start>>) rather than directly
+accepting a variable number of arguments.
 
 RETURNS
 The return values are consistent with the corresponding functions:
-<<vasprintf>>/<<vsprintf>> returns the number of bytes in the output string,
+<<vsprintf>> returns the number of bytes in the output string,
 save that the concluding <<NULL>> is not counted.
 <<vprintf>> and <<vfprintf>> return the number of characters transmitted.
-If an error occurs, <<vprintf>> and <<vfprintf>> return <<EOF>> and
-<<vasprintf>> returns -1.  No error returns occur for <<vsprintf>>.
+If an error occurs, <<vprintf>> and <<vfprintf>> return <<EOF>>. No
+error returns occur for <<vsprintf>>.
 
 PORTABILITY
 ANSI C requires all three functions.
@@ -148,6 +97,42 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)vfprintf.c	5.50 (Berkeley) 12/16/92";*/
 static char *rcsid = "$Id$";
@@ -158,7 +143,6 @@ static char *rcsid = "$Id$";
  *
  * This code is large and complicated...
  */
-#include <newlib.h>
 
 #ifdef INTEGER_ONLY
 #define VFPRINTF vfiprintf
@@ -166,30 +150,26 @@ static char *rcsid = "$Id$";
 #else
 #define VFPRINTF vfprintf
 #define _VFPRINTF_R _vfprintf_r
-#ifndef NO_FLOATING_POINT
 #define FLOATING_POINT
 #endif
-#endif
 
-#define _NO_POS_ARGS 
-#if defined _WANT_IO_POS_ARGS
-# undef _NO_POS_ARGS
+#define _NO_LONGLONG
+#if defined WANT_PRINTF_LONG_LONG && defined __GNUC__
+# undef _NO_LONGLONG
 #endif
 
 #include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
-#include <wchar.h>
-#include <string.h>
-#include <sys/lock.h>
+#include <reent.h>
+
 #ifdef _HAVE_STDC
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
+
 #include "local.h"
 #include "fvwrite.h"
 #include "vfieeefp.h"
@@ -198,23 +178,18 @@ static char *rcsid = "$Id$";
    This could be changed in the future should the _ldtoa_r code be
    preferred over _dtoa_r.  */
 #define _NO_LONGDBL
-#if defined _WANT_IO_LONG_DOUBLE && (LDBL_MANT_DIG > DBL_MANT_DIG)
+#if defined WANT_IO_LONG_DBL && (LDBL_MANT_DIG > DBL_MANT_DIG)
 #undef _NO_LONGDBL
 #endif
 
-#define _NO_LONGLONG
-#if defined _WANT_IO_LONG_LONG && defined __GNUC__
-# undef _NO_LONGLONG
-#endif
-
 /*
  * Flush out all the vectors defined by the given uio,
  * then reset it so that it can be reused.
  */
 static int
-_DEFUN(__sprint, (fp, uio),
-       FILE *fp _AND
-       register struct __suio *uio)
+__sprint(fp, uio)
+	FILE *fp;
+	register struct __suio *uio;
 {
 	register int err;
 
@@ -234,17 +209,17 @@ _DEFUN(__sprint, (fp, uio),
  * worries about ungetc buffers and so forth.
  */
 static int
-_DEFUN(__sbprintf, (rptr, fp, fmt, ap),
-       struct _reent *rptr _AND
-       register FILE *fp   _AND
-       _CONST char *fmt  _AND
-       va_list ap)
+__sbprintf(fp, fmt, ap)
+	register FILE *fp;
+	const char *fmt;
+	va_list ap;
 {
 	int ret;
 	FILE fake;
 	unsigned char buf[BUFSIZ];
 
 	/* copy the important variables */
+	fake._data = fp->_data;
 	fake._flags = fp->_flags & ~__SNBF;
 	fake._file = fp->_file;
 	fake._cookie = fp->_cookie;
@@ -252,22 +227,15 @@ _DEFUN(__sbprintf, (rptr, fp, fmt, ap),
 
 	/* set up the buffer */
 	fake._bf._base = fake._p = buf;
-	fake._bf._size = fake._w = sizeof (buf);
+	fake._bf._size = fake._w = sizeof(buf);
 	fake._lbfsize = 0;	/* not actually used, but Just In Case */
-#ifndef __SINGLE_THREAD__
-	__lock_init_recursive (fake._lock);
-#endif
 
 	/* do the work, then copy any error status */
-	ret = _VFPRINTF_R (rptr, &fake, fmt, ap);
+	ret = VFPRINTF(&fake, fmt, ap);
 	if (ret >= 0 && fflush(&fake))
 		ret = EOF;
 	if (fake._flags & __SERR)
 		fp->_flags |= __SERR;
-
-#ifndef __SINGLE_THREAD__
-	__lock_close_recursive (fake._lock);
-#endif
 	return (ret);
 }
 
@@ -277,24 +245,17 @@ _DEFUN(__sbprintf, (rptr, fp, fmt, ap),
 #include <math.h>
 #include "floatio.h"
 
-#if ((MAXEXP+MAXFRACT+1) > MB_LEN_MAX)
-#  define BUF (MAXEXP+MAXFRACT+1) /* + decimal point */
-#else 
-#  define BUF MB_LEN_MAX
-#endif
-
+#define	BUF		(MAXEXP+MAXFRACT+1)	/* + decimal point */
 #define	DEFPREC		6
 
 #ifdef _NO_LONGDBL
-static char *
-_EXFUN(cvt, (struct _reent *, double, int, int, char *, int *, int, int *));
+static char *cvt _PARAMS((struct _reent *, double, int, int, char *, int *, int, int *));
 #else
-static char *
-_EXFUN(cvt, (struct _reent *, _LONG_DOUBLE, int, int, char *, int *, int, int *));
-extern int _EXFUN(_ldcheck,(_LONG_DOUBLE *));
+static char *cvt _PARAMS((struct _reent *, _LONG_DOUBLE, int, int, char *, int *, int, int *));
+extern int  _ldcheck _PARAMS((_LONG_DOUBLE *));
 #endif
 
-static int _EXFUN(exponent, (char *, int, int));
+static int exponent _PARAMS((char *, int, int));
 
 #else /* no FLOATING_POINT */
 
@@ -302,55 +263,12 @@ static int _EXFUN(exponent, (char *, int, int));
 
 #endif /* FLOATING_POINT */
 
-#ifndef _NO_LONGLONG
-#define quad_t long long
-#define u_quad_t unsigned long long
-#else
-#define quad_t long
-#define u_quad_t unsigned long
-#endif
-
-typedef quad_t * quad_ptr_t;
-typedef _PTR     void_ptr_t;
-typedef char *   char_ptr_t;
-typedef long *   long_ptr_t;
-typedef int  *   int_ptr_t;
-typedef short *  short_ptr_t;
-
-#ifndef _NO_POS_ARGS
-#define MAX_POS_ARGS 32
-
-union arg_val
-{
-  int val_int;
-  u_int val_u_int;
-  long val_long;
-  u_long val_u_long;
-  float val_float;
-  double val_double;
-  _LONG_DOUBLE val__LONG_DOUBLE;
-  int_ptr_t val_int_ptr_t;
-  short_ptr_t val_short_ptr_t;
-  long_ptr_t val_long_ptr_t;
-  char_ptr_t val_char_ptr_t;
-  quad_ptr_t val_quad_ptr_t;
-  void_ptr_t val_void_ptr_t;
-  quad_t val_quad_t;
-  u_quad_t val_u_quad_t;
-  wint_t val_wint_t;
-};
-
-static union arg_val *
-_EXFUN(get_arg, (struct _reent *data, int n, char *fmt, 
-                 va_list *ap, int *numargs, union arg_val *args, 
-                 int *arg_type, char **last_fmt));
-#endif /* !_NO_POS_ARGS */
 
 /*
  * Macros for converting digits to letters and vice versa
  */
 #define	to_digit(c)	((c) - '0')
-#define is_digit(c)	((unsigned)to_digit (c) <= 9)
+#define is_digit(c)	((unsigned)to_digit(c) <= 9)
 #define	to_char(n)	((n) + '0')
 
 /*
@@ -372,25 +290,22 @@ _EXFUN(get_arg, (struct _reent *data, int n, char *fmt,
 #define	ZEROPAD		0x080		/* zero (as opposed to blank) pad */
 #define FPT		0x100		/* Floating point number */
 
-int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, _CONST char *, va_list));
-
 int 
-_DEFUN(VFPRINTF, (fp, fmt0, ap),
-       FILE * fp         _AND
-       _CONST char *fmt0 _AND
-       va_list ap)
+_DEFUN (VFPRINTF, (fp, fmt0, ap),
+	FILE * fp _AND
+	_CONST char *fmt0 _AND
+	va_list ap)
 {
-  int result;
-  result = _VFPRINTF_R (_REENT, fp, fmt0, ap);
-  return result;
+  CHECK_INIT (fp);
+  return _VFPRINTF_R (fp->_data, fp, fmt0, ap);
 }
 
 int 
-_DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
-       struct _reent *data _AND
-       FILE * fp           _AND
-       _CONST char *fmt0   _AND
-       va_list ap)
+_DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
+	struct _reent *data _AND
+	FILE * fp _AND
+	_CONST char *fmt0 _AND
+	va_list ap)
 {
 	register char *fmt;	/* format string */
 	register int ch;	/* character from fmt */
@@ -398,21 +313,11 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
 	register char *cp;	/* handy char pointer (short term usage) */
 	register struct __siov *iovp;/* for PRINT macro */
 	register int flags;	/* flags as above */
-	char *fmt_anchor;       /* current format spec being processed */
-	int N;                  /* arg number */
-	int arg_index;          /* index into args processed directly */
-#ifndef _NO_POS_ARGS
-	int numargs;            /* number of varargs read */
-	char *saved_fmt;        /* saved fmt pointer */
-	union arg_val args[MAX_POS_ARGS];
-	int arg_type[MAX_POS_ARGS];
-	int is_pos_arg;         /* is current format positional? */
-	int old_is_pos_arg;     /* is current format positional? */
-#endif
 	int ret;		/* return value accumulator */
 	int width;		/* width from format (%8d), or 0 */
 	int prec;		/* precision from format (%.3d), or -1 */
 	char sign;		/* sign prefix (' ', '+', '-', or \0) */
+	wchar_t wc;
 #ifdef FLOATING_POINT
 	char *decimal_point = localeconv()->decimal_point;
 	char softsign;		/* temporary negative sign for floats */
@@ -429,7 +334,17 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
 	int ndig;		/* actual number of digits returned by cvt */
 	char expstr[7];		/* buffer for exponent string */
 #endif
+
+#ifndef _NO_LONGLONG
+#define	quad_t	  long long
+#define	u_quad_t  unsigned long long
+#endif
+
+#ifndef _NO_LONGLONG
 	u_quad_t _uquad;	/* integer arguments %[diouxX] */
+#else
+	u_long _uquad;
+#endif
 	enum { OCT, DEC, HEX } base;/* base for [diouxX] conversion */
 	int dprec;		/* a copy of prec if [diouxX], 0 otherwise */
 	int realsz;		/* field size expanded by dprec */
@@ -440,11 +355,7 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
 	struct __siov iov[NIOV];/* ... and individual io vectors */
 	char buf[BUF];		/* space for %c, %[diouxX], %[eEfgG] */
 	char ox[2];		/* space for 0x hex-prefix */
-#ifdef _MB_CAPABLE
-	wchar_t wc;
-	mbstate_t state;        /* mbtowc calls from library must not change state */
-#endif
-	char *malloc_buf = NULL;/* handy pointer for malloced buffers */
+        int state = 0;          /* mbtowc calls from library must not change state */
 
 	/*
 	 * Choose PADSIZE to trade efficiency vs. size.  If larger printf
@@ -457,9 +368,6 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
 	static _CONST char zeroes[PADSIZE] =
 	 {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
 
-#ifdef _MB_CAPABLE
-        memset (&state, '\0', sizeof (state));
-#endif
 	/*
 	 * BEWARE, these `goto error' on error, and PAD uses `n'.
 	 */
@@ -477,10 +385,10 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
 #define	PAD(howmany, with) { \
 	if ((n = (howmany)) > 0) { \
 		while (n > PADSIZE) { \
-			PRINT (with, PADSIZE); \
+			PRINT(with, PADSIZE); \
 			n -= PADSIZE; \
 		} \
-		PRINT (with, n); \
+		PRINT(with, n); \
 	} \
 }
 #define	FLUSH() { \
@@ -490,105 +398,65 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
 	iovp = iov; \
 }
 
-	/* Macros to support positional arguments */
-#ifndef _NO_POS_ARGS
-#define GET_ARG(n, ap, type) \
-  ( is_pos_arg \
-      ? n < numargs \
-         ? args[n].val_##type \
-         : get_arg (data, n, fmt_anchor, &ap, &numargs, args, arg_type, &saved_fmt)->val_##type \
-      : arg_index++ < numargs \
-         ? args[n].val_##type \
-         : numargs < MAX_POS_ARGS \
-           ? args[numargs++].val_##type = va_arg (ap, type) \
-           : va_arg (ap, type) \
-  )
-#else
-#define GET_ARG(n, ap, type) (va_arg (ap, type))
-#endif
-    
 	/*
 	 * To extend shorts properly, we need both signed and unsigned
 	 * argument extraction methods.
 	 */
 #ifndef _NO_LONGLONG
 #define	SARG() \
-	(flags&QUADINT ? GET_ARG (N, ap, quad_t) : \
-	    flags&LONGINT ? GET_ARG (N, ap, long) : \
-	    flags&SHORTINT ? (long)(short)GET_ARG (N, ap, int) : \
-	    (long)GET_ARG (N, ap, int))
+	(flags&QUADINT ? va_arg(ap, quad_t) : \
+	    flags&LONGINT ? va_arg(ap, long) : \
+	    flags&SHORTINT ? (long)(short)va_arg(ap, int) : \
+	    (long)va_arg(ap, int))
 #define	UARG() \
-	(flags&QUADINT ? GET_ARG (N, ap, u_quad_t) : \
-	    flags&LONGINT ? GET_ARG (N, ap, u_long) : \
-	    flags&SHORTINT ? (u_long)(u_short)GET_ARG (N, ap, int) : \
-	    (u_long)GET_ARG (N, ap, u_int))
+	(flags&QUADINT ? va_arg(ap, u_quad_t) : \
+	    flags&LONGINT ? va_arg(ap, u_long) : \
+	    flags&SHORTINT ? (u_long)(u_short)va_arg(ap, int) : \
+	    (u_long)va_arg(ap, u_int))
 #else
 #define	SARG() \
-	(flags&LONGINT ? GET_ARG (N, ap, long) : \
-	    flags&SHORTINT ? (long)(short)GET_ARG (N, ap, int) : \
-	    (long)GET_ARG (N, ap, int))
+	(flags&LONGINT ? va_arg(ap, long) : \
+	    flags&SHORTINT ? (long)(short)va_arg(ap, int) : \
+	    (long)va_arg(ap, int))
 #define	UARG() \
-	(flags&LONGINT ? GET_ARG (N, ap, u_long) : \
-	    flags&SHORTINT ? (u_long)(u_short)GET_ARG (N, ap, int) : \
-	    (u_long)GET_ARG (N, ap, u_int))
+	(flags&LONGINT ? va_arg(ap, u_long) : \
+	    flags&SHORTINT ? (u_long)(u_short)va_arg(ap, int) : \
+	    (u_long)va_arg(ap, u_int))
 #endif
 
-	CHECK_INIT (data);
-	_flockfile (fp);
-
 	/* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
-	if (cantwrite (fp)) {
-		_funlockfile (fp);	
+	if (cantwrite(fp))
 		return (EOF);
-	}
 
 	/* optimise fprintf(stderr) (and other unbuffered Unix files) */
 	if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
-	    fp->_file >= 0) {
-		_funlockfile (fp);
-		return (__sbprintf (data, fp, fmt0, ap));
-	}
+	    fp->_file >= 0)
+		return (__sbprintf(fp, fmt0, ap));
 
 	fmt = (char *)fmt0;
 	uio.uio_iov = iovp = iov;
 	uio.uio_resid = 0;
 	uio.uio_iovcnt = 0;
 	ret = 0;
-	arg_index = 0;
-#ifndef _NO_POS_ARGS
-	saved_fmt = NULL;
-	arg_type[0] = -1;
-	numargs = 0;
-	is_pos_arg = 0;
-#endif
 
 	/*
 	 * Scan the format for conversions (`%' character).
 	 */
 	for (;;) {
 	        cp = fmt;
-#ifdef _MB_CAPABLE
-	        while ((n = _mbtowc_r (data, &wc, fmt, MB_CUR_MAX, &state)) > 0) {
-                    if (wc == '%')
-                        break;
-                    fmt += n;
+	        while ((n = _mbtowc_r(_REENT, &wc, fmt, MB_CUR_MAX, &state)) > 0) {
+			fmt += n;
+			if (wc == '%') {
+				fmt--;
+				break;
+			}
 		}
-#else
-                while (*fmt != '\0' && *fmt != '%')
-                    fmt += 1;
-#endif
 		if ((m = fmt - cp) != 0) {
-			PRINT (cp, m);
+			PRINT(cp, m);
 			ret += m;
 		}
-#ifdef _MB_CAPABLE
 		if (n <= 0)
-                    goto done;
-#else
-                if (*fmt == '\0')
-                    goto done;
-#endif
-		fmt_anchor = fmt;
+			goto done;
 		fmt++;		/* skip over '%' */
 
 		flags = 0;
@@ -596,10 +464,6 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
 		width = 0;
 		prec = -1;
 		sign = '\0';
-		N = arg_index;
-#ifndef _NO_POS_ARGS
-		is_pos_arg = 0;
-#endif
 
 rflag:		ch = *fmt++;
 reswitch:	switch (ch) {
@@ -616,47 +480,13 @@ reswitch:	switch (ch) {
 			flags |= ALT;
 			goto rflag;
 		case '*':
-			n = N;
-#ifndef _NO_POS_ARGS
-			/* we must check for positional arg used for dynamic width */
-			old_is_pos_arg = is_pos_arg;
-			is_pos_arg = 0;
-			if (is_digit (*fmt)) {
-				char *old_fmt = fmt;
-
-				n = 0;
-				ch = *fmt++;
-				do {
-					n = 10 * n + to_digit (ch);
-					ch = *fmt++;
-				} while (is_digit (ch));
-
-				if (ch == '$') {
-					if (n <= MAX_POS_ARGS) {
-						n -= 1;
-						is_pos_arg = 1;
-					}
-					else
-						goto error;
-				}
-				else {
-					fmt = old_fmt;
-					goto rflag;
-				}
-			}
-#endif /* !_NO_POS_ARGS */
-
 			/*
 			 * ``A negative field width argument is taken as a
 			 * - flag followed by a positive field width.''
 			 *	-- ANSI X3J11
 			 * They don't exclude field widths read from args.
 			 */
-			width = GET_ARG (n, ap, int);
-#ifndef _NO_POS_ARGS
-			is_pos_arg = old_is_pos_arg;
-#endif
-			if (width >= 0)
+			if ((width = va_arg(ap, int)) >= 0)
 				goto rflag;
 			width = -width;
 			/* FALLTHROUGH */
@@ -668,46 +498,13 @@ reswitch:	switch (ch) {
 			goto rflag;
 		case '.':
 			if ((ch = *fmt++) == '*') {
-				n = N;
-#ifndef _NO_POS_ARGS
-				/* we must check for positional arg used for dynamic width */
-				old_is_pos_arg = is_pos_arg;
-				is_pos_arg = 0;
-				if (is_digit (*fmt)) {
-					char *old_fmt = fmt;
-
-					n = 0;
-					ch = *fmt++;
-					do {
-						n = 10 * n + to_digit (ch);
-						ch = *fmt++;
-					} while (is_digit (ch));
-
-					if (ch == '$') {
-						if (n <= MAX_POS_ARGS) {
-							n -= 1;
-							is_pos_arg = 1;
-						}
-						else
-							goto error;
-					}
-					else {
-						fmt = old_fmt;
-						goto rflag;
-					}
-				}
-#endif /* !_NO_POS_ARGS */
-				prec = GET_ARG (n, ap, int);
-#ifndef _NO_POS_ARGS
-				is_pos_arg = old_is_pos_arg;
-#endif
-				if (prec < 0)
-					prec = -1;
+				n = va_arg(ap, int);
+				prec = n < 0 ? -1 : n;
 				goto rflag;
 			}
 			n = 0;
-			while (is_digit (ch)) {
-				n = 10 * n + to_digit (ch);
+			while (is_digit(ch)) {
+				n = 10 * n + to_digit(ch);
 				ch = *fmt++;
 			}
 			prec = n < 0 ? -1 : n;
@@ -724,20 +521,9 @@ reswitch:	switch (ch) {
 		case '5': case '6': case '7': case '8': case '9':
 			n = 0;
 			do {
-				n = 10 * n + to_digit (ch);
+				n = 10 * n + to_digit(ch);
 				ch = *fmt++;
-			} while (is_digit (ch));
-#ifndef _NO_POS_ARGS
-			if (ch == '$') {
-				if (n <= MAX_POS_ARGS) {
-					N = n - 1;
-					is_pos_arg = 1;
-					goto rflag;
-				}
-				else
-					goto error;
-			}
-#endif /* !_NO_POS_ARGS */
+			} while (is_digit(ch));
 			width = n;
 			goto reswitch;
 #ifdef FLOATING_POINT
@@ -760,23 +546,8 @@ reswitch:	switch (ch) {
 			flags |= QUADINT;
 			goto rflag;
 		case 'c':
-		case 'C':
-			cp = buf;
-			if (ch == 'C' || (flags & LONGINT)) {
-				mbstate_t ps;
-
-				memset ((_PTR)&ps, '\0', sizeof (mbstate_t));
-				if ((size = (int)_wcrtomb_r (data, cp, 
-				    	       (wchar_t)GET_ARG (N, ap, wint_t), 
-					        &ps)) == -1) {
-					fp->_flags |= __SERR;
-					goto error; 
-				}
-			}
-			else {
-				*cp = GET_ARG (N, ap, int);
-				size = 1;
-			}
+			*(cp = buf) = va_arg(ap, int);
+			size = 1;
 			sign = '\0';
 			break;
 		case 'D':
@@ -784,7 +555,7 @@ reswitch:	switch (ch) {
 			/*FALLTHROUGH*/
 		case 'd':
 		case 'i':
-			_uquad = SARG ();
+			_uquad = SARG();
 #ifndef _NO_LONGLONG
 			if ((quad_t)_uquad < 0)
 #else
@@ -801,7 +572,6 @@ reswitch:	switch (ch) {
 		case 'e':
 		case 'E':
 		case 'f':
-		case 'F':
 		case 'g':
 		case 'G':
 			if (prec == -1) {
@@ -812,27 +582,21 @@ reswitch:	switch (ch) {
 
 #ifdef _NO_LONGDBL
 			if (flags & LONGDBL) {
-				_fpvalue = (double) GET_ARG (N, ap, _LONG_DOUBLE);
+				_fpvalue = (double) va_arg(ap, _LONG_DOUBLE);
 			} else {
-				_fpvalue = GET_ARG (N, ap, double);
+				_fpvalue = va_arg(ap, double);
 			}
 
 			/* do this before tricky precision changes */
-			if (isinf (_fpvalue)) {
+			if (isinf(_fpvalue)) {
 				if (_fpvalue < 0)
 					sign = '-';
-				if (ch == 'E' || ch == 'F' || ch == 'G')
-					cp = "INF";
-				else
-					cp = "inf";
+				cp = "Inf";
 				size = 3;
 				break;
 			}
-			if (isnan (_fpvalue)) {
-				if (ch == 'E' || ch == 'F' || ch == 'G')
-					cp = "NAN";
-				else
-					cp = "nan";
+			if (isnan(_fpvalue)) {
+				cp = "NaN";
 				size = 3;
 				break;
 			}
@@ -840,9 +604,9 @@ reswitch:	switch (ch) {
 #else /* !_NO_LONGDBL */
 			
 			if (flags & LONGDBL) {
-				_fpvalue = GET_ARG (N, ap, _LONG_DOUBLE);
+				_fpvalue = va_arg(ap, _LONG_DOUBLE);
 			} else {
-				_fpvalue = (_LONG_DOUBLE)GET_ARG (N, ap, double);
+				_fpvalue = (_LONG_DOUBLE)va_arg(ap, double);
 			}
 
 			/* do this before tricky precision changes */
@@ -850,18 +614,12 @@ reswitch:	switch (ch) {
 			if (tmp == 2) {
 				if (_fpvalue < 0)
 					sign = '-';
-				if (ch == 'E' || ch == 'F' || ch == 'G')
-					cp = "INF";
-				else
-					cp = "inf";
+				cp = "Inf";
 				size = 3;
 				break;
 			}
 			if (tmp == 1) {
-				if (ch == 'E' || ch == 'F' || ch == 'G')
-					cp = "NAN";
-				else
-					cp = "nan";
+				cp = "NaN";
 				size = 3;
 				break;
 			}
@@ -869,7 +627,7 @@ reswitch:	switch (ch) {
 
 			flags |= FPT;
 
-			cp = cvt (data, _fpvalue, prec, flags, &softsign,
+			cp = cvt(data, _fpvalue, prec, flags, &softsign,
 				&expt, ch, &ndig);
 
 			if (ch == 'g' || ch == 'G') {
@@ -880,7 +638,7 @@ reswitch:	switch (ch) {
 			} 
 			if (ch <= 'e') {	/* 'e' or 'E' fmt */
 				--expt;
-				expsize = exponent (expstr, expt, ch);
+				expsize = exponent(expstr, expt, ch);
 				size = expsize + ndig;
 				if (ndig > 1 || flags & ALT)
 					++size;
@@ -890,9 +648,7 @@ reswitch:	switch (ch) {
 					if (prec || flags & ALT)
 						size += prec + 1;
 				} else	/* "0.X" */
-					size = (prec || flags & ALT)
-						  ? prec + 2
-						  : 1;
+					size = prec + 2;
 			} else if (expt >= ndig) {	/* fixed g fmt */
 				size = expt;
 				if (flags & ALT)
@@ -908,21 +664,21 @@ reswitch:	switch (ch) {
 		case 'n':
 #ifndef _NO_LONGLONG
 			if (flags & QUADINT)
-				*GET_ARG (N, ap, quad_ptr_t) = ret;
+				*va_arg(ap, quad_t *) = ret;
 			else 
 #endif
 			if (flags & LONGINT)
-				*GET_ARG (N, ap, long_ptr_t) = ret;
+				*va_arg(ap, long *) = ret;
 			else if (flags & SHORTINT)
-				*GET_ARG (N, ap, short_ptr_t) = ret;
+				*va_arg(ap, short *) = ret;
 			else
-				*GET_ARG (N, ap, int_ptr_t) = ret;
+				*va_arg(ap, int *) = ret;
 			continue;	/* no output */
 		case 'O':
 			flags |= LONGINT;
 			/*FALLTHROUGH*/
 		case 'o':
-			_uquad = UARG ();
+			_uquad = UARG();
 			base = OCT;
 			goto nosign;
 		case 'p':
@@ -934,82 +690,22 @@ reswitch:	switch (ch) {
 			 *	-- ANSI X3J11
 			 */
 			/* NOSTRICT */
-			_uquad = (u_long)(unsigned _POINTER_INT)GET_ARG (N, ap, void_ptr_t);
+			_uquad = (u_long)(unsigned _POINTER_INT)va_arg(ap, void *);
 			base = HEX;
 			xdigs = "0123456789abcdef";
 			flags |= HEXPREFIX;
 			ch = 'x';
 			goto nosign;
 		case 's':
-		case 'S':
-			sign = '\0';
-			if ((cp = GET_ARG (N, ap, char_ptr_t)) == NULL) {
+			if ((cp = va_arg(ap, char *)) == NULL)
 				cp = "(null)";
-				size = 6;
-			}
-			else if (ch == 'S' || (flags & LONGINT)) {
-				mbstate_t ps;
-				_CONST wchar_t *wcp;
- 
-				wcp = (_CONST wchar_t *)cp;
-				size = m = 0;
-				memset ((_PTR)&ps, '\0', sizeof (mbstate_t));
- 
-				/* Count number of bytes needed for multibyte
-				   string that will be produced from widechar
-				   string.  */
-  				if (prec >= 0) {
-					while (1) {
-						if (wcp[m] == L'\0')
-							break;
-						if ((n = (int)_wcrtomb_r (data, 
-                                                     buf, wcp[m], &ps)) == -1) {
-							fp->_flags |= __SERR;
-							goto error;
-						}
-						if (n + size > prec)
-							break;
-						m += 1;
-						size += n;
-						if (size == prec)
-							break;
-					}
-				}
-				else {
-					if ((size = (int)_wcsrtombs_r (data, 
-                                                   NULL, &wcp, 0, &ps)) == -1) {
-						fp->_flags |= __SERR;
-						goto error;
-					}
-					wcp = (_CONST wchar_t *)cp;
-				}
- 
-				if (size == 0)
-					break;
- 
-				if ((malloc_buf = 
-				    (char *)_malloc_r (data, size + 1)) == NULL) {
-					fp->_flags |= __SERR;
-					goto error;
-				}
-                             
-				/* Convert widechar string to multibyte string. */
-				memset ((_PTR)&ps, '\0', sizeof (mbstate_t));
-				if (_wcsrtombs_r (data, malloc_buf, 
-                                                 &wcp, size, &ps) != size) {
-					fp->_flags |= __SERR;
-					goto error;
-				}
-				cp = malloc_buf;
-				cp[size] = '\0';
-			}
-			else if (prec >= 0) {
+			if (prec >= 0) {
 				/*
 				 * can't use strlen; can only look for the
 				 * NUL in the first `prec' characters, and
-				 * strlen () will go further.
+				 * strlen() will go further.
 				 */
-				char *p = memchr (cp, 0, prec);
+				char *p = memchr(cp, 0, prec);
 
 				if (p != NULL) {
 					size = p - cp;
@@ -1018,14 +714,14 @@ reswitch:	switch (ch) {
 				} else
 					size = prec;
 			} else
-				size = strlen (cp);
-
+				size = strlen(cp);
+			sign = '\0';
 			break;
 		case 'U':
 			flags |= LONGINT;
 			/*FALLTHROUGH*/
 		case 'u':
-			_uquad = UARG ();
+			_uquad = UARG();
 			base = DEC;
 			goto nosign;
 		case 'X':
@@ -1033,7 +729,7 @@ reswitch:	switch (ch) {
 			goto hex;
 		case 'x':
 			xdigs = "0123456789abcdef";
-hex:			_uquad = UARG ();
+hex:			_uquad = UARG();
 			base = HEX;
 			/* leading 0x/X only if non-zero */
 			if (flags & ALT && _uquad != 0)
@@ -1064,7 +760,7 @@ number:			if ((dprec = prec) >= 0)
 				switch (base) {
 				case OCT:
 					do {
-						*--cp = to_char (_uquad & 7);
+						*--cp = to_char(_uquad & 7);
 						_uquad >>= 3;
 					} while (_uquad);
 					/* handle octal leading 0 */
@@ -1075,10 +771,10 @@ number:			if ((dprec = prec) >= 0)
 				case DEC:
 					/* many numbers are 1 digit */
 					while (_uquad >= 10) {
-						*--cp = to_char (_uquad % 10);
+						*--cp = to_char(_uquad % 10);
 						_uquad /= 10;
 					}
-					*--cp = to_char (_uquad);
+					*--cp = to_char(_uquad);
 					break;
 
 				case HEX:
@@ -1090,7 +786,7 @@ number:			if ((dprec = prec) >= 0)
 
 				default:
 					cp = "bug in vfprintf: bad base";
-					size = strlen (cp);
+					size = strlen(cp);
 					goto skipsize;
 				}
 			}
@@ -1142,94 +838,86 @@ number:			if ((dprec = prec) >= 0)
 
 		/* right-adjusting blank padding */
 		if ((flags & (LADJUST|ZEROPAD)) == 0)
-			PAD (width - realsz, blanks);
+			PAD(width - realsz, blanks);
 
 		/* prefix */
 		if (sign) {
-			PRINT (&sign, 1);
+			PRINT(&sign, 1);
 		} else if (flags & HEXPREFIX) {
 			ox[0] = '0';
 			ox[1] = ch;
-			PRINT (ox, 2);
+			PRINT(ox, 2);
 		}
 
 		/* right-adjusting zero padding */
 		if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD)
-			PAD (width - realsz, zeroes);
+			PAD(width - realsz, zeroes);
 
 		/* leading zeroes from decimal precision */
-		PAD (dprec - size, zeroes);
+		PAD(dprec - size, zeroes);
 
 		/* the string or number proper */
 #ifdef FLOATING_POINT
 		if ((flags & FPT) == 0) {
-			PRINT (cp, size);
+			PRINT(cp, size);
 		} else {	/* glue together f_p fragments */
 			if (ch >= 'f') {	/* 'f' or 'g' */
 				if (_fpvalue == 0) {
 					/* kludge for __dtoa irregularity */
-					PRINT ("0", 1);
+					PRINT("0", 1);
 					if (expt < ndig || (flags & ALT) != 0) {
-						PRINT (decimal_point, 1);
-						PAD (ndig - 1, zeroes);
+						PRINT(decimal_point, 1);
+						PAD(ndig - 1, zeroes);
 					}
 				} else if (expt <= 0) {
-					PRINT ("0", 1);
+					PRINT("0", 1);
 					if(expt || ndig) {
-						PRINT (decimal_point, 1);
-						PAD (-expt, zeroes);
-						PRINT (cp, ndig);
+						PRINT(decimal_point, 1);
+						PAD(-expt, zeroes);
+						PRINT(cp, ndig);
 					}
 				} else if (expt >= ndig) {
-					PRINT (cp, ndig);
-					PAD (expt - ndig, zeroes);
+					PRINT(cp, ndig);
+					PAD(expt - ndig, zeroes);
 					if (flags & ALT)
-						PRINT (".", 1);
+						PRINT(".", 1);
 				} else {
-					PRINT (cp, expt);
+					PRINT(cp, expt);
 					cp += expt;
-					PRINT (".", 1);
-					PRINT (cp, ndig-expt);
+					PRINT(".", 1);
+					PRINT(cp, ndig-expt);
 				}
 			} else {	/* 'e' or 'E' */
 				if (ndig > 1 || flags & ALT) {
 					ox[0] = *cp++;
 					ox[1] = '.';
-					PRINT (ox, 2);
+					PRINT(ox, 2);
                                        if (_fpvalue) {
-						PRINT (cp, ndig-1);
+						PRINT(cp, ndig-1);
 					} else	/* 0.[0..] */
 						/* __dtoa irregularity */
-						PAD (ndig - 1, zeroes);
+						PAD(ndig - 1, zeroes);
 				} else	/* XeYYY */
-					PRINT (cp, 1);
-				PRINT (expstr, expsize);
+					PRINT(cp, 1);
+				PRINT(expstr, expsize);
 			}
 		}
 #else
-		PRINT (cp, size);
+		PRINT(cp, size);
 #endif
 		/* left-adjusting padding (always blank) */
 		if (flags & LADJUST)
-			PAD (width - realsz, blanks);
+			PAD(width - realsz, blanks);
 
 		/* finally, adjust ret */
 		ret += width > realsz ? width : realsz;
 
-		FLUSH ();	/* copy out the I/O vectors */
-
-                if (malloc_buf != NULL) {
-			_free_r (data, malloc_buf);
-			malloc_buf = NULL;
-		}
+		FLUSH();	/* copy out the I/O vectors */
 	}
 done:
-	FLUSH ();
+	FLUSH();
 error:
-	if (malloc_buf != NULL)
-		_free_r (data, malloc_buf);
-	_funlockfile (fp);
-	return (__sferror (fp) ? EOF : ret);
+	return (__sferror(fp) ? EOF : ret);
 	/* NOTREACHED */
 }
 
@@ -1245,40 +933,23 @@ extern char *_ldtoa_r _PARAMS((struct _reent *, _LONG_DOUBLE, int,
 #define word0(x) ldword0(x)
 #endif
 
-#ifdef _NO_LONGDBL
 static char *
-_DEFUN(cvt, (data, value, ndigits, flags, sign, decpt, ch, length),
-       struct _reent *data _AND
-       double value _AND
-       int ndigits  _AND
-       int flags    _AND
-       char *sign   _AND
-       int *decpt   _AND
-       int ch       _AND
-       int *length)
+cvt(data, value, ndigits, flags, sign, decpt, ch, length)
+	struct _reent *data;
+#ifdef _NO_LONGDBL
+	double value;
 #else
-static char *
-_DEFUN(cvt, (data, value, ndigits, flags, sign, decpt, ch, length),
-       struct _reent *data _AND
-       _LONG_DOUBLE value  _AND
-       int ndigits         _AND
-       int flags           _AND
-       char *sign          _AND
-       int *decpt          _AND
-       int ch              _AND
-       int *length)
+	_LONG_DOUBLE value;
 #endif
+	int ndigits, flags, *decpt, ch, *length;
+	char *sign;
 {
 	int mode, dsgn;
 	char *digits, *bp, *rve;
 #ifdef _NO_LONGDBL
         union double_union tmp;
 #else
-	union
-	{
-	  struct ldieee ieee;
-	  _LONG_DOUBLE val;
-	} ld;
+        struct ldieee *ldptr;
 #endif
 
 	if (ch == 'f') {
@@ -1297,22 +968,22 @@ _DEFUN(cvt, (data, value, ndigits, flags, sign, decpt, ch, length),
 #ifdef _NO_LONGDBL
         tmp.d = value;
 
-	if (word0 (tmp) & Sign_bit) { /* this will check for < 0 and -0.0 */
+	if (word0(tmp) & Sign_bit) { /* this will check for < 0 and -0.0 */
 		value = -value;
 		*sign = '-';
         } else
 		*sign = '\000';
 
-	digits = _dtoa_r (data, value, mode, ndigits, decpt, &dsgn, &rve);
+	digits = _dtoa_r(data, value, mode, ndigits, decpt, &dsgn, &rve);
 #else /* !_NO_LONGDBL */
-	ld.val = value;
-	if (ld.ieee.sign) { /* this will check for < 0 and -0.0 */
+	ldptr = (struct ldieee *)&value;
+	if (ldptr->sign) { /* this will check for < 0 and -0.0 */
 		value = -value;
 		*sign = '-';
         } else
 		*sign = '\000';
 
-	digits = _ldtoa_r (data, value, mode, ndigits, decpt, &dsgn, &rve);
+	digits = _ldtoa_r(data, value, mode, ndigits, decpt, &dsgn, &rve);
 #endif /* !_NO_LONGDBL */
 
 	if ((ch != 'g' && ch != 'G') || flags & ALT) {	/* Print trailing zeros */
@@ -1332,10 +1003,9 @@ _DEFUN(cvt, (data, value, ndigits, flags, sign, decpt, ch, length),
 }
 
 static int
-_DEFUN(exponent, (p0, exp, fmtch),
-       char *p0 _AND
-       int exp  _AND
-       int fmtch)
+exponent(p0, exp, fmtch)
+	char *p0;
+	int exp, fmtch;
 {
 	register char *p, *t;
 	char expbuf[40];
@@ -1351,427 +1021,15 @@ _DEFUN(exponent, (p0, exp, fmtch),
 	t = expbuf + 40;
 	if (exp > 9) {
 		do {
-			*--t = to_char (exp % 10);
+			*--t = to_char(exp % 10);
 		} while ((exp /= 10) > 9);
-		*--t = to_char (exp);
+		*--t = to_char(exp);
 		for (; t < expbuf + 40; *p++ = *t++);
 	}
 	else {
 		*p++ = '0';
-		*p++ = to_char (exp);
+		*p++ = to_char(exp);
 	}
 	return (p - p0);
 }
 #endif /* FLOATING_POINT */
-
-
-#ifndef _NO_POS_ARGS
-
-/* Positional argument support.
-   Written by Jeff Johnston
-
-   Copyright (c) 2002 Red Hat Incorporated.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are met:
-
-      Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-      Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-      
-      The name of Red Hat Incorporated may not be used to endorse
-      or promote products derived from this software without specific
-      prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-   DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-
-typedef enum {
-  ZERO,   /* '0' */
-  DIGIT,  /* '1-9' */
-  DOLLAR, /* '$' */
-  MODFR,  /* spec modifier */
-  SPEC,   /* format specifier */
-  DOT,    /* '.' */
-  STAR,   /* '*' */
-  FLAG,   /* format flag */
-  OTHER,  /* all other chars */ 
-  MAX_CH_CLASS /* place-holder */
-} CH_CLASS;
-
-typedef enum { 
-  START,  /* start */
-  SFLAG,  /* seen a flag */
-  WDIG,   /* seen digits in width area */
-  WIDTH,  /* processed width */
-  SMOD,   /* seen spec modifier */
-  SDOT,   /* seen dot */ 
-  VARW,   /* have variable width specifier */
-  VARP,   /* have variable precision specifier */
-  PREC,   /* processed precision */
-  VWDIG,  /* have digits in variable width specification */
-  VPDIG,  /* have digits in variable precision specification */
-  DONE,   /* done */   
-  MAX_STATE, /* place-holder */ 
-} STATE;
-
-typedef enum {
-  NOOP,  /* do nothing */
-  NUMBER, /* build a number from digits */
-  SKIPNUM, /* skip over digits */
-  GETMOD,  /* get and process format modifier */
-  GETARG,  /* get and process argument */
-  GETPW,   /* get variable precision or width */
-  GETPWB,  /* get variable precision or width and pushback fmt char */
-  GETPOS,  /* get positional parameter value */
-  PWPOS,   /* get positional parameter value for variable width or precision */
-} ACTION;
-
-_CONST static CH_CLASS chclass[256] = {
-  /* 00-07 */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* 08-0f */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* 10-17 */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* 18-1f */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* 20-27 */  FLAG,    OTHER,   OTHER,   FLAG,    DOLLAR,  OTHER,   OTHER,   OTHER,
-  /* 28-2f */  OTHER,   OTHER,   STAR,    FLAG,    OTHER,   FLAG,    DOT,     OTHER,
-  /* 30-37 */  ZERO,    DIGIT,   DIGIT,   DIGIT,   DIGIT,   DIGIT,   DIGIT,   DIGIT,
-  /* 38-3f */  DIGIT,   DIGIT,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* 40-47 */  OTHER,   OTHER,   OTHER,   SPEC,    SPEC,    SPEC,    OTHER,   SPEC, 
-  /* 48-4f */  OTHER,   OTHER,   OTHER,   OTHER,   MODFR,   OTHER,   OTHER,   SPEC, 
-  /* 50-57 */  OTHER,   OTHER,   OTHER,   SPEC,    OTHER,   SPEC,    OTHER,   SPEC, 
-  /* 58-5f */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* 60-67 */  OTHER,   OTHER,   OTHER,   SPEC,    SPEC,    SPEC,    SPEC,    SPEC, 
-  /* 68-6f */  MODFR,   SPEC,    OTHER,   OTHER,   MODFR,   OTHER,   OTHER,   SPEC, 
-  /* 70-77 */  SPEC,    MODFR,   OTHER,   SPEC,    OTHER,   SPEC,    OTHER,   OTHER,
-  /* 78-7f */  SPEC,    OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* 80-87 */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* 88-8f */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* 90-97 */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* 98-9f */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* a0-a7 */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* a8-af */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* b0-b7 */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* b8-bf */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* c0-c7 */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* c8-cf */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* d0-d7 */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* d8-df */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* e0-e7 */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* e8-ef */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* f0-f7 */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-  /* f8-ff */  OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,   OTHER,
-};
-
-_CONST static STATE state_table[MAX_STATE][MAX_CH_CLASS] = {
-  /*             '0'     '1-9'     '$'     MODFR    SPEC    '.'     '*'    FLAG    OTHER */ 
-  /* START */  { SFLAG,   WDIG,    DONE,   SMOD,    DONE,   SDOT,  VARW,   SFLAG,  DONE },
-  /* SFLAG */  { SFLAG,   WDIG,    DONE,   SMOD,    DONE,   SDOT,  VARW,   SFLAG,  DONE },
-  /* WDIG  */  { DONE,    DONE,    WIDTH,  SMOD,    DONE,   SDOT,  DONE,   DONE,   DONE },
-  /* WIDTH */  { DONE,    DONE,    DONE,   SMOD,    DONE,   SDOT,  DONE,   DONE,   DONE },
-  /* SMOD  */  { DONE,    DONE,    DONE,   DONE,    DONE,   DONE,  DONE,   DONE,   DONE },
-  /* SDOT  */  { SDOT,    PREC,    DONE,   SMOD,    DONE,   DONE,  VARP,   DONE,   DONE },
-  /* VARW  */  { DONE,    VWDIG,   DONE,   SMOD,    DONE,   SDOT,  DONE,   DONE,   DONE },
-  /* VARP  */  { DONE,    VPDIG,   DONE,   SMOD,    DONE,   DONE,  DONE,   DONE,   DONE },
-  /* PREC  */  { DONE,    DONE,    DONE,   SMOD,    DONE,   DONE,  DONE,   DONE,   DONE },
-  /* VWDIG */  { DONE,    DONE,    WIDTH,  DONE,    DONE,   DONE,  DONE,   DONE,   DONE },
-  /* VPDIG */  { DONE,    DONE,    PREC,   DONE,    DONE,   DONE,  DONE,   DONE,   DONE },
-};
-
-_CONST static ACTION action_table[MAX_STATE][MAX_CH_CLASS] = {
-  /*             '0'     '1-9'     '$'     MODFR    SPEC    '.'     '*'    FLAG    OTHER */ 
-  /* START */  { NOOP,    NUMBER,  NOOP,   GETMOD,  GETARG, NOOP,  NOOP,   NOOP,   NOOP },
-  /* SFLAG */  { NOOP,    NUMBER,  NOOP,   GETMOD,  GETARG, NOOP,  NOOP,   NOOP,   NOOP },
-  /* WDIG  */  { NOOP,    NOOP,    GETPOS, GETMOD,  GETARG, NOOP,  NOOP,   NOOP,   NOOP },
-  /* WIDTH */  { NOOP,    NOOP,    NOOP,   GETMOD,  GETARG, NOOP,  NOOP,   NOOP,   NOOP },
-  /* SMOD  */  { NOOP,    NOOP,    NOOP,   NOOP,    GETARG, NOOP,  NOOP,   NOOP,   NOOP },
-  /* SDOT  */  { NOOP,    SKIPNUM, NOOP,   GETMOD,  GETARG, NOOP,  NOOP,   NOOP,   NOOP },
-  /* VARW  */  { NOOP,    NUMBER,  NOOP,   GETPW,   GETPWB, GETPW, NOOP,   NOOP,   NOOP },
-  /* VARP  */  { NOOP,    NUMBER,  NOOP,   GETPW,   GETPWB, NOOP,  NOOP,   NOOP,   NOOP },
-  /* PREC  */  { NOOP,    NOOP,    NOOP,   GETMOD,  GETARG, NOOP,  NOOP,   NOOP,   NOOP },
-  /* VWDIG */  { NOOP,    NOOP,    PWPOS,  NOOP,    NOOP,   NOOP,  NOOP,   NOOP,   NOOP },
-  /* VPDIG */  { NOOP,    NOOP,    PWPOS,  NOOP,    NOOP,   NOOP,  NOOP,   NOOP,   NOOP },
-};
-
-/* function to get positional parameter N where n = N - 1 */
-static union arg_val *
-_DEFUN(get_arg, (data, n, fmt, ap, numargs_p, args, arg_type, last_fmt),
-       struct _reent *data _AND
-       int n               _AND
-       char *fmt           _AND
-       va_list *ap         _AND
-       int *numargs_p      _AND
-       union arg_val *args _AND
-       int *arg_type       _AND
-       char **last_fmt)
-{
-  int ch;
-  int number, flags;
-  int spec_type;
-  int numargs = *numargs_p;
-  CH_CLASS chtype;
-  STATE state, next_state;
-  ACTION action;
-  int pos, last_arg;
-  int max_pos_arg = n;
-  enum types { INT, LONG_INT, SHORT_INT, QUAD_INT, CHAR, CHAR_PTR, DOUBLE, LONG_DOUBLE, WIDE_CHAR };
-#ifdef _MB_CAPABLE
-  wchar_t wc;
-  mbstate_t wc_state;
-  int nbytes; 
-#endif
-    
-  /* if this isn't the first call, pick up where we left off last time */
-  if (*last_fmt != NULL)
-    fmt = *last_fmt;
-
-#ifdef _MB_CAPABLE
-  memset (&wc_state, '\0', sizeof (wc_state));
-#endif
-
-  /* we need to process either to end of fmt string or until we have actually
-     read the desired parameter from the vararg list. */
-  while (*fmt && n >= numargs)
-    {
-#ifdef _MB_CAPABLE
-      while ((nbytes = _mbtowc_r (data, &wc, fmt, MB_CUR_MAX, &wc_state)) > 0) 
-	{
-	  fmt += nbytes;
-	  if (wc == '%') 
-	    break;
-	}
-
-      if (nbytes <= 0)
-	break;
-#else
-      while (*fmt != '\0' && *fmt != '%')
-	fmt += 1;
-
-      if (*fmt == '\0')
-	break;
-#endif
-      state = START;
-      flags = 0;
-      pos = -1;
-      number = 0;
-      spec_type = INT;
-
-      /* Use state/action table to process format specifiers.  We ignore invalid
-         formats and we are only interested in information that tells us how to
-         read the vararg list. */
-      while (state != DONE)
-	{
-	  ch = *fmt++;
-	  chtype = chclass[ch];
-	  next_state = state_table[state][chtype];
-	  action = action_table[state][chtype];
-	  state = next_state;
-	  
-	  switch (action)
-	    {
-	    case GETMOD:  /* we have format modifier */
-	      switch (ch)
-		{
-		case 'h':
-		  flags |= SHORTINT;
-		  break;
-		case 'L':
-		  flags |= LONGDBL;
-		  break;
-		case 'q':
-		  flags |= QUADINT;
-		  break;
-		case 'l':
-		default:
-		  if (*fmt == 'l')
-		    {
-		      flags |= QUADINT;
-		      ++fmt;
-		    }
-		  else
-		    flags |= LONGINT;
-		  break;
-		}
-	      break;
-	    case GETARG: /* we have format specifier */
-	      {
-		numargs &= (MAX_POS_ARGS - 1);
-		/* process the specifier and translate it to a type to fetch from varargs */
-		switch (ch)
-		  {
-		  case 'd':
-		  case 'i':
-		  case 'o':
-		  case 'x':
-		  case 'X':
-		  case 'u':
-		    if (flags & LONGINT)
-		      spec_type = LONG_INT;
-		    else if (flags & SHORTINT)
-		      spec_type = SHORT_INT;
-#ifndef _NO_LONGLONG
-		    else if (flags & QUADINT)
-		      spec_type = QUAD_INT;
-#endif
-		    else
-		      spec_type = INT;
-		    break;
-		  case 'D':
-		  case 'U':
-		  case 'O':
-		    spec_type = LONG_INT;
-		    break;
-		  case 'f':
-		  case 'g':
-		  case 'G':
-		  case 'E':
-		  case 'e':
-#ifndef _NO_LONGDBL
-		    if (flags & LONGDBL)
-		      spec_type = LONG_DOUBLE;
-		    else
-#endif
-		      spec_type = DOUBLE;
-		    break;
-		  case 's':
-		  case 'S':
-		  case 'p':
-		    spec_type = CHAR_PTR;
-		    break;
-		  case 'c':
-		    spec_type = CHAR;
-		    break;
-		  case 'C':
-		    spec_type = WIDE_CHAR;
-		    break;
-		  }
-
-		/* if we have a positional parameter, just store the type, otherwise
-		   fetch the parameter from the vararg list */
-		if (pos != -1)
-		  arg_type[pos] = spec_type;
-		else
-		  {
-		    switch (spec_type)
-		      {
-		      case LONG_INT:
-			args[numargs++].val_long = va_arg (*ap, long);
-			break;
-		      case QUAD_INT:
-			args[numargs++].val_quad_t = va_arg (*ap, quad_t);
-			break;
-		      case WIDE_CHAR:
-			args[numargs++].val_wint_t = va_arg (*ap, wint_t);
-			break;
-		      case CHAR:
-		      case SHORT_INT:
-		      case INT:
-			args[numargs++].val_int = va_arg (*ap, int);
-			break;
-		      case CHAR_PTR:
-			args[numargs++].val_char_ptr_t = va_arg (*ap, char *);
-			break;
-		      case DOUBLE:
-			args[numargs++].val_double = va_arg (*ap, double);
-			break;
-		      case LONG_DOUBLE:
-			args[numargs++].val__LONG_DOUBLE = va_arg (*ap, _LONG_DOUBLE);
-			break;
-		      }
-		  }
-	      }
-	      break;
-	    case GETPOS: /* we have positional specifier */
-	      if (arg_type[0] == -1)
-		memset (arg_type, 0, sizeof (int) * MAX_POS_ARGS);
-	      pos = number - 1;
-	      max_pos_arg = (max_pos_arg > pos ? max_pos_arg : pos);
-	      break;
-	    case PWPOS:  /* we have positional specifier for width or precision */
-	      if (arg_type[0] == -1)
-		memset (arg_type, 0, sizeof (int) * MAX_POS_ARGS);
-	      number -= 1;
-	      arg_type[number] = INT;
-	      max_pos_arg = (max_pos_arg > number ? max_pos_arg : number);
-	      break;
-	    case GETPWB: /* we require format pushback */
-	      --fmt;
-	      /* fallthrough */
-	    case GETPW:  /* we have a variable precision or width to acquire */
-	      args[numargs++].val_int = va_arg (*ap, int);
-	      break;
-	    case NUMBER: /* we have a number to process */
-	      number = (ch - '0');
-	      while ((ch = *fmt) != '\0' && is_digit (ch))
-		{
-		  number = number * 10 + (ch - '0');
-		  ++fmt;
-		}
-	      break;
-	    case SKIPNUM: /* we have a number to skip */
-	      while ((ch = *fmt) != '\0' && is_digit (ch))
-		++fmt;
-	      break;
-	    case NOOP:
-	    default:
-	      break; /* do nothing */
-	    }
-	}
-    }
-
-  /* process all arguments up to at least the one we are looking for and if we
-     have seen the end of the string, then process up to the max argument needed */
-  if (*fmt == '\0')
-    last_arg = max_pos_arg;
-  else
-    last_arg = n;
-
-  while (numargs <= last_arg)
-    {
-      switch (arg_type[numargs])
-	{
-	case LONG_INT:
-	  args[numargs++].val_long = va_arg (*ap, long);
-	  break;
-	case QUAD_INT:
-	  args[numargs++].val_quad_t = va_arg (*ap, quad_t);
-	  break;
-	case CHAR_PTR:
-	  args[numargs++].val_char_ptr_t = va_arg (*ap, char *);
-	  break;
-	case DOUBLE:
-	  args[numargs++].val_double = va_arg (*ap, double);
-	  break;
-	case LONG_DOUBLE:
-	  args[numargs++].val__LONG_DOUBLE = va_arg (*ap, _LONG_DOUBLE);
-	  break;
-	case WIDE_CHAR:
-	  args[numargs++].val_wint_t = va_arg (*ap, wint_t);
-	  break;
-	case INT:
-	case SHORT_INT:
-	case CHAR:
-	default:
-	  args[numargs++].val_int = va_arg (*ap, int);
-	  break;
-	}
-    }
-
-  /* alter the global numargs value and keep a reference to the last bit of the fmt
-     string we processed here because the caller will continue processing where we started */
-  *numargs_p = numargs;
-  *last_fmt = fmt;
-  return &args[n];
-}
-#endif /* !_NO_POS_ARGS */
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 4788938..8f49141 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -1,20 +1,3 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
 /*
 FUNCTION
 <<vscanf>>, <<vfscanf>>, <<vsscanf>>---format argument list
@@ -33,12 +16,12 @@ ANSI_SYNOPSIS
 	int vfscanf(FILE *<[fp]>, const char *<[fmt]>, va_list <[list]>);
 	int vsscanf(const char *<[str]>, const char *<[fmt]>, va_list <[list]>);
 
-	int _vscanf_r(struct _reent *<[reent]>, const char *<[fmt]>, 
+	int _vscanf_r(void *<[reent]>, const char *<[fmt]>, 
                        va_list <[list]>);
-	int _vfscanf_r(struct _reent *<[reent]>, FILE *<[fp]>, const char *<[fmt]>, 
+	int _vfscanf_r(void *<[reent]>, FILE *<[fp]>, const char *<[fmt]>, 
+                       va_list <[list]>);
+	int _vsscanf_r(void *<[reent]>, const char *<[str]>, const char *<[fmt]>, 
                        va_list <[list]>);
-	int _vsscanf_r(struct _reent *<[reent]>, const char *<[str]>,
-                       const char *<[fmt]>, va_list <[list]>);
 
 TRAD_SYNOPSIS
 	#include <stdio.h>
@@ -58,18 +41,18 @@ TRAD_SYNOPSIS
 	va_list <[list]>;
 
 	int _vscanf_r( <[reent]>, <[fmt]>, <[ist]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[fmt]>;
 	va_list <[list]>;
 
 	int _vfscanf_r( <[reent]>, <[fp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	FILE *<[fp]>;
 	char *<[fmt]>;
 	va_list <[list]>;
 	
 	int _vsscanf_r( <[reent]>, <[str]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
+	char *<[reent]>;
 	char *<[str]>;
 	char *<[fmt]>;
 	va_list <[list]>;
@@ -102,16 +85,28 @@ These are GNU extensions.
 Supporting OS subroutines required:
 */
 
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
 #include <_ansi.h>
-#include <reent.h>
-#include <newlib.h>
 #include <ctype.h>
-#include <wctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
-#include <wchar.h>
-#include <string.h>
 #ifdef _HAVE_STDC
 #include <stdarg.h>
 #else
@@ -119,42 +114,29 @@ Supporting OS subroutines required:
 #endif
 #include "local.h"
 
-#ifdef INTEGER_ONLY
-#define VFSCANF vfiscanf
-#define _VFSCANF_R _vfiscanf_r
-#define __SVFSCANF __svfiscanf
-#define __SVFSCANF_R __svfiscanf_r
-#else
-#define VFSCANF vfscanf
-#define _VFSCANF_R _vfscanf_r
-#define __SVFSCANF __svfscanf
-#define __SVFSCANF_R __svfscanf_r
-#ifndef NO_FLOATING_POINT
+#ifndef	NO_FLOATING_POINT
 #define FLOATING_POINT
 #endif
-#endif
 
 #ifdef FLOATING_POINT
-#include <math.h>
 #include <float.h>
 
 /* Currently a test is made to see if long double processing is warranted.
    This could be changed in the future should the _ldtoa_r code be
    preferred over _dtoa_r.  */
 #define _NO_LONGDBL
-#if defined _WANT_IO_LONG_DOUBLE && (LDBL_MANT_DIG > DBL_MANT_DIG)
+#if defined WANT_IO_LONG_DBL && (LDBL_MANT_DIG > DBL_MANT_DIG)
 #undef _NO_LONGDBL
 extern _LONG_DOUBLE _strtold _PARAMS((char *s, char **sptr));
 #endif
 
-#include "floatio.h"
-
-#if ((MAXEXP+MAXFRACT+3) > MB_LEN_MAX)
-#  define BUF (MAXEXP+MAXFRACT+3)        /* 3 = sign + decimal point + NUL */
-#else
-#  define BUF MB_LEN_MAX
+#define _NO_LONGLONG
+#if defined WANT_PRINTF_LONG_LONG && defined __GNUC__
+# undef _NO_LONGLONG
 #endif
 
+#include "floatio.h"
+#define	BUF	(MAXEXP+MAXFRACT+3)	/* 3 = sign + decimal point + NUL */
 /* An upper bound for how long a long prints in decimal.  4 / 13 approximates
    log (2).  Add one char for roundoff compensation and one for the sign.  */
 #define MAX_LONG_LEN ((CHAR_BIT * sizeof (long)  - 1) * 4 / 13 + 2)
@@ -162,22 +144,16 @@ extern _LONG_DOUBLE _strtold _PARAMS((char *s, char **sptr));
 #define	BUF	40
 #endif
 
-#define _NO_LONGLONG
-#if defined _WANT_IO_LONG_LONG && defined __GNUC__
-# undef _NO_LONGLONG
-#endif
-
 /*
  * Flags used during conversion.
  */
 
 #define	LONG		0x01	/* l: long or double */
-#define	LONGDBL		0x02	/* L/ll: long double or long long */
+#define	LONGDBL		0x02	/* L: long double or long long */
 #define	SHORT		0x04	/* h: short */
-#define CHAR		0x08	/* hh: 8 bit integer */
-#define	SUPPRESS	0x10	/* suppress assignment */
-#define	POINTER		0x20	/* weird %p pointer (`fake hex') */
-#define	NOSKIP		0x40	/* do not skip blanks */
+#define	SUPPRESS	0x08	/* suppress assignment */
+#define	POINTER		0x10	/* weird %p pointer (`fake hex') */
+#define	NOSKIP		0x20	/* do not skip blanks */
 
 /*
  * The following are used in numeric conversions only:
@@ -185,15 +161,14 @@ extern _LONG_DOUBLE _strtold _PARAMS((char *s, char **sptr));
  * SIGNOK, NDIGITS, PFXOK, and NZDIGITS are for integral.
  */
 
-#define	SIGNOK		0x80	/* +/- is (still) legal */
-#define	NDIGITS		0x100	/* no digits detected */
+#define	SIGNOK		0x40	/* +/- is (still) legal */
+#define	NDIGITS		0x80	/* no digits detected */
 
-#define	DPTOK		0x200	/* (float) decimal point is still legal */
-#define	EXPOK		0x400	/* (float) exponent (e+3, etc) still legal */
+#define	DPTOK		0x100	/* (float) decimal point is still legal */
+#define	EXPOK		0x200	/* (float) exponent (e+3, etc) still legal */
 
-#define	PFXOK		0x200	/* 0x prefix is (still) legal */
-#define	NZDIGITS	0x400	/* no zero digits detected */
-#define	NNZDIGITS	0x800	/* no non-zero digits detected */
+#define	PFXOK		0x100	/* 0x prefix is (still) legal */
+#define	NZDIGITS	0x200	/* no zero digits detected */
 
 /*
  * Conversion types.
@@ -226,44 +201,43 @@ typedef unsigned long long u_long_long;
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(VFSCANF, (fp, fmt, ap), 
-       register FILE *fp _AND 
-       _CONST char *fmt _AND 
-       va_list ap)
+_DEFUN (vfscanf, (fp, fmt, ap), 
+    register FILE *fp _AND 
+    _CONST char *fmt _AND 
+    va_list ap)
 {
-  CHECK_INIT(_REENT);
-  return __SVFSCANF_R (_REENT, fp, fmt, ap);
+  CHECK_INIT(fp);
+  return __svfscanf_r (fp->_data, fp, fmt, ap);
 }
 
 int
-_DEFUN(__SVFSCANF, (fp, fmt0, ap),
-       register FILE *fp _AND
-       char _CONST *fmt0 _AND
-       va_list ap)
+__svfscanf (fp, fmt0, ap)
+     register FILE *fp;
+     char _CONST *fmt0;
+     va_list ap;
 {
-  return __SVFSCANF_R (_REENT, fp, fmt0, ap);
+  return __svfscanf_r (_REENT, fp, fmt0, ap);
 }
 
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
-       struct _reent *data _AND 
-       register FILE *fp   _AND 
-       _CONST char *fmt    _AND 
-       va_list ap)
+_DEFUN (_vfscanf_r, (data, fp, fmt, ap),
+    struct _reent *data _AND 
+    register FILE *fp _AND 
+    _CONST char *fmt _AND 
+    va_list ap)
 {
-  CHECK_INIT(data);
-  return __SVFSCANF_R (data, fp, fmt, ap);
+  return __svfscanf_r (data, fp, fmt, ap);
 }
 
 
 int
-_DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
-       struct _reent *rptr _AND
-       register FILE *fp   _AND
-       char _CONST *fmt0   _AND
-       va_list ap)
+__svfscanf_r (rptr, fp, fmt0, ap)
+     struct _reent *rptr;
+     register FILE *fp;
+     char _CONST *fmt0;
+     va_list ap;
 {
   register u_char *fmt = (u_char *) fmt0;
   register int c;		/* character from format, or conversion */
@@ -277,16 +251,15 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
   int base = 0;			/* base argument to strtol/strtoul */
   int nbytes = 1;               /* number of bytes read from fmt string */
   wchar_t wc;                   /* wchar to use to read format string */
-  wchar_t *wcp;                 /* handy wide character pointer */
-  size_t mbslen;                /* length of converted multibyte sequence */
-  mbstate_t state;              /* value to keep track of multibyte state */
 
   u_long (*ccfn) () = 0;	/* conversion function (strtol/strtoul) */
   char ccltab[256];		/* character class table for %[...] */
   char buf[BUF];		/* buffer for numeric conversions */
   char *lptr;                   /* literal pointer */
+#ifdef MB_CAPABLE
+  int state = 0;                /* value to keep track of multibyte state */
+#endif
 
-  char *cp;
   short *sp;
   int *ip;
   float *flp;
@@ -295,32 +268,33 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
   long *lp;
 #ifndef _NO_LONGLONG
   long long *llp;
+#else
+	u_long _uquad;
 #endif
 
   /* `basefix' is used to avoid `if' tests in the integer scanner */
   static _CONST short basefix[17] =
     {10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
 
-  _flockfile (fp);
- 
   nassigned = 0;
   nread = 0;
   for (;;)
     {
-#ifndef _MB_CAPABLE
+#ifndef MB_CAPABLE
       wc = *fmt;
 #else
-      memset (&state, '\0', sizeof (state));
       nbytes = _mbtowc_r (rptr, &wc, fmt, MB_CUR_MAX, &state);
 #endif
       fmt += nbytes;
       if (wc == 0)
-	goto all_done;
+	return nassigned;
       if (nbytes == 1 && isspace (wc))
 	{
 	  for (;;)
 	    {
-	      if (BufferEmpty || !isspace (*fp->_p))
+	      if (BufferEmpty)
+		return nassigned;
+	      if (!isspace (*fp->_p))
 		break;
 	      nread++, fp->_r--, fp->_p++;
 	    }
@@ -360,25 +334,13 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	  flags |= SUPPRESS;
 	  goto again;
 	case 'l':
-	  if (*fmt == 'l')	/* Check for 'll' = long long (SUSv3) */
-	    {
-	      ++fmt;
-	      flags |= LONGDBL;
-	    }
-	  else
-	    flags |= LONG;
+	  flags |= LONG;
 	  goto again;
 	case 'L':
 	  flags |= LONGDBL;
 	  goto again;
 	case 'h':
-	  if (*fmt == 'h')	/* Check for 'hh' = char int (SUSv3) */
-	    {
-	      ++fmt;
-	      flags |= CHAR;
-	    }
-	  else
-	    flags |= SHORT;
+	  flags |= SHORT;
 	  goto again;
 
 	case '0':
@@ -451,9 +413,6 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	  c = CT_FLOAT;
 	  break;
 #endif
-        case 'S':
-          flags |= LONG;
-          /* FALLTHROUGH */
 
 	case 's':
 	  c = CT_STRING;
@@ -465,10 +424,6 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	  c = CT_CCL;
 	  break;
 
-        case 'C':
-          flags |= LONG;
-          /* FALLTHROUGH */
-
 	case 'c':
 	  flags |= NOSKIP;
 	  c = CT_CHAR;
@@ -484,12 +439,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	case 'n':
 	  if (flags & SUPPRESS)	/* ??? */
 	    continue;
-	  if (flags & CHAR)
-	    {
-	      cp = va_arg (ap, char *);
-	      *cp = nread;
-	    }
-	  else if (flags & SHORT)
+	  if (flags & SHORT)
 	    {
 	      sp = va_arg (ap, short *);
 	      *sp = nread;
@@ -517,7 +467,6 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	   * Disgusting backwards compatibility hacks.	XXX
 	   */
 	case '\0':		/* compat */
-	  _funlockfile (fp);
 	  return EOF;
 
 	default:		/* compat */
@@ -547,7 +496,9 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	      if (--fp->_r > 0)
 		fp->_p++;
 	      else
+#ifndef CYGNUS_NEC
 	      if (__srefill (fp))
+#endif
 		goto input_failure;
 	    }
 	  /*
@@ -567,47 +518,10 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	  /* scan arbitrary characters (sets NOSKIP) */
 	  if (width == 0)
 	    width = 1;
-          if (flags & LONG) 
-            {
-              if ((flags & SUPPRESS) == 0)
-                wcp = va_arg (ap, wchar_t *);
-              else
-                wcp = NULL;
-              n = 0;
-              while (width != 0) 
-                {
-                  if (n == MB_CUR_MAX)
-                    goto input_failure;
-                  buf[n++] = *fp->_p;
-                  fp->_r -= 1;
-                  fp->_p += 1;
-                  memset ((_PTR)&state, '\0', sizeof (mbstate_t));
-                  if ((mbslen = _mbrtowc_r (rptr, wcp, buf, n, &state)) 
-                                                         == (size_t)-1)
-                    goto input_failure; /* Invalid sequence */
-                  if (mbslen == 0 && !(flags & SUPPRESS))
-                    *wcp = L'\0';
-                  if (mbslen != (size_t)-2) /* Incomplete sequence */
-                    {
-                      nread += n;
-                      width -= 1;
-                      if (!(flags & SUPPRESS))
-                        wcp += 1;
-                      n = 0;
-                    }
-                  if (BufferEmpty) 
-	            {
-                      if (n != 0) 
-                        goto input_failure;
-                      break;
-                    }
-                }
-              if (!(flags & SUPPRESS))
-                nassigned++;
-            } 
-          else if (flags & SUPPRESS) 
+	  if (flags & SUPPRESS)
 	    {
 	      size_t sum = 0;
+
 	      for (;;)
 		{
 		  if ((n = fp->_r) < (int)width)
@@ -615,12 +529,16 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		      sum += n;
 		      width -= n;
 		      fp->_p += n;
+#ifndef CYGNUS_NEC
 		      if (__srefill (fp))
 			{
+#endif
 			  if (sum == 0)
 			    goto input_failure;
 			  break;
+#ifndef CYGNUS_NEC
 			}
+#endif
 		    }
 		  else
 		    {
@@ -634,11 +552,27 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	    }
 	  else
 	    {
+#ifdef CYGNUS_NEC
+	      /* Kludge city for the moment */
+	      char *dest = va_arg (ap, char *);
+	      int n = width;
+	      if (fp->_r == 0)
+		goto input_failure;
+
+	      while (n && fp->_r)
+		{
+		  *dest++ = *(fp->_p++);
+		  n--;
+		  fp->_r--;
+		  nread++;
+		}
+#else
 	      size_t r = fread ((_PTR) va_arg (ap, char *), 1, width, fp);
 
 	      if (r == 0)
 		goto input_failure;
 	      nread += r;
+#endif
 	      nassigned++;
 	    }
 	  break;
@@ -694,56 +628,8 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	case CT_STRING:
 	  /* like CCL, but zero-length string OK, & no NOSKIP */
 	  if (width == 0)
-            width = (size_t)~0;
-          if (flags & LONG) 
-            {
-              /* Process %S and %ls placeholders */
-              if ((flags & SUPPRESS) == 0)
-                wcp = va_arg (ap, wchar_t *);
-              else
-                wcp = &wc;
-              n = 0;
-              while (!isspace (*fp->_p) && width != 0) 
-                {
-                  if (n == MB_CUR_MAX)
-                    goto input_failure;
-                  buf[n++] = *fp->_p;
-                  fp->_r -= 1;
-                  fp->_p += 1;
-                  memset ((_PTR)&state, '\0', sizeof (mbstate_t));
-                  if ((mbslen = _mbrtowc_r (rptr, wcp, buf, n, &state)) 
-                                                        == (size_t)-1)
-                    goto input_failure;
-                  if (mbslen == 0)
-                    *wcp = L'\0';
-                  if (mbslen != (size_t)-2) /* Incomplete sequence */
-                    {
-                      if (iswspace(*wcp)) 
-                        {
-                          while (n != 0)
-                            ungetc (buf[--n], fp);
-                          break;
-                        }
-                      nread += n;
-                      width -= 1;
-                      if ((flags & SUPPRESS) == 0)
-                        wcp += 1;
-                      n = 0;
-                    }
-                  if (BufferEmpty) 
-                    {
-                      if (n != 0)
-                        goto input_failure;
-                      break;
-                    }
-                }
-              if (!(flags & SUPPRESS)) 
-                {
-                  *wcp = L'\0';
-                  nassigned++;
-                }
-            }
-          else if (flags & SUPPRESS) 
+	    width = ~0;
+	  if (flags & SUPPRESS)
 	    {
 	      n = 0;
 	      while (!isspace (*fp->_p))
@@ -775,21 +661,17 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	  continue;
 
 	case CT_INT:
-	{
 	  /* scan an integer as if by strtol/strtoul */
-	  unsigned width_left = 0;
-	  int skips = 0;
 #ifdef hardway
 	  if (width == 0 || width > sizeof (buf) - 1)
+	    width = sizeof (buf) - 1;
 #else
 	  /* size_t is unsigned, hence this optimisation */
-	  if (width - 1 > sizeof (buf) - 2)
+	  if (--width > sizeof (buf) - 2)
+	    width = sizeof (buf) - 2;
+	  width++;
 #endif
-	    {
-	      width_left = width - (sizeof (buf) - 1);
-	      width = sizeof (buf) - 1;
-	    }
-	  flags |= SIGNOK | NDIGITS | NZDIGITS | NNZDIGITS;
+	  flags |= SIGNOK | NDIGITS | NZDIGITS;
 	  for (p = buf; width; width--)
 	    {
 	      c = *fp->_p;
@@ -809,26 +691,16 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		   * will turn it off if we have scanned any nonzero digits).
 		   */
 		case '0':
-		  if (! (flags & NNZDIGITS))
-		    goto ok;
 		  if (base == 0)
 		    {
 		      base = 8;
 		      flags |= PFXOK;
 		    }
 		  if (flags & NZDIGITS)
-		    {
-		      flags &= ~(SIGNOK | NZDIGITS | NDIGITS);
-		      goto ok;
-		    }
-		  flags &= ~(SIGNOK | PFXOK | NDIGITS);
-		  if (width_left)
-		    {
-		      width_left--;
-		      width++;
-		    }
-		  ++skips;
-		  goto skip;
+		    flags &= ~(SIGNOK | NZDIGITS | NDIGITS);
+		  else
+		    flags &= ~(SIGNOK | PFXOK | NDIGITS);
+		  goto ok;
 
 		  /* 1 through 7 always legal */
 		case '1':
@@ -839,7 +711,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		case '6':
 		case '7':
 		  base = basefix[base];
-		  flags &= ~(SIGNOK | PFXOK | NDIGITS | NNZDIGITS);
+		  flags &= ~(SIGNOK | PFXOK | NDIGITS);
 		  goto ok;
 
 		  /* digits 8 and 9 ok iff decimal or hex */
@@ -848,7 +720,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		  base = basefix[base];
 		  if (base <= 8)
 		    break;	/* not legal here */
-		  flags &= ~(SIGNOK | PFXOK | NDIGITS | NNZDIGITS);
+		  flags &= ~(SIGNOK | PFXOK | NDIGITS);
 		  goto ok;
 
 		  /* letters ok iff hex */
@@ -867,7 +739,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		  /* no need to fix base here */
 		  if (base <= 10)
 		    break;	/* not legal here */
-		  flags &= ~(SIGNOK | PFXOK | NDIGITS | NNZDIGITS);
+		  flags &= ~(SIGNOK | PFXOK | NDIGITS);
 		  goto ok;
 
 		  /* sign ok only as first character */
@@ -887,10 +759,6 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		    {
 		      base = 16;/* if %i */
 		      flags &= ~PFXOK;
-		      /* We must reset the NZDIGITS and NDIGITS
-		         flags that would have been unset by seeing
-			 the zero that preceded the X or x.  */
-		      flags |= NZDIGITS | NDIGITS;
 		      goto ok;
 		    }
 		  break;
@@ -906,11 +774,12 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	       * c is legal: store it and look at the next.
 	       */
 	      *p++ = c;
-	    skip:
 	      if (--fp->_r > 0)
 		fp->_p++;
 	      else
+#ifndef CYGNUS_NEC
 	      if (__srefill (fp))
+#endif
 		break;		/* EOF */
 	    }
 	  /*
@@ -938,11 +807,6 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	      res = (*ccfn) (rptr, buf, (char **) NULL, base);
 	      if (flags & POINTER)
 		*(va_arg (ap, _PTR *)) = (_PTR) (unsigned _POINTER_INT) res;
-	      else if (flags & CHAR)
-		{
-		  cp = va_arg (ap, char *);
-		  *cp = res;
-		}
 	      else if (flags & SHORT)
 		{
 		  sp = va_arg (ap, short *);
@@ -972,9 +836,9 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		}
 	      nassigned++;
 	    }
-	  nread += p - buf + skips;
+	  nread += p - buf;
 	  break;
-	}
+
 #ifdef FLOATING_POINT
 	case CT_FLOAT:
 	{
@@ -986,18 +850,15 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	  long leading_zeroes = 0;
 	  long zeroes, exp_adjust;
 	  char *exp_start = NULL;
-	  unsigned width_left = 0;
-	  int nancount = 0;
 #ifdef hardway
 	  if (width == 0 || width > sizeof (buf) - 1)
+	    width = sizeof (buf) - 1;
 #else
 	  /* size_t is unsigned, hence this optimisation */
-	  if (width - 1 > sizeof (buf) - 2)
+	  if (--width > sizeof (buf) - 2)
+	    width = sizeof (buf) - 2;
+	  width++;
 #endif
-	    {
-	      width_left = width - (sizeof (buf) - 1);
-	      width = sizeof (buf) - 1;
-	    }
 	  flags |= SIGNOK | NDIGITS | DPTOK | EXPOK;
 	  zeroes = 0;
 	  exp_adjust = 0;
@@ -1010,16 +871,12 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	       */
 	      switch (c)
 		{
+
 		case '0':
 		  if (flags & NDIGITS)
 		    {
 		      flags &= ~SIGNOK;
 		      zeroes++;
-		      if (width_left)
-			{
-			  width_left--;
-			  width++;
-			}
 		      goto fskip;
 		    }
 		  /* Fall through.  */
@@ -1032,12 +889,8 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		case '7':
 		case '8':
 		case '9':
-		  if (nancount == 0)
-		    {
-		      flags &= ~(SIGNOK | NDIGITS);
-		      goto fok;
-		    }
-		  break;
+		  flags &= ~(SIGNOK | NDIGITS);
+		  goto fok;
 
 		case '+':
 		case '-':
@@ -1047,30 +900,6 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		      goto fok;
 		    }
 		  break;
-		case 'n':
-		case 'N':
-	          if (nancount == 0
-		      && (flags & (SIGNOK | NDIGITS | DPTOK | EXPOK)) ==
-		      	          (SIGNOK | NDIGITS | DPTOK | EXPOK))
-		    {
-		      flags &= ~(SIGNOK | DPTOK | EXPOK | NDIGITS);
-		      nancount = 1;
-		      goto fok;
-		    }
-		  else if (nancount == 2)
-		    {
-		      nancount = 3;
-		      goto fok;
-		    }
-		  break;
-		case 'a':
-		case 'A':
-		  if (nancount == 1)
-		    {
-		      nancount = 2;
-		      goto fok;
-		    }
-		  break;
 		case '.':
 		  if (flags & DPTOK)
 		    {
@@ -1101,35 +930,20 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	      break;
 	    fok:
 	      *p++ = c;
-	    fskip:
 	      width--;
+	    fskip:
               ++nread;
 	      if (--fp->_r > 0)
 		fp->_p++;
 	      else
+#ifndef CYGNUS_NEC
 	      if (__srefill (fp))
+#endif
 		break;		/* EOF */
 	    }
 	  if (zeroes)
 	    flags &= ~NDIGITS;
-          /* We may have a 'N' or possibly even a 'Na' as the start of 'NaN', 
-	     only to run out of chars before it was complete (or having 
-	     encountered a non- matching char).  So check here if we have an 
-	     outstanding nancount, and if so put back the chars we did 
-	     swallow and treat as a failed match. */
-          if (nancount && nancount != 3)
-            {
-              /* Ok... what are we supposed to do in the event that the
-              __srefill call above was triggered in the middle of the partial
-              'NaN' and so we can't put it all back? */
-              while (nancount-- && (p > buf))
-                {
-                  ungetc (*(u_char *)--p, fp);
-                  --nread;
-                }
-              goto match_failure;
-            }
-          /*
+	  /*
 	   * If no digits, might be missing exponent digits
 	   * (just give back the exponent) or might be missing
 	   * regular digits, but had sign and/or decimal point.
@@ -1141,7 +955,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		  /* no digits at all */
 		  while (p > buf)
                     {
-		      ungetc (*(u_char *)--p, fp);
+		      ungetc (*(u_char *)-- p, fp);
                       --nread;
                     }
 		  goto match_failure;
@@ -1159,12 +973,10 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	    }
 	  if ((flags & SUPPRESS) == 0)
 	    {
-	      double res = 0;
 #ifdef _NO_LONGDBL
-#define QUAD_RES res;
+	      double res;
 #else  /* !_NO_LONG_DBL */
-	      long double qres = 0;
-#define QUAD_RES qres;
+	      long double res;
 #endif /* !_NO_LONG_DBL */
 	      long new_exp = 0;
 
@@ -1186,17 +998,11 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 		    exp_start = buf + sizeof (buf) - MAX_LONG_LEN - 1;
                  sprintf (exp_start, "e%ld", new_exp);
 		}
-
-	      /* Current _strtold routine is markedly slower than 
-	         _strtod_r.  Only use it if we have a long double
-	         result.  */
-#ifndef _NO_LONGDBL /* !_NO_LONGDBL */
-	      if (flags & LONGDBL)
-	      	qres = _strtold (buf, NULL);
-	      else
-#endif
-	        res = _strtod_r (rptr, buf, NULL);
-
+#ifdef _NO_LONGDBL
+	      res = _strtod_r (rptr, buf, NULL);
+#else  /* !_NO_LONGDBL */
+	      res = _strtold (buf, NULL);
+#endif /* !_NO_LONGDBL */
 	      if (flags & LONG)
 		{
 		  dp = va_arg (ap, double *);
@@ -1205,15 +1011,12 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	      else if (flags & LONGDBL)
 		{
 		  ldp = va_arg (ap, _LONG_DOUBLE *);
-		  *ldp = QUAD_RES;
+		  *ldp = res;
 		}
 	      else
 		{
 		  flp = va_arg (ap, float *);
-		  if (isnan (res))
-		    *flp = nanf (NULL);
-		  else
-		    *flp = res;
+		  *flp = res;
 		}
 	      nassigned++;
 	    }
@@ -1223,10 +1026,111 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
 	}
     }
 input_failure:
-  _funlockfile (fp);
   return nassigned ? nassigned : -1;
 match_failure:
-all_done:
-  _funlockfile (fp);
   return nassigned;
 }
+
+/*
+ * Fill in the given table from the scanset at the given format
+ * (just after `[').  Return a pointer to the character past the
+ * closing `]'.  The table has a 1 wherever characters should be
+ * considered part of the scanset.
+ */
+
+/*static*/
+u_char *
+__sccl (tab, fmt)
+     register char *tab;
+     register u_char *fmt;
+{
+  register int c, n, v;
+
+  /* first `clear' the whole table */
+  c = *fmt++;			/* first char hat => negated scanset */
+  if (c == '^')
+    {
+      v = 1;			/* default => accept */
+      c = *fmt++;		/* get new first char */
+    }
+  else
+    v = 0;			/* default => reject */
+  /* should probably use memset here */
+  for (n = 0; n < 256; n++)
+    tab[n] = v;
+  if (c == 0)
+    return fmt - 1;		/* format ended before closing ] */
+
+  /*
+   * Now set the entries corresponding to the actual scanset to the
+   * opposite of the above.
+   *
+   * The first character may be ']' (or '-') without being special; the
+   * last character may be '-'.
+   */
+
+  v = 1 - v;
+  for (;;)
+    {
+      tab[c] = v;		/* take character c */
+    doswitch:
+      n = *fmt++;		/* and examine the next */
+      switch (n)
+	{
+
+	case 0:		/* format ended too soon */
+	  return fmt - 1;
+
+	case '-':
+	  /*
+	   * A scanset of the form [01+-] is defined as `the digit 0, the
+	   * digit 1, the character +, the character -', but the effect of a
+	   * scanset such as [a-zA-Z0-9] is implementation defined.  The V7
+	   * Unix scanf treats `a-z' as `the letters a through z', but treats
+	   * `a-a' as `the letter a, the character -, and the letter a'.
+	   *
+	   * For compatibility, the `-' is not considerd to define a range if
+	   * the character following it is either a close bracket (required by
+	   * ANSI) or is not numerically greater than the character we just
+	   * stored in the table (c).
+	   */
+	  n = *fmt;
+	  if (n == ']' || n < c)
+	    {
+	      c = '-';
+	      break;		/* resume the for(;;) */
+	    }
+	  fmt++;
+	  do
+	    {			/* fill in the range */
+	      tab[++c] = v;
+	    }
+	  while (c < n);
+#if 1			/* XXX another disgusting compatibility hack */
+	  /*
+	   * Alas, the V7 Unix scanf also treats formats such
+	   * as [a-c-e] as `the letters a through e'. This too
+	   * is permitted by the standard....
+	   */
+	  goto doswitch;
+#else
+	  c = *fmt++;
+	  if (c == 0)
+	    return fmt - 1;
+	  if (c == ']')
+	    return fmt;
+#endif
+
+	  break;
+
+
+	case ']':		/* end of scanset */
+	  return fmt;
+
+	default:		/* just another character */
+	  c = n;
+	  break;
+	}
+    }
+  /* NOTREACHED */
+}
diff --git a/newlib/libc/stdio/viprintf.c b/newlib/libc/stdio/viprintf.c
deleted file mode 100644
index cea96d3..0000000
--- a/newlib/libc/stdio/viprintf.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<viprintf>>, <<vfiprintf>>, <<vsiprintf>>---format argument list
-
-INDEX
-	viprintf
-INDEX
-	vfiprintf
-INDEX
-	vsiprintf
-INDEX
-	vsniprintf
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	#include <stdarg.h>
-	int viprintf(const char *<[fmt]>, va_list <[list]>);
-	int vfiprintf(FILE *<[fp]>, const char *<[fmt]>, va_list <[list]>);
-	int vsiprintf(char *<[str]>, const char *<[fmt]>, va_list <[list]>);
-	int vasiprintf(char **<[strp]>, const char *<[fmt]>, va_list <[list]>);
-	int vsniprintf(char *<[str]>, size_t <[size]>, const char *<[fmt]>,
-                       va_list <[list]>);
-
-	int _viprintf_r(struct _reent *<[reent]>, const char *<[fmt]>,
-                        va_list <[list]>);
-	int _vfiprintf_r(struct _reent *<[reent]>, FILE *<[fp]>,
-                        const char *<[fmt]>, va_list <[list]>);
-	int _vasiprintf_r(struct _reent *<[reent]>, char **<[str]>,
-                        const char *<[fmt]>, va_list <[list]>);
-	int _vsiprintf_r(struct _reent *<[reent]>, char *<[str]>,
-                        const char *<[fmt]>, va_list <[list]>);
-	int _vsniprintf_r(struct _reent *<[reent]>, char *<[str]>, size_t <[size]>,
-                        const char *<[fmt]>, va_list <[list]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	#include <varargs.h>
-	int viprintf( <[fmt]>, <[list]>)
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vfiprintf(<[fp]>, <[fmt]>, <[list]>)
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vasiprintf(<[strp]>, <[fmt]>, <[list]>)
-	char **<[strp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vsiprintf(<[str]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vsniprintf(<[str]>, <[size]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-        size_t <[size]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _viprintf_r(<[reent]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vfiprintf_r(<[reent]>, <[fp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vasiprintf_r(<[reent]>, <[strp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char **<[strp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vsiprintf_r(<[reent]>, <[str]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vsniprintf_r(<[reent]>, <[str]>, <[size]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[str]>;
-        size_t <[size]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-DESCRIPTION
-<<viprintf>>, <<vfiprintf>>, <<vasiprintf>>, <<vsiprintf>> and 
-<<vsniprintf>> are (respectively) variants of <<iprintf>>, <<fiprintf>>, 
-<<asiprintf>>, <<siprintf>>, and <<sniprintf>>.  They differ only in 
-restricting the caller to use non-floating-point format specifiers.
-
-RETURNS
-The return values are consistent with the corresponding functions:
-<<vasiprintf>>/<<vsiprintf>> returns the number of bytes in the output string,
-save that the concluding <<NULL>> is not counted.
-<<viprintf>> and <<vfiprintf>> return the number of characters transmitted.
-If an error occurs, <<viprintf>> and <<vfiprintf>> return <<EOF>> and
-<<vasiprintf>> returns -1.  No error returns occur for <<vsiprintf>>.
-
-PORTABILITY
-<<viprintf>>, <<vfiprintf>>, <<vasiprintf>>, <<vsiprintf>> and <<vsniprintf>>
-are newlib extensions.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-*/
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include "local.h"
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN(viprintf, (fmt, ap),
-       _CONST char *fmt _AND
-       va_list ap)
-{
-  _REENT_SMALL_CHECK_INIT (_REENT);
-  return _vfiprintf_r (_REENT, _stdout_r (_REENT), fmt, ap);
-}
-
-#endif /* !_REENT_ONLY */
-
-int
-_DEFUN(_viprintf_r, (ptr, fmt, ap),
-       struct _reent *ptr _AND
-       _CONST char *fmt   _AND
-       va_list ap)
-{
-  _REENT_SMALL_CHECK_INIT (ptr);
-  return _vfiprintf_r (ptr, _stdout_r (ptr), fmt, ap);
-}
diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c
deleted file mode 100644
index f335f69..0000000
--- a/newlib/libc/stdio/viscanf.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * Code created by modifying iscanf.c which has following copyright.
- *
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<viscanf>>, <<vfiscanf>>, <<vsiscanf>>---format argument list
-
-INDEX
-	viscanf
-INDEX
-	vfiscanf
-INDEX
-	vsiscanf
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	#include <stdarg.h>
-	int viscanf(const char *<[fmt]>, va_list <[list]>);
-	int vfiscanf(FILE *<[fp]>, const char *<[fmt]>, va_list <[list]>);
-	int vsiscanf(const char *<[str]>, const char *<[fmt]>, va_list <[list]>);
-
-	int _viscanf_r(struct _reent *<[reent]>, const char *<[fmt]>, 
-                       va_list <[list]>);
-	int _vfiscanf_r(struct _reent *<[reent]>, FILE *<[fp]>, const char *<[fmt]>, 
-                       va_list <[list]>);
-	int _vsiscanf_r(struct _reent *<[reent]>, const char *<[str]>,
-                       const char *<[fmt]>, va_list <[list]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	#include <varargs.h>
-	int viscanf( <[fmt]>, <[ist]>)
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int vfiscanf( <[fp]>, <[fmt]>, <[list]>)
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-	
-	int vsiscanf( <[str]>, <[fmt]>, <[list]>)
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _viscanf_r( <[reent]>, <[fmt]>, <[ist]>)
-	struct _reent *<[reent]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-	int _vfiscanf_r( <[reent]>, <[fp]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	FILE *<[fp]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-	
-	int _vsiscanf_r( <[reent]>, <[str]>, <[fmt]>, <[list]>)
-	struct _reent *<[reent]>;
-	char *<[str]>;
-	char *<[fmt]>;
-	va_list <[list]>;
-
-DESCRIPTION
-<<viscanf>>, <<vfiscanf>>, and <<vsiscanf>> are (respectively) variants
-of <<iscanf>>, <<fiscanf>>, and <<siscanf>>.  They differ only in 
-allowing their caller to pass the variable argument list as a 
-<<va_list>> object (initialized by <<va_start>>) rather than 
-directly accepting a variable number of arguments.
-
-RETURNS
-The return values are consistent with the corresponding functions:
-<<viscanf>> returns the number of input fields successfully scanned,
-converted, and stored; the return value does not include scanned
-fields which were not stored.  
-
-If <<viscanf>> attempts to read at end-of-file, the return value 
-is <<EOF>>.
-
-If no fields were stored, the return value is <<0>>.
-
-The routines <<_viscanf_r>>, <<_vfiscanf_f>>, and <<_vsiscanf_r>> are
-reentrant versions which take an additional first parameter which points to the
-reentrancy structure.
-
-PORTABILITY
-These are newlib extensions.
-
-Supporting OS subroutines required:
-*/
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include "local.h"
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN(viscanf, (fmt, ap), 
-       _CONST char *fmt _AND 
-       va_list ap)
-{
-  _REENT_SMALL_CHECK_INIT (_REENT);
-  return __svfiscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
-}
-
-#endif /* !_REENT_ONLY */
-
-int
-_DEFUN(_viscanf_r, (ptr, fmt, ap),
-       struct _reent *ptr _AND 
-       _CONST char *fmt   _AND 
-       va_list ap)
-{
-  _REENT_SMALL_CHECK_INIT (ptr);
-  return __svfiscanf_r (ptr, _stdin_r (ptr), fmt, ap);
-}
-
diff --git a/newlib/libc/stdio/vprintf.c b/newlib/libc/stdio/vprintf.c
index 69edc87..f913bc0 100644
--- a/newlib/libc/stdio/vprintf.c
+++ b/newlib/libc/stdio/vprintf.c
@@ -1,3 +1,5 @@
+/* doc in vfprintf.c */
+
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,37 +16,29 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* doc in vfprintf.c */
 
 #include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
+
 #ifdef _HAVE_STDC
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
-#include "local.h"
-
-#ifndef _REENT_ONLY
 
 int
-_DEFUN(vprintf, (fmt, ap),
-       _CONST char *fmt _AND
-       va_list ap)
+_DEFUN (vprintf, (fmt, ap),
+     _CONST char *fmt _AND
+     va_list ap)
 {
-  _REENT_SMALL_CHECK_INIT (_REENT);
-  return _vfprintf_r (_REENT, _stdout_r (_REENT), fmt, ap);
+  return vfprintf (stdout, fmt, ap);
 }
 
-#endif /* !_REENT_ONLY */
-
 int
-_DEFUN(_vprintf_r, (ptr, fmt, ap),
-       struct _reent *ptr _AND
-       _CONST char *fmt   _AND
-       va_list ap)
+_DEFUN (_vprintf_r, (ptr, fmt, ap),
+     struct _reent *ptr _AND
+     _CONST char *fmt _AND
+     va_list ap)
 {
-  _REENT_SMALL_CHECK_INIT (ptr);
   return _vfprintf_r (ptr, _stdout_r (ptr), fmt, ap);
 }
diff --git a/newlib/libc/stdio/vscanf.c b/newlib/libc/stdio/vscanf.c
index e559b77..59c6373 100644
--- a/newlib/libc/stdio/vscanf.c
+++ b/newlib/libc/stdio/vscanf.c
@@ -18,35 +18,37 @@
  */
 
 #include <_ansi.h>
-#include <reent.h>
 #include <stdio.h>
+#include "local.h"
+
 #ifdef _HAVE_STDC
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
-#include "local.h"
+
+/*
+ * vscanf
+ */
 
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vscanf, (fmt, ap), 
-       _CONST char *fmt _AND 
-       va_list ap)
+_DEFUN (vscanf, (fmt, ap), 
+    _CONST char *fmt _AND 
+    va_list ap)
 {
-  _REENT_SMALL_CHECK_INIT (_REENT);
   return __svfscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
 }
 
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vscanf_r, (ptr, fmt, ap),
-       struct _reent *ptr _AND 
-       _CONST char *fmt   _AND 
-       va_list ap)
+_DEFUN (_vscanf_r, (ptr, fmt, ap),
+    struct _reent *ptr _AND 
+    _CONST char *fmt _AND 
+    va_list ap)
 {
-  _REENT_SMALL_CHECK_INIT (ptr);
   return __svfscanf_r (ptr, _stdin_r (ptr), fmt, ap);
 }
 
diff --git a/newlib/libc/stdio/vsiprintf.c b/newlib/libc/stdio/vsiprintf.c
deleted file mode 100644
index c9d2638..0000000
--- a/newlib/libc/stdio/vsiprintf.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-/* doc in vfiprintf.c */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "%W% (Berkeley) %G%";
-#endif /* LIBC_SCCS and not lint */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#include <limits.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#ifndef _REENT_ONLY 
-
-int
-_DEFUN(vsiprintf, (str, fmt, ap),
-       char *str        _AND
-       _CONST char *fmt _AND
-       va_list ap)
-{
-  int ret;
-  FILE f;
-
-  f._flags = __SWR | __SSTR;
-  f._bf._base = f._p = (unsigned char *) str;
-  f._bf._size = f._w = INT_MAX;
-  f._file = -1;  /* No file. */
-  ret = _vfiprintf_r (_REENT, &f, fmt, ap);
-  *f._p = 0;
-  return ret;
-}
-
-#endif /* !_REENT_ONLY */
-
-int
-_DEFUN(_vsiprintf_r, (ptr, str, fmt, ap),
-       struct _reent *ptr _AND
-       char *str          _AND
-       _CONST char *fmt   _AND
-       va_list ap)
-{
-  int ret;
-  FILE f;
-
-  f._flags = __SWR | __SSTR;
-  f._bf._base = f._p = (unsigned char *) str;
-  f._bf._size = f._w = INT_MAX;
-  f._file = -1;  /* No file. */
-  ret = _vfiprintf_r (ptr, &f, fmt, ap);
-  *f._p = 0;
-  return ret;
-}
-
diff --git a/newlib/libc/stdio/vsiscanf.c b/newlib/libc/stdio/vsiscanf.c
deleted file mode 100644
index c620184..0000000
--- a/newlib/libc/stdio/vsiscanf.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Code created by modifying iscanf.c which has following copyright.
- *
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-#include "local.h"
-
-static _READ_WRITE_RETURN_TYPE
-_DEFUN(eofread1, (cookie, buf, len),
-       _PTR cookie _AND
-       char *buf   _AND
-       int len)
-{
-  return 0;
-}
-
-/*
- * vsiscanf
- */
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN(vsiscanf, (str, fmt, ap), 
-       _CONST char *str _AND 
-       _CONST char *fmt _AND 
-       va_list ap)
-{
-  return _vsiscanf_r (_REENT, str, fmt, ap);
-}
-
-#endif /* !_REENT_ONLY */
-
-int
-_DEFUN(_vsiscanf_r, (ptr, str, fmt, ap),
-       struct _reent *ptr _AND 
-       _CONST char *str   _AND 
-       _CONST char *fmt   _AND 
-       va_list ap)
-{
-  FILE f;
-
-  f._flags = __SRD | __SSTR;
-  f._bf._base = f._p = (unsigned char *) str;
-  f._bf._size = f._r = strlen (str);
-  f._read = eofread1;
-  f._ub._base = NULL;
-  f._lb._base = NULL;
-  f._file = -1;  /* No file. */
-  return __svfiscanf_r (ptr, &f, fmt, ap);
-}
diff --git a/newlib/libc/stdio/vsniprintf.c b/newlib/libc/stdio/vsniprintf.c
deleted file mode 100644
index 6a5bd45..0000000
--- a/newlib/libc/stdio/vsniprintf.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<vsniprintf>>---write formatted output (integer only)
-
-INDEX
-	vsniprintf
-
-ANSI_SYNOPSIS
-        #include <stdio.h>
-
-        int vsniprintf(char *<[str]>, size_t <[size]>, const char *<[fmt]>, va_list <[list]>);
-
-TRAD_SYNOPSIS
-        #include <stdio.h>
-
-        int vsnprintf(<[str]>, <[size]>, <[fmt]>, <[list]>)
-        char *<[str]>;
-        size_t <[size]>;
-        char *<[fmt]>;
-        va_list <[list]>;
-
-DESCRIPTION
-<<vsniprintf>> is a restricted version of <<vsnprintf>>: it has the same
-arguments and behavior, save that it cannot perform any floating-point
-formatting: the <<f>>, <<g>>, <<G>>, <<e>>, and <<F>> type specifiers
-are not recognized.
-
-RETURNS
-        <<vsniprintf>> returns the number of bytes in the output string,
-        save that the concluding <<NULL>> is not counted.
-        <<vsniprintf>> returns when the end of the format string is
-        encountered.
-
-PORTABILITY
-<<vsniprintf>> is not required by ANSI C.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
-*/
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "%W% (Berkeley) %G%";
-#endif /* LIBC_SCCS and not lint */
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#include <limits.h>
-#ifdef _HAVE_STDC
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN(vsniprintf, (str, size, fmt, ap),
-       char *str        _AND
-       size_t size      _AND
-       _CONST char *fmt _AND
-       va_list ap)
-{
-  int ret;
-  FILE f;
-
-  f._flags = __SWR | __SSTR;
-  f._bf._base = f._p = (unsigned char *) str;
-  f._bf._size = f._w = (size > 0 ? size - 1 : 0);
-  f._file = -1;  /* No file. */
-  ret = _vfiprintf_r (_REENT, &f, fmt, ap);
-  if (size > 0)
-    *f._p = 0;
-  return ret;
-}
-
-#endif /* !_REENT_ONLY */
-
-int
-_DEFUN(_vsniprintf_r, (ptr, str, size, fmt, ap),
-       struct _reent *ptr _AND
-       char *str          _AND
-       size_t size        _AND
-       _CONST char *fmt   _AND
-       va_list ap)
-{
-  int ret;
-  FILE f;
-
-  f._flags = __SWR | __SSTR;
-  f._bf._base = f._p = (unsigned char *) str;
-  f._bf._size = f._w = (size > 0 ? size - 1 : 0);
-  f._file = -1;  /* No file. */
-  ret = _vfiprintf_r (ptr, &f, fmt, ap);
-  if (size > 0)
-    *f._p = 0;
-  return ret;
-}
diff --git a/newlib/libc/stdio/vsnprintf.c b/newlib/libc/stdio/vsnprintf.c
index 9fc1b2d..4e9c283 100644
--- a/newlib/libc/stdio/vsnprintf.c
+++ b/newlib/libc/stdio/vsnprintf.c
@@ -1,3 +1,7 @@
+/* doc in vfprintf.c */
+
+/* This code created by modifying vsprintf.c so copyright inherited. */
+
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,7 +18,6 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* doc in vfprintf.c */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "%W% (Berkeley) %G%";
@@ -30,14 +33,12 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #include <varargs.h>
 #endif
 
-#ifndef _REENT_ONLY
-
 int
-_DEFUN(vsnprintf, (str, size, fmt, ap),
-       char *str        _AND
-       size_t size      _AND
-       _CONST char *fmt _AND
-       va_list ap)
+_DEFUN (vsnprintf, (str, size, fmt, ap),
+     char *str _AND
+     size_t size _AND
+     _CONST char *fmt _AND
+     va_list ap)
 {
   int ret;
   FILE f;
@@ -45,22 +46,20 @@ _DEFUN(vsnprintf, (str, size, fmt, ap),
   f._flags = __SWR | __SSTR;
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = (size > 0 ? size - 1 : 0);
-  f._file = -1;  /* No file. */
-  ret = _vfprintf_r (_REENT, &f, fmt, ap);
+  f._data = _REENT;
+  ret = vfprintf (&f, fmt, ap);
   if (size > 0)
     *f._p = 0;
   return ret;
 }
 
-#endif /* !_REENT_ONLY */
-
 int
-_DEFUN(_vsnprintf_r, (ptr, str, size, fmt, ap),
-       struct _reent *ptr _AND
-       char *str          _AND
-       size_t size        _AND
-       _CONST char *fmt   _AND
-       va_list ap)
+_DEFUN (_vsnprintf_r, (ptr, str, size, fmt, ap),
+     struct _reent *ptr _AND
+     char *str _AND
+     size_t size _AND
+     _CONST char *fmt _AND
+     va_list ap)
 {
   int ret;
   FILE f;
@@ -68,7 +67,7 @@ _DEFUN(_vsnprintf_r, (ptr, str, size, fmt, ap),
   f._flags = __SWR | __SSTR;
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = (size > 0 ? size - 1 : 0);
-  f._file = -1;  /* No file. */
+  f._data = ptr;
   ret = _vfprintf_r (ptr, &f, fmt, ap);
   if (size > 0)
     *f._p = 0;
diff --git a/newlib/libc/stdio/vsprintf.c b/newlib/libc/stdio/vsprintf.c
index daf4605..b440ac5 100644
--- a/newlib/libc/stdio/vsprintf.c
+++ b/newlib/libc/stdio/vsprintf.c
@@ -1,3 +1,5 @@
+/* doc in vfprintf.c */
+
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,7 +16,6 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* doc in vfprintf.c */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "%W% (Berkeley) %G%";
@@ -30,13 +31,11 @@ static char sccsid[] = "%W% (Berkeley) %G%";
 #include <varargs.h>
 #endif
 
-#ifndef _REENT_ONLY 
-
 int
-_DEFUN(vsprintf, (str, fmt, ap),
-       char *str        _AND
-       _CONST char *fmt _AND
-       va_list ap)
+_DEFUN (vsprintf, (str, fmt, ap),
+     char *str _AND
+     _CONST char *fmt _AND
+     va_list ap)
 {
   int ret;
   FILE f;
@@ -44,20 +43,18 @@ _DEFUN(vsprintf, (str, fmt, ap),
   f._flags = __SWR | __SSTR;
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = INT_MAX;
-  f._file = -1;  /* No file. */
-  ret = _vfprintf_r (_REENT, &f, fmt, ap);
+  f._data = _REENT;
+  ret = vfprintf (&f, fmt, ap);
   *f._p = 0;
   return ret;
 }
 
-#endif /* !_REENT_ONLY */
-
 int
-_DEFUN(_vsprintf_r, (ptr, str, fmt, ap),
-       struct _reent *ptr _AND
-       char *str          _AND
-       _CONST char *fmt   _AND
-       va_list ap)
+_DEFUN (_vsprintf_r, (ptr, str, fmt, ap),
+     struct _reent *ptr _AND
+     char *str _AND
+     _CONST char *fmt _AND
+     va_list ap)
 {
   int ret;
   FILE f;
@@ -65,7 +62,7 @@ _DEFUN(_vsprintf_r, (ptr, str, fmt, ap),
   f._flags = __SWR | __SSTR;
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._w = INT_MAX;
-  f._file = -1;  /* No file. */
+  f._data = ptr;
   ret = _vfprintf_r (ptr, &f, fmt, ap);
   *f._p = 0;
   return ret;
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c
index 22ed9cd..5ac6d09 100644
--- a/newlib/libc/stdio/vsscanf.c
+++ b/newlib/libc/stdio/vsscanf.c
@@ -28,11 +28,12 @@
 #endif
 #include "local.h"
 
-static _READ_WRITE_RETURN_TYPE
-_DEFUN(eofread1, (cookie, buf, len),
-       _PTR cookie _AND
-       char *buf   _AND
-       int len)
+static
+_READ_WRITE_RETURN_TYPE
+eofread1 (cookie, buf, len)
+    _PTR cookie;
+    char *buf;
+    int len;
 {
   return 0;
 }
@@ -44,10 +45,10 @@ _DEFUN(eofread1, (cookie, buf, len),
 #ifndef _REENT_ONLY
 
 int
-_DEFUN(vsscanf, (str, fmt, ap), 
-       _CONST char *str _AND 
-       _CONST char *fmt _AND 
-       va_list ap)
+_DEFUN (vsscanf, (str, fmt, ap), 
+    _CONST char *str _AND 
+    _CONST char *fmt _AND 
+    va_list ap)
 {
   return _vsscanf_r (_REENT, str, fmt, ap);
 }
@@ -55,20 +56,21 @@ _DEFUN(vsscanf, (str, fmt, ap),
 #endif /* !_REENT_ONLY */
 
 int
-_DEFUN(_vsscanf_r, (ptr, str, fmt, ap),
-       struct _reent *ptr _AND 
-       _CONST char *str   _AND 
-       _CONST char *fmt   _AND 
-       va_list ap)
+_DEFUN (_vsscanf_r, (ptr, str, fmt, ap),
+    struct _reent *ptr _AND 
+    _CONST char *str _AND 
+    _CONST char *fmt _AND 
+    va_list ap)
 {
   FILE f;
 
-  f._flags = __SRD | __SSTR;
+  f._flags = __SRD;
   f._bf._base = f._p = (unsigned char *) str;
   f._bf._size = f._r = strlen (str);
   f._read = eofread1;
   f._ub._base = NULL;
   f._lb._base = NULL;
-  f._file = -1;  /* No file. */
-  return __svfscanf_r (ptr, &f, fmt, ap);
+  f._data = ptr;
+  return __svfscanf_r (ptr, &f, fmt, ap);    
 }
+
diff --git a/newlib/libc/stdio/wbuf.c b/newlib/libc/stdio/wbuf.c
index e7ddb49..1106829 100644
--- a/newlib/libc/stdio/wbuf.c
+++ b/newlib/libc/stdio/wbuf.c
@@ -1,3 +1,5 @@
+/* No user fns here.  Pesch 15apr92. */
+
 /*
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -14,13 +16,11 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
-/* No user fns here.  Pesch 15apr92. */
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "%W% (Berkeley) %G%";
 #endif /* LIBC_SCCS and not lint */
 
-#include <_ansi.h>
 #include <stdio.h>
 #include "local.h"
 #include "fvwrite.h"
@@ -32,15 +32,15 @@ static char sccsid[] = "%W% (Berkeley) %G%";
  */
 
 int
-_DEFUN(__swbuf, (c, fp),
-       register int c _AND
-       register FILE *fp)
+__swbuf (c, fp)
+     register int c;
+     register FILE *fp;
 {
   register int n;
 
   /* Ensure stdio has been initialized.  */
 
-  CHECK_INIT (_REENT);
+  CHECK_INIT (fp);
 
   /*
    * In case we cannot write, or longjmp takes us out early,
diff --git a/newlib/libc/stdio/wsetup.c b/newlib/libc/stdio/wsetup.c
index cf56c2a..23b032e 100644
--- a/newlib/libc/stdio/wsetup.c
+++ b/newlib/libc/stdio/wsetup.c
@@ -17,7 +17,6 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <_ansi.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "local.h"
@@ -29,12 +28,12 @@
  */
 
 int
-_DEFUN(__swsetup, (fp),
-       register FILE * fp)
+_DEFUN (__swsetup, (fp),
+	register FILE * fp)
 {
   /* Make sure stdio is set up.  */
 
-  CHECK_INIT (_REENT);
+  CHECK_INIT (fp);
 
   /*
    * If we are not writing, we had better be reading and writing.
@@ -58,11 +57,9 @@ _DEFUN(__swsetup, (fp),
 
   /*
    * Make a buffer if necessary, then set _w.
-   * A string I/O file should not explicitly allocate a buffer
-   * unless asprintf is being used.
    */
-  if (fp->_bf._base == NULL 
-        && (!(fp->_flags & __SSTR) || (fp->_flags & __SMBF)))
+  /* NOT NEEDED FOR CYGNUS SPRINTF ONLY jpg */
+  if (fp->_bf._base == NULL)
     __smakebuf (fp);
 
   if (fp->_flags & __SLBF)
diff --git a/newlib/libc/stdio64/Makefile.am b/newlib/libc/stdio64/Makefile.am
deleted file mode 100644
index f31614a..0000000
--- a/newlib/libc/stdio64/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-# need a dummy object so objectlist.awk.in will build every time
-GENERAL_SOURCES = dummy.c local64.h
-
-## All interfaces are EL/IX level 2
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-LIB_OBJS = \
-	fdopen64.$(oext) 	\
-	fgetpos64.$(oext)	\
-	fopen64.$(oext) 	\
-	freopen64.$(oext) 	\
-	fseeko64.$(oext) 	\
-	fsetpos64.$(oext) 	\
-	ftello64.$(oext)	\
-	stdio64.$(oext)		\
-	tmpfile64.$(oext)
-endif
-
-libstdio64_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libstdio64.la
-libstdio64_la_SOURCES = $(GENERAL_SOURCES)
-libstdio64_la_LIBADD = $(LIB_OBJS)
-libstdio64_la_DEPENDENCIES = $(LIB_OBJS)
-LIB_COMPILE = $(LTCOMPILE)
-noinst_DATA = objectlist.awk.in
-else
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
-LIB_COMPILE = $(COMPILE)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../Makefile.shared
-
-AM_CFLAGS = -I $(srcdir)/../stdio
-
-CHEWOUT_FILES = \
-	fgetpos64.def		\
-	fopen64.def		\
-	freopen64.def		\
-	fseeko64.def		\
-	fsetpos64.def		\
-	ftello64.def		\
-	tmpfile64.def
-
-SUFFIXES = .def
-
-CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
-
-.c.def:
-	$(CHEW) < $< > $*.def 2> $*.ref
-	touch stmp-def
-
-TARGETDOC = ../tmp.texi
-
-doc: $(CHEWOUT_FILES)
-	cat $(srcdir)/stdio64.tex >> $(TARGETDOC)
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-
diff --git a/newlib/libc/stdio64/Makefile.in b/newlib/libc/stdio64/Makefile.in
deleted file mode 100644
index a70c3ef..0000000
--- a/newlib/libc/stdio64/Makefile.in
+++ /dev/null
@@ -1,397 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
-LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
-LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
-LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
-LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
-LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
-LIBC_SYS_LIB = @LIBC_SYS_LIB@
-LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-extra_dir = @extra_dir@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-# need a dummy object so objectlist.awk.in will build every time
-GENERAL_SOURCES = dummy.c local64.h
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = 	fdopen64.$(oext) 		fgetpos64.$(oext)		fopen64.$(oext) 		freopen64.$(oext) 		fseeko64.$(oext) 		fsetpos64.$(oext) 		ftello64.$(oext)		stdio64.$(oext)			tmpfile64.$(oext)
-
-libstdio64_la_LDFLAGS = -Xcompiler -nostdlib
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libstdio64.la
-@USE_LIBTOOL_TRUE@libstdio64_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@libstdio64_la_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@libstdio64_la_DEPENDENCIES = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@LIB_COMPILE = $(LTCOMPILE)
-@USE_LIBTOOL_FALSE@LIB_COMPILE = $(COMPILE)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS)
-
-AM_CFLAGS = -I $(srcdir)/../stdio
-
-CHEWOUT_FILES =  	fgetpos64.def			fopen64.def			freopen64.def			fseeko64.def			fsetpos64.def			ftello64.def			tmpfile64.def
-
-
-SUFFIXES = .def
-
-CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
-
-TARGETDOC = ../tmp.texi
-
-CLEANFILES = $(CHEWOUT_FILES) *.ref
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  dummy.$(OBJEXT)
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-@USE_LIBTOOL_TRUE@libstdio64_la_OBJECTS =  dummy.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(libstdio64_la_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(libstdio64_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus stdio64/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-libstdio64.la: $(libstdio64_la_OBJECTS) $(libstdio64_la_DEPENDENCIES)
-	$(LINK)  $(libstdio64_la_LDFLAGS) $(libstdio64_la_OBJECTS) $(libstdio64_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = stdio64
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-noinstLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
-distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-.c.def:
-	$(CHEW) < $< > $*.def 2> $*.ref
-	touch stmp-def
-
-doc: $(CHEWOUT_FILES)
-	cat $(srcdir)/stdio64.tex >> $(TARGETDOC)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/stdio64/dummy.c b/newlib/libc/stdio64/dummy.c
deleted file mode 100644
index 90d0120..0000000
--- a/newlib/libc/stdio64/dummy.c
+++ /dev/null
@@ -1 +0,0 @@
-/* empty stub so there's at least one file to put in objectlist.awk.in */
diff --git a/newlib/libc/stdio64/fdopen64.c b/newlib/libc/stdio64/fdopen64.c
deleted file mode 100644
index aa5a9ce..0000000
--- a/newlib/libc/stdio64/fdopen64.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-FUNCTION
-<<fdopen64>>---turn open file into a stream
-
-INDEX
-	fdopen64
-INDEX
-	_fdopen64_r
-
-SYNOPSIS
-	#include <stdio.h>
-	FILE *fdopen64(int <[fd]>, const char *<[mode]>);
-	FILE *_fdopen64_r(void *<[reent]>,
-                     int <[fd]>, const char *<[mode]>);
-
-DESCRIPTION
-<<fdopen64>> produces a file descriptor of type <<FILE *>>, from a
-descriptor for an already-open file (returned, for example, by the
-system subroutine <<open>> rather than by <<fopen>>).
-The <[mode]> argument has the same meanings as in <<fopen>>.
-
-RETURNS
-File pointer or <<NULL>>, as for <<fopen>>.
-*/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-
-#include <stdio.h>
-#include <errno.h>
-#include "local64.h"
-#include <_syslist.h>
-#include <sys/lock.h>
-
-extern int __sflags ();
-
-FILE *
-_DEFUN (_fdopen64_r, (ptr, fd, mode),
-	struct _reent *ptr _AND
-	int fd _AND
-	_CONST char *mode)
-{
-  register FILE *fp;
-  int flags, oflags;
-#ifdef HAVE_FCNTL
-  int fdflags, fdmode;
-#endif
-
-  if ((flags = __sflags (ptr, mode, &oflags)) == 0)
-    return 0;
-
-  /* make sure the mode the user wants is a subset of the actual mode */
-#ifdef HAVE_FCNTL
-  if ((fdflags = _fcntl_r (ptr, fd, F_GETFL, 0)) < 0)
-    return 0;
-  fdmode = fdflags & O_ACCMODE;
-  if (fdmode != O_RDWR && (fdmode != (oflags & O_ACCMODE)))
-    {
-      ptr->_errno = EBADF;
-      return 0;
-    }
-#endif
-
-  if ((fp = __sfp (ptr)) == 0)
-    return 0;
-
-  _flockfile(fp);
-
-  fp->_flags = flags;
-  /*
-   * If opened for appending, but underlying descriptor
-   * does not have O_APPEND bit set, assert __SAPP so that
-   * __swrite() will lseek to end before each write.
-   */
-  if ((oflags & O_APPEND)
-#ifdef HAVE_FCNTL
-       && !(fdflags & O_APPEND)
-#endif
-      )
-    fp->_flags |= __SAPP;
-  fp->_file = fd;
-  fp->_cookie = (_PTR) fp;
-
-#undef _read
-#undef _write
-#undef _seek
-#undef _close
-
-  fp->_read = __sread;
-  fp->_write = __swrite64;
-  fp->_seek = __sseek;
-  fp->_seek64 = __sseek64;
-  fp->_close = __sclose;
-
-#ifdef __SCLE
-  /* Explicit given mode results in explicit setting mode on fd */
-  if (oflags & O_BINARY)
-    setmode(fp->_file, O_BINARY);
-  else if (oflags & O_TEXT)
-    setmode(fp->_file, O_TEXT);
-  if (__stextmode(fp->_file))
-    fp->_flags |= __SCLE;
-#endif
-
-  fp->_flags |= __SL64;
-
-  _funlockfile(fp);
-  return fp;
-}
-
-#ifndef _REENT_ONLY
-
-FILE *
-_DEFUN (fdopen64, (fd, mode),
-	int fd _AND
-	_CONST char *mode)
-{
-  return _fdopen64_r (_REENT, fd, mode);
-}
-
-#endif
diff --git a/newlib/libc/stdio64/fgetpos64.c b/newlib/libc/stdio64/fgetpos64.c
deleted file mode 100644
index 36f7ec9..0000000
--- a/newlib/libc/stdio64/fgetpos64.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-FUNCTION
-<<fgetpos64>>---record position in a large stream or file
-
-INDEX
-	fgetpos64
-INDEX
-	_fgetpos64_r
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	int fgetpos64(FILE *<[fp]>, _fpos64_t *<[pos]>);
-	int _fgetpos64_r(struct _reent *<[ptr]>, FILE *<[fp]>, 
-	                 _fpos64_t *<[pos]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fgetpos64(<[fp]>, <[pos]>)
-	FILE *<[fp]>;
-	_fpos64_t *<[pos]>;
-
-	int _fgetpos64_r(<[ptr]>, <[fp]>, <[pos]>)
-	FILE *<[fp]>;
-	_fpos64_t *<[pos]>;
-
-DESCRIPTION
-Objects of type <<FILE>> can have a ``position'' that records how much
-of the file your program has already read.  Many of the <<stdio>> functions
-depend on this position, and many change it as a side effect.
-
-You can use <<fgetpos64>> to report on the current position for a file
-identified by <[fp]> that was opened by <<fopen64>>; <<fgetpos>> will write 
-a value representing that position at <<*<[pos]>>>.  Later, you can
-use this value with <<fsetpos64>> to return the file to this
-position.
-
-In the current implementation, <<fgetpos64>> simply uses a character
-count to represent the file position; this is the same number that
-would be returned by <<ftello64>>.
-
-RETURNS
-<<fgetpos64>> returns <<0>> when successful.  If <<fgetpos64>> fails, the
-result is <<1>>.  Failure occurs on streams that do not support
-positioning or streams not opened via <<fopen64>>; the global <<errno>> 
-indicates these conditions with the value <<ESPIPE>>.
-
-PORTABILITY
-<<fgetpos64>> is a glibc extension.
-
-No supporting OS subroutines are required.
-*/
-
-#include <stdio.h>
-
-#ifdef __LARGE64_FILES
-
-int
-_DEFUN (_fgetpos64_r, (ptr, fp, pos),
-	struct _reent * ptr _AND
-	FILE * fp _AND
-	_fpos64_t * pos)
-{
-  *pos = (_fpos64_t)_ftello64_r (ptr, fp);
-
-  if (*pos != -1)
-    {
-      return 0;
-    }
-  return 1;
-}
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN (fgetpos64, (fp, pos),
-	FILE * fp _AND
-	_fpos64_t * pos)
-{
-  return _fgetpos64_r (_REENT, fp, pos);
-}
-
-#endif /* !_REENT_ONLY */
-
-#endif /* __LARGE64_FILES */
diff --git a/newlib/libc/stdio64/fopen64.c b/newlib/libc/stdio64/fopen64.c
deleted file mode 100644
index 61c4e4f..0000000
--- a/newlib/libc/stdio64/fopen64.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<fopen64>>---open a large file
-
-INDEX
-	fopen64
-INDEX
-	_fopen64_r
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	FILE *fopen64(const char *<[file]>, const char *<[mode]>);
-	FILE *_fopen64_r(void *<[reent]>, 
-                       const char *<[file]>, const char *<[mode]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	FILE *fopen64(<[file]>, <[mode]>)
-	char *<[file]>;
-	char *<[mode]>;
-
-	FILE *_fopen64_r(<[reent]>, <[file]>, <[mode]>)
-	char *<[reent]>;
-	char *<[file]>;
-	char *<[mode]>;
-
-DESCRIPTION
-<<fopen64>> is identical to <<fopen>> except it opens a large file that
-is potentially >2GB in size.  See <<fopen>> for further details.
-
-RETURNS
-<<fopen64>> return a file pointer which you can use for other file
-operations, unless the file you requested could not be opened; in that
-situation, the result is <<NULL>>.  If the reason for failure was an
-invalid string at <[mode]>, <<errno>> is set to <<EINVAL>>.
-
-PORTABILITY
-<<fopen64>> is a glibc extension.
-
-Supporting OS subroutines required: <<close>>, <<fstat64>>, <<isatty>>,
-<<lseek64>>, <<open64>>, <<read>>, <<sbrk>>, <<write>>.
-*/
-
-/* Copied from fopen.c */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "%W% (Berkeley) %G%";
-#endif /* LIBC_SCCS and not lint */
-
-#include <stdio.h>
-#include <errno.h>
-#include "local64.h"
-#ifdef __CYGWIN__
-#include <fcntl.h>
-#endif
-#include <sys/lock.h>
-
-#ifdef __LARGE64_FILES
-
-FILE *
-_DEFUN (_fopen64_r, (ptr, file, mode),
-	struct _reent *ptr _AND
-	_CONST char *file _AND
-	_CONST char *mode)
-{
-  register FILE *fp;
-  register int f;
-  int flags, oflags;
-
-  if ((flags = __sflags (ptr, mode, &oflags)) == 0)
-    return NULL;
-  if ((fp = __sfp (ptr)) == NULL)
-    return NULL;
-
-  if ((f = _open64_r (ptr, file, oflags, 0666)) < 0)
-    {
-      __sfp_lock_acquire (); 
-      fp->_flags = 0;		/* release */
-#ifndef __SINGLE_THREAD__
-      __lock_close_recursive (fp->_lock);
-#endif
-      __sfp_lock_release (); 
-      return NULL;
-    }
-
-  _flockfile(fp);
-
-  fp->_file = f;
-  fp->_flags = flags;
-  fp->_cookie = (_PTR) fp;
-  fp->_read = __sread;
-  fp->_write = __swrite64;
-  fp->_seek = __sseek;
-  fp->_seek64 = __sseek64;
-  fp->_close = __sclose;
-
-  if (fp->_flags & __SAPP)
-    _fseeko64_r (ptr, fp, 0, SEEK_END);
-
-#ifdef __SCLE
-  if (__stextmode (fp->_file))
-    fp->_flags |= __SCLE;
-#endif
-
-  fp->_flags |= __SL64;
-
-  _funlockfile(fp);
-  return fp;
-}
-
-#ifndef _REENT_ONLY
-
-FILE *
-_DEFUN (fopen64, (file, mode),
-	_CONST char *file _AND
-	_CONST char *mode)
-{
-  return _fopen64_r (_REENT, file, mode);
-}
-
-#endif
-
-#endif /* __LARGE64_FILES */
diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c
deleted file mode 100644
index cb76605..0000000
--- a/newlib/libc/stdio64/freopen64.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 1990, 2006 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<freopen64>>---open a large file using an existing file descriptor
-
-INDEX
-	freopen64
-INDEX
-	_freopen64_r
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	FILE *freopen64(const char *<[file]>, const char *<[mode]>,
-		        FILE *<[fp]>);
-	FILE *_freopen64_r(struct _reent *<[ptr]>, const char *<[file]>, 
-		        const char *<[mode]>, FILE *<[fp]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	FILE *freopen64(<[file]>, <[mode]>, <[fp]>)
-	char *<[file]>;
-	char *<[mode]>;
-	FILE *<[fp]>;
-
-	FILE *_freopen64_r(<[ptr]>, <[file]>, <[mode]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	char *<[file]>;
-	char *<[mode]>;
-	FILE *<[fp]>;
-
-DESCRIPTION
-Use this variant of <<fopen64>> if you wish to specify a particular file
-descriptor <[fp]> (notably <<stdin>>, <<stdout>>, or <<stderr>>) for
-the file.
-
-If <[fp]> was associated with another file or stream, <<freopen64>>
-closes that other file or stream (but ignores any errors while closing
-it).
-
-<[file]> and <[mode]> are used just as in <<fopen>>.
-
-If <[file]> is <<NULL>>, the underlying stream is modified rather than
-closed.  The file cannot be given a more permissive access mode (for
-example, a <[mode]> of "w" will fail on a read-only file descriptor),
-but can change status such as append or binary mode.  If modification
-is not possible, failure occurs.
-
-RETURNS
-If successful, the result is the same as the argument <[fp]>.  If the
-file cannot be opened as specified, the result is <<NULL>>.
-
-PORTABILITY
-<<freopen>> is a glibc extension.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek64>>, <<open64>>, <<read>>, <<sbrk>>, <<write>>.
-*/
-
-#include <time.h>
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <sys/lock.h>
-#include "local64.h"
-
-/*
- * Re-direct an existing, open (probably) file to some other file.
- */
-
-#ifdef __LARGE64_FILES
-
-FILE *
-_DEFUN (_freopen64_r, (ptr, file, mode, fp),
-	struct _reent *ptr _AND
-	_CONST char *file _AND
-	_CONST char *mode _AND
-	register FILE *fp)
-{
-  register int f;
-  int flags, oflags;
-  int e = 0;
-
-  __sfp_lock_acquire ();
-
-  CHECK_INIT (ptr);
-
-  _flockfile(fp);
-
-  if ((flags = __sflags (ptr, mode, &oflags)) == 0)
-    {
-      _funlockfile(fp);
-      (void) _fclose_r (ptr, fp);
-      __sfp_lock_release ();
-      return NULL;
-    }
-
-  /*
-   * Remember whether the stream was open to begin with, and
-   * which file descriptor (if any) was associated with it.
-   * If it was attached to a descriptor, defer closing it,
-   * so that, e.g., freopen("/dev/stdin", "r", stdin) works.
-   * This is unnecessary if it was not a Unix file.
-   */
-
-  if (fp->_flags == 0)
-    fp->_flags = __SEOF;	/* hold on to it */
-  else
-    {
-      if (fp->_flags & __SWR)
-	(void) fflush (fp);
-      /*
-       * If close is NULL, closing is a no-op, hence pointless.
-       * If file is NULL, the file should not be closed.
-       */
-      if (fp->_close != NULL && file != NULL)
-	(void) (*fp->_close) (fp->_cookie);
-    }
-
-  /*
-   * Now get a new descriptor to refer to the new file, or reuse the
-   * existing file descriptor if file is NULL.
-   */
-
-  if (file != NULL)
-    {
-      f = _open64_r (ptr, (char *) file, oflags, 0666);
-      e = ptr->_errno;
-    }
-  else
-    {
-#ifdef HAVE_FCNTL
-      int oldflags;
-      /*
-       * Reuse the file descriptor, but only if the new access mode is
-       * equal or less permissive than the old.  F_SETFL correctly
-       * ignores creation flags.
-       */
-      f = fp->_file;
-      if ((oldflags = _fcntl_r (ptr, f, F_GETFL, 0)) == -1
-          || ! ((oldflags & O_ACCMODE) == O_RDWR
-                || ((oldflags ^ oflags) & O_ACCMODE) == 0)
-          || _fcntl_r (ptr, f, F_SETFL, oflags) == -1)
-        f = -1;
-#else
-      /* We cannot modify without fcntl support.  */
-      f = -1;
-#endif
-
-#ifdef __SCLE
-      /*
-       * F_SETFL doesn't change textmode.  Don't mess with modes of ttys.
-       */
-      if (0 <= f && ! isatty (f)
-          && setmode (f, oflags & (O_BINARY | O_TEXT)) == -1)
-        f = -1;
-#endif
-
-      if (f < 0)
-        {
-          e = EBADF;
-          if (fp->_close != NULL)
-            (void) (*fp->_close) (fp->_cookie);
-        }
-    }
-
-  /*
-   * Finish closing fp.  Even if the open succeeded above,
-   * we cannot keep fp->_base: it may be the wrong size.
-   * This loses the effect of any setbuffer calls,
-   * but stdio has always done this before.
-   */
-
-  if (fp->_flags & __SMBF)
-    _free_r (ptr, (char *) fp->_bf._base);
-  fp->_w = 0;
-  fp->_r = 0;
-  fp->_p = NULL;
-  fp->_bf._base = NULL;
-  fp->_bf._size = 0;
-  fp->_lbfsize = 0;
-  if (HASUB (fp))
-    FREEUB (fp);
-  fp->_ub._size = 0;
-  if (HASLB (fp))
-    FREELB (fp);
-  fp->_lb._size = 0;
-
-  if (f < 0)
-    {				/* did not get it after all */
-      fp->_flags = 0;		/* set it free */
-      ptr->_errno = e;		/* restore in case _close clobbered */
-      _funlockfile(fp);
-#ifndef __SINGLE_THREAD__
-      __lock_close_recursive (fp->_lock);
-#endif
-      __sfp_lock_release ();
-      return NULL;
-    }
-
-  fp->_flags = flags;
-  fp->_file = f;
-  fp->_cookie = (_PTR) fp;
-  fp->_read = __sread;
-  fp->_write = __swrite64;
-  fp->_seek = __sseek;
-  fp->_seek64 = __sseek64;
-  fp->_close = __sclose;
-
-#ifdef __SCLE
-  if (__stextmode(fp->_file))
-    fp->_flags |= __SCLE;
-#endif
-
-  fp->_flags |= __SL64;
-
-  _funlockfile(fp);
-  __sfp_lock_release ();
-  return fp;
-}
-
-#ifndef _REENT_ONLY
-
-FILE *
-_DEFUN (freopen64, (file, mode, fp),
-	_CONST char *file _AND
-	_CONST char *mode _AND
-	register FILE *fp)
-{
-  return _freopen64_r (_REENT, file, mode, fp);
-}
-
-#endif /* !_REENT_ONLY */
-
-#endif /* __LARGE64_FILES */
diff --git a/newlib/libc/stdio64/fseeko64.c b/newlib/libc/stdio64/fseeko64.c
deleted file mode 100644
index edd7640..0000000
--- a/newlib/libc/stdio64/fseeko64.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<fseeko64>>---set file position for large file
-
-INDEX
-	fseeko64
-INDEX
-	_fseeko64_r
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	int fseeko64(FILE *<[fp]>, _off64_t <[offset]>, int <[whence]>)
-	int _fseeko64_r (struct _reent *<[ptr]>, FILE *<[fp]>, 
-                         _off64_t <[offset]>, int <[whence]>)
-TRAD_SYNOPSIS
-	#include <stdio.h>
-
-	int fseeko64(<[fp]>, <[offset]>, <[whence]>)
-	FILE *<[fp]>;
-	_off64_t <[offset]>;
-	int <[whence]>;
-
-	int _fseeko64_r (<[ptr]>, <[fp]>, <[offset]>, <[whence]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	_off64_t <[offset]>;
-	int <[whence]>;
-
-DESCRIPTION
-Objects of type <<FILE>> can have a ``position'' that records how much
-of the file your program has already read.  Many of the <<stdio>> functions
-depend on this position, and many change it as a side effect.
-
-You can use <<fseeko64>> to set the position for the file identified by
-<[fp]> that was opened via <<fopen64>>.  The value of <[offset]> determines 
-the new position, in one of three ways selected by the value of <[whence]> 
-(defined as macros in `<<stdio.h>>'):
-
-<<SEEK_SET>>---<[offset]> is the absolute file position (an offset
-from the beginning of the file) desired.  <[offset]> must be positive.
-
-<<SEEK_CUR>>---<[offset]> is relative to the current file position.
-<[offset]> can meaningfully be either positive or negative.
-
-<<SEEK_END>>---<[offset]> is relative to the current end of file.
-<[offset]> can meaningfully be either positive (to increase the size
-of the file) or negative.
-
-See <<ftello64>> to determine the current file position.
-
-RETURNS
-<<fseeko64>> returns <<0>> when successful.  On failure, the
-result is <<EOF>>.  The reason for failure is indicated in <<errno>>:
-either <<ESPIPE>> (the stream identified by <[fp]> doesn't support
-repositioning or wasn't opened via <<fopen64>>) or <<EINVAL>> 
-(invalid file position).
-
-PORTABILITY
-<<fseeko64>> is a glibc extension.
-
-Supporting OS subroutines required: <<close>>, <<fstat64>>, <<isatty>>,
-<<lseek64>>, <<read>>, <<sbrk>>, <<write>>.
-*/
-
-#include <stdio.h>
-#include <time.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "local64.h"
-
-#define	POS_ERR	(-(_fpos64_t)1)
-
-#ifdef __LARGE64_FILES
-
-/*
- * Seek the given file to the given offset.
- * `Whence' must be one of the three SEEK_* macros.
- */
-
-_off64_t
-_DEFUN (_fseeko64_r, (ptr, fp, offset, whence),
-     struct _reent *ptr _AND
-     register FILE *fp _AND
-     _off64_t offset _AND
-     int whence)
-{
-  _fpos64_t _EXFUN ((*seekfn), (void *, _fpos64_t, int));
-  _fpos64_t target, curoff;
-  size_t n;
-
-  struct stat64 st;
-  int havepos;
-
-  /* Make sure stdio is set up.  */
-
-  CHECK_INIT (ptr);
-
-  _flockfile(fp);
-
-  curoff = fp->_offset;
-
-  /* If we've been doing some writing, and we're in append mode
-     then we don't really know where the filepos is.  */
-
-  if (fp->_flags & __SAPP && fp->_flags & __SWR)
-    {
-      /* So flush the buffer and seek to the end.  */
-      fflush (fp);
-    }
-
-  /* Have to be able to seek.  */
-
-  if ((seekfn = fp->_seek64) == NULL || !(fp->_flags & __SL64))
-    {
-      ptr->_errno = ESPIPE;	/* ??? */
-      _funlockfile(fp);
-      return EOF;
-    }
-
-  /*
-   * Change any SEEK_CUR to SEEK_SET, and check `whence' argument.
-   * After this, whence is either SEEK_SET or SEEK_END.
-   */
-
-  switch (whence)
-    {
-    case SEEK_CUR:
-      /*
-       * In order to seek relative to the current stream offset,
-       * we have to first find the current stream offset a la
-       * ftell (see ftell for details).
-       */
-      fflush(fp);   /* may adjust seek offset on append stream */
-      if (fp->_flags & __SOFF)
-	curoff = fp->_offset;
-      else
-	{
-	  curoff = (*seekfn) (fp->_cookie, (_fpos64_t) 0, SEEK_CUR);
-	  if (curoff == -1L)
-	    {
-	      _funlockfile(fp);
-	      return EOF;
-	    }
-	}
-      if (fp->_flags & __SRD)
-	{
-	  curoff -= fp->_r;
-	  if (HASUB (fp))
-	    curoff -= fp->_ur;
-	}
-      else if (fp->_flags & __SWR && fp->_p != NULL)
-	curoff += fp->_p - fp->_bf._base;
-
-      offset += curoff;
-      whence = SEEK_SET;
-      havepos = 1;
-      break;
-
-    case SEEK_SET:
-    case SEEK_END:
-      havepos = 0;
-      break;
-
-    default:
-      ptr->_errno = EINVAL;
-      _funlockfile(fp);
-      return (EOF);
-    }
-
-  /*
-   * Can only optimise if:
-   *	reading (and not reading-and-writing);
-   *	not unbuffered; and
-   *	this is a `regular' Unix file (and hence seekfn==__sseek).
-   * We must check __NBF first, because it is possible to have __NBF
-   * and __SOPT both set.
-   */
-
-  if (fp->_bf._base == NULL)
-    __smakebuf (fp);
-  if (fp->_flags & (__SWR | __SRW | __SNBF | __SNPT))
-    goto dumb;
-  if ((fp->_flags & __SOPT) == 0)
-    {
-      if (seekfn != __sseek64
-	  || fp->_file < 0
-	  || _fstat64_r (ptr, fp->_file, &st)
-	  || (st.st_mode & S_IFMT) != S_IFREG)
-	{
-	  fp->_flags |= __SNPT;
-	  goto dumb;
-	}
-#ifdef	HAVE_BLKSIZE
-      fp->_blksize = st.st_blksize;
-#else
-      fp->_blksize = 1024;
-#endif
-      fp->_flags |= __SOPT;
-    }
-
-  /*
-   * We are reading; we can try to optimise.
-   * Figure out where we are going and where we are now.
-   */
-
-  if (whence == SEEK_SET)
-    target = offset;
-  else
-    {
-      if (_fstat64_r (ptr, fp->_file, &st))
-	goto dumb;
-      target = st.st_size + offset;
-    }
-
-  if (!havepos)
-    {
-      if (fp->_flags & __SOFF)
-	curoff = fp->_offset;
-      else
-	{
-	  curoff = (*seekfn) (fp->_cookie, (_fpos64_t)0, SEEK_CUR);
-	  if (curoff == POS_ERR)
-	    goto dumb;
-	}
-      curoff -= fp->_r;
-      if (HASUB (fp))
-	curoff -= fp->_ur;
-    }
-
-  /*
-   * Compute the number of bytes in the input buffer (pretending
-   * that any ungetc() input has been discarded).  Adjust current
-   * offset backwards by this count so that it represents the
-   * file offset for the first byte in the current input buffer.
-   */
-
-  if (HASUB (fp))
-    {
-      curoff += fp->_r;       /* kill off ungetc */
-      n = fp->_up - fp->_bf._base;
-      curoff -= n;
-      n += fp->_ur;
-    }
-  else
-    {
-      n = fp->_p - fp->_bf._base;
-      curoff -= n;
-      n += fp->_r;
-    }
-
-  /*
-   * If the target offset is within the current buffer,
-   * simply adjust the pointers, clear EOF, undo ungetc(),
-   * and return.  (If the buffer was modified, we have to
-   * skip this; see fgetline.c.)
-   */
-
-  if ((fp->_flags & __SMOD) == 0 &&
-      target >= curoff && target < curoff + n)
-    {
-      register int o = target - curoff;
-
-      fp->_p = fp->_bf._base + o;
-      fp->_r = n - o;
-      if (HASUB (fp))
-	FREEUB (fp);
-      fp->_flags &= ~__SEOF;
-      _funlockfile(fp);
-      return 0;
-    }
-
-  /*
-   * The place we want to get to is not within the current buffer,
-   * but we can still be kind to the kernel copyout mechanism.
-   * By aligning the file offset to a block boundary, we can let
-   * the kernel use the VM hardware to map pages instead of
-   * copying bytes laboriously.  Using a block boundary also
-   * ensures that we only read one block, rather than two.
-   */
-
-  curoff = target & ~((_fpos64_t)(fp->_blksize - 1));
-  if ((*seekfn) (fp->_cookie, curoff, SEEK_SET) == POS_ERR)
-    goto dumb;
-  fp->_r = 0;
-  fp->_p = fp->_bf._base;
-  if (HASUB (fp))
-    FREEUB (fp);
-  fp->_flags &= ~__SEOF;
-  n = target - curoff;
-  if (n)
-    {
-      if (__srefill (fp) || fp->_r < n)
-	goto dumb;
-      fp->_p += n;
-      fp->_r -= n;
-    }
-  _funlockfile(fp);
-  return 0;
-
-  /*
-   * We get here if we cannot optimise the seek ... just
-   * do it.  Allow the seek function to change fp->_bf._base.
-   */
-
-dumb:
-  if (fflush (fp) || (*seekfn) (fp->_cookie, offset, whence) == POS_ERR)
-    {
-      _funlockfile(fp);
-      return EOF;
-    }
-  /* success: clear EOF indicator and discard ungetc() data */
-  if (HASUB (fp))
-    FREEUB (fp);
-  fp->_p = fp->_bf._base;
-  fp->_r = 0;
-  /* fp->_w = 0; *//* unnecessary (I think...) */
-  fp->_flags &= ~__SEOF;
-  _funlockfile(fp);
-  return 0;
-}
-
-#ifndef _REENT_ONLY
-
-_off64_t
-_DEFUN (fseeko64, (fp, offset, whence),
-     register FILE *fp _AND
-     _off64_t offset _AND
-     int whence)
-{
-  return _fseeko64_r (_REENT, fp, offset, whence);
-}
-
-#endif /* !_REENT_ONLY */
-
-#endif /* __LARGE64_FILES */
diff --git a/newlib/libc/stdio64/fsetpos64.c b/newlib/libc/stdio64/fsetpos64.c
deleted file mode 100644
index 046990d..0000000
--- a/newlib/libc/stdio64/fsetpos64.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-FUNCTION
-<<fsetpos64>>---restore position of a large stream or file
-
-INDEX
-	fsetpos64
-INDEX
-	_fsetpos64_r
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	int fsetpos64(FILE *<[fp]>, const _fpos64_t *<[pos]>);
-	int _fsetpos64_r(struct _reent *<[ptr]>, FILE *<[fp]>, 
-	                 const _fpos64_t *<[pos]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	int fsetpos64(<[fp]>, <[pos]>)
-	FILE *<[fp]>;
-	_fpos64_t *<[pos]>;
-
-	int _fsetpos64_r(<[ptr]>, <[fp]>, <[pos]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-	_fpos64_t *<[pos]>;
-
-DESCRIPTION
-Objects of type <<FILE>> can have a ``position'' that records how much
-of the file your program has already read.  Many of the <<stdio>> functions
-depend on this position, and many change it as a side effect.
-
-You can use <<fsetpos64>> to return the large file identified by <[fp]> to a 
-previous position <<*<[pos]>>> (after first recording it with <<fgetpos64>>).
-
-See <<fseeko64>> for a similar facility.
-
-RETURNS
-<<fgetpos64>> returns <<0>> when successful.  If <<fgetpos64>> fails, the
-result is <<1>>.  The reason for failure is indicated in <<errno>>:
-either <<ESPIPE>> (the stream identified by <[fp]> doesn't support
-64-bit repositioning) or <<EINVAL>> (invalid file position).
-
-PORTABILITY
-<<fsetpos64>> is a glibc extension.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
-<<lseek64>>, <<read>>, <<sbrk>>, <<write>>.
-*/
-
-#include <stdio.h>
-
-#ifdef __LARGE64_FILES
-
-int
-_DEFUN (_fsetpos64_r, (ptr, iop, pos),
-	struct _reent *ptr _AND
-	FILE * iop _AND
-	_CONST _fpos64_t * pos)
-{
-  int x = _fseeko64_r (ptr, iop, (_off64_t)(*pos), SEEK_SET);
-
-  if (x != 0)
-    return 1;
-  return 0;
-}
-
-#ifndef _REENT_ONLY
-
-int
-_DEFUN (fsetpos64, (iop, pos),
-	FILE * iop _AND
-	_CONST _fpos64_t * pos)
-{
-  return _fsetpos64_r (_REENT, iop, pos);
-}
-
-#endif /* !_REENT_ONLY */
-
-#endif /* __LARGE64_FILES */
diff --git a/newlib/libc/stdio64/ftello64.c b/newlib/libc/stdio64/ftello64.c
deleted file mode 100644
index ef33175..0000000
--- a/newlib/libc/stdio64/ftello64.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/*
-FUNCTION
-<<ftello64>>---return position in a stream or file
-
-INDEX
-	ftello64
-INDEX
-	_ftello64_r
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	_off64_t ftello64(FILE *<[fp]>);
-	_off64_t _ftello64_r(struct _reent *<[ptr]>, FILE *<[fp]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	_off64_t ftello64(<[fp]>)
-	FILE *<[fp]>;
-
-	_off64_t _ftello64_r(<[ptr]>, <[fp]>)
-	struct _reent *<[ptr]>;
-	FILE *<[fp]>;
-
-DESCRIPTION
-Objects of type <<FILE>> can have a ``position'' that records how much
-of the file your program has already read.  Many of the <<stdio>> functions
-depend on this position, and many change it as a side effect.
-
-The result of <<ftello64>> is the current position for a large file
-identified by <[fp]>.  If you record this result, you can later
-use it with <<fseeko64>> to return the file to this
-position.  The difference between <<ftello>> and <<ftello64>> is that
-<<ftello>> returns <<off_t>> and <<ftello64>> is designed to work
-for large files (>2GB) and returns <<_off64_t>>.
-
-In the current implementation, <<ftello64>> simply uses a character
-count to represent the file position; this is the same number that
-would be recorded by <<fgetpos64>>.
-
-The function exists only if the __LARGE64_FILES flag is defined.
-An error occurs if the <[fp]> was not opened via <<fopen64>>.
-
-RETURNS
-<<ftello64>> returns the file position, if possible.  If it cannot do
-this, it returns <<-1>>.  Failure occurs on streams that do not support
-positioning or not opened via <<fopen64>>; the global <<errno>> indicates 
-this condition with the value <<ESPIPE>>.
-
-PORTABILITY
-<<ftello64>> is a glibc extension.
-
-No supporting OS subroutines are required.
-*/
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "%W% (Berkeley) %G%";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * ftello64: return current offset.
- */
-
-#include <stdio.h>
-#include <errno.h>
-
-#include "local64.h"
-
-#ifdef __LARGE64_FILES
-
-_off64_t
-_DEFUN (_ftello64_r, (ptr, fp),
-	struct _reent *ptr _AND
-	register FILE * fp)
-{
-  _fpos64_t pos;
-
-  /* Ensure stdio is set up.  */
-
-  CHECK_INIT (ptr);
-
-  _flockfile(fp);
-
-  if (fp->_seek64 == NULL)
-    {
-      ptr->_errno = ESPIPE;
-      _funlockfile(fp);
-      return -1L;
-    }
-
-  /* Find offset of underlying I/O object, then
-     adjust for buffered bytes.  */
-  fflush(fp);           /* may adjust seek offset on append stream */
-  if (fp->_flags & __SOFF)
-    pos = fp->_offset;
-  else
-    {
-      pos = (*fp->_seek64) (fp->_cookie, (_fpos64_t) 0, SEEK_CUR);
-      if (pos == -1L)
-        {
-          _funlockfile(fp);
-          return pos;
-        }
-    }
-  if (fp->_flags & __SRD)
-    {
-      /*
-       * Reading.  Any unread characters (including
-       * those from ungetc) cause the position to be
-       * smaller than that in the underlying object.
-       */
-      pos -= fp->_r;
-      if (HASUB (fp))
-	pos -= fp->_ur;
-    }
-  else if (fp->_flags & __SWR && fp->_p != NULL)
-    {
-      /*
-       * Writing.  Any buffered characters cause the
-       * position to be greater than that in the
-       * underlying object.
-       */
-      pos += fp->_p - fp->_bf._base;
-    }
-
-  _funlockfile(fp);
-  return pos;
-}
-
-#ifndef _REENT_ONLY
-
-_off64_t
-_DEFUN (ftello64, (fp),
-	register FILE * fp)
-{
-  return _ftello64_r (_REENT, fp);
-}
-
-#endif /* !_REENT_ONLY */
-
-#endif /* __LARGE64_FILES */
diff --git a/newlib/libc/stdio64/local64.h b/newlib/libc/stdio64/local64.h
deleted file mode 100644
index b86c95d..0000000
--- a/newlib/libc/stdio64/local64.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Information local to this implementation of stdio64,
- * in particular, macros and private variables.
- */
-
-#include "local.h"
-
-#ifdef __LARGE64_FILES
-extern _fpos64_t _EXFUN(__sseek64,(void *, _fpos64_t, int));
-extern _fpos64_t _EXFUN(__sseek64_r,(struct _reent *, void *, _fpos64_t, int));
-extern _fpos64_t _EXFUN(__sseek64_error,(void *, _fpos64_t, int));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite64,(void *, char const *, int));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite64_r,(struct _reent *, void *, 
-                                      char const *, int));
-#endif
-
diff --git a/newlib/libc/stdio64/stdio64.c b/newlib/libc/stdio64/stdio64.c
deleted file mode 100644
index 35967ad..0000000
--- a/newlib/libc/stdio64/stdio64.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* No user fns here.  Pesch 15apr92. */
-
-/*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/unistd.h>
-#include <errno.h>
-#include "local.h"
-
-#ifdef __LARGE64_FILES
-_fpos64_t
-__sseek64_r (ptr, cookie, offset, whence)
-     struct _reent *ptr;
-     _PTR cookie;
-     _fpos64_t offset;
-     int whence;
-{
-  register FILE *fp = (FILE *) cookie;
-  register _off64_t ret;
-
-  ret = _lseek64_r (ptr, fp->_file, (_off64_t) offset, whence);
-  if (ret == (_fpos64_t)-1L)
-    fp->_flags &= ~__SOFF;
-  else
-    {
-      fp->_flags |= __SOFF;
-      fp->_offset = ret;
-    }
-  return ret;
-}
-
-_READ_WRITE_RETURN_TYPE
-__swrite64_r (ptr, cookie, buf, n)
-     struct _reent *ptr;
-     _PTR cookie;
-     char _CONST *buf;
-     int n;
-{
-  register FILE *fp = (FILE *) cookie;
-  int w;
-#ifdef __SCLE
-  int oldmode=0;
-#endif
-
-  if (fp->_flags & __SAPP)
-    (void) _lseek64_r (ptr, fp->_file, (_off64_t)0, SEEK_END);
-  fp->_flags &= ~__SOFF;	/* in case O_APPEND mode is set */
-
-#ifdef __SCLE
-  if (fp->_flags & __SCLE)
-    oldmode = setmode(fp->_file, O_BINARY);
-#endif
-
-  w = _write_r (ptr, fp->_file, buf, n);
-
-#ifdef __SCLE
-  if (oldmode)
-    setmode(fp->_file, oldmode);
-#endif
-
-  return w;
-}
-
-#ifndef _REENT_ONLY
-_fpos64_t
-__sseek64 (cookie, offset, whence)
-     _PTR cookie;
-     _fpos64_t offset;
-     int whence;
-{
-  return __sseek64_r (_REENT, cookie, offset, whence);
-}
-
-_READ_WRITE_RETURN_TYPE
-__swrite64 (cookie, buf, n)
-     _PTR cookie;
-     char _CONST *buf;
-     int n;
-{
-  return __swrite64_r (_REENT, cookie, buf, n);
-}
-
-#endif /* !_REENT_ONLY */
-
-#endif /* __LARGE64_FILES */
-
diff --git a/newlib/libc/stdio64/stdio64.tex b/newlib/libc/stdio64/stdio64.tex
deleted file mode 100644
index 55818c3..0000000
--- a/newlib/libc/stdio64/stdio64.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-@node Stdio64
-@chapter Large File Input and Output (@file{stdio.h}) 
-
-This chapter comprises additional functions to manage large files which
-are potentially larger than 2GB.
-
-The underlying facilities for input and output depend on the host
-system, but these functions provide a uniform interface.
-
-The corresponding declarations are in @file{stdio.h}.
-
-@menu  
-* fopen64::     Open a large file
-* freopen64::   Open a large file using an existing file descriptor
-* fsetpos64::   Restore position of a large stream or file
-* fgetpos64::   Get position of a large stream or file
-* ftello64::    Return position in a large stream or file
-* fseeko64::    Set large file position
-* tmpfile64::   Create a temporary large file
-@end menu 
-
-@page
-@include stdio64/fopen64.def
-
-@page
-@include stdio64/freopen64.def
-
-@page 
-@include stdio64/ftello64.def 
-
-@page
-@include stdio64/fseeko64.def
-
-@page
-@include stdio64/fgetpos64.def
-
-@page
-@include stdio64/fsetpos64.def
-
-@page
-@include stdio64/tmpfile64.def
-
diff --git a/newlib/libc/stdio64/tmpfile64.c b/newlib/libc/stdio64/tmpfile64.c
deleted file mode 100644
index 9868963..0000000
--- a/newlib/libc/stdio64/tmpfile64.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-FUNCTION
-<<tmpfile64>>---create a large temporary file
-
-INDEX
-	tmpfile64
-INDEX
-	_tmpfile64_r
-
-ANSI_SYNOPSIS
-	#include <stdio.h>
-	FILE *tmpfile64(void);
-
-	FILE *_tmpfile64_r(void *<[reent]>);
-
-TRAD_SYNOPSIS
-	#include <stdio.h>
-	FILE *tmpfile64();
-
-	FILE *_tmpfile64_r(<[reent]>)
-	char *<[reent]>;
-
-DESCRIPTION
-Create a large temporary file (a file which will be deleted automatically),
-using a name generated by <<tmpnam>>.  The temporary file is opened with
-the mode <<"wb+">>, permitting you to read and write anywhere in it
-as a binary file (without any data transformations the host system may
-perform for text files).  The file may be larger than 2GB.
-
-The alternate function <<_tmpfile64_r>> is a reentrant version.  The
-argument <[reent]> is a pointer to a reentrancy structure.
-
-Both <<tmpfile64>> and <<_tmpfile64_r>> are only defined if __LARGE64_FILES
-is defined.
-
-RETURNS
-<<tmpfile64>> normally returns a pointer to the temporary file.  If no
-temporary file could be created, the result is NULL, and <<errno>>
-records the reason for failure.
-
-PORTABILITY
-<<tmpfile64>> is a glibc extension.
-
-Supporting OS subroutines required: <<close>>, <<fstat>>, <<getpid>>,
-<<isatty>>, <<lseek64>>, <<open64>>, <<read>>, <<sbrk>>, <<write>>.
-
-<<tmpfile64>> also requires the global pointer <<environ>>.
-*/
-
-#include <stdio.h>
-#include <errno.h>
-
-#ifdef __LARGE64_FILES
-
-FILE *
-_DEFUN (_tmpfile64_r, (ptr),
-	struct _reent *ptr)
-{
-  FILE *fp;
-  int e;
-  char *f;
-  char buf[L_tmpnam];
-
-  if ((f = _tmpnam_r (ptr, buf)) == NULL)
-    return NULL;
-  fp = _fopen64_r (ptr, (const char *)f, "wb+");
-  e = ptr->_errno;
-  _CAST_VOID _remove_r (ptr, f);
-  ptr->_errno = e;
-  return fp;
-}
-
-#ifndef _REENT_ONLY
-
-FILE *
-_DEFUN_VOID (tmpfile64)
-{
-  return _tmpfile64_r (_REENT);
-}
-
-#endif
-
-#endif /* __LARGE64_FILES */
-
diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am
index 36e6107..8c7687e 100644
--- a/newlib/libc/stdlib/Makefile.am
+++ b/newlib/libc/stdlib/Makefile.am
@@ -4,13 +4,10 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES = \
+LIB_SOURCES = \
 	__adjust.c 	\
-	__atexit.c	\
-	__call_atexit.c	\
 	__exp10.c 	\
 	__ten_mu.c 	\
-	_Exit.c		\
 	abort.c  	\
 	abs.c 		\
 	assert.c  	\
@@ -19,19 +16,29 @@ GENERAL_SOURCES = \
 	atoff.c		\
 	atoi.c  	\
 	atol.c		\
+	bsearch.c	\
 	calloc.c	\
 	div.c  		\
+	drand48.c	\
 	dtoa.c 		\
 	dtoastub.c 	\
+	ecvtbuf.c 	\
+	efgcvt.c 	\
 	environ.c	\
 	envlock.c	\
 	eprintf.c	\
+	erand48.c	\
 	exit.c 		\
 	getenv.c  	\
 	getenv_r.c	\
+	getopt.c	\
+	jrand48.c	\
 	labs.c 		\
+	lcong48.c	\
 	ldiv.c  	\
 	ldtoa.c		\
+	lrand48.c	\
+	malign.c	\
 	malloc.c  	\
 	mblen.c		\
 	mblen_r.c	\
@@ -41,105 +48,54 @@ GENERAL_SOURCES = \
 	mbtowc_r.c	\
 	mlock.c		\
 	mprec.c		\
-	mstats.c	\
-	rand.c		\
-	rand_r.c	\
-	realloc.c	\
-	strtod.c	\
-	strtol.c	\
-	strtoul.c	\
-	wcstombs.c	\
-	wcstombs_r.c	\
-	wctomb.c	\
-	wctomb_r.c
-
-EXTENDED_SOURCES = \
-	cxa_atexit.c	\
-	cxa_finalize.c	\
-	drand48.c	\
-	ecvtbuf.c 	\
-	efgcvt.c 	\
-	erand48.c	\
-	jrand48.c	\
-	lcong48.c	\
-	lrand48.c	\
 	mrand48.c	\
 	msize.c		\
+	mstats.c	\
 	mtrim.c		\
 	nrand48.c	\
+	putenv.c	\
+	putenv_r.c	\
+	qsort.c		\
+	rand.c		\
 	rand48.c	\
+	rand_r.c	\
+	realloc.c	\
 	seed48.c	\
+	setenv.c	\
+	setenv_r.c	\
 	srand48.c	\
+	strdup.c	\
+	strdup_r.c	\
+	strtod.c	\
+	strtol.c	\
 	strtoll.c	\
 	strtoll_r.c	\
+	strtoul.c	\
 	strtoull.c	\
 	strtoull_r.c	\
-	atoll.c		\
-	llabs.c		\
-	lldiv.c
-
-ELIX_2_OBJS = \
-	a64l.$(oext)		\
-	btowc.$(oext)		\
-	getopt.$(oext)		\
-	getsubopt.$(oext)	\
-	l64a.$(oext)		\
-	malign.$(oext)		\
-	malignr.$(oext)		\
-	malloptr.$(oext)	\
-	mbrlen.$(oext)		\
-	mbrtowc.$(oext)		\
-	mbsinit.$(oext)		\
-	mbsrtowcs.$(oext)	\
-	on_exit.$(oext)		\
-	pvallocr.$(oext)	\
-	valloc.$(oext)		\
-	vallocr.$(oext)		\
-	wcrtomb.$(oext)		\
-	wcsrtombs.$(oext)	\
-	wctob.$(oext)
-
-ELIX_3_OBJS = \
-	putenv.$(oext)		\
-	putenv_r.$(oext)	\
-	setenv.$(oext)		\
-	setenv_r.$(oext)
-
-ELIX_4_OBJS = \
-	system.$(oext)
-
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-if ELIX_LEVEL_2
-LIB_OBJS = $(ELIX_2_OBJS)
-else
-if ELIX_LEVEL_3
-LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS)
-else
-LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS)
-endif
-endif
-endif
+	system.c	\
+	valloc.c	\
+	wcstombs.c	\
+	wcstombs_r.c	\
+	wctomb.c	\
+	wctomb_r.c
 
 # Because of how libtool moves objects around, mallocr must be built last.
-LIBADD_OBJS = freer.$(oext) reallocr.$(oext) callocr.$(oext) cfreer.$(oext) \
-	mallinfor.$(oext) mallstatsr.$(oext) msizer.$(oext) mallocr.$(oext)
+LIBADD_OBJS = freer.$(oext) reallocr.$(oext) callocr.$(oext) cfreer.$(oext) malignr.$(oext) \
+	vallocr.$(oext) pvallocr.$(oext) mallinfor.$(oext) mallstatsr.$(oext) msizer.$(oext) malloptr.$(oext) mallocr.$(oext)
 
 libstdlib_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libstdlib.la
-libstdlib_la_SOURCES = $(GENERAL_SOURCES) $(EXTENDED_SOURCES)
-libstdlib_la_LIBADD = $(LIB_OBJS) $(LIBADD_OBJS)
-libstdlib_la_DEPENDENCIES = $(LIB_OBJS) $(LIBADD_OBJS)
+libstdlib_la_SOURCES = $(LIB_SOURCES)
+libstdlib_la_LIBADD = $(LIBADD_OBJS)
 LIB_COMPILE = $(LTCOMPILE)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES) $(EXTENDED_SOURCES)
-lib_a_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS)
+lib_a_SOURCES = $(LIB_SOURCES)
+lib_a_LIBADD = $(LIBADD_OBJS)
 LIB_COMPILE = $(COMPILE)
 noinst_DATA =
 endif # USE_LIBTOOL
@@ -185,26 +141,22 @@ malloptr.$(oext): mallocr.c
 	$(MALLOC_COMPILE) -DDEFINE_MALLOPT -c $(srcdir)/mallocr.c -o $@
 
 CHEWOUT_FILES= \
-	_Exit.def	\
-	a64l.def	\
 	abort.def	\
 	abs.def		\
 	assert.def	\
 	atexit.def	\
 	atof.def 	\
+	ecvtbuf.def	\
 	atoi.def 	\
-	atoll.def 	\
+	bsearch.def	\
 	calloc.def	\
 	div.def		\
-	ecvtbuf.def	\
 	efgcvt.def 	\
 	envlock.def	\
 	exit.def	\
 	getenv.def	\
 	labs.def	\
 	ldiv.def	\
-	llabs.def	\
-	lldiv.def	\
 	malloc.def	\
 	mallocr.def	\
 	mblen.def	\
@@ -212,7 +164,7 @@ CHEWOUT_FILES= \
 	mbtowc.def	\
 	mlock.def	\
 	mstats.def	\
-	on_exit.def	\
+	qsort.def	\
 	rand.def	\
 	rand48.def	\
 	strtod.def 	\
diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in
index 46d96b8..8ae3d15 100644
--- a/newlib/libc/stdlib/Makefile.in
+++ b/newlib/libc/stdlib/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -110,47 +95,138 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES =  	__adjust.c 		__atexit.c		__call_atexit.c		__exp10.c 		__ten_mu.c 		_Exit.c			abort.c  		abs.c 			assert.c  		atexit.c		atof.c 			atoff.c			atoi.c  		atol.c			calloc.c		div.c  			dtoa.c 			dtoastub.c 		environ.c		envlock.c		eprintf.c		exit.c 			getenv.c  		getenv_r.c		labs.c 			ldiv.c  		ldtoa.c			malloc.c  		mblen.c			mblen_r.c		mbstowcs.c		mbstowcs_r.c		mbtowc.c		mbtowc_r.c		mlock.c			mprec.c			mstats.c		rand.c			rand_r.c		realloc.c		strtod.c		strtol.c		strtoul.c		wcstombs.c		wcstombs_r.c		wctomb.c		wctomb_r.c
+LIB_SOURCES = \
+	__adjust.c 	\
+	__exp10.c 	\
+	__ten_mu.c 	\
+	abort.c  	\
+	abs.c 		\
+	assert.c  	\
+	atexit.c	\
+	atof.c 		\
+	atoff.c		\
+	atoi.c  	\
+	atol.c		\
+	bsearch.c	\
+	calloc.c	\
+	div.c  		\
+	drand48.c	\
+	dtoa.c 		\
+	dtoastub.c 	\
+	ecvtbuf.c 	\
+	efgcvt.c 	\
+	environ.c	\
+	envlock.c	\
+	eprintf.c	\
+	erand48.c	\
+	exit.c 		\
+	getenv.c  	\
+	getenv_r.c	\
+	getopt.c	\
+	jrand48.c	\
+	labs.c 		\
+	lcong48.c	\
+	ldiv.c  	\
+	ldtoa.c		\
+	lrand48.c	\
+	malign.c	\
+	malloc.c  	\
+	mblen.c		\
+	mblen_r.c	\
+	mbstowcs.c	\
+	mbstowcs_r.c	\
+	mbtowc.c	\
+	mbtowc_r.c	\
+	mlock.c		\
+	mprec.c		\
+	mrand48.c	\
+	msize.c		\
+	mstats.c	\
+	mtrim.c		\
+	nrand48.c	\
+	putenv.c	\
+	putenv_r.c	\
+	qsort.c		\
+	rand.c		\
+	rand48.c	\
+	rand_r.c	\
+	realloc.c	\
+	seed48.c	\
+	setenv.c	\
+	setenv_r.c	\
+	srand48.c	\
+	strdup.c	\
+	strdup_r.c	\
+	strtod.c	\
+	strtol.c	\
+	strtoll.c	\
+	strtoll_r.c	\
+	strtoul.c	\
+	strtoull.c	\
+	strtoull_r.c	\
+	system.c	\
+	valloc.c	\
+	wcstombs.c	\
+	wcstombs_r.c	\
+	wctomb.c	\
+	wctomb_r.c
 
 
-EXTENDED_SOURCES =  	cxa_atexit.c		cxa_finalize.c		drand48.c		ecvtbuf.c 		efgcvt.c 		erand48.c		jrand48.c		lcong48.c		lrand48.c		mrand48.c		msize.c			mtrim.c			nrand48.c		rand48.c		seed48.c		srand48.c		strtoll.c		strtoll_r.c		strtoull.c		strtoull_r.c		atoll.c			llabs.c			lldiv.c
-
-
-ELIX_2_OBJS =  	a64l.$(oext)			btowc.$(oext)			getopt.$(oext)			getsubopt.$(oext)		l64a.$(oext)			malign.$(oext)			malignr.$(oext)			malloptr.$(oext)		mbrlen.$(oext)			mbrtowc.$(oext)			mbsinit.$(oext)			mbsrtowcs.$(oext)		on_exit.$(oext)			pvallocr.$(oext)		valloc.$(oext)			vallocr.$(oext)			wcrtomb.$(oext)			wcsrtombs.$(oext)		wctob.$(oext)
-
-
-ELIX_3_OBJS =  	putenv.$(oext)			putenv_r.$(oext)		setenv.$(oext)			setenv_r.$(oext)
-
-
-ELIX_4_OBJS =  	system.$(oext)
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS)
-
 # Because of how libtool moves objects around, mallocr must be built last.
-LIBADD_OBJS = freer.$(oext) reallocr.$(oext) callocr.$(oext) cfreer.$(oext) 	mallinfor.$(oext) mallstatsr.$(oext) msizer.$(oext) mallocr.$(oext)
+LIBADD_OBJS = freer.$(oext) reallocr.$(oext) callocr.$(oext) cfreer.$(oext) malignr.$(oext) \
+	vallocr.$(oext) pvallocr.$(oext) mallinfor.$(oext) mallstatsr.$(oext) msizer.$(oext) malloptr.$(oext) mallocr.$(oext)
 
 
 libstdlib_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libstdlib.la
-@USE_LIBTOOL_TRUE@libstdlib_la_SOURCES = $(GENERAL_SOURCES) $(EXTENDED_SOURCES)
-@USE_LIBTOOL_TRUE@libstdlib_la_LIBADD = $(LIB_OBJS) $(LIBADD_OBJS)
-@USE_LIBTOOL_TRUE@libstdlib_la_DEPENDENCIES = $(LIB_OBJS) $(LIBADD_OBJS)
-@USE_LIBTOOL_TRUE@LIB_COMPILE = $(LTCOMPILE)
-@USE_LIBTOOL_FALSE@LIB_COMPILE = $(COMPILE)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libstdlib.la
+@USE_LIBTOOL_TRUE@libstdlib_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@libstdlib_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIBADD_OBJS)
+@USE_LIBTOOL_TRUE@LIB_COMPILE = @USE_LIBTOOL_TRUE@$(LTCOMPILE)
+@USE_LIBTOOL_FALSE@LIB_COMPILE = @USE_LIBTOOL_FALSE@$(COMPILE)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES) $(EXTENDED_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
+@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIBADD_OBJS)
 
 MALLOC_COMPILE = $(LIB_COMPILE) -DINTERNAL_NEWLIB
 
-CHEWOUT_FILES =  	_Exit.def		a64l.def		abort.def		abs.def			assert.def		atexit.def		atof.def 		atoi.def 		atoll.def 		calloc.def		div.def			ecvtbuf.def		efgcvt.def 		envlock.def		exit.def		getenv.def		labs.def		ldiv.def		llabs.def		lldiv.def		malloc.def		mallocr.def		mblen.def		mbstowcs.def		mbtowc.def		mlock.def		mstats.def		on_exit.def		rand.def		rand48.def		strtod.def 		strtol.def 		strtoll.def 		strtoul.def 		strtoull.def 		system.def		wcstombs.def		wctomb.def	
+CHEWOUT_FILES = \
+	abort.def	\
+	abs.def		\
+	assert.def	\
+	atexit.def	\
+	atof.def 	\
+	ecvtbuf.def	\
+	atoi.def 	\
+	bsearch.def	\
+	calloc.def	\
+	div.def		\
+	efgcvt.def 	\
+	envlock.def	\
+	exit.def	\
+	getenv.def	\
+	labs.def	\
+	ldiv.def	\
+	malloc.def	\
+	mallocr.def	\
+	mblen.def	\
+	mbstowcs.def	\
+	mbtowc.def	\
+	mlock.def	\
+	mstats.def	\
+	qsort.def	\
+	rand.def	\
+	rand48.def	\
+	strtod.def 	\
+	strtol.def 	\
+	strtoll.def 	\
+	strtoul.def 	\
+	strtoull.def 	\
+	system.def	\
+	wcstombs.def	\
+	wctomb.def	
 
 
 SUFFIXES = .def
@@ -168,52 +244,49 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  __adjust.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@__atexit.$(OBJEXT) __call_atexit.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@__exp10.$(OBJEXT) __ten_mu.$(OBJEXT) _Exit.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@abort.$(OBJEXT) abs.$(OBJEXT) assert.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@atexit.$(OBJEXT) atof.$(OBJEXT) atoff.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@atoi.$(OBJEXT) atol.$(OBJEXT) calloc.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@div.$(OBJEXT) dtoa.$(OBJEXT) dtoastub.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@environ.$(OBJEXT) envlock.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@eprintf.$(OBJEXT) exit.$(OBJEXT) getenv.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getenv_r.$(OBJEXT) labs.$(OBJEXT) ldiv.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ldtoa.$(OBJEXT) malloc.$(OBJEXT) mblen.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mblen_r.$(OBJEXT) mbstowcs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mbstowcs_r.$(OBJEXT) mbtowc.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mbtowc_r.$(OBJEXT) mlock.$(OBJEXT) mprec.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mstats.$(OBJEXT) rand.$(OBJEXT) rand_r.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@realloc.$(OBJEXT) strtod.$(OBJEXT) strtol.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strtoul.$(OBJEXT) wcstombs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wcstombs_r.$(OBJEXT) wctomb.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wctomb_r.$(OBJEXT) cxa_atexit.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@cxa_finalize.$(OBJEXT) drand48.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ecvtbuf.$(OBJEXT) efgcvt.$(OBJEXT) erand48.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@jrand48.$(OBJEXT) lcong48.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@lrand48.$(OBJEXT) mrand48.$(OBJEXT) msize.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mtrim.$(OBJEXT) nrand48.$(OBJEXT) rand48.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@seed48.$(OBJEXT) srand48.$(OBJEXT) strtoll.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strtoll_r.$(OBJEXT) strtoull.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strtoull_r.$(OBJEXT) atoll.$(OBJEXT) llabs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@lldiv.$(OBJEXT)
+@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES =  freer.$(oext) reallocr.$(oext) \
+@USE_LIBTOOL_FALSE@callocr.$(oext) cfreer.$(oext) malignr.$(oext) \
+@USE_LIBTOOL_FALSE@vallocr.$(oext) pvallocr.$(oext) mallinfor.$(oext) \
+@USE_LIBTOOL_FALSE@mallstatsr.$(oext) msizer.$(oext) malloptr.$(oext) \
+@USE_LIBTOOL_FALSE@mallocr.$(oext)
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  __adjust.o __exp10.o __ten_mu.o \
+@USE_LIBTOOL_FALSE@abort.o abs.o assert.o atexit.o atof.o atoff.o \
+@USE_LIBTOOL_FALSE@atoi.o atol.o bsearch.o calloc.o div.o drand48.o \
+@USE_LIBTOOL_FALSE@dtoa.o dtoastub.o ecvtbuf.o efgcvt.o environ.o \
+@USE_LIBTOOL_FALSE@envlock.o eprintf.o erand48.o exit.o getenv.o \
+@USE_LIBTOOL_FALSE@getenv_r.o getopt.o jrand48.o labs.o lcong48.o \
+@USE_LIBTOOL_FALSE@ldiv.o ldtoa.o lrand48.o malign.o malloc.o mblen.o \
+@USE_LIBTOOL_FALSE@mblen_r.o mbstowcs.o mbstowcs_r.o mbtowc.o \
+@USE_LIBTOOL_FALSE@mbtowc_r.o mlock.o mprec.o mrand48.o msize.o \
+@USE_LIBTOOL_FALSE@mstats.o mtrim.o nrand48.o putenv.o putenv_r.o \
+@USE_LIBTOOL_FALSE@qsort.o rand.o rand48.o rand_r.o realloc.o seed48.o \
+@USE_LIBTOOL_FALSE@setenv.o setenv_r.o srand48.o strdup.o strdup_r.o \
+@USE_LIBTOOL_FALSE@strtod.o strtol.o strtoll.o strtoll_r.o strtoul.o \
+@USE_LIBTOOL_FALSE@strtoull.o strtoull_r.o system.o valloc.o wcstombs.o \
+@USE_LIBTOOL_FALSE@wcstombs_r.o wctomb.o wctomb_r.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
-@USE_LIBTOOL_TRUE@libstdlib_la_OBJECTS =  __adjust.lo __atexit.lo \
-@USE_LIBTOOL_TRUE@__call_atexit.lo __exp10.lo __ten_mu.lo _Exit.lo \
-@USE_LIBTOOL_TRUE@abort.lo abs.lo assert.lo atexit.lo atof.lo atoff.lo \
-@USE_LIBTOOL_TRUE@atoi.lo atol.lo calloc.lo div.lo dtoa.lo dtoastub.lo \
-@USE_LIBTOOL_TRUE@environ.lo envlock.lo eprintf.lo exit.lo getenv.lo \
-@USE_LIBTOOL_TRUE@getenv_r.lo labs.lo ldiv.lo ldtoa.lo malloc.lo \
-@USE_LIBTOOL_TRUE@mblen.lo mblen_r.lo mbstowcs.lo mbstowcs_r.lo \
-@USE_LIBTOOL_TRUE@mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo mstats.lo \
-@USE_LIBTOOL_TRUE@rand.lo rand_r.lo realloc.lo strtod.lo strtol.lo \
-@USE_LIBTOOL_TRUE@strtoul.lo wcstombs.lo wcstombs_r.lo wctomb.lo \
-@USE_LIBTOOL_TRUE@wctomb_r.lo cxa_atexit.lo cxa_finalize.lo drand48.lo \
-@USE_LIBTOOL_TRUE@ecvtbuf.lo efgcvt.lo erand48.lo jrand48.lo lcong48.lo \
-@USE_LIBTOOL_TRUE@lrand48.lo mrand48.lo msize.lo mtrim.lo nrand48.lo \
-@USE_LIBTOOL_TRUE@rand48.lo seed48.lo srand48.lo strtoll.lo \
-@USE_LIBTOOL_TRUE@strtoll_r.lo strtoull.lo strtoull_r.lo atoll.lo \
-@USE_LIBTOOL_TRUE@llabs.lo lldiv.lo
+@USE_LIBTOOL_TRUE@libstdlib_la_DEPENDENCIES =  freer.$(oext) \
+@USE_LIBTOOL_TRUE@reallocr.$(oext) callocr.$(oext) cfreer.$(oext) \
+@USE_LIBTOOL_TRUE@malignr.$(oext) vallocr.$(oext) pvallocr.$(oext) \
+@USE_LIBTOOL_TRUE@mallinfor.$(oext) mallstatsr.$(oext) msizer.$(oext) \
+@USE_LIBTOOL_TRUE@malloptr.$(oext) mallocr.$(oext)
+@USE_LIBTOOL_TRUE@libstdlib_la_OBJECTS =  __adjust.lo __exp10.lo \
+@USE_LIBTOOL_TRUE@__ten_mu.lo abort.lo abs.lo assert.lo atexit.lo \
+@USE_LIBTOOL_TRUE@atof.lo atoff.lo atoi.lo atol.lo bsearch.lo calloc.lo \
+@USE_LIBTOOL_TRUE@div.lo drand48.lo dtoa.lo dtoastub.lo ecvtbuf.lo \
+@USE_LIBTOOL_TRUE@efgcvt.lo environ.lo envlock.lo eprintf.lo erand48.lo \
+@USE_LIBTOOL_TRUE@exit.lo getenv.lo getenv_r.lo getopt.lo jrand48.lo \
+@USE_LIBTOOL_TRUE@labs.lo lcong48.lo ldiv.lo ldtoa.lo lrand48.lo \
+@USE_LIBTOOL_TRUE@malign.lo malloc.lo mblen.lo mblen_r.lo mbstowcs.lo \
+@USE_LIBTOOL_TRUE@mbstowcs_r.lo mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo \
+@USE_LIBTOOL_TRUE@mrand48.lo msize.lo mstats.lo mtrim.lo nrand48.lo \
+@USE_LIBTOOL_TRUE@putenv.lo putenv_r.lo qsort.lo rand.lo rand48.lo \
+@USE_LIBTOOL_TRUE@rand_r.lo realloc.lo seed48.lo setenv.lo setenv_r.lo \
+@USE_LIBTOOL_TRUE@srand48.lo strdup.lo strdup_r.lo strtod.lo strtol.lo \
+@USE_LIBTOOL_TRUE@strtoll.lo strtoll_r.lo strtoul.lo strtoull.lo \
+@USE_LIBTOOL_TRUE@strtoull_r.lo system.lo valloc.lo wcstombs.lo \
+@USE_LIBTOOL_TRUE@wcstombs_r.lo wctomb.lo wctomb_r.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -233,7 +306,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libstdlib_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus stdlib/Makefile
 
@@ -254,11 +327,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -267,7 +335,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libc/stdlib/_Exit.c b/newlib/libc/stdlib/_Exit.c
deleted file mode 100644
index 3f189a2..0000000
--- a/newlib/libc/stdlib/_Exit.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-FUNCTION
-<<_Exit>>---end program execution with no cleanup processing
-
-INDEX
-	_Exit
-
-ANSI_SYNOPSIS
-	#include <stdlib.h>
-	void _Exit(int <[code]>);
-
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	void _Exit(<[code]>)
-	int <[code]>;
-
-DESCRIPTION
-Use <<_Exit>> to return control from a program to the host operating
-environment.  Use the argument <[code]> to pass an exit status to the
-operating environment: two particular values, <<EXIT_SUCCESS>> and
-<<EXIT_FAILURE>>, are defined in `<<stdlib.h>>' to indicate success or
-failure in a portable fashion.
-
-<<_Exit>> differs from <<exit>> in that it does not run any
-application-defined cleanup functions registered with <<atexit>> and
-it does not clean up files and streams.  It is identical to <<_exit>>.
-
-RETURNS
-<<_Exit>> does not return to its caller.
-
-PORTABILITY
-<<_Exit>> is defined by the C99 standard.
-
-Supporting OS subroutines required: <<_exit>>.
-*/
-
-#include <stdlib.h>
-#include <unistd.h>	/* for _exit() declaration */
-#include <reent.h>
-
-void 
-_DEFUN (_Exit, (code),
-	int code)
-{
-  _exit (code);
-}
diff --git a/newlib/libc/stdlib/__atexit.c b/newlib/libc/stdlib/__atexit.c
deleted file mode 100644
index 49eebb3..0000000
--- a/newlib/libc/stdlib/__atexit.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Common routine to implement atexit-like functionality.
- */
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <reent.h>
-#include <sys/lock.h>
-#include "atexit.h"
-
-
-/*
- * Register a function to be performed at exit or on shared library unload.
- */
-
-int
-_DEFUN (__register_exitproc,
-	(type, fn, arg, d),
-	int type _AND
-	void (*fn) (void) _AND
-	void *arg _AND
-	void *d)
-{
-  struct _on_exit_args * args;
-  register struct _atexit *p;
-
-#ifndef __SINGLE_THREAD__
-  __LOCK_INIT(static, lock);
-
-  __lock_acquire(lock);
-#endif
-
-  p = _GLOBAL_REENT->_atexit;
-  if (p == NULL)
-    _GLOBAL_REENT->_atexit = p = &_GLOBAL_REENT->_atexit0;
-  if (p->_ind >= _ATEXIT_SIZE)
-    {
-#ifndef _ATEXIT_DYNAMIC_ALLOC
-      return -1;
-#else
-      p = (struct _atexit *) malloc (sizeof *p);
-      if (p == NULL)
-	{
-#ifndef __SINGLE_THREAD__
-	  __lock_release(lock);
-#endif
-	  return -1;
-	}
-      p->_ind = 0;
-      p->_next = _GLOBAL_REENT->_atexit;
-      _GLOBAL_REENT->_atexit = p;
-#ifndef _REENT_SMALL
-      p->_on_exit_args._fntypes = 0;
-      p->_on_exit_args._is_cxa = 0;
-#endif
-#endif
-    }
-
-  if (type != __et_atexit)
-    {
-#ifdef _REENT_SMALL
-      args = p->_on_exit_args_ptr;
-      if (args == NULL)
-	{
-	  args = malloc (sizeof * p->_on_exit_args_ptr);
-	  if (args == NULL)
-	    {
-#ifndef __SINGLE_THREAD__
-	      __lock_release(lock);
-#endif
-	      return -1;
-	    }
-	  args->_fntypes = 0;
-	  args->_is_cxa = 0;
-	  p->_on_exit_args_ptr = args;
-	}
-#else
-      args = &p->_on_exit_args;
-#endif
-      args->_fnargs[p->_ind] = arg;
-      args->_fntypes |= (1 << p->_ind);
-      args->_dso_handle[p->_ind] = d;
-      if (type == __et_cxa)
-	args->_is_cxa |= (1 << p->_ind);
-    }
-  p->_fns[p->_ind++] = fn;
-#ifndef __SINGLE_THREAD__
-  __lock_release(lock);
-#endif
-  return 0;
-}
diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c
deleted file mode 100644
index 6fa398a..0000000
--- a/newlib/libc/stdlib/__call_atexit.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * COmmon routine to call call registered atexit-like routines.
- */
-
-
-#include <stdlib.h>
-#include <reent.h>
-#include "atexit.h"
-
-/*
- * Call registered exit handlers.  If D is null then all handlers are called,
- * otherwise only the handlers from that DSO are called.
- */
-
-void 
-_DEFUN (__call_exitprocs, (code, d),
-	int code _AND _PTR d)
-{
-  register struct _atexit *p;
-  struct _atexit **lastp;
-  register struct _on_exit_args * args;
-  register int n;
-  int i;
-  void (*fn) (void);
-
-  p = _GLOBAL_REENT->_atexit;
-  lastp = &_GLOBAL_REENT->_atexit;
-  while (p)
-    {
-#ifdef _REENT_SMALL
-      args = p->_on_exit_args_ptr;
-#else
-      args = &p->_on_exit_args;
-#endif
-      for (n = p->_ind - 1; n >= 0; n--)
-	{
-	  i = 1 << n;
-
-	  /* Skip functions not from this dso.  */
-	  if (d && (!args || args->_dso_handle[n] != d))
-	    continue;
-
-	  /* Remove the function now to protect against the
-	     function calling exit recursively.  */
-	  fn = p->_fns[n];
-	  if (n == p->_ind - 1)
-	    p->_ind--;
-	  else
-	    p->_fns[n] = NULL;
-
-	  /* Skip functions that have already been called.  */
-	  if (!fn)
-	    continue;
-
-	  /* Call the function.  */
-	  if (!args || (args->_fntypes & i) == 0)
-	    fn ();
-	  else if ((args->_is_cxa & i) == 0)
-	    (*((void (*)(int, _PTR)) fn))(code, args->_fnargs[n]);
-	  else
-	    (*((void (*)(_PTR)) fn))(args->_fnargs[n]);
-	}
-
-#ifndef _ATEXIT_DYNAMIC_ALLOC
-      break;
-#else
-      /* Move to the next block.  Free empty blocks except the last one,
-	 which is part of _GLOBAL_REENT.  */
-      if (p->_ind == 0 && p->_next)
-	{
-	  /* Remove empty block from the list.  */
-	  *lastp = p->_next;
-#ifdef _REENT_SMALL
-	  if (args)
-	    free (args);
-#endif
-	  free (p);
-	  p = *lastp;
-	}
-      else
-	{
-	  lastp = &p->_next;
-	  p = p->_next;
-	}
-#endif
-    }
-}
diff --git a/newlib/libc/stdlib/a64l.c b/newlib/libc/stdlib/a64l.c
deleted file mode 100644
index 42fc2d2..0000000
--- a/newlib/libc/stdlib/a64l.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-FUNCTION
-<<a64l>>, <<l64a>>---convert between radix-64 ASCII string and long
-
-INDEX
-        a64l
-INDEX
-	l64a
-
-ANSI_SYNOPSIS
-        #include <stdlib.h>
-        long a64l(const char *<[input]>);
-        char *l64a(long <[input]>);
-
-TRAD_SYNOPSIS
-        #include <stdlib.h>
-        long a64l(<[input]>)
-        const char *<[input]>;
-
-        char *l64a(<[input]>)
-        long <[input]>;
-
-DESCRIPTION
-Conversion is performed between long and radix-64 characters.  The
-<<l64a>> routine transforms up to 32 bits of input value starting from
-least significant bits to the most significant bits.  The input value
-is split up into a maximum of 5 groups of 6 bits and possibly one
-group of 2 bits (bits 31 and 30).
-
-Each group of 6 bits forms a value from 0--63 which is translated into
-a character as follows:
-
-O+
-o     0 = '.'
-o     1 = '/'
-o     2--11 = '0' to '9'
-o     12--37 = 'A' to 'Z'
-o     38--63 = 'a' to 'z'
-O-
-
-When the remaining bits are zero or all bits have been translated, a
-null terminator is appended to the string.  An input value of 0
-results in the empty string.
-
-The <<a64l>> function performs the reverse translation.  Each
-character is used to generate a 6-bit value for up to 30 bits and then
-a 2-bit value to complete a 32-bit result.  The null terminator means
-that the remaining digits are 0.  An empty input string or NULL string
-results in 0L.  An invalid string results in undefined behavior.  If
-the size of a long is greater than 32 bits, the result is sign-extended.
-
-RETURNS
-<<l64a>> returns a null-terminated string of 0 to 6 characters.
-<<a64l>> returns the 32-bit translated value from the input character string.
-
-PORTABILITY
-<<l64a>> and <<a64l>> are non-ANSI and are defined by the Single Unix Specification.
-
-Supporting OS subroutines required: None.
-*/
-
-#include <_ansi.h>
-#include <stdlib.h>
-#include <limits.h>
-
-long
-_DEFUN (a64l, (input),
-	const char *input)
-{
-  const char *ptr;
-  char ch;
-  int i, digit;
-  unsigned long result = 0;
-
-  if (input == NULL)
-    return 0;
-
-  ptr = input;
-
-  /* it easiest to go from most significant digit to least so find end of input or up
-     to 6 characters worth */
-  for (i = 0; i < 6; ++i)
-    {
-      if (*ptr)
-	++ptr;
-    }
-
-  while (ptr > input)
-    {
-      ch = *(--ptr);
-
-#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
-      if (ch >= 'a')
-	digit = (ch - 'a') + 38;
-      else if (ch >= 'A')
-	digit = (ch - 'A') + 12;
-      else if (ch >= '0')
-	digit = (ch - '0') + 2;
-      else if (ch == '/')
-	digit = 1;
-      else
-	digit = 0;
-#else /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) */
-      switch (ch)
-	{
-	case '/':
-	  digit = 1;
-	  break;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	  digit = (ch - '0') + 2;
-	  break;
-	case 'A':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'E':
-	case 'F':
-	case 'G':
-	case 'H':
-	case 'I':
-	case 'J':
-	case 'K':
-	case 'L':
-	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':
-	case 'Q':
-	case 'R':
-	case 'S':
-	case 'T':
-	case 'U':
-	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':
-	case 'Z':
-	  digit = (ch - 'A') + 12;
-	  break;
-	case 'a':
-	case 'b':
-	case 'c':
-	case 'd':
-	case 'e':
-	case 'f':
-	case 'g':
-	case 'h':
-	case 'i':
-	case 'j':
-	case 'k':
-	case 'l':
-	case 'm':
-	case 'n':
-	case 'o':
-	case 'p':
-	case 'q':
-	case 'r':
-	case 's':
-	case 't':
-	case 'u':
-	case 'v':
-	case 'w':
-	case 'x':
-	case 'y':
-	case 'z':
-	  digit = (ch - 'A') + 38;
-	  break;
-	default:
-	  digit = 0;
-	  break;
-	}
-#endif /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) */ 
-      
-      result = (result << 6) + digit;
-    }
-
-#if LONG_MAX > 2147483647
-  /* for implementations where long is > 32 bits, the result must be sign-extended */
-  if (result & 0x80000000)
-      return (((long)-1 >> 32) << 32) + result;
-#endif
-
-  return result;
-}
-
-
-
-
diff --git a/newlib/libc/stdlib/assert.c b/newlib/libc/stdlib/assert.c
index c9887da..5b08bba 100644
--- a/newlib/libc/stdlib/assert.c
+++ b/newlib/libc/stdlib/assert.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-<<assert>>---macro for debugging diagnostics
+<<assert>>---Macro for Debugging Diagnostics
 
 INDEX
 	assert
diff --git a/newlib/libc/stdlib/atexit.c b/newlib/libc/stdlib/atexit.c
index 21ffd6e..88cdd23 100644
--- a/newlib/libc/stdlib/atexit.c
+++ b/newlib/libc/stdlib/atexit.c
@@ -50,8 +50,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
 <<lseek>>, <<read>>, <<sbrk>>, <<write>>.
 */
 
+#include <stddef.h>
 #include <stdlib.h>
-#include "atexit.h"
+#include <reent.h>
 
 /*
  * Register a function to be performed at exit.
@@ -62,5 +63,18 @@ _DEFUN (atexit,
 	(fn),
 	_VOID _EXFUN ((*fn), (_VOID)))
 {
-  return __register_exitproc (__et_atexit, fn, NULL, NULL);
+  register struct _atexit *p;
+
+  if ((p = _REENT->_atexit) == NULL)
+    _REENT->_atexit = p = &_REENT->_atexit0;
+  if (p->_ind >= _ATEXIT_SIZE)
+    {
+      if ((p = (struct _atexit *) malloc (sizeof *p)) == NULL)
+	return -1;
+      p->_ind = 0;
+      p->_next = _REENT->_atexit;
+      _REENT->_atexit = p;
+    }
+  p->_fns[p->_ind++] = fn;
+  return 0;
 }
diff --git a/newlib/libc/stdlib/atexit.h b/newlib/libc/stdlib/atexit.h
index e37a146..44a9281 100644
--- a/newlib/libc/stdlib/atexit.h
+++ b/newlib/libc/stdlib/atexit.h
@@ -1,14 +1,13 @@
 /*
- *	Common definitions for atexit-like routines
+ *	%G% (UofMD) %D%
  */
 
-enum __atexit_types
-{
-  __et_atexit,
-  __et_onexit,
-  __et_cxa
-};
+#define	ATEXIT_SIZE 32	/* must be at least 32 to guarantee ANSI conformance */
 
-void __call_exitprocs _PARAMS ((int, _PTR));
-int __register_exitproc _PARAMS ((int, void (*fn) (void), _PTR, _PTR));
+struct atexit {
+	struct	atexit *next;		/* next in list */
+	int	ind;			/* next index in this table */
+	void	(*fns[ATEXIT_SIZE])();	/* the table itself */
+};
 
+struct atexit *__atexit;	/* points to head of LIFO stack */
diff --git a/newlib/libc/stdlib/atof.c b/newlib/libc/stdlib/atof.c
index 8497f68..cf4abdb 100644
--- a/newlib/libc/stdlib/atof.c
+++ b/newlib/libc/stdlib/atof.c
@@ -25,7 +25,7 @@ DESCRIPTION
 <<atoff>> converts the initial portion of a string to a <<float>>.
 
 The functions parse the character string <[s]>,
-locating a substring which can be converted to a floating-point
+locating a substring which can be converted to a floating point
 value. The substring must match the format:
 . [+|-]<[digits]>[.][<[digits]>][(e|E)[+|-]<[digits]>]
 The substring converted is the longest initial
@@ -36,7 +36,7 @@ of whitespace, or if the first non-whitespace character is
 something other than <<+>>, <<->>, <<.>>, or a digit.
 
 <<atof(<[s]>)>> is implemented as <<strtod(<[s]>, NULL)>>.
-<<atoff(<[s]>)>> is implemented as <<strtof(<[s]>, NULL)>>.
+<<atoff(<[s]>)>> is implemented as <<strtodf(<[s]>, NULL)>>.
 
 RETURNS
 <<atof>> returns the converted substring value, if any, as a
diff --git a/newlib/libc/stdlib/atoff.c b/newlib/libc/stdlib/atoff.c
index c97b78f..9c682c4 100644
--- a/newlib/libc/stdlib/atoff.c
+++ b/newlib/libc/stdlib/atoff.c
@@ -5,5 +5,5 @@ float
 _DEFUN (atoff, (s),
 	_CONST char *s)
 {
-  return strtof (s, NULL);
+  return strtodf (s, NULL);
 }
diff --git a/newlib/libc/stdlib/atoi.c b/newlib/libc/stdlib/atoi.c
index 6156eda..c7792a4 100644
--- a/newlib/libc/stdlib/atoi.c
+++ b/newlib/libc/stdlib/atoi.c
@@ -6,17 +6,11 @@ INDEX
 	atoi
 INDEX
 	atol
-INDEX
-	_atoi_r
-INDEX
-	_atol_r
 
 ANSI_SYNOPSIS
 	#include <stdlib.h>
         int atoi(const char *<[s]>);
 	long atol(const char *<[s]>);
-        int _atoi_r(struct _reent *<[ptr]>, const char *<[s]>);
-        long _atol_r(struct _reent *<[ptr]>, const char *<[s]>);
 
 TRAD_SYNOPSIS
 	#include <stdlib.h>
@@ -26,14 +20,6 @@ TRAD_SYNOPSIS
        long atol(<[s]>)
        char *<[s]>;
 
-       int _atoi_r(<[ptr]>, <[s]>)
-       struct _reent *<[ptr]>;
-       char *<[s]>;
-
-       long _atol_r(<[ptr]>, <[s]>)
-       struct _reent *<[ptr]>;
-       char *<[s]>;
-
 
 DESCRIPTION
    <<atoi>> converts the initial portion of a string to an <<int>>.
@@ -42,15 +28,12 @@ DESCRIPTION
    <<atoi(s)>> is implemented as <<(int)strtol(s, NULL, 10).>>
    <<atol(s)>> is implemented as <<strtol(s, NULL, 10).>>
 
-   <<_atoi_r>> and <<_atol_r>> are reentrant versions of <<atoi>> and
-   <<atol>> respectively, passing the reentrancy struct pointer.
-
 RETURNS
    The functions return the converted value, if any. If no conversion was
    made, <<0>> is returned.
 
 PORTABILITY
-<<atoi>>, <<atol>> are ANSI.
+<<atoi>> is ANSI.
 
 No supporting OS subroutines are required.
 */
@@ -62,20 +45,10 @@ No supporting OS subroutines are required.
 #include <stdlib.h>
 #include <_ansi.h>
 
-#ifndef _REENT_ONLY
 int
 _DEFUN (atoi, (s),
 	_CONST char *s)
 {
   return (int) strtol (s, NULL, 10);
 }
-#endif /* !_REENT_ONLY */
-
-int
-_DEFUN (_atoi_r, (s),
-	struct _reent *ptr _AND
-	_CONST char *s)
-{
-  return (int) _strtol_r (ptr, s, NULL, 10);
-}
 
diff --git a/newlib/libc/stdlib/atol.c b/newlib/libc/stdlib/atol.c
index 8d0e5cd..6b059a8 100644
--- a/newlib/libc/stdlib/atol.c
+++ b/newlib/libc/stdlib/atol.c
@@ -5,17 +5,8 @@
 #include <stdlib.h>
 #include <_ansi.h>
 
-#ifndef _REENT_ONLY
 long
 _DEFUN (atol, (s), _CONST char *s)
 {
   return strtol (s, NULL, 10);
 }
-#endif /* !_REENT_ONLY */
-
-long
-_DEFUN (_atol_r, (ptr, s), struct _reent *ptr _AND _CONST char *s)
-{
-  return _strtol_r (ptr, s, NULL, 10);
-}
-
diff --git a/newlib/libc/stdlib/atoll.c b/newlib/libc/stdlib/atoll.c
deleted file mode 100644
index a6abd95..0000000
--- a/newlib/libc/stdlib/atoll.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-FUNCTION
-<<atoll>>---convert a string to a long long integer
-
-INDEX
-        atoll
-INDEX
-        _atoll_r
-
-ANSI_SYNOPSIS
-        #include <stdlib.h>
-        long long atoll(const char *<[str]>);
-        long long _atoll_r(struct _reent *<[ptr]>, const char *<[str]>);
-
-TRAD_SYNOPSIS
-        #include <stdlib.h>
-        long long atoll(<[str]>)
-        const char *<[str]>;
-
-        long long _atoll_r(<[ptr]>, <[str]>)
-	struct _reent *<[ptr]>;
-        const char *<[str]>;
-
-DESCRIPTION
-The function <<atoll>> converts the initial portion of the string 
-pointed to by <<*<[str]>>> to a type <<long long>>.  A call to
-atoll(str) in this implementation is equivalent to 
-strtoll(str, (char **)NULL, 10) including behavior on error.
-
-The alternate function <<_atoll_r>> is a reentrant version.  The
-extra argument <[reent]> is a pointer to a reentrancy structure.
-
-
-RETURNS
-The converted value.
-
-PORTABILITY
-<<atoll>> is ISO 9899 (C99) and POSIX 1003.1-2001 compatable.
-
-No supporting OS subroutines are required.
-*/
-
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <stdlib.h>
-#include <stddef.h>
-
-#ifndef _REENT_ONLY
-long long
-_DEFUN(atoll, (str),
-       _CONST char *str)
-{
-	return strtoll(str, (char **)NULL, 10);
-}
-#endif /* !_REENT_ONLY */
-
-long long
-_DEFUN(_atoll_r, (ptr, str),
-       struct _reent *ptr _AND
-       _CONST char *str)
-{
-	return _strtoll_r(ptr, str, (char **)NULL, 10);
-}
diff --git a/newlib/libc/search/bsearch.c b/newlib/libc/stdlib/bsearch.c
index b9539aa..b9539aa 100644
--- a/newlib/libc/search/bsearch.c
+++ b/newlib/libc/stdlib/bsearch.c
diff --git a/newlib/libc/stdlib/btowc.c b/newlib/libc/stdlib/btowc.c
deleted file mode 100644
index a1ea920..0000000
--- a/newlib/libc/stdlib/btowc.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <wchar.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <reent.h>
-
-wint_t
-btowc (int c)
-{
-  mbstate_t mbs;
-  int retval = 0;
-  wchar_t pwc;
-  unsigned char b;
-
-  b = (unsigned char)c;
-
-  /* Put mbs in initial state. */
-  memset (&mbs, '\0', sizeof (mbs));
-
-  _REENT_CHECK_MISC(_REENT);
-
-  retval = _mbtowc_r (_REENT, &pwc, &b, 1, &mbs);
-
-  if (c == EOF || retval != 1)
-    return WEOF;
-  else
-    return (wint_t)pwc;
-}
diff --git a/newlib/libc/stdlib/cxa_atexit.c b/newlib/libc/stdlib/cxa_atexit.c
deleted file mode 100644
index 8c39236..0000000
--- a/newlib/libc/stdlib/cxa_atexit.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Implementation of __cxa_atexit.
- */
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <reent.h>
-#include <sys/lock.h>
-#include "atexit.h"
-
-/*
- * Register a function to be performed at exit or DSO unload.
- */
-
-int
-_DEFUN (__cxa_atexit,
-	(fn, arg, d),
-	void (*fn) (void *) _AND
-	void *arg _AND
-	void *d)
-{
-  return __register_exitproc (__et_cxa, (void (*)(void)) fn, arg, d);
-}
diff --git a/newlib/libc/stdlib/cxa_finalize.c b/newlib/libc/stdlib/cxa_finalize.c
deleted file mode 100644
index 17d0526..0000000
--- a/newlib/libc/stdlib/cxa_finalize.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Implementation if __cxa_finalize.
- */
-
-
-#include <stdlib.h>
-#include <reent.h>
-#include "atexit.h"
-
-/*
- * Call registered exit handlers.  If D is null then all handlers are called,
- * otherwise only the handlers from that DSO are called.
- */
-
-void 
-_DEFUN (__cxa_finalize, (d),
-	void * d)
-{
-  __call_exitprocs (0, d);
-}
diff --git a/newlib/libc/stdlib/div.c b/newlib/libc/stdlib/div.c
index 816c3fb..2c070de 100644
--- a/newlib/libc/stdlib/div.c
+++ b/newlib/libc/stdlib/div.c
@@ -19,9 +19,9 @@ Divide
 @tex
 $n/d$,
 @end tex
-@ifnottex
+@ifinfo
 <[n]>/<[d]>,
-@end ifnottex
+@end ifinfo
 returning quotient and remainder as two integers in a structure <<div_t>>.
 
 RETURNS
diff --git a/newlib/libc/stdlib/drand48.c b/newlib/libc/stdlib/drand48.c
index 89fe6af..8f9c4a2 100644
--- a/newlib/libc/stdlib/drand48.c
+++ b/newlib/libc/stdlib/drand48.c
@@ -17,7 +17,6 @@ double
 _DEFUN (_drand48_r, (r),
        struct _reent *r)
 {
-  _REENT_CHECK_RAND48(r);
   return _erand48_r(r, __rand48_seed);
 }
 
diff --git a/newlib/libc/stdlib/dtoa.c b/newlib/libc/stdlib/dtoa.c
index 62597c7..1ea1c55 100644
--- a/newlib/libc/stdlib/dtoa.c
+++ b/newlib/libc/stdlib/dtoa.c
@@ -229,19 +229,18 @@ _DEFUN (_dtoa_r,
   int denorm;
   __ULong x;
 #endif
-  _Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S;
+  _Bigint *b, *b1, *delta, *mlo, *mhi, *S;
   double ds;
   char *s, *s0;
 
   d.d = _d;
 
-  _REENT_CHECK_MP(ptr);
-  if (_REENT_MP_RESULT(ptr))
+  if (ptr->_result)
     {
-      _REENT_MP_RESULT(ptr)->_k = _REENT_MP_RESULT_K(ptr);
-      _REENT_MP_RESULT(ptr)->_maxwds = 1 << _REENT_MP_RESULT_K(ptr);
-      Bfree (ptr, _REENT_MP_RESULT(ptr));
-      _REENT_MP_RESULT(ptr) = 0;
+      ptr->_result->_k = ptr->_result_k;
+      ptr->_result->_maxwds = 1 << ptr->_result_k;
+      Bfree (ptr, ptr->_result);
+      ptr->_result = 0;
     }
 
   if (word0 (d) & Sign_bit)
@@ -416,11 +415,11 @@ _DEFUN (_dtoa_r,
 	i = 1;
     }
   j = sizeof (__ULong);
-  for (_REENT_MP_RESULT_K(ptr) = 0; sizeof (_Bigint) - sizeof (__ULong) + j <= i;
+  for (ptr->_result_k = 0; sizeof (_Bigint) - sizeof (__ULong) + j <= i;
        j <<= 1)
-    _REENT_MP_RESULT_K(ptr)++;
-  _REENT_MP_RESULT(ptr) = Balloc (ptr, _REENT_MP_RESULT_K(ptr));
-  s = s0 = (char *) _REENT_MP_RESULT(ptr);
+    ptr->_result_k++;
+  ptr->_result = Balloc (ptr, ptr->_result_k);
+  s = s0 = (char *) ptr->_result;
 
   if (ilim >= 0 && ilim <= Quick_max && try_quick)
     {
diff --git a/newlib/libc/stdlib/efgcvt.c b/newlib/libc/stdlib/efgcvt.c
index 9aa3b2f..556d224 100644
--- a/newlib/libc/stdlib/efgcvt.c
+++ b/newlib/libc/stdlib/efgcvt.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-<<ecvt>>, <<ecvtf>>, <<fcvt>>, <<fcvtf>>---double or float to string
+<<ecvt>>,<<ecvtf>>,<<fcvt>>,<<fcvtf>>---double or float to string
 
 INDEX
 	ecvt
diff --git a/newlib/libc/stdlib/environ.c b/newlib/libc/stdlib/environ.c
index 8cc2392..4f6ff8b 100644
--- a/newlib/libc/stdlib/environ.c
+++ b/newlib/libc/stdlib/environ.c
@@ -1,30 +1,17 @@
-/* Copyright (c) 1995, 1996, 2002 Red Hat Incorporated.
+/* Copyright (c) 1995, 1996 Cygnus Support.
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *    Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
  *
- *    Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- *    The name of Red Hat Incorporated may not be used to endorse
- *    or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 /* Provide a definition of `environ' if crt0.o doesn't.  */
diff --git a/newlib/libc/stdlib/envlock.c b/newlib/libc/stdlib/envlock.c
index 74c85a8..8e55de2 100644
--- a/newlib/libc/stdlib/envlock.c
+++ b/newlib/libc/stdlib/envlock.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-<<__env_lock>>, <<__env_unlock>>---lock environ variable
+<<__env_lock>>, <<__env_unlock>>--lock environ variable
 
 INDEX
 	__env_lock
@@ -9,24 +9,24 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include "envlock.h"
-	void __env_lock (struct _reent *<[reent]>);
-	void __env_unlock (struct _reent *<[reent]>);
+       void __env_lock (struct _reent *<[reent]>);
+       void __env_unlock (struct _reent *<[reent]>);
 
 TRAD_SYNOPSIS
 	void __env_lock(<[reent]>)
-	struct _reent *<[reent]>;
+       struct _reent *<[reent]>;
 
 	void __env_unlock(<[reent]>)
-	struct _reent *<[reent]>;
+       struct _reent *<[reent]>;
 
 DESCRIPTION
-The <<setenv>> family of routines call these functions when they need to
-modify the environ variable.  The version of these routines supplied in the
-library use the lock API defined in sys/lock.h.  If multiple threads of
-execution can call <<setenv>>, or if <<setenv>> can be called reentrantly,
-then you need to define your own versions of these functions in order to
-safely lock the memory pool during a call.  If you do not, the memory pool
-may become corrupted.
+The <<setenv>> family of routines call these functions when they need
+to modify the environ variable.  The version of these routines supplied
+in the library does not do anything.  If multiple threads of execution
+can call <<setenv>>, or if <<setenv>> can be called reentrantly, then
+you need to define your own versions of these functions in order to
+safely lock the memory pool during a call.  If you do not, the memory
+pool may become corrupted.
 
 A call to <<setenv>> may call <<__env_lock>> recursively; that is,
 the sequence of calls may go <<__env_lock>>, <<__env_lock>>,
@@ -36,26 +36,16 @@ that it already holds.
 */
 
 #include "envlock.h"
-#include <sys/lock.h>
 
-#ifndef __SINGLE_THREAD__
-__LOCK_INIT_RECURSIVE(static, __env_lock_object);
-#endif
 
 void
 __env_lock (ptr)
      struct _reent *ptr;
 {
-#ifndef __SINGLE_THREAD__
-  __lock_acquire_recursive (__env_lock_object);
-#endif
 }
 
 void
 __env_unlock (ptr)
      struct _reent *ptr;
 {
-#ifndef __SINGLE_THREAD__
-  __lock_release_recursive (__env_lock_object);
-#endif
 }
diff --git a/newlib/libc/stdlib/exit.c b/newlib/libc/stdlib/exit.c
index 195b724..543bd0e 100644
--- a/newlib/libc/stdlib/exit.c
+++ b/newlib/libc/stdlib/exit.c
@@ -48,7 +48,8 @@ Supporting OS subroutines required: <<_exit>>.
 #include <stdlib.h>
 #include <unistd.h>	/* for _exit() declaration */
 #include <reent.h>
-#include "atexit.h"
+
+#ifndef _REENT_ONLY
 
 /*
  * Exit, flushing stdio buffers if necessary.
@@ -58,9 +59,15 @@ void
 _DEFUN (exit, (code),
 	int code)
 {
-  __call_exitprocs (code, NULL);
+  register struct _atexit *p;
+  register int n;
 
-  if (_GLOBAL_REENT->__cleanup)
-    (*_GLOBAL_REENT->__cleanup) (_GLOBAL_REENT);
+  for (p = _REENT->_atexit; p; p = p->_next)
+    for (n = p->_ind; --n >= 0;)
+      (*p->_fns[n]) ();
+  if (_REENT->__cleanup)
+    (*_REENT->__cleanup) (_REENT);
   _exit (code);
 }
+
+#endif
diff --git a/newlib/libc/stdlib/getenv_r.c b/newlib/libc/stdlib/getenv_r.c
index 85d250b..4d567c7 100644
--- a/newlib/libc/stdlib/getenv_r.c
+++ b/newlib/libc/stdlib/getenv_r.c
@@ -35,7 +35,7 @@ variables vary from one system to another.
 */
 
 /* This file may have been modified by DJ Delorie (Jan 1991).  If so,
-** these modifications are Copyright (C) 1991 DJ Delorie.
+** these modifications are Copyright (C) 1991 DJ Delorie
 */
 
 /*
@@ -94,10 +94,7 @@ _DEFUN (_findenv_r, (reent_ptr, name, offset),
   /* In some embedded systems, this does not get set.  This protects
      newlib from dereferencing a bad pointer.  */
   if (!*p_environ)
-    {
-      ENV_UNLOCK;
-      return NULL;
-    }
+    return NULL;
 
   c = name;
   len = 0;
diff --git a/newlib/libc/stdlib/getopt.c b/newlib/libc/stdlib/getopt.c
index 10002ed..b38938d 100644
--- a/newlib/libc/stdlib/getopt.c
+++ b/newlib/libc/stdlib/getopt.c
@@ -1,406 +1,117 @@
-/****************************************************************************
+/*
+ * Copyright (c) 1987, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+/* static char sccsid[] = "from: @(#)getopt.c	8.2 (Berkeley) 4/2/94"; */
+static char *rcsid = "$Id$";
+#endif /* LIBC_SCCS and not lint */
 
-getopt.c - Read command line options
-
-AUTHOR: Gregory Pietsch
-CREATED Fri Jan 10 21:13:05 1997
-
-DESCRIPTION:
-
-The getopt() function parses the command line arguments.  Its arguments argc
-and argv are the argument count and array as passed to the main() function
-on program invocation.  The argument optstring is a list of available option
-characters.  If such a character is followed by a colon (`:'), the option
-takes an argument, which is placed in optarg.  If such a character is
-followed by two colons, the option takes an optional argument, which is
-placed in optarg.  If the option does not take an argument, optarg is NULL.
-
-The external variable optind is the index of the next array element of argv
-to be processed; it communicates from one call to the next which element to
-process.
-
-The getopt_long() function works like getopt() except that it also accepts
-long options started by two dashes `--'.  If these take values, it is either
-in the form
-
---arg=value
-
- or
-
---arg value
-
-It takes the additional arguments longopts which is a pointer to the first
-element of an array of type struct option.  The last element of the array
-has to be filled with NULL for the name field.
-
-The longind pointer points to the index of the current long option relative
-to longopts if it is non-NULL.
-
-The getopt() function returns the option character if the option was found
-successfully, `:' if there was a missing parameter for one of the options,
-`?' for an unknown option character, and EOF for the end of the option list.
-
-The getopt_long() function's return value is described in the header file.
-
-The function getopt_long_only() is identical to getopt_long(), except that a
-plus sign `+' can introduce long options as well as `--'.
-
-The following describes how to deal with options that follow non-option
-argv-elements.
-
-If the caller did not specify anything, the default is REQUIRE_ORDER if the
-environment variable POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-REQUIRE_ORDER means don't recognize them as options; stop option processing
-when the first non-option is seen.  This is what Unix does.  This mode of
-operation is selected by either setting the environment variable
-POSIXLY_CORRECT, or using `+' as the first character of the optstring
-parameter.
-
-PERMUTE is the default.  We permute the contents of ARGV as we scan, so that
-eventually all the non-options are at the end.  This allows options to be
-given in any order, even with programs that were not written to expect this.
-
-RETURN_IN_ORDER is an option available to programs that were written to
-expect options and other argv-elements in any order and that care about the
-ordering of the two.  We describe each non-option argv-element as if it were
-the argument of an option with character code 1.  Using `-' as the first
-character of the optstring parameter selects this mode of operation.
-
-The special argument `--' forces an end of option-scanning regardless of the
-value of ordering.  In the case of RETURN_IN_ORDER, only `--' can cause
-getopt() and friends to return EOF with optind != argc.
-
-COPYRIGHT NOTICE AND DISCLAIMER:
-
-Copyright (C) 1997 Gregory Pietsch
-
-This file and the accompanying getopt.h header file are hereby placed in the 
-public domain without restrictions.  Just give the author credit, don't
-claim you wrote it or prevent anyone else from using it.
-
-Gregory Pietsch's current e-mail address:
-gpietsch@comcast.net
-****************************************************************************/
-
-/* include files */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <getopt.h>
 
-/* macros */
+int	opterr = 1,		/* if error message should be printed */
+	optind = 1,		/* index into parent argv vector */
+	optopt,			/* character checked for validity */
+	optreset;		/* reset getopt */
+char	*optarg;		/* argument associated with option */
 
-/* types */
-typedef enum GETOPT_ORDERING_T
-{
-  PERMUTE,
-  RETURN_IN_ORDER,
-  REQUIRE_ORDER
-} GETOPT_ORDERING_T;
-
-/* globally-defined variables */
-char *optarg = NULL;
-int optind = 0;
-int opterr = 1;
-int optopt = '?';
-
-/* functions */
-
-/* reverse_argv_elements:  reverses num elements starting at argv */
-static void
-reverse_argv_elements (char ** argv, int num)
-{
-  int i;
-  char *tmp;
-
-  for (i = 0; i < (num >> 1); i++)
-    {
-      tmp = argv[i];
-      argv[i] = argv[num - i - 1];
-      argv[num - i - 1] = tmp;
-    }
-}
-
-/* permute: swap two blocks of argv-elements given their lengths */
-static void
-permute (char *const argv[], int len1, int len2)
-{
-  reverse_argv_elements ((char **)argv, len1);
-  reverse_argv_elements ((char **)argv, len1 + len2);
-  reverse_argv_elements ((char **)argv, len2);
-}
-
-/* is_option: is this argv-element an option or the end of the option list? */
-static int
-is_option (char *argv_element, int only)
-{
-  return ((argv_element == NULL)
-          || (argv_element[0] == '-') || (only && argv_element[0] == '+'));
-}
-
-/* getopt_internal:  the function that does all the dirty work */
-static int
-getopt_internal (int argc, char *const argv[], const char *shortopts,
-                 const struct option *longopts, int *longind, int only)
-{
-  GETOPT_ORDERING_T ordering = PERMUTE;
-  static size_t optwhere = 0;
-  size_t permute_from = 0;
-  int num_nonopts = 0;
-  int optindex = 0;
-  size_t match_chars = 0;
-  char *possible_arg = NULL;
-  int longopt_match = -1;
-  int has_arg = -1;
-  char *cp;
-  int arg_next = 0;
-
-  /* first, deal with silly parameters and easy stuff */
-  if (argc == 0 || argv == NULL || (shortopts == NULL && longopts == NULL))
-    return EOF;
-  if (optind >= argc || argv[optind] == NULL)
-    return EOF;
-  if (strcmp (argv[optind], "--") == 0)
-    {
-      optind++;
-      return EOF;
-    }
-  /* if this is our first time through */
-  if (optind == 0)
-    optind = optwhere = 1;
-
-  /* define ordering */
-  if (shortopts != NULL && (*shortopts == '-' || *shortopts == '+'))
-    {
-      ordering = (*shortopts == '-') ? RETURN_IN_ORDER : REQUIRE_ORDER;
-      shortopts++;
-    }
-  else
-    ordering = (getenv ("POSIXLY_CORRECT") != NULL) ? REQUIRE_ORDER : PERMUTE;
-
-  /*
-   * based on ordering, find our next option, if we're at the beginning of
-   * one
-   */
-  if (optwhere == 1)
-    {
-      switch (ordering)
-        {
-        case PERMUTE:
-          permute_from = optind;
-          num_nonopts = 0;
-          while (!is_option (argv[optind], only))
-            {
-              optind++;
-              num_nonopts++;
-            }
-          if (argv[optind] == NULL)
-            {
-              /* no more options */
-              optind = permute_from;
-              return EOF;
-            }
-          else if (strcmp (argv[optind], "--") == 0)
-            {
-              /* no more options, but have to get `--' out of the way */
-              permute (argv + permute_from, num_nonopts, 1);
-              optind = permute_from + 1;
-              return EOF;
-            }
-          break;
-        case RETURN_IN_ORDER:
-          if (!is_option (argv[optind], only))
-            {
-              optarg = argv[optind++];
-              return (optopt = 1);
-            }
-          break;
-        case REQUIRE_ORDER:
-          if (!is_option (argv[optind], only))
-            return EOF;
-          break;
-        }
-    }
-  /* we've got an option, so parse it */
-
-  /* first, is it a long option? */
-  if (longopts != NULL
-      && (memcmp (argv[optind], "--", 2) == 0
-          || (only && argv[optind][0] == '+')) && optwhere == 1)
-    {
-      /* handle long options */
-      if (memcmp (argv[optind], "--", 2) == 0)
-        optwhere = 2;
-      longopt_match = -1;
-      possible_arg = strchr (argv[optind] + optwhere, '=');
-      if (possible_arg == NULL)
-        {
-          /* no =, so next argv might be arg */
-          match_chars = strlen (argv[optind]);
-          possible_arg = argv[optind] + match_chars;
-          match_chars = match_chars - optwhere;
-        }
-      else
-        match_chars = (possible_arg - argv[optind]) - optwhere;
-      for (optindex = 0; longopts[optindex].name != NULL; optindex++)
-        {
-          if (memcmp (argv[optind] + optwhere,
-                      longopts[optindex].name, match_chars) == 0)
-            {
-              /* do we have an exact match? */
-              if (match_chars == (int) (strlen (longopts[optindex].name)))
-                {
-                  longopt_match = optindex;
-                  break;
-                }
-              /* do any characters match? */
-              else
-                {
-                  if (longopt_match < 0)
-                    longopt_match = optindex;
-                  else
-                    {
-                      /* we have ambiguous options */
-                      if (opterr)
-                        fprintf (stderr, "%s: option `%s' is ambiguous "
-                                 "(could be `--%s' or `--%s')\n",
-                                 argv[0],
-                                 argv[optind],
-                                 longopts[longopt_match].name,
-                                 longopts[optindex].name);
-                      return (optopt = '?');
-                    }
-                }
-            }
-        }
-      if (longopt_match >= 0)
-        has_arg = longopts[longopt_match].has_arg;
-    }
-  /* if we didn't find a long option, is it a short option? */
-  if (longopt_match < 0 && shortopts != NULL)
-    {
-      cp = strchr (shortopts, argv[optind][optwhere]);
-      if (cp == NULL)
-        {
-          /* couldn't find option in shortopts */
-          if (opterr)
-            fprintf (stderr,
-                     "%s: invalid option -- `-%c'\n",
-                     argv[0], argv[optind][optwhere]);
-          optwhere++;
-          if (argv[optind][optwhere] == '\0')
-            {
-              optind++;
-              optwhere = 1;
-            }
-          return (optopt = '?');
-        }
-      has_arg = ((cp[1] == ':')
-                 ? ((cp[2] == ':') ? OPTIONAL_ARG : REQUIRED_ARG) : NO_ARG);
-      possible_arg = argv[optind] + optwhere + 1;
-      optopt = *cp;
-    }
-  /* get argument and reset optwhere */
-  arg_next = 0;
-  switch (has_arg)
-    {
-    case OPTIONAL_ARG:
-      if (*possible_arg == '=')
-        possible_arg++;
-      if (*possible_arg != '\0')
-        {
-          optarg = possible_arg;
-          optwhere = 1;
-        }
-      else
-        optarg = NULL;
-      break;
-    case REQUIRED_ARG:
-      if (*possible_arg == '=')
-        possible_arg++;
-      if (*possible_arg != '\0')
-        {
-          optarg = possible_arg;
-          optwhere = 1;
-        }
-      else if (optind + 1 >= argc)
-        {
-          if (opterr)
-            {
-              fprintf (stderr, "%s: argument required for option `", argv[0]);
-              if (longopt_match >= 0)
-                fprintf (stderr, "--%s'\n", longopts[longopt_match].name);
-              else
-                fprintf (stderr, "-%c'\n", *cp);
-            }
-          optind++;
-          return (optopt = ':');
-        }
-      else
-        {
-          optarg = argv[optind + 1];
-          arg_next = 1;
-          optwhere = 1;
-        }
-      break;
-    case NO_ARG:
-      if (longopt_match < 0)
-        {
-          optwhere++;
-          if (argv[optind][optwhere] == '\0')
-            optwhere = 1;
-        }
-      else
-        optwhere = 1;
-      optarg = NULL;
-      break;
-    }
-
-  /* do we have to permute or otherwise modify optind? */
-  if (ordering == PERMUTE && optwhere == 1 && num_nonopts != 0)
-    {
-      permute (argv + permute_from, num_nonopts, 1 + arg_next);
-      optind = permute_from + 1 + arg_next;
-    }
-  else if (optwhere == 1)
-    optind = optind + 1 + arg_next;
-
-  /* finally return */
-  if (longopt_match >= 0)
-    {
-      if (longind != NULL)
-        *longind = longopt_match;
-      if (longopts[longopt_match].flag != NULL)
-        {
-          *(longopts[longopt_match].flag) = longopts[longopt_match].val;
-          return 0;
-        }
-      else
-        return longopts[longopt_match].val;
-    }
-  else
-    return optopt;
-}
+#define	BADCH	(int)'?'
+#define	BADARG	(int)':'
+#define	EMSG	""
 
+/*
+ * getopt --
+ *	Parse argc/argv argument vector.
+ */
 int
-getopt (int argc, char *const argv[], const char *optstring)
+getopt(nargc, nargv, ostr)
+	int nargc;
+	char * const *nargv;
+	const char *ostr;
 {
-  return getopt_internal (argc, argv, optstring, NULL, NULL, 0);
+	static char *place = EMSG;		/* option letter processing */
+	char *oli;				/* option letter list index */
+
+	if (optreset || !*place) {		/* update scanning pointer */
+		optreset = 0;
+		if (optind >= nargc || *(place = nargv[optind]) != '-') {
+			place = EMSG;
+			return (-1);
+		}
+		if (place[1] && *++place == '-') {	/* found "--" */
+			++optind;
+			place = EMSG;
+			return (-1);
+		}
+	}					/* option letter okay? */
+	if ((optopt = (int)*place++) == (int)':' ||
+	    !(oli = strchr(ostr, optopt))) {
+		/*
+		 * if the user didn't specify '-' as an option,
+		 * assume it means -1.
+		 */
+		if (optopt == (int)'-')
+			return (-1);
+		if (!*place)
+			++optind;
+		if (opterr && *ostr != ':')
+			(void)fprintf(stderr,
+			    "%s: illegal option -- %c\n", nargv[0], optopt);
+		return (BADCH);
+	}
+	if (*++oli != ':') {			/* don't need argument */
+		optarg = NULL;
+		if (!*place)
+			++optind;
+	}
+	else {					/* need an argument */
+		if (*place)			/* no white space */
+			optarg = place;
+		else if (nargc <= ++optind) {	/* no arg */
+			place = EMSG;
+			if (*ostr == ':')
+				return (BADARG);
+			if (opterr)
+				(void)fprintf(stderr,
+				    "%s: option requires an argument -- %c\n",
+				    nargv[0], optopt);
+			return (BADCH);
+		}
+	 	else				/* white space */
+			optarg = nargv[optind];
+		place = EMSG;
+		++optind;
+	}
+	return (optopt);			/* dump back option letter */
 }
-
-int
-getopt_long (int argc, char *const argv[], const char *shortopts,
-             const struct option *longopts, int *longind)
-{
-  return getopt_internal (argc, argv, shortopts, longopts, longind, 0);
-}
-
-int
-getopt_long_only (int argc, char *const argv[], const char *shortopts,
-                  const struct option *longopts, int *longind)
-{
-  return getopt_internal (argc, argv, shortopts, longopts, longind, 1);
-}
-
-/* end of file GETOPT.C */
diff --git a/newlib/libc/stdlib/getsubopt.3 b/newlib/libc/stdlib/getsubopt.3
deleted file mode 100644
index 83c5f7c..0000000
--- a/newlib/libc/stdlib/getsubopt.3
+++ /dev/null
@@ -1,149 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)getsubopt.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: src/lib/libc/stdlib/getsubopt.3,v 1.9 2001/09/07 14:46:35 asmodai Exp $
-.\"
-.Dd June 9, 1993
-.Dt GETSUBOPT 3
-.Os
-.Sh NAME
-.Nm getsubopt
-.Nd get sub options from an argument
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Vt extern char *suboptarg ;
-.Ft int
-.Fn getsubopt "char **optionp" "char * const *tokens" "char **valuep"
-.Sh DESCRIPTION
-The
-.Fn getsubopt
-function
-parses a string containing tokens delimited by one or more tab, space or
-comma
-.Pq Ql \&,
-characters.
-It is intended for use in parsing groups of option arguments provided
-as part of a utility command line.
-.Pp
-The argument
-.Fa optionp
-is a pointer to a pointer to the string.
-The argument
-.Fa tokens
-is a pointer to a
-.Dv NULL Ns -terminated
-array of pointers to strings.
-.Pp
-The
-.Fn getsubopt
-function
-returns the zero-based offset of the pointer in the
-.Fa tokens
-array referencing a string which matches the first token
-in the string, or, \-1 if the string contains no tokens or
-.Fa tokens
-does not contain a matching string.
-.Pp
-If the token is of the form ``name=value'', the location referenced by
-.Fa valuep
-will be set to point to the start of the ``value'' portion of the token.
-.Pp
-On return from
-.Fn getsubopt ,
-.Fa optionp
-will be set to point to the start of the next token in the string,
-or the null at the end of the string if no more tokens are present.
-The external variable
-.Fa suboptarg
-will be set to point to the start of the current token, or
-.Dv NULL
-if no
-tokens were present.
-The argument
-.Fa valuep
-will be set to point to the ``value'' portion of the token, or
-.Dv NULL
-if no ``value'' portion was present.
-.Sh EXAMPLES
-.Bd -literal -compact
-char *tokens[] = {
-	#define	ONE	0
-		"one",
-	#define	TWO	1
-		"two",
-	NULL
-};
-
-\&...
-
-extern char *optarg, *suboptarg;
-char *options, *value;
-
-while ((ch = getopt(argc, argv, "ab:")) != \-1) {
-	switch(ch) {
-	case 'a':
-		/* process ``a'' option */
-		break;
-	case 'b':
-		options = optarg;
-		while (*options) {
-			switch(getsubopt(&options, tokens, &value)) {
-			case ONE:
-				/* process ``one'' sub option */
-				break;
-			case TWO:
-				/* process ``two'' sub option */
-				if (!value)
-					error("no value for two");
-				i = atoi(value);
-				break;
-			case \-1:
-				if (suboptarg)
-					error("illegal sub option %s",
-					  suboptarg);
-				else
-					error("missing sub option");
-				break;
-		}
-		break;
-	}
-.Ed
-.Sh SEE ALSO
-.Xr getopt 3 ,
-.Xr strsep 3
-.Sh HISTORY
-The
-.Fn getsubopt
-function first appeared in
-.Bx 4.4 .
diff --git a/newlib/libc/stdlib/getsubopt.c b/newlib/libc/stdlib/getsubopt.c
deleted file mode 100644
index 250e73d..0000000
--- a/newlib/libc/stdlib/getsubopt.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getsubopt.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * The SVID interface to getsubopt provides no way of figuring out which
- * part of the suboptions list wasn't matched.  This makes error messages
- * tricky...  The extern variable suboptarg is a pointer to the token
- * which didn't match.
- */
-char *suboptarg;
-
-int
-getsubopt(optionp, tokens, valuep)
-	char **optionp, **valuep;
-	char * const *tokens;
-{
-	int cnt;
-	char *p;
-
-	suboptarg = *valuep = NULL;
-
-	if (!optionp || !*optionp)
-		return(-1);
-
-	/* skip leading white-space, commas */
-	for (p = *optionp; *p && (*p == ',' || *p == ' ' || *p == '\t'); ++p);
-
-	if (!*p) {
-		*optionp = p;
-		return(-1);
-	}
-
-	/* save the start of the token, and skip the rest of the token. */
-	for (suboptarg = p;
-	    *++p && *p != ',' && *p != '=' && *p != ' ' && *p != '\t';);
-
-	if (*p) {
-		/*
-		 * If there's an equals sign, set the value pointer, and
-		 * skip over the value part of the token.  Terminate the
-		 * token.
-		 */
-		if (*p == '=') {
-			*p = '\0';
-			for (*valuep = ++p;
-			    *p && *p != ',' && *p != ' ' && *p != '\t'; ++p);
-			if (*p)
-				*p++ = '\0';
-		} else
-			*p++ = '\0';
-		/* Skip any whitespace or commas after this token. */
-		for (; *p && (*p == ',' || *p == ' ' || *p == '\t'); ++p);
-	}
-
-	/* set optionp for next round. */
-	*optionp = p;
-
-	for (cnt = 0; *tokens; ++tokens, ++cnt)
-		if (!strcmp(suboptarg, *tokens))
-			return(cnt);
-	return(-1);
-}
diff --git a/newlib/libc/stdlib/l64a.c b/newlib/libc/stdlib/l64a.c
deleted file mode 100644
index d415d04..0000000
--- a/newlib/libc/stdlib/l64a.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* l64a - convert long to radix-64 ascii string
- *          
- * Conversion is performed on at most 32-bits of input value starting 
- * from least significant bits to the most significant bits.
- *
- * The routine splits the input value into groups of 6 bits for up to 
- * 32 bits of input.  This means that the last group may be 2 bits 
- * (bits 30 and 31).
- * 
- * Each group of 6 bits forms a value from 0-63 which is converted into 
- * a character as follows:
- *         0 = '.'
- *         1 = '/'
- *         2-11 = '0' to '9'
- *        12-37 = 'A' to 'Z'
- *        38-63 = 'a' to 'z'
- *
- * When the remaining bits are zero or all 32 bits have been translated, 
- * a nul terminator is appended to the resulting string.  An input value of 
- * 0 results in an empty string.
- */
-
-#include <_ansi.h>
-#include <stdlib.h>
-#include <reent.h>
-
-static const char R64_ARRAY[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-char *
-_DEFUN (l64a, (value),
-     long value)
-{
-  return _l64a_r (_REENT, value);
-}
-
-char *
-_DEFUN (_l64a_r, (rptr, value),
-     struct _reent *rptr _AND
-     long value)
-{
-  char *ptr;
-  char *result;
-  int i, index;
-  unsigned long tmp = (unsigned long)value & 0xffffffff;
-
-  _REENT_CHECK_MISC(rptr);
-  result = _REENT_L64A_BUF(rptr);
-  ptr = result;
-
-  for (i = 0; i < 6; ++i)
-    {
-      if (tmp == 0)
-	{
-	  *ptr = '\0';
-	  break;
-	}
-
-      index = tmp & (64 - 1);
-      *ptr++ = R64_ARRAY[index];
-      tmp >>= 6;
-    }
-
-  return result;
-}
diff --git a/newlib/libc/stdlib/lcong48.c b/newlib/libc/stdlib/lcong48.c
index 548f327..6dae4e9 100644
--- a/newlib/libc/stdlib/lcong48.c
+++ b/newlib/libc/stdlib/lcong48.c
@@ -18,7 +18,6 @@ _DEFUN (_lcong48_r, (r, p),
        struct _reent *r _AND
        unsigned short p[7])
 {
-  _REENT_CHECK_RAND48(r);
   __rand48_seed[0] = p[0];
   __rand48_seed[1] = p[1];
   __rand48_seed[2] = p[2];
diff --git a/newlib/libc/stdlib/ldiv.c b/newlib/libc/stdlib/ldiv.c
index d7508f1..054b338 100644
--- a/newlib/libc/stdlib/ldiv.c
+++ b/newlib/libc/stdlib/ldiv.c
@@ -19,9 +19,9 @@ Divide
 @tex
 $n/d$,
 @end tex
-@ifnottex
+@ifinfo
 <[n]>/<[d]>,
-@end ifnottex
+@end ifinfo
 returning quotient and remainder as two long integers in a structure <<ldiv_t>>.
 
 RETURNS
diff --git a/newlib/libc/stdlib/ldtoa.c b/newlib/libc/stdlib/ldtoa.c
index 6a29dda..b332d2a 100644
--- a/newlib/libc/stdlib/ldtoa.c
+++ b/newlib/libc/stdlib/ldtoa.c
@@ -41,10 +41,7 @@ void _IO_ldtostr(long double *, char *, int, int, char);
  /* The exponent of 1.0 */
  #define EXONE (0x3fff)
 
- /* Maximum exponent digits - base 10 */
- #define MAX_EXP_DIGITS 5
-
-/* Control structure for long double conversion including rounding precision values.
+/* Control structure for long doublue conversion including rounding precision values.
  * rndprc can be set to 80 (if NE=6), 64, 56, 53, or 24 bits.
  */
 typedef struct
@@ -80,12 +77,6 @@ static void einfin(register short unsigned int *x, register LDPARMS *ldp);
 static void efloor(short unsigned int *x, short unsigned int *y, LDPARMS *ldp);
 static void etoasc(short unsigned int *x, char *string, int ndigs, int outformat, LDPARMS *ldp);
 
-union uconv
-{
-  unsigned short pe;
-  long double d;
-};
-
 #if LDBL_MANT_DIG == 24
 static void e24toe(short unsigned int *pe, short unsigned int *y, LDPARMS *ldp);
 #elif LDBL_MANT_DIG == 53
@@ -1868,7 +1859,7 @@ if((yy[NE-1] & 0x7fff) == 0 && (yy[NE-2] & 0x8000) == 0)
 #ifdef INFINITY
 /* Point to the exponent field.  */
 p = &yy[NE-1];
-if( (*p & 0x7fff) == 0x7fff )
+if( *p == 0x7fff )
 	{
 #ifdef NANS
 #ifdef IBMPC
@@ -2712,38 +2703,31 @@ _ldtoa_r (struct _reent *ptr, long double d, int mode, int ndigits, int *decpt,
 {
 unsigned short e[NI];
 char *s, *p;
-int i, j, k;
-int orig_ndigits;
+int k;
 LDPARMS rnd;
 LDPARMS *ldp = &rnd;
 char *outstr;
-char outbuf[NDEC + MAX_EXP_DIGITS + 10];
-union uconv du;
-du.d = d;
 
-orig_ndigits = ndigits;
 rnd.rlast = -1;
 rnd.rndprc = NBITS;
 
-  _REENT_CHECK_MP(ptr);
-
 /* reentrancy addition to use mprec storage pool */
-if (_REENT_MP_RESULT(ptr))
+if (ptr->_result)
   {
-    _REENT_MP_RESULT(ptr)->_k = _REENT_MP_RESULT_K(ptr);
-    _REENT_MP_RESULT(ptr)->_maxwds = 1 << _REENT_MP_RESULT_K(ptr);
-    Bfree (ptr, _REENT_MP_RESULT(ptr));
-    _REENT_MP_RESULT(ptr) = 0;
+    ptr->_result->_k = ptr->_result_k;
+    ptr->_result->_maxwds = 1 << ptr->_result_k;
+    Bfree (ptr, ptr->_result);
+    ptr->_result = 0;
   }
 
 #if LDBL_MANT_DIG == 24
-e24toe( &du.pe, e, ldp );
+e24toe( (unsigned short *)&d, e, ldp );
 #elif LDBL_MANT_DIG == 53
-e53toe( &du.pe, e, ldp );
+e53toe( (unsigned short *)&d, e, ldp );
 #elif LDBL_MANT_DIG == 64
-e64toe( &du.pe, e, ldp );
+e64toe( (unsigned short *)&d, e, ldp );
 #else
-e113toe( &du.pe, e, ldp );
+e113toe( (unsigned short *)&d, e, ldp );
 #endif
 
 if( eisneg(e) )
@@ -2758,14 +2742,18 @@ if( mode != 3 )
    For now, just ask for 20 digits which is enough but sometimes too many.  */
 if( mode == 0 )
         ndigits = 20;
-
 /* This sanity limit must agree with the corresponding one in etoasc, to
    keep straight the returned value of outexpon.  */
 if( ndigits > NDEC )
         ndigits = NDEC;
 
-etoasc( e, outbuf, ndigits, mode, ldp );
-s =  outbuf;
+/* reentrancy addition to use mprec storage pool */
+ptr->_result = Balloc (ptr, 3);
+ptr->_result_k = 3;
+outstr = (char *)ptr->_result;
+
+etoasc( e, outstr, ndigits, mode, ldp );
+s =  outstr;
 if( eisinf(e) || eisnan(e) )
         {
         *decpt = 9999;
@@ -2776,7 +2764,7 @@ if( eisinf(e) || eisnan(e) )
 /* Transform the string returned by etoasc into what the caller wants.  */
 
 /* Look for decimal point and delete it from the string. */
-s = outbuf;
+s = outstr;
 while( *s != '\0' )
         {
         if( *s == '.' )
@@ -2797,19 +2785,19 @@ while( *s != '\0' )
 nodecpt:
 
 /* Back up over the exponent field. */
-while( *s != 'E' && s > outbuf)
+while( *s != 'E' && s > outstr)
         --s;
 *s = '\0';
 
 stripspaces:
 
 /* Strip leading spaces and sign. */
-p = outbuf;
+p = outstr;
 while( *p == ' ' || *p == '-')
         ++p;
 
 /* Find new end of string.  */
-s = outbuf;
+s = outstr;
 while( (*s++ = *p++) != '\0' )
         ;
 --s;
@@ -2822,38 +2810,20 @@ else if( ndigits > ldp->outexpon )
 else
         k = ldp->outexpon;
 
-while( *(s-1) == '0' && ((s - outbuf) > k))
+while( *(s-1) == '0' && ((s - outstr) > k))
         *(--s) = '\0';
 
 /* In f format, flush small off-scale values to zero.
    Rounding has been taken care of by etoasc. */
 if( mode == 3 && ((ndigits + ldp->outexpon) < 0))
         {
-        s = outbuf;
+        s = outstr;
         *s = '\0';
         *decpt = 0;
         }
 
-/* reentrancy addition to use mprec storage pool */
-/* we want to have enough space to hold the formatted result */
-
-if (mode == 3) /* f format, account for sign + dec digits + decpt + frac */
-  i = *decpt + orig_ndigits + 3;
-else /* account for sign + max precision digs + E + exp sign + exponent */
-  i = orig_ndigits + MAX_EXP_DIGITS + 4;
-
-j = sizeof (__ULong);
-for (_REENT_MP_RESULT_K(ptr) = 0; sizeof (_Bigint) - sizeof (__ULong) + j <= i; j <<= 1)
-  _REENT_MP_RESULT_K(ptr)++;
-_REENT_MP_RESULT(ptr) = Balloc (ptr, _REENT_MP_RESULT_K(ptr));
-
-/* Copy from internal temporary buffer to permanent buffer.  */
-outstr = (char *)_REENT_MP_RESULT(ptr);
-strcpy (outstr, outbuf);
-
 if( rve )
-        *rve = outstr + (s - outbuf);
-
+        *rve = s;
 return outstr;
 }
 
@@ -2866,22 +2836,23 @@ int
 _ldcheck (long double *d)
 {
 unsigned short e[NI];
+char *s, *p;
+int k;
 LDPARMS rnd;
 LDPARMS *ldp = &rnd;
+char *outstr;
 
 rnd.rlast = -1;
 rnd.rndprc = NBITS;
 
-union uconv du;
-du.d = *d;
 #if LDBL_MANT_DIG == 24
-e24toe( &du.pe, e, ldp );
+e24toe( (unsigned short *)d, e, ldp );
 #elif LDBL_MANT_DIG == 53
-e53toe( &du.pe, e, ldp );
+e53toe( (unsigned short *)d, e, ldp );
 #elif LDBL_MANT_DIG == 64
-e64toe( &du.pe, e, ldp );
+e64toe( (unsigned short *)d, e, ldp );
 #else
-e113toe( &du.pe, e, ldp );
+e113toe( (unsigned short *)d, e, ldp );
 #endif
 
 if( (e[NE-1] & 0x7fff) == 0x7fff )
@@ -3230,7 +3201,7 @@ ldp->outexpon =  expon;
 
 long double _strtold (char *s, char **se)
 {
-  union uconv x;
+  long double x;
   LDPARMS rnd;
   LDPARMS *ldp = &rnd;
   int lenldstr;
@@ -3238,10 +3209,10 @@ long double _strtold (char *s, char **se)
   rnd.rlast = -1;
   rnd.rndprc = NBITS;
 
-  lenldstr = asctoeg( s, &x.pe, LDBL_MANT_DIG, ldp );
+  lenldstr = asctoeg( s, (unsigned short *)&x, LDBL_MANT_DIG, ldp );
   if (se)
     *se = s + lenldstr;
-  return x.d;
+  return x;
 }
 
 #define REASONABLE_LEN 200
diff --git a/newlib/libc/stdlib/llabs.c b/newlib/libc/stdlib/llabs.c
deleted file mode 100644
index 11246c3..0000000
--- a/newlib/libc/stdlib/llabs.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-FUNCTION
-<<llabs>>---compute the absolute value of an long long integer.
-
-INDEX
-        llabs
-
-ANSI_SYNOPSIS
-        #include <stdlib.h>
-        long long llabs(long long j);
-
-TRAD_SYNOPSIS
-        #include <stdlib.h>
-        long long llabs(<[j]>)
-        long long <[j]>;
-
-DESCRIPTION
-The <<llabs>> function computes the absolute value of the long long integer 
-argument <[j]> (also called the magnitude of <[j]>).
-
-The similar function <<labs>> uses and returns <<long>> rather than
-<<long long>> values.
-
-RETURNS
-A nonnegative long long integer.
-
-PORTABILITY
-<<llabs>> is ISO 9899 (C99) compatable.
-
-No supporting OS subroutines are required.
-*/
-
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <stdlib.h>
-
-long long
-_DEFUN(llabs, (j),
-       long long j)
-{
-	return (j < 0 ? -j : j);
-}
diff --git a/newlib/libc/stdlib/lldiv.c b/newlib/libc/stdlib/lldiv.c
deleted file mode 100644
index 6b853e4..0000000
--- a/newlib/libc/stdlib/lldiv.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-FUNCTION
-<<lldiv>>---divide two long long integers
-
-INDEX
-        lldiv
-
-ANSI_SYNOPSIS
-        #include <stdlib.h>
-        lldiv_t lldiv(long long <[n]>, long long <[d]>);
-
-TRAD_SYNOPSIS
-        #include <stdlib.h>
-        lldiv_t lldiv(<[n]>, <[d]>)
-        long long <[n]>, <[d]>;
-
-DESCRIPTION
-Divide
-@tex
-$n/d$,
-@end tex
-@ifnottex
-<[n]>/<[d]>,
-@end ifnottex
-returning quotient and remainder as two long long integers in a structure 
-<<lldiv_t>>.
-
-RETURNS
-The result is represented with the structure
-
-. typedef struct
-. {
-.  long long quot;
-.  long long rem;
-. } lldiv_t;
-
-where the <<quot>> field represents the quotient, and <<rem>> the
-remainder.  For nonzero <[d]>, if `<<<[r]> = ldiv(<[n]>,<[d]>);>>' then
-<[n]> equals `<<<[r]>.rem + <[d]>*<[r]>.quot>>'.
-
-To divide <<long>> rather than <<long long>> values, use the similar
-function <<ldiv>>.
-
-PORTABILITY
-<<lldiv>> is ISO 9899 (C99) compatable.
-
-No supporting OS subroutines are required.
-*/
-
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <stdlib.h>
-
-/*
- * The ANSI standard says that |r.quot| <= |n/d|, where
- * n/d is to be computed in infinite precision.  In other
- * words, we should always truncate the quotient towards
- * 0, never -infinity.
- *
- * Machine division and remainer may work either way when
- * one or both of n or d is negative.  If only one is
- * negative and r.quot has been truncated towards -inf,
- * r.rem will have the same sign as denom and the opposite
- * sign of num; if both are negative and r.quot has been
- * truncated towards -inf, r.rem will be positive (will
- * have the opposite sign of num).  These are considered
- * `wrong'.
- *
- * If both are num and denom are positive, r will always
- * be positive.
- *
- * This all boils down to:
- *      if num >= 0, but r.rem < 0, we got the wrong answer.
- * In that case, to get the right answer, add 1 to r.quot and
- * subtract denom from r.rem.
- */
-lldiv_t
-_DEFUN (lldiv, (number, denom), 
-       long long numer _AND long long denom)
-{
-	lldiv_t retval;
-
-	retval.quot = numer / denom;
-	retval.rem = numer % denom;
-	if (numer >= 0 && retval.rem < 0) {
-		retval.quot++;
-		retval.rem -= denom;
-	}
-	return (retval);
-}
-
diff --git a/newlib/libc/stdlib/lrand48.c b/newlib/libc/stdlib/lrand48.c
index bfc693b..2e850f2 100644
--- a/newlib/libc/stdlib/lrand48.c
+++ b/newlib/libc/stdlib/lrand48.c
@@ -17,7 +17,6 @@ long
 _DEFUN (_lrand48_r, (r),
        struct _reent *r)
 {
-  _REENT_CHECK_RAND48(r);
   __dorand48(r, __rand48_seed);
   return (long)((unsigned long) __rand48_seed[2] << 15) +
     ((unsigned long) __rand48_seed[1] >> 1);
diff --git a/newlib/libc/stdlib/malign.c b/newlib/libc/stdlib/malign.c
index 1eded30..d012d9b 100644
--- a/newlib/libc/stdlib/malign.c
+++ b/newlib/libc/stdlib/malign.c
@@ -1,4 +1,3 @@
-#ifndef MALLOC_PROVIDED
 /* malign.c -- a wrapper for memalign_r.  */
 
 #include <_ansi.h>
@@ -17,4 +16,3 @@ _DEFUN (memalign, (align, nbytes),
 }
 
 #endif
-#endif
diff --git a/newlib/libc/stdlib/mallocr.c b/newlib/libc/stdlib/mallocr.c
index cfa2554..fb9b7d8 100644
--- a/newlib/libc/stdlib/mallocr.c
+++ b/newlib/libc/stdlib/mallocr.c
@@ -168,6 +168,10 @@ int _dummy_mallocr = 1;
   MALLOC_ALIGNMENT          (default: NOT defined)
      Define this to 16 if you need 16 byte alignment instead of 8 byte alignment
      which is the normal default.
+  SIZE_T_SMALLER_THAN_LONG (default: NOT defined)
+     Define this when the platform you are compiling has sizeof(long) > sizeof(size_t).
+     The option causes some extra code to be generated to handle operations
+     that use size_t operands and have long results.
   REALLOC_ZERO_BYTES_FREES (default: NOT defined) 
      Define this if you think that realloc(p, 0) should be equivalent
      to free(p). Otherwise, since malloc returns a unique pointer for
@@ -267,13 +271,7 @@ extern "C" {
 #endif
 
 #include <stdio.h>    /* needed for malloc_stats */
-#include <limits.h>   /* needed for overflow checks */
-#include <errno.h>    /* needed to set errno to ENOMEM */
 
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
 
 /*
   Compile-time options
@@ -336,7 +334,6 @@ extern void __malloc_unlock();
 #define RDECL struct _reent *reent_ptr;
 #endif
 
-#define RERRNO reent_ptr->_errno
 #define RCALL reent_ptr,
 #define RONECALL reent_ptr
 
@@ -346,7 +343,6 @@ extern void __malloc_unlock();
 #define RARG
 #define RONEARG
 #define RDECL
-#define RERRNO errno
 #define RCALL
 #define RONECALL
 
@@ -447,10 +443,11 @@ extern void __malloc_unlock();
   fact that assignment from unsigned to signed won't sign extend.
 */
 
-#define long_sub_size_t(x, y)				\
-  (sizeof (long) > sizeof (INTERNAL_SIZE_T) && x < y	\
-   ? -(long) (y - x)					\
-   : (long) (x - y))
+#ifdef SIZE_T_SMALLER_THAN_LONG
+#define long_sub_size_t(x, y) ( (x < y) ? -((long)(y - x)) : (x - y) );
+#else
+#define long_sub_size_t(x, y) ( (long)(x - y) )
+#endif
 
 /*
   REALLOC_ZERO_BYTES_FREES should be set if a call to
@@ -490,10 +487,6 @@ extern void __malloc_unlock();
 
 #define HAVE_MEMCPY 
 
-/* Although the original macro is called USE_MEMCPY, newlib actually
-   uses memmove to handle cases whereby a platform's memcpy implementation
-   copies backwards and thus destructive overlap may occur in realloc
-   whereby we are reclaiming free memory prior to the old allocation.  */
 #ifndef USE_MEMCPY
 #ifdef HAVE_MEMCPY
 #define USE_MEMCPY 1
@@ -507,11 +500,9 @@ extern void __malloc_unlock();
 #if __STD_C
 void* memset(void*, int, size_t);
 void* memcpy(void*, const void*, size_t);
-void* memmove(void*, const void*, size_t);
 #else
 Void_t* memset();
 Void_t* memcpy();
-Void_t* memmove();
 #endif
 #endif
 
@@ -553,7 +544,7 @@ do {                                                                          \
                                      *mcdst++ = *mcsrc++;                     \
                                      *mcdst++ = *mcsrc++;                     \
                                      *mcdst   = *mcsrc  ;                     \
-  } else memmove(dest, src, mcsz);                                             \
+  } else memcpy(dest, src, mcsz);                                             \
 } while(0)
 
 #else /* !USE_MEMCPY */
@@ -1085,7 +1076,7 @@ struct mallinfo mALLINFo();
 
 #ifdef WIN32
 
-#define AlignPage(add) (((add) + (malloc_getpagesize-1)) & \
+#define AlignPage(add) (((add) + (malloc_getpagesize-1)) &
 ~(malloc_getpagesize-1))
 
 /* resrve 64MB to insure large contiguous space */ 
@@ -1408,8 +1399,8 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 /* pad request bytes into a usable size */
 
 #define request2size(req) \
- (((unsigned long)((req) + (SIZE_SZ + MALLOC_ALIGN_MASK)) < \
-  (unsigned long)(MINSIZE + MALLOC_ALIGN_MASK)) ? ((MINSIZE + MALLOC_ALIGN_MASK) & ~(MALLOC_ALIGN_MASK)) : \
+ (((long)((req) + (SIZE_SZ + MALLOC_ALIGN_MASK)) < \
+  (long)(MINSIZE + MALLOC_ALIGN_MASK)) ? ((MINSIZE + MALLOC_ALIGN_MASK) & ~(MALLOC_ALIGN_MASK)) : \
    (((req) + (SIZE_SZ + MALLOC_ALIGN_MASK)) & ~(MALLOC_ALIGN_MASK)))
 
 /* Check if m has acceptable alignment */
@@ -1945,8 +1936,8 @@ static void do_check_malloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s;
 {                                                                             \
   BK = P->bk;                                                                 \
   FD = P->fd;                                                                 \
-  FD->bk = BK;                                                        \
-  BK->fd = FD;                                                        \
+  FD->bk = BK;                                                                \
+  BK->fd = FD;                                                                \
 }                                                                             \
 
 /* Place p as the last remainder */
@@ -2137,7 +2128,6 @@ static void malloc_extend_top(RARG nb) RDECL INTERNAL_SIZE_T nb;
   char*     brk;                  /* return value from sbrk */
   INTERNAL_SIZE_T front_misalign; /* unusable bytes at front of sbrked space */
   INTERNAL_SIZE_T correction;     /* bytes for 2nd sbrk call */
-  int correction_failed = 0;      /* whether we should relax the assertion */
   char*     new_brk;              /* return of 2nd sbrk call */
   INTERNAL_SIZE_T top_size;       /* new size of top chunk */
 
@@ -2162,13 +2152,11 @@ static void malloc_extend_top(RARG nb) RDECL INTERNAL_SIZE_T nb;
   /* Fail if sbrk failed or if a foreign sbrk call killed our space */
   if (brk == (char*)(MORECORE_FAILURE) || 
       (brk < old_end && old_top != initial_top))
-    return;
+    return;     
 
   sbrked_mem += sbrk_size;
 
-  if (brk == old_end /* can just add bytes to current top, unless
-			previous correction failed */
-      && ((POINTER_UINT)old_end & (pagesz - 1)) == 0)
+  if (brk == old_end) /* can just add bytes to current top */
   {
     top_size = sbrk_size + old_top_size;
     set_head(top, top_size | PREV_INUSE);
@@ -2195,12 +2183,7 @@ static void malloc_extend_top(RARG nb) RDECL INTERNAL_SIZE_T nb;
 
     /* Allocate correction */
     new_brk = (char*)(MORECORE (correction));
-    if (new_brk == (char*)(MORECORE_FAILURE))
-      {
-	correction = 0;
-	correction_failed = 1;
-	new_brk = brk;
-      }
+    if (new_brk == (char*)(MORECORE_FAILURE)) return; 
 
     sbrked_mem += correction;
 
@@ -2245,8 +2228,7 @@ static void malloc_extend_top(RARG nb) RDECL INTERNAL_SIZE_T nb;
 #endif
 
   /* We always land on a page boundary */
-  assert(((unsigned long)((char*)top + top_size) & (pagesz - 1)) == 0
-	 || correction_failed);
+  assert(((unsigned long)((char*)top + top_size) & (pagesz - 1)) == 0);
 }
 
 #endif /* DEFINE_MALLOC */
@@ -2342,13 +2324,6 @@ Void_t* mALLOc(RARG bytes) RDECL size_t bytes;
 
   INTERNAL_SIZE_T nb  = request2size(bytes);  /* padded request size; */
 
-  /* Check for overflow and just fail, if so. */
-  if (nb > INT_MAX || nb < bytes)
-  {
-    RERRNO = ENOMEM;
-    return 0;
-  }
-
   MALLOC_LOCK;
 
   /* Check for exact match in a bin */
@@ -2808,13 +2783,6 @@ Void_t* rEALLOc(RARG oldmem, bytes) RDECL Void_t* oldmem; size_t bytes;
 
   nb = request2size(bytes);
 
-  /* Check for overflow and just fail, if so. */
-  if (nb > INT_MAX || nb < bytes)
-  {
-    RERRNO = ENOMEM;
-    return 0;
-  }
-
 #if HAVE_MMAP
   if (chunk_is_mmapped(oldp)) 
   {
@@ -3043,14 +3011,6 @@ Void_t* mEMALIGn(RARG alignment, bytes) RDECL size_t alignment; size_t bytes;
   /* Call malloc with worst case padding to hit alignment. */
 
   nb = request2size(bytes);
-
-  /* Check for overflow. */
-  if (nb > INT_MAX || nb < bytes)
-  {
-    RERRNO = ENOMEM;
-    return 0;
-  }
-
   m  = (char*)(mALLOc(RCALL nb + alignment + MINSIZE));
 
   if (m == 0) return 0; /* propagate failure */
@@ -3502,7 +3462,6 @@ void malloc_stats(RONEARG) RDECL
   MALLOC_UNLOCK;
 
 #ifdef INTERNAL_NEWLIB
-  _REENT_SMALL_CHECK_INIT(reent_ptr);
   fp = _stderr_r(reent_ptr);
 #define fprintf fiprintf
 #else
diff --git a/newlib/libc/stdlib/mblen.c b/newlib/libc/stdlib/mblen.c
index 6df27b9..d9b774e 100644
--- a/newlib/libc/stdlib/mblen.c
+++ b/newlib/libc/stdlib/mblen.c
@@ -16,20 +16,20 @@ TRAD_SYNOPSIS
 	size_t <[n]>;
 
 DESCRIPTION
-When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
+When MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
 implementation of <<mblen>>.  In this case, the
 only ``multi-byte character sequences'' recognized are single bytes,
 and thus <<1>> is returned unless <[s]> is the null pointer or
 has a length of 0 or is the empty string.
 
-When _MB_CAPABLE is defined, this routine calls <<_mbtowc_r>> to perform
+When MB_CAPABLE is defined, this routine calls <<_mbtowc_r>> to perform
 the conversion, passing a state variable to allow state dependent
 decoding.  The result is based on the locale setting which may
 be restricted to a defined set of locales.
 
 RETURNS
 This implementation of <<mblen>> returns <<0>> if
-<[s]> is <<NULL>> or the empty string; it returns <<1>> if not _MB_CAPABLE or
+<[s]> is <<NULL>> or the empty string; it returns <<1>> if not MB_CAPABLE or
 the character is a single-byte character; it returns <<-1>>
 if the multi-byte character is invalid; otherwise it returns
 the number of bytes in the multibyte character.
@@ -43,37 +43,24 @@ effects vary with the locale.
 
 #ifndef _REENT_ONLY
 
-#include <newlib.h>
 #include <stdlib.h>
-#include <wchar.h>
 
 int
 _DEFUN (mblen, (s, n), 
         const char *s _AND
         size_t n)
 {
-#ifdef _MB_CAPABLE
-  int retval = 0;
-  mbstate_t *state;
-  
-  _REENT_CHECK_MISC(_REENT);
-  state = &(_REENT_MBLEN_STATE(_REENT));
-  retval = _mbtowc_r (_REENT, NULL, s, n, state);
-  if (retval < 0)
-    {
-      state->__count = 0;
-      return -1;
-    }
-  else
-    return retval;
-  
-#else /* not _MB_CAPABLE */
-  if (s == NULL || *s == '\0')
-    return 0;
-  if (n == 0)
-    return -1;
-  return 1;
-#endif /* not _MB_CAPABLE */
+#ifdef MB_CAPABLE
+        static int state;
+
+        return _mbtowc_r (_REENT, NULL, s, n, &state);
+#else /* not MB_CAPABLE */
+        if (s == NULL || *s == '\0')
+                return 0;
+        if (n == 0)
+                return -1;
+        return 1;
+#endif /* not MB_CAPABLE */
 }
 
 #endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdlib/mblen_r.c b/newlib/libc/stdlib/mblen_r.c
index 9361f65..22d1d40 100644
--- a/newlib/libc/stdlib/mblen_r.c
+++ b/newlib/libc/stdlib/mblen_r.c
@@ -18,20 +18,20 @@ TRAD_SYNOPSIS
         int *<[state]>;
 
 DESCRIPTION
-When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
+When MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
 implementation of <<_mblen_r>>.  In this case, the
 only ``multi-byte character sequences'' recognized are single bytes,
 and thus <<1>> is returned unless <[s]> is the null pointer or
 has a length of 0 or is the empty string.
 
-When _MB_CAPABLE is defined, this routine calls <<_mbtowc_r>> to perform
+When MB_CAPABLE is defined, this routine calls <<_mbtowc_r>> to perform
 the conversion, passing a state variable to allow state dependent
 decoding.  The result is based on the locale setting which may
 be restricted to a defined set of locales.
 
 RETURNS
 This implementation of <<_mblen_r>> returns <<0>> if
-<[s]> is <<NULL>> or the empty string; it returns <<1>> if not _MB_CAPABLE or
+<[s]> is <<NULL>> or the empty string; it returns <<1>> if not MB_CAPABLE or
 the character is a single-byte character; it returns <<-1>>
 if the multi-byte character is invalid; otherwise it returns
 the number of bytes in the multibyte character.
@@ -43,34 +43,24 @@ effects vary with the locale.
 <<_mblen_r>> requires no supporting OS subroutines.
 */
 
-#include <newlib.h>
 #include <stdlib.h>
-#include <wchar.h>
 
 int
 _DEFUN (_mblen_r, (r, s, n, state), 
         struct _reent *r    _AND
         const char *s _AND
         size_t n _AND
-        mbstate_t *state)
+        int *state)
 {
-#ifdef _MB_CAPABLE
-  int retval;
-  retval = _mbtowc_r (r, NULL, s, n, state);
+#ifdef MB_CAPABLE
 
-  if (retval < 0)
-    {
-      state->__count = 0;
-      return -1;
-    }
-
-  return retval;
-#else /* not _MB_CAPABLE */
-  if (s == NULL || *s == '\0')
-    return 0;
-  if (n == 0)
-    return -1;
-  return 1;
-#endif /* not _MB_CAPABLE */
+        return _mbtowc_r (r, NULL, s, n, state);
+#else /* not MB_CAPABLE */
+        if (s == NULL || *s == '\0')
+                return 0;
+        if (n == 0)
+                return -1;
+        return 1;
+#endif /* not MB_CAPABLE */
 }
 
diff --git a/newlib/libc/stdlib/mbrlen.c b/newlib/libc/stdlib/mbrlen.c
deleted file mode 100644
index ac9aa32..0000000
--- a/newlib/libc/stdlib/mbrlen.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <reent.h>
-#include <newlib.h>
-#include <wchar.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-
-size_t
-mbrlen(const char *s, size_t n, mbstate_t *ps)
-{
-#ifdef _MB_CAPABLE
-  if (ps == NULL)
-    {
-      _REENT_CHECK_MISC(_REENT);
-      ps = &(_REENT_MBRLEN_STATE(_REENT));
-    }
-#endif
-
-  return mbrtowc(NULL, s, n, ps);
-}
diff --git a/newlib/libc/stdlib/mbrtowc.c b/newlib/libc/stdlib/mbrtowc.c
deleted file mode 100644
index c5e700d..0000000
--- a/newlib/libc/stdlib/mbrtowc.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <reent.h>
-#include <newlib.h>
-#include <wchar.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
-size_t
-_DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps),
-	struct _reent *ptr _AND
-	wchar_t *pwc _AND
-	const char *s _AND
-	size_t n _AND
-	mbstate_t *ps)
-{
-  int retval = 0;
-
-#ifdef _MB_CAPABLE
-  if (ps == NULL)
-    {
-      _REENT_CHECK_MISC(ptr);
-      ps = &(_REENT_MBRTOWC_STATE(ptr));
-    }
-#endif
-
-  if (s == NULL)
-    retval = _mbtowc_r (ptr, NULL, "", 1, ps);
-  else
-    retval = _mbtowc_r (ptr, pwc, s, n, ps);
-
-  if (retval == -1)
-    {
-      ps->__count = 0;
-      ptr->_errno = EILSEQ;
-      return (size_t)(-1);
-    }
-  else
-    return (size_t)retval;
-}
-
-#ifndef _REENT_ONLY
-size_t
-_DEFUN (mbrtowc, (pwc, s, n, ps),
-	wchar_t *pwc _AND
-	const char *s _AND
-	size_t n _AND
-	mbstate_t *ps)
-{
-  return _mbrtowc_r (_REENT, pwc, s, n, ps);
-}
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdlib/mbsinit.c b/newlib/libc/stdlib/mbsinit.c
deleted file mode 100644
index e32369a..0000000
--- a/newlib/libc/stdlib/mbsinit.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <reent.h>
-#include <wchar.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-
-int
-mbsinit(const mbstate_t *ps)
-{
-  if (ps == NULL || ps->__count == 0)
-    return 1;
-  else
-    return 0;
-}
diff --git a/newlib/libc/stdlib/mbsrtowcs.c b/newlib/libc/stdlib/mbsrtowcs.c
deleted file mode 100644
index 2eaa0fe..0000000
--- a/newlib/libc/stdlib/mbsrtowcs.c
+++ /dev/null
@@ -1,80 +0,0 @@
-#include <reent.h>
-#include <newlib.h>
-#include <wchar.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-
-size_t
-_DEFUN (_mbsrtowcs_r, (r, dst, src, n, ps), 
-	struct _reent *r _AND
-	wchar_t *dst _AND
-	const char **src _AND
-	size_t n _AND
-	mbstate_t *ps)
-{
-  wchar_t *ptr = dst;
-  const char *tmp_src;
-  size_t max;
-  size_t count = 0;
-  int bytes;
-
-#ifdef _MB_CAPABLE
-  if (ps == NULL)
-    {
-      _REENT_CHECK_MISC(r);
-      ps = &(_REENT_MBSRTOWCS_STATE(r));
-    }
-#endif
-
-  if (dst == NULL)
-    {
-      /* Ignore original n value and do not alter src pointer if the
-         dst pointer is NULL.  */
-      n = (size_t)-1;
-      tmp_src = *src;
-      src = &tmp_src;
-    }      
-  
-  max = n;
-  while (n > 0)
-    {
-      bytes = _mbrtowc_r (r, ptr, *src, MB_CUR_MAX, ps);
-      if (bytes > 0)
-	{
-	  *src += bytes;
-	  ++count;
-	  ptr = (dst == NULL) ? NULL : ptr + 1;
-	  --n;
-	}
-      else if (bytes == -2)
-	{
-	  *src += MB_CUR_MAX;
-	}
-      else if (bytes == 0)
-	{
-	  *src = NULL;
-	  return count;
-	}
-      else
-	{
-	  ps->__count = 0;
-	  r->_errno = EILSEQ;
-	  return (size_t)-1;
-	}
-    }
-
-  return (size_t)max;
-}
-
-#ifndef _REENT_ONLY
-size_t
-_DEFUN (mbsrtowcs, (dst, src, len, ps),
-	wchar_t *dst _AND
-	const char **src _AND
-	size_t len _AND
-	mbstate_t *ps)
-{
-  return _mbsrtowcs_r (_REENT, dst, src, len, ps);
-}
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdlib/mbstowcs.c b/newlib/libc/stdlib/mbstowcs.c
index 334b5f5..fee621a 100644
--- a/newlib/libc/stdlib/mbstowcs.c
+++ b/newlib/libc/stdlib/mbstowcs.c
@@ -17,13 +17,13 @@ TRAD_SYNOPSIS
 	size_t <[n]>;
 
 DESCRIPTION
-When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
+When MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
 implementation of <<mbstowcs>>.  In this case, the
 only ``multi-byte character sequences'' recognized are single bytes,
 and they are ``converted'' to wide-char versions simply by byte
 extension.
 
-When _MB_CAPABLE is defined, this routine calls <<_mbstowcs_r>> to perform
+When MB_CAPABLE is defined, this routine calls <<_mbstowcs_r>> to perform
 the conversion, passing a state variable to allow state dependent
 decoding.  The result is based on the locale setting which may
 be restricted to a defined set of locales.
@@ -31,7 +31,7 @@ be restricted to a defined set of locales.
 RETURNS
 This implementation of <<mbstowcs>> returns <<0>> if
 <[s]> is <<NULL>> or is the empty string; 
-it returns <<-1>> if _MB_CAPABLE and one of the
+it returns <<-1>> if MB_CAPABLE and one of the
 multi-byte characters is invalid or incomplete;
 otherwise it returns the minimum of: <<n>> or the
 number of multi-byte characters in <<s>> plus 1 (to
@@ -49,9 +49,7 @@ effects vary with the locale.
 
 #ifndef _REENT_ONLY
 
-#include <newlib.h>
 #include <stdlib.h>
-#include <wchar.h>
 
 size_t
 _DEFUN (mbstowcs, (pwcs, s, n),
@@ -59,25 +57,24 @@ _DEFUN (mbstowcs, (pwcs, s, n),
         const char *s _AND
         size_t n)
 {
-#ifdef _MB_CAPABLE
-  mbstate_t state;
-  state.__count = 0;
-  
-  return _mbstowcs_r (_REENT, pwcs, s, n, &state);
-#else /* not _MB_CAPABLE */
-  
-  int count = 0;
-  
-  if (n != 0) {
-    do {
-      if ((*pwcs++ = (wchar_t) *s++) == 0)
-	break;
-      count++;
-    } while (--n != 0);
-  }
-  
-  return count;
-#endif /* not _MB_CAPABLE */
+#ifdef MB_CAPABLE
+        int state = 0;
+
+        return _mbstowcs_r (_REENT, pwcs, s, n, &state);
+#else /* not MB_CAPABLE */
+
+        int count = 0;
+
+        if (n != 0) {
+                do {
+                        if ((*pwcs++ = (wchar_t) *s++) == 0)
+                                break;
+                        count++;
+                } while (--n != 0);
+        }
+
+        return count;
+#endif /* not MB_CAPABLE */
 }
 
 #endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdlib/mbstowcs_r.c b/newlib/libc/stdlib/mbstowcs_r.c
index c6130b2..5478849 100644
--- a/newlib/libc/stdlib/mbstowcs_r.c
+++ b/newlib/libc/stdlib/mbstowcs_r.c
@@ -1,5 +1,4 @@
 #include <stdlib.h>
-#include <wchar.h>
 
 size_t
 _DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state),
@@ -7,7 +6,7 @@ _DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state),
         wchar_t       *pwcs _AND
         const char    *s    _AND
         size_t         n    _AND
-        mbstate_t     *state)
+        int           *state)
 {
   wchar_t *ptr = pwcs;
   size_t max = n;
@@ -17,11 +16,8 @@ _DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state),
   while (n > 0)
     {
       bytes = _mbtowc_r (r, ptr, t, MB_CUR_MAX, state);
-      if (bytes < 0)
-	{
-	  state->__count = 0;
-	  return -1;
-	}
+      if (bytes == -1)
+        return -1;
       else if (bytes == 0)
         return ptr - pwcs;
       t += bytes;
diff --git a/newlib/libc/stdlib/mbtowc.c b/newlib/libc/stdlib/mbtowc.c
index 3f34b8a..5e34fe3 100644
--- a/newlib/libc/stdlib/mbtowc.c
+++ b/newlib/libc/stdlib/mbtowc.c
@@ -17,7 +17,7 @@ TRAD_SYNOPSIS
 	size_t <[n]>;
 
 DESCRIPTION
-When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
+When MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
 implementation of <<mbtowc>>.  In this case,
 only ``multi-byte character sequences'' recognized are single bytes,
 and they are ``converted'' to themselves.
@@ -25,7 +25,7 @@ Each call to <<mbtowc>> copies one character from <<*<[s]>>> to
 <<*<[pwc]>>>, unless <[s]> is a null pointer.  The argument n
 is ignored.
 
-When _MB_CAPABLE is defined, this routine calls <<_mbtowc_r>> to perform
+When MB_CAPABLE is defined, this routine calls <<_mbtowc_r>> to perform
 the conversion, passing a state variable to allow state dependent
 decoding.  The result is based on the locale setting which may
 be restricted to a defined set of locales.
@@ -33,7 +33,7 @@ be restricted to a defined set of locales.
 RETURNS
 This implementation of <<mbtowc>> returns <<0>> if
 <[s]> is <<NULL>> or is the empty string; 
-it returns <<1>> if not _MB_CAPABLE or
+it returns <<1>> if not MB_CAPABLE or
 the character is a single-byte character; it returns <<-1>>
 if n is <<0>> or the multi-byte character is invalid; 
 otherwise it returns the number of bytes in the multibyte character.
@@ -51,9 +51,7 @@ effects vary with the locale.
 
 #ifndef _REENT_ONLY
 
-#include <newlib.h>
 #include <stdlib.h>
-#include <wchar.h>
 
 int
 _DEFUN (mbtowc, (pwc, s, n),
@@ -61,30 +59,19 @@ _DEFUN (mbtowc, (pwc, s, n),
         const char *s _AND
         size_t n)
 {
-#ifdef _MB_CAPABLE
-  int retval = 0;
-  mbstate_t *ps;
-
-  _REENT_CHECK_MISC(_REENT);
-  ps = &(_REENT_MBTOWC_STATE(_REENT));
-  
-  retval = _mbtowc_r (_REENT, pwc, s, n, ps);
-  
-  if (retval < 0)
-    {
-      ps->__count = 0;
-      return -1;
-    }
-  return retval;
-#else /* not _MB_CAPABLE */
-  if (s == NULL)
-    return 0;
-  if (n == 0)
-    return -1;
-  if (pwc)
-    *pwc = (wchar_t) *s;
-  return (*s != '\0');
-#endif /* not _MB_CAPABLE */
+#ifdef MB_CAPABLE
+        static int state;
+
+        return _mbtowc_r (_REENT, pwc, s, n, &state);
+#else /* not MB_CAPABLE */
+        if (s == NULL)
+                return 0;
+        if (n == 0)
+                return -1;
+        if (pwc)
+                *pwc = (wchar_t) *s;
+        return (*s != '\0');
+#endif /* not MB_CAPABLE */
 }
 
 #endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
index 7f0dd11..4bf3023 100644
--- a/newlib/libc/stdlib/mbtowc_r.c
+++ b/newlib/libc/stdlib/mbtowc_r.c
@@ -1,16 +1,13 @@
-#include <newlib.h>
 #include <stdlib.h>
 #include <locale.h>
 #include "mbctype.h"
-#include <wchar.h>
-#include <string.h>
 
-#ifdef _MB_CAPABLE
+#ifdef MB_CAPABLE
 typedef enum { ESCAPE, DOLLAR, BRACKET, AT, B, J, 
                NUL, JIS_CHAR, OTHER, JIS_C_NUM } JIS_CHAR_TYPE;
-typedef enum { ASCII, JIS, A_ESC, A_ESC_DL, JIS_1, J_ESC, J_ESC_BR,
-               INV, JIS_S_NUM } JIS_STATE; 
-typedef enum { COPY_A, COPY_J1, COPY_J2, MAKE_A, NOOP, EMPTY, ERROR } JIS_ACTION;
+typedef enum { ASCII, A_ESC, A_ESC_DL, JIS, JIS_1, JIS_2, J_ESC, J_ESC_BR,
+               J2_ESC, J2_ESC_BR, DONE, INV, JIS_S_NUM } JIS_STATE; 
+typedef enum { COPY_A, COPY_J, COPY_J2, MAKE_A, MAKE_J, NOOP, EMPTY, ERROR } JIS_ACTION;
 
 /************************************************************************************** 
  * state/action tables for processing JIS encoding
@@ -21,31 +18,32 @@ typedef enum { COPY_A, COPY_J1, COPY_J2, MAKE_A, NOOP, EMPTY, ERROR } JIS_ACTION
 
 static JIS_STATE JIS_state_table[JIS_S_NUM][JIS_C_NUM] = {
 /*              ESCAPE   DOLLAR    BRACKET   AT       B       J        NUL      JIS_CHAR  OTHER */
-/* ASCII */   { A_ESC,   ASCII,    ASCII,    ASCII,   ASCII,  ASCII,   ASCII,   ASCII,    ASCII },
+/* ASCII */   { A_ESC,   DONE,     DONE,     DONE,    DONE,   DONE,    DONE,    DONE,     DONE },
+/* A_ESC */   { DONE,    A_ESC_DL, DONE,     DONE,    DONE,   DONE,    DONE,    DONE,     DONE },
+/* A_ESC_DL */{ DONE,    DONE,     DONE,     JIS,     JIS,    DONE,    DONE,    DONE,     DONE }, 
 /* JIS */     { J_ESC,   JIS_1,    JIS_1,    JIS_1,   JIS_1,  JIS_1,   INV,     JIS_1,    INV },
-/* A_ESC */   { ASCII,   A_ESC_DL, ASCII,    ASCII,   ASCII,  ASCII,   ASCII,   ASCII,    ASCII },
-/* A_ESC_DL */{ ASCII,   ASCII,    ASCII,    JIS,     JIS,    ASCII,   ASCII,   ASCII,    ASCII }, 
-/* JIS_1 */   { INV,     JIS,      JIS,      JIS,     JIS,    JIS,     INV,     JIS,      INV },
+/* JIS_1 */   { INV,     JIS_2,    JIS_2,    JIS_2,   JIS_2,  JIS_2,   INV,     JIS_2,    INV },
+/* JIS_2 */   { J2_ESC,  DONE,     DONE,     DONE,    DONE,   DONE,    INV,     DONE,     DONE },
 /* J_ESC */   { INV,     INV,      J_ESC_BR, INV,     INV,    INV,     INV,     INV,      INV },
 /* J_ESC_BR */{ INV,     INV,      INV,      INV,     ASCII,  ASCII,   INV,     INV,      INV },
+/* J2_ESC */  { INV,     INV,      J2_ESC_BR,INV,     INV,    INV,     INV,     INV,      INV },
+/* J2_ESC_BR*/{ INV,     INV,      INV,      INV,     DONE,   DONE,    INV,     INV,      INV },
 };
 
 static JIS_ACTION JIS_action_table[JIS_S_NUM][JIS_C_NUM] = {
 /*              ESCAPE   DOLLAR    BRACKET   AT       B        J        NUL      JIS_CHAR  OTHER */
 /* ASCII */   { NOOP,    COPY_A,   COPY_A,   COPY_A,  COPY_A,  COPY_A,  EMPTY,   COPY_A,  COPY_A},
-/* JIS */     { NOOP,    COPY_J1,  COPY_J1,  COPY_J1, COPY_J1, COPY_J1, ERROR,   COPY_J1, ERROR },
 /* A_ESC */   { COPY_A,  NOOP,     COPY_A,   COPY_A,  COPY_A,  COPY_A,  COPY_A,  COPY_A,  COPY_A},
-/* A_ESC_DL */{ COPY_A,  COPY_A,   COPY_A,   NOOP,    NOOP,    COPY_A,  COPY_A,  COPY_A,  COPY_A},
-/* JIS_1 */   { ERROR,   COPY_J2,  COPY_J2,  COPY_J2, COPY_J2, COPY_J2, ERROR,   COPY_J2, ERROR },
+/* A_ESC_DL */{ COPY_A,  COPY_A,   COPY_A,   MAKE_J,  MAKE_J,  COPY_A,  COPY_A,  COPY_A,  COPY_A},
+/* JIS */     { NOOP,    NOOP,     NOOP,     NOOP,    NOOP,    NOOP,    ERROR,   NOOP,    ERROR },
+/* JIS_1 */   { ERROR,   NOOP,     NOOP,     NOOP,    NOOP,    NOOP,    ERROR,   NOOP,    ERROR },
+/* JIS_2 */   { NOOP,    COPY_J2,  COPY_J2,  COPY_J2, COPY_J2, COPY_J2, ERROR,   COPY_J2, COPY_J2},
 /* J_ESC */   { ERROR,   ERROR,    NOOP,     ERROR,   ERROR,   ERROR,   ERROR,   ERROR,   ERROR },
-/* J_ESC_BR */{ ERROR,   ERROR,    ERROR,    ERROR,   MAKE_A,  MAKE_A,  ERROR,   ERROR,   ERROR },
+/* J_ESC_BR */{ ERROR,   ERROR,    ERROR,    ERROR,   NOOP,    NOOP,    ERROR,   ERROR,   ERROR },
+/* J2_ESC */  { ERROR,   ERROR,    NOOP,     ERROR,   ERROR,   ERROR,   ERROR,   ERROR,   ERROR },
+/* J2_ESC_BR*/{ ERROR,   ERROR,    ERROR,    ERROR,   COPY_J,  COPY_J,  ERROR,   ERROR,   ERROR },
 };
-#endif /* _MB_CAPABLE */
-
-/* we override the mbstate_t __count field for more complex encodings and use it store a state value */
-#define __state __count
-
-extern char __lc_ctype[12];
+#endif /* MB_CAPABLE */
 
 int
 _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
@@ -53,7 +51,7 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
         wchar_t       *pwc _AND 
         const char    *s   _AND        
         size_t         n   _AND
-        mbstate_t      *state)
+        int           *state)
 {
   wchar_t dummy;
   unsigned char *t = (unsigned char *)s;
@@ -62,330 +60,67 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
     pwc = &dummy;
 
   if (s != NULL && n == 0)
-    return -2;
+    return -1;
 
-#ifdef _MB_CAPABLE
-  if (__lc_ctype == NULL ||
-      (strlen (__lc_ctype) <= 1))
+#ifdef MB_CAPABLE
+  if (r->_current_locale == NULL ||
+      (strlen (r->_current_locale) <= 1))
     { /* fall-through */ }
-  else if (!strcmp (__lc_ctype, "C-UTF-8"))
-    {
-      int ch;
-      int i = 0;
-
-      if (s == NULL)
-        return 0; /* UTF-8 character encodings are not state-dependent */
-
-      if (state->__count == 0)
-	ch = t[i++];
-      else
-	{
-	  ++n;
-	  ch = state->__value.__wchb[0];
-	}
-
-      if (ch == '\0')
-	{
-	  *pwc = 0;
-	  state->__count = 0;
-	  return 0; /* s points to the null character */
-	}
-
-      if (ch >= 0x0 && ch <= 0x7f)
-	{
-	  /* single-byte sequence */
-	  state->__count = 0;
-	  *pwc = ch;
-	  return 1;
-	}
-      else if (ch >= 0xc0 && ch <= 0xdf)
-	{
-	  /* two-byte sequence */
-	  state->__value.__wchb[0] = ch;
-	  state->__count = 1;
-	  if (n < 2)
-	    return -2;
-	  ch = t[i++];
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  if (state->__value.__wchb[0] < 0xc2)
-	    /* overlong UTF-8 sequence */
-	    return -1;
-	  state->__count = 0;
-	  *pwc = (wchar_t)((state->__value.__wchb[0] & 0x1f) << 6)
-	    |    (wchar_t)(ch & 0x3f);
-	  return i;
-	}
-      else if (ch >= 0xe0 && ch <= 0xef)
-	{
-	  /* three-byte sequence */
-	  wchar_t tmp;
-	  state->__value.__wchb[0] = ch;
-	  if (state->__count == 0)
-	    state->__count = 1;
-	  else
-	    ++n;
-	  if (n < 2)
-	    return -2;
-	  ch = (state->__count == 1) ? t[i++] : state->__value.__wchb[1];
-	  if (state->__value.__wchb[0] == 0xe0 && ch < 0xa0)
-	    /* overlong UTF-8 sequence */
-	    return -1;
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  state->__value.__wchb[1] = ch;
-	  state->__count = 2;
-	  if (n < 3)
-	    return -2;
-	  ch = t[i++];
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  state->__count = 0;
-	  tmp = (wchar_t)((state->__value.__wchb[0] & 0x0f) << 12)
-	    |    (wchar_t)((state->__value.__wchb[1] & 0x3f) << 6)
-	    |     (wchar_t)(ch & 0x3f);
-	
-	  if (tmp >= 0xd800 && tmp <= 0xdfff)
-	    return -1;
-	  *pwc = tmp;
-	  return i;
-	}
-      else if (ch >= 0xf0 && ch <= 0xf7)
-	{
-	  /* four-byte sequence */
-	  if (sizeof(wchar_t) < 4)
-	    return -1; /* we can't store such a value */
-	  state->__value.__wchb[0] = ch;
-	  if (state->__count == 0)
-	    state->__count = 1;
-	  else
-	    ++n;
-	  if (n < 2)
-	    return -2;
-	  ch = (state->__count == 1) ? t[i++] : state->__value.__wchb[1];
-	  if (state->__value.__wchb[0] == 0xf0 && ch < 0x90)
-	    /* overlong UTF-8 sequence */
-	    return -1;
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  state->__value.__wchb[1] = ch;
-	  if (state->__count == 1)
-	    state->__count = 2;
-	  else
-	    ++n;
-	  if (n < 3)
-	    return -2;
-	  ch = (state->__count == 2) ? t[i++] : state->__value.__wchb[2];
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  state->__value.__wchb[2] = ch;
-	  state->__count = 3;
-	  if (n < 4)
-	    return -2;
-	  ch = t[i++];
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  *pwc = (wchar_t)((state->__value.__wchb[0] & 0x07) << 18)
-	    |    (wchar_t)((state->__value.__wchb[1] & 0x3f) << 12)
-	    |    (wchar_t)((state->__value.__wchb[2] & 0x3f) << 6)
-	    |    (wchar_t)(ch & 0x3f);
-	
-	  state->__count = 0;
-	  return i;
-	}
-      else if (ch >= 0xf8 && ch <= 0xfb)
-	{
-	  /* five-byte sequence */
-	  if (sizeof(wchar_t) < 4)
-	    return -1; /* we can't store such a value */
-	  state->__value.__wchb[0] = ch;
-	  if (state->__count == 0)
-	    state->__count = 1;
-	  else
-	    ++n;
-	  if (n < 2)
-	    return -2;
-	  ch = (state->__count == 1) ? t[i++] : state->__value.__wchb[1];
-	  if (state->__value.__wchb[0] == 0xf8 && ch < 0x88)
-	    /* overlong UTF-8 sequence */
-	    return -1;
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  state->__value.__wchb[1] = ch;
-	  if (state->__count == 1)
-	    state->__count = 2;
-	  else
-	    ++n;
-	  if (n < 3)
-	    return -2;
-	  ch = (state->__count == 2) ? t[i++] : state->__value.__wchb[2];
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  state->__value.__wchb[2] = ch;
-	  if (state->__count == 2)
-	    state->__count = 3;
-	  else
-	    ++n;
-	  if (n < 4)
-	    return -2;
-	  ch = (state->__count == 3) ? t[i++] : state->__value.__wchb[3];
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  state->__value.__wchb[3] = ch;
-	  state->__count = 4;
-	  if (n < 5)
-	    return -2;
-	  ch = t[i++];
-	  *pwc = (wchar_t)((state->__value.__wchb[0] & 0x03) << 24)
-	    |    (wchar_t)((state->__value.__wchb[1] & 0x3f) << 18)
-	    |    (wchar_t)((state->__value.__wchb[2] & 0x3f) << 12)
-	    |    (wchar_t)((state->__value.__wchb[3] & 0x3f) << 6)
-	    |    (wchar_t)(ch & 0x3f);
-	
-	  state->__count = 0;
-	  return i;
-	}
-      else if (ch >= 0xfc && ch <= 0xfd)
-        {
-          /* six-byte sequence */
-	  int ch2;
-	  if (sizeof(wchar_t) < 4)
-	    return -1; /* we can't store such a value */
-	  state->__value.__wchb[0] = ch;
-	  if (state->__count == 0)
-	    state->__count = 1;
-	  else
-	    ++n;
-	  if (n < 2)
-	    return -2;
-	  ch = (state->__count == 1) ? t[i++] : state->__value.__wchb[1];
-	  if (state->__value.__wchb[0] == 0xfc && ch < 0x84)
-	    /* overlong UTF-8 sequence */
-	    return -1;
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  state->__value.__wchb[1] = ch;
-	  if (state->__count == 1)
-	    state->__count = 2;
-	  else
-	    ++n;
-	  if (n < 3)
-	    return -2;
-	  ch = (state->__count == 2) ? t[i++] : state->__value.__wchb[2];
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  state->__value.__wchb[2] = ch;
-	  if (state->__count == 2)
-	    state->__count = 3;
-	  else
-	    ++n;
-	  if (n < 4)
-	    return -2;
-	  ch = (state->__count == 3) ? t[i++] : state->__value.__wchb[3];
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  state->__value.__wchb[3] = ch;
-	  if (state->__count == 3)
-	    state->__count = 4;
-	  else
-	    ++n;
-	  if (n < 5)
-	    return -2;
-	  if (n == 5)
-	    return -1; /* at this point we can't save enough to restart */
-	  ch = t[i++];
-	  if (ch < 0x80 || ch > 0xbf)
-	    return -1;
-	  ch2 = t[i++];
-	  *pwc = (wchar_t)((state->__value.__wchb[0] & 0x01) << 30)
-	    |    (wchar_t)((state->__value.__wchb[1] & 0x3f) << 24)
-	    |    (wchar_t)((state->__value.__wchb[2] & 0x3f) << 18)
-	    |    (wchar_t)((state->__value.__wchb[3] & 0x3f) << 12)
-	    |    (wchar_t)((ch & 0x3f) << 6)
-	    |    (wchar_t)(ch2 & 0x3f);
-	
-	  state->__count = 0;
-	  return i;
-	}
-      else
-	return -1;
-    }      
-  else if (!strcmp (__lc_ctype, "C-SJIS"))
+  else if (!strcmp (r->_current_locale, "C-SJIS"))
     {
-      int ch;
-      int i = 0;
+      int char1;
       if (s == NULL)
         return 0;  /* not state-dependent */
-      ch = t[i++];
-      if (state->__count == 0)
-	{
-	  if (_issjis1 (ch))
-	    {
-	      state->__value.__wchb[0] = ch;
-	      state->__count = 1;
-	      if (n <= 1)
-		return -2;
-	      ch = t[i++];
-	    }
-	}
-      if (state->__count == 1)
-	{
-	  if (_issjis2 (ch))
-	    {
-	      *pwc = (((wchar_t)state->__value.__wchb[0]) << 8) + (wchar_t)ch;
-	      state->__count = 0;
-	      return i;
-	    }
-	  else  
-	    return -1;
-	}
+      char1 = *t;
+      if (_issjis1 (char1))
+        {
+          int char2 = t[1];
+          if (n <= 1)
+            return -1;
+          if (_issjis2 (char2))
+            {
+              *pwc = (((wchar_t)*t) << 8) + (wchar_t)(*(t+1));
+              return 2;
+            }
+          else  
+            return -1;
+        }
     }
-  else if (!strcmp (__lc_ctype, "C-EUCJP"))
+  else if (!strcmp (r->_current_locale, "C-EUCJP"))
     {
-      int ch;
-      int i = 0;
+      int char1;
       if (s == NULL)
         return 0;  /* not state-dependent */
-      ch = t[i++];
-      if (state->__count == 0)
-	{
-	  if (_iseucjp (ch))
-	    {
-	      state->__value.__wchb[0] = ch;
-	      state->__count = 1;
-	      if (n <= 1)
-		return -2;
-	      ch = t[i++];
-	    }
-	}
-      if (state->__count == 1)
-	{
-	  if (_iseucjp (ch))
-	    {
-	      *pwc = (((wchar_t)state->__value.__wchb[0]) << 8) + (wchar_t)ch;
-	      state->__count = 0;
-	      return i;
-	    }
-	  else
-	    return -1;
-	}
+      char1 = *t;
+      if (_iseucjp (char1))
+        {
+          int char2 = t[1];     
+          if (n <= 1)
+            return -1;
+          if (_iseucjp (char2))
+            {
+              *pwc = (((wchar_t)*t) << 8) + (wchar_t)(*(t+1));
+              return 2;
+            }
+          else
+            return -1;
+        }
     }
-  else if (!strcmp (__lc_ctype, "C-JIS"))
+  else if (!strcmp (r->_current_locale, "C-JIS"))
     {
       JIS_STATE curr_state;
       JIS_ACTION action;
       JIS_CHAR_TYPE ch;
       unsigned char *ptr;
-      unsigned int i;
-      int curr_ch;
+      int i, curr_ch;
  
       if (s == NULL)
         {
-          state->__state = ASCII;
+          *state = 0;
           return 1;  /* state-dependent */
         }
 
-      curr_state = state->__state;
+      curr_state = (*state == 0 ? ASCII : JIS);
       ptr = t;
 
       for (i = 0; i < n; ++i)
@@ -429,21 +164,23 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
             case NOOP:
               break;
             case EMPTY:
-              state->__state = ASCII;
+              *state = 0;
               *pwc = (wchar_t)0;
-              return 0;
+              return i;
             case COPY_A:
-	      state->__state = ASCII;
+	      *state = 0;
               *pwc = (wchar_t)*ptr;
               return (i + 1);
-            case COPY_J1:
-              state->__value.__wchb[0] = t[i];
-	      break;
-            case COPY_J2:
-              state->__state = JIS;
-              *pwc = (((wchar_t)state->__value.__wchb[0]) << 8) + (wchar_t)(t[i]);
+            case COPY_J:
+              *state = 0;
+              *pwc = (((wchar_t)*ptr) << 8) + (wchar_t)(*(ptr+1));
               return (i + 1);
+            case COPY_J2:
+              *state = 1;
+              *pwc = (((wchar_t)*ptr) << 8) + (wchar_t)(*(ptr+1));
+              return (ptr - t) + 2;
             case MAKE_A:
+            case MAKE_J:
               ptr = (char *)(t + i + 1);
               break;
             case ERROR:
@@ -453,10 +190,9 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
 
         }
 
-      state->__state = curr_state;
-      return -2;  /* n < bytes needed */
+      return -1;  /* n < bytes needed */
     }
-#endif /* _MB_CAPABLE */               
+#endif /* MB_CAPABLE */               
 
   /* otherwise this must be the "C" locale or unknown locale */
   if (s == NULL)
@@ -469,3 +205,4 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
 
   return 1;
 }
+
diff --git a/newlib/libc/stdlib/mlock.c b/newlib/libc/stdlib/mlock.c
index 888c986..485d0d5 100644
--- a/newlib/libc/stdlib/mlock.c
+++ b/newlib/libc/stdlib/mlock.c
@@ -1,7 +1,6 @@
-#ifndef MALLOC_PROVIDED
 /*
 FUNCTION
-<<__malloc_lock>>, <<__malloc_unlock>>---lock malloc pool
+<<__malloc_lock>>, <<__malloc_unlock>>--lock malloc pool
 
 INDEX
 	__malloc_lock
@@ -21,13 +20,13 @@ TRAD_SYNOPSIS
 	struct _reent *<[reent]>;
 
 DESCRIPTION
-The <<malloc>> family of routines call these functions when they need to lock
-the memory pool.  The version of these routines supplied in the library use
-the lock API defined in sys/lock.h.  If multiple threads of execution can
-call <<malloc>>, or if <<malloc>> can be called reentrantly, then you need to
-define your own versions of these functions in order to safely lock the
-memory pool during a call.  If you do not, the memory pool may become
-corrupted.
+The <<malloc>> family of routines call these functions when they need
+to lock the memory pool.  The version of these routines supplied in
+the library does not do anything.  If multiple threads of execution
+can call <<malloc>>, or if <<malloc>> can be called reentrantly, then
+you need to define your own versions of these functions in order to
+safely lock the memory pool during a call.  If you do not, the memory
+pool may become corrupted.
 
 A call to <<malloc>> may call <<__malloc_lock>> recursively; that is,
 the sequence of calls may go <<__malloc_lock>>, <<__malloc_lock>>,
@@ -37,28 +36,15 @@ that it already holds.
 */
 
 #include <malloc.h>
-#include <sys/lock.h>
-
-#ifndef __SINGLE_THREAD__
-__LOCK_INIT_RECURSIVE(static, __malloc_lock_object);
-#endif
 
 void
 __malloc_lock (ptr)
      struct _reent *ptr;
 {
-#ifndef __SINGLE_THREAD__
-  __lock_acquire_recursive (__malloc_lock_object);
-#endif
 }
 
 void
 __malloc_unlock (ptr)
      struct _reent *ptr;
 {
-#ifndef __SINGLE_THREAD__
-  __lock_release_recursive (__malloc_lock_object);
-#endif
 }
-
-#endif
diff --git a/newlib/libc/stdlib/mprec.c b/newlib/libc/stdlib/mprec.c
index 0ef28c7..8a2d404 100644
--- a/newlib/libc/stdlib/mprec.c
+++ b/newlib/libc/stdlib/mprec.c
@@ -95,22 +95,21 @@ _DEFUN (Balloc, (ptr, k), struct _reent *ptr _AND int k)
   int x;
   _Bigint *rv ;
 
-  _REENT_CHECK_MP(ptr);
-  if (_REENT_MP_FREELIST(ptr) == NULL)
+  if (ptr->_freelist == NULL)
     {
       /* Allocate a list of pointers to the mprec objects */
-      _REENT_MP_FREELIST(ptr) = (struct _Bigint **) _calloc_r (ptr, 
+      ptr->_freelist = (struct _Bigint **) _calloc_r (ptr, 
 						      sizeof (struct _Bigint *),
 						      _Kmax + 1);
-      if (_REENT_MP_FREELIST(ptr) == NULL)
+      if (ptr->_freelist == NULL)
 	{
 	  return NULL;
 	}
     }
 
-  if ((rv = _REENT_MP_FREELIST(ptr)[k]) != 0)
+  if ((rv = ptr->_freelist[k]) != 0)
     {
-      _REENT_MP_FREELIST(ptr)[k] = rv->_next;
+      ptr->_freelist[k] = rv->_next;
     }
   else
     {
@@ -131,11 +130,10 @@ _DEFUN (Balloc, (ptr, k), struct _reent *ptr _AND int k)
 void
 _DEFUN (Bfree, (ptr, v), struct _reent *ptr _AND _Bigint * v)
 {
-  _REENT_CHECK_MP(ptr);
   if (v)
     {
-      v->_next = _REENT_MP_FREELIST(ptr)[v->_k];
-      _REENT_MP_FREELIST(ptr)[v->_k] = v;
+      v->_next = ptr->_freelist[v->_k];
+      ptr->_freelist[v->_k] = v;
     }
 }
 
@@ -427,11 +425,10 @@ _DEFUN (pow5mult,
 
   if (!(k >>= 2))
     return b;
-  _REENT_CHECK_MP(ptr);
-  if (!(p5 = _REENT_MP_P5S(ptr)))
+  if (!(p5 = ptr->_p5s))
     {
       /* first time */
-      p5 = _REENT_MP_P5S(ptr) = i2b (ptr, 625);
+      p5 = ptr->_p5s = i2b (ptr, 625);
       p5->_next = 0;
     }
   for (;;)
diff --git a/newlib/libc/stdlib/mprec.h b/newlib/libc/stdlib/mprec.h
index 4ca48f2..31d52e1 100644
--- a/newlib/libc/stdlib/mprec.h
+++ b/newlib/libc/stdlib/mprec.h
@@ -31,7 +31,6 @@
 #include <float.h>
 #include <errno.h>
 #include <sys/config.h>
-#include <sys/types.h>
 
 #ifdef __IEEE_LITTLE_ENDIAN
 #define IEEE_8087
diff --git a/newlib/libc/stdlib/mrand48.c b/newlib/libc/stdlib/mrand48.c
index 28f4f7d..d515b3a 100644
--- a/newlib/libc/stdlib/mrand48.c
+++ b/newlib/libc/stdlib/mrand48.c
@@ -17,7 +17,6 @@ long
 _DEFUN (_mrand48_r, (r),
        struct _reent *r)
 {
-  _REENT_CHECK_RAND48(r);
   __dorand48(r, __rand48_seed);
   return ((long) __rand48_seed[2] << 16) + (long) __rand48_seed[1];
 }
diff --git a/newlib/libc/stdlib/msize.c b/newlib/libc/stdlib/msize.c
index e33e4aa..e910c44 100644
--- a/newlib/libc/stdlib/msize.c
+++ b/newlib/libc/stdlib/msize.c
@@ -1,4 +1,3 @@
-#ifndef MALLOC_PROVIDED
 /* msize.c -- a wrapper for malloc_usable_size.  */
 
 #include <_ansi.h>
@@ -16,4 +15,3 @@ _DEFUN (malloc_usable_size, (ptr),
 }
 
 #endif
-#endif
diff --git a/newlib/libc/stdlib/mstats.c b/newlib/libc/stdlib/mstats.c
index ba89f49..c162895 100644
--- a/newlib/libc/stdlib/mstats.c
+++ b/newlib/libc/stdlib/mstats.c
@@ -10,7 +10,7 @@ int _dummy_mstats = 1;
 
 /*
 FUNCTION
-<<mallinfo>>, <<malloc_stats>>, <<mallopt>>---malloc support
+<<mallinfo>>, <<malloc_stats>>, <<mallopt>>--malloc support
 
 INDEX
 	mallinfo
@@ -110,7 +110,6 @@ _DEFUN_VOID (mallinfo)
   return _mallinfo_r (_REENT);
 }
 
-#if !defined (_ELIX_LEVEL) || _ELIX_LEVEL >= 2
 void
 _DEFUN_VOID (malloc_stats)
 {
@@ -125,12 +124,8 @@ _DEFUN (mallopt, (p, v),
   return _mallopt_r (_REENT, p, v);
 }
 
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 2 */
-
 #endif
 
-#if !defined (_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-
 /* mstats is now compatibility code.  It used to be real, for a
    previous version of the malloc routines.  It now just calls
    malloc_stats.  */
@@ -140,7 +135,6 @@ _DEFUN (_mstats_r, (ptr, s),
 	struct _reent *ptr _AND
 	char *s)
 {
-  _REENT_SMALL_CHECK_INIT(ptr);
   fiprintf (_stderr_r (ptr), "Memory allocation statistics %s\n", s);
   _malloc_stats_r (ptr);
 }
@@ -154,7 +148,4 @@ _DEFUN (mstats, (s),
 }
 
 #endif
-
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 2 */
-
 #endif /* ! defined (MALLOC_PROVIDED) */
diff --git a/newlib/libc/stdlib/mtrim.c b/newlib/libc/stdlib/mtrim.c
index 328eb71..f5e0401 100644
--- a/newlib/libc/stdlib/mtrim.c
+++ b/newlib/libc/stdlib/mtrim.c
@@ -1,4 +1,3 @@
-#ifndef MALLOC_PROVIDED
 /* mtrim.c -- a wrapper for malloc_trim.  */
 
 #include <_ansi.h>
@@ -16,4 +15,3 @@ _DEFUN (malloc_trim, (pad),
 }
 
 #endif
-#endif
diff --git a/newlib/libc/stdlib/on_exit.c b/newlib/libc/stdlib/on_exit.c
deleted file mode 100644
index 3ac7f99..0000000
--- a/newlib/libc/stdlib/on_exit.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1990 Regents of the University of California.
- * All rights reserved.
- *
- * %sccs.include.redist.c%
- *
- * This function is a modified version of atexit.c
- */
-
-/*
-FUNCTION
-<<on_exit>>---request execution of function with argument at program exit
-
-INDEX
-	on_exit
-
-ANSI_SYNOPSIS
-	#include <stdlib.h>
-	int on_exit (void (*<[function]>)(int, void *), void *<[arg]>);
-
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	int on_exit ((<[function]>, <[arg]>)
-	  void (*<[function]>)(int, void *);
-	  void *<[arg]>;
-
-DESCRIPTION
-You can use <<on_exit>> to enroll functions in a list of functions that
-will be called when your program terminates normally.  The argument is
-a pointer to a user-defined function which takes two arguments.  The
-first is the status code passed to exit and the second argument is of type
-pointer to void.  The function must not return a result.  The value
-of <[arg]> is registered and passed as the argument to <[function]>.
-
-The functions are kept in a LIFO stack; that is, the last function
-enrolled by <<atexit>> or <<on_exit>> will be the first to execute when 
-your program exits.  You can intermix functions using <<atexit>> and
-<<on_exit>>.
-
-There is no built-in limit to the number of functions you can enroll
-in this list; however, after every group of 32 functions is enrolled,
-<<atexit>>/<<on_exit>> will call <<malloc>> to get space for the next part 
-of the list.   The initial list of 32 functions is statically allocated, so
-you can always count on at least that many slots available.
-
-RETURNS
-<<on_exit>> returns <<0>> if it succeeds in enrolling your function,
-<<-1>> if it fails (possible only if no space was available for
-<<malloc>> to extend the list of functions).
-
-PORTABILITY
-<<on_exit>> is a non-standard glibc extension
-
-Supporting OS subroutines required: None
-*/
-
-#include <stddef.h>
-#include <stdlib.h>
-#include "atexit.h"
-
-/*
- * Register a function to be performed at exit.
- */
-
-int
-_DEFUN (on_exit,
-	(fn, arg),
-	_VOID _EXFUN ((*fn), (int, _PTR)) _AND
-        _PTR arg)
-{
-  return __register_exitproc (__et_onexit, (void (*)(void)) fn, arg, NULL);
-}
diff --git a/newlib/libc/stdlib/putenv.c b/newlib/libc/stdlib/putenv.c
index 978f7c5..8ee67d7 100644
--- a/newlib/libc/stdlib/putenv.c
+++ b/newlib/libc/stdlib/putenv.c
@@ -24,7 +24,7 @@
 
 int
 _DEFUN (putenv, (str),
-	char *str)
+	_CONST char *str)
 {
   return _putenv_r (_REENT, str);
 }
diff --git a/newlib/libc/stdlib/putenv_r.c b/newlib/libc/stdlib/putenv_r.c
index 9ba6260..7c2686f 100644
--- a/newlib/libc/stdlib/putenv_r.c
+++ b/newlib/libc/stdlib/putenv_r.c
@@ -1,5 +1,5 @@
 /* This file may have been modified by DJ Delorie (Jan 1991).  If so,
-** these modifications are Copyright (C) 1991 DJ Delorie.
+** these modifications are Copyright (C) 1991 DJ Delorie
 */
 
 /*-
@@ -33,7 +33,7 @@
 int
 _DEFUN (_putenv_r, (reent_ptr, str),
 	struct _reent *reent_ptr _AND
-	char   *str)
+	_CONST char   *str)
 {
   register char *p, *equal;
   int rval;
diff --git a/newlib/libc/search/qsort.c b/newlib/libc/stdlib/qsort.c
index d47f470..d47f470 100644
--- a/newlib/libc/search/qsort.c
+++ b/newlib/libc/stdlib/qsort.c
diff --git a/newlib/libc/stdlib/rand.c b/newlib/libc/stdlib/rand.c
index 6a46aa8..a085ef3 100644
--- a/newlib/libc/stdlib/rand.c
+++ b/newlib/libc/stdlib/rand.c
@@ -51,8 +51,8 @@ number between <<0>> and <<RAND_MAX>> (inclusive).
 <<srand>> does not return a result.
 
 NOTES
-<<rand>> and <<srand>> are unsafe for multi-threaded applications.
-<<rand_r>> is thread-safe and should be used instead.
+<<rand>> and <<srand>> are unsafe for multi-thread applications.
+<<rand_r>> is MT-Safe and should be used instead.
 
 
 PORTABILITY
@@ -72,7 +72,7 @@ on two different systems.
 void
 _DEFUN (srand, (seed), unsigned int seed)
 {
-        _REENT_RAND_NEXT(_REENT) = seed;
+        _REENT->_new._reent._rand_next = seed;
 }
 
 int
@@ -81,10 +81,9 @@ _DEFUN_VOID (rand)
   /* This multiplier was obtained from Knuth, D.E., "The Art of
      Computer Programming," Vol 2, Seminumerical Algorithms, Third
      Edition, Addison-Wesley, 1998, p. 106 (line 26) & p. 108 */
-  _REENT_CHECK_RAND48(_REENT);
-  _REENT_RAND_NEXT(_REENT) = 
-     _REENT_RAND_NEXT(_REENT) * __extension__ 6364136223846793005LL + 1;
-  return (int)((_REENT_RAND_NEXT(_REENT) >> 32) & RAND_MAX);
+  _REENT->_new._reent._rand_next = 
+     _REENT->_new._reent._rand_next * __extension__ 6364136223846793005LL + 1;
+  return (int)((_REENT->_new._reent._rand_next >> 32) & RAND_MAX);
 }
 
 #endif /* _REENT_ONLY */
diff --git a/newlib/libc/stdlib/rand48.c b/newlib/libc/stdlib/rand48.c
index af2be3c..c65af12 100644
--- a/newlib/libc/stdlib/rand48.c
+++ b/newlib/libc/stdlib/rand48.c
@@ -13,7 +13,7 @@
 
 /*
 FUNCTION
-   <<rand48>>, <<drand48>>, <<erand48>>, <<lrand48>>, <<nrand48>>, <<mrand48>>, <<jrand48>>, <<srand48>>, <<seed48>>, <<lcong48>>---pseudo-random number generators and initialization routines
+   <<rand48>>, <<drand48>>, <<erand48>>, <<lrand48>>, <<nrand48>>, <<mrand48>>, <<jrand48>>, <<srand48>>, <<seed48>>, <<lcong48>> ---pseudo random number generators and initialization routines
 
 INDEX
        rand48
@@ -163,7 +163,6 @@ _DEFUN (__dorand48, (r, xseed),
   unsigned long accu;
   unsigned short temp[2];
 
-  _REENT_CHECK_RAND48(r);
   accu = (unsigned long) __rand48_mult[0] * (unsigned long) xseed[0] +
     (unsigned long) __rand48_add;
   temp[0] = (unsigned short) accu;     /* lower 16 bits */
diff --git a/newlib/libc/stdlib/rand48.h b/newlib/libc/stdlib/rand48.h
index a6cb479..c1446d6 100644
--- a/newlib/libc/stdlib/rand48.h
+++ b/newlib/libc/stdlib/rand48.h
@@ -18,9 +18,9 @@
 #include <stdlib.h>
 
 extern void _EXFUN(__dorand48,(struct _reent *r, unsigned short[3]));
-#define __rand48_seed	_REENT_RAND48_SEED(r)
-#define __rand48_mult	_REENT_RAND48_MULT(r)
-#define __rand48_add	_REENT_RAND48_ADD(r)
+#define __rand48_seed (r->_new._reent._r48._seed)
+#define __rand48_mult (r->_new._reent._r48._mult)
+#define __rand48_add (r->_new._reent._r48._add)
 
 #if 0
 /* following values are defined in <sys/reent.h> */
diff --git a/newlib/libc/stdlib/seed48.c b/newlib/libc/stdlib/seed48.c
index 43629cc..3f2cb50 100644
--- a/newlib/libc/stdlib/seed48.c
+++ b/newlib/libc/stdlib/seed48.c
@@ -20,7 +20,6 @@ _DEFUN (_seed48_r, (r, xseed),
 {
   static unsigned short sseed[3];
 
-  _REENT_CHECK_RAND48(r);
   sseed[0] = __rand48_seed[0];
   sseed[1] = __rand48_seed[1];
   sseed[2] = __rand48_seed[2];
diff --git a/newlib/libc/stdlib/setenv_r.c b/newlib/libc/stdlib/setenv_r.c
index 694bd14..6cc18a8 100644
--- a/newlib/libc/stdlib/setenv_r.c
+++ b/newlib/libc/stdlib/setenv_r.c
@@ -1,5 +1,5 @@
 /* This file may have been modified by DJ Delorie (Jan 1991).  If so,
-** these modifications are Copyright (C) 1991 DJ Delorie.
+** these modifications are Copyright (C) 1991 DJ Delorie
 */
 
 /*
@@ -26,7 +26,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 #include "envlock.h"
 
 extern char **environ;
@@ -70,11 +69,8 @@ _DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
         }
       if (strlen (C) >= l_value)
 	{			/* old larger; copy over */
-	  while ((*C++ = *value++) != 0);
+         while ((*C++ = *value++) != 0);
           ENV_UNLOCK;
-	  /* if we are changing the TZ environment variable, update timezone info */
-	  if (strcmp (name, "TZ") == 0)
-	    tzset ();
 	  return 0;
 	}
     }
@@ -121,10 +117,6 @@ _DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
 
   ENV_UNLOCK;
 
-  /* if we are setting the TZ environment variable, update timezone info */
-  if (strncmp ((*p_environ)[offset], "TZ=", 3) == 0)
-    tzset ();
-
   return 0;
 }
 
diff --git a/newlib/libc/stdlib/srand48.c b/newlib/libc/stdlib/srand48.c
index 69bdbfc..8850540 100644
--- a/newlib/libc/stdlib/srand48.c
+++ b/newlib/libc/stdlib/srand48.c
@@ -18,7 +18,6 @@ _DEFUN (_srand48_r, (r, seed),
        struct _reent *r _AND
        long seed)
 {
-  _REENT_CHECK_RAND48(r);
   __rand48_seed[0] = _RAND48_SEED_0;
   __rand48_seed[1] = (unsigned short) seed;
   __rand48_seed[2] = (unsigned short) ((unsigned long)seed >> 16);
diff --git a/newlib/libc/stdlib/stdlib.tex b/newlib/libc/stdlib/stdlib.tex
index 9d19b71..fc16436 100644
--- a/newlib/libc/stdlib/stdlib.tex
+++ b/newlib/libc/stdlib/stdlib.tex
@@ -5,15 +5,13 @@ This chapter groups utility functions useful in a variety of programs.
 The corresponding declarations are in the header file @file{stdlib.h}.
 
 @menu 
-* _Exit::       End program execution without cleaning up
-* a64l::        String to long long
 * abort::       Abnormal termination of a program
 * abs::         Integer absolute value (magnitude)
 * assert::      Macro for Debugging Diagnostics
 * atexit::      Request execution of functions at program exit
 * atof::        String to double or float
 * atoi::        String to integer
-* atoll::       String to long long
+* bsearch::     Binary search
 * calloc::      Allocate space for arrays
 * div::         Divide two integers
 * ecvtbuf::     Double or float to string of digits
@@ -24,34 +22,24 @@ The corresponding declarations are in the header file @file{stdlib.h}.
 * getenv::      Look up environment variable
 * labs::        Long integer absolute value (magnitude)
 * ldiv::        Divide two long integers
-* llabs::       Long long integer absolute value (magnitude)
-* lldiv::       Divide two long long integers
 * malloc::      Allocate and manage memory (malloc, realloc, free)
 * mallinfo::	Get information about allocated memory
 * __malloc_lock::	Lock memory pool for malloc and free
 * mbstowcs::	Minimal multibyte string to wide string converter
 * mblen::	Minimal multibyte length
 * mbtowc::      Minimal multibyte to wide character converter
-* on_exit::     Request execution of functions at program exit
+* qsort::       Sort an array
 * rand::        Pseudo-random numbers
-* rand48::      Uniformly distributed pseudo-random numbers
+* rand48::      Uniformaly distributed pseudo-random numbers
 * strtod::      String to double or float
 * strtol::      String to long
-* strtoll::     String to long long
 * strtoul::     String to unsigned long
-* strtoull::    String to unsigned long long
 * system::      Execute command string
 * wcstombs::	Minimal wide string to multibyte string converter
 * wctomb::      Minimal wide character to multibyte converter
 @end menu
 
 @page
-@include stdlib/_Exit.def
-
-@page
-@include stdlib/a64l.def
-
-@page
 @include stdlib/abort.def
 
 @page
@@ -70,7 +58,7 @@ The corresponding declarations are in the header file @file{stdlib.h}.
 @include stdlib/atoi.def
 
 @page
-@include stdlib/atoll.def
+@include stdlib/bsearch.def
 
 @page
 @include stdlib/calloc.def
@@ -100,12 +88,6 @@ The corresponding declarations are in the header file @file{stdlib.h}.
 @include stdlib/ldiv.def
 
 @page
-@include stdlib/llabs.def
-
-@page
-@include stdlib/lldiv.def
-
-@page
 @include stdlib/malloc.def
 
 @page
@@ -124,7 +106,7 @@ The corresponding declarations are in the header file @file{stdlib.h}.
 @include stdlib/mbtowc.def
 
 @page
-@include stdlib/on_exit.def
+@include stdlib/qsort.def
 
 @page
 @include stdlib/rand.def
@@ -139,15 +121,9 @@ The corresponding declarations are in the header file @file{stdlib.h}.
 @include stdlib/strtol.def
 
 @page
-@include stdlib/strtoll.def
-
-@page
 @include stdlib/strtoul.def
 
 @page
-@include stdlib/strtoull.def
-
-@page
 @include stdlib/system.def
 
 @page
diff --git a/newlib/libc/string/strdup.c b/newlib/libc/stdlib/strdup.c
index dbb0692..dbb0692 100644
--- a/newlib/libc/string/strdup.c
+++ b/newlib/libc/stdlib/strdup.c
diff --git a/newlib/libc/string/strdup_r.c b/newlib/libc/stdlib/strdup_r.c
index ef77a58..ef77a58 100644
--- a/newlib/libc/string/strdup_r.c
+++ b/newlib/libc/stdlib/strdup_r.c
diff --git a/newlib/libc/stdlib/strtod.c b/newlib/libc/stdlib/strtod.c
index 9b70dfc..c16d75d 100644
--- a/newlib/libc/stdlib/strtod.c
+++ b/newlib/libc/stdlib/strtod.c
@@ -1,18 +1,18 @@
 /*
 FUNCTION
-        <<strtod>>, <<strtof>>---string to double or float
+        <<strtod>>, <<strtodf>>---string to double or float
 
 INDEX
 	strtod
 INDEX
 	_strtod_r
 INDEX
-	strtof
+	strtodf
 
 ANSI_SYNOPSIS
         #include <stdlib.h>
         double strtod(const char *<[str]>, char **<[tail]>);
-        float strtof(const char *<[str]>, char **<[tail]>);
+        float strtodf(const char *<[str]>, char **<[tail]>);
 
         double _strtod_r(void *<[reent]>, 
                          const char *<[str]>, char **<[tail]>);
@@ -23,7 +23,7 @@ TRAD_SYNOPSIS
         char *<[str]>;
         char **<[tail]>;
 
-        float strtof(<[str]>,<[tail]>)
+        float strtodf(<[str]>,<[tail]>)
         char *<[str]>;
         char **<[tail]>;
 
@@ -48,7 +48,7 @@ DESCRIPTION
 	(which will contain at least the terminating null character of
 	<[str]>) is stored in <<*<[tail]>>>.  If you want no
 	assignment to <<*<[tail]>>>, pass a null pointer as <[tail]>.
-	<<strtof>> is identical to <<strtod>> except for its return type.
+	<<strtodf>> is identical to <<strtod>> except for its return type.
 
 	This implementation returns the nearest machine number to the
 	input decimal string.  Ties are broken by using the IEEE
@@ -111,16 +111,15 @@ _DEFUN (_strtod_r, (ptr, s00, se),
   int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign, e1, esign, i, j,
     k, nd, nd0, nf, nz, nz0, sign;
   long e;
-  _CONST char *s, *s0, *s1, *s2;
+  _CONST char *s, *s0, *s1;
   double aadj, aadj1, adj;
   long L;
   unsigned long z;
   __ULong y;
   union double_union rv, rv0;
-  int nanflag;
 
   _Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
-  sign = nz0 = nz = nanflag = 0;
+  sign = nz0 = nz = 0;
   rv.d = 0.;
   for (s = s00;; s++)
     switch (*s)
@@ -146,23 +145,7 @@ _DEFUN (_strtod_r, (ptr, s00, se),
 	goto break2;
       }
 break2:
-  if (*s == 'n' || *s == 'N')
-    {
-      ++s; 
-      if (*s == 'a' || *s == 'A')
-        {
-          ++s;
-          if (*s == 'n' || *s == 'N')
-            {
-              nanflag = 1;
-              ++s;
-              goto ret;
-            }
-        }
-      s = s00;
-      goto ret;
-    }
-  else if (*s == '0')
+  if (*s == '0')
     {
       nz0 = 1;
       while (*++s == '0');
@@ -222,7 +205,7 @@ dig_done:
 	  s = s00;
 	  goto ret;
 	}
-      s2 = s;
+      s00 = s;
       esign = 0;
       switch (c = *++s)
 	{
@@ -253,7 +236,7 @@ dig_done:
 	    e = 0;
 	}
       else
-	s = s2;
+	s = s00;
     }
   if (!nd)
     {
@@ -725,10 +708,7 @@ retfree:
 ret:
   if (se)
     *se = (char *) s;
-
-  if (nanflag)
-    return nan (NULL);
-  return (sign && (s != s00)) ? -rv.d : rv.d;
+  return sign ? -rv.d : rv.d;
 }
 
 #ifndef NO_REENT
@@ -741,14 +721,11 @@ _DEFUN (strtod, (s00, se),
 }
 
 float
-_DEFUN (strtof, (s00, se),
+_DEFUN (strtodf, (s00, se),
 	_CONST char *s00 _AND
 	char **se)
 {
-  double retval = _strtod_r (_REENT, s00, se);
-  if (isnan (retval))
-    return nanf (NULL);
-  return (float)retval;
+  return _strtod_r (_REENT, s00, se);
 }
 
 #endif
diff --git a/newlib/libc/stdlib/strtoll.c b/newlib/libc/stdlib/strtoll.c
index 3ee9e75..fdba09f 100644
--- a/newlib/libc/stdlib/strtoll.c
+++ b/newlib/libc/stdlib/strtoll.c
@@ -16,14 +16,14 @@ ANSI_SYNOPSIS
 
 TRAD_SYNOPSIS
 	#include <stdlib.h>
-	long long strtoll (<[s]>, <[ptr]>, <[base]>)
-        const char *<[s]>;
+	long strtoll (<[s]>, <[ptr]>, <[base]>)
+        char *<[s]>;
         char **<[ptr]>;
         int <[base]>;
 
-	long long _strtoll_r (<[reent]>, <[s]>, <[ptr]>, <[base]>)
+	long _strtoll_r (<[reent]>, <[s]>, <[ptr]>, <[base]>)
 	char *<[reent]>;
-        const char *<[s]>;
+        char *<[s]>;
         char **<[ptr]>;
         int <[base]>;
 
diff --git a/newlib/libc/stdlib/system.c b/newlib/libc/stdlib/system.c
index ad22177..73c0540 100644
--- a/newlib/libc/stdlib/system.c
+++ b/newlib/libc/stdlib/system.c
@@ -69,10 +69,7 @@ _system_r (ptr, s)
      struct _reent *ptr;
      _CONST char *s;
 {
-#if defined(HAVE_SYSTEM)
-  return _system (s);
-  ptr = ptr;
-#elif defined(NO_EXEC)
+#ifdef NO_EXEC
   if (s == NULL)
     return 0;
   errno = ENOSYS;
diff --git a/newlib/libc/stdlib/valloc.c b/newlib/libc/stdlib/valloc.c
index 26a44df..42c09a0 100644
--- a/newlib/libc/stdlib/valloc.c
+++ b/newlib/libc/stdlib/valloc.c
@@ -1,4 +1,3 @@
-#ifndef MALLOC_PROVIDED
 /* valloc.c -- a wrapper for valloc_r and pvalloc_r.  */
 
 #include <_ansi.h>
@@ -23,4 +22,3 @@ _DEFUN (pvalloc, (nbytes),
 }
 
 #endif
-#endif
diff --git a/newlib/libc/stdlib/wcrtomb.c b/newlib/libc/stdlib/wcrtomb.c
deleted file mode 100644
index 06e4874..0000000
--- a/newlib/libc/stdlib/wcrtomb.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <reent.h>
-#include <newlib.h>
-#include <wchar.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-
-size_t
-_DEFUN (_wcrtomb_r, (ptr, s, wc, ps),
-	struct _reent *ptr _AND
-	char *s _AND
-	wchar_t wc _AND
-	mbstate_t *ps)
-{
-  int retval = 0;
-  char buf[10];
-
-#ifdef _MB_CAPABLE
-  if (ps == NULL)
-    {
-      _REENT_CHECK_MISC(ptr);
-      ps = &(_REENT_WCRTOMB_STATE(ptr));
-    }
-#endif
-
-  if (s == NULL)
-    retval = _wctomb_r (ptr, buf, L'\0', ps);
-  else
-    retval = _wctomb_r (ptr, s, wc, ps);
-
-  if (retval == -1)
-    {
-      ps->__count = 0;
-      ptr->_errno = EILSEQ;
-      return (size_t)(-1);
-    }
-  else
-    return (size_t)retval;
-}
-
-#ifndef _REENT_ONLY
-size_t
-_DEFUN (wcrtomb, (s, wc, ps),
-	char *s _AND
-	wchar_t wc _AND
-	mbstate_t *ps)
-{
-  return _wcrtomb_r (_REENT, s, wc, ps);
-}
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdlib/wcsrtombs.c b/newlib/libc/stdlib/wcsrtombs.c
deleted file mode 100644
index 6871d0c..0000000
--- a/newlib/libc/stdlib/wcsrtombs.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <reent.h>
-#include <newlib.h>
-#include <wchar.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-
-size_t
-_DEFUN (_wcsrtombs_r, (r, dst, src, len, ps),
-	struct _reent *r _AND
-	char *dst _AND
-	const wchar_t **src _AND
-	size_t len _AND
-	mbstate_t *ps)
-{
-  char *ptr = dst;
-  char buff[10];
-  wchar_t *pwcs;
-  size_t n;
-  int i;
-
-#ifdef _MB_CAPABLE
-  if (ps == NULL)
-    {
-      _REENT_CHECK_MISC(r);
-      ps = &(_REENT_WCSRTOMBS_STATE(r));
-    }
-#endif
-
-  /* If no dst pointer, treat len as maximum possible value. */
-  if (dst == NULL)
-    len = (size_t)-1;
-
-  n = 0;
-  pwcs = (wchar_t *)(*src);
-
-  while (n < len)
-    {
-      int count = ps->__count;
-      wint_t wch = ps->__value.__wch;
-      int bytes = _wcrtomb_r (r, buff, *pwcs, ps);
-      if (bytes == -1)
-	{
-	  r->_errno = EILSEQ;
-	  ps->__count = 0;
-	  return (size_t)-1;
-	}
-      if (n <= len - bytes && bytes < len)
-	{
-          n += bytes;
-	  if (dst)
-	    {
-	      for (i = 0; i < bytes; ++i)
-	        *ptr++ = buff[i];
-	      ++(*src);
-	    }
-	  if (*pwcs++ == 0x00)
-	    {
-	      if (dst)
-	        *src = NULL;
-	      ps->__count = 0;
-	      return n - 1;
-	    }
-	}
-      else
-	{
-	  /* not enough room, we must back up state to before _wctomb_r call */
-	  ps->__count = count;
-	  ps->__value.__wch = wch;
-          len = 0;
-	}
-    }
-
-  return n;
-} 
-
-#ifndef _REENT_ONLY
-size_t
-_DEFUN (wcsrtombs, (dst, src, len, ps),
-	char *dst _AND
-	const wchar_t **src _AND
-	size_t len _AND
-	mbstate_t *ps)
-{
-  return _wcsrtombs_r (_REENT, dst, src, len, ps);
-}
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdlib/wcstombs.c b/newlib/libc/stdlib/wcstombs.c
index 83e48da..ca99f2e 100644
--- a/newlib/libc/stdlib/wcstombs.c
+++ b/newlib/libc/stdlib/wcstombs.c
@@ -17,12 +17,12 @@ TRAD_SYNOPSIS
 	size_t <[n]>;
 
 DESCRIPTION
-When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
+When MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
 implementation of <<wcstombs>>.  In this case,
 all wide-characters are expected to represent single bytes and so
 are converted simply by casting to char.
 
-When _MB_CAPABLE is defined, this routine calls <<_wcstombs_r>> to perform
+When MB_CAPABLE is defined, this routine calls <<_wcstombs_r>> to perform
 the conversion, passing a state variable to allow state dependent
 decoding.  The result is based on the locale setting which may
 be restricted to a defined set of locales.
@@ -30,7 +30,7 @@ be restricted to a defined set of locales.
 RETURNS
 This implementation of <<wcstombs>> returns <<0>> if
 <[s]> is <<NULL>> or is the empty string; 
-it returns <<-1>> if _MB_CAPABLE and one of the
+it returns <<-1>> if MB_CAPABLE and one of the
 wide-char characters does not represent a valid multi-byte character;
 otherwise it returns the minimum of: <<n>> or the
 number of bytes that are transferred to <<s>>, not including the
@@ -50,9 +50,7 @@ effects vary with the locale.
 
 #ifndef _REENT_ONLY
 
-#include <newlib.h>
 #include <stdlib.h>
-#include <wchar.h>
 
 size_t
 _DEFUN (wcstombs, (s, pwcs, n),
@@ -60,24 +58,23 @@ _DEFUN (wcstombs, (s, pwcs, n),
         const wchar_t *pwcs _AND
         size_t         n)
 {
-#ifdef _MB_CAPABLE
-  mbstate_t state;
-  state.__count = 0;
-  
-  return _wcstombs_r (_REENT, s, pwcs, n, &state);
-#else /* not _MB_CAPABLE */
-  int count = 0;
-  
-  if (n != 0) {
-    do {
-      if ((*s++ = (char) *pwcs++) == 0)
-	break;
-      count++;
-    } while (--n != 0);
-  }
-  
-  return count;
-#endif /* not _MB_CAPABLE */
+#ifdef MB_CAPABLE
+        int state = 0;
+
+        return _wcstombs_r (_REENT, s, pwcs, n, &state);
+#else /* not MB_CAPABLE */
+        int count = 0;
+
+        if (n != 0) {
+                do {
+                        if ((*s++ = (char) *pwcs++) == 0)
+                                break;
+                        count++;
+                } while (--n != 0);
+        }
+
+        return count;
+#endif /* not MB_CAPABLE */
 }
 
 #endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdlib/wcstombs_r.c b/newlib/libc/stdlib/wcstombs_r.c
index 70f680a..69c82d4 100644
--- a/newlib/libc/stdlib/wcstombs_r.c
+++ b/newlib/libc/stdlib/wcstombs_r.c
@@ -1,5 +1,4 @@
 #include <stdlib.h>
-#include <wchar.h>
 
 size_t
 _DEFUN (_wcstombs_r, (reent, s, pwcs, n, state),
@@ -7,7 +6,7 @@ _DEFUN (_wcstombs_r, (reent, s, pwcs, n, state),
         char          *s    _AND
         const wchar_t *pwcs _AND
         size_t         n    _AND
-        mbstate_t     *state)
+        int           *state)
 {
   char *ptr = s;
   size_t max = n;
diff --git a/newlib/libc/stdlib/wctob.c b/newlib/libc/stdlib/wctob.c
deleted file mode 100644
index 57187b2..0000000
--- a/newlib/libc/stdlib/wctob.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <reent.h>
-#include <wchar.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-int
-wctob (wint_t c)
-{
-  mbstate_t mbs;
-  int retval = 0;
-  unsigned char pwc;
-
-  /* Put mbs in initial state. */
-  memset (&mbs, '\0', sizeof (mbs));
-
-  _REENT_CHECK_MISC(_REENT);
-
-  retval = _wctomb_r (_REENT, &pwc, c, &mbs);
-
-  if (c == EOF || retval != 1)
-    return WEOF;
-  else
-    return (int)pwc;
-}
diff --git a/newlib/libc/stdlib/wctomb.c b/newlib/libc/stdlib/wctomb.c
index f2c6249..a681250 100644
--- a/newlib/libc/stdlib/wctomb.c
+++ b/newlib/libc/stdlib/wctomb.c
@@ -16,24 +16,24 @@ TRAD_SYNOPSIS
 	wchar_t <[wchar]>;
 
 DESCRIPTION
-When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
+When MB_CAPABLE is not defined, this is a minimal ANSI-conforming 
 implementation of <<wctomb>>.  The
 only ``wide characters'' recognized are single bytes,
 and they are ``converted'' to themselves.  
 
-When _MB_CAPABLE is defined, this routine calls <<_wctomb_r>> to perform
+When MB_CAPABLE is defined, this routine calls <<_wctomb_r>> to perform
 the conversion, passing a state variable to allow state dependent
 decoding.  The result is based on the locale setting which may
 be restricted to a defined set of locales.
 
 Each call to <<wctomb>> modifies <<*<[s]>>> unless <[s]> is a null
-pointer or _MB_CAPABLE is defined and <[wchar]> is invalid.
+pointer or MB_CAPABLE is defined and <[wchar]> is invalid.
 
 RETURNS
 This implementation of <<wctomb>> returns <<0>> if
-<[s]> is <<NULL>>; it returns <<-1>> if _MB_CAPABLE is enabled
+<[s]> is <<NULL>>; it returns <<-1>> if MB_CAPABLE is enabled
 and the wchar is not a valid multi-byte character, it returns <<1>>
-if _MB_CAPABLE is not defined or the wchar is in reality a single
+if MB_CAPABLE is not defined or the wchar is in reality a single
 byte character, otherwise it returns the number of bytes in the
 multi-byte character.
 
@@ -46,7 +46,6 @@ effects vary with the locale.
 
 #ifndef _REENT_ONLY
 
-#include <newlib.h>
 #include <stdlib.h>
 
 int
@@ -54,17 +53,17 @@ _DEFUN (wctomb, (s, wchar),
         char *s _AND
         wchar_t wchar)
 {
-#ifdef _MB_CAPABLE
-        _REENT_CHECK_MISC(_REENT);
+#ifdef MB_CAPABLE
+        static int state;
 
-        return _wctomb_r (_REENT, s, wchar, &(_REENT_WCTOMB_STATE(_REENT)));
-#else /* not _MB_CAPABLE */
+        return _wctomb_r (_REENT, s, wchar, &state);
+#else /* not MB_CAPABLE */
         if (s == NULL)
                 return 0;
 
         *s = (char) wchar;
         return 1;
-#endif /* not _MB_CAPABLE */
+#endif /* not MB_CAPABLE */
 }
 
 #endif /* !_REENT_ONLY */
diff --git a/newlib/libc/stdlib/wctomb_r.c b/newlib/libc/stdlib/wctomb_r.c
index a018632..b382c99 100644
--- a/newlib/libc/stdlib/wctomb_r.c
+++ b/newlib/libc/stdlib/wctomb_r.c
@@ -1,81 +1,18 @@
 #include <stdlib.h>
 #include <string.h>
-#include <wchar.h>
 #include <locale.h>
 #include "mbctype.h"
 
-/* for some conversions, we use the __count field as a place to store a state value */
-#define __state __count
-
-extern char __lc_ctype[12];
-
 int
 _DEFUN (_wctomb_r, (r, s, wchar, state),
         struct _reent *r     _AND 
         char          *s     _AND
         wchar_t        wchar _AND
-        mbstate_t     *state)
+        int           *state)
 {
-  if (strlen (__lc_ctype) <= 1)
+  if (strlen (r->_current_locale) <= 1)
     { /* fall-through */ }
-  else if (!strcmp (__lc_ctype, "C-UTF-8"))
-    {
-      if (s == NULL)
-        return 0; /* UTF-8 encoding is not state-dependent */
-
-      if (wchar <= 0x7f)
-        {
-          *s = wchar;
-          return 1;
-        }
-      else if (wchar >= 0x80 && wchar <= 0x7ff)
-        {
-          *s++ = 0xc0 | ((wchar & 0x7c0) >> 6);
-          *s   = 0x80 |  (wchar &  0x3f);
-          return 2;
-        }
-      else if (wchar >= 0x800 && wchar <= 0xffff)
-        {
-          /* UTF-16 surrogates -- must not occur in normal UCS-4 data */
-          if (wchar >= 0xd800 && wchar <= 0xdfff)
-            return -1;
-
-          *s++ = 0xe0 | ((wchar & 0xf000) >> 12);
-          *s++ = 0x80 | ((wchar &  0xfc0) >> 6);
-          *s   = 0x80 |  (wchar &   0x3f);
-          return 3;
-        }
-      else if (wchar >= 0x10000 && wchar <= 0x1fffff)
-        {
-          *s++ = 0xf0 | ((wchar & 0x1c0000) >> 18);
-          *s++ = 0x80 | ((wchar &  0x3f000) >> 12);
-          *s++ = 0x80 | ((wchar &    0xfc0) >> 6);
-          *s   = 0x80 |  (wchar &     0x3f);
-          return 4;
-        }
-      else if (wchar >= 0x200000 && wchar <= 0x3ffffff)
-        {
-          *s++ = 0xf8 | ((wchar & 0x3000000) >> 24);
-          *s++ = 0x80 | ((wchar &  0xfc0000) >> 18);
-          *s++ = 0x80 | ((wchar &   0x3f000) >> 12);
-          *s++ = 0x80 | ((wchar &     0xfc0) >> 6);
-          *s   = 0x80 |  (wchar &      0x3f);
-          return 5;
-        }
-      else if (wchar >= 0x4000000 && wchar <= 0x7fffffff)
-        {
-          *s++ = 0xfc | ((wchar & 0x40000000) >> 30);
-          *s++ = 0x80 | ((wchar & 0x3f000000) >> 24);
-          *s++ = 0x80 | ((wchar &   0xfc0000) >> 18);
-          *s++ = 0x80 | ((wchar &    0x3f000) >> 12);
-          *s++ = 0x80 | ((wchar &      0xfc0) >> 6);
-          *s   = 0x80 |  (wchar &       0x3f);
-          return 6;
-        }
-      else
-        return -1;
-    }
-  else if (!strcmp (__lc_ctype, "C-SJIS"))
+  else if (!strcmp (r->_current_locale, "C-SJIS"))
     {
       unsigned char char2 = (unsigned char)wchar;
       unsigned char char1 = (unsigned char)(wchar >> 8);
@@ -96,7 +33,7 @@ _DEFUN (_wctomb_r, (r, s, wchar, state),
             return -1;
         }
     }
-  else if (!strcmp (__lc_ctype, "C-EUCJP"))
+  else if (!strcmp (r->_current_locale, "C-EUCJP"))
     {
       unsigned char char2 = (unsigned char)wchar;
       unsigned char char1 = (unsigned char)(wchar >> 8);
@@ -117,7 +54,7 @@ _DEFUN (_wctomb_r, (r, s, wchar, state),
             return -1;
         }
     }
-  else if (!strcmp (__lc_ctype, "C-JIS"))
+  else if (!strcmp (r->_current_locale, "C-JIS"))
     {
       int cnt = 0; 
       unsigned char char2 = (unsigned char)wchar;
@@ -131,10 +68,10 @@ _DEFUN (_wctomb_r, (r, s, wchar, state),
         /* first byte is non-zero..validate multi-byte char */
           if (_isjis (char1) && _isjis (char2)) 
             {
-              if (state->__state == 0)
+              if (*state == 0)
                 {
                   /* must switch from ASCII to JIS state */
-                  state->__state = 1;
+                  *state = 1;
                   *s++ = ESC_CHAR;
                   *s++ = '$';
                   *s++ = 'B';
@@ -149,10 +86,10 @@ _DEFUN (_wctomb_r, (r, s, wchar, state),
         }
       else
         {
-          if (state->__state != 0)
+          if (*state != 0)
             {
               /* must switch from JIS to ASCII state */
-              state->__state = 0;
+              *state = 0;
               *s++ = ESC_CHAR;
               *s++ = '(';
               *s++ = 'B';
diff --git a/newlib/libc/string/Makefile.am b/newlib/libc/string/Makefile.am
index cac5f1d..e360125 100644
--- a/newlib/libc/string/Makefile.am
+++ b/newlib/libc/string/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES = \
+LIB_SOURCES = \
+	bcmp.c \
 	bcopy.c \
 	bzero.c \
 	index.c \
@@ -14,29 +15,22 @@ GENERAL_SOURCES = \
 	memmove.c \
 	memset.c \
 	rindex.c \
-	strcasecmp.c \
 	strcat.c \
 	strchr.c \
 	strcmp.c \
+	strcasecmp.c \
 	strcoll.c \
 	strcpy.c \
 	strcspn.c \
-	strdup.c \
-	strdup_r.c \
 	strerror.c \
-	strerror_r.c \
-	strlcat.c \
-	strlcpy.c \
 	strlen.c  \
 	strlwr.c \
-	strncasecmp.c \
 	strncat.c \
 	strncmp.c \
+	strncasecmp.c \
 	strncpy.c \
-	strnlen.c \
 	strpbrk.c \
 	strrchr.c \
-	strsep.c \
 	strspn.c \
 	strtok.c \
 	strtok_r.c \
@@ -44,56 +38,17 @@ GENERAL_SOURCES = \
 	strxfrm.c  \
 	strstr.c \
 	swab.c \
-	u_strerr.c \
-	wcscat.c \
-	wcschr.c \
-	wcscmp.c \
-	wcscoll.c \
-	wcscpy.c \
-	wcscspn.c \
-	wcslcat.c \
-	wcslcpy.c \
-	wcslen.c \
-	wcsncat.c \
-	wcsncmp.c \
-	wcsncpy.c \
-	wcsnlen.c \
-	wcspbrk.c \
-	wcsrchr.c \
-	wcsspn.c \
-	wcsstr.c \
-	wcswidth.c \
-	wcwidth.c \
-	wmemchr.c \
-	wmemcmp.c \
-	wmemcpy.c \
-	wmemmove.c \
-	wmemset.c
-
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-LIB_OBJS = \
-	bcmp.$(oext) \
-	memccpy.$(oext) \
-	mempcpy.$(oext) \
-	strndup.$(oext) \
-	strndup_r.$(oext)
-endif
+	u_strerr.c
 
 libstring_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libstring.la
-libstring_la_SOURCES = $(GENERAL_SOURCES)
-libstring_la_LIBADD = $(LIB_OBJS)
-libstring_la_DEPENDENCIES = $(LIB_OBJS)
+libstring_la_SOURCES = $(LIB_SOURCES)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
+lib_a_SOURCES = $(LIB_SOURCES)
 noinst_DATA =
 endif # USE_LIBTOOL
 
@@ -104,17 +59,9 @@ bcmp.def	memcpy.def	strcmp.def	strncat.def strstr.def \
 bcopy.def	memmove.def	strcoll.def	strncmp.def strtok.def \
 bzero.def	memset.def	strcpy.def	strncpy.def strxfrm.def \
 index.def	rindex.def	strcspn.def	strpbrk.def swab.def \
-memchr.def	strcat.def	strerror.def	strerror_r.def strrchr.def \
-memcmp.def	strchr.def	strlen.def	strnlen.def strspn.def \
-strcasecmp.def	strncasecmp.def strlwr.def	strupr.def  memccpy.def \
-mempcpy.def \
-wcscat.def	wcschr.def	wcscmp.def	wcscoll.def \
-wcscpy.def	wcscspn.def \
-wcslcat.def	wcslcpy.def	wcslen.def	wcsncat.def \
-wcsncmp.def	wcsncpy.def	wcsnlen.def	wcspbrk.def \
-wcsrchr.def	wcsspn.def	wcsstr.def \
-wcswidth.def	wcwidth.def	wmemchr.def \
-wmemcmp.def	wmemcpy.def	wmemmove.def	wmemset.def
+memchr.def	strcat.def	strerror.def	strrchr.def \
+memcmp.def	strchr.def	strlen.def	strspn.def \
+strcasecmp.def	strncasecmp.def strlwr.def	strupr.def
 
 SUFFIXES = .def
 
@@ -128,6 +75,5 @@ TARGETDOC = ../tmp.texi
 
 doc: $(CHEWOUT_FILES)
 	cat $(srcdir)/strings.tex >> $(TARGETDOC)
-	cat $(srcdir)/wcstrings.tex >> $(TARGETDOC)
 
 CLEANFILES = $(CHEWOUT_FILES) *.ref
diff --git a/newlib/libc/string/Makefile.in b/newlib/libc/string/Makefile.in
index 9c218b0..473b09f 100644
--- a/newlib/libc/string/Makefile.in
+++ b/newlib/libc/string/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -110,25 +95,60 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES =  	bcopy.c 	bzero.c 	index.c 	memchr.c 	memcmp.c 	memcpy.c 	memmove.c 	memset.c 	rindex.c 	strcasecmp.c 	strcat.c 	strchr.c 	strcmp.c 	strcoll.c 	strcpy.c 	strcspn.c 	strdup.c 	strdup_r.c 	strerror.c 	strerror_r.c 	strlcat.c 	strlcpy.c 	strlen.c  	strlwr.c 	strncasecmp.c 	strncat.c 	strncmp.c 	strncpy.c 	strnlen.c 	strpbrk.c 	strrchr.c 	strsep.c 	strspn.c 	strtok.c 	strtok_r.c 	strupr.c 	strxfrm.c  	strstr.c 	swab.c 	u_strerr.c 	wcscat.c 	wcschr.c 	wcscmp.c 	wcscoll.c 	wcscpy.c 	wcscspn.c 	wcslcat.c 	wcslcpy.c 	wcslen.c 	wcsncat.c 	wcsncmp.c 	wcsncpy.c 	wcsnlen.c 	wcspbrk.c 	wcsrchr.c 	wcsspn.c 	wcsstr.c 	wcswidth.c 	wcwidth.c 	wmemchr.c 	wmemcmp.c 	wmemcpy.c 	wmemmove.c 	wmemset.c
+LIB_SOURCES = \
+	bcmp.c \
+	bcopy.c \
+	bzero.c \
+	index.c \
+	memchr.c \
+	memcmp.c \
+	memcpy.c \
+	memmove.c \
+	memset.c \
+	rindex.c \
+	strcat.c \
+	strchr.c \
+	strcmp.c \
+	strcasecmp.c \
+	strcoll.c \
+	strcpy.c \
+	strcspn.c \
+	strerror.c \
+	strlen.c  \
+	strlwr.c \
+	strncat.c \
+	strncmp.c \
+	strncasecmp.c \
+	strncpy.c \
+	strpbrk.c \
+	strrchr.c \
+	strspn.c \
+	strtok.c \
+	strtok_r.c \
+	strupr.c \
+	strxfrm.c  \
+	strstr.c \
+	swab.c \
+	u_strerr.c
 
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@LIB_OBJS = 	bcmp.$(oext) 	memccpy.$(oext) 	mempcpy.$(oext) 	strndup.$(oext) 	strndup_r.$(oext)
 
 libstring_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libstring.la
-@USE_LIBTOOL_TRUE@libstring_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@libstring_la_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@libstring_la_DEPENDENCIES = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libstring.la
+@USE_LIBTOOL_TRUE@libstring_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
 
-CHEWOUT_FILES =  bcmp.def	memcpy.def	strcmp.def	strncat.def strstr.def bcopy.def	memmove.def	strcoll.def	strncmp.def strtok.def bzero.def	memset.def	strcpy.def	strncpy.def strxfrm.def index.def	rindex.def	strcspn.def	strpbrk.def swab.def memchr.def	strcat.def	strerror.def	strerror_r.def strrchr.def memcmp.def	strchr.def	strlen.def	strnlen.def strspn.def strcasecmp.def	strncasecmp.def strlwr.def	strupr.def  memccpy.def mempcpy.def wcscat.def	wcschr.def	wcscmp.def	wcscoll.def wcscpy.def	wcscspn.def wcslcat.def	wcslcpy.def	wcslen.def	wcsncat.def wcsncmp.def	wcsncpy.def	wcsnlen.def	wcspbrk.def wcsrchr.def	wcsspn.def	wcsstr.def wcswidth.def	wcwidth.def	wmemchr.def wmemcmp.def	wmemcpy.def	wmemmove.def	wmemset.def
+CHEWOUT_FILES = \
+bcmp.def	memcpy.def	strcmp.def	strncat.def strstr.def \
+bcopy.def	memmove.def	strcoll.def	strncmp.def strtok.def \
+bzero.def	memset.def	strcpy.def	strncpy.def strxfrm.def \
+index.def	rindex.def	strcspn.def	strpbrk.def swab.def \
+memchr.def	strcat.def	strerror.def	strrchr.def \
+memcmp.def	strchr.def	strlen.def	strspn.def \
+strcasecmp.def	strncasecmp.def strlwr.def	strupr.def
 
 
 SUFFIXES = .def
@@ -146,49 +166,25 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  bcopy.$(OBJEXT) bzero.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@index.$(OBJEXT) memchr.$(OBJEXT) memcmp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@memcpy.$(OBJEXT) memmove.$(OBJEXT) memset.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@rindex.$(OBJEXT) strcasecmp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strcat.$(OBJEXT) strchr.$(OBJEXT) strcmp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strcoll.$(OBJEXT) strcpy.$(OBJEXT) strcspn.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strdup.$(OBJEXT) strdup_r.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strerror.$(OBJEXT) strerror_r.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strlcat.$(OBJEXT) strlcpy.$(OBJEXT) strlen.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strlwr.$(OBJEXT) strncasecmp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strncat.$(OBJEXT) strncmp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strncpy.$(OBJEXT) strnlen.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strpbrk.$(OBJEXT) strrchr.$(OBJEXT) strsep.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strspn.$(OBJEXT) strtok.$(OBJEXT) strtok_r.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strupr.$(OBJEXT) strxfrm.$(OBJEXT) strstr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@swab.$(OBJEXT) u_strerr.$(OBJEXT) wcscat.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wcschr.$(OBJEXT) wcscmp.$(OBJEXT) wcscoll.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wcscpy.$(OBJEXT) wcscspn.$(OBJEXT) wcslcat.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wcslcpy.$(OBJEXT) wcslen.$(OBJEXT) wcsncat.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wcsncmp.$(OBJEXT) wcsncpy.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wcsnlen.$(OBJEXT) wcspbrk.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wcsrchr.$(OBJEXT) wcsspn.$(OBJEXT) wcsstr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wcswidth.$(OBJEXT) wcwidth.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wmemchr.$(OBJEXT) wmemcmp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wmemcpy.$(OBJEXT) wmemmove.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wmemset.$(OBJEXT)
+lib_a_LIBADD = 
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  bcmp.o bcopy.o bzero.o index.o \
+@USE_LIBTOOL_FALSE@memchr.o memcmp.o memcpy.o memmove.o memset.o \
+@USE_LIBTOOL_FALSE@rindex.o strcat.o strchr.o strcmp.o strcasecmp.o \
+@USE_LIBTOOL_FALSE@strcoll.o strcpy.o strcspn.o strerror.o strlen.o \
+@USE_LIBTOOL_FALSE@strlwr.o strncat.o strncmp.o strncasecmp.o strncpy.o \
+@USE_LIBTOOL_FALSE@strpbrk.o strrchr.o strspn.o strtok.o strtok_r.o \
+@USE_LIBTOOL_FALSE@strupr.o strxfrm.o strstr.o swab.o u_strerr.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
-@USE_LIBTOOL_TRUE@libstring_la_OBJECTS =  bcopy.lo bzero.lo index.lo \
-@USE_LIBTOOL_TRUE@memchr.lo memcmp.lo memcpy.lo memmove.lo memset.lo \
-@USE_LIBTOOL_TRUE@rindex.lo strcasecmp.lo strcat.lo strchr.lo strcmp.lo \
-@USE_LIBTOOL_TRUE@strcoll.lo strcpy.lo strcspn.lo strdup.lo strdup_r.lo \
-@USE_LIBTOOL_TRUE@strerror.lo strerror_r.lo strlcat.lo strlcpy.lo \
-@USE_LIBTOOL_TRUE@strlen.lo strlwr.lo strncasecmp.lo strncat.lo \
-@USE_LIBTOOL_TRUE@strncmp.lo strncpy.lo strnlen.lo strpbrk.lo \
-@USE_LIBTOOL_TRUE@strrchr.lo strsep.lo strspn.lo strtok.lo strtok_r.lo \
-@USE_LIBTOOL_TRUE@strupr.lo strxfrm.lo strstr.lo swab.lo u_strerr.lo \
-@USE_LIBTOOL_TRUE@wcscat.lo wcschr.lo wcscmp.lo wcscoll.lo wcscpy.lo \
-@USE_LIBTOOL_TRUE@wcscspn.lo wcslcat.lo wcslcpy.lo wcslen.lo wcsncat.lo \
-@USE_LIBTOOL_TRUE@wcsncmp.lo wcsncpy.lo wcsnlen.lo wcspbrk.lo \
-@USE_LIBTOOL_TRUE@wcsrchr.lo wcsspn.lo wcsstr.lo wcswidth.lo wcwidth.lo \
-@USE_LIBTOOL_TRUE@wmemchr.lo wmemcmp.lo wmemcpy.lo wmemmove.lo \
-@USE_LIBTOOL_TRUE@wmemset.lo
+libstring_la_LIBADD = 
+@USE_LIBTOOL_TRUE@libstring_la_OBJECTS =  bcmp.lo bcopy.lo bzero.lo \
+@USE_LIBTOOL_TRUE@index.lo memchr.lo memcmp.lo memcpy.lo memmove.lo \
+@USE_LIBTOOL_TRUE@memset.lo rindex.lo strcat.lo strchr.lo strcmp.lo \
+@USE_LIBTOOL_TRUE@strcasecmp.lo strcoll.lo strcpy.lo strcspn.lo \
+@USE_LIBTOOL_TRUE@strerror.lo strlen.lo strlwr.lo strncat.lo strncmp.lo \
+@USE_LIBTOOL_TRUE@strncasecmp.lo strncpy.lo strpbrk.lo strrchr.lo \
+@USE_LIBTOOL_TRUE@strspn.lo strtok.lo strtok_r.lo strupr.lo strxfrm.lo \
+@USE_LIBTOOL_TRUE@strstr.lo swab.lo u_strerr.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -208,7 +204,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libstring_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus string/Makefile
 
@@ -229,11 +225,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -242,7 +233,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -426,7 +416,6 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
 
 doc: $(CHEWOUT_FILES)
 	cat $(srcdir)/strings.tex >> $(TARGETDOC)
-	cat $(srcdir)/wcstrings.tex >> $(TARGETDOC)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/newlib/libc/string/bcmp.c b/newlib/libc/string/bcmp.c
index e8d0573..b6a4d52 100644
--- a/newlib/libc/string/bcmp.c
+++ b/newlib/libc/string/bcmp.c
@@ -7,20 +7,22 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <string.h>
-	int bcmp(const void *<[s1]>, const void *<[s2]>, size_t <[n]>);
+	int bcmp(const char *<[s1]>, const char *<[s2]>, size_t <[n]>);
 
 TRAD_SYNOPSIS
 	#include <string.h>
 	int bcmp(<[s1]>, <[s2]>, <[n]>)
-	const void *<[s1]>;
-	const void *<[s2]>;
+	char *<[s1]>;
+	char *<[s2]>;
 	size_t <[n]>;
 
 DESCRIPTION
-	This function compares not more than <[n]> bytes of the
+	This function compares not more than <[n]> characters of the
 	object pointed to by <[s1]> with the object pointed to by <[s2]>.
 
 	This function is identical to <<memcmp>>.
+	
+
 
 RETURNS
 	The function returns an integer greater than, equal to or
@@ -39,8 +41,8 @@ QUICKREF
 
 int
 _DEFUN (bcmp, (m1, m2, n),
-	_CONST void *m1 _AND
-	_CONST void *m2 _AND
+	_CONST char *m1 _AND
+	_CONST char *m2 _AND
 	size_t n)
 
 {
diff --git a/newlib/libc/string/bcopy.c b/newlib/libc/string/bcopy.c
index 505e39d..733840b 100644
--- a/newlib/libc/string/bcopy.c
+++ b/newlib/libc/string/bcopy.c
@@ -4,12 +4,12 @@ FUNCTION
 
 ANSI_SYNOPSIS
 	#include <string.h>
-	void bcopy(const void *<[in]>, void *<[out]>, size_t <[n]>);
+	void bcopy(const char *<[in]>, char  *<[out]>, size_t <[n]>);
 
 TRAD_SYNOPSIS
 	void bcopy(<[in]>, <[out]>, <[n]>
-	const void *<[in]>;
-	void *<[out]>;
+	char *<[in]>;
+	char *<[out]>;
 	size_t <[n]>;
 
 DESCRIPTION
@@ -30,9 +30,9 @@ QUICKREF
 
 void
 _DEFUN (bcopy, (b1, b2, length),
-	_CONST void *b1 _AND
-	void *b2 _AND
+	_CONST char *b1 _AND
+	char *b2 _AND
 	size_t length)
 {
-  memmove (b2, b1, length);
+  memmove ((_PTR) b2, (_PTR) b1, length);
 }
diff --git a/newlib/libc/string/bzero.c b/newlib/libc/string/bzero.c
index 661285f..e9e78c9 100644
--- a/newlib/libc/string/bzero.c
+++ b/newlib/libc/string/bzero.c
@@ -7,12 +7,12 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <string.h>
-	void bzero(void *<[b]>, size_t <[length]>);
+	void bzero(char *<[b]>, size_t <[length]>);
 
 TRAD_SYNOPSIS
 	#include <string.h>
 	void bzero(<[b]>, <[length]>)
-	void *<[b]>;
+	char *<[b]>;
 	size_t <[length]>;
 
 DESCRIPTION
@@ -34,10 +34,9 @@ Neither ANSI C nor the System V Interface Definition (Issue 2) require
 
 _VOID
 _DEFUN (bzero, (b, length),
-	void *b _AND
+	char *b _AND
 	size_t length)
 {
-  char *ptr = (char *)b;
   while (length--)
-    *ptr++ = 0;
+    *b++ = 0;
 }
diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c
deleted file mode 100644
index f677ac0..0000000
--- a/newlib/libc/string/memccpy.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-FUNCTION
-        <<memccpy>>---copy memory regions with end-token check
-
-ANSI_SYNOPSIS
-        #include <string.h>
-        void* memccpy(void *<[out]>, const void *<[in]>, 
-                      int <[endchar]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-        void *memccpy(<[out]>, <[in]>, <[endchar]>, <[n]>
-        void *<[out]>;
-        void *<[in]>;
-	int <[endchar]>;
-        size_t <[n]>;
-
-DESCRIPTION
-        This function copies up to <[n]> bytes from the memory region
-        pointed to by <[in]> to the memory region pointed to by
-        <[out]>.  If a byte matching the <[endchar]> is encountered,
-	the byte is copied and copying stops.
-
-        If the regions overlap, the behavior is undefined.
-
-RETURNS
-        <<memccpy>> returns a pointer to the first byte following the
-	<[endchar]> in the <[out]> region.  If no byte matching
-	<[endchar]> was copied, then <<NULL>> is returned.
-
-PORTABILITY
-<<memccpy>> is a GNU extension.
-
-<<memccpy>> requires no supporting OS subroutines.
-
-	*/
-
-#include <_ansi.h>
-#include <stddef.h>
-#include <string.h>
-#include <limits.h>
-
-/* Nonzero if either X or Y is not aligned on a "long" boundary.  */
-#define UNALIGNED(X, Y) \
-  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-
-/* How many bytes are copied each iteration of the word copy loop.  */
-#define LITTLEBLOCKSIZE (sizeof (long))
-
-/* Threshhold for punting to the byte copier.  */
-#define TOO_SMALL(LEN)  ((LEN) < LITTLEBLOCKSIZE)
-
-/* Macros for detecting endchar */
-#if LONG_MAX == 2147483647L
-#define DETECTNULL(X) (((X) - 0x01010101) & ~(X) & 0x80808080)
-#else
-#if LONG_MAX == 9223372036854775807L
-/* Nonzero if X (a long int) contains a NULL byte. */
-#define DETECTNULL(X) (((X) - 0x0101010101010101) & ~(X) & 0x8080808080808080)
-#else
-#error long int is not a 32bit or 64bit type.
-#endif
-#endif
-
-
-_PTR
-_DEFUN (memccpy, (dst0, src0, endchar, len0),
-	_PTR dst0 _AND
-	_CONST _PTR src0 _AND
-	int endchar0 _AND
-	size_t len0)
-{
-
-#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
-  _PTR ptr = NULL;
-  char *dst = (char *) dst0;
-  char *src = (char *) src0;
-  char endchar = endchar0 & 0xff;
-
-  while (len0--)
-    {
-      if ((*dst++ = *src++) == endchar)
-        {
-          ptr = dst;
-          break;
-        }
-    }
-
-  return ptr;
-#else
-  _PTR ptr = NULL;
-  char *dst = dst0;
-  _CONST char *src = src0;
-  long *aligned_dst;
-  _CONST long *aligned_src;
-  int   len =  len0;
-  char endchar = endchar0 & 0xff;
-
-  /* If the size is small, or either SRC or DST is unaligned,
-     then punt into the byte copy loop.  This should be rare.  */
-  if (!TOO_SMALL(len) && !UNALIGNED (src, dst))
-    {
-      int i;
-      unsigned long mask = 0;
-
-      aligned_dst = (long*)dst;
-      aligned_src = (long*)src;
-
-      /* The fast code reads the ASCII one word at a time and only
-         performs the bytewise search on word-sized segments if they
-         contain the search character, which is detected by XORing
-         the word-sized segment with a word-sized block of the search
-         character and then detecting for the presence of NULL in the
-         result.  */
-      for (i = 0; i < LITTLEBLOCKSIZE; i++)
-        mask = (mask << 8) + endchar;
-
-
-      /* Copy one long word at a time if possible.  */
-      while (len >= LITTLEBLOCKSIZE)
-        {
-          unsigned long buffer = (unsigned long)(*aligned_src);
-          buffer ^=  mask;
-          if (DETECTNULL (buffer))
-            break; /* endchar is found, go byte by byte from here */
-          *aligned_dst++ = *aligned_src++;
-          len -= LITTLEBLOCKSIZE;
-        }
-
-       /* Pick up any residual with a byte copier.  */
-      dst = (char*)aligned_dst;
-      src = (char*)aligned_src;
-    }
-
-  while (len--)
-    {
-      if ((*dst++ = *src++) == endchar)
-        {
-          ptr = dst;
-          break;
-        }
-    }
-
-  return ptr;
-#endif /* not PREFER_SIZE_OVER_SPEED */
-}
diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c
index 7c1a584..2fd3c86 100644
--- a/newlib/libc/string/memchr.c
+++ b/newlib/libc/string/memchr.c
@@ -28,9 +28,9 @@ RETURNS
 	<[c]> is not found, then <<NULL>> is returned.
 
 PORTABILITY
-<<memchr>> is ANSI C.
+<<memchr>>> is ANSI C.
 
-<<memchr>> requires no supporting OS subroutines.
+<<memchr>>  requires no supporting OS subroutines.
 
 QUICKREF
 	memchr ansi pure
diff --git a/newlib/libc/string/memcmp.c b/newlib/libc/string/memcmp.c
index 4a871fa..ac7a194 100644
--- a/newlib/libc/string/memcmp.c
+++ b/newlib/libc/string/memcmp.c
@@ -95,8 +95,8 @@ _DEFUN (memcmp, (m1, m2, n),
 
       /* check m mod LBLOCKSIZE remaining characters */
 
-      s1 = (unsigned char*)a1;
-      s2 = (unsigned char*)a2;
+      s1 = (char*)a1;
+      s2 = (char*)a2;
     }
 
   while (n--)
diff --git a/newlib/libc/string/mempcpy.c b/newlib/libc/string/mempcpy.c
deleted file mode 100644
index 284cbea..0000000
--- a/newlib/libc/string/mempcpy.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-FUNCTION
-        <<mempcpy>>---copy memory regions and return end pointer
-
-ANSI_SYNOPSIS
-        #include <string.h>
-        void* mempcpy(void *<[out]>, const void *<[in]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-        void *mempcpy(<[out]>, <[in]>, <[n]>
-        void *<[out]>;
-        void *<[in]>;
-        size_t <[n]>;
-
-DESCRIPTION
-        This function copies <[n]> bytes from the memory region
-        pointed to by <[in]> to the memory region pointed to by
-        <[out]>.
-
-        If the regions overlap, the behavior is undefined.
-
-RETURNS
-        <<mempcpy>> returns a pointer to the byte following the
-        last byte copied to the <[out]> region.
-
-PORTABILITY
-<<mempcpy>> is a GNU extension.
-
-<<mempcpy>> requires no supporting OS subroutines.
-
-	*/
-
-#include <_ansi.h>
-#include <stddef.h>
-#include <limits.h>
-#include <string.h>
-
-/* Nonzero if either X or Y is not aligned on a "long" boundary.  */
-#define UNALIGNED(X, Y) \
-  (((long)X & (sizeof (long) - 1)) | ((long)Y & (sizeof (long) - 1)))
-
-/* How many bytes are copied each iteration of the 4X unrolled loop.  */
-#define BIGBLOCKSIZE    (sizeof (long) << 2)
-
-/* How many bytes are copied each iteration of the word copy loop.  */
-#define LITTLEBLOCKSIZE (sizeof (long))
-
-/* Threshhold for punting to the byte copier.  */
-#define TOO_SMALL(LEN)  ((LEN) < BIGBLOCKSIZE)
-
-_PTR
-_DEFUN (mempcpy, (dst0, src0, len0),
-	_PTR dst0 _AND
-	_CONST _PTR src0 _AND
-	size_t len0)
-{
-#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
-  char *dst = (char *) dst0;
-  char *src = (char *) src0;
-
-  while (len0--)
-    {
-      *dst++ = *src++;
-    }
-
-  return dst;
-#else
-  char *dst = dst0;
-  _CONST char *src = src0;
-  long *aligned_dst;
-  _CONST long *aligned_src;
-  int   len =  len0;
-
-  /* If the size is small, or either SRC or DST is unaligned,
-     then punt into the byte copy loop.  This should be rare.  */
-  if (!TOO_SMALL(len) && !UNALIGNED (src, dst))
-    {
-      aligned_dst = (long*)dst;
-      aligned_src = (long*)src;
-
-      /* Copy 4X long words at a time if possible.  */
-      while (len >= BIGBLOCKSIZE)
-        {
-          *aligned_dst++ = *aligned_src++;
-          *aligned_dst++ = *aligned_src++;
-          *aligned_dst++ = *aligned_src++;
-          *aligned_dst++ = *aligned_src++;
-          len -= BIGBLOCKSIZE;
-        }
-
-      /* Copy one long word at a time if possible.  */
-      while (len >= LITTLEBLOCKSIZE)
-        {
-          *aligned_dst++ = *aligned_src++;
-          len -= LITTLEBLOCKSIZE;
-        }
-
-       /* Pick up any residual with a byte copier.  */
-      dst = (char*)aligned_dst;
-      src = (char*)aligned_src;
-    }
-
-  while (len--)
-    *dst++ = *src++;
-
-  return dst;
-#endif /* not PREFER_SIZE_OVER_SPEED */
-}
diff --git a/newlib/libc/string/memset.c b/newlib/libc/string/memset.c
index ac3590e..a5890c8 100644
--- a/newlib/libc/string/memset.c
+++ b/newlib/libc/string/memset.c
@@ -59,26 +59,26 @@ _DEFUN (memset, (m, c, n),
   int i;
   unsigned long buffer;
   unsigned long *aligned_addr;
-  unsigned int d = c & 0xff;	/* To avoid sign extension, copy C to an
-				   unsigned variable.  */
 
   if (!TOO_SMALL (n) && !UNALIGNED (m))
     {
       /* If we get this far, we know that n is large and m is word-aligned. */
+
       aligned_addr = (unsigned long*)m;
 
-      /* Store D into each char sized location in BUFFER so that
+      /* Store C into each char sized location in BUFFER so that
          we can set large blocks quickly.  */
+      c &= 0xff;
       if (LBLOCKSIZE == 4)
         {
-          buffer = (d << 8) | d;
+          buffer = (c << 8) | c;
           buffer |= (buffer << 16);
         }
       else
         {
           buffer = 0;
           for (i = 0; i < LBLOCKSIZE; i++)
-	    buffer = (buffer << 8) | d;
+	    buffer = (buffer << 8) | c;
         }
 
       while (n >= LBLOCKSIZE*4)
@@ -101,7 +101,7 @@ _DEFUN (memset, (m, c, n),
 
   while (n--)
     {
-      *s++ = (char)d;
+      *s++ = (char)c;
     }
 
   return m;
diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c
index f96f7f5..4dcfc78 100644
--- a/newlib/libc/string/strcasecmp.c
+++ b/newlib/libc/string/strcasecmp.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strcasecmp>>---case-insensitive character string compare
+	<<strcasecmp>>---case insensitive character string compare
 	
 INDEX
 	strcasecmp
@@ -22,7 +22,7 @@ DESCRIPTION
 RETURNS 
 
 	If <<*<[a]>>> sorts lexicographically after <<*<[b]>>> (after
-	both are converted to uppercase), <<strcasecmp>> returns a
+	both are converted to upper case), <<strcasecmp>> returns a
 	number greater than zero.  If the two strings match,
 	<<strcasecmp>> returns zero.  If <<*<[a]>>> sorts
 	lexicographically before <<*<[b]>>>, <<strcasecmp>> returns a
diff --git a/newlib/libc/string/strchr.c b/newlib/libc/string/strchr.c
index 60b0fde..de4585f 100644
--- a/newlib/libc/string/strchr.c
+++ b/newlib/libc/string/strchr.c
@@ -12,8 +12,8 @@ ANSI_SYNOPSIS
 TRAD_SYNOPSIS
 	#include <string.h>
 	char * strchr(<[string]>, <[c]>);
-	const char *<[string]>;
-	int <[c]>;
+	char *<[string]>;
+	int *<[c]>;
 
 DESCRIPTION
 	This function finds the first occurence of <[c]> (converted to
diff --git a/newlib/libc/string/strcoll.c b/newlib/libc/string/strcoll.c
index 65dc380..8760b22 100644
--- a/newlib/libc/string/strcoll.c
+++ b/newlib/libc/string/strcoll.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strcoll>>---locale-specific character string compare
+	<<strcoll>>---locale specific character string compare
 	
 INDEX
 	strcoll
diff --git a/newlib/libc/string/strcspn.c b/newlib/libc/string/strcspn.c
index 403330c..fe68b8f 100644
--- a/newlib/libc/string/strcspn.c
+++ b/newlib/libc/string/strcspn.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strcspn>>---count characters not in string
+	<<strcspn>>---count chars not in string
 
 INDEX
 	strcspn
diff --git a/newlib/libc/string/strerror.c b/newlib/libc/string/strerror.c
index 8bea4b7..209eeb9 100644
--- a/newlib/libc/string/strerror.c
+++ b/newlib/libc/string/strerror.c
@@ -736,7 +736,7 @@ _DEFUN (strerror, (errnum),
         error = "Socket is already connected";
         break;
 #endif
-#if defined(EOPNOTSUPP) && (!defined(ENOTSUP) || (ENOTSUP != EOPNOTSUPP))
+#ifdef EOPNOTSUPP
     case EOPNOTSUPP:
         error = "Operation not supported on socket";
         break;
diff --git a/newlib/libc/string/strerror_r.c b/newlib/libc/string/strerror_r.c
deleted file mode 100644
index be5358f..0000000
--- a/newlib/libc/string/strerror_r.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-FUNCTION
-	<<strerror_r>>---convert error number to string and copy to buffer
-
-INDEX
-	strerror_r
-
-ANSI_SYNOPSIS
-	#include <string.h>
-	char *strerror_r(int <[errnum]>, char *<[buffer]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-	#include <string.h>
-	char *strerror_r(<[errnum]>, <[buffer]>, <[n]>)
-	int <[errnum]>;
-	char *<[buffer]>;
-	size_t <[n]>;
-
-DESCRIPTION
-<<strerror_r>> converts the error number <[errnum]> into a
-string and copies the result into the supplied <[buffer]> for
-a length up to <[n]>, including the NUL terminator. The value of 
-<[errnum]> is usually a copy of <<errno>>.  If <<errnum>> is not a known 
-error number, the result is the empty string.
-
-See <<strerror>> for how strings are mapped to <<errnum>>.
-
-RETURNS
-This function returns a pointer to a string.  Your application must
-not modify that string.
-
-PORTABILITY
-<<strerror_r>> is a GNU extension.
-
-<<strerror_r>> requires no supporting OS subroutines.
-
-*/
-
-#undef __STRICT_ANSI__
-#include <errno.h>
-#include <string.h>
-
-char *
-_DEFUN (strerror_r, (errnum, buffer, n),
-	int errnum _AND
-	char *buffer _AND
-	size_t n)
-{
-  char *error;
-  error = strerror (errnum);
-
-  return strncpy (buffer, (const char *)error, n);
-}
diff --git a/newlib/libc/string/strings.tex b/newlib/libc/string/strings.tex
index 3ca732f..f70580b 100644
--- a/newlib/libc/string/strings.tex
+++ b/newlib/libc/string/strings.tex
@@ -10,30 +10,26 @@ managing areas of memory.  The corresponding declarations are in
 * bcopy::       Copy memory regions
 * bzero::       Initialize memory to zero
 * index::       Search for character in string
-* memccpy::     Copy memory regions up to end-token
 * memchr::      Find character in memory
 * memcmp::      Compare two memory areas
 * memcpy::      Copy memory regions
 * memmove::     Move possibly overlapping memory
-* mempcpy::	Copy memory regions and locate end
 * memset::      Set an area of memory
 * rindex::      Reverse search for character in string
 * strcasecmp::	Compare strings ignoring case
 * strcat::      Concatenate strings
 * strchr::      Search for character in string
 * strcmp::      Character string compare
-* strcoll::     Locale-specific character string compare
+* strcoll::     Locale specific character string compare
 * strcpy::      Copy string
 * strcspn::     Count chars not in string
 * strerror::    Convert error number to string
-* strerror_r::  Convert error number to string
 * strlen::      Character string length
-* strlwr::	Convert string to lowercase
+* strlwr::	Convert string to lower case
 * strncasecmp::	Compare strings ignoring case
 * strncat::     Concatenate strings
 * strncmp::     Character string compare
 * strncpy::     Counted copy string
-* strnlen::     Character string length
 * strpbrk::     Find chars in string
 * strrchr::     Reverse search for character in string
 * strspn::      Find initial match
@@ -57,9 +53,6 @@ managing areas of memory.  The corresponding declarations are in
 @include string/index.def
 
 @page
-@include string/memccpy.def
-
-@page
 @include string/memchr.def
 
 @page
@@ -72,9 +65,6 @@ managing areas of memory.  The corresponding declarations are in
 @include string/memmove.def
 
 @page
-@include string/mempcpy.def
-
-@page
 @include string/memset.def
 
 @page
@@ -105,9 +95,6 @@ managing areas of memory.  The corresponding declarations are in
 @include string/strerror.def
 
 @page
-@include string/strerror_r.def
-
-@page
 @include string/strlen.def
 
 @page
@@ -126,9 +113,6 @@ managing areas of memory.  The corresponding declarations are in
 @include string/strncpy.def
 
 @page
-@include string/strnlen.def
-
-@page
 @include string/strpbrk.def
 
 @page
diff --git a/newlib/libc/string/strlcat.c b/newlib/libc/string/strlcat.c
deleted file mode 100644
index 0c47bd5..0000000
--- a/newlib/libc/string/strlcat.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*      $OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $        */
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
-size_t
-_DEFUN (strlcat, (dst, src, siz),
-	char *dst _AND
-	_CONST char *src _AND
-	size_t siz)
-{
-        register char *d = dst;
-        register const char *s = src;
-        register size_t n = siz;
-        size_t dlen;
-
-        /* Find the end of dst and adjust bytes left but don't go past end */
-        while (n-- != 0 && *d != '\0')
-                d++;
-        dlen = d - dst;
-        n = siz - dlen;
-
-        if (n == 0)
-                return(dlen + strlen(s));
-        while (*s != '\0') {
-                if (n != 1) {
-                        *d++ = *s;
-                        n--;
-                }
-                s++;
-        }
-        *d = '\0';
-
-        return(dlen + (s - src));        /* count does not include NUL */
-}
-
diff --git a/newlib/libc/string/strlcpy.c b/newlib/libc/string/strlcpy.c
deleted file mode 100644
index c310016..0000000
--- a/newlib/libc/string/strlcpy.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*      $OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $        */
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t
-_DEFUN (strlcpy, (dst, src, siz),
-	char *dst _AND
-	_CONST char *src _AND
-	size_t siz)
-{
-        register char *d = dst;
-        register const char *s = src;
-        register size_t n = siz;
-
-        /* Copy as many bytes as will fit */
-        if (n != 0 && --n != 0) {
-                do {
-                        if ((*d++ = *s++) == 0)
-                                break;
-                } while (--n != 0);
-        }
-
-        /* Not enough room in dst, add NUL and traverse rest of src */
-        if (n == 0) {
-                if (siz != 0)
-                        *d = '\0';                /* NUL-terminate dst */
-                while (*s++)
-                        ;
-        }
-
-        return(s - src - 1);        /* count does not include NUL */
-}
-
diff --git a/newlib/libc/string/strlwr.c b/newlib/libc/string/strlwr.c
index 47096d4..cf0d45f 100644
--- a/newlib/libc/string/strlwr.c
+++ b/newlib/libc/string/strlwr.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strlwr>>---force string to lowercase
+	<<strlwr>>---force string to lower case
 	
 INDEX
 	strlwr
@@ -15,8 +15,8 @@ TRAD_SYNOPSIS
 	char *<[a]>;
 
 DESCRIPTION
-	<<strlwr>> converts each character in the string at <[a]> to
-	lowercase.
+	<<strlwr>> converts each characters in the string at <[a]> to
+	lower case.
 
 RETURNS
 	<<strlwr>> returns its argument, <[a]>.
diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c
index c877ba5..28c6cc4 100644
--- a/newlib/libc/string/strncasecmp.c
+++ b/newlib/libc/string/strncasecmp.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strncasecmp>>---case-insensitive character string compare
+	<<strncasecmp>>---case insensitive character string compare
 	
 INDEX
 	strncasecmp
@@ -24,7 +24,7 @@ DESCRIPTION
 RETURNS
 
 	If <<*<[a]>>> sorts lexicographically after <<*<[b]>>> (after
-	both are converted to uppercase), <<strncasecmp>> returns a
+	both are converted to upper case), <<strncasecmp>> returns a
 	number greater than zero.  If the two strings are equivalent,
 	<<strncasecmp>> returns zero.  If <<*<[a]>>> sorts
 	lexicographically before <<*<[b]>>>, <<strncasecmp>> returns a
diff --git a/newlib/libc/string/strncat.c b/newlib/libc/string/strncat.c
index 0f29247..57ca068 100644
--- a/newlib/libc/string/strncat.c
+++ b/newlib/libc/string/strncat.c
@@ -28,6 +28,7 @@ WARNINGS
 	Note that a null is always appended, so that if the copy is
 	limited by the <[length]> argument, the number of characters
 	appended to <[dst]> is <<n + 1>>.
+	
 
 RETURNS
 	This function returns the initial value of <[dst]>
diff --git a/newlib/libc/string/strndup.c b/newlib/libc/string/strndup.c
deleted file mode 100644
index caa1b68..0000000
--- a/newlib/libc/string/strndup.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _REENT_ONLY
-
-#include <_ansi.h>
-#include <reent.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *
-_DEFUN (strndup, (str, n), 
-	_CONST char *str _AND
-	size_t n)
-{
-  return _strndup_r (_REENT, str, n);
-}
-
-#endif /* !_REENT_ONLY */
diff --git a/newlib/libc/string/strndup_r.c b/newlib/libc/string/strndup_r.c
deleted file mode 100644
index 2acf63d..0000000
--- a/newlib/libc/string/strndup_r.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <reent.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *
-_DEFUN (_strndup_r, (reent_ptr, str, n), 
-        struct _reent *reent_ptr  _AND
-        _CONST char   *str _AND
-        size_t n)
-{
-  _CONST char *ptr = str;
-  size_t len;
-  char *copy;
-
-  while (n-- > 0 && *ptr)
-    ptr++;
-
-  len = ptr - str;
-
-  copy = _malloc_r (reent_ptr, len + 1);
-  if (copy)
-    {
-      memcpy (copy, str, len);
-      copy[len] = '\0';
-    }
-  return copy;
-}
diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c
deleted file mode 100644
index ed60e93..0000000
--- a/newlib/libc/string/strnlen.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* 
-FUNCTION
-	<<strnlen>>---character string length
-	
-INDEX
-	strnlen
-
-ANSI_SYNOPSIS
-	#include <string.h>
-	size_t strnlen(const char *<[str]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-	#include <string.h>
-	size_t strnlen(<[str]>, <[n]>)
-	char *<[src]>;
-	size_t <[n]>;
-
-DESCRIPTION
-	The <<strnlen>> function works out the length of the string
-	starting at <<*<[str]>>> by counting chararacters until it
-	reaches a NUL character or the maximum: <[n]> number of
-        characters have been inspected.
-
-RETURNS
-	<<strnlen>> returns the character count or <[n]>.
-
-PORTABILITY
-<<strnlen>> is a GNU extension.
-
-<<strnlen>> requires no supporting OS subroutines.
-
-*/
-
-#undef __STRICT_ANSI__
-#include <_ansi.h>
-#include <string.h>
-
-size_t
-_DEFUN (strnlen, (str, n),
-	_CONST char *str _AND
-	size_t n)
-{
-  _CONST char *start = str;
-
-  while (n-- > 0 && *str)
-    str++;
-
-  return str - start;
-}
diff --git a/newlib/libc/string/strpbrk.c b/newlib/libc/string/strpbrk.c
index 5668db3..e7f2dd2 100644
--- a/newlib/libc/string/strpbrk.c
+++ b/newlib/libc/string/strpbrk.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strpbrk>>---find characters in string
+	<<strpbrk>>---find chars in string
 
 INDEX
 	strpbrk
diff --git a/newlib/libc/string/strsep.c b/newlib/libc/string/strsep.c
deleted file mode 100644
index d3d0ad0..0000000
--- a/newlib/libc/string/strsep.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* BSD strsep function */
-
-/* Copyright 2002, Red Hat Inc. */
-
-/* undef STRICT_ANSI so that strsep prototype will be defined */
-#undef  __STRICT_ANSI__
-#include <string.h>
-#include <_ansi.h>
-#include <reent.h>
-
-extern char *__strtok_r (char *, const char *, char **, int);
-
-char *
-_DEFUN (strsep, (source_ptr, delim),
-	register char **source_ptr _AND
-	register const char *delim)
-{
-	return __strtok_r (*source_ptr, delim, source_ptr, 0);
-}
diff --git a/newlib/libc/string/strtok.c b/newlib/libc/string/strtok.c
index 7640fb7..7f250b4 100644
--- a/newlib/libc/string/strtok.c
+++ b/newlib/libc/string/strtok.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<strtok>>, <<strtok_r>>, <<strsep>>---get next token from a string
+	<<strtok>>---get next token from a string
 
 INDEX
 	strtok
@@ -8,15 +8,11 @@ INDEX
 INDEX
 	strtok_r
 
-INDEX
-	strsep
-
 ANSI_SYNOPSIS
 	#include <string.h>
       	char *strtok(char *<[source]>, const char *<[delimiters]>)
       	char *strtok_r(char *<[source]>, const char *<[delimiters]>,
 			char **<[lasts]>)
-      	char *strsep(char **<[source_ptr]>, const char *<[delimiters]>)
 
 TRAD_SYNOPSIS
 	#include <string.h>
@@ -29,10 +25,6 @@ TRAD_SYNOPSIS
 	char *<[delimiters]>;
 	char **<[lasts]>;
 
-	char *strsep(<[source_ptr]>, <[delimiters]>)
-	char **<[source_ptr]>;
-	char *<[delimiters]>;
-
 DESCRIPTION
 	The <<strtok>> function is used to isolate sequential tokens in a 
 	null-terminated string, <<*<[source]>>>. These tokens are delimited 
@@ -40,41 +32,29 @@ DESCRIPTION
 	The first time that <<strtok>> is called, <<*<[source]>>> should be
 	specified; subsequent calls, wishing to obtain further tokens from
 	the same string, should pass a null pointer instead.  The separator
-	string, <<*<[delimiters]>>>, must be supplied each time and may 
+	string, <<*<[delimiters]>>>, must be supplied each time, and may 
 	change between calls.
 
 	The <<strtok>> function returns a pointer to the beginning of each 
 	subsequent token in the string, after replacing the separator 
-	character itself with a null character.  When no more tokens remain, 
+	character itself with a NUL character.  When no more tokens remain, 
 	a null pointer is returned.
 
 	The <<strtok_r>> function has the same behavior as <<strtok>>, except
-	a pointer to placeholder <<*<[lasts]>>> must be supplied by the caller.
-
-	The <<strsep>> function is similar in behavior to <<strtok>>, except
-	a pointer to the string pointer must be supplied <<<[source_ptr]>>> and
-	the function does not skip leading delimiters.  When the string starts
-	with a delimiter, the delimiter is changed to the null character and
-	the empty string is returned.  Like <<strtok_r>> and <<strtok>>, the
-	<<*<[source_ptr]>>> is updated to the next character following the
-	last delimiter found or NULL if the end of string is reached with
-	no more delimiters.
+	a pointer to placeholder <<*[lasts]>> must be supplied by the caller.
 
 RETURNS
-	<<strtok>>, <<strtok_r>>, and <<strsep>> all return a pointer to the 
-	next token, or <<NULL>> if no more tokens can be found.  For
-	<<strsep>>, a token may be the empty string.
+	<<strtok>> returns a pointer to the next token, or <<NULL>> if
+	no more tokens can be found.
 
 NOTES
-	<<strtok>> is unsafe for multi-threaded applications.  <<strtok_r>>
-	and <<strsep>> are thread-safe and should be used instead.
+	<<strtok>> is unsafe for multi-thread applications.  <<strtok_r>>
+	is MT-Safe and should be used instead.
 
 PORTABILITY
 <<strtok>> is ANSI C.
-<<strtok_r>> is POSIX.
-<<strsep>> is a BSD extension.
 
-<<strtok>>, <<strtok_r>>, and <<strsep>> require no supporting OS subroutines.
+<<strtok>> requires no supporting OS subroutines.
 
 QUICKREF
 	strtok ansi impure
@@ -88,14 +68,11 @@ QUICKREF
 
 #ifndef _REENT_ONLY
 
-extern char *__strtok_r (char *, const char *, char **, int);
-
 char *
 _DEFUN (strtok, (s, delim),
 	register char *s _AND
 	register const char *delim)
 {
-	_REENT_CHECK_MISC(_REENT);
-	return __strtok_r (s, delim, &(_REENT_STRTOK_LAST(_REENT)), 1);
+	return strtok_r (s, delim, &(_REENT->_new._reent._strtok_last));
 }
 #endif
diff --git a/newlib/libc/string/strtok_r.c b/newlib/libc/string/strtok_r.c
index 02ad80b..ed32336 100644
--- a/newlib/libc/string/strtok_r.c
+++ b/newlib/libc/string/strtok_r.c
@@ -10,7 +10,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -30,11 +34,10 @@
 #include <string.h>
 
 char *
-_DEFUN (__strtok_r, (s, delim, lasts, skip_leading_delim),
+_DEFUN (strtok_r, (s, delim, lasts),
 	register char *s _AND
 	register const char *delim _AND
-	char **lasts _AND
-	int skip_leading_delim)
+	char **lasts)
 {
 	register char *spanp;
 	register int c, sc;
@@ -50,16 +53,8 @@ _DEFUN (__strtok_r, (s, delim, lasts, skip_leading_delim),
 cont:
 	c = *s++;
 	for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
-		if (c == sc) {
-			if (skip_leading_delim) {
-				goto cont;
-			}
-			else {
-				*lasts = s;
-				s[-1] = 0;
-				return (s - 1);
-			}
-		}
+		if (c == sc)
+			goto cont;
 	}
 
 	if (c == 0) {		/* no non-delimiter characters */
@@ -88,12 +83,3 @@ cont:
 	}
 	/* NOTREACHED */
 }
-
-char *
-_DEFUN (strtok_r, (s, delim, lasts),
-	register char *s _AND
-	register const char *delim _AND
-	char **lasts)
-{
-	return __strtok_r (s, delim, lasts, 1);
-}
diff --git a/newlib/libc/string/strupr.c b/newlib/libc/string/strupr.c
index 3f346b8..d7f7c12 100644
--- a/newlib/libc/string/strupr.c
+++ b/newlib/libc/string/strupr.c
@@ -15,8 +15,8 @@ TRAD_SYNOPSIS
 	char *<[a]>;
 
 DESCRIPTION
-	<<strupr>> converts each character in the string at <[a]> to
-	uppercase.
+	<<strupr>> converts each characters in the string at <[a]> to
+	upper case.
 
 RETURNS
 	<<strupr>> returns its argument, <[a]>.
diff --git a/newlib/libc/string/wcscat.c b/newlib/libc/string/wcscat.c
deleted file mode 100644
index 54c0b50..0000000
--- a/newlib/libc/string/wcscat.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-FUNCTION
-	<<wcscat>>---concatenate two wide-character strings
-INDEX
-	wcscat
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wcscat(wchar_t *<[s1]>, const wchar_t *<[s2]>);
-
-TRAD_SYNOPSIS
-	wchar_t *wcscat(<[s1]>, <[s2]>
-	wchar_t *<[s1]>;
-	const wchar_t *<[s2]>;
-
-DESCRIPTION
-	The <<wcscat>> function appends a copy of the wide-character string
-	pointed to by <[s2]> (including the terminating null wide-character
-	code) to the end of the wide-character string pointed to by <[s1]>.
-	The initial wide-character code of <[s2]> overwrites the null
-	wide-character code at the end of <[s1]>. If copying takes place between
-	objects that overlap, the behaviour is undefined. 
-
-RETURNS
-	The <<wcscat>> function returns <[s1]>;
-	no return value is reserved to indicate an error. 
-
-PORTABILITY
-<<wcscat>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcscat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-wchar_t *
-_DEFUN (wcscat, (s1, s2),
-	wchar_t * s1 _AND
-	_CONST wchar_t * s2)
-{
-  wchar_t *p;
-  wchar_t *q;
-  _CONST wchar_t *r;
-
-  p = s1;
-  while (*p)
-    p++;
-  q = p;
-  r = s2;
-  while (*r)
-    *q++ = *r++;
-  *q = '\0';
-  return s1;
-}
diff --git a/newlib/libc/string/wcschr.c b/newlib/libc/string/wcschr.c
deleted file mode 100644
index fb35d1f..0000000
--- a/newlib/libc/string/wcschr.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-FUNCTION
-	<<wcschr>>---wide-character string scanning operation
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wcschr(const wchar_t *<[s]>, wchar_t <[c]>);
-
-TRAD_SYNOPSIS
-	wchar_t *wcschr(<[s]>, <[c]>
-	const wchar_t *<[s]>;
-	wchar_t <[c]>;
-
-DESCRIPTION
-	The <<wcschr>> function locates the first occurrence of <[c]> in the
-	wide-character string pointed to by <[s]>. The value of <[c]> must be a
-	character representable as a type wchar_t and must be a wide-character
-	code corresponding to a valid character in the current locale.
-	The terminating null wide-character string.
-
-RETURNS
-	Upon completion, <<wcschr>> returns a pointer to the wide-character
-	code, or a null pointer if the wide-character code is not found. 
-
-PORTABILITY
-<<wcschr>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wcschr.c,v 1.1 2000/12/23 23:14:36 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcschr.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <_ansi.h>
-#include <stddef.h>
-#include <wchar.h>
-
-wchar_t *
-_DEFUN (wcschr, (s, c),
-	_CONST wchar_t * s _AND
-	wchar_t c)
-{
-  _CONST wchar_t *p;
-
-  p = s;
-  do
-    {
-      if (*p == c)
-	{
-	  /* LINTED interface specification */
-	  return (wchar_t *) p;
-	}
-    } while (*p++);
-  return NULL;
-}
diff --git a/newlib/libc/string/wcscmp.c b/newlib/libc/string/wcscmp.c
deleted file mode 100644
index 0308962..0000000
--- a/newlib/libc/string/wcscmp.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-FUNCTION
-	<<wcscmp>>---compare two wide-character strings
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	int wcscmp(const wchar_t *<[s1]>, *<[s2]>);
-
-TRAD_SYNOPSIS
-	int wcscmp(<[s1]>, <[s2]>
-	const wchar_t *<[s1]>, <[s2]>;
-
-DESCRIPTION
-	The <<wcscmp>> function compares the wide-character string pointed to
-	by <[s1]> to the wide-character string pointed to by <[s2]>.
-
-	The sign of a non-zero return value is determined by the sign of the
-	difference between the values of the first pair of wide-character codes
-	that differ in the objects being compared.
-
-RETURNS
-	Upon completion, <<wcscmp>> returns an integer greater than, equal to
-	or less than 0, if the wide-character string pointed to by <[s1]> is
-	greater than, equal to or less than the wide-character string pointed
-	to by <[s2]> respectively. 
-
-PORTABILITY
-<<wcscmp>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD$	*/
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-/*
- * Compare strings.
- */
-int
-_DEFUN (wcscmp, (s1, s2),
-	_CONST wchar_t * s1 _AND
-	_CONST wchar_t * s2)
-{
-
-  while (*s1 == *s2++)
-    if (*s1++ == 0)
-      return (0);
-  return (*s1 - *--s2);
-}
diff --git a/newlib/libc/string/wcscoll.c b/newlib/libc/string/wcscoll.c
deleted file mode 100644
index 0f0513a..0000000
--- a/newlib/libc/string/wcscoll.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-FUNCTION
-	<<wcscoll>>---locale-specific wide-character string compare
-	
-INDEX
-	wcscoll
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	int wcscoll(const wchar_t *<[stra]>, const wchar_t * <[strb]>);
-
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	int wcscoll(<[stra]>, <[strb]>)
-	wchar_t *<[stra]>;
-	wchar_t *<[strb]>;
-
-DESCRIPTION
-	<<wcscoll>> compares the wide-character string pointed to by
-	<[stra]> to the wide-character string pointed to by <[strb]>,
-	using an interpretation appropriate to the current <<LC_COLLATE>>
-	state.
-
-	The current implementation of <<wcscoll>> simply uses <<wcscmp>>
-	and does not support any language-specific sorting.
-
-RETURNS
-	If the first string is greater than the second string,
-	<<wcscoll>> returns a number greater than zero.  If the two
-	strings are equivalent, <<wcscoll>> returns zero.  If the first
-	string is less than the second string, <<wcscoll>> returns a
-	number less than zero.
-
-PORTABILITY
-<<wcscoll>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-*/
-
-#include <_ansi.h>
-#include <wchar.h>
-
-int
-_DEFUN (wcscoll, (a, b),
-	_CONST wchar_t *a _AND
-	_CONST wchar_t *b)
-
-{
-  return wcscmp (a, b);
-}
diff --git a/newlib/libc/string/wcscpy.c b/newlib/libc/string/wcscpy.c
deleted file mode 100644
index ede693d..0000000
--- a/newlib/libc/string/wcscpy.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-FUNCTION
-	<<wcscpy>>---copy a wide-character string 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wcscpy(wchar_t *<[s1]>, const wchar_t *,<[s2]>);
-
-TRAD_SYNOPSIS
-	wchar_t *wcscpy(<[s1]>, <[s2]>
-	wchar_t *<[s1]>;
-	const wchar_t *<[s2]>;
-
-DESCRIPTION
-	The <<wcscpy>> function copies the wide-character string pointed to by
-	<[s2]> (including the terminating null wide-character code) into the
-	array pointed to by <[s1]>. If copying takes place between objects that
-	overlap, the behaviour is undefined. 
-
-RETURNS
-	The <<wcscpy>> function returns <[s1]>; no return value is reserved to
-	indicate an error. 
-
-PORTABILITY
-<<wcscpy>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcscpy.c,v 1.2 2000/12/21 04:51:09 itojun Exp
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-wchar_t *
-_DEFUN (wcscpy, (s1, s2),
-	wchar_t * s1 _AND
-	_CONST wchar_t * s2)
-{
-  wchar_t *p;
-  _CONST wchar_t *q;
-
-  *s1 = '\0';
-  p = s1;
-  q = s2;
-  while (*q)
-    *p++ = *q++;
-  *p = '\0';
-
-  return s1;
-}
diff --git a/newlib/libc/string/wcscspn.c b/newlib/libc/string/wcscspn.c
deleted file mode 100644
index 5ab9656..0000000
--- a/newlib/libc/string/wcscspn.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-FUNCTION
-	<<wcscspn>>---get length of a complementary wide substring 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	size_t wcscspn(const wchar_t *<[s]>, wchar_t *<[set]>);
-
-TRAD_SYNOPSIS
-	size_t wcscspn(<[s]>, <[set]>
-	const wchar_t *<[s]>;
-	const wchar_t *<[set]>;
-
-DESCRIPTION
-	The <<wcscspn>> function computes the length of the maximum initial
-	segment of the wide-character string pointed to by <[s]> which consists
-	entirely of wide-character codes not from the wide-character string
-	pointed to by <[set]>. 
-
-RETURNS
-	The <<wcscspn>> function returns the length of the initial substring of
-	<[s1]>; no return value is reserved to indicate an error.
-
-PORTABILITY
-<<wcscspn>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wcscspn.c,v 1.1 2000/12/23 23:14:36 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcscspn.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-size_t
-_DEFUN (wcscspn, (s, set),
-	_CONST wchar_t * s _AND
-	_CONST wchar_t * set)
-{
-  _CONST wchar_t *p;
-  _CONST wchar_t *q;
-
-  p = s;
-  while (*p)
-    {
-      q = set;
-      while (*q)
-	{
-	  if (*p == *q)
-	    goto done;
-	  q++;
-	}
-      p++;
-    }
-
-done:
-  return (p - s);
-}
diff --git a/newlib/libc/string/wcslcat.c b/newlib/libc/string/wcslcat.c
deleted file mode 100644
index 75c085b..0000000
--- a/newlib/libc/string/wcslcat.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-FUNCTION
-	<<wcslcat>>---concatenate wide-character strings to specified length
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	size_t wcslcat(wchar_t *<[dst]>, const wchar_t *<[src]>, size_t <[siz]>);
-
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	size_t wcslcat(<[dst]>, <[src]>, <[siz]>
-	wchar_t *<[dst]>;
-	const wchar_t *<[src]>;
-	size_t <[siz]>;
-
-DESCRIPTION
-	The <<wcslcat>> function appends wide characters from <[src]> to
-	end of the <[dst]> wide-character string so that the resultant
-	wide-character string is not more than <[siz]> wide characters
-	including the terminating null wide-character code.  A terminating
-	null wide character is always added unless <[siz]> is 0.  Thus,
-	the maximum number of wide characters that can be appended from
-	<[src]> is <[siz]> - 1. If copying takes place between objects 
-	that overlap, the behaviour is undefined.
-
-RETURNS
-	Wide-character string length of initial <[dst]> plus the
-	wide-character string length of <[src]> (does not include
-	terminating null wide-characters).  If the return value is
-	greater than or equal to <[siz]>, then truncation occurred and
-	not all wide characters from <[src]> were appended.
-
-PORTABILITY
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $	*/
-/*	from OpenBSD: strlcat.c,v 1.3 2000/11/24 11:10:02 itojun Exp 	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-/*
- * Appends src to string dst of size siz (unlike wcsncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns wcslen(initial dst) + wcslen(src); if retval >= siz,
- * truncation occurred.
- */
-size_t
-_DEFUN (wcslcat, (dst, src, siz),
-	wchar_t * dst _AND
-	_CONST wchar_t * src _AND
-	size_t siz)
-{
-  wchar_t *d = dst;
-  _CONST wchar_t *s = src;
-  size_t n = siz;
-  size_t dlen;
-
-  /* Find the end of dst and adjust bytes left but don't go past end */
-  while (*d != '\0' && n-- != 0)
-    d++;
-  dlen = d - dst;
-  n = siz - dlen;
-
-  if (n == 0)
-    return (dlen + wcslen (s));
-  while (*s != '\0')
-    {
-      if (n != 1)
-	{
-	  *d++ = *s;
-	  n--;
-	}
-      s++;
-    }
-  *d = '\0';
-
-  return (dlen + (s - src));	/* count does not include NUL */
-}
diff --git a/newlib/libc/string/wcslcpy.c b/newlib/libc/string/wcslcpy.c
deleted file mode 100644
index 21c030b..0000000
--- a/newlib/libc/string/wcslcpy.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-FUNCTION
-	<<wcslcpy>>---copy a wide-character string to specified length
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	size_t wcslcpy(wchar_t *<[dst]>, const wchar_t *<[src]>, size_t <[siz]>);
-
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	size_t wcslcpy(<[dst]>, <[src]>, <[siz]>)
-	wchar_t *<[dst]>;
-	const wchar_t *<[src]>;
-	size_t <[siz]>;
-
-DESCRIPTION
-	<<wcslcpy>> copies wide characters from <[src]> to <[dst]>
-	such that up to <[siz]> - 1 characters are copied.  A
-	terminating null is appended to the result, unless <[siz]>
-	is zero.
-
-RETURNS
-	<<wcslcpy>> returns the number of wide characters in <[src]>,
-	not including the terminating null wide character.  If the
-	return value is greater than or equal to <[siz]>, then
-	not all wide characters were copied from <[src]> and truncation
-	occurred.
-
-PORTABILITY
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $	*/
-/*	from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp 	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns wcslen(src); if retval >= siz, truncation occurred.
- */
-size_t
-_DEFUN (wcslcpy, (dst, src, siz),
-	wchar_t * dst _AND
-	_CONST wchar_t * src _AND
-	size_t siz)
-{
-  wchar_t *d = dst;
-  _CONST wchar_t *s = src;
-  size_t n = siz;
-
-  /* Copy as many bytes as will fit */
-  if (n != 0 && --n != 0)
-    {
-      do
-	{
-	  if ((*d++ = *s++) == 0)
-	    break;
-	}
-      while (--n != 0);
-    }
-
-  /* Not enough room in dst, add NUL and traverse rest of src */
-  if (n == 0)
-    {
-      if (siz != 0)
-	*d = '\0';		/* NUL-terminate dst */
-      while (*s++)
-	;
-    }
-
-  return (s - src - 1);		/* count does not include NUL */
-}
diff --git a/newlib/libc/string/wcslen.c b/newlib/libc/string/wcslen.c
deleted file mode 100644
index d671551..0000000
--- a/newlib/libc/string/wcslen.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-FUNCTION
-	<<wcslen>>---get wide-character string length 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	size_t wcslen(const wchar_t *<[s]>);
-
-TRAD_SYNOPSIS
-	size_t wcslen(<[s]>
-	const wchar_t *<[s]>;
-
-DESCRIPTION
-	The <<wcslen>> function computes the number of wide-character codes
-	in the wide-character string to which <[s]> points, not including the
-	terminating null wide-character code.
-
-RETURNS
-	The <<wcslen>> function returns the length of <[s]>; no return value is
-	reserved to indicate an error.
-
-PORTABILITY
-<<wcslen>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wcslen.c,v 1.1 2000/12/23 23:14:36 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcslen.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-size_t
-_DEFUN (wcslen, (s),
-	_CONST wchar_t * s)
-{
-  _CONST wchar_t *p;
-
-  p = s;
-  while (*p)
-    p++;
-
-  return p - s;
-}
diff --git a/newlib/libc/string/wcsncat.c b/newlib/libc/string/wcsncat.c
deleted file mode 100644
index fd77c0c..0000000
--- a/newlib/libc/string/wcsncat.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-FUNCTION
-	<<wcsncat>>---concatenate part of two wide-character strings 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wcsncat(wchar_t *<[s1]>, const wchar_t *<[s2]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-	wchar_t *wcsncat(<[s1]>, <[s2]>, <[n]>
-	wchar_t *<[s1]>;
-	const wchar_t *<[s2]>;
-	size_t <[n]>;
-
-DESCRIPTION
-	The <<wcsncat>> function appends not more than <[n]> wide-character
-	codes (a null wide-character code and wide-character codes that follow
-	it are not appended) from the array pointed to by <[s2]> to the end of
-	the wide-character string pointed to by <[s1]>. The initial
-	wide-character code of <[s2]> overwrites the null wide-character code
-	at the end of <[s1]>.
-	A terminating null wide-character code is always appended to the result.
-	If copying takes place between objects that overlap, the behaviour is
-	undefined.
-
-RETURNS
-	The <<wcsncat>> function returns <[s1]>; no return value is reserved to
-	indicate an error.
-
-PORTABILITY
-<<wcsncat>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wcsncat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcsncat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-wchar_t *
-_DEFUN (wcsncat, (s1, s2, n),
-	wchar_t * s1 _AND
-	_CONST wchar_t * s2 _AND
-	size_t n)
-{
-  wchar_t *p;
-  wchar_t *q;
-  _CONST wchar_t *r;
-
-  p = s1;
-  while (*p)
-    p++;
-  q = p;
-  r = s2;
-  while (*r && n)
-    {
-      *q++ = *r++;
-      n--;
-    }
-  *q = '\0';
-  return s1;
-}
diff --git a/newlib/libc/string/wcsncmp.c b/newlib/libc/string/wcsncmp.c
deleted file mode 100644
index 1897f5c..0000000
--- a/newlib/libc/string/wcsncmp.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-FUNCTION
-	<<wcsncmp>>---compare part of two wide-character strings 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	int wcsncmp(const wchar_t *<[s1]>, const wchar_t *<[s2]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-	int wcsncmp(<[s1]>, <[s2]>, <[n]>
-	const wchar_t *<[s1]>;
-	const wchar_t *<[s2]>;
-	size_t <[n]>;
-
-DESCRIPTION
-	The <<wcsncmp>> function compares not more than <[n]> wide-character
-	codes (wide-character codes that follow a null wide-character code are
-	not compared) from the array pointed to by <[s1]> to the array pointed
-	to by <[s2]>.
-
-	The sign of a non-zero return value is determined by the sign of the
-	difference between the values of the first pair of wide-character codes
-	that differ in the objects being compared. 
-
-RETURNS
-	Upon successful completion, <<wcsncmp>> returns an integer greater than,
-	equal to or less than 0, if the possibly null-terminated array pointed
-	to by <[s1]> is greater than, equal to or less than the possibly
-	null-terminated array pointed to by <[s2]> respectively. 
-
-PORTABILITY
-<<wcsncmp>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD$	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-int
-_DEFUN (wcsncmp, (s1, s2, n),
-	_CONST wchar_t * s1 _AND
-	_CONST wchar_t * s2 _AND
-	size_t n)
-{
-
-  if (n == 0)
-    return (0);
-  do
-    {
-      if (*s1 != *s2++)
-	{
-	  return (*s1 - *--s2);
-	}
-      if (*s1++ == 0)
-	break;
-    }
-  while (--n != 0);
-  return (0);
-}
diff --git a/newlib/libc/string/wcsncpy.c b/newlib/libc/string/wcsncpy.c
deleted file mode 100644
index b53e9c3..0000000
--- a/newlib/libc/string/wcsncpy.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-FUNCTION
-	<<wcsncpy>>---copy part of a wide-character string 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wcsncpy(wchar_t *<[s1]>, const wchar_t *<[s2]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-	wchar_t *wcsncpy(<[s1]>, <[s2]>, <[n]>
-	wchar_t *<[s1]>;
-	const wchar_t *<[s2]>;
-	size_t <[n]>;
-
-DESCRIPTION
-	The <<wcsncpy>> function copies not more than n wide-character codes
-	(wide-character codes that follow a null wide-character code are not
-	copied) from the array pointed to by <[s2]> to the array pointed to
-	by <[s1]>. If copying takes place between objects that overlap, the
-	behaviour is undefined.
-
-	If the array pointed to by <[s2]> is a wide-character string that is
-	shorter than <[n]> wide-character codes, null wide-character codes are
-	appended to the copy in the array pointed to by <[s1]>, until <[n]>
-	wide-character codes in all are written. 
-
-RETURNS
-	The <<wcsncpy>> function returns <[s1]>; no return value is reserved to
-	indicate an error. 
-
-PORTABILITY
-<<wcsncpy>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wcsncpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcsncpy.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-wchar_t *
-_DEFUN (wcsncpy, (s1, s2, n),
-	wchar_t * s1 _AND
-	_CONST wchar_t * s2 _AND
-	size_t n)
-{
-  wchar_t *p;
-  _CONST wchar_t *q;
-
-  *s1 = '\0';
-  p = s1;
-  q = s2;
-  while (n && *q)
-    {
-      *p++ = *q++;
-      n--;
-    }
-  *p = '\0';
-
-  return s1;
-}
diff --git a/newlib/libc/string/wcsnlen.c b/newlib/libc/string/wcsnlen.c
deleted file mode 100644
index 9d680d6..0000000
--- a/newlib/libc/string/wcsnlen.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* 
-FUNCTION
-        <<wcsnlen>>---get fixed-size wide-character string length
-    
-INDEX
-        wcsnlen
-
-ANSI_SYNOPSIS
-        #include <wchar.h>
-        size_t wcsnlen(const wchar_t *<[s]>, size_t <[maxlen]>);
-
-TRAD_SYNOPSIS
-        #include <wchar.h>
-        size_t wcsnlen(<[s]>, <[maxlen]>)
-        wchar_t *<[s]>;
-        size_t <[maxlen]>;
-
-DESCRIPTION
-        The <<wcsnlen>> function computes the number of wide-character codes
-        in the wide-character string pointed to by <[s]> not including the
-        terminating L'\0' wide character but at most <[maxlen]> wide
-        characters.
-
-RETURNS
-        <<wcsnlen>> returns the length of <[s]> if it is less then <[maxlen]>,
-        or <[maxlen]> if there is no L'\0' wide character in first <[maxlen]>
-        characters.
-
-PORTABILITY
-<<wcsnlen>> is a GNU extension.
-
-<<wcsnlen>> requires no supporting OS subroutines.
-*/
-
-/*
- * Copyright (c) 2003, Artem B. Bityuckiy (dedekind@mail.ru).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the above copyright notice,
- * this condition statement, and the following disclaimer are retained
- * in any redistributions of the source code.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <wchar.h>
-
-size_t
-_DEFUN(wcsnlen, (s, maxlen), 
-                 _CONST wchar_t *s _AND 
-                 size_t maxlen)
-{
-  _CONST wchar_t *p;
-
-  p = s;
-  while (*p && maxlen-- > 0)
-    p++;
-
-  return (size_t)(p - s);
-}
-
-
-
diff --git a/newlib/libc/string/wcspbrk.c b/newlib/libc/string/wcspbrk.c
deleted file mode 100644
index fbdf9e4..0000000
--- a/newlib/libc/string/wcspbrk.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-FUNCTION
-	<<wcspbrk>>----scan wide-character string for a wide-character code
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wcspbrk(const wchar_t *<[s]>, const wchar_t *<[set]>);
-
-TRAD_SYNOPSIS
-	wchar_t *wcspbrk(<[s]>, <[set]>
-	const wchar_t *<[s]>;
-	const wchar_t *<[set]>;
-
-DESCRIPTION
-	The <<wcspbrk>> function locates the first occurrence in the
-	wide-character string pointed to by <[s]> of any wide-character code
-	from the wide-character string pointed to by <[set]>. 
-
-RETURNS
-	Upon successful completion, <<wcspbrk>> returns a pointer to the
-	wide-character code or a null pointer if no wide-character code from
-	<[set]> occurs in <[s]>.
-
-PORTABILITY
-<<wcspbrk>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wcspbrk.c,v 1.1 2000/12/23 23:14:37 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcspbrk.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <_ansi.h>
-#include <stddef.h>
-#include <wchar.h>
-
-wchar_t *
-_DEFUN (wcspbrk, (s, set),
-	_CONST wchar_t * s _AND
-	_CONST wchar_t * set)
-{
-  _CONST wchar_t *p;
-  _CONST wchar_t *q;
-
-  p = s;
-  while (*p)
-    {
-      q = set;
-      while (*q)
-	{
-	  if (*p == *q)
-	    {
-	      /* LINTED interface specification */
-	      return (wchar_t *) p;
-	    }
-	  q++;
-	}
-      p++;
-    }
-  return NULL;
-}
diff --git a/newlib/libc/string/wcsrchr.c b/newlib/libc/string/wcsrchr.c
deleted file mode 100644
index 495d95a..0000000
--- a/newlib/libc/string/wcsrchr.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-FUNCTION
-	<<wcsrchr>>---wide-character string scanning operation 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wcsrchr(const wchar_t *<[s]>, wchar_t <[c]>);
-
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wcsrchr(<[s]>, <[c]>
-	const wchar_t *<[s]>;
-	wchar_t <[c]>;
-
-DESCRIPTION
-	The <<wcsrchr>> function locates the last occurrence of <[c]> in the
-	wide-character string pointed to by <[s]>. The value of <[c]> must be a
-	character representable as a type wchar_t and must be a wide-character
-	code corresponding to a valid character in the current locale.
-	The terminating null wide-character code is considered to be part of
-	the wide-character string. 
-
-RETURNS
-	Upon successful completion, <<wcsrchr>> returns a pointer to the
-	wide-character code or a null pointer if <[c]> does not occur in the
-	wide-character string.
-
-PORTABILITY
-<<wcsrchr>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wcsrchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcsrchr.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <_ansi.h>
-#include <stddef.h>
-#include <wchar.h>
-
-wchar_t *
-_DEFUN (wcsrchr, (s, c),
-	_CONST wchar_t * s _AND
-	wchar_t c)
-{
-  _CONST wchar_t *p;
-
-  p = s;
-  while (*p)
-    p++;
-  while (s <= p)
-    {
-      if (*p == c)
-	{
-	  /* LINTED interface specification */
-	  return (wchar_t *) p;
-	}
-      p--;
-    }
-  return NULL;
-}
diff --git a/newlib/libc/string/wcsspn.c b/newlib/libc/string/wcsspn.c
deleted file mode 100644
index e83f42f..0000000
--- a/newlib/libc/string/wcsspn.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-FUNCTION
-	<<wcsspn>>---get length of a wide substring 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	size_t wcsspn(const wchar_t *<[s]>, const wchar_t *<[set]>);
-
-TRAD_SYNOPSIS
-	size_t wcsspn(<[s]>, <[set]>
-	const wchar_t *<[s]>;
-	const wchar_t *<[set]>;
-
-DESCRIPTION
-	The <<wcsspn>> function computes the length of the maximum initial
-	segment of the wide-character string pointed to by <[s]> which consists
-	entirely of wide-character codes from the wide-character string
-	pointed to by <[set]>.
-
-RETURNS
-	The wcsspn() function returns the length <[s1]>; no return value is
-	reserved to indicate an error.
-
-PORTABILITY
-<<wcsspn>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wcsspn.c,v 1.1 2000/12/23 23:14:37 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcsspn.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-size_t
-_DEFUN (wcsspn, (s, set),
-	_CONST wchar_t * s _AND
-	_CONST wchar_t * set)
-{
-  _CONST wchar_t *p;
-  _CONST wchar_t *q;
-
-  p = s;
-  while (*p)
-    {
-      q = set;
-      while (*q)
-	{
-	  if (*p == *q)
-	    break;
-	  q++;
-	}
-      if (!*q)
-	goto done;
-      p++;
-    }
-
-done:
-  return (p - s);
-}
diff --git a/newlib/libc/string/wcsstr.c b/newlib/libc/string/wcsstr.c
deleted file mode 100644
index 0b00396..0000000
--- a/newlib/libc/string/wcsstr.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-FUNCTION
-	<<wcsstr>>---find a wide-character substring 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wcsstr(const wchar_t *<[big]>, const wchar_t *<[little]>);
-
-TRAD_SYNOPSIS
-	wchar_t *wcsstr(<[big]>, <[little]>
-	const wchar_t *<[big]>;
-	const wchar_t *<[little]>;
-
-DESCRIPTION
-	The <<wcsstr>> function locates the first occurrence in the
-	wide-character string pointed to by <[big]> of the sequence of
-	wide characters (excluding the terminating null wide character) in the
-	wide-character string pointed to by <[little]>.
-
-RETURNS
-	On successful completion, <<wcsstr>> returns a pointer to the located
-	wide-character string, or a null pointer if the wide-character string
-	is not found.
-
-	If <[little]> points to a wide-character string with zero length,
-	the function returns <[big]>.
-
-PORTABILITY
-<<wcsstr>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-*/
-
-/*	$NetBSD: wcsstr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wcsstr.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <_ansi.h>
-#include <stddef.h>
-#include <wchar.h>
-
-wchar_t *
-_DEFUN (wcsstr, (big, little),
-	_CONST wchar_t * big _AND
-	_CONST wchar_t * little)
-{
-  _CONST wchar_t *p;
-  _CONST wchar_t *q;
-  _CONST wchar_t *r;
-
-  if (!*little)
-    {
-      /* LINTED interface specification */
-      return (wchar_t *) big;
-    }
-  if (wcslen (big) < wcslen (little))
-    return NULL;
-
-  p = big;
-  q = little;
-  while (*p)
-    {
-      q = little;
-      r = p;
-      while (*q)
-	{
-	  if (*r != *q)
-	    break;
-	  q++;
-	  r++;
-	}
-      if (!*q)
-	{
-	  /* LINTED interface specification */
-	  return (wchar_t *) p;
-	}
-      p++;
-    }
-  return NULL;
-}
diff --git a/newlib/libc/string/wcstrings.tex b/newlib/libc/string/wcstrings.tex
deleted file mode 100644
index df6edc4..0000000
--- a/newlib/libc/string/wcstrings.tex
+++ /dev/null
@@ -1,106 +0,0 @@
-@node Wchar strings
-@chapter Wide Character Strings (@file{wchar.h})
-
-This chapter describes wide-character string-handling functions and
-managing areas of memory containing wide characters.  The corresponding 
-declarations are in @file{wchar.h}.
-
-@menu
-* wmemchr::     Find wide character in memory
-* wmemcmp::     Compare two wide-character memory areas
-* wmemcpy::     Copy wide-character memory regions
-* wmemmove::    Move possibly overlapping wide-character memory
-* wmemset::     Set an area of memory to a specified wide character
-* wcscat::      Concatenate wide-character strings
-* wcschr::      Search for wide character in string
-* wcscmp::      Wide-character string compare
-* wcscoll::     Locale-specific wide-character string compare
-* wcscpy::      Copy wide-character string
-* wcscspn::     Count wide characters not in string
-* wcslcat::     Concatenate wide-character strings to specified length
-* wcslcpy::     Copy wide-character string to specified length
-* wcslen::      Wide-character string length
-* wcsncat::     Concatenate wide-character strings
-* wcsncmp::     Wide-character string compare
-* wcsncpy::     Counted copy wide-character string
-* wcsnlen::     Wide-character string length with maximum limit
-* wcspbrk::     Find wide characters in string
-* wcsrchr::     Reverse search for wide character in string
-* wcsspn::      Find initial match in wide-character string
-* wcsstr::      Find wide-character string segment
-* wcswidth::    Number of column positions of a wide-character string
-* wcwidth::     Number of column positions of a wide-character code
-@end menu
-
-@page
-@include string/wmemchr.def
-
-@page
-@include string/wmemcmp.def
-
-@page
-@include string/wmemcpy.def
-
-@page
-@include string/wmemmove.def
-
-@page
-@include string/wmemset.def
-
-@page
-@include string/wcscat.def
-
-@page
-@include string/wcschr.def
-
-@page
-@include string/wcscmp.def
-
-@page
-@include string/wcscoll.def
-
-@page
-@include string/wcscpy.def
-
-@page
-@include string/wcscspn.def
-
-@page
-@include string/wcslcat.def
-
-@page
-@include string/wcslcpy.def
-
-@page
-@include string/wcslen.def
-
-@page
-@include string/wcsncat.def
-
-@page
-@include string/wcsncmp.def
-
-@page
-@include string/wcsncpy.def
-
-@page
-@include string/wcsnlen.def
-
-@page
-@include string/wcspbrk.def
-
-@page
-@include string/wcsrchr.def
-
-@page
-@include string/wcsspn.def
-
-@page
-@include string/wcsstr.def
-
-@page
-@include string/wcswidth.def
-
-@page
-@include string/wcwidth.def
-
diff --git a/newlib/libc/string/wcswidth.c b/newlib/libc/string/wcswidth.c
deleted file mode 100644
index 8a9670e..0000000
--- a/newlib/libc/string/wcswidth.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-FUNCTION
-	<<wcswidth>>---number of column positions of a wide-character string
-	
-INDEX
-	wcswidth
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	int wcswidth(const wchar_t *<[pwcs]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	int wcswidth(<[pwcs]>, <[n]>)
-	wchar_t *<[wc]>;
-	size_t <[n]>;
-
-DESCRIPTION
-	The <<wcswidth>> function shall determine the number of column
-	positions required for <[n]> wide-character codes (or fewer than <[n]>
-	wide-character codes if a null wide-character code is encountered
-	before <[n]> wide-character codes are exhausted) in the string pointed
-	to by <[pwcs]>.
-
-RETURNS
-	The <<wcswidth>> function either shall return 0 (if <[pwcs]> points to a
-	null wide-character code), or return the number of column positions
-	to be occupied by the wide-character string pointed to by <[pwcs]>, or
-	return -1 (if any of the first <[n]> wide-character codes in the
-	wide-character string pointed to by <[pwcs]> is not a printable
-	wide-character code).
-
-PORTABILITY
-<<wcswidth>> has been introduced in the Single UNIX Specification Volume 2.
-<<wcswidth>> has been marked as an extension in the Single UNIX Specification Volume 3.
-*/
-
-#include <_ansi.h>
-#include <wchar.h>
-
-int
-_DEFUN (wcswidth, (pwcs, n),
-	_CONST wchar_t *pwcs _AND
-	size_t n)
-
-{
-  int w, len = 0;
-  if (!pwcs || n == 0)
-    return 0;
-  do {
-    if ((w = wcwidth (*pwcs)) < 0)
-      return -1;
-    len += w;
-  } while (*pwcs++ && --n > 0);
-  return len;
-}
diff --git a/newlib/libc/string/wcwidth.c b/newlib/libc/string/wcwidth.c
deleted file mode 100644
index d886b4a..0000000
--- a/newlib/libc/string/wcwidth.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-FUNCTION
-	<<wcwidth>>---number of column positions of a wide-character code
-	
-INDEX
-	wcwidth
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	int wcwidth(const wchar_t <[wc]>);
-
-TRAD_SYNOPSIS
-	#include <wchar.h>
-	int wcwidth(<[wc]>)
-	wchar_t *<[wc]>;
-
-DESCRIPTION
-	The <<wcwidth>> function shall determine the number of column
-	positions required for the wide character <[wc]>. The application
-	shall ensure that the value of <[wc]> is a character representable
-	as a wchar_t, and is a wide-character code corresponding to a
-	valid character in the current locale.
-
-RETURNS
-	The <<wcwidth>> function shall either return 0 (if <[wc]> is a null
-	wide-character code), or return the number of column positions to
-	be occupied by the wide-character code <[wc]>, or return -1 (if <[wc]>
-	does not correspond to a printable wide-character code).
-
-	The current implementation of <<wcwidth>> simply sets the width
-	of all printable characters to 1 since newlib has no character
-	tables around.
-
-PORTABILITY
-<<wcwidth>> has been introduced in the Single UNIX Specification Volume 2.
-<<wcwidth>> has been marked as an extension in the Single UNIX Specification Volume 3.
-*/
-
-#include <_ansi.h>
-#include <wchar.h>
-#include <wctype.h>
-
-int
-_DEFUN (wcwidth, (wc),
-	_CONST wchar_t wc)
-
-{
-  if (iswprint (wc))
-    return 1;
-  if (iswcntrl (wc) || wc == L'\0')
-    return 0;
-  return -1;
-}
diff --git a/newlib/libc/string/wmemchr.c b/newlib/libc/string/wmemchr.c
deleted file mode 100644
index b582b89..0000000
--- a/newlib/libc/string/wmemchr.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-FUNCTION
-	<<wmemchr>>---find a wide character in memory
- 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	wchar_t	*wmemchr(const wchar_t *<[s]>, wchar_t <[c]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-	wchar_t	*wmemchr(<[s]>, <[c]>, <[n]>
-	const wchar_t *<[s]>;
-	wchar_t <[c]>;
-	size_t <[n]>;
-
-DESCRIPTION
-	The <<wmemchr>> function locates the first occurrence of <[c]> in the
-	initial <[n]> wide characters of the object pointed to be <[s]>. This
-	function is not affected by locale and all wchar_t values are treated
-	identically.  The null wide character and wchar_t values not
-	corresponding to valid characters are not treated specially.
-
-	If <[n]> is zero, <[s]> must be a valid pointer and the function
-	behaves as if no valid occurrence of <[c]> is found. 
-
-RETURNS
-	The <<wmemchr>> function returns a pointer to the located
-	wide character, or a null pointer if the wide character does not occur
-	in the object. 
-
-PORTABILITY
-<<wmemchr>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wmemchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wmemchr.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-
-#include <_ansi.h>
-#include <wchar.h>
-
-wchar_t *
-_DEFUN (wmemchr, (s, c, n),
-	_CONST wchar_t * s _AND
-	wchar_t c _AND
-	size_t n)
-{
-  size_t i;
-
-  for (i = 0; i < n; i++)
-    {
-      if (*s == c)
-	{
-	  /* LINTED const castaway */
-	  return (wchar_t *) s;
-	}
-      s++;
-    }
-  return NULL;
-}
diff --git a/newlib/libc/string/wmemcmp.c b/newlib/libc/string/wmemcmp.c
deleted file mode 100644
index af9ee32..0000000
--- a/newlib/libc/string/wmemcmp.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-FUNCTION
-	<<wmemcmp>>---compare wide characters in memory 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	int wmemcmp(const wchar_t *<[s1]>, const wchar_t *<[s2]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-	int wmemcmp(<[s1]>, <[s2]>, <[n]>
-	const wchar_t *<[s1]>;
-	const wchar_t *<[s2]>;
-	size_t <[n]>;
-
-DESCRIPTION
-	The <<wmemcmp>> function compares the first <[n]> wide characters of the
-	object pointed to by <[s1]> to the first <[n]> wide characters of the
-	object pointed to by <[s2]>. This function is not affected by locale
-	and all wchar_t values are treated identically. The null wide character
-	and wchar_t values not corresponding to valid characters are not treated
-	specially.
-
-	If <[n]> is zero, <[s1]> and <[s2]> must be a valid pointers and the
-	function behaves as if the two objects compare equal. 
-
-RETURNS
-	The <<wmemcmp>> function returns an integer greater than, equal to,
-	or less than zero, accordingly as the object pointed to by <[s1]> is
-	greater than, equal to, or less than the object pointed to by <[s2]>.
-
-PORTABILITY
-<<wmemcmp>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wmemcmp.c,v 1.1 2000/12/23 23:14:37 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wmemcmp.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-int
-_DEFUN (wmemcmp, (s1, s2, n),
-	_CONST wchar_t * s1 _AND
-	_CONST wchar_t * s2 _AND
-	size_t n)
-{
-  size_t i;
-
-  for (i = 0; i < n; i++)
-    {
-      if (*s1 != *s2)
-	{
-	  /* wchar might be unsigned */
-	  return *s1 > *s2 ? 1 : -1;
-	}
-      s1++;
-      s2++;
-    }
-  return 0;
-}
diff --git a/newlib/libc/string/wmemcpy.c b/newlib/libc/string/wmemcpy.c
deleted file mode 100644
index 748e8e1..0000000
--- a/newlib/libc/string/wmemcpy.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-FUNCTION
-	<<wmemcpy>>---copy wide characters in memory 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wmemcpy(wchar_t *<[d]>, const wchar_t *<[s]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-	wchar_t *wmemcpy(<[d]>, <[s]>, <[n]>
-	wchar_t *<[d]>;
-	const wchar_t *<[s]>;
-	size_t <[n]>;
-
-DESCRIPTION
-	The <<wmemcpy>> function copies <[n]> wide characters from the object
-	pointed to by <[s]> to the object pointed to be <[d]>. This function
-	is not affected by locale and all wchar_t values are treated
-	identically.  The null wide character and wchar_t values not
-	corresponding to valid characters are not treated specially.
-
-	If <[n]> is zero, <[d]> and <[s]> must be a valid pointers, and the
-	function copies zero wide characters. 
-
-RETURNS
-	The <<wmemcpy>> function returns the value of <[d]>.
-
-PORTABILITY
-<<wmemcpy>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wmemcpy.c,v 1.1 2000/12/23 23:14:37 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wmemcpy.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <_ansi.h>
-#include <string.h>
-#include <wchar.h>
-
-wchar_t *
-_DEFUN (wmemcpy, (d, s, n),
-	wchar_t * d _AND
-	_CONST wchar_t * s _AND
-	size_t n)
-{
-
-  return (wchar_t *) memcpy (d, s, n * sizeof (wchar_t));
-}
diff --git a/newlib/libc/string/wmemmove.c b/newlib/libc/string/wmemmove.c
deleted file mode 100644
index e20a26a..0000000
--- a/newlib/libc/string/wmemmove.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-FUNCTION
-	<<wmemmove>>---copy wide characters in memory with overlapping areas 
-
-ANSI_SYNOPSIS
-	#include <wchar.h>
-	wchar_t *wmemmove(wchar_t *<[d]>, const wchar_t *<[s]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-	wchar_t *wmemmove(<[d]>, <[s]>, <[n]>
-	wchar_t *<[d]>;
-	const wchar_t *<[s]>;
-	size_t <[n]>;
-
-DESCRIPTION
-	The <<wmemmove>> function copies <[n]> wide characters from the object
-	pointed to by <[s]> to the object pointed to by <[d]>. Copying takes
-	place as if the <[n]> wide characters from the object pointed to by
-	<[s]> are first copied into a temporary array of <[n]> wide characters
-	that does not overlap the objects pointed to by <[d]> or <[s]>, and then
-	the <[n]> wide characters from the temporary array are copied into the
-	object pointed to by <[d]>.
-
-	This function is not affected by locale and all wchar_t values are
-	treated identically. The null wide character and wchar_t values not
-	corresponding to valid characters are not treated specially.
-
-	If <[n]> is zero, <[d]> and <[s]> must be a valid pointers, and the
-	function copies zero wide characters. 
-
-RETURNS
-	The <<wmemmove>> function returns the value of <[d]>.
-
-PORTABILITY
-<<wmemmove>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*	$NetBSD: wmemmove.c,v 1.1 2000/12/23 23:14:37 itojun Exp $	*/
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wmemmove.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <_ansi.h>
-#include <string.h>
-#include <wchar.h>
-
-wchar_t *
-_DEFUN (wmemmove, (d, s, n),
-	wchar_t * d _AND
-	_CONST wchar_t * s _AND
-	size_t n)
-{
-
-  return (wchar_t *) memmove (d, s, n * sizeof (wchar_t));
-}
diff --git a/newlib/libc/string/wmemset.c b/newlib/libc/string/wmemset.c
deleted file mode 100644
index 0af6f91..0000000
--- a/newlib/libc/string/wmemset.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-FUNCTION
-       <<wmemset>>---set wide characters in memory 
-
-ANSI_SYNOPSIS
-       #include <wchar.h>
-       wchar_t *wmemset(wchar_t *<[s]>, wchar_t <[c]>, size_t <[n]>);
-
-TRAD_SYNOPSIS
-       wchar_t *wmemset(<[s]>, <[c]>, <[n]>
-       wchar_t *<[s]>;
-       wchar_t <[c]>;
-       size_t <[n]>;
-
-DESCRIPTION
-       The <<wmemset>> function copies the value of <[c]> into each of the
-       first <[n]> wide characters of the object pointed to by <[s]>.  This
-       function is not affected by locale and all wchar_t values are treated
-       identically.  The null wide character and wchar_t values not
-       corresponding to valid characters are not treated specially.
-
-       If <[n]> is zero, <[s]> must be a valid pointer and the function
-       copies zero wide characters.
-
-RETURNS
-       The <<wmemset>> function returns the value of <[s]>.
-
-PORTABILITY
-<<wmemset>> is ISO/IEC 9899/AMD1:1995 (ISO C).
-
-No supporting OS subroutines are required.
-*/
-
-/*     $NetBSD: wmemset.c,v 1.1 2000/12/23 23:14:37 itojun Exp $       */
-
-/*-
- * Copyright (c)1999 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	citrus Id: wmemset.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <_ansi.h>
-#include <wchar.h>
-
-wchar_t	*
-_DEFUN(wmemset, (s, c, n),
-	wchar_t *s _AND
-	wchar_t c _AND
-	size_t n)
-{
-	size_t i;
-	wchar_t *p;
-
-	p = (wchar_t *)s;
-	for (i = 0; i < n; i++) {
-		*p = c;
-		p++;
-	}
-	return s;
-}
diff --git a/newlib/libc/sys.tex b/newlib/libc/sys.tex
index 3b04c15..3182b71 100644
--- a/newlib/libc/sys.tex
+++ b/newlib/libc/sys.tex
@@ -34,7 +34,7 @@ Graceful failure is permitted by returning an error code.  A minor
 complication arises here: the C library must be compatible with
 development environments that supply fully functional versions of these
 subroutines.  Such environments usually return error codes in a global
-@code{errno}.  However, the Red Hat newlib C library provides a @emph{macro}
+@code{errno}.  However, the Cygnus C library provides a @emph{macro}
 definition for @code{errno} in the header file @file{errno.h}, as part
 of its support for reentrant routines (@pxref{Reentrancy,,Reentrancy}).
 
@@ -68,8 +68,8 @@ it (@code{exit}, @code{system}).
 Close a file.  Minimal implementation:
 
 @example
-int close(int file) @{
-  return -1;
+int close(int file)@{
+    return -1;
 @}
 @end example
 
@@ -90,8 +90,8 @@ without processes):
 #include <errno.h>
 #undef errno
 extern int errno;
-int execve(char *name, char **argv, char **env) @{
-  errno = ENOMEM;
+int execve(char *name, char **argv, char **env)@{
+  errno=ENOMEM;
   return -1;
 @}
 @end example
@@ -103,8 +103,8 @@ Create a new process.  Minimal implementation (for a system without processes):
 #include <errno.h>
 #undef errno
 extern int errno;
-int fork(void) @{
-  errno = EAGAIN;
+int fork() @{
+  errno=EAGAIN;
   return -1;
 @}
 @end example
@@ -129,7 +129,7 @@ conflict with other processes.  Minimal implementation, for a system
 without processes:
 
 @example
-int getpid(void) @{
+int getpid() @{
   return 1;
 @}
 @end example
@@ -140,8 +140,8 @@ other minimal implementations, which only support output to
 @code{stdout}, this minimal implementation is suggested:
 
 @example
-int isatty(int file) @{
-  return 1;
+int isatty(int file)@{
+   return 1;
 @}
 @end example
 
@@ -152,9 +152,9 @@ Send a signal.  Minimal implementation:
 #include <errno.h>
 #undef errno
 extern int errno;
-int kill(int pid, int sig) @{
-  errno = EINVAL;
-  return -1;
+int kill(int pid, int sig)@{
+  errno=EINVAL;
+  return(-1);
 @}
 @end example
 
@@ -165,8 +165,8 @@ Establish a new name for an existing file.  Minimal implementation:
 #include <errno.h>
 #undef errno
 extern int errno;
-int link(char *old, char *new) @{
-  errno = EMLINK;
+int link(char *old, char *new)@{
+  errno=EMLINK;
   return -1;
 @}
 @end example
@@ -175,26 +175,19 @@ int link(char *old, char *new) @{
 Set position in a file.  Minimal implementation:
 
 @example
-int lseek(int file, int ptr, int dir) @{
-  return 0;
+int lseek(int file, int ptr, int dir)@{
+    return 0;
 @}
 @end example
 
-@item open
-Open a file.  Minimal implementation:
-
-@example
-int open(const char *name, int flags, int mode) @{
-  return -1;
-@}
-@end example
+@c FIXME! Why no stub for open?
 
 @item read
 Read from a file.  Minimal implementation:
 
 @example
-int read(int file, char *ptr, int len) @{
-  return 0;
+int read(int file, char *ptr, int len)@{
+    return 0;
 @}
 @end example
 
@@ -202,23 +195,24 @@ int read(int file, char *ptr, int len) @{
 Increase program data space.  As @code{malloc} and related functions
 depend on this, it is useful to have a working implementation.  The
 following suffices for a standalone system; it exploits the symbol
-@code{_end} automatically defined by the GNU linker.
+@code{end} automatically defined by the GNU linker.
 
 @example
 @group
-caddr_t sbrk(int incr) @{
-  extern char _end;		/* @r{Defined by the linker} */
+caddr_t sbrk(int incr)@{
+  extern char end;		/* @r{Defined by the linker} */
   static char *heap_end;
   char *prev_heap_end;
  
   if (heap_end == 0) @{
-    heap_end = &_end;
+    heap_end = &end;
   @}
   prev_heap_end = heap_end;
-  if (heap_end + incr > stack_ptr) @{
-    write (1, "Heap and stack collision\n", 25);
-    abort ();
-  @}
+  if (heap_end + incr > stack_ptr)
+    @{
+      _write (1, "Heap and stack collision\n", 25);
+      abort ();
+    @}
 
   heap_end += incr;
   return (caddr_t) prev_heap_end;
@@ -240,7 +234,7 @@ int stat(char *file, struct stat *st) @{
 Timing information for current process.  Minimal implementation:
 
 @example
-int times(struct tms *buf) @{
+int times(struct tms *buf)@{
   return -1;
 @}
 @end example
@@ -252,8 +246,8 @@ Remove a file's directory entry.  Minimal implementation:
 #include <errno.h>
 #undef errno
 extern int errno;
-int unlink(char *name) @{
-  errno = ENOENT;
+int unlink(char *name)@{
+  errno=ENOENT;
   return -1; 
 @}
 @end example
@@ -265,30 +259,30 @@ Wait for a child process.  Minimal implementation:
 #undef errno
 extern int errno;
 int wait(int *status) @{
-  errno = ECHILD;
+  errno=ECHILD;
   return -1;
 @}
 @end example
 
 @item write
-Write to a file.  @file{libc} subroutines will use this
+Write a character to a file.  @file{libc} subroutines will use this
 system routine for output to all files, @emph{including}
 @code{stdout}---so if you need to generate any output, for example to a
 serial port for debugging, you should make your minimal @code{write}
 capable of doing this.  The following minimal implementation is an
-incomplete example; it relies on a @code{outbyte} subroutine (not
+incomplete example; it relies on a @code{writechar} subroutine (not
 shown; typically, you must write this in assembler from examples
 provided by your hardware manufacturer) to actually perform the output.
 
 @example
 @group
-int write(int file, char *ptr, int len) @{
-  int todo;
-
-  for (todo = 0; todo < len; todo++) @{
-    outbyte (*ptr++);
-  @}
-  return len;
+int write(int file, char *ptr, int len)@{
+    int todo;
+  
+    for (todo = 0; todo < len; todo++) @{
+        writechar(*ptr++);
+    @}
+    return len;
 @}
 @end group
 @end example
@@ -347,17 +341,6 @@ int _open_r(void *@var{reent},
     const char *@var{file}, int @var{flags}, int @var{mode});
 @end example
 
-@ifset STDIO64
-@item _open64_r
-A reentrant version of @code{open64}.  It takes a pointer
-to the global data block, which holds @code{errno}.
-
-@example
-int _open64_r(void *@var{reent},
-    const char *@var{file}, int @var{flags}, int @var{mode});
-@end example
-@end ifset
-
 @item _close_r
 A reentrant version of @code{close}.  It takes a pointer to the global
 data block, which holds @code{errno}.
@@ -375,17 +358,6 @@ off_t _lseek_r(void *@var{reent},
     int @var{fd}, off_t @var{pos}, int @var{whence});
 @end example
 
-@ifset STDIO64
-@item _lseek64_r
-A reentrant version of @code{lseek64}.  It takes a pointer to the global
-data block, which holds @code{errno}.
-
-@example
-off_t _lseek64_r(void *@var{reent},
-    int @var{fd}, off_t @var{pos}, int @var{whence});
-@end example
-@end ifset
-
 @item _read_r
 A reentrant version of @code{read}.  It takes a pointer to the global
 data block, which holds @code{errno}.
@@ -438,17 +410,6 @@ int _fstat_r(void *@var{reent},
     int @var{fd}, struct stat *@var{pstat});
 @end example
 
-@ifset STDIO64
-@item _fstat64_r
-A reentrant version of @code{fstat64}.  It takes a pointer to the global
-data block, which holds @code{errno}.
-
-@example
-int _fstat64_r(void *@var{reent},
-    int @var{fd}, struct stat *@var{pstat});
-@end example
-@end ifset
-
 @item _link_r
 A reentrant version of @code{link}.  It takes a pointer to the global
 data block, which holds @code{errno}.
diff --git a/newlib/libc/sys/Makefile.in b/newlib/libc/sys/Makefile.in
index 2273630..6a196d3 100644
--- a/newlib/libc/sys/Makefile.in
+++ b/newlib/libc/sys/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,23 +57,15 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
@@ -81,10 +73,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
 libm_machine_dir = @libm_machine_dir@
@@ -97,11 +87,11 @@ AUTOMAKE_OPTIONS = cygnus
 
 SUBDIRS = $(sys_dir) .
 
-@HAVE_SYS_DIR_TRUE@SYSLIB = lib.a
+@HAVE_SYS_DIR_TRUE@SYSLIB = @HAVE_SYS_DIR_TRUE@lib.a
 
 noinst_DATA = $(CRT0)
 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = $(SYSLIB)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@$(SYSLIB)
 
 CLEANFILES = $(CRT0)
 
@@ -118,7 +108,7 @@ CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
 lib_a_SOURCES = lib.a.c
-lib_a_OBJECTS =  lib.a.$(OBJEXT)
+lib_a_OBJECTS =  lib.a.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -134,11 +124,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = gtar
 GZIP_ENV = --best
 SOURCES = lib.a.c
-OBJECTS = lib.a.$(OBJEXT)
+OBJECTS = lib.a.o
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
+.SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
 
@@ -147,7 +137,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  ../../acinclude.m4 \
-		../../aclocal.m4 ../../libtool.m4
+		../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -167,11 +157,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -180,7 +165,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -244,7 +228,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
+	  test "$$subdir" = "." && dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
diff --git a/newlib/libc/sys/a29khif/Makefile.in b/newlib/libc/sys/a29khif/Makefile.in
index 89a14a5..96b8cd5 100644
--- a/newlib/libc/sys/a29khif/Makefile.in
+++ b/newlib/libc/sys/a29khif/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,41 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES =  	_alloc.s		_close.s		_cycles.s		_exit.s			_getpsiz.s		_gettz.s		_ioctl.s		_iostat.s		_iowait.s		_lseek.s		_open.s			_query.s		_read.s			_setim.s		_settrap.s		_setvec.s		_tmpnam.s		_write.s		alloc.s			clock.s			getargs.s		getenv.s		read.s			remove.s		rename.s		signal.s		_sbrk.s 		_fstat.s 		_isatty.s 		systime.s		vec.s			kill.c			getpid.c		stubs.s
+lib_a_SOURCES = \
+	_alloc.s	\
+	_close.s	\
+	_cycles.s	\
+	_exit.s		\
+	_getpsiz.s	\
+	_gettz.s	\
+	_ioctl.s	\
+	_iostat.s	\
+	_iowait.s	\
+	_lseek.s	\
+	_open.s		\
+	_query.s	\
+	_read.s		\
+	_setim.s	\
+	_settrap.s	\
+	_setvec.s	\
+	_tmpnam.s	\
+	_write.s	\
+	alloc.s		\
+	clock.s		\
+	getargs.s	\
+	getenv.s	\
+	read.s		\
+	remove.s	\
+	rename.s	\
+	signal.s	\
+	_sbrk.s 	\
+	_fstat.s 	\
+	_isatty.s 	\
+	systime.s	\
+	vec.s		\
+	kill.c		\
+	getpid.c	\
+	stubs.s
 
 
 ACLOCAL_AMFLAGS = -I ../../..
@@ -134,8 +163,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/a29khif/aclocal.m4 b/newlib/libc/sys/a29khif/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/a29khif/aclocal.m4
+++ b/newlib/libc/sys/a29khif/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/a29khif/configure b/newlib/libc/sys/a29khif/configure
index cd8d263..644d0c7 100755
--- a/newlib/libc/sys/a29khif/configure
+++ b/newlib/libc/sys/a29khif/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/aclocal.m4 b/newlib/libc/sys/aclocal.m4
index 35519ac..a5208f1 100644
--- a/newlib/libc/sys/aclocal.m4
+++ b/newlib/libc/sys/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,60 +284,41 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
 
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
+
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
 # Save cache, so that ltconfig can load it
 AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
 AC_CACHE_LOAD
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -431,43 +329,27 @@ AC_SUBST(LIBTOOL)dnl
 exec 5>>./config.log
 ])
 
-AC_DEFUN([AC_LIBTOOL_SETUP],
+AC_DEFUN(AC_LIBTOOL_SETUP,
 [AC_PREREQ(2.13)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 AC_REQUIRE([AC_PROG_NM])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
 [libtool_flags="$libtool_flags --enable-dlopen"])
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
@@ -477,20 +359,14 @@ AC_ARG_ENABLE(libtool-lock,
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -505,31 +381,12 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -537,56 +394,33 @@ ia64-*-hpux*)
   ;;
 
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+[*-*-cygwin* | *-*-mingw*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  ])
+])
 esac
 ])
 
 # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
 
 # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
 
 # AC_ENABLE_SHARED - implement the --enable-shared flag
 # Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
 <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -605,21 +439,21 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
 # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)])
 
 # AC_ENABLE_STATIC - implement the --enable-static flag
 # Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
 <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -638,8 +472,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])
 
 # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_STATIC(no)])
 
 
@@ -647,14 +480,14 @@ AC_ENABLE_STATIC(no)])
 # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(fast-install,
 changequote(<<, >>)dnl
 <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -672,98 +505,12 @@ esac],
 enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_FAST_INSTALL(no)])
 
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
 # AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -771,20 +518,16 @@ AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
+changequote(,)dnl
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
@@ -806,17 +549,17 @@ elif test "$with_gnu_ld" = yes; then
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL(lt_cv_path_LD,
+AC_CACHE_VAL(ac_cv_path_LD,
 [if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -825,9 +568,9 @@ AC_CACHE_VAL(lt_cv_path_LD,
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -837,240 +580,56 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_PROG_LD_GNU
 ])
 
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
 ])
 
-
 # AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
+AC_CACHE_VAL(ac_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi])
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
 ])
 
 # AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
+AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
+case "$host" in
+*-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
@@ -1084,39 +643,33 @@ esac
 ])
 
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case "$enable_ltdl_convenience" in
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   AC_CHECK_LIB(ltdl, main,
   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
   [if test x"$enable_ltdl_install" = xno; then
@@ -1127,8 +680,8 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
@@ -1136,91 +689,15 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   fi
 ])
 
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
 dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
 
 dnl This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])dnl
 
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libc/sys/arc/Makefile.in b/newlib/libc/sys/arc/Makefile.in
index 9e1c0c1..db4840b 100644
--- a/newlib/libc/sys/arc/Makefile.in
+++ b/newlib/libc/sys/arc/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/arc/aclocal.m4 b/newlib/libc/sys/arc/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/arc/aclocal.m4
+++ b/newlib/libc/sys/arc/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/arc/configure b/newlib/libc/sys/arc/configure
index 39982f1..2ad8ca9 100755
--- a/newlib/libc/sys/arc/configure
+++ b/newlib/libc/sys/arc/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/arc/syscalls.c b/newlib/libc/sys/arc/syscalls.c
index 9c57845..107989b 100644
--- a/newlib/libc/sys/arc/syscalls.c
+++ b/newlib/libc/sys/arc/syscalls.c
@@ -15,7 +15,7 @@ _read_r (struct _reent *r, int fd, void *buf, size_t nbytes)
 
   SYSCALL (SYS_read, rc, err, fd, buf, nbytes);
   if (err)
-    __errno_r (r) = err;
+    errno = err;
   return rc;
 }
 
@@ -27,7 +27,7 @@ _write_r (struct _reent *r, int fd, const void *buf, size_t nbytes)
 
   SYSCALL (SYS_write, rc, err, fd, buf, nbytes);
   if (err)
-    __errno_r (r) = err;
+    errno = err;
   return rc;
 }
 
@@ -48,8 +48,7 @@ _open_r (struct _reent *r, const char *buf, int flags, int mode)
 #endif
 
   SYSCALL (SYS_open, rc, err, buf, flags, mode);
-  if (err)
-    __errno_r (r) = err;
+  errno = err;
   return rc;
 }
 
@@ -60,7 +59,7 @@ _close_r (struct _reent *r, int fd)
 
   SYSCALL (SYS_close, rc, err, fd, 0, 0);
   if (err)
-    __errno_r (r) = err;
+    errno = err;
   return rc;
 }
 
@@ -72,7 +71,7 @@ _lseek_r (struct _reent *r, int fd,  off_t offset, int whence)
 
   SYSCALL (SYS_lseek, rc, err, fd, offset, whence);
   if (err)
-    __errno_r (r) = err;
+    errno = err;
   return rc;
 }
 
@@ -83,7 +82,7 @@ _fstat_r (struct _reent *r, int fd, struct stat *buf)
 
   SYSCALL (SYS_fstat, rc, err, fd, buf, 0);
   if (err)
-    __errno_r (r) = err;
+    errno = err;
   return rc;
 }
 
@@ -126,6 +125,6 @@ _kill_r (struct _reent *r, int pid, int sig)
 
   SYSCALL (SYS_kill, rc, err, pid, sig, 0);
   if (err)
-    __errno_r (r) = err;
+    errno = err;
   return rc;
 }
diff --git a/newlib/libc/sys/arm/Makefile.am b/newlib/libc/sys/arm/Makefile.am
index 7749d4a..1af0f8d 100644
--- a/newlib/libc/sys/arm/Makefile.am
+++ b/newlib/libc/sys/arm/Makefile.am
@@ -6,19 +6,9 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-if MAY_SUPPLY_SYSCALLS
-extra_objs = libcfunc.o trap.o syscalls.o
-else
-extra_objs =
-endif
+lib_a_SOURCES = syscalls.c libcfunc.c trap.S setjmp.S
 
-lib_a_SOURCES = aeabi_atexit.c
-lib_a_LIBADD = $(extra_objs)
-lib_a_DEPENDENCIES = $(extra_objs)
-
-if MAY_SUPPLY_SYSCALLS
 all: crt0.o
-endif
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/arm/Makefile.in b/newlib/libc/sys/arm/Makefile.in
index 323db9c..08c2ba9 100644
--- a/newlib/libc/sys/arm/Makefile.in
+++ b/newlib/libc/sys/arm/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -88,12 +83,8 @@ AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
-@MAY_SUPPLY_SYSCALLS_TRUE@extra_objs = libcfunc.o trap.o syscalls.o
-@MAY_SUPPLY_SYSCALLS_FALSE@extra_objs = 
 
-lib_a_SOURCES = aeabi_atexit.c
-lib_a_LIBADD = $(extra_objs)
-lib_a_DEPENDENCIES = $(extra_objs)
+lib_a_SOURCES = syscalls.c libcfunc.c trap.S setjmp.S
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@@ -106,7 +97,8 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-lib_a_OBJECTS =  aeabi_atexit.o
+lib_a_LIBADD = 
+lib_a_OBJECTS =  syscalls.o libcfunc.o trap.o setjmp.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -132,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -325,7 +316,7 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-@MAY_SUPPLY_SYSCALLS_TRUE@all: crt0.o
+all: crt0.o
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/newlib/libc/sys/arm/aclocal.m4 b/newlib/libc/sys/arm/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/arm/aclocal.m4
+++ b/newlib/libc/sys/arm/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/arm/aeabi_atexit.c b/newlib/libc/sys/arm/aeabi_atexit.c
deleted file mode 100644
index 4b600e2..0000000
--- a/newlib/libc/sys/arm/aeabi_atexit.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdlib.h>
-
-/* Register a function to be called by exit or when a shared library
-   is unloaded.  This routine is like __cxa_atexit, but uses the
-   calling sequence required by the ARM EABI.  */
-int
-__aeabi_atexit (void *arg, void (*func) (void *), void *d)
-{
-  return __cxa_atexit (func, arg, d);
-}
diff --git a/newlib/libc/sys/arm/configure b/newlib/libc/sys/arm/configure
index 1f40c98..385093e 100755
--- a/newlib/libc/sys/arm/configure
+++ b/newlib/libc/sys/arm/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/arm/crt0.S b/newlib/libc/sys/arm/crt0.S
index c750ca8..9d1de2e 100644
--- a/newlib/libc/sys/arm/crt0.S
+++ b/newlib/libc/sys/arm/crt0.S
@@ -1,4 +1,3 @@
-#include "newlib.h"
 #include "swi.h"
 
 /* ANSI concatenation macros.  */
@@ -11,37 +10,17 @@
 #error __USER_LABEL_PREFIX is not defined
 #endif
 
-#ifdef HAVE_INITFINI_ARRAY
-#define _init	__libc_init_array
-#define _fini	__libc_fini_array
-#endif
-
 /* .text is used instead of .section .text so it works with arm-aout too.  */
 	.text
-#if defined(__thumb2__)
-	.syntax unified
-	.thumb
-.macro FUNC_START name
-	.global	\name
-	.thumb_func
-\name:
-.endm	
-#else
 	.code 32
-.macro FUNC_START name
-	.global	\name
-\name:
-.endm	
-#endif
 	.align 	0
 
-	FUNC_START	_mainCRTStartup
-	FUNC_START	_start
-	FUNC_START	start
-#if defined(__ELF__) && !defined(__USING_SJLJ_EXCEPTIONS__)
-	/* Annotation for EABI unwinding tables.  */
-	.fnstart
-#endif
+	.global	_mainCRTStartup
+	.global	_start
+	.global	start
+start:
+_start:
+_mainCRTStartup:
 
 /* Start by setting up a stack */
 #ifdef ARM_RDP_MONITOR
@@ -56,12 +35,7 @@
 	/*  Issue Angel SWI to read stack info */
 	mov	r0, #AngelSWI_Reason_HeapInfo
 	adr	r1, .LC0	/*  point at ptr to 4 words to receive data */
-#if defined(__thumb2__)
-	bkpt	AngelSWI
-#else
-	/*  We are always in ARM mode for startup */
-	AngelSWIAsm	AngelSWI_ARM
-#endif
+	swi	AngelSWI_ARM	/*  We are always in ARM mode for startup */
 	ldr	r0, .LC0	/*  point at values read */
 	ldr	sp, [r0, #8]
 	ldr	sl, [r0, #12]
@@ -81,7 +55,6 @@
 	sub	sl, sp, #64 << 10	/* Still assumes 256bytes below sl */
 #endif
 #endif
-	/* Zero the memory in the .bss section.  */
 	mov 	a2, #0			/* Second arg: fill value */
 	mov	fp, a2			/* Null frame pointer */
 	mov	r7, a2			/* Null frame pointer for Thumb */
@@ -91,8 +64,8 @@
 	sub	a3, a3, a1		/* Third arg: length of block */
 	
 
-#if defined(__thumb__) && !defined(__thumb2__)
-	/* Enter Thumb mode.... */
+#ifdef __thumb__		/* Enter Thumb mode.... */
+
 	add	a4, pc, #1	/* Get the address of the Thumb block */
 	bx	a4		/* Go there and start Thumb decoding  */
 
@@ -116,17 +89,11 @@ __change_mode:
 #else
 	mov	r0, #AngelSWI_Reason_GetCmdLine
 	adr	r1, .LC30	/*  Space for command line */
-	AngelSWIAsm	AngelSWI
+	swi	AngelSWI
 	ldr	r1, .LC30
 #endif
 	/*  Parse string at r1 */
 	mov	r0, #0		/*  count of arguments so far */
-	/* Push a NULL argument onto the end of the list.  */
-#ifdef __thumb__
-	push	{r0}
-#else
-	stmfd	sp!, {r0}
-#endif
 .LC10:
 /*  Skip leading blanks */
 #ifdef __thumb__
@@ -202,11 +169,6 @@ __change_mode:
 	add	r3, #4
 	b	.LC15
 .LC14:	
-	/* Ensure doubleword stack alignment.  */
-	mov	r4, sp
-	mov	r5, #7
-	bic	r4, r5
-	mov	sp, r4
 #else
 	add	r2, sp, r0, LSL #2	/* End of args */
 	mov	r3, sp			/* Start of args */
@@ -216,9 +178,8 @@ __change_mode:
 	strhi	r5, [r2, #-4]!
 	strhi	r4, [r3], #4
 	bhi	.LC13
-	/* Ensure doubleword stack alignment.  */
-	bic	sp, sp, #7
 #endif
+
 #endif
 
 #ifdef __USES_INITFINI__
@@ -238,7 +199,7 @@ __change_mode:
 
 	bl	FUNCTION (exit)		/* Should not return.  */
 
-#if defined(__thumb__) && !defined(__thumb2__)
+#ifdef __thumb__
 	/* Come out of Thumb mode.  This code should be redundant.  */
 
 	mov	a4, pc
@@ -270,11 +231,6 @@ change_back:
 #endif
 #endif
 #endif
-#if defined(__ELF__) && !defined(__USING_SJLJ_EXCEPTIONS__)
-	/* Protect against unhandled exceptions.  */
-	.cantunwind
-	.fnend
-#endif
 .LC1:
 	.word	__bss_start__
 .LC2:
@@ -303,3 +259,4 @@ CommandLine:	.space	256,0	/*  Maximum length of 255 chars handled.  */
 	.section .idata$3
 	.long	0,0,0,0,0,0,0,0
 #endif
+
diff --git a/newlib/libc/sys/arm/libcfunc.c b/newlib/libc/sys/arm/libcfunc.c
index 3bf0a56..ddc611f 100644
--- a/newlib/libc/sys/arm/libcfunc.c
+++ b/newlib/libc/sys/arm/libcfunc.c
@@ -13,7 +13,7 @@ static inline int
 do_AngelSWI (int reason, void * arg)
 {
   int value;
-  asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0"
+  asm volatile ("mov r0, %1; mov r1, %2; swi %a3; mov %0, r0"
        : "=r" (value) /* Outputs */
        : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */
        : "r0", "r1", "lr"
diff --git a/newlib/libc/machine/xscale/setjmp.S b/newlib/libc/sys/arm/setjmp.S
index d374860..d374860 100644
--- a/newlib/libc/machine/xscale/setjmp.S
+++ b/newlib/libc/sys/arm/setjmp.S
diff --git a/newlib/libc/sys/arm/swi.h b/newlib/libc/sys/arm/swi.h
index f5c9103..91fad59 100644
--- a/newlib/libc/sys/arm/swi.h
+++ b/newlib/libc/sys/arm/swi.h
@@ -1,4 +1,9 @@
-/* SWI numbers for RDP (Demon) monitor.  */
+
+/***************************************************************************\
+*                               SWI numbers                                 *
+\***************************************************************************/
+
+/* SWI numbers for RDP (Demon) monitor */
 #define SWI_WriteC                 0x0
 #define SWI_Write0                 0x2
 #define SWI_ReadC                  0x4
@@ -26,43 +31,35 @@
 #define SWI_GenerateError          0x71
 
 
-/* Now the SWI numbers and reason codes for RDI (Angel) monitors.  */
-#define AngelSWI_ARM 			0x123456
+/* Now the SWI numbers and reason codes for RDI (Angel) monitors */
+#define AngelSWI_ARM 			(0x123456)
 #ifdef __thumb__
-#define AngelSWI 			0xAB
+#define AngelSWI 			(0xAB)
 #else
 #define AngelSWI 			AngelSWI_ARM
 #endif
-/* For Thumb-2 code use the BKPT instruction instead of SWI.  */
-#ifdef __thumb2__
-#define AngelSWIInsn			"bkpt"
-#define AngelSWIAsm			bkpt
-#else
-#define AngelSWIInsn			"swi"
-#define AngelSWIAsm			swi
-#endif
 
-/* The reason codes:  */
-#define AngelSWI_Reason_Open		0x01
-#define AngelSWI_Reason_Close		0x02
-#define AngelSWI_Reason_WriteC		0x03
-#define AngelSWI_Reason_Write0		0x04
-#define AngelSWI_Reason_Write		0x05
-#define AngelSWI_Reason_Read		0x06
-#define AngelSWI_Reason_ReadC		0x07
-#define AngelSWI_Reason_IsTTY		0x09
-#define AngelSWI_Reason_Seek		0x0A
-#define AngelSWI_Reason_FLen		0x0C
-#define AngelSWI_Reason_TmpNam		0x0D
-#define AngelSWI_Reason_Remove		0x0E
-#define AngelSWI_Reason_Rename		0x0F
-#define AngelSWI_Reason_Clock		0x10
-#define AngelSWI_Reason_Time		0x11
-#define AngelSWI_Reason_System		0x12
-#define AngelSWI_Reason_Errno		0x13
-#define AngelSWI_Reason_GetCmdLine 	0x15
-#define AngelSWI_Reason_HeapInfo 	0x16
-#define AngelSWI_Reason_EnterSVC 	0x17
-#define AngelSWI_Reason_ReportException 0x18
+/* The reason codes: */
+#define AngelSWI_Reason_Open		(0x01)
+#define AngelSWI_Reason_Close		(0x02)
+#define AngelSWI_Reason_WriteC		(0x03)
+#define AngelSWI_Reason_Write0		(0x04)
+#define AngelSWI_Reason_Write		(0x05)
+#define AngelSWI_Reason_Read		(0x06)
+#define AngelSWI_Reason_ReadC		(0x07)
+#define AngelSWI_Reason_IsTTY		(0x09)
+#define AngelSWI_Reason_Seek		(0x0A)
+#define AngelSWI_Reason_FLen		(0x0C)
+#define AngelSWI_Reason_TmpNam		(0x0D)
+#define AngelSWI_Reason_Remove		(0x0E)
+#define AngelSWI_Reason_Rename		(0x0F)
+#define AngelSWI_Reason_Clock		(0x10)
+#define AngelSWI_Reason_Time		(0x11)
+#define AngelSWI_Reason_System		(0x12)
+#define AngelSWI_Reason_Errno		(0x13)
+#define AngelSWI_Reason_GetCmdLine 	(0x15)
+#define AngelSWI_Reason_HeapInfo 	(0x16)
+#define AngelSWI_Reason_EnterSVC 	(0x17)
+#define AngelSWI_Reason_ReportException (0x18)
 #define ADP_Stopped_ApplicationExit 	((2 << 16) + 38)
-#define ADP_Stopped_RunTimeError 	((2 << 16) + 35)
+#define ADP_Stopped_RunTimeError 	((2 << 16) + 34)
diff --git a/newlib/libc/sys/arm/sys/param.h b/newlib/libc/sys/arm/sys/param.h
index adc066e..968c8ef 100644
--- a/newlib/libc/sys/arm/sys/param.h
+++ b/newlib/libc/sys/arm/sys/param.h
@@ -7,13 +7,4 @@
 # define NOFILE	(60)
 # define PATHSIZE (1024)
 
-#define BIG_ENDIAN      4321
-#define LITTLE_ENDIAN   1234
-
-#ifdef __ARMEB__
-#define BYTE_ORDER BIG_ENDIAN
-#else
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
 #endif
diff --git a/newlib/libc/sys/arm/syscalls.c b/newlib/libc/sys/arm/syscalls.c
index 5293099..795f778 100644
--- a/newlib/libc/sys/arm/syscalls.c
+++ b/newlib/libc/sys/arm/syscalls.c
@@ -12,19 +12,15 @@
 #include <sys/times.h>
 #include <errno.h>
 #include <reent.h>
-#include <unistd.h>
 #include "swi.h"
 
 /* Forward prototypes.  */
-int     _system     _PARAMS ((const char *));
-int     _rename     _PARAMS ((const char *, const char *));
 int     isatty		_PARAMS ((int));
 clock_t _times		_PARAMS ((struct tms *));
 int     _gettimeofday	_PARAMS ((struct timeval *, struct timezone *));
 void    _raise 		_PARAMS ((void));
 int     _unlink		_PARAMS ((void));
 int     _link 		_PARAMS ((void));
-int     _stat 		_PARAMS ((const char *, struct stat *));
 int     _fstat 		_PARAMS ((int, struct stat *));
 caddr_t _sbrk		_PARAMS ((int));
 int     _getpid		_PARAMS ((int));
@@ -55,17 +51,20 @@ register char * stack_ptr asm ("sp");
 
 /* following is copied from libc/stdio/local.h to check std streams */
 extern void   _EXFUN(__sinit,(struct _reent *));
-#define CHECK_INIT(ptr) \
-  do						\
-    {						\
-      if ((ptr) && !(ptr)->__sdidinit)		\
-	__sinit (ptr);				\
-    }						\
+#define CHECK_INIT(fp) \
+  do                                    \
+    {                                   \
+      if ((fp)->_data == 0)             \
+        (fp)->_data = _REENT;           \
+      if (!(fp)->_data->__sdidinit)     \
+        __sinit ((fp)->_data);          \
+    }                                   \
   while (0)
 
 /* Adjust our internal handles to stay away from std* handles.  */
 #define FILE_HANDLE_OFFSET (0x20)
 
+static int std_files_checked;
 static int monitor_stdin;
 static int monitor_stdout;
 static int monitor_stderr;
@@ -98,7 +97,7 @@ static inline int
 do_AngelSWI (int reason, void * arg)
 {
   int value;
-  asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0"
+  asm volatile ("mov r0, %1; mov r1, %2; swi %a3; mov %0, r0"
        : "=r" (value) /* Outputs */
        : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */
        : "r0", "r1", "r2", "r3", "ip", "lr", "memory", "cc"
@@ -116,13 +115,18 @@ do_AngelSWI (int reason, void * arg)
 static int
 remap_handle (int fh)
 {
-  CHECK_INIT(_REENT);
-
-  if (fh == STDIN_FILENO)
+  if (!std_files_checked)
+    {
+       CHECK_INIT(stdin);
+       CHECK_INIT(stdout);
+       CHECK_INIT(stderr);
+       std_files_checked = 1;
+    }
+  if (fh == __sfileno (stdin))
     return monitor_stdin;
-  if (fh == STDOUT_FILENO)
+  if (fh == __sfileno (stdout))
     return monitor_stdout;
-  if (fh == STDERR_FILENO)
+  if (fh == __sfileno (stderr))
     return monitor_stderr;
 
   return fh - FILE_HANDLE_OFFSET;
@@ -466,6 +470,8 @@ _getpid (int n)
   n = n;
 }
 
+extern void abort (void);
+
 caddr_t
 _sbrk (int incr)
 {
@@ -480,18 +486,8 @@ _sbrk (int incr)
   
   if (heap_end + incr > stack_ptr)
     {
-      /* Some of the libstdc++-v3 tests rely upon detecting
-	 out of memory errors, so do not abort here.  */
-#if 0
-      extern void abort (void);
-
       _write (1, "_sbrk: Heap and stack collision\n", 32);
-      
       abort ();
-#else
-      errno = ENOMEM;
-      return (caddr_t) -1;
-#endif
     }
   
   heap_end += incr;
@@ -511,22 +507,6 @@ _fstat (int file, struct stat * st)
   file = file;
 }
 
-int _stat (const char *fname, struct stat *st)
-{
-  int file;
-
-  /* The best we can do is try to open the file readonly.  If it exists,
-     then we can guess a few things about it.  */
-  if ((file = _open (fname, O_RDONLY)) < 0)
-    return -1;
-
-  memset (st, 0, sizeof (* st));
-  st->st_mode = S_IFREG | S_IREAD;
-  st->st_blksize = 1024;
-  _swiclose (file); /* Not interested in the error.  */
-  return 0;
-}
-
 int
 _link (void)
 {
@@ -604,19 +584,3 @@ isatty (int fd)
   return 1;
   fd = fd;
 }
-
-int
-_system (const char *s)
-{
-  if (s == NULL)
-    return 0;
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-_rename (const char * oldpath, const char * newpath)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/newlib/libc/sys/arm/trap.S b/newlib/libc/sys/arm/trap.S
index 21b6937..328fabc 100644
--- a/newlib/libc/sys/arm/trap.S
+++ b/newlib/libc/sys/arm/trap.S
@@ -1,5 +1,4 @@
         /* Run-time exception support */
-#if !defined(__thumb2__)
 #include "swi.h"
 
 /* .text is used instead of .section .text so it works with arm-aout too.  */
@@ -92,4 +91,3 @@ __rt_stkovf_split_big:
         @ We now know how much extra stack the function requires.
         @ Terminate the program for the moment:
         swi     SWI_Exit
-#endif
diff --git a/newlib/libc/sys/configure b/newlib/libc/sys/configure
index 04436d9..e57d4fc 100755
--- a/newlib/libc/sys/configure
+++ b/newlib/libc/sys/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -40,8 +32,6 @@ ac_help="$ac_help
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -59,6 +49,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -173,6 +164,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -343,6 +335,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -508,12 +505,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -573,7 +574,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -827,79 +827,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -917,34 +854,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:948: checking host system type" >&5
+echo "configure:864: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -964,52 +880,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:969: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:987: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1025,21 +900,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1030: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:905: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1043: checking for working autoconf" >&5
+echo "configure:918: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1051,21 +926,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1056: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:931: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1069: checking for working autoheader" >&5
+echo "configure:944: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1078,7 +953,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1082: checking for working makeinfo" >&5
+echo "configure:957: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1103,7 +978,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
+echo "configure:982: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1133,7 +1008,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
+echo "configure:1012: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1182,7 +1057,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1186: checking whether we are using GNU C" >&5
+echo "configure:1061: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1191,7 +1066,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1206,7 +1081,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1210: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1085: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1234,10 +1109,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1118: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_word" >&5
+echo "configure:1139: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1269,7 +1167,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_word" >&5
+echo "configure:1171: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1301,7 +1199,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
+echo "configure:1203: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1333,7 +1231,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1337: checking for $ac_word" >&5
+echo "configure:1235: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1378,7 +1276,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1382: checking for a BSD compatible install" >&5
+echo "configure:1280: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1431,11 +1329,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1334: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1364,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1368: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,10 +1374,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1503,6 +1398,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1513,52 +1420,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1567,12 +1428,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1586,7 +1441,7 @@ if test "${use_libtool}" = "yes"; then
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -1609,7 +1464,7 @@ fi
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -1632,7 +1487,7 @@ fi
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -1651,10 +1506,40 @@ else
   enable_fast_install=yes
 fi
 
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1513: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1658: checking for $ac_word" >&5
+echo "configure:1543: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1684,7 +1569,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1688: checking for $ac_word" >&5
+echo "configure:1573: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1735,7 +1620,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1739: checking for $ac_word" >&5
+echo "configure:1624: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1767,7 +1652,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1656: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1778,12 +1663,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1782 "configure"
+#line 1667 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1809,12 +1694,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1698: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1818: checking whether we are using GNU C" >&5
+echo "configure:1703: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1823,7 +1708,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1842,7 +1727,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1846: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1731: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1882,18 +1767,12 @@ else
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1889: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+echo "configure:1774: checking for ld used by GCC" >&5
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
@@ -1915,12 +1794,12 @@ echo "configure:1889: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1919: checking for GNU ld" >&5
+echo "configure:1798: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1922: checking for non-GNU ld" >&5
+echo "configure:1801: checking for non-GNU ld" >&5
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -z "$LD"; then
@@ -1928,11 +1807,11 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -1941,11 +1820,11 @@ else
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   echo "$ac_t""$LD" 1>&6
 else
@@ -1953,74 +1832,59 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1957: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
+echo "configure:1836: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi
 fi
 
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
+echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
 
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1974: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1986: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
+echo "configure:1852: checking for BSD-compatible nm" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi
 fi
 
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2024: checking whether ln -s works" >&5
+echo "configure:1888: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2040,482 +1904,14 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2045: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2218: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2248: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2310: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2381: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2413: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2448: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2480: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
 
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 
 libtool_flags="$libtool_flags --enable-win32-dll"
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
@@ -2527,25 +1923,14 @@ fi
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2547 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
+  echo '#line 1932 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -2560,48 +1945,24 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2585: checking whether the C compiler needs -belf" >&5
+echo "configure:1954: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2598 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1959 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2611,13 +1972,6 @@ else
   lt_cv_cc_needs_belf=no
 fi
 rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
 fi
 
 echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
@@ -2627,11 +1981,11 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   fi
   ;;
 
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+*-*-cygwin* | *-*-mingw*)
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2635: checking for $ac_word" >&5
+echo "configure:1989: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2663,7 +2017,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2667: checking for $ac_word" >&5
+echo "configure:2021: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2698,7 +2052,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2702: checking for $ac_word" >&5
+echo "configure:2056: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2730,7 +2084,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2734: checking for $ac_word" >&5
+echo "configure:2088: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2765,7 +2119,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2769: checking for $ac_word" >&5
+echo "configure:2123: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2797,7 +2151,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2801: checking for $ac_word" >&5
+echo "configure:2155: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2829,77 +2183,8 @@ else
 fi
 fi
 
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2837: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2871: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2876 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  
+
 esac
 
 
@@ -2953,14 +2238,12 @@ rm -f confcache
 
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -2974,7 +2257,7 @@ fi
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -2983,11 +2266,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 # clobbered by the next message.
 exec 5>>./config.log
 
-  
-
-  
-	 
-	 
 fi
 
 if test -n "${sys_dir}"; then
@@ -2996,7 +2274,7 @@ if test -n "${sys_dir}"; then
 fi
 
 CRT0=
-if test "x${have_crt0}" = "xyes"; then
+if test -n "${sys_dir}"; then
   CRT0=crt0.o
 fi
 
@@ -3156,24 +2434,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -3186,6 +2452,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -3194,26 +2465,14 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
 s%@machine_dir@%$machine_dir%g
 s%@sys_dir@%$sys_dir%g
 s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@OBJDUMP@%$OBJDUMP%g
 s%@LIBTOOL@%$LIBTOOL%g
@@ -3229,7 +2488,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/configure.in b/newlib/libc/sys/configure.in
index 895bdb2..4a53612 100644
--- a/newlib/libc/sys/configure.in
+++ b/newlib/libc/sys/configure.in
@@ -22,7 +22,7 @@ if test -n "${sys_dir}"; then
 fi
 
 CRT0=
-if test "x${have_crt0}" = "xyes"; then
+if test -n "${sys_dir}"; then
   CRT0=crt0.o
 fi
 AC_SUBST(CRT0)
diff --git a/newlib/libc/sys/cygwin/Makefile.am b/newlib/libc/sys/cygwin/Makefile.am
new file mode 100644
index 0000000..f55a90a
--- /dev/null
+++ b/newlib/libc/sys/cygwin/Makefile.am
@@ -0,0 +1,19 @@
+## Process this file with automake to generate Makefile.in
+
+AUTOMAKE_OPTIONS = cygnus
+
+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+
+noinst_LIBRARIES = lib.a
+
+lib_a_SOURCES =
+
+# This is a hack to force automake to include a definition for
+# COMPILE.
+EXTRA_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = crt0.c
+
+all: crt0.o
+
+ACLOCAL_AMFLAGS = -I ../../..
+CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/cygwin/Makefile.in b/newlib/libc/sys/cygwin/Makefile.in
new file mode 100644
index 0000000..8c1a80c
--- /dev/null
+++ b/newlib/libc/sys/cygwin/Makefile.in
@@ -0,0 +1,335 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = .
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AR = @AR@
+AS = @AS@
+CC = @CC@
+CPP = @CPP@
+EXEEXT = @EXEEXT@
+LDFLAGS = @LDFLAGS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+VERSION = @VERSION@
+aext = @aext@
+libm_machine_dir = @libm_machine_dir@
+machine_dir = @machine_dir@
+newlib_basedir = @newlib_basedir@
+oext = @oext@
+sys_dir = @sys_dir@
+
+AUTOMAKE_OPTIONS = cygnus
+
+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+
+noinst_LIBRARIES = lib.a
+
+lib_a_SOURCES = 
+
+# This is a hack to force automake to include a definition for
+# COMPILE.
+EXTRA_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = crt0.c
+
+ACLOCAL_AMFLAGS = -I ../../..
+CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
+CONFIG_CLEAN_FILES = 
+LIBRARIES =  $(noinst_LIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) 
+CPPFLAGS = @CPPFLAGS@
+LIBS = @LIBS@
+libfoo_a_LIBADD = 
+libfoo_a_OBJECTS =  crt0.o
+lib_a_LIBADD = 
+lib_a_OBJECTS = 
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = gtar
+GZIP_ENV = --best
+SOURCES = $(libfoo_a_SOURCES) $(lib_a_SOURCES)
+OBJECTS = $(libfoo_a_OBJECTS) $(lib_a_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
+		../../../acinclude.m4 ../../../aclocal.m4
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+mostlyclean-noinstLIBRARIES:
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+distclean-noinstLIBRARIES:
+
+maintainer-clean-noinstLIBRARIES:
+
+.c.o:
+	$(COMPILE) -c $<
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
+
+maintainer-clean-compile:
+
+libfoo.a: $(libfoo_a_OBJECTS) $(libfoo_a_DEPENDENCIES)
+	-rm -f libfoo.a
+	$(AR) cru libfoo.a $(libfoo_a_OBJECTS) $(libfoo_a_LIBADD)
+	$(RANLIB) libfoo.a
+
+lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
+	-rm -f lib.a
+	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
+	$(RANLIB) lib.a
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	-rm -rf $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist
+	-rm -rf $(distdir)
+	@banner="$(distdir).tar.gz is ready for distribution"; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+distdir: $(DISTFILES)
+	-rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 777 $(distdir)
+	@for file in $(DISTFILES); do \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am:
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-info-am: 
+install-info: install-info-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile $(LIBRARIES)
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
+		mostlyclean-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
+		mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
+		distclean-tags distclean-generic clean-am
+
+distclean: distclean-am
+	-rm -f config.status
+
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
+		maintainer-clean-compile maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+	-rm -f config.status
+
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-info-am install-info \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+all: crt0.o
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/newlib/libc/sys/cygwin/aclocal.m4 b/newlib/libc/sys/cygwin/aclocal.m4
new file mode 100644
index 0000000..9a25f7b
--- /dev/null
+++ b/newlib/libc/sys/cygwin/aclocal.m4
@@ -0,0 +1,299 @@
+dnl aclocal.m4 generated automatically by aclocal 1.4
+
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl This provides configure definitions used by all the newlib
+dnl configure.in files.
+
+dnl Basic newlib configury.  This calls basic introductory stuff,
+dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
+dnl configure.host.  The only argument is the relative path to the top
+dnl newlib directory.
+
+AC_DEFUN(NEWLIB_CONFIGURE,
+[
+dnl Default to --enable-multilib
+AC_ARG_ENABLE(multilib,
+[  --enable-multilib         build many library versions (default)],
+[case "${enableval}" in
+  yes) multilib=yes ;;
+  no)  multilib=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
+ esac], [multilib=yes])dnl
+
+dnl Support --enable-target-optspace
+AC_ARG_ENABLE(target-optspace,
+[  --enable-target-optspace  optimize for space],
+[case "${enableval}" in
+  yes) target_optspace=yes ;;
+  no)  target_optspace=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
+ esac], [target_optspace=])dnl
+
+dnl Support --enable-malloc-debugging - currently only supported for Cygwin
+AC_ARG_ENABLE(malloc-debugging,
+[  --enable-malloc-debugging indicate malloc debugging requested],
+[case "${enableval}" in
+  yes) malloc_debugging=yes ;;
+  no)  malloc_debugging=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
+ esac], [malloc_debugging=])dnl
+
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
+[case "${enableval}" in
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
+
+dnl We may get other options which we don't document:
+dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
+
+test -z "[$]{with_target_subdir}" && with_target_subdir=.
+
+if test "[$]{srcdir}" = "."; then
+  if test "[$]{with_target_subdir}" != "."; then
+    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
+  else
+    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
+  fi
+else
+  newlib_basedir="[$]{srcdir}/$1"
+fi
+AC_SUBST(newlib_basedir)
+
+AC_CANONICAL_HOST
+
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
+
+# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
+# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
+# are probably using a cross compiler, which will not be able to fully
+# link an executable.  This should really be fixed in autoconf
+# itself.
+
+AC_DEFUN(LIB_AC_PROG_CC,
+[AC_BEFORE([$0], [AC_PROG_CPP])dnl
+AC_CHECK_PROG(CC, gcc, gcc)
+if test -z "$CC"; then
+  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
+  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+fi
+
+AC_PROG_CC_GNU
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+dnl Check whether -g works, even if CFLAGS is set, in case the package
+dnl plays around with CFLAGS (such as to build both debugging and
+dnl normal versions of a library), tasteless as that idea is.
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS=
+  AC_PROG_CC_G
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-O2"
+  fi
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
+])
+
+LIB_AC_PROG_CC
+
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
+AC_CHECK_TOOL(AS, as)
+AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+
+AC_PROG_INSTALL
+
+AM_MAINTAINER_MODE
+
+# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
+# at least currently, we never actually build a program, so we never
+# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
+# fails, because we are probably configuring with a cross compiler
+# which can't create executables.  So we include AC_EXEEXT to keep
+# automake happy, but we don't execute it, since we don't care about
+# the result.
+if false; then
+  AC_EXEEXT
+fi
+
+. [$]{newlib_basedir}/configure.host
+
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -fno-builtin"
+
+NEWLIB_CFLAGS=${newlib_cflags}
+AC_SUBST(NEWLIB_CFLAGS)
+
+LDFLAGS=${ldflags}
+AC_SUBST(LDFLAGS)
+
+AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
+AC_SUBST(oext)
+AC_SUBST(aext)
+
+AC_SUBST(libm_machine_dir)
+AC_SUBST(machine_dir)
+AC_SUBST(sys_dir)
+])
+
+# Do all the work for Automake.  This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+VERSION=[$2]
+AC_SUBST(VERSION)
+dnl test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+ifelse([$3],,
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
+dnl FIXME This is truly gross.
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN(AM_SANITY_CHECK,
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+   if test "[$]*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftestfile`
+   fi
+   if test "[$]*" != "X $srcdir/configure conftestfile" \
+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "[$]2" = conftestfile
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])
+
+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+dnl The program must properly implement --version.
+AC_DEFUN(AM_MISSING_PROG,
+[AC_MSG_CHECKING(for working $2)
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if ($2 --version) < /dev/null > /dev/null 2>&1; then
+   $1=$2
+   AC_MSG_RESULT(found)
+else
+   $1="$3/missing $2"
+   AC_MSG_RESULT(missing)
+fi
+AC_SUBST($1)])
+
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# serial 1
+
+AC_DEFUN(AM_MAINTAINER_MODE,
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT($USE_MAINTAINER_MODE)
+  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/cygwin/configure b/newlib/libc/sys/cygwin/configure
new file mode 100755
index 0000000..340ccba
--- /dev/null
+++ b/newlib/libc/sys/cygwin/configure
@@ -0,0 +1,1722 @@
+#! /bin/sh
+
+# Guess values for system-dependent variables and create Makefiles.
+# Generated automatically using autoconf version 2.13 
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
+ac_help="$ac_help
+  --enable-multilib         build many library versions (default)"
+ac_help="$ac_help
+  --enable-target-optspace  optimize for space"
+ac_help="$ac_help
+  --enable-malloc-debugging indicate malloc debugging requested"
+ac_help="$ac_help
+  --enable-newlib-mb        enable multibyte support"
+ac_help="$ac_help
+  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer"
+
+# Initialize some variables set by options.
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+build=NONE
+cache_file=./config.cache
+exec_prefix=NONE
+host=NONE
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+sitefile=
+srcdir=
+target=NONE
+verbose=
+x_includes=NONE
+x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+# Initialize some other variables.
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
+
+ac_prev=
+for ac_option
+do
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval "$ac_prev=\$ac_option"
+    ac_prev=
+    continue
+  fi
+
+  case "$ac_option" in
+  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) ac_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case "$ac_option" in
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir="$ac_optarg" ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build="$ac_optarg" ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file="$ac_optarg" ;;
+
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir="$ac_optarg" ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    eval "enable_${ac_feature}=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_${ac_feature}='$ac_optarg'" ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix="$ac_optarg" ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he)
+    # Omit some internal or obsolete options to make the list less imposing.
+    # This message is too long to be a string in the A/UX 3.1 sh.
+    cat << EOF
+Usage: configure [options] [host]
+Options: [defaults in brackets after descriptions]
+Configuration:
+  --cache-file=FILE       cache test results in FILE
+  --help                  print this message
+  --no-create             do not create output files
+  --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
+  --version               print the version of autoconf that created configure
+Directory and file names:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [same as prefix]
+  --bindir=DIR            user executables in DIR [EPREFIX/bin]
+  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
+  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
+  --datadir=DIR           read-only architecture-independent data in DIR
+                          [PREFIX/share]
+  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
+                          [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
+  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
+  --includedir=DIR        C header files in DIR [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
+  --infodir=DIR           info documentation in DIR [PREFIX/info]
+  --mandir=DIR            man documentation in DIR [PREFIX/man]
+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+  --program-prefix=PREFIX prepend PREFIX to installed program names
+  --program-suffix=SUFFIX append SUFFIX to installed program names
+  --program-transform-name=PROGRAM
+                          run sed PROGRAM on installed program names
+EOF
+    cat << EOF
+Host type:
+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
+  --host=HOST             configure for HOST [guessed]
+  --target=TARGET         configure for TARGET [TARGET=HOST]
+Features and packages:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --x-includes=DIR        X include files are in DIR
+  --x-libraries=DIR       X library files are in DIR
+EOF
+    if test -n "$ac_help"; then
+      echo "--enable and --with options recognized:$ac_help"
+    fi
+    exit 0 ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host="$ac_optarg" ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir="$ac_optarg" ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir="$ac_optarg" ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir="$ac_optarg" ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir="$ac_optarg" ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    localstatedir="$ac_optarg" ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir="$ac_optarg" ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir="$ac_optarg" ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix="$ac_optarg" ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix="$ac_optarg" ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix="$ac_optarg" ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name="$ac_optarg" ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir="$ac_optarg" ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir="$ac_optarg" ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site="$ac_optarg" ;;
+
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir="$ac_optarg" ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir="$ac_optarg" ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target="$ac_optarg" ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers)
+    echo "configure generated by autoconf version 2.13"
+    exit 0 ;;
+
+  -with-* | --with-*)
+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_${ac_package}='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    eval "with_${ac_package}=no" ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes="$ac_optarg" ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries="$ac_optarg" ;;
+
+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+    ;;
+
+  *)
+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+      echo "configure: warning: $ac_option: invalid host type" 1>&2
+    fi
+    if test "x$nonopt" != xNONE; then
+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+    fi
+    nonopt="$ac_option"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+fi
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 6 checking for... messages and results
+# 5 compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec 6>/dev/null
+else
+  exec 6>&1
+fi
+exec 5>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+" 1>&5
+
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell metacharacters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
+# NLS nuisances.
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo > confdefs.h
+
+# A filename unique to this package, relative to the directory that
+# configure is in, which we can look for to find out if srcdir is correct.
+ac_unique_file=crt0.c
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_prog=$0
+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+  else
+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+  fi
+fi
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
+  fi
+else
+  CONFIG_SITE="$sitefile"
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    echo "loading site script $ac_site_file"
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  echo "loading cache $cache_file"
+  . $cache_file
+else
+  echo "creating cache $cache_file"
+  > $cache_file
+fi
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+ac_exeext=
+ac_objext=o
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
+
+
+ac_aux_dir=
+for ac_dir in ../../../.. $srcdir/../../../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:580: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_IFS"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL="$ac_install_sh"
+  fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+echo "configure:633: checking whether build environment is sane" >&5
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftestfile`
+   fi
+   if test "$*" != "X $srcdir/configure conftestfile" \
+      && test "$*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" 1>&2; exit 1; }
+   fi
+
+   test "$2" = conftestfile
+   )
+then
+   # Ok.
+   :
+else
+   { echo "configure: error: newly created file is older than distributed files!
+Check your system clock" 1>&2; exit 1; }
+fi
+rm -f conftest*
+echo "$ac_t""yes" 1>&6
+if test "$program_transform_name" = s,x,x,; then
+  program_transform_name=
+else
+  # Double any \ or $.  echo might interpret backslashes.
+  cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftestmake <<\EOF
+all:
+	@echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftestmake
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SET_MAKE=
+else
+  echo "$ac_t""no" 1>&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+if test $host != $build; then
+  ac_tool_prefix=${host_alias}-
+else
+  ac_tool_prefix=
+fi
+
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+echo "configure:723: checking for Cygwin environment" >&5
+if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 728 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_cygwin=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_cygwin=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_cygwin" 1>&6
+CYGWIN=
+test "$ac_cv_cygwin" = yes && CYGWIN=yes
+echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
+echo "configure:756: checking for mingw32 environment" >&5
+if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 761 "configure"
+#include "confdefs.h"
+
+int main() {
+return __MINGW32__;
+; return 0; }
+EOF
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_mingw32=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_mingw32=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_mingw32" 1>&6
+MINGW32=
+test "$ac_cv_mingw32" = yes && MINGW32=yes
+
+# Check whether --enable-multilib or --disable-multilib was given.
+if test "${enable_multilib+set}" = set; then
+  enableval="$enable_multilib"
+  case "${enableval}" in
+  yes) multilib=yes ;;
+  no)  multilib=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
+ esac
+else
+  multilib=yes
+fi
+
+# Check whether --enable-target-optspace or --disable-target-optspace was given.
+if test "${enable_target_optspace+set}" = set; then
+  enableval="$enable_target_optspace"
+  case "${enableval}" in
+  yes) target_optspace=yes ;;
+  no)  target_optspace=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
+ esac
+else
+  target_optspace=
+fi
+
+# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
+if test "${enable_malloc_debugging+set}" = set; then
+  enableval="$enable_malloc_debugging"
+  case "${enableval}" in
+  yes) malloc_debugging=yes ;;
+  no)  malloc_debugging=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
+ esac
+else
+  malloc_debugging=
+fi
+
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
+  case "${enableval}" in
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
+ esac
+else
+  newlib_mb=no
+fi
+
+
+test -z "${with_target_subdir}" && with_target_subdir=.
+
+if test "${srcdir}" = "."; then
+  if test "${with_target_subdir}" != "."; then
+    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
+  else
+    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
+  fi
+else
+  newlib_basedir="${srcdir}/../../.."
+fi
+
+
+
+# Make sure we can run config.sub.
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:854: checking host system type" >&5
+
+host_alias=$host
+case "$host_alias" in
+NONE)
+  case $nonopt in
+  NONE)
+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+    fi ;;
+  *) host_alias=$nonopt ;;
+  esac ;;
+esac
+
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
+
+
+
+PACKAGE=newlib
+
+VERSION=1.10.0
+
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
+fi
+cat >> confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
+
+
+
+missing_dir=`cd $ac_aux_dir && pwd`
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
+   echo "$ac_t""found" 1>&6
+else
+   ACLOCAL="$missing_dir/missing aclocal"
+   echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
+echo "configure:908: checking for working autoconf" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (autoconf --version) < /dev/null > /dev/null 2>&1; then
+   AUTOCONF=autoconf
+   echo "$ac_t""found" 1>&6
+else
+   AUTOCONF="$missing_dir/missing autoconf"
+   echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
+   echo "$ac_t""found" 1>&6
+else
+   AUTOMAKE="$missing_dir/missing automake"
+   echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
+echo "configure:934: checking for working autoheader" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (autoheader --version) < /dev/null > /dev/null 2>&1; then
+   AUTOHEADER=autoheader
+   echo "$ac_t""found" 1>&6
+else
+   AUTOHEADER="$missing_dir/missing autoheader"
+   echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
+echo "configure:947: checking for working makeinfo" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
+   MAKEINFO=makeinfo
+   echo "$ac_t""found" 1>&6
+else
+   MAKEINFO="$missing_dir/missing makeinfo"
+   echo "$ac_t""missing" 1>&6
+fi
+
+
+
+# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
+# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
+# are probably using a cross compiler, which will not be able to fully
+# link an executable.  This should really be fixed in autoconf
+# itself.
+
+
+
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:972: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="gcc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1002: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_prog_rejected=no
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+	continue
+      fi
+      ac_cv_prog_CC="cc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# -gt 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    set dummy "$ac_dir/$ac_word" "$@"
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+echo "configure:1051: checking whether we are using GNU C" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.c <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gcc=yes
+else
+  ac_cv_prog_gcc=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS=
+  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  ac_cv_prog_cc_g=yes
+else
+  ac_cv_prog_cc_g=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-O2"
+  fi
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
+
+
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
+# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1129: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AS="${ac_tool_prefix}as"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
+fi
+fi
+AS="$ac_cv_prog_AS"
+if test -n "$AS"; then
+  echo "$ac_t""$AS" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1161: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AR="${ac_tool_prefix}ar"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
+fi
+fi
+AR="$ac_cv_prog_AR"
+if test -n "$AR"; then
+  echo "$ac_t""$AR" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1193: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+if test -z "$ac_cv_prog_RANLIB"; then
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1225: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  RANLIB=":"
+fi
+fi
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:1270: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_IFS"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL="$ac_install_sh"
+  fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval="$enable_maintainer_mode"
+  USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
+  
+
+if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+  MAINT=$MAINTAINER_MODE_TRUE
+  
+
+
+# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
+# at least currently, we never actually build a program, so we never
+# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
+# fails, because we are probably configuring with a cross compiler
+# which can't create executables.  So we include AC_EXEEXT to keep
+# automake happy, but we don't execute it, since we don't care about
+# the result.
+if false; then
+  
+
+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+echo "configure:1358: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+  ac_cv_exeext=.exe
+else
+  rm -f conftest*
+  echo 'int main () { return 0; }' > conftest.$ac_ext
+  ac_cv_exeext=
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+    for file in conftest.*; do
+      case $file in
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+      esac
+    done
+  else
+    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+  fi
+  rm -f conftest*
+  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+fi
+fi
+
+EXEEXT=""
+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+echo "$ac_t""${ac_cv_exeext}" 1>&6
+ac_exeext=$EXEEXT
+
+fi
+
+. ${newlib_basedir}/configure.host
+
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
+newlib_cflags="${newlib_cflags} -fno-builtin"
+
+NEWLIB_CFLAGS=${newlib_cflags}
+
+
+LDFLAGS=${ldflags}
+
+
+
+
+if test x${use_libtool} = xyes; then
+  USE_LIBTOOL_TRUE=
+  USE_LIBTOOL_FALSE='#'
+else
+  USE_LIBTOOL_TRUE='#'
+  USE_LIBTOOL_FALSE=
+fi
+
+
+
+
+
+
+
+
+trap '' 1 2 15
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Any assignment to VPATH causes Sun make to only execute
+# the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+fi
+
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
+
+
+# Without the "./", some shells look in PATH for config.status.
+: ${CONFIG_STATUS=./config.status}
+
+echo creating $CONFIG_STATUS
+rm -f $CONFIG_STATUS
+cat > $CONFIG_STATUS <<EOF
+#! /bin/sh
+# Generated automatically by configure.
+# Run this file to recreate the current configuration.
+# This directory was configured as follows,
+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# $0 $ac_configure_args
+#
+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.
+
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option
+do
+  case "\$ac_option" in
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    exit 0 ;;
+  -help | --help | --hel | --he | --h)
+    echo "\$ac_cs_usage"; exit 0 ;;
+  *) echo "\$ac_cs_usage"; exit 1 ;;
+  esac
+done
+
+ac_given_srcdir=$srcdir
+ac_given_INSTALL="$INSTALL"
+
+trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+$ac_vpsub
+$extrasub
+s%@SHELL@%$SHELL%g
+s%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
+s%@DEFS@%$DEFS%g
+s%@LDFLAGS@%$LDFLAGS%g
+s%@LIBS@%$LIBS%g
+s%@exec_prefix@%$exec_prefix%g
+s%@prefix@%$prefix%g
+s%@program_transform_name@%$program_transform_name%g
+s%@bindir@%$bindir%g
+s%@sbindir@%$sbindir%g
+s%@libexecdir@%$libexecdir%g
+s%@datadir@%$datadir%g
+s%@sysconfdir@%$sysconfdir%g
+s%@sharedstatedir@%$sharedstatedir%g
+s%@localstatedir@%$localstatedir%g
+s%@libdir@%$libdir%g
+s%@includedir@%$includedir%g
+s%@oldincludedir@%$oldincludedir%g
+s%@infodir@%$infodir%g
+s%@mandir@%$mandir%g
+s%@newlib_basedir@%$newlib_basedir%g
+s%@host@%$host%g
+s%@host_alias@%$host_alias%g
+s%@host_cpu@%$host_cpu%g
+s%@host_vendor@%$host_vendor%g
+s%@host_os@%$host_os%g
+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+s%@INSTALL_DATA@%$INSTALL_DATA%g
+s%@PACKAGE@%$PACKAGE%g
+s%@VERSION@%$VERSION%g
+s%@ACLOCAL@%$ACLOCAL%g
+s%@AUTOCONF@%$AUTOCONF%g
+s%@AUTOMAKE@%$AUTOMAKE%g
+s%@AUTOHEADER@%$AUTOHEADER%g
+s%@MAKEINFO@%$MAKEINFO%g
+s%@SET_MAKE@%$SET_MAKE%g
+s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
+s%@AS@%$AS%g
+s%@AR@%$AR%g
+s%@RANLIB@%$RANLIB%g
+s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
+s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
+s%@MAINT@%$MAINT%g
+s%@EXEEXT@%$EXEEXT%g
+s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
+s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
+s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
+s%@oext@%$oext%g
+s%@aext@%$aext%g
+s%@libm_machine_dir@%$libm_machine_dir%g
+s%@machine_dir@%$machine_dir%g
+s%@sys_dir@%$sys_dir%g
+
+CEOF
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+    # The file is in a subdirectory.
+    test ! -d "$ac_dir" && mkdir "$ac_dir"
+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dir_suffix.
+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dir_suffix= ac_dots=
+  fi
+
+  case "$ac_given_srcdir" in
+  .)  srcdir=.
+      if test -z "$ac_dots"; then top_srcdir=.
+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  *) # Relative path.
+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  case "$ac_given_INSTALL" in
+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  esac
+
+  echo creating "$ac_file"
+  rm -f "$ac_file"
+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  case "$ac_file" in
+  *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+  *) ac_comsub= ;;
+  esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
+s%@srcdir@%$srcdir%g
+s%@top_srcdir@%$top_srcdir%g
+s%@INSTALL@%$INSTALL%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+fi; done
+rm -f conftest.s*
+
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+
+exit 0
+EOF
+chmod +x $CONFIG_STATUS
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+
diff --git a/newlib/libc/sys/cygwin/configure.in b/newlib/libc/sys/cygwin/configure.in
new file mode 100644
index 0000000..a7179a2
--- /dev/null
+++ b/newlib/libc/sys/cygwin/configure.in
@@ -0,0 +1,12 @@
+dnl This is the newlib/libc/sys/cygwin32 configure.in file.
+dnl Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.5)
+AC_INIT(crt0.c)
+
+dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
+AC_CONFIG_AUX_DIR(../../../..)
+
+NEWLIB_CONFIGURE(../../..)
+
+AC_OUTPUT(Makefile)
diff --git a/newlib/libc/sys/cygwin/crt0.c b/newlib/libc/sys/cygwin/crt0.c
new file mode 100644
index 0000000..2837a54
--- /dev/null
+++ b/newlib/libc/sys/cygwin/crt0.c
@@ -0,0 +1,56 @@
+/* crt0.c.
+
+   Copyright 2001 Red Hat, Inc.
+
+This software is a copyrighted work licensed under the terms of the
+Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+details. */
+
+#ifdef __PPC__
+/* For the PowerPC, we want to make this function have its structured
+   exception table exception function point to something we control.  */
+
+extern void __cygwin_exception_handler();
+extern void mainCRTStartup(void) __attribute__((__exception__(__cygwin_exception_handler)));
+#endif
+
+/* In the following ifdef'd i386 code, the FPU precision is set to 80 bits
+   and all FPU exceptions are masked.  The former is needed to make long
+   doubles work correctly.  The latter causes the FPU to generate NaNs and
+   Infinities instead of signals for certain operations.
+*/
+
+#ifdef __i386__
+#define FPU_RESERVED 0xF0C0
+#define FPU_DEFAULT  0x033f
+
+/* For debugging on *#!$@ windbg.  bp for breakpoint.  */
+int __cygwin_crt0_bp = 0;
+#endif
+
+extern int main (int argc, char **argv);
+
+void
+mainCRTStartup ()
+{
+#ifdef __i386__
+  if (__cygwin_crt0_bp)
+    asm volatile ("int3");
+
+  {
+    volatile unsigned short cw;
+
+    /* Get Control Word */
+    __asm__ volatile ("fnstcw %0" : "=m" (cw) : );
+
+    /* mask in */
+    cw &= FPU_RESERVED;
+    cw |= FPU_DEFAULT;
+
+    /* set cw */
+    __asm__ volatile ("fldcw %0" :: "m" (cw));
+  }
+#endif
+
+  cygwin_crt0 (main);
+}
diff --git a/newlib/libc/sys/cygwin/include/unistd.h b/newlib/libc/sys/cygwin/include/unistd.h
new file mode 100644
index 0000000..9818176
--- /dev/null
+++ b/newlib/libc/sys/cygwin/include/unistd.h
@@ -0,0 +1,11 @@
+/* unistd.h for Cygwin. */
+
+#ifndef _UNISTD_H_
+#define _UNISTD_H_
+
+# include <sys/unistd.h>
+# define __UNISTD_GETOPT__
+# include <getopt.h>
+# undef __UNISTD_GETOPT__
+
+#endif /* _UNISTD_H_ */
diff --git a/newlib/libc/sys/cygwin/sys/dirent.h b/newlib/libc/sys/cygwin/sys/dirent.h
new file mode 100644
index 0000000..c393fba
--- /dev/null
+++ b/newlib/libc/sys/cygwin/sys/dirent.h
@@ -0,0 +1,71 @@
+/* Posix dirent.h for WIN32.
+
+   Copyright 2001 Red Hat, Inc.
+
+   This software is a copyrighted work licensed under the terms of the
+   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+   details. */
+
+/* Including this file should not require any Windows headers.  */
+   
+#ifndef _SYS_DIRENT_H
+#define _SYS_DIRENT_H
+
+#include <sys/types.h>
+
+#define __DIRENT_VERSION	1
+
+struct dirent
+{
+  long d_version;	/* Used since Cygwin 1.3.3. */
+  long __d_reserved[2];
+  long d_fd;		/* File descriptor of open directory.
+			   Used since Cygwin 1.3.3. */
+  ino_t d_ino;		/* Just for compatibility, it's junk */
+  char d_name[256];	/* FIXME: use NAME_MAX? */
+};
+
+#define __DIRENT_COOKIE 0xdede4242
+
+typedef struct __DIR
+{
+  /* This is first to set alignment in non _COMPILING_NEWLIB case.  */
+  unsigned long __d_cookie;
+  struct dirent *__d_dirent;
+  char *__d_dirname;		/* directory name with trailing '*' */
+  off_t __d_position;		/* used by telldir/seekdir */
+  unsigned long __d_dirhash;	/* hash of directory name for use by
+				   readdir */
+  union
+    {
+#ifdef _COMPILING_NEWLIB
+      struct
+	{
+	  void *__handle;
+	  void *__fh;
+	} __d_data;
+#endif
+      char __d_filler[16];
+    } __d_u;
+} DIR;
+
+DIR *opendir (const char *);
+struct dirent *readdir (DIR *);
+void rewinddir (DIR *);
+int closedir (DIR *);
+
+int dirfd (DIR *);
+
+#ifndef _POSIX_SOURCE
+off_t telldir (DIR *);
+void seekdir (DIR *, off_t loc);
+
+int scandir (const char *__dir,
+	     struct dirent ***__namelist,
+	     int (*select) (const struct dirent *),
+	     int (*compar) (const struct dirent **, const struct dirent **));
+
+int alphasort (const struct dirent **__a, const struct dirent **__b);
+#endif /* _POSIX_SOURCE */
+
+#endif
diff --git a/newlib/libc/sys/cygwin/sys/param.h b/newlib/libc/sys/cygwin/sys/param.h
new file mode 100644
index 0000000..09ef74e
--- /dev/null
+++ b/newlib/libc/sys/cygwin/sys/param.h
@@ -0,0 +1,51 @@
+/* sys/param.h
+
+   Copyright 2001 Red Hat, Inc.
+
+   This software is a copyrighted work licensed under the terms of the
+   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+   details. */
+
+#ifndef _SYS_PARAM_H
+#define _SYS_PARAM_H
+
+#include <sys/types.h>
+/* Linux includes limits.h, but this is not universally done. */
+#include <limits.h>
+
+/* Max number of open files.  The Posix version is OPEN_MAX.  */
+/* Number of fds is virtually unlimited in cygwin, but we must provide
+   some reasonable value for Posix conformance */
+#define NOFILE		8192
+
+/* Max number of groups; must keep in sync with NGROUPS_MAX in limits.h */
+#define NGROUPS		16
+
+/* Ticks/second for system calls such as times() */
+/* FIXME: is this the appropriate value? */
+#define HZ		1000
+
+/* Max hostname size that can be dealt with */
+/* FIXME: is this the appropriate value? */
+#define MAXHOSTNAMELEN	64
+
+/* This is defined to be the same as MAX_PATH which is used internally.
+   The Posix version is PATH_MAX.  */
+#define MAXPATHLEN      (260 - 1 /*NUL*/)
+
+/* Some autoconf'd packages check for endianness.  When cross-building we
+   can't run programs on the target.  Fortunately, autoconf supports the
+   definition of byte order in sys/param.h (that's us!).
+   The values here are the same as used in gdb/defs.h (are the more
+   appropriate values?).  */
+#define BIG_ENDIAN	4321
+#define LITTLE_ENDIAN	1234
+
+/* All known win32 systems are little endian.  */
+#define BYTE_ORDER	LITTLE_ENDIAN
+
+#ifndef NULL
+#define NULL            0L
+#endif
+
+#endif
diff --git a/newlib/libc/sys/cygwin/sys/utime.h b/newlib/libc/sys/cygwin/sys/utime.h
new file mode 100644
index 0000000..5565b36
--- /dev/null
+++ b/newlib/libc/sys/cygwin/sys/utime.h
@@ -0,0 +1,30 @@
+/* sys/utime.h
+
+   Copyright 2001 Red Hat, Inc.
+
+   This software is a copyrighted work licensed under the terms of the
+   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+   details. */
+
+#ifndef _SYS_UTIME_H
+#define _SYS_UTIME_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <_ansi.h>
+#include <sys/types.h>
+
+struct utimbuf 
+{
+  time_t actime;
+  time_t modtime; 
+};
+
+int _EXFUN(utime, (const char *__path, struct utimbuf *__buf));
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif /* _SYS_UTIME_H */
diff --git a/newlib/libc/sys/cygwin/sys/utmp.h b/newlib/libc/sys/cygwin/sys/utmp.h
new file mode 100644
index 0000000..12257f5
--- /dev/null
+++ b/newlib/libc/sys/cygwin/sys/utmp.h
@@ -0,0 +1,59 @@
+/* sys/utmp.h
+
+   Copyright 2001 Red Hat, Inc.
+
+   This software is a copyrighted work licensed under the terms of the
+   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+   details. */
+
+#ifndef UTMP_H
+#define UTMP_H
+
+#include <sys/types.h>
+#include <time.h>
+#include <paths.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define UT_LINESIZE	16
+#define UT_NAMESIZE	16
+#define UT_HOSTSIZE	256
+#define ut_name ut_user
+
+struct utmp 
+{
+ short	ut_type;	
+ pid_t	ut_pid;		
+ char	ut_line[UT_LINESIZE];
+ char	ut_id[2];
+ time_t ut_time;	
+ char	ut_user[UT_NAMESIZE];	
+ char	ut_host[UT_HOSTSIZE];	
+ long	ut_addr;	
+};
+
+#define INIT_PROCESS	5
+#define LOGIN_PROCESS	6
+#define USER_PROCESS	7
+#define DEAD_PROCESS	8
+
+extern struct utmp *_getutline (struct utmp *);
+extern struct utmp *getutent (void);
+extern struct utmp *getutid (struct utmp *);
+extern struct utmp *getutline (struct utmp *);
+extern void endutent (void);
+extern void pututline (struct utmp *);
+extern void setutent (void);
+extern void utmpname (const char *);
+
+void login (struct utmp *);
+int logout (char *);
+int login_tty (int);
+void logwtmp (char *, char *, char *);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* UTMP_H */
diff --git a/newlib/libc/sys/d10v/Makefile.in b/newlib/libc/sys/d10v/Makefile.in
index 8a34fbd..605f555 100644
--- a/newlib/libc/sys/d10v/Makefile.in
+++ b/newlib/libc/sys/d10v/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/d10v/aclocal.m4 b/newlib/libc/sys/d10v/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/d10v/aclocal.m4
+++ b/newlib/libc/sys/d10v/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/d10v/configure b/newlib/libc/sys/d10v/configure
index 091e11f..b505fc6 100755
--- a/newlib/libc/sys/d10v/configure
+++ b/newlib/libc/sys/d10v/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/decstation/Makefile.in b/newlib/libc/sys/decstation/Makefile.in
index ab05464..6c3c128 100644
--- a/newlib/libc/sys/decstation/Makefile.in
+++ b/newlib/libc/sys/decstation/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,29 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-COPYOFILES =  	read.o 	open.o 	_exit.o 	write.o 	lseek.o 	close.o 	sbrk.o 	cerror.o 	fork.o 	isatty.o 	ioctl.o 	getpid.o 	time.o 	kill.o 	wait.o 	execve.o 	gettimeofday.o 	link.o 	unlink.o 	fstat.o 	times.o  	getrusage.o  
+COPYOFILES = \
+	read.o \
+	open.o \
+	_exit.o \
+	write.o \
+	lseek.o \
+	close.o \
+	sbrk.o \
+	cerror.o \
+	fork.o \
+	isatty.o \
+	ioctl.o \
+	getpid.o \
+	time.o \
+	kill.o \
+	wait.o \
+	execve.o \
+	gettimeofday.o \
+	link.o \
+	unlink.o \
+	fstat.o \
+	times.o  \
+	getrusage.o  
 
 
 lib_a_SOURCES = _main.c
@@ -135,8 +152,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/decstation/aclocal.m4 b/newlib/libc/sys/decstation/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/decstation/aclocal.m4
+++ b/newlib/libc/sys/decstation/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/decstation/configure b/newlib/libc/sys/decstation/configure
index 58f3ec9..976406e 100755
--- a/newlib/libc/sys/decstation/configure
+++ b/newlib/libc/sys/decstation/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/go32/Makefile.am b/newlib/libc/sys/go32/Makefile.am
new file mode 100644
index 0000000..4ccd669
--- /dev/null
+++ b/newlib/libc/sys/go32/Makefile.am
@@ -0,0 +1,105 @@
+## Process this file with automake to generate Makefile.in
+
+AUTOMAKE_OPTIONS = cygnus
+
+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+
+noinst_LIBRARIES = lib.a
+
+lib_a_SOURCES = \
+	_exit.s		\
+	_main.c		\
+	abort.c		\
+	access.c	\
+	bdos.c		\
+	bdosptr.c	\
+	brk.s		\
+	chdir.s		\
+	chmod.c		\
+	chown.c		\
+	clock.S		\
+	close.s		\
+	creat.s		\
+	crlf2nl.c	\
+	dir.c		\
+	dosmem.S 	\
+	dpmi.c          \
+	dup.s		\
+	dup2.s		\
+	exec.c          \
+	fchmod.c	\
+	findfirs.s	\
+	findnext.s	\
+	fixpath.c	\
+	fstat.s		\
+	fsync.s		\
+	ftruncat.c	\
+	gerrno.s	\
+	getcwd.c	\
+	getdate.c 	\
+	getdtabl.c	\
+	getgid.c	\
+	getkey.s	\
+	getpages.c	\
+	getpid.c	\
+	getrusag.c	\
+	gettime.c	\
+	gettimeo.c	\
+	getuid.c	\
+	getwd.s		\
+	go32func.c      \
+	infoblk.c	\
+	inportb.s	\
+	inportl.s	\
+	inportsb.s	\
+	inportsl.s	\
+	inportsw.s	\
+	inportw.s	\
+	int86x.s	\
+	intdos.c	\
+	intdosx.c	\
+	isatty.s	\
+	kbhit.s		\
+	kill.c		\
+	link.s		\
+	longjmp.S	\
+	lseek.s		\
+	lstat.s		\
+	mkdir.s		\
+	open.s		\
+	outportb.s	\
+	outportl.s	\
+	outportw.s	\
+	outprtsb.s	\
+	outprtsl.s	\
+	outprtsw.s	\
+	read.s		\
+	readv.c		\
+	rename.s	\
+	rmdir.s		\
+	sbrk.s		\
+	screen.S	\
+	setjmp.S	\
+	setmode.s	\
+	setstack.S 	\
+	settimeo.s	\
+	sleep.c		\
+	stat.c		\
+	stat_ast.s  	\
+	syserr.c	\
+	system.s	\
+	tell.s		\
+	time.c		\
+	truncate.c	\
+	turbo.s		\
+	umask.c		\
+	unlink.s	\
+	utime.c		\
+	utimes.c	\
+	write.s		\
+	writev.c
+
+all: crt0.o
+
+ACLOCAL_AMFLAGS = -I ../../..
+CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/go32/Makefile.in b/newlib/libc/sys/go32/Makefile.in
new file mode 100644
index 0000000..def3ff1
--- /dev/null
+++ b/newlib/libc/sys/go32/Makefile.in
@@ -0,0 +1,427 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = .
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AR = @AR@
+AS = @AS@
+CC = @CC@
+CPP = @CPP@
+EXEEXT = @EXEEXT@
+LDFLAGS = @LDFLAGS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+VERSION = @VERSION@
+aext = @aext@
+libm_machine_dir = @libm_machine_dir@
+machine_dir = @machine_dir@
+newlib_basedir = @newlib_basedir@
+oext = @oext@
+sys_dir = @sys_dir@
+
+AUTOMAKE_OPTIONS = cygnus
+
+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
+
+noinst_LIBRARIES = lib.a
+
+lib_a_SOURCES = \
+	_exit.s		\
+	_main.c		\
+	abort.c		\
+	access.c	\
+	bdos.c		\
+	bdosptr.c	\
+	brk.s		\
+	chdir.s		\
+	chmod.c		\
+	chown.c		\
+	clock.S		\
+	close.s		\
+	creat.s		\
+	crlf2nl.c	\
+	dir.c		\
+	dosmem.S 	\
+	dpmi.c          \
+	dup.s		\
+	dup2.s		\
+	exec.c          \
+	fchmod.c	\
+	findfirs.s	\
+	findnext.s	\
+	fixpath.c	\
+	fstat.s		\
+	fsync.s		\
+	ftruncat.c	\
+	gerrno.s	\
+	getcwd.c	\
+	getdate.c 	\
+	getdtabl.c	\
+	getgid.c	\
+	getkey.s	\
+	getpages.c	\
+	getpid.c	\
+	getrusag.c	\
+	gettime.c	\
+	gettimeo.c	\
+	getuid.c	\
+	getwd.s		\
+	go32func.c      \
+	infoblk.c	\
+	inportb.s	\
+	inportl.s	\
+	inportsb.s	\
+	inportsl.s	\
+	inportsw.s	\
+	inportw.s	\
+	int86x.s	\
+	intdos.c	\
+	intdosx.c	\
+	isatty.s	\
+	kbhit.s		\
+	kill.c		\
+	link.s		\
+	longjmp.S	\
+	lseek.s		\
+	lstat.s		\
+	mkdir.s		\
+	open.s		\
+	outportb.s	\
+	outportl.s	\
+	outportw.s	\
+	outprtsb.s	\
+	outprtsl.s	\
+	outprtsw.s	\
+	read.s		\
+	readv.c		\
+	rename.s	\
+	rmdir.s		\
+	sbrk.s		\
+	screen.S	\
+	setjmp.S	\
+	setmode.s	\
+	setstack.S 	\
+	settimeo.s	\
+	sleep.c		\
+	stat.c		\
+	stat_ast.s  	\
+	syserr.c	\
+	system.s	\
+	tell.s		\
+	time.c		\
+	truncate.c	\
+	turbo.s		\
+	umask.c		\
+	unlink.s	\
+	utime.c		\
+	utimes.c	\
+	write.s		\
+	writev.c
+
+
+ACLOCAL_AMFLAGS = -I ../../..
+CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
+CONFIG_CLEAN_FILES = 
+LIBRARIES =  $(noinst_LIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) 
+CPPFLAGS = @CPPFLAGS@
+LIBS = @LIBS@
+lib_a_LIBADD = 
+lib_a_OBJECTS =  _exit.o _main.o abort.o access.o bdos.o bdosptr.o brk.o \
+chdir.o chmod.o chown.o clock.o close.o creat.o crlf2nl.o dir.o \
+dosmem.o dpmi.o dup.o dup2.o exec.o fchmod.o findfirs.o findnext.o \
+fixpath.o fstat.o fsync.o ftruncat.o gerrno.o getcwd.o getdate.o \
+getdtabl.o getgid.o getkey.o getpages.o getpid.o getrusag.o gettime.o \
+gettimeo.o getuid.o getwd.o go32func.o infoblk.o inportb.o inportl.o \
+inportsb.o inportsl.o inportsw.o inportw.o int86x.o intdos.o intdosx.o \
+isatty.o kbhit.o kill.o link.o longjmp.o lseek.o lstat.o mkdir.o open.o \
+outportb.o outportl.o outportw.o outprtsb.o outprtsl.o outprtsw.o \
+read.o readv.o rename.o rmdir.o sbrk.o screen.o setjmp.o setmode.o \
+setstack.o settimeo.o sleep.o stat.o stat_ast.o syserr.o system.o \
+tell.o time.o truncate.o turbo.o umask.o unlink.o utime.o utimes.o \
+write.o writev.o
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = gtar
+GZIP_ENV = --best
+SOURCES = $(lib_a_SOURCES)
+OBJECTS = $(lib_a_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
+		../../../acinclude.m4 ../../../aclocal.m4
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+mostlyclean-noinstLIBRARIES:
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+distclean-noinstLIBRARIES:
+
+maintainer-clean-noinstLIBRARIES:
+
+.c.o:
+	$(COMPILE) -c $<
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
+
+maintainer-clean-compile:
+
+lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
+	-rm -f lib.a
+	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
+	$(RANLIB) lib.a
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	-rm -rf $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist
+	-rm -rf $(distdir)
+	@banner="$(distdir).tar.gz is ready for distribution"; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+distdir: $(DISTFILES)
+	-rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 777 $(distdir)
+	@for file in $(DISTFILES); do \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am:
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-info-am: 
+install-info: install-info-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile $(LIBRARIES)
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
+		mostlyclean-tags mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
+		mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-noinstLIBRARIES distclean-compile \
+		distclean-tags distclean-generic clean-am
+
+distclean: distclean-am
+	-rm -f config.status
+
+maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
+		maintainer-clean-compile maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+	-rm -f config.status
+
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-info-am install-info \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+all: crt0.o
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/newlib/libc/sys/go32/_exit.s b/newlib/libc/sys/go32/_exit.s
new file mode 100644
index 0000000..9ea01ce
--- /dev/null
+++ b/newlib/libc/sys/go32/_exit.s
@@ -0,0 +1,20 @@
+# /* This is file _EXIT.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl __exit
+__exit:
+	movb	4(%esp),%al
+	movb	$0x4c,%ah
+	int	$0x21
diff --git a/newlib/libc/sys/go32/_main.c b/newlib/libc/sys/go32/_main.c
new file mode 100644
index 0000000..c8c6136
--- /dev/null
+++ b/newlib/libc/sys/go32/_main.c
@@ -0,0 +1,3 @@
+__main()
+{
+}
diff --git a/newlib/libc/sys/go32/abort.c b/newlib/libc/sys/go32/abort.c
new file mode 100644
index 0000000..f2466c8
--- /dev/null
+++ b/newlib/libc/sys/go32/abort.c
@@ -0,0 +1,8 @@
+
+void
+abort()
+{
+  
+  exit(1);
+  
+}
diff --git a/newlib/libc/sys/go32/access.c b/newlib/libc/sys/go32/access.c
new file mode 100644
index 0000000..17d5646
--- /dev/null
+++ b/newlib/libc/sys/go32/access.c
@@ -0,0 +1,34 @@
+/* This is file ACCESS.C */
+/*
+** Copyright (C) 1993 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+int access(const char *fn, int flags)
+{
+  struct stat s;
+  if (stat(fn, &s))
+    return -1;
+  if (s.st_mode & S_IFDIR)
+    return 0;
+  if (flags & W_OK)
+  {
+    if (s.st_mode & S_IWRITE)
+      return 0;
+    return -1;
+  }
+  return 0;
+}
+	
diff --git a/newlib/libc/sys/go32/aclocal.m4 b/newlib/libc/sys/go32/aclocal.m4
new file mode 100644
index 0000000..9a25f7b
--- /dev/null
+++ b/newlib/libc/sys/go32/aclocal.m4
@@ -0,0 +1,299 @@
+dnl aclocal.m4 generated automatically by aclocal 1.4
+
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+dnl This provides configure definitions used by all the newlib
+dnl configure.in files.
+
+dnl Basic newlib configury.  This calls basic introductory stuff,
+dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
+dnl configure.host.  The only argument is the relative path to the top
+dnl newlib directory.
+
+AC_DEFUN(NEWLIB_CONFIGURE,
+[
+dnl Default to --enable-multilib
+AC_ARG_ENABLE(multilib,
+[  --enable-multilib         build many library versions (default)],
+[case "${enableval}" in
+  yes) multilib=yes ;;
+  no)  multilib=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
+ esac], [multilib=yes])dnl
+
+dnl Support --enable-target-optspace
+AC_ARG_ENABLE(target-optspace,
+[  --enable-target-optspace  optimize for space],
+[case "${enableval}" in
+  yes) target_optspace=yes ;;
+  no)  target_optspace=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
+ esac], [target_optspace=])dnl
+
+dnl Support --enable-malloc-debugging - currently only supported for Cygwin
+AC_ARG_ENABLE(malloc-debugging,
+[  --enable-malloc-debugging indicate malloc debugging requested],
+[case "${enableval}" in
+  yes) malloc_debugging=yes ;;
+  no)  malloc_debugging=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
+ esac], [malloc_debugging=])dnl
+
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
+[case "${enableval}" in
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
+
+dnl We may get other options which we don't document:
+dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
+
+test -z "[$]{with_target_subdir}" && with_target_subdir=.
+
+if test "[$]{srcdir}" = "."; then
+  if test "[$]{with_target_subdir}" != "."; then
+    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
+  else
+    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
+  fi
+else
+  newlib_basedir="[$]{srcdir}/$1"
+fi
+AC_SUBST(newlib_basedir)
+
+AC_CANONICAL_HOST
+
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
+
+# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
+# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
+# are probably using a cross compiler, which will not be able to fully
+# link an executable.  This should really be fixed in autoconf
+# itself.
+
+AC_DEFUN(LIB_AC_PROG_CC,
+[AC_BEFORE([$0], [AC_PROG_CPP])dnl
+AC_CHECK_PROG(CC, gcc, gcc)
+if test -z "$CC"; then
+  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
+  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+fi
+
+AC_PROG_CC_GNU
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+dnl Check whether -g works, even if CFLAGS is set, in case the package
+dnl plays around with CFLAGS (such as to build both debugging and
+dnl normal versions of a library), tasteless as that idea is.
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS=
+  AC_PROG_CC_G
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-O2"
+  fi
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
+])
+
+LIB_AC_PROG_CC
+
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
+AC_CHECK_TOOL(AS, as)
+AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+
+AC_PROG_INSTALL
+
+AM_MAINTAINER_MODE
+
+# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
+# at least currently, we never actually build a program, so we never
+# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
+# fails, because we are probably configuring with a cross compiler
+# which can't create executables.  So we include AC_EXEEXT to keep
+# automake happy, but we don't execute it, since we don't care about
+# the result.
+if false; then
+  AC_EXEEXT
+fi
+
+. [$]{newlib_basedir}/configure.host
+
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -fno-builtin"
+
+NEWLIB_CFLAGS=${newlib_cflags}
+AC_SUBST(NEWLIB_CFLAGS)
+
+LDFLAGS=${ldflags}
+AC_SUBST(LDFLAGS)
+
+AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
+AC_SUBST(oext)
+AC_SUBST(aext)
+
+AC_SUBST(libm_machine_dir)
+AC_SUBST(machine_dir)
+AC_SUBST(sys_dir)
+])
+
+# Do all the work for Automake.  This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+VERSION=[$2]
+AC_SUBST(VERSION)
+dnl test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+ifelse([$3],,
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
+dnl FIXME This is truly gross.
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN(AM_SANITY_CHECK,
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+   if test "[$]*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftestfile`
+   fi
+   if test "[$]*" != "X $srcdir/configure conftestfile" \
+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "[$]2" = conftestfile
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])
+
+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+dnl The program must properly implement --version.
+AC_DEFUN(AM_MISSING_PROG,
+[AC_MSG_CHECKING(for working $2)
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if ($2 --version) < /dev/null > /dev/null 2>&1; then
+   $1=$2
+   AC_MSG_RESULT(found)
+else
+   $1="$3/missing $2"
+   AC_MSG_RESULT(missing)
+fi
+AC_SUBST($1)])
+
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# serial 1
+
+AC_DEFUN(AM_MAINTAINER_MODE,
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT($USE_MAINTAINER_MODE)
+  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/go32/bdos.c b/newlib/libc/sys/go32/bdos.c
new file mode 100644
index 0000000..523f73a
--- /dev/null
+++ b/newlib/libc/sys/go32/bdos.c
@@ -0,0 +1,12 @@
+#include <errno.h>
+#include "dos.h"
+
+bdos(int func, unsigned dx, unsigned al)
+{
+  union REGS r;
+  r.x.dx = dx;
+  r.h.ah = func;
+  r.h.al = al;
+  int86(0x21, &r, &r);
+  return r.x.ax;
+}
diff --git a/newlib/libc/sys/go32/bdosptr.c b/newlib/libc/sys/go32/bdosptr.c
new file mode 100644
index 0000000..214d40b
--- /dev/null
+++ b/newlib/libc/sys/go32/bdosptr.c
@@ -0,0 +1,12 @@
+#include <errno.h>
+#include "dos.h"
+
+bdosptr(int func, void *dx, unsigned al)
+{
+  union REGS r;
+  r.x.dx = dx;
+  r.h.ah = func;
+  r.h.al = al;
+  int86(0x21, &r, &r);
+  return r.x.ax;
+}
diff --git a/newlib/libc/sys/go32/brk.s b/newlib/libc/sys/go32/brk.s
new file mode 100644
index 0000000..dded61d
--- /dev/null
+++ b/newlib/libc/sys/go32/brk.s
@@ -0,0 +1,27 @@
+# /* This is file BRK.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl	_brk
+_brk:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movw	$0x4a00,%ax
+	movl	16(%esp),%ebx
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	ret
diff --git a/newlib/libc/sys/go32/chdir.s b/newlib/libc/sys/go32/chdir.s
new file mode 100644
index 0000000..071c345
--- /dev/null
+++ b/newlib/libc/sys/go32/chdir.s
@@ -0,0 +1,27 @@
+# /* This is file CHDIR.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _chdir
+_chdir:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%edx
+	movb	$0x3b,%ah
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jmp	syscall_check
diff --git a/newlib/libc/sys/go32/chmod.c b/newlib/libc/sys/go32/chmod.c
new file mode 100644
index 0000000..e90f0e1
--- /dev/null
+++ b/newlib/libc/sys/go32/chmod.c
@@ -0,0 +1,15 @@
+/* This is file CHMOD.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+chmod(){}
diff --git a/newlib/libc/sys/go32/chown.c b/newlib/libc/sys/go32/chown.c
new file mode 100644
index 0000000..3daa7ea
--- /dev/null
+++ b/newlib/libc/sys/go32/chown.c
@@ -0,0 +1,15 @@
+/* This is file CHOWN.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+chown(){}
diff --git a/newlib/libc/sys/go32/clock.S b/newlib/libc/sys/go32/clock.S
new file mode 100644
index 0000000..198c7e6
--- /dev/null
+++ b/newlib/libc/sys/go32/clock.S
@@ -0,0 +1,45 @@
+/* This is file CLOCK.S */
+/*
+** Copyright (C) 1993 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+**
+** Modified by C. Sandmann for DPMI support (sandmann@clio.rice.edu)
+*/
+	.data
+clock_init:
+	.long	0
+
+	.text
+	.globl _clock
+_clock:
+	call	_rawclock
+	imull	$54931,%eax,%eax
+	ret
+	
+	.align  4,0x90
+	.globl	_rawclock
+_rawclock:
+	movzwl	__core_select,%eax
+	testl	%eax,%eax
+	je	old_clock	/* Image run with pre-DPMI extender */
+	movw	%ax,%gs
+	movl	%gs:0x46c(,1),%eax
+	jmp	check_initted
+old_clock:
+	movl	0xe000046c,%eax
+check_initted:
+	cmp	$0,clock_init
+	jne	clock_initted
+	movl	%eax,clock_init
+clock_initted:
+	subl	clock_init,%eax
+	ret
+
diff --git a/newlib/libc/sys/go32/close.s b/newlib/libc/sys/go32/close.s
new file mode 100644
index 0000000..aee0004
--- /dev/null
+++ b/newlib/libc/sys/go32/close.s
@@ -0,0 +1,27 @@
+# /* This is file CLOSE.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _close
+_close:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%ebx
+	movb	$0x3e,%ah
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jmp	syscall_check
diff --git a/newlib/libc/sys/go32/configure b/newlib/libc/sys/go32/configure
new file mode 100755
index 0000000..969169c
--- /dev/null
+++ b/newlib/libc/sys/go32/configure
@@ -0,0 +1,1722 @@
+#! /bin/sh
+
+# Guess values for system-dependent variables and create Makefiles.
+# Generated automatically using autoconf version 2.13 
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
+ac_help="$ac_help
+  --enable-multilib         build many library versions (default)"
+ac_help="$ac_help
+  --enable-target-optspace  optimize for space"
+ac_help="$ac_help
+  --enable-malloc-debugging indicate malloc debugging requested"
+ac_help="$ac_help
+  --enable-newlib-mb        enable multibyte support"
+ac_help="$ac_help
+  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer"
+
+# Initialize some variables set by options.
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+build=NONE
+cache_file=./config.cache
+exec_prefix=NONE
+host=NONE
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+sitefile=
+srcdir=
+target=NONE
+verbose=
+x_includes=NONE
+x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+# Initialize some other variables.
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
+
+ac_prev=
+for ac_option
+do
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval "$ac_prev=\$ac_option"
+    ac_prev=
+    continue
+  fi
+
+  case "$ac_option" in
+  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) ac_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case "$ac_option" in
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir="$ac_optarg" ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build="$ac_optarg" ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file="$ac_optarg" ;;
+
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir="$ac_optarg" ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    eval "enable_${ac_feature}=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_${ac_feature}='$ac_optarg'" ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix="$ac_optarg" ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he)
+    # Omit some internal or obsolete options to make the list less imposing.
+    # This message is too long to be a string in the A/UX 3.1 sh.
+    cat << EOF
+Usage: configure [options] [host]
+Options: [defaults in brackets after descriptions]
+Configuration:
+  --cache-file=FILE       cache test results in FILE
+  --help                  print this message
+  --no-create             do not create output files
+  --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
+  --version               print the version of autoconf that created configure
+Directory and file names:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [same as prefix]
+  --bindir=DIR            user executables in DIR [EPREFIX/bin]
+  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
+  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
+  --datadir=DIR           read-only architecture-independent data in DIR
+                          [PREFIX/share]
+  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
+                          [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
+  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
+  --includedir=DIR        C header files in DIR [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
+  --infodir=DIR           info documentation in DIR [PREFIX/info]
+  --mandir=DIR            man documentation in DIR [PREFIX/man]
+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+  --program-prefix=PREFIX prepend PREFIX to installed program names
+  --program-suffix=SUFFIX append SUFFIX to installed program names
+  --program-transform-name=PROGRAM
+                          run sed PROGRAM on installed program names
+EOF
+    cat << EOF
+Host type:
+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
+  --host=HOST             configure for HOST [guessed]
+  --target=TARGET         configure for TARGET [TARGET=HOST]
+Features and packages:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --x-includes=DIR        X include files are in DIR
+  --x-libraries=DIR       X library files are in DIR
+EOF
+    if test -n "$ac_help"; then
+      echo "--enable and --with options recognized:$ac_help"
+    fi
+    exit 0 ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host="$ac_optarg" ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir="$ac_optarg" ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir="$ac_optarg" ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir="$ac_optarg" ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir="$ac_optarg" ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    localstatedir="$ac_optarg" ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir="$ac_optarg" ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir="$ac_optarg" ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix="$ac_optarg" ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix="$ac_optarg" ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix="$ac_optarg" ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name="$ac_optarg" ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir="$ac_optarg" ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir="$ac_optarg" ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site="$ac_optarg" ;;
+
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir="$ac_optarg" ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir="$ac_optarg" ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target="$ac_optarg" ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers)
+    echo "configure generated by autoconf version 2.13"
+    exit 0 ;;
+
+  -with-* | --with-*)
+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_${ac_package}='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    eval "with_${ac_package}=no" ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes="$ac_optarg" ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries="$ac_optarg" ;;
+
+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+    ;;
+
+  *)
+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+      echo "configure: warning: $ac_option: invalid host type" 1>&2
+    fi
+    if test "x$nonopt" != xNONE; then
+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+    fi
+    nonopt="$ac_option"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+fi
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 6 checking for... messages and results
+# 5 compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec 6>/dev/null
+else
+  exec 6>&1
+fi
+exec 5>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+" 1>&5
+
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell metacharacters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
+# NLS nuisances.
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo > confdefs.h
+
+# A filename unique to this package, relative to the directory that
+# configure is in, which we can look for to find out if srcdir is correct.
+ac_unique_file=djtime.h
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_prog=$0
+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+  else
+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+  fi
+fi
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
+  fi
+else
+  CONFIG_SITE="$sitefile"
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    echo "loading site script $ac_site_file"
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  echo "loading cache $cache_file"
+  . $cache_file
+else
+  echo "creating cache $cache_file"
+  > $cache_file
+fi
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+ac_exeext=
+ac_objext=o
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
+
+
+ac_aux_dir=
+for ac_dir in ../../../.. $srcdir/../../../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:580: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_IFS"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL="$ac_install_sh"
+  fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+echo "configure:633: checking whether build environment is sane" >&5
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+   if test "$*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftestfile`
+   fi
+   if test "$*" != "X $srcdir/configure conftestfile" \
+      && test "$*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" 1>&2; exit 1; }
+   fi
+
+   test "$2" = conftestfile
+   )
+then
+   # Ok.
+   :
+else
+   { echo "configure: error: newly created file is older than distributed files!
+Check your system clock" 1>&2; exit 1; }
+fi
+rm -f conftest*
+echo "$ac_t""yes" 1>&6
+if test "$program_transform_name" = s,x,x,; then
+  program_transform_name=
+else
+  # Double any \ or $.  echo might interpret backslashes.
+  cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftestmake <<\EOF
+all:
+	@echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftestmake
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SET_MAKE=
+else
+  echo "$ac_t""no" 1>&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+if test $host != $build; then
+  ac_tool_prefix=${host_alias}-
+else
+  ac_tool_prefix=
+fi
+
+echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+echo "configure:723: checking for Cygwin environment" >&5
+if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 728 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_cygwin=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_cygwin=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_cygwin" 1>&6
+CYGWIN=
+test "$ac_cv_cygwin" = yes && CYGWIN=yes
+echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
+echo "configure:756: checking for mingw32 environment" >&5
+if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 761 "configure"
+#include "confdefs.h"
+
+int main() {
+return __MINGW32__;
+; return 0; }
+EOF
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_mingw32=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_mingw32=no
+fi
+rm -f conftest*
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_mingw32" 1>&6
+MINGW32=
+test "$ac_cv_mingw32" = yes && MINGW32=yes
+
+# Check whether --enable-multilib or --disable-multilib was given.
+if test "${enable_multilib+set}" = set; then
+  enableval="$enable_multilib"
+  case "${enableval}" in
+  yes) multilib=yes ;;
+  no)  multilib=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
+ esac
+else
+  multilib=yes
+fi
+
+# Check whether --enable-target-optspace or --disable-target-optspace was given.
+if test "${enable_target_optspace+set}" = set; then
+  enableval="$enable_target_optspace"
+  case "${enableval}" in
+  yes) target_optspace=yes ;;
+  no)  target_optspace=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
+ esac
+else
+  target_optspace=
+fi
+
+# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
+if test "${enable_malloc_debugging+set}" = set; then
+  enableval="$enable_malloc_debugging"
+  case "${enableval}" in
+  yes) malloc_debugging=yes ;;
+  no)  malloc_debugging=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
+ esac
+else
+  malloc_debugging=
+fi
+
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
+  case "${enableval}" in
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
+ esac
+else
+  newlib_mb=no
+fi
+
+
+test -z "${with_target_subdir}" && with_target_subdir=.
+
+if test "${srcdir}" = "."; then
+  if test "${with_target_subdir}" != "."; then
+    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
+  else
+    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
+  fi
+else
+  newlib_basedir="${srcdir}/../../.."
+fi
+
+
+
+# Make sure we can run config.sub.
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:854: checking host system type" >&5
+
+host_alias=$host
+case "$host_alias" in
+NONE)
+  case $nonopt in
+  NONE)
+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+    fi ;;
+  *) host_alias=$nonopt ;;
+  esac ;;
+esac
+
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
+
+
+
+PACKAGE=newlib
+
+VERSION=1.10.0
+
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
+fi
+cat >> confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
+
+
+
+missing_dir=`cd $ac_aux_dir && pwd`
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
+   echo "$ac_t""found" 1>&6
+else
+   ACLOCAL="$missing_dir/missing aclocal"
+   echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
+echo "configure:908: checking for working autoconf" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (autoconf --version) < /dev/null > /dev/null 2>&1; then
+   AUTOCONF=autoconf
+   echo "$ac_t""found" 1>&6
+else
+   AUTOCONF="$missing_dir/missing autoconf"
+   echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
+   echo "$ac_t""found" 1>&6
+else
+   AUTOMAKE="$missing_dir/missing automake"
+   echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
+echo "configure:934: checking for working autoheader" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (autoheader --version) < /dev/null > /dev/null 2>&1; then
+   AUTOHEADER=autoheader
+   echo "$ac_t""found" 1>&6
+else
+   AUTOHEADER="$missing_dir/missing autoheader"
+   echo "$ac_t""missing" 1>&6
+fi
+
+echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
+echo "configure:947: checking for working makeinfo" >&5
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
+   MAKEINFO=makeinfo
+   echo "$ac_t""found" 1>&6
+else
+   MAKEINFO="$missing_dir/missing makeinfo"
+   echo "$ac_t""missing" 1>&6
+fi
+
+
+
+# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
+# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
+# are probably using a cross compiler, which will not be able to fully
+# link an executable.  This should really be fixed in autoconf
+# itself.
+
+
+
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:972: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="gcc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1002: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_prog_rejected=no
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+	continue
+      fi
+      ac_cv_prog_CC="cc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# -gt 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    set dummy "$ac_dir/$ac_word" "$@"
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+echo "configure:1051: checking whether we are using GNU C" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.c <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gcc=yes
+else
+  ac_cv_prog_gcc=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS=
+  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  ac_cv_prog_cc_g=yes
+else
+  ac_cv_prog_cc_g=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-O2"
+  fi
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
+
+
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
+# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1129: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AS="${ac_tool_prefix}as"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
+fi
+fi
+AS="$ac_cv_prog_AS"
+if test -n "$AS"; then
+  echo "$ac_t""$AS" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1161: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AR="${ac_tool_prefix}ar"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
+fi
+fi
+AR="$ac_cv_prog_AR"
+if test -n "$AR"; then
+  echo "$ac_t""$AR" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1193: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+if test -z "$ac_cv_prog_RANLIB"; then
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1225: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  RANLIB=":"
+fi
+fi
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:1270: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_IFS"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL="$ac_install_sh"
+  fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval="$enable_maintainer_mode"
+  USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
+  
+
+if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+  MAINT=$MAINTAINER_MODE_TRUE
+  
+
+
+# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
+# at least currently, we never actually build a program, so we never
+# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
+# fails, because we are probably configuring with a cross compiler
+# which can't create executables.  So we include AC_EXEEXT to keep
+# automake happy, but we don't execute it, since we don't care about
+# the result.
+if false; then
+  
+
+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+echo "configure:1358: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+  ac_cv_exeext=.exe
+else
+  rm -f conftest*
+  echo 'int main () { return 0; }' > conftest.$ac_ext
+  ac_cv_exeext=
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+    for file in conftest.*; do
+      case $file in
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+      esac
+    done
+  else
+    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
+  fi
+  rm -f conftest*
+  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
+fi
+fi
+
+EXEEXT=""
+test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+echo "$ac_t""${ac_cv_exeext}" 1>&6
+ac_exeext=$EXEEXT
+
+fi
+
+. ${newlib_basedir}/configure.host
+
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
+newlib_cflags="${newlib_cflags} -fno-builtin"
+
+NEWLIB_CFLAGS=${newlib_cflags}
+
+
+LDFLAGS=${ldflags}
+
+
+
+
+if test x${use_libtool} = xyes; then
+  USE_LIBTOOL_TRUE=
+  USE_LIBTOOL_FALSE='#'
+else
+  USE_LIBTOOL_TRUE='#'
+  USE_LIBTOOL_FALSE=
+fi
+
+
+
+
+
+
+
+
+trap '' 1 2 15
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Any assignment to VPATH causes Sun make to only execute
+# the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+fi
+
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
+
+
+# Without the "./", some shells look in PATH for config.status.
+: ${CONFIG_STATUS=./config.status}
+
+echo creating $CONFIG_STATUS
+rm -f $CONFIG_STATUS
+cat > $CONFIG_STATUS <<EOF
+#! /bin/sh
+# Generated automatically by configure.
+# Run this file to recreate the current configuration.
+# This directory was configured as follows,
+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# $0 $ac_configure_args
+#
+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.
+
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option
+do
+  case "\$ac_option" in
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    exit 0 ;;
+  -help | --help | --hel | --he | --h)
+    echo "\$ac_cs_usage"; exit 0 ;;
+  *) echo "\$ac_cs_usage"; exit 1 ;;
+  esac
+done
+
+ac_given_srcdir=$srcdir
+ac_given_INSTALL="$INSTALL"
+
+trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+$ac_vpsub
+$extrasub
+s%@SHELL@%$SHELL%g
+s%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
+s%@DEFS@%$DEFS%g
+s%@LDFLAGS@%$LDFLAGS%g
+s%@LIBS@%$LIBS%g
+s%@exec_prefix@%$exec_prefix%g
+s%@prefix@%$prefix%g
+s%@program_transform_name@%$program_transform_name%g
+s%@bindir@%$bindir%g
+s%@sbindir@%$sbindir%g
+s%@libexecdir@%$libexecdir%g
+s%@datadir@%$datadir%g
+s%@sysconfdir@%$sysconfdir%g
+s%@sharedstatedir@%$sharedstatedir%g
+s%@localstatedir@%$localstatedir%g
+s%@libdir@%$libdir%g
+s%@includedir@%$includedir%g
+s%@oldincludedir@%$oldincludedir%g
+s%@infodir@%$infodir%g
+s%@mandir@%$mandir%g
+s%@newlib_basedir@%$newlib_basedir%g
+s%@host@%$host%g
+s%@host_alias@%$host_alias%g
+s%@host_cpu@%$host_cpu%g
+s%@host_vendor@%$host_vendor%g
+s%@host_os@%$host_os%g
+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+s%@INSTALL_DATA@%$INSTALL_DATA%g
+s%@PACKAGE@%$PACKAGE%g
+s%@VERSION@%$VERSION%g
+s%@ACLOCAL@%$ACLOCAL%g
+s%@AUTOCONF@%$AUTOCONF%g
+s%@AUTOMAKE@%$AUTOMAKE%g
+s%@AUTOHEADER@%$AUTOHEADER%g
+s%@MAKEINFO@%$MAKEINFO%g
+s%@SET_MAKE@%$SET_MAKE%g
+s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
+s%@AS@%$AS%g
+s%@AR@%$AR%g
+s%@RANLIB@%$RANLIB%g
+s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
+s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
+s%@MAINT@%$MAINT%g
+s%@EXEEXT@%$EXEEXT%g
+s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
+s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
+s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
+s%@oext@%$oext%g
+s%@aext@%$aext%g
+s%@libm_machine_dir@%$libm_machine_dir%g
+s%@machine_dir@%$machine_dir%g
+s%@sys_dir@%$sys_dir%g
+
+CEOF
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+    # The file is in a subdirectory.
+    test ! -d "$ac_dir" && mkdir "$ac_dir"
+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dir_suffix.
+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dir_suffix= ac_dots=
+  fi
+
+  case "$ac_given_srcdir" in
+  .)  srcdir=.
+      if test -z "$ac_dots"; then top_srcdir=.
+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  *) # Relative path.
+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  case "$ac_given_INSTALL" in
+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  esac
+
+  echo creating "$ac_file"
+  rm -f "$ac_file"
+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  case "$ac_file" in
+  *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+  *) ac_comsub= ;;
+  esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
+s%@srcdir@%$srcdir%g
+s%@top_srcdir@%$top_srcdir%g
+s%@INSTALL@%$INSTALL%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+fi; done
+rm -f conftest.s*
+
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+
+exit 0
+EOF
+chmod +x $CONFIG_STATUS
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+
diff --git a/newlib/libc/sys/go32/configure.in b/newlib/libc/sys/go32/configure.in
new file mode 100644
index 0000000..5706733
--- /dev/null
+++ b/newlib/libc/sys/go32/configure.in
@@ -0,0 +1,12 @@
+dnl This is the newlib/libc/sys/go32 configure.in file.
+dnl Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.5)
+AC_INIT(djtime.h)
+
+dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
+AC_CONFIG_AUX_DIR(../../../..)
+
+NEWLIB_CONFIGURE(../../..)
+
+AC_OUTPUT(Makefile)
diff --git a/newlib/libc/sys/go32/copying.dj b/newlib/libc/sys/go32/copying.dj
new file mode 100644
index 0000000..392311f
--- /dev/null
+++ b/newlib/libc/sys/go32/copying.dj
@@ -0,0 +1,61 @@
+This is the file "copying.dj".
+
+   Copyright Information for sources and executables that are marked
+   Copyright (C) DJ Delorie
+
+This document is Copyright (C) DJ Delorie and may be distributed
+verbatim, but changing it is not allowed.
+
+Source code copyright DJ Delorie is distributed under the terms of the
+GNU General Public Licence, with the following exceptions:
+
+
+* Source code copyright DJ Delorie is distributed under the terms of the
+  GNU General Public Licence, with the following exceptions:
+  ("go32.exe" refers to go32.exe and debug32.exe)
+
+  * There are no conditions on distributing copies of stub.exe as
+    it is originally distributed in this software package, prepended
+    onto a binary or otherwise.  This is the recommended distribution
+    mechanism for applications.
+  
+  * Binaries of emu387 may be distributed with no restrictions.
+
+  * If a user creates an application, prepends a copy of go32.exe onto
+    the beginning of it, and distributes it free of charge, then the
+    user is under no obligations to distribute source or pay royalties.
+    Note that the copyright terms of the FSF and/or UCB must be
+    obeyed regardless of this.
+  
+  * If a user creates an application, prepends a copy of go32.exe onto
+    the beginning of it, and charges a fee for the software, then a
+    royalty of $5 or 5% of the selling price per copy sold must be paid
+    to DJ Delorie.  DJ's mailing address is documented on the web page:
+    http://www.delorie.com/users/dj/.  Note that shareware programs are 
+    not considered "sold" until payment is rendered for them.
+
+  * For all other cases, source code for go32.exe must be distributed
+    with any distributed copies of go32.exe.
+  
+  * Software that requires go32.exe to run, but is not distributed with
+    a copy of go32.exe, incurs no obligations with regards to the
+    above sections.
+
+  * Contact me for special terms if none of the above are suitable.
+
+  * Donations are always appreciated.
+
+  The intent of this copyright is this: If you make money by using the
+  programs I wrote, I get some of it.  If you use your sources to
+  teach others how to write programs, I'll support you.
+
+Changes to source code copyright BSD or FSF are copyright DJ Delorie, but
+fall under the terms of the original copyright.
+
+A copy of the file "COPYING" is included with this document.  If you did not
+receive a copy of "COPYING", you may obtain one from whence this document
+was obtained, or by writing:
+      Free Software Foundation
+      675 Mass Ave
+      Cambridge, MA  02139
+      USA
diff --git a/newlib/libc/sys/go32/creat.s b/newlib/libc/sys/go32/creat.s
new file mode 100644
index 0000000..a866525
--- /dev/null
+++ b/newlib/libc/sys/go32/creat.s
@@ -0,0 +1,19 @@
+# /* This is file CREAT.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _creat
+_creat:
+	movb	$1,%al
+	jmp	turbo_assist
diff --git a/newlib/libc/sys/go32/crlf2nl.c b/newlib/libc/sys/go32/crlf2nl.c
new file mode 100644
index 0000000..79939c9
--- /dev/null
+++ b/newlib/libc/sys/go32/crlf2nl.c
@@ -0,0 +1,69 @@
+/* This is file CRLF2NL.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+unsigned crlf2nl(char *buf, unsigned len)
+{
+  char *bp = buf;
+  int i=0;
+  while (len--)
+  {
+    if (*bp != 13)
+    {
+      *buf++ = *bp;
+      i++;
+    }
+    bp++;
+  }
+  return i;
+}
+
+unsigned readcr(int fd, char *buf, unsigned len)
+{
+  unsigned i;
+  i = read(fd, buf, len);
+  if (i <= 0)
+    return i;
+  return crlf2nl(buf, i);
+}
+
+static char *sbuf = 0;
+#define BUFSIZE 4096
+
+unsigned writecr(int fd, char *buf, unsigned len)
+{
+  unsigned bufp=0, sbufp=0, crcnt=0, rlen=0;
+  int rv;
+  if (sbuf == 0)
+    sbuf = (char *)malloc(BUFSIZE+1);
+  while (len--)
+  {
+    if (buf[bufp] == 10)
+    {
+      crcnt++;
+      sbuf[sbufp++] = 13;
+    }
+    sbuf[sbufp++] = buf[bufp++];
+    if ((sbufp >= BUFSIZE) || (len == 0))
+    {
+      rv = write(fd, sbuf, sbufp);
+      if (rv < 0)
+        return rv;
+      rlen += rv - crcnt;
+      crcnt = 0;
+      sbufp = 0;
+    }
+  }
+  return rlen;
+}
+
diff --git a/newlib/libc/sys/go32/crt0.S b/newlib/libc/sys/go32/crt0.S
new file mode 100644
index 0000000..5fc6cf7
--- /dev/null
+++ b/newlib/libc/sys/go32/crt0.S
@@ -0,0 +1,233 @@
+
+/*
+**	Called as start(argc, argv, envp)
+*/
+
+/*	gs:edx points to prog_info structure.  All other registers are OBSOLETE
+**	but included for backwards compatibility
+*/
+
+/* These symbols are for global constructors and destructors */
+#if 0
+	.section	.ctor
+	.globl		___go32_first_ctor
+___go32_first_ctor:
+	.section	.dtor
+	.globl		___go32_last_ctor
+___go32_last_ctor:
+	.globl		___go32_first_dtor
+___go32_first_dtor:
+	.data
+	.globl		___go32_last_dtor
+___go32_last_dtor:
+#endif
+	.text
+	.globl	_start
+_start:
+	.globl	start
+start:
+#ifdef EMU387
+	pusha
+	push	%gs
+#endif
+	movl	%eax,__hard_master
+	movl	%esi,___pid
+	movl	%edi,___transfer_buffer
+	movl	%ebx,_ScreenPrimary
+	movl	%ebp,_ScreenSecondary
+
+	cmpl	$0, %edx
+	je	Lcopy_none
+	movw	%gs,%cx
+	movw	%ds,%ax
+	cmpw	%cx,%ax
+	je	Lcopy_none
+
+	movl	%gs:(%edx), %ecx
+	cmpl	__go32_info_block, %ecx
+	jbe	Lcopy_less
+	movl	__go32_info_block, %ecx
+Lcopy_less:
+	movl	$__go32_info_block, %edi
+	addl	$3, %ecx
+	andl	$0xfffffffc, %ecx
+	movl	%ecx, (%edi)
+	addl	$4, %edi
+	addl	$4, %edx
+	subl	$4, %ecx
+Lcopy_more:
+	movl	%gs:(%edx), %eax
+	movl	%eax, (%edi)
+	addl	$4, %edx
+	addl	$4, %edi
+	subl	$4, %ecx
+	jnz	Lcopy_more
+
+	movl	__go32_info_block+4, %eax
+	movl	%eax, _ScreenPrimary
+	movl	__go32_info_block+8, %eax
+	movl	%eax, _ScreenSecondary
+/* Backward compatibility - do not copy this one!
+**	movl	__go32_info_block+12, %eax
+**	movl	%eax, ___transfer_buffer
+*/
+	movl	__go32_info_block+20, %eax
+	movl	%eax, ___pid
+	movl	__go32_info_block+24, %eax
+	movl	%eax, __hard_master
+
+	jmp	Lcopy_done
+
+Lcopy_none:
+	movl	%ebx,__go32_info_block+4
+	movl	%ebp,__go32_info_block+8
+	movl	%edi,__go32_info_block+12
+	movl	$4096,__go32_info_block+16
+	movl	%esi,__go32_info_block+20
+	movl	%eax,__go32_info_block+24
+	movl	$28, __go32_info_block
+Lcopy_done:
+
+#ifndef EMU387
+	call	__setstack
+#endif
+	xorl	%esi,%esi
+	xorl	%edi,%edi
+	xorl	%ebp,%ebp
+	xorl	%ebx,%ebx
+
+	movl	%esp,%ebx
+#ifdef MAKE_GCRT0
+	call	mcount_init /* initialize the profiler */
+#endif
+	movl	8(%ebx),%eax
+	pushl	%eax
+	movl	%eax,_environ
+	pushl	4(%ebx)
+	pushl	(%ebx)
+	call	___main
+	call	_main
+	addl	$12,%esp
+#ifdef EMU387
+	pop	%gs
+	popa
+#else
+	pushl	%eax
+	call	_exit
+
+exit_again:
+	movl	$0x4c00,%eax
+	int	$0x21
+	jmp	exit_again
+#endif
+
+	ret
+
+
+#ifdef MAKE_GCRT0
+	.globl	__exit
+__exit:
+	call	mcount_write /* make sure we dump the output */
+exit_again2:
+	movb	4(%esp),%al
+	movb	$0x4c,%ah
+	int	$0x21
+	jmp	exit_again2
+
+/* Here is where we initialize the timer interrupt - specific to go32 */
+/* In this case, the timer calls mcount_isr */
+	.globl	mcount_isr_init
+mcount_isr_init:
+	movw	__go32_info_block+36, %ax	/* run mode */
+	cmp	$1,%ax
+	jb	skip_mcount
+	cmp	$3,%ax
+	ja	skip_mcount
+	
+	movw	$16,%ax
+	movw	%ax,%gs
+
+	movzbl	__hard_master,%eax	/* timer is on irq 0 */
+	shll	$3,%eax /* times 8 bpv */
+/*	movl	$960,%eax	   vector 0x78 * 8 bpv */
+	movw	%gs:(%eax),%cx
+	movw	%cx,mc_chain
+	movw	%gs:6(%eax),%cx
+	movw	%cx,mc_chain_hi
+	movw	%gs:2(%eax),%cx
+	movw	%cx,mc_chain_sel
+
+	movl	$mcount_isr,%ecx
+	movw	%cx,%gs:(%eax)
+	movw	$0xd8,%gs:2(%eax)	/* selector 27 == 32-bit code */
+	movw	$0x8f00,%gs:4(%eax)
+	rorl	$16,%ecx
+	movw	%cx,%gs:6(%eax)
+	movw	%ds,%ax
+	movw	%ax,%gs
+skip_mcount:
+	movl	mcount_histogram,%eax
+	movl	$1,(%eax)
+	ret
+
+/* Obtain the PC where we interrupted, and bump the histogram.  We should  */
+/* do error checking here, but we don't.  This routine is specific to go32 */
+/* in some spots */
+mcount_isr:
+	pushl	%eax
+	cmpl	$1,mcount_skip
+	je	L0
+	movl	4(%esp),%eax /* get the PC */
+	subl	$0x1020,%eax /* to fit in low..high */
+	andl	$0xfffffffc,%eax
+	shrl	$1,%eax /* now points to one 4-byte entry */
+	addl	mcount_histogram,%eax
+	incw	(%eax)
+L0:
+	popl	%eax
+	ljmp	mc_chain /* chain to the next timer vector */
+	iret
+#endif
+
+	.data
+
+	.globl	_environ
+_environ:
+	.long	0
+
+	.globl	___pid
+___pid:
+	.long	42
+
+	.globl	___transfer_buffer
+___transfer_buffer:
+	.long	0
+
+	.globl	_ScreenPrimary
+_ScreenPrimary:
+	.long	0
+
+	.globl	_ScreenSecondary
+_ScreenSecondary:
+	.long	0
+
+	.globl	__hard_master
+	.globl	__hard_slave
+	.globl	__core_select
+__hard_master:
+	.byte	0
+__hard_slave:
+	.byte	0
+__core_select:
+	.short	0
+
+#ifdef MAKE_GCRT0
+mc_chain:
+	.short	0
+mc_chain_hi:
+	.short	0
+mc_chain_sel:
+	.short	0
+#endif
+
+	
diff --git a/newlib/libc/sys/go32/dir.c b/newlib/libc/sys/go32/dir.c
new file mode 100644
index 0000000..ba3831a
--- /dev/null
+++ b/newlib/libc/sys/go32/dir.c
@@ -0,0 +1,95 @@
+#include <string.h>
+
+#include "sys/dir.h"
+#include "sys/dirent.h"
+#include <errno.h>
+
+DIR *opendir(char *name)
+{
+  int length;
+  DIR *dir = (DIR *)malloc(sizeof(DIR));
+  dir->num_read = 0;
+  dir->name = (char *)malloc(strlen(name)+6);
+  strcpy(dir->name, name);
+
+  /* Append a "." if we got only the device name */
+  if (dir->name[1] == ':' && strlen(dir->name) == 2)
+      strcat(dir->name, ".");
+
+  /* Strip trailing slashes, so we can append "/*.*" */
+  while (1)
+  {
+      length = strlen(dir->name);
+      if (length == 0) break;
+      if (dir->name[length - 1] == '/' ||
+	  dir->name[length - 1] == '\\')
+	  dir->name[length - 1] = '\0';
+      else
+	  break;
+  }
+
+  strcat(dir->name, "/*.*");
+  return dir;
+}
+
+
+
+static char *strlwr(char *s)
+{
+  char *p = s;
+  while (*s)
+  {
+    if ((*s >= 'A') && (*s <= 'Z'))
+      *s += 'a'-'A';
+    s++;
+  }
+  return p;
+}
+
+struct dirent *readdir(DIR *dir)
+{
+  int done;
+  int oerrno = errno;
+  if (dir->num_read)
+    done = findnext(&dir->ff);
+  else
+    done = findfirst(dir->name, &dir->ff,
+		     FA_ARCH|FA_RDONLY|FA_DIREC|FA_HIDDEN|FA_SYSTEM);
+  if (done)
+  {
+    if (errno == ENMFILE)
+      errno = oerrno;
+    return 0;
+  }
+  dir->num_read ++;
+  dir->de.d_namlen = strlen(dir->ff.ff_name);
+  strcpy(dir->de.d_name,dir->ff.ff_name);
+  strlwr(dir->de.d_name);
+  return &dir->de;
+}
+
+long telldir(DIR *dir)
+{
+  return dir->num_read;
+}
+
+void seekdir(DIR *dir, long loc)
+{
+  int i;
+  rewinddir(dir);
+  for (i=0; i<loc; i++)
+    readdir(dir);
+}
+
+void rewinddir(DIR *dir)
+{
+  dir->num_read = 0;
+}
+
+int closedir(DIR *dir)
+{
+  free(dir->name);
+  free(dir);
+  return 0;
+}
+
diff --git a/newlib/libc/sys/go32/dir.h b/newlib/libc/sys/go32/dir.h
new file mode 100644
index 0000000..826c460
--- /dev/null
+++ b/newlib/libc/sys/go32/dir.h
@@ -0,0 +1,53 @@
+#ifndef _DIR_H_

+#define _DIR_H_

+

+struct ffblk {

+  char ff_reserved[21];

+  char ff_attrib;

+  short ff_ftime;

+  short ff_fdate;

+  short ff_filler;

+  long ff_fsize;

+  char ff_name[16];

+};

+

+#define FA_RDONLY       1

+#define FA_HIDDEN       2

+#define FA_SYSTEM       4

+#define FA_LABEL        8

+#define FA_DIREC        16

+#define FA_ARCH         32

+

+/* for fnmerge/fnsplit */

+#define MAXPATH   80

+#define MAXDRIVE  3

+#define MAXDIR	  66

+#define MAXFILE   9

+#define MAXEXT	  5

+

+#define WILDCARDS 0x01

+#define EXTENSION 0x02

+#define FILENAME  0x04

+#define DIRECTORY 0x08

+#define DRIVE	  0x10

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+int findfirst(const char *pathname, struct ffblk *ffblk, int attrib);

+int findnext(struct ffblk *ffblk);

+

+void fnmerge (char *path, const char *drive, const char *dir,

+				 const char *name, const char *ext);

+int fnsplit (const char *path, char *drive, char *dir, 

+				 char *name, char *ext);

+

+int getdisk(void);

+int setdisk(int drive);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif

diff --git a/newlib/libc/sys/go32/djtime.h b/newlib/libc/sys/go32/djtime.h
new file mode 100644
index 0000000..7a14d2a
--- /dev/null
+++ b/newlib/libc/sys/go32/djtime.h
@@ -0,0 +1,42 @@
+/* This is file TIME.H */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#ifndef _SYS_TIME_H_
+#define _SYS_TIME_H_
+
+#include <time.h>
+
+struct timeval {
+  long tv_sec;
+  long tv_usec;
+};
+
+struct timezone {
+  int tz_minuteswest;
+  int tz_dsttime;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int gettimeofday(struct timeval *tp, struct timezone *tzp);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
diff --git a/newlib/libc/sys/go32/dos.h b/newlib/libc/sys/go32/dos.h
new file mode 100644
index 0000000..8b42562
--- /dev/null
+++ b/newlib/libc/sys/go32/dos.h
@@ -0,0 +1,107 @@
+#ifndef _DOS_H_
+#define _DOS_H_
+
+#include "pc.h"
+
+union REGS {
+  struct {
+    unsigned long ax;
+    unsigned long bx;
+    unsigned long cx;
+    unsigned long dx;
+    unsigned long si;
+    unsigned long di;
+    unsigned long cflag;
+    unsigned long flags;
+  } x;
+  struct {
+    unsigned char al;
+    unsigned char ah;
+    unsigned short upper_ax;
+    unsigned char bl;
+    unsigned char bh;
+    unsigned short upper_bx;
+    unsigned char cl;
+    unsigned char ch;
+    unsigned short upper_cx;
+    unsigned char dl;
+    unsigned char dh;
+    unsigned short upper_dx;
+  } h;
+};
+
+struct SREGS {
+  unsigned short cs;
+  unsigned short ds;
+  unsigned short es;
+  unsigned short fs;
+  unsigned short gs;
+  unsigned short ss;
+};
+
+struct ftime {
+  unsigned ft_tsec:5;	/* 0-29, double to get real seconds */
+  unsigned ft_min:6;	/* 0-59 */
+  unsigned ft_hour:5;	/* 0-23 */
+  unsigned ft_day:5;	/* 1-31 */
+  unsigned ft_month:4;	/* 1-12 */
+  unsigned ft_year:7;	/* since 1980 */
+};
+
+struct date {
+  short da_year;
+  char  da_day;
+  char  da_mon;
+};
+
+struct time {
+  unsigned char ti_min;
+  unsigned char ti_hour;
+  unsigned char ti_hund;
+  unsigned char ti_sec;
+};
+
+struct dfree {
+  unsigned df_avail;
+  unsigned df_total;
+  unsigned df_bsec;
+  unsigned df_sclus;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int bdos(int func, unsigned dx, unsigned al);
+int bdosptr(int func, void *dx, unsigned al);
+int int86(int ivec, union REGS *in, union REGS *out);
+int int86x(int ivec, union REGS *in, union REGS *out, struct SREGS *seg);
+int intdos(union REGS *in, union REGS *out);
+int intdosx(union REGS *in, union REGS *out, struct SREGS *seg);
+
+int enable(void);
+int disable(void);
+
+int getftime(int handle, struct ftime *ftimep);
+int setftime(int handle, struct ftime *ftimep);
+
+int getcbrk(void);
+int setcbrk(int new_value);
+
+void getdate(struct date *);
+void gettime(struct time *);
+void setdate(struct date *);
+void settime(struct time *);
+
+void getdfree(unsigned char drive, struct dfree *ptr);
+
+void delay(unsigned msec);
+int _get_default_drive(void);
+void _fixpath(const char *, char *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/newlib/libc/sys/go32/dosmem.S b/newlib/libc/sys/go32/dosmem.S
new file mode 100644
index 0000000..c1956f7
--- /dev/null
+++ b/newlib/libc/sys/go32/dosmem.S
@@ -0,0 +1,120 @@
+/* DOSMEM.S */
+/*
+** Copyright (C) 1993 C.W. Sandmann
+**
+** This file may be freely distributed as long as the author's name remains.
+** Extender environment independent way to set up Real area 1Mb access.
+** Procedure takes a single argument %eax which contains the real area offset.
+** After call, access may be made with "%gs:(%eax)"
+*/
+	.text
+	.align	2
+	.globl dosmemsetup
+dosmemsetup:				/* no params, expected ASM call only */
+	pushl	%eax
+	movzwl	__core_select,%eax
+	testl	%eax,%eax
+	je	old_go32		/* Image run with pre-DPMI extender */
+	movw	%ax,%gs			/* Use real area selector */
+	popl	%eax			/* Plus real offset */
+	andl	$0x0fffffff,%eax	/* Clear any linear access bits */
+	ret
+	.align	2,0x90
+old_go32:
+	push	%ds
+	pop	%gs			/* Use arena selector */
+	popl	%eax
+	orl	$0xe0000000,%eax	/* Plus linear access area */
+	ret
+
+	.align	2
+	.globl _dosmemget
+_dosmemget:				/* long offset, long len, long *buf */
+	push	%gs
+	movl	8(%esp),%eax		/* offset */
+	call	dosmemsetup
+	movl	12(%esp),%ecx		/* length */
+	movl	16(%esp),%edx		/* arena offset */
+	pushl	%esi
+	pushl	%edi
+	movl	%eax,%esi
+	movl	%edx,%edi
+	push	%ds
+	push	%es
+	push	%ds
+	pop	%es
+	push	%gs
+	pop	%ds
+	cld
+	rep
+	movsb				/* move ECX bytes from Real area */
+	pop	%es
+	pop	%ds
+	popl	%edi
+	popl	%esi
+	pop	%gs
+	ret
+
+	.align	2
+	.globl _dosmemput
+_dosmemput:				/* long *buf, long len, long offset */
+	push	%gs
+	movl	16(%esp),%eax		/* offset */
+	call	dosmemsetup
+	movl	12(%esp),%ecx		/* length */
+	movl	8(%esp),%edx		/* arena offset */
+	pushl	%esi
+	pushl	%edi
+	movl	%eax,%edi
+	movl	%edx,%esi
+	push	%es
+	push	%gs
+	pop	%es
+	cld
+	rep
+	movsb				/* move ECX bytes to Real area */
+	pop	%es
+	popl	%edi
+	popl	%esi
+	pop	%gs
+	ret
+
+	.align	2			/* 8(bp)    12(bp)   16(bp)    20(bp)    24(bp) */
+	.globl	_movedata		/* src_sel, src_ofs, dest_sel, dest_ofs, len    */
+_movedata:
+	pushl	%ebp
+	movl	%esp,%ebp
+	pushw	%ds
+	pushw	%es
+	pushl	%esi
+	pushl	%edi
+
+	movl	8(%ebp),%eax
+	movw	%ax,%ds
+	movl	12(%ebp),%esi
+
+	movl	16(%ebp),%eax
+	movw	%ax,%es
+	movl	20(%ebp),%edi
+
+	movl	24(%ebp),%ecx
+	pushl	%ecx
+	shrl	$2,%ecx
+	jcxz	no_big_move
+	rep
+	movsl
+no_big_move:
+	popl	%ecx
+	andl	$3,%ecx
+	jcxz	no_little_move
+	rep
+	movsb
+no_little_move:
+
+	popl	%edi
+	popl	%esi
+	popw	%es
+	popw	%ds
+	leave
+	ret
+
diff --git a/newlib/libc/sys/go32/dpmi.c b/newlib/libc/sys/go32/dpmi.c
new file mode 100644
index 0000000..5215065
--- /dev/null
+++ b/newlib/libc/sys/go32/dpmi.c
@@ -0,0 +1,413 @@
+#include <stdlib.h>
+#include "dos.h"
+#include "go32.h"
+#include <sys/types.h>
+#include "dpmi.h"
+
+static union REGS r;
+static struct SREGS s;
+
+int _go32_dpmi_allocate_dos_memory(_go32_dpmi_seginfo *info)
+{
+  r.x.ax = 0x0100;
+  r.x.bx = info->size;
+  int86(0x31, &r, &r);
+  if (r.x.flags & 1)
+  {
+    info->size = r.x.bx;
+    return r.x.ax;
+  }
+  else
+  {
+    info->rm_segment = r.x.ax;
+    info->pm_selector = r.x.dx;
+    return 0;
+  }
+}
+
+int _go32_dpmi_free_dos_memory(_go32_dpmi_seginfo *info)
+{
+  r.x.ax = 0x0101;
+  r.x.dx = info->pm_selector;
+  int86(0x31, &r, &r);
+  if (r.x.flags & 1)
+  {
+    return r.x.ax;
+  }
+  else
+  {
+    return 0;
+  }
+}
+
+int _go32_dpmi_resize_dos_memory(_go32_dpmi_seginfo *info)
+{
+  r.x.ax = 0x0102;
+  r.x.bx = info->size;
+  r.x.dx = info->pm_selector;
+  int86(0x31, &r, &r);
+  if (r.x.flags & 1)
+  {
+    info->size = r.x.bx;
+    return r.x.ax;
+  }
+  else
+  {
+    return 0;
+  }
+}
+
+int _go32_dpmi_get_real_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info)
+{
+  r.x.ax = 0x0200;
+  r.h.bl = vector;
+  int86(0x31, &r, &r);
+  info->rm_segment = r.x.cx;
+  info->rm_offset = r.x.dx;
+  return 0;
+}
+
+int _go32_dpmi_set_real_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info)
+{
+  r.x.ax = 0x0201;
+  r.h.bl = vector;
+  r.x.cx = info->rm_segment;
+  r.x.dx = info->rm_offset;
+  int86(0x31, &r, &r);
+  return 0;
+}
+
+int _go32_dpmi_get_protected_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info)
+{
+  r.x.ax = 0x0204;
+  r.h.bl = vector;
+  int86(0x31, &r, &r);
+  info->pm_selector = r.x.cx;
+  info->pm_offset = r.x.dx;
+  return 0;
+}
+
+int _go32_dpmi_set_protected_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info)
+{
+  r.x.ax = 0x0205;
+  r.h.bl = vector;
+  r.x.cx = info->pm_selector;
+  r.x.dx = info->pm_offset;
+  int86(0x31, &r, &r);
+  if (r.x.flags & 1)
+  {
+    return r.x.ax;
+  }
+  else
+  {
+    return 0;
+  }
+}
+
+/* In real DPMI, we enter with only CS known, and SS on a locked 4K stack which
+   is *NOT* our SS.  We must set up everthing, including a stack swap, then
+   restore it the way we found it.   C. Sandmann 4-93 */
+
+static unsigned char wrapper_intcommon[] = {
+0x1e,						/* push    ds                  */
+0x06,						/* push    es                  */
+0x0f, 0xa0,					/* push    fs                  */
+0x0f, 0xa8,					/* push    gs                  */
+0x60,						/* pusha                       */
+0x66, 0xb8, 0x34, 0x12,				/* mov     ax,0x1234           */
+0x8e, 0xd8,					/* mov     ds,ax               */
+0x8e, 0xc0,					/* mov     es,ax               */
+0x8e, 0xe0,					/* mov     fs,ax               */
+0x8e, 0xe8,					/* mov     gs,ax               */
+0xbb, 0x00, 0x00, 0x00, 0x00,			/* mov     ebx,_local_stack    */
+0xfc,						/* cld                         */
+0x89, 0xe1,					/* mov     ecx,esp             */
+0x8c, 0xd2,					/* mov     dx,ss               */
+0x8e, 0xd0,					/* mov     ss,ax               */
+0x89, 0xdc,					/* mov     esp,ebx             */
+0x52,						/* push    edx                 */
+0x51,						/* push    ecx                 */
+0xe8, 0x00, 0x00, 0x00, 0x00,			/* call    _rmih               */
+0x58,						/* pop     eax                 */
+0x5b,						/* pop     ebx                 */
+0x8e, 0xd3,					/* mov     ss,bx               */
+0x89, 0xc4,					/* mov     esp,eax             */
+0x61,						/* popa                        */
+0x0f, 0xa9,					/* pop     gs                  */
+0x0f, 0xa1,					/* pop     fs                  */
+0x07,						/* pop     es                  */
+0x1f						/* pop     ds                  */
+};
+
+static unsigned char wrapper_intiret[] = {
+0xcf						/* iret                        */
+};
+
+static unsigned char wrapper_intchain[] = {
+0x2e, 0xff, 0x2d, 0x00, 0x00, 0x00, 0x00,	/* jmp     cs:[_old_int+39]    */
+0xcf,						/* iret                        */
+0x78, 0x56, 0x34, 0x12,
+0xcd, 0xab
+};
+
+/* _interrupt_stack_size can be changed globally before calling this routine if
+   needed.  Don't change it between calls or you will mess up the malloc chain ! */
+
+unsigned _interrupt_stack_size = 32256;
+
+int _go32_dpmi_chain_protected_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info)
+{
+  char *mystack;
+  unsigned char *wrapper = (unsigned char *)malloc(sizeof(wrapper_intcommon) + sizeof(wrapper_intchain));
+  if (wrapper == 0)
+    return 0x8015;
+  mystack = (char *)malloc(_interrupt_stack_size);
+  if (mystack == 0)
+    return 0x8015;
+
+  r.x.ax = 0x0204;
+  r.h.bl = vector;
+  int86(0x31, &r, &r);
+
+  memcpy(wrapper, wrapper_intcommon, sizeof(wrapper_intcommon));
+  memcpy(wrapper+sizeof(wrapper_intcommon), wrapper_intchain, sizeof(wrapper_intchain));
+  *(short *)(wrapper+9) = _go32_my_ds();
+  *(long *)(wrapper+20) = (int)mystack + _interrupt_stack_size;
+  *(long *)(wrapper+36) = info->pm_offset - (int)wrapper - 40;
+  *(long *)(wrapper+sizeof(wrapper_intcommon)+3) = (long)wrapper+sizeof(wrapper_intcommon)+8;
+  *(long *)(wrapper+sizeof(wrapper_intcommon)+8) = r.x.dx;
+  *(short *)(wrapper+sizeof(wrapper_intcommon)+12) = r.x.cx;
+
+  r.x.ax = 0x0205;
+  r.h.bl = vector;
+  r.x.cx = _go32_my_cs();
+  r.x.dx = (int)wrapper;
+  int86(0x31, &r, &r);
+  return 0;
+}
+
+int _go32_dpmi_allocate_iret_wrapper(_go32_dpmi_seginfo *info)
+{
+  char *mystack;
+  unsigned char *wrapper = (unsigned char *)malloc(sizeof(wrapper_intcommon) + sizeof(wrapper_intiret));
+  if (wrapper == 0)
+    return 0x8015;
+  mystack = (char *)malloc(_interrupt_stack_size);
+  if (mystack == 0)
+    return 0x8015;
+
+  memcpy(wrapper, wrapper_intcommon, sizeof(wrapper_intcommon));
+  memcpy(wrapper+sizeof(wrapper_intcommon), wrapper_intiret, sizeof(wrapper_intiret));
+  *(short *)(wrapper+9) = _go32_my_ds();
+  *(long *)(wrapper+20) = (int)mystack + _interrupt_stack_size;
+  *(long *)(wrapper+36) = info->pm_offset - (int)wrapper - 40;
+
+  info->pm_offset = (int)wrapper;
+  return 0;
+}
+
+int _go32_dpmi_free_iret_wrapper(_go32_dpmi_seginfo *info)
+{
+  char *mystack;
+  char *wrapper = (char *)info->pm_offset;
+  mystack = (char *)(*(long *)(wrapper+20) - _interrupt_stack_size);
+  free(mystack);
+  free(wrapper);
+  return 0;
+}
+
+int _go32_dpmi_simulate_int(int vector, _go32_dpmi_registers *regs)
+{
+  r.h.bl = vector;
+  r.h.bh = 0;
+  r.x.cx = 0;
+  r.x.di = (int)regs;
+  if (vector == 0x21 && regs->x.ax == 0x4b00)
+  {
+    r.x.ax = 0xff0a;
+    int86(0x21, &r, &r);
+  }
+  else
+  {
+    r.x.ax = 0x0300;
+    int86(0x31, &r, &r);
+  }
+  if (r.x.flags & 1)
+  {
+    return r.x.ax;
+  }
+  else
+  {
+    return 0;
+  }
+}
+
+int _go32_dpmi_simulate_fcall(_go32_dpmi_registers *regs)
+{
+  r.x.ax = 0x0301;
+  r.h.bh = 0;
+  r.x.cx = 0;
+  r.x.di = (int)regs;
+  int86(0x31, &r, &r);
+  if (r.x.flags & 1)
+  {
+    return r.x.ax;
+  }
+  else
+  {
+    return 0;
+  }
+}
+
+int _go32_dpmi_simulate_fcall_iret(_go32_dpmi_registers *regs)
+{
+  r.x.ax = 0x0302;
+  r.h.bh = 0;
+  r.x.cx = 0;
+  r.x.di = (int)regs;
+  int86(0x31, &r, &r);
+  if (r.x.flags & 1)
+  {
+    return r.x.ax;
+  }
+  else
+  {
+    return 0;
+  }
+}
+
+/* Bug here; this needs to be fixed like above with SS & CLD */
+
+static unsigned char wrapper_common[] = {
+0x66, 0x06,				/* push    es                  */
+0x66, 0x1e,				/* push    ds                  */
+0x66, 0x06,				/* push    es                  */
+0x66, 0x1f,				/* pop     ds                  */
+0x56,					/* push    esi                 */
+0x57,					/* push    edi                 */
+0xe8, 0x00, 0x00, 0x00, 0x00,		/* call    _rmcb               */
+0x5f,					/* pop     edi                 */
+0x5e,					/* pop     esi                 */
+0x66, 0x1f,				/* pop     ds                  */
+0x66, 0x07,				/* pop     es                  */
+0xfc,					/* cld                         */
+0x66, 0x8b, 0x06,			/* mov     ax,[esi]            */
+0x66, 0x26, 0x89, 0x47, 0x2a,		/* mov     es:[edi+42],ax      */
+0x66, 0x8b, 0x46, 0x02,			/* mov     ax,[esi+2]          */
+0x66, 0x26, 0x89, 0x47, 0x2c,		/* mov     es:[edi+44],ax      */
+};
+
+static unsigned char wrapper_retf[] = {
+0x66, 0x26, 0x83, 0x47, 0x2e, 0x04,	/* add     es:[edi+46],0x4     */
+0xcf					/* iret                        */
+};
+
+static unsigned char wrapper_iret[] = {
+0x66, 0x8b, 0x46, 0x04,			/* mov     ax,[esi+4]          */
+0x66, 0x26, 0x89, 0x47, 0x20,		/* mov     es:[edi+32],ax      */
+0x66, 0x26, 0x83, 0x47, 0x2e, 0x06,	/* add     es:[edi+46],0x6     */
+0xcf					/* iret                        */
+};
+
+int _go32_dpmi_allocate_real_mode_callback_retf(_go32_dpmi_seginfo *info, _go32_dpmi_registers *regs)
+{
+  unsigned char *wrapper = (unsigned char *)malloc(sizeof(wrapper_common) + sizeof(wrapper_retf));
+  if (wrapper == 0)
+    return 0x8015;
+
+  memcpy(wrapper, wrapper_common, sizeof(wrapper_common));
+  memcpy(wrapper+sizeof(wrapper_common), wrapper_retf, sizeof(wrapper_retf));
+  *(long *)(wrapper+11) = info->pm_offset - (int)wrapper - 15;
+  info->size = (int)wrapper;
+
+  r.x.ax = 0x0303;
+  r.x.si = (int)wrapper;
+  r.x.di = (int)regs;
+  s.ds = _go32_my_cs();
+  s.es = _go32_my_ds();
+  s.fs = 0;
+  s.gs = 0;
+  int86x(0x31, &r, &r, &s);
+  if (r.x.flags & 1)
+  {
+    return r.x.ax;
+  }
+  else
+  {
+    info->rm_segment = r.x.cx;
+    info->rm_offset = r.x.dx;
+    return 0;
+  }
+}
+
+int _go32_dpmi_allocate_real_mode_callback_iret(_go32_dpmi_seginfo *info, _go32_dpmi_registers *regs)
+{
+  unsigned char *wrapper = (unsigned char *)malloc(sizeof(wrapper_common) + sizeof(wrapper_iret));
+  if (wrapper == 0)
+    return 0x8015;
+
+  memcpy(wrapper, wrapper_common, sizeof(wrapper_common));
+  memcpy(wrapper+sizeof(wrapper_common), wrapper_iret, sizeof(wrapper_iret));
+  *(long *)(wrapper+11) = info->pm_offset - (int)wrapper - 15;
+  info->size = (int)wrapper;
+
+  r.x.ax = 0x0303;
+  r.x.si = (int)wrapper;
+  r.x.di = (int)regs;
+  s.ds = _go32_my_cs();
+  s.es = _go32_my_ds();
+  s.fs = 0;
+  s.gs = 0;
+  int86x(0x31, &r, &r, &s);
+  if (r.x.flags & 1)
+  {
+    return r.x.ax;
+  }
+  else
+  {
+    info->rm_segment = r.x.cx;
+    info->rm_offset = r.x.dx;
+    return 0;
+  }
+}
+
+int _go32_dpmi_free_real_mode_callback(_go32_dpmi_seginfo *info)
+{
+  free((char *)info->size);
+  r.x.ax = 0x0304;
+  r.x.cx = info->rm_segment;
+  r.x.dx = info->rm_offset;
+  int86(0x31, &r, &r);
+  if (r.x.flags & 1)
+  {
+    return r.x.ax;
+  }
+  else
+  {
+    return 0;
+  }
+}
+
+int _go32_dpmi_get_free_memory_information(_go32_dpmi_meminfo *info)
+{
+  r.x.ax = 0x0500;
+  r.x.di = (int)info;
+  int86(0x31, &r, &r);
+  return 0;
+}
+
+u_long _go32_dpmi_remaining_physical_memory()
+{
+  _go32_dpmi_meminfo info;
+  _go32_dpmi_get_free_memory_information(&info);
+  if (info.available_physical_pages)
+    return info.available_physical_pages * 4096;
+  return info.available_memory;
+}
+
+u_long _go32_dpmi_remaining_virtual_memory()
+{
+  _go32_dpmi_meminfo info;
+  _go32_dpmi_get_free_memory_information(&info);
+  return info.available_memory;
+}
diff --git a/newlib/libc/sys/go32/dpmi.h b/newlib/libc/sys/go32/dpmi.h
new file mode 100644
index 0000000..56bde19
--- /dev/null
+++ b/newlib/libc/sys/go32/dpmi.h
@@ -0,0 +1,151 @@
+/* This is file dpmi.h */

+/*

+** Copyright (C) 1993 DJ Delorie
+**

+** This file is distributed under the terms listed in the document

+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy

+** should be available from where this file was obtained.  This file

+** may not be distributed without a verbatim copy of "copying.dj".

+**

+** This file is distributed WITHOUT ANY WARRANTY; without even the implied

+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+*/

+

+#ifndef _DPMI_H_

+#define _DPMI_H_

+

+

+#include <sys/types.h>

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+typedef union {

+  struct {

+    u_long edi;

+    u_long esi;

+    u_long ebp;

+    u_long res;

+    u_long ebx;

+    u_long edx;

+    u_long ecx;

+    u_long eax;

+  } d;

+  struct {

+    u_short di, di_hi;

+    u_short si, si_hi;

+    u_short bp, bp_hi;

+    u_short res, res_hi;

+    u_short bx, bx_hi;

+    u_short dx, dx_hi;

+    u_short cx, cx_hi;

+    u_short ax, ax_hi;

+    u_short flags;

+    u_short es;

+    u_short ds;

+    u_short fs;

+    u_short gs;

+    u_short ip;

+    u_short cs;

+    u_short sp;

+    u_short ss;

+  } x;

+  struct {

+    u_char edi[4];

+    u_char esi[4];

+    u_char ebp[4];

+    u_char res[4];

+    u_char bl, bh, ebx_b2, ebx_b3;

+    u_char dl, dh, edx_b2, edx_b3;

+    u_char cl, ch, ecx_b2, ecx_b3;

+    u_char al, ah, eax_b2, eax_b3;

+  } h;

+} _go32_dpmi_registers;

+

+typedef struct {

+  u_long  size;

+  u_long  pm_offset;

+  u_short pm_selector;

+  u_short rm_offset;

+  u_short rm_segment;

+} _go32_dpmi_seginfo;

+

+typedef struct {

+  u_long available_memory;

+  u_long available_pages;

+  u_long available_lockable_pages;

+  u_long linear_space;

+  u_long unlocked_pages;

+  u_long available_physical_pages;

+  u_long total_physical_pages;

+  u_long free_linear_space;

+  u_long max_pages_in_paging_file;

+  u_long reserved[3];

+} _go32_dpmi_meminfo;

+

+/* returns zero if success, else dpmi error and info->size is max size */

+int _go32_dpmi_allocate_dos_memory(_go32_dpmi_seginfo *info);

+	/* set size to bytes/16, call, use rm_segment.  Do not

+	   change anthing but size until the memory is freed.

+	   If error, max size is returned in size as bytes/16. */

+int _go32_dpmi_free_dos_memory(_go32_dpmi_seginfo *info);

+	/* set new size to bytes/16, call.  If error, max size

+	   is returned in size as bytes/16 */

+int _go32_dpmi_resize_dos_memory(_go32_dpmi_seginfo *info);

+	/* uses pm_selector to free memory */

+

+/* These both use the rm_segment:rm_offset fields only */

+int _go32_dpmi_get_real_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info);

+int _go32_dpmi_set_real_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info);

+

+/* These do NOT wrap the function in pm_offset in an iret handler.

+   You must provide an assembler interface yourself, or alloc one below.

+   You may NOT longjmp out of an interrupt handler. */

+int _go32_dpmi_get_protected_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info);

+	/* puts vector in pm_selector:pm_offset. */

+int _go32_dpmi_set_protected_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info);

+	/* sets vector from pm_offset and pm_selector */

+int _go32_dpmi_chain_protected_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info);

+	/* sets up wrapper that calls function in pm_offset, chaining to old

+	   handler when it returns */

+

+/* These can be used to generate assember IRET-style wrappers for functions */

+int _go32_dpmi_allocate_iret_wrapper(_go32_dpmi_seginfo *info);

+	/* Put function ptr in pm_offset, call, returns wrapper entry in pm_offset. */

+int _go32_dpmi_free_iret_wrapper(_go32_dpmi_seginfo *info);

+	/* assumes pm_offset points to wrapper, frees it */

+

+/* simulate real mode calls.  CS:IP from regs for non-interrupt */

+int _go32_dpmi_simulate_int(int vector, _go32_dpmi_registers *regs);

+int _go32_dpmi_simulate_fcall(_go32_dpmi_registers *regs);

+int _go32_dpmi_simulate_fcall_iret(_go32_dpmi_registers *regs);

+

+/* These automatically handle the tasks of restructuring the

+   real-mode stack for the proper return type.  The callback

+   (info->pm_offset) is called as (*pmcb)(_go32_dpmi_registers *regs); */

+int _go32_dpmi_allocate_real_mode_callback_retf(_go32_dpmi_seginfo *info, _go32_dpmi_registers *regs);

+	/* points callback at pm_offset, returns seg:ofs of callback addr

+	   in rm_segment:rm_offset.  Do not change any fields until freed.

+	   Interface is added to simulate far return */

+int _go32_dpmi_allocate_real_mode_callback_iret(_go32_dpmi_seginfo *info, _go32_dpmi_registers *regs);

+	/* same, but simulates iret */

+int _go32_dpmi_free_real_mode_callback(_go32_dpmi_seginfo *info);

+	/* frees callback */

+

+/* Only available_memory is guaranteed to be valid.  Try

+   available_physical_pages for phys mem left */

+int _go32_dpmi_get_free_memory_information(_go32_dpmi_meminfo *info);

+

+/* Convenience functions.  These use the above memory info call.

+   The return value is *bytes* */

+u_long _go32_dpmi_remaining_physical_memory(void);

+u_long _go32_dpmi_remaining_virtual_memory(void);

+

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif

diff --git a/newlib/libc/sys/go32/dup.s b/newlib/libc/sys/go32/dup.s
new file mode 100644
index 0000000..3d3aa04
--- /dev/null
+++ b/newlib/libc/sys/go32/dup.s
@@ -0,0 +1,28 @@
+# /* This is file DUP.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _dup
+_dup:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%ebx
+	movb	$0x45,%ah
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jb	syscall_error
+	ret
diff --git a/newlib/libc/sys/go32/dup2.s b/newlib/libc/sys/go32/dup2.s
new file mode 100644
index 0000000..f06f0b7
--- /dev/null
+++ b/newlib/libc/sys/go32/dup2.s
@@ -0,0 +1,28 @@
+# /* This is file DUP2.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _dup2
+_dup2:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%ebx
+	movl	20(%esp),%ecx
+	movb	$0x46,%ah
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jmp	syscall_check
diff --git a/newlib/libc/sys/go32/exec.c b/newlib/libc/sys/go32/exec.c
new file mode 100644
index 0000000..004666c
--- /dev/null
+++ b/newlib/libc/sys/go32/exec.c
@@ -0,0 +1,509 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include "go32.h"
+#include "dpmi.h"
+/*#include "process.h"*/
+#if 1
+#define P_WAIT		1

+#define P_NOWAIT	2	/* always generates error */

+#define P_OVERLAY	3

+#endif
+extern const char **environ;
+#define environ ((const char **)environ)
+
+#define scan_ptr() \
+	char const **ptr; \
+	for (ptr = &argv0; *ptr; ptr++); \
+	ptr = (char const **)(*++ptr);
+
+int execl(const char *path, const char *argv0, ...)
+{
+  return spawnve(P_OVERLAY, path, &argv0, environ);
+}
+
+int execle(const char *path, const char *argv0, ... /*, const char **envp */)
+{
+  scan_ptr();
+  return spawnve(P_OVERLAY, path, &argv0, ptr);
+}
+
+int execlp(const char *path, const char *argv0, ...)
+{
+  return spawnvpe(P_OVERLAY, path, &argv0, environ);
+}
+
+int execlpe(const char *path, const char *argv0, ... /*, const char **envp */)
+{
+  scan_ptr();
+  return spawnvpe(P_OVERLAY, path, &argv0, ptr);
+}
+
+/*-------------------------------------------------*/
+
+int execv(const char *path, const char **argv)
+{
+  return spawnve(P_OVERLAY, path, argv, environ);
+}
+
+int execve(const char *path, const char **argv, const char **envp)
+{
+  return spawnve(P_OVERLAY, path, argv, envp);
+}
+
+int execvp(const char *path, const char **argv)
+{
+  return spawnvpe(P_OVERLAY, path, argv, environ);
+}
+
+int execvpe(const char *path, const char **argv, const char **envp)
+{
+  return spawnvpe(P_OVERLAY, path, argv, envp);
+}
+
+/*-------------------------------------------------*/
+
+int spawnl(int mode, const char *path, const char *argv0, ...)
+{
+  return spawnve(mode, path, &argv0, environ);
+}
+
+int spawnle(int mode, const char *path, const char *argv0, ... /*, const char **envp */)
+{
+  scan_ptr();
+  return spawnve(mode, path, &argv0, ptr);
+}
+
+int spawnlp(int mode, const char *path, const char *argv0, ...)
+{
+  return spawnvpe(mode, path, &argv0, environ);
+}
+
+int spawnlpe(int mode, const char *path, const char *argv0, ... /*, const char **envp */)
+{
+  scan_ptr();
+  return spawnvpe(mode, path, &argv0, ptr);
+}
+
+/*-------------------------------------------------*/
+
+typedef struct {
+  u_short eseg;
+  u_short argoff;
+  u_short argseg;
+  u_short fcb1_off;
+  u_short fcb1_seg;
+  u_short fcb2_off;
+  u_short fcb2_seg;
+} Execp;
+
+static Execp parm;
+
+static u_long tbuf;
+
+static u_long talloc(size_t amt)
+{
+  u_long rv = tbuf;
+  tbuf += amt;
+  return rv;
+}
+
+static int direct_exec_tail(const char *program, const char *args, const char **envp)
+{
+  _go32_dpmi_registers r;
+  u_long program_la;
+  u_long arg_la;
+  u_long parm_la;
+  u_long env_la, env_e_la;
+  char arg_header[3];
+  int i;
+
+  program_la = talloc(strlen(program)+1);
+  arg_la = talloc(strlen(args)+3);
+  parm_la = talloc(sizeof(Execp));
+
+  dosmemput(program, strlen(program)+1, program_la);
+  
+  arg_header[0] = strlen(args);
+  arg_header[1] = '\r';
+  dosmemput(arg_header, 1, arg_la);
+  dosmemput(args, strlen(args), arg_la+1);
+  dosmemput(arg_header+1, 1, arg_la+1+strlen(args));
+
+  do {
+    env_la = talloc(1);
+  } while (env_la & 15);
+  talloc(-1);
+  for (i=0; envp[i]; i++)
+  {
+    env_e_la = talloc(strlen(envp[i])+1);
+    dosmemput(envp[i], strlen(envp[i])+1, env_e_la);
+  }
+  arg_header[0] = 0;
+  arg_header[1] = 1;
+  arg_header[2] = 0;
+  dosmemput(arg_header, 3, talloc(3));
+  env_e_la = talloc(strlen(program)+1);
+  dosmemput(program, strlen(program)+1, env_e_la);
+
+  parm.eseg = env_la / 16;
+  parm.argseg = arg_la / 16;
+  parm.argoff = arg_la & 15;
+  dosmemput(&parm, sizeof(parm), parm_la);
+
+  memset(&r, 0, sizeof(r));
+  r.x.ax = 0x4b00;
+  r.x.ds = program_la / 16;
+  r.x.dx = program_la & 15;
+  r.x.es = parm_la / 16;
+  r.x.bx = parm_la & 15;
+  _go32_dpmi_simulate_int(0x21, &r);
+  if (r.x.flags & 1)
+  {
+    errno = r.x.ax;
+    return -1;
+  }
+  
+  memset(&r, 0, sizeof(r));
+  r.h.ah = 0x4d;
+  _go32_dpmi_simulate_int(0x21, &r);
+  
+  if (r.x.flags & 1)
+  {
+    errno = r.x.ax;
+    return -1;
+  }
+  return r.x.ax;
+}
+
+static int direct_exec(const char *program, const char **argv, const char **envp)
+{
+  int i, arglen;
+  char *args, *argp;
+
+  tbuf = _go32_info_block.linear_address_of_transfer_buffer;
+
+  arglen = 0;
+  for (i=1; argv[i]; i++)
+    arglen += strlen(argv[i]) + 1;
+  args = (char *)malloc(arglen+1);
+  argp = args;
+  for (i=1; argv[i]; i++)
+  {
+    const char *p = argv[i];
+    if (argp - args > 125)
+      break;
+    *argp++ = ' ';
+    while (*p)
+    {
+      if (argp - args > 125)
+        break;
+      *argp++ = *p++;
+    }
+  }
+  *argp = 0;
+  
+  return direct_exec_tail(program, args, envp);
+}
+
+typedef struct {
+  char magic[16];
+  int struct_length;
+  char go32[16];
+} StubInfo;
+#define STUB_INFO_MAGIC "StubInfoMagic!!"
+
+static int go32_exec(const char *program, const char **argv, const char **envp)
+{
+  int is_stubbed = 0;
+  int found_si = 0;
+  StubInfo si;
+  unsigned short header[3];
+  int pf, has_dot, i;
+  char *go32, *sip;
+  const char *pp, *pe;
+  char rpath[80], *rp;
+  int stub_offset, argc;
+
+  int si_la, rm_la, rm_seg;
+  short *rm_argv;
+  char cmdline[34];
+  
+  pf = open(program, O_RDONLY|O_BINARY);
+
+  read(pf, header, sizeof(header));
+  if (header[0] == 0x010b || header[0] == 0x014c)
+  {
+    is_stubbed = 1;
+  }
+  else if (header[0] == 0x5a4d)
+  {
+    int header_offset = (long)header[2]*512L;
+    if (header[1])
+      header_offset += (long)header[1] - 512L;
+    lseek(pf, header_offset - 4, 0);
+    read(pf, &stub_offset, 4);
+    header[0] = 0;
+    read(pf, header, sizeof(header));
+    if (header[0] == 0x010b)
+      is_stubbed = 1;
+    if (header[0] == 0x014c)
+      is_stubbed = 1;
+    lseek(pf, stub_offset, 0);
+    read(pf, &si, sizeof(si));
+    if (memcmp(STUB_INFO_MAGIC, si.magic, 16) == 0)
+      found_si = 1;
+  }
+  if (!is_stubbed)
+  {
+    close(pf);
+    return direct_exec(program, argv, envp);
+  }
+
+  if (found_si)
+    go32 = si.go32;
+  else
+    go32 = "go32.exe";
+  has_dot = 0;
+  for (i=0; go32[i]; i++)
+    if (go32[i] == '.')
+      has_dot = 1;
+  if (!has_dot)
+    strcpy(go32+i, ".exe");
+  for (i=0; envp[i]; i++)
+    if (strncmp(envp[i], "PATH=", 5) == 0)
+      pp = envp[i]+5;
+  strcpy(rpath, go32);
+  while (access(rpath, 0))
+  {
+    char *ptr;
+    rp = rpath;
+    for (pe=pp; *pe && *pe != ';'; pe++)
+      *rp++ = *pe;
+    pp = pe+1;
+    if (rp > rpath && rp[-1] != '/' && rp[-1] != '\\' && rp[-1] != ':')
+      *rp++ = '/';
+    for (ptr = go32; *ptr; ptr++)
+      *rp++ = *ptr;
+    *rp = 0;
+    if (access(rpath, 0) == 0)
+      break;
+    if (*pe == 0)
+      return direct_exec(program, argv, envp); /* give up and just run it */
+  }
+
+  if (found_si)
+  {  
+    lseek(pf, stub_offset, 0);
+    sip = (char *)malloc(si.struct_length);
+    read(pf, sip, si.struct_length);
+  }
+  close(pf);
+
+  argv[0] = program; /* since that's where we really found it */
+
+  tbuf = _go32_info_block.linear_address_of_transfer_buffer;
+
+  if (found_si)
+  {
+    si_la = talloc(si.struct_length);
+    dosmemput(sip, si.struct_length, si_la);
+    free(sip);
+  }
+  
+  for (argc=0; argv[argc]; argc++);
+  rm_la = talloc(2*(argc+1));
+  rm_seg = (_go32_info_block.linear_address_of_transfer_buffer >> 4) & 0xffff;
+  rm_argv = (short *)malloc((argc+1) * sizeof(short));
+  for (i=0; i<argc; i++)
+  {
+    int sl = strlen(argv[i]) + 1;
+    int q = talloc(sl);
+    dosmemput(argv[i], sl, q);
+    rm_argv[i] = (q - (rm_seg<<4)) & 0xffff;
+  }
+  rm_argv[i] = 0;
+  dosmemput(rm_argv, 2*(argc+1), rm_la);
+  
+  sprintf(cmdline, " !proxy %04x %04x %04x %04x %04x",
+    argc, rm_seg, (rm_la - (rm_seg<<4))&0xffff,
+    rm_seg, (si_la - (rm_seg<<4))&0xffff);
+  if (!found_si)
+    cmdline[22] = 0; /* remove stub information */
+
+  return direct_exec_tail(rpath, cmdline, envp);
+}
+
+static int command_exec(const char *program, const char **argv, const char **envp)
+{
+  const char *comspec=0;
+  char *cmdline;
+  char *newargs[3];
+  int cmdlen;
+  int i;
+  
+  cmdlen = strlen(program) + 4;
+  for (i=0; argv[i]; i++)
+    cmdlen += strlen(argv[i]) + 1;
+  cmdline = (char *)malloc(cmdlen);
+  
+  strcpy(cmdline, "/c ");
+  for (i=0; program[i]; i++)
+  {
+    if (program[i] == '/')
+      cmdline[i+3] = '\\';
+    else
+      cmdline[i+3] = program[i];
+  }
+  cmdline[i+3] = 0;
+  for (i=1; argv[i]; i++)
+  {
+    strcat(cmdline, " ");
+    strcat(cmdline, argv[i]);
+  }
+  for (i=0; envp[i]; i++)
+    if (strncmp(envp[i], "COMSPEC=", 8) == 0)
+      comspec = envp[i]+8;
+  if (!comspec)
+    for (i=0; environ[i]; i++)
+      if (strncmp(environ[i], "COMSPEC=", 8) == 0)
+        comspec = environ[i]+8;
+  if (!comspec)
+    comspec = "c:/command.com";
+  newargs[0] = comspec;
+  newargs[1] = cmdline;
+  newargs[2] = 0;
+  i = direct_exec(comspec, (const char **)newargs, envp);
+  free(cmdline);
+  return i;
+}
+
+static int script_exec(const char *program, const char **argv, const char **envp)
+{
+  return go32_exec(program, argv, envp);
+}
+
+static struct {
+  char *extension;
+  int (*interp)(const char *, const char **, const char **);
+} interpreters[] = {
+  { ".com", direct_exec },
+  { ".exe", go32_exec },
+  { ".bat", command_exec },
+  { 0,      script_exec }
+};
+#define INTERP_NO_EXT 3
+
+int spawnv(int mode, const char *path, const char **argv)
+{
+  return spawnve(mode, path, argv, environ);
+}
+
+int spawnve(int mode, const char *path, const char **argv, const char **envp)
+{
+  /* This is the one that does the work! */
+  int i = -1;
+  char rpath[80], *rp, *rd=0;
+  fflush(stdout); /* just in case */
+  for (rp=rpath; *path; *rp++ = *path++)
+  {
+    if (*path == '.')
+      rd = rp;
+    if (*path == '\\' || *path == '/')
+      rd = 0;
+  }
+  *rp = 0;
+  if (rd)
+  {
+    for (i=0; interpreters[i].extension; i++)
+      if (strcasecmp(rd, interpreters[i].extension) == 0)
+        break;
+  }
+  while (access(rpath, 0))
+  {
+    i++;
+    if (interpreters[i].extension == 0 || rd)
+    {
+      errno = ENOENT;
+      return -1;
+    }
+    strcpy(rp, interpreters[i].extension);
+  }
+  if (i == -1)
+    i = INTERP_NO_EXT;
+  i = interpreters[i].interp(rpath, argv, envp);
+  if (mode == P_OVERLAY)
+    exit(i);
+  return i;
+}
+
+int spawnvp(int mode, const char *path, const char **argv)
+{
+  return spawnvpe(mode, path, argv, environ);
+}
+
+int spawnvpe(int mode, const char *path, const char **argv, const char **envp)
+{
+  const char *pp, *pe, *ptr;
+  char rpath[80], *rp, *rd;
+  int hasdot = 0, i, tried_dot = 0;
+
+  for (ptr=path; *ptr; ptr++)
+  {
+    if (*ptr == '.')
+      hasdot = 1;
+    if (*ptr == '/' || *ptr == '\\' || *ptr == ':')
+      return spawnve(mode, path, argv, envp);
+  }
+
+  pp = 0;
+  for (i=0; envp[i]; i++)
+    if (strncmp(envp[i], "PATH=", 5) == 0)
+      pp = envp[i] + 5;
+  if (pp == 0)
+    return spawnve(mode, path, argv, envp);
+
+  while (1)
+  {
+    if (!tried_dot)
+    {
+      rp = rpath;
+      pe = pp;
+      tried_dot = 1;
+    }
+    else
+    {
+      rp = rpath;
+      for (pe = pp; *pe && *pe != ';'; pe++)
+        *rp++ = *pe;
+      pp = pe+1;
+      if (rp > rpath && rp[-1] != '/' && rp[-1] != '\\' && rp[-1] != ':')
+        *rp++ = '/';
+    }
+    for (ptr = path; *ptr; ptr++)
+      *rp++ = *ptr;
+    *rp = 0;
+    
+    if (hasdot)
+    {
+      if (access(rpath, 0) == 0)
+        return spawnve(mode, rpath, argv, envp);
+    }
+    else
+    {
+      for (i=0; interpreters[i].extension; i++)
+      {
+        strcpy(rp, interpreters[i].extension);
+        if (access(rpath, 0) == 0)
+          return spawnve(mode, rpath, argv, envp);
+      }
+    }
+    if (*pe == 0)
+    {
+      errno = ENOENT;
+      return -1;
+    }
+  }
+}
diff --git a/newlib/libc/sys/go32/fchmod.c b/newlib/libc/sys/go32/fchmod.c
new file mode 100644
index 0000000..93a5f63
--- /dev/null
+++ b/newlib/libc/sys/go32/fchmod.c
@@ -0,0 +1,18 @@
+/* This is file FCHMOD.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+fchmod()
+{
+  write(2, "Warning: fchmod() unimplemented\n", 32);
+}
diff --git a/newlib/libc/sys/go32/findfirs.s b/newlib/libc/sys/go32/findfirs.s
new file mode 100644
index 0000000..fa3f247
--- /dev/null
+++ b/newlib/libc/sys/go32/findfirs.s
@@ -0,0 +1,18 @@
+	.globl	_findfirst 
+_findfirst:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	20(%esp),%edx
+	movb	$0x1a,%ah
+	int	$0x21		
+
+	movl	16(%esp),%edx
+	movl	24(%esp),%ecx
+	movb	$0x4e,%ah
+	int	$0x21		
+
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jmp	syscall_check
diff --git a/newlib/libc/sys/go32/findnext.s b/newlib/libc/sys/go32/findnext.s
new file mode 100644
index 0000000..4e6518f
--- /dev/null
+++ b/newlib/libc/sys/go32/findnext.s
@@ -0,0 +1,16 @@
+	.globl	_findnext 
+_findnext:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%edx
+	movb	$0x1a,%ah
+	int	$0x21		
+
+	movb	$0x4f,%ah
+	int	$0x21		
+
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jmp	syscall_check
diff --git a/newlib/libc/sys/go32/fixpath.c b/newlib/libc/sys/go32/fixpath.c
new file mode 100644
index 0000000..e7d61fd
--- /dev/null
+++ b/newlib/libc/sys/go32/fixpath.c
@@ -0,0 +1,155 @@
+/*
+  (c) Copyright 1992 Eric Backus
+
+  This software may be used freely so long as this copyright notice is
+  left intact.  There is no warrantee on this software.
+*/
+
+#include "dos.h"		/* For intdos() */
+#include <errno.h>		/* For errno */
+#include <string.h>		/* For strlen() */
+
+int
+_get_default_drive(void)
+{
+    union REGS	regs;
+
+    regs.h.ah = 0x19;		/* DOS Get Default Drive call */
+    regs.h.al = 0;
+    (void) intdos(&regs, &regs);
+    return regs.h.al;
+}
+
+static char *
+get_current_directory(char *out, int drive_number)
+{
+    union REGS	regs;
+
+    regs.h.ah = 0x47;
+    regs.h.dl = drive_number + 1;
+    regs.x.si = (unsigned long) (out + 1);
+    (void) intdos(&regs, &regs);
+    if (regs.x.cflag != 0)
+    {
+	errno = regs.x.ax;
+	return out;
+    }
+    else
+    {
+	/* Root path, don't insert "/", it'll be added later */
+	if (*(out + 1) != '\0')
+	    *out = '/';
+	else
+	    *out = '\0';
+	return out + strlen(out);
+    }
+}
+
+static int
+is_slash(int c)
+{
+    return c == '/' || c == '\\';
+}
+
+static int
+is_term(int c)
+{
+    return c == '/' || c == '\\' || c == '\0';
+}
+
+/* Takes as input an arbitrary path.  Fixes up the path by:
+   1. Removing consecutive slashes
+   2. Removing trailing slashes
+   3. Making the path absolute if it wasn't already
+   4. Removing "." in the path
+   5. Removing ".." entries in the path (and the directory above them)
+   6. Adding a drive specification if one wasn't there
+   7. Converting all slashes to '/'
+ */
+void
+_fixpath(const char *in, char *out)
+{
+    int		drive_number;
+    const char	*ip = in;
+    char	*op = out;
+
+    /* Add drive specification to output string */
+    if (*(ip + 1) == ':' && ((*ip >= 'a' && *ip <= 'z') ||
+			     (*ip >= 'A' && *ip <= 'Z')))
+    {
+	if (*ip >= 'a' && *ip <= 'z')
+	    drive_number = *ip - 'a';
+	else
+	    drive_number = *ip - 'A';
+	*op++ = *ip++;
+	*op++ = *ip++;
+    }
+    else
+    {
+	drive_number = _get_default_drive();
+	*op++ = drive_number + 'a';
+	*op++ = ':';
+    }
+
+    /* Convert relative path to absolute */
+    if (!is_slash(*ip))
+	op = get_current_directory(op, drive_number);
+
+    /* Step through the input path */
+    while (*ip)
+    {
+	/* Skip input slashes */
+	if (is_slash(*ip))
+	{
+	    ip++;
+	    continue;
+	}
+
+	/* Skip "." and output nothing */
+	if (*ip == '.' && is_term(*(ip + 1)))
+	{
+	    ip++;
+	    continue;
+	}
+
+	/* Skip ".." and remove previous output directory */
+	if (*ip == '.' && *(ip + 1) == '.' && is_term(*(ip + 2)))
+	{
+	    ip += 2;
+	    /* Don't back up over drive spec */
+	    if (op > out + 2)
+		/* This requires "/" to follow drive spec */
+		while (!is_slash(*--op));
+	    continue;
+	}
+
+	/* Copy path component from in to out */
+	*op++ = '/';
+	while (!is_term(*ip)) *op++ = *ip++;
+    }
+
+    /* If root directory, insert trailing slash */
+    if (op == out + 2) *op++ = '/';
+
+    /* Null terminate the output */
+    *op = '\0';
+}
+
+#ifdef	TEST
+#include <stdio.h>
+
+int
+main(int argc, char **argv)
+{
+    char	path[90];
+    int		i;
+
+    for (i = 1; i < argc; i++)
+    {
+	_fixpath(argv[i], path);
+	(void) printf("'%s' -> '%s'\n", argv[i], path);
+    }
+
+    return 0;
+}
+#endif
diff --git a/newlib/libc/sys/go32/fstat.s b/newlib/libc/sys/go32/fstat.s
new file mode 100644
index 0000000..7139976
--- /dev/null
+++ b/newlib/libc/sys/go32/fstat.s
@@ -0,0 +1,19 @@
+# /* This is file FSTAT.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _fstat
+_fstat:
+	movb	$3,%al
+	jmp	turbo_assist
diff --git a/newlib/libc/sys/go32/fsync.s b/newlib/libc/sys/go32/fsync.s
new file mode 100644
index 0000000..1aca105
--- /dev/null
+++ b/newlib/libc/sys/go32/fsync.s
@@ -0,0 +1,27 @@
+# /* This is file FSYNC.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _fsync
+_fsync:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%ebx
+	movb	$0x68,%ah
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	ret
diff --git a/newlib/libc/sys/go32/ftruncat.c b/newlib/libc/sys/go32/ftruncat.c
new file mode 100644
index 0000000..4deb1b9
--- /dev/null
+++ b/newlib/libc/sys/go32/ftruncat.c
@@ -0,0 +1,25 @@
+/* This is file FTRUNCAT.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#include <fcntl.h>
+
+/*
+** Note: this only works right if you close the file right after truncating!
+*/
+
+ftruncate(int fd, unsigned long where)
+{
+  lseek(fd, where, 0);
+  write(fd, 0, 0);
+}
diff --git a/newlib/libc/sys/go32/gerrno.s b/newlib/libc/sys/go32/gerrno.s
new file mode 100644
index 0000000..fa3f307
--- /dev/null
+++ b/newlib/libc/sys/go32/gerrno.s
@@ -0,0 +1,33 @@
+# /* This is file GERRNO.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+# Modified to use newlib's reent mechanism, 960414, dje.
+# Reentrancy isn't really supported of course, the purpose is to
+# record `errno' in the normal place.
+
+	.text
+	.globl	syscall_error
+syscall_error:
+	pushl	%eax
+	call	___errno
+	popl	%edx
+	mov	%edx,(%eax)
+	mov	$-1,%eax
+	ret
+
+	.globl	syscall_check
+syscall_check:
+	jb	syscall_error
+	mov	$0,%eax
+	ret
diff --git a/newlib/libc/sys/go32/getcwd.c b/newlib/libc/sys/go32/getcwd.c
new file mode 100644
index 0000000..9dda864
--- /dev/null
+++ b/newlib/libc/sys/go32/getcwd.c
@@ -0,0 +1,37 @@
+/* This is file GETCWD.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#include <errno.h>
+
+char *getcwd(char *buf, int n)
+{
+  char tmp[90];
+  getwd(tmp);
+  if (strlen(tmp)+1 > n)
+  {
+    errno = ERANGE;
+    return 0;
+  }
+  if (buf == 0)
+  {
+    buf = malloc(n);
+    if (buf == 0)
+    {
+      errno = ENOMEM;
+      return 0;
+    }
+  }
+  strcpy(buf, tmp);
+  return buf;
+}
diff --git a/newlib/libc/sys/go32/getdate.c b/newlib/libc/sys/go32/getdate.c
new file mode 100644
index 0000000..7593b0a
--- /dev/null
+++ b/newlib/libc/sys/go32/getdate.c
@@ -0,0 +1,11 @@
+#include "dos.h"
+
+void getdate( struct date *dateblk)
+{
+  union REGS regs;
+  regs.h.ah = 0x2a;
+  intdos( &regs, &regs);
+  dateblk-> da_year = regs.x.cx;
+  dateblk-> da_mon = regs.h.dh;
+  dateblk-> da_day = regs.h.dl;
+}
diff --git a/newlib/libc/sys/go32/getdtabl.c b/newlib/libc/sys/go32/getdtabl.c
new file mode 100644
index 0000000..cfe6b10
--- /dev/null
+++ b/newlib/libc/sys/go32/getdtabl.c
@@ -0,0 +1,18 @@
+/* This is file GETDTABL.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+getdtablesize()
+{
+  return 50; /* really depends on FILES= in config.sys */
+}
diff --git a/newlib/libc/sys/go32/getgid.c b/newlib/libc/sys/go32/getgid.c
new file mode 100644
index 0000000..a0cd7b9
--- /dev/null
+++ b/newlib/libc/sys/go32/getgid.c
@@ -0,0 +1,9 @@
+
+#include <sys/types.h>
+
+getgid()
+{
+  
+  return 20;
+  
+}
diff --git a/newlib/libc/sys/go32/getkey.s b/newlib/libc/sys/go32/getkey.s
new file mode 100644
index 0000000..d70a275
--- /dev/null
+++ b/newlib/libc/sys/go32/getkey.s
@@ -0,0 +1,59 @@
+/* This is file GETKEY.S */
+/*
+** Copyright (C) 1993 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+Modified by J. Alan Eldridge, Liberty Brokerage, 77 Water St, NYC 10005
+
+Changed handling of characters starting with 0xE0:
+	Now calls interrupt 16, function 10
+	if leading byte was 0x00, ah = 0x01
+	if leading byte was 0xE0, ah = 0x02
+
+	The main function is now called getxkey()...
+	getkey is provided to maintain compatibility with
+	already written software
+*/
+
+	.globl	_getxkey
+_getxkey:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movb	$0x10,%ah
+	int	$0x16
+	mov	$1,%bl
+	cmpb	$0,%al
+	je	L0
+	cmpb	$0xE0,%al
+	jne	L1
+	inc	%bl
+L0:
+	movb	%ah,%al
+	movb	%bl,%ah
+	jmp	L2
+L1:
+	movb	$0,%ah
+L2:
+	andl	$0xffff,%eax
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	ret
+
+	.globl	_getkey
+_getkey:
+	call	_getxkey
+	testb	$0x02,%ah
+	jz	L3
+	movb	$0x01,%ah
+L3:
+	ret
diff --git a/newlib/libc/sys/go32/getpages.c b/newlib/libc/sys/go32/getpages.c
new file mode 100644
index 0000000..2e1a073
--- /dev/null
+++ b/newlib/libc/sys/go32/getpages.c
@@ -0,0 +1,18 @@
+/* This is file GETPAGES.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+getpagesize()
+{
+  return 4096;
+}
diff --git a/newlib/libc/sys/go32/getpid.c b/newlib/libc/sys/go32/getpid.c
new file mode 100644
index 0000000..84b7e81
--- /dev/null
+++ b/newlib/libc/sys/go32/getpid.c
@@ -0,0 +1,18 @@
+/* This is file GETPID.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+getpid()
+{
+  return 42;  /* Why not? */
+}
diff --git a/newlib/libc/sys/go32/getrusag.c b/newlib/libc/sys/go32/getrusag.c
new file mode 100644
index 0000000..77370ed
--- /dev/null
+++ b/newlib/libc/sys/go32/getrusag.c
@@ -0,0 +1,35 @@
+/* This is file GETRUSAG.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#include <sys/time.h>
+#include <sys/resource.h>
+
+static struct timeval old_time = {0,0};
+
+int getrusage(int who, struct rusage *rusage)
+{
+  struct timeval now;
+  bzero(rusage, sizeof(struct rusage));
+  if (old_time.tv_sec == 0)
+    gettimeofday(&old_time, 0);
+  gettimeofday(&now, 0);
+  rusage->ru_utime.tv_usec = now.tv_usec - old_time.tv_usec;
+  rusage->ru_utime.tv_sec = now.tv_sec - old_time.tv_sec;
+  if (rusage->ru_utime.tv_usec < 0)
+  {
+    rusage->ru_utime.tv_usec += 1000000;
+    rusage->ru_utime.tv_sec -= 1;
+  }
+  return 0;
+}
diff --git a/newlib/libc/sys/go32/gettime.c b/newlib/libc/sys/go32/gettime.c
new file mode 100644
index 0000000..ba81161
--- /dev/null
+++ b/newlib/libc/sys/go32/gettime.c
@@ -0,0 +1,12 @@
+#include "dos.h"
+
+void gettime( struct time *tp)
+{
+  union REGS regs;
+  regs.h.ah = 0x2c;
+  intdos( &regs, &regs);
+  tp->ti_hour = regs.h.ch;
+  tp->ti_min = regs.h.cl;
+  tp->ti_sec = regs.h.dh;
+  tp->ti_hund = regs.h.dl;
+}
diff --git a/newlib/libc/sys/go32/gettimeo.c b/newlib/libc/sys/go32/gettimeo.c
new file mode 100644
index 0000000..7f4f7c8
--- /dev/null
+++ b/newlib/libc/sys/go32/gettimeo.c
@@ -0,0 +1,61 @@
+/*
+  (c) Copyright 1992 Eric Backus
+
+  This software may be used freely so long as this copyright notice is
+  left intact.  There is no warrantee on this software.
+*/
+
+#include <time.h>
+#include <sys/time.h>
+#include "dos.h"
+
+static int daylight, gmtoffset;
+
+int
+gettimeofday (struct timeval *tp, struct timezone *tzp)
+{
+
+  if (tp)
+  {
+    struct time t;
+    struct date d;
+    struct tm tmrec;
+
+    gettime (&t);
+    getdate (&d);
+    tmrec.tm_year = d.da_year - 1900;
+    tmrec.tm_mon = d.da_mon - 1;
+    tmrec.tm_mday = d.da_day;
+    tmrec.tm_hour = t.ti_hour;
+    tmrec.tm_min = t.ti_min;
+    tmrec.tm_sec = t.ti_sec;
+/*    tmrec.tm_gmtoff = gmtoffset;*/
+    tmrec.tm_isdst = daylight;
+    tp->tv_sec = mktime (&tmrec);
+    tp->tv_usec = t.ti_hund * (1000000 / 100);
+  }
+  if (tzp)
+  {
+    tzp->tz_minuteswest = gmtoffset;
+    tzp->tz_dsttime = daylight;
+  }
+
+  return 0;
+}
+
+void
+__gettimeofday_init ()
+{
+  time_t ltm, gtm;
+  struct tm *lstm;
+
+  daylight = 0;
+  gmtoffset = 0;
+  ltm = gtm = time (NULL);
+  ltm = mktime (lstm = localtime (&ltm));
+  gtm = mktime (gmtime (&gtm));
+  daylight = lstm->tm_isdst;
+  gmtoffset = (int)(gtm - ltm) / 60;
+
+}
+
diff --git a/newlib/libc/sys/go32/gettimeo.s b/newlib/libc/sys/go32/gettimeo.s
new file mode 100644
index 0000000..e1c9b18
--- /dev/null
+++ b/newlib/libc/sys/go32/gettimeo.s
@@ -0,0 +1,19 @@
+# /* This is file GETTIMEO.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _gettimeofday
+_gettimeofday:
+	movb	$4,%al
+	jmp	turbo_assist
diff --git a/newlib/libc/sys/go32/getuid.c b/newlib/libc/sys/go32/getuid.c
new file mode 100644
index 0000000..4ce9a46
--- /dev/null
+++ b/newlib/libc/sys/go32/getuid.c
@@ -0,0 +1,9 @@
+
+#include <sys/types.h>
+
+getuid()
+{
+  
+  return 10;
+  
+}
diff --git a/newlib/libc/sys/go32/getwd.s b/newlib/libc/sys/go32/getwd.s
new file mode 100644
index 0000000..3987628
--- /dev/null
+++ b/newlib/libc/sys/go32/getwd.s
@@ -0,0 +1,31 @@
+# /* This is file GETWD.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _getwd
+_getwd:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%esi
+	movb	$47,(%esi)
+	incl	%esi
+	movb	$0,%dl
+	movb	$0x47,%ah
+	int	$0x21
+	movl	16(%esp),%eax
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	ret
diff --git a/newlib/libc/sys/go32/go32.h b/newlib/libc/sys/go32/go32.h
new file mode 100644
index 0000000..0e43274
--- /dev/null
+++ b/newlib/libc/sys/go32/go32.h
@@ -0,0 +1,70 @@
+/* This is file go32.h */
+/*
+** Copyright (C) 1993 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#ifndef _GO32_H_
+#define _GO32_H_
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* This must match go32/proginfo.h */
+
+typedef struct {
+  u_long size_of_this_structure_in_bytes;
+  u_long linear_address_of_primary_screen;
+  u_long linear_address_of_secondary_screen;
+  u_long linear_address_of_transfer_buffer;
+  u_long size_of_transfer_buffer; /* >= 4k */
+  u_long pid;
+  u_char master_interrupt_controller_base;
+  u_char slave_interrupt_controller_base;
+  u_short selector_for_linear_memory;
+  u_long linear_address_of_stub_info_structure;
+  u_long linear_address_of_original_psp;
+  u_short run_mode;
+  u_short run_mode_info;
+} Go32_Info_Block;
+
+extern Go32_Info_Block _go32_info_block;
+
+#define _GO32_RUN_MODE_UNDEF	0
+#define _GO32_RUN_MODE_RAW	1
+#define _GO32_RUN_MODE_XMS	2
+#define _GO32_RUN_MODE_VCPI	3
+#define _GO32_RUN_MODE_DPMI	4
+
+void dosmemget(int offset, int length, void *buffer);
+void dosmemput(const void *buffer, int length, int offset);
+void movedata(unsigned source_selector, unsigned source_offset,
+              unsigned dest_selector, unsigned dest_offset,
+              size_t length);
+
+/* returns number of times hit since last call. (zero first time) */
+u_long _go32_was_ctrl_break_hit();
+void   _go32_want_ctrl_break(int yes); /* auto-yes if call above function */
+
+u_short _go32_my_cs();
+u_short _go32_my_ds();
+u_short _go32_my_ss();
+u_short _go32_conventional_mem_selector();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/newlib/libc/sys/go32/go32func.c b/newlib/libc/sys/go32/go32func.c
new file mode 100644
index 0000000..ec3853b
--- /dev/null
+++ b/newlib/libc/sys/go32/go32func.c
@@ -0,0 +1,69 @@
+#include <sys/types.h>
+#include "go32.h"
+#include "dpmi.h"
+#include "dos.h"
+
+u_short _go32_my_cs()
+{
+  asm("movw %cs,%ax");
+}
+
+u_short _go32_my_ds()
+{
+  asm("movw %ds,%ax");
+}
+
+u_short _go32_my_ss()
+{
+  asm("movw %ss,%ax");
+}
+
+u_short _go32_conventional_mem_selector()
+{
+  return _go32_info_block.selector_for_linear_memory;
+}
+
+static _go32_dpmi_registers regs;
+static volatile u_long ctrl_break_count = 0;
+static int ctrl_break_hooked = 0;
+static _go32_dpmi_seginfo old_vector;
+static _go32_dpmi_seginfo new_vector;
+
+static ctrl_break_isr(_go32_dpmi_registers *regs)
+{
+  ctrl_break_count ++;
+}
+
+u_long _go32_was_ctrl_break_hit()
+{
+  u_long cnt;
+  _go32_want_ctrl_break(1);
+  cnt = ctrl_break_count;
+  ctrl_break_count = 0;
+  return cnt;
+}
+
+void _go32_want_ctrl_break(int yes)
+{
+  if (yes)
+  {
+    if (ctrl_break_hooked)
+      return;
+    _go32_dpmi_get_real_mode_interrupt_vector(0x1b, &old_vector);
+
+    new_vector.pm_offset = (int)ctrl_break_isr;
+    _go32_dpmi_allocate_real_mode_callback_iret(&new_vector, &regs);
+    _go32_dpmi_set_real_mode_interrupt_vector(0x1b, &new_vector);
+    ctrl_break_count = 0;
+    ctrl_break_hooked = 1;
+  }
+  else
+  {
+    if (!ctrl_break_hooked)
+      return;
+    _go32_dpmi_set_real_mode_interrupt_vector(0x1b, &old_vector);
+    _go32_dpmi_free_real_mode_callback(&new_vector);
+    ctrl_break_count = 0;
+    ctrl_break_hooked = 0;
+  }
+}
diff --git a/newlib/libc/sys/go32/infoblk.c b/newlib/libc/sys/go32/infoblk.c
new file mode 100644
index 0000000..0a54b6b
--- /dev/null
+++ b/newlib/libc/sys/go32/infoblk.c
@@ -0,0 +1,4 @@
+#include "go32.h"
+
+Go32_Info_Block _go32_info_block = { sizeof(Go32_Info_Block) };
+
diff --git a/newlib/libc/sys/go32/inportb.s b/newlib/libc/sys/go32/inportb.s
new file mode 100644
index 0000000..3ff71f1
--- /dev/null
+++ b/newlib/libc/sys/go32/inportb.s
@@ -0,0 +1,21 @@
+#/* This is file INPORTB.S */
+#/*
+#** Copyright (C) 1991 DJ Delorie
+#**
+#** This file is distributed under the terms listed in the document
+#** "copying.dj".
+#** A copy of "copying.dj" should accompany this file; if not, a copy
+#** should be available from where this file was obtained.  This file
+#** may not be distributed without a verbatim copy of "copying.dj".
+#**
+#** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+#** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#*/
+
+	.globl	_inportb
+_inportb:
+	movl	4(%esp),%edx
+#	inb	%dx,%al
+	.byte	0xec
+	movzb	%al,%eax
+	ret
diff --git a/newlib/libc/sys/go32/inportl.s b/newlib/libc/sys/go32/inportl.s
new file mode 100644
index 0000000..5f3c195
--- /dev/null
+++ b/newlib/libc/sys/go32/inportl.s
@@ -0,0 +1,19 @@
+#/* This is file INPORTL.S */
+#/*
+#** Copyright (C) 1991 DJ Delorie
+#**
+#** This file is distributed under the terms listed in the document
+#** "copying.dj".
+#** A copy of "copying.dj" should accompany this file; if not, a copy
+#** should be available from where this file was obtained.  This file
+#** may not be distributed without a verbatim copy of "copying.dj".
+#**
+#** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+#** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#*/
+
+	.globl	_inportl
+_inportl:
+	movl	4(%esp),%edx
+	inl	%dx,%eax
+	ret
diff --git a/newlib/libc/sys/go32/inportsb.s b/newlib/libc/sys/go32/inportsb.s
new file mode 100644
index 0000000..feedd40
--- /dev/null
+++ b/newlib/libc/sys/go32/inportsb.s
@@ -0,0 +1,25 @@
+#/* This is file INPORTSB.S */
+#/*
+#** Copyright (C) 1991 DJ Delorie
+#**
+#** This file is distributed under the terms listed in the document
+#** "copying.dj".
+#** A copy of "copying.dj" should accompany this file; if not, a copy
+#** should be available from where this file was obtained.  This file
+#** may not be distributed without a verbatim copy of "copying.dj".
+#**
+#** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+#** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#*/
+
+	.globl	_inportsb	 
+_inportsb:
+	pushl	%edi
+	movl	8(%esp),%edx
+	movl	12(%esp),%edi
+	movl	16(%esp),%ecx
+	rep
+	insb
+	popl	%edi
+	ret
+
diff --git a/newlib/libc/sys/go32/inportsl.s b/newlib/libc/sys/go32/inportsl.s
new file mode 100644
index 0000000..9865ed9
--- /dev/null
+++ b/newlib/libc/sys/go32/inportsl.s
@@ -0,0 +1,24 @@
+#/* This is file INPORTSL.S */
+#/*
+#** Copyright (C) 1991 DJ Delorie
+#**
+#** This file is distributed under the terms listed in the document
+#** "copying.dj".
+#** A copy of "copying.dj" should accompany this file; if not, a copy
+#** should be available from where this file was obtained.  This file
+#** may not be distributed without a verbatim copy of "copying.dj".
+#**
+#** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+#** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#*/
+
+	.globl	_inportsl	 
+_inportsl:
+	pushl	%edi
+	movl	8(%esp),%edx
+	movl	12(%esp),%edi
+	movl	16(%esp),%ecx
+	rep
+	insl
+	popl	%edi
+	ret
diff --git a/newlib/libc/sys/go32/inportsw.s b/newlib/libc/sys/go32/inportsw.s
new file mode 100644
index 0000000..7fb2b43
--- /dev/null
+++ b/newlib/libc/sys/go32/inportsw.s
@@ -0,0 +1,24 @@
+#/* This is file INPORTSW.S */
+#/*
+#** Copyright (C) 1991 DJ Delorie
+#**
+#** This file is distributed under the terms listed in the document
+#** "copying.dj".
+#** A copy of "copying.dj" should accompany this file; if not, a copy
+#** should be available from where this file was obtained.  This file
+#** may not be distributed without a verbatim copy of "copying.dj".
+#**
+#** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+#** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#*/
+
+	.globl	_inportsw	 
+_inportsw:
+	pushl	%edi
+	movl	8(%esp),%edx
+	movl	12(%esp),%edi
+	movl	16(%esp),%ecx
+	rep
+	insw
+	popl	%edi
+	ret
diff --git a/newlib/libc/sys/go32/inportw.s b/newlib/libc/sys/go32/inportw.s
new file mode 100644
index 0000000..525f58a
--- /dev/null
+++ b/newlib/libc/sys/go32/inportw.s
@@ -0,0 +1,21 @@
+#/* This is file INPORTW.S */
+#/*
+#** Copyright (C) 1991 DJ Delorie
+#**
+#** This file is distributed under the terms listed in the document
+#** "copying.dj".
+#** A copy of "copying.dj" should accompany this file; if not, a copy
+#** should be available from where this file was obtained.  This file
+#** may not be distributed without a verbatim copy of "copying.dj".
+#**
+#** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+#** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#*/
+
+	.globl	_inportw
+_inportw:
+	movl	4(%esp),%edx
+#	inw	(%dx),%ax
+	.byte	0x66, 0xed
+	movzwl	%ax,%eax
+	ret
diff --git a/newlib/libc/sys/go32/int86x.s b/newlib/libc/sys/go32/int86x.s
new file mode 100644
index 0000000..7b49bcd
--- /dev/null
+++ b/newlib/libc/sys/go32/int86x.s
@@ -0,0 +1,103 @@
+	.data
+ds:
+	.word	0
+es:
+	.word	0
+fs:
+	.word	0
+gs:
+	.word	0
+
+	.globl	int86
+int86:
+	.byte	0x2e
+	push	ds
+	pop	%ds
+	.byte	0x2e
+	push	es
+	pop	%es
+	.byte	0x2e
+	push	fs
+	pop	%fs
+	.byte	0x2e
+	push	gs
+	pop	%gs
+
+	.byte	0xcd
+int86_vec:
+	.byte	0x03
+	ret
+
+	.text
+	.globl	_int86x
+_int86x:
+	movl	16(%esp), %eax
+
+	movw	2(%eax), %cx
+	movw	%cx, ds
+	movw	4(%eax), %cx
+	movw	%cx, es
+	movw	6(%eax), %cx
+	movw	%cx, fs
+	movw	8(%eax), %cx
+	movw	%cx, gs
+
+	jmp	int86_common
+
+	.globl	_int86
+_int86:
+	movw	%ds, %ax
+	movw	%ax, ds
+	movw	%ax, es
+	movw	%ax, fs
+	movw	%ax, gs
+	jmp	int86_common
+
+int86_common:
+	pushl	%ebp
+	movl	%esp,%ebp
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	pushf
+
+	movl	8(%ebp),%eax
+	movb	%al,int86_vec
+
+	movl	12(%ebp),%eax
+	movl	4(%eax),%ebx
+	movl	8(%eax),%ecx
+	movl	12(%eax),%edx
+	movl	16(%eax),%esi
+	movl	20(%eax),%edi
+	movl	(%eax),%eax
+
+	push	%ds
+	push	%es
+	call	int86
+	pop	%es
+	pop	%ds
+
+	pushf
+	pushl	%eax
+	movl	%esp,%ebp
+	addl	$24,%ebp
+	movl	16(%ebp),%eax
+	popl	(%eax)
+	movl	%ebx,4(%eax)
+	movl	%ecx,8(%eax)
+	movl	%edx,12(%eax)
+	movl	%esi,16(%eax)
+	movl	%edi,20(%eax)
+	popl	%ebx	/* flags */
+	movl	%ebx,28(%eax)
+	andl	$1,%ebx
+	movl	%ebx,24(%eax)
+	movl	(%eax),%eax
+
+	popf
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	popl	%ebp
+	ret
diff --git a/newlib/libc/sys/go32/intdos.c b/newlib/libc/sys/go32/intdos.c
new file mode 100644
index 0000000..a13f38e
--- /dev/null
+++ b/newlib/libc/sys/go32/intdos.c
@@ -0,0 +1,7 @@
+#include <sys/dos.h>
+
+int
+intdos(union REGS *in, union REGS *out)
+{
+  return int86(0x21, in, out);
+}
diff --git a/newlib/libc/sys/go32/intdosx.c b/newlib/libc/sys/go32/intdosx.c
new file mode 100644
index 0000000..ec3e9fb
--- /dev/null
+++ b/newlib/libc/sys/go32/intdosx.c
@@ -0,0 +1,6 @@
+#include <sys/dos.h>
+
+intdosx(union REGS *in, union REGS *out, struct SREGS *seg)
+{
+  return int86x(0x21, in, out, seg);
+}
diff --git a/newlib/libc/sys/go32/isatty.s b/newlib/libc/sys/go32/isatty.s
new file mode 100644
index 0000000..40e55c9
--- /dev/null
+++ b/newlib/libc/sys/go32/isatty.s
@@ -0,0 +1,33 @@
+# /* This is file ISATTY.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _isatty
+_isatty:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%ebx
+	movw	$0x4400,%ax
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	movl	$0,%eax
+	jb	tf
+	testl	$0x80,%edx
+	jz	tf
+	movl	$1,%eax
+tf:
+	ret
diff --git a/newlib/libc/sys/go32/kbhit.s b/newlib/libc/sys/go32/kbhit.s
new file mode 100644
index 0000000..6008cf2
--- /dev/null
+++ b/newlib/libc/sys/go32/kbhit.s
@@ -0,0 +1,51 @@
+/* This is file KBHIT.S */
+/*
+** Copyright (C) 1993 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+	.globl	_kbhit
+_kbhit:
+	pushl	%ebp
+	movl	%esp,%ebp
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+
+try_again:
+	movl	$0x41a,%eax
+	call	dosmemsetup
+	movzwl	%gs:(%eax),%ebx
+	movzwl	%gs:2(%eax),%ecx
+	cmp	%ebx,%ecx
+	je	key_not_hit
+
+	movb	$0x11,%ah
+	int	$0x16
+	jz	key_not_hit
+	cmp	$0,%eax
+	jne	key_hit
+	movb	$0x10,%ah
+	int	$0x16
+	jmp	try_again
+
+key_not_hit:
+	movl	$0,%eax
+	jmp	L1
+
+key_hit:
+	movl	$1,%eax
+L1:
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	leave
+	ret
diff --git a/newlib/libc/sys/go32/kill.c b/newlib/libc/sys/go32/kill.c
new file mode 100644
index 0000000..3335f1a
--- /dev/null
+++ b/newlib/libc/sys/go32/kill.c
@@ -0,0 +1,6 @@
+kill()
+{
+  
+
+}
+
diff --git a/newlib/libc/sys/go32/link.s b/newlib/libc/sys/go32/link.s
new file mode 100644
index 0000000..cd9681b
--- /dev/null
+++ b/newlib/libc/sys/go32/link.s
@@ -0,0 +1,28 @@
+# /* This is file LINK.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _link
+_link:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%edx
+	movl	20(%esp),%edi
+	movb	$0x56,%ah
+	int	$0x21
+	pop	%edi
+	pop	%esi
+	pop	%ebx
+	jmp	syscall_check
diff --git a/newlib/libc/sys/go32/longjmp.S b/newlib/libc/sys/go32/longjmp.S
new file mode 100644
index 0000000..3c9dca3
--- /dev/null
+++ b/newlib/libc/sys/go32/longjmp.S
@@ -0,0 +1,65 @@
+/* This is file LONGJMP.S */
+/*
+** Copyright (C) 1993 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/*
+**	jmp_buf:
+**	 eax ebx ecx edx esi edi ebp esp eip es fs gs ss
+**	 0   4   8   12  16  20  24  28  32  36 38 40 42
+*/
+
+	.globl	_longjmp /* jmp_buf, int */
+_longjmp:
+	pushl	%ebp
+	movl	%esp,%ebp
+
+	movl	8(%ebp),%edi	/* get jmp_buf */
+	movl	12(%ebp),%eax	/* store retval in j->eax */
+	testl	%eax,%eax
+	jne 0f
+	incl %eax
+0:
+	movl	%eax,0(%edi)
+
+	movl	24(%edi),%ebp
+
+	pushfl			/* get flags so will only re-enable */
+	popl	%ebx		/* interrupts if they were previously */
+				/* enabled */
+
+	cli
+	movw	42(%edi),%ax
+	movw	%ax,%ss
+	movl	28(%edi),%esp
+	
+	pushl	32(%edi)	/* for a ret! */
+
+        pushl	%ebx		/* save flags that contain previous */
+				/* interrupt state */
+
+	movw	36(%edi),%ax
+	movw	%ax,%es
+	movw	38(%edi),%ax
+	movw	%ax,%fs
+	movw	40(%edi),%ax
+	movw	%ax,%gs
+	movl	0(%edi),%eax
+	movl	4(%edi),%ebx
+	movl	8(%edi),%ecx
+	movl	12(%edi),%edx
+	movl	16(%edi),%esi
+	movl	20(%edi),%edi
+
+	popfl			/* restore previous interrupt state */
+
+	ret			/* actually jump to new eip */
diff --git a/newlib/libc/sys/go32/lseek.s b/newlib/libc/sys/go32/lseek.s
new file mode 100644
index 0000000..cd8f4ed
--- /dev/null
+++ b/newlib/libc/sys/go32/lseek.s
@@ -0,0 +1,36 @@
+# /* This is file LSEEK.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _lseek
+_lseek:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%ebx
+	movl	20(%esp),%ecx
+	shrl	$16,%ecx
+	movl	20(%esp),%edx
+	andl	$0xffff,%edx
+	movb	24(%esp),%al
+	movb	$0x42,%ah
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jb	syscall_error
+	shll	$16,%edx
+	andl	$0xffff,%eax
+	orl	%edx,%eax
+	ret
diff --git a/newlib/libc/sys/go32/lstat.s b/newlib/libc/sys/go32/lstat.s
new file mode 100644
index 0000000..caf650d
--- /dev/null
+++ b/newlib/libc/sys/go32/lstat.s
@@ -0,0 +1,19 @@
+# /* This is file LSTAT.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _lstat
+_lstat:
+	movb	$6,%al
+	jmp	turbo_assist
diff --git a/newlib/libc/sys/go32/mkdir.s b/newlib/libc/sys/go32/mkdir.s
new file mode 100644
index 0000000..2a7caba
--- /dev/null
+++ b/newlib/libc/sys/go32/mkdir.s
@@ -0,0 +1,27 @@
+# /* This is file MKDIR.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _mkdir
+_mkdir:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%edx
+	movb	$0x39,%ah
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jmp	syscall_check
diff --git a/newlib/libc/sys/go32/open.s b/newlib/libc/sys/go32/open.s
new file mode 100644
index 0000000..6dae45e
--- /dev/null
+++ b/newlib/libc/sys/go32/open.s
@@ -0,0 +1,31 @@
+# /* This is file OPEN.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.data
+	.globl	__fmode
+__fmode:
+	.long	0x4000
+
+	.text
+	.globl _open
+_open:
+	testl	$0xc000,8(%esp)
+	jnz	L0
+	andl	$0xc000,__fmode
+	movl	__fmode,%eax
+	orl	%eax,8(%esp)
+L0:
+	movb	$2,%al
+	jmp	turbo_assist
+
diff --git a/newlib/libc/sys/go32/outportb.s b/newlib/libc/sys/go32/outportb.s
new file mode 100644
index 0000000..2bcabaa
--- /dev/null
+++ b/newlib/libc/sys/go32/outportb.s
@@ -0,0 +1,21 @@
+#/* This is file OUTPORTB.S */
+#/*
+#** Copyright (C) 1991 DJ Delorie
+#**
+#** This file is distributed under the terms listed in the document
+#** "copying.dj".
+#** A copy of "copying.dj" should accompany this file; if not, a copy
+#** should be available from where this file was obtained.  This file
+#** may not be distributed without a verbatim copy of "copying.dj".
+#**
+#** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+#** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#*/
+
+	.globl	_outportb
+_outportb:
+	movl	4(%esp),%edx
+	movl	8(%esp),%eax
+#	outb	%al,%dx
+	.byte	0xee
+	ret
diff --git a/newlib/libc/sys/go32/outportl.s b/newlib/libc/sys/go32/outportl.s
new file mode 100644
index 0000000..5efb3ef
--- /dev/null
+++ b/newlib/libc/sys/go32/outportl.s
@@ -0,0 +1,20 @@
+#/* This is file OUTPORTL.S */
+#/*
+#** Copyright (C) 1991 DJ Delorie
+#**
+#** This file is distributed under the terms listed in the document
+#** "copying.dj".
+#** A copy of "copying.dj" should accompany this file; if not, a copy
+#** should be available from where this file was obtained.  This file
+#** may not be distributed without a verbatim copy of "copying.dj".
+#**
+#** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+#** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#*/
+
+	.globl	_outportl
+_outportl:
+	movl	4(%esp),%edx
+	movl	8(%esp),%eax
+	outl	%eax,%dx
+	ret
diff --git a/newlib/libc/sys/go32/outportw.s b/newlib/libc/sys/go32/outportw.s
new file mode 100644
index 0000000..ceac40c
--- /dev/null
+++ b/newlib/libc/sys/go32/outportw.s
@@ -0,0 +1,22 @@
+#/* This is file OUTPORTW.S */
+#/*
+#** Copyright (C) 1991 DJ Delorie
+#**
+#** This file is distributed under the terms listed in the document
+#** "copying.dj".
+#** A copy of "copying.dj" should accompany this file; if not, a copy
+#** should be available from where this file was obtained.  This file
+#** may not be distributed without a verbatim copy of "copying.dj".
+#**
+#** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+#** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#*/
+
+	.globl	_outportw
+_outportw:
+	movl	4(%esp),%edx
+	movl	8(%esp),%eax
+#	outw	%ax,%dx
+	.byte	0x66, 0xef
+	ret
+
diff --git a/newlib/libc/sys/go32/outprtsb.s b/newlib/libc/sys/go32/outprtsb.s
new file mode 100644
index 0000000..6cd80a2
--- /dev/null
+++ b/newlib/libc/sys/go32/outprtsb.s
@@ -0,0 +1,25 @@
+
+#/* This is file OUTPRTSB.S */
+#/*
+#** Copyright (C) 1991 DJ Delorie
+#**
+#** This file is distributed under the terms listed in the document
+#** "copying.dj".
+#** A copy of "copying.dj" should accompany this file; if not, a copy
+#** should be available from where this file was obtained.  This file
+#** may not be distributed without a verbatim copy of "copying.dj".
+#**
+#** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+#** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#*/
+
+	.globl	_outportsb	 
+_outportsb:
+	pushl	%esi
+	movl	8(%esp),%edx
+	movl	12(%esp),%esi
+	movl	16(%esp),%ecx
+	rep
+	outsb
+	popl	%esi
+	ret
diff --git a/newlib/libc/sys/go32/outprtsl.s b/newlib/libc/sys/go32/outprtsl.s
new file mode 100644
index 0000000..707adc8
--- /dev/null
+++ b/newlib/libc/sys/go32/outprtsl.s
@@ -0,0 +1,25 @@
+#/* This is file OUTPRTSL.S */
+#/*
+#** Copyright (C) 1991 DJ Delorie
+#**
+#** This file is distributed under the terms listed in the document
+#** "copying.dj".
+#** A copy of "copying.dj" should accompany this file; if not, a copy
+#** should be available from where this file was obtained.  This file
+#** may not be distributed without a verbatim copy of "copying.dj".
+#**
+#** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+#** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#*/
+
+	.globl	_outportsl	 
+_outportsl:
+	pushl	%esi
+	movl	8(%esp),%edx
+	movl	12(%esp),%esi
+	movl	16(%esp),%ecx
+	rep
+	outsl
+	popl	%esi
+	ret
+
diff --git a/newlib/libc/sys/go32/outprtsw.s b/newlib/libc/sys/go32/outprtsw.s
new file mode 100644
index 0000000..93a84f6
--- /dev/null
+++ b/newlib/libc/sys/go32/outprtsw.s
@@ -0,0 +1,25 @@
+#/* This is file OUTPRTSW.S */
+#/*
+#** Copyright (C) 1991 DJ Delorie
+#**
+#** This file is distributed under the terms listed in the document
+#** "copying.dj".
+#** A copy of "copying.dj" should accompany this file; if not, a copy
+#** should be available from where this file was obtained.  This file
+#** may not be distributed without a verbatim copy of "copying.dj".
+#**
+#** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+#** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#*/
+#
+	.globl	_outportsw	 
+_outportsw:
+	pushl	%esi
+	movl	8(%esp),%edx
+	movl	12(%esp),%esi
+	movl	16(%esp),%ecx
+	rep
+	outsw
+	popl	%esi
+	ret
+
diff --git a/newlib/libc/sys/go32/pc.h b/newlib/libc/sys/go32/pc.h
new file mode 100644
index 0000000..692901d
--- /dev/null
+++ b/newlib/libc/sys/go32/pc.h
@@ -0,0 +1,71 @@
+/*

+** Copyright (C) 1991 DJ Delorie
+**

+** This file is distributed under the terms listed in the document

+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy

+** should be available from where this file was obtained.  This file

+** may not be distributed without a verbatim copy of "copying.dj".

+**

+** This file is distributed WITHOUT ANY WARRANTY; without even the implied

+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+**

+** Modified by J. Alan Eldridge, Liberty Brokerage, 77 Water St, NYC 10005

+**

+**    added getxkey(), which can read extended keystrokes that start with

+**    0xE0, as well as those which start with 0x00

+**    

+**    added global char ScreenAttrib, the attribute used by ScreenClear():

+**    it defaults to 0x07 so as not to break existing code.

+**

+**    added ScreenMode(), to return the current video mode

+*/

+

+#ifndef _PC_H_

+#define _PC_H_

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+unsigned char inportb(unsigned short port);

+unsigned short inportw(unsigned short port);

+unsigned long inportl(unsigned short port);

+unsigned char inportsb(unsigned short port, unsigned char *buf, unsigned len);

+unsigned short inportsw(unsigned short port, unsigned short *buf, unsigned len);

+unsigned long inportsl(unsigned short port, unsigned long *buf, unsigned len);

+void outportb(unsigned short port, unsigned char data);

+void outportw(unsigned short port, unsigned short data);

+void outportl(unsigned short port, unsigned long data);

+void outportsb(unsigned short port, unsigned char *buf, unsigned len);

+void outportsw(unsigned short port, unsigned short *buf, unsigned len);

+void outportsl(unsigned short port, unsigned long *buf, unsigned len);

+

+int kbhit(void);

+int getkey(void); /* ALT's have 0x100 set */

+int getxkey(void); /* ALT's have 0x100 set, 0xe0 sets 0x200 */

+

+void sound(int frequency);

+#define nosound() sound(0)

+

+extern unsigned char ScreenAttrib;

+extern short *ScreenPrimary;

+extern short *ScreenSecondary;

+

+/* For the primary screen: */

+int ScreenMode(void);

+int ScreenRows(void);

+int ScreenCols(void);

+void ScreenPutChar(int ch, int attr, int x, int y);

+void ScreenSetCursor(int row, int col);

+void ScreenGetCursor(int *row, int *col);

+void ScreenClear(void);

+void ScreenUpdate(void *virtual_screen);

+void ScreenUpdateLine(void *virtual_screen_line, int row);

+void ScreenRetrieve(void *virtual_screen);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif

diff --git a/newlib/libc/sys/go32/read.s b/newlib/libc/sys/go32/read.s
new file mode 100644
index 0000000..2e271b8
--- /dev/null
+++ b/newlib/libc/sys/go32/read.s
@@ -0,0 +1,30 @@
+# /* This is file READ.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _read
+_read:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%ebx
+	movl	20(%esp),%edx
+	movl	24(%esp),%ecx
+	movb	$0x3f,%ah
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jb	syscall_error
+	ret
diff --git a/newlib/libc/sys/go32/readv.c b/newlib/libc/sys/go32/readv.c
new file mode 100644
index 0000000..e51744b
--- /dev/null
+++ b/newlib/libc/sys/go32/readv.c
@@ -0,0 +1,31 @@
+/* This is file READV.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#include <sys/types.h>
+#include <sys/uio.h>
+
+readv(int handle, struct iovec *iov, int count)
+{
+  unsigned long r, t=0;
+  while (count)
+  {
+    r = read(handle, iov->iov_base, iov->iov_len);
+    if (r < 0)
+      return r;
+    t += r;
+    iov++;
+    count--;
+  }
+  return t;
+}
diff --git a/newlib/libc/sys/go32/rename.s b/newlib/libc/sys/go32/rename.s
new file mode 100644
index 0000000..8a32581
--- /dev/null
+++ b/newlib/libc/sys/go32/rename.s
@@ -0,0 +1,31 @@
+# /* This is file RENAME.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _rename
+_rename:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	20(%esp),%edx
+	movb	$0x41,%ah
+	int	$0x21		# remove "to" 
+	movl	16(%esp),%edx
+	movl	20(%esp),%edi
+	movb	$0x56,%ah
+	int	$0x21		#  move "from" to "to" 
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jmp	syscall_check
diff --git a/newlib/libc/sys/go32/rmdir.s b/newlib/libc/sys/go32/rmdir.s
new file mode 100644
index 0000000..3269cc9
--- /dev/null
+++ b/newlib/libc/sys/go32/rmdir.s
@@ -0,0 +1,27 @@
+# /* This is file RMDIR.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _rmdir
+_rmdir:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%edx
+	movb	$0x3a,%ah
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jmp	syscall_check
diff --git a/newlib/libc/sys/go32/sbrk.s b/newlib/libc/sys/go32/sbrk.s
new file mode 100644
index 0000000..77332d6
--- /dev/null
+++ b/newlib/libc/sys/go32/sbrk.s
@@ -0,0 +1,27 @@
+# /* This is file SBRK.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl	_sbrk
+_sbrk:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%ebx
+	movw	$0x4a01,%ax
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	ret
diff --git a/newlib/libc/sys/go32/screen.S b/newlib/libc/sys/go32/screen.S
new file mode 100644
index 0000000..0d4b173
--- /dev/null
+++ b/newlib/libc/sys/go32/screen.S
@@ -0,0 +1,256 @@
+/* This is file SCREEN.S */
+/*
+** Copyright (C) 1993 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+**
+** Modified by J. Alan Eldridge, Liberty Brokerage, 77 Water St, NYC 10005
+**
+** added global char ScreenAttrib -- this is the attribute
+** used by ScreenClear(): it defaults to 0x07 so as not to
+** break existing code.
+**
+** Modified by C. Sandmann (sandmann@clio.rice.edu) for DPMI support
+** Combined SCREEN2.S and SCREEN.C into SCREEN.S
+*/
+
+	.data
+
+	.globl	_ScreenAttrib
+_ScreenAttrib:
+	.byte 0x07
+
+	.text
+
+	.align 2
+	.globl	_ScreenSetCursor
+		/* row, col */
+_ScreenSetCursor:
+	pushl	%ebp
+	movl	%esp,%ebp
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movb	$0x02,%ah
+	movb	$0,%bh
+	movb	8(%ebp),%dh
+	movb	12(%ebp),%dl
+	int	$0x10
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	popl	%ebp
+	ret
+
+	.align 2
+	.globl	_ScreenGetCursor
+		 /* &row, &col */
+_ScreenGetCursor:
+	pushl	%ebp
+	movl	%esp,%ebp
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movb	$0x03,%ah
+	movb	$0,%bh
+	pushl	%ebp
+	int	$0x10
+	popl	%ebp
+	movl	8(%ebp),%esi
+	movzbl	%dh,%eax
+	movl	%eax,(%esi)
+	movl	12(%ebp),%esi
+	movzbl	%dl,%eax
+	movl	%eax,(%esi)
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	popl	%ebp
+	ret
+
+	.align 2
+	.globl	_ScreenClear
+_ScreenClear:
+	pushl	%edi
+	call	_ScreenCols
+	movl	%eax,%ecx
+	call	_ScreenRows
+		/* ECX is total words to store */
+	imull	%eax,%ecx
+	movl	_ScreenPrimary,%eax
+	call	dosmemsetup
+	movl	%eax,%edi
+	push	%es
+	push	%gs
+	pop	%es
+	movb	$0x20,%al
+	movb	_ScreenAttrib,%ah
+	rep
+	stosw
+	pop	%es
+	popl	%edi
+	ret
+	
+	.align 2
+	.globl _ScreenRows
+_ScreenRows:
+	movl	$0x484,%eax
+	call	dosmemsetup
+	movzbl	%gs:(%eax),%eax
+	incl	%eax
+	ret
+
+	.align 2
+	.globl _ScreenCols
+_ScreenCols:
+	movl	$0x44a,%eax
+	call	dosmemsetup
+	movzwl	%gs:(%eax),%eax
+	ret
+
+	.align 2
+	.globl _ScreenMode
+_ScreenMode:
+	movl	$0x449,%eax
+	call	dosmemsetup
+	movzbl	%gs:(%eax),%eax
+	ret
+
+	.align 2
+	.globl _ScreenPutChar
+_ScreenPutChar:
+		/* int ch, int attr, unsigned x, unsigned y */
+/*
+  if ( (x >= ScreenCols()) || (y >= ScreenRows())) return;
+  ch &= 0xff;
+  attr = (attr & 0xff) << 8;
+  *(unsigned short *)(ScreenPrimary+x+y*ScreenCols()) = ch | attr;
+*/
+	call	_ScreenRows
+	cmpl	%eax,16(%esp)
+	jae	L1
+	call	_ScreenCols
+	cmpl	%eax,12(%esp)
+	jae	L1
+				/* Out of range */
+	movl	%eax,%edx
+	imull	16(%esp),%edx
+	addl	12(%esp),%edx
+			/* EDX = x + y*ScreenCols */
+
+	movb	4(%esp),%cl
+	movb	8(%esp),%ch
+
+	movl	_ScreenPrimary,%eax
+	call	dosmemsetup
+	movw	%cx,%gs:(%eax,%edx,2)	
+L1:
+	ret	
+
+/* A quick way to update the screen from a logical video buffer, used 
+   primarily for DPMI full screen management */
+	.align 2
+	.globl _ScreenUpdate
+		/* (void *)screenbuf */
+_ScreenUpdate:
+	call	_ScreenRows
+	movl	%eax,%ecx
+	call	_ScreenCols
+	imull	%eax,%ecx
+	sarl	$1,%ecx
+			/* Number of long words in screen */
+
+	movl	_ScreenPrimary,%eax
+	call	dosmemsetup
+	movl	4(%esp),%edx
+		/* screenbuf */
+
+	pushl	%esi
+	pushl	%edi
+	movl	%eax,%edi
+	movl	%edx,%esi
+	push	%es
+	push	%gs
+	pop	%es
+	rep
+	movsl
+					/* move ECX bytes to Real area */
+	pop	%es
+	popl	%edi
+	popl	%esi
+	ret
+
+/* A quick way to update a screen line from a logical video buffer, used 
+   primarily for DPMI full screen management */
+	.align 2
+	.globl _ScreenUpdateLine
+		/* (void *)screenline, int row */
+_ScreenUpdateLine:
+	call	_ScreenCols
+	movl	%eax,%ecx
+	sarl	$1,%ecx
+			/* Number of long words in screen line */
+	shll	$1,%eax
+	imull	8(%esp),%eax
+	addl	_ScreenPrimary,%eax
+	call	dosmemsetup
+	movl	4(%esp),%edx
+		/* screenbuf */
+
+	pushl	%esi
+	pushl	%edi
+	movl	%eax,%edi
+	movl	%edx,%esi
+	push	%es
+	push	%gs
+	pop	%es
+	rep
+	movsl
+					/* move ECX bytes to Real area */
+	pop	%es
+	popl	%edi
+	popl	%esi
+	ret
+
+
+/* A quick way to update the screen from a logical video buffer, used 
+   primarily for DPMI full screen management */
+	.align 2
+	.globl _ScreenRetrieve
+		/* (void *)screenbuf */
+_ScreenRetrieve:
+	call	_ScreenRows
+	movl	%eax,%ecx
+	call	_ScreenCols
+	imull	%eax,%ecx
+	sarl	$1,%ecx
+			/* Number of long words in screen */
+
+	movl	_ScreenPrimary,%eax
+	call	dosmemsetup
+	movl	4(%esp),%edx
+		/* screenbuf */
+
+	pushl	%esi
+	pushl	%edi
+	movl	%eax,%esi
+	movl	%edx,%edi
+	push	%ds
+	push	%gs
+	pop	%ds
+	rep
+	movsl
+					/* move ECX bytes to Real area */
+	pop	%ds
+	popl	%edi
+	popl	%esi
+	ret
+
+
diff --git a/newlib/libc/sys/go32/setjmp.S b/newlib/libc/sys/go32/setjmp.S
new file mode 100644
index 0000000..3e3ef6f
--- /dev/null
+++ b/newlib/libc/sys/go32/setjmp.S
@@ -0,0 +1,61 @@
+/* This is file SETJMP.S */
+/*
+** Copyright (C) 1993 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/*
+**	jmp_buf:
+**	 eax ebx ecx edx esi edi ebp esp eip es fs gs ss
+**	 0   4   8   12  16  20  24  28  32  36 38 40 42
+*/
+
+	.globl	_setjmp /* jmp_buf */
+_setjmp:
+	pushl	%ebp
+	movl	%esp,%ebp
+
+	pushl	%edi
+	movl	8(%ebp),%edi
+
+	movl	%eax,0(%edi)
+	movl	%ebx,4(%edi)
+	movl	%ecx,8(%edi)
+	movl	%edx,12(%edi)
+	movl	%esi,16(%edi)
+
+	movl	-4(%ebp),%eax
+	movl	%eax,20(%edi)
+
+	movl	0(%ebp),%eax
+	movl	%eax,24(%edi)
+
+	movl	%esp,%eax
+	addl	$12,%eax
+	movl	%eax,28(%edi)
+	
+	movl	4(%ebp),%eax
+	movl	%eax,32(%edi)
+
+	movw	%es, %ax
+	movw	%ax, 36(%edi)
+	movw	%fs, %ax
+	movw	%ax, 38(%edi)
+	movw	%gs, %ax
+	movw	%ax, 40(%edi)
+	movw	%ss, %ax
+	movw	%ax, 42(%edi)
+
+	popl	%edi
+	movl	$0,%eax
+	leave
+	ret
+	
diff --git a/newlib/libc/sys/go32/setmode.s b/newlib/libc/sys/go32/setmode.s
new file mode 100644
index 0000000..ccca815
--- /dev/null
+++ b/newlib/libc/sys/go32/setmode.s
@@ -0,0 +1,19 @@
+# /* This is file SETMODE.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _setmode
+_setmode:
+	movb	$8,%al
+	jmp	turbo_assist
diff --git a/newlib/libc/sys/go32/setstack.S b/newlib/libc/sys/go32/setstack.S
new file mode 100644
index 0000000..dcd3ac0
--- /dev/null
+++ b/newlib/libc/sys/go32/setstack.S
@@ -0,0 +1,70 @@
+/*  This routine potentially increases the stack size at runtime based on
+    the _stklen variable.  Only used by DPMI code.
+    Copyright (c) 1993  C. Sandmann
+    Environment:  called by crt0.s (and gcrt0.s)
+                  EAX, EBX, EBP, EDI, ESI disposable (cleared on return) */
+
+	.text
+	.globl	__setstack
+__setstack:
+	movl	%esp,%eax
+	andl	$0xc0000000,%eax	/* clear all except upper bits */
+	jne	ok_stack		/* obviously not DPMI! */
+	movw	%ss,%ax
+	lsll	%eax,%ebx		/* stack segment limit */
+	movl	%esp,%eax		/* current location */
+	subl	%ebx,%eax		/* Free stack */
+	cmpl	%eax,__stklen
+	jb	ok_stack
+
+/* Not enough stack.  Call sbrk() to get a new area.  Copy current ESP + 20
+   to end of new area (3 args + our stack).  Change ESP to new area.  Set new
+   limit to start of new area using DPMI services.  */
+
+	pushl	__stklen
+	call	_sbrk			/* eax = got memory base */
+	popl	%ebx			/* remove _stklen */
+	cmpl	$0xffffffff,%eax	/* if eax = -1 failure */
+	je	badstack
+	addl	%eax,%ebx		/* ebx now is end of new stack area */
+	andl	$0xfffffff0,%ebx	/* 16 byte alignment */
+	addl	$0xfff,%eax		/* make stack base page aligned */
+	andl	$0xfffff000,%eax	/* 4096 byte alignment */
+
+/* Now copy old stack to new stack.  We only need our part + 4 words, 3 for
+   the parameters to pass to main, one for our return EIP (4 extra safety) */
+	movl	%esp, %esi		/* Source is current stack */
+	subl	$0x20, %ebx		/* 8 longwords */
+	movl	%ebx, %edi		/* Destination is new stack */
+	movl	$8,%ecx
+	rep
+	movsl
+
+/* New stack in place.  Change ESP to point to it.  Assumes new stack is
+   higher in memory so we don't get caught by limit.  Change limit using 
+   DPMI services. */
+
+	movl	%ebx,%esp		/* Switch to new stack */
+	subl	$1,%eax			/* Low 12 bits all 1s */
+	pushl	%eax			/* Easiest way to move long to words */
+	popw	%dx
+	popw	%cx
+	movl	$8,%eax			/* DPMI function Set Segment Limit */
+	movw	%ss,%bx			/* Selector */
+	int	$0x31			/* Do service */
+
+	xor	%ecx,%ecx		/* Clean up */
+	xor	%edx,%edx		/* Clean up */
+
+ok_stack:
+	ret				/* What we have is already bigger */
+
+badstack:
+	movl	$0x4c01,%eax
+	int	$0x21
+	jmp	badstack
+
+	.data
+	.globl	__stklen
+	.comm	__stklen,4
+
diff --git a/newlib/libc/sys/go32/settimeo.s b/newlib/libc/sys/go32/settimeo.s
new file mode 100644
index 0000000..8d85eb9
--- /dev/null
+++ b/newlib/libc/sys/go32/settimeo.s
@@ -0,0 +1,19 @@
+# /* This is file SETTIMEO.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _settimeofday
+_settimeofday:
+	movb	$5,%al
+	jmp	turbo_assist
diff --git a/newlib/libc/sys/go32/sleep.c b/newlib/libc/sys/go32/sleep.c
new file mode 100644
index 0000000..7254b15
--- /dev/null
+++ b/newlib/libc/sys/go32/sleep.c
@@ -0,0 +1,27 @@
+/* This is file sleep.c */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+
+sleep(unsigned int seconds)
+{
+  long tnow, tthen;
+  time(&tnow);
+  tthen = tnow + seconds;
+  while (1)
+  {
+    time(&tnow);
+    if (tnow >= tthen)
+      return;
+  }
+}
diff --git a/newlib/libc/sys/go32/stat.c b/newlib/libc/sys/go32/stat.c
new file mode 100644
index 0000000..e64e5b8
--- /dev/null
+++ b/newlib/libc/sys/go32/stat.c
@@ -0,0 +1,151 @@
+/*
+  (c) Copyright 1992 Eric Backus
+
+  This software may be used freely so long as this copyright notice is
+  left intact.  There is no warrantee on this software.
+*/
+
+#include <sys/stat.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "dos.h"
+#include <errno.h>
+#include <stdio.h>
+
+extern int	_stat_assist(const char *, struct stat *);
+extern void	_fixpath(const char *, char *);
+
+struct path_list
+{
+    struct path_list	*next;
+    char		*path;
+    int			inode;
+};
+
+static int
+fixinode(const char *path, struct stat *buf)
+{
+    static struct path_list	*path_list[1256];
+    /* Start the inode count at three, since root path should be two */
+    static int			inode_count = 3;
+
+    struct path_list		*path_ptr, *prev_ptr;
+    const char			*p;
+    int				hash;
+
+    /* Skip over device and leading '/' */
+    if (path[1] == ':' && path[2] == '/') path += 3;
+
+    /* We could probably use a better hash than this */
+    p = path;
+    hash = 0;
+    while (*p != '\0') hash += *p++;
+    hash = hash & 0xff;
+
+    /* Have we seen this string? */
+    path_ptr = path_list[hash];
+    prev_ptr = path_ptr;
+    while (path_ptr)
+    {
+	if (strcmp(path, path_ptr->path) == 0) break;
+	prev_ptr = path_ptr;
+	path_ptr = path_ptr->next;
+    }
+
+    if (path_ptr)
+	/* Same string, so same inode */
+	buf->st_ino = path_ptr->inode;
+    else
+    {
+	/* New string with same hash code */
+	path_ptr = malloc(sizeof *path_ptr);
+	if (path_ptr == NULL)
+	  {
+	    errno = ENOMEM;
+	    return -1;
+	  }
+	path_ptr->next = NULL;
+	path_ptr->path = strdup(path);
+	if (path_ptr->path == NULL)
+	  {
+	    errno = ENOMEM;
+	    return -1;
+	  }
+	path_ptr->inode = inode_count;
+	if (prev_ptr)
+	    prev_ptr->next = path_ptr;
+	else
+	    path_list[hash] = path_ptr;
+	buf->st_ino = inode_count;
+	inode_count++;
+    }
+    return 0;
+}
+
+int
+stat(const char *path, struct stat *buf)
+{
+    static int	stat_called_before = 0;
+    char	p[1090];	/* Should be p[PATH_MAX+1] */
+    int		status;
+
+    /* Normalize the path */
+    _fixpath(path, p);
+
+    /* Work around strange bug with stat and time */
+    if (!stat_called_before)
+    {
+	stat_called_before = 1;
+	(void) time((time_t *) 0);
+    }
+
+    /* Check for root path */
+    if (strcmp(p, "/") == 0 || strcmp(p + 1, ":/") == 0)
+    {
+	/* Handle root path as special case, stat_assist doesn't like
+	   the root directory. */
+	if (p[1] == ':')
+	{
+	    if (p[0] >= 'a' && p[0] <= 'z')
+		buf->st_dev = p[0] - 'a';
+	    else
+		buf->st_dev = p[0] - 'A';
+	}
+	else
+	    buf->st_dev = -1;	/* No device? */
+	buf->st_ino = 2;	/* Root path always inode 2 */
+	buf->st_mode = S_IFDIR | S_IREAD | S_IWRITE | S_IEXEC;
+	buf->st_nlink = 1;
+	buf->st_uid = getuid();
+	buf->st_gid = getgid();
+	buf->st_rdev = buf->st_dev;
+	buf->st_size = 0;
+	buf->st_atime = 0;
+	buf->st_mtime = 0;
+	buf->st_ctime = 0;
+	buf->st_blksize = 512;	/* Not always correct? */
+	status = 0;
+    }
+    else
+    {
+	status = _stat_assist(p, buf);
+
+	/* Make inode numbers unique */
+	if (status == 0) status = fixinode(p, buf);
+
+	/* The stat_assist does something weird with st_dev, but sets
+	   st_rdev to the drive number.  Fix st_dev. */
+	buf->st_dev = buf->st_rdev;
+
+	/* Make all files owned by ourself. */
+	buf->st_uid = getuid();
+	buf->st_gid = getgid();
+
+	/* Make all directories writable.  They always are in DOS, but
+	   stat_assist doesn't think so. */
+	if (S_ISDIR(buf->st_mode)) buf->st_mode |= S_IWRITE;
+    }
+
+    return status;
+}
diff --git a/newlib/libc/sys/go32/stat.s b/newlib/libc/sys/go32/stat.s
new file mode 100644
index 0000000..edea068
--- /dev/null
+++ b/newlib/libc/sys/go32/stat.s
@@ -0,0 +1,19 @@
+# /* This is file STAT.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _stat
+_stat:
+	movb	$6,%al
+	jmp	turbo_assist
diff --git a/newlib/libc/sys/go32/stat_ast.s b/newlib/libc/sys/go32/stat_ast.s
new file mode 100644
index 0000000..08dfffe
--- /dev/null
+++ b/newlib/libc/sys/go32/stat_ast.s
@@ -0,0 +1,21 @@
+/* This is file STAT_AST.S */
+/*
+** Copyright (C) 1993 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+**
+** Modified very slightly by Eric Backus.
+*/
+
+	.text
+	.globl __stat_assist
+__stat_assist:
+	movb	$6,%al
+	jmp	turbo_assist
diff --git a/newlib/libc/sys/go32/sys/dir.h b/newlib/libc/sys/go32/sys/dir.h
new file mode 100644
index 0000000..6ac830f
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/dir.h
@@ -0,0 +1,33 @@
+#ifndef _DIR_H_
+#define _DIR_H_
+
+struct ffblk {
+  char ff_reserved[21];
+  char ff_attrib;
+  short ff_ftime;
+  short ff_fdate;
+  short ff_filler;
+  long ff_fsize;
+  char ff_name[16];
+};
+
+#define FA_RDONLY	1
+#define FA_HIDDEN	2
+#define FA_SYSTEM	4
+#define FA_LABEL	8
+#define FA_DIREC	16
+#define FA_ARCH		32
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int findfirst(const char *pathname, struct ffblk *ffblk, int attrib);
+int findnext(struct ffblk *ffblk);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/newlib/libc/sys/go32/sys/dirent.h b/newlib/libc/sys/go32/sys/dirent.h
new file mode 100644
index 0000000..fef5fd8
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/dirent.h
@@ -0,0 +1,39 @@
+/* This is file DIRENT.H */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#ifndef _dirent_h_
+#define _dirent_h_
+
+#include <sys/dir.h>
+
+struct dirent {
+  unsigned short d_namlen;
+  char		 d_name[14];
+};
+
+typedef struct {
+  int num_read;
+  char *name;
+  struct ffblk ff;
+  struct dirent de;
+} DIR;
+
+DIR *opendir(char *name);
+struct dirent *readdir(DIR *dir);
+long telldir(DIR *dir);
+void seekdir(DIR *dir, long loc);
+void rewinddir(DIR *dir);
+int closedir(DIR *dir);
+
+#endif
diff --git a/newlib/libc/sys/go32/sys/dos.h b/newlib/libc/sys/go32/sys/dos.h
new file mode 100644
index 0000000..ff3103f
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/dos.h
@@ -0,0 +1,57 @@
+#ifndef _DOS_H_
+#define _DOS_H_
+
+union REGS {
+  struct {
+    unsigned long ax;
+    unsigned long bx;
+    unsigned long cx;
+    unsigned long dx;
+    unsigned long si;
+    unsigned long di;
+    unsigned long cflag;
+    unsigned long flags;
+  } x;
+  struct {
+    unsigned char al;
+    unsigned char ah;
+    unsigned short upper_ax;
+    unsigned char bl;
+    unsigned char bh;
+    unsigned short upper_bx;
+    unsigned char cl;
+    unsigned char ch;
+    unsigned short upper_cx;
+    unsigned char dl;
+    unsigned char dh;
+    unsigned short upper_dx;
+  } h;
+};
+
+struct SREGS {
+  unsigned short cs;
+  unsigned short ds;
+  unsigned short es;
+  unsigned short fs;
+  unsigned short gs;
+  unsigned short ss;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int bdos(int func, unsigned dx, unsigned al);
+int bdosptr(int func, void *dx, unsigned al);
+int int86(int ivec, union REGS *in, union REGS *out);
+int int86x(int ivec, union REGS *in, union REGS *out, struct SREGS *seg);
+int intdos(union REGS *in, union REGS *out);
+int intdosx(union REGS *in, union REGS *out, struct SREGS *seg);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
diff --git a/newlib/libc/sys/go32/sys/dpmi.h b/newlib/libc/sys/go32/sys/dpmi.h
new file mode 100644
index 0000000..56bde19
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/dpmi.h
@@ -0,0 +1,151 @@
+/* This is file dpmi.h */

+/*

+** Copyright (C) 1993 DJ Delorie
+**

+** This file is distributed under the terms listed in the document

+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy

+** should be available from where this file was obtained.  This file

+** may not be distributed without a verbatim copy of "copying.dj".

+**

+** This file is distributed WITHOUT ANY WARRANTY; without even the implied

+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+*/

+

+#ifndef _DPMI_H_

+#define _DPMI_H_

+

+

+#include <sys/types.h>

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+typedef union {

+  struct {

+    u_long edi;

+    u_long esi;

+    u_long ebp;

+    u_long res;

+    u_long ebx;

+    u_long edx;

+    u_long ecx;

+    u_long eax;

+  } d;

+  struct {

+    u_short di, di_hi;

+    u_short si, si_hi;

+    u_short bp, bp_hi;

+    u_short res, res_hi;

+    u_short bx, bx_hi;

+    u_short dx, dx_hi;

+    u_short cx, cx_hi;

+    u_short ax, ax_hi;

+    u_short flags;

+    u_short es;

+    u_short ds;

+    u_short fs;

+    u_short gs;

+    u_short ip;

+    u_short cs;

+    u_short sp;

+    u_short ss;

+  } x;

+  struct {

+    u_char edi[4];

+    u_char esi[4];

+    u_char ebp[4];

+    u_char res[4];

+    u_char bl, bh, ebx_b2, ebx_b3;

+    u_char dl, dh, edx_b2, edx_b3;

+    u_char cl, ch, ecx_b2, ecx_b3;

+    u_char al, ah, eax_b2, eax_b3;

+  } h;

+} _go32_dpmi_registers;

+

+typedef struct {

+  u_long  size;

+  u_long  pm_offset;

+  u_short pm_selector;

+  u_short rm_offset;

+  u_short rm_segment;

+} _go32_dpmi_seginfo;

+

+typedef struct {

+  u_long available_memory;

+  u_long available_pages;

+  u_long available_lockable_pages;

+  u_long linear_space;

+  u_long unlocked_pages;

+  u_long available_physical_pages;

+  u_long total_physical_pages;

+  u_long free_linear_space;

+  u_long max_pages_in_paging_file;

+  u_long reserved[3];

+} _go32_dpmi_meminfo;

+

+/* returns zero if success, else dpmi error and info->size is max size */

+int _go32_dpmi_allocate_dos_memory(_go32_dpmi_seginfo *info);

+	/* set size to bytes/16, call, use rm_segment.  Do not

+	   change anthing but size until the memory is freed.

+	   If error, max size is returned in size as bytes/16. */

+int _go32_dpmi_free_dos_memory(_go32_dpmi_seginfo *info);

+	/* set new size to bytes/16, call.  If error, max size

+	   is returned in size as bytes/16 */

+int _go32_dpmi_resize_dos_memory(_go32_dpmi_seginfo *info);

+	/* uses pm_selector to free memory */

+

+/* These both use the rm_segment:rm_offset fields only */

+int _go32_dpmi_get_real_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info);

+int _go32_dpmi_set_real_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info);

+

+/* These do NOT wrap the function in pm_offset in an iret handler.

+   You must provide an assembler interface yourself, or alloc one below.

+   You may NOT longjmp out of an interrupt handler. */

+int _go32_dpmi_get_protected_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info);

+	/* puts vector in pm_selector:pm_offset. */

+int _go32_dpmi_set_protected_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info);

+	/* sets vector from pm_offset and pm_selector */

+int _go32_dpmi_chain_protected_mode_interrupt_vector(int vector, _go32_dpmi_seginfo *info);

+	/* sets up wrapper that calls function in pm_offset, chaining to old

+	   handler when it returns */

+

+/* These can be used to generate assember IRET-style wrappers for functions */

+int _go32_dpmi_allocate_iret_wrapper(_go32_dpmi_seginfo *info);

+	/* Put function ptr in pm_offset, call, returns wrapper entry in pm_offset. */

+int _go32_dpmi_free_iret_wrapper(_go32_dpmi_seginfo *info);

+	/* assumes pm_offset points to wrapper, frees it */

+

+/* simulate real mode calls.  CS:IP from regs for non-interrupt */

+int _go32_dpmi_simulate_int(int vector, _go32_dpmi_registers *regs);

+int _go32_dpmi_simulate_fcall(_go32_dpmi_registers *regs);

+int _go32_dpmi_simulate_fcall_iret(_go32_dpmi_registers *regs);

+

+/* These automatically handle the tasks of restructuring the

+   real-mode stack for the proper return type.  The callback

+   (info->pm_offset) is called as (*pmcb)(_go32_dpmi_registers *regs); */

+int _go32_dpmi_allocate_real_mode_callback_retf(_go32_dpmi_seginfo *info, _go32_dpmi_registers *regs);

+	/* points callback at pm_offset, returns seg:ofs of callback addr

+	   in rm_segment:rm_offset.  Do not change any fields until freed.

+	   Interface is added to simulate far return */

+int _go32_dpmi_allocate_real_mode_callback_iret(_go32_dpmi_seginfo *info, _go32_dpmi_registers *regs);

+	/* same, but simulates iret */

+int _go32_dpmi_free_real_mode_callback(_go32_dpmi_seginfo *info);

+	/* frees callback */

+

+/* Only available_memory is guaranteed to be valid.  Try

+   available_physical_pages for phys mem left */

+int _go32_dpmi_get_free_memory_information(_go32_dpmi_meminfo *info);

+

+/* Convenience functions.  These use the above memory info call.

+   The return value is *bytes* */

+u_long _go32_dpmi_remaining_physical_memory(void);

+u_long _go32_dpmi_remaining_virtual_memory(void);

+

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif

diff --git a/newlib/libc/sys/go32/sys/errno.h b/newlib/libc/sys/go32/sys/errno.h
new file mode 100644
index 0000000..793e51f
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/errno.h
@@ -0,0 +1,73 @@
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/* ??? This file has been modified to work with newlib's way of storing
+   `errno'.  Arguably there's no need and arguably we shouldn't diverge
+   from go32 sources.  If you feel strongly about it, please change it.
+   The interface between newlib and system's version of errno is via
+   __errno, so there's no problem in storing errno in a different place
+   (any changes can be dealt with inside __errno).  */
+
+#ifndef _SYS_ERRNO_H_
+#define _SYS_ERRNO_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/reent.h>
+
+#ifndef _REENT_ONLY
+#define errno (*__errno())
+extern int *__errno _PARAMS ((void));
+#endif
+
+#define __errno_r(ptr) ((ptr)->_errno)
+
+#define ENOENT   2              /* No such file or directory    */
+#define ENOTDIR  3              /* No path                      */
+#define EMFILE   4              /* Too many open files          */
+#define EACCES   5              /* Permission denied            */
+#define EBADF    6              /* Bad file number              */
+#define EARENA   7              /* Arena trashed                */
+#define ENOMEM   8              /* Not enough core              */
+#define ESEGV    9              /* invalid memory address       */
+#define EBADENV 10              /* invalid environment          */
+#define ENODEV  15              /* No such device               */
+#define ENMFILE 18              /* No more files                */
+#define EINVAL  19              /* Invalid argument             */
+#define E2BIG   EBADENV         /* Arg list too long            */
+#define ENOEXEC 21              /* Exec format error            */
+#define EXDEV   17              /* Cross-device link            */
+#define EPIPE	32		/* POHC                         */
+#define EDOM    33              /* Math argument                */
+#define ERANGE  34              /* Result too large             */
+#if 0 /* readline.c assumes that if this is defined, so is O_NDELAY.
+	 Newlib doesn't use it, so comment it out.  */
+#define EWOULDBLOCK 35		/* POHC                         */
+#endif
+#define EEXIST  36              /* File already exists          */
+#define EINTR	100		/* Interrupted system call	*/
+#define EIO	101		/* I/O or bounds error		*/
+#define ENOSPC	102		/* No space left on drive	*/
+#define EAGAIN	103		/* No more processes		*/
+#define ECHILD  200		/* child exited (porting only)  */
+#define EFAULT	201		/* bad address */
+#define ENXIO	ENODEV
+#define EPERM	EACCES
+
+/* New values required by newlib and the Cygnus toolchain.  */
+#define ENOSYS	230		/* Function not implemented */
+#define ESPIPE	231		/* Illegal seek */
+
+#endif
diff --git a/newlib/libc/sys/go32/sys/fcntl.h b/newlib/libc/sys/go32/sys/fcntl.h
new file mode 100644
index 0000000..792c067
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/fcntl.h
@@ -0,0 +1,12 @@
+#define O_RDONLY	0x0001
+#define	O_WRONLY	0x0002
+#define	O_RDWR		0x0004
+#define	O_CREAT		0x0100
+#define	O_TRUNC		0x0200
+#define O_EXCL		0x0400
+#define O_APPEND	0x0800
+#define O_TEXT		0x4000
+#define O_BINARY	0x8000
+
+
+
diff --git a/newlib/libc/sys/go32/sys/file.h b/newlib/libc/sys/go32/sys/file.h
new file mode 100644
index 0000000..6679fd6
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/file.h
@@ -0,0 +1,31 @@
+/* This is file FILE.H */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#ifndef _FILE_H_
+#define _FILE_H_
+
+#include <fcntl.h>
+
+#define L_SET  0
+#define L_CURR 1
+#define L_INCR 1
+#define L_XTND 2
+
+
+#define	F_OK		0	/* does file exist */
+#define	X_OK		1	/* is it executable by caller */
+#define	W_OK		2	/* is it writable by caller */
+#define	R_OK		4	/* is it readable by caller */
+
+#endif
diff --git a/newlib/libc/sys/go32/sys/go32.h b/newlib/libc/sys/go32/sys/go32.h
new file mode 100644
index 0000000..55b1ce4
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/go32.h
@@ -0,0 +1,69 @@
+/* This is file go32.h */

+/*

+** Copyright (C) 1993 DJ Delorie
+**

+** This file is distributed under the terms listed in the document

+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy

+** should be available from where this file was obtained.  This file

+** may not be distributed without a verbatim copy of "copying.dj".

+**

+** This file is distributed WITHOUT ANY WARRANTY; without even the implied

+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+*/

+

+#ifndef _GO32_H_

+#define _GO32_H_

+

+#include <sys/types.h>

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+/* This must match go32/proginfo.h */

+

+typedef struct {

+  u_long size_of_this_structure_in_bytes;

+  u_long linear_address_of_primary_screen;

+  u_long linear_address_of_secondary_screen;

+  u_long linear_address_of_transfer_buffer;

+  u_long size_of_transfer_buffer; /* >= 4k */

+  u_long pid;

+  u_char master_interrupt_controller_base;

+  u_char slave_interrupt_controller_base;

+  u_short selector_for_linear_memory;

+  u_long linear_address_of_stub_info_structure;

+  u_long linear_address_of_original_psp;

+  u_short run_mode;

+  u_short run_mode_info;

+} Go32_Info_Block;

+

+extern Go32_Info_Block _go32_info_block;

+

+#define _GO32_RUN_MODE_UNDEF	0

+#define _GO32_RUN_MODE_RAW	1

+#define _GO32_RUN_MODE_XMS	2

+#define _GO32_RUN_MODE_VCPI	3

+#define _GO32_RUN_MODE_DPMI	4

+

+void dosmemget(int offset, int length, void *buffer);

+void dosmemput(const void *buffer, int length, int offset);

+void movedata(unsigned source_selector, unsigned source_offset,

+              unsigned dest_selector, unsigned dest_offset,

+              size_t length);

+

+/* returns number of times hit since last call. (zero first time) */

+u_long _go32_was_ctrl_break_hit(void);

+void   _go32_want_ctrl_break(int yes); /* auto-yes if call above function */

+

+u_short _go32_my_cs(void);

+u_short _go32_my_ds(void);

+u_short _go32_my_ss(void);

+u_short _go32_conventional_mem_selector(void);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif

diff --git a/newlib/libc/sys/go32/sys/param.h b/newlib/libc/sys/go32/sys/param.h
new file mode 100644
index 0000000..0bc4a8d
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/param.h
@@ -0,0 +1,22 @@
+/* This is file PARAM.H */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#ifndef _PARAM_H_
+#define _PARAM_H_
+
+#define MAXPATHLEN 80
+/* 100, according to the real go32 sys/times.h */
+#define HZ (100)
+
+#endif
diff --git a/newlib/libc/sys/go32/sys/pc.h b/newlib/libc/sys/go32/sys/pc.h
new file mode 100644
index 0000000..c0460d7
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/pc.h
@@ -0,0 +1,56 @@
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#ifndef _PC_H_
+#define _PC_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+unsigned char inportb(unsigned short port);
+unsigned short inportw(unsigned short port);
+unsigned long inportl(unsigned short port);
+unsigned char inportsb(unsigned short port, unsigned char *buf, unsigned len);
+unsigned short inportsw(unsigned short port, unsigned short *buf, unsigned len);
+unsigned long inportsl(unsigned short port, unsigned long *buf, unsigned len);
+void outportb(unsigned short port, unsigned char data);
+void outportw(unsigned short port, unsigned short data);
+void outportl(unsigned short port, unsigned long data);
+void outportsb(unsigned short port, unsigned char *buf, unsigned len);
+void outportsw(unsigned short port, unsigned short *buf, unsigned len);
+void outportsl(unsigned short port, unsigned long *buf, unsigned len);
+
+int kbhit(void);
+int getkey(void);
+
+void sound(int frequency);
+
+extern short ScreenPrimary[];
+extern short ScreenSecondary[];
+
+/* For the primary screen: */
+int ScreenRows();
+int ScreenCols();
+void ScreenPutChar(int ch, int attr, int x, int y);
+void ScreenSetCursor(int row, int col);
+void ScreenGetCursor(int *row, int *col);
+void ScreenClear();
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/newlib/libc/sys/go32/sys/register.h b/newlib/libc/sys/go32/sys/register.h
new file mode 100644
index 0000000..e6b7814
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/register.h
@@ -0,0 +1,28 @@
+/* This is file REGISTER.H */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+  	unsigned ax, bx, cx, dx, si, di, bp, f;
+	} REGISTERS;
+
+#define	FLAGS_C	1
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/newlib/libc/sys/go32/sys/resource.h b/newlib/libc/sys/go32/sys/resource.h
new file mode 100644
index 0000000..418b499
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/resource.h
@@ -0,0 +1,50 @@
+/* This is file RESOURCE.H */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#ifndef _SYS_RESOURCE_H_
+#define _SYS_RESOURCE_H_
+
+#include <sys/time.h>
+
+#define	RUSAGE_SELF	0		/* calling process */
+#define	RUSAGE_CHILDREN	-1		/* terminated child processes */
+
+struct rusage {
+	struct timeval ru_utime;	/* user time used */
+	struct timeval ru_stime;	/* system time used */
+	long ru_maxrss;			/* integral max resident set size */
+	long ru_ixrss;			/* integral shared text memory size */
+	long ru_idrss;			/* integral unshared data size */
+	long ru_isrss;			/* integral unshared stack size */
+	long ru_minflt;			/* page reclaims */
+	long ru_majflt;			/* page faults */
+	long ru_nswap;			/* swaps */
+	long ru_inblock;		/* block input operations */
+	long ru_oublock;		/* block output operations */
+	long ru_msgsnd;			/* messages sent */
+	long ru_msgrcv;			/* messages received */
+	long ru_nsignals;		/* signals received */
+	long ru_nvcsw;			/* voluntary context switches */
+	long ru_nivcsw;			/* involuntary context switches */
+};
+
+
+#ifdef __cplusplus
+extern "C" int getrusage(int who, struct rusage *rusage);
+#else
+extern int getrusage(int who, struct rusage *rusage);
+#endif
+
+#endif
+
diff --git a/newlib/libc/sys/go32/sys/setjmp.h b/newlib/libc/sys/go32/sys/setjmp.h
new file mode 100644
index 0000000..58dfc32
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/setjmp.h
@@ -0,0 +1,44 @@
+/*

+** Copyright (C) 1991 DJ Delorie
+**

+** This file is distributed under the terms listed in the document

+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy

+** should be available from where this file was obtained.  This file

+** may not be distributed without a verbatim copy of "copying.dj".

+**

+** This file is distributed WITHOUT ANY WARRANTY; without even the implied

+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+*/

+

+#ifndef _SETJMP_H_

+#define _SETJMP_H_

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+typedef struct {

+  unsigned long eax;

+  unsigned long ebx;

+  unsigned long ecx;

+  unsigned long edx;

+  unsigned long esi;

+  unsigned long edi;

+  unsigned long ebp;

+  unsigned long esp;

+  unsigned long eip;

+  unsigned short es;

+  unsigned short fs;

+  unsigned short gs;

+  unsigned short ss;

+} jmp_buf[1];

+

+extern int setjmp(jmp_buf);

+extern void longjmp(jmp_buf, int);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif

diff --git a/newlib/libc/sys/go32/sys/stdc.h b/newlib/libc/sys/go32/sys/stdc.h
new file mode 100644
index 0000000..a36a4f6
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/stdc.h
@@ -0,0 +1,15 @@
+/* This is file STDC.H */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#include <sys/types.h>
diff --git a/newlib/libc/sys/go32/sys/uio.h b/newlib/libc/sys/go32/sys/uio.h
new file mode 100644
index 0000000..7e8c6bc
--- /dev/null
+++ b/newlib/libc/sys/go32/sys/uio.h
@@ -0,0 +1,23 @@
+/* This is file UIO.H */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#ifndef _SYS_UIO_H_
+#define _SYS_UIO_H_
+
+struct iovec {
+  void *iov_base;
+  unsigned long iov_len;
+};
+
+#endif
diff --git a/newlib/libc/sys/go32/syserr.c b/newlib/libc/sys/go32/syserr.c
new file mode 100644
index 0000000..4a102eb
--- /dev/null
+++ b/newlib/libc/sys/go32/syserr.c
@@ -0,0 +1,38 @@
+
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+char *sys_errlist[] = {
+  "no error",
+  "invalid function",
+  "file not found",
+  "path not found",
+  "too many open files",
+  "access denied",
+  "invalid file handle",
+  "arena trashed",
+  "not enough memory",
+  "invalid block",
+  "no environment",
+  "no format",
+  "invalid access code",
+  "invalid data",
+  "undefined",
+  "invalid drive",
+  "attempt to remove current directory",
+  "not same device",
+  "no more files"
+};
+
+int sys_nerr= sizeof(sys_errlist) / sizeof(char *);
+
diff --git a/newlib/libc/sys/go32/system.s b/newlib/libc/sys/go32/system.s
new file mode 100644
index 0000000..1707825
--- /dev/null
+++ b/newlib/libc/sys/go32/system.s
@@ -0,0 +1,19 @@
+# /* This is file SYSTEM.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _system
+_system:
+	movb	$7,%al
+	jmp	turbo_assist
diff --git a/newlib/libc/sys/go32/tell.s b/newlib/libc/sys/go32/tell.s
new file mode 100644
index 0000000..eaf7a32
--- /dev/null
+++ b/newlib/libc/sys/go32/tell.s
@@ -0,0 +1,33 @@
+# /* This is file TELL.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _tell
+_tell:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%ebx
+	movl	$0,%ecx
+	movl	$0,%edx
+	movw	$0x4201,%ax
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jb	syscall_error
+	shll	$16,%edx
+	andl	$0xffff,%eax
+	orl	%edx,%eax
+	ret
diff --git a/newlib/libc/sys/go32/time.c b/newlib/libc/sys/go32/time.c
new file mode 100644
index 0000000..f8ab6f4
--- /dev/null
+++ b/newlib/libc/sys/go32/time.c
@@ -0,0 +1,53 @@
+/*
+FUNCTION
+<<time>>---get current calendar time (as single number)
+
+INDEX
+	time
+
+ANSI_SYNOPSIS
+	#include <time.h>
+	time_t time(time_t *<[t]>);
+
+TRAD_SYNOPSIS
+	#include <time.h>
+	time_t time(<[t]>)
+	time_t *<[t]>;
+
+DESCRIPTION
+<<time>> looks up the best available representation of the current
+time and returns it, encoded as a <<time_t>>.  It stores the same
+value at <[t]> unless the argument is <<NULL>>.
+
+RETURNS
+A <<-1>> result means the current time is not available; otherwise the
+result represents the current time.
+
+PORTABILITY
+ANSI C requires <<time>>.
+This function is a wrapper for <<gettimeofday>>; this pollutes the
+namespace, and should be dealt with in the future.
+*/
+
+#include <_ansi.h>
+#include <sys/types.h>
+#include <sys/time.h>
+
+time_t
+_DEFUN(time,(t),
+	time_t *t)
+{
+  struct timeval now;
+
+  if (gettimeofday(&now, (struct timezone *)0) >= 0)
+  {
+    if (t) 
+    {
+      *t = now.tv_sec;
+    }
+    
+    return now.tv_sec;
+
+  }
+  return -1 ;	
+}
diff --git a/newlib/libc/sys/go32/truncate.c b/newlib/libc/sys/go32/truncate.c
new file mode 100644
index 0000000..9c25e3c
--- /dev/null
+++ b/newlib/libc/sys/go32/truncate.c
@@ -0,0 +1,25 @@
+/* This is file TRUNCATE.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#include <fcntl.h>
+
+truncate(const char *fn, unsigned long where)
+{
+  int fd = open(fn, O_WRONLY);
+  if (fd < 0)
+    return -1;
+  lseek(fd, where, 0);
+  write(fd, 0, 0);
+  close(fd);
+}
diff --git a/newlib/libc/sys/go32/turbo.s b/newlib/libc/sys/go32/turbo.s
new file mode 100644
index 0000000..1cd94f6
--- /dev/null
+++ b/newlib/libc/sys/go32/turbo.s
@@ -0,0 +1,30 @@
+# /* This is file TURBO.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl	turbo_assist
+turbo_assist:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%ebx
+	movl	20(%esp),%ecx
+	movl	24(%esp),%edx
+	movb	$0xff,%ah
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jb	syscall_error
+	ret
diff --git a/newlib/libc/sys/go32/umask.c b/newlib/libc/sys/go32/umask.c
new file mode 100644
index 0000000..4fabe64
--- /dev/null
+++ b/newlib/libc/sys/go32/umask.c
@@ -0,0 +1,4 @@
+umask()
+{
+  return 0644;
+}
diff --git a/newlib/libc/sys/go32/unlink.s b/newlib/libc/sys/go32/unlink.s
new file mode 100644
index 0000000..8c99aae
--- /dev/null
+++ b/newlib/libc/sys/go32/unlink.s
@@ -0,0 +1,27 @@
+# /* This is file UNLINK.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _unlink
+_unlink:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%edx
+	movb	$0x41,%ah
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jmp	syscall_check
diff --git a/newlib/libc/sys/go32/utime.c b/newlib/libc/sys/go32/utime.c
new file mode 100644
index 0000000..6e35acc
--- /dev/null
+++ b/newlib/libc/sys/go32/utime.c
@@ -0,0 +1,15 @@
+/* This is file UTIME.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+utime(){}
diff --git a/newlib/libc/sys/go32/utimes.c b/newlib/libc/sys/go32/utimes.c
new file mode 100644
index 0000000..e7378c5
--- /dev/null
+++ b/newlib/libc/sys/go32/utimes.c
@@ -0,0 +1,15 @@
+/* This is file UTIMES.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+utimes(){}
diff --git a/newlib/libc/sys/go32/write.s b/newlib/libc/sys/go32/write.s
new file mode 100644
index 0000000..bdce3a4
--- /dev/null
+++ b/newlib/libc/sys/go32/write.s
@@ -0,0 +1,30 @@
+# /* This is file WRITE.S */
+# /*
+# ** Copyright (C) 1991 DJ Delorie
+# **
+# ** This file is distributed under the terms listed in the document
+# ** "copying.dj".
+# ** A copy of "copying.dj" should accompany this file; if not, a copy
+# ** should be available from where this file was obtained.  This file
+# ** may not be distributed without a verbatim copy of "copying.dj".
+# **
+# ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+# ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# */
+
+	.text
+	.globl _write
+_write:
+	pushl	%ebx
+	pushl	%esi
+	pushl	%edi
+	movl	16(%esp),%ebx
+	movl	20(%esp),%edx
+	movl	24(%esp),%ecx
+	movb	$0x40,%ah
+	int	$0x21
+	popl	%edi
+	popl	%esi
+	popl	%ebx
+	jb	syscall_error
+	ret
diff --git a/newlib/libc/sys/go32/writestub.c b/newlib/libc/sys/go32/writestub.c
new file mode 100644
index 0000000..ae1b993
--- /dev/null
+++ b/newlib/libc/sys/go32/writestub.c
@@ -0,0 +1,6 @@
+
+sswrite(a,b,c)
+{
+  /*write(1,"writing\n",9);*/
+  return write_real(a,b,c);
+}
diff --git a/newlib/libc/sys/go32/writev.c b/newlib/libc/sys/go32/writev.c
new file mode 100644
index 0000000..17f0bfc
--- /dev/null
+++ b/newlib/libc/sys/go32/writev.c
@@ -0,0 +1,31 @@
+/* This is file WRITEV.C */
+/*
+** Copyright (C) 1991 DJ Delorie
+**
+** This file is distributed under the terms listed in the document
+** "copying.dj".
+** A copy of "copying.dj" should accompany this file; if not, a copy
+** should be available from where this file was obtained.  This file
+** may not be distributed without a verbatim copy of "copying.dj".
+**
+** This file is distributed WITHOUT ANY WARRANTY; without even the implied
+** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+#include <sys/types.h>
+#include <sys/uio.h>
+
+writev(int handle, struct iovec *iov, int count)
+{
+  unsigned long r, t=0;
+  while (count)
+  {
+    r = write(handle, iov->iov_base, iov->iov_len);
+    if (r < 0)
+      return r;
+    t += r;
+    iov++;
+    count--;
+  }
+  return t;
+}
diff --git a/newlib/libc/sys/h8300hms/Makefile.am b/newlib/libc/sys/h8300hms/Makefile.am
index 4f47672..131adc0 100644
--- a/newlib/libc/sys/h8300hms/Makefile.am
+++ b/newlib/libc/sys/h8300hms/Makefile.am
@@ -6,8 +6,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = syscalls.c _exit.S sbrk.c misc.c crt1.c \
-	close.S fstat.S lseek.S open.S read.S stat.S write.S
+lib_a_SOURCES = syscalls.c write.c _exit.c sbrk.c misc.c crt1.c
 
 all: crt0.o
 
diff --git a/newlib/libc/sys/h8300hms/Makefile.in b/newlib/libc/sys/h8300hms/Makefile.in
index b18e64e..2ec9ac6 100644
--- a/newlib/libc/sys/h8300hms/Makefile.in
+++ b/newlib/libc/sys/h8300hms/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,8 +84,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = syscalls.c _exit.S sbrk.c misc.c crt1.c 	close.S fstat.S lseek.S open.S read.S stat.S write.S
-
+lib_a_SOURCES = syscalls.c write.c _exit.c sbrk.c misc.c crt1.c
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@@ -104,8 +98,7 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-lib_a_OBJECTS =  syscalls.o _exit.o sbrk.o misc.o crt1.o close.o fstat.o \
-lseek.o open.o read.o stat.o write.o
+lib_a_OBJECTS =  syscalls.o write.o _exit.o sbrk.o misc.o crt1.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -131,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/h8300hms/_exit.S b/newlib/libc/sys/h8300hms/_exit.S
deleted file mode 100644
index 7fac3d3..0000000
--- a/newlib/libc/sys/h8300hms/_exit.S
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "setarch.h"
-
-/* `sleep' is passed an argument in r0 that indicates the reason
-   the program is exiting.  The format of r0 is defined in 
-   devo/include/wait.h. */ 
-
-/* extern void _exit (int rc); */
-
-	.section .text
-	.align 2
-	.global __exit
-__exit:
-	mov.w   #0xdead,r1
-	mov.w   #0xbeef,r2
-	mov.b   r0l,r0h
-	sub.b   r0l,r0l
-	sleep
diff --git a/newlib/libc/sys/h8300hms/_exit.c b/newlib/libc/sys/h8300hms/_exit.c
new file mode 100644
index 0000000..17d1538
--- /dev/null
+++ b/newlib/libc/sys/h8300hms/_exit.c
@@ -0,0 +1,23 @@
+/* FIXME: which one? */
+
+#include <_ansi.h>
+
+/* `sleep' is passed an argument in r0 that indicates the reason
+   the program is exiting.  The format of r0 is defined in devo/include/wait.h.
+*/
+
+void
+_DEFUN (_exit,(rc),
+     int rc)
+{
+  short rc2 = rc << 8;
+  asm("mov.w %0,r0\n\tsleep" : : "r" (rc2) : "r0");
+}
+
+void
+_DEFUN (__exit,(rc),
+     int rc)
+{
+  short rc2 = rc << 8;
+  asm("mov.w %0,r0\n\tsleep" : : "r" (rc2) : "r0");
+}
diff --git a/newlib/libc/sys/h8300hms/aclocal.m4 b/newlib/libc/sys/h8300hms/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/h8300hms/aclocal.m4
+++ b/newlib/libc/sys/h8300hms/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/h8300hms/close.S b/newlib/libc/sys/h8300hms/close.S
deleted file mode 100644
index f231420..0000000
--- a/newlib/libc/sys/h8300hms/close.S
+++ /dev/null
@@ -1,17 +0,0 @@
-;int close(int fd);
-;Integer arguments have to be zero extended.
-
-#include "setarch.h"
-
-	.section .text
-	.align 2
-	.global __close
-__close:
-#if defined(__H8300H__) || defined(__H8300S__) || defined (__H8300SX__)
-#if __INT_MAX__ == 32767
-	extu.l er0
-#endif
-#endif
-	jsr @@0xc9
-	rts
-	.end
diff --git a/newlib/libc/sys/h8300hms/configure b/newlib/libc/sys/h8300hms/configure
index 1efee2b..2b24ad2 100755
--- a/newlib/libc/sys/h8300hms/configure
+++ b/newlib/libc/sys/h8300hms/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/h8300hms/crt0.S b/newlib/libc/sys/h8300hms/crt0.S
index 6394f68..8d23bd4 100644
--- a/newlib/libc/sys/h8300hms/crt0.S
+++ b/newlib/libc/sys/h8300hms/crt0.S
@@ -1,7 +1,5 @@
 ; h8/300 and h8/300h start up file.
 
-#include "setarch.h"
-
 #ifdef __H8300__
 
 	.section .text
@@ -11,21 +9,15 @@ _start:
 	mov.w	#_edata,r0
 	mov.w	#_end,r1
 	sub.w   r2,r2
-.Loop:	mov.w	r2,@r0
+.loop:	mov.w	r2,@r0
 	adds	#2,r0
 	cmp	r1,r0
-	blo	.Loop
+	blo	.loop
 #ifdef __ELF__
 	mov.l   #__fini,r0
 	jsr     @_atexit
-#ifdef __SIMULATOR__
-        jsr     @0xcc
-#endif
 	jsr     @__init
 #else
-#ifdef __SIMULATOR__
-        jsr     @0xcc
-#endif
 	jsr	@___main
 #endif
 	jsr	@_main
@@ -38,6 +30,7 @@ _stack:	.word 	1
 
 #ifdef __H8300H__
 
+	.h8300h
 	.section .text
 	.global	_start
 _start:
@@ -45,21 +38,15 @@ _start:
 	mov.l	#_edata,er0
 	mov.l	#_end,er1
 	sub.w   r2,r2           ; not sure about alignment requirements
-.Loop:	mov.w	r2,@er0		; playing it safe for now
+.loop:	mov.w	r2,@er0		; playing it safe for now
 	adds	#2,er0
 	cmp.l	er1,er0
-	blo	.Loop
+	blo	.loop
 #ifdef __ELF__
-	mov.l   #__fini,er0
+	mov.l   #__fini,r0
 	jsr     @_atexit
-#ifdef __SIMULATOR__
-        jsr     @0xcc
-#endif
 	jsr     @__init
 #else
-#ifdef __SIMULATOR__
-        jsr     @0xcc
-#endif
 	jsr	@___main
 #endif
 	jsr	@_main
@@ -70,8 +57,9 @@ _stack:	.long 	1
 
 #endif
 
-#if defined (__H8300S__) || defined (__H8300SX__)
+#ifdef __H8300S__
 
+	.h8300s
 	.section .text
 	.global	_start
 _start:
@@ -79,21 +67,15 @@ _start:
 	mov.l	#_edata,er0
 	mov.l	#_end,er1
 	sub.w   r2,r2           ; not sure about alignment requirements
-.Loop:	mov.w	r2,@er0		; playing it safe for now
+.loop:	mov.w	r2,@er0		; playing it safe for now
 	adds	#2,er0
 	cmp.l	er1,er0
-	blo	.Loop
+	blo	.loop
 #ifdef __ELF__
-	mov.l   #__fini,er0
+	mov.l   #__fini,r0
 	jsr     @_atexit
-#ifdef __SIMULATOR__
-        jsr     @0xcc
-#endif
 	jsr     @__init
 #else
-#ifdef __SIMULATOR__
-        jsr     @0xcc
-#endif
 	jsr	@___main
 #endif
 	jsr	@_main
diff --git a/newlib/libc/sys/h8300hms/fstat.S b/newlib/libc/sys/h8300hms/fstat.S
deleted file mode 100644
index 1e1ca29..0000000
--- a/newlib/libc/sys/h8300hms/fstat.S
+++ /dev/null
@@ -1,18 +0,0 @@
-;int fstat(int filedes, struct stat *buf);
-;Integer arguments have to be zero extended.
-
-#include "setarch.h"
-
-	.section .text
-	.align 2
-	.global __fstat
-__fstat:
-#if defined(__H8300H__) || defined(__H8300S__) || defined (__H8300SX__)
-#if __INT_MAX__ == 32767
-	extu.l	er0
-#endif
-#endif
-	jsr @@0xcb
-	rts
-	.end
-									
diff --git a/newlib/libc/sys/h8300hms/lseek.S b/newlib/libc/sys/h8300hms/lseek.S
deleted file mode 100644
index 4b3c267..0000000
--- a/newlib/libc/sys/h8300hms/lseek.S
+++ /dev/null
@@ -1,18 +0,0 @@
-;off_t lseek(int fildes, off_t offset, int whence);
-;Integer arguments have to be zero extended.
-
-#include "setarch.h"
-
-	.section .text
-	.align 2
-	.global __lseek
-__lseek:
-#if defined(__H8300H__) || defined(__H8300S__) || defined (__H8300SX__)
-#if __INT_MAX__ == 32767
-	extu.l er0
-	extu.l er2
-#endif
-#endif
-	jsr @@0xc8
-	rts
-	.end
diff --git a/newlib/libc/sys/h8300hms/open.S b/newlib/libc/sys/h8300hms/open.S
deleted file mode 100644
index 0feaab2..0000000
--- a/newlib/libc/sys/h8300hms/open.S
+++ /dev/null
@@ -1,14 +0,0 @@
-;int open(const char *pathname, int flags);
-;Integer arguments have to be zero extended.
-;The second argument is taken from the stack,
-;hence it is not zero extended here.
-
-#include "setarch.h"
-
-	.section .text
-	.align 2
-	.global __open
-__open:
-	jsr @@0xc5
-	rts
-	.end
diff --git a/newlib/libc/sys/h8300hms/read.S b/newlib/libc/sys/h8300hms/read.S
deleted file mode 100644
index 20fc59b..0000000
--- a/newlib/libc/sys/h8300hms/read.S
+++ /dev/null
@@ -1,18 +0,0 @@
-;ssize_t read(int fd, void *buf, size_t count);
-;Integer arguments have to be zero extended.
-
-#include "setarch.h"
-
-	.section .text
-	.align 2
-	.global __read
-__read:
-#if defined(__H8300H__) || defined(__H8300S__) || defined (__H8300SX__)
-#if __INT_MAX__ == 32767
-	extu.l  er0
-#endif
-#endif
-	jsr @@0xc6
-	rts
-	.end
-									
diff --git a/newlib/libc/sys/h8300hms/setarch.h b/newlib/libc/sys/h8300hms/setarch.h
deleted file mode 100644
index 56bdaaf..0000000
--- a/newlib/libc/sys/h8300hms/setarch.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifdef __H8300H__
-#ifdef __NORMAL_MODE__
-	.h8300hn
-#else
-	.h8300h
-#endif
-#endif
-#ifdef __H8300S__
-#ifdef __NORMAL_MODE__
-	.h8300sn
-#else
-	.h8300s
-#endif
-#endif
-#ifdef __H8300SX__
-#ifdef __NORMAL_MODE__
-	.h8300sxn
-#else
-	.h8300sx
-#endif
-#endif
diff --git a/newlib/libc/sys/h8300hms/stat.S b/newlib/libc/sys/h8300hms/stat.S
deleted file mode 100644
index dae23c4..0000000
--- a/newlib/libc/sys/h8300hms/stat.S
+++ /dev/null
@@ -1,12 +0,0 @@
-;int stat(const char *file_name, struct stat *buf);
-
-#include "setarch.h"
-
-	.section .text
-	.align 2
-	.global __stat
-__stat:
-	jsr @@0xca
-	rts
-	.end
-									
diff --git a/newlib/libc/sys/h8300hms/sys/syscall.h b/newlib/libc/sys/h8300hms/sys/syscall.h
deleted file mode 100644
index fba0354..0000000
--- a/newlib/libc/sys/h8300hms/sys/syscall.h
+++ /dev/null
@@ -1 +0,0 @@
-#define	SYS_read	4
diff --git a/newlib/libc/sys/h8300hms/syscalls.c b/newlib/libc/sys/h8300hms/syscalls.c
index b716e62..9f89c55 100644
--- a/newlib/libc/sys/h8300hms/syscalls.c
+++ b/newlib/libc/sys/h8300hms/syscalls.c
@@ -1,14 +1,55 @@
 /* Operating system stubs, set up for the MRI simulator */
 
 #include <_ansi.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <errno.h>
 
+int _DEFUN(_read,(file, ptr, len),
+	   int file _AND
+	   char *ptr _AND
+	   int len)
+{
+  return 0;
+}
+
+
+int _DEFUN(_lseek,(file, ptr, dir),
+	  int file _AND
+	  int ptr _AND
+	  int dir)
+{
+  return 0;
+}
+
+int _DEFUN(_close,(file),
+	  int file)
+{
+  return -1;
+}
+
 int isatty(file)
      int file;
 {
   return 1;
 }
 
+int _DEFUN(_fstat,(file, st),
+	  int file _AND
+	  struct stat *st)
+{
+  st->st_mode = S_IFCHR;
+  return 0;
+}
+
+int
+_open (path, flags)
+     const char *path;
+     int flags;
+{
+  return 0;
+}
+
 int
 _unlink (path)
      const char *path;
diff --git a/newlib/libc/sys/h8300hms/write.S b/newlib/libc/sys/h8300hms/write.S
deleted file mode 100644
index e416b15..0000000
--- a/newlib/libc/sys/h8300hms/write.S
+++ /dev/null
@@ -1,17 +0,0 @@
-;ssize_t write(int fd, const void *buf, size_t count);
-;Integer arguments have to be zero extended.
-
-#include "setarch.h"
-
-	.section .text
-	.align 2
-	.global __write
-__write:
-#if defined(__H8300H__) || defined(__H8300S__) || defined (__H8300SX__)
-#if __INT_MAX__ == 32767
-	extu.l	er0
-#endif
-#endif
-	jsr @@0xc7
-	rts
-	.end
diff --git a/newlib/libc/sys/h8300hms/write.c b/newlib/libc/sys/h8300hms/write.c
new file mode 100644
index 0000000..22fc63d
--- /dev/null
+++ b/newlib/libc/sys/h8300hms/write.c
@@ -0,0 +1,16 @@
+
+
+int _write(file, ptr, len)
+     int file;
+     char *ptr;
+     int len;
+{
+  int todo;
+  
+  for (todo = 0; todo < len; todo++) 
+    {
+      asm("mov.b #0,r1l\n mov.b %0l,r2l\njsr @@0xc4"   :  : "r" (*ptr++)  : "r1", "r2");
+    }
+  return len;
+}
+
diff --git a/newlib/libc/sys/h8500hms/Makefile.in b/newlib/libc/sys/h8500hms/Makefile.in
index d59bf40..46c77a7 100644
--- a/newlib/libc/sys/h8500hms/Makefile.in
+++ b/newlib/libc/sys/h8500hms/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/h8500hms/aclocal.m4 b/newlib/libc/sys/h8500hms/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/h8500hms/aclocal.m4
+++ b/newlib/libc/sys/h8500hms/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/h8500hms/configure b/newlib/libc/sys/h8500hms/configure
index 6392760..dd29e48 100755
--- a/newlib/libc/sys/h8500hms/configure
+++ b/newlib/libc/sys/h8500hms/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am
index de11547..1e11422 100644
--- a/newlib/libc/sys/linux/Makefile.am
+++ b/newlib/libc/sys/linux/Makefile.am
@@ -2,241 +2,41 @@
 
 AUTOMAKE_OPTIONS = cygnus
 
-INCLUDES = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-if ELIX_LEVEL_1
-argp_dir=
-ARGP_LIB=
-else
-argp_dir=argp
-ARGP_LIB=argp/libargp.la
-endif
-
-SUBDIRS = machine \
-	$(argp_dir) \
-	cmath \
-	$(EXTRA_SUBDIRS)\
-	.
-SUBLIBS = \
-	$(ARGP_LIB) \
-	cmath/libcmath.la \
-	$(EXTRA_SUBLIBS) \
-	$(LINUX_MACH_LIB)
-
-GENERAL_SOURCES = \
-	aio.c \
-	brk.c \
-	calloc.c \
-	callocr.c \
-	cfreer.c \
-	cfspeed.c \
-	clock_getres.c \
-	clock_gettime.c \
-	clock_settime.c \
-	flockfile.c \
-	free.c \
-	freer.c \
-	ftok.c \
-	funlockfile.c \
-	getdate.c \
-	getdate_err.c \
-	gethostname.c \
-	getreent.c \
-	ids.c \
-	inode.c \
-	io.c \
-	ipc.c \
-	linux.c \
-	mallinfor.c \
-	mallocr.c \
-	mallstatsr.c \
-	mmap.c \
-	mq_close.c \
-	mq_getattr.c \
-	mq_notify.c \
-	mq_open.c \
-	mq_receive.c \
-	mq_send.c \
-	mq_setattr.c \
-	mq_unlink.c \
-	msize.c \
-	msizer.c \
-	mstats.c \
-	mtrim.c \
-	mtrimr.c \
-	ntp_gettime.c \
-	pread.c \
-	process.c \
-	prof-freq.c \
-	profile.c \
-	psignal.c \
-	pwrite.c \
-	raise.c \
-	realloc.c \
-	reallocr.c \
-	rename.c \
-	resource.c \
-	sched.c \
-	select.c \
-	seteuid.c \
-	sethostname.c \
-	shm_open.c \
-	shm_unlink.c \
-	sig.c \
-	sigaction.c \
-	sigqueue.c \
-	signal.c \
-	siglongjmp.c \
-	sigset.c \
-	sigwait.c \
-	socket.c \
-	sleep.c \
-	strsignal.c \
-	strverscmp.c \
-	sysconf.c \
-	sysctl.c \
-	systat.c \
-	tcdrain.c \
-	tcsendbrk.c \
-	termios.c \
-	time.c \
-	usleep.c \
-	versionsort.c 
-
-ELIX_2_OBJS = \
-	aio64.$(oext) \
-	confstr.$(oext) \
-	ctermid.$(oext) \
-	fclean.$(oext) \
-	fpathconf.$(oext) \
-	fstab.$(oext) \
-	fstatvfs.$(oext) \
-	fstatvfs64.$(oext) \
-	ftw.$(oext) \
-	ftw64.$(oext) \
-	getopt.$(oext) \
-	getopt1.$(oext) \
-	getrlimit64.$(oext) \
-	getwd.$(oext) \
-	io64.$(oext) \
-	malign.$(oext) \
-	malignr.$(oext) \
-	malloptr.$(oext) \
-	mcheck.$(oext) \
-	mntent.$(oext) \
-	mntent_r.$(oext) \
-	pathconf.$(oext) \
-	pread64.$(oext) \
-	pvallocr.$(oext) \
-	pwrite64.$(oext) \
-	readdir64.$(oext) \
-	realpath.$(oext) \
-	scandir64.$(oext) \
-	setrlimit64.$(oext) \
-	statvfs.$(oext) \
-	statvfs64.$(oext) \
-	ttyname_r.$(oext) \
-	utimes.$(oext) \
-	vallocr.$(oext) \
-	versionsort64.$(oext)
-
-ELIX_3_OBJS = \
-	system.$(oext) \
-	wait.$(oext)
-
-ELIX_4_OBJS = \
-	getlogin.$(oext) \
-	getpwent.$(oext) \
-	stack.$(oext)
-
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-if ELIX_LEVEL_2
-LIB_OBJS = $(ELIX_2_OBJS)
-else
-if ELIX_LEVEL_3
-LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS)
-else
-LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS)
-endif
-endif
-endif
+LIB_SOURCES = \
+	brk.c getoptlong.c ids.c inode.c io.c linux.c process.c realpath.c \
+	select.c signal.c systat.c termios.c time.c wait.c
 
 # This will handle both /usr/src/linux-2.4/include/asm/signal.h (in Red Hat Linux 7.1)
 # and also /usr/src/linux/include/asm/signal.h in older versions of Red Hat Linux
-SIGNAL_H = /usr/include/asm/signal.h
+SIGNAL_H = /usr/src/$(shell ls /usr/src/ | grep ^linux | head -n 1)/include/asm/signal.h
 
 liblinux_la_LDFLAGS = -Xcompiler -nostdlib
 
-ADD_OBJS = \
-	malloc.$(oext) \
-	gethostid.$(oext) \
-	sethostid.$(oext) \
-	$(LINUX_MACH_LIB)
-
 if USE_LIBTOOL
 noinst_LTLIBRARIES = liblinux.la
-liblinux_la_SOURCES = $(GENERAL_SOURCES)
-liblinux_la_LIBADD = $(ADD_OBJS) $(LIB_OBJS)
-liblinux_la_DEPENDENCIES = $(ADD_OBJS) $(LIB_OBJS)
-LIBC_COMPILE = $(LTCOMPILE)
+liblinux_la_SOURCES = $(LIB_SOURCES)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(ADD_OBJS) $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(ADD_OBJS) $(LIB_OBJS)
-LIBC_COMPILE = $(COMPILE)
+lib_a_SOURCES = $(LIB_SOURCES)
 noinst_DATA =
-
-lib.a:  $(ADD_OBJS) $(LIB_OBJS) $(lib_a_OBJECTS)
-	rm -f $@
-	rm -rf tmp
-	mkdir tmp
-	cd tmp; \
-	for i in $(SUBLIBS); do \
-	  $(AR) x ../$$i; \
-	done; \
-	$(AR) $(AR_FLAGS) ../$@ *.o
-	$(RANLIB) $@
-	rm -rf tmp
-
 endif # USE_LIBTOOL
 
-objectlist.awk.in: $(noinst_LTLIBRARIES) $(SUBLIBS)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	  do \
-	    echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-	for j in $(SUBLIBS) ; \
-	  do \
-	    export i=`echo $$j | sed -e 's,\(.*\)\/[^\/]*$$,\1,'`; \
-	    if test $$i != "." && test -f $$i/objectlist.awk.in; then \
-	    	cat $$i/objectlist.awk.in >> objectlist.awk.in ; \
-	    fi; \
-	done
-
-all: crt0.o crt1.o
-
-crt0.o: machine/crt0.o
-	rm -f $@
-	ln machine/crt0.o $@ >/dev/null 2>/dev/null || cp machine/crt0.o $@
+include $(srcdir)/../../../Makefile.shared
 
-machine/crt0.o: ; @true
+all: crt0.o
 
-sig.$(oext):	siglist.inc
+signal.$(oext):	siglist.inc
 
 siglist.inc:
-		$(AWK) '{ max = 32 } \
-		  /#define.SIG.*[1-9][0-9]*/ { n[$$3] = $$2 } \
+		$(AWK) '/#define.SIG.*[1-9][0-9]*/ { n[$$3] = $$2 } \
 		  /#define.NSIG.*[1-9][0-9]*/ { max = $$3 } \
 		  /#define.SIGUNUSED/ \
 		    { for (i = 0; i <= max; i++) print "\"" n[i] "\"," }' \
 		    < $(SIGNAL_H) > siglist.inc || \
 		    { rm -f siglist.inc; exit 1; }
 
-AM_CFLAGS = -I $(srcdir)/../../stdio
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/linux/Makefile.in b/newlib/libc/sys/linux/Makefile.in
index ead3582..407fbfc 100644
--- a/newlib/libc/sys/linux/Makefile.in
+++ b/newlib/libc/sys/linux/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,6 +11,7 @@
 # PARTICULAR PURPOSE.
 
 
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -57,37 +58,24 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 AWK = @AWK@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-EXTRA_SUBDIRS = @EXTRA_SUBDIRS@
-EXTRA_SUBLIBS = @EXTRA_SUBLIBS@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBTOOL = @LIBTOOL@
-LINUX_MACH_LIB = @LINUX_MACH_LIB@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
 libm_machine_dir = @libm_machine_dir@
@@ -98,56 +86,26 @@ sys_dir = @sys_dir@
 
 AUTOMAKE_OPTIONS = cygnus
 
-INCLUDES = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
-@ELIX_LEVEL_1_TRUE@argp_dir = 
-@ELIX_LEVEL_1_FALSE@argp_dir = argp
-@ELIX_LEVEL_1_TRUE@ARGP_LIB = 
-@ELIX_LEVEL_1_FALSE@ARGP_LIB = argp/libargp.la
-
-SUBDIRS = machine 	$(argp_dir) 	cmath 	$(EXTRA_SUBDIRS) 	.
-
-SUBLIBS =  	$(ARGP_LIB) 	cmath/libcmath.la 	$(EXTRA_SUBLIBS) 	$(LINUX_MACH_LIB)
-
-
-GENERAL_SOURCES =  	aio.c 	brk.c 	calloc.c 	callocr.c 	cfreer.c 	cfspeed.c 	clock_getres.c 	clock_gettime.c 	clock_settime.c 	flockfile.c 	free.c 	freer.c 	ftok.c 	funlockfile.c 	getdate.c 	getdate_err.c 	gethostname.c 	getreent.c 	ids.c 	inode.c 	io.c 	ipc.c 	linux.c 	mallinfor.c 	mallocr.c 	mallstatsr.c 	mmap.c 	mq_close.c 	mq_getattr.c 	mq_notify.c 	mq_open.c 	mq_receive.c 	mq_send.c 	mq_setattr.c 	mq_unlink.c 	msize.c 	msizer.c 	mstats.c 	mtrim.c 	mtrimr.c 	ntp_gettime.c 	pread.c 	process.c 	prof-freq.c 	profile.c 	psignal.c 	pwrite.c 	raise.c 	realloc.c 	reallocr.c 	rename.c 	resource.c 	sched.c 	select.c 	seteuid.c 	sethostname.c 	shm_open.c 	shm_unlink.c 	sig.c 	sigaction.c 	sigqueue.c 	signal.c 	siglongjmp.c 	sigset.c 	sigwait.c 	socket.c 	sleep.c 	strsignal.c 	strverscmp.c 	sysconf.c 	sysctl.c 	systat.c 	tcdrain.c 	tcsendbrk.c 	termios.c 	time.c 	usleep.c 	versionsort.c 
-
-
-ELIX_2_OBJS =  	aio64.$(oext) 	confstr.$(oext) 	ctermid.$(oext) 	fclean.$(oext) 	fpathconf.$(oext) 	fstab.$(oext) 	fstatvfs.$(oext) 	fstatvfs64.$(oext) 	ftw.$(oext) 	ftw64.$(oext) 	getopt.$(oext) 	getopt1.$(oext) 	getrlimit64.$(oext) 	getwd.$(oext) 	io64.$(oext) 	malign.$(oext) 	malignr.$(oext) 	malloptr.$(oext) 	mcheck.$(oext) 	mntent.$(oext) 	mntent_r.$(oext) 	pathconf.$(oext) 	pread64.$(oext) 	pvallocr.$(oext) 	pwrite64.$(oext) 	readdir64.$(oext) 	realpath.$(oext) 	scandir64.$(oext) 	setrlimit64.$(oext) 	statvfs.$(oext) 	statvfs64.$(oext) 	ttyname_r.$(oext) 	utimes.$(oext) 	vallocr.$(oext) 	versionsort64.$(oext)
+INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
+LIB_SOURCES = \
+	brk.c getoptlong.c ids.c inode.c io.c linux.c process.c realpath.c \
+	select.c signal.c systat.c termios.c time.c wait.c
 
-ELIX_3_OBJS =  	system.$(oext) 	wait.$(oext)
-
-
-ELIX_4_OBJS =  	getlogin.$(oext) 	getpwent.$(oext) 	stack.$(oext)
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS)
 
 # This will handle both /usr/src/linux-2.4/include/asm/signal.h (in Red Hat Linux 7.1)
 # and also /usr/src/linux/include/asm/signal.h in older versions of Red Hat Linux
-SIGNAL_H = /usr/include/asm/signal.h
+SIGNAL_H = /usr/src/$(shell ls /usr/src/ | grep ^linux | head -n 1)/include/asm/signal.h
 
 liblinux_la_LDFLAGS = -Xcompiler -nostdlib
 
-ADD_OBJS =  	malloc.$(oext) 	gethostid.$(oext) 	sethostid.$(oext) 	$(LINUX_MACH_LIB)
-
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = liblinux.la
-@USE_LIBTOOL_TRUE@liblinux_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@liblinux_la_LIBADD = $(ADD_OBJS) $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@liblinux_la_DEPENDENCIES = $(ADD_OBJS) $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@LIBC_COMPILE = $(LTCOMPILE)
-@USE_LIBTOOL_FALSE@LIBC_COMPILE = $(COMPILE)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@liblinux.la
+@USE_LIBTOOL_TRUE@liblinux_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(ADD_OBJS) $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(ADD_OBJS) $(LIB_OBJS)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
 
-AM_CFLAGS = -I $(srcdir)/../../stdio
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -159,60 +117,17 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  aio.$(OBJEXT) brk.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@calloc.$(OBJEXT) callocr.$(OBJEXT) cfreer.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@cfspeed.$(OBJEXT) clock_getres.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@clock_gettime.$(OBJEXT) clock_settime.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@flockfile.$(OBJEXT) free.$(OBJEXT) freer.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ftok.$(OBJEXT) funlockfile.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getdate.$(OBJEXT) getdate_err.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@gethostname.$(OBJEXT) getreent.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ids.$(OBJEXT) inode.$(OBJEXT) io.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ipc.$(OBJEXT) linux.$(OBJEXT) mallinfor.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mallocr.$(OBJEXT) mallstatsr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mmap.$(OBJEXT) mq_close.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mq_getattr.$(OBJEXT) mq_notify.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mq_open.$(OBJEXT) mq_receive.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mq_send.$(OBJEXT) mq_setattr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mq_unlink.$(OBJEXT) msize.$(OBJEXT) msizer.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mstats.$(OBJEXT) mtrim.$(OBJEXT) mtrimr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ntp_gettime.$(OBJEXT) pread.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@process.$(OBJEXT) prof-freq.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@profile.$(OBJEXT) psignal.$(OBJEXT) pwrite.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@raise.$(OBJEXT) realloc.$(OBJEXT) reallocr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@rename.$(OBJEXT) resource.$(OBJEXT) sched.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@select.$(OBJEXT) seteuid.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sethostname.$(OBJEXT) shm_open.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@shm_unlink.$(OBJEXT) sig.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sigaction.$(OBJEXT) sigqueue.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@signal.$(OBJEXT) siglongjmp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sigset.$(OBJEXT) sigwait.$(OBJEXT) socket.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sleep.$(OBJEXT) strsignal.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strverscmp.$(OBJEXT) sysconf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sysctl.$(OBJEXT) systat.$(OBJEXT) tcdrain.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@tcsendbrk.$(OBJEXT) termios.$(OBJEXT) time.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@usleep.$(OBJEXT) versionsort.$(OBJEXT)
+lib_a_LIBADD = 
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  brk.o getoptlong.o ids.o inode.o \
+@USE_LIBTOOL_FALSE@io.o linux.o process.o realpath.o select.o signal.o \
+@USE_LIBTOOL_FALSE@systat.o termios.o time.o wait.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
-@USE_LIBTOOL_TRUE@liblinux_la_OBJECTS =  aio.lo brk.lo calloc.lo \
-@USE_LIBTOOL_TRUE@callocr.lo cfreer.lo cfspeed.lo clock_getres.lo \
-@USE_LIBTOOL_TRUE@clock_gettime.lo clock_settime.lo flockfile.lo \
-@USE_LIBTOOL_TRUE@free.lo freer.lo ftok.lo funlockfile.lo getdate.lo \
-@USE_LIBTOOL_TRUE@getdate_err.lo gethostname.lo getreent.lo ids.lo \
-@USE_LIBTOOL_TRUE@inode.lo io.lo ipc.lo linux.lo mallinfor.lo \
-@USE_LIBTOOL_TRUE@mallocr.lo mallstatsr.lo mmap.lo mq_close.lo \
-@USE_LIBTOOL_TRUE@mq_getattr.lo mq_notify.lo mq_open.lo mq_receive.lo \
-@USE_LIBTOOL_TRUE@mq_send.lo mq_setattr.lo mq_unlink.lo msize.lo \
-@USE_LIBTOOL_TRUE@msizer.lo mstats.lo mtrim.lo mtrimr.lo ntp_gettime.lo \
-@USE_LIBTOOL_TRUE@pread.lo process.lo prof-freq.lo profile.lo \
-@USE_LIBTOOL_TRUE@psignal.lo pwrite.lo raise.lo realloc.lo reallocr.lo \
-@USE_LIBTOOL_TRUE@rename.lo resource.lo sched.lo select.lo seteuid.lo \
-@USE_LIBTOOL_TRUE@sethostname.lo shm_open.lo shm_unlink.lo sig.lo \
-@USE_LIBTOOL_TRUE@sigaction.lo sigqueue.lo signal.lo siglongjmp.lo \
-@USE_LIBTOOL_TRUE@sigset.lo sigwait.lo socket.lo sleep.lo strsignal.lo \
-@USE_LIBTOOL_TRUE@strverscmp.lo sysconf.lo sysctl.lo systat.lo \
-@USE_LIBTOOL_TRUE@tcdrain.lo tcsendbrk.lo termios.lo time.lo usleep.lo \
-@USE_LIBTOOL_TRUE@versionsort.lo
+liblinux_la_LIBADD = 
+@USE_LIBTOOL_TRUE@liblinux_la_OBJECTS =  brk.lo getoptlong.lo ids.lo \
+@USE_LIBTOOL_TRUE@inode.lo io.lo linux.lo process.lo realpath.lo \
+@USE_LIBTOOL_TRUE@select.lo signal.lo systat.lo termios.lo time.lo \
+@USE_LIBTOOL_TRUE@wait.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -227,14 +142,13 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
-DIST_SUBDIRS =  machine argp cmath @EXTRA_SUBDIRS@ .
 SOURCES = $(lib_a_SOURCES) $(liblinux_la_SOURCES)
 OBJECTS = $(lib_a_OBJECTS) $(liblinux_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+.SUFFIXES: .S .c .lo .o .s
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
@@ -242,8 +156,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -263,11 +176,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -276,7 +184,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -304,6 +211,11 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
+lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
+	-rm -f lib.a
+	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
+	$(RANLIB) lib.a
+
 mostlyclean-noinstLTLIBRARIES:
 
 clean-noinstLTLIBRARIES:
@@ -316,61 +228,6 @@ maintainer-clean-noinstLTLIBRARIES:
 liblinux.la: $(liblinux_la_OBJECTS) $(liblinux_la_DEPENDENCIES)
 	$(LINK)  $(liblinux_la_LDFLAGS) $(liblinux_la_OBJECTS) $(liblinux_la_LIBADD) $(LIBS)
 
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -381,14 +238,9 @@ ID: $(HEADERS) $(SOURCES) $(LISP)
 	here=`pwd` && cd $(srcdir) \
 	  && mkid -f$$here/ID $$unique $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
 	  awk '    { files[$$0] = 1; } \
@@ -453,43 +305,32 @@ distdir: $(DISTFILES)
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-	for subdir in $(DIST_SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
 info-am:
-info: info-recursive
+info: info-am
 dvi-am:
-dvi: dvi-recursive
+dvi: dvi-am
 check-am:
-check: check-recursive
+check: check-am
 installcheck-am:
-installcheck: installcheck-recursive
+installcheck: installcheck-am
 install-info-am: 
-install-info: install-info-recursive
+install-info: install-info-am
 install-exec-am:
-install-exec: install-exec-recursive
+install-exec: install-exec-am
 
 install-data-am:
-install-data: install-data-recursive
+install-data: install-data-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
+install: install-am
 uninstall-am:
-uninstall: uninstall-recursive
+uninstall: uninstall-am
 all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-recursive
+all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
+installdirs:
 
 
 mostlyclean-generic:
@@ -505,20 +346,20 @@ mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
 		mostlyclean-tags mostlyclean-generic
 
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
 
 clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
 		clean-noinstLTLIBRARIES clean-tags clean-generic \
 		mostlyclean-am
 
-clean: clean-recursive
+clean: clean-am
 
 distclean-am:  distclean-noinstLIBRARIES distclean-compile \
 		distclean-libtool distclean-noinstLTLIBRARIES \
 		distclean-tags distclean-generic clean-am
 	-rm -f libtool
 
-distclean: distclean-recursive
+distclean: distclean-am
 	-rm -f config.status
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
@@ -529,7 +370,7 @@ maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-am
 	-rm -f config.status
 
 .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
@@ -538,60 +379,28 @@ mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
 distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs-am installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
-
-
-@USE_LIBTOOL_FALSE@lib.a:  $(ADD_OBJS) $(LIB_OBJS) $(lib_a_OBJECTS)
-@USE_LIBTOOL_FALSE@	rm -f $@
-@USE_LIBTOOL_FALSE@	rm -rf tmp
-@USE_LIBTOOL_FALSE@	mkdir tmp
-@USE_LIBTOOL_FALSE@	cd tmp; \
-@USE_LIBTOOL_FALSE@	for i in $(SUBLIBS); do \
-@USE_LIBTOOL_FALSE@	  $(AR) x ../$$i; \
-@USE_LIBTOOL_FALSE@	done; \
-@USE_LIBTOOL_FALSE@	$(AR) $(AR_FLAGS) ../$@ *.o
-@USE_LIBTOOL_FALSE@	$(RANLIB) $@
-@USE_LIBTOOL_FALSE@	rm -rf tmp
-
-objectlist.awk.in: $(noinst_LTLIBRARIES) $(SUBLIBS)
+maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-info-am install-info \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+objectlist.awk.in: $(noinst_LTLIBRARIES)
 	-rm -f objectlist.awk.in
 	for i in `ls *.lo` ; \
-	  do \
-	    echo $$i `pwd`/$$i >> objectlist.awk.in ; \
+	do \
+	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
 	done
-	for j in $(SUBLIBS) ; \
-	  do \
-	    export i=`echo $$j | sed -e 's,\(.*\)\/[^\/]*$$,\1,'`; \
-	    if test $$i != "." && test -f $$i/objectlist.awk.in; then \
-	    	cat $$i/objectlist.awk.in >> objectlist.awk.in ; \
-	    fi; \
-	done
-
-all: crt0.o crt1.o
-
-crt0.o: machine/crt0.o
-	rm -f $@
-	ln machine/crt0.o $@ >/dev/null 2>/dev/null || cp machine/crt0.o $@
 
-machine/crt0.o: ; @true
+all: crt0.o
 
-sig.$(oext):	siglist.inc
+signal.$(oext):	siglist.inc
 
 siglist.inc:
-		$(AWK) '{ max = 32 } \
-		  /#define.SIG.*[1-9][0-9]*/ { n[$$3] = $$2 } \
+		$(AWK) '/#define.SIG.*[1-9][0-9]*/ { n[$$3] = $$2 } \
 		  /#define.NSIG.*[1-9][0-9]*/ { max = $$3 } \
 		  /#define.SIGUNUSED/ \
 		    { for (i = 0; i <= max; i++) print "\"" n[i] "\"," }' \
diff --git a/newlib/libc/sys/linux/aclocal.m4 b/newlib/libc/sys/linux/aclocal.m4
index 35519ac..a5208f1 100644
--- a/newlib/libc/sys/linux/aclocal.m4
+++ b/newlib/libc/sys/linux/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,60 +284,41 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
 
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
+
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
 # Save cache, so that ltconfig can load it
 AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
 AC_CACHE_LOAD
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -431,43 +329,27 @@ AC_SUBST(LIBTOOL)dnl
 exec 5>>./config.log
 ])
 
-AC_DEFUN([AC_LIBTOOL_SETUP],
+AC_DEFUN(AC_LIBTOOL_SETUP,
 [AC_PREREQ(2.13)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 AC_REQUIRE([AC_PROG_NM])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
 [libtool_flags="$libtool_flags --enable-dlopen"])
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
@@ -477,20 +359,14 @@ AC_ARG_ENABLE(libtool-lock,
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -505,31 +381,12 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -537,56 +394,33 @@ ia64-*-hpux*)
   ;;
 
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+[*-*-cygwin* | *-*-mingw*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  ])
+])
 esac
 ])
 
 # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
 
 # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
 
 # AC_ENABLE_SHARED - implement the --enable-shared flag
 # Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
 <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -605,21 +439,21 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
 # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)])
 
 # AC_ENABLE_STATIC - implement the --enable-static flag
 # Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
 <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -638,8 +472,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])
 
 # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_STATIC(no)])
 
 
@@ -647,14 +480,14 @@ AC_ENABLE_STATIC(no)])
 # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(fast-install,
 changequote(<<, >>)dnl
 <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -672,98 +505,12 @@ esac],
 enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_FAST_INSTALL(no)])
 
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
 # AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -771,20 +518,16 @@ AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
+changequote(,)dnl
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
@@ -806,17 +549,17 @@ elif test "$with_gnu_ld" = yes; then
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL(lt_cv_path_LD,
+AC_CACHE_VAL(ac_cv_path_LD,
 [if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -825,9 +568,9 @@ AC_CACHE_VAL(lt_cv_path_LD,
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -837,240 +580,56 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_PROG_LD_GNU
 ])
 
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
 ])
 
-
 # AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
+AC_CACHE_VAL(ac_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi])
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
 ])
 
 # AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
+AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
+case "$host" in
+*-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
@@ -1084,39 +643,33 @@ esac
 ])
 
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case "$enable_ltdl_convenience" in
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   AC_CHECK_LIB(ltdl, main,
   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
   [if test x"$enable_ltdl_install" = xno; then
@@ -1127,8 +680,8 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
@@ -1136,91 +689,15 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   fi
 ])
 
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
 dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
 
 dnl This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])dnl
 
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libc/sys/linux/aio.c b/newlib/libc/sys/linux/aio.c
deleted file mode 100644
index 9a2e4ce..0000000
--- a/newlib/libc/sys/linux/aio.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* libc/sys/linux/aio.c - asychronous I/O */
-
-/* Copyright 2002, Red Hat Inc. */
-
-/* Currently asynchronous I/O is not implemented. */
-
-#define _GNU_SOURCE 1
-
-#include <sys/types.h>
-#include <aio.h>
-#include <errno.h>
-
-int
-aio_cancel (int fd, struct aiocb *cb)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-aio_error (const struct aiocb *cb)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-aio_fsync (int op, struct aiocb *cb)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-aio_read (struct aiocb *cb)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-ssize_t
-aio_return (struct aiocb *cb)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-aio_suspend (const struct aiocb *const list[], int nent,
-             const struct timespec *timeout)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-aio_write (struct aiocb *cb)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-lio_listio (int mode, struct aiocb * const list[], int nent,
-            struct sigevent *sig)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4
-void 
-aio_init (const struct aioinit *INIT)
-{
-  errno = ENOSYS;
-}
-#endif
diff --git a/newlib/libc/sys/linux/aio64.c b/newlib/libc/sys/linux/aio64.c
deleted file mode 100644
index 5a9cdd9..0000000
--- a/newlib/libc/sys/linux/aio64.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* libc/sys/linux/aio64.c - asychronous I/O */
-
-/* Copyright 2002, Red Hat Inc. */
-
-/* Currently asynchronous I/O is not implemented. */
-
-#include <sys/types.h>
-#include <aio.h>
-#include <errno.h>
-
-int
-aio_cancel64 (int fd, struct aiocb64 *cb)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-aio_error64 (const struct aiocb64 *cb)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-aio_fsync64 (int op, struct aiocb64 *cb)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-aio_read64 (struct aiocb64 *cb)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-ssize_t
-aio_return64 (struct aiocb64 *cb)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-aio_suspend64 (const struct aiocb64 *const list[], int nent,
-             const struct timespec *timeout)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-aio_write64 (struct aiocb64 *cb)
-{
-  errno = ENOSYS;
-  return -1;
-}
-
-int
-lio_listio64 (int mode, struct aiocb64 * const list[], int nent,
-              struct sigevent *sig)
-{
-  errno = ENOSYS;
-  return -1;
-}
diff --git a/newlib/libc/sys/linux/argp/Makefile.am b/newlib/libc/sys/linux/argp/Makefile.am
deleted file mode 100644
index 95869fe..0000000
--- a/newlib/libc/sys/linux/argp/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES = \
-	argp-ba.c  argp-eexst.c  argp-fmtstream.c  argp-fs-xinl.c \
-	argp-help.c  argp-parse.c  argp-pv.c  argp-pvh.c  argp-xinl.c
-
-libargp_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libargp.la
-libargp_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(LIB_SOURCES)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../../../Makefile.shared
diff --git a/newlib/libc/sys/linux/argp/Makefile.in b/newlib/libc/sys/linux/argp/Makefile.in
deleted file mode 100644
index e04ae04..0000000
--- a/newlib/libc/sys/linux/argp/Makefile.in
+++ /dev/null
@@ -1,367 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-EXTRA_SUBDIRS = @EXTRA_SUBDIRS@
-EXTRA_SUBLIBS = @EXTRA_SUBLIBS@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LINUX_MACH_LIB = @LINUX_MACH_LIB@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES =  	argp-ba.c  argp-eexst.c  argp-fmtstream.c  argp-fs-xinl.c 	argp-help.c  argp-parse.c  argp-pv.c  argp-pvh.c  argp-xinl.c
-
-
-libargp_la_LDFLAGS = -Xcompiler -nostdlib
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libargp.la
-@USE_LIBTOOL_TRUE@libargp_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  argp-ba.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@argp-eexst.$(OBJEXT) argp-fmtstream.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@argp-fs-xinl.$(OBJEXT) argp-help.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@argp-parse.$(OBJEXT) argp-pv.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@argp-pvh.$(OBJEXT) argp-xinl.$(OBJEXT)
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-libargp_la_LIBADD = 
-@USE_LIBTOOL_TRUE@libargp_la_OBJECTS =  argp-ba.lo argp-eexst.lo \
-@USE_LIBTOOL_TRUE@argp-fmtstream.lo argp-fs-xinl.lo argp-help.lo \
-@USE_LIBTOOL_TRUE@argp-parse.lo argp-pv.lo argp-pvh.lo argp-xinl.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(libargp_la_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(libargp_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus argp/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-libargp.la: $(libargp_la_OBJECTS) $(libargp_la_DEPENDENCIES)
-	$(LINK)  $(libargp_la_LDFLAGS) $(libargp_la_OBJECTS) $(libargp_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = argp
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-noinstLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
-distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/linux/argp/argp-ba.c b/newlib/libc/sys/linux/argp/argp-ba.c
deleted file mode 100644
index f5270c8..0000000
--- a/newlib/libc/sys/linux/argp/argp-ba.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Default definition for ARGP_PROGRAM_BUG_ADDRESS.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* If set by the user program, it should point to string that is the
-   bug-reporting address for the program.  It will be printed by argp_help if
-   the ARGP_HELP_BUG_ADDR flag is set (as it is by various standard help
-   messages), embedded in a sentence that says something like `Report bugs to
-   ADDR.'.  */
-const char *argp_program_bug_address;
diff --git a/newlib/libc/sys/linux/argp/argp-eexst.c b/newlib/libc/sys/linux/argp/argp-eexst.c
deleted file mode 100644
index a94c346..0000000
--- a/newlib/libc/sys/linux/argp/argp-eexst.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Default definition for ARGP_ERR_EXIT_STATUS
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <sysexits.h>
-
-#include <argp.h>
-
-/* The exit status that argp will use when exiting due to a parsing error.
-   If not defined or set by the user program, this defaults to EX_USAGE from
-   <sysexits.h>.  */
-error_t argp_err_exit_status = EX_USAGE;
diff --git a/newlib/libc/sys/linux/argp/argp-fmtstream.c b/newlib/libc/sys/linux/argp/argp-fmtstream.c
deleted file mode 100644
index f783b80..0000000
--- a/newlib/libc/sys/linux/argp/argp-fmtstream.c
+++ /dev/null
@@ -1,430 +0,0 @@
-/* Word-wrapping and line-truncating streams
-   Copyright (C) 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* This package emulates glibc `line_wrap_stream' semantics for systems that
-   don't have that.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <ctype.h>
-
-#include "argp-fmtstream.h"
-#include "argp-namefrob.h"
-
-#ifndef ARGP_FMTSTREAM_USE_LINEWRAP
-
-#ifndef isblank
-#define isblank(ch) ((ch)==' ' || (ch)=='\t')
-#endif
-
-#if defined _LIBC && defined USE_IN_LIBIO
-# include <wchar.h>
-# include <libio/libioP.h>
-# define __vsnprintf(s, l, f, a) _IO_vsnprintf (s, l, f, a)
-#endif
-
-#define INIT_BUF_SIZE 200
-#define PRINTF_SIZE_GUESS 150
-
-/* Return an argp_fmtstream that outputs to STREAM, and which prefixes lines
-   written on it with LMARGIN spaces and limits them to RMARGIN columns
-   total.  If WMARGIN >= 0, words that extend past RMARGIN are wrapped by
-   replacing the whitespace before them with a newline and WMARGIN spaces.
-   Otherwise, chars beyond RMARGIN are simply dropped until a newline.
-   Returns NULL if there was an error.  */
-argp_fmtstream_t
-__argp_make_fmtstream (FILE *stream,
-		       size_t lmargin, size_t rmargin, ssize_t wmargin)
-{
-  argp_fmtstream_t fs;
-
-  fs = (struct argp_fmtstream *) malloc (sizeof (struct argp_fmtstream));
-  if (fs != NULL)
-    {
-      fs->stream = stream;
-
-      fs->lmargin = lmargin;
-      fs->rmargin = rmargin;
-      fs->wmargin = wmargin;
-      fs->point_col = 0;
-      fs->point_offs = 0;
-
-      fs->buf = (char *) malloc (INIT_BUF_SIZE);
-      if (! fs->buf)
-	{
-	  free (fs);
-	  fs = 0;
-	}
-      else
-	{
-	  fs->p = fs->buf;
-	  fs->end = fs->buf + INIT_BUF_SIZE;
-	}
-    }
-
-  return fs;
-}
-#ifdef weak_alias
-weak_alias (__argp_make_fmtstream, argp_make_fmtstream)
-#endif
-
-/* Flush FS to its stream, and free it (but don't close the stream).  */
-void
-__argp_fmtstream_free (argp_fmtstream_t fs)
-{
-  __argp_fmtstream_update (fs);
-  if (fs->p > fs->buf)
-    {
-#ifdef USE_IN_LIBIO
-      if (_IO_fwide (fs->stream, 0) > 0)
-	__fwprintf (fs->stream, L"%.*s", (int) (fs->p - fs->buf), fs->buf);
-      else
-#endif
-	fwrite (fs->buf, 1, fs->p - fs->buf, fs->stream);
-    }
-  free (fs->buf);
-  free (fs);
-}
-#ifdef weak_alias
-weak_alias (__argp_fmtstream_free, argp_fmtstream_free)
-#endif
-
-/* Process FS's buffer so that line wrapping is done from POINT_OFFS to the
-   end of its buffer.  This code is mostly from glibc stdio/linewrap.c.  */
-void
-__argp_fmtstream_update (argp_fmtstream_t fs)
-{
-  char *buf, *nl;
-  size_t len;
-
-  /* Scan the buffer for newlines.  */
-  buf = fs->buf + fs->point_offs;
-  while (buf < fs->p)
-    {
-      size_t r;
-
-      if (fs->point_col == 0 && fs->lmargin != 0)
-	{
-	  /* We are starting a new line.  Print spaces to the left margin.  */
-	  const size_t pad = fs->lmargin;
-	  if (fs->p + pad < fs->end)
-	    {
-	      /* We can fit in them in the buffer by moving the
-		 buffer text up and filling in the beginning.  */
-	      memmove (buf + pad, buf, fs->p - buf);
-	      fs->p += pad; /* Compensate for bigger buffer. */
-	      memset (buf, ' ', pad); /* Fill in the spaces.  */
-	      buf += pad; /* Don't bother searching them.  */
-	    }
-	  else
-	    {
-	      /* No buffer space for spaces.  Must flush.  */
-	      size_t i;
-	      for (i = 0; i < pad; i++)
-		{
-#ifdef USE_IN_LIBIO
-		  if (_IO_fwide (fs->stream, 0) > 0)
-		    putwc_unlocked (L' ', fs->stream);
-		  else
-#endif
-		    putc_unlocked (' ', fs->stream);
-		}
-	    }
-	  fs->point_col = pad;
-	}
-
-      len = fs->p - buf;
-      nl = memchr (buf, '\n', len);
-
-      if (fs->point_col < 0)
-	fs->point_col = 0;
-
-      if (!nl)
-	{
-	  /* The buffer ends in a partial line.  */
-
-	  if (fs->point_col + len < fs->rmargin)
-	    {
-	      /* The remaining buffer text is a partial line and fits
-		 within the maximum line width.  Advance point for the
-		 characters to be written and stop scanning.  */
-	      fs->point_col += len;
-	      break;
-	    }
-	  else
-	    /* Set the end-of-line pointer for the code below to
-	       the end of the buffer.  */
-	    nl = fs->p;
-	}
-      else if (fs->point_col + (nl - buf) < (ssize_t) fs->rmargin)
-	{
-	  /* The buffer contains a full line that fits within the maximum
-	     line width.  Reset point and scan the next line.  */
-	  fs->point_col = 0;
-	  buf = nl + 1;
-	  continue;
-	}
-
-      /* This line is too long.  */
-      r = fs->rmargin - 1;
-
-      if (fs->wmargin < 0)
-	{
-	  /* Truncate the line by overwriting the excess with the
-	     newline and anything after it in the buffer.  */
-	  if (nl < fs->p)
-	    {
-	      memmove (buf + (r - fs->point_col), nl, fs->p - nl);
-	      fs->p -= buf + (r - fs->point_col) - nl;
-	      /* Reset point for the next line and start scanning it.  */
-	      fs->point_col = 0;
-	      buf += r + 1; /* Skip full line plus \n. */
-	    }
-	  else
-	    {
-	      /* The buffer ends with a partial line that is beyond the
-		 maximum line width.  Advance point for the characters
-		 written, and discard those past the max from the buffer.  */
-	      fs->point_col += len;
-	      fs->p -= fs->point_col - r;
-	      break;
-	    }
-	}
-      else
-	{
-	  /* Do word wrap.  Go to the column just past the maximum line
-	     width and scan back for the beginning of the word there.
-	     Then insert a line break.  */
-
-	  char *p, *nextline;
-	  int i;
-
-	  p = buf + (r + 1 - fs->point_col);
-	  while (p >= buf && !isblank (*p))
-	    --p;
-	  nextline = p + 1;	/* This will begin the next line.  */
-
-	  if (nextline > buf)
-	    {
-	      /* Swallow separating blanks.  */
-	      if (p >= buf)
-		do
-		  --p;
-		while (p >= buf && isblank (*p));
-	      nl = p + 1;	/* The newline will replace the first blank. */
-	    }
-	  else
-	    {
-	      /* A single word that is greater than the maximum line width.
-		 Oh well.  Put it on an overlong line by itself.  */
-	      p = buf + (r + 1 - fs->point_col);
-	      /* Find the end of the long word.  */
-	      do
-		++p;
-	      while (p < nl && !isblank (*p));
-	      if (p == nl)
-		{
-		  /* It already ends a line.  No fussing required.  */
-		  fs->point_col = 0;
-		  buf = nl + 1;
-		  continue;
-		}
-	      /* We will move the newline to replace the first blank.  */
-	      nl = p;
-	      /* Swallow separating blanks.  */
-	      do
-		++p;
-	      while (isblank (*p));
-	      /* The next line will start here.  */
-	      nextline = p;
-	    }
-
-	  /* Note: There are a bunch of tests below for
-	     NEXTLINE == BUF + LEN + 1; this case is where NL happens to fall
-	     at the end of the buffer, and NEXTLINE is in fact empty (and so
-	     we need not be careful to maintain its contents).  */
-
-	  if (nextline == buf + len + 1
-	      ? fs->end - nl < fs->wmargin + 1
-	      : nextline - (nl + 1) < fs->wmargin)
-	    {
-	      /* The margin needs more blanks than we removed.  */
-	      if (fs->end - fs->p > fs->wmargin + 1)
-		/* Make some space for them.  */
-		{
-		  size_t mv = fs->p - nextline;
-		  memmove (nl + 1 + fs->wmargin, nextline, mv);
-		  nextline = nl + 1 + fs->wmargin;
-		  len = nextline + mv - buf;
-		  *nl++ = '\n';
-		}
-	      else
-		/* Output the first line so we can use the space.  */
-		{
-#ifdef USE_IN_LIBIO
-		  if (_IO_fwide (fs->stream, 0) > 0)
-		    __fwprintf (fs->stream, L"%.*s\n",
-				(int) (nl - fs->buf), fs->buf);
-		  else
-#endif
-		    {
-		      if (nl > fs->buf)
-			fwrite (fs->buf, 1, nl - fs->buf, fs->stream);
-		      putc_unlocked ('\n', fs->stream);
-		    }
-		  len += buf - fs->buf;
-		  nl = buf = fs->buf;
-		}
-	    }
-	  else
-	    /* We can fit the newline and blanks in before
-	       the next word.  */
-	    *nl++ = '\n';
-
-	  if (nextline - nl >= fs->wmargin
-	      || (nextline == buf + len + 1 && fs->end - nextline >= fs->wmargin))
-	    /* Add blanks up to the wrap margin column.  */
-	    for (i = 0; i < fs->wmargin; ++i)
-	      *nl++ = ' ';
-	  else
-	    for (i = 0; i < fs->wmargin; ++i)
-#ifdef USE_IN_LIBIO
-	      if (_IO_fwide (fs->stream, 0) > 0)
-		putwc_unlocked (L' ', fs->stream);
-	      else
-#endif
-		putc_unlocked (' ', fs->stream);
-
-	  /* Copy the tail of the original buffer into the current buffer
-	     position.  */
-	  if (nl < nextline)
-	    memmove (nl, nextline, buf + len - nextline);
-	  len -= nextline - buf;
-
-	  /* Continue the scan on the remaining lines in the buffer.  */
-	  buf = nl;
-
-	  /* Restore bufp to include all the remaining text.  */
-	  fs->p = nl + len;
-
-	  /* Reset the counter of what has been output this line.  If wmargin
-	     is 0, we want to avoid the lmargin getting added, so we set
-	     point_col to a magic value of -1 in that case.  */
-	  fs->point_col = fs->wmargin ? fs->wmargin : -1;
-	}
-    }
-
-  /* Remember that we've scanned as far as the end of the buffer.  */
-  fs->point_offs = fs->p - fs->buf;
-}
-
-/* Ensure that FS has space for AMOUNT more bytes in its buffer, either by
-   growing the buffer, or by flushing it.  True is returned iff we succeed. */
-int
-__argp_fmtstream_ensure (struct argp_fmtstream *fs, size_t amount)
-{
-  if ((size_t) (fs->end - fs->p) < amount)
-    {
-      ssize_t wrote;
-
-      /* Flush FS's buffer.  */
-      __argp_fmtstream_update (fs);
-
-#ifdef USE_IN_LIBIO
-      if (_IO_fwide (fs->stream, 0) > 0)
-	{
-	  __fwprintf (fs->stream, L"%.*s", (int) (fs->p - fs->buf), fs->buf);
-	  wrote = fs->p - fs->buf;
-	}
-      else
-#endif
-	wrote = fwrite (fs->buf, 1, fs->p - fs->buf, fs->stream);
-      if (wrote == fs->p - fs->buf)
-	{
-	  fs->p = fs->buf;
-	  fs->point_offs = 0;
-	}
-      else
-	{
-	  fs->p -= wrote;
-	  fs->point_offs -= wrote;
-	  memmove (fs->buf, fs->buf + wrote, fs->p - fs->buf);
-	  return 0;
-	}
-
-      if ((size_t) (fs->end - fs->buf) < amount)
-	/* Gotta grow the buffer.  */
-	{
-	  size_t new_size = fs->end - fs->buf + amount;
-	  char *new_buf = realloc (fs->buf, new_size);
-
-	  if (! new_buf)
-	    {
-	      __set_errno (ENOMEM);
-	      return 0;
-	    }
-
-	  fs->buf = new_buf;
-	  fs->end = new_buf + new_size;
-	  fs->p = fs->buf;
-	}
-    }
-
-  return 1;
-}
-
-ssize_t
-__argp_fmtstream_printf (struct argp_fmtstream *fs, const char *fmt, ...)
-{
-  int out;
-  size_t avail;
-  size_t size_guess = PRINTF_SIZE_GUESS; /* How much space to reserve. */
-
-  do
-    {
-      va_list args;
-
-      if (! __argp_fmtstream_ensure (fs, size_guess))
-	return -1;
-
-      va_start (args, fmt);
-      avail = fs->end - fs->p;
-      out = __vsnprintf (fs->p, avail, fmt, args);
-      va_end (args);
-      if (out >= avail)
-	size_guess = out + 1;
-    }
-  while (out >= avail);
-
-  fs->p += out;
-
-  return out;
-}
-#ifdef weak_alias
-weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf)
-#endif
-
-#endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */
diff --git a/newlib/libc/sys/linux/argp/argp-fmtstream.h b/newlib/libc/sys/linux/argp/argp-fmtstream.h
deleted file mode 100644
index 7a291e2..0000000
--- a/newlib/libc/sys/linux/argp/argp-fmtstream.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/* Word-wrapping and line-truncating streams.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* This package emulates glibc `line_wrap_stream' semantics for systems that
-   don't have that.  If the system does have it, it is just a wrapper for
-   that.  This header file is only used internally while compiling argp, and
-   shouldn't be installed.  */
-
-#ifndef _ARGP_FMTSTREAM_H
-#define _ARGP_FMTSTREAM_H
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#if    (_LIBC - 0 && !defined (USE_IN_LIBIO)) \
-    || (defined (__GNU_LIBRARY__) && defined (HAVE_LINEWRAP_H))
-/* line_wrap_stream is available, so use that.  */
-#define ARGP_FMTSTREAM_USE_LINEWRAP
-#endif
-
-#ifdef ARGP_FMTSTREAM_USE_LINEWRAP
-/* Just be a simple wrapper for line_wrap_stream; the semantics are
-   *slightly* different, as line_wrap_stream doesn't actually make a new
-   object, it just modifies the given stream (reversibly) to do
-   line-wrapping.  Since we control who uses this code, it doesn't matter.  */
-
-#include <linewrap.h>
-
-typedef FILE *argp_fmtstream_t;
-
-#define argp_make_fmtstream line_wrap_stream
-#define __argp_make_fmtstream line_wrap_stream
-#define argp_fmtstream_free line_unwrap_stream
-#define __argp_fmtstream_free line_unwrap_stream
-
-#define __argp_fmtstream_putc(fs,ch) putc(ch,fs)
-#define argp_fmtstream_putc(fs,ch) putc(ch,fs)
-#define __argp_fmtstream_puts(fs,str) fputs(str,fs)
-#define argp_fmtstream_puts(fs,str) fputs(str,fs)
-#define __argp_fmtstream_write(fs,str,len) fwrite(str,1,len,fs)
-#define argp_fmtstream_write(fs,str,len) fwrite(str,1,len,fs)
-#define __argp_fmtstream_printf fprintf
-#define argp_fmtstream_printf fprintf
-
-#define __argp_fmtstream_lmargin line_wrap_lmargin
-#define argp_fmtstream_lmargin line_wrap_lmargin
-#define __argp_fmtstream_set_lmargin line_wrap_set_lmargin
-#define argp_fmtstream_set_lmargin line_wrap_set_lmargin
-#define __argp_fmtstream_rmargin line_wrap_rmargin
-#define argp_fmtstream_rmargin line_wrap_rmargin
-#define __argp_fmtstream_set_rmargin line_wrap_set_rmargin
-#define argp_fmtstream_set_rmargin line_wrap_set_rmargin
-#define __argp_fmtstream_wmargin line_wrap_wmargin
-#define argp_fmtstream_wmargin line_wrap_wmargin
-#define __argp_fmtstream_set_wmargin line_wrap_set_wmargin
-#define argp_fmtstream_set_wmargin line_wrap_set_wmargin
-#define __argp_fmtstream_point line_wrap_point
-#define argp_fmtstream_point line_wrap_point
-
-#else /* !ARGP_FMTSTREAM_USE_LINEWRAP */
-/* Guess we have to define our own version.  */
-
-#ifndef __const
-#define __const const
-#endif
-
-struct argp_fmtstream
-{
-  FILE *stream;			/* The stream we're outputting to.  */
-
-  size_t lmargin, rmargin;	/* Left and right margins.  */
-  ssize_t wmargin;		/* Margin to wrap to, or -1 to truncate.  */
-
-  /* Point in buffer to which we've processed for wrapping, but not output.  */
-  size_t point_offs;
-  /* Output column at POINT_OFFS, or -1 meaning 0 but don't add lmargin.  */
-  ssize_t point_col;
-
-  char *buf;			/* Output buffer.  */
-  char *p;			/* Current end of text in BUF. */
-  char *end;			/* Absolute end of BUF.  */
-};
-
-typedef struct argp_fmtstream *argp_fmtstream_t;
-
-/* Return an argp_fmtstream that outputs to STREAM, and which prefixes lines
-   written on it with LMARGIN spaces and limits them to RMARGIN columns
-   total.  If WMARGIN >= 0, words that extend past RMARGIN are wrapped by
-   replacing the whitespace before them with a newline and WMARGIN spaces.
-   Otherwise, chars beyond RMARGIN are simply dropped until a newline.
-   Returns NULL if there was an error.  */
-extern argp_fmtstream_t __argp_make_fmtstream (FILE *__stream,
-					       size_t __lmargin,
-					       size_t __rmargin,
-					       ssize_t __wmargin);
-extern argp_fmtstream_t argp_make_fmtstream (FILE *__stream,
-					     size_t __lmargin,
-					     size_t __rmargin,
-					     ssize_t __wmargin);
-
-/* Flush __FS to its stream, and free it (but don't close the stream).  */
-extern void __argp_fmtstream_free (argp_fmtstream_t __fs);
-extern void argp_fmtstream_free (argp_fmtstream_t __fs);
-
-extern ssize_t __argp_fmtstream_printf (argp_fmtstream_t __fs,
-				       __const char *__fmt, ...)
-     __attribute__ ((__format__ (printf, 2, 3)));
-extern ssize_t argp_fmtstream_printf (argp_fmtstream_t __fs,
-				      __const char *__fmt, ...)
-     __attribute__ ((__format__ (printf, 2, 3)));
-
-extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
-extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
-
-extern int __argp_fmtstream_puts (argp_fmtstream_t __fs, __const char *__str);
-extern int argp_fmtstream_puts (argp_fmtstream_t __fs, __const char *__str);
-
-extern size_t __argp_fmtstream_write (argp_fmtstream_t __fs,
-				      __const char *__str, size_t __len);
-extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
-				    __const char *__str, size_t __len);
-
-/* Access macros for various bits of state.  */
-#define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
-#define argp_fmtstream_rmargin(__fs) ((__fs)->rmargin)
-#define argp_fmtstream_wmargin(__fs) ((__fs)->wmargin)
-#define __argp_fmtstream_lmargin argp_fmtstream_lmargin
-#define __argp_fmtstream_rmargin argp_fmtstream_rmargin
-#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
-
-/* Set __FS's left margin to LMARGIN and return the old value.  */
-extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
-					  size_t __lmargin);
-extern size_t __argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
-					    size_t __lmargin);
-
-/* Set __FS's right margin to __RMARGIN and return the old value.  */
-extern size_t argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
-					  size_t __rmargin);
-extern size_t __argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
-					    size_t __rmargin);
-
-/* Set __FS's wrap margin to __WMARGIN and return the old value.  */
-extern size_t argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
-					  size_t __wmargin);
-extern size_t __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
-					    size_t __wmargin);
-
-/* Return the column number of the current output point in __FS.  */
-extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
-extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
-
-/* Internal routines.  */
-extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
-extern void __argp_fmtstream_update (argp_fmtstream_t __fs);
-extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
-extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
-
-#ifdef __OPTIMIZE__
-/* Inline versions of above routines.  */
-
-#if !_LIBC
-#define __argp_fmtstream_putc argp_fmtstream_putc
-#define __argp_fmtstream_puts argp_fmtstream_puts
-#define __argp_fmtstream_write argp_fmtstream_write
-#define __argp_fmtstream_set_lmargin argp_fmtstream_set_lmargin
-#define __argp_fmtstream_set_rmargin argp_fmtstream_set_rmargin
-#define __argp_fmtstream_set_wmargin argp_fmtstream_set_wmargin
-#define __argp_fmtstream_point argp_fmtstream_point
-#define __argp_fmtstream_update _argp_fmtstream_update
-#define __argp_fmtstream_ensure _argp_fmtstream_ensure
-#endif
-
-#ifndef ARGP_FS_EI
-#define ARGP_FS_EI extern inline
-#endif
-
-ARGP_FS_EI size_t
-__argp_fmtstream_write (argp_fmtstream_t __fs,
-			__const char *__str, size_t __len)
-{
-  if (__fs->p + __len <= __fs->end || __argp_fmtstream_ensure (__fs, __len))
-    {
-      memcpy (__fs->p, __str, __len);
-      __fs->p += __len;
-      return __len;
-    }
-  else
-    return 0;
-}
-
-ARGP_FS_EI int
-__argp_fmtstream_puts (argp_fmtstream_t __fs, __const char *__str)
-{
-  size_t __len = strlen (__str);
-  if (__len)
-    {
-      size_t __wrote = __argp_fmtstream_write (__fs, __str, __len);
-      return __wrote == __len ? 0 : -1;
-    }
-  else
-    return 0;
-}
-
-ARGP_FS_EI int
-__argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch)
-{
-  if (__fs->p < __fs->end || __argp_fmtstream_ensure (__fs, 1))
-    return *__fs->p++ = __ch;
-  else
-    return EOF;
-}
-
-/* Set __FS's left margin to __LMARGIN and return the old value.  */
-ARGP_FS_EI size_t
-__argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, size_t __lmargin)
-{
-  size_t __old;
-  if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
-    __argp_fmtstream_update (__fs);
-  __old = __fs->lmargin;
-  __fs->lmargin = __lmargin;
-  return __old;
-}
-
-/* Set __FS's right margin to __RMARGIN and return the old value.  */
-ARGP_FS_EI size_t
-__argp_fmtstream_set_rmargin (argp_fmtstream_t __fs, size_t __rmargin)
-{
-  size_t __old;
-  if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
-    __argp_fmtstream_update (__fs);
-  __old = __fs->rmargin;
-  __fs->rmargin = __rmargin;
-  return __old;
-}
-
-/* Set FS's wrap margin to __WMARGIN and return the old value.  */
-ARGP_FS_EI size_t
-__argp_fmtstream_set_wmargin (argp_fmtstream_t __fs, size_t __wmargin)
-{
-  size_t __old;
-  if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
-    __argp_fmtstream_update (__fs);
-  __old = __fs->wmargin;
-  __fs->wmargin = __wmargin;
-  return __old;
-}
-
-/* Return the column number of the current output point in __FS.  */
-ARGP_FS_EI size_t
-__argp_fmtstream_point (argp_fmtstream_t __fs)
-{
-  if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
-    __argp_fmtstream_update (__fs);
-  return __fs->point_col >= 0 ? __fs->point_col : 0;
-}
-
-#if !_LIBC
-#undef __argp_fmtstream_putc
-#undef __argp_fmtstream_puts
-#undef __argp_fmtstream_write
-#undef __argp_fmtstream_set_lmargin
-#undef __argp_fmtstream_set_rmargin
-#undef __argp_fmtstream_set_wmargin
-#undef __argp_fmtstream_point
-#undef __argp_fmtstream_update
-#undef __argp_fmtstream_ensure
-#endif
-
-#endif /* __OPTIMIZE__ */
-
-#endif /* ARGP_FMTSTREAM_USE_LINEWRAP */
-
-#endif /* argp-fmtstream.h */
diff --git a/newlib/libc/sys/linux/argp/argp-fs-xinl.c b/newlib/libc/sys/linux/argp/argp-fs-xinl.c
deleted file mode 100644
index 9b836d1..0000000
--- a/newlib/libc/sys/linux/argp/argp-fs-xinl.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Real definitions for extern inline functions in argp-fmtstream.h
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define ARGP_FS_EI
-#undef __OPTIMIZE__
-#define __OPTIMIZE__ 1
-#include "argp-fmtstream.h"
-
-/* Add weak aliases.  */
-#if _LIBC - 0 && !defined (ARGP_FMTSTREAM_USE_LINEWRAP) && defined (weak_alias)
-
-weak_alias (__argp_fmtstream_putc, argp_fmtstream_putc)
-weak_alias (__argp_fmtstream_puts, argp_fmtstream_puts)
-weak_alias (__argp_fmtstream_write, argp_fmtstream_write)
-weak_alias (__argp_fmtstream_set_lmargin, argp_fmtstream_set_lmargin)
-weak_alias (__argp_fmtstream_set_rmargin, argp_fmtstream_set_rmargin)
-weak_alias (__argp_fmtstream_set_wmargin, argp_fmtstream_set_wmargin)
-weak_alias (__argp_fmtstream_point, argp_fmtstream_point)
-
-#endif
diff --git a/newlib/libc/sys/linux/argp/argp-help.c b/newlib/libc/sys/linux/argp/argp-help.c
deleted file mode 100644
index d152369..0000000
--- a/newlib/libc/sys/linux/argp/argp-help.c
+++ /dev/null
@@ -1,1863 +0,0 @@
-/* Hierarchial argument parsing help output
-   Copyright (C) 1995-2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifndef alloca
-# ifdef __GNUC__
-#  define alloca __builtin_alloca
-#  define HAVE_ALLOCA 1
-# else
-#  if defined HAVE_ALLOCA_H || defined _LIBC
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdarg.h>
-#include <malloc.h>
-#include <ctype.h>
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
-
-#ifndef _
-/* This is for other GNU distributions with internationalized messages.  */
-# if defined HAVE_LIBINTL_H || defined _LIBC
-#  include <libintl.h>
-#  ifdef _LIBC
-#   undef dgettext
-#   define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES)
-#  endif
-# else
-#  define dgettext(domain, msgid) (msgid)
-# endif
-#endif
-
-#include <argp.h>
-#include "argp-fmtstream.h"
-#include "argp-namefrob.h"
-
-/* User-selectable (using an environment variable) formatting parameters.
-
-   These may be specified in an environment variable called `ARGP_HELP_FMT',
-   with a contents like:  VAR1=VAL1,VAR2=VAL2,BOOLVAR2,no-BOOLVAR2
-   Where VALn must be a positive integer.  The list of variables is in the
-   UPARAM_NAMES vector, below.  */
-
-/* Default parameters.  */
-#define DUP_ARGS      0		/* True if option argument can be duplicated. */
-#define DUP_ARGS_NOTE 1		/* True to print a note about duplicate args. */
-#define SHORT_OPT_COL 2		/* column in which short options start */
-#define LONG_OPT_COL  6		/* column in which long options start */
-#define DOC_OPT_COL   2		/* column in which doc options start */
-#define OPT_DOC_COL  29		/* column in which option text starts */
-#define HEADER_COL    1		/* column in which group headers are printed */
-#define USAGE_INDENT 12		/* indentation of wrapped usage lines */
-#define RMARGIN      79		/* right margin used for wrapping */
-
-/* User-selectable (using an environment variable) formatting parameters.
-   They must all be of type `int' for the parsing code to work.  */
-struct uparams
-{
-  /* If true, arguments for an option are shown with both short and long
-     options, even when a given option has both, e.g. `-x ARG, --longx=ARG'.
-     If false, then if an option has both, the argument is only shown with
-     the long one, e.g., `-x, --longx=ARG', and a message indicating that
-     this really means both is printed below the options.  */
-  int dup_args;
-
-  /* This is true if when DUP_ARGS is false, and some duplicate arguments have
-     been suppressed, an explanatory message should be printed.  */
-  int dup_args_note;
-
-  /* Various output columns.  */
-  int short_opt_col;
-  int long_opt_col;
-  int doc_opt_col;
-  int opt_doc_col;
-  int header_col;
-  int usage_indent;
-  int rmargin;
-
-  int valid;			/* True when the values in here are valid.  */
-};
-
-/* This is a global variable, as user options are only ever read once.  */
-static struct uparams uparams = {
-  DUP_ARGS, DUP_ARGS_NOTE,
-  SHORT_OPT_COL, LONG_OPT_COL, DOC_OPT_COL, OPT_DOC_COL, HEADER_COL,
-  USAGE_INDENT, RMARGIN,
-  0
-};
-
-/* A particular uparam, and what the user name is.  */
-struct uparam_name
-{
-  const char *name;		/* User name.  */
-  int is_bool;			/* Whether it's `boolean'.  */
-  size_t uparams_offs;		/* Location of the (int) field in UPARAMS.  */
-};
-
-/* The name-field mappings we know about.  */
-static const struct uparam_name uparam_names[] =
-{
-  { "dup-args",       1, offsetof (struct uparams, dup_args) },
-  { "dup-args-note",  1, offsetof (struct uparams, dup_args_note) },
-  { "short-opt-col",  0, offsetof (struct uparams, short_opt_col) },
-  { "long-opt-col",   0, offsetof (struct uparams, long_opt_col) },
-  { "doc-opt-col",    0, offsetof (struct uparams, doc_opt_col) },
-  { "opt-doc-col",    0, offsetof (struct uparams, opt_doc_col) },
-  { "header-col",     0, offsetof (struct uparams, header_col) },
-  { "usage-indent",   0, offsetof (struct uparams, usage_indent) },
-  { "rmargin",        0, offsetof (struct uparams, rmargin) },
-  { 0 }
-};
-
-/* Read user options from the environment, and fill in UPARAMS appropiately.  */
-static void
-fill_in_uparams (const struct argp_state *state)
-{
-  const char *var = getenv ("ARGP_HELP_FMT");
-
-#define SKIPWS(p) do { while (isspace (*p)) p++; } while (0);
-
-  if (var)
-    /* Parse var. */
-    while (*var)
-      {
-	SKIPWS (var);
-
-	if (isalpha (*var))
-	  {
-	    size_t var_len;
-	    const struct uparam_name *un;
-	    int unspec = 0, val = 0;
-	    const char *arg = var;
-
-	    while (isalnum (*arg) || *arg == '-' || *arg == '_')
-	      arg++;
-	    var_len = arg - var;
-
-	    SKIPWS (arg);
-
-	    if (*arg == '\0' || *arg == ',')
-	      unspec = 1;
-	    else if (*arg == '=')
-	      {
-		arg++;
-		SKIPWS (arg);
-	      }
-
-	    if (unspec)
-	      {
-		if (var[0] == 'n' && var[1] == 'o' && var[2] == '-')
-		  {
-		    val = 0;
-		    var += 3;
-		    var_len -= 3;
-		  }
-		else
-		  val = 1;
-	      }
-	    else if (isdigit (*arg))
-	      {
-		val = atoi (arg);
-		while (isdigit (*arg))
-		  arg++;
-		SKIPWS (arg);
-	      }
-
-	    for (un = uparam_names; un->name; un++)
-	      if (strlen (un->name) == var_len
-		  && strncmp (var, un->name, var_len) == 0)
-		{
-		  if (unspec && !un->is_bool)
-		    __argp_failure (state, 0, 0,
-				    dgettext (state->root_argp->argp_domain, "\
-%.*s: ARGP_HELP_FMT parameter requires a value"),
-				    (int) var_len, var);
-		  else
-		    *(int *)((char *)&uparams + un->uparams_offs) = val;
-		  break;
-		}
-	    if (! un->name)
-	      __argp_failure (state, 0, 0,
-			      dgettext (state->root_argp->argp_domain, "\
-%.*s: Unknown ARGP_HELP_FMT parameter"),
-			      (int) var_len, var);
-
-	    var = arg;
-	    if (*var == ',')
-	      var++;
-	  }
-	else if (*var)
-	  {
-	    __argp_failure (state, 0, 0,
-			    dgettext (state->root_argp->argp_domain,
-				      "Garbage in ARGP_HELP_FMT: %s"), var);
-	    break;
-	  }
-      }
-}
-
-/* Returns true if OPT hasn't been marked invisible.  Visibility only affects
-   whether OPT is displayed or used in sorting, not option shadowing.  */
-#define ovisible(opt) (! ((opt)->flags & OPTION_HIDDEN))
-
-/* Returns true if OPT is an alias for an earlier option.  */
-#define oalias(opt) ((opt)->flags & OPTION_ALIAS)
-
-/* Returns true if OPT is an documentation-only entry.  */
-#define odoc(opt) ((opt)->flags & OPTION_DOC)
-
-/* Returns true if OPT is the end-of-list marker for a list of options.  */
-#define oend(opt) __option_is_end (opt)
-
-/* Returns true if OPT has a short option.  */
-#define oshort(opt) __option_is_short (opt)
-
-/*
-   The help format for a particular option is like:
-
-     -xARG, -yARG, --long1=ARG, --long2=ARG        Documentation...
-
-   Where ARG will be omitted if there's no argument, for this option, or
-   will be surrounded by "[" and "]" appropiately if the argument is
-   optional.  The documentation string is word-wrapped appropiately, and if
-   the list of options is long enough, it will be started on a separate line.
-   If there are no short options for a given option, the first long option is
-   indented slighly in a way that's supposed to make most long options appear
-   to be in a separate column.
-
-   For example, the following output (from ps):
-
-     -p PID, --pid=PID          List the process PID
-	 --pgrp=PGRP            List processes in the process group PGRP
-     -P, -x, --no-parent        Include processes without parents
-     -Q, --all-fields           Don't elide unusable fields (normally if there's
-				some reason ps can't print a field for any
-				process, it's removed from the output entirely)
-     -r, --reverse, --gratuitously-long-reverse-option
-				Reverse the order of any sort
-	 --session[=SID]        Add the processes from the session SID (which
-				defaults to the sid of the current process)
-
-    Here are some more options:
-     -f ZOT, --foonly=ZOT       Glork a foonly
-     -z, --zaza                 Snit a zar
-
-     -?, --help                 Give this help list
-	 --usage                Give a short usage message
-     -V, --version              Print program version
-
-   The struct argp_option array for the above could look like:
-
-   {
-     {"pid",       'p',      "PID",  0, "List the process PID"},
-     {"pgrp",      OPT_PGRP, "PGRP", 0, "List processes in the process group PGRP"},
-     {"no-parent", 'P',	      0,     0, "Include processes without parents"},
-     {0,           'x',       0,     OPTION_ALIAS},
-     {"all-fields",'Q',       0,     0, "Don't elide unusable fields (normally"
-                                        " if there's some reason ps can't"
-					" print a field for any process, it's"
-                                        " removed from the output entirely)" },
-     {"reverse",   'r',       0,     0, "Reverse the order of any sort"},
-     {"gratuitously-long-reverse-option", 0, 0, OPTION_ALIAS},
-     {"session",   OPT_SESS,  "SID", OPTION_ARG_OPTIONAL,
-                                        "Add the processes from the session"
-					" SID (which defaults to the sid of"
-					" the current process)" },
-
-     {0,0,0,0, "Here are some more options:"},
-     {"foonly", 'f', "ZOT", 0, "Glork a foonly"},
-     {"zaza", 'z', 0, 0, "Snit a zar"},
-
-     {0}
-   }
-
-   Note that the last three options are automatically supplied by argp_parse,
-   unless you tell it not to with ARGP_NO_HELP.
-
-*/
-
-/* Returns true if CH occurs between BEG and END.  */
-static int
-find_char (char ch, char *beg, char *end)
-{
-  while (beg < end)
-    if (*beg == ch)
-      return 1;
-    else
-      beg++;
-  return 0;
-}
-
-struct hol_cluster;		/* fwd decl */
-
-struct hol_entry
-{
-  /* First option.  */
-  const struct argp_option *opt;
-  /* Number of options (including aliases).  */
-  unsigned num;
-
-  /* A pointers into the HOL's short_options field, to the first short option
-     letter for this entry.  The order of the characters following this point
-     corresponds to the order of options pointed to by OPT, and there are at
-     most NUM.  A short option recorded in a option following OPT is only
-     valid if it occurs in the right place in SHORT_OPTIONS (otherwise it's
-     probably been shadowed by some other entry).  */
-  char *short_options;
-
-  /* Entries are sorted by their group first, in the order:
-       1, 2, ..., n, 0, -m, ..., -2, -1
-     and then alphabetically within each group.  The default is 0.  */
-  int group;
-
-  /* The cluster of options this entry belongs to, or 0 if none.  */
-  struct hol_cluster *cluster;
-
-  /* The argp from which this option came.  */
-  const struct argp *argp;
-};
-
-/* A cluster of entries to reflect the argp tree structure.  */
-struct hol_cluster
-{
-  /* A descriptive header printed before options in this cluster.  */
-  const char *header;
-
-  /* Used to order clusters within the same group with the same parent,
-     according to the order in which they occurred in the parent argp's child
-     list.  */
-  int index;
-
-  /* How to sort this cluster with respect to options and other clusters at the
-     same depth (clusters always follow options in the same group).  */
-  int group;
-
-  /* The cluster to which this cluster belongs, or 0 if it's at the base
-     level.  */
-  struct hol_cluster *parent;
-
-  /* The argp from which this cluster is (eventually) derived.  */
-  const struct argp *argp;
-
-  /* The distance this cluster is from the root.  */
-  int depth;
-
-  /* Clusters in a given hol are kept in a linked list, to make freeing them
-     possible.  */
-  struct hol_cluster *next;
-};
-
-/* A list of options for help.  */
-struct hol
-{
-  /* An array of hol_entry's.  */
-  struct hol_entry *entries;
-  /* The number of entries in this hol.  If this field is zero, the others
-     are undefined.  */
-  unsigned num_entries;
-
-  /* A string containing all short options in this HOL.  Each entry contains
-     pointers into this string, so the order can't be messed with blindly.  */
-  char *short_options;
-
-  /* Clusters of entries in this hol.  */
-  struct hol_cluster *clusters;
-};
-
-/* Create a struct hol from the options in ARGP.  CLUSTER is the
-   hol_cluster in which these entries occur, or 0, if at the root.  */
-static struct hol *
-make_hol (const struct argp *argp, struct hol_cluster *cluster)
-{
-  char *so;
-  const struct argp_option *o;
-  const struct argp_option *opts = argp->options;
-  struct hol_entry *entry;
-  unsigned num_short_options = 0;
-  struct hol *hol = malloc (sizeof (struct hol));
-
-  assert (hol);
-
-  hol->num_entries = 0;
-  hol->clusters = 0;
-
-  if (opts)
-    {
-      int cur_group = 0;
-
-      /* The first option must not be an alias.  */
-      assert (! oalias (opts));
-
-      /* Calculate the space needed.  */
-      for (o = opts; ! oend (o); o++)
-	{
-	  if (! oalias (o))
-	    hol->num_entries++;
-	  if (oshort (o))
-	    num_short_options++;	/* This is an upper bound.  */
-	}
-
-      hol->entries = malloc (sizeof (struct hol_entry) * hol->num_entries);
-      hol->short_options = malloc (num_short_options + 1);
-
-      assert (hol->entries && hol->short_options);
-
-      /* Fill in the entries.  */
-      so = hol->short_options;
-      for (o = opts, entry = hol->entries; ! oend (o); entry++)
-	{
-	  entry->opt = o;
-	  entry->num = 0;
-	  entry->short_options = so;
-	  entry->group = cur_group =
-	    o->group
-	    ? o->group
-	    : ((!o->name && !o->key)
-	       ? cur_group + 1
-	       : cur_group);
-	  entry->cluster = cluster;
-	  entry->argp = argp;
-
-	  do
-	    {
-	      entry->num++;
-	      if (oshort (o) && ! find_char (o->key, hol->short_options, so))
-		/* O has a valid short option which hasn't already been used.*/
-		*so++ = o->key;
-	      o++;
-	    }
-	  while (! oend (o) && oalias (o));
-	}
-      *so = '\0';		/* null terminated so we can find the length */
-    }
-
-  return hol;
-}
-
-/* Add a new cluster to HOL, with the given GROUP and HEADER (taken from the
-   associated argp child list entry), INDEX, and PARENT, and return a pointer
-   to it.  ARGP is the argp that this cluster results from.  */
-static struct hol_cluster *
-hol_add_cluster (struct hol *hol, int group, const char *header, int index,
-		 struct hol_cluster *parent, const struct argp *argp)
-{
-  struct hol_cluster *cl = malloc (sizeof (struct hol_cluster));
-  if (cl)
-    {
-      cl->group = group;
-      cl->header = header;
-
-      cl->index = index;
-      cl->parent = parent;
-      cl->argp = argp;
-      cl->depth = parent ? parent->depth + 1 : 0;
-
-      cl->next = hol->clusters;
-      hol->clusters = cl;
-    }
-  return cl;
-}
-
-/* Free HOL and any resources it uses.  */
-static void
-hol_free (struct hol *hol)
-{
-  struct hol_cluster *cl = hol->clusters;
-
-  while (cl)
-    {
-      struct hol_cluster *next = cl->next;
-      free (cl);
-      cl = next;
-    }
-
-  if (hol->num_entries > 0)
-    {
-      free (hol->entries);
-      free (hol->short_options);
-    }
-
-  free (hol);
-}
-
-static inline int
-hol_entry_short_iterate (const struct hol_entry *entry,
-			 int (*func)(const struct argp_option *opt,
-				     const struct argp_option *real,
-				     const char *domain, void *cookie),
-			 const char *domain, void *cookie)
-{
-  unsigned nopts;
-  int val = 0;
-  const struct argp_option *opt, *real = entry->opt;
-  char *so = entry->short_options;
-
-  for (opt = real, nopts = entry->num; nopts > 0 && !val; opt++, nopts--)
-    if (oshort (opt) && *so == opt->key)
-      {
-	if (!oalias (opt))
-	  real = opt;
-	if (ovisible (opt))
-	  val = (*func)(opt, real, domain, cookie);
-	so++;
-      }
-
-  return val;
-}
-
-static inline int
-hol_entry_long_iterate (const struct hol_entry *entry,
-			int (*func)(const struct argp_option *opt,
-				    const struct argp_option *real,
-				    const char *domain, void *cookie),
-			const char *domain, void *cookie)
-{
-  unsigned nopts;
-  int val = 0;
-  const struct argp_option *opt, *real = entry->opt;
-
-  for (opt = real, nopts = entry->num; nopts > 0 && !val; opt++, nopts--)
-    if (opt->name)
-      {
-	if (!oalias (opt))
-	  real = opt;
-	if (ovisible (opt))
-	  val = (*func)(opt, real, domain, cookie);
-      }
-
-  return val;
-}
-
-/* Iterator that returns true for the first short option.  */
-static inline int
-until_short (const struct argp_option *opt, const struct argp_option *real,
-	     const char *domain, void *cookie)
-{
-  return oshort (opt) ? opt->key : 0;
-}
-
-/* Returns the first valid short option in ENTRY, or 0 if there is none.  */
-static char
-hol_entry_first_short (const struct hol_entry *entry)
-{
-  return hol_entry_short_iterate (entry, until_short,
-				  entry->argp->argp_domain, 0);
-}
-
-/* Returns the first valid long option in ENTRY, or 0 if there is none.  */
-static const char *
-hol_entry_first_long (const struct hol_entry *entry)
-{
-  const struct argp_option *opt;
-  unsigned num;
-  for (opt = entry->opt, num = entry->num; num > 0; opt++, num--)
-    if (opt->name && ovisible (opt))
-      return opt->name;
-  return 0;
-}
-
-/* Returns the entry in HOL with the long option name NAME, or 0 if there is
-   none.  */
-static struct hol_entry *
-hol_find_entry (struct hol *hol, const char *name)
-{
-  struct hol_entry *entry = hol->entries;
-  unsigned num_entries = hol->num_entries;
-
-  while (num_entries-- > 0)
-    {
-      const struct argp_option *opt = entry->opt;
-      unsigned num_opts = entry->num;
-
-      while (num_opts-- > 0)
-	if (opt->name && ovisible (opt) && strcmp (opt->name, name) == 0)
-	  return entry;
-	else
-	  opt++;
-
-      entry++;
-    }
-
-  return 0;
-}
-
-/* If an entry with the long option NAME occurs in HOL, set it's special
-   sort position to GROUP.  */
-static void
-hol_set_group (struct hol *hol, const char *name, int group)
-{
-  struct hol_entry *entry = hol_find_entry (hol, name);
-  if (entry)
-    entry->group = group;
-}
-
-/* Order by group:  0, 1, 2, ..., n, -m, ..., -2, -1.
-   EQ is what to return if GROUP1 and GROUP2 are the same.  */
-static int
-group_cmp (int group1, int group2, int eq)
-{
-  if (group1 == group2)
-    return eq;
-  else if ((group1 < 0 && group2 < 0) || (group1 >= 0 && group2 >= 0))
-    return group1 - group2;
-  else
-    return group2 - group1;
-}
-
-/* Compare clusters CL1 & CL2 by the order that they should appear in
-   output.  */
-static int
-hol_cluster_cmp (const struct hol_cluster *cl1, const struct hol_cluster *cl2)
-{
-  /* If one cluster is deeper than the other, use its ancestor at the same
-     level, so that finding the common ancestor is straightforward.  */
-  while (cl1->depth < cl2->depth)
-    cl1 = cl1->parent;
-  while (cl2->depth < cl1->depth)
-    cl2 = cl2->parent;
-
-  /* Now reduce both clusters to their ancestors at the point where both have
-     a common parent; these can be directly compared.  */
-  while (cl1->parent != cl2->parent)
-    cl1 = cl1->parent, cl2 = cl2->parent;
-
-  return group_cmp (cl1->group, cl2->group, cl2->index - cl1->index);
-}
-
-/* Return the ancestor of CL that's just below the root (i.e., has a parent
-   of 0).  */
-static struct hol_cluster *
-hol_cluster_base (struct hol_cluster *cl)
-{
-  while (cl->parent)
-    cl = cl->parent;
-  return cl;
-}
-
-/* Return true if CL1 is a child of CL2.  */
-static int
-hol_cluster_is_child (const struct hol_cluster *cl1,
-		      const struct hol_cluster *cl2)
-{
-  while (cl1 && cl1 != cl2)
-    cl1 = cl1->parent;
-  return cl1 == cl2;
-}
-
-/* Given the name of a OPTION_DOC option, modifies NAME to start at the tail
-   that should be used for comparisons, and returns true iff it should be
-   treated as a non-option.  */
-static int
-canon_doc_option (const char **name)
-{
-  int non_opt;
-  /* Skip initial whitespace.  */
-  while (isspace (**name))
-    (*name)++;
-  /* Decide whether this looks like an option (leading `-') or not.  */
-  non_opt = (**name != '-');
-  /* Skip until part of name used for sorting.  */
-  while (**name && !isalnum (**name))
-    (*name)++;
-  return non_opt;
-}
-
-/* Order ENTRY1 & ENTRY2 by the order which they should appear in a help
-   listing.  */
-static int
-hol_entry_cmp (const struct hol_entry *entry1,
-	       const struct hol_entry *entry2)
-{
-  /* The group numbers by which the entries should be ordered; if either is
-     in a cluster, then this is just the group within the cluster.  */
-  int group1 = entry1->group, group2 = entry2->group;
-
-  if (entry1->cluster != entry2->cluster)
-    {
-      /* The entries are not within the same cluster, so we can't compare them
-	 directly, we have to use the appropiate clustering level too.  */
-      if (! entry1->cluster)
-	/* ENTRY1 is at the `base level', not in a cluster, so we have to
-	   compare it's group number with that of the base cluster in which
-	   ENTRY2 resides.  Note that if they're in the same group, the
-	   clustered option always comes laster.  */
-	return group_cmp (group1, hol_cluster_base (entry2->cluster)->group, -1);
-      else if (! entry2->cluster)
-	/* Likewise, but ENTRY2's not in a cluster.  */
-	return group_cmp (hol_cluster_base (entry1->cluster)->group, group2, 1);
-      else
-	/* Both entries are in clusters, we can just compare the clusters.  */
-	return hol_cluster_cmp (entry1->cluster, entry2->cluster);
-    }
-  else if (group1 == group2)
-    /* The entries are both in the same cluster and group, so compare them
-       alphabetically.  */
-    {
-      int short1 = hol_entry_first_short (entry1);
-      int short2 = hol_entry_first_short (entry2);
-      int doc1 = odoc (entry1->opt);
-      int doc2 = odoc (entry2->opt);
-      const char *long1 = hol_entry_first_long (entry1);
-      const char *long2 = hol_entry_first_long (entry2);
-
-      if (doc1)
-	doc1 = canon_doc_option (&long1);
-      if (doc2)
-	doc2 = canon_doc_option (&long2);
-
-      if (doc1 != doc2)
-	/* `documentation' options always follow normal options (or
-	   documentation options that *look* like normal options).  */
-	return doc1 - doc2;
-      else if (!short1 && !short2 && long1 && long2)
-	/* Only long options.  */
-	return __strcasecmp (long1, long2);
-      else
-	/* Compare short/short, long/short, short/long, using the first
-	   character of long options.  Entries without *any* valid
-	   options (such as options with OPTION_HIDDEN set) will be put
-	   first, but as they're not displayed, it doesn't matter where
-	   they are.  */
-	{
-	  char first1 = short1 ? short1 : long1 ? *long1 : 0;
-	  char first2 = short2 ? short2 : long2 ? *long2 : 0;
-#ifdef _tolower
-	  int lower_cmp = _tolower (first1) - _tolower (first2);
-#else
-	  int lower_cmp = tolower (first1) - tolower (first2);
-#endif
-	  /* Compare ignoring case, except when the options are both the
-	     same letter, in which case lower-case always comes first.  */
-	  return lower_cmp ? lower_cmp : first2 - first1;
-	}
-    }
-  else
-    /* Within the same cluster, but not the same group, so just compare
-       groups.  */
-    return group_cmp (group1, group2, 0);
-}
-
-/* Version of hol_entry_cmp with correct signature for qsort.  */
-static int
-hol_entry_qcmp (const void *entry1_v, const void *entry2_v)
-{
-  return hol_entry_cmp (entry1_v, entry2_v);
-}
-
-/* Sort HOL by group and alphabetically by option name (with short options
-   taking precedence over long).  Since the sorting is for display purposes
-   only, the shadowing of options isn't effected.  */
-static void
-hol_sort (struct hol *hol)
-{
-  if (hol->num_entries > 0)
-    qsort (hol->entries, hol->num_entries, sizeof (struct hol_entry),
-	   hol_entry_qcmp);
-}
-
-/* Append MORE to HOL, destroying MORE in the process.  Options in HOL shadow
-   any in MORE with the same name.  */
-static void
-hol_append (struct hol *hol, struct hol *more)
-{
-  struct hol_cluster **cl_end = &hol->clusters;
-  char *tmp;
-
-  /* Steal MORE's cluster list, and add it to the end of HOL's.  */
-  while (*cl_end)
-    cl_end = &(*cl_end)->next;
-  *cl_end = more->clusters;
-  more->clusters = 0;
-
-  /* Merge entries.  */
-  if (more->num_entries > 0)
-    {
-      if (hol->num_entries == 0)
-	{
-	  hol->num_entries = more->num_entries;
-	  hol->entries = more->entries;
-	  hol->short_options = more->short_options;
-	  more->num_entries = 0;	/* Mark MORE's fields as invalid.  */
-	}
-      else
-	/* Append the entries in MORE to those in HOL, taking care to only add
-	   non-shadowed SHORT_OPTIONS values.  */
-	{
-	  unsigned left;
-	  char *so, *more_so;
-	  struct hol_entry *e;
-	  unsigned num_entries = hol->num_entries + more->num_entries;
-	  struct hol_entry *entries =
-	    malloc (num_entries * sizeof (struct hol_entry));
-	  unsigned hol_so_len = strlen (hol->short_options);
-	  char *short_options =
-	    malloc (hol_so_len + strlen (more->short_options) + 1);
-
-          tmp = memcpy (entries, hol->entries,
-                        hol->num_entries * sizeof (struct hol_entry));
-          tmp += hol->num_entries * sizeof (struct hol_entry);
-	  memcpy (tmp,
-                  more->entries,
-                  more->num_entries * sizeof (struct hol_entry));
-
-	  memcpy (short_options, hol->short_options, hol_so_len);
-
-	  /* Fix up the short options pointers from HOL.  */
-	  for (e = entries, left = hol->num_entries; left > 0; e++, left--)
-	    e->short_options += (short_options - hol->short_options);
-
-	  /* Now add the short options from MORE, fixing up its entries
-	     too.  */
-	  so = short_options + hol_so_len;
-	  more_so = more->short_options;
-	  for (left = more->num_entries; left > 0; e++, left--)
-	    {
-	      int opts_left;
-	      const struct argp_option *opt;
-
-	      e->short_options = so;
-
-	      for (opts_left = e->num, opt = e->opt; opts_left; opt++, opts_left--)
-		{
-		  int ch = *more_so;
-		  if (oshort (opt) && ch == opt->key)
-		    /* The next short option in MORE_SO, CH, is from OPT.  */
-		    {
-		      if (! find_char (ch, short_options,
-				       short_options + hol_so_len))
-			/* The short option CH isn't shadowed by HOL's options,
-			   so add it to the sum.  */
-			*so++ = ch;
-		      more_so++;
-		    }
-		}
-	    }
-
-	  *so = '\0';
-
-	  free (hol->entries);
-	  free (hol->short_options);
-
-	  hol->entries = entries;
-	  hol->num_entries = num_entries;
-	  hol->short_options = short_options;
-	}
-    }
-
-  hol_free (more);
-}
-
-/* Inserts enough spaces to make sure STREAM is at column COL.  */
-static void
-indent_to (argp_fmtstream_t stream, unsigned col)
-{
-  int needed = col - __argp_fmtstream_point (stream);
-  while (needed-- > 0)
-    __argp_fmtstream_putc (stream, ' ');
-}
-
-/* Output to STREAM either a space, or a newline if there isn't room for at
-   least ENSURE characters before the right margin.  */
-static void
-space (argp_fmtstream_t stream, size_t ensure)
-{
-  if (__argp_fmtstream_point (stream) + ensure
-      >= __argp_fmtstream_rmargin (stream))
-    __argp_fmtstream_putc (stream, '\n');
-  else
-    __argp_fmtstream_putc (stream, ' ');
-}
-
-/* If the option REAL has an argument, we print it in using the printf
-   format REQ_FMT or OPT_FMT depending on whether it's a required or
-   optional argument.  */
-static void
-arg (const struct argp_option *real, const char *req_fmt, const char *opt_fmt,
-     const char *domain, argp_fmtstream_t stream)
-{
-  if (real->arg)
-    {
-      if (real->flags & OPTION_ARG_OPTIONAL)
-	__argp_fmtstream_printf (stream, opt_fmt,
-				 dgettext (domain, real->arg));
-      else
-	__argp_fmtstream_printf (stream, req_fmt,
-				 dgettext (domain, real->arg));
-    }
-}
-
-/* Helper functions for hol_entry_help.  */
-
-/* State used during the execution of hol_help.  */
-struct hol_help_state
-{
-  /* PREV_ENTRY should contain the previous entry printed, or 0.  */
-  struct hol_entry *prev_entry;
-
-  /* If an entry is in a different group from the previous one, and SEP_GROUPS
-     is true, then a blank line will be printed before any output. */
-  int sep_groups;
-
-  /* True if a duplicate option argument was suppressed (only ever set if
-     UPARAMS.dup_args is false).  */
-  int suppressed_dup_arg;
-};
-
-/* Some state used while printing a help entry (used to communicate with
-   helper functions).  See the doc for hol_entry_help for more info, as most
-   of the fields are copied from its arguments.  */
-struct pentry_state
-{
-  const struct hol_entry *entry;
-  argp_fmtstream_t stream;
-  struct hol_help_state *hhstate;
-
-  /* True if nothing's been printed so far.  */
-  int first;
-
-  /* If non-zero, the state that was used to print this help.  */
-  const struct argp_state *state;
-};
-
-/* If a user doc filter should be applied to DOC, do so.  */
-static const char *
-filter_doc (const char *doc, int key, const struct argp *argp,
-	    const struct argp_state *state)
-{
-  if (argp->help_filter)
-    /* We must apply a user filter to this output.  */
-    {
-      void *input = __argp_input (argp, state);
-      return (*argp->help_filter) (key, doc, input);
-    }
-  else
-    /* No filter.  */
-    return doc;
-}
-
-/* Prints STR as a header line, with the margin lines set appropiately, and
-   notes the fact that groups should be separated with a blank line.  ARGP is
-   the argp that should dictate any user doc filtering to take place.  Note
-   that the previous wrap margin isn't restored, but the left margin is reset
-   to 0.  */
-static void
-print_header (const char *str, const struct argp *argp,
-	      struct pentry_state *pest)
-{
-  const char *tstr = dgettext (argp->argp_domain, str);
-  const char *fstr = filter_doc (tstr, ARGP_KEY_HELP_HEADER, argp, pest->state);
-
-  if (fstr)
-    {
-      if (*fstr)
-	{
-	  if (pest->hhstate->prev_entry)
-	    /* Precede with a blank line.  */
-	    __argp_fmtstream_putc (pest->stream, '\n');
-	  indent_to (pest->stream, uparams.header_col);
-	  __argp_fmtstream_set_lmargin (pest->stream, uparams.header_col);
-	  __argp_fmtstream_set_wmargin (pest->stream, uparams.header_col);
-	  __argp_fmtstream_puts (pest->stream, fstr);
-	  __argp_fmtstream_set_lmargin (pest->stream, 0);
-	  __argp_fmtstream_putc (pest->stream, '\n');
-	}
-
-      pest->hhstate->sep_groups = 1; /* Separate subsequent groups. */
-    }
-
-  if (fstr != tstr)
-    free ((char *) fstr);
-}
-
-/* Inserts a comma if this isn't the first item on the line, and then makes
-   sure we're at least to column COL.  If this *is* the first item on a line,
-   prints any pending whitespace/headers that should precede this line. Also
-   clears FIRST.  */
-static void
-comma (unsigned col, struct pentry_state *pest)
-{
-  if (pest->first)
-    {
-      const struct hol_entry *pe = pest->hhstate->prev_entry;
-      const struct hol_cluster *cl = pest->entry->cluster;
-
-      if (pest->hhstate->sep_groups && pe && pest->entry->group != pe->group)
-	__argp_fmtstream_putc (pest->stream, '\n');
-
-      if (cl && cl->header && *cl->header
-	  && (!pe
-	      || (pe->cluster != cl
-		  && !hol_cluster_is_child (pe->cluster, cl))))
-	/* If we're changing clusters, then this must be the start of the
-	   ENTRY's cluster unless that is an ancestor of the previous one
-	   (in which case we had just popped into a sub-cluster for a bit).
-	   If so, then print the cluster's header line.  */
-	{
-	  int old_wm = __argp_fmtstream_wmargin (pest->stream);
-	  print_header (cl->header, cl->argp, pest);
-	  __argp_fmtstream_set_wmargin (pest->stream, old_wm);
-	}
-
-      pest->first = 0;
-    }
-  else
-    __argp_fmtstream_puts (pest->stream, ", ");
-
-  indent_to (pest->stream, col);
-}
-
-/* Print help for ENTRY to STREAM.  */
-static void
-hol_entry_help (struct hol_entry *entry, const struct argp_state *state,
-		argp_fmtstream_t stream, struct hol_help_state *hhstate)
-{
-  unsigned num;
-  const struct argp_option *real = entry->opt, *opt;
-  char *so = entry->short_options;
-  int have_long_opt = 0;	/* We have any long options.  */
-  /* Saved margins.  */
-  int old_lm = __argp_fmtstream_set_lmargin (stream, 0);
-  int old_wm = __argp_fmtstream_wmargin (stream);
-  /* PEST is a state block holding some of our variables that we'd like to
-     share with helper functions.  */
-  struct pentry_state pest = { entry, stream, hhstate, 1, state };
-
-  if (! odoc (real))
-    for (opt = real, num = entry->num; num > 0; opt++, num--)
-      if (opt->name && ovisible (opt))
-	{
-	  have_long_opt = 1;
-	  break;
-	}
-
-  /* First emit short options.  */
-  __argp_fmtstream_set_wmargin (stream, uparams.short_opt_col); /* For truly bizarre cases. */
-  for (opt = real, num = entry->num; num > 0; opt++, num--)
-    if (oshort (opt) && opt->key == *so)
-      /* OPT has a valid (non shadowed) short option.  */
-      {
-	if (ovisible (opt))
-	  {
-	    comma (uparams.short_opt_col, &pest);
-	    __argp_fmtstream_putc (stream, '-');
-	    __argp_fmtstream_putc (stream, *so);
-	    if (!have_long_opt || uparams.dup_args)
-	      arg (real, " %s", "[%s]", state->root_argp->argp_domain, stream);
-	    else if (real->arg)
-	      hhstate->suppressed_dup_arg = 1;
-	  }
-	so++;
-      }
-
-  /* Now, long options.  */
-  if (odoc (real))
-    /* A `documentation' option.  */
-    {
-      __argp_fmtstream_set_wmargin (stream, uparams.doc_opt_col);
-      for (opt = real, num = entry->num; num > 0; opt++, num--)
-	if (opt->name && ovisible (opt))
-	  {
-	    comma (uparams.doc_opt_col, &pest);
-	    /* Calling gettext here isn't quite right, since sorting will
-	       have been done on the original; but documentation options
-	       should be pretty rare anyway...  */
-	    __argp_fmtstream_puts (stream,
-				   dgettext (state->root_argp->argp_domain,
-					     opt->name));
-	  }
-    }
-  else
-    /* A real long option.  */
-    {
-      int first_long_opt = 1;
-
-      __argp_fmtstream_set_wmargin (stream, uparams.long_opt_col);
-      for (opt = real, num = entry->num; num > 0; opt++, num--)
-	if (opt->name && ovisible (opt))
-	  {
-	    comma (uparams.long_opt_col, &pest);
-	    __argp_fmtstream_printf (stream, "--%s", opt->name);
-	    if (first_long_opt || uparams.dup_args)
-	      arg (real, "=%s", "[=%s]", state->root_argp->argp_domain,
-		   stream);
-	    else if (real->arg)
-	      hhstate->suppressed_dup_arg = 1;
-	  }
-    }
-
-  /* Next, documentation strings.  */
-  __argp_fmtstream_set_lmargin (stream, 0);
-
-  if (pest.first)
-    {
-      /* Didn't print any switches, what's up?  */
-      if (!oshort (real) && !real->name)
-	/* This is a group header, print it nicely.  */
-	print_header (real->doc, entry->argp, &pest);
-      else
-	/* Just a totally shadowed option or null header; print nothing.  */
-	goto cleanup;		/* Just return, after cleaning up.  */
-    }
-  else
-    {
-      const char *tstr = real->doc ? dgettext (state->root_argp->argp_domain,
-					       real->doc) : 0;
-      const char *fstr = filter_doc (tstr, real->key, entry->argp, state);
-      if (fstr && *fstr)
-	{
-	  unsigned int col = __argp_fmtstream_point (stream);
-
-	  __argp_fmtstream_set_lmargin (stream, uparams.opt_doc_col);
-	  __argp_fmtstream_set_wmargin (stream, uparams.opt_doc_col);
-
-	  if (col > (unsigned int) (uparams.opt_doc_col + 3))
-	    __argp_fmtstream_putc (stream, '\n');
-	  else if (col >= (unsigned int) uparams.opt_doc_col)
-	    __argp_fmtstream_puts (stream, "   ");
-	  else
-	    indent_to (stream, uparams.opt_doc_col);
-
-	  __argp_fmtstream_puts (stream, fstr);
-	}
-      if (fstr && fstr != tstr)
-	free ((char *) fstr);
-
-      /* Reset the left margin.  */
-      __argp_fmtstream_set_lmargin (stream, 0);
-      __argp_fmtstream_putc (stream, '\n');
-    }
-
-  hhstate->prev_entry = entry;
-
-cleanup:
-  __argp_fmtstream_set_lmargin (stream, old_lm);
-  __argp_fmtstream_set_wmargin (stream, old_wm);
-}
-
-/* Output a long help message about the options in HOL to STREAM.  */
-static void
-hol_help (struct hol *hol, const struct argp_state *state,
-	  argp_fmtstream_t stream)
-{
-  unsigned num;
-  struct hol_entry *entry;
-  struct hol_help_state hhstate = { 0, 0, 0 };
-
-  for (entry = hol->entries, num = hol->num_entries; num > 0; entry++, num--)
-    hol_entry_help (entry, state, stream, &hhstate);
-
-  if (hhstate.suppressed_dup_arg && uparams.dup_args_note)
-    {
-      const char *tstr = dgettext (state->root_argp->argp_domain, "\
-Mandatory or optional arguments to long options are also mandatory or \
-optional for any corresponding short options.");
-      const char *fstr = filter_doc (tstr, ARGP_KEY_HELP_DUP_ARGS_NOTE,
-				     state ? state->root_argp : 0, state);
-      if (fstr && *fstr)
-	{
-	  __argp_fmtstream_putc (stream, '\n');
-	  __argp_fmtstream_puts (stream, fstr);
-	  __argp_fmtstream_putc (stream, '\n');
-	}
-      if (fstr && fstr != tstr)
-	free ((char *) fstr);
-    }
-}
-
-/* Helper functions for hol_usage.  */
-
-/* If OPT is a short option without an arg, append its key to the string
-   pointer pointer to by COOKIE, and advance the pointer.  */
-static int
-add_argless_short_opt (const struct argp_option *opt,
-		       const struct argp_option *real,
-		       const char *domain, void *cookie)
-{
-  char **snao_end = cookie;
-  if (!(opt->arg || real->arg)
-      && !((opt->flags | real->flags) & OPTION_NO_USAGE))
-    *(*snao_end)++ = opt->key;
-  return 0;
-}
-
-/* If OPT is a short option with an arg, output a usage entry for it to the
-   stream pointed at by COOKIE.  */
-static int
-usage_argful_short_opt (const struct argp_option *opt,
-			const struct argp_option *real,
-			const char *domain, void *cookie)
-{
-  argp_fmtstream_t stream = cookie;
-  const char *arg = opt->arg;
-  int flags = opt->flags | real->flags;
-
-  if (! arg)
-    arg = real->arg;
-
-  if (arg && !(flags & OPTION_NO_USAGE))
-    {
-      arg = dgettext (domain, arg);
-
-      if (flags & OPTION_ARG_OPTIONAL)
-	__argp_fmtstream_printf (stream, " [-%c[%s]]", opt->key, arg);
-      else
-	{
-	  /* Manually do line wrapping so that it (probably) won't
-	     get wrapped at the embedded space.  */
-	  space (stream, 6 + strlen (arg));
-	  __argp_fmtstream_printf (stream, "[-%c %s]", opt->key, arg);
-	}
-    }
-
-  return 0;
-}
-
-/* Output a usage entry for the long option opt to the stream pointed at by
-   COOKIE.  */
-static int
-usage_long_opt (const struct argp_option *opt,
-		const struct argp_option *real,
-		const char *domain, void *cookie)
-{
-  argp_fmtstream_t stream = cookie;
-  const char *arg = opt->arg;
-  int flags = opt->flags | real->flags;
-
-  if (! arg)
-    arg = real->arg;
-
-  if (! (flags & OPTION_NO_USAGE))
-    {
-      if (arg)
-	{
-	  arg = dgettext (domain, arg);
-	  if (flags & OPTION_ARG_OPTIONAL)
-	    __argp_fmtstream_printf (stream, " [--%s[=%s]]", opt->name, arg);
-	  else
-	    __argp_fmtstream_printf (stream, " [--%s=%s]", opt->name, arg);
-	}
-      else
-	__argp_fmtstream_printf (stream, " [--%s]", opt->name);
-    }
-
-  return 0;
-}
-
-/* Print a short usage description for the arguments in HOL to STREAM.  */
-static void
-hol_usage (struct hol *hol, argp_fmtstream_t stream)
-{
-  if (hol->num_entries > 0)
-    {
-      unsigned nentries;
-      struct hol_entry *entry;
-      char *short_no_arg_opts = alloca (strlen (hol->short_options) + 1);
-      char *snao_end = short_no_arg_opts;
-
-      /* First we put a list of short options without arguments.  */
-      for (entry = hol->entries, nentries = hol->num_entries
-	   ; nentries > 0
-	   ; entry++, nentries--)
-	hol_entry_short_iterate (entry, add_argless_short_opt,
-				 entry->argp->argp_domain, &snao_end);
-      if (snao_end > short_no_arg_opts)
-	{
-	  *snao_end++ = 0;
-	  __argp_fmtstream_printf (stream, " [-%s]", short_no_arg_opts);
-	}
-
-      /* Now a list of short options *with* arguments.  */
-      for (entry = hol->entries, nentries = hol->num_entries
-	   ; nentries > 0
-	   ; entry++, nentries--)
-	hol_entry_short_iterate (entry, usage_argful_short_opt,
-				 entry->argp->argp_domain, stream);
-
-      /* Finally, a list of long options (whew!).  */
-      for (entry = hol->entries, nentries = hol->num_entries
-	   ; nentries > 0
-	   ; entry++, nentries--)
-	hol_entry_long_iterate (entry, usage_long_opt,
-				entry->argp->argp_domain, stream);
-    }
-}
-
-/* Make a HOL containing all levels of options in ARGP.  CLUSTER is the
-   cluster in which ARGP's entries should be clustered, or 0.  */
-static struct hol *
-argp_hol (const struct argp *argp, struct hol_cluster *cluster)
-{
-  const struct argp_child *child = argp->children;
-  struct hol *hol = make_hol (argp, cluster);
-  if (child)
-    while (child->argp)
-      {
-	struct hol_cluster *child_cluster =
-	  ((child->group || child->header)
-	   /* Put CHILD->argp within its own cluster.  */
-	   ? hol_add_cluster (hol, child->group, child->header,
-			      child - argp->children, cluster, argp)
-	   /* Just merge it into the parent's cluster.  */
-	   : cluster);
-	hol_append (hol, argp_hol (child->argp, child_cluster)) ;
-	child++;
-      }
-  return hol;
-}
-
-/* Calculate how many different levels with alternative args strings exist in
-   ARGP.  */
-static size_t
-argp_args_levels (const struct argp *argp)
-{
-  size_t levels = 0;
-  const struct argp_child *child = argp->children;
-
-  if (argp->args_doc && strchr (argp->args_doc, '\n'))
-    levels++;
-
-  if (child)
-    while (child->argp)
-      levels += argp_args_levels ((child++)->argp);
-
-  return levels;
-}
-
-/* Print all the non-option args documented in ARGP to STREAM.  Any output is
-   preceded by a space.  LEVELS is a pointer to a byte vector the length
-   returned by argp_args_levels; it should be initialized to zero, and
-   updated by this routine for the next call if ADVANCE is true.  True is
-   returned as long as there are more patterns to output.  */
-static int
-argp_args_usage (const struct argp *argp, const struct argp_state *state,
-		 char **levels, int advance, argp_fmtstream_t stream)
-{
-  char *our_level = *levels;
-  int multiple = 0;
-  const struct argp_child *child = argp->children;
-  const char *tdoc = dgettext (argp->argp_domain, argp->args_doc), *nl = 0;
-  const char *fdoc = filter_doc (tdoc, ARGP_KEY_HELP_ARGS_DOC, argp, state);
-
-  if (fdoc)
-    {
-      const char *cp = fdoc;
-      nl = strchr (cp, '\n');
-      if (!nl)
-        {
-          nl = cp;
-          while (*nl != '\0') nl++;
-        }
-
-      if (*nl != '\0')
-	/* This is a `multi-level' args doc; advance to the correct position
-	   as determined by our state in LEVELS, and update LEVELS.  */
-	{
-	  int i;
-	  multiple = 1;
-	  for (i = 0; i < *our_level; i++)
-            {
-              cp = nl + 1;
-              nl = strchr (cp, '\n');
-              if (!nl)
-                {
-                  nl = cp;
-                  while (*nl != '\0') nl++;
-                }
-            }
-	  (*levels)++;
-	}
-
-      /* Manually do line wrapping so that it (probably) won't get wrapped at
-	 any embedded spaces.  */
-      space (stream, 1 + nl - cp);
-
-      __argp_fmtstream_write (stream, cp, nl - cp);
-    }
-  if (fdoc && fdoc != tdoc)
-    free ((char *)fdoc);	/* Free user's modified doc string.  */
-
-  if (child)
-    while (child->argp)
-      advance = !argp_args_usage ((child++)->argp, state, levels, advance, stream);
-
-  if (advance && multiple)
-    {
-      /* Need to increment our level.  */
-      if (*nl)
-	/* There's more we can do here.  */
-	{
-	  (*our_level)++;
-	  advance = 0;		/* Our parent shouldn't advance also. */
-	}
-      else if (*our_level > 0)
-	/* We had multiple levels, but used them up; reset to zero.  */
-	*our_level = 0;
-    }
-
-  return !advance;
-}
-
-/* Print the documentation for ARGP to STREAM; if POST is false, then
-   everything preceeding a `\v' character in the documentation strings (or
-   the whole string, for those with none) is printed, otherwise, everything
-   following the `\v' character (nothing for strings without).  Each separate
-   bit of documentation is separated a blank line, and if PRE_BLANK is true,
-   then the first is as well.  If FIRST_ONLY is true, only the first
-   occurrence is output.  Returns true if anything was output.  */
-static int
-argp_doc (const struct argp *argp, const struct argp_state *state,
-	  int post, int pre_blank, int first_only,
-	  argp_fmtstream_t stream)
-{
-  const char *text;
-  const char *inp_text;
-  char *tmp_text;
-  void *input = 0;
-  int anything = 0;
-  size_t inp_text_limit = 0;
-  const char *doc = dgettext (argp->argp_domain, argp->doc);
-  const struct argp_child *child = argp->children;
-
-  if (doc)
-    {
-      char *vt = strchr (doc, '\v');
-      inp_text = post ? (vt ? vt + 1 : 0) : doc;
-      inp_text_limit = (!post && vt) ? (vt - doc) : 0;
-    }
-  else
-    inp_text = 0;
-
-  if (argp->help_filter)
-    /* We have to filter the doc strings.  */
-    {
-      if (inp_text_limit)
-        {
-          /* Copy INP_TEXT so that it's nul-terminated. */
-          tmp_text = _malloc_r (_REENT, inp_text_limit);
-          strncpy (tmp_text, inp_text, inp_text_limit);
-          _free_r (_REENT, inp_text);
-          inp_text = tmp_text;
-        }
-      input = __argp_input (argp, state);
-      text =
-	(*argp->help_filter) (post
-			      ? ARGP_KEY_HELP_POST_DOC
-			      : ARGP_KEY_HELP_PRE_DOC,
-			      inp_text, input);
-    }
-  else
-    text = (const char *) inp_text;
-
-  if (text)
-    {
-      if (pre_blank)
-	__argp_fmtstream_putc (stream, '\n');
-
-      if (text == inp_text && inp_text_limit)
-	__argp_fmtstream_write (stream, inp_text, inp_text_limit);
-      else
-	__argp_fmtstream_puts (stream, text);
-
-      if (__argp_fmtstream_point (stream) > __argp_fmtstream_lmargin (stream))
-	__argp_fmtstream_putc (stream, '\n');
-
-      anything = 1;
-    }
-
-  if (text && text != inp_text)
-    free ((char *) text);	/* Free TEXT returned from the help filter.  */
-  if (inp_text && inp_text_limit && argp->help_filter)
-    free ((char *) inp_text);	/* We copied INP_TEXT, so free it now.  */
-
-  if (post && argp->help_filter)
-    /* Now see if we have to output a ARGP_KEY_HELP_EXTRA text.  */
-    {
-      text = (*argp->help_filter) (ARGP_KEY_HELP_EXTRA, 0, input);
-      if (text)
-	{
-	  if (anything || pre_blank)
-	    __argp_fmtstream_putc (stream, '\n');
-	  __argp_fmtstream_puts (stream, text);
-	  free ((char *) text);
-	  if (__argp_fmtstream_point (stream)
-	      > __argp_fmtstream_lmargin (stream))
-	    __argp_fmtstream_putc (stream, '\n');
-	  anything = 1;
-	}
-    }
-
-  if (child)
-    while (child->argp && !(first_only && anything))
-      anything |=
-	argp_doc ((child++)->argp, state,
-		  post, anything || pre_blank, first_only,
-		  stream);
-
-  return anything;
-}
-
-/* Output a usage message for ARGP to STREAM.  If called from
-   argp_state_help, STATE is the relevent parsing state.  FLAGS are from the
-   set ARGP_HELP_*.  NAME is what to use wherever a `program name' is
-   needed. */
-static void
-_help (const struct argp *argp, const struct argp_state *state, FILE *stream,
-       unsigned flags, char *name)
-{
-  int anything = 0;		/* Whether we've output anything.  */
-  struct hol *hol = 0;
-  argp_fmtstream_t fs;
-
-  if (! stream)
-    return;
-
-  _flockfile (stream);
-
-  if (! uparams.valid)
-    fill_in_uparams (state);
-
-  fs = __argp_make_fmtstream (stream, 0, uparams.rmargin, 0);
-  if (! fs)
-    {
-      _funlockfile (stream);
-      return;
-    }
-
-  if (flags & (ARGP_HELP_USAGE | ARGP_HELP_SHORT_USAGE | ARGP_HELP_LONG))
-    {
-      hol = argp_hol (argp, 0);
-
-      /* If present, these options always come last.  */
-      hol_set_group (hol, "help", -1);
-      hol_set_group (hol, "version", -1);
-
-      hol_sort (hol);
-    }
-
-  if (flags & (ARGP_HELP_USAGE | ARGP_HELP_SHORT_USAGE))
-    /* Print a short `Usage:' message.  */
-    {
-      int first_pattern = 1, more_patterns;
-      size_t num_pattern_levels = argp_args_levels (argp);
-      char *pattern_levels = alloca (num_pattern_levels);
-
-      memset (pattern_levels, 0, num_pattern_levels);
-
-      do
-	{
-	  int old_lm;
-	  int old_wm = __argp_fmtstream_set_wmargin (fs, uparams.usage_indent);
-	  char *levels = pattern_levels;
-
-	  if (first_pattern)
-	    __argp_fmtstream_printf (fs, "%s %s",
-				     dgettext (argp->argp_domain, "Usage:"),
-				     name);
-	  else
-	    __argp_fmtstream_printf (fs, "%s %s",
-				     dgettext (argp->argp_domain, "  or: "),
-				     name);
-
-	  /* We set the lmargin as well as the wmargin, because hol_usage
-	     manually wraps options with newline to avoid annoying breaks.  */
-	  old_lm = __argp_fmtstream_set_lmargin (fs, uparams.usage_indent);
-
-	  if (flags & ARGP_HELP_SHORT_USAGE)
-	    /* Just show where the options go.  */
-	    {
-	      if (hol->num_entries > 0)
-		__argp_fmtstream_puts (fs, dgettext (argp->argp_domain,
-						     " [OPTION...]"));
-	    }
-	  else
-	    /* Actually print the options.  */
-	    {
-	      hol_usage (hol, fs);
-	      flags |= ARGP_HELP_SHORT_USAGE; /* But only do so once.  */
-	    }
-
-	  more_patterns = argp_args_usage (argp, state, &levels, 1, fs);
-
-	  __argp_fmtstream_set_wmargin (fs, old_wm);
-	  __argp_fmtstream_set_lmargin (fs, old_lm);
-
-	  __argp_fmtstream_putc (fs, '\n');
-	  anything = 1;
-
-	  first_pattern = 0;
-	}
-      while (more_patterns);
-    }
-
-  if (flags & ARGP_HELP_PRE_DOC)
-    anything |= argp_doc (argp, state, 0, 0, 1, fs);
-
-  if (flags & ARGP_HELP_SEE)
-    {
-      __argp_fmtstream_printf (fs, dgettext (argp->argp_domain, "\
-Try `%s --help' or `%s --usage' for more information.\n"),
-			       name, name);
-      anything = 1;
-    }
-
-  if (flags & ARGP_HELP_LONG)
-    /* Print a long, detailed help message.  */
-    {
-      /* Print info about all the options.  */
-      if (hol->num_entries > 0)
-	{
-	  if (anything)
-	    __argp_fmtstream_putc (fs, '\n');
-	  hol_help (hol, state, fs);
-	  anything = 1;
-	}
-    }
-
-  if (flags & ARGP_HELP_POST_DOC)
-    /* Print any documentation strings at the end.  */
-    anything |= argp_doc (argp, state, 1, anything, 0, fs);
-
-  if ((flags & ARGP_HELP_BUG_ADDR) && argp_program_bug_address)
-    {
-      if (anything)
-	__argp_fmtstream_putc (fs, '\n');
-      __argp_fmtstream_printf (fs, dgettext (argp->argp_domain,
-					     "Report bugs to %s.\n"),
- 			       argp_program_bug_address);
-      anything = 1;
-    }
-
-  _funlockfile (stream);
-
-  if (hol)
-    hol_free (hol);
-
-  __argp_fmtstream_free (fs);
-}
-
-/* Output a usage message for ARGP to STREAM.  FLAGS are from the set
-   ARGP_HELP_*.  NAME is what to use wherever a `program name' is needed. */
-void __argp_help (const struct argp *argp, FILE *stream,
-		  unsigned flags, char *name)
-{
-  _help (argp, 0, stream, flags, name);
-}
-#ifdef weak_alias
-weak_alias (__argp_help, argp_help)
-#endif
-
-/* Output, if appropriate, a usage message for STATE to STREAM.  FLAGS are
-   from the set ARGP_HELP_*.  */
-void
-__argp_state_help (const struct argp_state *state, FILE *stream, unsigned flags)
-{
-  if ((!state || ! (state->flags & ARGP_NO_ERRS)) && stream)
-    {
-      if (state && (state->flags & ARGP_LONG_ONLY))
-	flags |= ARGP_HELP_LONG_ONLY;
-
-      _help (state ? state->root_argp : 0, state, stream, flags,
-	     state ? state->name : program_invocation_short_name);
-
-      if (!state || ! (state->flags & ARGP_NO_EXIT))
-	{
-	  if (flags & ARGP_HELP_EXIT_ERR)
-	    exit (argp_err_exit_status);
-	  if (flags & ARGP_HELP_EXIT_OK)
-	    exit (0);
-	}
-  }
-}
-#ifdef weak_alias
-weak_alias (__argp_state_help, argp_state_help)
-#endif
-
-/* If appropriate, print the printf string FMT and following args, preceded
-   by the program name and `:', to stderr, and followed by a `Try ... --help'
-   message, then exit (1).  */
-void
-__argp_error (const struct argp_state *state, const char *fmt, ...)
-{
-  if (!state || !(state->flags & ARGP_NO_ERRS))
-    {
-      FILE *stream = state ? state->err_stream : stderr;
-
-      if (stream)
-	{
-	  va_list ap;
-
-	  _flockfile (stream);
-
-	  va_start (ap, fmt);
-
-#ifdef USE_IN_LIBIO
-	  if (_IO_fwide (stream, 0) > 0)
-	    {
-	      char *buf;
-
-	      __asprintf (&buf, fmt, ap);
-
-	      __fwprintf (stream, L"%s: %s\n",
-			  state ? state->name : program_invocation_short_name,
-			  buf);
-
-	      free (buf);
-	    }
-	  else
-#endif
-	    {
-	      fputs (state
-			      ? state->name : program_invocation_short_name,
-			      stream);
-	      putc_unlocked (':', stream);
-	      putc_unlocked (' ', stream);
-
-	      vfprintf (stream, fmt, ap);
-
-	      putc_unlocked ('\n', stream);
-	    }
-
-	  __argp_state_help (state, stream, ARGP_HELP_STD_ERR);
-
-	  va_end (ap);
-
-	  _funlockfile (stream);
-	}
-    }
-}
-#ifdef weak_alias
-weak_alias (__argp_error, argp_error)
-#endif
-
-/* Similar to the standard gnu error-reporting function error(), but will
-   respect the ARGP_NO_EXIT and ARGP_NO_ERRS flags in STATE, and will print
-   to STATE->err_stream.  This is useful for argument parsing code that is
-   shared between program startup (when exiting is desired) and runtime
-   option parsing (when typically an error code is returned instead).  The
-   difference between this function and argp_error is that the latter is for
-   *parsing errors*, and the former is for other problems that occur during
-   parsing but don't reflect a (syntactic) problem with the input.  */
-void
-__argp_failure (const struct argp_state *state, int status, int errnum,
-		const char *fmt, ...)
-{
-  if (!state || !(state->flags & ARGP_NO_ERRS))
-    {
-      FILE *stream = state ? state->err_stream : stderr;
-
-      if (stream)
-	{
-	  _flockfile (stream);
-
-#ifdef USE_IN_LIBIO
-	  if (_IO_fwide (stream, 0) > 0)
-	    __fwprintf (stream, L"%s",
-			state ? state->name : program_invocation_short_name);
-	  else
-#endif
-	    fputs (state
-			    ? state->name : program_invocation_short_name,
-			    stream);
-
-	  if (fmt)
-	    {
-	      va_list ap;
-
-	      va_start (ap, fmt);
-#ifdef USE_IN_LIBIO
-	      if (_IO_fwide (stream, 0) > 0)
-		{
-		  char *buf;
-
-		  __asprintf (&buf, fmt, ap);
-
-		  __fwprintf (stream, L": %s", buf);
-
-		  free (buf);
-		}
-	      else
-#endif
-		{
-		  putc_unlocked (':', stream);
-		  putc_unlocked (' ', stream);
-
-		  vfprintf (stream, fmt, ap);
-		}
-
-	      va_end (ap);
-	    }
-
-	  if (errnum)
-	    {
-	      char buf[200];
-
-#ifdef USE_IN_LIBIO
-	      if (_IO_fwide (stream, 0) > 0)
-		__fwprintf (stream, L": %s",
-			    strerror_r (errnum, buf, sizeof (buf)));
-	      else
-#endif
-		{
-		  putc_unlocked (':', stream);
-		  putc_unlocked (' ', stream);
-		  fputs (strerror_r (errnum, buf, sizeof (buf)), stream);
-		}
-	    }
-
-#ifdef USE_IN_LIBIO
-	  if (_IO_fwide (stream, 0) > 0)
-	    putwc_unlocked (L'\n', stream);
-	  else
-#endif
-	    putc_unlocked ('\n', stream);
-
-	  _funlockfile (stream);
-
-	  if (status && (!state || !(state->flags & ARGP_NO_EXIT)))
-	    exit (status);
-	}
-    }
-}
-#ifdef weak_alias
-weak_alias (__argp_failure, argp_failure)
-#endif
diff --git a/newlib/libc/sys/linux/argp/argp-namefrob.h b/newlib/libc/sys/linux/argp/argp-namefrob.h
deleted file mode 100644
index 668f35d..0000000
--- a/newlib/libc/sys/linux/argp/argp-namefrob.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Name frobnication for compiling argp outside of glibc
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#if !_LIBC
-/* This code is written for inclusion in gnu-libc, and uses names in the
-   namespace reserved for libc.  If we're not compiling in libc, define those
-   names to be the normal ones instead.  */
-
-/* argp-parse functions */
-#undef __argp_parse
-#define __argp_parse argp_parse
-#undef __option_is_end
-#define __option_is_end _option_is_end
-#undef __option_is_short
-#define __option_is_short _option_is_short
-#undef __argp_input
-#define __argp_input _argp_input
-
-/* argp-help functions */
-#undef __argp_help
-#define __argp_help argp_help
-#undef __argp_error
-#define __argp_error argp_error
-#undef __argp_failure
-#define __argp_failure argp_failure
-#undef __argp_state_help
-#define __argp_state_help argp_state_help
-#undef __argp_usage
-#define __argp_usage argp_usage
-
-/* argp-fmtstream functions */
-#undef __argp_make_fmtstream
-#define __argp_make_fmtstream argp_make_fmtstream
-#undef __argp_fmtstream_free
-#define __argp_fmtstream_free argp_fmtstream_free
-#undef __argp_fmtstream_putc
-#define __argp_fmtstream_putc argp_fmtstream_putc
-#undef __argp_fmtstream_puts
-#define __argp_fmtstream_puts argp_fmtstream_puts
-#undef __argp_fmtstream_write
-#define __argp_fmtstream_write argp_fmtstream_write
-#undef __argp_fmtstream_printf
-#define __argp_fmtstream_printf argp_fmtstream_printf
-#undef __argp_fmtstream_set_lmargin
-#define __argp_fmtstream_set_lmargin argp_fmtstream_set_lmargin
-#undef __argp_fmtstream_set_rmargin
-#define __argp_fmtstream_set_rmargin argp_fmtstream_set_rmargin
-#undef __argp_fmtstream_set_wmargin
-#define __argp_fmtstream_set_wmargin argp_fmtstream_set_wmargin
-#undef __argp_fmtstream_point
-#define __argp_fmtstream_point argp_fmtstream_point
-#undef __argp_fmtstream_update
-#define __argp_fmtstream_update _argp_fmtstream_update
-#undef __argp_fmtstream_ensure
-#define __argp_fmtstream_ensure _argp_fmtstream_ensure
-#undef __argp_fmtstream_lmargin
-#define __argp_fmtstream_lmargin argp_fmtstream_lmargin
-#undef __argp_fmtstream_rmargin
-#define __argp_fmtstream_rmargin argp_fmtstream_rmargin
-#undef __argp_fmtstream_wmargin
-#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
-
-/* normal libc functions we call */
-#undef __sleep
-#define __sleep sleep
-#undef __strcasecmp
-#define __strcasecmp strcasecmp
-#undef __vsnprintf
-#define __vsnprintf vsnprintf
-
-#endif /* !_LIBC */
-
-#ifndef __set_errno
-#define __set_errno(e) (errno = (e))
-#endif
diff --git a/newlib/libc/sys/linux/argp/argp-parse.c b/newlib/libc/sys/linux/argp/argp-parse.c
deleted file mode 100644
index 38211e3..0000000
--- a/newlib/libc/sys/linux/argp/argp-parse.c
+++ /dev/null
@@ -1,966 +0,0 @@
-/* Hierarchial argument parsing, layered over getopt
-   Copyright (C) 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <limits.h>
-#include <getopt.h>
-
-#ifndef _
-/* This is for other GNU distributions with internationalized messages.
-   When compiling libc, the _ macro is predefined.  */
-# if defined HAVE_LIBINTL_H || defined _LIBC
-#  include <libintl.h>
-#  ifdef _LIBC
-#   undef dgettext
-#   define dgettext(domain, msgid) __dcgettext (domain, msgid, LC_MESSAGES)
-#  endif
-# else
-#  define dgettext(domain, msgid) (msgid)
-#  define gettext(msgid) (msgid)
-# endif
-#endif
-#ifndef N_
-# define N_(msgid) (msgid)
-#endif
-
-#if _LIBC - 0
-#include <bits/libc-lock.h>
-#else
-#ifdef HAVE_CTHREADS_H
-#include <cthreads.h>
-#endif
-#endif /* _LIBC */
-
-#include <argp.h>
-#include "argp-namefrob.h"
-
-/* Getopt return values.  */
-#define KEY_END (-1)		/* The end of the options.  */
-#define KEY_ARG 1		/* A non-option argument.  */
-#define KEY_ERR '?'		/* An error parsing the options.  */
-
-/* The meta-argument used to prevent any further arguments being interpreted
-   as options.  */
-#define QUOTE "--"
-
-/* The number of bits we steal in a long-option value for our own use.  */
-#define GROUP_BITS CHAR_BIT
-
-/* The number of bits available for the user value.  */
-#define USER_BITS ((sizeof ((struct option *)0)->val * CHAR_BIT) - GROUP_BITS)
-#define USER_MASK ((1 << USER_BITS) - 1)
-
-/* EZ alias for ARGP_ERR_UNKNOWN.  */
-#define EBADKEY ARGP_ERR_UNKNOWN
-
-/* Default options.  */
-
-/* When argp is given the --HANG switch, _ARGP_HANG is set and argp will sleep
-   for one second intervals, decrementing _ARGP_HANG until it's zero.  Thus
-   you can force the program to continue by attaching a debugger and setting
-   it to 0 yourself.  */
-volatile int _argp_hang;
-
-#define OPT_PROGNAME	-2
-#define OPT_USAGE	-3
-#define OPT_HANG	-4
-
-static const struct argp_option argp_default_options[] =
-{
-  {"help",	  '?',    	0, 0,  N_("Give this help list"), -1},
-  {"usage",	  OPT_USAGE,	0, 0,  N_("Give a short usage message")},
-  {"program-name",OPT_PROGNAME,"NAME", OPTION_HIDDEN, N_("Set the program name")},
-  {"HANG",	  OPT_HANG,    "SECS", OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
-     N_("Hang for SECS seconds (default 3600)")},
-  {0, 0}
-};
-
-static error_t
-argp_default_parser (int key, char *arg, struct argp_state *state)
-{
-  switch (key)
-    {
-    case '?':
-      __argp_state_help (state, state->out_stream, ARGP_HELP_STD_HELP);
-      break;
-    case OPT_USAGE:
-      __argp_state_help (state, state->out_stream,
-		       ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
-      break;
-
-    case OPT_PROGNAME:		/* Set the program name.  */
-      program_invocation_name = arg;
-
-      /* [Note that some systems only have PROGRAM_INVOCATION_SHORT_NAME (aka
-	 __PROGNAME), in which case, PROGRAM_INVOCATION_NAME is just defined
-	 to be that, so we have to be a bit careful here.]  */
-      arg = strrchr (arg, '/');
-      if (arg)
-	program_invocation_short_name = arg + 1;
-      else
-	program_invocation_short_name = program_invocation_name;
-
-      /* Update what we use for messages.  */
-      state->name = program_invocation_short_name;
-
-      if ((state->flags & (ARGP_PARSE_ARGV0 | ARGP_NO_ERRS))
-	  == ARGP_PARSE_ARGV0)
-	/* Update what getopt uses too.  */
-	state->argv[0] = program_invocation_name;
-
-      break;
-
-    case OPT_HANG:
-      _argp_hang = atoi (arg ? arg : "3600");
-      while (_argp_hang-- > 0)
-	__sleep (1);
-      break;
-
-    default:
-      return EBADKEY;
-    }
-  return 0;
-}
-
-static const struct argp argp_default_argp =
-  {argp_default_options, &argp_default_parser, NULL, NULL, NULL, NULL, "libc"};
-
-
-static const struct argp_option argp_version_options[] =
-{
-  {"version",	  'V',    	0, 0,  N_("Print program version"), -1},
-  {0, 0}
-};
-
-static error_t
-argp_version_parser (int key, char *arg, struct argp_state *state)
-{
-  switch (key)
-    {
-    case 'V':
-      if (argp_program_version_hook)
-	(*argp_program_version_hook) (state->out_stream, state);
-      else if (argp_program_version)
-	fprintf (state->out_stream, "%s\n", argp_program_version);
-      else
-	__argp_error (state, dgettext (state->root_argp->argp_domain,
-				       "(PROGRAM ERROR) No version known!?"));
-      if (! (state->flags & ARGP_NO_EXIT))
-	exit (0);
-      break;
-    default:
-      return EBADKEY;
-    }
-  return 0;
-}
-
-static const struct argp argp_version_argp =
-  {argp_version_options, &argp_version_parser, NULL, NULL, NULL, NULL, "libc"};
-
-/* Returns the offset into the getopt long options array LONG_OPTIONS of a
-   long option with called NAME, or -1 if none is found.  Passing NULL as
-   NAME will return the number of options.  */
-static int
-find_long_option (struct option *long_options, const char *name)
-{
-  struct option *l = long_options;
-  while (l->name != NULL)
-    if (name != NULL && strcmp (l->name, name) == 0)
-      return l - long_options;
-    else
-      l++;
-  if (name == NULL)
-    return l - long_options;
-  else
-    return -1;
-}
-
-/* If we can, we regulate access to getopt, which is non-reentrant, with a
-   mutex.  Since the case we're trying to guard against is two different
-   threads interfering, and it's possible that someone might want to call
-   argp_parse recursively (they're careful), we use a recursive lock if
-   possible.  */
-
-#if _LIBC - 0
-
-__libc_lock_define_initialized_recursive (static, getopt_lock)
-#define LOCK_GETOPT   __libc_lock_lock_recursive (getopt_lock)
-#define UNLOCK_GETOPT __libc_lock_unlock_recursive (getopt_lock)
-
-#else /* !_LIBC */
-#ifdef HAVE_CTHREADS_H
-
-static struct mutex getopt_lock = MUTEX_INITIALIZER;
-#define LOCK_GETOPT   mutex_lock (&getopt_lock)
-#define UNLOCK_GETOPT mutex_unlock (&getopt_lock)
-
-#else /* !HAVE_CTHREADS_H */
-
-#define LOCK_GETOPT    (void)0
-#define UNLOCK_GETOPT  (void)0
-
-#endif /* HAVE_CTHREADS_H */
-#endif /* _LIBC */
-
-/* This hack to allow programs that know what's going on to call argp
-   recursively.  If someday argp is changed not to use the non-reentrant
-   getopt interface, we can get rid of this shit.  XXX */
-void
-_argp_unlock_xxx (void)
-{
-  UNLOCK_GETOPT;
-}
-
-/* The state of a `group' during parsing.  Each group corresponds to a
-   particular argp structure from the tree of such descending from the top
-   level argp passed to argp_parse.  */
-struct group
-{
-  /* This group's parsing function.  */
-  argp_parser_t parser;
-
-  /* Which argp this group is from.  */
-  const struct argp *argp;
-
-  /* Points to the point in SHORT_OPTS corresponding to the end of the short
-     options for this group.  We use it to determine from which group a
-     particular short options is from.  */
-  char *short_end;
-
-  /* The number of non-option args sucessfully handled by this parser.  */
-  unsigned args_processed;
-
-  /* This group's parser's parent's group.  */
-  struct group *parent;
-  unsigned parent_index;	/* And the our position in the parent.   */
-
-  /* These fields are swapped into and out of the state structure when
-     calling this group's parser.  */
-  void *input, **child_inputs;
-  void *hook;
-};
-
-/* Call GROUP's parser with KEY and ARG, swapping any group-specific info
-   from STATE before calling, and back into state afterwards.  If GROUP has
-   no parser, EBADKEY is returned.  */
-static error_t
-group_parse (struct group *group, struct argp_state *state, int key, char *arg)
-{
-  if (group->parser)
-    {
-      error_t err;
-      state->hook = group->hook;
-      state->input = group->input;
-      state->child_inputs = group->child_inputs;
-      state->arg_num = group->args_processed;
-      err = (*group->parser)(key, arg, state);
-      group->hook = state->hook;
-      return err;
-    }
-  else
-    return EBADKEY;
-}
-
-struct parser
-{
-  const struct argp *argp;
-
-  /* SHORT_OPTS is the getopt short options string for the union of all the
-     groups of options.  */
-  char *short_opts;
-  /* LONG_OPTS is the array of getop long option structures for the union of
-     all the groups of options.  */
-  struct option *long_opts;
-
-  /* States of the various parsing groups.  */
-  struct group *groups;
-  /* The end of the GROUPS array.  */
-  struct group *egroup;
-  /* An vector containing storage for the CHILD_INPUTS field in all groups.  */
-  void **child_inputs;
-
-  /* True if we think using getopt is still useful; if false, then
-     remaining arguments are just passed verbatim with ARGP_KEY_ARG.  This is
-     cleared whenever getopt returns KEY_END, but may be set again if the user
-     moves the next argument pointer backwards.  */
-  int try_getopt;
-
-  /* State block supplied to parsing routines.  */
-  struct argp_state state;
-
-  /* Memory used by this parser.  */
-  void *storage;
-};
-
-/* The next usable entries in the various parser tables being filled in by
-   convert_options.  */
-struct parser_convert_state
-{
-  struct parser *parser;
-  char *short_end;
-  struct option *long_end;
-  void **child_inputs_end;
-};
-
-/* Converts all options in ARGP (which is put in GROUP) and ancestors
-   into getopt options stored in SHORT_OPTS and LONG_OPTS; SHORT_END and
-   CVT->LONG_END are the points at which new options are added.  Returns the
-   next unused group entry.  CVT holds state used during the conversion.  */
-static struct group *
-convert_options (const struct argp *argp,
-		 struct group *parent, unsigned parent_index,
-		 struct group *group, struct parser_convert_state *cvt)
-{
-  /* REAL is the most recent non-alias value of OPT.  */
-  const struct argp_option *real = argp->options;
-  const struct argp_child *children = argp->children;
-
-  if (real || argp->parser)
-    {
-      const struct argp_option *opt;
-
-      if (real)
-	for (opt = real; !__option_is_end (opt); opt++)
-	  {
-	    if (! (opt->flags & OPTION_ALIAS))
-	      /* OPT isn't an alias, so we can use values from it.  */
-	      real = opt;
-
-	    if (! (real->flags & OPTION_DOC))
-	      /* A real option (not just documentation).  */
-	      {
-		if (__option_is_short (opt))
-		  /* OPT can be used as a short option.  */
-		  {
-		    *cvt->short_end++ = opt->key;
-		    if (real->arg)
-		      {
-			*cvt->short_end++ = ':';
-			if (real->flags & OPTION_ARG_OPTIONAL)
-			  *cvt->short_end++ = ':';
-		      }
-		    *cvt->short_end = '\0'; /* keep 0 terminated */
-		  }
-
-		if (opt->name
-		    && find_long_option (cvt->parser->long_opts, opt->name) < 0)
-		  /* OPT can be used as a long option.  */
-		  {
-		    cvt->long_end->name = opt->name;
-		    cvt->long_end->has_arg =
-		      (real->arg
-		       ? (real->flags & OPTION_ARG_OPTIONAL
-			  ? optional_argument
-			  : required_argument)
-		       : no_argument);
-		    cvt->long_end->flag = 0;
-		    /* we add a disambiguating code to all the user's
-		       values (which is removed before we actually call
-		       the function to parse the value); this means that
-		       the user loses use of the high 8 bits in all his
-		       values (the sign of the lower bits is preserved
-		       however)...  */
-		    cvt->long_end->val =
-		      ((opt->key | real->key) & USER_MASK)
-		      + (((group - cvt->parser->groups) + 1) << USER_BITS);
-
-		    /* Keep the LONG_OPTS list terminated.  */
-		    (++cvt->long_end)->name = NULL;
-		  }
-	      }
-	    }
-
-      group->parser = argp->parser;
-      group->argp = argp;
-      group->short_end = cvt->short_end;
-      group->args_processed = 0;
-      group->parent = parent;
-      group->parent_index = parent_index;
-      group->input = 0;
-      group->hook = 0;
-      group->child_inputs = 0;
-
-      if (children)
-	/* Assign GROUP's CHILD_INPUTS field some space from
-           CVT->child_inputs_end.*/
-	{
-	  unsigned num_children = 0;
-	  while (children[num_children].argp)
-	    num_children++;
-	  group->child_inputs = cvt->child_inputs_end;
-	  cvt->child_inputs_end += num_children;
-	}
-
-      parent = group++;
-    }
-  else
-    parent = 0;
-
-  if (children)
-    {
-      unsigned index = 0;
-      while (children->argp)
-	group =
-	  convert_options (children++->argp, parent, index++, group, cvt);
-    }
-
-  return group;
-}
-
-/* Find the merged set of getopt options, with keys appropiately prefixed. */
-static void
-parser_convert (struct parser *parser, const struct argp *argp, int flags)
-{
-  struct parser_convert_state cvt;
-
-  cvt.parser = parser;
-  cvt.short_end = parser->short_opts;
-  cvt.long_end = parser->long_opts;
-  cvt.child_inputs_end = parser->child_inputs;
-
-  if (flags & ARGP_IN_ORDER)
-    *cvt.short_end++ = '-';
-  else if (flags & ARGP_NO_ARGS)
-    *cvt.short_end++ = '+';
-  *cvt.short_end = '\0';
-
-  cvt.long_end->name = NULL;
-
-  parser->argp = argp;
-
-  if (argp)
-    parser->egroup = convert_options (argp, 0, 0, parser->groups, &cvt);
-  else
-    parser->egroup = parser->groups; /* No parsers at all! */
-}
-
-/* Lengths of various parser fields which we will allocated.  */
-struct parser_sizes
-{
-  size_t short_len;		/* Getopt short options string.  */
-  size_t long_len;		/* Getopt long options vector.  */
-  size_t num_groups;		/* Group structures we allocate.  */
-  size_t num_child_inputs;	/* Child input slots.  */
-};
-
-/* For ARGP, increments the NUM_GROUPS field in SZS by the total number of
- argp structures descended from it, and the SHORT_LEN & LONG_LEN fields by
- the maximum lengths of the resulting merged getopt short options string and
- long-options array, respectively.  */
-static void
-calc_sizes (const struct argp *argp,  struct parser_sizes *szs)
-{
-  const struct argp_child *child = argp->children;
-  const struct argp_option *opt = argp->options;
-
-  if (opt || argp->parser)
-    {
-      szs->num_groups++;
-      if (opt)
-	{
-	  int num_opts = 0;
-	  while (!__option_is_end (opt++))
-	    num_opts++;
-	  szs->short_len += num_opts * 3; /* opt + up to 2 `:'s */
-	  szs->long_len += num_opts;
-	}
-    }
-
-  if (child)
-    while (child->argp)
-      {
-	calc_sizes ((child++)->argp, szs);
-	szs->num_child_inputs++;
-      }
-}
-
-/* Initializes PARSER to parse ARGP in a manner described by FLAGS.  */
-static error_t
-parser_init (struct parser *parser, const struct argp *argp,
-	     int argc, char **argv, int flags, void *input)
-{
-  error_t err = 0;
-  struct group *group;
-  struct parser_sizes szs;
-
-  szs.short_len = (flags & ARGP_NO_ARGS) ? 0 : 1;
-  szs.long_len = 0;
-  szs.num_groups = 0;
-  szs.num_child_inputs = 0;
-
-  if (argp)
-    calc_sizes (argp, &szs);
-
-  /* Lengths of the various bits of storage used by PARSER.  */
-#define GLEN (szs.num_groups + 1) * sizeof (struct group)
-#define CLEN (szs.num_child_inputs * sizeof (void *))
-#define LLEN ((szs.long_len + 1) * sizeof (struct option))
-#define SLEN (szs.short_len + 1)
-
-  parser->storage = malloc (GLEN + CLEN + LLEN + SLEN);
-  if (! parser->storage)
-    return ENOMEM;
-
-  parser->groups = parser->storage;
-  parser->child_inputs = parser->storage + GLEN;
-  parser->long_opts = parser->storage + GLEN + CLEN;
-  parser->short_opts = parser->storage + GLEN + CLEN + LLEN;
-
-  memset (parser->child_inputs, 0, szs.num_child_inputs * sizeof (void *));
-  parser_convert (parser, argp, flags);
-
-  memset (&parser->state, 0, sizeof (struct argp_state));
-  parser->state.root_argp = parser->argp;
-  parser->state.argc = argc;
-  parser->state.argv = argv;
-  parser->state.flags = flags;
-  parser->state.err_stream = stderr;
-  parser->state.out_stream = stdout;
-  parser->state.next = 0;	/* Tell getopt to initialize.  */
-  parser->state.pstate = parser;
-
-  parser->try_getopt = 1;
-
-  /* Call each parser for the first time, giving it a chance to propagate
-     values to child parsers.  */
-  if (parser->groups < parser->egroup)
-    parser->groups->input = input;
-  for (group = parser->groups;
-       group < parser->egroup && (!err || err == EBADKEY);
-       group++)
-    {
-      if (group->parent)
-	/* If a child parser, get the initial input value from the parent. */
-	group->input = group->parent->child_inputs[group->parent_index];
-
-      if (!group->parser
-	  && group->argp->children && group->argp->children->argp)
-	/* For the special case where no parsing function is supplied for an
-	   argp, propagate its input to its first child, if any (this just
-	   makes very simple wrapper argps more convenient).  */
-	group->child_inputs[0] = group->input;
-
-      err = group_parse (group, &parser->state, ARGP_KEY_INIT, 0);
-    }
-  if (err == EBADKEY)
-    err = 0;			/* Some parser didn't understand.  */
-
-  if (err)
-    return err;
-
-  /* Getopt is (currently) non-reentrant.  */
-  LOCK_GETOPT;
-
-  if (parser->state.flags & ARGP_NO_ERRS)
-    {
-      opterr = 0;
-      if (parser->state.flags & ARGP_PARSE_ARGV0)
-	/* getopt always skips ARGV[0], so we have to fake it out.  As long
-	   as OPTERR is 0, then it shouldn't actually try to access it.  */
-	parser->state.argv--, parser->state.argc++;
-    }
-  else
-    opterr = 1;		/* Print error messages.  */
-
-  if (parser->state.argv == argv && argv[0])
-    /* There's an argv[0]; use it for messages.  */
-    {
-      char *short_name = strrchr (argv[0], '/');
-      parser->state.name = short_name ? short_name + 1 : argv[0];
-    }
-  else
-    parser->state.name = program_invocation_short_name;
-
-  return 0;
-}
-
-/* Free any storage consumed by PARSER (but not PARSER itself).  */
-static error_t
-parser_finalize (struct parser *parser,
-		 error_t err, int arg_ebadkey, int *end_index)
-{
-  struct group *group;
-
-  UNLOCK_GETOPT;
-
-  if (err == EBADKEY && arg_ebadkey)
-    /* Suppress errors generated by unparsed arguments.  */
-    err = 0;
-
-  if (! err)
-    {
-      if (parser->state.next == parser->state.argc)
-	/* We successfully parsed all arguments!  Call all the parsers again,
-	   just a few more times... */
-	{
-	  for (group = parser->groups;
-	       group < parser->egroup && (!err || err==EBADKEY);
-	       group++)
-	    if (group->args_processed == 0)
-	      err = group_parse (group, &parser->state, ARGP_KEY_NO_ARGS, 0);
-	  for (group = parser->egroup - 1;
-	       group >= parser->groups && (!err || err==EBADKEY);
-	       group--)
-	    err = group_parse (group, &parser->state, ARGP_KEY_END, 0);
-
-	  if (err == EBADKEY)
-	    err = 0;		/* Some parser didn't understand.  */
-
-	  /* Tell the user that all arguments are parsed.  */
-	  if (end_index)
-	    *end_index = parser->state.next;
-	}
-      else if (end_index)
-	/* Return any remaining arguments to the user.  */
-	*end_index = parser->state.next;
-      else
-	/* No way to return the remaining arguments, they must be bogus. */
-	{
-	  if (!(parser->state.flags & ARGP_NO_ERRS)
-	      && parser->state.err_stream)
-	    fprintf (parser->state.err_stream,
-		     dgettext (parser->argp->argp_domain,
-			       "%s: Too many arguments\n"),
-		     parser->state.name);
-	  err = EBADKEY;
-	}
-    }
-
-  /* Okay, we're all done, with either an error or success; call the parsers
-     to indicate which one.  */
-
-  if (err)
-    {
-      /* Maybe print an error message.  */
-      if (err == EBADKEY)
-	/* An appropriate message describing what the error was should have
-	   been printed earlier.  */
-	__argp_state_help (&parser->state, parser->state.err_stream,
-			   ARGP_HELP_STD_ERR);
-
-      /* Since we didn't exit, give each parser an error indication.  */
-      for (group = parser->groups; group < parser->egroup; group++)
-	group_parse (group, &parser->state, ARGP_KEY_ERROR, 0);
-    }
-  else
-    /* Notify parsers of success, and propagate back values from parsers.  */
-    {
-      /* We pass over the groups in reverse order so that child groups are
-	 given a chance to do there processing before passing back a value to
-	 the parent.  */
-      for (group = parser->egroup - 1
-	   ; group >= parser->groups && (!err || err == EBADKEY)
-	   ; group--)
-	err = group_parse (group, &parser->state, ARGP_KEY_SUCCESS, 0);
-      if (err == EBADKEY)
-	err = 0;		/* Some parser didn't understand.  */
-    }
-
-  /* Call parsers once more, to do any final cleanup.  Errors are ignored.  */
-  for (group = parser->egroup - 1; group >= parser->groups; group--)
-    group_parse (group, &parser->state, ARGP_KEY_FINI, 0);
-
-  if (err == EBADKEY)
-    err = EINVAL;
-
-  free (parser->storage);
-
-  return err;
-}
-
-/* Call the user parsers to parse the non-option argument VAL, at the current
-   position, returning any error.  The state NEXT pointer is assumed to have
-   been adjusted (by getopt) to point after this argument; this function will
-   adjust it correctly to reflect however many args actually end up being
-   consumed.  */
-static error_t
-parser_parse_arg (struct parser *parser, char *val)
-{
-  /* Save the starting value of NEXT, first adjusting it so that the arg
-     we're parsing is again the front of the arg vector.  */
-  int index = --parser->state.next;
-  error_t err = EBADKEY;
-  struct group *group;
-  int key = 0;			/* Which of ARGP_KEY_ARG[S] we used.  */
-
-  /* Try to parse the argument in each parser.  */
-  for (group = parser->groups
-       ; group < parser->egroup && err == EBADKEY
-       ; group++)
-    {
-      parser->state.next++;	/* For ARGP_KEY_ARG, consume the arg.  */
-      key = ARGP_KEY_ARG;
-      err = group_parse (group, &parser->state, key, val);
-
-      if (err == EBADKEY)
-	/* This parser doesn't like ARGP_KEY_ARG; try ARGP_KEY_ARGS instead. */
-	{
-	  parser->state.next--;	/* For ARGP_KEY_ARGS, put back the arg.  */
-	  key = ARGP_KEY_ARGS;
-	  err = group_parse (group, &parser->state, key, 0);
-	}
-    }
-
-  if (! err)
-    {
-      if (key == ARGP_KEY_ARGS)
-	/* The default for ARGP_KEY_ARGS is to assume that if NEXT isn't
-	   changed by the user, *all* arguments should be considered
-	   consumed.  */
-	parser->state.next = parser->state.argc;
-
-      if (parser->state.next > index)
-	/* Remember that we successfully processed a non-option
-	   argument -- but only if the user hasn't gotten tricky and set
-	   the clock back.  */
-	(--group)->args_processed += (parser->state.next - index);
-      else
-	/* The user wants to reparse some args, give getopt another try.  */
-	parser->try_getopt = 1;
-    }
-
-  return err;
-}
-
-/* Call the user parsers to parse the option OPT, with argument VAL, at the
-   current position, returning any error.  */
-static error_t
-parser_parse_opt (struct parser *parser, int opt, char *val)
-{
-  /* The group key encoded in the high bits; 0 for short opts or
-     group_number + 1 for long opts.  */
-  int group_key = opt >> USER_BITS;
-  error_t err = EBADKEY;
-
-  if (group_key == 0)
-    /* A short option.  By comparing OPT's position in SHORT_OPTS to the
-       various starting positions in each group's SHORT_END field, we can
-       determine which group OPT came from.  */
-    {
-      struct group *group;
-      char *short_index = strchr (parser->short_opts, opt);
-
-      if (short_index)
-	for (group = parser->groups; group < parser->egroup; group++)
-	  if (group->short_end > short_index)
-	    {
-	      err = group_parse (group, &parser->state, opt, optarg);
-	      break;
-	    }
-    }
-  else
-    /* A long option.  We use shifts instead of masking for extracting
-       the user value in order to preserve the sign.  */
-    err =
-      group_parse (&parser->groups[group_key - 1], &parser->state,
-		   (opt << GROUP_BITS) >> GROUP_BITS, optarg);
-
-  if (err == EBADKEY)
-    /* At least currently, an option not recognized is an error in the
-       parser, because we pre-compute which parser is supposed to deal
-       with each option.  */
-    {
-      static const char bad_key_err[] =
-	N_("(PROGRAM ERROR) Option should have been recognized!?");
-      if (group_key == 0)
-	__argp_error (&parser->state, "-%c: %s", opt,
-		      dgettext (parser->argp->argp_domain, bad_key_err));
-      else
-	{
-	  struct option *long_opt = parser->long_opts;
-	  while (long_opt->val != opt && long_opt->name)
-	    long_opt++;
-	  __argp_error (&parser->state, "--%s: %s",
-			long_opt->name ? long_opt->name : "???",
-			dgettext (parser->argp->argp_domain, bad_key_err));
-	}
-    }
-
-  return err;
-}
-
-/* Parse the next argument in PARSER (as indicated by PARSER->state.next).
-   Any error from the parsers is returned, and *ARGP_EBADKEY indicates
-   whether a value of EBADKEY is due to an unrecognized argument (which is
-   generally not fatal).  */
-static error_t
-parser_parse_next (struct parser *parser, int *arg_ebadkey)
-{
-  int opt;
-  error_t err = 0;
-
-  if (parser->state.quoted && parser->state.next < parser->state.quoted)
-    /* The next argument pointer has been moved to before the quoted
-       region, so pretend we never saw the quoting `--', and give getopt
-       another chance.  If the user hasn't removed it, getopt will just
-       process it again.  */
-    parser->state.quoted = 0;
-
-  if (parser->try_getopt && !parser->state.quoted)
-    /* Give getopt a chance to parse this.  */
-    {
-      optind = parser->state.next; /* Put it back in OPTIND for getopt.  */
-      optopt = KEY_END;	/* Distinguish KEY_ERR from a real option.  */
-      if (parser->state.flags & ARGP_LONG_ONLY)
-	opt = getopt_long_only (parser->state.argc, parser->state.argv,
-				parser->short_opts, parser->long_opts, 0);
-      else
-	opt = getopt_long (parser->state.argc, parser->state.argv,
-			   parser->short_opts, parser->long_opts, 0);
-      parser->state.next = optind; /* And see what getopt did.  */
-
-      if (opt == KEY_END)
-	/* Getopt says there are no more options, so stop using
-	   getopt; we'll continue if necessary on our own.  */
-	{
-	  parser->try_getopt = 0;
-	  if (parser->state.next > 1
-	      && strcmp (parser->state.argv[parser->state.next - 1], QUOTE)
-	           == 0)
-	    /* Not only is this the end of the options, but it's a
-	       `quoted' region, which may have args that *look* like
-	       options, so we definitely shouldn't try to use getopt past
-	       here, whatever happens.  */
-	    parser->state.quoted = parser->state.next;
-	}
-      else if (opt == KEY_ERR && optopt != KEY_END)
-	/* KEY_ERR can have the same value as a valid user short
-	   option, but in the case of a real error, getopt sets OPTOPT
-	   to the offending character, which can never be KEY_END.  */
-	{
-	  *arg_ebadkey = 0;
-	  return EBADKEY;
-	}
-    }
-  else
-    opt = KEY_END;
-
-  if (opt == KEY_END)
-    {
-      /* We're past what getopt considers the options.  */
-      if (parser->state.next >= parser->state.argc
-	  || (parser->state.flags & ARGP_NO_ARGS))
-	/* Indicate that we're done.  */
-	{
-	  *arg_ebadkey = 1;
-	  return EBADKEY;
-	}
-      else
-	/* A non-option arg; simulate what getopt might have done.  */
-	{
-	  opt = KEY_ARG;
-	  optarg = parser->state.argv[parser->state.next++];
-	}
-    }
-
-  if (opt == KEY_ARG)
-    /* A non-option argument; try each parser in turn.  */
-    err = parser_parse_arg (parser, optarg);
-  else
-    err = parser_parse_opt (parser, opt, optarg);
-
-  if (err == EBADKEY)
-    *arg_ebadkey = (opt == KEY_END || opt == KEY_ARG);
-
-  return err;
-}
-
-/* Parse the options strings in ARGC & ARGV according to the argp in ARGP.
-   FLAGS is one of the ARGP_ flags above.  If END_INDEX is non-NULL, the
-   index in ARGV of the first unparsed option is returned in it.  If an
-   unknown option is present, EINVAL is returned; if some parser routine
-   returned a non-zero value, it is returned; otherwise 0 is returned.  */
-error_t
-__argp_parse (const struct argp *argp, int argc, char **argv, unsigned flags,
-	      int *end_index, void *input)
-{
-  error_t err;
-  struct parser parser;
-
-  /* If true, then err == EBADKEY is a result of a non-option argument failing
-     to be parsed (which in some cases isn't actually an error).  */
-  int arg_ebadkey = 0;
-
-  if (! (flags & ARGP_NO_HELP))
-    /* Add our own options.  */
-    {
-      struct argp_child *child = alloca (4 * sizeof (struct argp_child));
-      struct argp *top_argp = alloca (sizeof (struct argp));
-
-      /* TOP_ARGP has no options, it just serves to group the user & default
-	 argps.  */
-      memset (top_argp, 0, sizeof (*top_argp));
-      top_argp->children = child;
-
-      memset (child, 0, 4 * sizeof (struct argp_child));
-
-      if (argp)
-	(child++)->argp = argp;
-      (child++)->argp = &argp_default_argp;
-      if (argp_program_version || argp_program_version_hook)
-	(child++)->argp = &argp_version_argp;
-      child->argp = 0;
-
-      argp = top_argp;
-    }
-
-  /* Construct a parser for these arguments.  */
-  err = parser_init (&parser, argp, argc, argv, flags, input);
-
-  if (! err)
-    /* Parse! */
-    {
-      while (! err)
-	err = parser_parse_next (&parser, &arg_ebadkey);
-      err = parser_finalize (&parser, err, arg_ebadkey, end_index);
-    }
-
-  return err;
-}
-#ifdef weak_alias
-weak_alias (__argp_parse, argp_parse)
-#endif
-
-/* Return the input field for ARGP in the parser corresponding to STATE; used
-   by the help routines.  */
-void *
-__argp_input (const struct argp *argp, const struct argp_state *state)
-{
-  if (state)
-    {
-      struct group *group;
-      struct parser *parser = state->pstate;
-
-      for (group = parser->groups; group < parser->egroup; group++)
-	if (group->argp == argp)
-	  return group->input;
-    }
-
-  return 0;
-}
-#ifdef weak_alias
-weak_alias (__argp_input, _argp_input)
-#endif
diff --git a/newlib/libc/sys/linux/argp/argp-pv.c b/newlib/libc/sys/linux/argp/argp-pv.c
deleted file mode 100644
index 5987956..0000000
--- a/newlib/libc/sys/linux/argp/argp-pv.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Default definition for ARGP_PROGRAM_VERSION.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* If set by the user program to a non-zero value, then a default option
-   --version is added (unless the ARGP_NO_HELP flag is used), which will
-   print this this string followed by a newline and exit (unless the
-   ARGP_NO_EXIT flag is used).  Overridden by ARGP_PROGRAM_VERSION_HOOK.  */
-const char *argp_program_version;
diff --git a/newlib/libc/sys/linux/argp/argp-pvh.c b/newlib/libc/sys/linux/argp/argp-pvh.c
deleted file mode 100644
index 8a8fd30..0000000
--- a/newlib/libc/sys/linux/argp/argp-pvh.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Default definition for ARGP_PROGRAM_VERSION_HOOK.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <argp.h>
-
-/* If set by the user program to a non-zero value, then a default option
-   --version is added (unless the ARGP_NO_HELP flag is used), which calls
-   this function with a stream to print the version to and a pointer to the
-   current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
-   used).  This variable takes precedent over ARGP_PROGRAM_VERSION.  */
-void (*argp_program_version_hook) (FILE *stream, struct argp_state *state);
diff --git a/newlib/libc/sys/linux/argp/argp-xinl.c b/newlib/libc/sys/linux/argp/argp-xinl.c
deleted file mode 100644
index 644836d..0000000
--- a/newlib/libc/sys/linux/argp/argp-xinl.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Real definitions for extern inline functions in argp.h
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <features.h>
-
-#ifndef __USE_EXTERN_INLINES
-# define __USE_EXTERN_INLINES	1
-#endif
-#define ARGP_EI
-#undef __OPTIMIZE__
-#define __OPTIMIZE__ 1
-#include <argp.h>
-
-/* Add weak aliases.  */
-#if _LIBC - 0 && defined (weak_alias)
-
-weak_alias (__argp_usage, argp_usage)
-weak_alias (__option_is_short, _option_is_short)
-weak_alias (__option_is_end, _option_is_end)
-
-#endif
diff --git a/newlib/libc/sys/linux/bits/initspin.h b/newlib/libc/sys/linux/bits/initspin.h
deleted file mode 100644
index a19ec07..0000000
--- a/newlib/libc/sys/linux/bits/initspin.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Generic definitions for spinlock initializers.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* Initial value of a spinlock.  Most platforms should use zero,
-   unless they only implement a "test and clear" operation instead of
-   the usual "test and set". */
-#define __LT_SPINLOCK_INIT 0
-
-/* Macros for lock initializers, using the above definition. */
-#define __LOCK_INITIALIZER { 0, __LT_SPINLOCK_INIT }
-#define __ALT_LOCK_INITIALIZER { 0, __LT_SPINLOCK_INIT }
-#define __ATOMIC_INITIALIZER { 0, __LT_SPINLOCK_INIT }
diff --git a/newlib/libc/sys/linux/bits/libc-lock.h b/newlib/libc/sys/linux/bits/libc-lock.h
deleted file mode 100644
index 2b17044..0000000
--- a/newlib/libc/sys/linux/bits/libc-lock.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/* libc-internal interface for mutex locks.  LinuxThreads version.
-   Copyright (C) 1996,1997,1998,1999,2000,2001,2002,2003
-   	Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _BITS_LIBC_LOCK_H
-#define _BITS_LIBC_LOCK_H 1
-
-#include <pthread.h>
-
-#if defined _LIBC && !defined NOT_IN_libc
-#include <linuxthreads/internals.h>
-#endif
-
-/* Mutex type.  */
-#if defined(_LIBC) || defined(_IO_MTSAFE_IO)
-typedef pthread_mutex_t __libc_lock_t;
-typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t;
-# ifdef __USE_UNIX98
-typedef pthread_rwlock_t __libc_rwlock_t;
-# else
-typedef struct __libc_rwlock_opaque__ __libc_rwlock_t;
-# endif
-typedef __libc_lock_recursive_t __rtld_lock_recursive_t;
-#else
-typedef struct __libc_lock_opaque__ __libc_lock_t;
-typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
-typedef struct __libc_rwlock_opaque__ __libc_rwlock_t;
-#endif
-
-/* Type for key to thread-specific data.  */
-typedef pthread_key_t __libc_key_t;
-
-/* Define a lock variable NAME with storage class CLASS.  The lock must be
-   initialized with __libc_lock_init before it can be used (or define it
-   with __libc_lock_define_initialized, below).  Use `extern' for CLASS to
-   declare a lock defined in another module.  In public structure
-   definitions you must use a pointer to the lock structure (i.e., NAME
-   begins with a `*'), because its storage size will not be known outside
-   of libc.  */
-#define __libc_lock_define(CLASS,NAME) \
-  CLASS __libc_lock_t NAME;
-#define __libc_rwlock_define(CLASS,NAME) \
-  CLASS __libc_rwlock_t NAME;
-#define __libc_lock_define_recursive(CLASS,NAME) \
-  CLASS __libc_lock_recursive_t NAME;
-#define __rtld_lock_define_recursive(CLASS,NAME) \
-  CLASS __rtld_lock_recursive_t NAME;
-
-/* Define an initialized lock variable NAME with storage class CLASS.
-
-   For the C library we take a deeper look at the initializer.  For
-   this implementation all fields are initialized to zero.  Therefore
-   we don't initialize the variable which allows putting it into the
-   BSS section.  (Except on PA-RISC and other odd architectures, where
-   initialized locks must be set to one due to the lack of normal
-   atomic operations.) */
-
-#if __LT_SPINLOCK_INIT == 0
-#  define __libc_lock_define_initialized(CLASS,NAME) \
-  CLASS __libc_lock_t NAME;
-#else
-#  define __libc_lock_define_initialized(CLASS,NAME) \
-  CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER;
-#endif
-
-#define __libc_rwlock_define_initialized(CLASS,NAME) \
-  CLASS __libc_rwlock_t NAME = PTHREAD_RWLOCK_INITIALIZER;
-
-/* Define an initialized recursive lock variable NAME with storage
-   class CLASS.  */
-#define __libc_lock_define_initialized_recursive(CLASS,NAME) \
-  CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER;
-#define _LIBC_LOCK_RECURSIVE_INITIALIZER \
-  {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP}
-
-#define __rtld_lock_define_initialized_recursive(CLASS,NAME) \
-  CLASS __rtld_lock_recursive_t NAME = _RTLD_LOCK_RECURSIVE_INITIALIZER;
-#define _RTLD_LOCK_RECURSIVE_INITIALIZER \
-  {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP}
-
-#if defined _LIBC && defined IS_IN_libpthread
-# define __libc_maybe_call(FUNC, ARGS, ELSE) FUNC ARGS
-#else
-# if defined __PIC__ || (defined _LIBC && defined SHARED)
-#  define __libc_maybe_call(FUNC, ARGS, ELSE) \
-  (__extension__ ({ __typeof (FUNC) *_fn = (FUNC); \
-                    _fn != NULL ? (*_fn) ARGS : ELSE; }))
-# else
-#  define __libc_maybe_call(FUNC, ARGS, ELSE) \
-  (FUNC != NULL ? FUNC ARGS : ELSE)
-# endif
-#endif
-#if defined _LIBC && !defined NOT_IN_libc && defined SHARED
-# define __libc_maybe_call2(FUNC, ARGS, ELSE) \
-  ({__builtin_expect (__libc_pthread_functions.ptr_##FUNC != NULL, 0) \
-    ? __libc_pthread_functions.ptr_##FUNC ARGS : ELSE; })
-#else
-# define __libc_maybe_call2(FUNC, ARGS, ELSE) __libc_maybe_call (__##FUNC, ARGS, ELSE)
-#endif
-
-/* Initialize the named lock variable, leaving it in a consistent, unlocked
-   state.  */
-#if defined _LIBC && !defined NOT_IN_libc && defined SHARED
-#define __libc_lock_init(NAME) \
-  ({									      \
-    (NAME).__m_count = 0;						      \
-    (NAME).__m_owner = NULL;						      \
-    (NAME).__m_kind = PTHREAD_MUTEX_TIMED_NP;				      \
-    (NAME).__m_lock.__status = 0;					      \
-    (NAME).__m_lock.__spinlock = __LT_SPINLOCK_INIT;			      \
-    0; })
-#else
-#define __libc_lock_init(NAME) \
-  (__libc_maybe_call2 (pthread_mutex_init, (&(NAME), NULL), 0))
-#endif
-#define __libc_rwlock_init(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_init, (&(NAME), NULL), 0));
-
-/* Same as last but this time we initialize a recursive mutex.  */
-#if defined _LIBC && !defined NOT_IN_libc && defined SHARED
-#define __libc_lock_init_recursive(NAME) \
-  ({									      \
-    (NAME).mutex.__m_count = 0;						      \
-    (NAME).mutex.__m_owner = NULL;					      \
-    (NAME).mutex.__m_kind = PTHREAD_MUTEX_RECURSIVE_NP;			      \
-    (NAME).mutex.__m_lock.__status = 0;					      \
-    (NAME).mutex.__m_lock.__spinlock = __LT_SPINLOCK_INIT;		      \
-    0; })
-#else
-#define __libc_lock_init_recursive(NAME) \
-  do {									      \
-    if (__pthread_mutex_init != NULL)					      \
-      {									      \
-	pthread_mutexattr_t __attr;					      \
-	__pthread_mutexattr_init (&__attr);				      \
-	__pthread_mutexattr_settype (&__attr, PTHREAD_MUTEX_RECURSIVE_NP); \
-	__pthread_mutex_init (&(NAME).mutex, &__attr);			      \
-	__pthread_mutexattr_destroy (&__attr);				      \
-      }									      \
-  } while (0);
-#endif
-#define __rtld_lock_init_recursive(NAME) \
-  __libc_lock_init_recursive (NAME)
-
-/* Finalize the named lock variable, which must be locked.  It cannot be
-   used again until __libc_lock_init is called again on it.  This must be
-   called on a lock variable before the containing storage is reused.  */
-#define __libc_lock_fini(NAME) \
-  (__libc_maybe_call2 (pthread_mutex_destroy, (&(NAME)), 0));
-#define __libc_rwlock_fini(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_destroy, (&(NAME)), 0));
-
-/* Finalize recursive named lock.  */
-#define __libc_lock_fini_recursive(NAME) __libc_lock_fini ((NAME).mutex)
-#define __rtld_lock_fini_recursive(NAME) __libc_lock_fini_recursive (NAME)
-
-/* Lock the named lock variable.  */
-#define __libc_lock_lock(NAME) \
-  (__libc_maybe_call2 (pthread_mutex_lock, (&(NAME)), 0));
-#define __libc_rwlock_rdlock(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_rdlock, (&(NAME)), 0));
-#define __libc_rwlock_wrlock(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_wrlock, (&(NAME)), 0));
-
-/* Lock the recursive named lock variable.  */
-#define __libc_lock_lock_recursive(NAME) __libc_lock_lock ((NAME).mutex)
-
-/* Try to lock the named lock variable.  */
-#define __libc_lock_trylock(NAME) \
-  (__libc_maybe_call2 (pthread_mutex_trylock, (&(NAME)), 0))
-#define __libc_rwlock_tryrdlock(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_tryrdlock, (&(NAME)), 0))
-#define __libc_rwlock_trywrlock(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_trywrlock, (&(NAME)), 0))
-
-/* Try to lock the recursive named lock variable.  */
-#define __libc_lock_trylock_recursive(NAME) __libc_lock_trylock ((NAME).mutex)
-#define __rtld_lock_trylock_recursive(NAME) \
-  __libc_lock_trylock_recursive (NAME)
-
-/* Unlock the named lock variable.  */
-#define __libc_lock_unlock(NAME) \
-  (__libc_maybe_call2 (pthread_mutex_unlock, (&(NAME)), 0));
-#define __libc_rwlock_unlock(NAME) \
-  (__libc_maybe_call (__pthread_rwlock_unlock, (&(NAME)), 0));
-
-/* Unlock the recursive named lock variable.  */
-#define __libc_lock_unlock_recursive(NAME) __libc_lock_unlock ((NAME).mutex)
-
-#if defined _LIBC && defined SHARED
-# define __rtld_lock_default_lock_recursive(lock) \
-  ++((pthread_mutex_t *)(lock))->__m_count;
-
-# define __rtld_lock_default_unlock_recursive(lock) \
-  --((pthread_mutex_t *)(lock))->__m_count;
-
-# define __rtld_lock_lock_recursive(NAME) \
-  GL(dl_rtld_lock_recursive) (&(NAME).mutex)
-
-# define __rtld_lock_unlock_recursive(NAME) \
-  GL(dl_rtld_unlock_recursive) (&(NAME).mutex)
-#else
-#define __rtld_lock_lock_recursive(NAME) __libc_lock_lock_recursive (NAME)
-#define __rtld_lock_unlock_recursive(NAME) __libc_lock_unlock_recursive (NAME)
-#endif
-
-/* Define once control variable.  */
-#if PTHREAD_ONCE_INIT == 0
-/* Special case for static variables where we can avoid the initialization
-   if it is zero.  */
-# define __libc_once_define(CLASS, NAME) \
-  CLASS pthread_once_t NAME
-#else
-# define __libc_once_define(CLASS, NAME) \
-  CLASS pthread_once_t NAME = PTHREAD_ONCE_INIT
-#endif
-
-/* Call handler iff the first call.  */
-#define __libc_once(ONCE_CONTROL, INIT_FUNCTION) \
-  do {									      \
-    if (__pthread_once != NULL)						      \
-      __pthread_once (&(ONCE_CONTROL), (INIT_FUNCTION));		      \
-    else if ((ONCE_CONTROL) == PTHREAD_ONCE_INIT) {			      \
-      INIT_FUNCTION ();							      \
-      (ONCE_CONTROL) = 2;						      \
-    }									      \
-  } while (0)
-
-
-/* Start critical region with cleanup.  */
-#define __libc_cleanup_region_start(DOIT, FCT, ARG) \
-  { struct _pthread_cleanup_buffer _buffer;				      \
-    int _avail = (DOIT) && _pthread_cleanup_push_defer != NULL;		      \
-    if (_avail) {							      \
-      _pthread_cleanup_push_defer (&_buffer, (FCT), (ARG));		      \
-    }
-
-/* End critical region with cleanup.  */
-#define __libc_cleanup_region_end(DOIT) \
-    if (_avail) {							      \
-      _pthread_cleanup_pop_restore (&_buffer, (DOIT));			      \
-    }									      \
-  }
-
-/* Sometimes we have to exit the block in the middle.  */
-#define __libc_cleanup_end(DOIT) \
-    if (_avail) {							      \
-      _pthread_cleanup_pop_restore (&_buffer, (DOIT));			      \
-    }
-
-#define __libc_cleanup_push(fct, arg) \
-    { struct _pthread_cleanup_buffer _buffer; 				      \
-    __libc_maybe_call (_pthread_cleanup_push, (&_buffer, (fct), (arg)), 0)
-
-#define __libc_cleanup_pop(execute) \
-    __libc_maybe_call (_pthread_cleanup_pop, (&_buffer, execute), 0);	      \
-    }
-
-/* Create thread-specific key.  */
-#define __libc_key_create(KEY, DESTRUCTOR) \
-  (__libc_maybe_call (__pthread_key_create, (KEY, DESTRUCTOR), 1))
-
-/* Get thread-specific data.  */
-#define __libc_getspecific(KEY) \
-  (__libc_maybe_call (__pthread_getspecific, (KEY), NULL))
-
-/* Set thread-specific data.  */
-#define __libc_setspecific(KEY, VALUE) \
-  (__libc_maybe_call (__pthread_setspecific, (KEY, VALUE), 0))
-
-
-/* Register handlers to execute before and after `fork'.  */
-#define __libc_atfork(PREPARE, PARENT, CHILD) \
-  (__libc_maybe_call (__pthread_atfork, (PREPARE, PARENT, CHILD), 0))
-
-/* Functions that are used by this file and are internal to the GNU C
-   library.  */
-
-extern int __pthread_mutex_init (pthread_mutex_t *__mutex,
-				 __const pthread_mutexattr_t *__mutex_attr);
-
-extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex);
-
-extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex);
-
-extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
-
-extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
-
-extern int __pthread_mutexattr_init (pthread_mutexattr_t *__attr);
-
-extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr);
-
-extern int __pthread_mutexattr_settype (pthread_mutexattr_t *__attr,
-					int __kind);
-
-#ifdef __USE_UNIX98
-extern int __pthread_rwlock_init (pthread_rwlock_t *__rwlock,
-				  __const pthread_rwlockattr_t *__attr);
-
-extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
-#endif
-
-extern int __pthread_key_create (pthread_key_t *__key,
-				 void (*__destr_function) (void *));
-
-extern int __pthread_setspecific (pthread_key_t __key,
-				  __const void *__pointer);
-
-extern void *__pthread_getspecific (pthread_key_t __key);
-
-extern int __pthread_once (pthread_once_t *__once_control,
-			   void (*__init_routine) (void));
-
-extern int __pthread_atfork (void (*__prepare) (void),
-			     void (*__parent) (void),
-			     void (*__child) (void));
-
-
-
-/* Make the pthread functions weak so that we can elide them from
-   single-threaded processes.  */
-#ifndef __NO_WEAK_PTHREAD_ALIASES
-#  pragma weak __pthread_mutex_init
-#  pragma weak __pthread_mutex_destroy
-#  pragma weak __pthread_mutex_lock
-#  pragma weak __pthread_mutex_trylock
-#  pragma weak __pthread_mutex_unlock
-#  pragma weak __pthread_mutexattr_init
-#  pragma weak __pthread_mutexattr_destroy
-#  pragma weak __pthread_mutexattr_settype
-#  pragma weak __pthread_rwlock_destroy
-#  pragma weak __pthread_rwlock_rdlock
-#  pragma weak __pthread_rwlock_tryrdlock
-#  pragma weak __pthread_rwlock_wrlock
-#  pragma weak __pthread_rwlock_trywrlock
-#  pragma weak __pthread_rwlock_unlock
-#  pragma weak __pthread_key_create
-#  pragma weak __pthread_setspecific
-#  pragma weak __pthread_getspecific
-#  pragma weak __pthread_once
-#  pragma weak __pthread_initialize
-#  pragma weak __pthread_atfork
-#  pragma weak _pthread_cleanup_push_defer
-#  pragma weak _pthread_cleanup_pop_restore
-#  pragma weak _pthread_cleanup_push
-#  pragma weak _pthread_cleanup_pop
-#endif
-
-/* We need portable names for some functions.  E.g., when they are
-   used as argument to __libc_cleanup_region_start.  */
-#define __libc_mutex_unlock __pthread_mutex_unlock
-
-#endif	/* bits/libc-lock.h */
diff --git a/newlib/libc/sys/linux/bits/pthreadtypes.h b/newlib/libc/sys/linux/bits/pthreadtypes.h
deleted file mode 100644
index d1daef0..0000000
--- a/newlib/libc/sys/linux/bits/pthreadtypes.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-#if !defined _BITS_TYPES_H && !defined _PTHREAD_H
-# error "Never include <bits/pthreadtypes.h> directly; use <sys/types.h> instead."
-#endif
-
-#ifndef _BITS_PTHREADTYPES_H
-#define _BITS_PTHREADTYPES_H	1
-
-#define __need_schedparam
-#include <bits/sched.h>
-
-/* Fast locks (not abstract because mutexes and conditions aren't abstract). */
-struct _pthread_fastlock
-{
-  long int __status;   /* "Free" or "taken" or head of waiting list */
-  int __spinlock;      /* Used by compare_and_swap emulation. Also,
-			  adaptive SMP lock stores spin count here. */
-};
-
-#ifndef _PTHREAD_DESCR_DEFINED
-/* Thread descriptors */
-typedef struct _pthread_descr_struct *_pthread_descr;
-# define _PTHREAD_DESCR_DEFINED
-#endif
-
-
-/* Attributes for threads.  */
-typedef struct __pthread_attr_s
-{
-  int __detachstate;
-  int __schedpolicy;
-  struct __sched_param __schedparam;
-  int __inheritsched;
-  int __scope;
-  size_t __guardsize;
-  int __stackaddr_set;
-  void *__stackaddr;
-  size_t __stacksize;
-} pthread_attr_t;
-
-
-/* Conditions (not abstract because of PTHREAD_COND_INITIALIZER */
-
-#ifdef __GLIBC_HAVE_LONG_LONG
-__extension__ typedef long long __pthread_cond_align_t;
-#else
-typedef long __pthread_cond_align_t;
-#endif
-
-typedef struct
-{
-  struct _pthread_fastlock __c_lock; /* Protect against concurrent access */
-  _pthread_descr __c_waiting;        /* Threads waiting on this condition */
-  char __padding[48 - sizeof (struct _pthread_fastlock)
-		 - sizeof (_pthread_descr) - sizeof (__pthread_cond_align_t)];
-  __pthread_cond_align_t __align;
-} pthread_cond_t;
-
-
-/* Attribute for conditionally variables.  */
-typedef struct
-{
-  int __dummy;
-} pthread_condattr_t;
-
-/* Keys for thread-specific data */
-typedef unsigned int pthread_key_t;
-
-
-/* Mutexes (not abstract because of PTHREAD_MUTEX_INITIALIZER).  */
-/* (The layout is unnatural to maintain binary compatibility
-    with earlier releases of LinuxThreads.) */
-typedef struct
-{
-  int __m_reserved;               /* Reserved for future use */
-  int __m_count;                  /* Depth of recursive locking */
-  _pthread_descr __m_owner;       /* Owner thread (if recursive or errcheck) */
-  int __m_kind;                   /* Mutex kind: fast, recursive or errcheck */
-  struct _pthread_fastlock __m_lock; /* Underlying fast lock */
-} pthread_mutex_t;
-
-
-/* Attribute for mutex.  */
-typedef struct
-{
-  int __mutexkind;
-} pthread_mutexattr_t;
-
-
-/* Once-only execution */
-typedef int pthread_once_t;
-
-
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K
-/* Read-write locks.  */
-typedef struct _pthread_rwlock_t
-{
-  struct _pthread_fastlock __rw_lock; /* Lock to guarantee mutual exclusion */
-  int __rw_readers;                   /* Number of readers */
-  _pthread_descr __rw_writer;         /* Identity of writer, or NULL if none */
-  _pthread_descr __rw_read_waiting;   /* Threads waiting for reading */
-  _pthread_descr __rw_write_waiting;  /* Threads waiting for writing */
-  int __rw_kind;                      /* Reader/Writer preference selection */
-  int __rw_pshared;                   /* Shared between processes or not */
-} pthread_rwlock_t;
-
-
-/* Attribute for read-write locks.  */
-typedef struct
-{
-  int __lockkind;
-  int __pshared;
-} pthread_rwlockattr_t;
-#endif
-
-#ifdef __USE_XOPEN2K
-/* POSIX spinlock data type.  */
-typedef volatile int pthread_spinlock_t;
-
-/* POSIX barrier. */
-typedef struct {
-  struct _pthread_fastlock __ba_lock; /* Lock to guarantee mutual exclusion */
-  int __ba_required;                  /* Threads needed for completion */
-  int __ba_present;                   /* Threads waiting */
-  _pthread_descr __ba_waiting;        /* Queue of waiting threads */
-} pthread_barrier_t;
-
-/* barrier attribute */
-typedef struct {
-  int __pshared;
-} pthread_barrierattr_t;
-
-#endif
-
-
-/* Thread identifiers */
-typedef unsigned long int pthread_t;
-
-#endif	/* bits/pthreadtypes.h */
diff --git a/newlib/libc/sys/linux/bits/typesizes.h b/newlib/libc/sys/linux/bits/typesizes.h
deleted file mode 100644
index 45264ac..0000000
--- a/newlib/libc/sys/linux/bits/typesizes.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* bits/typesizes.h -- underlying types for *_t.  Generic version.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _BITS_TYPES_H
-# error "Never include <bits/typesizes.h> directly; use <sys/types.h> instead."
-#endif
-
-#ifndef	_BITS_TYPESIZES_H
-#define	_BITS_TYPESIZES_H	1
-
-/* See <bits/types.h> for the meaning of these macros.  This file exists so
-   that <bits/types.h> need not vary across different GNU platforms.  */
-
-#define __DEV_T_TYPE		__UQUAD_TYPE
-#define __UID_T_TYPE		__U32_TYPE
-#define __GID_T_TYPE		__U32_TYPE
-#define __INO_T_TYPE		__ULONGWORD_TYPE
-#define __INO64_T_TYPE		__UQUAD_TYPE
-#define __MODE_T_TYPE		__U32_TYPE
-#define __NLINK_T_TYPE		__UWORD_TYPE
-#define __OFF_T_TYPE		__SLONGWORD_TYPE
-#define __OFF64_T_TYPE		__SQUAD_TYPE
-#define __PID_T_TYPE		__S32_TYPE
-#define __RLIM_T_TYPE		__ULONGWORD_TYPE
-#define __RLIM64_T_TYPE		__UQUAD_TYPE
-#define	__BLKCNT_T_TYPE		__SLONGWORD_TYPE
-#define	__BLKCNT64_T_TYPE	__SQUAD_TYPE
-#define	__FSBLKCNT_T_TYPE	__ULONGWORD_TYPE
-#define	__FSBLKCNT64_T_TYPE	__UQUAD_TYPE
-#define	__FSFILCNT_T_TYPE	__ULONGWORD_TYPE
-#define	__FSFILCNT64_T_TYPE	__UQUAD_TYPE
-#define	__ID_T_TYPE		__U32_TYPE
-#define __CLOCK_T_TYPE		__SLONGWORD_TYPE
-#define __TIME_T_TYPE		__SLONGWORD_TYPE
-#define __USECONDS_T_TYPE	__U32_TYPE
-#define __SUSECONDS_T_TYPE	__SLONGWORD_TYPE
-#define __DADDR_T_TYPE		__S32_TYPE
-#define __SWBLK_T_TYPE		__SLONGWORD_TYPE
-#define __KEY_T_TYPE		__S32_TYPE
-#define __CLOCKID_T_TYPE	__S32_TYPE
-#define __TIMER_T_TYPE		__S32_TYPE
-#define __BLKSIZE_T_TYPE	__SLONGWORD_TYPE
-#define __FSID_T_TYPE		struct { int __val[2]; }
-#define __SSIZE_T_TYPE		__SWORD_TYPE
-
-/* Number of descriptors that can fit in an `fd_set'.  */
-#define	__FD_SETSIZE		1024
-
-
-#endif /* bits/typesizes.h */
diff --git a/newlib/libc/sys/linux/bp-checks.h b/newlib/libc/sys/linux/bp-checks.h
deleted file mode 100644
index efbb847..0000000
--- a/newlib/libc/sys/linux/bp-checks.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Bounded-pointer checking macros for C.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Greg McGary <greg@mcgary.org>
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _bp_checks_h_
-#define _bp_checks_h_ 1
-
-#if __BOUNDED_POINTERS__
-
-# define BOUNDS_VIOLATED (__builtin_trap (), 0)
-
-/* Verify that pointer's value >= low.  Return pointer value.  */
-# define CHECK_BOUNDS_LOW(ARG)					\
-  (((__ptrvalue (ARG) < __ptrlow (ARG)) && BOUNDS_VIOLATED),	\
-   __ptrvalue (ARG))
-
-/* Verify that pointer's value < high.  Return pointer value.  */
-# define CHECK_BOUNDS_HIGH(ARG)				\
-  (((__ptrvalue (ARG) > __ptrhigh (ARG)) && BOUNDS_VIOLATED),	\
-   __ptrvalue (ARG))
-
-# define _CHECK_N(ARG, N, COND)				\
-  (((COND)						\
-    && (__ptrvalue (ARG) < __ptrlow (ARG)		\
-	|| __ptrvalue (ARG) + (N) > __ptrhigh (ARG))	\
-    && BOUNDS_VIOLATED),				\
-   __ptrvalue (ARG))
-
-extern void *__unbounded __ubp_memchr (const void *__unbounded, int, unsigned);
-
-# define _CHECK_STRING(ARG, COND)				\
-  (((COND)							\
-    && (__ptrvalue (ARG) < __ptrlow (ARG)			\
-	|| !__ubp_memchr (__ptrvalue (ARG), '\0',			\
-		      (__ptrhigh (ARG) - __ptrvalue (ARG))))	\
-    && BOUNDS_VIOLATED),					\
-   __ptrvalue (ARG))
-
-/* Check bounds of a pointer seated to an array of N objects.  */
-# define CHECK_N(ARG, N) _CHECK_N ((ARG), (N), 1)
-/* Same as CHECK_N, but tolerate ARG == NULL.  */
-# define CHECK_N_NULL_OK(ARG, N) _CHECK_N ((ARG), (N), __ptrvalue (ARG))
-
-/* Check bounds of a pointer seated to a single object.  */
-# define CHECK_1(ARG) CHECK_N ((ARG), 1)
-/* Same as CHECK_1, but tolerate ARG == NULL.  */
-# define CHECK_1_NULL_OK(ARG) CHECK_N_NULL_OK ((ARG), 1)
-
-/* Check for NUL-terminator within string's bounds.  */
-# define CHECK_STRING(ARG) _CHECK_STRING ((ARG), 1)
-/* Same as CHECK_STRING, but tolerate ARG == NULL.  */
-# define CHECK_STRING_NULL_OK(ARG) _CHECK_STRING ((ARG), __ptrvalue (ARG))
-
-/* Check bounds of signal syscall args with type sigset_t.  */
-# define CHECK_SIGSET(SET) CHECK_N ((SET), _NSIG / (8 * sizeof *(SET)))
-/* Same as CHECK_SIGSET, but tolerate SET == NULL.  */
-# define CHECK_SIGSET_NULL_OK(SET) CHECK_N_NULL_OK ((SET), _NSIG / (8 * sizeof *(SET)))
-
-# if defined (_IOC_SIZESHIFT) && defined (_IOC_SIZEBITS)
-/* Extract the size of the ioctl data and check its bounds.  */
-#  define CHECK_IOCTL(ARG, CMD)						\
-  CHECK_N ((const char *) (ARG),					\
-	   (((CMD) >> _IOC_SIZESHIFT) & ((1 << _IOC_SIZEBITS) - 1)))
-# else
-/* We don't know the size of the ioctl data, so the best we can do
-   is check that the first byte is within bounds.  */
-#  define CHECK_IOCTL(ARG, CMD) CHECK_1 ((const char *) ARG)
-# endif
-
-/* Check bounds of `struct flock *' for the locking fcntl commands.  */
-# define CHECK_FCNTL(ARG, CMD)					\
-  (((CMD) == F_GETLK || (CMD) == F_SETLK || (CMD) == F_SETLKW)	\
-   ? CHECK_1 ((struct flock *) ARG) : (unsigned long) (ARG))
-
-/* Check bounds of an array of mincore residency-status flags that
-   cover a region of NBYTES.  Such a vector occupies one byte per page
-   of memory.  */
-# define CHECK_N_PAGES(ARG, NBYTES)				\
-  ({ int _page_size_ = sysconf (_SC_PAGE_SIZE);			\
-     CHECK_N ((const char *) (ARG),				\
-	      ((NBYTES) + _page_size_ - 1) / _page_size_); })
-
-/* Return a bounded pointer with value PTR that satisfies CHECK_N (PTR, N).  */
-# define BOUNDED_N(PTR, N) 				\
-  ({ __typeof (PTR) __bounded _p_;			\
-     __ptrvalue _p_ = __ptrlow _p_ = __ptrvalue (PTR);	\
-     __ptrhigh _p_ = __ptrvalue _p_ + (N);		\
-     _p_; })
-
-#else /* !__BOUNDED_POINTERS__ */
-
-/* Do nothing if not compiling with -fbounded-pointers.  */
-
-# define BOUNDS_VIOLATED
-# define CHECK_BOUNDS_LOW(ARG) (ARG)
-# define CHECK_BOUNDS_HIGH(ARG) (ARG)
-# define CHECK_1(ARG) (ARG)
-# define CHECK_1_NULL_OK(ARG) (ARG)
-# define CHECK_N(ARG, N) (ARG)
-# define CHECK_N_NULL_OK(ARG, N) (ARG)
-# define CHECK_STRING(ARG) (ARG)
-# define CHECK_SIGSET(SET) (SET)
-# define CHECK_SIGSET_NULL_OK(SET) (SET)
-# define CHECK_IOCTL(ARG, CMD) (ARG)
-# define CHECK_FCNTL(ARG, CMD) (ARG)
-# define CHECK_N_PAGES(ARG, NBYTES) (ARG)
-# define BOUNDED_N(PTR, N) (PTR)
-
-#endif /* !__BOUNDED_POINTERS__ */
-
-#define BOUNDED_1(PTR) BOUNDED_N (PTR, 1)
-
-#endif /* _bp_checks_h_ */
diff --git a/newlib/libc/sys/linux/brk.c b/newlib/libc/sys/linux/brk.c
index 91bb367..f61a0c3 100644
--- a/newlib/libc/sys/linux/brk.c
+++ b/newlib/libc/sys/linux/brk.c
@@ -6,7 +6,7 @@
 #include <stddef.h> /* for NULL */
 #include <sys/types.h>
 #include <sys/unistd.h>
-#include <machine/syscall.h>
+#include <sys/syscall.h>
 
 
 static char *curr_brk = NULL;
@@ -28,7 +28,7 @@ int brk(void *end_data_segment)
 }
 
 
-void *sbrk(ptrdiff_t increment) /* SHOULD be ptrdiff_t */
+void *sbrk(size_t increment) /* SHOULD be ptrdiff_t */
 {
     char *old_brk,*new_brk;
 
diff --git a/newlib/libc/sys/linux/calloc.c b/newlib/libc/sys/linux/calloc.c
deleted file mode 100644
index 818e05a..0000000
--- a/newlib/libc/sys/linux/calloc.c
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy file to override one object in stdlib directory */
diff --git a/newlib/libc/sys/linux/callocr.c b/newlib/libc/sys/linux/callocr.c
deleted file mode 100644
index bff43b8..0000000
--- a/newlib/libc/sys/linux/callocr.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-void *
-_calloc_r (struct _reent *ptr, size_t size, size_t len)
-{
-  return calloc (size, len);
-}
diff --git a/newlib/libc/sys/linux/cfreer.c b/newlib/libc/sys/linux/cfreer.c
deleted file mode 100644
index c7e6c25..0000000
--- a/newlib/libc/sys/linux/cfreer.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-void
-_cfree_r (struct _reent *ptr, void *mem)
-{
-  return cfree (mem);
-}
diff --git a/newlib/libc/sys/linux/cfspeed.c b/newlib/libc/sys/linux/cfspeed.c
deleted file mode 100644
index e935bf1..0000000
--- a/newlib/libc/sys/linux/cfspeed.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* `struct termios' speed frobnication functions.  Linux version.
-   Copyright (C) 1991, 92, 93, 95, 96, 97, 98, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Modified by Jeff Johnston, May 27, 2002 to remove kernel hack
-   as we simply ignore a cfisetspeed of 0 instead of treating it specially */
-
-#include <stddef.h>
-#include <errno.h>
-#include <termios.h>
-
-/* Return the output baud rate stored in *TERMIOS_P.  */
-speed_t
-cfgetospeed (termios_p)
-     const struct termios *termios_p;
-{
-  return termios_p->c_cflag & (CBAUD | CBAUDEX);
-}
-
-/* Return the input baud rate stored in *TERMIOS_P.
-   For Linux there is no difference between input and output
-   speed. */
-speed_t
-cfgetispeed (termios_p)
-     const struct termios *termios_p;
-{
-  return termios_p->c_cflag & (CBAUD | CBAUDEX);
-}
-
-/* Set the output baud rate stored in *TERMIOS_P to SPEED.  */
-int
-cfsetospeed  (termios_p, speed)
-     struct termios *termios_p;
-     speed_t speed;
-{
-  if ((speed & ~CBAUD) != 0
-      && (speed < B57600 || speed > __MAX_BAUD))
-    {
-      errno = (EINVAL);
-      return -1;
-    }
-
-  termios_p->c_cflag &= ~(CBAUD | CBAUDEX);
-  termios_p->c_cflag |= speed;
-
-  return 0;
-}
-
-/* Set the input baud rate stored in *TERMIOS_P to SPEED.
-   Although for Linux there is no difference between input and output
-   speed, the numerical 0 is a special case for the input baud rate.  It
-   should set the input baud rate to the output baud rate so we do
-   nothing. */
-int
-cfsetispeed (termios_p, speed)
-     struct termios *termios_p;
-     speed_t speed;
-{
-  if ((speed & ~CBAUD) != 0
-      && (speed < B57600 || speed > __MAX_BAUD))
-    {
-      errno = (EINVAL);
-      return -1;
-    }
-
-  if (speed != 0)
-    {
-      termios_p->c_cflag &= ~(CBAUD | CBAUDEX);
-      termios_p->c_cflag |= speed;
-    }
-
-  return 0;
-}
diff --git a/newlib/libc/sys/linux/clock_getres.c b/newlib/libc/sys/linux/clock_getres.c
deleted file mode 100644
index 8bf648f..0000000
--- a/newlib/libc/sys/linux/clock_getres.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <stdint.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/param.h>
-#include <libc-internal.h>
-
-
-#if HP_TIMING_AVAIL
-/* Clock frequency of the processor.  */
-static long int nsec;
-#endif
-
-
-/* Get resolution of clock.  */
-int
-clock_getres (clockid_t clock_id, struct timespec *res)
-{
-  int retval = -1;
-
-  switch (clock_id)
-    {
-    case CLOCK_REALTIME:
-      {
-	long int clk_tck = sysconf (_SC_CLK_TCK);
-
-	if (__builtin_expect (clk_tck != -1, 1))
-	  {
-	    /* This implementation assumes that the realtime clock has a
-	       resolution higher than 1 second.  This is the case for any
-	       reasonable implementation.  */
-	    res->tv_sec = 0;
-	    res->tv_nsec = 1000000000 / clk_tck;
-
-	    retval = 0;
-	  }
-      }
-      break;
-
-#if HP_TIMING_AVAIL
-    case CLOCK_PROCESS_CPUTIME_ID:
-    case CLOCK_THREAD_CPUTIME_ID:
-      {
-	if (__builtin_expect (nsec == 0, 0))
-	  {
-	    hp_timing_t freq;
-
-	    /* This can only happen if we haven't initialized the `freq'
-	       variable yet.  Do this now. We don't have to protect this
-	       code against multiple execution since all of them should
-	       lead to the same result.  */
-	    freq = __get_clockfreq ();
-	    if (__builtin_expect (freq == 0, 0))
-	      /* Something went wrong.  */
-	      break;
-
-	    nsec = MAX (UINT64_C (1000000000) / freq, 1);
-	  }
-
-	/* File in the values.  The seconds are always zero (unless we
-	   have a 1Hz machine).  */
-	res->tv_sec = 0;
-	res->tv_nsec = nsec;
-
-	retval = 0;
-      }
-      break;
-#endif
-
-    default:
-      __set_errno (EINVAL);
-      break;
-    }
-
-  return retval;
-}
diff --git a/newlib/libc/sys/linux/clock_gettime.c b/newlib/libc/sys/linux/clock_gettime.c
deleted file mode 100644
index a86786b..0000000
--- a/newlib/libc/sys/linux/clock_gettime.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <stdint.h>
-#include <time.h>
-#include <sys/time.h>
-#include <libc-internal.h>
-#include <hp-timing.h>
-
-
-#if HP_TIMING_AVAIL
-/* Clock frequency of the processor.  We make it a 64-bit variable
-   because some jokers are already playing with processors with more
-   than 4GHz.  */
-static hp_timing_t freq;
-
-
-/* We need the starting time for the process.  */
-extern hp_timing_t _dl_cpuclock_offset;
-
-
-/* This function is defined in the thread library.  */
-extern int __pthread_clock_gettime (hp_timing_t freq, struct timespec *tp)
-     __attribute__ ((__weak__));
-#endif
-
-
-/* Get current value of CLOCK and store it in TP.  */
-int
-clock_gettime (clockid_t clock_id, struct timespec *tp)
-{
-  struct timeval tv;
-  int retval = -1;
-
-  switch (clock_id)
-    {
-    case CLOCK_REALTIME:
-      retval = gettimeofday (&tv, NULL);
-      if (retval == 0)
-	/* Convert into `timespec'.  */
-	TIMEVAL_TO_TIMESPEC (&tv, tp);
-      break;
-
-#if HP_TIMING_AVAIL
-    case CLOCK_PROCESS_CPUTIME_ID:
-    case CLOCK_THREAD_CPUTIME_ID:
-      {
-	hp_timing_t tsc;
-
-	if (__builtin_expect (freq == 0, 0))
-	  {
-	    /* This can only happen if we haven't initialized the `freq'
-	       variable yet.  Do this now. We don't have to protect this
-	       code against multiple execution since all of them should
-	       lead to the same result.  */
-	    freq = __get_clockfreq ();
-	    if (__builtin_expect (freq == 0, 0))
-	      /* Something went wrong.  */
-	      break;
-	  }
-
-	if (clock_id == CLOCK_THREAD_CPUTIME_ID
-	    && __pthread_clock_gettime != NULL)
-	  {
-	    retval = __pthread_clock_gettime (freq, tp);
-	    break;
-	  }
-
-	/* Get the current counter.  */
-	HP_TIMING_NOW (tsc);
-
-	/* Compute the offset since the start time of the process.  */
-	tsc -= _dl_cpuclock_offset;
-
-	/* Compute the seconds.  */
-	tp->tv_sec = tsc / freq;
-
-	/* And the nanoseconds.  This computation should be stable until
-	   we get machines with about 16GHz frequency.  */
-	tp->tv_nsec = ((tsc % freq) * UINT64_C (1000000000)) / freq;
-
-	retval = 0;
-      }
-    break;
-#endif
-
-    default:
-      __set_errno (EINVAL);
-      break;
-    }
-
-  return retval;
-}
diff --git a/newlib/libc/sys/linux/clock_settime.c b/newlib/libc/sys/linux/clock_settime.c
deleted file mode 100644
index 79a9b56..0000000
--- a/newlib/libc/sys/linux/clock_settime.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <time.h>
-#include <sys/time.h>
-#include <libc-internal.h>
-
-
-#if HP_TIMING_AVAIL
-/* Clock frequency of the processor.  We make it a 64-bit variable
-   because some jokers are already playing with processors with more
-   than 4GHz.  */
-static hp_timing_t freq;
-
-
-/* We need the starting time for the process.  */
-extern hp_timing_t _dl_cpuclock_offset;
-
-
-/* This function is defined in the thread library.  */
-extern void __pthread_clock_settime (hp_timing_t offset)
-     __attribute__ ((__weak__));
-#endif
-
-
-/* Set CLOCK to value TP.  */
-int
-clock_settime (clockid_t clock_id, const struct timespec *tp)
-{
-  struct timeval tv;
-  int retval;
-
-  /* Make sure the time cvalue is OK.  */
-  if (tp->tv_nsec < 0 || tp->tv_nsec >= 1000000000)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  switch (clock_id)
-    {
-    case CLOCK_REALTIME:
-      TIMESPEC_TO_TIMEVAL (&tv, tp);
-
-      retval = settimeofday (&tv, NULL);
-      break;
-
-#if HP_TIMING_AVAIL
-    case CLOCK_PROCESS_CPUTIME_ID:
-    case CLOCK_THREAD_CPUTIME_ID:
-      {
-	hp_timing_t tsc;
-	hp_timing_t usertime;
-
-	/* First thing is to get the current time.  */
-	HP_TIMING_NOW (tsc);
-
-	if (__builtin_expect (freq == 0, 0))
-	  {
-	    /* This can only happen if we haven't initialized the `freq'
-	       variable yet.  Do this now. We don't have to protect this
-	       code against multiple execution since all of them should
-	       lead to the same result.  */
-	    freq = __get_clockfreq ();
-	    if (__builtin_expect (freq == 0, 0))
-	      {
-		/* Something went wrong.  */
-		retval = -1;
-		break;
-	      }
-	  }
-
-	/* Convert the user-provided time into CPU ticks.  */
-	usertime = tp->tv_sec * freq + (tp->tv_nsec * freq) / 1000000000ull;
-
-	/* Determine the offset and use it as the new base value.  */
-	if (clock_id != CLOCK_THREAD_CPUTIME_ID
-	    || __pthread_clock_settime == NULL)
-	  _dl_cpuclock_offset = tsc - usertime;
-	else
-	  __pthread_clock_settime (tsc - usertime);
-
-	retval = 0;
-      }
-      break;
-#endif
-
-    default:
-      __set_errno (EINVAL);
-      retval = -1;
-      break;
-    }
-
-  return retval;
-}
diff --git a/newlib/libc/sys/linux/cmath/Makefile.am b/newlib/libc/sys/linux/cmath/Makefile.am
deleted file mode 100644
index 6c47f21..0000000
--- a/newlib/libc/sys/linux/cmath/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES = \
-	s_cacos.c    s_casinf.c   s_catanh.c   s_ccosh.c   s_clog.c     s_cpowf.c   s_csinh.c   s_ctan.c \
-	s_cacosf.c   s_casinh.c   s_catanhf.c  s_ccoshf.c  s_clog10.c   s_csinhf.c  s_ctanf.c \
-	s_cacosh.c   s_casinhf.c  s_clog10f.c  s_cproj.c   s_ctanh.c \
-	s_cacoshf.c  s_cprojf.c  s_ctanhf.c \
-	s_cexp.c    s_clogf.c    s_csqrt.c  \
-	s_catan.c    s_ccos.c     s_cexpf.c   s_csin.c    s_csqrtf.c  \
-	s_casin.c    s_catanf.c   s_ccosf.c    s_cpow.c     s_csinf.c   
-
-libcmath_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libcmath.la
-libcmath_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(LIB_SOURCES)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../../../Makefile.shared
diff --git a/newlib/libc/sys/linux/cmath/Makefile.in b/newlib/libc/sys/linux/cmath/Makefile.in
deleted file mode 100644
index 88a40e4..0000000
--- a/newlib/libc/sys/linux/cmath/Makefile.in
+++ /dev/null
@@ -1,385 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-EXTRA_SUBDIRS = @EXTRA_SUBDIRS@
-EXTRA_SUBLIBS = @EXTRA_SUBLIBS@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LINUX_MACH_LIB = @LINUX_MACH_LIB@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES =  	s_cacos.c    s_casinf.c   s_catanh.c   s_ccosh.c   s_clog.c     s_cpowf.c   s_csinh.c   s_ctan.c 	s_cacosf.c   s_casinh.c   s_catanhf.c  s_ccoshf.c  s_clog10.c   s_csinhf.c  s_ctanf.c 	s_cacosh.c   s_casinhf.c  s_clog10f.c  s_cproj.c   s_ctanh.c 	s_cacoshf.c  s_cprojf.c  s_ctanhf.c 	s_cexp.c    s_clogf.c    s_csqrt.c  	s_catan.c    s_ccos.c     s_cexpf.c   s_csin.c    s_csqrtf.c  	s_casin.c    s_catanf.c   s_ccosf.c    s_cpow.c     s_csinf.c   
-
-
-libcmath_la_LDFLAGS = -Xcompiler -nostdlib
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libcmath.la
-@USE_LIBTOOL_TRUE@libcmath_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  s_cacos.$(OBJEXT) s_casinf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_catanh.$(OBJEXT) s_ccosh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_clog.$(OBJEXT) s_cpowf.$(OBJEXT) s_csinh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_ctan.$(OBJEXT) s_cacosf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_casinh.$(OBJEXT) s_catanhf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_ccoshf.$(OBJEXT) s_clog10.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_csinhf.$(OBJEXT) s_ctanf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_cacosh.$(OBJEXT) s_casinhf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_clog10f.$(OBJEXT) s_cproj.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_ctanh.$(OBJEXT) s_cacoshf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_cprojf.$(OBJEXT) s_ctanhf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_cexp.$(OBJEXT) s_clogf.$(OBJEXT) s_csqrt.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_catan.$(OBJEXT) s_ccos.$(OBJEXT) s_cexpf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_csin.$(OBJEXT) s_csqrtf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_casin.$(OBJEXT) s_catanf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_ccosf.$(OBJEXT) s_cpow.$(OBJEXT) s_csinf.$(OBJEXT)
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-libcmath_la_LIBADD = 
-@USE_LIBTOOL_TRUE@libcmath_la_OBJECTS =  s_cacos.lo s_casinf.lo \
-@USE_LIBTOOL_TRUE@s_catanh.lo s_ccosh.lo s_clog.lo s_cpowf.lo \
-@USE_LIBTOOL_TRUE@s_csinh.lo s_ctan.lo s_cacosf.lo s_casinh.lo \
-@USE_LIBTOOL_TRUE@s_catanhf.lo s_ccoshf.lo s_clog10.lo s_csinhf.lo \
-@USE_LIBTOOL_TRUE@s_ctanf.lo s_cacosh.lo s_casinhf.lo s_clog10f.lo \
-@USE_LIBTOOL_TRUE@s_cproj.lo s_ctanh.lo s_cacoshf.lo s_cprojf.lo \
-@USE_LIBTOOL_TRUE@s_ctanhf.lo s_cexp.lo s_clogf.lo s_csqrt.lo \
-@USE_LIBTOOL_TRUE@s_catan.lo s_ccos.lo s_cexpf.lo s_csin.lo s_csqrtf.lo \
-@USE_LIBTOOL_TRUE@s_casin.lo s_catanf.lo s_ccosf.lo s_cpow.lo \
-@USE_LIBTOOL_TRUE@s_csinf.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(libcmath_la_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(libcmath_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus cmath/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-libcmath.la: $(libcmath_la_OBJECTS) $(libcmath_la_DEPENDENCIES)
-	$(LINK)  $(libcmath_la_LDFLAGS) $(libcmath_la_OBJECTS) $(libcmath_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = cmath
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-noinstLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
-distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/linux/cmath/math_private.h b/newlib/libc/sys/linux/cmath/math_private.h
deleted file mode 100644
index 148376c..0000000
--- a/newlib/libc/sys/linux/cmath/math_private.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-/*
- * from: @(#)fdlibm.h 5.1 93/09/24
- * $Id$
- */
-
-#ifndef _MATH_PRIVATE_H_
-#define _MATH_PRIVATE_H_
-
-#include <endian.h>
-#include <sys/types.h>
-#include <machine/weakalias.h>
-#include <machine/huge_val.h>
-
-#define INFINITY HUGE_VALF
-
-#define __nan nan
-#define __isnan isnan
-#define __isinf isinf
-#define __copysignf copysignf
-#define __copysign copysign
-#define __isnanf isnanf
-#define __isinff isinff
-#define __nanf nanf
-#define feraiseexcept(x) /* nothing */
-#define __sincos sincos
-#define __sincosf sincosf
-
-int __signbitd (double x);
-int __signbitf (float x);
-
-/* The original fdlibm code used statements like:
-	n0 = ((*(int*)&one)>>29)^1;		* index of high word *
-	ix0 = *(n0+(int*)&x);			* high word of x *
-	ix1 = *((1-n0)+(int*)&x);		* low word of x *
-   to dig two 32 bit words out of the 64 bit IEEE floating point
-   value.  That is non-ANSI, and, moreover, the gcc instruction
-   scheduler gets it wrong.  We instead use the following macros.
-   Unlike the original code, we determine the endianness at compile
-   time, not at run time; I don't see much benefit to selecting
-   endianness at run time.  */
-
-/* A union which permits us to convert between a double and two 32 bit
-   ints.  */
-
-#if __FLOAT_WORD_ORDER == BIG_ENDIAN
-
-typedef union
-{
-  double value;
-  struct
-  {
-    u_int32_t msw;
-    u_int32_t lsw;
-  } parts;
-} ieee_double_shape_type;
-
-#endif
-
-#if __FLOAT_WORD_ORDER == LITTLE_ENDIAN
-
-typedef union
-{
-  double value;
-  struct
-  {
-    u_int32_t lsw;
-    u_int32_t msw;
-  } parts;
-} ieee_double_shape_type;
-
-#endif
-
-/* Get two 32 bit ints from a double.  */
-
-#define EXTRACT_WORDS(ix0,ix1,d)				\
-do {								\
-  ieee_double_shape_type ew_u;					\
-  ew_u.value = (d);						\
-  (ix0) = ew_u.parts.msw;					\
-  (ix1) = ew_u.parts.lsw;					\
-} while (0)
-
-/* Get the more significant 32 bit int from a double.  */
-
-#define GET_HIGH_WORD(i,d)					\
-do {								\
-  ieee_double_shape_type gh_u;					\
-  gh_u.value = (d);						\
-  (i) = gh_u.parts.msw;						\
-} while (0)
-
-/* Get the less significant 32 bit int from a double.  */
-
-#define GET_LOW_WORD(i,d)					\
-do {								\
-  ieee_double_shape_type gl_u;					\
-  gl_u.value = (d);						\
-  (i) = gl_u.parts.lsw;						\
-} while (0)
-
-/* Set a double from two 32 bit ints.  */
-
-#define INSERT_WORDS(d,ix0,ix1)					\
-do {								\
-  ieee_double_shape_type iw_u;					\
-  iw_u.parts.msw = (ix0);					\
-  iw_u.parts.lsw = (ix1);					\
-  (d) = iw_u.value;						\
-} while (0)
-
-/* Set the more significant 32 bits of a double from an int.  */
-
-#define SET_HIGH_WORD(d,v)					\
-do {								\
-  ieee_double_shape_type sh_u;					\
-  sh_u.value = (d);						\
-  sh_u.parts.msw = (v);						\
-  (d) = sh_u.value;						\
-} while (0)
-
-/* Set the less significant 32 bits of a double from an int.  */
-
-#define SET_LOW_WORD(d,v)					\
-do {								\
-  ieee_double_shape_type sl_u;					\
-  sl_u.value = (d);						\
-  sl_u.parts.lsw = (v);						\
-  (d) = sl_u.value;						\
-} while (0)
-
-/* A union which permits us to convert between a float and a 32 bit
-   int.  */
-
-typedef union
-{
-  float value;
-  u_int32_t word;
-} ieee_float_shape_type;
-
-/* Get a 32 bit int from a float.  */
-
-#define GET_FLOAT_WORD(i,d)					\
-do {								\
-  ieee_float_shape_type gf_u;					\
-  gf_u.value = (d);						\
-  (i) = gf_u.word;						\
-} while (0)
-
-/* Set a float from a 32 bit int.  */
-
-#define SET_FLOAT_WORD(d,i)					\
-do {								\
-  ieee_float_shape_type sf_u;					\
-  sf_u.word = (i);						\
-  (d) = sf_u.value;						\
-} while (0)
-
-#if 0
-/* ieee style elementary functions */
-extern double __ieee754_sqrt (double);
-extern double __ieee754_acos (double);
-extern double __ieee754_acosh (double);
-extern double __ieee754_log (double);
-extern double __ieee754_atanh (double);
-extern double __ieee754_asin (double);
-extern double __ieee754_atan2 (double,double);
-extern double __ieee754_exp (double);
-extern double __ieee754_exp2 (double);
-extern double __ieee754_exp10 (double);
-extern double __ieee754_cosh (double);
-extern double __ieee754_fmod (double,double);
-extern double __ieee754_pow (double,double);
-extern double __ieee754_lgamma_r (double,int *);
-extern double __ieee754_gamma_r (double,int *);
-extern double __ieee754_lgamma (double);
-extern double __ieee754_gamma (double);
-extern double __ieee754_log10 (double);
-extern double __ieee754_log2 (double);
-extern double __ieee754_sinh (double);
-extern double __ieee754_hypot (double,double);
-extern double __ieee754_j0 (double);
-extern double __ieee754_j1 (double);
-extern double __ieee754_y0 (double);
-extern double __ieee754_y1 (double);
-extern double __ieee754_jn (int,double);
-extern double __ieee754_yn (int,double);
-extern double __ieee754_remainder (double,double);
-extern int32_t __ieee754_rem_pio2 (double,double*);
-extern double __ieee754_scalb (double,double);
-#endif
-
-/* This is necessary because the hardware accelerated version of libm
-   does not provide the __ieee754 functions. */
-#define __ieee754_sinh   sinh
-#define __ieee754_hypot  hypot
-#define __ieee754_hypotf hypotf
-#define __ieee754_logf   logf
-#define __ieee754_log10  log10
-#define __ieee754_exp    exp
-#define __ieee754_cosh   cosh
-#define __ieee754_expf   expf
-#define __ieee754_log10f log10f
-#define __ieee754_atan2  atan2
-#define __ieee754_sqrtf  sqrtf
-#define __ieee754_sinhf  sinhf
-#define __ieee754_log    log
-#define __ieee754_sqrt   sqrt
-#define __ieee754_coshf  coshf
-#define __ieee754_atan2f atan2f
-
-/* fdlibm kernel function */
-extern double __kernel_standard (double,double,int);
-extern double __kernel_sin (double,double,int);
-extern double __kernel_cos (double,double);
-extern double __kernel_tan (double,double,int);
-extern int    __kernel_rem_pio2 (double*,double*,int,int,int, const int32_t*);
-
-/* internal functions.  */
-extern double __copysign (double x, double __y);
-
-
-/* ieee style elementary float functions */
-extern float __ieee754_sqrtf (float);
-extern float __ieee754_acosf (float);
-extern float __ieee754_acoshf (float);
-extern float __ieee754_logf (float);
-extern float __ieee754_atanhf (float);
-extern float __ieee754_asinf (float);
-extern float __ieee754_atan2f (float,float);
-extern float __ieee754_expf (float);
-extern float __ieee754_exp2f (float);
-extern float __ieee754_exp10f (float);
-extern float __ieee754_coshf (float);
-extern float __ieee754_fmodf (float,float);
-extern float __ieee754_powf (float,float);
-extern float __ieee754_lgammaf_r (float,int *);
-extern float __ieee754_gammaf_r (float,int *);
-extern float __ieee754_lgammaf (float);
-extern float __ieee754_gammaf (float);
-extern float __ieee754_log10f (float);
-extern float __ieee754_log2f (float);
-extern float __ieee754_sinhf (float);
-extern float __ieee754_hypotf (float,float);
-extern float __ieee754_j0f (float);
-extern float __ieee754_j1f (float);
-extern float __ieee754_y0f (float);
-extern float __ieee754_y1f (float);
-extern float __ieee754_jnf (int,float);
-extern float __ieee754_ynf (int,float);
-extern float __ieee754_remainderf (float,float);
-extern int32_t __ieee754_rem_pio2f (float,float*);
-extern float __ieee754_scalbf (float,float);
-
-
-/* float versions of fdlibm kernel functions */
-extern float __kernel_sinf (float,float,int);
-extern float __kernel_cosf (float,float);
-extern float __kernel_tanf (float,float,int);
-extern int   __kernel_rem_pio2f (float*,float*,int,int,int, const int32_t*);
-
-
-/* ieee style elementary long double functions */
-extern long double __ieee754_sqrtl (long double);
-extern long double __ieee754_acosl (long double);
-extern long double __ieee754_acoshl (long double);
-extern long double __ieee754_logl (long double);
-extern long double __ieee754_atanhl (long double);
-extern long double __ieee754_asinl (long double);
-extern long double __ieee754_atan2l (long double,long double);
-extern long double __ieee754_expl (long double);
-extern long double __ieee754_exp2l (long double);
-extern long double __ieee754_exp10l (long double);
-extern long double __ieee754_coshl (long double);
-extern long double __ieee754_fmodl (long double,long double);
-extern long double __ieee754_powl (long double,long double);
-extern long double __ieee754_lgammal_r (long double,int *);
-extern long double __ieee754_gammal_r (long double,int *);
-extern long double __ieee754_lgammal (long double);
-extern long double __ieee754_gammal (long double);
-extern long double __ieee754_log10l (long double);
-extern long double __ieee754_log2l (long double);
-extern long double __ieee754_sinhl (long double);
-extern long double __ieee754_hypotl (long double,long double);
-extern long double __ieee754_j0l (long double);
-extern long double __ieee754_j1l (long double);
-extern long double __ieee754_y0l (long double);
-extern long double __ieee754_y1l (long double);
-extern long double __ieee754_jnl (int,long double);
-extern long double __ieee754_ynl (int,long double);
-extern long double __ieee754_remainderl (long double,long double);
-extern int   __ieee754_rem_pio2l (long double,long double*);
-extern long double __ieee754_scalbl (long double,long double);
-
-/* long double versions of fdlibm kernel functions */
-extern long double __kernel_sinl (long double,long double,int);
-extern long double __kernel_cosl (long double,long double);
-extern long double __kernel_tanl (long double,long double,int);
-extern void __kernel_sincosl (long double,long double,
-			      long double *,long double *, int);
-extern int   __kernel_rem_pio2l (long double*,long double*,int,int,
-				 int,const int*);
-
-#ifndef NO_LONG_DOUBLE
-/* prototypes required to compile the ldbl-96 support without warnings */
-extern int __finitel (long double);
-extern int __ilogbl (long double);
-extern int __isinfl (long double);
-extern int __isnanl (long double);
-extern long double __atanl (long double);
-extern long double __copysignl (long double, long double);
-extern long double __expm1l (long double);
-extern long double __floorl (long double);
-extern long double __frexpl (long double, int *);
-extern long double __ldexpl (long double, int);
-extern long double __log1pl (long double);
-extern long double __nanl (const char *);
-extern long double __rintl (long double);
-extern long double __scalbnl (long double, int);
-extern long double __sqrtl (long double x);
-extern long double fabsl (long double x);
-extern void __sincosl (long double, long double *, long double *);
-extern long double __logbl (long double x);
-extern long double __significandl (long double x);
-#endif
-
-/* Prototypes for functions of the IBM Accurate Mathematical Library.  */
-extern double __exp1 (double __x, double __xx, double __error);
-extern double __sin (double __x);
-extern double __cos (double __x);
-extern int __branred (double __x, double *__a, double *__aa);
-extern void __doasin (double __x, double __dx, double __v[]);
-extern void __dubsin (double __x, double __dx, double __v[]);
-extern void __dubcos (double __x, double __dx, double __v[]);
-extern double __halfulp (double __x, double __y);
-extern double __sin32 (double __x, double __res, double __res1);
-extern double __cos32 (double __x, double __res, double __res1);
-extern double __mpsin (double __x, double __dx);
-extern double __mpcos (double __x, double __dx);
-extern double __mpsin1 (double __x);
-extern double __mpcos1 (double __x);
-extern double __slowexp (double __x);
-extern double __slowpow (double __x, double __y, double __z);
-extern void __docos (double __x, double __dx, double __v[]);
-
-#endif /* _MATH_PRIVATE_H_ */
diff --git a/newlib/libc/sys/linux/cmath/s_cacos.c b/newlib/libc/sys/linux/cmath/s_cacos.c
deleted file mode 100644
index f986447..0000000
--- a/newlib/libc/sys/linux/cmath/s_cacos.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Return cosine of complex double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ double
-__cacos (__complex__ double x)
-{
-  __complex__ double y;
-  __complex__ double res;
-
-  y = __casin (x);
-
-  __real__ res = (double) M_PI_2 - __real__ y;
-  __imag__ res = -__imag__ y;
-
-  return res;
-}
-weak_alias (__cacos, cacos)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__cacos, __cacosl)
-weak_alias (__cacos, cacosl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_cacosf.c b/newlib/libc/sys/linux/cmath/s_cacosf.c
deleted file mode 100644
index bf01890..0000000
--- a/newlib/libc/sys/linux/cmath/s_cacosf.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Return cosine of complex float value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ float
-__cacosf (__complex__ float x)
-{
-  __complex__ float y;
-  __complex__ float res;
-
-  y = __casinf (x);
-
-  __real__ res = (float) M_PI_2 - __real__ y;
-  __imag__ res = -__imag__ y;
-
-  return res;
-}
-weak_alias (__cacosf, cacosf)
diff --git a/newlib/libc/sys/linux/cmath/s_cacosh.c b/newlib/libc/sys/linux/cmath/s_cacosh.c
deleted file mode 100644
index 6ca3426..0000000
--- a/newlib/libc/sys/linux/cmath/s_cacosh.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Return arc hyperbole cosine for double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ double
-__cacosh (__complex__ double x)
-{
-  __complex__ double res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (icls == FP_INFINITE)
-	{
-	  __real__ res = HUGE_VAL;
-
-	  if (rcls == FP_NAN)
-	    __imag__ res = __nan ("");
-	  else
-	    __imag__ res = __copysign ((rcls == FP_INFINITE
-					? (__real__ x < 0.0
-					   ? M_PI - M_PI_4 : M_PI_4)
-					: M_PI_2), __imag__ x);
-	}
-      else if (rcls == FP_INFINITE)
-	{
-	  __real__ res = HUGE_VAL;
-
-	  if (icls >= FP_ZERO)
-	    __imag__ res = __copysign (signbit (__real__ x) ? M_PI : 0.0,
-				       __imag__ x);
-	  else
-	    __imag__ res = __nan ("");
-	}
-      else
-	{
-	  __real__ res = __nan ("");
-	  __imag__ res = __nan ("");
-	}
-    }
-  else if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      __real__ res = 0.0;
-      __imag__ res = __copysign (M_PI_2, __imag__ x);
-    }
-  else
-    {
-      __complex__ double y;
-
-      __real__ y = (__real__ x - __imag__ x) * (__real__ x + __imag__ x) - 1.0;
-      __imag__ y = 2.0 * __real__ x * __imag__ x;
-
-      y = __csqrt (y);
-
-      __real__ y += __real__ x;
-      __imag__ y += __imag__ x;
-
-      res = __clog (y);
-    }
-
-  return res;
-}
-weak_alias (__cacosh, cacosh)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__cacosh, __cacoshl)
-weak_alias (__cacosh, cacoshl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_cacoshf.c b/newlib/libc/sys/linux/cmath/s_cacoshf.c
deleted file mode 100644
index 69054cd..0000000
--- a/newlib/libc/sys/linux/cmath/s_cacoshf.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Return arc hyperbole cosine for float value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ float
-__cacoshf (__complex__ float x)
-{
-  __complex__ float res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (icls == FP_INFINITE)
-	{
-	  __real__ res = HUGE_VALF;
-
-	  if (rcls == FP_NAN)
-	    __imag__ res = __nanf ("");
-	  else
-	    __imag__ res = __copysignf ((rcls == FP_INFINITE
-					 ? (__real__ x < 0.0
-					    ? M_PI - M_PI_4 : M_PI_4)
-					 : M_PI_2), __imag__ x);
-	}
-      else if (rcls == FP_INFINITE)
-	{
-	  __real__ res = HUGE_VALF;
-
-	  if (icls >= FP_ZERO)
-	    __imag__ res = __copysignf (signbit (__real__ x) ? M_PI : 0.0,
-					__imag__ x);
-	  else
-	    __imag__ res = __nanf ("");
-	}
-      else
-	{
-	  __real__ res = __nanf ("");
-	  __imag__ res = __nanf ("");
-	}
-    }
-  else if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      __real__ res = 0.0;
-      __imag__ res = __copysignf (M_PI_2, __imag__ x);
-    }
-  else
-    {
-#if 1
-      __complex__ float y;
-
-      __real__ y = (__real__ x - __imag__ x) * (__real__ x + __imag__ x) - 1.0;
-      __imag__ y = 2.0 * __real__ x * __imag__ x;
-
-      y = __csqrtf (y);
-
-      __real__ y += __real__ x;
-      __imag__ y += __imag__ x;
-
-      res = __clogf (y);
-#else
-      float re2 = __real__ x * __real__ x;
-      float im2 = __imag__ x * __imag__ x;
-      float sq = re2 - im2 - 1.0;
-      float ro = __ieee754_sqrtf (sq * sq + 4 * re2 * im2);
-      float a = __ieee754_sqrtf ((sq + ro) / 2.0);
-      float b = __ieee754_sqrtf ((-sq + ro) / 2.0);
-
-      __real__ res = 0.5 * __ieee754_logf (re2 + __real__ x * 2 * a
-					   + im2 + __imag__ x * 2 * b
-					   + ro);
-      __imag__ res = __ieee754_atan2f (__imag__ x + b, __real__ x + a);
-#endif
-    }
-
-  return res;
-}
-weak_alias (__cacoshf, cacoshf)
diff --git a/newlib/libc/sys/linux/cmath/s_cacoshl.c b/newlib/libc/sys/linux/cmath/s_cacoshl.c
deleted file mode 100644
index 3d0cd7f..0000000
--- a/newlib/libc/sys/linux/cmath/s_cacoshl.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Return arc hyperbole cosine for long double value.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ long double
-__cacoshl (__complex__ long double x)
-{
-  __complex__ long double res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (icls == FP_INFINITE)
-	{
-	  __real__ res = HUGE_VALL;
-
-	  if (rcls == FP_NAN)
-	    __imag__ res = __nanl ("");
-	  else
-	    __imag__ res = __copysignl ((rcls == FP_INFINITE
-					 ? (__real__ x < 0.0
-					    ? M_PIl - M_PI_4l : M_PI_4l)
-					 : M_PI_2l), __imag__ x);
-	}
-      else if (rcls == FP_INFINITE)
-	{
-	  __real__ res = HUGE_VALL;
-
-	  if (icls >= FP_ZERO)
-	    __imag__ res = __copysignl (signbit (__real__ x) ? M_PIl : 0.0,
-					__imag__ x);
-	  else
-	    __imag__ res = __nanl ("");
-	}
-      else
-	{
-	  __real__ res = __nanl ("");
-	  __imag__ res = __nanl ("");
-	}
-    }
-  else if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      __real__ res = 0.0;
-      __imag__ res = __copysignl (M_PI_2l, __imag__ x);
-    }
-  else
-    {
-      __complex__ long double y;
-
-      __real__ y = (__real__ x - __imag__ x) * (__real__ x + __imag__ x) - 1.0;
-      __imag__ y = 2.0 * __real__ x * __imag__ x;
-
-      y = __csqrtl (y);
-
-      __real__ y += __real__ x;
-      __imag__ y += __imag__ x;
-
-      res = __clogl (y);
-    }
-
-  return res;
-}
-weak_alias (__cacoshl, cacoshl)
diff --git a/newlib/libc/sys/linux/cmath/s_cacosl.c b/newlib/libc/sys/linux/cmath/s_cacosl.c
deleted file mode 100644
index d4bbfec..0000000
--- a/newlib/libc/sys/linux/cmath/s_cacosl.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Return cosine of complex long double value.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ long double
-__cacosl (__complex__ long double x)
-{
-  __complex__ long double y;
-  __complex__ long double res;
-
-  y = __casinl (x);
-
-  __real__ res = M_PI_2l - __real__ y;
-  __imag__ res = -__imag__ y;
-
-  return res;
-}
-weak_alias (__cacosl, cacosl)
diff --git a/newlib/libc/sys/linux/cmath/s_casin.c b/newlib/libc/sys/linux/cmath/s_casin.c
deleted file mode 100644
index 4c164b5..0000000
--- a/newlib/libc/sys/linux/cmath/s_casin.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Return arc sine of complex double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ double
-__casin (__complex__ double x)
-{
-  __complex__ double res;
-
-  if (isnan (__real__ x) || isnan (__imag__ x))
-    {
-      if (__real__ x == 0.0)
-	{
-	  res = x;
-	}
-      else if (__isinf (__real__ x) || __isinf (__imag__ x))
-	{
-	  __real__ res = __nan ("");
-	  __imag__ res = __copysign (HUGE_VAL, __imag__ x);
-	}
-      else
-	{
-	  __real__ res = __nan ("");
-	  __imag__ res = __nan ("");
-	}
-    }
-  else
-    {
-      __complex__ double y;
-
-      __real__ y = -__imag__ x;
-      __imag__ y = __real__ x;
-
-      y = __casinh (y);
-
-      __real__ res = __imag__ y;
-      __imag__ res = -__real__ y;
-    }
-
-  return res;
-}
-weak_alias (__casin, casin)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__casin, __casinl)
-weak_alias (__casin, casinl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_casinf.c b/newlib/libc/sys/linux/cmath/s_casinf.c
deleted file mode 100644
index 09e52b4..0000000
--- a/newlib/libc/sys/linux/cmath/s_casinf.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Return arc sine of complex float value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-
-__complex__ float
-__casinf (__complex__ float x)
-{
-  __complex__ float res;
-
-  if (isnan (__real__ x) || isnan (__imag__ x))
-    {
-      if (__real__ x == 0.0)
-	{
-	  res = x;
-	}
-      else if (__isinff (__real__ x) || __isinff (__imag__ x))
-	{
-	  __real__ res = __nanf ("");
-	  __imag__ res = __copysignf (HUGE_VALF, __imag__ x);
-	}
-      else
-	{
-	  __real__ res = __nanf ("");
-	  __imag__ res = __nanf ("");
-	}
-    }
-  else
-    {
-      __complex__ float y;
-
-      __real__ y = -__imag__ x;
-      __imag__ y = __real__ x;
-
-      y = __casinhf (y);
-
-      __real__ res = __imag__ y;
-      __imag__ res = -__real__ y;
-    }
-
-  return res;
-}
-weak_alias (__casinf, casinf)
diff --git a/newlib/libc/sys/linux/cmath/s_casinh.c b/newlib/libc/sys/linux/cmath/s_casinh.c
deleted file mode 100644
index 30b9dbb..0000000
--- a/newlib/libc/sys/linux/cmath/s_casinh.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Return arc hyperbole sine for double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ double
-__casinh (__complex__ double x)
-{
-  __complex__ double res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (icls == FP_INFINITE)
-	{
-	  __real__ res = __copysign (HUGE_VAL, __real__ x);
-
-	  if (rcls == FP_NAN)
-	    __imag__ res = __nan ("");
-	  else
-	    __imag__ res = __copysign (rcls >= FP_ZERO ? M_PI_2 : M_PI_4,
-				       __imag__ x);
-	}
-      else if (rcls <= FP_INFINITE)
-	{
-	  __real__ res = __real__ x;
-	  if ((rcls == FP_INFINITE && icls >= FP_ZERO)
-	      || (rcls == FP_NAN && icls == FP_ZERO))
-	    __imag__ res = __copysign (0.0, __imag__ x);
-	  else
-	    __imag__ res = __nan ("");
-	}
-      else
-	{
-	  __real__ res = __nan ("");
-	  __imag__ res = __nan ("");
-	}
-    }
-  else if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      res = x;
-    }
-  else
-    {
-      __complex__ double y;
-
-      __real__ y = (__real__ x - __imag__ x) * (__real__ x + __imag__ x) + 1.0;
-      __imag__ y = 2.0 * __real__ x * __imag__ x;
-
-      y = __csqrt (y);
-
-      __real__ y += __real__ x;
-      __imag__ y += __imag__ x;
-
-      res = __clog (y);
-    }
-
-  return res;
-}
-weak_alias (__casinh, casinh)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__casinh, __casinhl)
-weak_alias (__casinh, casinhl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_casinhf.c b/newlib/libc/sys/linux/cmath/s_casinhf.c
deleted file mode 100644
index f9fc4e7..0000000
--- a/newlib/libc/sys/linux/cmath/s_casinhf.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Return arc hyperbole sine for float value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ float
-__casinhf (__complex__ float x)
-{
-  __complex__ float res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (icls == FP_INFINITE)
-	{
-	  __real__ res = __copysignf (HUGE_VALF, __real__ x);
-
-	  if (rcls == FP_NAN)
-	    __imag__ res = __nanf ("");
-	  else
-	    __imag__ res = __copysignf (rcls >= FP_ZERO ? M_PI_2 : M_PI_4,
-					__imag__ x);
-	}
-      else if (rcls <= FP_INFINITE)
-	{
-	  __real__ res = __real__ x;
-	  if ((rcls == FP_INFINITE && icls >= FP_ZERO)
-	      || (rcls == FP_NAN && icls == FP_ZERO))
-	    __imag__ res = __copysignf (0.0, __imag__ x);
-	  else
-	    __imag__ res = __nanf ("");
-	}
-      else
-	{
-	  __real__ res = __nanf ("");
-	  __imag__ res = __nanf ("");
-	}
-    }
-  else if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      res = x;
-    }
-  else
-    {
-      __complex__ float y;
-
-      __real__ y = (__real__ x - __imag__ x) * (__real__ x + __imag__ x) + 1.0;
-      __imag__ y = 2.0 * __real__ x * __imag__ x;
-
-      y = __csqrtf (y);
-
-      __real__ y += __real__ x;
-      __imag__ y += __imag__ x;
-
-      res = __clogf (y);
-    }
-
-  return res;
-}
-weak_alias (__casinhf, casinhf)
diff --git a/newlib/libc/sys/linux/cmath/s_casinhl.c b/newlib/libc/sys/linux/cmath/s_casinhl.c
deleted file mode 100644
index b48c609..0000000
--- a/newlib/libc/sys/linux/cmath/s_casinhl.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Return arc hyperbole sine for long double value.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ long double
-__casinhl (__complex__ long double x)
-{
-  __complex__ long double res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (icls == FP_INFINITE)
-	{
-	  __real__ res = __copysignl (HUGE_VALL, __real__ x);
-
-	  if (rcls == FP_NAN)
-	    __imag__ res = __nanl ("");
-	  else
-	    __imag__ res = __copysignl (rcls >= FP_ZERO ? M_PI_2l : M_PI_4l,
-					__imag__ x);
-	}
-      else if (rcls <= FP_INFINITE)
-	{
-	  __real__ res = __real__ x;
-	  if ((rcls == FP_INFINITE && icls >= FP_ZERO)
-	      || (rcls == FP_NAN && icls == FP_ZERO))
-	    __imag__ res = __copysignl (0.0, __imag__ x);
-	  else
-	    __imag__ res = __nanl ("");
-	}
-      else
-	{
-	  __real__ res = __nanl ("");
-	  __imag__ res = __nanl ("");
-	}
-    }
-  else if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      res = x;
-    }
-  else
-    {
-      __complex__ long double y;
-
-      __real__ y = (__real__ x - __imag__ x) * (__real__ x + __imag__ x) + 1.0;
-      __imag__ y = 2.0 * __real__ x * __imag__ x;
-
-      y = __csqrtl (y);
-
-      __real__ y += __real__ x;
-      __imag__ y += __imag__ x;
-
-      res = __clogl (y);
-    }
-
-  return res;
-}
-weak_alias (__casinhl, casinhl)
diff --git a/newlib/libc/sys/linux/cmath/s_casinl.c b/newlib/libc/sys/linux/cmath/s_casinl.c
deleted file mode 100644
index d6b7a80..0000000
--- a/newlib/libc/sys/linux/cmath/s_casinl.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Return arc sine of complex long double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ long double
-__casinl (__complex__ long double x)
-{
-  __complex__ long double res;
-
-  if (isnan (__real__ x) || isnan (__imag__ x))
-    {
-      if (__real__ x == 0.0)
-	{
-	  res = x;
-	}
-      else if (__isinfl (__real__ x) || __isinfl (__imag__ x))
-	{
-	  __real__ res = __nanl ("");
-	  __imag__ res = __copysignl (HUGE_VALL, __imag__ x);
-	}
-      else
-	{
-	  __real__ res = __nanl ("");
-	  __imag__ res = __nanl ("");
-	}
-    }
-  else
-    {
-      __complex__ long double y;
-
-      __real__ y = -__imag__ x;
-      __imag__ y = __real__ x;
-
-      y = __casinhl (y);
-
-      __real__ res = __imag__ y;
-      __imag__ res = -__real__ y;
-    }
-
-  return res;
-}
-weak_alias (__casinl, casinl)
diff --git a/newlib/libc/sys/linux/cmath/s_catan.c b/newlib/libc/sys/linux/cmath/s_catan.c
deleted file mode 100644
index 1d0673a..0000000
--- a/newlib/libc/sys/linux/cmath/s_catan.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Return arc tangent of complex double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ double
-__catan (__complex__ double x)
-{
-  __complex__ double res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (rcls == FP_INFINITE)
-	{
-	  __real__ res = __copysign (M_PI_2, __real__ x);
-	  __imag__ res = __copysign (0.0, __imag__ x);
-	}
-      else if (icls == FP_INFINITE)
-	{
-	  if (rcls >= FP_ZERO)
-	    __real__ res = __copysign (M_PI_2, __real__ x);
-	  else
-	    __real__ res = __nan ("");
-	  __imag__ res = __copysign (0.0, __imag__ x);
-	}
-      else if (icls == FP_ZERO || icls == FP_INFINITE)
-	{
-	  __real__ res = __nan ("");
-	  __imag__ res = __copysign (0.0, __imag__ x);
-	}
-      else
-	{
-	  __real__ res = __nan ("");
-	  __imag__ res = __nan ("");
-	}
-    }
-  else if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      res = x;
-    }
-  else
-    {
-      double r2, num, den;
-
-      r2 = __real__ x * __real__ x;
-
-      den = 1 - r2 - __imag__ x * __imag__ x;
-
-      __real__ res = 0.5 * __ieee754_atan2 (2.0 * __real__ x, den);
-
-      num = __imag__ x + 1.0;
-      num = r2 + num * num;
-
-      den = __imag__ x - 1.0;
-      den = r2 + den * den;
-
-      __imag__ res = 0.25 * __ieee754_log (num / den);
-    }
-
-  return res;
-}
-weak_alias (__catan, catan)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__catan, __catanl)
-weak_alias (__catan, catanl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_catanf.c b/newlib/libc/sys/linux/cmath/s_catanf.c
deleted file mode 100644
index cc9e5ea..0000000
--- a/newlib/libc/sys/linux/cmath/s_catanf.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Return arc tangent of complex float value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ float
-__catanf (__complex__ float x)
-{
-  __complex__ float res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (rcls == FP_INFINITE)
-	{
-	  __real__ res = __copysignf (M_PI_2, __real__ x);
-	  __imag__ res = __copysignf (0.0, __imag__ x);
-	}
-      else if (icls == FP_INFINITE)
-	{
-	  if (rcls >= FP_ZERO)
-	    __real__ res = __copysignf (M_PI_2, __real__ x);
-	  else
-	    __real__ res = __nanf ("");
-	  __imag__ res = __copysignf (0.0, __imag__ x);
-	}
-      else if (icls == FP_ZERO || icls == FP_INFINITE)
-	{
-	  __real__ res = __nanf ("");
-	  __imag__ res = __copysignf (0.0, __imag__ x);
-	}
-      else
-	{
-	  __real__ res = __nanf ("");
-	  __imag__ res = __nanf ("");
-	}
-    }
-  else if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      res = x;
-    }
-  else
-    {
-      float r2, num, den;
-
-      r2 = __real__ x * __real__ x;
-
-      den = 1 - r2 - __imag__ x * __imag__ x;
-
-      __real__ res = 0.5 * __ieee754_atan2f (2.0 * __real__ x, den);
-
-      num = __imag__ x + 1.0;
-      num = r2 + num * num;
-
-      den = __imag__ x - 1.0;
-      den = r2 + den * den;
-
-      __imag__ res = 0.25 * __ieee754_logf (num / den);
-    }
-
-  return res;
-}
-weak_alias (__catanf, catanf)
diff --git a/newlib/libc/sys/linux/cmath/s_catanh.c b/newlib/libc/sys/linux/cmath/s_catanh.c
deleted file mode 100644
index e15c073..0000000
--- a/newlib/libc/sys/linux/cmath/s_catanh.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Return arc hyperbole tangent for double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ double
-__catanh (__complex__ double x)
-{
-  __complex__ double res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (icls == FP_INFINITE)
-	{
-	  __real__ res = __copysign (0.0, __real__ x);
-	  __imag__ res = __copysign (M_PI_2, __imag__ x);
-	}
-      else if (rcls == FP_INFINITE || rcls == FP_ZERO)
-	{
-	  __real__ res = __copysign (0.0, __real__ x);
-	  if (icls >= FP_ZERO)
-	    __imag__ res = __copysign (M_PI_2, __imag__ x);
-	  else
-	    __imag__ res = __nan ("");
-	}
-      else
-	{
-	  __real__ res = __nan ("");
-	  __imag__ res = __nan ("");
-	}
-    }
-  else if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      res = x;
-    }
-  else
-    {
-      double i2, num, den;
-
-      i2 = __imag__ x * __imag__ x;
-
-      num = 1.0 + __real__ x;
-      num = i2 + num * num;
-
-      den = 1.0 - __real__ x;
-      den = i2 + den * den;
-
-      __real__ res = 0.25 * (__ieee754_log (num) - __ieee754_log (den));
-
-      den = 1 - __real__ x * __real__ x - i2;
-
-      __imag__ res = 0.5 * __ieee754_atan2 (2.0 * __imag__ x, den);
-    }
-
-  return res;
-}
-weak_alias (__catanh, catanh)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__catanh, __catanhl)
-weak_alias (__catanh, catanhl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_catanhf.c b/newlib/libc/sys/linux/cmath/s_catanhf.c
deleted file mode 100644
index 30a5a1b..0000000
--- a/newlib/libc/sys/linux/cmath/s_catanhf.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Return arc hyperbole tangent for float value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ float
-__catanhf (__complex__ float x)
-{
-  __complex__ float res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (icls == FP_INFINITE)
-	{
-	  __real__ res = __copysignf (0.0, __real__ x);
-	  __imag__ res = __copysignf (M_PI_2, __imag__ x);
-	}
-      else if (rcls == FP_INFINITE || rcls == FP_ZERO)
-	{
-	  __real__ res = __copysignf (0.0, __real__ x);
-	  if (icls >= FP_ZERO)
-	    __imag__ res = __copysignf (M_PI_2, __imag__ x);
-	  else
-	    __imag__ res = __nanf ("");
-	}
-      else
-	{
-	  __real__ res = __nanf ("");
-	  __imag__ res = __nanf ("");
-	}
-    }
-  else if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      res = x;
-    }
-  else
-    {
-      float i2, num, den;
-
-      i2 = __imag__ x * __imag__ x;
-
-      num = 1.0 + __real__ x;
-      num = i2 + num * num;
-
-      den = 1.0 - __real__ x;
-      den = i2 + den * den;
-
-      __real__ res = 0.25 * (__ieee754_logf (num) - __ieee754_logf (den));
-
-      den = 1 - __real__ x * __real__ x - i2;
-
-      __imag__ res = 0.5 * __ieee754_atan2f (2.0 * __imag__ x, den);
-    }
-
-  return res;
-}
-weak_alias (__catanhf, catanhf)
diff --git a/newlib/libc/sys/linux/cmath/s_catanhl.c b/newlib/libc/sys/linux/cmath/s_catanhl.c
deleted file mode 100644
index c3fb0ce..0000000
--- a/newlib/libc/sys/linux/cmath/s_catanhl.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Return arc hyperbole tangent for long double value.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ long double
-__catanhl (__complex__ long double x)
-{
-  __complex__ long double res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (icls == FP_INFINITE)
-	{
-	  __real__ res = __copysignl (0.0, __real__ x);
-	  __imag__ res = __copysignl (M_PI_2l, __imag__ x);
-	}
-      else if (rcls == FP_INFINITE || rcls == FP_ZERO)
-	{
-	  __real__ res = __copysignl (0.0, __real__ x);
-	  if (icls >= FP_ZERO)
-	    __imag__ res = __copysignl (M_PI_2l, __imag__ x);
-	  else
-	    __imag__ res = __nanl ("");
-	}
-      else
-	{
-	  __real__ res = __nanl ("");
-	  __imag__ res = __nanl ("");
-	}
-    }
-  else if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      res = x;
-    }
-  else
-    {
-      long double i2, num, den;
-
-      i2 = __imag__ x * __imag__ x;
-
-      num = 1.0 + __real__ x;
-      num = i2 + num * num;
-
-      den = 1.0 - __real__ x;
-      den = i2 + den * den;
-
-      __real__ res = 0.25 * (__ieee754_logl (num) - __ieee754_logl (den));
-
-      den = 1 - __real__ x * __real__ x - i2;
-
-      __imag__ res = 0.5 * __ieee754_atan2l (2.0 * __imag__ x, den);
-    }
-
-  return res;
-}
-weak_alias (__catanhl, catanhl)
diff --git a/newlib/libc/sys/linux/cmath/s_catanl.c b/newlib/libc/sys/linux/cmath/s_catanl.c
deleted file mode 100644
index 6cb45e5..0000000
--- a/newlib/libc/sys/linux/cmath/s_catanl.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Return arc tangent of complex long double value.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ long double
-__catanl (__complex__ long double x)
-{
-  __complex__ long double res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (rcls == FP_INFINITE)
-	{
-	  __real__ res = __copysignl (M_PI_2l, __real__ x);
-	  __imag__ res = __copysignl (0.0, __imag__ x);
-	}
-      else if (icls == FP_INFINITE)
-	{
-	  if (rcls >= FP_ZERO)
-	    __real__ res = __copysignl (M_PI_2l, __real__ x);
-	  else
-	    __real__ res = __nanl ("");
-	  __imag__ res = __copysignl (0.0, __imag__ x);
-	}
-      else if (icls == FP_ZERO || icls == FP_INFINITE)
-	{
-	  __real__ res = __nanl ("");
-	  __imag__ res = __copysignl (0.0, __imag__ x);
-	}
-      else
-	{
-	  __real__ res = __nanl ("");
-	  __imag__ res = __nanl ("");
-	}
-    }
-  else if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      res = x;
-    }
-  else
-    {
-      long double r2, num, den;
-
-      r2 = __real__ x * __real__ x;
-
-      den = 1 - r2 - __imag__ x * __imag__ x;
-
-      __real__ res = 0.5 * __ieee754_atan2l (2.0 * __real__ x, den);
-
-      num = __imag__ x + 1.0;
-      num = r2 + num * num;
-
-      den = __imag__ x - 1.0;
-      den = r2 + den * den;
-
-      __imag__ res = 0.25 * __ieee754_logl (num / den);
-    }
-
-  return res;
-}
-weak_alias (__catanl, catanl)
diff --git a/newlib/libc/sys/linux/cmath/s_cbrtl.c b/newlib/libc/sys/linux/cmath/s_cbrtl.c
deleted file mode 100644
index d668e37..0000000
--- a/newlib/libc/sys/linux/cmath/s_cbrtl.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <errno.h>
-
-long double
-__cbrtl(long double x)
-{
-  fputs ("__cbrtl not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
-
-weak_alias (__cbrtl, cbrtl)
-stub_warning (cbrtl)
-#include <stub-tag.h>
diff --git a/newlib/libc/sys/linux/cmath/s_ccos.c b/newlib/libc/sys/linux/cmath/s_ccos.c
deleted file mode 100644
index e65ea38..0000000
--- a/newlib/libc/sys/linux/cmath/s_ccos.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Return cosine of complex double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ double
-__ccos (__complex__ double x)
-{
-  __complex__ double res;
-
-  if (!isfinite (__real__ x) || __isnan (__imag__ x))
-    {
-      if (__real__ x == 0.0 || __imag__ x == 0.0)
-	{
-	  __real__ res = __nan ("");
-	  __imag__ res = 0.0;
-
-#ifdef FE_INVALID
-	  if (__isinf (__real__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-      else if (__isinf (__imag__ x))
-	{
-	  __real__ res = HUGE_VAL;
-	  __imag__ res = __nan ("");
-
-#ifdef FE_INVALID
-	  if (__isinf (__real__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-      else
-	{
-	  __real__ res = __nan ("");
-	  __imag__ res = __nan ("");
-
-#ifdef FE_INVALID
-	  if (isfinite (__imag__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      __complex__ double y;
-
-      __real__ y = -__imag__ x;
-      __imag__ y = __real__ x;
-
-      res = __ccosh (y);
-    }
-
-  return res;
-}
-weak_alias (__ccos, ccos)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__ccos, __ccosl)
-weak_alias (__ccos, ccosl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_ccosf.c b/newlib/libc/sys/linux/cmath/s_ccosf.c
deleted file mode 100644
index 016d806..0000000
--- a/newlib/libc/sys/linux/cmath/s_ccosf.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Return cosine of complex float value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ float
-__ccosf (__complex__ float x)
-{
-  __complex__ float res;
-
-  if (!isfinite (__real__ x) || __isnanf (__imag__ x))
-    {
-      if (__real__ x == 0.0 || __imag__ x == 0.0)
-	{
-	  __real__ res = __nanf ("");
-	  __imag__ res = 0.0;
-
-#ifdef FE_INVALID
-	  if (__isinff (__real__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-      else if (__isinff (__imag__ x))
-	{
-	  __real__ res = HUGE_VALF;
-	  __imag__ res = __nanf ("");
-
-#ifdef FE_INVALID
-	  if (__isinff (__real__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-      else
-	{
-	  __real__ res = __nanf ("");
-	  __imag__ res = __nanf ("");
-
-#ifdef FE_INVALID
-	  if (isfinite (__imag__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      __complex__ float y;
-
-      __real__ y = -__imag__ x;
-      __imag__ y = __real__ x;
-
-      res = __ccoshf (y);
-    }
-
-  return res;
-}
-weak_alias (__ccosf, ccosf)
diff --git a/newlib/libc/sys/linux/cmath/s_ccosh.c b/newlib/libc/sys/linux/cmath/s_ccosh.c
deleted file mode 100644
index f5b29db..0000000
--- a/newlib/libc/sys/linux/cmath/s_ccosh.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Complex cosine hyperbole function for double.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ double
-__ccosh (__complex__ double x)
-{
-  __complex__ double retval;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls >= FP_ZERO)
-    {
-      /* Real part is finite.  */
-      if (icls >= FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  double sinh_val = __ieee754_sinh (__real__ x);
-	  double cosh_val = __ieee754_cosh (__real__ x);
-	  double sinix, cosix;
-
-	  __sincos (__imag__ x, &sinix, &cosix);
-
-	  __real__ retval = cosh_val * cosix;
-	  __imag__ retval = sinh_val * sinix;
-	}
-      else
-	{
-	  __imag__ retval = __real__ x == 0.0 ? 0.0 : __nan ("");
-	  __real__ retval = __nan ("") + __nan ("");
-
-#ifdef FE_INVALID
-	  if (icls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else if (rcls == FP_INFINITE)
-    {
-      /* Real part is infinite.  */
-      if (icls == FP_ZERO)
-	{
-	  /* Imaginary part is 0.0.  */
-	  __real__ retval = HUGE_VAL;
-	  __imag__ retval = __imag__ x * __copysign (1.0, __real__ x);
-	}
-      else if (icls > FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  double sinix, cosix;
-
-	  __sincos (__imag__ x, &sinix, &cosix);
-
-	  __real__ retval = __copysign (HUGE_VAL, cosix);
-	  __imag__ retval = (__copysign (HUGE_VAL, sinix)
-			     * __copysign (1.0, __real__ x));
-	}
-      else
-	{
-	  /* The addition raises the invalid exception.  */
-	  __real__ retval = HUGE_VAL;
-	  __imag__ retval = __nan ("") + __nan ("");
-
-#ifdef FE_INVALID
-	  if (icls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      __real__ retval = __nan ("");
-      __imag__ retval = __imag__ x == 0.0 ? __imag__ x : __nan ("");
-    }
-
-  return retval;
-}
-weak_alias (__ccosh, ccosh)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__ccosh, __ccoshl)
-weak_alias (__ccosh, ccoshl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_ccoshf.c b/newlib/libc/sys/linux/cmath/s_ccoshf.c
deleted file mode 100644
index 339b6bc..0000000
--- a/newlib/libc/sys/linux/cmath/s_ccoshf.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Complex cosine hyperbole function for float.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ float
-__ccoshf (__complex__ float x)
-{
-  __complex__ float retval;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls >= FP_ZERO)
-    {
-      /* Real part is finite.  */
-      if (icls >= FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  float sinh_val = __ieee754_sinhf (__real__ x);
-	  float cosh_val = __ieee754_coshf (__real__ x);
-	  float sinix, cosix;
-
-	  __sincosf (__imag__ x, &sinix, &cosix);
-
-	  __real__ retval = cosh_val * cosix;
-	  __imag__ retval = sinh_val * sinix;
-	}
-      else
-	{
-	  __imag__ retval = __real__ x == 0.0 ? 0.0 : __nanf ("");
-	  __real__ retval = __nanf ("");
-
-#ifdef FE_INVALID
-	  if (icls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else if (rcls == FP_INFINITE)
-    {
-      /* Real part is infinite.  */
-      if (icls == FP_ZERO)
-	{
-	  /* Imaginary part is 0.0.  */
-	  __real__ retval = HUGE_VALF;
-	  __imag__ retval = __imag__ x * __copysignf (1.0, __real__ x);
-	}
-      else if (icls > FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  float sinix, cosix;
-
-	  __sincosf (__imag__ x, &sinix, &cosix);
-
-	  __real__ retval = __copysignf (HUGE_VALF, cosix);
-	  __imag__ retval = (__copysignf (HUGE_VALF, sinix)
-			     * __copysignf (1.0, __real__ x));
-	}
-      else
-	{
-	  /* The addition raises the invalid exception.  */
-	  __real__ retval = HUGE_VALF;
-	  __imag__ retval = __nanf ("") + __nanf ("");
-
-#ifdef FE_INVALID
-	  if (icls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      __real__ retval = __nanf ("");
-      __imag__ retval = __imag__ x == 0.0 ? __imag__ x : __nanf ("");
-    }
-
-  return retval;
-}
-weak_alias (__ccoshf, ccoshf)
diff --git a/newlib/libc/sys/linux/cmath/s_ccoshl.c b/newlib/libc/sys/linux/cmath/s_ccoshl.c
deleted file mode 100644
index 61ffb49..0000000
--- a/newlib/libc/sys/linux/cmath/s_ccoshl.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Complex cosine hyperbole function for long double.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ long double
-__ccoshl (__complex__ long double x)
-{
-  __complex__ long double retval;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls >= FP_ZERO)
-    {
-      /* Real part is finite.  */
-      if (icls >= FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  long double sinh_val = __ieee754_sinhl (__real__ x);
-	  long double cosh_val = __ieee754_coshl (__real__ x);
-	  long double sinix, cosix;
-
-	  __sincosl (__imag__ x, &sinix, &cosix);
-
-	  __real__ retval = cosh_val * cosix;
-	  __imag__ retval = sinh_val * sinix;
-	}
-      else
-	{
-	  __imag__ retval = __real__ x == 0.0 ? 0.0 : __nanl ("");
-	  __real__ retval = __nanl ("") + __nanl ("");
-
-#ifdef FE_INVALID
-	  if (icls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else if (rcls == FP_INFINITE)
-    {
-      /* Real part is infinite.  */
-      if (icls == FP_ZERO)
-	{
-	  /* Imaginary part is 0.0.  */
-	  __real__ retval = HUGE_VALL;
-	  __imag__ retval = __imag__ x * __copysignl (1.0, __real__ x);
-	}
-      else if (icls > FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  long double sinix, cosix;
-
-	  __sincosl (__imag__ x, &sinix, &cosix);
-
-	  __real__ retval = __copysignl (HUGE_VALL, cosix);
-	  __imag__ retval = (__copysignl (HUGE_VALL, sinix)
-			     * __copysignl (1.0, __real__ x));
-	}
-      else
-	{
-	  /* The addition raises the invalid exception.  */
-	  __real__ retval = HUGE_VALL;
-	  __imag__ retval = __nanl ("") + __nanl ("");
-
-#ifdef FE_INVALID
-	  if (icls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      __real__ retval = __nanl ("");
-      __imag__ retval = __imag__ x == 0.0 ? __imag__ x : __nanl ("");
-    }
-
-  return retval;
-}
-weak_alias (__ccoshl, ccoshl)
diff --git a/newlib/libc/sys/linux/cmath/s_ccosl.c b/newlib/libc/sys/linux/cmath/s_ccosl.c
deleted file mode 100644
index 4ebe2c3..0000000
--- a/newlib/libc/sys/linux/cmath/s_ccosl.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Return cosine of complex long double value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-
-__complex__ long double
-__ccosl (__complex__ long double x)
-{
-  __complex__ long double res;
-
-  if (!isfinite (__real__ x) || __isnanl (__imag__ x))
-    {
-      if (__real__ x == 0.0 || __imag__ x == 0.0)
-	{
-	  __real__ res = __nanl ("");
-	  __imag__ res = 0.0;
-
-#ifdef FE_INVALID
-	  if (__isinfl (__real__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-      else if (__isinfl (__imag__ x))
-	{
-	  __real__ res = HUGE_VALL;
-	  __imag__ res = __nanl ("");
-
-#ifdef FE_INVALID
-	  if (__isinfl (__real__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-      else
-	{
-	  __real__ res = __nanl ("");
-	  __imag__ res = __nanl ("");
-
-#ifdef FE_INVALID
-	  if (isfinite (__imag__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      __complex__ long double y;
-
-      __real__ y = -__imag__ x;
-      __imag__ y = __real__ x;
-
-      res = __ccoshl (y);
-    }
-
-  return res;
-}
-weak_alias (__ccosl, ccosl)
diff --git a/newlib/libc/sys/linux/cmath/s_cexp.c b/newlib/libc/sys/linux/cmath/s_cexp.c
deleted file mode 100644
index 5a299b7..0000000
--- a/newlib/libc/sys/linux/cmath/s_cexp.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Return value of complex exponential function for double complex value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ double
-__cexp (__complex__ double x)
-{
-  __complex__ double retval;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls >= FP_ZERO)
-    {
-      /* Real part is finite.  */
-      if (icls >= FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  double exp_val = __ieee754_exp (__real__ x);
-	  double sinix, cosix;
-
-	  __sincos (__imag__ x, &sinix, &cosix);
-
-	  if (isfinite (exp_val))
-	    {
-	      __real__ retval = exp_val * cosix;
-	      __imag__ retval = exp_val * sinix;
-	    }
-	  else
-	    {
-	      __real__ retval = __copysign (exp_val, cosix);
-	      __imag__ retval = __copysign (exp_val, sinix);
-	    }
-	}
-      else
-	{
-	  /* If the imaginary part is +-inf or NaN and the real part
-	     is not +-inf the result is NaN + iNaN.  */
-	  __real__ retval = __nan ("");
-	  __imag__ retval = __nan ("");
-
-#ifdef FE_INVALID
-	  feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else if (rcls == FP_INFINITE)
-    {
-      /* Real part is infinite.  */
-      if (icls >= FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  double value = signbit (__real__ x) ? 0.0 : HUGE_VAL;
-
-	  if (icls == FP_ZERO)
-	    {
-	      /* Imaginary part is 0.0.  */
-	      __real__ retval = value;
-	      __imag__ retval = __imag__ x;
-	    }
-	  else
-	    {
-	      double sinix, cosix;
-
-	      __sincos (__imag__ x, &sinix, &cosix);
-
-	      __real__ retval = __copysign (value, cosix);
-	      __imag__ retval = __copysign (value, sinix);
-	    }
-	}
-      else if (signbit (__real__ x) == 0)
-	{
-	  __real__ retval = HUGE_VAL;
-	  __imag__ retval = __nan ("");
-
-#ifdef FE_INVALID
-	  if (icls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-      else
-	{
-	  __real__ retval = 0.0;
-	  __imag__ retval = __copysign (0.0, __imag__ x);
-	}
-    }
-  else
-    {
-      /* If the real part is NaN the result is NaN + iNaN.  */
-      __real__ retval = __nan ("");
-      __imag__ retval = __nan ("");
-
-#ifdef FE_INVALID
-      if (rcls != FP_NAN || icls != FP_NAN)
-	feraiseexcept (FE_INVALID);
-#endif
-    }
-
-  return retval;
-}
-weak_alias (__cexp, cexp)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__cexp, __cexpl)
-weak_alias (__cexp, cexpl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_cexpf.c b/newlib/libc/sys/linux/cmath/s_cexpf.c
deleted file mode 100644
index 93bfe20..0000000
--- a/newlib/libc/sys/linux/cmath/s_cexpf.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Return value of complex exponential function for float complex value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ float
-__cexpf (__complex__ float x)
-{
-  __complex__ float retval;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls >= FP_ZERO)
-    {
-      /* Real part is finite.  */
-      if (icls >= FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  float exp_val = __ieee754_expf (__real__ x);
-	  float sinix, cosix;
-
-	  __sincosf (__imag__ x, &sinix, &cosix);
-
-	  if (isfinite (exp_val))
-	    {
-	      __real__ retval = exp_val * cosix;
-	      __imag__ retval = exp_val * sinix;
-	    }
-	  else
-	    {
-	      __real__ retval = __copysignf (exp_val, cosix);
-	      __imag__ retval = __copysignf (exp_val, sinix);
-	    }
-	}
-      else
-	{
-	  /* If the imaginary part is +-inf or NaN and the real part
-	     is not +-inf the result is NaN + iNaN.  */
-	  __real__ retval = __nanf ("");
-	  __imag__ retval = __nanf ("");
-
-#ifdef FE_INVALID
-	  feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else if (rcls == FP_INFINITE)
-    {
-      /* Real part is infinite.  */
-      if (icls >= FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  float value = signbit (__real__ x) ? 0.0 : HUGE_VALF;
-
-	  if (icls == FP_ZERO)
-	    {
-	      /* Imaginary part is 0.0.  */
-	      __real__ retval = value;
-	      __imag__ retval = __imag__ x;
-	    }
-	  else
-	    {
-	      float sinix, cosix;
-
-	      __sincosf (__imag__ x, &sinix, &cosix);
-
-	      __real__ retval = __copysignf (value, cosix);
-	      __imag__ retval = __copysignf (value, sinix);
-	    }
-	}
-      else if (signbit (__real__ x) == 0)
-	{
-	  __real__ retval = HUGE_VALF;
-	  __imag__ retval = __nanf ("");
-
-#ifdef FE_INVALID
-	  if (icls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-      else
-	{
-	  __real__ retval = 0.0;
-	  __imag__ retval = __copysignf (0.0, __imag__ x);
-	}
-    }
-  else
-    {
-      /* If the real part is NaN the result is NaN + iNaN.  */
-      __real__ retval = __nanf ("");
-      __imag__ retval = __nanf ("");
-
-#ifdef FE_INVALID
-      if (rcls != FP_NAN || icls != FP_NAN)
-	feraiseexcept (FE_INVALID);
-#endif
-    }
-
-  return retval;
-}
-weak_alias (__cexpf, cexpf)
diff --git a/newlib/libc/sys/linux/cmath/s_cexpl.c b/newlib/libc/sys/linux/cmath/s_cexpl.c
deleted file mode 100644
index cf6bc97..0000000
--- a/newlib/libc/sys/linux/cmath/s_cexpl.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Return value of complex exponential function for long double complex value.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ long double
-__cexpl (__complex__ long double x)
-{
-  __complex__ long double retval;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls >= FP_ZERO)
-    {
-      /* Real part is finite.  */
-      if (icls >= FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  long double exp_val = __ieee754_expl (__real__ x);
-	  long double sinix, cosix;
-
-	  __sincosl (__imag__ x, &sinix, &cosix);
-
-	  if (isfinite (exp_val))
-	    {
-	      __real__ retval = exp_val * cosix;
-	      __imag__ retval = exp_val * sinix;
-	    }
-	  else
-	    {
-	      __real__ retval = __copysignl (exp_val, cosix);
-	      __imag__ retval = __copysignl (exp_val, sinix);
-	    }
-	}
-      else
-	{
-	  /* If the imaginary part is +-inf or NaN and the real part
-	     is not +-inf the result is NaN + iNaN.  */
-	  __real__ retval = __nanl ("");
-	  __imag__ retval = __nanl ("");
-
-#ifdef FE_INVALID
-	  feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else if (rcls == FP_INFINITE)
-    {
-      /* Real part is infinite.  */
-      if (icls >= FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  long double value = signbit (__real__ x) ? 0.0 : HUGE_VALL;
-
-	  if (icls == FP_ZERO)
-	    {
-	      /* Imaginary part is 0.0.  */
-	      __real__ retval = value;
-	      __imag__ retval = __imag__ x;
-	    }
-	  else
-	    {
-	      long double sinix, cosix;
-
-	      __sincosl (__imag__ x, &sinix, &cosix);
-
-	      __real__ retval = __copysignl (value, cosix);
-	      __imag__ retval = __copysignl (value, sinix);
-	    }
-	}
-      else if (signbit (__real__ x) == 0)
-	{
-	  __real__ retval = HUGE_VALL;
-	  __imag__ retval = __nanl ("");
-
-#ifdef FE_INVALID
-	  if (icls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-      else
-	{
-	  __real__ retval = 0.0;
-	  __imag__ retval = __copysignl (0.0, __imag__ x);
-	}
-    }
-  else
-    {
-      /* If the real part is NaN the result is NaN + iNaN.  */
-      __real__ retval = __nanl ("");
-      __imag__ retval = __nanl ("");
-
-#ifdef FE_INVALID
-      if (rcls != FP_NAN || icls != FP_NAN)
-	feraiseexcept (FE_INVALID);
-#endif
-    }
-
-  return retval;
-}
-weak_alias (__cexpl, cexpl)
diff --git a/newlib/libc/sys/linux/cmath/s_clog.c b/newlib/libc/sys/linux/cmath/s_clog.c
deleted file mode 100644
index f796024..0000000
--- a/newlib/libc/sys/linux/cmath/s_clog.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Compute complex natural logarithm.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ double
-__clog (__complex__ double x)
-{
-  __complex__ double result;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      /* Real and imaginary part are 0.0.  */
-      __imag__ result = signbit (__real__ x) ? M_PI : 0.0;
-      __imag__ result = __copysign (__imag__ result, __imag__ x);
-      /* Yes, the following line raises an exception.  */
-      __real__ result = -1.0 / fabs (__real__ x);
-    }
-  else if (rcls != FP_NAN && icls != FP_NAN)
-    {
-      /* Neither real nor imaginary part is NaN.  */
-      __real__ result = __ieee754_log (__ieee754_hypot (__real__ x,
-							__imag__ x));
-      __imag__ result = __ieee754_atan2 (__imag__ x, __real__ x);
-    }
-  else
-    {
-      __imag__ result = __nan ("");
-      if (rcls == FP_INFINITE || icls == FP_INFINITE)
-	/* Real or imaginary part is infinite.  */
-	__real__ result = HUGE_VAL;
-      else
-	__real__ result = __nan ("");
-    }
-
-  return result;
-}
-weak_alias (__clog, clog)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__clog, __clogl)
-weak_alias (__clog, clogl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_clog10.c b/newlib/libc/sys/linux/cmath/s_clog10.c
deleted file mode 100644
index 62c2ca7..0000000
--- a/newlib/libc/sys/linux/cmath/s_clog10.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Compute complex base 10 logarithm.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ double
-__clog10 (__complex__ double x)
-{
-  __complex__ double result;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      /* Real and imaginary part are 0.0.  */
-      __imag__ result = signbit (__real__ x) ? M_PI : 0.0;
-      __imag__ result = __copysign (__imag__ result, __imag__ x);
-      /* Yes, the following line raises an exception.  */
-      __real__ result = -1.0 / fabs (__real__ x);
-    }
-  else if (rcls != FP_NAN && icls != FP_NAN)
-    {
-      /* Neither real nor imaginary part is NaN.  */
-      __real__ result = __ieee754_log10 (__ieee754_hypot (__real__ x,
-							  __imag__ x));
-      __imag__ result = M_LOG10E * __ieee754_atan2 (__imag__ x, __real__ x);
-    }
-  else
-    {
-      __imag__ result = __nan ("");
-      if (rcls == FP_INFINITE || icls == FP_INFINITE)
-	/* Real or imaginary part is infinite.  */
-	__real__ result = HUGE_VAL;
-      else
-	__real__ result = __nan ("");
-    }
-
-  return result;
-}
-weak_alias (__clog10, clog10)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__clog10, __clog10l)
-weak_alias (__clog10, clog10l)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_clog10f.c b/newlib/libc/sys/linux/cmath/s_clog10f.c
deleted file mode 100644
index 6d60c5f..0000000
--- a/newlib/libc/sys/linux/cmath/s_clog10f.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Compute complex base 10 logarithm.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ float
-__clog10f (__complex__ float x)
-{
-  __complex__ float result;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      /* Real and imaginary part are 0.0.  */
-      __imag__ result = signbit (__real__ x) ? M_PI : 0.0;
-      __imag__ result = __copysignf (__imag__ result, __imag__ x);
-      /* Yes, the following line raises an exception.  */
-      __real__ result = -1.0 / fabsf (__real__ x);
-    }
-  else if (rcls != FP_NAN && icls != FP_NAN)
-    {
-      /* Neither real nor imaginary part is NaN.  */
-      __real__ result = __ieee754_log10f (__ieee754_hypotf (__real__ x,
-							    __imag__ x));
-      __imag__ result = M_LOG10E * __ieee754_atan2f (__imag__ x, __real__ x);
-    }
-  else
-    {
-      __imag__ result = __nanf ("");
-      if (rcls == FP_INFINITE || icls == FP_INFINITE)
-	/* Real or imaginary part is infinite.  */
-	__real__ result = HUGE_VALF;
-      else
-	__real__ result = __nanf ("");
-    }
-
-  return result;
-}
-weak_alias (__clog10f, clog10f)
diff --git a/newlib/libc/sys/linux/cmath/s_clog10l.c b/newlib/libc/sys/linux/cmath/s_clog10l.c
deleted file mode 100644
index f901543..0000000
--- a/newlib/libc/sys/linux/cmath/s_clog10l.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Compute complex base 10 logarithm.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ long double
-__clog10l (__complex__ long double x)
-{
-  __complex__ long double result;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      /* Real and imaginary part are 0.0.  */
-      __imag__ result = signbit (__real__ x) ? M_PIl : 0.0;
-      __imag__ result = __copysignl (__imag__ result, __imag__ x);
-      /* Yes, the following line raises an exception.  */
-      __real__ result = -1.0 / fabsl (__real__ x);
-    }
-  else if (rcls != FP_NAN && icls != FP_NAN)
-    {
-      /* Neither real nor imaginary part is NaN.  */
-      __real__ result = __ieee754_log10l (__ieee754_hypotl (__real__ x,
-							    __imag__ x));
-      __imag__ result = M_LOG10El * __ieee754_atan2l (__imag__ x, __real__ x);
-    }
-  else
-    {
-      __imag__ result = __nanl ("");
-      if (rcls == FP_INFINITE || icls == FP_INFINITE)
-	/* Real or imaginary part is infinite.  */
-	__real__ result = HUGE_VALL;
-      else
-	__real__ result = __nanl ("");
-    }
-
-  return result;
-}
-weak_alias (__clog10l, clog10l)
diff --git a/newlib/libc/sys/linux/cmath/s_clogf.c b/newlib/libc/sys/linux/cmath/s_clogf.c
deleted file mode 100644
index c7151f2..0000000
--- a/newlib/libc/sys/linux/cmath/s_clogf.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Compute complex natural logarithm.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ float
-__clogf (__complex__ float x)
-{
-  __complex__ float result;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      /* Real and imaginary part are 0.0.  */
-      __imag__ result = signbit (__real__ x) ? M_PI : 0.0;
-      __imag__ result = __copysignf (__imag__ result, __imag__ x);
-      /* Yes, the following line raises an exception.  */
-      __real__ result = -1.0 / fabsf (__real__ x);
-    }
-  else if (rcls != FP_NAN && icls != FP_NAN)
-    {
-      /* Neither real nor imaginary part is NaN.  */
-      __real__ result = __ieee754_logf (__ieee754_hypotf (__real__ x,
-							  __imag__ x));
-      __imag__ result = __ieee754_atan2f (__imag__ x, __real__ x);
-    }
-  else
-    {
-      __imag__ result = __nanf ("");
-      if (rcls == FP_INFINITE || icls == FP_INFINITE)
-	/* Real or imaginary part is infinite.  */
-	__real__ result = HUGE_VALF;
-      else
-	__real__ result = __nanf ("");
-    }
-
-  return result;
-}
-weak_alias (__clogf, clogf)
diff --git a/newlib/libc/sys/linux/cmath/s_clogl.c b/newlib/libc/sys/linux/cmath/s_clogl.c
deleted file mode 100644
index 43118f7..0000000
--- a/newlib/libc/sys/linux/cmath/s_clogl.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Compute complex natural logarithm.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ long double
-__clogl (__complex__ long double x)
-{
-  __complex__ long double result;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls == FP_ZERO && icls == FP_ZERO)
-    {
-      /* Real and imaginary part are 0.0.  */
-      __imag__ result = signbit (__real__ x) ? M_PIl : 0.0;
-      __imag__ result = __copysignl (__imag__ result, __imag__ x);
-      /* Yes, the following line raises an exception.  */
-      __real__ result = -1.0 / fabsl (__real__ x);
-    }
-  else if (rcls != FP_NAN && icls != FP_NAN)
-    {
-      /* Neither real nor imaginary part is NaN.  */
-      __real__ result = __ieee754_logl (__ieee754_hypotl (__real__ x,
-							  __imag__ x));
-      __imag__ result = __ieee754_atan2l (__imag__ x, __real__ x);
-    }
-  else
-    {
-      __imag__ result = __nanl ("");
-      if (rcls == FP_INFINITE || icls == FP_INFINITE)
-	/* Real or imaginary part is infinite.  */
-	__real__ result = HUGE_VALL;
-      else
-	__real__ result = __nanl ("");
-    }
-
-  return result;
-}
-weak_alias (__clogl, clogl)
diff --git a/newlib/libc/sys/linux/cmath/s_cpow.c b/newlib/libc/sys/linux/cmath/s_cpow.c
deleted file mode 100644
index 9018a8a..0000000
--- a/newlib/libc/sys/linux/cmath/s_cpow.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Complex power of double values.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ double
-__cpow (__complex__ double x, __complex__ double c)
-{
-  return __cexp (c * __clog (x));
-}
-weak_alias (__cpow, cpow)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__cpow, __cpowl)
-weak_alias (__cpow, cpowl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_cpowf.c b/newlib/libc/sys/linux/cmath/s_cpowf.c
deleted file mode 100644
index b0c0324..0000000
--- a/newlib/libc/sys/linux/cmath/s_cpowf.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Complex power of float values.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ float
-__cpowf (__complex__ float x, __complex__ float c)
-{
-  return __cexpf (c * __clogf (x));
-}
-weak_alias (__cpowf, cpowf)
diff --git a/newlib/libc/sys/linux/cmath/s_cpowl.c b/newlib/libc/sys/linux/cmath/s_cpowl.c
deleted file mode 100644
index 4c358b3..0000000
--- a/newlib/libc/sys/linux/cmath/s_cpowl.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Complex power of long double values.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-
-__complex__ long double
-__cpowl (__complex__ long double x, __complex__ long double c)
-{
-  return __cexpl (c * __clogl (x));
-}
-weak_alias (__cpowl, cpowl)
diff --git a/newlib/libc/sys/linux/cmath/s_cproj.c b/newlib/libc/sys/linux/cmath/s_cproj.c
deleted file mode 100644
index 6c9e417..0000000
--- a/newlib/libc/sys/linux/cmath/s_cproj.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Compute projection of complex double value to Riemann sphere.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ double
-__cproj (__complex__ double x)
-{
-  __complex__ double res;
-
-  if (isnan (__real__ x) && isnan (__imag__ x))
-    return x;
-  else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
-    {
-      __real__ res = INFINITY;
-      __imag__ res = __copysign (0.0, __imag__ x);
-    }
-  else
-    {
-      double den = __real__ x * __real__ x + __imag__ x * __imag__ x + 1.0;
-
-      __real__ res = (2.0 * __real__ x) / den;
-      __imag__ res = (2.0 * __imag__ x) / den;
-    }
-
-  return res;
-}
-weak_alias (__cproj, cproj)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__cproj, __cprojl)
-weak_alias (__cproj, cprojl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_cprojf.c b/newlib/libc/sys/linux/cmath/s_cprojf.c
deleted file mode 100644
index a302078..0000000
--- a/newlib/libc/sys/linux/cmath/s_cprojf.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Compute projection of complex float value to Riemann sphere.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-#include "math_private.h"
-
-__complex__ float
-__cprojf (__complex__ float x)
-{
-  __complex__ float res;
-
-  if (isnan (__real__ x) && isnan (__imag__ x))
-    return x;
-  else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
-    {
-      __real__ res = INFINITY;
-      __imag__ res = __copysignf (0.0, __imag__ x);
-    }
-  else
-    {
-      float den = __real__ x * __real__ x + __imag__ x * __imag__ x + 1.0;
-
-      __real__ res = (2.0 * __real__ x) / den;
-      __imag__ res = (2.0 * __imag__ x) / den;
-    }
-
-  return res;
-}
-weak_alias (__cprojf, cprojf)
diff --git a/newlib/libc/sys/linux/cmath/s_cprojl.c b/newlib/libc/sys/linux/cmath/s_cprojl.c
deleted file mode 100644
index c70cdc4..0000000
--- a/newlib/libc/sys/linux/cmath/s_cprojl.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Compute projection of complex long double value to Riemann sphere.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-
-__complex__ long double
-__cprojl (__complex__ long double x)
-{
-  __complex__ long double res;
-
-  if (isnan (__real__ x) && isnan (__imag__ x))
-    return x;
-  else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
-    {
-      __real__ res = INFINITY;
-      __imag__ res = __copysignl (0.0, __imag__ x);
-    }
-  else
-    {
-      long double den = (__real__ x * __real__ x + __imag__ x * __imag__ x
-			 + 1.0);
-
-      __real__ res = (2.0 * __real__ x) / den;
-      __imag__ res = (2.0 * __imag__ x) / den;
-    }
-
-  return res;
-}
-weak_alias (__cprojl, cprojl)
diff --git a/newlib/libc/sys/linux/cmath/s_csin.c b/newlib/libc/sys/linux/cmath/s_csin.c
deleted file mode 100644
index eb380e2..0000000
--- a/newlib/libc/sys/linux/cmath/s_csin.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Complex sine function for double.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ double
-__csin (__complex__ double x)
-{
-  __complex__ double retval;
-  int negate = signbit (__real__ x);
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  __real__ x = fabs (__real__ x);
-
-  if (icls >= FP_ZERO)
-    {
-      /* Imaginary part is finite.  */
-      if (rcls >= FP_ZERO)
-	{
-	  /* Real part is finite.  */
-	  double sinh_val = __ieee754_sinh (__imag__ x);
-	  double cosh_val = __ieee754_cosh (__imag__ x);
-	  double sinix, cosix;
-
-	  __sincos (__real__ x, &sinix, &cosix);
-
-	  __real__ retval = cosh_val * sinix;
-	  __imag__ retval = sinh_val * cosix;
-
-	  if (negate)
-	    __real__ retval = -__real__ retval;
-	}
-      else
-	{
-	  if (icls == FP_ZERO)
-	    {
-	      /* Imaginary part is 0.0.  */
-	      __real__ retval = __nan ("");
-	      __imag__ retval = __imag__ x;
-
-#ifdef FE_INVALID
-	      if (rcls == FP_INFINITE)
-		feraiseexcept (FE_INVALID);
-#endif
-	    }
-	  else
-	    {
-	      __real__ retval = __nan ("");
-	      __imag__ retval = __nan ("");
-
-#ifdef FE_INVALID
-	      feraiseexcept (FE_INVALID);
-#endif
-	    }
-	}
-    }
-  else if (icls == FP_INFINITE)
-    {
-      /* Imaginary part is infinite.  */
-      if (rcls == FP_ZERO)
-	{
-	  /* Real part is 0.0.  */
-	  __real__ retval = __copysign (0.0, negate ? -1.0 : 1.0);
-	  __imag__ retval = __imag__ x;
-	}
-      else if (rcls > FP_ZERO)
-	{
-	  /* Real part is finite.  */
-	  double sinix, cosix;
-
-	  __sincos (__real__ x, &sinix, &cosix);
-
-	  __real__ retval = __copysign (HUGE_VAL, sinix);
-	  __imag__ retval = __copysign (HUGE_VAL, cosix);
-
-	  if (negate)
-	    __real__ retval = -__real__ retval;
-	  if (signbit (__imag__ x))
-	    __imag__ retval = -__imag__ retval;
-	}
-      else
-	{
-	  /* The addition raises the invalid exception.  */
-	  __real__ retval = __nan ("");
-	  __imag__ retval = HUGE_VAL;
-
-#ifdef FE_INVALID
-	  if (rcls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      if (rcls == FP_ZERO)
-	__real__ retval = __copysign (0.0, negate ? -1.0 : 1.0);
-      else
-	__real__ retval = __nan ("");
-      __imag__ retval = __nan ("");
-    }
-
-  return retval;
-}
-weak_alias (__csin, csin)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__csin, __csinl)
-weak_alias (__csin, csinl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_csinf.c b/newlib/libc/sys/linux/cmath/s_csinf.c
deleted file mode 100644
index b727881..0000000
--- a/newlib/libc/sys/linux/cmath/s_csinf.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Complex sine function for float.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ float
-__csinf (__complex__ float x)
-{
-  __complex__ float retval;
-  int negate = signbit (__real__ x);
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  __real__ x = fabsf (__real__ x);
-
-  if (icls >= FP_ZERO)
-    {
-      /* Imaginary part is finite.  */
-      if (rcls >= FP_ZERO)
-	{
-	  /* Real part is finite.  */
-	  float sinh_val = __ieee754_sinhf (__imag__ x);
-	  float cosh_val = __ieee754_coshf (__imag__ x);
-	  float sinix, cosix;
-
-	  __sincosf (__real__ x, &sinix, &cosix);
-
-	  __real__ retval = cosh_val * sinix;
-	  __imag__ retval = sinh_val * cosix;
-
-	  if (negate)
-	    __real__ retval = -__real__ retval;
-	}
-      else
-	{
-	  if (icls == FP_ZERO)
-	    {
-	      /* Imaginary part is 0.0.  */
-	      __real__ retval = __nanf ("");
-	      __imag__ retval = __imag__ x;
-
-#ifdef FE_INVALID
-	      if (rcls == FP_INFINITE)
-		feraiseexcept (FE_INVALID);
-#endif
-	    }
-	  else
-	    {
-	      __real__ retval = __nanf ("");
-	      __imag__ retval = __nanf ("");
-
-#ifdef FE_INVALID
-	      feraiseexcept (FE_INVALID);
-#endif
-	    }
-	}
-    }
-  else if (icls == FP_INFINITE)
-    {
-      /* Imaginary part is infinite.  */
-      if (rcls == FP_ZERO)
-	{
-	  /* Real part is 0.0.  */
-	  __real__ retval = __copysignf (0.0, negate ? -1.0 : 1.0);
-	  __imag__ retval = __imag__ x;
-	}
-      else if (rcls > FP_ZERO)
-	{
-	  /* Real part is finite.  */
-	  float sinix, cosix;
-
-	  __sincosf (__real__ x, &sinix, &cosix);
-
-	  __real__ retval = __copysignf (HUGE_VALF, sinix);
-	  __imag__ retval = __copysignf (HUGE_VALF, cosix);
-
-	  if (negate)
-	    __real__ retval = -__real__ retval;
-	  if (signbit (__imag__ x))
-	    __imag__ retval = -__imag__ retval;
-	}
-      else
-	{
-	  /* The addition raises the invalid exception.  */
-	  __real__ retval = __nanf ("");
-	  __imag__ retval = HUGE_VALF;
-
-#ifdef FE_INVALID
-	  if (rcls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      if (rcls == FP_ZERO)
-	__real__ retval = __copysignf (0.0, negate ? -1.0 : 1.0);
-      else
-	__real__ retval = __nanf ("");
-      __imag__ retval = __nanf ("");
-    }
-
-  return retval;
-}
-weak_alias (__csinf, csinf)
diff --git a/newlib/libc/sys/linux/cmath/s_csinh.c b/newlib/libc/sys/linux/cmath/s_csinh.c
deleted file mode 100644
index f0e0cc6..0000000
--- a/newlib/libc/sys/linux/cmath/s_csinh.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Complex sine hyperbole function for double.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ double
-__csinh (__complex__ double x)
-{
-  __complex__ double retval;
-  int negate = signbit (__real__ x);
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  __real__ x = fabs (__real__ x);
-
-  if (rcls >= FP_ZERO)
-    {
-      /* Real part is finite.  */
-      if (icls >= FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  double sinh_val = __ieee754_sinh (__real__ x);
-	  double cosh_val = __ieee754_cosh (__real__ x);
-	  double sinix, cosix;
-
-	  __sincos (__imag__ x, &sinix, &cosix);
-
-	  __real__ retval = sinh_val * cosix;
-	  __imag__ retval = cosh_val * sinix;
-
-	  if (negate)
-	    __real__ retval = -__real__ retval;
-	}
-      else
-	{
-	  if (rcls == FP_ZERO)
-	    {
-	      /* Real part is 0.0.  */
-	      __real__ retval = __copysign (0.0, negate ? -1.0 : 1.0);
-	      __imag__ retval = __nan ("") + __nan ("");
-
-#ifdef FE_INVALID
-	      if (icls == FP_INFINITE)
-		feraiseexcept (FE_INVALID);
-#endif
-	    }
-	  else
-	    {
-	      __real__ retval = __nan ("");
-	      __imag__ retval = __nan ("");
-
-#ifdef FE_INVALID
-	      feraiseexcept (FE_INVALID);
-#endif
-	    }
-	}
-    }
-  else if (rcls == FP_INFINITE)
-    {
-      /* Real part is infinite.  */
-      if (icls == FP_ZERO)
-	{
-	  /* Imaginary part is 0.0.  */
-	  __real__ retval = negate ? -HUGE_VAL : HUGE_VAL;
-	  __imag__ retval = __imag__ x;
-	}
-      else if (icls > FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  double sinix, cosix;
-
-	  __sincos (__imag__ x, &sinix, &cosix);
-
-	  __real__ retval = __copysign (HUGE_VAL, cosix);
-	  __imag__ retval = __copysign (HUGE_VAL, sinix);
-
-	  if (negate)
-	    __real__ retval = -__real__ retval;
-	}
-      else
-	{
-	  /* The addition raises the invalid exception.  */
-	  __real__ retval = HUGE_VAL;
-	  __imag__ retval = __nan ("") + __nan ("");
-
-#ifdef FE_INVALID
-	  if (icls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      __real__ retval = __nan ("");
-      __imag__ retval = __imag__ x == 0.0 ? __imag__ x : __nan ("");
-    }
-
-  return retval;
-}
-weak_alias (__csinh, csinh)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__csinh, __csinhl)
-weak_alias (__csinh, csinhl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_csinhf.c b/newlib/libc/sys/linux/cmath/s_csinhf.c
deleted file mode 100644
index 5cf80d0..0000000
--- a/newlib/libc/sys/linux/cmath/s_csinhf.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Complex sine hyperbole function for float.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ float
-__csinhf (__complex__ float x)
-{
-  __complex__ float retval;
-  int negate = signbit (__real__ x);
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  __real__ x = fabsf (__real__ x);
-
-  if (rcls >= FP_ZERO)
-    {
-      /* Real part is finite.  */
-      if (icls >= FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  float sinh_val = __ieee754_sinhf (__real__ x);
-	  float cosh_val = __ieee754_coshf (__real__ x);
-	  float sinix, cosix;
-
-	  __sincosf (__imag__ x, &sinix, &cosix);
-
-	  __real__ retval = sinh_val * cosix;
-	  __imag__ retval = cosh_val * sinix;
-
-	  if (negate)
-	    __real__ retval = -__real__ retval;
-	}
-      else
-	{
-	  if (rcls == FP_ZERO)
-	    {
-	      /* Real part is 0.0.  */
-	      __real__ retval = __copysignf (0.0, negate ? -1.0 : 1.0);
-	      __imag__ retval = __nanf ("") + __nanf ("");
-
-#ifdef FE_INVALID
-	      if (icls == FP_INFINITE)
-		feraiseexcept (FE_INVALID);
-#endif
-	    }
-	  else
-	    {
-	      __real__ retval = __nanf ("");
-	      __imag__ retval = __nanf ("");
-
-#ifdef FE_INVALID
-	      feraiseexcept (FE_INVALID);
-#endif
-	    }
-	}
-    }
-  else if (rcls == FP_INFINITE)
-    {
-      /* Real part is infinite.  */
-      if (icls == FP_ZERO)
-	{
-	  /* Imaginary part is 0.0.  */
-	  __real__ retval = negate ? -HUGE_VALF : HUGE_VALF;
-	  __imag__ retval = __imag__ x;
-	}
-      else if (icls > FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  float sinix, cosix;
-
-	  __sincosf (__imag__ x, &sinix, &cosix);
-
-	  __real__ retval = __copysignf (HUGE_VALF, cosix);
-	  __imag__ retval = __copysignf (HUGE_VALF, sinix);
-
-	  if (negate)
-	    __real__ retval = -__real__ retval;
-	}
-      else
-	{
-	  /* The addition raises the invalid exception.  */
-	  __real__ retval = HUGE_VALF;
-	  __imag__ retval = __nanf ("") + __nanf ("");
-
-#ifdef FE_INVALID
-	  if (icls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      __real__ retval = __nanf ("");
-      __imag__ retval = __imag__ x == 0.0 ? __imag__ x : __nanf ("");
-    }
-
-  return retval;
-}
-weak_alias (__csinhf, csinhf)
diff --git a/newlib/libc/sys/linux/cmath/s_csinhl.c b/newlib/libc/sys/linux/cmath/s_csinhl.c
deleted file mode 100644
index 2260756..0000000
--- a/newlib/libc/sys/linux/cmath/s_csinhl.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Complex sine hyperbole function for long double.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ long double
-__csinhl (__complex__ long double x)
-{
-  __complex__ long double retval;
-  int negate = signbit (__real__ x);
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  __real__ x = fabsl (__real__ x);
-
-  if (rcls >= FP_ZERO)
-    {
-      /* Real part is finite.  */
-      if (icls >= FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  long double sinh_val = __ieee754_sinhl (__real__ x);
-	  long double cosh_val = __ieee754_coshl (__real__ x);
-	  long double sinix, cosix;
-
-	  __sincosl (__imag__ x, &sinix, &cosix);
-
-	  __real__ retval = sinh_val * cosix;
-	  __imag__ retval = cosh_val * sinix;
-
-	  if (negate)
-	    __real__ retval = -__real__ retval;
-	}
-      else
-	{
-	  if (rcls == FP_ZERO)
-	    {
-	      /* Real part is 0.0.  */
-	      __real__ retval = __copysignl (0.0, negate ? -1.0 : 1.0);
-	      __imag__ retval = __nanl ("") + __nanl ("");
-
-#ifdef FE_INVALID
-	      if (icls == FP_INFINITE)
-		feraiseexcept (FE_INVALID);
-#endif
-	    }
-	  else
-	    {
-	      __real__ retval = __nanl ("");
-	      __imag__ retval = __nanl ("");
-
-#ifdef FE_INVALID
-	      feraiseexcept (FE_INVALID);
-#endif
-	    }
-	}
-    }
-  else if (rcls == FP_INFINITE)
-    {
-      /* Real part is infinite.  */
-      if (icls == FP_ZERO)
-	{
-	  /* Imaginary part is 0.0.  */
-	  __real__ retval = negate ? -HUGE_VALL : HUGE_VALL;
-	  __imag__ retval = __imag__ x;
-	}
-      else if (icls > FP_ZERO)
-	{
-	  /* Imaginary part is finite.  */
-	  long double sinix, cosix;
-
-	  __sincosl (__imag__ x, &sinix, &cosix);
-
-	  __real__ retval = __copysignl (HUGE_VALL, cosix);
-	  __imag__ retval = __copysignl (HUGE_VALL, sinix);
-
-	  if (negate)
-	    __real__ retval = -__real__ retval;
-	}
-      else
-	{
-	  /* The addition raises the invalid exception.  */
-	  __real__ retval = HUGE_VALL;
-	  __imag__ retval = __nanl ("") + __nanl ("");
-
-#ifdef FE_INVALID
-	  if (icls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      __real__ retval = __nanl ("");
-      __imag__ retval = __imag__ x == 0.0 ? __imag__ x : __nanl ("");
-    }
-
-  return retval;
-}
-weak_alias (__csinhl, csinhl)
diff --git a/newlib/libc/sys/linux/cmath/s_csinl.c b/newlib/libc/sys/linux/cmath/s_csinl.c
deleted file mode 100644
index f7a1c43..0000000
--- a/newlib/libc/sys/linux/cmath/s_csinl.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Complex sine function for long double.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ long double
-__csinl (__complex__ long double x)
-{
-  __complex__ long double retval;
-  int negate = signbit (__real__ x);
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  __real__ x = fabsl (__real__ x);
-
-  if (icls >= FP_ZERO)
-    {
-      /* Imaginary part is finite.  */
-      if (rcls >= FP_ZERO)
-	{
-	  /* Real part is finite.  */
-	  long double sinh_val = __ieee754_sinhl (__imag__ x);
-	  long double cosh_val = __ieee754_coshl (__imag__ x);
-	  long double sinix, cosix;
-
-	  __sincosl (__real__ x, &sinix, &cosix);
-
-	  __real__ retval = cosh_val * sinix;
-	  __imag__ retval = sinh_val * cosix;
-
-	  if (negate)
-	    __real__ retval = -__real__ retval;
-	}
-      else
-	{
-	  if (icls == FP_ZERO)
-	    {
-	      /* Imaginary part is 0.0.  */
-	      __real__ retval = __nanl ("");
-	      __imag__ retval = __imag__ x;
-
-#ifdef FE_INVALID
-	      if (rcls == FP_INFINITE)
-		feraiseexcept (FE_INVALID);
-#endif
-	    }
-	  else
-	    {
-	      __real__ retval = __nanl ("");
-	      __imag__ retval = __nanl ("");
-
-#ifdef FE_INVALID
-	      feraiseexcept (FE_INVALID);
-#endif
-	    }
-	}
-    }
-  else if (icls == FP_INFINITE)
-    {
-      /* Imaginary part is infinite.  */
-      if (rcls == FP_ZERO)
-	{
-	  /* Real part is 0.0.  */
-	  __real__ retval = __copysignl (0.0, negate ? -1.0 : 1.0);
-	  __imag__ retval = __imag__ x;
-	}
-      else if (rcls > FP_ZERO)
-	{
-	  /* Real part is finite.  */
-	  long double sinix, cosix;
-
-	  __sincosl (__real__ x, &sinix, &cosix);
-
-	  __real__ retval = __copysignl (HUGE_VALL, sinix);
-	  __imag__ retval = __copysignl (HUGE_VALL, cosix);
-
-	  if (negate)
-	    __real__ retval = -__real__ retval;
-	  if (signbit (__imag__ x))
-	    __imag__ retval = -__imag__ retval;
-	}
-      else
-	{
-	  /* The addition raises the invalid exception.  */
-	  __real__ retval = __nanl ("");
-	  __imag__ retval = HUGE_VALL;
-
-#ifdef FE_INVALID
-	  if (rcls == FP_INFINITE)
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      if (rcls == FP_ZERO)
-	__real__ retval = __copysignl (0.0, negate ? -1.0 : 1.0);
-      else
-	__real__ retval = __nanl ("");
-      __imag__ retval = __nanl ("");
-    }
-
-  return retval;
-}
-weak_alias (__csinl, csinl)
diff --git a/newlib/libc/sys/linux/cmath/s_csqrt.c b/newlib/libc/sys/linux/cmath/s_csqrt.c
deleted file mode 100644
index 0bb6690..0000000
--- a/newlib/libc/sys/linux/cmath/s_csqrt.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Complex square root of double value.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Based on an algorithm by Stephen L. Moshier <moshier@world.std.com>.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ double
-__csqrt (__complex__ double x)
-{
-  __complex__ double res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (icls == FP_INFINITE)
-	{
-	  __real__ res = HUGE_VAL;
-	  __imag__ res = __imag__ x;
-	}
-      else if (rcls == FP_INFINITE)
-	{
-	  if (__real__ x < 0.0)
-	    {
-	      __real__ res = icls == FP_NAN ? __nan ("") : 0;
-	      __imag__ res = __copysign (HUGE_VAL, __imag__ x);
-	    }
-	  else
-	    {
-	      __real__ res = __real__ x;
-	      __imag__ res = (icls == FP_NAN
-			      ? __nan ("") : __copysign (0.0, __imag__ x));
-	    }
-	}
-      else
-	{
-	  __real__ res = __nan ("");
-	  __imag__ res = __nan ("");
-	}
-    }
-  else
-    {
-      if (icls == FP_ZERO)
-	{
-	  if (__real__ x < 0.0)
-	    {
-	      __real__ res = 0.0;
-	      __imag__ res = __copysign (__ieee754_sqrt (-__real__ x),
-					 __imag__ x);
-	    }
-	  else
-	    {
-	      __real__ res = fabs (__ieee754_sqrt (__real__ x));
-	      __imag__ res = __copysign (0.0, __imag__ x);
-	    }
-	}
-      else if (rcls == FP_ZERO)
-	{
-	  double r = __ieee754_sqrt (0.5 * fabs (__imag__ x));
-
-	  __real__ res = __copysign (r, __imag__ x);
-	  __imag__ res = r;
-	}
-      else
-	{
-	  double d, r, s;
-
-	  d = __ieee754_hypot (__real__ x, __imag__ x);
-	  /* Use the identity   2  Re res  Im res = Im x
-	     to avoid cancellation error in  d +/- Re x.  */
-	  if (__real__ x > 0)
-	    {
-	      r = __ieee754_sqrt (0.5 * d + 0.5 * __real__ x);
-	      s = (0.5 * __imag__ x) / r;
-	    }
-	  else
-	    {
-	      s = __ieee754_sqrt (0.5 * d - 0.5 * __real__ x);
-	      r = fabs ((0.5 * __imag__ x) / s);
-	    }
-
-	  __real__ res = r;
-	  __imag__ res = __copysign (s, __imag__ x);
-	}
-    }
-
-  return res;
-}
-weak_alias (__csqrt, csqrt)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__csqrt, __csqrtl)
-weak_alias (__csqrt, csqrtl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_csqrtf.c b/newlib/libc/sys/linux/cmath/s_csqrtf.c
deleted file mode 100644
index f7b1836..0000000
--- a/newlib/libc/sys/linux/cmath/s_csqrtf.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Complex square root of float value.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Based on an algorithm by Stephen L. Moshier <moshier@world.std.com>.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ float
-__csqrtf (__complex__ float x)
-{
-  __complex__ float res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (icls == FP_INFINITE)
-	{
-	  __real__ res = HUGE_VALF;
-	  __imag__ res = __imag__ x;
-	}
-      else if (rcls == FP_INFINITE)
-	{
-	  if (__real__ x < 0.0)
-	    {
-	      __real__ res = icls == FP_NAN ? __nanf ("") : 0;
-	      __imag__ res = __copysignf (HUGE_VALF, __imag__ x);
-	    }
-	  else
-	    {
-	      __real__ res = __real__ x;
-	      __imag__ res = (icls == FP_NAN
-			      ? __nanf ("") : __copysignf (0.0, __imag__ x));
-	    }
-	}
-      else
-	{
-	  __real__ res = __nanf ("");
-	  __imag__ res = __nanf ("");
-	}
-    }
-  else
-    {
-      if (icls == FP_ZERO)
-	{
-	  if (__real__ x < 0.0)
-	    {
-	      __real__ res = 0.0;
-	      __imag__ res = __copysignf (__ieee754_sqrtf (-__real__ x),
-					  __imag__ x);
-	    }
-	  else
-	    {
-	      __real__ res = fabsf (__ieee754_sqrtf (__real__ x));
-	      __imag__ res = __copysignf (0.0, __imag__ x);
-	    }
-	}
-      else if (rcls == FP_ZERO)
-	{
-	  float r = __ieee754_sqrtf (0.5 * fabsf (__imag__ x));
-
-	  __real__ res = __copysignf (r, __imag__ x);
-	  __imag__ res = r;
-	}
-      else
-	{
-	  float d, r, s;
-
-	  d = __ieee754_hypotf (__real__ x, __imag__ x);
-	  /* Use the identity   2  Re res  Im res = Im x
-	     to avoid cancellation error in  d +/- Re x.  */
-	  if (__real__ x > 0)
-	    {
-	      r = __ieee754_sqrtf (0.5f * d + 0.5f * __real__ x);
-	      s = (0.5f * __imag__ x) / r;
-	    }
-	  else
-	    {
-	      s = __ieee754_sqrtf (0.5f * d - 0.5f * __real__ x);
-	      r = fabsf ((0.5f * __imag__ x) / s);
-	    }
-
-	  __real__ res = r;
-	  __imag__ res = __copysignf (s, __imag__ x);
-	}
-    }
-
-  return res;
-}
-weak_alias (__csqrtf, csqrtf)
diff --git a/newlib/libc/sys/linux/cmath/s_csqrtl.c b/newlib/libc/sys/linux/cmath/s_csqrtl.c
deleted file mode 100644
index 8e27750..0000000
--- a/newlib/libc/sys/linux/cmath/s_csqrtl.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Complex square root of long double value.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Based on an algorithm by Stephen L. Moshier <moshier@world.std.com>.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ long double
-__csqrtl (__complex__ long double x)
-{
-  __complex__ long double res;
-  int rcls = fpclassify (__real__ x);
-  int icls = fpclassify (__imag__ x);
-
-  if (rcls <= FP_INFINITE || icls <= FP_INFINITE)
-    {
-      if (icls == FP_INFINITE)
-	{
-	  __real__ res = HUGE_VALL;
-	  __imag__ res = __imag__ x;
-	}
-      else if (rcls == FP_INFINITE)
-	{
-	  if (__real__ x < 0.0)
-	    {
-	      __real__ res = icls == FP_NAN ? __nanl ("") : 0;
-	      __imag__ res = __copysignl (HUGE_VALL, __imag__ x);
-	    }
-	  else
-	    {
-	      __real__ res = __real__ x;
-	      __imag__ res = (icls == FP_NAN
-			      ? __nanl ("") : __copysignl (0.0, __imag__ x));
-	    }
-	}
-      else
-	{
-	  __real__ res = __nanl ("");
-	  __imag__ res = __nanl ("");
-	}
-    }
-  else
-    {
-      if (icls == FP_ZERO)
-	{
-	  if (__real__ x < 0.0)
-	    {
-	      __real__ res = 0.0;
-	      __imag__ res = __copysignl (__ieee754_sqrtl (-__real__ x),
-					  __imag__ x);
-	    }
-	  else
-	    {
-	      __real__ res = fabsl (__ieee754_sqrtl (__real__ x));
-	      __imag__ res = __copysignl (0.0, __imag__ x);
-	    }
-	}
-      else if (rcls == FP_ZERO)
-	{
-	  long double r = __ieee754_sqrtl (0.5 * fabsl (__imag__ x));
-
-	  __real__ res = __copysignl (r, __imag__ x);
-	  __imag__ res = r;
-	}
-      else
-	{
-	  long double d, r, s;
-
-	  d = __ieee754_hypotl (__real__ x, __imag__ x);
-	  /* Use the identity   2  Re res  Im res = Im x
-	     to avoid cancellation error in  d +/- Re x.  */
-	  if (__real__ x > 0)
-	    {
-	      r = __ieee754_sqrtl (0.5L * d + 0.5L * __real__ x);
-	      s = (0.5L * __imag__ x) / r;
-	    }
-	  else
-	    {
-	      s = __ieee754_sqrtl (0.5L * d - 0.5L * __real__ x);
-	      r = fabsl ((0.5L * __imag__ x) / s);
-	    }
-
-	  __real__ res = r;
-	  __imag__ res = __copysignl (s, __imag__ x);
-	}
-    }
-
-  return res;
-}
-weak_alias (__csqrtl, csqrtl)
diff --git a/newlib/libc/sys/linux/cmath/s_ctan.c b/newlib/libc/sys/linux/cmath/s_ctan.c
deleted file mode 100644
index 6a09fe4..0000000
--- a/newlib/libc/sys/linux/cmath/s_ctan.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Complex tangent function for double.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ double
-__ctan (__complex__ double x)
-{
-  __complex__ double res;
-
-  if (!isfinite (__real__ x) || !isfinite (__imag__ x))
-    {
-      if (__isinf (__imag__ x))
-	{
-	  __real__ res = __copysign (0.0, __real__ x);
-	  __imag__ res = __copysign (1.0, __imag__ x);
-	}
-      else if (__real__ x == 0.0)
-	{
-	  res = x;
-	}
-      else
-	{
-	  __real__ res = __nan ("");
-	  __imag__ res = __nan ("");
-
-#ifdef FE_INVALID
-	  if (__isinf (__real__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      double sin2rx, cos2rx;
-      double den;
-
-      __sincos (2.0 * __real__ x, &sin2rx, &cos2rx);
-
-      den = cos2rx + __ieee754_cosh (2.0 * __imag__ x);
-
-      __real__ res = sin2rx / den;
-      __imag__ res = __ieee754_sinh (2.0 * __imag__ x) / den;
-    }
-
-  return res;
-}
-weak_alias (__ctan, ctan)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__ctan, __ctanl)
-weak_alias (__ctan, ctanl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_ctanf.c b/newlib/libc/sys/linux/cmath/s_ctanf.c
deleted file mode 100644
index 89bc847..0000000
--- a/newlib/libc/sys/linux/cmath/s_ctanf.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Complex tangent function for float.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ float
-__ctanf (__complex__ float x)
-{
-  __complex__ float res;
-
-  if (!isfinite (__real__ x) || !isfinite (__imag__ x))
-    {
-      if (__isinff (__imag__ x))
-	{
-	  __real__ res = __copysignf (0.0, __real__ x);
-	  __imag__ res = __copysignf (1.0, __imag__ x);
-	}
-      else if (__real__ x == 0.0)
-	{
-	  res = x;
-	}
-      else
-	{
-	  __real__ res = __nanf ("");
-	  __imag__ res = __nanf ("");
-
-#ifdef FE_INVALID
-	  if (__isinff (__real__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      float sin2rx, cos2rx;
-      float den;
-
-      __sincosf (2.0 * __real__ x, &sin2rx, &cos2rx);
-
-      den = cos2rx + __ieee754_coshf (2.0 * __imag__ x);
-
-      __real__ res = sin2rx / den;
-      __imag__ res = __ieee754_sinhf (2.0 * __imag__ x) / den;
-    }
-
-  return res;
-}
-weak_alias (__ctanf, ctanf)
diff --git a/newlib/libc/sys/linux/cmath/s_ctanh.c b/newlib/libc/sys/linux/cmath/s_ctanh.c
deleted file mode 100644
index 971cd90..0000000
--- a/newlib/libc/sys/linux/cmath/s_ctanh.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Complex hyperbole tangent for double.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ double
-__ctanh (__complex__ double x)
-{
-  __complex__ double res;
-
-  if (!isfinite (__real__ x) || !isfinite (__imag__ x))
-    {
-      if (__isinf (__real__ x))
-	{
-	  __real__ res = __copysign (1.0, __real__ x);
-	  __imag__ res = __copysign (0.0, __imag__ x);
-	}
-      else if (__imag__ x == 0.0)
-	{
-	  res = x;
-	}
-      else
-	{
-	  __real__ res = __nan ("");
-	  __imag__ res = __nan ("");
-
-#ifdef FE_INVALID
-	  if (__isinf (__imag__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      double sin2ix, cos2ix;
-      double den;
-
-      __sincos (2.0 * __imag__ x, &sin2ix, &cos2ix);
-
-      den = (__ieee754_cosh (2.0 * __real__ x) + cos2ix);
-
-      __real__ res = __ieee754_sinh (2.0 * __real__ x) / den;
-      __imag__ res = sin2ix / den;
-    }
-
-  return res;
-}
-weak_alias (__ctanh, ctanh)
-#ifdef NO_LONG_DOUBLE
-strong_alias (__ctanh, __ctanhl)
-weak_alias (__ctanh, ctanhl)
-#endif
diff --git a/newlib/libc/sys/linux/cmath/s_ctanhf.c b/newlib/libc/sys/linux/cmath/s_ctanhf.c
deleted file mode 100644
index b9e3c57..0000000
--- a/newlib/libc/sys/linux/cmath/s_ctanhf.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Complex hyperbole tangent for float.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ float
-__ctanhf (__complex__ float x)
-{
-  __complex__ float res;
-
-  if (!isfinite (__real__ x) || !isfinite (__imag__ x))
-    {
-      if (__isinff (__real__ x))
-	{
-	  __real__ res = __copysignf (1.0, __real__ x);
-	  __imag__ res = __copysignf (0.0, __imag__ x);
-	}
-      else if (__imag__ x == 0.0)
-	{
-	  res = x;
-	}
-      else
-	{
-	  __real__ res = __nanf ("");
-	  __imag__ res = __nanf ("");
-
-#ifdef FE_INVALID
-	  if (__isinff (__imag__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      float sin2ix, cos2ix;
-      float den;
-
-      __sincosf (2.0 * __imag__ x, &sin2ix, &cos2ix);
-
-      den = (__ieee754_coshf (2.0 * __real__ x) + cos2ix);
-
-      __real__ res = __ieee754_sinhf (2.0 * __real__ x) / den;
-      __imag__ res = sin2ix / den;
-    }
-
-  return res;
-}
-weak_alias (__ctanhf, ctanhf)
diff --git a/newlib/libc/sys/linux/cmath/s_ctanhl.c b/newlib/libc/sys/linux/cmath/s_ctanhl.c
deleted file mode 100644
index 7bf6b39..0000000
--- a/newlib/libc/sys/linux/cmath/s_ctanhl.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Complex hyperbole tangent for long double.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ long double
-__ctanhl (__complex__ long double x)
-{
-  __complex__ long double res;
-
-  if (!isfinite (__real__ x) || !isfinite (__imag__ x))
-    {
-      if (__isinfl (__real__ x))
-	{
-	  __real__ res = __copysignl (1.0, __real__ x);
-	  __imag__ res = __copysignl (0.0, __imag__ x);
-	}
-      else if (__imag__ x == 0.0)
-	{
-	  res = x;
-	}
-      else
-	{
-	  __real__ res = __nanl ("");
-	  __imag__ res = __nanl ("");
-
-#ifdef FE_INVALID
-	  if (__isinfl (__imag__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      long double sin2ix, cos2ix;
-      long double den;
-
-      __sincosl (2.0 * __imag__ x, &sin2ix, &cos2ix);
-
-      den = (__ieee754_coshl (2.0 * __real__ x) + cos2ix);
-
-      __real__ res = __ieee754_sinhl (2.0 * __real__ x) / den;
-      __imag__ res = sin2ix / den;
-    }
-
-  return res;
-}
-weak_alias (__ctanhl, ctanhl)
diff --git a/newlib/libc/sys/linux/cmath/s_ctanl.c b/newlib/libc/sys/linux/cmath/s_ctanl.c
deleted file mode 100644
index fa153e9..0000000
--- a/newlib/libc/sys/linux/cmath/s_ctanl.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Complex tangent function for long double.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <complex.h>
-#include <fenv.h>
-#include <math.h>
-
-#include "math_private.h"
-
-
-__complex__ long double
-__ctanl (__complex__ long double x)
-{
-  __complex__ long double res;
-
-  if (!isfinite (__real__ x) || !isfinite (__imag__ x))
-    {
-      if (__isinfl (__imag__ x))
-	{
-	  __real__ res = __copysignl (0.0, __real__ x);
-	  __imag__ res = __copysignl (1.0, __imag__ x);
-	}
-      else if (__real__ x == 0.0)
-	{
-	  res = x;
-	}
-      else
-	{
-	  __real__ res = __nanl ("");
-	  __imag__ res = __nanl ("");
-
-#ifdef FE_INVALID
-	  if (__isinfl (__real__ x))
-	    feraiseexcept (FE_INVALID);
-#endif
-	}
-    }
-  else
-    {
-      long double sin2rx, cos2rx;
-      long double den;
-
-      __sincosl (2.0 * __real__ x, &sin2rx, &cos2rx);
-
-      den = cos2rx + __ieee754_coshl (2.0 * __imag__ x);
-
-      __real__ res = sin2rx / den;
-      __imag__ res = __ieee754_sinhl (2.0 * __imag__ x) / den;
-    }
-
-  return res;
-}
-weak_alias (__ctanl, ctanl)
diff --git a/newlib/libc/sys/linux/config.h b/newlib/libc/sys/linux/config.h
deleted file mode 100644
index 76b438c..0000000
--- a/newlib/libc/sys/linux/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#define HAVE_WEAK_SYMBOLS 1
-#define HAVE_GNU_LD 1
-#define HAVE_ELF 1
-#define __ASSUME_REALTIME_SIGNALS 1
-#define ASM_GLOBAL_DIRECTIVE .global
-
-#define TEMP_FAILURE_RETRY(expression) \
-  (__extension__                                                              \
-    ({ long int __result;                                                     \
-       do __result = (long int) (expression);                                 \
-       while (__result == -1L && errno == EINTR);                             \
-       __result; }))
-
-#define UINT32_C(c)    c ## U
-
-#include <machine/sysdep.h>
diff --git a/newlib/libc/sys/linux/configure b/newlib/libc/sys/linux/configure
index 202a986..1f8ab0f 100755
--- a/newlib/libc/sys/linux/configure
+++ b/newlib/libc/sys/linux/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -40,8 +32,6 @@ ac_help="$ac_help
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -59,6 +49,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -173,6 +164,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -343,6 +335,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -508,12 +505,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -573,7 +574,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -827,79 +827,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -917,34 +854,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:948: checking host system type" >&5
+echo "configure:864: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -964,52 +880,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:969: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:987: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1025,21 +900,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1030: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:905: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1043: checking for working autoconf" >&5
+echo "configure:918: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1051,21 +926,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1056: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:931: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1069: checking for working autoheader" >&5
+echo "configure:944: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1078,7 +953,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1082: checking for working makeinfo" >&5
+echo "configure:957: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1103,7 +978,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
+echo "configure:982: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1133,7 +1008,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
+echo "configure:1012: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1182,7 +1057,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1186: checking whether we are using GNU C" >&5
+echo "configure:1061: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1191,7 +1066,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1206,7 +1081,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1210: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1085: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1234,10 +1109,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1118: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_word" >&5
+echo "configure:1139: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1269,7 +1167,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_word" >&5
+echo "configure:1171: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1301,7 +1199,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
+echo "configure:1203: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1333,7 +1231,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1337: checking for $ac_word" >&5
+echo "configure:1235: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1378,7 +1276,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1382: checking for a BSD compatible install" >&5
+echo "configure:1280: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1431,11 +1329,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1334: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1364,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1368: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,10 +1374,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1503,6 +1398,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1513,52 +1420,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1567,12 +1428,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1587,7 +1442,7 @@ if test "${use_libtool}" = "yes"; then
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -1610,7 +1465,7 @@ fi
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -1633,7 +1488,7 @@ fi
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -1652,10 +1507,40 @@ else
   enable_fast_install=yes
 fi
 
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1514: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1544: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1570,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1574: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1621,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1625: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1653,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1657: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1664,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1668 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1695,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1704: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1709,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1728,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1732: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1883,18 +1768,12 @@ else
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+echo "configure:1775: checking for ld used by GCC" >&5
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
@@ -1916,12 +1795,12 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1799: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1802: checking for non-GNU ld" >&5
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -z "$LD"; then
@@ -1929,11 +1808,11 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -1942,11 +1821,11 @@ else
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   echo "$ac_t""$LD" 1>&6
 else
@@ -1954,74 +1833,59 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
+echo "configure:1837: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi
 fi
 
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
+echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
+echo "configure:1853: checking for BSD-compatible nm" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi
 fi
 
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:1889: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2041,482 +1905,14 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
 
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 
 libtool_flags="$libtool_flags --enable-win32-dll"
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
@@ -2528,25 +1924,14 @@ fi
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
+  echo '#line 1933 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -2561,48 +1946,24 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:1955: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1960 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2612,13 +1973,6 @@ else
   lt_cv_cc_needs_belf=no
 fi
 rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
 fi
 
 echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
@@ -2628,11 +1982,11 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   fi
   ;;
 
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+*-*-cygwin* | *-*-mingw*)
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:1990: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2018,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2022: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2053,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2057: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2085,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2089: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2120,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2124: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2152,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2156: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2830,77 +2184,8 @@ else
 fi
 fi
 
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  
+
 esac
 
 
@@ -2954,14 +2239,12 @@ rm -f confcache
 
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -2975,7 +2258,7 @@ fi
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -2984,17 +2267,12 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 # clobbered by the next message.
 exec 5>>./config.log
 
-  
-
-  
-	 
-	 
 for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2998: checking for $ac_word" >&5
+echo "configure:2276: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3025,35 +2303,6 @@ done
 
 fi
 
-LINUX_MACH_LIB=
-if test -n "${machine_dir}"; then
-  if test "${use_libtool}" = "yes"; then
-    LINUX_MACH_LIB=machine/${machine_dir}/liblinux${machine_dir}.${aext}
-  else
-    LINUX_MACH_LIB=machine/lib.${aext}
-  fi
-fi
-
-
-EXTRA_SUBDIRS=
-EXTRA_SUBLIBS=
-
-if test "${newlib_multithread}" = "yes"; then
-EXTRA_CONFIG_DIRS=linuxthreads
-fi
-if test "x${newlib_elix_level}" = "x1"; then
-EXTRA_SUBDIRS=linuxthreads net
-else 
-EXTRA_SUBDIRS="linuxthreads net intl stdlib iconv dl"
-EXTRA_SUBLIBS="net/libnet.la intl/libintl.la stdlib/libstdlib.la iconv/libiconv.la dl/libdl.la"
-fi
-
-
-
-
-subdirs="machine $EXTRA_CONFIG_DIRS"
-
-
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -3167,7 +2416,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile intl/Makefile net/Makefile stdlib/Makefile iconv/Makefile dl/Makefile cmath/Makefile argp/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -3199,24 +2448,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -3229,6 +2466,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -3237,34 +2479,18 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
 s%@machine_dir@%$machine_dir%g
 s%@sys_dir@%$sys_dir%g
 s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@OBJDUMP@%$OBJDUMP%g
 s%@LIBTOOL@%$LIBTOOL%g
 s%@AWK@%$AWK%g
-s%@LINUX_MACH_LIB@%$LINUX_MACH_LIB%g
-s%@EXTRA_SUBDIRS@%$EXTRA_SUBDIRS%g
-s%@EXTRA_SUBLIBS@%$EXTRA_SUBLIBS%g
-s%@subdirs@%$subdirs%g
 
 CEOF
 EOF
@@ -3273,7 +2499,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
@@ -3306,7 +2532,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile intl/Makefile net/Makefile stdlib/Makefile iconv/Makefile dl/Makefile cmath/Makefile argp/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -3377,100 +2603,3 @@ chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  for ac_arg in $ac_configure_args; do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case "$ac_arg" in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  for ac_config_dir in machine $EXTRA_CONFIG_DIRS; do
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    if test ! -d $srcdir/$ac_config_dir; then
-      continue
-    fi
-
-    echo configuring in $ac_config_dir
-
-    case "$srcdir" in
-    .) ;;
-    *)
-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
-      else
-        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
-      fi
-      ;;
-    esac
-
-    ac_popdir=`pwd`
-    cd $ac_config_dir
-
-      # A "../" for each directory in /$ac_config_dir.
-      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
-
-    case "$srcdir" in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir ;;
-    /*) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
-    *) # Relative path.
-      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
-    esac
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure=$ac_sub_srcdir/configure
-    elif test -f $ac_sub_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-
-      # Make the cache file name correct relative to the subdirectory.
-      case "$cache_file" in
-      /*) ac_sub_cache_file=$cache_file ;;
-      *) # Relative path.
-        ac_sub_cache_file="$ac_dots$cache_file" ;;
-      esac
-  case "$ac_given_INSTALL" in
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
-
-      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-      # The eval makes quoting arguments work.
-      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-      then :
-      else
-        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
-      fi
-    fi
-
-    cd $ac_popdir
-  done
-fi
-
diff --git a/newlib/libc/sys/linux/configure.in b/newlib/libc/sys/linux/configure.in
index e03bcd9..fffaa0e 100644
--- a/newlib/libc/sys/linux/configure.in
+++ b/newlib/libc/sys/linux/configure.in
@@ -19,32 +19,4 @@ AM_PROG_LIBTOOL
 AC_PROG_AWK
 fi
 
-LINUX_MACH_LIB=
-if test -n "${machine_dir}"; then
-  if test "${use_libtool}" = "yes"; then
-    LINUX_MACH_LIB=machine/${machine_dir}/liblinux${machine_dir}.${aext}
-  else
-    LINUX_MACH_LIB=machine/lib.${aext}
-  fi
-fi
-AC_SUBST(LINUX_MACH_LIB)
-
-EXTRA_SUBDIRS=
-EXTRA_SUBLIBS=
-
-if test "${newlib_multithread}" = "yes"; then
-EXTRA_CONFIG_DIRS=linuxthreads
-fi
-if test "x${newlib_elix_level}" = "x1"; then
-EXTRA_SUBDIRS=linuxthreads net
-else 
-EXTRA_SUBDIRS="linuxthreads net intl stdlib iconv dl"
-EXTRA_SUBLIBS="net/libnet.la intl/libintl.la stdlib/libstdlib.la iconv/libiconv.la dl/libdl.la"
-fi
-
-AC_SUBST(EXTRA_SUBDIRS)
-AC_SUBST(EXTRA_SUBLIBS)
-
-AC_CONFIG_SUBDIRS(machine $EXTRA_CONFIG_DIRS)
-
-AC_OUTPUT(Makefile intl/Makefile net/Makefile stdlib/Makefile iconv/Makefile dl/Makefile cmath/Makefile argp/Makefile)
+AC_OUTPUT(Makefile)
diff --git a/newlib/libc/sys/linux/confstr.c b/newlib/libc/sys/linux/confstr.c
deleted file mode 100644
index 6b566b3..0000000
--- a/newlib/libc/sys/linux/confstr.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Copyright (C) 1991, 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#define _GNU_SOURCE 1
-
-#include <stddef.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <confstr.h>
-
-/* If BUF is not NULL and LEN > 0, fill in at most LEN - 1 bytes
-   of BUF with the value corresponding to NAME and zero-terminate BUF.
-   Return the number of bytes required to hold NAME's entire value.  */
-size_t
-confstr (name, buf, len)
-     int name;
-     char *buf;
-     size_t len;
-{
-  const char *string;
-  size_t string_len;
-
-  switch (name)
-    {
-    case _CS_PATH:
-      {
-	static const char cs_path[] = CS_PATH;
-	string = cs_path;
-	string_len = sizeof (cs_path);
-      }
-      break;
-
-    case _CS_V6_WIDTH_RESTRICTED_ENVS:
-      /* We have to return a newline-separated list of named of
-	 programming environements in which the widths of blksize_t,
-	 cc_t, mode_t, nfds_t, pid_t, ptrdiff_t, size_t, speed_t,
-	 ssize_t, suseconds_t, tcflag_t, useconds_t, wchar_t, and
-	 wint_t types are no greater than the width of type long.
-
-	 Currently this means all environment which the system allows.  */
-      {
-	static const char restenvs[] =
-#if _POSIX_V6_ILP32_OFF32 > 0
-	"_POSIX_V6_ILP32_OFF32"
-#endif
-#if _POSIX_V6_ILP32_OFFBIG > 0
-# if _POSIX_V6_ILP32_OFF32 > 0
-	"\n"
-# endif
-	"_POSIX_V6_ILP32_OFFBIG"
-#endif
-#if _POSIX_V6_LP64_OFF64 > 0
-# if _POSIX_V6_ILP32_OFF32 > 0 || _POSIX_V6_ILP32_OFFBIG > 0
-	"\n"
-# endif
-	"_POSIX_V6_LP64_OFF64"
-#endif
-#if _POSIX_V6_LPBIG_OFFBIG > 0
-# if _POSIX_V6_ILP32_OFF32 > 0 || _POSIX_V6_ILP32_OFFBIG > 0 \
-     || _POSIX_V6_LP64_OFF64 > 0
-	"\n"
-# endif
-	"_POSIX_V6_LPBIG_OFFBIG"
-#endif
-	  ;
-	string = restenvs;
-	string_len = sizeof (restenvs);
-      }
-      break;
-
-    case _CS_XBS5_ILP32_OFFBIG_CFLAGS:
-    case _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS:
-    case _CS_LFS_CFLAGS:
-#if _XBS5_LP64_OFF64 == -1 && _XBS5_LPBIG_OFFBIG == -1 && _XBS5_ILP32_OFFBIG == 1
-      /* Signal that we want the new ABI.  */
-      {
-	static const char file_offset[] = "-D_FILE_OFFSET_BITS=64";
-	string = file_offset;
-	string_len = sizeof (file_offset);
-      }
-      break;
-#endif
-      /* FALLTHROUGH */
-
-    case _CS_LFS_LINTFLAGS:
-    case _CS_LFS_LDFLAGS:
-    case _CS_LFS_LIBS:
-    case _CS_LFS64_CFLAGS:
-    case _CS_LFS64_LINTFLAGS:
-    case _CS_LFS64_LDFLAGS:
-    case _CS_LFS64_LIBS:
-
-    case _CS_XBS5_ILP32_OFF32_CFLAGS:
-    case _CS_XBS5_ILP32_OFF32_LDFLAGS:
-    case _CS_XBS5_ILP32_OFF32_LIBS:
-    case _CS_XBS5_ILP32_OFF32_LINTFLAGS:
-    case _CS_XBS5_ILP32_OFFBIG_LDFLAGS:
-    case _CS_XBS5_ILP32_OFFBIG_LIBS:
-    case _CS_XBS5_ILP32_OFFBIG_LINTFLAGS:
-    case _CS_XBS5_LP64_OFF64_CFLAGS:
-    case _CS_XBS5_LP64_OFF64_LDFLAGS:
-    case _CS_XBS5_LP64_OFF64_LIBS:
-    case _CS_XBS5_LP64_OFF64_LINTFLAGS:
-    case _CS_XBS5_LPBIG_OFFBIG_CFLAGS:
-    case _CS_XBS5_LPBIG_OFFBIG_LDFLAGS:
-    case _CS_XBS5_LPBIG_OFFBIG_LIBS:
-    case _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS:
-
-    case _CS_POSIX_V6_ILP32_OFF32_CFLAGS:
-    case _CS_POSIX_V6_ILP32_OFF32_LDFLAGS:
-    case _CS_POSIX_V6_ILP32_OFF32_LIBS:
-    case _CS_POSIX_V6_ILP32_OFF32_LINTFLAGS:
-    case _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS:
-    case _CS_POSIX_V6_ILP32_OFFBIG_LIBS:
-    case _CS_POSIX_V6_ILP32_OFFBIG_LINTFLAGS:
-    case _CS_POSIX_V6_LP64_OFF64_CFLAGS:
-    case _CS_POSIX_V6_LP64_OFF64_LDFLAGS:
-    case _CS_POSIX_V6_LP64_OFF64_LIBS:
-    case _CS_POSIX_V6_LP64_OFF64_LINTFLAGS:
-    case _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS:
-    case _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS:
-    case _CS_POSIX_V6_LPBIG_OFFBIG_LIBS:
-    case _CS_POSIX_V6_LPBIG_OFFBIG_LINTFLAGS:
-      /* GNU libc does not require special actions to use LFS functions.  */
-      string = "";
-      string_len = 1;
-      break;
-
-    default:
-      __set_errno (EINVAL);
-      return 0;
-    }
-
-  if (len > 0 && buf != NULL)
-    {
-      if (string_len <= len)
-	memcpy (buf, string, string_len);
-      else
-	{
-	  memcpy (buf, string, len - 1);
-	  buf[len - 1] = '\0';
-	}
-    }
-  return string_len;
-}
diff --git a/newlib/libc/sys/linux/confstr.h b/newlib/libc/sys/linux/confstr.h
deleted file mode 100644
index 15859c3..0000000
--- a/newlib/libc/sys/linux/confstr.h
+++ /dev/null
@@ -1 +0,0 @@
-#define	CS_PATH	"/bin:/usr/bin"
diff --git a/newlib/libc/sys/linux/crt0.c b/newlib/libc/sys/linux/crt0.c
new file mode 100644
index 0000000..420a2b9
--- /dev/null
+++ b/newlib/libc/sys/linux/crt0.c
@@ -0,0 +1,32 @@
+/* libc/sys/linux/crt0.c - Run-time initialization */
+
+/* FIXME: This should be rewritten in assembler and
+          placed in a subdirectory specific to a platform.
+          There should also be calls to run constructors. */
+
+/* Written 2000 by Werner Almesberger */
+
+
+#include <stdlib.h>
+
+
+extern char **environ;
+
+extern int main(int argc,char **argv,char **envp);
+
+
+void _start(int args)
+{
+    /*
+     * The argument block begins above the current stack frame, because we
+     * have no return address. The calculation assumes that sizeof(int) ==
+     * sizeof(void *). This is okay for i386 user space, but may be invalid in
+     * other cases.
+     */
+    int *params = &args-1;
+    int argc = *params;
+    char **argv = (char **) (params+1);
+
+    environ = argv+argc+1;
+    exit(main(argc,argv,environ));
+}
diff --git a/newlib/libc/sys/linux/crt1.c b/newlib/libc/sys/linux/crt1.c
deleted file mode 100644
index 018e9a2..0000000
--- a/newlib/libc/sys/linux/crt1.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* dummy crt1.c file to override the one normally used by
-   gcc which refers to glibc variables that don't exist in
-   newlib.  */
diff --git a/newlib/libc/sys/linux/ctermid.c b/newlib/libc/sys/linux/ctermid.c
deleted file mode 100644
index 05914ff..0000000
--- a/newlib/libc/sys/linux/ctermid.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ctermid */
-
-#include <stdio.h>
-#include <string.h>
-
-static char devname[] = "/dev/tty";
-
-char *
-_DEFUN (ctermid, (buf),
-     char *buf)
-{
-  if (buf == NULL)
-    return devname;
-
-  return strcpy (buf, "/dev/tty");
-}
diff --git a/newlib/libc/sys/linux/dl/Makefile.am b/newlib/libc/sys/linux/dl/Makefile.am
deleted file mode 100644
index 9c73a13..0000000
--- a/newlib/libc/sys/linux/dl/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -DSHARED -D_GNU_SOURCE $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
-
-LIB_SOURCES = \
-	dl-addr.c   dl-deps.c   dl-init.c         dl-load.c     dl-misc.c    dl-profile.c   dl-runtime.c  dl-version.c \
-	dl-close.c  dl-error.c  dl-iteratephdr.c  dl-lookup.c   dl-object.c  dl-profstub.c  dl-support.c \
-	dl-debug.c  dl-fini.c   dl-libc.c         dl-open.c    dl-reloc.c     dl-sym.c   dl-cache.c
-
-AM_CFLAGS = -D_GNU_SOURCE -D__strerror_r=strerror_r
-libdl_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libdl.la
-libdl_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(LIB_SOURCES)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../../../Makefile.shared
diff --git a/newlib/libc/sys/linux/dl/Makefile.in b/newlib/libc/sys/linux/dl/Makefile.in
deleted file mode 100644
index 78c5083..0000000
--- a/newlib/libc/sys/linux/dl/Makefile.in
+++ /dev/null
@@ -1,378 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-EXTRA_SUBDIRS = @EXTRA_SUBDIRS@
-EXTRA_SUBLIBS = @EXTRA_SUBLIBS@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LINUX_MACH_LIB = @LINUX_MACH_LIB@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -DSHARED -D_GNU_SOURCE $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
-
-LIB_SOURCES =  	dl-addr.c   dl-deps.c   dl-init.c         dl-load.c     dl-misc.c    dl-profile.c   dl-runtime.c  dl-version.c 	dl-close.c  dl-error.c  dl-iteratephdr.c  dl-lookup.c   dl-object.c  dl-profstub.c  dl-support.c 	dl-debug.c  dl-fini.c   dl-libc.c         dl-open.c    dl-reloc.c     dl-sym.c   dl-cache.c
-
-
-AM_CFLAGS = -D_GNU_SOURCE -D__strerror_r=strerror_r
-libdl_la_LDFLAGS = -Xcompiler -nostdlib
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libdl.la
-@USE_LIBTOOL_TRUE@libdl_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  dl-addr.$(OBJEXT) dl-deps.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dl-init.$(OBJEXT) dl-load.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dl-misc.$(OBJEXT) dl-profile.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dl-runtime.$(OBJEXT) dl-version.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dl-close.$(OBJEXT) dl-error.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dl-iteratephdr.$(OBJEXT) dl-lookup.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dl-object.$(OBJEXT) dl-profstub.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dl-support.$(OBJEXT) dl-debug.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dl-fini.$(OBJEXT) dl-libc.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dl-open.$(OBJEXT) dl-reloc.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dl-sym.$(OBJEXT) dl-cache.$(OBJEXT)
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-libdl_la_LIBADD = 
-@USE_LIBTOOL_TRUE@libdl_la_OBJECTS =  dl-addr.lo dl-deps.lo dl-init.lo \
-@USE_LIBTOOL_TRUE@dl-load.lo dl-misc.lo dl-profile.lo dl-runtime.lo \
-@USE_LIBTOOL_TRUE@dl-version.lo dl-close.lo dl-error.lo \
-@USE_LIBTOOL_TRUE@dl-iteratephdr.lo dl-lookup.lo dl-object.lo \
-@USE_LIBTOOL_TRUE@dl-profstub.lo dl-support.lo dl-debug.lo dl-fini.lo \
-@USE_LIBTOOL_TRUE@dl-libc.lo dl-open.lo dl-reloc.lo dl-sym.lo \
-@USE_LIBTOOL_TRUE@dl-cache.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(libdl_la_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(libdl_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus dl/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-libdl.la: $(libdl_la_OBJECTS) $(libdl_la_DEPENDENCIES)
-	$(LINK)  $(libdl_la_LDFLAGS) $(libdl_la_OBJECTS) $(libdl_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = dl
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-noinstLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
-distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/linux/dl/abi-tag.h b/newlib/libc/sys/linux/dl/abi-tag.h
deleted file mode 100644
index 85db374..0000000
--- a/newlib/libc/sys/linux/dl/abi-tag.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define __ABI_TAG_OS 0
-#ifndef __ABI_TAG_VERSION
-# define __ABI_TAG_VERSION 2,0,0
-#endif
diff --git a/newlib/libc/sys/linux/dl/atomicity.h b/newlib/libc/sys/linux/dl/atomicity.h
deleted file mode 100644
index 8b52ab4..0000000
--- a/newlib/libc/sys/linux/dl/atomicity.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Low-level functions for atomic operations.  ix86 version, x >= 4.
-   Copyright (C) 1997, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _ATOMICITY_H
-#define _ATOMICITY_H	1
-
-
-
-static inline uint32_t
-__attribute__ ((unused))
-exchange_and_add (volatile uint32_t *mem, uint32_t val)
-{
-  register uint32_t result;
-  __asm__ __volatile__ ("lock; xaddl %0,%1"
-			: "=r" (result), "=m" (*mem) : "0" (val), "1" (*mem));
-  return result;
-}
-
-static inline void
-__attribute__ ((unused))
-atomic_add (volatile uint32_t *mem, int val)
-{
-  __asm__ __volatile__ ("lock; addl %1,%0"
-			: "=m" (*mem) : "ir" (val), "0" (*mem));
-}
-
-static inline char
-__attribute__ ((unused))
-compare_and_swap (volatile long int *p, long int oldval, long int newval)
-{
-  char ret;
-  long int readval;
-
-  __asm__ __volatile__ ("lock; cmpxchgl %3, %1; sete %0"
-                        : "=q" (ret), "=m" (*p), "=a" (readval)
-                        : "r" (newval), "1" (*p), "a" (oldval));
-  return ret;
-}
-
-#endif /* atomicity.h */
diff --git a/newlib/libc/sys/linux/dl/dl-addr.c b/newlib/libc/sys/linux/dl/dl-addr.c
deleted file mode 100644
index 2386749..0000000
--- a/newlib/libc/sys/linux/dl/dl-addr.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Locate the shared object symbol nearest a given address.
-   Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <dlfcn.h>
-#include <stddef.h>
-#include <ldsodefs.h>
-
-int
-internal_function
-_dl_addr (const void *address, Dl_info *info)
-{
-  const ElfW(Addr) addr = DL_LOOKUP_ADDRESS (address);
-  struct link_map *l, *match;
-  const ElfW(Sym) *symtab, *matchsym;
-  const char *strtab;
-  ElfW(Word) strtabsize;
-
-  /* Find the highest-addressed object that ADDRESS is not below.  */
-  match = NULL;
-  for (l = _dl_loaded; l; l = l->l_next)
-    if (addr >= l->l_map_start && addr < l->l_map_end)
-      {
-	/* We know ADDRESS lies within L if in any shared object.
-	   Make sure it isn't past the end of L's segments.  */
-	size_t n = l->l_phnum;
-	if (n > 0)
-	  {
-	    do
-	      --n;
-	    while (l->l_phdr[n].p_type != PT_LOAD);
-	    if (addr >= (l->l_addr +
-			 l->l_phdr[n].p_vaddr + l->l_phdr[n].p_memsz))
-	      /* Off the end of the highest-addressed shared object.  */
-	      continue;
-	  }
-
-	match = l;
-	break;
-      }
-
-  if (match == NULL)
-    return 0;
-
-  /* Now we know what object the address lies in.  */
-  info->dli_fname = match->l_name;
-  info->dli_fbase = (void *) match->l_addr;
-
-  /* If this is the main program the information is incomplete.  */
-  if (__builtin_expect (info->dli_fbase == NULL, 0))
-    {
-      info->dli_fname = _dl_argv[0];
-      info->dli_fbase = (void *) match->l_map_start;
-    }
-
-  symtab = (const void *) D_PTR (match, l_info[DT_SYMTAB]);
-  strtab = (const void *) D_PTR (match, l_info[DT_STRTAB]);
-  strtabsize = match->l_info[DT_STRSZ]->d_un.d_val;
-
-  /* We assume that the string table follows the symbol table, because
-     there is no way in ELF to know the size of the dynamic symbol table!!  */
-  for (matchsym = NULL; (void *) symtab < (void *) strtab; ++symtab)
-    if (addr >= match->l_addr + symtab->st_value
-	&& ((symtab->st_size == 0 && addr == match->l_addr + symtab->st_value)
-	    || addr < match->l_addr + symtab->st_value + symtab->st_size)
-	&& symtab->st_name < strtabsize
-	&& (matchsym == NULL || matchsym->st_value < symtab->st_value)
-	&& (ELFW(ST_BIND) (symtab->st_info) == STB_GLOBAL
-	    || ELFW(ST_BIND) (symtab->st_info) == STB_WEAK))
-      matchsym = symtab;
-
-  if (matchsym)
-    {
-      /* We found a symbol close by.  Fill in its name and exact address.  */
-      info->dli_sname = strtab + matchsym->st_name;
-      info->dli_saddr = (void *) (match->l_addr + matchsym->st_value);
-    }
-  else
-    {
-      /* No symbol matches.  We return only the containing object.  */
-      info->dli_sname = NULL;
-      info->dli_saddr = NULL;
-    }
-
-  return 1;
-}
diff --git a/newlib/libc/sys/linux/dl/dl-cache.c b/newlib/libc/sys/linux/dl/dl-cache.c
deleted file mode 100644
index 9511da1..0000000
--- a/newlib/libc/sys/linux/dl/dl-cache.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
-   Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <unistd.h>
-#include <ldsodefs.h>
-#include <sys/mman.h>
-#include <dl-cache.h>
-#include <machine/dl-procinfo.h>
-#include <machine/weakalias.h>
-
-extern const char *_dl_platform;
-
-#ifndef _DL_PLATFORMS_COUNT
-# define _DL_PLATFORMS_COUNT 0
-#endif
-
-/* This is the starting address and the size of the mmap()ed file.  */
-static struct cache_file *cache;
-static struct cache_file_new *cache_new;
-static size_t cachesize;
-
-/* 1 if cache_data + PTR points into the cache.  */
-#define _dl_cache_verify_ptr(ptr) (ptr < cache_data_size)
-
-/* This is the cache ID we expect.  Normally it is 3 for glibc linked
-   binaries.  */
-int _dl_correct_cache_id = _DL_CACHE_DEFAULT_ID;
-
-#define SEARCH_CACHE(cache) \
-/* We use binary search since the table is sorted in the cache file.	      \
-   The first matching entry in the table is returned.			      \
-   It is important to use the same algorithm as used while generating	      \
-   the cache file.  */							      \
-do									      \
-  {									      \
-    left = 0;								      \
-    right = cache->nlibs - 1;						      \
-									      \
-    while (left <= right)						      \
-      {									      \
-	__typeof__ (cache->libs[0].key) key;				      \
-									      \
-	middle = (left + right) / 2;					      \
-									      \
-	key = cache->libs[middle].key;					      \
-									      \
-	/* Make sure string table indices are not bogus before using	      \
-	   them.  */							      \
-	if (! _dl_cache_verify_ptr (key))				      \
-	  {								      \
-	    cmpres = 1;							      \
-	    break;							      \
-	  }								      \
-									      \
-	/* Actually compare the entry with the key.  */			      \
-	cmpres = _dl_cache_libcmp (name, cache_data + key);		      \
-	if (__builtin_expect (cmpres == 0, 0))				      \
-	  {								      \
-	    /* Found it.  LEFT now marks the last entry for which we	      \
-	       know the name is correct.  */				      \
-	    left = middle;						      \
-									      \
-	    /* There might be entries with this name before the one we	      \
-	       found.  So we have to find the beginning.  */		      \
-	    while (middle > 0)						      \
-	      {								      \
-		__typeof__ (cache->libs[0].key) key;			      \
-									      \
-		key = cache->libs[middle - 1].key;			      \
-		/* Make sure string table indices are not bogus before	      \
-		   using them.  */					      \
-		if (! _dl_cache_verify_ptr (key)			      \
-		    /* Actually compare the entry.  */			      \
-		    || _dl_cache_libcmp (name, cache_data + key) != 0)	      \
-		  break;						      \
-		--middle;						      \
-	      }								      \
-									      \
-	    do								      \
-	      {								      \
-		int flags;						      \
-		__typeof__ (cache->libs[0]) *lib = &cache->libs[middle];      \
-									      \
-		/* Only perform the name test if necessary.  */		      \
-		if (middle > left					      \
-		    /* We haven't seen this string so far.  Test whether the  \
-		       index is ok and whether the name matches.  Otherwise   \
-		       we are done.  */					      \
-		    && (! _dl_cache_verify_ptr (lib->key)		      \
-			|| (_dl_cache_libcmp (name, cache_data + lib->key)    \
-			    != 0)))					      \
-		  break;						      \
-									      \
-		flags = lib->flags;					      \
-		if (_dl_cache_check_flags (flags)			      \
-		    && _dl_cache_verify_ptr (lib->value))		      \
-		  {							      \
-		    if (best == NULL || flags == _dl_correct_cache_id)	      \
-		      {							      \
-			HWCAP_CHECK;					      \
-			best = cache_data + lib->value;			      \
-									      \
-			if (flags == _dl_correct_cache_id)		      \
-			  /* We've found an exact match for the shared	      \
-			     object and no general `ELF' release.  Stop	      \
-			     searching.  */				      \
-			  break;					      \
-		      }							      \
-		  }							      \
-	      }								      \
-	    while (++middle <= right);					      \
-	    break;							      \
-	}								      \
-									      \
-	if (cmpres < 0)							      \
-	  left = middle + 1;						      \
-	else								      \
-	  right = middle - 1;						      \
-      }									      \
-  }									      \
-while (0)
-
-
-
-/* Look up NAME in ld.so.cache and return the file name stored there,
-   or null if none is found.  */
-
-const char *
-internal_function
-_dl_load_cache_lookup (const char *name)
-{
-  int left, right, middle;
-  int cmpres;
-  const char *cache_data;
-  uint32_t cache_data_size;
-  const char *best;
-
-  if (cache == NULL)
-    {
-      /* Read the contents of the file.  */
-      void *file = _dl_sysdep_read_whole_file (LD_SO_CACHE, &cachesize,
-					       PROT_READ);
-
-      /* We can handle three different cache file formats here:
-	 - the old libc5/glibc2.0/2.1 format
-	 - the old format with the new format in it
-	 - only the new format
-	 The following checks if the cache contains any of these formats.  */
-      if (file != MAP_FAILED && cachesize > sizeof *cache
-	  && memcmp (file, CACHEMAGIC, sizeof CACHEMAGIC - 1) == 0)
-	{
-	  size_t offset;
-	  /* Looks ok.  */
-	  cache = file;
-
-	  /* Check for new version.  */
-	  offset = ALIGN_CACHE (sizeof (struct cache_file)
-				+ cache->nlibs * sizeof (struct file_entry));
-
-	  cache_new = (struct cache_file_new *) ((void *) cache + offset);
-	  if (cachesize < (offset + sizeof (struct cache_file_new))
-	      || memcmp (cache_new->magic, CACHEMAGIC_VERSION_NEW,
-			 sizeof CACHEMAGIC_VERSION_NEW - 1) != 0)
-	    cache_new = (void *) -1;
-	}
-      else if (file != MAP_FAILED && cachesize > sizeof *cache_new
-	       && memcmp (file, CACHEMAGIC_VERSION_NEW,
-			  sizeof CACHEMAGIC_VERSION_NEW - 1) == 0)
-	{
-	  cache_new = file;
-	  cache = file;
-	}
-      else
-	{
-	  if (file != MAP_FAILED)
-	    munmap (file, cachesize);
-	  cache = (void *) -1;
-	}
-
-      assert (cache != NULL);
-    }
-
-  if (cache == (void *) -1)
-    /* Previously looked for the cache file and didn't find it.  */
-    return NULL;
-
-  best = NULL;
-
-  if (cache_new != (void *) -1)
-    {
-      /* This file ends in static libraries where we don't have a hwcap.  */
-      unsigned long int *hwcap;
-      uint64_t platform;
-      #pragma weak _dl_hwcap
-
-      /* This is where the strings start.  */
-      cache_data = (const char *) cache_new;
-
-      /* Now we can compute how large the string table is.  */
-      cache_data_size = (const char *) cache + cachesize - cache_data;
-
-      hwcap = &_dl_hwcap;
-      platform = _dl_string_platform (_dl_platform);
-      if (platform != -1)
-	platform = 1ULL << platform;
-
-      /* Only accept hwcap if it's for the right platform.  */
-#define HWCAP_CHECK \
-      if (_dl_osversion	&& cache_new->libs[middle].osversion > _dl_osversion) \
-	continue;							      \
-      if (_DL_PLATFORMS_COUNT && platform != -1				      \
-	  && (lib->hwcap & _DL_HWCAP_PLATFORM) != 0			      \
-	  && (lib->hwcap & _DL_HWCAP_PLATFORM) != platform)		      \
-	continue;							      \
-      if (hwcap								      \
-	  && ((lib->hwcap & *hwcap & ~_DL_HWCAP_PLATFORM) > *hwcap))	      \
-	continue
-      SEARCH_CACHE (cache_new);
-    }
-  else
-    {
-      /* This is where the strings start.  */
-      cache_data = (const char *) &cache->libs[cache->nlibs];
-
-      /* Now we can compute how large the string table is.  */
-      cache_data_size = (const char *) cache + cachesize - cache_data;
-
-#undef HWCAP_CHECK
-#define HWCAP_CHECK do {} while (0)
-      SEARCH_CACHE (cache);
-    }
-
-  /* Print our result if wanted.  */
-  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_LIBS, 0) && best != NULL)
-    _dl_debug_printf ("  trying file=%s\n", best);
-
-  return best;
-}
-
-#ifndef MAP_COPY
-/* If the system does not support MAP_COPY we cannot leave the file open
-   all the time since this would create problems when the file is replaced.
-   Therefore we provide this function to close the file and open it again
-   once needed.  */
-void
-_dl_unload_cache (void)
-{
-  if (cache != NULL && cache != (struct cache_file *) -1)
-    {
-      munmap (cache, cachesize);
-      cache = NULL;
-    }
-}
-#endif
diff --git a/newlib/libc/sys/linux/dl/dl-cache.h b/newlib/libc/sys/linux/dl/dl-cache.h
deleted file mode 100644
index 0699853..0000000
--- a/newlib/libc/sys/linux/dl/dl-cache.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stdint.h>
-
-#ifndef _DL_CACHE_DEFAULT_ID
-# define _DL_CACHE_DEFAULT_ID	3
-#endif
-
-#ifndef _dl_cache_check_flags
-# define _dl_cache_check_flags(flags)			\
-  ((flags) == 1 || (flags) == _DL_CACHE_DEFAULT_ID)
-#endif
-
-#ifndef SYSCONFDIR
-# define SYSCONFDIR "/etc"
-#endif
-
-#ifndef LD_SO_CACHE
-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache"
-#endif
-
-#define CACHEMAGIC "ld.so-1.7.0"
-
-/* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
-   format has been added in a compatible way:
-   The beginning of the string table is used for the new table:
-	old_magic
-	nlibs
-	libs[0]
-	...
-	libs[nlibs-1]
-	pad, new magic needs to be aligned
-	     - this is string[0] for the old format
-	new magic - this is string[0] for the new format
-	newnlibs
-	...
-	newlibs[0]
-	...
-	newlibs[newnlibs-1]
-	string 1
-	string 2
-	...
-*/
-struct file_entry
-{
-  int flags;		/* This is 1 for an ELF library.  */
-  unsigned int key, value; /* String table indices.  */
-};
-
-struct cache_file
-{
-  char magic[sizeof CACHEMAGIC - 1];
-  unsigned int nlibs;
-  struct file_entry libs[0];
-};
-
-#define CACHEMAGIC_NEW "glibc-ld.so.cache"
-#define CACHE_VERSION "1.1"
-#define CACHEMAGIC_VERSION_NEW CACHEMAGIC_NEW CACHE_VERSION
-
-
-struct file_entry_new
-{
-  int32_t flags;		/* This is 1 for an ELF library.  */
-  uint32_t key, value;		/* String table indices.  */
-  uint32_t osversion;		/* Required OS version.	 */
-  uint64_t hwcap;		/* Hwcap entry.	 */
-};
-
-struct cache_file_new
-{
-  char magic[sizeof CACHEMAGIC_NEW - 1];
-  char version[sizeof CACHE_VERSION - 1];
-  uint32_t nlibs;		/* Number of entries.  */
-  uint32_t len_strings;		/* Size of string table. */
-  uint32_t unused[5];		/* Leave space for future extensions
-				   and align to 8 byte boundary.  */
-  struct file_entry_new libs[0]; /* Entries describing libraries.  */
-  /* After this the string table of size len_strings is found.	*/
-};
-
-/* Used to align cache_file_new.  */
-#define ALIGN_CACHE(addr)				\
-(((addr) + __alignof__ (struct cache_file_new) -1)	\
- & (~(__alignof__ (struct cache_file_new) - 1)))
-
-static int
-_dl_cache_libcmp (const char *p1, const char *p2)
-{
-  while (*p1 != '\0')
-    {
-      if (*p1 >= '0' && *p1 <= '9')
-        {
-          if (*p2 >= '0' && *p2 <= '9')
-            {
-	      /* Must compare this numerically.  */
-	      int val1;
-	      int val2;
-
-	      val1 = *p1++ - '0';
-	      val2 = *p2++ - '0';
-	      while (*p1 >= '0' && *p1 <= '9')
-	        val1 = val1 * 10 + *p1++ - '0';
-	      while (*p2 >= '0' && *p2 <= '9')
-	        val2 = val2 * 10 + *p2++ - '0';
-	      if (val1 != val2)
-		return val1 - val2;
-	    }
-	  else
-            return 1;
-        }
-      else if (*p2 >= '0' && *p2 <= '9')
-        return -1;
-      else if (*p1 != *p2)
-        return *p1 - *p2;
-      else
-	{
-	  ++p1;
-	  ++p2;
-	}
-    }
-  return *p1 - *p2;
-}
diff --git a/newlib/libc/sys/linux/dl/dl-close.c b/newlib/libc/sys/linux/dl/dl-close.c
deleted file mode 100644
index ef53868..0000000
--- a/newlib/libc/sys/linux/dl/dl-close.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/* Close a shared object opened by `_dl_open'.
-   Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <dlfcn.h>
-#include <libintl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <bits/libc-lock.h>
-#include <ldsodefs.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-
-
-/* Type of the constructor functions.  */
-typedef void (*fini_t) (void);
-
-
-void
-internal_function
-_dl_close (void *_map)
-{
-  struct reldep_list
-  {
-    struct link_map **rellist;
-    unsigned int nrellist;
-    struct reldep_list *next;
-  } *reldeps = NULL;
-  struct link_map **list;
-  struct link_map *map = _map;
-  unsigned int i;
-  unsigned int *new_opencount;
-
-  /* First see whether we can remove the object at all.  */
-  if (__builtin_expect (map->l_flags_1 & DF_1_NODELETE, 0)
-      && map->l_init_called)
-    /* Nope.  Do nothing.  */
-    return;
-
-  if (__builtin_expect (map->l_opencount, 1) == 0)
-    _dl_signal_error (0, map->l_name, NULL, N_("shared object not open"));
-
-  /* Acquire the lock.  */
-#ifdef HAVE_DD_LOCK
-    __lock_acquire(_dl_load_lock);
-#endif
-
-
-  /* Decrement the reference count.  */
-  if (map->l_opencount > 1 || map->l_type != lt_loaded)
-    {
-      /* There are still references to this object.  Do nothing more.  */
-      if (__builtin_expect (_dl_debug_mask & DL_DEBUG_FILES, 0))
-	_dl_debug_printf ("\nclosing file=%s; opencount == %u\n",
-			  map->l_name, map->l_opencount);
-
-      /* One decrement the object itself, not the dependencies.  */
-      --map->l_opencount;
-
-#ifdef HAVE_DD_LOCK
-        __lock_release(_dl_load_lock);
-#endif
-
-      return;
-    }
-
-  list = map->l_initfini;
-
-  /* Compute the new l_opencount values.  */
-  i = map->l_searchlist.r_nlist;
-  if (__builtin_expect (i == 0, 0))
-    /* This can happen if we handle relocation dependencies for an
-       object which wasn't loaded directly.  */
-    for (i = 1; list[i] != NULL; ++i)
-      ;
-
-  new_opencount = (unsigned int *) alloca (i * sizeof (unsigned int));
-
-  for (i = 0; list[i] != NULL; ++i)
-    {
-      list[i]->l_idx = i;
-      new_opencount[i] = list[i]->l_opencount;
-    }
-  --new_opencount[0];
-  for (i = 1; list[i] != NULL; ++i)
-    if ((! (list[i]->l_flags_1 & DF_1_NODELETE) || ! list[i]->l_init_called)
-	/* Decrement counter.  */
-	&& --new_opencount[i] == 0
-	/* Test whether this object was also loaded directly.  */
-	&& list[i]->l_searchlist.r_list != NULL)
-      {
-	/* In this case we have the decrement all the dependencies of
-           this object.  They are all in MAP's dependency list.  */
-	unsigned int j;
-	struct link_map **dep_list = list[i]->l_searchlist.r_list;
-
-	for (j = 1; j < list[i]->l_searchlist.r_nlist; ++j)
-	  if (! (dep_list[j]->l_flags_1 & DF_1_NODELETE)
-	      || ! dep_list[j]->l_init_called)
-	    {
-	      assert (dep_list[j]->l_idx < map->l_searchlist.r_nlist);
-	      --new_opencount[dep_list[j]->l_idx];
-	    }
-      }
-  assert (new_opencount[0] == 0);
-
-  /* Call all termination functions at once.  */
-  for (i = 0; list[i] != NULL; ++i)
-    {
-      struct link_map *imap = list[i];
-      if (new_opencount[i] == 0 && imap->l_type == lt_loaded
-	  && (imap->l_info[DT_FINI] || imap->l_info[DT_FINI_ARRAY])
-	  && (! (imap->l_flags_1 & DF_1_NODELETE) || ! imap->l_init_called)
-	  /* Skip any half-cooked objects that were never initialized.  */
-	  && imap->l_init_called)
-	{
-	  /* When debugging print a message first.  */
-	  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_IMPCALLS, 0))
-	    _dl_debug_printf ("\ncalling fini: %s\n\n", imap->l_name);
-
-	  /* Call its termination function.  */
-	  if (imap->l_info[DT_FINI_ARRAY] != NULL)
-	    {
-	      ElfW(Addr) *array =
-		(ElfW(Addr) *) (imap->l_addr
-				+ imap->l_info[DT_FINI_ARRAY]->d_un.d_ptr);
-	      unsigned int sz = (imap->l_info[DT_FINI_ARRAYSZ]->d_un.d_val
-				 / sizeof (ElfW(Addr)));
-	      unsigned int cnt;
-
-	      for (cnt = 0; cnt < sz; ++cnt)
-		((fini_t) (imap->l_addr + array[cnt])) ();
-	    }
-
-	  /* Next try the old-style destructor.  */
-	  if (imap->l_info[DT_FINI] != NULL)
-	    (*(void (*) (void)) DL_DT_FINI_ADDRESS
-	      (imap, (void *) imap->l_addr
-		     + imap->l_info[DT_FINI]->d_un.d_ptr)) ();
-	}
-      else if (new_opencount[i] != 0 && imap->l_type == lt_loaded)
-	{
-	  /* The object is still used.  But the object we are unloading
-	     right now is responsible for loading it and therefore we
-	     have the search list of the current object in its scope.
-	     Remove it.  */
-	  struct r_scope_elem **runp = imap->l_scope;
-
-	  while (*runp != NULL)
-	    if (*runp == &map->l_searchlist)
-	      {
-		/* Copy all later elements.  */
-		while ((runp[0] = runp[1]) != NULL)
-		  ++runp;
-		break;
-	      }
-	  else
-	    ++runp;
-	}
-
-      /* Store the new l_opencount value.  */
-      imap->l_opencount = new_opencount[i];
-      /* Just a sanity check.  */
-      assert (imap->l_type == lt_loaded || imap->l_opencount > 0);
-    }
-
-  /* Notify the debugger we are about to remove some loaded objects.  */
-  _r_debug.r_state = RT_DELETE;
-  _dl_debug_state ();
-
-  /* Check each element of the search list to see if all references to
-     it are gone.  */
-  for (i = 0; list[i] != NULL; ++i)
-    {
-      struct link_map *imap = list[i];
-      if (imap->l_opencount == 0 && imap->l_type == lt_loaded)
-	{
-	  struct libname_list *lnp;
-
-	  /* That was the last reference, and this was a dlopen-loaded
-	     object.  We can unmap it.  */
-	  if (__builtin_expect (imap->l_global, 0))
-	    {
-	      /* This object is in the global scope list.  Remove it.  */
-	      unsigned int cnt = _dl_main_searchlist->r_nlist;
-
-	      do
-		--cnt;
-	      while (_dl_main_searchlist->r_list[cnt] != imap);
-
-	      /* The object was already correctly registered.  */
-	      while (++cnt < _dl_main_searchlist->r_nlist)
-		_dl_main_searchlist->r_list[cnt - 1]
-		  = _dl_main_searchlist->r_list[cnt];
-
-	      --_dl_main_searchlist->r_nlist;
-	    }
-
-	  /* We can unmap all the maps at once.  We determined the
-	     start address and length when we loaded the object and
-	     the `munmap' call does the rest.  */
-	  DL_UNMAP (imap);
-
-	  /* Finally, unlink the data structure and free it.  */
-#ifdef SHARED
-	  /* We will unlink the first object only if this is a statically
-	     linked program.  */
-	  assert (imap->l_prev != NULL);
-	  imap->l_prev->l_next = imap->l_next;
-#else
-	  if (imap->l_prev != NULL)
-	    imap->l_prev->l_next = imap->l_next;
-	  else
-	    _dl_loaded = imap->l_next;
-#endif
-	  --_dl_nloaded;
-	  if (imap->l_next)
-	    imap->l_next->l_prev = imap->l_prev;
-
-	  if (imap->l_versions != NULL)
-	    free (imap->l_versions);
-	  if (imap->l_origin != NULL && imap->l_origin != (char *) -1)
-	    free ((char *) imap->l_origin);
-
-	  /* If the object has relocation dependencies save this
-             information for latter.  */
-	  if (__builtin_expect (imap->l_reldeps != NULL, 0))
-	    {
-	      struct reldep_list *newrel;
-
-	      newrel = (struct reldep_list *) alloca (sizeof (*reldeps));
-	      newrel->rellist = imap->l_reldeps;
-	      newrel->nrellist = imap->l_reldepsact;
-	      newrel->next = reldeps;
-
-	      reldeps = newrel;
-	    }
-
-	  /* This name always is allocated.  */
-	  free (imap->l_name);
-	  /* Remove the list with all the names of the shared object.  */
-	  lnp = imap->l_libname;
-	  do
-	    {
-	      struct libname_list *this = lnp;
-	      lnp = lnp->next;
-	      if (!this->dont_free)
-		free (this);
-	    }
-	  while (lnp != NULL);
-
-	  /* Remove the searchlists.  */
-	  if (imap != map)
-	      free (imap->l_initfini);
-
-	  /* Remove the scope array if we allocated it.  */
-	  if (imap->l_scope != imap->l_scope_mem)
-	    free (imap->l_scope);
-
-	  if (imap->l_phdr_allocated)
-	    free ((void *) imap->l_phdr);
-
-	  if (imap->l_rpath_dirs.dirs != (void *) -1)
-	    free (imap->l_rpath_dirs.dirs);
-	  if (imap->l_runpath_dirs.dirs != (void *) -1)
-	    free (imap->l_runpath_dirs.dirs);
-
-	  free (imap);
-	}
-    }
-
-  /* Notify the debugger those objects are finalized and gone.  */
-  _r_debug.r_state = RT_CONSISTENT;
-  _dl_debug_state ();
-
-  /* Now we can perhaps also remove the modules for which we had
-     dependencies because of symbol lookup.  */
-  while (__builtin_expect (reldeps != NULL, 0))
-    {
-      while (reldeps->nrellist-- > 0)
-	_dl_close (reldeps->rellist[reldeps->nrellist]);
-
-      free (reldeps->rellist);
-
-      reldeps = reldeps->next;
-    }
-
-  free (list);
-
-  /* Release the lock.  */
-#ifdef HAVE_DD_LOCK
-    __lock_release(_dl_load_lock);
-#endif
-
-  
-}
-
-
-static void
-free_mem (void)
-{
-  if (__builtin_expect (_dl_global_scope_alloc, 0) != 0
-      && _dl_main_searchlist->r_nlist == _dl_initial_searchlist.r_nlist)
-    {
-      /* All object dynamically loaded by the program are unloaded.  Free
-	 the memory allocated for the global scope variable.  */
-      struct link_map **old = _dl_main_searchlist->r_list;
-
-      /* Put the old map in.  */
-      _dl_main_searchlist->r_list = _dl_initial_searchlist.r_list;
-      /* Signal that the original map is used.  */
-      _dl_global_scope_alloc = 0;
-
-      /* Now free the old map.  */
-      free (old);
-    }
-}
-text_set_element (__libc_subfreeres, free_mem);
diff --git a/newlib/libc/sys/linux/dl/dl-debug.c b/newlib/libc/sys/linux/dl/dl-debug.c
deleted file mode 100644
index 5a51b53..0000000
--- a/newlib/libc/sys/linux/dl/dl-debug.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Communicate dynamic linker state to the debugger at runtime.
-   Copyright (C) 1996, 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <ldsodefs.h>
-
-/* This structure communicates dl state to the debugger.  The debugger
-   normally finds it via the DT_DEBUG entry in the dynamic section, but in
-   a statically-linked program there is no dynamic section for the debugger
-   to examine and it looks for this particular symbol name.  */
-struct r_debug _r_debug;
-
-
-/* Initialize _r_debug if it has not already been done.  The argument is
-   the run-time load address of the dynamic linker, to be put in
-   _r_debug.r_ldbase.  Returns the address of _r_debug.  */
-
-struct r_debug *
-internal_function
-_dl_debug_initialize (ElfW(Addr) ldbase)
-{
-  if (_r_debug.r_brk == 0)
-    {
-      /* Tell the debugger where to find the map of loaded objects.  */
-      _r_debug.r_version = 1	/* R_DEBUG_VERSION XXX */;
-      _r_debug.r_ldbase = ldbase;
-      _r_debug.r_map = _dl_loaded;
-      _r_debug.r_brk = (ElfW(Addr)) &_dl_debug_state;
-    }
-
-  return &_r_debug;
-}
-
-
-/* This function exists solely to have a breakpoint set on it by the
-   debugger.  The debugger is supposed to find this function's address by
-   examining the r_brk member of struct r_debug, but GDB 4.15 in fact looks
-   for this particular symbol name in the PT_INTERP file.  */
-void
-_dl_debug_state (void)
-{
-}
diff --git a/newlib/libc/sys/linux/dl/dl-deps.c b/newlib/libc/sys/linux/dl/dl-deps.c
deleted file mode 100644
index 4596a85..0000000
--- a/newlib/libc/sys/linux/dl/dl-deps.c
+++ /dev/null
@@ -1,561 +0,0 @@
-/* Load the dependencies of a mapped object.
-   Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <dlfcn.h>
-#include <errno.h>
-#include <libintl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/param.h>
-#include <ldsodefs.h>
-
-#include <dl-dst.h>
-
-/* Whether an shared object references one or more auxiliary objects
-   is signaled by the AUXTAG entry in l_info.  */
-#define AUXTAG	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
-		 + DT_EXTRATAGIDX (DT_AUXILIARY))
-/* Whether an shared object references one or more auxiliary objects
-   is signaled by the AUXTAG entry in l_info.  */
-#define FILTERTAG (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
-		   + DT_EXTRATAGIDX (DT_FILTER))
-
-/* This is zero at program start to signal that the global scope map is
-   allocated by rtld.  Later it keeps the size of the map.  It might be
-   reset if in _dl_close if the last global object is removed.  */
-size_t _dl_global_scope_alloc;
-
-extern size_t _dl_platformlen;
-
-/* When loading auxiliary objects we must ignore errors.  It's ok if
-   an object is missing.  */
-struct openaux_args
-  {
-    /* The arguments to openaux.  */
-    struct link_map *map;
-    int trace_mode;
-    const char *strtab;
-    const char *name;
-
-    /* The return value of openaux.  */
-    struct link_map *aux;
-  };
-
-static void
-openaux (void *a)
-{
-  struct openaux_args *args = (struct openaux_args *) a;
-
-  args->aux = _dl_map_object (args->map, args->name, 0,
-			      (args->map->l_type == lt_executable
-			       ? lt_library : args->map->l_type),
-			      args->trace_mode, 0);
-}
-
-
-
-/* We use a very special kind of list to track the path
-   through the list of loaded shared objects.  We have to
-   produce a flat list with unique members of all involved objects.
-*/
-struct list
-  {
-    int done;			/* Nonzero if this map was processed.  */
-    struct link_map *map;	/* The data.  */
-    struct list *next;	/* Elements for normal list.  */
-  };
-
-
-/* Macro to expand DST.  It is an macro since we use `alloca'.  */
-#define expand_dst(l, str, fatal) \
-  ({									      \
-    const char *__str = (str);						      \
-    const char *__result = __str;					      \
-    size_t __cnt = DL_DST_COUNT(__str, 0);				      \
-									      \
-    if (__cnt != 0)							      \
-      {									      \
-	char *__newp;							      \
-									      \
-	__newp = (char *) alloca (DL_DST_REQUIRED (l, __str, strlen (__str),  \
-						   __cnt));		      \
-									      \
-	__result = DL_DST_SUBSTITUTE (l, __str, __newp, 0);		      \
-									      \
-	if (*__result == '\0')						      \
-	  {								      \
-	    /* The replacement for the DST is not known.  We can't	      \
-	       processed.  */						      \
-	    if (fatal)							      \
-	      _dl_signal_error (0, __str, NULL, N_("\
-empty dynamics string token substitution"));				      \
-	    else							      \
-	      {								      \
-		/* This is for DT_AUXILIARY.  */			      \
-		if (__builtin_expect (_dl_debug_mask & DL_DEBUG_LIBS, 0))     \
-		  _dl_debug_printf ("cannot load auxiliary `%s' because of"   \
-				    "empty dynamic string token "	      \
-				    "substitution\n", __str);		      \
-		continue;						      \
-	      }								      \
-	  }								      \
-      }									      \
-									      \
-    __result; })
-
-
-void
-internal_function
-_dl_map_object_deps (struct link_map *map,
-		     struct link_map **preloads, unsigned int npreloads,
-		     int trace_mode)
-{
-  struct list known[1 + npreloads + 1];
-  struct list *runp, *tail;
-  unsigned int nlist, i;
-  /* Object name.  */
-  const char *name;
-  int errno_saved;
-  int errno_reason;
-  const char *errstring;
-  const char *objname;
-
-  auto inline void preload (struct link_map *map);
-
-  inline void preload (struct link_map *map)
-    {
-      known[nlist].done = 0;
-      known[nlist].map = map;
-      known[nlist].next = &known[nlist + 1];
-
-      ++nlist;
-      /* We use `l_reserved' as a mark bit to detect objects we have
-	 already put in the search list and avoid adding duplicate
-	 elements later in the list.  */
-      map->l_reserved = 1;
-    }
-
-  /* No loaded object so far.  */
-  nlist = 0;
-
-  /* First load MAP itself.  */
-  preload (map);
-
-  /* Add the preloaded items after MAP but before any of its dependencies.  */
-  for (i = 0; i < npreloads; ++i)
-    preload (preloads[i]);
-
-  /* Terminate the lists.  */
-  known[nlist - 1].next = NULL;
-
-  /* Pointer to last unique object.  */
-  tail = &known[nlist - 1];
-
-  /* Process each element of the search list, loading each of its
-     auxiliary objects and immediate dependencies.  Auxiliary objects
-     will be added in the list before the object itself and
-     dependencies will be appended to the list as we step through it.
-     This produces a flat, ordered list that represents a
-     breadth-first search of the dependency tree.
-
-     The whole process is complicated by the fact that we better
-     should use alloca for the temporary list elements.  But using
-     alloca means we cannot use recursive function calls.  */
-  errno_saved = errno;
-  errno_reason = 0;
-  errstring = NULL;
-  errno = 0;
-  name = NULL;
-  for (runp = known; runp; )
-    {
-      struct link_map *l = runp->map;
-      struct link_map **needed = NULL;
-      unsigned int nneeded = 0;
-
-      /* Unless otherwise stated, this object is handled.  */
-      runp->done = 1;
-
-      /* Allocate a temporary record to contain the references to the
-	 dependencies of this object.  */
-      if (l->l_searchlist.r_list == NULL && l->l_initfini == NULL
-	  && l != map && l->l_ldnum > 0)
-	needed = (struct link_map **) alloca (l->l_ldnum
-					      * sizeof (struct link_map *));
-
-      if (l->l_info[DT_NEEDED] || l->l_info[AUXTAG] || l->l_info[FILTERTAG])
-	{
-	  const char *strtab = (const void *) D_PTR (l, l_info[DT_STRTAB]);
-	  struct openaux_args args;
-	  struct list *orig;
-	  const ElfW(Dyn) *d;
-
-	  args.strtab = strtab;
-	  args.map = l;
-	  args.trace_mode = trace_mode;
-	  orig = runp;
-
-	  for (d = l->l_ld; d->d_tag != DT_NULL; ++d)
-	    if (__builtin_expect (d->d_tag, DT_NEEDED) == DT_NEEDED)
-	      {
-		/* Map in the needed object.  */
-		struct link_map *dep;
-		int err;
-
-		/* Recognize DSTs.  */
-		name = expand_dst (l, strtab + d->d_un.d_val, 0);
-		/* Store the tag in the argument structure.  */
-		args.name = name;
-
-		err = _dl_catch_error (&objname, &errstring, openaux, &args);
-		if (__builtin_expect (errstring != NULL, 0))
-		  {
-		    if (err)
-		      errno_reason = err;
-		    else
-		      errno_reason = -1;
-		    goto out;
-		  }
-		else
-		  dep = args.aux;
-
-		if (! dep->l_reserved)
-		  {
-		    /* Allocate new entry.  */
-		    struct list *newp;
-
-		    newp = alloca (sizeof (struct list));
-
-		    /* Append DEP to the list.  */
-		    newp->map = dep;
-		    newp->done = 0;
-		    newp->next = NULL;
-		    tail->next = newp;
-		    tail = newp;
-		    ++nlist;
-		    /* Set the mark bit that says it's already in the list.  */
-		    dep->l_reserved = 1;
-		  }
-
-		/* Remember this dependency.  */
-		if (needed != NULL)
-		  needed[nneeded++] = dep;
-	      }
-	    else if (d->d_tag == DT_AUXILIARY || d->d_tag == DT_FILTER)
-	      {
-		struct list *newp;
-
-		/* Recognize DSTs.  */
-		name = expand_dst (l, strtab + d->d_un.d_val,
-				   d->d_tag == DT_AUXILIARY);
-		/* Store the tag in the argument structure.  */
-		args.name = name;
-
-		if (d->d_tag == DT_AUXILIARY)
-		  {
-		    int err;
-
-		    /* Say that we are about to load an auxiliary library.  */
-		    if (__builtin_expect (_dl_debug_mask & DL_DEBUG_LIBS, 0))
-		      _dl_debug_printf ("load auxiliary object=%s"
-					" requested by file=%s\n", name,
-					l->l_name[0]
-					? l->l_name : _dl_argv[0]);
-
-		    /* We must be prepared that the addressed shared
-		       object is not available.  */
-		    err = _dl_catch_error (&objname, &errstring, openaux,
-					   &args);
-		    if (__builtin_expect (errstring != NULL, 0))
-		      {
-			/* We are not interested in the error message.  */
-			assert (errstring != NULL);
-			if (errstring != _dl_out_of_memory)
-			  free ((char *) errstring);
-
-			/* Simply ignore this error and continue the work.  */
-			continue;
-		      }
-		  }
-		else
-		  {
-		    int err;
-
-		    /* Say that we are about to load an auxiliary library.  */
-		    if (__builtin_expect (_dl_debug_mask & DL_DEBUG_LIBS, 0))
-		      _dl_debug_printf ("load filtered object=%s"
-					" requested by file=%s\n", name,
-					l->l_name[0]
-					? l->l_name : _dl_argv[0]);
-
-		    /* For filter objects the dependency must be available.  */
-		    err = _dl_catch_error (&objname, &errstring, openaux,
-					   &args);
-		    if (__builtin_expect (errstring != NULL, 0))
-		      {
-			if (err)
-			  errno_reason = err;
-			else
-			  errno_reason = -1;
-			goto out;
-		      }
-		  }
-
-		/* The auxiliary object is actually available.
-		   Incorporate the map in all the lists.  */
-
-		/* Allocate new entry.  This always has to be done.  */
-		newp = alloca (sizeof (struct list));
-
-		/* We want to insert the new map before the current one,
-		   but we have no back links.  So we copy the contents of
-		   the current entry over.  Note that ORIG and NEWP now
-		   have switched their meanings.  */
-		memcpy (newp, orig, sizeof (*newp));
-
-		/* Initialize new entry.  */
-		orig->done = 0;
-		orig->map = args.aux;
-
-		/* Remember this dependency.  */
-		if (needed != NULL)
-		  needed[nneeded++] = args.aux;
-
-		/* We must handle two situations here: the map is new,
-		   so we must add it in all three lists.  If the map
-		   is already known, we have two further possibilities:
-		   - if the object is before the current map in the
-		   search list, we do nothing.  It is already found
-		   early
-		   - if the object is after the current one, we must
-		   move it just before the current map to make sure
-		   the symbols are found early enough
-		*/
-		if (args.aux->l_reserved)
-		  {
-		    /* The object is already somewhere in the list.
-		       Locate it first.  */
-		    struct list *late;
-
-		    /* This object is already in the search list we
-		       are building.  Don't add a duplicate pointer.
-		       Just added by _dl_map_object.  */
-		    for (late = newp; late->next != NULL; late = late->next)
-		      if (late->next->map == args.aux)
-			break;
-
-		    if (late->next != NULL)
-		      {
-			/* The object is somewhere behind the current
-			   position in the search path.  We have to
-			   move it to this earlier position.  */
-			orig->next = newp;
-
-			/* Now remove the later entry from the list
-			   and adjust the tail pointer.  */
-			if (tail == late->next)
-			  tail = late;
-			late->next = late->next->next;
-
-			/* We must move the object earlier in the chain.  */
-			if (args.aux->l_prev != NULL)
-			  args.aux->l_prev->l_next = args.aux->l_next;
-			if (args.aux->l_next != NULL)
-			  args.aux->l_next->l_prev = args.aux->l_prev;
-
-			args.aux->l_prev = newp->map->l_prev;
-			newp->map->l_prev = args.aux;
-			if (args.aux->l_prev != NULL)
-			  args.aux->l_prev->l_next = args.aux;
-			args.aux->l_next = newp->map;
-		      }
-		    else
-		      {
-			/* The object must be somewhere earlier in the
-			   list.  Undo to the current list element what
-			   we did above.  */
-			memcpy (orig, newp, sizeof (*newp));
-			continue;
-		      }
-		  }
-		else
-		  {
-		    /* This is easy.  We just add the symbol right here.  */
-		    orig->next = newp;
-		    ++nlist;
-		    /* Set the mark bit that says it's already in the list.  */
-		    args.aux->l_reserved = 1;
-
-		    /* The only problem is that in the double linked
-		       list of all objects we don't have this new
-		       object at the correct place.  Correct this here.  */
-		    if (args.aux->l_prev)
-		      args.aux->l_prev->l_next = args.aux->l_next;
-		    if (args.aux->l_next)
-		      args.aux->l_next->l_prev = args.aux->l_prev;
-
-		    args.aux->l_prev = newp->map->l_prev;
-		    newp->map->l_prev = args.aux;
-		    if (args.aux->l_prev != NULL)
-		      args.aux->l_prev->l_next = args.aux;
-		    args.aux->l_next = newp->map;
-		  }
-
-		/* Move the tail pointer if necessary.  */
-		if (orig == tail)
-		  tail = newp;
-
-		/* Move on the insert point.  */
-		orig = newp;
-	      }
-	}
-
-      /* Terminate the list of dependencies and store the array address.  */
-      if (needed != NULL)
-	{
-	  needed[nneeded++] = NULL;
-
-	  l->l_initfini = (struct link_map **)
-	    malloc ((nneeded + 1) * sizeof needed[0]);
-	  if (l->l_initfini == NULL)
-	    _dl_signal_error (ENOMEM, map->l_name, NULL,
-			      N_("cannot allocate dependency list"));
-	  l->l_initfini[0] = l;
-	  memcpy (&l->l_initfini[1], needed, nneeded * sizeof needed[0]);
-	}
-
-      /* If we have no auxiliary objects just go on to the next map.  */
-      if (runp->done)
-	do
-	  runp = runp->next;
-	while (runp != NULL && runp->done);
-    }
-
- out:
-  if (errno == 0 && errno_saved != 0)
-    __set_errno (errno_saved);
-
-  if (map->l_initfini != NULL && map->l_type == lt_loaded)
-    {
-      /* This object was previously loaded as a dependency and we have
-	 a separate l_initfini list.  We don't need it anymore.  */
-      assert (map->l_searchlist.r_list == NULL);
-      free (map->l_initfini);
-    }
-
-  /* Store the search list we built in the object.  It will be used for
-     searches in the scope of this object.  */
-  map->l_initfini =
-    (struct link_map **) malloc ((2 * nlist + 1)
-				 * sizeof (struct link_map *));
-  if (map->l_initfini == NULL)
-    _dl_signal_error (ENOMEM, map->l_name, NULL,
-		      N_("cannot allocate symbol search list"));
-
-
-  map->l_searchlist.r_list = &map->l_initfini[nlist + 1];
-  map->l_searchlist.r_nlist = nlist;
-
-  for (nlist = 0, runp = known; runp; runp = runp->next)
-    {
-      if (__builtin_expect (trace_mode, 0) && runp->map->l_faked)
-	/* This can happen when we trace the loading.  */
-	--map->l_searchlist.r_nlist;
-      else
-	map->l_searchlist.r_list[nlist++] = runp->map;
-
-      /* Now clear all the mark bits we set in the objects on the search list
-	 to avoid duplicates, so the next call starts fresh.  */
-      runp->map->l_reserved = 0;
-    }
-
-  /* Maybe we can remove some relocation dependencies now.  */
-  assert (map->l_searchlist.r_list[0] == map);
-  for (i = 0; i < map->l_reldepsact; ++i)
-    {
-      unsigned int j;
-
-      for (j = 1; j < nlist; ++j)
-	if (map->l_searchlist.r_list[j] == map->l_reldeps[i])
-	  {
-	    /* A direct or transitive dependency is also on the list
-	       of relocation dependencies.  Remove the latter.  */
-	    --map->l_reldeps[i]->l_opencount;
-
-	    for (j = i + 1; j < map->l_reldepsact; ++j)
-	      map->l_reldeps[j - 1] = map->l_reldeps[j];
-
-	    --map->l_reldepsact;
-
-	    /* Account for the '++i' performed by the 'for'.  */
-	    --i;
-	    break;
-	  }
-    }
-
-  /* Now determine the order in which the initialization has to happen.  */
-  memcpy (map->l_initfini, map->l_searchlist.r_list,
-	  nlist * sizeof (struct link_map *));
-  /* We can skip looking for the binary itself which is at the front
-     of the search list.  Look through the list backward so that circular
-     dependencies are not changing the order.  */
-  for (i = 1; i < nlist; ++i)
-    {
-      struct link_map *l = map->l_searchlist.r_list[i];
-      unsigned int j;
-      unsigned int k;
-
-      /* Find the place in the initfini list where the map is currently
-	 located.  */
-      for (j = 1; map->l_initfini[j] != l; ++j)
-	;
-
-      /* Find all object for which the current one is a dependency and
-	 move the found object (if necessary) in front.  */
-      for (k = j + 1; k < nlist; ++k)
-	{
-	  struct link_map **runp;
-
-	  runp = map->l_initfini[k]->l_initfini;
-	  if (runp != NULL)
-	    {
-	      while (*runp != NULL)
-		if (__builtin_expect (*runp++ == l, 0))
-		  {
-		    struct link_map *here = map->l_initfini[k];
-
-		    /* Move it now.  */
-		    memmove (&map->l_initfini[j] + 1,
-			     &map->l_initfini[j],
-			     (k - j) * sizeof (struct link_map *));
-		    map->l_initfini[j] = here;
-
-		    break;
-		  }
-	    }
-	}
-    }
-  /* Terminate the list of dependencies.  */
-  map->l_initfini[nlist] = NULL;
-
-  if (errno_reason)
-    _dl_signal_error (errno_reason == -1 ? 0 : errno_reason,
-		      objname, NULL, errstring);
-}
diff --git a/newlib/libc/sys/linux/dl/dl-dst.h b/newlib/libc/sys/linux/dl/dl-dst.h
deleted file mode 100644
index ccebf92..0000000
--- a/newlib/libc/sys/linux/dl/dl-dst.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Handling of dynamic sring tokens.
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Determine the number of DST elements in the name.  Only if IS_PATH is
-   nonzero paths are recognized (i.e., multiple, ':' separated filenames).  */
-#define DL_DST_COUNT(name, is_path) \
-  ({									      \
-    size_t __cnt = 0;							      \
-    const char *__sf = strchr (name, '$');				      \
-									      \
-    if (__builtin_expect (__sf != NULL, 0))				      \
-      __cnt = _dl_dst_count (__sf, is_path);				      \
-									      \
-    __cnt; })
-
-/* Prototype for used function.  */
-extern size_t _dl_dst_count (const char *name, int is_path);
-
-
-/* Guess from the number of DSTs the length of the result string.  */
-#define DL_DST_REQUIRED(l, name, len, cnt) 1024
-
-/* Perform the DST substitution.  */
-#define DL_DST_SUBSTITUTE(l, name, res, is_path) \
-  _dl_dst_substitute (l, name, res, is_path)
-
-/* Prototype for used function.  */
-extern char *_dl_dst_substitute (struct link_map *l, const char *name,
-				 char *result, int is_path);
diff --git a/newlib/libc/sys/linux/dl/dl-error.c b/newlib/libc/sys/linux/dl/dl-error.c
deleted file mode 100644
index 9c0f55f..0000000
--- a/newlib/libc/sys/linux/dl/dl-error.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/* Error handling for runtime dynamic linker.
-   Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <libintl.h>
-#include <setjmp.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ldsodefs.h>
-#include <sys/libc-tsd.h>
-
-/* This structure communicates state between _dl_catch_error and
-   _dl_signal_error.  */
-struct catch
-  {
-    const char *objname;	/* Object/File name.  */
-    const char *errstring;	/* Error detail filled in here.  */
-    jmp_buf env;		/* longjmp here on error.  */
-  };
-
-/* Multiple threads at once can use the `_dl_catch_error' function.  The
-   calls can come from `_dl_map_object_deps', `_dlerror_run', or from
-   any of the libc functionality which loads dynamic objects (NSS, iconv).
-   Therefore we have to be prepared to save the state in thread-local
-   memory.  */
-
-__libc_tsd_define (static, DL_ERROR)
-#define tsd_getspecific()	__libc_tsd_get (DL_ERROR)
-#define tsd_setspecific(data)	__libc_tsd_set (DL_ERROR, (data))
-
-
-/* This message we return as a last resort.  We define the string in a
-   variable since we have to avoid freeing it and so have to enable
-   a pointer comparison.  See below and in dlfcn/dlerror.c.  */
-const char _dl_out_of_memory[] = "out of memory";
-
-
-/* This points to a function which is called when an continuable error is
-   received.  Unlike the handling of `catch' this function may return.
-   The arguments will be the `errstring' and `objname'.
-
-   Since this functionality is not used in normal programs (only in ld.so)
-   we do not care about multi-threaded programs here.  We keep this as a
-   global variable.  */
-static receiver_fct receiver;
-
-
-void
-internal_function
-_dl_signal_error (int errcode, const char *objname, const char *occation,
-		  const char *errstring)
-{
-  struct catch *lcatch;
-
-  if (! errstring)
-    errstring = N_("DYNAMIC LINKER BUG!!!");
-
-  lcatch = tsd_getspecific ();
-  if (objname == NULL)
-    objname = "";
-  if (lcatch != NULL)
-    {
-      /* We are inside _dl_catch_error.  Return to it.  We have to
-	 duplicate the error string since it might be allocated on the
-	 stack.  The object name is always a string constant.  */
-      size_t len_objname = strlen (objname) + 1;
-      size_t len_errstring = strlen (errstring) + 1;
-
-      lcatch->errstring = (char *) malloc (len_objname + len_errstring);
-      if (lcatch->errstring != NULL)
-        {
-          char *tmp;
-          /* Make a copy of the object file name and the error string.  */
-          tmp = memcpy ((char *) lcatch->errstring,
-                           errstring, len_errstring);
-          tmp += len_errstring;
-          lcatch->objname = memcpy (tmp,
-				  objname, len_objname);
-        }
-      else
-	{
-	  /* This is better than nothing.  */
-	  lcatch->objname = "";
-	  lcatch->errstring = _dl_out_of_memory;
-	}
-      longjmp (lcatch->env, errcode ?: -1);
-    }
-  else
-    {
-      /* Lossage while resolving the program's own symbols is always fatal.  */
-      char buffer[1024];
-      _dl_fatal_printf ("%s: %s: %s%s%s%s%s\n",
-			_dl_argv[0] ?: "<program name unknown>",
-			occation ?: N_("error while loading shared libraries"),
-			objname, *objname ? ": " : "",
-			errstring, errcode ? ": " : "",
-			(errcode
-			 ? __strerror_r (errcode, buffer, sizeof buffer)
-			 : ""));
-    }
-}
-
-
-void
-internal_function
-_dl_signal_cerror (int errcode, const char *objname, const char *occation,
-		   const char *errstring)
-{
-  if (receiver)
-    {
-      /* We are inside _dl_receive_error.  Call the user supplied
-	 handler and resume the work.  The receiver will still be
-	 installed.  */
-      (*receiver) (errcode, objname, errstring);
-    }
-  else
-    _dl_signal_error (errcode, objname, occation, errstring);
-}
-
-
-int
-internal_function
-_dl_catch_error (const char **objname, const char **errstring,
-		 void (*operate) (void *), void *args)
-{
-  int errcode;
-  struct catch *volatile old;
-  struct catch c;
-  /* We need not handle `receiver' since setting a `catch' is handled
-     before it.  */
-
-  /* Some systems (e.g., SPARC) handle constructors to local variables
-     inefficient.  So we initialize `c' by hand.  */
-  c.errstring = NULL;
-
-  old = tsd_getspecific ();
-  errcode = setjmp (c.env);
-  if (__builtin_expect (errcode, 0) == 0)
-    {
-      tsd_setspecific (&c);
-      (*operate) (args);
-      tsd_setspecific (old);
-      *objname = NULL;
-      *errstring = NULL;
-      return 0;
-    }
-
-  /* We get here only if we longjmp'd out of OPERATE.  */
-  tsd_setspecific (old);
-  *objname = c.objname;
-  *errstring = c.errstring;
-  return errcode == -1 ? 0 : errcode;
-}
-
-void
-internal_function
-_dl_receive_error (receiver_fct fct, void (*operate) (void *), void *args)
-{
-  struct catch *old_catch;
-  receiver_fct old_receiver;
-
-  old_catch = tsd_getspecific ();
-  old_receiver = receiver;
-
-  /* Set the new values.  */
-  tsd_setspecific (NULL);
-  receiver = fct;
-
-  (*operate) (args);
-
-  tsd_setspecific (old_catch);
-  receiver = old_receiver;
-}
diff --git a/newlib/libc/sys/linux/dl/dl-fini.c b/newlib/libc/sys/linux/dl/dl-fini.c
deleted file mode 100644
index fc4f4b6..0000000
--- a/newlib/libc/sys/linux/dl/dl-fini.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* Call the termination functions of loaded shared objects.
-   Copyright (C) 1995,96,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <alloca.h>
-#include <assert.h>
-#include <string.h>
-#include <ldsodefs.h>
-
-
-/* Type of the constructor functions.  */
-typedef void (*fini_t) (void);
-
-
-void
-internal_function
-_dl_fini (void)
-{
-  /* Lots of fun ahead.  We have to call the destructors for all still
-     loaded objects.  The problem is that the ELF specification now
-     demands that dependencies between the modules are taken into account.
-     I.e., the destructor for a module is called before the ones for any
-     of its dependencies.
-
-     To make things more complicated, we cannot simply use the reverse
-     order of the constructors.  Since the user might have loaded objects
-     using `dlopen' there are possibly several other modules with its
-     dependencies to be taken into account.  Therefore we have to start
-     determining the order of the modules once again from the beginning.  */
-  unsigned int i;
-  struct link_map *l;
-  struct link_map **maps;
-
-  /* XXX Could it be (in static binaries) that there is no object loaded?  */
-  assert (_dl_nloaded > 0);
-
-  /* Now we can allocate an array to hold all the pointers and copy
-     the pointers in.  */
-  maps = (struct link_map **) alloca (_dl_nloaded
-				      * sizeof (struct link_map *));
-  for (l = _dl_loaded, i = 0; l != NULL; l = l->l_next)
-    {
-      assert (i < _dl_nloaded);
-
-      maps[i++] = l;
-
-      /* Bump l_opencount of all objects so that they are not dlclose()ed
-	 from underneath us.  */
-      ++l->l_opencount;
-    }
-  assert (i == _dl_nloaded);
-
-  /* Now we have to do the sorting.  */
-  for (l = _dl_loaded->l_next; l != NULL; l = l->l_next)
-    {
-      unsigned int j;
-      unsigned int k;
-
-      /* Find the place in the `maps' array.  */
-      for (j = 1; maps[j] != l; ++j)
-	;
-
-      /* Find all object for which the current one is a dependency and
-	 move the found object (if necessary) in front.  */
-      for (k = j + 1; k < _dl_nloaded; ++k)
-	{
-	  struct link_map **runp;
-
-	  runp = maps[k]->l_initfini;
-	  if (runp != NULL)
-	    {
-	      while (*runp != NULL)
-		if (*runp == l)
-		  {
-		    struct link_map *here = maps[k];
-
-		    /* Move it now.  */
-		    memmove (&maps[j] + 1,
-			     &maps[j],
-			     (k - j) * sizeof (struct link_map *));
-		    maps[j++] = here;
-
-		    break;
-		  }
-		else
-		  ++runp;
-	    }
-
-	  if (__builtin_expect (maps[k]->l_reldeps != NULL, 0))
-	    {
-	      unsigned int m = maps[k]->l_reldepsact;
-	      struct link_map **relmaps = maps[k]->l_reldeps;
-
-	      while (m-- > 0)
-		{
-		  if (relmaps[m] == l)
-		    {
-		      struct link_map *here = maps[k];
-
-		      /* Move it now.  */
-		      memmove (&maps[j] + 1,
-			       &maps[j],
-			       (k - j) * sizeof (struct link_map *));
-		      maps[j] = here;
-
-		      break;
-		    }
-
-		}
-	    }
-	}
-    }
-
-  /* `maps' now contains the objects in the right order.  Now call the
-     destructors.  We have to process this array from the front.  */
-  for (i = 0; i < _dl_nloaded; ++i)
-    {
-      l = maps[i];
-
-      if (l->l_init_called)
-	{
-	  /* Make sure nothing happens if we are called twice.  */
-	  l->l_init_called = 0;
-
-	  /* Don't call the destructors for objects we are not supposed to.  */
-	  if (l->l_name[0] == '\0' && l->l_type == lt_executable)
-	    continue;
-
-	  /* Is there a destructor function?  */
-	  if (l->l_info[DT_FINI_ARRAY] == NULL && l->l_info[DT_FINI] == NULL)
-	    continue;
-
-	  /* When debugging print a message first.  */
-	  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_IMPCALLS, 0))
-	    _dl_debug_printf ("\ncalling fini: %s\n\n",
-			      l->l_name[0] ? l->l_name : _dl_argv[0]);
-
-	  /* First see whether an array is given.  */
-	  if (l->l_info[DT_FINI_ARRAY] != NULL)
-	    {
-	      ElfW(Addr) *array =
-		(ElfW(Addr) *) (l->l_addr
-				+ l->l_info[DT_FINI_ARRAY]->d_un.d_ptr);
-	      unsigned int sz = (l->l_info[DT_FINI_ARRAYSZ]->d_un.d_val
-				 / sizeof (ElfW(Addr)));
-	      unsigned int cnt;
-
-	      for (cnt = 0; cnt < sz; ++cnt)
-		((fini_t) (l->l_addr + array[cnt])) ();
-	    }
-
-	  /* Next try the old-style destructor.  */
-	  if (l->l_info[DT_FINI] != NULL)
-	    ((fini_t) DL_DT_FINI_ADDRESS (l, l->l_addr + l->l_info[DT_FINI]->d_un.d_ptr)) ();
-	}
-    }
-}
diff --git a/newlib/libc/sys/linux/dl/dl-init.c b/newlib/libc/sys/linux/dl/dl-init.c
deleted file mode 100644
index 5448b03..0000000
--- a/newlib/libc/sys/linux/dl/dl-init.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Return the next shared object initializer function not yet run.
-   Copyright (C) 1995,1996,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stddef.h>
-#include <ldsodefs.h>
-
-
-/* Type of the initializer.  */
-typedef void (*init_t) (int, char **, char **);
-
-/* Flag, nonzero during startup phase.  */
-extern int _dl_starting_up;
-
-/* The object to be initialized first.  */
-extern struct link_map *_dl_initfirst;
-
-
-static void
-call_init (struct link_map *l, int argc, char **argv, char **env)
-{
-  if (l->l_init_called)
-    /* This object is all done.  */
-    return;
-
-  /* Avoid handling this constructor again in case we have a circular
-     dependency.  */
-  l->l_init_called = 1;
-
-  /* Check for object which constructors we do not run here.  */
-  if (__builtin_expect (l->l_name[0], 'a') == '\0'
-      && l->l_type == lt_executable)
-    return;
-
-  /* Are there any constructors?  */
-  if (l->l_info[DT_INIT] == NULL
-      && __builtin_expect (l->l_info[DT_INIT_ARRAY] == NULL, 1))
-    return;
-
-  /* Print a debug message if wanted.  */
-  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_IMPCALLS, 0))
-    _dl_debug_printf ("\ncalling init: %s\n\n",
-		      l->l_name[0] ? l->l_name : _dl_argv[0]);
-
-  /* Now run the local constructors.  There are two forms of them:
-     - the one named by DT_INIT
-     - the others in the DT_INIT_ARRAY.
-  */
-  if (l->l_info[DT_INIT] != NULL)
-    {
-      init_t init = (init_t) DL_DT_INIT_ADDRESS
-	(l, l->l_addr + l->l_info[DT_INIT]->d_un.d_ptr);
-
-      /* Call the function.  */
-      init (argc, argv, env);
-    }
-
-  /* Next see whether there is an array with initialization functions.  */
-  if (l->l_info[DT_INIT_ARRAY] != NULL)
-    {
-      unsigned int j;
-      unsigned int jm;
-      ElfW(Addr) *addrs;
-
-      jm = l->l_info[DT_INIT_ARRAYSZ]->d_un.d_val / sizeof (ElfW(Addr));
-
-      addrs = (ElfW(Addr) *) (l->l_info[DT_INIT_ARRAY]->d_un.d_ptr
-			      + l->l_addr);
-      for (j = 0; j < jm; ++j)
-	((init_t) addrs[j]) (argc, argv, env);
-    }
-}
-
-
-void
-internal_function
-_dl_init (struct link_map *main_map, int argc, char **argv, char **env)
-{
-  ElfW(Dyn) *preinit_array = main_map->l_info[DT_PREINIT_ARRAY];
-  struct r_debug *r;
-  unsigned int i;
-
-  if (__builtin_expect (_dl_initfirst != NULL, 0))
-    {
-      call_init (_dl_initfirst, argc, argv, env);
-      _dl_initfirst = NULL;
-    }
-
-  /* Don't do anything if there is no preinit array.  */
-  if (__builtin_expect (preinit_array != NULL, 0)
-      && (i = preinit_array->d_un.d_val / sizeof (ElfW(Addr))) > 0)
-    {
-      ElfW(Addr) *addrs;
-      unsigned int cnt;
-
-      if (__builtin_expect (_dl_debug_mask & DL_DEBUG_IMPCALLS, 0))
-	_dl_debug_printf ("\ncalling preinit: %s\n\n",
-			  main_map->l_name[0]
-			  ? main_map->l_name : _dl_argv[0]);
-
-      addrs = (ElfW(Addr) *) (main_map->l_info[DT_PREINIT_ARRAY]->d_un.d_ptr
-			      + main_map->l_addr);
-      for (cnt = 0; cnt < i; ++cnt)
-	((init_t) addrs[cnt]) (argc, argv, env);
-    }
-
-  /* Notify the debugger we have added some objects.  We need to call
-     _dl_debug_initialize in a static program in case dynamic linking has
-     not been used before.  */
-  r = _dl_debug_initialize (0);
-  r->r_state = RT_ADD;
-  _dl_debug_state ();
-
-  /* Stupid users forced the ELF specification to be changed.  It now
-     says that the dynamic loader is responsible for determining the
-     order in which the constructors have to run.  The constructors
-     for all dependencies of an object must run before the constructor
-     for the object itself.  Circular dependencies are left unspecified.
-
-     This is highly questionable since it puts the burden on the dynamic
-     loader which has to find the dependencies at runtime instead of
-     letting the user do it right.  Stupidity rules!  */
-
-  i = main_map->l_searchlist.r_nlist;
-  while (i-- > 0)
-    call_init (main_map->l_initfini[i], argc, argv, env);
-
-  /* Notify the debugger all new objects are now ready to go.  */
-  r->r_state = RT_CONSISTENT;
-  _dl_debug_state ();
-
-  /* Finished starting up.  */
-  _dl_starting_up = 0;
-}
diff --git a/newlib/libc/sys/linux/dl/dl-iteratephdr.c b/newlib/libc/sys/linux/dl/dl-iteratephdr.c
deleted file mode 100644
index a39a493..0000000
--- a/newlib/libc/sys/linux/dl/dl-iteratephdr.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Get loaded objects program headers.
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Jakub Jelinek <jakub@redhat.com>, 2001.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <errno.h>
-#include <ldsodefs.h>
-#include <stddef.h>
-#include <bits/libc-lock.h>
-
-int
-__dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
-				    size_t size, void *data), void *data)
-{
-  struct link_map *l;
-  struct dl_phdr_info info;
-  int ret = 0;
-
-  /* Make sure we are alone.  */
-#ifdef HAVE_DD_LOCK
-    __lock_acquire(_dl_load_lock);
-#endif
-
-
-  for (l = _dl_loaded; l != NULL; l = l->l_next)
-    {
-      /* Skip the dynamic linker.  */
-      if (l->l_phdr == NULL)
-	continue;
-      info.dlpi_addr = l->l_addr;
-      info.dlpi_name = l->l_name;
-      info.dlpi_phdr = l->l_phdr;
-      info.dlpi_phnum = l->l_phnum;
-      ret = callback (&info, sizeof (struct dl_phdr_info), data);
-      if (ret)
-	break;
-    }
-
-  /* Release the lock.  */
-#ifdef HAVE_DD_LOCK
-    __lock_release(_dl_load_lock);
-#endif
-
-
-  return ret;
-}
-
-#ifdef SHARED
-weak_alias (__dl_iterate_phdr, dl_iterate_phdr);
-#endif
diff --git a/newlib/libc/sys/linux/dl/dl-libc.c b/newlib/libc/sys/linux/dl/dl-libc.c
deleted file mode 100644
index c83448d..0000000
--- a/newlib/libc/sys/linux/dl/dl-libc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Handle loading and unloading shared objects for internal libc purposes.
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Zack Weinberg <zack@rabi.columbia.edu>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <dlfcn.h>
-#include <stdlib.h>
-#include <ldsodefs.h>
-
-/* The purpose of this file is to provide wrappers around the dynamic
-   linker error mechanism (similar to dlopen() et al in libdl) which
-   are usable from within libc.  Generally we want to throw away the
-   string that dlerror() would return and just pass back a null pointer
-   for errors.  This also lets the rest of libc not know about the error
-   handling mechanism.
-
-   Much of this code came from gconv_dl.c with slight modifications. */
-
-static int
-internal_function
-dlerror_run (void (*operate) (void *), void *args)
-{
-  const char *objname;
-  const char *last_errstring = NULL;
-  int result;
-
-  (void) _dl_catch_error (&objname, &last_errstring, operate, args);
-
-  result = last_errstring != NULL;
-  if (result && last_errstring != _dl_out_of_memory)
-    free ((char *) last_errstring);
-
-  return result;
-}
-
-/* These functions are called by dlerror_run... */
-
-struct do_dlopen_args
-{
-  /* Argument to do_dlopen.  */
-  const char *name;
-
-  /* Return from do_dlopen.  */
-  struct link_map *map;
-};
-
-struct do_dlsym_args
-{
-  /* Arguments to do_dlsym.  */
-  struct link_map *map;
-  const char *name;
-
-  /* Return values of do_dlsym.  */
-  lookup_t loadbase;
-  const ElfW(Sym) *ref;
-};
-
-static void
-do_dlopen (void *ptr)
-{
-  struct do_dlopen_args *args = (struct do_dlopen_args *) ptr;
-  /* Open and relocate the shared object.  */
-  args->map = _dl_open (args->name, RTLD_LAZY, NULL);
-}
-
-static void
-do_dlsym (void *ptr)
-{
-  struct do_dlsym_args *args = (struct do_dlsym_args *) ptr;
-  args->ref = NULL;
-  args->loadbase = _dl_lookup_symbol (args->name, args->map, &args->ref,
-				      args->map->l_local_scope, 0, 1);
-}
-
-static void
-do_dlclose (void *ptr)
-{
-  _dl_close ((struct link_map *) ptr);
-}
-
-/* ... and these functions call dlerror_run. */
-
-void *
-__libc_dlopen (const char *__name)
-{
-  struct do_dlopen_args args;
-  args.name = __name;
-
-  return (dlerror_run (do_dlopen, &args) ? NULL : (void *) args.map);
-}
-
-void *
-__libc_dlsym (void *__map, const char *__name)
-{
-  struct do_dlsym_args args;
-  args.map = __map;
-  args.name = __name;
-
-  return (dlerror_run (do_dlsym, &args) ? NULL
-	  : (void *) (DL_SYMBOL_ADDRESS (args.loadbase, args.ref)));
-}
-
-int
-__libc_dlclose (void *__map)
-{
-  return dlerror_run (do_dlclose, __map);
-}
-
-
-static void
-free_mem (void)
-{
-  struct link_map *l;
-  struct r_search_path_elem *d;
-
-  /* Remove all search directories.  */
-  d = _dl_all_dirs;
-  while (d != _dl_init_all_dirs)
-    {
-      struct r_search_path_elem *old = d;
-      d = d->next;
-      free (old);
-    }
-
-  /* Remove all additional names added to the objects.  */
-  for (l = _dl_loaded; l != NULL; l = l->l_next)
-    {
-      struct libname_list *lnp = l->l_libname->next;
-
-      l->l_libname->next = NULL;
-
-      while (lnp != NULL)
-	{
-	  struct libname_list *old = lnp;
-	  lnp = lnp->next;
-	  if (! old->dont_free)
-	    free (old);
-	}
-    }
-}
-text_set_element (__libc_subfreeres, free_mem);
diff --git a/newlib/libc/sys/linux/dl/dl-librecon.h b/newlib/libc/sys/linux/dl/dl-librecon.h
deleted file mode 100644
index 3e39a32..0000000
--- a/newlib/libc/sys/linux/dl/dl-librecon.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Optional code to distinguish library flavours.
-   Copyright (C) 1998, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _DL_LIBRECON_H
-#define _DL_LIBRECON_H	1
-
-#define DISTINGUISH_LIB_VERSIONS \
-  do									      \
-    {									      \
-      /* We have to find out whether the binary is linked against	      \
-	 libc 5 or glibc.  We do this by looking at all the DT_NEEDED	      \
-	 entries.  If one is libc.so.5 this is a libc 5 linked binary.  */    \
-      if (_dl_loaded->l_info[DT_NEEDED])				      \
-	{								      \
-	  /* We have dependencies.  */					      \
-	  const ElfW(Dyn) *d;						      \
-	  const char *strtab;						      \
-									      \
-	  strtab = (const char *) D_PTR (_dl_loaded, l_info[DT_STRTAB]);      \
-									      \
-	  for (d = _dl_loaded->l_ld; d->d_tag != DT_NULL; ++d)		      \
-	    if (d->d_tag == DT_NEEDED					      \
-		&& strcmp (strtab + d->d_un.d_val, "libc.so.5") == 0)	      \
-	      break;							      \
-									      \
-	  /* We print a `5' or `6' depending on the outcome.  */	      \
-	  _dl_printf (d->d_tag != DT_NULL ? "5\n" : "6\n");		      \
-	}								      \
-    }									      \
-  while (0)
-
-/* Recognizing extra environment variables.  */
-#define EXTRA_LD_ENVVARS \
-  case 13:								      \
-    if (memcmp (envline, "ASSUME_KERNEL", 13) == 0)			      \
-      {									      \
-	unsigned long int i, j, osversion = 0;				      \
-	char *p = &envline[14], *q;					      \
-									      \
-	for (i = 0; i < 3; i++, p = q + 1)				      \
-	  {								      \
-	    j = __strtoul_internal (p, &q, 0, 0);			      \
-	    if (j >= 255 || p == q || (i < 2 && *q && *q != '.'))	      \
-	      {								      \
-		osversion = 0;						      \
-		break;							      \
-	      }								      \
-	    osversion |= j << (16 - 8 * i);				      \
-	    if (!*q)							      \
-	      break;							      \
-	  }								      \
-	if (osversion)							      \
-	  _dl_osversion = osversion;					      \
-	break;								      \
-      }									      \
-									      \
-  case 15:								      \
-    if (memcmp (envline, "LIBRARY_VERSION", 15) == 0)			      \
-      {									      \
-	_dl_correct_cache_id = envline[16] == '5' ? 2 : 3;		      \
-	break;								      \
-      }
-
-/* Extra unsecure variables.  The names are all stuffed in a single
-   string which means they have to be terminated with a '\0' explicitly.  */
-#define EXTRA_UNSECURE_ENVVARS \
-  "LD_AOUT_LIBRARY_PATH\0"						      \
-  "LD_AOUT_PRELOAD\0"
-
-#endif /* dl-librecon.h */
diff --git a/newlib/libc/sys/linux/dl/dl-load.c b/newlib/libc/sys/linux/dl/dl-load.c
deleted file mode 100644
index 4e32d60..0000000
--- a/newlib/libc/sys/linux/dl/dl-load.c
+++ /dev/null
@@ -1,1830 +0,0 @@
-/* Map in a shared object's segments from the file.
-   Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <elf.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <libintl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <ldsodefs.h>
-#include <sys/mman.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include "dynamic-link.h"
-#include <abi-tag.h>
-#include <dl-osinfo.h>
-
-#include <dl-dst.h>
-
-/* On some systems, no flag bits are given to specify file mapping.  */
-#ifndef MAP_FILE
-# define MAP_FILE	0
-#endif
-
-/* The right way to map in the shared library files is MAP_COPY, which
-   makes a virtual copy of the data at the time of the mmap call; this
-   guarantees the mapped pages will be consistent even if the file is
-   overwritten.  Some losing VM systems like Linux's lack MAP_COPY.  All we
-   get is MAP_PRIVATE, which copies each page when it is modified; this
-   means if the file is overwritten, we may at some point get some pages
-   from the new version after starting with pages from the old version.  */
-#ifndef MAP_COPY
-# define MAP_COPY	MAP_PRIVATE
-#endif
-
-/* Some systems link their relocatable objects for another base address
-   than 0.  We want to know the base address for these such that we can
-   subtract this address from the segment addresses during mapping.
-   This results in a more efficient address space usage.  Defaults to
-   zero for almost all systems.  */
-#ifndef MAP_BASE_ADDR
-# define MAP_BASE_ADDR(l)	0
-#endif
-
-
-#include <endian.h>
-#if BYTE_ORDER == BIG_ENDIAN
-# define byteorder ELFDATA2MSB
-#elif BYTE_ORDER == LITTLE_ENDIAN
-# define byteorder ELFDATA2LSB
-#else
-# error "Unknown BYTE_ORDER " BYTE_ORDER
-# define byteorder ELFDATANONE
-#endif
-
-#define STRING(x) __STRING (x)
-
-#ifdef MAP_ANON
-/* The fd is not examined when using MAP_ANON.  */
-# define ANONFD -1
-#else
-int _dl_zerofd = -1;
-# define ANONFD _dl_zerofd
-#endif
-
-/* Handle situations where we have a preferred location in memory for
-   the shared objects.  */
-#ifdef ELF_PREFERRED_ADDRESS_DATA
-ELF_PREFERRED_ADDRESS_DATA;
-#endif
-#ifndef ELF_PREFERRED_ADDRESS
-# define ELF_PREFERRED_ADDRESS(loader, maplength, mapstartpref) (mapstartpref)
-#endif
-#ifndef ELF_FIXED_ADDRESS
-# define ELF_FIXED_ADDRESS(loader, mapstart) ((void) 0)
-#endif
-
-/* Type for the buffer we put the ELF header and hopefully the program
-   header.  This buffer does not really have to be too large.  In most
-   cases the program header follows the ELF header directly.  If this
-   is not the case all bets are off and we can make the header arbitrarily
-   large and still won't get it read.  This means the only question is
-   how large are the ELF and program header combined.  The ELF header
-   in 64-bit files is 56 bytes long.  Each program header entry is again
-   56 bytes long.  I.e., even with a file which has 17 program header
-   entries we only have to read 1kB.  And 17 program header entries is
-   plenty, normal files have < 10.  If this heuristic should really fail
-   for some file the code in `_dl_map_object_from_fd' knows how to
-   recover.  */
-struct filebuf
-{
-  ssize_t len;
-  char buf[1024];
-};
-
-size_t _dl_pagesize;
-
-unsigned int _dl_osversion;
-
-int _dl_clktck;
-
-extern const char *_dl_platform;
-extern size_t _dl_platformlen;
-
-/* The object to be initialized first.  */
-struct link_map *_dl_initfirst;
-
-/* This is the decomposed LD_LIBRARY_PATH search path.  */
-static struct r_search_path_struct env_path_list;
-
-/* List of the hardware capabilities we might end up using.  */
-static const struct r_strlenpair *capstr;
-static size_t ncapstr;
-static size_t max_capstrlen;
-
-
-/* Get the generated information about the trusted directories.  */
-#include "trusted-dirs.h"
-
-static const char system_dirs[] = SYSTEM_DIRS;
-static const size_t system_dirs_len[] =
-{
-  SYSTEM_DIRS_LEN
-};
-#define nsystem_dirs_len \
-  (sizeof (system_dirs_len) / sizeof (system_dirs_len[0]))
-
-
-/* Local version of `strdup' function.  */
-static inline char *
-local_strdup (const char *s)
-{
-  size_t len = strlen (s) + 1;
-  void *new = malloc (len);
-
-  if (new == NULL)
-    return NULL;
-
-  return (char *) memcpy (new, s, len);
-}
-
-
-static size_t
-is_dst (const char *start, const char *name, const char *str, size_t cmplen,
-	int is_path, int secure)
-{
-  size_t len;
-
-  if (strncmp (name, str, cmplen) == 0)
-    len = cmplen + 1;
-  else if (strncmp (name, str + 1, cmplen - 2) == 0
-	   && (name[cmplen - 2] == '\0' || name[cmplen - 2] == '/'
-	       || (is_path && name[cmplen - 2] == ':')))
-    len = cmplen - 1;
-  else
-    return 0;
-
-  if (__builtin_expect (secure, 0)
-      && ((name[len - 1] != '\0' && (!is_path || name[len - 1] != ':'))
-	  || (name != start + 1 && (!is_path || name[-2] != ':'))))
-    return 0;
-
-  return len;
-}
-
-
-size_t
-_dl_dst_count (const char *name, int is_path)
-{
-  const char *const start = name;
-  size_t cnt = 0;
-
-  do
-    {
-      size_t len = 1;
-
-      /* $ORIGIN is not expanded for SUID/GUID programs (except if it
-	 is $ORIGIN alone) and it must always appear first in path.
-
-	 Note that it is no bug that the string in the second and
-	 fourth `strncmp' call is longer than the sequence which is
-	 actually tested.  */
-      if ((len = is_dst (start, name + 1, "{ORIGIN}", 8, is_path,
-			 0)) != 0
-	  || ((len = is_dst (start, name + 1, "{PLATFORM}", 10, is_path, 0))
-	      != 0))
-	++cnt;
-
-      name = strchr (name + len, '$');
-    }
-  while (name != NULL);
-
-  return cnt;
-}
-
-
-char *
-_dl_dst_substitute (struct link_map *l, const char *name, char *result,
-		    int is_path)
-{
-  const char *const start = name;
-  char *last_elem, *wp;
-
-  /* Now fill the result path.  While copying over the string we keep
-     track of the start of the last path element.  When we come accross
-     a DST we copy over the value or (if the value is not available)
-     leave the entire path element out.  */
-  last_elem = wp = result;
-
-  do
-    {
-      if (__builtin_expect (*name == '$', 0))
-	{
-	  const char *repl = NULL;
-	  size_t len = 1;
-
-	  /* Note that it is no bug that the string in the second and
-	     fourth `strncmp' call is longer than the sequence which
-	     is actually tested.  */
-	  if ((len = is_dst (start, name + 1, "{ORIGIN}", 8, is_path,
-			     0)) != 0)
-	    repl = l->l_origin;
-	  else if ((len = is_dst (start, name + 1, "{PLATFORM}", 10, is_path,
-				  0)) != 0)
-	    repl = _dl_platform;
-
-	  if (repl != NULL && repl != (const char *) -1)
-	    {
-	      wp = strcpy (wp, repl);
-              wp += strlen (repl);
-	      name += len;
-	    }
-	  else if (len > 1)
-	    {
-	      /* We cannot use this path element, the value of the
-		 replacement is unknown.  */
-	      wp = last_elem;
-	      name += len;
-	      while (*name != '\0' && (!is_path || *name != ':'))
-		++name;
-	    }
-	  else
-	    /* No DST we recognize.  */
-	    *wp++ = *name++;
-	}
-      else
-	{
-	  *wp++ = *name++;
-	  if (is_path && *name == ':')
-	    last_elem = wp;
-	}
-    }
-  while (*name != '\0');
-
-  *wp = '\0';
-
-  return result;
-}
-
-
-/* Return copy of argument with all recognized dynamic string tokens
-   ($ORIGIN and $PLATFORM for now) replaced.  On some platforms it
-   might not be possible to determine the path from which the object
-   belonging to the map is loaded.  In this case the path element
-   containing $ORIGIN is left out.  */
-static char *
-expand_dynamic_string_token (struct link_map *l, const char *s)
-{
-  /* We make two runs over the string.  First we determine how large the
-     resulting string is and then we copy it over.  Since this is now
-     frequently executed operation we are looking here not for performance
-     but rather for code size.  */
-  size_t cnt;
-  size_t total;
-  char *result;
-
-  /* Determine the number of DST elements.  */
-  cnt = DL_DST_COUNT (s, 1);
-
-  /* If we do not have to replace anything simply copy the string.  */
-  if (__builtin_expect (cnt, 0) == 0)
-    return local_strdup (s);
-
-  /* Determine the length of the substituted string.  */
-  total = DL_DST_REQUIRED (l, s, strlen (s), cnt);
-
-  /* Allocate the necessary memory.  */
-  result = (char *) malloc (total + 1);
-  if (result == NULL)
-    return NULL;
-
-  return DL_DST_SUBSTITUTE (l, s, result, 1);
-}
-
-
-/* Add `name' to the list of names for a particular shared object.
-   `name' is expected to have been allocated with malloc and will
-   be freed if the shared object already has this name.
-   Returns false if the object already had this name.  */
-static void
-internal_function
-add_name_to_object (struct link_map *l, const char *name)
-{
-  struct libname_list *lnp, *lastp;
-  struct libname_list *newname;
-  size_t name_len;
-
-  lastp = NULL;
-  for (lnp = l->l_libname; lnp != NULL; lastp = lnp, lnp = lnp->next)
-    if (strcmp (name, lnp->name) == 0)
-      return;
-
-  name_len = strlen (name) + 1;
-  newname = (struct libname_list *) malloc (sizeof *newname + name_len);
-  if (newname == NULL)
-    {
-      /* No more memory.  */
-      _dl_signal_error (ENOMEM, name, NULL, N_("cannot allocate name record"));
-      return;
-    }
-  /* The object should have a libname set from _dl_new_object.  */
-  assert (lastp != NULL);
-
-  newname->name = memcpy (newname + 1, name, name_len);
-  newname->next = NULL;
-  newname->dont_free = 0;
-  lastp->next = newname;
-}
-
-/* All known directories in sorted order.  */
-struct r_search_path_elem *_dl_all_dirs;
-
-/* All directories after startup.  */
-struct r_search_path_elem *_dl_init_all_dirs;
-
-/* Standard search directories.  */
-static struct r_search_path_struct rtld_search_dirs;
-
-static size_t max_dirnamelen;
-
-static inline struct r_search_path_elem **
-fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep,
-	      int check_trusted, const char *what, const char *where)
-{
-  char *cp;
-  size_t nelems = 0;
-
-  printf("In fillin_rpath\n");
-  while ((cp = strsep (&rpath, sep)) != NULL)
-    {
-      struct r_search_path_elem *dirp;
-      size_t len = strlen (cp);
-
-      /* `strsep' can pass an empty string.  This has to be
-         interpreted as `use the current directory'. */
-      if (len == 0)
-	{
-	  static const char curwd[] = "./";
-	  cp = (char *) curwd;
-	}
-
-      /* Remove trailing slashes (except for "/").  */
-      while (len > 1 && cp[len - 1] == '/')
-	--len;
-
-      /* Now add one if there is none so far.  */
-      if (len > 0 && cp[len - 1] != '/')
-	cp[len++] = '/';
-
-      /* Make sure we don't use untrusted directories if we run SUID.  */
-      if (__builtin_expect (check_trusted, 0))
-	{
-	  const char *trun = system_dirs;
-	  size_t idx;
-	  int unsecure = 1;
-
-	  /* All trusted directories must be complete names.  */
-	  if (cp[0] == '/')
-	    {
-	      for (idx = 0; idx < nsystem_dirs_len; ++idx)
-		{
-		  if (len == system_dirs_len[idx]
-		      && memcmp (trun, cp, len) == 0)
-		    {
-		      /* Found it.  */
-		      unsecure = 0;
-		      break;
-		    }
-
-		  trun += system_dirs_len[idx] + 1;
-		}
-	    }
-
-	  if (unsecure)
-	    /* Simply drop this directory.  */
-	    continue;
-	}
-
-      /* See if this directory is already known.  */
-      for (dirp = _dl_all_dirs; dirp != NULL; dirp = dirp->next)
-	if (dirp->dirnamelen == len && memcmp (cp, dirp->dirname, len) == 0)
-	  break;
-
-      if (dirp != NULL)
-	{
-	  /* It is available, see whether it's on our own list.  */
-	  size_t cnt;
-	  for (cnt = 0; cnt < nelems; ++cnt)
-	    if (result[cnt] == dirp)
-	      break;
-
-	  if (cnt == nelems)
-	    result[nelems++] = dirp;
-	}
-      else
-	{
-	  size_t cnt;
-	  enum r_dir_status init_val;
-	  size_t where_len = where ? strlen (where) + 1 : 0;
-
-	  /* It's a new directory.  Create an entry and add it.  */
-	  dirp = (struct r_search_path_elem *)
-	    malloc (sizeof (*dirp) + ncapstr * sizeof (enum r_dir_status)
-		    + where_len + len + 1);
-	  if (dirp == NULL)
-	    _dl_signal_error (ENOMEM, NULL, NULL,
-			      N_("cannot create cache for search path"));
-
-	  dirp->dirname = ((char *) dirp + sizeof (*dirp)
-			   + ncapstr * sizeof (enum r_dir_status));
-	  *((char *) (memcpy ((char *) dirp->dirname, cp, len) + len)) = '\0';
-	  dirp->dirnamelen = len;
-
-	  if (len > max_dirnamelen)
-	    max_dirnamelen = len;
-
-	  /* We have to make sure all the relative directories are
-	     never ignored.  The current directory might change and
-	     all our saved information would be void.  */
-	  init_val = cp[0] != '/' ? existing : unknown;
-	  for (cnt = 0; cnt < ncapstr; ++cnt)
-	    dirp->status[cnt] = init_val;
-
-	  dirp->what = what;
-	  if (__builtin_expect (where != NULL, 1))
-	    dirp->where = memcpy ((char *) dirp + sizeof (*dirp) + len + 1
-				  + ncapstr * sizeof (enum r_dir_status),
-				  where, where_len);
-	  else
-	    dirp->where = NULL;
-
-	  dirp->next = _dl_all_dirs;
-	  _dl_all_dirs = dirp;
-
-	  /* Put it in the result array.  */
-	  result[nelems++] = dirp;
-	}
-    }
-
-  /* Terminate the array.  */
-  result[nelems] = NULL;
-
-  return result;
-}
-
-
-static void
-internal_function
-decompose_rpath (struct r_search_path_struct *sps,
-		 const char *rpath, struct link_map *l, const char *what)
-{
-  /* Make a copy we can work with.  */
-  const char *where = l->l_name;
-  char *copy;
-  char *cp;
-  struct r_search_path_elem **result;
-  size_t nelems;
-  /* Initialize to please the compiler.  */
-  const char *errstring = NULL;
-
-  /* First see whether we must forget the RUNPATH and RPATH from this
-     object.  */
-  if (__builtin_expect (_dl_inhibit_rpath != NULL, 0)) 
-    {
-      const char *found = strstr (_dl_inhibit_rpath, where);
-      if (found != NULL)
-	{
-	  size_t len = strlen (where);
-	  if ((found == _dl_inhibit_rpath || found[-1] == ':')
-	      && (found[len] == '\0' || found[len] == ':'))
-	    {
-	      /* This object is on the list of objects for which the
-		 RUNPATH and RPATH must not be used.  */
-	      result = (struct r_search_path_elem **)
-		malloc (sizeof (*result));
-	      if (result == NULL)
-		{
-		signal_error_cache:
-		  errstring = N_("cannot create cache for search path");
-		signal_error:
-		  _dl_signal_error (ENOMEM, NULL, NULL, errstring);
-		}
-
-	      result[0] = NULL;
-
-	      sps->dirs = result;
-	      sps->malloced = 1;
-
-	      return;
-	    }
-	}
-    }
-
-  /* Make a writable copy.  At the same time expand possible dynamic
-     string tokens.  */
-  copy = expand_dynamic_string_token (l, rpath);
-  if (copy == NULL)
-    {
-      errstring = N_("cannot create RUNPATH/RPATH copy");
-      goto signal_error;
-    }
-
-  /* Count the number of necessary elements in the result array.  */
-  nelems = 0;
-  for (cp = copy; *cp != '\0'; ++cp)
-    if (*cp == ':')
-      ++nelems;
-
-  /* Allocate room for the result.  NELEMS + 1 is an upper limit for the
-     number of necessary entries.  */
-  result = (struct r_search_path_elem **) malloc ((nelems + 1 + 1)
-						  * sizeof (*result));
-  if (result == NULL)
-    goto signal_error_cache;
-
-  fillin_rpath (copy, result, ":", 0, what, where);
-
-  /* Free the copied RPATH string.  `fillin_rpath' make own copies if
-     necessary.  */
-  free (copy);
-
-  sps->dirs = result;
-  /* The caller will change this value if we haven't used a real malloc.  */
-  sps->malloced = 1;
-}
-
-
-void
-internal_function
-_dl_init_paths (const char *llp)
-{
-  size_t idx;
-  const char *strp;
-  struct r_search_path_elem *pelem, **aelem;
-  size_t round_size;
-#ifdef SHARED
-  struct link_map *l;
-#endif
-  /* Initialize to please the compiler.  */
-  const char *errstring = NULL;
-
-  /* Fill in the information about the application's RPATH and the
-     directories addressed by the LD_LIBRARY_PATH environment variable.  */
-
-  /* Get the capabilities.  */
-  capstr = _dl_important_hwcaps (_dl_platform, _dl_platformlen,
-				 &ncapstr, &max_capstrlen);
-
-  /* First set up the rest of the default search directory entries.  */
-  aelem = rtld_search_dirs.dirs = (struct r_search_path_elem **)
-    malloc ((nsystem_dirs_len + 1) * sizeof (struct r_search_path_elem *));
-  if (rtld_search_dirs.dirs == NULL)
-    {
-      errstring = N_("cannot create search path array");
-    signal_error:
-      _dl_signal_error (ENOMEM, NULL, NULL, errstring);
-    }
-
-  round_size = ((2 * sizeof (struct r_search_path_elem) - 1
-		 + ncapstr * sizeof (enum r_dir_status))
-		/ sizeof (struct r_search_path_elem));
-
-  rtld_search_dirs.dirs[0] = (struct r_search_path_elem *)
-    malloc ((sizeof (system_dirs) / sizeof (system_dirs[0]))
-	    * round_size * sizeof (struct r_search_path_elem));
-  if (rtld_search_dirs.dirs[0] == NULL)
-    {
-      errstring = N_("cannot create cache for search path");
-      goto signal_error;
-    }
-
-  rtld_search_dirs.malloced = 0;
-  pelem = _dl_all_dirs = rtld_search_dirs.dirs[0];
-  strp = system_dirs;
-  idx = 0;
-
-  do
-    {
-      size_t cnt;
-
-      *aelem++ = pelem;
-
-      pelem->what = "system search path";
-      pelem->where = NULL;
-
-      pelem->dirname = strp;
-      pelem->dirnamelen = system_dirs_len[idx];
-      strp += system_dirs_len[idx] + 1;
-
-      /* System paths must be absolute.  */
-      assert (pelem->dirname[0] == '/');
-      for (cnt = 0; cnt < ncapstr; ++cnt)
-	pelem->status[cnt] = unknown;
-
-      pelem->next = (++idx == nsystem_dirs_len ? NULL : (pelem + round_size));
-
-      pelem += round_size;
-    }
-  while (idx < nsystem_dirs_len);
-
-  max_dirnamelen = SYSTEM_DIRS_MAX_LEN;
-  *aelem = NULL;
-
-#ifdef SHARED
-  /* This points to the map of the main object.  */
-  l = _dl_loaded;
-  if (l != NULL)
-    {
-      assert (l->l_type != lt_loaded);
-
-      if (l->l_info[DT_RUNPATH])
-	{
-	  /* Allocate room for the search path and fill in information
-	     from RUNPATH.  */
-	  decompose_rpath (&l->l_runpath_dirs,
-			   (const void *) (D_PTR (l, l_info[DT_STRTAB])
-					   + l->l_info[DT_RUNPATH]->d_un.d_val),
-			   l, "RUNPATH");
-
-	  /* The RPATH is ignored.  */
-	  l->l_rpath_dirs.dirs = (void *) -1;
-	}
-      else
-	{
-	  l->l_runpath_dirs.dirs = (void *) -1;
-
-	  if (l->l_info[DT_RPATH])
-	    {
-	      /* Allocate room for the search path and fill in information
-		 from RPATH.  */
-	      decompose_rpath (&l->l_rpath_dirs,
-			       (const void *) (D_PTR (l, l_info[DT_STRTAB])
-					       + l->l_info[DT_RPATH]->d_un.d_val),
-			       l, "RPATH");
-	      l->l_rpath_dirs.malloced = 0;
-	    }
-	  else
-	    l->l_rpath_dirs.dirs = (void *) -1;
-	}
-    }
-#endif	/* SHARED */
-
-  if (llp != NULL && *llp != '\0')
-    {
-      size_t nllp;
-      const char *cp = llp;
-      const char *old = llp;
-      size_t len = strlen (old) + 1;
-      char *new = alloca(len);
-      char *llp_tmp;
-
-      llp_tmp = memcpy (new, old, len);
-
-      /* Decompose the LD_LIBRARY_PATH contents.  First determine how many
-	 elements it has.  */
-      nllp = 1;
-      while (*cp)
-	{
-	  if (*cp == ':' || *cp == ';')
-	    ++nllp;
-	  ++cp;
-	}
-
-      env_path_list.dirs = (struct r_search_path_elem **)
-	malloc ((nllp + 1) * sizeof (struct r_search_path_elem *));
-      if (env_path_list.dirs == NULL)
-	{
-	  errstring = N_("cannot create cache for search path");
-	  goto signal_error;
-	}
-
-      (void) fillin_rpath (llp_tmp, env_path_list.dirs, ":;",
-			   0, "LD_LIBRARY_PATH", NULL);
-
-      if (env_path_list.dirs[0] == NULL)
-	{
-	  free (env_path_list.dirs);
-	  env_path_list.dirs = (void *) -1;
-	}
-
-      env_path_list.malloced = 0;
-    }
-  else
-    env_path_list.dirs = (void *) -1;
-
-  /* Remember the last search directory added at startup.  */
-  _dl_init_all_dirs = _dl_all_dirs;
-}
-
-
-/* Think twice before changing anything in this function.  It is placed
-   here and prepared using the `alloca' magic to prevent it from being
-   inlined.  The function is only called in case of an error.  But then
-   performance does not count.  The function used to be "inlinable" and
-   the compiled did so all the time.  This increased the code size for
-   absolutely no good reason.  */
-static void
-__attribute__ ((noreturn))
-lose (int code, int fd, const char *name, char *realname, struct link_map *l,
-      const char *msg)
-{
-  /* The use of `alloca' here looks ridiculous but it helps.  The goal
-     is to avoid the function from being inlined.  There is no official
-     way to do this so we use this trick.  gcc never inlines functions
-     which use `alloca'.  */
-  int *a = (int *) alloca (sizeof (int));
-  a[0] = fd;
-  /* The file might already be closed.  */
-  if (a[0] != -1)
-    (void) close (a[0]);
-  if (l != NULL)
-    {
-      /* Remove the stillborn object from the list and free it.  */
-      assert (l->l_next == NULL);
-#ifndef SHARED
-      if (l->l_prev == NULL)
-	/* No other module loaded.  */
-	_dl_loaded = NULL;
-      else
-#endif
-	l->l_prev->l_next = NULL;
-      --_dl_nloaded;
-      free (l);
-    }
-  free (realname);
-  _dl_signal_error (code, name, NULL, msg);
-}
-
-
-/* Map in the shared object NAME, actually located in REALNAME, and already
-   opened on FD.  */
-
-#ifndef EXTERNAL_MAP_FROM_FD
-static
-#endif
-struct link_map *
-_dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
-			char *realname, struct link_map *loader, int l_type,
-			int mode)
-{
-  struct link_map *l = NULL;
-  const ElfW(Ehdr) *header;
-  const ElfW(Phdr) *phdr;
-  const ElfW(Phdr) *ph;
-  size_t maplength;
-  int type;
-  struct stat64 st;
-  /* Initialize to keep the compiler happy.  */
-  const char *errstring = NULL;
-  int errval = 0;
-
-  /* Get file information.  */
-  if (__builtin_expect (fstat64 (fd, &st) < 0, 0))
-    {
-      errstring = N_("cannot stat shared object");
-    call_lose_errno:
-      errval = errno;
-    call_lose:
-      fprintf (stderr, "%s\n", errstring);
-      lose (errval, fd, name, realname, l, errstring);
-    }
-
-  /* Look again to see if the real name matched another already loaded.  */
-  for (l = _dl_loaded; l; l = l->l_next)
-    if (l->l_ino == st.st_ino && l->l_dev == st.st_dev)
-      {
-	/* The object is already loaded.
-	   Just bump its reference count and return it.  */
-	close (fd);
-
-	/* If the name is not in the list of names for this object add
-	   it.  */
-	free (realname);
-	add_name_to_object (l, name);
-
-	return l;
-      }
-
-  if (mode & RTLD_NOLOAD)
-    /* We are not supposed to load the object unless it is already
-       loaded.  So return now.  */
-    return NULL;
-
-  /* Print debugging message.  */
-  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_FILES, 0))
-    _dl_debug_printf ("file=%s;  generating link map\n", name);
-
-  /* This is the ELF header.  We read it in `open_verify'.  */
-  header = (void *) fbp->buf;
-
-#ifndef MAP_ANON
-# define MAP_ANON 0
-  if (_dl_zerofd == -1)
-    {
-      _dl_zerofd = _dl_sysdep_open_zero_fill ();
-      if (_dl_zerofd == -1)
-	{
-	  close (fd);
-	  _dl_signal_error (errno, NULL, NULL,
-			    N_("cannot open zero fill device"));
-	}
-    }
-#endif
-
-  /* Enter the new object in the list of loaded objects.  */
-  l = _dl_new_object (realname, name, l_type, loader);
-  if (__builtin_expect (! l, 0))
-    {
-      errstring = N_("cannot create shared object descriptor");
-      goto call_lose_errno;
-    }
-
-  /* Extract the remaining details we need from the ELF header
-     and then read in the program header table.  */
-  l->l_entry = header->e_entry;
-  type = header->e_type;
-  l->l_phnum = header->e_phnum;
-
-  maplength = header->e_phnum * sizeof (ElfW(Phdr));
-  if (header->e_phoff + maplength <= fbp->len)
-    phdr = (void *) (fbp->buf + header->e_phoff);
-  else
-    {
-      phdr = alloca (maplength);
-      lseek (fd, SEEK_SET, header->e_phoff);
-      if (__libc_read (fd, (void *) phdr, maplength) != maplength)
-	{
-	  errstring = N_("cannot read file data");
-	  goto call_lose_errno;
-	}
-    }
-
-  {
-    /* Scan the program header table, collecting its load commands.  */
-    struct loadcmd
-      {
-	ElfW(Addr) mapstart, mapend, dataend, allocend;
-	off_t mapoff;
-	int prot;
-      } loadcmds[l->l_phnum], *c;
-    size_t nloadcmds = 0;
-
-    /* The struct is initialized to zero so this is not necessary:
-    l->l_ld = 0;
-    l->l_phdr = 0;
-    l->l_addr = 0; */
-    for (ph = phdr; ph < &phdr[l->l_phnum]; ++ph)
-      switch (ph->p_type)
-	{
-	  /* These entries tell us where to find things once the file's
-	     segments are mapped in.  We record the addresses it says
-	     verbatim, and later correct for the run-time load address.  */
-	case PT_DYNAMIC:
-	  l->l_ld = (void *) ph->p_vaddr;
-	  l->l_ldnum = ph->p_memsz / sizeof (ElfW(Dyn));
-	  break;
-
-	case PT_PHDR:
-	  l->l_phdr = (void *) ph->p_vaddr;
-	  break;
-
-	case PT_LOAD:
-	  /* A load command tells us to map in part of the file.
-	     We record the load commands and process them all later.  */
-	  if ((ph->p_align & (_dl_pagesize - 1)) != 0)
-	    {
-	      errstring = N_("ELF load command alignment not page-aligned");
-	      goto call_lose;
-	    }
-	  if (((ph->p_vaddr - ph->p_offset) & (ph->p_align - 1)) != 0)
-	    {
-	      errstring
-		= N_("ELF load command address/offset not properly aligned");
-	      goto call_lose;
-	    }
-
-	  {
-	    struct loadcmd *c = &loadcmds[nloadcmds++];
-	    c->mapstart = ph->p_vaddr & ~(ph->p_align - 1);
-	    c->mapend = ((ph->p_vaddr + ph->p_filesz + _dl_pagesize - 1)
-			 & ~(_dl_pagesize - 1));
-	    c->dataend = ph->p_vaddr + ph->p_filesz;
-	    c->allocend = ph->p_vaddr + ph->p_memsz;
-	    c->mapoff = ph->p_offset & ~(ph->p_align - 1);
-
-	    /* Optimize a common case.  */
-#if (PF_R | PF_W | PF_X) == 7 && (PROT_READ | PROT_WRITE | PROT_EXEC) == 7
-	    c->prot = (PF_TO_PROT
-		       >> ((ph->p_flags & (PF_R | PF_W | PF_X)) * 4)) & 0xf;
-#else
-	    c->prot = 0;
-	    if (ph->p_flags & PF_R)
-	      c->prot |= PROT_READ;
-	    if (ph->p_flags & PF_W)
-	      c->prot |= PROT_WRITE;
-	    if (ph->p_flags & PF_X)
-	      c->prot |= PROT_EXEC;
-#endif
-	  }
-	  break;
-	}
-
-    /* Now process the load commands and map segments into memory.  */
-    c = loadcmds;
-
-    /* Length of the sections to be loaded.  */
-    maplength = loadcmds[nloadcmds - 1].allocend - c->mapstart;
-
-    if (__builtin_expect (type, ET_DYN) == ET_DYN)
-      {
-	/* This is a position-independent shared object.  We can let the
-	   kernel map it anywhere it likes, but we must have space for all
-	   the segments in their specified positions relative to the first.
-	   So we map the first segment without MAP_FIXED, but with its
-	   extent increased to cover all the segments.  Then we remove
-	   access from excess portion, and there is known sufficient space
-	   there to remap from the later segments.
-
-	   As a refinement, sometimes we have an address that we would
-	   prefer to map such objects at; but this is only a preference,
-	   the OS can do whatever it likes. */
-	ElfW(Addr) mappref;
-	mappref = (ELF_PREFERRED_ADDRESS (loader, maplength, c->mapstart)
-		   - MAP_BASE_ADDR (l));
-
-	/* Remember which part of the address space this object uses.  */
-	l->l_map_start = (ElfW(Addr)) mmap ((void *) mappref, maplength,
-					      c->prot, MAP_COPY | MAP_FILE,
-					      fd, c->mapoff);
-	if ((void *) l->l_map_start == MAP_FAILED)
-	  {
-	  map_error:
-	    errstring = N_("failed to map segment from shared object");
-	    goto call_lose_errno;
-	  }
-
-	l->l_map_end = l->l_map_start + maplength;
-	l->l_addr = l->l_map_start - c->mapstart;
-
-	/* Change protection on the excess portion to disallow all access;
-	   the portions we do not remap later will be inaccessible as if
-	   unallocated.  Then jump into the normal segment-mapping loop to
-	   handle the portion of the segment past the end of the file
-	   mapping.  */
-	mprotect ((caddr_t) (l->l_addr + c->mapend),
-		    loadcmds[nloadcmds - 1].allocend - c->mapend,
-		    PROT_NONE);
-
-	goto postmap;
-      }
-    else
-      {
-	/* This object is loaded at a fixed address.  This must never
-           happen for objects loaded with dlopen().  */
-	if (__builtin_expect (mode & __RTLD_DLOPEN, 0))
-	  {
-	    errstring = N_("cannot dynamically load executable");
-	    goto call_lose;
-	  }
-
-	/* Notify ELF_PREFERRED_ADDRESS that we have to load this one
-	   fixed.  */
-	ELF_FIXED_ADDRESS (loader, c->mapstart);
-      }
-
-    /* Remember which part of the address space this object uses.  */
-    l->l_map_start = c->mapstart + l->l_addr;
-    l->l_map_end = l->l_map_start + maplength;
-
-    while (c < &loadcmds[nloadcmds])
-      {
-	if (c->mapend > c->mapstart
-	    /* Map the segment contents from the file.  */
-	    && (mmap ((void *) (l->l_addr + c->mapstart),
-			c->mapend - c->mapstart, c->prot,
-			MAP_FIXED | MAP_COPY | MAP_FILE, fd, c->mapoff)
-		== MAP_FAILED))
-	  goto map_error;
-
-      postmap:
-	if (l->l_phdr == 0
-	    && c->mapoff <= header->e_phoff
-	    && (c->mapend - c->mapstart + c->mapoff
-		>= header->e_phoff + header->e_phnum * sizeof (ElfW(Phdr))))
-	  /* Found the program header in this segment.  */
-	  l->l_phdr = (void *) (c->mapstart + header->e_phoff - c->mapoff);
-
-	if (c->allocend > c->dataend)
-	  {
-	    /* Extra zero pages should appear at the end of this segment,
-	       after the data mapped from the file.   */
-	    ElfW(Addr) zero, zeroend, zeropage;
-
-	    zero = l->l_addr + c->dataend;
-	    zeroend = l->l_addr + c->allocend;
-	    zeropage = (zero + _dl_pagesize - 1) & ~(_dl_pagesize - 1);
-
-	    if (zeroend < zeropage)
-	      /* All the extra data is in the last page of the segment.
-		 We can just zero it.  */
-	      zeropage = zeroend;
-
-	    if (zeropage > zero)
-	      {
-		/* Zero the final part of the last page of the segment.  */
-		if ((c->prot & PROT_WRITE) == 0)
-		  {
-		    /* Dag nab it.  */
-		    if (mprotect ((caddr_t) (zero & ~(_dl_pagesize - 1)),
-				    _dl_pagesize, c->prot|PROT_WRITE) < 0)
-		      {
-			errstring = N_("cannot change memory protections");
-			goto call_lose_errno;
-		      }
-		  }
-		memset ((void *) zero, '\0', zeropage - zero);
-		if ((c->prot & PROT_WRITE) == 0)
-		  mprotect ((caddr_t) (zero & ~(_dl_pagesize - 1)),
-			      _dl_pagesize, c->prot);
-	      }
-
-	    if (zeroend > zeropage)
-	      {
-		/* Map the remaining zero pages in from the zero fill FD.  */
-		caddr_t mapat;
-		mapat = mmap ((caddr_t) zeropage, zeroend - zeropage,
-				c->prot, MAP_ANON|MAP_PRIVATE|MAP_FIXED,
-				ANONFD, 0);
-		if (mapat == MAP_FAILED)
-		  {
-		    errstring = N_("cannot map zero-fill pages");
-		    goto call_lose_errno;
-		  }
-	      }
-	  }
-
-	++c;
-      }
-
-    if (l->l_phdr == NULL)
-      {
-	/* The program header is not contained in any of the segments.
-	   We have to allocate memory ourself and copy it over from
-	   out temporary place.  */
-	ElfW(Phdr) *newp = (ElfW(Phdr) *) malloc (header->e_phnum
-						  * sizeof (ElfW(Phdr)));
-	if (newp == NULL)
-	  {
-	    errstring = N_("cannot allocate memory for program header");
-	    goto call_lose_errno;
-	  }
-
-	l->l_phdr = memcpy (newp, phdr,
-			    (header->e_phnum * sizeof (ElfW(Phdr))));
-	l->l_phdr_allocated = 1;
-      }
-    else
-      /* Adjust the PT_PHDR value by the runtime load address.  */
-      l->l_phdr = (ElfW(Addr)) l->l_phdr + l->l_addr;
-  }
-
-  /* We are done mapping in the file.  We no longer need the descriptor.  */
-  close (fd);
-  /* Signal that we closed the file.  */
-  fd = -1;
-
-  if (l->l_type == lt_library && type == ET_EXEC)
-    l->l_type = lt_executable;
-
-  if (l->l_ld == 0)
-    {
-      if (type == ET_DYN)
-	{
-	  errstring = N_("object file has no dynamic section");
-	  goto call_lose;
-	}
-    }
-  else
-    l->l_ld = (ElfW(Addr)) l->l_ld + l->l_addr;
-
-  l->l_entry += l->l_addr;
-
-  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_FILES, 0))
-    _dl_debug_printf ("  dynamic: 0x%0*lx  base: 0x%0*lx   size: 0x%0*Zx\n"
-		      "    entry: 0x%0*lx  phdr: 0x%0*lx  phnum:   %*u\n\n",
-		      (int) sizeof (void *) * 2, (unsigned long int) l->l_ld,
-		      (int) sizeof (void *) * 2, (unsigned long int) l->l_addr,
-		      (int) sizeof (void *) * 2, maplength,
-		      (int) sizeof (void *) * 2, (unsigned long int) l->l_entry,
-		      (int) sizeof (void *) * 2, (unsigned long int) l->l_phdr,
-		      (int) sizeof (void *) * 2, l->l_phnum);
-
-  elf_get_dynamic_info (l);
-
-  /* Make sure we are dlopen()ing an object which has the DF_1_NOOPEN
-     flag set.  */
-  if (__builtin_expect (l->l_flags_1 & DF_1_NOOPEN, 0)
-      && (mode & __RTLD_DLOPEN))
-    {
-      /* We are not supposed to load this object.  Free all resources.  */
-      munmap ((void *) l->l_map_start, l->l_map_end - l->l_map_start);
-
-      if (!l->l_libname->dont_free)
-	free (l->l_libname);
-
-      if (l->l_phdr_allocated)
-	free ((void *) l->l_phdr);
-
-      errstring = N_("shared object cannot be dlopen()ed");
-      goto call_lose;
-    }
-
-  if (l->l_info[DT_HASH])
-    _dl_setup_hash (l);
-
-  /* If this object has DT_SYMBOLIC set modify now its scope.  We don't
-     have to do this for the main map.  */
-  if (__builtin_expect (l->l_info[DT_SYMBOLIC] != NULL, 0)
-      && &l->l_searchlist != l->l_scope[0])
-    {
-      /* Create an appropriate searchlist.  It contains only this map.
-
-	 XXX This is the definition of DT_SYMBOLIC in SysVr4.  The old
-	 GNU ld.so implementation had a different interpretation which
-	 is more reasonable.  We are prepared to add this possibility
-	 back as part of a GNU extension of the ELF format.  */
-      l->l_symbolic_searchlist.r_list =
-	(struct link_map **) malloc (sizeof (struct link_map *));
-
-      if (l->l_symbolic_searchlist.r_list == NULL)
-	{
-	  errstring = N_("cannot create searchlist");
-	  goto call_lose_errno;
-	}
-
-      l->l_symbolic_searchlist.r_list[0] = l;
-      l->l_symbolic_searchlist.r_nlist = 1;
-
-      /* Now move the existing entries one back.  */
-      memmove (&l->l_scope[1], &l->l_scope[0],
-	       (l->l_scope_max - 1) * sizeof (l->l_scope[0]));
-
-      /* Now add the new entry.  */
-      l->l_scope[0] = &l->l_symbolic_searchlist;
-    }
-
-  /* Remember whether this object must be initialized first.  */
-  if (l->l_flags_1 & DF_1_INITFIRST)
-    _dl_initfirst = l;
-
-  /* Finally the file information.  */
-  l->l_dev = st.st_dev;
-  l->l_ino = st.st_ino;
-
-  return l;
-}
-
-/* Print search path.  */
-static void
-print_search_path (struct r_search_path_elem **list,
-                   const char *what, const char *name)
-{
-  char buf[max_dirnamelen + max_capstrlen];
-  int first = 1;
-
-  _dl_debug_printf (" search path=");
-
-  while (*list != NULL && (*list)->what == what) /* Yes, ==.  */
-    {
-      char *endp = memcpy (buf, (*list)->dirname, (*list)->dirnamelen);
-      size_t cnt;
-      endp += (*list)->dirnamelen;
-
-
-      for (cnt = 0; cnt < ncapstr; ++cnt)
-	if ((*list)->status[cnt] != nonexisting)
-	  {
-	    char *cp = memcpy (endp, capstr[cnt].str, capstr[cnt].len);
-            cp += capstr[cnt].len;
-
-	    if (cp == buf || (cp == buf + 1 && buf[0] == '/'))
-	      cp[0] = '\0';
-	    else
-	      cp[-1] = '\0';
-
-	    _dl_debug_printf_c (first ? "%s" : ":%s", buf);
-	    first = 0;
-	  }
-
-      ++list;
-    }
-
-  if (name != NULL)
-    _dl_debug_printf_c ("\t\t(%s from file %s)\n", what,
-			name[0] ? name : _dl_argv[0]);
-  else
-    _dl_debug_printf_c ("\t\t(%s)\n", what);
-}
-
-/* Open a file and verify it is an ELF file for this architecture.  We
-   ignore only ELF files for other architectures.  Non-ELF files and
-   ELF files with different header information cause fatal errors since
-   this could mean there is something wrong in the installation and the
-   user might want to know about this.  */
-static int
-open_verify (const char *name, struct filebuf *fbp)
-{
-  /* This is the expected ELF header.  */
-#define ELF32_CLASS ELFCLASS32
-#define ELF64_CLASS ELFCLASS64
-#ifndef VALID_ELF_HEADER
-# define VALID_ELF_HEADER(hdr,exp,size)	(memcmp (hdr, exp, size) == 0)
-# define VALID_ELF_OSABI(osabi)		(osabi == ELFOSABI_SYSV)
-# define VALID_ELF_ABIVERSION(ver)	(ver == 0)
-#endif
-  static const unsigned char expected[EI_PAD] =
-  {
-    [EI_MAG0] = ELFMAG0,
-    [EI_MAG1] = ELFMAG1,
-    [EI_MAG2] = ELFMAG2,
-    [EI_MAG3] = ELFMAG3,
-    [EI_CLASS] = ELFW(CLASS),
-    [EI_DATA] = byteorder,
-    [EI_VERSION] = EV_CURRENT,
-    [EI_OSABI] = ELFOSABI_SYSV,
-    [EI_ABIVERSION] = 0
-  };
-  static const struct
-  {
-    ElfW(Word) vendorlen;
-    ElfW(Word) datalen;
-    ElfW(Word) type;
-    char vendor[4];
-  } expected_note = { 4, 16, 1, "GNU" };
-  int fd;
-  /* Initialize it to make the compiler happy.  */
-  const char *errstring = NULL;
-  int errval = 0;
-
-  /* Open the file.  We always open files read-only.  */
-  fd = open (name, O_RDONLY);
-  if (fd != -1)
-    {
-      ElfW(Ehdr) *ehdr;
-      ElfW(Phdr) *phdr, *ph;
-      ElfW(Word) *abi_note, abi_note_buf[8];
-      unsigned int osversion;
-      size_t maplength;
-
-      /* We successfully openened the file.  Now verify it is a file
-	 we can use.  */
-      __set_errno (0);
-      fbp->len = __libc_read (fd, fbp->buf, sizeof (fbp->buf));
-
-      /* This is where the ELF header is loaded.  */
-      assert (sizeof (fbp->buf) > sizeof (ElfW(Ehdr)));
-      ehdr = (ElfW(Ehdr) *) fbp->buf;
-
-      /* Now run the tests.  */
-      if (__builtin_expect (fbp->len < (ssize_t) sizeof (ElfW(Ehdr)), 0))
-	{
-	  errval = errno;
-	  errstring = (errval == 0
-		       ? N_("file too short") : N_("cannot read file data"));
-	call_lose:
-	  lose (errval, fd, name, NULL, NULL, errstring);
-	}
-
-      /* See whether the ELF header is what we expect.  */
-      if (__builtin_expect (! VALID_ELF_HEADER (ehdr->e_ident, expected,
-						EI_PAD), 0))
-	{
-	  /* Something is wrong.  */
-	  if (*(Elf32_Word *) &ehdr->e_ident !=
-#if BYTE_ORDER == LITTLE_ENDIAN
-	      ((ELFMAG0 << (EI_MAG0 * 8)) |
-	       (ELFMAG1 << (EI_MAG1 * 8)) |
-	       (ELFMAG2 << (EI_MAG2 * 8)) |
-	       (ELFMAG3 << (EI_MAG3 * 8)))
-#else
-	      ((ELFMAG0 << (EI_MAG3 * 8)) |
-	       (ELFMAG1 << (EI_MAG2 * 8)) |
-	       (ELFMAG2 << (EI_MAG1 * 8)) |
-	       (ELFMAG3 << (EI_MAG0 * 8)))
-#endif
-	      )
-	    errstring = N_("invalid ELF header");
-	  else if (ehdr->e_ident[EI_CLASS] != ELFW(CLASS))
-	    /* This is not a fatal error.  On architectures where
-	       32-bit and 64-bit binaries can be run this might
-	       happen.  */
-	    goto close_and_out;
-	  else if (ehdr->e_ident[EI_DATA] != byteorder)
-	    {
-	      if (BYTE_ORDER == BIG_ENDIAN)
-		errstring = N_("ELF file data encoding not big-endian");
-	      else
-		errstring = N_("ELF file data encoding not little-endian");
-	    }
-	  else if (ehdr->e_ident[EI_VERSION] != EV_CURRENT)
-	    errstring
-	      = N_("ELF file version ident does not match current one");
-	  /* XXX We should be able so set system specific versions which are
-	     allowed here.  */
-	  else if (!VALID_ELF_OSABI (ehdr->e_ident[EI_OSABI]))
-	    errstring = N_("ELF file OS ABI invalid");
-	  else if (!VALID_ELF_ABIVERSION (ehdr->e_ident[EI_ABIVERSION]))
-	    errstring = N_("ELF file ABI version invalid");
-	  else
-	    /* Otherwise we don't know what went wrong.  */
-	    errstring = N_("internal error");
-
-	  goto call_lose;
-	}
-
-      if (__builtin_expect (ehdr->e_version, EV_CURRENT) != EV_CURRENT)
-	{
-	  errstring = N_("ELF file version does not match current one");
-	  goto call_lose;
-	}
-      if (! __builtin_expect (elf_machine_matches_host (ehdr), 1))
-	goto close_and_out;
-      else if (__builtin_expect (ehdr->e_phentsize, sizeof (ElfW(Phdr)))
-	       != sizeof (ElfW(Phdr)))
-	{
-	  errstring = N_("ELF file's phentsize not the expected size");
-	  goto call_lose;
-	}
-      else if (__builtin_expect (ehdr->e_type, ET_DYN) != ET_DYN
-	       && __builtin_expect (ehdr->e_type, ET_EXEC) != ET_EXEC)
-	{
-	  errstring = N_("only ET_DYN and ET_EXEC can be loaded");
-	  goto call_lose;
-	}
-
-      maplength = ehdr->e_phnum * sizeof (ElfW(Phdr));
-      if (ehdr->e_phoff + maplength <= fbp->len)
-	phdr = (void *) (fbp->buf + ehdr->e_phoff);
-      else
-	{
-	  phdr = alloca (maplength);
-	  lseek (fd, SEEK_SET, ehdr->e_phoff);
-	  if (__libc_read (fd, (void *) phdr, maplength) != maplength)
-	    {
-	    read_error:
-	      errval = errno;
-	      errstring = N_("cannot read file data");
-	      goto call_lose;
-	    }
-	}
-
-      /* Check .note.ABI-tag if present.  */
-      for (ph = phdr; ph < &phdr[ehdr->e_phnum]; ++ph)
-	if (ph->p_type == PT_NOTE && ph->p_filesz == 32 && ph->p_align >= 4)
-	  {
-	    if (ph->p_offset + 32 <= fbp->len)
-	      abi_note = (void *) (fbp->buf + ph->p_offset);
-	    else
-	      {
-		lseek (fd, SEEK_SET, ph->p_offset);
-		if (__libc_read (fd, (void *) abi_note_buf, 32) != 32)
-		  goto read_error;
-
-		abi_note = abi_note_buf;
-	      }
-
-	    if (memcmp (abi_note, &expected_note, sizeof (expected_note)))
-	      continue;
-
-	    osversion = (abi_note[5] & 0xff) * 65536
-			+ (abi_note[6] & 0xff) * 256
-			+ (abi_note[7] & 0xff);
-	    if (abi_note[4] != __ABI_TAG_OS
-		|| (_dl_osversion && _dl_osversion < osversion))
-	      {
-	      close_and_out:
-		close (fd);
-		__set_errno (ENOENT);
-		fd = -1;
-	      }
-
-	    break;
-	  }
-    }
-
-  return fd;
-}
-
-/* Try to open NAME in one of the directories in *DIRSP.
-   Return the fd, or -1.  If successful, fill in *REALNAME
-   with the malloc'd full directory name.  If it turns out
-   that none of the directories in *DIRSP exists, *DIRSP is
-   replaced with (void *) -1, and the old value is free()d
-   if MAY_FREE_DIRS is true.  */
-
-static int
-open_path (const char *name, size_t namelen, int preloaded,
-	   struct r_search_path_struct *sps, char **realname,
-	   struct filebuf *fbp)
-{
-  struct r_search_path_elem **dirs = sps->dirs;
-  char *buf;
-  int fd = -1;
-  const char *current_what = NULL;
-  int any = 0;
-
-  buf = alloca (max_dirnamelen + max_capstrlen + namelen);
-  do
-    {
-      struct r_search_path_elem *this_dir = *dirs;
-      size_t buflen = 0;
-      size_t cnt;
-      char *edp;
-      int here_any = 0;
-      int err;
-
-      /* If we are debugging the search for libraries print the path
-	 now if it hasn't happened now.  */
-      if (__builtin_expect (_dl_debug_mask & DL_DEBUG_LIBS, 0)
-	  && current_what != this_dir->what)
-	{
-	  current_what = this_dir->what;
-	  print_search_path (dirs, current_what, this_dir->where);
-	}
-
-      edp = (char *) (memcpy (buf, this_dir->dirname, this_dir->dirnamelen) + this_dir->dirnamelen);
-      for (cnt = 0; fd == -1 && cnt < ncapstr; ++cnt)
-	{
-          char *tmp;
-	  /* Skip this directory if we know it does not exist.  */
-	  if (this_dir->status[cnt] == nonexisting)
-	    continue;
-
-          tmp = memcpy (edp, capstr[cnt].str, capstr[cnt].len);
-          tmp += capstr[cnt].len;
-
-          tmp = memcpy (tmp, name, namelen);
-          tmp += namelen;
-	  buflen = ((char *) (tmp - buf));
-
-	  /* Print name we try if this is wanted.  */
-	  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_LIBS, 0))
-	    _dl_debug_printf ("  trying file=%s\n", buf);
-
-	  fd = open_verify (buf, fbp);
-	  if (this_dir->status[cnt] == unknown)
-	    {
-	      if (fd != -1)
-		this_dir->status[cnt] = existing;
-	      else
-		{
-		  /* We failed to open machine dependent library.  Let's
-		     test whether there is any directory at all.  */
-		  struct stat64 st;
-
-		  buf[buflen - namelen - 1] = '\0';
-
-		  if (stat64 (buf, &st) != 0
-		      || ! S_ISDIR (st.st_mode))
-		    /* The directory does not exist or it is no directory.  */
-		    this_dir->status[cnt] = nonexisting;
-		  else
-		    this_dir->status[cnt] = existing;
-		}
-	    }
-
-	  /* Remember whether we found any existing directory.  */
-	  here_any |= this_dir->status[cnt] == existing;
-
-	  if (fd != -1 && __builtin_expect (preloaded, 0)
-	      && 0)
-	    {
-	      /* This is an extra security effort to make sure nobody can
-		 preload broken shared objects which are in the trusted
-		 directories and so exploit the bugs.  */
-	      struct stat64 st;
-
-	      if (fstat64 (fd, &st) != 0
-		  || (st.st_mode & S_ISUID) == 0)
-		{
-		  /* The shared object cannot be tested for being SUID
-		     or this bit is not set.  In this case we must not
-		     use this object.  */
-		  close (fd);
-		  fd = -1;
-		  /* We simply ignore the file, signal this by setting
-		     the error value which would have been set by `open'.  */
-		  errno = ENOENT;
-		}
-	    }
-	}
-
-      if (fd != -1)
-	{
-	  *realname = (char *) malloc (buflen);
-	  if (*realname != NULL)
-	    {
-	      memcpy (*realname, buf, buflen);
-	      return fd;
-	    }
-	  else
-	    {
-	      /* No memory for the name, we certainly won't be able
-		 to load and link it.  */
-	      close (fd);
-	      return -1;
-	    }
-	}
-      if (here_any && (err = errno) != ENOENT && err != EACCES)
-	/* The file exists and is readable, but something went wrong.  */
-	return -1;
-
-      /* Remember whether we found anything.  */
-      any |= here_any;
-    }
-  while (*++dirs != NULL);
-
-  /* Remove the whole path if none of the directories exists.  */
-  if (__builtin_expect (! any, 0))
-    {
-      /* Paths which were allocated using the minimal malloc() in ld.so
-	 must not be freed using the general free() in libc.  */
-      if (sps->malloced)
-	free (sps->dirs);
-      sps->dirs = (void *) -1;
-    }
-
-  return -1;
-}
-
-/* Map in the shared object file NAME.  */
-
-struct link_map *
-internal_function
-_dl_map_object (struct link_map *loader, const char *name, int preloaded,
-		int type, int trace_mode, int mode)
-{
-  int fd;
-  char *realname;
-  char *name_copy;
-  struct link_map *l;
-  struct filebuf fb;
-
-  /* Look for this name among those already loaded.  */
-  for (l = _dl_loaded; l; l = l->l_next)
-    {
-      /* If the requested name matches the soname of a loaded object,
-	 use that object.  Elide this check for names that have not
-	 yet been opened.  */
-      if (__builtin_expect (l->l_faked, 0) != 0)
-	continue;
-      if (!_dl_name_match_p (name, l))
-	{
-	  const char *soname;
-
-	  if (__builtin_expect (l->l_soname_added, 1)
-	      || l->l_info[DT_SONAME] == NULL)
-	    continue;
-
-	  soname = ((const char *) D_PTR (l, l_info[DT_STRTAB])
-		    + l->l_info[DT_SONAME]->d_un.d_val);
-	  if (strcmp (name, soname) != 0)
-	    continue;
-
-	  /* We have a match on a new name -- cache it.  */
-	  add_name_to_object (l, soname);
-	  l->l_soname_added = 1;
-	}
-
-      /* We have a match.  */
-      return l;
-    }
-
-  /* Display information if we are debugging.  */
-  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_FILES, 0) && loader != NULL)
-    _dl_debug_printf ("\nfile=%s;  needed by %s\n", name,
-		      loader->l_name[0] ? loader->l_name : _dl_argv[0]);
-
-  if (strchr (name, '/') == NULL)
-    {
-      /* Search for NAME in several places.  */
-
-      size_t namelen = strlen (name) + 1;
-
-      if (__builtin_expect (_dl_debug_mask & DL_DEBUG_LIBS, 0))
-	_dl_debug_printf ("find library=%s; searching\n", name);
-
-      fd = -1;
-
-      /* When the object has the RUNPATH information we don't use any
-         RPATHs.  */
-      if (loader == NULL || loader->l_info[DT_RUNPATH] == NULL)
-	{
-	  /* First try the DT_RPATH of the dependent object that caused NAME
-	     to be loaded.  Then that object's dependent, and on up.  */
-	  for (l = loader; fd == -1 && l; l = l->l_loader)
-	    {
-	      if (l->l_rpath_dirs.dirs == NULL)
-		{
-		  if (l->l_info[DT_RPATH] == NULL)
-		    {
-		      /* There is no path.  */
-		      l->l_rpath_dirs.dirs = (void *) -1;
-		      continue;
-		    }
-		  else
-		    {
-		      /* Make sure the cache information is available.  */
-		      size_t ptrval = (D_PTR (l, l_info[DT_STRTAB])
-				       + l->l_info[DT_RPATH]->d_un.d_val);
-		      decompose_rpath (&l->l_rpath_dirs,
-				       (const char *) ptrval, l, "RPATH");
-		    }
-		}
-
-	      if (l->l_rpath_dirs.dirs != (void *) -1)
-		fd = open_path (name, namelen, preloaded, &l->l_rpath_dirs,
-				&realname, &fb);
-	    }
-
-	  /* If dynamically linked, try the DT_RPATH of the executable
-             itself.  */
-	  l = _dl_loaded;
-	  if (fd == -1 && l && l->l_type != lt_loaded && l != loader
-	      && l->l_rpath_dirs.dirs != (void *) -1)
-	    fd = open_path (name, namelen, preloaded, &l->l_rpath_dirs,
-			    &realname, &fb);
-	}
-
-      /* Try the LD_LIBRARY_PATH environment variable.  */
-      if (fd == -1 && env_path_list.dirs != (void *) -1)
-	fd = open_path (name, namelen, preloaded, &env_path_list,
-			&realname, &fb);
-
-      /* Look at the RUNPATH information for this binary.
-
-	 Note that this is no real loop.  'while' is used only to enable
-	 us to use 'break' instead of a 'goto' to jump to the end.  The
-	 loop is always left after the first round.  */
-      while (fd == -1 && loader != NULL
-	     && loader->l_runpath_dirs.dirs != (void *) -1)
-	{
-	  if (loader->l_runpath_dirs.dirs == NULL)
-	    {
-	      if (loader->l_info[DT_RUNPATH] == NULL)
-		{
-		  /* No RUNPATH.  */
-		  loader->l_runpath_dirs.dirs = (void *) -1;
-		  break;
-		}
-	      else
-		{
-		  /* Make sure the cache information is available.  */
-		  size_t ptrval = (D_PTR (loader, l_info[DT_STRTAB])
-				   + loader->l_info[DT_RUNPATH]->d_un.d_val);
-		  decompose_rpath (&loader->l_runpath_dirs,
-				   (const char *) ptrval, loader, "RUNPATH");
-		}
-	    }
-
-	  if (loader->l_runpath_dirs.dirs != (void *) -1)
-	    fd = open_path (name, namelen, preloaded,
-			    &loader->l_runpath_dirs, &realname, &fb);
-	  break;
-	}
-
-      if (fd == -1
-	  && (__builtin_expect (! preloaded, 1) || ! 0))
-	{
-	  /* Check the list of libraries in the file /etc/ld.so.cache,
-	     for compatibility with Linux's ldconfig program.  */
-	  const char *cached = _dl_load_cache_lookup (name);
-
-	  if (cached != NULL)
-	    {
-#ifdef SHARED
-	      l = loader ?: _dl_loaded;
-#else
-	      l = loader;
-#endif
-
-	      /* If the loader has the DF_1_NODEFLIB flag set we must not
-		 use a cache entry from any of these directories.  */
-	      if (
-#ifndef SHARED
-		  /* 'l' is always != NULL for dynamically linked objects.  */
-		  l != NULL &&
-#endif
-		  __builtin_expect (l->l_flags_1 & DF_1_NODEFLIB, 0))
-		{
-		  const char *dirp = system_dirs;
-		  unsigned int cnt = 0;
-
-		  do
-		    {
-		      if (memcmp (cached, dirp, system_dirs_len[cnt]) == 0)
-			{
-			  /* The prefix matches.  Don't use the entry.  */
-			  cached = NULL;
-			  break;
-			}
-
-		      dirp += system_dirs_len[cnt] + 1;
-		      ++cnt;
-		    }
-		  while (cnt < nsystem_dirs_len);
-		}
-
-	      if (cached != NULL)
-		{
-		  fd = open_verify (cached, &fb);
-		  if (__builtin_expect (fd != -1, 1))
-		    {
-		      realname = local_strdup (cached);
-		      if (realname == NULL)
-			{
-			  close (fd);
-			  fd = -1;
-			}
-		    }
-		}
-	    }
-	}
-
-      /* Finally, try the default path.  */
-      if (fd == -1
-	  && ((l = loader ?: _dl_loaded)
-	      /* 'l' is always != NULL for dynamically linked objects.  */
-#ifdef SHARED
-	      ,
-#else
-	      == NULL ||
-#endif
-	      __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
-	  && rtld_search_dirs.dirs != (void *) -1)
-	fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
-			&realname, &fb);
-
-      /* Add another newline when we a tracing the library loading.  */
-      if (__builtin_expect (_dl_debug_mask & DL_DEBUG_LIBS, 0))
-        _dl_debug_printf ("\n");
-    }
-  else
-    {
-      /* The path may contain dynamic string tokens.  */
-      realname = (loader
-		  ? expand_dynamic_string_token (loader, name)
-		  : local_strdup (name));
-      if (realname == NULL)
-	fd = -1;
-      else
-	{
-	  fd = open_verify (realname, &fb);
-	  if (__builtin_expect (fd, 0) == -1)
-	    free (realname);
-	}
-    }
-
-  if (__builtin_expect (fd, 0) == -1)
-    {
-      if (trace_mode)
-	{
-	  /* We haven't found an appropriate library.  But since we
-	     are only interested in the list of libraries this isn't
-	     so severe.  Fake an entry with all the information we
-	     have.  */
-	  static const Elf_Symndx dummy_bucket = STN_UNDEF;
-
-	  /* Enter the new object in the list of loaded objects.  */
-	  if ((name_copy = local_strdup (name)) == NULL
-	      || (l = _dl_new_object (name_copy, name, type, loader)) == NULL)
-	    _dl_signal_error (ENOMEM, name, NULL,
-			      N_("cannot create shared object descriptor"));
-	  /* Signal that this is a faked entry.  */
-	  l->l_faked = 1;
-	  /* Since the descriptor is initialized with zero we do not
-	     have do this here.
-	  l->l_reserved = 0; */
-	  l->l_buckets = &dummy_bucket;
-	  l->l_nbuckets = 1;
-	  l->l_relocated = 1;
-
-	  return l;
-	}
-      else
-	_dl_signal_error (errno, name, NULL,
-			  N_("cannot open shared object file"));
-    }
-
-  return _dl_map_object_from_fd (name, fd, &fb, realname, loader, type, mode);
-}
diff --git a/newlib/libc/sys/linux/dl/dl-local.h b/newlib/libc/sys/linux/dl/dl-local.h
deleted file mode 100644
index 3629ab9..0000000
--- a/newlib/libc/sys/linux/dl/dl-local.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef _LOCAL_H
-#include <dlfcn.h>
-
-#define internal_function
-
-/* Internally used flag.  */
-#define __RTLD_DLOPEN	0x80000000
-#define __RTLD_SPROF	0x40000000
-
-/* Now define the internal interfaces.  */
-extern void *__dlvsym (void *__handle, __const char *__name,
-		       __const char *__version);
-
-extern void *__libc_dlopen  (__const char *__name);
-extern void *__libc_dlsym   (void *__map, __const char *__name);
-extern int   __libc_dlclose (void *__map);
-
-/* Locate shared object containing the given address.  */
-extern int _dl_addr (const void *address, Dl_info *info)
-     internal_function;
-
-/* Open the shared object NAME, relocate it, and run its initializer if it
-   hasn't already been run.  MODE is as for `dlopen' (see <dlfcn.h>).  If
-   the object is already opened, returns its existing map.  */
-extern void *_dl_open (const char *name, int mode, const void *caller)
-     internal_function;
-
-/* Close an object previously opened by _dl_open.  */
-extern void _dl_close (void *map)
-     internal_function;
-
-/* Look up NAME in shared object HANDLE (which may be RTLD_DEFAULT or
-   RTLD_NEXT).  WHO is the calling function, for RTLD_NEXT.  Returns
-   the symbol value, which may be NULL.  */
-extern void *_dl_sym (void *handle, const char *name, void *who)
-    internal_function;
-
-/* Look up version VERSION of symbol NAME in shared object HANDLE
-   (which may be RTLD_DEFAULT or RTLD_NEXT).  WHO is the calling
-   function, for RTLD_NEXT.  Returns the symbol value, which may be
-   NULL.  */
-extern void *_dl_vsym (void *handle, const char *name, const char *version,
-		       void *who)
-    internal_function;
-
-/* Call OPERATE, catching errors from `dl_signal_error'.  If there is no
-   error, *ERRSTRING is set to null.  If there is an error, *ERRSTRING is
-   set to a string constructed from the strings passed to _dl_signal_error,
-   and the error code passed is the return value and *OBJNAME is set to
-   the object name which experienced the problems.  ERRSTRING if nonzero
-   points to a malloc'ed string which the caller has to free after use.
-   ARGS is passed as argument to OPERATE.  */
-extern int _dl_catch_error (const char **objname, const char **errstring,
-			    void (*operate) (void *),
-			    void *args)
-     internal_function;
-
-/* Helper function for <dlfcn.h> functions.  Runs the OPERATE function via
-   _dl_catch_error.  Returns zero for success, nonzero for failure; and
-   arranges for `dlerror' to return the error details.
-   ARGS is passed as argument to OPERATE.  */
-extern int _dlerror_run (void (*operate) (void *), void *args)
-     internal_function;
-
-#endif
diff --git a/newlib/libc/sys/linux/dl/dl-lookup.c b/newlib/libc/sys/linux/dl/dl-lookup.c
deleted file mode 100644
index 9fc296c..0000000
--- a/newlib/libc/sys/linux/dl/dl-lookup.c
+++ /dev/null
@@ -1,654 +0,0 @@
-/* Look up a symbol in the loaded objects.
-   Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <alloca.h>
-#include <libintl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ldsodefs.h>
-#include "dl-hash.h"
-#include <machine/dl-machine.h>
-#include <bits/libc-lock.h>
-
-#include <assert.h>
-
-#define VERSTAG(tag)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (tag))
-
-/* We need this string more than once.  */
-static const char undefined_msg[] = "undefined symbol: ";
-
-
-struct sym_val
-  {
-    const ElfW(Sym) *s;
-    struct link_map *m;
-  };
-
-
-#define make_string(string, rest...) \
-  ({									      \
-    const char *all[] = { string, ## rest };				      \
-    size_t len, cnt;							      \
-    char *result, *cp;							      \
-									      \
-    len = 1;								      \
-    for (cnt = 0; cnt < sizeof (all) / sizeof (all[0]); ++cnt)		      \
-      len += strlen (all[cnt]);						      \
-									      \
-    cp = result = alloca (len);						      \
-    for (cnt = 0; cnt < sizeof (all) / sizeof (all[0]); ++cnt)		      \
-    {                                                                         \
-      cp = strcpy (cp, all[cnt]);					      \
-      cp += strlen(all[cnt]);                                                 \
-    }                                                                         \
-									      \
-    result;								      \
-  })
-
-/* Statistics function.  */
-unsigned long int _dl_num_relocations;
-
-
-/* We have two different situations when looking up a simple: with or
-   without versioning.  gcc is not able to optimize a single function
-   definition serving for both purposes so we define two functions.  */
-#define VERSIONED	0
-#include "do-lookup.h"
-
-#define VERSIONED	1
-#include "do-lookup.h"
-
-
-/* Add extra dependency on MAP to UNDEF_MAP.  */
-static int
-internal_function
-add_dependency (struct link_map *undef_map, struct link_map *map)
-{
-  struct link_map **list;
-  struct link_map *runp;
-  unsigned int act;
-  unsigned int i;
-  int result = 0;
-
-  /* Avoid self-references.  */
-  if (undef_map == map)
-    return 0;
-
-  /* Make sure nobody can unload the object while we are at it.  */
-#ifdef HAVE_DD_LOCK
-    __lock_acquire(_dl_load_lock);
-#endif
-
-
-  /* Determine whether UNDEF_MAP already has a reference to MAP.  First
-     look in the normal dependencies.  */
-  if (undef_map->l_searchlist.r_list != NULL)
-    {
-      list = undef_map->l_initfini;
-
-      for (i = 0; list[i] != NULL; ++i)
-	if (list[i] == map)
-	  goto out;
-    }
-
-  /* No normal dependency.  See whether we already had to add it
-     to the special list of dynamic dependencies.  */
-  list = undef_map->l_reldeps;
-  act = undef_map->l_reldepsact;
-
-  for (i = 0; i < act; ++i)
-    if (list[i] == map)
-      goto out;
-
-  /* The object is not yet in the dependency list.  Before we add
-     it make sure just one more time the object we are about to
-     reference is still available.  There is a brief period in
-     which the object could have been removed since we found the
-     definition.  */
-  runp = _dl_loaded;
-  while (runp != NULL && runp != map)
-    runp = runp->l_next;
-
-  if (runp != NULL)
-    {
-      /* The object is still available.  Add the reference now.  */
-      if (__builtin_expect (act >= undef_map->l_reldepsmax, 0))
-	{
-	  /* Allocate more memory for the dependency list.  Since this
-	     can never happen during the startup phase we can use
-	     `realloc'.  */
-	  void *newp;
-
-	  undef_map->l_reldepsmax += 5;
-	  newp = realloc (undef_map->l_reldeps,
-			  undef_map->l_reldepsmax
-			  * sizeof (struct link_map *));
-
-	  if (__builtin_expect (newp != NULL, 1))
-	    undef_map->l_reldeps = (struct link_map **) newp;
-	  else
-	    /* Correct the addition.  */
-	    undef_map->l_reldepsmax -= 5;
-	}
-
-      /* If we didn't manage to allocate memory for the list this is
-	 no fatal mistake.  We simply increment the use counter of the
-	 referenced object and don't record the dependencies.  This
-	 means this increment can never be reverted and the object
-	 will never be unloaded.  This is semantically the correct
-	 behaviour.  */
-      if (__builtin_expect (act < undef_map->l_reldepsmax, 1))
-	undef_map->l_reldeps[undef_map->l_reldepsact++] = map;
-
-      if (map->l_searchlist.r_list != NULL)
-	/* And increment the counter in the referenced object.  */
-	++map->l_opencount;
-      else
-	/* We have to bump the counts for all dependencies since so far
-	   this object was only a normal or transitive dependency.
-	   Now it might be closed with _dl_close() directly.  */
-	for (list = map->l_initfini; *list != NULL; ++list)
-	  ++(*list)->l_opencount;
-
-      /* Display information if we are debugging.  */
-      if (__builtin_expect (_dl_debug_mask & DL_DEBUG_FILES, 0))
-	_dl_debug_printf ("\
-\nfile=%s;  needed by %s (relocation dependency)\n\n",
-			  map->l_name[0] ? map->l_name : _dl_argv[0],
-			  undef_map->l_name[0]
-			  ? undef_map->l_name : _dl_argv[0]);
-    }
-  else
-    /* Whoa, that was bad luck.  We have to search again.  */
-    result = -1;
-
- out:
-  /* Release the lock.  */
-#ifdef HAVE_DD_LOCK
-    __lock_release(_dl_load_lock);
-#endif
-
-
-  return result;
-}
-
-static int
-internal_function
-_dl_do_lookup (const char *undef_name, unsigned long int hash,
-	       const ElfW(Sym) *ref, struct sym_val *result,
-	       struct r_scope_elem *scope, size_t i,
-	       struct link_map *skip, int type_class);
-static int
-internal_function
-_dl_do_lookup_versioned (const char *undef_name, unsigned long int hash,
-			 const ElfW(Sym) *ref, struct sym_val *result,
-			 struct r_scope_elem *scope, size_t i,
-			 const struct r_found_version *const version,
-			 struct link_map *skip, int type_class);
-
-
-/* Search loaded objects' symbol tables for a definition of the symbol
-   UNDEF_NAME.  */
-
-lookup_t
-internal_function
-_dl_lookup_symbol (const char *undef_name, struct link_map *undef_map,
-		   const ElfW(Sym) **ref, struct r_scope_elem *symbol_scope[],
-		   int type_class, int explicit)
-{
-  unsigned long int hash = _dl_elf_hash (undef_name);
-  struct sym_val current_value = { NULL, NULL };
-  struct r_scope_elem **scope;
-  int protected;
-
-  ++_dl_num_relocations;
-
-  /* Search the relevant loaded objects for a definition.  */
-  for (scope = symbol_scope; *scope; ++scope)
-    if (do_lookup (undef_name, hash, *ref, &current_value, *scope, 0, NULL,
-		   type_class))
-      {
-	/* We have to check whether this would bind UNDEF_MAP to an object
-	   in the global scope which was dynamically loaded.  In this case
-	   we have to prevent the latter from being unloaded unless the
-	   UNDEF_MAP object is also unloaded.  */
-	if (__builtin_expect (current_value.m->l_type == lt_loaded, 0)
-	    /* Don't do this for explicit lookups as opposed to implicit
-	       runtime lookups.  */
-	    && ! explicit
-	    /* Add UNDEF_MAP to the dependencies.  */
-	    && add_dependency (undef_map, current_value.m) < 0)
-	  /* Something went wrong.  Perhaps the object we tried to reference
-	     was just removed.  Try finding another definition.  */
-	  return _dl_lookup_symbol (undef_name, undef_map, ref, symbol_scope,
-				    type_class, 0);
-
-	break;
-      }
-
-  if (__builtin_expect (current_value.s == NULL, 0))
-    {
-      const char *reference_name = undef_map ? undef_map->l_name : NULL;
-
-      if (*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK)
-	/* We could find no value for a strong reference.  */
-	/* XXX We cannot translate the messages.  */
-	_dl_signal_cerror (0, (reference_name && reference_name[0]
-			       ? reference_name
-			       : (_dl_argv[0] ?: "<main program>")),
-			   N_("relocation error"),
-			   make_string (undefined_msg, undef_name));
-      *ref = NULL;
-      return 0;
-    }
-
-  protected = *ref && ELFW(ST_VISIBILITY) ((*ref)->st_other) == STV_PROTECTED;
-
-  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_BINDINGS, 0))
-    {
-      const char *reference_name = undef_map ? undef_map->l_name : NULL;
-
-      _dl_debug_printf ("binding file %s to %s: %s symbol `%s'\n",
-			(reference_name && reference_name[0]
-			 ? reference_name : (_dl_argv[0] ?: "<main program>")),
-			current_value.m->l_name[0]
-			? current_value.m->l_name : _dl_argv[0],
-			protected ? "protected" : "normal", undef_name);
-    }
-
-  if (__builtin_expect (protected == 0, 1))
-    {
-      *ref = current_value.s;
-      return LOOKUP_VALUE (current_value.m);
-    }
-  else
-    {
-      /* It is very tricky. We need to figure out what value to
-         return for the protected symbol */
-      struct sym_val protected_value = { NULL, NULL };
-
-      for (scope = symbol_scope; *scope; ++scope)
-	if (_dl_do_lookup (undef_name, hash, *ref, &protected_value, *scope,
-			   0, NULL, ELF_RTYPE_CLASS_PLT))
-	  break;
-
-      if (protected_value.s == NULL || protected_value.m == undef_map)
-	{
-	  *ref = current_value.s;
-	  return LOOKUP_VALUE (current_value.m);
-	}
-
-      return LOOKUP_VALUE (undef_map);
-    }
-}
-
-
-/* This function is nearly the same as `_dl_lookup_symbol' but it
-   skips in the first list all objects until SKIP_MAP is found.  I.e.,
-   it only considers objects which were loaded after the described
-   object.  If there are more search lists the object described by
-   SKIP_MAP is only skipped.  */
-lookup_t
-internal_function
-_dl_lookup_symbol_skip (const char *undef_name,
-			struct link_map *undef_map, const ElfW(Sym) **ref,
-			struct r_scope_elem *symbol_scope[],
-			struct link_map *skip_map)
-{
-  const char *reference_name = undef_map ? undef_map->l_name : NULL;
-  const unsigned long int hash = _dl_elf_hash (undef_name);
-  struct sym_val current_value = { NULL, NULL };
-  struct r_scope_elem **scope;
-  size_t i;
-  int protected;
-
-  ++_dl_num_relocations;
-
-  /* Search the relevant loaded objects for a definition.  */
-  scope = symbol_scope;
-  for (i = 0; (*scope)->r_list[i] != skip_map; ++i)
-    assert (i < (*scope)->r_nlist);
-
-  if (! _dl_do_lookup (undef_name, hash, *ref, &current_value, *scope, i,
-		       skip_map, 0))
-    while (*++scope)
-      if (_dl_do_lookup (undef_name, hash, *ref, &current_value, *scope, 0,
-			 skip_map, 0))
-	break;
-
-  if (__builtin_expect (current_value.s == NULL, 0))
-    {
-      *ref = NULL;
-      return 0;
-    }
-
-  protected = *ref && ELFW(ST_VISIBILITY) ((*ref)->st_other) == STV_PROTECTED;
-
-  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_BINDINGS, 0))
-    _dl_debug_printf ("binding file %s to %s: %s symbol `%s'\n",
-		       (reference_name && reference_name[0]
-			? reference_name : (_dl_argv[0] ?: "<main program>")),
-		       current_value.m->l_name[0]
-		       ? current_value.m->l_name : _dl_argv[0],
-		       protected ? "protected" : "normal", undef_name);
-
-  if (__builtin_expect (protected == 0, 1))
-    {
-      *ref = current_value.s;
-      return LOOKUP_VALUE (current_value.m);
-    }
-  else
-    {
-      /* It is very tricky.  We need to figure out what value to
-         return for the protected symbol.  */
-      struct sym_val protected_value = { NULL, NULL };
-
-      if (i >= (*scope)->r_nlist
-	  || !_dl_do_lookup (undef_name, hash, *ref, &protected_value, *scope,
-			     i, skip_map, ELF_RTYPE_CLASS_PLT))
-	while (*++scope)
-	  if (_dl_do_lookup (undef_name, hash, *ref, &protected_value, *scope,
-			     0, skip_map, ELF_RTYPE_CLASS_PLT))
-	    break;
-
-      if (protected_value.s == NULL || protected_value.m == undef_map)
-	{
-	  *ref = current_value.s;
-	  return LOOKUP_VALUE (current_value.m);
-	}
-
-      return LOOKUP_VALUE (undef_map);
-    }
-}
-
-
-/* This function works like _dl_lookup_symbol but it takes an
-   additional arguement with the version number of the requested
-   symbol.
-
-   XXX We'll see whether we need this separate function.  */
-lookup_t
-internal_function
-_dl_lookup_versioned_symbol (const char *undef_name,
-			     struct link_map *undef_map, const ElfW(Sym) **ref,
-			     struct r_scope_elem *symbol_scope[],
-			     const struct r_found_version *version,
-			     int type_class, int explicit)
-{
-  unsigned long int hash = _dl_elf_hash (undef_name);
-  struct sym_val current_value = { NULL, NULL };
-  struct r_scope_elem **scope;
-  int protected;
-
-  ++_dl_num_relocations;
-
-  /* Search the relevant loaded objects for a definition.  */
-  for (scope = symbol_scope; *scope; ++scope)
-    {
-      int res = do_lookup_versioned (undef_name, hash, *ref, &current_value,
-				     *scope, 0, version, NULL, type_class);
-      if (res > 0)
-	{
-	  /* We have to check whether this would bind UNDEF_MAP to an object
-	     in the global scope which was dynamically loaded.  In this case
-	     we have to prevent the latter from being unloaded unless the
-	     UNDEF_MAP object is also unloaded.  */
-	  if (__builtin_expect (current_value.m->l_type == lt_loaded, 0)
-	      /* Don't do this for explicit lookups as opposed to implicit
-		 runtime lookups.  */
-	      && ! explicit
-	      /* Add UNDEF_MAP to the dependencies.  */
-	      && add_dependency (undef_map, current_value.m) < 0)
-	    /* Something went wrong.  Perhaps the object we tried to reference
-	       was just removed.  Try finding another definition.  */
-	    return _dl_lookup_versioned_symbol (undef_name, undef_map, ref,
-						symbol_scope, version,
-						type_class, 0);
-
-	  break;
-	}
-
-      if (__builtin_expect (res, 0) < 0)
-	{
-	  /* Oh, oh.  The file named in the relocation entry does not
-	     contain the needed symbol.  */
-	  const char *reference_name = undef_map ? undef_map->l_name : NULL;
-
-	  /* XXX We cannot translate the message.  */
-	  _dl_signal_cerror (0, (reference_name && reference_name[0]
-				 ? reference_name
-				 : (_dl_argv[0] ?: "<main program>")),
-			     N_("relocation error"),
-			     make_string ("symbol ", undef_name, ", version ",
-					  version->name,
-					  " not defined in file ",
-					  version->filename,
-					  " with link time reference",
-					  res == -2
-					  ? " (no version symbols)" : ""));
-	  *ref = NULL;
-	  return 0;
-	}
-    }
-
-  if (__builtin_expect (current_value.s == NULL, 0))
-    {
-      if (*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK)
-	{
-	  /* We could find no value for a strong reference.  */
-	  const char *reference_name = undef_map ? undef_map->l_name : NULL;
-
-	  /* XXX We cannot translate the message.  */
-	  _dl_signal_cerror (0, (reference_name && reference_name[0]
-				 ? reference_name
-				 : (_dl_argv[0] ?: "<main program>")), NULL,
-			     make_string (undefined_msg, undef_name,
-					  ", version ",
-					  version->name ?: NULL));
-	}
-      *ref = NULL;
-      return 0;
-    }
-
-  protected = *ref && ELFW(ST_VISIBILITY) ((*ref)->st_other) == STV_PROTECTED;
-
-  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_BINDINGS, 0))
-    {
-      const char *reference_name = undef_map ? undef_map->l_name : NULL;
-
-      _dl_debug_printf ("binding file %s to %s: %s symbol `%s' [%s]\n",
-			(reference_name && reference_name[0]
-			 ? reference_name : (_dl_argv[0] ?: "<main program>")),
-			current_value.m->l_name[0]
-			? current_value.m->l_name : _dl_argv[0],
-			protected ? "protected" : "normal",
-			undef_name, version->name);
-    }
-
-  if (__builtin_expect (protected == 0, 1))
-    {
-      *ref = current_value.s;
-      return LOOKUP_VALUE (current_value.m);
-    }
-  else
-    {
-      /* It is very tricky. We need to figure out what value to
-         return for the protected symbol */
-      struct sym_val protected_value = { NULL, NULL };
-
-      for (scope = symbol_scope; *scope; ++scope)
-	if (_dl_do_lookup_versioned (undef_name, hash, *ref, &protected_value,
-				     *scope, 0, version, NULL,
-				     ELF_RTYPE_CLASS_PLT))
-	  break;
-
-      if (protected_value.s == NULL || protected_value.m == undef_map)
-	{
-	  *ref = current_value.s;
-	  return LOOKUP_VALUE (current_value.m);
-	}
-
-      return LOOKUP_VALUE (undef_map);
-    }
-}
-
-
-/* Similar to _dl_lookup_symbol_skip but takes an additional argument
-   with the version we are looking for.  */
-lookup_t
-internal_function
-_dl_lookup_versioned_symbol_skip (const char *undef_name,
-				  struct link_map *undef_map,
-				  const ElfW(Sym) **ref,
-				  struct r_scope_elem *symbol_scope[],
-				  const struct r_found_version *version,
-				  struct link_map *skip_map)
-{
-  const char *reference_name = undef_map ? undef_map->l_name : NULL;
-  const unsigned long int hash = _dl_elf_hash (undef_name);
-  struct sym_val current_value = { NULL, NULL };
-  struct r_scope_elem **scope;
-  size_t i;
-  int protected;
-
-  ++_dl_num_relocations;
-
-  /* Search the relevant loaded objects for a definition.  */
-  scope = symbol_scope;
-  for (i = 0; (*scope)->r_list[i] != skip_map; ++i)
-    assert (i < (*scope)->r_nlist);
-
-  if (! _dl_do_lookup_versioned (undef_name, hash, *ref, &current_value,
-				 *scope, i, version, skip_map, 0))
-    while (*++scope)
-      if (_dl_do_lookup_versioned (undef_name, hash, *ref, &current_value,
-				   *scope, 0, version, skip_map, 0))
-	break;
-
-  if (__builtin_expect (current_value.s == NULL, 0))
-    {
-      if (*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK)
-	{
-	  /* We could find no value for a strong reference.  */
-	  const size_t len = strlen (undef_name);
-	  char buf[sizeof undefined_msg + len];
-          char *tmp;
-          tmp = memcpy (buf, undefined_msg, sizeof undefined_msg - 1);
-          tmp += (sizeof undefined_msg - 1);
-
-	  memcpy (tmp, undef_name, len + 1);
-
-	  /* XXX We cannot translate the messages.  */
-	  _dl_signal_cerror (0, (reference_name && reference_name[0]
-				 ? reference_name
-				 : (_dl_argv[0] ?: "<main program>")),
-			     NULL, buf);
-	}
-      *ref = NULL;
-      return 0;
-    }
-
-  protected = *ref && ELFW(ST_VISIBILITY) ((*ref)->st_other) == STV_PROTECTED;
-
-  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_BINDINGS, 0))
-    _dl_debug_printf ("binding file %s to %s: %s symbol `%s' [%s]\n",
-		      (reference_name && reference_name[0]
-		       ? reference_name : (_dl_argv[0] ?: "<main program>")),
-		      current_value.m->l_name[0]
-		      ? current_value.m->l_name : _dl_argv[0],
-		      protected ? "protected" : "normal",
-		      undef_name, version->name);
-
-  if (__builtin_expect (protected == 0, 1))
-    {
-      *ref = current_value.s;
-      return LOOKUP_VALUE (current_value.m);
-    }
-  else
-    {
-      /* It is very tricky. We need to figure out what value to
-         return for the protected symbol */
-      struct sym_val protected_value = { NULL, NULL };
-
-      if (i >= (*scope)->r_nlist
-	  || !_dl_do_lookup_versioned (undef_name, hash, *ref,
-				       &protected_value, *scope, i, version,
-				       skip_map, ELF_RTYPE_CLASS_PLT))
-	while (*++scope)
-	  if (_dl_do_lookup_versioned (undef_name, hash, *ref,
-				       &protected_value, *scope, 0, version,
-				       skip_map, ELF_RTYPE_CLASS_PLT))
-	    break;
-
-      if (protected_value.s == NULL || protected_value.m == undef_map)
-	{
-	  *ref = current_value.s;
-	  return LOOKUP_VALUE (current_value.m);
-	}
-
-      return LOOKUP_VALUE (undef_map);
-    }
-}
-
-
-/* Cache the location of MAP's hash table.  */
-
-void
-internal_function
-_dl_setup_hash (struct link_map *map)
-{
-  Elf_Symndx *hash;
-  Elf_Symndx nchain;
-
-  if (!map->l_info[DT_HASH])
-    return;
-  hash = (void *)(map->l_addr + map->l_info[DT_HASH]->d_un.d_ptr);
-
-  map->l_nbuckets = *hash++;
-  nchain = *hash++;
-  map->l_buckets = hash;
-  hash += map->l_nbuckets;
-  map->l_chain = hash;
-}
-
-/* These are here so that we only inline do_lookup{,_versioned} in the common
-   case, not everywhere.  */
-static int
-internal_function
-_dl_do_lookup (const char *undef_name, unsigned long int hash,
-	       const ElfW(Sym) *ref, struct sym_val *result,
-	       struct r_scope_elem *scope, size_t i,
-	       struct link_map *skip, int type_class)
-{
-  return do_lookup (undef_name, hash, ref, result, scope, i, skip,
-		    type_class);
-}
-
-static int
-internal_function
-_dl_do_lookup_versioned (const char *undef_name, unsigned long int hash,
-			 const ElfW(Sym) *ref, struct sym_val *result,
-			 struct r_scope_elem *scope, size_t i,
-			 const struct r_found_version *const version,
-			 struct link_map *skip, int type_class)
-{
-  return do_lookup_versioned (undef_name, hash, ref, result, scope, i,
-			      version, skip, type_class);
-}
diff --git a/newlib/libc/sys/linux/dl/dl-lookupcfg.h b/newlib/libc/sys/linux/dl/dl-lookupcfg.h
deleted file mode 100644
index 810e8c7..0000000
--- a/newlib/libc/sys/linux/dl/dl-lookupcfg.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Configuration of lookup functions.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Some platforms need more information from the symbol lookup function
-   than just the address.  But this is not generally the case.  */
-#undef DL_LOOKUP_RETURNS_MAP
diff --git a/newlib/libc/sys/linux/dl/dl-minimal.c b/newlib/libc/sys/linux/dl/dl-minimal.c
deleted file mode 100644
index 807bfad..0000000
--- a/newlib/libc/sys/linux/dl/dl-minimal.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/* Minimal replacements for basic facilities used in the dynamic linker.
-   Copyright (C) 1995,96,97,98,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <limits.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <ldsodefs.h>
-#include <machine/weakalias.h>
-
-#include <assert.h>
-
-/* Minimal `malloc' allocator for use while loading shared libraries.
-   No block is ever freed.  */
-
-static void *alloc_ptr, *alloc_end, *alloc_last_block;
-
-/* Declarations of global functions.  */
-extern void weak_function free (void *ptr);
-extern void * weak_function realloc (void *ptr, size_t n);
-extern unsigned long int weak_function __strtoul_internal
-(const char *nptr, char **endptr, int base, int group);
-extern unsigned long int weak_function strtoul (const char *nptr,
-						char **endptr, int base);
-
-
-void * weak_function
-malloc (size_t n)
-{
-#ifdef MAP_ANON
-#define	_dl_zerofd (-1)
-#else
-  extern int _dl_zerofd;
-
-  if (_dl_zerofd == -1)
-    _dl_zerofd = _dl_sysdep_open_zero_fill ();
-#define MAP_ANON 0
-#endif
-
-  if (alloc_end == 0)
-    {
-      /* Consume any unused space in the last page of our data segment.  */
-      extern int _end;
-      alloc_ptr = &_end;
-      alloc_end = (void *) 0 + (((alloc_ptr - (void *) 0) + _dl_pagesize - 1)
-				& ~(_dl_pagesize - 1));
-    }
-
-  /* Make sure the allocation pointer is ideally aligned.  */
-  alloc_ptr = (void *) 0 + (((alloc_ptr - (void *) 0) + sizeof (double) - 1)
-			    & ~(sizeof (double) - 1));
-
-  if (alloc_ptr + n >= alloc_end)
-    {
-      /* Insufficient space left; allocate another page.  */
-      caddr_t page;
-      size_t nup = (n + _dl_pagesize - 1) & ~(_dl_pagesize - 1);
-      page = __mmap (0, nup, PROT_READ|PROT_WRITE,
-		     MAP_ANON|MAP_PRIVATE, _dl_zerofd, 0);
-      assert (page != MAP_FAILED);
-      if (page != alloc_end)
-	alloc_ptr = page;
-      alloc_end = page + nup;
-    }
-
-  alloc_last_block = (void *) alloc_ptr;
-  alloc_ptr += n;
-  return alloc_last_block;
-}
-
-/* We use this function occasionally since the real implementation may
-   be optimized when it can assume the memory it returns already is
-   set to NUL.  */
-void * weak_function
-calloc (size_t nmemb, size_t size)
-{
-  size_t total = nmemb * size;
-  void *result = malloc (total);
-  return memset (result, '\0', total);
-}
-
-/* This will rarely be called.  */
-void weak_function
-free (void *ptr)
-{
-  /* We can free only the last block allocated.  */
-  if (ptr == alloc_last_block)
-    alloc_ptr = alloc_last_block;
-}
-
-/* This is only called with the most recent block returned by malloc.  */
-void * weak_function
-realloc (void *ptr, size_t n)
-{
-  void *new;
-  if (ptr == NULL)
-    return malloc (n);
-  assert (ptr == alloc_last_block);
-  alloc_ptr = alloc_last_block;
-  new = malloc (n);
-  assert (new == ptr);
-  return new;
-}
-
-
-/* Define our own version of the internal function used by strerror.  We
-   only provide the messages for some common errors.  This avoids pulling
-   in the whole error list.  */
-
-char * weak_function
-__strerror_r (int errnum, char *buf, size_t buflen)
-{
-  char *msg;
-
-  switch (errnum)
-    {
-    case ENOMEM:
-      msg = (char *) "Cannot allocate memory";
-      break;
-    case EINVAL:
-      msg = (char *) "Invalid argument";
-      break;
-    case ENOENT:
-      msg = (char *) "No such file or directory";
-      break;
-    case EPERM:
-      msg = (char *) "Operation not permitted";
-      break;
-    case EIO:
-      msg = (char *) "Input/output error";
-      break;
-    case EACCES:
-      msg = (char *) "Permission denied";
-      break;
-    default:
-      /* No need to check buffer size, all calls in the dynamic linker
-	 provide enough space.  */
-      msg = (char *) "Error";
-      break;
-    }
-
-  return msg;
-}
-
-#ifndef NDEBUG
-
-/* Define (weakly) our own assert failure function which doesn't use stdio.
-   If we are linked into the user program (-ldl), the normal __assert_fail
-   defn can override this one.  */
-
-void weak_function
-__assert_fail (const char *assertion,
-	       const char *file, unsigned int line, const char *function)
-{
-  _dl_fatal_printf ("\
-Inconsistency detected by ld.so: %s: %u: %s%sAssertion `%s' failed!\n",
-		    file, line, function ?: "", function ? ": " : "",
-		    assertion);
-
-}
-
-void weak_function
-__assert_perror_fail (int errnum,
-		      const char *file, unsigned int line,
-		      const char *function)
-{
-  char errbuf[64];
-  _dl_fatal_printf ("\
-Inconsistency detected by ld.so: %s: %u: %s%sUnexpected error: %s\n",
-		    file, line, function ?: "", function ? ": " : "",
-		    __strerror_r (errnum, errbuf, sizeof (errbuf)));
-}
-
-#endif
-
-unsigned long int weak_function
-__strtoul_internal (const char *nptr, char **endptr, int base, int group)
-{
-  unsigned long int result = 0;
-  long int sign = 1;
-
-  while (*nptr == ' ' || *nptr == '\t')
-    ++nptr;
-
-  if (*nptr == '-')
-    {
-      sign = -1;
-      ++nptr;
-    }
-  else if (*nptr == '+')
-    ++nptr;
-
-  if (*nptr < '0' || *nptr > '9')
-    {
-      if (endptr != NULL)
-	*endptr = (char *) nptr;
-      return 0UL;
-    }
-
-  assert (base == 0);
-  base = 10;
-  if (*nptr == '0')
-    {
-      if (nptr[1] == 'x' || nptr[1] == 'X')
-	{
-	  base = 16;
-	  nptr += 2;
-	}
-      else
-	base = 8;
-    }
-
-  while (*nptr >= '0' && *nptr <= '9')
-    {
-      unsigned long int digval = *nptr - '0';
-      if (result > LONG_MAX / 10
-	  || (result == ULONG_MAX / 10 && digval > ULONG_MAX % 10))
-	{
-	  errno = ERANGE;
-	  if (endptr != NULL)
-	    *endptr = (char *) nptr;
-	  return ULONG_MAX;
-	}
-      result *= base;
-      result += digval;
-      ++nptr;
-    }
-
-  if (endptr != NULL)
-    *endptr = (char *) nptr;
-  return result * sign;
-}
diff --git a/newlib/libc/sys/linux/dl/dl-misc.c b/newlib/libc/sys/linux/dl/dl-misc.c
deleted file mode 100644
index 1a4c297..0000000
--- a/newlib/libc/sys/linux/dl/dl-misc.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* Miscellaneous support functions for dynamic linker
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <fcntl.h>
-#include <ldsodefs.h>
-#include <limits.h>
-#include <link.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/uio.h>
-
-#ifndef MAP_ANON
-/* This is the only dl-sysdep.c function that is actually needed at run-time
-   by _dl_map_object.  */
-
-int
-_dl_sysdep_open_zero_fill (void)
-{
-  return __open ("/dev/zero", O_RDONLY);
-}
-#endif
-
-/* Read the whole contents of FILE into new mmap'd space with given
-   protections.  *SIZEP gets the size of the file.  On error MAP_FAILED
-   is returned.  */
-
-void *
-internal_function
-_dl_sysdep_read_whole_file (const char *file, size_t *sizep, int prot)
-{
-  void *result = MAP_FAILED;
-  struct stat64 st;
-  int fd = __open (file, O_RDONLY);
-  if (fd >= 0)
-    {
-      if (fstat64 (fd, &st) >= 0)
-	{
-	  *sizep = st.st_size;
-
-	  /* No need to map the file if it is empty.  */
-	  if (*sizep != 0)
-	    /* Map a copy of the file contents.  */
-	    result = mmap (NULL, *sizep, prot,
-#ifdef MAP_COPY
-			     MAP_COPY
-#else
-			     MAP_PRIVATE
-#endif
-#ifdef MAP_FILE
-			     | MAP_FILE
-#endif
-			     , fd, 0);
-	}
-      close (fd);
-    }
-  return result;
-}
-
-
-/* Descriptor to write debug messages to.  */
-int _dl_debug_fd = 2;
-
-
-/* Bare-bone printf implementation.  This function only knows about
-   the formats and flags needed and can handle only up to 64 stripes in
-   the output.  */
-static void
-_dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg)
-{
-  const int niovmax = 64;
-  struct iovec iov[niovmax];
-  int niov = 0;
-  pid_t pid = 0;
-  char pidbuf[7];
-
-  while (*fmt != '\0')
-    {
-      const char *startp = fmt;
-
-      if (tag_p > 0)
-	{
-	  /* Generate the tag line once.  It consists of the PID and a
-	     colon followed by a tab.  */
-	  if (pid == 0)
-	    {
-	      char *p = "0";
-	      pid = __getpid ();
-	      assert (pid >= 0 && pid < 100000);
-	      while (p > pidbuf)
-		*--p = '0';
-	      pidbuf[5] = ':';
-	      pidbuf[6] = '\t';
-	    }
-
-	  /* Append to the output.  */
-	  assert (niov < niovmax);
-	  iov[niov].iov_len = 7;
-	  iov[niov++].iov_base = pidbuf;
-
-	  /* No more tags until we see the next newline.  */
-	  tag_p = -1;
-	}
-
-      /* Skip everything except % and \n (if tags are needed).  */
-      while (*fmt != '\0' && *fmt != '%' && (! tag_p || *fmt != '\n'))
-	++fmt;
-
-      /* Append constant string.  */
-      assert (niov < niovmax);
-      if ((iov[niov].iov_len = fmt - startp) != 0)
-	iov[niov++].iov_base = (char *) startp;
-
-      if (*fmt == '%')
-	{
-	  /* It is a format specifier.  */
-	  char fill = ' ';
-	  int width = -1;
-#if LONG_MAX != INT_MAX
-	  int long_mod = 0;
-#endif
-
-	  /* Recognize zero-digit fill flag.  */
-	  if (*++fmt == '0')
-	    {
-	      fill = '0';
-	      ++fmt;
-	    }
-
-	  /* See whether with comes from a parameter.  Note that no other
-	     way to specify the width is implemented.  */
-	  if (*fmt == '*')
-	    {
-	      width = va_arg (arg, int);
-	      ++fmt;
-	    }
-
-	  /* Recognize the l modifier.  It is only important on some
-	     platforms where long and int have a different size.  We
-	     can use the same code for size_t.  */
-	  if (*fmt == 'l' || *fmt == 'Z')
-	    {
-#if LONG_MAX != INT_MAX
-	      long_mod = 1;
-#endif
-	      ++fmt;
-	    }
-
-	  switch (*fmt)
-	    {
-	      /* Integer formatting.  */
-	    case 'u':
-	    case 'x':
-	      {
-		/* We have to make a difference if long and int have a
-		   different size.  */
-#if LONG_MAX != INT_MAX
-		unsigned long int num = (long_mod
-					 ? va_arg (arg, unsigned long int)
-					 : va_arg (arg, unsigned int));
-#else
-		unsigned long int num = va_arg (arg, unsigned int);
-#endif
-		/* We use alloca() to allocate the buffer with the most
-		   pessimistic guess for the size.  Using alloca() allows
-		   having more than one integer formatting in a call.  */
-		char *buf = (char *) alloca (3 * sizeof (unsigned long int));
-		char *endp = &buf[3 * sizeof (unsigned long int)];
-		char *cp = "0"; 
-
-		/* Pad to the width the user specified.  */
-		if (width != -1)
-		  while (endp - cp < width)
-		    *--cp = fill;
-
-		iov[niov].iov_base = cp;
-		iov[niov].iov_len = endp - cp;
-		++niov;
-	      }
-	      break;
-
-	    case 's':
-	      /* Get the string argument.  */
-	      iov[niov].iov_base = va_arg (arg, char *);
-	      iov[niov].iov_len = strlen (iov[niov].iov_base);
-	      ++niov;
-	      break;
-
-	    case '%':
-	      iov[niov].iov_base = (void *) fmt;
-	      iov[niov].iov_len = 1;
-	      ++niov;
-	      break;
-
-	    default:
-	      assert (! "invalid format specifier");
-	    }
-	  ++fmt;
-	}
-      else if (*fmt == '\n')
-	{
-	  /* See whether we have to print a single newline character.  */
-	  if (fmt == startp)
-	    {
-	      iov[niov].iov_base = (char *) startp;
-	      iov[niov++].iov_len = 1;
-	    }
-	  else
-	    /* No, just add it to the rest of the string.  */
-	    ++iov[niov - 1].iov_len;
-
-	  /* Next line, print a tag again.  */
-	  tag_p = 1;
-	  ++fmt;
-	}
-    }
-
-  /* Finally write the result.  */
-  writev (fd, iov, niov);
-}
-
-
-/* Write to debug file.  */
-void
-_dl_debug_printf (const char *fmt, ...)
-{
-  va_list arg;
-
-  va_start (arg, fmt);
-  _dl_debug_vdprintf (_dl_debug_fd, 1, fmt, arg);
-  va_end (arg);
-}
-
-
-/* Write to debug file but don't start with a tag.  */
-void
-_dl_debug_printf_c (const char *fmt, ...)
-{
-  va_list arg;
-
-  va_start (arg, fmt);
-  _dl_debug_vdprintf (_dl_debug_fd, -1, fmt, arg);
-  va_end (arg);
-}
-
-
-/* Write the given file descriptor.  */
-void
-_dl_dprintf (int fd, const char *fmt, ...)
-{
-  va_list arg;
-
-  va_start (arg, fmt);
-  _dl_debug_vdprintf (fd, 0, fmt, arg);
-  va_end (arg);
-}
diff --git a/newlib/libc/sys/linux/dl/dl-object.c b/newlib/libc/sys/linux/dl/dl-object.c
deleted file mode 100644
index 1e2049e..0000000
--- a/newlib/libc/sys/linux/dl/dl-object.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Storage management for the chain of loaded shared objects.
-   Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <ldsodefs.h>
-
-#include <assert.h>
-
-
-/* Allocate a `struct link_map' for a new object being loaded,
-   and enter it into the _dl_loaded list.  */
-
-struct link_map *
-internal_function
-_dl_new_object (char *realname, const char *libname, int type,
-		struct link_map *loader)
-{
-  struct link_map *l;
-  int idx;
-  size_t libname_len = strlen (libname) + 1;
-  struct link_map *new;
-  struct libname_list *newname;
-
-  new = (struct link_map *) calloc (sizeof (*new) + sizeof (*newname)
-				    + libname_len, 1);
-  if (new == NULL)
-    return NULL;
-
-  new->l_libname = newname = (struct libname_list *) (new + 1);
-  newname->name = (char *) memcpy (newname + 1, libname, libname_len);
-  /* newname->next = NULL;	We use calloc therefore not necessary.  */
-  newname->dont_free = 1;
-
-  new->l_name = realname;
-  new->l_type = type;
-  new->l_loader = loader;
-  /* new->l_global = 0;	We use calloc therefore not necessary.  */
-
-  /* Use the 'l_scope_mem' array by default for the the 'l_scope'
-     information.  If we need more entries we will allocate a large
-     array dynamically.  */
-  new->l_scope = new->l_scope_mem;
-  new->l_scope_max = sizeof (new->l_scope_mem) / sizeof (new->l_scope_mem[0]);
-
-  /* Counter for the scopes we have to handle.  */
-  idx = 0;
-
-  if (_dl_loaded != NULL)
-    {
-      l = _dl_loaded;
-      while (l->l_next != NULL)
-	l = l->l_next;
-      new->l_prev = l;
-      /* new->l_next = NULL;	Would be necessary but we use calloc.  */
-      l->l_next = new;
-
-      /* Add the global scope.  */
-      new->l_scope[idx++] = &_dl_loaded->l_searchlist;
-    }
-  else
-    _dl_loaded = new;
-  ++_dl_nloaded;
-
-  /* If we have no loader the new object acts as it.  */
-  if (loader == NULL)
-    loader = new;
-  else
-    /* Determine the local scope.  */
-    while (loader->l_loader != NULL)
-      loader = loader->l_loader;
-
-  /* Insert the scope if it isn't the global scope we already added.  */
-  if (idx == 0 || &loader->l_searchlist != new->l_scope[0])
-    new->l_scope[idx] = &loader->l_searchlist;
-
-  new->l_local_scope[0] = &new->l_searchlist;
-
-  /* Don't try to find the origin for the main map which has the name "".  */
-  if (realname[0] != '\0')
-    {
-      size_t realname_len = strlen (realname) + 1;
-      char *origin;
-      char *cp;
-
-      if (realname[0] == '/')
-	{
-	  /* It is an absolute path.  Use it.  But we have to make a
-	     copy since we strip out the trailing slash.  */
-	  cp = origin = (char *) malloc (realname_len);
-	  if (origin == NULL)
-	    {
-	      origin = (char *) -1;
-	      goto out;
-	    }
-	}
-      else
-	{
-	  size_t len = realname_len;
-	  char *result = NULL;
-
-	  /* Get the current directory name.  */
-	  origin = NULL;
-	  do
-	    {
-	      len += 128;
-	      origin = (char *) realloc (origin, len);
-	    }
-	  while (origin != NULL
-		 && (result = getcwd (origin, len - realname_len)) == NULL
-		 && errno == ERANGE);
-
-	  if (result == NULL)
-	    {
-	      /* We were not able to determine the current directory.
-	         Note that free(origin) is OK if origin == NULL.  */
-	      free (origin);
-	      origin = (char *) -1;
-	      goto out;
-	    }
-
-	  /* Find the end of the path and see whether we have to add
-	     a slash.  */
-	  cp = memchr (origin, '\0', strlen(origin));
-	  if (cp[-1] != '/')
-	    *cp++ = '/';
-	}
-
-      /* Add the real file name.  */
-      memcpy (cp, realname, realname_len);
-
-      /* Now remove the filename and the slash.  Leave the slash if it
-	 the name is something like "/foo".  */
-      cp = strrchr (origin, '/');
-      if (cp == origin)
-	origin[1] = '\0';
-      else
-	*cp = '\0';
-
-    out:
-      new->l_origin = origin;
-    }
-
-  return new;
-}
diff --git a/newlib/libc/sys/linux/dl/dl-open.c b/newlib/libc/sys/linux/dl/dl-open.c
deleted file mode 100644
index 4e068d4..0000000
--- a/newlib/libc/sys/linux/dl/dl-open.c
+++ /dev/null
@@ -1,487 +0,0 @@
-/* Load a shared object at runtime, relocate it, and run its initializer.
-   Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <dlfcn.h>
-#include <errno.h>
-#include <libintl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/mman.h>		/* Check whether MAP_COPY is defined.  */
-#include <sys/param.h>
-#include <ldsodefs.h>
-#include <bp-sym.h>
-
-#include <dl-dst.h>
-#include <machine/weakalias.h>
-
-
-extern ElfW(Addr) _dl_sysdep_start (void **start_argptr,
-				    void (*dl_main) (const ElfW(Phdr) *phdr,
-						     ElfW(Word) phnum,
-						     ElfW(Addr) *user_entry))
-				   weak_function;
-
-/* This function is used to unload the cache file if necessary.  */
-extern void _dl_unload_cache (void);
-
-int __libc_argc = 0;
-char **__libc_argv = NULL;
-
-extern char **environ;
-
-extern int _dl_lazy;			/* Do we do lazy relocations?  */
-
-/* Undefine the following for debugging.  */
-/* #define SCOPE_DEBUG 1 */
-#ifdef SCOPE_DEBUG
-static void show_scope (struct link_map *new);
-#endif
-
-extern size_t _dl_platformlen;
-
-/* We must be carefull not to leave us in an inconsistent state.  Thus we
-   catch any error and re-raise it after cleaning up.  */
-
-struct dl_open_args
-{
-  const char *file;
-  int mode;
-  const void *caller;
-  struct link_map *map;
-};
-
-
-static int
-add_to_global (struct link_map *new)
-{
-  struct link_map **new_global;
-  unsigned int to_add = 0;
-  unsigned int cnt;
-
-  /* Count the objects we have to put in the global scope.  */
-  for (cnt = 0; cnt < new->l_searchlist.r_nlist; ++cnt)
-    if (new->l_searchlist.r_list[cnt]->l_global == 0)
-      ++to_add;
-
-  /* The symbols of the new objects and its dependencies are to be
-     introduced into the global scope that will be used to resolve
-     references from other dynamically-loaded objects.
-
-     The global scope is the searchlist in the main link map.  We
-     extend this list if necessary.  There is one problem though:
-     since this structure was allocated very early (before the libc
-     is loaded) the memory it uses is allocated by the malloc()-stub
-     in the ld.so.  When we come here these functions are not used
-     anymore.  Instead the malloc() implementation of the libc is
-     used.  But this means the block from the main map cannot be used
-     in an realloc() call.  Therefore we allocate a completely new
-     array the first time we have to add something to the locale scope.  */
-
-  if (_dl_global_scope_alloc == 0)
-    {
-      /* This is the first dynamic object given global scope.  */
-      _dl_global_scope_alloc = _dl_main_searchlist->r_nlist + to_add + 8;
-      new_global = (struct link_map **)
-	malloc (_dl_global_scope_alloc * sizeof (struct link_map *));
-      if (new_global == NULL)
-	{
-	  _dl_global_scope_alloc = 0;
-	nomem:
-	  _dl_signal_error (ENOMEM, new->l_libname->name, NULL,
-			    N_("cannot extend global scope"));
-	  return 1;
-	}
-
-      /* Copy over the old entries.  */
-      memcpy (new_global, _dl_main_searchlist->r_list,
-	      (_dl_main_searchlist->r_nlist * sizeof (struct link_map *)));
-
-      _dl_main_searchlist->r_list = new_global;
-    }
-  else if (_dl_main_searchlist->r_nlist + to_add > _dl_global_scope_alloc)
-    {
-      /* We have to extend the existing array of link maps in the
-	 main map.  */
-      new_global = (struct link_map **)
-	realloc (_dl_main_searchlist->r_list,
-		 ((_dl_global_scope_alloc + to_add + 8)
-		  * sizeof (struct link_map *)));
-      if (new_global == NULL)
-	goto nomem;
-
-      _dl_global_scope_alloc += to_add + 8;
-      _dl_main_searchlist->r_list = new_global;
-    }
-
-  /* Now add the new entries.  */
-  for (cnt = 0; cnt < new->l_searchlist.r_nlist; ++cnt)
-    {
-      struct link_map *map = new->l_searchlist.r_list[cnt];
-
-      if (map->l_global == 0)
-	{
-	  map->l_global = 1;
-	  _dl_main_searchlist->r_list[_dl_main_searchlist->r_nlist] = map;
-	  ++_dl_main_searchlist->r_nlist;
-	}
-    }
-
-  return 0;
-}
-
-
-static void
-dl_open_worker (void *a)
-{
-  struct dl_open_args *args = a;
-  const char *file = args->file;
-  int mode = args->mode;
-  struct link_map *new, *l;
-  const char *dst;
-  int lazy;
-  unsigned int i;
-
-  /* Maybe we have to expand a DST.  */
-  dst = strchr (file, '$');
-  if (dst != NULL)
-    {
-      const void *caller = args->caller;
-      size_t len = strlen (file);
-      size_t required;
-      struct link_map *call_map;
-      char *new_file;
-
-      /* We have to find out from which object the caller is calling.  */
-      call_map = NULL;
-      for (l = _dl_loaded; l; l = l->l_next)
-	if (caller >= (const void *) l->l_map_start
-	    && caller < (const void *) l->l_map_end)
-	  {
-	    /* There must be exactly one DSO for the range of the virtual
-	       memory.  Otherwise something is really broken.  */
-	    call_map = l;
-	    break;
-	  }
-
-      if (call_map == NULL)
-	/* In this case we assume this is the main application.  */
-	call_map = _dl_loaded;
-
-      /* Determine how much space we need.  We have to allocate the
-	 memory locally.  */
-      required = DL_DST_REQUIRED (call_map, file, len, _dl_dst_count (dst, 0));
-
-      /* Get space for the new file name.  */
-      new_file = (char *) alloca (required + 1);
-
-      /* Generate the new file name.  */
-      DL_DST_SUBSTITUTE (call_map, file, new_file, 0);
-
-      /* If the substitution failed don't try to load.  */
-      if (*new_file == '\0')
-	_dl_signal_error (0, "dlopen", NULL,
-			  N_("empty dynamic string token substitution"));
-
-      /* Now we have a new file name.  */
-      file = new_file;
-    }
-
-  /* Load the named object.  */
-  args->map = new = _dl_map_object (NULL, file, 0, lt_loaded, 0,
-				    mode);
-
-  /* If the pointer returned is NULL this means the RTLD_NOLOAD flag is
-     set and the object is not already loaded.  */
-  if (new == NULL)
-    {
-      assert (mode & RTLD_NOLOAD);
-      return;
-    }
-
-  /* It was already open.  */
-  if (new->l_searchlist.r_list != NULL)
-    {
-      /* Let the user know about the opencount.  */
-      if (__builtin_expect (_dl_debug_mask & DL_DEBUG_FILES, 0))
-	_dl_debug_printf ("opening file=%s; opencount == %u\n\n",
-			  new->l_name, new->l_opencount);
-
-      /* If the user requested the object to be in the global namespace
-	 but it is not so far, add it now.  */
-      if ((mode & RTLD_GLOBAL) && new->l_global == 0)
-	(void) add_to_global (new);
-
-      /* Increment just the reference counter of the object.  */
-      ++new->l_opencount;
-
-      return;
-    }
-
-  /* Load that object's dependencies.  */
-  _dl_map_object_deps (new, NULL, 0, 0);
-
-  /* So far, so good.  Now check the versions.  */
-  for (i = 0; i < new->l_searchlist.r_nlist; ++i)
-    if (new->l_searchlist.r_list[i]->l_versions == NULL)
-      (void) _dl_check_map_versions (new->l_searchlist.r_list[i], 0, 0);
-
-#ifdef SCOPE_DEBUG
-  show_scope (new);
-#endif
-
-  /* Only do lazy relocation if `LD_BIND_NOW' is not set.  */
-  lazy = (mode & RTLD_BINDING_MASK) == RTLD_LAZY && _dl_lazy;
-
-  /* Relocate the objects loaded.  We do this in reverse order so that copy
-     relocs of earlier objects overwrite the data written by later objects.  */
-
-  l = new;
-  while (l->l_next)
-    l = l->l_next;
-  while (1)
-    {
-      if (! l->l_relocated)
-	{
-#if 0
-#ifdef SHARED
-	  if (_dl_profile != NULL)
-	    {
-	      /* If this here is the shared object which we want to profile
-		 make sure the profile is started.  We can find out whether
-	         this is necessary or not by observing the `_dl_profile_map'
-	         variable.  If was NULL but is not NULL afterwars we must
-		 start the profiling.  */
-	      struct link_map *old_profile_map = _dl_profile_map;
-
-	      _dl_relocate_object (l, l->l_scope, 1, 1);
-
-	      if (old_profile_map == NULL && _dl_profile_map != NULL)
-		/* We must prepare the profiling.  */
-		_dl_start_profile (_dl_profile_map, _dl_profile_output);
-	    }
-	  else
-#endif
-#endif
-	    _dl_relocate_object (l, l->l_scope, lazy, 0);
-	}
-
-      if (l == new)
-	break;
-      l = l->l_prev;
-    }
-
-  /* Increment the open count for all dependencies.  If the file is
-     not loaded as a dependency here add the search list of the newly
-     loaded object to the scope.  */
-  for (i = 0; i < new->l_searchlist.r_nlist; ++i)
-    if (++new->l_searchlist.r_list[i]->l_opencount > 1
-	&& new->l_searchlist.r_list[i]->l_type == lt_loaded)
-      {
-	struct link_map *imap = new->l_searchlist.r_list[i];
-	struct r_scope_elem **runp = imap->l_scope;
-	size_t cnt = 0;
-
-	while (*runp != NULL)
-	  {
-	    /* This can happen if imap was just loaded, but during
-	       relocation had l_opencount bumped because of relocation
-	       dependency.  Avoid duplicates in l_scope.  */
-	    if (__builtin_expect (*runp == &new->l_searchlist, 0))
-	      break;
-
-	    ++cnt;
-	    ++runp;
-	  }
-
-	if (*runp != NULL)
-	  /* Avoid duplicates.  */
-	  continue;
-
-	if (__builtin_expect (cnt + 1 >= imap->l_scope_max, 0))
-	  {
-	    /* The 'r_scope' array is too small.  Allocate a new one
-	       dynamically.  */
-	    struct r_scope_elem **newp;
-	    size_t new_size = imap->l_scope_max * 2;
-
-	    if (imap->l_scope == imap->l_scope_mem)
-	      {
-		newp = (struct r_scope_elem **)
-		  malloc (new_size * sizeof (struct r_scope_elem *));
-		if (newp == NULL)
-		  _dl_signal_error (ENOMEM, "dlopen", NULL,
-				    N_("cannot create scope list"));
-		imap->l_scope = memcpy (newp, imap->l_scope,
-					cnt * sizeof (imap->l_scope[0]));
-	      }
-	    else
-	      {
-		newp = (struct r_scope_elem **)
-		  realloc (imap->l_scope,
-			   new_size * sizeof (struct r_scope_elem *));
-		if (newp == NULL)
-		  _dl_signal_error (ENOMEM, "dlopen", NULL,
-				    N_("cannot create scope list"));
-		imap->l_scope = newp;
-	      }
-
-	    imap->l_scope_max = new_size;
-	  }
-
-	imap->l_scope[cnt++] = &new->l_searchlist;
-	imap->l_scope[cnt] = NULL;
-      }
-
-  /* Run the initializer functions of new objects.  */
-  _dl_init (new, __libc_argc, __libc_argv, environ);
-
-  /* Now we can make the new map available in the global scope.  */
-  if (mode & RTLD_GLOBAL)
-    /* Move the object in the global namespace.  */
-    if (add_to_global (new) != 0)
-      /* It failed.  */
-      return;
-
-  /* Mark the object as not deletable if the RTLD_NODELETE flags was
-     passed.  */
-  if (__builtin_expect (mode & RTLD_NODELETE, 0))
-    new->l_flags_1 |= DF_1_NODELETE;
-
-  /* Let the user know about the opencount.  */
-  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_FILES, 0))
-    _dl_debug_printf ("opening file=%s; opencount == %u\n\n",
-		      new->l_name, new->l_opencount);
-}
-
-
-void *
-internal_function
-_dl_open (const char *file, int mode, const void *caller)
-{
-  struct dl_open_args args;
-  const char *objname;
-  const char *errstring;
-  int errcode;
-
-  if ((mode & RTLD_BINDING_MASK) == 0)
-    /* One of the flags must be set.  */
-    _dl_signal_error (EINVAL, file, NULL, N_("invalid mode for dlopen()"));
-
-  /* Make sure we are alone.  */
-#ifdef HAVE_DD_LOCK
-    __lock_acquire_recursive(_dl_load_lock);
-#endif
-
-  args.file = file;
-  args.mode = mode;
-  args.caller = caller;
-  args.map = NULL;
-  errcode = _dl_catch_error (&objname, &errstring, dl_open_worker, &args);
-
-#ifndef MAP_COPY
-  /* We must munmap() the cache file.  */
-  _dl_unload_cache ();
-#endif
-
-  /* Release the lock.  */
-#ifdef HAVE_DD_LOCK
-    __lock_release_recursive(_dl_load_lock);
-#endif
-
-
-  if (errstring)
-    {
-      /* Some error occurred during loading.  */
-      char *local_errstring;
-      size_t len_errstring;
-
-      /* Remove the object from memory.  It may be in an inconsistent
-	 state if relocation failed, for example.  */
-      if (args.map)
-	{
-	  unsigned int i;
-
-	  /* Increment open counters for all objects since this has
-	     not happened yet.  */
-	  for (i = 0; i < args.map->l_searchlist.r_nlist; ++i)
-	    ++args.map->l_searchlist.r_list[i]->l_opencount;
-
-	  _dl_close (args.map);
-	}
-
-      /* Make a local copy of the error string so that we can release the
-	 memory allocated for it.  */
-      len_errstring = strlen (errstring) + 1;
-      if (objname == errstring + len_errstring)
-	{
-	  size_t total_len = len_errstring + strlen (objname) + 1;
-	  local_errstring = alloca (total_len);
-	  memcpy (local_errstring, errstring, total_len);
-	  objname = local_errstring + len_errstring;
-	}
-      else
-	{
-	  local_errstring = alloca (len_errstring);
-	  memcpy (local_errstring, errstring, len_errstring);
-	}
-
-      if (errstring != _dl_out_of_memory)
-	free ((char *) errstring);
-
-      /* Reraise the error.  */
-      _dl_signal_error (errcode, objname, NULL, local_errstring);
-    }
-
-#ifndef SHARED
-  DL_STATIC_INIT (args.map);
-#endif
-
-  return args.map;
-}
-
-
-#ifdef SCOPE_DEBUG
-#include <unistd.h>
-
-static void
-show_scope (struct link_map *new)
-{
-  int scope_cnt;
-
-  for (scope_cnt = 0; new->l_scope[scope_cnt] != NULL; ++scope_cnt)
-    {
-      char numbuf[2];
-      unsigned int cnt;
-
-      numbuf[0] = '0' + scope_cnt;
-      numbuf[1] = '\0';
-      _dl_printf ("scope %s:", numbuf);
-
-      for (cnt = 0; cnt < new->l_scope[scope_cnt]->r_nlist; ++cnt)
-	if (*new->l_scope[scope_cnt]->r_list[cnt]->l_name)
-	  _dl_printf (" %s", new->l_scope[scope_cnt]->r_list[cnt]->l_name);
-	else
-	  _dl_printf (" <main>");
-
-      _dl_printf ("\n");
-    }
-}
-#endif
diff --git a/newlib/libc/sys/linux/dl/dl-osinfo.h b/newlib/libc/sys/linux/dl/dl-osinfo.h
deleted file mode 100644
index 4976b31..0000000
--- a/newlib/libc/sys/linux/dl/dl-osinfo.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Operating system specific code  for generic dynamic loader functions.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <string.h>
-#include <sys/sysctl.h>
-#include <sys/utsname.h>
-#include "kernel-features.h"
-
-#ifndef MIN
-# define MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-
-#ifdef SHARED
-/* This is the function used in the dynamic linker to print the fatal error
-   message.  */
-static inline void
-__attribute__ ((__noreturn__))
-dl_fatal (const char *str)
-{
-  _dl_dprintf (2, str);
-  _exit (1);
-}
-#endif
-
-
-#define DL_SYSDEP_OSCHECK(FATAL) \
-  do {									      \
-    /* Test whether the kernel is new enough.  This test is only	      \
-       performed if the library is not compiled to run on all		      \
-       kernels.  */							      \
-    if (__LINUX_KERNEL_VERSION > 0)					      \
-      {									      \
-	char bufmem[64];						      \
-	char *buf = bufmem;						      \
-	unsigned int version;						      \
-	int parts;							      \
-	char *cp;							      \
-	struct utsname uts;						      \
-									      \
-	/* Try the uname syscall */					      \
-	if (__uname (&uts))					      	      \
-	  {							      	      \
-	    /* This was not successful.  Now try reading the /proc	      \
-	       filesystem.  */						      \
-	    ssize_t reslen;						      \
-	    int fd = __open ("/proc/sys/kernel/osrelease", O_RDONLY);	      \
-	    if (fd == -1						      \
-		|| (reslen = __read (fd, bufmem, sizeof (bufmem))) <= 0)      \
-  	      /* This also didn't work.  We give up since we cannot	      \
-		 make sure the library can actually work.  */		      \
-	      FATAL ("FATAL: cannot determine library version\n");	      \
-	    __close (fd);						      \
-	    buf[MIN (reslen, (ssize_t) sizeof (bufmem) - 1)] = '\0';	      \
-	  }								      \
-	else								      \
-          buf = uts.release;						      \
-									      \
-	/* Now convert it into a number.  The string consists of at most      \
-	   three parts.  */						      \
-	version = 0;							      \
-	parts = 0;							      \
-	cp = buf;							      \
-	while ((*cp >= '0') && (*cp <= '9'))				      \
-	  {								      \
-	    unsigned int here = *cp++ - '0';				      \
-									      \
-	    while ((*cp >= '0') && (*cp <= '9'))			      \
-	      {								      \
-		here *= 10;						      \
-		here += *cp++ - '0';					      \
-	      }								      \
-									      \
-	    ++parts;							      \
-	    version <<= 8;						      \
-	    version |= here;						      \
-									      \
-	    if (*cp++ != '.')						      \
-	      /* Another part following?  */				      \
-	      break;							      \
-	  }								      \
-									      \
-	if (parts < 3)							      \
-	  version <<= 8 * (3 - parts);					      \
-									      \
-	/* Now we can test with the required version.  */		      \
-	if (version < __LINUX_KERNEL_VERSION)				      \
-	  /* Not sufficent.  */						      \
-	  FATAL ("FATAL: kernel too old\n");				      \
-									      \
-	_dl_osversion = version;					      \
-      }									      \
-  } while (0)
diff --git a/newlib/libc/sys/linux/dl/dl-profile.c b/newlib/libc/sys/linux/dl/dl-profile.c
deleted file mode 100644
index 52c533f..0000000
--- a/newlib/libc/sys/linux/dl/dl-profile.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/* Profiling of shared libraries.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-   Based on the BSD mcount implementation.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ldsodefs.h>
-#include <sys/gmon.h>
-#include <sys/gmon_out.h>
-#include <sys/mman.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <atomicity.h>
-#include <config.h>
-
-/* The LD_PROFILE feature has to be implemented different to the
-   normal profiling using the gmon/ functions.  The problem is that an
-   arbitrary amount of processes simulataneously can be run using
-   profiling and all write the results in the same file.  To provide
-   this mechanism one could implement a complicated mechanism to merge
-   the content of two profiling runs or one could extend the file
-   format to allow more than one data set.  For the second solution we
-   would have the problem that the file can grow in size beyond any
-   limit and both solutions have the problem that the concurrency of
-   writing the results is a big problem.
-
-   Another much simpler method is to use mmap to map the same file in
-   all using programs and modify the data in the mmap'ed area and so
-   also automatically on the disk.  Using the MAP_SHARED option of
-   mmap(2) this can be done without big problems in more than one
-   file.
-
-   This approach is very different from the normal profiling.  We have
-   to use the profiling data in exactly the way they are expected to
-   be written to disk.  But the normal format used by gprof is not usable
-   to do this.  It is optimized for size.  It writes the tags as single
-   bytes but this means that the following 32/64 bit values are
-   unaligned.
-
-   Therefore we use a new format.  This will look like this
-
-					0  1  2  3	<- byte is 32 bit word
-	0000				g  m  o  n
-	0004				*version*	<- GMON_SHOBJ_VERSION
-	0008				00 00 00 00
-	000c				00 00 00 00
-	0010				00 00 00 00
-
-	0014				*tag*		<- GMON_TAG_TIME_HIST
-	0018				?? ?? ?? ??
-					?? ?? ?? ??	<- 32/64 bit LowPC
-	0018+A				?? ?? ?? ??
-					?? ?? ?? ??	<- 32/64 bit HighPC
-	0018+2*A			*histsize*
-	001c+2*A			*profrate*
-	0020+2*A			s  e  c  o
-	0024+2*A			n  d  s  \0
-	0028+2*A			\0 \0 \0 \0
-	002c+2*A			\0 \0 \0
-	002f+2*A			s
-
-	0030+2*A			?? ?? ?? ??	<- Count data
-	...				...
-	0030+2*A+K			?? ?? ?? ??
-
-	0030+2*A+K			*tag*		<- GMON_TAG_CG_ARC
-	0034+2*A+K			*lastused*
-	0038+2*A+K			?? ?? ?? ??
-					?? ?? ?? ??	<- FromPC#1
-	0038+3*A+K			?? ?? ?? ??
-					?? ?? ?? ??	<- ToPC#1
-	0038+4*A+K			?? ?? ?? ??	<- Count#1
-	...				...		   ...
-	0038+(2*(CN-1)+2)*A+(CN-1)*4+K	?? ?? ?? ??
-					?? ?? ?? ??	<- FromPC#CGN
-	0038+(2*(CN-1)+3)*A+(CN-1)*4+K	?? ?? ?? ??
-					?? ?? ?? ??	<- ToPC#CGN
-	0038+(2*CN+2)*A+(CN-1)*4+K	?? ?? ?? ??	<- Count#CGN
-
-   We put (for now?) no basic block information in the file since this would
-   introduce rase conditions among all the processes who want to write them.
-
-   `K' is the number of count entries which is computed as
-
- 		textsize / HISTFRACTION
-
-   `CG' in the above table is the number of call graph arcs.  Normally,
-   the table is sparse and the profiling code writes out only the those
-   entries which are really used in the program run.  But since we must
-   not extend this table (the profiling file) we'll keep them all here.
-   So CN can be executed in advance as
-
-		MINARCS <= textsize*(ARCDENSITY/100) <= MAXARCS
-
-   Now the remaining question is: how to build the data structures we can
-   work with from this data.  We need the from set and must associate the
-   froms with all the associated tos.  We will do this by constructing this
-   data structures at the program start.  To do this we'll simply visit all
-   entries in the call graph table and add it to the appropriate list.  */
-
-extern int __profile_frequency (void);
-
-/* We define a special type to address the elements of the arc table.
-   This is basically the `gmon_cg_arc_record' format but it includes
-   the room for the tag and it uses real types.  */
-struct here_cg_arc_record
-  {
-    uintptr_t from_pc;
-    uintptr_t self_pc;
-    uint32_t count;
-  } __attribute__ ((packed));
-
-static struct here_cg_arc_record *data;
-
-/* Nonzero if profiling is under way.  */
-static int running;
-
-/* This is the number of entry which have been incorporated in the toset.  */
-static uint32_t narcs;
-/* This is a pointer to the object representing the number of entries
-   currently in the mmaped file.  At no point of time this has to be the
-   same as NARCS.  If it is equal all entries from the file are in our
-   lists.  */
-static volatile uint32_t *narcsp;
-
-static volatile uint16_t *kcount;
-static size_t kcountsize;
-
-struct here_fromstruct
-  {
-    struct here_cg_arc_record volatile *here;
-    uint16_t link;
-  };
-
-static volatile uint16_t *tos;
-
-static struct here_fromstruct *froms;
-static uint32_t fromlimit;
-static volatile uint32_t fromidx;
-
-static uintptr_t lowpc;
-static size_t textsize;
-static unsigned int hashfraction;
-static unsigned int log_hashfraction;
-
-
-
-/* Set up profiling data to profile object desribed by MAP.  The output
-   file is found (or created) in OUTPUT_DIR.  */
-void
-internal_function
-_dl_start_profile (struct link_map *map, const char *output_dir)
-{
-  char *filename;
-  int fd;
-  struct stat64 st;
-  const ElfW(Phdr) *ph;
-  ElfW(Addr) mapstart = ~((ElfW(Addr)) 0);
-  ElfW(Addr) mapend = 0;
-  struct gmon_hdr gmon_hdr;
-  struct gmon_hist_hdr hist_hdr;
-  char *hist, *cp, *tmp;
-  size_t idx;
-  size_t tossize;
-  size_t fromssize;
-  uintptr_t highpc;
-  struct gmon_hdr *addr = NULL;
-  off_t expected_size;
-  /* See profil(2) where this is described.  */
-  int s_scale;
-#define SCALE_1_TO_1	0x10000L
-
-  /* Compute the size of the sections which contain program code.  */
-  for (ph = map->l_phdr; ph < &map->l_phdr[map->l_phnum]; ++ph)
-    if (ph->p_type == PT_LOAD && (ph->p_flags & PF_X))
-      {
-	ElfW(Addr) start = (ph->p_vaddr & ~(_dl_pagesize - 1));
-	ElfW(Addr) end = ((ph->p_vaddr + ph->p_memsz + _dl_pagesize - 1)
-			  & ~(_dl_pagesize - 1));
-
-	if (start < mapstart)
-	  mapstart = start;
-	if (end > mapend)
-	  mapend = end;
-      }
-
-  /* Now we can compute the size of the profiling data.  This is done
-     with the same formulars as in `monstartup' (see gmon.c).  */
-  running = 0;
-  lowpc = ROUNDDOWN (mapstart + map->l_addr,
-		     HISTFRACTION * sizeof (HISTCOUNTER));
-  highpc = ROUNDUP (mapend + map->l_addr,
-		    HISTFRACTION * sizeof (HISTCOUNTER));
-  textsize = highpc - lowpc;
-  kcountsize = textsize / HISTFRACTION;
-  hashfraction = HASHFRACTION;
-  if ((HASHFRACTION & (HASHFRACTION - 1)) == 0)
-    /* If HASHFRACTION is a power of two, mcount can use shifting
-       instead of integer division.  Precompute shift amount.  */
-    log_hashfraction = ffs (hashfraction * sizeof (*froms)) - 1;
-  else
-    log_hashfraction = -1;
-  tossize = textsize / HASHFRACTION;
-  fromlimit = textsize * ARCDENSITY / 100;
-  if (fromlimit < MINARCS)
-    fromlimit = MINARCS;
-  if (fromlimit > MAXARCS)
-    fromlimit = MAXARCS;
-  fromssize = fromlimit * sizeof (struct here_fromstruct);
-
-  expected_size = (sizeof (struct gmon_hdr)
-		   + 4 + sizeof (struct gmon_hist_hdr) + kcountsize
-		   + 4 + 4 + fromssize * sizeof (struct here_cg_arc_record));
-
-  /* Create the gmon_hdr we expect or write.  */
-  memset (&gmon_hdr, '\0', sizeof (struct gmon_hdr));
-  memcpy (&gmon_hdr.cookie[0], GMON_MAGIC, sizeof (gmon_hdr.cookie));
-  *(int32_t *) gmon_hdr.version = GMON_SHOBJ_VERSION;
-
-  /* Create the hist_hdr we expect or write.  */
-  *(char **) hist_hdr.low_pc = (char *) mapstart;
-  *(char **) hist_hdr.high_pc = (char *) mapend;
-  *(int32_t *) hist_hdr.hist_size = kcountsize / sizeof (HISTCOUNTER);
-  *(int32_t *) hist_hdr.prof_rate = __profile_frequency ();
-  strncpy (hist_hdr.dimen, "seconds", sizeof (hist_hdr.dimen));
-  hist_hdr.dimen_abbrev = 's';
-
-  /* First determine the output name.  We write in the directory
-     OUTPUT_DIR and the name is composed from the shared objects
-     soname (or the file name) and the ending ".profile".  */
-  filename = (char *) alloca (strlen (output_dir) + 1 + strlen (_dl_profile)
-			      + sizeof ".profile");
-  cp = strcpy (filename, output_dir);
-  cp += strlen (output_dir);
-  *cp++ = '/';
-  tmp = strcpy (cp, _dl_profile);
-  tmp += strlen (_dl_profile);
-  strcpy (tmp, ".profile");
-
-#ifdef O_NOFOLLOW
-# define EXTRA_FLAGS | O_NOFOLLOW
-#else
-# define EXTRA_FLAGS
-#endif
-  fd = __open (filename, O_RDWR | O_CREAT EXTRA_FLAGS);
-  if (fd == -1)
-    {
-      /* We cannot write the profiling data so don't do anything.  */
-      char buf[400];
-      _dl_error_printf ("%s: cannot open file: %s\n", filename,
-			__strerror_r (errno, buf, sizeof buf));
-      return;
-    }
-
-  if (fstat64 (fd, &st) < 0 || !S_ISREG (st.st_mode))
-    {
-      /* Not stat'able or not a regular file => don't use it.  */
-      char buf[400];
-      int errnum = errno;
-      __close (fd);
-      _dl_error_printf ("%s: cannot stat file: %s\n", filename,
-			__strerror_r (errnum, buf, sizeof buf));
-      return;
-    }
-
-  /* Test the size.  If it does not match what we expect from the size
-     values in the map MAP we don't use it and warn the user.  */
-  if (st.st_size == 0)
-    {
-      /* We have to create the file.  */
-      char buf[_dl_pagesize];
-
-      memset (buf, '\0', _dl_pagesize);
-
-      if (__lseek (fd, expected_size & ~(_dl_pagesize - 1), SEEK_SET) == -1)
-	{
-	  char buf[400];
-	  int errnum;
-	cannot_create:
-	  errnum = errno;
-	  __close (fd);
-	  _dl_error_printf ("%s: cannot create file: %s\n", filename,
-			    __strerror_r (errnum, buf, sizeof buf));
-	  return;
-	}
-
-      if (TEMP_FAILURE_RETRY (__libc_write (fd, buf, (expected_size
-						      & (_dl_pagesize - 1))))
-	  < 0)
-	goto cannot_create;
-    }
-  else if (st.st_size != expected_size)
-    {
-      __close (fd);
-    wrong_format:
-
-      if (addr != NULL)
-	__munmap ((void *) addr, expected_size);
-
-      _dl_error_printf ("%s: file is no correct profile data file for `%s'\n",
-			filename, _dl_profile);
-      return;
-    }
-
-  addr = (struct gmon_hdr *) __mmap (NULL, expected_size, PROT_READ|PROT_WRITE,
-				     MAP_SHARED|MAP_FILE, fd, 0);
-  if (addr == (struct gmon_hdr *) MAP_FAILED)
-    {
-      char buf[400];
-      int errnum = errno;
-      __close (fd);
-      _dl_error_printf ("%s: cannot map file: %s\n", filename,
-			__strerror_r (errnum, buf, sizeof buf));
-      return;
-    }
-
-  /* We don't need the file desriptor anymore.  */
-  __close (fd);
-
-  /* Pointer to data after the header.  */
-  hist = (char *) (addr + 1);
-  kcount = (uint16_t *) ((char *) hist + sizeof (uint32_t)
-			 + sizeof (struct gmon_hist_hdr));
-
-  /* Compute pointer to array of the arc information.  */
-  narcsp = (uint32_t *) ((char *) kcount + kcountsize + sizeof (uint32_t));
-  data = (struct here_cg_arc_record *) ((char *) narcsp + sizeof (uint32_t));
-
-  if (st.st_size == 0)
-    {
-      /* Create the signature.  */
-      memcpy (addr, &gmon_hdr, sizeof (struct gmon_hdr));
-
-      *(uint32_t *) hist = GMON_TAG_TIME_HIST;
-      memcpy (hist + sizeof (uint32_t), &hist_hdr,
-	      sizeof (struct gmon_hist_hdr));
-
-      narcsp[-1] = GMON_TAG_CG_ARC;
-    }
-  else
-    {
-      /* Test the signature in the file.  */
-      if (memcmp (addr, &gmon_hdr, sizeof (struct gmon_hdr)) != 0
-	  || *(uint32_t *) hist != GMON_TAG_TIME_HIST
-	  || memcmp (hist + sizeof (uint32_t), &hist_hdr,
-		     sizeof (struct gmon_hist_hdr)) != 0
-	  || narcsp[-1] != GMON_TAG_CG_ARC)
-	goto wrong_format;
-    }
-
-  /* Allocate memory for the froms data and the pointer to the tos records.  */
-  tos = (uint16_t *) calloc (tossize + fromssize, 1);
-  if (tos == NULL)
-    {
-      __munmap ((void *) addr, expected_size);
-      _dl_fatal_printf ("Out of memory while initializing profiler\n");
-      /* NOTREACHED */
-    }
-
-  froms = (struct here_fromstruct *) ((char *) tos + tossize);
-  fromidx = 0;
-
-  /* Now we have to process all the arc count entries.  BTW: it is
-     not critical whether the *NARCSP value changes meanwhile.  Before
-     we enter a new entry in to toset we will check that everything is
-     available in TOS.  This happens in _dl_mcount.
-
-     Loading the entries in reverse order should help to get the most
-     frequently used entries at the front of the list.  */
-  for (idx = narcs = MIN (*narcsp, fromlimit); idx > 0; )
-    {
-      size_t to_index;
-      size_t newfromidx;
-      --idx;
-      to_index = (data[idx].self_pc / (hashfraction * sizeof (*tos)));
-      newfromidx = fromidx++;
-      froms[newfromidx].here = &data[idx];
-      froms[newfromidx].link = tos[to_index];
-      tos[to_index] = newfromidx;
-    }
-
-  /* Setup counting data.  */
-  if (kcountsize < highpc - lowpc)
-    {
-#if 0
-      s_scale = ((double) kcountsize / (highpc - lowpc)) * SCALE_1_TO_1;
-#else
-      size_t range = highpc - lowpc;
-      size_t quot = range / kcountsize;
-
-      if (quot >= SCALE_1_TO_1)
-	s_scale = 1;
-      else if (quot >= SCALE_1_TO_1 / 256)
-	s_scale = SCALE_1_TO_1 / quot;
-      else if (range > ULONG_MAX / 256)
-	s_scale = (SCALE_1_TO_1 * 256) / (range / (kcountsize / 256));
-      else
-	s_scale = (SCALE_1_TO_1 * 256) / ((range * 256) / kcountsize);
-#endif
-    }
-  else
-    s_scale = SCALE_1_TO_1;
-
-  /* Start the profiler.  */
-  profil ((void *) kcount, kcountsize, lowpc, s_scale);
-
-  /* Turn on profiling.  */
-  running = 1;
-}
-
-
-void
-_dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc)
-{
-  volatile uint16_t *topcindex;
-  size_t i, fromindex;
-  struct here_fromstruct *fromp;
-
-  if (! running)
-    return;
-
-  /* Compute relative addresses.  The shared object can be loaded at
-     any address.  The value of frompc could be anything.  We cannot
-     restrict it in any way, just set to a fixed value (0) in case it
-     is outside the allowed range.  These calls show up as calls from
-     <external> in the gprof output.  */
-  frompc -= lowpc;
-  if (frompc >= textsize)
-    frompc = 0;
-  selfpc -= lowpc;
-  if (selfpc >= textsize)
-    goto done;
-
-  /* Getting here we now have to find out whether the location was
-     already used.  If yes we are lucky and only have to increment a
-     counter (this also has to be atomic).  If the entry is new things
-     are getting complicated...  */
-
-  /* Avoid integer divide if possible.  */
-  if ((HASHFRACTION & (HASHFRACTION - 1)) == 0)
-    i = selfpc >> log_hashfraction;
-  else
-    i = selfpc / (hashfraction * sizeof (*tos));
-
-  topcindex = &tos[i];
-  fromindex = *topcindex;
-
-  if (fromindex == 0)
-    goto check_new_or_add;
-
-  fromp = &froms[fromindex];
-
-  /* We have to look through the chain of arcs whether there is already
-     an entry for our arc.  */
-  while (fromp->here->from_pc != frompc)
-    {
-      if (fromp->link != 0)
-	do
-	  fromp = &froms[fromp->link];
-	while (fromp->link != 0 && fromp->here->from_pc != frompc);
-
-      if (fromp->here->from_pc != frompc)
-	{
-	  topcindex = &fromp->link;
-
-	check_new_or_add:
-	  /* Our entry is not among the entries we read so far from the
-	     data file.  Now see whether we have to update the list.  */
-	  while (narcs != *narcsp && narcs < fromlimit)
-	    {
-	      size_t to_index;
-	      size_t newfromidx;
-	      to_index = (data[narcs].self_pc
-			  / (hashfraction * sizeof (*tos)));
-	      newfromidx = exchange_and_add (&fromidx, 1) + 1;
-	      froms[newfromidx].here = &data[narcs];
-	      froms[newfromidx].link = tos[to_index];
-	      tos[to_index] = newfromidx;
-	      atomic_add (&narcs, 1);
-	    }
-
-	  /* If we still have no entry stop searching and insert.  */
-	  if (*topcindex == 0)
-	    {
-	      uint32_t newarc = exchange_and_add (narcsp, 1);
-
-	      /* In rare cases it could happen that all entries in FROMS are
-		 occupied.  So we cannot count this anymore.  */
-	      if (newarc >= fromlimit)
-		goto done;
-
-	      *topcindex = exchange_and_add (&fromidx, 1) + 1;
-	      fromp = &froms[*topcindex];
-
-	      fromp->here = &data[newarc];
-	      data[newarc].from_pc = frompc;
-	      data[newarc].self_pc = selfpc;
-	      data[newarc].count = 0;
-	      fromp->link = 0;
-	      atomic_add (&narcs, 1);
-
-	      break;
-	    }
-
-	  fromp = &froms[*topcindex];
-	}
-      else
-	/* Found in.  */
-	break;
-    }
-
-  /* Increment the counter.  */
-  atomic_add (&fromp->here->count, 1);
-
- done:
-  ;
-}
diff --git a/newlib/libc/sys/linux/dl/dl-profstub.c b/newlib/libc/sys/linux/dl/dl-profstub.c
deleted file mode 100644
index 4175886..0000000
--- a/newlib/libc/sys/linux/dl/dl-profstub.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Helper definitions for profiling of shared libraries.
-   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <dlfcn.h>
-#include <elf.h>
-#include <ldsodefs.h>
-#include <libc-symbols.h>
-
-/* This is the map for the shared object we profile.  It is defined here
-   only because we test for this value being NULL or not.  */
-extern struct link_map *_dl_profile_map;
-
-
-void
-_dl_mcount_wrapper (void *selfpc)
-{
-  _dl_mcount ((ElfW(Addr)) RETURN_ADDRESS (0), (ElfW(Addr)) selfpc);
-}
-
-
-void
-_dl_mcount_wrapper_check (void *selfpc)
-{
-  if (_dl_profile_map != NULL)
-    _dl_mcount ((ElfW(Addr)) RETURN_ADDRESS (0), (ElfW(Addr)) selfpc);
-}
diff --git a/newlib/libc/sys/linux/dl/dl-reloc.c b/newlib/libc/sys/linux/dl/dl-reloc.c
deleted file mode 100644
index 0bffa4e..0000000
--- a/newlib/libc/sys/linux/dl/dl-reloc.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/* Relocate a shared object and resolve its references to other loaded objects.
-   Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <libintl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <ldsodefs.h>
-#include <sys/mman.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include "dynamic-link.h"
-
-/* Statistics function.  */
-unsigned long int _dl_num_cache_relocations;
-
-
-void
-_dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
-		     int lazy, int consider_profiling)
-{
-  struct textrels
-  {
-    caddr_t start;
-    size_t len;
-    int prot;
-    struct textrels *next;
-  } *textrels = NULL;
-  /* Initialize it to make the compiler happy.  */
-  const char *errstring = NULL;
-
-  if (l->l_relocated)
-    return;
-
-  /* If DT_BIND_NOW is set relocate all references in this object.  We
-     do not do this if we are profiling, of course.  */
-  if (!consider_profiling
-      && __builtin_expect (l->l_info[DT_BIND_NOW] != NULL, 0))
-    lazy = 0;
-
-  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_RELOC, 0))
-    _dl_printf ("\nrelocation processing: %s%s\n",
-		l->l_name[0] ? l->l_name : _dl_argv[0], lazy ? " (lazy)" : "");
-
-  /* DT_TEXTREL is now in level 2 and might phase out at some time.
-     But we rewrite the DT_FLAGS entry to a DT_TEXTREL entry to make
-     testing easier and therefore it will be available at all time.  */
-  if (__builtin_expect (l->l_info[DT_TEXTREL] != NULL, 0))
-    {
-      /* Bletch.  We must make read-only segments writable
-	 long enough to relocate them.  */
-      const ElfW(Phdr) *ph;
-      for (ph = l->l_phdr; ph < &l->l_phdr[l->l_phnum]; ++ph)
-	if (ph->p_type == PT_LOAD && (ph->p_flags & PF_W) == 0)
-	  {
-	    struct textrels *newp;
-
-	    newp = (struct textrels *) alloca (sizeof (*newp));
-	    newp->len = (((ph->p_vaddr + ph->p_memsz + _dl_pagesize - 1)
-			  & ~(_dl_pagesize - 1))
-			 - (ph->p_vaddr & ~(_dl_pagesize - 1)));
-	    newp->start = ((ph->p_vaddr & ~(_dl_pagesize - 1))
-			   + (caddr_t) l->l_addr);
-
-	    if (mprotect (newp->start, newp->len, PROT_READ|PROT_WRITE) < 0)
-	      {
-		errstring = N_("cannot make segment writable for relocation");
-	      call_error:
-		_dl_signal_error (errno, l->l_name, NULL, errstring);
-	      }
-
-#if (PF_R | PF_W | PF_X) == 7 && (PROT_READ | PROT_WRITE | PROT_EXEC) == 7
-	    newp->prot = (PF_TO_PROT
-			  >> ((ph->p_flags & (PF_R | PF_W | PF_X)) * 4)) & 0xf;
-#else
-	    newp->prot = 0;
-	    if (ph->p_flags & PF_R)
-	      newp->prot |= PROT_READ;
-	    if (ph->p_flags & PF_W)
-	      newp->prot |= PROT_WRITE;
-	    if (ph->p_flags & PF_X)
-	      newp->prot |= PROT_EXEC;
-#endif
-	    newp->next = textrels;
-	    textrels = newp;
-	  }
-    }
-
-  {
-    /* Do the actual relocation of the object's GOT and other data.  */
-
-    /* This macro is used as a callback from the ELF_DYNAMIC_RELOCATE code.  */
-#define RESOLVE_MAP(ref, version, r_type, scope) \
-    (ELFW(ST_BIND) ((*ref)->st_info) != STB_LOCAL			      \
-     ? ((__builtin_expect ((*ref) == map->l_lookup_cache.sym, 0)	      \
-	 && elf_machine_type_class (r_type) == map->l_lookup_cache.type_class)\
-	? (++_dl_num_cache_relocations,					      \
-	   (*ref) = map->l_lookup_cache.ret,				      \
-	   map->l_lookup_cache.value)					      \
-	: ({ lookup_t _lr;						      \
-	     int _tc = elf_machine_type_class (r_type);			      \
-	     map->l_lookup_cache.type_class = _tc;			      \
-	     map->l_lookup_cache.sym = (*ref);				      \
-	     _lr = ((version) != NULL && (version)->hash != 0		      \
-		    ? _dl_lookup_versioned_symbol (strtab + (*ref)->st_name,  \
-						   map, (ref), scope,	      \
-						   (version), _tc, 0)	      \
-		    : _dl_lookup_symbol (strtab + (*ref)->st_name, map, (ref),\
-					 scope, _tc, 0));		      \
-	     map->l_lookup_cache.ret = (*ref);				      \
-	     map->l_lookup_cache.value = _lr; }))				      \
-     : map)
-#define RESOLVE(ref, version, r_type, scope) \
-    (ELFW(ST_BIND) ((*ref)->st_info) != STB_LOCAL			      \
-     ? ((__builtin_expect ((*ref) == map->l_lookup_cache.sym, 0)	      \
-	 && elf_machine_type_class (r_type) == map->l_lookup_cache.type_class)\
-	? (++_dl_num_cache_relocations,					      \
-	   (*ref) = map->l_lookup_cache.ret,				      \
-	   map->l_lookup_cache.value)					      \
-	: ({ lookup_t _lr;						      \
-	     int _tc = elf_machine_type_class (r_type);			      \
-	     map->l_lookup_cache.type_class = _tc;			      \
-	     map->l_lookup_cache.sym = (*ref);				      \
-	     _lr = ((version) != NULL && (version)->hash != 0		      \
-		    ? _dl_lookup_versioned_symbol (strtab + (*ref)->st_name,  \
-						   map, (ref), scope,	      \
-						   (version), _tc, 0)	      \
-		    : _dl_lookup_symbol (strtab + (*ref)->st_name, map, (ref),\
-					 scope, _tc, 0));		      \
-	     map->l_lookup_cache.ret = (*ref);				      \
-	     map->l_lookup_cache.value = _lr; }))			      \
-     : map->l_addr)
-
-#include "dynamic-link.h"
-
-    ELF_DYNAMIC_RELOCATE (l, lazy, consider_profiling);
-
-    if (__builtin_expect (consider_profiling, 0))
-      {
-	/* Allocate the array which will contain the already found
-	   relocations.  If the shared object lacks a PLT (for example
-	   if it only contains lead function) the l_info[DT_PLTRELSZ]
-	   will be NULL.  */
-	if (l->l_info[DT_PLTRELSZ] == NULL)
-	  {
-	    errstring = N_("%s: profiler found no PLTREL in object %s\n");
-	  fatal:
-	    _dl_fatal_printf (errstring,
-			      _dl_argv[0] ?: "<program name unknown>",
-			      l->l_name);
-	  }
-
-	l->l_reloc_result =
-	  (ElfW(Addr) *) calloc (sizeof (ElfW(Addr)),
-				 l->l_info[DT_PLTRELSZ]->d_un.d_val);
-	if (l->l_reloc_result == NULL)
-	  {
-	    errstring = N_("\
-%s: profiler out of memory shadowing PLTREL of %s\n");
-	    goto fatal;
-	  }
-      }
-  }
-
-  /* Mark the object so we know this work has been done.  */
-  l->l_relocated = 1;
-
-  /* Undo the segment protection changes.  */
-  while (__builtin_expect (textrels != NULL, 0))
-    {
-      if (mprotect (textrels->start, textrels->len, textrels->prot) < 0)
-	{
-	  errstring = N_("cannot restore segment prot after reloc");
-	  goto call_error;
-	}
-
-      textrels = textrels->next;
-    }
-}
-
-#include <machine/dl-machine.h>
-
-void
-internal_function
-_dl_reloc_bad_type (struct link_map *map, unsigned int type, int plt)
-{
-  /* XXX We cannot translate these messages.  */
-  static const char msg[2][32] = { "unexpected reloc type",
-				   "unexpected PLT reloc type" };
-  char msgbuf[sizeof (msg[0])];
-
-  strcpy (msgbuf, msg[plt]);
-
-  _dl_signal_error (0, map->l_name, NULL, msgbuf);
-}
diff --git a/newlib/libc/sys/linux/dl/dl-runtime.c b/newlib/libc/sys/linux/dl/dl-runtime.c
deleted file mode 100644
index 4fb81cf..0000000
--- a/newlib/libc/sys/linux/dl/dl-runtime.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* On-demand PLT fixup for shared objects.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <alloca.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <ldsodefs.h>
-#include "dynamic-link.h"
-
-#ifndef __attribute_used__
-#define __attribute_used__
-#endif
-
-#if !defined ELF_MACHINE_NO_RELA || ELF_MACHINE_NO_REL
-# define PLTREL  ElfW(Rela)
-#else
-# define PLTREL  ElfW(Rel)
-#endif
-
-#ifndef VERSYMIDX
-# define VERSYMIDX(sym)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
-#endif
-
-
-/* This function is called through a special trampoline from the PLT the
-   first time each PLT entry is called.  We must perform the relocation
-   specified in the PLT of the given shared object, and return the resolved
-   function address to the trampoline, which will restart the original call
-   to that address.  Future calls will bounce directly from the PLT to the
-   function.  */
-
-#ifndef ELF_MACHINE_NO_PLT
-static ElfW(Addr) __attribute__ ((regparm (2), used))
-fixup (
-# ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
-        ELF_MACHINE_RUNTIME_FIXUP_ARGS,
-# endif
-	/* GKM FIXME: Fix trampoline to pass bounds so we can do
-	   without the `__unbounded' qualifier.  */
-       struct link_map *__unbounded l, ElfW(Word) reloc_offset)
-{
-  const ElfW(Sym) *const symtab
-    = (const void *) D_PTR (l, l_info[DT_SYMTAB]);
-  const char *strtab = (const void *) D_PTR (l, l_info[DT_STRTAB]);
-
-  const PLTREL *const reloc
-    = (const void *) (D_PTR (l, l_info[DT_JMPREL]) + reloc_offset);
-  const ElfW(Sym) *sym = &symtab[ELFW(R_SYM) (reloc->r_info)];
-  void *const rel_addr = (void *)(l->l_addr + reloc->r_offset);
-  lookup_t result;
-  ElfW(Addr) value;
-
-  /* The use of `alloca' here looks ridiculous but it helps.  The goal is
-     to prevent the function from being inlined and thus optimized out.
-     There is no official way to do this so we use this trick.  gcc never
-     inlines functions which use `alloca'.  */
-  alloca (sizeof (int));
-
-  /* Sanity check that we're really looking at a PLT relocation.  */
-  assert (ELFW(R_TYPE)(reloc->r_info) == ELF_MACHINE_JMP_SLOT);
-
-   /* Look up the target symbol.  If the normal lookup rules are not
-      used don't look in the global scope.  */
-  if (__builtin_expect (ELFW(ST_VISIBILITY) (sym->st_other), 0) == 0)
-    {
-      switch (l->l_info[VERSYMIDX (DT_VERSYM)] != NULL)
-	{
-	default:
-	  {
-	    const ElfW(Half) *vernum =
-	      (const void *) D_PTR (l, l_info[VERSYMIDX (DT_VERSYM)]);
-	    ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info)];
-	    const struct r_found_version *version = &l->l_versions[ndx];
-
-	    if (version->hash != 0)
-	      {
-		result = _dl_lookup_versioned_symbol (strtab + sym->st_name,
-						      l, &sym, l->l_scope,
-						      version,
-						      ELF_RTYPE_CLASS_PLT, 0);
-		break;
-	      }
-	  }
-	case 0:
-	  result = _dl_lookup_symbol (strtab + sym->st_name, l, &sym,
-				      l->l_scope, ELF_RTYPE_CLASS_PLT, 0);
-	}
-
-      /* Currently result contains the base load address (or link map)
-	 of the object that defines sym.  Now add in the symbol
-	 offset.  */
-      value = (sym ? LOOKUP_VALUE_ADDRESS (result) + sym->st_value : 0);
-    }
-  else
-    {
-      /* We already found the symbol.  The module (and therefore its load
-	 address) is also known.  */
-      value = l->l_addr + sym->st_value;
-#ifdef DL_LOOKUP_RETURNS_MAP
-      result = l;
-#endif
-    }
-
-  /* And now perhaps the relocation addend.  */
-  value = elf_machine_plt_value (l, reloc, value);
-
-  /* Finally, fix up the plt itself.  */
-  if (__builtin_expect (_dl_bind_not, 0))
-    return value;
-
-  return elf_machine_fixup_plt (l, result, reloc, rel_addr, value);
-}
-#endif
-
-#if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__
-
-static ElfW(Addr) __attribute__ ((regparm (3), used))
-profile_fixup (
-#ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
-       ELF_MACHINE_RUNTIME_FIXUP_ARGS,
-#endif
-       struct link_map *l, ElfW(Word) reloc_offset, ElfW(Addr) retaddr)
-{
-  void (*mcount_fct) (ElfW(Addr), ElfW(Addr)) = _dl_mcount;
-  ElfW(Addr) *resultp;
-  lookup_t result;
-  ElfW(Addr) value;
-
-  /* The use of `alloca' here looks ridiculous but it helps.  The goal is
-     to prevent the function from being inlined, and thus optimized out.
-     There is no official way to do this so we use this trick.  gcc never
-     inlines functions which use `alloca'.  */
-  alloca (sizeof (int));
-
-  /* This is the address in the array where we store the result of previous
-     relocations.  */
-  resultp = &l->l_reloc_result[reloc_offset / sizeof (PLTREL)];
-
-  value = *resultp;
-  if (value == 0)
-    {
-      /* This is the first time we have to relocate this object.  */
-      const ElfW(Sym) *const symtab
-	= (const void *) D_PTR (l, l_info[DT_SYMTAB]);
-      const char *strtab = (const void *) D_PTR (l, l_info[DT_STRTAB]);
-
-      const PLTREL *const reloc
-	= (const void *) (D_PTR (l, l_info[DT_JMPREL]) + reloc_offset);
-      const ElfW(Sym) *sym = &symtab[ELFW(R_SYM) (reloc->r_info)];
-
-      /* Sanity check that we're really looking at a PLT relocation.  */
-      assert (ELFW(R_TYPE)(reloc->r_info) == ELF_MACHINE_JMP_SLOT);
-
-      /* Look up the target symbol.  If the symbol is marked STV_PROTECTED
-	 don't look in the global scope.  */
-      if (__builtin_expect (ELFW(ST_VISIBILITY) (sym->st_other), 0) == 0)
-	{
-	  switch (l->l_info[VERSYMIDX (DT_VERSYM)] != NULL)
-	    {
-	    default:
-	      {
-		const ElfW(Half) *vernum =
-		  (const void *) D_PTR (l,l_info[VERSYMIDX (DT_VERSYM)]);
-		ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info)];
-		const struct r_found_version *version = &l->l_versions[ndx];
-
-		if (version->hash != 0)
-		  {
-		    result = _dl_lookup_versioned_symbol(strtab + sym->st_name,
-							 l, &sym, l->l_scope,
-							 version,
-							 ELF_RTYPE_CLASS_PLT,
-							 0);
-		    break;
-		  }
-	      }
-	    case 0:
-	      result = _dl_lookup_symbol (strtab + sym->st_name, l, &sym,
-					  l->l_scope, ELF_RTYPE_CLASS_PLT, 0);
-	    }
-
-	  /* Currently result contains the base load address (or link map)
-	     of the object that defines sym.  Now add in the symbol
-	     offset.  */
-	  value = (sym ? LOOKUP_VALUE_ADDRESS (result) + sym->st_value : 0);
-	}
-      else
-	{
-	  /* We already found the symbol.  The module (and therefore its load
-	     address) is also known.  */
-	  value = l->l_addr + sym->st_value;
-#ifdef DL_LOOKUP_RETURNS_MAP
-	  result = l;
-#endif
-	}
-      /* And now perhaps the relocation addend.  */
-      value = elf_machine_plt_value (l, reloc, value);
-
-      /* Store the result for later runs.  */
-      if (__builtin_expect (! _dl_bind_not, 1))
-	*resultp = value;
-    }
-
-  (*mcount_fct) (retaddr, value);
-
-  return value;
-}
-
-#endif /* PROF && ELF_MACHINE_NO_PLT */
-
-
-/* This macro is defined in dl-machine.h to define the entry point called
-   by the PLT.  The `fixup' function above does the real work, but a little
-   more twiddling is needed to get the stack right and jump to the address
-   finally resolved.  */
-
-ELF_MACHINE_RUNTIME_TRAMPOLINE
diff --git a/newlib/libc/sys/linux/dl/dl-support.c b/newlib/libc/sys/linux/dl/dl-support.c
deleted file mode 100644
index ce53491..0000000
--- a/newlib/libc/sys/linux/dl/dl-support.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* Support for dynamic linking code in static libc.
-   Copyright (C) 1996, 97, 98, 99, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* This file defines some things that for the dynamic linker are defined in
-   rtld.c and dl-sysdep.c in ways appropriate to bootstrap dynamic linking.  */
-
-#include <errno.h>
-#include <libintl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <pthread.h>
-#include <ldsodefs.h>
-#include <machine/dl-machine.h>
-#include <dl-librecon.h>
-#include <unsecvars.h>
-#include <machine/hp-timing.h>
-
-char *__progname = "newlib";
-char **_dl_argv = &__progname;	/* This is checked for some error messages.  */
-
-/* Name of the architecture.  */
-const char *_dl_platform;
-size_t _dl_platformlen;
-
-int _dl_debug_mask;
-int _dl_lazy;
-/* XXX I know about at least one case where we depend on the old weak
-   behavior (it has to do with librt).  Until we get DSO groups implemented
-   we have to make this the default.  Bummer. --drepper  */
-#if 0
-int _dl_dynamic_weak;
-#else
-int _dl_dynamic_weak = 1;
-#endif
-
-/* If nonzero print warnings about problematic situations.  */
-int _dl_verbose;
-
-/* Structure to store information about search paths.  */
-struct r_search_path *_dl_search_paths;
-
-/* We never do profiling.  */
-const char *_dl_profile;
-
-/* Names of shared object for which the RUNPATHs and RPATHs should be
-   ignored.  */
-const char *_dl_inhibit_rpath;
-
-/* The map for the object we will profile.  */
-struct link_map *_dl_profile_map;
-
-/* This is the address of the last stack address ever used.  */
-void *__libc_stack_end;
-
-/* Path where the binary is found.  */
-const char *_dl_origin_path;
-
-/* Nonzero if runtime lookup should not update the .got/.plt.  */
-int _dl_bind_not;
-
-/* Initially empty list of loaded objects.  */
-struct link_map *_dl_loaded;
-/* Number of object in the _dl_loaded list.  */
-unsigned int _dl_nloaded;
-
-/* Fake scope.  In dynamically linked binaries this is the scope of the
-   main application but here we don't have something like this.  So
-   create a fake scope containing nothing.  */
-struct r_scope_elem _dl_initial_searchlist;
-/* Variable which can be used in lookup to process the global scope.  */
-struct r_scope_elem *_dl_global_scope[2] = { &_dl_initial_searchlist, NULL };
-/* This is a global pointer to this structure which is public.  It is
-   used by dlopen/dlclose to add and remove objects from what is regarded
-   to be the global scope.  */
-struct r_scope_elem *_dl_main_searchlist = &_dl_initial_searchlist;
-
-/* Nonzero during startup.  */
-int _dl_starting_up = 1;
-
-/* We expect less than a second for relocation.  */
-#ifdef HP_SMALL_TIMING_AVAIL
-# undef HP_TIMING_AVAIL
-# define HP_TIMING_AVAIL HP_SMALL_TIMING_AVAIL
-#endif
-
-/* Initial value of the CPU clock.  */
-#ifndef HP_TIMING_NONAVAIL
-hp_timing_t _dl_cpuclock_offset;
-#endif
-
-/* During the program run we must not modify the global data of
-   loaded shared object simultanously in two threads.  Therefore we
-   protect `_dl_open' and `_dl_close' in dl-close.c.
-
-   This must be a recursive lock since the initializer function of
-   the loaded object might as well require a call to this function.
-   At this time it is not anymore a problem to modify the tables.  */
-__LOCK_INIT_RECURSIVE(, _dl_load_lock)
-
-
-#ifdef HAVE_AUX_VECTOR
-extern int _dl_clktck;
-
-void
-internal_function
-_dl_aux_init (ElfW(auxv_t) *av)
-{
-  for (; av->a_type != AT_NULL; ++av)
-    switch (av->a_type)
-      {
-      case AT_PAGESZ:
-	_dl_pagesize = av->a_un.a_val;
-	break;
-      case AT_CLKTCK:
-	_dl_clktck = av->a_un.a_val;
-	break;
-      }
-}
-#endif
-
-void non_dynamic_init (void) __attribute__ ((unused));
-
-void
-non_dynamic_init (void)
-{
-  if (HP_TIMING_AVAIL)
-    HP_TIMING_NOW (_dl_cpuclock_offset);
-
-  if (!_dl_pagesize)
-    _dl_pagesize = __getpagesize ();
-
-  _dl_verbose = *(getenv ("LD_WARN") ?: "") == '\0' ? 0 : 1;
-
-  /* Initialize the data structures for the search paths for shared
-     objects.  */
-  _dl_init_paths (getenv ("LD_LIBRARY_PATH"));
-
-  _dl_lazy = *(getenv ("LD_BIND_NOW") ?: "") == '\0';
-
-  _dl_bind_not = *(getenv ("LD_BIND_NOT") ?: "") != '\0';
-
-  _dl_dynamic_weak = *(getenv ("LD_DYNAMIC_WEAK") ?: "") == '\0';
-
-#ifdef DL_PLATFORM_INIT
-  DL_PLATFORM_INIT;
-#endif
-
-  /* Now determine the length of the platform string.  */
-  if (_dl_platform != NULL)
-    _dl_platformlen = strlen (_dl_platform);
-}
-text_set_element (__libc_subinit, non_dynamic_init);
-
-const struct r_strlenpair *
-internal_function
-_dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
-		      size_t *max_capstrlen)
-{
-  static struct r_strlenpair result;
-  static char buf[1];
-
-  result.str = buf;	/* Does not really matter.  */
-  result.len = 0;
-
-  *sz = 1;
-  return &result;
-}
diff --git a/newlib/libc/sys/linux/dl/dl-sym.c b/newlib/libc/sys/linux/dl/dl-sym.c
deleted file mode 100644
index 85d084f..0000000
--- a/newlib/libc/sys/linux/dl/dl-sym.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Look up a symbol in a shared object loaded by `dlopen'.
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stddef.h>
-#include <setjmp.h>
-#include <libintl.h>
-
-#include <dlfcn.h>
-#include <ldsodefs.h>
-#include <dl-hash.h>
-
-void *
-internal_function
-_dl_sym (void *handle, const char *name, void *who)
-{
-  const ElfW(Sym) *ref = NULL;
-  lookup_t result;
-  ElfW(Addr) caller = (ElfW(Addr)) who;
-  struct link_map *match;
-  struct link_map *l;
-
-  /* If the address is not recognized the call comes from the main
-     program (we hope).  */
-  match = _dl_loaded;
-
-  /* Find the highest-addressed object that CALLER is not below.  */
-  for (l = _dl_loaded; l != NULL; l = l->l_next)
-    if (caller >= l->l_map_start && caller < l->l_map_end)
-      {
-	/* There must be exactly one DSO for the range of the virtual
-	   memory.  Otherwise something is really broken.  */
-	match = l;
-	break;
-      }
-
-  if (handle == RTLD_DEFAULT)
-    /* Search the global scope as seen in the caller object.  */
-    result = _dl_lookup_symbol (name, match, &ref, match->l_scope, 0, 0);
-  else
-    {
-      if (handle != RTLD_NEXT)
-	{
-	  /* Search the scope of the given object.  */
-	  struct link_map *map = handle;
-
-	  result = _dl_lookup_symbol (name, match, &ref, map->l_local_scope,
-				      0, 1);
-	}
-      else
-	{
-	  if (__builtin_expect (match == _dl_loaded, 0))
-	    {
-	      if (! _dl_loaded
-		  || caller < _dl_loaded->l_map_start
-		  || caller >= _dl_loaded->l_map_end)
-	        _dl_signal_error (0, NULL, NULL, N_("\
-RTLD_NEXT used in code not dynamically loaded"));
-	    }
-
-	  l = match;
-	  while (l->l_loader != NULL)
-	    l = l->l_loader;
-
-	  result = _dl_lookup_symbol_skip (name, l, &ref, l->l_local_scope,
-					   match);
-	}
-    }
-
-  if (ref != NULL)
-    return DL_SYMBOL_ADDRESS (result, ref);
-
-  return NULL;
-}
-
-void *
-internal_function
-_dl_vsym (void *handle, const char *name, const char *version, void *who)
-{
-  const ElfW(Sym) *ref = NULL;
-  struct r_found_version vers;
-  lookup_t result;
-  ElfW(Addr) caller = (ElfW(Addr)) who;
-  struct link_map *match;
-  struct link_map *l;
-
-  /* Compute hash value to the version string.  */
-  vers.name = version;
-  vers.hidden = 1;
-  vers.hash = _dl_elf_hash (version);
-  /* We don't have a specific file where the symbol can be found.  */
-  vers.filename = NULL;
-
-  /* If the address is not recognized the call comes from the main
-     program (we hope).  */
-  match = _dl_loaded;
-
-  /* Find the highest-addressed object that CALLER is not below.  */
-  for (l = _dl_loaded; l != NULL; l = l->l_next)
-    if (caller >= l->l_map_start && caller < l->l_map_end)
-      {
-	/* There must be exactly one DSO for the range of the virtual
-	   memory.  Otherwise something is really broken.  */
-	match = l;
-	break;
-      }
-
-  if (handle == RTLD_DEFAULT)
-    /* Search the global scope.  */
-    result = _dl_lookup_versioned_symbol (name, match, &ref, match->l_scope,
-					  &vers, 0, 0);
-  else if (handle == RTLD_NEXT)
-    {
-      if (__builtin_expect (match == _dl_loaded, 0))
-	{
-	  if (! _dl_loaded
-	      || caller < _dl_loaded->l_map_start
-	      || caller >= _dl_loaded->l_map_end)
-	    _dl_signal_error (0, NULL, NULL, N_("\
-RTLD_NEXT used in code not dynamically loaded"));
-	}
-
-      l = match;
-      while (l->l_loader != NULL)
-	l = l->l_loader;
-
-      result = _dl_lookup_versioned_symbol_skip (name, l, &ref,
-						 l->l_local_scope,
-						 &vers, match);
-    }
-  else
-    {
-      /* Search the scope of the given object.  */
-      struct link_map *map = handle;
-      result = _dl_lookup_versioned_symbol (name, map, &ref,
-					    map->l_local_scope, &vers, 0, 1);
-    }
-
-  if (ref != NULL)
-    return DL_SYMBOL_ADDRESS (result, ref);
-
-  return NULL;
-}
diff --git a/newlib/libc/sys/linux/dl/dl-version.c b/newlib/libc/sys/linux/dl/dl-version.c
deleted file mode 100644
index eefbea7..0000000
--- a/newlib/libc/sys/linux/dl/dl-version.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/* Handle symbol and library versioning.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <elf.h>
-#include <errno.h>
-#include <libintl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ldsodefs.h>
-
-#include <assert.h>
-
-
-#ifndef VERSYMIDX
-# define VERSYMIDX(tag)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (tag))
-#endif
-
-
-#define make_string(string, rest...) \
-  ({									      \
-    const char *all[] = { string, ## rest };				      \
-    size_t len, cnt;							      \
-    char *result, *cp;							      \
-									      \
-    len = 1;								      \
-    for (cnt = 0; cnt < sizeof (all) / sizeof (all[0]); ++cnt)		      \
-      len += strlen (all[cnt]);						      \
-									      \
-    cp = result = alloca (len);						      \
-    for (cnt = 0; cnt < sizeof (all) / sizeof (all[0]); ++cnt)		      \
-    {                    						      \
-      cp = strcpy (cp, all[cnt]);					      \
-      cp += strlen (all[cnt]);					              \
-    }                    						      \
-									      \
-    result;								      \
-  })
-
-
-static inline struct link_map *
-find_needed (const char *name, struct link_map *map)
-{
-  struct link_map *tmap;
-  unsigned int n;
-
-  for (tmap = _dl_loaded; tmap != NULL; tmap = tmap->l_next)
-    if (_dl_name_match_p (name, tmap))
-      return tmap;
-
-  /* The required object is not in the global scope, look to see if it is
-     a dependency of the current object.  */
-  for (n = 0; n < map->l_searchlist.r_nlist; n++)
-    if (_dl_name_match_p (name, map->l_searchlist.r_list[n]))
-      return map->l_searchlist.r_list[n];
-
-  /* Should never happen.  */
-  return NULL;
-}
-
-
-static int
-internal_function
-match_symbol (const char *name, ElfW(Word) hash, const char *string,
-	      struct link_map *map, int verbose, int weak)
-{
-  const char *strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
-  ElfW(Addr) def_offset;
-  ElfW(Verdef) *def;
-  /* Initialize to make the compiler happy.  */
-  const char *errstring = NULL;
-  int result = 0;
-
-  /* Display information about what we are doing while debugging.  */
-  if (__builtin_expect (_dl_debug_mask & DL_DEBUG_VERSIONS, 0))
-    _dl_debug_printf ("\
-checking for version `%s' in file %s required by file %s\n",
-		      string, map->l_name[0] ? map->l_name : _dl_argv[0],
-		      name);
-
-  if (__builtin_expect (map->l_info[VERSYMIDX (DT_VERDEF)] == NULL, 0))
-    {
-      /* The file has no symbol versioning.  I.e., the dependent
-	 object was linked against another version of this file.  We
-	 only print a message if verbose output is requested.  */
-      if (verbose)
-	{
-	  /* XXX We cannot translate the messages.  */
-	  errstring = make_string ("\
-no version information available (required by ", name, ")");
-	  goto call_cerror;
-	}
-      return 0;
-    }
-
-  def_offset = map->l_info[VERSYMIDX (DT_VERDEF)]->d_un.d_ptr;
-  assert (def_offset != 0);
-
-  def = (ElfW(Verdef) *) ((char *) map->l_addr + def_offset);
-  while (1)
-    {
-      /* Currently the version number of the definition entry is 1.
-	 Make sure all we see is this version.  */
-      if (__builtin_expect (def->vd_version, 1) != 1)
-	{
-	  char buf[20];
-	  buf[sizeof (buf) - 1] = '\0';
-	  /* XXX We cannot translate the message.  */
-	  errstring = make_string ("unsupported version of Verdef record");
-	  result = 1;
-	  goto call_cerror;
-	}
-
-      /* Compare the hash values.  */
-      if (hash == def->vd_hash)
-	{
-	  ElfW(Verdaux) *aux = (ElfW(Verdaux) *) ((char *) def + def->vd_aux);
-
-	  /* To be safe, compare the string as well.  */
-	  if (__builtin_expect (strcmp (string, strtab + aux->vda_name), 0)
-	      == 0)
-	    /* Bingo!  */
-	    return 0;
-	}
-
-      /* If no more definitions we failed to find what we want.  */
-      if (def->vd_next == 0)
-	break;
-
-      /* Next definition.  */
-      def = (ElfW(Verdef) *) ((char *) def + def->vd_next);
-    }
-
-  /* Symbol not found.  If it was a weak reference it is not fatal.  */
-  if (__builtin_expect (weak, 1))
-    {
-      if (verbose)
-	{
-	  /* XXX We cannot translate the message.  */
-	  errstring = make_string ("weak version `", string,
-				   "' not found (required by ", name, ")");
-	  goto call_cerror;
-	}
-      return 0;
-    }
-
-  /* XXX We cannot translate the message.  */
-  errstring = make_string ("version `", string, "' not found (required by ",
-			   name, ")");
-  result = 1;
- call_cerror:
-  _dl_signal_cerror (0, map->l_name[0] ? map->l_name : _dl_argv[0], NULL,
-		     errstring);
-  return result;
-}
-
-
-int
-internal_function
-_dl_check_map_versions (struct link_map *map, int verbose, int trace_mode)
-{
-  int result = 0;
-  const char *strtab;
-  /* Pointer to section with needed versions.  */
-  ElfW(Dyn) *dyn;
-  /* Pointer to dynamic section with definitions.  */
-  ElfW(Dyn) *def;
-  /* We need to find out which is the highest version index used
-    in a dependecy.  */
-  unsigned int ndx_high = 0;
-  /* Initialize to make the compiler happy.  */
-  const char *errstring = NULL;
-  int errval = 0;
-
-  /* If we don't have a string table, we must be ok.  */
-  if (map->l_info[DT_STRTAB] == NULL)
-    return 0;
-  strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
-
-  dyn = map->l_info[VERSYMIDX (DT_VERNEED)];
-  def = map->l_info[VERSYMIDX (DT_VERDEF)];
-
-  if (dyn != NULL)
-    {
-      /* This file requires special versions from its dependencies.  */
-      ElfW(Verneed) *ent = (ElfW(Verneed) *) (map->l_addr + dyn->d_un.d_ptr);
-
-      /* Currently the version number of the needed entry is 1.
-	 Make sure all we see is this version.  */
-      if (__builtin_expect (ent->vn_version, 1) != 1)
-	{
-	  char buf[20];
-	  buf[sizeof (buf) - 1] = '\0';
-	  /* XXX We cannot translate the message.  */
-	  errstring = make_string ("unsupported version of Verneed record\n");
-	call_error:
-	  _dl_signal_error (errval, (*map->l_name ? map->l_name : _dl_argv[0]),
-			    NULL, errstring);
-	}
-
-      while (1)
-	{
-	  ElfW(Vernaux) *aux;
-	  struct link_map *needed = find_needed (strtab + ent->vn_file, map);
-
-	  /* If NEEDED is NULL this means a dependency was not found
-	     and no stub entry was created.  This should never happen.  */
-	  assert (needed != NULL);
-
-	  /* Make sure this is no stub we created because of a missing
-	     dependency.  */
-	  if (__builtin_expect (! trace_mode, 1)
-	      || ! __builtin_expect (needed->l_faked, 0))
-	    {
-	      /* NEEDED is the map for the file we need.  Now look for the
-		 dependency symbols.  */
-	      aux = (ElfW(Vernaux) *) ((char *) ent + ent->vn_aux);
-	      while (1)
-		{
-		  /* Match the symbol.  */
-		  result |= match_symbol ((*map->l_name
-					   ? map->l_name : _dl_argv[0]),
-					  aux->vna_hash,
-					  strtab + aux->vna_name,
-					  needed, verbose,
-					  aux->vna_flags & VER_FLG_WEAK);
-
-		  /* Compare the version index.  */
-		  if ((unsigned int) (aux->vna_other & 0x7fff) > ndx_high)
-		    ndx_high = aux->vna_other & 0x7fff;
-
-		  if (aux->vna_next == 0)
-		    /* No more symbols.  */
-		    break;
-
-		  /* Next symbol.  */
-		  aux = (ElfW(Vernaux) *) ((char *) aux + aux->vna_next);
-		}
-	    }
-
-	  if (ent->vn_next == 0)
-	    /* No more dependencies.  */
-	    break;
-
-	  /* Next dependency.  */
-	  ent = (ElfW(Verneed) *) ((char *) ent + ent->vn_next);
-	}
-    }
-
-  /* We also must store the names of the defined versions.  Determine
-     the maximum index here as well.
-
-     XXX We could avoid the loop by just taking the number of definitions
-     as an upper bound of new indeces.  */
-  if (def != NULL)
-    {
-      ElfW(Verdef) *ent;
-      ent = (ElfW(Verdef) *) (map->l_addr + def->d_un.d_ptr);
-      while (1)
-	{
-	  if ((unsigned int) (ent->vd_ndx & 0x7fff) > ndx_high)
-	    ndx_high = ent->vd_ndx & 0x7fff;
-
-	  if (ent->vd_next == 0)
-	    /* No more definitions.  */
-	    break;
-
-	  ent = (ElfW(Verdef) *) ((char *) ent + ent->vd_next);
-	}
-    }
-
-  if (ndx_high > 0)
-    {
-      /* Now we are ready to build the array with the version names
-	 which can be indexed by the version index in the VERSYM
-	 section.  */
-      map->l_versions = (struct r_found_version *)
-	calloc (ndx_high + 1, sizeof (*map->l_versions));
-      if (__builtin_expect (map->l_versions == NULL, 0))
-	{
-	  errstring = N_("cannot allocate version reference table");
-	  errval = ENOMEM;
-	  goto call_error;
-	}
-
-      /* Store the number of available symbols.  */
-      map->l_nversions = ndx_high + 1;
-
-      /* Compute the pointer to the version symbols.  */
-      map->l_versyms = (void *) D_PTR (map, l_info[VERSYMIDX (DT_VERSYM)]);
-
-      if (dyn != NULL)
-	{
-	  ElfW(Verneed) *ent;
-	  ent = (ElfW(Verneed) *) (map->l_addr + dyn->d_un.d_ptr);
-	  while (1)
-	    {
-	      ElfW(Vernaux) *aux;
-	      aux = (ElfW(Vernaux) *) ((char *) ent + ent->vn_aux);
-	      while (1)
-		{
-		  ElfW(Half) ndx = aux->vna_other & 0x7fff;
-		  map->l_versions[ndx].hash = aux->vna_hash;
-		  map->l_versions[ndx].hidden = aux->vna_other & 0x8000;
-		  map->l_versions[ndx].name = &strtab[aux->vna_name];
-		  map->l_versions[ndx].filename = &strtab[ent->vn_file];
-
-		  if (aux->vna_next == 0)
-		    /* No more symbols.  */
-		    break;
-
-		  /* Advance to next symbol.  */
-		  aux = (ElfW(Vernaux) *) ((char *) aux + aux->vna_next);
-		}
-
-	      if (ent->vn_next == 0)
-		/* No more dependencies.  */
-		break;
-
-	      /* Advance to next dependency.  */
-	      ent = (ElfW(Verneed) *) ((char *) ent + ent->vn_next);
-	    }
-	}
-
-      /* And insert the defined versions.  */
-      if (def != NULL)
-	{
-	  ElfW(Verdef) *ent;
-	  ent = (ElfW(Verdef)  *) (map->l_addr + def->d_un.d_ptr);
-	  while (1)
-	    {
-	      ElfW(Verdaux) *aux;
-	      aux = (ElfW(Verdaux) *) ((char *) ent + ent->vd_aux);
-
-	      if ((ent->vd_flags & VER_FLG_BASE) == 0)
-		{
-		  /* The name of the base version should not be
-		     available for matching a versioned symbol.  */
-		  ElfW(Half) ndx = ent->vd_ndx & 0x7fff;
-		  map->l_versions[ndx].hash = ent->vd_hash;
-		  map->l_versions[ndx].name = &strtab[aux->vda_name];
-		  map->l_versions[ndx].filename = NULL;
-		}
-
-	      if (ent->vd_next == 0)
-		/* No more definitions.  */
-		break;
-
-	      ent = (ElfW(Verdef) *) ((char *) ent + ent->vd_next);
-	    }
-	}
-    }
-
-  return result;
-}
-
-
-int
-internal_function
-_dl_check_all_versions (struct link_map *map, int verbose, int trace_mode)
-{
-  struct link_map *l;
-  int result = 0;
-
-  for (l = map; l != NULL; l = l->l_next)
-    result |= ! l->l_faked && _dl_check_map_versions (l, verbose, trace_mode);
-
-  return result;
-}
diff --git a/newlib/libc/sys/linux/dl/do-lookup.h b/newlib/libc/sys/linux/dl/do-lookup.h
deleted file mode 100644
index b9364b9..0000000
--- a/newlib/libc/sys/linux/dl/do-lookup.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* Look up a symbol in the loaded objects.
-   Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#if VERSIONED
-# define FCT do_lookup_versioned
-# define ARG const struct r_found_version *const version,
-#else
-# define FCT do_lookup
-# define ARG
-#endif
-
-/* Inner part of the lookup functions.  We return a value > 0 if we
-   found the symbol, the value 0 if nothing is found and < 0 if
-   something bad happened.  */
-static inline int
-FCT (const char *undef_name, unsigned long int hash, const ElfW(Sym) *ref,
-     struct sym_val *result, struct r_scope_elem *scope, size_t i, ARG
-     struct link_map *skip, int type_class)
-{
-  struct link_map **list = scope->r_list;
-  size_t n = scope->r_nlist;
-  struct link_map *map;
-
-  do
-    {
-      const ElfW(Sym) *symtab;
-      const char *strtab;
-      const ElfW(Half) *verstab;
-      Elf_Symndx symidx;
-      const ElfW(Sym) *sym;
-#if ! VERSIONED
-      int num_versions = 0;
-      const ElfW(Sym) *versioned_sym = NULL;
-#endif
-
-      map = list[i];
-
-      /* Here come the extra test needed for `_dl_lookup_symbol_skip'.  */
-      if (skip != NULL && map == skip)
-	continue;
-
-      /* Don't search the executable when resolving a copy reloc.  */
-      if ((type_class & ELF_RTYPE_CLASS_COPY) && map->l_type == lt_executable)
-	continue;
-
-      /* Print some debugging info if wanted.  */
-      if (__builtin_expect (_dl_debug_mask & DL_DEBUG_SYMBOLS, 0))
-	_dl_debug_printf ("symbol=%s;  lookup in file=%s\n", undef_name,
-			  map->l_name[0] ? map->l_name : _dl_argv[0]);
-
-      symtab = (const void *) D_PTR (map, l_info[DT_SYMTAB]);
-      strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
-      verstab = map->l_versyms;
-
-      /* Search the appropriate hash bucket in this object's symbol table
-	 for a definition for the same symbol name.  */
-      for (symidx = map->l_buckets[hash % map->l_nbuckets];
-	   symidx != STN_UNDEF;
-	   symidx = map->l_chain[symidx])
-	{
-	  sym = &symtab[symidx];
-
-	  assert (ELF_RTYPE_CLASS_PLT == 1);
-	  if (sym->st_value == 0 || /* No value.  */
-	      /* ((type_class & ELF_RTYPE_CLASS_PLT)
-		  && (sym->st_shndx == SHN_UNDEF)) */
-	      (type_class & (sym->st_shndx == SHN_UNDEF)))
-	    continue;
-
-	  if (ELFW(ST_TYPE) (sym->st_info) > STT_FUNC)
-	    /* Ignore all but STT_NOTYPE, STT_OBJECT and STT_FUNC entries
-	       since these are no code/data definitions.  */
-	    continue;
-
-	  if (sym != ref && strcmp (strtab + sym->st_name, undef_name))
-	    /* Not the symbol we are looking for.  */
-	    continue;
-
-#if VERSIONED
-	  if (__builtin_expect (verstab == NULL, 0))
-	    {
-	      /* We need a versioned symbol but haven't found any.  If
-		 this is the object which is referenced in the verneed
-		 entry it is a bug in the library since a symbol must
-		 not simply disappear.
-
-		 It would also be a bug in the object since it means that
-		 the list of required versions is incomplete and so the
-		 tests in dl-version.c haven't found a problem.*/
-	      assert (version->filename == NULL
-		      || ! _dl_name_match_p (version->filename, map));
-
-	      /* Otherwise we accept the symbol.  */
-	    }
-	  else
-	    {
-	      /* We can match the version information or use the
-		 default one if it is not hidden.  */
-	      ElfW(Half) ndx = verstab[symidx] & 0x7fff;
-	      if ((map->l_versions[ndx].hash != version->hash
-		   || strcmp (map->l_versions[ndx].name, version->name))
-		  && (version->hidden || map->l_versions[ndx].hash
-		      || (verstab[symidx] & 0x8000)))
-		/* It's not the version we want.  */
-		continue;
-	    }
-#else
-	  /* No specific version is selected.  When the object file
-	     also does not define a version we have a match.
-	     Otherwise we accept the default version, or in case there
-	     is only one version defined, this one version.  */
-	  if (verstab != NULL)
-	    {
-	      ElfW(Half) ndx = verstab[symidx] & 0x7fff;
-	      if (ndx > 2) /* map->l_versions[ndx].hash != 0) */
-		{
-		  /* Don't accept hidden symbols.  */
-		  if ((verstab[symidx] & 0x8000) == 0 && num_versions++ == 0)
-		    /* No version so far.  */
-		    versioned_sym = sym;
-		  continue;
-		}
-	    }
-#endif
-
-	  /* There cannot be another entry for this symbol so stop here.  */
-	  goto found_it;
-	}
-
-      /* If we have seen exactly one versioned symbol while we are
-	 looking for an unversioned symbol and the version is not the
-	 default version we still accept this symbol since there are
-	 no possible ambiguities.  */
-#if VERSIONED
-      sym = NULL;
-#else
-      sym = num_versions == 1 ? versioned_sym : NULL;
-#endif
-
-      if (sym != NULL)
-	{
-	found_it:
-	  switch (ELFW(ST_BIND) (sym->st_info))
-	    {
-	    case STB_WEAK:
-	      /* Weak definition.  Use this value if we don't find another.  */
-	      if (__builtin_expect (_dl_dynamic_weak, 0))
-		{
-		  if (! result->s)
-		    {
-		      result->s = sym;
-		      result->m = map;
-		    }
-		  break;
-		}
-	      /* FALLTHROUGH */
-	    case STB_GLOBAL:
-	      /* Global definition.  Just what we need.  */
-	      result->s = sym;
-	      result->m = map;
-	      return 1;
-	    default:
-	      /* Local symbols are ignored.  */
-	      break;
-	    }
-	}
-
-#if VERSIONED
-      /* If this current map is the one mentioned in the verneed entry
-	 and we have not found a weak entry, it is a bug.  */
-      if (symidx == STN_UNDEF && version->filename != NULL
-	  && __builtin_expect (_dl_name_match_p (version->filename, map), 0))
-	return -1;
-#endif
-    }
-  while (++i < n);
-
-  /* We have not found anything until now.  */
-  return 0;
-}
-
-#undef FCT
-#undef ARG
-#undef VERSIONED
diff --git a/newlib/libc/sys/linux/dl/do-rel.h b/newlib/libc/sys/linux/dl/do-rel.h
deleted file mode 100644
index 03b9e80..0000000
--- a/newlib/libc/sys/linux/dl/do-rel.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Do relocations for ELF dynamic linking.
-   Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* This file may be included twice, to define both
-   `elf_dynamic_do_rel' and `elf_dynamic_do_rela'.  */
-
-#include <machine/weakalias.h>
-
-#ifdef DO_RELA
-# define elf_dynamic_do_rel		elf_dynamic_do_rela
-# define RELCOUNT_IDX			VERSYMIDX (DT_RELACOUNT)
-# define Rel				Rela
-# define elf_machine_rel		elf_machine_rela
-# define elf_machine_rel_relative	elf_machine_rela_relative
-#else
-# define RELCOUNT_IDX			VERSYMIDX (DT_RELCOUNT)
-#endif
-
-#ifndef VERSYMIDX
-# define VERSYMIDX(sym)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
-#endif
-
-/* Perform the relocations in MAP on the running program image as specified
-   by RELTAG, SZTAG.  If LAZY is nonzero, this is the first pass on PLT
-   relocations; they should be set up to call _dl_runtime_resolve, rather
-   than fully resolved now.  */
-
-static inline void
-elf_dynamic_do_rel (struct link_map *map,
-		    ElfW(Addr) reladdr, ElfW(Addr) relsize,
-		    int lazy,
-		    struct r_scope_elem *scope[])
-{
-  const ElfW(Rel) *r = (const void *) reladdr;
-  const ElfW(Rel) *end = (const void *) (reladdr + relsize);
-  ElfW(Addr) l_addr = map->l_addr;
-
-#ifndef RTLD_BOOTSTRAP
-  /* We never bind lazily during ld.so bootstrap.  Unfortunately gcc is
-     not clever enough to see through all the function calls to realize
-     that.  */
-  if (lazy)
-    {
-      /* Doing lazy PLT relocations; they need very little info.  */
-      for (; r < end; ++r)
-	elf_machine_lazy_rel (map, l_addr, r);
-    }
-  else
-#endif
-    {
-      const ElfW(Sym) *const symtab =
-	(const void *) D_PTR (map, l_info[DT_SYMTAB]);
-      ElfW(Word) nrelative = (map->l_info[RELCOUNT_IDX] == NULL
-			      ? 0 : map->l_info[RELCOUNT_IDX]->d_un.d_val);
-      const ElfW(Rel) *relative = r;
-      r = MIN (r + nrelative, end);
-
-#ifndef RTLD_BOOTSTRAP
-      /* This is defined in rtld.c, but nowhere in the static libc.a; make
-	 the reference weak so static programs can still link.  This
-	 declaration cannot be done when compiling rtld.c (i.e. #ifdef
-	 RTLD_BOOTSTRAP) because rtld.c contains the common defn for
-	 _dl_rtld_map, which is incompatible with a weak decl in the same
-	 file.  */
-      #pragma weak _dl_rtld_map
-      if (map != &_dl_rtld_map) /* Already done in rtld itself.  */
-# ifndef DO_RELA
-	/* Rela platforms get the offset from r_addend and this must
-	   be copied in the relocation address.  Therefore we can skip
-	   the relative relocations only if this is for rel
-	   relocations.  */
-	if (l_addr != 0)
-# endif
-#endif
-	  for (; relative < r; ++relative)
-	    elf_machine_rel_relative (l_addr, relative,
-				      (void *) (l_addr + relative->r_offset));
-
-      if (map->l_info[VERSYMIDX (DT_VERSYM)])
-	{
-	  const ElfW(Half) *const version =
-	    (const void *) D_PTR (map, l_info[VERSYMIDX (DT_VERSYM)]);
-
-	  for (; r < end; ++r)
-	    {
-	      ElfW(Half) ndx = version[ELFW(R_SYM) (r->r_info)];
-	      elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)],
-			       &map->l_versions[ndx],
-			       (void *) (l_addr + r->r_offset),
-			       scope);
-	    }
-	}
-      else
-	for (; r < end; ++r)
-	  elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)], NULL,
-			   (void *) (l_addr + r->r_offset), scope);
-    }
-}
-
-#undef elf_dynamic_do_rel
-#undef Rel
-#undef elf_machine_rel
-#undef elf_machine_rel_relative
-#undef RELCOUNT_IDX
diff --git a/newlib/libc/sys/linux/dl/dynamic-link.h b/newlib/libc/sys/linux/dl/dynamic-link.h
deleted file mode 100644
index c1709f7..0000000
--- a/newlib/libc/sys/linux/dl/dynamic-link.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/* Inline functions for dynamic linking.
-   Copyright (C) 1995,96,97,98,99,2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef __DYNAMIC_LINK_H__
-#define __DYNAMIC_LINK_H__
-
-#include <elf.h>
-#include <machine/dl-machine.h>
-#include <assert.h>
-
-#ifndef VERSYMIDX
-# define VERSYMIDX(sym)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
-#endif
-
-
-/* Global read-only variable defined in rtld.c which is nonzero if we
-   shall give more warning messages.  */
-extern int _dl_verbose __attribute__ ((unused));
-
-
-/* Read the dynamic section at DYN and fill in INFO with indices DT_*.  */
-
-static void __attribute__ ((unused))
-elf_get_dynamic_info (struct link_map *l)
-{
-  ElfW(Dyn) *dyn = l->l_ld;
-  ElfW(Addr) l_addr;
-  ElfW(Dyn) **info;
-
-  if (! dyn)
-    return;
-
-  l_addr = l->l_addr;
-  info = l->l_info;
-
-  while (dyn->d_tag != DT_NULL)
-    {
-      if (dyn->d_tag < DT_NUM)
-	info[dyn->d_tag] = dyn;
-      else if (dyn->d_tag >= DT_LOPROC &&
-	       dyn->d_tag < DT_LOPROC + DT_THISPROCNUM)
-	info[dyn->d_tag - DT_LOPROC + DT_NUM] = dyn;
-      else if ((Elf32_Word) DT_VERSIONTAGIDX (dyn->d_tag) < DT_VERSIONTAGNUM)
-	info[VERSYMIDX (dyn->d_tag)] = dyn;
-      else if ((Elf32_Word) DT_EXTRATAGIDX (dyn->d_tag) < DT_EXTRANUM)
-	info[DT_EXTRATAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
-	     + DT_VERSIONTAGNUM] = dyn;
-      else
-	assert (! "bad dynamic tag");
-      ++dyn;
-    }
-#ifndef DL_RO_DYN_SECTION
-  if (info[DT_PLTGOT] != NULL)
-    info[DT_PLTGOT]->d_un.d_ptr += l_addr;
-  if (info[DT_STRTAB] != NULL)
-    info[DT_STRTAB]->d_un.d_ptr += l_addr;
-  if (info[DT_SYMTAB] != NULL)
-    info[DT_SYMTAB]->d_un.d_ptr += l_addr;
-# if ! ELF_MACHINE_NO_RELA
-  if (info[DT_RELA] != NULL)
-    {
-      assert (info[DT_RELAENT]->d_un.d_val == sizeof (ElfW(Rela)));
-      info[DT_RELA]->d_un.d_ptr += l_addr;
-    }
-# endif
-# if ! ELF_MACHINE_NO_REL
-  if (info[DT_REL] != NULL)
-    {
-      assert (info[DT_RELENT]->d_un.d_val == sizeof (ElfW(Rel)));
-      info[DT_REL]->d_un.d_ptr += l_addr;
-    }
-# endif
-#endif
-  if (info[DT_PLTREL] != NULL)
-    {
-# if ELF_MACHINE_NO_RELA
-      assert (info[DT_PLTREL]->d_un.d_val == DT_REL);
-# elif ELF_MACHINE_NO_REL
-      assert (info[DT_PLTREL]->d_un.d_val == DT_RELA);
-# else
-      assert (info[DT_PLTREL]->d_un.d_val == DT_REL
-	      || info[DT_PLTREL]->d_un.d_val == DT_RELA);
-# endif
-    }
-#ifndef DL_RO_DYN_SECTION
-  if (info[DT_JMPREL] != NULL)
-    info[DT_JMPREL]->d_un.d_ptr += l_addr;
-  if (info[VERSYMIDX (DT_VERSYM)] != NULL)
-    info[VERSYMIDX (DT_VERSYM)]->d_un.d_ptr += l_addr;
-#endif
-  if (info[DT_FLAGS] != NULL)
-    {
-      /* Flags are used.  Translate to the old form where available.
-	 Since these l_info entries are only tested for NULL pointers it
-	 is ok if they point to the DT_FLAGS entry.  */
-      ElfW(Word) flags = info[DT_FLAGS]->d_un.d_val;
-      if (flags & DF_SYMBOLIC)
-	info[DT_SYMBOLIC] = info[DT_FLAGS];
-      if (flags & DF_TEXTREL)
-	info[DT_TEXTREL] = info[DT_FLAGS];
-      if (flags & DF_BIND_NOW)
-	info[DT_BIND_NOW] = info[DT_FLAGS];
-    }
-  if (info[VERSYMIDX (DT_FLAGS_1)] != NULL)
-    l->l_flags_1 = info[VERSYMIDX (DT_FLAGS_1)]->d_un.d_val;
-  if (info[DT_RUNPATH] != NULL)
-    /* If both RUNPATH and RPATH are given, the latter is ignored.  */
-    info[DT_RPATH] = NULL;
-}
-
-# if ! ELF_MACHINE_NO_REL
-#  include "do-rel.h"
-# endif
-
-# if ! ELF_MACHINE_NO_RELA
-#  define DO_RELA
-#  include "do-rel.h"
-# endif
-
-#endif  /* __DYNAMIC_LINK_H__ */
-
-#ifdef RESOLVE
-
-/* Get the definitions of `elf_dynamic_do_rel' and `elf_dynamic_do_rela'.
-   These functions are almost identical, so we use cpp magic to avoid
-   duplicating their code.  It cannot be done in a more general function
-   because we must be able to completely inline.  */
-
-/* On some machines, notably SPARC, DT_REL* includes DT_JMPREL in its
-   range.  Note that according to the ELF spec, this is completely legal!
-   But conditionally define things so that on machines we know this will
-   not happen we do something more optimal.  */
-
-# ifdef ELF_MACHINE_PLTREL_OVERLAP
-#  define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy, test_rel) \
-  do {									      \
-    struct { ElfW(Addr) start, size; int lazy; } ranges[3];		      \
-    int ranges_index;							      \
-									      \
-    ranges[0].lazy = ranges[2].lazy = 0;				      \
-    ranges[1].lazy = 1;							      \
-    ranges[0].size = ranges[1].size = ranges[2].size = 0;		      \
-									      \
-    if ((map)->l_info[DT_##RELOC])					      \
-      {									      \
-	ranges[0].start = D_PTR ((map), l_info[DT_##RELOC]);		      \
-	ranges[0].size = (map)->l_info[DT_##RELOC##SZ]->d_un.d_val;	      \
-      }									      \
-									      \
-     if ((do_lazy)							      \
-	&& (map)->l_info[DT_PLTREL]					      \
-	&& (!test_rel || (map)->l_info[DT_PLTREL]->d_un.d_val == DT_##RELOC)) \
-      {									      \
-	ranges[1].start = D_PTR ((map), l_info[DT_JMPREL]);		      \
-	ranges[1].size = (map)->l_info[DT_PLTRELSZ]->d_un.d_val;	      \
-	ranges[2].start = ranges[1].start + ranges[1].size;		      \
-	ranges[2].size = ranges[0].start + ranges[0].size - ranges[2].start;  \
-	ranges[0].size = ranges[1].start - ranges[0].start;		      \
-      }									      \
-									      \
-    for (ranges_index = 0; ranges_index < 3; ++ranges_index)		      \
-      elf_dynamic_do_##reloc ((map),					      \
-			      ranges[ranges_index].start,		      \
-			      ranges[ranges_index].size,		      \
-			      ranges[ranges_index].lazy,		      \
-			      scope);					      \
-  } while (0)
-# else
-#  define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy, test_rel) \
-  do {									      \
-    struct { ElfW(Addr) start, size; int lazy; } ranges[2];		      \
-    int ranges_index;							      \
-    ranges[0].lazy = 0;							      \
-    ranges[0].size = ranges[1].size = 0;				      \
-    ranges[0].start = 0;						      \
-									      \
-    if ((map)->l_info[DT_##RELOC])					      \
-      {									      \
-        ranges[0].start = D_PTR ((map), l_info[DT_##RELOC]);		      \
-        ranges[0].size = (map)->l_info[DT_##RELOC##SZ]->d_un.d_val;	      \
-      }									      \
-    if ((map)->l_info[DT_PLTREL]					      \
-	&& (!test_rel || (map)->l_info[DT_PLTREL]->d_un.d_val == DT_##RELOC)) \
-      {									      \
-	ElfW(Addr) start = D_PTR ((map), l_info[DT_JMPREL]);		      \
-									      \
-	if ((do_lazy)							      \
-	    /* This test does not only detect whether the relocation	      \
-	       sections are in the right order, it also checks whether	      \
-	       there is a DT_REL/DT_RELA section.  */			      \
-	    || ranges[0].start + ranges[0].size != start)		      \
-	  {								      \
-	    ranges[1].start = start;					      \
-	    ranges[1].size = (map)->l_info[DT_PLTRELSZ]->d_un.d_val;	      \
-	    ranges[1].lazy = (do_lazy);					      \
-	  }								      \
-	else								      \
-	  /* Combine processing the sections.  */			      \
-	  ranges[0].size += (map)->l_info[DT_PLTRELSZ]->d_un.d_val;	      \
-      }									      \
-									      \
-    for (ranges_index = 0; ranges_index < 2; ++ranges_index)		      \
-      elf_dynamic_do_##reloc ((map),					      \
-			      ranges[ranges_index].start,		      \
-			      ranges[ranges_index].size,		      \
-			      ranges[ranges_index].lazy,		      \
-			      scope);					      \
-  } while (0)
-# endif
-
-# if ELF_MACHINE_NO_REL || ELF_MACHINE_NO_RELA
-#  define _ELF_CHECK_REL 0
-# else
-#  define _ELF_CHECK_REL 1
-# endif
-
-# if ! ELF_MACHINE_NO_REL
-#  define ELF_DYNAMIC_DO_REL(map, lazy) \
-  _ELF_DYNAMIC_DO_RELOC (REL, rel, map, lazy, _ELF_CHECK_REL)
-# else
-#  define ELF_DYNAMIC_DO_REL(map, lazy) /* Nothing to do.  */
-# endif
-
-# if ! ELF_MACHINE_NO_RELA
-#  define ELF_DYNAMIC_DO_RELA(map, lazy) \
-  _ELF_DYNAMIC_DO_RELOC (RELA, rela, map, lazy, _ELF_CHECK_REL)
-# else
-#  define ELF_DYNAMIC_DO_RELA(map, lazy) /* Nothing to do.  */
-# endif
-
-/* This can't just be an inline function because GCC is too dumb
-   to inline functions containing inlines themselves.  */
-# define ELF_DYNAMIC_RELOCATE(map, lazy, consider_profile) \
-  do {									      \
-    int edr_lazy = elf_machine_runtime_setup ((map), (lazy),		      \
-					      (consider_profile));	      \
-    ELF_DYNAMIC_DO_REL ((map), edr_lazy);				      \
-    ELF_DYNAMIC_DO_RELA ((map), edr_lazy);				      \
-  } while (0)
-
-#endif
diff --git a/newlib/libc/sys/linux/dl/kernel-features.h b/newlib/libc/sys/linux/dl/kernel-features.h
deleted file mode 100644
index 562a6c7..0000000
--- a/newlib/libc/sys/linux/dl/kernel-features.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Set flags signalling availability of kernel features based on given
-   kernel version number.
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* This file must not contain any C code.  At least it must be protected
-   to allow using the file also in assembler files.  */
-
-#ifndef __LINUX_KERNEL_VERSION
-/* We assume the worst; all kernels should be supported.  */
-# define __LINUX_KERNEL_VERSION	0
-#endif
-
-/* We assume for __LINUX_KERNEL_VERSION the same encoding used in
-   linux/version.h.  I.e., the major, minor, and subminor all get a
-   byte with the major number being in the highest byte.  This means
-   we can do numeric comparisons.
-
-   In the following we will define certain symbols depending on
-   whether the describes kernel feature is available in the kernel
-   version given by __LINUX_KERNEL_VERSION.  We are not always exactly
-   recording the correct versions in which the features were
-   introduced.  If somebody cares these values can afterwards be
-   corrected.  Most of the numbers here are set corresponding to
-   2.2.0.  */
-
-/* `getcwd' system call.  */
-#if __LINUX_KERNEL_VERSION >= 131584
-# define __ASSUME_GETCWD_SYSCALL	1
-#endif
-
-/* Real-time signal became usable in 2.1.70.  */
-#if __LINUX_KERNEL_VERSION >= 131398
-# define __ASSUME_REALTIME_SIGNALS	1
-#endif
-
-/* When were the `pread'/`pwrite' syscalls introduced?  */
-#if __LINUX_KERNEL_VERSION >= 131584
-# define __ASSUME_PREAD_SYSCALL		1
-# define __ASSUME_PWRITE_SYSCALL	1
-#endif
-
-/* When was `poll' introduced?  */
-#if __LINUX_KERNEL_VERSION >= 131584
-# define __ASSUME_POLL_SYSCALL		1
-#endif
-
-/* The `lchown' syscall was introduced in 2.1.80.  */
-#if __LINUX_KERNEL_VERSION >= 131408
-# define __ASSUME_LCHOWN_SYSCALL	1
-#endif
-
-/* When did the `setresuid' sysall became available?  */
-#if __LINUX_KERNEL_VERSION >= 131584 && !defined __sparc__
-# define __ASSUME_SETRESUID_SYSCALL	1
-#endif
-
-/* The SIOCGIFNAME ioctl is available starting with 2.1.50.  */
-#if __LINUX_KERNEL_VERSION >= 131408
-# define __ASSUME_SIOCGIFNAME		1
-#endif
-
-/* On x86 another `getrlimit' syscall was added in 2.3.25.  */
-#if __LINUX_KERNEL_VERSION >= 131865 && defined __i386__
-# define __ASSUME_NEW_GETRLIMIT_SYSCALL	1
-#endif
-
-/* On x86 the truncate64/ftruncate64 syscalls were introduced in 2.3.31.  */
-#if __LINUX_KERNEL_VERSION >= 131871 && defined __i386__
-# define __ASSUME_TRUNCATE64_SYSCALL	1
-#endif
-
-/* On x86 the mmap2 syscall was introduced in 2.3.31.  */
-#if __LINUX_KERNEL_VERSION >= 131871 && defined __i386__
-# define __ASSUME_MMAP2_SYSCALL	1
-#endif
-
-/* On x86 the stat64/lstat64/fstat64 syscalls were introduced in 2.3.34.  */
-#if __LINUX_KERNEL_VERSION >= 131874 && defined __i386__
-# define __ASSUME_STAT64_SYSCALL	1
-#endif
-
-/* On sparc and ARM the truncate64/ftruncate64/mmap2/stat64/lstat64/fstat64
-   syscalls were introduced in 2.3.35.  */
-#if __LINUX_KERNEL_VERSION >= 131875 && (defined __sparc__ || defined __arm__)
-# define __ASSUME_TRUNCATE64_SYSCALL	1
-# define __ASSUME_MMAP2_SYSCALL		1
-# define __ASSUME_STAT64_SYSCALL	1
-#endif
-
-/* I know for sure that these are in 2.3.35 on powerpc.  */
-#if __LINUX_KERNEL_VERSION >= 131875 && defined __powerpc__
-# define __ASSUME_TRUNCATE64_SYSCALL	1
-# define __ASSUME_STAT64_SYSCALL	1
-# define __ASSUME_NEW_GETRLIMIT_SYSCALL	1
-#endif
-
-/* Linux 2.3.39 introduced 32bit UID/GIDs and IPC64.  Some platforms had 32
-   bit type all along.  */
-#if __LINUX_KERNEL_VERSION >= 131879 || defined __powerpc__ || defined __mips__
-# define __ASSUME_32BITUIDS		1
-# ifndef __powerpc__
-#  define __ASSUME_IPC64		1
-# endif
-# ifdef __sparc__
-#  define __ASSUME_SETRESUID_SYSCALL	1
-# endif
-#endif
-
-/* Linux 2.4.0 on PPC introduced a correct IPC64.  */
-#if __LINUX_KERNEL_VERSION >= 132096 && defined __powerpc__
-# define __ASSUME_IPC64			1
-#endif
-
-/* We can use the LDTs for threading with Linux 2.3.99 and newer.  */
-#if __LINUX_KERNEL_VERSION >= 131939
-# define __ASSUME_LDT_WORKS		1
-#endif
-
-/* The changed st_ino field appeared in 2.4.0-test6.  But we cannot
-   distinguish this version from other 2.4.0 releases.  Therefore play
-   save and assume it available is for 2.4.1 and up.  */
-#if __LINUX_KERNEL_VERSION >= 132097
-# define __ASSUME_ST_INO_64_BIT		1
-#endif
-
-/* To support locking of large files a new fcntl() syscall was introduced
-   in 2.4.0-test7.  We test for 2.4.1 for the earliest version we know
-   the syscall is available.  */
-#if __LINUX_KERNEL_VERSION >= 132097 && (defined __i386__ || defined __sparc__)
-# define __ASSUME_FCNTL64		1
-#endif
-
-/* Arm got fcntl64 in 2.4.4, PowerPC and SH have it also in 2.4.4 (I
-   don't know when it got introduced).  */
-#if __LINUX_KERNEL_VERSION >= 132100 \
-    && (defined __arm__ || defined __powerpc__ || defined __sh__)
-# define __ASSUME_FCNTL64		1
-#endif
-
-/* The getdents64 syscall was introduced in 2.4.0-test7.  We test for
-   2.4.1 for the earliest version we know the syscall is available.  */
-#if __LINUX_KERNEL_VERSION >= 132097
-# define __ASSUME_GETDENTS64_SYSCALL	1
-#endif
-
-/* When did O_DIRECTORY became available?  Early in 2.3 but when?
-   Be safe, use 2.3.99.  */
-#if __LINUX_KERNEL_VERSION >= 131939
-# define __ASSUME_O_DIRECTORY		1
-#endif
-
-/* Starting with one of the 2.4.0 pre-releases the Linux kernel passes
-   up the page size information.  */
-#if __LINUX_KERNEL_VERSION >= 132097
-# define __ASSUME_AT_PAGESIZE		1
-#endif
-
-/* Starting with 2.4.5 kernels PPC passes the AUXV in the standard way
-   and the mmap2 syscall made it into the official kernel.  */
-#if __LINUX_KERNEL_VERSION >= (132096+5) && defined __powerpc__
-# define __ASSUME_STD_AUXV		1
-# define __ASSUME_MMAP2_SYSCALL		1
-#endif
-
-/* There are an infinite number of PA-RISC kernel versions numbered
-   2.4.0.  But they've not really been released as such.  We require
-   and expect the final version here.  */
-#ifdef __hppa__
-# define __ASSUME_32BITUIDS		1
-# define __ASSUME_TRUNCATE64_SYSCALL	1
-# define __ASSUME_MMAP2_SYSCALL		1
-# define __ASSUME_STAT64_SYSCALL	1
-# define __ASSUME_IPC64			1
-# define __ASSUME_ST_INO_64_BIT		1
-# define __ASSUME_FCNTL64		1
-# define __ASSUME_GETDENTS64_SYSCALL	1
-#endif
diff --git a/newlib/libc/sys/linux/dl/ldsodefs.h b/newlib/libc/sys/linux/dl/ldsodefs.h
deleted file mode 100644
index e6f57dd..0000000
--- a/newlib/libc/sys/linux/dl/ldsodefs.h
+++ /dev/null
@@ -1,536 +0,0 @@
-/* Run-time dynamic linker data structures for loaded ELF shared objects.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef	_LDSODEFS_H
-#define	_LDSODEFS_H	1
-
-#include <features.h>
-
-#define __need_size_t
-#define __need_NULL
-#include <stddef.h>
-#include <string.h>
-
-#include <elf.h>
-#include <link.h>
-#include <dl-lookupcfg.h>
-#include <bits/libc-lock.h>
-
-#include "dl-local.h"
-
-__BEGIN_DECLS
-
-/* We use this macro to refer to ELF types independent of the native wordsize.
-   `ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'.  */
-#define ELFW(type)	_ElfW (ELF, __ELF_NATIVE_CLASS, type)
-
-#define internal_function 
-/* All references to the value of l_info[DT_PLTGOT],
-  l_info[DT_STRTAB], l_info[DT_SYMTAB], l_info[DT_RELA],
-  l_info[DT_REL], l_info[DT_JMPREL], and l_info[VERSYMIDX (DT_VERSYM)]
-  have to be accessed via the D_PTR macro.  The macro is needed since for
-  most architectures the entry is already relocated - but for some not
-  and we need to relocate at access time.  */
-#ifdef DL_RO_DYN_SECTION
-# define D_PTR(map,i) (map->i->d_un.d_ptr + map->l_addr)
-#else
-# define D_PTR(map,i) map->i->d_un.d_ptr
-#endif
-
-/* On some platforms more information than just the address of the symbol
-   is needed from the lookup functions.  In this case we return the whole
-   link map.  */
-#ifdef DL_LOOKUP_RETURNS_MAP
-typedef struct link_map *lookup_t;
-# define LOOKUP_VALUE(map) map
-# define LOOKUP_VALUE_ADDRESS(map) (map ? map->l_addr : 0)
-#else
-typedef ElfW(Addr) lookup_t;
-# define LOOKUP_VALUE(map) map->l_addr
-# define LOOKUP_VALUE_ADDRESS(address) address
-#endif
-
-/* on some architectures a pointer to a function is not just a pointer
-   to the actual code of the function but rather an architecture
-   specific descriptor. */
-#ifndef ELF_FUNCTION_PTR_IS_SPECIAL
-# define DL_SYMBOL_ADDRESS(map, ref) \
- (void *) (LOOKUP_VALUE_ADDRESS (map) + ref->st_value)
-# define DL_LOOKUP_ADDRESS(addr) ((ElfW(Addr)) (addr))
-# define DL_DT_INIT_ADDRESS(map, start) (start)
-# define DL_DT_FINI_ADDRESS(map, start) (start)
-#endif
-
-/* Unmap a loaded object, called by _dl_close (). */
-#ifndef DL_UNMAP_IS_SPECIAL
-# define DL_UNMAP(map) \
- __munmap ((void *) (map)->l_map_start,					      \
-	   (map)->l_map_end - (map)->l_map_start)
-#endif
-
-/* By default we do not need special support to initialize DSOs loaded
-   by statically linked binaries.  */
-#ifndef DL_STATIC_INIT
-# define DL_STATIC_INIT(map)
-#endif
-
-/* Reloc type classes as returned by elf_machine_type_class().
-   ELF_RTYPE_CLASS_PLT means this reloc should not be satisfied by
-   some PLT symbol, ELF_RTYPE_CLASS_COPY means this reloc should not be
-   satisfied by any symbol in the executable.  */
-#define ELF_RTYPE_CLASS_PLT 1
-#define ELF_RTYPE_CLASS_COPY 2
-
-/* ELF uses the PF_x macros to specify the segment permissions, mmap
-   uses PROT_xxx.  In most cases the three macros have the values 1, 2,
-   and 3 but not in a matching order.  The following macros allows
-   converting from the PF_x values to PROT_xxx values.  */
-#define PF_TO_PROT \
-  ((PROT_READ << (PF_R * 4))						      \
-   | (PROT_WRITE << (PF_W * 4))						      \
-   | (PROT_EXEC << (PF_X * 4))						      \
-   | ((PROT_READ | PROT_WRITE) << ((PF_R | PF_W) * 4))			      \
-   | ((PROT_READ | PROT_EXEC) << ((PF_R | PF_X) * 4))			      \
-   | ((PROT_WRITE | PROT_EXEC) << (PF_W | PF_X) * 4)			      \
-   | ((PROT_READ | PROT_WRITE | PROT_EXEC) << ((PF_R | PF_W | PF_X) * 4)))
-
-
-/* For the version handling we need an array with only names and their
-   hash values.  */
-struct r_found_version
-  {
-    const char *name;
-    ElfW(Word) hash;
-
-    int hidden;
-    const char *filename;
-  };
-
-/* We want to cache information about the searches for shared objects.  */
-
-enum r_dir_status { unknown, nonexisting, existing };
-
-struct r_search_path_elem
-  {
-    /* This link is only used in the `all_dirs' member of `r_search_path'.  */
-    struct r_search_path_elem *next;
-
-    /* Strings saying where the definition came from.  */
-    const char *what;
-    const char *where;
-
-    /* Basename for this search path element.  The string must end with
-       a slash character.  */
-    const char *dirname;
-    size_t dirnamelen;
-
-    enum r_dir_status status[0];
-  };
-
-struct r_strlenpair
-  {
-    const char *str;
-    size_t len;
-  };
-
-
-/* A data structure for a simple single linked list of strings.  */
-struct libname_list
-  {
-    const char *name;		/* Name requested (before search).  */
-    struct libname_list *next;	/* Link to next name for this object.  */
-    int dont_free;		/* Flag whether this element should be freed
-				   if the object is not entirely unloaded.  */
-  };
-
-
-/* Test whether given NAME matches any of the names of the given object.  */
-static __inline int
-__attribute__ ((unused))
-_dl_name_match_p (const char *__name, struct link_map *__map)
-{
-  int __found = strcmp (__name, __map->l_name) == 0;
-  struct libname_list *__runp = __map->l_libname;
-
-  while (! __found && __runp != NULL)
-    if (strcmp (__name, __runp->name) == 0)
-      __found = 1;
-    else
-      __runp = __runp->next;
-
-  return __found;
-}
-
-/* Function used as argument for `_dl_receive_error' function.  The
-   arguments are the error code, error string, and the objname the
-   error occurred in.  */
-typedef void (*receiver_fct) (int, const char *, const char *);
-
-/* Internal functions of the run-time dynamic linker.
-   These can be accessed if you link again the dynamic linker
-   as a shared library, as in `-lld' or `/lib/ld.so' explicitly;
-   but are not normally of interest to user programs.
-
-   The `-ldl' library functions in <dlfcn.h> provide a simple
-   user interface to run-time dynamic linking.  */
-
-
-/* Parameters passed to the dynamic linker.  */
-extern char **_dl_argv;
-
-/* Cached value of `getpagesize ()'.  */
-extern size_t _dl_pagesize;
-
-/* OS version.  */
-extern unsigned int _dl_osversion;
-
-/* File descriptor referring to the zero-fill device.  */
-extern int _dl_zerofd;
-
-/* Name of the shared object to be profiled (if any).  */
-extern const char *_dl_profile;
-/* Map of shared object to be profiled.  */
-extern struct link_map *_dl_profile_map;
-/* Filename of the output file.  */
-extern const char *_dl_profile_output;
-
-/* If nonzero the appropriate debug information is printed.  */
-extern int _dl_debug_mask;
-#define DL_DEBUG_LIBS	    (1 << 0)
-#define DL_DEBUG_IMPCALLS   (1 << 1)
-#define DL_DEBUG_BINDINGS   (1 << 2)
-#define DL_DEBUG_SYMBOLS    (1 << 3)
-#define DL_DEBUG_VERSIONS   (1 << 4)
-#define DL_DEBUG_RELOC      (1 << 5)
-#define DL_DEBUG_FILES      (1 << 6)
-#define DL_DEBUG_STATISTICS (1 << 7)
-/* This one is used only internally.  */
-#define DL_DEBUG_HELP       (1 << 8)
-
-/* Expect cache ID.  */
-extern int _dl_correct_cache_id;
-
-/* Mask for hardware capabilities that are available.  */
-extern unsigned long int _dl_hwcap;
-
-/* Mask for important hardware capabilities we honour. */
-extern unsigned long int _dl_hwcap_mask;
-
-/* File descriptor to write debug messages to.  */
-extern int _dl_debug_fd;
-
-/* Names of shared object for which the RPATH should be ignored.  */
-extern const char *_dl_inhibit_rpath;
-
-/* Nonzero if references should be treated as weak during runtime linking.  */
-extern int _dl_dynamic_weak;
-
-/* The array with message we print as a last resort.  */
-extern const char _dl_out_of_memory[];
-
-/* Nonzero if runtime lookups should not update the .got/.plt.  */
-extern int _dl_bind_not;
-
-/* List of search directories.  */
-extern struct r_search_path_elem *_dl_all_dirs;
-extern struct r_search_path_elem *_dl_init_all_dirs;
-
-/* OS-dependent function to open the zero-fill device.  */
-extern int _dl_sysdep_open_zero_fill (void); /* dl-sysdep.c */
-
-
-/* During the program run we must not modify the global data of
-   loaded shared object simultanously in two threads.  Therefore we
-   protect `_dl_open' and `_dl_close' in dl-close.c.
-
-   This must be a recursive lock since the initializer function of
-   the loaded object might as well require a call to this function.
-   At this time it is not anymore a problem to modify the tables.  */
-__libc_lock_define_recursive (extern, _dl_load_lock)
-
-
-/* Write message on the debug file descriptor.  The parameters are
-   interpreted as for a `printf' call.  All the lines start with a
-   tag showing the PID.  */
-extern void _dl_debug_printf (const char *fmt, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
-
-/* Write message on the debug file descriptor.  The parameters are
-   interpreted as for a `printf' call.  All the lines buf the first
-   start with a tag showing the PID.  */
-extern void _dl_debug_printf_c (const char *fmt, ...)
-     __attribute__ ((__format__ (__printf__, 1, 2)));
-
-
-/* Write a message on the specified descriptor FD.  The parameters are
-   interpreted as for a `printf' call.  */
-extern void _dl_dprintf (int fd, const char *fmt, ...)
-     __attribute__ ((__format__ (__printf__, 2, 3)));
-
-/* Write a message on the specified descriptor standard output.  The
-   parameters are interpreted as for a `printf' call.  */
-#define _dl_printf(fmt, args...) \
-  _dl_dprintf (STDOUT_FILENO, fmt, ##args)
-
-/* Write a message on the specified descriptor standard error.  The
-   parameters are interpreted as for a `printf' call.  */
-#define _dl_error_printf(fmt, args...) \
-  _dl_dprintf (STDERR_FILENO, fmt, ##args)
-
-/* Write a message on the specified descriptor standard error and exit
-   the program.  The parameters are interpreted as for a `printf' call.  */
-#define _dl_fatal_printf(fmt, args...) \
-  do									      \
-    {									      \
-      _dl_dprintf (STDERR_FILENO, fmt, ##args);				      \
-      _exit (127);							      \
-    }									      \
-  while (1)
-
-
-/* This function is called by all the internal dynamic linker functions
-   when they encounter an error.  ERRCODE is either an `errno' code or
-   zero; OBJECT is the name of the problematical shared object, or null if
-   it is a general problem; ERRSTRING is a string describing the specific
-   problem.  */
-extern void _dl_signal_error (int errcode, const char *object,
-			      const char *occurred, const char *errstring)
-     internal_function
-     __attribute__ ((__noreturn__));
-
-/* Like _dl_signal_error, but may return when called in the context of
-   _dl_receive_error.  */
-extern void _dl_signal_cerror (int errcode, const char *object,
-			       const char *occation, const char *errstring)
-     internal_function;
-
-/* Call OPERATE, receiving errors from `dl_signal_cerror'.  Unlike
-   `_dl_catch_error' the operation is resumed after the OPERATE
-   function returns.
-   ARGS is passed as argument to OPERATE.  */
-extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *),
-			       void *args)
-     internal_function;
-
-
-/* Open the shared object NAME and map in its segments.
-   LOADER's DT_RPATH is used in searching for NAME.
-   If the object is already opened, returns its existing map.
-   For preloaded shared objects PRELOADED is set to a non-zero
-   value to allow additional security checks.  */
-extern struct link_map *_dl_map_object (struct link_map *loader,
-					const char *name, int preloaded,
-					int type, int trace_mode, int mode)
-     internal_function;
-
-/* Call _dl_map_object on the dependencies of MAP, and set up
-   MAP->l_searchlist.  PRELOADS points to a vector of NPRELOADS previously
-   loaded objects that will be inserted into MAP->l_searchlist after MAP
-   but before its dependencies.  */
-extern void _dl_map_object_deps (struct link_map *map,
-				 struct link_map **preloads,
-				 unsigned int npreloads, int trace_mode)
-     internal_function;
-
-/* Cache the locations of MAP's hash table.  */
-extern void _dl_setup_hash (struct link_map *map) internal_function;
-
-
-/* Search loaded objects' symbol tables for a definition of the symbol
-   referred to by UNDEF.  *SYM is the symbol table entry containing the
-   reference; it is replaced with the defining symbol, and the base load
-   address of the defining object is returned.  SYMBOL_SCOPE is a
-   null-terminated list of object scopes to search; each object's
-   l_searchlist (i.e. the segment of the dependency tree starting at that
-   object) is searched in turn.  REFERENCE_NAME should name the object
-   containing the reference; it is used in error messages.
-   TYPE_CLASS describes the type of symbol we are looking for.  */
-extern lookup_t _dl_lookup_symbol (const char *undef,
-				   struct link_map *undef_map,
-				   const ElfW(Sym) **sym,
-				   struct r_scope_elem *symbol_scope[],
-				   int type_class, int explicit)
-     internal_function;
-
-/* Lookup versioned symbol.  */
-extern lookup_t _dl_lookup_versioned_symbol (const char *undef,
-					     struct link_map *undef_map,
-					     const ElfW(Sym) **sym,
-					     struct r_scope_elem *symbol_scope[],
-					     const struct r_found_version *version,
-					     int type_class, int explicit)
-     internal_function;
-
-/* For handling RTLD_NEXT we must be able to skip shared objects.  */
-extern lookup_t _dl_lookup_symbol_skip (const char *undef,
-					struct link_map *undef_map,
-					const ElfW(Sym) **sym,
-					struct r_scope_elem *symbol_scope[],
-					struct link_map *skip_this)
-     internal_function;
-
-/* For handling RTLD_NEXT with versioned symbols we must be able to
-   skip shared objects.  */
-extern lookup_t _dl_lookup_versioned_symbol_skip (const char *undef,
-						  struct link_map *undef_map,
-						  const ElfW(Sym) **sym,
-						  struct r_scope_elem *symbol_scope[],
-						  const struct r_found_version *version,
-						  struct link_map *skip_this)
-     internal_function;
-
-/* Look up symbol NAME in MAP's scope and return its run-time address.  */
-extern ElfW(Addr) _dl_symbol_value (struct link_map *map, const char *name)
-     internal_function;
-
-
-/* Structure describing the dynamic linker itself.  */
-extern struct link_map _dl_rtld_map;
-/* And a pointer to the map for the main map.  */
-extern struct link_map *_dl_loaded;
-/* Number of object in the _dl_loaded list.  */
-extern unsigned int _dl_nloaded;
-/* Array representing global scope.  */
-extern struct r_scope_elem *_dl_global_scope[2];
-/* Direct pointer to the searchlist of the main object.  */
-extern struct r_scope_elem *_dl_main_searchlist;
-/* Copy of the content of `_dl_main_searchlist'.  */
-extern struct r_scope_elem _dl_initial_searchlist;
-/* This is zero at program start to signal that the global scope map is
-   allocated by rtld.  Later it keeps the size of the map.  It might be
-   reset if in _dl_close if the last global object is removed.  */
-extern size_t _dl_global_scope_alloc;
-
-/* Allocate a `struct link_map' for a new object being loaded,
-   and enter it into the _dl_main_map list.  */
-extern struct link_map *_dl_new_object (char *realname, const char *libname,
-					int type, struct link_map *loader)
-     internal_function;
-
-/* Relocate the given object (if it hasn't already been).
-   SCOPE is passed to _dl_lookup_symbol in symbol lookups.
-   If LAZY is nonzero, don't relocate its PLT.  */
-extern void _dl_relocate_object (struct link_map *map,
-				 struct r_scope_elem *scope[],
-				 int lazy, int consider_profiling);
-
-/* Call _dl_signal_error with a message about an unhandled reloc type.
-   TYPE is the result of ELFW(R_TYPE) (r_info), i.e. an R_<CPU>_* value.
-   PLT is nonzero if this was a PLT reloc; it just affects the message.  */
-extern void _dl_reloc_bad_type (struct link_map *map,
-				unsigned int type, int plt)
-     internal_function __attribute__ ((__noreturn__));
-
-/* Check the version dependencies of all objects available through
-   MAP.  If VERBOSE print some more diagnostics.  */
-extern int _dl_check_all_versions (struct link_map *map, int verbose,
-				   int trace_mode)
-     internal_function;
-
-/* Check the version dependencies for MAP.  If VERBOSE print some more
-   diagnostics.  */
-extern int _dl_check_map_versions (struct link_map *map, int verbose,
-				   int trace_mode)
-     internal_function;
-
-/* Initialize the object in SCOPE by calling the constructors with
-   ARGC, ARGV, and ENV as the parameters.  */
-extern void _dl_init (struct link_map *main_map, int argc, char **argv,
-		      char **env) internal_function;
-
-/* Call the finalizer functions of all shared objects whose
-   initializer functions have completed.  */
-extern void _dl_fini (void) internal_function;
-
-/* The dynamic linker calls this function before and having changing
-   any shared object mappings.  The `r_state' member of `struct r_debug'
-   says what change is taking place.  This function's address is
-   the value of the `r_brk' member.  */
-extern void _dl_debug_state (void);
-
-/* Initialize `struct r_debug' if it has not already been done.  The
-   argument is the run-time load address of the dynamic linker, to be put
-   in the `r_ldbase' member.  Returns the address of the structure.  */
-extern struct r_debug *_dl_debug_initialize (ElfW(Addr) ldbase)
-     internal_function;
-
-/* Initialize the basic data structure for the search paths.  */
-extern void _dl_init_paths (const char *library_path) internal_function;
-
-/* Gather the information needed to install the profiling tables and start
-   the timers.  */
-extern void _dl_start_profile (struct link_map *map, const char *output_dir)
-     internal_function;
-
-/* The actual functions used to keep book on the calls.  */
-extern void _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc);
-
-/* This function is simply a wrapper around the _dl_mcount function
-   which does not require a FROMPC parameter since this is the
-   calling function.  */
-extern void _dl_mcount_wrapper (void *selfpc);
-
-/* Show the members of the auxiliary array passed up from the kernel.  */
-extern void _dl_show_auxv (void) internal_function;
-
-/* Return all environment variables starting with `LD_', one after the
-   other.  */
-extern char *_dl_next_ld_env_entry (char ***position) internal_function;
-
-/* Return an array with the names of the important hardware capabilities.  */
-extern const struct r_strlenpair *_dl_important_hwcaps (const char *platform,
-							size_t paltform_len,
-							size_t *sz,
-							size_t *max_capstrlen)
-     internal_function;
-
-/* Look up NAME in ld.so.cache and return the file name stored there,
-   or null if none is found.  */
-extern const char *_dl_load_cache_lookup (const char *name)
-     internal_function;
-
-/* If the system does not support MAP_COPY we cannot leave the file open
-   all the time since this would create problems when the file is replaced.
-   Therefore we provide this function to close the file and open it again
-   once needed.  */
-extern void _dl_unload_cache (void);
-
-/* System-dependent function to read a file's whole contents in the
-   most convenient manner available.  *SIZEP gets the size of the
-   file.  On error MAP_FAILED is returned.  */
-extern void *_dl_sysdep_read_whole_file (const char *file, size_t *sizep,
-					 int prot)
-     internal_function;
-
-/* System-specific function to do initial startup for the dynamic linker.
-   After this, file access calls and getenv must work.  This is responsible
-   for setting __libc_enable_secure if we need to be secure (e.g. setuid),
-   and for setting _dl_argc and _dl_argv, and then calling _dl_main.  */
-extern ElfW(Addr) _dl_sysdep_start (void **start_argptr,
-				    void (*dl_main) (const ElfW(Phdr) *phdr,
-						     ElfW(Word) phnum,
-						     ElfW(Addr) *user_entry));
-
-extern void _dl_sysdep_start_cleanup (void)
-     internal_function;
-
-
-__END_DECLS
-
-#endif /* ldsodefs.h */
diff --git a/newlib/libc/sys/linux/dl/libintl.h b/newlib/libc/sys/linux/dl/libintl.h
deleted file mode 100644
index 839210d..0000000
--- a/newlib/libc/sys/linux/dl/libintl.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define N_(x) x
-
diff --git a/newlib/libc/sys/linux/dl/trusted-dirs.h b/newlib/libc/sys/linux/dl/trusted-dirs.h
deleted file mode 100644
index 103d6e6..0000000
--- a/newlib/libc/sys/linux/dl/trusted-dirs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#define SYSTEM_DIRS \
-  "/usr/local/lib/"
-
-#define SYSTEM_DIRS_LEN \
-  15
-
-#define SYSTEM_DIRS_MAX_LEN	15
diff --git a/newlib/libc/sys/linux/dl/unsecvars.h b/newlib/libc/sys/linux/dl/unsecvars.h
deleted file mode 100644
index efb9515..0000000
--- a/newlib/libc/sys/linux/dl/unsecvars.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Environment variable to be removed for SUID programs.  The names are
-   all stuffed in a single string which means they have to be terminated
-   with a '\0' explicitly.  */
-#define UNSECURE_ENVVARS \
-  "LD_PRELOAD\0"							      \
-  "LD_LIBRARY_PATH\0"							      \
-  "LD_ORIGIN_PATH\0"							      \
-  "LD_DEBUG_OUTPUT\0"							      \
-  "LD_PROFILE\0"							      \
-  "GCONV_PATH\0"							      \
-  "HOSTALIASES\0"							      \
-  "LOCALDOMAIN\0"							      \
-  "LOCPATH\0"								      \
-  "MALLOC_TRACE\0"							      \
-  "NLSPATH\0"								      \
-  "RESOLV_HOST_CONF\0"							      \
-  "RES_OPTIONS\0"							      \
-  "TMPDIR\0"								      \
-  "TZDIR\0"
diff --git a/newlib/libc/sys/linux/fclean.c b/newlib/libc/sys/linux/fclean.c
deleted file mode 100644
index 2fb11fc..0000000
--- a/newlib/libc/sys/linux/fclean.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdio.h>
-
-int
-fclean (FILE *fp)
-{
-  return fflush (fp);
-}
diff --git a/newlib/libc/sys/linux/flockfile.c b/newlib/libc/sys/linux/flockfile.c
deleted file mode 100644
index 4a6cbc4..0000000
--- a/newlib/libc/sys/linux/flockfile.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* stub to allow libpthread to override */
-
-#include <stdio.h>
-#include <machine/weakalias.h>
-
-void __libc_flockfile (FILE *fp)
-{
-}
-weak_alias(__libc_flockfile,flockfile)
diff --git a/newlib/libc/sys/linux/fpathconf.c b/newlib/libc/sys/linux/fpathconf.c
deleted file mode 100644
index 6d006a1..0000000
--- a/newlib/libc/sys/linux/fpathconf.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/* Linux specific extensions to fpathconf.
-   Copyright (C) 1991,95,96,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Modified for newlib July 19, 2002 by Jeff Johnston */
-
-#include <errno.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <limits.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/statvfs.h>
-#include <machine/weakalias.h>
-#include "linux_fsinfo.h"
-
-/* The Linux kernel header mentioned this as a kind of generic value.  */
-#define LINUX_LINK_MAX	127
-
-static long int posix_fpathconf (int fd, int name);
-
-/* Get file-specific information about descriptor FD.  */
-long int
-__fpathconf (fd, name)
-     int fd;
-     int name;
-{
-  if (name == _PC_LINK_MAX)
-    {
-      struct statfs fsbuf;
-
-      /* Determine the filesystem type.  */
-      if (__fstatfs (fd, &fsbuf) < 0)
-	{
-	  if (errno == ENOSYS)
-	    /* not possible, return the default value.  */
-	    return LINUX_LINK_MAX;
-
-	  /* Some error occured.  */
-          return -1;
-	}
-
-      switch (fsbuf.f_type)
-	{
-	case EXT2_SUPER_MAGIC:
-	  return EXT2_LINK_MAX;
-
-	case MINIX_SUPER_MAGIC:
-	case MINIX_SUPER_MAGIC2:
-	  return MINIX_LINK_MAX;
-
-	case MINIX2_SUPER_MAGIC:
-	case MINIX2_SUPER_MAGIC2:
-	  return MINIX2_LINK_MAX;
-
-	case XENIX_SUPER_MAGIC:
-	  return XENIX_LINK_MAX;
-
-	case SYSV4_SUPER_MAGIC:
-	case SYSV2_SUPER_MAGIC:
-	  return SYSV_LINK_MAX;
-
-	case COH_SUPER_MAGIC:
-	  return COH_LINK_MAX;
-
-	case UFS_MAGIC:
-	case UFS_CIGAM:
-	  return UFS_LINK_MAX;
-
-	case REISERFS_SUPER_MAGIC:
-	  return REISERFS_LINK_MAX;
-
-	default:
-	  return LINUX_LINK_MAX;
-	}
-    }
-
-  return posix_fpathconf (fd, name);
-}
-
-/* Get file-specific information about descriptor FD.  */
-static long int
-posix_fpathconf (fd, name)
-     int fd;
-     int name;
-{
-  if (fd < 0)
-    {
-      __set_errno (EBADF);
-      return -1;
-    }
-
-  switch (name)
-    {
-    default:
-      __set_errno (EINVAL);
-      return -1;
-
-    case _PC_LINK_MAX:
-#ifdef	LINK_MAX
-      return LINK_MAX;
-#else
-      return -1;
-#endif
-
-    case _PC_MAX_CANON:
-#ifdef	MAX_CANON
-      return MAX_CANON;
-#else
-      return -1;
-#endif
-
-    case _PC_MAX_INPUT:
-#ifdef	MAX_INPUT
-      return MAX_INPUT;
-#else
-      return -1;
-#endif
-
-    case _PC_NAME_MAX:
-#ifdef	NAME_MAX
-      {
-	struct statfs buf;
-	int save_errno = errno;
-
-	if (__fstatfs (fd, &buf) < 0)
-	  {
-	    if (errno == ENOSYS)
-	      {
-		__set_errno (save_errno);
-		return NAME_MAX;
-	      }
-	    else if (errno == ENODEV)
-	      __set_errno (EINVAL);
-
-	    return -1;
-	  }
-	else
-	  {
-#ifdef _STATFS_F_NAMELEN
-	    return buf.f_namelen;
-#else
-# ifdef _STATFS_F_NAME_MAX
-	    return buf.f_name_max;
-# else
-	    return NAME_MAX;
-# endif
-#endif
-	  }
-      }
-#else
-      return -1;
-#endif
-
-    case _PC_PATH_MAX:
-#ifdef	PATH_MAX
-      return PATH_MAX;
-#else
-      return -1;
-#endif
-
-    case _PC_PIPE_BUF:
-#ifdef	PIPE_BUF
-      return PIPE_BUF;
-#else
-      return -1;
-#endif
-
-    case _PC_CHOWN_RESTRICTED:
-#ifdef	_POSIX_CHOWN_RESTRICTED
-      return _POSIX_CHOWN_RESTRICTED;
-#else
-      return -1;
-#endif
-
-    case _PC_NO_TRUNC:
-#ifdef	_POSIX_NO_TRUNC
-      return _POSIX_NO_TRUNC;
-#else
-      return -1;
-#endif
-
-    case _PC_VDISABLE:
-#ifdef	_POSIX_VDISABLE
-      return _POSIX_VDISABLE;
-#else
-      return -1;
-#endif
-
-    case _PC_SYNC_IO:
-#ifdef	_POSIX_SYNC_IO
-      return _POSIX_SYNC_IO;
-#else
-      return -1;
-#endif
-
-    case _PC_ASYNC_IO:
-#ifdef	_POSIX_ASYNC_IO
-      {
-	/* AIO is only allowed on regular files and block devices.  */
-	struct stat64 st;
-
-	if (fstat64 (fd, &st) < 0
-	    || (! S_ISREG (st.st_mode) && ! S_ISBLK (st.st_mode)))
-	  return -1;
-	else
-	  return 1;
-      }
-#else
-      return -1;
-#endif
-
-    case _PC_PRIO_IO:
-#ifdef	_POSIX_PRIO_IO
-      return _POSIX_PRIO_IO;
-#else
-      return -1;
-#endif
-
-    case _PC_SOCK_MAXBUF:
-#ifdef	SOCK_MAXBUF
-      return SOCK_MAXBUF;
-#else
-      return -1;
-#endif
-
-    case _PC_FILESIZEBITS:
-#ifdef FILESIZEBITS
-      return FILESIZEBITS;
-#else
-      /* We let platforms with larger file sizes overwrite this value.  */
-      return 32;
-#endif
-
-    case _PC_REC_INCR_XFER_SIZE:
-      /* XXX It is not entirely clear what the limit is supposed to do.
-	 What is incremented?  */
-      return -1;
-
-    case _PC_REC_MAX_XFER_SIZE:
-      /* XXX It is not entirely clear what the limit is supposed to do.
-	 In general there is no top limit of the number of bytes which
-	 case be transported at once.  */
-      return -1;
-
-    case _PC_REC_MIN_XFER_SIZE:
-      {
-	/* XXX It is not entirely clear what the limit is supposed to do.
-	   I assume this is the block size of the filesystem.  */
-	struct statvfs64 sv;
-
-	if (__fstatvfs64 (fd, &sv) < 0)
-	  return -1;
-	return sv.f_bsize;
-      }
-
-    case _PC_REC_XFER_ALIGN:
-      {
-	/* XXX It is not entirely clear what the limit is supposed to do.
-	   I assume that the number should reflect the minimal block
-	   alignment.  */
-	struct statvfs64 sv;
-
-	if (__fstatvfs64 (fd, &sv) < 0)
-	  return -1;
-	return sv.f_frsize;
-      }
-
-    case _PC_ALLOC_SIZE_MIN:
-      {
-	/* XXX It is not entirely clear what the limit is supposed to do.
-	   I assume that the number should reflect the minimal block
-	   alignment.  */
-	struct statvfs64 sv;
-
-	if (__fstatvfs64 (fd, &sv) < 0)
-	  return -1;
-	return sv.f_frsize;
-      }
-
-    case _PC_SYMLINK_MAX:
-      /* In general there are no limits.  If a system has one it should
-	 overwrite this case.  */
-      return -1;
-    }
-}
-
-weak_alias (__fpathconf, fpathconf)
diff --git a/newlib/libc/sys/linux/free.c b/newlib/libc/sys/linux/free.c
deleted file mode 100644
index 818e05a..0000000
--- a/newlib/libc/sys/linux/free.c
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy file to override one object in stdlib directory */
diff --git a/newlib/libc/sys/linux/freer.c b/newlib/libc/sys/linux/freer.c
deleted file mode 100644
index d8d7f98..0000000
--- a/newlib/libc/sys/linux/freer.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-void
-_free_r (struct _reent *ptr, void *addr)
-{
-  free (addr);
-}
diff --git a/newlib/libc/sys/linux/fstab.c b/newlib/libc/sys/linux/fstab.c
deleted file mode 100644
index f98f4b7..0000000
--- a/newlib/libc/sys/linux/fstab.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <fstab.h>
-#include <mntent.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <bits/libc-lock.h>
-#include <libc-symbols.h>
-
-#define BUFFER_SIZE 0x1fc0
-
-struct fstab_state
-{
-  FILE *fs_fp;
-  char *fs_buffer;
-  struct mntent fs_mntres;
-  struct fstab fs_ret;
-};
-
-static struct fstab_state *fstab_init (int opt_rewind);
-static struct mntent *fstab_fetch (struct fstab_state *state);
-static struct fstab *fstab_convert (struct fstab_state *state);
-
-static struct fstab_state fstab_state;
-
-
-int
-setfsent (void)
-{
-  return fstab_init (1) != NULL;
-}
-
-
-struct fstab *
-getfsent (void)
-{
-  struct fstab_state *state;
-
-  state = fstab_init (0);
-  if (state == NULL)
-    return NULL;
-  if (fstab_fetch (state) == NULL)
-    return NULL;
-  return fstab_convert (state);
-}
-
-
-struct fstab *
-getfsspec (name)
-     const char *name;
-{
-  struct fstab_state *state;
-  struct mntent *m;
-
-  state = fstab_init (1);
-  if (state == NULL)
-    return NULL;
-  while ((m = fstab_fetch (state)) != NULL)
-    if (strcmp (m->mnt_fsname, name) == 0)
-      return fstab_convert (state);
-  return NULL;
-}
-
-
-struct fstab *
-getfsfile (name)
-     const char *name;
-{
-  struct fstab_state *state;
-  struct mntent *m;
-
-  state = fstab_init (1);
-  if (state == NULL)
-    return NULL;
-  while ((m = fstab_fetch (state)) != NULL)
-    if (strcmp (m->mnt_dir, name) == 0)
-      return fstab_convert (state);
-  return NULL;
-}
-
-
-void
-endfsent ()
-{
-  struct fstab_state *state;
-
-  state = &fstab_state;
-  if (state->fs_fp != NULL)
-    {
-      (void) __endmntent (state->fs_fp);
-      state->fs_fp = NULL;
-    }
-}
-
-
-static struct fstab_state *
-fstab_init (int opt_rewind)
-{
-  struct fstab_state *state;
-  char *buffer;
-  FILE *fp;
-
-  state = &fstab_state;
-
-  buffer = state->fs_buffer;
-  if (buffer == NULL)
-    {
-      buffer = (char *) malloc (BUFFER_SIZE);
-      if (buffer == NULL)
-	return NULL;
-      state->fs_buffer = buffer;
-    }
-
-  fp = state->fs_fp;
-  if (fp != NULL)
-    {
-      if (opt_rewind)
-	rewind (fp);
-    }
-  else
-    {
-      fp = __setmntent (_PATH_FSTAB, "r");
-      if (fp == NULL)
-	return NULL;
-      state->fs_fp = fp;
-    }
-
-  return state;
-}
-
-
-static struct mntent *
-fstab_fetch (struct fstab_state *state)
-{
-  return __getmntent_r (state->fs_fp, &state->fs_mntres,
-			state->fs_buffer, BUFFER_SIZE);
-}
-
-
-static struct fstab *
-fstab_convert (struct fstab_state *state)
-{
-  struct mntent *m;
-  struct fstab *f;
-
-  m = &state->fs_mntres;
-  f = &state->fs_ret;
-
-  f->fs_spec = m->mnt_fsname;
-  f->fs_file = m->mnt_dir;
-  f->fs_vfstype = m->mnt_type;
-  f->fs_mntops = m->mnt_opts;
-  f->fs_type = (__hasmntopt (m, FSTAB_RW) ? FSTAB_RW :
-		__hasmntopt (m, FSTAB_RQ) ? FSTAB_RQ :
-		__hasmntopt (m, FSTAB_RO) ? FSTAB_RO :
-		__hasmntopt (m, FSTAB_SW) ? FSTAB_SW :
-		__hasmntopt (m, FSTAB_XX) ? FSTAB_XX :
-		"??");
-  f->fs_freq = m->mnt_freq;
-  f->fs_passno = m->mnt_passno;
-  return f;
-}
-
-
-/* Make sure the memory is freed if the programs ends while in
-   memory-debugging mode and something actually was allocated.  */
-static void
-__attribute__ ((unused))
-fstab_free (void)
-{
-  char *buffer;
-
-  buffer = fstab_state.fs_buffer;
-  if (buffer != NULL)
-    free ((void *) buffer);
-}
-
-text_set_element (__libc_subfreeres, fstab_free);
diff --git a/newlib/libc/sys/linux/fstatvfs.c b/newlib/libc/sys/linux/fstatvfs.c
deleted file mode 100644
index e1a1260..0000000
--- a/newlib/libc/sys/linux/fstatvfs.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#define _GNU_SOURCE
-
-#include <errno.h>
-#include <mntent.h>
-#include <paths.h>
-#include <string.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/statvfs.h>
-
-
-int
-fstatvfs (int fd, struct statvfs *buf)
-{
-  struct statfs fsbuf;
-  struct stat64 st;
-
-  /* Get as much information as possible from the system.  */
-  if (__fstatfs (fd, &fsbuf) < 0)
-    return -1;
-
-#define STAT(st) fstat64 (fd, st)
-#include "internal_statvfs.c"
-
-  /* We signal success if the statfs call succeeded.  */
-  return 0;
-}
diff --git a/newlib/libc/sys/linux/fstatvfs64.c b/newlib/libc/sys/linux/fstatvfs64.c
deleted file mode 100644
index 65c9e60..0000000
--- a/newlib/libc/sys/linux/fstatvfs64.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Return information about the filesystem on which FD resides.
-   Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/statvfs.h>
-#include <string.h>
-#include <machine/weakalias.h>
-
-/* Return information about the filesystem on which FD resides.  */
-int
-__fstatvfs64 (int fd, struct statvfs64 *buf)
-{
-  struct statvfs buf32;
-
-  if (fstatvfs (fd, &buf32) < 0)
-    return -1;
-
-  buf->f_bsize = buf32.f_bsize;
-  buf->f_frsize = buf32.f_frsize;
-  buf->f_blocks = buf32.f_blocks;
-  buf->f_bfree = buf32.f_bfree;
-  buf->f_bavail = buf32.f_bavail;
-  buf->f_files = buf32.f_files;
-  buf->f_ffree = buf32.f_ffree;
-  buf->f_favail = buf32.f_favail;
-  buf->f_fsid = buf32.f_fsid;
-  buf->f_flag = buf32.f_flag;
-  buf->f_namemax = buf32.f_namemax;
-  memcpy (buf->__f_spare, buf32.__f_spare, sizeof (buf32.__f_spare));
-
-  return 0;
-}
-weak_alias (__fstatvfs64, fstatvfs64)
diff --git a/newlib/libc/sys/linux/ftok.c b/newlib/libc/sys/linux/ftok.c
deleted file mode 100644
index 2f4b684..0000000
--- a/newlib/libc/sys/linux/ftok.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Modified for newlib by Jeff Johnston, June 10/2002 */
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/stat.h>
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-#define STAT stat64
-#else
-#define STAT stat
-#endif
-
-key_t
-ftok (pathname, proj_id)
-     const char *pathname;
-     int proj_id;
-{
-  struct STAT st;
-  key_t key;
-
-  if (STAT (pathname, &st) < 0)
-    return (key_t) -1;
-
-  key = ((st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16)
-	 | ((proj_id & 0xff) << 24));
-
-  return key;
-}
diff --git a/newlib/libc/sys/linux/ftw.c b/newlib/libc/sys/linux/ftw.c
deleted file mode 100644
index a7f7259..0000000
--- a/newlib/libc/sys/linux/ftw.c
+++ /dev/null
@@ -1,640 +0,0 @@
-/* File tree walker functions.
-   Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Modified for newlib by Jeff Johnston, July 26, 2002 */
-
-#define _GNU_SOURCE 1
-
-#include <dirent.h>
-#include <errno.h>
-#include <ftw.h>
-#include <search.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-
-extern struct dirent64 *__readdir64 (DIR *);
-
-/* #define NDEBUG 1 */
-#include <assert.h>
-
-/* Support for the LFS API version.  */
-#ifndef FTW_NAME
-# define FTW_NAME ftw
-# define NFTW_NAME nftw
-# define INO_T ino_t
-# define STAT stat
-# define LXSTAT lstat
-# define XSTAT stat
-# define FTW_FUNC_T __ftw_func_t
-# define NFTW_FUNC_T __nftw_func_t
-#endif
-
-#define dirfd(x) ((x)->dd_fd)
-
-struct dir_data
-{
-  DIR *stream;
-  char *content;
-};
-
-struct known_object
-{
-  dev_t dev;
-  INO_T ino;
-};
-
-struct ftw_data
-{
-  /* Array with pointers to open directory streams.  */
-  struct dir_data **dirstreams;
-  size_t actdir;
-  size_t maxdir;
-
-  /* Buffer containing name of currently processed object.  */
-  char *dirbuf;
-  size_t dirbufsize;
-
-  /* Passed as fourth argument to `nftw' callback.  The `base' member
-     tracks the content of the `dirbuf'.  */
-  struct FTW ftw;
-
-  /* Flags passed to `nftw' function.  0 for `ftw'.  */
-  int flags;
-
-  /* Conversion array for flag values.  It is the identity mapping for
-     `nftw' calls, otherwise it maps the values to those know by
-     `ftw'.  */
-  const int *cvt_arr;
-
-  /* Callback function.  We always use the `nftw' form.  */
-  NFTW_FUNC_T func;
-
-  /* Device of starting point.  Needed for FTW_MOUNT.  */
-  dev_t dev;
-
-  /* Data structure for keeping fingerprints of already processed
-     object.  This is needed when not using FTW_PHYS.  */
-  void *known_objects;
-};
-
-
-/* Internally we use the FTW_* constants used for `nftw'.  When the
-   process called `ftw' we must reduce the flag to the known flags
-   for `ftw'.  */
-static const int nftw_arr[] =
-{
-  FTW_F, FTW_D, FTW_DNR, FTW_NS, FTW_SL, FTW_DP, FTW_SLN
-};
-
-static const int ftw_arr[] =
-{
-  FTW_F, FTW_D, FTW_DNR, FTW_NS, FTW_F, FTW_D, FTW_NS
-};
-
-
-/* Forward declarations of local functions.  */
-static int ftw_dir (struct ftw_data *data, struct STAT *st);
-
-
-static int
-object_compare (const void *p1, const void *p2)
-{
-  /* We don't need a sophisticated and useful comparison.  We are only
-     interested in equality.  However, we must be careful not to
-     accidentally compare `holes' in the structure.  */
-  const struct known_object *kp1 = p1, *kp2 = p2;
-  int cmp1;
-  cmp1 = (kp1->dev > kp2->dev) - (kp1->dev < kp2->dev);
-  if (cmp1 != 0)
-    return cmp1;
-  return (kp1->ino > kp2->ino) - (kp1->ino < kp2->ino);
-}
-
-
-static inline int
-add_object (struct ftw_data *data, struct STAT *st)
-{
-  struct known_object *newp = malloc (sizeof (struct known_object));
-  if (newp == NULL)
-    return -1;
-  newp->dev = st->st_dev;
-  newp->ino = st->st_ino;
-  return tsearch (newp, &data->known_objects, object_compare) ? 0 : -1;
-}
-
-
-static inline int
-find_object (struct ftw_data *data, struct STAT *st)
-{
-  struct known_object obj = { dev: st->st_dev, ino: st->st_ino };
-  return tfind (&obj, &data->known_objects, object_compare) != NULL;
-}
-
-
-static inline int
-open_dir_stream (struct ftw_data *data, struct dir_data *dirp)
-{
-  int result = 0;
-
-  if (data->dirstreams[data->actdir] != NULL)
-    {
-      /* Oh, oh.  We must close this stream.  Get all remaining
-	 entries and store them as a list in the `content' member of
-	 the `struct dir_data' variable.  */
-      size_t bufsize = 1024;
-      char *buf = malloc (bufsize);
-
-      if (buf == NULL)
-	result = -1;
-      else
-	{
-	  DIR *st = data->dirstreams[data->actdir]->stream;
-	  struct dirent64 *d;
-	  size_t actsize = 0;
-
-	  while ((d = __readdir64 (st)) != NULL)
-	    {
-	      size_t this_len = strlen (d->d_name);
-	      if (actsize + this_len + 2 >= bufsize)
-		{
-		  char *newp;
-		  bufsize += MAX (1024, 2 * this_len);
-		  newp = realloc (buf, bufsize);
-		  if (newp == NULL)
-		    {
-		      /* No more memory.  */
-		      int save_err = errno;
-		      free (buf);
-		      __set_errno (save_err);
-		      result = -1;
-		      break;
-		    }
-		  buf = newp;
-		}
-
-	      *((char *) mempcpy (buf + actsize, d->d_name, this_len))
-		= '\0';
-	      actsize += this_len + 1;
-	    }
-
-	  /* Terminate the list with an additional NUL byte.  */
-	  buf[actsize++] = '\0';
-
-	  /* Shrink the buffer to what we actually need.  */
-	  data->dirstreams[data->actdir]->content = realloc (buf, actsize);
-	  if (data->dirstreams[data->actdir]->content == NULL)
-	    {
-	      int save_err = errno;
-	      free (buf);
-	      __set_errno (save_err);
-	      result = -1;
-	    }
-	  else
-	    {
-	      closedir (st);
-	      data->dirstreams[data->actdir]->stream = NULL;
-	      data->dirstreams[data->actdir] = NULL;
-	    }
-	}
-    }
-
-  /* Open the new stream.  */
-  if (result == 0)
-    {
-      assert (data->dirstreams[data->actdir] == NULL);
-
-      dirp->stream = opendir (data->dirbuf);
-      if (dirp->stream == NULL)
-	result = -1;
-      else
-	{
-	  dirp->content = NULL;
-	  data->dirstreams[data->actdir] = dirp;
-
-	  if (++data->actdir == data->maxdir)
-	    data->actdir = 0;
-	}
-    }
-
-  return result;
-}
-
-
-static inline int
-process_entry (struct ftw_data *data, struct dir_data *dir, const char *name,
-	       size_t namlen)
-{
-  struct STAT st;
-  int result = 0;
-  int flag = 0;
-
-  if (name[0] == '.' && (name[1] == '\0'
-			 || (name[1] == '.' && name[2] == '\0')))
-    /* Don't process the "." and ".." entries.  */
-    return 0;
-
-  if (data->dirbufsize < data->ftw.base + namlen + 2)
-    {
-      /* Enlarge the buffer.  */
-      char *newp;
-
-      data->dirbufsize *= 2;
-      newp = realloc (data->dirbuf, data->dirbufsize);
-      if (newp == NULL)
-	return -1;
-      data->dirbuf = newp;
-    }
-
-  *((char *) mempcpy (data->dirbuf + data->ftw.base, name, namlen)) = '\0';
-
-  if (((data->flags & FTW_PHYS)
-       ? LXSTAT (data->dirbuf, &st)
-       : XSTAT (data->dirbuf, &st)) < 0)
-    {
-      if (errno != EACCES && errno != ENOENT)
-	result = -1;
-      else if (!(data->flags & FTW_PHYS)
-	       && LXSTAT (data->dirbuf, &st) == 0
-	       && S_ISLNK (st.st_mode))
-	flag = FTW_SLN;
-      else
-	flag = FTW_NS;
-    }
-  else
-    {
-      if (S_ISDIR (st.st_mode))
-	flag = FTW_D;
-      else if (S_ISLNK (st.st_mode))
-	flag = FTW_SL;
-      else
-	flag = FTW_F;
-    }
-
-  if (result == 0
-      && (flag == FTW_NS
-	  || !(data->flags & FTW_MOUNT) || st.st_dev == data->dev))
-    {
-      if (flag == FTW_D)
-	{
-	  if ((data->flags & FTW_PHYS)
-	      || (!find_object (data, &st)
-		  /* Remember the object.  */
-		  && (result = add_object (data, &st)) == 0))
-	    {
-	      result = ftw_dir (data, &st);
-
-	      if (result == 0 && (data->flags & FTW_CHDIR))
-		{
-		  /* Change back to current directory.  */
-		  int done = 0;
-		  if (dir->stream != NULL)
-		    if (fchdir (dirfd (dir->stream)) == 0)
-		      done = 1;
-
-		  if (!done)
-		    {
-		      if (data->ftw.base == 1)
-			{
-			  if (chdir ("/") < 0)
-			    result = -1;
-			}
-		      else
-			{
-			  /* Please note that we overwrite a slash.  */
-			  data->dirbuf[data->ftw.base - 1] = '\0';
-
-			  if (chdir (data->dirbuf) < 0)
-			    result = -1;
-
-			  data->dirbuf[data->ftw.base - 1] = '/';
-			}
-		    }
-		}
-	    }
-	}
-      else
-	result = (*data->func) (data->dirbuf, &st, data->cvt_arr[flag],
-				&data->ftw);
-    }
-
-  return result;
-}
-
-
-static int
-ftw_dir (struct ftw_data *data, struct STAT *st)
-{
-  struct dir_data dir;
-  struct dirent64 *d;
-  int previous_base = data->ftw.base;
-  int result;
-  char *startp;
-
-  /* Open the stream for this directory.  This might require that
-     another stream has to be closed.  */
-  result = open_dir_stream (data, &dir);
-  if (result != 0)
-    {
-      if (errno == EACCES)
-	/* We cannot read the directory.  Signal this with a special flag.  */
-	result = (*data->func) (data->dirbuf, st, FTW_DNR, &data->ftw);
-
-      return result;
-    }
-
-  /* First, report the directory (if not depth-first).  */
-  if (!(data->flags & FTW_DEPTH))
-    {
-      result = (*data->func) (data->dirbuf, st, FTW_D, &data->ftw);
-      if (result != 0)
-	return result;
-    }
-
-  /* If necessary, change to this directory.  */
-  if (data->flags & FTW_CHDIR)
-    {
-      if (fchdir (dirfd (dir.stream)) < 0)
-	{
-	  if (errno == ENOSYS)
-	    {
-	      if (chdir (data->dirbuf) < 0)
-		result = -1;
-	    }
-	  else
-	    result = -1;
-	}
-
-      if (result != 0)
-	{
-	  int save_err = errno;
-	  closedir (dir.stream);
-	  __set_errno (save_err);
-
-	  if (data->actdir-- == 0)
-	    data->actdir = data->maxdir - 1;
-	  data->dirstreams[data->actdir] = NULL;
-
-	  return result;
-	}
-    }
-
-  /* Next, update the `struct FTW' information.  */
-  ++data->ftw.level;
-  startp = strchr (data->dirbuf, '\0');
-  /* There always must be a directory name.  */
-  assert (startp != data->dirbuf);
-  if (startp[-1] != '/')
-    *startp++ = '/';
-  data->ftw.base = startp - data->dirbuf;
-
-  while (dir.stream != NULL && (d = __readdir64 (dir.stream)) != NULL)
-    {
-      result = process_entry (data, &dir, d->d_name, strlen (d->d_name));
-      if (result != 0)
-	break;
-    }
-
-  if (dir.stream != NULL)
-    {
-      /* The stream is still open.  I.e., we did not need more
-	 descriptors.  Simply close the stream now.  */
-      int save_err = errno;
-
-      assert (dir.content == NULL);
-
-      closedir (dir.stream);
-      __set_errno (save_err);
-
-      if (data->actdir-- == 0)
-	data->actdir = data->maxdir - 1;
-      data->dirstreams[data->actdir] = NULL;
-    }
-  else
-    {
-      int save_err;
-      char *runp = dir.content;
-
-      while (result == 0 && *runp != '\0')
-	{
-	  char *endp = strchr (runp, '\0');
-
-	  result = process_entry (data, &dir, runp, endp - runp);
-
-	  runp = endp + 1;
-	}
-
-      save_err = errno;
-      free (dir.content);
-      __set_errno (save_err);
-    }
-
-  /* Prepare the return, revert the `struct FTW' information.  */
-  data->dirbuf[data->ftw.base - 1] = '\0';
-  --data->ftw.level;
-  data->ftw.base = previous_base;
-
-  /* Finally, if we process depth-first report the directory.  */
-  if (result == 0 && (data->flags & FTW_DEPTH))
-    result = (*data->func) (data->dirbuf, st, FTW_DP, &data->ftw);
-
-  return result;
-}
-
-
-static int
-ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
-	     int flags)
-{
-  struct ftw_data data;
-  struct STAT st;
-  int result = 0;
-  int save_err;
-  int len;
-  char *cwd = NULL;
-  char *cp;
-
-  /* First make sure the parameters are reasonable.  */
-  if (dir[0] == '\0')
-    {
-      __set_errno (ENOENT);
-      return -1;
-    }
-
-  if (access (dir, R_OK) != 0)
-    return -1;
-
-  data.maxdir = descriptors < 1 ? 1 : descriptors;
-  data.actdir = 0;
-  data.dirstreams = (struct dir_data **) alloca (data.maxdir
-						 * sizeof (struct dir_data *));
-  memset (data.dirstreams, '\0', data.maxdir * sizeof (struct dir_data *));
-
-#ifdef PATH_MAX
-  data.dirbufsize = MAX (2 * strlen (dir), PATH_MAX);
-#else
-  data.dirbufsize = 2 * strlen (dir);
-#endif
-  data.dirbuf = (char *) malloc (data.dirbufsize);
-  if (data.dirbuf == NULL)
-    return -1;
-  len = strlen (dir);
-  cp = mempcpy (data.dirbuf, dir, len);
-  /* Strip trailing slashes.  */
-  while (cp > data.dirbuf + 1 && cp[-1] == '/')
-    --cp;
-  *cp = '\0';
-
-  data.ftw.level = 0;
-
-  /* Find basename.  */
-  while (cp > data.dirbuf && cp[-1] != '/')
-    --cp;
-  data.ftw.base = cp - data.dirbuf;
-
-  data.flags = flags;
-
-  /* This assignment might seem to be strange but it is what we want.
-     The trick is that the first three arguments to the `ftw' and
-     `nftw' callback functions are equal.  Therefore we can call in
-     every case the callback using the format of the `nftw' version
-     and get the correct result since the stack layout for a function
-     call in C allows this.  */
-  data.func = (NFTW_FUNC_T) func;
-
-  /* Since we internally use the complete set of FTW_* values we need
-     to reduce the value range before calling a `ftw' callback.  */
-  data.cvt_arr = is_nftw ? nftw_arr : ftw_arr;
-
-  /* No object known so far.  */
-  data.known_objects = NULL;
-
-  /* Now go to the directory containing the initial file/directory.  */
-  if ((flags & FTW_CHDIR) && data.ftw.base > 0)
-    {
-      /* GNU extension ahead.  */
-      cwd =  getcwd (NULL, 0);
-      if (cwd == NULL)
-	result = -1;
-      else
-	{
-	  /* Change to the directory the file is in.  In data.dirbuf
-	     we have a writable copy of the file name.  Just NUL
-	     terminate it for now and change the directory.  */
-	  if (data.ftw.base == 1)
-	    /* I.e., the file is in the root directory.  */
-	    result = chdir ("/");
-	  else
-	    {
-	      char ch = data.dirbuf[data.ftw.base - 1];
-	      data.dirbuf[data.ftw.base - 1] = '\0';
-	      result = chdir (data.dirbuf);
-	      data.dirbuf[data.ftw.base - 1] = ch;
-	    }
-	}
-    }
-
-  /* Get stat info for start directory.  */
-  if (result == 0)
-    {
-      if (((flags & FTW_PHYS)
-	   ? LXSTAT (data.dirbuf, &st)
-	   : XSTAT (data.dirbuf, &st)) < 0)
-	{
-	  if (errno == EACCES)
-	    result = (*data.func) (data.dirbuf, &st, FTW_NS, &data.ftw);
-	  else if (!(flags & FTW_PHYS)
-		   && errno == ENOENT
-		   && LXSTAT (dir, &st) == 0
-		   && S_ISLNK (st.st_mode))
-	    result = (*data.func) (data.dirbuf, &st, data.cvt_arr[FTW_SLN],
-				   &data.ftw);
-	  else
-	    /* No need to call the callback since we cannot say anything
-	       about the object.  */
-	    result = -1;
-	}
-      else
-	{
-	  if (S_ISDIR (st.st_mode))
-	    {
-	      /* Remember the device of the initial directory in case
-		 FTW_MOUNT is given.  */
-	      data.dev = st.st_dev;
-
-	      /* We know this directory now.  */
-	      if (!(flags & FTW_PHYS))
-		result = add_object (&data, &st);
-
-	      if (result == 0)
-		result = ftw_dir (&data, &st);
-	    }
-	  else
-	    {
-	      int flag = S_ISLNK (st.st_mode) ? FTW_SL : FTW_F;
-
-	      result = (*data.func) (data.dirbuf, &st, data.cvt_arr[flag],
-				     &data.ftw);
-	    }
-	}
-    }
-
-  /* Return to the start directory (if necessary).  */
-  if (cwd != NULL)
-    {
-      int save_err = errno;
-      chdir (cwd);
-      free (cwd);
-      __set_errno (save_err);
-    }
-
-  /* Free all memory.  */
-  save_err = errno;
-  tdestroy (data.known_objects, free);
-  free (data.dirbuf);
-  __set_errno (save_err);
-
-  return result;
-}
-
-
-
-/* Entry points.  */
-
-int
-FTW_NAME (path, func, descriptors)
-     const char *path;
-     FTW_FUNC_T func;
-     int descriptors;
-{
-  return ftw_startup (path, 0, func, descriptors, 0);
-}
-
-int
-NFTW_NAME (path, func, descriptors, flags)
-     const char *path;
-     NFTW_FUNC_T func;
-     int descriptors;
-     int flags;
-{
-  return ftw_startup (path, 1, func, descriptors, flags);
-}
diff --git a/newlib/libc/sys/linux/ftw64.c b/newlib/libc/sys/linux/ftw64.c
deleted file mode 100644
index 216549a..0000000
--- a/newlib/libc/sys/linux/ftw64.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* File tree walker functions.  LFS version.
-   Copyright (C) 1996, 1997, 1998, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#define FTW_NAME ftw64
-#define NFTW_NAME nftw64
-#define INO_T ino64_t
-#define STAT stat64
-#define LXSTAT lstat64
-#define XSTAT stat64
-#define FTW_FUNC_T __ftw64_func_t
-#define NFTW_FUNC_T __nftw64_func_t
-
-#include "ftw.c"
diff --git a/newlib/libc/sys/linux/funlockfile.c b/newlib/libc/sys/linux/funlockfile.c
deleted file mode 100644
index 82466d3..0000000
--- a/newlib/libc/sys/linux/funlockfile.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* stub to allow libpthread to override */
-
-#include <stdio.h>
-#include <machine/weakalias.h>
-
-void __libc_funlockfile (FILE *fp)
-{
-}
-weak_alias(__libc_funlockfile,funlockfile)
diff --git a/newlib/libc/sys/linux/getdate.c b/newlib/libc/sys/linux/getdate.c
deleted file mode 100644
index 5c056c7..0000000
--- a/newlib/libc/sys/linux/getdate.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/* Convert a string representation of time to a time value.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/*
-FUNCTION
-<<getdate>>,<<getdate_r>>---convert a string representation of time to a time value
-
-INDEX
-        getdate
-INDEX
-        getdate_r
-
-ANSI_SYNOPSIS
-        #include <time.h>
-        struct tm *getdate(const char *<[string]>);
-        int getdate_r(const char *<[string]>, struct tm *<[res]>);
-
-TRAD_SYNOPSIS
-        #include <time.h>
-        struct tm *getdate(<[string]>);
-        const char *<[string]>;
-
-        int getdate_r(<[string]>, <[res]>);
-        const char *<[string]>;
-        struct tm *<[res]>;
-
-DESCRIPTION
-<<getdate>> reads a file which is specified by the environment variable:
-DATEMSK.  This file contains a number of formats valid for input to the
-<<strptime>> function.  The input <[string]> is used as input to the format
-strings and the first valid match that occurs is used.  The resultant
-time struct is returned.  If an error occurs, the value <<getdate_err>> is
-set to one of the following values.
-
-     1  the DATEMSK environment variable is null or undefined,
-     2  the template file cannot be opened for reading,
-     3  failed to get file status information,
-     4  the template file is not a regular file,
-     5  an error is encountered while reading the template file,
-     6  memory allication failed (not enough memory available),
-     7  there is no line in the template that matches the input,
-     8  invalid input specification
-
-The <<getdate_r>> routine is similar, except that it returns the error
-code and has the <[res]> time struct pointer passed in.  <<getdate>> is
-non-reentrant.  Applications that wish to be reentrant should use 
-<<getdate_r>> instead of <<getdate>>.  
-
-RETURNS
-<<getdate>> returns a pointer to the traditional time representation 
-(<<struct tm>>).  <<getdate_r>> returns 0 if successful, otherwise it
-returns the error code.
-
-PORTABILITY
-<<getdate>> is defined by the Single Unix specification.
-<<getdate_r>> is a reentrant extension.
-
-<<getdate>> and <<getdate_r>> optionally require <<stat>> and <<access>>.
-*/
-
-
-/* Modified for newlib by Jeff Johnston, June 19/2002 */
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-# define STAT stat64
-#else
-# define STAT stat
-#endif
-
-#define TM_YEAR_BASE 1900
-
-extern ssize_t __getline (char **, size_t *, FILE *);
-
-/* Prototypes for local functions.  */
-static int first_wday (int year, int mon, int wday);
-static int check_mday (int year, int mon, int mday);
-
-#define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
-
-/* Error code is set to one of the following values to indicate an error.
-     1  the DATEMSK environment variable is null or undefined,
-     2  the template file cannot be opened for reading,
-     3  failed to get file status information,
-     4  the template file is not a regular file,
-     5  an error is encountered while reading the template file,
-     6  memory allication failed (not enough memory available),
-     7  there is no line in the template that matches the input,
-     8  invalid input specification Example: February 31 or a time is
-        specified that can not be represented in a time_t (representing
-	the time in seconds since 00:00:00 UTC, January 1, 1970) */
-
-/* Returns the first weekday WDAY of month MON in the year YEAR.  */
-static int
-first_wday (int year, int mon, int wday)
-{
-  struct tm tm;
-
-  if (wday == INT_MIN)
-    return 1;
-
-  memset (&tm, 0, sizeof (struct tm));
-  tm.tm_year = year;
-  tm.tm_mon = mon;
-  tm.tm_mday = 1;
-  mktime (&tm);
-
-  return (1 + (wday - tm.tm_wday + 7) % 7);
-}
-
-
-/* Returns 1 if MDAY is a valid day of the month in month MON of year
-   YEAR, and 0 if it is not.  */
-static int
-check_mday (int year, int mon, int mday)
-{
-  switch (mon)
-    {
-    case 0:
-    case 2:
-    case 4:
-    case 6:
-    case 7:
-    case 9:
-    case 11:
-      if (mday >= 1 && mday <= 31)
-	return 1;
-      break;
-    case 3:
-    case 5:
-    case 8:
-    case 10:
-      if (mday >= 1 && mday <= 30)
-	return 1;
-      break;
-    case 1:
-      if (mday >= 1 && mday <= (isleap (year) ? 29 : 28))
-	return 1;
-      break;
-    }
-
-  return 0;
-}
-
-
-int
-getdate_r (const char *string, struct tm *tp)
-{
-  FILE *fp;
-  char *line;
-  size_t len;
-  char *datemsk;
-  char *result = NULL;
-  time_t timer;
-  struct tm tm;
-  struct STAT st;
-  int mday_ok = 0;
-
-  datemsk = getenv ("DATEMSK");
-  if (datemsk == NULL || *datemsk == '\0')
-    return 1;
-
-  if (STAT (datemsk, &st) < 0)
-    return 3;
-
-  if (!S_ISREG (st.st_mode))
-    return 4;
-
-  if (access (datemsk, R_OK) < 0)
-    return 2;
-
-  /* Open the template file.  */
-  fp = fopen (datemsk, "r");
-  if (fp == NULL)
-    return 2;
-
-  line = NULL;
-  len = 0;
-  do
-    {
-      ssize_t n;
-
-      n = __getline (&line, &len, fp);
-      if (n < 0)
-	break;
-      if (line[n - 1] == '\n')
-	line[n - 1] = '\0';
-
-      /* Do the conversion.  */
-      tp->tm_year = tp->tm_mon = tp->tm_mday = tp->tm_wday = INT_MIN;
-      tp->tm_hour = tp->tm_sec = tp->tm_min = INT_MIN;
-      tp->tm_isdst = -1;
-      result = strptime (string, line, tp);
-      if (result && *result == '\0')
-	break;
-    }
-  while (!__sfeof (fp));
-
-  /* Free the buffer.  */
-  free (line);
-
-  /* Check for errors. */
-  if (__sferror (fp))
-    {
-      fclose (fp);
-      return 5;
-    }
-
-  /* Close template file.  */
-  fclose (fp);
-
-  if (result == NULL || *result != '\0')
-    return 7;
-
-  /* Get current time.  */
-  time (&timer);
-  localtime_r (&timer, &tm);
-
-  /* If only the weekday is given, today is assumed if the given day
-     is equal to the current day and next week if it is less.  */
-  if (tp->tm_wday >= 0 && tp->tm_wday <= 6 && tp->tm_year == INT_MIN
-      && tp->tm_mon == INT_MIN && tp->tm_mday == INT_MIN)
-    {
-      tp->tm_year = tm.tm_year;
-      tp->tm_mon = tm.tm_mon;
-      tp->tm_mday = tm.tm_mday + (tp->tm_wday - tm.tm_wday + 7) % 7;
-      mday_ok = 1;
-    }
-
-  /* If only the month is given, the current month is assumed if the
-     given month is equal to the current month and next year if it is
-     less and no year is given (the first day of month is assumed if
-     no day is given.  */
-  if (tp->tm_mon >= 0 && tp->tm_mon <= 11 && tp->tm_mday == INT_MIN)
-    {
-      if (tp->tm_year == INT_MIN)
-	tp->tm_year = tm.tm_year + (((tp->tm_mon - tm.tm_mon) < 0) ? 1 : 0);
-      tp->tm_mday = first_wday (tp->tm_year, tp->tm_mon, tp->tm_wday);
-      mday_ok = 1;
-    }
-
-  /* If no hour, minute and second are given the current hour, minute
-     and second are assumed.  */
-  if (tp->tm_hour == INT_MIN && tp->tm_min == INT_MIN && tp->tm_sec == INT_MIN)
-    {
-      tp->tm_hour = tm.tm_hour;
-      tp->tm_min = tm.tm_min;
-      tp->tm_sec = tm.tm_sec;
-    }
-
-  /* If no date is given, today is assumed if the given hour is
-     greater than the current hour and tomorrow is assumed if
-     it is less.  */
-  if (tp->tm_hour >= 0 && tp->tm_hour <= 23
-      && tp->tm_year == INT_MIN && tp->tm_mon == INT_MIN
-      && tp->tm_mday == INT_MIN && tp->tm_wday == INT_MIN)
-    {
-      tp->tm_year = tm.tm_year;
-      tp->tm_mon = tm.tm_mon;
-      tp->tm_mday = tm.tm_mday + ((tp->tm_hour - tm.tm_hour) < 0 ? 1 : 0);
-      mday_ok = 1;
-    }
-
-  /* Fill in the gaps.  */
-  if (tp->tm_year == INT_MIN)
-    tp->tm_year = tm.tm_year;
-  if (tp->tm_hour == INT_MIN)
-    tp->tm_hour = 0;
-  if (tp->tm_min == INT_MIN)
-    tp->tm_min = 0;
-  if (tp->tm_sec == INT_MIN)
-    tp->tm_sec = 0;
-
-  /* Check if the day of month is within range, and if the time can be
-     represented in a time_t.  We make use of the fact that the mktime
-     call normalizes the struct tm.  */
-  if ((!mday_ok && !check_mday (TM_YEAR_BASE + tp->tm_year, tp->tm_mon,
-				tp->tm_mday))
-      || mktime (tp) == (time_t) -1)
-    return 8;
-
-  return 0;
-}
-
-#ifndef _REENT_ONLY
-struct tm *
-getdate (const char *string)
-{
-  /* Buffer returned by getdate.  */
-  static struct tm tmbuf;
-  int errval = getdate_r (string, &tmbuf);
-
-  if (errval != 0)
-    {
-      getdate_err = errval;
-      return NULL;
-    }
-
-  return &tmbuf;
-}
-#endif /* _REENT_ONLY */
diff --git a/newlib/libc/sys/linux/getdate_err.c b/newlib/libc/sys/linux/getdate_err.c
deleted file mode 100644
index e90b74b..0000000
--- a/newlib/libc/sys/linux/getdate_err.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* The getdate_err variable is stored in the reentrancy structure.  This
-   function returns its address for use by the getdate_err macro defined in
-   time.h.  */
-
-#include <errno.h>
-#include <reent.h>
-
-#ifndef _REENT_ONLY
-
-int *
-__getdate_err ()
-{
-  struct _reent *ptr = _REENT;
-  _REENT_CHECK_MISC(ptr);
-  return _REENT_GETDATE_ERR_P(ptr);
-}
-
-#endif
diff --git a/newlib/libc/sys/linux/gethostid.c b/newlib/libc/sys/linux/gethostid.c
deleted file mode 100644
index bf801c7..0000000
--- a/newlib/libc/sys/linux/gethostid.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright (C) 1995,1996,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <alloca.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <netdb.h>
-
-#define HOSTIDFILE "/etc/hostid"
-#define OLD_HOSTIDFILE "/etc/hostid"
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-# define OPEN __open64
-#else
-# define OPEN __open
-#endif
-
-#ifdef SET_PROCEDURE
-int
-sethostid (id)
-     long int id;
-{
-  int fd;
-  ssize_t written;
-
-  /* Open file for writing.  Everybody is allowed to read this file.  */
-  fd = OPEN (HOSTIDFILE, O_CREAT|O_WRONLY|O_TRUNC, 0644);
-  if (fd < 0)
-    return -1;
-
-  written = __write (fd, &id, sizeof (id));
-
-  __close (fd);
-
-  return written != sizeof (id) ? -1 : 0;
-}
-
-#else
-# include <string.h>
-# include <sys/param.h>
-# include <netdb.h>
-# include <netinet/in.h>
-
-long int
-gethostid ()
-{
-  char hostname[MAXHOSTNAMELEN + 1];
-  size_t buflen;
-  char *buffer;
-  struct hostent hostbuf, *hp;
-  unsigned long int id;
-  struct in_addr in;
-  int herr;
-  int fd;
-
-  /* First try to get the ID from a former invocation of sethostid.  */
-  fd = OPEN (HOSTIDFILE, O_RDONLY);
-  if (fd >= 0)
-    {
-      ssize_t n = __read (fd, &id, sizeof (id));
-
-      __close (fd);
-
-      if (n == sizeof (id))
-	return id;
-    }
-
-  /* Getting from the file was not successful.  An intelligent guess for
-     a unique number of a host is its IP address.  Return this.  */
-  if (__gethostname (hostname, MAXHOSTNAMELEN) < 0 || hostname[0] == '\0')
-    /* This also fails.  Return and arbitrary value.  */
-    return 0;
-
-  buflen = 1024;
-  buffer = alloca (buflen);
-
-  /* To get the IP address we need to know the host name.  */
-  while (__gethostbyname_r (hostname, &hostbuf, buffer, buflen, &hp, &herr)
-	 != 0
-	 || hp == NULL)
-    if (herr != NETDB_INTERNAL || errno != ERANGE)
-      return 0;
-    else
-      {
-	/* Enlarge buffer.  */
-	buflen *= 2;
-	buffer = alloca (buflen);
-      }
-
-  in.s_addr = 0;
-  memcpy (&in, hp->h_addr,
-	  (int) sizeof (in) < hp->h_length ? sizeof (in) : hp->h_length);
-
-  /* For the return value to be not exactly the IP address we do some
-     bit fiddling.  */
-  return in.s_addr << 16 | in.s_addr >> 16;
-}
-#endif
diff --git a/newlib/libc/sys/linux/gethostname.c b/newlib/libc/sys/linux/gethostname.c
deleted file mode 100644
index ef52691..0000000
--- a/newlib/libc/sys/linux/gethostname.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2002, Red Hat Inc. */
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/utsname.h>
-#include <machine/weakalias.h>
-
-int
-__gethostname (char *name, size_t len)
-{
-	struct utsname nodebuf;
-	size_t nodelen;
-
-	if (uname (&nodebuf))
-		return -1;
-
-	nodelen = strlen (nodebuf.nodename) + 1;
-	if (len < nodelen)
-		memcpy (name, nodebuf.nodename, len);
-	else
-		memcpy (name, nodebuf.nodename, nodelen);
-
-	if (nodelen > len)
-	{
-		errno = ENAMETOOLONG;
-		return -1;
-	}
-	return 0;
-}
-weak_alias(__gethostname, gethostname)
diff --git a/newlib/libc/sys/linux/getlogin.c b/newlib/libc/sys/linux/getlogin.c
deleted file mode 100644
index 3931e77..0000000
--- a/newlib/libc/sys/linux/getlogin.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* FIXME: dummy stub for now.  */
-#include <errno.h>
-#include <unistd.h>
-
-char *
-_DEFUN_VOID (getlogin)
-{
-  errno = ENOSYS;
-  return NULL;
-}
-
diff --git a/newlib/libc/sys/linux/getopt.c b/newlib/libc/sys/linux/getopt.c
deleted file mode 100644
index cc035d6..0000000
--- a/newlib/libc/sys/linux/getopt.c
+++ /dev/null
@@ -1,1249 +0,0 @@
-/* Getopt for GNU.
-   NOTE: getopt is now part of the C library, so if you don't know what
-   "Keep this file name-space clean" means, talk to drepper@gnu.org
-   before changing it!
-   Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001
-   	Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
-   Ditto for AIX 3.2 and <stdlib.h>.  */
-#ifndef _NO_PROTO
-# define _NO_PROTO
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-# ifndef const
-#  define const
-# endif
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
-# include <gnu-versions.h>
-# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-#  define ELIDE_CODE
-# endif
-#endif
-
-
-/* This needs to come after some library #include
-   to get __GNU_LIBRARY__ defined.  */
-#ifdef	__GNU_LIBRARY__
-/* Don't include stdlib.h for non-GNU C libraries because some of them
-   contain conflicting prototypes for getopt.  */
-# include <stdlib.h>
-# include <unistd.h>
-#endif	/* GNU C library.  */
-
-#ifdef VMS
-# include <unixlib.h>
-# if HAVE_STRING_H - 0
-#  include <string.h>
-# endif
-#endif
-
-#ifndef _
-/* This is for other GNU distributions with internationalized messages.  */
-# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
-#  include <libintl.h>
-#  ifndef _
-#   define _(msgid)	gettext (msgid)
-#  endif
-# else
-#  define _(msgid)	(msgid)
-# endif
-# if defined _LIBC && defined USE_IN_LIBIO
-#  include <wchar.h>
-# endif
-#endif
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
-   but it behaves differently for the user, since it allows the user
-   to intersperse the options with the other arguments.
-
-   As `getopt' works, it permutes the elements of ARGV so that,
-   when it is done, all the options precede everything else.  Thus
-   all application programs are extended to handle flexible argument order.
-
-   Setting the environment variable POSIXLY_CORRECT disables permutation.
-   Then the behavior is completely standard.
-
-   GNU application programs can use a third alternative mode in which
-   they can distinguish the relative order of options and other arguments.  */
-
-#include "getopt.h"
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns -1, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-/* 1003.2 says this must be 1 before any call.  */
-int optind = 1;
-
-/* Formerly, initialization of getopt depended on optind==0, which
-   causes problems with re-calling getopt as programs generally don't
-   know that. */
-
-int __getopt_initialized;
-
-/* The next char to be scanned in the option-element
-   in which the last option character we returned was found.
-   This allows us to pick up the scan where we left off.
-
-   If this is zero, or a null string, it means resume the scan
-   by advancing to the next ARGV-element.  */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
-   for unrecognized options.  */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
-   This must be initialized on some systems to avoid linking in the
-   system's own getopt implementation.  */
-
-int optopt = '?';
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
-   If the caller did not specify anything,
-   the default is REQUIRE_ORDER if the environment variable
-   POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-   REQUIRE_ORDER means don't recognize them as options;
-   stop option processing when the first non-option is seen.
-   This is what Unix does.
-   This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using `+' as the first character
-   of the list of option characters.
-
-   PERMUTE is the default.  We permute the contents of ARGV as we scan,
-   so that eventually all the non-options are at the end.  This allows options
-   to be given in any order, even with programs that were not written to
-   expect this.
-
-   RETURN_IN_ORDER is an option available to programs that were written
-   to expect options and other ARGV-elements in any order and that care about
-   the ordering of the two.  We describe each non-option ARGV-element
-   as if it were the argument of an option with character code 1.
-   Using `-' as the first character of the list of option characters
-   selects this mode of operation.
-
-   The special argument `--' forces an end of option-scanning regardless
-   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
-
-static enum
-{
-  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-/* Value of POSIXLY_CORRECT environment variable.  */
-static char *posixly_correct;
-
-#ifdef	__GNU_LIBRARY__
-/* We want to avoid inclusion of string.h with non-GNU libraries
-   because there are many ways it can cause trouble.
-   On some systems, it contains special magic macros that don't work
-   in GCC.  */
-# include <string.h>
-# define my_index	strchr
-#else
-
-# if HAVE_STRING_H
-#  include <string.h>
-# else
-#  include <strings.h>
-# endif
-
-/* Avoid depending on library functions or files
-   whose names are inconsistent.  */
-
-#ifndef getenv
-extern char *getenv ();
-#endif
-
-static char *
-my_index (str, chr)
-     const char *str;
-     int chr;
-{
-  while (*str)
-    {
-      if (*str == chr)
-	return (char *) str;
-      str++;
-    }
-  return 0;
-}
-
-/* If using GCC, we can safely declare strlen this way.
-   If not using GCC, it is ok not to declare it.  */
-#ifdef __GNUC__
-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
-   That was relevant to code that was here before.  */
-# if (!defined __STDC__ || !__STDC__) && !defined strlen
-/* gcc with -traditional declares the built-in strlen to return int,
-   and has done so at least since version 2.4.5. -- rms.  */
-extern int strlen (const char *);
-# endif /* not __STDC__ */
-#endif /* __GNUC__ */
-
-#endif /* not __GNU_LIBRARY__ */
-
-/* Handle permutation of arguments.  */
-
-/* Describe the part of ARGV that contains non-options that have
-   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
-   `last_nonopt' is the index after the last of them.  */
-
-static int first_nonopt;
-static int last_nonopt;
-
-#ifdef _LIBC
-/* Stored original parameters.
-   XXX This is no good solution.  We should rather copy the args so
-   that we can compare them later.  But we must not use malloc(3).  */
-extern int __libc_argc;
-extern char **__libc_argv;
-
-/* Bash 2.0 gives us an environment variable containing flags
-   indicating ARGV elements that should not be considered arguments.  */
-
-# ifdef USE_NONOPTION_FLAGS
-/* Defined in getopt_init.c  */
-extern char *__getopt_nonoption_flags;
-
-static int nonoption_flags_max_len;
-static int nonoption_flags_len;
-# endif
-
-# ifdef USE_NONOPTION_FLAGS
-#  define SWAP_FLAGS(ch1, ch2) \
-  if (nonoption_flags_len > 0)						      \
-    {									      \
-      char __tmp = __getopt_nonoption_flags[ch1];			      \
-      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \
-      __getopt_nonoption_flags[ch2] = __tmp;				      \
-    }
-# else
-#  define SWAP_FLAGS(ch1, ch2)
-# endif
-#else	/* !_LIBC */
-# define SWAP_FLAGS(ch1, ch2)
-#endif	/* _LIBC */
-
-/* Exchange two adjacent subsequences of ARGV.
-   One subsequence is elements [first_nonopt,last_nonopt)
-   which contains all the non-options that have been skipped so far.
-   The other is elements [last_nonopt,optind), which contains all
-   the options processed since those non-options were skipped.
-
-   `first_nonopt' and `last_nonopt' are relocated so that they describe
-   the new indices of the non-options in ARGV after they are moved.  */
-
-#if defined __STDC__ && __STDC__
-static void exchange (char **);
-#endif
-
-static void
-exchange (argv)
-     char **argv;
-{
-  int bottom = first_nonopt;
-  int middle = last_nonopt;
-  int top = optind;
-  char *tem;
-
-  /* Exchange the shorter segment with the far end of the longer segment.
-     That puts the shorter segment into the right place.
-     It leaves the longer segment in the right place overall,
-     but it consists of two parts that need to be swapped next.  */
-
-#if defined _LIBC && defined USE_NONOPTION_FLAGS
-  /* First make sure the handling of the `__getopt_nonoption_flags'
-     string can work normally.  Our top argument must be in the range
-     of the string.  */
-  if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
-    {
-      /* We must extend the array.  The user plays games with us and
-	 presents new arguments.  */
-      char *new_str = malloc (top + 1);
-      if (new_str == NULL)
-	nonoption_flags_len = nonoption_flags_max_len = 0;
-      else
-	{
-	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
-			     nonoption_flags_max_len),
-		  '\0', top + 1 - nonoption_flags_max_len);
-	  nonoption_flags_max_len = top + 1;
-	  __getopt_nonoption_flags = new_str;
-	}
-    }
-#endif
-
-  while (top > middle && middle > bottom)
-    {
-      if (top - middle > middle - bottom)
-	{
-	  /* Bottom segment is the short one.  */
-	  int len = middle - bottom;
-	  register int i;
-
-	  /* Swap it with the top part of the top segment.  */
-	  for (i = 0; i < len; i++)
-	    {
-	      tem = argv[bottom + i];
-	      argv[bottom + i] = argv[top - (middle - bottom) + i];
-	      argv[top - (middle - bottom) + i] = tem;
-	      SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
-	    }
-	  /* Exclude the moved bottom segment from further swapping.  */
-	  top -= len;
-	}
-      else
-	{
-	  /* Top segment is the short one.  */
-	  int len = top - middle;
-	  register int i;
-
-	  /* Swap it with the bottom part of the bottom segment.  */
-	  for (i = 0; i < len; i++)
-	    {
-	      tem = argv[bottom + i];
-	      argv[bottom + i] = argv[middle + i];
-	      argv[middle + i] = tem;
-	      SWAP_FLAGS (bottom + i, middle + i);
-	    }
-	  /* Exclude the moved top segment from further swapping.  */
-	  bottom += len;
-	}
-    }
-
-  /* Update records for the slots the non-options now occupy.  */
-
-  first_nonopt += (optind - last_nonopt);
-  last_nonopt = optind;
-}
-
-/* Initialize the internal data when the first call is made.  */
-
-#if defined __STDC__ && __STDC__
-static const char *_getopt_initialize (int, char *const *, const char *);
-#endif
-static const char *
-_getopt_initialize (argc, argv, optstring)
-     int argc;
-     char *const *argv;
-     const char *optstring;
-{
-  /* Start processing options with ARGV-element 1 (since ARGV-element 0
-     is the program name); the sequence of previously skipped
-     non-option ARGV-elements is empty.  */
-
-  first_nonopt = last_nonopt = optind;
-
-  nextchar = NULL;
-
-  posixly_correct = getenv ("POSIXLY_CORRECT");
-
-  /* Determine how to handle the ordering of options and nonoptions.  */
-
-  if (optstring[0] == '-')
-    {
-      ordering = RETURN_IN_ORDER;
-      ++optstring;
-    }
-  else if (optstring[0] == '+')
-    {
-      ordering = REQUIRE_ORDER;
-      ++optstring;
-    }
-  else if (posixly_correct != NULL)
-    ordering = REQUIRE_ORDER;
-  else
-    ordering = PERMUTE;
-
-#if defined _LIBC && defined USE_NONOPTION_FLAGS
-  if (posixly_correct == NULL
-      && argc == __libc_argc && argv == __libc_argv)
-    {
-      if (nonoption_flags_max_len == 0)
-	{
-	  if (__getopt_nonoption_flags == NULL
-	      || __getopt_nonoption_flags[0] == '\0')
-	    nonoption_flags_max_len = -1;
-	  else
-	    {
-	      const char *orig_str = __getopt_nonoption_flags;
-	      int len = nonoption_flags_max_len = strlen (orig_str);
-	      if (nonoption_flags_max_len < argc)
-		nonoption_flags_max_len = argc;
-	      __getopt_nonoption_flags =
-		(char *) malloc (nonoption_flags_max_len);
-	      if (__getopt_nonoption_flags == NULL)
-		nonoption_flags_max_len = -1;
-	      else
-		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
-			'\0', nonoption_flags_max_len - len);
-	    }
-	}
-      nonoption_flags_len = nonoption_flags_max_len;
-    }
-  else
-    nonoption_flags_len = 0;
-#endif
-
-  return optstring;
-}
-
-/* Scan elements of ARGV (whose length is ARGC) for option characters
-   given in OPTSTRING.
-
-   If an element of ARGV starts with '-', and is not exactly "-" or "--",
-   then it is an option element.  The characters of this element
-   (aside from the initial '-') are option characters.  If `getopt'
-   is called repeatedly, it returns successively each of the option characters
-   from each of the option elements.
-
-   If `getopt' finds another option character, it returns that character,
-   updating `optind' and `nextchar' so that the next call to `getopt' can
-   resume the scan with the following option character or ARGV-element.
-
-   If there are no more option characters, `getopt' returns -1.
-   Then `optind' is the index in ARGV of the first ARGV-element
-   that is not an option.  (The ARGV-elements have been permuted
-   so that those that are not options now come last.)
-
-   OPTSTRING is a string containing the legitimate option characters.
-   If an option character is seen that is not listed in OPTSTRING,
-   return '?' after printing an error message.  If you set `opterr' to
-   zero, the error message is suppressed but we still return '?'.
-
-   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
-   so the following text in the same ARGV-element, or the text of the following
-   ARGV-element, is returned in `optarg'.  Two colons mean an option that
-   wants an optional arg; if there is text in the current ARGV-element,
-   it is returned in `optarg', otherwise `optarg' is set to zero.
-
-   If OPTSTRING starts with `-' or `+', it requests different methods of
-   handling the non-option ARGV-elements.
-   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-
-   Long-named options begin with `--' instead of `-'.
-   Their names may be abbreviated as long as the abbreviation is unique
-   or is an exact match for some defined option.  If they have an
-   argument, it follows the option name in the same ARGV-element, separated
-   from the option name by a `=', or else the in next ARGV-element.
-   When `getopt' finds a long-named option, it returns 0 if that option's
-   `flag' field is nonzero, the value of the option's `val' field
-   if the `flag' field is zero.
-
-   The elements of ARGV aren't really const, because we permute them.
-   But we pretend they're const in the prototype to be compatible
-   with other systems.
-
-   LONGOPTS is a vector of `struct option' terminated by an
-   element containing a name which is zero.
-
-   LONGIND returns the index in LONGOPT of the long-named option found.
-   It is only valid when a long-named option has been found by the most
-   recent call.
-
-   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
-   long-named options.  */
-
-int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
-     int argc;
-     char *const *argv;
-     const char *optstring;
-     const struct option *longopts;
-     int *longind;
-     int long_only;
-{
-  int print_errors = opterr;
-  if (optstring[0] == ':')
-    print_errors = 0;
-
-  if (argc < 1)
-    return -1;
-
-  optarg = NULL;
-
-  if (optind == 0 || !__getopt_initialized)
-    {
-      if (optind == 0)
-	optind = 1;	/* Don't scan ARGV[0], the program name.  */
-      optstring = _getopt_initialize (argc, argv, optstring);
-      __getopt_initialized = 1;
-    }
-
-  /* Test whether ARGV[optind] points to a non-option argument.
-     Either it does not have option syntax, or there is an environment flag
-     from the shell indicating it is not an option.  The later information
-     is only used when the used in the GNU libc.  */
-#if defined _LIBC && defined USE_NONOPTION_FLAGS
-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
-		      || (optind < nonoption_flags_len			      \
-			  && __getopt_nonoption_flags[optind] == '1'))
-#else
-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
-#endif
-
-  if (nextchar == NULL || *nextchar == '\0')
-    {
-      /* Advance to the next ARGV-element.  */
-
-      /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
-	 moved back by the user (who may also have changed the arguments).  */
-      if (last_nonopt > optind)
-	last_nonopt = optind;
-      if (first_nonopt > optind)
-	first_nonopt = optind;
-
-      if (ordering == PERMUTE)
-	{
-	  /* If we have just processed some options following some non-options,
-	     exchange them so that the options come first.  */
-
-	  if (first_nonopt != last_nonopt && last_nonopt != optind)
-	    exchange ((char **) argv);
-	  else if (last_nonopt != optind)
-	    first_nonopt = optind;
-
-	  /* Skip any additional non-options
-	     and extend the range of non-options previously skipped.  */
-
-	  while (optind < argc && NONOPTION_P)
-	    optind++;
-	  last_nonopt = optind;
-	}
-
-      /* The special ARGV-element `--' means premature end of options.
-	 Skip it like a null option,
-	 then exchange with previous non-options as if it were an option,
-	 then skip everything else like a non-option.  */
-
-      if (optind != argc && !strcmp (argv[optind], "--"))
-	{
-	  optind++;
-
-	  if (first_nonopt != last_nonopt && last_nonopt != optind)
-	    exchange ((char **) argv);
-	  else if (first_nonopt == last_nonopt)
-	    first_nonopt = optind;
-	  last_nonopt = argc;
-
-	  optind = argc;
-	}
-
-      /* If we have done all the ARGV-elements, stop the scan
-	 and back over any non-options that we skipped and permuted.  */
-
-      if (optind == argc)
-	{
-	  /* Set the next-arg-index to point at the non-options
-	     that we previously skipped, so the caller will digest them.  */
-	  if (first_nonopt != last_nonopt)
-	    optind = first_nonopt;
-	  return -1;
-	}
-
-      /* If we have come to a non-option and did not permute it,
-	 either stop the scan or describe it to the caller and pass it by.  */
-
-      if (NONOPTION_P)
-	{
-	  if (ordering == REQUIRE_ORDER)
-	    return -1;
-	  optarg = argv[optind++];
-	  return 1;
-	}
-
-      /* We have found another option-ARGV-element.
-	 Skip the initial punctuation.  */
-
-      nextchar = (argv[optind] + 1
-		  + (longopts != NULL && argv[optind][1] == '-'));
-    }
-
-  /* Decode the current option-ARGV-element.  */
-
-  /* Check whether the ARGV-element is a long option.
-
-     If long_only and the ARGV-element has the form "-f", where f is
-     a valid short option, don't consider it an abbreviated form of
-     a long option that starts with f.  Otherwise there would be no
-     way to give the -f short option.
-
-     On the other hand, if there's a long option "fubar" and
-     the ARGV-element is "-fu", do consider that an abbreviation of
-     the long option, just like "--fu", and not "-f" with arg "u".
-
-     This distinction seems to be the most useful approach.  */
-
-  if (longopts != NULL
-      && (argv[optind][1] == '-'
-	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
-    {
-      char *nameend;
-      const struct option *p;
-      const struct option *pfound = NULL;
-      int exact = 0;
-      int ambig = 0;
-      int indfound = -1;
-      int option_index;
-
-      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
-	/* Do nothing.  */ ;
-
-      /* Test all long options for either exact match
-	 or abbreviated matches.  */
-      for (p = longopts, option_index = 0; p->name; p++, option_index++)
-	if (!strncmp (p->name, nextchar, nameend - nextchar))
-	  {
-	    if ((unsigned int) (nameend - nextchar)
-		== (unsigned int) strlen (p->name))
-	      {
-		/* Exact match found.  */
-		pfound = p;
-		indfound = option_index;
-		exact = 1;
-		break;
-	      }
-	    else if (pfound == NULL)
-	      {
-		/* First nonexact match found.  */
-		pfound = p;
-		indfound = option_index;
-	      }
-	    else if (long_only
-		     || pfound->has_arg != p->has_arg
-		     || pfound->flag != p->flag
-		     || pfound->val != p->val)
-	      /* Second or later nonexact match found.  */
-	      ambig = 1;
-	  }
-
-      if (ambig && !exact)
-	{
-	  if (print_errors)
-	    {
-#if defined _LIBC && defined USE_IN_LIBIO
-	      char *buf;
-
-	      __asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
-			  argv[0], argv[optind]);
-
-	      if (_IO_fwide (stderr, 0) > 0)
-		__fwprintf (stderr, L"%s", buf);
-	      else
-		fputs (buf, stderr);
-
-	      free (buf);
-#else
-	      fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
-		       argv[0], argv[optind]);
-#endif
-	    }
-	  nextchar += strlen (nextchar);
-	  optind++;
-	  optopt = 0;
-	  return '?';
-	}
-
-      if (pfound != NULL)
-	{
-	  option_index = indfound;
-	  optind++;
-	  if (*nameend)
-	    {
-	      /* Don't test has_arg with >, because some C compilers don't
-		 allow it to be used on enums.  */
-	      if (pfound->has_arg)
-		optarg = nameend + 1;
-	      else
-		{
-		  if (print_errors)
-		    {
-#if defined _LIBC && defined USE_IN_LIBIO
-		      char *buf;
-#endif
-
-		      if (argv[optind - 1][1] == '-')
-			{
-			  /* --option */
-#if defined _LIBC && defined USE_IN_LIBIO
-			  __asprintf (&buf, _("\
-%s: option `--%s' doesn't allow an argument\n"),
-				      argv[0], pfound->name);
-#else
-			  fprintf (stderr, _("\
-%s: option `--%s' doesn't allow an argument\n"),
-				   argv[0], pfound->name);
-#endif
-			}
-		      else
-			{
-			  /* +option or -option */
-#if defined _LIBC && defined USE_IN_LIBIO
-			  __asprintf (&buf, _("\
-%s: option `%c%s' doesn't allow an argument\n"),
-				      argv[0], argv[optind - 1][0],
-				      pfound->name);
-#else
-			  fprintf (stderr, _("\
-%s: option `%c%s' doesn't allow an argument\n"),
-				   argv[0], argv[optind - 1][0], pfound->name);
-#endif
-			}
-
-#if defined _LIBC && defined USE_IN_LIBIO
-		      if (_IO_fwide (stderr, 0) > 0)
-			__fwprintf (stderr, L"%s", buf);
-		      else
-			fputs (buf, stderr);
-
-		      free (buf);
-#endif
-		    }
-
-		  nextchar += strlen (nextchar);
-
-		  optopt = pfound->val;
-		  return '?';
-		}
-	    }
-	  else if (pfound->has_arg == 1)
-	    {
-	      if (optind < argc)
-		optarg = argv[optind++];
-	      else
-		{
-		  if (print_errors)
-		    {
-#if defined _LIBC && defined USE_IN_LIBIO
-		      char *buf;
-
-		      __asprintf (&buf,
-				  _("%s: option `%s' requires an argument\n"),
-				  argv[0], argv[optind - 1]);
-
-		      if (_IO_fwide (stderr, 0) > 0)
-			__fwprintf (stderr, L"%s", buf);
-		      else
-			fputs (buf, stderr);
-
-		      free (buf);
-#else
-		      fprintf (stderr,
-			       _("%s: option `%s' requires an argument\n"),
-			       argv[0], argv[optind - 1]);
-#endif
-		    }
-		  nextchar += strlen (nextchar);
-		  optopt = pfound->val;
-		  return optstring[0] == ':' ? ':' : '?';
-		}
-	    }
-	  nextchar += strlen (nextchar);
-	  if (longind != NULL)
-	    *longind = option_index;
-	  if (pfound->flag)
-	    {
-	      *(pfound->flag) = pfound->val;
-	      return 0;
-	    }
-	  return pfound->val;
-	}
-
-      /* Can't find it as a long option.  If this is not getopt_long_only,
-	 or the option starts with '--' or is not a valid short
-	 option, then it's an error.
-	 Otherwise interpret it as a short option.  */
-      if (!long_only || argv[optind][1] == '-'
-	  || my_index (optstring, *nextchar) == NULL)
-	{
-	  if (print_errors)
-	    {
-#if defined _LIBC && defined USE_IN_LIBIO
-	      char *buf;
-#endif
-
-	      if (argv[optind][1] == '-')
-		{
-		  /* --option */
-#if defined _LIBC && defined USE_IN_LIBIO
-		  __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
-			      argv[0], nextchar);
-#else
-		  fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
-			   argv[0], nextchar);
-#endif
-		}
-	      else
-		{
-		  /* +option or -option */
-#if defined _LIBC && defined USE_IN_LIBIO
-		  __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
-			      argv[0], argv[optind][0], nextchar);
-#else
-		  fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
-			   argv[0], argv[optind][0], nextchar);
-#endif
-		}
-
-#if defined _LIBC && defined USE_IN_LIBIO
-	      if (_IO_fwide (stderr, 0) > 0)
-		__fwprintf (stderr, L"%s", buf);
-	      else
-		fputs (buf, stderr);
-
-	      free (buf);
-#endif
-	    }
-	  nextchar = (char *) "";
-	  optind++;
-	  optopt = 0;
-	  return '?';
-	}
-    }
-
-  /* Look at and handle the next short option-character.  */
-
-  {
-    char c = *nextchar++;
-    char *temp = my_index (optstring, c);
-
-    /* Increment `optind' when we start to process its last character.  */
-    if (*nextchar == '\0')
-      ++optind;
-
-    if (temp == NULL || c == ':')
-      {
-	if (print_errors)
-	  {
-#if defined _LIBC && defined USE_IN_LIBIO
-	      char *buf;
-#endif
-
-	    if (posixly_correct)
-	      {
-		/* 1003.2 specifies the format of this message.  */
-#if defined _LIBC && defined USE_IN_LIBIO
-		__asprintf (&buf, _("%s: illegal option -- %c\n"),
-			    argv[0], c);
-#else
-		fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
-#endif
-	      }
-	    else
-	      {
-#if defined _LIBC && defined USE_IN_LIBIO
-		__asprintf (&buf, _("%s: invalid option -- %c\n"),
-			    argv[0], c);
-#else
-		fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
-#endif
-	      }
-
-#if defined _LIBC && defined USE_IN_LIBIO
-	    if (_IO_fwide (stderr, 0) > 0)
-	      __fwprintf (stderr, L"%s", buf);
-	    else
-	      fputs (buf, stderr);
-
-	    free (buf);
-#endif
-	  }
-	optopt = c;
-	return '?';
-      }
-    /* Convenience. Treat POSIX -W foo same as long option --foo */
-    if (temp[0] == 'W' && temp[1] == ';')
-      {
-	char *nameend;
-	const struct option *p;
-	const struct option *pfound = NULL;
-	int exact = 0;
-	int ambig = 0;
-	int indfound = 0;
-	int option_index;
-
-	/* This is an option that requires an argument.  */
-	if (*nextchar != '\0')
-	  {
-	    optarg = nextchar;
-	    /* If we end this ARGV-element by taking the rest as an arg,
-	       we must advance to the next element now.  */
-	    optind++;
-	  }
-	else if (optind == argc)
-	  {
-	    if (print_errors)
-	      {
-		/* 1003.2 specifies the format of this message.  */
-#if defined _LIBC && defined USE_IN_LIBIO
-		char *buf;
-
-		__asprintf (&buf, _("%s: option requires an argument -- %c\n"),
-			    argv[0], c);
-
-		if (_IO_fwide (stderr, 0) > 0)
-		  __fwprintf (stderr, L"%s", buf);
-		else
-		  fputs (buf, stderr);
-
-		free (buf);
-#else
-		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
-			 argv[0], c);
-#endif
-	      }
-	    optopt = c;
-	    if (optstring[0] == ':')
-	      c = ':';
-	    else
-	      c = '?';
-	    return c;
-	  }
-	else
-	  /* We already incremented `optind' once;
-	     increment it again when taking next ARGV-elt as argument.  */
-	  optarg = argv[optind++];
-
-	/* optarg is now the argument, see if it's in the
-	   table of longopts.  */
-
-	for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
-	  /* Do nothing.  */ ;
-
-	/* Test all long options for either exact match
-	   or abbreviated matches.  */
-	for (p = longopts, option_index = 0; p->name; p++, option_index++)
-	  if (!strncmp (p->name, nextchar, nameend - nextchar))
-	    {
-	      if ((unsigned int) (nameend - nextchar) == strlen (p->name))
-		{
-		  /* Exact match found.  */
-		  pfound = p;
-		  indfound = option_index;
-		  exact = 1;
-		  break;
-		}
-	      else if (pfound == NULL)
-		{
-		  /* First nonexact match found.  */
-		  pfound = p;
-		  indfound = option_index;
-		}
-	      else
-		/* Second or later nonexact match found.  */
-		ambig = 1;
-	    }
-	if (ambig && !exact)
-	  {
-	    if (print_errors)
-	      {
-#if defined _LIBC && defined USE_IN_LIBIO
-		char *buf;
-
-		__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
-			    argv[0], argv[optind]);
-
-		if (_IO_fwide (stderr, 0) > 0)
-		  __fwprintf (stderr, L"%s", buf);
-		else
-		  fputs (buf, stderr);
-
-		free (buf);
-#else
-		fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
-			 argv[0], argv[optind]);
-#endif
-	      }
-	    nextchar += strlen (nextchar);
-	    optind++;
-	    return '?';
-	  }
-	if (pfound != NULL)
-	  {
-	    option_index = indfound;
-	    if (*nameend)
-	      {
-		/* Don't test has_arg with >, because some C compilers don't
-		   allow it to be used on enums.  */
-		if (pfound->has_arg)
-		  optarg = nameend + 1;
-		else
-		  {
-		    if (print_errors)
-		      {
-#if defined _LIBC && defined USE_IN_LIBIO
-			char *buf;
-
-			__asprintf (&buf, _("\
-%s: option `-W %s' doesn't allow an argument\n"),
-				    argv[0], pfound->name);
-
-			if (_IO_fwide (stderr, 0) > 0)
-			  __fwprintf (stderr, L"%s", buf);
-			else
-			  fputs (buf, stderr);
-
-			free (buf);
-#else
-			fprintf (stderr, _("\
-%s: option `-W %s' doesn't allow an argument\n"),
-				 argv[0], pfound->name);
-#endif
-		      }
-
-		    nextchar += strlen (nextchar);
-		    return '?';
-		  }
-	      }
-	    else if (pfound->has_arg == 1)
-	      {
-		if (optind < argc)
-		  optarg = argv[optind++];
-		else
-		  {
-		    if (print_errors)
-		      {
-#if defined _LIBC && defined USE_IN_LIBIO
-			char *buf;
-
-			__asprintf (&buf, _("\
-%s: option `%s' requires an argument\n"),
-				    argv[0], argv[optind - 1]);
-
-			if (_IO_fwide (stderr, 0) > 0)
-			  __fwprintf (stderr, L"%s", buf);
-			else
-			  fputs (buf, stderr);
-
-			free (buf);
-#else
-			fprintf (stderr,
-				 _("%s: option `%s' requires an argument\n"),
-				 argv[0], argv[optind - 1]);
-#endif
-		      }
-		    nextchar += strlen (nextchar);
-		    return optstring[0] == ':' ? ':' : '?';
-		  }
-	      }
-	    nextchar += strlen (nextchar);
-	    if (longind != NULL)
-	      *longind = option_index;
-	    if (pfound->flag)
-	      {
-		*(pfound->flag) = pfound->val;
-		return 0;
-	      }
-	    return pfound->val;
-	  }
-	  nextchar = NULL;
-	  return 'W';	/* Let the application handle it.   */
-      }
-    if (temp[1] == ':')
-      {
-	if (temp[2] == ':')
-	  {
-	    /* This is an option that accepts an argument optionally.  */
-	    if (*nextchar != '\0')
-	      {
-		optarg = nextchar;
-		optind++;
-	      }
-	    else
-	      optarg = NULL;
-	    nextchar = NULL;
-	  }
-	else
-	  {
-	    /* This is an option that requires an argument.  */
-	    if (*nextchar != '\0')
-	      {
-		optarg = nextchar;
-		/* If we end this ARGV-element by taking the rest as an arg,
-		   we must advance to the next element now.  */
-		optind++;
-	      }
-	    else if (optind == argc)
-	      {
-		if (print_errors)
-		  {
-		    /* 1003.2 specifies the format of this message.  */
-#if defined _LIBC && defined USE_IN_LIBIO
-		    char *buf;
-
-		    __asprintf (&buf,
-				_("%s: option requires an argument -- %c\n"),
-				argv[0], c);
-
-		    if (_IO_fwide (stderr, 0) > 0)
-		      __fwprintf (stderr, L"%s", buf);
-		    else
-		      fputs (buf, stderr);
-
-		    free (buf);
-#else
-		    fprintf (stderr,
-			     _("%s: option requires an argument -- %c\n"),
-			     argv[0], c);
-#endif
-		  }
-		optopt = c;
-		if (optstring[0] == ':')
-		  c = ':';
-		else
-		  c = '?';
-	      }
-	    else
-	      /* We already incremented `optind' once;
-		 increment it again when taking next ARGV-elt as argument.  */
-	      optarg = argv[optind++];
-	    nextchar = NULL;
-	  }
-      }
-    return c;
-  }
-}
-
-int
-getopt (argc, argv, optstring)
-     int argc;
-     char *const *argv;
-     const char *optstring;
-{
-  return _getopt_internal (argc, argv, optstring,
-			   (const struct option *) 0,
-			   (int *) 0,
-			   0);
-}
-
-
-#ifdef TEST
-
-/* Compile with -DTEST to make an executable for use in testing
-   the above definition of `getopt'.  */
-
-int
-main (argc, argv)
-     int argc;
-     char **argv;
-{
-  int c;
-  int digit_optind = 0;
-
-  while (1)
-    {
-      int this_option_optind = optind ? optind : 1;
-
-      c = getopt (argc, argv, "abc:d:0123456789");
-      if (c == -1)
-	break;
-
-      switch (c)
-	{
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	  if (digit_optind != 0 && digit_optind != this_option_optind)
-	    printf ("digits occur in two different argv-elements.\n");
-	  digit_optind = this_option_optind;
-	  printf ("option %c\n", c);
-	  break;
-
-	case 'a':
-	  printf ("option a\n");
-	  break;
-
-	case 'b':
-	  printf ("option b\n");
-	  break;
-
-	case 'c':
-	  printf ("option c with value `%s'\n", optarg);
-	  break;
-
-	case '?':
-	  break;
-
-	default:
-	  printf ("?? getopt returned character code 0%o ??\n", c);
-	}
-    }
-
-  if (optind < argc)
-    {
-      printf ("non-option ARGV-elements: ");
-      while (optind < argc)
-	printf ("%s ", argv[optind++]);
-      printf ("\n");
-    }
-
-  exit (0);
-}
-
-#endif /* TEST */
diff --git a/newlib/libc/sys/linux/getopt1.c b/newlib/libc/sys/linux/getopt1.c
deleted file mode 100644
index 2f149bc..0000000
--- a/newlib/libc/sys/linux/getopt1.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
-     Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "getopt.h"
-
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
-#include <gnu-versions.h>
-#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-#define ELIDE_CODE
-#endif
-#endif
-
-
-/* This needs to come after some library #include
-   to get __GNU_LIBRARY__ defined.  */
-#ifdef __GNU_LIBRARY__
-#include <stdlib.h>
-#endif
-
-#ifndef	NULL
-#define NULL 0
-#endif
-
-int
-getopt_long (argc, argv, options, long_options, opt_index)
-     int argc;
-     char *const *argv;
-     const char *options;
-     const struct option *long_options;
-     int *opt_index;
-{
-  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
-}
-
-/* Like getopt_long, but '-' as well as '--' can indicate a long option.
-   If an option that starts with '-' (not '--') doesn't match a long option,
-   but does match a short option, it is parsed as a short option
-   instead.  */
-
-int
-getopt_long_only (argc, argv, options, long_options, opt_index)
-     int argc;
-     char *const *argv;
-     const char *options;
-     const struct option *long_options;
-     int *opt_index;
-{
-  return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
-}
-
-
-
-#ifdef TEST
-
-#include <stdio.h>
-
-int
-main (argc, argv)
-     int argc;
-     char **argv;
-{
-  int c;
-  int digit_optind = 0;
-
-  while (1)
-    {
-      int this_option_optind = optind ? optind : 1;
-      int option_index = 0;
-      static struct option long_options[] =
-      {
-	{"add", 1, 0, 0},
-	{"append", 0, 0, 0},
-	{"delete", 1, 0, 0},
-	{"verbose", 0, 0, 0},
-	{"create", 0, 0, 0},
-	{"file", 1, 0, 0},
-	{0, 0, 0, 0}
-      };
-
-      c = getopt_long (argc, argv, "abc:d:0123456789",
-		       long_options, &option_index);
-      if (c == -1)
-	break;
-
-      switch (c)
-	{
-	case 0:
-	  printf ("option %s", long_options[option_index].name);
-	  if (optarg)
-	    printf (" with arg %s", optarg);
-	  printf ("\n");
-	  break;
-
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	  if (digit_optind != 0 && digit_optind != this_option_optind)
-	    printf ("digits occur in two different argv-elements.\n");
-	  digit_optind = this_option_optind;
-	  printf ("option %c\n", c);
-	  break;
-
-	case 'a':
-	  printf ("option a\n");
-	  break;
-
-	case 'b':
-	  printf ("option b\n");
-	  break;
-
-	case 'c':
-	  printf ("option c with value `%s'\n", optarg);
-	  break;
-
-	case 'd':
-	  printf ("option d with value `%s'\n", optarg);
-	  break;
-
-	case '?':
-	  break;
-
-	default:
-	  printf ("?? getopt returned character code 0%o ??\n", c);
-	}
-    }
-
-  if (optind < argc)
-    {
-      printf ("non-option ARGV-elements: ");
-      while (optind < argc)
-	printf ("%s ", argv[optind++]);
-      printf ("\n");
-    }
-
-  exit (0);
-}
-
-#endif /* TEST */
diff --git a/newlib/libc/sys/linux/getoptlong.c b/newlib/libc/sys/linux/getoptlong.c
new file mode 100644
index 0000000..089f4cd
--- /dev/null
+++ b/newlib/libc/sys/linux/getoptlong.c
@@ -0,0 +1,64 @@
+#include <unistd.h>
+#include <string.h>
+#include <getopt.h>
+
+/* Written 2000 by Werner Almesberger */
+
+static const char *__resume;
+
+
+int getopt_long(int argc,char *const argv[],const char *optstring,
+  const struct option *longopts,int *longindex)
+{
+    char *here;
+
+    optarg = NULL;
+    if (!__resume) {
+	if (argc == optind || *argv[optind] != '-') return -1;
+	if (argv[optind][1] == '-') {
+	    const struct option *opt;
+
+	    optarg = strchr(argv[optind],'=');
+	    if (optarg) optarg++;
+	    for (opt = longopts; opt->name &&
+	      (optarg || strcmp(opt->name,argv[optind]+2)) &&
+	      (!optarg || strlen(opt->name) != optarg-argv[optind]-3 ||
+	      strncmp(opt->name,argv[optind]+2,optarg-argv[optind]-3));
+	      opt++);
+	    optind++;
+	    if (!opt->name) return '?';
+	    if ((opt->has_arg == no_argument && optarg) ||
+	      (opt->has_arg == required_argument && !optarg)) return ':';
+	    if (longindex) *longindex = opt-longopts;
+	    if (!opt->flag) return opt->val;
+	    *opt->flag = opt->val;
+	    return 0;
+	}
+	else {
+	    __resume = argv[optind]+1;
+	}
+    }
+    here = strchr(optstring,*__resume);
+    if (!here) {
+	optind++;
+	__resume = NULL;
+	return '?';
+    }
+    if (here[1] != ':') {
+	if (!*++__resume) __resume = NULL;
+    }
+    else {
+	if (__resume[1]) optarg = (char *) __resume+1;
+	else {
+	    optarg = (char *) argv[++optind];
+	    if (optind == argc || *argv[optind] == '-') {
+		optind++;
+		__resume = NULL;
+		return ':';
+	    }
+	}
+	__resume = NULL;
+    }
+    if (!__resume) optind++;
+    return *here;
+}
diff --git a/newlib/libc/sys/linux/getpwent.c b/newlib/libc/sys/linux/getpwent.c
deleted file mode 100644
index 9479021..0000000
--- a/newlib/libc/sys/linux/getpwent.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* FIXME: dummy stub for now.  */
-#include <errno.h>
-#include <pwd.h>
-
-struct passwd *
-_DEFUN (getpwnam, (name),
-	_CONST char *name)
-{
-  errno = ENOSYS;
-  return NULL;
-}
-
-/* FIXME: dummy stub for now.  */
-struct passwd *
-_DEFUN (getpwuid, (uid),
-	uid_t uid)
-{
-  errno = ENOSYS;
-  return NULL;
-}
-
-/* FIXME: dummy stub for now.  */
-struct passwd *
-_DEFUN (getpwent, (uid),
-	uid_t uid)
-{
-  errno = ENOSYS;
-  return NULL;
-}
-
diff --git a/newlib/libc/sys/linux/getreent.c b/newlib/libc/sys/linux/getreent.c
deleted file mode 100644
index 2d84207..0000000
--- a/newlib/libc/sys/linux/getreent.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* default function used by _REENT when not using multithreading */
-
-#include <reent.h>
-#include <machine/weakalias.h>
-
-struct _reent *
-__libc_getreent (void)
-{
-  return _impure_ptr;
-}
-weak_alias(__libc_getreent,__getreent)
-
diff --git a/newlib/libc/sys/linux/getrlimit64.c b/newlib/libc/sys/linux/getrlimit64.c
deleted file mode 100644
index dcd67cf..0000000
--- a/newlib/libc/sys/linux/getrlimit64.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/resource.h>
-#include <sys/types.h>
-
-/* Put the soft and hard limits for RESOURCE in *RLIMITS.
-   Returns 0 if successful, -1 if not (and sets errno).  */
-int
-getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits)
-{
-  struct rlimit rlimits32;
-
-  if (__getrlimit (resource, &rlimits32) < 0)
-    return -1;
-
-  if (rlimits32.rlim_cur == RLIM_INFINITY)
-    rlimits->rlim_cur = RLIM64_INFINITY;
-  else
-    rlimits->rlim_cur = rlimits32.rlim_cur;
-  if (rlimits32.rlim_max == RLIM_INFINITY)
-    rlimits->rlim_max = RLIM64_INFINITY;
-  else
-    rlimits->rlim_max = rlimits32.rlim_max;
-
-  return 0;
-}
diff --git a/newlib/libc/sys/linux/getwd.c b/newlib/libc/sys/linux/getwd.c
deleted file mode 100644
index 72db338..0000000
--- a/newlib/libc/sys/linux/getwd.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-
-char *
-getwd (char *buf)
-{
-  char tmp[MAXPATHLEN];
-
-  if (buf == NULL)
-    {
-      errno = EINVAL;
-      return NULL;
-    }
-
-  if (getcwd (tmp, MAXPATHLEN) == NULL)
-    return NULL;
-
-  return strncpy (buf, tmp, MAXPATHLEN);
-}
diff --git a/newlib/libc/sys/linux/hp-timing.h b/newlib/libc/sys/linux/hp-timing.h
deleted file mode 100644
index 0507f44..0000000
--- a/newlib/libc/sys/linux/hp-timing.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <machine/hp-timing.h>
diff --git a/newlib/libc/sys/linux/iconv/Makefile.am b/newlib/libc/sys/linux/iconv/Makefile.am
deleted file mode 100644
index 7326440..0000000
--- a/newlib/libc/sys/linux/iconv/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -DGCONV_DIR='"$(pkglibdir)"' -DGCONV_PATH='"$(pkglibdir)"' -I$(srcdir) -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES = \
-	iconv.h gconv.h \
-	iconv_open.c iconv.c iconv_close.c \
-	gconv_open.c gconv.c gconv_close.c \
-	gconv_db.c gconv_dl.c gconv_conf.c gconv_builtin.c \
-	gconv_simple.c gconv_trans.c gconv_cache.c
-
-libiconv_la_CFLAGS =
-libiconv_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libiconv.la
-libiconv_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(LIB_SOURCES)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../../../Makefile.shared
diff --git a/newlib/libc/sys/linux/iconv/Makefile.in b/newlib/libc/sys/linux/iconv/Makefile.in
deleted file mode 100644
index f29cbda..0000000
--- a/newlib/libc/sys/linux/iconv/Makefile.in
+++ /dev/null
@@ -1,372 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-EXTRA_SUBDIRS = @EXTRA_SUBDIRS@
-EXTRA_SUBLIBS = @EXTRA_SUBLIBS@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LINUX_MACH_LIB = @LINUX_MACH_LIB@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -DGCONV_DIR='"$(pkglibdir)"' -DGCONV_PATH='"$(pkglibdir)"' -I$(srcdir) -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES =  	iconv.h gconv.h 	iconv_open.c iconv.c iconv_close.c 	gconv_open.c gconv.c gconv_close.c 	gconv_db.c gconv_dl.c gconv_conf.c gconv_builtin.c 	gconv_simple.c gconv_trans.c gconv_cache.c
-
-
-libiconv_la_CFLAGS = 
-libiconv_la_LDFLAGS = -Xcompiler -nostdlib
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libiconv.la
-@USE_LIBTOOL_TRUE@libiconv_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  iconv_open.$(OBJEXT) iconv.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@iconv_close.$(OBJEXT) gconv_open.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@gconv.$(OBJEXT) gconv_close.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@gconv_db.$(OBJEXT) gconv_dl.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@gconv_conf.$(OBJEXT) gconv_builtin.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@gconv_simple.$(OBJEXT) gconv_trans.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@gconv_cache.$(OBJEXT)
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-libiconv_la_LIBADD = 
-@USE_LIBTOOL_TRUE@libiconv_la_OBJECTS =  iconv_open.lo iconv.lo \
-@USE_LIBTOOL_TRUE@iconv_close.lo gconv_open.lo gconv.lo gconv_close.lo \
-@USE_LIBTOOL_TRUE@gconv_db.lo gconv_dl.lo gconv_conf.lo \
-@USE_LIBTOOL_TRUE@gconv_builtin.lo gconv_simple.lo gconv_trans.lo \
-@USE_LIBTOOL_TRUE@gconv_cache.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(libiconv_la_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(libiconv_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus iconv/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-libiconv.la: $(libiconv_la_OBJECTS) $(libiconv_la_DEPENDENCIES)
-	$(LINK)  $(libiconv_la_LDFLAGS) $(libiconv_la_OBJECTS) $(libiconv_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = iconv
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-noinstLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
-distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/linux/iconv/categories.def b/newlib/libc/sys/linux/iconv/categories.def
deleted file mode 100644
index 257fac7..0000000
--- a/newlib/libc/sys/linux/iconv/categories.def
+++ /dev/null
@@ -1,344 +0,0 @@
-/* Definition of all available locale categories and their items.  -*- C -*-
-   Copyright (C) 1995-2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* These definitions are used by the locale-related files in the C library
-   and the programs `localedef' and `locale'.
-
-   The general format of the descriptions is like this:
-
-     DEFINE_CATEGORY (ID, name, ( items ), setlocale-postload)
-
-   where items itself is an array of entries in the form
-
-     { ID, name, standard, value-type, min, max }
-
-   The usage of the load, check, output functions depends on the individual
-   program code which loads this file.
-
-   The various value types for the items are `string', `stringarray', `byte'
-   `bytearray', and `word'.  These cover all possible values in the current
-   locale definitions.  `min' and `max' can be individually used again.  */
-
-#ifndef NO_POSTLOAD
-#define NO_POSTLOAD NULL
-#endif
-
-DEFINE_CATEGORY
-(
- LC_COLLATE, "LC_COLLATE",
- (
-  DEFINE_ELEMENT (_NL_COLLATE_NRULES,           "collate-nrules",           std, word)
-  DEFINE_ELEMENT (_NL_COLLATE_RULESETS,         "collate-rulesets",         std, string)
-  DEFINE_ELEMENT (_NL_COLLATE_TABLEMB,          "collate-tablemb",          std, wstring)
-  DEFINE_ELEMENT (_NL_COLLATE_WEIGHTMB,         "collate-weightmb",         std, wstring)
-  DEFINE_ELEMENT (_NL_COLLATE_EXTRAMB,          "collate-extramb",          std, wstring)
-  DEFINE_ELEMENT (_NL_COLLATE_INDIRECTMB,       "collate-indirectmb",       std, wstring)
-  DEFINE_ELEMENT (_NL_COLLATE_TABLEWC,          "collate-tablewc",          std, wstring)
-  DEFINE_ELEMENT (_NL_COLLATE_WEIGHTWC,         "collate-weightwc",         std, wstring)
-  DEFINE_ELEMENT (_NL_COLLATE_EXTRAWC,          "collate-extrawc",          std, wstring)
-  DEFINE_ELEMENT (_NL_COLLATE_INDIRECTWC,       "collate-indirectwc",       std, wstring)
-  DEFINE_ELEMENT (_NL_COLLATE_SYMB_HASH_SIZEMB, "collate-symb-hash-sizemb", std, word)
-  DEFINE_ELEMENT (_NL_COLLATE_SYMB_TABLEMB,     "collate-symb-tablemb",     std, wstring)
-  DEFINE_ELEMENT (_NL_COLLATE_SYMB_EXTRAMB,     "collate-symb-extramb",     std, wstring)
-  DEFINE_ELEMENT (_NL_COLLATE_COLLSEQMB,        "collate-collseqmb",        std, wstring)
-  DEFINE_ELEMENT (_NL_COLLATE_COLLSEQWC,        "collate-collseqwc",        std, wstring)
-  DEFINE_ELEMENT (_NL_COLLATE_CODESET,		"collate-codeset",	    std, string)
-  ), NO_POSTLOAD)
-
-
-/* The actual definition of ctype is meaningless here.  It is hard coded in
-   the code because it has to be handled very specially.  Only the names of
-   the functions and the value types are important.  */
-DEFINE_CATEGORY
-(
- LC_CTYPE, "LC_CTYPE",
- (
-  DEFINE_ELEMENT (_NL_CTYPE_CLASS,	  "ctype-class",        std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_TOUPPER,      "ctype-toupper",      std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_TOLOWER,      "ctype-tolower",      std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_CLASS32,      "ctype-class32",      std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_CLASS_NAMES,  "ctype-class-names",  std, stringlist, 10, 32)
-  DEFINE_ELEMENT (_NL_CTYPE_MAP_NAMES,	  "ctype-map-names",    std, stringlist, 2, 32)
-  DEFINE_ELEMENT (_NL_CTYPE_WIDTH,	  "ctype-width",        std, bytearray)
-  DEFINE_ELEMENT (_NL_CTYPE_MB_CUR_MAX,	  "ctype-mb-cur-max",   std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_CODESET_NAME, "charmap",		std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_TOUPPER32,    "ctype-toupper32",    std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_TOLOWER32,    "ctype-tolower32",    std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_CLASS_OFFSET, "ctype-class-offset", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_MAP_OFFSET,   "ctype-map-offset",   std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS_MB_LEN, "ctype-indigits_mb-len", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS0_MB, "ctype-indigits0_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS1_MB, "ctype-indigits1_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS2_MB, "ctype-indigits2_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS3_MB, "ctype-indigits3_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS4_MB, "ctype-indigits4_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS5_MB, "ctype-indigits5_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS6_MB, "ctype-indigits6_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS7_MB, "ctype-indigits7_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS8_MB, "ctype-indigits8_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS9_MB, "ctype-indigits9_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS_WC_LEN, "ctype-indigits_wc-len", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS0_WC, "ctype-indigits0_wc", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS1_WC, "ctype-indigits1_wc", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS2_WC, "ctype-indigits2_wc", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS3_WC, "ctype-indigits3_wc", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS4_WC, "ctype-indigits4_wc", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS5_WC, "ctype-indigits5_wc", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS6_WC, "ctype-indigits6_wc", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS7_WC, "ctype-indigits7_wc", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS8_WC, "ctype-indigits8_wc", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_INDIGITS9_WC, "ctype-indigits9_wc", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT0_MB, "ctype-outdigit0_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT1_MB, "ctype-outdigit1_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT2_MB, "ctype-outdigit2_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT3_MB, "ctype-outdigit3_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT4_MB, "ctype-outdigit4_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT5_MB, "ctype-outdigit5_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT6_MB, "ctype-outdigit6_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT7_MB, "ctype-outdigit7_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT8_MB, "ctype-outdigit8_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT9_MB, "ctype-outdigit9_mb", std, string)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT0_WC, "ctype-outdigit0_wc", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT1_WC, "ctype-outdigit1_wc", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT2_WC, "ctype-outdigit2_wc", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT3_WC, "ctype-outdigit3_wc", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT4_WC, "ctype-outdigit4_wc", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT5_WC, "ctype-outdigit5_wc", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT6_WC, "ctype-outdigit6_wc", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT7_WC, "ctype-outdigit7_wc", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT8_WC, "ctype-outdigit8_wc", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_OUTDIGIT9_WC, "ctype-outdigit9_wc", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_TRANSLIT_TAB_SIZE, "ctype-translit-tab-size", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_TRANSLIT_FROM_IDX, "ctype-translit-from-idx", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_TRANSLIT_FROM_TBL, "ctype-translit-from-tbl", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_TRANSLIT_TO_IDX, "ctype-translit-to-idx", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_TRANSLIT_TO_TBL, "ctype-translit-to-tbl", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_TRANSLIT_DEFAULT_MISSING_LEN, "ctype-translit-default-missing-len", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_TRANSLIT_DEFAULT_MISSING, "ctype-translit-default-missing", std, wstring)
-  DEFINE_ELEMENT (_NL_CTYPE_TRANSLIT_IGNORE_LEN, "ctype-translit-ignore-len", std, word)
-  DEFINE_ELEMENT (_NL_CTYPE_TRANSLIT_IGNORE, "ctype-translit-ignore", std, string)
-  ), _nl_postload_ctype)
-
-
-DEFINE_CATEGORY
-(
- LC_MONETARY, "LC_MONETARY",
- (
-  DEFINE_ELEMENT (INT_CURR_SYMBOL,                     "int_curr_symbol",        std, string)
-  DEFINE_ELEMENT (CURRENCY_SYMBOL,                     "currency_symbol",        std, string)
-  DEFINE_ELEMENT (MON_DECIMAL_POINT,                   "mon_decimal_point",      std, string)
-  DEFINE_ELEMENT (MON_THOUSANDS_SEP,                   "mon_thousands_sep",      std, string)
-  DEFINE_ELEMENT (MON_GROUPING,                        "mon_grouping",           std, bytearray)
-  DEFINE_ELEMENT (POSITIVE_SIGN,                       "positive_sign",          std, string)
-  DEFINE_ELEMENT (NEGATIVE_SIGN,                       "negative_sign",          std, string)
-  DEFINE_ELEMENT (INT_FRAC_DIGITS,                     "int_frac_digits",        std, byte)
-  DEFINE_ELEMENT (FRAC_DIGITS,                         "frac_digits",            std, byte)
-  DEFINE_ELEMENT (P_CS_PRECEDES,                       "p_cs_precedes",          std, byte, 0, 1)
-  DEFINE_ELEMENT (P_SEP_BY_SPACE,                      "p_sep_by_space",         std, byte, 0, 2)
-  DEFINE_ELEMENT (N_CS_PRECEDES,                       "n_cs_precedes",          std, byte, 0, 1)
-  DEFINE_ELEMENT (N_SEP_BY_SPACE,                      "n_sep_by_space",         std, byte, 0, 2)
-  DEFINE_ELEMENT (P_SIGN_POSN,                         "p_sign_posn",            std, byte, 0, 4)
-  DEFINE_ELEMENT (N_SIGN_POSN,                         "n_sign_posn",            std, byte, 0, 4)
-  DEFINE_ELEMENT (__INT_P_CS_PRECEDES,                 "int_p_cs_precedes",      std, byte, 0, 1)
-  DEFINE_ELEMENT (__INT_P_SEP_BY_SPACE,                "int_p_sep_by_space",     std, byte, 0, 2)
-  DEFINE_ELEMENT (__INT_N_CS_PRECEDES,                 "int_n_cs_precedes",      std, byte, 0, 1)
-  DEFINE_ELEMENT (__INT_N_SEP_BY_SPACE,                "int_n_sep_by_space",     std, byte, 0, 2)
-  DEFINE_ELEMENT (__INT_P_SIGN_POSN,                   "int_p_sign_posn",        std, byte, 0, 4)
-  DEFINE_ELEMENT (__INT_N_SIGN_POSN,                   "int_n_sign_posn",        std, byte, 0, 4)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_INT_CURR_SYMBOL,    "duo_int_curr_symbol",    std, string)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_CURRENCY_SYMBOL,    "duo_currency_symbol",    std, string)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_INT_FRAC_DIGITS,    "duo_int_frac_digits",    std, byte)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_FRAC_DIGITS,        "duo_frac_digits",        std, byte)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_P_CS_PRECEDES,      "duo_p_cs_precedes",      std, byte, 0, 1)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_P_SEP_BY_SPACE,     "duo_p_sep_by_space",     std, byte, 0, 2)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_N_CS_PRECEDES,      "duo_n_cs_precedes",      std, byte, 0, 1)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_N_SEP_BY_SPACE,     "duo_n_sep_by_space",     std, byte, 0, 2)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_INT_P_CS_PRECEDES,  "duo_int_p_cs_precedes",  std, byte, 0, 1)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_INT_P_SEP_BY_SPACE, "duo_int_p_sep_by_space", std, byte, 0, 2)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_INT_N_CS_PRECEDES,  "duo_int_n_cs_precedes",  std, byte, 0, 1)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_INT_N_SEP_BY_SPACE, "duo_int_n_sep_by_space", std, byte, 0, 2)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_P_SIGN_POSN,        "duo_p_sign_posn",        std, byte, 0, 4)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_N_SIGN_POSN,        "duo_n_sign_posn",        std, byte, 0, 4)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_INT_P_SIGN_POSN,    "duo_int_p_sign_posn",    std, byte, 0, 4)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_INT_N_SIGN_POSN,    "duo_int_n_sign_posn",    std, byte, 0, 4)
-  DEFINE_ELEMENT (_NL_MONETARY_UNO_VALID_FROM,         "uno_valid_from",         std, word)
-  DEFINE_ELEMENT (_NL_MONETARY_UNO_VALID_TO,           "uno_valid_to",           std, word)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_VALID_FROM,         "duo_valid_from",         std, word)
-  DEFINE_ELEMENT (_NL_MONETARY_DUO_VALID_TO,           "duo_valid_to",           std, word)
-  DEFINE_ELEMENT (_NL_MONETARY_CONVERSION_RATE,        "conversion_rate",         std, wordarray, 2, 2)
-  DEFINE_ELEMENT (_NL_MONETARY_DECIMAL_POINT_WC,       "monetary-decimal-point-wc", std, word)
-  DEFINE_ELEMENT (_NL_MONETARY_THOUSANDS_SEP_WC,       "monetary-thousands-sep-wc", std, word)
-  DEFINE_ELEMENT (_NL_MONETARY_CODESET,		       "monetary-codeset",	    std, string)
-  ), NO_POSTLOAD)
-
-
-DEFINE_CATEGORY
-(
- LC_NUMERIC, "LC_NUMERIC",
- (
-  DEFINE_ELEMENT (DECIMAL_POINT, "decimal_point", std, string)
-  DEFINE_ELEMENT (THOUSANDS_SEP, "thousands_sep", std, string)
-  DEFINE_ELEMENT (GROUPING,      "grouping",      std, bytearray)
-  DEFINE_ELEMENT (_NL_NUMERIC_DECIMAL_POINT_WC, "numeric-decimal-point-wc", std, word)
-  DEFINE_ELEMENT (_NL_NUMERIC_THOUSANDS_SEP_WC, "numeric-thousands-sep-wc", std, word)
-  DEFINE_ELEMENT (_NL_NUMERIC_CODESET,		"numeric-codeset",	    std, string)
-
-  ), NO_POSTLOAD)
-
-
-DEFINE_CATEGORY
-(
- LC_TIME, "LC_TIME",
- (
-  DEFINE_ELEMENT (ABDAY_1,     "abday",       std, stringarray,  7,  7)
-  DEFINE_ELEMENT (DAY_1,       "day",         std, stringarray,  7,  7)
-  DEFINE_ELEMENT (ABMON_1,     "abmon",       std, stringarray, 12, 12)
-  DEFINE_ELEMENT (MON_1,       "mon",         std, stringarray, 12, 12)
-  DEFINE_ELEMENT (AM_STR,      "am_pm",       std, stringarray,  2,  2)
-  DEFINE_ELEMENT (D_T_FMT,     "d_t_fmt",     std, string)
-  DEFINE_ELEMENT (D_FMT,       "d_fmt",       std, string)
-  DEFINE_ELEMENT (T_FMT,       "t_fmt",       std, string)
-  DEFINE_ELEMENT (T_FMT_AMPM,  "t_fmt_ampm",  std, string)
-  DEFINE_ELEMENT (ERA,         "era",         opt, stringlist, 0, 100)
-  DEFINE_ELEMENT (ERA_YEAR,    "era_year",    opt, string)
-  DEFINE_ELEMENT (ERA_D_FMT,   "era_d_fmt",   opt, string)
-  DEFINE_ELEMENT (ALT_DIGITS,  "alt_digits",  opt, stringlist,  100, 100)
-  DEFINE_ELEMENT (ERA_D_T_FMT, "era_d_t_fmt", opt, string)
-  DEFINE_ELEMENT (ERA_T_FMT,   "era_t_fmt",   opt, string)
-  DEFINE_ELEMENT (_NL_TIME_ERA_NUM_ENTRIES,    "time-era-num-entries",    opt, word)
-  DEFINE_ELEMENT (_NL_TIME_ERA_ENTRIES,   "time-era-entries", opt, string)
-  DEFINE_ELEMENT (_NL_WABDAY_1,  "wide-abday",    std, wstringarray,  7,  7)
-  DEFINE_ELEMENT (_NL_WDAY_1,    "wide-day",      std, wstringarray,  7,  7)
-  DEFINE_ELEMENT (_NL_WABMON_1,  "wide-abmon",    std, wstringarray, 12, 12)
-  DEFINE_ELEMENT (_NL_WMON_1,    "wide-mon",      std, wstringarray, 12, 12)
-  DEFINE_ELEMENT (_NL_WAM_STR,   "wide-am_pm",    std, wstringarray,  2,  2)
-  DEFINE_ELEMENT (_NL_WD_T_FMT,  "wide-d_t_fmt",  std, wstring)
-  DEFINE_ELEMENT (_NL_WD_FMT,    "wide-d_fmt",    std, wstring)
-  DEFINE_ELEMENT (_NL_WT_FMT,    "wide-t_fmt",    std, wstring)
-  DEFINE_ELEMENT (_NL_WT_FMT_AMPM, "wide-t_fmt_ampm", std, wstring)
-  DEFINE_ELEMENT (_NL_WERA_YEAR,   "wide-era_year",    opt, wstring)
-  DEFINE_ELEMENT (_NL_WERA_D_FMT,  "wide-era_d_fmt",   opt, wstring)
-  DEFINE_ELEMENT (_NL_WALT_DIGITS,  "wide-alt_digits",  opt, wstringlist, 1000, 100)
-  DEFINE_ELEMENT (_NL_WERA_D_T_FMT, "wide-era_d_t_fmt", opt, wstring)
-  DEFINE_ELEMENT (_NL_WERA_T_FMT,   "wide-era_t_fmt",   opt, wstring)
-  DEFINE_ELEMENT (_NL_TIME_WEEK_NDAYS,      "week-ndays",          std, byte)
-  DEFINE_ELEMENT (_NL_TIME_WEEK_1STDAY,     "week-1stday",         std, word)
-  DEFINE_ELEMENT (_NL_TIME_WEEK_1STWEEK,    "week-1stweek",        std, byte)
-  DEFINE_ELEMENT (_NL_TIME_FIRST_WEEKDAY,   "first_weekday",       std, byte)
-  DEFINE_ELEMENT (_NL_TIME_FIRST_WORKDAY,   "first_workday",       std, byte)
-  DEFINE_ELEMENT (_NL_TIME_CAL_DIRECTION,   "cal_direction",       std, byte)
-  DEFINE_ELEMENT (_NL_TIME_TIMEZONE,        "timezone",            std, string)
-  DEFINE_ELEMENT (_DATE_FMT,                "date_fmt",            opt, string)
-  DEFINE_ELEMENT (_NL_W_DATE_FMT,           "wide-date_fmt",       opt, wstring)
-  DEFINE_ELEMENT (_NL_TIME_CODESET,	    "time-codeset",	   std, string)
-  ), _nl_postload_time)
-
-
-DEFINE_CATEGORY
-(
- LC_MESSAGES, "LC_MESSAGES",
- (
-  DEFINE_ELEMENT (YESEXPR, "yesexpr", std, string)
-  DEFINE_ELEMENT (NOEXPR,  "noexpr",  std, string)
-  DEFINE_ELEMENT (YESSTR,  "yesstr",  opt, string)
-  DEFINE_ELEMENT (NOSTR,   "nostr",   opt, string)
-  DEFINE_ELEMENT (_NL_MESSAGES_CODESET, "messages-codeset", std, string)
-  ), NO_POSTLOAD)
-
-DEFINE_CATEGORY
-(
- LC_PAPER, "LC_PAPER",
- (
-  DEFINE_ELEMENT (_NL_PAPER_HEIGHT, "height", std, word)
-  DEFINE_ELEMENT (_NL_PAPER_WIDTH,  "width",  std, word)
-  DEFINE_ELEMENT (_NL_PAPER_CODESET, "paper-codeset", std, string)
-  ), NO_POSTLOAD)
-
-DEFINE_CATEGORY
-(
- LC_NAME, "LC_NAME",
- (
-  DEFINE_ELEMENT (_NL_NAME_NAME_FMT,  "name_fmt",  std, string)
-  DEFINE_ELEMENT (_NL_NAME_NAME_GEN,  "name_gen",  std, string)
-  DEFINE_ELEMENT (_NL_NAME_NAME_MR,   "name_mr",   std, string)
-  DEFINE_ELEMENT (_NL_NAME_NAME_MRS,  "name_mrs",  std, string)
-  DEFINE_ELEMENT (_NL_NAME_NAME_MISS, "name_miss", std, string)
-  DEFINE_ELEMENT (_NL_NAME_NAME_MS,   "name_ms",   std, string)
-  DEFINE_ELEMENT (_NL_NAME_CODESET,   "name-codeset", std, string)
-  ), NO_POSTLOAD)
-
-DEFINE_CATEGORY
-(
- LC_ADDRESS, "LC_ADDRESS",
- (
-  DEFINE_ELEMENT (_NL_ADDRESS_POSTAL_FMT,      "postal_fmt",      std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_NAME,    "country_name",    std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_POST,    "country_post",    std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_AB2,     "country_ab2",     std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_AB3,     "country_ab3",     std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_CAR,     "country_car",     std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_NUM,     "country_num",     std, word)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_ISBN,    "country_isbn",    std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_LANG_NAME,       "lang_name",       std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_LANG_AB,         "lang_ab",         std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_LANG_TERM,       "lang_term",       std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_LANG_LIB,        "lang_lib",        std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_CODESET,	       "address-codeset", std, string)
-  ), NO_POSTLOAD)
-
-DEFINE_CATEGORY
-(
- LC_TELEPHONE, "LC_TELEPHONE",
- (
-  DEFINE_ELEMENT (_NL_TELEPHONE_TEL_INT_FMT, "tel_int_fmt", std, string)
-  DEFINE_ELEMENT (_NL_TELEPHONE_TEL_DOM_FMT, "tel_dom_fmt", std, string)
-  DEFINE_ELEMENT (_NL_TELEPHONE_INT_SELECT,  "int_select",  std, string)
-  DEFINE_ELEMENT (_NL_TELEPHONE_INT_PREFIX,  "int_prefix",  std, string)
-  DEFINE_ELEMENT (_NL_TELEPHONE_CODESET,     "telephone-codeset", std, string)
-  ), NO_POSTLOAD)
-
-DEFINE_CATEGORY
-(
- LC_MEASUREMENT, "LC_MEASUREMENT",
- (
-  DEFINE_ELEMENT (_NL_MEASUREMENT_MEASUREMENT, "measurement", std, byte)
-  DEFINE_ELEMENT (_NL_MEASUREMENT_CODESET,     "measurement-codeset", std, string)
-  ), NO_POSTLOAD)
-
-DEFINE_CATEGORY
-(
- LC_IDENTIFICATION, "LC_IDENTIFICATION",
- (
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_TITLE,        "title",        std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_SOURCE,       "source",       std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_ADDRESS,      "address",      std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_CONTACT,      "contact",      std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_EMAIL,        "email",        std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_TEL,          "tel",          std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_FAX,          "fax",          std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_LANGUAGE,     "language",     std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_TERRITORY,    "territory",    std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_AUDIENCE,     "audience",     std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_APPLICATION,  "applcation",   std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_ABBREVIATION, "abbreviation", std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_REVISION,     "revision",     std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_DATE,         "date",         std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_CATEGORY,     "category",     std, stringarray, 13, 13)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_CODESET,	   "identification-codeset", std, string)
-  ), NO_POSTLOAD)
diff --git a/newlib/libc/sys/linux/iconv/dummy-repertoire.c b/newlib/libc/sys/linux/iconv/dummy-repertoire.c
deleted file mode 100644
index a195460..0000000
--- a/newlib/libc/sys/linux/iconv/dummy-repertoire.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* For iconv we don't have to handle repertoire maps.  Provide dummy
-   definitions to allow the use of linereader.c unchanged.  */
-#include <repertoire.h>
-
-
-uint32_t
-repertoire_find_value (const struct repertoire_t *repertoire, const char *name,
-		       size_t len)
-{
-  return ILLEGAL_CHAR_VALUE;
-}
-
-
-const char *
-repertoire_find_symbol (const struct repertoire_t *repertoire, uint32_t ucs)
-{
-  return NULL;
-}
diff --git a/newlib/libc/sys/linux/iconv/gconv.c b/newlib/libc/sys/linux/iconv/gconv.c
deleted file mode 100644
index b413e26..0000000
--- a/newlib/libc/sys/linux/iconv/gconv.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Convert characters in input buffer using conversion descriptor to
-   output buffer.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <gconv_int.h>
-#include <sys/param.h>
-#include <dlfcn.h>
-#include <stddef.h>
-
-int
-internal_function
-__gconv (__gconv_t cd, const unsigned char **inbuf,
-	 const unsigned char *inbufend, unsigned char **outbuf,
-	 unsigned char *outbufend, size_t *irreversible)
-{
-  size_t last_step;
-  int result;
-
-  if (cd == (__gconv_t) -1L)
-    return __GCONV_ILLEGAL_DESCRIPTOR;
-
-  last_step = cd->__nsteps - 1;
-
-  assert (irreversible != NULL);
-  *irreversible = 0;
-
-  cd->__data[last_step].__outbuf = outbuf != NULL ? *outbuf : NULL;
-  cd->__data[last_step].__outbufend = outbufend;
-
-  if (inbuf == NULL || *inbuf == NULL)
-    /* We just flush.  */
-    result = cd->__steps->__fct (cd->__steps, cd->__data, NULL, NULL, NULL,
-                                 irreversible,
-                                 cd->__data[last_step].__outbuf == NULL ? 2 : 1, 0);
-  else
-    {
-      const unsigned char *last_start;
-
-      assert (outbuf != NULL && *outbuf != NULL);
-
-      do
-	{
-	  last_start = *inbuf;
-	  result = cd->__steps->__fct (cd->__steps, cd->__data, inbuf, inbufend,
-				 NULL, irreversible, 0, 0);
-	}
-      while (result == __GCONV_EMPTY_INPUT && last_start != *inbuf
-	     && *inbuf + cd->__steps->__min_needed_from <= inbufend);
-    }
-
-  if (outbuf != NULL && *outbuf != NULL)
-    *outbuf = cd->__data[last_step].__outbuf;
-
-  return result;
-}
diff --git a/newlib/libc/sys/linux/iconv/gconv_builtin.c b/newlib/libc/sys/linux/iconv/gconv_builtin.c
deleted file mode 100644
index 45bd4e7..0000000
--- a/newlib/libc/sys/linux/iconv/gconv_builtin.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Table for builtin transformation mapping.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <endian.h>
-#include <limits.h>
-#include <string.h>
-
-#include <gconv_int.h>
-
-#include <assert.h>
-
-
-static struct builtin_map
-{
-  const char *name;
-  __gconv_fct fct;
-
-  int min_needed_from;
-  int max_needed_from;
-  int min_needed_to;
-  int max_needed_to;
-
-} map[] =
-{
-#define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, MinF, MaxF, \
-			       MinT, MaxT) \
-  {									      \
-    .name = Name,							      \
-    .fct = Fct,								      \
-									      \
-    .min_needed_from = MinF,						      \
-    .max_needed_from = MaxF,						      \
-    .min_needed_to = MinT,						      \
-    .max_needed_to = MaxT						      \
-  },
-#define BUILTIN_ALIAS(From, To)
-
-#include <gconv_builtin.h>
-};
-
-
-void
-internal_function
-__gconv_get_builtin_trans (const char *name, struct __gconv_step *step)
-{
-  size_t cnt;
-
-  for (cnt = 0; cnt < sizeof (map) / sizeof (map[0]); ++cnt)
-    if (strcmp (name, map[cnt].name) == 0)
-      break;
-
-  assert (cnt < sizeof (map) / sizeof (map[0]));
-
-  step->__fct = map[cnt].fct;
-  step->__init_fct = NULL;
-  step->__end_fct = NULL;
-  step->__shlib_handle = NULL;
-  step->__modname = NULL;
-
-  step->__min_needed_from = map[cnt].min_needed_from;
-  step->__max_needed_from = map[cnt].max_needed_from;
-  step->__min_needed_to = map[cnt].min_needed_to;
-  step->__max_needed_to = map[cnt].max_needed_to;
-
-  /* None of the builtin converters handles stateful encoding.  */
-  step->__stateful = 0;
-}
diff --git a/newlib/libc/sys/linux/iconv/gconv_builtin.h b/newlib/libc/sys/linux/iconv/gconv_builtin.h
deleted file mode 100644
index 1a9d8a8..0000000
--- a/newlib/libc/sys/linux/iconv/gconv_builtin.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Builtin transformations.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-BUILTIN_ALIAS ("UCS4//", "ISO-10646/UCS4/")
-BUILTIN_ALIAS ("UCS-4//", "ISO-10646/UCS4/")
-BUILTIN_ALIAS ("UCS-4BE//", "ISO-10646/UCS4/")
-BUILTIN_ALIAS ("CSUCS4//", "ISO-10646/UCS4/")
-BUILTIN_ALIAS ("ISO-10646//", "ISO-10646/UCS4/")
-BUILTIN_ALIAS ("10646-1:1993//", "ISO-10646/UCS4/")
-BUILTIN_ALIAS ("10646-1:1993/UCS4/", "ISO-10646/UCS4/")
-BUILTIN_ALIAS ("OSF00010104//", "ISO-10646/UCS4/") /* level 1 */
-BUILTIN_ALIAS ("OSF00010105//", "ISO-10646/UCS4/") /* level 2 */
-BUILTIN_ALIAS ("OSF00010106//", "ISO-10646/UCS4/") /* level 3 */
-
-BUILTIN_TRANSFORMATION ("INTERNAL", "ISO-10646/UCS4/", 1, "=INTERNAL->ucs4",
-			__gconv_transform_internal_ucs4, 4, 4, 4, 4)
-BUILTIN_TRANSFORMATION ("ISO-10646/UCS4/", "INTERNAL", 1, "=ucs4->INTERNAL",
-			__gconv_transform_ucs4_internal, 4, 4, 4, 4)
-
-BUILTIN_TRANSFORMATION ("INTERNAL", "UCS-4LE//", 1, "=INTERNAL->ucs4le",
-			__gconv_transform_internal_ucs4le, 4, 4, 4, 4)
-BUILTIN_TRANSFORMATION ("UCS-4LE//", "INTERNAL", 1, "=ucs4le->INTERNAL",
-			__gconv_transform_ucs4le_internal, 4, 4, 4, 4)
-
-BUILTIN_ALIAS ("WCHAR_T//", "INTERNAL")
-
-BUILTIN_ALIAS ("UTF8//", "ISO-10646/UTF8/")
-BUILTIN_ALIAS ("UTF-8//", "ISO-10646/UTF8/")
-BUILTIN_ALIAS ("ISO-IR-193//", "ISO-10646/UTF8/")
-BUILTIN_ALIAS ("OSF05010001//", "ISO-10646/UTF8/")
-BUILTIN_ALIAS ("ISO-10646/UTF-8/", "ISO-10646/UTF8/")
-
-BUILTIN_TRANSFORMATION ("INTERNAL", "ISO-10646/UTF8/", 1, "=INTERNAL->utf8",
-			__gconv_transform_internal_utf8, 4, 4, 1, 6)
-
-BUILTIN_TRANSFORMATION ("ISO-10646/UTF8/", "INTERNAL", 1, "=utf8->INTERNAL",
-			__gconv_transform_utf8_internal, 1, 6, 4, 4)
-
-BUILTIN_ALIAS ("UCS2//", "ISO-10646/UCS2/")
-BUILTIN_ALIAS ("UCS-2//", "ISO-10646/UCS2/")
-BUILTIN_ALIAS ("OSF00010100//", "ISO-10646/UCS2/") /* level 1 */
-BUILTIN_ALIAS ("OSF00010101//", "ISO-10646/UCS2/") /* level 2 */
-BUILTIN_ALIAS ("OSF00010102//", "ISO-10646/UCS2/") /* level 3 */
-
-BUILTIN_TRANSFORMATION ("ISO-10646/UCS2/", "INTERNAL", 1, "=ucs2->INTERNAL",
-			__gconv_transform_ucs2_internal, 2, 2, 4, 4)
-
-BUILTIN_TRANSFORMATION ("INTERNAL", "ISO-10646/UCS2/", 1, "=INTERNAL->ucs2",
-			__gconv_transform_internal_ucs2, 4, 4, 2, 2)
-
-
-BUILTIN_ALIAS ("ANSI_X3.4//", "ANSI_X3.4-1968//")
-BUILTIN_ALIAS ("ISO-IR-6//", "ANSI_X3.4-1968//")
-BUILTIN_ALIAS ("ANSI_X3.4-1986//", "ANSI_X3.4-1968//")
-BUILTIN_ALIAS ("ISO_646.IRV:1991//", "ANSI_X3.4-1968//")
-BUILTIN_ALIAS ("ASCII//", "ANSI_X3.4-1968//")
-BUILTIN_ALIAS ("ISO646-US//", "ANSI_X3.4-1968//")
-BUILTIN_ALIAS ("US-ASCII//", "ANSI_X3.4-1968//")
-BUILTIN_ALIAS ("US//", "ANSI_X3.4-1968//")
-BUILTIN_ALIAS ("IBM367//", "ANSI_X3.4-1968//")
-BUILTIN_ALIAS ("CP367//", "ANSI_X3.4-1968//")
-BUILTIN_ALIAS ("CSASCII//", "ANSI_X3.4-1968//")
-BUILTIN_ALIAS ("OSF00010020//", "ANSI_X3.4-1968//")
-
-BUILTIN_TRANSFORMATION ("ANSI_X3.4-1968//", "INTERNAL", 1, "=ascii->INTERNAL",
-			__gconv_transform_ascii_internal, 4, 4, 1, 1)
-
-BUILTIN_TRANSFORMATION ("INTERNAL", "ANSI_X3.4-1968//", 1, "=INTERNAL->ascii",
-			__gconv_transform_internal_ascii, 4, 4, 1, 1)
-
-
-#if BYTE_ORDER == BIG_ENDIAN
-BUILTIN_ALIAS ("UNICODEBIG//", "ISO-10646/UCS2/")
-BUILTIN_ALIAS ("UCS-2BE//", "ISO-10646/UCS2/")
-
-BUILTIN_ALIAS ("UCS-2LE//", "UNICODELITTLE//")
-
-BUILTIN_TRANSFORMATION ("UNICODELITTLE//", "INTERNAL", 1,
-			"=ucs2reverse->INTERNAL",
-			__gconv_transform_ucs2reverse_internal, 2, 2, 4, 4)
-
-BUILTIN_TRANSFORMATION ("INTERNAL", "UNICODELITTLE//", 1,
-			"=INTERNAL->ucs2reverse",
-			__gconv_transform_internal_ucs2reverse, 4, 4, 2, 2)
-#else
-BUILTIN_ALIAS ("UNICODELITTLE//", "ISO-10646/UCS2/")
-BUILTIN_ALIAS ("UCS-2LE//", "ISO-10646/UCS2/")
-
-BUILTIN_ALIAS ("UCS-2BE//", "UNICODEBIG//")
-
-BUILTIN_TRANSFORMATION ("UNICODEBIG//", "INTERNAL", 1,
-			"=ucs2reverse->INTERNAL",
-			__gconv_transform_ucs2reverse_internal, 2, 2, 4, 4)
-
-BUILTIN_TRANSFORMATION ("INTERNAL", "UNICODEBIG//", 1,
-			"=INTERNAL->ucs2reverse",
-			__gconv_transform_internal_ucs2reverse, 4, 4, 2, 2)
-#endif
diff --git a/newlib/libc/sys/linux/iconv/gconv_cache.c b/newlib/libc/sys/linux/iconv/gconv_cache.c
deleted file mode 100644
index c887be9..0000000
--- a/newlib/libc/sys/linux/iconv/gconv_cache.c
+++ /dev/null
@@ -1,459 +0,0 @@
-/* Cache handling for iconv modules.
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <dlfcn.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-
-#include <gconv_int.h>
-#include <iconvconfig.h>
-
-#include "hash-string.h"
-
-void *__gconv_cache;
-static size_t cache_size;
-static int cache_malloced;
-
-
-int
-internal_function
-__gconv_load_cache (void)
-{
-  int fd;
-  struct stat64 st;
-  struct gconvcache_header *header;
-
-  /* We cannot use the cache if the GCONV_PATH environment variable is
-     set.  */
-  __gconv_path_envvar = getenv ("GCONV_PATH");
-  if (__gconv_path_envvar != NULL)
-    return -1;
-
-  /* See whether the cache file exists.  */
-  fd = open (GCONV_MODULES_CACHE, O_RDONLY);
-  if (__builtin_expect (fd, 0) == -1)
-    /* Not available.  */
-    return -1;
-
-#ifdef	_POSIX_ASYNC_IO
-  /* Get information about the file.  */
-  if (__builtin_expect (fstat64 (fd, &st), 0) < 0
-      /* We do not have to start looking at the file if it cannot contain
-	 at least the cache header.  */
-      || st.st_size < sizeof (struct gconvcache_header))
-    {
-#endif
-    close_and_exit:
-      close (fd);
-      return -1;
-#ifdef	_POSIX_ASYNC_IO
-    }
-#endif
-
-  /* Make the file content available.  */
-  cache_size = st.st_size;
-#ifdef _POSIX_MAPPED_FILES
-  __gconv_cache = mmap (NULL, cache_size, PROT_READ, MAP_SHARED, fd, 0);
-  if (__builtin_expect (__gconv_cache == MAP_FAILED, 0))
-#endif
-    {
-      size_t already_read;
-
-      __gconv_cache = malloc (cache_size);
-      if (__gconv_cache == NULL)
-	goto close_and_exit;
-
-      already_read = 0;
-      do
-	{
-	  ssize_t n = read (fd, (char *) __gconv_cache + already_read,
-			      cache_size - already_read);
-	  if (__builtin_expect (n, 0) == -1)
-	    {
-	      free (__gconv_cache);
-	      __gconv_cache = NULL;
-	      goto close_and_exit;
-	    }
-
-	  already_read += n;
-	}
-      while (already_read < cache_size);
-
-      cache_malloced = 1;
-    }
-
-  /* We don't need the file descriptor anymore.  */
-  close (fd);
-
-  /* Check the consistency.  */
-  header = (struct gconvcache_header *) __gconv_cache;
-  if (__builtin_expect (header->magic, GCONVCACHE_MAGIC) != GCONVCACHE_MAGIC
-      || __builtin_expect (header->string_offset >= cache_size, 0)
-      || __builtin_expect (header->hash_offset >= cache_size, 0)
-      || __builtin_expect (header->hash_size == 0, 0)
-      || __builtin_expect ((header->hash_offset
-			    + header->hash_size * sizeof (struct hash_entry))
-			   > cache_size, 0)
-      || __builtin_expect (header->module_offset >= cache_size, 0)
-      || __builtin_expect (header->otherconv_offset > cache_size, 0))
-    {
-      if (cache_malloced)
-	{
-	  free (__gconv_cache);
-	  cache_malloced = 0;
-	}
-#ifdef _POSIX_MAPPED_FILES
-      else
-	__munmap (__gconv_cache, cache_size);
-#endif
-      __gconv_cache = NULL;
-
-      return -1;
-    }
-
-  /* That worked.  */
-  return 0;
-}
-
-
-static int
-internal_function
-find_module_idx (const char *str, size_t *idxp)
-{
-  unsigned int idx;
-  unsigned int hval;
-  unsigned int hval2;
-  const struct gconvcache_header *header;
-  const char *strtab;
-  const struct hash_entry *hashtab;
-  unsigned int limit;
-
-  header = (const struct gconvcache_header *) __gconv_cache;
-  strtab = (char *) __gconv_cache + header->string_offset;
-  hashtab = (struct hash_entry *) ((char *) __gconv_cache
-				   + header->hash_offset);
-
-  hval = hash_string (str);
-  idx = hval % header->hash_size;
-  hval2 = 1 + hval % (header->hash_size - 2);
-
-  limit = cache_size - header->string_offset;
-  while (hashtab[idx].string_offset != 0)
-    if (hashtab[idx].string_offset < limit
-	&& strcmp (str, strtab + hashtab[idx].string_offset) == 0)
-      {
-	*idxp = hashtab[idx].module_idx;
-	return 0;
-      }
-    else
-      if ((idx += hval2) >= header->hash_size)
-	idx -= header->hash_size;
-
-  /* Nothing found.  */
-  return -1;
-}
-
-
-#ifndef STATIC_GCONV
-static int
-internal_function
-find_module (const char *directory, const char *filename,
-	     struct __gconv_step *result)
-{
-  size_t dirlen = strlen (directory);
-  size_t fnamelen = strlen (filename) + 1;
-  char fullname[dirlen + fnamelen];
-  int status = __GCONV_NOCONV;
-  char *tmp;
-
-  tmp = mempcpy (fullname, directory, dirlen);
-  tmp += dirlen;
-  memcpy (tmp, filename, fnamelen);
-
-  result->__shlib_handle = __gconv_find_shlib (fullname);
-  if (result->__shlib_handle != NULL)
-    {
-      status = __GCONV_OK;
-
-      result->__modname = NULL;
-      result->__fct = result->__shlib_handle->fct;
-      result->__init_fct = result->__shlib_handle->init_fct;
-      result->__end_fct = result->__shlib_handle->end_fct;
-
-      result->__data = NULL;
-      if (result->__init_fct != NULL)
-	status = result->__init_fct (result);
-    }
-
-  return status;
-}
-#endif
-
-
-int
-internal_function
-__gconv_compare_alias_cache (const char *name1, const char *name2, int *result)
-{
-  size_t name1_idx;
-  size_t name2_idx;
-
-  if (__gconv_cache == NULL)
-    return -1;
-
-  if (find_module_idx (name1, &name1_idx) != 0
-      || find_module_idx (name2, &name2_idx) != 0)
-    *result = strcmp (name1, name2);
-  else
-    *result = (int) (name1_idx - name2_idx);
-
-  return 0;
-}
-
-
-int
-internal_function
-__gconv_lookup_cache (const char *toset, const char *fromset,
-		      struct __gconv_step **handle, size_t *nsteps, int flags)
-{
-  const struct gconvcache_header *header;
-  const char *strtab;
-  size_t fromidx;
-  size_t toidx;
-  const struct module_entry *modtab;
-  const struct module_entry *from_module;
-  const struct module_entry *to_module;
-  struct __gconv_step *result;
-
-  if (__gconv_cache == NULL)
-    /* We have no cache available.  */
-    return __GCONV_NODB;
-
-  header = (const struct gconvcache_header *) __gconv_cache;
-  strtab = (char *) __gconv_cache + header->string_offset;
-  modtab = (const struct module_entry *) ((char *) __gconv_cache
-					  + header->module_offset);
-
-  if (find_module_idx (fromset, &fromidx) != 0
-      || (header->module_offset + (fromidx + 1) * sizeof (struct module_entry)
-	  > cache_size))
-    return __GCONV_NOCONV;
-  from_module = &modtab[fromidx];
-
-  if (find_module_idx (toset, &toidx) != 0
-      || (header->module_offset + (toidx + 1) * sizeof (struct module_entry)
-	  > cache_size))
-    return __GCONV_NOCONV;
-  to_module = &modtab[toidx];
-
-  /* Avoid copy-only transformations if the user requests.   */
-  if (__builtin_expect (flags & GCONV_AVOID_NOCONV, 0) && fromidx == toidx)
-    return __GCONV_NOCONV;
-
-  /* If there are special conversions available examine them first.  */
-  if (fromidx != 0 && toidx != 0
-      && __builtin_expect (from_module->extra_offset, 0) != 0)
-    {
-      /* Search through the list to see whether there is a module
-	 matching the destination character set.  */
-      const struct extra_entry *extra;
-
-      /* Note the -1.  This is due to the offset added in iconvconfig.
-	 See there for more explanations.  */
-      extra = (const struct extra_entry *) ((char *) __gconv_cache
-					    + header->otherconv_offset
-					    + from_module->extra_offset - 1);
-      while (extra->module_cnt != 0
-	     && extra->module[extra->module_cnt - 1].outname_offset != toidx)
-	extra = (const struct extra_entry *) ((char *) extra
-					      + sizeof (struct extra_entry)
-					      + (extra->module_cnt
-						 * sizeof (struct extra_entry_module)));
-
-      if (extra->module_cnt != 0)
-	{
-	  /* Use the extra module.  First determine how many steps.  */
-	  char *fromname;
-	  int idx;
-
-	  *nsteps = extra->module_cnt;
-	  *handle = result =
-	    (struct __gconv_step *) malloc (extra->module_cnt
-					    * sizeof (struct __gconv_step));
-	  if (result == NULL)
-	    return __GCONV_NOMEM;
-
-	  fromname = (char *) strtab + from_module->canonname_offset;
-	  idx = 0;
-	  do
-	    {
-	      result[idx].__from_name = fromname;
-	      fromname = result[idx].__to_name =
-		(char *) strtab + modtab[extra->module[idx].outname_offset].canonname_offset;
-
-	      result[idx].__counter = 1;
-	      result[idx].__data = NULL;
-
-#ifndef STATIC_GCONV
-	      if (strtab[extra->module[idx].dir_offset] != '\0')
-		{
-		  /* Load the module, return handle for it.  */
-		  int res;
-
-		  res = find_module (strtab + extra->module[idx].dir_offset,
-				     strtab + extra->module[idx].name_offset,
-				     &result[idx]);
-		  if (__builtin_expect (res, __GCONV_OK) != __GCONV_OK)
-		    {
-		      /* Something went wrong.  */
-		      free (result);
-		      goto try_internal;
-		    }
-		}
-	      else
-#endif
-		/* It's a builtin transformation.  */
-		__gconv_get_builtin_trans (strtab
-					   + extra->module[idx].name_offset,
-					   &result[idx]);
-
-	    }
-	  while (++idx < extra->module_cnt);
-
-	  return __GCONV_OK;
-	}
-    }
-
- try_internal:
-  /* See whether we can convert via the INTERNAL charset.  */
-  if ((fromidx != 0 && __builtin_expect (from_module->fromname_offset, 1) == 0)
-      || (toidx != 0 && __builtin_expect (to_module->toname_offset, 1) == 0)
-      || (fromidx == 0 && toidx == 0))
-    /* Not possible.  Nothing we can do.  */
-    return __GCONV_NOCONV;
-
-  /* We will use up to two modules.  Always allocate room for two.  */
-  result = (struct __gconv_step *) malloc (2 * sizeof (struct __gconv_step));
-  if (result == NULL)
-    return __GCONV_NOMEM;
-
-  *handle = result;
-  *nsteps = 0;
-
-  /* Generate data structure for conversion to INTERNAL.  */
-  if (fromidx != 0)
-    {
-      result[0].__from_name = (char *) strtab + from_module->canonname_offset;
-      result[0].__to_name = (char *) "INTERNAL";
-
-      result[0].__counter = 1;
-      result[0].__data = NULL;
-
-#ifndef STATIC_GCONV
-      if (strtab[from_module->todir_offset] != '\0')
-	{
-	  /* Load the module, return handle for it.  */
-	  int res = find_module (strtab + from_module->todir_offset,
-				 strtab + from_module->toname_offset,
-				 &result[0]);
-	  if (__builtin_expect (res, __GCONV_OK) != __GCONV_OK)
-	    {
-	      /* Something went wrong.  */
-	      free (result);
-	      return res;
-	    }
-	}
-      else
-#endif
-	/* It's a builtin transformation.  */
-	__gconv_get_builtin_trans (strtab + from_module->toname_offset,
-				   &result[0]);
-
-      ++*nsteps;
-    }
-
-  /* Generate data structure for conversion from INTERNAL.  */
-  if (toidx != 0)
-    {
-      int idx = *nsteps;
-
-      result[idx].__from_name = (char *) "INTERNAL";
-      result[idx].__to_name = (char *) strtab + to_module->canonname_offset;
-
-      result[idx].__counter = 1;
-      result[idx].__data = NULL;
-
-#ifndef STATIC_GCONV
-      if (strtab[to_module->fromdir_offset] != '\0')
-	{
-	  /* Load the module, return handle for it.  */
-	  int res = find_module (strtab + to_module->fromdir_offset,
-				 strtab + to_module->fromname_offset,
-				 &result[idx]);
-	  if (__builtin_expect (res, __GCONV_OK) != __GCONV_OK)
-	    {
-	      /* Something went wrong.  */
-	      if (idx != 0)
-		__gconv_release_step (&result[0]);
-	      free (result);
-	      return res;
-	    }
-	}
-      else
-#endif
-	/* It's a builtin transformation.  */
-	__gconv_get_builtin_trans (strtab + to_module->fromname_offset,
-				   &result[idx]);
-
-      ++*nsteps;
-    }
-
-  return __GCONV_OK;
-}
-
-
-/* Free memory allocated for the transformation record.  */
-void
-internal_function
-__gconv_release_cache (struct __gconv_step *steps, size_t nsteps)
-{
-  if (__gconv_cache != NULL)
-    /* The only thing we have to deallocate is the record with the
-       steps.  */
-    free (steps);
-}
-
-
-/* Free all resources if necessary.  */
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  if (cache_malloced)
-    free (__gconv_cache);
-#ifdef _POSIX_MAPPED_FILES
-  else
-    __munmap (__gconv_cache, cache_size);
-#endif
-}
-
-text_set_element (__libc_subfreeres, free_mem);
diff --git a/newlib/libc/sys/linux/iconv/gconv_charset.h b/newlib/libc/sys/linux/iconv/gconv_charset.h
deleted file mode 100644
index 7066698..0000000
--- a/newlib/libc/sys/linux/iconv/gconv_charset.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Charset name normalization.
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <ctype.h>
-#include <locale.h>
-
-
-static inline void
-strip (char *wp, const char *s)
-{
-  int slash_count = 0;
-  char old_locale[20], *old_locale_p;
-
-  /* Set locale to default C locale. */
-  old_locale_p = setlocale(LC_ALL, "C");
-  strncpy(old_locale, old_locale_p, 20);
-  while (*s != '\0')
-    {
-      if (isalnum (*s)
-	  || *s == '_' || *s == '-' || *s == '.')
-	*wp++ = toupper (*s);
-      else if (*s == '/')
-	{
-	  if (++slash_count == 3)
-	    break;
-	  *wp++ = '/';
-	}
-      ++s;
-    }
-
-  while (slash_count++ < 2)
-    *wp++ = '/';
-
-  *wp = '\0';
-  setlocale(LC_ALL, old_locale);
-}
-
-
-static char * __attribute__ ((unused))
-upstr (char *dst, const char *str)
-{
-  char *cp = dst;
-  char old_locale[20], *old_locale_p;
-  /* Set locale to default C locale. */
-  old_locale_p = setlocale(LC_ALL, "C");
-  strncpy(old_locale, old_locale_p, 20);
-  while ((*cp++ = toupper (*str++)) != '\0')
-    /* nothing */;
-  setlocale(LC_ALL, old_locale);
-  return dst;
-}
-
-
-/* If NAME is an codeset alias expand it.  */
-extern int __gconv_compare_alias (const char *name1, const char *name2)
-     internal_function;
diff --git a/newlib/libc/sys/linux/iconv/gconv_close.c b/newlib/libc/sys/linux/iconv/gconv_close.c
deleted file mode 100644
index cc0ecd6..0000000
--- a/newlib/libc/sys/linux/iconv/gconv_close.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Release any resource associated with given conversion descriptor.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stdlib.h>
-
-#include <gconv_int.h>
-
-
-int
-internal_function
-__gconv_close (__gconv_t cd)
-{
-  struct __gconv_step *srunp;
-  struct __gconv_step_data *drunp;
-  size_t nsteps;
-
-  /* Free all resources by calling destructor functions and release
-     the implementations.  */
-  srunp = cd->__steps;
-  nsteps = cd->__nsteps;
-  drunp = cd->__data;
-  do
-    {
-      struct __gconv_trans_data *transp;
-
-      transp = drunp->__trans;
-      while (transp != NULL)
-	{
-	  struct __gconv_trans_data *curp = transp;
-	  transp = transp->__next;
-
-	  if (__builtin_expect (curp->__trans_end_fct != NULL, 0))
-	    curp->__trans_end_fct (curp->__data);
-
-	  free (curp);
-	}
-
-      if (!(drunp->__flags & __GCONV_IS_LAST) && drunp->__outbuf != NULL)
-	free (drunp->__outbuf);
-    }
-  while (!((drunp++)->__flags & __GCONV_IS_LAST));
-
-  /* Free the data allocated for the descriptor.  */
-  free (cd);
-
-  /* Close the participating modules.  */
-  return __gconv_close_transform (srunp, nsteps);
-}
diff --git a/newlib/libc/sys/linux/iconv/gconv_conf.c b/newlib/libc/sys/linux/iconv/gconv_conf.c
deleted file mode 100644
index c714102..0000000
--- a/newlib/libc/sys/linux/iconv/gconv_conf.c
+++ /dev/null
@@ -1,680 +0,0 @@
-/* Handle configuration data.
-   Copyright (C) 1997,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <search.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdio_ext.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/param.h>
-
-#include <dirent.h>
-#include <gconv_int.h>
-
-/* This is the default path where we look for module lists.  */
-static const char default_gconv_path[] = GCONV_PATH;
-
-/* The path elements, as determined by the __gconv_get_path function.
-   All path elements end in a slash.  */
-struct path_elem *__gconv_path_elem;
-/* Maximum length of a single path element in __gconv_path_elem.  */
-size_t __gconv_max_path_elem_len;
-
-/* We use the following struct if we couldn't allocate memory.  */
-static const struct path_elem empty_path_elem;
-
-/* Name of the file containing the module information in the directories
-   along the path.  */
-static const char gconv_conf_filename[] = "gconv-modules";
-
-/* Filename extension for the modules.  */
-#ifndef MODULE_EXT
-# define MODULE_EXT ".so"
-#endif
-static const char gconv_module_ext[] = MODULE_EXT;
-
-/* We have a few builtin transformations.  */
-static struct gconv_module builtin_modules[] =
-{
-#define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, MinF, MaxF, \
-			       MinT, MaxT) \
-  {									      \
-    from_string: From,							      \
-    to_string: To,							      \
-    cost_hi: Cost,							      \
-    cost_lo: INT_MAX,							      \
-    module_name: Name							      \
-  },
-#define BUILTIN_ALIAS(From, To)
-
-#include "gconv_builtin.h"
-};
-
-#undef BUILTIN_TRANSFORMATION
-#undef BUILTIN_ALIAS
-
-static const char *builtin_aliases[] =
-{
-#define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, MinF, MaxF, \
-			       MinT, MaxT)
-#define BUILTIN_ALIAS(From, To) From " " To,
-
-#include "gconv_builtin.h"
-};
-
-#ifdef USE_IN_LIBIO
-# include <libio/libioP.h>
-# define __getdelim(line, len, c, fp) _IO_getdelim (line, len, c, fp)
-#endif
-
-
-/* Value of the GCONV_PATH environment variable.  */
-const char *__gconv_path_envvar;
-
-
-/* Test whether there is already a matching module known.  */
-static int
-internal_function
-detect_conflict (const char *alias)
-{
-  struct gconv_module *node = __gconv_modules_db;
-
-  while (node != NULL)
-    {
-      int cmpres = strcmp (alias, node->from_string);
-
-      if (cmpres == 0)
-	/* We have a conflict.  */
-	return 1;
-      else if (cmpres < 0)
-	node = node->left;
-      else
-	node = node->right;
-    }
-
-  return node != NULL;
-}
-
-
-/* Add new alias.  */
-static inline void
-add_alias (char *rp, void *modules)
-{
-  /* We now expect two more string.  The strings are normalized
-     (converted to UPPER case) and strored in the alias database.  */
-  struct gconv_alias *new_alias;
-  char *from, *to, *wp;
-  char old_locale[20], *old_locale_p;
-
-  /* Set locale to default C locale. */
-  old_locale_p = setlocale(LC_ALL, "C");
-  strncpy(old_locale, old_locale_p, 20);
-
-  while (isspace (*rp))
-    ++rp;
-  from = wp = rp;
-  while (*rp != '\0' && !isspace (*rp))
-    *wp++ = toupper (*rp++);
-  if (*rp == '\0')
-    {
-      setlocale(LC_ALL, old_locale);
-      /* There is no `to' string on the line.  Ignore it.  */
-      return;
-    }
-  *wp++ = '\0';
-  to = ++rp;
-  while (isspace (*rp))
-    ++rp;
-  while (*rp != '\0' && !isspace (*rp))
-    *wp++ = toupper (*rp++);
-  if (to == wp)
-    {
-      setlocale(LC_ALL, old_locale);
-      /* No `to' string, ignore the line.  */
-      return;
-    }
-  *wp++ = '\0';
-
-  /* Test whether this alias conflicts with any available module.  */
-  if (detect_conflict (from))
-    {
-      setlocale(LC_ALL, old_locale);
-      /* It does conflict, don't add the alias.  */
-      return;
-    }
-
-  new_alias = (struct gconv_alias *) malloc (sizeof (struct gconv_alias) + (wp - from));
-  if (new_alias != NULL)
-    {
-      void **inserted;
-
-      new_alias->fromname = memcpy ((char *) new_alias
-				    + sizeof (struct gconv_alias),
-				    from, wp - from);
-      new_alias->toname = new_alias->fromname + (to - from);
-
-      inserted = (void **) tsearch (new_alias, &__gconv_alias_db,
-				      __gconv_alias_compare);
-      if (inserted == NULL || *inserted != new_alias)
-	/* Something went wrong, free this entry.  */
-	free (new_alias);
-    }
-  setlocale(LC_ALL, old_locale);
-}
-
-
-/* Insert a data structure for a new module in the search tree.  */
-static inline void
-internal_function
-insert_module (struct gconv_module *newp, int tobefreed)
-{
-  struct gconv_module **rootp = &__gconv_modules_db;
-
-  while (*rootp != NULL)
-    {
-      struct gconv_module *root = *rootp;
-      int cmpres;
-
-      cmpres = strcmp (newp->from_string, root->from_string);
-      if (cmpres == 0)
-	{
-	  /* Both strings are identical.  Insert the string at the
-	     end of the `same' list if it is not already there.  */
-	  while (strcmp (newp->from_string, root->from_string) != 0
-		 || strcmp (newp->to_string, root->to_string) != 0)
-	    {
-	      rootp = &root->same;
-	      root = *rootp;
-	      if (root == NULL)
-		break;
-	    }
-
-	  if (root != NULL)
-	    {
-	      /* This is a no new conversion.  But maybe the cost is
-		 better.  */
-	      if (newp->cost_hi < root->cost_hi
-		  || (newp->cost_hi == root->cost_hi
-		      && newp->cost_lo < root->cost_lo))
-		{
-		  newp->left = root->left;
-		  newp->right = root->right;
-		  newp->same = root->same;
-		  *rootp = newp;
-
-		  free (root);
-		}
-	      else if (tobefreed)
-		free (newp);
-	      return;
-	    }
-
-	  break;
-	}
-      else if (cmpres < 0)
-	rootp = &root->left;
-      else
-	rootp = &root->right;
-    }
-
-  /* Plug in the new node here.  */
-  *rootp = newp;
-}
-
-
-/* Add new module.  */
-static void
-internal_function
-add_module (char *rp, const char *directory, size_t dir_len, void **modules,
-	    size_t *nmodules, int modcounter)
-{
-  /* We expect now
-     1. `from' name
-     2. `to' name
-     3. filename of the module
-     4. an optional cost value
-  */
-  struct gconv_alias fake_alias;
-  struct gconv_module *new_module;
-  char *from, *to, *module, *wp;
-  int need_ext;
-  int cost_hi;
-  char old_locale[20], *old_locale_p;
-  char *old;
-  size_t len;
-  char *new;
-
-  /* Set locale to default C locale. */
-  old_locale_p = setlocale(LC_ALL, "C");
-  strncpy(old_locale, old_locale_p, 20);
-
-  while (isspace (*rp))
-    ++rp;
-  from = rp;
-  while (*rp != '\0' && !isspace (*rp))
-    {
-      *rp = toupper (*rp);
-      ++rp;
-    }
-  if (*rp == '\0')
-    {
-      setlocale(LC_ALL, old_locale);
-      return;
-    }
-  *rp++ = '\0';
-  to = wp = rp;
-  while (isspace (*rp))
-    {
-      setlocale(LC_ALL, old_locale);
-      ++rp;
-    }
-  while (*rp != '\0' && !isspace (*rp))
-    *wp++ = toupper (*rp++);
-  if (*rp == '\0')
-    {
-      setlocale(LC_ALL, old_locale);
-      return;
-    }
-  *wp++ = '\0';
-  do
-    ++rp;
-  while (isspace (*rp));
-  module = wp;
-  while (*rp != '\0' && !isspace (*rp))
-    *wp++ = *rp++;
-  if (*rp == '\0')
-    {
-      /* There is no cost, use one by default.  */
-      *wp++ = '\0';
-      cost_hi = 1;
-    }
-  else
-    {
-      /* There might be a cost value.  */
-      char *endp;
-
-      *wp++ = '\0';
-      cost_hi = strtol (rp, &endp, 10);
-      if (rp == endp || cost_hi < 1)
-	/* No useful information.  */
-	cost_hi = 1;
-    }
-
-  if (module[0] == '\0')
-    {
-      setlocale(LC_ALL, old_locale);
-      /* No module name given.  */
-      return;
-    }
-  if (module[0] == '/')
-    dir_len = 0;
-
-  /* See whether we must add the ending.  */
-  need_ext = 0;
-  if (wp - module < (ptrdiff_t) sizeof (gconv_module_ext)
-      || memcmp (wp - sizeof (gconv_module_ext), gconv_module_ext,
-		 sizeof (gconv_module_ext)) != 0)
-    /* We must add the module extension.  */
-    need_ext = sizeof (gconv_module_ext) - 1;
-
-  /* See whether we have already an alias with this name defined.  */
-  old = from;
-  len = strnlen (old, to - from);
-  new = (char *) alloca (len + 1);
-  new[len] = '\0';
-  fake_alias.fromname = (char *) memcpy (new, old, len);
-
-  if (tfind (&fake_alias, &__gconv_alias_db, __gconv_alias_compare) != NULL)
-    {
-      setlocale(LC_ALL, old_locale);
-      /* This module duplicates an alias.  */
-      return;
-    }
-
-  new_module = (struct gconv_module *) calloc (1,
-					       sizeof (struct gconv_module)
-					       + (wp - from)
-					       + dir_len + need_ext);
-  if (new_module != NULL)
-    {
-      char *tmp;
-
-      new_module->from_string = tmp = (char *) (new_module + 1);
-      tmp = memcpy (tmp, from, to - from);
-      tmp += (to - from);
-
-      new_module->to_string = tmp;
-      tmp = memcpy (tmp, to, module - to);
-      tmp += (module - to);
-
-      new_module->cost_hi = cost_hi;
-      new_module->cost_lo = modcounter;
-
-      new_module->module_name = tmp;
-
-      if (dir_len != 0)
-        {
-          tmp = memcpy (tmp, directory, dir_len);
-          tmp += dir_len;
-        }
-
-      tmp = memcpy (tmp, module, wp - module);
-      tmp += (wp - module);
-
-      if (need_ext)
-	memcpy (tmp - 1, gconv_module_ext, sizeof (gconv_module_ext));
-
-      /* Now insert the new module data structure in our search tree.  */
-      insert_module (new_module, 1);
-    }
-  setlocale(LC_ALL, old_locale);
-}
-
-
-/* Read the next configuration file.  */
-static void
-internal_function
-read_conf_file (const char *filename, const char *directory, size_t dir_len,
-		void **modules, size_t *nmodules)
-{
-  FILE *fp = fopen (filename, "r");
-  char *line = NULL;
-  size_t line_len = 0;
-  static int modcounter;
-  char old_locale[20], *old_locale_p;
-
-  /* Don't complain if a file is not present or readable, simply silently
-     ignore it.  */
-  if (fp == NULL)
-    return;
-
-  /* Set locale to default C locale. */
-  old_locale_p = setlocale(LC_ALL, "C");
-  strncpy(old_locale, old_locale_p, 20);
-
-  /* Process the known entries of the file.  Comments start with `#' and
-     end with the end of the line.  Empty lines are ignored.  */
-  while (!feof (fp))
-    {
-      char *rp, *endp, *word;
-      ssize_t n = __getdelim (&line, &line_len, '\n', fp);
-      if (n < 0)
-	/* An error occurred.  */
-	break;
-
-      rp = line;
-      /* Terminate the line (excluding comments or newline) by an NUL byte
-	 to simplify the following code.  */
-      endp = strchr (rp, '#');
-      if (endp != NULL)
-	*endp = '\0';
-      else
-	if (rp[n - 1] == '\n')
-	  rp[n - 1] = '\0';
-
-      while (isspace (*rp))
-	++rp;
-
-      /* If this is an empty line go on with the next one.  */
-      if (rp == endp)
-	continue;
-
-      word = rp;
-      while (*rp != '\0' && !isspace (*rp))
-	++rp;
-
-      if (rp - word == sizeof ("alias") - 1
-	  && memcmp (word, "alias", sizeof ("alias") - 1) == 0)
-	add_alias (rp, *modules);
-      else if (rp - word == sizeof ("module") - 1
-	       && memcmp (word, "module", sizeof ("module") - 1) == 0)
-	add_module (rp, directory, dir_len, modules, nmodules, modcounter++);
-      /* else */
-	/* Otherwise ignore the line.  */
-    }
-
-  free (line);
-
-  fclose (fp);
-
-  setlocale(LC_ALL, old_locale);
-}
-
-
-/* Determine the directories we are looking for data in.  */
-void
-__gconv_get_path (void)
-{
-  struct path_elem *result;
-  __LOCK_INIT(static, path_lock);
-
-#ifdef HAVE_DD_LOCK
-  __lock_acquire(path_lock);
-#endif
-
-  /* Make sure there wasn't a second thread doing it already.  */
-  result = (struct path_elem *) __gconv_path_elem;
-  if (result == NULL)
-    {
-      /* Determine the complete path first.  */
-      char *gconv_path;
-      size_t gconv_path_len;
-      char *elem;
-      char *oldp;
-      char *cp;
-      int nelems;
-      char *cwd;
-      size_t cwdlen;
-
-      if (__gconv_path_envvar == NULL)
-	{
-          char * old = default_gconv_path;
-          size_t len = strlen (old) + 1;
-          char *new = (char *) alloca (len);
-
-	  /* No user-defined path.  Make a modifiable copy of the
-	     default path.  */
-          gconv_path = (char *) memcpy (new, old, len);
-	  gconv_path_len = sizeof (default_gconv_path);
-	  cwd = NULL;
-	  cwdlen = 0;
-	}
-      else
-	{
-	  /* Append the default path to the user-defined path.  */
-	  size_t user_len = strlen (__gconv_path_envvar);
-          char *tmp;
-
-	  gconv_path_len = user_len + 1 + sizeof (default_gconv_path);
-	  gconv_path = alloca (gconv_path_len);
-          tmp = memcpy (gconv_path, __gconv_path_envvar,
-                        user_len);
-          tmp += user_len;
-          memcpy (tmp, ":", 1);
-          tmp += 1;
-	  memcpy (tmp,
-                  default_gconv_path, sizeof (default_gconv_path));
-
-	  cwd = getcwd (NULL, 0);
-	  cwdlen = strlen (cwd);
-	}
-      assert (default_gconv_path[0] == '/');
-
-      /* In a first pass we calculate the number of elements.  */
-      oldp = NULL;
-      cp = strchr (gconv_path, ':');
-      nelems = 1;
-      while (cp != NULL)
-	{
-	  if (cp != oldp + 1)
-	    ++nelems;
-	  oldp = cp;
-	  cp =  strchr (cp + 1, ':');
-	}
-
-      /* Allocate the memory for the result.  */
-      result = (struct path_elem *) malloc ((nelems + 1)
-					    * sizeof (struct path_elem)
-					    + gconv_path_len + nelems
-					    + (nelems - 1) * (cwdlen + 1));
-      if (result != NULL)
-	{
-	  char *strspace = (char *) &result[nelems + 1];
-	  int n = 0;
-
-	  /* Separate the individual parts.  */
-	  __gconv_max_path_elem_len = 0;
-	  elem = strtok_r (gconv_path, ":", &gconv_path);
-	  assert (elem != NULL);
-	  do
-	    {
-	      result[n].name = strspace;
-	      if (elem[0] != '/')
-		{
-		  assert (cwd != NULL);
-		  strspace = memcpy (strspace, cwd, cwdlen);
-                  strspace += cwdlen;
-		  *strspace++ = '/';
-		}
-	      strspace = strcpy (strspace, elem);
-              while(*strspace != '\0') strspace++;
-
-	      if (strspace[-1] != '/')
-		*strspace++ = '/';
-
-	      result[n].len = strspace - result[n].name;
-	      if (result[n].len > __gconv_max_path_elem_len)
-		__gconv_max_path_elem_len = result[n].len;
-
-	      *strspace++ = '\0';
-	      ++n;
-	    }
-	  while ((elem = strtok_r (NULL, ":", &gconv_path)) != NULL);
-
-	  result[n].name = NULL;
-	  result[n].len = 0;
-	}
-
-      __gconv_path_elem = result ?: (struct path_elem *) &empty_path_elem;
-
-      if (cwd != NULL)
-	free (cwd);
-    }
-
-#ifdef HAVE_DD_LOCK
-  __lock_release(path_lock);
-#endif
-}
-
-
-/* Read all configuration files found in the user-specified and the default
-   path.  */
-void
-__gconv_read_conf (void)
-{
-  void *modules = NULL;
-  size_t nmodules = 0;
-  int save_errno = errno;
-  size_t cnt;
-  char *filename;
-  char *tmp;
-  const char *elem;
-  size_t elem_len;
-
-  /* First see whether we should use the cache.  */
-  if (__gconv_load_cache () == 0)
-    {
-      /* Yes, we are done.  */
-      __set_errno (save_errno);
-      return;
-    }
-
-#ifndef STATIC_GCONV
-  /* Find out where we have to look.  */
-  if (__gconv_path_elem == NULL)
-    __gconv_get_path ();
-
-  for (cnt = 0; __gconv_path_elem[cnt].name != NULL; ++cnt)
-    {
-      elem = __gconv_path_elem[cnt].name;
-      elem_len = __gconv_path_elem[cnt].len;
-
-      /* No slash needs to be inserted between elem and gconv_conf_filename;
-	 elem already ends in a slash.  */
-      filename = alloca (elem_len + sizeof (gconv_conf_filename));
-      tmp = memcpy (filename, elem, elem_len);
-      tmp += elem_len;
-      memcpy (tmp, gconv_conf_filename, sizeof (gconv_conf_filename));
-
-      /* Read the next configuration file.  */
-      read_conf_file (filename, elem, elem_len, &modules, &nmodules);
-    }
-#endif
-
-  /* Add the internal modules.  */
-  for (cnt = 0; cnt < sizeof (builtin_modules) / sizeof (builtin_modules[0]);
-       ++cnt)
-    {
-      struct gconv_alias fake_alias;
-
-      fake_alias.fromname = (char *) builtin_modules[cnt].from_string;
-
-      if (tfind (&fake_alias, &__gconv_alias_db, __gconv_alias_compare)
-	  != NULL)
-	/* It'll conflict so don't add it.  */
-	continue;
-
-      insert_module (&builtin_modules[cnt], 0);
-    }
-
-  /* Add aliases for builtin conversions.  */
-  cnt = sizeof (builtin_aliases) / sizeof (builtin_aliases[0]);
-  while (cnt > 0)
-    {
-      char * old = builtin_aliases[--cnt];
-      size_t len = strlen (old) + 1;
-      char *new = (char *) alloca (len);
-      char *copy = (char *) memcpy (new, old, len);
-
-      add_alias (copy, modules);
-    }
-
-  /* Restore the error number.  */
-  __set_errno (save_errno);
-}
-
-
-
-/* Free all resources if necessary.  */
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  if (__gconv_path_elem != NULL && __gconv_path_elem != &empty_path_elem)
-    free ((void *) __gconv_path_elem);
-}
-
-text_set_element (__libc_subfreeres, free_mem);
diff --git a/newlib/libc/sys/linux/iconv/gconv_db.c b/newlib/libc/sys/linux/iconv/gconv_db.c
deleted file mode 100644
index 749995e..0000000
--- a/newlib/libc/sys/linux/iconv/gconv_db.c
+++ /dev/null
@@ -1,803 +0,0 @@
-/* Provide access to the collection of available transformation modules.
-   Copyright (C) 1997,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <limits.h>
-#include <search.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-#include <dirent.h>
-
-#include <dlfcn.h>
-#include <gconv_int.h>
-#include <gconv_charset.h>
-
-
-/* Simple data structure for alias mapping.  We have two names, `from'
-   and `to'.  */
-void *__gconv_alias_db;
-
-/* Array with available modules.  */
-struct gconv_module *__gconv_modules_db;
-
-/* We modify global data.   */
-__LOCK_INIT(static, lock);
-
-
-/* Function for searching alias.  */
-int
-__gconv_alias_compare (const void *p1, const void *p2)
-{
-  const struct gconv_alias *s1 = (const struct gconv_alias *) p1;
-  const struct gconv_alias *s2 = (const struct gconv_alias *) p2;
-  return strcmp (s1->fromname, s2->fromname);
-}
-
-
-/* To search for a derivation we create a list of intermediate steps.
-   Each element contains a pointer to the element which precedes it
-   in the derivation order.  */
-struct derivation_step
-{
-  const char *result_set;
-  size_t result_set_len;
-  int cost_lo;
-  int cost_hi;
-  struct gconv_module *code;
-  struct derivation_step *last;
-  struct derivation_step *next;
-};
-
-#define NEW_STEP(result, hi, lo, module, last_mod) \
-  ({ struct derivation_step *newp = alloca (sizeof (struct derivation_step)); \
-     newp->result_set = result;						      \
-     newp->result_set_len = strlen (result);				      \
-     newp->cost_hi = hi;						      \
-     newp->cost_lo = lo;						      \
-     newp->code = module;						      \
-     newp->last = last_mod;						      \
-     newp->next = NULL;							      \
-     newp; })
-
-
-/* If a specific transformation is used more than once we should not need
-   to start looking for it again.  Instead cache each successful result.  */
-struct known_derivation
-{
-  const char *from;
-  const char *to;
-  struct __gconv_step *steps;
-  size_t nsteps;
-};
-
-/* Compare function for database of found derivations.  */
-static int
-derivation_compare (const void *p1, const void *p2)
-{
-  const struct known_derivation *s1 = (const struct known_derivation *) p1;
-  const struct known_derivation *s2 = (const struct known_derivation *) p2;
-  int result;
-
-  result = strcmp (s1->from, s2->from);
-  if (result == 0)
-    result = strcmp (s1->to, s2->to);
-  return result;
-}
-
-/* The search tree for known derivations.  */
-static void *known_derivations;
-
-/* Look up whether given transformation was already requested before.  */
-static int
-internal_function
-derivation_lookup (const char *fromset, const char *toset,
-		   struct __gconv_step **handle, size_t *nsteps)
-{
-  struct known_derivation key = { fromset, toset, NULL, 0 };
-  struct known_derivation **result;
-
-  result = tfind (&key, &known_derivations, derivation_compare);
-
-  if (result == NULL)
-    return __GCONV_NOCONV;
-
-  *handle = (*result)->steps;
-  *nsteps = (*result)->nsteps;
-
-  /* Please note that we return GCONV_OK even if the last search for
-     this transformation was unsuccessful.  */
-  return __GCONV_OK;
-}
-
-/* Add new derivation to list of known ones.  */
-static void
-internal_function
-add_derivation (const char *fromset, const char *toset,
-		struct __gconv_step *handle, size_t nsteps)
-{
-  struct known_derivation *new_deriv;
-  size_t fromset_len = strlen (fromset) + 1;
-  size_t toset_len = strlen (toset) + 1;
-
-  new_deriv = (struct known_derivation *)
-    malloc (sizeof (struct known_derivation) + fromset_len + toset_len);
-  if (new_deriv != NULL)
-    {
-      char *tmp;
-      new_deriv->from = (char *) (new_deriv + 1);
-      tmp = memcpy (new_deriv + 1, fromset, fromset_len);
-      tmp += fromset_len;
-
-      new_deriv->to = memcpy (tmp,
-			      toset, toset_len);
-
-      new_deriv->steps = handle;
-      new_deriv->nsteps = nsteps;
-
-      if (tsearch (new_deriv, &known_derivations, derivation_compare)
-	  == NULL)
-	/* There is some kind of memory allocation problem.  */
-	free (new_deriv);
-    }
-  /* Please note that we don't complain if the allocation failed.  This
-     is not tragically but in case we use the memory debugging facilities
-     not all memory will be freed.  */
-}
-
-static void
-free_derivation (void *p)
-{
-  struct known_derivation *deriv = (struct known_derivation *) p;
-  size_t cnt;
-
-  for (cnt = 0; cnt < deriv->nsteps; ++cnt)
-    if (deriv->steps[cnt].__counter > 0
-	&& deriv->steps[cnt].__end_fct != NULL)
-      deriv->steps[cnt].__end_fct (&deriv->steps[cnt]);
-
-  /* Free the name strings.  */
-  free ((char *) deriv->steps[0].__from_name);
-  free ((char *) deriv->steps[deriv->nsteps - 1].__to_name);
-
-  free ((struct __gconv_step *) deriv->steps);
-  free (deriv);
-}
-
-
-/* Decrement the reference count for a single step in a steps array.  */
-void
-internal_function
-__gconv_release_step (struct __gconv_step *step)
-{
-  if (--step->__counter == 0)
-    {
-      /* Call the destructor.  */
-      if (step->__end_fct != NULL)
-	step->__end_fct (step);
-
-#ifndef STATIC_GCONV
-      /* Skip builtin modules; they are not reference counted.  */
-      if (step->__shlib_handle != NULL)
-	{
-	  /* Release the loaded module.  */
-	  __gconv_release_shlib (step->__shlib_handle);
-	  step->__shlib_handle = NULL;
-	}
-#endif
-    }
-}
-
-static int
-internal_function
-gen_steps (struct derivation_step *best, const char *toset,
-	   const char *fromset, struct __gconv_step **handle, size_t *nsteps)
-{
-  size_t step_cnt = 0;
-  struct __gconv_step *result;
-  struct derivation_step *current;
-  int status = __GCONV_NOMEM;
-
-  /* First determine number of steps.  */
-  for (current = best; current->last != NULL; current = current->last)
-    ++step_cnt;
-
-  result = (struct __gconv_step *) malloc (sizeof (struct __gconv_step)
-					   * step_cnt);
-  if (result != NULL)
-    {
-      int failed = 0;
-
-      status = __GCONV_OK;
-      *nsteps = step_cnt;
-      current = best;
-      while (step_cnt-- > 0)
-	{
-	  result[step_cnt].__from_name = (step_cnt == 0
-					  ? strdup (fromset)
-					  : (char *)current->last->result_set);
-	  result[step_cnt].__to_name = (step_cnt + 1 == *nsteps
-					? strdup (current->result_set)
-					: result[step_cnt + 1].__from_name);
-
-	  result[step_cnt].__counter = 1;
-	  result[step_cnt].__data = NULL;
-
-#ifndef STATIC_GCONV
-	  if (current->code->module_name[0] == '/')
-	    {
-	      /* Load the module, return handle for it.  */
-	      struct __gconv_loaded_object *shlib_handle =
-		__gconv_find_shlib (current->code->module_name);
-
-	      if (shlib_handle == NULL)
-		{
-		  failed = 1;
-		  break;
-		}
-
-	      result[step_cnt].__shlib_handle = shlib_handle;
-	      result[step_cnt].__modname = shlib_handle->name;
-	      result[step_cnt].__fct = shlib_handle->fct;
-	      result[step_cnt].__init_fct = shlib_handle->init_fct;
-	      result[step_cnt].__end_fct = shlib_handle->end_fct;
-
-	      /* Call the init function.  */
-	      if (result[step_cnt].__init_fct != NULL)
-		{
-		  status = result[step_cnt].__init_fct (&result[step_cnt]);
-
-		  if (__builtin_expect (status, __GCONV_OK) != __GCONV_OK)
-		    {
-		      failed = 1;
-		      /* Make sure we unload this modules.  */
-		      --step_cnt;
-		      result[step_cnt].__end_fct = NULL;
-		      break;
-		    }
-		}
-	    }
-	  else
-#endif
-	    /* It's a builtin transformation.  */
-	    __gconv_get_builtin_trans (current->code->module_name,
-				       &result[step_cnt]);
-
-	  current = current->last;
-	}
-
-      if (__builtin_expect (failed, 0) != 0)
-	{
-	  /* Something went wrong while initializing the modules.  */
-	  while (++step_cnt < *nsteps)
-	    __gconv_release_step (&result[step_cnt]);
-	  free (result);
-	  *nsteps = 0;
-	  *handle = NULL;
-	  if (status == __GCONV_OK)
-	    status = __GCONV_NOCONV;
-	}
-      else
-	*handle = result;
-    }
-  else
-    {
-      *nsteps = 0;
-      *handle = NULL;
-    }
-
-  return status;
-}
-
-
-#ifndef STATIC_GCONV
-static int
-internal_function
-increment_counter (struct __gconv_step *steps, size_t nsteps)
-{
-  /* Increment the user counter.  */
-  size_t cnt = nsteps;
-  int result = __GCONV_OK;
-
-  while (cnt-- > 0)
-    {
-      struct __gconv_step *step = &steps[cnt];
-
-      if (step->__counter++ == 0)
-	{
-	  /* Skip builtin modules.  */
-	  if (step->__modname != NULL)
-	    {
-	      /* Reopen a previously used module.  */
-	      step->__shlib_handle = __gconv_find_shlib (step->__modname);
-	      if (step->__shlib_handle == NULL)
-		{
-		  /* Oops, this is the second time we use this module
-		     (after unloading) and this time loading failed!?  */
-		  --step->__counter;
-		  while (++cnt < nsteps)
-		    __gconv_release_step (&steps[cnt]);
-		  result = __GCONV_NOCONV;
-		  break;
-		}
-
-	      /* The function addresses defined by the module may
-		 have changed.  */
-	      step->__fct = step->__shlib_handle->fct;
-	      step->__init_fct = step->__shlib_handle->init_fct;
-	      step->__end_fct = step->__shlib_handle->end_fct;
-	    }
-
-	  if (step->__init_fct != NULL)
-	    step->__init_fct (step);
-	}
-    }
-  return result;
-}
-#endif
-
-
-/* The main function: find a possible derivation from the `fromset' (either
-   the given name or the alias) to the `toset' (again with alias).  */
-static int
-internal_function
-find_derivation (const char *toset, const char *toset_expand,
-		 const char *fromset, const char *fromset_expand,
-		 struct __gconv_step **handle, size_t *nsteps)
-{
-  struct derivation_step *first, *current, **lastp, *solution = NULL;
-  int best_cost_hi = INT_MAX;
-  int best_cost_lo = INT_MAX;
-  int result;
-
-  /* Look whether an earlier call to `find_derivation' has already
-     computed a possible derivation.  If so, return it immediately.  */
-  result = derivation_lookup (fromset_expand ?: fromset, toset_expand ?: toset,
-			      handle, nsteps);
-  if (result == __GCONV_OK)
-    {
-#ifndef STATIC_GCONV
-      result = increment_counter (*handle, *nsteps);
-#endif
-      return result;
-    }
-
-  /* The task is to find a sequence of transformations, backed by the
-     existing modules - whether builtin or dynamically loadable -,
-     starting at `fromset' (or `fromset_expand') and ending at `toset'
-     (or `toset_expand'), and with minimal cost.
-
-     For computer scientists, this is a shortest path search in the
-     graph where the nodes are all possible charsets and the edges are
-     the transformations listed in __gconv_modules_db.
-
-     For now we use a simple algorithm with quadratic runtime behaviour.
-     A breadth-first search, starting at `fromset' and `fromset_expand'.
-     The list starting at `first' contains all nodes that have been
-     visited up to now, in the order in which they have been visited --
-     excluding the goal nodes `toset' and `toset_expand' which get
-     managed in the list starting at `solution'.
-     `current' walks through the list starting at `first' and looks
-     which nodes are reachable from the current node, adding them to
-     the end of the list [`first' or `solution' respectively] (if
-     they are visited the first time) or updating them in place (if
-     they have have already been visited).
-     In each node of either list, cost_lo and cost_hi contain the
-     minimum cost over any paths found up to now, starting at `fromset'
-     or `fromset_expand', ending at that node.  best_cost_lo and
-     best_cost_hi represent the minimum over the elements of the
-     `solution' list.  */
-
-  if (fromset_expand != NULL)
-    {
-      first = NEW_STEP (fromset_expand, 0, 0, NULL, NULL);
-      first->next = NEW_STEP (fromset, 0, 0, NULL, NULL);
-      lastp = &first->next->next;
-    }
-  else
-    {
-      first = NEW_STEP (fromset, 0, 0, NULL, NULL);
-      lastp = &first->next;
-    }
-
-  for (current = first; current != NULL; current = current->next)
-    {
-      /* Now match all the available module specifications against the
-         current charset name.  If any of them matches check whether
-         we already have a derivation for this charset.  If yes, use the
-         one with the lower costs.  Otherwise add the new charset at the
-         end.
-
-	 The module database is organized in a tree form which allows
-	 searching for prefixes.  So we search for the first entry with a
-	 matching prefix and any other matching entry can be found from
-	 this place.  */
-      struct gconv_module *node;
-
-      /* Maybe it is not necessary anymore to look for a solution for
-	 this entry since the cost is already as high (or higher) as
-	 the cost for the best solution so far.  */
-      if (current->cost_hi > best_cost_hi
-	  || (current->cost_hi == best_cost_hi
-	      && current->cost_lo >= best_cost_lo))
-	continue;
-
-      node = __gconv_modules_db;
-      while (node != NULL)
-	{
-	  int cmpres = strcmp (current->result_set, node->from_string);
-	  if (cmpres == 0)
-	    {
-	      /* Walk through the list of modules with this prefix and
-		 try to match the name.  */
-	      struct gconv_module *runp;
-
-	      /* Check all the modules with this prefix.  */
-	      runp = node;
-	      do
-		{
-		  const char *result_set = (strcmp (runp->to_string, "-") == 0
-					    ? (toset_expand ?: toset)
-					    : runp->to_string);
-		  int cost_hi = runp->cost_hi + current->cost_hi;
-		  int cost_lo = runp->cost_lo + current->cost_lo;
-		  struct derivation_step *step;
-
-		  /* We managed to find a derivation.  First see whether
-		     we have reached one of the goal nodes.  */
-		  if (strcmp (result_set, toset) == 0
-		      || (toset_expand != NULL
-			  && strcmp (result_set, toset_expand) == 0))
-		    {
-		      /* Append to the `solution' list if there
-			 is no entry with this name.  */
-		      for (step = solution; step != NULL; step = step->next)
-			if (strcmp (result_set, step->result_set) == 0)
-			  break;
-
-		      if (step == NULL)
-			{
-			  step = NEW_STEP (result_set,
-					   cost_hi, cost_lo,
-					   runp, current);
-			  step->next = solution;
-			  solution = step;
-			}
-		      else if (step->cost_hi > cost_hi
-			       || (step->cost_hi == cost_hi
-				   && step->cost_lo > cost_lo))
-			{
-			  /* A better path was found for the node,
-			     on the `solution' list.  */
-			  step->code = runp;
-			  step->last = current;
-			  step->cost_hi = cost_hi;
-			  step->cost_lo = cost_lo;
-			}
-
-		      /* Update best_cost accordingly.  */
-		      if (cost_hi < best_cost_hi
-			  || (cost_hi == best_cost_hi
-			      && cost_lo < best_cost_lo))
-			{
-			  best_cost_hi = cost_hi;
-			  best_cost_lo = cost_lo;
-			}
-		    }
-		  else if (cost_hi < best_cost_hi
-			   || (cost_hi == best_cost_hi
-			       && cost_lo < best_cost_lo))
-		    {
-		      /* Append at the end of the `first' list if there
-			 is no entry with this name.  */
-		      for (step = first; step != NULL; step = step->next)
-			if (strcmp (result_set, step->result_set) == 0)
-			  break;
-
-		      if (step == NULL)
-			{
-			  *lastp = NEW_STEP (result_set,
-					     cost_hi, cost_lo,
-					     runp, current);
-			  lastp = &(*lastp)->next;
-			}
-		      else if (step->cost_hi > cost_hi
-			       || (step->cost_hi == cost_hi
-				   && step->cost_lo > cost_lo))
-			{
-			  /* A better path was found for the node,
-			     on the `first' list.  */
-			  step->code = runp;
-			  step->last = current;
-
-			  /* Update the cost for all steps.  */
-			  for (step = first; step != NULL;
-			       step = step->next)
-			    /* But don't update the start nodes.  */
-			    if (step->code != NULL)
-			      {
-				struct derivation_step *back;
-				int hi, lo;
-
-				hi = step->code->cost_hi;
-				lo = step->code->cost_lo;
-
-				for (back = step->last; back->code != NULL;
-				     back = back->last)
-				  {
-				    hi += back->code->cost_hi;
-				    lo += back->code->cost_lo;
-				  }
-
-				step->cost_hi = hi;
-				step->cost_lo = lo;
-			      }
-
-			  /* Likewise for the nodes on the solution list.
-			     Also update best_cost accordingly.  */
-			  for (step = solution; step != NULL;
-			       step = step->next)
-			    {
-			      step->cost_hi = (step->code->cost_hi
-					       + step->last->cost_hi);
-			      step->cost_lo = (step->code->cost_lo
-					       + step->last->cost_lo);
-
-			      if (step->cost_hi < best_cost_hi
-				  || (step->cost_hi == best_cost_hi
-				      && step->cost_lo < best_cost_lo))
-				{
-				  best_cost_hi = step->cost_hi;
-				  best_cost_lo = step->cost_lo;
-				}
-			    }
-			}
-		    }
-
-		  runp = runp->same;
-		}
-	      while (runp != NULL);
-
-	      break;
-	    }
-	  else if (cmpres < 0)
-	    node = node->left;
-	  else
-	    node = node->right;
-	}
-    }
-
-  if (solution != NULL)
-    {
-      /* We really found a way to do the transformation.  */
-
-      /* Choose the best solution.  This is easy because we know that
-	 the solution list has at most length 2 (one for every possible
-	 goal node).  */
-      if (solution->next != NULL)
-	{
-	  struct derivation_step *solution2 = solution->next;
-
-	  if (solution2->cost_hi < solution->cost_hi
-	      || (solution2->cost_hi == solution->cost_hi
-		  && solution2->cost_lo < solution->cost_lo))
-	    solution = solution2;
-	}
-
-      /* Now build a data structure describing the transformation steps.  */
-      result = gen_steps (solution, toset_expand ?: toset,
-			  fromset_expand ?: fromset, handle, nsteps);
-    }
-  else
-    {
-      /* We haven't found a transformation.  Clear the result values.  */
-      *handle = NULL;
-      *nsteps = 0;
-    }
-
-  /* Add result in any case to list of known derivations.  */
-  add_derivation (fromset_expand ?: fromset, toset_expand ?: toset,
-		  *handle, *nsteps);
-
-  return result;
-}
-
-
-/* Control of initialization.  */
-__libc_once_define (static, once);
-
-
-static const char *
-do_lookup_alias (const char *name)
-{
-  struct gconv_alias key;
-  struct gconv_alias **found;
-
-  key.fromname = (char *) name;
-  found = tfind (&key, &__gconv_alias_db, __gconv_alias_compare);
-  return found != NULL ? (*found)->toname : NULL;
-}
-
-
-int
-internal_function
-__gconv_compare_alias (const char *name1, const char *name2)
-{
-  int result;
-
-  /* Ensure that the configuration data is read.  */
-  __libc_once (once, __gconv_read_conf);
-
-  if (__gconv_compare_alias_cache (name1, name2, &result) != 0)
-    result = strcmp (do_lookup_alias (name1) ?: name1,
-		     do_lookup_alias (name2) ?: name2);
-
-  return result;
-}
-
-
-int
-internal_function
-__gconv_find_transform (const char *toset, const char *fromset,
-			struct __gconv_step **handle, size_t *nsteps,
-			int flags)
-{
-  const char *fromset_expand;
-  const char *toset_expand;
-  int result;
-
-  /* Ensure that the configuration data is read.  */
-  __libc_once (once, __gconv_read_conf);
-
-  /* Acquire the lock.  */
-#ifdef HAVE_DD_LOCK
-  __lock_acquire(lock);
-#endif
-
-  result = __gconv_lookup_cache (toset, fromset, handle, nsteps, flags);
-  if (result != __GCONV_NODB)
-    {
-      /* We have a cache and could resolve the request, successful or not.  */
-#ifdef HAVE_DD_LOCK
-      __lock_release(lock);
-#endif
-
-      return result;
-    }
-
-  /* If we don't have a module database return with an error.  */
-  if (__gconv_modules_db == NULL)
-    {
-#ifdef HAVE_DD_LOCK
-  __lock_release(lock);
-#endif
-
-      return __GCONV_NOCONV;
-    }
-
-  /* See whether the names are aliases.  */
-  fromset_expand = do_lookup_alias (fromset);
-  toset_expand = do_lookup_alias (toset);
-
-  if (__builtin_expect (flags & GCONV_AVOID_NOCONV, 0)
-      /* We are not supposed to create a pseudo transformation (means
-	 copying) when the input and output character set are the same.  */
-      && (strcmp (toset, fromset) == 0
-	  || (toset_expand != NULL && strcmp (toset_expand, fromset) == 0)
-	  || (fromset_expand != NULL
-	      && (strcmp (toset, fromset_expand) == 0
-		  || (toset_expand != NULL
-		      && strcmp (toset_expand, fromset_expand) == 0)))))
-    {
-      /* Both character sets are the same.  */
-#ifdef HAVE_DD_LOCK
-  __lock_release(lock);
-#endif
-
-      return __GCONV_NOCONV;
-    }
-
-  result = find_derivation (toset, toset_expand, fromset, fromset_expand,
-			    handle, nsteps);
-
-  /* Release the lock.  */
-#ifdef HAVE_DD_LOCK
-  __lock_release(lock);
-#endif
-
-
-  /* The following code is necessary since `find_derivation' will return
-     GCONV_OK even when no derivation was found but the same request
-     was processed before.  I.e., negative results will also be cached.  */
-  return (result == __GCONV_OK
-	  ? (*handle == NULL ? __GCONV_NOCONV : __GCONV_OK)
-	  : result);
-}
-
-
-/* Release the entries of the modules list.  */
-int
-internal_function
-__gconv_close_transform (struct __gconv_step *steps, size_t nsteps)
-{
-  int result = __GCONV_OK;
-  size_t cnt;
-
-  /* Acquire the lock.  */
-#ifdef HAVE_DD_LOCK
-  __lock_acquire(lock);
-#endif
-
-
-#ifndef STATIC_GCONV
-  cnt = nsteps;
-  while (cnt-- > 0)
-    __gconv_release_step (&steps[cnt]);
-#endif
-
-  /* If we use the cache we free a bit more since we don't keep any
-     transformation records around, they are cheap enough to
-     recreate.  */
-  __gconv_release_cache (steps, nsteps);
-
-  /* Release the lock.  */
-#ifdef HAVE_DD_LOCK
-  __lock_release(lock);
-#endif
-
-
-  return result;
-}
-
-
-/* Free the modules mentioned.  */
-static void
-internal_function
-free_modules_db (struct gconv_module *node)
-{
-  if (node->left != NULL)
-    free_modules_db (node->left);
-  if (node->right != NULL)
-    free_modules_db (node->right);
-  do
-    {
-      struct gconv_module *act = node;
-      node = node->same;
-      if (act->module_name[0] == '/')
-	free (act);
-    }
-  while (node != NULL);
-}
-
-
-/* Free all resources if necessary.  */
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  if (__gconv_alias_db != NULL)
-    tdestroy (__gconv_alias_db, free);
-
-  if (__gconv_modules_db != NULL)
-    free_modules_db (__gconv_modules_db);
-
-  if (known_derivations != NULL)
-    tdestroy (known_derivations, free_derivation);
-}
-
-text_set_element (__libc_subfreeres, free_mem);
diff --git a/newlib/libc/sys/linux/iconv/gconv_dl.c b/newlib/libc/sys/linux/iconv/gconv_dl.c
deleted file mode 100644
index ee72514..0000000
--- a/newlib/libc/sys/linux/iconv/gconv_dl.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/* Handle loading/unloading of shared object for transformation.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <dlfcn.h>
-#include <search.h>
-#include <stdlib.h>
-#include <string.h>
-#include <bits/libc-lock.h>
-#include <sys/param.h>
-#include <ltdl.h>
-
-#include <gconv_int.h>
-
-
-#ifdef DEBUG
-/* For debugging purposes.  */
-static void print_all (void);
-#endif
-
-
-/* This is a tuning parameter.  If a transformation module is not used
-   anymore it gets not immediately unloaded.  Instead we wait a certain
-   number of load attempts for further modules.  If none of the
-   subsequent load attempts name the same object it finally gets unloaded.
-   Otherwise it is still available which hopefully is the frequent case.
-   The following number is the number of unloading attempts we wait
-   before unloading.  */
-#define TRIES_BEFORE_UNLOAD	2
-
-/* Array of loaded objects.  This is shared by all threads so we have
-   to use semaphores to access it.  */
-static void *loaded;
-
-/* Comparison function for searching `loaded_object' tree.  */
-static int
-known_compare (const void *p1, const void *p2)
-{
-  const struct __gconv_loaded_object *s1 =
-    (const struct __gconv_loaded_object *) p1;
-  const struct __gconv_loaded_object *s2 =
-    (const struct __gconv_loaded_object *) p2;
-
-  return strcmp (s1->name, s2->name);
-}
-
-/* Open the gconv database if necessary.  A non-negative return value
-   means success.  */
-struct __gconv_loaded_object *
-internal_function
-__gconv_find_shlib (const char *name)
-{
-  struct __gconv_loaded_object *found;
-  void *keyp;
-
-  
-
-  /* Search the tree of shared objects previously requested.  Data in
-     the tree are `loaded_object' structures, whose first member is a
-     `const char *', the lookup key.  The search returns a pointer to
-     the tree node structure; the first member of the is a pointer to
-     our structure (i.e. what will be a `loaded_object'); since the
-     first member of that is the lookup key string, &FCT_NAME is close
-     enough to a pointer to our structure to use as a lookup key that
-     will be passed to `known_compare' (above).  */
-
-  keyp = tfind (&name, &loaded, known_compare);
-  if (keyp == NULL)
-    {
-      /* This name was not known before.  */
-      size_t namelen = strlen (name) + 1;
-
-      found = malloc (sizeof (struct __gconv_loaded_object) + namelen);
-      if (found != NULL)
-	{
-	  /* Point the tree node at this new structure.  */
-	  found->name = (char *) memcpy (found + 1, name, namelen);
-	  found->counter = -TRIES_BEFORE_UNLOAD - 1;
-	  found->handle = NULL;
-
-	  if (__builtin_expect (tsearch (found, &loaded, known_compare)
-				== NULL, 0))
-	    {
-	      /* Something went wrong while inserting the entry.  */
-	      free (found);
-	      found = NULL;
-	    }
-	}
-    }
-  else
-    found = *(struct __gconv_loaded_object **) keyp;
-
-  /* Try to load the shared object if the usage count is 0.  This
-     implies that if the shared object is not loadable, the handle is
-     NULL and the usage count > 0.  */
-  if (found != NULL)
-    {
-      if (found->counter < -TRIES_BEFORE_UNLOAD)
-	{
-	  assert (found->handle == NULL);
-	  found->handle = __libc_dlopen (found->name);
-	  if (found->handle != NULL)
-	    {
-	      found->fct = __libc_dlsym (found->handle, "gconv");
-	      if (found->fct == NULL)
-		{
-		  /* Argh, no conversion function.  There is something
-                     wrong here.  */
-		  __gconv_release_shlib (found);
-		  found = NULL;
-		}
-	      else
-		{
-		  found->init_fct = __libc_dlsym (found->handle, "gconv_init");
-		  found->end_fct = __libc_dlsym (found->handle, "gconv_end");
-
-		  /* We have succeeded in loading the shared object.  */
-		  found->counter = 1;
-		}
-	    }
-	  else
-	    /* Error while loading the shared object.  */
-	    found = NULL;
-	}
-      else if (found->handle != NULL)
-	found->counter = MAX (found->counter + 1, 1);
-    }
-
-  return found;
-}
-
-
-/* This is very ugly but the tsearch functions provide no way to pass
-   information to the walker function.  So we use a global variable.
-   It is MT safe since we use a lock.  */
-static struct __gconv_loaded_object *release_handle;
-
-static void
-do_release_shlib (void *nodep, VISIT value, int level)
-{
-  struct __gconv_loaded_object *obj = *(struct __gconv_loaded_object **) nodep;
-
-  
-
-  if (value != preorder && value != leaf)
-    return;
-
-  if (obj == release_handle)
-    {
-      /* This is the object we want to unload.  Now decrement the
-	 reference counter.  */
-      assert (obj->counter > 0);
-      --obj->counter;
-    }
-  else if (obj->counter <= 0 && obj->counter >= -TRIES_BEFORE_UNLOAD
-	   && --obj->counter < -TRIES_BEFORE_UNLOAD && obj->handle != NULL)
-    {
-      /* Unload the shared object.  */
-      __libc_dlclose (obj->handle);
-      obj->handle = NULL;
-    }
-}
-
-
-/* Notify system that a shared object is not longer needed.  */
-void
-internal_function
-__gconv_release_shlib (struct __gconv_loaded_object *handle)
-{
-  /* Urgh, this is ugly but we have no other possibility.  */
-  release_handle = handle;
-
-  /* Process all entries.  Please note that we also visit entries
-     with release counts <= 0.  This way we can finally unload them
-     if necessary.  */
-  twalk (loaded, (void *) do_release_shlib);
-}
-
-
-/* We run this if we debug the memory allocation.  */
-static void
-do_release_all (void *nodep)
-{
-  struct __gconv_loaded_object *obj = (struct __gconv_loaded_object *) nodep;
-
-  
-  /* Unload the shared object.  */
-  if (obj->handle != NULL)
-    __libc_dlclose (obj->handle);
-
-  free (obj);
-}
-
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  tdestroy (loaded, do_release_all);
-}
-text_set_element (__libc_subfreeres, free_mem);
-
-
-#ifdef DEBUG
-static void
-do_print (const void *nodep, VISIT value, int level)
-{
-  struct __gconv_loaded_object *obj = *(struct __gconv_loaded_object **) nodep;
-
-  printf ("%10s: \"%s\", %d\n",
-	  value == leaf ? "leaf" :
-	  value == preorder ? "preorder" :
-	  value == postorder ? "postorder" : "endorder",
-	  obj->name, obj->counter);
-}
-
-static void
-print_all (void)
-{
-  __twalk (loaded, do_print);
-}
-#endif
diff --git a/newlib/libc/sys/linux/iconv/gconv_int.h b/newlib/libc/sys/linux/iconv/gconv_int.h
deleted file mode 100644
index bcd50a2..0000000
--- a/newlib/libc/sys/linux/iconv/gconv_int.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _GCONV_INT_H
-#define _GCONV_INT_H	1
-
-#include "gconv.h"
-#include <libc-symbols.h>
-
-__BEGIN_DECLS
-
-
-/* Type to represent search path.  */
-struct path_elem
-{
-  const char *name;
-  size_t len;
-};
-
-/* Variable with search path for `gconv' implementation.  */
-extern struct path_elem *__gconv_path_elem;
-/* Maximum length of a single path element.  */
-extern size_t __gconv_max_path_elem_len;
-
-
-/* Structure for alias definition.  Simply two strings.  */
-struct gconv_alias
-{
-  char *fromname;
-  char *toname;
-};
-
-
-/* How many character should be conveted in one call?  */
-#define GCONV_NCHAR_GOAL	8160
-
-
-/* Structure describing one loaded shared object.  This normally are
-   objects to perform conversation but as a special case the db shared
-   object is also handled.  */
-struct __gconv_loaded_object
-{
-  /* Name of the object.  It must be the first structure element.  */
-  const char *name;
-
-  /* Reference counter for the db functionality.  If no conversion is
-     needed we unload the db library.  */
-  int counter;
-
-  /* The handle for the shared object.  */
-  void *handle;
-
-  /* Pointer to the functions the module defines.  */
-  __gconv_fct fct;
-  __gconv_init_fct init_fct;
-  __gconv_end_fct end_fct;
-};
-
-
-/* Description for an available conversion module.  */
-struct gconv_module
-{
-  const char *from_string;
-  const char *to_string;
-
-  int cost_hi;
-  int cost_lo;
-
-  const char *module_name;
-
-  struct gconv_module *left;	/* Prefix smaller.  */
-  struct gconv_module *same;	/* List of entries with identical prefix.  */
-  struct gconv_module *right;	/* Prefix larger.  */
-};
-
-
-/* Internal data structure to represent transliteration module.  */
-struct trans_struct
-{
-  const char *name;
-  struct trans_struct *next;
-
-  const char **csnames;
-  size_t ncsnames;
-  __gconv_trans_fct trans_fct;
-  __gconv_trans_context_fct trans_context_fct;
-  __gconv_trans_init_fct trans_init_fct;
-  __gconv_trans_end_fct trans_end_fct;
-};
-
-
-/* Flags for `gconv_open'.  */
-enum
-{
-  GCONV_AVOID_NOCONV = 1 << 0
-};
-
-
-/* Global variables.  */
-
-/* Database of alias names.  */
-extern void *__gconv_alias_db;
-
-/* Array with available modules.  */
-extern size_t __gconv_nmodules;
-extern struct gconv_module *__gconv_modules_db;
-
-/* Value of the GCONV_PATH environment variable.  */
-extern const char *__gconv_path_envvar;
-
-
-/* The gconv functions expects the name to be in upper case and complete,
-   including the trailing slashes if necessary.  */
-#define norm_add_slashes(str,suffix) \
-  ({									      \
-    const char *cp = (str);						      \
-    char *result;							      \
-    char *tmp;								      \
-    size_t cnt = 0;							      \
-    size_t suffix_len = (suffix) == NULL ? 0 : strlen (suffix);		      \
-									      \
-    while (*cp != '\0')							      \
-      if (*cp++ == '/')							      \
-	++cnt;								      \
-									      \
-    tmp = result = alloca (cp - (str) + 3 + suffix_len);		      \
-    cp = (str);								      \
-    while (*cp != '\0')							      \
-      *tmp++ = __toupper_l (*cp++, &_nl_C_locobj);			      \
-    if (cnt < 2)							      \
-      {									      \
-	*tmp++ = '/';							      \
-	if (cnt < 1)							      \
-	  {								      \
-	    *tmp++ = '/';						      \
-	    if (suffix != NULL)						      \
-            {                                                                 \
-	      tmp = memcpy (tmp, suffix, suffix_len);		              \
-              tmp += suffix_len;                                              \
-            }                                                                 \
-	  }								      \
-      }									      \
-    *tmp = '\0';							      \
-    result;								      \
-  })
-
-
-/* Return in *HANDLE decriptor for transformation from FROMSET to TOSET.  */
-extern int __gconv_open (const char *toset, const char *fromset,
-			 __gconv_t *handle, int flags)
-     internal_function;
-
-/* Free resources associated with transformation descriptor CD.  */
-extern int __gconv_close (__gconv_t cd)
-     internal_function;
-
-/* Transform at most *INBYTESLEFT bytes from buffer starting at *INBUF
-   according to rules described by CD and place up to *OUTBYTESLEFT
-   bytes in buffer starting at *OUTBUF.  Return number of non-identical
-   conversions in *IRREVERSIBLE if this pointer is not null.  */
-extern int __gconv (__gconv_t cd, const unsigned char **inbuf,
-		    const unsigned char *inbufend, unsigned char **outbuf,
-		    unsigned char *outbufend, size_t *irreversible)
-     internal_function;
-
-/* Return in *HANDLE a pointer to an array with *NSTEPS elements describing
-   the single steps necessary for transformation from FROMSET to TOSET.  */
-extern int __gconv_find_transform (const char *toset, const char *fromset,
-				   struct __gconv_step **handle,
-				   size_t *nsteps, int flags)
-     internal_function;
-
-/* Search for transformation in cache data.  */
-extern int __gconv_lookup_cache (const char *toset, const char *fromset,
-				 struct __gconv_step **handle, size_t *nsteps,
-				 int flags)
-     internal_function;
-
-/* Compare the two name for whether they are after alias expansion the
-   same.  This function uses the cache and fails if none is
-   loaded.  */
-extern int __gconv_compare_alias_cache (const char *name1, const char *name2,
-					int *result) internal_function;
-
-/* Free data associated with a step's structure.  */
-extern void __gconv_release_step (struct __gconv_step *step)
-     internal_function;
-
-/* Read all the configuration data and cache it.  */
-extern void __gconv_read_conf (void);
-
-/* Try to read module cache file.  */
-extern int __gconv_load_cache (void) internal_function;
-
-/* Determine the directories we are looking in.  */
-extern void __gconv_get_path (void);
-
-/* Comparison function to search alias.  */
-extern int __gconv_alias_compare (const void *p1, const void *p2);
-
-/* Clear reference to transformation step implementations which might
-   cause the code to be unloaded.  */
-extern int __gconv_close_transform (struct __gconv_step *steps,
-				    size_t nsteps)
-     internal_function;
-
-/* Free all resources allocated for the transformation record when
-   using the cache.  */
-extern void __gconv_release_cache (struct __gconv_step *steps, size_t nsteps)
-     internal_function;
-
-/* Load shared object named by NAME.  If already loaded increment reference
-   count.  */
-extern struct __gconv_loaded_object *__gconv_find_shlib (const char *name)
-     internal_function;
-
-/* Release shared object.  If no further reference is available unload
-   the object.  */
-extern void __gconv_release_shlib (struct __gconv_loaded_object *handle)
-     internal_function;
-
-/* Fill STEP with information about builtin module with NAME.  */
-extern void __gconv_get_builtin_trans (const char *name,
-				       struct __gconv_step *step)
-     internal_function;
-
-/* Try to load transliteration step module.  */
-extern int __gconv_translit_find (struct trans_struct *trans)
-     internal_function;
-
-/* Transliteration using the locale's data.  */
-extern int __gconv_transliterate (struct __gconv_step *step,
-				  struct __gconv_step_data *step_data,
-				  void *trans_data,
-				  __const unsigned char *inbufstart,
-				  __const unsigned char **inbufp,
-				  __const unsigned char *inbufend,
-				  unsigned char **outbufstart,
-				  size_t *irreversible);
-
-
-/* Builtin transformations.  */
-#ifdef _LIBC
-# define __BUILTIN_TRANS(Name) \
-  extern int Name (struct __gconv_step *step,				      \
-		   struct __gconv_step_data *data,			      \
-		   const unsigned char **inbuf,				      \
-		   const unsigned char *inbufend,			      \
-		   unsigned char **outbufstart, size_t *irreversible,	      \
-		   int do_flush, int consume_incomplete)
-
-__BUILTIN_TRANS (__gconv_transform_ascii_internal);
-__BUILTIN_TRANS (__gconv_transform_internal_ascii);
-__BUILTIN_TRANS (__gconv_transform_utf8_internal);
-__BUILTIN_TRANS (__gconv_transform_internal_utf8);
-__BUILTIN_TRANS (__gconv_transform_ucs2_internal);
-__BUILTIN_TRANS (__gconv_transform_internal_ucs2);
-__BUILTIN_TRANS (__gconv_transform_ucs2reverse_internal);
-__BUILTIN_TRANS (__gconv_transform_internal_ucs2reverse);
-__BUILTIN_TRANS (__gconv_transform_internal_ucs4);
-__BUILTIN_TRANS (__gconv_transform_ucs4_internal);
-__BUILTIN_TRANS (__gconv_transform_internal_ucs4le);
-__BUILTIN_TRANS (__gconv_transform_ucs4le_internal);
-__BUILTIN_TRANS (__gconv_transform_internal_utf16);
-__BUILTIN_TRANS (__gconv_transform_utf16_internal);
-# undef __BUITLIN_TRANS
-
-#endif
-
-__END_DECLS
-
-#endif /* gconv_int.h */
diff --git a/newlib/libc/sys/linux/iconv/gconv_open.c b/newlib/libc/sys/linux/iconv/gconv_open.c
deleted file mode 100644
index 1b2fbb5..0000000
--- a/newlib/libc/sys/linux/iconv/gconv_open.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Find matching transformation algorithms and initialize steps.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gconv_int.h>
-
-int
-internal_function
-__gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
-	      int flags)
-{
-  struct __gconv_step *steps;
-  size_t nsteps;
-  __gconv_t result = NULL;
-  size_t cnt = 0;
-  int res;
-  int conv_flags = 0;
-  const char *errhand;
-  const char *ignore;
-  struct trans_struct *trans = NULL;
-  char old_locale[20], *old_locale_p;
-  char *old, *new;
-  size_t len;
-
-  /* Find out whether any error handling method is specified.  */
-  errhand = strchr (toset, '/');
-  if (errhand != NULL)
-    errhand = strchr (errhand + 1, '/');
-  if (__builtin_expect (errhand != NULL, 1))
-    {
-      if (*++errhand == '\0')
-	errhand = NULL;
-      else
-	{
-	  /* Make copy without the error handling description.  */
-	  char *newtoset = (char *) alloca (errhand - toset + 1);
-	  char *tok;
-	  char *ptr;
-
-	  newtoset[errhand - toset] = '\0';
-	  toset = memcpy (newtoset, toset, errhand - toset);
-
-	  /* Find the appropriate transliteration handlers.  */
-          old = (char *)(errhand);
-          len = strlen (old) + 1;
-          new = (char *) alloca (len);
-          tok = (char *) memcpy (new, old, len);
-
-	  tok = strtok_r (tok, ",", &ptr);
-
-          /* Set locale to default C locale. */
-          old_locale_p = setlocale(LC_ALL, "C");
-          strncpy(old_locale, old_locale_p, 20);
-
-	  while (tok != NULL)
-	    {
-	      if (strcasecmp (tok, "TRANSLIT") == 0)
-		{
-		  /* It's the builtin transliteration handling.  We only
-		     support it for working on the internal encoding.  */
-		  static const char *internal_trans_names[1] = { "INTERNAL" };
-		  struct trans_struct *lastp = NULL;
-		  struct trans_struct *runp;
-
-		  for (runp = trans; runp != NULL; runp = runp->next)
-		    if (runp->trans_fct == __gconv_transliterate)
-		      break;
-		    else
-		      lastp = runp;
-
-		  if (runp == NULL)
-		    {
-		      struct trans_struct *newp;
-
-		      newp = (struct trans_struct *) alloca (sizeof (*newp));
-		      memset (newp, '\0', sizeof (*newp));
-
-		      /* We leave the `name' field zero to signal that
-			 this is an internal transliteration step.  */
-		      newp->csnames = internal_trans_names;
-		      newp->ncsnames = 1;
-		      newp->trans_fct = __gconv_transliterate;
-
-		      if (lastp == NULL)
-			trans = newp;
-		      else
-			lastp->next = newp;
-		    }
-		}
-	      else if (strcasecmp (tok, "IGNORE") == 0)
-		/* Set the flag to ignore all errors.  */
-		conv_flags |= __GCONV_IGNORE_ERRORS;
-	      else
-		{
-		  /* `tok' is possibly a module name.  We'll see later
-		     whether we can find it.  But first see that we do
-		     not already a module of this name.  */
-		  struct trans_struct *lastp = NULL;
-		  struct trans_struct *runp;
-
-		  for (runp = trans; runp != NULL; runp = runp->next)
-		    if (runp->name != NULL
-			&& strcasecmp (tok, runp->name) == 0)
-		      break;
-		    else
-		      lastp = runp;
-
-		  if (runp == NULL)
-		    {
-		      struct trans_struct *newp;
-
-		      newp = (struct trans_struct *) alloca (sizeof (*newp));
-		      memset (newp, '\0', sizeof (*newp));
-		      newp->name = tok;
-
-		      if (lastp == NULL)
-			trans = newp;
-		      else
-			lastp->next = newp;
-		    }
-		}
-
-	      tok = strtok_r (NULL, ",", &ptr);
-	    }
-	}
-    }
-
-  /* For the source character set we ignore the error handler specification.
-     XXX Is this really always the best?  */
-  ignore = strchr (fromset, '/');
-  if (ignore != NULL && (ignore = strchr (ignore + 1, '/')) != NULL
-      && *++ignore != '\0')
-    {
-      char *newfromset = (char *) alloca (ignore - fromset + 1);
-
-      newfromset[ignore - fromset] = '\0';
-      fromset = memcpy (newfromset, fromset, ignore - fromset);
-    }
-
-  res = __gconv_find_transform (toset, fromset, &steps, &nsteps, flags);
-  if (res == __GCONV_OK)
-    {
-      /* Find the modules.  */
-      struct trans_struct *lastp = NULL;
-      struct trans_struct *runp;
-
-      for (runp = trans; runp != NULL; runp = runp->next)
-	{
-	  if (runp->name == NULL
-	      || __builtin_expect (__gconv_translit_find (runp), 0) == 0)
-	    lastp = runp;
-	  else
-	    /* This means we haven't found the module.  Remove it.  */
-	    if (lastp == NULL)
-	      trans = runp->next;
-	    else
-	      lastp->next = runp->next;
-	}
-
-      /* Allocate room for handle.  */
-      result = (__gconv_t) malloc (sizeof (struct __gconv_info)
-				   + (nsteps
-				      * sizeof (struct __gconv_step_data)));
-      if (result == NULL)
-	res = __GCONV_NOMEM;
-      else
-	{
-	  size_t n;
-
-	  /* Remember the list of steps.  */
-	  result->__steps = steps;
-	  result->__nsteps = nsteps;
-
-	  /* Clear the array for the step data.  */
-	  memset (result->__data, '\0',
-		  nsteps * sizeof (struct __gconv_step_data));
-
-	  /* Call all initialization functions for the transformation
-	     step implementations.  */
-	  for (cnt = 0; cnt < nsteps; ++cnt)
-	    {
-	      size_t size;
-
-	      /* Would have to be done if we would not clear the whole
-                 array above.  */
-#if 0
-	      /* Reset the counter.  */
-	      result->__data[cnt].__invocation_counter = 0;
-
-	      /* It's a regular use.  */
-	      result->__data[cnt].__internal_use = 0;
-#endif
-
-	      /* We use the `mbstate_t' member in DATA.  */
-	      result->__data[cnt].__statep = &result->__data[cnt].__state;
-
-	      /* Now see whether we can use any of the transliteration
-		 modules for this step.  */
-	      for (runp = trans; runp != NULL; runp = runp->next)
-		for (n = 0; n < runp->ncsnames; ++n)
-		  if (strcasecmp (steps[cnt].__from_name, runp->csnames[n]) == 0)
-		    {
-		      void *data = NULL;
-
-		      /* Match!  Now try the initializer.  */
-		      if (runp->trans_init_fct == NULL
-			  || (runp->trans_init_fct (&data,
-						    steps[cnt].__to_name)
-			      == __GCONV_OK))
-			{
-			  /* Append at the end of the list.  */
-			  struct __gconv_trans_data *newp;
-			  struct __gconv_trans_data **lastp;
-
-			  newp = (struct __gconv_trans_data *)
-			    malloc (sizeof (struct __gconv_trans_data));
-			  if (newp == NULL)
-			    {
-			      res = __GCONV_NOMEM;
-			      goto bail;
-			    }
-
-			  newp->__trans_fct = runp->trans_fct;
-			  newp->__trans_context_fct = runp->trans_context_fct;
-			  newp->__trans_end_fct = runp->trans_end_fct;
-			  newp->__data = data;
-			  newp->__next = NULL;
-
-			  lastp = &result->__data[cnt].__trans;
-			  while (*lastp != NULL)
-			    lastp = &(*lastp)->__next;
-
-			  *lastp = newp;
-			}
-		      break;
-		    }
-
-	      /* If this is the last step we must not allocate an
-		 output buffer.  */
-	      if (cnt < nsteps - 1)
-		{
-		  result->__data[cnt].__flags = conv_flags;
-
-		  /* Allocate the buffer.  */
-		  size = (GCONV_NCHAR_GOAL * steps[cnt].__max_needed_to);
-
-		  result->__data[cnt].__outbuf = (char *) malloc (size);
-		  if (result->__data[cnt].__outbuf == NULL)
-		    {
-		      res = __GCONV_NOMEM;
-		      goto bail;
-		    }
-
-		  result->__data[cnt].__outbufend =
-		    result->__data[cnt].__outbuf + size;
-		}
-	      else
-		{
-		  /* Handle the last entry.  */
-		  result->__data[cnt].__flags = conv_flags | __GCONV_IS_LAST;
-
-		  break;
-		}
-	    }
-	}
-
-      if (res != __GCONV_OK)
-	{
-	  /* Something went wrong.  Free all the resources.  */
-	  int serrno;
-	bail:
-	  serrno = errno;
-
-	  if (result != NULL)
-	    {
-	      while (cnt-- > 0)
-		{
-		  struct __gconv_trans_data *transp;
-
-		  transp = result->__data[cnt].__trans;
-		  while (transp != NULL)
-		    {
-		      struct __gconv_trans_data *curp = transp;
-		      transp = transp->__next;
-
-		      if (__builtin_expect (curp->__trans_end_fct != NULL, 0))
-			curp->__trans_end_fct (curp->__data);
-
-		      free (curp);
-		    }
-
-		  free (result->__data[cnt].__outbuf);
-		}
-
-	      free (result);
-	      result = NULL;
-	    }
-
-	  __gconv_close_transform (steps, nsteps);
-
-	  __set_errno (serrno);
-	}
-    }
-
-  *handle = result;
-  setlocale(LC_ALL, old_locale);
-  return res;
-}
diff --git a/newlib/libc/sys/linux/iconv/gconv_simple.c b/newlib/libc/sys/linux/iconv/gconv_simple.c
deleted file mode 100644
index edc091f..0000000
--- a/newlib/libc/sys/linux/iconv/gconv_simple.c
+++ /dev/null
@@ -1,1354 +0,0 @@
-/* Simple transformations functions.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <byteswap.h>
-#include <dlfcn.h>
-#include <endian.h>
-#include <errno.h>
-#include <gconv.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <sys/param.h>
-
-#define BUILTIN_ALIAS(s1, s2) /* nothing */
-#define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, MinF, MaxF, \
-			       MinT, MaxT) \
-  extern int Fct (struct __gconv_step *, struct __gconv_step_data *,	      \
-		  __const unsigned char **, __const unsigned char *,	      \
-		  unsigned char **, size_t *, int, int);
-#include "gconv_builtin.h"
-
-
-#ifndef EILSEQ
-# define EILSEQ EINVAL
-#endif
-
-
-/* Transform from the internal, UCS4-like format, to UCS4.  The
-   difference between the internal ucs4 format and the real UCS4
-   format is, if any, the endianess.  The Unicode/ISO 10646 says that
-   unless some higher protocol specifies it differently, the byte
-   order is big endian.*/
-#define DEFINE_INIT		0
-#define DEFINE_FINI		0
-#define MIN_NEEDED_FROM		4
-#define MIN_NEEDED_TO		4
-#define FROM_DIRECTION		1
-#define FROM_LOOP		internal_ucs4_loop
-#define TO_LOOP			internal_ucs4_loop /* This is not used.  */
-#define FUNCTION_NAME		__gconv_transform_internal_ucs4
-
-
-static inline int
-internal_ucs4_loop (struct __gconv_step *step,
-		    struct __gconv_step_data *step_data,
-		    const unsigned char **inptrp, const unsigned char *inend,
-		    unsigned char **outptrp, unsigned char *outend,
-		    size_t *irreversible)
-{
-  const unsigned char *inptr = *inptrp;
-  unsigned char *outptr = *outptrp;
-  size_t n_convert = MIN (inend - inptr, outend - outptr) / 4;
-  int result;
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-  /* Sigh, we have to do some real work.  */
-  size_t cnt;
-
-  for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4)
-    {
-      *((uint32_t *) outptr) = bswap_32 (*(const uint32_t *) inptr);
-      outptr = (unsigned char *)((uint32_t *) outptr + 1);
-    }
-
-  *inptrp = inptr;
-  *outptrp = outptr;
-#elif __BYTE_ORDER == __BIG_ENDIAN
-  /* Simply copy the data.  */
-  *inptrp = inptr + n_convert * 4;
-  *outptrp = memcpy (outptr, inptr, n_convert * 4);
-  *outptrp += n_convert * 4;
-#else
-# error "This endianess is not supported."
-#endif
-
-  /* Determine the status.  */
-  if (*inptrp == inend)
-    result = __GCONV_EMPTY_INPUT;
-  else if (*outptrp + 4 > outend)
-    result = __GCONV_FULL_OUTPUT;
-  else
-    result = __GCONV_INCOMPLETE_INPUT;
-
-  return result;
-}
-
-#ifndef _STRING_ARCH_unaligned
-static inline int
-internal_ucs4_loop_unaligned (struct __gconv_step *step,
-			      struct __gconv_step_data *step_data,
-			      const unsigned char **inptrp,
-			      const unsigned char *inend,
-			      unsigned char **outptrp, unsigned char *outend,
-			      size_t *irreversible)
-{
-  const unsigned char *inptr = *inptrp;
-  unsigned char *outptr = *outptrp;
-  size_t n_convert = MIN (inend - inptr, outend - outptr) / 4;
-  int result;
-
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-  /* Sigh, we have to do some real work.  */
-  size_t cnt;
-
-  for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4, outptr += 4)
-    {
-      outptr[0] = inptr[3];
-      outptr[1] = inptr[2];
-      outptr[2] = inptr[1];
-      outptr[3] = inptr[0];
-    }
-
-  *inptrp = inptr;
-  *outptrp = outptr;
-# elif __BYTE_ORDER == __BIG_ENDIAN
-  /* Simply copy the data.  */
-  *inptrp = inptr + n_convert * 4;
-  *outptrp = memcpy (outptr, inptr, n_convert * 4);
-  *outptrp += n_convert * 4;
-# else
-#  error "This endianess is not supported."
-# endif
-
-  /* Determine the status.  */
-  if (*inptrp == inend)
-    result = __GCONV_EMPTY_INPUT;
-  else if (*outptrp + 4 > outend)
-    result = __GCONV_FULL_OUTPUT;
-  else
-    result = __GCONV_INCOMPLETE_INPUT;
-
-  return result;
-}
-#endif
-
-
-static inline int
-internal_ucs4_loop_single (struct __gconv_step *step,
-			   struct __gconv_step_data *step_data,
-			   const unsigned char **inptrp,
-			   const unsigned char *inend,
-			   unsigned char **outptrp, unsigned char *outend,
-			   size_t *irreversible)
-{
-  mbstate_t *state = step_data->__statep;
-  size_t cnt = state->__count & 7;
-
-  while (*inptrp < inend && cnt < 4)
-    state->__value.__wchb[cnt++] = *(*inptrp)++;
-
-  if (__builtin_expect (cnt < 4, 0))
-    {
-      /* Still not enough bytes.  Store the ones in the input buffer.  */
-      state->__count &= ~7;
-      state->__count |= cnt;
-
-      return __GCONV_INCOMPLETE_INPUT;
-    }
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-  (*outptrp)[0] = state->__value.__wchb[3];
-  (*outptrp)[1] = state->__value.__wchb[2];
-  (*outptrp)[2] = state->__value.__wchb[1];
-  (*outptrp)[3] = state->__value.__wchb[0];
-
-  *outptrp += 4;
-#elif __BYTE_ORDER == __BIG_ENDIAN
-  {
-    uint32_t **p = (uint32_t **)outptrp;
-    uint32_t *q = *p;
-    /* XXX unaligned */
-    *q = state->__value.__wch;
-    outptrp = (unsigned char *)(p + 1);
-  }
-#else
-# error "This endianess is not supported."
-#endif
-
-  /* Clear the state buffer.  */
-  state->__count &= ~7;
-
-  return __GCONV_OK;
-}
-
-#include <iconv/skeleton.c>
-
-
-/* Transform from UCS4 to the internal, UCS4-like format.  Unlike
-   for the other direction we have to check for correct values here.  */
-#define DEFINE_INIT		0
-#define DEFINE_FINI		0
-#define MIN_NEEDED_FROM		4
-#define MIN_NEEDED_TO		4
-#define FROM_DIRECTION		1
-#define FROM_LOOP		ucs4_internal_loop
-#define TO_LOOP			ucs4_internal_loop /* This is not used.  */
-#define FUNCTION_NAME		__gconv_transform_ucs4_internal
-
-
-static inline int
-ucs4_internal_loop (struct __gconv_step *step,
-		    struct __gconv_step_data *step_data,
-		    const unsigned char **inptrp, const unsigned char *inend,
-		    unsigned char **outptrp, unsigned char *outend,
-		    size_t *irreversible)
-{
-  int flags = step_data->__flags;
-  const unsigned char *inptr = *inptrp;
-  unsigned char *outptr = *outptrp;
-  size_t n_convert = MIN (inend - inptr, outend - outptr) / 4;
-  int result;
-  size_t cnt;
-
-  for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4)
-    {
-      uint32_t inval;
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-      inval = bswap_32 (*(const uint32_t *) inptr);
-#else
-      inval = *(const uint32_t *) inptr;
-#endif
-
-      if (__builtin_expect (inval > 0x7fffffff, 0))
-	{
-	  /* The value is too large.  We don't try transliteration here since
-	     this is not an error because of the lack of possibilities to
-	     represent the result.  This is a genuine bug in the input since
-	     UCS4 does not allow such values.  */
-	  if (irreversible == NULL)
-	    /* We are transliterating, don't try to correct anything.  */
-	    return __GCONV_ILLEGAL_INPUT;
-
-	  if (flags & __GCONV_IGNORE_ERRORS)
-	    {
-	      /* Just ignore this character.  */
-	      *irreversible = *irreversible + 1;
-	      continue;
-	    }
-
-	  *inptrp = inptr;
-	  *outptrp = outptr;
-	  return __GCONV_ILLEGAL_INPUT;
-	}
-
-      *((uint32_t *) outptr) = inval;
-      outptr = (unsigned char *) ((uint32_t *) outptr + 1);
-    }
-
-  *inptrp = inptr;
-  *outptrp = outptr;
-
-  /* Determine the status.  */
-  if (*inptrp == inend)
-    result = __GCONV_EMPTY_INPUT;
-  else if (*outptrp + 4 > outend)
-    result = __GCONV_FULL_OUTPUT;
-  else
-    result = __GCONV_INCOMPLETE_INPUT;
-
-  return result;
-}
-
-#ifndef _STRING_ARCH_unaligned
-static inline int
-ucs4_internal_loop_unaligned (struct __gconv_step *step,
-			      struct __gconv_step_data *step_data,
-			      const unsigned char **inptrp,
-			      const unsigned char *inend,
-			      unsigned char **outptrp, unsigned char *outend,
-			      size_t *irreversible)
-{
-  int flags = step_data->__flags;
-  const unsigned char *inptr = *inptrp;
-  unsigned char *outptr = *outptrp;
-  size_t n_convert = MIN (inend - inptr, outend - outptr) / 4;
-  int result;
-  size_t cnt;
-
-  for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4)
-    {
-      if (__builtin_expect (inptr[0] > 0x80, 0))
-	{
-	  /* The value is too large.  We don't try transliteration here since
-	     this is not an error because of the lack of possibilities to
-	     represent the result.  This is a genuine bug in the input since
-	     UCS4 does not allow such values.  */
-	  if (irreversible == NULL)
-	    /* We are transliterating, don't try to correct anything.  */
-	    return __GCONV_ILLEGAL_INPUT;
-
-	  if (flags & __GCONV_IGNORE_ERRORS)
-	    {
-	      /* Just ignore this character.  */
-	      *irreversible = *irreversible + 1;
-	      continue;
-	    }
-
-	  *inptrp = inptr;
-	  *outptrp = outptr;
- 	  return __GCONV_ILLEGAL_INPUT;
-	}
-
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-      outptr[3] = inptr[0];
-      outptr[2] = inptr[1];
-      outptr[1] = inptr[2];
-      outptr[0] = inptr[3];
-# else
-      outptr[0] = inptr[0];
-      outptr[1] = inptr[1];
-      outptr[2] = inptr[2];
-      outptr[3] = inptr[3];
-# endif
-      outptr += 4;
-    }
-
-  *inptrp = inptr;
-  *outptrp = outptr;
-
-  /* Determine the status.  */
-  if (*inptrp == inend)
-    result = __GCONV_EMPTY_INPUT;
-  else if (*outptrp + 4 > outend)
-    result = __GCONV_FULL_OUTPUT;
-  else
-    result = __GCONV_INCOMPLETE_INPUT;
-
-  return result;
-}
-#endif
-
-
-static inline int
-ucs4_internal_loop_single (struct __gconv_step *step,
-			   struct __gconv_step_data *step_data,
-			   const unsigned char **inptrp,
-			   const unsigned char *inend,
-			   unsigned char **outptrp, unsigned char *outend,
-			   size_t *irreversible)
-{
-  mbstate_t *state = step_data->__statep;
-  int flags = step_data->__flags;
-  size_t cnt = state->__count & 7;
-
-  while (*inptrp < inend && cnt < 4)
-    state->__value.__wchb[cnt++] = *(*inptrp)++;
-
-  if (__builtin_expect (cnt < 4, 0))
-    {
-      /* Still not enough bytes.  Store the ones in the input buffer.  */
-      state->__count &= ~7;
-      state->__count |= cnt;
-
-      return __GCONV_INCOMPLETE_INPUT;
-    }
-
-  if (__builtin_expect (((unsigned char *) state->__value.__wchb)[0] > 0x80,
-			0))
-    {
-      /* The value is too large.  We don't try transliteration here since
-	 this is not an error because of the lack of possibilities to
-	 represent the result.  This is a genuine bug in the input since
-	 UCS4 does not allow such values.  */
-      if (!(flags & __GCONV_IGNORE_ERRORS))
-	{
-	  *inptrp -= cnt - (state->__count & 7);
-	  return __GCONV_ILLEGAL_INPUT;
-	}
-    }
-  else
-    {
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-      (*outptrp)[0] = state->__value.__wchb[3];
-      (*outptrp)[1] = state->__value.__wchb[2];
-      (*outptrp)[2] = state->__value.__wchb[1];
-      (*outptrp)[3] = state->__value.__wchb[0];
-#elif __BYTE_ORDER == __BIG_ENDIAN
-      (*outptrp)[0] = state->__value.__wchb[0];
-      (*outptrp)[1] = state->__value.__wchb[1];
-      (*outptrp)[2] = state->__value.__wchb[2];
-      (*outptrp)[3] = state->__value.__wchb[3];
-#endif
-
-      *outptrp += 4;
-    }
-
-  /* Clear the state buffer.  */
-  state->__count &= ~7;
-
-  return __GCONV_OK;
-}
-
-#include <iconv/skeleton.c>
-
-
-/* Similarly for the little endian form.  */
-#define DEFINE_INIT		0
-#define DEFINE_FINI		0
-#define MIN_NEEDED_FROM		4
-#define MIN_NEEDED_TO		4
-#define FROM_DIRECTION		1
-#define FROM_LOOP		internal_ucs4le_loop
-#define TO_LOOP			internal_ucs4le_loop /* This is not used.  */
-#define FUNCTION_NAME		__gconv_transform_internal_ucs4le
-
-
-static inline int
-internal_ucs4le_loop (struct __gconv_step *step,
-		      struct __gconv_step_data *step_data,
-		      const unsigned char **inptrp, const unsigned char *inend,
-		      unsigned char **outptrp, unsigned char *outend,
-		      size_t *irreversible)
-{
-  const unsigned char *inptr = *inptrp;
-  unsigned char *outptr = *outptrp;
-  size_t n_convert = MIN (inend - inptr, outend - outptr) / 4;
-  int result;
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-  /* Sigh, we have to do some real work.  */
-  size_t cnt;
-
-  for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4)
-    *((uint32_t *) outptr)++ = bswap_32 (*(const uint32_t *) inptr);
-
-  *inptrp = inptr;
-  *outptrp = outptr;
-#elif __BYTE_ORDER == __LITTLE_ENDIAN
-  /* Simply copy the data.  */
-  *inptrp = inptr + n_convert * 4;
-  *outptrp = memcpy (outptr, inptr, n_convert * 4);
-  *outptrp += n_convert * 4;
-#else
-# error "This endianess is not supported."
-#endif
-
-  /* Determine the status.  */
-  if (*inptrp == inend)
-    result = __GCONV_EMPTY_INPUT;
-  else if (*outptrp + 4 > outend)
-    result = __GCONV_FULL_OUTPUT;
-  else
-    result = __GCONV_INCOMPLETE_INPUT;
-
-  return result;
-}
-
-#ifndef _STRING_ARCH_unaligned
-static inline int
-internal_ucs4le_loop_unaligned (struct __gconv_step *step,
-				struct __gconv_step_data *step_data,
-				const unsigned char **inptrp,
-				const unsigned char *inend,
-				unsigned char **outptrp, unsigned char *outend,
-				size_t *irreversible)
-{
-  const unsigned char *inptr = *inptrp;
-  unsigned char *outptr = *outptrp;
-  size_t n_convert = MIN (inend - inptr, outend - outptr) / 4;
-  int result;
-
-# if __BYTE_ORDER == __BIG_ENDIAN
-  /* Sigh, we have to do some real work.  */
-  size_t cnt;
-
-  for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4, outptr += 4)
-    {
-      outptr[0] = inptr[3];
-      outptr[1] = inptr[2];
-      outptr[2] = inptr[1];
-      outptr[3] = inptr[0];
-    }
-
-  *inptrp = inptr;
-  *outptrp = outptr;
-# elif __BYTE_ORDER == __LITTLE_ENDIAN
-  /* Simply copy the data.  */
-  *inptrp = inptr + n_convert * 4;
-  *outptrp = memcpy (outptr, inptr, n_convert * 4);
-  *outptrp += n_convert * 4;
-# else
-#  error "This endianess is not supported."
-# endif
-
-  /* Determine the status.  */
-  if (*inptrp + 4 > inend)
-    result = __GCONV_EMPTY_INPUT;
-  else if (*outptrp + 4 > outend)
-    result = __GCONV_FULL_OUTPUT;
-  else
-    result = __GCONV_INCOMPLETE_INPUT;
-
-  return result;
-}
-#endif
-
-
-static inline int
-internal_ucs4le_loop_single (struct __gconv_step *step,
-			     struct __gconv_step_data *step_data,
-			     const unsigned char **inptrp,
-			     const unsigned char *inend,
-			     unsigned char **outptrp, unsigned char *outend,
-			     size_t *irreversible)
-{
-  mbstate_t *state = step_data->__statep;
-  size_t cnt = state->__count & 7;
-
-  while (*inptrp < inend && cnt < 4)
-    state->__value.__wchb[cnt++] = *(*inptrp)++;
-
-  if (__builtin_expect (cnt < 4, 0))
-    {
-      /* Still not enough bytes.  Store the ones in the input buffer.  */
-      state->__count &= ~7;
-      state->__count |= cnt;
-
-      return __GCONV_INCOMPLETE_INPUT;
-    }
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-  (*outptrp)[0] = state->__value.__wchb[3];
-  (*outptrp)[1] = state->__value.__wchb[2];
-  (*outptrp)[2] = state->__value.__wchb[1];
-  (*outptrp)[3] = state->__value.__wchb[0];
-
-  *outptrp += 4;
-#else
-  {
-  /* XXX unaligned */
-  uint32_t **p = (uint32_t **)outptrp;
-  uint32_t *q = *p;
-  *q = state->__value.__wch;
-  outptrp = (unsigned char **)(p + 1);
-  }
-#endif
-
-  /* Clear the state buffer.  */
-  state->__count &= ~7;
-
-  return __GCONV_OK;
-}
-
-#include <iconv/skeleton.c>
-
-
-/* And finally from UCS4-LE to the internal encoding.  */
-#define DEFINE_INIT		0
-#define DEFINE_FINI		0
-#define MIN_NEEDED_FROM		4
-#define MIN_NEEDED_TO		4
-#define FROM_DIRECTION		1
-#define FROM_LOOP		ucs4le_internal_loop
-#define TO_LOOP			ucs4le_internal_loop /* This is not used.  */
-#define FUNCTION_NAME		__gconv_transform_ucs4le_internal
-
-
-static inline int
-ucs4le_internal_loop (struct __gconv_step *step,
-		      struct __gconv_step_data *step_data,
-		      const unsigned char **inptrp, const unsigned char *inend,
-		      unsigned char **outptrp, unsigned char *outend,
-		      size_t *irreversible)
-{
-  int flags = step_data->__flags;
-  const unsigned char *inptr = *inptrp;
-  unsigned char *outptr = *outptrp;
-  size_t n_convert = MIN (inend - inptr, outend - outptr) / 4;
-  int result;
-  size_t cnt;
-
-  for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4)
-    {
-      uint32_t inval;
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-      inval = bswap_32 (*(const uint32_t *) inptr);
-#else
-      inval = *(const uint32_t *) inptr;
-#endif
-
-      if (__builtin_expect (inval > 0x7fffffff, 0))
-	{
-	  /* The value is too large.  We don't try transliteration here since
-	     this is not an error because of the lack of possibilities to
-	     represent the result.  This is a genuine bug in the input since
-	     UCS4 does not allow such values.  */
-	  if (irreversible == NULL)
-	    /* We are transliterating, don't try to correct anything.  */
-	    return __GCONV_ILLEGAL_INPUT;
-
-	  if (flags & __GCONV_IGNORE_ERRORS)
-	    {
-	      /* Just ignore this character.  */
-	      ++*irreversible;
-	      continue;
-	    }
-
-	  return __GCONV_ILLEGAL_INPUT;
-	}
-
-      *((uint32_t *) outptr) = inval;
-      outptr = (unsigned char *)((uint32_t *) outptr + 1);
-    }
-
-  *inptrp = inptr;
-  *outptrp = outptr;
-
-  /* Determine the status.  */
-  if (*inptrp == inend)
-    result = __GCONV_EMPTY_INPUT;
-  else if (*outptrp + 4 > outend)
-    result = __GCONV_FULL_OUTPUT;
-  else
-    result = __GCONV_INCOMPLETE_INPUT;
-
-  return result;
-}
-
-#ifndef _STRING_ARCH_unaligned
-static inline int
-ucs4le_internal_loop_unaligned (struct __gconv_step *step,
-				struct __gconv_step_data *step_data,
-				const unsigned char **inptrp,
-				const unsigned char *inend,
-				unsigned char **outptrp, unsigned char *outend,
-				size_t *irreversible)
-{
-  int flags = step_data->__flags;
-  const unsigned char *inptr = *inptrp;
-  unsigned char *outptr = *outptrp;
-  size_t n_convert = MIN (inend - inptr, outend - outptr) / 4;
-  int result;
-  size_t cnt;
-
-  for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4)
-    {
-      if (__builtin_expect (inptr[3] > 0x80, 0))
-	{
-	  /* The value is too large.  We don't try transliteration here since
-	     this is not an error because of the lack of possibilities to
-	     represent the result.  This is a genuine bug in the input since
-	     UCS4 does not allow such values.  */
-	  if (irreversible == NULL)
-	    /* We are transliterating, don't try to correct anything.  */
-	    return __GCONV_ILLEGAL_INPUT;
-
-	  if (flags & __GCONV_IGNORE_ERRORS)
-	    {
-	      /* Just ignore this character.  */
-	      ++*irreversible;
-	      continue;
-	    }
-
-	  *inptrp = inptr;
-	  *outptrp = outptr;
- 	  return __GCONV_ILLEGAL_INPUT;
-	}
-
-# if __BYTE_ORDER == __BIG_ENDIAN
-      outptr[3] = inptr[0];
-      outptr[2] = inptr[1];
-      outptr[1] = inptr[2];
-      outptr[0] = inptr[3];
-# else
-      outptr[0] = inptr[0];
-      outptr[1] = inptr[1];
-      outptr[2] = inptr[2];
-      outptr[3] = inptr[3];
-# endif
-
-      outptr += 4;
-    }
-
-  *inptrp = inptr;
-  *outptrp = outptr;
-
-  /* Determine the status.  */
-  if (*inptrp == inend)
-    result = __GCONV_EMPTY_INPUT;
-  else if (*outptrp + 4 > outend)
-    result = __GCONV_FULL_OUTPUT;
-  else
-    result = __GCONV_INCOMPLETE_INPUT;
-
-  return result;
-}
-#endif
-
-
-static inline int
-ucs4le_internal_loop_single (struct __gconv_step *step,
-			     struct __gconv_step_data *step_data,
-			     const unsigned char **inptrp,
-			     const unsigned char *inend,
-			     unsigned char **outptrp, unsigned char *outend,
-			     size_t *irreversible)
-{
-  mbstate_t *state = step_data->__statep;
-  int flags = step_data->__flags;
-  size_t cnt = state->__count & 7;
-
-  while (*inptrp < inend && cnt < 4)
-    state->__value.__wchb[cnt++] = *(*inptrp)++;
-
-  if (__builtin_expect (cnt < 4, 0))
-    {
-      /* Still not enough bytes.  Store the ones in the input buffer.  */
-      state->__count &= ~7;
-      state->__count |= cnt;
-
-      return __GCONV_INCOMPLETE_INPUT;
-    }
-
-  if (__builtin_expect (((unsigned char *) state->__value.__wchb)[3] > 0x80,
-			0))
-    {
-      /* The value is too large.  We don't try transliteration here since
-	 this is not an error because of the lack of possibilities to
-	 represent the result.  This is a genuine bug in the input since
-	 UCS4 does not allow such values.  */
-      if (!(flags & __GCONV_IGNORE_ERRORS))
-	return __GCONV_ILLEGAL_INPUT;
-    }
-  else
-    {
-#if __BYTE_ORDER == __BIG_ENDIAN
-      (*outptrp)[0] = state->__value.__wchb[3];
-      (*outptrp)[1] = state->__value.__wchb[2];
-      (*outptrp)[2] = state->__value.__wchb[1];
-      (*outptrp)[3] = state->__value.__wchb[0];
-#elif __BYTE_ORDER == __BIG_ENDIAN
-      (*outptrp)[0] = state->__value.__wchb[0];
-      (*outptrp)[1] = state->__value.__wchb[1];
-      (*outptrp)[2] = state->__value.__wchb[2];
-      (*outptrp)[3] = state->__value.__wchb[3];
-#endif
-
-      *outptrp += 4;
-    }
-
-  /* Clear the state buffer.  */
-  state->__count &= ~7;
-
-  return __GCONV_OK;
-}
-
-#include <iconv/skeleton.c>
-
-
-/* Convert from ISO 646-IRV to the internal (UCS4-like) format.  */
-#define DEFINE_INIT		0
-#define DEFINE_FINI		0
-#define MIN_NEEDED_FROM		1
-#define MIN_NEEDED_TO		4
-#define FROM_DIRECTION		1
-#define FROM_LOOP		ascii_internal_loop
-#define TO_LOOP			ascii_internal_loop /* This is not used.  */
-#define FUNCTION_NAME		__gconv_transform_ascii_internal
-#define ONE_DIRECTION		1
-
-#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
-#define LOOPFCT			FROM_LOOP
-#define BODY \
-  {									      \
-    if (__builtin_expect (*inptr > '\x7f', 0))				      \
-      {									      \
-	/* The value is too large.  We don't try transliteration here since   \
-	   this is not an error because of the lack of possibilities to	      \
-	   represent the result.  This is a genuine bug in the input since    \
-	   ASCII does not allow such values.  */			      \
-	if (! ignore_errors_p ())					      \
-	  {								      \
-	    /* This is no correct ANSI_X3.4-1968 character.  */		      \
-	    result = __GCONV_ILLEGAL_INPUT;				      \
-	    break;							      \
-	  }								      \
-									      \
-	*irreversible = *irreversible + 1;				      \
-	++inptr;							      \
-      }									      \
-    else								      \
-      { 								      \
-        /* It's an one byte sequence.  */				      \
-        *((uint32_t *) outptr) = *inptr;				      \
-        ++inptr;							      \
-        outptr = (unsigned char *)((uint32_t *) outptr + 1);		      \
-      }									      \
-  }
-#define LOOP_NEED_FLAGS
-#include <iconv/loop.c>
-#include <iconv/skeleton.c>
-
-
-/* Convert from the internal (UCS4-like) format to ISO 646-IRV.  */
-#define DEFINE_INIT		0
-#define DEFINE_FINI		0
-#define MIN_NEEDED_FROM		4
-#define MIN_NEEDED_TO		1
-#define FROM_DIRECTION		1
-#define FROM_LOOP		internal_ascii_loop
-#define TO_LOOP			internal_ascii_loop /* This is not used.  */
-#define FUNCTION_NAME		__gconv_transform_internal_ascii
-#define ONE_DIRECTION		1
-
-#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
-#define LOOPFCT			FROM_LOOP
-#define BODY \
-  {									      \
-    if (__builtin_expect (*((const uint32_t *) inptr) > 0x7f, 0))	      \
-      {									      \
-	UNICODE_TAG_HANDLER (*((const uint32_t *) inptr), 4);		      \
-	STANDARD_ERR_HANDLER (4);					      \
-      }									      \
-    else								      \
-      { 								      \
-        /* It's an one byte sequence.  */				      \
-        *outptr++ = *((const uint32_t *) inptr);			      \
-        inptr = ((const uint32_t *) inptr + 1);				      \
-      }									      \
-  }
-#define LOOP_NEED_FLAGS
-#include <iconv/loop.c>
-#include <iconv/skeleton.c>
-
-
-/* Convert from the internal (UCS4-like) format to UTF-8.  */
-#define DEFINE_INIT		0
-#define DEFINE_FINI		0
-#define MIN_NEEDED_FROM		4
-#define MIN_NEEDED_TO		1
-#define MAX_NEEDED_TO		6
-#define FROM_DIRECTION		1
-#define FROM_LOOP		internal_utf8_loop
-#define TO_LOOP			internal_utf8_loop /* This is not used.  */
-#define FUNCTION_NAME		__gconv_transform_internal_utf8
-#define ONE_DIRECTION		1
-
-#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
-#define MAX_NEEDED_OUTPUT	MAX_NEEDED_TO
-#define LOOPFCT			FROM_LOOP
-#define BODY \
-  {									      \
-    uint32_t wc = *((const uint32_t *) inptr);				      \
-									      \
-    if (wc < 0x80)							      \
-      /* It's an one byte sequence.  */					      \
-      *outptr++ = (unsigned char) wc;					      \
-    else if (__builtin_expect (wc <= 0x7fffffff, 1))			      \
-      {									      \
-	size_t step;							      \
-	char *start;							      \
-									      \
-	for (step = 2; step < 6; ++step)				      \
-	  if ((wc & (~(uint32_t)0 << (5 * step + 1))) == 0)		      \
-	    break;							      \
-									      \
-	if (__builtin_expect (outptr + step > outend, 0))		      \
-	  {								      \
-	    /* Too long.  */						      \
-	    result = __GCONV_FULL_OUTPUT;				      \
-	    break;							      \
-	  }								      \
-									      \
-	start = outptr;							      \
-	*outptr = (unsigned char) (~0xff >> step);			      \
-	outptr += step;							      \
-	--step;								      \
-	do								      \
-	  {								      \
-	    start[step] = 0x80 | (wc & 0x3f);				      \
-	    wc >>= 6;							      \
-	  }								      \
-	while (--step > 0);						      \
-	start[0] |= wc;							      \
-      }									      \
-    else								      \
-      {									      \
-	STANDARD_ERR_HANDLER (4);					      \
-      }									      \
-									      \
-    inptr += 4;								      \
-  }
-#define LOOP_NEED_FLAGS
-#include <iconv/loop.c>
-#include <iconv/skeleton.c>
-
-
-/* Convert from UTF-8 to the internal (UCS4-like) format.  */
-#define DEFINE_INIT		0
-#define DEFINE_FINI		0
-#define MIN_NEEDED_FROM		1
-#define MAX_NEEDED_FROM		6
-#define MIN_NEEDED_TO		4
-#define FROM_DIRECTION		1
-#define FROM_LOOP		utf8_internal_loop
-#define TO_LOOP			utf8_internal_loop /* This is not used.  */
-#define FUNCTION_NAME		__gconv_transform_utf8_internal
-#define ONE_DIRECTION		1
-
-#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
-#define MAX_NEEDED_INPUT	MAX_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
-#define LOOPFCT			FROM_LOOP
-#define BODY \
-  {									      \
-    uint32_t ch;							      \
-    uint32_t cnt;							      \
-    uint32_t i;							      \
-									      \
-    /* Next input byte.  */						      \
-    ch = *inptr;							      \
-									      \
-    if (ch < 0x80)							      \
-      {									      \
-	/* One byte sequence.  */					      \
-	cnt = 1;							      \
-	++inptr;							      \
-      }									      \
-    else								      \
-      {									      \
- 	if (ch >= 0xc2 && ch < 0xe0)					      \
-	  {								      \
- 	    /* We expect two bytes.  The first byte cannot be 0xc0 or 0xc1,   \
- 	       otherwise the wide character could have been represented	      \
- 	       using a single byte.  */					      \
-	    cnt = 2;							      \
-	    ch &= 0x1f;							      \
-	  }								      \
-        else if (__builtin_expect ((ch & 0xf0) == 0xe0, 1))		      \
-	  {								      \
-	    /* We expect three bytes.  */				      \
-	    cnt = 3;							      \
-	    ch &= 0x0f;							      \
-	  }								      \
-	else if (__builtin_expect ((ch & 0xf8) == 0xf0, 1))		      \
-	  {								      \
-	    /* We expect four bytes.  */				      \
-	    cnt = 4;							      \
-	    ch &= 0x07;							      \
-	  }								      \
-	else if (__builtin_expect ((ch & 0xfc) == 0xf8, 1))		      \
-	  {								      \
-	    /* We expect five bytes.  */				      \
-	    cnt = 5;							      \
-	    ch &= 0x03;							      \
-	  }								      \
-	else if (__builtin_expect ((ch & 0xfe) == 0xfc, 1))		      \
-	  {								      \
-	    /* We expect six bytes.  */					      \
-	    cnt = 6;							      \
-	    ch &= 0x01;							      \
-	  }								      \
-	else								      \
-	  {								      \
-	    int skipped;						      \
-									      \
-	    if (! ignore_errors_p ())					      \
-	      {								      \
-		/* This is an illegal encoding.  */			      \
-		result = __GCONV_ILLEGAL_INPUT;				      \
-		break;							      \
-	      }								      \
-									      \
-	    /* Search the end of this ill-formed UTF-8 character.  This	      \
-	       is the next byte with (x & 0xc0) != 0x80.  */		      \
-	     skipped = 0;						      \
-	     do								      \
-	       {							      \
-		 ++inptr;						      \
-		 ++skipped;						      \
-	       }							      \
-	     while (inptr < inend && (*inptr & 0xc0) == 0x80 && skipped < 5); \
-									      \
-	     continue;							      \
-	  }								      \
-									      \
-	if (__builtin_expect (inptr + cnt > inend, 0))			      \
-	  {								      \
-	    /* We don't have enough input.  But before we report that check   \
-	       that all the bytes are correct.  */			      \
-	    for (i = 1; inptr + i < inend; ++i)				      \
-	      if ((inptr[i] & 0xc0) != 0x80)				      \
-		break;							      \
-									      \
-	    if (__builtin_expect (inptr + i == inend, 1))		      \
-	      {								      \
-		result = __GCONV_INCOMPLETE_INPUT;			      \
-		break;							      \
-	      }								      \
-									      \
-	    if (ignore_errors_p ())					      \
-	      {								      \
-		/* Ignore it.  */					      \
-		inptr += i;						      \
-		*irreversible = *irreversible + 1;			      \
-		continue;						      \
-	      }								      \
-									      \
-	    result = __GCONV_ILLEGAL_INPUT;				      \
-	    break;							      \
-	  }								      \
-									      \
-	/* Read the possible remaining bytes.  */			      \
-	for (i = 1; i < cnt; ++i)					      \
-	  {								      \
-	    uint32_t byte = inptr[i];					      \
-									      \
-	    if ((byte & 0xc0) != 0x80)					      \
-	      /* This is an illegal encoding.  */			      \
-	      break;							      \
-									      \
-	    ch <<= 6;							      \
-	    ch |= byte & 0x3f;						      \
-	  }								      \
-									      \
-	/* If i < cnt, some trail byte was not >= 0x80, < 0xc0.		      \
-	   If cnt > 2 and ch < 2^(5*cnt-4), the wide character ch could	      \
-	   have been represented with fewer than cnt bytes.  */		      \
-	if (i < cnt || (cnt > 2 && (ch >> (5 * cnt - 4)) == 0))		      \
-	  {								      \
-	    /* This is an illegal encoding.  */				      \
-	    if (ignore_errors_p ())					      \
-	      {								      \
-		inptr += i;						      \
-		*irreversible = *irreversible + 1;			      \
-		continue;						      \
-	      }								      \
-									      \
-	    result = __GCONV_ILLEGAL_INPUT;				      \
-	    break;							      \
-	  }								      \
-									      \
-	inptr += cnt;							      \
-      }									      \
-									      \
-    /* Now adjust the pointers and store the result.  */		      \
-    *((uint32_t *) outptr) = ch;					      \
-    outptr = (unsigned char *)((uint32_t *) outptr + 1);		      \
-  }
-#define LOOP_NEED_FLAGS
-
-#define STORE_REST \
-  {									      \
-    /* We store the remaining bytes while converting them into the UCS4	      \
-       format.  We can assume that the first byte in the buffer is	      \
-       correct and that it requires a larger number of bytes than there	      \
-       are in the input buffer.  */					      \
-    wint_t ch = **inptrp;						      \
-    size_t cnt;								      \
-									      \
-    state->__count = inend - *inptrp;					      \
-									      \
-    if (ch >= 0xc2 && ch < 0xe0)					      \
-      {									      \
-	/* We expect two bytes.  The first byte cannot be 0xc0 or	      \
-	   0xc1, otherwise the wide character could have been		      \
-	   represented using a single byte.  */				      \
-	cnt = 2;							      \
-	ch &= 0x1f;							      \
-      }									      \
-    else if (__builtin_expect ((ch & 0xf0) == 0xe0, 1))			      \
-      {									      \
-	/* We expect three bytes.  */					      \
-	cnt = 3;							      \
-	ch &= 0x0f;							      \
-      }									      \
-    else if (__builtin_expect ((ch & 0xf8) == 0xf0, 1))			      \
-      {									      \
-	/* We expect four bytes.  */					      \
-	cnt = 4;							      \
-	ch &= 0x07;							      \
-      }									      \
-    else if (__builtin_expect ((ch & 0xfc) == 0xf8, 1))			      \
-      {									      \
-	/* We expect five bytes.  */					      \
-	cnt = 5;							      \
-	ch &= 0x03;							      \
-      }									      \
-    else								      \
-      {									      \
-	/* We expect six bytes.  */					      \
-	cnt = 6;							      \
-	ch &= 0x01;							      \
-      }									      \
-									      \
-    /* The first byte is already consumed.  */				      \
-    --cnt;								      \
-    while (++(*inptrp) < inend)						      \
-      {									      \
-	ch <<= 6;							      \
-	ch |= **inptrp & 0x3f;						      \
-	--cnt;								      \
-      }									      \
-									      \
-    /* Shift for the so far missing bytes.  */				      \
-    ch <<= cnt * 6;							      \
-									      \
-    /* Store the value.  */						      \
-    state->__value.__wch = ch;						      \
-  }
-
-#define UNPACK_BYTES \
-  {									      \
-    wint_t wch = state->__value.__wch;					      \
-    size_t ntotal;							      \
-    inlen = state->__count;						      \
-									      \
-    if (state->__value.__wch <= 0x7ff)					      \
-      {									      \
-	bytebuf[0] = 0xc0;						      \
-	ntotal = 2;							      \
-      }									      \
-    else if (__builtin_expect (state->__value.__wch <= 0xffff, 1))	      \
-      {									      \
-	bytebuf[0] = 0xe0;						      \
-	ntotal = 3;							      \
-      }									      \
-    else if (__builtin_expect (state->__value.__wch < 0x1fffff, 1))	      \
-      {									      \
-	bytebuf[0] = 0xf0;						      \
-	ntotal = 4;							      \
-      }									      \
-    else if (__builtin_expect (state->__value.__wch < 0x3ffffff, 1))	      \
-      {									      \
-	bytebuf[0] = 0xf8;						      \
-	ntotal = 5;							      \
-      }									      \
-    else								      \
-      {									      \
-	bytebuf[0] = 0xfc;						      \
-	ntotal = 6;							      \
-      }									      \
-									      \
-    do									      \
-      {									      \
-	if (--ntotal < inlen)						      \
-	  bytebuf[ntotal] = 0x80 | (wch & 0x3f);			      \
-	wch >>= 6;							      \
-      }									      \
-    while (ntotal > 1);							      \
-									      \
-    bytebuf[0] |= wch;							      \
-  }
-
-#include <iconv/loop.c>
-#include <iconv/skeleton.c>
-
-
-/* Convert from UCS2 to the internal (UCS4-like) format.  */
-#define DEFINE_INIT		0
-#define DEFINE_FINI		0
-#define MIN_NEEDED_FROM		2
-#define MIN_NEEDED_TO		4
-#define FROM_DIRECTION		1
-#define FROM_LOOP		ucs2_internal_loop
-#define TO_LOOP			ucs2_internal_loop /* This is not used.  */
-#define FUNCTION_NAME		__gconv_transform_ucs2_internal
-#define ONE_DIRECTION		1
-
-#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
-#define LOOPFCT			FROM_LOOP
-#define BODY \
-  {									      \
-    uint16_t u1 = *((const uint16_t *) inptr);				      \
-									      \
-    if (__builtin_expect (u1 >= 0xd800 && u1 < 0xe000, 0))		      \
-      {									      \
-	/* Surrogate characters in UCS-2 input are not valid.  Reject	      \
-	   them.  (Catching this here is not security relevant.)  */	      \
-	if (! ignore_errors_p ())					      \
-	  {								      \
-	    result = __GCONV_ILLEGAL_INPUT;				      \
-	    break;							      \
-	  }								      \
-	inptr += 2;							      \
-	*irreversible = *irreversible + 1;				      \
-	continue;							      \
-      }									      \
-									      \
-    *((uint32_t *) outptr) = u1;					      \
-    outptr = (unsigned char *)((uint32_t *) outptr + 1);		      \
-    inptr += 2;								      \
-  }
-#define LOOP_NEED_FLAGS
-#include <iconv/loop.c>
-#include <iconv/skeleton.c>
-
-
-/* Convert from the internal (UCS4-like) format to UCS2.  */
-#define DEFINE_INIT		0
-#define DEFINE_FINI		0
-#define MIN_NEEDED_FROM		4
-#define MIN_NEEDED_TO		2
-#define FROM_DIRECTION		1
-#define FROM_LOOP		internal_ucs2_loop
-#define TO_LOOP			internal_ucs2_loop /* This is not used.  */
-#define FUNCTION_NAME		__gconv_transform_internal_ucs2
-#define ONE_DIRECTION		1
-
-#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
-#define LOOPFCT			FROM_LOOP
-#define BODY \
-  {									      \
-    uint32_t val = *((const uint32_t *) inptr);				      \
-									      \
-    if (__builtin_expect (val >= 0x10000, 0))				      \
-      {									      \
-	UNICODE_TAG_HANDLER (val, 4);					      \
-	STANDARD_ERR_HANDLER (4);					      \
-      }									      \
-    else if (__builtin_expect (val >= 0xd800 && val < 0xe000, 0))	      \
-      {									      \
-	/* Surrogate characters in UCS-4 input are not valid.		      \
-	   We must catch this, because the UCS-2 output might be	      \
-	   interpreted as UTF-16 by other programs.  If we let		      \
-	   surrogates pass through, attackers could make a security	      \
-	   hole exploit by synthesizing any desired plane 1-16		      \
-	   character.  */						      \
-	if (! ignore_errors_p ())					      \
-	  {								      \
-	    result = __GCONV_ILLEGAL_INPUT;				      \
-	    break;							      \
-	  }								      \
-	inptr += 4;							      \
-	*irreversible = *irreversible + 1;				      \
-	continue;							      \
-      }									      \
-    else 								      \
-      {									      \
-	*((uint16_t *) outptr) = val;					      \
-	outptr = (unsigned char *)((uint16_t *) outptr + 1);		      \
-	inptr += 4;							      \
-      }									      \
-  }
-#define LOOP_NEED_FLAGS
-#include <iconv/loop.c>
-#include <iconv/skeleton.c>
-
-
-/* Convert from UCS2 in other endianness to the internal (UCS4-like) format. */
-#define DEFINE_INIT		0
-#define DEFINE_FINI		0
-#define MIN_NEEDED_FROM		2
-#define MIN_NEEDED_TO		4
-#define FROM_DIRECTION		1
-#define FROM_LOOP		ucs2reverse_internal_loop
-#define TO_LOOP			ucs2reverse_internal_loop/* This is not used.*/
-#define FUNCTION_NAME		__gconv_transform_ucs2reverse_internal
-#define ONE_DIRECTION		1
-
-#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
-#define LOOPFCT			FROM_LOOP
-#define BODY \
-  {									      \
-    uint16_t u1 = bswap_16 (*((const uint16_t *) inptr));		      \
-									      \
-    if (__builtin_expect (u1 >= 0xd800 && u1 < 0xe000, 0))		      \
-      {									      \
-	/* Surrogate characters in UCS-2 input are not valid.  Reject	      \
-	   them.  (Catching this here is not security relevant.)  */	      \
-	if (! ignore_errors_p ())					      \
-	  {								      \
-	    result = __GCONV_ILLEGAL_INPUT;				      \
-	    break;							      \
-	  }								      \
-	inptr += 2;							      \
-	*irreversible = *irreversible + 1;				      \
-	continue;							      \
-      }									      \
-									      \
-    *((uint32_t *) outptr) = u1;					      \
-    outptr = (unsigned char *)((uint32_t *) outptr + 1);		      \
-    inptr += 2;								      \
-  }
-#define LOOP_NEED_FLAGS
-#include <iconv/loop.c>
-#include <iconv/skeleton.c>
-
-
-/* Convert from the internal (UCS4-like) format to UCS2 in other endianness. */
-#define DEFINE_INIT		0
-#define DEFINE_FINI		0
-#define MIN_NEEDED_FROM		4
-#define MIN_NEEDED_TO		2
-#define FROM_DIRECTION		1
-#define FROM_LOOP		internal_ucs2reverse_loop
-#define TO_LOOP			internal_ucs2reverse_loop/* This is not used.*/
-#define FUNCTION_NAME		__gconv_transform_internal_ucs2reverse
-#define ONE_DIRECTION		1
-
-#define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
-#define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
-#define LOOPFCT			FROM_LOOP
-#define BODY \
-  {									      \
-    uint32_t val = *((const uint32_t *) inptr);				      \
-    if (__builtin_expect (val >= 0x10000, 0))				      \
-      {									      \
-	UNICODE_TAG_HANDLER (val, 4);					      \
-	STANDARD_ERR_HANDLER (4);					      \
-      }									      \
-    else if (__builtin_expect (val >= 0xd800 && val < 0xe000, 0))	      \
-      {									      \
-	/* Surrogate characters in UCS-4 input are not valid.		      \
-	   We must catch this, because the UCS-2 output might be	      \
-	   interpreted as UTF-16 by other programs.  If we let		      \
-	   surrogates pass through, attackers could make a security	      \
-	   hole exploit by synthesizing any desired plane 1-16		      \
-	   character.  */						      \
-	if (! ignore_errors_p ())					      \
-	  {								      \
-	    result = __GCONV_ILLEGAL_INPUT;				      \
-	    break;							      \
-	  }								      \
-	inptr += 4;							      \
-	*irreversible = *irreversible + 1;				      \
-	continue;							      \
-      }									      \
-    else 								      \
-      {									      \
-	*((uint16_t *) outptr) = bswap_16 (val);			      \
-	outptr = (unsigned char *)((uint16_t *) outptr + 1);		      \
-	inptr += 4;							      \
-      }									      \
-  }
-#define LOOP_NEED_FLAGS
-#include <iconv/loop.c>
-#include <iconv/skeleton.c>
diff --git a/newlib/libc/sys/linux/iconv/gconv_trans.c b/newlib/libc/sys/linux/iconv/gconv_trans.c
deleted file mode 100644
index dcc1004..0000000
--- a/newlib/libc/sys/linux/iconv/gconv_trans.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/* Transliteration using the locale's data.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <dlfcn.h>
-#include <search.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dirent.h>
-#include <ltdl.h>
-
-#include "gconv_int.h"
-#include "localeinfo.h"
-
-int
-__gconv_transliterate (struct __gconv_step *step,
-		       struct __gconv_step_data *step_data,
-		       void *trans_data __attribute__ ((unused)),
-		       const unsigned char *inbufstart,
-		       const unsigned char **inbufp,
-		       const unsigned char *inbufend,
-		       unsigned char **outbufstart, size_t *irreversible)
-{
-  return 0;
-}
-
-
-/* Structure to represent results of found (or not) transliteration
-   modules.  */
-struct known_trans
-{
-  /* This structure must remain the first member.  */
-  struct trans_struct info;
-
-  char *fname;
-  void *handle;
-  int open_count;
-};
-
-
-/* Tree with results of previous calls to __gconv_translit_find.  */
-static void *search_tree;
-
-/* We modify global data.   */
-__LOCK_INIT(static, lock);
-
-/* Compare two transliteration entries.  */
-static int
-trans_compare (const void *p1, const void *p2)
-{
-  const struct known_trans *s1 = (const struct known_trans *) p1;
-  const struct known_trans *s2 = (const struct known_trans *) p2;
-
-  return strcmp (s1->info.name, s2->info.name);
-}
-
-
-/* Open (maybe reopen) the module named in the struct.  Get the function
-   and data structure pointers we need.  */
-static int
-open_translit (struct known_trans *trans)
-{
-  __gconv_trans_query_fct queryfct;
-
-  trans->handle = __libc_dlopen (trans->fname);
-  if (trans->handle == NULL)
-    /* Not available.  */
-    return 1;
-
-  /* Find the required symbol.  */
-  queryfct = __libc_dlsym (trans->handle, "gconv_trans_context");
-  if (queryfct == NULL)
-    {
-      /* We cannot live with that.  */
-    close_and_out:
-      __libc_dlclose (trans->handle);
-      trans->handle = NULL;
-      return 1;
-    }
-
-  /* Get the context.  */
-  if (queryfct (trans->info.name, &trans->info.csnames, &trans->info.ncsnames)
-      != 0)
-    goto close_and_out;
-
-  /* Of course we also have to have the actual function.  */
-  trans->info.trans_fct = __libc_dlsym (trans->handle, "gconv_trans");
-  if (trans->info.trans_fct == NULL)
-    goto close_and_out;
-
-  /* Now the optional functions.  */
-  trans->info.trans_init_fct =
-    __libc_dlsym (trans->handle, "gconv_trans_init");
-  trans->info.trans_context_fct =
-    __libc_dlsym (trans->handle, "gconv_trans_context");
-  trans->info.trans_end_fct =
-    __libc_dlsym (trans->handle, "gconv_trans_end");
-
-  trans->open_count = 1;
-
-  return 0;
-}
-
-
-int
-internal_function
-__gconv_translit_find (struct trans_struct *trans)
-{
-  struct known_trans **found;
-  const struct path_elem *runp;
-  int res = 1;
-
-  /* We have to have a name.  */
-  assert (trans->name != NULL);
-
-  /* Acquire the lock.  */
-#ifdef HAVE_DD_LOCK
-  __lock_acquire(lock);
-#endif
-
-  /* See whether we know this module already.  */
-  found = tfind (trans, &search_tree, trans_compare);
-  if (found != NULL)
-    {
-      /* Is this module available?  */
-      if ((*found)->handle != NULL)
-	{
-	  /* Maybe we have to reopen the file.  */
-	  if ((*found)->handle != (void *) -1)
-	    /* The object is not unloaded.  */
-	    res = 0;
-	  else if (open_translit (*found) == 0)
-	    {
-	      /* Copy the data.  */
-	      *trans = (*found)->info;
-	      (*found)->open_count++;
-	      res = 0;
-	    }
-	}
-    }
-  else
-    {
-      size_t name_len = strlen (trans->name) + 1;
-      int need_so = 0;
-      struct known_trans *newp;
-
-      /* We have to continue looking for the module.  */
-      if (__gconv_path_elem == NULL)
-	__gconv_get_path ();
-
-      /* See whether we have to append .so.  */
-      if (name_len <= 4 || memcmp (&trans->name[name_len - 4], ".so", 3) != 0)
-	need_so = 1;
-
-      /* Create a new entry.  */
-      newp = (struct known_trans *) malloc (sizeof (struct known_trans)
-					    + (__gconv_max_path_elem_len
-					       + name_len + 3)
-					    + name_len);
-      if (newp != NULL)
-	{
-	  char *cp;
-
-	  /* Clear the struct.  */
-	  memset (newp, '\0', sizeof (struct known_trans));
-
-	  /* Store a copy of the module name.  */
-	  newp->info.name = cp = (char *) (newp + 1);
-	  cp = memcpy (cp, trans->name, name_len);
-          cp += name_len;
-
-	  newp->fname = cp;
-
-	  /* Search in all the directories.  */
-	  for (runp = __gconv_path_elem; runp->name != NULL; ++runp)
-	    {
-              strcpy ((char *) newp->fname, runp->name);
-              while(newp->fname != '\0') newp->fname++;
-
-	      cp = memcpy (newp->fname,
-                            trans->name, name_len);
-              cp += name_len;
-	      if (need_so)
-		memcpy (cp, ".so", sizeof (".so"));
-
-	      if (open_translit (newp) == 0)
-		{
-		  /* We found a module.  */
-		  res = 0;
-		  break;
-		}
-	    }
-
-	  if (res)
-	    newp->fname = NULL;
-
-	  /* In any case we'll add the entry to our search tree.  */
-	  if (tsearch (newp, &search_tree, trans_compare) == NULL)
-	    {
-	      /* Yickes, this should not happen.  Unload the object.  */
-	      res = 1;
-	      /* XXX unload here.  */
-	    }
-	}
-    }
-
-#ifdef HAVE_DD_LOCK
-  __lock_release(lock);
-#endif
-
-  return res;
-}
diff --git a/newlib/libc/sys/linux/iconv/hash-string.h b/newlib/libc/sys/linux/iconv/hash-string.h
deleted file mode 100644
index ae4bcfb..0000000
--- a/newlib/libc/sys/linux/iconv/hash-string.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Implements a string hashing function.
-   Copyright (C) 1995, 1997, 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-/* We assume to have `unsigned long int' value with at least 32 bits.  */
-#define HASHWORDBITS 32
-
-
-/* Defines the so called `hashpjw' function by P.J. Weinberger
-   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-   1986, 1987 Bell Telephone Laboratories, Inc.]  */
-static unsigned long int hash_string PARAMS ((const char *__str_param));
-
-static inline unsigned long int
-hash_string (str_param)
-     const char *str_param;
-{
-  unsigned long int hval, g;
-  const char *str = str_param;
-
-  /* Compute the hash value for the given string.  */
-  hval = 0;
-  while (*str != '\0')
-    {
-      hval <<= 4;
-      hval += (unsigned long int) *str++;
-      g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
-      if (g != 0)
-	{
-	  hval ^= g >> (HASHWORDBITS - 8);
-	  hval ^= g;
-	}
-    }
-  return hval;
-}
diff --git a/newlib/libc/sys/linux/iconv/iconv.c b/newlib/libc/sys/linux/iconv/iconv.c
deleted file mode 100644
index d0f5528..0000000
--- a/newlib/libc/sys/linux/iconv/iconv.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Convert characters in input buffer using conversion descriptor to
-   output buffer.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stddef.h> /* for NULL */
-#include <errno.h>
-#include <iconv.h>
-
-#include <gconv_int.h>
-
-#include <assert.h>
-
-
-size_t
-iconv (iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf,
-       size_t *outbytesleft)
-{
-  __gconv_t gcd = (__gconv_t) cd;
-  char *outstart = outbuf ? *outbuf : NULL;
-  size_t irreversible;
-  int result;
-
-  if (__builtin_expect (inbuf == NULL || *inbuf == NULL, 0))
-    {
-      if (outbuf == NULL || *outbuf == NULL)
-	result = __gconv (gcd, NULL, NULL, NULL, NULL, &irreversible);
-      else
-	result = __gconv (gcd, NULL, NULL, (unsigned char **) outbuf,
-			  (unsigned char *) (outstart + *outbytesleft),
-			  &irreversible);
-    }
-  else
-    {
-      const char *instart = *inbuf;
-
-      result = __gconv (gcd, (const unsigned char **) inbuf,
-			(const unsigned char *)  (*inbuf + *inbytesleft),
-			(unsigned char **) outbuf,
-			(unsigned char *) (*outbuf + *outbytesleft),
-			&irreversible);
-
-      *inbytesleft -= *inbuf - instart;
-    }
-  if (outstart != NULL)
-    *outbytesleft -= *outbuf - outstart;
-
-  switch (__builtin_expect (result, __GCONV_OK))
-    {
-    case __GCONV_ILLEGAL_DESCRIPTOR:
-      __set_errno (EBADF);
-      irreversible = (size_t) -1L;
-      break;
-
-    case __GCONV_ILLEGAL_INPUT:
-      __set_errno (EILSEQ);
-      irreversible = (size_t) -1L;
-      break;
-
-    case __GCONV_FULL_OUTPUT:
-      __set_errno (E2BIG);
-      irreversible = (size_t) -1L;
-      break;
-
-    case __GCONV_INCOMPLETE_INPUT:
-      __set_errno (EINVAL);
-      irreversible = (size_t) -1L;
-      break;
-
-    case __GCONV_EMPTY_INPUT:
-    case __GCONV_OK:
-      /* Nothing.  */
-      break;
-
-    default:
-      assert (!"Nothing like this should happen");
-    }
-
-  return irreversible;
-}
diff --git a/newlib/libc/sys/linux/iconv/iconv.h b/newlib/libc/sys/linux/iconv/iconv.h
deleted file mode 100644
index 5a795dc..0000000
--- a/newlib/libc/sys/linux/iconv/iconv.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _ICONV_H
-#define _ICONV_H	1
-
-#include <features.h>
-#define __need_size_t
-#include <stddef.h>
-
-
-__BEGIN_DECLS
-
-/* Identifier for conversion method from one codeset to another.  */
-typedef void *iconv_t;
-
-
-/* Allocate descriptor for code conversion from codeset FROMCODE to
-   codeset TOCODE.  */
-extern iconv_t iconv_open (__const char *__tocode, __const char *__fromcode)
-     __THROW;
-
-/* Convert at most *INBYTESLEFT bytes from *INBUF according to the
-   code conversion algorithm specified by CD and place up to
-   *OUTBYTESLEFT bytes in buffer at *OUTBUF.  */
-extern size_t iconv (iconv_t __cd, char **__restrict __inbuf,
-		     size_t *__restrict __inbytesleft,
-		     char **__restrict __outbuf,
-		     size_t *__restrict __outbytesleft);
-
-/* Free resources allocated for descriptor CD for code conversion.  */
-extern int iconv_close (iconv_t __cd) __THROW;
-
-__END_DECLS
-
-#endif /* iconv.h */
diff --git a/newlib/libc/sys/linux/iconv/iconv_charmap.c b/newlib/libc/sys/linux/iconv/iconv_charmap.c
deleted file mode 100644
index 141c8ec..0000000
--- a/newlib/libc/sys/linux/iconv/iconv_charmap.c
+++ /dev/null
@@ -1,563 +0,0 @@
-/* Convert using charmaps and possibly iconv().
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <errno.h>
-#include <error.h>
-#include <fcntl.h>
-#include <iconv.h>
-#include <libintl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-
-#include "iconv_prog.h"
-
-
-/* Prototypes for a few program-wide used functions.  */
-extern void *xmalloc (size_t __n);
-extern void *xcalloc (size_t __n, size_t __s);
-
-
-struct convtable
-{
-  int term[256 / 8];
-  union
-  {
-    struct convtable *sub;
-    struct charseq *out;
-  } val[256];
-};
-
-
-static inline struct convtable *
-allocate_table (void)
-{
-  return (struct convtable *) xcalloc (1, sizeof (struct convtable));
-}
-
-
-static inline int
-is_term (struct convtable *tbl, unsigned int idx)
-{
-  return tbl->term[idx / 8] & (1 << (idx % 8));
-}
-
-
-static inline void
-clear_term (struct convtable *tbl, unsigned int idx)
-{
-  tbl->term[idx / 8] &= ~(1 << (idx % 8));
-}
-
-
-static inline void
-set_term (struct convtable *tbl, unsigned int idx)
-{
-  tbl->term[idx / 8] |= 1 << (idx % 8);
-}
-
-
-/* Generate the conversion table.  */
-static struct convtable *use_from_charmap (struct charmap_t *from_charmap,
-					   const char *to_code);
-static struct convtable *use_to_charmap (const char *from_code,
-					 struct charmap_t *to_charmap);
-static struct convtable *use_both_charmaps (struct charmap_t *from_charmap,
-					    struct charmap_t *to_charmap);
-
-/* Prototypes for the functions doing the actual work.  */
-static int process_block (struct convtable *tbl, char *addr, size_t len,
-			  FILE *output);
-static int process_fd (struct convtable *tbl, int fd, FILE *output);
-static int process_file (struct convtable *tbl, FILE *input, FILE *output);
-
-
-int
-charmap_conversion (const char *from_code, struct charmap_t *from_charmap,
-		    const char *to_code, struct charmap_t *to_charmap,
-		    int argc, int remaining, char *argv[], FILE *output)
-{
-  struct convtable *cvtbl;
-  int status = EXIT_SUCCESS;
-
-  /* We have three different cases to handle:
-
-     - both, from_charmap and to_charmap, are available.  This means we
-       can assume that the symbolic names match and use them to create
-       the mapping.
-
-     - only from_charmap is available.  In this case we can only hope that
-       the symbolic names used are of the <Uxxxx> form in which case we
-       can use a UCS4->"to_code" iconv() conversion for the second step.
-
-     - only to_charmap is available.  This is similar, only that we would
-       use iconv() for the "to_code"->UCS4 conversion.
-
-       We first create a table which maps input bytes into output bytes.
-       Once this is done we can handle all three of the cases above
-       equally.  */
-  if (from_charmap != NULL)
-    {
-      if (to_charmap == NULL)
-	cvtbl = use_from_charmap (from_charmap, to_code);
-      else
-	cvtbl = use_both_charmaps (from_charmap, to_charmap);
-    }
-  else
-    {
-      assert (to_charmap != NULL);
-      cvtbl = use_to_charmap (from_code, to_charmap);
-    }
-
-  /* If we couldn't generate a table stop now.  */
-  if (cvtbl == NULL)
-    return EXIT_FAILURE;
-
-  /* We can now start the conversion.  */
-  if (remaining == argc)
-    {
-      if (process_file (cvtbl, stdin, output) != 0)
-	status = EXIT_FAILURE;
-    }
-  else
-    do
-      {
-	struct stat st;
-	char *addr;
-	int fd;
-
-	if (verbose)
-	  printf ("%s:\n", argv[remaining]);
-	if (strcmp (argv[remaining], "-") == 0)
-	  fd = 0;
-	else
-	  {
-	    fd = open (argv[remaining], O_RDONLY);
-
-	    if (fd == -1)
-	      {
-		error (0, errno, _("cannot open input file `%s'"),
-		       argv[remaining]);
-		status = EXIT_FAILURE;
-		continue;
-	      }
-	  }
-
-#ifdef _POSIX_MAPPED_FILES
-	/* We have possibilities for reading the input file.  First try
-	   to mmap() it since this will provide the fastest solution.  */
-	if (fstat (fd, &st) == 0
-	    && ((addr = mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE,
-			      fd, 0)) != MAP_FAILED))
-	  {
-	    /* Yes, we can use mmap().  The descriptor is not needed
-	       anymore.  */
-	    if (close (fd) != 0)
-	      error (EXIT_FAILURE, errno,
-		     _("error while closing input `%s'"), argv[remaining]);
-
-	    if (process_block (cvtbl, addr, st.st_size, output) < 0)
-	      {
-		/* Something went wrong.  */
-		status = EXIT_FAILURE;
-
-		/* We don't need the input data anymore.  */
-		munmap ((void *) addr, st.st_size);
-
-		/* We cannot go on with producing output since it might
-		   lead to problem because the last output might leave
-		   the output stream in an undefined state.  */
-		break;
-	      }
-
-	    /* We don't need the input data anymore.  */
-	    munmap ((void *) addr, st.st_size);
-	  }
-	else
-#endif	/* _POSIX_MAPPED_FILES */
-	  {
-	    /* Read the file in pieces.  */
-	    if (process_fd (cvtbl, fd, output) != 0)
-	      {
-		/* Something went wrong.  */
-		status = EXIT_FAILURE;
-
-		/* We don't need the input file anymore.  */
-		close (fd);
-
-		/* We cannot go on with producing output since it might
-		   lead to problem because the last output might leave
-		   the output stream in an undefined state.  */
-		break;
-	      }
-
-	    /* Now close the file.  */
-	    close (fd);
-	  }
-      }
-    while (++remaining < argc);
-
-  /* All done.  */
-  return status;
-}
-
-
-static void
-add_bytes (struct convtable *tbl, struct charseq *in, struct charseq *out)
-{
-  int n = 0;
-  unsigned int byte;
-
-  assert (in->nbytes > 0);
-
-  byte = ((unsigned char *) in->bytes)[n];
-  while (n + 1 < in->nbytes)
-    {
-      if (is_term (tbl, byte) || tbl->val[byte].sub == NULL)
-	{
-	  /* Note that we simply ignore a definition for a byte sequence
-	     which is also the prefix for a longer one.  */
-	  clear_term (tbl, byte);
-	  tbl->val[byte].sub =
-	    (struct convtable *) xcalloc (1, sizeof (struct convtable));
-	}
-
-      tbl = tbl->val[byte].sub;
-
-      byte = ((unsigned char *) in->bytes)[++n];
-    }
-
-  /* Only add the new sequence if there is none yet and the byte sequence
-     is not part of an even longer one.  */
-  if (! is_term (tbl, byte) && tbl->val[byte].sub == NULL)
-    {
-      set_term (tbl, byte);
-      tbl->val[byte].out = out;
-    }
-}
-
-
-static struct convtable *
-use_from_charmap (struct charmap_t *from_charmap, const char *to_code)
-{
-  /* We iterate over all entries in the from_charmap and for those which
-     have a known UCS4 representation we use an iconv() call to determine
-     the mapping to the to_code charset.  */
-  struct convtable *rettbl;
-  iconv_t cd;
-  void *ptr = NULL;
-  const void *key;
-  size_t keylen;
-  void *data;
-
-  cd = iconv_open (to_code, "WCHAR_T");
-  if (cd == (iconv_t) -1)
-    /* We cannot do anything.  */
-    return NULL;
-
-  rettbl = allocate_table ();
-
-  while (iterate_table (&from_charmap->char_table, &ptr, &key, &keylen, &data)
-	 >= 0)
-    {
-      struct charseq *in = (struct charseq *) data;
-
-      if (in->ucs4 != UNINITIALIZED_CHAR_VALUE)
-	{
-	  /* There is a chance.  Try the iconv module.  */
-	  wchar_t inbuf[1] = { in->ucs4 };
-	  unsigned char outbuf[64];
-	  char *inptr = (char *) inbuf;
-	  size_t inlen = sizeof (inbuf);
-	  char *outptr = (char *) outbuf;
-	  size_t outlen = sizeof (outbuf);
-
-	  (void) iconv (cd, &inptr, &inlen, &outptr, &outlen);
-
-	  if (outptr != (char *) outbuf)
-	    {
-	      /* We got some output.  Good, use it.  */
-	      struct charseq *newp;
-
-	      outlen = sizeof (outbuf) - outlen;
-	      assert ((char *) outbuf + outlen == outptr);
-
-	      newp = (struct charseq *) xmalloc (sizeof (struct charseq)
-						 + outlen);
-	      newp->name = in->name;
-	      newp->ucs4 = in->ucs4;
-	      newp->nbytes = outlen;
-	      memcpy (newp->bytes, outbuf, outlen);
-
-	      add_bytes (rettbl, in, newp);
-	    }
-
-	  /* Clear any possible state left behind.  */
-	  (void) iconv (cd, NULL, NULL, NULL, NULL);
-	}
-    }
-
-  iconv_close (cd);
-
-  return rettbl;
-}
-
-
-static struct convtable *
-use_to_charmap (const char *from_code, struct charmap_t *to_charmap)
-{
-  /* We iterate over all entries in the to_charmap and for those which
-     have a known UCS4 representation we use an iconv() call to determine
-     the mapping to the from_code charset.  */
-  struct convtable *rettbl;
-  iconv_t cd;
-  void *ptr = NULL;
-  const void *key;
-  size_t keylen;
-  void *data;
-
-  /* Note that the conversion we use here is the reverse direction.  Without
-     exhaustive search we cannot figure out which input yields the UCS4
-     character we are looking for.  Therefore we determine it the other
-     way round.  */
-  cd = iconv_open (from_code, "WCHAR_T");
-  if (cd == (iconv_t) -1)
-    /* We cannot do anything.  */
-    return NULL;
-
-  rettbl = allocate_table ();
-
-  while (iterate_table (&to_charmap->char_table, &ptr, &key, &keylen, &data)
-	 >= 0)
-    {
-      struct charseq *out = (struct charseq *) data;
-
-      if (out->ucs4 != UNINITIALIZED_CHAR_VALUE)
-	{
-	  /* There is a chance.  Try the iconv module.  */
-	  wchar_t inbuf[1] = { out->ucs4 };
-	  unsigned char outbuf[64];
-	  char *inptr = (char *) inbuf;
-	  size_t inlen = sizeof (inbuf);
-	  char *outptr = (char *) outbuf;
-	  size_t outlen = sizeof (outbuf);
-
-	  (void) iconv (cd, &inptr, &inlen, &outptr, &outlen);
-
-	  if (outptr != (char *) outbuf)
-	    {
-	      /* We got some output.  Good, use it.  */
-	      struct charseq *newp;
-
-	      outlen = sizeof (outbuf) - outlen;
-	      assert ((char *) outbuf + outlen == outptr);
-
-	      newp = (struct charseq *) xmalloc (sizeof (struct charseq)
-						 + outlen);
-	      newp->name = out->name;
-	      newp->ucs4 = out->ucs4;
-	      newp->nbytes = outlen;
-	      memcpy (newp->bytes, outbuf, outlen);
-
-	      add_bytes (rettbl, newp, out);
-	    }
-
-	  /* Clear any possible state left behind.  */
-	  (void) iconv (cd, NULL, NULL, NULL, NULL);
-	}
-    }
-
-  iconv_close (cd);
-
-  return rettbl;
-}
-
-
-static struct convtable *
-use_both_charmaps (struct charmap_t *from_charmap,
-		   struct charmap_t *to_charmap)
-{
-  /* In this case we iterate over all the entries in the from_charmap,
-     determine the internal name, and find an appropriate entry in the
-     to_charmap (if it exists).  */
-  struct convtable *rettbl = allocate_table ();
-  void *ptr = NULL;
-  const void *key;
-  size_t keylen;
-  void *data;
-
-  while (iterate_table (&from_charmap->char_table, &ptr, &key, &keylen, &data)
-	 >= 0)
-    {
-      struct charseq *in = (struct charseq *) data;
-      struct charseq *out = charmap_find_value (to_charmap, key, keylen);
-
-      if (out != NULL)
-	add_bytes (rettbl, in, out);
-    }
-
-  return rettbl;
-}
-
-
-static int
-process_block (struct convtable *tbl, char *addr, size_t len, FILE *output)
-{
-  size_t n = 0;
-
-  while (n < len)
-    {
-      struct convtable *cur = tbl;
-      unsigned char *curp = (unsigned char *) addr;
-      unsigned int byte = *curp;
-      int cnt;
-      struct charseq *out;
-
-      while (! is_term (cur, byte))
-	if (cur->val[byte].sub == NULL)
-	  {
-	    /* This is a invalid sequence.  Skip the first byte if we are
-	       ignoring errors.  Otherwise punt.  */
-	    if (! omit_invalid)
-	      {
-		error (0, 0, _("illegal input sequence at position %Zd"), n);
-		return -1;
-	      }
-
-	    n -= curp - (unsigned char *) addr;
-
-	    byte = *(curp = (unsigned char *) ++addr);
-	    if (++n >= len)
-	      /* All converted.  */
-	      return 0;
-
-	    cur = tbl;
-	  }
-	else
-	  {
-	    cur = cur->val[byte].sub;
-
-	    if (++n >= len)
-	      {
-		error (0, 0, _("\
-incomplete character or shift sequence at end of buffer"));
-		return -1;
-	      }
-
-	    byte = *++curp;
-	  }
-
-      /* We found a final byte.  Write the output bytes.  */
-      out = cur->val[byte].out;
-      for (cnt = 0; cnt < out->nbytes; ++cnt)
-	fputc_unlocked (out->bytes[cnt], output);
-
-      addr = (char *) curp + 1;
-      ++n;
-    }
-
-  return 0;
-}
-
-
-static int
-process_fd (struct convtable *tbl, int fd, FILE *output)
-{
-  /* we have a problem with reading from a desriptor since we must not
-     provide the iconv() function an incomplete character or shift
-     sequence at the end of the buffer.  Since we have to deal with
-     arbitrary encodings we must read the whole text in a buffer and
-     process it in one step.  */
-  static char *inbuf = NULL;
-  static size_t maxlen = 0;
-  char *inptr = NULL;
-  size_t actlen = 0;
-
-  while (actlen < maxlen)
-    {
-      ssize_t n = read (fd, inptr, maxlen - actlen);
-
-      if (n == 0)
-	/* No more text to read.  */
-	break;
-
-      if (n == -1)
-	{
-	  /* Error while reading.  */
-	  error (0, errno, _("error while reading the input"));
-	  return -1;
-	}
-
-      inptr += n;
-      actlen += n;
-    }
-
-  if (actlen == maxlen)
-    while (1)
-      {
-	ssize_t n;
-
-	/* Increase the buffer.  */
-	maxlen += 32768;
-	inbuf = realloc (inbuf, maxlen);
-	if (inbuf == NULL)
-	  error (0, errno, _("unable to allocate buffer for input"));
-	inptr = inbuf + actlen;
-
-	do
-	  {
-	    n = read (fd, inptr, maxlen - actlen);
-
-	    if (n == 0)
-	      /* No more text to read.  */
-	      break;
-
-	    if (n == -1)
-	      {
-		/* Error while reading.  */
-		error (0, errno, _("error while reading the input"));
-		return -1;
-	      }
-
-	    inptr += n;
-	    actlen += n;
-	  }
-	while (actlen < maxlen);
-
-	if (n == 0)
-	  /* Break again so we leave both loops.  */
-	  break;
-      }
-
-  /* Now we have all the input in the buffer.  Process it in one run.  */
-  return process_block (tbl, inbuf, actlen, output);
-}
-
-
-static int
-process_file (struct convtable *tbl, FILE *input, FILE *output)
-{
-  /* This should be safe since we use this function only for `stdin' and
-     we haven't read anything so far.  */
-  return process_fd (tbl, fileno (input), output);
-}
diff --git a/newlib/libc/sys/linux/iconv/iconv_close.c b/newlib/libc/sys/linux/iconv/iconv_close.c
deleted file mode 100644
index 038acc6..0000000
--- a/newlib/libc/sys/linux/iconv/iconv_close.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Release any resource associated with given conversion descriptor.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <iconv.h>
-
-#include <gconv_int.h>
-
-
-int
-iconv_close (iconv_t cd)
-{
-  if (__builtin_expect (cd == (iconv_t *) -1L, 0))
-    {
-      __set_errno (EBADF);
-      return -1;
-    }
-
-  return __gconv_close ((__gconv_t) cd) ? -1 : 0;
-}
diff --git a/newlib/libc/sys/linux/iconv/iconv_open.c b/newlib/libc/sys/linux/iconv/iconv_open.c
deleted file mode 100644
index ac44af8..0000000
--- a/newlib/libc/sys/linux/iconv/iconv_open.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Get descriptor for character set conversion.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <iconv.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gconv_int.h>
-#include "gconv_charset.h"
-
-
-iconv_t
-iconv_open (const char *tocode, const char *fromcode)
-{
-  char *tocode_conv;
-  char *fromcode_conv;
-  size_t tocode_len;
-  size_t fromcode_len;
-  __gconv_t cd;
-  int res;
-
-  /* Normalize the name.  We remove all characters beside alpha-numeric,
-     '_', '-', '/', and '.'.  */
-  tocode_len = strlen (tocode);
-  tocode_conv = alloca (tocode_len + 3);
-  strip (tocode_conv, tocode);
-  tocode = tocode_conv[2] == '\0' ? upstr (tocode_conv, tocode) : tocode_conv;
-
-  fromcode_len = strlen (fromcode);
-  fromcode_conv = alloca (fromcode_len + 3);
-  strip (fromcode_conv, fromcode);
-  fromcode = (fromcode_conv[2] == '\0'
-	      ? upstr (fromcode_conv, fromcode) : fromcode_conv);
-
-  res = __gconv_open (tocode, fromcode, &cd, 0);
-
-  if (__builtin_expect (res, __GCONV_OK) != __GCONV_OK)
-    {
-      /* We must set the error number according to the specs.  */
-      if (res == __GCONV_NOCONV || res == __GCONV_NODB)
-	__set_errno (EINVAL);
-
-      return (iconv_t) -1;
-    }
-
-  return (iconv_t) cd;
-}
diff --git a/newlib/libc/sys/linux/iconv/iconvconfig.c b/newlib/libc/sys/linux/iconv/iconvconfig.c
deleted file mode 100644
index 8ad6c93..0000000
--- a/newlib/libc/sys/linux/iconv/iconvconfig.c
+++ /dev/null
@@ -1,1176 +0,0 @@
-/* Generate fastloading iconv module configuration files.
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <argp.h>
-#include <assert.h>
-#include <error.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <libintl.h>
-#include <locale.h>
-#include <mcheck.h>
-#include <search.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdio_ext.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/cdefs.h>
-#include <sys/uio.h>
-
-#include "iconvconfig.h"
-
-/* Get libc version number.  */
-#include "../version.h"
-
-#define PACKAGE _libc_intl_domainname
-
-
-/* The hashing function we use.  */
-#include "../intl/hash-string.h"
-
-
-/* Types used.  */
-struct module
-{
-  char *fromname;
-  struct Strent *fromname_strent;
-  char *filename;
-  struct Strent *filename_strent;
-  const char *directory;
-  struct Strent *directory_strent;
-  struct module *next;
-  int cost;
-  struct Strent *toname_strent;
-  char toname[0];
-};
-
-struct alias
-{
-  char *fromname;
-  struct Strent *froment;
-  struct module *module;
-  struct Strent *toent;
-  char toname[0];
-};
-
-struct name
-{
-  const char *name;
-  struct Strent *strent;
-  int module_idx;
-  uint32_t hashval;
-};
-
-struct name_info
-{
-  const char *canonical_name;
-  struct Strent *canonical_strent;
-
-  struct module *from_internal;
-  struct module *to_internal;
-
-  struct other_conv_list
-  {
-    int dest_idx;
-    struct other_conv
-    {
-      gidx_t module_idx;
-      struct module *module;
-      struct other_conv *next;
-    } other_conv;
-    struct other_conv_list *next;
-  } *other_conv_list;
-};
-
-
-/* Name and version of program.  */
-static void print_version (FILE *stream, struct argp_state *state);
-void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version;
-
-/* Short description of program.  */
-static const char doc[] = N_("\
-Create fastloading iconv module configuration file.");
-
-/* Strings for arguments in help texts.  */
-static const char args_doc[] = N_("[DIR...]");
-
-/* Function to print some extra text in the help message.  */
-static char *more_help (int key, const char *text, void *input);
-
-/* Data structure to communicate with argp functions.  */
-static struct argp argp =
-{
-  NULL, NULL, args_doc, doc, NULL, more_help
-};
-
-
-/* The function doing the actual work.  */
-static int handle_dir (const char *dir);
-
-/* Add all known builtin conversions and aliases.  */
-static void add_builtins (void);
-
-/* Create list of all aliases without circular aliases.  */
-static void get_aliases (void);
-
-/* Create list of all modules.  */
-static void get_modules (void);
-
-/* Get list of all the names and thereby indexing them.  */
-static void generate_name_list (void);
-
-/* Collect information about all the names.  */
-static void generate_name_info (void);
-
-/* Write the output file.  */
-static int write_output (void);
-
-
-/* Search tree of the modules we know.  */
-static void *modules;
-
-/* Search tree of the aliases we know.  */
-static void *aliases;
-
-/* Search tree for name to index mapping.  */
-static void *names;
-
-/* Number of names we know about.  */
-static int nnames;
-
-/* List of all aliases.  */
-static struct alias **alias_list;
-static size_t nalias_list;
-static size_t nalias_list_max;
-
-/* List of all modules.  */
-static struct module **module_list;
-static size_t nmodule_list;
-static size_t nmodule_list_max;
-
-/* Names and information about them.  */
-static struct name_info *name_info;
-static size_t nname_info;
-
-/* Number of translations not from or to INTERNAL.  */
-static size_t nextra_modules;
-
-
-/* Names and aliases for the builtin transformations.  */
-static struct
-{
-  const char *from;
-  const char *to;
-} builtin_alias[] =
-  {
-#define BUILTIN_ALIAS(alias, real) \
-    { .from = alias, .to = real },
-#define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, MinF, MaxF, \
-			       MinT, MaxT)
-#include <gconv_builtin.h>
-  };
-#undef BUILTIN_ALIAS
-#undef BUILTIN_TRANSFORMATION
-#define nbuiltin_alias (sizeof (builtin_alias) / sizeof (builtin_alias[0]))
-
-static struct
-{
-  const char *from;
-  const char *to;
-  const char *module;
-  int cost;
-} builtin_trans[] =
-  {
-#define BUILTIN_ALIAS(alias, real)
-#define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, MinF, MaxF, \
-			       MinT, MaxT) \
-    { .from = From, .to = To, .module = Name, .cost = Cost },
-#include <gconv_builtin.h>
-  };
-#define nbuiltin_trans (sizeof (builtin_trans) / sizeof (builtin_trans[0]))
-
-
-/* Filename extension for the modules.  */
-#ifndef MODULE_EXT
-# define MODULE_EXT ".so"
-#endif
-static const char gconv_module_ext[] = MODULE_EXT;
-
-
-extern void *xmalloc (size_t n) __attribute_malloc__;
-extern void *xcalloc (size_t n, size_t m) __attribute_malloc__;
-extern void *xrealloc (void *p, size_t n);
-
-
-/* C string table handling.  */
-struct Strtab;
-struct Strent;
-
-/* Create new C string table object in memory.  */
-extern struct Strtab *strtabinit (void);
-
-/* Free resources allocated for C string table ST.  */
-extern void strtabfree (struct Strtab *st);
-
-/* Add string STR (length LEN is != 0) to C string table ST.  */
-extern struct Strent *strtabadd (struct Strtab *st, const char *str,
-				 size_t len);
-
-/* Finalize string table ST and store size in *SIZE and return a pointer.  */
-extern void *strtabfinalize (struct Strtab *st, size_t *size);
-
-/* Get offset in string table for string associated with SE.  */
-extern size_t strtaboffset (struct Strent *se);
-
-/* String table we construct.  */
-static struct Strtab *strtab;
-
-
-
-int
-main (int argc, char *argv[])
-{
-  int remaining;
-  int status = 0;
-  char *path;
-  char *tp;
-  const char *old = GCONV_PATH;
-  size_t len = strlen (old) + 1;
-  char *new = alloca(len);
-
-  /* Enable memory use testing.  */
-  /* mcheck_pedantic (NULL); */
-  mtrace ();
-
-  /* Set locale via LC_ALL.  */
-  setlocale (LC_ALL, "");
-
-  /* Set the text message domain.  */
-  textdomain (_libc_intl_domainname);
-
-  /* Parse and process arguments.  */
-  argp_parse (&argp, argc, argv, 0, &remaining, NULL);
-
-  /* Initialize the string table.  */
-  strtab = strtabinit ();
-
-  /* Handle all directories mentioned.  */
-  while (remaining < argc)
-    status |= handle_dir (argv[remaining++]);
-
-  /* In any case also handle the standard directory.  */
-  path = memcpy (new, old, len);
-  tp = strtok (path, ":");
-  while (tp != NULL)
-    {
-      status |= handle_dir (tp);
-
-      tp = strtok (NULL, ":");
-    }
-
-  /* Add the builtin transformations and aliases without overwriting
-     anything.  */
-  add_builtins ();
-
-  /* Store aliases in an array.  */
-  get_aliases ();
-
-  /* Get list of all modules.  */
-  get_modules ();
-
-  /* Generate list of all the names we know to handle in some way.  */
-  generate_name_list ();
-
-  /* Now we know all the names we will handle, collect information
-     about them.  */
-  generate_name_info ();
-
-  /* Write the output file, but only if we haven't seen any error.  */
-  if (status == 0)
-    status = write_output ();
-  else
-    error (1, 0, _("no output file produced because warning were issued"));
-
-  return status;
-}
-
-
-static char *
-more_help (int key, const char *text, void *input)
-{
-  switch (key)
-    {
-    case ARGP_KEY_HELP_EXTRA:
-      /* We print some extra information.  */
-      return strdup (gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"));
-    default:
-      break;
-    }
-  return (char *) text;
-}
-
-
-/* Print the version information.  */
-static void
-print_version (FILE *stream, struct argp_state *state)
-{
-  fprintf (stream, "iconvconfig (GNU %s) %s\n", PACKAGE, VERSION);
-  fprintf (stream, gettext ("\
-Copyright (C) %s Free Software Foundation, Inc.\n\
-This is free software; see the source for copying conditions.  There is NO\n\
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-"), "2002");
-  fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper");
-}
-
-
-static int
-alias_compare (const void *p1, const void *p2)
-{
-  const struct alias *a1 = (const struct alias *) p1;
-  const struct alias *a2 = (const struct alias *) p2;
-
-  return strcmp (a1->fromname, a2->fromname);
-}
-
-
-static void
-new_alias (const char *fromname, size_t fromlen, const char *toname,
-	   size_t tolen)
-{
-  struct alias *newp;
-  void **inserted;
-
-  newp = (struct alias *) xmalloc (sizeof (struct alias) + fromlen + tolen);
-
-  newp->fromname = memcpy (newp->toname, toname, tolen);
-  newp->fromname += tolen;
-  memcpy (newp->fromname, fromname, fromlen);
-  newp->module = NULL;
-
-  inserted = (void **) tsearch (newp, &aliases, alias_compare);
-  if (inserted == NULL)
-    error (EXIT_FAILURE, errno, gettext ("while inserting in search tree"));
-  if (*inserted != newp)
-    /* Something went wrong, free this entry.  */
-    free (newp);
-  else
-    {
-      newp->froment = strtabadd (strtab, newp->fromname, fromlen);
-      newp->toent = strtabadd (strtab, newp->toname, tolen);
-    }
-}
-
-
-/* Add new alias.  */
-static void
-add_alias (char *rp)
-{
-  /* We now expect two more string.  The strings are normalized
-     (converted to UPPER case) and strored in the alias database.  */
-  char *from;
-  char *to;
-  char *wp;
-
-  while (isspace (*rp))
-    ++rp;
-  from = wp = rp;
-  while (*rp != '\0' && !isspace (*rp))
-    *wp++ = toupper (*rp++);
-  if (*rp == '\0')
-    /* There is no `to' string on the line.  Ignore it.  */
-    return;
-  *wp++ = '\0';
-  to = ++rp;
-  while (isspace (*rp))
-    ++rp;
-  while (*rp != '\0' && !isspace (*rp))
-    *wp++ = toupper (*rp++);
-  if (to == wp)
-    /* No `to' string, ignore the line.  */
-    return;
-  *wp++ = '\0';
-
-  assert (strlen (from) + 1 == to - from);
-  assert (strlen (to) + 1 == wp - to);
-
-  new_alias (from, to - from, to, wp - to);
-}
-
-
-static void
-append_alias (const void *nodep, VISIT value, int level)
-{
-  if (value != leaf && value != postorder)
-    return;
-
-  if (nalias_list_max == nalias_list)
-    {
-      nalias_list_max += 50;
-      alias_list = (struct alias **) xrealloc (alias_list,
-					       (nalias_list_max
-						* sizeof (struct alias *)));
-    }
-
-  alias_list[nalias_list++] = *(struct alias **) nodep;
-}
-
-
-static void
-get_aliases (void)
-{
-  twalk (aliases, append_alias);
-}
-
-
-static int
-module_compare (const void *p1, const void *p2)
-{
-  const struct module *m1 = (const struct module *) p1;
-  const struct module *m2 = (const struct module *) p2;
-  int result;
-
-  result = strcmp (m1->fromname, m2->fromname);
-  if (result == 0)
-    result = strcmp (m1->toname, m2->toname);
-
-  return result;
-}
-
-
-/* Create new module record.  */
-static void
-new_module (const char *fromname, size_t fromlen, const char *toname,
-	    size_t tolen, const char *directory,
-	    const char *filename, size_t filelen, int cost, size_t need_ext)
-{
-  struct module *new_module;
-  size_t dirlen = strlen (directory) + 1;
-  char *tmp;
-  void **inserted;
-
-  new_module = (struct module *) xmalloc (sizeof (struct module)
-					  + fromlen + tolen + filelen
-					  + need_ext);
-
-  new_module->fromname = memcpy (new_module->toname, toname, tolen);
-  new_module->fromname += tolen;
-
-  new_module->filename = memcpy (new_module->fromname, fromname, fromlen);
-  new_module->filename += fromlen;
-
-  new_module->cost = cost;
-  new_module->next = NULL;
-
-  tmp = memcpy (new_module->filename, filename, filelen);
-  tmp += filelen;
-
-  if (need_ext)
-    {
-      memcpy (tmp - 1, gconv_module_ext, need_ext + 1);
-      filelen += need_ext;
-    }
-  new_module->directory = directory;
-
-  /* Now insert the new module data structure in our search tree.  */
-  inserted = (void **) tsearch (new_module, &modules, module_compare);
-  if (inserted == NULL)
-    error (EXIT_FAILURE, errno, "while inserting in search tree");
-  if (*inserted != new_module)
-    free (new_module);
-  else
-    {
-      new_module->fromname_strent = strtabadd (strtab, new_module->fromname,
-					       fromlen);
-      new_module->toname_strent = strtabadd (strtab, new_module->toname,
-					     tolen);
-      new_module->filename_strent = strtabadd (strtab, new_module->filename,
-					       filelen);
-      new_module->directory_strent = strtabadd (strtab, directory, dirlen);
-    }
-}
-
-
-/* Add new module.  */
-static void
-internal_function
-add_module (char *rp, const char *directory)
-{
-  /* We expect now
-     1. `from' name
-     2. `to' name
-     3. filename of the module
-     4. an optional cost value
-  */
-  char *from;
-  char *to;
-  char *module;
-  char *wp;
-  int need_ext;
-  int cost;
-
-  while (isspace (*rp))
-    ++rp;
-  from = rp;
-  while (*rp != '\0' && !isspace (*rp))
-    {
-      *rp = toupper (*rp);
-      ++rp;
-    }
-  if (*rp == '\0')
-    return;
-  *rp++ = '\0';
-  to = wp = rp;
-  while (isspace (*rp))
-    ++rp;
-  while (*rp != '\0' && !isspace (*rp))
-    *wp++ = toupper (*rp++);
-  if (*rp == '\0')
-    return;
-  *wp++ = '\0';
-  do
-    ++rp;
-  while (isspace (*rp));
-  module = wp;
-  while (*rp != '\0' && !isspace (*rp))
-    *wp++ = *rp++;
-  if (*rp == '\0')
-    {
-      /* There is no cost, use one by default.  */
-      *wp++ = '\0';
-      cost = 1;
-    }
-  else
-    {
-      /* There might be a cost value.  */
-      char *endp;
-
-      *wp++ = '\0';
-      cost = strtol (rp, &endp, 10);
-      if (rp == endp || cost < 1)
-	/* No useful information.  */
-	cost = 1;
-    }
-
-  if (module[0] == '\0')
-    /* No module name given.  */
-    return;
-
-  /* See whether we must add the ending.  */
-  need_ext = 0;
-  if (wp - module < sizeof (gconv_module_ext)
-      || memcmp (wp - sizeof (gconv_module_ext), gconv_module_ext,
-		 sizeof (gconv_module_ext)) != 0)
-    /* We must add the module extension.  */
-    need_ext = sizeof (gconv_module_ext) - 1;
-
-  assert (strlen (from) + 1 == to - from);
-  assert (strlen (to) + 1 == module - to);
-  assert (strlen (module) + 1 == wp - module);
-
-  new_module (from, to - from, to, module - to, directory, module, wp - module,
-	      cost, need_ext);
-}
-
-
-/* Read the config file and add the data for this directory to that.  */
-static int
-handle_dir (const char *dir)
-{
-  char *infile;
-  FILE *fp;
-  char *line = NULL;
-  size_t linelen = 0;
-  size_t dirlen = strlen (dir);
-  char *tmp;
-
-  if (dir[dirlen - 1] != '/')
-    {
-      char *newp = (char *) xmalloc (dirlen + 2);
-      dir = memcpy (newp, dir, dirlen);
-      newp[dirlen++] = '/';
-      newp[dirlen] = '\0';
-    }
-
-  infile = (char *) alloca (dirlen + sizeof "gconv-modules");
-  tmp = mempcpy (infile, dir, dirlen);
-  tmp += dirlen;
-  strcpy (tmp, "gconv-modules");
-
-  fp = fopen (infile, "r");
-  if (fp == NULL)
-    {
-      error (0, errno, "cannot open `%s'", infile);
-      return 1;
-    }
-
-  /* No threads present.  */
-  __fsetlocking (fp, FSETLOCKING_BYCALLER);
-
-  while (!feof_unlocked (fp))
-    {
-      char *rp, *endp, *word;
-      ssize_t n = __getdelim (&line, &linelen, '\n', fp);
-
-      if (n < 0)
-	/* An error occurred.  */
-	break;
-
-      rp = line;
-      /* Terminate the line (excluding comments or newline) with a NUL
-	 byte to simplify the following code.  */
-      endp = strchr (rp, '#');
-      if (endp != NULL)
-	*endp = '\0';
-      else
-	if (rp[n - 1] == '\n')
-	  rp[n - 1] = '\0';
-
-      while (isspace (*rp))
-	++rp;
-
-      /* If this is an empty line go on with the next one.  */
-      if (rp == endp)
-	continue;
-
-      word = rp;
-      while (*rp != '\0' && !isspace (*rp))
-	++rp;
-
-      if (rp - word == sizeof ("alias") - 1
-	  && memcmp (word, "alias", sizeof ("alias") - 1) == 0)
-	add_alias (rp);
-      else if (rp - word == sizeof ("module") - 1
-	       && memcmp (word, "module", sizeof ("module") - 1) == 0)
-	add_module (rp, dir);
-      /* else */
-	/* Otherwise ignore the line.  */
-    }
-
-  free (line);
-
-  fclose (fp);
-
-  return 0;
-}
-
-
-static void
-append_module (const void *nodep, VISIT value, int level)
-{
-  struct module *mo;
-
-  if (value != leaf && value != postorder)
-    return;
-
-  mo = *(struct module **) nodep;
-
-  if (nmodule_list > 0
-      && strcmp (module_list[nmodule_list - 1]->fromname, mo->fromname) == 0)
-    {
-      /* Same name.  */
-      mo->next = module_list[nmodule_list - 1];
-      module_list[nmodule_list - 1] = mo;
-
-      return;
-    }
-
-  if (nmodule_list_max == nmodule_list)
-    {
-      nmodule_list_max += 50;
-      module_list = (struct module **) xrealloc (module_list,
-						 (nmodule_list_max
-						  * sizeof (struct module *)));
-    }
-
-  module_list[nmodule_list++] = mo;
-}
-
-
-static void
-get_modules (void)
-{
-  twalk (modules, append_module);
-}
-
-
-static void
-add_builtins (void)
-{
-  size_t cnt;
-
-  /* Add all aliases.  */
-  for (cnt = 0; cnt < nbuiltin_alias; ++cnt)
-    new_alias (builtin_alias[cnt].from,
-	       strlen (builtin_alias[cnt].from) + 1,
-	       builtin_alias[cnt].to,
-	       strlen (builtin_alias[cnt].to) + 1);
-
-  /* add the builtin transformations.  */
-  for (cnt = 0; cnt < nbuiltin_trans; ++cnt)
-    new_module (builtin_trans[cnt].from,
-		strlen (builtin_trans[cnt].from) + 1,
-		builtin_trans[cnt].to,
-		strlen (builtin_trans[cnt].to) + 1,
-		"", builtin_trans[cnt].module,
-		strlen (builtin_trans[cnt].module) + 1,
-		builtin_trans[cnt].cost, 0);
-}
-
-
-static int
-name_compare (const void *p1, const void *p2)
-{
-  const struct name *n1 = (const struct name *) p1;
-  const struct name *n2 = (const struct name *) p2;
-
-  return strcmp (n1->name, n2->name);
-}
-
-
-static struct name *
-new_name (const char *str, struct Strent *strent)
-{
-  struct name *newp = (struct name *) xmalloc (sizeof (struct name));
-
-  newp->name = str;
-  newp->strent = strent;
-  newp->module_idx = -1;
-  newp->hashval = hash_string (str);
-
-  ++nnames;
-
-  return newp;
-}
-
-
-static void
-generate_name_list (void)
-{
-  size_t i;
-
-  /* A name we always need.  */
-  tsearch (new_name ("INTERNAL", strtabadd (strtab, "INTERNAL",
-					    sizeof ("INTERNAL"))),
-	   &names, name_compare);
-
-  for (i = 0; i < nmodule_list; ++i)
-    {
-      struct module *runp;
-
-      if (strcmp (module_list[i]->fromname, "INTERNAL") != 0)
-	tsearch (new_name (module_list[i]->fromname,
-			   module_list[i]->fromname_strent),
-		 &names, name_compare);
-
-      for (runp = module_list[i]; runp != NULL; runp = runp->next)
-	if (strcmp (runp->toname, "INTERNAL") != 0)
-	  tsearch (new_name (runp->toname, runp->toname_strent),
-		   &names, name_compare);
-    }
-}
-
-
-static int
-name_to_module_idx (const char *name, int add)
-{
-  struct name **res;
-  struct name fake_name = { .name = name };
-  int idx;
-
-  res = (struct name **) tfind (&fake_name, &names, name_compare);
-  if (res == NULL)
-    abort ();
-
-  idx = (*res)->module_idx;
-  if (idx == -1 && add)
-    /* No module index assigned yet.  */
-    idx = (*res)->module_idx = nname_info++;
-
-  return idx;
-}
-
-
-static void
-generate_name_info (void)
-{
-  size_t i;
-  int idx;
-
-  name_info = (struct name_info *) xcalloc (nmodule_list + 1,
-					    sizeof (struct name_info));
-
-  /* First add a special entry for the INTERNAL name.  This must have
-     index zero.  */
-  idx = name_to_module_idx ("INTERNAL", 1);
-  name_info[0].canonical_name = "INTERNAL";
-  name_info[0].canonical_strent = strtabadd (strtab, "INTERNAL",
-					     sizeof ("INTERNAL"));
-  assert (nname_info == 1);
-
-  for (i = 0; i < nmodule_list; ++i)
-    {
-      struct module *runp;
-
-      for (runp = module_list[i]; runp != NULL; runp = runp->next)
-	if (strcmp (runp->fromname, "INTERNAL") == 0)
-	  {
-	    idx = name_to_module_idx (runp->toname, 1);
-	    name_info[idx].from_internal = runp;
-	    assert (name_info[idx].canonical_name == NULL
-		    || strcmp (name_info[idx].canonical_name,
-			       runp->toname) == 0);
-	    name_info[idx].canonical_name = runp->toname;
-	    name_info[idx].canonical_strent = runp->toname_strent;
-	  }
-	else if (strcmp (runp->toname, "INTERNAL") == 0)
-	  {
-	    idx = name_to_module_idx (runp->fromname, 1);
-	    name_info[idx].to_internal = runp;
-	    assert (name_info[idx].canonical_name == NULL
-		    || strcmp (name_info[idx].canonical_name,
-			       runp->fromname) == 0);
-	    name_info[idx].canonical_name = runp->fromname;
-	    name_info[idx].canonical_strent = runp->fromname_strent;
-	  }
-	else
-	  {
-	    /* This is a transformation not to or from the INTERNAL
-	       encoding.  */
-	    int from_idx = name_to_module_idx (runp->fromname, 1);
-	    int to_idx = name_to_module_idx (runp->toname, 1);
-	    struct other_conv_list *newp;
-
-	    newp = (struct other_conv_list *)
-	      xmalloc (sizeof (struct other_conv_list));
-	    newp->other_conv.module_idx = to_idx;
-	    newp->other_conv.module = runp;
-	    newp->other_conv.next = NULL; /* XXX Allow multiple module sequence */
-	    newp->dest_idx = to_idx;
-	    newp->next = name_info[from_idx].other_conv_list;
-	    name_info[from_idx].other_conv_list = newp;
-	    assert (name_info[from_idx].canonical_name == NULL
-		    || strcmp (name_info[from_idx].canonical_name,
-			       runp->fromname) == 0);
-	    name_info[from_idx].canonical_name = runp->fromname;
-	    name_info[from_idx].canonical_strent = runp->fromname_strent;
-
-	    ++nextra_modules;
-	  }
-    }
-
-  /* Now add the module index information for all the aliases.  */
-  for (i = 0; i < nalias_list; ++i)
-    {
-      struct name fake_name = { .name = alias_list[i]->toname };
-      struct name **tonamep;
-
-      tonamep = (struct name **) tfind (&fake_name, &names, name_compare);
-      if (tonamep != NULL)
-	{
-	  struct name *newp = new_name (alias_list[i]->fromname,
-					alias_list[i]->froment);
-	  newp->module_idx = (*tonamep)->module_idx;
-	  tsearch (newp, &names, name_compare);
-	}
-    }
-}
-
-
-static int
-is_prime (unsigned long int candidate)
-{
-  /* No even number and none less than 10 will be passed here.  */
-  unsigned long int divn = 3;
-  unsigned long int sq = divn * divn;
-
-  while (sq < candidate && candidate % divn != 0)
-    {
-      ++divn;
-      sq += 4 * divn;
-      ++divn;
-    }
-
-  return candidate % divn != 0;
-}
-
-
-static uint32_t
-next_prime (uint32_t seed)
-{
-  /* Make it definitely odd.  */
-  seed |= 1;
-
-  while (!is_prime (seed))
-    seed += 2;
-
-  return seed;
-}
-
-
-/* Format of the output file.
-
-   Offset   Length       Description
-   0000     4            Magic header bytes
-   0004     4            Offset of string table (stoff)
-   0008     4            Offset of name hashing table (hoff)
-   000C     4            Hashing table size (hsize)
-   0010     4            Offset of module table (moff)
-   0014     4            Offset of other conversion module table (ooff)
-
-   stoff    ???          String table
-
-   hoff     8*hsize      Array of tuples
-                            string table offset
-                            module index
-
-   moff     ???          Array of tuples
-                            canonical name offset
-                            from-internal module dir name offset
-                            from-internal module name off
-                            to-internal module dir name offset
-                            to-internal module name offset
-                            offset into other conversion table
-
-   ooff     ???          One or more of
-                            number of steps/modules
-                            one or more of tuple
-                              canonical name offset for output
-                              module dir name offset
-                              module name offset
-                         (following last entry with step count 0)
-*/
-static int
-write_output (void)
-{
-  int fd;
-  char *string_table;
-  size_t string_table_size;
-  struct gconvcache_header header;
-  struct hash_entry *hash_table;
-  size_t hash_size;
-  struct module_entry *module_table;
-  char *extra_table;
-  char *cur_extra_table;
-  size_t n;
-  int idx;
-  struct iovec iov[6];
-  static const gidx_t null_word;
-  size_t total;
-  char tmpfname[sizeof (GCONV_MODULES_CACHE) + strlen (".XXXXXX")];
-
-  /* Function to insert the names.  */
-  static void name_insert (const void *nodep, VISIT value, int level)
-    {
-      struct name *name;
-      unsigned int idx;
-      unsigned int hval2;
-
-      if (value != leaf && value != postorder)
-	return;
-
-      name = *(struct name **) nodep;
-      idx = name->hashval % hash_size;
-      hval2 = 1 + name->hashval % (hash_size - 2);
-
-      while (hash_table[idx].string_offset != 0)
-	if ((idx += hval2) >= hash_size)
-	  idx -= hash_size;
-
-      hash_table[idx].string_offset = strtaboffset (name->strent);
-
-      assert (name->module_idx != -1);
-      hash_table[idx].module_idx = name->module_idx;
-    }
-
-  /* Open the output file.  */
-  strcpy (stpcpy (tmpfname, GCONV_MODULES_CACHE), ".XXXXXX");
-  fd = mkstemp (tmpfname);
-  if (fd == -1)
-    return 1;
-
-  /* Create the string table.  */
-  string_table = strtabfinalize (strtab, &string_table_size);
-
-  /* Create the hashing table.  We know how many strings we have.
-     Creating a perfect hash table is not reasonable here.  Therefore
-     we use open hashing and a table size which is the next prime 40%
-     larger than the number of strings.  */
-  hash_size = next_prime (nnames * 1.4);
-  hash_table = (struct hash_entry *) xcalloc (hash_size,
-					      sizeof (struct hash_entry));
-  /* Fill the hash table.  */
-  twalk (names, name_insert);
-
-  /* Create the section for the module list.  */
-  module_table = (struct module_entry *) xcalloc (sizeof (struct module_entry),
-						  nname_info);
-
-  /* Allocate memory for the non-INTERNAL conversions.  The allocated
-     memory can be more than is actually needed.  */
-  extra_table = (char *) xcalloc (sizeof (struct extra_entry)
-				  + sizeof (gidx_t)
-				  + sizeof (struct extra_entry_module),
-				  nextra_modules);
-  cur_extra_table = extra_table;
-
-  /* Fill in the module information.  */
-  for (n = 0; n < nname_info; ++n)
-    {
-      module_table[n].canonname_offset =
-	strtaboffset (name_info[n].canonical_strent);
-
-      if (name_info[n].from_internal == NULL)
-	{
-	  module_table[n].fromdir_offset = 0;
-	  module_table[n].fromname_offset = 0;
-	}
-      else
-	{
-	  module_table[n].fromdir_offset =
-	    strtaboffset (name_info[n].from_internal->directory_strent);
-	  module_table[n].fromname_offset =
-	    strtaboffset (name_info[n].from_internal->filename_strent);
-	}
-
-      if (name_info[n].to_internal == NULL)
-	{
-	  module_table[n].todir_offset = 0;
-	  module_table[n].toname_offset = 0;
-	}
-      else
-	{
-	  module_table[n].todir_offset =
-	    strtaboffset (name_info[n].to_internal->directory_strent);
-	  module_table[n].toname_offset =
-	    strtaboffset (name_info[n].to_internal->filename_strent);
-	}
-
-      if (name_info[n].other_conv_list != NULL)
-	{
-	  struct other_conv_list *other = name_info[n].other_conv_list;
-
-	  /* Store the reference.  We add 1 to distinguish the entry
-	     at offset zero from the case where no extra modules are
-	     available.  The file reader has to account for the
-	     offset.  */
-	  module_table[n].extra_offset = 1 + cur_extra_table - extra_table;
-
-	  do
-	    {
-	      struct other_conv *runp;
-	      struct extra_entry *extra;
-
-	      /* Allocate new entry.  */
-	      extra = (struct extra_entry *) cur_extra_table;
-	      cur_extra_table += sizeof (struct extra_entry);
-	      extra->module_cnt = 0;
-
-	      runp = &other->other_conv;
-	      do
-		{
-		  cur_extra_table += sizeof (struct extra_entry_module);
-		  extra->module[extra->module_cnt].outname_offset =
-		    runp->next == NULL
-		    ? other->dest_idx : runp->next->module_idx;
-		  extra->module[extra->module_cnt].dir_offset =
-		    strtaboffset (runp->module->directory_strent);
-		  extra->module[extra->module_cnt].name_offset =
-		    strtaboffset (runp->module->filename_strent);
-		  ++extra->module_cnt;
-
-		  runp = runp->next;
-		}
-	      while (runp != NULL);
-
-	      other = other->next;
-	    }
-	  while (other != NULL);
-
-	  /* Final module_cnt is zero.  */
-	  *((gidx_t *) cur_extra_table) = 0;
-	  cur_extra_table += sizeof (gidx_t);
-	}
-    }
-
-  header.magic = GCONVCACHE_MAGIC;
-
-  iov[0].iov_base = &header;
-  iov[0].iov_len = sizeof (struct gconvcache_header);
-  total = iov[0].iov_len;
-
-  header.string_offset = total;
-  iov[1].iov_base = string_table;
-  iov[1].iov_len = string_table_size;
-  total += iov[1].iov_len;
-
-  idx = 2;
-  if ((string_table_size & (sizeof (gidx_t) - 1)) != 0)
-    {
-      iov[2].iov_base = (void *) &null_word;
-      iov[2].iov_len = (sizeof (gidx_t)
-			- (string_table_size & (sizeof (gidx_t) - 1)));
-      total += iov[2].iov_len;
-      ++idx;
-    }
-
-  header.hash_offset = total;
-  header.hash_size = hash_size;
-  iov[idx].iov_base = hash_table;
-  iov[idx].iov_len = hash_size * sizeof (struct hash_entry);
-  total += iov[idx].iov_len;
-  ++idx;
-
-  header.module_offset = total;
-  iov[idx].iov_base = module_table;
-  iov[idx].iov_len = nname_info * sizeof (struct module_entry);
-  total += iov[idx].iov_len;
-  ++idx;
-
-  assert (cur_extra_table - extra_table
-	  <= ((sizeof (struct extra_entry) + sizeof (gidx_t)
-	       + sizeof (struct extra_entry_module))
-	      * nextra_modules));
-  header.otherconv_offset = total;
-  iov[idx].iov_base = extra_table;
-  iov[idx].iov_len = cur_extra_table - extra_table;
-  total += iov[idx].iov_len;
-  ++idx;
-
-  if (TEMP_FAILURE_RETRY (writev (fd, iov, idx)) != total
-      /* The file was created with mode 0600.  Make it world-readable.  */
-      || fchmod (fd, 0644) != 0
-      /* Rename the file, possibly replacing an old one.  */
-      || rename (tmpfname, GCONV_MODULES_CACHE) != 0)
-    {
-      int save_errno = errno;
-      close (fd);
-      unlink (tmpfname);
-      error (EXIT_FAILURE, save_errno,
-	     gettext ("cannot generate output file"));
-    }
-
-  close (fd);
-
-  return 0;
-}
diff --git a/newlib/libc/sys/linux/iconv/iconvconfig.h b/newlib/libc/sys/linux/iconv/iconvconfig.h
deleted file mode 100644
index c52ceae..0000000
--- a/newlib/libc/sys/linux/iconv/iconvconfig.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <stdint.h>
-
-
-typedef uint16_t gidx_t;
-
-
-struct gconvcache_header
-{
-  uint32_t magic;
-  gidx_t string_offset;
-  gidx_t hash_offset;
-  gidx_t hash_size;
-  gidx_t module_offset;
-  gidx_t otherconv_offset;
-};
-
-struct hash_entry
-{
-  gidx_t string_offset;
-  gidx_t module_idx;
-};
-
-struct module_entry
-{
-  gidx_t canonname_offset;
-  gidx_t fromdir_offset;
-  gidx_t fromname_offset;
-  gidx_t todir_offset;
-  gidx_t toname_offset;
-  gidx_t extra_offset;
-};
-
-struct extra_entry
-{
-  gidx_t module_cnt;
-  struct extra_entry_module
-  {
-    gidx_t outname_offset;
-    gidx_t dir_offset;
-    gidx_t name_offset;
-  } module[0];
-};
-
-
-#define GCONVCACHE_MAGIC	0x20010324
-
-
-#define GCONV_MODULES_CACHE	GCONV_DIR "/gconv-modules.cache"
diff --git a/newlib/libc/sys/linux/iconv/loadinfo.h b/newlib/libc/sys/linux/iconv/loadinfo.h
deleted file mode 100644
index 1de6cfd..0000000
--- a/newlib/libc/sys/linux/iconv/loadinfo.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _LOADINFO_H
-#define _LOADINFO_H	1
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-/* Encoding of locale name parts.  */
-#define CEN_REVISION		1
-#define CEN_SPONSOR		2
-#define CEN_SPECIAL		4
-#define XPG_NORM_CODESET	8
-#define XPG_CODESET		16
-#define TERRITORY		32
-#define CEN_AUDIENCE		64
-#define XPG_MODIFIER		128
-
-#define CEN_SPECIFIC	(CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
-#define XPG_SPECIFIC	(XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
-
-
-struct loaded_l10nfile
-{
-  const char *filename;
-  int decided;
-
-  const void *data;
-
-  struct loaded_l10nfile *next;
-  struct loaded_l10nfile *successor[1];
-};
-
-
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
-extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
-						  size_t name_len));
-
-extern struct loaded_l10nfile *
-_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
-			    const char *dirlist, size_t dirlist_len, int mask,
-			    const char *language, const char *territory,
-			    const char *codeset,
-			    const char *normalized_codeset,
-			    const char *modifier, const char *special,
-			    const char *sponsor, const char *revision,
-			    const char *filename, int do_allocate));
-
-
-extern const char *_nl_expand_alias PARAMS ((const char *name));
-
-/* normalized_codeset is dynamically allocated and has to be freed by
-   the caller.  */
-extern int _nl_explode_name PARAMS ((char *name, const char **language,
-				     const char **modifier,
-				     const char **territory,
-				     const char **codeset,
-				     const char **normalized_codeset,
-				     const char **special,
-				     const char **sponsor,
-				     const char **revision));
-
-extern char *_nl_find_language PARAMS ((const char *name));
-
-#endif	/* loadinfo.h */
diff --git a/newlib/libc/sys/linux/iconv/localeinfo.h b/newlib/libc/sys/linux/iconv/localeinfo.h
deleted file mode 100644
index 026463f..0000000
--- a/newlib/libc/sys/linux/iconv/localeinfo.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* Declarations for internal libc locale interfaces
-   Copyright (C) 1995, 96, 97, 98, 99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _LOCALEINFO_H
-#define _LOCALEINFO_H 1
-
-#include <stddef.h>
-#include <langinfo.h>
-#include <limits.h>
-#include <time.h>
-#include <stdint.h>
-#include <sys/types.h>
-
-/* This has to be changed whenever a new locale is defined.  */
-#define __LC_LAST	13
-
-#include "loadinfo.h"	/* For loaded_l10nfile definition.  */
-
-/* Magic number at the beginning of a locale data file for CATEGORY.  */
-#define	LIMAGIC(category)	((unsigned int) (0x20000828 ^ (category)))
-
-/* Two special weight constants for the collation data.  */
-#define IGNORE_CHAR	2
-
-/* We use a special value for the usage counter in `locale_data' to
-   signal that this data must never be removed anymore.  */
-#define MAX_USAGE_COUNT (UINT_MAX - 1)
-#define UNDELETABLE	UINT_MAX
-
-/* Structure describing locale data in core for a category.  */
-struct locale_data
-{
-  const char *name;
-  const char *filedata;		/* Region mapping the file data.  */
-  off_t filesize;		/* Size of the file (and the region).  */
-  int mmaped;			/* If nonzero the data is mmaped.  */
-
-  unsigned int usage_count;	/* Counter for users.  */
-
-  int use_translit;		/* Nonzero if the mb*towv*() and wc*tomb()
-				   functions should use transliteration.  */
-  const char *options;		/* Extra options from the locale name,
-				   not used in the path to the locale data.  */
-
-  unsigned int nstrings;	/* Number of strings below.  */
-  union locale_data_value
-  {
-    const uint32_t *wstr;
-    const char *string;
-    unsigned int word;
-  }
-  values __flexarr;	/* Items, usually pointers into `filedata'.  */
-};
-
-/* We know three kinds of collation sorting rules.  */
-enum coll_sort_rule
-{
-  illegal_0__,
-  sort_forward,
-  sort_backward,
-  illegal_3__,
-  sort_position,
-  sort_forward_position,
-  sort_backward_position,
-  sort_mask
-};
-
-/* We can map the types of the entries into a few categories.  */
-enum value_type
-{
-  none,
-  string,
-  stringarray,
-  byte,
-  bytearray,
-  word,
-  stringlist,
-  wordarray,
-  wstring,
-  wstringarray,
-  wstringlist
-};
-
-
-/* Definitions for `era' information from LC_TIME.  */
-#define ERA_NAME_FORMAT_MEMBERS 4
-#define ERA_M_NAME   0
-#define ERA_M_FORMAT 1
-#define ERA_W_NAME   2
-#define ERA_W_FORMAT 3
-
-
-/* Structure to access `era' information from LC_TIME.  */
-struct era_entry
-{
-  uint32_t direction;		/* Contains '+' or '-'.  */
-  int32_t offset;
-  int32_t start_date[3];
-  int32_t stop_date[3];
-  const char *era_name;
-  const char *era_format;
-  const wchar_t *era_wname;
-  const wchar_t *era_wformat;
-  int absolute_direction;
-  /* absolute direction:
-     +1 indicates that year number is higher in the future. (like A.D.)
-     -1 indicates that year number is higher in the past. (like B.C.)  */
-};
-
-
-/* LC_CTYPE specific:
-   Hardwired indices for standard wide character translation mappings.  */
-enum
-{
-  __TOW_toupper = 0,
-  __TOW_tolower = 1
-};
-
-
-/* LC_CTYPE specific:
-   Access a wide character class with a single character index.
-   _ISCTYPE (c, desc) = iswctype (btowc (c), desc).
-   c must be an `unsigned char'.  desc must be a nonzero wctype_t.  */
-#define _ISCTYPE(c, desc) \
-  (((((const uint32_t *) (desc)) - 8)[(c) >> 5] >> ((c) & 0x1f)) & 1)
-
-
-/* For each category declare the variable for the current locale data.  */
-#define DEFINE_CATEGORY(category, category_name, items, a) \
-extern struct locale_data *_nl_current_##category;
-#include "categories.def"
-#undef	DEFINE_CATEGORY
-
-extern const char *const _nl_category_names[__LC_LAST];
-extern const size_t _nl_category_name_sizes[__LC_LAST];
-extern struct locale_data * *const _nl_current[__LC_LAST];
-
-/* Extract the current CATEGORY locale's string for ITEM.  */
-#define _NL_CURRENT(category, item) \
-  (_nl_current_##category->values[_NL_ITEM_INDEX (item)].string)
-
-/* Extract the current CATEGORY locale's string for ITEM.  */
-#define _NL_CURRENT_WSTR(category, item) \
-  ((wchar_t *) (_nl_current_##category->values[_NL_ITEM_INDEX (item)].wstr))
-
-/* Extract the current CATEGORY locale's word for ITEM.  */
-#define _NL_CURRENT_WORD(category, item) \
-  (_nl_current_##category->values[_NL_ITEM_INDEX (item)].word)
-
-/* This is used in lc-CATEGORY.c to define _nl_current_CATEGORY.  */
-#define _NL_CURRENT_DEFINE(category) \
-  extern struct locale_data _nl_C_##category; \
-  struct locale_data *_nl_current_##category = &_nl_C_##category
-
-/* Load the locale data for CATEGORY from the file specified by *NAME.
-   If *NAME is "", use environment variables as specified by POSIX,
-   and fill in *NAME with the actual name used.  The directories
-   listed in LOCALE_PATH are searched for the locale files.  */
-extern struct locale_data *_nl_find_locale (const char *locale_path,
-					    size_t locale_path_len,
-					    int category, const char **name);
-
-/* Try to load the file described by FILE.  */
-extern void _nl_load_locale (struct loaded_l10nfile *file, int category);
-
-/* Free all resource.  */
-extern void _nl_unload_locale (struct locale_data *locale);
-
-/* Free the locale and give back all memory if the usage count is one.  */
-extern void _nl_remove_locale (int locale, struct locale_data *data);
-
-
-/* Return `era' entry which corresponds to TP.  Used in strftime.  */
-extern struct era_entry *_nl_get_era_entry (const struct tm *tp);
-
-/* Return `era' cnt'th entry .  Used in strptime.  */
-extern struct era_entry *_nl_select_era_entry (int cnt);
-
-/* Return `alt_digit' which corresponds to NUMBER.  Used in strftime.  */
-extern const char *_nl_get_alt_digit (unsigned int number);
-
-/* Similar, but now for wide characters.  */
-extern const wchar_t *_nl_get_walt_digit (unsigned int number);
-
-/* Parse string as alternative digit and return numeric value.  */
-extern int _nl_parse_alt_digit (const char **strp);
-
-/* Postload processing.  */
-extern void _nl_postload_ctype (void);
-extern void _nl_postload_time (void);
-
-
-#endif	/* localeinfo.h */
diff --git a/newlib/libc/sys/linux/iconv/loop.c b/newlib/libc/sys/linux/iconv/loop.c
deleted file mode 100644
index 7d3bf47..0000000
--- a/newlib/libc/sys/linux/iconv/loop.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/* Conversion loop frame work.
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* This file provides a frame for the reader loop in all conversion modules.
-   The actual code must (of course) be provided in the actual module source
-   code but certain actions can be written down generically, with some
-   customization options which are these:
-
-     MIN_NEEDED_INPUT	minimal number of input bytes needed for the next
-			conversion.
-     MIN_NEEDED_OUTPUT	minimal number of bytes produced by the next round
-			of conversion.
-
-     MAX_NEEDED_INPUT	you guess it, this is the maximal number of input
-			bytes needed.  It defaults to MIN_NEEDED_INPUT
-     MAX_NEEDED_OUTPUT	likewise for output bytes.
-
-     LOOPFCT		name of the function created.  If not specified
-			the name is `loop' but this prevents the use
-			of multiple functions in the same file.
-
-     BODY		this is supposed to expand to the body of the loop.
-			The user must provide this.
-
-     EXTRA_LOOP_DECLS	extra arguments passed from converion loop call.
-
-     INIT_PARAMS	code to define and initialize variables from params.
-     UPDATE_PARAMS	code to store result in params.
-*/
-
-#include <assert.h>
-#include <machine/endian.h>
-#include <gconv.h>
-#include <stdint.h>
-#include <string.h>
-#include <wchar.h>
-#include <sys/param.h>		/* For MIN.  */
-#define __need_size_t
-#include <stddef.h>
-
-
-/* We have to provide support for machines which are not able to handled
-   unaligned memory accesses.  Some of the character encodings have
-   representations with a fixed width of 2 or 4 bytes.  But if we cannot
-   access unaligned memory we still have to read byte-wise.  */
-#undef FCTNAME2
-#if defined _STRING_ARCH_unaligned || !defined DEFINE_UNALIGNED
-/* We can handle unaligned memory access.  */
-# define get16(addr) *((__const uint16_t *) (addr))
-# define get32(addr) *((__const uint32_t *) (addr))
-
-/* We need no special support for writing values either.  */
-# define put16(addr, val) *((uint16_t *) (addr)) = (val)
-# define put32(addr, val) *((uint32_t *) (addr)) = (val)
-
-# define FCTNAME2(name) name
-#else
-/* Distinguish between big endian and little endian.  */
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-#  define get16(addr) \
-     (((__const unsigned char *) (addr))[1] << 8			      \
-      | ((__const unsigned char *) (addr))[0])
-#  define get32(addr) \
-     (((((__const unsigned char *) (addr))[3] << 8			      \
-	| ((__const unsigned char *) (addr))[2]) << 8			      \
-       | ((__const unsigned char *) (addr))[1]) << 8			      \
-      | ((__const unsigned char *) (addr))[0])
-
-#  define put16(addr, val) \
-     ({ uint16_t __val = (val);						      \
-	((unsigned char *) (addr))[0] = __val;				      \
-	((unsigned char *) (addr))[1] = __val >> 8;			      \
-	(void) 0; })
-#  define put32(addr, val) \
-     ({ uint32_t __val = (val);						      \
-	((unsigned char *) (addr))[0] = __val;				      \
-	__val >>= 8;							      \
-	((unsigned char *) (addr))[1] = __val;				      \
-	__val >>= 8;							      \
-	((unsigned char *) (addr))[2] = __val;				      \
-	__val >>= 8;							      \
-	((unsigned char *) (addr))[3] = __val;				      \
-	(void) 0; })
-# else
-#  define get16(addr) \
-     (((__const unsigned char *) (addr))[0] << 8			      \
-      | ((__const unsigned char *) (addr))[1])
-#  define get32(addr) \
-     (((((__const unsigned char *) (addr))[0] << 8			      \
-	| ((__const unsigned char *) (addr))[1]) << 8			      \
-       | ((__const unsigned char *) (addr))[2]) << 8			      \
-      | ((__const unsigned char *) (addr))[3])
-
-#  define put16(addr, val) \
-     ({ uint16_t __val = (val);						      \
-	((unsigned char *) (addr))[1] = __val;				      \
-	((unsigned char *) (addr))[0] = __val >> 8;			      \
-	(void) 0; })
-#  define put32(addr, val) \
-     ({ uint32_t __val = (val);						      \
-	((unsigned char *) (addr))[3] = __val;				      \
-	__val >>= 8;							      \
-	((unsigned char *) (addr))[2] = __val;				      \
-	__val >>= 8;							      \
-	((unsigned char *) (addr))[1] = __val;				      \
-	__val >>= 8;							      \
-	((unsigned char *) (addr))[0] = __val;				      \
-	(void) 0; })
-# endif
-
-# define FCTNAME2(name) name##_unaligned
-#endif
-#define FCTNAME(name) FCTNAME2(name)
-
-
-/* We need at least one byte for the next round.  */
-#ifndef MIN_NEEDED_INPUT
-# error "MIN_NEEDED_INPUT definition missing"
-#endif
-
-/* Let's see how many bytes we produce.  */
-#ifndef MAX_NEEDED_INPUT
-# define MAX_NEEDED_INPUT	MIN_NEEDED_INPUT
-#endif
-
-/* We produce at least one byte in the next round.  */
-#ifndef MIN_NEEDED_OUTPUT
-# error "MIN_NEEDED_OUTPUT definition missing"
-#endif
-
-/* Let's see how many bytes we produce.  */
-#ifndef MAX_NEEDED_OUTPUT
-# define MAX_NEEDED_OUTPUT	MIN_NEEDED_OUTPUT
-#endif
-
-/* Default name for the function.  */
-#ifndef LOOPFCT
-# define LOOPFCT		loop
-#endif
-
-/* Make sure we have a loop body.  */
-#ifndef BODY
-# error "Definition of BODY missing for function" LOOPFCT
-#endif
-
-
-/* If no arguments have to passed to the loop function define the macro
-   as empty.  */
-#ifndef EXTRA_LOOP_DECLS
-# define EXTRA_LOOP_DECLS
-#endif
-
-
-/* To make it easier for the writers of the modules, we define a macro
-   to test whether we have to ignore errors.  */
-#define ignore_errors_p() \
-  (irreversible != NULL && (flags & __GCONV_IGNORE_ERRORS))
-
-
-/* Error handling with transliteration/transcription function use and
-   ignoring of errors.  Note that we cannot use the do while (0) trick
-   since `break' and `continue' must reach certain points.  */
-#define STANDARD_ERR_HANDLER(Incr) \
-  {									      \
-    struct __gconv_trans_data *trans;					      \
-									      \
-    result = __GCONV_ILLEGAL_INPUT;					      \
-									      \
-    if (irreversible == NULL)						      \
-      /* This means we are in call from __gconv_transliterate.  In this	      \
-	 case we are not doing any error recovery outself.  */		      \
-      break;								      \
-									      \
-    /* First try the transliteration methods.  */			      \
-    for (trans = step_data->__trans; trans != NULL; trans = trans->__next)    \
-      {									      \
-	result = trans->__trans_fct (step, step_data, trans->__data, *inptrp, \
-			       &inptr, inend, &outptr, irreversible);	      \
-	if (result != __GCONV_ILLEGAL_INPUT)				      \
-	  break;							      \
-      }									      \
-    /* If any of them recognized the input continue with the loop.  */	      \
-    if (result != __GCONV_ILLEGAL_INPUT)				      \
-      continue;								      \
-									      \
-    /* Next see whether we have to ignore the error.  If not, stop.  */	      \
-    if (! ignore_errors_p ())						      \
-      break;								      \
-									      \
-    /* When we come here it means we ignore the character.  */		      \
-    ++*irreversible;							      \
-    inptr += Incr;							      \
-    continue;								      \
-  }
-
-
-/* Handling of Unicode 3.1 TAG characters.  Unicode recommends
-   "If language codes are not relevant to the particular processing
-    operation, then they should be ignored."
-   This macro is usually called right before STANDARD_ERR_HANDLER (Incr).  */
-#define UNICODE_TAG_HANDLER(Character, Incr) \
-  {									      \
-    /* TAG characters are those in the range U+E0000..U+E007F.  */	      \
-    if (((Character) >> 7) == (0xe0000 >> 7))				      \
-      {									      \
-	inptr += Incr;							      \
-	continue;							      \
-      }									      \
-  }
-
-
-/* The function returns the status, as defined in gconv.h.  */
-static inline int
-FCTNAME (LOOPFCT) (struct __gconv_step *step,
-		   struct __gconv_step_data *step_data,
-		   const unsigned char **inptrp, const unsigned char *inend,
-		   unsigned char **outptrp, const unsigned char *outend,
-		   size_t *irreversible EXTRA_LOOP_DECLS)
-{
-#ifdef LOOP_NEED_STATE
-  mbstate_t *state = step_data->__statep;
-#endif
-#ifdef LOOP_NEED_FLAGS
-  int flags = step_data->__flags;
-#endif
-#ifdef LOOP_NEED_DATA
-  void *data = step->__data;
-#endif
-  int result = __GCONV_EMPTY_INPUT;
-  const unsigned char *inptr = *inptrp;
-  unsigned char *outptr = *outptrp;
-
-#ifdef INIT_PARAMS
-  INIT_PARAMS;
-#endif
-
-  while (inptr != inend)
-    {
-      /* `if' cases for MIN_NEEDED_OUTPUT ==/!= 1 is made to help the
-	 compiler generating better code.  They will be optimized away
-	 since MIN_NEEDED_OUTPUT is always a constant.  */
-      if ((MIN_NEEDED_OUTPUT != 1
-	   && __builtin_expect (outptr + MIN_NEEDED_OUTPUT > outend, 0))
-	  || (MIN_NEEDED_OUTPUT == 1
-	      && __builtin_expect (outptr >= outend, 0)))
-	{
-	  /* Overflow in the output buffer.  */
-	  result = __GCONV_FULL_OUTPUT;
-	  break;
-	}
-      if (MIN_NEEDED_INPUT > 1
-	  && __builtin_expect (inptr + MIN_NEEDED_INPUT > inend, 0))
-	{
-	  /* We don't have enough input for another complete input
-	     character.  */
-	  result = __GCONV_INCOMPLETE_INPUT;
-	  break;
-	}
-
-      /* Here comes the body the user provides.  It can stop with
-	 RESULT set to GCONV_INCOMPLETE_INPUT (if the size of the
-	 input characters vary in size), GCONV_ILLEGAL_INPUT, or
-	 GCONV_FULL_OUTPUT (if the output characters vary in size).  */
-      BODY
-    }
-
-  /* Update the pointers pointed to by the parameters.  */
-  *inptrp = inptr;
-  *outptrp = outptr;
-#ifdef UPDATE_PARAMS
-  UPDATE_PARAMS;
-#endif
-
-  return result;
-}
-
-
-/* Include the file a second time to define the function to handle
-   unaligned access.  */
-#if !defined DEFINE_UNALIGNED && !defined _STRING_ARCH_unaligned \
-    && MIN_NEEDED_FROM != 1 && MAX_NEEDED_FROM % MIN_NEEDED_FROM == 0 \
-    && MIN_NEEDED_TO != 1 && MAX_NEEDED_TO % MIN_NEEDED_TO == 0
-# undef get16
-# undef get32
-# undef put16
-# undef put32
-# undef unaligned
-
-# define DEFINE_UNALIGNED
-# include "loop.c"
-# undef DEFINE_UNALIGNED
-#endif
-
-
-#if MAX_NEEDED_INPUT > 1
-# define SINGLE(fct) SINGLE2 (fct)
-# define SINGLE2(fct) fct##_single
-static inline int
-SINGLE(LOOPFCT) (struct __gconv_step *step,
-		 struct __gconv_step_data *step_data,
-		 const unsigned char **inptrp, const unsigned char *inend,
-		 unsigned char **outptrp, unsigned char *outend,
-		 size_t *irreversible EXTRA_LOOP_DECLS)
-{
-  mbstate_t *state = step_data->__statep;
-#ifdef LOOP_NEED_FLAGS
-  int flags = step_data->__flags;
-#endif
-#ifdef LOOP_NEED_DATA
-  void *data = step->__data;
-#endif
-  int result = __GCONV_OK;
-  unsigned char bytebuf[MAX_NEEDED_INPUT];
-  const unsigned char *inptr = *inptrp;
-  unsigned char *outptr = *outptrp;
-  size_t inlen;
-
-#ifdef INIT_PARAMS
-  INIT_PARAMS;
-#endif
-
-#ifdef UNPACK_BYTES
-  UNPACK_BYTES
-#else
-  /* Add the bytes from the state to the input buffer.  */
-  for (inlen = 0; inlen < (size_t) (state->__count & 7); ++inlen)
-    bytebuf[inlen] = state->__value.__wchb[inlen];
-#endif
-
-  /* Are there enough bytes in the input buffer?  */
-  if (__builtin_expect (inptr + (MIN_NEEDED_INPUT - inlen) > inend, 0))
-    {
-      *inptrp = inend;
-#ifdef STORE_REST
-      inptr = bytebuf;
-      inptrp = &inptr;
-      inend = &bytebuf[inlen];
-
-      STORE_REST
-#else
-      /* We don't have enough input for another complete input
-	 character.  */
-      while (inptr < inend)
-	state->__value.__wchb[inlen++] = *inptr++;
-#endif
-
-      return __GCONV_INCOMPLETE_INPUT;
-    }
-
-  /* Enough space in output buffer.  */
-  if ((MIN_NEEDED_OUTPUT != 1 && outptr + MIN_NEEDED_OUTPUT > outend)
-      || (MIN_NEEDED_OUTPUT == 1 && outptr >= outend))
-    /* Overflow in the output buffer.  */
-    return __GCONV_FULL_OUTPUT;
-
-  /*  Now add characters from the normal input buffer.  */
-  do
-    bytebuf[inlen++] = *inptr++;
-  while (inlen < MAX_NEEDED_INPUT && inptr < inend);
-
-  inptr = bytebuf;
-  inend = &bytebuf[inlen];
-
-  do
-    {
-      BODY
-    }
-  while (0);
-
-  /* Now we either have produced an output character and consumed all the
-     bytes from the state and at least one more, or the character is still
-     incomplete, or we have some other error (like illegal input character,
-     no space in output buffer).  */
-  if (__builtin_expect (inptr != bytebuf, 1))
-    {
-      /* We found a new character.  */
-      assert (inptr - bytebuf > (state->__count & 7));
-
-      *inptrp += inptr - bytebuf - (state->__count & 7);
-      *outptrp = outptr;
-
-      result = __GCONV_OK;
-
-      /* Clear the state buffer.  */
-      state->__count &= ~7;
-    }
-  else if (result == __GCONV_INCOMPLETE_INPUT)
-    {
-      /* This can only happen if we have less than MAX_NEEDED_INPUT bytes
-	 available.  */
-      assert (inend != &bytebuf[MAX_NEEDED_INPUT]);
-
-      *inptrp += inend - bytebuf - (state->__count & 7);
-#ifdef STORE_REST
-      inptrp = &inptr;
-
-      STORE_REST
-#else
-      /* We don't have enough input for another complete input
-	 character.  */
-      while (inptr < inend)
-	state->__value.__wchb[inlen++] = *inptr++;
-#endif
-    }
-
-  return result;
-}
-# undef SINGLE
-# undef SINGLE2
-#endif
-
-
-/* We remove the macro definitions so that we can include this file again
-   for the definition of another function.  */
-#undef MIN_NEEDED_INPUT
-#undef MAX_NEEDED_INPUT
-#undef MIN_NEEDED_OUTPUT
-#undef MAX_NEEDED_OUTPUT
-#undef LOOPFCT
-#undef BODY
-#undef LOOPFCT
-#undef EXTRA_LOOP_DECLS
-#undef INIT_PARAMS
-#undef UPDATE_PARAMS
-#undef UNPACK_BYTES
-#undef LOOP_NEED_STATE
-#undef LOOP_NEED_FLAGS
-#undef LOOP_NEED_DATA
-#undef get16
-#undef get32
-#undef put16
-#undef put32
-#undef unaligned
diff --git a/newlib/libc/sys/linux/iconv/skeleton.c b/newlib/libc/sys/linux/iconv/skeleton.c
deleted file mode 100644
index cde8533..0000000
--- a/newlib/libc/sys/linux/iconv/skeleton.c
+++ /dev/null
@@ -1,696 +0,0 @@
-/* Skeleton for a conversion module.
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* This file can be included to provide definitions of several things
-   many modules have in common.  It can be customized using the following
-   macros:
-
-     DEFINE_INIT	define the default initializer.  This requires the
-			following symbol to be defined.
-
-     CHARSET_NAME	string with official name of the coded character
-			set (in all-caps)
-
-     DEFINE_FINI	define the default destructor function.
-
-     MIN_NEEDED_FROM	minimal number of bytes needed for the from-charset.
-     MIN_NEEDED_TO	likewise for the to-charset.
-
-     MAX_NEEDED_FROM	maximal number of bytes needed for the from-charset.
-			This macro is optional, it defaults to MIN_NEEDED_FROM.
-     MAX_NEEDED_TO	likewise for the to-charset.
-
-     DEFINE_DIRECTION_OBJECTS
-			two objects will be defined to be used when the
-			`gconv' function must only distinguish two
-			directions.  This is implied by DEFINE_INIT.
-			If this macro is not defined the following
-			macro must be available.
-
-     FROM_DIRECTION	this macro is supposed to return a value != 0
-			if we convert from the current character set,
-			otherwise it return 0.
-
-     EMIT_SHIFT_TO_INIT	this symbol is optional.  If it is defined it
-			defines some code which writes out a sequence
-			of characters which bring the current state into
-			the initial state.
-
-     FROM_LOOP		name of the function implementing the conversion
-			from the current characters.
-     TO_LOOP		likewise for the other direction
-
-     ONE_DIRECTION	optional.  If defined to 1, only one conversion
-			direction is defined instead of two.  In this
-			case, FROM_DIRECTION should be defined to 1, and
-			FROM_LOOP and TO_LOOP should have the same value.
-
-     SAVE_RESET_STATE	in case of an error we must reset the state for
-			the rerun so this macro must be defined for
-			stateful encodings.  It takes an argument which
-			is nonzero when saving.
-
-     RESET_INPUT_BUFFER	If the input character sets allow this the macro
-			can be defined to reset the input buffer pointers
-			to cover only those characters up to the error.
-
-     FUNCTION_NAME	if not set the conversion function is named `gconv'.
-
-     PREPARE_LOOP	optional code preparing the conversion loop.  Can
-			contain variable definitions.
-     END_LOOP		also optional, may be used to store information
-
-     EXTRA_LOOP_ARGS	optional macro specifying extra arguments passed
-			to loop function.
- */
-
-#include <assert.h>
-#include <gconv.h>
-#include <string.h>
-#define __need_size_t
-#define __need_NULL
-#include <stddef.h>
-
-#include <wchar.h>
-
-#ifndef STATIC_GCONV
-# include <dlfcn.h>
-#endif
-
-# define DL_CALL_FCT(fct, args) fct args
-
-/* The direction objects.  */
-#if DEFINE_DIRECTION_OBJECTS || DEFINE_INIT
-static int from_object;
-static int to_object;
-
-# ifndef FROM_DIRECTION
-#  define FROM_DIRECTION (step->__data == &from_object)
-# endif
-#else
-# ifndef FROM_DIRECTION
-#  error "FROM_DIRECTION must be provided if direction objects are not used"
-# endif
-#endif
-
-
-/* How many bytes are needed at most for the from-charset.  */
-#ifndef MAX_NEEDED_FROM
-# define MAX_NEEDED_FROM	MIN_NEEDED_FROM
-#endif
-
-/* Same for the to-charset.  */
-#ifndef MAX_NEEDED_TO
-# define MAX_NEEDED_TO		MIN_NEEDED_TO
-#endif
-
-
-/* Define macros which can access unaligned buffers.  These macros are
-   supposed to be used only in code outside the inner loops.  For the inner
-   loops we have other definitions which allow optimized access.  */
-#ifdef _STRING_ARCH_unaligned
-/* We can handle unaligned memory access.  */
-# define get16u(addr) *((__const uint16_t *) (addr))
-# define get32u(addr) *((__const uint32_t *) (addr))
-
-/* We need no special support for writing values either.  */
-# define put16u(addr, val) *((uint16_t *) (addr)) = (val)
-# define put32u(addr, val) *((uint32_t *) (addr)) = (val)
-#else
-/* Distinguish between big endian and little endian.  */
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-#  define get16u(addr) \
-     (((__const unsigned char *) (addr))[1] << 8			      \
-      | ((__const unsigned char *) (addr))[0])
-#  define get32u(addr) \
-     (((((__const unsigned char *) (addr))[3] << 8			      \
-	| ((__const unsigned char *) (addr))[2]) << 8			      \
-       | ((__const unsigned char *) (addr))[1]) << 8			      \
-      | ((__const unsigned char *) (addr))[0])
-
-#  define put16u(addr, val) \
-     ({ uint16_t __val = (val);						      \
-	((unsigned char *) (addr))[0] = __val;				      \
-	((unsigned char *) (addr))[1] = __val >> 8;			      \
-	(void) 0; })
-#  define put32u(addr, val) \
-     ({ uint32_t __val = (val);						      \
-	((unsigned char *) (addr))[0] = __val;				      \
-	__val >>= 8;							      \
-	((unsigned char *) (addr))[1] = __val;				      \
-	__val >>= 8;							      \
-	((unsigned char *) (addr))[2] = __val;				      \
-	__val >>= 8;							      \
-	((unsigned char *) (addr))[3] = __val;				      \
-	(void) 0; })
-# else
-#  define get16u(addr) \
-     (((__const unsigned char *) (addr))[0] << 8			      \
-      | ((__const unsigned char *) (addr))[1])
-#  define get32u(addr) \
-     (((((__const unsigned char *) (addr))[0] << 8			      \
-	| ((__const unsigned char *) (addr))[1]) << 8			      \
-       | ((__const unsigned char *) (addr))[2]) << 8			      \
-      | ((__const unsigned char *) (addr))[3])
-
-#  define put16u(addr, val) \
-     ({ uint16_t __val = (val);						      \
-	((unsigned char *) (addr))[1] = __val;				      \
-	((unsigned char *) (addr))[0] = __val >> 8;			      \
-	(void) 0; })
-#  define put32u(addr, val) \
-     ({ uint32_t __val = (val);						      \
-	((unsigned char *) (addr))[3] = __val;				      \
-	__val >>= 8;							      \
-	((unsigned char *) (addr))[2] = __val;				      \
-	__val >>= 8;							      \
-	((unsigned char *) (addr))[1] = __val;				      \
-	__val >>= 8;							      \
-	((unsigned char *) (addr))[0] = __val;				      \
-	(void) 0; })
-# endif
-#endif
-
-
-/* For conversions from a fixed width character set to another fixed width
-   character set we can define RESET_INPUT_BUFFER in a very fast way.  */
-#if !defined RESET_INPUT_BUFFER && !defined SAVE_RESET_STATE
-# if MIN_NEEDED_FROM == MAX_NEEDED_FROM && MIN_NEEDED_TO == MAX_NEEDED_TO
-/* We have to use these `if's here since the compiler cannot know that
-   (outbuf - outerr) is always divisible by MIN_NEEDED_TO.  */
-#  define RESET_INPUT_BUFFER \
-  if (MIN_NEEDED_FROM % MIN_NEEDED_TO == 0)				      \
-    *inptrp -= (outbuf - outerr) * (MIN_NEEDED_FROM / MIN_NEEDED_TO);	      \
-  else if (MIN_NEEDED_TO % MIN_NEEDED_FROM == 0)			      \
-    *inptrp -= (outbuf - outerr) / (MIN_NEEDED_TO / MIN_NEEDED_FROM);	      \
-  else									      \
-    *inptrp -= ((outbuf - outerr) / MIN_NEEDED_TO) * MIN_NEEDED_FROM
-# endif
-#endif
-
-
-/* The default init function.  It simply matches the name and initializes
-   the step data to point to one of the objects above.  */
-#if DEFINE_INIT
-# ifndef CHARSET_NAME
-#  error "CHARSET_NAME not defined"
-# endif
-
-extern int gconv_init (struct __gconv_step *step);
-int
-gconv_init (struct __gconv_step *step)
-{
-  /* Determine which direction.  */
-  if (strcmp (step->__from_name, CHARSET_NAME) == 0)
-    {
-      step->__data = &from_object;
-
-      step->__min_needed_from = MIN_NEEDED_FROM;
-      step->__max_needed_from = MAX_NEEDED_FROM;
-      step->__min_needed_to = MIN_NEEDED_TO;
-      step->__max_needed_to = MAX_NEEDED_TO;
-    }
-  else if (__builtin_expect (strcmp (step->__to_name, CHARSET_NAME), 0) == 0)
-    {
-      step->__data = &to_object;
-
-      step->__min_needed_from = MIN_NEEDED_TO;
-      step->__max_needed_from = MAX_NEEDED_TO;
-      step->__min_needed_to = MIN_NEEDED_FROM;
-      step->__max_needed_to = MAX_NEEDED_FROM;
-    }
-  else
-    return __GCONV_NOCONV;
-
-#ifdef SAVE_RESET_STATE
-  step->__stateful = 1;
-#else
-  step->__stateful = 0;
-#endif
-
-  return __GCONV_OK;
-}
-#endif
-
-
-/* The default destructor function does nothing in the moment and so
-   we don't define it at all.  But we still provide the macro just in
-   case we need it some day.  */
-#if DEFINE_FINI
-#endif
-
-
-/* If no arguments have to passed to the loop function define the macro
-   as empty.  */
-#ifndef EXTRA_LOOP_ARGS
-# define EXTRA_LOOP_ARGS
-#endif
-
-
-/* This is the actual conversion function.  */
-#ifndef FUNCTION_NAME
-# define FUNCTION_NAME	gconv
-#endif
-
-/* The macros are used to access the function to convert single characters.  */
-#define SINGLE(fct) SINGLE2 (fct)
-#define SINGLE2(fct) fct##_single
-
-
-extern int FUNCTION_NAME (struct __gconv_step *step,
-			  struct __gconv_step_data *data,
-			  const unsigned char **inptrp,
-			  const unsigned char *inend,
-			  unsigned char **outbufstart, size_t *irreversible,
-			  int do_flush, int consume_incomplete);
-int
-FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
-	       const unsigned char **inptrp, const unsigned char *inend,
-	       unsigned char **outbufstart, size_t *irreversible, int do_flush,
-	       int consume_incomplete)
-{
-  struct __gconv_step *next_step = step + 1;
-  struct __gconv_step_data *next_data = data + 1;
-  __gconv_fct fct;
-  int status;
-
-  fct = (data->__flags & __GCONV_IS_LAST) ? NULL : next_step->__fct;
-
-  /* If the function is called with no input this means we have to reset
-     to the initial state.  The possibly partly converted input is
-     dropped.  */
-  if (__builtin_expect (do_flush, 0))
-    {
-      /* This should never happen during error handling.  */
-      assert (outbufstart == NULL);
-
-      status = __GCONV_OK;
-
-#ifdef EMIT_SHIFT_TO_INIT
-      if (do_flush == 1)
-	{
-	  /* We preserve the initial values of the pointer variables.  */
-	  unsigned char *outbuf = data->__outbuf;
-	  unsigned char *outstart = outbuf;
-	  unsigned char *outend = data->__outbufend;
-
-# ifdef PREPARE_LOOP
-	  PREPARE_LOOP
-# endif
-
-# ifdef SAVE_RESET_STATE
-	  SAVE_RESET_STATE (1);
-# endif
-
-	  /* Emit the escape sequence to reset the state.  */
-	  EMIT_SHIFT_TO_INIT;
-
-	  /* Call the steps down the chain if there are any but only if we
-	     successfully emitted the escape sequence.  This should only
-	     fail if the output buffer is full.  If the input is invalid
-	     it should be discarded since the user wants to start from a
-	     clean state.  */
-	  if (status == __GCONV_OK)
-	    {
-	      if (data->__flags & __GCONV_IS_LAST)
-		/* Store information about how many bytes are available.  */
-		data->__outbuf = outbuf;
-	      else
-		{
-		  /* Write out all output which was produced.  */
-		  if (outbuf > outstart)
-		    {
-		      const unsigned char *outerr = outstart;
-		      int result;
-
-		      result = DL_CALL_FCT (fct, (next_step, next_data,
-						  &outerr, outbuf, NULL,
-						  irreversible, 0,
-						  consume_incomplete));
-
-		      if (result != __GCONV_EMPTY_INPUT)
-			{
-			  if (__builtin_expect (outerr != outbuf, 0))
-			    {
-			      /* We have a problem.  Undo the conversion.  */
-			      outbuf = outstart;
-
-			      /* Restore the state.  */
-# ifdef SAVE_RESET_STATE
-			      SAVE_RESET_STATE (0);
-# endif
-			    }
-
-			  /* Change the status.  */
-			  status = result;
-			}
-		    }
-
-		  if (status == __GCONV_OK)
-		    /* Now flush the remaining steps.  */
-		    status = DL_CALL_FCT (fct, (next_step, next_data, NULL,
-						NULL, NULL, irreversible, 1,
-						consume_incomplete));
-		}
-	    }
-	}
-      else
-#endif
-	{
-	  /* Clear the state object.  There might be bytes in there from
-	     previous calls with CONSUME_INCOMPLETE == 1.  But don't emit
-	     escape sequences.  */
-	  memset (data->__statep, '\0', sizeof (*data->__statep));
-
-	  if (! (data->__flags & __GCONV_IS_LAST))
-	    /* Now flush the remaining steps.  */
-	    status = DL_CALL_FCT (fct, (next_step, next_data, NULL, NULL,
-					NULL, irreversible, do_flush,
-					consume_incomplete));
-	}
-    }
-  else
-    {
-      /* We preserve the initial values of the pointer variables.  */
-      const unsigned char *inptr = *inptrp;
-      unsigned char *outbuf = (__builtin_expect (outbufstart == NULL, 1)
-			       ? data->__outbuf : *outbufstart);
-      unsigned char *outend = data->__outbufend;
-      unsigned char *outstart;
-      /* This variable is used to count the number of characters we
-	 actually converted.  */
-      size_t lirreversible = 0;
-      size_t *lirreversiblep = irreversible ? &lirreversible : NULL;
-#if defined _STRING_ARCH_unaligned \
-    || MIN_NEEDED_FROM == 1 || MAX_NEEDED_FROM % MIN_NEEDED_FROM != 0 \
-    || MIN_NEEDED_TO == 1 || MAX_NEEDED_TO % MIN_NEEDED_TO != 0
-# define unaligned 0
-#else
-      int unaligned;
-# define GEN_unaligned(name) GEN_unaligned2 (name)
-# define GEN_unaligned2(name) name##_unaligned
-#endif
-
-#ifdef PREPARE_LOOP
-      PREPARE_LOOP
-#endif
-
-#if MAX_NEEDED_FROM > 1 || MAX_NEEDED_TO > 1
-      /* If the function is used to implement the mb*towc*() or wc*tomb*()
-	 functions we must test whether any bytes from the last call are
-	 stored in the `state' object.  */
-      if (((MAX_NEEDED_FROM > 1 && MAX_NEEDED_TO > 1)
-	   || (MAX_NEEDED_FROM > 1 && FROM_DIRECTION)
-	   || (MAX_NEEDED_TO > 1 && !FROM_DIRECTION))
-	  && consume_incomplete && (data->__statep->__count & 7) != 0)
-	{
-	  /* Yep, we have some bytes left over.  Process them now.
-             But this must not happen while we are called from an
-             error handler.  */
-	  assert (outbufstart == NULL);
-
-# if MAX_NEEDED_FROM > 1
-	  if (MAX_NEEDED_TO == 1 || FROM_DIRECTION)
-	    status = SINGLE(FROM_LOOP) (step, data, inptrp, inend, &outbuf,
-					outend, lirreversiblep
-					EXTRA_LOOP_ARGS);
-# endif
-# if MAX_NEEDED_FROM > 1 && MAX_NEEDED_TO > 1 && !ONE_DIRECTION
-	  else
-# endif
-# if MAX_NEEDED_TO > 1 && !ONE_DIRECTION
-	    status = SINGLE(TO_LOOP) (step, data, inptrp, inend, &outbuf,
-				      outend, lirreversiblep EXTRA_LOOP_ARGS);
-# endif
-
-	  if (__builtin_expect (status, __GCONV_OK) != __GCONV_OK)
-	    return status;
-	}
-#endif
-
-#if !defined _STRING_ARCH_unaligned \
-    && MIN_NEEDED_FROM != 1 && MAX_NEEDED_FROM % MIN_NEEDED_FROM == 0 \
-    && MIN_NEEDED_TO != 1 && MAX_NEEDED_TO % MIN_NEEDED_TO == 0
-      /* The following assumes that encodings, which have a variable length
-	 what might unalign a buffer even though it is a aligned in the
-	 beginning, either don't have the minimal number of bytes as a divisor
-	 of the maximum length or have a minimum length of 1.  This is true
-	 for all known and supported encodings.  */
-      unaligned = ((FROM_DIRECTION
-		    && ((uintptr_t) inptr % MIN_NEEDED_FROM != 0
-			|| ((data->__flags & __GCONV_IS_LAST)
-			    && (uintptr_t) outbuf % MIN_NEEDED_TO != 0)))
-		   || (!FROM_DIRECTION
-		       && (((data->__flags & __GCONV_IS_LAST)
-			    && (uintptr_t) outbuf % MIN_NEEDED_FROM != 0)
-			   || (uintptr_t) inptr % MIN_NEEDED_TO != 0)));
-#endif
-
-      while (1)
-	{
-	  struct __gconv_trans_data *trans;
-
-	  /* Remember the start value for this round.  */
-	  inptr = *inptrp;
-	  /* The outbuf buffer is empty.  */
-	  outstart = outbuf;
-
-#ifdef SAVE_RESET_STATE
-	  SAVE_RESET_STATE (1);
-#endif
-
-	  if (__builtin_expect (!unaligned, 1))
-	    {
-	      if (FROM_DIRECTION)
-		/* Run the conversion loop.  */
-		status = FROM_LOOP (step, data, inptrp, inend, &outbuf, outend,
-				    lirreversiblep EXTRA_LOOP_ARGS);
-	      else
-		/* Run the conversion loop.  */
-		status = TO_LOOP (step, data, inptrp, inend, &outbuf, outend,
-				  lirreversiblep EXTRA_LOOP_ARGS);
-	    }
-#if !defined _STRING_ARCH_unaligned \
-    && MIN_NEEDED_FROM != 1 && MAX_NEEDED_FROM % MIN_NEEDED_FROM == 0 \
-    && MIN_NEEDED_TO != 1 && MAX_NEEDED_TO % MIN_NEEDED_TO == 0
-	  else
-	    {
-	      if (FROM_DIRECTION)
-		/* Run the conversion loop.  */
-		status = GEN_unaligned (FROM_LOOP) (step, data, inptrp, inend,
-						    &outbuf, outend,
-						    lirreversiblep
-						    EXTRA_LOOP_ARGS);
-	      else
-		/* Run the conversion loop.  */
-		status = GEN_unaligned (TO_LOOP) (step, data, inptrp, inend,
-						  &outbuf, outend,
-						  lirreversiblep
-						  EXTRA_LOOP_ARGS);
-	    }
-#endif
-
-	  /* If we were called as part of an error handling module we
-	     don't do anything else here.  */
-	  if (__builtin_expect (outbufstart != NULL, 0))
-	    {
-	      *outbufstart = outbuf;
-	      return status;
-	    }
-
-	  /* Give the transliteration module the chance to store the
-	     original text and the result in case it needs a context.  */
-	  for (trans = data->__trans; trans != NULL; trans = trans->__next)
-	    if (trans->__trans_context_fct != NULL)
-	      DL_CALL_FCT (trans->__trans_context_fct,
-			   (trans->__data, inptr, *inptrp, outstart, outbuf));
-
-	  /* We finished one use of the loops.  */
-	  ++data->__invocation_counter;
-
-	  /* If this is the last step leave the loop, there is nothing
-             we can do.  */
-	  if (__builtin_expect (data->__flags & __GCONV_IS_LAST, 0))
-	    {
-	      /* Store information about how many bytes are available.  */
-	      data->__outbuf = outbuf;
-
-	      /* Remember how many non-identical characters we
-                 converted in a irreversible way.  */
-	      *irreversible += lirreversible;
-
-	      break;
-	    }
-
-	  /* Write out all output which was produced.  */
-	  if (__builtin_expect (outbuf > outstart, 1))
-	    {
-	      const unsigned char *outerr = data->__outbuf;
-	      int result;
-
-	      result = DL_CALL_FCT (fct, (next_step, next_data, &outerr,
-					  outbuf, NULL, irreversible, 0,
-					  consume_incomplete));
-
-	      if (result != __GCONV_EMPTY_INPUT)
-		{
-		  if (__builtin_expect (outerr != outbuf, 0))
-		    {
-#ifdef RESET_INPUT_BUFFER
-		      RESET_INPUT_BUFFER;
-#else
-		      /* We have a problem with the in on of the functions
-			 below.  Undo the conversion upto the error point.  */
-		      size_t nstatus;
-
-		      /* Reload the pointers.  */
-		      *inptrp = inptr;
-		      outbuf = outstart;
-
-		      /* Restore the state.  */
-# ifdef SAVE_RESET_STATE
-		      SAVE_RESET_STATE (0);
-# endif
-
-		      if (__builtin_expect (!unaligned, 1))
-			{
-			  if (FROM_DIRECTION)
-			    /* Run the conversion loop.  */
-			    nstatus = FROM_LOOP (step, data, inptrp, inend,
-						 &outbuf, outerr,
-						 lirreversiblep
-						 EXTRA_LOOP_ARGS);
-			  else
-			    /* Run the conversion loop.  */
-			    nstatus = TO_LOOP (step, data, inptrp, inend,
-					       &outbuf, outerr,
-					       lirreversiblep
-					       EXTRA_LOOP_ARGS);
-			}
-# if !defined _STRING_ARCH_unaligned \
-     && MIN_NEEDED_FROM != 1 && MAX_NEEDED_FROM % MIN_NEEDED_FROM == 0 \
-     && MIN_NEEDED_TO != 1 && MAX_NEEDED_TO % MIN_NEEDED_TO == 0
-		      else
-			{
-			  if (FROM_DIRECTION)
-			    /* Run the conversion loop.  */
-			    nstatus = GEN_unaligned (FROM_LOOP) (step, data,
-								 inptrp, inend,
-								 &outbuf,
-								 outerr,
-								 lirreversiblep
-								 EXTRA_LOOP_ARGS);
-			  else
-			    /* Run the conversion loop.  */
-			    nstatus = GEN_unaligned (TO_LOOP) (step, data,
-							       inptrp, inend,
-							       &outbuf, outerr,
-							       lirreversiblep
-							       EXTRA_LOOP_ARGS);
-			}
-# endif
-
-		      /* We must run out of output buffer space in this
-			 rerun.  */
-		      assert (outbuf == outerr);
-		      assert (nstatus == __GCONV_FULL_OUTPUT);
-
-		      /* If we haven't consumed a single byte decrement
-			 the invocation counter.  */
-		      if (__builtin_expect (outbuf == outstart, 0))
-			--data->__invocation_counter;
-#endif	/* reset input buffer */
-		    }
-
-		  /* Change the status.  */
-		  status = result;
-		}
-	      else
-		/* All the output is consumed, we can make another run
-		   if everything was ok.  */
-		if (status == __GCONV_FULL_OUTPUT)
-		  {
-		    status = __GCONV_OK;
-		    outbuf = data->__outbuf;
-		  }
-	    }
-
-	  if (status != __GCONV_OK)
-	    break;
-
-	  /* Reset the output buffer pointer for the next round.  */
-	  outbuf = data->__outbuf;
-	}
-
-#ifdef END_LOOP
-      END_LOOP
-#endif
-
-      /* If we are supposed to consume all character store now all of the
-	 remaining characters in the `state' object.  */
-#if MAX_NEEDED_FROM > 1 || MAX_NEEDED_TO > 1
-      if (((MAX_NEEDED_FROM > 1 && MAX_NEEDED_TO > 1)
-	   || (MAX_NEEDED_FROM > 1 && FROM_DIRECTION)
-	   || (MAX_NEEDED_TO > 1 && !FROM_DIRECTION))
-	  && __builtin_expect (consume_incomplete, 0)
-	  && status == __GCONV_INCOMPLETE_INPUT)
-	{
-# ifdef STORE_REST
-	  mbstate_t *state = data->__statep;
-
-	  STORE_REST
-# else
-	  size_t cnt;
-
-	  /* Make sure the remaining bytes fit into the state objects
-             buffer.  */
-	  assert (inend - *inptrp < 4);
-
-	  for (cnt = 0; *inptrp < inend; ++cnt)
-	    data->__statep->__value.__wchb[cnt] = *(*inptrp)++;
-	  data->__statep->__count &= ~7;
-	  data->__statep->__count |= cnt;
-# endif
-	}
-#endif
-    }
-
-  return status;
-}
-
-#undef DEFINE_INIT
-#undef CHARSET_NAME
-#undef DEFINE_FINI
-#undef MIN_NEEDED_FROM
-#undef MIN_NEEDED_TO
-#undef MAX_NEEDED_FROM
-#undef MAX_NEEDED_TO
-#undef DEFINE_DIRECTION_OBJECTS
-#undef FROM_DIRECTION
-#undef EMIT_SHIFT_TO_INIT
-#undef FROM_LOOP
-#undef TO_LOOP
-#undef SAVE_RESET_STATE
-#undef RESET_INPUT_BUFFER
-#undef FUNCTION_NAME
-#undef PREPARE_LOOP
-#undef END_LOOP
-#undef ONE_DIRECTION
-#undef STORE_REST
diff --git a/newlib/libc/sys/linux/iconv/strtab.c b/newlib/libc/sys/linux/iconv/strtab.c
deleted file mode 100644
index 0f5e2b6..0000000
--- a/newlib/libc/sys/linux/iconv/strtab.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* C string table handling.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@redhat.com>, 2000.
-
-   This program 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 program 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 program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <assert.h>
-#include <inttypes.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/cdefs.h>
-#include <sys/param.h>
-
-
-struct Strent
-{
-  const char *string;
-  size_t len;
-  struct Strent *next;
-  struct Strent *left;
-  struct Strent *right;
-  size_t offset;
-  char reverse[0];
-};
-
-
-struct memoryblock
-{
-  struct memoryblock *next;
-  char memory[0];
-};
-
-
-struct Strtab
-{
-  struct Strent *root;
-  struct memoryblock *memory;
-  char *backp;
-  size_t left;
-  size_t total;
-
-  struct Strent null;
-};
-
-
-/* Cache for the pagesize.  We correct this value a bit so that `malloc'
-   is not allocating more than a page.  */
-static size_t ps;
-
-
-extern void *xmalloc (size_t n) __attribute_malloc__;
-
-/* Prototypes for our functions that are used from iconvconfig.c.  If
-   you change these, change also iconvconfig.c.  */
-/* Create new C string table object in memory.  */
-extern struct Strtab *strtabinit (void);
-
-/* Free resources allocated for C string table ST.  */
-extern void strtabfree (struct Strtab *st);
-
-/* Add string STR (length LEN is != 0) to C string table ST.  */
-extern struct Strent *strtabadd (struct Strtab *st, const char *str,
-				 size_t len);
-
-/* Finalize string table ST and store size in *SIZE and return a pointer.  */
-extern void *strtabfinalize (struct Strtab *st, size_t *size);
-
-/* Get offset in string table for string associated with SE.  */
-extern size_t strtaboffset (struct Strent *se);
-
-
-struct Strtab *
-strtabinit (void)
-{
-  struct Strtab *ret;
-
-  if (ps == 0)
-    {
-      ps = sysconf (_SC_PAGESIZE) - 2 * sizeof (void *);
-      assert (sizeof (struct memoryblock) < ps);
-    }
-
-  ret = (struct Strtab *) calloc (1, sizeof (struct Strtab));
-  if (ret != NULL)
-    {
-      ret->null.len = 1;
-      ret->null.string = "";
-    }
-  return ret;
-}
-
-
-static void
-morememory (struct Strtab *st, size_t len)
-{
-  struct memoryblock *newmem;
-
-  if (len < ps)
-    len = ps;
-  newmem = (struct memoryblock *) malloc (len);
-  if (newmem == NULL)
-    abort ();
-
-  newmem->next = st->memory;
-  st->memory = newmem;
-  st->backp = newmem->memory;
-  st->left = len - offsetof (struct memoryblock, memory);
-}
-
-
-void
-strtabfree (struct Strtab *st)
-{
-  struct memoryblock *mb = st->memory;
-
-  while (mb != NULL)
-    {
-      void *old = mb;
-      mb = mb->next;
-      free (old);
-    }
-
-  free (st);
-}
-
-
-static struct Strent *
-newstring (struct Strtab *st, const char *str, size_t len)
-{
-  struct Strent *newstr;
-  size_t align;
-  int i;
-
-  /* Compute the amount of padding needed to make the structure aligned.  */
-  align = ((__alignof__ (struct Strent)
-	    - (((uintptr_t) st->backp)
-	       & (__alignof__ (struct Strent) - 1)))
-	   & (__alignof__ (struct Strent) - 1));
-
-  /* Make sure there is enough room in the memory block.  */
-  if (st->left < align + sizeof (struct Strent) + len)
-    {
-      morememory (st, sizeof (struct Strent) + len);
-      align = 0;
-    }
-
-  /* Create the reserved string.  */
-  newstr = (struct Strent *) (st->backp + align);
-  newstr->string = str;
-  newstr->len = len;
-  newstr->next = NULL;
-  newstr->left = NULL;
-  newstr->right = NULL;
-  newstr->offset = 0;
-  for (i = len - 2; i >= 0; --i)
-    newstr->reverse[i] = str[len - 2 - i];
-  newstr->reverse[len - 1] = '\0';
-  st->backp += align + sizeof (struct Strent) + len;
-  st->left -= align + sizeof (struct Strent) + len;
-
-  return newstr;
-}
-
-
-/* XXX This function should definitely be rewritten to use a balancing
-   tree algorith (AVL, red-black trees).  For now a simple, correct
-   implementation is enough.  */
-static struct Strent **
-searchstring (struct Strent **sep, struct Strent *newstr)
-{
-  int cmpres;
-
-  /* More strings?  */
-  if (*sep == NULL)
-    {
-      *sep = newstr;
-      return sep;
-    }
-
-  /* Compare the strings.  */
-  cmpres = memcmp ((*sep)->reverse, newstr->reverse,
-		   MIN ((*sep)->len, newstr->len) - 1);
-  if (cmpres == 0)
-    /* We found a matching string.  */
-    return sep;
-  else if (cmpres > 0)
-    return searchstring (&(*sep)->left, newstr);
-  else
-    return searchstring (&(*sep)->right, newstr);
-}
-
-
-/* Add new string.  The actual string is assumed to be permanent.  */
-struct Strent *
-strtabadd (struct Strtab *st, const char *str, size_t len)
-{
-  struct Strent *newstr;
-  struct Strent **sep;
-
-  /* Compute the string length if the caller doesn't know it.  */
-  if (len == 0)
-    len = strlen (str) + 1;
-
-  /* Make sure all "" strings get offset 0.  */
-  if (len == 1)
-    return &st->null;
-
-  /* Allocate memory for the new string and its associated information.  */
-  newstr = newstring (st, str, len);
-
-  /* Search in the array for the place to insert the string.  If there
-     is no string with matching prefix and no string with matching
-     leading substring, create a new entry.  */
-  sep = searchstring (&st->root, newstr);
-  if (*sep != newstr)
-    {
-      /* This is not the same entry.  This means we have a prefix match.  */
-      if ((*sep)->len > newstr->len)
-	{
-	  struct Strent *subs;
-
-	  for (subs = (*sep)->next; subs; subs = subs->next)
-	    if (subs->len == newstr->len)
-	      {
-		/* We have an exact match with a substring.  Free the memory
-		   we allocated.  */
-		st->left += st->backp - (char *) newstr;
-		st->backp = (char *) newstr;
-
-		return subs;
-	      }
-
-	  /* We have a new substring.  This means we don't need the reverse
-	     string of this entry anymore.  */
-	  st->backp -= newstr->len;
-	  st->left += newstr->len;
-
-	  newstr->next = (*sep)->next;
-	  (*sep)->next = newstr;
-	}
-      else if ((*sep)->len != newstr->len)
-	{
-	  /* When we get here it means that the string we are about to
-	     add has a common prefix with a string we already have but
-	     it is longer.  In this case we have to put it first.  */
-	  st->total += newstr->len - (*sep)->len;
-	  newstr->next = *sep;
-	  newstr->left = (*sep)->left;
-	  newstr->right = (*sep)->right;
-	  *sep = newstr;
-	}
-      else
-	{
-	  /* We have an exact match.  Free the memory we allocated.  */
-	  st->left += st->backp - (char *) newstr;
-	  st->backp = (char *) newstr;
-
-	  newstr = *sep;
-	}
-    }
-  else
-    st->total += newstr->len;
-
-  return newstr;
-}
-
-
-static void
-copystrings (struct Strent *nodep, char **freep, size_t *offsetp)
-{
-  struct Strent *subs;
-
-  if (nodep->left != NULL)
-    copystrings (nodep->left, freep, offsetp);
-
-  /* Process the current node.  */
-  nodep->offset = *offsetp;
-  *freep = (char *) memcpy (*freep, nodep->string, nodep->len);
-  *freep += nodep->len;
-  *offsetp += nodep->len;
-
-  for (subs = nodep->next; subs != NULL; subs = subs->next)
-    {
-      assert (subs->len < nodep->len);
-      subs->offset = nodep->offset + nodep->len - subs->len;
-    }
-
-  if (nodep->right != NULL)
-    copystrings (nodep->right, freep, offsetp);
-}
-
-
-void *
-strtabfinalize (struct Strtab *st, size_t *size)
-{
-  size_t copylen;
-  char *endp;
-  char *retval;
-
-  /* Fill in the information.  */
-  endp = retval = (char *) xmalloc (st->total + 1);
-
-  /* Always put an empty string at the beginning so that a zero offset
-     can mean error.  */
-  *endp++ = '\0';
-
-  /* Now run through the tree and add all the string while also updating
-     the offset members of the elfstrent records.  */
-  copylen = 1;
-  copystrings (st->root, &endp, &copylen);
-  assert (copylen == st->total + 1);
-  assert (endp = retval + st->total + 1);
-  *size = copylen;
-
-  return retval;
-}
-
-
-size_t
-strtaboffset (struct Strent *se)
-{
-  return se->offset;
-}
diff --git a/newlib/libc/sys/linux/ids.c b/newlib/libc/sys/linux/ids.c
index f3a95b1..8a12029 100644
--- a/newlib/libc/sys/linux/ids.c
+++ b/newlib/libc/sys/linux/ids.c
@@ -5,22 +5,13 @@
 
 #include <sys/types.h>
 #include <sys/unistd.h>
-#include <machine/syscall.h>
+#include <sys/syscall.h>
 
 
-_syscall1(int,setfsuid,uid_t,uid)
+_syscall1(int,setuid,uid_t,uid)
 _syscall0(uid_t,getuid)
-_syscall1(int,setfsgid,gid_t,gid)
+_syscall1(int,setgid,gid_t,gid)
 _syscall0(gid_t,getgid)
 _syscall0(uid_t,geteuid)
 _syscall0(gid_t,getegid)
-_syscall3(int,setresuid,uid_t,ruid,uid_t,euid,uid_t,suid)
-_syscall3(int,syslog,int,type,char *,bufp,int,len)
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL > 3
 _syscall2(int,getgroups,int,size,gid_t *,list)
-_syscall1(int,setgid,gid_t,gid)
-_syscall1(int,setuid,uid_t,uid)
-#endif
-
-weak_alias(__libc_getuid,__getuid);
diff --git a/newlib/libc/sys/linux/include/argp.h b/newlib/libc/sys/linux/include/argp.h
deleted file mode 100644
index e58258a..0000000
--- a/newlib/libc/sys/linux/include/argp.h
+++ /dev/null
@@ -1,570 +0,0 @@
-/* Hierarchial argument parsing, layered over getopt.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _ARGP_H
-#define _ARGP_H
-
-#include <stdio.h>
-#include <ctype.h>
-#include <getopt.h>
-
-#define __need_error_t
-#include <errno.h>
-
-char *program_invocation_name;
-char *program_invocation_short_name;
-
-#ifndef __const
-# define __const const
-#endif
-
-#ifndef __error_t_defined
-typedef int error_t;
-# define __error_t_defined
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* A description of a particular option.  A pointer to an array of
-   these is passed in the OPTIONS field of an argp structure.  Each option
-   entry can correspond to one long option and/or one short option; more
-   names for the same option can be added by following an entry in an option
-   array with options having the OPTION_ALIAS flag set.  */
-struct argp_option
-{
-  /* The long option name.  For more than one name for the same option, you
-     can use following options with the OPTION_ALIAS flag set.  */
-  __const char *name;
-
-  /* What key is returned for this option.  If > 0 and printable, then it's
-     also accepted as a short option.  */
-  int key;
-
-  /* If non-NULL, this is the name of the argument associated with this
-     option, which is required unless the OPTION_ARG_OPTIONAL flag is set. */
-  __const char *arg;
-
-  /* OPTION_ flags.  */
-  int flags;
-
-  /* The doc string for this option.  If both NAME and KEY are 0, This string
-     will be printed outdented from the normal option column, making it
-     useful as a group header (it will be the first thing printed in its
-     group); in this usage, it's conventional to end the string with a `:'.  */
-  __const char *doc;
-
-  /* The group this option is in.  In a long help message, options are sorted
-     alphabetically within each group, and the groups presented in the order
-     0, 1, 2, ..., n, -m, ..., -2, -1.  Every entry in an options array with
-     if this field 0 will inherit the group number of the previous entry, or
-     zero if it's the first one, unless its a group header (NAME and KEY both
-     0), in which case, the previous entry + 1 is the default.  Automagic
-     options such as --help are put into group -1.  */
-  int group;
-};
-
-/* The argument associated with this option is optional.  */
-#define OPTION_ARG_OPTIONAL	0x1
-
-/* This option isn't displayed in any help messages.  */
-#define OPTION_HIDDEN	       	0x2
-
-/* This option is an alias for the closest previous non-alias option.  This
-   means that it will be displayed in the same help entry, and will inherit
-   fields other than NAME and KEY from the aliased option.  */
-#define OPTION_ALIAS		0x4
-
-/* This option isn't actually an option (and so should be ignored by the
-   actual option parser), but rather an arbitrary piece of documentation that
-   should be displayed in much the same manner as the options.  If this flag
-   is set, then the option NAME field is displayed unmodified (e.g., no `--'
-   prefix is added) at the left-margin (where a *short* option would normally
-   be displayed), and the documentation string in the normal place.  For
-   purposes of sorting, any leading whitespace and puncuation is ignored,
-   except that if the first non-whitespace character is not `-', this entry
-   is displayed after all options (and OPTION_DOC entries with a leading `-')
-   in the same group.  */
-#define OPTION_DOC		0x8
-
-/* This option shouldn't be included in `long' usage messages (but is still
-   included in help messages).  This is mainly intended for options that are
-   completely documented in an argp's ARGS_DOC field, in which case including
-   the option in the generic usage list would be redundant.  For instance,
-   if ARGS_DOC is "FOO BAR\n-x BLAH", and the `-x' option's purpose is to
-   distinguish these two cases, -x should probably be marked
-   OPTION_NO_USAGE.  */
-#define OPTION_NO_USAGE		0x10
-
-struct argp;			/* fwd declare this type */
-struct argp_state;		/* " */
-struct argp_child;		/* " */
-
-/* The type of a pointer to an argp parsing function.  */
-typedef error_t (*argp_parser_t) (int key, char *arg,
-				  struct argp_state *state);
-
-/* What to return for unrecognized keys.  For special ARGP_KEY_ keys, such
-   returns will simply be ignored.  For user keys, this error will be turned
-   into EINVAL (if the call to argp_parse is such that errors are propagated
-   back to the user instead of exiting); returning EINVAL itself would result
-   in an immediate stop to parsing in *all* cases.  */
-#define ARGP_ERR_UNKNOWN	E2BIG /* Hurd should never need E2BIG.  XXX */
-
-/* Special values for the KEY argument to an argument parsing function.
-   ARGP_ERR_UNKNOWN should be returned if they aren't understood.
-
-   The sequence of keys to a parsing function is either (where each
-   uppercased word should be prefixed by `ARGP_KEY_' and opt is a user key):
-
-       INIT opt... NO_ARGS END SUCCESS  -- No non-option arguments at all
-   or  INIT (opt | ARG)... END SUCCESS  -- All non-option args parsed
-   or  INIT (opt | ARG)... SUCCESS      -- Some non-option arg unrecognized
-
-   The third case is where every parser returned ARGP_KEY_UNKNOWN for an
-   argument, in which case parsing stops at that argument (returning the
-   unparsed arguments to the caller of argp_parse if requested, or stopping
-   with an error message if not).
-
-   If an error occurs (either detected by argp, or because the parsing
-   function returned an error value), then the parser is called with
-   ARGP_KEY_ERROR, and no further calls are made.  */
-
-/* This is not an option at all, but rather a command line argument.  If a
-   parser receiving this key returns success, the fact is recorded, and the
-   ARGP_KEY_NO_ARGS case won't be used.  HOWEVER, if while processing the
-   argument, a parser function decrements the NEXT field of the state it's
-   passed, the option won't be considered processed; this is to allow you to
-   actually modify the argument (perhaps into an option), and have it
-   processed again.  */
-#define ARGP_KEY_ARG		0
-/* There are remaining arguments not parsed by any parser, which may be found
-   starting at (STATE->argv + STATE->next).  If success is returned, but
-   STATE->next left untouched, it's assumed that all arguments were consume,
-   otherwise, the parser should adjust STATE->next to reflect any arguments
-   consumed.  */
-#define ARGP_KEY_ARGS		0x1000006
-/* There are no more command line arguments at all.  */
-#define ARGP_KEY_END		0x1000001
-/* Because it's common to want to do some special processing if there aren't
-   any non-option args, user parsers are called with this key if they didn't
-   successfully process any non-option arguments.  Called just before
-   ARGP_KEY_END (where more general validity checks on previously parsed
-   arguments can take place).  */
-#define ARGP_KEY_NO_ARGS	0x1000002
-/* Passed in before any parsing is done.  Afterwards, the values of each
-   element of the CHILD_INPUT field, if any, in the state structure is
-   copied to each child's state to be the initial value of the INPUT field.  */
-#define ARGP_KEY_INIT		0x1000003
-/* Use after all other keys, including SUCCESS & END.  */
-#define ARGP_KEY_FINI		0x1000007
-/* Passed in when parsing has successfully been completed (even if there are
-   still arguments remaining).  */
-#define ARGP_KEY_SUCCESS	0x1000004
-/* Passed in if an error occurs.  */
-#define ARGP_KEY_ERROR		0x1000005
-
-/* An argp structure contains a set of options declarations, a function to
-   deal with parsing one, documentation string, a possible vector of child
-   argp's, and perhaps a function to filter help output.  When actually
-   parsing options, getopt is called with the union of all the argp
-   structures chained together through their CHILD pointers, with conflicts
-   being resolved in favor of the first occurrence in the chain.  */
-struct argp
-{
-  /* An array of argp_option structures, terminated by an entry with both
-     NAME and KEY having a value of 0.  */
-  __const struct argp_option *options;
-
-  /* What to do with an option from this structure.  KEY is the key
-     associated with the option, and ARG is any associated argument (NULL if
-     none was supplied).  If KEY isn't understood, ARGP_ERR_UNKNOWN should be
-     returned.  If a non-zero, non-ARGP_ERR_UNKNOWN value is returned, then
-     parsing is stopped immediately, and that value is returned from
-     argp_parse().  For special (non-user-supplied) values of KEY, see the
-     ARGP_KEY_ definitions below.  */
-  argp_parser_t parser;
-
-  /* A string describing what other arguments are wanted by this program.  It
-     is only used by argp_usage to print the `Usage:' message.  If it
-     contains newlines, the strings separated by them are considered
-     alternative usage patterns, and printed on separate lines (lines after
-     the first are prefix by `  or: ' instead of `Usage:').  */
-  __const char *args_doc;
-
-  /* If non-NULL, a string containing extra text to be printed before and
-     after the options in a long help message (separated by a vertical tab
-     `\v' character).  */
-  __const char *doc;
-
-  /* A vector of argp_children structures, terminated by a member with a 0
-     argp field, pointing to child argps should be parsed with this one.  Any
-     conflicts are resolved in favor of this argp, or early argps in the
-     CHILDREN list.  This field is useful if you use libraries that supply
-     their own argp structure, which you want to use in conjunction with your
-     own.  */
-  __const struct argp_child *children;
-
-  /* If non-zero, this should be a function to filter the output of help
-     messages.  KEY is either a key from an option, in which case TEXT is
-     that option's help text, or a special key from the ARGP_KEY_HELP_
-     defines, below, describing which other help text TEXT is.  The function
-     should return either TEXT, if it should be used as-is, a replacement
-     string, which should be malloced, and will be freed by argp, or NULL,
-     meaning `print nothing'.  The value for TEXT is *after* any translation
-     has been done, so if any of the replacement text also needs translation,
-     that should be done by the filter function.  INPUT is either the input
-     supplied to argp_parse, or NULL, if argp_help was called directly.  */
-  char *(*help_filter) (int __key, __const char *__text, void *__input);
-
-  /* If non-zero the strings used in the argp library are translated using
-     the domain described by this string.  Otherwise the currently installed
-     default domain is used.  */
-  const char *argp_domain;
-};
-
-/* Possible KEY arguments to a help filter function.  */
-#define ARGP_KEY_HELP_PRE_DOC	0x2000001 /* Help text preceeding options. */
-#define ARGP_KEY_HELP_POST_DOC	0x2000002 /* Help text following options. */
-#define ARGP_KEY_HELP_HEADER	0x2000003 /* Option header string. */
-#define ARGP_KEY_HELP_EXTRA	0x2000004 /* After all other documentation;
-					     TEXT is NULL for this key.  */
-/* Explanatory note emitted when duplicate option arguments have been
-   suppressed.  */
-#define ARGP_KEY_HELP_DUP_ARGS_NOTE 0x2000005
-#define ARGP_KEY_HELP_ARGS_DOC	0x2000006 /* Argument doc string.  */
-
-/* When an argp has a non-zero CHILDREN field, it should point to a vector of
-   argp_child structures, each of which describes a subsidiary argp.  */
-struct argp_child
-{
-  /* The child parser.  */
-  __const struct argp *argp;
-
-  /* Flags for this child.  */
-  int flags;
-
-  /* If non-zero, an optional header to be printed in help output before the
-     child options.  As a side-effect, a non-zero value forces the child
-     options to be grouped together; to achieve this effect without actually
-     printing a header string, use a value of "".  */
-  __const char *header;
-
-  /* Where to group the child options relative to the other (`consolidated')
-     options in the parent argp; the values are the same as the GROUP field
-     in argp_option structs, but all child-groupings follow parent options at
-     a particular group level.  If both this field and HEADER are zero, then
-     they aren't grouped at all, but rather merged with the parent options
-     (merging the child's grouping levels with the parents).  */
-  int group;
-};
-
-/* Parsing state.  This is provided to parsing functions called by argp,
-   which may examine and, as noted, modify fields.  */
-struct argp_state
-{
-  /* The top level ARGP being parsed.  */
-  __const struct argp *root_argp;
-
-  /* The argument vector being parsed.  May be modified.  */
-  int argc;
-  char **argv;
-
-  /* The index in ARGV of the next arg that to be parsed.  May be modified. */
-  int next;
-
-  /* The flags supplied to argp_parse.  May be modified.  */
-  unsigned flags;
-
-  /* While calling a parsing function with a key of ARGP_KEY_ARG, this is the
-     number of the current arg, starting at zero, and incremented after each
-     such call returns.  At all other times, this is the number of such
-     arguments that have been processed.  */
-  unsigned arg_num;
-
-  /* If non-zero, the index in ARGV of the first argument following a special
-     `--' argument (which prevents anything following being interpreted as an
-     option).  Only set once argument parsing has proceeded past this point. */
-  int quoted;
-
-  /* An arbitrary pointer passed in from the user.  */
-  void *input;
-  /* Values to pass to child parsers.  This vector will be the same length as
-     the number of children for the current parser.  */
-  void **child_inputs;
-
-  /* For the parser's use.  Initialized to 0.  */
-  void *hook;
-
-  /* The name used when printing messages.  This is initialized to ARGV[0],
-     or PROGRAM_INVOCATION_NAME if that is unavailable.  */
-  char *name;
-
-  /* Streams used when argp prints something.  */
-  FILE *err_stream;		/* For errors; initialized to stderr. */
-  FILE *out_stream;		/* For information; initialized to stdout. */
-
-  void *pstate;			/* Private, for use by argp.  */
-};
-
-/* Flags for argp_parse (note that the defaults are those that are
-   convenient for program command line parsing): */
-
-/* Don't ignore the first element of ARGV.  Normally (and always unless
-   ARGP_NO_ERRS is set) the first element of the argument vector is
-   skipped for option parsing purposes, as it corresponds to the program name
-   in a command line.  */
-#define ARGP_PARSE_ARGV0  0x01
-
-/* Don't print error messages for unknown options to stderr; unless this flag
-   is set, ARGP_PARSE_ARGV0 is ignored, as ARGV[0] is used as the program
-   name in the error messages.  This flag implies ARGP_NO_EXIT (on the
-   assumption that silent exiting upon errors is bad behaviour).  */
-#define ARGP_NO_ERRS	0x02
-
-/* Don't parse any non-option args.  Normally non-option args are parsed by
-   calling the parse functions with a key of ARGP_KEY_ARG, and the actual arg
-   as the value.  Since it's impossible to know which parse function wants to
-   handle it, each one is called in turn, until one returns 0 or an error
-   other than ARGP_ERR_UNKNOWN; if an argument is handled by no one, the
-   argp_parse returns prematurely (but with a return value of 0).  If all
-   args have been parsed without error, all parsing functions are called one
-   last time with a key of ARGP_KEY_END.  This flag needn't normally be set,
-   as the normal behavior is to stop parsing as soon as some argument can't
-   be handled.  */
-#define ARGP_NO_ARGS	0x04
-
-/* Parse options and arguments in the same order they occur on the command
-   line -- normally they're rearranged so that all options come first. */
-#define ARGP_IN_ORDER	0x08
-
-/* Don't provide the standard long option --help, which causes usage and
-      option help information to be output to stdout, and exit (0) called. */
-#define ARGP_NO_HELP	0x10
-
-/* Don't exit on errors (they may still result in error messages).  */
-#define ARGP_NO_EXIT	0x20
-
-/* Use the gnu getopt `long-only' rules for parsing arguments.  */
-#define ARGP_LONG_ONLY	0x40
-
-/* Turns off any message-printing/exiting options.  */
-#define ARGP_SILENT    (ARGP_NO_EXIT | ARGP_NO_ERRS | ARGP_NO_HELP)
-
-/* Parse the options strings in ARGC & ARGV according to the options in ARGP.
-   FLAGS is one of the ARGP_ flags above.  If ARG_INDEX is non-NULL, the
-   index in ARGV of the first unparsed option is returned in it.  If an
-   unknown option is present, ARGP_ERR_UNKNOWN is returned; if some parser
-   routine returned a non-zero value, it is returned; otherwise 0 is
-   returned.  This function may also call exit unless the ARGP_NO_HELP flag
-   is set.  INPUT is a pointer to a value to be passed in to the parser.  */
-extern error_t argp_parse (__const struct argp *__restrict __argp,
-			   int __argc, char **__restrict __argv,
-			   unsigned __flags, int *__restrict __arg_index,
-			   void *__restrict __input) __THROW;
-extern error_t __argp_parse (__const struct argp *__restrict __argp,
-			     int __argc, char **__restrict __argv,
-			     unsigned __flags, int *__restrict __arg_index,
-			     void *__restrict __input) __THROW;
-
-/* Global variables.  */
-
-/* If defined or set by the user program to a non-zero value, then a default
-   option --version is added (unless the ARGP_NO_HELP flag is used), which
-   will print this string followed by a newline and exit (unless the
-   ARGP_NO_EXIT flag is used).  Overridden by ARGP_PROGRAM_VERSION_HOOK.  */
-extern __const char *argp_program_version;
-
-/* If defined or set by the user program to a non-zero value, then a default
-   option --version is added (unless the ARGP_NO_HELP flag is used), which
-   calls this function with a stream to print the version to and a pointer to
-   the current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
-   used).  This variable takes precedent over ARGP_PROGRAM_VERSION.  */
-extern void (*argp_program_version_hook) (FILE *__restrict __stream,
-					  struct argp_state *__restrict
-					  __state);
-
-/* If defined or set by the user program, it should point to string that is
-   the bug-reporting address for the program.  It will be printed by
-   argp_help if the ARGP_HELP_BUG_ADDR flag is set (as it is by various
-   standard help messages), embedded in a sentence that says something like
-   `Report bugs to ADDR.'.  */
-extern __const char *argp_program_bug_address;
-
-/* The exit status that argp will use when exiting due to a parsing error.
-   If not defined or set by the user program, this defaults to EX_USAGE from
-   <sysexits.h>.  */
-extern error_t argp_err_exit_status;
-
-/* Flags for argp_help.  */
-#define ARGP_HELP_USAGE		0x01 /* a Usage: message. */
-#define ARGP_HELP_SHORT_USAGE	0x02 /*  " but don't actually print options. */
-#define ARGP_HELP_SEE		0x04 /* a `Try ... for more help' message. */
-#define ARGP_HELP_LONG		0x08 /* a long help message. */
-#define ARGP_HELP_PRE_DOC	0x10 /* doc string preceding long help.  */
-#define ARGP_HELP_POST_DOC	0x20 /* doc string following long help.  */
-#define ARGP_HELP_DOC		(ARGP_HELP_PRE_DOC | ARGP_HELP_POST_DOC)
-#define ARGP_HELP_BUG_ADDR	0x40 /* bug report address */
-#define ARGP_HELP_LONG_ONLY	0x80 /* modify output appropriately to
-					reflect ARGP_LONG_ONLY mode.  */
-
-/* These ARGP_HELP flags are only understood by argp_state_help.  */
-#define ARGP_HELP_EXIT_ERR	0x100 /* Call exit(1) instead of returning.  */
-#define ARGP_HELP_EXIT_OK	0x200 /* Call exit(0) instead of returning.  */
-
-/* The standard thing to do after a program command line parsing error, if an
-   error message has already been printed.  */
-#define ARGP_HELP_STD_ERR \
-  (ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR)
-/* The standard thing to do after a program command line parsing error, if no
-   more specific error message has been printed.  */
-#define ARGP_HELP_STD_USAGE \
-  (ARGP_HELP_SHORT_USAGE | ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR)
-/* The standard thing to do in response to a --help option.  */
-#define ARGP_HELP_STD_HELP \
-  (ARGP_HELP_SHORT_USAGE | ARGP_HELP_LONG | ARGP_HELP_EXIT_OK \
-   | ARGP_HELP_DOC | ARGP_HELP_BUG_ADDR)
-
-/* Output a usage message for ARGP to STREAM.  FLAGS are from the set
-   ARGP_HELP_*.  */
-extern void argp_help (__const struct argp *__restrict __argp,
-		       FILE *__restrict __stream,
-		       unsigned __flags, char *__restrict __name) __THROW;
-extern void __argp_help (__const struct argp *__restrict __argp,
-			 FILE *__restrict __stream, unsigned __flags,
-			 char *__name) __THROW;
-
-/* The following routines are intended to be called from within an argp
-   parsing routine (thus taking an argp_state structure as the first
-   argument).  They may or may not print an error message and exit, depending
-   on the flags in STATE -- in any case, the caller should be prepared for
-   them *not* to exit, and should return an appropiate error after calling
-   them.  [argp_usage & argp_error should probably be called argp_state_...,
-   but they're used often enough that they should be short]  */
-
-/* Output, if appropriate, a usage message for STATE to STREAM.  FLAGS are
-   from the set ARGP_HELP_*.  */
-extern void argp_state_help (__const struct argp_state *__restrict __state,
-			     FILE *__restrict __stream,
-			     unsigned int __flags) __THROW;
-extern void __argp_state_help (__const struct argp_state *__restrict __state,
-			       FILE *__restrict __stream,
-			       unsigned int __flags) __THROW;
-
-/* Possibly output the standard usage message for ARGP to stderr and exit.  */
-extern void argp_usage (__const struct argp_state *__state) __THROW;
-extern void __argp_usage (__const struct argp_state *__state) __THROW;
-
-/* If appropriate, print the printf string FMT and following args, preceded
-   by the program name and `:', to stderr, and followed by a `Try ... --help'
-   message, then exit (1).  */
-extern void argp_error (__const struct argp_state *__restrict __state,
-			__const char *__restrict __fmt, ...) __THROW
-     __attribute__ ((__format__ (__printf__, 2, 3)));
-extern void __argp_error (__const struct argp_state *__restrict __state,
-			  __const char *__restrict __fmt, ...) __THROW
-     __attribute__ ((__format__ (__printf__, 2, 3)));
-
-/* Similar to the standard gnu error-reporting function error(), but will
-   respect the ARGP_NO_EXIT and ARGP_NO_ERRS flags in STATE, and will print
-   to STATE->err_stream.  This is useful for argument parsing code that is
-   shared between program startup (when exiting is desired) and runtime
-   option parsing (when typically an error code is returned instead).  The
-   difference between this function and argp_error is that the latter is for
-   *parsing errors*, and the former is for other problems that occur during
-   parsing but don't reflect a (syntactic) problem with the input.  */
-extern void argp_failure (__const struct argp_state *__restrict __state,
-			  int __status, int __errnum,
-			  __const char *__restrict __fmt, ...) __THROW
-     __attribute__ ((__format__ (__printf__, 4, 5)));
-extern void __argp_failure (__const struct argp_state *__restrict __state,
-			    int __status, int __errnum,
-			    __const char *__restrict __fmt, ...) __THROW
-     __attribute__ ((__format__ (__printf__, 4, 5)));
-
-/* Returns true if the option OPT is a valid short option.  */
-extern int _option_is_short (__const struct argp_option *__opt) __THROW;
-extern int __option_is_short (__const struct argp_option *__opt) __THROW;
-
-/* Returns true if the option OPT is in fact the last (unused) entry in an
-   options array.  */
-extern int _option_is_end (__const struct argp_option *__opt) __THROW;
-extern int __option_is_end (__const struct argp_option *__opt) __THROW;
-
-/* Return the input field for ARGP in the parser corresponding to STATE; used
-   by the help routines.  */
-extern void *_argp_input (__const struct argp *__restrict __argp,
-			  __const struct argp_state *__restrict __state)
-     __THROW;
-extern void *__argp_input (__const struct argp *__restrict __argp,
-			   __const struct argp_state *__restrict __state)
-     __THROW;
-
-#ifdef __USE_EXTERN_INLINES
-
-# if !_LIBC
-#  define __argp_usage argp_usage
-#  define __argp_state_help argp_state_help
-#  define __option_is_short _option_is_short
-#  define __option_is_end _option_is_end
-# endif
-
-# ifndef ARGP_EI
-#  define ARGP_EI extern __inline__
-# endif
-
-ARGP_EI void
-__argp_usage (__const struct argp_state *__state) __THROW
-{
-  __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
-}
-
-ARGP_EI int
-__option_is_short (__const struct argp_option *__opt) __THROW
-{
-  if (__opt->flags & OPTION_DOC)
-    return 0;
-  else
-    {
-      int __key = __opt->key;
-      return __key > 0 && isprint (__key);
-    }
-}
-
-ARGP_EI int
-__option_is_end (__const struct argp_option *__opt) __THROW
-{
-  return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
-}
-
-# if !_LIBC
-#  undef __argp_usage
-#  undef __argp_state_help
-#  undef __option_is_short
-#  undef __option_is_end
-# endif
-#endif /* Use extern inlines.  */
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* argp.h */
diff --git a/newlib/libc/sys/linux/include/arpa/ftp.h b/newlib/libc/sys/linux/include/arpa/ftp.h
deleted file mode 100644
index 9a36488..0000000
--- a/newlib/libc/sys/linux/include/arpa/ftp.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ftp.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _ARPA_FTP_H_
-#define	_ARPA_FTP_H_
-
-/* Definitions for FTP; see RFC-765. */
-
-/*
- * Reply codes.
- */
-#define PRELIM		1	/* positive preliminary */
-#define COMPLETE	2	/* positive completion */
-#define CONTINUE	3	/* positive intermediate */
-#define TRANSIENT	4	/* transient negative completion */
-#define ERROR		5	/* permanent negative completion */
-
-/*
- * Type codes
- */
-#define	TYPE_A		1	/* ASCII */
-#define	TYPE_E		2	/* EBCDIC */
-#define	TYPE_I		3	/* image */
-#define	TYPE_L		4	/* local byte size */
-
-#ifdef FTP_NAMES
-char *typenames[] =  {"0", "ASCII", "EBCDIC", "Image", "Local" };
-#endif
-
-/*
- * Form codes
- */
-#define	FORM_N		1	/* non-print */
-#define	FORM_T		2	/* telnet format effectors */
-#define	FORM_C		3	/* carriage control (ASA) */
-#ifdef FTP_NAMES
-char *formnames[] =  {"0", "Nonprint", "Telnet", "Carriage-control" };
-#endif
-
-/*
- * Structure codes
- */
-#define	STRU_F		1	/* file (no record structure) */
-#define	STRU_R		2	/* record structure */
-#define	STRU_P		3	/* page structure */
-#ifdef FTP_NAMES
-char *strunames[] =  {"0", "File", "Record", "Page" };
-#endif
-
-/*
- * Mode types
- */
-#define	MODE_S		1	/* stream */
-#define	MODE_B		2	/* block */
-#define	MODE_C		3	/* compressed */
-#ifdef FTP_NAMES
-char *modenames[] =  {"0", "Stream", "Block", "Compressed" };
-#endif
-
-/*
- * Record Tokens
- */
-#define	REC_ESC		'\377'	/* Record-mode Escape */
-#define	REC_EOR		'\001'	/* Record-mode End-of-Record */
-#define REC_EOF		'\002'	/* Record-mode End-of-File */
-
-/*
- * Block Header
- */
-#define	BLK_EOR		0x80	/* Block is End-of-Record */
-#define	BLK_EOF		0x40	/* Block is End-of-File */
-#define BLK_ERRORS	0x20	/* Block is suspected of containing errors */
-#define	BLK_RESTART	0x10	/* Block is Restart Marker */
-
-#define	BLK_BYTECOUNT	2	/* Bytes in this block */
-
-#endif /* !_FTP_H_ */
diff --git a/newlib/libc/sys/linux/include/arpa/inet.h b/newlib/libc/sys/linux/include/arpa/inet.h
deleted file mode 100644
index 82bcf35..0000000
--- a/newlib/libc/sys/linux/include/arpa/inet.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- *	@(#)inet.h	8.1 (Berkeley) 6/2/93
- *	From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $
- * $FreeBSD: src/include/arpa/inet.h,v 1.22 2002/04/10 10:51:53 mike Exp $
- */
-
-#ifndef _ARPA_INET_H_
-#define	_ARPA_INET_H_
-
-/* External definitions for functions in inet(3), addr2ascii(3) */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/ansi.h>
-
-/* Required for byteorder(3) functions. */
-#include <machine/endian.h>
-
-#define	INET_ADDRSTRLEN		16
-#define	INET6_ADDRSTRLEN	46
-
-#ifndef _UINT16_T_DECLARED
-typedef	__uint16_t	uint16_t;
-#define	_UINT16_T_DECLARED
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef	__uint32_t	uint32_t;
-#define	_UINT32_T_DECLARED
-#endif
-
-#ifndef	_IN_ADDR_T_DECLARED
-typedef	uint32_t	in_addr_t;
-#define	_IN_ADDR_T_DECLARED
-#endif
-
-#ifndef	_IN_PORT_T_DECLARED
-typedef	uint16_t	in_port_t;
-#define	_IN_PORT_T_DECLARED
-#endif
-
-#ifndef _POSIX_SOURCE
-#ifdef	_BSD_SIZE_T_
-typedef	_BSD_SIZE_T_	size_t;
-#undef	_BSD_SIZE_T_
-#endif
-#endif /* !_POSIX_SOURCE */
-
-/*
- * XXX socklen_t is used by a POSIX.1-2001 interface, but not required by
- * POSIX.1-2001.
- */
-
-
-#ifndef __socklen_t_defined
-typedef unsigned int socklen_t;
-#define __socklen_t_defined 1
-#endif
-
-#ifdef	_BSD_SOCKLEN_T_
-typedef	_BSD_SOCKLEN_T_	socklen_t;
-#undef	_BSD_SOCKLEN_T_
-#endif
-
-#ifndef _STRUCT_IN_ADDR_DECLARED
-struct in_addr {
-	in_addr_t s_addr;
-};
-#define	_STRUCT_IN_ADDR_DECLARED
-#endif
-
-#define	inet_addr	__inet_addr
-#define	inet_aton	__inet_aton
-#define	inet_lnaof	__inet_lnaof
-#define	inet_makeaddr	__inet_makeaddr
-#define	inet_neta	__inet_neta
-#define	inet_netof	__inet_netof
-#define	inet_network	__inet_network
-#define	inet_net_ntop	__inet_net_ntop
-#define	inet_net_pton	__inet_net_pton
-#define	inet_ntoa	__inet_ntoa
-#define	inet_pton	__inet_pton
-#define	inet_ntop	__inet_ntop
-#define	inet_nsap_addr	__inet_nsap_addr
-#define	inet_nsap_ntoa	__inet_nsap_ntoa
-
-__BEGIN_DECLS
-in_addr_t	 inet_addr(const char *);
-char		*inet_ntoa(struct in_addr);
-const char	*inet_ntop(int, const void *, char *, socklen_t);
-int		 inet_pton(int, const char *, void *);
-
-int		 ascii2addr(int, const char *, void *);
-char		*addr2ascii(int, const void *, int, char *);
-int		 inet_aton(const char *, struct in_addr *);
-in_addr_t	 inet_lnaof(struct in_addr);
-struct in_addr	 inet_makeaddr(in_addr_t, in_addr_t);
-char *		 inet_neta(in_addr_t, char *, size_t);
-in_addr_t	 inet_netof(struct in_addr);
-in_addr_t	 inet_network(const char *);
-char		*inet_net_ntop(int, const void *, int, char *, size_t);
-int		 inet_net_pton(int, const char *, void *, size_t);
-unsigned	 inet_nsap_addr(const char *, unsigned char *, int);
-char		*inet_nsap_ntoa(int, const unsigned char *, char *);
-__END_DECLS
-
-#endif /* !_ARPA_INET_H_ */
diff --git a/newlib/libc/sys/linux/include/arpa/nameser.h b/newlib/libc/sys/linux/include/arpa/nameser.h
deleted file mode 100644
index 8735b8b..0000000
--- a/newlib/libc/sys/linux/include/arpa/nameser.h
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	From: Id: nameser.h,v 8.16 1998/02/06 00:35:58 halley Exp
- * $FreeBSD: src/include/arpa/nameser.h,v 1.16 2002/03/23 17:24:55 imp Exp $
- */
-
-#ifndef _ARPA_NAMESER_H_
-#define _ARPA_NAMESER_H_
-
-#define BIND_4_COMPAT
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-/*
- * revision information.  this is the release date in YYYYMMDD format.
- * it can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__NAMESER > 19931104)".  do not
- * compare for equality; rather, use it to determine whether your libnameser.a
- * is new enough to contain a certain feature.
- */
-
-/* XXXRTH I made this bigger than __BIND in 4.9.5 T6B */
-#define __NAMESER	19961001	/* New interface version stamp. */
-
-/*
- * Define constants based on RFC 883, RFC 1034, RFC 1035
- */
-#define NS_PACKETSZ	512	/* maximum packet size */
-#define NS_MAXDNAME	1025	/* maximum domain name */
-#define NS_MAXCDNAME	255	/* maximum compressed domain name */
-#define NS_MAXLABEL	63	/* maximum length of domain label */
-#define NS_HFIXEDSZ	12	/* #/bytes of fixed data in header */
-#define NS_QFIXEDSZ	4	/* #/bytes of fixed data in query */
-#define NS_RRFIXEDSZ	10	/* #/bytes of fixed data in r record */
-#define NS_INT32SZ	4	/* #/bytes of data in a u_int32_t */
-#define NS_INT16SZ	2	/* #/bytes of data in a u_int16_t */
-#define NS_INT8SZ	1	/* #/bytes of data in a u_int8_t */
-#define NS_INADDRSZ	4	/* IPv4 T_A */
-#define NS_IN6ADDRSZ	16	/* IPv6 T_AAAA */
-#define NS_CMPRSFLGS	0xc0	/* Flag bits indicating name compression. */
-#define NS_DEFAULTPORT	53	/* For both TCP and UDP. */
-
-/*
- * These can be expanded with synonyms, just keep ns_parse.c:ns_parserecord()
- * in synch with it.
- */
-typedef enum __ns_sect {
-	ns_s_qd = 0,		/* Query: Question. */
-	ns_s_zn = 0,		/* Update: Zone. */
-	ns_s_an = 1,		/* Query: Answer. */
-	ns_s_pr = 1,		/* Update: Prerequisites. */
-	ns_s_ns = 2,		/* Query: Name servers. */
-	ns_s_ud = 2,		/* Update: Update. */
-	ns_s_ar = 3,		/* Query|Update: Additional records. */
-	ns_s_max = 4
-} ns_sect;
-
-/*
- * This is a message handle.  It is caller allocated and has no dynamic data.
- * This structure is intended to be opaque to all but ns_parse.c, thus the
- * leading _'s on the member names.  Use the accessor functions, not the _'s.
- */
-typedef struct __ns_msg {
-	const u_char	*_msg, *_eom;
-	u_int16_t	_id, _flags, _counts[ns_s_max];
-	const u_char	*_sections[ns_s_max];
-	ns_sect		_sect;
-	int		_rrnum;
-	const u_char	*_ptr;
-} ns_msg;
-
-/* Private data structure - do not use from outside library. */
-struct _ns_flagdata {  int mask, shift;  };
-extern struct _ns_flagdata _ns_flagdata[];
-
-/* Accessor macros - this is part of the public interface. */
-#define ns_msg_getflag(handle, flag) ( \
-			((handle)._flags & _ns_flagdata[flag].mask) \
-			 >> _ns_flagdata[flag].shift \
-			)
-#define ns_msg_id(handle) ((handle)._id + 0)
-#define ns_msg_base(handle) ((handle)._msg + 0)
-#define ns_msg_end(handle) ((handle)._eom + 0)
-#define ns_msg_size(handle) ((handle)._eom - (handle)._msg)
-#define ns_msg_count(handle, section) ((handle)._counts[section] + 0)
-
-/*
- * This is a parsed record.  It is caller allocated and has no dynamic data.
- */
-typedef	struct __ns_rr {
-	char		name[NS_MAXDNAME];	/* XXX need to malloc */
-	u_int16_t	type;
-	u_int16_t	rr_class;
-	u_int32_t	ttl;
-	u_int16_t	rdlength;
-	const u_char	*rdata;
-} ns_rr;
-
-/* Accessor macros - this is part of the public interface. */
-#define ns_rr_name(rr)	(((rr).name[0] != '\0') ? (rr).name : ".")
-#define ns_rr_type(rr)	((rr).type + 0)
-#define ns_rr_class(rr)	((rr).rr_class + 0)
-#define ns_rr_ttl(rr)	((rr).ttl + 0)
-#define ns_rr_rdlen(rr)	((rr).rdlength + 0)
-#define ns_rr_rdata(rr)	((rr).rdata + 0)
-
-/*
- * These don't have to be in the same order as in the packet flags word,
- * and they can even overlap in some cases, but they will need to be kept
- * in synch with ns_parse.c:ns_flagdata[].
- */
-typedef enum __ns_flag {
-	ns_f_qr,		/* Question/Response. */
-	ns_f_opcode,		/* Operation code. */
-	ns_f_aa,		/* Authoritative Answer. */
-	ns_f_tc,		/* Truncation occurred. */
-	ns_f_rd,		/* Recursion Desired. */
-	ns_f_ra,		/* Recursion Available. */
-	ns_f_z,			/* MBZ. */
-	ns_f_ad,		/* Authentic Data (DNSSEC). */
-	ns_f_cd,		/* Checking Disabled (DNSSEC). */
-	ns_f_rcode,		/* Response code. */
-	ns_f_max
-} ns_flag;
-
-/*
- * Currently defined opcodes.
- */
-typedef enum __ns_opcode {
-	ns_o_query = 0,		/* Standard query. */
-	ns_o_iquery = 1,	/* Inverse query (deprecated/unsupported). */
-	ns_o_status = 2,	/* Name server status query (unsupported). */
-				/* Opcode 3 is undefined/reserved. */
-	ns_o_notify = 4,	/* Zone change notification. */
-	ns_o_update = 5,	/* Zone update message. */
-	ns_o_max = 6
-} ns_opcode;
-
-/*
- * Currently defined response codes.
- */
-typedef	enum __ns_rcode {
-	ns_r_noerror = 0,	/* No error occurred. */
-	ns_r_formerr = 1,	/* Format error. */
-	ns_r_servfail = 2,	/* Server failure. */
-	ns_r_nxdomain = 3,	/* Name error. */
-	ns_r_notimpl = 4,	/* Unimplemented. */
-	ns_r_refused = 5,	/* Operation refused. */
-	/* these are for BIND_UPDATE */
-	ns_r_yxdomain = 6,	/* Name exists */
-	ns_r_yxrrset = 7,	/* RRset exists */
-	ns_r_nxrrset = 8,	/* RRset does not exist */
-	ns_r_notauth = 9,	/* Not authoritative for zone */
-	ns_r_notzone = 10,	/* Zone of record different from zone section */
-	ns_r_max = 11
-} ns_rcode;
-
-/* BIND_UPDATE */
-typedef enum __ns_update_operation {
-	ns_uop_delete = 0,
-	ns_uop_add = 1,
-	ns_uop_max = 2
-} ns_update_operation;
-
-/*
- * This RR-like structure is particular to UPDATE.
- */
-struct ns_updrec {
-	struct ns_updrec *r_prev;	/* prev record */
-	struct ns_updrec *r_next;	/* next record */
-	u_int8_t	r_section;	/* ZONE/PREREQUISITE/UPDATE */
-	char *		r_dname;	/* owner of the RR */
-	u_int16_t	r_class;	/* class number */
-	u_int16_t	r_type;		/* type number */
-	u_int32_t	r_ttl;		/* time to live */
-	u_char *	r_data;		/* rdata fields as text string */
-	u_int16_t	r_size;		/* size of r_data field */
-	int		r_opcode;	/* type of operation */
-	/* following fields for private use by the resolver/server routines */
-	struct ns_updrec *r_grpnext;	/* next record when grouped */
-	struct databuf *r_dp;		/* databuf to process */
-	struct databuf *r_deldp;	/* databuf's deleted/overwritten */
-	u_int16_t	r_zone;		/* zone number on server */
-};
-typedef struct ns_updrec ns_updrec;
-
-/*
- * Currently defined type values for resources and queries.
- */
-typedef enum __ns_type {
-	ns_t_a = 1,		/* Host address. */
-	ns_t_ns = 2,		/* Authoritative server. */
-	ns_t_md = 3,		/* Mail destination. */
-	ns_t_mf = 4,		/* Mail forwarder. */
-	ns_t_cname = 5,		/* Canonical name. */
-	ns_t_soa = 6,		/* Start of authority zone. */
-	ns_t_mb = 7,		/* Mailbox domain name. */
-	ns_t_mg = 8,		/* Mail group member. */
-	ns_t_mr = 9,		/* Mail rename name. */
-	ns_t_null = 10,		/* Null resource record. */
-	ns_t_wks = 11,		/* Well known service. */
-	ns_t_ptr = 12,		/* Domain name pointer. */
-	ns_t_hinfo = 13,	/* Host information. */
-	ns_t_minfo = 14,	/* Mailbox information. */
-	ns_t_mx = 15,		/* Mail routing information. */
-	ns_t_txt = 16,		/* Text strings. */
-	ns_t_rp = 17,		/* Responsible person. */
-	ns_t_afsdb = 18,	/* AFS cell database. */
-	ns_t_x25 = 19,		/* X_25 calling address. */
-	ns_t_isdn = 20,		/* ISDN calling address. */
-	ns_t_rt = 21,		/* Router. */
-	ns_t_nsap = 22,		/* NSAP address. */
-	ns_t_nsap_ptr = 23,	/* Reverse NSAP lookup (deprecated). */
-	ns_t_sig = 24,		/* Security signature. */
-	ns_t_key = 25,		/* Security key. */
-	ns_t_px = 26,		/* X.400 mail mapping. */
-	ns_t_gpos = 27,		/* Geographical position (withdrawn). */
-	ns_t_aaaa = 28,		/* Ip6 Address. */
-	ns_t_loc = 29,		/* Location Information. */
-	ns_t_nxt = 30,		/* Next domain (security). */
-	ns_t_eid = 31,		/* Endpoint identifier. */
-	ns_t_nimloc = 32,	/* Nimrod Locator. */
-	ns_t_srv = 33,		/* Server Selection. */
-	ns_t_atma = 34,		/* ATM Address */
-	ns_t_naptr = 35,	/* Naming Authority PoinTeR */
-	ns_t_opt = 41,		/* OPT pseudo-RR, RFC2761 */
-	/* Query type values which do not appear in resource records. */
-	ns_t_ixfr = 251,	/* Incremental zone transfer. */
-	ns_t_axfr = 252,	/* Transfer zone of authority. */
-	ns_t_mailb = 253,	/* Transfer mailbox records. */
-	ns_t_maila = 254,	/* Transfer mail agent records. */
-	ns_t_any = 255,		/* Wildcard match. */
-	ns_t_max = 65536
-} ns_type;
-
-/*
- * Values for class field
- */
-typedef enum __ns_class {
-	ns_c_in = 1,		/* Internet. */
-				/* Class 2 unallocated/unsupported. */
-	ns_c_chaos = 3,		/* MIT Chaos-net. */
-	ns_c_hs = 4,		/* MIT Hesiod. */
-	/* Query class values which do not appear in resource records */
-	ns_c_none = 254,	/* for prereq. sections in update requests */
-	ns_c_any = 255,		/* Wildcard match. */
-	ns_c_max = 65536
-} ns_class;
-
-/*
- * Flags field of the KEY RR rdata
- */
-#define	NS_KEY_TYPEMASK		0xC000	/* Mask for "type" bits */
-#define	NS_KEY_TYPE_AUTH_CONF	0x0000	/* Key usable for both */
-#define	NS_KEY_TYPE_CONF_ONLY	0x8000	/* Key usable for confidentiality */
-#define	NS_KEY_TYPE_AUTH_ONLY	0x4000	/* Key usable for authentication */
-#define	NS_KEY_TYPE_NO_KEY	0xC000	/* No key usable for either; no key */
-/* The type bits can also be interpreted independently, as single bits: */
-#define	NS_KEY_NO_AUTH		0x8000	/* Key unusable for authentication */
-#define	NS_KEY_NO_CONF		0x4000	/* Key unusable for confidentiality */
-#define	NS_KEY_EXPERIMENTAL	0x2000	/* Security is *mandatory* if bit=0 */
-#define	NS_KEY_RESERVED3	0x1000  /* reserved - must be zero */
-#define	NS_KEY_RESERVED4	0x0800  /* reserved - must be zero */
-#define	NS_KEY_USERACCOUNT	0x0400	/* key is assoc. with a user acct */
-#define	NS_KEY_ENTITY		0x0200	/* key is assoc. with entity eg host */
-#define	NS_KEY_ZONEKEY		0x0100	/* key is zone key */
-#define	NS_KEY_IPSEC		0x0080  /* key is for IPSEC (host or user)*/
-#define	NS_KEY_EMAIL		0x0040  /* key is for email (MIME security) */
-#define	NS_KEY_RESERVED10	0x0020  /* reserved - must be zero */
-#define	NS_KEY_RESERVED11	0x0010  /* reserved - must be zero */
-#define	NS_KEY_SIGNATORYMASK	0x000F	/* key can sign RR's of same name */
-
-#define	NS_KEY_RESERVED_BITMASK ( NS_KEY_RESERVED3 | \
-				  NS_KEY_RESERVED4 | \
-				  NS_KEY_RESERVED10 | \
-				  NS_KEY_RESERVED11 )
-
-/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
-#define	NS_ALG_MD5RSA		1	/* MD5 with RSA */
-#define	NS_ALG_EXPIRE_ONLY	253	/* No alg, no security */
-#define	NS_ALG_PRIVATE_OID	254	/* Key begins with OID giving alg */
-
-/* Signatures */
-#define	NS_MD5RSA_MIN_BITS	 512	/* Size of a mod or exp in bits */
-#define	NS_MD5RSA_MAX_BITS	2552
-	/* Total of binary mod and exp */
-#define	NS_MD5RSA_MAX_BYTES	((NS_MD5RSA_MAX_BITS+7/8)*2+3)
-	/* Max length of text sig block */
-#define	NS_MD5RSA_MAX_BASE64	(((NS_MD5RSA_MAX_BYTES+2)/3)*4)
-
-/* Offsets into SIG record rdata to find various values */
-#define	NS_SIG_TYPE	0	/* Type flags */
-#define	NS_SIG_ALG	2	/* Algorithm */
-#define	NS_SIG_LABELS	3	/* How many labels in name */
-#define	NS_SIG_OTTL	4	/* Original TTL */
-#define	NS_SIG_EXPIR	8	/* Expiration time */
-#define	NS_SIG_SIGNED	12	/* Signature time */
-#define	NS_SIG_FOOT	16	/* Key footprint */
-#define	NS_SIG_SIGNER	18	/* Domain name of who signed it */
-
-/* How RR types are represented as bit-flags in NXT records */
-#define	NS_NXT_BITS 8
-#define	NS_NXT_BIT_SET(  n,p) (p[(n)/NS_NXT_BITS] |=  (0x80>>((n)%NS_NXT_BITS)))
-#define	NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS)))
-#define	NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
-
-
-/*
- * Inline versions of get/put short/long.  Pointer is advanced.
- */
-#define NS_GET16(s, cp) { \
-	register u_char *t_cp = (u_char *)(cp); \
-	(s) = ((u_int16_t)t_cp[0] << 8) \
-	    | ((u_int16_t)t_cp[1]) \
-	    ; \
-	(cp) += NS_INT16SZ; \
-}
-
-#define NS_GET32(l, cp) { \
-	register u_char *t_cp = (u_char *)(cp); \
-	(l) = ((u_int32_t)t_cp[0] << 24) \
-	    | ((u_int32_t)t_cp[1] << 16) \
-	    | ((u_int32_t)t_cp[2] << 8) \
-	    | ((u_int32_t)t_cp[3]) \
-	    ; \
-	(cp) += NS_INT32SZ; \
-}
-
-#define NS_PUT16(s, cp) { \
-	register u_int16_t t_s = (u_int16_t)(s); \
-	register u_char *t_cp = (u_char *)(cp); \
-	*t_cp++ = t_s >> 8; \
-	*t_cp   = t_s; \
-	(cp) += NS_INT16SZ; \
-}
-
-#define NS_PUT32(l, cp) { \
-	register u_int32_t t_l = (u_int32_t)(l); \
-	register u_char *t_cp = (u_char *)(cp); \
-	*t_cp++ = t_l >> 24; \
-	*t_cp++ = t_l >> 16; \
-	*t_cp++ = t_l >> 8; \
-	*t_cp   = t_l; \
-	(cp) += NS_INT32SZ; \
-}
-
-/*
- * ANSI C identifier hiding.
- */
-#define ns_get16		__ns_get16
-#define ns_get32		__ns_get32
-#define ns_put16		__ns_put16
-#define ns_put32		__ns_put32
-#define ns_initparse		__ns_initparse
-#define ns_parserr		__ns_parserr
-#define	ns_sprintrr		__ns_sprintrr
-#define	ns_sprintrrf		__ns_sprintrrf
-#define	ns_format_ttl		__ns_format_ttl
-#define	ns_parse_ttl		__ns_parse_ttl
-#define	ns_name_ntop		__ns_name_ntop
-#define	ns_name_pton		__ns_name_pton
-#define	ns_name_unpack		__ns_name_unpack
-#define	ns_name_pack		__ns_name_pack
-#define	ns_name_compress	__ns_name_compress
-#define	ns_name_uncompress	__ns_name_uncompress
-
-__BEGIN_DECLS
-u_int		ns_get16(const u_char *);
-u_long		ns_get32(const u_char *);
-void		ns_put16(u_int, u_char *);
-void		ns_put32(u_long, u_char *);
-int		ns_initparse(const u_char *, int, ns_msg *);
-int		ns_parserr(ns_msg *, ns_sect, int, ns_rr *);
-int		ns_sprintrr(const ns_msg *, const ns_rr *,
-			    const char *, const char *, char *, size_t);
-int		ns_sprintrrf(const u_char *, size_t, const char *,
-			     ns_class, ns_type, u_long, const u_char *,
-			     size_t, const char *, const char *,
-			     char *, size_t);
-int		ns_format_ttl(u_long, char *, size_t);
-int		ns_parse_ttl(const char *, u_long *);
-int		ns_name_ntop(const u_char *, char *, size_t);
-int		ns_name_pton(const char *, u_char *, size_t);
-int		ns_name_unpack(const u_char *, const u_char *,
-			       const u_char *, u_char *, size_t);
-int		ns_name_pack(const u_char *, u_char *, int,
-			     const u_char **, const u_char **);
-int		ns_name_uncompress(const u_char *, const u_char *,
-				   const u_char *, char *, size_t);
-int		ns_name_compress(const char *, u_char *, size_t,
-				 const u_char **, const u_char **);
-int		ns_name_skip(const u_char **, const u_char *);
-__END_DECLS
-
-#ifdef BIND_4_COMPAT
-#include <arpa/nameser_compat.h>
-#endif
-
-#endif /* !_ARPA_NAMESER_H_ */
diff --git a/newlib/libc/sys/linux/include/arpa/nameser_compat.h b/newlib/libc/sys/linux/include/arpa/nameser_compat.h
deleted file mode 100644
index bbdea89..0000000
--- a/newlib/libc/sys/linux/include/arpa/nameser_compat.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Copyright (c) 1983, 1989
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	From: Id: nameser_compat.h,v 8.9 1998/03/20 23:25:10 halley Exp
- * $FreeBSD: src/include/arpa/nameser_compat.h,v 1.3 2001/06/10 20:25:22 ume Exp $
- */
-
-#ifndef _ARPA_NAMESER_COMPAT_
-#define	_ARPA_NAMESER_COMPAT_
-
-#define	__BIND		19950621	/* (DEAD) interface version stamp. */
-
-#include <endian.h>
-#include <machine/endian.h>
-
-#if !defined(BYTE_ORDER) || \
-    (BYTE_ORDER != BIG_ENDIAN && BYTE_ORDER != LITTLE_ENDIAN && \
-    BYTE_ORDER != PDP_ENDIAN)
-	/* you must determine what the correct bit order is for
-	 * your compiler - the next line is an intentional error
-	 * which will force your compiles to bomb until you fix
-	 * the above macros.
-	 */
-  error "Undefined or invalid BYTE_ORDER";
-#endif
-
-/*
- * Structure for query header.  The order of the fields is machine- and
- * compiler-dependent, depending on the byte/bit order and the layout
- * of bit fields.  We use bit fields only in int variables, as this
- * is all ANSI requires.  This requires a somewhat confusing rearrangement.
- */
-
-typedef struct {
-	unsigned	id :16;		/* query identification number */
-#if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN
-			/* fields in third byte */
-	unsigned	rd :1;		/* recursion desired */
-	unsigned	tc :1;		/* truncated message */
-	unsigned	aa :1;		/* authoritive answer */
-	unsigned	opcode :4;	/* purpose of message */
-	unsigned	qr :1;		/* response flag */
-			/* fields in fourth byte */
-	unsigned	rcode :4;	/* response code */
-	unsigned	cd: 1;		/* checking disabled by resolver */
-	unsigned	ad: 1;		/* authentic data from named */
-	unsigned	unused :1;	/* unused bits (MBZ as of 4.9.3a3) */
-	unsigned	ra :1;		/* recursion available */
-#endif
-			/* remaining bytes */
-	unsigned	qdcount :16;	/* number of question entries */
-	unsigned	ancount :16;	/* number of answer entries */
-	unsigned	nscount :16;	/* number of authority entries */
-	unsigned	arcount :16;	/* number of resource entries */
-} HEADER;
-
-#define PACKETSZ	NS_PACKETSZ
-#define MAXDNAME	NS_MAXDNAME
-#define MAXCDNAME	NS_MAXCDNAME
-#define MAXLABEL	NS_MAXLABEL
-#define	HFIXEDSZ	NS_HFIXEDSZ
-#define QFIXEDSZ	NS_QFIXEDSZ
-#define RRFIXEDSZ	NS_RRFIXEDSZ
-#define	INT32SZ		NS_INT32SZ
-#define	INT16SZ		NS_INT16SZ
-#define	INADDRSZ	NS_INADDRSZ
-#define	IN6ADDRSZ	NS_IN6ADDRSZ
-#define	INDIR_MASK	NS_CMPRSFLGS
-#define NAMESERVER_PORT	NS_DEFAULTPORT
-
-#define S_ZONE		ns_s_zn
-#define S_PREREQ	ns_s_pr
-#define S_UPDATE	ns_s_ud
-#define S_ADDT		ns_s_ar
-
-#define QUERY		ns_o_query
-#define IQUERY		ns_o_iquery
-#define STATUS		ns_o_status
-#define	NS_NOTIFY_OP	ns_o_notify
-#define	NS_UPDATE_OP	ns_o_update
-
-#define NOERROR		ns_r_noerror
-#define FORMERR		ns_r_formerr
-#define SERVFAIL	ns_r_servfail
-#define NXDOMAIN	ns_r_nxdomain
-#define NOTIMP		ns_r_notimpl
-#define REFUSED		ns_r_refused
-#define YXDOMAIN	ns_r_yxdomain
-#define YXRRSET		ns_r_yxrrset
-#define NXRRSET		ns_r_nxrrset
-#define NOTAUTH		ns_r_notauth
-#define NOTZONE		ns_r_notzone
-
-#define DELETE		ns_uop_delete
-#define ADD		ns_uop_add
-
-#define T_A		ns_t_a
-#define T_NS		ns_t_ns
-#define T_MD		ns_t_md
-#define T_MF		ns_t_mf
-#define T_CNAME		ns_t_cname
-#define T_SOA		ns_t_soa
-#define T_MB		ns_t_mb
-#define T_MG		ns_t_mg
-#define T_MR		ns_t_mr
-#define T_NULL		ns_t_null
-#define T_WKS		ns_t_wks
-#define T_PTR		ns_t_ptr
-#define T_HINFO		ns_t_hinfo
-#define T_MINFO		ns_t_minfo
-#define T_MX		ns_t_mx
-#define T_TXT		ns_t_txt
-#define	T_RP		ns_t_rp
-#define T_AFSDB		ns_t_afsdb
-#define T_X25		ns_t_x25
-#define T_ISDN		ns_t_isdn
-#define T_RT		ns_t_rt
-#define T_NSAP		ns_t_nsap
-#define T_NSAP_PTR	ns_t_nsap_ptr
-#define	T_SIG		ns_t_sig
-#define	T_KEY		ns_t_key
-#define	T_PX		ns_t_px
-#define	T_GPOS		ns_t_gpos
-#define	T_AAAA		ns_t_aaaa
-#define	T_LOC		ns_t_loc
-#define	T_NXT		ns_t_nxt
-#define	T_EID		ns_t_eid
-#define	T_NIMLOC	ns_t_nimloc
-#define	T_SRV		ns_t_srv
-#define T_ATMA		ns_t_atma
-#define T_NAPTR		ns_t_naptr
-#define T_OPT		ns_t_opt
-#define	T_IXFR		ns_t_ixfr
-#define T_AXFR		ns_t_axfr
-#define T_MAILB		ns_t_mailb
-#define T_MAILA		ns_t_maila
-#define T_ANY		ns_t_any
-
-#define C_IN		ns_c_in
-#define C_CHAOS		ns_c_chaos
-#define C_HS		ns_c_hs
-/* BIND_UPDATE */
-#define C_NONE		ns_c_none
-#define C_ANY		ns_c_any
-
-#define	GETSHORT		NS_GET16
-#define	GETLONG			NS_GET32
-#define	PUTSHORT		NS_PUT16
-#define	PUTLONG			NS_PUT32
-
-#endif /* _ARPA_NAMESER_COMPAT_ */
diff --git a/newlib/libc/sys/linux/include/arpa/telnet.h b/newlib/libc/sys/linux/include/arpa/telnet.h
deleted file mode 100644
index 70e7ea8..0000000
--- a/newlib/libc/sys/linux/include/arpa/telnet.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- * $FreeBSD: src/include/arpa/telnet.h,v 1.8 2001/12/03 12:41:18 markm Exp $
- */
-
-#ifndef _ARPA_TELNET_H_
-#define	_ARPA_TELNET_H_
-
-/*
- * Definitions for the TELNET protocol.
- */
-#define	IAC	255		/* interpret as command: */
-#define	DONT	254		/* you are not to use option */
-#define	DO	253		/* please, you use option */
-#define	WONT	252		/* I won't use option */
-#define	WILL	251		/* I will use option */
-#define	SB	250		/* interpret as subnegotiation */
-#define	GA	249		/* you may reverse the line */
-#define	EL	248		/* erase the current line */
-#define	EC	247		/* erase the current character */
-#define	AYT	246		/* are you there */
-#define	AO	245		/* abort output--but let prog finish */
-#define	IP	244		/* interrupt process--permanently */
-#define	BREAK	243		/* break */
-#define	DM	242		/* data mark--for connect. cleaning */
-#define	NOP	241		/* nop */
-#define	SE	240		/* end sub negotiation */
-#define EOR     239             /* end of record (transparent mode) */
-#define	ABORT	238		/* Abort process */
-#define	SUSP	237		/* Suspend process */
-#define	xEOF	236		/* End of file: EOF is already used... */
-
-#define SYNCH	242		/* for telfunc calls */
-
-#ifdef TELCMDS
-const char *telcmds[] = {
-	"EOF", "SUSP", "ABORT", "EOR",
-	"SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
-	"EL", "GA", "SB", "WILL", "WONT", "DO", "DONT", "IAC",
-	0
-};
-#else
-extern char *telcmds[];
-#endif
-
-#define	TELCMD_FIRST	xEOF
-#define	TELCMD_LAST	IAC
-#define	TELCMD_OK(x)	((unsigned int)(x) <= TELCMD_LAST && \
-			 (unsigned int)(x) >= TELCMD_FIRST)
-#define	TELCMD(x)	telcmds[(x)-TELCMD_FIRST]
-
-/* telnet options */
-#define TELOPT_BINARY	0	/* 8-bit data path */
-#define TELOPT_ECHO	1	/* echo */
-#define	TELOPT_RCP	2	/* prepare to reconnect */
-#define	TELOPT_SGA	3	/* suppress go ahead */
-#define	TELOPT_NAMS	4	/* approximate message size */
-#define	TELOPT_STATUS	5	/* give status */
-#define	TELOPT_TM	6	/* timing mark */
-#define	TELOPT_RCTE	7	/* remote controlled transmission and echo */
-#define TELOPT_NAOL 	8	/* negotiate about output line width */
-#define TELOPT_NAOP 	9	/* negotiate about output page size */
-#define TELOPT_NAOCRD	10	/* negotiate about CR disposition */
-#define TELOPT_NAOHTS	11	/* negotiate about horizontal tabstops */
-#define TELOPT_NAOHTD	12	/* negotiate about horizontal tab disposition */
-#define TELOPT_NAOFFD	13	/* negotiate about formfeed disposition */
-#define TELOPT_NAOVTS	14	/* negotiate about vertical tab stops */
-#define TELOPT_NAOVTD	15	/* negotiate about vertical tab disposition */
-#define TELOPT_NAOLFD	16	/* negotiate about output LF disposition */
-#define TELOPT_XASCII	17	/* extended ascic character set */
-#define	TELOPT_LOGOUT	18	/* force logout */
-#define	TELOPT_BM	19	/* byte macro */
-#define	TELOPT_DET	20	/* data entry terminal */
-#define	TELOPT_SUPDUP	21	/* supdup protocol */
-#define	TELOPT_SUPDUPOUTPUT 22	/* supdup output */
-#define	TELOPT_SNDLOC	23	/* send location */
-#define	TELOPT_TTYPE	24	/* terminal type */
-#define	TELOPT_EOR	25	/* end or record */
-#define	TELOPT_TUID	26	/* TACACS user identification */
-#define	TELOPT_OUTMRK	27	/* output marking */
-#define	TELOPT_TTYLOC	28	/* terminal location number */
-#define	TELOPT_3270REGIME 29	/* 3270 regime */
-#define	TELOPT_X3PAD	30	/* X.3 PAD */
-#define	TELOPT_NAWS	31	/* window size */
-#define	TELOPT_TSPEED	32	/* terminal speed */
-#define	TELOPT_LFLOW	33	/* remote flow control */
-#define TELOPT_LINEMODE	34	/* Linemode option */
-#define TELOPT_XDISPLOC	35	/* X Display Location */
-#define TELOPT_OLD_ENVIRON 36	/* Old - Environment variables */
-#define	TELOPT_AUTHENTICATION 37/* Authenticate */
-#define	TELOPT_ENCRYPT	38	/* Encryption option */
-#define TELOPT_NEW_ENVIRON 39	/* New - Environment variables */
-#define	TELOPT_EXOPL	255	/* extended-options-list */
-
-
-#define	NTELOPTS	(1+TELOPT_NEW_ENVIRON)
-#ifdef TELOPTS
-const char *telopts[NTELOPTS+1] = {
-	"BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
-	"STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
-	"NAOCRD", "NAOHTS", "NAOHTD", "NAOFFD", "NAOVTS",
-	"NAOVTD", "NAOLFD", "EXTEND ASCII", "LOGOUT", "BYTE MACRO",
-	"DATA ENTRY TERMINAL", "SUPDUP", "SUPDUP OUTPUT",
-	"SEND LOCATION", "TERMINAL TYPE", "END OF RECORD",
-	"TACACS UID", "OUTPUT MARKING", "TTYLOC",
-	"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
-	"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
-	"ENCRYPT", "NEW-ENVIRON",
-	0
-};
-#define	TELOPT_FIRST	TELOPT_BINARY
-#define	TELOPT_LAST	TELOPT_NEW_ENVIRON
-#define	TELOPT_OK(x)	((unsigned int)(x) <= TELOPT_LAST)
-#define	TELOPT(x)	telopts[(x)-TELOPT_FIRST]
-#endif
-
-/* sub-option qualifiers */
-#define	TELQUAL_IS	0	/* option is... */
-#define	TELQUAL_SEND	1	/* send option */
-#define	TELQUAL_INFO	2	/* ENVIRON: informational version of IS */
-#define	TELQUAL_REPLY	2	/* AUTHENTICATION: client version of IS */
-#define	TELQUAL_NAME	3	/* AUTHENTICATION: client version of IS */
-
-#define	LFLOW_OFF		0	/* Disable remote flow control */
-#define	LFLOW_ON		1	/* Enable remote flow control */
-#define	LFLOW_RESTART_ANY	2	/* Restart output on any char */
-#define	LFLOW_RESTART_XON	3	/* Restart output only on XON */
-
-/*
- * LINEMODE suboptions
- */
-
-#define	LM_MODE		1
-#define	LM_FORWARDMASK	2
-#define	LM_SLC		3
-
-#define	MODE_EDIT	0x01
-#define	MODE_TRAPSIG	0x02
-#define	MODE_ACK	0x04
-#define MODE_SOFT_TAB	0x08
-#define MODE_LIT_ECHO	0x10
-
-#define	MODE_MASK	0x1f
-
-/* Not part of protocol, but needed to simplify things... */
-#define MODE_FLOW		0x0100
-#define MODE_ECHO		0x0200
-#define MODE_INBIN		0x0400
-#define MODE_OUTBIN		0x0800
-#define MODE_FORCE		0x1000
-
-#define	SLC_SYNCH	1
-#define	SLC_BRK		2
-#define	SLC_IP		3
-#define	SLC_AO		4
-#define	SLC_AYT		5
-#define	SLC_EOR		6
-#define	SLC_ABORT	7
-#define	SLC_EOF		8
-#define	SLC_SUSP	9
-#define	SLC_EC		10
-#define	SLC_EL		11
-#define	SLC_EW		12
-#define	SLC_RP		13
-#define	SLC_LNEXT	14
-#define	SLC_XON		15
-#define	SLC_XOFF	16
-#define	SLC_FORW1	17
-#define	SLC_FORW2	18
-#define SLC_MCL         19
-#define SLC_MCR         20
-#define SLC_MCWL        21
-#define SLC_MCWR        22
-#define SLC_MCBOL       23
-#define SLC_MCEOL       24
-#define SLC_INSRT       25
-#define SLC_OVER        26
-#define SLC_ECR         27
-#define SLC_EWR         28
-#define SLC_EBOL        29
-#define SLC_EEOL        30
-
-#define	NSLC		30
-
-/*
- * For backwards compatibility, we define SLC_NAMES to be the
- * list of names if SLC_NAMES is not defined.
- */
-#define	SLC_NAMELIST	"0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR",	\
-			"ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP",	\
-			"LNEXT", "XON", "XOFF", "FORW1", "FORW2",	\
-			"MCL", "MCR", "MCWL", "MCWR", "MCBOL",		\
-			"MCEOL", "INSRT", "OVER", "ECR", "EWR",		\
-			"EBOL", "EEOL",					\
-			0
-
-#ifdef	SLC_NAMES
-const char *slc_names[] = {
-	SLC_NAMELIST
-};
-#else
-extern char *slc_names[];
-#define	SLC_NAMES SLC_NAMELIST
-#endif
-
-#define	SLC_NAME_OK(x)	((unsigned int)(x) <= NSLC)
-#define SLC_NAME(x)	slc_names[x]
-
-#define	SLC_NOSUPPORT	0
-#define	SLC_CANTCHANGE	1
-#define	SLC_VARIABLE	2
-#define	SLC_DEFAULT	3
-#define	SLC_LEVELBITS	0x03
-
-#define	SLC_FUNC	0
-#define	SLC_FLAGS	1
-#define	SLC_VALUE	2
-
-#define	SLC_ACK		0x80
-#define	SLC_FLUSHIN	0x40
-#define	SLC_FLUSHOUT	0x20
-
-#define	OLD_ENV_VAR	1
-#define	OLD_ENV_VALUE	0
-#define	NEW_ENV_VAR	0
-#define	NEW_ENV_VALUE	1
-#define	ENV_ESC		2
-#define ENV_USERVAR	3
-
-/*
- * AUTHENTICATION suboptions
- */
-
-/*
- * Who is authenticating who ...
- */
-#define	AUTH_WHO_CLIENT		0	/* Client authenticating server */
-#define	AUTH_WHO_SERVER		1	/* Server authenticating client */
-#define	AUTH_WHO_MASK		1
-
-/*
- * amount of authentication done
- */
-#define	AUTH_HOW_ONE_WAY	0
-#define	AUTH_HOW_MUTUAL		2
-#define	AUTH_HOW_MASK		2
-
-#define	AUTHTYPE_NULL		0
-#define	AUTHTYPE_KERBEROS_V4	1
-#define	AUTHTYPE_KERBEROS_V5	2
-#define	AUTHTYPE_SPX		3
-#define	AUTHTYPE_MINK		4
-#define	AUTHTYPE_SRA		6
-#define	AUTHTYPE_CNT		7
-
-#define	AUTHTYPE_TEST		99
-
-#ifdef	AUTH_NAMES
-const char *authtype_names[] = {
-	"NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK", NULL, "SRA",
-	0
-};
-#else
-extern char *authtype_names[];
-#endif
-
-#define	AUTHTYPE_NAME_OK(x)	((unsigned int)(x) < AUTHTYPE_CNT)
-#define	AUTHTYPE_NAME(x)	authtype_names[x]
-
-/*
- * ENCRYPTion suboptions
- */
-#define	ENCRYPT_IS		0	/* I pick encryption type ... */
-#define	ENCRYPT_SUPPORT		1	/* I support encryption types ... */
-#define	ENCRYPT_REPLY		2	/* Initial setup response */
-#define	ENCRYPT_START		3	/* Am starting to send encrypted */
-#define	ENCRYPT_END		4	/* Am ending encrypted */
-#define	ENCRYPT_REQSTART	5	/* Request you start encrypting */
-#define	ENCRYPT_REQEND		6	/* Request you end encrypting */
-#define	ENCRYPT_ENC_KEYID	7
-#define	ENCRYPT_DEC_KEYID	8
-#define	ENCRYPT_CNT		9
-
-#define	ENCTYPE_ANY		0
-#define	ENCTYPE_DES_CFB64	1
-#define	ENCTYPE_DES_OFB64	2
-#define	ENCTYPE_CNT		3
-
-#ifdef	ENCRYPT_NAMES
-const char *encrypt_names[] = {
-	"IS", "SUPPORT", "REPLY", "START", "END",
-	"REQUEST-START", "REQUEST-END", "ENC-KEYID", "DEC-KEYID",
-	0
-};
-const char *enctype_names[] = {
-	"ANY", "DES_CFB64",  "DES_OFB64",
-	0
-};
-#else
-extern char *encrypt_names[];
-extern char *enctype_names[];
-#endif
-
-
-#define	ENCRYPT_NAME_OK(x)	((unsigned int)(x) < ENCRYPT_CNT)
-#define	ENCRYPT_NAME(x)		encrypt_names[x]
-
-#define	ENCTYPE_NAME_OK(x)	((unsigned int)(x) < ENCTYPE_CNT)
-#define	ENCTYPE_NAME(x)		enctype_names[x]
-
-#endif /* !_TELNET_H_ */
diff --git a/newlib/libc/sys/linux/include/arpa/tftp.h b/newlib/libc/sys/linux/include/arpa/tftp.h
deleted file mode 100644
index 1de4dd4..0000000
--- a/newlib/libc/sys/linux/include/arpa/tftp.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tftp.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/arpa/tftp.h,v 1.5 2001/09/27 20:50:14 obrien Exp $
- */
-
-#ifndef _ARPA_TFTP_H_
-#define	_ARPA_TFTP_H_
-
-/*
- * Trivial File Transfer Protocol (IEN-133)
- */
-#define	SEGSIZE		512		/* data segment size */
-
-/*
- * Packet types.
- */
-#define	RRQ	01			/* read request */
-#define	WRQ	02			/* write request */
-#define	DATA	03			/* data packet */
-#define	ACK	04			/* acknowledgement */
-#define	ERROR	05			/* error code */
-#define	OACK	06			/* option acknowledgement */
-
-struct tftphdr {
-	unsigned short	th_opcode;		/* packet type */
-	union {
-		unsigned short	tu_block;	/* block # */
-		unsigned short	tu_code;	/* error code */
-		char	tu_stuff[1];	/* request packet stuff */
-	} th_u;
-	char	th_data[1];		/* data or error string */
-};
-
-#define	th_block	th_u.tu_block
-#define	th_code		th_u.tu_code
-#define	th_stuff	th_u.tu_stuff
-#define	th_msg		th_data
-
-/*
- * Error codes.
- */
-#define	EUNDEF		0		/* not defined */
-#define	ENOTFOUND	1		/* file not found */
-#define	EACCESS		2		/* access violation */
-#define	ENOSPACE	3		/* disk full or allocation exceeded */
-#define	EBADOP		4		/* illegal TFTP operation */
-#define	EBADID		5		/* unknown transfer ID */
-#define	EEXISTS		6		/* file already exists */
-#define	ENOUSER		7		/* no such user */
-#define	EOPTNEG		8		/* option negotiation failed */
-
-#endif /* !_TFTP_H_ */
diff --git a/newlib/libc/sys/linux/include/bp-sym.h b/newlib/libc/sys/linux/include/bp-sym.h
deleted file mode 100644
index 249a4bd..0000000
--- a/newlib/libc/sys/linux/include/bp-sym.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __BP_SYM_H__
-#define __BP_SYM_H__
-
-#define BP_SYM(NAME) NAME
-
-#endif
diff --git a/newlib/libc/sys/linux/include/cmathcalls.h b/newlib/libc/sys/linux/include/cmathcalls.h
deleted file mode 100644
index c680c6d..0000000
--- a/newlib/libc/sys/linux/include/cmathcalls.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Prototype declarations for complex math functions;
-   helper file for <complex.h>.
-   Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* NOTE: Because of the special way this file is used by <complex.h>, this
-   file must NOT be protected from multiple inclusion as header files
-   usually are.
-
-   This file provides prototype declarations for the math functions.
-   Most functions are declared using the macro:
-
-   __MATHCALL (NAME, (ARGS...));
-
-   This means there is a function `NAME' returning `double' and a function
-   `NAMEf' returning `float'.  Each place `_Mdouble_' appears in the
-   prototype, that is actually `double' in the prototype for `NAME' and
-   `float' in the prototype for `NAMEf'.  Reentrant variant functions are
-   called `NAME_r' and `NAMEf_r'.
-
-   Functions returning other types like `int' are declared using the macro:
-
-   __MATHDECL (TYPE, NAME, (ARGS...));
-
-   This is just like __MATHCALL but for a function returning `TYPE'
-   instead of `_Mdouble_'.  In all of these cases, there is still
-   both a `NAME' and a `NAMEf' that takes `float' arguments.  */
-
-#ifndef _COMPLEX_H
-#error "Never use <bits/cmathcalls.h> directly; include <complex.h> instead."
-#endif
-
-#define _Mdouble_complex_ _Mdouble_ _Complex
-
-
-/* Trigonometric functions.  */
-
-/* Arc cosine of Z.  */
-__MATHCALL (cacos, (_Mdouble_complex_ __z));
-/* Arc sine of Z.  */
-__MATHCALL (casin, (_Mdouble_complex_ __z));
-/* Arc tangent of Z.  */
-__MATHCALL (catan, (_Mdouble_complex_ __z));
-
-/* Cosine of Z.  */
-__MATHCALL (ccos, (_Mdouble_complex_ __z));
-/* Sine of Z.  */
-__MATHCALL (csin, (_Mdouble_complex_ __z));
-/* Tangent of Z.  */
-__MATHCALL (ctan, (_Mdouble_complex_ __z));
-
-
-/* Hyperbolic functions.  */
-
-/* Hyperbolic arc cosine of Z.  */
-__MATHCALL (cacosh, (_Mdouble_complex_ __z));
-/* Hyperbolic arc sine of Z.  */
-__MATHCALL (casinh, (_Mdouble_complex_ __z));
-/* Hyperbolic arc tangent of Z.  */
-__MATHCALL (catanh, (_Mdouble_complex_ __z));
-
-/* Hyperbolic cosine of Z.  */
-__MATHCALL (ccosh, (_Mdouble_complex_ __z));
-/* Hyperbolic sine of Z.  */
-__MATHCALL (csinh, (_Mdouble_complex_ __z));
-/* Hyperbolic tangent of Z.  */
-__MATHCALL (ctanh, (_Mdouble_complex_ __z));
-
-
-/* Exponential and logarithmic functions.  */
-
-/* Exponential function of Z.  */
-__MATHCALL (cexp, (_Mdouble_complex_ __z));
-
-/* Natural logarithm of Z.  */
-__MATHCALL (clog, (_Mdouble_complex_ __z));
-
-#ifdef __USE_GNU
-/* The base 10 logarithm is not defined by the standard but to implement
-   the standard C++ library it is handy.  */
-__MATHCALL (clog10, (_Mdouble_complex_ __z));
-#endif
-
-/* Power functions.  */
-
-/* Return X to the Y power.  */
-__MATHCALL (cpow, (_Mdouble_complex_ __x, _Mdouble_complex_ __y));
-
-/* Return the square root of Z.  */
-__MATHCALL (csqrt, (_Mdouble_complex_ __z));
-
-
-/* Absolute value, conjugates, and projection.  */
-
-/* Absolute value of Z.  */
-__MATHDECL (_Mdouble_,cabs, (_Mdouble_complex_ __z));
-
-/* Argument value of Z.  */
-__MATHDECL (_Mdouble_,carg, (_Mdouble_complex_ __z));
-
-/* Complex conjugate of Z.  */
-__MATHCALL (conj, (_Mdouble_complex_ __z));
-
-/* Projection of Z onto the Riemann sphere.  */
-__MATHCALL (cproj, (_Mdouble_complex_ __z));
-
-
-/* Decomposing complex values.  */
-
-/* Imaginary part of Z.  */
-__MATHDECL (_Mdouble_,cimag, (_Mdouble_complex_ __z));
-
-/* Real part of Z.  */
-__MATHDECL (_Mdouble_,creal, (_Mdouble_complex_ __z));
-
-
-/* Now some optimized versions.  GCC has handy notations for these
-   functions.  Recent GCC handles these as builtin functions so does
-   not need inlines.  */
-#if defined __GNUC__ && !__GNUC_PREREQ (2, 97) && defined __OPTIMIZE__
-
-/* Imaginary part of Z.  */
-extern __inline _Mdouble_
-__MATH_PRECNAME(cimag) (_Mdouble_complex_ __z) __THROW
-{
-  return __imag__ __z;
-}
-
-/* Real part of Z.  */
-extern __inline _Mdouble_
-__MATH_PRECNAME(creal) (_Mdouble_complex_ __z) __THROW
-{
-  return __real__ __z;
-}
-
-/* Complex conjugate of Z.  */
-extern __inline _Mdouble_complex_
-__MATH_PRECNAME(conj) (_Mdouble_complex_ __z) __THROW
-{
-  return __extension__ ~__z;
-}
-
-#endif
diff --git a/newlib/libc/sys/linux/include/complex.h b/newlib/libc/sys/linux/include/complex.h
deleted file mode 100644
index daa4656..0000000
--- a/newlib/libc/sys/linux/include/complex.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/*
- *	ISO C99:  7.3 Complex arithmetic	<complex.h>
- */
-
-#ifndef _COMPLEX_H
-#define _COMPLEX_H	1
-
-#include <sys/types.h>
-#include <features.h>
-
-__BEGIN_DECLS
-
-#define __CONCAT(x,y) x ## y
-/* We might need to add support for more compilers here.  But since ISO
-   C99 is out hopefully all maintained compilers will soon provide the data
-   types `float complex' and `double complex'.  */
-#if __GNUC_PREREQ (2, 7) && !__GNUC_PREREQ (2, 97)
-# define _Complex __complex__
-#endif
-
-#define complex		_Complex
-
-/* Narrowest imaginary unit.  This depends on the floating-point
-   evaluation method.
-   XXX This probably has to go into a gcc related file.  */
-#define _Complex_I	(__extension__ 1.0iF)
-
-/* Another more descriptive name is `I'.
-   XXX Once we have the imaginary support switch this to _Imaginary_I.  */
-#undef I
-#define I _Complex_I
-
-/* The file <bits/cmathcalls.h> contains the prototypes for all the
-   actual math functions.  These macros are used for those prototypes,
-   so we can easily declare each function as both `name' and `__name',
-   and can declare the float versions `namef' and `__namef'.  */
-
-#define __MATHCALL(function, args)	\
-  __MATHDECL (_Mdouble_complex_,function, args)
-#define __MATHDECL(type, function, args) \
-  __MATHDECL_1(type, function, args); \
-  __MATHDECL_1(type, __CONCAT(__,function), args)
-#define __MATHDECL_1(type, function, args) \
-  extern type __MATH_PRECNAME(function) args __THROW
-
-#define _Mdouble_ 		double
-#define __MATH_PRECNAME(name)	name
-#include <cmathcalls.h>
-#undef	_Mdouble_
-#undef	__MATH_PRECNAME
-
-/* Now the float versions.  */
-#ifndef _Mfloat_
-# define _Mfloat_		float
-#endif
-#define _Mdouble_ 		_Mfloat_
-#ifdef __STDC__
-# define __MATH_PRECNAME(name)	name##f
-#else
-# define __MATH_PRECNAME(name)	name/**/f
-#endif
-#include <cmathcalls.h>
-#undef	_Mdouble_
-#undef	__MATH_PRECNAME
-
-#if 0
-/* And the long double versions.  It is non-critical to define them
-   here unconditionally since `long double' is required in ISO C99.  */
-#if __STDC__ - 0 || __GNUC__ - 0 && !defined __NO_LONG_DOUBLE_MATH
-# ifndef _Mlong_double_
-#  define _Mlong_double_	long double
-# endif
-# define _Mdouble_ 		_Mlong_double_
-# ifdef __STDC__
-#  define __MATH_PRECNAME(name)	name##l
-# else
-#  define __MATH_PRECNAME(name)	name/**/l
-# endif
-# include <cmathcalls.h>
-#endif
-#endif
-#undef	_Mdouble_
-#undef	__MATH_PRECNAME
-#undef	__MATHDECL_1
-#undef	__MATHDECL
-#undef	__MATHCALL
-
-__END_DECLS
-
-#endif /* complex.h */
diff --git a/newlib/libc/sys/linux/include/dl-hash.h b/newlib/libc/sys/linux/include/dl-hash.h
deleted file mode 100644
index e0f7a49..0000000
--- a/newlib/libc/sys/linux/include/dl-hash.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Compute hash value for given string according to ELF standard.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _DL_HASH_H
-#define _DL_HASH_H	1
-
-
-/* This is the hashing function specified by the ELF ABI.  In the
-   first five operations no overflow is possible so we optimized it a
-   bit.  */
-static inline unsigned int
-_dl_elf_hash (const unsigned char *name)
-{
-  unsigned long int hash = 0;
-  if (*name != '\0')
-    {
-      hash = *name++;
-      if (*name != '\0')
-	{
-	  hash = (hash << 4) + *name++;
-	  if (*name != '\0')
-	    {
-	      hash = (hash << 4) + *name++;
-	      if (*name != '\0')
-		{
-		  hash = (hash << 4) + *name++;
-		  if (*name != '\0')
-		    {
-		      hash = (hash << 4) + *name++;
-		      while (*name != '\0')
-			{
-			  unsigned long int hi;
-			  hash = (hash << 4) + *name++;
-			  hi = hash & 0xf0000000;
-
-			  /* The algorithm specified in the ELF ABI is as
-			     follows:
-
-			     if (hi != 0)
-			       hash ^= hi >> 24;
-
-			     hash &= ~hi;
-
-			     But the following is equivalent and a lot
-			     faster, especially on modern processors.  */
-
-			  hash ^= hi;
-			  hash ^= hi >> 24;
-			}
-		    }
-		}
-	    }
-	}
-    }
-  return hash;
-}
-
-#endif /* dl-hash.h */
diff --git a/newlib/libc/sys/linux/include/dlfcn.h b/newlib/libc/sys/linux/include/dlfcn.h
deleted file mode 100644
index 67ba73d..0000000
--- a/newlib/libc/sys/linux/include/dlfcn.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* User functions for run-time dynamic loading.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef	_DLFCN_H
-#define	_DLFCN_H 1
-
-#include <features.h>
-
-/* Collect various system dependent definitions and declarations.  */
-#include <sys/dlfcn.h>
-
-
-/* If the first argument of `dlsym' or `dlvsym' is set to RTLD_NEXT
-   the run-time address of the symbol called NAME in the next shared
-   object is returned.  The "next" relation is defined by the order
-   the shared objects were loaded.  */
-# define RTLD_NEXT	((void *) -1l)
-
-/* If the first argument to `dlsym' or `dlvsym' is set to RTLD_DEFAULT
-   the run-time address of the symbol called NAME in the global scope
-   is returned.  */
-# define RTLD_DEFAULT	((void *) 0)
-
-
-__BEGIN_DECLS
-
-/* Open the shared object FILE and map it in; return a handle that can be
-   passed to `dlsym' to get symbol values from it.  */
-extern void *dlopen (__const char *__file, int __mode) __THROW;
-
-/* Unmap and close a shared object opened by `dlopen'.
-   The handle cannot be used again after calling `dlclose'.  */
-extern int dlclose (void *__handle) __THROW;
-
-/* Find the run-time address in the shared object HANDLE refers to
-   of the symbol called NAME.  */
-extern void *dlsym (void *__restrict __handle,
-		    __const char *__restrict __name) __THROW;
-
-/* Find the run-time address in the shared object HANDLE refers to
-   of the symbol called NAME with VERSION.  */
-extern void *dlvsym (void *__restrict __handle,
-		     __const char *__restrict __name,
-		     __const char *__restrict __version) __THROW;
-
-/* When any of the above functions fails, call this function
-   to return a string describing the error.  Each call resets
-   the error string so that a following call returns null.  */
-extern char *dlerror (void) __THROW;
-
-
-/* Structure containing information about object searched using
-   `dladdr'.  */
-typedef struct
-{
-  __const char *dli_fname;	/* File name of defining object.  */
-  void *dli_fbase;		/* Load address of that object.  */
-  __const char *dli_sname;	/* Name of nearest symbol.  */
-  void *dli_saddr;		/* Exact value of nearest symbol.  */
-} Dl_info;
-
-/* Fill in *INFO with the following information about ADDRESS.
-   Returns 0 iff no shared object's segments contain that address.  */
-extern int dladdr (__const void *__address, Dl_info *__info) __THROW;
-
-__END_DECLS
-
-#endif	/* dlfcn.h */
diff --git a/newlib/libc/sys/linux/include/fnmatch.h b/newlib/libc/sys/linux/include/fnmatch.h
deleted file mode 100644
index c038bf7..0000000
--- a/newlib/libc/sys/linux/include/fnmatch.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/include/fnmatch.h,v 1.10 2002/03/23 17:24:53 imp Exp $
- *	@(#)fnmatch.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef	_FNMATCH_H_
-#define	_FNMATCH_H_
-
-#define	FNM_NOMATCH	1	/* Match failed. */
-
-#define	FNM_NOESCAPE	0x01	/* Disable backslash escaping. */
-#define	FNM_PATHNAME	0x02	/* Slash must be matched by slash. */
-#define	FNM_PERIOD	0x04	/* Period must be matched by period. */
-
-#if defined(_GNU_SOURCE) || !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-#define	FNM_LEADING_DIR	0x08	/* Ignore /<tail> after Imatch. */
-#define	FNM_CASEFOLD	0x10	/* Case insensitive search. */
-#define	FNM_IGNORECASE	FNM_CASEFOLD
-#define	FNM_FILE_NAME	FNM_PATHNAME
-#endif
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	 fnmatch(const char *, const char *, int);
-__END_DECLS
-
-#endif /* !_FNMATCH_H_ */
diff --git a/newlib/libc/sys/linux/include/gconv.h b/newlib/libc/sys/linux/include/gconv.h
deleted file mode 100644
index 64df45b..0000000
--- a/newlib/libc/sys/linux/include/gconv.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* This header provides no interface for a user to the internals of
-   the gconv implementation in the libc.  Therefore there is no use
-   for these definitions beside for writing additional gconv modules.  */
-
-#ifndef _GCONV_H
-#define _GCONV_H	1
-
-#include <features.h>
-#define __need_mbstate_t
-#include <wchar.h>
-#define __need_size_t
-#define __need_wchar_t
-#include <stddef.h>
-
-/* ISO 10646 value used to signal invalid value.  */
-#define __UNKNOWN_10646_CHAR	((wchar_t) 0xfffd)
-
-/* Error codes for gconv functions.  */
-enum
-{
-  __GCONV_OK = 0,
-  __GCONV_NOCONV,
-  __GCONV_NODB,
-  __GCONV_NOMEM,
-
-  __GCONV_EMPTY_INPUT,
-  __GCONV_FULL_OUTPUT,
-  __GCONV_ILLEGAL_INPUT,
-  __GCONV_INCOMPLETE_INPUT,
-
-  __GCONV_ILLEGAL_DESCRIPTOR,
-  __GCONV_INTERNAL_ERROR
-};
-
-
-/* Flags the `__gconv_open' function can set.  */
-enum
-{
-  __GCONV_IS_LAST = 0x0001,
-  __GCONV_IGNORE_ERRORS = 0x0002
-};
-
-
-/* Forward declarations.  */
-struct __gconv_step;
-struct __gconv_step_data;
-struct __gconv_loaded_object;
-struct __gconv_trans_data;
-
-
-/* Type of a conversion function.  */
-typedef int (*__gconv_fct) (struct __gconv_step *, struct __gconv_step_data *,
-			    __const unsigned char **, __const unsigned char *,
-			    unsigned char **, size_t *, int, int);
-
-/* Constructor and destructor for local data for conversion step.  */
-typedef int (*__gconv_init_fct) (struct __gconv_step *);
-typedef void (*__gconv_end_fct) (struct __gconv_step *);
-
-
-/* Type of a transliteration/transscription function.  */
-typedef int (*__gconv_trans_fct) (struct __gconv_step *,
-				  struct __gconv_step_data *, void *,
-				  __const unsigned char *,
-				  __const unsigned char **,
-				  __const unsigned char *, unsigned char **,
-				  size_t *);
-
-/* Function to call to provide transliteration module with context.  */
-typedef int (*__gconv_trans_context_fct) (void *, __const unsigned char *,
-					  __const unsigned char *,
-					  unsigned char *, unsigned char *);
-
-/* Function to query module about supported encoded character sets.  */
-typedef int (*__gconv_trans_query_fct) (__const char *, __const char ***,
-					size_t *);
-
-/* Constructor and destructor for local data for transliteration.  */
-typedef int (*__gconv_trans_init_fct) (void **, const char *);
-typedef void (*__gconv_trans_end_fct) (void *);
-
-struct __gconv_trans_data
-{
-  /* Transliteration/Transscription function.  */
-  __gconv_trans_fct __trans_fct;
-  __gconv_trans_context_fct __trans_context_fct;
-  __gconv_trans_end_fct __trans_end_fct;
-  void *__data;
-  struct __gconv_trans_data *__next;
-};
-
-
-/* Description of a conversion step.  */
-struct __gconv_step
-{
-  struct __gconv_loaded_object *__shlib_handle;
-  __const char *__modname;
-
-  int __counter;
-
-  char *__from_name;
-  char *__to_name;
-
-  __gconv_fct __fct;
-  __gconv_init_fct __init_fct;
-  __gconv_end_fct __end_fct;
-
-  /* Information about the number of bytes needed or produced in this
-     step.  This helps optimizing the buffer sizes.  */
-  int __min_needed_from;
-  int __max_needed_from;
-  int __min_needed_to;
-  int __max_needed_to;
-
-  /* Flag whether this is a stateful encoding or not.  */
-  int __stateful;
-
-  void *__data;		/* Pointer to step-local data.  */
-};
-
-/* Additional data for steps in use of conversion descriptor.  This is
-   allocated by the `init' function.  */
-struct __gconv_step_data
-{
-  unsigned char *__outbuf;    /* Output buffer for this step.  */
-  unsigned char *__outbufend; /* Address of first byte after the output
-				 buffer.  */
-
-  /* Is this the last module in the chain.  */
-  int __flags;
-
-  /* Counter for number of invocations of the module function for this
-     descriptor.  */
-  int __invocation_counter;
-
-  /* Flag whether this is an internal use of the module (in the mb*towc*
-     and wc*tomb* functions) or regular with iconv(3).  */
-  int __internal_use;
-
-  mbstate_t *__statep;
-  mbstate_t __state;	/* This element must not be used directly by
-			   any module; always use STATEP!  */
-
-  /* Transliteration information.  */
-  struct __gconv_trans_data *__trans;
-};
-
-
-/* Combine conversion step description with data.  */
-typedef struct __gconv_info
-{
-  size_t __nsteps;
-  struct __gconv_step *__steps;
-  __extension__ struct __gconv_step_data __data __flexarr;
-} *__gconv_t;
-
-#endif /* gconv.h */
diff --git a/newlib/libc/sys/linux/include/getopt.h b/newlib/libc/sys/linux/include/getopt.h
index 3fdf464..994f860 100644
--- a/newlib/libc/sys/linux/include/getopt.h
+++ b/newlib/libc/sys/linux/include/getopt.h
@@ -8,11 +8,8 @@
 
 #include <unistd.h>
 
-enum { NO_ARG, REQUIRED_ARG, OPTIONAL_ARG };
-/* Define glibc names as well for compatibility.  */
-#define no_argument NO_ARG
-#define required_argument REQUIRED_ARG
-#define optional_argument OPTIONAL_ARG
+
+enum { no_argument, required_argument, optional_argument };
 
 struct option {
     const char *name;
diff --git a/newlib/libc/sys/linux/include/glob.h b/newlib/libc/sys/linux/include/glob.h
deleted file mode 100644
index 6e03847..0000000
--- a/newlib/libc/sys/linux/include/glob.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)glob.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/glob.h,v 1.6 2002/03/23 17:24:53 imp Exp $
- */
-
-#ifndef _GLOB_H_
-#define	_GLOB_H_
-
-#include <sys/cdefs.h>
-
-struct stat;
-typedef struct {
-	int gl_pathc;		/* Count of total paths so far. */
-	int gl_matchc;		/* Count of paths matching pattern. */
-	int gl_offs;		/* Reserved at beginning of gl_pathv. */
-	int gl_flags;		/* Copy of flags parameter to glob. */
-	char **gl_pathv;	/* List of paths matching pattern. */
-				/* Copy of errfunc parameter to glob. */
-	int (*gl_errfunc)(const char *, int);
-
-	/*
-	 * Alternate filesystem access methods for glob; replacement
-	 * versions of closedir(3), readdir(3), opendir(3), stat(2)
-	 * and lstat(2).
-	 */
-	void (*gl_closedir)(void *);
-	struct dirent *(*gl_readdir)(void *);
-	void *(*gl_opendir)(const char *);
-	int (*gl_lstat)(const char *, struct stat *);
-	int (*gl_stat)(const char *, struct stat *);
-} glob_t;
-
-#define	GLOB_APPEND	0x0001	/* Append to output from previous call. */
-#define	GLOB_DOOFFS	0x0002	/* Use gl_offs. */
-#define	GLOB_ERR	0x0004	/* Return on error. */
-#define	GLOB_MARK	0x0008	/* Append / to matching directories. */
-#define	GLOB_NOCHECK	0x0010	/* Return pattern itself if nothing matches. */
-#define	GLOB_NOSORT	0x0020	/* Don't sort. */
-
-#define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
-#define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
-#define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
-#define	GLOB_NOMAGIC	0x0200	/* GLOB_NOCHECK without magic chars (csh). */
-#define	GLOB_QUOTE	0x0400	/* Quote special chars with \. */
-#define	GLOB_TILDE	0x0800	/* Expand tilde names from the passwd file. */
-#define	GLOB_LIMIT	0x1000	/* limit number of returned paths */
-
-/* backwards compatibility, this is the old name for this option */
-#define GLOB_MAXPATH	GLOB_LIMIT
-
-#define	GLOB_NOSPACE	(-1)	/* Malloc call failed. */
-#define	GLOB_ABEND	(-2)	/* Unignored error. */
-
-__BEGIN_DECLS
-int	glob(const char *, int, int (*)(const char *, int), glob_t *);
-void	globfree(glob_t *);
-__END_DECLS
-
-#endif /* !_GLOB_H_ */
diff --git a/newlib/libc/sys/linux/include/hesiod.h b/newlib/libc/sys/linux/include/hesiod.h
deleted file mode 100644
index c7dbeee..0000000
--- a/newlib/libc/sys/linux/include/hesiod.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: hesiod.h,v 1.3 1999/01/24 23:53:18 lukem Exp $	*/
-/*	$FreeBSD: src/include/hesiod.h,v 1.2 2002/03/23 17:24:53 imp Exp $ */
-
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#ifndef _HESIOD_H_
-#define _HESIOD_H_
-
-	/* Application-visible indication that we have the new interfaces */
-
-#define HESIOD_INTERFACES
-
-	/* Configuration information. */
-
-#ifndef _PATH_HESIOD_CONF			/* Configuration file. */
-#define _PATH_HESIOD_CONF	"/etc/hesiod.conf"
-#endif
-
-#define DEF_RHS		""			/* Defaults if HESIOD_CONF */
-#define DEF_LHS		""			/*    file is not present. */
-
-	/* Error codes (for backwards compatibility) */
-
-#define	HES_ER_UNINIT	-1	/* uninitialized */
-#define	HES_ER_OK	0	/* no error */
-#define	HES_ER_NOTFOUND	1	/* Hesiod name not found by server */
-#define HES_ER_CONFIG	2	/* local problem (no config file?) */
-#define HES_ER_NET	3	/* network problem */
-
-	/* Declaration of routines */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	hesiod_init(void **);
-char  **hesiod_resolve(void *, const char *, const char *);
-void	hesiod_free_list(void *, char **);
-char   *hesiod_to_bind(void *, const char *, const char *);
-void	hesiod_end(void *);
-
-				/* backwards compatibility */
-int	hes_init(void);
-char   *hes_to_bind(const char *, const char *);
-char  **hes_resolve(const char *, const char *);
-int	hes_error(void);
-void	hes_free(char **);
-__END_DECLS
-
-#endif /* ! _HESIOD_H_ */
diff --git a/newlib/libc/sys/linux/include/iconv.h b/newlib/libc/sys/linux/include/iconv.h
deleted file mode 100644
index 5a795dc..0000000
--- a/newlib/libc/sys/linux/include/iconv.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _ICONV_H
-#define _ICONV_H	1
-
-#include <features.h>
-#define __need_size_t
-#include <stddef.h>
-
-
-__BEGIN_DECLS
-
-/* Identifier for conversion method from one codeset to another.  */
-typedef void *iconv_t;
-
-
-/* Allocate descriptor for code conversion from codeset FROMCODE to
-   codeset TOCODE.  */
-extern iconv_t iconv_open (__const char *__tocode, __const char *__fromcode)
-     __THROW;
-
-/* Convert at most *INBYTESLEFT bytes from *INBUF according to the
-   code conversion algorithm specified by CD and place up to
-   *OUTBYTESLEFT bytes in buffer at *OUTBUF.  */
-extern size_t iconv (iconv_t __cd, char **__restrict __inbuf,
-		     size_t *__restrict __inbytesleft,
-		     char **__restrict __outbuf,
-		     size_t *__restrict __outbytesleft);
-
-/* Free resources allocated for descriptor CD for code conversion.  */
-extern int iconv_close (iconv_t __cd) __THROW;
-
-__END_DECLS
-
-#endif /* iconv.h */
diff --git a/newlib/libc/sys/linux/include/ifaddrs.h b/newlib/libc/sys/linux/include/ifaddrs.h
deleted file mode 100644
index aad6c68..0000000
--- a/newlib/libc/sys/linux/include/ifaddrs.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$FreeBSD: src/include/ifaddrs.h,v 1.2 2002/03/23 17:24:53 imp Exp $	*/
-
-/*
- * Copyright (c) 1995, 1999
- *	Berkeley Software Design, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	BSDI ifaddrs.h,v 2.5 2000/02/23 14:51:59 dab Exp
- */
-
-#ifndef	_IFADDRS_H_
-#define	_IFADDRS_H_
-
-struct ifaddrs {
-	struct ifaddrs  *ifa_next;
-	char		*ifa_name;
-	u_int		 ifa_flags;
-	struct sockaddr	*ifa_addr;
-	struct sockaddr	*ifa_netmask;
-	struct sockaddr	*ifa_dstaddr;
-	void		*ifa_data;
-};
-
-/*
- * This may have been defined in <net/if.h>.  Note that if <net/if.h> is
- * to be included it must be included before this header file.
- */
-#ifndef	ifa_broadaddr
-#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
-#endif
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern int getifaddrs(struct ifaddrs **);
-extern void freeifaddrs(struct ifaddrs *);
-__END_DECLS
-
-#endif
diff --git a/newlib/libc/sys/linux/include/libc_private.h b/newlib/libc/sys/linux/include/libc_private.h
deleted file mode 100644
index af7df8c..0000000
--- a/newlib/libc/sys/linux/include/libc_private.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.5 2002/03/29 22:43:42 markm Exp $
- *
- * Private definitions for libc, libc_r and libpthread.
- *
- */
-
-#ifndef _LIBC_PRIVATE_H_
-#define _LIBC_PRIVATE_H_
-
-/*
- * This global flag is non-zero when a process has created one
- * or more threads. It is used to avoid calling locking functions
- * when they are not required.
- */
-extern int	__isthreaded;
-
-/*
- * File lock contention is difficult to diagnose without knowing
- * where locks were set. Allow a debug library to be built which
- * records the source file and line number of each lock call.
- */
-#ifdef	_FLOCK_DEBUG
-#define _FLOCKFILE(x)	_flockfile_debug(x, __FILE__, __LINE__)
-#else
-#define _FLOCKFILE(x)	_flockfile(x)
-#endif
-
-/*
- * Macros for locking and unlocking FILEs. These test if the
- * process is threaded to avoid locking when not required.
- */
-#define	FLOCKFILE(fp)		if (__isthreaded) _FLOCKFILE(fp)
-#define	FUNLOCKFILE(fp)		if (__isthreaded) _funlockfile(fp)
-
-/*
- * This is a pointer in the C run-time startup code. It is used
- * by getprogname() and setprogname().
- */
-extern const char *__progname;
-
-#endif /* _LIBC_PRIVATE_H_ */
diff --git a/newlib/libc/sys/linux/include/limits.h b/newlib/libc/sys/linux/include/limits.h
deleted file mode 100644
index 45cd6f2..0000000
--- a/newlib/libc/sys/linux/include/limits.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright (C) 1991, 92, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/*
- *	ISO C99 Standard: 7.10/5.2.4.2.1 Sizes of integer types	<limits.h>
- */
-
-#ifndef _LIBC_LIMITS_H_
-#define _LIBC_LIMITS_H_	1
-
-#include <features.h>
-
-
-/* Maximum length of any multibyte character in any locale.
-   We define this value here since the gcc header does not define
-   the correct value.  */
-#define MB_LEN_MAX	16
-
-
-/* If we are not using GNU CC we have to define all the symbols ourself.
-   Otherwise use gcc's definitions (see below).  */
-#if !defined __GNUC__ || __GNUC__ < 2
-
-/* We only protect from multiple inclusion here, because all the other
-   #include's protect themselves, and in GCC 2 we may #include_next through
-   multiple copies of this file before we get to GCC's.  */
-# ifndef _LIMITS_H
-#  define _LIMITS_H	1
-
-#include <bits/wordsize.h>
-
-/* We don't have #include_next.
-   Define ANSI <limits.h> for standard 32-bit words.  */
-
-/* These assume 8-bit `char's, 16-bit `short int's,
-   and 32-bit `int's and `long int's.  */
-
-/* Number of bits in a `char'.	*/
-#  define CHAR_BIT	8
-
-/* Minimum and maximum values a `signed char' can hold.  */
-#  define SCHAR_MIN	(-128)
-#  define SCHAR_MAX	127
-
-/* Maximum value an `unsigned char' can hold.  (Minimum is 0.)  */
-#  define UCHAR_MAX	255
-
-/* Minimum and maximum values a `char' can hold.  */
-#  ifdef __CHAR_UNSIGNED__
-#   define CHAR_MIN	0
-#   define CHAR_MAX	UCHAR_MAX
-#  else
-#   define CHAR_MIN	SCHAR_MIN
-#   define CHAR_MAX	SCHAR_MAX
-#  endif
-
-/* Minimum and maximum values a `signed short int' can hold.  */
-#  define SHRT_MIN	(-32768)
-#  define SHRT_MAX	32767
-
-/* Maximum value an `unsigned short int' can hold.  (Minimum is 0.)  */
-#  define USHRT_MAX	65535
-
-/* Minimum and maximum values a `signed int' can hold.  */
-#  define INT_MIN	(-INT_MAX - 1)
-#  define INT_MAX	2147483647
-
-/* Maximum value an `unsigned int' can hold.  (Minimum is 0.)  */
-#  define UINT_MAX	4294967295U
-
-/* Minimum and maximum values a `signed long int' can hold.  */
-#  if __WORDSIZE == 64
-#   define LONG_MAX	9223372036854775807L
-#  else
-#   define LONG_MAX	2147483647L
-#  endif
-#  define LONG_MIN	(-LONG_MAX - 1L)
-
-/* Maximum value an `unsigned long int' can hold.  (Minimum is 0.)  */
-#  if __WORDSIZE == 64
-#   define ULONG_MAX	18446744073709551615UL
-#  else
-#   define ULONG_MAX	4294967295UL
-#  endif
-
-#  ifdef __USE_ISOC99
-
-/* Minimum and maximum values a `signed long long int' can hold.  */
-#   define LLONG_MAX	9223372036854775807LL
-#   define LLONG_MIN	(-LLONG_MAX - 1LL)
-
-/* Maximum value an `unsigned long long int' can hold.  (Minimum is 0.)  */
-#   define ULLONG_MAX	18446744073709551615ULL
-
-#  endif /* ISO C99 */
-
-# endif	/* limits.h  */
-#endif	/* GCC 2.  */
-
-#endif	/* !_LIBC_LIMITS_H_ */
-
- /* Get the compiler's limits.h, which defines almost all the ISO constants.
-
-    We put this #include_next outside the double inclusion check because
-    it should be possible to include this file more than once and still get
-    the definitions from gcc's header.  */
-#if defined __GNUC__ && !defined _GCC_LIMITS_H_
-/* `_GCC_LIMITS_H_' is what GCC's file defines.  */
-# include_next <limits.h>
-
-/* The <limits.h> files in some gcc versions don't define LLONG_MIN,
-   LLONG_MAX, and ULLONG_MAX.  Instead only the values gcc defined for
-   ages are available.  */
-# ifdef __USE_ISOC99
-#  ifndef LLONG_MIN
-#   define LLONG_MIN	LONG_LONG_MIN
-#  endif
-#  ifndef LLONG_MAX
-#   define LLONG_MAX	LONG_LONG_MAX
-#  endif
-#  ifndef ULLONG_MAX
-#   define ULLONG_MAX	ULONG_LONG_MAX
-#  endif
-# endif
-#endif
-
-#ifdef	__USE_POSIX
-/* POSIX adds things to <limits.h>.  */
-# include <bits/posix1_lim.h>
-#endif
-
-#ifdef	__USE_POSIX2
-# include <bits/posix2_lim.h>
-#endif
-
-#ifdef	__USE_XOPEN
-# include <bits/xopen_lim.h>
-#endif
diff --git a/newlib/libc/sys/linux/include/link.h b/newlib/libc/sys/linux/include/link.h
deleted file mode 100644
index 424fb29..0000000
--- a/newlib/libc/sys/linux/include/link.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/* Data structure for communication from the run-time dynamic linker for
-   loaded ELF shared objects.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef	_LINK_H
-#define	_LINK_H	1
-
-#include <features.h>
-#include <elf.h>
-#include <dlfcn.h>
-#include <sys/types.h>
-
-#define DT_THISPROCNUM 0
-/* We use this macro to refer to ELF types independent of the native wordsize.
-   `ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'.  */
-#define ElfW(type)	_ElfW (Elf, __ELF_NATIVE_CLASS, type)
-#define _ElfW(e,w,t)	_ElfW_1 (e, w, _##t)
-#define _ElfW_1(e,w,t)	e##w##t
-
-#include <sys/elfclass.h>		/* Defines __ELF_NATIVE_CLASS.  */
-#include <sys/link.h>
-#include <dl-lookupcfg.h>
-
-/* Rendezvous structure used by the run-time dynamic linker to communicate
-   details of shared object loading to the debugger.  If the executable's
-   dynamic section has a DT_DEBUG element, the run-time linker sets that
-   element's value to the address where this structure can be found.  */
-
-struct r_debug
-  {
-    int r_version;		/* Version number for this protocol.  */
-
-    struct link_map *r_map;	/* Head of the chain of loaded objects.  */
-
-    /* This is the address of a function internal to the run-time linker,
-       that will always be called when the linker begins to map in a
-       library or unmap it, and again when the mapping change is complete.
-       The debugger can set a breakpoint at this address if it wants to
-       notice shared object mapping changes.  */
-    ElfW(Addr) r_brk;
-    enum
-      {
-	/* This state value describes the mapping change taking place when
-	   the `r_brk' address is called.  */
-	RT_CONSISTENT,		/* Mapping change is complete.  */
-	RT_ADD,			/* Beginning to add a new object.  */
-	RT_DELETE		/* Beginning to remove an object mapping.  */
-      } r_state;
-
-    ElfW(Addr) r_ldbase;	/* Base address the linker is loaded at.  */
-  };
-
-/* This is the instance of that structure used by the dynamic linker.  */
-extern struct r_debug _r_debug;
-
-/* This symbol refers to the "dynamic structure" in the `.dynamic' section
-   of whatever module refers to `_DYNAMIC'.  So, to find its own
-   `struct r_debug', a program could do:
-     for (dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn)
-       if (dyn->d_tag == DT_DEBUG)
-	 r_debug = (struct r_debug *) dyn->d_un.d_ptr;
-   */
-extern ElfW(Dyn) _DYNAMIC[];
-
-
-/* Some internal data structures of the dynamic linker used in the
-   linker map.  We only provide forward declarations.  */
-struct libname_list;
-struct r_found_version;
-struct r_search_path_elem;
-
-/* Forward declaration.  */
-struct link_map;
-
-/* Structure to describe a single list of scope elements.  The lookup
-   functions get passed an array of pointers to such structures.  */
-struct r_scope_elem
-{
-  /* Array of maps for the scope.  */
-  struct link_map **r_list;
-  /* Number of entries in the scope.  */
-  unsigned int r_nlist;
-};
-
-
-/* Structure to record search path and allocation mechanism.  */
-struct r_search_path_struct
-  {
-    struct r_search_path_elem **dirs;
-    int malloced;
-  };
-
-
-/* Structure describing a loaded shared object.  The `l_next' and `l_prev'
-   members form a chain of all the shared objects loaded at startup.
-
-   These data structures exist in space used by the run-time dynamic linker;
-   modifying them may have disastrous results.
-
-   This data structure might change in future, if necessary.  User-level
-   programs must avoid defining objects of this type.  */
-
-struct link_map
-  {
-    /* These first few members are part of the protocol with the debugger.
-       This is the same format used in SVR4.  */
-
-    ElfW(Addr) l_addr;		/* Base address shared object is loaded at.  */
-    char *l_name;		/* Absolute file name object was found in.  */
-    ElfW(Dyn) *l_ld;		/* Dynamic section of the shared object.  */
-    struct link_map *l_next, *l_prev; /* Chain of loaded objects.  */
-
-    /* All following members are internal to the dynamic linker.
-       They may change without notice.  */
-
-    struct libname_list *l_libname;
-    /* Indexed pointers to dynamic section.
-       [0,DT_NUM) are indexed by the processor-independent tags.
-       [DT_NUM,DT_NUM+DT_THISPROCNUM) are indexed by the tag minus DT_LOPROC.
-       [DT_NUM+DT_THISPROCNUM,DT_NUM+DT_THISPROCNUM+DT_EXTRANUM) are indexed
-       by DT_EXTRATAGIDX(tagvalue) and
-       [DT_NUM+DT_THISPROCNUM+DT_VERSIONTAGNUM,
-        DT_NUM+DT_THISPROCNUM+DT_VERSIONTAGNUM+DT_EXTRANUM)
-       are indexed by DT_EXTRATAGIDX(tagvalue) (see <elf.h>).  */
-
-    ElfW(Dyn) *l_info[DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM
-		     + DT_EXTRANUM];
-    const ElfW(Phdr) *l_phdr;	/* Pointer to program header table in core.  */
-    ElfW(Addr) l_entry;		/* Entry point location.  */
-    ElfW(Half) l_phnum;		/* Number of program header entries.  */
-    ElfW(Half) l_ldnum;	/* Number of dynamic segment entries.  */
-
-    /* Array of DT_NEEDED dependencies and their dependencies, in
-       dependency order for symbol lookup (with and without
-       duplicates).  There is no entry before the dependencies have
-       been loaded.  */
-    struct r_scope_elem l_searchlist;
-
-    /* We need a special searchlist to process objects marked with
-       DT_SYMBOLIC.  */
-    struct r_scope_elem l_symbolic_searchlist;
-
-    /* Dependent object that first caused this object to be loaded.  */
-    struct link_map *l_loader;
-
-    /* Symbol hash table.  */
-    Elf_Symndx l_nbuckets;
-    const Elf_Symndx *l_buckets, *l_chain;
-
-    unsigned int l_opencount;	/* Reference count for dlopen/dlclose.  */
-    enum			/* Where this object came from.  */
-      {
-	lt_executable,		/* The main executable program.  */
-	lt_library,		/* Library needed by main executable.  */
-	lt_loaded		/* Extra run-time loaded shared object.  */
-      } l_type:2;
-    unsigned int l_relocated:1;	/* Nonzero if object's relocations done.  */
-    unsigned int l_init_called:1; /* Nonzero if DT_INIT function called.  */
-    unsigned int l_global:1;	/* Nonzero if object in _dl_global_scope.  */
-    unsigned int l_reserved:2;	/* Reserved for internal use.  */
-    unsigned int l_phdr_allocated:1; /* Nonzero if the data structure pointed
-					to by `l_phdr' is allocated.  */
-    unsigned int l_soname_added:1; /* Nonzero if the SONAME is for sure in
-				      the l_libname list.  */
-    unsigned int l_faked:1;	/* Nonzero if this is a faked descriptor
-				   without associated file.  */
-
-    /* Array with version names.  */
-    unsigned int l_nversions;
-    struct r_found_version *l_versions;
-
-    /* Collected information about own RPATH directories.  */
-    struct r_search_path_struct l_rpath_dirs;
-
-    /* Collected results of relocation while profiling.  */
-    ElfW(Addr) *l_reloc_result;
-
-    /* Pointer to the version information if available.  */
-    ElfW(Versym) *l_versyms;
-
-    /* String specifying the path where this object was found.  */
-    const char *l_origin;
-
-    /* Start and finish of memory map for this object.  l_map_start
-       need not be the same as l_addr.  */
-    ElfW(Addr) l_map_start, l_map_end;
-
-    /* Default array for 'l_scope'.  */
-    struct r_scope_elem *l_scope_mem[4];
-    /* Size of array allocated for 'l_scope'.  */
-    size_t l_scope_max;
-    /* This is an array defining the lookup scope for this link map.
-       There are at most three different scope lists.  */
-    struct r_scope_elem **l_scope;
-
-    /* A similar array, this time only with the local scope.  This is
-       used occasionally.  */
-    struct r_scope_elem *l_local_scope[2];
-
-    /* This information is kept to check for sure whether a shared
-       object is the same as one already loaded.  */
-    dev_t l_dev;
-    ino64_t l_ino;
-
-    /* Collected information about own RUNPATH directories.  */
-    struct r_search_path_struct l_runpath_dirs;
-
-    /* List of object in order of the init and fini calls.  */
-    struct link_map **l_initfini;
-
-    /* List of the dependencies introduced through symbol binding.  */
-    unsigned int l_reldepsmax;
-    unsigned int l_reldepsact;
-    struct link_map **l_reldeps;
-
-    /* Various flag words.  */
-    ElfW(Word) l_feature_1;
-    ElfW(Word) l_flags_1;
-
-    /* Temporarily used in `dl_close'.  */
-    unsigned int l_idx;
-
-    struct link_map_machine l_mach;
-
-    struct
-    {
-      const ElfW(Sym) *sym;
-      int type_class;
-#ifdef DL_LOOKUP_RETURNS_MAP
-      struct link_map *value;
-#else
-      ElfW(Addr) value;
-#endif
-      const ElfW(Sym) *ret;
-    } l_lookup_cache;
-  };
-
-struct dl_phdr_info
-  {
-    ElfW(Addr) dlpi_addr;
-    const char *dlpi_name;
-    const ElfW(Phdr) *dlpi_phdr;
-    ElfW(Half) dlpi_phnum;
-  };
-
-extern int dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
-					     size_t size, void *data),
-			    void *data);
-extern int __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
-					       size_t size, void *data),
-			      void *data);
-
-#endif /* link.h */
diff --git a/newlib/libc/sys/linux/include/ltdl.h b/newlib/libc/sys/linux/include/ltdl.h
deleted file mode 100644
index 2bbfa30..0000000
--- a/newlib/libc/sys/linux/include/ltdl.h
+++ /dev/null
@@ -1,361 +0,0 @@
-/* ltdl.h -- generic dlopen functions
-   Copyright (C) 1998-2000 Free Software Foundation, Inc.
-   Originally by Thomas Tanner <tanner@ffii.org>
-   This file is part of GNU Libtool.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-As a special exception to the GNU Lesser General Public License,
-if you distribute this file as part of a program or library that
-is built using GNU libtool, you may include it under the same
-distribution terms that you use for the rest of that program.
-
-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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307  USA
-*/
-
-/* Only include this header file once. */
-#ifndef LTDL_H
-#define LTDL_H 1
-
-#include <sys/types.h>		/* for size_t declaration */
-
-
-/* --- MACROS FOR PORTABILITY --- */
-
-
-/* Saves on those hard to debug '\0' typos....  */
-#define LT_EOS_CHAR	'\0'
-
-/* LTDL_BEGIN_C_DECLS should be used at the beginning of your declarations,
-   so that C++ compilers don't mangle their names.  Use LTDL_END_C_DECLS at
-   the end of C declarations. */
-#ifdef __cplusplus
-# define LT_BEGIN_C_DECLS	extern "C" {
-# define LT_END_C_DECLS		}
-#else
-# define LT_BEGIN_C_DECLS	/* empty */
-# define LT_END_C_DECLS		/* empty */
-#endif
-
-LT_BEGIN_C_DECLS
-
-
-/* LT_PARAMS is a macro used to wrap function prototypes, so that compilers
-   that don't understand ANSI C prototypes still work, and ANSI C
-   compilers can issue warnings about type mismatches.  */
-#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(WIN32) || defined(__cplusplus)
-# define LT_PARAMS(protos)	protos
-# define lt_ptr		void*
-#else
-# define LT_PARAMS(protos)	()
-# define lt_ptr		char*
-#endif
-
-/* LT_STMT_START/END are used to create macros which expand to a
-   a single compound statement in a portable way.  */
-#if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus)
-#  define LT_STMT_START        (void)(
-#  define LT_STMT_END          )
-#else
-#  if (defined (sun) || defined (__sun__))
-#    define LT_STMT_START      if (1)
-#    define LT_STMT_END        else (void)0
-#  else
-#    define LT_STMT_START      do
-#    define LT_STMT_END        while (0)
-#  endif
-#endif
-
-/* LT_CONC creates a new concatenated symbol for the compiler
-   in a portable way.  */
-#if defined(__STDC__) || defined(__cplusplus)
-#  define LT_CONC(s,t)	s##t
-#else
-#  define LT_CONC(s,t)	s/**/t
-#endif
-
-/* LT_STRLEN can be used safely on NULL pointers.  */
-#define LT_STRLEN(s)	(((s) && (s)[0]) ? strlen (s) : 0)
-
-
-
-/* --- WINDOWS SUPPORT --- */
-
-
-/* Canonicalise Windows and Cygwin recognition macros.  */
-#ifdef __CYGWIN32__
-#  ifndef __CYGWIN__
-#    define __CYGWIN__ __CYGWIN32__
-#  endif
-#endif
-#if defined(_WIN32) || defined(WIN32)
-#  ifndef __WINDOWS__
-#    ifdef _WIN32
-#      define __WINDOWS__ _WIN32
-#    else
-#      ifdef WIN32
-#        define __WINDOWS__ WIN32
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __WINDOWS__
-#  ifndef __CYGWIN__
-/* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory
-   separator when it is set. */
-#    define LT_DIRSEP_CHAR	'\\'
-#    define LT_PATHSEP_CHAR	';'
-#  endif
-#endif
-#ifndef LT_PATHSEP_CHAR
-#  define LT_PATHSEP_CHAR	':'
-#endif
-
-/* DLL building support on win32 hosts;  mostly to workaround their
-   ridiculous implementation of data symbol exporting. */
-#ifndef LT_SCOPE
-#  ifdef __WINDOWS__
-#    ifdef DLL_EXPORT		/* defined by libtool (if required) */
-#      define LT_SCOPE	__declspec(dllexport)
-#    endif
-#    ifdef LIBLTDL_DLL_IMPORT	/* define if linking with this dll */
-#      define LT_SCOPE	extern __declspec(dllimport)
-#    endif
-#  endif
-#  ifndef LT_SCOPE		/* static linking or !__WINDOWS__ */
-#    define LT_SCOPE	extern
-#  endif
-#endif
-
-
-
-
-/* --- DYNAMIC MODULE LOADING API --- */
-
-
-typedef	struct lt_dlhandle_struct *lt_dlhandle;	/* A loaded module.  */
-
-/* Initialisation and finalisation functions for libltdl. */
-extern	int	    lt_dlinit		LT_PARAMS((void));
-extern	int	    lt_dlexit		LT_PARAMS((void));
-
-/* Module search path manipulation.  */
-extern	int	    lt_dladdsearchdir	 LT_PARAMS((const char *search_dir));
-extern	int	    lt_dlinsertsearchdir LT_PARAMS((const char *before,
-						    const char *search_dir));
-extern	int 	    lt_dlsetsearchpath	 LT_PARAMS((const char *search_path));
-extern	const char *lt_dlgetsearchpath	 LT_PARAMS((void));
-extern	int	    lt_dlforeachfile	 LT_PARAMS((
-			const char *search_path,
-			int (*func) (const char *filename, lt_ptr data),
-			lt_ptr data));
-
-/* Portable libltdl versions of the system dlopen() API. */
-extern	lt_dlhandle lt_dlopen		LT_PARAMS((const char *filename));
-extern	lt_dlhandle lt_dlopenext	LT_PARAMS((const char *filename));
-extern	lt_ptr	    lt_dlsym		LT_PARAMS((lt_dlhandle handle,
-						     const char *name));
-extern	const char *lt_dlerror		LT_PARAMS((void));
-extern	int	    lt_dlclose		LT_PARAMS((lt_dlhandle handle));
-
-/* Module residency management. */
-extern	int	    lt_dlmakeresident	LT_PARAMS((lt_dlhandle handle));
-extern	int	    lt_dlisresident	LT_PARAMS((lt_dlhandle handle));
-
-
-
-
-/* --- MUTEX LOCKING --- */
-
-
-typedef void	lt_dlmutex_lock		LT_PARAMS((void));
-typedef void	lt_dlmutex_unlock	LT_PARAMS((void));
-typedef void	lt_dlmutex_seterror	LT_PARAMS((const char *errmsg));
-typedef const char *lt_dlmutex_geterror	LT_PARAMS((void));
-
-extern	int	lt_dlmutex_register	LT_PARAMS((lt_dlmutex_lock *lock,
-					    lt_dlmutex_unlock *unlock,
-					    lt_dlmutex_seterror *seterror,
-					    lt_dlmutex_geterror *geterror));
-
-
-
-
-/* --- MEMORY HANDLING --- */
-
-
-/* By default, the realloc function pointer is set to our internal
-   realloc implementation which iself uses lt_dlmalloc and lt_dlfree.
-   libltdl relies on a featureful realloc, but if you are sure yours
-   has the right semantics then you can assign it directly.  Generally,
-   it is safe to assign just a malloc() and a free() function.  */
-LT_SCOPE  lt_ptr   (*lt_dlmalloc)	LT_PARAMS((size_t size));
-LT_SCOPE  lt_ptr   (*lt_dlrealloc)	LT_PARAMS((lt_ptr ptr, size_t size));
-LT_SCOPE  void	   (*lt_dlfree)		LT_PARAMS((lt_ptr ptr));
-
-
-
-
-/* --- PRELOADED MODULE SUPPORT --- */
-
-
-/* A preopened symbol. Arrays of this type comprise the exported
-   symbols for a dlpreopened module. */
-typedef struct {
-  const char *name;
-  lt_ptr      address;
-} lt_dlsymlist;
-
-extern	int	lt_dlpreload	LT_PARAMS((const lt_dlsymlist *preloaded));
-extern	int	lt_dlpreload_default
-				LT_PARAMS((const lt_dlsymlist *preloaded));
-
-#define LTDL_SET_PRELOADED_SYMBOLS() 		LT_STMT_START{	\
-	extern const lt_dlsymlist lt_preloaded_symbols[];		\
-	lt_dlpreload_default(lt_preloaded_symbols);			\
-						}LT_STMT_END
-
-
-
-
-/* --- MODULE INFORMATION --- */
-
-
-/* Read only information pertaining to a loaded module. */
-typedef	struct {
-  char	*filename;		/* file name */
-  char	*name;			/* module name */
-  int	ref_count;		/* number of times lt_dlopened minus
-				   number of times lt_dlclosed. */
-} lt_dlinfo;
-
-extern	const lt_dlinfo	*lt_dlgetinfo	    LT_PARAMS((lt_dlhandle handle));
-extern	lt_dlhandle	lt_dlhandle_next    LT_PARAMS((lt_dlhandle place));
-extern	int		lt_dlforeach	    LT_PARAMS((
-				int (*func) (lt_dlhandle handle, lt_ptr data),
-				lt_ptr data));
-
-/* Associating user data with loaded modules. */
-typedef unsigned lt_dlcaller_id;
-
-extern	lt_dlcaller_id	lt_dlcaller_register  LT_PARAMS((void));
-extern	lt_ptr		lt_dlcaller_set_data  LT_PARAMS((lt_dlcaller_id key,
-						lt_dlhandle handle,
-						lt_ptr data));
-extern	lt_ptr		lt_dlcaller_get_data  LT_PARAMS((lt_dlcaller_id key,
-						lt_dlhandle handle));
-
-
-
-/* --- USER MODULE LOADER API --- */
-
-
-typedef	struct lt_dlloader	lt_dlloader;
-typedef lt_ptr			lt_user_data;
-typedef lt_ptr			lt_module;
-
-/* Function pointer types for creating user defined module loaders. */
-typedef lt_module   lt_module_open	LT_PARAMS((lt_user_data loader_data,
-					    const char *filename));
-typedef int	    lt_module_close	LT_PARAMS((lt_user_data loader_data,
-					    lt_module handle));
-typedef lt_ptr	    lt_find_sym		LT_PARAMS((lt_user_data loader_data,
-					    lt_module handle,
-					    const char *symbol));
-typedef int	    lt_dlloader_exit	LT_PARAMS((lt_user_data loader_data));
-
-struct lt_user_dlloader {
-  const char	       *sym_prefix;
-  lt_module_open       *module_open;
-  lt_module_close      *module_close;
-  lt_find_sym	       *find_sym;
-  lt_dlloader_exit     *dlloader_exit;
-  lt_user_data		dlloader_data;
-};
-
-extern	lt_dlloader    *lt_dlloader_next    LT_PARAMS((lt_dlloader *place));
-extern	lt_dlloader    *lt_dlloader_find    LT_PARAMS((
-						const char *loader_name));
-extern	const char     *lt_dlloader_name    LT_PARAMS((lt_dlloader *place));
-extern	lt_user_data   *lt_dlloader_data    LT_PARAMS((lt_dlloader *place));
-extern	int		lt_dlloader_add     LT_PARAMS((lt_dlloader *place,
-				const struct lt_user_dlloader *dlloader,
-				const char *loader_name));
-extern	int		lt_dlloader_remove  LT_PARAMS((
-						const char *loader_name));
-
-
-
-/* --- ERROR MESSAGE HANDLING --- */
-
-
-/* Defining error strings alongside their symbolic names in a macro in
-   this way allows us to expand the macro in different contexts with
-   confidence that the enumeration of symbolic names will map correctly
-   onto the table of error strings.  */
-#define lt_dlerror_table						\
-    LT_ERROR(UNKNOWN,		    "unknown error")			\
-    LT_ERROR(DLOPEN_NOT_SUPPORTED,  "dlopen support not available")	\
-    LT_ERROR(INVALID_LOADER,	    "invalid loader")			\
-    LT_ERROR(INIT_LOADER,	    "loader initialization failed")	\
-    LT_ERROR(REMOVE_LOADER,	    "loader removal failed")		\
-    LT_ERROR(FILE_NOT_FOUND,	    "file not found")			\
-    LT_ERROR(DEPLIB_NOT_FOUND,      "dependency library not found")	\
-    LT_ERROR(NO_SYMBOLS,	    "no symbols defined")		\
-    LT_ERROR(CANNOT_OPEN,	    "can't open the module")		\
-    LT_ERROR(CANNOT_CLOSE,	    "can't close the module")		\
-    LT_ERROR(SYMBOL_NOT_FOUND,      "symbol not found")			\
-    LT_ERROR(NO_MEMORY,		    "not enough memory")		\
-    LT_ERROR(INVALID_HANDLE,	    "invalid module handle")		\
-    LT_ERROR(BUFFER_OVERFLOW,	    "internal buffer overflow")		\
-    LT_ERROR(INVALID_ERRORCODE,     "invalid errorcode")		\
-    LT_ERROR(SHUTDOWN,		    "library already shutdown")		\
-    LT_ERROR(CLOSE_RESIDENT_MODULE, "can't close resident module")	\
-    LT_ERROR(INVALID_MUTEX_ARGS,    "invalid mutex handler registration") \
-    LT_ERROR(INVALID_POSITION,	    "invalid search path insert position")
-
-/* Enumerate the symbolic error names. */
-enum {
-#define LT_ERROR(name, diagnostic)	LT_CONC(LT_ERROR_, name),
-	lt_dlerror_table
-#undef LT_ERROR
-
-	LT_ERROR_MAX
-};
-
-/* These functions are only useful from inside custom module loaders. */
-extern	int	lt_dladderror	LT_PARAMS((const char *diagnostic));
-extern	int	lt_dlseterror	LT_PARAMS((int errorcode));
-
-
-
-
-/* --- SOURCE COMPATIBILITY WITH OLD LIBLTDL --- */
-
-
-#ifdef LT_NON_POSIX_NAMESPACE
-#  define lt_ptr_t		lt_ptr
-#  define lt_module_t		lt_module
-#  define lt_module_open_t	lt_module_open
-#  define lt_module_close_t	lt_module_close
-#  define lt_find_sym_t		lt_find_sym
-#  define lt_dlloader_exit_t	lt_dlloader_exit
-#  define lt_dlloader_t		lt_dlloader
-#  define lt_dlloader_data_t	lt_user_data
-#endif
-
-LT_END_C_DECLS
-
-#endif /* !LTDL_H */
diff --git a/newlib/libc/sys/linux/include/malloc.h b/newlib/libc/sys/linux/include/malloc.h
deleted file mode 100644
index 7a7bcdb..0000000
--- a/newlib/libc/sys/linux/include/malloc.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/* Prototypes and definition for malloc implementation.
-   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _MALLOC_H
-#define _MALLOC_H 1
-
-#include <features.h>
-
-/*
-  `ptmalloc', a malloc implementation for multiple threads without
-  lock contention, by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>.
-  See the files `ptmalloc.c' or `COPYRIGHT' for copying conditions.
-
-  VERSION 2.6.4-pt Wed Dec  4 00:35:54 MET 1996
-
-  This work is mainly derived from malloc-2.6.4 by Doug Lea
-  <dl@cs.oswego.edu>, which is available from:
-
-                 ftp://g.oswego.edu/pub/misc/malloc.c
-
-  This trimmed-down header file only provides function prototypes and
-  the exported data structures.  For more detailed function
-  descriptions and compile-time options, see the source file
-  `ptmalloc.c'.
-*/
-
-#if defined(__STDC__) || defined (__cplusplus)
-# include <stddef.h>
-# define __malloc_ptr_t  void *
-#else
-# undef  size_t
-# define size_t          unsigned int
-# undef  ptrdiff_t
-# define ptrdiff_t       int
-# define __malloc_ptr_t  char *
-#endif
-
-#ifdef _LIBC
-/* Used by GNU libc internals. */
-# define __malloc_size_t size_t
-# define __malloc_ptrdiff_t ptrdiff_t
-#elif !defined __attribute_malloc__
-# define __attribute_malloc__
-#endif
-
-#ifdef __GNUC__
-
-/* GCC can always grok prototypes.  For C++ programs we add throw()
-   to help it optimize the function calls.  But this works only with
-   gcc 2.8.x and egcs.  */
-# if defined __cplusplus && (__GNUC__ >= 3 || __GNUC_MINOR__ >= 8)
-#  define __THROW	throw ()
-# else
-#  define __THROW
-# endif
-# define __MALLOC_P(args)	args __THROW
-/* This macro will be used for functions which might take C++ callback
-   functions.  */
-# define __MALLOC_PMT(args)	args
-
-#else	/* Not GCC.  */
-
-# define __THROW
-
-# if (defined __STDC__ && __STDC__) || defined __cplusplus
-
-#  define __MALLOC_P(args)	args
-#  define __MALLOC_PMT(args)	args
-
-# else	/* Not ANSI C or C++.  */
-
-#  define __MALLOC_P(args)	()	/* No prototypes.  */
-#  define __MALLOC_PMT(args)	()
-
-# endif	/* ANSI C or C++.  */
-
-#endif	/* GCC.  */
-
-#ifndef NULL
-# ifdef __cplusplus
-#  define NULL	0
-# else
-#  define NULL	((__malloc_ptr_t) 0)
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct _reent;
-
-/* Nonzero if the malloc is already initialized.  */
-#ifdef _LIBC
-/* In the GNU libc we rename the global variable
-   `__malloc_initialized' to `__libc_malloc_initialized'.  */
-# define __malloc_initialized __libc_malloc_initialized
-#endif
-extern int __malloc_initialized;
-
-/* Initialize global configuration.  Not needed with GNU libc. */
-#ifndef __GLIBC__
-extern void ptmalloc_init __MALLOC_P ((void));
-#endif
-
-/* Allocate SIZE bytes of memory.  */
-extern __malloc_ptr_t malloc __MALLOC_P ((size_t __size)) __attribute_malloc__;
-extern __malloc_ptr_t _malloc_r __MALLOC_P ((struct _reent * __r, size_t __size)) __attribute_malloc__;
-
-/* Allocate NMEMB elements of SIZE bytes each, all initialized to 0.  */
-extern __malloc_ptr_t calloc __MALLOC_P ((size_t __nmemb, size_t __size))
-       __attribute_malloc__;
-extern __malloc_ptr_t _calloc_r __MALLOC_P ((struct _reent * __r,
-                                             size_t __nmemb, size_t __size))
-       __attribute_malloc__;
-
-/* Re-allocate the previously allocated block in __ptr, making the new
-   block SIZE bytes long.  */
-extern __malloc_ptr_t realloc __MALLOC_P ((__malloc_ptr_t __ptr,
-					   size_t __size))
-       __attribute_malloc__;
-extern __malloc_ptr_t _realloc_r __MALLOC_P ((struct _reent * __r,
-			         	      __malloc_ptr_t __ptr,
-				              size_t __size))
-       __attribute_malloc__;
-
-/* Free a block allocated by `malloc', `realloc' or `calloc'.  */
-extern void free __MALLOC_P ((__malloc_ptr_t __ptr));
-extern void _free_r __MALLOC_P ((struct _reent * __r, __malloc_ptr_t __ptr));
-
-/* Free a block allocated by `calloc'. */
-extern void cfree __MALLOC_P ((__malloc_ptr_t __ptr));
-
-/* Allocate SIZE bytes allocated to ALIGNMENT bytes.  */
-extern __malloc_ptr_t memalign __MALLOC_P ((size_t __alignment, size_t __size));
-extern __malloc_ptr_t _memalign_r __MALLOC_P ((struct _reent *__r,
-                                               size_t __alignment, 
-                                               size_t __size));
-
-/* Allocate SIZE bytes on a page boundary.  */
-extern __malloc_ptr_t valloc __MALLOC_P ((size_t __size)) __attribute_malloc__;
-extern __malloc_ptr_t _valloc_r __MALLOC_P ((struct _reent *__r,
-                                             size_t __size)) 
-       __attribute_malloc__;
-
-/* Equivalent to valloc(minimum-page-that-holds(n)), that is, round up
-   __size to nearest pagesize. */
-extern __malloc_ptr_t  pvalloc __MALLOC_P ((size_t __size))
-       __attribute_malloc__;
-extern __malloc_ptr_t  _pvalloc_r __MALLOC_P ((struct _reent *__r,
-                                               size_t __size))
-       __attribute_malloc__;
-
-/* Underlying allocation function; successive calls should return
-   contiguous pieces of memory.  */
-extern __malloc_ptr_t (*__morecore) __MALLOC_PMT ((ptrdiff_t __size));
-
-/* Default value of `__morecore'.  */
-extern __malloc_ptr_t __default_morecore __MALLOC_P ((ptrdiff_t __size))
-       __attribute_malloc__;
-
-/* SVID2/XPG mallinfo structure */
-struct mallinfo {
-  int arena;    /* total space allocated from system */
-  int ordblks;  /* number of non-inuse chunks */
-  int smblks;   /* unused -- always zero */
-  int hblks;    /* number of mmapped regions */
-  int hblkhd;   /* total space in mmapped regions */
-  int usmblks;  /* unused -- always zero */
-  int fsmblks;  /* unused -- always zero */
-  int uordblks; /* total allocated space */
-  int fordblks; /* total non-inuse space */
-  int keepcost; /* top-most, releasable (via malloc_trim) space */
-};
-
-/* Returns a copy of the updated current mallinfo. */
-extern struct mallinfo mallinfo __MALLOC_P ((void));
-extern struct mallinfo _mallinfo_r __MALLOC_P ((struct _reent *__r));
-
-/* SVID2/XPG mallopt options */
-#ifndef M_MXFAST
-# define M_MXFAST  1	/* UNUSED in this malloc */
-#endif
-#ifndef M_NLBLKS
-# define M_NLBLKS  2	/* UNUSED in this malloc */
-#endif
-#ifndef M_GRAIN
-# define M_GRAIN   3	/* UNUSED in this malloc */
-#endif
-#ifndef M_KEEP
-# define M_KEEP    4	/* UNUSED in this malloc */
-#endif
-
-/* mallopt options that actually do something */
-#define M_TRIM_THRESHOLD    -1
-#define M_TOP_PAD           -2
-#define M_MMAP_THRESHOLD    -3
-#define M_MMAP_MAX          -4
-#define M_CHECK_ACTION      -5
-
-/* General SVID/XPG interface to tunable parameters. */
-extern int mallopt __MALLOC_P ((int __param, int __val));
-extern int _mallopt_r __MALLOC_P ((struct _reent *__r, int __param, int __val));
-
-/* Release all but __pad bytes of freed top-most memory back to the
-   system. Return 1 if successful, else 0. */
-extern int malloc_trim __MALLOC_P ((size_t __pad));
-
-/* Report the number of usable allocated bytes associated with allocated
-   chunk __ptr. */
-extern size_t malloc_usable_size __MALLOC_P ((__malloc_ptr_t __ptr));
-
-/* Prints brief summary statistics on stderr. */
-extern void malloc_stats __MALLOC_P ((void));
-extern void _malloc_stats_r __MALLOC_P ((struct _reent *__r));
-
-/* Record the state of all malloc variables in an opaque data structure. */
-extern __malloc_ptr_t malloc_get_state __MALLOC_P ((void));
-
-/* Restore the state of all malloc variables from data obtained with
-   malloc_get_state(). */
-extern int malloc_set_state __MALLOC_P ((__malloc_ptr_t __ptr));
-
-#if defined __GLIBC__ || defined MALLOC_HOOKS
-/* Called once when malloc is initialized; redefining this variable in
-   the application provides the preferred way to set up the hook
-   pointers. */
-extern void (*__malloc_initialize_hook) __MALLOC_PMT ((void));
-/* Hooks for debugging and user-defined versions. */
-extern void (*__free_hook) __MALLOC_PMT ((__malloc_ptr_t __ptr,
-					__const __malloc_ptr_t));
-extern __malloc_ptr_t (*__malloc_hook) __MALLOC_PMT ((size_t __size,
-						    __const __malloc_ptr_t));
-extern __malloc_ptr_t (*__realloc_hook) __MALLOC_PMT ((__malloc_ptr_t __ptr,
-						     size_t __size,
-						     __const __malloc_ptr_t));
-extern __malloc_ptr_t (*__memalign_hook) __MALLOC_PMT ((size_t __alignment,
-						      size_t __size,
-						      __const __malloc_ptr_t));
-extern void (*__after_morecore_hook) __MALLOC_PMT ((void));
-
-/* Activate a standard set of debugging hooks. */
-extern void __malloc_check_init __MALLOC_P ((void));
-#endif
-
-#ifdef __cplusplus
-}; /* end of extern "C" */
-#endif
-
-#endif /* malloc.h */
diff --git a/newlib/libc/sys/linux/include/mcheck.h b/newlib/libc/sys/linux/include/mcheck.h
deleted file mode 100644
index 39e396d..0000000
--- a/newlib/libc/sys/linux/include/mcheck.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Modified for newlib, July 9, 2002 by Jeff Johnston */
-
-#ifndef _MCHECK_H
-#define _MCHECK_H	1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Return values for `mprobe': these are the kinds of inconsistencies that
-   `mcheck' enables detection of.  */
-enum mcheck_status
-  {
-    MCHECK_DISABLED = -1,       /* Consistency checking is not turned on.  */
-    MCHECK_OK,                  /* Block is fine.  */
-    MCHECK_FREE,                /* Block freed twice.  */
-    MCHECK_HEAD,                /* Memory before the block was clobbered.  */
-    MCHECK_TAIL                 /* Memory after the block was clobbered.  */
-  };
-
-
-/* Activate a standard collection of debugging hooks.  This must be called
-   before `malloc' is ever called.  ABORTFUNC is called with an error code
-   (see enum above) when an inconsistency is detected.  If ABORTFUNC is
-   null, the standard function prints on stderr and then calls `abort'.  */
-extern int mcheck (void (*__abortfunc) (enum mcheck_status));
-
-/* Similar to `mcheck´ but performs checks for all block whenever one of
-   the memory handling functions is called.  This can be very slow.  */
-extern int mcheck_pedantic (void (*__abortfunc) (enum mcheck_status));
-
-/* Force check of all blocks now.  */
-extern void mcheck_check_all (void);
-
-/* Check for aberrations in a particular malloc'd block.  You must have
-   called `mcheck' already.  These are the same checks that `mcheck' does
-   when you free or reallocate a block.  */
-extern enum mcheck_status mprobe (void *__ptr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* mcheck.h */
diff --git a/newlib/libc/sys/linux/include/mqueue.h b/newlib/libc/sys/linux/include/mqueue.h
deleted file mode 100644
index 734ccfe..0000000
--- a/newlib/libc/sys/linux/include/mqueue.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* libc/sys/linux/include/mqueue.h - message queue functions */
-
-/* Copyright 2002, Red Hat Inc. - all rights reserved */
-
-#ifndef __MQUEUE_H
-#define __MQUEUE_H
-
-#include <sys/types.h>
-#define __need_sigevent_t 1
-#include <bits/siginfo.h>
-
-#include <sys/fcntl.h>
-
-/* message queue types */
-typedef int mqd_t;
-
-struct mq_attr {
-  long mq_flags;    /* message queue flags */
-  long mq_maxmsg;   /* maximum number of messages */
-  long mq_msgsize;  /* maximum message size */
-  long mq_curmsgs;  /* number of messages currently queued */
-};
-
-#define MQ_PRIO_MAX 16
-
-/* prototypes */
-mqd_t mq_open (const char *__name, int __oflag, ...);
-int mq_close (mqd_t __msgid);
-int mq_send (mqd_t __msgid, const char *__msg, size_t __msg_len, unsigned int __msg_prio);
-ssize_t mq_receive (mqd_t __msgid, char *__msg, size_t __msg_len, unsigned int *__msg_prio);
-int mq_notify (mqd_t __msgid, const struct sigevent *__notification);
-int mq_unlink (const char *__name);
-int mq_getattr (mqd_t __msgid, struct mq_attr *__mqstat);
-int mq_setattr (mqd_t __msgid, const struct mq_attr *__mqstat, struct mq_attr *__omqattr);
-
-#endif /* __MQUEUE_H */
diff --git a/newlib/libc/sys/linux/include/namespace.h b/newlib/libc/sys/linux/include/namespace.h
deleted file mode 100644
index 159b8e3..0000000
--- a/newlib/libc/sys/linux/include/namespace.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@FreeBSD.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/include/namespace.h,v 1.9 2002/03/29 22:43:42 markm Exp $
- */
-
-#ifndef _NAMESPACE_H_
-#define _NAMESPACE_H_
-
-/*
- * Adjust names so that headers declare "hidden" names.
- */
-
-/*
- * ISO C (C90) section.  Most names in libc aren't in ISO C, so they
- * should be here.  Most aren't here...
- */
-#define		err				_err
-#define		warn				_warn
-
-/*
- * Prototypes for syscalls/functions that need to be overridden
- * in libc_r/libpthread.
- */
-#define		accept				_accept
-#define		__acl_aclcheck_fd		___acl_aclcheck_fd
-#define		__acl_delete_fd			___acl_delete_fd
-#define		__acl_get_fd			___acl_get_fd
-#define		__acl_set_fd			___acl_set_fd
-#define		bind				_bind
-#define		__cap_get_fd			___cap_get_fd
-#define		__cap_set_fd			___cap_set_fd
-#define		close				_close
-#define		connect				_connect
-#define		dup				_dup
-#define		dup2				_dup2
-#define		execve				_execve
-#define		fcntl				_fcntl
-/*#define		flock				_flock */
-#define		fstat				_fstat
-#define		fstatfs				_fstatfs
-#define		fsync				_fsync
-#define		getdirentries			_getdirentries
-#define		getlogin			_getlogin
-#define		getpeername			_getpeername
-#define		getprogname			_getprogname
-#define		getsockname			_getsockname
-#define		getsockopt			_getsockopt
-#define		ioctl				_ioctl
-/* #define		kevent				_kevent */
-#define		listen				_listen
-#define		nanosleep			_nanosleep
-#define		open				_open
-#define		poll				_poll
-#define		pthread_cond_signal		_pthread_cond_signal
-#define		pthread_cond_wait		_pthread_cond_wait
-#define		pthread_cond_init		_pthread_cond_init
-#define		pthread_exit			_pthread_exit
-#define		pthread_getspecific		_pthread_getspecific
-#define		pthread_key_create		_pthread_key_create
-#define		pthread_key_delete		_pthread_key_delete
-#define		pthread_main_np			_pthread_main_np
-#define		pthread_mutex_destroy		_pthread_mutex_destroy
-#define		pthread_mutex_init		_pthread_mutex_init
-#define		pthread_mutex_lock		_pthread_mutex_lock
-#define		pthread_mutex_trylock		_pthread_mutex_trylock
-#define		pthread_mutex_unlock		_pthread_mutex_unlock
-#define		pthread_mutexattr_init		_pthread_mutexattr_init
-#define		pthread_mutexattr_destroy	_pthread_mutexattr_destroy
-#define		pthread_mutexattr_settype	_pthread_mutexattr_settype
-#define		pthread_once			_pthread_once
-#define		pthread_rwlock_init		_pthread_rwlock_init
-#define		pthread_rwlock_rdlock		_pthread_rwlock_rdlock
-#define		pthread_rwlock_wrlock		_pthread_rwlock_wrlock
-#define		pthread_rwlock_unlock		_pthread_rwlock_unlock
-#define		pthread_self			_pthread_self
-#define		pthread_setspecific		_pthread_setspecific
-#define		pthread_sigmask			_pthread_sigmask
-#define		read				_read
-#define		readv				_readv
-#define		recvfrom			_recvfrom
-#define		recvmsg				_recvmsg
-#define		select				_select
-#define		sendmsg				_sendmsg
-#define		sendto				_sendto
-#define		setsockopt			_setsockopt
-/*#define		sigaction			_sigaction*/
-#define		sigprocmask			_sigprocmask
-#define		sigsuspend			_sigsuspend
-#define		socket				_socket
-#define		socketpair			_socketpair
-#define		wait4				_wait4
-#define		write				_write
-#define		writev				_writev
-
-
-/*
- * Other hidden syscalls/functions that libc_r needs to override
- * but are not used internally by libc.
- *
- * XXX - When modifying libc to use one of the following, remove
- * the prototype from below and place it in the list above.
- */
-#if 0
-#define		creat				_creat
-#define		fchflags			_fchflags
-#define		fchmod				_fchmod
-#define		fpathconf			_fpathconf
-#define		msync				_msync
-#define		nfssvc				_nfssvc
-#define		pause				_pause
-#define		pthread_rwlock_destroy		_pthread_rwlock_destroy
-#define		pthread_rwlock_tryrdlock	_pthread_rwlock_tryrdlock
-#define		pthread_rwlock_trywrlock	_pthread_rwlock_trywrlock
-#define		pthread_rwlockattr_init		_pthread_rwlockattr_init
-#define		pthread_rwlockattr_destroy	_pthread_rwlockattr_destroy
-#define		sched_yield			_sched_yield
-#define		sendfile			_sendfile
-#define		shutdown			_shutdown
-#define		sigaltstack			_sigaltstack
-#define		sigpending			_sigpending
-#define		sigreturn			_sigreturn
-#define		sigsetmask			_sigsetmask
-#define		sleep				_sleep
-#define		system				_system
-#define		tcdrain				_tcdrain
-#define		wait				_wait
-#define		waitpid				_waitpid
-#endif
-
-#endif /* _NAMESPACE_H_ */
diff --git a/newlib/libc/sys/linux/include/net/bpf.h b/newlib/libc/sys/linux/include/net/bpf.h
deleted file mode 100644
index 1f4a8be..0000000
--- a/newlib/libc/sys/linux/include/net/bpf.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Copyright (c) 1990, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
- * Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
- *	@(#)bpf.h	1.34 (LBL)     6/16/96
- *
- * $FreeBSD: src/sys/net/bpf.h,v 1.25 2002/03/19 21:54:16 alfred Exp $
- */
-
-#ifndef _NET_BPF_H_
-#define _NET_BPF_H_
-
-/* BSD style release date */
-#define	BPF_RELEASE 199606
-
-typedef	int32_t	  bpf_int32;
-typedef	u_int32_t bpf_u_int32;
-
-/*
- * Alignment macros.  BPF_WORDALIGN rounds up to the next
- * even multiple of BPF_ALIGNMENT.
- */
-#define BPF_ALIGNMENT sizeof(long)
-#define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1))
-
-#define BPF_MAXINSNS 512
-#define BPF_MAXBUFSIZE 0x80000
-#define BPF_MINBUFSIZE 32
-
-/*
- *  Structure for BIOCSETF.
- */
-struct bpf_program {
-	u_int bf_len;
-	struct bpf_insn *bf_insns;
-};
-
-/*
- * Struct returned by BIOCGSTATS.
- */
-struct bpf_stat {
-	u_int bs_recv;		/* number of packets received */
-	u_int bs_drop;		/* number of packets dropped */
-};
-
-/*
- * Struct return by BIOCVERSION.  This represents the version number of
- * the filter language described by the instruction encodings below.
- * bpf understands a program iff kernel_major == filter_major &&
- * kernel_minor >= filter_minor, that is, if the value returned by the
- * running kernel has the same major number and a minor number equal
- * equal to or less than the filter being downloaded.  Otherwise, the
- * results are undefined, meaning an error may be returned or packets
- * may be accepted haphazardly.
- * It has nothing to do with the source code version.
- */
-struct bpf_version {
-	u_short bv_major;
-	u_short bv_minor;
-};
-/* Current version number of filter architecture. */
-#define BPF_MAJOR_VERSION 1
-#define BPF_MINOR_VERSION 1
-
-#define	BIOCGBLEN	_IOR('B',102, u_int)
-#define	BIOCSBLEN	_IOWR('B',102, u_int)
-#define	BIOCSETF	_IOW('B',103, struct bpf_program)
-#define	BIOCFLUSH	_IO('B',104)
-#define BIOCPROMISC	_IO('B',105)
-#define	BIOCGDLT	_IOR('B',106, u_int)
-#define BIOCGETIF	_IOR('B',107, struct ifreq)
-#define BIOCSETIF	_IOW('B',108, struct ifreq)
-#define BIOCSRTIMEOUT	_IOW('B',109, struct timeval)
-#define BIOCGRTIMEOUT	_IOR('B',110, struct timeval)
-#define BIOCGSTATS	_IOR('B',111, struct bpf_stat)
-#define BIOCIMMEDIATE	_IOW('B',112, u_int)
-#define BIOCVERSION	_IOR('B',113, struct bpf_version)
-#define BIOCGRSIG	_IOR('B',114, u_int)
-#define BIOCSRSIG	_IOW('B',115, u_int)
-#define BIOCGHDRCMPLT	_IOR('B',116, u_int)
-#define BIOCSHDRCMPLT	_IOW('B',117, u_int)
-#define BIOCGSEESENT	_IOR('B',118, u_int)
-#define BIOCSSEESENT	_IOW('B',119, u_int)
-
-/*
- * Structure prepended to each packet.
- */
-struct bpf_hdr {
-	struct timeval	bh_tstamp;	/* time stamp */
-	bpf_u_int32	bh_caplen;	/* length of captured portion */
-	bpf_u_int32	bh_datalen;	/* original length of packet */
-	u_short		bh_hdrlen;	/* length of bpf header (this struct
-					   plus alignment padding) */
-};
-/*
- * Because the structure above is not a multiple of 4 bytes, some compilers
- * will insist on inserting padding; hence, sizeof(struct bpf_hdr) won't work.
- * Only the kernel needs to know about it; applications use bh_hdrlen.
- */
-#ifdef _KERNEL
-#define	SIZEOF_BPF_HDR	(sizeof(struct bpf_hdr) <= 20 ? 18 : \
-    sizeof(struct bpf_hdr))
-#endif
-
-/*
- * Data-link level type codes.
- */
-#define DLT_NULL	0	/* no link-layer encapsulation */
-#define DLT_EN10MB	1	/* Ethernet (10Mb) */
-#define DLT_EN3MB	2	/* Experimental Ethernet (3Mb) */
-#define DLT_AX25	3	/* Amateur Radio AX.25 */
-#define DLT_PRONET	4	/* Proteon ProNET Token Ring */
-#define DLT_CHAOS	5	/* Chaos */
-#define DLT_IEEE802	6	/* IEEE 802 Networks */
-#define DLT_ARCNET	7	/* ARCNET */
-#define DLT_SLIP	8	/* Serial Line IP */
-#define DLT_PPP		9	/* Point-to-point Protocol */
-#define DLT_FDDI	10	/* FDDI */
-#define DLT_ATM_RFC1483	11	/* LLC/SNAP encapsulated atm */
-#define DLT_RAW		12	/* raw IP */
-
-/*
- * These are values from BSD/OS's "bpf.h".
- * These are not the same as the values from the traditional libpcap
- * "bpf.h"; however, these values shouldn't be generated by any
- * OS other than BSD/OS, so the correct values to use here are the
- * BSD/OS values.
- *
- * Platforms that have already assigned these values to other
- * DLT_ codes, however, should give these codes the values
- * from that platform, so that programs that use these codes will
- * continue to compile - even though they won't correctly read
- * files of these types.
- */
-#define DLT_SLIP_BSDOS	15	/* BSD/OS Serial Line IP */
-#define DLT_PPP_BSDOS	16	/* BSD/OS Point-to-point Protocol */
-
-#define DLT_ATM_CLIP	19	/* Linux Classical-IP over ATM */
-
-/*
- * This value is defined by NetBSD; other platforms should refrain from
- * using it for other purposes, so that NetBSD savefiles with a link
- * type of 50 can be read as this type on all platforms.
- */
-#define DLT_PPP_SERIAL	50	/* PPP over serial with HDLC encapsulation */
-
-/*
- * This value was defined by libpcap 0.5; platforms that have defined
- * it with a different value should define it here with that value -
- * a link type of 104 in a save file will be mapped to DLT_C_HDLC,
- * whatever value that happens to be, so programs will correctly
- * handle files with that link type regardless of the value of
- * DLT_C_HDLC.
- *
- * The name DLT_C_HDLC was used by BSD/OS; we use that name for source
- * compatibility with programs written for BSD/OS.
- *
- * libpcap 0.5 defined it as DLT_CHDLC; we define DLT_CHDLC as well,
- * for source compatibility with programs written for libpcap 0.5.
- */
-#define DLT_C_HDLC	104	/* Cisco HDLC */
-#define DLT_CHDLC	DLT_C_HDLC
-
-/*
- * Reserved for future use.
- * Do not pick other numerical value for these unless you have also
- * picked up the tcpdump.org top-of-CVS-tree version of "savefile.c",
- * which will arrange that capture files for these DLT_ types have
- * the same "network" value on all platforms, regardless of what
- * value is chosen for their DLT_ type (thus allowing captures made
- * on one platform to be read on other platforms, even if the two
- * platforms don't use the same numerical values for all DLT_ types).
- */
-#define DLT_IEEE802_11	105	/* IEEE 802.11 wireless */
-
-/*
- * Values between 106 and 107 are used in capture file headers as
- * link-layer types corresponding to DLT_ types that might differ
- * between platforms; don't use those values for new DLT_ new types.
- */
-
-/*
- * OpenBSD DLT_LOOP, for loopback devices; it's like DLT_NULL, except
- * that the AF_ type in the link-layer header is in network byte order.
- *
- * OpenBSD defines it as 12, but that collides with DLT_RAW, so we
- * define it as 108 here.  If OpenBSD picks up this file, it should
- * define DLT_LOOP as 12 in its version, as per the comment above -
- * and should not use 108 for any purpose.
- */
-#define DLT_LOOP	108
-
-/*
- * Values between 109 and 112 are used in capture file headers as
- * link-layer types corresponding to DLT_ types that might differ
- * between platforms; don't use those values for new DLT_ new types.
- */
-
-/*
- * This is for Linux cooked sockets.
- */
-#define DLT_LINUX_SLL	113
-
-/*
- * The instruction encodings.
- */
-/* instruction classes */
-#define BPF_CLASS(code) ((code) & 0x07)
-#define		BPF_LD		0x00
-#define		BPF_LDX		0x01
-#define		BPF_ST		0x02
-#define		BPF_STX		0x03
-#define		BPF_ALU		0x04
-#define		BPF_JMP		0x05
-#define		BPF_RET		0x06
-#define		BPF_MISC	0x07
-
-/* ld/ldx fields */
-#define BPF_SIZE(code)	((code) & 0x18)
-#define		BPF_W		0x00
-#define		BPF_H		0x08
-#define		BPF_B		0x10
-#define BPF_MODE(code)	((code) & 0xe0)
-#define		BPF_IMM 	0x00
-#define		BPF_ABS		0x20
-#define		BPF_IND		0x40
-#define		BPF_MEM		0x60
-#define		BPF_LEN		0x80
-#define		BPF_MSH		0xa0
-
-/* alu/jmp fields */
-#define BPF_OP(code)	((code) & 0xf0)
-#define		BPF_ADD		0x00
-#define		BPF_SUB		0x10
-#define		BPF_MUL		0x20
-#define		BPF_DIV		0x30
-#define		BPF_OR		0x40
-#define		BPF_AND		0x50
-#define		BPF_LSH		0x60
-#define		BPF_RSH		0x70
-#define		BPF_NEG		0x80
-#define		BPF_JA		0x00
-#define		BPF_JEQ		0x10
-#define		BPF_JGT		0x20
-#define		BPF_JGE		0x30
-#define		BPF_JSET	0x40
-#define BPF_SRC(code)	((code) & 0x08)
-#define		BPF_K		0x00
-#define		BPF_X		0x08
-
-/* ret - BPF_K and BPF_X also apply */
-#define BPF_RVAL(code)	((code) & 0x18)
-#define		BPF_A		0x10
-
-/* misc */
-#define BPF_MISCOP(code) ((code) & 0xf8)
-#define		BPF_TAX		0x00
-#define		BPF_TXA		0x80
-
-/*
- * The instruction data structure.
- */
-struct bpf_insn {
-	u_short		code;
-	u_char		jt;
-	u_char		jf;
-	bpf_u_int32	k;
-};
-
-/*
- * Macros for insn array initializers.
- */
-#define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
-#define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
-
-#ifdef _KERNEL
-int	 bpf_validate(const struct bpf_insn *, int);
-void	 bpf_tap(struct ifnet *, u_char *, u_int);
-void	 bpf_mtap(struct ifnet *, struct mbuf *);
-void	 bpfattach(struct ifnet *, u_int, u_int);
-void	 bpfdetach(struct ifnet *);
-
-void	 bpfilterattach(int);
-u_int	 bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int);
-#endif
-
-/*
- * Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST).
- */
-#define BPF_MEMWORDS 16
-
-#endif
diff --git a/newlib/libc/sys/linux/include/net/bpf_compat.h b/newlib/libc/sys/linux/include/net/bpf_compat.h
deleted file mode 100644
index 31cd069..0000000
--- a/newlib/libc/sys/linux/include/net/bpf_compat.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)bpf_compat.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/bpf_compat.h,v 1.8 2000/12/27 22:20:13 bmilekic Exp $
- */
-
-#ifndef _NET_BPF_COMPAT_H_
-#define _NET_BPF_COMPAT_H_
-
-/*
- * Some hacks for compatibility across SunOS and 4.4BSD.  We emulate malloc
- * and free with mbuf clusters.  We store a pointer to the mbuf in the first
- * word of the mbuf and return 8 bytes passed the start of data (for double
- * word alignment).  We cannot just use offsets because clusters are not at
- * a fixed offset from the associated mbuf.  Sorry for this kludge.
- */
-#define malloc(size, type, canwait) bpf_alloc(size, canwait)
-#define free(cp, type) m_free(*(struct mbuf **)(cp - 8))
-#define M_WAITOK M_TRYWAIT
-#define M_NOWAIT M_DONTWAIT
-
-/* This mapping works for our purposes. */
-#define ERESTART EINTR
-
-#endif
diff --git a/newlib/libc/sys/linux/include/net/bpfdesc.h b/newlib/libc/sys/linux/include/net/bpfdesc.h
deleted file mode 100644
index ec0c8fc..0000000
--- a/newlib/libc/sys/linux/include/net/bpfdesc.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 1990, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
- * Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)bpfdesc.h	8.1 (Berkeley) 6/10/93
- *
- * $FreeBSD: src/sys/net/bpfdesc.h,v 1.19 2001/12/14 22:17:54 jdp Exp $
- */
-
-#ifndef _NET_BPFDESC_H_
-#define _NET_BPFDESC_H_
-
-#include <sys/callout.h>
-#include <sys/selinfo.h>
-
-/*
- * Descriptor associated with each open bpf file.
- */
-struct bpf_d {
-	struct bpf_d	*bd_next;	/* Linked list of descriptors */
-	/*
-	 * Buffer slots: two mbuf clusters buffer the incoming packets.
-	 *   The model has three slots.  Sbuf is always occupied.
-	 *   sbuf (store) - Receive interrupt puts packets here.
-	 *   hbuf (hold) - When sbuf is full, put cluster here and
-	 *                 wakeup read (replace sbuf with fbuf).
-	 *   fbuf (free) - When read is done, put cluster here.
-	 * On receiving, if sbuf is full and fbuf is 0, packet is dropped.
-	 */
-	caddr_t		bd_sbuf;	/* store slot */
-	caddr_t		bd_hbuf;	/* hold slot */
-	caddr_t		bd_fbuf;	/* free slot */
-	int 		bd_slen;	/* current length of store buffer */
-	int 		bd_hlen;	/* current length of hold buffer */
-
-	int		bd_bufsize;	/* absolute length of buffers */
-
-	struct bpf_if *	bd_bif;		/* interface descriptor */
-	u_long		bd_rtout;	/* Read timeout in 'ticks' */
-	struct bpf_insn *bd_filter; 	/* filter code */
-	u_long		bd_rcount;	/* number of packets received */
-	u_long		bd_dcount;	/* number of packets dropped */
-
-	u_char		bd_promisc;	/* true if listening promiscuously */
-	u_char		bd_state;	/* idle, waiting, or timed out */
-	u_char		bd_immediate;	/* true to return on packet arrival */
-	int		bd_hdrcmplt;	/* false to fill in src lladdr automatically */
-	int		bd_seesent;	/* true if bpf should see sent packets */
-	int		bd_async;	/* non-zero if packet reception should generate signal */
-	int		bd_sig;		/* signal to send upon packet reception */
-	struct sigio *	bd_sigio;	/* information for async I/O */
-#if BSD < 199103
-	u_char		bd_selcoll;	/* true if selects collide */
-	int		bd_timedout;
-	struct thread *	bd_selthread;	/* process that last selected us */
-#else
-	u_char		bd_pad;		/* explicit alignment */
-	struct selinfo	bd_sel;		/* bsd select info */
-#endif
-	struct mtx	bd_mtx;		/* mutex for this descriptor */
-	struct callout	bd_callout;	/* for BPF timeouts with select */
-};
-
-/* Values for bd_state */
-#define BPF_IDLE	0		/* no select in progress */
-#define BPF_WAITING	1		/* waiting for read timeout in select */
-#define BPF_TIMED_OUT	2		/* read timeout has expired in select */
-
-#define BPFD_LOCK(bd)		mtx_lock(&(bd)->bd_mtx)
-#define BPFD_UNLOCK(bd)		mtx_unlock(&(bd)->bd_mtx)
-
-/*
- * Descriptor associated with each attached hardware interface.
- */
-struct bpf_if {
-	struct bpf_if *bif_next;	/* list of all interfaces */
-	struct bpf_d *bif_dlist;	/* descriptor list */
-	u_int bif_dlt;			/* link layer type */
-	u_int bif_hdrlen;		/* length of header (with padding) */
-	struct ifnet *bif_ifp;		/* corresponding interface */
-	struct mtx	bif_mtx;	/* mutex for interface */
-};
-
-#define BPFIF_LOCK(bif)		mtx_lock(&(bif)->bif_mtx)
-#define BPFIF_UNLOCK(bif)	mtx_unlock(&(bif)->bif_mtx)
-
-#endif
diff --git a/newlib/libc/sys/linux/include/net/bridge.h b/newlib/libc/sys/linux/include/net/bridge.h
deleted file mode 100644
index a90f274..0000000
--- a/newlib/libc/sys/linux/include/net/bridge.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Luigi Rizzo
- *
- * Work partly supported by: Cisco Systems, Inc. - NSITE lab, RTP, NC
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/net/bridge.h,v 1.11 2002/02/15 05:11:11 luigi Exp $
- */
-
-extern int do_bridge;
-
-/*
- * We need additional per-interface info for the bridge, which is
- * stored in a struct bdg_softc. The ifp2sc[] array provides a pointer
- * to this struct using the if_index as a mapping key.
- * bdg_softc has a backpointer to the struct ifnet, the bridge
- * flags, and a cluster (bridging occurs only between port of the
- * same cluster).
- */
-
-struct cluster_softc;	/* opaque here, defined in bridge.c */
-
-struct bdg_softc {
-    struct ifnet *ifp ;
-    /* also ((struct arpcom *)ifp)->ac_enaddr is the eth. addr */
-    int flags ;
-#define IFF_BDG_PROMISC 0x0001  /* set promisc mode on this if.	*/
-#define IFF_MUTE        0x0002  /* mute this if for bridging.   */
-#define IFF_USED        0x0004  /* use this if for bridging.    */
-    struct cluster_softc *cluster;
-} ;
-
-extern struct bdg_softc *ifp2sc;
-
-#define BDG_USED(ifp) (ifp2sc[ifp->if_index].flags & IFF_USED)
-/*
- * BDG_ACTIVE(ifp) does all checks to see if bridging is enabled, loaded,
- * and used on a given interface.
- */
-#define	BDG_ACTIVE(ifp)	(do_bridge && BDG_LOADED && BDG_USED(ifp))
-
-/*
- * The following constants are not legal ifnet pointers, and are used
- * as return values from the classifier, bridge_dst_lookup().
- * The same values are used as index in the statistics arrays,
- * with BDG_FORWARD replacing specifically forwarded packets.
- *
- * These constants are here because they are used in 'netstat'
- * to show bridge statistics.
- */
-#define BDG_BCAST	( (struct ifnet *)1 )
-#define BDG_MCAST	( (struct ifnet *)2 )
-#define BDG_LOCAL	( (struct ifnet *)3 )
-#define BDG_DROP	( (struct ifnet *)4 )
-#define BDG_UNKNOWN	( (struct ifnet *)5 )
-#define BDG_IN		( (struct ifnet *)7 )
-#define BDG_OUT		( (struct ifnet *)8 )
-#define BDG_FORWARD	( (struct ifnet *)9 )
-
-/*
- * Statistics are passed up with the sysctl interface, "netstat -p bdg"
- * reads them. PF_BDG defines the 'bridge' protocol family.
- */
-
-#define PF_BDG 3 /* XXX superhack */
-
-#define STAT_MAX (int)BDG_FORWARD
-struct bdg_port_stat {
-    char name[16];
-    u_long collisions;
-    u_long p_in[STAT_MAX+1];
-} ;
-
-/* XXX this should be made dynamic */
-#define BDG_MAX_PORTS 128
-struct bdg_stats {
-    struct bdg_port_stat s[BDG_MAX_PORTS];
-} ;
-
-
-#define BDG_STAT(ifp, type) bdg_stats.s[ifp->if_index].p_in[(uintptr_t)type]++ 
- 
-#ifdef _KERNEL
-typedef	struct ifnet *bridge_in_t(struct ifnet *, struct ether_header *);
-/* bdg_forward frees the mbuf if necessary, returning null */
-typedef	struct mbuf *bdg_forward_t(struct mbuf *, struct ether_header *const,
-		struct ifnet *);
-typedef	void bdgtakeifaces_t(void);
-extern	bridge_in_t *bridge_in_ptr;
-extern	bdg_forward_t *bdg_forward_ptr;
-extern	bdgtakeifaces_t *bdgtakeifaces_ptr;
-
-#define	BDG_LOADED	(bdgtakeifaces_ptr != NULL)
-#endif /* KERNEL */
diff --git a/newlib/libc/sys/linux/include/net/ethernet.h b/newlib/libc/sys/linux/include/net/ethernet.h
deleted file mode 100644
index 6b1d1c9..0000000
--- a/newlib/libc/sys/linux/include/net/ethernet.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Fundamental constants relating to ethernet.
- *
- * $FreeBSD: src/sys/net/ethernet.h,v 1.20 2002/04/04 05:42:09 luigi Exp $
- *
- */
-
-#ifndef _NET_ETHERNET_H_
-#define _NET_ETHERNET_H_
-
-/*
- * The number of bytes in an ethernet (MAC) address.
- */
-#define	ETHER_ADDR_LEN		6
-
-/*
- * The number of bytes in the type field.
- */
-#define	ETHER_TYPE_LEN		2
-
-/*
- * The number of bytes in the trailing CRC field.
- */
-#define	ETHER_CRC_LEN		4
-
-/*
- * The length of the combined header.
- */
-#define	ETHER_HDR_LEN		(ETHER_ADDR_LEN*2+ETHER_TYPE_LEN)
-
-/*
- * The minimum packet length.
- */
-#define	ETHER_MIN_LEN		64
-
-/*
- * The maximum packet length.
- */
-#define	ETHER_MAX_LEN		1518
-
-/*
- * A macro to validate a length with
- */
-#define	ETHER_IS_VALID_LEN(foo)	\
-	((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
-
-/*
- * Structure of a 10Mb/s Ethernet header.
- */
-struct	ether_header {
-	u_char	ether_dhost[ETHER_ADDR_LEN];
-	u_char	ether_shost[ETHER_ADDR_LEN];
-	u_short	ether_type;
-};
-
-/*
- * Structure of a 48-bit Ethernet address.
- */
-struct	ether_addr {
-	u_char octet[ETHER_ADDR_LEN];
-};
-
-#define	ETHERTYPE_PUP		0x0200	/* PUP protocol */
-#define	ETHERTYPE_IP		0x0800	/* IP protocol */
-#define	ETHERTYPE_ARP		0x0806	/* Addr. resolution protocol */
-#define	ETHERTYPE_REVARP	0x8035	/* reverse Addr. resolution protocol */
-#define	ETHERTYPE_VLAN		0x8100	/* IEEE 802.1Q VLAN tagging */
-#define	ETHERTYPE_IPV6		0x86dd	/* IPv6 */
-#define	ETHERTYPE_LOOPBACK	0x9000	/* used to test interfaces */
-/* XXX - add more useful types here */
-
-/*
- * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have
- * (type-ETHERTYPE_TRAIL)*512 bytes of data followed
- * by an ETHER type (as given above) and then the (variable-length) header.
- */
-#define	ETHERTYPE_TRAIL		0x1000		/* Trailer packet */
-#define	ETHERTYPE_NTRAILER	16
-
-#define	ETHERMTU	(ETHER_MAX_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
-#define	ETHERMIN	(ETHER_MIN_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
-
-#ifdef _KERNEL
-
-/*
- * For device drivers to specify whether they support BPF or not
- */
-#define ETHER_BPF_UNSUPPORTED	0
-#define ETHER_BPF_SUPPORTED	1
-
-struct ifnet;
-struct mbuf;
-
-extern	void (*ng_ether_input_p)(struct ifnet *ifp,
-		struct mbuf **mp, struct ether_header *eh);
-extern	void (*ng_ether_input_orphan_p)(struct ifnet *ifp,
-		struct mbuf *m, struct ether_header *eh);
-extern	int  (*ng_ether_output_p)(struct ifnet *ifp, struct mbuf **mp);
-extern	void (*ng_ether_attach_p)(struct ifnet *ifp);
-extern	void (*ng_ether_detach_p)(struct ifnet *ifp);
-
-extern	int (*vlan_input_p)(struct ether_header *eh, struct mbuf *m);
-extern	int (*vlan_input_tag_p)(struct ether_header *eh, struct mbuf *m,
-		u_int16_t t);
-
-#define	VLAN_INPUT_TAG(eh, m, t) do {			\
-	/* XXX: lock */					\
-	if (vlan_input_tag_p != NULL) 			\
-		(*vlan_input_tag_p)(eh, m, t);		\
-	else {						\
-		(m)->m_pkthdr.rcvif->if_noproto++;	\
-		m_freem(m);				\
-	}						\
-	/* XXX: unlock */				\
-} while (0)
-
-#else /* _KERNEL */
-
-#include <sys/cdefs.h>
-
-/*
- * Ethernet address conversion/parsing routines.
- */
-__BEGIN_DECLS
-struct	ether_addr *ether_aton(const char *);
-int	ether_hostton(const char *, struct ether_addr *);
-int	ether_line(const char *, struct ether_addr *, char *);
-char 	*ether_ntoa(const struct ether_addr *);
-int	ether_ntohost(char *, const struct ether_addr *);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_NET_ETHERNET_H_ */
diff --git a/newlib/libc/sys/linux/include/net/fddi.h b/newlib/libc/sys/linux/include/net/fddi.h
deleted file mode 100644
index e9a3b55..0000000
--- a/newlib/libc/sys/linux/include/net/fddi.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- * Copyright (c) 1995 Matt Thomas (thomas@lkg.dec.com)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_fddi.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/fddi.h,v 1.12 2002/03/29 11:22:22 mdodd Exp $
- */
-
-#ifndef _NETINET_IF_FDDI_H_
-#define _NETINET_IF_FDDI_H_
-
-#define	FDDIIPMTU		4352
-#define	FDDIMTU			4470
-#define	FDDIMIN			3
-
-#define	FDDIFC_C		0x80	/* 0b10000000 */
-#define	FDDIFC_L		0x40	/* 0b01000000 */
-#define	FDDIFC_F		0x30	/* 0b00110000 */
-#define	FDDIFC_Z		0x0F	/* 0b00001111 */
-#define	FDDIFC_CLFF		0xF0	/* Class/Length/Format bits */
-#define	FDDIFC_ZZZZ		0x0F	/* Control bits */
-
-/*
- * FDDI Frame Control values. (48-bit addressing only).
- */
-#define	FDDIFC_VOID		0x40	/* Void frame */
-#define	FDDIFC_NRT		0x80	/* Nonrestricted token */
-#define	FDDIFC_RT		0xc0	/* Restricted token */
-#define	FDDIFC_MAC_BEACON	0xc2	/* MAC Beacon frame */
-#define	FDDIFC_MAC_CLAIM	0xc3	/* MAC Claim frame */
-#define	FDDIFC_LLC_ASYNC	0x50
-#define	FDDIFC_LLC_PRIO0	0
-#define	FDDIFC_LLC_PRIO1	1
-#define	FDDIFC_LLC_PRIO2	2
-#define	FDDIFC_LLC_PRIO3	3
-#define	FDDIFC_LLC_PRIO4	4
-#define	FDDIFC_LLC_PRIO5	5
-#define	FDDIFC_LLC_PRIO6	6
-#define	FDDIFC_LLC_PRIO7	7
-#define	FDDIFC_LLC_SYNC		0xd0
-#define	FDDIFC_IMP_ASYNC	0x60	/* Implementor Async. */
-#define	FDDIFC_IMP_SYNC		0xe0	/* Implementor Synch. */
-#define	FDDIFC_SMT		0x40
-#define	FDDIFC_SMT_INFO		0x41	/* SMT Info */
-#define	FDDIFC_SMT_NSA		0x4F	/* SMT Next station adrs */
-#define	FDDIFC_MAC		0xc0	/* MAC frame */
-
-#define	FDDI_ADDR_LEN		6
-#define	FDDI_HDR_LEN		(sizeof(struct fddi_header))
-
-/*
- * Structure of an 100Mb/s FDDI header.
- */
-struct fddi_header {
-	u_char  fddi_fc;
-	u_char  fddi_dhost[FDDI_ADDR_LEN];
-	u_char  fddi_shost[FDDI_ADDR_LEN];
-};
-
-#if defined(_KERNEL)
-#define	fddi_ipmulticast_min	ether_ipmulticast_min
-#define	fddi_ipmulticast_max	ether_ipmulticast_max
-#define	fddi_addmulti		ether_addmulti
-#define	fddi_delmulti		ether_delmulti
-#define	fddi_sprintf		ether_sprintf
-
-#define	FDDI_BPF_UNSUPPORTED	0
-#define	FDDI_BPF_SUPPORTED	1
-
-void	fddi_ifattach(struct ifnet *, int);
-void	fddi_ifdetach(struct ifnet *, int);
-void	fddi_input(struct ifnet *, struct fddi_header *, struct mbuf *);
-int	fddi_ioctl(struct ifnet *, int, caddr_t);
-
-#endif	/* _KERNEL */
-#endif	/* _NET_FDDI_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if.h b/newlib/libc/sys/linux/include/net/if.h
deleted file mode 100644
index 5671b11..0000000
--- a/newlib/libc/sys/linux/include/net/if.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/if.h,v 1.71 2002/03/19 21:54:16 alfred Exp $
- */
-
-#ifndef _NET_IF_H_
-#define	_NET_IF_H_
-
-#include <sys/queue.h>
-#include <sys/socket.h>
-
-/*
- * <net/if.h> does not depend on <sys/time.h> on most other systems.  This
- * helps userland compatibility.  (struct timeval ifi_lastchange)
- */
-#ifndef _KERNEL
-#include <sys/time.h>
-#endif
-
-struct ifnet;
-
-/*
- * Length of interface external name, including terminating '\0'.
- * Note: this is the same size as a generic device's external name.
- */
-#define		IFNAMSIZ	16
-#define		IF_NAMESIZE	IFNAMSIZ
-#define		IF_MAXUNIT	0x7fff	/* ifp->if_unit is only 15 bits */
-
-/*
- * Structure describing a `cloning' interface.
- */
-struct if_clone {
-	LIST_ENTRY(if_clone) ifc_list;	/* on list of cloners */
-	const char *ifc_name;		/* name of device, e.g. `gif' */
-	size_t ifc_namelen;		/* length of name */
-	int ifc_maxunit;		/* maximum unit number */
-	unsigned char *ifc_units;	/* bitmap to handle units */
-	int ifc_bmlen;			/* bitmap length */
-
-	int	(*ifc_create)(struct if_clone *, int);
-	int	(*ifc_destroy)(struct ifnet *);
-};
-
-#define IF_CLONE_INITIALIZER(name, create, destroy, maxunit)		\
-	{ { 0 }, name, sizeof(name) - 1, maxunit, NULL, 0, create, destroy }
-
-/*
- * Structure used to query names of interface cloners.
- */
-
-struct if_clonereq {
-	int	ifcr_total;		/* total cloners (out) */
-	int	ifcr_count;		/* room for this many in user buffer */
-	char	*ifcr_buffer;		/* buffer for cloner names */
-};
-
-/*
- * Structure describing information about an interface
- * which may be of interest to management entities.
- */
-struct if_data {
-	/* generic interface information */
-	u_char	ifi_type;		/* ethernet, tokenring, etc */
-	u_char	ifi_physical;		/* e.g., AUI, Thinnet, 10base-T, etc */
-	u_char	ifi_addrlen;		/* media address length */
-	u_char	ifi_hdrlen;		/* media header length */
-	u_char	ifi_recvquota;		/* polling quota for receive intrs */
-	u_char	ifi_xmitquota;		/* polling quota for xmit intrs */
-	u_long	ifi_mtu;		/* maximum transmission unit */
-	u_long	ifi_metric;		/* routing metric (external only) */
-	u_long	ifi_baudrate;		/* linespeed */
-	/* volatile statistics */
-	u_long	ifi_ipackets;		/* packets received on interface */
-	u_long	ifi_ierrors;		/* input errors on interface */
-	u_long	ifi_opackets;		/* packets sent on interface */
-	u_long	ifi_oerrors;		/* output errors on interface */
-	u_long	ifi_collisions;		/* collisions on csma interfaces */
-	u_long	ifi_ibytes;		/* total number of octets received */
-	u_long	ifi_obytes;		/* total number of octets sent */
-	u_long	ifi_imcasts;		/* packets received via multicast */
-	u_long	ifi_omcasts;		/* packets sent via multicast */
-	u_long	ifi_iqdrops;		/* dropped on input, this interface */
-	u_long	ifi_noproto;		/* destined for unsupported protocol */
-	u_long	ifi_hwassist;		/* HW offload capabilities */
-	u_long	ifi_unused;		/* XXX was ifi_xmittiming */
-	struct	timeval ifi_lastchange;	/* time of last administrative change */
-};
-
-#define	IFF_UP		0x1		/* interface is up */
-#define	IFF_BROADCAST	0x2		/* broadcast address valid */
-#define	IFF_DEBUG	0x4		/* turn on debugging */
-#define	IFF_LOOPBACK	0x8		/* is a loopback net */
-#define	IFF_POINTOPOINT	0x10		/* interface is point-to-point link */
-#define	IFF_NOTRAILERS	0x20		/* avoid use of trailers */
-#define	IFF_RUNNING	0x40		/* resources allocated */
-#define	IFF_NOARP	0x80		/* no address resolution protocol */
-#define	IFF_PROMISC	0x100		/* receive all packets */
-#define	IFF_ALLMULTI	0x200		/* receive all multicast packets */
-#define	IFF_OACTIVE	0x400		/* transmission in progress */
-#define	IFF_SIMPLEX	0x800		/* can't hear own transmissions */
-#define	IFF_LINK0	0x1000		/* per link layer defined bit */
-#define	IFF_LINK1	0x2000		/* per link layer defined bit */
-#define	IFF_LINK2	0x4000		/* per link layer defined bit */
-#define	IFF_ALTPHYS	IFF_LINK2	/* use alternate physical connection */
-#define	IFF_MULTICAST	0x8000		/* supports multicast */
-
-/*
- * The following flag(s) ought to go in if_flags, but we cannot change
- * struct ifnet because of binary compatibility, so we store them in
- * if_ipending, which is not used so far.
- * If possible, make sure the value is not conflicting with other
- * IFF flags, so we have an easier time when we want to merge them.
- */
-#define	IFF_POLLING	0x10000		/* Interface is in polling mode. */
-
-/* flags set internally only: */
-#define	IFF_CANTCHANGE \
-	(IFF_BROADCAST|IFF_POINTOPOINT|IFF_RUNNING|IFF_OACTIVE|\
-	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_NOTRAILERS)
-
-/* Capabilities that interfaces can advertise. */
-#define IFCAP_RXCSUM		0x0001  /* can offload checksum on RX */
-#define IFCAP_TXCSUM		0x0002  /* can offload checksum on TX */
-#define IFCAP_NETCONS		0x0004  /* can be a network console */
-
-#define IFCAP_HWCSUM		(IFCAP_RXCSUM | IFCAP_TXCSUM)
-
-#define	IFQ_MAXLEN	50
-#define	IFNET_SLOWHZ	1		/* granularity is 1 second */
-
-/*
- * Message format for use in obtaining information about interfaces
- * from getkerninfo and the routing socket
- */
-struct if_msghdr {
-	u_short	ifm_msglen;	/* to skip over non-understood messages */
-	u_char	ifm_version;	/* future binary compatibility */
-	u_char	ifm_type;	/* message type */
-	int	ifm_addrs;	/* like rtm_addrs */
-	int	ifm_flags;	/* value of if_flags */
-	u_short	ifm_index;	/* index for associated ifp */
-	struct	if_data ifm_data;/* statistics and other data about if */
-};
-
-/*
- * Message format for use in obtaining information about interface addresses
- * from getkerninfo and the routing socket
- */
-struct ifa_msghdr {
-	u_short	ifam_msglen;	/* to skip over non-understood messages */
-	u_char	ifam_version;	/* future binary compatibility */
-	u_char	ifam_type;	/* message type */
-	int	ifam_addrs;	/* like rtm_addrs */
-	int	ifam_flags;	/* value of ifa_flags */
-	u_short	ifam_index;	/* index for associated ifp */
-	int	ifam_metric;	/* value of ifa_metric */
-};
-
-/*
- * Message format for use in obtaining information about multicast addresses
- * from the routing socket
- */
-struct ifma_msghdr {
-	u_short	ifmam_msglen;	/* to skip over non-understood messages */
-	u_char	ifmam_version;	/* future binary compatibility */
-	u_char	ifmam_type;	/* message type */
-	int	ifmam_addrs;	/* like rtm_addrs */
-	int	ifmam_flags;	/* value of ifa_flags */
-	u_short	ifmam_index;	/* index for associated ifp */
-};
-
-/*
- * Message format announcing the arrival or departure of a network interface.
- */
-struct if_announcemsghdr {
-	u_short	ifan_msglen;	/* to skip over non-understood messages */
-	u_char	ifan_version;	/* future binary compatibility */
-	u_char	ifan_type;	/* message type */
-	u_short	ifan_index;	/* index for associated ifp */
-	char	ifan_name[IFNAMSIZ]; /* if name, e.g. "en0" */
-	u_short	ifan_what;	/* what type of announcement */
-};
-
-#define	IFAN_ARRIVAL	0	/* interface arrival */
-#define	IFAN_DEPARTURE	1	/* interface departure */
-
-/*
- * Interface request structure used for socket
- * ioctl's.  All interface ioctl's must have parameter
- * definitions which begin with ifr_name.  The
- * remainder may be interface specific.
- */
-struct	ifreq {
-	char	ifr_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	union {
-		struct	sockaddr ifru_addr;
-		struct	sockaddr ifru_dstaddr;
-		struct	sockaddr ifru_broadaddr;
-		struct	sockaddr ifru_netmask;
-		short	ifru_flags[2];
-		short	ifru_index;
-		int	ifru_metric;
-		int	ifru_mtu;
-		int	ifru_phys;
-		int	ifru_media;
-		caddr_t	ifru_data;
-		int	ifru_cap[2];
-	} ifr_ifru;
-#define	ifr_addr	ifr_ifru.ifru_addr	/* address */
-#define	ifr_dstaddr	ifr_ifru.ifru_dstaddr	/* other end of p-to-p link */
-#define	ifr_broadaddr	ifr_ifru.ifru_broadaddr	/* broadcast address */
-#define	ifr_netmask	ifr_ifru.ifru_netmask	/* interface net mask	*/
-#define	ifr_flags	ifr_ifru.ifru_flags[0]	/* flags */
-#define	ifr_prevflags	ifr_ifru.ifru_flags[1]	/* flags */
-#define	ifr_metric	ifr_ifru.ifru_metric	/* metric */
-#define	ifr_mtu		ifr_ifru.ifru_mtu	/* mtu */
-#define ifr_phys	ifr_ifru.ifru_phys	/* physical wire */
-#define ifr_media	ifr_ifru.ifru_media	/* physical media */
-#define	ifr_data	ifr_ifru.ifru_data	/* for use by interface */
-#define	ifr_reqcap	ifr_ifru.ifru_cap[0]	/* requested capabilities */
-#define	ifr_curcap	ifr_ifru.ifru_cap[1]	/* current capabilities */
-#define	ifr_index	ifr_ifru.ifru_index	/* interface index */
-};
-
-struct ifaliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr ifra_addr;
-	struct	sockaddr ifra_broadaddr;
-	struct	sockaddr ifra_mask;
-};
-
-struct ifmediareq {
-	char	ifm_name[IFNAMSIZ];	/* if name, e.g. "en0" */
-	int	ifm_current;		/* current media options */
-	int	ifm_mask;		/* don't care mask */
-	int	ifm_status;		/* media status */
-	int	ifm_active;		/* active options */
-	int	ifm_count;		/* # entries in ifm_ulist array */
-	int	*ifm_ulist;		/* media words */
-};
-
-/* 
- * Structure used to retrieve aux status data from interfaces.
- * Kernel suppliers to this interface should respect the formatting
- * needed by ifconfig(8): each line starts with a TAB and ends with
- * a newline.  The canonical example to copy and paste is in if_tun.c.
- */
-
-#define	IFSTATMAX	800		/* 10 lines of text */
-struct ifstat {
-	char	ifs_name[IFNAMSIZ];	/* if name, e.g. "en0" */
-	char	ascii[IFSTATMAX + 1];
-};
-
-/*
- * Structure used in SIOCGIFCONF request.
- * Used to retrieve interface configuration
- * for machine (useful for programs which
- * must know all networks accessible).
- */
-struct	ifconf {
-	int	ifc_len;		/* size of associated buffer */
-	union {
-		caddr_t	ifcu_buf;
-		struct	ifreq *ifcu_req;
-	} ifc_ifcu;
-#define	ifc_buf	ifc_ifcu.ifcu_buf	/* buffer address */
-#define	ifc_req	ifc_ifcu.ifcu_req	/* array of structures returned */
-};
-
-
-/*
- * Structure for SIOC[AGD]LIFADDR
- */
-struct if_laddrreq {
-	char	iflr_name[IFNAMSIZ];
-	u_int	flags;
-#define	IFLR_PREFIX	0x8000  /* in: prefix given  out: kernel fills id */
-	u_int	prefixlen;         /* in/out */
-	struct	sockaddr_storage addr;   /* in/out */
-	struct	sockaddr_storage dstaddr; /* out */
-};
-
-#ifdef _KERNEL
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_IFADDR);
-MALLOC_DECLARE(M_IFMADDR);
-#endif
-#endif
-
-#ifndef _KERNEL
-struct if_nameindex {
-	u_int	if_index;	/* 1, 2, ... */
-	char	*if_name;	/* null terminated name: "le0", ... */
-};
-
-__BEGIN_DECLS
-u_int	 if_nametoindex(const char *);
-char	*if_indextoname(u_int, char *);
-struct	 if_nameindex *if_nameindex(void);
-void	 if_freenameindex(struct if_nameindex *);
-__END_DECLS
-#endif
-
-#ifdef _KERNEL
-struct thread;
-
-/* XXX - this should go away soon. */
-#include <net/if_var.h>
-#endif
-
-#endif /* !_NET_IF_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_arc.h b/newlib/libc/sys/linux/include/net/if_arc.h
deleted file mode 100644
index 03db7f5..0000000
--- a/newlib/libc/sys/linux/include/net/if_arc.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*	$NetBSD: if_arc.h,v 1.13 1999/11/19 20:41:19 thorpej Exp $	*/
-/* $FreeBSD: src/sys/net/if_arc.h,v 1.3 2002/03/19 21:54:16 alfred Exp $ */
-
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * from: NetBSD: if_ether.h,v 1.10 1994/06/29 06:37:55 cgd Exp
- *       @(#)if_ether.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _NET_IF_ARC_H_
-#define _NET_IF_ARC_H_
-
-/*
- * Arcnet address - 1 octets
- * don't know who uses this.
- */
-struct arc_addr {
-	u_int8_t  arc_addr_octet[1];
-} __attribute__((__packed__));
-
-/*
- * Structure of a 2.5MB/s Arcnet header.
- * as given to interface code.
- */
-struct	arc_header {
-	u_int8_t  arc_shost;
-	u_int8_t  arc_dhost;
-	u_int8_t  arc_type;
-	/*
-	 * only present for newstyle encoding with LL fragmentation.
-	 * Don't use sizeof(anything), use ARC_HDR{,NEW}LEN instead.
-	 */
-	u_int8_t  arc_flag;
-	u_int16_t arc_seqid;
-
-	/*
-	 * only present in exception packets (arc_flag == 0xff)
-	 */
-	u_int8_t  arc_type2;	/* same as arc_type */
-	u_int8_t  arc_flag2;	/* real flag value */
-	u_int16_t arc_seqid2;	/* real seqid value */
-} __attribute__((__packed__));
-
-#define	ARC_ADDR_LEN		1
-
-#define	ARC_HDRLEN		3
-#define	ARC_HDRNEWLEN		6
-#define	ARC_HDRNEWLEN_EXC	10
-
-/* these lengths are data link layer length - 2*ARC_ADDR_LEN */
-#define	ARC_MIN_LEN		1
-#define	ARC_MIN_FORBID_LEN	254
-#define	ARC_MAX_FORBID_LEN	256
-#define	ARC_MAX_LEN		508
-
-
-/* RFC 1051 */
-#define	ARCTYPE_IP_OLD		240	/* IP protocol */
-#define	ARCTYPE_ARP_OLD		241	/* address resolution protocol */
-
-/* RFC 1201 */
-#define	ARCTYPE_IP		212	/* IP protocol */
-#define	ARCTYPE_ARP		213	/* address resolution protocol */
-#define	ARCTYPE_REVARP		214	/* reverse addr resolution protocol */
-
-#define	ARCTYPE_ATALK		221	/* Appletalk */
-#define	ARCTYPE_BANIAN		247	/* Banyan Vines */
-#define	ARCTYPE_IPX		250	/* Novell IPX */
-
-#define ARCTYPE_INET6		0xc4	/* IPng */
-#define ARCTYPE_DIAGNOSE	0x80	/* as per ANSI/ATA 878.1 */
-
-#define	ARCMTU			507
-#define	ARCMIN			0
-
-#define ARC_PHDS_MAXMTU		60480
-
-struct	arccom {
-	struct	  ifnet ac_if;		/* network-visible interface */
-
-	u_int16_t ac_seqid;		/* seq. id used by PHDS encap. */
-
-	u_int8_t  arc_shost;
-	u_int8_t  arc_dhost;
-	u_int8_t  arc_type;
-
-	u_int8_t  dummy0;
-	u_int16_t dummy1;
-	int sflag, fsflag, rsflag;
-	struct mbuf *curr_frag;
-
-	struct ac_frag {
-		u_int8_t  af_maxflag;	/* from first packet */
-		u_int8_t  af_lastseen;	/* last split flag seen */
-		u_int16_t af_seqid;
-		struct mbuf *af_packet;
-	} ac_fragtab[256];		/* indexed by sender ll address */
-};
-
-#ifdef _KERNEL
-extern u_int8_t arcbroadcastaddr;
-extern int arc_ipmtu;	/* XXX new ip only, no RFC 1051! */
-
-void	arc_ifattach(struct ifnet *, u_int8_t);
-void	arc_ifdetach(struct ifnet *);
-void	arc_storelladdr(struct ifnet *, u_int8_t);
-char	*arc_sprintf(u_int8_t *);
-int	arc_isphds(int);
-void	arc_input(struct ifnet *, struct mbuf *);
-int	arc_output(struct ifnet *, struct mbuf *,
-	    struct sockaddr *, struct rtentry *);
-int	arc_ioctl(struct ifnet *, int, caddr_t);
-
-void		arc_frag_init(struct ifnet *);
-struct mbuf *	arc_frag_next(struct ifnet *);
-#endif
-
-#endif /* _NET_IF_ARC_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_arp.h b/newlib/libc/sys/linux/include/net/if_arp.h
deleted file mode 100644
index bdcacbc..0000000
--- a/newlib/libc/sys/linux/include/net/if_arp.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/if_arp.h,v 1.16 2001/10/14 20:17:52 fjoe Exp $
- */
-
-#ifndef _NET_IF_ARP_H_
-#define	_NET_IF_ARP_H_
-
-/*
- * Address Resolution Protocol.
- *
- * See RFC 826 for protocol description.  ARP packets are variable
- * in size; the arphdr structure defines the fixed-length portion.
- * Protocol type values are the same as those for 10 Mb/s Ethernet.
- * It is followed by the variable-sized fields ar_sha, arp_spa,
- * arp_tha and arp_tpa in that order, according to the lengths
- * specified.  Field names used correspond to RFC 826.
- */
-struct	arphdr {
-	u_short	ar_hrd;		/* format of hardware address */
-#define ARPHRD_ETHER 	1	/* ethernet hardware format */
-#define ARPHRD_IEEE802	6	/* token-ring hardware format */
-#define ARPHRD_ARCNET	7	/* arcnet hardware format */
-#define ARPHRD_FRELAY 	15	/* frame relay hardware format */
-	u_short	ar_pro;		/* format of protocol address */
-	u_char	ar_hln;		/* length of hardware address */
-	u_char	ar_pln;		/* length of protocol address */
-	u_short	ar_op;		/* one of: */
-#define	ARPOP_REQUEST	1	/* request to resolve address */
-#define	ARPOP_REPLY	2	/* response to previous request */
-#define	ARPOP_REVREQUEST 3	/* request protocol address given hardware */
-#define	ARPOP_REVREPLY	4	/* response giving protocol address */
-#define ARPOP_INVREQUEST 8 	/* request to identify peer */
-#define ARPOP_INVREPLY	9	/* response identifying peer */
-/*
- * The remaining fields are variable in size,
- * according to the sizes above.
- */
-#ifdef COMMENT_ONLY
-	u_char	ar_sha[];	/* sender hardware address */
-	u_char	ar_spa[];	/* sender protocol address */
-	u_char	ar_tha[];	/* target hardware address */
-	u_char	ar_tpa[];	/* target protocol address */
-#endif
-};
-
-#define ar_sha(ap)	(((caddr_t)((ap)+1)) +   0)
-#define ar_spa(ap)	(((caddr_t)((ap)+1)) +   (ap)->ar_hln)
-#define ar_tha(ap)	(((caddr_t)((ap)+1)) +   (ap)->ar_hln + (ap)->ar_pln)
-#define ar_tpa(ap)	(((caddr_t)((ap)+1)) + 2*(ap)->ar_hln + (ap)->ar_pln)
-
-#define arphdr_len2(ar_hln, ar_pln)					\
-	(sizeof(struct arphdr) + 2*(ar_hln) + 2*(ar_pln))
-#define arphdr_len(ap)	(arphdr_len2((ap)->ar_hln, (ap)->ar_pln))
-
-/*
- * ARP ioctl request
- */
-struct arpreq {
-	struct	sockaddr arp_pa;		/* protocol address */
-	struct	sockaddr arp_ha;		/* hardware address */
-	int	arp_flags;			/* flags */
-};
-/*  arp_flags and at_flags field values */
-#define	ATF_INUSE	0x01	/* entry in use */
-#define ATF_COM		0x02	/* completed entry (enaddr valid) */
-#define	ATF_PERM	0x04	/* permanent entry */
-#define	ATF_PUBL	0x08	/* publish entry (respond for other host) */
-#define	ATF_USETRAILERS	0x10	/* has requested trailers */
-
-#ifdef _KERNEL
-/*
- * Structure shared between the ethernet driver modules and
- * the address resolution code.  For example, each ec_softc or il_softc
- * begins with this structure.
- */
-struct	arpcom {
-	/*
-	 * The ifnet struct _must_ be at the head of this structure.
-	 */
-	struct 	ifnet ac_if;		/* network-visible interface */
-	u_char	ac_enaddr[6];		/* ethernet hardware address */
-	int	ac_multicnt;		/* length of ac_multiaddrs list */
-	void	*ac_netgraph;		/* ng_ether(4) netgraph node info */
-};
-
-extern u_char	etherbroadcastaddr[6];
-#endif
-
-#endif /* !_NET_IF_ARP_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_atm.h b/newlib/libc/sys/linux/include/net/if_atm.h
deleted file mode 100644
index c9ff107..0000000
--- a/newlib/libc/sys/linux/include/net/if_atm.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*      $NetBSD: if_atm.h,v 1.7 1996/11/09 23:02:27 chuck Exp $       */
-/* $FreeBSD: src/sys/net/if_atm.h,v 1.5 2002/03/19 21:54:16 alfred Exp $ */
-
-/*
- *
- * Copyright (c) 1996 Charles D. Cranor and Washington University.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Charles D. Cranor and
- *	Washington University.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * net/if_atm.h
- */
-
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
-#define RTALLOC1(A,B)		rtalloc1((A),(B))
-#elif defined(__FreeBSD__)
-#define RTALLOC1(A,B)		rtalloc1((A),(B),0UL)
-#endif
-
-/*
- * pseudo header for packet transmission
- */
-struct atm_pseudohdr {
-  u_int8_t atm_ph[4];	/* flags+VPI+VCI1(msb)+VCI2(lsb) */
-};
-
-#define ATM_PH_FLAGS(X)	((X)->atm_ph[0])
-#define ATM_PH_VPI(X)	((X)->atm_ph[1])
-#define ATM_PH_VCI(X)	((((X)->atm_ph[2]) << 8) | ((X)->atm_ph[3]))
-#define ATM_PH_SETVCI(X,V) { \
-	(X)->atm_ph[2] = ((V) >> 8) & 0xff; \
-	(X)->atm_ph[3] = ((V) & 0xff); \
-}
-
-#define ATM_PH_AAL5    0x01	/* use AAL5? (0 == aal0) */
-#define ATM_PH_LLCSNAP 0x02	/* use the LLC SNAP encoding (iff aal5) */
-
-#define ATM_PH_DRIVER7  0x40	/* reserve for driver's use */
-#define ATM_PH_DRIVER8  0x80	/* reserve for driver's use */
-
-#define ATMMTU		9180	/* ATM MTU size for IP */
-				/* XXX: could be 9188 with LLC/SNAP according
-					to comer */
-
-/* user's ioctl hook for raw atm mode */
-#define SIOCRAWATM	_IOWR('a', 122, int)	/* set driver's raw mode */
-
-/* atm_pseudoioctl: turns on and off RX VCIs  [for internal use only!] */
-struct atm_pseudoioctl {
-  struct atm_pseudohdr aph;
-  void *rxhand;
-};
-#define SIOCATMENA	_IOWR('a', 123, struct atm_pseudoioctl) /* enable */
-#define SIOCATMDIS	_IOWR('a', 124, struct atm_pseudoioctl) /* disable */
-
-
-/*
- * XXX forget all the garbage in if_llc.h and do it the easy way
- */
-
-#define ATMLLC_HDR "\252\252\3\0\0\0"
-struct atmllc {
-  u_int8_t llchdr[6];	/* aa.aa.03.00.00.00 */
-  u_int8_t type[2];	/* "ethernet" type */
-};
-
-/* ATM_LLC macros: note type code in host byte order */
-#define ATM_LLC_TYPE(X) (((X)->type[0] << 8) | ((X)->type[1]))
-#define ATM_LLC_SETTYPE(X,V) { \
-	(X)->type[1] = ((V) >> 8) & 0xff; \
-	(X)->type[0] = ((V) & 0xff); \
-}
-
-#ifdef _KERNEL
-void	atm_ifattach(struct ifnet *);
-void	atm_input(struct ifnet *, struct atm_pseudohdr *,
-		struct mbuf *, void *);
-int	atm_output(struct ifnet *, struct mbuf *, struct sockaddr *, 
-		struct rtentry *);
-#endif
-
diff --git a/newlib/libc/sys/linux/include/net/if_dl.h b/newlib/libc/sys/linux/include/net/if_dl.h
deleted file mode 100644
index 2c14671..0000000
--- a/newlib/libc/sys/linux/include/net/if_dl.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/if_dl.h,v 1.12 2002/05/07 22:14:06 kbyanc Exp $
- */
-
-#ifndef _NET_IF_DL_H_
-#define _NET_IF_DL_H_
-
-/*
- * A Link-Level Sockaddr may specify the interface in one of two
- * ways: either by means of a system-provided index number (computed
- * anew and possibly differently on every reboot), or by a human-readable
- * string such as "il0" (for managerial convenience).
- *
- * Census taking actions, such as something akin to SIOCGCONF would return
- * both the index and the human name.
- *
- * High volume transactions (such as giving a link-level ``from'' address
- * in a recvfrom or recvmsg call) may be likely only to provide the indexed
- * form, (which requires fewer copy operations and less space).
- *
- * The form and interpretation  of the link-level address is purely a matter
- * of convention between the device driver and its consumers; however, it is
- * expected that all drivers for an interface of a given if_type will agree.
- */
-
-/*
- * Structure of a Link-Level sockaddr:
- */
-struct sockaddr_dl {
-	u_char	sdl_len;	/* Total length of sockaddr */
-	u_char	sdl_family;	/* AF_LINK */
-	u_short	sdl_index;	/* if != 0, system given index for interface */
-	u_char	sdl_type;	/* interface type */
-	u_char	sdl_nlen;	/* interface name length, no trailing 0 reqd. */
-	u_char	sdl_alen;	/* link level address length */
-	u_char	sdl_slen;	/* link layer selector length */
-	char	sdl_data[46];	/* minimum work area, can be larger;
-				   contains both if name and ll address */
-};
-
-#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen))
-
-#ifndef _KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void	link_addr(const char *, struct sockaddr_dl *);
-char	*link_ntoa(const struct sockaddr_dl *);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif
diff --git a/newlib/libc/sys/linux/include/net/if_gif.h b/newlib/libc/sys/linux/include/net/if_gif.h
deleted file mode 100644
index 4cffb08..0000000
--- a/newlib/libc/sys/linux/include/net/if_gif.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$FreeBSD: src/sys/net/if_gif.h,v 1.11 2002/03/24 09:34:04 bde Exp $	*/
-/*	$KAME: if_gif.h,v 1.17 2000/09/11 11:36:41 sumikawa Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * if_gif.h
- */
-
-#ifndef _NET_IF_GIF_H_
-#define _NET_IF_GIF_H_
-
-
-#ifdef _KERNEL
-#include "opt_inet.h"
-#include "opt_inet6.h"
-
-#include <netinet/in.h>
-/* xxx sigh, why route have struct route instead of pointer? */
-
-struct encaptab;
-
-extern	void (*ng_gif_input_p)(struct ifnet *ifp, struct mbuf **mp,
-		int af);
-extern	void (*ng_gif_input_orphan_p)(struct ifnet *ifp, struct mbuf *m,
-		int af);
-extern	int  (*ng_gif_output_p)(struct ifnet *ifp, struct mbuf **mp);
-extern	void (*ng_gif_attach_p)(struct ifnet *ifp);
-extern	void (*ng_gif_detach_p)(struct ifnet *ifp);
-
-struct gif_softc {
-	struct ifnet	gif_if;	   /* common area - must be at the top */
-	struct sockaddr	*gif_psrc; /* Physical src addr */
-	struct sockaddr	*gif_pdst; /* Physical dst addr */
-	union {
-		struct route  gifscr_ro;    /* xxx */
-#ifdef INET6
-		struct route_in6 gifscr_ro6; /* xxx */
-#endif
-	} gifsc_gifscr;
-	int		gif_flags;
-	const struct encaptab *encap_cookie4;
-	const struct encaptab *encap_cookie6;
-	void		*gif_netgraph;	/* ng_gif(4) netgraph node info */
-	LIST_ENTRY(gif_softc) gif_link; /* all gif's are linked */
-};
-
-#define gif_ro gifsc_gifscr.gifscr_ro
-#ifdef INET6
-#define gif_ro6 gifsc_gifscr.gifscr_ro6
-#endif
-
-#define GIF_MTU		(1280)	/* Default MTU */
-#define	GIF_MTU_MIN	(1280)	/* Minimum MTU */
-#define	GIF_MTU_MAX	(8192)	/* Maximum MTU */
-
-/* Prototypes */
-void gif_input(struct mbuf *, int, struct ifnet *);
-int gif_output(struct ifnet *, struct mbuf *, struct sockaddr *,
-	       struct rtentry *);
-int gif_ioctl(struct ifnet *, u_long, caddr_t);
-
-#endif /* _KERNEL */
-
-#endif /* _NET_IF_GIF_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_ieee80211.h b/newlib/libc/sys/linux/include/net/if_ieee80211.h
deleted file mode 100644
index 0757f9d..0000000
--- a/newlib/libc/sys/linux/include/net/if_ieee80211.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/*	$NetBSD: if_ieee80211.h,v 1.5 2000/07/21 04:47:40 onoe Exp $	*/
-/* $FreeBSD: src/sys/net/if_ieee80211.h,v 1.6 2002/04/11 05:43:10 imp Exp $ */
-
-#ifndef _NET_IF_IEEE80211_H_
-#define _NET_IF_IEEE80211_H_
-
-/*
- * generic definitions for IEEE 802.11 frames
- */
-struct ieee80211_frame {
-	u_int8_t	i_fc[2];
-	u_int8_t	i_dur[2];
-	u_int8_t	i_addr1[ETHER_ADDR_LEN];
-	u_int8_t	i_addr2[ETHER_ADDR_LEN];
-	u_int8_t	i_addr3[ETHER_ADDR_LEN];
-	u_int8_t	i_seq[2];
-	/* possibly followed by addr4[ETHER_ADDR_LEN]; */
-};
-
-#define	IEEE80211_FC0_VERSION_MASK		0x03
-#define	IEEE80211_FC0_VERSION_0			0x00
-#define	IEEE80211_FC0_TYPE_MASK			0x0c
-#define	IEEE80211_FC0_TYPE_MGT			0x00
-#define	IEEE80211_FC0_TYPE_CTL			0x04
-#define	IEEE80211_FC0_TYPE_DATA			0x08
-
-#define	IEEE80211_FC0_SUBTYPE_MASK		0xf0
-/* for TYPE_MGT */
-#define	IEEE80211_FC0_SUBTYPE_ASSOC_REQ		0x00
-#define	IEEE80211_FC0_SUBTYPE_ASSOC_RESP	0x10
-#define	IEEE80211_FC0_SUBTYPE_REASSOC_REQ	0x20
-#define	IEEE80211_FC0_SUBTYPE_REASSOC_RESP	0x30
-#define	IEEE80211_FC0_SUBTYPE_PROBE_REQ		0x40
-#define	IEEE80211_FC0_SUBTYPE_PROBE_RESP	0x50
-#define	IEEE80211_FC0_SUBTYPE_BEACON		0x80
-#define	IEEE80211_FC0_SUBTYPE_ATIM		0x90
-#define	IEEE80211_FC0_SUBTYPE_DISASSOC		0xa0
-#define	IEEE80211_FC0_SUBTYPE_AUTH		0xb0
-#define	IEEE80211_FC0_SUBTYPE_DEAUTH		0xc0
-/* for TYPE_CTL */
-#define	IEEE80211_FC0_SUBTYPE_PS_POLL		0xa0
-#define	IEEE80211_FC0_SUBTYPE_RTS		0xb0
-#define	IEEE80211_FC0_SUBTYPE_CTS		0xc0
-#define	IEEE80211_FC0_SUBTYPE_ACK		0xd0
-#define	IEEE80211_FC0_SUBTYPE_CF_END		0xe0
-#define	IEEE80211_FC0_SUBTYPE_CF_END_ACK	0xf0
-/* for TYPE_DATA (bit combination) */
-#define IEEE80211_FC0_SUBTYPE_DATA		0x00
-#define	IEEE80211_FC0_SUBTYPE_CF_ACK		0x10
-#define	IEEE80211_FC0_SUBTYPE_CF_POLL		0x20
-#define	IEEE80211_FC0_SUBTYPE_CF_ACPL		0x30
-#define	IEEE80211_FC0_SUBTYPE_NODATA		0x40
-#define	IEEE80211_FC0_SUBTYPE_CFACK		0x50
-#define	IEEE80211_FC0_SUBTYPE_CFPOLL		0x60
-#define	IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK	0x70
-
-#define	IEEE80211_FC1_DIR_MASK			0x03
-#define	IEEE80211_FC1_DIR_NODS			0x00	/* STA->STA */
-#define	IEEE80211_FC1_DIR_TODS			0x01	/* STA->AP  */
-#define	IEEE80211_FC1_DIR_FROMDS		0x02	/* AP ->STA */
-#define	IEEE80211_FC1_DIR_DSTODS		0x03	/* AP ->AP  */
-
-#define	IEEE80211_FC1_MORE_FRAG			0x04
-#define	IEEE80211_FC1_RETRY			0x08
-#define	IEEE80211_FC1_PWR_MGT			0x10
-#define	IEEE80211_FC1_MORE_DATA			0x20
-#define	IEEE80211_FC1_WEP			0x40
-#define	IEEE80211_FC1_ORDER			0x80
-
-#define	IEEE80211_NWID_LEN			32
-
-/*
- * BEACON management packets
- *
- *	octect timestamp[8]
- *	octect beacon interval[2]
- *	octect capability information[2]
- *	information element
- *		octect elemid
- *		octect length
- *		octect information[length[
- */
-typedef u_int8_t *	ieee80211_mgt_beacon_t;
-
-#define IEEE80211_BEACON_INTERVAL(beacon) \
-	(beacon[8] + (beacon[9] << 8))
-#define IEEE80211_BEACON_CAPABILITY(beacon) \
-	(beacon[10] + (beacon[11] << 8))
-
-#define	IEEE80211_CAPINFO_ESS			0x01
-#define	IEEE80211_CAPINFO_IBSS			0x02
-#define	IEEE80211_CAPINFO_CF_POLLABLE		0x04
-#define	IEEE80211_CAPINFO_CF_POLLREQ		0x08
-#define	IEEE80211_CAPINFO_PRIVACY		0x10
-
-
-/*
- * Management information elements
- */
-struct ieee80211_information {
-	char	ssid[IEEE80211_NWID_LEN+1];
-	struct rates {
-		u_int8_t 	*p;
-	} rates;
-	struct fh {
-		u_int16_t 	dwell;
-		u_int8_t 	set;
-		u_int8_t 	pattern;
-		u_int8_t 	index;
-	} fh;
-	struct ds {
-		u_int8_t	channel;
-	} ds;
-	struct cf {
-		u_int8_t	count;
-		u_int8_t	period;
-		u_int8_t	maxdur[2];
-		u_int8_t	dur[2];
-	} cf;
-	struct tim {
-		u_int8_t 	count;
-		u_int8_t 	period;
-		u_int8_t 	bitctl;
-		/* u_int8_t 	pvt[251]; The driver never needs to use this */
-	} tim;
-	struct ibss {
-	    	u_int16_t	atim;
-	} ibss;
-	struct challenge {
-		u_int8_t 	*p;
-		u_int8_t	len;
-	} challenge;
-};
-
-#define	IEEE80211_ELEMID_SSID			0
-#define	IEEE80211_ELEMID_RATES			1
-#define	IEEE80211_ELEMID_FHPARMS		2
-#define	IEEE80211_ELEMID_DSPARMS		3
-#define	IEEE80211_ELEMID_CFPARMS		4
-#define	IEEE80211_ELEMID_TIM			5
-#define	IEEE80211_ELEMID_IBSSPARMS		6
-#define	IEEE80211_ELEMID_CHALLENGE		16
-
-/*
- * AUTH management packets
- *
- *	octect algo[2]
- *	octect seq[2]
- *	octect status[2]
- *	octect chal.id
- *	octect chal.length
- *	octect chal.text[253]
- */
-typedef u_int8_t *	ieee80211_mgt_auth_t;
-
-#define IEEE80211_AUTH_ALGORITHM(auth) \
-    (auth[0] + (auth[1] << 8))
-#define IEEE80211_AUTH_TRANSACTION(auth) \
-    (auth[2] + (auth[3] << 8))
-#define IEEE80211_AUTH_STATUS(auth) \
-    (auth[4] + (auth[5] << 8))
-
-#define	IEEE80211_AUTH_ALG_OPEN			0x0000
-#define	IEEE80211_AUTH_ALG_SHARED		0x0001
-
-#define IEEE80211_AUTH_OPEN_REQUEST		1
-#define IEEE80211_AUTH_OPEN_RESPONSE		2
-
-#define IEEE80211_AUTH_SHARED_REQUEST		1
-#define IEEE80211_AUTH_SHARED_CHALLENGE		2
-#define IEEE80211_AUTH_SHARED_RESPONSE		3
-#define IEEE80211_AUTH_SHARED_PASS		4
-
-/*
- * Reason codes
- *
- * Unlisted codes are reserved
- */
-#define	IEEE80211_REASON_UNSPECIFIED		1
-#define	IEEE80211_REASON_AUTH_EXPIRE		2
-#define	IEEE80211_REASON_AUTH_LEAVE		3
-#define	IEEE80211_REASON_ASSOC_EXPIRE		4
-#define	IEEE80211_REASON_ASSOC_TOOMANY		5
-#define	IEEE80211_REASON_NOT_AUTHED		6  
-#define	IEEE80211_REASON_NOT_ASSOCED		7
-#define	IEEE80211_REASON_ASSOC_LEAVE		8
-#define	IEEE80211_REASON_ASSOC_NOT_AUTHED	9
-
-/*
- * Status code
- *
- * Unlisted codes are reserved
- */
-#define IEEE80211_STATUS_SUCCESS		0x0000
-#define	IEEE80211_STATUS_UNSPECIFIED		1
-#define	IEEE80211_STATUS_CAPINFO		10
-#define	IEEE80211_STATUS_NOT_ASSOCED		11
-#define	IEEE80211_STATUS_OTHER			12
-#define	IEEE80211_STATUS_ALG			13
-#define	IEEE80211_STATUS_SEQUENCE		14
-#define	IEEE80211_STATUS_CHALLENGE		15
-#define	IEEE80211_STATUS_TIMEOUT		16
-#define	IEEE80211_STATUS_TOO_MANY_STATIONS	17
-#define	IEEE80211_STATUS_RATES			18
-
-#define	IEEE80211_WEP_KEYLEN			5	/* 40bit */
-#define	IEEE80211_WEP_IVLEN			3	/* 24bit */
-#define	IEEE80211_WEP_KIDLEN			1	/* 1 octet */
-#define	IEEE80211_WEP_CRCLEN			4	/* CRC-32 */
-#define	IEEE80211_WEP_NKID			4	/* number of key ids */
-
-/* nwid is pointed at by ifr.ifr_data */
-struct ieee80211_nwid {
-	u_int8_t	i_len;
-	u_int8_t	i_nwid[IEEE80211_NWID_LEN];
-};
-
-#define	SIOCS80211NWID		_IOWR('i', 230, struct ifreq)
-#define	SIOCG80211NWID		_IOWR('i', 231, struct ifreq)
-
-/* the first member must be matched with struct ifreq */
-struct ieee80211_nwkey {
-	char		i_name[IFNAMSIZ];	/* if_name, e.g. "wi0" */
-	int		i_wepon;		/* wep enabled flag */
-	int		i_defkid;		/* default encrypt key id */
-	struct {
-		int		i_keylen;
-		u_int8_t	*i_keydat;
-	}		i_key[IEEE80211_WEP_NKID];
-};
-#define	SIOCS80211NWKEY		 _IOW('i', 232, struct ieee80211_nwkey)
-#define	SIOCG80211NWKEY		_IOWR('i', 233, struct ieee80211_nwkey)
-
-#define IEEE80211_WEP_NOSUP	-1
-#define IEEE80211_WEP_OFF	0
-#define IEEE80211_WEP_ON	1
-#define IEEE80211_WEP_MIXED	2
-
-#define IEEE80211_AUTH_NONE	0
-#define IEEE80211_AUTH_OPEN	1
-#define IEEE80211_AUTH_SHARED	2
-
-#define IEEE80211_POWERSAVE_NOSUP	-1
-#define IEEE80211_POWERSAVE_OFF		0
-#define IEEE80211_POWERSAVE_CAM		1
-#define IEEE80211_POWERSAVE_PSP		2
-#define IEEE80211_POWERSAVE_PSP_CAM	3
-#define IEEE80211_POWERSAVE_ON		IEEE80211_POWERSAVE_CAM
-
-/* the first member must be matched with struct ifreq */
-struct ieee80211req {
-	char		i_name[IFNAMSIZ];	/* if_name, e.g. "wi0" */
-	u_int16_t	i_type;			/* req type */
-	int16_t		i_val;			/* Index or simple value */
-	int16_t		i_len;			/* Index or simple value */
-	void		*i_data;		/* Extra data */
-};
-#define	SIOCS80211		 _IOW('i', 234, struct ieee80211req)
-#define	SIOCG80211		_IOWR('i', 235, struct ieee80211req)
-
-#define IEEE80211_IOC_SSID		1
-#define IEEE80211_IOC_NUMSSIDS		2
-#define IEEE80211_IOC_WEP		3
-#define IEEE80211_IOC_WEPKEY		4
-#define IEEE80211_IOC_NUMWEPKEYS	5
-#define IEEE80211_IOC_WEPTXKEY		6
-#define IEEE80211_IOC_AUTHMODE		7
-#define IEEE80211_IOC_STATIONNAME	8
-#define IEEE80211_IOC_CHANNEL		9
-#define IEEE80211_IOC_POWERSAVE		10
-#define IEEE80211_IOC_POWERSAVESLEEP	11
-
-#endif /* !_NET_IF_IEEE80211_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_llc.h b/newlib/libc/sys/linux/include/net/if_llc.h
deleted file mode 100644
index ec2b75b..0000000
--- a/newlib/libc/sys/linux/include/net/if_llc.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*	$NetBSD: if_llc.h,v 1.12 1999/11/19 20:41:19 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/if_llc.h,v 1.8 2002/03/29 06:58:45 mdodd Exp $
- */
-
-#ifndef _NET_IF_LLC_H_
-#define _NET_IF_LLC_H_
-
-/*
- * IEEE 802.2 Link Level Control headers, for use in conjunction with
- * 802.{3,4,5} media access control methods.
- *
- * Headers here do not use bit fields due to shortcommings in many
- * compilers.
- */
-
-struct llc {
-	u_int8_t llc_dsap;
-	u_int8_t llc_ssap;
-	union {
-	    struct {
-		u_int8_t control;
-		u_int8_t format_id;
-		u_int8_t class;
-		u_int8_t window_x2;
-	    } type_u __attribute__((__packed__));
-	    struct {
-		u_int8_t num_snd_x2;
-		u_int8_t num_rcv_x2;
-	    } type_i __attribute__((__packed__));
-	    struct {
-		u_int8_t control;
-		u_int8_t num_rcv_x2;
-	    } type_s __attribute__((__packed__));
-	    struct {
-	        u_int8_t control;
-		/*
-		 * We cannot put the following fields in a structure because
-		 * the structure rounding might cause padding.
-		 */
-		u_int8_t frmr_rej_pdu0;
-		u_int8_t frmr_rej_pdu1;
-		u_int8_t frmr_control;
-		u_int8_t frmr_control_ext;
-		u_int8_t frmr_cause;
-	    } type_frmr __attribute__((__packed__));
-	    struct {
-		u_int8_t  control;
-		u_int8_t  org_code[3];
-		u_int16_t ether_type;
-	    } type_snap __attribute__((__packed__));
-	    struct {
-		u_int8_t control;
-		u_int8_t control_ext;
-	    } type_raw __attribute__((__packed__));
-	} llc_un /* XXX __attribute__((__packed__)) ??? */;
-} __attribute__((__packed__));
-
-struct frmrinfo {
-	u_int8_t frmr_rej_pdu0;
-	u_int8_t frmr_rej_pdu1;
-	u_int8_t frmr_control;
-	u_int8_t frmr_control_ext;
-	u_int8_t frmr_cause;
-} __attribute__((__packed__));
-
-#define	llc_control		llc_un.type_u.control
-#define	llc_control_ext		llc_un.type_raw.control_ext
-#define	llc_fid			llc_un.type_u.format_id
-#define	llc_class		llc_un.type_u.class
-#define	llc_window		llc_un.type_u.window_x2
-#define	llc_frmrinfo 		llc_un.type_frmr.frmr_rej_pdu0
-#define	llc_frmr_pdu0		llc_un.type_frmr.frmr_rej_pdu0
-#define	llc_frmr_pdu1		llc_un.type_frmr.frmr_rej_pdu1
-#define	llc_frmr_control	llc_un.type_frmr.frmr_control
-#define	llc_frmr_control_ext	llc_un.type_frmr.frmr_control_ext
-#define	llc_frmr_cause		llc_un.type_frmr.frmr_cause
-#define	llc_snap		llc_un.type_snap
-
-/*
- * Don't use sizeof(struct llc_un) for LLC header sizes
- */
-#define LLC_ISFRAMELEN 4
-#define LLC_UFRAMELEN  3
-#define LLC_FRMRLEN    7
-#define LLC_SNAPFRAMELEN 8
-
-/*
- * Unnumbered LLC format commands
- */
-#define LLC_UI		0x3
-#define LLC_UI_P	0x13
-#define LLC_DISC	0x43
-#define	LLC_DISC_P	0x53
-#define LLC_UA		0x63
-#define LLC_UA_P	0x73
-#define LLC_TEST	0xe3
-#define LLC_TEST_P	0xf3
-#define LLC_FRMR	0x87
-#define	LLC_FRMR_P	0x97
-#define LLC_DM		0x0f
-#define	LLC_DM_P	0x1f
-#define LLC_XID		0xaf
-#define LLC_XID_P	0xbf
-#define LLC_SABME	0x6f
-#define LLC_SABME_P	0x7f
-
-/*
- * Supervisory LLC commands
- */
-#define	LLC_RR		0x01
-#define	LLC_RNR		0x05
-#define	LLC_REJ		0x09
-
-/*
- * Info format - dummy only
- */
-#define	LLC_INFO	0x00
-
-/*
- * ISO PDTR 10178 contains among others
- */
-#define LLC_X25_LSAP	0x7e
-#define LLC_SNAP_LSAP	0xaa
-#define LLC_ISO_LSAP	0xfe
-
-#endif /* _NET_IF_LLC_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_media.h b/newlib/libc/sys/linux/include/net/if_media.h
deleted file mode 100644
index 80599bd..0000000
--- a/newlib/libc/sys/linux/include/net/if_media.h
+++ /dev/null
@@ -1,409 +0,0 @@
-/*	$NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $	*/
-/* $FreeBSD: src/sys/net/if_media.h,v 1.17 2002/05/07 18:16:39 imp Exp $ */
-
-/*
- * Copyright (c) 1997
- *	Jonathan Stone and Jason R. Thorpe.  All rights reserved.
- *
- * This software is derived from information provided by Matt Thomas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Jonathan Stone
- *	and Jason R. Thorpe for the NetBSD Project.
- * 4. The names of the authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NET_IF_MEDIA_H_
-#define _NET_IF_MEDIA_H_
-
-/*
- * Prototypes and definitions for BSD/OS-compatible network interface
- * media selection.
- *
- * Where it is safe to do so, this code strays slightly from the BSD/OS
- * design.  Software which uses the API (device drivers, basically)
- * shouldn't notice any difference.
- *
- * Many thanks to Matt Thomas for providing the information necessary
- * to implement this interface.
- */
-
-#ifdef _KERNEL
-
-#include <sys/queue.h>
-
-/*
- * Driver callbacks for media status and change requests.
- */
-typedef	int (*ifm_change_cb_t)(struct ifnet *ifp);
-typedef	void (*ifm_stat_cb_t)(struct ifnet *ifp, struct ifmediareq *req);
-
-/*
- * In-kernel representation of a single supported media type.
- */
-struct ifmedia_entry {
-	LIST_ENTRY(ifmedia_entry) ifm_list;
-	int	ifm_media;	/* description of this media attachment */
-	int	ifm_data;	/* for driver-specific use */
-	void	*ifm_aux;	/* for driver-specific use */
-};
-
-/*
- * One of these goes into a network interface's softc structure.
- * It is used to keep general media state.
- */
-struct ifmedia {
-	int	ifm_mask;	/* mask of changes we don't care about */
-	int	ifm_media;	/* current user-set media word */
-	struct ifmedia_entry *ifm_cur;	/* currently selected media */
-	LIST_HEAD(, ifmedia_entry) ifm_list; /* list of all supported media */
-	ifm_change_cb_t	ifm_change;	/* media change driver callback */
-	ifm_stat_cb_t	ifm_status;	/* media status driver callback */
-};
-
-/* Initialize an interface's struct if_media field. */
-void	ifmedia_init(struct ifmedia *ifm, int dontcare_mask,
-	    ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback);
-
-/* Remove all mediums from a struct ifmedia.  */
-void	ifmedia_removeall( struct ifmedia *ifm);
-
-/* Add one supported medium to a struct ifmedia. */
-void	ifmedia_add(struct ifmedia *ifm, int mword, int data, void *aux);
-
-/* Add an array (of ifmedia_entry) media to a struct ifmedia. */
-void	ifmedia_list_add(struct ifmedia *mp, struct ifmedia_entry *lp,
-	    int count);
-
-/* Set default media type on initialization. */
-void	ifmedia_set(struct ifmedia *ifm, int mword);
-
-/* Common ioctl function for getting/setting media, called by driver. */
-int	ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr,
-	    struct ifmedia *ifm, u_long cmd);
-
-#endif /*_KERNEL */
-
-/*
- * if_media Options word:
- *	Bits	Use
- *	----	-------
- *	0-4	Media variant
- *	5-7	Media type
- *	8-15	Type specific options
- *	16-19	RFU
- *	20-27	Shared (global) options
- *	28-31	Instance
- */
-
-/*
- * Ethernet
- */
-#define	IFM_ETHER	0x00000020
-#define	IFM_10_T	3		/* 10BaseT - RJ45 */
-#define	IFM_10_2	4		/* 10Base2 - Thinnet */
-#define	IFM_10_5	5		/* 10Base5 - AUI */
-#define	IFM_100_TX	6		/* 100BaseTX - RJ45 */
-#define	IFM_100_FX	7		/* 100BaseFX - Fiber */
-#define	IFM_100_T4	8		/* 100BaseT4 - 4 pair cat 3 */
-#define	IFM_100_VG	9		/* 100VG-AnyLAN */
-#define	IFM_100_T2	10		/* 100BaseT2 */
-#define	IFM_1000_SX	11		/* 1000BaseSX - multi-mode fiber */
-#define	IFM_10_STP	12		/* 10BaseT over shielded TP */
-#define	IFM_10_FL	13		/* 10BaseFL - Fiber */
-#define	IFM_1000_LX	14		/* 1000baseLX - single-mode fiber */
-#define	IFM_1000_CX	15		/* 1000baseCX - 150ohm STP */
-#define	IFM_1000_T	16		/* 1000baseT - 4 pair cat 5 */
-#define	IFM_HPNA_1	17		/* HomePNA 1.0 (1Mb/s) */
-/* note 31 is the max! */
-
-#define	IFM_ETH_MASTER	0x00000100	/* master mode (1000baseT) */
-
-/*
- * Token ring
- */
-#define	IFM_TOKEN	0x00000040
-#define	IFM_TOK_STP4	3		/* Shielded twisted pair 4m - DB9 */
-#define	IFM_TOK_STP16	4		/* Shielded twisted pair 16m - DB9 */
-#define	IFM_TOK_UTP4	5		/* Unshielded twisted pair 4m - RJ45 */
-#define	IFM_TOK_UTP16	6		/* Unshielded twisted pair 16m - RJ45 */
-#define	IFM_TOK_STP100  7		/* Shielded twisted pair 100m - DB9 */
-#define	IFM_TOK_UTP100  8		/* Unshielded twisted pair 100m - RJ45 */
-#define	IFM_TOK_ETR	0x00000200	/* Early token release */
-#define	IFM_TOK_SRCRT	0x00000400	/* Enable source routing features */
-#define	IFM_TOK_ALLR	0x00000800	/* All routes / Single route bcast */
-#define	IFM_TOK_DTR	0x00002000	/* Dedicated token ring */
-#define	IFM_TOK_CLASSIC	0x00004000	/* Classic token ring */
-#define	IFM_TOK_AUTO	0x00008000	/* Automatic Dedicate/Classic token ring */
-
-/*
- * FDDI
- */
-#define	IFM_FDDI	0x00000060
-#define	IFM_FDDI_SMF	3		/* Single-mode fiber */
-#define	IFM_FDDI_MMF	4		/* Multi-mode fiber */
-#define	IFM_FDDI_UTP	5		/* CDDI / UTP */
-#define	IFM_FDDI_DA	0x00000100	/* Dual attach / single attach */
-
-/*
- * IEEE 802.11 Wireless
- */
-#define	IFM_IEEE80211	0x00000080
-#define	IFM_IEEE80211_FH1	3	/* Frequency Hopping 1Mbps */
-#define	IFM_IEEE80211_FH2	4	/* Frequency Hopping 2Mbps */
-#define	IFM_IEEE80211_DS1	5	/* Direct Sequence 1Mbps */
-#define	IFM_IEEE80211_DS2	6	/* Direct Sequence 2Mbps */
-#define	IFM_IEEE80211_DS5	7	/* Direct Sequence 5.5Mbps */
-#define	IFM_IEEE80211_DS11	8	/* Direct Sequence 11Mbps */
-#define	IFM_IEEE80211_DS22	9	/* Direct Sequence 22Mbps */
-#define	IFM_IEEE80211_ADHOC	0x00000100	/* Operate in Adhoc mode */
-#define	IFM_IEEE80211_HOSTAP	0x00000200	/* Operate in Host AP mode */
-#define	IFM_IEEE80211_IBSS	0x00000400	/* Operate in IBSS mode */
-#define	IFM_IEEE80211_IBSSMASTER 0x00000800	/* Operate as an IBSS master */
-
-/*
- * Shared media sub-types
- */
-#define	IFM_AUTO	0		/* Autoselect best media */
-#define	IFM_MANUAL	1		/* Jumper/dipswitch selects media */
-#define	IFM_NONE	2		/* Deselect all media */
-
-/*
- * Shared options
- */
-#define	IFM_FDX		0x00100000	/* Force full duplex */
-#define	IFM_HDX		0x00200000	/* Force half duplex */
-#define	IFM_FLAG0	0x01000000	/* Driver defined flag */
-#define	IFM_FLAG1	0x02000000	/* Driver defined flag */
-#define	IFM_FLAG2	0x04000000	/* Driver defined flag */
-#define	IFM_LOOP	0x08000000	/* Put hardware in loopback */
-
-/*
- * Masks
- */
-#define	IFM_NMASK	0x000000e0	/* Network type */
-#define	IFM_TMASK	0x0000001f	/* Media sub-type */
-#define	IFM_IMASK	0xf0000000	/* Instance */
-#define	IFM_ISHIFT	28		/* Instance shift */
-#define	IFM_OMASK	0x0000ff00	/* Type specific options */
-#define	IFM_GMASK	0x0ff00000	/* Global options */
-
-/*
- * Status bits
- */
-#define	IFM_AVALID	0x00000001	/* Active bit valid */
-#define	IFM_ACTIVE	0x00000002	/* Interface attached to working net */
-
-/*
- * Macros to extract various bits of information from the media word.
- */
-#define	IFM_TYPE(x)         ((x) & IFM_NMASK)
-#define	IFM_SUBTYPE(x)      ((x) & IFM_TMASK)
-#define	IFM_TYPE_OPTIONS(x) ((x) & IFM_OMASK)
-#define	IFM_INST(x)         (((x) & IFM_IMASK) >> IFM_ISHIFT)
-#define	IFM_OPTIONS(x)	((x) & (IFM_OMASK|IFM_GMASK))
-
-#define	IFM_INST_MAX	IFM_INST(IFM_IMASK)
-
-/*
- * Macro to create a media word.
- */
-#define	IFM_MAKEWORD(type, subtype, options, instance)			\
-	((type) | (subtype) | (options) | ((instance) << IFM_ISHIFT))
-
-/*
- * NetBSD extension not defined in the BSDI API.  This is used in various
- * places to get the canonical description for a given type/subtype.
- *
- * NOTE: all but the top-level type descriptions must contain NO whitespace!
- * Otherwise, parsing these in ifconfig(8) would be a nightmare.
- */
-struct ifmedia_description {
-	int	ifmt_word;		/* word value; may be masked */
-	const char *ifmt_string;	/* description */
-};
-
-#define	IFM_TYPE_DESCRIPTIONS {						\
-	{ IFM_ETHER,		"Ethernet" },				\
-	{ IFM_TOKEN,		"Token ring" },				\
-	{ IFM_FDDI,		"FDDI" },				\
-	{ IFM_IEEE80211,	"IEEE 802.11 Wireless Ethernet" },	\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_ETHERNET_DESCRIPTIONS {				\
-	{ IFM_10_T,	"10baseT/UTP" },				\
-	{ IFM_10_2,	"10base2/BNC" },				\
-	{ IFM_10_5,	"10base5/AUI" },				\
-	{ IFM_100_TX,	"100baseTX" },					\
-	{ IFM_100_FX,	"100baseFX" },					\
-	{ IFM_100_T4,	"100baseT4" },					\
-	{ IFM_100_VG,	"100baseVG" },					\
-	{ IFM_100_T2,	"100baseT2" },					\
-	{ IFM_10_STP,	"10baseSTP" },					\
-	{ IFM_10_FL,	"10baseFL" },					\
-	{ IFM_1000_SX,	"1000baseSX" },					\
-	{ IFM_1000_LX,	"1000baseLX" },					\
-	{ IFM_1000_CX,	"1000baseCX" },					\
-	{ IFM_1000_T,	"1000baseTX" },					\
-	{ IFM_1000_T,	"1000baseT" },					\
-	{ IFM_HPNA_1,	"homePNA" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_ETHERNET_ALIASES {					\
-	{ IFM_10_T,	"UTP" },					\
-	{ IFM_10_T,	"10UTP" },					\
-	{ IFM_10_2,	"BNC" },					\
-	{ IFM_10_2,	"10BNC" },					\
-	{ IFM_10_5,	"AUI" },					\
-	{ IFM_10_5,	"10AUI" },					\
-	{ IFM_100_TX,	"100TX" },					\
-	{ IFM_100_T4,	"100T4" },					\
-	{ IFM_100_VG,	"100VG" },					\
-	{ IFM_100_T2,	"100T2" },					\
-	{ IFM_10_STP,	"10STP" },					\
-	{ IFM_10_FL,	"10FL" },					\
-	{ IFM_1000_SX,	"1000SX" },					\
-	{ IFM_1000_LX,	"1000LX" },					\
-	{ IFM_1000_CX,	"1000CX" },					\
-	{ IFM_1000_T,	"1000TX" },					\
-	{ IFM_1000_T,	"1000T" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_ETHERNET_OPTION_DESCRIPTIONS {			\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_TOKENRING_DESCRIPTIONS {				\
-	{ IFM_TOK_STP4,	"DB9/4Mbit" },					\
-	{ IFM_TOK_STP16, "DB9/16Mbit" },				\
-	{ IFM_TOK_UTP4,	"UTP/4Mbit" },					\
-	{ IFM_TOK_UTP16, "UTP/16Mbit" },				\
-	{ IFM_TOK_STP100, "STP/100Mbit" },				\
-	{ IFM_TOK_UTP100, "UTP/100Mbit" },				\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_TOKENRING_ALIASES {					\
-	{ IFM_TOK_STP4,	"4STP" },					\
-	{ IFM_TOK_STP16, "16STP" },					\
-	{ IFM_TOK_UTP4,	"4UTP" },					\
-	{ IFM_TOK_UTP16, "16UTP" },					\
-	{ IFM_TOK_STP100, "100STP" },					\
-	{ IFM_TOK_UTP100, "100UTP" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_TOKENRING_OPTION_DESCRIPTIONS {			\
-	{ IFM_TOK_ETR,	"EarlyTokenRelease" },				\
-	{ IFM_TOK_SRCRT, "SourceRouting" },				\
-	{ IFM_TOK_ALLR,	"AllRoutes" },					\
-	{ IFM_TOK_DTR,	"Dedicated" },					\
-	{ IFM_TOK_CLASSIC,"Classic" },					\
-	{ IFM_TOK_AUTO,	" " },						\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_FDDI_DESCRIPTIONS {					\
-	{ IFM_FDDI_SMF, "Single-mode" },				\
-	{ IFM_FDDI_MMF, "Multi-mode" },					\
-	{ IFM_FDDI_UTP, "UTP" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_FDDI_ALIASES {					\
-	{ IFM_FDDI_SMF,	"SMF" },					\
-	{ IFM_FDDI_MMF,	"MMF" },					\
-	{ IFM_FDDI_UTP,	"CDDI" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS {				\
-	{ IFM_FDDI_DA, "Dual-attach" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_IEEE80211_DESCRIPTIONS {				\
-	{ IFM_IEEE80211_FH1, "FH/1Mbps" },				\
-	{ IFM_IEEE80211_FH2, "FH/2Mbps" },				\
-	{ IFM_IEEE80211_DS1, "DS/1Mbps" },				\
-	{ IFM_IEEE80211_DS2, "DS/2Mbps" },				\
-	{ IFM_IEEE80211_DS5, "DS/5.5Mbps" },				\
-	{ IFM_IEEE80211_DS11, "DS/11Mbps" },				\
-	{ IFM_IEEE80211_DS22, "DS/22Mbps" },				\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_IEEE80211_ALIASES {					\
-	{ IFM_IEEE80211_FH1, "FH1" },					\
-	{ IFM_IEEE80211_FH2, "FH2" },					\
-	{ IFM_IEEE80211_FH1, "FrequencyHopping/1Mbps" },		\
-	{ IFM_IEEE80211_FH2, "FrequencyHopping/2Mbps" },		\
-	{ IFM_IEEE80211_DS1, "DS1" },					\
-	{ IFM_IEEE80211_DS2, "DS2" },					\
-	{ IFM_IEEE80211_DS5, "DS5.5" },					\
-	{ IFM_IEEE80211_DS11, "DS11" },					\
-	{ IFM_IEEE80211_DS22, "DS22" },					\
-	{ IFM_IEEE80211_DS1, "DirectSequence/1Mbps" },			\
-	{ IFM_IEEE80211_DS2, "DirectSequence/2Mbps" },			\
-	{ IFM_IEEE80211_DS5, "DirectSequence/5.5Mbps" },		\
-	{ IFM_IEEE80211_DS11, "DirectSequence/11Mbps" },		\
-	{ IFM_IEEE80211_DS22, "DirectSequence/22Mbps" },		\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS {			\
-	{ IFM_IEEE80211_ADHOC, "adhoc" },				\
-	{ IFM_IEEE80211_HOSTAP, "hostap" },				\
-	{ IFM_IEEE80211_IBSS, "ibss" },					\
-	{ IFM_IEEE80211_IBSSMASTER, "ibss-master" },			\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_SHARED_DESCRIPTIONS {				\
-	{ IFM_AUTO,	"autoselect" },					\
-	{ IFM_MANUAL,	"manual" },					\
-	{ IFM_NONE,	"none" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_SHARED_ALIASES {					\
-	{ IFM_AUTO,	"auto" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SHARED_OPTION_DESCRIPTIONS {				\
-	{ IFM_FDX,	"full-duplex" },				\
-	{ IFM_HDX,	"half-duplex" },				\
-	{ IFM_FLAG0,	"flag0" },					\
-	{ IFM_FLAG1,	"flag1" },					\
-	{ IFM_FLAG2,	"flag2" },					\
-	{ IFM_LOOP,	"hw-loopback" },				\
-	{ 0, NULL },							\
-}
-
-#endif	/* _NET_IF_MEDIA_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_mib.h b/newlib/libc/sys/linux/include/net/if_mib.h
deleted file mode 100644
index b1a7bcf..0000000
--- a/newlib/libc/sys/linux/include/net/if_mib.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/net/if_mib.h,v 1.6 1999/08/28 00:48:19 peter Exp $
- */
-
-#ifndef _NET_IF_MIB_H
-#define	_NET_IF_MIB_H	1
-
-struct ifmibdata {
-	char	ifmd_name[IFNAMSIZ]; /* name of interface */
-	int	ifmd_pcount;	/* number of promiscuous listeners */
-	int	ifmd_flags;	/* interface flags */
-	int	ifmd_snd_len;	/* instantaneous length of send queue */
-	int	ifmd_snd_maxlen; /* maximum length of send queue */
-	int	ifmd_snd_drops;	/* number of drops in send queue */
-	int	ifmd_filler[4];	/* for future expansion */
-	struct	if_data ifmd_data; /* generic information and statistics */
-};
-
-/*
- * sysctl MIB tags at the net.link.generic level
- */
-#define	IFMIB_SYSTEM	1	/* non-interface-specific */
-#define	IFMIB_IFDATA	2	/* per-interface data table */
-
-/*
- * MIB tags for the various net.link.generic.ifdata tables
- */
-#define	IFDATA_GENERAL	1	/* generic stats for all kinds of ifaces */
-#define	IFDATA_LINKSPECIFIC	2 /* specific to the type of interface */
-
-/*
- * MIB tags at the net.link.generic.system level
- */
-#define	IFMIB_IFCOUNT	1	/* number of interfaces configured */
-
-/*
- * MIB tags as the net.link level
- * All of the other values are IFT_* names defined in if_types.h.
- */
-#define	NETLINK_GENERIC	0	/* functions not specific to a type of iface */
-
-/*
- * The reason why the IFDATA_LINKSPECIFIC stuff is not under the
- * net.link.<iftype> branches is twofold:
- *   1) It's easier to code this way, and doesn't require duplication.
- *   2) The fourth level under net.link.<iftype> is <pf>; that is to say,
- *	the net.link.<iftype> tree instruments the adaptation layers between
- *	<iftype> and a particular protocol family (e.g., net.link.ether.inet
- *	instruments ARP).  This does not really leave room for anything else
- *	that needs to have a well-known number.
- */
-
-/*
- * Link-specific MIB structures for various link types.
- */
-
-/* For IFT_ETHER, IFT_ISO88023, and IFT_STARLAN, as used by RFC 1650 */
-struct ifmib_iso_8802_3 {
-	u_int32_t	dot3StatsAlignmentErrors;
-	u_int32_t	dot3StatsFCSErrors;
-	u_int32_t	dot3StatsSingleCollisionFrames;
-	u_int32_t	dot3StatsMultipleCollisionFrames;
-	u_int32_t	dot3StatsSQETestErrors;
-	u_int32_t	dot3StatsDeferredTransmissions;
-	u_int32_t	dot3StatsLateCollisions;
-	u_int32_t	dot3StatsExcessiveCollisions;
-	u_int32_t	dot3StatsInternalMacTransmitErrors;
-	u_int32_t	dot3StatsCarrierSenseErrors;
-	u_int32_t	dot3StatsFrameTooLongs;
-	u_int32_t	dot3StatsInternalMacReceiveErrors;
-	u_int32_t	dot3StatsEtherChipSet;
-	/* Matt Thomas wants this one, not included in RFC 1650: */
-	u_int32_t	dot3StatsMissedFrames;
-
-	u_int32_t	dot3StatsCollFrequencies[16]; /* NB: index origin */
-
-	u_int32_t	dot3Compliance;
-#define	DOT3COMPLIANCE_STATS	1
-#define	DOT3COMPLIANCE_COLLS	2
-};
-
-/*
- * Chipset identifiers are normally part of the vendor's enterprise MIB.
- * However, we don't want to be trying to represent arbitrary-length
- * OBJECT IDENTIFIERs here (ick!), and the right value is not necessarily
- * obvious to the driver implementor.  So, we define our own identification
- * mechanism here, and let the agent writer deal with the translation.
- */
-#define	DOT3CHIPSET_VENDOR(x)	((x) >> 16)
-#define	DOT3CHIPSET_PART(x)	((x) & 0xffff)
-#define	DOT3CHIPSET(v,p)	(((v) << 16) + ((p) & 0xffff))
-
-/* Driver writers!  Add your vendors here! */
-enum dot3Vendors {
-	dot3VendorAMD = 1,
-	dot3VendorIntel = 2,
-	dot3VendorNational = 4,
-	dot3VendorFujitsu = 5,
-	dot3VendorDigital = 6,
-	dot3VendorWesternDigital = 7
-};
-
-/* Driver writers!  Add your chipsets here! */
-enum {
-	dot3ChipSetAMD7990 = 1,
-	dot3ChipSetAMD79900 = 2,
-	dot3ChipSetAMD79C940 = 3
-};
-
-enum {
-	dot3ChipSetIntel82586 = 1,
-	dot3ChipSetIntel82596 = 2,
-	dot3ChipSetIntel82557 = 3
-};
-
-enum {
-	dot3ChipSetNational8390 = 1,
-	dot3ChipSetNationalSonic = 2
-};
-
-enum {
-	dot3ChipSetFujitsu86950 = 1
-};
-
-enum {
-	dot3ChipSetDigitalDC21040 = 1,
-	dot3ChipSetDigitalDC21140 = 2,
-	dot3ChipSetDigitalDC21041 = 3,
-	dot3ChipSetDigitalDC21140A = 4,
-	dot3ChipSetDigitalDC21142 = 5
-};
-
-enum {
-	dot3ChipSetWesternDigital83C690 = 1,
-	dot3ChipSetWesternDigital83C790 = 2
-};
-/* END of Ethernet-link MIB stuff */
-
-/*
- * Put other types of interface MIBs here, or in interface-specific
- * header files if convenient ones already exist.
- */
-#endif /* _NET_IF_MIB_H */
diff --git a/newlib/libc/sys/linux/include/net/if_ppp.h b/newlib/libc/sys/linux/include/net/if_ppp.h
deleted file mode 100644
index 0d4b607..0000000
--- a/newlib/libc/sys/linux/include/net/if_ppp.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * if_ppp.h - Point-to-Point Protocol definitions.
- *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $FreeBSD: src/sys/net/if_ppp.h,v 1.14 1999/08/28 00:48:20 peter Exp $
- */
-
-#ifndef _IF_PPP_H_
-#define _IF_PPP_H_
-
-/* XXX this used to be self-contained. */
-#include <net/ppp_defs.h>
-#include <net/if.h>
-
-/*
- * Packet sizes
- */
-#define	PPP_MTU		1500	/* Default MTU (size of Info field) */
-#define PPP_MAXMRU	65000	/* Largest MRU we allow */
-#define PPP_MAXMTU	16384	/* Largest MTU we allow */
-
-/*
- * Bit definitions for flags.
- */
-#define SC_COMP_PROT	0x00000001	/* protocol compression (output) */
-#define SC_COMP_AC	0x00000002	/* header compression (output) */
-#define	SC_COMP_TCP	0x00000004	/* TCP (VJ) compression (output) */
-#define SC_NO_TCP_CCID	0x00000008	/* disable VJ connection-id comp. */
-#define SC_REJ_COMP_AC	0x00000010	/* reject adrs/ctrl comp. on input */
-#define SC_REJ_COMP_TCP	0x00000020	/* reject TCP (VJ) comp. on input */
-#define SC_CCP_OPEN	0x00000040	/* Look at CCP packets */
-#define SC_CCP_UP	0x00000080	/* May send/recv compressed packets */
-#define SC_DEBUG	0x00010000	/* enable debug messages */
-#define SC_LOG_INPKT	0x00020000	/* log contents of good pkts recvd */
-#define SC_LOG_OUTPKT	0x00040000	/* log contents of pkts sent */
-#define SC_LOG_RAWIN	0x00080000	/* log all chars received */
-#define SC_LOG_FLUSH	0x00100000	/* log all chars flushed */
-#define SC_RCV_B7_0	0x01000000	/* have rcvd char with bit 7 = 0 */
-#define SC_RCV_B7_1	0x02000000	/* have rcvd char with bit 7 = 1 */
-#define SC_RCV_EVNP	0x04000000	/* have rcvd char with even parity */
-#define SC_RCV_ODDP	0x08000000	/* have rcvd char with odd parity */
-#define	SC_MASK		0x0fff00ff	/* bits that user can change */
-
-/*
- * State bits in sc_flags, not changeable by user.
- */
-#define SC_TIMEOUT	0x00000400	/* timeout is currently pending */
-#define SC_VJ_RESET	0x00000800	/* need to reset VJ decomp */
-#define SC_COMP_RUN	0x00001000	/* compressor has been initiated */
-#define SC_DECOMP_RUN	0x00002000	/* decompressor has been initiated */
-#define SC_DC_ERROR	0x00004000	/* non-fatal decomp error detected */
-#define SC_DC_FERROR	0x00008000	/* fatal decomp error detected */
-#define SC_TBUSY	0x10000000	/* xmitter doesn't need a packet yet */
-#define SC_PKTLOST	0x20000000	/* have lost or dropped a packet */
-#define	SC_FLUSH	0x40000000	/* flush input until next PPP_FLAG */
-#define	SC_ESCAPED	0x80000000	/* saw a PPP_ESCAPE */
-
-/*
- * Ioctl definitions.
- */
-
-struct npioctl {
-    int		protocol;	/* PPP procotol, e.g. PPP_IP */
-    enum NPmode	mode;
-};
-
-/* Structure describing a CCP configuration option, for PPPIOCSCOMPRESS */
-struct ppp_option_data {
-	u_char	*ptr;
-	u_int	length;
-	int	transmit;
-};
-
-struct ifpppstatsreq {
-    char ifr_name[IFNAMSIZ];
-    struct ppp_stats stats;
-};
-
-struct ifpppcstatsreq {
-    char ifr_name[IFNAMSIZ];
-    struct ppp_comp_stats stats;
-};
-
-/*
- * Ioctl definitions.
- */
-
-#define	PPPIOCGFLAGS	_IOR('t', 90, int)	/* get configuration flags */
-#define	PPPIOCSFLAGS	_IOW('t', 89, int)	/* set configuration flags */
-#define	PPPIOCGASYNCMAP	_IOR('t', 88, int)	/* get async map */
-#define	PPPIOCSASYNCMAP	_IOW('t', 87, int)	/* set async map */
-#define	PPPIOCGUNIT	_IOR('t', 86, int)	/* get ppp unit number */
-#define	PPPIOCGRASYNCMAP _IOR('t', 85, int)	/* get receive async map */
-#define	PPPIOCSRASYNCMAP _IOW('t', 84, int)	/* set receive async map */
-#define	PPPIOCGMRU	_IOR('t', 83, int)	/* get max receive unit */
-#define	PPPIOCSMRU	_IOW('t', 82, int)	/* set max receive unit */
-#define	PPPIOCSMAXCID	_IOW('t', 81, int)	/* set VJ max slot ID */
-#define PPPIOCGXASYNCMAP _IOR('t', 80, ext_accm) /* get extended ACCM */
-#define PPPIOCSXASYNCMAP _IOW('t', 79, ext_accm) /* set extended ACCM */
-#define PPPIOCXFERUNIT	_IO('t', 78)		/* transfer PPP unit */
-#define PPPIOCSCOMPRESS	_IOW('t', 77, struct ppp_option_data)
-#define PPPIOCGNPMODE	_IOWR('t', 76, struct npioctl) /* get NP mode */
-#define PPPIOCSNPMODE	_IOW('t', 75, struct npioctl)  /* set NP mode */
-#define PPPIOCGIDLE	_IOR('t', 74, struct ppp_idle) /* get idle time */
-#define PPPIOCSPASS	_IOW('t', 71, struct bpf_program) /* set pass filter */
-#define PPPIOCSACTIVE	_IOW('t', 70, struct bpf_program) /* set active filt */
-
-/* PPPIOC[GS]MTU are alternatives to SIOC[GS]IFMTU, used under Ultrix */
-#define PPPIOCGMTU	_IOR('t', 73, int)	/* get interface MTU */
-#define PPPIOCSMTU	_IOW('t', 72, int)	/* set interface MTU */
-
-/*
- * These two are interface ioctls so that pppstats can do them on
- * a socket without having to open the serial device.
- */
-#define SIOCGPPPSTATS	_IOWR('i', 123, struct ifpppstatsreq)
-#define SIOCGPPPCSTATS	_IOWR('i', 122, struct ifpppcstatsreq)
-
-#if !defined(ifr_mtu)
-#define ifr_mtu	ifr_ifru.ifru_metric
-#endif
-
-#endif /* _IF_PPP_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_pppvar.h b/newlib/libc/sys/linux/include/net/if_pppvar.h
deleted file mode 100644
index b4380f4..0000000
--- a/newlib/libc/sys/linux/include/net/if_pppvar.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * if_pppvar.h - private structures and declarations for PPP.
- *
- * Copyright (c) 1994 The Australian National University.
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, provided that the above copyright
- * notice appears in all copies.  This software is provided without any
- * warranty, express or implied. The Australian National University
- * makes no representations about the suitability of this software for
- * any purpose.
- *
- * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
- * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
- * OR MODIFICATIONS.
- *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $FreeBSD: src/sys/net/if_pppvar.h,v 1.19 2002/03/24 09:34:04 bde Exp $
- */
-
-/*
- * Supported network protocols.  These values are used for
- * indexing sc_npmode.
- */
-#define NP_IP	0		/* Internet Protocol */
-#define NUM_NP	1		/* Number of NPs. */
-
-/*
- * Structure describing each ppp unit.
- */
-struct ppp_softc {
-	struct	ifnet sc_if;		/* network-visible interface */
-/*hi*/	u_int	sc_flags;		/* control/status bits; see if_ppp.h */
-	struct	callout_handle sc_ch;	/* Used for scheduling timeouts */
-	void	*sc_devp;		/* pointer to device-dep structure */
-	void	(*sc_start)(struct ppp_softc *);	/* start output proc */
-	void	(*sc_ctlp)(struct ppp_softc *); /* rcvd control pkt */
-	void	(*sc_relinq)(struct ppp_softc *); /* relinquish ifunit */
-	void	(*sc_setmtu)(struct ppp_softc *); /* set mtu */
-	short	sc_mru;			/* max receive unit */
-	pid_t	sc_xfer;		/* used in transferring unit */
-/*hi*/	struct	ifqueue sc_rawq;	/* received packets */
-/*net*/	struct	ifqueue sc_inq;		/* queue of input packets for daemon */
-/*net*/	struct	ifqueue sc_fastq;	/* interactive output packet q */
-	struct	mbuf *sc_npqueue;	/* output packets not to be sent yet */
-	struct	mbuf **sc_npqtail;	/* ptr to last next ptr in npqueue */
-	struct	pppstat sc_stats;	/* count of bytes/pkts sent/rcvd */
-	enum	NPmode sc_npmode[NUM_NP]; /* what to do with each NP */
-	struct	compressor *sc_xcomp;	/* transmit compressor */
-	void	*sc_xc_state;		/* transmit compressor state */
-	struct	compressor *sc_rcomp;	/* receive decompressor */
-	void	*sc_rc_state;		/* receive decompressor state */
-	time_t	sc_last_sent;		/* time (secs) last NP pkt sent */
-	time_t	sc_last_recv;		/* time (secs) last NP pkt rcvd */
-#ifdef PPP_FILTER
-	struct	bpf_program sc_pass_filt;   /* filter for packets to pass */
-	struct	bpf_program sc_active_filt; /* filter for "non-idle" packets */
-#endif /* PPP_FILTER */
-#ifdef	VJC
-	struct	slcompress *sc_comp; 	/* vjc control buffer */
-#endif
-
-	/* Device-dependent part for async lines. */
-	ext_accm sc_asyncmap;		/* async control character map */
-	u_long	sc_rasyncmap;		/* receive async control char map */
-	struct	mbuf *sc_outm;		/* mbuf chain currently being output */
-	struct	mbuf *sc_m;		/* pointer to input mbuf chain */
-	struct	mbuf *sc_mc;		/* pointer to current input mbuf */
-	char	*sc_mp;			/* ptr to next char in input mbuf */
-	short	sc_ilen;		/* length of input packet so far */
-	u_short	sc_fcs;			/* FCS so far (input) */
-	u_short	sc_outfcs;		/* FCS so far for output packet */
-	u_char	sc_rawin[16];		/* chars as received */
-	int	sc_rawin_count;		/* # in sc_rawin */
-};
-
-struct	ppp_softc *pppalloc(pid_t pid);
-void	pppdealloc(struct ppp_softc *sc);
-int	pppioctl(struct ppp_softc *sc, u_long cmd, caddr_t data, int flag,
-	    struct thread *td);
-int	pppoutput(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
-	    struct rtentry *rtp);
-void	ppp_restart(struct ppp_softc *sc);
-void	ppppktin(struct ppp_softc *sc, struct mbuf *m, int lost);
-struct	mbuf *ppp_dequeue(struct ppp_softc *sc);
diff --git a/newlib/libc/sys/linux/include/net/if_slvar.h b/newlib/libc/sys/linux/include/net/if_slvar.h
deleted file mode 100644
index 5f70089..0000000
--- a/newlib/libc/sys/linux/include/net/if_slvar.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_slvar.h	8.3 (Berkeley) 2/1/94
- *
- * $FreeBSD: src/sys/net/if_slvar.h,v 1.21 2001/10/27 20:31:24 dillon Exp $
- */
-
-#ifndef _NET_IF_SLVAR_H_
-#define _NET_IF_SLVAR_H_
-
-#include <sys/callout.h>
-
-/*
- * Definitions for SLIP interface data structures
- *
- * (This exists so programs like slstats can get at the definition
- *  of sl_softc.)
- */
-struct sl_softc {
-	struct	ifnet sc_if;		/* network-visible interface */
-	struct	ifqueue sc_fastq;	/* interactive output queue */
-	struct	tty *sc_ttyp;		/* pointer to tty structure */
-	struct	mbuf *sc_mbuf;		/* pointer to mbuf containing buffer */
-	u_char	*sc_mp;			/* pointer to next available buf char */
-	u_char	*sc_ep;			/* pointer to last available buf char */
-	u_char	*sc_buf;		/* input buffer */
-	u_int	sc_flags;		/* see below */
-	u_int	sc_escape;	/* =1 if last char input was FRAME_ESCAPE */
-	time_t	sc_lasttime;		/* last time a char arrived */
-	long	sc_abortcount;		/* number of abort escape chars */
-	time_t	sc_starttime;		/* time of first abort in window */
-	u_int	sc_keepalive;		/* time	to decide link hang */
-	u_int	sc_outfill;	/* time	to send	FRAME_END when output idle */
-					/*
-					 * Handles for scheduling outfill and
-					 * keepalive timeouts.
-					 */
-	struct	callout_handle	sc_ofhandle;
-	struct	callout_handle	sc_kahandle;
-	struct	slcompress sc_comp;	/* tcp compression data */
-	LIST_ENTRY(sl_softc) sl_next;
-	u_char	*bpfbuf;		/* hang buffer for bpf here */
-};
-
-/* internal flags */
-#define	SC_ERROR	0x0001		/* had an input error */
-#define	SC_OUTWAIT	0x0002		/* waiting for output fill */
-#define	SC_KEEPALIVE	0x0004		/* input keepalive */
-
-/* visible flags */
-#define	SC_COMPRESS	IFF_LINK0	/* compress TCP traffic */
-#define	SC_NOICMP	IFF_LINK1	/* suppress ICMP traffic */
-#define	SC_AUTOCOMP	IFF_LINK2	/* auto-enable TCP compression */
-
-
-#endif
diff --git a/newlib/libc/sys/linux/include/net/if_sppp.h b/newlib/libc/sys/linux/include/net/if_sppp.h
deleted file mode 100644
index 182651c..0000000
--- a/newlib/libc/sys/linux/include/net/if_sppp.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Defines for synchronous PPP/Cisco link level subroutines.
- *
- * Copyright (C) 1994 Cronyx Ltd.
- * Author: Serge Vakulenko, <vak@cronyx.ru>
- *
- * Heavily revamped to conform to RFC 1661.
- * Copyright (C) 1997, Joerg Wunsch.
- *
- * This software is distributed with NO WARRANTIES, not even the implied
- * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Authors grant any other persons or organizations permission to use
- * or modify this software as long as this message is kept with the software,
- * all derivative works or modified versions.
- *
- * From: Version 2.0, Fri Oct  6 20:39:21 MSK 1995
- *
- * $FreeBSD: src/sys/net/if_sppp.h,v 1.24 2001/12/30 20:42:29 joerg Exp $
- */
-
-#ifndef _NET_IF_SPPP_H_
-#define _NET_IF_SPPP_H_ 1
-
-#define IDX_LCP 0		/* idx into state table */
-
-struct slcp {
-	u_long	opts;		/* LCP options to send (bitfield) */
-	u_long  magic;          /* local magic number */
-	u_long	mru;		/* our max receive unit */
-	u_long	their_mru;	/* their max receive unit */
-	u_long	protos;		/* bitmask of protos that are started */
-	u_char  echoid;         /* id of last keepalive echo request */
-	/* restart max values, see RFC 1661 */
-	int	timeout;
-	int	max_terminate;
-	int	max_configure;
-	int	max_failure;
-};
-
-#define IDX_IPCP 1		/* idx into state table */
-#define IDX_IPV6CP 2		/* idx into state table */
-
-struct sipcp {
-	u_long	opts;		/* IPCP options to send (bitfield) */
-	u_int	flags;
-#define IPCP_HISADDR_SEEN 1	/* have seen his address already */
-#define IPCP_MYADDR_DYN   2	/* my address is dynamically assigned */
-#define IPCP_MYADDR_SEEN  4	/* have seen his address already */
-#ifdef notdef
-#define IPV6CP_MYIFID_DYN 8	/* my ifid is dynamically assigned */
-#endif
-#define IPV6CP_MYIFID_SEEN 0x10	/* have seen his ifid already */
-#define IPCP_VJ		0x20	/* can use VJ compression */
-	int	max_state;	/* VJ: Max-Slot-Id */
-	int	compress_cid;	/* VJ: Comp-Slot-Id */
-};
-
-#define AUTHNAMELEN	64
-#define AUTHKEYLEN	16
-
-struct sauth {
-	u_short	proto;			/* authentication protocol to use */
-	u_short	flags;
-#define AUTHFLAG_NOCALLOUT	1	/* do not require authentication on */
-					/* callouts */
-#define AUTHFLAG_NORECHALLENGE	2	/* do not re-challenge CHAP */
-	u_char	name[AUTHNAMELEN];	/* system identification name */
-	u_char	secret[AUTHKEYLEN];	/* secret password */
-	u_char	challenge[AUTHKEYLEN];	/* random challenge */
-};
-
-#define IDX_PAP		3
-#define IDX_CHAP	4
-
-#define IDX_COUNT (IDX_CHAP + 1) /* bump this when adding cp's! */
-
-/*
- * Don't change the order of this.  Ordering the phases this way allows
- * for a comparision of ``pp_phase >= PHASE_AUTHENTICATE'' in order to
- * know whether LCP is up.
- */
-enum ppp_phase {
-	PHASE_DEAD, PHASE_ESTABLISH, PHASE_TERMINATE,
-	PHASE_AUTHENTICATE, PHASE_NETWORK
-};
-
-#define PP_MTU          1500    /* default/minimal MRU */
-#define PP_MAX_MRU	2048	/* maximal MRU we want to negotiate */
-
-/*
- * This is a cut down struct sppp (see below) that can easily be
- * exported to/ imported from userland without the need to include
- * dozens of kernel-internal header files.  It is used by the
- * SPPPIO[GS]DEFS ioctl commands below.
- */
-struct sppp_parms {
-	enum ppp_phase pp_phase;	/* phase we're currently in */
-	int	enable_vj;		/* VJ header compression enabled */
-	int	enable_ipv6;		/*
-					 * Enable IPv6 negotiations -- only
-					 * needed since each IPv4 i/f auto-
-					 * matically gets an IPv6 address
-					 * assigned, so we can't use this as
-					 * a decision.
-					 */
-	struct slcp lcp;		/* LCP params */
-	struct sipcp ipcp;		/* IPCP params */
-	struct sipcp ipv6cp;		/* IPv6CP params */
-	struct sauth myauth;		/* auth params, i'm peer */
-	struct sauth hisauth;		/* auth params, i'm authenticator */
-};
-
-/*
- * Definitions to pass struct sppp_parms data down into the kernel
- * using the SIOC[SG]IFGENERIC ioctl interface.
- *
- * In order to use this, create a struct spppreq, fill in the cmd
- * field with SPPPIOGDEFS, and put the address of this structure into
- * the ifr_data portion of a struct ifreq.  Pass this struct to a
- * SIOCGIFGENERIC ioctl.  Then replace the cmd field by SPPPIOSDEFS,
- * modify the defs field as desired, and pass the struct ifreq now
- * to a SIOCSIFGENERIC ioctl.
- */
-
-#define SPPPIOGDEFS  ((caddr_t)(('S' << 24) + (1 << 16) +\
-	sizeof(struct sppp_parms)))
-#define SPPPIOSDEFS  ((caddr_t)(('S' << 24) + (2 << 16) +\
-	sizeof(struct sppp_parms)))
-
-struct spppreq {
-	int	cmd;
-	struct sppp_parms defs;
-};
-
-#ifdef _KERNEL
-struct sppp {
-	/* NB: pp_if _must_ be first */
-	struct  ifnet pp_if;    /* network interface data */
-	struct  ifqueue pp_fastq; /* fast output queue */
-	struct	ifqueue pp_cpq;	/* PPP control protocol queue */
-	struct  sppp *pp_next;  /* next interface in keepalive list */
-	u_int   pp_mode;        /* major protocol modes (cisco/ppp/...) */
-	u_int   pp_flags;       /* sub modes */
-	u_short pp_alivecnt;    /* keepalive packets counter */
-	u_short pp_loopcnt;     /* loopback detection counter */
-	u_long  pp_seq[IDX_COUNT];	/* local sequence number */
-	u_long  pp_rseq[IDX_COUNT];	/* remote sequence number */
-	enum ppp_phase pp_phase;	/* phase we're currently in */
-	int	state[IDX_COUNT];	/* state machine */
-	u_char  confid[IDX_COUNT];	/* id of last configuration request */
-	int	rst_counter[IDX_COUNT];	/* restart counter */
-	int	fail_counter[IDX_COUNT]; /* negotiation failure counter */
-	int	confflags;	/* administrative configuration flags */
-#define CONF_ENABLE_VJ    0x01	/* VJ header compression enabled */
-#define CONF_ENABLE_IPV6  0x02	/* IPv6 administratively enabled */
-	time_t	pp_last_recv;	/* time last packet has been received */
-	time_t	pp_last_sent;	/* time last packet has been sent */
-	struct callout_handle ch[IDX_COUNT]; /* per-proto and if callouts */
-	struct callout_handle pap_my_to_ch; /* PAP needs one more... */
-	struct slcp lcp;		/* LCP params */
-	struct sipcp ipcp;		/* IPCP params */
-	struct sipcp ipv6cp;		/* IPv6CP params */
-	struct sauth myauth;		/* auth params, i'm peer */
-	struct sauth hisauth;		/* auth params, i'm authenticator */
-	struct slcompress *pp_comp;	/* for VJ compression */
-	/*
-	 * These functions are filled in by sppp_attach(), and are
-	 * expected to be used by the lower layer (hardware) drivers
-	 * in order to communicate the (un)availability of the
-	 * communication link.  Lower layer drivers that are always
-	 * ready to communicate (like hardware HDLC) can shortcut
-	 * pp_up from pp_tls, and pp_down from pp_tlf.
-	 */
-	void	(*pp_up)(struct sppp *sp);
-	void	(*pp_down)(struct sppp *sp);
-	/*
-	 * These functions need to be filled in by the lower layer
-	 * (hardware) drivers if they request notification from the
-	 * PPP layer whether the link is actually required.  They
-	 * correspond to the tls and tlf actions.
-	 */
-	void	(*pp_tls)(struct sppp *sp);
-	void	(*pp_tlf)(struct sppp *sp);
-	/*
-	 * These (optional) functions may be filled by the hardware
-	 * driver if any notification of established connections
-	 * (currently: IPCP up) is desired (pp_con) or any internal
-	 * state change of the interface state machine should be
-	 * signaled for monitoring purposes (pp_chg).
-	 */
-	void	(*pp_con)(struct sppp *sp);
-	void	(*pp_chg)(struct sppp *sp, int new_state);
-	/* These two fields are for use by the lower layer */
-	void    *pp_lowerp;
-	int     pp_loweri;
-};
-
-/* bits for pp_flags */
-#define PP_KEEPALIVE    0x01    /* use keepalive protocol */
-				/* 0x04 was PP_TIMO */
-#define PP_CALLIN	0x08	/* we are being called */
-#define PP_NEEDAUTH	0x10	/* remote requested authentication */
-
-void sppp_attach (struct ifnet *ifp);
-void sppp_detach (struct ifnet *ifp);
-void sppp_input (struct ifnet *ifp, struct mbuf *m);
-int sppp_ioctl (struct ifnet *ifp, u_long cmd, void *data);
-struct mbuf *sppp_dequeue (struct ifnet *ifp);
-struct mbuf *sppp_pick(struct ifnet *ifp);
-int sppp_isempty (struct ifnet *ifp);
-void sppp_flush (struct ifnet *ifp);
-#endif
-
-#endif /* _NET_IF_SPPP_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_stf.h b/newlib/libc/sys/linux/include/net/if_stf.h
deleted file mode 100644
index 3dbc61a..0000000
--- a/newlib/libc/sys/linux/include/net/if_stf.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$FreeBSD: src/sys/net/if_stf.h,v 1.4 2002/04/19 04:46:21 suz Exp $	*/
-/*	$KAME: if_stf.h,v 1.5 2001/10/12 10:09:17 keiichi Exp $	*/
-
-/*
- * Copyright (C) 2000 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NET_IF_STF_H_
-#define _NET_IF_STF_H_
-
-void in_stf_input(struct mbuf *, int);
-
-#endif /* _NET_IF_STF_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_tap.h b/newlib/libc/sys/linux/include/net/if_tap.h
deleted file mode 100644
index 14a4a8f..0000000
--- a/newlib/libc/sys/linux/include/net/if_tap.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * BASED ON:
- * -------------------------------------------------------------------------
- *
- * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
- * Nottingham University 1987.
- */
-
-/*
- * $FreeBSD: src/sys/net/if_tap.h,v 1.1 2000/07/20 17:01:10 nsayer Exp $
- * $Id$
- */
-
-#ifndef _NET_IF_TAP_H_
-#define _NET_IF_TAP_H_
-
-/* refer to if_tapvar.h for the softc stuff */
-
-/* maximum receive packet size (hard limit) */
-#define	TAPMRU		16384
-
-struct tapinfo {
-	int	baudrate;	/* linespeed                 */
-	short	mtu;		/* maximum transmission unit */
-	u_char	type;		/* ethernet, tokenring, etc. */
-	u_char	dummy;		/* place holder              */
-};
-
-/* ioctl's for get/set debug */
-#define	TAPSDEBUG		_IOW('t', 90, int)
-#define	TAPGDEBUG		_IOR('t', 89, int)
-#define	TAPSIFINFO		_IOW('t', 91, struct tapinfo)
-#define	TAPGIFINFO		_IOR('t', 92, struct tapinfo)
-
-/* VMware ioctl's */
-#define VMIO_SIOCSIFFLAGS	_IO('V', 0)
-#define VMIO_SIOCSKEEP		_IO('V', 1)
-#define VMIO_SIOCSIFBR		_IO('V', 2)
-#define VMIO_SIOCSLADRF		_IO('V', 3)
-
-/* XXX -- unimplemented */
-#define VMIO_SIOCSETMACADDR	_IO('V', 4)
-
-/* XXX -- not used? */
-#define VMIO_SIOCPORT		_IO('V', 5)
-#define VMIO_SIOCBRIDGE		_IO('V', 6)
-#define VMIO_SIOCNETIF		_IO('V', 7)
-
-#endif /* !_NET_IF_TAP_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_tapvar.h b/newlib/libc/sys/linux/include/net/if_tapvar.h
deleted file mode 100644
index d131f08..0000000
--- a/newlib/libc/sys/linux/include/net/if_tapvar.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * BASED ON:
- * -------------------------------------------------------------------------
- *
- * Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
- * All rights reserved.
- *
- * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
- * Nottingham University 1987.
- */
-
-/*
- * $FreeBSD: src/sys/net/if_tapvar.h,v 1.4 2001/09/05 01:06:21 brooks Exp $
- * $Id$
- */
-
-#ifndef _NET_IF_TAPVAR_H_
-#define _NET_IF_TAPVAR_H_
-
-struct tap_softc {
-	struct arpcom	arpcom;			/* ethernet common data      */
-#define tap_if		arpcom.ac_if
-	struct resource	*tap_unit;		/* unit                      */
-
-	u_short		tap_flags;		/* misc flags                */
-#define	TAP_OPEN	(1 << 0)
-#define	TAP_INITED	(1 << 1)
-#define	TAP_RWAIT	(1 << 2)
-#define	TAP_ASYNC	(1 << 3)
-#define TAP_READY       (TAP_OPEN|TAP_INITED)
-#define	TAP_VMNET	(1 << 4)
-
-	u_int8_t 	ether_addr[ETHER_ADDR_LEN]; /* ether addr of the remote side */
-
-	pid_t		 tap_pid;		/* PID of process to open    */
-	struct sigio	*tap_sigio;		/* information for async I/O */
-	struct selinfo	 tap_rsel;		/* read select               */
-
-	SLIST_ENTRY(tap_softc)	tap_next;	/* next device in chain      */
-};
-
-#endif /* !_NET_IF_TAPVAR_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_tun.h b/newlib/libc/sys/linux/include/net/if_tun.h
deleted file mode 100644
index ed98e43..0000000
--- a/newlib/libc/sys/linux/include/net/if_tun.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: if_tun.h,v 1.5 1994/06/29 06:36:27 cgd Exp $	*/
-
-/*
- * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
- * Nottingham University 1987.
- *
- * This source may be freely distributed, however I would be interested
- * in any changes that are made.
- *
- * This driver takes packets off the IP i/f and hands them up to a
- * user process to have its wicked way with. This driver has it's
- * roots in a similar driver written by Phil Cockcroft (formerly) at
- * UCL. This driver is based much more on read/write/select mode of
- * operation though.
- *
- * $FreeBSD: src/sys/net/if_tun.h,v 1.17 2000/01/23 01:47:12 brian Exp $
- */
-
-#ifndef _NET_IF_TUN_H_
-#define _NET_IF_TUN_H_
-
-/* Refer to if_tunvar.h for the softc stuff */
-
-/* Maximum transmit packet size (default) */
-#define	TUNMTU		1500
-
-/* Maximum receive packet size (hard limit) */
-#define	TUNMRU		16384
-
-struct tuninfo {
-	int	baudrate;		/* linespeed */
-	short	mtu;			/* maximum transmission unit */
-	u_char	type;			/* ethernet, tokenring, etc. */
-	u_char	dummy;			/* place holder */
-};
-
-/* ioctl's for get/set debug */
-#define	TUNSDEBUG	_IOW('t', 90, int)
-#define	TUNGDEBUG	_IOR('t', 89, int)
-#define	TUNSIFINFO	_IOW('t', 91, struct tuninfo)
-#define	TUNGIFINFO	_IOR('t', 92, struct tuninfo)
-#define	TUNSLMODE	_IOW('t', 93, int)
-#define	TUNSIFMODE	_IOW('t', 94, int)
-#define	TUNSIFPID	_IO('t', 95)
-#define	TUNSIFHEAD	_IOW('t', 96, int)
-#define	TUNGIFHEAD	_IOR('t', 97, int)
-
-#endif /* !_NET_IF_TUN_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_tunvar.h b/newlib/libc/sys/linux/include/net/if_tunvar.h
deleted file mode 100644
index b85a25f..0000000
--- a/newlib/libc/sys/linux/include/net/if_tunvar.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/net/if_tunvar.h,v 1.9 2001/06/01 15:51:10 brian Exp $
- */
-
-#ifndef _NET_IF_TUNVAR_H_
-#define _NET_IF_TUNVAR_H_
-
-struct tun_softc {
-	u_short	tun_flags;		/* misc flags */
-#define	TUN_OPEN	0x0001
-#define	TUN_INITED	0x0002
-#define	TUN_RCOLL	0x0004
-#define	TUN_IASET	0x0008
-#define	TUN_DSTADDR	0x0010
-#define	TUN_LMODE	0x0020
-#define	TUN_RWAIT	0x0040
-#define	TUN_ASYNC	0x0080
-#define	TUN_IFHEAD	0x0100
-
-#define TUN_READY       (TUN_OPEN | TUN_INITED)
-
-	pid_t	tun_pid;		/* PID of process to open */
-	struct	ifnet tun_if;		/* the interface */
-	struct  sigio *tun_sigio;	/* information for async I/O */
-	struct	selinfo	tun_rsel;	/* read select */
-	struct	selinfo	tun_wsel;	/* write select (not used) */
-
-	struct	tun_softc *next;	/* Next softc in list */
-	struct	resource *r_unit;	/* resource allocated for this unit */
-};
-
-#endif /* !_NET_IF_TUNVAR_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_types.h b/newlib/libc/sys/linux/include/net/if_types.h
deleted file mode 100644
index e24d188..0000000
--- a/newlib/libc/sys/linux/include/net/if_types.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_types.h	8.3 (Berkeley) 4/28/95
- * $FreeBSD: src/sys/net/if_types.h,v 1.13 2001/04/04 14:18:57 yar Exp $
- * $NetBSD: if_types.h,v 1.16 2000/04/19 06:30:53 itojun Exp $
- */
-
-#ifndef _NET_IF_TYPES_H_
-#define _NET_IF_TYPES_H_
-
-/*
- * Interface types for benefit of parsing media address headers.
- * This list is derived from the SNMP list of ifTypes, originally
- * documented in RFC1573, now maintained as:
- *
- * 	ftp.isi.edu/in-notes/iana/assignments/smi-numbers
- */
-
-#define	IFT_OTHER	0x1		/* none of the following */
-#define	IFT_1822	0x2		/* old-style arpanet imp */
-#define	IFT_HDH1822	0x3		/* HDH arpanet imp */
-#define	IFT_X25DDN	0x4		/* x25 to imp */
-#define	IFT_X25		0x5		/* PDN X25 interface (RFC877) */
-#define	IFT_ETHER	0x6		/* Ethernet CSMA/CD */
-#define	IFT_ISO88023	0x7		/* CMSA/CD */
-#define	IFT_ISO88024	0x8		/* Token Bus */
-#define	IFT_ISO88025	0x9		/* Token Ring */
-#define	IFT_ISO88026	0xa		/* MAN */
-#define	IFT_STARLAN	0xb
-#define	IFT_P10		0xc		/* Proteon 10MBit ring */
-#define	IFT_P80		0xd		/* Proteon 80MBit ring */
-#define	IFT_HY		0xe		/* Hyperchannel */
-#define	IFT_FDDI	0xf
-#define	IFT_LAPB	0x10
-#define	IFT_SDLC	0x11
-#define	IFT_T1		0x12
-#define	IFT_CEPT	0x13		/* E1 - european T1 */
-#define	IFT_ISDNBASIC	0x14
-#define	IFT_ISDNPRIMARY	0x15
-#define	IFT_PTPSERIAL	0x16		/* Proprietary PTP serial */
-#define	IFT_PPP		0x17		/* RFC 1331 */
-#define	IFT_LOOP	0x18		/* loopback */
-#define	IFT_EON		0x19		/* ISO over IP */
-#define	IFT_XETHER	0x1a		/* obsolete 3MB experimental ethernet */
-#define	IFT_NSIP	0x1b		/* XNS over IP */
-#define	IFT_SLIP	0x1c		/* IP over generic TTY */
-#define	IFT_ULTRA	0x1d		/* Ultra Technologies */
-#define	IFT_DS3		0x1e		/* Generic T3 */
-#define	IFT_SIP		0x1f		/* SMDS */
-#define	IFT_FRELAY	0x20		/* Frame Relay DTE only */
-#define	IFT_RS232	0x21
-#define	IFT_PARA	0x22		/* parallel-port */
-#define	IFT_ARCNET	0x23
-#define	IFT_ARCNETPLUS	0x24
-#define	IFT_ATM		0x25		/* ATM cells */
-#define	IFT_MIOX25	0x26
-#define	IFT_SONET	0x27		/* SONET or SDH */
-#define	IFT_X25PLE	0x28
-#define	IFT_ISO88022LLC	0x29
-#define	IFT_LOCALTALK	0x2a
-#define	IFT_SMDSDXI	0x2b
-#define	IFT_FRELAYDCE	0x2c		/* Frame Relay DCE */
-#define	IFT_V35		0x2d
-#define	IFT_HSSI	0x2e
-#define	IFT_HIPPI	0x2f
-#define	IFT_MODEM	0x30		/* Generic Modem */
-#define	IFT_AAL5	0x31		/* AAL5 over ATM */
-#define	IFT_SONETPATH	0x32
-#define	IFT_SONETVT	0x33
-#define	IFT_SMDSICIP	0x34		/* SMDS InterCarrier Interface */
-#define	IFT_PROPVIRTUAL	0x35		/* Proprietary Virtual/internal */
-#define	IFT_PROPMUX	0x36		/* Proprietary Multiplexing */
-#define	IFT_IEEE80212		   0x37 /* 100BaseVG */
-#define	IFT_FIBRECHANNEL	   0x38 /* Fibre Channel */
-#define	IFT_HIPPIINTERFACE	   0x39 /* HIPPI interfaces	 */
-#define	IFT_FRAMERELAYINTERCONNECT 0x3a /* Obsolete, use either 0x20 or 0x2c */
-#define	IFT_AFLANE8023		   0x3b /* ATM Emulated LAN for 802.3 */
-#define	IFT_AFLANE8025		   0x3c /* ATM Emulated LAN for 802.5 */
-#define	IFT_CCTEMUL		   0x3d /* ATM Emulated circuit		  */
-#define	IFT_FASTETHER		   0x3e /* Fast Ethernet (100BaseT) */
-#define	IFT_ISDN		   0x3f /* ISDN and X.25	    */
-#define	IFT_V11			   0x40 /* CCITT V.11/X.21		*/
-#define	IFT_V36			   0x41 /* CCITT V.36			*/
-#define	IFT_G703AT64K		   0x42 /* CCITT G703 at 64Kbps */
-#define	IFT_G703AT2MB		   0x43 /* Obsolete see DS1-MIB */
-#define	IFT_QLLC		   0x44 /* SNA QLLC			*/
-#define	IFT_FASTETHERFX		   0x45 /* Fast Ethernet (100BaseFX)	*/
-#define	IFT_CHANNEL		   0x46 /* channel			*/
-#define	IFT_IEEE80211		   0x47 /* radio spread spectrum	*/
-#define	IFT_IBM370PARCHAN	   0x48 /* IBM System 360/370 OEMI Channel */
-#define	IFT_ESCON		   0x49 /* IBM Enterprise Systems Connection */
-#define	IFT_DLSW		   0x4a /* Data Link Switching */
-#define	IFT_ISDNS		   0x4b /* ISDN S/T interface */
-#define	IFT_ISDNU		   0x4c /* ISDN U interface */
-#define	IFT_LAPD		   0x4d /* Link Access Protocol D */
-#define	IFT_IPSWITCH		   0x4e /* IP Switching Objects */
-#define	IFT_RSRB		   0x4f /* Remote Source Route Bridging */
-#define	IFT_ATMLOGICAL		   0x50 /* ATM Logical Port */
-#define	IFT_DS0			   0x51 /* Digital Signal Level 0 */
-#define	IFT_DS0BUNDLE		   0x52 /* group of ds0s on the same ds1 */
-#define	IFT_BSC			   0x53 /* Bisynchronous Protocol */
-#define	IFT_ASYNC		   0x54 /* Asynchronous Protocol */
-#define	IFT_CNR			   0x55 /* Combat Net Radio */
-#define	IFT_ISO88025DTR		   0x56 /* ISO 802.5r DTR */
-#define	IFT_EPLRS		   0x57 /* Ext Pos Loc Report Sys */
-#define	IFT_ARAP		   0x58 /* Appletalk Remote Access Protocol */
-#define	IFT_PROPCNLS		   0x59 /* Proprietary Connectionless Protocol*/
-#define	IFT_HOSTPAD		   0x5a /* CCITT-ITU X.29 PAD Protocol */
-#define	IFT_TERMPAD		   0x5b /* CCITT-ITU X.3 PAD Facility */
-#define	IFT_FRAMERELAYMPI	   0x5c /* Multiproto Interconnect over FR */
-#define	IFT_X213		   0x5d /* CCITT-ITU X213 */
-#define	IFT_ADSL		   0x5e /* Asymmetric Digital Subscriber Loop */
-#define	IFT_RADSL		   0x5f /* Rate-Adapt. Digital Subscriber Loop*/
-#define	IFT_SDSL		   0x60 /* Symmetric Digital Subscriber Loop */
-#define	IFT_VDSL		   0x61 /* Very H-Speed Digital Subscrib. Loop*/
-#define	IFT_ISO88025CRFPINT	   0x62 /* ISO 802.5 CRFP */
-#define	IFT_MYRINET		   0x63 /* Myricom Myrinet */
-#define	IFT_VOICEEM		   0x64 /* voice recEive and transMit */
-#define	IFT_VOICEFXO		   0x65 /* voice Foreign Exchange Office */
-#define	IFT_VOICEFXS		   0x66 /* voice Foreign Exchange Station */
-#define	IFT_VOICEENCAP		   0x67 /* voice encapsulation */
-#define	IFT_VOICEOVERIP		   0x68 /* voice over IP encapsulation */
-#define	IFT_ATMDXI		   0x69 /* ATM DXI */
-#define	IFT_ATMFUNI		   0x6a /* ATM FUNI */
-#define	IFT_ATMIMA		   0x6b /* ATM IMA		      */
-#define	IFT_PPPMULTILINKBUNDLE	   0x6c /* PPP Multilink Bundle */
-#define	IFT_IPOVERCDLC		   0x6d /* IBM ipOverCdlc */
-#define	IFT_IPOVERCLAW		   0x6e /* IBM Common Link Access to Workstn */
-#define	IFT_STACKTOSTACK	   0x6f /* IBM stackToStack */
-#define	IFT_VIRTUALIPADDRESS	   0x70 /* IBM VIPA */
-#define	IFT_MPC			   0x71 /* IBM multi-protocol channel support */
-#define	IFT_IPOVERATM		   0x72 /* IBM ipOverAtm */
-#define	IFT_ISO88025FIBER	   0x73 /* ISO 802.5j Fiber Token Ring */
-#define	IFT_TDLC		   0x74 /* IBM twinaxial data link control */
-#define	IFT_GIGABITETHERNET	   0x75 /* Gigabit Ethernet */
-#define	IFT_HDLC		   0x76 /* HDLC */
-#define	IFT_LAPF		   0x77 /* LAP F */
-#define	IFT_V37			   0x78 /* V.37 */
-#define	IFT_X25MLP		   0x79 /* Multi-Link Protocol */
-#define	IFT_X25HUNTGROUP	   0x7a /* X25 Hunt Group */
-#define	IFT_TRANSPHDLC		   0x7b /* Transp HDLC */
-#define	IFT_INTERLEAVE		   0x7c /* Interleave channel */
-#define	IFT_FAST		   0x7d /* Fast channel */
-#define	IFT_IP			   0x7e /* IP (for APPN HPR in IP networks) */
-#define	IFT_DOCSCABLEMACLAYER	   0x7f /* CATV Mac Layer */
-#define	IFT_DOCSCABLEDOWNSTREAM	   0x80 /* CATV Downstream interface */
-#define	IFT_DOCSCABLEUPSTREAM	   0x81 /* CATV Upstream interface */
-#define	IFT_A12MPPSWITCH	   0x82	/* Avalon Parallel Processor */
-#define	IFT_TUNNEL		   0x83	/* Encapsulation interface */
-#define	IFT_COFFEE		   0x84	/* coffee pot */
-#define	IFT_CES			   0x85	/* Circiut Emulation Service */
-#define	IFT_ATMSUBINTERFACE	   0x86	/* (x)  ATM Sub Interface */
-#define	IFT_L2VLAN		   0x87	/* Layer 2 Virtual LAN using 802.1Q */
-#define	IFT_L3IPVLAN		   0x88	/* Layer 3 Virtual LAN - IP Protocol */
-#define	IFT_L3IPXVLAN		   0x89	/* Layer 3 Virtual LAN - IPX Prot. */
-#define	IFT_DIGITALPOWERLINE	   0x8a	/* IP over Power Lines */
-#define	IFT_MEDIAMAILOVERIP	   0x8b	/* (xxx)  Multimedia Mail over IP */
-#define	IFT_DTM			   0x8c	/* Dynamic synchronous Transfer Mode */
-#define	IFT_DCN			   0x8d	/* Data Communications Network */
-#define	IFT_IPFORWARD		   0x8e	/* IP Forwarding Interface */
-#define	IFT_MSDSL		   0x8f	/* Multi-rate Symmetric DSL */
-#define	IFT_IEEE1394		   0x90	/* IEEE1394 High Performance SerialBus*/
-#define	IFT_IFGSN		   0x91	/* HIPPI-6400 */
-#define	IFT_DVBRCCMACLAYER	   0x92	/* DVB-RCC MAC Layer */
-#define	IFT_DVBRCCDOWNSTREAM	   0x93	/* DVB-RCC Downstream Channel */
-#define	IFT_DVBRCCUPSTREAM	   0x94	/* DVB-RCC Upstream Channel */
-#define	IFT_ATMVIRTUAL		   0x95	/* ATM Virtual Interface */
-#define	IFT_MPLSTUNNEL		   0x96	/* MPLS Tunnel Virtual Interface */
-#define	IFT_SRP			   0x97	/* Spatial Reuse Protocol */
-#define	IFT_VOICEOVERATM	   0x98	/* Voice over ATM */
-#define	IFT_VOICEOVERFRAMERELAY	   0x99	/* Voice Over Frame Relay */
-#define	IFT_IDSL		   0x9a	/* Digital Subscriber Loop over ISDN */
-#define	IFT_COMPOSITELINK	   0x9b	/* Avici Composite Link Interface */
-#define	IFT_SS7SIGLINK		   0x9c	/* SS7 Signaling Link */
-#define	IFT_PROPWIRELESSP2P	   0x9d	/* Prop. P2P wireless interface */
-#define	IFT_FRFORWARD		   0x9e	/* Frame forward Interface */
-#define	IFT_RFC1483		   0x9f	/* Multiprotocol over ATM AAL5 */
-#define	IFT_USB			   0xa0	/* USB Interface */
-#define	IFT_IEEE8023ADLAG	   0xa1	/* IEEE 802.3ad Link Aggregate*/
-#define	IFT_BGPPOLICYACCOUNTING	   0xa2	/* BGP Policy Accounting */
-#define	IFT_FRF16MFRBUNDLE	   0xa3	/* FRF.16 Multilik Frame Relay*/
-#define	IFT_H323GATEKEEPER	   0xa4	/* H323 Gatekeeper */
-#define	IFT_H323PROXY		   0xa5	/* H323 Voice and Video Proxy */
-#define	IFT_MPLS		   0xa6	/* MPLS */
-#define	IFT_MFSIGLINK		   0xa7	/* Multi-frequency signaling link */
-#define	IFT_HDSL2		   0xa8	/* High Bit-Rate DSL, 2nd gen. */
-#define	IFT_SHDSL		   0xa9	/* Multirate HDSL2 */
-#define	IFT_DS1FDL		   0xaa	/* Facility Data Link (4Kbps) on a DS1*/
-#define	IFT_POS			   0xab	/* Packet over SONET/SDH Interface */
-#define	IFT_DVBASILN		   0xac	/* DVB-ASI Input */
-#define	IFT_DVBASIOUT		   0xad	/* DVB-ASI Output */
-#define	IFT_PLC			   0xae	/* Power Line Communications */
-#define	IFT_NFAS		   0xaf	/* Non-Facility Associated Signaling */
-#define	IFT_TR008		   0xb0	/* TROO8 */
-#define	IFT_GR303RDT		   0xb1	/* Remote Digital Terminal */
-#define	IFT_GR303IDT		   0xb2	/* Integrated Digital Terminal */
-#define	IFT_ISUP		   0xb3	/* ISUP */
-#define	IFT_PROPDOCSWIRELESSMACLAYER	   0xb4	/* prop/Wireless MAC Layer */
-#define	IFT_PROPDOCSWIRELESSDOWNSTREAM	   0xb5	/* prop/Wireless Downstream */
-#define	IFT_PROPDOCSWIRELESSUPSTREAM	   0xb6	/* prop/Wireless Upstream */
-#define	IFT_HIPERLAN2		   0xb7	/* HIPERLAN Type 2 Radio Interface */
-#define	IFT_PROPBWAP2MP		   0xb8	/* PropBroadbandWirelessAccess P2MP*/
-#define	IFT_SONETOVERHEADCHANNEL   0xb9	/* SONET Overhead Channel */
-#define	IFT_DIGITALWRAPPEROVERHEADCHANNEL  0xba	/* Digital Wrapper Overhead */
-#define	IFT_AAL2		   0xbb	/* ATM adaptation layer 2 */
-#define	IFT_RADIOMAC		   0xbc	/* MAC layer over radio links */
-#define	IFT_ATMRADIO		   0xbd	/* ATM over radio links */
-#define	IFT_IMT			   0xbe /* Inter-Machine Trunks */
-#define	IFT_MVL			   0xbf /* Multiple Virtual Lines DSL */
-#define	IFT_REACHDSL		   0xc0 /* Long Reach DSL */
-#define	IFT_FRDLCIENDPT		   0xc1 /* Frame Relay DLCI End Point */
-#define	IFT_ATMVCIENDPT		   0xc2 /* ATM VCI End Point */
-#define	IFT_OPTICALCHANNEL	   0xc3 /* Optical Channel */
-#define	IFT_OPTICALTRANSPORT	   0xc4 /* Optical Transport */
-
-/* not based on IANA assignments */
-#define	IFT_GIF		0xf0
-#define	IFT_PVC		0xf1
-#define	IFT_FAITH	0xf2
-#define	IFT_STF		0xf3
-#endif /* !_NET_IF_TYPES_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_var.h b/newlib/libc/sys/linux/include/net/if_var.h
deleted file mode 100644
index cc53626..0000000
--- a/newlib/libc/sys/linux/include/net/if_var.h
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/if_var.h,v 1.46 2002/05/07 18:11:55 imp Exp $
- */
-
-#ifndef	_NET_IF_VAR_H_
-#define	_NET_IF_VAR_H_
-
-/*
- * Structures defining a network interface, providing a packet
- * transport mechanism (ala level 0 of the PUP protocols).
- *
- * Each interface accepts output datagrams of a specified maximum
- * length, and provides higher level routines with input datagrams
- * received from its medium.
- *
- * Output occurs when the routine if_output is called, with three parameters:
- *	(*ifp->if_output)(ifp, m, dst, rt)
- * Here m is the mbuf chain to be sent and dst is the destination address.
- * The output routine encapsulates the supplied datagram if necessary,
- * and then transmits it on its medium.
- *
- * On input, each interface unwraps the data received by it, and either
- * places it on the input queue of a internetwork datagram routine
- * and posts the associated software interrupt, or passes the datagram to a raw
- * packet input routine.
- *
- * Routines exist for locating interfaces by their addresses
- * or for locating a interface on a certain network, as well as more general
- * routing and gateway routines maintaining information used to locate
- * interfaces.  These routines live in the files if.c and route.c
- */
-
-#ifdef __STDC__
-/*
- * Forward structure declarations for function prototypes [sic].
- */
-struct	mbuf;
-struct	thread;
-struct	rtentry;
-struct	rt_addrinfo;
-struct	socket;
-struct	ether_header;
-#endif
-
-#include <sys/queue.h>		/* get TAILQ macros */
-
-#ifdef _KERNEL
-#include <sys/mbuf.h>
-#include <sys/systm.h>		/* XXX */
-#endif /* _KERNEL */
-#include <sys/lock.h>		/* XXX */
-#include <sys/mutex.h>		/* XXX */
-#include <sys/event.h>		/* XXX */
-
-TAILQ_HEAD(ifnethead, ifnet);	/* we use TAILQs so that the order of */
-TAILQ_HEAD(ifaddrhead, ifaddr);	/* instantiation is preserved in the list */
-TAILQ_HEAD(ifprefixhead, ifprefix);
-TAILQ_HEAD(ifmultihead, ifmultiaddr);
-
-/*
- * Structure defining a queue for a network interface.
- */
-struct	ifqueue {
-	struct	mbuf *ifq_head;
-	struct	mbuf *ifq_tail;
-	int	ifq_len;
-	int	ifq_maxlen;
-	int	ifq_drops;
-	struct	mtx ifq_mtx;
-};
-
-/*
- * Structure defining a network interface.
- *
- * (Would like to call this struct ``if'', but C isn't PL/1.)
- */
-
-/*
- * NB: For FreeBSD, it is assumed that each NIC driver's softc starts with
- * one of these structures, typically held within an arpcom structure.
- *
- *	struct <foo>_softc {
- *		struct arpcom {
- *			struct  ifnet ac_if;
- *			...
- *		} <arpcom> ;
- *		...
- *	};
- *
- * The assumption is used in a number of places, including many
- * files in sys/net, device drivers, and sys/dev/mii.c:miibus_attach().
- *
- * Unfortunately devices' softc are opaque, so we depend on this layout
- * to locate the struct ifnet from the softc in the generic code.
- * 
- */
-struct ifnet {
-	void	*if_softc;		/* pointer to driver state */
-	char	*if_name;		/* name, e.g. ``en'' or ``lo'' */
-	TAILQ_ENTRY(ifnet) if_link; 	/* all struct ifnets are chained */
-	struct	ifaddrhead if_addrhead;	/* linked list of addresses per if */
-	struct	klist if_klist;		/* events attached to this if */
-	int	if_pcount;		/* number of promiscuous listeners */
-	struct	bpf_if *if_bpf;		/* packet filter structure */
-	u_short	if_index;		/* numeric abbreviation for this if  */
-	short	if_unit;		/* sub-unit for lower level driver */
-	short	if_timer;		/* time 'til if_watchdog called */
-	short	if_flags;		/* up/down, broadcast, etc. */
-	int	if_capabilities;	/* interface capabilities */
-	int	if_capenable;		/* enabled features */
-	int	if_ipending;		/* interrupts pending */
-	void	*if_linkmib;		/* link-type-specific MIB data */
-	size_t	if_linkmiblen;		/* length of above data */
-	struct	if_data if_data;
-	struct	ifmultihead if_multiaddrs; /* multicast addresses configured */
-	int	if_amcount;		/* number of all-multicast requests */
-/* procedure handles */
-	int	(*if_output)		/* output routine (enqueue) */
-		(struct ifnet *, struct mbuf *, struct sockaddr *,
-		     struct rtentry *);
-	void	(*if_start)		/* initiate output routine */
-		(struct ifnet *);
-	int	(*if_done)		/* output complete routine */
-		(struct ifnet *);	/* (XXX not used; fake prototype) */
-	int	(*if_ioctl)		/* ioctl routine */
-		(struct ifnet *, u_long, caddr_t);
-	void	(*if_watchdog)		/* timer routine */
-		(struct ifnet *);
-	int	(*if_poll_recv)		/* polled receive routine */
-		(struct ifnet *, int *);
-	int	(*if_poll_xmit)		/* polled transmit routine */
-		(struct ifnet *, int *);
-	void	(*if_poll_intren)	/* polled interrupt reenable routine */
-		(struct ifnet *);
-	void	(*if_poll_slowinput)	/* input routine for slow devices */
-		(struct ifnet *, struct mbuf *);
-	void	(*if_init)		/* Init routine */
-		(void *);
-	int	(*if_resolvemulti)	/* validate/resolve multicast */
-		(struct ifnet *, struct sockaddr **, struct sockaddr *);
-	struct	ifqueue if_snd;		/* output queue */
-	struct	ifqueue *if_poll_slowq;	/* input queue for slow devices */
-	struct	ifprefixhead if_prefixhead; /* list of prefixes per if */
-	u_int8_t *if_broadcastaddr;	/* linklevel broadcast bytestring */
-};
-
-typedef void if_init_f_t(void *);
-
-#define	if_mtu		if_data.ifi_mtu
-#define	if_type		if_data.ifi_type
-#define if_physical	if_data.ifi_physical
-#define	if_addrlen	if_data.ifi_addrlen
-#define	if_hdrlen	if_data.ifi_hdrlen
-#define	if_metric	if_data.ifi_metric
-#define	if_baudrate	if_data.ifi_baudrate
-#define	if_hwassist	if_data.ifi_hwassist
-#define	if_ipackets	if_data.ifi_ipackets
-#define	if_ierrors	if_data.ifi_ierrors
-#define	if_opackets	if_data.ifi_opackets
-#define	if_oerrors	if_data.ifi_oerrors
-#define	if_collisions	if_data.ifi_collisions
-#define	if_ibytes	if_data.ifi_ibytes
-#define	if_obytes	if_data.ifi_obytes
-#define	if_imcasts	if_data.ifi_imcasts
-#define	if_omcasts	if_data.ifi_omcasts
-#define	if_iqdrops	if_data.ifi_iqdrops
-#define	if_noproto	if_data.ifi_noproto
-#define	if_lastchange	if_data.ifi_lastchange
-#define if_recvquota	if_data.ifi_recvquota
-#define	if_xmitquota	if_data.ifi_xmitquota
-#define if_rawoutput(if, m, sa) if_output(if, m, sa, (struct rtentry *)0)
-
-/* for compatibility with other BSDs */
-#define	if_addrlist	if_addrhead
-#define	if_list		if_link
-
-/*
- * Bit values in if_ipending
- */
-#define	IFI_RECV	1	/* I want to receive */
-#define	IFI_XMIT	2	/* I want to transmit */
-
-/*
- * Output queues (ifp->if_snd) and slow device input queues (*ifp->if_slowq)
- * are queues of messages stored on ifqueue structures
- * (defined above).  Entries are added to and deleted from these structures
- * by these macros, which should be called with ipl raised to splimp().
- */
-#define IF_LOCK(ifq)		mtx_lock(&(ifq)->ifq_mtx)
-#define IF_UNLOCK(ifq)		mtx_unlock(&(ifq)->ifq_mtx)
-#define	_IF_QFULL(ifq)		((ifq)->ifq_len >= (ifq)->ifq_maxlen)
-#define	_IF_DROP(ifq)		((ifq)->ifq_drops++)
-#define	_IF_QLEN(ifq)		((ifq)->ifq_len)
-
-#define	_IF_ENQUEUE(ifq, m) do { 				\
-	(m)->m_nextpkt = NULL;					\
-	if ((ifq)->ifq_tail == NULL) 				\
-		(ifq)->ifq_head = m; 				\
-	else 							\
-		(ifq)->ifq_tail->m_nextpkt = m; 		\
-	(ifq)->ifq_tail = m; 					\
-	(ifq)->ifq_len++; 					\
-} while (0)
-
-#define IF_ENQUEUE(ifq, m) do {					\
-	IF_LOCK(ifq); 						\
-	_IF_ENQUEUE(ifq, m); 					\
-	IF_UNLOCK(ifq); 					\
-} while (0)
-
-#define	_IF_PREPEND(ifq, m) do {				\
-	(m)->m_nextpkt = (ifq)->ifq_head; 			\
-	if ((ifq)->ifq_tail == NULL) 				\
-		(ifq)->ifq_tail = (m); 				\
-	(ifq)->ifq_head = (m); 					\
-	(ifq)->ifq_len++; 					\
-} while (0)
-
-#define IF_PREPEND(ifq, m) do {		 			\
-	IF_LOCK(ifq); 						\
-	_IF_PREPEND(ifq, m); 					\
-	IF_UNLOCK(ifq); 					\
-} while (0)
-
-#define	_IF_DEQUEUE(ifq, m) do { 				\
-	(m) = (ifq)->ifq_head; 					\
-	if (m) { 						\
-		if (((ifq)->ifq_head = (m)->m_nextpkt) == 0) 	\
-			(ifq)->ifq_tail = NULL; 		\
-		(m)->m_nextpkt = NULL; 				\
-		(ifq)->ifq_len--; 				\
-	} 							\
-} while (0)
-
-#define IF_DEQUEUE(ifq, m) do { 				\
-	IF_LOCK(ifq); 						\
-	_IF_DEQUEUE(ifq, m); 					\
-	IF_UNLOCK(ifq); 					\
-} while (0)
-
-#define IF_DRAIN(ifq) do { 					\
-	struct mbuf *m; 					\
-	IF_LOCK(ifq); 						\
-	for (;;) { 						\
-		_IF_DEQUEUE(ifq, m); 				\
-		if (m == NULL) 					\
-			break; 					\
-		m_freem(m); 					\
-	} 							\
-	IF_UNLOCK(ifq); 					\
-} while (0)
-
-#ifdef _KERNEL
-#define	IF_HANDOFF(ifq, m, ifp)			if_handoff(ifq, m, ifp, 0)
-#define	IF_HANDOFF_ADJ(ifq, m, ifp, adj)	if_handoff(ifq, m, ifp, adj)
-
-static __inline int
-if_handoff(struct ifqueue *ifq, struct mbuf *m, struct ifnet *ifp, int adjust)
-{
-	int active = 0;
-
-	IF_LOCK(ifq);
-	if (_IF_QFULL(ifq)) {
-		_IF_DROP(ifq);
-		IF_UNLOCK(ifq);
-		m_freem(m);
-		return (0);
-	}
-	if (ifp != NULL) {
-		ifp->if_obytes += m->m_pkthdr.len + adjust;
-		if (m->m_flags & M_MCAST)
-			ifp->if_omcasts++;
-		active = ifp->if_flags & IFF_OACTIVE;
-	}
-	_IF_ENQUEUE(ifq, m);
-	IF_UNLOCK(ifq);
-	if (ifp != NULL && !active)
-		(*ifp->if_start)(ifp);
-	return (1);
-}
-
-/*
- * 72 was chosen below because it is the size of a TCP/IP
- * header (40) + the minimum mss (32).
- */
-#define	IF_MINMTU	72
-#define	IF_MAXMTU	65535
-
-#endif /* _KERNEL */
-
-/*
- * The ifaddr structure contains information about one address
- * of an interface.  They are maintained by the different address families,
- * are allocated and attached when an address is set, and are linked
- * together so all addresses for an interface can be located.
- */
-struct ifaddr {
-	struct	sockaddr *ifa_addr;	/* address of interface */
-	struct	sockaddr *ifa_dstaddr;	/* other end of p-to-p link */
-#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
-	struct	sockaddr *ifa_netmask;	/* used to determine subnet */
-	struct	if_data if_data;	/* not all members are meaningful */
-	struct	ifnet *ifa_ifp;		/* back-pointer to interface */
-	TAILQ_ENTRY(ifaddr) ifa_link;	/* queue macro glue */
-	void	(*ifa_rtrequest)	/* check or clean routes (+ or -)'d */
-		(int, struct rtentry *, struct rt_addrinfo *);
-	u_short	ifa_flags;		/* mostly rt_flags for cloning */
-	u_int	ifa_refcnt;		/* references to this structure */
-	int	ifa_metric;		/* cost of going out this interface */
-#ifdef notdef
-	struct	rtentry *ifa_rt;	/* XXXX for ROUTETOIF ????? */
-#endif
-	int (*ifa_claim_addr)		/* check if an addr goes to this if */
-		(struct ifaddr *, struct sockaddr *);
-
-};
-#define	IFA_ROUTE	RTF_UP		/* route installed */
-
-/* for compatibility with other BSDs */
-#define	ifa_list	ifa_link
-
-/*
- * The prefix structure contains information about one prefix
- * of an interface.  They are maintained by the different address families,
- * are allocated and attached when an prefix or an address is set,
- * and are linked together so all prefixes for an interface can be located.
- */
-struct ifprefix {
-	struct	sockaddr *ifpr_prefix;	/* prefix of interface */
-	struct	ifnet *ifpr_ifp;	/* back-pointer to interface */
-	TAILQ_ENTRY(ifprefix) ifpr_list; /* queue macro glue */
-	u_char	ifpr_plen;		/* prefix length in bits */
-	u_char	ifpr_type;		/* protocol dependent prefix type */
-};
-
-/*
- * Multicast address structure.  This is analogous to the ifaddr
- * structure except that it keeps track of multicast addresses.
- * Also, the reference count here is a count of requests for this
- * address, not a count of pointers to this structure.
- */
-struct ifmultiaddr {
-	TAILQ_ENTRY(ifmultiaddr) ifma_link; /* queue macro glue */
-	struct	sockaddr *ifma_addr; 	/* address this membership is for */
-	struct	sockaddr *ifma_lladdr;	/* link-layer translation, if any */
-	struct	ifnet *ifma_ifp;	/* back-pointer to interface */
-	u_int	ifma_refcount;		/* reference count */
-	void	*ifma_protospec;	/* protocol-specific state, if any */
-};
-
-#ifdef _KERNEL
-#define	IFAFREE(ifa) \
-	do { \
-		if ((ifa)->ifa_refcnt <= 0) \
-			ifafree(ifa); \
-		else \
-			(ifa)->ifa_refcnt--; \
-	} while (0)
-
-struct ifindex_entry {
-	struct	ifnet *ife_ifnet;
-	struct	ifaddr *ife_ifnet_addr;
-	dev_t	ife_dev;
-};
-
-#define ifnet_byindex(idx)	ifindex_table[(idx)].ife_ifnet
-#define ifaddr_byindex(idx)	ifindex_table[(idx)].ife_ifnet_addr
-#define ifdev_byindex(idx)	ifindex_table[(idx)].ife_dev
-
-extern	struct ifnethead ifnet;
-extern	struct ifindex_entry *ifindex_table;
-extern	int ifqmaxlen;
-extern	struct ifnet *loif;	/* first loopback interface */
-extern	int if_index;
-
-void	ether_ifattach(struct ifnet *, int);
-void	ether_ifdetach(struct ifnet *, int);
-void	ether_input(struct ifnet *, struct ether_header *, struct mbuf *);
-void	ether_demux(struct ifnet *, struct ether_header *, struct mbuf *);
-int	ether_output(struct ifnet *,
-	   struct mbuf *, struct sockaddr *, struct rtentry *);
-int	ether_output_frame(struct ifnet *, struct mbuf *);
-int	ether_ioctl(struct ifnet *, int, caddr_t);
-
-int	if_addmulti(struct ifnet *, struct sockaddr *, struct ifmultiaddr **);
-int	if_allmulti(struct ifnet *, int);
-void	if_attach(struct ifnet *);
-int	if_delmulti(struct ifnet *, struct sockaddr *);
-void	if_detach(struct ifnet *);
-void	if_down(struct ifnet *);
-void	if_route(struct ifnet *, int flag, int fam);
-int	if_setlladdr(struct ifnet *, const u_char *, int);
-void	if_unroute(struct ifnet *, int flag, int fam);
-void	if_up(struct ifnet *);
-/*void	ifinit(void);*/ /* declared in systm.h for main() */
-int	ifioctl(struct socket *, u_long, caddr_t, struct thread *);
-int	ifpromisc(struct ifnet *, int);
-struct	ifnet *ifunit(const char *);
-struct	ifnet *if_withname(struct sockaddr *);
-
-int	if_poll_recv_slow(struct ifnet *ifp, int *quotap);
-void	if_poll_xmit_slow(struct ifnet *ifp, int *quotap);
-void	if_poll_throttle(void);
-void	if_poll_unthrottle(void *);
-void	if_poll_init(void);
-void	if_poll(void);
-
-struct	ifaddr *ifa_ifwithaddr(struct sockaddr *);
-struct	ifaddr *ifa_ifwithdstaddr(struct sockaddr *);
-struct	ifaddr *ifa_ifwithnet(struct sockaddr *);
-struct	ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *);
-struct	ifaddr *ifaof_ifpforaddr(struct sockaddr *, struct ifnet *);
-void	ifafree(struct ifaddr *);
-
-struct	ifmultiaddr *ifmaof_ifpforaddr(struct sockaddr *, struct ifnet *);
-int	if_simloop(struct ifnet *ifp, struct mbuf *m, int af, int hlen);
-
-void	if_clone_attach(struct if_clone *);
-void	if_clone_detach(struct if_clone *);
-
-int	if_clone_create(char *, int);
-int	if_clone_destroy(const char *);
-
-#define IF_LLADDR(ifp)							\
-    LLADDR((struct sockaddr_dl *) ifaddr_byindex((ifp)->if_index)->ifa_addr)
-
-#ifdef DEVICE_POLLING
-enum poll_cmd {	POLL_ONLY, POLL_AND_CHECK_STATUS, POLL_DEREGISTER };
-
-typedef	void poll_handler_t(struct ifnet *ifp, enum poll_cmd cmd, int count);
-int    ether_poll_register(poll_handler_t *h, struct ifnet *ifp);
-int    ether_poll_deregister(struct ifnet *ifp);
-#endif /* DEVICE_POLLING */
-
-#endif /* _KERNEL */
-
-#endif /* !_NET_IF_VAR_H_ */
diff --git a/newlib/libc/sys/linux/include/net/if_vlan_var.h b/newlib/libc/sys/linux/include/net/if_vlan_var.h
deleted file mode 100644
index 249543b..0000000
--- a/newlib/libc/sys/linux/include/net/if_vlan_var.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 1998 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/net/if_vlan_var.h,v 1.11 2002/03/11 09:26:07 mux Exp $
- */
-
-#ifndef _NET_IF_VLAN_VAR_H_
-#define	_NET_IF_VLAN_VAR_H_	1
-
-#ifdef _KERNEL
-struct vlan_mc_entry {
-	struct ether_addr		mc_addr;
-	SLIST_ENTRY(vlan_mc_entry)	mc_entries;
-};
-
-struct	ifvlan {
-	struct	arpcom ifv_ac;	/* make this an interface */
-	struct	ifnet *ifv_p;	/* parent inteface of this vlan */
-	struct	ifv_linkmib {
-		int	ifvm_parent;
-		u_int16_t ifvm_proto; /* encapsulation ethertype */
-		u_int16_t ifvm_tag; /* tag to apply on packets leaving if */
-	}	ifv_mib;
-	SLIST_HEAD(__vlan_mchead, vlan_mc_entry)	vlan_mc_listhead;
-	LIST_ENTRY(ifvlan) ifv_list;
-};
-#define	ifv_if	ifv_ac.ac_if
-#define	ifv_tag	ifv_mib.ifvm_tag
-#endif /* _KERNEL */
-
-struct	ether_vlan_header {
-	u_char	evl_dhost[ETHER_ADDR_LEN];
-	u_char	evl_shost[ETHER_ADDR_LEN];
-	u_int16_t evl_encap_proto;
-	u_int16_t evl_tag;
-	u_int16_t evl_proto;
-};
-
-#define	EVL_VLANOFTAG(tag) ((tag) & 4095)
-#define	EVL_PRIOFTAG(tag) (((tag) >> 13) & 7)
-#define	EVL_ENCAPLEN	4	/* length in octets of encapsulation */
-
-/* sysctl(3) tags, for compatibility purposes */
-#define	VLANCTL_PROTO	1
-#define	VLANCTL_MAX	2
-
-/*
- * Configuration structure for SIOCSETVLAN and SIOCGETVLAN ioctls.
- */
-struct	vlanreq {
-	char	vlr_parent[IFNAMSIZ];
-	u_short	vlr_tag;
-};
-#define	SIOCSETVLAN	SIOCSIFGENERIC
-#define	SIOCGETVLAN	SIOCGIFGENERIC
-
-#endif /* _NET_IF_VLAN_VAR_H_ */
diff --git a/newlib/libc/sys/linux/include/net/intrq.h b/newlib/libc/sys/linux/include/net/intrq.h
deleted file mode 100644
index 68e2e4a..0000000
--- a/newlib/libc/sys/linux/include/net/intrq.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2000 Brian Somers <brian@Awfulhak.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/net/intrq.h,v 1.4 2002/03/19 21:54:18 alfred Exp $
- */
-
-#ifndef _NET_INTRQ_H_
-#define	_NET_INTRQ_H_
-
-#ifdef _KERNEL
-extern int	atintrq1_present;
-extern int	atintrq2_present;
-extern int	atmintrq_present;
-extern int	ipintrq_present;
-extern int	ip6intrq_present;
-extern int	ipxintrq_present;
-extern int	natmintrq_present;
-extern int	nsintrq_present;
-
-extern int	family_enqueue(sa_family_t, struct mbuf *);
-#endif
-
-#endif /* _NET_INTRQ_H_ */
diff --git a/newlib/libc/sys/linux/include/net/iso88025.h b/newlib/libc/sys/linux/include/net/iso88025.h
deleted file mode 100644
index 898fc1c..0000000
--- a/newlib/libc/sys/linux/include/net/iso88025.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 1998, Larry Lile
- * All rights reserved.
- *
- * For latest sources and information on this driver, please
- * go to http://anarchy.stdio.com.
- *
- * Questions, comments or suggestions should be directed to
- * Larry Lile <lile@stdio.com>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice unmodified, this list of conditions, and the following
- *    disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/net/iso88025.h,v 1.7 2002/05/08 01:08:26 kbyanc Exp $
- *
- * Information gathered from tokenring@freebsd, /sys/net/ethernet.h and
- * the Mach token ring driver.
- */
-
-/*
- * Fundamental constants relating to iso 802.5
- */
-
-#ifndef _NET_ISO88025_H_
-#define _NET_ISO88025_H_
-
-/*
- * General ISO 802.5 definitions
- */
-#define	ISO88025_ADDR_LEN	6
-#define ISO88025_HDR_LEN	(ISO88025_CF_LEN + (ISO88025_ADDR_LEN * 2))
-#define ISO88025_CF_LEN		2
-#define RCF_LEN			2
-#define RIF_MAX_RD		14
-#define RIF_MAX_LEN		16
-
-#define TR_AC			0x10
-#define TR_LLC_FRAME		0x40
-
-#define TR_4MBPS		4000000
-#define TR_16MBPS		16000000
-#define TR_100MBPS		100000000
-
-/*
- * Source routing 
- */
-#define	TR_RII			0x80
-#define TR_RCF_BCST_MASK	0xe000
-#define TR_RCF_LEN_MASK		0x1f00
-#define TR_RCF_DIR		0x0080
-#define TR_RCF_LF_MASK		0x0070
-
-#define TR_RCF_RIFLEN(x)	((ntohs(x) & TR_RCF_LEN_MASK) >> 8)
-
-/*
- * Minimum and maximum packet payload lengths.
- */
-#define	ISO88025_MIN_LEN	0 
-#define	ISO88025_MAX_LEN_4	4464
-#define	ISO88025_MAX_LEN_16	17960	
-#define	ISO88025_MAX_LEN	ISO88025_MAX_LEN_16
-
-/*
- * A macro to validate a length with
- */
-#define	ISO88025_IS_VALID_LEN(foo)	\
-	((foo) >= ISO88025_MIN_LEN && (foo) <= ISO88025_MAX_LEN)
-
-/*
- * ISO 802.5 physical header
- */
-struct iso88025_header {
-	u_int8_t	ac;				    /* access control field */
-	u_int8_t	fc;				    /* frame control field */
-	u_int8_t	iso88025_dhost[ISO88025_ADDR_LEN];  /* destination address */
-	u_int8_t	iso88025_shost[ISO88025_ADDR_LEN];  /* source address */
-	u_int16_t	rcf;				    /* route control field */
-	u_int16_t	rd[RIF_MAX_RD];			    /* routing designators */
-} __attribute__ ((__packed__));
-
-struct iso88025_rif {
-	u_int16_t	rcf;				    /* route control field */
-	u_int16_t	rd[RIF_MAX_RD];			    /* routing designators */
-} __attribute__ ((__packed__));
-
-struct iso88025_sockaddr_data {
-	u_char ether_dhost[ISO88025_ADDR_LEN];
-	u_char ether_shost[ISO88025_ADDR_LEN];
-	u_char ac;
-	u_char fc;
-};
-
-struct iso88025_sockaddr_dl_data {
-	u_short	 trld_rcf;
-	u_short	*trld_route[RIF_MAX_LEN];
-};
-
-#define ISO88025_MIN(a, b)	(((a)<(b))?(a):(b))
-#define SDL_ISO88025(s)		((struct iso88025_sockaddr_dl_data *)	\
-				 ((s)->sdl_data + \
-				  ISO88025_MIN((s)->sdl_nlen + (s)->sdl_alen + \
-					       (s)->sdl_slen, 12)))
-
-/*
- * Structure of a 48-bit iso 802.5 address.
- *  ( We could also add the 16 bit addresses as a union)
- */
-struct	iso88025_addr {
-	u_char octet[ISO88025_ADDR_LEN];
-};
-
-#define ISO88025_MAX_MTU	18000
-#define ISO88025_DEFAULT_MTU	1500
-#define senderr(e) { error = (e); goto bad;}
-
-void	iso88025_ifattach	(struct ifnet *);
-void	iso88025_ifdetach	(struct ifnet *, int);
-int	iso88025_ioctl		(struct ifnet *, int , caddr_t );
-int	iso88025_output		(struct ifnet *, struct mbuf *, struct sockaddr *,
-				 struct rtentry *);
-void	iso88025_input		(struct ifnet *, struct iso88025_header *,
-				 struct mbuf *);
-
-#endif
diff --git a/newlib/libc/sys/linux/include/net/net_osdep.h b/newlib/libc/sys/linux/include/net/net_osdep.h
deleted file mode 100644
index 19c4b1a..0000000
--- a/newlib/libc/sys/linux/include/net/net_osdep.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/*	$FreeBSD: src/sys/net/net_osdep.h,v 1.8 2002/04/19 04:46:21 suz Exp $	*/
-/*	$KAME: net_osdep.h,v 1.68 2001/12/21 08:14:58 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-/*
- * glue for kernel code programming differences.
- */
-
-/*
- * OS dependencies:
- * - ioctl
- *   FreeBSD 3 and later warn when sys/ioctl.h is included in a kernel source
- *   file.  For socket ioctl, we are suggested to use sys/sockio.h.
- *
- * - RTFREE()
- *   bsdi does not escape this macro using do-clause, so it is recommended
- *   to escape the macro explicitly.
- *   e.g.
- *	if (rt) {
- *		RTFREE(rt);
- *	}
- *
- * - whether the IPv4 input routine convert the byte order of some fileds
- *   of the IP header (x: convert to the host byte order, s: strip the header
- *   length for possible reassembly)
- *             ip_len ip_id ip_off
- * bsdi3:          xs     x      x
- * bsdi4:          xs            x
- * freebsd[23]:    xs     x      x 
- * freebsd4:       xs            x
- * NetBSD:          x            x
- * OpenBSD:        xs     x      x
- *
- * - ifa_ifwithaf()
- *   bsdi[34], netbsd, and openbsd define it in sys/net/if.c
- *   freebsd (all versions) does not have it.
- *  
- * - struct rt_addrinfo
- *   bsdi4, netbsd 1.5R and beyond: rti_addrs, rti_info[], rti_flags, rti_ifa,
- *	rti_ifp, and rti_rtm.
- *   others: rti_addrs and rti_info[] only.
- *
- * - ifa->ifa_rtrequest
- *   bsdi4, netbsd 1.5R and beyond: rt_addrinfo *
- *   others: sockaddr * (note that sys/net/route.c:rtrequest() has an unsafe
- *	typecast code, from 4.3BSD-reno)
- *
- * - side effects of rtrequest{,1}(RTM_DELETE)
- *	BSDI[34]: delete all cloned routes underneath the route.
- *	FreeBSD[234]: delete all protocol-cloned routes underneath the route.
- *		      note that cloned routes from an interface direct route
- *		      still remain.
- *	NetBSD: 1.5 have no side effects.  KAME/netbsd15, and post-1.5R, have
- *		the same effects as of BSDI.
- *	OpenBSD: have no side effects.  KAME/openbsd has the same effects as
- *		of BSDI (the change is not merged - yet).
- *
- * - privileged process
- *	NetBSD, FreeBSD 3
- *		struct proc *p;
- *		if (p && !suser(p->p_ucred, &p->p_acflag))
- *			privileged;
- *	FreeBSD 4
- *		struct proc *p;
- *		if (p && !suser(p))
- *			privileged;
- *	FreeBSD 5
- *		struct thread *td;
- *		if (suser(td))
- *			privileged;
- *	OpenBSD, BSDI [34], FreeBSD 2
- *		struct socket *so;
- *		if (so->so_state & SS_PRIV)
- *			privileged;
- * - foo_control
- *	NetBSD, FreeBSD 3
- *		needs to give struct proc * as argument
- *	OpenBSD, BSDI [34], FreeBSD 2
- *		do not need struct proc *
- *
- * - bpf:
- *	OpenBSD, NetBSD 1.5, BSDI [34]
- *		need caddr_t * (= if_bpf **) and struct ifnet *
- *	FreeBSD 2, FreeBSD 3, NetBSD post-1.5N
- *		need only struct ifnet * as argument
- *
- * - struct ifnet
- *			use queue.h?	member names	if name
- *			---		---		---
- *	FreeBSD 2	no		old standard	if_name+unit
- *	FreeBSD 3	yes		strange		if_name+unit
- *	OpenBSD		yes		standard	if_xname
- *	NetBSD		yes		standard	if_xname
- *	BSDI [34]	no		old standard	if_name+unit
- *
- * - usrreq
- *	NetBSD, OpenBSD, BSDI [34], FreeBSD 2
- *		single function with PRU_xx, arguments are mbuf
- *	FreeBSD 3
- *		separates functions, non-mbuf arguments
- *
- * - {set,get}sockopt
- *	NetBSD, OpenBSD, BSDI [34], FreeBSD 2
- *		manipulation based on mbuf
- *	FreeBSD 3
- *		non-mbuf manipulation using sooptcopy{in,out}()
- *
- * - timeout() and untimeout()
- *	NetBSD 1.4.x, OpenBSD, BSDI [34], FreeBSD 2
- *		timeout() is a void function
- *	FreeBSD 3
- *		timeout() is non-void, must keep returned value for untimeout()
- *		callout_xx is also available (sys/callout.h)
- *	NetBSD 1.5
- *		timeout() is obsoleted, use callout_xx (sys/callout.h)
- *	OpenBSD 2.8
- *		timeout_{add,set,del} is encouraged (sys/timeout.h)
- *
- * - kernel internal time structure
- *	FreeBSD 2, NetBSD, OpenBSD, BSD/OS
- *		mono_time.tv_u?sec, time.tv_u?sec
- *	FreeBSD [34]
- *		time_second
- *	if you need portability, #ifdef out FreeBSD[34], or use microtime(&tv)
- *	then touch tv.tv_sec (note: microtime is an expensive operation).
- *
- * - sysctl
- *	NetBSD, OpenBSD
- *		foo_sysctl()
- *	BSDI [34]
- *		foo_sysctl() but with different style.  sysctl_int_arr() takes
- *		care of most of the cases.
- *	FreeBSD
- *		linker hack.  however, there are freebsd version differences
- *		(how wonderful!).
- *		on FreeBSD[23] function arg #define includes paren.
- *			int foo SYSCTL_HANDLER_ARGS;
- *		on FreeBSD4, function arg #define does not include paren.
- *			int foo(SYSCTL_HANDLER_ARGS);
- *		on some versions, forward reference to the tree is okay.
- *		on some versions, you need SYSCTL_DECL().  you need things
- *		like this.
- *			#ifdef SYSCTL_DECL
- *			SYSCTL_DECL(net_inet_ip6);
- *			#endif
- *		it is hard to share functions between freebsd and non-freebsd.
- *
- * - if_ioctl
- *	NetBSD, FreeBSD 3, BSDI [34]
- *		2nd argument is u_long cmd
- *	FreeBSD 2
- *		2nd argument is int cmd
- *
- * - if attach routines
- *	NetBSD
- *		void xxattach(int);
- *	FreeBSD 2, FreeBSD 3
- *		void xxattach(void *);
- *		PSEUDO_SET(xxattach, if_xx);
- *
- * - ovbcopy()
- *	in NetBSD 1.4 or later, ovbcopy() is not supplied in the kernel.
- *	we have updated sys/systm.h to include declaration.
- *
- * - splnet()
- *	NetBSD 1.4 or later requires splsoftnet().
- *	other operating systems use splnet().
- *
- * - splimp()
- *	NetBSD-current (2001/4/13): use splnet() in network, splvm() in vm.
- *	other operating systems: use splimp().
- *
- * - dtom()
- *	NEVER USE IT!
- *
- * - struct ifnet for loopback interface
- *	BSDI3: struct ifnet loif;
- *	BSDI4: struct ifnet *loifp;
- *	NetBSD, OpenBSD 2.8, FreeBSD2: struct ifnet loif[NLOOP];
- *	OpenBSD 2.9: struct ifnet *lo0ifp;
- *
- *	odd thing is that many of them refers loif as ifnet *loif,
- *	not loif[NLOOP], from outside of if_loop.c.
- *
- * - number of bpf pseudo devices
- *	others: bpfilter.h, NBPFILTER
- *	FreeBSD4: bpf.h, NBPF
- *	solution:
- *		#if defined(__FreeBSD__) && __FreeBSD__ >= 4
- *		#include "bpf.h"
- *		#define NBPFILTER	NBPF
- *		#else
- *		#include "bpfilter.h"
- *		#endif
- *
- * - protosw for IPv4 (sys/netinet)
- *	FreeBSD4: struct ipprotosw in netinet/ipprotosw.h
- *	others: struct protosw in sys/protosw.h
- *
- * - protosw in general.
- *	NetBSD 1.5 has extra member for ipfilter (netbsd-current dropped
- *	it so it will go away in 1.6).
- *	NetBSD 1.5 requires PR_LISTEN flag bit with protocols that permit
- *	listen/accept (like tcp).
- *
- * - header files with defopt (opt_xx.h)
- *	FreeBSD3: opt_{inet,ipsec,ip6fw,altq}.h
- *	FreeBSD4: opt_{inet,inet6,ipsec,ip6fw,altq}.h
- *	NetBSD: opt_{inet,ipsec,altq}.h
- *	others: does not use defopt
- *
- * - IN_MULTICAST/IN_CLASS[A-D] macro.
- *	OpenBSD and NetBSD: net endian (kernel) or host endian (userland)
- *	others: always host endian
- *
- * - (m->m_flags & M_EXT) != 0 does *not* mean that the max data length of
- *   the mbuf == MCLBYTES.
- *
- * - sys/kern/uipc_mbuf.c:m_dup()
- *	freebsd[34]: copies the whole mbuf chain.
- *	netbsd: similar arg with m_copym().
- *	others: no m_dup().
- *
- * - ifa_refcnt (struct ifaddr) management (IFAREF/IFAFREE).
- *	NetBSD 1.5: always use IFAREF whenever reference gets added.
- *		always use IFAFREE whenever reference gets freed.
- *		IFAFREE frees ifaddr when ifa_refcnt reaches 0.
- *	others: do not increase refcnt for ifp->if_addrlist and in_ifaddr.
- *		use IFAFREE once when ifaddr is disconnected from
- *		ifp->if_addrlist and in_ifaddr.  IFAFREE frees ifaddr when
- *		ifa_refcnt goes negative.  in KAME environment, IFAREF is
- *		provided as a compatibility wrapper (use it instead of
- *		ifa_refcnt++ to reduce #ifdef).
- *
- * - ifnet.if_lastchange
- *	freebsd, bsdi, netbsd-current (jun 14 2001-),
- *	openbsd-current (jun 15 2001-): updated only when IFF_UP changes.
- *		(RFC1573 ifLastChange interpretation)
- *	netbsd151, openbsd29: updated whenever packets go through the interface.
- *		(4.4BSD interpretation)
- *
- * - kernel compilation options ("options HOGE" in kernel config file)
- *	freebsd4: sys/conf/options has to have mapping between option
- *		and a header file (opt_hoge.h).
- *	netbsd: by default, -DHOGE will go into
- *		sys/arch/foo/compile/BAR/Makefile.
- *		if you define mapping in sys/conf/files, you can create
- *		a header file like opt_hoge.h to help make dependencies.
- *	bsdi/openbsd: always use -DHOGE in Makefile.  there's no need/way
- *		to have opt_hoge.h.
- *
- *	therefore, opt_hoge.h is mandatory on freebsd4 only.
- *
- * - MALLOC() macro
- *	Use it only if the size of the allocation is constant.
- *	When we do NOT collect statistics about kernel memory usage, the result
- *	of macro expansion contains a large set of condition branches.  If the
- *	size is not constant, compilation optimization cannot be applied, and
- *	a bunch of the large branch will be embedded in the kernel code.
- *
- * - M_COPY_PKTHDR
- *	openbsd30: M_COPY_PKTHDR is deprecated.  use M_MOVE_PKTHDR or
- *		M_DUP_PKTHDR, depending on how you want to handle m_tag.
- *	others: M_COPY_PKTHDR is available as usual.
- */
-
-#ifndef __NET_NET_OSDEP_H_DEFINED_
-#define __NET_NET_OSDEP_H_DEFINED_
-#ifdef _KERNEL
-
-struct ifnet;
-extern const char *if_name(struct ifnet *);
-
-#define HAVE_OLD_BPF
-
-#define ifa_list	ifa_link
-#define if_addrlist	if_addrhead
-#define if_list		if_link
-
-/* sys/net/if.h */
-#define IFAREF(ifa)	do { ++(ifa)->ifa_refcnt; } while (0)
-
-#define WITH_CONVERT_AND_STRIP_IP_LEN
-
-#if 1				/* at this moment, all OSes do this */
-#define WITH_CONVERT_IP_OFF
-#endif
-
-/*
- * Deprecated.
- */
-#include <sys/module.h>
-#define	PSEUDO_SET(sym, name) \
-	static int name ## _modevent(module_t mod, int type, void *data) \
-	{ \
-		void (*initfunc)(void *) = (void (*)(void *))data; \
-		switch (type) { \
-		case MOD_LOAD: \
-			/* printf(#name " module load\n"); */ \
-			initfunc(NULL); \
-			break; \
-		case MOD_UNLOAD: \
-			printf(#name " module unload - not possible for this module type\n"); \
-			return EINVAL; \
-		} \
-		return 0; \
-	} \
-	static moduledata_t name ## _mod = { \
-		#name, \
-		name ## _modevent, \
-		(void *)sym \
-	}; \
-	DECLARE_MODULE(name, name ## _mod, SI_SUB_PSEUDO, SI_ORDER_ANY)
-
-#endif /*_KERNEL*/
-#endif /*__NET_NET_OSDEP_H_DEFINED_ */
diff --git a/newlib/libc/sys/linux/include/net/netisr.h b/newlib/libc/sys/linux/include/net/netisr.h
deleted file mode 100644
index 717e77b..0000000
--- a/newlib/libc/sys/linux/include/net/netisr.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)netisr.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/netisr.h,v 1.26 2002/03/19 21:54:18 alfred Exp $
- */
-
-#ifndef _NET_NETISR_H_
-#define _NET_NETISR_H_
-
-/*
- * The networking code runs off software interrupts.
- *
- * You can switch into the network by doing splnet() and return by splx().
- * The software interrupt level for the network is higher than the software
- * level for the clock (so you can enter the network in routines called
- * at timeout time).
- */
-
-/*
- * Each ``pup-level-1'' input queue has a bit in a ``netisr'' status
- * word which is used to de-multiplex a single software
- * interrupt used for scheduling the network code to calls
- * on the lowest level routine of each protocol.
- */
-#define	NETISR_POLL	0		/* polling callback, must be first */
-#define	NETISR_IP	2		/* same as AF_INET */
-#define	NETISR_NS	6		/* same as AF_NS */
-#define	NETISR_ATALK    16              /* same as AF_APPLETALK */
-#define	NETISR_ARP	18		/* same as AF_LINK */
-#define	NETISR_IPX	23		/* same as AF_IPX */
-#define NETISR_USB	25		/* USB soft interrupt */
-#define	NETISR_PPP	27		/* PPP soft interrupt */
-#define	NETISR_IPV6	28		/* same as AF_INET6 */
-#define	NETISR_NATM	29		/* same as AF_NATM */
-#define	NETISR_ATM	30		/* same as AF_ATM */
-#define	NETISR_NETGRAPH	31		/* same as AF_NETGRAPH */
-
-
-#ifndef LOCORE
-#ifdef _KERNEL
-
-void legacy_setsoftnet(void);
-
-extern volatile unsigned int	netisr;	/* scheduling bits for network */
-extern	void	(*netisrs[32])(void);
-#define	schednetisr(anisr) do {						\
-	atomic_set_rel_int(&netisr, 1 << (anisr));			\
-	legacy_setsoftnet();						\
-} while (0)
-
-typedef void netisr_t(void);
-
-int register_netisr(int, netisr_t *);
-int unregister_netisr(int);
-
-#endif
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/net/pfil.h b/newlib/libc/sys/linux/include/net/pfil.h
deleted file mode 100644
index 48ed4b7..0000000
--- a/newlib/libc/sys/linux/include/net/pfil.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$FreeBSD: src/sys/net/pfil.h,v 1.9 2002/03/24 09:34:04 bde Exp $	*/
-
-/*
- * Copyright (c) 1996 Matthew R. Green
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NET_PFIL_H_
-#define _NET_PFIL_H_
-
-#include <sys/queue.h>
-
-struct mbuf;
-struct ifnet;
-
-/*
- * The packet filter hooks are designed for anything to call them to
- * possibly intercept the packet.
- */
-struct packet_filter_hook {
-        TAILQ_ENTRY(packet_filter_hook) pfil_link;
-	int	(*pfil_func)(void *, int, struct ifnet *, int, struct mbuf **);
-	int	pfil_flags;
-};
-
-#define PFIL_IN		0x00000001
-#define PFIL_OUT	0x00000002
-#define PFIL_WAITOK	0x00000004
-#define PFIL_ALL	(PFIL_IN|PFIL_OUT)
-
-typedef	TAILQ_HEAD(pfil_list, packet_filter_hook) pfil_list_t;
-
-struct pfil_head {
-	pfil_list_t	ph_in;
-	pfil_list_t	ph_out;
-	int		ph_init;
-};
-
-struct packet_filter_hook *pfil_hook_get(int, struct pfil_head *);
-int	pfil_add_hook(int (*func)(void *, int,
-	    struct ifnet *, int, struct mbuf **), int, struct pfil_head *);
-int	pfil_remove_hook(int (*func)(void *, int,
-	    struct ifnet *, int, struct mbuf **), int, struct pfil_head *);
-
-/* XXX */
-#if defined(_KERNEL) && !defined(KLD_MODULE)
-#include "opt_ipfilter.h"
-#endif
-
-#if IPFILTER > 0
-#ifdef PFIL_HOOKS
-#undef PFIL_HOOKS
-#endif
-#define PFIL_HOOKS
-#endif /* IPFILTER */
-
-#endif /* _NET_PFIL_H_ */
diff --git a/newlib/libc/sys/linux/include/net/pfkeyv2.h b/newlib/libc/sys/linux/include/net/pfkeyv2.h
deleted file mode 100644
index 229ef71..0000000
--- a/newlib/libc/sys/linux/include/net/pfkeyv2.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/*	$FreeBSD: src/sys/net/pfkeyv2.h,v 1.7 2001/08/06 19:39:59 ume Exp $	*/
-/*	$KAME: pfkeyv2.h,v 1.26 2001/06/27 10:49:49 sakane Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * This file has been derived rfc 2367,
- * And added some flags of SADB_KEY_FLAGS_ as SADB_X_EXT_.
- *	sakane@ydc.co.jp
- */
-
-#ifndef _NET_PFKEYV2_H_
-#define _NET_PFKEYV2_H_
-
-/*
-This file defines structures and symbols for the PF_KEY Version 2
-key management interface. It was written at the U.S. Naval Research
-Laboratory. This file is in the public domain. The authors ask that
-you leave this credit intact on any copies of this file.
-*/
-#ifndef __PFKEY_V2_H
-#define __PFKEY_V2_H 1
-
-#define PF_KEY_V2 2
-#define PFKEYV2_REVISION        199806L
-
-#define SADB_RESERVED    0
-#define SADB_GETSPI      1
-#define SADB_UPDATE      2
-#define SADB_ADD         3
-#define SADB_DELETE      4
-#define SADB_GET         5
-#define SADB_ACQUIRE     6
-#define SADB_REGISTER    7
-#define SADB_EXPIRE      8
-#define SADB_FLUSH       9
-#define SADB_DUMP        10
-#define SADB_X_PROMISC   11
-#define SADB_X_PCHANGE   12
-
-#define SADB_X_SPDUPDATE  13
-#define SADB_X_SPDADD     14
-#define SADB_X_SPDDELETE  15	/* by policy index */
-#define SADB_X_SPDGET     16
-#define SADB_X_SPDACQUIRE 17
-#define SADB_X_SPDDUMP    18
-#define SADB_X_SPDFLUSH   19
-#define SADB_X_SPDSETIDX  20
-#define SADB_X_SPDEXPIRE  21
-#define SADB_X_SPDDELETE2 22	/* by policy id */
-#define SADB_MAX          22
-
-struct sadb_msg {
-  u_int8_t sadb_msg_version;
-  u_int8_t sadb_msg_type;
-  u_int8_t sadb_msg_errno;
-  u_int8_t sadb_msg_satype;
-  u_int16_t sadb_msg_len;
-  u_int16_t sadb_msg_reserved;
-  u_int32_t sadb_msg_seq;
-  u_int32_t sadb_msg_pid;
-};
-
-struct sadb_ext {
-  u_int16_t sadb_ext_len;
-  u_int16_t sadb_ext_type;
-};
-
-struct sadb_sa {
-  u_int16_t sadb_sa_len;
-  u_int16_t sadb_sa_exttype;
-  u_int32_t sadb_sa_spi;
-  u_int8_t sadb_sa_replay;
-  u_int8_t sadb_sa_state;
-  u_int8_t sadb_sa_auth;
-  u_int8_t sadb_sa_encrypt;
-  u_int32_t sadb_sa_flags;
-};
-
-struct sadb_lifetime {
-  u_int16_t sadb_lifetime_len;
-  u_int16_t sadb_lifetime_exttype;
-  u_int32_t sadb_lifetime_allocations;
-  u_int64_t sadb_lifetime_bytes;
-  u_int64_t sadb_lifetime_addtime;
-  u_int64_t sadb_lifetime_usetime;
-};
-
-struct sadb_address {
-  u_int16_t sadb_address_len;
-  u_int16_t sadb_address_exttype;
-  u_int8_t sadb_address_proto;
-  u_int8_t sadb_address_prefixlen;
-  u_int16_t sadb_address_reserved;
-};
-
-struct sadb_key {
-  u_int16_t sadb_key_len;
-  u_int16_t sadb_key_exttype;
-  u_int16_t sadb_key_bits;
-  u_int16_t sadb_key_reserved;
-};
-
-struct sadb_ident {
-  u_int16_t sadb_ident_len;
-  u_int16_t sadb_ident_exttype;
-  u_int16_t sadb_ident_type;
-  u_int16_t sadb_ident_reserved;
-  u_int64_t sadb_ident_id;
-};
-
-struct sadb_sens {
-  u_int16_t sadb_sens_len;
-  u_int16_t sadb_sens_exttype;
-  u_int32_t sadb_sens_dpd;
-  u_int8_t sadb_sens_sens_level;
-  u_int8_t sadb_sens_sens_len;
-  u_int8_t sadb_sens_integ_level;
-  u_int8_t sadb_sens_integ_len;
-  u_int32_t sadb_sens_reserved;
-};
-
-struct sadb_prop {
-  u_int16_t sadb_prop_len;
-  u_int16_t sadb_prop_exttype;
-  u_int8_t sadb_prop_replay;
-  u_int8_t sadb_prop_reserved[3];
-};
-
-struct sadb_comb {
-  u_int8_t sadb_comb_auth;
-  u_int8_t sadb_comb_encrypt;
-  u_int16_t sadb_comb_flags;
-  u_int16_t sadb_comb_auth_minbits;
-  u_int16_t sadb_comb_auth_maxbits;
-  u_int16_t sadb_comb_encrypt_minbits;
-  u_int16_t sadb_comb_encrypt_maxbits;
-  u_int32_t sadb_comb_reserved;
-  u_int32_t sadb_comb_soft_allocations;
-  u_int32_t sadb_comb_hard_allocations;
-  u_int64_t sadb_comb_soft_bytes;
-  u_int64_t sadb_comb_hard_bytes;
-  u_int64_t sadb_comb_soft_addtime;
-  u_int64_t sadb_comb_hard_addtime;
-  u_int64_t sadb_comb_soft_usetime;
-  u_int64_t sadb_comb_hard_usetime;
-};
-
-struct sadb_supported {
-  u_int16_t sadb_supported_len;
-  u_int16_t sadb_supported_exttype;
-  u_int32_t sadb_supported_reserved;
-};
-
-struct sadb_alg {
-  u_int8_t sadb_alg_id;
-  u_int8_t sadb_alg_ivlen;
-  u_int16_t sadb_alg_minbits;
-  u_int16_t sadb_alg_maxbits;
-  u_int16_t sadb_alg_reserved;
-};
-
-struct sadb_spirange {
-  u_int16_t sadb_spirange_len;
-  u_int16_t sadb_spirange_exttype;
-  u_int32_t sadb_spirange_min;
-  u_int32_t sadb_spirange_max;
-  u_int32_t sadb_spirange_reserved;
-};
-
-struct sadb_x_kmprivate {
-  u_int16_t sadb_x_kmprivate_len;
-  u_int16_t sadb_x_kmprivate_exttype;
-  u_int32_t sadb_x_kmprivate_reserved;
-};
-
-/*
- * XXX Additional SA Extension.
- * mode: tunnel or transport
- * reqid: to make SA unique nevertheless the address pair of SA are same.
- *        Mainly it's for VPN.
- */
-struct sadb_x_sa2 {
-  u_int16_t sadb_x_sa2_len;
-  u_int16_t sadb_x_sa2_exttype;
-  u_int8_t sadb_x_sa2_mode;
-  u_int8_t sadb_x_sa2_reserved1;
-  u_int16_t sadb_x_sa2_reserved2;
-  u_int32_t sadb_x_sa2_sequence;
-  u_int32_t sadb_x_sa2_reqid;
-};
-
-/* XXX Policy Extension */
-/* sizeof(struct sadb_x_policy) == 16 */
-struct sadb_x_policy {
-  u_int16_t sadb_x_policy_len;
-  u_int16_t sadb_x_policy_exttype;
-  u_int16_t sadb_x_policy_type;		/* See policy type of ipsec.h */
-  u_int8_t sadb_x_policy_dir;		/* direction, see ipsec.h */
-  u_int8_t sadb_x_policy_reserved;
-  u_int32_t sadb_x_policy_id;
-  u_int32_t sadb_x_policy_reserved2;
-};
-/*
- * When policy_type == IPSEC, it is followed by some of
- * the ipsec policy request.
- * [total length of ipsec policy requests]
- *	= (sadb_x_policy_len * sizeof(uint64_t) - sizeof(struct sadb_x_policy))
- */
-
-/* XXX IPsec Policy Request Extension */
-/*
- * This structure is aligned 8 bytes.
- */
-struct sadb_x_ipsecrequest {
-  u_int16_t sadb_x_ipsecrequest_len;	/* structure length aligned to 8 bytes.
-					 * This value is true length of bytes.
-					 * Not in units of 64 bits. */
-  u_int16_t sadb_x_ipsecrequest_proto;	/* See ipsec.h */
-  u_int8_t sadb_x_ipsecrequest_mode;	/* See IPSEC_MODE_XX in ipsec.h. */
-  u_int8_t sadb_x_ipsecrequest_level;	/* See IPSEC_LEVEL_XX in ipsec.h */
-  u_int16_t sadb_x_ipsecrequest_reqid;	/* See ipsec.h */
-
-  /*
-   * followed by source IP address of SA, and immediately followed by
-   * destination IP address of SA.  These encoded into two of sockaddr
-   * structure without any padding.  Must set each sa_len exactly.
-   * Each of length of the sockaddr structure are not aligned to 64bits,
-   * but sum of x_request and addresses is aligned to 64bits.
-   */
-};
-
-#define SADB_EXT_RESERVED             0
-#define SADB_EXT_SA                   1
-#define SADB_EXT_LIFETIME_CURRENT     2
-#define SADB_EXT_LIFETIME_HARD        3
-#define SADB_EXT_LIFETIME_SOFT        4
-#define SADB_EXT_ADDRESS_SRC          5
-#define SADB_EXT_ADDRESS_DST          6
-#define SADB_EXT_ADDRESS_PROXY        7
-#define SADB_EXT_KEY_AUTH             8
-#define SADB_EXT_KEY_ENCRYPT          9
-#define SADB_EXT_IDENTITY_SRC         10
-#define SADB_EXT_IDENTITY_DST         11
-#define SADB_EXT_SENSITIVITY          12
-#define SADB_EXT_PROPOSAL             13
-#define SADB_EXT_SUPPORTED_AUTH       14
-#define SADB_EXT_SUPPORTED_ENCRYPT    15
-#define SADB_EXT_SPIRANGE             16
-#define SADB_X_EXT_KMPRIVATE          17
-#define SADB_X_EXT_POLICY             18
-#define SADB_X_EXT_SA2                19
-#define SADB_EXT_MAX                  19
-
-#define SADB_SATYPE_UNSPEC	0
-#define SADB_SATYPE_AH		2
-#define SADB_SATYPE_ESP		3
-#define SADB_SATYPE_RSVP	5
-#define SADB_SATYPE_OSPFV2	6
-#define SADB_SATYPE_RIPV2	7
-#define SADB_SATYPE_MIP		8
-#define SADB_X_SATYPE_IPCOMP	9
-#define SADB_X_SATYPE_POLICY	10
-#define SADB_SATYPE_MAX		11
-
-#define SADB_SASTATE_LARVAL   0
-#define SADB_SASTATE_MATURE   1
-#define SADB_SASTATE_DYING    2
-#define SADB_SASTATE_DEAD     3
-#define SADB_SASTATE_MAX      3
-
-#define SADB_SAFLAGS_PFS      1
-
-/* RFC2367 numbers - meets RFC2407 */
-#define SADB_AALG_NONE		0
-#define SADB_AALG_MD5HMAC	1	/*2*/
-#define SADB_AALG_SHA1HMAC	2	/*3*/
-#define SADB_AALG_MAX		8
-/* private allocations - based on RFC2407/IANA assignment */
-#define SADB_X_AALG_SHA2_256	6	/*5*/
-#define SADB_X_AALG_SHA2_384	7	/*6*/
-#define SADB_X_AALG_SHA2_512	8	/*7*/
-/* private allocations should use 249-255 (RFC2407) */
-#define SADB_X_AALG_MD5		3	/*249*/	/* Keyed MD5 */
-#define SADB_X_AALG_SHA		4	/*250*/	/* Keyed SHA */
-#define SADB_X_AALG_NULL	5	/*251*/	/* null authentication */
-
-/* RFC2367 numbers - meets RFC2407 */
-#define SADB_EALG_NONE		0
-#define SADB_EALG_DESCBC	1	/*2*/
-#define SADB_EALG_3DESCBC	2	/*3*/
-#define SADB_EALG_NULL		3	/*11*/
-#define SADB_EALG_MAX		12
-/* private allocations - based on RFC2407/IANA assignment */
-#define SADB_X_EALG_CAST128CBC	5	/*6*/
-#define SADB_X_EALG_BLOWFISHCBC	4	/*7*/
-#define SADB_X_EALG_RIJNDAELCBC	12
-#define SADB_X_EALG_AES		12
-/* private allocations should use 249-255 (RFC2407) */
-
-#if 1	/*nonstandard */
-#define SADB_X_CALG_NONE	0
-#define SADB_X_CALG_OUI		1
-#define SADB_X_CALG_DEFLATE	2
-#define SADB_X_CALG_LZS		3
-#define SADB_X_CALG_MAX		4
-#endif
-
-#define SADB_IDENTTYPE_RESERVED   0
-#define SADB_IDENTTYPE_PREFIX     1
-#define SADB_IDENTTYPE_FQDN       2
-#define SADB_IDENTTYPE_USERFQDN   3
-#define SADB_X_IDENTTYPE_ADDR     4
-#define SADB_IDENTTYPE_MAX        4
-
-/* `flags' in sadb_sa structure holds followings */
-#define SADB_X_EXT_NONE		0x0000	/* i.e. new format. */
-#define SADB_X_EXT_OLD		0x0001	/* old format. */
-
-#define SADB_X_EXT_IV4B		0x0010	/* IV length of 4 bytes in use */
-#define SADB_X_EXT_DERIV	0x0020	/* DES derived */
-#define SADB_X_EXT_CYCSEQ	0x0040	/* allowing to cyclic sequence. */
-
-	/* three of followings are exclusive flags each them */
-#define SADB_X_EXT_PSEQ		0x0000	/* sequencial padding for ESP */
-#define SADB_X_EXT_PRAND	0x0100	/* random padding for ESP */
-#define SADB_X_EXT_PZERO	0x0200	/* zero padding for ESP */
-#define SADB_X_EXT_PMASK	0x0300	/* mask for padding flag */
-
-#if 1
-#define SADB_X_EXT_RAWCPI	0x0080	/* use well known CPI (IPComp) */
-#endif
-
-#define SADB_KEY_FLAGS_MAX	0x0fff
-
-/* SPI size for PF_KEYv2 */
-#define PFKEY_SPI_SIZE	sizeof(u_int32_t)
-
-/* Identifier for menber of lifetime structure */
-#define SADB_X_LIFETIME_ALLOCATIONS	0
-#define SADB_X_LIFETIME_BYTES		1
-#define SADB_X_LIFETIME_ADDTIME		2
-#define SADB_X_LIFETIME_USETIME		3
-
-/* The rate for SOFT lifetime against HARD one. */
-#define PFKEY_SOFT_LIFETIME_RATE	80
-
-/* Utilities */
-#define PFKEY_ALIGN8(a) (1 + (((a) - 1) | (8 - 1)))
-#define	PFKEY_EXTLEN(msg) \
-	PFKEY_UNUNIT64(((struct sadb_ext *)(msg))->sadb_ext_len)
-#define PFKEY_ADDR_PREFIX(ext) \
-	(((struct sadb_address *)(ext))->sadb_address_prefixlen)
-#define PFKEY_ADDR_PROTO(ext) \
-	(((struct sadb_address *)(ext))->sadb_address_proto)
-#define PFKEY_ADDR_SADDR(ext) \
-	((struct sockaddr *)((caddr_t)(ext) + sizeof(struct sadb_address)))
-
-/* in 64bits */
-#define	PFKEY_UNUNIT64(a)	((a) << 3)
-#define	PFKEY_UNIT64(a)		((a) >> 3)
-
-#endif /* __PFKEY_V2_H */
-
-#endif /* _NET_PFKEYV2_H_ */
diff --git a/newlib/libc/sys/linux/include/net/ppp_comp.h b/newlib/libc/sys/linux/include/net/ppp_comp.h
deleted file mode 100644
index 9f63329..0000000
--- a/newlib/libc/sys/linux/include/net/ppp_comp.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * ppp_comp.h - Definitions for doing PPP packet compression.
- *
- * Copyright (c) 1994 The Australian National University.
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, provided that the above copyright
- * notice appears in all copies.  This software is provided without any
- * warranty, express or implied. The Australian National University
- * makes no representations about the suitability of this software for
- * any purpose.
- *
- * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
- * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
- * OR MODIFICATIONS.
- *
- * $FreeBSD: src/sys/net/ppp_comp.h,v 1.11 2002/03/24 09:34:04 bde Exp $
- */
-
-#ifndef _NET_PPP_COMP_H
-#define _NET_PPP_COMP_H
-
-/*
- * Structure giving methods for compression/decompression.
- */
-#ifdef PACKETPTR
-struct compressor {
-	int	compress_proto;	/* CCP compression protocol number */
-
-	/* Allocate space for a compressor (transmit side) */
-	void	*(*comp_alloc)(u_char *options, int opt_len);
-	/* Free space used by a compressor */
-	void	(*comp_free)(void *state);
-	/* Initialize a compressor */
-	int	(*comp_init)(void *state, u_char *options, int opt_len,
-		    int unit, int hdrlen, int debug);
-	/* Reset a compressor */
-	void	(*comp_reset)(void *state);
-	/* Compress a packet */
-	int	(*compress)(void *state, PACKETPTR *mret, PACKETPTR mp,
-		    int orig_len, int max_len);
-	/* Return compression statistics */
-	void	(*comp_stat)(void *state, struct compstat *stats);
-
-	/* Allocate space for a decompressor (receive side) */
-	void	*(*decomp_alloc)(u_char *options, int opt_len);
-	/* Free space used by a decompressor */
-	void	(*decomp_free)(void *state);
-	/* Initialize a decompressor */
-	int	(*decomp_init)(void *state, u_char *options, int opt_len,
-		    int unit, int hdrlen, int mru, int debug);
-	/* Reset a decompressor */
-	void	(*decomp_reset)(void *state);
-	/* Decompress a packet. */
-	int	(*decompress)(void *state, PACKETPTR mp, PACKETPTR *dmpp);
-	/* Update state for an incompressible packet received */
-	void	(*incomp)(void *state, PACKETPTR mp);
-	/* Return decompression statistics */
-	void	(*decomp_stat)(void *state, struct compstat *stats);
-};
-#endif /* PACKETPTR */
-
-/*
- * Return values for decompress routine.
- * We need to make these distinctions so that we can disable certain
- * useful functionality, namely sending a CCP reset-request as a result
- * of an error detected after decompression.  This is to avoid infringing
- * a patent held by Motorola.
- * Don't you just lurve software patents.
- */
-#define DECOMP_OK		0	/* everything went OK */
-#define DECOMP_ERROR		1	/* error detected before decomp. */
-#define DECOMP_FATALERROR	2	/* error detected after decomp. */
-
-/*
- * CCP codes.
- */
-#define CCP_CONFREQ	1
-#define CCP_CONFACK	2
-#define CCP_TERMREQ	5
-#define CCP_TERMACK	6
-#define CCP_RESETREQ	14
-#define CCP_RESETACK	15
-
-/*
- * Max # bytes for a CCP option
- */
-#define CCP_MAX_OPTION_LENGTH	32
-
-/*
- * Parts of a CCP packet.
- */
-#define CCP_CODE(dp)		((dp)[0])
-#define CCP_ID(dp)		((dp)[1])
-#define CCP_LENGTH(dp)		(((dp)[2] << 8) + (dp)[3])
-#define CCP_HDRLEN		4
-
-#define CCP_OPT_CODE(dp)	((dp)[0])
-#define CCP_OPT_LENGTH(dp)	((dp)[1])
-#define CCP_OPT_MINLEN		2
-
-/*
- * Definitions for BSD-Compress.
- */
-#define CI_BSD_COMPRESS		21	/* config. option for BSD-Compress */
-#define CILEN_BSD_COMPRESS	3	/* length of config. option */
-
-/* Macros for handling the 3rd byte of the BSD-Compress config option. */
-#define BSD_NBITS(x)		((x) & 0x1F)	/* number of bits requested */
-#define BSD_VERSION(x)		((x) >> 5)	/* version of option format */
-#define BSD_CURRENT_VERSION	1		/* current version number */
-#define BSD_MAKE_OPT(v, n)	(((v) << 5) | (n))
-
-#define BSD_MIN_BITS		9	/* smallest code size supported */
-#define BSD_MAX_BITS		15	/* largest code size supported */
-
-/*
- * Definitions for Deflate.
- */
-#define CI_DEFLATE		26	/* config option for Deflate */
-#define CI_DEFLATE_DRAFT	24	/* value used in original draft RFC */
-#define CILEN_DEFLATE		4	/* length of its config option */
-
-#define DEFLATE_MIN_SIZE	8
-#define DEFLATE_MAX_SIZE	15
-#define DEFLATE_METHOD_VAL	8
-#define DEFLATE_SIZE(x)		(((x) >> 4) + DEFLATE_MIN_SIZE)
-#define DEFLATE_METHOD(x)	((x) & 0x0F)
-#define DEFLATE_MAKE_OPT(w)	((((w) - DEFLATE_MIN_SIZE) << 4) \
-				 + DEFLATE_METHOD_VAL)
-#define DEFLATE_CHK_SEQUENCE	0
-
-/*
- * Definitions for other, as yet unsupported, compression methods.
- */
-#define CI_PREDICTOR_1		1	/* config option for Predictor-1 */
-#define CILEN_PREDICTOR_1	2	/* length of its config option */
-#define CI_PREDICTOR_2		2	/* config option for Predictor-2 */
-#define CILEN_PREDICTOR_2	2	/* length of its config option */
-
-#endif /* _NET_PPP_COMP_H */
diff --git a/newlib/libc/sys/linux/include/net/ppp_defs.h b/newlib/libc/sys/linux/include/net/ppp_defs.h
deleted file mode 100644
index 11a3fef..0000000
--- a/newlib/libc/sys/linux/include/net/ppp_defs.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * ppp_defs.h - PPP definitions.
- *
- * Copyright (c) 1994 The Australian National University.
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, provided that the above copyright
- * notice appears in all copies.  This software is provided without any
- * warranty, express or implied. The Australian National University
- * makes no representations about the suitability of this software for
- * any purpose.
- *
- * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
- * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
- * OR MODIFICATIONS.
- *
- * $FreeBSD: src/sys/net/ppp_defs.h,v 1.7 2001/06/11 12:38:58 ume Exp $
- */
-
-#ifndef _PPP_DEFS_H_
-#define _PPP_DEFS_H_
-
-/*
- * The basic PPP frame.
- */
-#define PPP_HDRLEN	4	/* octets for standard ppp header */
-#define PPP_FCSLEN	2	/* octets for FCS */
-#define PPP_MRU		1500	/* default MRU = max length of info field */
-
-#define PPP_ADDRESS(p)	(((u_char *)(p))[0])
-#define PPP_CONTROL(p)	(((u_char *)(p))[1])
-#define PPP_PROTOCOL(p)	((((u_char *)(p))[2] << 8) + ((u_char *)(p))[3])
-
-/*
- * Significant octet values.
- */
-#define	PPP_ALLSTATIONS	0xff	/* All-Stations broadcast address */
-#define	PPP_UI		0x03	/* Unnumbered Information */
-#define	PPP_FLAG	0x7e	/* Flag Sequence */
-#define	PPP_ESCAPE	0x7d	/* Asynchronous Control Escape */
-#define	PPP_TRANS	0x20	/* Asynchronous transparency modifier */
-
-/*
- * Protocol field values.
- */
-#define PPP_IP		0x21	/* Internet Protocol */
-#define	PPP_XNS		0x25	/* Xerox NS */
-#define PPP_AT		0x29	/* AppleTalk Protocol */
-#define PPP_IPX		0x2b	/* IPX Datagram (RFC1552) */
-#define	PPP_VJC_COMP	0x2d	/* VJ compressed TCP */
-#define	PPP_VJC_UNCOMP	0x2f	/* VJ uncompressed TCP */
-#define PPP_COMP	0xfd	/* compressed packet */
-#define PPP_IPCP	0x8021	/* IP Control Protocol */
-#define PPP_ATCP	0x8029	/* AppleTalk Control Protocol */
-#define PPP_IPXCP	0x802b	/* IPX Control Protocol (RFC1552) */
-#define PPP_CCP		0x80fd	/* Compression Control Protocol */
-#define PPP_LCP		0xc021	/* Link Control Protocol */
-#define PPP_PAP		0xc023	/* Password Authentication Protocol */
-#define PPP_LQR		0xc025	/* Link Quality Report protocol */
-#define PPP_CHAP	0xc223	/* Cryptographic Handshake Auth. Protocol */
-#define PPP_CBCP	0xc029	/* Callback Control Protocol */
-#define PPP_IPV6	0x57	/* Internet Protocol version 6*/
-#define PPP_IPV6CP	0x8057	/* IPv6 Control Protocol */
-
-/*
- * Values for FCS calculations.
- */
-#define PPP_INITFCS	0xffff	/* Initial FCS value */
-#define PPP_GOODFCS	0xf0b8	/* Good final FCS value */
-#define PPP_FCS(fcs, c)	(((fcs) >> 8) ^ fcstab[((fcs) ^ (c)) & 0xff])
-
-/*
- * Extended asyncmap - allows any character to be escaped.
- */
-typedef u_int32_t	ext_accm[8];
-
-/*
- * What to do with network protocol (NP) packets.
- */
-enum NPmode {
-    NPMODE_PASS,		/* pass the packet through */
-    NPMODE_DROP,		/* silently drop the packet */
-    NPMODE_ERROR,		/* return an error */
-    NPMODE_QUEUE		/* save it up for later. */
-};
-
-/*
- * Statistics.
- */
-struct pppstat	{
-    unsigned int ppp_ibytes;	/* bytes received */
-    unsigned int ppp_ipackets;	/* packets received */
-    unsigned int ppp_ierrors;	/* receive errors */
-    unsigned int ppp_obytes;	/* bytes sent */
-    unsigned int ppp_opackets;	/* packets sent */
-    unsigned int ppp_oerrors;	/* transmit errors */
-};
-
-struct vjstat {
-    unsigned int vjs_packets;	/* outbound packets */
-    unsigned int vjs_compressed; /* outbound compressed packets */
-    unsigned int vjs_searches;	/* searches for connection state */
-    unsigned int vjs_misses;	/* times couldn't find conn. state */
-    unsigned int vjs_uncompressedin; /* inbound uncompressed packets */
-    unsigned int vjs_compressedin; /* inbound compressed packets */
-    unsigned int vjs_errorin;	/* inbound unknown type packets */
-    unsigned int vjs_tossed;	/* inbound packets tossed because of error */
-};
-
-struct ppp_stats {
-    struct pppstat p;		/* basic PPP statistics */
-    struct vjstat vj;		/* VJ header compression statistics */
-};
-
-struct compstat {
-    unsigned int unc_bytes;	/* total uncompressed bytes */
-    unsigned int unc_packets;	/* total uncompressed packets */
-    unsigned int comp_bytes;	/* compressed bytes */
-    unsigned int comp_packets;	/* compressed packets */
-    unsigned int inc_bytes;	/* incompressible bytes */
-    unsigned int inc_packets;	/* incompressible packets */
-    unsigned int ratio;		/* recent compression ratio << 8 */
-};
-
-struct ppp_comp_stats {
-    struct compstat c;		/* packet compression statistics */
-    struct compstat d;		/* packet decompression statistics */
-};
-
-/*
- * The following structure records the time in seconds since
- * the last NP packet was sent or received.
- */
-struct ppp_idle {
-    time_t xmit_idle;		/* time since last NP packet sent */
-    time_t recv_idle;		/* time since last NP packet received */
-};
-
-#ifndef __P
-#ifdef __STDC__
-#define __P(x)	x
-#else
-#define __P(x)	()
-#endif
-#endif
-
-#endif /* _PPP_DEFS_H_ */
diff --git a/newlib/libc/sys/linux/include/net/radix.h b/newlib/libc/sys/linux/include/net/radix.h
deleted file mode 100644
index 7f1984e..0000000
--- a/newlib/libc/sys/linux/include/net/radix.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- * $FreeBSD: src/sys/net/radix.h,v 1.18 2002/03/19 21:54:18 alfred Exp $
- */
-
-#ifndef _RADIX_H_
-#define	_RADIX_H_
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_RTABLE);
-#endif
-
-/*
- * Radix search tree node layout.
- */
-
-struct radix_node {
-	struct	radix_mask *rn_mklist;	/* list of masks contained in subtree */
-	struct	radix_node *rn_parent;	/* parent */
-	short	rn_bit;			/* bit offset; -1-index(netmask) */
-	char	rn_bmask;		/* node: mask for bit test*/
-	u_char	rn_flags;		/* enumerated next */
-#define RNF_NORMAL	1		/* leaf contains normal route */
-#define RNF_ROOT	2		/* leaf is root leaf for tree */
-#define RNF_ACTIVE	4		/* This node is alive (for rtfree) */
-	union {
-		struct {			/* leaf only data: */
-			caddr_t	rn_Key;		/* object of search */
-			caddr_t	rn_Mask;	/* netmask, if present */
-			struct	radix_node *rn_Dupedkey;
-		} rn_leaf;
-		struct {			/* node only data: */
-			int	rn_Off;		/* where to start compare */
-			struct	radix_node *rn_L;/* progeny */
-			struct	radix_node *rn_R;/* progeny */
-		} rn_node;
-	}		rn_u;
-#ifdef RN_DEBUG
-	int rn_info;
-	struct radix_node *rn_twin;
-	struct radix_node *rn_ybro;
-#endif
-};
-
-#define	rn_dupedkey	rn_u.rn_leaf.rn_Dupedkey
-#define	rn_key		rn_u.rn_leaf.rn_Key
-#define	rn_mask		rn_u.rn_leaf.rn_Mask
-#define	rn_offset	rn_u.rn_node.rn_Off
-#define	rn_left		rn_u.rn_node.rn_L
-#define	rn_right	rn_u.rn_node.rn_R
-
-/*
- * Annotations to tree concerning potential routes applying to subtrees.
- */
-
-struct radix_mask {
-	short	rm_bit;			/* bit offset; -1-index(netmask) */
-	char	rm_unused;		/* cf. rn_bmask */
-	u_char	rm_flags;		/* cf. rn_flags */
-	struct	radix_mask *rm_mklist;	/* more masks to try */
-	union	{
-		caddr_t	rmu_mask;		/* the mask */
-		struct	radix_node *rmu_leaf;	/* for normal routes */
-	}	rm_rmu;
-	int	rm_refs;		/* # of references to this struct */
-};
-
-#define	rm_mask rm_rmu.rmu_mask
-#define	rm_leaf rm_rmu.rmu_leaf		/* extra field would make 32 bytes */
-
-#define MKGet(m) {\
-	if (rn_mkfreelist) {\
-		m = rn_mkfreelist; \
-		rn_mkfreelist = (m)->rm_mklist; \
-	} else \
-		R_Malloc(m, struct radix_mask *, sizeof (*(m))); }\
-
-#define MKFree(m) { (m)->rm_mklist = rn_mkfreelist; rn_mkfreelist = (m);}
-
-typedef int walktree_f_t(struct radix_node *, void *);
-
-struct radix_node_head {
-	struct	radix_node *rnh_treetop;
-	int	rnh_addrsize;		/* permit, but not require fixed keys */
-	int	rnh_pktsize;		/* permit, but not require fixed keys */
-	struct	radix_node *(*rnh_addaddr)	/* add based on sockaddr */
-		(void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]);
-	struct	radix_node *(*rnh_addpkt)	/* add based on packet hdr */
-		(void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]);
-	struct	radix_node *(*rnh_deladdr)	/* remove based on sockaddr */
-		(void *v, void *mask, struct radix_node_head *head);
-	struct	radix_node *(*rnh_delpkt)	/* remove based on packet hdr */
-		(void *v, void *mask, struct radix_node_head *head);
-	struct	radix_node *(*rnh_matchaddr)	/* locate based on sockaddr */
-		(void *v, struct radix_node_head *head);
-	struct	radix_node *(*rnh_lookup)	/* locate based on sockaddr */
-		(void *v, void *mask, struct radix_node_head *head);
-	struct	radix_node *(*rnh_matchpkt)	/* locate based on packet hdr */
-		(void *v, struct radix_node_head *head);
-	int	(*rnh_walktree)			/* traverse tree */
-		(struct radix_node_head *head, walktree_f_t *f, void *w);
-	int	(*rnh_walktree_from)		/* traverse tree below a */
-		(struct radix_node_head *head, void *a, void *m,
-		     walktree_f_t *f, void *w);
-	void	(*rnh_close)	/* do something when the last ref drops */
-		(struct radix_node *rn, struct radix_node_head *head);
-	struct	radix_node rnh_nodes[3];	/* empty tree for common case */
-};
-
-#ifndef _KERNEL
-#define Bcmp(a, b, n) bcmp(((char *)(a)), ((char *)(b)), (n))
-#define Bcopy(a, b, n) bcopy(((char *)(a)), ((char *)(b)), (unsigned)(n))
-#define Bzero(p, n) bzero((char *)(p), (int)(n));
-#define R_Malloc(p, t, n) (p = (t) malloc((unsigned int)(n)))
-#define Free(p) free((char *)p);
-#else
-#define Bcmp(a, b, n) bcmp(((caddr_t)(a)), ((caddr_t)(b)), (unsigned)(n))
-#define Bcopy(a, b, n) bcopy(((caddr_t)(a)), ((caddr_t)(b)), (unsigned)(n))
-#define Bzero(p, n) bzero((caddr_t)(p), (unsigned)(n));
-#define R_Malloc(p, t, n) (p = (t) malloc((unsigned long)(n), M_RTABLE, M_DONTWAIT))
-#define Free(p) free((caddr_t)p, M_RTABLE);
-#endif /* _KERNEL */
-
-void	 rn_init(void);
-int	 rn_inithead(void **, int);
-int	 rn_refines(void *, void *);
-struct radix_node
-	 *rn_addmask(void *, int, int),
-	 *rn_addroute (void *, void *, struct radix_node_head *,
-			struct radix_node [2]),
-	 *rn_delete(void *, void *, struct radix_node_head *),
-	 *rn_lookup (void *v_arg, void *m_arg,
-		        struct radix_node_head *head),
-	 *rn_match(void *, struct radix_node_head *);
-
-
-#endif /* _RADIX_H_ */
diff --git a/newlib/libc/sys/linux/include/net/raw_cb.h b/newlib/libc/sys/linux/include/net/raw_cb.h
deleted file mode 100644
index d17712d..0000000
--- a/newlib/libc/sys/linux/include/net/raw_cb.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/raw_cb.h,v 1.16 2002/03/19 21:54:18 alfred Exp $
- */
-
-#ifndef _NET_RAW_CB_H_
-#define _NET_RAW_CB_H_
-
-#include <sys/queue.h>
-
-/*
- * Raw protocol interface control block.  Used
- * to tie a socket to the generic raw interface.
- */
-struct rawcb {
-	LIST_ENTRY(rawcb) list;
-	struct	socket *rcb_socket;	/* back pointer to socket */
-	struct	sockaddr *rcb_faddr;	/* destination address */
-	struct	sockaddr *rcb_laddr;	/* socket's address */
-	struct	sockproto rcb_proto;	/* protocol family, protocol */
-};
-
-#define	sotorawcb(so)		((struct rawcb *)(so)->so_pcb)
-
-/*
- * Nominal space allocated to a raw socket.
- */
-#define	RAWSNDQ		8192
-#define	RAWRCVQ		8192
-
-#ifdef _KERNEL
-extern LIST_HEAD(rawcb_list_head, rawcb) rawcb_list;
-
-/* protosw entries */
-pr_ctlinput_t	raw_ctlinput;
-pr_init_t	raw_init;
-
-/* usrreq entries */
-int	 raw_attach(struct socket *, int);
-void	 raw_detach(struct rawcb *);
-void	 raw_disconnect(struct rawcb *);
-
-#if 0 /* what the ??? */
-pr_input_t	raw_input;
-#else
-void	 raw_input(struct mbuf *,
-	    struct sockproto *, struct sockaddr *, struct sockaddr *);
-#endif
-
-extern	struct pr_usrreqs raw_usrreqs;
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/net/route.h b/newlib/libc/sys/linux/include/net/route.h
deleted file mode 100644
index c60bf35..0000000
--- a/newlib/libc/sys/linux/include/net/route.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 1980, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)route.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/net/route.h,v 1.45 2002/03/24 09:34:04 bde Exp $
- */
-
-#ifndef _NET_ROUTE_H_
-#define _NET_ROUTE_H_
-
-/*
- * Kernel resident routing tables.
- *
- * The routing tables are initialized when interface addresses
- * are set by making entries for all directly connected interfaces.
- */
-
-/*
- * A route consists of a destination address and a reference
- * to a routing entry.  These are often held by protocols
- * in their control blocks, e.g. inpcb.
- */
-struct route {
-	struct	rtentry *ro_rt;
-	struct	sockaddr ro_dst;
-};
-
-/*
- * These numbers are used by reliable protocols for determining
- * retransmission behavior and are included in the routing structure.
- */
-struct rt_metrics {
-	u_long	rmx_locks;	/* Kernel must leave these values alone */
-	u_long	rmx_mtu;	/* MTU for this path */
-	u_long	rmx_hopcount;	/* max hops expected */
-	u_long	rmx_expire;	/* lifetime for route, e.g. redirect */
-	u_long	rmx_recvpipe;	/* inbound delay-bandwidth product */
-	u_long	rmx_sendpipe;	/* outbound delay-bandwidth product */
-	u_long	rmx_ssthresh;	/* outbound gateway buffer limit */
-	u_long	rmx_rtt;	/* estimated round trip time */
-	u_long	rmx_rttvar;	/* estimated rtt variance */
-	u_long	rmx_pksent;	/* packets sent using this route */
-	u_long	rmx_filler[4];	/* will be used for T/TCP later */
-};
-
-/*
- * rmx_rtt and rmx_rttvar are stored as microseconds;
- * RTTTOPRHZ(rtt) converts to a value suitable for use
- * by a protocol slowtimo counter.
- */
-#define	RTM_RTTUNIT	1000000	/* units for rtt, rttvar, as units per sec */
-#define	RTTTOPRHZ(r)	((r) / (RTM_RTTUNIT / PR_SLOWHZ))
-
-/*
- * XXX kernel function pointer `rt_output' is visible to applications.
- */
-struct mbuf;
-
-/*
- * We distinguish between routes to hosts and routes to networks,
- * preferring the former if available.  For each route we infer
- * the interface to use from the gateway address supplied when
- * the route was entered.  Routes that forward packets through
- * gateways are marked so that the output routines know to address the
- * gateway rather than the ultimate destination.
- */
-#ifndef RNF_NORMAL
-#include <net/radix.h>
-#endif
-struct rtentry {
-	struct	radix_node rt_nodes[2];	/* tree glue, and other values */
-#define	rt_key(r)	((struct sockaddr *)((r)->rt_nodes->rn_key))
-#define	rt_mask(r)	((struct sockaddr *)((r)->rt_nodes->rn_mask))
-	struct	sockaddr *rt_gateway;	/* value */
-	long	rt_refcnt;		/* # held references */
-	u_long	rt_flags;		/* up/down?, host/net */
-	struct	ifnet *rt_ifp;		/* the answer: interface to use */
-	struct	ifaddr *rt_ifa;		/* the answer: interface to use */
-	struct	sockaddr *rt_genmask;	/* for generation of cloned routes */
-	caddr_t	rt_llinfo;		/* pointer to link level info cache */
-	struct	rt_metrics rt_rmx;	/* metrics used by rx'ing protocols */
-	struct	rtentry *rt_gwroute;	/* implied entry for gatewayed routes */
-	int	(*rt_output)(struct ifnet *, struct mbuf *, struct sockaddr *,
-		    struct rtentry *);
-					/* output routine for this (rt,if) */
-	struct	rtentry *rt_parent; 	/* cloning parent of this route */
-	void	*rt_filler2;		/* more filler */
-};
-
-/*
- * Following structure necessary for 4.3 compatibility;
- * We should eventually move it to a compat file.
- */
-struct ortentry {
-	u_long	rt_hash;		/* to speed lookups */
-	struct	sockaddr rt_dst;	/* key */
-	struct	sockaddr rt_gateway;	/* value */
-	short	rt_flags;		/* up/down?, host/net */
-	short	rt_refcnt;		/* # held references */
-	u_long	rt_use;			/* raw # packets forwarded */
-	struct	ifnet *rt_ifp;		/* the answer: interface to use */
-};
-
-#define rt_use rt_rmx.rmx_pksent
-
-#define	RTF_UP		0x1		/* route usable */
-#define	RTF_GATEWAY	0x2		/* destination is a gateway */
-#define	RTF_HOST	0x4		/* host entry (net otherwise) */
-#define	RTF_REJECT	0x8		/* host or net unreachable */
-#define	RTF_DYNAMIC	0x10		/* created dynamically (by redirect) */
-#define	RTF_MODIFIED	0x20		/* modified dynamically (by redirect) */
-#define RTF_DONE	0x40		/* message confirmed */
-/*			0x80		   unused, was RTF_DELCLONE */
-#define RTF_CLONING	0x100		/* generate new routes on use */
-#define RTF_XRESOLVE	0x200		/* external daemon resolves name */
-#define RTF_LLINFO	0x400		/* generated by link layer (e.g. ARP) */
-#define RTF_STATIC	0x800		/* manually added */
-#define RTF_BLACKHOLE	0x1000		/* just discard pkts (during updates) */
-#define RTF_PROTO2	0x4000		/* protocol specific routing flag */
-#define RTF_PROTO1	0x8000		/* protocol specific routing flag */
-
-#define RTF_PRCLONING	0x10000		/* protocol requires cloning */
-#define RTF_WASCLONED	0x20000		/* route generated through cloning */
-#define RTF_PROTO3	0x40000		/* protocol specific routing flag */
-/*			0x80000		   unused */
-#define RTF_PINNED	0x100000	/* future use */
-#define	RTF_LOCAL	0x200000 	/* route represents a local address */
-#define	RTF_BROADCAST	0x400000	/* route represents a bcast address */
-#define	RTF_MULTICAST	0x800000	/* route represents a mcast address */
-					/* 0x1000000 and up unassigned */
-
-/*
- * Routing statistics.
- */
-struct	rtstat {
-	short	rts_badredirect;	/* bogus redirect calls */
-	short	rts_dynamic;		/* routes created by redirects */
-	short	rts_newgateway;		/* routes modified by redirects */
-	short	rts_unreach;		/* lookups which failed */
-	short	rts_wildcard;		/* lookups satisfied by a wildcard */
-};
-/*
- * Structures for routing messages.
- */
-struct rt_msghdr {
-	u_short	rtm_msglen;	/* to skip over non-understood messages */
-	u_char	rtm_version;	/* future binary compatibility */
-	u_char	rtm_type;	/* message type */
-	u_short	rtm_index;	/* index for associated ifp */
-	int	rtm_flags;	/* flags, incl. kern & message, e.g. DONE */
-	int	rtm_addrs;	/* bitmask identifying sockaddrs in msg */
-	pid_t	rtm_pid;	/* identify sender */
-	int	rtm_seq;	/* for sender to identify action */
-	int	rtm_errno;	/* why failed */
-	int	rtm_use;	/* from rtentry */
-	u_long	rtm_inits;	/* which metrics we are initializing */
-	struct	rt_metrics rtm_rmx; /* metrics themselves */
-};
-
-#define RTM_VERSION	5	/* Up the ante and ignore older versions */
-
-/*
- * Message types.
- */
-#define RTM_ADD		0x1	/* Add Route */
-#define RTM_DELETE	0x2	/* Delete Route */
-#define RTM_CHANGE	0x3	/* Change Metrics or flags */
-#define RTM_GET		0x4	/* Report Metrics */
-#define RTM_LOSING	0x5	/* Kernel Suspects Partitioning */
-#define RTM_REDIRECT	0x6	/* Told to use different route */
-#define RTM_MISS	0x7	/* Lookup failed on this address */
-#define RTM_LOCK	0x8	/* fix specified metrics */
-#define RTM_OLDADD	0x9	/* caused by SIOCADDRT */
-#define RTM_OLDDEL	0xa	/* caused by SIOCDELRT */
-#define RTM_RESOLVE	0xb	/* req to resolve dst to LL addr */
-#define RTM_NEWADDR	0xc	/* address being added to iface */
-#define RTM_DELADDR	0xd	/* address being removed from iface */
-#define RTM_IFINFO	0xe	/* iface going up/down etc. */
-#define	RTM_NEWMADDR	0xf	/* mcast group membership being added to if */
-#define	RTM_DELMADDR	0x10	/* mcast group membership being deleted */
-#define	RTM_IFANNOUNCE	0x11	/* iface arrival/departure */
-
-/*
- * Bitmask values for rtm_inits and rmx_locks.
- */
-#define RTV_MTU		0x1	/* init or lock _mtu */
-#define RTV_HOPCOUNT	0x2	/* init or lock _hopcount */
-#define RTV_EXPIRE	0x4	/* init or lock _expire */
-#define RTV_RPIPE	0x8	/* init or lock _recvpipe */
-#define RTV_SPIPE	0x10	/* init or lock _sendpipe */
-#define RTV_SSTHRESH	0x20	/* init or lock _ssthresh */
-#define RTV_RTT		0x40	/* init or lock _rtt */
-#define RTV_RTTVAR	0x80	/* init or lock _rttvar */
-
-/*
- * Bitmask values for rtm_addrs.
- */
-#define RTA_DST		0x1	/* destination sockaddr present */
-#define RTA_GATEWAY	0x2	/* gateway sockaddr present */
-#define RTA_NETMASK	0x4	/* netmask sockaddr present */
-#define RTA_GENMASK	0x8	/* cloning mask sockaddr present */
-#define RTA_IFP		0x10	/* interface name sockaddr present */
-#define RTA_IFA		0x20	/* interface addr sockaddr present */
-#define RTA_AUTHOR	0x40	/* sockaddr for author of redirect */
-#define RTA_BRD		0x80	/* for NEWADDR, broadcast or p-p dest addr */
-
-/*
- * Index offsets for sockaddr array for alternate internal encoding.
- */
-#define RTAX_DST	0	/* destination sockaddr present */
-#define RTAX_GATEWAY	1	/* gateway sockaddr present */
-#define RTAX_NETMASK	2	/* netmask sockaddr present */
-#define RTAX_GENMASK	3	/* cloning mask sockaddr present */
-#define RTAX_IFP	4	/* interface name sockaddr present */
-#define RTAX_IFA	5	/* interface addr sockaddr present */
-#define RTAX_AUTHOR	6	/* sockaddr for author of redirect */
-#define RTAX_BRD	7	/* for NEWADDR, broadcast or p-p dest addr */
-#define RTAX_MAX	8	/* size of array to allocate */
-
-struct rt_addrinfo {
-	int	rti_addrs;
-	struct	sockaddr *rti_info[RTAX_MAX];
-	int	rti_flags;
-	struct	ifaddr *rti_ifa;
-	struct	ifnet *rti_ifp;
-};
-
-struct route_cb {
-	int	ip_count;
-	int	ip6_count;
-	int	ipx_count;
-	int	ns_count;
-	int	any_count;
-};
-
-#ifdef _KERNEL
-#define	RTFREE(rt) \
-	do { \
-		if ((rt)->rt_refcnt <= 1) \
-			rtfree(rt); \
-		else \
-			(rt)->rt_refcnt--; \
-	} while (0)
-
-extern struct route_cb route_cb;
-extern struct radix_node_head *rt_tables[AF_MAX+1];
-
-struct ifmultiaddr;
-
-void	 route_init(void);
-int	 rt_getifa(struct rt_addrinfo *);
-void	 rt_ifannouncemsg(struct ifnet *, int);
-void	 rt_ifmsg(struct ifnet *);
-void	 rt_missmsg(int, struct rt_addrinfo *, int, int);
-void	 rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *);
-void	 rt_newmaddrmsg(int, struct ifmultiaddr *);
-int	 rt_setgate(struct rtentry *, struct sockaddr *, struct sockaddr *);
-void	 rtalloc(struct route *);
-void	 rtalloc_ign(struct route *, u_long);
-struct rtentry *
-	 rtalloc1(struct sockaddr *, int, u_long);
-void	 rtfree(struct rtentry *);
-int	 rtinit(struct ifaddr *, int, int);
-int	 rtioctl(u_long, caddr_t);
-void	 rtredirect(struct sockaddr *, struct sockaddr *,
-	    struct sockaddr *, int, struct sockaddr *, struct rtentry **);
-int	 rtrequest(int, struct sockaddr *,
-	    struct sockaddr *, struct sockaddr *, int, struct rtentry **);
-int	 rtrequest1(int, struct rt_addrinfo *, struct rtentry **);
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/net/slcompress.h b/newlib/libc/sys/linux/include/net/slcompress.h
deleted file mode 100644
index a054246..0000000
--- a/newlib/libc/sys/linux/include/net/slcompress.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Definitions for tcp compression routines.
- *
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
- *	- Initial distribution.
- * $FreeBSD: src/sys/net/slcompress.h,v 1.17 2002/03/19 21:54:18 alfred Exp $
- */
-
-#ifndef _NET_SLCOMPRESS_H_
-#define _NET_SLCOMPRESS_H_
-
-#define MAX_STATES 16		/* must be > 2 and < 256 */
-#define MAX_HDR 128
-
-/*
- * Compressed packet format:
- *
- * The first octet contains the packet type (top 3 bits), TCP
- * 'push' bit, and flags that indicate which of the 4 TCP sequence
- * numbers have changed (bottom 5 bits).  The next octet is a
- * conversation number that associates a saved IP/TCP header with
- * the compressed packet.  The next two octets are the TCP checksum
- * from the original datagram.  The next 0 to 15 octets are
- * sequence number changes, one change per bit set in the header
- * (there may be no changes and there are two special cases where
- * the receiver implicitly knows what changed -- see below).
- *
- * There are 5 numbers which can change (they are always inserted
- * in the following order): TCP urgent pointer, window,
- * acknowledgement, sequence number and IP ID.  (The urgent pointer
- * is different from the others in that its value is sent, not the
- * change in value.)  Since typical use of SLIP links is biased
- * toward small packets (see comments on MTU/MSS below), changes
- * use a variable length coding with one octet for numbers in the
- * range 1 - 255 and 3 octets (0, MSB, LSB) for numbers in the
- * range 256 - 65535 or 0.  (If the change in sequence number or
- * ack is more than 65535, an uncompressed packet is sent.)
- */
-
-/*
- * Packet types (must not conflict with IP protocol version)
- *
- * The top nibble of the first octet is the packet type.  There are
- * three possible types: IP (not proto TCP or tcp with one of the
- * control flags set); uncompressed TCP (a normal IP/TCP packet but
- * with the 8-bit protocol field replaced by an 8-bit connection id --
- * this type of packet syncs the sender & receiver); and compressed
- * TCP (described above).
- *
- * LSB of 4-bit field is TCP "PUSH" bit (a worthless anachronism) and
- * is logically part of the 4-bit "changes" field that follows.  Top
- * three bits are actual packet type.  For backward compatibility
- * and in the interest of conserving bits, numbers are chosen so the
- * IP protocol version number (4) which normally appears in this nibble
- * means "IP packet".
- */
-
-/* packet types */
-#define TYPE_IP 0x40
-#define TYPE_UNCOMPRESSED_TCP 0x70
-#define TYPE_COMPRESSED_TCP 0x80
-#define TYPE_ERROR 0x00
-
-/* Bits in first octet of compressed packet */
-#define NEW_C	0x40	/* flag bits for what changed in a packet */
-#define NEW_I	0x20
-#define NEW_S	0x08
-#define NEW_A	0x04
-#define NEW_W	0x02
-#define NEW_U	0x01
-
-/* reserved, special-case values of above */
-#define SPECIAL_I (NEW_S|NEW_W|NEW_U)		/* echoed interactive traffic */
-#define SPECIAL_D (NEW_S|NEW_A|NEW_W|NEW_U)	/* unidirectional data */
-#define SPECIALS_MASK (NEW_S|NEW_A|NEW_W|NEW_U)
-
-#define TCP_PUSH_BIT 0x10
-
-
-/*
- * "state" data for each active tcp conversation on the wire.  This is
- * basically a copy of the entire IP/TCP header from the last packet
- * we saw from the conversation together with a small identifier
- * the transmit & receive ends of the line use to locate saved header.
- */
-struct cstate {
-	struct cstate *cs_next;	/* next most recently used cstate (xmit only) */
-	u_int16_t cs_hlen;	/* size of hdr (receive only) */
-	u_char cs_id;		/* connection # associated with this state */
-	u_char cs_filler;
-	union {
-		char csu_hdr[MAX_HDR];
-		struct ip csu_ip;	/* ip/tcp hdr from most recent packet */
-	} slcs_u;
-};
-#define cs_ip slcs_u.csu_ip
-#define cs_hdr slcs_u.csu_hdr
-
-/*
- * all the state data for one serial line (we need one of these
- * per line).
- */
-struct slcompress {
-	struct cstate *last_cs;	/* most recently used tstate */
-	u_char last_recv;	/* last rcvd conn. id */
-	u_char last_xmit;	/* last sent conn. id */
-	u_int16_t flags;
-#ifndef SL_NO_STATS
-	int sls_packets;	/* outbound packets */
-	int sls_compressed;	/* outbound compressed packets */
-	int sls_searches;	/* searches for connection state */
-	int sls_misses;		/* times couldn't find conn. state */
-	int sls_uncompressedin;	/* inbound uncompressed packets */
-	int sls_compressedin;	/* inbound compressed packets */
-	int sls_errorin;	/* inbound unknown type packets */
-	int sls_tossed;		/* inbound packets tossed because of error */
-#endif
-	struct cstate tstate[MAX_STATES];	/* xmit connection states */
-	struct cstate rstate[MAX_STATES];	/* receive connection states */
-};
-/* flag values */
-#define SLF_TOSS 1		/* tossing rcvd frames because of input err */
-
-void	 sl_compress_init(struct slcompress *, int);
-u_int	 sl_compress_tcp(struct mbuf *, struct ip *, struct slcompress *, int);
-int	 sl_uncompress_tcp(u_char **, int, u_int, struct slcompress *);
-int	 sl_uncompress_tcp_core(u_char *, int, int, u_int,
-	    struct slcompress *, u_char **, u_int *);
-
-#endif /* !_NET_SLCOMPRESS_H_ */
diff --git a/newlib/libc/sys/linux/include/net/slip.h b/newlib/libc/sys/linux/include/net/slip.h
deleted file mode 100644
index 595b935..0000000
--- a/newlib/libc/sys/linux/include/net/slip.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)slip.h	8.1 (Berkeley) 2/12/94
- * $FreeBSD: src/sys/net/slip.h,v 1.9 1999/08/28 00:48:29 peter Exp $
- */
-
-#ifndef _NET_SLIP_H_
-#define	_NET_SLIP_H_
-
-/* Ioctls operating on SLIP ttys. */
-#define	SLIOCGUNIT	_IOR('t', 88, int)	/* get slip unit number */
-#define	SLIOCSKEEPAL	_IOW('t', 84, int)	/* set keepalive */
-#define	SLIOCSOUTFILL	_IOW('t', 83, int)	/* set out fill time */
-#define	SLIOCGKEEPAL	_IOR('t', 82, int)	/* get keepalive time */
-#define	SLIOCGOUTFILL	_IOR('t', 81, int)	/* get out fill time */
-#define	SLIOCSUNIT	_IOW('t', 80, int)	/* set slip unit number */
-
-/*
- * Definitions of the pseudo-link-level header attached to slip
- * packets grabbed by the packet filter (bpf) traffic monitor.
- */
-#define	SLIP_HDRLEN	16		/* BPF SLIP header length */
-
-/* Offsets into BPF SLIP header. */
-#define	SLX_DIR		0		/* direction; see below */
-#define	SLX_CHDR	1		/* compressed header data */
-#define	CHDR_LEN	15		/* length of compressed header data */
-
-#define	SLIPDIR_IN	0		/* incoming */
-#define	SLIPDIR_OUT	1		/* outgoing */
-
-#endif /* !_NET_SLIP_H */
diff --git a/newlib/libc/sys/linux/include/net/zlib.h b/newlib/libc/sys/linux/include/net/zlib.h
deleted file mode 100644
index c2d32be..0000000
--- a/newlib/libc/sys/linux/include/net/zlib.h
+++ /dev/null
@@ -1,1013 +0,0 @@
-/* $FreeBSD: src/sys/net/zlib.h,v 1.7 1999/12/29 04:38:38 peter Exp $	*/
-
-/*
- * This file is derived from zlib.h and zconf.h from the zlib-1.0.4
- * distribution by Jean-loup Gailly and Mark Adler, with some additions
- * by Paul Mackerras to aid in implementing Deflate compression and
- * decompression for PPP packets.
- */
-
-/*
- *  ==FILEVERSION 971127==
- *
- * This marker is used by the Linux installation script to determine
- * whether an up-to-date version of this file is already installed.
- */
-
-
-/* +++ zlib.h */
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.0.4, Jul 24th, 1996.
-
-  Copyright (C) 1995-1996 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  gzip@prep.ai.mit.edu    madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef _ZLIB_H
-#define _ZLIB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* +++ zconf.h */
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-1996 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* From: zconf.h,v 1.20 1996/07/02 15:09:28 me Exp $ */
-
-#ifndef _ZCONF_H
-#define _ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_	z_deflateInit_
-#  define deflate	z_deflate
-#  define deflateEnd	z_deflateEnd
-#  define inflateInit_ 	z_inflateInit_
-#  define inflate	z_inflate
-#  define inflateEnd	z_inflateEnd
-#  define deflateInit2_	z_deflateInit2_
-#  define deflateSetDictionary z_deflateSetDictionary
-#  define deflateCopy	z_deflateCopy
-#  define deflateReset	z_deflateReset
-#  define deflateParams	z_deflateParams
-#  define inflateInit2_	z_inflateInit2_
-#  define inflateSetDictionary z_inflateSetDictionary
-#  define inflateSync	z_inflateSync
-#  define inflateReset	z_inflateReset
-#  define compress	z_compress
-#  define uncompress	z_uncompress
-#  define adler32	z_adler32
-#  define crc32		z_crc32
-#  define get_crc_table z_get_crc_table
-
-#  define Byte		z_Byte
-#  define uInt		z_uInt
-#  define uLong		z_uLong
-#  define Bytef	        z_Bytef
-#  define charf		z_charf
-#  define intf		z_intf
-#  define uIntf		z_uIntf
-#  define uLongf	z_uLongf
-#  define voidpf	z_voidpf
-#  define voidp		z_voidp
-#endif
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
-#endif
-#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
-#  ifndef __32BIT__
-#    define __32BIT__
-#  endif
-#endif
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#if defined(MSDOS) && !defined(__32BIT__)
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
-#  define STDC
-#endif
-#if (defined(__STDC__) || defined(__cplusplus)) && !defined(STDC)
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2 */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            1 << (windowBits+2)   +  1 << (memLevel+9)
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__)
-   /* MSC small or medium model */
-#  define SMALL_MEDIUM
-#  ifdef _MSC_VER
-#    define FAR __far
-#  else
-#    define FAR far
-#  endif
-#endif
-#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
-#  ifndef __32BIT__
-#    define SMALL_MEDIUM
-#    define FAR __far
-#  endif
-#endif
-#ifndef FAR
-#   define FAR
-#endif
-
-typedef unsigned char  Byte;  /* 8 bits */
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#if defined(__BORLANDC__) && defined(SMALL_MEDIUM)
-   /* Borland C/C++ ignores FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void FAR *voidpf;
-   typedef void     *voidp;
-#else
-   typedef Byte FAR *voidpf;
-   typedef Byte     *voidp;
-#endif
-
-
-/* Compile with -DZLIB_DLL for Windows DLL support */
-#if (defined(_WINDOWS) || defined(WINDOWS)) && defined(ZLIB_DLL)
-#  include <windows.h>
-#  define EXPORT  WINAPI
-#else
-#  define EXPORT
-#endif
-
-#endif /* _ZCONF_H */
-/* --- zconf.h */
-
-#define ZLIB_VERSION "1.0.4P"
-
-/* 
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms may be added later and will have the same
-  stream interface.
-
-     For compression the application must provide the output buffer and
-  may optionally provide the input buffer for optimization. For decompression,
-  the application must provide the input buffer and may optionally provide
-  the output buffer for optimization.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The library does not install any signal handler. It is recommended to
-  add at least a handler for SIGSEGV when decompressing; the library checks
-  the consistency of the input data whenever possible but may go nuts
-  for some forms of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    const char     *msg; /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: ascii or binary */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
-#define Z_PACKET_FLUSH	2
-#define Z_SYNC_FLUSH    3
-#define Z_FULL_FLUSH    4
-#define Z_FINISH        5
-/* Allowed flush values; see deflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_ASCII    1
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-extern const char * EXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/* 
-extern int EXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-extern int EXPORT deflate OF((z_streamp strm, int flush));
-/*
-  Performs one or both of the following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    If the parameter flush is set to Z_PARTIAL_FLUSH, the current compression
-  block is terminated and flushed to the output buffer so that the
-  decompressor can get all input data available so far. For method 9, a future
-  variant on method 8, the current block will be flushed but not terminated.
-  Z_SYNC_FLUSH has the same effect as partial flush except that the compressed
-  output is byte aligned (the compressor can clear its internal bit buffer)
-  and the current block is always terminated; this can be useful if the
-  compressor has to be restarted from scratch after an interruption (in which
-  case the internal state of the compressor may be lost).
-    If flush is set to Z_FULL_FLUSH, the compression block is terminated, a
-  special marker is output and the compression dictionary is discarded; this
-  is useful to allow the decompressor to synchronize if one compressed block
-  has been damaged (see inflateSync below).  Flushing degrades compression and
-  so should be used only when necessary.  Using Z_FULL_FLUSH too often can
-  seriously degrade the compression. If deflate returns with avail_out == 0,
-  this function must be called again with the same value of the flush
-  parameter and more output space (updated avail_out), until the flush is
-  complete (deflate returns with non-zero avail_out).
-
-    If the parameter flush is set to Z_PACKET_FLUSH, the compression
-  block is terminated, and a zero-length stored block is output,
-  omitting the length bytes (the effect of this is that the 3-bit type
-  code 000 for a stored block is output, and the output is then
-  byte-aligned).  This is designed for use at the end of a PPP packet.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-  
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  0.1% larger than avail_in plus 12 bytes.  If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() may update data_type if it can make a good guess about
-  the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible.
-*/
-
-
-extern int EXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/* 
-extern int EXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to Z_NULL, inflateInit updates them to use default
-   allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_VERSION_ERROR if the zlib library version is incompatible
-   with the version assumed by the caller.  msg is set to null if there is no
-   error message. inflateInit does not perform any decompression: this will be
-   done by inflate().
-*/
-
-#if defined(__FreeBSD__) && defined(_KERNEL)
-#define inflate       inflate_ppp     /* FreeBSD already has an inflate :-( */
-#endif
-
-extern int EXPORT inflate OF((z_streamp strm, int flush));
-/*
-  Performs one or both of the following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    If the parameter flush is set to Z_PARTIAL_FLUSH or Z_PACKET_FLUSH,
-  inflate flushes as much output as possible to the output buffer. The
-  flushing behavior of inflate is not specified for values of the flush
-  parameter other than Z_PARTIAL_FLUSH, Z_PACKET_FLUSH or Z_FINISH, but the
-  current implementation actually flushes as much output as possible
-  anyway.  For Z_PACKET_FLUSH, inflate checks that once all the input data
-  has been consumed, it is expecting to see the length field of a stored
-  block; if not, it returns Z_DATA_ERROR.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster routine
-  may be used for the single inflate() call.
-
-    inflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if the end of the
-  compressed data has been reached and all uncompressed output has been
-  produced, Z_NEED_DICT if a preset dictionary is needed at this point (see
-  inflateSetDictionary below), Z_DATA_ERROR if the input data was corrupted,
-  Z_STREAM_ERROR if the stream structure was inconsistent (for example if
-  next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in
-  the output buffer when Z_FINISH is used. In the Z_DATA_ERROR case, the
-  application may then call inflateSync to look for a good compression block.
-  In the Z_NEED_DICT case, strm->adler is set to the Adler32 value of the
-  dictionary chosen by the compressor.
-*/
-
-
-extern int EXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*   
-extern int EXPORT deflateInit2 OF((z_streamp strm,
-                                   int  level,
-                                   int  method,
-                                   int  windowBits,
-                                   int  memLevel,
-                                   int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library. (Method 9 will allow a 64K history buffer and
-   partial block flushes.)
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library (the value 16 will be allowed for method 9). Larger
-   values of this parameter result in better compression at the expense of
-   memory usage. The default value is 15 if deflateInit is used instead.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match).  Filtered data consists mostly of small values with a
-   somewhat random distribution. In this case, the compression algorithm is
-   tuned to compress them better. The effect of Z_FILTERED is to force more
-   Huffman coding and less string matching; it is somewhat intermediate
-   between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects
-   the compression ratio but not the correctness of the compressed output even
-   if it is not set appropriately.
-
-     If next_in is not null, the library will use this buffer to hold also
-   some history information; the buffer must either hold the entire input
-   data, or have at least 1<<(windowBits+1) bytes and be writable. If next_in
-   is null, the library will allocate its own history buffer (and leave next_in
-   null). next_out need not be provided here but must be provided by the
-   application for the next call of deflate().
-
-     If the history buffer is provided by the application, next_in must
-   must never be changed by the application since the compressor maintains
-   information inside this buffer from call to call; the application
-   must provide more input only by increasing avail_in. next_in is always
-   reset by the library in this case.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was
-   not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as
-   an invalid method). msg is set to null if there is no error message.
-   deflateInit2 does not perform any compression: this will be done by
-   deflate(). 
-*/
-                            
-extern int EXPORT deflateSetDictionary OF((z_streamp strm,
-                                           const Bytef *dictionary,
-				           uInt  dictLength));
-/*
-     Initializes the compression dictionary (history buffer) from the given
-   byte sequence without producing any compressed output. This function must
-   be called immediately after deflateInit or deflateInit2, before any call
-   of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and
-   can be predicted with good accuracy; the data can then be compressed better
-   than with the default empty dictionary. In this version of the library,
-   only the last 32K bytes of the dictionary are used.
-     Upon return of this function, strm->adler is set to the Adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The Adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.)
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state
-   is inconsistent (for example if deflate has already been called for this
-   stream). deflateSetDictionary does not perform any compression: this will
-   be done by deflate(). 
-*/
-
-extern int EXPORT deflateCopy OF((z_streamp dest,
-                                  z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.  If
-   the source stream is using an application-supplied history buffer, a new
-   buffer is allocated for the destination stream.  The compressed output
-   buffer is always application-supplied. It's the responsibility of the
-   application to provide the correct values of next_out and avail_out for the
-   next call of deflate.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-extern int EXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-extern int EXPORT deflateParams OF((z_streamp strm, int level, int strategy));
-/*
-     Dynamically update the compression level and compression strategy.
-   This can be used to switch between compression and straight copy of
-   the input data, or to switch to a different kind of input data requiring
-   a different strategy. If the compression level is changed, the input
-   available so far is compressed with the old level (and may be flushed);
-   the new level will take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-extern int EXPORT deflateOutputPending OF((z_streamp strm));
-/*
-     Returns the number of bytes of output which are immediately
-   available from the compressor (i.e. without any further input
-   or flush).
-*/
-
-/*   
-extern int EXPORT inflateInit2 OF((z_streamp strm,
-                                   int  windowBits));
-
-     This is another version of inflateInit with more compression options. The
-   fields next_out, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library (the value 16 will be allowed soon). The
-   default value is 15 if inflateInit is used instead. If a compressed stream
-   with a larger window size is given as input, inflate() will return with
-   the error code Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     If next_out is not null, the library will use this buffer for the history
-   buffer; the buffer must either be large enough to hold the entire output
-   data, or have at least 1<<windowBits bytes.  If next_out is null, the
-   library will allocate its own buffer (and leave next_out null). next_in
-   need not be provided here but must be provided by the application for the
-   next call of inflate().
-
-     If the history buffer is provided by the application, next_out must
-   never be changed by the application since the decompressor maintains
-   history information inside this buffer from call to call; the application
-   can only reset next_out to the beginning of the history buffer when
-   avail_out is zero and all output has been consumed.
-
-      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was
-   not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as
-   windowBits < 8). msg is set to null if there is no error message.
-   inflateInit2 does not perform any decompression: this will be done by
-   inflate().
-*/
-
-extern int EXPORT inflateSetDictionary OF((z_streamp strm,
-				           const Bytef *dictionary,
-					   uInt  dictLength));
-/*
-     Initializes the decompression dictionary (history buffer) from the given
-   uncompressed byte sequence. This function must be called immediately after
-   a call of inflate if this call returned Z_NEED_DICT. The dictionary chosen
-   by the compressor can be determined from the Adler32 value returned by this
-   call of inflate. The compressor and decompressor must use exactly the same
-   dictionary (see deflateSetDictionary).
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect Adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-extern int EXPORT inflateSync OF((z_streamp strm));
-/* 
-    Skips invalid compressed data until the special marker (see deflate()
-  above) can be found, or until all available input is skipped. No output
-  is provided.
-
-    inflateSync returns Z_OK if the special marker has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no marker has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-extern int EXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-extern int inflateIncomp OF((z_stream *strm));
-/*
-     This function adds the data at next_in (avail_in bytes) to the output
-   history without performing any output.  There must be no pending output,
-   and the decompressor must be expecting to see the start of a block.
-   Calling this function is equivalent to decompressing a stored block
-   containing the data at next_in (except that the data is not output).
-*/
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level, window size,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-extern int EXPORT compress OF((Bytef *dest,   uLongf *destLen,
-			       const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least 0.1% larger than
-   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-extern int EXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-				 const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
-*/
-
-
-typedef voidp gzFile;
-
-extern gzFile EXPORT gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9").  gzopen can be used to read a file which is not in gzip format;
-   in this case gzread will directly read from the file without decompression.
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).
-*/
-
-extern gzFile EXPORT gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-extern int EXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-extern int EXPORT    gzwrite OF((gzFile file, const voidp buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-extern int EXPORT    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-extern int EXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-extern const char * EXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-extern uLong EXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-extern uLong EXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running crc with the bytes buf[0..len-1] and return the updated
-   crc. If buf is NULL, this function returns the required initial value
-   for the crc. Pre- and post-conditioning (one's complement) is performed
-   within this function so it shouldn't be done by the application.
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-extern int EXPORT deflateInit_ OF((z_streamp strm, int level,
-			           const char *version, int stream_size));
-extern int EXPORT inflateInit_ OF((z_streamp strm,
-				   const char *version, int stream_size));
-extern int EXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-				    int windowBits, int memLevel, int strategy,
-				    const char *version, int stream_size));
-extern int EXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-				    const char *version, int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-		      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-
-#if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
-#endif
-
-uLongf *get_crc_table OF((void)); /* can be used by asm versions of crc32() */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ZLIB_H */
-/* --- zlib.h */
diff --git a/newlib/libc/sys/linux/include/netconfig.h b/newlib/libc/sys/linux/include/netconfig.h
deleted file mode 100644
index cead321..0000000
--- a/newlib/libc/sys/linux/include/netconfig.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*	$NetBSD: netconfig.h,v 1.1 2000/06/02 22:57:54 fvdl Exp $	*/
-/*	$FreeBSD: src/include/netconfig.h,v 1.3 2002/03/23 17:24:53 imp Exp $ */
-
-
-#ifndef _NETCONFIG_H_
-#define _NETCONFIG_H_
-
-#include <sys/cdefs.h>
-
-#define NETCONFIG	"/etc/netconfig"
-#define NETPATH		"NETPATH"
-
-struct netconfig {
-	char *nc_netid;			/* Network ID */
-	unsigned long nc_semantics;	/* Semantics (see below) */
-	unsigned long nc_flag;		/* Flags (see below) */
-	char *nc_protofmly;		/* Protocol family */
-	char *nc_proto;			/* Protocol name */
-	char *nc_device;		/* Network device pathname */
-	unsigned long nc_nlookups;	/* Number of directory lookup libs */
-	char **nc_lookups;		/* Names of the libraries */
-	unsigned long nc_unused[9];	/* reserved */
-};
-
-typedef struct {
-	struct netconfig **nc_head;
-	struct netconfig **nc_curr;
-} NCONF_HANDLE;
-
-/*
- * nc_semantics values
- */
-#define NC_TPI_CLTS	1
-#define NC_TPI_COTS	2
-#define NC_TPI_COTS_ORD	3
-#define NC_TPI_RAW	4
-
-/*
- * nc_flag values
- */
-#define NC_NOFLAG	0x00
-#define NC_VISIBLE	0x01
-#define NC_BROADCAST	0x02
-
-/*
- * nc_protofmly values
- */
-#define NC_NOPROTOFMLY	"-"
-#define NC_LOOPBACK	"loopback"
-#define NC_INET		"inet"
-#define NC_INET6	"inet6"
-#define NC_IMPLINK	"implink"
-#define NC_PUP		"pup"
-#define NC_CHAOS	"chaos"
-#define NC_NS		"ns"
-#define NC_NBS		"nbs"
-#define NC_ECMA		"ecma"
-#define NC_DATAKIT	"datakit"
-#define NC_CCITT	"ccitt"
-#define NC_SNA		"sna"
-#define NC_DECNET	"decnet"
-#define NC_DLI		"dli"
-#define NC_LAT		"lat"
-#define NC_HYLINK	"hylink"
-#define NC_APPLETALK	"appletalk"
-#define NC_NIT		"nit"
-#define NC_IEEE802	"ieee802"
-#define NC_OSI		"osi"
-#define NC_X25		"x25"
-#define NC_OSINET	"osinet"
-#define NC_GOSIP	"gosip"
-
-/*
- * nc_proto values
- */
-#define NC_NOPROTO	"-"
-#define NC_TCP		"tcp"
-#define NC_UDP		"udp"
-#define NC_ICMP		"icmp"
-
-__BEGIN_DECLS
-void *setnetconfig(void);
-struct netconfig *getnetconfig(void *);
-struct netconfig *getnetconfigent(const char *);
-void freenetconfigent(struct netconfig *);
-int endnetconfig(void *);
-
-void *setnetpath(void);
-struct netconfig *getnetpath(void *);
-int endnetpath(void *);
-
-void nc_perror(const char *);
-char *nc_sperror(void);
-__END_DECLS
-
-#endif /* _NETCONFIG_H_ */
diff --git a/newlib/libc/sys/linux/include/netdb.h b/newlib/libc/sys/linux/include/netdb.h
deleted file mode 100644
index e92b269..0000000
--- a/newlib/libc/sys/linux/include/netdb.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*-
- * Copyright (c) 1980, 1983, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-/*
- *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
- *      From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
- * $FreeBSD: src/include/netdb.h,v 1.23 2002/03/23 17:24:53 imp Exp $
- */
-
-#ifndef _NETDB_H_
-#define _NETDB_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/ansi.h>
-#include <stdio.h>
-
-#ifndef __socklen_t_defined
-typedef unsigned int socklen_t;
-#define __socklen_t_defined 1
-#endif
-
-#ifdef	_BSD_SOCKLEN_T_
-typedef	_BSD_SOCKLEN_T_	socklen_t;
-#undef	_BSD_SOCKLEN_T_
-#endif
-
-#ifndef _PATH_HEQUIV
-# define	_PATH_HEQUIV	"/etc/hosts.equiv"
-#endif
-#define	_PATH_HOSTS	"/etc/hosts"
-#define	_PATH_NETWORKS	"/etc/networks"
-#define	_PATH_PROTOCOLS	"/etc/protocols"
-#define	_PATH_SERVICES	"/etc/services"
-
-extern int h_errno;
-
-#define	MAXALIASES	35
-  /* For now, only support one return address. */
-#define MAXADDRS         2
-/*
- * Structures returned by network data base library.  All addresses are
- * supplied in host order, and returned in network order (suitable for
- * use in system calls).
- */
-struct hostent {
-  char	*h_name;	/* official name of host */
-  char	**h_aliases;	/* alias list */
-  int	h_addrtype;	/* host address type */
-  int	h_length;	/* length of address */
-  char	**h_addr_list;	/* list of addresses from name server */
-  char *h_addr;         /* address, for backward compatibility */
-  /* private data, for re-entrancy */
-  char *__host_addrs[MAXADDRS];
-  char *__host_aliases[MAXALIASES];
-  unsigned int __host_addr[4];
-};
-
-/*
- * Assumption here is that a network number
- * fits in an unsigned long -- probably a poor one.
- */
-struct netent {
-	char		*n_name;	/* official name of net */
-	char		**n_aliases;	/* alias list */
-	int		n_addrtype;	/* net address type */
-	unsigned long	n_net;		/* network # */
-};
-
-struct servent {
-	char	*s_name;	/* official service name */
-	char	**s_aliases;	/* alias list */
-	int	s_port;		/* port # */
-	char	*s_proto;	/* protocol to use */
-};
-
-struct protoent {
-	char	*p_name;	/* official protocol name */
-	char	**p_aliases;	/* alias list */
-	int	p_proto;	/* protocol # */
-};
-
-struct addrinfo {
-	int	ai_flags;	/* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
-	int	ai_family;	/* PF_xxx */
-	int	ai_socktype;	/* SOCK_xxx */
-	int	ai_protocol;	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
-	size_t	ai_addrlen;	/* length of ai_addr */
-	char	*ai_canonname;	/* canonical name for hostname */
-	struct	sockaddr *ai_addr;	/* binary address */
-	struct	addrinfo *ai_next;	/* next structure in linked list */
-};
-
-/*
- * Error return codes from gethostbyname() and gethostbyaddr()
- * (left in extern int h_errno).
- */
-
-#define	NETDB_INTERNAL	-1	/* see errno */
-#define	NETDB_SUCCESS	0	/* no problem */
-#define	HOST_NOT_FOUND	1 /* Authoritative Answer Host not found */
-#define	TRY_AGAIN	2 /* Non-Authoritative Host not found, or SERVERFAIL */
-#define	NO_RECOVERY	3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
-#define	NO_DATA		4 /* Valid name, no data record of requested type */
-#define	NO_ADDRESS	NO_DATA		/* no address, look for MX record */
-
-/*
- * Error return codes from getaddrinfo()
- */
-#define	EAI_ADDRFAMILY	 1	/* address family for hostname not supported */
-#define	EAI_AGAIN	 2	/* temporary failure in name resolution */
-#define	EAI_BADFLAGS	 3	/* invalid value for ai_flags */
-#define	EAI_FAIL	 4	/* non-recoverable failure in name resolution */
-#define	EAI_FAMILY	 5	/* ai_family not supported */
-#define	EAI_MEMORY	 6	/* memory allocation failure */
-#define	EAI_NODATA	 7	/* no address associated with hostname */
-#define	EAI_NONAME	 8	/* hostname nor servname provided, or not known */
-#define	EAI_SERVICE	 9	/* servname not supported for ai_socktype */
-#define	EAI_SOCKTYPE	10	/* ai_socktype not supported */
-#define	EAI_SYSTEM	11	/* system error returned in errno */
-#define	EAI_BADHINTS	12
-#define	EAI_PROTOCOL	13
-#define	EAI_MAX		14
-
-/*
- * Flag values for getaddrinfo()
- */
-#define	AI_PASSIVE	0x00000001 /* get address to use bind() */
-#define	AI_CANONNAME	0x00000002 /* fill ai_canonname */
-#define	AI_NUMERICHOST	0x00000004 /* prevent name resolution */
-/* valid flags for addrinfo */
-#define AI_MASK \
-    (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_ADDRCONFIG)
-
-#define	AI_ALL		0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */
-#define	AI_V4MAPPED_CFG	0x00000200 /* accept IPv4-mapped if kernel supports */
-#define	AI_ADDRCONFIG	0x00000400 /* only if any address is assigned */
-#define	AI_V4MAPPED	0x00000800 /* accept IPv4-mapped IPv6 address */
-/* special recommended flags for getipnodebyname */
-#define	AI_DEFAULT	(AI_V4MAPPED_CFG | AI_ADDRCONFIG)
-
-/*
- * Constants for getnameinfo()
- */
-#define	NI_MAXHOST	1025
-#define	NI_MAXSERV	32
-
-/*
- * Flag values for getnameinfo()
- */
-#define	NI_NOFQDN	0x00000001
-#define	NI_NUMERICHOST	0x00000002
-#define	NI_NAMEREQD	0x00000004
-#define	NI_NUMERICSERV	0x00000008
-#define	NI_DGRAM	0x00000010
-#define NI_WITHSCOPEID	0x00000020
-
-/*
- * Scope delimit character
- */
-#define	SCOPE_DELIMITER	'%'
-
-__BEGIN_DECLS
-void		endhostent(void);
-void		endhostent_r(FILE **, int *);
-void		endnetent(void);
-void		endnetgrent(void);
-void		endprotoent(void);
-void		endservent(void);
-void		freehostent(struct hostent *);
-struct hostent	*gethostbyaddr(const char *, int, int);
-struct hostent	*gethostbyname(const char *);
-struct hostent	*gethostbyname2(const char *, int);
-struct hostent	*gethostent(void);
-int             gethostent_r(struct hostent *, char *, int, int *, FILE **);
-struct hostent	*getipnodebyaddr(const void *, size_t, int, int *);
-struct hostent	*getipnodebyname(const char *, int, int, int *);
-struct netent	*getnetbyaddr(unsigned long, int);
-struct netent	*getnetbyname(const char *);
-struct netent	*getnetent(void);
-int		getnetgrent(char **, char **, char **);
-struct protoent	*getprotobyname(const char *);
-struct protoent	*getprotobynumber(int);
-struct protoent	*getprotoent(void);
-struct servent	*getservbyname(const char *, const char *);
-struct servent	*getservbyport(int, const char *);
-struct servent	*getservent(void);
-void		herror(const char *);
-__const char	*hstrerror(int);
-int		innetgr(const char *, const char *, const char *, const char *);
-void		sethostent(int);
-void		sethostent_r(int, FILE **, int *);
-/* void		sethostfile(const char *); */
-void		setnetent(int);
-void		setprotoent(int);
-int		getaddrinfo(const char *, const char *,
-			    const struct addrinfo *, struct addrinfo **);
-int		getnameinfo(const struct sockaddr *, socklen_t, char *,
-			    size_t, char *, size_t, int);
-void		freeaddrinfo(struct addrinfo *);
-char		*gai_strerror(int);
-void		setnetgrent(const char *);
-void		setservent(int);
-
-/*
- * PRIVATE functions specific to the FreeBSD implementation
- */
-
-/* DO NOT USE THESE, THEY ARE SUBJECT TO CHANGE AND ARE NOT PORTABLE!!! */
-void	_sethosthtent(int);
-void	_sethosthtent_r(int, FILE **, int *);
-void	_endhosthtent(void);
-void	_endhosthtent_r(FILE **, int *);
-void	_sethostdnsent(int);
-void	_endhostdnsent(void);
-void	_setnethtent(int);
-void	_endnethtent(void);
-void	_setnetdnsent(int);
-void	_endnetdnsent(void);
-struct hostent * _gethostbynisname(const char *, int);
-struct hostent * _gethostbynisaddr(const char *, int, int);
-void _map_v4v6_address(const char *, char *);
-void _map_v4v6_hostent(struct hostent *, char **, int *);
-__END_DECLS
-
-#endif /* !_NETDB_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/icmp6.h b/newlib/libc/sys/linux/include/netinet/icmp6.h
deleted file mode 100644
index 915efda..0000000
--- a/newlib/libc/sys/linux/include/netinet/icmp6.h
+++ /dev/null
@@ -1,740 +0,0 @@
-/*	$FreeBSD: src/sys/netinet/icmp6.h,v 1.8 2002/05/06 16:28:25 ume Exp $	*/
-/*	$KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _NETINET_ICMP6_H_
-#define _NETINET_ICMP6_H_
-
-#define ICMPV6_PLD_MAXLEN	1232	/* IPV6_MMTU - sizeof(struct ip6_hdr)
-					   - sizeof(struct icmp6_hdr) */
-
-struct icmp6_hdr {
-	u_int8_t	icmp6_type;	/* type field */
-	u_int8_t	icmp6_code;	/* code field */
-	u_int16_t	icmp6_cksum;	/* checksum field */
-	union {
-		u_int32_t	icmp6_un_data32[1]; /* type-specific field */
-		u_int16_t	icmp6_un_data16[2]; /* type-specific field */
-		u_int8_t	icmp6_un_data8[4];  /* type-specific field */
-	} icmp6_dataun;
-} __attribute__((__packed__));
-
-#define icmp6_data32	icmp6_dataun.icmp6_un_data32
-#define icmp6_data16	icmp6_dataun.icmp6_un_data16
-#define icmp6_data8	icmp6_dataun.icmp6_un_data8
-#define icmp6_pptr	icmp6_data32[0]		/* parameter prob */
-#define icmp6_mtu	icmp6_data32[0]		/* packet too big */
-#define icmp6_id	icmp6_data16[0]		/* echo request/reply */
-#define icmp6_seq	icmp6_data16[1]		/* echo request/reply */
-#define icmp6_maxdelay	icmp6_data16[0]		/* mcast group membership */
-
-#define ICMP6_DST_UNREACH		1	/* dest unreachable, codes: */
-#define ICMP6_PACKET_TOO_BIG		2	/* packet too big */
-#define ICMP6_TIME_EXCEEDED		3	/* time exceeded, code: */
-#define ICMP6_PARAM_PROB		4	/* ip6 header bad */
-
-#define ICMP6_ECHO_REQUEST		128	/* echo service */
-#define ICMP6_ECHO_REPLY		129	/* echo reply */
-#define ICMP6_MEMBERSHIP_QUERY		130	/* group membership query */
-#define MLD_LISTENER_QUERY		130 	/* multicast listener query */
-#define ICMP6_MEMBERSHIP_REPORT		131	/* group membership report */
-#define MLD_LISTENER_REPORT		131	/* multicast listener report */
-#define ICMP6_MEMBERSHIP_REDUCTION	132	/* group membership termination */
-#define MLD_LISTENER_DONE		132	/* multicast listener done */
-
-#ifndef _KERNEL
-/* the followings are for backward compatibility to old KAME apps. */
-#define MLD6_LISTENER_QUERY	MLD_LISTENER_QUERY
-#define MLD6_LISTENER_REPORT	MLD_LISTENER_REPORT
-#define MLD6_LISTENER_DONE	MLD_LISTENER_DONE
-#endif
-
-#define ND_ROUTER_SOLICIT		133	/* router solicitation */
-#define ND_ROUTER_ADVERT		134	/* router advertisment */
-#define ND_NEIGHBOR_SOLICIT		135	/* neighbor solicitation */
-#define ND_NEIGHBOR_ADVERT		136	/* neighbor advertisment */
-#define ND_REDIRECT			137	/* redirect */
-
-#define ICMP6_ROUTER_RENUMBERING	138	/* router renumbering */
-
-#define ICMP6_WRUREQUEST		139	/* who are you request */
-#define ICMP6_WRUREPLY			140	/* who are you reply */
-#define ICMP6_FQDN_QUERY		139	/* FQDN query */
-#define ICMP6_FQDN_REPLY		140	/* FQDN reply */
-#define ICMP6_NI_QUERY			139	/* node information request */
-#define ICMP6_NI_REPLY			140	/* node information reply */
-
-/* The definitions below are experimental. TBA */
-#define MLD_MTRACE_RESP			200	/* mtrace resp (to sender) */
-#define MLD_MTRACE			201	/* mtrace messages */
-
-#define ICMP6_HADISCOV_REQUEST		202	/* XXX To be defined */
-#define ICMP6_HADISCOV_REPLY		203	/* XXX To be defined */
-  
-#ifndef _KERNEL
-#define MLD6_MTRACE_RESP	MLD_MTRACE_RESP
-#define MLD6_MTRACE		MLD_MTRACE
-#endif
-
-#define ICMP6_MAXTYPE			203
-
-#define ICMP6_DST_UNREACH_NOROUTE	0	/* no route to destination */
-#define ICMP6_DST_UNREACH_ADMIN	 	1	/* administratively prohibited */
-#define ICMP6_DST_UNREACH_NOTNEIGHBOR	2	/* not a neighbor(obsolete) */
-#define ICMP6_DST_UNREACH_BEYONDSCOPE	2	/* beyond scope of source address */
-#define ICMP6_DST_UNREACH_ADDR		3	/* address unreachable */
-#define ICMP6_DST_UNREACH_NOPORT	4	/* port unreachable */
-
-#define ICMP6_TIME_EXCEED_TRANSIT 	0	/* ttl==0 in transit */
-#define ICMP6_TIME_EXCEED_REASSEMBLY	1	/* ttl==0 in reass */
-
-#define ICMP6_PARAMPROB_HEADER 	 	0	/* erroneous header field */
-#define ICMP6_PARAMPROB_NEXTHEADER	1	/* unrecognized next header */
-#define ICMP6_PARAMPROB_OPTION		2	/* unrecognized option */
-
-#define ICMP6_INFOMSG_MASK		0x80	/* all informational messages */
-
-#define ICMP6_NI_SUBJ_IPV6	0	/* Query Subject is an IPv6 address */
-#define ICMP6_NI_SUBJ_FQDN	1	/* Query Subject is a Domain name */
-#define ICMP6_NI_SUBJ_IPV4	2	/* Query Subject is an IPv4 address */
-
-#define ICMP6_NI_SUCCESS	0	/* node information successful reply */
-#define ICMP6_NI_REFUSED	1	/* node information request is refused */
-#define ICMP6_NI_UNKNOWN	2	/* unknown Qtype */
-
-#define ICMP6_ROUTER_RENUMBERING_COMMAND  0	/* rr command */
-#define ICMP6_ROUTER_RENUMBERING_RESULT   1	/* rr result */
-#define ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET   255	/* rr seq num reset */
-
-/* Used in kernel only */
-#define ND_REDIRECT_ONLINK	0	/* redirect to an on-link node */
-#define ND_REDIRECT_ROUTER	1	/* redirect to a better router */
-
-/*
- * Multicast Listener Discovery
- */
-struct mld_hdr {
-	struct icmp6_hdr	mld_icmp6_hdr;
-	struct in6_addr		mld_addr; /* multicast address */
-} __attribute__((__packed__));
-
-/* definitions to provide backward compatibility to old KAME applications */
-#ifndef _KERNEL
-#define mld6_hdr	mld_hdr
-#define mld6_type	mld_type
-#define mld6_code	mld_code
-#define mld6_cksum	mld_cksum
-#define mld6_maxdelay	mld_maxdelay
-#define mld6_reserved	mld_reserved
-#define mld6_addr	mld_addr
-#endif
-
-/* shortcut macro definitions */
-#define mld_type	mld_icmp6_hdr.icmp6_type
-#define mld_code	mld_icmp6_hdr.icmp6_code
-#define mld_cksum	mld_icmp6_hdr.icmp6_cksum
-#define mld_maxdelay	mld_icmp6_hdr.icmp6_data16[0]
-#define mld_reserved	mld_icmp6_hdr.icmp6_data16[1]
-
-/*
- * Neighbor Discovery
- */
-
-struct nd_router_solicit {	/* router solicitation */
-	struct icmp6_hdr 	nd_rs_hdr;
-	/* could be followed by options */
-} __attribute__((__packed__));
-
-#define nd_rs_type	nd_rs_hdr.icmp6_type
-#define nd_rs_code	nd_rs_hdr.icmp6_code
-#define nd_rs_cksum	nd_rs_hdr.icmp6_cksum
-#define nd_rs_reserved	nd_rs_hdr.icmp6_data32[0]
-
-struct nd_router_advert {	/* router advertisement */
-	struct icmp6_hdr	nd_ra_hdr;
-	u_int32_t		nd_ra_reachable;	/* reachable time */
-	u_int32_t		nd_ra_retransmit;	/* retransmit timer */
-	/* could be followed by options */
-} __attribute__((__packed__));
-
-#define nd_ra_type		nd_ra_hdr.icmp6_type
-#define nd_ra_code		nd_ra_hdr.icmp6_code
-#define nd_ra_cksum		nd_ra_hdr.icmp6_cksum
-#define nd_ra_curhoplimit	nd_ra_hdr.icmp6_data8[0]
-#define nd_ra_flags_reserved	nd_ra_hdr.icmp6_data8[1]
-#define ND_RA_FLAG_MANAGED	0x80
-#define ND_RA_FLAG_OTHER	0x40
-#define ND_RA_FLAG_HA		0x20
-
-/*
- * Router preference values based on draft-draves-ipngwg-router-selection-01.
- * These are non-standard definitions.
- */
-#define ND_RA_FLAG_RTPREF_MASK	0x18 /* 00011000 */
-
-#define ND_RA_FLAG_RTPREF_HIGH	0x08 /* 00001000 */
-#define ND_RA_FLAG_RTPREF_MEDIUM	0x00 /* 00000000 */
-#define ND_RA_FLAG_RTPREF_LOW	0x18 /* 00011000 */
-#define ND_RA_FLAG_RTPREF_RSV	0x10 /* 00010000 */
-
-#define nd_ra_router_lifetime	nd_ra_hdr.icmp6_data16[1]
-
-struct nd_neighbor_solicit {	/* neighbor solicitation */
-	struct icmp6_hdr	nd_ns_hdr;
-	struct in6_addr		nd_ns_target;	/*target address */
-	/* could be followed by options */
-} __attribute__((__packed__));
-
-#define nd_ns_type		nd_ns_hdr.icmp6_type
-#define nd_ns_code		nd_ns_hdr.icmp6_code
-#define nd_ns_cksum		nd_ns_hdr.icmp6_cksum
-#define nd_ns_reserved		nd_ns_hdr.icmp6_data32[0]
-
-struct nd_neighbor_advert {	/* neighbor advertisement */
-	struct icmp6_hdr	nd_na_hdr;
-	struct in6_addr		nd_na_target;	/* target address */
-	/* could be followed by options */
-} __attribute__((__packed__));
-
-#define nd_na_type		nd_na_hdr.icmp6_type
-#define nd_na_code		nd_na_hdr.icmp6_code
-#define nd_na_cksum		nd_na_hdr.icmp6_cksum
-#define nd_na_flags_reserved	nd_na_hdr.icmp6_data32[0]
-#if BYTE_ORDER == BIG_ENDIAN
-#define ND_NA_FLAG_ROUTER		0x80000000
-#define ND_NA_FLAG_SOLICITED		0x40000000
-#define ND_NA_FLAG_OVERRIDE		0x20000000
-#else
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define ND_NA_FLAG_ROUTER		0x80
-#define ND_NA_FLAG_SOLICITED		0x40
-#define ND_NA_FLAG_OVERRIDE		0x20
-#endif
-#endif
-
-struct nd_redirect {		/* redirect */
-	struct icmp6_hdr	nd_rd_hdr;
-	struct in6_addr		nd_rd_target;	/* target address */
-	struct in6_addr		nd_rd_dst;	/* destination address */
-	/* could be followed by options */
-} __attribute__((__packed__));
-
-#define nd_rd_type		nd_rd_hdr.icmp6_type
-#define nd_rd_code		nd_rd_hdr.icmp6_code
-#define nd_rd_cksum		nd_rd_hdr.icmp6_cksum
-#define nd_rd_reserved		nd_rd_hdr.icmp6_data32[0]
-
-struct nd_opt_hdr {		/* Neighbor discovery option header */
-	u_int8_t	nd_opt_type;
-	u_int8_t	nd_opt_len;
-	/* followed by option specific data*/
-} __attribute__((__packed__));
-
-#define ND_OPT_SOURCE_LINKADDR		1
-#define ND_OPT_TARGET_LINKADDR		2
-#define ND_OPT_PREFIX_INFORMATION	3
-#define ND_OPT_REDIRECTED_HEADER	4
-#define ND_OPT_MTU			5
-
-#define ND_OPT_ROUTE_INFO		200	/* draft-ietf-ipngwg-router-preference, not officially assigned yet */
-
-struct nd_opt_prefix_info {	/* prefix information */
-	u_int8_t	nd_opt_pi_type;
-	u_int8_t	nd_opt_pi_len;
-	u_int8_t	nd_opt_pi_prefix_len;
-	u_int8_t	nd_opt_pi_flags_reserved;
-	u_int32_t	nd_opt_pi_valid_time;
-	u_int32_t	nd_opt_pi_preferred_time;
-	u_int32_t	nd_opt_pi_reserved2;
-	struct in6_addr	nd_opt_pi_prefix;
-} __attribute__((__packed__));
-
-#define ND_OPT_PI_FLAG_ONLINK		0x80
-#define ND_OPT_PI_FLAG_AUTO		0x40
-
-struct nd_opt_rd_hdr {		/* redirected header */
-	u_int8_t	nd_opt_rh_type;
-	u_int8_t	nd_opt_rh_len;
-	u_int16_t	nd_opt_rh_reserved1;
-	u_int32_t	nd_opt_rh_reserved2;
-	/* followed by IP header and data */
-} __attribute__((__packed__));
-
-struct nd_opt_mtu {		/* MTU option */
-	u_int8_t	nd_opt_mtu_type;
-	u_int8_t	nd_opt_mtu_len;
-	u_int16_t	nd_opt_mtu_reserved;
-	u_int32_t	nd_opt_mtu_mtu;
-} __attribute__((__packed__));
-
-struct nd_opt_route_info {	/* route info */
-	u_int8_t	nd_opt_rti_type;
-	u_int8_t	nd_opt_rti_len;
-	u_int8_t	nd_opt_rti_prefixlen;
-	u_int8_t	nd_opt_rti_flags;
-	u_int32_t	nd_opt_rti_lifetime;
-	/* prefix follows */
-} __attribute__((__packed__));
-
-/*
- * icmp6 namelookup
- */
-
-struct icmp6_namelookup {
-	struct icmp6_hdr 	icmp6_nl_hdr;
-	u_int8_t	icmp6_nl_nonce[8];
-	int32_t		icmp6_nl_ttl;
-#if 0
-	u_int8_t	icmp6_nl_len;
-	u_int8_t	icmp6_nl_name[3];
-#endif
-	/* could be followed by options */
-} __attribute__((__packed__));
-
-/*
- * icmp6 node information
- */
-struct icmp6_nodeinfo {
-	struct icmp6_hdr icmp6_ni_hdr;
-	u_int8_t icmp6_ni_nonce[8];
-	/* could be followed by reply data */
-} __attribute__((__packed__));
-
-#define ni_type		icmp6_ni_hdr.icmp6_type
-#define ni_code		icmp6_ni_hdr.icmp6_code
-#define ni_cksum	icmp6_ni_hdr.icmp6_cksum
-#define ni_qtype	icmp6_ni_hdr.icmp6_data16[0]
-#define ni_flags	icmp6_ni_hdr.icmp6_data16[1]
-
-#define NI_QTYPE_NOOP		0 /* NOOP  */
-#define NI_QTYPE_SUPTYPES	1 /* Supported Qtypes */
-#define NI_QTYPE_FQDN		2 /* FQDN (draft 04) */
-#define NI_QTYPE_DNSNAME	2 /* DNS Name */
-#define NI_QTYPE_NODEADDR	3 /* Node Addresses */
-#define NI_QTYPE_IPV4ADDR	4 /* IPv4 Addresses */
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define NI_SUPTYPE_FLAG_COMPRESS	0x1
-#define NI_FQDN_FLAG_VALIDTTL		0x1
-#elif BYTE_ORDER == LITTLE_ENDIAN
-#define NI_SUPTYPE_FLAG_COMPRESS	0x0100
-#define NI_FQDN_FLAG_VALIDTTL		0x0100
-#endif
-
-#ifdef NAME_LOOKUPS_04
-#if BYTE_ORDER == BIG_ENDIAN
-#define NI_NODEADDR_FLAG_LINKLOCAL	0x1
-#define NI_NODEADDR_FLAG_SITELOCAL	0x2
-#define NI_NODEADDR_FLAG_GLOBAL		0x4
-#define NI_NODEADDR_FLAG_ALL		0x8
-#define NI_NODEADDR_FLAG_TRUNCATE	0x10
-#define NI_NODEADDR_FLAG_ANYCAST	0x20 /* just experimental. not in spec */
-#elif BYTE_ORDER == LITTLE_ENDIAN
-#define NI_NODEADDR_FLAG_LINKLOCAL	0x0100
-#define NI_NODEADDR_FLAG_SITELOCAL	0x0200
-#define NI_NODEADDR_FLAG_GLOBAL		0x0400
-#define NI_NODEADDR_FLAG_ALL		0x0800
-#define NI_NODEADDR_FLAG_TRUNCATE	0x1000
-#define NI_NODEADDR_FLAG_ANYCAST	0x2000 /* just experimental. not in spec */
-#endif
-#else  /* draft-ietf-ipngwg-icmp-name-lookups-05 (and later?) */
-#if BYTE_ORDER == BIG_ENDIAN
-#define NI_NODEADDR_FLAG_TRUNCATE	0x1
-#define NI_NODEADDR_FLAG_ALL		0x2
-#define NI_NODEADDR_FLAG_COMPAT		0x4
-#define NI_NODEADDR_FLAG_LINKLOCAL	0x8
-#define NI_NODEADDR_FLAG_SITELOCAL	0x10
-#define NI_NODEADDR_FLAG_GLOBAL		0x20
-#define NI_NODEADDR_FLAG_ANYCAST	0x40 /* just experimental. not in spec */
-#elif BYTE_ORDER == LITTLE_ENDIAN
-#define NI_NODEADDR_FLAG_TRUNCATE	0x0100
-#define NI_NODEADDR_FLAG_ALL		0x0200
-#define NI_NODEADDR_FLAG_COMPAT		0x0400
-#define NI_NODEADDR_FLAG_LINKLOCAL	0x0800
-#define NI_NODEADDR_FLAG_SITELOCAL	0x1000
-#define NI_NODEADDR_FLAG_GLOBAL		0x2000
-#define NI_NODEADDR_FLAG_ANYCAST	0x4000 /* just experimental. not in spec */
-#endif
-#endif
-
-struct ni_reply_fqdn {
-	u_int32_t ni_fqdn_ttl;	/* TTL */
-	u_int8_t ni_fqdn_namelen; /* length in octets of the FQDN */
-	u_int8_t ni_fqdn_name[3]; /* XXX: alignment */
-} __attribute__((__packed__));
-
-/*
- * Router Renumbering. as router-renum-08.txt
- */
-struct icmp6_router_renum {	/* router renumbering header */
-	struct icmp6_hdr	rr_hdr;
-	u_int8_t	rr_segnum;
-	u_int8_t	rr_flags;
-	u_int16_t	rr_maxdelay;
-	u_int32_t	rr_reserved;
-} __attribute__((__packed__));
-
-#define ICMP6_RR_FLAGS_TEST		0x80
-#define ICMP6_RR_FLAGS_REQRESULT	0x40
-#define ICMP6_RR_FLAGS_FORCEAPPLY	0x20
-#define ICMP6_RR_FLAGS_SPECSITE		0x10
-#define ICMP6_RR_FLAGS_PREVDONE		0x08
-
-#define rr_type		rr_hdr.icmp6_type
-#define rr_code		rr_hdr.icmp6_code
-#define rr_cksum	rr_hdr.icmp6_cksum
-#define rr_seqnum 	rr_hdr.icmp6_data32[0]
-
-struct rr_pco_match {		/* match prefix part */
-	u_int8_t	rpm_code;
-	u_int8_t	rpm_len;
-	u_int8_t	rpm_ordinal;
-	u_int8_t	rpm_matchlen;
-	u_int8_t	rpm_minlen;
-	u_int8_t	rpm_maxlen;
-	u_int16_t	rpm_reserved;
-	struct	in6_addr	rpm_prefix;
-} __attribute__((__packed__));
-
-#define RPM_PCO_ADD		1
-#define RPM_PCO_CHANGE		2
-#define RPM_PCO_SETGLOBAL	3
-#define RPM_PCO_MAX		4
-
-struct rr_pco_use {		/* use prefix part */
-	u_int8_t	rpu_uselen;
-	u_int8_t	rpu_keeplen;
-	u_int8_t	rpu_ramask;
-	u_int8_t	rpu_raflags;
-	u_int32_t	rpu_vltime;
-	u_int32_t	rpu_pltime;
-	u_int32_t	rpu_flags;
-	struct	in6_addr rpu_prefix;
-} __attribute__((__packed__));
-#define ICMP6_RR_PCOUSE_RAFLAGS_ONLINK	0x80
-#define ICMP6_RR_PCOUSE_RAFLAGS_AUTO	0x40
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME     0x80000000
-#define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME     0x40000000
-#elif BYTE_ORDER == LITTLE_ENDIAN
-#define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME     0x80
-#define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME     0x40
-#endif
-
-struct rr_result {		/* router renumbering result message */
-	u_int16_t	rrr_flags;
-	u_int8_t	rrr_ordinal;
-	u_int8_t	rrr_matchedlen;
-	u_int32_t	rrr_ifid;
-	struct	in6_addr rrr_prefix;
-} __attribute__((__packed__));
-#if BYTE_ORDER == BIG_ENDIAN
-#define ICMP6_RR_RESULT_FLAGS_OOB		0x0002
-#define ICMP6_RR_RESULT_FLAGS_FORBIDDEN		0x0001
-#elif BYTE_ORDER == LITTLE_ENDIAN
-#define ICMP6_RR_RESULT_FLAGS_OOB		0x0200
-#define ICMP6_RR_RESULT_FLAGS_FORBIDDEN		0x0100
-#endif
-
-/*
- * icmp6 filter structures.
- */
-
-struct icmp6_filter {
-	u_int32_t icmp6_filt[8];
-};
-
-#ifdef _KERNEL
-#define	ICMP6_FILTER_SETPASSALL(filterp) \
-do {								\
-	int i; u_char *p;					\
-	p = (u_char *)filterp;					\
-	for (i = 0; i < sizeof(struct icmp6_filter); i++)	\
-		p[i] = 0xff;					\
-} while (0)
-#define	ICMP6_FILTER_SETBLOCKALL(filterp) \
-	bzero(filterp, sizeof(struct icmp6_filter))
-#else /* _KERNEL */
-#define	ICMP6_FILTER_SETPASSALL(filterp) \
-	memset(filterp, 0xff, sizeof(struct icmp6_filter))
-#define	ICMP6_FILTER_SETBLOCKALL(filterp) \
-	memset(filterp, 0x00, sizeof(struct icmp6_filter))
-#endif /* _KERNEL */
-
-#define	ICMP6_FILTER_SETPASS(type, filterp) \
-	(((filterp)->icmp6_filt[(type) >> 5]) |= (1 << ((type) & 31)))
-#define	ICMP6_FILTER_SETBLOCK(type, filterp) \
-	(((filterp)->icmp6_filt[(type) >> 5]) &= ~(1 << ((type) & 31)))
-#define	ICMP6_FILTER_WILLPASS(type, filterp) \
-	((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) != 0)
-#define	ICMP6_FILTER_WILLBLOCK(type, filterp) \
-	((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) == 0)
-
-/*
- * Variables related to this implementation
- * of the internet control message protocol version 6.
- */
-struct icmp6errstat {
-	u_quad_t icp6errs_dst_unreach_noroute;
-	u_quad_t icp6errs_dst_unreach_admin;
-	u_quad_t icp6errs_dst_unreach_beyondscope;
-	u_quad_t icp6errs_dst_unreach_addr;
-	u_quad_t icp6errs_dst_unreach_noport;
-	u_quad_t icp6errs_packet_too_big;
-	u_quad_t icp6errs_time_exceed_transit;
-	u_quad_t icp6errs_time_exceed_reassembly;
-	u_quad_t icp6errs_paramprob_header;
-	u_quad_t icp6errs_paramprob_nextheader;
-	u_quad_t icp6errs_paramprob_option;
-	u_quad_t icp6errs_redirect; /* we regard redirect as an error here */
-	u_quad_t icp6errs_unknown;
-};
-
-struct icmp6stat {
-/* statistics related to icmp6 packets generated */
-	u_quad_t icp6s_error;		/* # of calls to icmp6_error */
-	u_quad_t icp6s_canterror;	/* no error 'cuz old was icmp */
-	u_quad_t icp6s_toofreq;		/* no error 'cuz rate limitation */
-	u_quad_t icp6s_outhist[256];
-/* statistics related to input message processed */
-	u_quad_t icp6s_badcode;		/* icmp6_code out of range */
-	u_quad_t icp6s_tooshort;	/* packet < sizeof(struct icmp6_hdr) */
-	u_quad_t icp6s_checksum;	/* bad checksum */
-	u_quad_t icp6s_badlen;		/* calculated bound mismatch */
-	/*
-	 * number of responses: this member is inherited from netinet code, but
-	 * for netinet6 code, it is already available in icp6s_outhist[].
-	 */
-	u_quad_t icp6s_reflect;
-	u_quad_t icp6s_inhist[256];	
-	u_quad_t icp6s_nd_toomanyopt;	/* too many ND options */
-	struct icmp6errstat icp6s_outerrhist;
-#define icp6s_odst_unreach_noroute \
-	icp6s_outerrhist.icp6errs_dst_unreach_noroute
-#define icp6s_odst_unreach_admin icp6s_outerrhist.icp6errs_dst_unreach_admin
-#define icp6s_odst_unreach_beyondscope \
-	icp6s_outerrhist.icp6errs_dst_unreach_beyondscope
-#define icp6s_odst_unreach_addr icp6s_outerrhist.icp6errs_dst_unreach_addr
-#define icp6s_odst_unreach_noport icp6s_outerrhist.icp6errs_dst_unreach_noport
-#define icp6s_opacket_too_big icp6s_outerrhist.icp6errs_packet_too_big
-#define icp6s_otime_exceed_transit \
-	icp6s_outerrhist.icp6errs_time_exceed_transit
-#define icp6s_otime_exceed_reassembly \
-	icp6s_outerrhist.icp6errs_time_exceed_reassembly
-#define icp6s_oparamprob_header icp6s_outerrhist.icp6errs_paramprob_header
-#define icp6s_oparamprob_nextheader \
-	icp6s_outerrhist.icp6errs_paramprob_nextheader
-#define icp6s_oparamprob_option icp6s_outerrhist.icp6errs_paramprob_option
-#define icp6s_oredirect icp6s_outerrhist.icp6errs_redirect
-#define icp6s_ounknown icp6s_outerrhist.icp6errs_unknown
-	u_quad_t icp6s_pmtuchg;		/* path MTU changes */
-	u_quad_t icp6s_nd_badopt;	/* bad ND options */
-	u_quad_t icp6s_badns;		/* bad neighbor solicitation */
-	u_quad_t icp6s_badna;		/* bad neighbor advertisement */
-	u_quad_t icp6s_badrs;		/* bad router advertisement */
-	u_quad_t icp6s_badra;		/* bad router advertisement */
-	u_quad_t icp6s_badredirect;	/* bad redirect message */
-};
-
-/*
- * Names for ICMP sysctl objects
- */
-#define ICMPV6CTL_STATS		1
-#define ICMPV6CTL_REDIRACCEPT	2	/* accept/process redirects */
-#define ICMPV6CTL_REDIRTIMEOUT	3	/* redirect cache time */
-#if 0	/*obsoleted*/
-#define ICMPV6CTL_ERRRATELIMIT	5	/* ICMPv6 error rate limitation */
-#endif
-#define ICMPV6CTL_ND6_PRUNE	6
-#define ICMPV6CTL_ND6_DELAY	8
-#define ICMPV6CTL_ND6_UMAXTRIES	9
-#define ICMPV6CTL_ND6_MMAXTRIES		10
-#define ICMPV6CTL_ND6_USELOOPBACK	11
-/*#define ICMPV6CTL_ND6_PROXYALL	12	obsoleted, do not reuse here */
-#define ICMPV6CTL_NODEINFO	13
-#define ICMPV6CTL_ERRPPSLIMIT	14	/* ICMPv6 error pps limitation */
-#define ICMPV6CTL_ND6_MAXNUDHINT	15
-#define ICMPV6CTL_MTUDISC_HIWAT	16
-#define ICMPV6CTL_MTUDISC_LOWAT	17
-#define ICMPV6CTL_ND6_DEBUG	18
-#define ICMPV6CTL_ND6_DRLIST	19
-#define ICMPV6CTL_ND6_PRLIST	20
-#define ICMPV6CTL_MAXID		21
-
-#define ICMPV6CTL_NAMES { \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "rediraccept", CTLTYPE_INT }, \
-	{ "redirtimeout", CTLTYPE_INT }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "nd6_prune", CTLTYPE_INT }, \
-	{ 0, 0 }, \
-	{ "nd6_delay", CTLTYPE_INT }, \
-	{ "nd6_umaxtries", CTLTYPE_INT }, \
-	{ "nd6_mmaxtries", CTLTYPE_INT }, \
-	{ "nd6_useloopback", CTLTYPE_INT }, \
-	{ 0, 0 }, \
-	{ "nodeinfo", CTLTYPE_INT }, \
-	{ "errppslimit", CTLTYPE_INT }, \
-	{ "nd6_maxnudhint", CTLTYPE_INT }, \
-	{ "mtudisc_hiwat", CTLTYPE_INT }, \
-	{ "mtudisc_lowat", CTLTYPE_INT }, \
-	{ "nd6_debug", CTLTYPE_INT }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-}
-
-#define RTF_PROBEMTU	RTF_PROTO1
-
-#ifdef _KERNEL
-# ifdef __STDC__
-struct	rtentry;
-struct	rttimer;
-struct	in6_multi;
-# endif
-void	icmp6_init(void);
-void	icmp6_paramerror(struct mbuf *, int);
-void	icmp6_error(struct mbuf *, int, int, int);
-int	icmp6_input(struct mbuf **, int *, int);
-void	icmp6_fasttimo(void);
-void	icmp6_reflect(struct mbuf *, size_t);
-void	icmp6_prepare(struct mbuf *);
-void	icmp6_redirect_input(struct mbuf *, int);
-void	icmp6_redirect_output(struct mbuf *, struct rtentry *);
-
-struct	ip6ctlparam;
-void	icmp6_mtudisc_update(struct ip6ctlparam *, int);
-
-/* XXX: is this the right place for these macros? */
-#define icmp6_ifstat_inc(ifp, tag) \
-do {								\
-	if ((ifp) && (ifp)->if_index <= if_index			\
-	 && (ifp)->if_index < icmp6_ifstatmax			\
-	 && icmp6_ifstat && icmp6_ifstat[(ifp)->if_index]) {	\
-		icmp6_ifstat[(ifp)->if_index]->tag++;		\
-	}							\
-} while (0)
-
-#define icmp6_ifoutstat_inc(ifp, type, code) \
-do { \
-		icmp6_ifstat_inc(ifp, ifs6_out_msg); \
- 		if (type < ICMP6_INFOMSG_MASK) \
- 			icmp6_ifstat_inc(ifp, ifs6_out_error); \
-		switch(type) { \
-		 case ICMP6_DST_UNREACH: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_dstunreach); \
-			 if (code == ICMP6_DST_UNREACH_ADMIN) \
-				 icmp6_ifstat_inc(ifp, ifs6_out_adminprohib); \
-			 break; \
-		 case ICMP6_PACKET_TOO_BIG: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_pkttoobig); \
-			 break; \
-		 case ICMP6_TIME_EXCEEDED: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_timeexceed); \
-			 break; \
-		 case ICMP6_PARAM_PROB: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_paramprob); \
-			 break; \
-		 case ICMP6_ECHO_REQUEST: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_echo); \
-			 break; \
-		 case ICMP6_ECHO_REPLY: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_echoreply); \
-			 break; \
-		 case MLD_LISTENER_QUERY: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_mldquery); \
-			 break; \
-		 case MLD_LISTENER_REPORT: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_mldreport); \
-			 break; \
-		 case MLD_LISTENER_DONE: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_mlddone); \
-			 break; \
-		 case ND_ROUTER_SOLICIT: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_routersolicit); \
-			 break; \
-		 case ND_ROUTER_ADVERT: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_routeradvert); \
-			 break; \
-		 case ND_NEIGHBOR_SOLICIT: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_neighborsolicit); \
-			 break; \
-		 case ND_NEIGHBOR_ADVERT: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_neighboradvert); \
-			 break; \
-		 case ND_REDIRECT: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_redirect); \
-			 break; \
-		} \
-} while (0)
-
-extern int	icmp6_rediraccept;	/* accept/process redirects */
-extern int	icmp6_redirtimeout;	/* cache time for redirect routes */
-#endif /* _KERNEL */
-
-#endif /* not _NETINET_ICMP6_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/icmp_var.h b/newlib/libc/sys/linux/include/netinet/icmp_var.h
deleted file mode 100644
index 79ce146..0000000
--- a/newlib/libc/sys/linux/include/netinet/icmp_var.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/icmp_var.h,v 1.21 2002/03/19 21:25:46 alfred Exp $
- */
-
-#ifndef _NETINET_ICMP_VAR_H_
-#define _NETINET_ICMP_VAR_H_
-
-
-/*
- * Variables related to this implementation
- * of the internet control message protocol.
- */
-struct	icmpstat {
-/* statistics related to icmp packets generated */
-	u_long	icps_error;		/* # of calls to icmp_error */
-	u_long	icps_oldshort;		/* no error 'cuz old ip too short */
-	u_long	icps_oldicmp;		/* no error 'cuz old was icmp */
-	u_long	icps_outhist[ICMP_MAXTYPE + 1];
-/* statistics related to input messages processed */
- 	u_long	icps_badcode;		/* icmp_code out of range */
-	u_long	icps_tooshort;		/* packet < ICMP_MINLEN */
-	u_long	icps_checksum;		/* bad checksum */
-	u_long	icps_badlen;		/* calculated bound mismatch */
-	u_long	icps_reflect;		/* number of responses */
-	u_long	icps_inhist[ICMP_MAXTYPE + 1];
-	u_long	icps_bmcastecho; 	/* b/mcast echo requests dropped */
-	u_long	icps_bmcasttstamp; 	/* b/mcast tstamp requests dropped */
-	u_long	icps_badaddr;		/* bad return address */
-	u_long	icps_noroute; 		/* no route back */
-};
-
-/*
- * Names for ICMP sysctl objects
- */
-#define	ICMPCTL_MASKREPL	1	/* allow replies to netmask requests */
-#define	ICMPCTL_STATS		2	/* statistics (read-only) */
-#define ICMPCTL_ICMPLIM		3
-#define ICMPCTL_MAXID		4
-
-#define ICMPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "maskrepl", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-	{ "icmplim", CTLTYPE_INT }, \
-}
-
-#ifdef _KERNEL
-SYSCTL_DECL(_net_inet_icmp);
-extern int badport_bandlim(int);
-#define BANDLIM_UNLIMITED -1
-#define BANDLIM_ICMP_UNREACH 0
-#define BANDLIM_ICMP_ECHO 1
-#define BANDLIM_ICMP_TSTAMP 2
-#define BANDLIM_RST_CLOSEDPORT 3 /* No connection, and no listeners */
-#define BANDLIM_RST_OPENPORT 4   /* No connection, listener */
-#define BANDLIM_MAX 4
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet/if_atm.h b/newlib/libc/sys/linux/include/netinet/if_atm.h
deleted file mode 100644
index 04ce13e..0000000
--- a/newlib/libc/sys/linux/include/netinet/if_atm.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $FreeBSD: src/sys/netinet/if_atm.h,v 1.5 2002/03/19 21:25:46 alfred Exp $ */
-/*      $NetBSD: if_atm.h,v 1.2 1996/07/03 17:17:17 chuck Exp $       */
-
-/*
- *
- * Copyright (c) 1996 Charles D. Cranor and Washington University.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Charles D. Cranor and 
- * 	Washington University.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * if_atm.h
- */
-
-struct atm_pseudohdr;
-struct mbuf;
-struct rtentry;
-struct sockaddr;
-
-void atm_rtrequest(int, struct rtentry *, struct rt_addrinfo *);
-int atmresolve(struct rtentry *, struct mbuf *, struct sockaddr *, 
-		struct atm_pseudohdr *);
diff --git a/newlib/libc/sys/linux/include/netinet/if_ether.h b/newlib/libc/sys/linux/include/netinet/if_ether.h
deleted file mode 100644
index ec65a3e..0000000
--- a/newlib/libc/sys/linux/include/netinet/if_ether.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
- * $FreeBSD: src/sys/netinet/if_ether.h,v 1.27 2002/03/24 10:19:10 bde Exp $
- */
-
-#ifndef _NETINET_IF_ETHER_H_
-#define _NETINET_IF_ETHER_H_
-
-#include <net/ethernet.h>
-#include <net/if_arp.h>
-
-/*
- * Macro to map an IP multicast address to an Ethernet multicast address.
- * The high-order 25 bits of the Ethernet address are statically assigned,
- * and the low-order 23 bits are taken from the low end of the IP address.
- */
-#define ETHER_MAP_IP_MULTICAST(ipaddr, enaddr) \
-	/* struct in_addr *ipaddr; */ \
-	/* u_char enaddr[ETHER_ADDR_LEN];	   */ \
-{ \
-	(enaddr)[0] = 0x01; \
-	(enaddr)[1] = 0x00; \
-	(enaddr)[2] = 0x5e; \
-	(enaddr)[3] = ((u_char *)ipaddr)[1] & 0x7f; \
-	(enaddr)[4] = ((u_char *)ipaddr)[2]; \
-	(enaddr)[5] = ((u_char *)ipaddr)[3]; \
-}
-/*
- * Macro to map an IP6 multicast address to an Ethernet multicast address.
- * The high-order 16 bits of the Ethernet address are statically assigned,
- * and the low-order 32 bits are taken from the low end of the IP6 address.
- */
-#define ETHER_MAP_IPV6_MULTICAST(ip6addr, enaddr)			\
-/* struct	in6_addr *ip6addr; */					\
-/* u_char	enaddr[ETHER_ADDR_LEN]; */				\
-{                                                                       \
-	(enaddr)[0] = 0x33;						\
-	(enaddr)[1] = 0x33;						\
-	(enaddr)[2] = ((u_char *)ip6addr)[12];				\
-	(enaddr)[3] = ((u_char *)ip6addr)[13];				\
-	(enaddr)[4] = ((u_char *)ip6addr)[14];				\
-	(enaddr)[5] = ((u_char *)ip6addr)[15];				\
-}
-
-/*
- * Ethernet Address Resolution Protocol.
- *
- * See RFC 826 for protocol description.  Structure below is adapted
- * to resolving internet addresses.  Field names used correspond to
- * RFC 826.
- */
-struct	ether_arp {
-	struct	arphdr ea_hdr;	/* fixed-size header */
-	u_char	arp_sha[ETHER_ADDR_LEN];	/* sender hardware address */
-	u_char	arp_spa[4];	/* sender protocol address */
-	u_char	arp_tha[ETHER_ADDR_LEN];	/* target hardware address */
-	u_char	arp_tpa[4];	/* target protocol address */
-};
-#define	arp_hrd	ea_hdr.ar_hrd
-#define	arp_pro	ea_hdr.ar_pro
-#define	arp_hln	ea_hdr.ar_hln
-#define	arp_pln	ea_hdr.ar_pln
-#define	arp_op	ea_hdr.ar_op
-
-struct sockaddr_inarp {
-	u_char	sin_len;
-	u_char	sin_family;
-	u_short sin_port;
-	struct	in_addr sin_addr;
-	struct	in_addr sin_srcaddr;
-	u_short	sin_tos;
-	u_short	sin_other;
-#define SIN_PROXY 1
-};
-/*
- * IP and ethernet specific routing flags
- */
-#define	RTF_USETRAILERS	RTF_PROTO1	/* use trailers */
-#define RTF_ANNOUNCE	RTF_PROTO2	/* announce new arp entry */
-
-#ifdef	_KERNEL
-extern u_char	ether_ipmulticast_min[ETHER_ADDR_LEN];
-extern u_char	ether_ipmulticast_max[ETHER_ADDR_LEN];
-extern struct	ifqueue arpintrq;
-
-int	arpresolve(struct ifnet *, struct rtentry *, struct mbuf *,
-	    struct sockaddr *, u_char *, struct rtentry *);
-void	arp_ifinit(struct ifnet *, struct ifaddr *);
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet/igmp.h b/newlib/libc/sys/linux/include/netinet/igmp.h
deleted file mode 100644
index 448265a..0000000
--- a/newlib/libc/sys/linux/include/netinet/igmp.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/igmp.h,v 1.10 1999/08/28 00:49:15 peter Exp $
- */
-
-#ifndef _NETINET_IGMP_H_
-#define _NETINET_IGMP_H_
-
-/*
- * Internet Group Management Protocol (IGMP) definitions.
- *
- * Written by Steve Deering, Stanford, May 1988.
- *
- * MULTICAST Revision: 3.5.1.2
- */
-
-/*
- * IGMP packet format.
- */
-struct igmp {
-	u_char		igmp_type;	/* version & type of IGMP message  */
-	u_char		igmp_code;	/* subtype for routing msgs        */
-	u_short		igmp_cksum;	/* IP-style checksum               */
-	struct in_addr	igmp_group;	/* group address being reported    */
-};					/*  (zero for queries)             */
-
-#define IGMP_MINLEN		     8
-
-/*
- * Message types, including version number.
- */
-#define IGMP_MEMBERSHIP_QUERY   	0x11	/* membership query         */
-#define IGMP_V1_MEMBERSHIP_REPORT	0x12	/* Ver. 1 membership report */
-#define IGMP_V2_MEMBERSHIP_REPORT	0x16	/* Ver. 2 membership report */
-#define IGMP_V2_LEAVE_GROUP		0x17	/* Leave-group message	    */
-
-#define IGMP_DVMRP			0x13	/* DVMRP routing message    */
-#define IGMP_PIM			0x14	/* PIM routing message	    */
-
-#define IGMP_MTRACE_RESP		0x1e  /* traceroute resp.(to sender)*/
-#define IGMP_MTRACE			0x1f  /* mcast traceroute messages  */
-
-#define IGMP_MAX_HOST_REPORT_DELAY   10    /* max delay for response to     */
-					   /*  query (in seconds) according */
-					   /*  to RFC1112                   */
-
-
-#define IGMP_TIMER_SCALE     10		/* denotes that the igmp code field */
-					/* specifies time in 10th of seconds*/
-
-/*
- * The following four defininitions are for backwards compatibility.
- * They should be removed as soon as all applications are updated to
- * use the new constant names.
- */
-#define IGMP_HOST_MEMBERSHIP_QUERY	IGMP_MEMBERSHIP_QUERY
-#define IGMP_HOST_MEMBERSHIP_REPORT	IGMP_V1_MEMBERSHIP_REPORT
-#define IGMP_HOST_NEW_MEMBERSHIP_REPORT	IGMP_V2_MEMBERSHIP_REPORT
-#define IGMP_HOST_LEAVE_MESSAGE		IGMP_V2_LEAVE_GROUP
-
-#endif /* _NETINET_IGMP_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/igmp_var.h b/newlib/libc/sys/linux/include/netinet/igmp_var.h
deleted file mode 100644
index 1cb6570..0000000
--- a/newlib/libc/sys/linux/include/netinet/igmp_var.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $FreeBSD: src/sys/netinet/igmp_var.h,v 1.19 2002/03/19 21:25:46 alfred Exp $
- */
-
-#ifndef _NETINET_IGMP_VAR_H_
-#define _NETINET_IGMP_VAR_H_
-
-/*
- * Internet Group Management Protocol (IGMP),
- * implementation-specific definitions.
- *
- * Written by Steve Deering, Stanford, May 1988.
- *
- * MULTICAST Revision: 3.5.1.3
- */
-
-struct igmpstat {
-	u_int	igps_rcv_total;		/* total IGMP messages received */
-	u_int	igps_rcv_tooshort;	/* received with too few bytes */
-	u_int	igps_rcv_badsum;	/* received with bad checksum */
-	u_int	igps_rcv_queries;	/* received membership queries */
-	u_int	igps_rcv_badqueries;	/* received invalid queries */
-	u_int	igps_rcv_reports;	/* received membership reports */
-	u_int	igps_rcv_badreports;	/* received invalid reports */
-	u_int	igps_rcv_ourreports;	/* received reports for our groups */
-	u_int	igps_snd_reports;	/* sent membership reports */
-};
-
-#ifdef _KERNEL
-#define IGMP_RANDOM_DELAY(X) (random() % (X) + 1)
-
-/*
- * States for IGMPv2's leave processing
- */
-#define IGMP_OTHERMEMBER			0
-#define IGMP_IREPORTEDLAST			1
-
-/*
- * We must remember what version the subnet's querier is.
- * We conveniently use the IGMP message type for the proper
- * membership report to keep this state.
- */
-#define IGMP_V1_ROUTER				IGMP_V1_MEMBERSHIP_REPORT
-#define IGMP_V2_ROUTER				IGMP_V2_MEMBERSHIP_REPORT
-
-/*
- * Revert to new router if we haven't heard from an old router in
- * this amount of time.
- */
-#define IGMP_AGE_THRESHOLD			540
-
-void	igmp_init(void);
-void	igmp_input(struct mbuf *, int);
-void	igmp_joingroup(struct in_multi *);
-void	igmp_leavegroup(struct in_multi *);
-void	igmp_fasttimo(void);
-void	igmp_slowtimo(void);
-
-SYSCTL_DECL(_net_inet_igmp);
-
-#endif
-
-/*
- * Names for IGMP sysctl objects
- */
-#define IGMPCTL_STATS		1	/* statistics (read-only) */
-#define IGMPCTL_MAXID		2
-
-#define IGMPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-}
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet/in.h b/newlib/libc/sys/linux/include/netinet/in.h
deleted file mode 100644
index 19bc3f1..0000000
--- a/newlib/libc/sys/linux/include/netinet/in.h
+++ /dev/null
@@ -1,569 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $FreeBSD: src/sys/netinet/in.h,v 1.68 2002/04/24 01:26:11 mike Exp $
- */
-
-#ifndef _NETINET_IN_H_
-#define _NETINET_IN_H_
-
-#include <sys/cdefs.h>
-#include <sys/config.h>
-#include <sys/_types.h>
-#include <machine/endian.h>
-
-/* Protocols common to RFC 1700, POSIX, and X/Open. */
-#define	IPPROTO_IP		0		/* dummy for IP */
-#define	IPPROTO_ICMP		1		/* control message protocol */
-#define	IPPROTO_TCP		6		/* tcp */
-#define	IPPROTO_UDP		17		/* user datagram protocol */
-
-#define	INADDR_ANY		(u_int32_t)0x00000000
-#define	INADDR_BROADCAST	(u_int32_t)0xffffffff	/* must be masked */
-
-#ifndef _UINT8_T_DECLARED
-typedef	__uint8_t		uint8_t;
-#define	_UINT8_T_DECLARED
-#endif
-
-#ifndef _UINT16_T_DECLARED
-typedef	__uint16_t		uint16_t;
-#define	_UINT16_T_DECLARED
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef	__uint32_t		uint32_t;
-#define	_UINT32_T_DECLARED
-#endif
-
-#ifndef _IN_ADDR_T_DECLARED
-typedef	uint32_t		in_addr_t;
-#define	_IN_ADDR_T_DECLARED
-#endif
-
-#ifndef _IN_PORT_T_DECLARED
-typedef	uint16_t		in_port_t;
-#define	_IN_PORT_T_DECLARED
-#endif
-
-typedef unsigned short sa_family_t;
-
-#ifdef _BSD_SA_FAMILY_T_
-typedef	_BSD_SA_FAMILY_T_	sa_family_t;
-#undef _BSD_SA_FAMILY_T_ 
-#endif
-
-/* Internet address (a structure for historical reasons). */
-#ifndef	_STRUCT_IN_ADDR_DECLARED
-struct in_addr {
-	in_addr_t s_addr;
-};
-#define	_STRUCT_IN_ADDR_DECLARED
-#endif
-
-/* Socket address, internet style. */
-struct sockaddr_in {
-	sa_family_t	sin_family;
-	in_port_t	sin_port;
-	struct	in_addr sin_addr;
-	char	sin_zero[8];
-};
-
-#if __POSIX_VISIBLE >= 200112
-#define	IPPROTO_RAW		255		/* raw IP packet */
-#define	INET_ADDRSTRLEN		16
-#endif
-
-#define __BSD_VISIBLE 1
-#if __BSD_VISIBLE
-/*
- * Constants and structures defined by the internet system,
- * Per RFC 790, September 1981, and numerous additions.
- */
-
-/*
- * Protocols (RFC 1700)
- */
-#define	IPPROTO_HOPOPTS		0		/* IP6 hop-by-hop options */
-#define	IPPROTO_IGMP		2		/* group mgmt protocol */
-#define	IPPROTO_GGP		3		/* gateway^2 (deprecated) */
-#define IPPROTO_IPV4		4 		/* IPv4 encapsulation */
-#define IPPROTO_IPIP		IPPROTO_IPV4	/* for compatibility */
-#define	IPPROTO_ST		7		/* Stream protocol II */
-#define	IPPROTO_EGP		8		/* exterior gateway protocol */
-#define	IPPROTO_PIGP		9		/* private interior gateway */
-#define	IPPROTO_RCCMON		10		/* BBN RCC Monitoring */
-#define	IPPROTO_NVPII		11		/* network voice protocol*/
-#define	IPPROTO_PUP		12		/* pup */
-#define	IPPROTO_ARGUS		13		/* Argus */
-#define	IPPROTO_EMCON		14		/* EMCON */
-#define	IPPROTO_XNET		15		/* Cross Net Debugger */
-#define	IPPROTO_CHAOS		16		/* Chaos*/
-#define	IPPROTO_MUX		18		/* Multiplexing */
-#define	IPPROTO_MEAS		19		/* DCN Measurement Subsystems */
-#define	IPPROTO_HMP		20		/* Host Monitoring */
-#define	IPPROTO_PRM		21		/* Packet Radio Measurement */
-#define	IPPROTO_IDP		22		/* xns idp */
-#define	IPPROTO_TRUNK1		23		/* Trunk-1 */
-#define	IPPROTO_TRUNK2		24		/* Trunk-2 */
-#define	IPPROTO_LEAF1		25		/* Leaf-1 */
-#define	IPPROTO_LEAF2		26		/* Leaf-2 */
-#define	IPPROTO_RDP		27		/* Reliable Data */
-#define	IPPROTO_IRTP		28		/* Reliable Transaction */
-#define	IPPROTO_TP		29 		/* tp-4 w/ class negotiation */
-#define	IPPROTO_BLT		30		/* Bulk Data Transfer */
-#define	IPPROTO_NSP		31		/* Network Services */
-#define	IPPROTO_INP		32		/* Merit Internodal */
-#define	IPPROTO_SEP		33		/* Sequential Exchange */
-#define	IPPROTO_3PC		34		/* Third Party Connect */
-#define	IPPROTO_IDPR		35		/* InterDomain Policy Routing */
-#define	IPPROTO_XTP		36		/* XTP */
-#define	IPPROTO_DDP		37		/* Datagram Delivery */
-#define	IPPROTO_CMTP		38		/* Control Message Transport */
-#define	IPPROTO_TPXX		39		/* TP++ Transport */
-#define	IPPROTO_IL		40		/* IL transport protocol */
-#define	IPPROTO_IPV6		41		/* IP6 header */
-#define	IPPROTO_SDRP		42		/* Source Demand Routing */
-#define	IPPROTO_ROUTING		43		/* IP6 routing header */
-#define	IPPROTO_FRAGMENT	44		/* IP6 fragmentation header */
-#define	IPPROTO_IDRP		45		/* InterDomain Routing*/
-#define	IPPROTO_RSVP		46 		/* resource reservation */
-#define	IPPROTO_GRE		47		/* General Routing Encap. */
-#define	IPPROTO_MHRP		48		/* Mobile Host Routing */
-#define	IPPROTO_BHA		49		/* BHA */
-#define	IPPROTO_ESP		50		/* IP6 Encap Sec. Payload */
-#define	IPPROTO_AH		51		/* IP6 Auth Header */
-#define	IPPROTO_INLSP		52		/* Integ. Net Layer Security */
-#define	IPPROTO_SWIPE		53		/* IP with encryption */
-#define	IPPROTO_NHRP		54		/* Next Hop Resolution */
-#define IPPROTO_MOBILE		55		/* IP Mobility */
-#define IPPROTO_TLSP		56		/* Transport Layer Security */
-#define IPPROTO_SKIP		57		/* SKIP */
-#define	IPPROTO_ICMPV6		58		/* ICMP6 */
-#define	IPPROTO_NONE		59		/* IP6 no next header */
-#define	IPPROTO_DSTOPTS		60		/* IP6 destination option */
-#define	IPPROTO_AHIP		61		/* any host internal protocol */
-#define	IPPROTO_CFTP		62		/* CFTP */
-#define	IPPROTO_HELLO		63		/* "hello" routing protocol */
-#define	IPPROTO_SATEXPAK	64		/* SATNET/Backroom EXPAK */
-#define	IPPROTO_KRYPTOLAN	65		/* Kryptolan */
-#define	IPPROTO_RVD		66		/* Remote Virtual Disk */
-#define	IPPROTO_IPPC		67		/* Pluribus Packet Core */
-#define	IPPROTO_ADFS		68		/* Any distributed FS */
-#define	IPPROTO_SATMON		69		/* Satnet Monitoring */
-#define	IPPROTO_VISA		70		/* VISA Protocol */
-#define	IPPROTO_IPCV		71		/* Packet Core Utility */
-#define	IPPROTO_CPNX		72		/* Comp. Prot. Net. Executive */
-#define	IPPROTO_CPHB		73		/* Comp. Prot. HeartBeat */
-#define	IPPROTO_WSN		74		/* Wang Span Network */
-#define	IPPROTO_PVP		75		/* Packet Video Protocol */
-#define	IPPROTO_BRSATMON	76		/* BackRoom SATNET Monitoring */
-#define	IPPROTO_ND		77		/* Sun net disk proto (temp.) */
-#define	IPPROTO_WBMON		78		/* WIDEBAND Monitoring */
-#define	IPPROTO_WBEXPAK		79		/* WIDEBAND EXPAK */
-#define	IPPROTO_EON		80		/* ISO cnlp */
-#define	IPPROTO_VMTP		81		/* VMTP */
-#define	IPPROTO_SVMTP		82		/* Secure VMTP */
-#define	IPPROTO_VINES		83		/* Banyon VINES */
-#define	IPPROTO_TTP		84		/* TTP */
-#define	IPPROTO_IGP		85		/* NSFNET-IGP */
-#define	IPPROTO_DGP		86		/* dissimilar gateway prot. */
-#define	IPPROTO_TCF		87		/* TCF */
-#define	IPPROTO_IGRP		88		/* Cisco/GXS IGRP */
-#define	IPPROTO_OSPFIGP		89		/* OSPFIGP */
-#define	IPPROTO_SRPC		90		/* Strite RPC protocol */
-#define	IPPROTO_LARP		91		/* Locus Address Resoloution */
-#define	IPPROTO_MTP		92		/* Multicast Transport */
-#define	IPPROTO_AX25		93		/* AX.25 Frames */
-#define	IPPROTO_IPEIP		94		/* IP encapsulated in IP */
-#define	IPPROTO_MICP		95		/* Mobile Int.ing control */
-#define	IPPROTO_SCCSP		96		/* Semaphore Comm. security */
-#define	IPPROTO_ETHERIP		97		/* Ethernet IP encapsulation */
-#define	IPPROTO_ENCAP		98		/* encapsulation header */
-#define	IPPROTO_APES		99		/* any private encr. scheme */
-#define	IPPROTO_GMTP		100		/* GMTP*/
-#define	IPPROTO_IPCOMP		108		/* payload compression (IPComp) */
-/* 101-254: Partly Unassigned */
-#define	IPPROTO_PIM		103		/* Protocol Independent Mcast */
-#define	IPPROTO_PGM		113		/* PGM */
-/* 255: Reserved */
-/* BSD Private, local use, namespace incursion */
-#define	IPPROTO_DIVERT		254		/* divert pseudo-protocol */
-#define	IPPROTO_MAX		256
-
-/* last return value of *_input(), meaning "all job for this pkt is done".  */
-#define	IPPROTO_DONE		257
-
-/*
- * Local port number conventions:
- *
- * When a user does a bind(2) or connect(2) with a port number of zero,
- * a non-conflicting local port address is chosen.
- * The default range is IPPORT_HIFIRSTAUTO through
- * IPPORT_HILASTAUTO, although that is settable by sysctl.
- *
- * A user may set the IPPROTO_IP option IP_PORTRANGE to change this
- * default assignment range.
- *
- * The value IP_PORTRANGE_DEFAULT causes the default behavior.
- *
- * The value IP_PORTRANGE_HIGH changes the range of candidate port numbers
- * into the "high" range.  These are reserved for client outbound connections
- * which do not want to be filtered by any firewalls.  Note that by default
- * this is the same as IP_PORTRANGE_DEFAULT.
- *
- * The value IP_PORTRANGE_LOW changes the range to the "low" are
- * that is (by convention) restricted to privileged processes.  This
- * convention is based on "vouchsafe" principles only.  It is only secure
- * if you trust the remote host to restrict these ports.
- *
- * The default range of ports and the high range can be changed by
- * sysctl(3).  (net.inet.ip.port{hi,low}{first,last}_auto)
- *
- * Changing those values has bad security implications if you are
- * using a a stateless firewall that is allowing packets outside of that
- * range in order to allow transparent outgoing connections.
- *
- * Such a firewall configuration will generally depend on the use of these
- * default values.  If you change them, you may find your Security
- * Administrator looking for you with a heavy object.
- *
- * For a slightly more orthodox text view on this:
- *
- *            ftp://ftp.isi.edu/in-notes/iana/assignments/port-numbers
- *
- *    port numbers are divided into three ranges:
- *
- *                0 -  1023 Well Known Ports
- *             1024 - 49151 Registered Ports
- *            49152 - 65535 Dynamic and/or Private Ports
- *
- */
-
-/*
- * Ports < IPPORT_RESERVED are reserved for
- * privileged processes (e.g. root).         (IP_PORTRANGE_LOW)
- */
-#define	IPPORT_RESERVED		1024
-
-/*
- * Default local port range, used by both IP_PORTRANGE_DEFAULT
- * and IP_PORTRANGE_HIGH.
- */
-#define	IPPORT_HIFIRSTAUTO	49152
-#define	IPPORT_HILASTAUTO	65535
-
-/*
- * Scanning for a free reserved port return a value below IPPORT_RESERVED,
- * but higher than IPPORT_RESERVEDSTART.  Traditionally the start value was
- * 512, but that conflicts with some well-known-services that firewalls may
- * have a fit if we use.
- */
-#define IPPORT_RESERVEDSTART	600
-
-#define	IPPORT_MAX		65535
-
-#ifndef _UINT8_T_DECLARED
-typedef	__uint8_t		uint8_t;
-#define	_UINT8_T_DECLARED
-#endif
-
-#ifndef _UINT16_T_DECLARED
-typedef	__uint16_t		uint16_t;
-#define	_UINT16_T_DECLARED
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef	__uint32_t		uint32_t;
-#define	_UINT32_T_DECLARED
-#endif
-
-#ifndef _IN_ADDR_T_DECLARED
-typedef	uint32_t		in_addr_t;
-#define	_IN_ADDR_T_DECLARED
-#endif
-
-#ifndef _IN_PORT_T_DECLARED
-typedef	uint16_t		in_port_t;
-#define	_IN_PORT_T_DECLARED
-#endif
-
-#ifdef _BSD_SA_FAMILY_T_
-typedef	_BSD_SA_FAMILY_T_	sa_family_t;
-#undef _BSD_SA_FAMILY_T_
-#endif
-
-/*
- * Internet address (a structure for historical reasons)
- */
-#ifndef	_STRUCT_IN_ADDR_DECLARED
-struct in_addr {
-	in_addr_t s_addr;
-};
-#define	_STRUCT_IN_ADDR_DECLARED
-#endif
-
-/*
- * Definitions of bits in internet address integers.
- * On subnets, the decomposition of addresses to host and net parts
- * is done according to subnet mask, not the masks here.
- */
-#define	IN_CLASSA(i)		(((u_int32_t)(i) & 0x80000000) == 0)
-#define	IN_CLASSA_NET		0xff000000
-#define	IN_CLASSA_NSHIFT	24
-#define	IN_CLASSA_HOST		0x00ffffff
-#define	IN_CLASSA_MAX		128
-
-#define	IN_CLASSB(i)		(((u_int32_t)(i) & 0xc0000000) == 0x80000000)
-#define	IN_CLASSB_NET		0xffff0000
-#define	IN_CLASSB_NSHIFT	16
-#define	IN_CLASSB_HOST		0x0000ffff
-#define	IN_CLASSB_MAX		65536
-
-#define	IN_CLASSC(i)		(((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
-#define	IN_CLASSC_NET		0xffffff00
-#define	IN_CLASSC_NSHIFT	8
-#define	IN_CLASSC_HOST		0x000000ff
-
-#define	IN_CLASSD(i)		(((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
-#define	IN_CLASSD_NET		0xf0000000	/* These ones aren't really */
-#define	IN_CLASSD_NSHIFT	28		/* net and host fields, but */
-#define	IN_CLASSD_HOST		0x0fffffff	/* routing needn't know.    */
-#define	IN_MULTICAST(i)		IN_CLASSD(i)
-
-#define	IN_EXPERIMENTAL(i)	(((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-#define	IN_BADCLASS(i)		(((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-
-#define	INADDR_LOOPBACK		(u_int32_t)0x7f000001
-#ifndef _KERNEL
-#define	INADDR_NONE		0xffffffff		/* -1 return */
-#endif
-
-#define	INADDR_UNSPEC_GROUP	(u_int32_t)0xe0000000	/* 224.0.0.0 */
-#define	INADDR_ALLHOSTS_GROUP	(u_int32_t)0xe0000001	/* 224.0.0.1 */
-#define	INADDR_ALLRTRS_GROUP	(u_int32_t)0xe0000002	/* 224.0.0.2 */
-#define	INADDR_MAX_LOCAL_GROUP	(u_int32_t)0xe00000ff	/* 224.0.0.255 */
-
-#define	IN_LOOPBACKNET		127			/* official! */
-
-/*
- * Options for use with [gs]etsockopt at the IP level.
- * First word of comment is data type; bool is stored in int.
- */
-#define	IP_OPTIONS		1    /* buf/ip_opts; set/get IP options */
-#define	IP_HDRINCL		2    /* int; header is included with data */
-#define	IP_TOS			3    /* int; IP type of service and preced. */
-#define	IP_TTL			4    /* int; IP time to live */
-#define	IP_RECVOPTS		5    /* bool; receive all IP opts w/dgram */
-#define	IP_RECVRETOPTS		6    /* bool; receive IP opts for response */
-#define	IP_RECVDSTADDR		7    /* bool; receive IP dst addr w/dgram */
-#define	IP_RETOPTS		8    /* ip_opts; set/get IP options */
-#define	IP_MULTICAST_IF		9    /* u_char; set/get IP multicast i/f  */
-#define	IP_MULTICAST_TTL	10   /* u_char; set/get IP multicast ttl */
-#define	IP_MULTICAST_LOOP	11   /* u_char; set/get IP multicast loopback */
-#define	IP_ADD_MEMBERSHIP	12   /* ip_mreq; add an IP group membership */
-#define	IP_DROP_MEMBERSHIP	13   /* ip_mreq; drop an IP group membership */
-#define IP_MULTICAST_VIF	14   /* set/get IP mcast virt. iface */
-#define IP_RSVP_ON		15   /* enable RSVP in kernel */
-#define IP_RSVP_OFF		16   /* disable RSVP in kernel */
-#define IP_RSVP_VIF_ON		17   /* set RSVP per-vif socket */
-#define IP_RSVP_VIF_OFF		18   /* unset RSVP per-vif socket */
-#define IP_PORTRANGE		19   /* int; range to choose for unspec port */
-#define	IP_RECVIF		20   /* bool; receive reception if w/dgram */
-/* for IPSEC */
-#define	IP_IPSEC_POLICY		21   /* int; set/get security policy */
-#define	IP_FAITH		22   /* bool; accept FAITH'ed connections */
-
-#define	IP_FW_ADD     		50   /* add a firewall rule to chain */
-#define	IP_FW_DEL    		51   /* delete a firewall rule from chain */
-#define	IP_FW_FLUSH   		52   /* flush firewall rule chain */
-#define	IP_FW_ZERO    		53   /* clear single/all firewall counter(s) */
-#define	IP_FW_GET     		54   /* get entire firewall rule chain */
-#define	IP_FW_RESETLOG		55   /* reset logging counters */
-
-#define	IP_DUMMYNET_CONFIGURE	60   /* add/configure a dummynet pipe */
-#define	IP_DUMMYNET_DEL		61   /* delete a dummynet pipe from chain */
-#define	IP_DUMMYNET_FLUSH	62   /* flush dummynet */
-#define	IP_DUMMYNET_GET		64   /* get entire dummynet pipes */
-
-/*
- * Defaults and limits for options
- */
-#define	IP_DEFAULT_MULTICAST_TTL  1	/* normally limit m'casts to 1 hop  */
-#define	IP_DEFAULT_MULTICAST_LOOP 1	/* normally hear sends if a member  */
-#define	IP_MAX_MEMBERSHIPS	20	/* per socket */
-
-/*
- * Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP.
- */
-struct ip_mreq {
-	struct	in_addr imr_multiaddr;	/* IP multicast address of group */
-	struct	in_addr imr_interface;	/* local IP address of interface */
-};
-
-/*
- * Argument for IP_PORTRANGE:
- * - which range to search when port is unspecified at bind() or connect()
- */
-#define	IP_PORTRANGE_DEFAULT	0	/* default range */
-#define	IP_PORTRANGE_HIGH	1	/* "high" - request firewall bypass */
-#define	IP_PORTRANGE_LOW	2	/* "low" - vouchsafe security */
-
-/*
- * Definitions for inet sysctl operations.
- *
- * Third level is protocol number.
- * Fourth level is desired variable within that protocol.
- */
-#define	IPPROTO_MAXID	(IPPROTO_AH + 1)	/* don't list to IPPROTO_MAX */
-
-#define	CTL_IPPROTO_NAMES { \
-	{ "ip", CTLTYPE_NODE }, \
-	{ "icmp", CTLTYPE_NODE }, \
-	{ "igmp", CTLTYPE_NODE }, \
-	{ "ggp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "tcp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ "egp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "pup", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "udp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "idp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "ipsec", CTLTYPE_NODE }, \
-}
-
-/*
- * Names for IP sysctl objects
- */
-#define	IPCTL_FORWARDING	1	/* act as router */
-#define	IPCTL_SENDREDIRECTS	2	/* may send redirects when forwarding */
-#define	IPCTL_DEFTTL		3	/* default TTL */
-#ifdef notyet
-#define	IPCTL_DEFMTU		4	/* default MTU */
-#endif
-#define IPCTL_RTEXPIRE		5	/* cloned route expiration time */
-#define IPCTL_RTMINEXPIRE	6	/* min value for expiration time */
-#define IPCTL_RTMAXCACHE	7	/* trigger level for dynamic expire */
-#define	IPCTL_SOURCEROUTE	8	/* may perform source routes */
-#define	IPCTL_DIRECTEDBROADCAST	9	/* may re-broadcast received packets */
-#define IPCTL_INTRQMAXLEN	10	/* max length of netisr queue */
-#define	IPCTL_INTRQDROPS	11	/* number of netisr q drops */
-#define	IPCTL_STATS		12	/* ipstat structure */
-#define	IPCTL_ACCEPTSOURCEROUTE	13	/* may accept source routed packets */
-#define	IPCTL_FASTFORWARDING	14	/* use fast IP forwarding code */
-#define	IPCTL_KEEPFAITH		15	/* FAITH IPv4->IPv6 translater ctl */
-#define	IPCTL_GIF_TTL		16	/* default TTL for gif encap packet */
-#define	IPCTL_MAXID		17
-
-#define	IPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "forwarding", CTLTYPE_INT }, \
-	{ "redirect", CTLTYPE_INT }, \
-	{ "ttl", CTLTYPE_INT }, \
-	{ "mtu", CTLTYPE_INT }, \
-	{ "rtexpire", CTLTYPE_INT }, \
-	{ "rtminexpire", CTLTYPE_INT }, \
-	{ "rtmaxcache", CTLTYPE_INT }, \
-	{ "sourceroute", CTLTYPE_INT }, \
- 	{ "directed-broadcast", CTLTYPE_INT }, \
-	{ "intr-queue-maxlen", CTLTYPE_INT }, \
-	{ "intr-queue-drops", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-	{ "accept_sourceroute", CTLTYPE_INT }, \
-	{ "fastforwarding", CTLTYPE_INT }, \
-}
-
-#endif /* __BSD_VISIBLE */
-
-#ifdef _KERNEL
-
-struct ifnet; struct mbuf;	/* forward declarations for Standard C */
-
-int	 in_broadcast(struct in_addr, struct ifnet *);
-int	 in_canforward(struct in_addr);
-int	 in_localaddr(struct in_addr);
-char 	*inet_ntoa(struct in_addr); /* in libkern */
-char	*inet_ntoa_r(struct in_addr ina, char *buf); /* in libkern */
-
-#define satosin(sa)	((struct sockaddr_in *)(sa))
-#define sintosa(sin)	((struct sockaddr *)(sin))
-#define ifatoia(ifa)	((struct in_ifaddr *)(ifa))
-
-#endif /* _KERNEL */
-
-/* INET6 stuff */
-#define	__KAME_NETINET_IN_H_INCLUDED_
-#include <netinet6/in6.h>
-#undef __KAME_NETINET_IN_H_INCLUDED_
-
-#endif /* !_NETINET_IN_H_*/
diff --git a/newlib/libc/sys/linux/include/netinet/in_gif.h b/newlib/libc/sys/linux/include/netinet/in_gif.h
deleted file mode 100644
index cf53920..0000000
--- a/newlib/libc/sys/linux/include/netinet/in_gif.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$FreeBSD: src/sys/netinet/in_gif.h,v 1.8 2002/03/19 21:25:46 alfred Exp $	*/
-/*	$KAME: in_gif.h,v 1.5 2000/04/14 08:36:02 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NETINET_IN_GIF_H_
-#define _NETINET_IN_GIF_H_
-
-#define GIF_TTL		30
-
-void in_gif_input(struct mbuf *, int off);
-int in_gif_output(struct ifnet *, int, struct mbuf *, struct rtentry *);
-int gif_encapcheck4(const struct mbuf *, int, int, void *);
-
-#endif /*_NETINET_IN_GIF_H_*/
diff --git a/newlib/libc/sys/linux/include/netinet/in_pcb.h b/newlib/libc/sys/linux/include/netinet/in_pcb.h
deleted file mode 100644
index 50ddd27..0000000
--- a/newlib/libc/sys/linux/include/netinet/in_pcb.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.48 2002/04/09 20:04:10 jhb Exp $
- */
-
-#ifndef _NETINET_IN_PCB_H_
-#define _NETINET_IN_PCB_H_
-
-#include <sys/queue.h>
-
-#include <net/route.h>
-#include <netinet6/ipsec.h> /* for IPSEC */
-#include <vm/uma.h>
-
-#define	in6pcb		inpcb	/* for KAME src sync over BSD*'s */
-#define	in6p_sp		inp_sp	/* for KAME src sync over BSD*'s */
-
-/*
- * Common structure pcb for internet protocol implementation.
- * Here are stored pointers to local and foreign host table
- * entries, local and foreign socket numbers, and pointers
- * up (to a socket structure) and down (to a protocol-specific)
- * control block.
- */
-LIST_HEAD(inpcbhead, inpcb);
-LIST_HEAD(inpcbporthead, inpcbport);
-typedef	u_quad_t	inp_gen_t;
-
-/*
- * PCB with AF_INET6 null bind'ed laddr can receive AF_INET input packet.
- * So, AF_INET6 null laddr is also used as AF_INET null laddr,
- * by utilize following structure. (At last, same as INRIA)
- */
-struct in_addr_4in6 {
-	u_int32_t	ia46_pad32[3];
-	struct	in_addr	ia46_addr4;
-};
-
-/*
- * NOTE: ipv6 addrs should be 64-bit aligned, per RFC 2553.
- * in_conninfo has some extra padding to accomplish this.
- */
-struct in_endpoints {
-	u_int16_t	ie_fport;		/* foreign port */
-	u_int16_t	ie_lport;		/* local port */
-	/* protocol dependent part, local and foreign addr */
-	union {
-		/* foreign host table entry */
-		struct	in_addr_4in6 ie46_foreign;
-		struct	in6_addr ie6_foreign;
-	} ie_dependfaddr;
-	union {
-		/* local host table entry */
-		struct	in_addr_4in6 ie46_local;
-		struct	in6_addr ie6_local;
-	} ie_dependladdr;
-#define	ie_faddr	ie_dependfaddr.ie46_foreign.ia46_addr4
-#define	ie_laddr	ie_dependladdr.ie46_local.ia46_addr4
-#define	ie6_faddr	ie_dependfaddr.ie6_foreign
-#define	ie6_laddr	ie_dependladdr.ie6_local
-};
-
-/*
- * XXX
- * At some point struct route should possibly change to:
- *   struct rtentry *rt
- *   struct in_endpoints *ie; 
- */
-struct in_conninfo {
-	u_int8_t	inc_flags;
-	u_int8_t	inc_len;
-	u_int16_t	inc_pad;	/* XXX alignment for in_endpoints */
-	/* protocol dependent part; cached route */
-	struct	in_endpoints inc_ie;
-	union {
-		/* placeholder for routing entry */
-		struct	route inc4_route;
-		struct	route_in6 inc6_route;
-	} inc_dependroute;
-};
-#define inc_isipv6	inc_flags	/* temp compatability */
-#define	inc_fport	inc_ie.ie_fport
-#define	inc_lport	inc_ie.ie_lport
-#define	inc_faddr	inc_ie.ie_faddr
-#define	inc_laddr	inc_ie.ie_laddr
-#define	inc_route	inc_dependroute.inc4_route
-#define	inc6_faddr	inc_ie.ie6_faddr
-#define	inc6_laddr	inc_ie.ie6_laddr
-#define	inc6_route	inc_dependroute.inc6_route
-
-struct	icmp6_filter;
-
-struct inpcb {
-	LIST_ENTRY(inpcb) inp_hash; /* hash list */
-	LIST_ENTRY(inpcb) inp_list; /* list for all PCBs of this proto */
-	u_int32_t	inp_flow;
-
-	/* local and foreign ports, local and foreign addr */
-	struct	in_conninfo inp_inc;
-
-	caddr_t	inp_ppcb;		/* pointer to per-protocol pcb */
-	struct	inpcbinfo *inp_pcbinfo;	/* PCB list info */
-	struct	socket *inp_socket;	/* back pointer to socket */
-					/* list for this PCB's local port */
-	int	inp_flags;		/* generic IP/datagram flags */
-
-	struct	inpcbpolicy *inp_sp; /* for IPSEC */
-	u_char	inp_vflag;		/* IP version flag (v4/v6) */
-#define	INP_IPV4	0x1
-#define	INP_IPV6	0x2
-	u_char	inp_ip_ttl;		/* time to live proto */
-	u_char	inp_ip_p;		/* protocol proto */
-
-	/* protocol dependent part; options */
-	struct {
-		u_char	inp4_ip_tos;		/* type of service proto */
-		struct	mbuf *inp4_options;	/* IP options */
-		struct	ip_moptions *inp4_moptions; /* IP multicast options */
-	} inp_depend4;
-#define inp_fport	inp_inc.inc_fport
-#define inp_lport	inp_inc.inc_lport
-#define	inp_faddr	inp_inc.inc_faddr
-#define	inp_laddr	inp_inc.inc_laddr
-#define	inp_route	inp_inc.inc_route
-#define	inp_ip_tos	inp_depend4.inp4_ip_tos
-#define	inp_options	inp_depend4.inp4_options
-#define	inp_moptions	inp_depend4.inp4_moptions
-	struct {
-		/* IP options */
-		struct	mbuf *inp6_options;
-		/* IP6 options for outgoing packets */
-		struct	ip6_pktopts *inp6_outputopts;
-		/* IP multicast options */
-		struct	ip6_moptions *inp6_moptions;
-		/* ICMPv6 code type filter */
-		struct	icmp6_filter *inp6_icmp6filt;
-		/* IPV6_CHECKSUM setsockopt */
-		int	inp6_cksum;
-		u_short	inp6_ifindex;
-		short	inp6_hops;
-		u_int8_t	inp6_hlim;
-	} inp_depend6;
-	LIST_ENTRY(inpcb) inp_portlist;
-	struct	inpcbport *inp_phd;	/* head of this list */
-	inp_gen_t	inp_gencnt;	/* generation count of this instance */
-#define	in6p_faddr	inp_inc.inc6_faddr
-#define	in6p_laddr	inp_inc.inc6_laddr
-#define	in6p_route	inp_inc.inc6_route
-#define	in6p_ip6_hlim	inp_depend6.inp6_hlim
-#define	in6p_hops	inp_depend6.inp6_hops	/* default hop limit */
-#define	in6p_ip6_nxt	inp_ip_p
-#define	in6p_flowinfo	inp_flow
-#define	in6p_vflag	inp_vflag
-#define	in6p_options	inp_depend6.inp6_options
-#define	in6p_outputopts	inp_depend6.inp6_outputopts
-#define	in6p_moptions	inp_depend6.inp6_moptions
-#define	in6p_icmp6filt	inp_depend6.inp6_icmp6filt
-#define	in6p_cksum	inp_depend6.inp6_cksum
-#define	inp6_ifindex	inp_depend6.inp6_ifindex
-#define	in6p_flags	inp_flags  /* for KAME src sync over BSD*'s */
-#define	in6p_socket	inp_socket  /* for KAME src sync over BSD*'s */
-#define	in6p_lport	inp_lport  /* for KAME src sync over BSD*'s */
-#define	in6p_fport	inp_fport  /* for KAME src sync over BSD*'s */
-#define	in6p_ppcb	inp_ppcb  /* for KAME src sync over BSD*'s */
-};
-/*
- * The range of the generation count, as used in this implementation,
- * is 9e19.  We would have to create 300 billion connections per
- * second for this number to roll over in a year.  This seems sufficiently
- * unlikely that we simply don't concern ourselves with that possibility.
- */
-
-/*
- * Interface exported to userland by various protocols which use
- * inpcbs.  Hack alert -- only define if struct xsocket is in scope.
- */
-#ifdef _SYS_SOCKETVAR_H_
-struct	xinpcb {
-	size_t	xi_len;		/* length of this structure */
-	struct	inpcb xi_inp;
-	struct	xsocket xi_socket;
-	u_quad_t	xi_alignment_hack;
-};
-
-struct	xinpgen {
-	size_t	xig_len;	/* length of this structure */
-	u_int	xig_count;	/* number of PCBs at this time */
-	inp_gen_t xig_gen;	/* generation count at this time */
-	so_gen_t xig_sogen;	/* socket generation count at this time */
-};
-#endif /* _SYS_SOCKETVAR_H_ */
-
-struct inpcbport {
-	LIST_ENTRY(inpcbport) phd_hash;
-	struct inpcbhead phd_pcblist;
-	u_short phd_port;
-};
-
-struct inpcbinfo {		/* XXX documentation, prefixes */
-	struct	inpcbhead *hashbase;
-	u_long	hashmask;
-	struct	inpcbporthead *porthashbase;
-	u_long	porthashmask;
-	struct	inpcbhead *listhead;
-	u_short	lastport;
-	u_short	lastlow;
-	u_short	lasthi;
-	uma_zone_t ipi_zone; /* zone to allocate pcbs from */
-	u_int	ipi_count;	/* number of pcbs in this list */
-	u_quad_t ipi_gencnt;	/* current generation count */
-};
-
-#define INP_PCBHASH(faddr, lport, fport, mask) \
-	(((faddr) ^ ((faddr) >> 16) ^ ntohs((lport) ^ (fport))) & (mask))
-#define INP_PCBPORTHASH(lport, mask) \
-	(ntohs((lport)) & (mask))
-
-/* flags in inp_flags: */
-#define	INP_RECVOPTS		0x01	/* receive incoming IP options */
-#define	INP_RECVRETOPTS		0x02	/* receive IP options for reply */
-#define	INP_RECVDSTADDR		0x04	/* receive IP dst address */
-#define	INP_HDRINCL		0x08	/* user supplies entire IP header */
-#define	INP_HIGHPORT		0x10	/* user wants "high" port binding */
-#define	INP_LOWPORT		0x20	/* user wants "low" port binding */
-#define	INP_ANONPORT		0x40	/* port chosen for user */
-#define	INP_RECVIF		0x80	/* receive incoming interface */
-#define	INP_MTUDISC		0x100	/* user can do MTU discovery */
-#define	INP_FAITH		0x200	/* accept FAITH'ed connections */
-
-#define IN6P_IPV6_V6ONLY	0x008000 /* restrict AF_INET6 socket for v6 */
-
-#define	IN6P_PKTINFO		0x010000 /* receive IP6 dst and I/F */
-#define	IN6P_HOPLIMIT		0x020000 /* receive hoplimit */
-#define	IN6P_HOPOPTS		0x040000 /* receive hop-by-hop options */
-#define	IN6P_DSTOPTS		0x080000 /* receive dst options after rthdr */
-#define	IN6P_RTHDR		0x100000 /* receive routing header */
-#define	IN6P_RTHDRDSTOPTS	0x200000 /* receive dstoptions before rthdr */
-#define IN6P_AUTOFLOWLABEL	0x800000 /* attach flowlabel automatically */
-#define	IN6P_BINDV6ONLY		0x10000000 /* do not grab IPv4 traffic */
-
-#define	INP_CONTROLOPTS		(INP_RECVOPTS|INP_RECVRETOPTS|INP_RECVDSTADDR|\
-					INP_RECVIF|\
-				 IN6P_PKTINFO|IN6P_HOPLIMIT|IN6P_HOPOPTS|\
-				 IN6P_DSTOPTS|IN6P_RTHDR|IN6P_RTHDRDSTOPTS|\
-				 IN6P_AUTOFLOWLABEL)
-#define	INP_UNMAPPABLEOPTS	(IN6P_HOPOPTS|IN6P_DSTOPTS|IN6P_RTHDR|\
-				 IN6P_AUTOFLOWLABEL)
-
- /* for KAME src sync over BSD*'s */
-#define	IN6P_HIGHPORT		INP_HIGHPORT
-#define	IN6P_LOWPORT		INP_LOWPORT
-#define	IN6P_ANONPORT		INP_ANONPORT
-#define	IN6P_RECVIF		INP_RECVIF
-#define	IN6P_MTUDISC		INP_MTUDISC
-#define	IN6P_FAITH		INP_FAITH
-#define	IN6P_CONTROLOPTS INP_CONTROLOPTS
-	/*
-	 * socket AF version is {newer than,or include}
-	 * actual datagram AF version
-	 */
-
-#define	INPLOOKUP_WILDCARD	1
-#define	sotoinpcb(so)	((struct inpcb *)(so)->so_pcb)
-#define	sotoin6pcb(so)	sotoinpcb(so) /* for KAME src sync over BSD*'s */
-
-#define	INP_SOCKAF(so) so->so_proto->pr_domain->dom_family
-
-#define	INP_CHECK_SOCKAF(so, af) 	(INP_SOCKAF(so) == af)
-
-#ifdef _KERNEL
-extern int	ipport_lowfirstauto;
-extern int	ipport_lowlastauto;
-extern int	ipport_firstauto;
-extern int	ipport_lastauto;
-extern int	ipport_hifirstauto;
-extern int	ipport_hilastauto;
-
-void	in_pcbpurgeif0(struct inpcb *, struct ifnet *);
-void	in_losing(struct inpcb *);
-void	in_rtchange(struct inpcb *, int);
-int	in_pcballoc(struct socket *, struct inpcbinfo *, struct thread *);
-int	in_pcbbind(struct inpcb *, struct sockaddr *, struct thread *);
-int	in_pcbconnect(struct inpcb *, struct sockaddr *, struct thread *);
-void	in_pcbdetach(struct inpcb *);
-void	in_pcbdisconnect(struct inpcb *);
-int	in_pcbinshash(struct inpcb *);
-int	in_pcbladdr(struct inpcb *, struct sockaddr *,
-	    struct sockaddr_in **);
-struct inpcb *
-	in_pcblookup_local(struct inpcbinfo *,
-	    struct in_addr, u_int, int);
-struct inpcb *
-	in_pcblookup_hash(struct inpcbinfo *, struct in_addr, u_int,
-	    struct in_addr, u_int, int, struct ifnet *);
-void	in_pcbnotifyall(struct inpcbhead *, struct in_addr,
-	    int, void (*)(struct inpcb *, int));
-void	in_pcbrehash(struct inpcb *);
-int	in_setpeeraddr(struct socket *so, struct sockaddr **nam);
-int	in_setsockaddr(struct socket *so, struct sockaddr **nam);
-void	in_pcbremlists(struct inpcb *inp);
-int	prison_xinpcb(struct thread *td, struct inpcb *inp);
-#endif /* _KERNEL */
-
-#endif /* !_NETINET_IN_PCB_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/in_systm.h b/newlib/libc/sys/linux/include/netinet/in_systm.h
deleted file mode 100644
index 62cea64..0000000
--- a/newlib/libc/sys/linux/include/netinet/in_systm.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/in_systm.h,v 1.10 2002/03/19 21:25:46 alfred Exp $
- */
-
-#ifndef _NETINET_IN_SYSTM_H_
-#define _NETINET_IN_SYSTM_H_
-
-/*
- * Miscellaneous internetwork
- * definitions for kernel.
- */
-
-/*
- * Network types.
- *
- * Internally the system keeps counters in the headers with the bytes
- * swapped so that VAX instructions will work on them.  It reverses
- * the bytes before transmission at each protocol level.  The n_ types
- * represent the types with the bytes in ``high-ender'' order.
- */
-typedef u_int16_t n_short;		/* short as received from the net */
-typedef u_int32_t n_long;		/* long as received from the net */
-
-typedef	u_int32_t n_time;		/* ms since 00:00 GMT, byte rev */
-
-#ifdef _KERNEL
-n_time	 iptime(void);
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet/in_var.h b/newlib/libc/sys/linux/include/netinet/in_var.h
deleted file mode 100644
index ce97b5a..0000000
--- a/newlib/libc/sys/linux/include/netinet/in_var.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (c) 1985, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/netinet/in_var.h,v 1.45 2002/03/24 10:19:10 bde Exp $
- */
-
-#ifndef _NETINET_IN_VAR_H_
-#define _NETINET_IN_VAR_H_
-
-#include <sys/queue.h>
-#include <sys/fnv_hash.h>
-
-/*
- * Interface address, Internet version.  One of these structures
- * is allocated for each Internet address on an interface.
- * The ifaddr structure contains the protocol-independent part
- * of the structure and is assumed to be first.
- */
-struct in_ifaddr {
-	struct	ifaddr ia_ifa;		/* protocol-independent info */
-#define	ia_ifp		ia_ifa.ifa_ifp
-#define ia_flags	ia_ifa.ifa_flags
-					/* ia_{,sub}net{,mask} in host order */
-	u_long	ia_net;			/* network number of interface */
-	u_long	ia_netmask;		/* mask of net part */
-	u_long	ia_subnet;		/* subnet number, including net */
-	u_long	ia_subnetmask;		/* mask of subnet part */
-	struct	in_addr ia_netbroadcast; /* to recognize net broadcasts */
-	LIST_ENTRY(in_ifaddr) ia_hash;	/* entry in bucket of inet addresses */
-	TAILQ_ENTRY(in_ifaddr) ia_link;	/* list of internet addresses */
-	struct	sockaddr_in ia_addr;	/* reserve space for interface name */
-	struct	sockaddr_in ia_dstaddr; /* reserve space for broadcast addr */
-#define	ia_broadaddr	ia_dstaddr
-	struct	sockaddr_in ia_sockmask; /* reserve space for general netmask */
-};
-
-struct	in_aliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr_in ifra_addr;
-	struct	sockaddr_in ifra_broadaddr;
-#define ifra_dstaddr ifra_broadaddr
-	struct	sockaddr_in ifra_mask;
-};
-/*
- * Given a pointer to an in_ifaddr (ifaddr),
- * return a pointer to the addr as a sockaddr_in.
- */
-#define IA_SIN(ia)    (&(((struct in_ifaddr *)(ia))->ia_addr))
-#define IA_DSTSIN(ia) (&(((struct in_ifaddr *)(ia))->ia_dstaddr))
-
-#define IN_LNAOF(in, ifa) \
-	((ntohl((in).s_addr) & ~((struct in_ifaddr *)(ifa)->ia_subnetmask))
-
-
-#ifdef	_KERNEL
-extern	struct	ifqueue	ipintrq;		/* ip packet input queue */
-extern	struct	in_addr zeroin_addr;
-extern	u_char	inetctlerrmap[];
-
-/* 
- * Hash table for IP addresses.
- */
-extern	LIST_HEAD(in_ifaddrhashhead, in_ifaddr) *in_ifaddrhashtbl;
-extern	TAILQ_HEAD(in_ifaddrhead, in_ifaddr) in_ifaddrhead;
-extern	u_long in_ifaddrhmask;			/* mask for hash table */
-
-#define INADDR_NHASH_LOG2       9
-#define INADDR_NHASH		(1 << INADDR_NHASH_LOG2)
-#define INADDR_HASHVAL(x)	fnv_32_buf((&(x)), sizeof(x), FNV1_32_INIT)
-#define INADDR_HASH(x) \
-	(&in_ifaddrhashtbl[INADDR_HASHVAL(x) & in_ifaddrhmask])
-
-
-/*
- * Macro for finding the interface (ifnet structure) corresponding to one
- * of our IP addresses.
- */
-#define INADDR_TO_IFP(addr, ifp) \
-	/* struct in_addr addr; */ \
-	/* struct ifnet *ifp; */ \
-{ \
-	struct in_ifaddr *ia; \
-\
-	LIST_FOREACH(ia, INADDR_HASH((addr).s_addr), ia_hash) \
-		if (IA_SIN(ia)->sin_addr.s_addr == (addr).s_addr) \
-			break; \
-	(ifp) = (ia == NULL) ? NULL : ia->ia_ifp; \
-}
-
-/*
- * Macro for finding the internet address structure (in_ifaddr) corresponding
- * to a given interface (ifnet structure).
- */
-#define IFP_TO_IA(ifp, ia) \
-	/* struct ifnet *ifp; */ \
-	/* struct in_ifaddr *ia; */ \
-{ \
-	for ((ia) = TAILQ_FIRST(&in_ifaddrhead); \
-	    (ia) != NULL && (ia)->ia_ifp != (ifp); \
-	    (ia) = TAILQ_NEXT((ia), ia_link)) \
-		continue; \
-}
-#endif
-
-/*
- * This information should be part of the ifnet structure but we don't wish
- * to change that - as it might break a number of things
- */
-
-struct router_info {
-	struct ifnet *rti_ifp;
-	int    rti_type; /* type of router which is querier on this interface */
-	int    rti_time; /* # of slow timeouts since last old query */
-	struct router_info *rti_next;
-};
-
-/*
- * Internet multicast address structure.  There is one of these for each IP
- * multicast group to which this host belongs on a given network interface.
- * For every entry on the interface's if_multiaddrs list which represents
- * an IP multicast group, there is one of these structures.  They are also
- * kept on a system-wide list to make it easier to keep our legacy IGMP code
- * compatible with the rest of the world (see IN_FIRST_MULTI et al, below).
- */
-struct in_multi {
-	LIST_ENTRY(in_multi) inm_link;	/* queue macro glue */
-	struct	in_addr inm_addr;	/* IP multicast address, convenience */
-	struct	ifnet *inm_ifp;		/* back pointer to ifnet */
-	struct	ifmultiaddr *inm_ifma;	/* back pointer to ifmultiaddr */
-	u_int	inm_timer;		/* IGMP membership report timer */
-	u_int	inm_state;		/*  state of the membership */
-	struct	router_info *inm_rti;	/* router info*/
-};
-
-#ifdef _KERNEL
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_inet_ip);
-SYSCTL_DECL(_net_inet_raw);
-#endif
-
-extern LIST_HEAD(in_multihead, in_multi) in_multihead;
-
-/*
- * Structure used by macros below to remember position when stepping through
- * all of the in_multi records.
- */
-struct in_multistep {
-	struct in_multi *i_inm;
-};
-
-/*
- * Macro for looking up the in_multi record for a given IP multicast address
- * on a given interface.  If no matching record is found, "inm" is set null.
- */
-#define IN_LOOKUP_MULTI(addr, ifp, inm) \
-	/* struct in_addr addr; */ \
-	/* struct ifnet *ifp; */ \
-	/* struct in_multi *inm; */ \
-do { \
-	struct ifmultiaddr *ifma; \
-\
-	TAILQ_FOREACH(ifma, &((ifp)->if_multiaddrs), ifma_link) { \
-		if (ifma->ifma_addr->sa_family == AF_INET \
-		    && ((struct sockaddr_in *)ifma->ifma_addr)->sin_addr.s_addr == \
-		    (addr).s_addr) \
-			break; \
-	} \
-	(inm) = ifma ? ifma->ifma_protospec : 0; \
-} while(0)
-
-/*
- * Macro to step through all of the in_multi records, one at a time.
- * The current position is remembered in "step", which the caller must
- * provide.  IN_FIRST_MULTI(), below, must be called to initialize "step"
- * and get the first record.  Both macros return a NULL "inm" when there
- * are no remaining records.
- */
-#define IN_NEXT_MULTI(step, inm) \
-	/* struct in_multistep  step; */ \
-	/* struct in_multi *inm; */ \
-do { \
-	if (((inm) = (step).i_inm) != NULL) \
-		(step).i_inm = LIST_NEXT((step).i_inm, inm_link); \
-} while(0)
-
-#define IN_FIRST_MULTI(step, inm) \
-	/* struct in_multistep step; */ \
-	/* struct in_multi *inm; */ \
-do { \
-	(step).i_inm = LIST_FIRST(&in_multihead); \
-	IN_NEXT_MULTI((step), (inm)); \
-} while(0)
-
-struct	route;
-struct	in_multi *in_addmulti(struct in_addr *, struct ifnet *);
-void	in_delmulti(struct in_multi *);
-int	in_control(struct socket *, u_long, caddr_t, struct ifnet *,
-	    struct thread *);
-void	in_rtqdrain(void);
-void	ip_input(struct mbuf *);
-int	in_ifadown(struct ifaddr *ifa, int);
-void	in_ifscrub(struct ifnet *, struct in_ifaddr *);
-int	ipflow_fastforward(struct mbuf *);
-void	ipflow_create(const struct route *, struct mbuf *);
-void	ipflow_slowtimo(void);
-
-#endif /* _KERNEL */
-
-/* INET6 stuff */
-#include <netinet6/in6_var.h>
-
-#endif /* _NETINET_IN_VAR_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/ip.h b/newlib/libc/sys/linux/include/netinet/ip.h
deleted file mode 100644
index 2b2bcb8..0000000
--- a/newlib/libc/sys/linux/include/netinet/ip.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip.h	8.2 (Berkeley) 6/1/94
- * $FreeBSD: src/sys/netinet/ip.h,v 1.19 2001/12/14 19:37:32 rwatson Exp $
- */
-
-#ifndef _NETINET_IP_H_
-#define _NETINET_IP_H_
-
-#include <netinet/in_systm.h>
-
-/*
- * Definitions for internet protocol version 4.
- * Per RFC 791, September 1981.
- */
-#define	IPVERSION	4
-
-/*
- * Structure of an internet header, naked of options.
- */
-struct ip {
-#ifdef _IP_VHL
-	u_char	ip_vhl;			/* version << 4 | header length >> 2 */
-#else
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_int	ip_hl:4,		/* header length */
-		ip_v:4;			/* version */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_int	ip_v:4,			/* version */
-		ip_hl:4;		/* header length */
-#endif
-#endif /* not _IP_VHL */
-	u_char	ip_tos;			/* type of service */
-	u_short	ip_len;			/* total length */
-	u_short	ip_id;			/* identification */
-	u_short	ip_off;			/* fragment offset field */
-#define	IP_RF 0x8000			/* reserved fragment flag */
-#define	IP_DF 0x4000			/* dont fragment flag */
-#define	IP_MF 0x2000			/* more fragments flag */
-#define	IP_OFFMASK 0x1fff		/* mask for fragmenting bits */
-	u_char	ip_ttl;			/* time to live */
-	u_char	ip_p;			/* protocol */
-	u_short	ip_sum;			/* checksum */
-	struct	in_addr ip_src,ip_dst;	/* source and dest address */
-};
-
-#ifdef _IP_VHL
-#define	IP_MAKE_VHL(v, hl)	((v) << 4 | (hl))
-#define	IP_VHL_HL(vhl)		((vhl) & 0x0f)
-#define	IP_VHL_V(vhl)		((vhl) >> 4)
-#define	IP_VHL_BORING		0x45
-#endif
-
-#define	IP_MAXPACKET	65535		/* maximum packet size */
-
-/*
- * Definitions for IP type of service (ip_tos)
- */
-#define	IPTOS_LOWDELAY		0x10
-#define	IPTOS_THROUGHPUT	0x08
-#define	IPTOS_RELIABILITY	0x04
-#define	IPTOS_MINCOST		0x02
-/* ECN bits proposed by Sally Floyd */
-#define	IPTOS_CE		0x01	/* congestion experienced */
-#define	IPTOS_ECT		0x02	/* ECN-capable transport */
-
-
-/*
- * Definitions for IP precedence (also in ip_tos) (hopefully unused)
- */
-#define	IPTOS_PREC_NETCONTROL		0xe0
-#define	IPTOS_PREC_INTERNETCONTROL	0xc0
-#define	IPTOS_PREC_CRITIC_ECP		0xa0
-#define	IPTOS_PREC_FLASHOVERRIDE	0x80
-#define	IPTOS_PREC_FLASH		0x60
-#define	IPTOS_PREC_IMMEDIATE		0x40
-#define	IPTOS_PREC_PRIORITY		0x20
-#define	IPTOS_PREC_ROUTINE		0x00
-
-/*
- * Definitions for options.
- */
-#define	IPOPT_COPIED(o)		((o)&0x80)
-#define	IPOPT_CLASS(o)		((o)&0x60)
-#define	IPOPT_NUMBER(o)		((o)&0x1f)
-
-#define	IPOPT_CONTROL		0x00
-#define	IPOPT_RESERVED1		0x20
-#define	IPOPT_DEBMEAS		0x40
-#define	IPOPT_RESERVED2		0x60
-
-#define	IPOPT_EOL		0		/* end of option list */
-#define	IPOPT_NOP		1		/* no operation */
-
-#define	IPOPT_RR		7		/* record packet route */
-#define	IPOPT_TS		68		/* timestamp */
-#define	IPOPT_SECURITY		130		/* provide s,c,h,tcc */
-#define	IPOPT_LSRR		131		/* loose source route */
-#define	IPOPT_ESO		133		/* extended security */
-#define	IPOPT_CIPSO		134		/* commerical security */
-#define	IPOPT_SATID		136		/* satnet id */
-#define	IPOPT_SSRR		137		/* strict source route */
-#define	IPOPT_RA		148		/* router alert */
-
-/*
- * Offsets to fields in options other than EOL and NOP.
- */
-#define	IPOPT_OPTVAL		0		/* option ID */
-#define	IPOPT_OLEN		1		/* option length */
-#define IPOPT_OFFSET		2		/* offset within option */
-#define	IPOPT_MINOFF		4		/* min value of above */
-
-/*
- * Time stamp option structure.
- */
-struct	ip_timestamp {
-	u_char	ipt_code;		/* IPOPT_TS */
-	u_char	ipt_len;		/* size of structure (variable) */
-	u_char	ipt_ptr;		/* index of current entry */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_int	ipt_flg:4,		/* flags, see below */
-		ipt_oflw:4;		/* overflow counter */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_int	ipt_oflw:4,		/* overflow counter */
-		ipt_flg:4;		/* flags, see below */
-#endif
-	union ipt_timestamp {
-		n_long	ipt_time[1];
-		struct	ipt_ta {
-			struct in_addr ipt_addr;
-			n_long ipt_time;
-		} ipt_ta[1];
-	} ipt_timestamp;
-};
-
-/* flag bits for ipt_flg */
-#define	IPOPT_TS_TSONLY		0		/* timestamps only */
-#define	IPOPT_TS_TSANDADDR	1		/* timestamps and addresses */
-#define	IPOPT_TS_PRESPEC	3		/* specified modules only */
-
-/* bits for security (not byte swapped) */
-#define	IPOPT_SECUR_UNCLASS	0x0000
-#define	IPOPT_SECUR_CONFID	0xf135
-#define	IPOPT_SECUR_EFTO	0x789a
-#define	IPOPT_SECUR_MMMM	0xbc4d
-#define	IPOPT_SECUR_RESTR	0xaf13
-#define	IPOPT_SECUR_SECRET	0xd788
-#define	IPOPT_SECUR_TOPSECRET	0x6bc5
-
-/*
- * Internet implementation parameters.
- */
-#define	MAXTTL		255		/* maximum time to live (seconds) */
-#define	IPDEFTTL	64		/* default ttl, from RFC 1340 */
-#define	IPFRAGTTL	60		/* time to live for frags, slowhz */
-#define	IPTTLDEC	1		/* subtracted when forwarding */
-
-#define	IP_MSS		576		/* default maximum segment size */
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet/ip6.h b/newlib/libc/sys/linux/include/netinet/ip6.h
deleted file mode 100644
index 6c5cbe1..0000000
--- a/newlib/libc/sys/linux/include/netinet/ip6.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/*	$FreeBSD: src/sys/netinet/ip6.h,v 1.5 2001/06/11 12:39:00 ume Exp $	*/
-/*	$KAME: ip6.h,v 1.18 2001/03/29 05:34:30 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _NETINET_IP6_H_
-#define _NETINET_IP6_H_
-
-/*
- * Definition for internet protocol version 6.
- * RFC 2460
- */
-
-struct ip6_hdr {
-	union {
-		struct ip6_hdrctl {
-			u_int32_t ip6_un1_flow;	/* 20 bits of flow-ID */
-			u_int16_t ip6_un1_plen;	/* payload length */
-			u_int8_t  ip6_un1_nxt;	/* next header */
-			u_int8_t  ip6_un1_hlim;	/* hop limit */
-		} ip6_un1;
-		u_int8_t ip6_un2_vfc;	/* 4 bits version, top 4 bits class */
-	} ip6_ctlun;
-	struct in6_addr ip6_src;	/* source address */
-	struct in6_addr ip6_dst;	/* destination address */
-} __attribute__((__packed__));
-
-#define ip6_vfc		ip6_ctlun.ip6_un2_vfc
-#define ip6_flow	ip6_ctlun.ip6_un1.ip6_un1_flow
-#define ip6_plen	ip6_ctlun.ip6_un1.ip6_un1_plen
-#define ip6_nxt		ip6_ctlun.ip6_un1.ip6_un1_nxt
-#define ip6_hlim	ip6_ctlun.ip6_un1.ip6_un1_hlim
-#define ip6_hops	ip6_ctlun.ip6_un1.ip6_un1_hlim
-
-#define IPV6_VERSION		0x60
-#define IPV6_VERSION_MASK	0xf0
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define IPV6_FLOWINFO_MASK	0x0fffffff	/* flow info (28 bits) */
-#define IPV6_FLOWLABEL_MASK	0x000fffff	/* flow label (20 bits) */
-#else
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define IPV6_FLOWINFO_MASK	0xffffff0f	/* flow info (28 bits) */
-#define IPV6_FLOWLABEL_MASK	0xffff0f00	/* flow label (20 bits) */
-#endif /* LITTLE_ENDIAN */
-#endif
-#if 1
-/* ECN bits proposed by Sally Floyd */
-#define IP6TOS_CE		0x01	/* congestion experienced */
-#define IP6TOS_ECT		0x02	/* ECN-capable transport */
-#endif
-
-/*
- * Extension Headers
- */
-
-struct	ip6_ext {
-	u_int8_t ip6e_nxt;
-	u_int8_t ip6e_len;
-} __attribute__((__packed__));
-
-/* Hop-by-Hop options header */
-/* XXX should we pad it to force alignment on an 8-byte boundary? */
-struct ip6_hbh {
-	u_int8_t ip6h_nxt;	/* next header */
-	u_int8_t ip6h_len;	/* length in units of 8 octets */
-	/* followed by options */
-} __attribute__((__packed__));
-
-/* Destination options header */
-/* XXX should we pad it to force alignment on an 8-byte boundary? */
-struct ip6_dest {
-	u_int8_t ip6d_nxt;	/* next header */
-	u_int8_t ip6d_len;	/* length in units of 8 octets */
-	/* followed by options */
-} __attribute__((__packed__));
-
-/* Option types and related macros */
-#define IP6OPT_PAD1		0x00	/* 00 0 00000 */
-#define IP6OPT_PADN		0x01	/* 00 0 00001 */
-#define IP6OPT_JUMBO		0xC2	/* 11 0 00010 = 194 */
-#define IP6OPT_NSAP_ADDR	0xC3	/* 11 0 00011 */
-#define IP6OPT_TUNNEL_LIMIT	0x04	/* 00 0 00100 */
-#define IP6OPT_RTALERT		0x05	/* 00 0 00101 (KAME definition) */
-
-#define IP6OPT_RTALERT_LEN	4
-#define IP6OPT_RTALERT_MLD	0	/* Datagram contains an MLD message */
-#define IP6OPT_RTALERT_RSVP	1	/* Datagram contains an RSVP message */
-#define IP6OPT_RTALERT_ACTNET	2 	/* contains an Active Networks msg */
-#define IP6OPT_MINLEN		2
-
-#define IP6OPT_BINDING_UPDATE	0xc6	/* 11 0 00110 */
-#define IP6OPT_BINDING_ACK	0x07	/* 00 0 00111 */
-#define IP6OPT_BINDING_REQ	0x08	/* 00 0 01000 */
-#define IP6OPT_HOME_ADDRESS	0xc9	/* 11 0 01001 */
-#define IP6OPT_EID		0x8a	/* 10 0 01010 */
-
-#define IP6OPT_TYPE(o)		((o) & 0xC0)
-#define IP6OPT_TYPE_SKIP	0x00
-#define IP6OPT_TYPE_DISCARD	0x40
-#define IP6OPT_TYPE_FORCEICMP	0x80
-#define IP6OPT_TYPE_ICMP	0xC0
-
-#define IP6OPT_MUTABLE		0x20
-
-#define IP6OPT_JUMBO_LEN	6
-
-/* Routing header */
-struct ip6_rthdr {
-	u_int8_t  ip6r_nxt;	/* next header */
-	u_int8_t  ip6r_len;	/* length in units of 8 octets */
-	u_int8_t  ip6r_type;	/* routing type */
-	u_int8_t  ip6r_segleft;	/* segments left */
-	/* followed by routing type specific data */
-} __attribute__((__packed__));
-
-/* Type 0 Routing header */
-struct ip6_rthdr0 {
-	u_int8_t  ip6r0_nxt;		/* next header */
-	u_int8_t  ip6r0_len;		/* length in units of 8 octets */
-	u_int8_t  ip6r0_type;		/* always zero */
-	u_int8_t  ip6r0_segleft;	/* segments left */
-	u_int8_t  ip6r0_reserved;	/* reserved field */
-	u_int8_t  ip6r0_slmap[3];	/* strict/loose bit map */
-	struct in6_addr  ip6r0_addr[1];	/* up to 23 addresses */
-} __attribute__((__packed__));
-
-/* Fragment header */
-struct ip6_frag {
-	u_int8_t  ip6f_nxt;		/* next header */
-	u_int8_t  ip6f_reserved;	/* reserved field */
-	u_int16_t ip6f_offlg;		/* offset, reserved, and flag */
-	u_int32_t ip6f_ident;		/* identification */
-} __attribute__((__packed__));
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define IP6F_OFF_MASK		0xfff8	/* mask out offset from _offlg */
-#define IP6F_RESERVED_MASK	0x0006	/* reserved bits in ip6f_offlg */
-#define IP6F_MORE_FRAG		0x0001	/* more-fragments flag */
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
-#define IP6F_OFF_MASK		0xf8ff	/* mask out offset from _offlg */
-#define IP6F_RESERVED_MASK	0x0600	/* reserved bits in ip6f_offlg */
-#define IP6F_MORE_FRAG		0x0100	/* more-fragments flag */
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
-/*
- * Internet implementation parameters.
- */
-#define IPV6_MAXHLIM	255	/* maximun hoplimit */
-#define IPV6_DEFHLIM	64	/* default hlim */
-#define IPV6_FRAGTTL	120	/* ttl for fragment packets, in slowtimo tick */
-#define IPV6_HLIMDEC	1	/* subtracted when forwaeding */
-
-#define IPV6_MMTU	1280	/* minimal MTU and reassembly. 1024 + 256 */
-#define IPV6_MAXPACKET	65535	/* ip6 max packet size without Jumbo payload*/
-
-#ifdef _KERNEL
-/*
- * IP6_EXTHDR_CHECK ensures that region between the IP6 header and the
- * target header (including IPv6 itself, extension headers and
- * TCP/UDP/ICMP6 headers) are continuous. KAME requires drivers
- * to store incoming data into one internal mbuf or one or more external
- * mbufs(never into two or more internal mbufs). Thus, the third case is
- * supposed to never be matched but is prepared just in case.
- */
-
-#define IP6_EXTHDR_CHECK(m, off, hlen, ret)				\
-do {									\
-    if ((m)->m_next != NULL) {						\
-	if (((m)->m_flags & M_LOOP) &&					\
-	    ((m)->m_len < (off) + (hlen)) &&				\
-	    (((m) = m_pullup((m), (off) + (hlen))) == NULL)) {		\
-		ip6stat.ip6s_exthdrtoolong++;				\
-		return ret;						\
-	} else if ((m)->m_flags & M_EXT) {				\
-		if ((m)->m_len < (off) + (hlen)) {			\
-			ip6stat.ip6s_exthdrtoolong++;			\
-			m_freem(m);					\
-			return ret;					\
-		}							\
-	} else {							\
-		if ((m)->m_len < (off) + (hlen)) {			\
-			ip6stat.ip6s_exthdrtoolong++;			\
-			m_freem(m);					\
-			return ret;					\
-		}							\
-	}								\
-    } else {								\
-	if ((m)->m_len < (off) + (hlen)) {				\
-		ip6stat.ip6s_tooshort++;				\
-		in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_truncated);	\
-		m_freem(m);						\
-		return ret;						\
-	}								\
-    }									\
-} while (0)
-
-/*
- * IP6_EXTHDR_GET ensures that intermediate protocol header (from "off" to
- * "len") is located in single mbuf, on contiguous memory region.
- * The pointer to the region will be returned to pointer variable "val",
- * with type "typ".
- * IP6_EXTHDR_GET0 does the same, except that it aligns the structure at the
- * very top of mbuf.  GET0 is likely to make memory copy than GET.
- *
- * XXX we're now testing this, needs m_pulldown()
- */
-#define IP6_EXTHDR_GET(val, typ, m, off, len) \
-do {									\
-	struct mbuf *t;							\
-	int tmp;							\
-	if ((m)->m_len >= (off) + (len))				\
-		(val) = (typ)(mtod((m), caddr_t) + (off));		\
-	else {								\
-		t = m_pulldown((m), (off), (len), &tmp);		\
-		if (t) {						\
-			if (t->m_len < tmp + (len))			\
-				panic("m_pulldown malfunction");	\
-			(val) = (typ)(mtod(t, caddr_t) + tmp);		\
-		} else {						\
-			(val) = (typ)NULL;				\
-			(m) = NULL;					\
-		}							\
-	}								\
-} while (0)
-
-#define IP6_EXTHDR_GET0(val, typ, m, off, len) \
-do {									\
-	struct mbuf *t;							\
-	if ((off) == 0)							\
-		(val) = (typ)mtod(m, caddr_t);				\
-	else {								\
-		t = m_pulldown((m), (off), (len), NULL);		\
-		if (t) {						\
-			if (t->m_len < (len))				\
-				panic("m_pulldown malfunction");	\
-			(val) = (typ)mtod(t, caddr_t);			\
-		} else {						\
-			(val) = (typ)NULL;				\
-			(m) = NULL;					\
-		}							\
-	}								\
-} while (0)
-#endif /*_KERNEL*/
-
-#endif /* not _NETINET_IP6_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/ip_dummynet.h b/newlib/libc/sys/linux/include/netinet/ip_dummynet.h
deleted file mode 100644
index 509172f..0000000
--- a/newlib/libc/sys/linux/include/netinet/ip_dummynet.h
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Luigi Rizzo, Universita` di Pisa
- * Portions Copyright (c) 2000 Akamba Corp.
- * All rights reserved
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/ip_dummynet.h,v 1.18 2002/05/05 21:27:47 luigi Exp $
- */
-
-#ifndef _IP_DUMMYNET_H
-#define _IP_DUMMYNET_H
-
-/*
- * Definition of dummynet data structures. In the structures, I decided
- * not to use the macros in <sys/queue.h> in the hope of making the code
- * easier to port to other architectures. The type of lists and queue we
- * use here is pretty simple anyways.
- */
-
-/*
- * We start with a heap, which is used in the scheduler to decide when
- * to transmit packets etc.
- *
- * The key for the heap is used for two different values:
- *
- * 1. timer ticks- max 10K/second, so 32 bits are enough;
- *
- * 2. virtual times. These increase in steps of len/x, where len is the
- *    packet length, and x is either the weight of the flow, or the
- *    sum of all weights.
- *    If we limit to max 1000 flows and a max weight of 100, then
- *    x needs 17 bits. The packet size is 16 bits, so we can easily
- *    overflow if we do not allow errors.
- * So we use a key "dn_key" which is 64 bits. Some macros are used to
- * compare key values and handle wraparounds.
- * MAX64 returns the largest of two key values.
- * MY_M is used as a shift count when doing fixed point arithmetic
- * (a better name would be useful...).
- */
-typedef u_int64_t dn_key ;      /* sorting key */
-#define DN_KEY_LT(a,b)     ((int64_t)((a)-(b)) < 0)
-#define DN_KEY_LEQ(a,b)    ((int64_t)((a)-(b)) <= 0)
-#define DN_KEY_GT(a,b)     ((int64_t)((a)-(b)) > 0)
-#define DN_KEY_GEQ(a,b)    ((int64_t)((a)-(b)) >= 0)
-#define MAX64(x,y)  (( (int64_t) ( (y)-(x) )) > 0 ) ? (y) : (x)
-#define MY_M	16 /* number of left shift to obtain a larger precision */
-
-/*
- * XXX With this scaling, max 1000 flows, max weight 100, 1Gbit/s, the
- * virtual time wraps every 15 days.
- */
-
-/*
- * The OFFSET_OF macro is used to return the offset of a field within
- * a structure. It is used by the heap management routines.
- */
-#define OFFSET_OF(type, field) ((int)&( ((type *)0)->field) )
-
-/*
- * A heap entry is made of a key and a pointer to the actual
- * object stored in the heap.
- * The heap is an array of dn_heap_entry entries, dynamically allocated.
- * Current size is "size", with "elements" actually in use.
- * The heap normally supports only ordered insert and extract from the top.
- * If we want to extract an object from the middle of the heap, we
- * have to know where the object itself is located in the heap (or we
- * need to scan the whole array). To this purpose, an object has a
- * field (int) which contains the index of the object itself into the
- * heap. When the object is moved, the field must also be updated.
- * The offset of the index in the object is stored in the 'offset'
- * field in the heap descriptor. The assumption is that this offset
- * is non-zero if we want to support extract from the middle.
- */
-struct dn_heap_entry {
-    dn_key key ;	/* sorting key. Topmost element is smallest one */
-    void *object ;	/* object pointer */
-} ;
-
-struct dn_heap {
-    int size ;
-    int elements ;
-    int offset ; /* XXX if > 0 this is the offset of direct ptr to obj */
-    struct dn_heap_entry *p ;	/* really an array of "size" entries */
-} ;
-
-/*
- * MT_DUMMYNET is a new (fake) mbuf type that is prepended to the
- * packet when it comes out of a pipe. The definition
- * ought to go in /sys/sys/mbuf.h but here it is less intrusive.
- */
-
-#define MT_DUMMYNET MT_CONTROL
-
-/*
- * struct dn_pkt identifies a packet in the dummynet queue. The
- * first part is really an m_hdr for implementation purposes, and some
- * fields are saved there. When passing the packet back to the ip_input/
- * ip_output()/bdg_forward, the struct is prepended to the mbuf chain with type
- * MT_DUMMYNET, and contains the pointer to the matching rule.
- *
- * Note: there is no real need to make this structure contain an m_hdr,
- * in the future this should be changed to a normal data structure.
- */
-struct dn_pkt {
-    struct m_hdr hdr ;
-#define dn_next	hdr.mh_nextpkt	/* next element in queue */
-#define DN_NEXT(x)	(struct dn_pkt *)(x)->dn_next
-#define dn_m	hdr.mh_next	/* packet to be forwarded */
-#define dn_dir	hdr.mh_flags	/* action when pkt extracted from a queue */
-#define DN_TO_IP_OUT	1
-#define DN_TO_IP_IN	2
-#define DN_TO_BDG_FWD	3
-
-    dn_key  output_time;	/* when the pkt is due for delivery	*/
-    struct ifnet *ifp;		/* interface, for ip_output		*/
-    struct sockaddr_in *dn_dst ;
-    struct route ro;		/* route, for ip_output. MUST COPY	*/
-    int flags ;			/* flags, for ip_output (IPv6 ?)	*/
-};
-
-/*
- * Overall structure of dummynet (with WF2Q+):
-
-In dummynet, packets are selected with the firewall rules, and passed
-to two different objects: PIPE or QUEUE.
-
-A QUEUE is just a queue with configurable size and queue management
-policy. It is also associated with a mask (to discriminate among
-different flows), a weight (used to give different shares of the
-bandwidth to different flows) and a "pipe", which essentially
-supplies the transmit clock for all queues associated with that
-pipe.
-
-A PIPE emulates a fixed-bandwidth link, whose bandwidth is
-configurable.  The "clock" for a pipe can come from either an
-internal timer, or from the transmit interrupt of an interface.
-A pipe is also associated with one (or more, if masks are used)
-queue, where all packets for that pipe are stored.
-
-The bandwidth available on the pipe is shared by the queues
-associated with that pipe (only one in case the packet is sent
-to a PIPE) according to the WF2Q+ scheduling algorithm and the
-configured weights.
-
-In general, incoming packets are stored in the appropriate queue,
-which is then placed into one of a few heaps managed by a scheduler
-to decide when the packet should be extracted.
-The scheduler (a function called dummynet()) is run at every timer
-tick, and grabs queues from the head of the heaps when they are
-ready for processing.
-
-There are three data structures definining a pipe and associated queues:
-
- + dn_pipe, which contains the main configuration parameters related
-   to delay and bandwidth;
- + dn_flow_set, which contains WF2Q+ configuration, flow
-   masks, plr and RED configuration;
- + dn_flow_queue, which is the per-flow queue (containing the packets)
-
-Multiple dn_flow_set can be linked to the same pipe, and multiple
-dn_flow_queue can be linked to the same dn_flow_set.
-All data structures are linked in a linear list which is used for
-housekeeping purposes.
-
-During configuration, we create and initialize the dn_flow_set
-and dn_pipe structures (a dn_pipe also contains a dn_flow_set).
-
-At runtime: packets are sent to the appropriate dn_flow_set (either
-WFQ ones, or the one embedded in the dn_pipe for fixed-rate flows),
-which in turn dispatches them to the appropriate dn_flow_queue
-(created dynamically according to the masks).
-
-The transmit clock for fixed rate flows (ready_event()) selects the
-dn_flow_queue to be used to transmit the next packet. For WF2Q,
-wfq_ready_event() extract a pipe which in turn selects the right
-flow using a number of heaps defined into the pipe itself.
-
- *
- */
-
-/*
- * per flow queue. This contains the flow identifier, the queue
- * of packets, counters, and parameters used to support both RED and
- * WF2Q+.
- *
- * A dn_flow_queue is created and initialized whenever a packet for
- * a new flow arrives.
- */
-struct dn_flow_queue {
-    struct dn_flow_queue *next ;
-    struct ipfw_flow_id id ;
-
-    struct dn_pkt *head, *tail ;	/* queue of packets */
-    u_int len ;
-    u_int len_bytes ;
-    long numbytes ;		/* credit for transmission (dynamic queues) */
-
-    u_int64_t tot_pkts ;	/* statistics counters	*/
-    u_int64_t tot_bytes ;
-    u_int32_t drops ;
-
-    int hash_slot ;		/* debugging/diagnostic */
-
-    /* RED parameters */
-    int avg ;                   /* average queue length est. (scaled) */
-    int count ;                 /* arrivals since last RED drop */
-    int random ;                /* random value (scaled) */
-    u_int32_t q_time ;          /* start of queue idle time */
-
-    /* WF2Q+ support */
-    struct dn_flow_set *fs ;	/* parent flow set */
-    int heap_pos ;		/* position (index) of struct in heap */
-    dn_key sched_time ;		/* current time when queue enters ready_heap */
-
-    dn_key S,F ;		/* start time, finish time */
-    /*
-     * Setting F < S means the timestamp is invalid. We only need
-     * to test this when the queue is empty.
-     */
-} ;
-
-/*
- * flow_set descriptor. Contains the "template" parameters for the
- * queue configuration, and pointers to the hash table of dn_flow_queue's.
- *
- * The hash table is an array of lists -- we identify the slot by
- * hashing the flow-id, then scan the list looking for a match.
- * The size of the hash table (buckets) is configurable on a per-queue
- * basis.
- *
- * A dn_flow_set is created whenever a new queue or pipe is created (in the
- * latter case, the structure is located inside the struct dn_pipe).
- */
-struct dn_flow_set {
-    struct dn_flow_set *next; /* next flow set in all_flow_sets list */
-
-    u_short fs_nr ;             /* flow_set number       */
-    u_short flags_fs;
-#define DN_HAVE_FLOW_MASK	0x0001
-#define DN_IS_RED		0x0002
-#define DN_IS_GENTLE_RED	0x0004
-#define DN_QSIZE_IS_BYTES	0x0008	/* queue size is measured in bytes */
-#define DN_IS_PIPE		0x4000
-#define DN_IS_QUEUE		0x8000
-
-    struct dn_pipe *pipe ;	/* pointer to parent pipe */
-    u_short parent_nr ;		/* parent pipe#, 0 if local to a pipe */
-
-    int weight ;		/* WFQ queue weight */
-    int qsize ;			/* queue size in slots or bytes */
-    int plr ;			/* pkt loss rate (2^31-1 means 100%) */
-
-    struct ipfw_flow_id flow_mask ;
-
-    /* hash table of queues onto this flow_set */
-    int rq_size ;		/* number of slots */
-    int rq_elements ;		/* active elements */
-    struct dn_flow_queue **rq;	/* array of rq_size entries */
-
-    u_int32_t last_expired ;	/* do not expire too frequently */
-    int backlogged ;		/* #active queues for this flowset */
-
-        /* RED parameters */
-#define SCALE_RED               16
-#define SCALE(x)                ( (x) << SCALE_RED )
-#define SCALE_VAL(x)            ( (x) >> SCALE_RED )
-#define SCALE_MUL(x,y)          ( ( (x) * (y) ) >> SCALE_RED )
-    int w_q ;			/* queue weight (scaled) */
-    int max_th ;		/* maximum threshold for queue (scaled) */
-    int min_th ;		/* minimum threshold for queue (scaled) */
-    int max_p ;			/* maximum value for p_b (scaled) */
-    u_int c_1 ;			/* max_p/(max_th-min_th) (scaled) */
-    u_int c_2 ;			/* max_p*min_th/(max_th-min_th) (scaled) */
-    u_int c_3 ;			/* for GRED, (1-max_p)/max_th (scaled) */
-    u_int c_4 ;			/* for GRED, 1 - 2*max_p (scaled) */
-    u_int * w_q_lookup ;	/* lookup table for computing (1-w_q)^t */
-    u_int lookup_depth ;	/* depth of lookup table */
-    int lookup_step ;		/* granularity inside the lookup table */
-    int lookup_weight ;		/* equal to (1-w_q)^t / (1-w_q)^(t+1) */
-    int avg_pkt_size ;		/* medium packet size */
-    int max_pkt_size ;		/* max packet size */
-} ;
-
-/*
- * Pipe descriptor. Contains global parameters, delay-line queue,
- * and the flow_set used for fixed-rate queues.
- * 
- * For WF2Q+ support it also has 3 heaps holding dn_flow_queue:
- *   not_eligible_heap, for queues whose start time is higher
- *	than the virtual time. Sorted by start time.
- *   scheduler_heap, for queues eligible for scheduling. Sorted by
- *	finish time.
- *   idle_heap, all flows that are idle and can be removed. We
- *	do that on each tick so we do not slow down too much
- *	operations during forwarding.
- * 
- */
-struct dn_pipe {		/* a pipe */
-    struct dn_pipe *next ;
-
-    int	pipe_nr ;		/* number	*/
-    int bandwidth;		/* really, bytes/tick.	*/
-    int	delay ;			/* really, ticks	*/
-
-    struct	dn_pkt *head, *tail ;	/* packets in delay line */
-
-    /* WF2Q+ */
-    struct dn_heap scheduler_heap ; /* top extract - key Finish time*/
-    struct dn_heap not_eligible_heap; /* top extract- key Start time */
-    struct dn_heap idle_heap ; /* random extract - key Start=Finish time */
-
-    dn_key V ;			/* virtual time */
-    int sum;			/* sum of weights of all active sessions */
-    int numbytes;		/* bits I can transmit (more or less). */
-
-    dn_key sched_time ;		/* time pipe was scheduled in ready_heap */
-
-    /*
-     * When the tx clock come from an interface (if_name[0] != '\0'), its name
-     * is stored below, whereas the ifp is filled when the rule is configured.
-     */
-    char if_name[16];
-    struct ifnet *ifp ;
-    int ready ; /* set if ifp != NULL and we got a signal from it */
-
-    struct dn_flow_set fs ; /* used with fixed-rate flows */
-};
-
-#ifdef _KERNEL
-typedef	int ip_dn_ctl_t(struct sockopt *); /* raw_ip.c */
-typedef	void ip_dn_ruledel_t(void *); /* ip_fw.c */
-typedef	int ip_dn_io_t(int pipe, int dir, struct mbuf *m,
-	struct ifnet *ifp, struct route *ro, struct sockaddr_in * dst,
-	struct ip_fw *rule, int flags); /* ip_{in,out}put.c, bridge.c */
-extern	ip_dn_ctl_t *ip_dn_ctl_ptr;
-extern	ip_dn_ruledel_t *ip_dn_ruledel_ptr;
-extern	ip_dn_io_t *ip_dn_io_ptr;
-#define	DUMMYNET_LOADED	(ip_dn_io_ptr != NULL)
-#endif
-
-#endif /* _IP_DUMMYNET_H */
diff --git a/newlib/libc/sys/linux/include/netinet/ip_ecn.h b/newlib/libc/sys/linux/include/netinet/ip_ecn.h
deleted file mode 100644
index 9f82168..0000000
--- a/newlib/libc/sys/linux/include/netinet/ip_ecn.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$FreeBSD: src/sys/netinet/ip_ecn.h,v 1.5 2002/03/19 21:25:46 alfred Exp $	*/
-/*	$KAME: ip_ecn.h,v 1.6 2001/05/03 14:51:48 itojun Exp $	*/
-
-/*
- * Copyright (C) 1999 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-/*
- * ECN consideration on tunnel ingress/egress operation.
- * http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt
- */
-
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_inet.h"
-#endif
-
-#define ECN_ALLOWED	1	/* ECN allowed */
-#define ECN_FORBIDDEN	0	/* ECN forbidden */
-#define ECN_NOCARE	(-1)	/* no consideration to ECN */
-
-#ifdef _KERNEL
-extern void ip_ecn_ingress(int, u_int8_t *, const u_int8_t *);
-extern void ip_ecn_egress(int, const u_int8_t *, u_int8_t *);
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet/ip_encap.h b/newlib/libc/sys/linux/include/netinet/ip_encap.h
deleted file mode 100644
index cfc6bca..0000000
--- a/newlib/libc/sys/linux/include/netinet/ip_encap.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$FreeBSD: src/sys/netinet/ip_encap.h,v 1.3 2002/03/19 21:25:46 alfred Exp $	*/
-/*	$KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NETINET_IP_ENCAP_H_
-#define _NETINET_IP_ENCAP_H_
-
-#ifdef _KERNEL
-
-struct encaptab {
-	LIST_ENTRY(encaptab) chain;
-	int af;
-	int proto;			/* -1: don't care, I'll check myself */
-	struct sockaddr_storage src;	/* my addr */
-	struct sockaddr_storage srcmask;
-	struct sockaddr_storage dst;	/* remote addr */
-	struct sockaddr_storage dstmask;
-	int (*func)(const struct mbuf *, int, int, void *);
-	const struct protosw *psw;	/* only pr_input will be used */
-	void *arg;			/* passed via m->m_pkthdr.aux */
-};
-
-void	encap_init(void);
-void	encap4_input(struct mbuf *, int);
-int	encap6_input(struct mbuf **, int *, int);
-const struct encaptab *encap_attach(int, int, const struct sockaddr *,
-	const struct sockaddr *, const struct sockaddr *,
-	const struct sockaddr *, const struct protosw *, void *);
-const struct encaptab *encap_attach_func(int, int,
-	int (*)(const struct mbuf *, int, int, void *),
-	const struct protosw *, void *);
-int	encap_detach(const struct encaptab *);
-void	*encap_getarg(struct mbuf *);
-#endif
-
-#endif /*_NETINET_IP_ENCAP_H_*/
diff --git a/newlib/libc/sys/linux/include/netinet/ip_flow.h b/newlib/libc/sys/linux/include/netinet/ip_flow.h
deleted file mode 100644
index 90561f0..0000000
--- a/newlib/libc/sys/linux/include/netinet/ip_flow.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by the 3am Software Foundry ("3am").  It was developed by Matt Thomas.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet/ip_flow.h,v 1.4 2000/05/26 02:05:46 jake Exp $
- */
-
-#ifndef _NETINET_IP_FLOW_H
-#define _NETINET_IP_FLOW_H
-
-struct ipflow {
-	LIST_ENTRY(ipflow) ipf_next;	/* next ipflow in bucket */
-	struct in_addr ipf_dst;		/* destination address */
-	struct in_addr ipf_src;		/* source address */
-
-	u_int8_t ipf_tos;		/* type-of-service */
-	struct route ipf_ro;		/* associated route entry */
-	u_long ipf_uses;		/* number of uses in this period */
-
-	int ipf_timer;			/* remaining lifetime of this entry */
-	u_long ipf_dropped;		/* ENOBUFS returned by if_output */
-	u_long ipf_errors;		/* other errors returned by if_output */
-	u_long ipf_last_uses;		/* number of uses in last period */
-};
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet/ip_fw.h b/newlib/libc/sys/linux/include/netinet/ip_fw.h
deleted file mode 100644
index 3c2b1c7..0000000
--- a/newlib/libc/sys/linux/include/netinet/ip_fw.h
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * Copyright (c) 1993 Daniel Boulet
- * Copyright (c) 1994 Ugen J.S.Antsilevich
- *
- * Redistribution and use in source forms, with and without modification,
- * are permitted provided that this entire comment appears intact.
- *
- * Redistribution in binary form may occur without any restrictions.
- * Obviously, it would be nice if you gave credit where credit is due
- * but requiring it would be too onerous.
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- *
- * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.66 2002/05/09 10:34:57 luigi Exp $
- */
-
-#ifndef _IP_FW_H
-#define _IP_FW_H
-
-#include <sys/queue.h>
-
-/*
- * This union structure identifies an interface, either explicitly
- * by name or implicitly by IP address. The flags IP_FW_F_IIFNAME
- * and IP_FW_F_OIFNAME say how to interpret this structure. An
- * interface unit number of -1 matches any unit number, while an
- * IP address of 0.0.0.0 indicates matches any interface.
- *
- * The receive and transmit interfaces are only compared against the
- * the packet if the corresponding bit (IP_FW_F_IIFACE or IP_FW_F_OIFACE)
- * is set. Note some packets lack a receive or transmit interface
- * (in which case the missing "interface" never matches).
- */
-
-union ip_fw_if {
-	struct in_addr	fu_via_ip;	/* Specified by IP address */
-	struct {			/* Specified by interface name */
-#define FW_IFNLEN	10		/* need room ! was IFNAMSIZ */
-		char	name[FW_IFNLEN];
-		short	unit;		/* -1 means match any unit */
-	} fu_via_if;
-};
-
-/*
- * Format of an IP firewall descriptor
- *
- * fw_src, fw_dst, fw_smsk, fw_dmsk are always stored in network byte order.
- * fw_flg and fw_n*p are stored in host byte order (of course).
- * Port numbers are stored in HOST byte order.
- */
-
-/*
- * To match MAC headers:
- *     12 bytes at fw_mac_hdr contain the dst-src MAC address after masking.
- *     12 bytes at fw_mac_mask contain the mask to apply to dst-src
- *     2 bytes at fw_mac_type contain the mac type after mask (in net format)
- *     2 bytes at fw_mac_type_mask contain the mac type mask
- *         If IP_FW_F_SRNG, the two contain the low-high of a range of types.
- *     IP_FW_F_DRNG is used to indicare we want to match a vlan.
- */
-#define	fw_mac_hdr		fw_src
-#define	fw_mac_mask		fw_uar
-#define	fw_mac_type		fw_iplen
-#define	fw_mac_mask_type	fw_ipid
-
-struct ip_fw {
-	LIST_ENTRY(ip_fw) next;		/* bidirectional list of rules */
-	u_int		fw_flg;		/* Operational Flags word */
-	u_int64_t	fw_pcnt;	/* Packet counters */
-	u_int64_t	fw_bcnt;	/* Byte counters */
-
-	struct in_addr	fw_src;		/* Source IP address */
-	struct in_addr	fw_dst;		/* Destination IP address */
-	struct in_addr	fw_smsk;	/* Mask for source IP address */
-	struct in_addr	fw_dmsk;	/* Mask for destination address */
-	u_short		fw_number;	/* Rule number */
-	u_char		fw_prot;	/* IP protocol */
-#if 1
-	u_char		fw_nports;	/* # of src/dst port in array */
-#define	IP_FW_GETNSRCP(rule)		((rule)->fw_nports & 0x0f)
-#define	IP_FW_SETNSRCP(rule, n)		do {				\
-					    (rule)->fw_nports &= ~0x0f;	\
-					    (rule)->fw_nports |= (n);	\
-					} while (0)
-#define	IP_FW_GETNDSTP(rule)		((rule)->fw_nports >> 4)
-#define	IP_FW_SETNDSTP(rule, n)		do {				  \
-					    (rule)->fw_nports &= ~0xf0;	  \
-					    (rule)->fw_nports |= (n) << 4;\
-					} while (0)
-#define	IP_FW_HAVEPORTS(rule)		((rule)->fw_nports != 0)
-#else
-	u_char		__pad[1];
-	u_int		_nsrcp;
-	u_int		_ndstp;
-#define	IP_FW_GETNSRCP(rule)		(rule)->_nsrcp
-#define	IP_FW_SETNSRCP(rule,n)		(rule)->_nsrcp = n
-#define	IP_FW_GETNDSTP(rule)		(rule)->_ndstp
-#define	IP_FW_SETNDSTP(rule,n)		(rule)->_ndstp = n
-#define	IP_FW_HAVEPORTS(rule)		((rule)->_ndstp + (rule)->_nsrcp != 0)
-#endif
-#define	IP_FW_MAX_PORTS	10		/* A reasonable maximum */
-    union {
-	u_short		fw_pts[IP_FW_MAX_PORTS]; /* port numbers to match */
-#define	IP_FW_ICMPTYPES_MAX	128
-#define	IP_FW_ICMPTYPES_DIM	(IP_FW_ICMPTYPES_MAX / (sizeof(unsigned) * 8))
-	unsigned	fw_icmptypes[IP_FW_ICMPTYPES_DIM]; /*ICMP types bitmap*/
-    } fw_uar;
-
-	u_int		fw_ipflg;	/* IP flags word */
-	u_short		fw_iplen;	/* IP length */
-	u_short		fw_ipid;	/* Identification */
-	u_char		fw_ipopt;	/* IP options set */
-	u_char		fw_ipnopt;	/* IP options unset */
-	u_char		fw_iptos;	/* IP type of service set */
-	u_char		fw_ipntos;	/* IP type of service unset */
-	u_char		fw_ipttl;	/* IP time to live */
-	u_int		fw_ipver:4;	/* IP version */
-	u_char		fw_tcpopt;	/* TCP options set */
-	u_char		fw_tcpnopt;	/* TCP options unset */
-	u_char		fw_tcpf;	/* TCP flags set */
-	u_char		fw_tcpnf;	/* TCP flags unset */
-	u_short		fw_tcpwin;	/* TCP window size */
-	u_int32_t	fw_tcpseq;	/* TCP sequence */
-	u_int32_t	fw_tcpack;	/* TCP acknowledgement */
-	long		timestamp;	/* timestamp (tv_sec) of last match */
-	union ip_fw_if	fw_in_if;	/* Incoming interfaces */
-	union ip_fw_if	fw_out_if;	/* Outgoing interfaces */
-    union {
-	u_short		fu_divert_port;	/* Divert/tee port (options IPDIVERT) */
-	u_short		fu_pipe_nr;	/* queue number (option DUMMYNET) */
-	u_short		fu_skipto_rule;	/* SKIPTO command rule number */
-	u_short		fu_reject_code;	/* REJECT response code */
-	struct sockaddr_in fu_fwd_ip;
-    } fw_un;
-	void		*pipe_ptr;	/* flow_set ptr for dummynet pipe */
-	void		*next_rule_ptr;	/* next rule in case of match */
-	uid_t		fw_uid;		/* uid to match */
-	gid_t		fw_gid;		/* gid to match */
-	int		fw_logamount;	/* amount to log */
-	u_int64_t	fw_loghighest;	/* highest number packet to log */
-
-	long		dont_match_prob; /* 0x7fffffff means 1.0, always fail */
-	u_char		dyn_type;	/* type for dynamic rule */
-
-#define	DYN_KEEP_STATE	0	/* type for keep-state rules	*/
-#define	DYN_LIMIT	1	/* type for limit connection rules */
-#define	DYN_LIMIT_PARENT 2	/* parent entry for limit connection rules */
-
-	/* following two fields are used to limit number of connections
-	 * basing on either src, srcport, dst, dstport.
-	 */
-	u_char		limit_mask;	/* mask type for limit rule, can
-					 * have many.
-					 */
-#define	DYN_SRC_ADDR	0x1
-#define	DYN_SRC_PORT	0x2
-#define	DYN_DST_ADDR	0x4
-#define	DYN_DST_PORT	0x8
-
-	u_short		conn_limit;	/* # of connections for limit rule */
-};
-
-#define	fw_divert_port	fw_un.fu_divert_port
-#define	fw_skipto_rule	fw_un.fu_skipto_rule
-#define	fw_reject_code	fw_un.fu_reject_code
-#define	fw_pipe_nr	fw_un.fu_pipe_nr
-#define	fw_fwd_ip	fw_un.fu_fwd_ip
-
-/*
- *
- *   rule_ptr  -------------+
- *                          V
- *     [ next.le_next ]---->[ next.le_next ]---- [ next.le_next ]--->
- *     [ next.le_prev ]<----[ next.le_prev ]<----[ next.le_prev ]<---
- *     [ <ip_fw> body ]     [ <ip_fw> body ]     [ <ip_fw> body ]
- *
- */
-
-/*
- * Flow mask/flow id for each queue.
- */
-struct ipfw_flow_id {
-	u_int32_t	dst_ip;
-	u_int32_t	src_ip;
-	u_int16_t	dst_port;
-	u_int16_t	src_port;
-	u_int8_t	proto;
-	u_int8_t	flags;	/* protocol-specific flags */
-};
-
-/*
- * dynamic ipfw rule
- */
-struct ipfw_dyn_rule {
-	struct ipfw_dyn_rule *next;
-	struct ipfw_flow_id id;		/* (masked) flow id */
-	struct ip_fw	*rule;		/* pointer to rule */
-	struct ipfw_dyn_rule *parent;	/* pointer to parent rule */
-	u_int32_t	expire;		/* expire time */
-	u_int64_t	pcnt;		/* packet match counters */
-	u_int64_t	bcnt;		/* byte match counters */
-	u_int32_t	bucket;		/* which bucket in hash table */
-	u_int32_t	state;		/* state of this rule (typically a
-					 * combination of TCP flags)
-					 */
-	u_int16_t	dyn_type;	/* rule type */
-	u_int16_t	count;		/* refcount */
-};
-
-/*
- * Values for "flags" field .
- */
-#define	IP_FW_F_COMMAND	0x000000ff	/* Mask for type of chain entry: */
-#define	IP_FW_F_DENY	0x00000000	/* This is a deny rule */
-#define	IP_FW_F_REJECT	0x00000001	/* Deny and send a response packet */
-#define	IP_FW_F_ACCEPT	0x00000002	/* This is an accept rule */
-#define	IP_FW_F_COUNT	0x00000003	/* This is a count rule */
-#define	IP_FW_F_DIVERT	0x00000004	/* This is a divert rule */
-#define	IP_FW_F_TEE	0x00000005	/* This is a tee rule */
-#define	IP_FW_F_SKIPTO	0x00000006	/* This is a skipto rule */
-#define	IP_FW_F_FWD	0x00000007	/* This is a "change forwarding
-					 * address" rule
-					 */
-#define	IP_FW_F_PIPE	0x00000008	/* This is a dummynet rule */
-#define	IP_FW_F_QUEUE	0x00000009	/* This is a dummynet queue */
-
-#define	IP_FW_F_IN	0x00000100	/* Check inbound packets */
-#define	IP_FW_F_OUT	0x00000200	/* Check outbound packets */
-#define	IP_FW_F_IIFACE	0x00000400	/* Apply inbound interface test */
-#define	IP_FW_F_OIFACE	0x00000800	/* Apply outbound interface test */
-#define	IP_FW_F_PRN	0x00001000	/* Print if this rule matches */
-#define	IP_FW_F_SRNG	0x00002000	/* The first two src ports are a min
-					 * and max range (stored in host byte
-					 * order).
-					 */
-#define	IP_FW_F_DRNG	0x00004000	/* The first two dst ports are a min
-					 * and max range (stored in host byte
-					 * order).
-					 */
-#define	IP_FW_F_FRAG	0x00008000	/* Fragment */
-#define	IP_FW_F_IIFNAME	0x00010000	/* In interface by name/unit (not IP) */
-#define	IP_FW_F_OIFNAME	0x00020000	/* Out interface by name/unit (not IP)*/
-#define	IP_FW_F_INVSRC	0x00040000	/* Invert sense of src check */
-#define	IP_FW_F_INVDST	0x00080000	/* Invert sense of dst check */
-#define	IP_FW_F_ICMPBIT	0x00100000	/* ICMP type bitmap is valid */
-#define	IP_FW_F_UID	0x00200000	/* filter by uid */
-#define	IP_FW_F_GID	0x00400000	/* filter by gid */
-#define	IP_FW_F_RND_MATCH 0x00800000	/* probabilistic rule match */
-#define	IP_FW_F_SMSK	0x01000000	/* src-port + mask */
-#define	IP_FW_F_DMSK	0x02000000	/* dst-port + mask */
-#define	IP_FW_BRIDGED	0x04000000	/* only match bridged packets */
-#define	IP_FW_F_KEEP_S	0x08000000	/* keep state */
-#define	IP_FW_F_CHECK_S	0x10000000	/* check state */
-#define	IP_FW_F_SME	0x20000000	/* source = me */
-#define	IP_FW_F_DME	0x40000000	/* destination = me */
-#define	IP_FW_F_MAC	0x80000000	/* match MAC header */
-
-#define	IP_FW_F_MASK	0xFFFFFFFF	/* All possible flag bits mask */
-
-/*
- * Flags for the 'fw_ipflg' field, for comparing values
- * of ip and its protocols.
- */
-#define	IP_FW_IF_TCPOPT	0x00000001	/* tcp options */
-#define	IP_FW_IF_TCPFLG	0x00000002	/* tcp flags */
-#define	IP_FW_IF_TCPSEQ	0x00000004	/* tcp sequence number */
-#define	IP_FW_IF_TCPACK	0x00000008	/* tcp acknowledgement number */
-#define	IP_FW_IF_TCPWIN	0x00000010	/* tcp window size */
-#define	IP_FW_IF_TCPEST	0x00000020	/* established TCP connection */
-#define	IP_FW_IF_TCPMSK	0x0000003f	/* mask of all tcp values */
-#define	IP_FW_IF_IPOPT	0x00000100	/* ip options */
-#define	IP_FW_IF_IPLEN	0x00000200	/* ip length */
-#define	IP_FW_IF_IPID	0x00000400	/* ip identification */
-#define	IP_FW_IF_IPTOS	0x00000800	/* ip type of service */
-#define	IP_FW_IF_IPTTL	0x00001000	/* ip time to live */
-#define	IP_FW_IF_IPVER	0x00002000	/* ip version */
-#define	IP_FW_IF_IPPRE	0x00004000	/* ip precedence */
-#define	IP_FW_IF_IPMSK	0x00007f00	/* mask of all ip values */
-#define	IP_FW_IF_MSK	0x0000ffff	/* All possible bits mask */
-
-/*
- * For backwards compatibility with rules specifying "via iface" but
- * not restricted to only "in" or "out" packets, we define this combination
- * of bits to represent this configuration.
- */
-
-#define	IF_FW_F_VIAHACK	(IP_FW_F_IN|IP_FW_F_OUT|IP_FW_F_IIFACE|IP_FW_F_OIFACE)
-
-/*
- * Definitions for REJECT response codes.
- * Values less than 256 correspond to ICMP unreachable codes.
- */
-#define	IP_FW_REJECT_RST	0x0100	/* TCP packets: send RST */
-
-/*
- * Definitions for IP option names.
- */
-#define	IP_FW_IPOPT_LSRR	0x01
-#define	IP_FW_IPOPT_SSRR	0x02
-#define	IP_FW_IPOPT_RR		0x04
-#define	IP_FW_IPOPT_TS		0x08
-
-/*
- * Definitions for TCP option names.
- */
-#define	IP_FW_TCPOPT_MSS	0x01
-#define	IP_FW_TCPOPT_WINDOW	0x02
-#define	IP_FW_TCPOPT_SACK	0x04
-#define	IP_FW_TCPOPT_TS		0x08
-#define	IP_FW_TCPOPT_CC		0x10
-
-/*
- * Definitions for TCP flags.
- */
-#define	IP_FW_TCPF_FIN		TH_FIN
-#define	IP_FW_TCPF_SYN		TH_SYN
-#define	IP_FW_TCPF_RST		TH_RST
-#define	IP_FW_TCPF_PSH		TH_PUSH
-#define	IP_FW_TCPF_ACK		TH_ACK
-#define	IP_FW_TCPF_URG		TH_URG
-
-/*
- * Main firewall chains definitions and global var's definitions.
- */
-#ifdef _KERNEL
-
-#define	IP_FW_PORT_DYNT_FLAG	0x10000
-#define	IP_FW_PORT_TEE_FLAG	0x20000
-#define	IP_FW_PORT_DENY_FLAG	0x40000
-
-/*
- * Function definitions.
- */
-void ip_fw_init(void);
-
-/* Firewall hooks */
-struct ip;
-struct sockopt;
-typedef int ip_fw_chk_t (struct mbuf **m, struct ifnet *oif,
-    u_int16_t *cookie, struct ip_fw **rule, struct sockaddr_in **next_hop);
-typedef int ip_fw_ctl_t (struct sockopt *);
-extern ip_fw_chk_t *ip_fw_chk_ptr;
-extern ip_fw_ctl_t *ip_fw_ctl_ptr;
-extern int fw_one_pass;
-extern int fw_enable;
-extern struct ipfw_flow_id last_pkt;
-#define	IPFW_LOADED	(ip_fw_chk_ptr != NULL)
-#endif /* _KERNEL */
-
-#endif /* _IP_FW_H */
diff --git a/newlib/libc/sys/linux/include/netinet/ip_icmp.h b/newlib/libc/sys/linux/include/netinet/ip_icmp.h
deleted file mode 100644
index 2574d07..0000000
--- a/newlib/libc/sys/linux/include/netinet/ip_icmp.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/ip_icmp.h,v 1.18 2002/03/19 21:25:46 alfred Exp $
- */
-
-#ifndef _NETINET_IP_ICMP_H_
-#define _NETINET_IP_ICMP_H_
-
-/*
- * Interface Control Message Protocol Definitions.
- * Per RFC 792, September 1981.
- */
-
-/*
- * Internal of an ICMP Router Advertisement
- */
-struct icmp_ra_addr {
-	u_int32_t ira_addr;
-	u_int32_t ira_preference;
-};
-
-/*
- * Structure of an icmp header.
- */
-struct icmp {
-	u_char	icmp_type;		/* type of message, see below */
-	u_char	icmp_code;		/* type sub code */
-	u_short	icmp_cksum;		/* ones complement cksum of struct */
-	union {
-		u_char ih_pptr;			/* ICMP_PARAMPROB */
-		struct in_addr ih_gwaddr;	/* ICMP_REDIRECT */
-		struct ih_idseq {
-			n_short	icd_id;
-			n_short	icd_seq;
-		} ih_idseq;
-		int ih_void;
-
-		/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
-		struct ih_pmtu {
-			n_short ipm_void;
-			n_short ipm_nextmtu;
-		} ih_pmtu;
-
-		struct ih_rtradv {
-			u_char irt_num_addrs;
-			u_char irt_wpa;
-			u_int16_t irt_lifetime;
-		} ih_rtradv;
-	} icmp_hun;
-#define	icmp_pptr	icmp_hun.ih_pptr
-#define	icmp_gwaddr	icmp_hun.ih_gwaddr
-#define	icmp_id		icmp_hun.ih_idseq.icd_id
-#define	icmp_seq	icmp_hun.ih_idseq.icd_seq
-#define	icmp_void	icmp_hun.ih_void
-#define	icmp_pmvoid	icmp_hun.ih_pmtu.ipm_void
-#define	icmp_nextmtu	icmp_hun.ih_pmtu.ipm_nextmtu
-#define	icmp_num_addrs	icmp_hun.ih_rtradv.irt_num_addrs
-#define	icmp_wpa	icmp_hun.ih_rtradv.irt_wpa
-#define	icmp_lifetime	icmp_hun.ih_rtradv.irt_lifetime
-	union {
-		struct id_ts {
-			n_time its_otime;
-			n_time its_rtime;
-			n_time its_ttime;
-		} id_ts;
-		struct id_ip  {
-			struct ip idi_ip;
-			/* options and then 64 bits of data */
-		} id_ip;
-		struct icmp_ra_addr id_radv;
-		u_int32_t id_mask;
-		char	id_data[1];
-	} icmp_dun;
-#define	icmp_otime	icmp_dun.id_ts.its_otime
-#define	icmp_rtime	icmp_dun.id_ts.its_rtime
-#define	icmp_ttime	icmp_dun.id_ts.its_ttime
-#define	icmp_ip		icmp_dun.id_ip.idi_ip
-#define	icmp_radv	icmp_dun.id_radv
-#define	icmp_mask	icmp_dun.id_mask
-#define	icmp_data	icmp_dun.id_data
-};
-
-/*
- * Lower bounds on packet lengths for various types.
- * For the error advice packets must first insure that the
- * packet is large enough to contain the returned ip header.
- * Only then can we do the check to see if 64 bits of packet
- * data have been returned, since we need to check the returned
- * ip header length.
- */
-#define	ICMP_MINLEN	8				/* abs minimum */
-#define	ICMP_TSLEN	(8 + 3 * sizeof (n_time))	/* timestamp */
-#define	ICMP_MASKLEN	12				/* address mask */
-#define	ICMP_ADVLENMIN	(8 + sizeof (struct ip) + 8)	/* min */
-#ifndef _IP_VHL
-#define	ICMP_ADVLEN(p)	(8 + ((p)->icmp_ip.ip_hl << 2) + 8)
-	/* N.B.: must separately check that ip_hl >= 5 */
-#else
-#define	ICMP_ADVLEN(p)	(8 + (IP_VHL_HL((p)->icmp_ip.ip_vhl) << 2) + 8)
-	/* N.B.: must separately check that header length >= 5 */
-#endif
-
-/*
- * Definition of type and code field values.
- */
-#define	ICMP_ECHOREPLY		0		/* echo reply */
-#define	ICMP_UNREACH		3		/* dest unreachable, codes: */
-#define		ICMP_UNREACH_NET	0		/* bad net */
-#define		ICMP_UNREACH_HOST	1		/* bad host */
-#define		ICMP_UNREACH_PROTOCOL	2		/* bad protocol */
-#define		ICMP_UNREACH_PORT	3		/* bad port */
-#define		ICMP_UNREACH_NEEDFRAG	4		/* IP_DF caused drop */
-#define		ICMP_UNREACH_SRCFAIL	5		/* src route failed */
-#define		ICMP_UNREACH_NET_UNKNOWN 6		/* unknown net */
-#define		ICMP_UNREACH_HOST_UNKNOWN 7		/* unknown host */
-#define		ICMP_UNREACH_ISOLATED	8		/* src host isolated */
-#define		ICMP_UNREACH_NET_PROHIB	9		/* prohibited access */
-#define		ICMP_UNREACH_HOST_PROHIB 10		/* ditto */
-#define		ICMP_UNREACH_TOSNET	11		/* bad tos for net */
-#define		ICMP_UNREACH_TOSHOST	12		/* bad tos for host */
-#define		ICMP_UNREACH_FILTER_PROHIB 13		/* admin prohib */
-#define		ICMP_UNREACH_HOST_PRECEDENCE 14		/* host prec vio. */
-#define		ICMP_UNREACH_PRECEDENCE_CUTOFF 15	/* prec cutoff */
-#define	ICMP_SOURCEQUENCH	4		/* packet lost, slow down */
-#define	ICMP_REDIRECT		5		/* shorter route, codes: */
-#define		ICMP_REDIRECT_NET	0		/* for network */
-#define		ICMP_REDIRECT_HOST	1		/* for host */
-#define		ICMP_REDIRECT_TOSNET	2		/* for tos and net */
-#define		ICMP_REDIRECT_TOSHOST	3		/* for tos and host */
-#define	ICMP_ECHO		8		/* echo service */
-#define	ICMP_ROUTERADVERT	9		/* router advertisement */
-#define	ICMP_ROUTERSOLICIT	10		/* router solicitation */
-#define	ICMP_TIMXCEED		11		/* time exceeded, code: */
-#define		ICMP_TIMXCEED_INTRANS	0		/* ttl==0 in transit */
-#define		ICMP_TIMXCEED_REASS	1		/* ttl==0 in reass */
-#define	ICMP_PARAMPROB		12		/* ip header bad */
-#define		ICMP_PARAMPROB_ERRATPTR 0		/* error at param ptr */
-#define		ICMP_PARAMPROB_OPTABSENT 1		/* req. opt. absent */
-#define		ICMP_PARAMPROB_LENGTH 2			/* bad length */
-#define	ICMP_TSTAMP		13		/* timestamp request */
-#define	ICMP_TSTAMPREPLY	14		/* timestamp reply */
-#define	ICMP_IREQ		15		/* information request */
-#define	ICMP_IREQREPLY		16		/* information reply */
-#define	ICMP_MASKREQ		17		/* address mask request */
-#define	ICMP_MASKREPLY		18		/* address mask reply */
-
-#define	ICMP_MAXTYPE		18
-
-#define	ICMP_INFOTYPE(type) \
-	((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
-	(type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
-	(type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \
-	(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
-	(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
-
-#ifdef _KERNEL
-void	icmp_error(struct mbuf *, int, int, n_long, struct ifnet *);
-void	icmp_input(struct mbuf *, int);
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet/ip_mroute.h b/newlib/libc/sys/linux/include/netinet/ip_mroute.h
deleted file mode 100644
index 555ff47..0000000
--- a/newlib/libc/sys/linux/include/netinet/ip_mroute.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 1989 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/ip_mroute.h,v 1.19 2002/03/19 21:25:46 alfred Exp $
- */
-
-#ifndef _NETINET_IP_MROUTE_H_
-#define _NETINET_IP_MROUTE_H_
-
-/*
- * Definitions for IP multicast forwarding.
- *
- * Written by David Waitzman, BBN Labs, August 1988.
- * Modified by Steve Deering, Stanford, February 1989.
- * Modified by Ajit Thyagarajan, PARC, August 1993.
- * Modified by Ajit Thyagarajan, PARC, August 1994.
- *
- * MROUTING Revision: 3.3.1.3
- */
-
-
-/*
- * Multicast Routing set/getsockopt commands.
- */
-#define	MRT_INIT	100	/* initialize forwarder */
-#define	MRT_DONE	101	/* shut down forwarder */
-#define	MRT_ADD_VIF	102	/* create virtual interface */
-#define	MRT_DEL_VIF	103	/* delete virtual interface */
-#define MRT_ADD_MFC	104	/* insert forwarding cache entry */
-#define MRT_DEL_MFC	105	/* delete forwarding cache entry */
-#define MRT_VERSION	106	/* get kernel version number */
-#define MRT_ASSERT      107     /* enable PIM assert processing */
-
-
-#define GET_TIME(t)	microtime(&t)
-
-/*
- * Types and macros for handling bitmaps with one bit per virtual interface.
- */
-#define	MAXVIFS 32
-typedef u_long vifbitmap_t;
-typedef u_short vifi_t;		/* type of a vif index */
-#define ALL_VIFS (vifi_t)-1
-
-#define	VIFM_SET(n, m)		((m) |= (1 << (n)))
-#define	VIFM_CLR(n, m)		((m) &= ~(1 << (n)))
-#define	VIFM_ISSET(n, m)	((m) & (1 << (n)))
-#define	VIFM_CLRALL(m)		((m) = 0x00000000)
-#define	VIFM_COPY(mfrom, mto)	((mto) = (mfrom))
-#define	VIFM_SAME(m1, m2)	((m1) == (m2))
-
-
-/*
- * Argument structure for MRT_ADD_VIF.
- * (MRT_DEL_VIF takes a single vifi_t argument.)
- */
-struct vifctl {
-	vifi_t	vifc_vifi;	    	/* the index of the vif to be added */
-	u_char	vifc_flags;     	/* VIFF_ flags defined below */
-	u_char	vifc_threshold; 	/* min ttl required to forward on vif */
-	u_int	vifc_rate_limit;	/* max rate */
-	struct	in_addr vifc_lcl_addr;	/* local interface address */
-	struct	in_addr vifc_rmt_addr;	/* remote address (tunnels only) */
-};
-
-#define	VIFF_TUNNEL	0x1		/* vif represents a tunnel end-point */
-#define VIFF_SRCRT	0x2		/* tunnel uses IP source routing */
-
-/*
- * Argument structure for MRT_ADD_MFC and MRT_DEL_MFC
- * (mfcc_tos to be added at a future point)
- */
-struct mfcctl {
-    struct in_addr  mfcc_origin;		/* ip origin of mcasts       */
-    struct in_addr  mfcc_mcastgrp; 		/* multicast group associated*/
-    vifi_t	    mfcc_parent;   		/* incoming vif              */
-    u_char	    mfcc_ttls[MAXVIFS]; 	/* forwarding ttls on vifs   */
-};
-
-/*
- * The kernel's multicast routing statistics.
- */
-struct mrtstat {
-    u_long	mrts_mfc_lookups;	/* # forw. cache hash table hits   */
-    u_long	mrts_mfc_misses;	/* # forw. cache hash table misses */
-    u_long	mrts_upcalls;		/* # calls to mrouted              */
-    u_long	mrts_no_route;		/* no route for packet's origin    */
-    u_long	mrts_bad_tunnel;	/* malformed tunnel options        */
-    u_long	mrts_cant_tunnel;	/* no room for tunnel options      */
-    u_long	mrts_wrong_if;		/* arrived on wrong interface	   */
-    u_long	mrts_upq_ovflw;		/* upcall Q overflow		   */
-    u_long	mrts_cache_cleanups;	/* # entries with no upcalls 	   */
-    u_long  	mrts_drop_sel;     	/* pkts dropped selectively        */
-    u_long  	mrts_q_overflow;    	/* pkts dropped - Q overflow       */
-    u_long  	mrts_pkt2large;     	/* pkts dropped - size > BKT SIZE  */
-    u_long	mrts_upq_sockfull;	/* upcalls dropped - socket full */
-};
-
-/*
- * Argument structure used by mrouted to get src-grp pkt counts
- */
-struct sioc_sg_req {
-    struct in_addr src;
-    struct in_addr grp;
-    u_long pktcnt;
-    u_long bytecnt;
-    u_long wrong_if;
-};
-
-/*
- * Argument structure used by mrouted to get vif pkt counts
- */
-struct sioc_vif_req {
-    vifi_t vifi;		/* vif number				*/
-    u_long icount;		/* Input packet count on vif		*/
-    u_long ocount;		/* Output packet count on vif		*/
-    u_long ibytes;		/* Input byte count on vif		*/
-    u_long obytes;		/* Output byte count on vif		*/
-};
-    
-
-/*
- * The kernel's virtual-interface structure.
- */
-struct vif {
-    u_char   		v_flags;     	/* VIFF_ flags defined above         */
-    u_char   		v_threshold;	/* min ttl required to forward on vif*/
-    u_int      		v_rate_limit; 	/* max rate			     */
-    struct tbf 	       *v_tbf;       	/* token bucket structure at intf.   */
-    struct in_addr 	v_lcl_addr;   	/* local interface address           */
-    struct in_addr 	v_rmt_addr;   	/* remote address (tunnels only)     */
-    struct ifnet       *v_ifp;	     	/* pointer to interface              */
-    u_long		v_pkt_in;	/* # pkts in on interface            */
-    u_long		v_pkt_out;	/* # pkts out on interface           */
-    u_long		v_bytes_in;	/* # bytes in on interface	     */
-    u_long		v_bytes_out;	/* # bytes out on interface	     */
-    struct route	v_route;	/* cached route if this is a tunnel */
-    u_int		v_rsvp_on;	/* RSVP listening on this vif */
-    struct socket      *v_rsvpd;	/* RSVP daemon socket */
-};
-
-/*
- * The kernel's multicast forwarding cache entry structure 
- * (A field for the type of service (mfc_tos) is to be added 
- * at a future point)
- */
-struct mfc {
-    struct in_addr  mfc_origin;	 		/* IP origin of mcasts   */
-    struct in_addr  mfc_mcastgrp;  		/* multicast group associated*/
-    vifi_t	    mfc_parent; 		/* incoming vif              */
-    u_char	    mfc_ttls[MAXVIFS]; 		/* forwarding ttls on vifs   */
-    u_long	    mfc_pkt_cnt;		/* pkt count for src-grp     */
-    u_long	    mfc_byte_cnt;		/* byte count for src-grp    */
-    u_long	    mfc_wrong_if;		/* wrong if for src-grp	     */
-    int		    mfc_expire;			/* time to clean entry up    */
-    struct timeval  mfc_last_assert;		/* last time I sent an assert*/
-    struct rtdetq  *mfc_stall;			/* q of packets awaiting mfc */
-    struct mfc     *mfc_next;			/* next mfc entry            */
-};
-
-/*
- * Struct used to communicate from kernel to multicast router
- * note the convenient similarity to an IP packet
- */
-struct igmpmsg {
-    u_long	    unused1;
-    u_long	    unused2;
-    u_char	    im_msgtype;			/* what type of message	    */
-#define IGMPMSG_NOCACHE		1
-#define IGMPMSG_WRONGVIF	2
-    u_char	    im_mbz;			/* must be zero		    */
-    u_char	    im_vif;			/* vif rec'd on		    */
-    u_char	    unused3;
-    struct in_addr  im_src, im_dst;
-};
-
-/*
- * Argument structure used for pkt info. while upcall is made
- */
-struct rtdetq {
-    struct mbuf 	*m;		/* A copy of the packet		    */
-    struct ifnet	*ifp;		/* Interface pkt came in on	    */
-    vifi_t		xmt_vif;	/* Saved copy of imo_multicast_vif  */
-#ifdef UPCALL_TIMING
-    struct timeval	t;		/* Timestamp */
-#endif /* UPCALL_TIMING */
-    struct rtdetq	*next;		/* Next in list of packets          */
-};
-
-#define MFCTBLSIZ	256
-#if (MFCTBLSIZ & (MFCTBLSIZ - 1)) == 0	  /* from sys:route.h */
-#define MFCHASHMOD(h)	((h) & (MFCTBLSIZ - 1))
-#else
-#define MFCHASHMOD(h)	((h) % MFCTBLSIZ)
-#endif
-
-#define MAX_UPQ	4		/* max. no of pkts in upcall Q */
-
-/*
- * Token Bucket filter code 
- */
-#define MAX_BKT_SIZE    10000             /* 10K bytes size 		*/
-#define MAXQSIZE        10                /* max # of pkts in queue 	*/
-
-/*
- * the token bucket filter at each vif
- */
-struct tbf
-{
-    struct timeval tbf_last_pkt_t; /* arr. time of last pkt 	*/
-    u_long tbf_n_tok;      	/* no of tokens in bucket 	*/
-    u_long tbf_q_len;    	/* length of queue at this vif	*/
-    u_long tbf_max_q_len;	/* max. queue length		*/
-    struct mbuf *tbf_q;		/* Packet queue			*/
-    struct mbuf *tbf_t;		/* tail-insertion pointer	*/
-};
-
-#ifdef _KERNEL
-
-struct sockopt;
-
-extern int	(*ip_mrouter_set)(struct socket *, struct sockopt *);
-extern int	(*ip_mrouter_get)(struct socket *, struct sockopt *);
-extern int	(*ip_mrouter_done)(void);
-extern int	(*mrt_ioctl)(int, caddr_t);
-
-#endif /* _KERNEL */
-
-#endif /* _NETINET_IP_MROUTE_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/ip_var.h b/newlib/libc/sys/linux/include/netinet/ip_var.h
deleted file mode 100644
index 8ee8602..0000000
--- a/newlib/libc/sys/linux/include/netinet/ip_var.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/netinet/ip_var.h,v 1.60 2002/03/19 21:25:46 alfred Exp $
- */
-
-#ifndef _NETINET_IP_VAR_H_
-#define	_NETINET_IP_VAR_H_
-
-#include <sys/queue.h>
-
-/*
- * Overlay for ip header used by other protocols (tcp, udp).
- */
-struct ipovly {
-	u_char	ih_x1[9];		/* (unused) */
-	u_char	ih_pr;			/* protocol */
-	u_short	ih_len;			/* protocol length */
-	struct	in_addr ih_src;		/* source internet address */
-	struct	in_addr ih_dst;		/* destination internet address */
-};
-
-/*
- * Ip reassembly queue structure.  Each fragment
- * being reassembled is attached to one of these structures.
- * They are timed out after ipq_ttl drops to 0, and may also
- * be reclaimed if memory becomes tight.
- */
-struct ipq {
-	TAILQ_ENTRY(ipq) ipq_list;	/* to other reass headers */
-	u_char	ipq_ttl;		/* time for reass q to live */
-	u_char	ipq_p;			/* protocol of this fragment */
-	u_short	ipq_id;			/* sequence id for reassembly */
-	struct mbuf *ipq_frags;		/* to ip headers of fragments */
-	struct	in_addr ipq_src,ipq_dst;
-#ifdef IPDIVERT
-	u_int32_t ipq_div_info;		/* ipfw divert port & flags */
-	u_int16_t ipq_div_cookie;	/* ipfw divert cookie */
-#endif
-};
-
-/*
- * Structure stored in mbuf in inpcb.ip_options
- * and passed to ip_output when ip options are in use.
- * The actual length of the options (including ipopt_dst)
- * is in m_len.
- */
-#define MAX_IPOPTLEN	40
-
-struct ipoption {
-	struct	in_addr ipopt_dst;	/* first-hop dst if source routed */
-	char	ipopt_list[MAX_IPOPTLEN];	/* options proper */
-};
-
-/*
- * Structure attached to inpcb.ip_moptions and
- * passed to ip_output when IP multicast options are in use.
- */
-struct ip_moptions {
-	struct	ifnet *imo_multicast_ifp; /* ifp for outgoing multicasts */
-	struct in_addr imo_multicast_addr; /* ifindex/addr on MULTICAST_IF */
-	u_char	imo_multicast_ttl;	/* TTL for outgoing multicasts */
-	u_char	imo_multicast_loop;	/* 1 => hear sends if a member */
-	u_short	imo_num_memberships;	/* no. memberships this socket */
-	struct	in_multi *imo_membership[IP_MAX_MEMBERSHIPS];
-	u_long	imo_multicast_vif;	/* vif num outgoing multicasts */
-};
-
-struct	ipstat {
-	u_long	ips_total;		/* total packets received */
-	u_long	ips_badsum;		/* checksum bad */
-	u_long	ips_tooshort;		/* packet too short */
-	u_long	ips_toosmall;		/* not enough data */
-	u_long	ips_badhlen;		/* ip header length < data size */
-	u_long	ips_badlen;		/* ip length < ip header length */
-	u_long	ips_fragments;		/* fragments received */
-	u_long	ips_fragdropped;	/* frags dropped (dups, out of space) */
-	u_long	ips_fragtimeout;	/* fragments timed out */
-	u_long	ips_forward;		/* packets forwarded */
-	u_long	ips_fastforward;	/* packets fast forwarded */
-	u_long	ips_cantforward;	/* packets rcvd for unreachable dest */
-	u_long	ips_redirectsent;	/* packets forwarded on same net */
-	u_long	ips_noproto;		/* unknown or unsupported protocol */
-	u_long	ips_delivered;		/* datagrams delivered to upper level*/
-	u_long	ips_localout;		/* total ip packets generated here */
-	u_long	ips_odropped;		/* lost packets due to nobufs, etc. */
-	u_long	ips_reassembled;	/* total packets reassembled ok */
-	u_long	ips_fragmented;		/* datagrams successfully fragmented */
-	u_long	ips_ofragments;		/* output fragments created */
-	u_long	ips_cantfrag;		/* don't fragment flag was set, etc. */
-	u_long	ips_badoptions;		/* error in option processing */
-	u_long	ips_noroute;		/* packets discarded due to no route */
-	u_long	ips_badvers;		/* ip version != 4 */
-	u_long	ips_rawout;		/* total raw ip packets generated */
-	u_long	ips_toolong;		/* ip length > max ip packet size */
-	u_long	ips_notmember;		/* multicasts for unregistered grps */
-	u_long	ips_nogif;		/* no match gif found */
-	u_long	ips_badaddr;		/* invalid address on header */
-};
-
-#ifdef _KERNEL
-
-/* flags passed to ip_output as last parameter */
-#define	IP_FORWARDING		0x1		/* most of ip header exists */
-#define	IP_RAWOUTPUT		0x2		/* raw ip header exists */
-#define	IP_ROUTETOIF		SO_DONTROUTE	/* bypass routing tables */
-#define	IP_ALLOWBROADCAST	SO_BROADCAST	/* can send broadcast packets */
-
-struct ip;
-struct inpcb;
-struct route;
-struct sockopt;
-
-extern struct	ipstat	ipstat;
-#ifndef RANDOM_IP_ID
-extern u_short	ip_id;				/* ip packet ctr, for ids */
-#endif
-extern int	ip_defttl;			/* default IP ttl */
-extern int	ipforwarding;			/* ip forwarding */
-extern struct route ipforward_rt;		/* ip forwarding cached route */
-extern u_char	ip_protox[];
-extern struct socket *ip_rsvpd;	/* reservation protocol daemon */
-extern struct socket *ip_mrouter; /* multicast routing daemon */
-extern int	(*legal_vif_num)(int);
-extern u_long	(*ip_mcast_src)(int);
-extern int rsvp_on;
-extern struct	pr_usrreqs rip_usrreqs;
-
-int	 ip_ctloutput(struct socket *, struct sockopt *sopt);
-void	 ip_drain(void);
-void	 ip_freemoptions(struct ip_moptions *);
-void	 ip_init(void);
-extern int	 (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *,
-			  struct ip_moptions *);
-int	 ip_output(struct mbuf *,
-	    struct mbuf *, struct route *, int, struct ip_moptions *);
-struct in_ifaddr *
-	 ip_rtaddr(struct in_addr, struct route *);
-void	 ip_savecontrol(struct inpcb *, struct mbuf **, struct ip *,
-		struct mbuf *);
-void	 ip_slowtimo(void);
-struct mbuf *
-	 ip_srcroute(void);
-void	 ip_stripoptions(struct mbuf *, struct mbuf *);
-#ifdef RANDOM_IP_ID
-u_int16_t	
-	 ip_randomid(void);
-#endif
-int	 rip_ctloutput(struct socket *, struct sockopt *);
-void	 rip_ctlinput(int, struct sockaddr *, void *);
-void	 rip_init(void);
-void	 rip_input(struct mbuf *, int);
-int	 rip_output(struct mbuf *, struct socket *, u_long);
-void	ipip_input(struct mbuf *, int);
-void	rsvp_input(struct mbuf *, int);
-int	ip_rsvp_init(struct socket *);
-int	ip_rsvp_done(void);
-int	ip_rsvp_vif_init(struct socket *, struct sockopt *);
-int	ip_rsvp_vif_done(struct socket *, struct sockopt *);
-void	ip_rsvp_force_done(struct socket *);
-
-#ifdef IPDIVERT
-void	div_init(void);
-void	div_input(struct mbuf *, int);
-void	divert_packet(struct mbuf *, int, int);
-extern struct pr_usrreqs div_usrreqs;
-extern u_int16_t ip_divert_cookie;
-#endif
-
-extern struct sockaddr_in *ip_fw_fwd_addr;
-
-void	in_delayed_cksum(struct mbuf *m);
-
-#endif /* _KERNEL */
-
-#endif /* !_NETINET_IP_VAR_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/ipprotosw.h b/newlib/libc/sys/linux/include/netinet/ipprotosw.h
deleted file mode 100644
index 0367ca2..0000000
--- a/newlib/libc/sys/linux/include/netinet/ipprotosw.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/sys/netinet/ipprotosw.h,v 1.4 2001/09/12 08:37:54 julian Exp $
- */
-
-#ifndef _NETINET_IPPROTOSW_H_
-#define _NETINET_IPPROTOSW_H_
-
-/*
- * For pfil_head structure.
- */
-#include <net/pfil.h>
-
-/* Forward declare these structures referenced from prototypes below. */
-struct mbuf;
-struct sockaddr;
-struct socket;
-struct sockopt;
-
-struct ipprotosw {
-	short	pr_type;		/* socket type used for */
-	struct	domain *pr_domain;	/* domain protocol a member of */
-	short	pr_protocol;		/* protocol number */
-	short	pr_flags;		/* see below */
-/* protocol-protocol hooks */
-	pr_in_input_t *pr_input;	/* input to protocol (from below) */
-	pr_output_t *pr_output;		/* output to protocol (from above) */
-	pr_ctlinput_t *pr_ctlinput;	/* control input (from below) */
-	pr_ctloutput_t *pr_ctloutput;	/* control output (from above) */
-/* user-protocol hook */
-	void	*pr_ousrreq;
-/* utility hooks */
-	pr_init_t *pr_init;
-	pr_fasttimo_t *pr_fasttimo;	/* fast timeout (200ms) */
-	pr_slowtimo_t *pr_slowtimo;	/* slow timeout (500ms) */
-	pr_drain_t *pr_drain;		/* flush any excess space possible */
-
-	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
-	struct	pfil_head	pr_pfh;
-};
-
-#endif /* !_NETINET_IPPROTOSW_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/tcp.h b/newlib/libc/sys/linux/include/netinet/tcp.h
deleted file mode 100644
index a6154e0..0000000
--- a/newlib/libc/sys/linux/include/netinet/tcp.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/tcp.h,v 1.16 2001/01/09 18:26:17 rwatson Exp $
- */
-
-#ifndef _NETINET_TCP_H_
-#define _NETINET_TCP_H_
-
-typedef	u_int32_t tcp_seq;
-typedef u_int32_t tcp_cc;		/* connection count per rfc1644 */
-
-#define tcp6_seq	tcp_seq	/* for KAME src sync over BSD*'s */
-#define tcp6hdr		tcphdr	/* for KAME src sync over BSD*'s */
-
-/*
- * TCP header.
- * Per RFC 793, September, 1981.
- */
-struct tcphdr {
-	u_short	th_sport;		/* source port */
-	u_short	th_dport;		/* destination port */
-	tcp_seq	th_seq;			/* sequence number */
-	tcp_seq	th_ack;			/* acknowledgement number */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_int	th_x2:4,		/* (unused) */
-		th_off:4;		/* data offset */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_int	th_off:4,		/* data offset */
-		th_x2:4;		/* (unused) */
-#endif
-	u_char	th_flags;
-#define	TH_FIN	0x01
-#define	TH_SYN	0x02
-#define	TH_RST	0x04
-#define	TH_PUSH	0x08
-#define	TH_ACK	0x10
-#define	TH_URG	0x20
-#define	TH_ECE	0x40
-#define	TH_CWR	0x80
-#define	TH_FLAGS	(TH_FIN|TH_SYN|TH_RST|TH_ACK|TH_URG|TH_ECE|TH_CWR)
-
-	u_short	th_win;			/* window */
-	u_short	th_sum;			/* checksum */
-	u_short	th_urp;			/* urgent pointer */
-};
-
-#define	TCPOPT_EOL		0
-#define	TCPOPT_NOP		1
-#define	TCPOPT_MAXSEG		2
-#define    TCPOLEN_MAXSEG		4
-#define TCPOPT_WINDOW		3
-#define    TCPOLEN_WINDOW		3
-#define TCPOPT_SACK_PERMITTED	4		/* Experimental */
-#define    TCPOLEN_SACK_PERMITTED	2
-#define TCPOPT_SACK		5		/* Experimental */
-#define TCPOPT_TIMESTAMP	8
-#define    TCPOLEN_TIMESTAMP		10
-#define    TCPOLEN_TSTAMP_APPA		(TCPOLEN_TIMESTAMP+2) /* appendix A */
-#define    TCPOPT_TSTAMP_HDR		\
-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
-
-#define	TCPOPT_CC		11		/* CC options: RFC-1644 */
-#define TCPOPT_CCNEW		12
-#define TCPOPT_CCECHO		13
-#define	   TCPOLEN_CC			6
-#define	   TCPOLEN_CC_APPA		(TCPOLEN_CC+2)
-#define	   TCPOPT_CC_HDR(ccopt)		\
-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|(ccopt)<<8|TCPOLEN_CC)
-
-/*
- * Default maximum segment size for TCP.
- * With an IP MSS of 576, this is 536,
- * but 512 is probably more convenient.
- * This should be defined as MIN(512, IP_MSS - sizeof (struct tcpiphdr)).
- */
-#define	TCP_MSS	512
-
-/*
- * Default maximum segment size for TCP6.
- * With an IP6 MSS of 1280, this is 1220,
- * but 1024 is probably more convenient. (xxx kazu in doubt)
- * This should be defined as MIN(1024, IP6_MSS - sizeof (struct tcpip6hdr))
- */
-#define	TCP6_MSS	1024
-
-#define	TCP_MAXWIN	65535	/* largest value for (unscaled) window */
-#define	TTCP_CLIENT_SND_WND	4096	/* dflt send window for T/TCP client */
-
-#define TCP_MAX_WINSHIFT	14	/* maximum window shift */
-
-#define TCP_MAXBURST		4 	/* maximum segments in a burst */
-
-#define TCP_MAXHLEN	(0xf<<2)	/* max length of header in bytes */
-#define TCP_MAXOLEN	(TCP_MAXHLEN - sizeof(struct tcphdr))
-					/* max space left for options */
-
-/*
- * User-settable options (used with setsockopt).
- */
-#define	TCP_NODELAY	0x01	/* don't delay send to coalesce packets */
-#define	TCP_MAXSEG	0x02	/* set maximum segment size */
-#define TCP_NOPUSH	0x04	/* don't push last block of write */
-#define TCP_NOOPT	0x08	/* don't use TCP options */
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet/tcp_debug.h b/newlib/libc/sys/linux/include/netinet/tcp_debug.h
deleted file mode 100644
index 3b27d09..0000000
--- a/newlib/libc/sys/linux/include/netinet/tcp_debug.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/tcp_debug.h,v 1.11 2000/01/29 11:49:05 shin Exp $
- */
-
-#ifndef _NETINET_TCP_DEBUG_H_
-#define	_NETINET_TCP_DEBUG_H_
-
-struct	tcp_debug {
-	n_time	td_time;
-	short	td_act;
-	short	td_ostate;
-	caddr_t	td_tcb;
-	int	td_family;
-	/*
-	 * Co-existense of td_ti and td_ti6 below is ugly, but it is necessary
-	 * to achieve backword compatibility to some extent.
-	 */
-	struct	tcpiphdr td_ti;
-	struct {
-#if !defined(_KERNEL) && defined(INET6)
-		struct	ip6_hdr ip6;
-#else
-		u_char	ip6buf[40]; /* sizeof(struct ip6_hdr) */
-#endif
-		struct	tcphdr th;
-	} td_ti6;
-#define	td_ip6buf	td_ti6.ip6buf
-	short	td_req;
-	struct	tcpcb td_cb;
-};
-
-#define	TA_INPUT 	0
-#define	TA_OUTPUT	1
-#define	TA_USER		2
-#define	TA_RESPOND	3
-#define	TA_DROP		4
-
-#ifdef TANAMES
-static char	*tanames[] =
-    { "input", "output", "user", "respond", "drop" };
-#endif
-
-#define	TCP_NDEBUG 100
-
-#ifndef _KERNEL
-/* XXX common variables for broken applications. */
-struct	tcp_debug tcp_debug[TCP_NDEBUG];
-int	tcp_debx;
-#endif
-
-#endif /* !_NETINET_TCP_DEBUG_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/tcp_fsm.h b/newlib/libc/sys/linux/include/netinet/tcp_fsm.h
deleted file mode 100644
index a45cbc7..0000000
--- a/newlib/libc/sys/linux/include/netinet/tcp_fsm.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/tcp_fsm.h,v 1.15 2002/02/03 11:57:32 markm Exp $
- */
-
-#ifndef _NETINET_TCP_FSM_H_
-#define _NETINET_TCP_FSM_H_
-
-/*
- * TCP FSM state definitions.
- * Per RFC793, September, 1981.
- */
-
-#define	TCP_NSTATES	11
-
-#define	TCPS_CLOSED		0	/* closed */
-#define	TCPS_LISTEN		1	/* listening for connection */
-#define	TCPS_SYN_SENT		2	/* active, have sent syn */
-#define	TCPS_SYN_RECEIVED	3	/* have send and received syn */
-/* states < TCPS_ESTABLISHED are those where connections not established */
-#define	TCPS_ESTABLISHED	4	/* established */
-#define	TCPS_CLOSE_WAIT		5	/* rcvd fin, waiting for close */
-/* states > TCPS_CLOSE_WAIT are those where user has closed */
-#define	TCPS_FIN_WAIT_1		6	/* have closed, sent fin */
-#define	TCPS_CLOSING		7	/* closed xchd FIN; await FIN ACK */
-#define	TCPS_LAST_ACK		8	/* had fin and close; await FIN ACK */
-/* states > TCPS_CLOSE_WAIT && < TCPS_FIN_WAIT_2 await ACK of FIN */
-#define	TCPS_FIN_WAIT_2		9	/* have closed, fin is acked */
-#define	TCPS_TIME_WAIT		10	/* in 2*msl quiet wait after close */
-
-/* for KAME src sync over BSD*'s */
-#define	TCP6_NSTATES		TCP_NSTATES
-#define	TCP6S_CLOSED		TCPS_CLOSED
-#define	TCP6S_LISTEN		TCPS_LISTEN
-#define	TCP6S_SYN_SENT		TCPS_SYN_SENT
-#define	TCP6S_SYN_RECEIVED	TCPS_SYN_RECEIVED
-#define	TCP6S_ESTABLISHED	TCPS_ESTABLISHED
-#define	TCP6S_CLOSE_WAIT	TCPS_CLOSE_WAIT
-#define	TCP6S_FIN_WAIT_1	TCPS_FIN_WAIT_1
-#define	TCP6S_CLOSING		TCPS_CLOSING
-#define	TCP6S_LAST_ACK		TCPS_LAST_ACK
-#define	TCP6S_FIN_WAIT_2	TCPS_FIN_WAIT_2
-#define	TCP6S_TIME_WAIT		TCPS_TIME_WAIT
-
-#define	TCPS_HAVERCVDSYN(s)	((s) >= TCPS_SYN_RECEIVED)
-#define	TCPS_HAVEESTABLISHED(s)	((s) >= TCPS_ESTABLISHED)
-#define	TCPS_HAVERCVDFIN(s)	((s) >= TCPS_TIME_WAIT)
-
-#ifdef	TCPOUTFLAGS
-/*
- * Flags used when sending segments in tcp_output.
- * Basic flags (TH_RST,TH_ACK,TH_SYN,TH_FIN) are totally
- * determined by state, with the proviso that TH_FIN is sent only
- * if all data queued for output is included in the segment.
- */
-static u_char	tcp_outflags[TCP_NSTATES] = {
-	TH_RST|TH_ACK,		/* 0, CLOSED */
-	0,			/* 1, LISTEN */
-	TH_SYN,			/* 2, SYN_SENT */
-	TH_SYN|TH_ACK,		/* 3, SYN_RECEIVED */
-	TH_ACK,			/* 4, ESTABLISHED */
-	TH_ACK,			/* 5, CLOSE_WAIT */
-	TH_FIN|TH_ACK,		/* 6, FIN_WAIT_1 */
-	TH_FIN|TH_ACK,		/* 7, CLOSING */
-	TH_FIN|TH_ACK,		/* 8, LAST_ACK */
-	TH_ACK,			/* 9, FIN_WAIT_2 */
-	TH_ACK,			/* 10, TIME_WAIT */
-};	
-#endif
-
-#ifdef KPROF
-int	tcp_acounts[TCP_NSTATES][PRU_NREQ];
-#endif
-
-#ifdef	TCPSTATES
-const char *tcpstates[] = {
-	"CLOSED",	"LISTEN",	"SYN_SENT",	"SYN_RCVD",
-	"ESTABLISHED",	"CLOSE_WAIT",	"FIN_WAIT_1",	"CLOSING",
-	"LAST_ACK",	"FIN_WAIT_2",	"TIME_WAIT",
-};
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet/tcp_seq.h b/newlib/libc/sys/linux/include/netinet/tcp_seq.h
deleted file mode 100644
index bb15401..0000000
--- a/newlib/libc/sys/linux/include/netinet/tcp_seq.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_seq.h	8.3 (Berkeley) 6/21/95
- * $FreeBSD: src/sys/netinet/tcp_seq.h,v 1.18 2001/11/21 18:45:51 jlemon Exp $
- */
-
-#ifndef _NETINET_TCP_SEQ_H_
-#define _NETINET_TCP_SEQ_H_
-/*
- * TCP sequence numbers are 32 bit integers operated
- * on with modular arithmetic.  These macros can be
- * used to compare such integers.
- */
-#define	SEQ_LT(a,b)	((int)((a)-(b)) < 0)
-#define	SEQ_LEQ(a,b)	((int)((a)-(b)) <= 0)
-#define	SEQ_GT(a,b)	((int)((a)-(b)) > 0)
-#define	SEQ_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/* for modulo comparisons of timestamps */
-#define TSTMP_LT(a,b)	((int)((a)-(b)) < 0)
-#define TSTMP_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/*
- * TCP connection counts are 32 bit integers operated
- * on with modular arithmetic.  These macros can be
- * used to compare such integers.
- */
-#define	CC_LT(a,b)	((int)((a)-(b)) < 0)
-#define	CC_LEQ(a,b)	((int)((a)-(b)) <= 0)
-#define	CC_GT(a,b)	((int)((a)-(b)) > 0)
-#define	CC_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/* Macro to increment a CC: skip 0 which has a special meaning */
-#define CC_INC(c)	(++(c) == 0 ? ++(c) : (c))
-
-/*
- * Macros to initialize tcp sequence numbers for
- * send and receive from initial send and receive
- * sequence numbers.
- */
-#define	tcp_rcvseqinit(tp) \
-	(tp)->rcv_adv = (tp)->rcv_nxt = (tp)->irs + 1
-
-#define	tcp_sendseqinit(tp) \
-	(tp)->snd_una = (tp)->snd_nxt = (tp)->snd_max = (tp)->snd_up = \
-	    (tp)->snd_recover = (tp)->iss
-
-#define TCP_PAWS_IDLE	(24 * 24 * 60 * 60 * hz)
-					/* timestamp wrap-around time */
-
-#ifdef _KERNEL
-extern tcp_cc	tcp_ccgen;		/* global connection count */
-#endif /* _KERNEL */
-#endif /* _NETINET_TCP_SEQ_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/tcp_timer.h b/newlib/libc/sys/linux/include/netinet/tcp_timer.h
deleted file mode 100644
index 1af1281..0000000
--- a/newlib/libc/sys/linux/include/netinet/tcp_timer.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/tcp_timer.h,v 1.19 2002/03/19 21:25:46 alfred Exp $
- */
-
-#ifndef _NETINET_TCP_TIMER_H_
-#define _NETINET_TCP_TIMER_H_
-
-/*
- * The TCPT_REXMT timer is used to force retransmissions.
- * The TCP has the TCPT_REXMT timer set whenever segments
- * have been sent for which ACKs are expected but not yet
- * received.  If an ACK is received which advances tp->snd_una,
- * then the retransmit timer is cleared (if there are no more
- * outstanding segments) or reset to the base value (if there
- * are more ACKs expected).  Whenever the retransmit timer goes off,
- * we retransmit one unacknowledged segment, and do a backoff
- * on the retransmit timer.
- *
- * The TCPT_PERSIST timer is used to keep window size information
- * flowing even if the window goes shut.  If all previous transmissions
- * have been acknowledged (so that there are no retransmissions in progress),
- * and the window is too small to bother sending anything, then we start
- * the TCPT_PERSIST timer.  When it expires, if the window is nonzero,
- * we go to transmit state.  Otherwise, at intervals send a single byte
- * into the peer's window to force him to update our window information.
- * We do this at most as often as TCPT_PERSMIN time intervals,
- * but no more frequently than the current estimate of round-trip
- * packet time.  The TCPT_PERSIST timer is cleared whenever we receive
- * a window update from the peer.
- *
- * The TCPT_KEEP timer is used to keep connections alive.  If an
- * connection is idle (no segments received) for TCPTV_KEEP_INIT amount of time,
- * but not yet established, then we drop the connection.  Once the connection
- * is established, if the connection is idle for TCPTV_KEEP_IDLE time
- * (and keepalives have been enabled on the socket), we begin to probe
- * the connection.  We force the peer to send us a segment by sending:
- *	<SEQ=SND.UNA-1><ACK=RCV.NXT><CTL=ACK>
- * This segment is (deliberately) outside the window, and should elicit
- * an ack segment in response from the peer.  If, despite the TCPT_KEEP
- * initiated segments we cannot elicit a response from a peer in TCPT_MAXIDLE
- * amount of time probing, then we drop the connection.
- */
-
-/*
- * Time constants.
- */
-#define	TCPTV_MSL	( 30*hz)		/* max seg lifetime (hah!) */
-#define	TCPTV_SRTTBASE	0			/* base roundtrip time;
-						   if 0, no idea yet */
-#define	TCPTV_RTOBASE	(  3*hz)		/* assumed RTO if no info */
-#define	TCPTV_SRTTDFLT	(  3*hz)		/* assumed RTT if no info */
-
-#define	TCPTV_PERSMIN	(  5*hz)		/* retransmit persistence */
-#define	TCPTV_PERSMAX	( 60*hz)		/* maximum persist interval */
-
-#define	TCPTV_KEEP_INIT	( 75*hz)		/* initial connect keepalive */
-#define	TCPTV_KEEP_IDLE	(120*60*hz)		/* dflt time before probing */
-#define	TCPTV_KEEPINTVL	( 75*hz)		/* default probe interval */
-#define	TCPTV_KEEPCNT	8			/* max probes before drop */
-
-#define	TCPTV_MIN	(  1*hz)		/* minimum allowable value */
-#define	TCPTV_REXMTMAX	( 64*hz)		/* max allowable REXMT value */
-
-#define TCPTV_TWTRUNC	8			/* RTO factor to truncate TW */
-
-#define	TCP_LINGERTIME	120			/* linger at most 2 minutes */
-
-#define	TCP_MAXRXTSHIFT	12			/* maximum retransmits */
-
-#define	TCPTV_DELACK	(hz / PR_FASTHZ / 2)	/* 100ms timeout */
-
-#ifdef	TCPTIMERS
-static char *tcptimers[] =
-    { "REXMT", "PERSIST", "KEEP", "2MSL" };
-#endif
-
-/*
- * Force a time value to be in a certain range.
- */
-#define	TCPT_RANGESET(tv, value, tvmin, tvmax) do { \
-	(tv) = (value); \
-	if ((u_long)(tv) < (u_long)(tvmin)) \
-		(tv) = (tvmin); \
-	else if ((u_long)(tv) > (u_long)(tvmax)) \
-		(tv) = (tvmax); \
-} while(0)
-
-#ifdef _KERNEL
-extern int tcp_keepinit;		/* time to establish connection */
-extern int tcp_keepidle;		/* time before keepalive probes begin */
-extern int tcp_keepintvl;		/* time between keepalive probes */
-extern int tcp_maxidle;			/* time to drop after starting probes */
-extern int tcp_delacktime;		/* time before sending a delayed ACK */
-extern int tcp_maxpersistidle;
-extern int tcp_msl;
-extern int tcp_ttl;			/* time to live for TCP segs */
-extern int tcp_backoff[];
-
-void	tcp_timer_2msl(void *xtp);
-void	tcp_timer_keep(void *xtp);
-void	tcp_timer_persist(void *xtp);
-void	tcp_timer_rexmt(void *xtp);
-void	tcp_timer_delack(void *xtp);
-
-#endif /* _KERNEL */
-
-#endif /* !_NETINET_TCP_TIMER_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/tcp_var.h b/newlib/libc/sys/linux/include/netinet/tcp_var.h
deleted file mode 100644
index adb5208..0000000
--- a/newlib/libc/sys/linux/include/netinet/tcp_var.h
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.76 2002/03/19 21:25:46 alfred Exp $
- */
-
-#ifndef _NETINET_TCP_VAR_H_
-#define _NETINET_TCP_VAR_H_
-
-#include <netinet/in_pcb.h>		/* needed for in_conninfo, inp_gen_t */
-
-/*
- * Kernel variables for tcp.
- */
-extern int	tcp_do_rfc1323;
-extern int	tcp_do_rfc1644;
-
-/* TCP segment queue entry */
-struct tseg_qent {
-	LIST_ENTRY(tseg_qent) tqe_q;
-	int	tqe_len;		/* TCP segment data length */
-	struct	tcphdr *tqe_th;		/* a pointer to tcp header */
-	struct	mbuf	*tqe_m;		/* mbuf contains packet */
-};
-LIST_HEAD(tsegqe_head, tseg_qent);
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_TSEGQ);
-#endif
-
-struct tcptemp {
-	u_char	tt_ipgen[40]; /* the size must be of max ip header, now IPv6 */
-	struct	tcphdr tt_t;
-};
-
-#define tcp6cb		tcpcb  /* for KAME src sync over BSD*'s */
-
-/*
- * Tcp control block, one per tcp; fields:
- * Organized for 16 byte cacheline efficiency.
- */
-struct tcpcb {
-	struct	tsegqe_head t_segq;
-	int	t_dupacks;		/* consecutive dup acks recd */
-	struct	tcptemp	*unused;	/* unused */
-
-	struct	callout *tt_rexmt;	/* retransmit timer */
-	struct	callout *tt_persist;	/* retransmit persistence */
-	struct	callout *tt_keep;	/* keepalive */
-	struct	callout *tt_2msl;	/* 2*msl TIME_WAIT timer */
-	struct	callout *tt_delack;	/* delayed ACK timer */
-
-	struct	inpcb *t_inpcb;		/* back pointer to internet pcb */
-	int	t_state;		/* state of this connection */
-	u_int	t_flags;
-#define	TF_ACKNOW	0x00001		/* ack peer immediately */
-#define	TF_DELACK	0x00002		/* ack, but try to delay it */
-#define	TF_NODELAY	0x00004		/* don't delay packets to coalesce */
-#define	TF_NOOPT	0x00008		/* don't use tcp options */
-#define	TF_SENTFIN	0x00010		/* have sent FIN */
-#define	TF_REQ_SCALE	0x00020		/* have/will request window scaling */
-#define	TF_RCVD_SCALE	0x00040		/* other side has requested scaling */
-#define	TF_REQ_TSTMP	0x00080		/* have/will request timestamps */
-#define	TF_RCVD_TSTMP	0x00100		/* a timestamp was received in SYN */
-#define	TF_SACK_PERMIT	0x00200		/* other side said I could SACK */
-#define	TF_NEEDSYN	0x00400		/* send SYN (implicit state) */
-#define	TF_NEEDFIN	0x00800		/* send FIN (implicit state) */
-#define	TF_NOPUSH	0x01000		/* don't push */
-#define	TF_REQ_CC	0x02000		/* have/will request CC */
-#define	TF_RCVD_CC	0x04000		/* a CC was received in SYN */
-#define	TF_SENDCCNEW	0x08000		/* send CCnew instead of CC in SYN */
-#define	TF_MORETOCOME	0x10000		/* More data to be appended to sock */
-#define	TF_LQ_OVERFLOW	0x20000		/* listen queue overflow */
-#define	TF_LASTIDLE	0x40000		/* connection was previously idle */
-#define TF_RXWIN0SENT	0x80000		/* sent a receiver win 0 in response */
-	int	t_force;		/* 1 if forcing out a byte */
-
-	tcp_seq	snd_una;		/* send unacknowledged */
-	tcp_seq	snd_max;		/* highest sequence number sent;
-					 * used to recognize retransmits
-					 */
-	tcp_seq	snd_nxt;		/* send next */
-	tcp_seq	snd_up;			/* send urgent pointer */
-
-	tcp_seq	snd_wl1;		/* window update seg seq number */
-	tcp_seq	snd_wl2;		/* window update seg ack number */
-	tcp_seq	iss;			/* initial send sequence number */
-	tcp_seq	irs;			/* initial receive sequence number */
-
-	tcp_seq	rcv_nxt;		/* receive next */
-	tcp_seq	rcv_adv;		/* advertised window */
-	u_long	rcv_wnd;		/* receive window */
-	tcp_seq	rcv_up;			/* receive urgent pointer */
-
-	u_long	snd_wnd;		/* send window */
-	u_long	snd_cwnd;		/* congestion-controlled window */
-	u_long	snd_ssthresh;		/* snd_cwnd size threshold for
-					 * for slow start exponential to
-					 * linear switch
-					 */
-	tcp_seq	snd_recover;		/* for use in fast recovery */
-
-	u_int	t_maxopd;		/* mss plus options */
-
-	u_long	t_rcvtime;		/* inactivity time */
-	u_long	t_starttime;		/* time connection was established */
-	int	t_rtttime;		/* round trip time */
-	tcp_seq	t_rtseq;		/* sequence number being timed */
-
-	int	t_rxtcur;		/* current retransmit value (ticks) */
-	u_int	t_maxseg;		/* maximum segment size */
-	int	t_srtt;			/* smoothed round-trip time */
-	int	t_rttvar;		/* variance in round-trip time */
-
-	int	t_rxtshift;		/* log(2) of rexmt exp. backoff */
-	u_int	t_rttmin;		/* minimum rtt allowed */
-	u_long	t_rttupdated;		/* number of times rtt sampled */
-	u_long	max_sndwnd;		/* largest window peer has offered */
-
-	int	t_softerror;		/* possible error not yet reported */
-/* out-of-band data */
-	char	t_oobflags;		/* have some */
-	char	t_iobc;			/* input character */
-#define	TCPOOB_HAVEDATA	0x01
-#define	TCPOOB_HADDATA	0x02
-/* RFC 1323 variables */
-	u_char	snd_scale;		/* window scaling for send window */
-	u_char	rcv_scale;		/* window scaling for recv window */
-	u_char	request_r_scale;	/* pending window scaling */
-	u_char	requested_s_scale;
-	u_long	ts_recent;		/* timestamp echo data */
-
-	u_long	ts_recent_age;		/* when last updated */
-	tcp_seq	last_ack_sent;
-/* RFC 1644 variables */
-	tcp_cc	cc_send;		/* send connection count */
-	tcp_cc	cc_recv;		/* receive connection count */
-/* experimental */
-	u_long	snd_cwnd_prev;		/* cwnd prior to retransmit */
-	u_long	snd_ssthresh_prev;	/* ssthresh prior to retransmit */
-	u_long	t_badrxtwin;		/* window for retransmit recovery */
-};
-
-/*
- * Structure to hold TCP options that are only used during segment
- * processing (in tcp_input), but not held in the tcpcb.
- * It's basically used to reduce the number of parameters
- * to tcp_dooptions.
- */
-struct tcpopt {
-	u_long		to_flags;	/* which options are present */
-#define TOF_TS		0x0001		/* timestamp */
-#define TOF_CC		0x0002		/* CC and CCnew are exclusive */
-#define TOF_CCNEW	0x0004
-#define	TOF_CCECHO	0x0008
-#define	TOF_MSS		0x0010
-#define	TOF_SCALE	0x0020
-	u_int32_t	to_tsval;
-	u_int32_t	to_tsecr;
-	tcp_cc		to_cc;		/* holds CC or CCnew */
-	tcp_cc		to_ccecho;
-	u_int16_t	to_mss;
-	u_int8_t 	to_requested_s_scale;
-	u_int8_t 	to_pad;
-};
-
-struct syncache {
-	inp_gen_t	sc_inp_gencnt;		/* pointer check */
-	struct 		tcpcb *sc_tp;		/* tcb for listening socket */
-	struct		mbuf *sc_ipopts;	/* source route */
-	struct 		in_conninfo sc_inc;	/* addresses */
-#define sc_route	sc_inc.inc_route
-#define sc_route6	sc_inc.inc6_route
-	u_int32_t	sc_tsrecent;
-	tcp_cc		sc_cc_send;		/* holds CC or CCnew */
-	tcp_cc		sc_cc_recv;
-	tcp_seq 	sc_irs;			/* seq from peer */
-	tcp_seq 	sc_iss;			/* our ISS */
-	u_long		sc_rxttime;		/* retransmit time */
-	u_int16_t	sc_rxtslot; 		/* retransmit counter */
-	u_int16_t	sc_peer_mss;		/* peer's MSS */
-	u_int16_t	sc_wnd;			/* advertised window */
-	u_int8_t 	sc_requested_s_scale:4,
-			sc_request_r_scale:4;
-	u_int8_t	sc_flags;
-#define SCF_NOOPT	0x01			/* no TCP options */
-#define SCF_WINSCALE	0x02			/* negotiated window scaling */
-#define SCF_TIMESTAMP	0x04			/* negotiated timestamps */
-#define SCF_CC		0x08			/* negotiated CC */
-#define SCF_UNREACH	0x10			/* icmp unreachable received */
-#define SCF_KEEPROUTE	0x20			/* keep cloned route */
-	TAILQ_ENTRY(syncache)	sc_hash;
-	TAILQ_ENTRY(syncache)	sc_timerq;
-};
-
-struct syncache_head {
-	TAILQ_HEAD(, syncache)	sch_bucket;
-	u_int		sch_length;
-};
- 
-/*
- * The TAO cache entry which is stored in the protocol family specific
- * portion of the route metrics.
- */
-struct rmxp_tao {
-	tcp_cc	tao_cc;			/* latest CC in valid SYN */
-	tcp_cc	tao_ccsent;		/* latest CC sent to peer */
-	u_short	tao_mssopt;		/* peer's cached MSS */
-#ifdef notyet
-	u_short	tao_flags;		/* cache status flags */
-#define	TAOF_DONT	0x0001		/* peer doesn't understand rfc1644 */
-#define	TAOF_OK		0x0002		/* peer does understand rfc1644 */
-#define	TAOF_UNDEF	0		/* we don't know yet */
-#endif /* notyet */
-};
-#define rmx_taop(r)	((struct rmxp_tao *)(r).rmx_filler)
-
-#define	intotcpcb(ip)	((struct tcpcb *)(ip)->inp_ppcb)
-#define	sototcpcb(so)	(intotcpcb(sotoinpcb(so)))
-
-/*
- * The smoothed round-trip time and estimated variance
- * are stored as fixed point numbers scaled by the values below.
- * For convenience, these scales are also used in smoothing the average
- * (smoothed = (1/scale)sample + ((scale-1)/scale)smoothed).
- * With these scales, srtt has 3 bits to the right of the binary point,
- * and thus an "ALPHA" of 0.875.  rttvar has 2 bits to the right of the
- * binary point, and is smoothed with an ALPHA of 0.75.
- */
-#define	TCP_RTT_SCALE		32	/* multiplier for srtt; 3 bits frac. */
-#define	TCP_RTT_SHIFT		5	/* shift for srtt; 3 bits frac. */
-#define	TCP_RTTVAR_SCALE	16	/* multiplier for rttvar; 2 bits */
-#define	TCP_RTTVAR_SHIFT	4	/* shift for rttvar; 2 bits */
-#define	TCP_DELTA_SHIFT		2	/* see tcp_input.c */
-
-/*
- * The initial retransmission should happen at rtt + 4 * rttvar.
- * Because of the way we do the smoothing, srtt and rttvar
- * will each average +1/2 tick of bias.  When we compute
- * the retransmit timer, we want 1/2 tick of rounding and
- * 1 extra tick because of +-1/2 tick uncertainty in the
- * firing of the timer.  The bias will give us exactly the
- * 1.5 tick we need.  But, because the bias is
- * statistical, we have to test that we don't drop below
- * the minimum feasible timer (which is 2 ticks).
- * This version of the macro adapted from a paper by Lawrence
- * Brakmo and Larry Peterson which outlines a problem caused
- * by insufficient precision in the original implementation,
- * which results in inappropriately large RTO values for very
- * fast networks.
- */
-#define	TCP_REXMTVAL(tp) \
-	max((tp)->t_rttmin, (((tp)->t_srtt >> (TCP_RTT_SHIFT - TCP_DELTA_SHIFT))  \
-	  + (tp)->t_rttvar) >> TCP_DELTA_SHIFT)
-
-/*
- * TCP statistics.
- * Many of these should be kept per connection,
- * but that's inconvenient at the moment.
- */
-struct	tcpstat {
-	u_long	tcps_connattempt;	/* connections initiated */
-	u_long	tcps_accepts;		/* connections accepted */
-	u_long	tcps_connects;		/* connections established */
-	u_long	tcps_drops;		/* connections dropped */
-	u_long	tcps_conndrops;		/* embryonic connections dropped */
-	u_long	tcps_closed;		/* conn. closed (includes drops) */
-	u_long	tcps_segstimed;		/* segs where we tried to get rtt */
-	u_long	tcps_rttupdated;	/* times we succeeded */
-	u_long	tcps_delack;		/* delayed acks sent */
-	u_long	tcps_timeoutdrop;	/* conn. dropped in rxmt timeout */
-	u_long	tcps_rexmttimeo;	/* retransmit timeouts */
-	u_long	tcps_persisttimeo;	/* persist timeouts */
-	u_long	tcps_keeptimeo;		/* keepalive timeouts */
-	u_long	tcps_keepprobe;		/* keepalive probes sent */
-	u_long	tcps_keepdrops;		/* connections dropped in keepalive */
-
-	u_long	tcps_sndtotal;		/* total packets sent */
-	u_long	tcps_sndpack;		/* data packets sent */
-	u_long	tcps_sndbyte;		/* data bytes sent */
-	u_long	tcps_sndrexmitpack;	/* data packets retransmitted */
-	u_long	tcps_sndrexmitbyte;	/* data bytes retransmitted */
-	u_long	tcps_sndacks;		/* ack-only packets sent */
-	u_long	tcps_sndprobe;		/* window probes sent */
-	u_long	tcps_sndurg;		/* packets sent with URG only */
-	u_long	tcps_sndwinup;		/* window update-only packets sent */
-	u_long	tcps_sndctrl;		/* control (SYN|FIN|RST) packets sent */
-
-	u_long	tcps_rcvtotal;		/* total packets received */
-	u_long	tcps_rcvpack;		/* packets received in sequence */
-	u_long	tcps_rcvbyte;		/* bytes received in sequence */
-	u_long	tcps_rcvbadsum;		/* packets received with ccksum errs */
-	u_long	tcps_rcvbadoff;		/* packets received with bad offset */
-	u_long	tcps_rcvmemdrop;	/* packets dropped for lack of memory */
-	u_long	tcps_rcvshort;		/* packets received too short */
-	u_long	tcps_rcvduppack;	/* duplicate-only packets received */
-	u_long	tcps_rcvdupbyte;	/* duplicate-only bytes received */
-	u_long	tcps_rcvpartduppack;	/* packets with some duplicate data */
-	u_long	tcps_rcvpartdupbyte;	/* dup. bytes in part-dup. packets */
-	u_long	tcps_rcvoopack;		/* out-of-order packets received */
-	u_long	tcps_rcvoobyte;		/* out-of-order bytes received */
-	u_long	tcps_rcvpackafterwin;	/* packets with data after window */
-	u_long	tcps_rcvbyteafterwin;	/* bytes rcvd after window */
-	u_long	tcps_rcvafterclose;	/* packets rcvd after "close" */
-	u_long	tcps_rcvwinprobe;	/* rcvd window probe packets */
-	u_long	tcps_rcvdupack;		/* rcvd duplicate acks */
-	u_long	tcps_rcvacktoomuch;	/* rcvd acks for unsent data */
-	u_long	tcps_rcvackpack;	/* rcvd ack packets */
-	u_long	tcps_rcvackbyte;	/* bytes acked by rcvd acks */
-	u_long	tcps_rcvwinupd;		/* rcvd window update packets */
-	u_long	tcps_pawsdrop;		/* segments dropped due to PAWS */
-	u_long	tcps_predack;		/* times hdr predict ok for acks */
-	u_long	tcps_preddat;		/* times hdr predict ok for data pkts */
-	u_long	tcps_pcbcachemiss;
-	u_long	tcps_cachedrtt;		/* times cached RTT in route updated */
-	u_long	tcps_cachedrttvar;	/* times cached rttvar updated */
-	u_long	tcps_cachedssthresh;	/* times cached ssthresh updated */
-	u_long	tcps_usedrtt;		/* times RTT initialized from route */
-	u_long	tcps_usedrttvar;	/* times RTTVAR initialized from rt */
-	u_long	tcps_usedssthresh;	/* times ssthresh initialized from rt*/
-	u_long	tcps_persistdrop;	/* timeout in persist state */
-	u_long	tcps_badsyn;		/* bogus SYN, e.g. premature ACK */
-	u_long	tcps_mturesent;		/* resends due to MTU discovery */
-	u_long	tcps_listendrop;	/* listen queue overflows */
-
-	u_long	tcps_sc_added;		/* entry added to syncache */
-	u_long	tcps_sc_retransmitted;	/* syncache entry was retransmitted */
-	u_long	tcps_sc_dupsyn;		/* duplicate SYN packet */
-	u_long	tcps_sc_dropped;	/* could not reply to packet */
-	u_long	tcps_sc_completed;	/* successful extraction of entry */
-	u_long	tcps_sc_bucketoverflow;	/* syncache per-bucket limit hit */
-	u_long	tcps_sc_cacheoverflow;	/* syncache cache limit hit */
-	u_long	tcps_sc_reset;		/* RST removed entry from syncache */
-	u_long	tcps_sc_stale;		/* timed out or listen socket gone */
-	u_long	tcps_sc_aborted;	/* syncache entry aborted */
-	u_long	tcps_sc_badack;		/* removed due to bad ACK */
-	u_long	tcps_sc_unreach;	/* ICMP unreachable received */
-	u_long	tcps_sc_zonefail;	/* zalloc() failed */
-	u_long	tcps_sc_sendcookie;	/* SYN cookie sent */
-	u_long	tcps_sc_recvcookie;	/* SYN cookie received */
-};
-
-/*
- * TCB structure exported to user-land via sysctl(3).
- * Evil hack: declare only if in_pcb.h and sys/socketvar.h have been
- * included.  Not all of our clients do.
- */
-#if defined(_NETINET_IN_PCB_H_) && defined(_SYS_SOCKETVAR_H_)
-struct	xtcpcb {
-	size_t	xt_len;
-	struct	inpcb	xt_inp;
-	struct	tcpcb	xt_tp;
-	struct	xsocket	xt_socket;
-	u_quad_t	xt_alignment_hack;
-};
-#endif
-
-/*
- * Names for TCP sysctl objects
- */
-#define	TCPCTL_DO_RFC1323	1	/* use RFC-1323 extensions */
-#define	TCPCTL_DO_RFC1644	2	/* use RFC-1644 extensions */
-#define	TCPCTL_MSSDFLT		3	/* MSS default */
-#define TCPCTL_STATS		4	/* statistics (read-only) */
-#define	TCPCTL_RTTDFLT		5	/* default RTT estimate */
-#define	TCPCTL_KEEPIDLE		6	/* keepalive idle timer */
-#define	TCPCTL_KEEPINTVL	7	/* interval to send keepalives */
-#define	TCPCTL_SENDSPACE	8	/* send buffer space */
-#define	TCPCTL_RECVSPACE	9	/* receive buffer space */
-#define	TCPCTL_KEEPINIT		10	/* timeout for establishing syn */
-#define	TCPCTL_PCBLIST		11	/* list of all outstanding PCBs */
-#define	TCPCTL_DELACKTIME	12	/* time before sending delayed ACK */
-#define	TCPCTL_V6MSSDFLT	13	/* MSS default for IPv6 */
-#define	TCPCTL_MAXID		14
-
-#define TCPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "rfc1323", CTLTYPE_INT }, \
-	{ "rfc1644", CTLTYPE_INT }, \
-	{ "mssdflt", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-	{ "rttdflt", CTLTYPE_INT }, \
-	{ "keepidle", CTLTYPE_INT }, \
-	{ "keepintvl", CTLTYPE_INT }, \
-	{ "sendspace", CTLTYPE_INT }, \
-	{ "recvspace", CTLTYPE_INT }, \
-	{ "keepinit", CTLTYPE_INT }, \
-	{ "pcblist", CTLTYPE_STRUCT }, \
-	{ "delacktime", CTLTYPE_INT }, \
-	{ "v6mssdflt", CTLTYPE_INT }, \
-}
-
-
-#ifdef _KERNEL
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_inet_tcp);
-#endif
-
-extern	struct inpcbhead tcb;		/* head of queue of active tcpcb's */
-extern	struct inpcbinfo tcbinfo;
-extern	struct tcpstat tcpstat;	/* tcp statistics */
-extern	int tcp_mssdflt;	/* XXX */
-extern	int tcp_delack_enabled;
-extern	int tcp_do_newreno;
-extern	int ss_fltsz;
-extern	int ss_fltsz_local;
-
-void	 tcp_canceltimers(struct tcpcb *);
-struct tcpcb *
-	 tcp_close(struct tcpcb *);
-void	 tcp_ctlinput(int, struct sockaddr *, void *);
-int	 tcp_ctloutput(struct socket *, struct sockopt *);
-struct tcpcb *
-	 tcp_drop(struct tcpcb *, int);
-void	 tcp_drain(void);
-void	 tcp_fasttimo(void);
-struct rmxp_tao *
-	 tcp_gettaocache(struct in_conninfo *);
-void	 tcp_init(void);
-void	 tcp_input(struct mbuf *, int);
-void	 tcp_mss(struct tcpcb *, int);
-int	 tcp_mssopt(struct tcpcb *);
-void	 tcp_drop_syn_sent(struct inpcb *, int);
-void	 tcp_mtudisc(struct inpcb *, int);
-struct tcpcb *
-	 tcp_newtcpcb(struct inpcb *);
-int	 tcp_output(struct tcpcb *);
-void	 tcp_quench(struct inpcb *, int);
-void	 tcp_respond(struct tcpcb *, void *,
-	    struct tcphdr *, struct mbuf *, tcp_seq, tcp_seq, int);
-struct rtentry *
-	 tcp_rtlookup(struct in_conninfo *);
-void	 tcp_setpersist(struct tcpcb *);
-void	 tcp_slowtimo(void);
-struct tcptemp *
-	 tcp_maketemplate(struct tcpcb *);
-void	 tcp_fillheaders(struct tcpcb *, void *, void *);
-struct tcpcb *
-	 tcp_timers(struct tcpcb *, int);
-void	 tcp_trace(int, int, struct tcpcb *, void *, struct tcphdr *, int);
-void	 syncache_init(void);
-void	 syncache_unreach(struct in_conninfo *, struct tcphdr *);
-int	 syncache_expand(struct in_conninfo *, struct tcphdr *,
-	     struct socket **, struct mbuf *);
-int	 syncache_add(struct in_conninfo *, struct tcpopt *,
-	     struct tcphdr *, struct socket **, struct mbuf *);
-void	 syncache_chkrst(struct in_conninfo *, struct tcphdr *);
-void	 syncache_badack(struct in_conninfo *);
-
-extern	struct pr_usrreqs tcp_usrreqs;
-extern	u_long tcp_sendspace;
-extern	u_long tcp_recvspace;
-tcp_seq tcp_new_isn(struct tcpcb *);
-
-#endif /* _KERNEL */
-
-#endif /* _NETINET_TCP_VAR_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet/tcpip.h b/newlib/libc/sys/linux/include/netinet/tcpip.h
deleted file mode 100644
index 53ecb8d..0000000
--- a/newlib/libc/sys/linux/include/netinet/tcpip.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/tcpip.h,v 1.9 2001/02/26 20:10:16 asmodai Exp $
- */
-
-#ifndef _NETINET_TCPIP_H_
-#define _NETINET_TCPIP_H_
-
-/*
- * Tcp+ip header, after ip options removed.
- */
-struct tcpiphdr {
-	struct 	ipovly ti_i;		/* overlaid ip structure */
-	struct	tcphdr ti_t;		/* tcp header */
-};
-#define	ti_x1		ti_i.ih_x1
-#define	ti_pr		ti_i.ih_pr
-#define	ti_len		ti_i.ih_len
-#define	ti_src		ti_i.ih_src
-#define	ti_dst		ti_i.ih_dst
-#define	ti_sport	ti_t.th_sport
-#define	ti_dport	ti_t.th_dport
-#define	ti_seq		ti_t.th_seq
-#define	ti_ack		ti_t.th_ack
-#define	ti_x2		ti_t.th_x2
-#define	ti_off		ti_t.th_off
-#define	ti_flags	ti_t.th_flags
-#define	ti_win		ti_t.th_win
-#define	ti_sum		ti_t.th_sum
-#define	ti_urp		ti_t.th_urp
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet/udp.h b/newlib/libc/sys/linux/include/netinet/udp.h
deleted file mode 100644
index 747e764..0000000
--- a/newlib/libc/sys/linux/include/netinet/udp.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/udp.h,v 1.7 1999/08/28 00:49:34 peter Exp $
- */
-
-#ifndef _NETINET_UDP_H_
-#define _NETINET_UDP_H_
-
-/*
- * Udp protocol header.
- * Per RFC 768, September, 1981.
- */
-struct udphdr {
-	u_short	uh_sport;		/* source port */
-	u_short	uh_dport;		/* destination port */
-	u_short	uh_ulen;		/* udp length */
-	u_short	uh_sum;			/* udp checksum */
-};
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet/udp_var.h b/newlib/libc/sys/linux/include/netinet/udp_var.h
deleted file mode 100644
index fc00e6e..0000000
--- a/newlib/libc/sys/linux/include/netinet/udp_var.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/udp_var.h,v 1.25 2002/03/19 21:25:46 alfred Exp $
- */
-
-#ifndef _NETINET_UDP_VAR_H_
-#define _NETINET_UDP_VAR_H_
-
-/*
- * UDP kernel structures and variables.
- */
-struct	udpiphdr {
-	struct 	ipovly ui_i;		/* overlaid ip structure */
-	struct	udphdr ui_u;		/* udp header */
-};
-#define	ui_x1		ui_i.ih_x1
-#define	ui_pr		ui_i.ih_pr
-#define	ui_len		ui_i.ih_len
-#define	ui_src		ui_i.ih_src
-#define	ui_dst		ui_i.ih_dst
-#define	ui_sport	ui_u.uh_sport
-#define	ui_dport	ui_u.uh_dport
-#define	ui_ulen		ui_u.uh_ulen
-#define	ui_sum		ui_u.uh_sum
-
-struct	udpstat {
-				/* input statistics: */
-	u_long	udps_ipackets;		/* total input packets */
-	u_long	udps_hdrops;		/* packet shorter than header */
-	u_long	udps_badsum;		/* checksum error */
-	u_long	udps_nosum;		/* no checksum */
-	u_long	udps_badlen;		/* data length larger than packet */
-	u_long	udps_noport;		/* no socket on port */
-	u_long	udps_noportbcast;	/* of above, arrived as broadcast */
-	u_long	udps_fullsock;		/* not delivered, input socket full */
-	u_long	udpps_pcbcachemiss;	/* input packets missing pcb cache */
-	u_long	udpps_pcbhashmiss;	/* input packets not for hashed pcb */
-				/* output statistics: */
-	u_long	udps_opackets;		/* total output packets */
-	u_long	udps_fastout;		/* output packets on fast path */
-	/* of no socket on port, arrived as multicast */
-	u_long	udps_noportmcast;
-};
-
-/*
- * Names for UDP sysctl objects
- */
-#define	UDPCTL_CHECKSUM		1	/* checksum UDP packets */
-#define UDPCTL_STATS		2	/* statistics (read-only) */
-#define	UDPCTL_MAXDGRAM		3	/* max datagram size */
-#define	UDPCTL_RECVSPACE	4	/* default receive buffer space */
-#define	UDPCTL_PCBLIST		5	/* list of PCBs for UDP sockets */
-#define UDPCTL_MAXID		6
-
-#define UDPCTL_NAMES { \
-	{ 0, 0 }, \
-	{ "checksum", CTLTYPE_INT }, \
-	{ "stats", CTLTYPE_STRUCT }, \
-	{ "maxdgram", CTLTYPE_INT }, \
-	{ "recvspace", CTLTYPE_INT }, \
-	{ "pcblist", CTLTYPE_STRUCT }, \
-}
-
-#ifdef _KERNEL
-SYSCTL_DECL(_net_inet_udp);
-
-extern struct	pr_usrreqs udp_usrreqs;
-extern struct	inpcbhead udb;
-extern struct	inpcbinfo udbinfo;
-extern u_long	udp_sendspace;
-extern u_long	udp_recvspace;
-extern struct	udpstat udpstat;
-extern int	log_in_vain;
-
-void	udp_ctlinput(int, struct sockaddr *, void *);
-void	udp_init(void);
-void	udp_input(struct mbuf *, int);
-
-void	udp_notify(struct inpcb *inp, int errno);
-int	udp_shutdown(struct socket *so);
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet6/ah.h b/newlib/libc/sys/linux/include/netinet6/ah.h
deleted file mode 100644
index ce7c5e8..0000000
--- a/newlib/libc/sys/linux/include/netinet6/ah.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ah.h,v 1.7 2002/04/19 04:46:22 suz Exp $	*/
-/*	$KAME: ah.h,v 1.16 2001/09/04 08:43:19 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * RFC1826/2402 authentication header.
- */
-
-#ifndef _NETINET6_AH_H_
-#define _NETINET6_AH_H_
-
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_inet.h"
-#endif
-
-struct ah {
-	u_int8_t	ah_nxt;		/* Next Header */
-	u_int8_t	ah_len;		/* Length of data, in 32bit */
-	u_int16_t	ah_reserve;	/* Reserved for future use */
-	u_int32_t	ah_spi;		/* Security parameter index */
-	/* variable size, 32bit bound*/	/* Authentication data */
-};
-
-struct newah {
-	u_int8_t	ah_nxt;		/* Next Header */
-	u_int8_t	ah_len;		/* Length of data + 1, in 32bit */
-	u_int16_t	ah_reserve;	/* Reserved for future use */
-	u_int32_t	ah_spi;		/* Security parameter index */
-	u_int32_t	ah_seq;		/* Sequence number field */
-	/* variable size, 32bit bound*/	/* Authentication data */
-};
-
-#ifdef _KERNEL
-struct secasvar;
-
-struct ah_algorithm_state {
-	struct secasvar *sav;
-	void* foo;	/* per algorithm data - maybe */
-};
-
-struct ah_algorithm {
-	int (*sumsiz) __P((struct secasvar *));
-	int (*mature) __P((struct secasvar *));
-	int keymin;	/* in bits */
-	int keymax;	/* in bits */
-	const char *name;
-	int (*init) __P((struct ah_algorithm_state *, struct secasvar *));
-	void (*update) __P((struct ah_algorithm_state *, caddr_t, size_t));
-	void (*result) __P((struct ah_algorithm_state *, caddr_t));
-};
-
-#define	AH_MAXSUMSIZE	16
-
-extern const struct ah_algorithm *ah_algorithm_lookup __P((int));
-
-/* cksum routines */
-extern int ah_hdrlen __P((struct secasvar *));
-
-extern size_t ah_hdrsiz __P((struct ipsecrequest *));
-extern void ah4_input __P((struct mbuf *, int));
-extern int ah4_output __P((struct mbuf *, struct ipsecrequest *));
-extern int ah4_calccksum __P((struct mbuf *, caddr_t, size_t,
-	const struct ah_algorithm *, struct secasvar *));
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_AH_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/ah6.h b/newlib/libc/sys/linux/include/netinet6/ah6.h
deleted file mode 100644
index a2d16d8..0000000
--- a/newlib/libc/sys/linux/include/netinet6/ah6.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ah6.h,v 1.4 2001/06/11 12:39:03 ume Exp $	*/
-/*	$KAME: ah.h,v 1.13 2000/10/18 21:28:00 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * RFC1826/2402 authentication header.
- */
-
-#ifndef _NETINET6_AH6_H_
-#define _NETINET6_AH6_H_
-
-#ifdef _KERNEL
-struct secasvar;
-
-extern int ah6_input __P((struct mbuf **, int *, int));
-extern int ah6_output __P((struct mbuf *, u_char *, struct mbuf *,
-	struct ipsecrequest *));
-extern int ah6_calccksum __P((struct mbuf *, caddr_t, size_t,
-	const struct ah_algorithm *, struct secasvar *));
-
-extern void ah6_ctlinput __P((int, struct sockaddr *, void *));
-#endif
-
-#endif /*_NETINET6_AH6_H_*/
diff --git a/newlib/libc/sys/linux/include/netinet6/esp.h b/newlib/libc/sys/linux/include/netinet6/esp.h
deleted file mode 100644
index 0a22f7a..0000000
--- a/newlib/libc/sys/linux/include/netinet6/esp.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/esp.h,v 1.6 2002/04/19 04:46:22 suz Exp $	*/
-/*	$KAME: esp.h,v 1.19 2001/09/04 08:43:19 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * RFC1827/2406 Encapsulated Security Payload.
- */
-
-#ifndef _NETINET6_ESP_H_
-#define _NETINET6_ESP_H_
-
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_inet.h"
-#endif
-
-struct esp {
-	u_int32_t	esp_spi;	/* ESP */
-	/* variable size, 32bit bound */	/* Initialization Vector */
-	/* variable size */		/* Payload data */
-	/* variable size */		/* padding */
-	/* 8bit */			/* pad size */
-	/* 8bit */			/* next header */
-	/* 8bit */			/* next header */
-	/* variable size, 32bit bound */ /* Authentication data (new IPsec) */
-};
-
-struct newesp {
-	u_int32_t	esp_spi;	/* ESP */
-	u_int32_t	esp_seq;	/* Sequence number */
-	/* variable size */		/* (IV and) Payload data */
-	/* variable size */		/* padding */
-	/* 8bit */			/* pad size */
-	/* 8bit */			/* next header */
-	/* 8bit */			/* next header */
-	/* variable size, 32bit bound *//* Authentication data */
-};
-
-struct esptail {
-	u_int8_t	esp_padlen;	/* pad length */
-	u_int8_t	esp_nxt;	/* Next header */
-	/* variable size, 32bit bound *//* Authentication data (new IPsec)*/
-};
-
-#ifdef _KERNEL
-struct secasvar;
-
-struct esp_algorithm {
-	size_t padbound;	/* pad boundary, in byte */
-	int ivlenval;		/* iv length, in byte */
-	int (*mature) __P((struct secasvar *));
-	int keymin;	/* in bits */
-	int keymax;	/* in bits */
-	int (*schedlen) __P((const struct esp_algorithm *));
-	const char *name;
-	int (*ivlen) __P((const struct esp_algorithm *, struct secasvar *));
-	int (*decrypt) __P((struct mbuf *, size_t,
-		struct secasvar *, const struct esp_algorithm *, int));
-	int (*encrypt) __P((struct mbuf *, size_t, size_t,
-		struct secasvar *, const struct esp_algorithm *, int));
-	/* not supposed to be called directly */
-	int (*schedule) __P((const struct esp_algorithm *, struct secasvar *));
-	int (*blockdecrypt) __P((const struct esp_algorithm *,
-		struct secasvar *, u_int8_t *, u_int8_t *));
-	int (*blockencrypt) __P((const struct esp_algorithm *,
-		struct secasvar *, u_int8_t *, u_int8_t *));
-};
-
-extern const struct esp_algorithm *esp_algorithm_lookup __P((int));
-extern int esp_max_ivlen __P((void));
-
-/* crypt routines */
-extern int esp4_output __P((struct mbuf *, struct ipsecrequest *));
-extern void esp4_input __P((struct mbuf *, int));
-extern size_t esp_hdrsiz __P((struct ipsecrequest *));
-
-extern int esp_schedule __P((const struct esp_algorithm *, struct secasvar *));
-extern int esp_auth __P((struct mbuf *, size_t, size_t,
-	struct secasvar *, u_char *));
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_ESP_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/esp6.h b/newlib/libc/sys/linux/include/netinet6/esp6.h
deleted file mode 100644
index 933fe2a..0000000
--- a/newlib/libc/sys/linux/include/netinet6/esp6.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/esp6.h,v 1.4 2001/06/11 12:39:04 ume Exp $	*/
-/*	$KAME: esp.h,v 1.16 2000/10/18 21:28:00 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * RFC1827/2406 Encapsulated Security Payload.
- */
-
-#ifndef _NETINET6_ESP6_H_
-#define _NETINET6_ESP6_H_
-
-#ifdef _KERNEL
-extern int esp6_output __P((struct mbuf *, u_char *, struct mbuf *,
-	struct ipsecrequest *));
-extern int esp6_input __P((struct mbuf **, int *, int));
-
-extern void esp6_ctlinput __P((int, struct sockaddr *, void *));
-#endif /*_KERNEL*/
-
-#endif /*_NETINET6_ESP6_H_*/
diff --git a/newlib/libc/sys/linux/include/netinet6/esp_rijndael.h b/newlib/libc/sys/linux/include/netinet6/esp_rijndael.h
deleted file mode 100644
index 8c7d44e..0000000
--- a/newlib/libc/sys/linux/include/netinet6/esp_rijndael.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/esp_rijndael.h,v 1.1 2001/06/11 12:39:05 ume Exp $	*/
-/*	$KAME: esp_rijndael.h,v 1.1 2000/09/20 18:15:22 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-int esp_rijndael_schedlen __P((const struct esp_algorithm *));
-int esp_rijndael_schedule __P((const struct esp_algorithm *,
-	struct secasvar *));
-int esp_rijndael_blockdecrypt __P((const struct esp_algorithm *,
-	struct secasvar *, u_int8_t *, u_int8_t *));
-int esp_rijndael_blockencrypt __P((const struct esp_algorithm *,
-	struct secasvar *, u_int8_t *, u_int8_t *));
diff --git a/newlib/libc/sys/linux/include/netinet6/icmp6.h b/newlib/libc/sys/linux/include/netinet6/icmp6.h
deleted file mode 100644
index 300b8ac..0000000
--- a/newlib/libc/sys/linux/include/netinet6/icmp6.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/icmp6.h,v 1.6 2000/07/04 16:35:09 itojun Exp $	*/
-/*	$KAME: icmp6.h,v 1.17 2000/06/11 17:23:40 jinmei Exp $	*/
-
-#error "netinet6/icmp6.h is obsolete.  use netinet/icmp6.h"
diff --git a/newlib/libc/sys/linux/include/netinet6/in6.h b/newlib/libc/sys/linux/include/netinet6/in6.h
deleted file mode 100644
index e4d1c1c..0000000
--- a/newlib/libc/sys/linux/include/netinet6/in6.h
+++ /dev/null
@@ -1,651 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/in6.h,v 1.19 2002/04/19 04:46:22 suz Exp $	*/
-/*	$KAME: in6.h,v 1.89 2001/05/27 13:28:35 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in.h	8.3 (Berkeley) 1/3/94
- */
-
-#ifndef __KAME_NETINET_IN_H_INCLUDED_
-#error "do not include netinet6/in6.h directly, include netinet/in.h.  see RFC2553"
-#endif
-
-#ifndef _NETINET6_IN6_H_
-#define _NETINET6_IN6_H_
-
-#include <sys/types.h>
-
-/*
- * Identification of the network protocol stack
- * for *BSD-current/release: http://www.kame.net/dev/cvsweb.cgi/kame/COVERAGE
- * has the table of implementation/integration differences.
- */
-#define __KAME__
-#define __KAME_VERSION		"20010528/FreeBSD"
-
-/*
- * Local port number conventions:
- *
- * Ports < IPPORT_RESERVED are reserved for privileged processes (e.g. root),
- * unless a kernel is compiled with IPNOPRIVPORTS defined.
- *
- * When a user does a bind(2) or connect(2) with a port number of zero,
- * a non-conflicting local port address is chosen.
- *
- * The default range is IPPORT_ANONMIN to IPPORT_ANONMAX, although
- * that is settable by sysctl(3); net.inet.ip.anonportmin and
- * net.inet.ip.anonportmax respectively.
- *
- * A user may set the IPPROTO_IP option IP_PORTRANGE to change this
- * default assignment range.
- *
- * The value IP_PORTRANGE_DEFAULT causes the default behavior.
- *
- * The value IP_PORTRANGE_HIGH is the same as IP_PORTRANGE_DEFAULT,
- * and exists only for FreeBSD compatibility purposes.
- *
- * The value IP_PORTRANGE_LOW changes the range to the "low" are
- * that is (by convention) restricted to privileged processes.
- * This convention is based on "vouchsafe" principles only.
- * It is only secure if you trust the remote host to restrict these ports.
- * The range is IPPORT_RESERVEDMIN to IPPORT_RESERVEDMAX.
- */
-
-#define	IPV6PORT_RESERVED	1024
-#define	IPV6PORT_ANONMIN	49152
-#define	IPV6PORT_ANONMAX	65535
-#define	IPV6PORT_RESERVEDMIN	600
-#define	IPV6PORT_RESERVEDMAX	(IPV6PORT_RESERVED-1)
-
-/*
- * IPv6 address
- */
-struct in6_addr {
-	union {
-		uint8_t   __u6_addr8[16];
-		uint16_t  __u6_addr16[8];
-		uint32_t  __u6_addr32[4];
-	} __u6_addr;			/* 128-bit IP6 address */
-};
-
-#define s6_addr   __u6_addr.__u6_addr8
-#ifdef _KERNEL	/* XXX nonstandard */
-#define s6_addr8  __u6_addr.__u6_addr8
-#define s6_addr16 __u6_addr.__u6_addr16
-#define s6_addr32 __u6_addr.__u6_addr32
-#endif
-
-#define INET6_ADDRSTRLEN	46
-
-/*
- * Socket address for IPv6
- */
-#ifndef _XOPEN_SOURCE
-#define SIN6_LEN
-#endif
-struct sockaddr_in6 {
-	uint8_t	sin6_family;	/* AF_INET6 (sa_family_t) */
-	uint16_t	sin6_port;	/* Transport layer port # (in_port_t)*/
-	uint32_t	sin6_flowinfo;	/* IP6 flow information */
-	struct in6_addr	sin6_addr;	/* IP6 address */
-	uint32_t	sin6_scope_id;	/* scope zone index */
-};
-
-/*
- * Local definition for masks
- */
-#ifdef _KERNEL	/* XXX nonstandard */
-#define IN6MASK0	{{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}}
-#define IN6MASK32	{{{ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, \
-			    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
-#define IN6MASK64	{{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \
-			    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
-#define IN6MASK96	{{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \
-			    0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }}}
-#define IN6MASK128	{{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \
-			    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }}}
-#endif
-
-#ifdef _KERNEL
-extern const struct sockaddr_in6 sa6_any;
-
-extern const struct in6_addr in6mask0;
-extern const struct in6_addr in6mask32;
-extern const struct in6_addr in6mask64;
-extern const struct in6_addr in6mask96;
-extern const struct in6_addr in6mask128;
-#endif /* _KERNEL */
-
-/*
- * Macros started with IPV6_ADDR is KAME local
- */
-#ifdef _KERNEL	/* XXX nonstandard */
-#if BYTE_ORDER == BIG_ENDIAN
-#define IPV6_ADDR_INT32_ONE	1
-#define IPV6_ADDR_INT32_TWO	2
-#define IPV6_ADDR_INT32_MNL	0xff010000
-#define IPV6_ADDR_INT32_MLL	0xff020000
-#define IPV6_ADDR_INT32_SMP	0x0000ffff
-#define IPV6_ADDR_INT16_ULL	0xfe80
-#define IPV6_ADDR_INT16_USL	0xfec0
-#define IPV6_ADDR_INT16_MLL	0xff02
-#elif BYTE_ORDER == LITTLE_ENDIAN
-#define IPV6_ADDR_INT32_ONE	0x01000000
-#define IPV6_ADDR_INT32_TWO	0x02000000
-#define IPV6_ADDR_INT32_MNL	0x000001ff
-#define IPV6_ADDR_INT32_MLL	0x000002ff
-#define IPV6_ADDR_INT32_SMP	0xffff0000
-#define IPV6_ADDR_INT16_ULL	0x80fe
-#define IPV6_ADDR_INT16_USL	0xc0fe
-#define IPV6_ADDR_INT16_MLL	0x02ff
-#endif
-#endif
-
-/*
- * Definition of some useful macros to handle IP6 addresses
- */
-#define IN6ADDR_ANY_INIT \
-	{{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
-#define IN6ADDR_LOOPBACK_INIT \
-	{{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
-#define IN6ADDR_NODELOCAL_ALLNODES_INIT \
-	{{{ 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
-#define IN6ADDR_LINKLOCAL_ALLNODES_INIT \
-	{{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
-#define IN6ADDR_LINKLOCAL_ALLROUTERS_INIT \
-	{{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 }}}
-
-extern const struct in6_addr in6addr_any;
-extern const struct in6_addr in6addr_loopback;
-extern const struct in6_addr in6addr_nodelocal_allnodes;
-extern const struct in6_addr in6addr_linklocal_allnodes;
-extern const struct in6_addr in6addr_linklocal_allrouters;
-
-/*
- * Equality
- * NOTE: Some of kernel programming environment (for example, openbsd/sparc)
- * does not supply memcmp().  For userland memcmp() is preferred as it is
- * in ANSI standard.
- */
-#ifdef _KERNEL
-#define IN6_ARE_ADDR_EQUAL(a, b)			\
-    (bcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0)
-#else
-#define IN6_ARE_ADDR_EQUAL(a, b)			\
-    (memcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0)
-#endif
-
-#ifdef _KERNEL			/* non standard */
-/* see if two addresses are equal in a scope-conscious manner. */
-#define SA6_ARE_ADDR_EQUAL(a, b) \
-	(((a)->sin6_scope_id == 0 || (b)->sin6_scope_id == 0 || \
-	  ((a)->sin6_scope_id == (b)->sin6_scope_id)) && \
-	 (bcmp(&(a)->sin6_addr, &(b)->sin6_addr, sizeof(struct in6_addr)) == 0))
-#endif
-
-/*
- * Unspecified
- */
-#define IN6_IS_ADDR_UNSPECIFIED(a)	\
-	((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[12]) == 0))
-
-/*
- * Loopback
- */
-#define IN6_IS_ADDR_LOOPBACK(a)		\
-	((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[12]) == ntohl(1)))
-
-/*
- * IPv4 compatible
- */
-#define IN6_IS_ADDR_V4COMPAT(a)		\
-	((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[12]) != 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[12]) != ntohl(1)))
-
-/*
- * Mapped
- */
-#define IN6_IS_ADDR_V4MAPPED(a)		      \
-	((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
-
-/*
- * KAME Scope Values
- */
-
-#ifdef _KERNEL	/* XXX nonstandard */
-#define IPV6_ADDR_SCOPE_NODELOCAL	0x01
-#define IPV6_ADDR_SCOPE_LINKLOCAL	0x02
-#define IPV6_ADDR_SCOPE_SITELOCAL	0x05
-#define IPV6_ADDR_SCOPE_ORGLOCAL	0x08	/* just used in this file */
-#define IPV6_ADDR_SCOPE_GLOBAL		0x0e
-#else
-#define __IPV6_ADDR_SCOPE_NODELOCAL	0x01
-#define __IPV6_ADDR_SCOPE_LINKLOCAL	0x02
-#define __IPV6_ADDR_SCOPE_SITELOCAL	0x05
-#define __IPV6_ADDR_SCOPE_ORGLOCAL	0x08	/* just used in this file */
-#define __IPV6_ADDR_SCOPE_GLOBAL	0x0e
-#endif
-
-/*
- * Unicast Scope
- * Note that we must check topmost 10 bits only, not 16 bits (see RFC2373).
- */
-#define IN6_IS_ADDR_LINKLOCAL(a)	\
-	(((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0x80))
-#define IN6_IS_ADDR_SITELOCAL(a)	\
-	(((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0xc0))
-
-/*
- * Multicast
- */
-#define IN6_IS_ADDR_MULTICAST(a)	((a)->s6_addr[0] == 0xff)
-
-#ifdef _KERNEL	/* XXX nonstandard */
-#define IPV6_ADDR_MC_SCOPE(a)		((a)->s6_addr[1] & 0x0f)
-#else
-#define __IPV6_ADDR_MC_SCOPE(a)		((a)->s6_addr[1] & 0x0f)
-#endif
-
-/*
- * Multicast Scope
- */
-#ifdef _KERNEL	/* refers nonstandard items */
-#define IN6_IS_ADDR_MC_NODELOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_NODELOCAL))
-#define IN6_IS_ADDR_MC_LINKLOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_LINKLOCAL))
-#define IN6_IS_ADDR_MC_SITELOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) && 	\
-	 (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_SITELOCAL))
-#define IN6_IS_ADDR_MC_ORGLOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_ORGLOCAL))
-#define IN6_IS_ADDR_MC_GLOBAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_GLOBAL))
-#else
-#define IN6_IS_ADDR_MC_NODELOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_NODELOCAL))
-#define IN6_IS_ADDR_MC_LINKLOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_LINKLOCAL))
-#define IN6_IS_ADDR_MC_SITELOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) && 	\
-	 (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_SITELOCAL))
-#define IN6_IS_ADDR_MC_ORGLOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_ORGLOCAL))
-#define IN6_IS_ADDR_MC_GLOBAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_GLOBAL))
-#endif
-
-#ifdef _KERNEL	/* nonstandard */
-/*
- * KAME Scope
- */
-#define IN6_IS_SCOPE_LINKLOCAL(a)	\
-	((IN6_IS_ADDR_LINKLOCAL(a)) ||	\
-	 (IN6_IS_ADDR_MC_LINKLOCAL(a)))
-
-#define IFA6_IS_DEPRECATED(a) \
-	((a)->ia6_lifetime.ia6t_preferred != 0 && \
-	 (a)->ia6_lifetime.ia6t_preferred < time_second)
-#define IFA6_IS_INVALID(a) \
-	((a)->ia6_lifetime.ia6t_expire != 0 && \
-	 (a)->ia6_lifetime.ia6t_expire < time_second)
-#endif /* _KERNEL */
-
-/*
- * IP6 route structure
- */
-#ifndef _XOPEN_SOURCE
-struct route_in6 {
-	struct	rtentry *ro_rt;
-	struct	sockaddr_in6 ro_dst;
-};
-#endif
-
-/*
- * Options for use with [gs]etsockopt at the IPV6 level.
- * First word of comment is data type; bool is stored in int.
- */
-/* no hdrincl */
-#if 0 /* the followings are relic in IPv4 and hence are disabled */
-#define IPV6_OPTIONS		1  /* buf/ip6_opts; set/get IP6 options */
-#define IPV6_RECVOPTS		5  /* bool; receive all IP6 opts w/dgram */
-#define IPV6_RECVRETOPTS	6  /* bool; receive IP6 opts for response */
-#define IPV6_RECVDSTADDR	7  /* bool; receive IP6 dst addr w/dgram */
-#define IPV6_RETOPTS		8  /* ip6_opts; set/get IP6 options */
-#endif
-#define IPV6_SOCKOPT_RESERVED1	3  /* reserved for future use */
-#define IPV6_UNICAST_HOPS	4  /* int; IP6 hops */
-#define IPV6_MULTICAST_IF	9  /* u_char; set/get IP6 multicast i/f  */
-#define IPV6_MULTICAST_HOPS	10 /* u_char; set/get IP6 multicast hops */
-#define IPV6_MULTICAST_LOOP	11 /* u_char; set/get IP6 multicast loopback */
-#define IPV6_JOIN_GROUP		12 /* ip6_mreq; join a group membership */
-#define IPV6_LEAVE_GROUP	13 /* ip6_mreq; leave a group membership */
-#define IPV6_PORTRANGE		14 /* int; range to choose for unspec port */
-#define ICMP6_FILTER		18 /* icmp6_filter; icmp6 filter */
-/* RFC2292 options */
-#define IPV6_PKTINFO		19 /* bool; send/recv if, src/dst addr */
-#define IPV6_HOPLIMIT		20 /* bool; hop limit */
-#define IPV6_NEXTHOP		21 /* bool; next hop addr */
-#define IPV6_HOPOPTS		22 /* bool; hop-by-hop option */
-#define IPV6_DSTOPTS		23 /* bool; destination option */
-#define IPV6_RTHDR		24 /* bool; routing header */
-#define IPV6_PKTOPTIONS		25 /* buf/cmsghdr; set/get IPv6 options */
-
-#define IPV6_CHECKSUM		26 /* int; checksum offset for raw socket */
-#define IPV6_V6ONLY		27 /* bool; only bind INET6 at wildcard bind */
-#ifndef _KERNEL
-#define IPV6_BINDV6ONLY		IPV6_V6ONLY
-#endif
-
-#if 1 /* IPSEC */
-#define IPV6_IPSEC_POLICY	28 /* struct; get/set security policy */
-#endif
-#define IPV6_FAITH		29 /* bool; accept FAITH'ed connections */
-
-#if 1 /* IPV6FIREWALL */
-#define IPV6_FW_ADD		30 /* add a firewall rule to chain */
-#define IPV6_FW_DEL		31 /* delete a firewall rule from chain */
-#define IPV6_FW_FLUSH		32 /* flush firewall rule chain */
-#define IPV6_FW_ZERO		33 /* clear single/all firewall counter(s) */
-#define IPV6_FW_GET		34 /* get entire firewall rule chain */
-#endif
-
-/* to define items, should talk with KAME guys first, for *BSD compatibility */
-
-#define IPV6_RTHDR_LOOSE     0 /* this hop need not be a neighbor. XXX old spec */
-#define IPV6_RTHDR_STRICT    1 /* this hop must be a neighbor. XXX old spec */
-#define IPV6_RTHDR_TYPE_0    0 /* IPv6 routing header type 0 */
-
-/*
- * Defaults and limits for options
- */
-#define IPV6_DEFAULT_MULTICAST_HOPS 1	/* normally limit m'casts to 1 hop */
-#define IPV6_DEFAULT_MULTICAST_LOOP 1	/* normally hear sends if a member */
-
-/*
- * Argument structure for IPV6_JOIN_GROUP and IPV6_LEAVE_GROUP.
- */
-struct ipv6_mreq {
-	struct in6_addr	ipv6mr_multiaddr;
-	unsigned int	ipv6mr_interface;
-};
-
-/*
- * IPV6_PKTINFO: Packet information(RFC2292 sec 5)
- */
-struct in6_pktinfo {
-	struct in6_addr	ipi6_addr;	/* src/dst IPv6 address */
-	unsigned int	ipi6_ifindex;	/* send/recv interface index */
-};
-
-/*
- * Argument for IPV6_PORTRANGE:
- * - which range to search when port is unspecified at bind() or connect()
- */
-#define	IPV6_PORTRANGE_DEFAULT	0	/* default range */
-#define	IPV6_PORTRANGE_HIGH	1	/* "high" - request firewall bypass */
-#define	IPV6_PORTRANGE_LOW	2	/* "low" - vouchsafe security */
-
-#ifndef _XOPEN_SOURCE
-/*
- * Definitions for inet6 sysctl operations.
- *
- * Third level is protocol number.
- * Fourth level is desired variable within that protocol.
- */
-#define IPV6PROTO_MAXID	(IPPROTO_PIM + 1)	/* don't list to IPV6PROTO_MAX */
-
-#define CTL_IPV6PROTO_NAMES { \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, \
-	{ "tcp6", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "udp6", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, \
-	{ "ip6", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, \
-	{ "ipsec6", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "icmp6", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "pim6", CTLTYPE_NODE }, \
-}
-
-/*
- * Names for IP sysctl objects
- */
-#define IPV6CTL_FORWARDING	1	/* act as router */
-#define IPV6CTL_SENDREDIRECTS	2	/* may send redirects when forwarding*/
-#define IPV6CTL_DEFHLIM		3	/* default Hop-Limit */
-#ifdef notyet
-#define IPV6CTL_DEFMTU		4	/* default MTU */
-#endif
-#define IPV6CTL_FORWSRCRT	5	/* forward source-routed dgrams */
-#define IPV6CTL_STATS		6	/* stats */
-#define IPV6CTL_MRTSTATS	7	/* multicast forwarding stats */
-#define IPV6CTL_MRTPROTO	8	/* multicast routing protocol */
-#define IPV6CTL_MAXFRAGPACKETS	9	/* max packets reassembly queue */
-#define IPV6CTL_SOURCECHECK	10	/* verify source route and intf */
-#define IPV6CTL_SOURCECHECK_LOGINT 11	/* minimume logging interval */
-#define IPV6CTL_ACCEPT_RTADV	12
-#define IPV6CTL_KEEPFAITH	13
-#define IPV6CTL_LOG_INTERVAL	14
-#define IPV6CTL_HDRNESTLIMIT	15
-#define IPV6CTL_DAD_COUNT	16
-#define IPV6CTL_AUTO_FLOWLABEL	17
-#define IPV6CTL_DEFMCASTHLIM	18
-#define IPV6CTL_GIF_HLIM	19	/* default HLIM for gif encap packet */
-#define IPV6CTL_KAME_VERSION	20
-#define IPV6CTL_USE_DEPRECATED	21	/* use deprecated addr (RFC2462 5.5.4) */
-#define IPV6CTL_RR_PRUNE	22	/* walk timer for router renumbering */
-#if 0	/* obsolete */
-#define IPV6CTL_MAPPED_ADDR	23
-#endif
-#define IPV6CTL_V6ONLY		24
-#define IPV6CTL_RTEXPIRE	25	/* cloned route expiration time */
-#define IPV6CTL_RTMINEXPIRE	26	/* min value for expiration time */
-#define IPV6CTL_RTMAXCACHE	27	/* trigger level for dynamic expire */
-
-#define IPV6CTL_USETEMPADDR	32	/* use temporary addresses (RFC3041) */
-#define IPV6CTL_TEMPPLTIME	33	/* preferred lifetime for tmpaddrs */
-#define IPV6CTL_TEMPVLTIME	34	/* valid lifetime for tmpaddrs */
-#define IPV6CTL_AUTO_LINKLOCAL	35	/* automatic link-local addr assign */
-#define IPV6CTL_RIP6STATS	36	/* raw_ip6 stats */
-
-/* New entries should be added here from current IPV6CTL_MAXID value. */
-/* to define items, should talk with KAME guys first, for *BSD compatibility */
-#define IPV6CTL_MAXID		37
-
-#endif /* !_XOPEN_SOURCE */
-
-/*
- * Redefinition of mbuf flags
- */
-#define	M_AUTHIPHDR	M_PROTO2
-#define	M_DECRYPTED	M_PROTO3
-#define	M_LOOP		M_PROTO4
-#define	M_AUTHIPDGM	M_PROTO5
-
-#ifdef _KERNEL
-struct cmsghdr;
-
-int	in6_cksum __P((struct mbuf *, uint8_t, uint32_t, uint32_t));
-int	in6_localaddr __P((struct in6_addr *));
-int	in6_addrscope __P((struct in6_addr *));
-struct	in6_ifaddr *in6_ifawithscope __P((struct ifnet *, struct in6_addr *));
-struct	in6_ifaddr *in6_ifawithifp __P((struct ifnet *, struct in6_addr *));
-extern void in6_if_up __P((struct ifnet *));
-struct sockaddr;
-extern	u_char	ip6_protox[];
-
-void	in6_sin6_2_sin __P((struct sockaddr_in *sin,
-			    struct sockaddr_in6 *sin6));
-void	in6_sin_2_v4mapsin6 __P((struct sockaddr_in *sin,
-				 struct sockaddr_in6 *sin6));
-void	in6_sin6_2_sin_in_sock __P((struct sockaddr *nam));
-void	in6_sin_2_v4mapsin6_in_sock __P((struct sockaddr **nam));
-
-#define	satosin6(sa)	((struct sockaddr_in6 *)(sa))
-#define	sin6tosa(sin6)	((struct sockaddr *)(sin6))
-#define	ifatoia6(ifa)	((struct in6_ifaddr *)(ifa))
-
-extern int	(*faithprefix_p)(struct in6_addr *);
-#endif /* _KERNEL */
-
-__BEGIN_DECLS
-struct cmsghdr;
-
-extern int inet6_option_space __P((int));
-extern int inet6_option_init __P((void *, struct cmsghdr **, int));
-extern int inet6_option_append __P((struct cmsghdr *, const uint8_t *,
-	int, int));
-extern uint8_t *inet6_option_alloc __P((struct cmsghdr *, int, int, int));
-extern int inet6_option_next __P((const struct cmsghdr *, uint8_t **));
-extern int inet6_option_find __P((const struct cmsghdr *, uint8_t **, int));
-
-extern size_t inet6_rthdr_space __P((int, int));
-extern struct cmsghdr *inet6_rthdr_init __P((void *, int));
-extern int inet6_rthdr_add __P((struct cmsghdr *, const struct in6_addr *,
-		unsigned int));
-extern int inet6_rthdr_lasthop __P((struct cmsghdr *, unsigned int));
-#if 0 /* not implemented yet */
-extern int inet6_rthdr_reverse __P((const struct cmsghdr *, struct cmsghdr *));
-#endif
-extern int inet6_rthdr_segments __P((const struct cmsghdr *));
-extern struct in6_addr *inet6_rthdr_getaddr __P((struct cmsghdr *, int));
-extern int inet6_rthdr_getflags __P((const struct cmsghdr *, int));
-
-extern int inet6_opt_init __P((void *, size_t));
-extern int inet6_opt_append __P((void *, size_t, int, uint8_t,
-				 size_t, uint8_t, void **));
-extern int inet6_opt_finish __P((void *, size_t, int));
-extern int inet6_opt_set_val __P((void *, size_t, void *, int));
-
-extern int inet6_opt_next __P((void *, size_t, int, uint8_t *,
-			       size_t *, void **));
-extern int inet6_opt_find __P((void *, size_t, int, uint8_t,
-			  size_t *, void **));
-extern int inet6_opt_get_val __P((void *, size_t, void *, int));
-extern size_t inet6_rth_space __P((int, int));
-extern void *inet6_rth_init __P((void *, int, int, int));
-extern int inet6_rth_add __P((void *, const struct in6_addr *));
-extern int inet6_rth_reverse __P((const void *, void *));
-extern int inet6_rth_segments __P((const void *));
-extern struct in6_addr *inet6_rth_getaddr __P((const void *, int));
-__END_DECLS
-
-#endif /* !_NETINET6_IN6_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/in6_gif.h b/newlib/libc/sys/linux/include/netinet6/in6_gif.h
deleted file mode 100644
index cd0db9b..0000000
--- a/newlib/libc/sys/linux/include/netinet6/in6_gif.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/in6_gif.h,v 1.3 2000/07/04 16:35:09 itojun Exp $	*/
-/*	$KAME: in6_gif.h,v 1.5 2000/04/14 08:36:03 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NETINET6_IN6_GIF_H_
-#define _NETINET6_IN6_GIF_H_
-
-#define GIF_HLIM	30
-
-int in6_gif_input __P((struct mbuf **, int *, int));
-int in6_gif_output __P((struct ifnet *, int, struct mbuf *, struct rtentry *));
-int gif_encapcheck6 __P((const struct mbuf *, int, int, void *));
-
-#endif /*_NETINET6_IN6_GIF_H_*/
diff --git a/newlib/libc/sys/linux/include/netinet6/in6_ifattach.h b/newlib/libc/sys/linux/include/netinet6/in6_ifattach.h
deleted file mode 100644
index 90229e4..0000000
--- a/newlib/libc/sys/linux/include/netinet6/in6_ifattach.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/in6_ifattach.h,v 1.3 2001/06/11 12:39:05 ume Exp $	*/
-/*	$KAME: in6_ifattach.h,v 1.14 2001/02/08 12:48:39 jinmei Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NETINET6_IN6_IFATTACH_H_
-#define _NETINET6_IN6_IFATTACH_H_
-
-#ifdef _KERNEL
-void in6_nigroup_attach __P((const char *, int));
-void in6_nigroup_detach __P((const char *, int));
-void in6_ifattach __P((struct ifnet *, struct ifnet *));
-void in6_ifdetach __P((struct ifnet *));
-void in6_get_tmpifid __P((struct ifnet *, u_int8_t *, const u_int8_t *, int));
-void in6_tmpaddrtimer __P((void *));
-int in6_nigroup __P((struct ifnet *, const char *, int, struct in6_addr *));
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_IN6_IFATTACH_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/in6_pcb.h b/newlib/libc/sys/linux/include/netinet6/in6_pcb.h
deleted file mode 100644
index c47c6c7..0000000
--- a/newlib/libc/sys/linux/include/netinet6/in6_pcb.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/in6_pcb.h,v 1.7 2002/02/27 02:44:45 alfred Exp $	*/
-/*	$KAME: in6_pcb.h,v 1.13 2001/02/06 09:16:53 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-/*
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _NETINET6_IN6_PCB_H_
-#define	_NETINET6_IN6_PCB_H_
-
-#ifdef _KERNEL
-#define	satosin6(sa)	((struct sockaddr_in6 *)(sa))
-#define	sin6tosa(sin6)	((struct sockaddr *)(sin6))
-#define	ifatoia6(ifa)	((struct in6_ifaddr *)(ifa))
-
-void	in6_pcbpurgeif0 __P((struct in6pcb *, struct ifnet *));
-void	in6_losing __P((struct inpcb *));
-int	in6_pcballoc __P((struct socket *, struct inpcbinfo *, struct thread *));
-int	in6_pcbbind __P((struct inpcb *, struct sockaddr *, struct thread *));
-int	in6_pcbconnect __P((struct inpcb *, struct sockaddr *, struct thread *));
-void	in6_pcbdetach __P((struct inpcb *));
-void	in6_pcbdisconnect __P((struct inpcb *));
-int	in6_pcbladdr __P((struct inpcb *, struct sockaddr *,
-			  struct in6_addr **));
-struct	inpcb *
-	in6_pcblookup_local __P((struct inpcbinfo *,
-				 struct in6_addr *, u_int, int));
-struct	inpcb *
-	in6_pcblookup_hash __P((struct inpcbinfo *,
-				struct in6_addr *, u_int, struct in6_addr *,
-				u_int, int, struct ifnet *));
-void	in6_pcbnotify __P((struct inpcbhead *, struct sockaddr *,
-			   u_int, const struct sockaddr *, u_int, int,
-			   void (*)(struct inpcb *, int)));
-void	in6_rtchange __P((struct inpcb *, int));
-int	in6_setpeeraddr __P((struct socket *so, struct sockaddr **nam));
-int	in6_setsockaddr __P((struct socket *so, struct sockaddr **nam));
-int	in6_mapped_sockaddr __P((struct socket *so, struct sockaddr **nam));
-int	in6_mapped_peeraddr __P((struct socket *so, struct sockaddr **nam));
-struct	in6_addr *in6_selectsrc __P((struct sockaddr_in6 *,
-				     struct ip6_pktopts *,
-				     struct ip6_moptions *,
-				     struct route_in6 *,
-				     struct in6_addr *, int *));
-int	in6_selecthlim __P((struct in6pcb *, struct ifnet *));
-int	in6_pcbsetport __P((struct in6_addr *, struct inpcb *, struct thread *));
-void	init_sin6 __P((struct sockaddr_in6 *sin6, struct mbuf *m));
-#endif /* _KERNEL */
-
-#endif /* !_NETINET6_IN6_PCB_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/in6_prefix.h b/newlib/libc/sys/linux/include/netinet6/in6_prefix.h
deleted file mode 100644
index 6b2c520..0000000
--- a/newlib/libc/sys/linux/include/netinet6/in6_prefix.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/in6_prefix.h,v 1.5 2001/06/11 12:39:05 ume Exp $	*/
-/*	$KAME: in6_prefix.h,v 1.10 2001/02/08 16:30:30 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, 1998 and 1999 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/callout.h>
-
-struct rr_prefix {
-	struct ifprefix	rp_ifpr;
-	LIST_ENTRY(rr_prefix) rp_entry;
-	LIST_HEAD(rp_addrhead, rp_addr) rp_addrhead;
-	struct sockaddr_in6 rp_prefix;	/* prefix */
-	u_int32_t rp_vltime;	/* advertised valid lifetime */
-	u_int32_t rp_pltime;	/* advertised preferred lifetime */
-	time_t rp_expire;	/* expiration time of the prefix */
-	time_t rp_preferred;	/* preferred time of the prefix */
-	struct in6_prflags rp_flags;
-	u_char	rp_origin; /* from where this prefix info is obtained */
-	struct	rp_stateflags {
-		/* if some prefix should be added to this prefix */
-		u_char addmark : 1;
-		u_char delmark : 1; /* if this prefix will be deleted */
-	} rp_stateflags;
-};
-
-#define rp_type		rp_ifpr.ifpr_type
-#define rp_ifp		rp_ifpr.ifpr_ifp
-#define rp_plen		rp_ifpr.ifpr_plen
-
-#define rp_raf		rp_flags.prf_ra
-#define rp_raf_onlink		rp_flags.prf_ra.onlink
-#define rp_raf_auto		rp_flags.prf_ra.autonomous
-
-#define rp_statef_addmark	rp_stateflags.addmark
-#define rp_statef_delmark	rp_stateflags.delmark
-
-#define rp_rrf		rp_flags.prf_rr
-#define rp_rrf_decrvalid	rp_flags.prf_rr.decrvalid
-#define rp_rrf_decrprefd	rp_flags.prf_rr.decrprefd
-
-struct rp_addr {
-	LIST_ENTRY(rp_addr)	ra_entry;
-	struct in6_addr		ra_ifid;
-	struct in6_ifaddr	*ra_addr;
-	struct ra_flags {
-		u_char anycast : 1;
-	} ra_flags;
-};
-
-#define ifpr2rp(ifpr)	((struct rr_prefix *)(ifpr))
-#define rp2ifpr(rp)	((struct ifprefix *)(rp))
-
-#define RP_IN6(rp)	(&(rp)->rp_prefix.sin6_addr)
-
-#define RR_INFINITE_LIFETIME		0xffffffff
-
-
-LIST_HEAD(rr_prhead, rr_prefix);
-
-extern struct rr_prhead rr_prefix;
-
-void in6_rr_timer __P((void *));
-extern struct callout in6_rr_timer_ch;
-int delete_each_prefix  __P((struct rr_prefix *rpp, u_char origin));
diff --git a/newlib/libc/sys/linux/include/netinet6/in6_var.h b/newlib/libc/sys/linux/include/netinet6/in6_var.h
deleted file mode 100644
index 7ddfbdb..0000000
--- a/newlib/libc/sys/linux/include/netinet6/in6_var.h
+++ /dev/null
@@ -1,608 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/in6_var.h,v 1.10 2002/04/19 04:46:22 suz Exp $	*/
-/*	$KAME: in6_var.h,v 1.56 2001/03/29 05:34:31 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1985, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)in_var.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _NETINET6_IN6_VAR_H_
-#define _NETINET6_IN6_VAR_H_
-
-/*
- * Interface address, Internet version.  One of these structures
- * is allocated for each interface with an Internet address.
- * The ifaddr structure contains the protocol-independent part
- * of the structure and is assumed to be first.
- */
-
-/*
- * pltime/vltime are just for future reference (required to implements 2
- * hour rule for hosts).  they should never be modified by nd6_timeout or
- * anywhere else.
- *	userland -> kernel: accept pltime/vltime
- *	kernel -> userland: throw up everything
- *	in kernel: modify preferred/expire only
- */
-struct in6_addrlifetime {
-	time_t ia6t_expire;	/* valid lifetime expiration time */
-	time_t ia6t_preferred;	/* preferred lifetime expiration time */
-	u_int32_t ia6t_vltime;	/* valid lifetime */
-	u_int32_t ia6t_pltime;	/* prefix lifetime */
-};
-
-struct	in6_ifaddr {
-	struct	ifaddr ia_ifa;		/* protocol-independent info */
-#define	ia_ifp		ia_ifa.ifa_ifp
-#define ia_flags	ia_ifa.ifa_flags
-	struct	sockaddr_in6 ia_addr;	/* interface address */
-	struct	sockaddr_in6 ia_net;	/* network number of interface */
-	struct	sockaddr_in6 ia_dstaddr; /* space for destination addr */
-	struct	sockaddr_in6 ia_prefixmask; /* prefix mask */
-	u_int32_t ia_plen;		/* prefix length */
-	struct	in6_ifaddr *ia_next;	/* next in6 list of IP6 addresses */
-	int	ia6_flags;
-
-	struct in6_addrlifetime ia6_lifetime;
-	struct ifprefix *ia6_ifpr; /* back pointer to ifprefix */
-
-	struct nd_prefix *ia6_ndpr; /* back pointer to the ND prefix
-				     * (for autoconfigured addresses only)
-				     */
-};
-
-/*
- * IPv6 interface statistics, as defined in RFC2465 Ipv6IfStatsEntry (p12).
- */
-struct in6_ifstat {
-	u_quad_t ifs6_in_receive;	/* # of total input datagram */
-	u_quad_t ifs6_in_hdrerr;	/* # of datagrams with invalid hdr */
-	u_quad_t ifs6_in_toobig;	/* # of datagrams exceeded MTU */
-	u_quad_t ifs6_in_noroute;	/* # of datagrams with no route */
-	u_quad_t ifs6_in_addrerr;	/* # of datagrams with invalid dst */
-	u_quad_t ifs6_in_protounknown;	/* # of datagrams with unknown proto */
-					/* NOTE: increment on final dst if */
-	u_quad_t ifs6_in_truncated;	/* # of truncated datagrams */
-	u_quad_t ifs6_in_discard;	/* # of discarded datagrams */
-					/* NOTE: fragment timeout is not here */
-	u_quad_t ifs6_in_deliver;	/* # of datagrams delivered to ULP */
-					/* NOTE: increment on final dst if */
-	u_quad_t ifs6_out_forward;	/* # of datagrams forwarded */
-					/* NOTE: increment on outgoing if */
-	u_quad_t ifs6_out_request;	/* # of outgoing datagrams from ULP */
-					/* NOTE: does not include forwrads */
-	u_quad_t ifs6_out_discard;	/* # of discarded datagrams */
-	u_quad_t ifs6_out_fragok;	/* # of datagrams fragmented */
-	u_quad_t ifs6_out_fragfail;	/* # of datagrams failed on fragment */
-	u_quad_t ifs6_out_fragcreat;	/* # of fragment datagrams */
-					/* NOTE: this is # after fragment */
-	u_quad_t ifs6_reass_reqd;	/* # of incoming fragmented packets */
-					/* NOTE: increment on final dst if */
-	u_quad_t ifs6_reass_ok;		/* # of reassembled packets */
-					/* NOTE: this is # after reass */
-					/* NOTE: increment on final dst if */
-	u_quad_t ifs6_reass_fail;	/* # of reass failures */
-					/* NOTE: may not be packet count */
-					/* NOTE: increment on final dst if */
-	u_quad_t ifs6_in_mcast;		/* # of inbound multicast datagrams */
-	u_quad_t ifs6_out_mcast;	/* # of outbound multicast datagrams */
-};
-
-/*
- * ICMPv6 interface statistics, as defined in RFC2466 Ipv6IfIcmpEntry.
- * XXX: I'm not sure if this file is the right place for this structure...
- */
-struct icmp6_ifstat {
-	/*
-	 * Input statistics
-	 */
-	/* ipv6IfIcmpInMsgs, total # of input messages */
-	u_quad_t ifs6_in_msg;
-	/* ipv6IfIcmpInErrors, # of input error messages */
-	u_quad_t ifs6_in_error;
-	/* ipv6IfIcmpInDestUnreachs, # of input dest unreach errors */
-	u_quad_t ifs6_in_dstunreach;
-	/* ipv6IfIcmpInAdminProhibs, # of input administratively prohibited errs */
-	u_quad_t ifs6_in_adminprohib;
-	/* ipv6IfIcmpInTimeExcds, # of input time exceeded errors */
-	u_quad_t ifs6_in_timeexceed;
-	/* ipv6IfIcmpInParmProblems, # of input parameter problem errors */
-	u_quad_t ifs6_in_paramprob;
-	/* ipv6IfIcmpInPktTooBigs, # of input packet too big errors */
-	u_quad_t ifs6_in_pkttoobig;
-	/* ipv6IfIcmpInEchos, # of input echo requests */
-	u_quad_t ifs6_in_echo;
-	/* ipv6IfIcmpInEchoReplies, # of input echo replies */
-	u_quad_t ifs6_in_echoreply;
-	/* ipv6IfIcmpInRouterSolicits, # of input router solicitations */
-	u_quad_t ifs6_in_routersolicit;
-	/* ipv6IfIcmpInRouterAdvertisements, # of input router advertisements */
-	u_quad_t ifs6_in_routeradvert;
-	/* ipv6IfIcmpInNeighborSolicits, # of input neighbor solicitations */
-	u_quad_t ifs6_in_neighborsolicit;
-	/* ipv6IfIcmpInNeighborAdvertisements, # of input neighbor advertisements */
-	u_quad_t ifs6_in_neighboradvert;
-	/* ipv6IfIcmpInRedirects, # of input redirects */
-	u_quad_t ifs6_in_redirect;
-	/* ipv6IfIcmpInGroupMembQueries, # of input MLD queries */
-	u_quad_t ifs6_in_mldquery;
-	/* ipv6IfIcmpInGroupMembResponses, # of input MLD reports */
-	u_quad_t ifs6_in_mldreport;
-	/* ipv6IfIcmpInGroupMembReductions, # of input MLD done */
-	u_quad_t ifs6_in_mlddone;
-
-	/*
-	 * Output statistics. We should solve unresolved routing problem...
-	 */
-	/* ipv6IfIcmpOutMsgs, total # of output messages */
-	u_quad_t ifs6_out_msg;
-	/* ipv6IfIcmpOutErrors, # of output error messages */
-	u_quad_t ifs6_out_error;
-	/* ipv6IfIcmpOutDestUnreachs, # of output dest unreach errors */
-	u_quad_t ifs6_out_dstunreach;
-	/* ipv6IfIcmpOutAdminProhibs, # of output administratively prohibited errs */
-	u_quad_t ifs6_out_adminprohib;
-	/* ipv6IfIcmpOutTimeExcds, # of output time exceeded errors */
-	u_quad_t ifs6_out_timeexceed;
-	/* ipv6IfIcmpOutParmProblems, # of output parameter problem errors */
-	u_quad_t ifs6_out_paramprob;
-	/* ipv6IfIcmpOutPktTooBigs, # of output packet too big errors */
-	u_quad_t ifs6_out_pkttoobig;
-	/* ipv6IfIcmpOutEchos, # of output echo requests */
-	u_quad_t ifs6_out_echo;
-	/* ipv6IfIcmpOutEchoReplies, # of output echo replies */
-	u_quad_t ifs6_out_echoreply;
-	/* ipv6IfIcmpOutRouterSolicits, # of output router solicitations */
-	u_quad_t ifs6_out_routersolicit;
-	/* ipv6IfIcmpOutRouterAdvertisements, # of output router advertisements */
-	u_quad_t ifs6_out_routeradvert;
-	/* ipv6IfIcmpOutNeighborSolicits, # of output neighbor solicitations */
-	u_quad_t ifs6_out_neighborsolicit;
-	/* ipv6IfIcmpOutNeighborAdvertisements, # of output neighbor advertisements */
-	u_quad_t ifs6_out_neighboradvert;
-	/* ipv6IfIcmpOutRedirects, # of output redirects */
-	u_quad_t ifs6_out_redirect;
-	/* ipv6IfIcmpOutGroupMembQueries, # of output MLD queries */
-	u_quad_t ifs6_out_mldquery;
-	/* ipv6IfIcmpOutGroupMembResponses, # of output MLD reports */
-	u_quad_t ifs6_out_mldreport;
-	/* ipv6IfIcmpOutGroupMembReductions, # of output MLD done */
-	u_quad_t ifs6_out_mlddone;
-};
-
-struct	in6_ifreq {
-	char	ifr_name[IFNAMSIZ];
-	union {
-		struct	sockaddr_in6 ifru_addr;
-		struct	sockaddr_in6 ifru_dstaddr;
-		short	ifru_flags;
-		int	ifru_flags6;
-		int	ifru_metric;
-		caddr_t	ifru_data;
-		struct in6_addrlifetime ifru_lifetime;
-		struct in6_ifstat ifru_stat;
-		struct icmp6_ifstat ifru_icmp6stat;
-		u_int32_t ifru_scope_id[16];
-	} ifr_ifru;
-};
-
-struct	in6_aliasreq {
-	char	ifra_name[IFNAMSIZ];
-	struct	sockaddr_in6 ifra_addr;
-	struct	sockaddr_in6 ifra_dstaddr;
-	struct	sockaddr_in6 ifra_prefixmask;
-	int	ifra_flags;
-	struct in6_addrlifetime ifra_lifetime;
-};
-
-/* prefix type macro */
-#define IN6_PREFIX_ND	1
-#define IN6_PREFIX_RR	2
-
-/*
- * prefix related flags passed between kernel(NDP related part) and
- * user land command(ifconfig) and daemon(rtadvd).
- */
-struct in6_prflags {
-	struct prf_ra {
-		u_char onlink : 1;
-		u_char autonomous : 1;
-		u_char reserved : 6;
-	} prf_ra;
-	u_char prf_reserved1;
-	u_short prf_reserved2;
-	/* want to put this on 4byte offset */
-	struct prf_rr {
-		u_char decrvalid : 1;
-		u_char decrprefd : 1;
-		u_char reserved : 6;
-	} prf_rr;
-	u_char prf_reserved3;
-	u_short prf_reserved4;
-};
-
-struct  in6_prefixreq {
-	char	ipr_name[IFNAMSIZ];
-	u_char	ipr_origin;
-	u_char	ipr_plen;
-	u_int32_t ipr_vltime;
-	u_int32_t ipr_pltime;
-	struct in6_prflags ipr_flags;
-	struct	sockaddr_in6 ipr_prefix;
-};
-
-#define PR_ORIG_RA	0
-#define PR_ORIG_RR	1
-#define PR_ORIG_STATIC	2
-#define PR_ORIG_KERNEL	3
-
-#define ipr_raf_onlink		ipr_flags.prf_ra.onlink
-#define ipr_raf_auto		ipr_flags.prf_ra.autonomous
-
-#define ipr_statef_onlink	ipr_flags.prf_state.onlink
-
-#define ipr_rrf_decrvalid	ipr_flags.prf_rr.decrvalid
-#define ipr_rrf_decrprefd	ipr_flags.prf_rr.decrprefd
-
-struct	in6_rrenumreq {
-	char	irr_name[IFNAMSIZ];
-	u_char	irr_origin;
-	u_char	irr_m_len;	/* match len for matchprefix */
-	u_char	irr_m_minlen;	/* minlen for matching prefix */
-	u_char	irr_m_maxlen;	/* maxlen for matching prefix */
-	u_char	irr_u_uselen;	/* uselen for adding prefix */
-	u_char	irr_u_keeplen;	/* keeplen from matching prefix */
-	struct irr_raflagmask {
-		u_char onlink : 1;
-		u_char autonomous : 1;
-		u_char reserved : 6;
-	} irr_raflagmask;
-	u_int32_t irr_vltime;
-	u_int32_t irr_pltime;
-	struct in6_prflags irr_flags;
-	struct	sockaddr_in6 irr_matchprefix;
-	struct	sockaddr_in6 irr_useprefix;
-};
-
-#define irr_raf_mask_onlink	irr_raflagmask.onlink
-#define irr_raf_mask_auto	irr_raflagmask.autonomous
-#define irr_raf_mask_reserved	irr_raflagmask.reserved
-
-#define irr_raf_onlink		irr_flags.prf_ra.onlink
-#define irr_raf_auto		irr_flags.prf_ra.autonomous
-
-#define irr_statef_onlink	irr_flags.prf_state.onlink
-
-#define irr_rrf			irr_flags.prf_rr
-#define irr_rrf_decrvalid	irr_flags.prf_rr.decrvalid
-#define irr_rrf_decrprefd	irr_flags.prf_rr.decrprefd
-
-/*
- * Given a pointer to an in6_ifaddr (ifaddr),
- * return a pointer to the addr as a sockaddr_in6
- */
-#define IA6_IN6(ia)	(&((ia)->ia_addr.sin6_addr))
-#define IA6_DSTIN6(ia)	(&((ia)->ia_dstaddr.sin6_addr))
-#define IA6_MASKIN6(ia)	(&((ia)->ia_prefixmask.sin6_addr))
-#define IA6_SIN6(ia)	(&((ia)->ia_addr))
-#define IA6_DSTSIN6(ia)	(&((ia)->ia_dstaddr))
-#define IFA_IN6(x)	(&((struct sockaddr_in6 *)((x)->ifa_addr))->sin6_addr)
-#define IFA_DSTIN6(x)	(&((struct sockaddr_in6 *)((x)->ifa_dstaddr))->sin6_addr)
-
-#define IFPR_IN6(x)	(&((struct sockaddr_in6 *)((x)->ifpr_prefix))->sin6_addr)
-
-#ifdef _KERNEL
-#define IN6_ARE_MASKED_ADDR_EQUAL(d, a, m)	(	\
-	(((d)->s6_addr32[0] ^ (a)->s6_addr32[0]) & (m)->s6_addr32[0]) == 0 && \
-	(((d)->s6_addr32[1] ^ (a)->s6_addr32[1]) & (m)->s6_addr32[1]) == 0 && \
-	(((d)->s6_addr32[2] ^ (a)->s6_addr32[2]) & (m)->s6_addr32[2]) == 0 && \
-	(((d)->s6_addr32[3] ^ (a)->s6_addr32[3]) & (m)->s6_addr32[3]) == 0 )
-#endif
-
-#define SIOCSIFADDR_IN6		 _IOW('i', 12, struct in6_ifreq)
-#define SIOCGIFADDR_IN6		_IOWR('i', 33, struct in6_ifreq)
-
-#ifdef _KERNEL
-/*
- * SIOCSxxx ioctls should be unused (see comments in in6.c), but
- * we do not shift numbers for binary compatibility.
- */
-#define SIOCSIFDSTADDR_IN6	 _IOW('i', 14, struct in6_ifreq)
-#define SIOCSIFNETMASK_IN6	 _IOW('i', 22, struct in6_ifreq)
-#endif
-
-#define SIOCGIFDSTADDR_IN6	_IOWR('i', 34, struct in6_ifreq)
-#define SIOCGIFNETMASK_IN6	_IOWR('i', 37, struct in6_ifreq)
-
-#define SIOCDIFADDR_IN6		 _IOW('i', 25, struct in6_ifreq)
-#define SIOCAIFADDR_IN6		 _IOW('i', 26, struct in6_aliasreq)
-
-#define SIOCSIFPHYADDR_IN6       _IOW('i', 70, struct in6_aliasreq)
-#define	SIOCGIFPSRCADDR_IN6	_IOWR('i', 71, struct in6_ifreq)
-#define	SIOCGIFPDSTADDR_IN6	_IOWR('i', 72, struct in6_ifreq)
-
-#define SIOCGIFAFLAG_IN6	_IOWR('i', 73, struct in6_ifreq)
-
-#define SIOCGDRLST_IN6		_IOWR('i', 74, struct in6_drlist)
-#define SIOCGPRLST_IN6		_IOWR('i', 75, struct in6_prlist)
-#ifdef _KERNEL
-#define OSIOCGIFINFO_IN6	_IOWR('i', 76, struct in6_ondireq)
-#endif
-#define SIOCGIFINFO_IN6		_IOWR('i', 108, struct in6_ndireq)
-#define SIOCSNDFLUSH_IN6	_IOWR('i', 77, struct in6_ifreq)
-#define SIOCGNBRINFO_IN6	_IOWR('i', 78, struct in6_nbrinfo)
-#define SIOCSPFXFLUSH_IN6	_IOWR('i', 79, struct in6_ifreq)
-#define SIOCSRTRFLUSH_IN6	_IOWR('i', 80, struct in6_ifreq)
-
-#define SIOCGIFALIFETIME_IN6	_IOWR('i', 81, struct in6_ifreq)
-#define SIOCSIFALIFETIME_IN6	_IOWR('i', 82, struct in6_ifreq)
-#define SIOCGIFSTAT_IN6		_IOWR('i', 83, struct in6_ifreq)
-#define SIOCGIFSTAT_ICMP6	_IOWR('i', 84, struct in6_ifreq)
-
-#define SIOCSDEFIFACE_IN6	_IOWR('i', 85, struct in6_ndifreq)
-#define SIOCGDEFIFACE_IN6	_IOWR('i', 86, struct in6_ndifreq)
-
-#define SIOCSIFINFO_FLAGS	_IOWR('i', 87, struct in6_ndireq) /* XXX */
-
-#define SIOCSSCOPE6		_IOW('i', 88, struct in6_ifreq)
-#define SIOCGSCOPE6		_IOWR('i', 89, struct in6_ifreq)
-#define SIOCGSCOPE6DEF		_IOWR('i', 90, struct in6_ifreq)
-
-#define SIOCSIFPREFIX_IN6	_IOW('i', 100, struct in6_prefixreq) /* set */
-#define SIOCGIFPREFIX_IN6	_IOWR('i', 101, struct in6_prefixreq) /* get */
-#define SIOCDIFPREFIX_IN6	_IOW('i', 102, struct in6_prefixreq) /* del */
-#define SIOCAIFPREFIX_IN6	_IOW('i', 103, struct in6_rrenumreq) /* add */
-#define SIOCCIFPREFIX_IN6	_IOW('i', 104, \
-				     struct in6_rrenumreq) /* change */
-#define SIOCSGIFPREFIX_IN6	_IOW('i', 105, \
-				     struct in6_rrenumreq) /* set global */
-
-#define SIOCGETSGCNT_IN6	_IOWR('u', 106, \
-				      struct sioc_sg_req6) /* get s,g pkt cnt */
-#define SIOCGETMIFCNT_IN6	_IOWR('u', 107, \
-				      struct sioc_mif_req6) /* get pkt cnt per if */
-
-#define IN6_IFF_ANYCAST		0x01	/* anycast address */
-#define IN6_IFF_TENTATIVE	0x02	/* tentative address */
-#define IN6_IFF_DUPLICATED	0x04	/* DAD detected duplicate */
-#define IN6_IFF_DETACHED	0x08	/* may be detached from the link */
-#define IN6_IFF_DEPRECATED	0x10	/* deprecated address */
-#define IN6_IFF_NODAD		0x20	/* don't perform DAD on this address
-					 * (used only at first SIOC* call)
-					 */
-#define IN6_IFF_AUTOCONF	0x40	/* autoconfigurable address. */
-#define IN6_IFF_TEMPORARY	0x80	/* temporary (anonymous) address. */
-#define IN6_IFF_NOPFX		0x8000	/* skip kernel prefix management.
-					 * XXX: this should be temporary.
-					 */
-
-/* do not input/output */
-#define IN6_IFF_NOTREADY (IN6_IFF_TENTATIVE|IN6_IFF_DUPLICATED)
-
-#ifdef _KERNEL
-#define IN6_ARE_SCOPE_CMP(a,b) ((a)-(b))
-#define IN6_ARE_SCOPE_EQUAL(a,b) ((a)==(b))
-#endif
-
-#ifdef _KERNEL
-extern struct in6_ifaddr *in6_ifaddr;
-
-extern struct in6_ifstat **in6_ifstat;
-extern size_t in6_ifstatmax;
-extern struct icmp6stat icmp6stat;
-extern struct icmp6_ifstat **icmp6_ifstat;
-extern size_t icmp6_ifstatmax;
-#define in6_ifstat_inc(ifp, tag) \
-do {								\
-	if ((ifp) && (ifp)->if_index <= if_index		\
-	 && (ifp)->if_index < in6_ifstatmax			\
-	 && in6_ifstat && in6_ifstat[(ifp)->if_index]) {	\
-		in6_ifstat[(ifp)->if_index]->tag++;		\
-	}							\
-} while (0)
-
-extern struct ifqueue ip6intrq;		/* IP6 packet input queue */
-extern struct in6_addr zeroin6_addr;
-extern u_char inet6ctlerrmap[];
-extern unsigned long in6_maxmtu;
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_IPMADDR);
-#endif
-
-/*
- * Macro for finding the internet address structure (in6_ifaddr) corresponding
- * to a given interface (ifnet structure).
- */
-
-#define IFP_TO_IA6(ifp, ia)				\
-/* struct ifnet *ifp; */				\
-/* struct in6_ifaddr *ia; */				\
-do {									\
-	struct ifaddr *ifa;						\
-	for (ifa = (ifp)->if_addrlist.tqh_first; ifa; ifa = ifa->ifa_list.tqe_next) {	\
-		if (!ifa->ifa_addr)					\
-			continue;					\
-		if (ifa->ifa_addr->sa_family == AF_INET6)		\
-			break;						\
-	}								\
-	(ia) = (struct in6_ifaddr *)ifa;				\
-} while (0)
-
-#endif /* _KERNEL */
-
-/*
- * Multi-cast membership entry.  One for each group/ifp that a PCB
- * belongs to.
- */
-struct in6_multi_mship {
-	struct	in6_multi *i6mm_maddr;	/* Multicast address pointer */
-	LIST_ENTRY(in6_multi_mship) i6mm_chain;  /* multicast options chain */
-};
-
-struct	in6_multi {
-	LIST_ENTRY(in6_multi) in6m_entry; /* list glue */
-	struct	in6_addr in6m_addr;	/* IP6 multicast address */
-	struct	ifnet *in6m_ifp;	/* back pointer to ifnet */
-	struct	ifmultiaddr *in6m_ifma;	/* back pointer to ifmultiaddr */
-	u_int	in6m_refcount;		/* # membership claims by sockets */
-	u_int	in6m_state;		/* state of the membership */
-	u_int	in6m_timer;		/* MLD6 listener report timer */
-};
-
-#ifdef _KERNEL
-extern LIST_HEAD(in6_multihead, in6_multi) in6_multihead;
-
-/*
- * Structure used by macros below to remember position when stepping through
- * all of the in6_multi records.
- */
-struct	in6_multistep {
-	struct	in6_ifaddr *i_ia;
-	struct	in6_multi *i_in6m;
-};
-
-/*
- * Macros for looking up the in6_multi record for a given IP6 multicast
- * address on a given interface. If no matching record is found, "in6m"
- * returns NLL.
- */
-
-#define IN6_LOOKUP_MULTI(addr, ifp, in6m)			\
-/* struct in6_addr addr; */					\
-/* struct ifnet *ifp; */					\
-/* struct in6_multi *in6m; */					\
-do { \
-	struct ifmultiaddr *ifma; \
-	TAILQ_FOREACH(ifma, &(ifp)->if_multiaddrs, ifma_link) { \
-		if (ifma->ifma_addr->sa_family == AF_INET6 \
-		    && IN6_ARE_ADDR_EQUAL(&((struct sockaddr_in6 *)ifma->ifma_addr)->sin6_addr, \
-					  &(addr))) \
-			break; \
-	} \
-	(in6m) = (struct in6_multi *)(ifma ? ifma->ifma_protospec : 0); \
-} while(0)
-
-/*
- * Macro to step through all of the in6_multi records, one at a time.
- * The current position is remembered in "step", which the caller must
- * provide.  IN6_FIRST_MULTI(), below, must be called to initialize "step"
- * and get the first record.  Both macros return a NULL "in6m" when there
- * are no remaining records.
- */
-#define IN6_NEXT_MULTI(step, in6m)					\
-/* struct in6_multistep step; */					\
-/* struct in6_multi *in6m; */						\
-do { \
-	if (((in6m) = (step).i_in6m) != NULL) \
-		(step).i_in6m = (step).i_in6m->in6m_entry.le_next; \
-} while(0)
-
-#define IN6_FIRST_MULTI(step, in6m)		\
-/* struct in6_multistep step; */		\
-/* struct in6_multi *in6m */			\
-do { \
-	(step).i_in6m = in6_multihead.lh_first; \
-		IN6_NEXT_MULTI((step), (in6m)); \
-} while(0)
-
-struct	in6_multi *in6_addmulti __P((struct in6_addr *, struct ifnet *,
-				     int *));
-void	in6_delmulti __P((struct in6_multi *));
-extern int in6_ifindex2scopeid __P((int));
-extern int in6_mask2len __P((struct in6_addr *, u_char *));
-extern void in6_len2mask __P((struct in6_addr *, int));
-int	in6_control __P((struct socket *,
-			 u_long, caddr_t, struct ifnet *, struct thread *));
-int	in6_update_ifa __P((struct ifnet *, struct in6_aliasreq *,
-			    struct in6_ifaddr *));
-void	in6_purgeaddr __P((struct ifaddr *));
-int	in6if_do_dad __P((struct ifnet *));
-void	in6_purgeif __P((struct ifnet *));
-void	in6_savemkludge __P((struct in6_ifaddr *));
-void	in6_setmaxmtu   __P((void));
-void	in6_restoremkludge __P((struct in6_ifaddr *, struct ifnet *));
-void	in6_purgemkludge __P((struct ifnet *));
-struct in6_ifaddr *in6ifa_ifpforlinklocal __P((struct ifnet *, int));
-struct in6_ifaddr *in6ifa_ifpwithaddr __P((struct ifnet *,
-					     struct in6_addr *));
-char	*ip6_sprintf __P((const struct in6_addr *));
-int	in6_addr2scopeid __P((struct ifnet *, struct in6_addr *));
-int	in6_matchlen __P((struct in6_addr *, struct in6_addr *));
-int	in6_are_prefix_equal __P((struct in6_addr *p1, struct in6_addr *p2,
-				  int len));
-void	in6_prefixlen2mask __P((struct in6_addr *maskp, int len));
-int	in6_prefix_ioctl __P((struct socket *so, u_long cmd, caddr_t data,
-			      struct ifnet *ifp));
-int	in6_prefix_add_ifid __P((int iilen, struct in6_ifaddr *ia));
-void	in6_prefix_remove_ifid __P((int iilen, struct in6_ifaddr *ia));
-void	in6_purgeprefix __P((struct ifnet *));
-
-int	in6_is_addr_deprecated __P((struct sockaddr_in6 *));
-struct inpcb;
-int in6_embedscope __P((struct in6_addr *, const struct sockaddr_in6 *,
-	struct inpcb *, struct ifnet **));
-int in6_recoverscope __P((struct sockaddr_in6 *, const struct in6_addr *,
-	struct ifnet *));
-void in6_clearscope __P((struct in6_addr *));
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_IN6_VAR_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/ip6.h b/newlib/libc/sys/linux/include/netinet6/ip6.h
deleted file mode 100644
index 528ff7c..0000000
--- a/newlib/libc/sys/linux/include/netinet6/ip6.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ip6.h,v 1.5 2000/07/04 16:35:09 itojun Exp $	*/
-/*	$KAME: ip6.h,v 1.7 2000/03/25 07:23:36 sumikawa Exp $	*/
-
-#error "netinet6/ip6.h is obsolete.  use netinet/ip6.h"
diff --git a/newlib/libc/sys/linux/include/netinet6/ip6_ecn.h b/newlib/libc/sys/linux/include/netinet6/ip6_ecn.h
deleted file mode 100644
index f7b762d..0000000
--- a/newlib/libc/sys/linux/include/netinet6/ip6_ecn.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ip6_ecn.h,v 1.4 2001/06/11 12:39:05 ume Exp $	*/
-/*	$KAME: ip_ecn.h,v 1.5 2000/03/27 04:58:38 sumikawa Exp $	*/
-
-/*
- * Copyright (C) 1999 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-/*
- * ECN consideration on tunnel ingress/egress operation.
- * http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt
- */
-
-#ifdef _KERNEL
-extern void ip6_ecn_ingress __P((int, u_int32_t *, const u_int32_t *));
-extern void ip6_ecn_egress __P((int, const u_int32_t *, u_int32_t *));
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet6/ip6_fw.h b/newlib/libc/sys/linux/include/netinet6/ip6_fw.h
deleted file mode 100644
index ee3aa81..0000000
--- a/newlib/libc/sys/linux/include/netinet6/ip6_fw.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ip6_fw.h,v 1.12 2002/04/19 04:46:22 suz Exp $	*/
-/*	$KAME: ip6_fw.h,v 1.9 2001/08/01 04:29:57 sumikawa Exp $	*/
-
-/*
- * Copyright (C) 1998, 1999, 2000 and 2001 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1993 Daniel Boulet
- * Copyright (c) 1994 Ugen J.S.Antsilevich
- *
- * Redistribution and use in source forms, with and without modification,
- * are permitted provided that this entire comment appears intact.
- *
- * Redistribution in binary form may occur without any restrictions.
- * Obviously, it would be nice if you gave credit where credit is due
- * but requiring it would be too onerous.
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- *
- */
-
-#ifndef _IP6_FW_H
-#define _IP6_FW_H
-
-#include <net/if.h>
-
-/*
- * This union structure identifies an interface, either explicitly
- * by name or implicitly by IP address. The flags IP_FW_F_IIFNAME
- * and IP_FW_F_OIFNAME say how to interpret this structure. An
- * interface unit number of -1 matches any unit number, while an
- * IP address of 0.0.0.0 indicates matches any interface.
- *
- * The receive and transmit interfaces are only compared against the
- * the packet if the corresponding bit (IP_FW_F_IIFACE or IP_FW_F_OIFACE)
- * is set. Note some packets lack a receive or transmit interface
- * (in which case the missing "interface" never matches).
- */
-
-union ip6_fw_if {
-    struct in6_addr fu_via_ip6;	/* Specified by IPv6 address */
-    struct {			/* Specified by interface name */
-#define IP6FW_IFNLEN     IFNAMSIZ
-	    char  name[IP6FW_IFNLEN];
-	    short unit;		/* -1 means match any unit */
-    } fu_via_if;
-};
-
-/*
- * Format of an IP firewall descriptor
- *
- * fw_src, fw_dst, fw_smsk, fw_dmsk are always stored in network byte order.
- * fw_flg and fw_n*p are stored in host byte order (of course).
- * Port numbers are stored in HOST byte order.
- * Warning: setsockopt() will fail if sizeof(struct ip_fw) > MLEN (108)
- */
-
-struct ip6_fw {
-    u_long fw_pcnt,fw_bcnt;		/* Packet and byte counters */
-    struct in6_addr fw_src, fw_dst;	/* Source and destination IPv6 addr */
-    struct in6_addr fw_smsk, fw_dmsk;	/* Mask for src and dest IPv6 addr */
-    u_short fw_number;			/* Rule number */
-    u_short fw_flg;			/* Flags word */
-#define IPV6_FW_MAX_PORTS	10	/* A reasonable maximum */
-    u_int fw_ipflg;			/* IP flags word */
-    u_short fw_pts[IPV6_FW_MAX_PORTS];	/* Array of port numbers to match */
-    u_char fw_ip6opt,fw_ip6nopt;	/* IPv6 options set/unset */
-    u_char fw_tcpf,fw_tcpnf;		/* TCP flags set/unset */
-#define IPV6_FW_ICMPTYPES_DIM (256 / (sizeof(unsigned) * 8))
-    unsigned fw_icmp6types[IPV6_FW_ICMPTYPES_DIM]; /* ICMP types bitmap */
-    long timestamp;			/* timestamp (tv_sec) of last match */
-    union ip6_fw_if fw_in_if, fw_out_if;/* Incoming and outgoing interfaces */
-    union {
-	u_short fu_divert_port;		/* Divert/tee port (options IP6DIVERT) */
-	u_short fu_skipto_rule;		/* SKIPTO command rule number */
-	u_short fu_reject_code;		/* REJECT response code */
-    } fw_un;
-    u_char fw_prot;			/* IPv6 protocol */
-    u_char fw_nports;			/* N'of src ports and # of dst ports */
-					/* in ports array (dst ports follow */
-					/* src ports; max of 10 ports in all; */
-					/* count of 0 means match all ports) */
-};
-
-#define IPV6_FW_GETNSRCP(rule)		((rule)->fw_nports & 0x0f)
-#define IPV6_FW_SETNSRCP(rule, n)		do {				\
-					  (rule)->fw_nports &= ~0x0f;	\
-					  (rule)->fw_nports |= (n);	\
-					} while (0)
-#define IPV6_FW_GETNDSTP(rule)		((rule)->fw_nports >> 4)
-#define IPV6_FW_SETNDSTP(rule, n)		do {				\
-					  (rule)->fw_nports &= ~0xf0;	\
-					  (rule)->fw_nports |= (n) << 4;\
-					} while (0)
-
-#define fw_divert_port	fw_un.fu_divert_port
-#define fw_skipto_rule	fw_un.fu_skipto_rule
-#define fw_reject_code	fw_un.fu_reject_code
-
-struct ip6_fw_chain {
-        LIST_ENTRY(ip6_fw_chain) chain;
-        struct ip6_fw    *rule;
-};
-
-/*
- * Values for "flags" field .
- */
-#define IPV6_FW_F_IN	0x0001	/* Check inbound packets		*/
-#define IPV6_FW_F_OUT	0x0002	/* Check outbound packets		*/
-#define IPV6_FW_F_IIFACE	0x0004	/* Apply inbound interface test		*/
-#define IPV6_FW_F_OIFACE	0x0008	/* Apply outbound interface test	*/
-
-#define IPV6_FW_F_COMMAND 0x0070	/* Mask for type of chain entry:	*/
-#define IPV6_FW_F_DENY	0x0000	/* This is a deny rule			*/
-#define IPV6_FW_F_REJECT	0x0010	/* Deny and send a response packet	*/
-#define IPV6_FW_F_ACCEPT	0x0020	/* This is an accept rule		*/
-#define IPV6_FW_F_COUNT	0x0030	/* This is a count rule			*/
-#define IPV6_FW_F_DIVERT	0x0040	/* This is a divert rule		*/
-#define IPV6_FW_F_TEE	0x0050	/* This is a tee rule			*/
-#define IPV6_FW_F_SKIPTO	0x0060	/* This is a skipto rule		*/
-
-#define IPV6_FW_F_PRN	0x0080	/* Print if this rule matches		*/
-
-#define IPV6_FW_F_SRNG	0x0100	/* The first two src ports are a min	*
-				 * and max range (stored in host byte	*
-				 * order).				*/
-
-#define IPV6_FW_F_DRNG	0x0200	/* The first two dst ports are a min	*
-				 * and max range (stored in host byte	*
-				 * order).				*/
-
-#define IPV6_FW_F_IIFNAME	0x0400	/* In interface by name/unit (not IP)	*/
-#define IPV6_FW_F_OIFNAME	0x0800	/* Out interface by name/unit (not IP)	*/
-
-#define IPV6_FW_F_INVSRC	0x1000	/* Invert sense of src check		*/
-#define IPV6_FW_F_INVDST	0x2000	/* Invert sense of dst check		*/
-
-#define IPV6_FW_F_FRAG	0x4000	/* Fragment				*/
-
-#define IPV6_FW_F_ICMPBIT 0x8000	/* ICMP type bitmap is valid		*/
-
-#define IPV6_FW_F_MASK	0xFFFF	/* All possible flag bits mask		*/
-
-/* 
- * Flags for the 'fw_ipflg' field, for comparing values of ip and its protocols. */
-#define	IPV6_FW_IF_TCPEST 0x00000020	/* established TCP connection	*/
-#define IPV6_FW_IF_TCPMSK 0x00000020	/* mask of all TCP values */
-
-/*
- * For backwards compatibility with rules specifying "via iface" but
- * not restricted to only "in" or "out" packets, we define this combination
- * of bits to represent this configuration.
- */
-
-#define IF6_FW_F_VIAHACK	(IPV6_FW_F_IN|IPV6_FW_F_OUT|IPV6_FW_F_IIFACE|IPV6_FW_F_OIFACE)
-
-/*
- * Definitions for REJECT response codes.
- * Values less than 256 correspond to ICMP unreachable codes.
- */
-#define IPV6_FW_REJECT_RST	0x0100		/* TCP packets: send RST */
-
-/*
- * Definitions for IPv6 option names.
- */
-#define IPV6_FW_IP6OPT_HOPOPT	0x01
-#define IPV6_FW_IP6OPT_ROUTE	0x02
-#define IPV6_FW_IP6OPT_FRAG	0x04
-#define IPV6_FW_IP6OPT_ESP	0x08
-#define IPV6_FW_IP6OPT_AH	0x10
-#define IPV6_FW_IP6OPT_NONXT	0x20
-#define IPV6_FW_IP6OPT_OPTS	0x40
-
-/*
- * Definitions for TCP flags.
- */
-#define IPV6_FW_TCPF_FIN	TH_FIN
-#define IPV6_FW_TCPF_SYN	TH_SYN
-#define IPV6_FW_TCPF_RST	TH_RST
-#define IPV6_FW_TCPF_PSH	TH_PUSH
-#define IPV6_FW_TCPF_ACK	TH_ACK
-#define IPV6_FW_TCPF_URG	TH_URG
-
-/*
- * Main firewall chains definitions and global var's definitions.
- */
-#ifdef _KERNEL
-
-/*
- * Function definitions.
- */
-void ip6_fw_init(void);
-
-/* Firewall hooks */
-struct ip6_hdr;
-typedef	int ip6_fw_chk_t __P((struct ip6_hdr**, struct ifnet*,
-				u_short *, struct mbuf**));
-typedef	int ip6_fw_ctl_t __P((int, struct mbuf**));
-extern	ip6_fw_chk_t *ip6_fw_chk_ptr;
-extern	ip6_fw_ctl_t *ip6_fw_ctl_ptr;
-extern	int ip6_fw_enable;
-
-#endif /* _KERNEL */
-
-#endif /* _IP6_FW_H */
diff --git a/newlib/libc/sys/linux/include/netinet6/ip6_mroute.h b/newlib/libc/sys/linux/include/netinet6/ip6_mroute.h
deleted file mode 100644
index 0cd915c..0000000
--- a/newlib/libc/sys/linux/include/netinet6/ip6_mroute.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ip6_mroute.h,v 1.5 2002/04/19 04:46:23 suz Exp $	*/
-/*	$KAME: ip6_mroute.h,v 1.19 2001/06/14 06:12:55 suz Exp $	*/
-
-/*
- * Copyright (C) 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*	BSDI ip_mroute.h,v 2.5 1996/10/11 16:01:48 pjd Exp	*/
-
-/*
- * Definitions for IP multicast forwarding.
- *
- * Written by David Waitzman, BBN Labs, August 1988.
- * Modified by Steve Deering, Stanford, February 1989.
- * Modified by Ajit Thyagarajan, PARC, August 1993.
- * Modified by Ajit Thyagarajan, PARC, August 1994.
- * Modified by Ahmed Helmy, USC, September 1996.
- *
- * MROUTING Revision: 1.2
- */
-
-#ifndef _NETINET6_IP6_MROUTE_H_
-#define _NETINET6_IP6_MROUTE_H_
-
-/*
- * Multicast Routing set/getsockopt commands.
- */
-#ifdef _KERNEL
-#define MRT6_OINIT		100	/* initialize forwarder (omrt6msg) */
-#endif
-#define MRT6_DONE		101	/* shut down forwarder */
-#define MRT6_ADD_MIF		102	/* add multicast interface */
-#define MRT6_DEL_MIF		103	/* delete multicast interface */
-#define MRT6_ADD_MFC		104	/* insert forwarding cache entry */
-#define MRT6_DEL_MFC		105	/* delete forwarding cache entry */
-#define MRT6_PIM                107     /* enable pim code */
-#define MRT6_INIT		108	/* initialize forwarder (mrt6msg) */
-
-#if BSD >= 199103
-#define GET_TIME(t)	microtime(&t)
-#elif defined(sun)
-#define GET_TIME(t)	uniqtime(&t)
-#else
-#define GET_TIME(t)	((t) = time)
-#endif
-
-/*
- * Types and macros for handling bitmaps with one bit per multicast interface.
- */
-typedef u_short mifi_t;		/* type of a mif index */
-#define MAXMIFS		64
-
-#ifndef	IF_SETSIZE
-#define	IF_SETSIZE	256
-#endif
-
-typedef	u_int32_t	if_mask;
-#define	NIFBITS	(sizeof(if_mask) * NBBY)	/* bits per mask */
-
-#ifndef howmany
-#define	howmany(x, y)	(((x) + ((y) - 1)) / (y))
-#endif
-
-typedef	struct if_set {
-	if_mask	ifs_bits[howmany(IF_SETSIZE, NIFBITS)];
-} if_set;
-
-#define	IF_SET(n, p)	((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS)))
-#define	IF_CLR(n, p)	((p)->ifs_bits[(n)/NIFBITS] &= ~(1 << ((n) % NIFBITS)))
-#define	IF_ISSET(n, p)	((p)->ifs_bits[(n)/NIFBITS] & (1 << ((n) % NIFBITS)))
-#define	IF_COPY(f, t)	bcopy(f, t, sizeof(*(f)))
-#define	IF_ZERO(p)	bzero(p, sizeof(*(p)))
-
-/*
- * Argument structure for MRT6_ADD_IF.
- */
-struct mif6ctl {
-	mifi_t	    mif6c_mifi;	    	/* the index of the mif to be added  */
-	u_char	    mif6c_flags;     	/* MIFF_ flags defined below         */
-	u_short	    mif6c_pifi;		/* the index of the physical IF */
-#ifdef notyet
-	u_int	    mif6c_rate_limit;    /* max rate           		     */
-#endif
-};
-
-#define	MIFF_REGISTER	0x1	/* mif represents a register end-point */
-
-/*
- * Argument structure for MRT6_ADD_MFC and MRT6_DEL_MFC
- */
-struct mf6cctl {
-	struct sockaddr_in6 mf6cc_origin;	/* IPv6 origin of mcasts */
-	struct sockaddr_in6 mf6cc_mcastgrp; /* multicast group associated */
-	mifi_t		mf6cc_parent;	/* incoming ifindex */
-	struct if_set	mf6cc_ifset;	/* set of forwarding ifs */
-};
-
-/*
- * The kernel's multicast routing statistics.
- */
-struct mrt6stat {
-	u_quad_t mrt6s_mfc_lookups;	/* # forw. cache hash table hits   */
-	u_quad_t mrt6s_mfc_misses;	/* # forw. cache hash table misses */
-	u_quad_t mrt6s_upcalls;		/* # calls to mrouted              */
-	u_quad_t mrt6s_no_route;	/* no route for packet's origin    */
-	u_quad_t mrt6s_bad_tunnel;	/* malformed tunnel options        */
-	u_quad_t mrt6s_cant_tunnel;	/* no room for tunnel options      */
-	u_quad_t mrt6s_wrong_if;	/* arrived on wrong interface	   */
-	u_quad_t mrt6s_upq_ovflw;	/* upcall Q overflow		   */
-	u_quad_t mrt6s_cache_cleanups;	/* # entries with no upcalls 	   */
-	u_quad_t mrt6s_drop_sel;     	/* pkts dropped selectively        */
-	u_quad_t mrt6s_q_overflow;    	/* pkts dropped - Q overflow       */
-	u_quad_t mrt6s_pkt2large;     	/* pkts dropped - size > BKT SIZE  */
-	u_quad_t mrt6s_upq_sockfull;	/* upcalls dropped - socket full   */
-};
-
-#ifdef MRT6_OINIT
-/*
- * Struct used to communicate from kernel to multicast router
- * note the convenient similarity to an IPv6 header.
- * XXX old version, superseded by mrt6msg.
- */
-struct omrt6msg {
-	u_long	    unused1;
-	u_char	    im6_msgtype;		/* what type of message	    */
-#if 0
-#define MRT6MSG_NOCACHE	1
-#define MRT6MSG_WRONGMIF	2
-#define MRT6MSG_WHOLEPKT	3		/* used for user level encap*/
-#endif
-	u_char	    im6_mbz;			/* must be zero		    */
-	u_char	    im6_mif;			/* mif rec'd on		    */
-	u_char	    unused2;
-	struct in6_addr  im6_src, im6_dst;
-};
-#endif
-
-/*
- * Structure used to communicate from kernel to multicast router.
- * We'll overlay the structure onto an MLD header (not an IPv6 header
- * like igmpmsg{} used for IPv4 implementation). This is because this
- * structure will be passed via an IPv6 raw socket, on which an application
- * will only receive the payload i.e. the data after the IPv6 header and all
- * the extension headers. (see Section 3 of draft-ietf-ipngwg-2292bis-01)
- */
-struct mrt6msg {
-#define MRT6MSG_NOCACHE		1
-#define MRT6MSG_WRONGMIF	2
-#define MRT6MSG_WHOLEPKT	3		/* used for user level encap*/
-	u_char	    im6_mbz;			/* must be zero		    */
-	u_char	    im6_msgtype;		/* what type of message	    */
-	u_int16_t   im6_mif;			/* mif rec'd on		    */
-	u_int32_t   im6_pad;			/* padding for 64bit arch   */
-	struct in6_addr  im6_src, im6_dst;
-};
-
-/*
- * Argument structure used by multicast routing daemon to get src-grp
- * packet counts
- */
-struct sioc_sg_req6 {
-	struct sockaddr_in6 src;
-	struct sockaddr_in6 grp;
-	u_quad_t pktcnt;
-	u_quad_t bytecnt;
-	u_quad_t wrong_if;
-};
-
-/*
- * Argument structure used by mrouted to get mif pkt counts
- */
-struct sioc_mif_req6 {
-	mifi_t mifi;		/* mif number				*/
-	u_quad_t icount;	/* Input packet count on mif		*/
-	u_quad_t ocount;	/* Output packet count on mif		*/
-	u_quad_t ibytes;	/* Input byte count on mif		*/
-	u_quad_t obytes;	/* Output byte count on mif		*/
-};
-
-#if defined(_KERNEL) || defined(KERNEL)
-/*
- * The kernel's multicast-interface structure.
- */
-struct mif6 {
-        u_char   	m6_flags;     	/* MIFF_ flags defined above         */
-	u_int      	m6_rate_limit; 	/* max rate			     */
-#ifdef notyet
-	struct tbf      *m6_tbf;      	/* token bucket structure at intf.   */
-#endif
-	struct in6_addr	m6_lcl_addr;   	/* local interface address           */
-	struct ifnet    *m6_ifp;     	/* pointer to interface              */
-	u_quad_t	m6_pkt_in;	/* # pkts in on interface            */
-	u_quad_t	m6_pkt_out;	/* # pkts out on interface           */
-	u_quad_t	m6_bytes_in;	/* # bytes in on interface	     */
-	u_quad_t	m6_bytes_out;	/* # bytes out on interface	     */
-	struct route_in6 m6_route;/* cached route if this is a tunnel */
-#ifdef notyet
-	u_int		m6_rsvp_on;	/* RSVP listening on this vif */
-	struct socket   *m6_rsvpd;	/* RSVP daemon socket */
-#endif
-};
-
-/*
- * The kernel's multicast forwarding cache entry structure
- */
-struct mf6c {
-	struct sockaddr_in6  mf6c_origin;	/* IPv6 origin of mcasts     */
-	struct sockaddr_in6  mf6c_mcastgrp;	/* multicast group associated*/
-	mifi_t	    	 mf6c_parent; 		/* incoming IF               */
-	struct if_set	 mf6c_ifset;		/* set of outgoing IFs */
-
-	u_quad_t    	mf6c_pkt_cnt;		/* pkt count for src-grp     */
-	u_quad_t    	mf6c_byte_cnt;		/* byte count for src-grp    */
-	u_quad_t    	mf6c_wrong_if;		/* wrong if for src-grp	     */
-	int	    	mf6c_expire;		/* time to clean entry up    */
-	struct timeval  mf6c_last_assert;	/* last time I sent an assert*/
-	struct rtdetq  *mf6c_stall;		/* pkts waiting for route */
-	struct mf6c    *mf6c_next;		/* hash table linkage */
-};
-
-#define MF6C_INCOMPLETE_PARENT ((mifi_t)-1)
-
-/*
- * Argument structure used for pkt info. while upcall is made
- */
-#ifndef _NETINET_IP_MROUTE_H_
-struct rtdetq {		/* XXX: rtdetq is also defined in ip_mroute.h */
-    struct mbuf 	*m;		/* A copy of the packet	    	    */
-    struct ifnet	*ifp;		/* Interface pkt came in on 	    */
-#ifdef UPCALL_TIMING
-    struct timeval	t;		/* Timestamp */
-#endif /* UPCALL_TIMING */
-    struct rtdetq	*next;
-};
-#endif /* _NETINET_IP_MROUTE_H_ */
-
-#define MF6CTBLSIZ	256
-#if (MF6CTBLSIZ & (MF6CTBLSIZ - 1)) == 0	  /* from sys:route.h */
-#define MF6CHASHMOD(h)	((h) & (MF6CTBLSIZ - 1))
-#else
-#define MF6CHASHMOD(h)	((h) % MF6CTBLSIZ)
-#endif
-
-#define MAX_UPQ6	4		/* max. no of pkts in upcall Q */
-
-int	ip6_mrouter_set __P((struct socket *so, struct sockopt *sopt));
-int	ip6_mrouter_get __P((struct socket *so, struct sockopt *sopt));
-int	ip6_mrouter_done __P((void));
-int	mrt6_ioctl __P((int, caddr_t));
-#endif /* _KERNEL */
-
-#endif /* !_NETINET6_IP6_MROUTE_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/ip6_var.h b/newlib/libc/sys/linux/include/netinet6/ip6_var.h
deleted file mode 100644
index d93ade7..0000000
--- a/newlib/libc/sys/linux/include/netinet6/ip6_var.h
+++ /dev/null
@@ -1,354 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ip6_var.h,v 1.8 2001/09/12 08:37:55 julian Exp $	*/
-/*	$KAME: ip6_var.h,v 1.62 2001/05/03 14:51:48 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_var.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _NETINET6_IP6_VAR_H_
-#define _NETINET6_IP6_VAR_H_
-
-/*
- * IP6 reassembly queue structure.  Each fragment
- * being reassembled is attached to one of these structures.
- */
-struct	ip6q {
-	u_int32_t	ip6q_head;
-	u_int16_t	ip6q_len;
-	u_int8_t	ip6q_nxt;	/* ip6f_nxt in first fragment */
-	u_int8_t	ip6q_hlim;
-	struct ip6asfrag *ip6q_down;
-	struct ip6asfrag *ip6q_up;
-	u_int32_t	ip6q_ident;
-	u_int8_t	ip6q_arrive;
-	u_int8_t	ip6q_ttl;
-	struct in6_addr	ip6q_src, ip6q_dst;
-	struct ip6q	*ip6q_next;
-	struct ip6q	*ip6q_prev;
-	int		ip6q_unfrglen;	/* len of unfragmentable part */
-#ifdef notyet
-	u_char		*ip6q_nxtp;
-#endif
-};
-
-struct	ip6asfrag {
-	u_int32_t	ip6af_head;
-	u_int16_t	ip6af_len;
-	u_int8_t	ip6af_nxt;
-	u_int8_t	ip6af_hlim;
-	/* must not override the above members during reassembling */
-	struct ip6asfrag *ip6af_down;
-	struct ip6asfrag *ip6af_up;
-	struct mbuf	*ip6af_m;
-	int		ip6af_offset;	/* offset in ip6af_m to next header */
-	int		ip6af_frglen;	/* fragmentable part length */
-	int		ip6af_off;	/* fragment offset */
-	u_int16_t	ip6af_mff;	/* more fragment bit in frag off */
-};
-
-#define IP6_REASS_MBUF(ip6af) (*(struct mbuf **)&((ip6af)->ip6af_m))
-
-struct	ip6_moptions {
-	struct	ifnet *im6o_multicast_ifp; /* ifp for outgoing multicasts */
-	u_char	im6o_multicast_hlim;	/* hoplimit for outgoing multicasts */
-	u_char	im6o_multicast_loop;	/* 1 >= hear sends if a member */
-	LIST_HEAD(, in6_multi_mship) im6o_memberships;
-};
-
-/*
- * Control options for outgoing packets
- */
-
-/* Routing header related info */
-struct	ip6po_rhinfo {
-	struct	ip6_rthdr *ip6po_rhi_rthdr; /* Routing header */
-	struct	route_in6 ip6po_rhi_route; /* Route to the 1st hop */
-};
-#define ip6po_rthdr	ip6po_rhinfo.ip6po_rhi_rthdr
-#define ip6po_route	ip6po_rhinfo.ip6po_rhi_route
-
-struct	ip6_pktopts {
-	struct	mbuf *ip6po_m;	/* Pointer to mbuf storing the data */
-	int	ip6po_hlim;	/* Hoplimit for outgoing packets */
-
-	/* Outgoing IF/address information */
-	struct	in6_pktinfo *ip6po_pktinfo;
-
-	struct	sockaddr *ip6po_nexthop; /* Next-hop address */
-	
-	struct	ip6_hbh *ip6po_hbh; /* Hop-by-Hop options header */
-
-	/* Destination options header (before a routing header) */
-	struct	ip6_dest *ip6po_dest1;
-
-	/* Routing header related info. */
-	struct	ip6po_rhinfo ip6po_rhinfo;
-
-	/* Destination options header (after a routing header) */
-	struct	ip6_dest *ip6po_dest2;
-};
-
-/*
- * Control options for incoming packets
- */
-
-struct	ip6stat {
-	u_quad_t ip6s_total;		/* total packets received */
-	u_quad_t ip6s_tooshort;		/* packet too short */
-	u_quad_t ip6s_toosmall;		/* not enough data */
-	u_quad_t ip6s_fragments;	/* fragments received */
-	u_quad_t ip6s_fragdropped;	/* frags dropped(dups, out of space) */
-	u_quad_t ip6s_fragtimeout;	/* fragments timed out */
-	u_quad_t ip6s_fragoverflow;	/* fragments that exceeded limit */
-	u_quad_t ip6s_forward;		/* packets forwarded */
-	u_quad_t ip6s_cantforward;	/* packets rcvd for unreachable dest */
-	u_quad_t ip6s_redirectsent;	/* packets forwarded on same net */
-	u_quad_t ip6s_delivered;	/* datagrams delivered to upper level*/
-	u_quad_t ip6s_localout;		/* total ip packets generated here */
-	u_quad_t ip6s_odropped;		/* lost packets due to nobufs, etc. */
-	u_quad_t ip6s_reassembled;	/* total packets reassembled ok */
-	u_quad_t ip6s_fragmented;	/* datagrams sucessfully fragmented */
-	u_quad_t ip6s_ofragments;	/* output fragments created */
-	u_quad_t ip6s_cantfrag;		/* don't fragment flag was set, etc. */
-	u_quad_t ip6s_badoptions;	/* error in option processing */
-	u_quad_t ip6s_noroute;		/* packets discarded due to no route */
-	u_quad_t ip6s_badvers;		/* ip6 version != 6 */
-	u_quad_t ip6s_rawout;		/* total raw ip packets generated */
-	u_quad_t ip6s_badscope;		/* scope error */
-	u_quad_t ip6s_notmember;	/* don't join this multicast group */
-	u_quad_t ip6s_nxthist[256];	/* next header history */
-	u_quad_t ip6s_m1;		/* one mbuf */
-	u_quad_t ip6s_m2m[32];		/* two or more mbuf */
-	u_quad_t ip6s_mext1;		/* one ext mbuf */
-	u_quad_t ip6s_mext2m;		/* two or more ext mbuf */
-	u_quad_t ip6s_exthdrtoolong;	/* ext hdr are not continuous */
-	u_quad_t ip6s_nogif;		/* no match gif found */
-	u_quad_t ip6s_toomanyhdr;	/* discarded due to too many headers */
-
-	/*
-	 * statistics for improvement of the source address selection
-	 * algorithm:
-	 * XXX: hardcoded 16 = # of ip6 multicast scope types + 1
-	 */
-	/* number of times that address selection fails */
-	u_quad_t ip6s_sources_none;
-	/* number of times that an address on the outgoing I/F is chosen */
-	u_quad_t ip6s_sources_sameif[16];
-	/* number of times that an address on a non-outgoing I/F is chosen */
-	u_quad_t ip6s_sources_otherif[16];
-	/*
-	 * number of times that an address that has the same scope
-	 * from the destination is chosen.
-	 */
-	u_quad_t ip6s_sources_samescope[16];
-	/*
-	 * number of times that an address that has a different scope
-	 * from the destination is chosen.
-	 */
-	u_quad_t ip6s_sources_otherscope[16];
-	/* number of times that an deprecated address is chosen */
-	u_quad_t ip6s_sources_deprecated[16];
-
-	u_quad_t ip6s_forward_cachehit;
-	u_quad_t ip6s_forward_cachemiss;
-};
-
-#ifdef _KERNEL
-/*
- * IPv6 onion peeling state.
- * it will be initialized when we come into ip6_input().
- * XXX do not make it a kitchen sink!
- */
-struct ip6aux {
-	u_int32_t ip6a_flags;
-#define IP6A_SWAP	0x01		/* swapped home/care-of on packet */
-#define IP6A_HASEEN	0x02		/* HA was present */
-#define IP6A_BRUID	0x04		/* BR Unique Identifier was present */
-#define IP6A_RTALERTSEEN 0x08		/* rtalert present */
-
-	/* ip6.ip6_src */
-	struct in6_addr ip6a_careof;	/* care-of address of the peer */
-	struct in6_addr ip6a_home;	/* home address of the peer */
-	u_int16_t	ip6a_bruid;	/* BR unique identifier */
-
-	/* ip6.ip6_dst */
-	struct in6_ifaddr *ip6a_dstia6;	/* my ifaddr that matches ip6_dst */
-
-	/* rtalert */
-	u_int16_t ip6a_rtalert;		/* rtalert option value */
-
-	/*
-	 * decapsulation history will be here.
-	 * with IPsec it may not be accurate.
-	 */
-};
-#endif
-
-#ifdef _KERNEL
-/* flags passed to ip6_output as last parameter */
-#define	IPV6_DADOUTPUT		0x01	/* DAD */
-#define	IPV6_FORWARDING		0x02	/* most of IPv6 header exists */
-#define	IPV6_MINMTU		0x04	/* use minimum MTU (IPV6_USE_MIN_MTU) */
-
-extern struct	ip6stat ip6stat;	/* statistics */
-extern u_int32_t ip6_id;		/* fragment identifier */
-extern int	ip6_defhlim;		/* default hop limit */
-extern int	ip6_defmcasthlim;	/* default multicast hop limit */
-extern int	ip6_forwarding;		/* act as router? */
-extern int	ip6_forward_srcrt;	/* forward src-routed? */
-extern int	ip6_gif_hlim;		/* Hop limit for gif encap packet */
-extern int	ip6_use_deprecated;	/* allow deprecated addr as source */
-extern int	ip6_rr_prune;		/* router renumbering prefix
-					 * walk list every 5 sec.    */
-#define ip6_mapped_addr_on	(!ip6_v6only)
-extern int	ip6_v6only;
-
-extern struct socket *ip6_mrouter; 	/* multicast routing daemon */
-extern int	ip6_sendredirects;	/* send IP redirects when forwarding? */
-extern int	ip6_maxfragpackets; /* Maximum packets in reassembly queue */
-extern int	ip6_sourcecheck;	/* Verify source interface */
-extern int	ip6_sourcecheck_interval; /* Interval between log messages */
-extern int	ip6_accept_rtadv;	/* Acts as a host not a router */
-extern int	ip6_keepfaith;		/* Firewall Aided Internet Translator */
-extern int	ip6_log_interval;
-extern time_t	ip6_log_time;
-extern int	ip6_hdrnestlimit; /* upper limit of # of extension headers */
-extern int	ip6_dad_count;		/* DupAddrDetectionTransmits */
-
-extern u_int32_t ip6_flow_seq;
-extern int ip6_auto_flowlabel;
-extern int ip6_auto_linklocal;
-
-extern int   ip6_anonportmin;		/* minimum ephemeral port */
-extern int   ip6_anonportmax;		/* maximum ephemeral port */
-extern int   ip6_lowportmin;		/* minimum reserved port */
-extern int   ip6_lowportmax;		/* maximum reserved port */
-
-extern int	ip6_use_tempaddr; /* whether to use temporary addresses. */
-
-extern struct	pr_usrreqs rip6_usrreqs;
-struct sockopt;
-
-struct inpcb;
-
-int	icmp6_ctloutput __P((struct socket *, struct sockopt *sopt));
-
-struct in6_ifaddr;
-void	ip6_init __P((void));
-void	ip6intr __P((void));
-void	ip6_input __P((struct mbuf *));
-struct in6_ifaddr *ip6_getdstifaddr __P((struct mbuf *));
-void	ip6_freepcbopts __P((struct ip6_pktopts *));
-void	ip6_freemoptions __P((struct ip6_moptions *));
-int	ip6_unknown_opt __P((u_int8_t *, struct mbuf *, int));
-char *	ip6_get_prevhdr __P((struct mbuf *, int));
-int	ip6_nexthdr __P((struct mbuf *, int, int, int *));
-int	ip6_lasthdr __P((struct mbuf *, int, int, int *));
-
-struct mbuf *ip6_addaux __P((struct mbuf *));
-struct mbuf *ip6_findaux __P((struct mbuf *));
-void	ip6_delaux __P((struct mbuf *));
-
-int	ip6_mforward __P((struct ip6_hdr *, struct ifnet *, struct mbuf *));
-int	ip6_process_hopopts __P((struct mbuf *, u_int8_t *, int, u_int32_t *,
-				 u_int32_t *));
-void	ip6_savecontrol __P((struct inpcb *, struct mbuf **, struct ip6_hdr *,
-			     struct mbuf *));
-void	ip6_notify_pmtu __P((struct inpcb *, struct sockaddr_in6 *,
-			     u_int32_t *));
-int	ip6_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
-
-void	ip6_forward __P((struct mbuf *, int));
-
-void	ip6_mloopback __P((struct ifnet *, struct mbuf *, struct sockaddr_in6 *));
-int	ip6_output __P((struct mbuf *, struct ip6_pktopts *,
-			struct route_in6 *,
-			int,
-			struct ip6_moptions *, struct ifnet **));
-int	ip6_ctloutput __P((struct socket *, struct sockopt *sopt));
-void	init_ip6pktopts __P((struct ip6_pktopts *));
-int	ip6_setpktoptions __P((struct mbuf *, struct ip6_pktopts *, int, int));
-void	ip6_clearpktopts __P((struct ip6_pktopts *, int, int));
-struct ip6_pktopts *ip6_copypktopts __P((struct ip6_pktopts *, int));
-int	ip6_optlen __P((struct inpcb *));
-
-int	route6_input __P((struct mbuf **, int *, int));
-
-void	frag6_init __P((void));
-int	frag6_input __P((struct mbuf **, int *, int));
-void	frag6_slowtimo __P((void));
-void	frag6_drain __P((void));
-
-void	rip6_init __P((void));
-int	rip6_input __P((struct mbuf **mp, int *offp, int proto));
-void	rip6_ctlinput __P((int, struct sockaddr *, void *));
-int	rip6_ctloutput __P((struct socket *so, struct sockopt *sopt));
-int	rip6_output __P((struct mbuf *, ...));
-int	rip6_usrreq __P((struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *, struct thread *));
-
-int	dest6_input __P((struct mbuf **, int *, int));
-int	none_input __P((struct mbuf **, int *, int));
-#endif /* _KERNEL */
-
-#endif /* !_NETINET6_IP6_VAR_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/ip6protosw.h b/newlib/libc/sys/linux/include/netinet6/ip6protosw.h
deleted file mode 100644
index 98d3a1d..0000000
--- a/newlib/libc/sys/linux/include/netinet6/ip6protosw.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ip6protosw.h,v 1.9 2002/04/19 04:46:23 suz Exp $	*/
-/*	$KAME: ip6protosw.h,v 1.25 2001/09/26 06:13:03 keiichi Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-/*	BSDI protosw.h,v 2.3 1996/10/11 16:02:40 pjd Exp	*/
-
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _NETINET6_IP6PROTOSW_H_
-#define _NETINET6_IP6PROTOSW_H_
-
-/*
- * For pfil_head structure.
- */
-#include <net/pfil.h>
-
-/*
- * Protocol switch table for IPv6.
- * All other definitions should refer to sys/protosw.h
- */
-
-struct mbuf;
-struct sockaddr;
-struct socket;
-struct domain;
-struct thread;
-struct ip6_hdr;
-struct icmp6_hdr;
-struct in6_addr;
-struct pr_usrreqs;
-
-/*
- * argument type for the last arg of pr_ctlinput().
- * should be consulted only with AF_INET6 family.
- *
- * IPv6 ICMP IPv6 [exthdrs] finalhdr paylaod
- * ^    ^    ^              ^
- * |    |    ip6c_ip6       ip6c_off
- * |    ip6c_icmp6
- * ip6c_m
- *
- * ip6c_finaldst usually points to ip6c_ip6->ip6_dst.  if the original
- * (internal) packet carries a routing header, it may point the final
- * dstination address in the routing header.
- *
- * ip6c_src: ip6c_ip6->ip6_src + scope info + flowlabel in ip6c_ip6
- *	(beware of flowlabel, if you try to compare it against others)
- * ip6c_dst: ip6c_finaldst + scope info
- */
-struct ip6ctlparam {
-	struct mbuf *ip6c_m;		/* start of mbuf chain */
-	struct icmp6_hdr *ip6c_icmp6;	/* icmp6 header of target packet */
-	struct ip6_hdr *ip6c_ip6;	/* ip6 header of target packet */
-	int ip6c_off;			/* offset of the target proto header */
-	struct sockaddr_in6 *ip6c_src;	/* srcaddr w/ additional info */
-	struct sockaddr_in6 *ip6c_dst;	/* (final) dstaddr w/ additional info */
-	struct in6_addr *ip6c_finaldst;	/* final destination address */
-	void *ip6c_cmdarg;		/* control command dependent data */
-	u_int8_t ip6c_nxt;		/* final next header field */
-};
-
-struct ip6protosw {
-	short	pr_type;		/* socket type used for */
-	struct	domain *pr_domain;	/* domain protocol a member of */
-	short	pr_protocol;		/* protocol number */
-	short	pr_flags;		/* see below */
-
-/* protocol-protocol hooks */
-	int	(*pr_input)		/* input to protocol (from below) */
-			__P((struct mbuf **, int *, int));
-	int	(*pr_output)		/* output to protocol (from above) */
-			__P((struct mbuf *, ...));
-	void	(*pr_ctlinput)		/* control input (from below) */
-			__P((int, struct sockaddr *, void *));
-	int	(*pr_ctloutput)		/* control output (from above) */
-			__P((struct socket *, struct sockopt *));
-
-/* user-protocol hook */
-	int	(*pr_usrreq)		/* user request: see list below */
-			__P((struct socket *, int, struct mbuf *,
-			     struct mbuf *, struct mbuf *, struct thread *));
-
-/* utility hooks */
-	void	(*pr_init)		/* initialization hook */
-			__P((void));
-
-	void	(*pr_fasttimo)		/* fast timeout (200ms) */
-			__P((void));
-	void	(*pr_slowtimo)		/* slow timeout (500ms) */
-			__P((void));
-	void	(*pr_drain)		/* flush any excess space possible */
-			__P((void));
-	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
-	struct	pfil_head	pr_pfh;
-};
-
-#ifdef _KERNEL
-extern struct ip6protosw inet6sw[];
-#endif
-
-#endif /* !_NETINET6_IP6PROTOSW_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/ipcomp.h b/newlib/libc/sys/linux/include/netinet6/ipcomp.h
deleted file mode 100644
index c9302e0..0000000
--- a/newlib/libc/sys/linux/include/netinet6/ipcomp.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ipcomp.h,v 1.4 2002/04/19 04:46:23 suz Exp $	*/
-/*	$KAME: ipcomp.h,v 1.11 2001/09/04 08:43:19 itojun Exp $	*/
-
-/*
- * Copyright (C) 1999 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * RFC2393 IP payload compression protocol (IPComp).
- */
-
-#ifndef _NETINET6_IPCOMP_H_
-#define _NETINET6_IPCOMP_H_
-
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_inet.h"
-#endif
-
-struct ipcomp {
-	u_int8_t comp_nxt;	/* Next Header */
-	u_int8_t comp_flags;	/* reserved, must be zero */
-	u_int16_t comp_cpi;	/* Compression parameter index */
-};
-
-/* well-known algorithm number (in CPI), from RFC2409 */
-#define IPCOMP_OUI	1	/* vendor specific */
-#define IPCOMP_DEFLATE	2	/* RFC2394 */
-#define IPCOMP_LZS	3	/* RFC2395 */
-#define IPCOMP_MAX	4
-
-#define IPCOMP_CPI_NEGOTIATE_MIN	256
-
-#ifdef _KERNEL
-struct ipcomp_algorithm {
-	int (*compress) __P((struct mbuf *, struct mbuf *, size_t *));
-	int (*decompress) __P((struct mbuf *, struct mbuf *, size_t *));
-	size_t minplen;		/* minimum required length for compression */
-};
-
-struct ipsecrequest;
-extern const struct ipcomp_algorithm *ipcomp_algorithm_lookup __P((int));
-extern void ipcomp4_input __P((struct mbuf *, int));
-extern int ipcomp4_output __P((struct mbuf *, struct ipsecrequest *));
-#endif /* KERNEL */
-
-#endif /* _NETINET6_IPCOMP_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/ipcomp6.h b/newlib/libc/sys/linux/include/netinet6/ipcomp6.h
deleted file mode 100644
index e5ec153..0000000
--- a/newlib/libc/sys/linux/include/netinet6/ipcomp6.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ipcomp6.h,v 1.2 2001/06/11 12:39:06 ume Exp $	*/
-/*	$KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $	*/
-
-/*
- * Copyright (C) 1999 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * RFC2393 IP payload compression protocol (IPComp).
- */
-
-#ifndef _NETINET6_IPCOMP6_H_
-#define _NETINET6_IPCOMP6_H_
-
-#ifdef _KERNEL
-extern int ipcomp6_input __P((struct mbuf **, int *, int));
-extern int ipcomp6_output __P((struct mbuf *, u_char *, struct mbuf *,
-	struct ipsecrequest *));
-#endif /*KERNEL*/
-
-#endif /*_NETINET6_IPCOMP6_H_*/
diff --git a/newlib/libc/sys/linux/include/netinet6/ipsec.h b/newlib/libc/sys/linux/include/netinet6/ipsec.h
deleted file mode 100644
index 5c6cbcf..0000000
--- a/newlib/libc/sys/linux/include/netinet6/ipsec.h
+++ /dev/null
@@ -1,354 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ipsec.h,v 1.9 2002/04/19 04:46:23 suz Exp $	*/
-/*	$KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * IPsec controller part.
- */
-
-#ifndef _NETINET6_IPSEC_H_
-#define _NETINET6_IPSEC_H_
-
-#if defined(_KERNEL) && !defined(_LKM) && !defined(KLD_MODULE)
-#include "opt_inet.h"
-#include "opt_ipsec.h"
-#endif
-
-#include <net/pfkeyv2.h>
-#include <netkey/keydb.h>
-
-#ifdef _KERNEL
-
-/*
- * Security Policy Index
- * Ensure that both address families in the "src" and "dst" are same.
- * When the value of the ul_proto is ICMPv6, the port field in "src"
- * specifies ICMPv6 type, and the port field in "dst" specifies ICMPv6 code.
- */
-struct secpolicyindex {
-	u_int8_t dir;			/* direction of packet flow, see blow */
-	struct sockaddr_storage src;	/* IP src address for SP */
-	struct sockaddr_storage dst;	/* IP dst address for SP */
-	u_int8_t prefs;			/* prefix length in bits for src */
-	u_int8_t prefd;			/* prefix length in bits for dst */
-	u_int16_t ul_proto;		/* upper layer Protocol */
-#ifdef notyet
-	uid_t uids;
-	uid_t uidd;
-	gid_t gids;
-	gid_t gidd;
-#endif
-};
-
-/* Security Policy Data Base */
-struct secpolicy {
-	LIST_ENTRY(secpolicy) chain;
-
-	int refcnt;			/* reference count */
-	struct secpolicyindex spidx;	/* selector */
-	u_int32_t id;			/* It's unique number on the system. */
-	u_int state;			/* 0: dead, others: alive */
-#define IPSEC_SPSTATE_DEAD	0
-#define IPSEC_SPSTATE_ALIVE	1
-
-	u_int policy;		/* DISCARD, NONE or IPSEC, see keyv2.h */
-	struct ipsecrequest *req;
-				/* pointer to the ipsec request tree, */
-				/* if policy == IPSEC else this value == NULL.*/
-
-	/*
-	 * lifetime handler.
-	 * the policy can be used without limitiation if both lifetime and
-	 * validtime are zero.
-	 * "lifetime" is passed by sadb_lifetime.sadb_lifetime_addtime.
-	 * "validtime" is passed by sadb_lifetime.sadb_lifetime_usetime.
-	 */
-	long created;		/* time created the policy */
-	long lastused;		/* updated every when kernel sends a packet */
-	long lifetime;		/* duration of the lifetime of this policy */
-	long validtime;		/* duration this policy is valid without use */
-};
-
-/* Request for IPsec */
-struct ipsecrequest {
-	struct ipsecrequest *next;
-				/* pointer to next structure */
-				/* If NULL, it means the end of chain. */
-	struct secasindex saidx;/* hint for search proper SA */
-				/* if __ss_len == 0 then no address specified.*/
-	u_int level;		/* IPsec level defined below. */
-
-	struct secasvar *sav;	/* place holder of SA for use */
-	struct secpolicy *sp;	/* back pointer to SP */
-};
-
-/* security policy in PCB */
-struct inpcbpolicy {
-	struct secpolicy *sp_in;
-	struct secpolicy *sp_out;
-	int priv;			/* privileged socket ? */
-};
-
-/* SP acquiring list table. */
-struct secspacq {
-	LIST_ENTRY(secspacq) chain;
-
-	struct secpolicyindex spidx;
-
-	long created;		/* for lifetime */
-	int count;		/* for lifetime */
-	/* XXX: here is mbuf place holder to be sent ? */
-};
-#endif /* _KERNEL */
-
-/* according to IANA assignment, port 0x0000 and proto 0xff are reserved. */
-#define IPSEC_PORT_ANY		0
-#define IPSEC_ULPROTO_ANY	255
-#define IPSEC_PROTO_ANY		255
-
-/* mode of security protocol */
-/* NOTE: DON'T use IPSEC_MODE_ANY at SPD.  It's only use in SAD */
-#define	IPSEC_MODE_ANY		0	/* i.e. wildcard. */
-#define	IPSEC_MODE_TRANSPORT	1
-#define	IPSEC_MODE_TUNNEL	2
-
-/*
- * Direction of security policy.
- * NOTE: Since INVALID is used just as flag.
- * The other are used for loop counter too.
- */
-#define IPSEC_DIR_ANY		0
-#define IPSEC_DIR_INBOUND	1
-#define IPSEC_DIR_OUTBOUND	2
-#define IPSEC_DIR_MAX		3
-#define IPSEC_DIR_INVALID	4
-
-/* Policy level */
-/*
- * IPSEC, ENTRUST and BYPASS are allowed for setsockopt() in PCB,
- * DISCARD, IPSEC and NONE are allowed for setkey() in SPD.
- * DISCARD and NONE are allowed for system default.
- */
-#define IPSEC_POLICY_DISCARD	0	/* discarding packet */
-#define IPSEC_POLICY_NONE	1	/* through IPsec engine */
-#define IPSEC_POLICY_IPSEC	2	/* do IPsec */
-#define IPSEC_POLICY_ENTRUST	3	/* consulting SPD if present. */
-#define IPSEC_POLICY_BYPASS	4	/* only for privileged socket. */
-
-/* Security protocol level */
-#define	IPSEC_LEVEL_DEFAULT	0	/* reference to system default */
-#define	IPSEC_LEVEL_USE		1	/* use SA if present. */
-#define	IPSEC_LEVEL_REQUIRE	2	/* require SA. */
-#define	IPSEC_LEVEL_UNIQUE	3	/* unique SA. */
-
-#define IPSEC_MANUAL_REQID_MAX	0x3fff
-				/*
-				 * if security policy level == unique, this id
-				 * indicate to a relative SA for use, else is
-				 * zero.
-				 * 1 - 0x3fff are reserved for manual keying.
-				 * 0 are reserved for above reason.  Others is
-				 * for kernel use.
-				 * Note that this id doesn't identify SA
-				 * by only itself.
-				 */
-#define IPSEC_REPLAYWSIZE  32
-
-/* statistics for ipsec processing */
-struct ipsecstat {
-	u_quad_t in_success;  /* succeeded inbound process */
-	u_quad_t in_polvio;
-			/* security policy violation for inbound process */
-	u_quad_t in_nosa;     /* inbound SA is unavailable */
-	u_quad_t in_inval;    /* inbound processing failed due to EINVAL */
-	u_quad_t in_nomem;    /* inbound processing failed due to ENOBUFS */
-	u_quad_t in_badspi;   /* failed getting a SPI */
-	u_quad_t in_ahreplay; /* AH replay check failed */
-	u_quad_t in_espreplay; /* ESP replay check failed */
-	u_quad_t in_ahauthsucc; /* AH authentication success */
-	u_quad_t in_ahauthfail; /* AH authentication failure */
-	u_quad_t in_espauthsucc; /* ESP authentication success */
-	u_quad_t in_espauthfail; /* ESP authentication failure */
-	u_quad_t in_esphist[256];
-	u_quad_t in_ahhist[256];
-	u_quad_t in_comphist[256];
-	u_quad_t out_success; /* succeeded outbound process */
-	u_quad_t out_polvio;
-			/* security policy violation for outbound process */
-	u_quad_t out_nosa;    /* outbound SA is unavailable */
-	u_quad_t out_inval;   /* outbound process failed due to EINVAL */
-	u_quad_t out_nomem;    /* inbound processing failed due to ENOBUFS */
-	u_quad_t out_noroute; /* there is no route */
-	u_quad_t out_esphist[256];
-	u_quad_t out_ahhist[256];
-	u_quad_t out_comphist[256];
-};
-
-/*
- * Definitions for IPsec & Key sysctl operations.
- */
-/*
- * Names for IPsec & Key sysctl objects
- */
-#define IPSECCTL_STATS			1	/* stats */
-#define IPSECCTL_DEF_POLICY		2
-#define IPSECCTL_DEF_ESP_TRANSLEV	3	/* int; ESP transport mode */
-#define IPSECCTL_DEF_ESP_NETLEV		4	/* int; ESP tunnel mode */
-#define IPSECCTL_DEF_AH_TRANSLEV	5	/* int; AH transport mode */
-#define IPSECCTL_DEF_AH_NETLEV		6	/* int; AH tunnel mode */
-#if 0	/* obsolete, do not reuse */
-#define IPSECCTL_INBOUND_CALL_IKE	7
-#endif
-#define	IPSECCTL_AH_CLEARTOS		8
-#define	IPSECCTL_AH_OFFSETMASK		9
-#define	IPSECCTL_DFBIT			10
-#define	IPSECCTL_ECN			11
-#define	IPSECCTL_DEBUG			12
-#define	IPSECCTL_ESP_RANDPAD		13
-#define IPSECCTL_MAXID			14
-
-#define IPSECCTL_NAMES { \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "def_policy", CTLTYPE_INT }, \
-	{ "esp_trans_deflev", CTLTYPE_INT }, \
-	{ "esp_net_deflev", CTLTYPE_INT }, \
-	{ "ah_trans_deflev", CTLTYPE_INT }, \
-	{ "ah_net_deflev", CTLTYPE_INT }, \
-	{ 0, 0 }, \
-	{ "ah_cleartos", CTLTYPE_INT }, \
-	{ "ah_offsetmask", CTLTYPE_INT }, \
-	{ "dfbit", CTLTYPE_INT }, \
-	{ "ecn", CTLTYPE_INT }, \
-	{ "debug", CTLTYPE_INT }, \
-	{ "esp_randpad", CTLTYPE_INT }, \
-}
-
-#define IPSEC6CTL_NAMES { \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "def_policy", CTLTYPE_INT }, \
-	{ "esp_trans_deflev", CTLTYPE_INT }, \
-	{ "esp_net_deflev", CTLTYPE_INT }, \
-	{ "ah_trans_deflev", CTLTYPE_INT }, \
-	{ "ah_net_deflev", CTLTYPE_INT }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "ecn", CTLTYPE_INT }, \
-	{ "debug", CTLTYPE_INT }, \
-	{ "esp_randpad", CTLTYPE_INT }, \
-}
-
-#ifdef _KERNEL
-struct ipsec_output_state {
-	struct mbuf *m;
-	struct route *ro;
-	struct sockaddr *dst;
-};
-
-struct ipsec_history {
-	int ih_proto;
-	u_int32_t ih_spi;
-};
-
-extern int ipsec_debug;
-
-extern struct ipsecstat ipsecstat;
-extern struct secpolicy ip4_def_policy;
-extern int ip4_esp_trans_deflev;
-extern int ip4_esp_net_deflev;
-extern int ip4_ah_trans_deflev;
-extern int ip4_ah_net_deflev;
-extern int ip4_ah_cleartos;
-extern int ip4_ah_offsetmask;
-extern int ip4_ipsec_dfbit;
-extern int ip4_ipsec_ecn;
-extern int ip4_esp_randpad;
-
-#define ipseclog(x)	do { if (ipsec_debug) log x; } while (0)
-
-extern struct secpolicy *ipsec4_getpolicybysock
-	__P((struct mbuf *, u_int, struct socket *, int *));
-extern struct secpolicy *ipsec4_getpolicybyaddr
-	__P((struct mbuf *, u_int, int, int *));
-
-struct inpcb;
-extern int ipsec_init_policy __P((struct socket *so, struct inpcbpolicy **));
-extern int ipsec_copy_policy
-	__P((struct inpcbpolicy *, struct inpcbpolicy *));
-extern u_int ipsec_get_reqlevel __P((struct ipsecrequest *));
-
-extern int ipsec4_set_policy __P((struct inpcb *inp, int optname,
-	caddr_t request, size_t len, int priv));
-extern int ipsec4_get_policy __P((struct inpcb *inpcb, caddr_t request,
-	size_t len, struct mbuf **mp));
-extern int ipsec4_delete_pcbpolicy __P((struct inpcb *));
-extern int ipsec4_in_reject_so __P((struct mbuf *, struct socket *));
-extern int ipsec4_in_reject __P((struct mbuf *, struct inpcb *));
-
-struct secas;
-struct tcpcb;
-extern int ipsec_chkreplay __P((u_int32_t, struct secasvar *));
-extern int ipsec_updatereplay __P((u_int32_t, struct secasvar *));
-
-extern size_t ipsec4_hdrsiz __P((struct mbuf *, u_int, struct inpcb *));
-extern size_t ipsec_hdrsiz_tcp __P((struct tcpcb *));
-
-struct ip;
-extern const char *ipsec4_logpacketstr __P((struct ip *, u_int32_t));
-extern const char *ipsec_logsastr __P((struct secasvar *));
-
-extern void ipsec_dumpmbuf __P((struct mbuf *));
-
-extern int ipsec4_output __P((struct ipsec_output_state *, struct secpolicy *,
-	int));
-extern int ipsec4_tunnel_validate __P((struct mbuf *, int, u_int,
-	struct secasvar *));
-extern struct mbuf *ipsec_copypkt __P((struct mbuf *));
-extern void ipsec_delaux __P((struct mbuf *));
-extern int ipsec_setsocket __P((struct mbuf *, struct socket *));
-extern struct socket *ipsec_getsocket __P((struct mbuf *));
-extern int ipsec_addhist __P((struct mbuf *, int, u_int32_t)); 
-extern struct ipsec_history *ipsec_gethist __P((struct mbuf *, int *));
-extern void ipsec_clearhist __P((struct mbuf *));
-#endif /* _KERNEL */
-
-#ifndef _KERNEL
-extern caddr_t ipsec_set_policy __P((char *, int));
-extern int ipsec_get_policylen __P((caddr_t));
-extern char *ipsec_dump_policy __P((caddr_t, char *));
-
-extern const char *ipsec_strerror __P((void));
-#endif /* !_KERNEL */
-
-#endif /* _NETINET6_IPSEC_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/ipsec6.h b/newlib/libc/sys/linux/include/netinet6/ipsec6.h
deleted file mode 100644
index 04a18cf..0000000
--- a/newlib/libc/sys/linux/include/netinet6/ipsec6.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ipsec6.h,v 1.5 2001/06/11 12:39:06 ume Exp $	*/
-/*	$KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * IPsec controller part.
- */
-
-#ifndef _NETINET6_IPSEC6_H_
-#define _NETINET6_IPSEC6_H_
-
-#include <net/pfkeyv2.h>
-#include <netkey/keydb.h>
-
-#ifdef _KERNEL
-extern struct ipsecstat ipsec6stat;
-extern struct secpolicy ip6_def_policy;
-extern int ip6_esp_trans_deflev;
-extern int ip6_esp_net_deflev;
-extern int ip6_ah_trans_deflev;
-extern int ip6_ah_net_deflev;
-extern int ip6_ipsec_ecn;
-extern int ip6_esp_randpad;
-
-extern struct secpolicy *ipsec6_getpolicybysock
-	__P((struct mbuf *, u_int, struct socket *, int *));
-extern struct secpolicy *ipsec6_getpolicybyaddr
-	__P((struct mbuf *, u_int, int, int *));
-
-struct inpcb;
-
-extern int ipsec6_in_reject_so __P((struct mbuf *, struct socket *));
-extern int ipsec6_delete_pcbpolicy __P((struct inpcb *));
-extern int ipsec6_set_policy __P((struct inpcb *inp, int optname,
-	caddr_t request, size_t len, int priv));
-extern int ipsec6_get_policy
-	__P((struct inpcb *inp, caddr_t request, size_t len, struct mbuf **mp));
-extern int ipsec6_in_reject __P((struct mbuf *, struct inpcb *));
-
-struct tcp6cb;
-
-extern size_t ipsec6_hdrsiz __P((struct mbuf *, u_int, struct inpcb *));
-
-struct ip6_hdr;
-extern const char *ipsec6_logpacketstr __P((struct ip6_hdr *, u_int32_t));
-
-extern int ipsec6_output_trans __P((struct ipsec_output_state *, u_char *,
-	struct mbuf *, struct secpolicy *, int, int *));
-extern int ipsec6_output_tunnel __P((struct ipsec_output_state *,
-	struct secpolicy *, int));
-extern int ipsec6_tunnel_validate __P((struct mbuf *, int, u_int,
-	struct secasvar *));
-#endif /*_KERNEL*/
-
-#endif /*_NETINET6_IPSEC6_H_*/
diff --git a/newlib/libc/sys/linux/include/netinet6/mld6_var.h b/newlib/libc/sys/linux/include/netinet6/mld6_var.h
deleted file mode 100644
index 85f0da2..0000000
--- a/newlib/libc/sys/linux/include/netinet6/mld6_var.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/mld6_var.h,v 1.2 2000/07/04 16:35:10 itojun Exp $	*/
-/*	$KAME: mld6_var.h,v 1.4 2000/03/25 07:23:54 sumikawa Exp $	*/
-
-/*
- * Copyright (C) 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NETINET6_MLD6_VAR_H_
-#define _NETINET6_MLD6_VAR_H_
-
-#ifdef _KERNEL
-
-#define MLD6_RANDOM_DELAY(X) (random() % (X) + 1)
-
-/*
- * States for MLD stop-listening processing
- */
-#define MLD6_OTHERLISTENER			0
-#define MLD6_IREPORTEDLAST			1
-
-void	mld6_init __P((void));
-void	mld6_input __P((struct mbuf *, int));
-void	mld6_start_listening __P((struct in6_multi *));
-void	mld6_stop_listening __P((struct in6_multi *));
-void	mld6_fasttimeo __P((void));
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_MLD6_VAR_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/nd6.h b/newlib/libc/sys/linux/include/netinet6/nd6.h
deleted file mode 100644
index c6e644d..0000000
--- a/newlib/libc/sys/linux/include/netinet6/nd6.h
+++ /dev/null
@@ -1,404 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/nd6.h,v 1.10 2002/04/19 04:46:23 suz Exp $	*/
-/*	$KAME: nd6.h,v 1.76 2001/12/18 02:10:31 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NETINET6_ND6_H_
-#define _NETINET6_ND6_H_
-
-/* see net/route.h, or net/if_inarp.h */
-#ifndef RTF_ANNOUNCE
-#define RTF_ANNOUNCE	RTF_PROTO2
-#endif
-
-#include <sys/queue.h>
-#include <sys/callout.h>
-
-struct	llinfo_nd6 {
-	struct	llinfo_nd6 *ln_next;
-	struct	llinfo_nd6 *ln_prev;
-	struct	rtentry *ln_rt;
-	struct	mbuf *ln_hold;	/* last packet until resolved/timeout */
-	long	ln_asked;	/* number of queries already sent for this addr */
-	u_long	ln_expire;	/* lifetime for NDP state transition */
-	short	ln_state;	/* reachability state */
-	short	ln_router;	/* 2^0: ND6 router bit */
-	int	ln_byhint;	/* # of times we made it reachable by UL hint */
-};
-
-#define ND6_LLINFO_NOSTATE	-2
-/*
- * We don't need the WAITDELETE state any more, but we keep the definition
- * in a comment line instead of removing it. This is necessary to avoid
- * unintentionally reusing the value for another purpose, which might
- * affect backward compatibility with old applications.
- * (20000711 jinmei@kame.net)
- */
-/* #define ND6_LLINFO_WAITDELETE	-1 */
-#define ND6_LLINFO_INCOMPLETE	0
-#define ND6_LLINFO_REACHABLE	1
-#define ND6_LLINFO_STALE	2
-#define ND6_LLINFO_DELAY	3
-#define ND6_LLINFO_PROBE	4
-
-#define ND6_IS_LLINFO_PROBREACH(n) ((n)->ln_state > ND6_LLINFO_INCOMPLETE)
-
-struct nd_ifinfo {
-	u_int32_t linkmtu;		/* LinkMTU */
-	u_int32_t maxmtu;		/* Upper bound of LinkMTU */
-	u_int32_t basereachable;	/* BaseReachableTime */
-	u_int32_t reachable;		/* Reachable Time */
-	u_int32_t retrans;		/* Retrans Timer */
-	u_int32_t flags;		/* Flags */
-	int recalctm;			/* BaseReacable re-calculation timer */
-	u_int8_t chlim;			/* CurHopLimit */
-	u_int8_t receivedra;
-	/* the following 3 members are for privacy extension for addrconf */
-	u_int8_t randomseed0[8]; /* upper 64 bits of MD5 digest */
-	u_int8_t randomseed1[8]; /* lower 64 bits (usually the EUI64 IFID) */
-	u_int8_t randomid[8];	/* current random ID */
-};
-
-#define ND6_IFF_PERFORMNUD	0x1
-
-struct in6_nbrinfo {
-	char ifname[IFNAMSIZ];	/* if name, e.g. "en0" */
-	struct in6_addr addr;	/* IPv6 address of the neighbor */
-	long	asked;		/* number of queries already sent for this addr */
-	int	isrouter;	/* if it acts as a router */
-	int	state;		/* reachability state */
-	int	expire;		/* lifetime for NDP state transition */
-};
-
-#define DRLSTSIZ 10
-#define PRLSTSIZ 10
-struct	in6_drlist {
-	char ifname[IFNAMSIZ];
-	struct {
-		struct	in6_addr rtaddr;
-		u_char	flags;
-		u_short	rtlifetime;
-		u_long	expire;
-		u_short if_index;
-	} defrouter[DRLSTSIZ];
-};
-
-struct	in6_defrouter {
-	struct	sockaddr_in6 rtaddr;
-	u_char	flags;
-	u_short	rtlifetime;
-	u_long	expire;
-	u_short if_index;
-};
-
-struct	in6_prlist {
-	char ifname[IFNAMSIZ];
-	struct {
-		struct	in6_addr prefix;
-		struct prf_ra raflags;
-		u_char	prefixlen;
-		u_char	origin;
-		u_int32_t vltime;
-		u_int32_t pltime;
-		time_t expire;
-		u_short if_index;
-		u_short advrtrs; /* number of advertisement routers */
-		struct	in6_addr advrtr[DRLSTSIZ]; /* XXX: explicit limit */
-	} prefix[PRLSTSIZ];
-};
-
-struct in6_prefix {
-	struct	sockaddr_in6 prefix;
-	struct prf_ra raflags;
-	u_char	prefixlen;
-	u_char	origin;
-	u_long	vltime;
-	u_long	pltime;
-	u_long	expire;
-	u_int32_t flags;
-	int refcnt;
-	u_short if_index;
-	u_short advrtrs; /* number of advertisement routers */
-	/* struct sockaddr_in6 advrtr[] */
-};
-
-#ifdef _KERNEL
-struct	in6_ondireq {
-	char ifname[IFNAMSIZ];
-	struct {
-		u_int32_t linkmtu;	/* LinkMTU */
-		u_int32_t maxmtu;	/* Upper bound of LinkMTU */
-		u_int32_t basereachable; /* BaseReachableTime */
-		u_int32_t reachable;	/* Reachable Time */
-		u_int32_t retrans;	/* Retrans Timer */
-		u_int32_t flags;	/* Flags */
-		int recalctm;		/* BaseReacable re-calculation timer */
-		u_int8_t chlim;		/* CurHopLimit */
-		u_int8_t receivedra;
-	} ndi;
-};
-#endif
-
-struct	in6_ndireq {
-	char ifname[IFNAMSIZ];
-	struct nd_ifinfo ndi;
-};
-
-struct	in6_ndifreq {
-	char ifname[IFNAMSIZ];
-	u_long ifindex;
-};
-
-/* Prefix status */
-#define NDPRF_ONLINK		0x1
-#define NDPRF_DETACHED		0x2
-
-/* protocol constants */
-#define MAX_RTR_SOLICITATION_DELAY	1	/* 1sec */
-#define RTR_SOLICITATION_INTERVAL	4	/* 4sec */
-#define MAX_RTR_SOLICITATIONS		3
-
-#define ND6_INFINITE_LIFETIME		0xffffffff
-
-#ifdef _KERNEL
-/* node constants */
-#define MAX_REACHABLE_TIME		3600000	/* msec */
-#define REACHABLE_TIME			30000	/* msec */
-#define RETRANS_TIMER			1000	/* msec */
-#define MIN_RANDOM_FACTOR		512	/* 1024 * 0.5 */
-#define MAX_RANDOM_FACTOR		1536	/* 1024 * 1.5 */
-#define DEF_TEMP_VALID_LIFETIME		604800	/* 1 week */
-#define DEF_TEMP_PREFERRED_LIFETIME	86400	/* 1 day */
-#define TEMPADDR_REGEN_ADVANCE		5	/* sec */
-#define MAX_TEMP_DESYNC_FACTOR		600	/* 10 min */
-#define ND_COMPUTE_RTIME(x) \
-		(((MIN_RANDOM_FACTOR * (x >> 10)) + (random() & \
-		((MAX_RANDOM_FACTOR - MIN_RANDOM_FACTOR) * (x >> 10)))) /1000)
-
-TAILQ_HEAD(nd_drhead, nd_defrouter);
-struct	nd_defrouter {
-	TAILQ_ENTRY(nd_defrouter) dr_entry;
-	struct	in6_addr rtaddr;
-	u_char	flags;		/* flags on RA message */
-	u_short	rtlifetime;
-	u_long	expire;
-	u_long	advint;		/* Mobile IPv6 addition (milliseconds) */
-	u_long	advint_expire;	/* Mobile IPv6 addition */
-	int	advints_lost;	/* Mobile IPv6 addition */
-	struct  ifnet *ifp;
-};
-
-struct nd_prefix {
-	struct ifnet *ndpr_ifp;
-	LIST_ENTRY(nd_prefix) ndpr_entry;
-	struct sockaddr_in6 ndpr_prefix;	/* prefix */
-	struct in6_addr ndpr_mask; /* netmask derived from the prefix */
-	struct in6_addr ndpr_addr; /* address that is derived from the prefix */
-	u_int32_t ndpr_vltime;	/* advertised valid lifetime */
-	u_int32_t ndpr_pltime;	/* advertised preferred lifetime */
-	time_t ndpr_expire;	/* expiration time of the prefix */
-	time_t ndpr_preferred;	/* preferred time of the prefix */
-	struct prf_ra ndpr_flags;
-	u_int32_t ndpr_stateflags; /* actual state flags */
-	/* list of routers that advertise the prefix: */
-	LIST_HEAD(pr_rtrhead, nd_pfxrouter) ndpr_advrtrs;
-	u_char	ndpr_plen;
-	int	ndpr_refcnt;	/* reference couter from addresses */
-};
-
-#define ndpr_next		ndpr_entry.le_next
-
-#define ndpr_raf		ndpr_flags
-#define ndpr_raf_onlink		ndpr_flags.onlink
-#define ndpr_raf_auto		ndpr_flags.autonomous
-
-/*
- * We keep expired prefix for certain amount of time, for validation purposes.
- * 1800s = MaxRtrAdvInterval
- */
-#define NDPR_KEEP_EXPIRED	(1800 * 2)
-
-/*
- * Message format for use in obtaining information about prefixes
- * from inet6 sysctl function
- */
-struct inet6_ndpr_msghdr {
-	u_short	inpm_msglen;	/* to skip over non-understood messages */
-	u_char	inpm_version;	/* future binary compatibility */
-	u_char	inpm_type;	/* message type */
-	struct in6_addr inpm_prefix;
-	u_long	prm_vltim;
-	u_long	prm_pltime;
-	u_long	prm_expire;
-	u_long	prm_preferred;
-	struct in6_prflags prm_flags;
-	u_short	prm_index;	/* index for associated ifp */
-	u_char	prm_plen;	/* length of prefix in bits */
-};
-
-#define prm_raf_onlink		prm_flags.prf_ra.onlink
-#define prm_raf_auto		prm_flags.prf_ra.autonomous
-
-#define prm_statef_onlink	prm_flags.prf_state.onlink
-
-#define prm_rrf_decrvalid	prm_flags.prf_rr.decrvalid
-#define prm_rrf_decrprefd	prm_flags.prf_rr.decrprefd
-
-#define ifpr2ndpr(ifpr)	((struct nd_prefix *)(ifpr))
-#define ndpr2ifpr(ndpr)	((struct ifprefix *)(ndpr))
-
-struct nd_pfxrouter {
-	LIST_ENTRY(nd_pfxrouter) pfr_entry;
-#define pfr_next pfr_entry.le_next
-	struct nd_defrouter *router;
-};
-
-LIST_HEAD(nd_prhead, nd_prefix);
-
-/* nd6.c */
-extern int nd6_prune;
-extern int nd6_delay;
-extern int nd6_umaxtries;
-extern int nd6_mmaxtries;
-extern int nd6_useloopback;
-extern int nd6_maxnudhint;
-extern int nd6_gctimer;
-extern struct llinfo_nd6 llinfo_nd6;
-extern struct nd_ifinfo *nd_ifinfo;
-extern struct nd_drhead nd_defrouter;
-extern struct nd_prhead nd_prefix;
-extern int nd6_debug;
-
-#define nd6log(x)	do { if (nd6_debug) log x; } while (0)
-
-extern struct callout nd6_timer_ch;
-
-/* nd6_rtr.c */
-extern int nd6_defifindex;
-extern int ip6_desync_factor;	/* seconds */
-extern u_int32_t ip6_temp_preferred_lifetime; /* seconds */
-extern u_int32_t ip6_temp_valid_lifetime; /* seconds */
-extern int ip6_temp_regen_advance; /* seconds */
-
-union nd_opts {
-	struct nd_opt_hdr *nd_opt_array[9];	/* max = home agent info */
-	struct {
-		struct nd_opt_hdr *zero;
-		struct nd_opt_hdr *src_lladdr;
-		struct nd_opt_hdr *tgt_lladdr;
-		struct nd_opt_prefix_info *pi_beg; /* multiple opts, start */
-		struct nd_opt_rd_hdr *rh;
-		struct nd_opt_mtu *mtu;
-		struct nd_opt_hdr *six;
-		struct nd_opt_advint *adv;
-		struct nd_opt_hai *hai;
-		struct nd_opt_hdr *search;	/* multiple opts */
-		struct nd_opt_hdr *last;	/* multiple opts */
-		int done;
-		struct nd_opt_prefix_info *pi_end;/* multiple opts, end */
-	} nd_opt_each;
-};
-#define nd_opts_src_lladdr	nd_opt_each.src_lladdr
-#define nd_opts_tgt_lladdr	nd_opt_each.tgt_lladdr
-#define nd_opts_pi		nd_opt_each.pi_beg
-#define nd_opts_pi_end		nd_opt_each.pi_end
-#define nd_opts_rh		nd_opt_each.rh
-#define nd_opts_mtu		nd_opt_each.mtu
-#define nd_opts_adv		nd_opt_each.adv
-#define nd_opts_hai		nd_opt_each.hai
-#define nd_opts_search		nd_opt_each.search
-#define nd_opts_last		nd_opt_each.last
-#define nd_opts_done		nd_opt_each.done
-
-/* XXX: need nd6_var.h?? */
-/* nd6.c */
-void nd6_init __P((void));
-void nd6_ifattach __P((struct ifnet *));
-int nd6_is_addr_neighbor __P((struct sockaddr_in6 *, struct ifnet *));
-void nd6_option_init __P((void *, int, union nd_opts *));
-struct nd_opt_hdr *nd6_option __P((union nd_opts *));
-int nd6_options __P((union nd_opts *));
-struct	rtentry *nd6_lookup __P((struct in6_addr *, int, struct ifnet *));
-void nd6_setmtu __P((struct ifnet *));
-void nd6_timer __P((void *));
-void nd6_purge __P((struct ifnet *));
-struct llinfo_nd6 *nd6_free __P((struct rtentry *));
-void nd6_nud_hint __P((struct rtentry *, struct in6_addr *, int));
-int nd6_resolve __P((struct ifnet *, struct rtentry *,
-		     struct mbuf *, struct sockaddr *, u_char *));
-void nd6_rtrequest __P((int, struct rtentry *, struct rt_addrinfo *));
-int nd6_ioctl __P((u_long, caddr_t, struct ifnet *));
-struct rtentry *nd6_cache_lladdr __P((struct ifnet *, struct in6_addr *,
-	char *, int, int, int));
-int nd6_output __P((struct ifnet *, struct ifnet *, struct mbuf *,
-		    struct sockaddr_in6 *, struct rtentry *));
-int nd6_storelladdr __P((struct ifnet *, struct rtentry *, struct mbuf *,
-			 struct sockaddr *, u_char *));
-int nd6_need_cache __P((struct ifnet *));
-
-/* nd6_nbr.c */
-void nd6_na_input __P((struct mbuf *, int, int));
-void nd6_na_output __P((struct ifnet *, const struct in6_addr *,
-	const struct in6_addr *, u_long, int, struct sockaddr *));
-void nd6_ns_input __P((struct mbuf *, int, int));
-void nd6_ns_output __P((struct ifnet *, const struct in6_addr *,
-	const struct in6_addr *, struct llinfo_nd6 *, int));
-caddr_t nd6_ifptomac __P((struct ifnet *));
-void nd6_dad_start __P((struct ifaddr *, int *));
-void nd6_dad_stop __P((struct ifaddr *));
-void nd6_dad_duplicated __P((struct ifaddr *));
-
-/* nd6_rtr.c */
-void nd6_rs_input __P((struct mbuf *, int, int));
-void nd6_ra_input __P((struct mbuf *, int, int));
-void prelist_del __P((struct nd_prefix *));
-void defrouter_addreq __P((struct nd_defrouter *));
-void defrouter_delreq __P((struct nd_defrouter *, int));
-void defrouter_select __P((void));
-void defrtrlist_del __P((struct nd_defrouter *));
-void prelist_remove __P((struct nd_prefix *));
-int prelist_update __P((struct nd_prefix *, struct nd_defrouter *,
-			struct mbuf *));
-int nd6_prelist_add __P((struct nd_prefix *, struct nd_defrouter *,
-			 struct nd_prefix **));
-int nd6_prefix_onlink __P((struct nd_prefix *));
-int nd6_prefix_offlink __P((struct nd_prefix *));
-void pfxlist_onlink_check __P((void));
-struct nd_defrouter *defrouter_lookup __P((struct in6_addr *,
-					   struct ifnet *));
-struct nd_prefix *nd6_prefix_lookup __P((struct nd_prefix *));
-int in6_init_prefix_ltimes __P((struct nd_prefix *ndpr));
-void rt6_flush __P((struct in6_addr *, struct ifnet *));
-int nd6_setdefaultiface __P((int));
-int in6_tmpifadd __P((const struct in6_ifaddr *, int));
-
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_ND6_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/pim6.h b/newlib/libc/sys/linux/include/netinet6/pim6.h
deleted file mode 100644
index b5c5fd8..0000000
--- a/newlib/libc/sys/linux/include/netinet6/pim6.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/pim6.h,v 1.2 2000/07/04 16:35:10 itojun Exp $	*/
-/*	$KAME: pim6.h,v 1.3 2000/03/25 07:23:58 sumikawa Exp $	*/
-
-/*
- * Copyright (C) 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-/*
- * Protocol Independent Multicast (PIM) definitions
- *
- * Written by Ahmed Helmy, SGI, July 1996
- *
- * MULTICAST
- */
-
-/*
- * PIM packet header
- */
-#define PIM_VERSION	2
-struct pim {
-#if defined(BYTE_ORDER) && (BYTE_ORDER == LITTLE_ENDIAN)
-	u_char	pim_type:4, /* the PIM message type, currently they are:
-			     * Hello, Register, Register-Stop, Join/Prune,
-			     * Bootstrap, Assert, Graft (PIM-DM only),
-			     * Graft-Ack (PIM-DM only), C-RP-Adv
-			     */
-		pim_ver:4;  /* PIM version number; 2 for PIMv2 */
-#else
-	u_char	pim_ver:4,	/* PIM version */
-		pim_type:4;	/* PIM type    */
-#endif
-	u_char  pim_rsv;	/* Reserved */
-	u_short	pim_cksum;	/* IP style check sum */
-};
-
-#define PIM_MINLEN	8		/* The header min. length is 8    */
-#define PIM6_REG_MINLEN	(PIM_MINLEN+40)	/* Register message + inner IP6 header */
-
-/*
- * Message types
- */
-#define PIM_REGISTER	1	/* PIM Register type is 1 */
-
-/* second bit in reg_head is the null bit */
-#define PIM_NULL_REGISTER 0x40000000
diff --git a/newlib/libc/sys/linux/include/netinet6/pim6_var.h b/newlib/libc/sys/linux/include/netinet6/pim6_var.h
deleted file mode 100644
index 6fe6f6a..0000000
--- a/newlib/libc/sys/linux/include/netinet6/pim6_var.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/pim6_var.h,v 1.3 2000/07/04 16:35:10 itojun Exp $	*/
-/*	$KAME: pim6_var.h,v 1.8 2000/06/06 08:07:43 jinmei Exp $	*/
-
-/*
- * Copyright (C) 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NETINET6_PIM6_VAR_H_
-#define _NETINET6_PIM6_VAR_H_
-
-/*
- * Protocol Independent Multicast (PIM),
- * implementation-specific definitions.
- *
- * Written by George Edmond Eddy (Rusty), ISI, February 1998
- * Modified by Pavlin Ivanov Radoslavov, USC/ISI, May 1998
- */
-
-struct pim6stat {
-	u_quad_t pim6s_rcv_total;	/* total PIM messages received	*/
-	u_quad_t pim6s_rcv_tooshort;	/* received with too few bytes	*/
-	u_quad_t pim6s_rcv_badsum;	/* received with bad checksum	*/
-	u_quad_t pim6s_rcv_badversion;	/* received bad PIM version	*/
-	u_quad_t pim6s_rcv_registers;	/* received registers		*/
-	u_quad_t pim6s_rcv_badregisters; /* received invalid registers	*/
-	u_quad_t pim6s_snd_registers;	/* sent registers		*/
-};
-
-#if (defined(KERNEL)) || (defined(_KERNEL))
-extern struct pim6stat pim6stat;
-
-int pim6_input __P((struct mbuf **, int*, int));
-#endif /* KERNEL */
-
-/*
- * Names for PIM sysctl objects
- */
-#define PIM6CTL_STATS		1	/* statistics (read-only) */
-#define PIM6CTL_MAXID		2
-
-#define PIM6CTL_NAMES { \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-}
-#endif /* _NETINET6_PIM6_VAR_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/raw_ip6.h b/newlib/libc/sys/linux/include/netinet6/raw_ip6.h
deleted file mode 100644
index 7efd75d..0000000
--- a/newlib/libc/sys/linux/include/netinet6/raw_ip6.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/raw_ip6.h,v 1.1 2001/06/11 12:39:06 ume Exp $	*/
-/*	$KAME: raw_ip6.h,v 1.2 2001/05/27 13:28:35 itojun Exp $	*/
-
-/*
- * Copyright (C) 2001 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NETINET6_RAW_IP6_H_
-#define _NETINET6_RAW_IP6_H_
-
-/*
- * ICMPv6 stat is counted separately.  see netinet/icmp6.h
- */
-struct rip6stat {
-	u_quad_t rip6s_ipackets;	/* total input packets */
-	u_quad_t rip6s_isum;		/* input checksum computations */
-	u_quad_t rip6s_badsum;		/* of above, checksum error */
-	u_quad_t rip6s_nosock;		/* no matching socket */
-	u_quad_t rip6s_nosockmcast;	/* of above, arrived as multicast */
-	u_quad_t rip6s_fullsock;	/* not delivered, input socket full */
-
-	u_quad_t rip6s_opackets;	/* total output packets */
-};
-
-#ifdef _KERNEL
-extern struct rip6stat rip6stat;
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netinet6/scope6_var.h b/newlib/libc/sys/linux/include/netinet6/scope6_var.h
deleted file mode 100644
index 4f66c53..0000000
--- a/newlib/libc/sys/linux/include/netinet6/scope6_var.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/scope6_var.h,v 1.1 2000/07/04 16:35:10 itojun Exp $	*/
-/*	$KAME: scope6_var.h,v 1.4 2000/05/18 15:03:27 jinmei Exp $	*/
-
-/*
- * Copyright (C) 2000 WIDE Project.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _NETINET6_SCOPE6_VAR_H_
-#define _NETINET6_SCOPE6_VAR_H_
-
-#ifdef _KERNEL
-void	scope6_ifattach __P((struct ifnet *));
-int	scope6_set __P((struct ifnet *, u_int32_t *));
-int	scope6_get __P((struct ifnet *, u_int32_t *));
-void	scope6_setdefault __P((struct ifnet *));
-int	scope6_get_default __P((u_int32_t *));
-u_int32_t scope6_in6_addrscope __P((struct in6_addr *));
-u_int32_t scope6_addr2default __P((struct in6_addr *));
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_SCOPE6_VAR_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/tcp6_var.h b/newlib/libc/sys/linux/include/netinet6/tcp6_var.h
deleted file mode 100644
index 62541ef..0000000
--- a/newlib/libc/sys/linux/include/netinet6/tcp6_var.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet6/tcp6_var.h,v 1.5 2001/11/22 04:50:44 jlemon Exp $
- */
-
-/*
- * Copyright (c) 1982, 1986, 1993, 1994, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD: src/sys/netinet6/tcp6_var.h,v 1.5 2001/11/22 04:50:44 jlemon Exp $
- */
-
-#ifndef _NETINET_TCP6_VAR_H_
-#define _NETINET_TCP6_VAR_H_
-
-#ifdef _KERNEL
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_inet6_tcp6);
-#endif
-
-extern	int tcp_v6mssdflt;	/* XXX */
-
-struct	ip6_hdr;
-void	tcp6_ctlinput __P((int, struct sockaddr *, void *));
-void	tcp6_init __P((void));
-int	tcp6_input __P((struct mbuf **, int *, int));
-struct	rtentry *tcp_rtlookup6(struct in_conninfo *);
-
-extern struct	pr_usrreqs tcp6_usrreqs;
-
-#endif /* _KERNEL */
-
-#endif /* _NETINET_TCP6_VAR_H_ */
diff --git a/newlib/libc/sys/linux/include/netinet6/udp6_var.h b/newlib/libc/sys/linux/include/netinet6/udp6_var.h
deleted file mode 100644
index 222d644..0000000
--- a/newlib/libc/sys/linux/include/netinet6/udp6_var.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/sys/netinet6/udp6_var.h,v 1.5 2001/09/12 08:37:55 julian Exp $
- */
-
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _NETINET6_UDP6_VAR_H_
-#define _NETINET6_UDP6_VAR_H_
-
-#ifdef _KERNEL
-SYSCTL_DECL(_net_inet6_udp6);
-
-extern struct	pr_usrreqs udp6_usrreqs;
-
-void	udp6_ctlinput __P((int, struct sockaddr *, void *));
-int	udp6_input __P((struct mbuf **, int *, int));
-int	udp6_output __P((struct inpcb *inp, struct mbuf *m,
-			struct sockaddr *addr, struct mbuf *control,
-			struct thread *td));
-#endif
-
-#endif /*_NETINET6_UDP6_VAR_H_*/
diff --git a/newlib/libc/sys/linux/include/netns/idp.h b/newlib/libc/sys/linux/include/netns/idp.h
deleted file mode 100644
index 05cd425..0000000
--- a/newlib/libc/sys/linux/include/netns/idp.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1984, 1985, 1986, 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)idp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netns/idp.h,v 1.8 1999/08/28 00:49:46 peter Exp $
- */
-
-#ifndef _NETNS_IDP_H_
-#define _NETNS_IDP_H_
-
-/*
- * Definitions for NS(tm) Internet Datagram Protocol
- */
-struct idp {
-	u_short	idp_sum;	/* Checksum */
-	u_short	idp_len;	/* Length, in bytes, including header */
-	u_char	idp_tc;		/* Transport Control (i.e. hop count) */
-	u_char	idp_pt;		/* Packet Type (i.e. level 2 protocol) */
-	struct ns_addr	idp_dna;	/* Destination Network Address */
-	struct ns_addr	idp_sna;	/* Source Network Address */
-};
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netns/idp_var.h b/newlib/libc/sys/linux/include/netns/idp_var.h
deleted file mode 100644
index aaeb1e0..0000000
--- a/newlib/libc/sys/linux/include/netns/idp_var.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1984, 1985, 1986, 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)idp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netns/idp_var.h,v 1.10 1999/12/29 04:46:18 peter Exp $
- */
-
-#ifndef _NETNS_IDP_VAR_H_
-#define _NETNS_IDP_VAR_H_
-
-/*
- * IDP Kernel Structures and Variables
- */
-struct	idpstat {
-	int	idps_badsum;		/* checksum bad */
-	int	idps_tooshort;		/* packet too short */
-	int	idps_toosmall;		/* not enough data */
-	int	idps_badhlen;		/* ip header length < data size */
-	int	idps_badlen;		/* ip length < ip header length */
-};
-
-#ifdef _KERNEL
-struct	idpstat	idpstat;
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netns/ns.h b/newlib/libc/sys/linux/include/netns/ns.h
deleted file mode 100644
index 94c8017..0000000
--- a/newlib/libc/sys/linux/include/netns/ns.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 1984, 1985, 1986, 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ns.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netns/ns.h,v 1.15 2002/03/20 02:39:27 alfred Exp $
- */
-
-#ifndef _NETNS_NS_H_
-#define _NETNS_NS_H_
-
-/*
- * Constants and Structures defined by the Xerox Network Software
- * per "Internet Transport Protocols", XSIS 028112, December 1981
- */
-
-/*
- * Protocols
- */
-#define NSPROTO_RI	1		/* Routing Information */
-#define NSPROTO_ECHO	2		/* Echo Protocol */
-#define NSPROTO_ERROR	3		/* Error Protocol */
-#define NSPROTO_PE	4		/* Packet Exchange */
-#define NSPROTO_SPP	5		/* Sequenced Packet */
-#define NSPROTO_RAW	255		/* Placemarker*/
-#define NSPROTO_MAX	256		/* Placemarker*/
-
-
-/*
- * Port/Socket numbers: network standard functions
- */
-
-#define NSPORT_RI	1		/* Routing Information */
-#define NSPORT_ECHO	2		/* Echo */
-#define NSPORT_RE	3		/* Router Error */
-
-/*
- * Ports < NSPORT_RESERVED are reserved for priveleged
- * processes (e.g. root).
- */
-#define NSPORT_RESERVED		3000
-
-/* flags passed to ns_output as last parameter */
-
-#define	NS_FORWARDING		0x1	/* most of idp header exists */
-#define	NS_ROUTETOIF		0x10	/* same as SO_DONTROUTE */
-#define	NS_ALLOWBROADCAST	SO_BROADCAST	/* can send broadcast packets */
-
-#define NS_MAXHOPS		15
-
-/* flags passed to get/set socket option */
-#define	SO_HEADERS_ON_INPUT	1
-#define	SO_HEADERS_ON_OUTPUT	2
-#define	SO_DEFAULT_HEADERS	3
-#define	SO_LAST_HEADER		4
-#define	SO_NSIP_ROUTE		5
-#define SO_SEQNO		6
-#define	SO_ALL_PACKETS		7
-#define SO_MTU			8
-
-
-/*
- * NS addressing
- */
-union ns_host {
-	u_char	c_host[6];
-	u_short	s_host[3];
-};
-
-union ns_net {
-	u_char	c_net[4];
-	u_short	s_net[2];
-};
-
-union ns_net_u {
-	union ns_net	net_e;
-	u_long		long_e;
-};
-
-struct ns_addr {
-	union ns_net	x_net;
-	union ns_host	x_host;
-	u_short	x_port;
-};
-
-/*
- * Socket address, Xerox style
- */
-struct sockaddr_ns {
-	u_char		sns_len;
-	u_char		sns_family;
-	struct ns_addr	sns_addr;
-	char		sns_zero[2];
-};
-#define sns_port sns_addr.x_port
-
-#define ns_neteqnn(a,b) (((a).s_net[0]==(b).s_net[0]) && \
-					((a).s_net[1]==(b).s_net[1]))
-#define ns_neteq(a,b) ns_neteqnn((a).x_net, (b).x_net)
-#define satons_addr(sa)	(((struct sockaddr_ns *)&(sa))->sns_addr)
-#define ns_hosteqnh(s,t) ((s).s_host[0] == (t).s_host[0] && \
-	(s).s_host[1] == (t).s_host[1] && (s).s_host[2] == (t).s_host[2])
-#define ns_hosteq(s,t) (ns_hosteqnh((s).x_host,(t).x_host))
-#define ns_nullhost(x) (((x).x_host.s_host[0]==0) && \
-	((x).x_host.s_host[1]==0) && ((x).x_host.s_host[2]==0))
-
-#ifdef _KERNEL
-extern struct domain nsdomain;
-union ns_host ns_thishost;
-union ns_host ns_zerohost;
-union ns_host ns_broadhost;
-union ns_net ns_zeronet;
-union ns_net ns_broadnet;
-u_short ns_cksum();
-#else
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern struct ns_addr ns_addr(const char *);
-extern char *ns_ntoa(struct ns_addr);
-__END_DECLS
-
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netns/ns_error.h b/newlib/libc/sys/linux/include/netns/ns_error.h
deleted file mode 100644
index ae44747..0000000
--- a/newlib/libc/sys/linux/include/netns/ns_error.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 1984, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ns_error.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netns/ns_error.h,v 1.10 1999/12/29 04:46:19 peter Exp $
- */
-
-#ifndef _NETNS_NS_ERROR_H_
-#define _NETNS_NS_ERROR_H_
-
-/*
- * Xerox NS error messages
- */
-
-struct ns_errp {
-	u_short		ns_err_num;		/* Error Number */
-	u_short		ns_err_param;		/* Error Parameter */
-	struct idp	ns_err_idp;		/* Initial segment of offending
-						   packet */
-	u_char		ns_err_lev2[12];	/* at least this much higher
-						   level protocol */
-};
-struct  ns_epidp {
-	struct idp ns_ep_idp;
-	struct ns_errp ns_ep_errp;
-};
-
-#define	NS_ERR_UNSPEC	0	/* Unspecified Error detected at dest. */
-#define	NS_ERR_BADSUM	1	/* Bad Checksum detected at dest */
-#define	NS_ERR_NOSOCK	2	/* Specified socket does not exist at dest*/
-#define	NS_ERR_FULLUP	3	/* Dest. refuses packet due to resource lim.*/
-#define	NS_ERR_UNSPEC_T	0x200	/* Unspec. Error occured before reaching dest*/
-#define	NS_ERR_BADSUM_T	0x201	/* Bad Checksum detected in transit */
-#define	NS_ERR_UNREACH_HOST	0x202	/* Dest cannot be reached from here*/
-#define	NS_ERR_TOO_OLD	0x203	/* Packet x'd 15 routers without delivery*/
-#define	NS_ERR_TOO_BIG	0x204	/* Packet too large to be forwarded through
-				   some intermediate gateway.  The error
-				   parameter field contains the max packet
-				   size that can be accommodated */
-#define NS_ERR_MAX 20
-
-/*
- * Variables related to this implementation
- * of the network systems error message protocol.
- */
-struct	ns_errstat {
-/* statistics related to ns_err packets generated */
-	int	ns_es_error;		/* # of calls to ns_error */
-	int	ns_es_oldshort;		/* no error 'cuz old ip too short */
-	int	ns_es_oldns_err;	/* no error 'cuz old was ns_err */
-	int	ns_es_outhist[NS_ERR_MAX];
-/* statistics related to input messages processed */
-	int	ns_es_badcode;		/* ns_err_code out of range */
-	int	ns_es_tooshort;		/* packet < IDP_MINLEN */
-	int	ns_es_checksum;		/* bad checksum */
-	int	ns_es_badlen;		/* calculated bound mismatch */
-	int	ns_es_reflect;		/* number of responses */
-	int	ns_es_inhist[NS_ERR_MAX];
-	u_short	ns_es_codes[NS_ERR_MAX];/* which error code for outhist
-					   since we might not know all */
-};
-
-#ifdef _KERNEL
-struct	ns_errstat ns_errstat;
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netns/ns_if.h b/newlib/libc/sys/linux/include/netns/ns_if.h
deleted file mode 100644
index 4487b44..0000000
--- a/newlib/libc/sys/linux/include/netns/ns_if.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 1984, 1985, 1986, 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ns_if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netns/ns_if.h,v 1.13 2002/03/20 02:39:27 alfred Exp $
- */
-
-#ifndef _NETNS_NS_IF_H_
-#define _NETNS_NS_IF_H_
-
-/*
- * Interface address, xerox version.  One of these structures
- * is allocated for each interface with an internet address.
- * The ifaddr structure contains the protocol-independent part
- * of the structure and is assumed to be first.
- */
-
-struct ns_ifaddr {
-	struct	ifaddr ia_ifa;		/* protocol-independent info */
-#define	ia_ifp		ia_ifa.ifa_ifp
-#define	ia_flags	ia_ifa.ifa_flags
-	struct	ns_ifaddr *ia_next;	/* next in list of xerox addresses */
-	struct	sockaddr_ns ia_addr;	/* reserve space for my address */
-	struct	sockaddr_ns ia_dstaddr;	/* space for my broadcast address */
-#define ia_broadaddr	ia_dstaddr
-	struct	sockaddr_ns ia_netmask;	/* space for my network mask */
-};
-
-struct	ns_aliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr_ns ifra_addr;
-	struct	sockaddr_ns ifra_broadaddr;
-#define ifra_dstaddr ifra_broadaddr
-};
-/*
- * Given a pointer to an ns_ifaddr (ifaddr),
- * return a pointer to the addr as a sockadd_ns.
- */
-
-#define	IA_SNS(ia) (&(((struct ns_ifaddr *)(ia))->ia_addr))
-
-/* This is not the right place for this but where is? */
-#define	ETHERTYPE_NS	0x0600
-
-#ifdef	NSIP
-struct nsip_req {
-	struct sockaddr rq_ns;	/* must be ns format destination */
-	struct sockaddr rq_ip;	/* must be ip format gateway */
-	short rq_flags;
-};
-#endif
-
-#ifdef	_KERNEL
-struct	ns_ifaddr *ns_ifaddr;
-struct	ns_ifaddr *ns_iaonnetof();
-void	nsintr(void);
-struct	ifqueue	nsintrq;	/* XNS input packet queue */
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netns/ns_pcb.h b/newlib/libc/sys/linux/include/netns/ns_pcb.h
deleted file mode 100644
index 359d839..0000000
--- a/newlib/libc/sys/linux/include/netns/ns_pcb.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 1984, 1985, 1986, 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ns_pcb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netns/ns_pcb.h,v 1.11 1999/12/29 04:46:20 peter Exp $
- */
-
-#ifndef _NETNS_NS_PCB_H_
-#define _NETNS_NS_PCB_H_
-
-/*
- * Ns protocol interface control block.
- */
-struct nspcb {
-	struct	nspcb *nsp_next;	/* doubly linked list */
-	struct	nspcb *nsp_prev;
-	struct	socket *nsp_socket;	/* back pointer to socket */
-	struct	ns_addr nsp_faddr;	/* destination address */
-	struct	ns_addr nsp_laddr;	/* socket's address */
-	caddr_t	nsp_pcb;		/* protocol specific stuff */
-	struct	route nsp_route;	/* routing information */
-	struct	ns_addr nsp_lastdst;	/* validate cached route for dg socks*/
-	long	nsp_notify_param;	/* extra info passed via ns_pcbnotify*/
-	short	nsp_flags;
-	u_char	nsp_dpt;		/* default packet type for idp_output*/
-	u_char	nsp_rpt;		/* last received packet type by
-								idp_input() */
-};
-
-/* possible flags */
-
-#define NSP_IN_ABORT	0x1		/* calling abort through socket */
-#define NSP_RAWIN	0x2		/* show headers on input */
-#define NSP_RAWOUT	0x4		/* show header on output */
-#define NSP_ALL_PACKETS	0x8		/* Turn off higher proto processing */
-
-#define	NS_WILDCARD	1
-
-#define nsp_lport nsp_laddr.x_port
-#define nsp_fport nsp_faddr.x_port
-
-#define	sotonspcb(so)		((struct nspcb *)((so)->so_pcb))
-
-/*
- * Nominal space allocated to a ns socket.
- */
-#define	NSSNDQ		2048
-#define	NSRCVQ		2048
-
-
-#ifdef _KERNEL
-struct	nspcb nspcb;			/* head of list */
-struct	nspcb *ns_pcblookup();
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netns/sp.h b/newlib/libc/sys/linux/include/netns/sp.h
deleted file mode 100644
index 90f26c9..0000000
--- a/newlib/libc/sys/linux/include/netns/sp.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1984, 1985, 1986, 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netns/sp.h,v 1.8 1999/08/28 00:49:52 peter Exp $
- */
-
-#ifndef _NETNS_SP_H_
-#define _NETNS_SP_H_
-
-/*
- * Definitions for Xerox NS style sequenced packet protocol
- */
-
-struct sphdr {
-	u_char	sp_cc;		/* connection control */
-	u_char	sp_dt;		/* datastream type */
-#define	SP_SP	0x80		/* system packet */
-#define	SP_SA	0x40		/* send acknowledgement */
-#define	SP_OB	0x20		/* attention (out of band data) */
-#define	SP_EM	0x10		/* end of message */
-	u_short	sp_sid;		/* source connection identifier */
-	u_short	sp_did;		/* destination connection identifier */
-	u_short	sp_seq;		/* sequence number */
-	u_short	sp_ack;		/* acknowledge number */
-	u_short	sp_alo;		/* allocation number */
-};
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netns/spidp.h b/newlib/libc/sys/linux/include/netns/spidp.h
deleted file mode 100644
index 310a2b2..0000000
--- a/newlib/libc/sys/linux/include/netns/spidp.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 1984, 1985, 1986, 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)spidp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netns/spidp.h,v 1.8 1999/08/28 00:49:52 peter Exp $
- */
-
-#ifndef _NETNS_SPIDP_H_
-#define _NETNS_SPIDP_H_
-
-/*
- * Definitions for NS(tm) Internet Datagram Protocol
- * containing a Sequenced Packet Protocol packet.
- */
-struct spidp {
-	struct idp	si_i;
-	struct sphdr 	si_s;
-};
-struct spidp_q {
-	struct spidp_q	*si_next;
-	struct spidp_q	*si_prev;
-};
-#define SI(x)	((struct spidp *)x)
-#define si_sum	si_i.idp_sum
-#define si_len	si_i.idp_len
-#define si_tc	si_i.idp_tc
-#define si_pt	si_i.idp_pt
-#define si_dna	si_i.idp_dna
-#define si_sna	si_i.idp_sna
-#define si_sport	si_i.idp_sna.x_port
-#define si_cc	si_s.sp_cc
-#define si_dt	si_s.sp_dt
-#define si_sid	si_s.sp_sid
-#define si_did	si_s.sp_did
-#define si_seq	si_s.sp_seq
-#define si_ack	si_s.sp_ack
-#define si_alo	si_s.sp_alo
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netns/spp_debug.h b/newlib/libc/sys/linux/include/netns/spp_debug.h
deleted file mode 100644
index f85cc39..0000000
--- a/newlib/libc/sys/linux/include/netns/spp_debug.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1984, 1985, 1986, 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)spp_debug.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netns/spp_debug.h,v 1.9 1999/08/28 00:49:53 peter Exp $
- */
-
-#ifndef _NETNS_SPP_DEBUG_H_
-#define _NETNS_SPP_DEBUG_H_
-
-struct	spp_debug {
-	u_long	sd_time;
-	short	sd_act;
-	short	sd_ostate;
-	caddr_t	sd_cb;
-	short	sd_req;
-	struct	spidp sd_si;
-	struct	sppcb sd_sp;
-};
-
-#define	SA_INPUT 	0
-#define	SA_OUTPUT	1
-#define	SA_USER		2
-#define	SA_RESPOND	3
-#define	SA_DROP		4
-
-#ifdef SANAMES
-char	*sanames[] =
-    { "input", "output", "user", "respond", "drop" };
-#endif
-
-#define	SPP_NDEBUG 100
-struct	spp_debug spp_debug[SPP_NDEBUG];
-int	spp_debx;
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netns/spp_timer.h b/newlib/libc/sys/linux/include/netns/spp_timer.h
deleted file mode 100644
index e28ecad..0000000
--- a/newlib/libc/sys/linux/include/netns/spp_timer.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)spp_timer.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netns/spp_timer.h,v 1.9 1999/12/29 04:46:20 peter Exp $
- */
-
-#ifndef _NETNS_SPP_TIMER_H_
-#define _NETNS_SPP_TIMER_H_
-
-/*
- * Definitions of the SPP timers.  These timers are counted
- * down PR_SLOWHZ times a second.
- */
-#define	SPPT_NTIMERS	4
-
-#define	SPPT_REXMT	0		/* retransmit */
-#define	SPPT_PERSIST	1		/* retransmit persistance */
-#define	SPPT_KEEP	2		/* keep alive */
-#define	SPPT_2MSL	3		/* 2*msl quiet time timer */
-
-/*
- * The SPPT_REXMT timer is used to force retransmissions.
- * The SPP has the SPPT_REXMT timer set whenever segments
- * have been sent for which ACKs are expected but not yet
- * received.  If an ACK is received which advances tp->snd_una,
- * then the retransmit timer is cleared (if there are no more
- * outstanding segments) or reset to the base value (if there
- * are more ACKs expected).  Whenever the retransmit timer goes off,
- * we retransmit one unacknowledged segment, and do a backoff
- * on the retransmit timer.
- *
- * The SPPT_PERSIST timer is used to keep window size information
- * flowing even if the window goes shut.  If all previous transmissions
- * have been acknowledged (so that there are no retransmissions in progress),
- * and the window is too small to bother sending anything, then we start
- * the SPPT_PERSIST timer.  When it expires, if the window is nonzero,
- * we go to transmit state.  Otherwise, at intervals send a single byte
- * into the peer's window to force him to update our window information.
- * We do this at most as often as SPPT_PERSMIN time intervals,
- * but no more frequently than the current estimate of round-trip
- * packet time.  The SPPT_PERSIST timer is cleared whenever we receive
- * a window update from the peer.
- *
- * The SPPT_KEEP timer is used to keep connections alive.  If an
- * connection is idle (no segments received) for SPPTV_KEEP amount of time,
- * but not yet established, then we drop the connection.  If the connection
- * is established, then we force the peer to send us a segment by sending:
- *	<SEQ=SND.UNA-1><ACK=RCV.NXT><CTL=ACK>
- * This segment is (deliberately) outside the window, and should elicit
- * an ack segment in response from the peer.  If, despite the SPPT_KEEP
- * initiated segments we cannot elicit a response from a peer in SPPT_MAXIDLE
- * amount of time, then we drop the connection.
- */
-
-#define	SPP_TTL		30		/* default time to live for SPP segs */
-/*
- * Time constants.
- */
-#define	SPPTV_MSL	( 15*PR_SLOWHZ)		/* max seg lifetime */
-#define	SPPTV_SRTTBASE	0			/* base roundtrip time;
-						   if 0, no idea yet */
-#define	SPPTV_SRTTDFLT	(  3*PR_SLOWHZ)		/* assumed RTT if no info */
-
-#define	SPPTV_PERSMIN	(  5*PR_SLOWHZ)		/* retransmit persistance */
-#define	SPPTV_PERSMAX	( 60*PR_SLOWHZ)		/* maximum persist interval */
-
-#define	SPPTV_KEEP	( 75*PR_SLOWHZ)		/* keep alive - 75 secs */
-#define	SPPTV_MAXIDLE	(  8*SPPTV_KEEP)	/* maximum allowable idle
-						   time before drop conn */
-
-#define	SPPTV_MIN	(  1*PR_SLOWHZ)		/* minimum allowable value */
-#define	SPPTV_REXMTMAX	( 64*PR_SLOWHZ)		/* max allowable REXMT value */
-
-#define	SPP_LINGERTIME	120			/* linger at most 2 minutes */
-
-#define	SPP_MAXRXTSHIFT	12			/* maximum retransmits */
-
-#ifdef	SPPTIMERS
-char *spptimers[] =
-    { "REXMT", "PERSIST", "KEEP", "2MSL" };
-#endif
-
-/*
- * Force a time value to be in a certain range.
- */
-#define	SPPT_RANGESET(tv, value, tvmin, tvmax) { \
-	(tv) = (value); \
-	if ((tv) < (tvmin)) \
-		(tv) = (tvmin); \
-	else if ((tv) > (tvmax)) \
-		(tv) = (tvmax); \
-}
-
-#ifdef _KERNEL
-extern int spp_backoff[];
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/netns/spp_var.h b/newlib/libc/sys/linux/include/netns/spp_var.h
deleted file mode 100644
index ed1ec05..0000000
--- a/newlib/libc/sys/linux/include/netns/spp_var.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 1984, 1985, 1986, 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)spp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netns/spp_var.h,v 1.11 1999/12/29 04:46:21 peter Exp $
- */
-
-#ifndef _NETNS_SPP_VAR_H_
-#define _NETNS_SPP_VAR_H_
-
-/*
- * Sp control block, one per connection
- */
-struct sppcb {
-	struct	spidp_q	s_q;		/* queue for out-of-order receipt */
-	struct	nspcb	*s_nspcb;	/* backpointer to internet pcb */
-	u_char	s_state;
-	u_char	s_flags;
-#define	SF_ACKNOW	0x01		/* Ack peer immediately */
-#define	SF_DELACK	0x02		/* Ack, but try to delay it */
-#define	SF_HI	0x04			/* Show headers on input */
-#define	SF_HO	0x08			/* Show headers on output */
-#define	SF_PI	0x10			/* Packet (datagram) interface */
-#define SF_WIN	0x20			/* Window info changed */
-#define SF_RXT	0x40			/* Rxt info changed */
-#define SF_RVD	0x80			/* Calling from read usrreq routine */
-	u_short s_mtu;			/* Max packet size for this stream */
-/* use sequence fields in headers to store sequence numbers for this
-   connection */
-	struct	idp	*s_idp;
-	struct	sphdr	s_shdr;		/* prototype header to transmit */
-#define s_cc s_shdr.sp_cc		/* connection control (for EM bit) */
-#define s_dt s_shdr.sp_dt		/* datastream type */
-#define s_sid s_shdr.sp_sid		/* source connection identifier */
-#define s_did s_shdr.sp_did		/* destination connection identifier */
-#define s_seq s_shdr.sp_seq		/* sequence number */
-#define s_ack s_shdr.sp_ack		/* acknowledge number */
-#define s_alo s_shdr.sp_alo		/* allocation number */
-#define s_dport s_idp->idp_dna.x_port	/* where we are sending */
-	struct sphdr s_rhdr;		/* last received header (in effect!)*/
-	u_short s_rack;			/* their acknowledge number */
-	u_short s_ralo;			/* their allocation number */
-	u_short s_smax;			/* highest packet # we have sent */
-	u_short	s_snxt;			/* which packet to send next */
-
-/* congestion control */
-#define	CUNIT	1024			/* scaling for ... */
-	int	s_cwnd;			/* Congestion-controlled window */
-					/* in packets * CUNIT */
-	short	s_swnd;			/* == tcp snd_wnd, in packets */
-	short	s_smxw;			/* == tcp max_sndwnd */
-					/* difference of two spp_seq's can be
-					   no bigger than a short */
-	u_short	s_swl1;			/* == tcp snd_wl1 */
-	u_short	s_swl2;			/* == tcp snd_wl2 */
-	int	s_cwmx;			/* max allowable cwnd */
-	int	s_ssthresh;		/* s_cwnd size threshhold for
-					 * slow start exponential-to-
-					 * linear switch */
-/* transmit timing stuff
- * srtt and rttvar are stored as fixed point, for convenience in smoothing.
- * srtt has 3 bits to the right of the binary point, rttvar has 2.
- */
-	short	s_idle;			/* time idle */
-	short	s_timer[SPPT_NTIMERS];	/* timers */
-	short	s_rxtshift;		/* log(2) of rexmt exp. backoff */
-	short	s_rxtcur;		/* current retransmit value */
-	u_short	s_rtseq;		/* packet being timed */
-	short	s_rtt;			/* timer for round trips */
-	short	s_srtt;			/* averaged timer */
-	short	s_rttvar;		/* variance in round trip time */
-	char	s_force;		/* which timer expired */
-	char	s_dupacks;		/* counter to intuit xmt loss */
-
-/* out of band data */
-	char	s_oobflags;
-#define SF_SOOB	0x08			/* sending out of band data */
-#define SF_IOOB 0x10			/* receiving out of band data */
-	char	s_iobc;			/* input characters */
-/* debug stuff */
-	u_short	s_want;			/* Last candidate for sending */
-	char	s_outx;			/* exit taken from spp_output */
-	char	s_inx;			/* exit taken from spp_input */
-	u_short	s_flags2;		/* more flags for testing */
-#define SF_NEWCALL	0x100		/* for new_recvmsg */
-#define SO_NEWCALL	10		/* for new_recvmsg */
-};
-
-#define	nstosppcb(np)	((struct sppcb *)(np)->nsp_pcb)
-#define	sotosppcb(so)	(nstosppcb(sotonspcb(so)))
-
-struct	sppstat {
-	long	spps_connattempt;	/* connections initiated */
-	long	spps_accepts;		/* connections accepted */
-	long	spps_connects;		/* connections established */
-	long	spps_drops;		/* connections dropped */
-	long	spps_conndrops;		/* embryonic connections dropped */
-	long	spps_closed;		/* conn. closed (includes drops) */
-	long	spps_segstimed;		/* segs where we tried to get rtt */
-	long	spps_rttupdated;	/* times we succeeded */
-	long	spps_delack;		/* delayed acks sent */
-	long	spps_timeoutdrop;	/* conn. dropped in rxmt timeout */
-	long	spps_rexmttimeo;	/* retransmit timeouts */
-	long	spps_persisttimeo;	/* persist timeouts */
-	long	spps_keeptimeo;		/* keepalive timeouts */
-	long	spps_keepprobe;		/* keepalive probes sent */
-	long	spps_keepdrops;		/* connections dropped in keepalive */
-
-	long	spps_sndtotal;		/* total packets sent */
-	long	spps_sndpack;		/* data packets sent */
-	long	spps_sndbyte;		/* data bytes sent */
-	long	spps_sndrexmitpack;	/* data packets retransmitted */
-	long	spps_sndrexmitbyte;	/* data bytes retransmitted */
-	long	spps_sndacks;		/* ack-only packets sent */
-	long	spps_sndprobe;		/* window probes sent */
-	long	spps_sndurg;		/* packets sent with URG only */
-	long	spps_sndwinup;		/* window update-only packets sent */
-	long	spps_sndctrl;		/* control (SYN|FIN|RST) packets sent */
-	long	spps_sndvoid;		/* couldn't find requested packet*/
-
-	long	spps_rcvtotal;		/* total packets received */
-	long	spps_rcvpack;		/* packets received in sequence */
-	long	spps_rcvbyte;		/* bytes received in sequence */
-	long	spps_rcvbadsum;		/* packets received with ccksum errs */
-	long	spps_rcvbadoff;		/* packets received with bad offset */
-	long	spps_rcvshort;		/* packets received too short */
-	long	spps_rcvduppack;	/* duplicate-only packets received */
-	long	spps_rcvdupbyte;	/* duplicate-only bytes received */
-	long	spps_rcvpartduppack;	/* packets with some duplicate data */
-	long	spps_rcvpartdupbyte;	/* dup. bytes in part-dup. packets */
-	long	spps_rcvoopack;		/* out-of-order packets received */
-	long	spps_rcvoobyte;		/* out-of-order bytes received */
-	long	spps_rcvpackafterwin;	/* packets with data after window */
-	long	spps_rcvbyteafterwin;	/* bytes rcvd after window */
-	long	spps_rcvafterclose;	/* packets rcvd after "close" */
-	long	spps_rcvwinprobe;	/* rcvd window probe packets */
-	long	spps_rcvdupack;		/* rcvd duplicate acks */
-	long	spps_rcvacktoomuch;	/* rcvd acks for unsent data */
-	long	spps_rcvackpack;	/* rcvd ack packets */
-	long	spps_rcvackbyte;	/* bytes acked by rcvd acks */
-	long	spps_rcvwinupd;		/* rcvd window update packets */
-};
-struct	spp_istat {
-	short	hdrops;
-	short	badsum;
-	short	badlen;
-	short	slotim;
-	short	fastim;
-	short	nonucn;
-	short	noconn;
-	short	notme;
-	short	wrncon;
-	short	bdreas;
-	short	gonawy;
-	short	notyet;
-	short	lstdup;
-	struct sppstat newstats;
-};
-
-#ifdef _KERNEL
-struct spp_istat spp_istat;
-
-/* Following was struct sppstat sppstat; */
-#ifndef sppstat
-#define sppstat spp_istat.newstats
-#endif
-
-u_short spp_iss;
-extern struct sppcb *spp_close(), *spp_disconnect(),
-	*spp_usrclosed(), *spp_timers(), *spp_drop();
-#endif
-
-#define	SPP_ISSINCR	128
-/*
- * SPP sequence numbers are 16 bit integers operated
- * on with modular arithmetic.  These macros can be
- * used to compare such integers.
- */
-#ifdef sun
-short xnsCbug;
-#define	SSEQ_LT(a,b)	((xnsCbug = (short)((a)-(b))) < 0)
-#define	SSEQ_LEQ(a,b)	((xnsCbug = (short)((a)-(b))) <= 0)
-#define	SSEQ_GT(a,b)	((xnsCbug = (short)((a)-(b))) > 0)
-#define	SSEQ_GEQ(a,b)	((xnsCbug = (short)((a)-(b))) >= 0)
-#else
-#define	SSEQ_LT(a,b)	(((short)((a)-(b))) < 0)
-#define	SSEQ_LEQ(a,b)	(((short)((a)-(b))) <= 0)
-#define	SSEQ_GT(a,b)	(((short)((a)-(b))) > 0)
-#define	SSEQ_GEQ(a,b)	(((short)((a)-(b))) >= 0)
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/include/nsswitch.h b/newlib/libc/sys/linux/include/nsswitch.h
deleted file mode 100644
index 3a578e4..0000000
--- a/newlib/libc/sys/linux/include/nsswitch.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*	$NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $	*/
-/*	$FreeBSD: src/include/nsswitch.h,v 1.2 2002/03/23 17:24:53 imp Exp $ */
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _NSSWITCH_H
-#define _NSSWITCH_H	1
-
-#include <sys/types.h>
-
-#include <stdarg.h>
-
-#ifndef _PATH_NS_CONF
-#define _PATH_NS_CONF	"/etc/nsswitch.conf"
-#endif
-
-#define	NS_CONTINUE	0
-#define	NS_RETURN	1
-
-#define	NS_SUCCESS	(1<<0)		/* entry was found */
-#define	NS_UNAVAIL	(1<<1)		/* source not responding, or corrupt */
-#define	NS_NOTFOUND	(1<<2)		/* source responded 'no such entry' */
-#define	NS_TRYAGAIN	(1<<3)		/* source busy, may respond to retrys */
-#define	NS_STATUSMASK	0x000000ff	/* bitmask to get the status flags */
-
-/*
- * currently implemented sources
- */
-#define NSSRC_FILES	"files"		/* local files */
-#define	NSSRC_DNS	"dns"		/* DNS; IN for hosts, HS for others */
-#define	NSSRC_NIS	"nis"		/* YP/NIS */
-#define	NSSRC_COMPAT	"compat"	/* passwd,group in YP compat mode */
-
-/*
- * currently implemented databases
- */
-#define NSDB_HOSTS		"hosts"
-#define NSDB_GROUP		"group"
-#define NSDB_GROUP_COMPAT	"group_compat"
-#define NSDB_NETGROUP		"netgroup"
-#define NSDB_NETWORKS		"networks"
-#define NSDB_PASSWD		"passwd"
-#define NSDB_PASSWD_COMPAT	"passwd_compat"
-#define NSDB_SHELLS		"shells"
-
-/*
- * suggested databases to implement
- */
-#define NSDB_ALIASES		"aliases"
-#define NSDB_AUTH		"auth"
-#define NSDB_AUTOMOUNT		"automount"
-#define NSDB_BOOTPARAMS		"bootparams"
-#define NSDB_ETHERS		"ethers"
-#define NSDB_EXPORTS		"exports"
-#define NSDB_NETMASKS		"netmasks"
-#define NSDB_PHONES		"phones"
-#define NSDB_PRINTCAP		"printcap"
-#define NSDB_PROTOCOLS		"protocols"
-#define NSDB_REMOTE		"remote"
-#define NSDB_RPC		"rpc"
-#define NSDB_SENDMAILVARS	"sendmailvars"
-#define NSDB_SERVICES		"services"
-#define NSDB_TERMCAP		"termcap"
-#define NSDB_TTYS		"ttys"
-
-/*
- * ns_dtab - `nsswitch dispatch table'
- * contains an entry for each source and the appropriate function to call
- */
-typedef struct {
-	const char	 *src;
-	int		(*callback)(void *retval, void *cb_data, va_list ap);
-	void		 *cb_data;
-} ns_dtab;
-
-/*
- * macros to help build an ns_dtab[]
- */
-#define NS_FILES_CB(F,C)	{ NSSRC_FILES,	F,	C },
-#define NS_COMPAT_CB(F,C)	{ NSSRC_COMPAT,	F,	C },
- 
-#ifdef HESIOD
-#   define NS_DNS_CB(F,C)	{ NSSRC_DNS,	F,	C },
-#else
-#   define NS_DNS_CB(F,C)
-#endif
-
-#ifdef YP
-#   define NS_NIS_CB(F,C)	{ NSSRC_NIS,	F,	C },
-#else
-#   define NS_NIS_CB(F,C)
-#endif
-
-/*
- * ns_src - `nsswitch source'
- * used by the nsparser routines to store a mapping between a source
- * and its dispatch control flags for a given database.
- */
-typedef struct {
-	const char	*name;
-	u_int32_t	 flags;
-} ns_src;
-
-
-/*
- * default sourcelist (if nsswitch.conf is missing, corrupt,
- * or the requested database doesn't have an entry.
- */
-extern const ns_src __nsdefaultsrc[];
-
-
-#ifdef _NS_PRIVATE
-
-/*
- * private data structures for back-end nsswitch implementation
- */
-
-/*
- * ns_dbt - `nsswitch database thang'
- * for each database in /etc/nsswitch.conf there is a ns_dbt, with its
- * name and a list of ns_src's containing the source information.
- */
-typedef struct {
-	const char	*name;		/* name of database */
-	ns_src		*srclist;	/* list of sources */
-	int		 srclistsize;	/* size of srclist */
-} ns_dbt;
-
-#endif /* _NS_PRIVATE */
-
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern	int	nsdispatch(void *, const ns_dtab [], const char *,
-			   const char *, const ns_src [], ...);
-
-#ifdef _NS_PRIVATE
-extern	void		 _nsdbtaddsrc(ns_dbt *, const ns_src *);
-extern	void		 _nsdbtdump(const ns_dbt *);
-extern	const ns_dbt	*_nsdbtget(const char *);
-extern	void		 _nsdbtput(const ns_dbt *);
-extern	void		 _nsyyerror(const char *);
-extern	int		 _nsyylex(void);
-extern	int		 _nsyylineno;
-#endif /* _NS_PRIVATE */
-
-__END_DECLS
-
-#endif /* !_NSSWITCH_H */
diff --git a/newlib/libc/sys/linux/include/paths.h b/newlib/libc/sys/linux/include/paths.h
deleted file mode 100644
index a87831e..0000000
--- a/newlib/libc/sys/linux/include/paths.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)paths.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _PATHS_H_
-#define	_PATHS_H_
-
-/* Default search path. */
-#define	_PATH_DEFPATH	"/usr/bin:/bin"
-/* All standard utilities path. */
-#define	_PATH_STDPATH \
-	"/usr/bin:/bin:/usr/sbin:/sbin"
-
-#define	_PATH_BSHELL	"/bin/sh"
-#define	_PATH_CONSOLE	"/dev/console"
-#define	_PATH_CSHELL	"/bin/csh"
-#define	_PATH_DEVDB	"/var/run/dev.db"
-#define	_PATH_DEVNULL	"/dev/null"
-#define	_PATH_DRUM	"/dev/drum"
-#define	_PATH_KLOG	"/proc/kmsg"
-#define	_PATH_KMEM	"/dev/kmem"
-#define	_PATH_LASTLOG	"/var/log/lastlog"
-#define	_PATH_MAILDIR	"/var/mail"
-#define	_PATH_MAN	"/usr/share/man"
-#define	_PATH_MEM	"/dev/mem"
-#define	_PATH_MNTTAB	"/etc/fstab"
-#define	_PATH_MOUNTED	"/etc/mtab"
-#define	_PATH_NOLOGIN	"/etc/nologin"
-#define	_PATH_PRESERVE	"/var/lib"
-#define	_PATH_RWHODIR	"/var/spool/rwho"
-#define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
-#define	_PATH_SHADOW	"/etc/shadow"
-#define	_PATH_SHELLS	"/etc/shells"
-#define	_PATH_TTY	"/dev/tty"
-#define	_PATH_UNIX	"/boot/vmlinux"
-#define _PATH_UTMP	"/var/run/utmp"
-#define	_PATH_VI	"/bin/vi"
-#define _PATH_WTMP	"/var/log/wtmp"
-
-/* Provide trailing slash, since mostly used for building pathnames. */
-#define	_PATH_DEV	"/dev/"
-#define	_PATH_TMP	"/tmp/"
-#define	_PATH_VARDB	"/var/db/"
-#define	_PATH_VARRUN	"/var/run/"
-#define	_PATH_VARTMP	"/var/tmp/"
-
-#endif /* !_PATHS_H_ */
diff --git a/newlib/libc/sys/linux/include/pthread.h b/newlib/libc/sys/linux/include/pthread.h
deleted file mode 100644
index d7addbe..0000000
--- a/newlib/libc/sys/linux/include/pthread.h
+++ /dev/null
@@ -1,682 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-#ifndef _PTHREAD_H
-#define _PTHREAD_H	1
-
-#include <features.h>
-
-#include <sched.h>
-#include <time.h>
-
-#define __need_sigset_t
-#include <signal.h>
-#include <bits/pthreadtypes.h>
-#include <bits/initspin.h>
-
-
-__BEGIN_DECLS
-
-/* Initializers.  */
-
-#define PTHREAD_MUTEX_INITIALIZER \
-  {0, 0, 0, PTHREAD_MUTEX_TIMED_NP, __LOCK_INITIALIZER}
-#ifdef __USE_GNU
-# define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
-  {0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, __LOCK_INITIALIZER}
-# define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
-  {0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, __LOCK_INITIALIZER}
-# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
-  {0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __LOCK_INITIALIZER}
-#endif
-
-#define PTHREAD_COND_INITIALIZER {__LOCK_INITIALIZER, 0}
-
-#ifdef __USE_UNIX98
-# define PTHREAD_RWLOCK_INITIALIZER \
-  { __LOCK_INITIALIZER, 0, NULL, NULL, NULL,				      \
-    PTHREAD_RWLOCK_DEFAULT_NP, PTHREAD_PROCESS_PRIVATE }
-#endif
-#ifdef __USE_GNU
-# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
-  { __LOCK_INITIALIZER, 0, NULL, NULL, NULL,				      \
-    PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, PTHREAD_PROCESS_PRIVATE }
-#endif
-
-/* Values for attributes.  */
-
-enum
-{
-  PTHREAD_CREATE_JOINABLE,
-#define PTHREAD_CREATE_JOINABLE	PTHREAD_CREATE_JOINABLE
-  PTHREAD_CREATE_DETACHED
-#define PTHREAD_CREATE_DETACHED	PTHREAD_CREATE_DETACHED
-};
-
-enum
-{
-  PTHREAD_INHERIT_SCHED,
-#define PTHREAD_INHERIT_SCHED	PTHREAD_INHERIT_SCHED
-  PTHREAD_EXPLICIT_SCHED
-#define PTHREAD_EXPLICIT_SCHED	PTHREAD_EXPLICIT_SCHED
-};
-
-enum
-{
-  PTHREAD_SCOPE_SYSTEM,
-#define PTHREAD_SCOPE_SYSTEM	PTHREAD_SCOPE_SYSTEM
-  PTHREAD_SCOPE_PROCESS
-#define PTHREAD_SCOPE_PROCESS	PTHREAD_SCOPE_PROCESS
-};
-
-enum
-{
-  PTHREAD_MUTEX_TIMED_NP,
-  PTHREAD_MUTEX_RECURSIVE_NP,
-  PTHREAD_MUTEX_ERRORCHECK_NP,
-  PTHREAD_MUTEX_ADAPTIVE_NP
-#ifdef __USE_UNIX98
-  ,
-  PTHREAD_MUTEX_NORMAL = PTHREAD_MUTEX_TIMED_NP,
-  PTHREAD_MUTEX_RECURSIVE = PTHREAD_MUTEX_RECURSIVE_NP,
-  PTHREAD_MUTEX_ERRORCHECK = PTHREAD_MUTEX_ERRORCHECK_NP,
-  PTHREAD_MUTEX_DEFAULT = PTHREAD_MUTEX_NORMAL
-#endif
-#ifdef __USE_GNU
-  /* For compatibility.  */
-  , PTHREAD_MUTEX_FAST_NP = PTHREAD_MUTEX_ADAPTIVE_NP
-#endif
-};
-
-enum
-{
-  PTHREAD_PROCESS_PRIVATE,
-#define PTHREAD_PROCESS_PRIVATE	PTHREAD_PROCESS_PRIVATE
-  PTHREAD_PROCESS_SHARED
-#define PTHREAD_PROCESS_SHARED	PTHREAD_PROCESS_SHARED
-};
-
-#ifdef __USE_UNIX98
-enum
-{
-  PTHREAD_RWLOCK_PREFER_READER_NP,
-  PTHREAD_RWLOCK_PREFER_WRITER_NP,
-  PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,
-  PTHREAD_RWLOCK_DEFAULT_NP = PTHREAD_RWLOCK_PREFER_WRITER_NP
-};
-#endif	/* Unix98 */
-
-#define PTHREAD_ONCE_INIT 0
-
-/* Special constants */
-
-#ifdef __USE_XOPEN2K
-/* -1 is distinct from 0 and all errno constants */
-# define PTHREAD_BARRIER_SERIAL_THREAD -1
-#endif
-
-/* Cleanup buffers */
-
-struct _pthread_cleanup_buffer
-{
-  void (*__routine) (void *);		  /* Function to call.  */
-  void *__arg;				  /* Its argument.  */
-  int __canceltype;			  /* Saved cancellation type. */
-  struct _pthread_cleanup_buffer *__prev; /* Chaining of cleanup functions.  */
-};
-
-/* Cancellation */
-
-enum
-{
-  PTHREAD_CANCEL_ENABLE,
-#define PTHREAD_CANCEL_ENABLE	PTHREAD_CANCEL_ENABLE
-  PTHREAD_CANCEL_DISABLE
-#define PTHREAD_CANCEL_DISABLE	PTHREAD_CANCEL_DISABLE
-};
-enum
-{
-  PTHREAD_CANCEL_DEFERRED,
-#define PTHREAD_CANCEL_DEFERRED	PTHREAD_CANCEL_DEFERRED
-  PTHREAD_CANCEL_ASYNCHRONOUS
-#define PTHREAD_CANCEL_ASYNCHRONOUS	PTHREAD_CANCEL_ASYNCHRONOUS
-};
-#define PTHREAD_CANCELED ((void *) -1)
-
-
-/* Function for handling threads.  */
-
-/* Create a thread with given attributes ATTR (or default attributes
-   if ATTR is NULL), and call function START_ROUTINE with given
-   arguments ARG.  */
-extern int pthread_create (pthread_t *__restrict __thread1,
-			   __const pthread_attr_t *__restrict __attr,
-			   void *(*__start_routine) (void *),
-			   void *__restrict __arg) __THROW;
-
-/* Obtain the identifier of the current thread.  */
-extern pthread_t pthread_self (void) __THROW;
-
-/* Compare two thread identifiers.  */
-extern int pthread_equal (pthread_t __thread1, pthread_t __thread2) __THROW;
-
-/* Terminate calling thread.  */
-extern void pthread_exit (void *__retval)
-     __THROW __attribute__ ((__noreturn__));
-
-/* Make calling thread wait for termination of the thread TH.  The
-   exit status of the thread is stored in *THREAD_RETURN, if THREAD_RETURN
-   is not NULL.  */
-extern int pthread_join (pthread_t __th, void **__thread_return) __THROW;
-
-/* Indicate that the thread TH is never to be joined with PTHREAD_JOIN.
-   The resources of TH will therefore be freed immediately when it
-   terminates, instead of waiting for another thread to perform PTHREAD_JOIN
-   on it.  */
-extern int pthread_detach (pthread_t __th) __THROW;
-
-
-/* Functions for handling attributes.  */
-
-/* Initialize thread attribute *ATTR with default attributes
-   (detachstate is PTHREAD_JOINABLE, scheduling policy is SCHED_OTHER,
-    no user-provided stack).  */
-extern int pthread_attr_init (pthread_attr_t *__attr) __THROW;
-
-/* Destroy thread attribute *ATTR.  */
-extern int pthread_attr_destroy (pthread_attr_t *__attr) __THROW;
-
-/* Set the `detachstate' attribute in *ATTR according to DETACHSTATE.  */
-extern int pthread_attr_setdetachstate (pthread_attr_t *__attr,
-					int __detachstate) __THROW;
-
-/* Return in *DETACHSTATE the `detachstate' attribute in *ATTR.  */
-extern int pthread_attr_getdetachstate (__const pthread_attr_t *__attr,
-					int *__detachstate) __THROW;
-
-/* Set scheduling parameters (priority, etc) in *ATTR according to PARAM.  */
-extern int pthread_attr_setschedparam (pthread_attr_t *__restrict __attr,
-				       __const struct sched_param *__restrict
-				       __param) __THROW;
-
-/* Return in *PARAM the scheduling parameters of *ATTR.  */
-extern int pthread_attr_getschedparam (__const pthread_attr_t *__restrict
-				       __attr,
-				       struct sched_param *__restrict __param)
-     __THROW;
-
-/* Set scheduling policy in *ATTR according to POLICY.  */
-extern int pthread_attr_setschedpolicy (pthread_attr_t *__attr, int __policy)
-     __THROW;
-
-/* Return in *POLICY the scheduling policy of *ATTR.  */
-extern int pthread_attr_getschedpolicy (__const pthread_attr_t *__restrict
-					__attr, int *__restrict __policy)
-     __THROW;
-
-/* Set scheduling inheritance mode in *ATTR according to INHERIT.  */
-extern int pthread_attr_setinheritsched (pthread_attr_t *__attr,
-					 int __inherit) __THROW;
-
-/* Return in *INHERIT the scheduling inheritance mode of *ATTR.  */
-extern int pthread_attr_getinheritsched (__const pthread_attr_t *__restrict
-					 __attr, int *__restrict __inherit)
-     __THROW;
-
-/* Set scheduling contention scope in *ATTR according to SCOPE.  */
-extern int pthread_attr_setscope (pthread_attr_t *__attr, int __scope)
-     __THROW;
-
-/* Return in *SCOPE the scheduling contention scope of *ATTR.  */
-extern int pthread_attr_getscope (__const pthread_attr_t *__restrict __attr,
-				  int *__restrict __scope) __THROW;
-
-#ifdef __USE_UNIX98
-/* Set the size of the guard area at the bottom of the thread.  */
-extern int pthread_attr_setguardsize (pthread_attr_t *__attr,
-				      size_t __guardsize) __THROW;
-
-/* Get the size of the guard area at the bottom of the thread.  */
-extern int pthread_attr_getguardsize (__const pthread_attr_t *__restrict
-				      __attr, size_t *__restrict __guardsize)
-     __THROW;
-#endif
-
-/* Set the starting address of the stack of the thread to be created.
-   Depending on whether the stack grows up or down the value must either
-   be higher or lower than all the address in the memory block.  The
-   minimal size of the block must be PTHREAD_STACK_SIZE.  */
-extern int pthread_attr_setstackaddr (pthread_attr_t *__attr,
-				      void *__stackaddr) __THROW;
-
-/* Return the previously set address for the stack.  */
-extern int pthread_attr_getstackaddr (__const pthread_attr_t *__restrict
-				      __attr, void **__restrict __stackaddr)
-     __THROW;
-
-#ifdef __USE_XOPEN2K
-/* The following two interfaces are intended to replace the last two.  They
-   require setting the address as well as the size since only setting the
-   address will make the implementation on some architectures impossible.  */
-extern int pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr,
-				  size_t __stacksize) __THROW;
-
-/* Return the previously set address for the stack.  */
-extern int pthread_attr_getstack (__const pthread_attr_t *__restrict __attr,
-				  void **__restrict __stackaddr,
-				  size_t *__restrict __stacksize) __THROW;
-#endif
-
-/* Add information about the minimum stack size needed for the thread
-   to be started.  This size must never be less than PTHREAD_STACK_SIZE
-   and must also not exceed the system limits.  */
-extern int pthread_attr_setstacksize (pthread_attr_t *__attr,
-				      size_t __stacksize) __THROW;
-
-/* Return the currently used minimal stack size.  */
-extern int pthread_attr_getstacksize (__const pthread_attr_t *__restrict
-				      __attr, size_t *__restrict __stacksize)
-     __THROW;
-
-#ifdef __USE_GNU
-/* Get thread attributes corresponding to the already running thread TH.  */
-extern int pthread_getattr_np (pthread_t __th, pthread_attr_t *__attr) __THROW;
-#endif
-
-/* Functions for scheduling control.  */
-
-/* Set the scheduling parameters for TARGET_THREAD according to POLICY
-   and *PARAM.  */
-extern int pthread_setschedparam (pthread_t __target_thread, int __policy,
-				  __const struct sched_param *__param)
-     __THROW;
-
-/* Return in *POLICY and *PARAM the scheduling parameters for TARGET_THREAD.  */
-extern int pthread_getschedparam (pthread_t __target_thread,
-				  int *__restrict __policy,
-				  struct sched_param *__restrict __param)
-     __THROW;
-
-#ifdef __USE_UNIX98
-/* Determine level of concurrency.  */
-extern int pthread_getconcurrency (void) __THROW;
-
-/* Set new concurrency level to LEVEL.  */
-extern int pthread_setconcurrency (int __level) __THROW;
-#endif
-
-#ifdef __USE_GNU
-/* Yield the processor to another thread or process.
-   This function is similar to the POSIX `sched_yield' function but
-   might be differently implemented in the case of a m-on-n thread
-   implementation.  */
-extern int pthread_yield (void) __THROW;
-#endif
-
-/* Functions for mutex handling.  */
-
-/* Initialize MUTEX using attributes in *MUTEX_ATTR, or use the
-   default values if later is NULL.  */
-extern int pthread_mutex_init (pthread_mutex_t *__restrict __mutex,
-			       __const pthread_mutexattr_t *__restrict
-			       __mutex_attr) __THROW;
-
-/* Destroy MUTEX.  */
-extern int pthread_mutex_destroy (pthread_mutex_t *__mutex) __THROW;
-
-/* Try to lock MUTEX.  */
-extern int pthread_mutex_trylock (pthread_mutex_t *__mutex) __THROW;
-
-/* Wait until lock for MUTEX becomes available and lock it.  */
-extern int pthread_mutex_lock (pthread_mutex_t *__mutex) __THROW;
-
-#ifdef __USE_XOPEN2K
-/* Wait until lock becomes available, or specified time passes. */
-extern int pthread_mutex_timedlock (pthread_mutex_t *__restrict __mutex,
-				    __const struct timespec *__restrict
-				    __abstime) __THROW;
-#endif
-
-/* Unlock MUTEX.  */
-extern int pthread_mutex_unlock (pthread_mutex_t *__mutex) __THROW;
-
-
-/* Functions for handling mutex attributes.  */
-
-/* Initialize mutex attribute object ATTR with default attributes
-   (kind is PTHREAD_MUTEX_TIMED_NP).  */
-extern int pthread_mutexattr_init (pthread_mutexattr_t *__attr) __THROW;
-
-/* Destroy mutex attribute object ATTR.  */
-extern int pthread_mutexattr_destroy (pthread_mutexattr_t *__attr) __THROW;
-
-/* Get the process-shared flag of the mutex attribute ATTR.  */
-extern int pthread_mutexattr_getpshared (__const pthread_mutexattr_t *
-					 __restrict __attr,
-					 int *__restrict __pshared) __THROW;
-
-/* Set the process-shared flag of the mutex attribute ATTR.  */
-extern int pthread_mutexattr_setpshared (pthread_mutexattr_t *__attr,
-					 int __pshared) __THROW;
-
-#ifdef __USE_UNIX98
-/* Set the mutex kind attribute in *ATTR to KIND (either PTHREAD_MUTEX_NORMAL,
-   PTHREAD_MUTEX_RECURSIVE, PTHREAD_MUTEX_ERRORCHECK, or
-   PTHREAD_MUTEX_DEFAULT).  */
-extern int pthread_mutexattr_settype (pthread_mutexattr_t *__attr, int __kind)
-     __THROW;
-
-/* Return in *KIND the mutex kind attribute in *ATTR.  */
-extern int pthread_mutexattr_gettype (__const pthread_mutexattr_t *__restrict
-				      __attr, int *__restrict __kind) __THROW;
-#endif
-
-
-/* Functions for handling conditional variables.  */
-
-/* Initialize condition variable COND using attributes ATTR, or use
-   the default values if later is NULL.  */
-extern int pthread_cond_init (pthread_cond_t *__restrict __cond,
-			      __const pthread_condattr_t *__restrict
-			      __cond_attr) __THROW;
-
-/* Destroy condition variable COND.  */
-extern int pthread_cond_destroy (pthread_cond_t *__cond) __THROW;
-
-/* Wake up one thread waiting for condition variable COND.  */
-extern int pthread_cond_signal (pthread_cond_t *__cond) __THROW;
-
-/* Wake up all threads waiting for condition variables COND.  */
-extern int pthread_cond_broadcast (pthread_cond_t *__cond) __THROW;
-
-/* Wait for condition variable COND to be signaled or broadcast.
-   MUTEX is assumed to be locked before.  */
-extern int pthread_cond_wait (pthread_cond_t *__restrict __cond,
-			      pthread_mutex_t *__restrict __mutex) __THROW;
-
-/* Wait for condition variable COND to be signaled or broadcast until
-   ABSTIME.  MUTEX is assumed to be locked before.  ABSTIME is an
-   absolute time specification; zero is the beginning of the epoch
-   (00:00:00 GMT, January 1, 1970).  */
-extern int pthread_cond_timedwait (pthread_cond_t *__restrict __cond,
-				   pthread_mutex_t *__restrict __mutex,
-				   __const struct timespec *__restrict
-				   __abstime) __THROW;
-
-/* Functions for handling condition variable attributes.  */
-
-/* Initialize condition variable attribute ATTR.  */
-extern int pthread_condattr_init (pthread_condattr_t *__attr) __THROW;
-
-/* Destroy condition variable attribute ATTR.  */
-extern int pthread_condattr_destroy (pthread_condattr_t *__attr) __THROW;
-
-/* Get the process-shared flag of the condition variable attribute ATTR.  */
-extern int pthread_condattr_getpshared (__const pthread_condattr_t *
-					__restrict __attr,
-					int *__restrict __pshared) __THROW;
-
-/* Set the process-shared flag of the condition variable attribute ATTR.  */
-extern int pthread_condattr_setpshared (pthread_condattr_t *__attr,
-					int __pshared) __THROW;
-
-
-#ifdef __USE_UNIX98
-/* Functions for handling read-write locks.  */
-
-/* Initialize read-write lock RWLOCK using attributes ATTR, or use
-   the default values if later is NULL.  */
-extern int pthread_rwlock_init (pthread_rwlock_t *__restrict __rwlock,
-				__const pthread_rwlockattr_t *__restrict
-				__attr) __THROW;
-
-/* Destroy read-write lock RWLOCK.  */
-extern int pthread_rwlock_destroy (pthread_rwlock_t *__rwlock) __THROW;
-
-/* Acquire read lock for RWLOCK.  */
-extern int pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock) __THROW;
-
-/* Try to acquire read lock for RWLOCK.  */
-extern int pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock) __THROW;
-
-#ifdef __USE_XOPEN2K
-/* Try to acquire read lock for RWLOCK or return after specfied time.  */
-extern int pthread_rwlock_timedrdlock (pthread_rwlock_t *__restrict __rwlock,
-				       __const struct timespec *__restrict
-				       __abstime) __THROW;
-#endif
-
-/* Acquire write lock for RWLOCK.  */
-extern int pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock) __THROW;
-
-/* Try to acquire write lock for RWLOCK.  */
-extern int pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock) __THROW;
-
-#ifdef __USE_XOPEN2K
-/* Try to acquire write lock for RWLOCK or return after specfied time.  */
-extern int pthread_rwlock_timedwrlock (pthread_rwlock_t *__restrict __rwlock,
-				       __const struct timespec *__restrict
-				       __abstime) __THROW;
-#endif
-
-/* Unlock RWLOCK.  */
-extern int pthread_rwlock_unlock (pthread_rwlock_t *__rwlock) __THROW;
-
-
-/* Functions for handling read-write lock attributes.  */
-
-/* Initialize attribute object ATTR with default values.  */
-extern int pthread_rwlockattr_init (pthread_rwlockattr_t *__attr) __THROW;
-
-/* Destroy attribute object ATTR.  */
-extern int pthread_rwlockattr_destroy (pthread_rwlockattr_t *__attr) __THROW;
-
-/* Return current setting of process-shared attribute of ATTR in PSHARED.  */
-extern int pthread_rwlockattr_getpshared (__const pthread_rwlockattr_t *
-					  __restrict __attr,
-					  int *__restrict __pshared) __THROW;
-
-/* Set process-shared attribute of ATTR to PSHARED.  */
-extern int pthread_rwlockattr_setpshared (pthread_rwlockattr_t *__attr,
-					  int __pshared) __THROW;
-
-/* Return current setting of reader/writer preference.  */
-extern int pthread_rwlockattr_getkind_np (__const pthread_rwlockattr_t *__attr,
-					  int *__pref) __THROW;
-
-/* Set reader/write preference.  */
-extern int pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *__attr,
-					  int __pref) __THROW;
-#endif
-
-#ifdef __USE_XOPEN2K
-/* The IEEE Std. 1003.1j-2000 introduces functions to implement
-   spinlocks.  */
-
-/* Initialize the spinlock LOCK.  If PSHARED is nonzero the spinlock can
-   be shared between different processes.  */
-extern int pthread_spin_init (pthread_spinlock_t *__lock, int __pshared)
-     __THROW;
-
-/* Destroy the spinlock LOCK.  */
-extern int pthread_spin_destroy (pthread_spinlock_t *__lock) __THROW;
-
-/* Wait until spinlock LOCK is retrieved.  */
-extern int pthread_spin_lock (pthread_spinlock_t *__lock) __THROW;
-
-/* Try to lock spinlock LOCK.  */
-extern int pthread_spin_trylock (pthread_spinlock_t *__lock) __THROW;
-
-/* Release spinlock LOCK.  */
-extern int pthread_spin_unlock (pthread_spinlock_t *__lock) __THROW;
-
-
-/* Barriers are a also a new feature in 1003.1j-2000. */
-
-extern int pthread_barrier_init (pthread_barrier_t *__restrict __barrier,
-				 __const pthread_barrierattr_t *__restrict
-				 __attr, unsigned int __count) __THROW;
-
-extern int pthread_barrier_destroy (pthread_barrier_t *__barrier) __THROW;
-
-extern int pthread_barrierattr_init (pthread_barrierattr_t *__attr) __THROW;
-
-extern int pthread_barrierattr_destroy (pthread_barrierattr_t *__attr) __THROW;
-
-extern int pthread_barrierattr_getpshared (__const pthread_barrierattr_t *
-					   __restrict __attr,
-					   int *__restrict __pshared) __THROW;
-
-extern int pthread_barrierattr_setpshared (pthread_barrierattr_t *__attr,
-					   int __pshared) __THROW;
-
-extern int pthread_barrier_wait (pthread_barrier_t *__barrier) __THROW;
-#endif
-
-
-/* Functions for handling thread-specific data.  */
-
-/* Create a key value identifying a location in the thread-specific
-   data area.  Each thread maintains a distinct thread-specific data
-   area.  DESTR_FUNCTION, if non-NULL, is called with the value
-   associated to that key when the key is destroyed.
-   DESTR_FUNCTION is not called if the value associated is NULL when
-   the key is destroyed.  */
-extern int pthread_key_create (pthread_key_t *__key,
-			       void (*__destr_function) (void *)) __THROW;
-
-/* Destroy KEY.  */
-extern int pthread_key_delete (pthread_key_t __key) __THROW;
-
-/* Store POINTER in the thread-specific data slot identified by KEY. */
-extern int pthread_setspecific (pthread_key_t __key,
-				__const void *__pointer) __THROW;
-
-/* Return current value of the thread-specific data slot identified by KEY.  */
-extern void *pthread_getspecific (pthread_key_t __key) __THROW;
-
-
-/* Functions for handling initialization.  */
-
-/* Guarantee that the initialization function INIT_ROUTINE will be called
-   only once, even if pthread_once is executed several times with the
-   same ONCE_CONTROL argument. ONCE_CONTROL must point to a static or
-   extern variable initialized to PTHREAD_ONCE_INIT.  */
-extern int pthread_once (pthread_once_t *__once_control,
-			 void (*__init_routine) (void)) __THROW;
-
-
-/* Functions for handling cancellation.  */
-
-/* Set cancelability state of current thread to STATE, returning old
-   state in *OLDSTATE if OLDSTATE is not NULL.  */
-extern int pthread_setcancelstate (int __state, int *__oldstate) __THROW;
-
-/* Set cancellation state of current thread to TYPE, returning the old
-   type in *OLDTYPE if OLDTYPE is not NULL.  */
-extern int pthread_setcanceltype (int __type, int *__oldtype) __THROW;
-
-/* Cancel THREAD immediately or at the next possibility.  */
-extern int pthread_cancel (pthread_t __thread1) __THROW;
-
-/* Test for pending cancellation for the current thread and terminate
-   the thread as per pthread_exit(PTHREAD_CANCELED) if it has been
-   cancelled.  */
-extern void pthread_testcancel (void) __THROW;
-
-
-/* Install a cleanup handler: ROUTINE will be called with arguments ARG
-   when the thread is cancelled or calls pthread_exit.  ROUTINE will also
-   be called with arguments ARG when the matching pthread_cleanup_pop
-   is executed with non-zero EXECUTE argument.
-   pthread_cleanup_push and pthread_cleanup_pop are macros and must always
-   be used in matching pairs at the same nesting level of braces. */
-
-#define pthread_cleanup_push(routine,arg) \
-  { struct _pthread_cleanup_buffer _buffer;				      \
-    _pthread_cleanup_push (&_buffer, (routine), (arg));
-
-extern void _pthread_cleanup_push (struct _pthread_cleanup_buffer *__buffer,
-				   void (*__routine) (void *),
-				   void *__arg) __THROW;
-
-/* Remove a cleanup handler installed by the matching pthread_cleanup_push.
-   If EXECUTE is non-zero, the handler function is called. */
-
-#define pthread_cleanup_pop(execute) \
-    _pthread_cleanup_pop (&_buffer, (execute)); }
-
-extern void _pthread_cleanup_pop (struct _pthread_cleanup_buffer *__buffer,
-				  int __execute) __THROW;
-
-/* Install a cleanup handler as pthread_cleanup_push does, but also
-   saves the current cancellation type and set it to deferred cancellation.  */
-
-#ifdef __USE_GNU
-# define pthread_cleanup_push_defer_np(routine,arg) \
-  { struct _pthread_cleanup_buffer _buffer;				      \
-    _pthread_cleanup_push_defer (&_buffer, (routine), (arg));
-
-extern void _pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *__buffer,
-					 void (*__routine) (void *),
-					 void *__arg) __THROW;
-
-/* Remove a cleanup handler as pthread_cleanup_pop does, but also
-   restores the cancellation type that was in effect when the matching
-   pthread_cleanup_push_defer was called.  */
-
-# define pthread_cleanup_pop_restore_np(execute) \
-  _pthread_cleanup_pop_restore (&_buffer, (execute)); }
-
-extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *__buffer,
-					  int __execute) __THROW;
-#endif
-
-
-#ifdef __USE_XOPEN2K
-/* Get ID of CPU-time clock for thread THREAD_ID.  */
-extern int pthread_getcpuclockid (pthread_t __thread_id,
-				  clockid_t *__clock_id) __THROW;
-#endif
-
-
-/* Functions for handling signals.  */
-#include <bits/sigthread.h>
-
-
-/* Functions for handling process creation and process execution.  */
-
-/* Install handlers to be called when a new process is created with FORK.
-   The PREPARE handler is called in the parent process just before performing
-   FORK. The PARENT handler is called in the parent process just after FORK.
-   The CHILD handler is called in the child process.  Each of the three
-   handlers can be NULL, meaning that no handler needs to be called at that
-   point.
-   PTHREAD_ATFORK can be called several times, in which case the PREPARE
-   handlers are called in LIFO order (last added with PTHREAD_ATFORK,
-   first called before FORK), and the PARENT and CHILD handlers are called
-   in FIFO (first added, first called).  */
-
-extern int pthread_atfork (void (*__prepare) (void),
-			   void (*__parent) (void),
-			   void (*__child) (void)) __THROW;
-
-/* Terminate all threads in the program except the calling process.
-   Should be called just before invoking one of the exec*() functions.  */
-
-extern void pthread_kill_other_threads_np (void) __THROW;
-
-__END_DECLS
-
-#endif	/* pthread.h */
diff --git a/newlib/libc/sys/linux/include/regex.h b/newlib/libc/sys/linux/include/regex.h
deleted file mode 100644
index d71c0ce..0000000
--- a/newlib/libc/sys/linux/include/regex.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 1992 Henry Spencer.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer of the University of Toronto.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)regex.h	8.2 (Berkeley) 1/3/94
- * $FreeBSD: src/include/regex.h,v 1.4 2002/03/23 17:24:53 imp Exp $
- */
-
-#ifndef _REGEX_H_
-#define	_REGEX_H_
-
-#include <sys/cdefs.h>
-
-/* types */
-typedef off_t regoff_t;
-
-typedef struct {
-	int re_magic;
-	size_t re_nsub;		/* number of parenthesized subexpressions */
-	__const char *re_endp;	/* end pointer for REG_PEND */
-	struct re_guts *re_g;	/* none of your business :-) */
-} regex_t;
-
-typedef struct {
-	regoff_t rm_so;		/* start of match */
-	regoff_t rm_eo;		/* end of match */
-} regmatch_t;
-
-/* regcomp() flags */
-#define	REG_BASIC	0000
-#define	REG_EXTENDED	0001
-#define	REG_ICASE	0002
-#define	REG_NOSUB	0004
-#define	REG_NEWLINE	0010
-#define	REG_NOSPEC	0020
-#define	REG_PEND	0040
-#define	REG_DUMP	0200
-
-/* regerror() flags */
-#define	REG_NOMATCH	 1
-#define	REG_BADPAT	 2
-#define	REG_ECOLLATE	 3
-#define	REG_ECTYPE	 4
-#define	REG_EESCAPE	 5
-#define	REG_ESUBREG	 6
-#define	REG_EBRACK	 7
-#define	REG_EPAREN	 8
-#define	REG_EBRACE	 9
-#define	REG_BADBR	10
-#define	REG_ERANGE	11
-#define	REG_ESPACE	12
-#define	REG_BADRPT	13
-#define	REG_EMPTY	14
-#define	REG_ASSERT	15
-#define	REG_INVARG	16
-#define	REG_ATOI	255	/* convert name to number (!) */
-#define	REG_ITOA	0400	/* convert number to name (!) */
-
-/* regexec() flags */
-#define	REG_NOTBOL	00001
-#define	REG_NOTEOL	00002
-#define	REG_STARTEND	00004
-#define	REG_TRACE	00400	/* tracing of execution */
-#define	REG_LARGE	01000	/* force large representation */
-#define	REG_BACKR	02000	/* force use of backref code */
-
-__BEGIN_DECLS
-int	regcomp(regex_t *, const char *, int);
-size_t	regerror(int, const regex_t *, char *, size_t);
-int	regexec(const regex_t *, const char *, size_t, regmatch_t [], int);
-void	regfree(regex_t *);
-__END_DECLS
-
-#endif /* !_REGEX_H_ */
diff --git a/newlib/libc/sys/linux/include/resolv.h b/newlib/libc/sys/linux/include/resolv.h
deleted file mode 100644
index 1114f2d..0000000
--- a/newlib/libc/sys/linux/include/resolv.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*-
- * Copyright (c) 1983, 1987, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $
- * $FreeBSD: src/include/resolv.h,v 1.21 2002/03/23 17:24:53 imp Exp $
- */
-
-#ifndef _RESOLV_H_
-#define	_RESOLV_H_
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <sys/socket.h>
-#include <stdio.h>
-
-/*
- * Revision information.  This is the release date in YYYYMMDD format.
- * It can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__RES > 19931104)".  Do not
- * compare for equality; rather, use it to determine whether your resolver
- * is new enough to contain a certain feature.
- */
-
-#define	__RES	19960801
-
-/*
- * Resolver configuration file.
- * Normally not present, but may contain the address of the
- * inital name server(s) to query and the domain search list.
- */
-
-#ifndef _PATH_RESCONF
-#define	_PATH_RESCONF        "/etc/resolv.conf"
-#endif
-
-/*
- * Global defines and variables for resolver stub.
- */
-#define	MAXNS			3	/* max # name servers we'll track */
-#define	MAXDFLSRCH		3	/* # default domain levels to try */
-#define	MAXDNSRCH		6	/* max # domains in search path */
-#define	LOCALDOMAINPARTS	2	/* min levels in name that is "local" */
-
-#define	RES_TIMEOUT		5	/* min. seconds between retries */
-#define	MAXRESOLVSORT		10	/* number of net to sort on */
-#define	RES_MAXNDOTS		15	/* should reflect bit field size */
-
-struct __res_state {
-	int	retrans;	 	/* retransmition time interval */
-	int	retry;			/* number of times to retransmit */
-	u_long	options;		/* option flags - see below. */
-	int	nscount;		/* number of name servers */
-	struct sockaddr_in
-		nsaddr_list[MAXNS];	/* address of name server */
-#define	nsaddr	nsaddr_list[0]		/* for backward compatibility */
-	u_short	id;			/* current message id */
-	char	*dnsrch[MAXDNSRCH+1];	/* components of domain to search */
-	char	defdname[256];		/* default domain (deprecated) */
-	u_long	pfcode;			/* RES_PRF_ flags - see below. */
-	unsigned ndots:4;		/* threshold for initial abs. query */
-	unsigned nsort:4;		/* number of elements in sort_list[] */
-	char	unused[3];
-	struct {
-		struct in_addr	addr;
-		u_int32_t	mask;
-	} sort_list[MAXRESOLVSORT];
-	char	pad[72];		/* on an i386 this means 512b total */
-};
-
-/* for INET6 */
-/*
- * replacement of __res_state, separated to keep binary compatibility.
- */
-struct __res_state_ext {
-	struct sockaddr_storage nsaddr_list[MAXNS];
-	struct {
-		int	af;		/* address family for addr, mask */
-		union {
-			struct	in_addr ina;
-			struct	in6_addr in6a;
-		} addr, mask;
-	} sort_list[MAXRESOLVSORT];
-};
-
-/*
- * Resolver options (keep these in synch with res_debug.c, please)
- */
-#define RES_INIT	0x00000001	/* address initialized */
-#define RES_DEBUG	0x00000002	/* print debug messages */
-#define RES_AAONLY	0x00000004	/* authoritative answers only (!IMPL)*/
-#define RES_USEVC	0x00000008	/* use virtual circuit */
-#define RES_PRIMARY	0x00000010	/* query primary server only (!IMPL) */
-#define RES_IGNTC	0x00000020	/* ignore truncation errors */
-#define RES_RECURSE	0x00000040	/* recursion desired */
-#define RES_DEFNAMES	0x00000080	/* use default domain name */
-#define RES_STAYOPEN	0x00000100	/* Keep TCP socket open */
-#define RES_DNSRCH	0x00000200	/* search up local domain tree */
-#define	RES_INSECURE1	0x00000400	/* type 1 security disabled */
-#define	RES_INSECURE2	0x00000800	/* type 2 security disabled */
-#define	RES_NOALIASES	0x00001000	/* shuts off HOSTALIASES feature */
-#define	RES_USE_INET6	0x00002000	/* use/map IPv6 in gethostbyname() */
-#define	RES_NOTLDQUERY	0x00004000	/* Don't query TLD names */
-/* KAME extensions: use higher bit to avoid conflict with ISC use */
-#define	RES_USE_EDNS0	0x40000000	/* use EDNS0 */
-
-#define RES_DEFAULT	(RES_RECURSE | RES_DEFNAMES | RES_DNSRCH)
-
-/*
- * Resolver "pfcode" values.  Used by dig.
- */
-#define	RES_PRF_STATS	0x00000001
-#define	RES_PRF_UPDATE	0x00000002
-#define	RES_PRF_CLASS   0x00000004
-#define	RES_PRF_CMD	0x00000008
-#define	RES_PRF_QUES	0x00000010
-#define	RES_PRF_ANS	0x00000020
-#define	RES_PRF_AUTH	0x00000040
-#define	RES_PRF_ADD	0x00000080
-#define	RES_PRF_HEAD1	0x00000100
-#define	RES_PRF_HEAD2	0x00000200
-#define	RES_PRF_TTLID	0x00000400
-#define	RES_PRF_HEADX	0x00000800
-#define	RES_PRF_QUERY	0x00001000
-#define	RES_PRF_REPLY	0x00002000
-#define	RES_PRF_INIT    0x00004000
-/*			0x00008000	*/
-
-typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
-	res_sendhookact;
-
-typedef res_sendhookact (*res_send_qhook)(struct sockaddr_in * const *ns,
-					  const u_char **query,
-					  int *querylen,
-					  u_char *ans,
-					  int anssiz,
-					  int *resplen);
-
-typedef res_sendhookact (*res_send_rhook)(const struct sockaddr_in *ns,
-					  const u_char *query,
-					  int querylen,
-					  u_char *ans,
-					  int anssiz,
-					  int *resplen);
-
-struct res_sym {
-	int	number;		/* Identifying number, like T_MX */
-	char *	name;		/* Its symbolic name, like "MX" */
-	char *	humanname;	/* Its fun name, like "mail exchanger" */
-};
-
-extern struct __res_state _res;
-/* for INET6 */
-extern struct __res_state_ext _res_ext;
-
-extern const struct res_sym __p_class_syms[];
-extern const struct res_sym __p_type_syms[];
-
-/* Private routines shared between libc/net, named, nslookup and others. */
-#define	res_hnok	__res_hnok
-#define	res_ownok	__res_ownok
-#define	res_mailok	__res_mailok
-#define	res_dnok	__res_dnok
-#define	sym_ston	__sym_ston
-#define	sym_ntos	__sym_ntos
-#define	sym_ntop	__sym_ntop
-#define	b64_ntop	__b64_ntop
-#define	b64_pton	__b64_pton
-#define	loc_ntoa	__loc_ntoa
-#define	loc_aton	__loc_aton
-#define	fp_resstat	__fp_resstat
-#define	p_query		__p_query
-#define	dn_skipname	__dn_skipname
-#define	fp_resstat	__fp_resstat
-#define	fp_query	__fp_query
-#define	fp_nquery	__fp_nquery
-#define	hostalias	__hostalias
-#define	putlong		__putlong
-#define	putshort	__putshort
-#define	p_class		__p_class
-#define	p_time		__p_time
-#define	p_type		__p_type
-#define	p_query		__p_query
-#define	p_cdnname	__p_cdnname
-#define	p_section	__p_section
-#define	p_cdname	__p_cdname
-#define	p_fqnname	__p_fqnname
-#define	p_fqname	__p_fqname
-#define	p_option	__p_option
-#define	p_secstodate	__p_secstodate
-#define	dn_count_labels	__dn_count_labels
-#define	dn_comp		__dn_comp
-#define	dn_expand	__dn_expand
-#define	res_init	__res_init
-#define	res_randomid	__res_randomid
-#define	res_query	__res_query
-#define	res_search	__res_search
-#define	res_querydomain	__res_querydomain
-#define	res_mkquery	__res_mkquery
-#define	res_send	__res_send
-#define	res_isourserver	__res_isourserver
-#define	res_nameinquery	__res_nameinquery
-#define	res_queriesmatch __res_queriesmatch
-#define	res_close	__res_close
-#define	res_opt		__res_opt
-#define	res_mkupdate	__res_mkupdate
-#define	res_mkupdrec	__res_mkupdrec
-#define	res_freeupdrec	__res_freeupdrec
-
-__BEGIN_DECLS
-int		res_hnok(const char *);
-int		res_ownok(const char *);
-int		res_mailok(const char *);
-int		res_dnok(const char *);
-int		sym_ston(const struct res_sym *, const char *, int *);
-const char *	sym_ntos(const struct res_sym *, int, int *);
-const char *	sym_ntop(const struct res_sym *, int, int *);
-int		b64_ntop(u_char const *, size_t, char *, size_t);
-int		b64_pton(char const *, u_char *, size_t);
-int		loc_aton(const char *, u_char *);
-const char *	loc_ntoa(const u_char *, char *);
-int		dn_skipname(const u_char *, const u_char *);
-void		fp_resstat(struct __res_state *, FILE *);
-void		fp_query(const u_char *, FILE *);
-void		fp_nquery(const u_char *, int, FILE *);
-const char *	hostalias(const char *);
-void		putlong(u_int32_t, u_char *);
-void		putshort(u_int16_t, u_char *);
-const char *	p_class(int);
-const char *	p_time(u_int32_t);
-const char *	p_type(int);
-void		p_query(const u_char *);
-const u_char *	p_cdnname(const u_char *, const u_char *, int, FILE *);
-const u_char *	p_cdname(const u_char *, const u_char *, FILE *);
-const u_char *	p_fqnname(const u_char *, const u_char *,
-			  int, char *, int);
-const u_char *	p_fqname(const u_char *, const u_char *, FILE *);
-const char *	p_option(u_long);
-char *		p_secstodate(u_long);
-int		dn_count_labels(const char *);
-int		dn_comp(const char *, u_char *, int, u_char **, u_char **);
-int		dn_expand(const u_char *, const u_char *, const u_char *,
-			  char *, int);
-int		res_init(void);
-u_int		res_randomid(void);
-int		res_query(const char *, int, int, u_char *, int);
-int		res_search(const char *, int, int, u_char *, int);
-int		res_querydomain(const char *, const char *, int, int,
-				u_char *, int);
-int		res_mkquery(int, const char *, int, int, const u_char *,
-			    int, const u_char *, u_char *, int);
-int		res_send(const u_char *, int, u_char *, int);
-int		res_isourserver(const struct sockaddr_in *);
-int		res_nameinquery(const char *, int, int,
-				const u_char *, const u_char *);
-int		res_queriesmatch(const u_char *, const u_char *,
-				 const u_char *, const u_char *);
-void		res_close(void);
-int		res_opt(int, u_char *, int, int);
-const char *	p_section(int, int);
-/* XXX The following depend on the ns_updrec typedef in arpa/nameser.h */
-#ifdef _ARPA_NAMESER_H_
-int		res_update(ns_updrec *);
-int		res_mkupdate(ns_updrec *, u_char *, int);
-ns_updrec *	res_mkupdrec(int, const char *, u_int, u_int, u_long);
-void		res_freeupdrec(ns_updrec *);
-#endif
-__END_DECLS
-
-#endif /* !_RESOLV_H_ */
diff --git a/newlib/libc/sys/linux/include/rpc/Makefile b/newlib/libc/sys/linux/include/rpc/Makefile
deleted file mode 100644
index 43a762b..0000000
--- a/newlib/libc/sys/linux/include/rpc/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#	from: @(#)Makefile	2.3 88/08/11 4.0 RPCSRC
-#	$FreeBSD: src/include/rpc/Makefile,v 1.1 2001/03/19 12:49:46 alfred Exp $
-
-.SUFFIXES: .x
-
-RPCCOM = rpcgen -C
-
-HDRS=	rpcb_prot.h
-
-XFILES= rpcb_prot.x
-
-HFILES=	auth.h auth_unix.h clnt.h clnt_soc.h clnt_stat.h \
-	nettype.h pmap_clnt.h pmap_prot.h pmap_rmt.h raw.h \
-	rpc.h rpc_msg.h rpcb_clnt.h rpcent.h rpc_com.h \
-	svc.h svc_auth.h svc_soc.h svc_dg.h types.h xdr.h
-
-# Secure RPC
-HFILES+= auth_des.h des.h des_crypt.h
-
-# Kerberos
-HFILES+= auth_kerb.h
-
-CLEANFILES+= ${HDRS}
-
-all: ${HDRS}
-
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${HFILES:S;^;${.CURDIR}/;} \
-		${XFILES:S;^;${.CURDIR}/;} \
-		${HDRS} \
-		${DESTDIR}/usr/include/rpc
-
-.x.h:
-	${RPCCOM} -h -DWANT_NFS3 ${.IMPSRC} -o ${.TARGET}
-
-.include <bsd.prog.mk>
diff --git a/newlib/libc/sys/linux/include/rpc/auth.h b/newlib/libc/sys/linux/include/rpc/auth.h
deleted file mode 100644
index 8118147..0000000
--- a/newlib/libc/sys/linux/include/rpc/auth.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*	$NetBSD: auth.h,v 1.15 2000/06/02 22:57:55 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)auth.h 1.17 88/02/08 SMI
- *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
- *	from: @(#)auth.h	1.43 	98/02/02 SMI
- * $FreeBSD: src/include/rpc/auth.h,v 1.19 2002/03/23 17:24:55 imp Exp $
- */
-
-/*
- * auth.h, Authentication interface.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * The data structures are completely opaque to the client.  The client
- * is required to pass a AUTH * to routines that create rpc
- * "sessions".
- */
-
-#ifndef _RPC_AUTH_H
-#define _RPC_AUTH_H
-#include <rpc/xdr.h>
-#include <rpc/clnt_stat.h>
-#include <sys/cdefs.h>
-#include <sys/socket.h>
-
-#define MAX_AUTH_BYTES	400
-#define MAXNETNAMELEN	255	/* maximum length of network user's name */
-
-/*
- *  Client side authentication/security data
- */
-
-typedef struct sec_data {
-	u_int	secmod;		/* security mode number e.g. in nfssec.conf */
-	u_int	rpcflavor;	/* rpc flavors:AUTH_UNIX,AUTH_DES,RPCSEC_GSS */
-	int	flags;		/* AUTH_F_xxx flags */
-	caddr_t data;		/* opaque data per flavor */
-} sec_data_t;
-
-#ifdef _SYSCALL32_IMPL
-struct sec_data32 {
-	uint32_t secmod;	/* security mode number e.g. in nfssec.conf */
-	uint32_t rpcflavor;	/* rpc flavors:AUTH_UNIX,AUTH_DES,RPCSEC_GSS */
-	int32_t flags;		/* AUTH_F_xxx flags */
-	caddr32_t data;		/* opaque data per flavor */
-};
-#endif /* _SYSCALL32_IMPL */
-
-/*
- * AUTH_DES flavor specific data from sec_data opaque data field.
- * AUTH_KERB has the same structure.
- */
-typedef struct des_clnt_data {
-	struct netbuf	syncaddr;	/* time sync addr */
-	struct knetconfig *knconf;	/* knetconfig info that associated */
-					/* with the syncaddr. */
-	char		*netname;	/* server's netname */
-	int		netnamelen;	/* server's netname len */
-} dh_k4_clntdata_t;
-
-#ifdef _SYSCALL32_IMPL
-struct des_clnt_data32 {
-	struct netbuf32 syncaddr;	/* time sync addr */
-	caddr32_t knconf;		/* knetconfig info that associated */
-					/* with the syncaddr. */
-	caddr32_t netname;		/* server's netname */
-	int32_t netnamelen;		/* server's netname len */
-};
-#endif /* _SYSCALL32_IMPL */
-
-#ifdef KERBEROS
-/*
- * flavor specific data to hold the data for AUTH_DES/AUTH_KERB(v4)
- * in sec_data->data opaque field.
- */
-typedef struct krb4_svc_data {
-	int		window;		/* window option value */
-} krb4_svcdata_t;
- 
-typedef struct krb4_svc_data	des_svcdata_t;
-#endif /* KERBEROS */
-
-/*
- * authentication/security specific flags
- */
-#define AUTH_F_RPCTIMESYNC	0x001	/* use RPC to do time sync */
-#define AUTH_F_TRYNONE		0x002	/* allow fall back to AUTH_NONE */
-
-
-/*
- * Status returned from authentication check
- */
-enum auth_stat {
-	AUTH_OK=0,
-	/*
-	 * failed at remote end
-	 */
-	AUTH_BADCRED=1,			/* bogus credentials (seal broken) */
-	AUTH_REJECTEDCRED=2,		/* client should begin new session */
-	AUTH_BADVERF=3,			/* bogus verifier (seal broken) */
-	AUTH_REJECTEDVERF=4,		/* verifier expired or was replayed */
-	AUTH_TOOWEAK=5,			/* rejected due to security reasons */
-	/*
-	 * failed locally
-	*/
-	AUTH_INVALIDRESP=6,		/* bogus response verifier */
-	AUTH_FAILED=7			/* some unknown reason */
-#ifdef KERBEROS
-	/*
-	 * kerberos errors
-	 */
-	,
-	AUTH_KERB_GENERIC = 8,		/* kerberos generic error */
-	AUTH_TIMEEXPIRE = 9,		/* time of credential expired */
-	AUTH_TKT_FILE = 10,		/* something wrong with ticket file */
-	AUTH_DECODE = 11,			/* can't decode authenticator */
-	AUTH_NET_ADDR = 12		/* wrong net address in ticket */
-#endif /* KERBEROS */
-};
-
-union des_block {
-	struct {
-		uint32_t high;
-		uint32_t low;
-	} key;
-	char c[8];
-};
-typedef union des_block des_block;
-__BEGIN_DECLS
-extern bool_t xdr_des_block(XDR *, des_block *);
-__END_DECLS
-
-/*
- * Authentication info.  Opaque to client.
- */
-struct opaque_auth {
-	enum_t	oa_flavor;		/* flavor of auth */
-	caddr_t	oa_base;		/* address of more auth stuff */
-	u_int	oa_length;		/* not to exceed MAX_AUTH_BYTES */
-};
-
-
-/*
- * Auth handle, interface to client side authenticators.
- */
-typedef struct __auth {
-	struct	opaque_auth	ah_cred;
-	struct	opaque_auth	ah_verf;
-	union	des_block	ah_key;
-	struct auth_ops {
-		void	(*ah_nextverf) (struct __auth *);
-		/* nextverf & serialize */
-		int	(*ah_marshal) (struct __auth *, XDR *);
-		/* validate verifier */
-		int	(*ah_validate) (struct __auth *,
-			    struct opaque_auth *);
-		/* refresh credentials */
-		int	(*ah_refresh) (struct __auth *, void *);
-		/* destroy this structure */
-		void	(*ah_destroy) (struct __auth *);
-	} *ah_ops;
-	void *ah_private;
-} AUTH;
-
-
-/*
- * Authentication ops.
- * The ops and the auth handle provide the interface to the authenticators.
- *
- * AUTH	*auth;
- * XDR	*xdrs;
- * struct opaque_auth verf;
- */
-#define AUTH_NEXTVERF(auth)		\
-		((*((auth)->ah_ops->ah_nextverf))(auth))
-#define auth_nextverf(auth)		\
-		((*((auth)->ah_ops->ah_nextverf))(auth))
-
-#define AUTH_MARSHALL(auth, xdrs)	\
-		((*((auth)->ah_ops->ah_marshal))(auth, xdrs))
-#define auth_marshall(auth, xdrs)	\
-		((*((auth)->ah_ops->ah_marshal))(auth, xdrs))
-
-#define AUTH_VALIDATE(auth, verfp)	\
-		((*((auth)->ah_ops->ah_validate))((auth), verfp))
-#define auth_validate(auth, verfp)	\
-		((*((auth)->ah_ops->ah_validate))((auth), verfp))
-
-#define AUTH_REFRESH(auth, msg)		\
-		((*((auth)->ah_ops->ah_refresh))(auth, msg))
-#define auth_refresh(auth, msg)		\
-		((*((auth)->ah_ops->ah_refresh))(auth, msg))
-
-#define AUTH_DESTROY(auth)		\
-		((*((auth)->ah_ops->ah_destroy))(auth))
-#define auth_destroy(auth)		\
-		((*((auth)->ah_ops->ah_destroy))(auth))
-
-
-__BEGIN_DECLS
-extern struct opaque_auth _null_auth;
-__END_DECLS
-
-/*
- * These are the various implementations of client side authenticators.
- */
-
-/*
- * System style authentication
- * AUTH *authunix_create(machname, uid, gid, len, aup_gids)
- *	char *machname;
- *	int uid;
- *	int gid;
- *	int len;
- *	int *aup_gids;
- */
-__BEGIN_DECLS
-extern AUTH *authunix_create(char *, int, int, int,
-    int *);
-extern AUTH *authunix_create_default(void);	/* takes no parameters */
-extern AUTH *authnone_create(void);		/* takes no parameters */
-__END_DECLS
-/*
- * DES style authentication
- * AUTH *authsecdes_create(servername, window, timehost, ckey)
- * 	char *servername;		- network name of server
- *	u_int window;			- time to live
- * 	const char *timehost;			- optional hostname to sync with
- * 	des_block *ckey;		- optional conversation key to use
- */
-__BEGIN_DECLS
-extern AUTH *authdes_create (char *, u_int, struct sockaddr *, des_block *);
-extern AUTH *authdes_seccreate (const char *, const u_int, const  char *,
-    const  des_block *);
-__END_DECLS
-
-__BEGIN_DECLS
-extern bool_t xdr_opaque_auth		(XDR *, struct opaque_auth *);
-__END_DECLS
-
-#define authsys_create(c,i1,i2,i3,ip) authunix_create((c),(i1),(i2),(i3),(ip))
-#define authsys_create_default() authunix_create_default()
-
-/*
- * Netname manipulation routines.
- */
-__BEGIN_DECLS
-extern int getnetname(char *);
-extern int host2netname(char *, const char *, const char *);
-extern int user2netname(char *, const uid_t, const char *);
-extern int netname2user(char *, uid_t *, gid_t *, int *, gid_t *);
-extern int netname2host(char *, char *, const int);
-extern void passwd2des ( char *, char * );
-__END_DECLS
-
-/*
- *
- * These routines interface to the keyserv daemon
- *
- */
-__BEGIN_DECLS
-extern int key_decryptsession(const char *, des_block *);
-extern int key_encryptsession(const char *, des_block *);
-extern int key_gendes(des_block *);
-extern int key_setsecret(const char *);
-extern int key_secretkey_is_set(void);
-__END_DECLS
-
-/*
- * Publickey routines.
- */
-__BEGIN_DECLS
-extern int getpublickey (const char *, char *);
-extern int getpublicandprivatekey (char *, char *);
-extern int getsecretkey (char *, char *, char *);
-__END_DECLS
-
-#ifdef KERBEROS
-/*
- * Kerberos style authentication
- * AUTH *authkerb_seccreate(service, srv_inst, realm, window, timehost, status)
- *	const char *service;			- service name
- *	const char *srv_inst;			- server instance
- *	const char *realm;			- server realm
- *	const u_int window;			- time to live
- *	const char *timehost;			- optional hostname to sync with
- *	int *status;				- kerberos status returned
- */
-__BEGIN_DECLS
-extern AUTH	*authkerb_seccreate(const char *, const char *, const  char *,
-		    const u_int, const char *, int *);
-__END_DECLS
-
-/*
- * Map a kerberos credential into a unix cred.
- *
- *	authkerb_getucred(rqst, uid, gid, grouplen, groups)
- *	const struct svc_req *rqst;		- request pointer
- *	uid_t *uid;
- *	gid_t *gid;
- *	short *grouplen;
- *	int *groups;
- *
- */
-__BEGIN_DECLS
-extern int	authkerb_getucred(/* struct svc_req *, uid_t *, gid_t *,
-		    short *, int * */);
-__END_DECLS
-#endif /* KERBEROS */
-
-__BEGIN_DECLS
-struct svc_req;
-struct rpc_msg;
-enum auth_stat _svcauth_null (struct svc_req *, struct rpc_msg *);
-enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *);
-enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *);
-__END_DECLS
-
-#define AUTH_NONE	0		/* no authentication */
-#define	AUTH_NULL	0		/* backward compatibility */
-#define	AUTH_SYS	1		/* unix style (uid, gids) */
-#define AUTH_UNIX	AUTH_SYS
-#define	AUTH_SHORT	2		/* short hand unix style */
-#define AUTH_DH		3		/* for Diffie-Hellman mechanism */
-#define AUTH_DES	AUTH_DH		/* for backward compatibility */
-#define AUTH_KERB	4		/* kerberos style */
-
-#endif /* !_RPC_AUTH_H */
diff --git a/newlib/libc/sys/linux/include/rpc/auth_des.h b/newlib/libc/sys/linux/include/rpc/auth_des.h
deleted file mode 100644
index 24ef5d3..0000000
--- a/newlib/libc/sys/linux/include/rpc/auth_des.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*	@(#)auth_des.h	2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI */
-/*	$FreeBSD: src/include/rpc/auth_des.h,v 1.3 2002/03/23 17:24:55 imp Exp $ */
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- * 
- *	from: @(#)auth_des.h 2.2 88/07/29 4.0 RPCSRC
- *	from: @(#)auth_des.h 1.14    94/04/25 SMI
- */
-
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * auth_des.h, Protocol for DES style authentication for RPC
- */
-
-#ifndef _AUTH_DES_
-#define _AUTH_DES_
-
-/*
- * There are two kinds of "names": fullnames and nicknames
- */
-enum authdes_namekind {
-	ADN_FULLNAME, 
-	ADN_NICKNAME
-};
-
-/*
- * A fullname contains the network name of the client, 
- * a conversation key and the window
- */
-struct authdes_fullname {
-	char *name;		/* network name of client, up to MAXNETNAMELEN */
-	des_block key;		/* conversation key */
-	u_long window;		/* associated window */
-};
-
-
-/*
- * A credential 
- */
-struct authdes_cred {
-	enum authdes_namekind adc_namekind;
-	struct authdes_fullname adc_fullname;
-	u_long adc_nickname;
-};
-
-
-
-/*
- * A des authentication verifier 
- */
-struct authdes_verf {
-	union {
-		struct timeval adv_ctime;	/* clear time */
-		des_block adv_xtime;		/* crypt time */
-	} adv_time_u;
-	u_long adv_int_u;
-};
-
-/*
- * des authentication verifier: client variety
- *
- * adv_timestamp is the current time.
- * adv_winverf is the credential window + 1.
- * Both are encrypted using the conversation key.
- */
-#define adv_timestamp	adv_time_u.adv_ctime
-#define adv_xtimestamp	adv_time_u.adv_xtime
-#define adv_winverf	adv_int_u
-
-/*
- * des authentication verifier: server variety
- *
- * adv_timeverf is the client's timestamp + client's window
- * adv_nickname is the server's nickname for the client.
- * adv_timeverf is encrypted using the conversation key.
- */
-#define adv_timeverf	adv_time_u.adv_ctime
-#define adv_xtimeverf	adv_time_u.adv_xtime
-#define adv_nickname	adv_int_u
-
-/*
- * Map a des credential into a unix cred.
- *
- */
-__BEGIN_DECLS
-extern int authdes_getucred( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * );
-__END_DECLS
-
-__BEGIN_DECLS
-extern bool_t	xdr_authdes_cred(XDR *, struct authdes_cred *);
-extern bool_t	xdr_authdes_verf(XDR *, struct authdes_verf *);
-extern int	rtime(dev_t, struct netbuf *, int, struct timeval *,
-		    struct timeval *);
-extern void	kgetnetname(char *);
-extern enum auth_stat _svcauth_des(struct svc_req *, struct rpc_msg *);
-__END_DECLS
-
-#endif /* ndef _AUTH_DES_ */
diff --git a/newlib/libc/sys/linux/include/rpc/auth_kerb.h b/newlib/libc/sys/linux/include/rpc/auth_kerb.h
deleted file mode 100644
index b686b78..0000000
--- a/newlib/libc/sys/linux/include/rpc/auth_kerb.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*	$FreeBSD: src/include/rpc/auth_kerb.h,v 1.1 2001/03/19 12:49:46 alfred Exp $ */
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * auth_kerb.h, Protocol for Kerberos style authentication for RPC
- *
- * Copyright (C) 1986, Sun Microsystems, Inc.
- */
-
-#ifndef	_RPC_AUTH_KERB_H
-#define	_RPC_AUTH_KERB_H
-
-#ifdef KERBEROS
-
-#pragma ident	"@(#)auth_kerb.h	1.10	94/04/25 SMI"
-
-#include <kerberos/krb.h>
-#include <sys/socket.h>
-#include <sys/t_kuser.h>
-#include <netinet/in.h>
-#include <rpc/svc.h>
-
-/*
- * There are two kinds of "names": fullnames and nicknames
- */
-enum authkerb_namekind {
-	AKN_FULLNAME,
-	AKN_NICKNAME
-};
-/*
- * A fullname contains the ticket and the window
- */
-struct authkerb_fullname {
-	KTEXT_ST ticket;
-	u_long window;		/* associated window */
-};
-
-/*
- *  cooked credential stored in rq_clntcred
- */
-struct authkerb_clnt_cred {
-	/* start of AUTH_DAT */
-	unsigned char k_flags;	/* Flags from ticket */
-	char    pname[ANAME_SZ]; /* Principal's name */
-	char    pinst[INST_SZ];	/* His Instance */
-	char    prealm[REALM_SZ]; /* His Realm */
-	unsigned long checksum;	/* Data checksum (opt) */
-	C_Block session;	/* Session Key */
-	int	life;		/* Life of ticket */
-	unsigned long time_sec;	/* Time ticket issued */
-	unsigned long address;	/* Address in ticket */
-	/* KTEXT_ST reply;	Auth reply (opt) */
-	/* end of AUTH_DAT */
-	unsigned long expiry;	/* time the ticket is expiring */
-	u_long nickname;	/* Nickname into cache */
-	u_long window;		/* associated window */
-};
-
-typedef struct authkerb_clnt_cred authkerb_clnt_cred;
-
-/*
- * A credential
- */
-struct authkerb_cred {
-	enum authkerb_namekind akc_namekind;
-	struct authkerb_fullname akc_fullname;
-	u_long akc_nickname;
-};
-
-/*
- * A kerb authentication verifier
- */
-struct authkerb_verf {
-	union {
-		struct timeval akv_ctime;	/* clear time */
-		des_block akv_xtime;		/* crypt time */
-	} akv_time_u;
-	u_long akv_int_u;
-};
-
-/*
- * des authentication verifier: client variety
- *
- * akv_timestamp is the current time.
- * akv_winverf is the credential window + 1.
- * Both are encrypted using the conversation key.
- */
-#ifndef akv_timestamp
-#define	akv_timestamp	akv_time_u.akv_ctime
-#define	akv_xtimestamp	akv_time_u.akv_xtime
-#define	akv_winverf	akv_int_u
-#endif
-/*
- * des authentication verifier: server variety
- *
- * akv_timeverf is the client's timestamp + client's window
- * akv_nickname is the server's nickname for the client.
- * akv_timeverf is encrypted using the conversation key.
- */
-#ifndef akv_timeverf
-#define	akv_timeverf	akv_time_u.akv_ctime
-#define	akv_xtimeverf	akv_time_u.akv_xtime
-#define	akv_nickname	akv_int_u
-#endif
-
-/*
- * Register the service name, instance and realm.
- */
-extern int	authkerb_create(char *, char *, char *, u_int,
-			struct netbuf *, int *, dev_t, int, AUTH **);
-extern bool_t	xdr_authkerb_cred(XDR *, struct authkerb_cred *);
-extern bool_t	xdr_authkerb_verf(XDR *, struct authkerb_verf *);
-extern int	svc_kerb_reg(SVCXPRT *, char *, char *, char *);
-extern enum auth_stat _svcauth_kerb(struct svc_req *, struct rpc_msg *);
-
-#endif KERBEROS
-#endif	/* !_RPC_AUTH_KERB_H */
diff --git a/newlib/libc/sys/linux/include/rpc/auth_unix.h b/newlib/libc/sys/linux/include/rpc/auth_unix.h
deleted file mode 100644
index 721a5c9..0000000
--- a/newlib/libc/sys/linux/include/rpc/auth_unix.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)auth_unix.h 1.8 88/02/08 SMI
- *	from: @(#)auth_unix.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/auth_unix.h,v 1.11 2002/03/23 17:24:55 imp Exp $
- */
-
-/*
- * auth_unix.h, Protocol for UNIX style authentication parameters for RPC
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-/*
- * The system is very weak.  The client uses no encryption for  it
- * credentials and only sends null verifiers.  The server sends backs
- * null verifiers or optionally a verifier that suggests a new short hand
- * for the credentials.
- */
-
-#ifndef _RPC_AUTH_UNIX_H
-#define _RPC_AUTH_UNIX_H
-#include <sys/cdefs.h>
-
-/* The machine name is part of a credential; it may not exceed 255 bytes */
-#define MAX_MACHINE_NAME 255
-
-/* gids compose part of a credential; there may not be more than 16 of them */
-#define NGRPS 16
-
-/*
- * Unix style credentials.
- */
-struct authunix_parms {
-	u_long	 aup_time;
-	char	*aup_machname;
-	int	 aup_uid;
-	int	 aup_gid;
-	u_int	 aup_len;
-	int	*aup_gids;
-};
-
-#define authsys_parms authunix_parms
-
-__BEGIN_DECLS
-extern bool_t xdr_authunix_parms(XDR *, struct authunix_parms *);
-__END_DECLS
-
-/*
- * If a response verifier has flavor AUTH_SHORT,
- * then the body of the response verifier encapsulates the following structure;
- * again it is serialized in the obvious fashion.
- */
-struct short_hand_verf {
-	struct opaque_auth new_cred;
-};
-
-#endif /* !_RPC_AUTH_UNIX_H */
diff --git a/newlib/libc/sys/linux/include/rpc/clnt.h b/newlib/libc/sys/linux/include/rpc/clnt.h
deleted file mode 100644
index 9a23404..0000000
--- a/newlib/libc/sys/linux/include/rpc/clnt.h
+++ /dev/null
@@ -1,504 +0,0 @@
-/*	$NetBSD: clnt.h,v 1.14 2000/06/02 22:57:55 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)clnt.h 1.31 94/04/29 SMI
- *	from: @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/clnt.h,v 1.17 2002/04/28 15:18:45 des Exp $
- */
-
-/*
- * clnt.h - Client side remote procedure call interface.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_CLNT_H_
-#define _RPC_CLNT_H_
-#include <rpc/clnt_stat.h>
-#include <sys/cdefs.h>
-#include <netconfig.h>
-#include <sys/un.h>
-
-/*
- * Well-known IPV6 RPC broadcast address.
- */
-#define RPCB_MULTICAST_ADDR "ff02::202"
-
-/*
- * the following errors are in general unrecoverable.  The caller
- * should give up rather than retry.
- */
-#define IS_UNRECOVERABLE_RPC(s) (((s) == RPC_AUTHERROR) || \
-	((s) == RPC_CANTENCODEARGS) || \
-	((s) == RPC_CANTDECODERES) || \
-	((s) == RPC_VERSMISMATCH) || \
-	((s) == RPC_PROCUNAVAIL) || \
-	((s) == RPC_PROGUNAVAIL) || \
-	((s) == RPC_PROGVERSMISMATCH) || \
-	((s) == RPC_CANTDECODEARGS))
-
-/*
- * Error info.
- */
-struct rpc_err {
-	enum clnt_stat re_status;
-	union {
-		int RE_errno;		/* related system error */
-		enum auth_stat RE_why;	/* why the auth error occurred */
-		struct {
-			rpcvers_t low;	/* lowest version supported */
-			rpcvers_t high;	/* highest version supported */
-		} RE_vers;
-		struct {		/* maybe meaningful if RPC_FAILED */
-			int32_t s1;
-			int32_t s2;
-		} RE_lb;		/* life boot & debugging only */
-	} ru;
-#define	re_errno	ru.RE_errno
-#define	re_why		ru.RE_why
-#define	re_vers		ru.RE_vers
-#define	re_lb		ru.RE_lb
-};
-
-
-/*
- * Client rpc handle.
- * Created by individual implementations
- * Client is responsible for initializing auth, see e.g. auth_none.c.
- */
-typedef struct __rpc_client {
-	AUTH	*cl_auth;			/* authenticator */
-	struct clnt_ops {
-		/* call remote procedure */
-		enum clnt_stat	(*cl_call)(struct __rpc_client *,
-				    rpcproc_t, xdrproc_t, void *, xdrproc_t,
-				        void *, struct timeval);
-		/* abort a call */
-		void		(*cl_abort)(struct __rpc_client *);
-		/* get specific error code */
-		void		(*cl_geterr)(struct __rpc_client *,
-					struct rpc_err *);
-		/* frees results */
-		bool_t		(*cl_freeres)(struct __rpc_client *,
-					xdrproc_t, void *);
-		/* destroy this structure */
-		void		(*cl_destroy)(struct __rpc_client *);
-		/* the ioctl() of rpc */
-		bool_t          (*cl_control)(struct __rpc_client *, u_int,
-				    void *);
-	} *cl_ops;
-	void 			*cl_private;	/* private stuff */
-	char			*cl_netid;	/* network token */
-	char			*cl_tp;		/* device name */
-} CLIENT;
-
-
-/*
- * Timers used for the pseudo-transport protocol when using datagrams
- */
-struct rpc_timers {
-	u_short		rt_srtt;	/* smoothed round-trip time */
-	u_short		rt_deviate;	/* estimated deviation */
-	u_long		rt_rtxcur;	/* current (backed-off) rto */
-};
-
-/*      
- * Feedback values used for possible congestion and rate control
- */
-#define FEEDBACK_REXMIT1	1	/* first retransmit */
-#define FEEDBACK_OK		2	/* no retransmits */    
-
-/* Used to set version of portmapper used in broadcast */
-  
-#define CLCR_SET_LOWVERS	3
-#define CLCR_GET_LOWVERS	4
- 
-#define RPCSMALLMSGSIZE 400	/* a more reasonable packet size */
-
-/*
- * client side rpc interface ops
- *
- * Parameter types are:
- *
- */
-
-/*
- * enum clnt_stat
- * CLNT_CALL(rh, proc, xargs, argsp, xres, resp, timeout)
- * 	CLIENT *rh;
- *	rpcproc_t proc;
- *	xdrproc_t xargs;
- *	void *argsp;
- *	xdrproc_t xres;
- *	void *resp;
- *	struct timeval timeout;
- */
-#define	CLNT_CALL(rh, proc, xargs, argsp, xres, resp, secs) \
-	((*(rh)->cl_ops->cl_call)(rh, proc, xargs, \
-		argsp, xres, resp, secs))
-#define	clnt_call(rh, proc, xargs, argsp, xres, resp, secs) \
-	((*(rh)->cl_ops->cl_call)(rh, proc, xargs, \
-		argsp, xres, resp, secs))
-
-/*
- * void
- * CLNT_ABORT(rh);
- * 	CLIENT *rh;
- */
-#define	CLNT_ABORT(rh)	((*(rh)->cl_ops->cl_abort)(rh))
-#define	clnt_abort(rh)	((*(rh)->cl_ops->cl_abort)(rh))
-
-/*
- * struct rpc_err
- * CLNT_GETERR(rh);
- * 	CLIENT *rh;
- */
-#define	CLNT_GETERR(rh,errp)	((*(rh)->cl_ops->cl_geterr)(rh, errp))
-#define	clnt_geterr(rh,errp)	((*(rh)->cl_ops->cl_geterr)(rh, errp))
-
-
-/*
- * bool_t
- * CLNT_FREERES(rh, xres, resp);
- * 	CLIENT *rh;
- *	xdrproc_t xres;
- *	void *resp;
- */
-#define	CLNT_FREERES(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp))
-#define	clnt_freeres(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp))
-
-/*
- * bool_t
- * CLNT_CONTROL(cl, request, info)
- *      CLIENT *cl;
- *      u_int request;
- *      char *info;
- */
-#define	CLNT_CONTROL(cl,rq,in) ((*(cl)->cl_ops->cl_control)(cl,rq,in))
-#define	clnt_control(cl,rq,in) ((*(cl)->cl_ops->cl_control)(cl,rq,in))
-
-/*
- * control operations that apply to both udp and tcp transports
- */
-#define CLSET_TIMEOUT		1	/* set timeout (timeval) */
-#define CLGET_TIMEOUT		2	/* get timeout (timeval) */
-#define CLGET_SERVER_ADDR	3	/* get server's address (sockaddr) */
-#define CLGET_FD		6	/* get connections file descriptor */
-#define CLGET_SVC_ADDR		7	/* get server's address (netbuf) */
-#define CLSET_FD_CLOSE		8	/* close fd while clnt_destroy */
-#define CLSET_FD_NCLOSE		9	/* Do not close fd while clnt_destroy */
-#define CLGET_XID 		10	/* Get xid */
-#define CLSET_XID		11	/* Set xid */
-#define CLGET_VERS		12	/* Get version number */
-#define CLSET_VERS		13	/* Set version number */
-#define CLGET_PROG		14	/* Get program number */
-#define CLSET_PROG		15	/* Set program number */
-#define CLSET_SVC_ADDR		16	/* get server's address (netbuf) */
-#define CLSET_PUSH_TIMOD	17	/* push timod if not already present */
-#define CLSET_POP_TIMOD		18	/* pop timod */
-/*
- * Connectionless only control operations
- */
-#define CLSET_RETRY_TIMEOUT 4   /* set retry timeout (timeval) */
-#define CLGET_RETRY_TIMEOUT 5   /* get retry timeout (timeval) */
-#define CLSET_ASYNC		19
-#define CLSET_CONNECT		20	/* Use connect() for UDP. (int) */
-
-/*
- * void
- * CLNT_DESTROY(rh);
- * 	CLIENT *rh;
- */
-#define	CLNT_DESTROY(rh)	((*(rh)->cl_ops->cl_destroy)(rh))
-#define	clnt_destroy(rh)	((*(rh)->cl_ops->cl_destroy)(rh))
-
-
-/*
- * RPCTEST is a test program which is accessible on every rpc
- * transport/port.  It is used for testing, performance evaluation,
- * and network administration.
- */
-
-#define RPCTEST_PROGRAM		((rpcprog_t)1)
-#define RPCTEST_VERSION		((rpcvers_t)1)
-#define RPCTEST_NULL_PROC	((rpcproc_t)2)
-#define RPCTEST_NULL_BATCH_PROC	((rpcproc_t)3)
-
-/*
- * By convention, procedure 0 takes null arguments and returns them
- */
-
-#define NULLPROC ((rpcproc_t)0)
-
-/*
- * Below are the client handle creation routines for the various
- * implementations of client side rpc.  They can return NULL if a
- * creation failure occurs.
- */
-
-/*
- * Generic client creation routine. Supported protocols are those that
- * belong to the nettype namespace (/etc/netconfig).
- * CLIENT *
- * clnt_create(host, prog, vers, prot);
- *	const char *host; 	-- hostname
- *	const rpcprog_t prog;	-- program number
- *	const rpcvers_t vers;	-- version number
- *	const char *prot;	-- protocol
- */
-__BEGIN_DECLS
-extern CLIENT *clnt_create(const char *, const rpcprog_t, const rpcvers_t,
-			   const char *);
-/*
- *
- * 	const char *hostname;			-- hostname
- *	const rpcprog_t prog;			-- program number
- *	const rpcvers_t vers;			-- version number
- *	const char *nettype;			-- network type
- */
-
-/*
- * Generic client creation routine. Supported protocols are which belong
- * to the nettype name space.
- */
-extern CLIENT *clnt_create_vers(const char *, const rpcprog_t, rpcvers_t *,
-				const rpcvers_t, const rpcvers_t,
-				const char *);
-/*
- *	const char *host;		-- hostname
- *	const rpcprog_t prog;		-- program number
- *	rpcvers_t *vers_out;		-- servers highest available version
- *	const rpcvers_t vers_low;	-- low version number
- *	const rpcvers_t vers_high;	-- high version number
- *	const char *nettype;		-- network type
- */
-
-
-/*
- * Generic client creation routine. It takes a netconfig structure
- * instead of nettype
- */
-extern CLIENT *clnt_tp_create(const char *, const rpcprog_t,
-			      const rpcvers_t, const struct netconfig *);
-/*
- *	const char *hostname;			-- hostname
- *	const rpcprog_t prog;			-- program number
- *	const rpcvers_t vers;			-- version number
- *	const struct netconfig *netconf; 	-- network config structure
- */
-
-/*
- * Generic TLI create routine. Only provided for compatibility.
- */
-
-extern CLIENT *clnt_tli_create(const int, const struct netconfig *,
-			       const struct netbuf *, const rpcprog_t,
-			       const rpcvers_t, const u_int, const u_int);
-/*
- *	const register int fd;		-- fd
- *	const struct netconfig *nconf;	-- netconfig structure
- *	const struct netbuf *svcaddr;		-- servers address
- *	const u_long prog;			-- program number
- *	const u_long vers;			-- version number
- *	const u_int sendsz;			-- send size
- *	const u_int recvsz;			-- recv size
- */
-
-/*
- * Low level clnt create routine for connectionful transports, e.g. tcp.
- */
-extern CLIENT *clnt_vc_create(const int, const struct netbuf *,
-			      const rpcprog_t, const rpcvers_t,
-			      const u_int, const u_int);
-/*
- * Added for compatibility to old rpc 4.0. Obsoleted by clnt_vc_create().
- */
-extern CLIENT *clntunix_create(struct sockaddr_un *,
-			       u_long, u_long, int *, u_int, u_int);
-/*
- *	const int fd;				-- open file descriptor
- *	const struct netbuf *svcaddr;		-- servers address
- *	const rpcprog_t prog;			-- program number
- *	const rpcvers_t vers;			-- version number
- *	const u_int sendsz;			-- buffer recv size
- *	const u_int recvsz;			-- buffer send size
- */
-
-/*
- * Low level clnt create routine for connectionless transports, e.g. udp.
- */
-extern CLIENT *clnt_dg_create(const int, const struct netbuf *,
-			      const rpcprog_t, const rpcvers_t,
-			      const u_int, const u_int);
-/*
- *	const int fd;				-- open file descriptor
- *	const struct netbuf *svcaddr;		-- servers address
- *	const rpcprog_t program;		-- program number
- *	const rpcvers_t version;		-- version number
- *	const u_int sendsz;			-- buffer recv size
- *	const u_int recvsz;			-- buffer send size
- */
-
-/*
- * Memory based rpc (for speed check and testing)
- * CLIENT *
- * clnt_raw_create(prog, vers)
- *	u_long prog;
- *	u_long vers;
- */
-extern CLIENT *clnt_raw_create(rpcprog_t, rpcvers_t);
-
-__END_DECLS
-
-
-/*
- * Print why creation failed
- */
-__BEGIN_DECLS
-extern void clnt_pcreateerror(const char *);			/* stderr */
-extern char *clnt_spcreateerror(const char *);			/* string */
-__END_DECLS
-
-/*
- * Like clnt_perror(), but is more verbose in its output
- */
-__BEGIN_DECLS
-extern void clnt_perrno(enum clnt_stat);		/* stderr */
-extern char *clnt_sperrno(enum clnt_stat);		/* string */
-__END_DECLS
-
-/*
- * Print an English error message, given the client error code
- */
-__BEGIN_DECLS
-extern void clnt_perror(CLIENT *, const char *);	 	/* stderr */
-extern char *clnt_sperror(CLIENT *, const char *);		/* string */
-__END_DECLS
-
-
-/*
- * If a creation fails, the following allows the user to figure out why.
- */
-struct rpc_createerr {
-	enum clnt_stat cf_stat;
-	struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */
-};
-
-#ifdef _THREAD_SAFE
-__BEGIN_DECLS
-extern struct rpc_createerr	*__rpc_createerr(void);
-__END_DECLS
-#define rpc_createerr		(*(__rpc_createerr()))
-#else
-extern struct rpc_createerr rpc_createerr;
-#endif /* _THREAD_SAFE */
-
-/*
- * The simplified interface:
- * enum clnt_stat
- * rpc_call(host, prognum, versnum, procnum, inproc, in, outproc, out, nettype)
- *	const char *host;
- *	const rpcprog_t prognum;
- *	const rpcvers_t versnum;
- *	const rpcproc_t procnum;
- *	const xdrproc_t inproc, outproc;
- *	const char *in;
- *	char *out;
- *	const char *nettype;
- */
-__BEGIN_DECLS
-extern enum clnt_stat rpc_call(const char *, const rpcprog_t,
-			       const rpcvers_t, const rpcproc_t,
-			       const xdrproc_t, const char *,
-			       const xdrproc_t, char *, const char *);
-__END_DECLS
-
-/*
- * RPC broadcast interface
- * The call is broadcasted to all locally connected nets.
- *
- * extern enum clnt_stat
- * rpc_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp,
- *			eachresult, nettype)
- *	const rpcprog_t		prog;		-- program number
- *	const rpcvers_t		vers;		-- version number
- *	const rpcproc_t		proc;		-- procedure number
- *	const xdrproc_t	xargs;		-- xdr routine for args
- *	caddr_t		argsp;		-- pointer to args
- *	const xdrproc_t	xresults;	-- xdr routine for results
- *	caddr_t		resultsp;	-- pointer to results
- *	const resultproc_t	eachresult;	-- call with each result
- *	const char		*nettype;	-- Transport type
- *
- * For each valid response received, the procedure eachresult is called.
- * Its form is:
- *		done = eachresult(resp, raddr, nconf)
- *			bool_t done;
- *			caddr_t resp;
- *			struct netbuf *raddr;
- *			struct netconfig *nconf;
- * where resp points to the results of the call and raddr is the
- * address if the responder to the broadcast.  nconf is the transport
- * on which the response was received.
- *
- * extern enum clnt_stat
- * rpc_broadcast_exp(prog, vers, proc, xargs, argsp, xresults, resultsp,
- *			eachresult, inittime, waittime, nettype)
- *	const rpcprog_t		prog;		-- program number
- *	const rpcvers_t		vers;		-- version number
- *	const rpcproc_t		proc;		-- procedure number
- *	const xdrproc_t	xargs;		-- xdr routine for args
- *	caddr_t		argsp;		-- pointer to args
- *	const xdrproc_t	xresults;	-- xdr routine for results
- *	caddr_t		resultsp;	-- pointer to results
- *	const resultproc_t	eachresult;	-- call with each result
- *	const int 		inittime;	-- how long to wait initially
- *	const int 		waittime;	-- maximum time to wait
- *	const char		*nettype;	-- Transport type
- */
-
-typedef bool_t (*resultproc_t)(caddr_t, ...);
-
-__BEGIN_DECLS
-extern enum clnt_stat rpc_broadcast(const rpcprog_t, const rpcvers_t,
-				    const rpcproc_t, const xdrproc_t,
-				    caddr_t, const xdrproc_t, caddr_t,
-				    const resultproc_t, const char *);
-extern enum clnt_stat rpc_broadcast_exp(const rpcprog_t, const rpcvers_t,
-					const rpcproc_t, const xdrproc_t,
-					caddr_t, const xdrproc_t, caddr_t,
-					const resultproc_t, const int,
-					const int, const char *);
-__END_DECLS
-
-/* For backward compatibility */
-#include <rpc/clnt_soc.h>
-
-#endif /* !_RPC_CLNT_H_ */
diff --git a/newlib/libc/sys/linux/include/rpc/clnt_soc.h b/newlib/libc/sys/linux/include/rpc/clnt_soc.h
deleted file mode 100644
index 338d28f..0000000
--- a/newlib/libc/sys/linux/include/rpc/clnt_soc.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*	$NetBSD: clnt_soc.h,v 1.1 2000/06/02 22:57:55 fvdl Exp $	*/
-/*	$FreeBSD: src/include/rpc/clnt_soc.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1984 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * clnt.h - Client side remote procedure call interface.
- */
-
-#ifndef _RPC_CLNT_SOC_H
-#define _RPC_CLNT_SOC_H
-
-/* derived from clnt_soc.h 1.3 88/12/17 SMI     */
-
-/*
- * All the following declarations are only for backward compatibility
- * with TS-RPC.
- */
-
-#include <sys/cdefs.h>
-
-#define UDPMSGSIZE      8800    /* rpc imposed limit on udp msg size */  
-
-/*
- * TCP based rpc
- * CLIENT *
- * clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
- *	struct sockaddr_in *raddr;
- *	u_long prog;
- *	u_long version;
- *	register int *sockp;
- *	u_int sendsz;
- *	u_int recvsz;
- */
-__BEGIN_DECLS
-extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, int *,
-			      u_int, u_int);
-__END_DECLS
-
-/*
- * Raw (memory) rpc.
- */
-__BEGIN_DECLS
-extern CLIENT *clntraw_create(u_long, u_long);
-__END_DECLS
-
-
-/*
- * UDP based rpc.
- * CLIENT *
- * clntudp_create(raddr, program, version, wait, sockp)
- *	struct sockaddr_in *raddr;
- *	u_long program;
- *	u_long version;
- *	struct timeval wait;
- *	int *sockp;
- *
- * Same as above, but you specify max packet sizes.
- * CLIENT *
- * clntudp_bufcreate(raddr, program, version, wait, sockp, sendsz, recvsz)
- *	struct sockaddr_in *raddr;
- *	u_long program;
- *	u_long version;
- *	struct timeval wait;
- *	int *sockp;
- *	u_int sendsz;
- *	u_int recvsz;
- */
-__BEGIN_DECLS
-extern CLIENT *clntudp_create(struct sockaddr_in *, u_long, u_long, 
-			      struct timeval, int *);
-extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, u_long, u_long,
-				 struct timeval, int *, u_int, u_int);
-__END_DECLS
-
-#endif /* _RPC_CLNT_SOC_H */
diff --git a/newlib/libc/sys/linux/include/rpc/clnt_stat.h b/newlib/libc/sys/linux/include/rpc/clnt_stat.h
deleted file mode 100644
index 397bdbc..0000000
--- a/newlib/libc/sys/linux/include/rpc/clnt_stat.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$FreeBSD: src/include/rpc/clnt_stat.h,v 1.2 2001/03/20 08:20:50 alfred Exp $ */
-/*
- * Copyright (c) 1986 - 1991, 1994, 1996, 1997 by Sun Microsystems, Inc.
- * All rights reserved.
- */
-
-/*
- * clnt_stat.h - Client side remote procedure call enum
- *
- */
-
-#ifndef	_RPC_CLNT_STAT_H
-#define	_RPC_CLNT_STAT_H
-
-/* #pragma ident	"@(#)clnt_stat.h	1.2	97/04/28 SMI" */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum clnt_stat {
-	RPC_SUCCESS = 0,			/* call succeeded */
-	/*
-	 * local errors
-	 */
-	RPC_CANTENCODEARGS = 1,		/* can't encode arguments */
-	RPC_CANTDECODERES = 2,		/* can't decode results */
-	RPC_CANTSEND = 3,			/* failure in sending call */
-	RPC_CANTRECV = 4,
-	/* failure in receiving result */
-	RPC_TIMEDOUT = 5,			/* call timed out */
-	RPC_INTR = 18,			/* call interrupted */
-	RPC_UDERROR = 23,			/* recv got uderr indication */
-	/*
-	 * remote errors
-	 */
-	RPC_VERSMISMATCH = 6,		/* rpc versions not compatible */
-	RPC_AUTHERROR = 7,		/* authentication error */
-	RPC_PROGUNAVAIL = 8,		/* program not available */
-	RPC_PROGVERSMISMATCH = 9,	/* program version mismatched */
-	RPC_PROCUNAVAIL = 10,		/* procedure unavailable */
-	RPC_CANTDECODEARGS = 11,		/* decode arguments error */
-	RPC_SYSTEMERROR = 12,		/* generic "other problem" */
-
-	/*
-	 * rpc_call & clnt_create errors
-	 */
-	RPC_UNKNOWNHOST = 13,		/* unknown host name */
-	RPC_UNKNOWNPROTO = 17,		/* unknown protocol */
-	RPC_UNKNOWNADDR = 19,		/* Remote address unknown */
-	RPC_NOBROADCAST = 21,		/* Broadcasting not supported */
-
-	/*
-	 * rpcbind errors
-	 */
-	RPC_RPCBFAILURE = 14,		/* the pmapper failed in its call */
-#define	RPC_PMAPFAILURE RPC_RPCBFAILURE
-	RPC_PROGNOTREGISTERED = 15,	/* remote program is not registered */
-	RPC_N2AXLATEFAILURE = 22,
-	/* Name to address translation failed */
-	/*
-	 * Misc error in the TLI library
-	 */
-	RPC_TLIERROR = 20,
-	/*
-	 * unspecified error
-	 */
-	RPC_FAILED = 16,
-	/*
-	 * asynchronous errors
-	 */
-	RPC_INPROGRESS = 24,
-	RPC_STALERACHANDLE = 25,
-	RPC_CANTCONNECT = 26,		/* couldn't make connection (cots) */
-	RPC_XPRTFAILED = 27,		/* received discon from remote (cots) */
-	RPC_CANTCREATESTREAM = 28	/* can't push rpc module (cots) */
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* !_RPC_CLNT_STAT_H */
diff --git a/newlib/libc/sys/linux/include/rpc/des.h b/newlib/libc/sys/linux/include/rpc/des.h
deleted file mode 100644
index 385afde..0000000
--- a/newlib/libc/sys/linux/include/rpc/des.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  @(#)des.h	2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI  */
-/* $FreeBSD: src/include/rpc/des.h,v 1.4 2002/03/23 17:24:55 imp Exp $ */
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Generic DES driver interface
- * Keep this file hardware independent!
- * Copyright (c) 1986 by Sun Microsystems, Inc.
- */
-
-#define DES_MAXLEN 	65536	/* maximum # of bytes to encrypt  */
-#define DES_QUICKLEN	16	/* maximum # of bytes to encrypt quickly */
-
-enum desdir { ENCRYPT, DECRYPT };
-enum desmode { CBC, ECB };
-
-/*
- * parameters to ioctl call
- */
-struct desparams {
-	u_char des_key[8];	/* key (with low bit parity) */
-	enum desdir des_dir;	/* direction */
-	enum desmode des_mode;	/* mode */
-	u_char des_ivec[8];	/* input vector */
-	unsigned des_len;	/* number of bytes to crypt */
-	union {
-		u_char UDES_data[DES_QUICKLEN];
-		u_char *UDES_buf;
-	} UDES;
-#	define des_data UDES.UDES_data	/* direct data here if quick */
-#	define des_buf	UDES.UDES_buf	/* otherwise, pointer to data */
-};
-
-#ifdef notdef
-
-/*
- * These ioctls are only implemented in SunOS. Maybe someday
- * if somebody writes a driver for DES hardware that works
- * with FreeBSD, we can being that back.
- */
-
-/*
- * Encrypt an arbitrary sized buffer
- */
-#define	DESIOCBLOCK	_IOWR('d', 6, struct desparams)
-
-/* 
- * Encrypt of small amount of data, quickly
- */
-#define DESIOCQUICK	_IOWR('d', 7, struct desparams) 
-
-#endif
-
-/*
- * Software DES.
- */
-extern int _des_crypt( char *, int, struct desparams * );
diff --git a/newlib/libc/sys/linux/include/rpc/des_crypt.h b/newlib/libc/sys/linux/include/rpc/des_crypt.h
deleted file mode 100644
index eb166ed..0000000
--- a/newlib/libc/sys/linux/include/rpc/des_crypt.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * @(#)des_crypt.h	2.1 88/08/11 4.0 RPCSRC;	from 1.4 88/02/08 (C) 1986 SMI
- * $FreeBSD: src/include/rpc/des_crypt.h,v 1.4 2002/03/23 17:24:55 imp Exp $
- *
- * des_crypt.h, des library routine interface
- * Copyright (C) 1986, Sun Microsystems, Inc.
- */
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * des_crypt.h, des library routine interface
- */
-
-#ifndef _DES_DES_CRYPT_H
-#define _DES_DES_CRYPT_H
-
-#include <sys/cdefs.h>
-#include <rpc/rpc.h>
-
-#define DES_MAXDATA 8192	/* max bytes encrypted in one call */
-#define DES_DIRMASK (1 << 0)
-#define DES_ENCRYPT (0*DES_DIRMASK)	/* Encrypt */
-#define DES_DECRYPT (1*DES_DIRMASK)	/* Decrypt */
-
-
-#define DES_DEVMASK (1 << 1)
-#define	DES_HW (0*DES_DEVMASK)	/* Use hardware device */ 
-#define DES_SW (1*DES_DEVMASK)	/* Use software device */
-
-
-#define DESERR_NONE 0	/* succeeded */
-#define DESERR_NOHWDEVICE 1	/* succeeded, but hw device not available */
-#define DESERR_HWERROR 2	/* failed, hardware/driver error */
-#define DESERR_BADPARAM 3	/* failed, bad parameter to call */
-
-#define DES_FAILED(err) \
-	((err) > DESERR_NOHWDEVICE)
-
-/*
- * cbc_crypt()
- * ecb_crypt()
- *
- * Encrypt (or decrypt) len bytes of a buffer buf.
- * The length must be a multiple of eight.
- * The key should have odd parity in the low bit of each byte.
- * ivec is the input vector, and is updated to the new one (cbc only).
- * The mode is created by oring together the appropriate parameters.
- * DESERR_NOHWDEVICE is returned if DES_HW was specified but
- * there was no hardware to do it on (the data will still be
- * encrypted though, in software).
- */
-
-
-/*
- * Cipher Block Chaining mode
- */
-__BEGIN_DECLS
-int cbc_crypt( char *, char *, unsigned int, unsigned int, char *);
-__END_DECLS
-
-/*
- * Electronic Code Book mode
- */
-__BEGIN_DECLS
-int ecb_crypt( char *, char *, unsigned int, unsigned int );
-__END_DECLS
-
-/* 
- * Set des parity for a key.
- * DES parity is odd and in the low bit of each byte
- */
-__BEGIN_DECLS
-void des_setparity( char *);
-__END_DECLS
-
-#endif  /* _DES_DES_CRYPT_H */
diff --git a/newlib/libc/sys/linux/include/rpc/nettype.h b/newlib/libc/sys/linux/include/rpc/nettype.h
deleted file mode 100644
index b18dc49..0000000
--- a/newlib/libc/sys/linux/include/rpc/nettype.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: nettype.h,v 1.2 2000/07/06 03:17:19 christos Exp $	*/
-/*	$FreeBSD: src/include/rpc/nettype.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * nettype.h, Nettype definitions.
- * All for the topmost layer of rpc
- *
- */
-
-#ifndef	_RPC_NETTYPE_H
-#define	_RPC_NETTYPE_H
-
-#include <netconfig.h>
-
-#define	_RPC_NONE	0
-#define	_RPC_NETPATH	1
-#define	_RPC_VISIBLE	2
-#define	_RPC_CIRCUIT_V	3
-#define	_RPC_DATAGRAM_V	4
-#define	_RPC_CIRCUIT_N	5
-#define	_RPC_DATAGRAM_N	6
-#define	_RPC_TCP	7
-#define	_RPC_UDP	8
-
-__BEGIN_DECLS
-extern void *__rpc_setconf(const char *);
-extern void __rpc_endconf(void *);
-extern struct netconfig *__rpc_getconf(void *);
-extern struct netconfig *__rpc_getconfip(const char *);
-__END_DECLS
-
-#endif	/* !_RPC_NETTYPE_H */
diff --git a/newlib/libc/sys/linux/include/rpc/pmap_clnt.h b/newlib/libc/sys/linux/include/rpc/pmap_clnt.h
deleted file mode 100644
index e6333c7..0000000
--- a/newlib/libc/sys/linux/include/rpc/pmap_clnt.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*	$NetBSD: pmap_clnt.h,v 1.9 2000/06/02 22:57:55 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)pmap_clnt.h 1.11 88/02/08 SMI 
- *	from: @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/pmap_clnt.h,v 1.14 2002/04/28 15:18:45 des Exp $
- */
-
-/*
- * pmap_clnt.h
- * Supplies C routines to get to portmap services.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-/*
- * Usage:
- *	success = pmap_set(program, version, protocol, port);
- *	success = pmap_unset(program, version);
- *	port = pmap_getport(address, program, version, protocol);
- *	head = pmap_getmaps(address);
- *	clnt_stat = pmap_rmtcall(address, program, version, procedure,
- *		xdrargs, argsp, xdrres, resp, tout, port_ptr)
- *		(works for udp only.)
- * 	clnt_stat = clnt_broadcast(program, version, procedure,
- *		xdrargs, argsp,	xdrres, resp, eachresult)
- *		(like pmap_rmtcall, except the call is broadcasted to all
- *		locally connected nets.  For each valid response received,
- *		the procedure eachresult is called.  Its form is:
- *	done = eachresult(resp, raddr)
- *		bool_t done;
- *		caddr_t resp;
- *		struct sockaddr_in raddr;
- *		where resp points to the results of the call and raddr is the
- *		address if the responder to the broadcast.
- */
-
-#ifndef _RPC_PMAP_CLNT_H_
-#define _RPC_PMAP_CLNT_H_
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern bool_t		pmap_set(u_long, u_long, int, int);
-extern bool_t		pmap_unset(u_long, u_long);
-extern struct pmaplist	*pmap_getmaps(struct sockaddr_in *);
-extern enum clnt_stat	pmap_rmtcall(struct sockaddr_in *,
-				     u_long, u_long, u_long,
-				     xdrproc_t, caddr_t,
-				     xdrproc_t, caddr_t,
-				     struct timeval, u_long *);
-extern enum clnt_stat	clnt_broadcast(u_long, u_long, u_long,
-				       xdrproc_t, void *,
-				       xdrproc_t, void *,
-				       resultproc_t);
-extern u_short		pmap_getport(struct sockaddr_in *,
-				     u_long, u_long, u_int);
-__END_DECLS
-
-#endif /* !_RPC_PMAP_CLNT_H_ */
diff --git a/newlib/libc/sys/linux/include/rpc/pmap_prot.h b/newlib/libc/sys/linux/include/rpc/pmap_prot.h
deleted file mode 100644
index d830499..0000000
--- a/newlib/libc/sys/linux/include/rpc/pmap_prot.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*	$NetBSD: pmap_prot.h,v 1.8 2000/06/02 22:57:55 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI 
- *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/pmap_prot.h,v 1.12 2002/03/23 17:24:55 imp Exp $
- */
-
-/*
- * pmap_prot.h
- * Protocol for the local binder service, or pmap.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * The following procedures are supported by the protocol:
- *
- * PMAPPROC_NULL() returns ()
- * 	takes nothing, returns nothing
- *
- * PMAPPROC_SET(struct pmap) returns (bool_t)
- * 	TRUE is success, FALSE is failure.  Registers the tuple
- *	[prog, vers, prot, port].
- *
- * PMAPPROC_UNSET(struct pmap) returns (bool_t)
- *	TRUE is success, FALSE is failure.  Un-registers pair
- *	[prog, vers].  prot and port are ignored.
- *
- * PMAPPROC_GETPORT(struct pmap) returns (long unsigned).
- *	0 is failure.  Otherwise returns the port number where the pair
- *	[prog, vers] is registered.  It may lie!
- *
- * PMAPPROC_DUMP() RETURNS (struct pmaplist *)
- *
- * PMAPPROC_CALLIT(unsigned, unsigned, unsigned, string<>)
- * 	RETURNS (port, string<>);
- * usage: encapsulatedresults = PMAPPROC_CALLIT(prog, vers, proc, encapsulatedargs);
- * 	Calls the procedure on the local machine.  If it is not registered,
- *	this procedure is quite; ie it does not return error information!!!
- *	This procedure only is supported on rpc/udp and calls via
- *	rpc/udp.  This routine only passes null authentication parameters.
- *	This file has no interface to xdr routines for PMAPPROC_CALLIT.
- *
- * The service supports remote procedure calls on udp/ip or tcp/ip socket 111.
- */
-
-#ifndef _RPC_PMAP_PROT_H
-#define _RPC_PMAP_PROT_H
-#include <sys/cdefs.h>
-
-#define PMAPPORT		((u_short)111)
-#define PMAPPROG		((u_long)100000)
-#define PMAPVERS		((u_long)2)
-#define PMAPVERS_PROTO		((u_long)2)
-#define PMAPVERS_ORIG		((u_long)1)
-#define PMAPPROC_NULL		((u_long)0)
-#define PMAPPROC_SET		((u_long)1)
-#define PMAPPROC_UNSET		((u_long)2)
-#define PMAPPROC_GETPORT	((u_long)3)
-#define PMAPPROC_DUMP		((u_long)4)
-#define PMAPPROC_CALLIT		((u_long)5)
-
-struct pmap {
-	long unsigned pm_prog;
-	long unsigned pm_vers;
-	long unsigned pm_prot;
-	long unsigned pm_port;
-};
-
-struct pmaplist {
-	struct pmap	pml_map;
-	struct pmaplist *pml_next;
-};
-
-__BEGIN_DECLS
-extern bool_t xdr_pmap(XDR *, struct pmap *);
-extern bool_t xdr_pmaplist(XDR *, struct pmaplist **);
-extern bool_t xdr_pmaplist_ptr(XDR *, struct pmaplist *);
-__END_DECLS
-
-#endif /* !_RPC_PMAP_PROT_H */
diff --git a/newlib/libc/sys/linux/include/rpc/pmap_rmt.h b/newlib/libc/sys/linux/include/rpc/pmap_rmt.h
deleted file mode 100644
index 3e069e7..0000000
--- a/newlib/libc/sys/linux/include/rpc/pmap_rmt.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: pmap_rmt.h,v 1.7 1998/02/11 23:01:23 lukem Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)pmap_rmt.h 1.2 88/02/08 SMI
- *	from: @(#)pmap_rmt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/pmap_rmt.h,v 1.12 2002/03/23 17:24:55 imp Exp $
- */
-
-/*
- * Structures and XDR routines for parameters to and replies from
- * the portmapper remote-call-service.
- *
- * Copyright (C) 1986, Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_PMAP_RMT_H
-#define _RPC_PMAP_RMT_H
-#include <sys/cdefs.h>
-
-struct rmtcallargs {
-	u_long prog, vers, proc, arglen;
-	caddr_t args_ptr;
-	xdrproc_t xdr_args;
-};
-
-struct rmtcallres {
-	u_long *port_ptr;
-	u_long resultslen;
-	caddr_t results_ptr;
-	xdrproc_t xdr_results;
-};
-
-__BEGIN_DECLS
-extern bool_t xdr_rmtcall_args(XDR *, struct rmtcallargs *);
-extern bool_t xdr_rmtcallres(XDR *, struct rmtcallres *);
-__END_DECLS
-
-#endif /* !_RPC_PMAP_RMT_H */
diff --git a/newlib/libc/sys/linux/include/rpc/raw.h b/newlib/libc/sys/linux/include/rpc/raw.h
deleted file mode 100644
index d418bf4..0000000
--- a/newlib/libc/sys/linux/include/rpc/raw.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: raw.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD: src/include/rpc/raw.h,v 1.1 2001/03/19 12:49:47 alfred Exp $ */
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_RAW_H
-#define	_RPC_RAW_H
-
-/* 	from: @(#)raw.h	1.11	94/04/25 SMI */
-/*	from: @(#)raw.h 1.2 88/10/25 SMI	*/
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/*
- * raw.h
- *
- * Raw interface
- * The common memory area over which they will communicate
- */
-extern char *__rpc_rawcombuf;
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _RPC_RAW_H */
diff --git a/newlib/libc/sys/linux/include/rpc/rpc.h b/newlib/libc/sys/linux/include/rpc/rpc.h
deleted file mode 100644
index 72a717c..0000000
--- a/newlib/libc/sys/linux/include/rpc/rpc.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*	$NetBSD: rpc.h,v 1.13 2000/06/02 22:57:56 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)rpc.h 1.9 88/02/08 SMI
- *	from: @(#)rpc.h	2.4 89/07/11 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/rpc.h,v 1.17 2002/03/23 17:24:55 imp Exp $
- */
-
-/*
- * rpc.h, Just includes the billions of rpc header files necessary to
- * do remote procedure calling.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-#ifndef _RPC_RPC_H
-#define _RPC_RPC_H
-
-#include <rpc/types.h>		/* some typedefs */
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-/* external data representation interfaces */
-#include <rpc/xdr.h>		/* generic (de)serializer */
-
-/* Client side only authentication */
-#include <rpc/auth.h>		/* generic authenticator (client side) */
-
-/* Client side (mostly) remote procedure call */
-#include <rpc/clnt.h>		/* generic rpc stuff */
-
-/* semi-private protocol headers */
-#include <rpc/rpc_msg.h>	/* protocol for rpc messages */
-#include <rpc/auth_unix.h>	/* protocol for unix style cred */
-/*
- *  Uncomment-out the next line if you are building the rpc library with
- *  DES Authentication (see the README file in the secure_rpc/ directory).
- */
-#include <rpc/auth_des.h>	/* protocol for des style cred */
-
-/* Server side only remote procedure callee */
-#include <rpc/svc.h>		/* service manager and multiplexer */
-#include <rpc/svc_auth.h>	/* service side authenticator */
-
-/* Portmapper client, server, and protocol headers */
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_prot.h>
-
-#ifndef _KERNEL
-#include <rpc/rpcb_clnt.h>	/* rpcbind interface functions */
-#endif
-
-#include <rpc/rpcent.h>
-
-__BEGIN_DECLS
-extern int get_myaddress(struct sockaddr_in *);
-extern int bindresvport(int, struct sockaddr_in *);
-extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]),
-    xdrproc_t, xdrproc_t);
-extern int callrpc(const char *, int, int, int, xdrproc_t, void *,
-    xdrproc_t , void *);
-extern int getrpcport(char *, int, int, int);
-
-char *taddr2uaddr(const struct netconfig *, const struct netbuf *);
-struct netbuf *uaddr2taddr(const struct netconfig *, const char *);
-
-struct sockaddr;
-extern int bindresvport_sa(int, struct sockaddr *);
-__END_DECLS
-
-/*
- * The following are not exported interfaces, they are for internal library
- * and rpcbind use only. Do not use, they may change without notice.
- */
-__BEGIN_DECLS
-int __rpc_nconf2fd(const struct netconfig *);
-int __rpc_nconf2sockinfo(const struct netconfig *, struct __rpc_sockinfo *);
-int __rpc_fd2sockinfo(int, struct __rpc_sockinfo *);
-u_int __rpc_get_t_size(int, int, int);
-__END_DECLS
-
-#endif /* !_RPC_RPC_H */
diff --git a/newlib/libc/sys/linux/include/rpc/rpc_com.h b/newlib/libc/sys/linux/include/rpc/rpc_com.h
deleted file mode 100644
index 8c6a26e..0000000
--- a/newlib/libc/sys/linux/include/rpc/rpc_com.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: rpc_com.h,v 1.3 2000/12/10 04:10:08 christos Exp $	*/
-/*	$FreeBSD: src/include/rpc/rpc_com.h,v 1.5 2002/03/23 17:24:55 imp Exp $ */
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * rpc_com.h, Common definitions for both the server and client side.
- * All for the topmost layer of rpc
- *
- */
-
-#ifndef _RPC_RPCCOM_H
-#define	_RPC_RPCCOM_H
-
-#include <sys/cdefs.h>
-
-/* #pragma ident	"@(#)rpc_com.h	1.11	93/07/05 SMI" */
-
-/*
- * The max size of the transport, if the size cannot be determined
- * by other means.
- */
-#define	RPC_MAXDATASIZE 9000
-#define	RPC_MAXADDRSIZE 1024
-
-#define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \
-    (u_int32_t)(now)->tv_usec)
-
-__BEGIN_DECLS
-extern u_int __rpc_get_a_size(int);
-extern int __rpc_dtbsize(void);
-extern int _rpc_dtablesize(void);
-extern struct netconfig * __rpcgettp(int);
-extern  int  __rpc_get_default_domain(char **);
-
-char *__rpc_taddr2uaddr_af(int, const struct netbuf *);
-struct netbuf *__rpc_uaddr2taddr_af(int, const char *);
-int __rpc_fixup_addr(struct netbuf *, const struct netbuf *);
-int __rpc_sockinfo2netid(struct __rpc_sockinfo *, const char **);
-int __rpc_seman2socktype(int);
-int __rpc_socktype2seman(int);
-void *rpc_nullproc(CLIENT *);
-int __rpc_sockisbound(int);
-
-struct netbuf *__rpcb_findaddr(rpcprog_t, rpcvers_t, const struct netconfig *,
-			       const char *, CLIENT **);
-bool_t __rpc_control(int,void *);
-
-char *_get_next_token(char *, int);
-
-__END_DECLS
-
-#endif /* _RPC_RPCCOM_H */
diff --git a/newlib/libc/sys/linux/include/rpc/rpc_msg.h b/newlib/libc/sys/linux/include/rpc/rpc_msg.h
deleted file mode 100644
index 6cb229c..0000000
--- a/newlib/libc/sys/linux/include/rpc/rpc_msg.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*	$NetBSD: rpc_msg.h,v 1.11 2000/06/02 22:57:56 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
- *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/rpc_msg.h,v 1.14 2002/03/23 17:24:55 imp Exp $
- */
-
-/*
- * rpc_msg.h
- * rpc message definition
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_RPC_MSG_H
-#define _RPC_RPC_MSG_H
-
-#define RPC_MSG_VERSION		((u_int32_t) 2)
-#define RPC_SERVICE_PORT	((u_short) 2048)
-
-/*
- * Bottom up definition of an rpc message.
- * NOTE: call and reply use the same overall stuct but
- * different parts of unions within it.
- */
-
-enum msg_type {
-	CALL=0,
-	REPLY=1
-};
-
-enum reply_stat {
-	MSG_ACCEPTED=0,
-	MSG_DENIED=1
-};
-
-enum accept_stat {
-	SUCCESS=0,
-	PROG_UNAVAIL=1,
-	PROG_MISMATCH=2,
-	PROC_UNAVAIL=3,
-	GARBAGE_ARGS=4,
-	SYSTEM_ERR=5
-};
-
-enum reject_stat {
-	RPC_MISMATCH=0,
-	AUTH_ERROR=1
-};
-
-/*
- * Reply part of an rpc exchange
- */
-
-/*
- * Reply to an rpc request that was accepted by the server.
- * Note: there could be an error even though the request was
- * accepted.
- */
-struct accepted_reply {
-	struct opaque_auth	ar_verf;
-	enum accept_stat	ar_stat;
-	union {
-		struct {
-			rpcvers_t low;
-			rpcvers_t high;
-		} AR_versions;
-		struct {
-			caddr_t	where;
-			xdrproc_t proc;
-		} AR_results;
-		/* and many other null cases */
-	} ru;
-#define	ar_results	ru.AR_results
-#define	ar_vers		ru.AR_versions
-};
-
-/*
- * Reply to an rpc request that was rejected by the server.
- */
-struct rejected_reply {
-	enum reject_stat rj_stat;
-	union {
-		struct {
-			rpcvers_t low;
-			rpcvers_t high;
-		} RJ_versions;
-		enum auth_stat RJ_why;  /* why authentication did not work */
-	} ru;
-#define	rj_vers	ru.RJ_versions
-#define	rj_why	ru.RJ_why
-};
-
-/*
- * Body of a reply to an rpc request.
- */
-struct reply_body {
-	enum reply_stat rp_stat;
-	union {
-		struct accepted_reply RP_ar;
-		struct rejected_reply RP_dr;
-	} ru;
-#define	rp_acpt	ru.RP_ar
-#define	rp_rjct	ru.RP_dr
-};
-
-/*
- * Body of an rpc request call.
- */
-struct call_body {
-	rpcvers_t cb_rpcvers;	/* must be equal to two */
-	rpcprog_t cb_prog;
-	rpcvers_t cb_vers;
-	rpcproc_t cb_proc;
-	struct opaque_auth cb_cred;
-	struct opaque_auth cb_verf; /* protocol specific - provided by client */
-};
-
-/*
- * The rpc message
- */
-struct rpc_msg {
-	u_int32_t		rm_xid;
-	enum msg_type		rm_direction;
-	union {
-		struct call_body RM_cmb;
-		struct reply_body RM_rmb;
-	} ru;
-#define	rm_call		ru.RM_cmb
-#define	rm_reply	ru.RM_rmb
-};
-#define	acpted_rply	ru.RM_rmb.ru.RP_ar
-#define	rjcted_rply	ru.RM_rmb.ru.RP_dr
-
-__BEGIN_DECLS
-/*
- * XDR routine to handle a rpc message.
- * xdr_callmsg(xdrs, cmsg)
- * 	XDR *xdrs;
- * 	struct rpc_msg *cmsg;
- */
-extern bool_t	xdr_callmsg(XDR *, struct rpc_msg *);
-
-/*
- * XDR routine to pre-serialize the static part of a rpc message.
- * xdr_callhdr(xdrs, cmsg)
- * 	XDR *xdrs;
- * 	struct rpc_msg *cmsg;
- */
-extern bool_t	xdr_callhdr(XDR *, struct rpc_msg *);
-
-/*
- * XDR routine to handle a rpc reply.
- * xdr_replymsg(xdrs, rmsg)
- * 	XDR *xdrs;
- * 	struct rpc_msg *rmsg;
- */
-extern bool_t	xdr_replymsg(XDR *, struct rpc_msg *);
-
-
-/*
- * XDR routine to handle a accepted rpc reply.
- * xdr_accepted_reply(xdrs, rej)
- * 	XDR *xdrs;
- * 	struct accepted_reply *rej;
- */
-extern bool_t	xdr_accepted_reply(XDR *, struct accepted_reply *);
-
-/*
- * XDR routine to handle a rejected rpc reply.
- * xdr_rejected_reply(xdrs, rej)
- * 	XDR *xdrs;
- * 	struct rejected_reply *rej;
- */
-extern bool_t	xdr_rejected_reply(XDR *, struct rejected_reply *);
-
-/*
- * Fills in the error part of a reply message.
- * _seterr_reply(msg, error)
- * 	struct rpc_msg *msg;
- * 	struct rpc_err *error;
- */
-extern void	_seterr_reply(struct rpc_msg *, struct rpc_err *);
-__END_DECLS
-
-#endif /* !_RPC_RPC_MSG_H */
diff --git a/newlib/libc/sys/linux/include/rpc/rpcb_clnt.h b/newlib/libc/sys/linux/include/rpc/rpcb_clnt.h
deleted file mode 100644
index 3b9966b..0000000
--- a/newlib/libc/sys/linux/include/rpc/rpcb_clnt.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: rpcb_clnt.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD: src/include/rpc/rpcb_clnt.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * rpcb_clnt.h
- * Supplies C routines to get to rpcbid services.
- *
- */
-
-/*
- * Usage:
- *	success = rpcb_set(program, version, nconf, address);
- *	success = rpcb_unset(program, version, nconf);
- *	success = rpcb_getaddr(program, version, nconf, host);
- *	head = rpcb_getmaps(nconf, host);
- *	clnt_stat = rpcb_rmtcall(nconf, host, program, version, procedure,
- *		xdrargs, argsp, xdrres, resp, tout, addr_ptr)
- *	success = rpcb_gettime(host, timep)
- *	uaddr = rpcb_taddr2uaddr(nconf, taddr);
- *	taddr = rpcb_uaddr2uaddr(nconf, uaddr);
- */
-
-#ifndef _RPC_RPCB_CLNT_H
-#define	_RPC_RPCB_CLNT_H
-
-/* #pragma ident	"@(#)rpcb_clnt.h	1.13	94/04/25 SMI" */
-/* rpcb_clnt.h 1.3 88/12/05 SMI */
-
-#include <rpc/types.h>
-#include <rpc/rpcb_prot.h>
-
-__BEGIN_DECLS
-extern bool_t rpcb_set(const rpcprog_t, const rpcvers_t,
-		       const struct netconfig  *, const struct netbuf *);
-extern bool_t rpcb_unset(const rpcprog_t, const rpcvers_t,
-			 const struct netconfig *);
-extern rpcblist	*rpcb_getmaps(const struct netconfig *, const char *);
-extern enum clnt_stat rpcb_rmtcall(const struct netconfig *,
-				   const char *, const rpcprog_t,
-				   const rpcvers_t, const rpcproc_t,
-				   const xdrproc_t, const caddr_t,
-				   const xdrproc_t, const caddr_t,
-				   const struct timeval,
-				   const struct netbuf *);
-extern bool_t rpcb_getaddr(const rpcprog_t, const rpcvers_t,
-			   const struct netconfig *, struct netbuf *,
-			   const  char *);
-extern bool_t rpcb_gettime(const char *, time_t *);
-extern char *rpcb_taddr2uaddr(struct netconfig *, struct netbuf *);
-extern struct netbuf *rpcb_uaddr2taddr(struct netconfig *, char *);
-__END_DECLS
-
-#endif	/* !_RPC_RPCB_CLNT_H */
diff --git a/newlib/libc/sys/linux/include/rpc/rpcb_prot.h b/newlib/libc/sys/linux/include/rpc/rpcb_prot.h
deleted file mode 100644
index 1442603..0000000
--- a/newlib/libc/sys/linux/include/rpc/rpcb_prot.h
+++ /dev/null
@@ -1,660 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _RPCB_PROT_H_RPCGEN
-#define _RPCB_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * $FreeBSD: src/include/rpc/rpcb_prot.x,v 1.3 2002/03/13 10:29:06 obrien Exp $
- *
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1988 by Sun Microsystems, Inc.
- */
-/* from rpcb_prot.x */
-
-/* #pragma ident	"@(#)rpcb_prot.x	1.5	94/04/29 SMI" */
-
-#ifndef _KERNEL
-
-
-/*
- * The following procedures are supported by the protocol in version 3:
- *
- * RPCBPROC_NULL() returns ()
- * 	takes nothing, returns nothing
- *
- * RPCBPROC_SET(rpcb) returns (bool_t)
- * 	TRUE is success, FALSE is failure.  Registers the tuple
- *	[prog, vers, address, owner, netid].
- *	Finds out owner and netid information on its own.
- *
- * RPCBPROC_UNSET(rpcb) returns (bool_t)
- *	TRUE is success, FALSE is failure.  Un-registers tuple
- *	[prog, vers, netid].  addresses is ignored.
- *	If netid is NULL, unregister all.
- *
- * RPCBPROC_GETADDR(rpcb) returns (string).
- *	0 is failure.  Otherwise returns the universal address where the
- *	triple [prog, vers, netid] is registered.  Ignore address and owner.
- *
- * RPCBPROC_DUMP() RETURNS (rpcblist_ptr)
- *	used to dump the entire rpcbind maps
- *
- * RPCBPROC_CALLIT(rpcb_rmtcallargs)
- * 	RETURNS (rpcb_rmtcallres);
- * 	Calls the procedure on the remote machine.  If it is not registered,
- *	this procedure is quiet; i.e. it does not return error information!!!
- *	This routine only passes null authentication parameters.
- *	It has no interface to xdr routines for RPCBPROC_CALLIT.
- *
- * RPCBPROC_GETTIME() returns (int).
- *	Gets the remote machines time
- *
- * RPCBPROC_UADDR2TADDR(strint) RETURNS (struct netbuf)
- *	Returns the netbuf address from universal address.
- *
- * RPCBPROC_TADDR2UADDR(struct netbuf) RETURNS (string)
- *	Returns the universal address from netbuf address.
- *
- * END OF RPCBIND VERSION 3 PROCEDURES
- */
-/*
- * Except for RPCBPROC_CALLIT, the procedures above are carried over to
- * rpcbind version 4.  Those below are added or modified for version 4.
- * NOTE: RPCBPROC_BCAST HAS THE SAME FUNCTIONALITY AND PROCEDURE NUMBER
- * AS RPCBPROC_CALLIT.
- *
- * RPCBPROC_BCAST(rpcb_rmtcallargs)
- * 	RETURNS (rpcb_rmtcallres);
- * 	Calls the procedure on the remote machine.  If it is not registered,
- *	this procedure IS quiet; i.e. it DOES NOT return error information!!!
- *	This routine should be used for broadcasting and nothing else.
- *
- * RPCBPROC_GETVERSADDR(rpcb) returns (string).
- *	0 is failure.  Otherwise returns the universal address where the
- *	triple [prog, vers, netid] is registered.  Ignore address and owner.
- *	Same as RPCBPROC_GETADDR except that if the given version number
- *	is not available, the address is not returned.
- *
- * RPCBPROC_INDIRECT(rpcb_rmtcallargs)
- * 	RETURNS (rpcb_rmtcallres);
- * 	Calls the procedure on the remote machine.  If it is not registered,
- *	this procedure is NOT quiet; i.e. it DOES return error information!!!
- * 	as any normal application would expect.
- *
- * RPCBPROC_GETADDRLIST(rpcb) returns (rpcb_entry_list_ptr).
- *	Same as RPCBPROC_GETADDR except that it returns a list of all the
- *	addresses registered for the combination (prog, vers) (for all
- *	transports).
- *
- * RPCBPROC_GETSTAT(void) returns (rpcb_stat_byvers)
- *	Returns the statistics about the kind of requests received by rpcbind.
- */
-
-/*
- * A mapping of (program, version, network ID) to address
- */
-
-struct rpcb {
-	rpcprog_t r_prog;
-	rpcvers_t r_vers;
-	char *r_netid;
-	char *r_addr;
-	char *r_owner;
-};
-typedef struct rpcb rpcb;
-
-typedef rpcb RPCB;
-
-
-/*
- * A list of mappings
- *
- * Below are two definitions for the rpcblist structure.  This is done because
- * xdr_rpcblist() is specified to take a struct rpcblist **, rather than a
- * struct rpcblist * that rpcgen would produce.  One version of the rpcblist
- * structure (actually called rp__list) is used with rpcgen, and the other is
- * defined only in the header file for compatibility with the specified
- * interface.
- */
-
-struct rp__list {
-	rpcb rpcb_map;
-	struct rp__list *rpcb_next;
-};
-typedef struct rp__list rp__list;
-
-typedef rp__list *rpcblist_ptr;
-
-typedef struct rp__list rpcblist;
-typedef struct rp__list RPCBLIST;
-
-#ifndef __cplusplus
-struct rpcblist {
- RPCB rpcb_map;
- struct rpcblist *rpcb_next;
-};
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern bool_t xdr_rpcblist(XDR *, rpcblist**);
-#ifdef __cplusplus
-}
-#endif
-
-
-/*
- * Arguments of remote calls
- */
-
-struct rpcb_rmtcallargs {
-	rpcprog_t prog;
-	rpcvers_t vers;
-	rpcproc_t proc;
-	struct {
-		u_int args_len;
-		char *args_val;
-	} args;
-};
-typedef struct rpcb_rmtcallargs rpcb_rmtcallargs;
-
-/*
- * Client-side only representation of rpcb_rmtcallargs structure.
- *
- * The routine that XDRs the rpcb_rmtcallargs structure must deal with the
- * opaque arguments in the "args" structure.  xdr_rpcb_rmtcallargs() needs to
- * be passed the XDR routine that knows the args' structure.  This routine
- * doesn't need to go over-the-wire (and it wouldn't make sense anyway) since
- * the application being called already knows the args structure.  So we use a
- * different "XDR" structure on the client side, r_rpcb_rmtcallargs, which
- * includes the args' XDR routine.
- */
-struct r_rpcb_rmtcallargs {
- rpcprog_t prog;
- rpcvers_t vers;
- rpcproc_t proc;
- struct {
- u_int args_len;
- char *args_val;
- } args;
- xdrproc_t xdr_args; /* encodes args */
-};
-
-
-/*
- * Results of the remote call
- */
-
-struct rpcb_rmtcallres {
-	char *addr;
-	struct {
-		u_int results_len;
-		char *results_val;
-	} results;
-};
-typedef struct rpcb_rmtcallres rpcb_rmtcallres;
-
-/*
- * Client-side only representation of rpcb_rmtcallres structure.
- */
-struct r_rpcb_rmtcallres {
- char *addr;
- struct {
- u_int32_t results_len;
- char *results_val;
- } results;
- xdrproc_t xdr_res; /* decodes results */
-};
-
-/*
- * rpcb_entry contains a merged address of a service on a particular
- * transport, plus associated netconfig information.  A list of rpcb_entrys
- * is returned by RPCBPROC_GETADDRLIST.  See netconfig.h for values used
- * in r_nc_* fields.
- */
-
-struct rpcb_entry {
-	char *r_maddr;
-	char *r_nc_netid;
-	u_int r_nc_semantics;
-	char *r_nc_protofmly;
-	char *r_nc_proto;
-};
-typedef struct rpcb_entry rpcb_entry;
-
-/*
- * A list of addresses supported by a service.
- */
-
-struct rpcb_entry_list {
-	rpcb_entry rpcb_entry_map;
-	struct rpcb_entry_list *rpcb_entry_next;
-};
-typedef struct rpcb_entry_list rpcb_entry_list;
-
-typedef rpcb_entry_list *rpcb_entry_list_ptr;
-
-/*
- * rpcbind statistics
- */
-
-#define rpcb_highproc_2 RPCBPROC_CALLIT
-#define rpcb_highproc_3 RPCBPROC_TADDR2UADDR
-#define rpcb_highproc_4 RPCBPROC_GETSTAT
-#define RPCBSTAT_HIGHPROC 13
-#define RPCBVERS_STAT 3
-#define RPCBVERS_4_STAT 2
-#define RPCBVERS_3_STAT 1
-#define RPCBVERS_2_STAT 0
-
-/* Link list of all the stats about getport and getaddr */
-
-struct rpcbs_addrlist {
-	rpcprog_t prog;
-	rpcvers_t vers;
-	int success;
-	int failure;
-	char *netid;
-	struct rpcbs_addrlist *next;
-};
-typedef struct rpcbs_addrlist rpcbs_addrlist;
-
-/* Link list of all the stats about rmtcall */
-
-struct rpcbs_rmtcalllist {
-	rpcprog_t prog;
-	rpcvers_t vers;
-	rpcproc_t proc;
-	int success;
-	int failure;
-	int indirect;
-	char *netid;
-	struct rpcbs_rmtcalllist *next;
-};
-typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist;
-
-typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
-
-typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
-
-typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
-
-struct rpcb_stat {
-	rpcbs_proc info;
-	int setinfo;
-	int unsetinfo;
-	rpcbs_addrlist_ptr addrinfo;
-	rpcbs_rmtcalllist_ptr rmtinfo;
-};
-typedef struct rpcb_stat rpcb_stat;
-
-/*
- * One rpcb_stat structure is returned for each version of rpcbind
- * being monitored.
- */
-
-typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
-
-/*
- * We don't define netbuf in RPCL, since it would contain structure member
- * names that would conflict with the definition of struct netbuf in
- * <tiuser.h>.  Instead we merely declare the XDR routine xdr_netbuf() here,
- * and implement it ourselves in rpc/rpcb_prot.c.
- */
-#ifdef __cplusplus
-extern "C" bool_t xdr_netbuf(XDR *, struct netbuf *);
-
-#else /* __STDC__ */
-extern bool_t xdr_netbuf(XDR *, struct netbuf *);
-
-#endif
-
-#define RPCBVERS_3 RPCBVERS
-#define RPCBVERS_4 RPCBVERS4
-
-#define _PATH_RPCBINDSOCK "/var/run/rpcbind.sock"
-
-#else /* ndef _KERNEL */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * A mapping of (program, version, network ID) to address
- */
-struct rpcb {
- rpcprog_t r_prog; /* program number */
- rpcvers_t r_vers; /* version number */
- char *r_netid; /* network id */
- char *r_addr; /* universal address */
- char *r_owner; /* owner of the mapping */
-};
-typedef struct rpcb RPCB;
-
-/*
- * A list of mappings
- */
-struct rpcblist {
- RPCB rpcb_map;
- struct rpcblist *rpcb_next;
-};
-typedef struct rpcblist RPCBLIST;
-typedef struct rpcblist *rpcblist_ptr;
-
-/*
- * Remote calls arguments
- */
-struct rpcb_rmtcallargs {
- rpcprog_t prog; /* program number */
- rpcvers_t vers; /* version number */
- rpcproc_t proc; /* procedure number */
- u_int32_t arglen; /* arg len */
- caddr_t args_ptr; /* argument */
- xdrproc_t xdr_args; /* XDR routine for argument */
-};
-typedef struct rpcb_rmtcallargs rpcb_rmtcallargs;
-
-/*
- * Remote calls results
- */
-struct rpcb_rmtcallres {
- char *addr_ptr; /* remote universal address */
- u_int32_t resultslen; /* results length */
- caddr_t results_ptr; /* results */
- xdrproc_t xdr_results; /* XDR routine for result */
-};
-typedef struct rpcb_rmtcallres rpcb_rmtcallres;
-
-struct rpcb_entry {
- char *r_maddr;
- char *r_nc_netid;
- unsigned int r_nc_semantics;
- char *r_nc_protofmly;
- char *r_nc_proto;
-};
-typedef struct rpcb_entry rpcb_entry;
-
-/*
- * A list of addresses supported by a service.
- */
-
-struct rpcb_entry_list {
- rpcb_entry rpcb_entry_map;
- struct rpcb_entry_list *rpcb_entry_next;
-};
-typedef struct rpcb_entry_list rpcb_entry_list;
-
-typedef rpcb_entry_list *rpcb_entry_list_ptr;
-
-/*
- * rpcbind statistics
- */
-
-#define rpcb_highproc_2 RPCBPROC_CALLIT
-#define rpcb_highproc_3 RPCBPROC_TADDR2UADDR
-#define rpcb_highproc_4 RPCBPROC_GETSTAT
-#define RPCBSTAT_HIGHPROC 13
-#define RPCBVERS_STAT 3
-#define RPCBVERS_4_STAT 2
-#define RPCBVERS_3_STAT 1
-#define RPCBVERS_2_STAT 0
-
-/* Link list of all the stats about getport and getaddr */
-
-struct rpcbs_addrlist {
- rpcprog_t prog;
- rpcvers_t vers;
- int success;
- int failure;
- char *netid;
- struct rpcbs_addrlist *next;
-};
-typedef struct rpcbs_addrlist rpcbs_addrlist;
-
-/* Link list of all the stats about rmtcall */
-
-struct rpcbs_rmtcalllist {
- rpcprog_t prog;
- rpcvers_t vers;
- rpcproc_t proc;
- int success;
- int failure;
- int indirect;
- char *netid;
- struct rpcbs_rmtcalllist *next;
-};
-typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist;
-
-typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
-
-typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
-
-typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
-
-struct rpcb_stat {
- rpcbs_proc info;
- int setinfo;
- int unsetinfo;
- rpcbs_addrlist_ptr addrinfo;
- rpcbs_rmtcalllist_ptr rmtinfo;
-};
-typedef struct rpcb_stat rpcb_stat;
-
-/*
- * One rpcb_stat structure is returned for each version of rpcbind
- * being monitored.
- */
-
-typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ndef _KERNEL */
-
-#define RPCBPROG 100000
-#define RPCBVERS 3
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define RPCBPROC_SET 1
-extern  bool_t * rpcbproc_set_3(rpcb *, CLIENT *);
-extern  bool_t * rpcbproc_set_3_svc(rpcb *, struct svc_req *);
-#define RPCBPROC_UNSET 2
-extern  bool_t * rpcbproc_unset_3(rpcb *, CLIENT *);
-extern  bool_t * rpcbproc_unset_3_svc(rpcb *, struct svc_req *);
-#define RPCBPROC_GETADDR 3
-extern  char ** rpcbproc_getaddr_3(rpcb *, CLIENT *);
-extern  char ** rpcbproc_getaddr_3_svc(rpcb *, struct svc_req *);
-#define RPCBPROC_DUMP 4
-extern  rpcblist_ptr * rpcbproc_dump_3(void *, CLIENT *);
-extern  rpcblist_ptr * rpcbproc_dump_3_svc(void *, struct svc_req *);
-#define RPCBPROC_CALLIT 5
-extern  rpcb_rmtcallres * rpcbproc_callit_3(rpcb_rmtcallargs *, CLIENT *);
-extern  rpcb_rmtcallres * rpcbproc_callit_3_svc(rpcb_rmtcallargs *, struct svc_req *);
-#define RPCBPROC_GETTIME 6
-extern  u_int * rpcbproc_gettime_3(void *, CLIENT *);
-extern  u_int * rpcbproc_gettime_3_svc(void *, struct svc_req *);
-#define RPCBPROC_UADDR2TADDR 7
-extern  struct netbuf * rpcbproc_uaddr2taddr_3(char **, CLIENT *);
-extern  struct netbuf * rpcbproc_uaddr2taddr_3_svc(char **, struct svc_req *);
-#define RPCBPROC_TADDR2UADDR 8
-extern  char ** rpcbproc_taddr2uaddr_3(struct netbuf *, CLIENT *);
-extern  char ** rpcbproc_taddr2uaddr_3_svc(struct netbuf *, struct svc_req *);
-extern int rpcbprog_3_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-#define RPCBPROC_SET 1
-extern  bool_t * rpcbproc_set_3();
-extern  bool_t * rpcbproc_set_3_svc();
-#define RPCBPROC_UNSET 2
-extern  bool_t * rpcbproc_unset_3();
-extern  bool_t * rpcbproc_unset_3_svc();
-#define RPCBPROC_GETADDR 3
-extern  char ** rpcbproc_getaddr_3();
-extern  char ** rpcbproc_getaddr_3_svc();
-#define RPCBPROC_DUMP 4
-extern  rpcblist_ptr * rpcbproc_dump_3();
-extern  rpcblist_ptr * rpcbproc_dump_3_svc();
-#define RPCBPROC_CALLIT 5
-extern  rpcb_rmtcallres * rpcbproc_callit_3();
-extern  rpcb_rmtcallres * rpcbproc_callit_3_svc();
-#define RPCBPROC_GETTIME 6
-extern  u_int * rpcbproc_gettime_3();
-extern  u_int * rpcbproc_gettime_3_svc();
-#define RPCBPROC_UADDR2TADDR 7
-extern  struct netbuf * rpcbproc_uaddr2taddr_3();
-extern  struct netbuf * rpcbproc_uaddr2taddr_3_svc();
-#define RPCBPROC_TADDR2UADDR 8
-extern  char ** rpcbproc_taddr2uaddr_3();
-extern  char ** rpcbproc_taddr2uaddr_3_svc();
-extern int rpcbprog_3_freeresult ();
-#endif /* K&R C */
-#define RPCBVERS4 4
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t * rpcbproc_set_4(rpcb *, CLIENT *);
-extern  bool_t * rpcbproc_set_4_svc(rpcb *, struct svc_req *);
-extern  bool_t * rpcbproc_unset_4(rpcb *, CLIENT *);
-extern  bool_t * rpcbproc_unset_4_svc(rpcb *, struct svc_req *);
-extern  char ** rpcbproc_getaddr_4(rpcb *, CLIENT *);
-extern  char ** rpcbproc_getaddr_4_svc(rpcb *, struct svc_req *);
-extern  rpcblist_ptr * rpcbproc_dump_4(void *, CLIENT *);
-extern  rpcblist_ptr * rpcbproc_dump_4_svc(void *, struct svc_req *);
-#define RPCBPROC_BCAST RPCBPROC_CALLIT
-extern  rpcb_rmtcallres * rpcbproc_bcast_4(rpcb_rmtcallargs *, CLIENT *);
-extern  rpcb_rmtcallres * rpcbproc_bcast_4_svc(rpcb_rmtcallargs *, struct svc_req *);
-extern  u_int * rpcbproc_gettime_4(void *, CLIENT *);
-extern  u_int * rpcbproc_gettime_4_svc(void *, struct svc_req *);
-extern  struct netbuf * rpcbproc_uaddr2taddr_4(char **, CLIENT *);
-extern  struct netbuf * rpcbproc_uaddr2taddr_4_svc(char **, struct svc_req *);
-extern  char ** rpcbproc_taddr2uaddr_4(struct netbuf *, CLIENT *);
-extern  char ** rpcbproc_taddr2uaddr_4_svc(struct netbuf *, struct svc_req *);
-#define RPCBPROC_GETVERSADDR 9
-extern  char ** rpcbproc_getversaddr_4(rpcb *, CLIENT *);
-extern  char ** rpcbproc_getversaddr_4_svc(rpcb *, struct svc_req *);
-#define RPCBPROC_INDIRECT 10
-extern  rpcb_rmtcallres * rpcbproc_indirect_4(rpcb_rmtcallargs *, CLIENT *);
-extern  rpcb_rmtcallres * rpcbproc_indirect_4_svc(rpcb_rmtcallargs *, struct svc_req *);
-#define RPCBPROC_GETADDRLIST 11
-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4(rpcb *, CLIENT *);
-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc(rpcb *, struct svc_req *);
-#define RPCBPROC_GETSTAT 12
-extern  rpcb_stat * rpcbproc_getstat_4(void *, CLIENT *);
-extern  rpcb_stat * rpcbproc_getstat_4_svc(void *, struct svc_req *);
-extern int rpcbprog_4_freeresult (SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-extern  bool_t * rpcbproc_set_4();
-extern  bool_t * rpcbproc_set_4_svc();
-extern  bool_t * rpcbproc_unset_4();
-extern  bool_t * rpcbproc_unset_4_svc();
-extern  char ** rpcbproc_getaddr_4();
-extern  char ** rpcbproc_getaddr_4_svc();
-extern  rpcblist_ptr * rpcbproc_dump_4();
-extern  rpcblist_ptr * rpcbproc_dump_4_svc();
-#define RPCBPROC_BCAST RPCBPROC_CALLIT
-extern  rpcb_rmtcallres * rpcbproc_bcast_4();
-extern  rpcb_rmtcallres * rpcbproc_bcast_4_svc();
-extern  u_int * rpcbproc_gettime_4();
-extern  u_int * rpcbproc_gettime_4_svc();
-extern  struct netbuf * rpcbproc_uaddr2taddr_4();
-extern  struct netbuf * rpcbproc_uaddr2taddr_4_svc();
-extern  char ** rpcbproc_taddr2uaddr_4();
-extern  char ** rpcbproc_taddr2uaddr_4_svc();
-#define RPCBPROC_GETVERSADDR 9
-extern  char ** rpcbproc_getversaddr_4();
-extern  char ** rpcbproc_getversaddr_4_svc();
-#define RPCBPROC_INDIRECT 10
-extern  rpcb_rmtcallres * rpcbproc_indirect_4();
-extern  rpcb_rmtcallres * rpcbproc_indirect_4_svc();
-#define RPCBPROC_GETADDRLIST 11
-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4();
-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc();
-#define RPCBPROC_GETSTAT 12
-extern  rpcb_stat * rpcbproc_getstat_4();
-extern  rpcb_stat * rpcbproc_getstat_4_svc();
-extern int rpcbprog_4_freeresult ();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_rpcb (XDR *, rpcb*);
-extern  bool_t xdr_rp__list (XDR *, rp__list*);
-extern  bool_t xdr_rpcblist_ptr (XDR *, rpcblist_ptr*);
-extern  bool_t xdr_rpcb_rmtcallargs (XDR *, rpcb_rmtcallargs*);
-extern  bool_t xdr_rpcb_rmtcallres (XDR *, rpcb_rmtcallres*);
-extern  bool_t xdr_rpcb_entry (XDR *, rpcb_entry*);
-extern  bool_t xdr_rpcb_entry_list (XDR *, rpcb_entry_list*);
-extern  bool_t xdr_rpcb_entry_list_ptr (XDR *, rpcb_entry_list_ptr*);
-extern  bool_t xdr_rpcbs_addrlist (XDR *, rpcbs_addrlist*);
-extern  bool_t xdr_rpcbs_rmtcalllist (XDR *, rpcbs_rmtcalllist*);
-extern  bool_t xdr_rpcbs_proc (XDR *, rpcbs_proc);
-extern  bool_t xdr_rpcbs_addrlist_ptr (XDR *, rpcbs_addrlist_ptr*);
-extern  bool_t xdr_rpcbs_rmtcalllist_ptr (XDR *, rpcbs_rmtcalllist_ptr*);
-extern  bool_t xdr_rpcb_stat (XDR *, rpcb_stat*);
-extern  bool_t xdr_rpcb_stat_byvers (XDR *, rpcb_stat_byvers);
-
-#else /* K&R C */
-extern bool_t xdr_rpcb ();
-extern bool_t xdr_rp__list ();
-extern bool_t xdr_rpcblist_ptr ();
-extern bool_t xdr_rpcb_rmtcallargs ();
-extern bool_t xdr_rpcb_rmtcallres ();
-extern bool_t xdr_rpcb_entry ();
-extern bool_t xdr_rpcb_entry_list ();
-extern bool_t xdr_rpcb_entry_list_ptr ();
-extern bool_t xdr_rpcbs_addrlist ();
-extern bool_t xdr_rpcbs_rmtcalllist ();
-extern bool_t xdr_rpcbs_proc ();
-extern bool_t xdr_rpcbs_addrlist_ptr ();
-extern bool_t xdr_rpcbs_rmtcalllist_ptr ();
-extern bool_t xdr_rpcb_stat ();
-extern bool_t xdr_rpcb_stat_byvers ();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_RPCB_PROT_H_RPCGEN */
diff --git a/newlib/libc/sys/linux/include/rpc/rpcb_prot.x b/newlib/libc/sys/linux/include/rpc/rpcb_prot.x
deleted file mode 100644
index 39f1627..0000000
--- a/newlib/libc/sys/linux/include/rpc/rpcb_prot.x
+++ /dev/null
@@ -1,554 +0,0 @@
-%/*
-% * $FreeBSD: src/include/rpc/rpcb_prot.x,v 1.3 2002/03/13 10:29:06 obrien Exp $
-% *
-% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-% * unrestricted use provided that this legend is included on all tape
-% * media and as a part of the software program in whole or part.  Users
-% * may copy or modify Sun RPC without charge, but are not authorized
-% * to license or distribute it to anyone else except as part of a product or
-% * program developed by the user.
-% *
-% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-% *
-% * Sun RPC is provided with no support and without any obligation on the
-% * part of Sun Microsystems, Inc. to assist in its use, correction,
-% * modification or enhancement.
-% *
-% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-% * OR ANY PART THEREOF.
-% *
-% * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-% * or profits or other special, indirect and consequential damages, even if
-% * Sun has been advised of the possibility of such damages.
-% *
-% * Sun Microsystems, Inc.
-% * 2550 Garcia Avenue
-% * Mountain View, California  94043
-% */
-%/*
-% * Copyright (c) 1988 by Sun Microsystems, Inc.
-% */
-
-%/* from rpcb_prot.x */
-
-#ifdef RPC_HDR
-%
-%/* #pragma ident	"@(#)rpcb_prot.x	1.5	94/04/29 SMI" */
-%
-%#ifndef _KERNEL
-%
-#endif
-
-/*
- * rpcb_prot.x
- * rpcbind protocol, versions 3 and 4, in RPC Language
- */
-%
-%/*
-% * The following procedures are supported by the protocol in version 3:
-% *
-% * RPCBPROC_NULL() returns ()
-% * 	takes nothing, returns nothing
-% *
-% * RPCBPROC_SET(rpcb) returns (bool_t)
-% * 	TRUE is success, FALSE is failure.  Registers the tuple
-% *	[prog, vers, address, owner, netid].
-% *	Finds out owner and netid information on its own.
-% *
-% * RPCBPROC_UNSET(rpcb) returns (bool_t)
-% *	TRUE is success, FALSE is failure.  Un-registers tuple
-% *	[prog, vers, netid].  addresses is ignored.
-% *	If netid is NULL, unregister all.
-% *
-% * RPCBPROC_GETADDR(rpcb) returns (string).
-% *	0 is failure.  Otherwise returns the universal address where the
-% *	triple [prog, vers, netid] is registered.  Ignore address and owner.
-% *
-% * RPCBPROC_DUMP() RETURNS (rpcblist_ptr)
-% *	used to dump the entire rpcbind maps
-% *
-% * RPCBPROC_CALLIT(rpcb_rmtcallargs)
-% * 	RETURNS (rpcb_rmtcallres);
-% * 	Calls the procedure on the remote machine.  If it is not registered,
-% *	this procedure is quiet; i.e. it does not return error information!!!
-% *	This routine only passes null authentication parameters.
-% *	It has no interface to xdr routines for RPCBPROC_CALLIT.
-% *
-% * RPCBPROC_GETTIME() returns (int).
-% *	Gets the remote machines time
-% *
-% * RPCBPROC_UADDR2TADDR(strint) RETURNS (struct netbuf)
-% *	Returns the netbuf address from universal address.
-% *
-% * RPCBPROC_TADDR2UADDR(struct netbuf) RETURNS (string)
-% *	Returns the universal address from netbuf address.
-% *
-% * END OF RPCBIND VERSION 3 PROCEDURES
-% */
-%/*
-% * Except for RPCBPROC_CALLIT, the procedures above are carried over to
-% * rpcbind version 4.  Those below are added or modified for version 4.
-% * NOTE: RPCBPROC_BCAST HAS THE SAME FUNCTIONALITY AND PROCEDURE NUMBER
-% * AS RPCBPROC_CALLIT.
-% *
-% * RPCBPROC_BCAST(rpcb_rmtcallargs)
-% * 	RETURNS (rpcb_rmtcallres);
-% * 	Calls the procedure on the remote machine.  If it is not registered,
-% *	this procedure IS quiet; i.e. it DOES NOT return error information!!!
-% *	This routine should be used for broadcasting and nothing else.
-% *
-% * RPCBPROC_GETVERSADDR(rpcb) returns (string).
-% *	0 is failure.  Otherwise returns the universal address where the
-% *	triple [prog, vers, netid] is registered.  Ignore address and owner.
-% *	Same as RPCBPROC_GETADDR except that if the given version number
-% *	is not available, the address is not returned.
-% *
-% * RPCBPROC_INDIRECT(rpcb_rmtcallargs)
-% * 	RETURNS (rpcb_rmtcallres);
-% * 	Calls the procedure on the remote machine.  If it is not registered,
-% *	this procedure is NOT quiet; i.e. it DOES return error information!!!
-% * 	as any normal application would expect.
-% *
-% * RPCBPROC_GETADDRLIST(rpcb) returns (rpcb_entry_list_ptr).
-% *	Same as RPCBPROC_GETADDR except that it returns a list of all the
-% *	addresses registered for the combination (prog, vers) (for all
-% *	transports).
-% *
-% * RPCBPROC_GETSTAT(void) returns (rpcb_stat_byvers)
-% *	Returns the statistics about the kind of requests received by rpcbind.
-% */
-%
-%/*
-% * A mapping of (program, version, network ID) to address
-% */
-struct rpcb {
-	rpcprog_t r_prog;		/* program number */
-	rpcvers_t r_vers;		/* version number */
-	string r_netid<>;		/* network id */
-	string r_addr<>;		/* universal address */
-	string r_owner<>;		/* owner of this service */
-};
-#ifdef RPC_HDR
-%
-%typedef rpcb RPCB;
-%
-#endif
-%
-%/*
-% * A list of mappings
-% *
-% * Below are two definitions for the rpcblist structure.  This is done because
-% * xdr_rpcblist() is specified to take a struct rpcblist **, rather than a
-% * struct rpcblist * that rpcgen would produce.  One version of the rpcblist
-% * structure (actually called rp__list) is used with rpcgen, and the other is
-% * defined only in the header file for compatibility with the specified
-% * interface.
-% */
-
-struct rp__list {
-	rpcb rpcb_map;
-	struct rp__list *rpcb_next;
-};
-
-typedef rp__list *rpcblist_ptr;		/* results of RPCBPROC_DUMP */
-
-#ifdef RPC_HDR
-%
-%typedef struct rp__list rpcblist;
-%typedef struct rp__list RPCBLIST;
-%
-%#ifndef __cplusplus
-%struct rpcblist {
-%	RPCB rpcb_map;
-%	struct rpcblist *rpcb_next;
-%};
-%#endif
-%
-%#ifdef __cplusplus
-%extern "C" {
-%#endif
-%extern  bool_t xdr_rpcblist(XDR *, rpcblist**);
-%#ifdef	__cplusplus
-%}
-%#endif
-%
-#endif
-
-%
-%/*
-% * Arguments of remote calls
-% */
-struct rpcb_rmtcallargs {
-	rpcprog_t prog;			/* program number */
-	rpcvers_t vers;			/* version number */
-	rpcproc_t proc;			/* procedure number */
-	opaque args<>;			/* argument */
-};
-#ifdef RPC_HDR
-%
-%/*
-% * Client-side only representation of rpcb_rmtcallargs structure.
-% *
-% * The routine that XDRs the rpcb_rmtcallargs structure must deal with the
-% * opaque arguments in the "args" structure.  xdr_rpcb_rmtcallargs() needs to
-% * be passed the XDR routine that knows the args' structure.  This routine
-% * doesn't need to go over-the-wire (and it wouldn't make sense anyway) since
-% * the application being called already knows the args structure.  So we use a
-% * different "XDR" structure on the client side, r_rpcb_rmtcallargs, which
-% * includes the args' XDR routine.
-% */
-%struct r_rpcb_rmtcallargs {
-%	rpcprog_t prog;
-%	rpcvers_t vers;
-%	rpcproc_t proc;
-%	struct {
-%		u_int args_len;
-%		char *args_val;
-%	} args;
-%	xdrproc_t	xdr_args;	/* encodes args */
-%};
-%
-#endif	/* def RPC_HDR */
-%
-%/*
-% * Results of the remote call
-% */
-struct rpcb_rmtcallres {
-	string addr<>;			/* remote universal address */
-	opaque results<>;		/* result */
-};
-#ifdef RPC_HDR
-%
-%/*
-% * Client-side only representation of rpcb_rmtcallres structure.
-% */
-%struct r_rpcb_rmtcallres {
-%	char *addr;
-%	struct {
-%		u_int32_t results_len;
-%		char *results_val;
-%	} results;
-%	xdrproc_t	xdr_res;	/* decodes results */
-%};
-#endif /* RPC_HDR */
-%
-%/*
-% * rpcb_entry contains a merged address of a service on a particular
-% * transport, plus associated netconfig information.  A list of rpcb_entrys
-% * is returned by RPCBPROC_GETADDRLIST.  See netconfig.h for values used
-% * in r_nc_* fields.
-% */
-struct rpcb_entry {
-	string		r_maddr<>;	/* merged address of service */
-	string		r_nc_netid<>;	/* netid field */
-	unsigned int	r_nc_semantics;	/* semantics of transport */
-	string		r_nc_protofmly<>; /* protocol family */
-	string		r_nc_proto<>;	/* protocol name */
-};
-%
-%/*
-% * A list of addresses supported by a service.
-% */
-struct rpcb_entry_list {
-	rpcb_entry rpcb_entry_map;
-	struct rpcb_entry_list *rpcb_entry_next;
-};
-
-typedef rpcb_entry_list *rpcb_entry_list_ptr;
-
-%
-%/*
-% * rpcbind statistics
-% */
-%
-const rpcb_highproc_2 = RPCBPROC_CALLIT;
-const rpcb_highproc_3 = RPCBPROC_TADDR2UADDR;
-const rpcb_highproc_4 = RPCBPROC_GETSTAT;
-
-const RPCBSTAT_HIGHPROC = 13;	/* # of procs in rpcbind V4 plus one */
-const RPCBVERS_STAT = 3;	/* provide only for rpcbind V2, V3 and V4 */
-const RPCBVERS_4_STAT = 2;
-const RPCBVERS_3_STAT = 1;
-const RPCBVERS_2_STAT = 0;
-%
-%/* Link list of all the stats about getport and getaddr */
-struct rpcbs_addrlist {
-	rpcprog_t prog;
-	rpcvers_t vers;
-	int success;
-	int failure;
-	string netid<>;
-	struct rpcbs_addrlist *next;
-};
-%
-%/* Link list of all the stats about rmtcall */
-struct rpcbs_rmtcalllist {
-	rpcprog_t prog;
-	rpcvers_t vers;
-	rpcproc_t proc;
-	int success;
-	int failure;
-	int indirect;	/* whether callit or indirect */
-	string netid<>;
-	struct rpcbs_rmtcalllist *next;
-};
-
-typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
-typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
-typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
-
-struct rpcb_stat {
-	rpcbs_proc		info;
-	int			setinfo;
-	int			unsetinfo;
-	rpcbs_addrlist_ptr	addrinfo;
-	rpcbs_rmtcalllist_ptr	rmtinfo;
-};
-%
-%/*
-% * One rpcb_stat structure is returned for each version of rpcbind
-% * being monitored.
-% */
-
-typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
-
-#ifdef RPC_HDR
-%
-%/*
-% * We don't define netbuf in RPCL, since it would contain structure member
-% * names that would conflict with the definition of struct netbuf in
-% * <tiuser.h>.  Instead we merely declare the XDR routine xdr_netbuf() here,
-% * and implement it ourselves in rpc/rpcb_prot.c.
-% */
-%#ifdef __cplusplus
-%extern "C" bool_t xdr_netbuf(XDR *, struct netbuf *);
-%
-%#else /* __STDC__ */
-%extern  bool_t xdr_netbuf(XDR *, struct netbuf *);
-%
-%#endif
-#endif /* def RPC_HDR */
-
-/*
- * rpcbind procedures
- */
-program RPCBPROG {
-	version RPCBVERS {
-		bool
-		RPCBPROC_SET(rpcb) = 1;
-
-		bool
-		RPCBPROC_UNSET(rpcb) = 2;
-
-		string
-		RPCBPROC_GETADDR(rpcb) = 3;
-
-		rpcblist_ptr
-		RPCBPROC_DUMP(void) = 4;
-
-		rpcb_rmtcallres
-		RPCBPROC_CALLIT(rpcb_rmtcallargs) = 5;
-
-		unsigned int
-		RPCBPROC_GETTIME(void) = 6;
-
-		struct netbuf
-		RPCBPROC_UADDR2TADDR(string) = 7;
-
-		string
-		RPCBPROC_TADDR2UADDR(struct netbuf) = 8;
-	} = 3;
-
-	version RPCBVERS4 {
-		bool
-		RPCBPROC_SET(rpcb) = 1;
-
-		bool
-		RPCBPROC_UNSET(rpcb) = 2;
-
-		string
-		RPCBPROC_GETADDR(rpcb) = 3;
-
-		rpcblist_ptr
-		RPCBPROC_DUMP(void) = 4;
-
-		/*
-		 * NOTE: RPCBPROC_BCAST has the same functionality as CALLIT;
-		 * the new name is intended to indicate that this
-		 * procedure should be used for broadcast RPC, and
-		 * RPCBPROC_INDIRECT should be used for indirect calls.
-		 */
-		rpcb_rmtcallres
-		RPCBPROC_BCAST(rpcb_rmtcallargs) = RPCBPROC_CALLIT;
-
-		unsigned int
-		RPCBPROC_GETTIME(void) = 6;
-
-		struct netbuf
-		RPCBPROC_UADDR2TADDR(string) = 7;
-
-		string
-		RPCBPROC_TADDR2UADDR(struct netbuf) = 8;
-
-		string
-		RPCBPROC_GETVERSADDR(rpcb) = 9;
-
-		rpcb_rmtcallres
-		RPCBPROC_INDIRECT(rpcb_rmtcallargs) = 10;
-
-		rpcb_entry_list_ptr
-		RPCBPROC_GETADDRLIST(rpcb) = 11;
-
-		rpcb_stat_byvers
-		RPCBPROC_GETSTAT(void) = 12;
-	} = 4;
-} = 100000;
-#ifdef RPC_HDR
-%
-%#define	RPCBVERS_3		RPCBVERS
-%#define	RPCBVERS_4		RPCBVERS4
-%
-%#define	_PATH_RPCBINDSOCK	"/var/run/rpcbind.sock"
-%
-%#else		/* ndef _KERNEL */
-%#ifdef __cplusplus
-%extern "C" {
-%#endif
-%
-%/*
-% * A mapping of (program, version, network ID) to address
-% */
-%struct rpcb {
-%	rpcprog_t r_prog;		/* program number */
-%	rpcvers_t r_vers;		/* version number */
-%	char *r_netid;			/* network id */
-%	char *r_addr;			/* universal address */
-%	char *r_owner;			/* owner of the mapping */
-%};
-%typedef struct rpcb RPCB;
-%
-%/*
-% * A list of mappings
-% */
-%struct rpcblist {
-%	RPCB rpcb_map;
-%	struct rpcblist *rpcb_next;
-%};
-%typedef struct rpcblist RPCBLIST;
-%typedef struct rpcblist *rpcblist_ptr;
-%
-%/*
-% * Remote calls arguments
-% */
-%struct rpcb_rmtcallargs {
-%	rpcprog_t prog;			/* program number */
-%	rpcvers_t vers;			/* version number */
-%	rpcproc_t proc;			/* procedure number */
-%	u_int32_t arglen;			/* arg len */
-%	caddr_t args_ptr;		/* argument */
-%	xdrproc_t xdr_args;		/* XDR routine for argument */
-%};
-%typedef struct rpcb_rmtcallargs rpcb_rmtcallargs;
-%
-%/*
-% * Remote calls results
-% */
-%struct rpcb_rmtcallres {
-%	char *addr_ptr;			/* remote universal address */
-%	u_int32_t resultslen;		/* results length */
-%	caddr_t results_ptr;		/* results */
-%	xdrproc_t xdr_results;		/* XDR routine for result */
-%};
-%typedef struct rpcb_rmtcallres rpcb_rmtcallres;
-%
-%struct rpcb_entry {
-%	char *r_maddr;
-%	char *r_nc_netid;
-%	unsigned int r_nc_semantics;
-%	char *r_nc_protofmly;
-%	char *r_nc_proto;
-%};
-%typedef struct rpcb_entry rpcb_entry;
-%
-%/*
-% * A list of addresses supported by a service.
-% */
-%
-%struct rpcb_entry_list {
-%	rpcb_entry rpcb_entry_map;
-%	struct rpcb_entry_list *rpcb_entry_next;
-%};
-%typedef struct rpcb_entry_list rpcb_entry_list;
-%
-%typedef rpcb_entry_list *rpcb_entry_list_ptr;
-%
-%/*
-% * rpcbind statistics
-% */
-%
-%#define	rpcb_highproc_2 RPCBPROC_CALLIT
-%#define	rpcb_highproc_3 RPCBPROC_TADDR2UADDR
-%#define	rpcb_highproc_4 RPCBPROC_GETSTAT
-%#define	RPCBSTAT_HIGHPROC 13
-%#define	RPCBVERS_STAT 3
-%#define	RPCBVERS_4_STAT 2
-%#define	RPCBVERS_3_STAT 1
-%#define	RPCBVERS_2_STAT 0
-%
-%/* Link list of all the stats about getport and getaddr */
-%
-%struct rpcbs_addrlist {
-%	rpcprog_t prog;
-%	rpcvers_t vers;
-%	int success;
-%	int failure;
-%	char *netid;
-%	struct rpcbs_addrlist *next;
-%};
-%typedef struct rpcbs_addrlist rpcbs_addrlist;
-%
-%/* Link list of all the stats about rmtcall */
-%
-%struct rpcbs_rmtcalllist {
-%	rpcprog_t prog;
-%	rpcvers_t vers;
-%	rpcproc_t proc;
-%	int success;
-%	int failure;
-%	int indirect;
-%	char *netid;
-%	struct rpcbs_rmtcalllist *next;
-%};
-%typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist;
-%
-%typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
-%
-%typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
-%
-%typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
-%
-%struct rpcb_stat {
-%	rpcbs_proc info;
-%	int setinfo;
-%	int unsetinfo;
-%	rpcbs_addrlist_ptr addrinfo;
-%	rpcbs_rmtcalllist_ptr rmtinfo;
-%};
-%typedef struct rpcb_stat rpcb_stat;
-%
-%/*
-% * One rpcb_stat structure is returned for each version of rpcbind
-% * being monitored.
-% */
-%
-%typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
-%
-%#ifdef __cplusplus
-%}
-%#endif
-%
-%#endif		/* ndef _KERNEL */
-#endif		/* RPC_HDR */
diff --git a/newlib/libc/sys/linux/include/rpc/rpcent.h b/newlib/libc/sys/linux/include/rpc/rpcent.h
deleted file mode 100644
index dbc8b0e..0000000
--- a/newlib/libc/sys/linux/include/rpc/rpcent.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: rpcent.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD: src/include/rpc/rpcent.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * rpcent.h,
- * For converting rpc program numbers to names etc.
- *
- */
-
-#ifndef _RPC_RPCENT_H
-#define _RPC_RPCENT_H
-
-/*	#pragma ident "@(#)rpcent.h   1.13    94/04/25 SMI"	*/
-/*      @(#)rpcent.h 1.1 88/12/06 SMI   */
-
-
-struct rpcent {
-      char    *r_name;        /* name of server for this rpc program */
-      char    **r_aliases;    /* alias list */
-      int     r_number;       /* rpc program number */
-};
-
-__BEGIN_DECLS
-extern struct rpcent *getrpcbyname_r(const char *, struct rpcent *,
-				     char *, int);
-extern struct rpcent *getrpcbynumber_r(int, struct rpcent *, char *, int);
-extern struct rpcent *getrpcent_r(struct rpcent *, char *, int);
-
-/* Old interfaces that return a pointer to a static area;  MT-unsafe */
-extern struct rpcent *getrpcbyname(char *);
-extern struct rpcent *getrpcbynumber(int);
-extern struct rpcent *getrpcent(void);
-extern void setrpcent(int);
-extern void endrpcent(void);
-__END_DECLS
-
-#endif /* !_RPC_CENT_H */
diff --git a/newlib/libc/sys/linux/include/rpc/svc.h b/newlib/libc/sys/linux/include/rpc/svc.h
deleted file mode 100644
index 6a8997b..0000000
--- a/newlib/libc/sys/linux/include/rpc/svc.h
+++ /dev/null
@@ -1,429 +0,0 @@
-/*	$NetBSD: svc.h,v 1.17 2000/06/02 22:57:56 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)svc.h 1.35 88/12/17 SMI
- *	from: @(#)svc.h      1.27    94/04/25 SMI
- * $FreeBSD: src/include/rpc/svc.h,v 1.22 2002/04/28 15:18:45 des Exp $
- */
-
-/*
- * svc.h, Server-side remote procedure call interface.
- *
- * Copyright (C) 1986-1993 by Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_SVC_H
-#define _RPC_SVC_H
-#include <sys/cdefs.h>
-
-/*
- * This interface must manage two items concerning remote procedure calling:
- *
- * 1) An arbitrary number of transport connections upon which rpc requests
- * are received.  The two most notable transports are TCP and UDP;  they are
- * created and registered by routines in svc_tcp.c and svc_udp.c, respectively;
- * they in turn call xprt_register and xprt_unregister.
- *
- * 2) An arbitrary number of locally registered services.  Services are
- * described by the following four data: program number, version number,
- * "service dispatch" function, a transport handle, and a boolean that
- * indicates whether or not the exported program should be registered with a
- * local binder service;  if true the program's number and version and the
- * port number from the transport handle are registered with the binder.
- * These data are registered with the rpc svc system via svc_register.
- *
- * A service's dispatch function is called whenever an rpc request comes in
- * on a transport.  The request's program and version numbers must match
- * those of the registered service.  The dispatch function is passed two
- * parameters, struct svc_req * and SVCXPRT *, defined below.
- */
-
-/*
- *      Service control requests
- */
-#define SVCGET_VERSQUIET	1
-#define SVCSET_VERSQUIET	2
-
-
-enum xprt_stat {
-	XPRT_DIED,
-	XPRT_MOREREQS,
-	XPRT_IDLE
-};
-
-/*
- * Server side transport handle
- */
-typedef struct __rpc_svcxprt {
-	int		xp_fd;
-	u_short		xp_port;	 /* associated port number */
-	const struct xp_ops {
-	    /* receive incoming requests */
-	    bool_t	(*xp_recv)(struct __rpc_svcxprt *, struct rpc_msg *);
-	    /* get transport status */
-	    enum xprt_stat (*xp_stat)(struct __rpc_svcxprt *);
-	    /* get arguments */
-	    bool_t	(*xp_getargs)(struct __rpc_svcxprt *, xdrproc_t,
-				void *);
-	    /* send reply */
-	    bool_t	(*xp_reply)(struct __rpc_svcxprt *, struct rpc_msg *);
-	    /* free mem allocated for args */
-	    bool_t	(*xp_freeargs)(struct __rpc_svcxprt *, xdrproc_t,
-				void *);
-	    /* destroy this struct */
-	    void	(*xp_destroy)(struct __rpc_svcxprt *);
-	} *xp_ops;
-	int		xp_addrlen;	 /* length of remote address */
-	struct sockaddr_in xp_raddr;	 /* remote addr. (backward ABI compat) */
-	/* XXX - fvdl stick this here for ABI backward compat reasons */
-	const struct xp_ops2 {
-		/* catch-all function */
-		bool_t  (*xp_control)(struct __rpc_svcxprt *, const u_int,
-				void *);
-	} *xp_ops2;
-	char		*xp_tp;		 /* transport provider device name */
-	char		*xp_netid;	 /* network token */
-	struct netbuf	xp_ltaddr;	 /* local transport address */
-	struct netbuf	xp_rtaddr;	 /* remote transport address */
-	struct opaque_auth xp_verf;	 /* raw response verifier */
-	void		*xp_p1;		 /* private: for use by svc ops */
-	void		*xp_p2;		 /* private: for use by svc ops */
-	void		*xp_p3;		 /* private: for use by svc lib */
-	int		xp_type;	 /* transport type */
-} SVCXPRT;
-
-/*
- * Service request
- */
-struct svc_req {
-	u_int32_t	rq_prog;	/* service program number */
-	u_int32_t	rq_vers;	/* service protocol version */
-	u_int32_t	rq_proc;	/* the desired procedure */
-	struct opaque_auth rq_cred;	/* raw creds from the wire */
-	void		*rq_clntcred;	/* read only cooked cred */
-	SVCXPRT		*rq_xprt;	/* associated transport */
-};
-
-/*
- *  Approved way of getting address of caller
- */
-#define svc_getrpccaller(x) (&(x)->xp_rtaddr)
-
-/*
- * FreeBSD-only definition to get the creds of the caller (AF_LOCAL).
- */
-#define __svc_getcallercreds(x) ((struct cmsgcred *)(x)->xp_p2)
-
-/*
- * Operations defined on an SVCXPRT handle
- *
- * SVCXPRT		*xprt;
- * struct rpc_msg	*msg;
- * xdrproc_t		 xargs;
- * void *		 argsp;
- */
-#define SVC_RECV(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_recv)((xprt), (msg))
-#define svc_recv(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_recv)((xprt), (msg))
-
-#define SVC_STAT(xprt)					\
-	(*(xprt)->xp_ops->xp_stat)(xprt)
-#define svc_stat(xprt)					\
-	(*(xprt)->xp_ops->xp_stat)(xprt)
-
-#define SVC_GETARGS(xprt, xargs, argsp)			\
-	(*(xprt)->xp_ops->xp_getargs)((xprt), (xargs), (argsp))
-#define svc_getargs(xprt, xargs, argsp)			\
-	(*(xprt)->xp_ops->xp_getargs)((xprt), (xargs), (argsp))
-
-#define SVC_REPLY(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_reply) ((xprt), (msg))
-#define svc_reply(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_reply) ((xprt), (msg))
-
-#define SVC_FREEARGS(xprt, xargs, argsp)		\
-	(*(xprt)->xp_ops->xp_freeargs)((xprt), (xargs), (argsp))
-#define svc_freeargs(xprt, xargs, argsp)		\
-	(*(xprt)->xp_ops->xp_freeargs)((xprt), (xargs), (argsp))
-
-#define SVC_DESTROY(xprt)				\
-	(*(xprt)->xp_ops->xp_destroy)(xprt)
-#define svc_destroy(xprt)				\
-	(*(xprt)->xp_ops->xp_destroy)(xprt)
-
-#define SVC_CONTROL(xprt, rq, in)			\
-	(*(xprt)->xp_ops2->xp_control)((xprt), (rq), (in))
-
-/*
- * Service registration
- *
- * svc_reg(xprt, prog, vers, dispatch, nconf)
- *	const SVCXPRT *xprt;
- *	const rpcprog_t prog;
- *	const rpcvers_t vers;
- *	const void (*dispatch)();
- *	const struct netconfig *nconf;
- */
-
-__BEGIN_DECLS
-extern bool_t	svc_reg(SVCXPRT *, const rpcprog_t, const rpcvers_t,
-			void (*)(struct svc_req *, SVCXPRT *),
-			const struct netconfig *);
-__END_DECLS
-
-/*
- * Service un-registration
- *
- * svc_unreg(prog, vers)
- *	const rpcprog_t prog;
- *	const rpcvers_t vers;
- */
-
-__BEGIN_DECLS
-extern void	svc_unreg(const rpcprog_t, const rpcvers_t);
-__END_DECLS
-
-/*
- * Transport registration.
- *
- * xprt_register(xprt)
- *	SVCXPRT *xprt;
- */
-__BEGIN_DECLS
-extern void	xprt_register(SVCXPRT *);
-__END_DECLS
-
-/*
- * Transport un-register
- *
- * xprt_unregister(xprt)
- *	SVCXPRT *xprt;
- */
-__BEGIN_DECLS
-extern void	xprt_unregister(SVCXPRT *);
-__END_DECLS
-
-
-/*
- * When the service routine is called, it must first check to see if it
- * knows about the procedure;  if not, it should call svcerr_noproc
- * and return.  If so, it should deserialize its arguments via
- * SVC_GETARGS (defined above).  If the deserialization does not work,
- * svcerr_decode should be called followed by a return.  Successful
- * decoding of the arguments should be followed the execution of the
- * procedure's code and a call to svc_sendreply.
- *
- * Also, if the service refuses to execute the procedure due to too-
- * weak authentication parameters, svcerr_weakauth should be called.
- * Note: do not confuse access-control failure with weak authentication!
- *
- * NB: In pure implementations of rpc, the caller always waits for a reply
- * msg.  This message is sent when svc_sendreply is called.
- * Therefore pure service implementations should always call
- * svc_sendreply even if the function logically returns void;  use
- * xdr.h - xdr_void for the xdr routine.  HOWEVER, tcp based rpc allows
- * for the abuse of pure rpc via batched calling or pipelining.  In the
- * case of a batched call, svc_sendreply should NOT be called since
- * this would send a return message, which is what batching tries to avoid.
- * It is the service/protocol writer's responsibility to know which calls are
- * batched and which are not.  Warning: responding to batch calls may
- * deadlock the caller and server processes!
- */
-
-__BEGIN_DECLS
-extern bool_t	svc_sendreply(SVCXPRT *, xdrproc_t, void *);
-extern void	svcerr_decode(SVCXPRT *);
-extern void	svcerr_weakauth(SVCXPRT *);
-extern void	svcerr_noproc(SVCXPRT *);
-extern void	svcerr_progvers(SVCXPRT *, rpcvers_t, rpcvers_t);
-extern void	svcerr_auth(SVCXPRT *, enum auth_stat);
-extern void	svcerr_noprog(SVCXPRT *);
-extern void	svcerr_systemerr(SVCXPRT *);
-extern int	rpc_reg(rpcprog_t, rpcvers_t, rpcproc_t,
-			char *(*)(char *), xdrproc_t, xdrproc_t,
-			char *);
-__END_DECLS
-
-/*
- * Lowest level dispatching -OR- who owns this process anyway.
- * Somebody has to wait for incoming requests and then call the correct
- * service routine.  The routine svc_run does infinite waiting; i.e.,
- * svc_run never returns.
- * Since another (co-existant) package may wish to selectively wait for
- * incoming calls or other events outside of the rpc architecture, the
- * routine svc_getreq is provided.  It must be passed readfds, the
- * "in-place" results of a select system call (see select, section 2).
- */
-
-/*
- * Global keeper of rpc service descriptors in use
- * dynamic; must be inspected before each call to select
- */
-extern int svc_maxfd;
-#ifdef FD_SETSIZE
-extern fd_set svc_fdset;
-#define svc_fds svc_fdset.fds_bits[0]	/* compatibility */
-#else
-extern int svc_fds;
-#endif /* def FD_SETSIZE */
-
-/*
- * a small program implemented by the svc_rpc implementation itself;
- * also see clnt.h for protocol numbers.
- */
-__BEGIN_DECLS
-extern void rpctest_service(void);
-__END_DECLS
-
-__BEGIN_DECLS
-extern void	svc_getreq(int);
-extern void	svc_getreqset(fd_set *);
-extern void	svc_getreq_common(int);
-struct pollfd;
-extern void	svc_getreq_poll(struct pollfd *, int);
-
-extern void	svc_run(void);
-extern void	svc_exit(void);
-__END_DECLS
-
-/*
- * Socket to use on svcxxx_create call to get default socket
- */
-#define	RPC_ANYSOCK	-1
-#define RPC_ANYFD	RPC_ANYSOCK
-
-/*
- * These are the existing service side transport implementations
- */
-
-__BEGIN_DECLS
-/*
- * Transport independent svc_create routine.
- */
-extern int svc_create(void (*)(struct svc_req *, SVCXPRT *),
-			   const rpcprog_t, const rpcvers_t, const char *);
-/*
- *      void (*dispatch)();             -- dispatch routine
- *      const rpcprog_t prognum;        -- program number
- *      const rpcvers_t versnum;        -- version number
- *      const char *nettype;            -- network type
- */
-
-
-/*
- * Generic server creation routine. It takes a netconfig structure
- * instead of a nettype.
- */
-
-extern SVCXPRT *svc_tp_create(void (*)(struct svc_req *, SVCXPRT *),
-				   const rpcprog_t, const rpcvers_t,
-				   const struct netconfig *);
-        /*
-         * void (*dispatch)();            -- dispatch routine
-         * const rpcprog_t prognum;       -- program number
-         * const rpcvers_t versnum;       -- version number
-         * const struct netconfig *nconf; -- netconfig structure
-         */
-
-
-/*
- * Generic TLI create routine
- */
-extern SVCXPRT *svc_tli_create(const int, const struct netconfig *,
-			       const struct t_bind *, const u_int,
-			       const u_int);
-/*
- *      const int fd;                   -- connection end point
- *      const struct netconfig *nconf;  -- netconfig structure for network
- *      const struct t_bind *bindaddr;  -- local bind address
- *      const u_int sendsz;             -- max sendsize
- *      const u_int recvsz;             -- max recvsize
- */
-
-/*
- * Connectionless and connectionful create routines
- */
-
-extern SVCXPRT *svc_vc_create(const int, const u_int, const u_int);
-/*
- *      const int fd;                           -- open connection end point
- *      const u_int sendsize;                   -- max send size
- *      const u_int recvsize;                   -- max recv size
- */
-
-/*
- * Added for compatibility to old rpc 4.0. Obsoleted by svc_vc_create().
- */
-extern SVCXPRT *svcunix_create(int, u_int, u_int, char *);
-
-extern SVCXPRT *svc_dg_create(const int, const u_int, const u_int);
-        /*
-         * const int fd;                                -- open connection
-         * const u_int sendsize;                        -- max send size
-         * const u_int recvsize;                        -- max recv size
-         */
-
-
-/*
- * the routine takes any *open* connection
- * descriptor as its first input and is used for open connections.
- */
-extern SVCXPRT *svc_fd_create(const int, const u_int, const u_int);
-/*
- *      const int fd;                           -- open connection end point
- *      const u_int sendsize;                   -- max send size
- *      const u_int recvsize;                   -- max recv size
- */
-
-/*
- * Added for compatibility to old rpc 4.0. Obsoleted by svc_fd_create().
- */
-extern SVCXPRT *svcunixfd_create(int, u_int, u_int);
-
-/*
- * Memory based rpc (for speed check and testing)
- */
-extern SVCXPRT *svc_raw_create(void);
-
-/*
- * svc_dg_enable_cache() enables the cache on dg transports.
- */
-int svc_dg_enablecache(SVCXPRT *, const u_int);
-
-int __rpc_get_local_uid(SVCXPRT *_transp, uid_t *_uid);
-
-__END_DECLS
-
-
-/* for backward compatibility */
-#include <rpc/svc_soc.h>
-
-#endif /* !_RPC_SVC_H */
diff --git a/newlib/libc/sys/linux/include/rpc/svc_auth.h b/newlib/libc/sys/linux/include/rpc/svc_auth.h
deleted file mode 100644
index 366f752..0000000
--- a/newlib/libc/sys/linux/include/rpc/svc_auth.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: svc_auth.h,v 1.8 2000/06/02 22:57:57 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)svc_auth.h 1.6 86/07/16 SMI
- *	@(#)svc_auth.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/svc_auth.h,v 1.14 2002/03/23 17:24:55 imp Exp $
- */
-
-/*
- * svc_auth.h, Service side of rpc authentication.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_SVC_AUTH_H
-#define _RPC_SVC_AUTH_H
-
-/*
- * Server side authenticator
- */
-__BEGIN_DECLS
-extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *);
-extern int svc_auth_reg(int, enum auth_stat (*)(struct svc_req *,
-			  struct rpc_msg *));
-
-__END_DECLS
-
-#endif /* !_RPC_SVC_AUTH_H */
diff --git a/newlib/libc/sys/linux/include/rpc/svc_dg.h b/newlib/libc/sys/linux/include/rpc/svc_dg.h
deleted file mode 100644
index 67d2564..0000000
--- a/newlib/libc/sys/linux/include/rpc/svc_dg.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: svc_dg.h,v 1.1 2000/06/02 23:11:16 fvdl Exp $	*/
-/*	$FreeBSD: src/include/rpc/svc_dg.h,v 1.1 2001/03/19 12:49:47 alfred Exp $ */
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * XXX - this file exists only so that the rpcbind code can pull it in.
- * This should go away. It should only be include by svc_dg.c and
- * rpcb_svc_com.c in the rpcbind code.
- */
-
-/*
- * kept in xprt->xp_p2
- */
-struct svc_dg_data {
-	/* XXX: optbuf should be the first field, used by ti_opts.c code */
-	size_t		su_iosz;		/* size of send.recv buffer */
-	u_int32_t	su_xid;			/* transaction id */
-	XDR		su_xdrs;			/* XDR handle */
-	char		su_verfbody[MAX_AUTH_BYTES];	/* verifier body */
-	void		*su_cache;		/* cached data, NULL if none */
-};
-
-#define __rpcb_get_dg_xidp(x)	(&((struct svc_dg_data *)(x)->xp_p2)->su_xid)
diff --git a/newlib/libc/sys/linux/include/rpc/svc_soc.h b/newlib/libc/sys/linux/include/rpc/svc_soc.h
deleted file mode 100644
index ceb4392..0000000
--- a/newlib/libc/sys/linux/include/rpc/svc_soc.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*	$NetBSD: svc_soc.h,v 1.1 2000/06/02 22:57:57 fvdl Exp $	*/
-/*	$FreeBSD: src/include/rpc/svc_soc.h,v 1.2 2002/03/23 17:24:55 imp Exp $ */
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * svc.h, Server-side remote procedure call interface.
- */
-
-#ifndef _RPC_SVC_SOC_H
-#define _RPC_SVC_SOC_H
-#include <sys/cdefs.h>
-
-/* #pragma ident   "@(#)svc_soc.h  1.11    94/04/25 SMI" */
-/*      svc_soc.h 1.8 89/05/01 SMI      */
-
-/*
- * All the following declarations are only for backward compatibility
- * with TS-RPC
- */
-
-/*
- *  Approved way of getting address of caller
- */
-#define svc_getcaller(x) (&(x)->xp_raddr)
-
-/*
- * Service registration
- *
- * svc_register(xprt, prog, vers, dispatch, protocol)
- *	SVCXPRT *xprt;
- *	u_long prog;
- *	u_long vers;
- *	void (*dispatch)();
- *	int protocol;    like TCP or UDP, zero means do not register 
- */
-__BEGIN_DECLS
-extern bool_t	svc_register(SVCXPRT *, u_long, u_long,
-		    void (*)(struct svc_req *, SVCXPRT *), int);
-__END_DECLS
-
-/*
- * Service un-registration
- *
- * svc_unregister(prog, vers)
- *	u_long prog;
- *	u_long vers;
- */
-__BEGIN_DECLS
-extern void	svc_unregister(u_long, u_long);
-__END_DECLS
-
-
-/*
- * Memory based rpc for testing and timing.
- */
-__BEGIN_DECLS
-extern SVCXPRT *svcraw_create(void);
-__END_DECLS
-
-
-/*
- * Udp based rpc.
- */
-__BEGIN_DECLS
-extern SVCXPRT *svcudp_create(int);
-extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int);
-extern int svcudp_enablecache(SVCXPRT *, u_long);
-__END_DECLS
-
-
-/*
- * Tcp based rpc.
- */
-__BEGIN_DECLS
-extern SVCXPRT *svctcp_create(int, u_int, u_int);
-__END_DECLS
-
-/*
- * Fd based rpc.
- */
-__BEGIN_DECLS
-extern SVCXPRT *svcfd_create(int, u_int, u_int);
-__END_DECLS
-
-#endif /* !_RPC_SVC_SOC_H */
diff --git a/newlib/libc/sys/linux/include/rpc/types.h b/newlib/libc/sys/linux/include/rpc/types.h
deleted file mode 100644
index 259127c..0000000
--- a/newlib/libc/sys/linux/include/rpc/types.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*	$NetBSD: types.h,v 1.13 2000/06/13 01:02:44 thorpej Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)types.h 1.18 87/07/24 SMI
- *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/types.h,v 1.10 2001/03/19 12:49:47 alfred Exp $
- */
-
-/*
- * Rpc additions to <sys/types.h>
- */
-#ifndef _RPC_TYPES_H
-#define _RPC_TYPES_H
-
-#include <sys/types.h>
-
-typedef int32_t bool_t;
-typedef int32_t enum_t;
-
-typedef u_int32_t rpcprog_t;
-typedef u_int32_t rpcvers_t;
-typedef u_int32_t rpcproc_t;
-typedef u_int32_t rpcprot_t;
-typedef u_int32_t rpcport_t;
-typedef   int32_t rpc_inline_t;
-
-#define __dontcare__	-1
-
-#ifndef FALSE
-#	define FALSE	(0)
-#endif
-#ifndef TRUE
-#	define TRUE	(1)
-#endif
-#ifndef NULL
-#	define NULL	0
-#endif
-
-#define mem_alloc(bsize)	calloc(1, bsize)
-#define mem_free(ptr, bsize)	free(ptr)
-
-#include <sys/time.h>
-#include <netconfig.h>
-
-/*
- * The netbuf structure is defined here, because FreeBSD / NetBSD only use
- * it inside the RPC code. It's in <xti.h> on SVR4, but it would be confusing
- * to have an xti.h, since FreeBSD / NetBSD does not support XTI/TLI.
- */
-
-/*
- * The netbuf structure is used for transport-independent address storage.
- */
-struct netbuf {
-	unsigned int maxlen;
-	unsigned int len;
-	void *buf;
-};
-
-/*
- * The format of the addres and options arguments of the XTI t_bind call.
- * Only provided for compatibility, it should not be used.
- */
-
-struct t_bind {
-	struct netbuf   addr;
-	unsigned int    qlen;
-};
-
-/*
- * Internal library and rpcbind use. This is not an exported interface, do
- * not use.
- */
-struct __rpc_sockinfo {
-	int si_af; 
-	int si_proto;
-	int si_socktype;
-	int si_alen;
-};
-
-#endif /* !_RPC_TYPES_H */
diff --git a/newlib/libc/sys/linux/include/rpc/xdr.h b/newlib/libc/sys/linux/include/rpc/xdr.h
deleted file mode 100644
index 678dbe4..0000000
--- a/newlib/libc/sys/linux/include/rpc/xdr.h
+++ /dev/null
@@ -1,365 +0,0 @@
-/*	$NetBSD: xdr.h,v 1.19 2000/07/17 05:00:45 matt Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)xdr.h 1.19 87/04/22 SMI
- *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/xdr.h,v 1.21 2002/04/28 15:18:45 des Exp $
- */
-
-/*
- * xdr.h, External Data Representation Serialization Routines.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_XDR_H
-#define _RPC_XDR_H
-#include <sys/cdefs.h>
-
-/*
- * XDR provides a conventional way for converting between C data
- * types and an external bit-string representation.  Library supplied
- * routines provide for the conversion on built-in C data types.  These
- * routines and utility routines defined here are used to help implement
- * a type encode/decode routine for each user-defined type.
- *
- * Each data type provides a single procedure which takes two arguments:
- *
- *	bool_t
- *	xdrproc(xdrs, argresp)
- *		XDR *xdrs;
- *		<type> *argresp;
- *
- * xdrs is an instance of a XDR handle, to which or from which the data
- * type is to be converted.  argresp is a pointer to the structure to be
- * converted.  The XDR handle contains an operation field which indicates
- * which of the operations (ENCODE, DECODE * or FREE) is to be performed.
- *
- * XDR_DECODE may allocate space if the pointer argresp is null.  This
- * data can be freed with the XDR_FREE operation.
- *
- * We write only one procedure per data type to make it easy
- * to keep the encode and decode procedures for a data type consistent.
- * In many cases the same code performs all operations on a user defined type,
- * because all the hard work is done in the component type routines.
- * decode as a series of calls on the nested data types.
- */
-
-/*
- * Xdr operations.  XDR_ENCODE causes the type to be encoded into the
- * stream.  XDR_DECODE causes the type to be extracted from the stream.
- * XDR_FREE can be used to release the space allocated by an XDR_DECODE
- * request.
- */
-enum xdr_op {
-	XDR_ENCODE=0,
-	XDR_DECODE=1,
-	XDR_FREE=2
-};
-
-/*
- * This is the number of bytes per unit of external data.
- */
-#define BYTES_PER_XDR_UNIT	(4)
-#define RNDUP(x)  ((((x) + BYTES_PER_XDR_UNIT - 1) / BYTES_PER_XDR_UNIT) \
-		    * BYTES_PER_XDR_UNIT)
-
-/*
- * The XDR handle.
- * Contains operation which is being applied to the stream,
- * an operations vector for the particular implementation (e.g. see xdr_mem.c),
- * and two private fields for the use of the particular implementation.
- */
-typedef struct __rpc_xdr {
-	enum xdr_op	x_op;		/* operation; fast additional param */
-	const struct xdr_ops {
-		/* get a long from underlying stream */
-		bool_t	(*x_getlong)(struct __rpc_xdr *, long *);
-		/* put a long to " */
-		bool_t	(*x_putlong)(struct __rpc_xdr *, const long *);
-		/* get some bytes from " */
-		bool_t	(*x_getbytes)(struct __rpc_xdr *, char *, u_int);
-		/* put some bytes to " */
-		bool_t	(*x_putbytes)(struct __rpc_xdr *, const char *, u_int);
-		/* returns bytes off from beginning */
-		u_int	(*x_getpostn)(struct __rpc_xdr *);
-		/* lets you reposition the stream */
-		bool_t  (*x_setpostn)(struct __rpc_xdr *, u_int);
-		/* buf quick ptr to buffered data */
-		int32_t *(*x_inline)(struct __rpc_xdr *, u_int);
-		/* free privates of this xdr_stream */
-		void	(*x_destroy)(struct __rpc_xdr *);
-		bool_t	(*x_control)(struct __rpc_xdr *, int, void *);
-	} *x_ops;
-	char *	 	x_public;	/* users' data */
-	void *		x_private;	/* pointer to private data */
-	char * 		x_base;		/* private used for position info */
-	int		x_handy;	/* extra private word */
-} XDR;
-
-/*
- * A xdrproc_t exists for each data type which is to be encoded or decoded.
- *
- * The second argument to the xdrproc_t is a pointer to an opaque pointer.
- * The opaque pointer generally points to a structure of the data type
- * to be decoded.  If this pointer is 0, then the type routines should
- * allocate dynamic storage of the appropriate size and return it.
- */
-#ifdef _KERNEL
-typedef	bool_t (*xdrproc_t)(XDR *, void *, u_int);
-#else
-/*
- * XXX can't actually prototype it, because some take three args!!!
- */
-typedef	bool_t (*xdrproc_t)(XDR *, ...);
-#endif
-
-/*
- * Operations defined on a XDR handle
- *
- * XDR		*xdrs;
- * long		*longp;
- * char *	 addr;
- * u_int	 len;
- * u_int	 pos;
- */
-#define XDR_GETLONG(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
-#define xdr_getlong(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
-
-#define XDR_PUTLONG(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-#define xdr_putlong(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-
-static __inline int
-xdr_getint32(XDR *xdrs, int32_t *ip)
-{
-	long l;
-
-	if (!xdr_getlong(xdrs, &l))
-		return (FALSE);
-	*ip = (int32_t)l;
-	return (TRUE);
-}
-
-static __inline int
-xdr_putint32(XDR *xdrs, int32_t *ip)
-{
-	long l;
-
-	l = (long)*ip;
-	return xdr_putlong(xdrs, &l);
-}
-
-#define XDR_GETINT32(xdrs, int32p)	xdr_getint32(xdrs, int32p)
-#define XDR_PUTINT32(xdrs, int32p)	xdr_putint32(xdrs, int32p)
-
-#define XDR_GETBYTES(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
-#define xdr_getbytes(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
-
-#define XDR_PUTBYTES(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
-#define xdr_putbytes(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
-
-#define XDR_GETPOS(xdrs)				\
-	(*(xdrs)->x_ops->x_getpostn)(xdrs)
-#define xdr_getpos(xdrs)				\
-	(*(xdrs)->x_ops->x_getpostn)(xdrs)
-
-#define XDR_SETPOS(xdrs, pos)				\
-	(*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
-#define xdr_setpos(xdrs, pos)				\
-	(*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
-
-#define	XDR_INLINE(xdrs, len)				\
-	(*(xdrs)->x_ops->x_inline)(xdrs, len)
-#define	xdr_inline(xdrs, len)				\
-	(*(xdrs)->x_ops->x_inline)(xdrs, len)
-
-#define	XDR_DESTROY(xdrs)				\
-	if ((xdrs)->x_ops->x_destroy) 			\
-		(*(xdrs)->x_ops->x_destroy)(xdrs)
-#define	xdr_destroy(xdrs)				\
-	if ((xdrs)->x_ops->x_destroy) 			\
-		(*(xdrs)->x_ops->x_destroy)(xdrs)
-
-#define XDR_CONTROL(xdrs, req, op)			\
-	if ((xdrs)->x_ops->x_control)			\
-		(*(xdrs)->x_ops->x_control)(xdrs, req, op)
-#define xdr_control(xdrs, req, op) XDR_CONTROL(xdrs, req, op)
-
-/*
- * Solaris strips the '_t' from these types -- not sure why.
- * But, let's be compatible.
- */
-#define xdr_rpcvers(xdrs, versp) xdr_u_int32(xdrs, versp)
-#define xdr_rpcprog(xdrs, progp) xdr_u_int32(xdrs, progp)
-#define xdr_rpcproc(xdrs, procp) xdr_u_int32(xdrs, procp)
-#define xdr_rpcprot(xdrs, protp) xdr_u_int32(xdrs, protp)
-#define xdr_rpcport(xdrs, portp) xdr_u_int32(xdrs, portp)
-
-/*
- * Support struct for discriminated unions.
- * You create an array of xdrdiscrim structures, terminated with
- * a entry with a null procedure pointer.  The xdr_union routine gets
- * the discriminant value and then searches the array of structures
- * for a matching value.  If a match is found the associated xdr routine
- * is called to handle that part of the union.  If there is
- * no match, then a default routine may be called.
- * If there is no match and no default routine it is an error.
- */
-#define NULL_xdrproc_t ((xdrproc_t)0)
-struct xdr_discrim {
-	int	value;
-	xdrproc_t proc;
-};
-
-/*
- * In-line routines for fast encode/decode of primitive data types.
- * Caveat emptor: these use single memory cycles to get the
- * data from the underlying buffer, and will fail to operate
- * properly if the data is not aligned.  The standard way to use these
- * is to say:
- *	if ((buf = XDR_INLINE(xdrs, count)) == NULL)
- *		return (FALSE);
- *	<<< macro calls >>>
- * where ``count'' is the number of bytes of data occupied
- * by the primitive data types.
- *
- * N.B. and frozen for all time: each data type here uses 4 bytes
- * of external representation.
- */
-#define IXDR_GET_INT32(buf)		((int32_t)__ntohl((u_int32_t)*(buf)++))
-#define IXDR_PUT_INT32(buf, v)		(*(buf)++ =(int32_t)__htonl((u_int32_t)v))
-#define IXDR_GET_U_INT32(buf)		((u_int32_t)IXDR_GET_INT32(buf))
-#define IXDR_PUT_U_INT32(buf, v)	IXDR_PUT_INT32((buf), ((int32_t)(v)))
-
-#define IXDR_GET_LONG(buf)		((long)__ntohl((u_int32_t)*(buf)++))
-#define IXDR_PUT_LONG(buf, v)		(*(buf)++ =(int32_t)__htonl((u_int32_t)v))
-
-#define IXDR_GET_BOOL(buf)		((bool_t)IXDR_GET_LONG(buf))
-#define IXDR_GET_ENUM(buf, t)		((t)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_LONG(buf)		((u_long)IXDR_GET_LONG(buf))
-#define IXDR_GET_SHORT(buf)		((short)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_SHORT(buf)		((u_short)IXDR_GET_LONG(buf))
-
-#define IXDR_PUT_BOOL(buf, v)		IXDR_PUT_LONG((buf), (v))
-#define IXDR_PUT_ENUM(buf, v)		IXDR_PUT_LONG((buf), (v))
-#define IXDR_PUT_U_LONG(buf, v)		IXDR_PUT_LONG((buf), (v))
-#define IXDR_PUT_SHORT(buf, v)		IXDR_PUT_LONG((buf), (v))
-#define IXDR_PUT_U_SHORT(buf, v)	IXDR_PUT_LONG((buf), (v))
-
-/*
- * These are the "generic" xdr routines.
- */
-__BEGIN_DECLS
-extern bool_t	xdr_void(void);
-extern bool_t	xdr_int(XDR *, int *);
-extern bool_t	xdr_u_int(XDR *, u_int *);
-extern bool_t	xdr_long(XDR *, long *);
-extern bool_t	xdr_u_long(XDR *, u_long *);
-extern bool_t	xdr_short(XDR *, short *);
-extern bool_t	xdr_u_short(XDR *, u_short *);
-extern bool_t	xdr_int16_t(XDR *, int16_t *);
-extern bool_t	xdr_u_int16_t(XDR *, u_int16_t *);
-extern bool_t	xdr_int32_t(XDR *, int32_t *);
-extern bool_t	xdr_u_int32_t(XDR *, u_int32_t *);
-extern bool_t	xdr_int64_t(XDR *, int64_t *);
-extern bool_t	xdr_u_int64_t(XDR *, u_int64_t *);
-extern bool_t	xdr_bool(XDR *, bool_t *);
-extern bool_t	xdr_enum(XDR *, enum_t *);
-extern bool_t	xdr_array(XDR *, char **, u_int *, u_int, u_int, xdrproc_t);
-extern bool_t	xdr_bytes(XDR *, char **, u_int *, u_int);
-extern bool_t	xdr_opaque(XDR *, char *, u_int);
-extern bool_t	xdr_string(XDR *, char **, u_int);
-extern bool_t	xdr_union(XDR *, enum_t *, char *, const struct xdr_discrim *, xdrproc_t);
-extern bool_t	xdr_char(XDR *, char *);
-extern bool_t	xdr_u_char(XDR *, u_char *);
-extern bool_t	xdr_vector(XDR *, char *, u_int, u_int, xdrproc_t);
-extern bool_t	xdr_float(XDR *, float *);
-extern bool_t	xdr_double(XDR *, double *);
-extern bool_t	xdr_quadruple(XDR *, long double *);
-extern bool_t	xdr_reference(XDR *, char **, u_int, xdrproc_t);
-extern bool_t	xdr_pointer(XDR *, char **, u_int, xdrproc_t);
-extern bool_t	xdr_wrapstring(XDR *, char **);
-extern void	xdr_free(xdrproc_t, void *);
-extern bool_t	xdr_hyper(XDR *, long long *);
-extern bool_t	xdr_u_hyper(XDR *, unsigned long long *);
-extern bool_t	xdr_longlong_t(XDR *, long long *);
-extern bool_t	xdr_u_longlong_t(XDR *, unsigned long long *);
-__END_DECLS
-
-/*
- * Common opaque bytes objects used by many rpc protocols;
- * declared here due to commonality.
- */
-#define MAX_NETOBJ_SZ 1024
-struct netobj {
-	u_int	n_len;
-	char	*n_bytes;
-};
-typedef struct netobj netobj;
-extern bool_t   xdr_netobj(XDR *, struct netobj *);
-
-/*
- * These are the public routines for the various implementations of
- * xdr streams.
- */
-__BEGIN_DECLS
-/* XDR using memory buffers */
-extern void   xdrmem_create(XDR *, char *, u_int, enum xdr_op);
-
-/* XDR using stdio library */
-#ifdef _STDIO_H_
-extern void   xdrstdio_create(XDR *, FILE *, enum xdr_op);
-#endif
-
-/* XDR pseudo records for tcp */
-extern void   xdrrec_create(XDR *, u_int, u_int, void *,
-			    int (*)(void *, void *, int),
-			    int (*)(void *, void *, int));
-
-/* make end of xdr record */
-extern bool_t xdrrec_endofrecord(XDR *, int);
-
-/* move to beginning of next record */
-extern bool_t xdrrec_skiprecord(XDR *);
-
-/* true if no more input */
-extern bool_t xdrrec_eof(XDR *);
-extern u_int xdrrec_readbytes(XDR *, caddr_t, u_int);
-__END_DECLS
-
-#endif /* !_RPC_XDR_H */
diff --git a/newlib/libc/sys/linux/include/rune.h b/newlib/libc/sys/linux/include/rune.h
deleted file mode 100644
index d8aa03d..0000000
--- a/newlib/libc/sys/linux/include/rune.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)rune.h	8.1 (Berkeley) 6/27/93
- * $FreeBSD: src/include/rune.h,v 1.2 2002/03/23 17:24:53 imp Exp $
- */
-
-#ifndef	_RUNE_H_
-#define	_RUNE_H_
-
-#include <runetype.h>
-#include <stdio.h>
-
-#define	_PATH_LOCALE	"/usr/share/locale"
-
-#define _INVALID_RUNE   _CurrentRuneLocale->invalid_rune
-
-#define __sgetrune      _CurrentRuneLocale->sgetrune
-#define __sputrune      _CurrentRuneLocale->sputrune
-
-#define sgetrune(s, n, r)       (*__sgetrune)((s), (n), (r))
-#define sputrune(c, s, n, r)    (*__sputrune)((c), (s), (n), (r))
-
-__BEGIN_DECLS
-char	*mbrune(const char *, rune_t);
-char	*mbrrune(const char *, rune_t);
-char	*mbmb(const char *, char *);
-long	 fgetrune(FILE *);
-int	 fputrune(rune_t, FILE *);
-int	 fungetrune(rune_t, FILE *);
-int	 setrunelocale(char *);
-void	 setinvalidrune(rune_t);
-__END_DECLS
-
-#endif	/*! _RUNE_H_ */
diff --git a/newlib/libc/sys/linux/include/runetype.h b/newlib/libc/sys/linux/include/runetype.h
deleted file mode 100644
index a0a3a43..0000000
--- a/newlib/libc/sys/linux/include/runetype.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)runetype.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/runetype.h,v 1.5 2002/03/26 01:35:05 bde Exp $
- */
-
-#ifndef	_RUNETYPE_H_
-#define	_RUNETYPE_H_
-
-#include <sys/cdefs.h>
-#include <machine/ansi.h>
-
-#ifdef	_BSD_RUNE_T_
-typedef	_BSD_RUNE_T_	rune_t;
-#undef	_BSD_RUNE_T_
-#endif
-
-typedef int rune_t;
-
-#ifdef	_BSD_SIZE_T_
-typedef	_BSD_SIZE_T_	size_t;
-#undef	_BSD_SIZE_T_
-#endif
-
-typedef unsigned int size_t;
-
-#ifdef	_BSD_WCHAR_T_
-typedef	_BSD_WCHAR_T_	wchar_t;
-#undef	_BSD_WCHAR_T_
-#endif
-
-#define	_CACHED_RUNES	(1 <<8 )	/* Must be a power of 2 */
-#define	_CRMASK		(~(_CACHED_RUNES - 1))
-
-/*
- * The lower 8 bits of runetype[] contain the digit value of the rune.
- */
-typedef struct {
-	rune_t		min;		/* First rune of the range */
-	rune_t		max;		/* Last rune (inclusive) of the range */
-	rune_t		map;		/* What first maps to in maps */
-	unsigned long	*types;		/* Array of types in range */
-} _RuneEntry;
-
-typedef struct {
-	int		nranges;	/* Number of ranges stored */
-	_RuneEntry	*ranges;	/* Pointer to the ranges */
-} _RuneRange;
-
-typedef struct {
-	char		magic[8];	/* Magic saying what version we are */
-	char		encoding[32];	/* ASCII name of this encoding */
-
-	rune_t		(*sgetrune)(const char *, size_t, char const **);
-	int		(*sputrune)(rune_t, char *, size_t, char **);
-	rune_t		invalid_rune;
-
-	unsigned long	runetype[_CACHED_RUNES];
-	rune_t		maplower[_CACHED_RUNES];
-	rune_t		mapupper[_CACHED_RUNES];
-
-	/*
-	 * The following are to deal with Runes larger than _CACHED_RUNES - 1.
-	 * Their data is actually contiguous with this structure so as to make
-	 * it easier to read/write from/to disk.
-	 */
-	_RuneRange	runetype_ext;
-	_RuneRange	maplower_ext;
-	_RuneRange	mapupper_ext;
-
-	void		*variable;	/* Data which depends on the encoding */
-	int		variable_len;	/* how long that data is */
-} _RuneLocale;
-
-#define	_RUNE_MAGIC_1	"RuneMagi"	/* Indicates version 0 of RuneLocale */
-
-extern _RuneLocale _DefaultRuneLocale;
-extern _RuneLocale *_CurrentRuneLocale;
-
-#endif	/* !_RUNETYPE_H_ */
diff --git a/newlib/libc/sys/linux/include/semaphore.h b/newlib/libc/sys/linux/include/semaphore.h
deleted file mode 100644
index 8793768..0000000
--- a/newlib/libc/sys/linux/include/semaphore.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <linuxthreads/semaphore.h>
diff --git a/newlib/libc/sys/linux/include/setjmp.h b/newlib/libc/sys/linux/include/setjmp.h
deleted file mode 100644
index f07dbab..0000000
--- a/newlib/libc/sys/linux/include/setjmp.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-	setjmp.h
-	stubs for future use.
-*/
-
-#ifndef _SETJMP_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define _SETJMP_H_
-
-#include "_ansi.h"
-#include <machine/setjmp.h>
-#include <signal.h> /* for sigset_t and sigprocmask */
-
-typedef struct __sigjmpbuf
-{
-  __jmp_buf __buf;
-  int __is_mask_saved;
-  sigset_t __saved_mask;
-} sigjmp_buf;
-
-typedef __jmp_buf jmp_buf;
-
-void	_EXFUN(longjmp,(jmp_buf __jmpb, int __retval));
-int	_EXFUN(setjmp,(jmp_buf __jmpb));
-void	_EXFUN(siglongjmp,(sigjmp_buf __jmpb, int __retval));
-int	_EXFUN(sigsetjmp,(sigjmp_buf __jmpb, int __savemask));
-
-/* sigsetjmp is implemented as macro using setjmp */
-
-#define sigsetjmp(__jmpb, __savemask) \
-                 ( __jmpb.__is_mask_saved = __savemask && \
-                   (sigprocmask (SIG_BLOCK, NULL, &__jmpb.__saved_mask) == 0), \
-                    setjmp (__jmpb.__buf) )
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _SETJMP_H_ */
-
diff --git a/newlib/libc/sys/linux/include/setlocale.h b/newlib/libc/sys/linux/include/setlocale.h
deleted file mode 100644
index 3eb7698..0000000
--- a/newlib/libc/sys/linux/include/setlocale.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (C) 1997 by Andrey A. Chernov, Moscow, Russia.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/locale/setlocale.h,v 1.4 2001/12/20 18:28:52 phantom Exp $
- */
-
-#ifndef _SETLOCALE_H_
-#define	_SETLOCALE_H_
-
-#define ENCODING_LEN 31
-#define CATEGORY_LEN 11
-
-extern char *_PathLocale;
-
-#endif /* !_SETLOCALE_H_ */
diff --git a/newlib/libc/sys/linux/include/stdint.h b/newlib/libc/sys/linux/include/stdint.h
index d1197f6..5c89acd 100644
--- a/newlib/libc/sys/linux/include/stdint.h
+++ b/newlib/libc/sys/linux/include/stdint.h
@@ -1,265 +1,18 @@
-/*
- * Copyright (c) 2004, 2005 by
- * Ralf Corsepius, Ulm/Germany. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-/*
- * @todo - Add fast<N>_t types.
- * @todo - Add support for wint_t types.
- */
-
-#ifndef _STDINT_H
-#define _STDINT_H
-
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__GNUC__) && (__GNUC__ >= 3 ) \
-  && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ > 2 ) 
-#define __STDINT_EXP(x) __##x##__
-#else
-#define __STDINT_EXP(x) x
-#include <limits.h>
-#endif
-
-#if __STDINT_EXP(SCHAR_MAX) == 0x7f
-#define __int8_t_defined 1
-#endif
-
-#if __int8_t_defined
-typedef signed char int_least8_t;
-typedef unsigned char uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-
-#if __STDINT_EXP(SHRT_MAX) == 0x7fff
-#define __int16_t_defined 1
-#elif __STDINT_EXP(INT_MAX) == 0x7fff
-#define __int16_t_defined 1
-#elif __STDINT_EXP(SCHAR_MAX) == 0x7fff
-#define __int16_t_defined 1
-#endif
-
-#if __int16_t_defined
-typedef int16_t   	int_least16_t;
-typedef uint16_t 	uint_least16_t;
-#define __int_least16_t_defined 1
-
-#ifndef __int_least8_t_defined
-typedef int16_t	   	int_least8_t;
-typedef uint16_t  	uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-#endif
-
-#if __STDINT_EXP(INT_MAX) == 0x7fffffffL
-#define __int32_t_defined 1
-#elif __STDINT_EXP(LONG_MAX) == 0x7fffffffL
-#define __int32_t_defined 1
-#define __have_long32 1
-#elif __STDINT_EXP(SHRT_MAX) == 0x7fffffffL
-#define __int32_t_defined 1
-#elif __STDINT_EXP(SCHAR_MAX) == 0x7fffffffL
-#define __int32_t_defined 1
-#endif
-
-#if __int32_t_defined
-typedef int32_t   	int_least32_t;
-typedef uint32_t 	uint_least32_t;
-#define __int_least32_t_defined 1
-
-#ifndef __int_least8_t_defined
-typedef int32_t	   	int_least8_t;
-typedef uint32_t  	uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-
-#ifndef __int_least16_t_defined
-typedef int32_t	   	int_least16_t;
-typedef uint32_t  	uint_least16_t;
-#define __int_least16_t_defined 1
-#endif
-#endif
-
-#if __STDINT_EXP(LONG_MAX) > 0x7fffffff
-#define __int64_t_defined 1
-#define __have_long64 1
-#elif  defined(__LONG_LONG_MAX__) && (__LONG_LONG_MAX__ > 0x7fffffff)
-#define __int64_t_defined 1
-#define __have_longlong64 1
-#elif  defined(LLONG_MAX) && (LLONG_MAX > 0x7fffffff)
-#define __int64_t_defined 1
-#define __have_longlong64 1
-#elif  __STDINT_EXP(INT_MAX) > 0x7fffffff
-#define __int64_t_defined 1
-#endif
-
-#if __int64_t_defined
-typedef int64_t   	int_least64_t;
-typedef uint64_t 	uint_least64_t;
-#define __int_least64_t_defined 1
-
-#ifndef __int_least8_t_defined
-typedef int64_t	   	int_least8_t;
-typedef uint64_t  	uint_least8_t;
-#define __int_least8_t_defined 1
-#endif
-
-#ifndef __int_least16_t_defined
-typedef int64_t	   	int_least16_t;
-typedef uint64_t  	uint_least16_t;
-#define __int_least16_t_defined 1
-#endif
+/* libc/sys/linux/include/stdint.h - Standard integer types */
 
-#ifndef __int_least32_t_defined
-typedef int64_t	   	int_least32_t;
-typedef uint64_t  	uint_least32_t;
-#define __int_least32_t_defined 1
-#endif
-#endif
-
-/* Greatest-width integer types */
-/* Modern GCCs provide __INTMAX_TYPE__ */
-#if defined(__INTMAX_TYPE__)
-  typedef __INTMAX_TYPE__ intmax_t;
-#elif __have_longlong64
-  typedef signed long long intmax_t;
-#else
-  typedef signed long intmax_t;
-#endif
-
-/* Modern GCCs provide __UINTMAX_TYPE__ */
-#if defined(__UINTMAX_TYPE__)
-  typedef __UINTMAX_TYPE__ uintmax_t;
-#elif __have_longlong64
-  typedef unsigned long long uintmax_t;
-#else
-  typedef unsigned long uintmax_t;
-#endif
-  
-/* Limits of Specified-Width Integer Types */
+/* Written 2000 by Werner Almesberger */
 
-#if __int8_t_defined
-#define INT8_MIN 	-128
-#define INT8_MAX 	 127
-#define UINT8_MAX 	 255
-#endif
 
-#if __int_least8_t_defined
-#define INT_LEAST8_MIN 	-128
-#define INT_LEAST8_MAX 	 127
-#define UINT_LEAST8_MAX	 255
-#else
-#error required type int_least8_t missing
-#endif
-
-#if __int16_t_defined
-#define INT16_MIN 	-32768
-#define INT16_MAX 	 32767
-#define UINT16_MAX 	 65535
-#endif
-
-#if __int_least16_t_defined
-#define INT_LEAST16_MIN	-32768
-#define INT_LEAST16_MAX	 32767
-#define UINT_LEAST16_MAX 65535
-#else
-#error required type int_least16_t missing
-#endif
-
-#if __int32_t_defined
-#define INT32_MIN 	 (-2147483647-1)
-#define INT32_MAX 	 2147483647
-#define UINT32_MAX       4294967295U
-#endif
-
-#if __int_least32_t_defined
-#define INT_LEAST32_MIN  (-2147483647-1)
-#define INT_LEAST32_MAX  2147483647
-#define UINT_LEAST32_MAX 4294967295U
-#else
-#error required type int_least32_t missing
-#endif
-
-#if __int64_t_defined
-#ifdef __have_long64
-#define INT64_MIN 	(-9223372036854775807L-1L)
-#define INT64_MAX 	 9223372036854775807L
-#define UINT64_MAX 	18446744073709551615U
-#elif defined(__have_longlong64)
-#define INT64_MIN 	(-9223372036854775807LL-1LL)
-#define INT64_MAX 	 9223372036854775807LL
-#define UINT64_MAX 	18446744073709551615ULL
-#endif
-#endif
+#ifndef _NEWLIB_STDINT_H
+#define _NEWLIB_STDINT_H
 
-#if __int_least64_t_defined
-#ifdef __have_long64
-#define INT_LEAST64_MIN  (-9223372036854775807L-1L)
-#define INT_LEAST64_MAX  9223372036854775807L
-#define UINT_LEAST64_MAX 18446744073709551615U
-#elif defined(__have_longlong64)
-#define INT_LEAST64_MIN  (-9223372036854775807LL-1LL)
-#define INT_LEAST64_MAX  9223372036854775807LL
-#define UINT_LEAST64_MAX 18446744073709551615ULL
-#endif
-#endif
-
-/* This must match size_t in stddef.h, currently long unsigned int */
-#define SIZE_MIN (-__STDINT_EXP(LONG_MAX) - 1L)
-#define SIZE_MAX __STDINT_EXP(LONG_MAX)
-
-/* This must match sig_atomic_t in <signal.h> (currently int) */
-#define SIG_ATOMIC_MIN (-__STDINT_EXP(INT_MAX) - 1)
-#define SIG_ATOMIC_MAX __STDINT_EXP(INT_MAX)
-
-/* This must match ptrdiff_t  in <stddef.h> (currently long int) */
-#define PTRDIFF_MIN (-__STDINT_EXP(LONG_MAX) - 1L)
-#define PTRDIFF_MAX __STDINT_EXP(LONG_MAX)
-
-/** Macros for minimum-width integer constant expressions */
-#define INT8_C(x)	x
-#define UINT8_C(x)	x##U
-
-#define INT16_C(x)	x
-#define UINT16_C(x)	x##U
-
-#if __have_long32
-#define INT32_C(x)	x##L
-#define UINT32_C(x)	x##UL
-#else
-#define INT32_C(x)	x
-#define UINT32_C(x)	x##U
-#endif
-
-#if __int64_t_defined
-#if __have_longlong64
-#define INT64_C(x)	x##LL
-#define UINT64_C(x)	x##ULL
-#else
-#define INT64_C(x)	x##L
-#define UINT64_C(x)	x##UL
-#endif
-#endif
-
-/** Macros for greatest-width integer constant expression */
-#if __have_longlong64
-#define INTMAX_C(x)	x##LL
-#define UINTMAX_C(x)	x##ULL
-#else
-#define INTMAX_C(x)	x##L
-#define UINTMAX_C(x)	x##UL
-#endif
+/*
+ * FIXME: linux/types.h defines various types that rightfully belong into
+ * stdint.h. So we have no choice but to include linux/types.h directly, even
+ * if this causes name space pollution. Note: we have to go via sys/types.h
+ * in order to resolve some other compatibility issues.
+ */
 
+#include <sys/types.h>
 
-#ifdef __cplusplus
-}
 #endif
-
-#endif /* _STDINT_H */
diff --git a/newlib/libc/sys/linux/include/time.h b/newlib/libc/sys/linux/include/time.h
deleted file mode 100644
index 64ade94..0000000
--- a/newlib/libc/sys/linux/include/time.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * time.h
- * 
- * Struct and function declarations for dealing with time.
- */
-
-#ifndef _TIME_H_
-
-#include "_ansi.h"
-#include <sys/reent.h>
-#include <sys/linux_time.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef NULL
-#define	NULL	0
-#endif
-
-/* Get _CLOCKS_PER_SEC_ */
-#include <machine/time.h>
-#include <sys/types.h>
-
-/* Time Value Specification Structures, P1003.1b-1993, p. 261 */
-#ifndef _STRUCT_TIMESPEC
-#define _STRUCT_TIMESPEC
-struct timespec {
-  time_t  tv_sec;   /* Seconds */
-  long    tv_nsec;  /* Nanoseconds */
-};
-#endif /* !_STRUCT_TIMESPEC */
-
-#ifndef __need_timespec
-
-#define _TIME_H_ 1
-
-#ifndef _CLOCKS_PER_SEC_
-#define _CLOCKS_PER_SEC_ 1000
-#endif
-
-#define CLOCKS_PER_SEC _CLOCKS_PER_SEC_
-#define CLK_TCK CLOCKS_PER_SEC
-#define __need_size_t
-#include <stddef.h>
-
-struct tm
-{
-  int	tm_sec;
-  int	tm_min;
-  int	tm_hour;
-  int	tm_mday;
-  int	tm_mon;
-  int	tm_year;
-  int	tm_wday;
-  int	tm_yday;
-  int	tm_isdst;
-};
-
-#ifndef __timer_t_defined
-# define __timer_t_defined      1
-typedef __timer_t timer_t;
-#endif
-
-clock_t	   _EXFUN(clock,    (void));
-double	   _EXFUN(difftime, (time_t _time2, time_t _time1));
-time_t	   _EXFUN(mktime,   (struct tm *_timeptr));
-time_t	   _EXFUN(time,     (time_t *_timer));
-#ifndef _REENT_ONLY
-char	  *_EXFUN(asctime,  (const struct tm *_tblock));
-char	  *_EXFUN(ctime,    (const time_t *_time));
-struct tm *_EXFUN(gmtime,   (const time_t *_timer));
-struct tm *_EXFUN(localtime,(const time_t *_timer));
-#endif
-size_t	   _EXFUN(strftime, (char *_s, size_t _maxsize, const char *_fmt, const struct tm *_t));
-
-char	  *_EXFUN(asctime_r,	(const struct tm *, char *));
-char	  *_EXFUN(ctime_r,	(const time_t *, char *));
-struct tm *_EXFUN(gmtime_r,	(const time_t *, struct tm *));
-struct tm *_EXFUN(localtime_r,	(const time_t *, struct tm *));
-
-#ifndef __STRICT_ANSI__
-char      *_EXFUN(strptime,     (const char *, const char *, struct tm *));
-_VOID      _EXFUN(tzset,	(_VOID));
-_VOID      _EXFUN(_tzset_r,	(struct _reent *));
-
-typedef struct __tzrule_struct
-{
-  char ch;
-  int m;
-  int n;
-  int d;
-  int s;
-  time_t change;
-  long offset; /* Match type of _timezone. */
-} __tzrule_type;
-
-typedef struct __tzinfo_struct
-{
-  int __tznorth;
-  int __tzyear;
-  __tzrule_type __tzrule[2];
-} __tzinfo_type;
-
-__tzinfo_type *_EXFUN (__gettzinfo, (_VOID));
-
-/* getdate functions */
-
-#ifndef _REENT_ONLY
-#define getdate_err (*__getdate_err())
-int *_EXFUN(__getdate_err,(_VOID));
-
-struct tm *	_EXFUN(getdate, (const char *));
-/* getdate_err is set to one of the following values to indicate the error.
-     1  the DATEMSK environment variable is null or undefined,
-     2  the template file cannot be opened for reading,
-     3  failed to get file status information,
-     4  the template file is not a regular file,
-     5  an error is encountered while reading the template file,
-     6  memory allication failed (not enough memory available),
-     7  there is no line in the template that matches the input,
-     8  invalid input specification  */
-#endif /* !_REENT_ONLY */
-
-/* getdate_r returns the error code as above */
-int		_EXFUN(getdate_r, (const char *, struct tm *));
-
-/* defines for the opengroup specifications Derived from Issue 1 of the SVID.  */
-extern __IMPORT long _timezone;
-extern __IMPORT int _daylight;
-extern __IMPORT char *_tzname[2];
-
-/* POSIX defines the external tzname being defined in time.h */
-#ifndef tzname
-#define tzname _tzname
-#endif
-
-#endif /* !__STRICT_ANSI__ */
-
-#include <sys/features.h>
-
-#if defined(_POSIX_TIMERS)
-
-#include <signal.h>
-
-/* Clocks, P1003.1b-1993, p. 263 */
-
-int _EXFUN(clock_settime, (clockid_t clock_id, const struct timespec *tp));
-int _EXFUN(clock_gettime, (clockid_t clock_id, struct timespec *tp));
-int _EXFUN(clock_getres,  (clockid_t clock_id, struct timespec *res));
-
-/* Create a Per-Process Timer, P1003.1b-1993, p. 264 */
-
-int _EXFUN(timer_create,
-  (clockid_t clock_id, struct sigevent *evp, timer_t *timerid));
-
-/* Delete a Per_process Timer, P1003.1b-1993, p. 266 */
-
-int _EXFUN(timer_delete, (timer_t timerid));
-
-/* Per-Process Timers, P1003.1b-1993, p. 267 */
-
-int _EXFUN(timer_settime,
-  (timer_t timerid, int flags, const struct itimerspec *value,
-   struct itimerspec *ovalue));
-int _EXFUN(timer_gettime, (timer_t timerid, struct itimerspec *value));
-int _EXFUN(timer_getoverrun, (timer_t timerid));
-
-/* High Resolution Sleep, P1003.1b-1993, p. 269 */
-
-int _EXFUN(nanosleep, (const struct timespec  *rqtp, struct timespec *rmtp));
-
-#endif /* _POSIX_TIMERS */
-
-/* CPU-time Clock Attributes, P1003.4b/D8, p. 54 */
-
-/* values for the clock enable attribute */
-
-#define CLOCK_ENABLED  1  /* clock is enabled, i.e. counting execution time */
-#define CLOCK_DISABLED 0  /* clock is disabled */
-
-/* values for the pthread cputime_clock_allowed attribute */
-
-#define CLOCK_ALLOWED    1 /* If a thread is created with this value a */
-                           /*   CPU-time clock attached to that thread */
-                           /*   shall be accessible. */
-#define CLOCK_DISALLOWED 0 /* If a thread is created with this value, the */
-                           /*   thread shall not have a CPU-time clock */
-                           /*   accessible. */
-
-/* Manifest Constants, P1003.1b-1993, p. 262 */
-
-#define CLOCK_REALTIME (clockid_t)1
-
-/* Flag indicating time is "absolute" with respect to the clock
-   associated with a time.  */
-
-#define TIMER_ABSTIME  4
-
-/* Manifest Constants, P1003.4b/D8, p. 55 */
-
-#if defined(_POSIX_CPUTIME)
-
-/* When used in a clock or timer function call, this is interpreted as
-   the identifier of the CPU_time clock associated with the PROCESS
-   making the function call.  */
-
-#define CLOCK_PROCESS_CPUTIME_ID (clockid_t)2
-
-#endif
-
-#if defined(_POSIX_THREAD_CPUTIME)
-
-/*  When used in a clock or timer function call, this is interpreted as
-    the identifier of the CPU_time clock associated with the THREAD
-    making the function call.  */
-
-#define CLOCK_THREAD_CPUTIME_ID (clockid_t)3
-
-#endif
-
-#if defined(_POSIX_CPUTIME)
-
-/* Accessing a Process CPU-time CLock, P1003.4b/D8, p. 55 */
-
-int _EXFUN(clock_getcpuclockid, (pid_t pid, clockid_t *clock_id));
-
-#endif /* _POSIX_CPUTIME */
-
-#if defined(_POSIX_CPUTIME) || defined(_POSIX_THREAD_CPUTIME)
-
-/* CPU-time Clock Attribute Access, P1003.4b/D8, p. 56 */
-
-int _EXFUN(clock_setenable_attr, (clockid_t clock_id, int attr));
-int _EXFUN(clock_getenable_attr, (clockid_t clock_id, int *attr));
-
-#endif /* _POSIX_CPUTIME or _POSIX_THREAD_CPUTIME */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ! __need_timespec */
-
-#undef __need_timespec
-
-#endif /* _TIME_H_ */
-
diff --git a/newlib/libc/sys/linux/include/un-namespace.h b/newlib/libc/sys/linux/include/un-namespace.h
deleted file mode 100644
index 01d9b8f..0000000
--- a/newlib/libc/sys/linux/include/un-namespace.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@FreeBSD.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.7 2002/03/29 22:43:42 markm Exp $
- */
-
-#ifndef _UN_NAMESPACE_H_
-#define _UN_NAMESPACE_H_
-
-#undef		accept
-#undef		__acl_aclcheck_fd
-#undef		__acl_delete_fd
-#undef		__acl_get_fd
-#undef		__acl_set_fd
-#undef		bind
-#undef		__cap_get_fd
-#undef		__cap_set_fd
-#undef		close
-#undef		connect
-#undef		dup
-#undef		dup2
-#undef		execve
-#undef		fcntl
-#undef		flock
-#undef		fstat
-#undef		fstatfs
-#undef		fsync
-#undef		getdirentries
-#undef		getlogin
-#undef		getpeername
-#undef		getprogname
-#undef		getsockname
-#undef		getsockopt
-#undef		ioctl
-#undef		kevent
-#undef		listen
-#undef		nanosleep
-#undef		open
-#undef		pthread_getspecific
-#undef		pthread_key_create
-#undef		pthread_key_delete
-#undef		pthread_mutex_destroy
-#undef		pthread_mutex_init
-#undef		pthread_mutex_lock
-#undef		pthread_mutex_trylock
-#undef		pthread_mutex_unlock
-#undef		pthread_mutexattr_init
-#undef		pthread_mutexattr_destroy
-#undef		pthread_mutexattr_settype
-#undef		pthread_once
-#undef		pthread_self
-#undef		pthread_setspecific
-#undef		read
-#undef		readv
-#undef		recvfrom
-#undef		recvmsg
-#undef		select
-#undef		sendmsg
-#undef		sendto
-#undef		setsockopt
-#undef		sigaction
-#undef		sigprocmask
-#undef		sigsuspend
-#undef		socket
-#undef		socketpair
-#undef		wait4
-#undef		write
-#undef		writev
-
-#if 0
-#undef		creat
-#undef		fchflags
-#undef		fchmod
-#undef		fpathconf
-#undef		msync
-#undef		nfssvc
-#undef		pause
-#undef		poll
-#undef		pthread_rwlock_destroy
-#undef		pthread_rwlock_init
-#undef		pthread_rwlock_rdlock
-#undef		pthread_rwlock_tryrdlock
-#undef		pthread_rwlock_trywrlock
-#undef		pthread_rwlock_unlock
-#undef		pthread_rwlock_wrlock
-#undef		pthread_rwlockattr_init
-#undef		pthread_rwlockattr_destroy
-#undef		sched_yield
-#undef		sendfile
-#undef		shutdown
-#undef		sigaltstack
-#undef		sigpending
-#undef		sigreturn
-#undef		sigsetmask
-#undef		sleep
-#undef		system
-#undef		tcdrain
-#undef		wait
-#undef		waitpid
-#endif	/* 0 */
-
-#ifdef _SIGNAL_H_
-int     	_sigaction(int, const struct sigaction *, struct sigaction *);
-#endif
-
-#ifdef _SYS_EVENT_H_
-int		_kevent(int, const struct kevent *, int, struct kevent *,
-		    int, const struct timespec *);
-#endif
-
-#ifdef _SYS_FCNTL_H_
-int		_flock(int, int);
-#endif
-
-#undef		err
-#undef		warn
-
-#endif	/* _UN_NAMESPACE_H_ */
diff --git a/newlib/libc/sys/linux/include/unistd.h b/newlib/libc/sys/linux/include/unistd.h
index 55ecc3a..e2f562a 100644
--- a/newlib/libc/sys/linux/include/unistd.h
+++ b/newlib/libc/sys/linux/include/unistd.h
@@ -15,4 +15,6 @@ extern char *optarg;
 extern int optind, opterr, optopt;
 
 
+int readlink(const char *path, char *buf, size_t bufsiz);
+
 #endif
diff --git a/newlib/libc/sys/linux/include/wordexp.h b/newlib/libc/sys/linux/include/wordexp.h
deleted file mode 100644
index 5bc3d00..0000000
--- a/newlib/libc/sys/linux/include/wordexp.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <sys/types.h>
-
-struct _wordexp_t
-{
-  size_t we_wordc;	/* Count of words matched by words. */
-  char **we_wordv;	/* Pointer to list of expanded words. */
-  size_t we_offs;	/* Slots to reserve at the beginning of we_wordv. */
-};
-
-typedef struct _wordexp_t wordexp_t;
-
-#define	WRDE_DOOFFS	0x0001	/* Use we_offs. */
-#define	WRDE_APPEND	0x0002	/* Append to output from previous call. */
-#define	WRDE_NOCMD	0x0004	/* Don't perform command substitution. */
-#define	WRDE_REUSE	0x0008	/* pwordexp points to a wordexp_t struct returned from
-                                   a previous successful call to wordexp. */
-#define	WRDE_SHOWERR	0x0010	/* Print error messages to stderr. */
-#define	WRDE_UNDEF	0x0020	/* Report attempt to expand undefined shell variable. */
-
-enum {
-  WRDE_SUCCESS,
-  WRDE_NOSPACE,
-  WRDE_BADCHAR,
-  WRDE_BADVAL,
-  WRDE_CMDSUB,
-  WRDE_SYNTAX,
-  WRDE_NOSYS
-};
-
-/* Note: This implementation of wordexp requires a version of bash
-   that supports the --wordexp and --protected arguments to be present
-   on the system.  It does not support the WRDE_UNDEF flag. */
-int wordexp(const char *, wordexp_t *, int);
-void wordfree(wordexp_t *);
diff --git a/newlib/libc/sys/linux/inode.c b/newlib/libc/sys/linux/inode.c
index 837dae3..aee2d1b 100644
--- a/newlib/libc/sys/linux/inode.c
+++ b/newlib/libc/sys/linux/inode.c
@@ -9,90 +9,24 @@
 #include <sys/stat.h>
 #include <sys/utime.h>
 #include <linux/dirent.h>
-#include <machine/syscall.h>
+#include <sys/syscall.h>
 
-#define _LIBC 1
-#include <sys/lock.h>
-
-
-#define __NR___umask __NR_umask
 
 _syscall2(int,link,const char *,oldpath,const char *,newpath)
 _syscall1(int,unlink,const char *,pathname)
 _syscall1(int,chdir,const char *,path)
-_syscall1(int,fchdir,int,fd)
+_syscall3(int,mknod,const char *,pathname,mode_t,mode,dev_t,dev)
+_syscall2(int,chmod,const char *,path,mode_t,mode)
+_syscall2(int,utime,const char *,filename,struct utimbuf *,buf)
 _syscall2(int,access,const char *,filename,int,mode)
 _syscall2(int,mkdir,const char *,pathname,mode_t,mode)
 _syscall1(int,rmdir,const char *,pathname)
+_syscall1(int,pipe,int *,filedes)
+_syscall1(mode_t,umask,mode_t,mask)
 _syscall1(int,chroot,const char *,path)
+_syscall2(int,symlink,const char *,oldpath,const char *,newpath)
+_syscall3(int,readlink,const char *,path,char *,buf,size_t,bufsiz)
 _syscall2(int,stat,const char *,file_name,struct stat *,buf)
-_syscall2(int,statfs,const char *,file_name,struct statfs *,buf)
+_syscall2(int,lstat,const char *,file_name,struct stat *,buf)
 _syscall2(int,fstat,int,filedes,struct stat *,buf)
-_syscall2(int,fstatfs,int,filedes,struct statfs *,buf)
 _syscall3(int,getdents,int,fd,struct dirent *,dirp,unsigned int,count)
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-_syscall2(int,chmod,const char *,path,mode_t,mode)
-_syscall3(int,chown,const char *,path,uid_t,owner,gid_t,group)
-_syscall2(int,fchmod,int,filedes,mode_t,mode)
-_syscall3(int,lchown,const char *,path,uid_t,owner,gid_t,group)
-_syscall2(int,lstat,const char *,file_name,struct stat *,buf)
-_syscall3(int,readlink,const char *,path,char *,buf,size_t,bufsiz)
-_syscall2(int,symlink,const char *,oldpath,const char *,newpath)
-_syscall2(int,utime,const char *,filename,const struct utimbuf *,buf)
-#endif
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3
-_syscall1(int,pipe,int *,filedes)
-#endif
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4
-_syscall3(int,mknod,const char *,pathname,mode_t,mode,dev_t,dev)
-#endif
-
-weak_alias(__libc_statfs,__statfs)
-weak_alias(__libc_fstatfs,__fstatfs)
-
-static _syscall3(int,fchown32,int,fd,uid_t,owner,gid_t,group)
-
-int
-fchown (int fd, uid_t owner, gid_t group)
-{
-  return __libc_fchown32 (fd, owner, group);
-}
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-
-__LOCK_INIT(static, umask_lock);
-
-_syscall1(mode_t,__umask,mode_t,mask)
-
-mode_t
-umask (mode_t mask)
-{
-  mode_t old_mask;
-
-  /* we need to lock so as to not interfere with getumask */
-  __lock_acquire(umask_lock);
-  old_mask = __umask (mask);
-  __lock_release(umask_lock);
-
-  return old_mask;
-}
-
-mode_t
-getumask (void)
-{
-  mode_t mask;
-
-  __lock_acquire(umask_lock);
-
-  mask = __umask (0);
-  mask = __umask (mask);
-
-  __lock_release(umask_lock);
-
-  return mask;
-}
-
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 2 */
diff --git a/newlib/libc/sys/linux/internal_statvfs.c b/newlib/libc/sys/linux/internal_statvfs.c
deleted file mode 100644
index 9efb7c2..0000000
--- a/newlib/libc/sys/linux/internal_statvfs.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-  /* Now fill in the fields we have information for.  */
-  buf->f_bsize = fsbuf.f_bsize;
-  /* Linux does not support f_frsize, so set it to the full block size.  */
-  buf->f_frsize = fsbuf.f_bsize;
-  buf->f_blocks = fsbuf.f_blocks;
-  buf->f_bfree = fsbuf.f_bfree;
-  buf->f_bavail = fsbuf.f_bavail;
-  buf->f_files = fsbuf.f_files;
-  buf->f_ffree = fsbuf.f_ffree;
-  if (sizeof (buf->f_fsid) == sizeof (fsbuf.f_fsid))
-    buf->f_fsid = (fsbuf.f_fsid.__val[0]
-		   | ((unsigned long int) fsbuf.f_fsid.__val[1]
-		      << (8 * (sizeof (buf->f_fsid)
-			       - sizeof (fsbuf.f_fsid.__val[0])))));
-  else
-    /* We cannot help here.  The statvfs element is not large enough to
-       contain both words of the statfs f_fsid field.  */
-    buf->f_fsid = fsbuf.f_fsid.__val[0];
-#ifdef _STATVFSBUF_F_UNUSED
-  buf->__f_unused = 0;
-#endif
-  buf->f_namemax = fsbuf.f_namelen;
-  memset (buf->__f_spare, '\0', 6 * sizeof (int));
-
-  /* What remains to do is to fill the fields f_favail and f_flag.  */
-
-  /* XXX I have no idea how to compute f_favail.  Any idea???  */
-  buf->f_favail = buf->f_ffree;
-
-  /* Determining the flags is tricky.  We have to read /proc/mounts or
-     the /etc/mtab file and search for the entry which matches the given
-     file.  The way we can test for matching filesystem is using the
-     device number.  */
-  buf->f_flag = 0;
-  if (STAT (&st) >= 0)
-    {
-      int save_errno = errno;
-      struct mntent mntbuf;
-      FILE *mtab;
-
-      mtab = __setmntent ("/proc/mounts", "r");
-      if (mtab == NULL)
-	mtab = __setmntent (_PATH_MOUNTED, "r");
-
-      if (mtab != NULL)
-	{
-	  char tmpbuf[1024];
-
-	  while (__getmntent_r (mtab, &mntbuf, tmpbuf, sizeof (tmpbuf)))
-	    {
-	      struct stat64 fsst;
-
-	      /* Find out about the device the current entry is for.  */
-	      if (stat64 (mntbuf.mnt_dir, &fsst) >= 0
-		  && st.st_dev == fsst.st_dev)
-		{
-		  /* Bingo, we found the entry for the device FD is on.
-		     Now interpret the option string.  */
-		  char *cp = mntbuf.mnt_opts;
-		  char *opt;
-
-		  while ((opt = strsep (&cp, ",")) != NULL)
-		    if (strcmp (opt, "ro") == 0)
-		      buf->f_flag |= ST_RDONLY;
-		    else if (strcmp (opt, "nosuid") == 0)
-		      buf->f_flag |= ST_NOSUID;
-		    else if (strcmp (opt, "noexec") == 0)
-		      buf->f_flag |= ST_NOEXEC;
-		    else if (strcmp (opt, "nodev") == 0)
-		      buf->f_flag |= ST_NODEV;
-		    else if (strcmp (opt, "sync") == 0)
-		      buf->f_flag |= ST_SYNCHRONOUS;
-		    else if (strcmp (opt, "mand") == 0)
-		      buf->f_flag |= ST_MANDLOCK;
-		    else if (strcmp (opt, "noatime") == 0)
-		      buf->f_flag |= ST_NOATIME;
-		    else if (strcmp (opt, "nodiratime") == 0)
-		      buf->f_flag |= ST_NODIRATIME;
-
-		  /* We can stop looking for more entries.  */
-		  break;
-		}
-	    }
-
-	  /* Close the file.  */
-	  __endmntent (mtab);
-	}
-
-      errno = (save_errno);
-    }
diff --git a/newlib/libc/sys/linux/intl/Makefile.am b/newlib/libc/sys/linux/intl/Makefile.am
deleted file mode 100644
index e484b2b..0000000
--- a/newlib/libc/sys/linux/intl/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES = \
-	bindtextdom.c catgets.c dcgettext.c dgettext.c gettext.c       \
-	dcigettext.c dcngettext.c dngettext.c ngettext.c open_catalog.c \
-	finddomain.c loadmsgcat.c localealias.c textdomain.c \
-	l10nflist.c explodename.c plural.c stpcpy.c
-
-
-libintl_la_LDFLAGS = -Xcompiler -nostdlib
-
-msgcatdir = /usr/share/locale
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libintl.la
-libintl_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(LIB_SOURCES)
-noinst_DATA = 
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../../../Makefile.shared
-
-AM_CFLAGS = -DNOT_IN_libc -DHAVE_CONFIG_H -D_GNU_SOURCE -D__libc_enable_secure=1 -D'LOCALEDIR="$(msgcatdir)"' -D'LOCALE_ALIAS_PATH="$(msgcatdir)"' -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"'
-
-# shouldn't have to do the following, but if needed
-BISONFLAGS = --yacc --name-prefix=__gettext --output
-plural.c: plural.y
-	$(BISON) $(BISONFLAGS) $@ $^
-
diff --git a/newlib/libc/sys/linux/intl/Makefile.in b/newlib/libc/sys/linux/intl/Makefile.in
deleted file mode 100644
index 6f222d8..0000000
--- a/newlib/libc/sys/linux/intl/Makefile.in
+++ /dev/null
@@ -1,384 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-EXTRA_SUBDIRS = @EXTRA_SUBDIRS@
-EXTRA_SUBLIBS = @EXTRA_SUBLIBS@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LINUX_MACH_LIB = @LINUX_MACH_LIB@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir)/.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES =  	bindtextdom.c catgets.c dcgettext.c dgettext.c gettext.c       	dcigettext.c dcngettext.c dngettext.c ngettext.c open_catalog.c 	finddomain.c loadmsgcat.c localealias.c textdomain.c 	l10nflist.c explodename.c plural.c stpcpy.c
-
-
-libintl_la_LDFLAGS = -Xcompiler -nostdlib
-
-msgcatdir = /usr/share/locale
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libintl.la
-@USE_LIBTOOL_TRUE@libintl_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
-
-AM_CFLAGS = -DNOT_IN_libc -DHAVE_CONFIG_H -D_GNU_SOURCE -D__libc_enable_secure=1 -D'LOCALEDIR="$(msgcatdir)"' -D'LOCALE_ALIAS_PATH="$(msgcatdir)"' -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"'
-
-# shouldn't have to do the following, but if needed
-BISONFLAGS = --yacc --name-prefix=__gettext --output
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  bindtextdom.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@catgets.$(OBJEXT) dcgettext.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dgettext.$(OBJEXT) gettext.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dcigettext.$(OBJEXT) dcngettext.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dngettext.$(OBJEXT) ngettext.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@open_catalog.$(OBJEXT) finddomain.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@loadmsgcat.$(OBJEXT) localealias.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@textdomain.$(OBJEXT) l10nflist.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@explodename.$(OBJEXT) plural.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@stpcpy.$(OBJEXT)
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-libintl_la_LIBADD = 
-@USE_LIBTOOL_TRUE@libintl_la_OBJECTS =  bindtextdom.lo catgets.lo \
-@USE_LIBTOOL_TRUE@dcgettext.lo dgettext.lo gettext.lo dcigettext.lo \
-@USE_LIBTOOL_TRUE@dcngettext.lo dngettext.lo ngettext.lo \
-@USE_LIBTOOL_TRUE@open_catalog.lo finddomain.lo loadmsgcat.lo \
-@USE_LIBTOOL_TRUE@localealias.lo textdomain.lo l10nflist.lo \
-@USE_LIBTOOL_TRUE@explodename.lo plural.lo stpcpy.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(libintl_la_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(libintl_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus intl/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-libintl.la: $(libintl_la_OBJECTS) $(libintl_la_DEPENDENCIES)
-	$(LINK)  $(libintl_la_LDFLAGS) $(libintl_la_OBJECTS) $(libintl_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = intl
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-noinstLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
-distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-plural.c: plural.y
-	$(BISON) $(BISONFLAGS) $@ $^
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/linux/intl/bindtextdom.c b/newlib/libc/sys/linux/intl/bindtextdom.c
deleted file mode 100644
index afd5030..0000000
--- a/newlib/libc/sys/linux/intl/bindtextdom.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-#include "gettextP.h"
-
-#ifdef _LIBC
-/* We have to handle multi-threaded applications.  */
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_dirname _nl_default_dirname__
-# define _nl_domain_bindings _nl_domain_bindings__
-#endif
-
-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
-#ifndef offsetof
-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Contains the default location of the message catalogs.  */
-extern const char _nl_default_dirname[];
-
-/* List with bindings of specific domains.  */
-extern struct binding *_nl_domain_bindings;
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define BINDTEXTDOMAIN __bindtextdomain
-# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
-# ifdef _GLIBC
-#  ifndef strdup
-#   define strdup(str) __strdup (str)
-#  endif
-# endif
-#else
-# define BINDTEXTDOMAIN bindtextdomain__
-# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__
-#endif
-
-/* Prototypes for local functions.  */
-static void set_binding_values PARAMS ((const char *domainname,
-					const char **dirnamep,
-					const char **codesetp));
-
-/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
-   to be used for the DOMAINNAME message catalog.
-   If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
-   modified, only the current value is returned.
-   If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
-   modified nor returned.  */
-static void
-set_binding_values (domainname, dirnamep, codesetp)
-     const char *domainname;
-     const char **dirnamep;
-     const char **codesetp;
-{
-  struct binding *binding;
-  int modified;
-
-  /* Some sanity checks.  */
-  if (domainname == NULL || domainname[0] == '\0')
-    {
-      if (dirnamep)
-	*dirnamep = NULL;
-      if (codesetp)
-	*codesetp = NULL;
-      return;
-    }
-
-  __libc_rwlock_wrlock (_nl_state_lock);
-
-  modified = 0;
-
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding != NULL)
-    {
-      if (dirnamep)
-	{
-	  const char *dirname = *dirnamep;
-
-	  if (dirname == NULL)
-	    /* The current binding has be to returned.  */
-	    *dirnamep = binding->dirname;
-	  else
-	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->dirname;
-	      if (strcmp (dirname, result) != 0)
-		{
-		  if (strcmp (dirname, _nl_default_dirname) == 0)
-		    result = (char *) _nl_default_dirname;
-		  else
-		    {
-#if defined _LIBC || defined HAVE_STRDUP
-		      result = strdup (dirname);
-#else
-		      size_t len = strlen (dirname) + 1;
-		      result = (char *) malloc (len);
-		      if (__builtin_expect (result != NULL, 1))
-			memcpy (result, dirname, len);
-#endif
-		    }
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->dirname != _nl_default_dirname)
-			free (binding->dirname);
-
-		      binding->dirname = result;
-		      modified = 1;
-		    }
-		}
-	      *dirnamep = result;
-	    }
-	}
-
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset == NULL)
-	    /* The current binding has be to returned.  */
-	    *codesetp = binding->codeset;
-	  else
-	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->codeset;
-	      if (result == NULL || strcmp (codeset, result) != 0)
-		{
-#if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (codeset);
-#else
-		  size_t len = strlen (codeset) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result != NULL, 1))
-		    memcpy (result, codeset, len);
-#endif
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->codeset != NULL)
-			free (binding->codeset);
-
-		      binding->codeset = result;
-		      ++binding->codeset_cntr;
-		      modified = 1;
-		    }
-		}
-	      *codesetp = result;
-	    }
-	}
-    }
-  else if ((dirnamep == NULL || *dirnamep == NULL)
-	   && (codesetp == NULL || *codesetp == NULL))
-    {
-      /* Simply return the default values.  */
-      if (dirnamep)
-	*dirnamep = _nl_default_dirname;
-      if (codesetp)
-	*codesetp = NULL;
-    }
-  else
-    {
-      /* We have to create a new binding.  */
-      size_t len = strlen (domainname) + 1;
-      struct binding *new_binding =
-	(struct binding *) malloc (offsetof (struct binding, domainname) + len);
-
-      if (__builtin_expect (new_binding == NULL, 0))
-	goto failed;
-
-      memcpy (new_binding->domainname, domainname, len);
-
-      if (dirnamep)
-	{
-	  const char *dirname = *dirnamep;
-
-	  if (dirname == NULL)
-	    /* The default value.  */
-	    dirname = _nl_default_dirname;
-	  else
-	    {
-	      if (strcmp (dirname, _nl_default_dirname) == 0)
-		dirname = _nl_default_dirname;
-	      else
-		{
-		  char *result;
-#if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (dirname);
-		  if (__builtin_expect (result == NULL, 0))
-		    goto failed_dirname;
-#else
-		  size_t len = strlen (dirname) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result == NULL, 0))
-		    goto failed_dirname;
-		  memcpy (result, dirname, len);
-#endif
-		  dirname = result;
-		}
-	    }
-	  *dirnamep = dirname;
-	  new_binding->dirname = (char *) dirname;
-	}
-      else
-	/* The default value.  */
-	new_binding->dirname = (char *) _nl_default_dirname;
-
-      new_binding->codeset_cntr = 0;
-
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset != NULL)
-	    {
-	      char *result;
-
-#if defined _LIBC || defined HAVE_STRDUP
-	      result = strdup (codeset);
-	      if (__builtin_expect (result == NULL, 0))
-		goto failed_codeset;
-#else
-	      size_t len = strlen (codeset) + 1;
-	      result = (char *) malloc (len);
-	      if (__builtin_expect (result == NULL, 0))
-		goto failed_codeset;
-	      memcpy (result, codeset, len);
-#endif
-	      codeset = result;
-	      ++new_binding->codeset_cntr;
-	    }
-	  *codesetp = codeset;
-	  new_binding->codeset = (char *) codeset;
-	}
-      else
-	new_binding->codeset = NULL;
-
-      /* Now enqueue it.  */
-      if (_nl_domain_bindings == NULL
-	  || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
-	{
-	  new_binding->next = _nl_domain_bindings;
-	  _nl_domain_bindings = new_binding;
-	}
-      else
-	{
-	  binding = _nl_domain_bindings;
-	  while (binding->next != NULL
-		 && strcmp (domainname, binding->next->domainname) > 0)
-	    binding = binding->next;
-
-	  new_binding->next = binding->next;
-	  binding->next = new_binding;
-	}
-
-      modified = 1;
-
-      /* Here we deal with memory allocation failures.  */
-      if (0)
-	{
-	failed_codeset:
-	  if (new_binding->dirname != _nl_default_dirname)
-	    free (new_binding->dirname);
-	failed_dirname:
-	  free (new_binding);
-	failed:
-	  if (dirnamep)
-	    *dirnamep = NULL;
-	  if (codesetp)
-	    *codesetp = NULL;
-	}
-    }
-
-  /* If we modified any binding, we flush the caches.  */
-  if (modified)
-    ++_nl_msg_cat_cntr;
-
-  __libc_rwlock_unlock (_nl_state_lock);
-}
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *
-BINDTEXTDOMAIN (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  set_binding_values (domainname, &dirname, NULL);
-  return (char *) dirname;
-}
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-char *
-BIND_TEXTDOMAIN_CODESET (domainname, codeset)
-     const char *domainname;
-     const char *codeset;
-{
-  set_binding_values (domainname, NULL, &codeset);
-  return (char *) codeset;
-}
-
-#ifdef _LIBC
-/* Aliases for function names in GNU C Library.  */
-weak_alias (__bindtextdomain, bindtextdomain);
-weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
-#endif
diff --git a/newlib/libc/sys/linux/intl/catgets.c b/newlib/libc/sys/linux/intl/catgets.c
deleted file mode 100644
index b11cc59..0000000
--- a/newlib/libc/sys/linux/intl/catgets.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper, <drepper@gnu.org>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <alloca.h>
-#include <errno.h>
-#include <locale.h>
-#include <nl_types.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/mman.h>
-
-#include "catgetsinfo.h"
-
-
-/* Open the catalog and return a descriptor for the catalog.  */
-nl_catd
-catopen (const char *cat_name, int flag)
-{
-  __nl_catd result;
-  const char *env_var = NULL;
-  const char *nlspath = NULL;
-
-  if (strchr (cat_name, '/') == NULL)
-    {
-      if (flag == NL_CAT_LOCALE)
-	/* Use the current locale setting for LC_MESSAGES.  */
-	env_var = setlocale (LC_MESSAGES, NULL);
-      else
-	/* Use the LANG environment variable.  */
-	env_var = getenv ("LANG");
-
-      if (env_var == NULL || *env_var == '\0'
-	  || (__libc_enable_secure && strchr (env_var, '/') != NULL))
-	env_var = "C";
-
-      nlspath = getenv ("NLSPATH");
-      if (nlspath != NULL && *nlspath != '\0')
-	{
-	  /* Append the system dependent directory.  */
-	  size_t len = strlen (nlspath) + 1 + sizeof NLSPATH;
-	  char *tmp = alloca (len);
-
-	  __stpcpy (__stpcpy (__stpcpy (tmp, nlspath), ":"), NLSPATH);
-	  nlspath = tmp;
-	}
-      else
-	nlspath = NLSPATH;
-    }
-
-  result = (__nl_catd) malloc (sizeof (*result));
-  if (result == NULL)
-    /* We cannot get enough memory.  */
-    return (nl_catd) -1;
-
-  if (__open_catalog (cat_name, nlspath, env_var, result) != 0)
-    /* Couldn't open the file.  */
-    return (nl_catd) -1;
-
-  return (nl_catd) result;
-}
-
-
-/* Return message from message catalog.  */
-char *
-catgets (nl_catd catalog_desc, int set, int message, const char *string)
-{
-  __nl_catd catalog;
-  size_t idx;
-  size_t cnt;
-
-  /* Be generous if catalog which failed to be open is used.  */
-  if (catalog_desc == (nl_catd) -1 || ++set <= 0 || message < 0)
-    return (char *) string;
-
-  catalog = (__nl_catd) catalog_desc;
-
-  idx = ((set * message) % catalog->plane_size) * 3;
-  cnt = 0;
-  do
-    {
-      if (catalog->name_ptr[idx + 0] == (u_int32_t) set
-	  && catalog->name_ptr[idx + 1] == (u_int32_t) message)
-	return (char *) &catalog->strings[catalog->name_ptr[idx + 2]];
-
-      idx += catalog->plane_size * 3;
-    }
-  while (++cnt < catalog->plane_depth);
-
-  __set_errno (ENOMSG);
-  return (char *) string;
-}
-
-
-/* Return resources used for loaded message catalog.  */
-int
-catclose (nl_catd catalog_desc)
-{
-  __nl_catd catalog;
-
-  /* Be generous if catalog which failed to be open is used.  */
-  if (catalog_desc == (nl_catd) -1)
-    {
-      __set_errno (EBADF);
-      return -1;
-    }
-
-  catalog = (__nl_catd) catalog_desc;
-
-#ifdef _POSIX_MAPPED_FILES
-  if (catalog->status == mmapped)
-    __munmap ((void *) catalog->file_ptr, catalog->file_size);
-  else
-#endif	/* _POSIX_MAPPED_FILES */
-    if (catalog->status == malloced)
-      free ((void *) catalog->file_ptr);
-    else
-      {
-	__set_errno (EBADF);
-	return -1;
-      }
-
-  free ((void *) catalog);
-
-  return 0;
-}
diff --git a/newlib/libc/sys/linux/intl/catgetsinfo.h b/newlib/libc/sys/linux/intl/catgetsinfo.h
deleted file mode 100644
index d4aa003..0000000
--- a/newlib/libc/sys/linux/intl/catgetsinfo.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sys/types.h>
-
-
-struct catalog_obj
-{
-  u_int32_t magic;
-  u_int32_t plane_size;
-  u_int32_t plane_depth;
-  /* This is in fact two arrays in one: always a pair of name and
-     pointer into the data area.  */
-  u_int32_t name_ptr[0];
-};
-
-
-/* This structure will be filled after loading the catalog.  */
-typedef struct catalog_info
-{
-  enum { mmapped, malloced } status;
-
-  size_t plane_size;
-  size_t plane_depth;
-  u_int32_t *name_ptr;
-  const char *strings;
-
-  struct catalog_obj *file_ptr;
-  size_t file_size;
-} *__nl_catd;
-
-
-
-/* The magic number to signal we really have a catalog file.  */
-#define CATGETS_MAGIC 0x960408de
-
-
-/* Prototypes for helper functions.  */
-extern int __open_catalog (const char *cat_name, const char *nlspath,
-			   const char *env_var, __nl_catd __catalog);
diff --git a/newlib/libc/sys/linux/intl/config.h b/newlib/libc/sys/linux/intl/config.h
deleted file mode 100644
index 69de0ab..0000000
--- a/newlib/libc/sys/linux/intl/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#define HAVE_ICONV 1
-#define HAVE_STRING_H 1
-#define HAVE_MEMPCPY 1
-#define HAVE_STRCHR 1
-#define HAVE_STRDUP 1
-#define HAVE_MMAP 1
-#define HAVE_STRTOUL 1
-#define HAVE_ALLOCA_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_STRCASECMP 1
-#define HAVE_WEAK_SYMBOLS 1
-#define HAVE_GNU_LD 1
-#define HAVE_ELF 1
-#define __ASSUME_REALTIME_SIGNALS 1
-#define ASM_GLOBAL_DIRECTIVE .global
-
-#define TEMP_FAILURE_RETRY(expression) \
-  (__extension__                                                              \
-    ({ long int __result;                                                     \
-       do __result = (long int) (expression);                                 \
-       while (__result == -1L && errno == EINTR);                             \
-       __result; }))
-
-#define UINT32_C(c)    c ## U
-
-#include <machine/sysdep.h>
-#include <features.h>
-
-#define _LIBC 1
diff --git a/newlib/libc/sys/linux/intl/dcgettext.c b/newlib/libc/sys/linux/intl/dcgettext.c
deleted file mode 100644
index c250da4..0000000
--- a/newlib/libc/sys/linux/intl/dcgettext.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCGETTEXT __dcgettext
-# define DCIGETTEXT __dcigettext
-#else
-# define DCGETTEXT dcgettext__
-# define DCIGETTEXT dcigettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCGETTEXT (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
-{
-  return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dcgettext, dcgettext);
-#endif
diff --git a/newlib/libc/sys/linux/intl/dcigettext.c b/newlib/libc/sys/linux/intl/dcigettext.c
deleted file mode 100644
index de47064..0000000
--- a/newlib/libc/sys/linux/intl/dcigettext.c
+++ /dev/null
@@ -1,1286 +0,0 @@
-/* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <newlib.h>
-
-#ifdef _MB_CAPABLE
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-
-#if defined __GNUC__ && !defined C_ALLOCA
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if (defined HAVE_ALLOCA_H || defined _LIBC) && !defined C_ALLOCA
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stddef.h>
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
-
-#if defined HAVE_SYS_PARAM_H || defined _LIBC
-# include <sys/param.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-#include "hash-string.h"
-
-/* Thread safetyness.  */
-#ifdef _LIBC
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_lock_define_initialized(CLASS, NAME)
-# define __libc_lock_lock(NAME)
-# define __libc_lock_unlock(NAME)
-# define __libc_rwlock_define_initialized(CLASS, NAME)
-# define __libc_rwlock_rdlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* Alignment of types.  */
-#if defined __GNUC__ && __GNUC__ >= 2
-# define alignof(TYPE) __alignof__ (TYPE)
-#else
-# define alignof(TYPE) \
-    ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_default_domain _nl_default_default_domain__
-# define _nl_current_default_domain _nl_current_default_domain__
-# define _nl_default_dirname _nl_default_dirname__
-# define _nl_domain_bindings _nl_domain_bindings__
-#endif
-
-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
-#ifndef offsetof
-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _GLIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define getcwd __getcwd
-# ifndef stpcpy
-#  define stpcpy __stpcpy
-# endif
-# define tfind __tfind
-#else
-# if !defined HAVE_GETCWD
-char *getwd ();
-#  define getcwd(buf, max) getwd (buf)
-# else
-char *getcwd ();
-# endif
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-# ifndef HAVE_MEMPCPY
-static void *mempcpy PARAMS ((void *dest, const void *src, size_t n));
-# endif
-#endif
-
-/* Amount to increase buffer size by in each try.  */
-#define PATH_INCR 32
-
-/* The following is from pathmax.h.  */
-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
-   PATH_MAX but might cause redefinition warnings when sys/param.h is
-   later included (as on MORE/BSD 4.3).  */
-#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
-# include <limits.h>
-#endif
-
-#ifndef _POSIX_PATH_MAX
-# define _POSIX_PATH_MAX 255
-#endif
-
-#if !defined PATH_MAX && defined _PC_PATH_MAX
-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
-#endif
-
-/* Don't include sys/param.h if it already has been.  */
-#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
-# include <sys/param.h>
-#endif
-
-#if !defined PATH_MAX && defined MAXPATHLEN
-# define PATH_MAX MAXPATHLEN
-#endif
-
-#ifndef PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
-   ``Directs `setlocale()' to query `category' and return the current
-     setting of `local'.''
-   However it does not specify the exact format.  Neither do SUSV2 and
-   ISO C 99.  So we can use this feature only on selected systems (e.g.
-   those using GNU C Library).  */
-#ifdef _LIBC
-# define HAVE_LOCALE_NULL
-#endif
-
-/* This is the type used for the search tree where known translations
-   are stored.  */
-struct known_translation_t
-{
-  /* Domain in which to search.  */
-  char *domainname;
-
-  /* The category.  */
-  int category;
-
-  /* State of the catalog counter at the point the string was found.  */
-  int counter;
-
-  /* Catalog where the string was found.  */
-  struct loaded_l10nfile *domain;
-
-  /* And finally the translation.  */
-  const char *translation;
-  size_t translation_length;
-
-  /* Pointer to the string in question.  */
-  char msgid[ZERO];
-};
-
-/* Root of the search tree with known translations.  We can use this
-   only if the system provides the `tsearch' function family.  */
-#if defined HAVE_TSEARCH || defined _LIBC
-# include <search.h>
-
-static void *root;
-
-# ifdef _GLIBC
-#  define tsearch __tsearch
-# endif
-
-/* Function to compare two entries in the table of known translations.  */
-static int transcmp PARAMS ((const void *p1, const void *p2));
-static int
-transcmp (p1, p2)
-     const void *p1;
-     const void *p2;
-{
-  const struct known_translation_t *s1;
-  const struct known_translation_t *s2;
-  int result;
-
-  s1 = (const struct known_translation_t *) p1;
-  s2 = (const struct known_translation_t *) p2;
-
-  result = strcmp (s1->msgid, s2->msgid);
-  if (result == 0)
-    {
-      result = strcmp (s1->domainname, s2->domainname);
-      if (result == 0)
-	/* We compare the category last (though this is the cheapest
-	   operation) since it is hopefully always the same (namely
-	   LC_MESSAGES).  */
-	result = s1->category - s2->category;
-    }
-
-  return result;
-}
-#endif
-
-/* Name of the default domain used for gettext(3) prior any call to
-   textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] = "messages";
-
-/* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain = _nl_default_default_domain;
-
-/* Contains the default location of the message catalogs.  */
-const char _nl_default_dirname[] = LOCALEDIR;
-
-/* List with bindings of specific domains created by bindtextdomain()
-   calls.  */
-struct binding *_nl_domain_bindings;
-
-/* Prototypes for local functions.  */
-static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain,
-				    unsigned long int n,
-				    const char *translation,
-				    size_t translation_len))
-     internal_function;
-static unsigned long int plural_eval PARAMS ((struct expression *pexp,
-					      unsigned long int n))
-     internal_function;
-static const char *category_to_name PARAMS ((int category)) internal_function;
-static const char *guess_category_value PARAMS ((int category,
-						 const char *categoryname))
-     internal_function;
-
-
-/* For those loosing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
-
-
-#ifdef _LIBC
-/* List of blocks allocated for translations.  */
-typedef struct transmem_list
-{
-  struct transmem_list *next;
-  char data[ZERO];
-} transmem_block_t;
-static struct transmem_list *transmem_list;
-#else
-typedef unsigned char transmem_block_t;
-#endif
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCIGETTEXT __dcigettext
-#else
-# define DCIGETTEXT dcigettext__
-#endif
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define_initialized (, _nl_state_lock)
-
-/* Checking whether the binaries runs SUID must be done and glibc provides
-   easier methods therefore we make a difference here.  */
-#ifdef _LIBC
-# define ENABLE_SECURE __libc_enable_secure
-# define DETERMINE_SECURE
-#else
-static int enable_secure;
-# define ENABLE_SECURE (enable_secure == 1)
-# define DETERMINE_SECURE \
-  if (enable_secure == 0)						      \
-    {									      \
-      if (getuid () != geteuid () || getgid () != getegid ())		      \
-	enable_secure = 1;						      \
-      else								      \
-	enable_secure = -1;						      \
-    }
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   CATEGORY locale and, if PLURAL is nonzero, search over string
-   depending on the plural form determined by N.  */
-char *
-DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     int plural;
-     unsigned long int n;
-     int category;
-{
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
-  struct loaded_l10nfile *domain;
-  struct binding *binding;
-  const char *categoryname;
-  const char *categoryvalue;
-  char *dirname, *xdomainname;
-  char *single_locale;
-  char *retval;
-  size_t retlen;
-  int saved_errno;
-#if defined HAVE_TSEARCH || defined _LIBC
-  struct known_translation_t *search;
-  struct known_translation_t **foundp = NULL;
-  size_t msgid_len;
-#endif
-  size_t domainname_len;
-
-  /* If no real MSGID is given return NULL.  */
-  if (msgid1 == NULL)
-    return NULL;
-
-  __libc_rwlock_rdlock (_nl_state_lock);
-
-  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
-     CATEGORY is not LC_MESSAGES this might not make much sense but the
-     definition left this undefined.  */
-  if (domainname == NULL)
-    domainname = _nl_current_default_domain;
-
-#if defined HAVE_TSEARCH || defined _LIBC
-  msgid_len = strlen (msgid1) + 1;
-
-  /* Try to find the translation among those which we found at
-     some time.  */
-  search = (struct known_translation_t *)
-	   alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
-  memcpy (search->msgid, msgid1, msgid_len);
-  search->domainname = (char *) domainname;
-  search->category = category;
-
-  foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
-  if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
-    {
-      /* Now deal with plural.  */
-      if (plural)
-	retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
-				(*foundp)->translation_length);
-      else
-	retval = (char *) (*foundp)->translation;
-
-      __libc_rwlock_unlock (_nl_state_lock);
-      return retval;
-    }
-#endif
-
-  /* Preserve the `errno' value.  */
-  saved_errno = errno;
-
-  /* See whether this is a SUID binary or not.  */
-  DETERMINE_SECURE;
-
-  /* First find matching binding.  */
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding == NULL)
-    dirname = (char *) _nl_default_dirname;
-  else if (binding->dirname[0] == '/')
-    dirname = binding->dirname;
-  else
-    {
-      /* We have a relative path.  Make it absolute now.  */
-      size_t dirname_len = strlen (binding->dirname) + 1;
-      size_t path_max;
-      char *ret;
-
-      path_max = (unsigned int) PATH_MAX;
-      path_max += 2;		/* The getcwd docs say to do this.  */
-
-      dirname = (char *) alloca (path_max + dirname_len);
-      ADD_BLOCK (block_list, dirname);
-
-      __set_errno (0);
-      while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
-	{
-	  path_max += PATH_INCR;
-	  dirname = (char *) alloca (path_max + dirname_len);
-	  ADD_BLOCK (block_list, dirname);
-	  __set_errno (0);
-	}
-
-      if (ret == NULL)
-	{
-	  /* We cannot get the current working directory.  Don't signal an
-	     error but simply return the default string.  */
-	  FREE_BLOCKS (block_list);
-	  __libc_rwlock_unlock (_nl_state_lock);
-	  __set_errno (saved_errno);
-	  return (plural == 0
-		  ? (char *) msgid1
-		  /* Use the Germanic plural rule.  */
-		  : n == 1 ? (char *) msgid1 : (char *) msgid2);
-	}
-
-      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
-    }
-
-  /* Now determine the symbolic name of CATEGORY and its value.  */
-  categoryname = category_to_name (category);
-  categoryvalue = guess_category_value (category, categoryname);
-
-  domainname_len = strlen (domainname);
-  xdomainname = (char *) alloca (strlen (categoryname)
-				 + domainname_len + 5);
-  ADD_BLOCK (block_list, xdomainname);
-
-  stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
-		  domainname, domainname_len),
-	  ".mo");
-
-  /* Creating working area.  */
-  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
-  ADD_BLOCK (block_list, single_locale);
-
-
-  /* Search for the given string.  This is a loop because we perhaps
-     got an ordered list of languages to consider for the translation.  */
-  while (1)
-    {
-      /* Make CATEGORYVALUE point to the next element of the list.  */
-      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
-	++categoryvalue;
-      if (categoryvalue[0] == '\0')
-	{
-	  /* The whole contents of CATEGORYVALUE has been searched but
-	     no valid entry has been found.  We solve this situation
-	     by implicitly appending a "C" entry, i.e. no translation
-	     will take place.  */
-	  single_locale[0] = 'C';
-	  single_locale[1] = '\0';
-	}
-      else
-	{
-	  char *cp = single_locale;
-	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
-	    *cp++ = *categoryvalue++;
-	  *cp = '\0';
-
-	  /* When this is a SUID binary we must not allow accessing files
-	     outside the dedicated directories.  */
-	  if (ENABLE_SECURE && strchr (single_locale, '/') != NULL)
-	    /* Ingore this entry.  */
-	    continue;
-	}
-
-      /* If the current locale value is C (or POSIX) we don't load a
-	 domain.  Return the MSGID.  */
-      if (strcmp (single_locale, "C") == 0
-	  || strcmp (single_locale, "POSIX") == 0)
-	{
-	  FREE_BLOCKS (block_list);
-	  __libc_rwlock_unlock (_nl_state_lock);
-	  __set_errno (saved_errno);
-	  return (plural == 0
-		  ? (char *) msgid1
-		  /* Use the Germanic plural rule.  */
-		  : n == 1 ? (char *) msgid1 : (char *) msgid2);
-	}
-
-
-      /* Find structure describing the message catalog matching the
-	 DOMAINNAME and CATEGORY.  */
-      domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
-
-      if (domain != NULL)
-	{
-	  retval = _nl_find_msg (domain, binding, msgid1, &retlen);
-
-	  if (retval == NULL)
-	    {
-	      int cnt;
-
-	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
-		{
-		  retval = _nl_find_msg (domain->successor[cnt], binding,
-					 msgid1, &retlen);
-
-		  if (retval != NULL)
-		    {
-		      domain = domain->successor[cnt];
-		      break;
-		    }
-		}
-	    }
-
-	  if (retval != NULL)
-	    {
-	      /* Found the translation of MSGID1 in domain DOMAIN:
-		 starting at RETVAL, RETLEN bytes.  */
-	      FREE_BLOCKS (block_list);
-	      __set_errno (saved_errno);
-#if defined HAVE_TSEARCH || defined _LIBC
-	      if (foundp == NULL)
-		{
-		  /* Create a new entry and add it to the search tree.  */
-		  struct known_translation_t *newp;
-
-		  newp = (struct known_translation_t *)
-		    malloc (offsetof (struct known_translation_t, msgid)
-			    + msgid_len + domainname_len + 1);
-		  if (newp != NULL)
-		    {
-		      newp->domainname =
-			mempcpy (newp->msgid, msgid1, msgid_len);
-		      memcpy (newp->domainname, domainname, domainname_len + 1);
-		      newp->category = category;
-		      newp->counter = _nl_msg_cat_cntr;
-		      newp->domain = domain;
-		      newp->translation = retval;
-		      newp->translation_length = retlen;
-
-		      /* Insert the entry in the search tree.  */
-		      foundp = (struct known_translation_t **)
-			tsearch (newp, &root, transcmp);
-		      if (foundp == NULL
-			  || __builtin_expect (*foundp != newp, 0))
-			/* The insert failed.  */
-			free (newp);
-		    }
-		}
-	      else
-		{
-		  /* We can update the existing entry.  */
-		  (*foundp)->counter = _nl_msg_cat_cntr;
-		  (*foundp)->domain = domain;
-		  (*foundp)->translation = retval;
-		  (*foundp)->translation_length = retlen;
-		}
-#endif
-	      /* Now deal with plural.  */
-	      if (plural)
-		retval = plural_lookup (domain, n, retval, retlen);
-
-	      __libc_rwlock_unlock (_nl_state_lock);
-	      return retval;
-	    }
-	}
-    }
-  /* NOTREACHED */
-}
-
-
-char *
-internal_function
-_nl_find_msg (domain_file, domainbinding, msgid, lengthp)
-     struct loaded_l10nfile *domain_file;
-     struct binding *domainbinding;
-     const char *msgid;
-     size_t *lengthp;
-{
-  struct loaded_domain *domain;
-  size_t act;
-  char *result;
-  size_t resultlen;
-
-  if (domain_file->decided == 0)
-    _nl_load_domain (domain_file, domainbinding);
-
-  if (domain_file->data == NULL)
-    return NULL;
-
-  domain = (struct loaded_domain *) domain_file->data;
-
-  /* Locate the MSGID and its translation.  */
-  if (domain->hash_size > 2 && domain->hash_tab != NULL)
-    {
-      /* Use the hashing table.  */
-      nls_uint32 len = strlen (msgid);
-      nls_uint32 hash_val = hash_string (msgid);
-      nls_uint32 idx = hash_val % domain->hash_size;
-      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
-
-      while (1)
-	{
-	  nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
-
-	  if (nstr == 0)
-	    /* Hash table entry is empty.  */
-	    return NULL;
-
-	  /* Compare msgid with the original string at index nstr-1.
-	     We compare the lengths with >=, not ==, because plural entries
-	     are represented by strings with an embedded NUL.  */
-	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) >= len
-	      && (strcmp (msgid,
-			  domain->data + W (domain->must_swap,
-					    domain->orig_tab[nstr - 1].offset))
-		  == 0))
-	    {
-	      act = nstr - 1;
-	      goto found;
-	    }
-
-	  if (idx >= domain->hash_size - incr)
-	    idx -= domain->hash_size - incr;
-	  else
-	    idx += incr;
-	}
-      /* NOTREACHED */
-    }
-  else
-    {
-      /* Try the default method:  binary search in the sorted array of
-	 messages.  */
-      size_t top, bottom;
-
-      bottom = 0;
-      top = domain->nstrings;
-      while (bottom < top)
-	{
-	  int cmp_val;
-
-	  act = (bottom + top) / 2;
-	  cmp_val = strcmp (msgid, (domain->data
-				    + W (domain->must_swap,
-					 domain->orig_tab[act].offset)));
-	  if (cmp_val < 0)
-	    top = act;
-	  else if (cmp_val > 0)
-	    bottom = act + 1;
-	  else
-	    goto found;
-	}
-      /* No translation was found.  */
-      return NULL;
-    }
-
- found:
-  /* The translation was found at index ACT.  If we have to convert the
-     string to use a different character set, this is the time.  */
-  result = ((char *) domain->data
-	    + W (domain->must_swap, domain->trans_tab[act].offset));
-  resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
-
-#if defined _LIBC || HAVE_ICONV
-  if (domain->codeset_cntr
-      != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
-    {
-      /* The domain's codeset has changed through bind_textdomain_codeset()
-	 since the message catalog was initialized or last accessed.  We
-	 have to reinitialize the converter.  */
-      _nl_free_domain_conv (domain);
-      _nl_init_domain_conv (domain_file, domain, domainbinding);
-    }
-
-  if (
-# ifdef _GLIBC
-      domain->conv != (__gconv_t) -1
-# else
-#  if HAVE_ICONV
-      domain->conv != (iconv_t) -1
-#  endif
-# endif
-      )
-    {
-      /* We are supposed to do a conversion.  First allocate an
-	 appropriate table with the same structure as the table
-	 of translations in the file, where we can put the pointers
-	 to the converted strings in.
-	 There is a slight complication with plural entries.  They
-	 are represented by consecutive NUL terminated strings.  We
-	 handle this case by converting RESULTLEN bytes, including
-	 NULs.  */
-
-      if (domain->conv_tab == NULL
-	  && ((domain->conv_tab = (char **) calloc (domain->nstrings,
-						    sizeof (char *)))
-	      == NULL))
-	/* Mark that we didn't succeed allocating a table.  */
-	domain->conv_tab = (char **) -1;
-
-      if (__builtin_expect (domain->conv_tab == (char **) -1, 0))
-	/* Nothing we can do, no more memory.  */
-	goto converted;
-
-      if (domain->conv_tab[act] == NULL)
-	{
-	  /* We haven't used this string so far, so it is not
-	     translated yet.  Do this now.  */
-	  /* We use a bit more efficient memory handling.
-	     We allocate always larger blocks which get used over
-	     time.  This is faster than many small allocations.   */
-	  __libc_lock_define_initialized (static, lock)
-# define INITIAL_BLOCK_SIZE	4080
-	  static unsigned char *freemem;
-	  static size_t freemem_size;
-
-	  const unsigned char *inbuf;
-	  unsigned char *outbuf;
-	  int malloc_count;
-# ifndef _LIBC
-	  transmem_block_t *transmem_list = NULL;
-# endif
-
-	  __libc_lock_lock (lock);
-
-	  inbuf = (const unsigned char *) result;
-	  outbuf = freemem + sizeof (size_t);
-
-	  malloc_count = 0;
-	  while (1)
-	    {
-	      transmem_block_t *newmem;
-# ifdef _GLIBC
-	      size_t non_reversible;
-	      int res;
-
-	      if (freemem_size < sizeof (size_t))
-		goto resize_freemem;
-
-	      res = __gconv (domain->conv,
-			     &inbuf, inbuf + resultlen,
-			     &outbuf,
-			     outbuf + freemem_size - sizeof (size_t),
-			     &non_reversible);
-
-	      if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
-		break;
-
-	      if (res != __GCONV_FULL_OUTPUT)
-		{
-		  __libc_lock_unlock (lock);
-		  goto converted;
-		}
-
-	      inbuf = result;
-# else
-#  if HAVE_ICONV
-	      const char *inptr = (const char *) inbuf;
-	      size_t inleft = resultlen;
-	      char *outptr = (char *) outbuf;
-	      size_t outleft;
-
-	      if (freemem_size < sizeof (size_t))
-		goto resize_freemem;
-
-	      outleft = freemem_size - sizeof (size_t);
-	      if (iconv (domain->conv,
-			 (char **) &inptr, &inleft,
-			 &outptr, &outleft)
-		  != (size_t) (-1))
-		{
-		  outbuf = (unsigned char *) outptr;
-		  break;
-		}
-	      if (errno != E2BIG)
-		{
-		  __libc_lock_unlock (lock);
-		  goto converted;
-		}
-#  endif
-# endif
-
-	    resize_freemem:
-	      /* We must allocate a new buffer or resize the old one.  */
-	      if (malloc_count > 0)
-		{
-		  ++malloc_count;
-		  freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
-		  newmem = (transmem_block_t *) realloc (transmem_list,
-							 freemem_size);
-# ifdef _LIBC
-		  if (newmem != NULL)
-		    transmem_list = transmem_list->next;
-		  else
-		    {
-		      struct transmem_list *old = transmem_list;
-
-		      transmem_list = transmem_list->next;
-		      free (old);
-		    }
-# endif
-		}
-	      else
-		{
-		  malloc_count = 1;
-		  freemem_size = INITIAL_BLOCK_SIZE;
-		  newmem = (transmem_block_t *) malloc (freemem_size);
-		}
-	      if (__builtin_expect (newmem == NULL, 0))
-		{
-		  freemem = NULL;
-		  freemem_size = 0;
-		  __libc_lock_unlock (lock);
-		  goto converted;
-		}
-
-# ifdef _LIBC
-	      /* Add the block to the list of blocks we have to free
-                 at some point.  */
-	      newmem->next = transmem_list;
-	      transmem_list = newmem;
-
-	      freemem = newmem->data;
-	      freemem_size -= offsetof (struct transmem_list, data);
-# else
-	      transmem_list = newmem;
-	      freemem = newmem;
-# endif
-
-	      outbuf = freemem + sizeof (size_t);
-	    }
-
-	  /* We have now in our buffer a converted string.  Put this
-	     into the table of conversions.  */
-	  *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
-	  domain->conv_tab[act] = (char *) freemem;
-	  /* Shrink freemem, but keep it aligned.  */
-	  freemem_size -= outbuf - freemem;
-	  freemem = outbuf;
-	  freemem += freemem_size & (alignof (size_t) - 1);
-	  freemem_size = freemem_size & ~ (alignof (size_t) - 1);
-
-	  __libc_lock_unlock (lock);
-	}
-
-      /* Now domain->conv_tab[act] contains the translation of all
-	 the plural variants.  */
-      result = domain->conv_tab[act] + sizeof (size_t);
-      resultlen = *(size_t *) domain->conv_tab[act];
-    }
-
- converted:
-  /* The result string is converted.  */
-
-#endif /* _LIBC || HAVE_ICONV */
-
-  *lengthp = resultlen;
-  return result;
-}
-
-
-/* Look up a plural variant.  */
-static char *
-internal_function
-plural_lookup (domain, n, translation, translation_len)
-     struct loaded_l10nfile *domain;
-     unsigned long int n;
-     const char *translation;
-     size_t translation_len;
-{
-  struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
-  unsigned long int index;
-  const char *p;
-
-  index = plural_eval (domaindata->plural, n);
-  if (index >= domaindata->nplurals)
-    /* This should never happen.  It means the plural expression and the
-       given maximum value do not match.  */
-    index = 0;
-
-  /* Skip INDEX strings at TRANSLATION.  */
-  p = translation;
-  while (index-- > 0)
-    {
-#ifdef _GLIBC
-      p = __rawmemchr (p, '\0');
-#else
-      p = strchr (p, '\0');
-#endif
-      /* And skip over the NUL byte.  */
-      p++;
-
-      if (p >= translation + translation_len)
-	/* This should never happen.  It means the plural expression
-	   evaluated to a value larger than the number of variants
-	   available for MSGID1.  */
-	return (char *) translation;
-    }
-  return (char *) p;
-}
-
-
-/* Function to evaluate the plural expression and return an index value.  */
-static unsigned long int
-internal_function
-plural_eval (pexp, n)
-     struct expression *pexp;
-     unsigned long int n;
-{
-  switch (pexp->nargs)
-    {
-    case 0:
-      switch (pexp->operation)
-	{
-	case var:
-	  return n;
-	case num:
-	  return pexp->val.num;
-	default:
-	  break;
-	}
-      /* NOTREACHED */
-      break;
-    case 1:
-      {
-	/* pexp->operation must be lnot.  */
-	unsigned long int arg = plural_eval (pexp->val.args[0], n);
-	return ! arg;
-      }
-    case 2:
-      {
-	unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
-	if (pexp->operation == lor)
-	  return leftarg || plural_eval (pexp->val.args[1], n);
-	else if (pexp->operation == land)
-	  return leftarg && plural_eval (pexp->val.args[1], n);
-	else
-	  {
-	    unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
-
-	    switch (pexp->operation)
-	      {
-	      case mult:
-		return leftarg * rightarg;
-	      case divide:
-		return leftarg / rightarg;
-	      case module:
-		return leftarg % rightarg;
-	      case plus:
-		return leftarg + rightarg;
-	      case minus:
-		return leftarg - rightarg;
-	      case less_than:
-		return leftarg < rightarg;
-	      case greater_than:
-		return leftarg > rightarg;
-	      case less_or_equal:
-		return leftarg <= rightarg;
-	      case greater_or_equal:
-		return leftarg >= rightarg;
-	      case equal:
-		return leftarg == rightarg;
-	      case not_equal:
-		return leftarg != rightarg;
-	      default:
-		break;
-	      }
-	  }
-	/* NOTREACHED */
-	break;
-      }
-    case 3:
-      {
-	/* pexp->operation must be qmop.  */
-	unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
-	return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
-      }
-    }
-  /* NOTREACHED */
-  return 0;
-}
-
-
-/* Return string representation of locale CATEGORY.  */
-static const char *
-internal_function
-category_to_name (category)
-     int category;
-{
-  const char *retval;
-
-  switch (category)
-  {
-#ifdef LC_COLLATE
-  case LC_COLLATE:
-    retval = "LC_COLLATE";
-    break;
-#endif
-#ifdef LC_CTYPE
-  case LC_CTYPE:
-    retval = "LC_CTYPE";
-    break;
-#endif
-#ifdef LC_MONETARY
-  case LC_MONETARY:
-    retval = "LC_MONETARY";
-    break;
-#endif
-#ifdef LC_NUMERIC
-  case LC_NUMERIC:
-    retval = "LC_NUMERIC";
-    break;
-#endif
-#ifdef LC_TIME
-  case LC_TIME:
-    retval = "LC_TIME";
-    break;
-#endif
-#ifdef LC_MESSAGES
-  case LC_MESSAGES:
-    retval = "LC_MESSAGES";
-    break;
-#endif
-#ifdef LC_RESPONSE
-  case LC_RESPONSE:
-    retval = "LC_RESPONSE";
-    break;
-#endif
-#ifdef LC_ALL
-  case LC_ALL:
-    /* This might not make sense but is perhaps better than any other
-       value.  */
-    retval = "LC_ALL";
-    break;
-#endif
-  default:
-    /* If you have a better idea for a default value let me know.  */
-    retval = "LC_XXX";
-  }
-
-  return retval;
-}
-
-/* Guess value of current locale from value of the environment variables.  */
-static const char *
-internal_function
-guess_category_value (category, categoryname)
-     int category;
-     const char *categoryname;
-{
-  const char *language;
-  const char *retval;
-
-  /* The highest priority value is the `LANGUAGE' environment
-     variable.  But we don't use the value if the currently selected
-     locale is the C locale.  This is a GNU extension.  */
-  language = getenv ("LANGUAGE");
-  if (language != NULL && language[0] == '\0')
-    language = NULL;
-
-  /* We have to proceed with the POSIX methods of looking to `LC_ALL',
-     `LC_xxx', and `LANG'.  On some systems this can be done by the
-     `setlocale' function itself.  */
-#if defined _LIBC || (defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL)
-  retval = setlocale (category, NULL);
-#else
-  /* Setting of LC_ALL overwrites all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval == NULL || retval[0] == '\0')
-    {
-      /* Next comes the name of the desired category.  */
-      retval = getenv (categoryname);
-      if (retval == NULL || retval[0] == '\0')
-	{
-	  /* Last possibility is the LANG environment variable.  */
-	  retval = getenv ("LANG");
-	  if (retval == NULL || retval[0] == '\0')
-	    /* We use C as the default domain.  POSIX says this is
-	       implementation defined.  */
-	    return "C";
-	}
-    }
-#endif
-
-  return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
-}
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_GLIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
-
-#if !_LIBC && !HAVE_MEMPCPY
-static void *
-mempcpy (dest, src, n)
-     void *dest;
-     const void *src;
-     size_t n;
-{
-  return (void *) ((char *) memcpy (dest, src, n) + n);
-}
-#endif
-
-
-#ifdef _LIBC
-/* If we want to free all resources we have to do some work at
-   program's end.  */
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  void *old;
-
-  while (_nl_domain_bindings != NULL)
-    {
-      struct binding *oldp = _nl_domain_bindings;
-      _nl_domain_bindings = _nl_domain_bindings->next;
-      if (oldp->dirname != _nl_default_dirname)
-	/* Yes, this is a pointer comparison.  */
-	free (oldp->dirname);
-      free (oldp->codeset);
-      free (oldp);
-    }
-
-  if (_nl_current_default_domain != _nl_default_default_domain)
-    /* Yes, again a pointer comparison.  */
-    free ((char *) _nl_current_default_domain);
-
-  /* Remove the search tree with the known translations.  */
-  tdestroy (root, free);
-  root = NULL;
-
-  while (transmem_list != NULL)
-    {
-      old = transmem_list;
-      transmem_list = transmem_list->next;
-      free (old);
-    }
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
-#else  /* !_MB_CAPABLE */
-
-#include <machine/weakalias.h>
-#include <sys/lock.h>
-
-/* Name of the default domain used for gettext(3) prior any call to
-   textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] = "messages";
-
-/* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain = _nl_default_default_domain;
-
-/* Contains the default location of the message catalogs.  */
-const char _nl_default_dirname[] = LOCALEDIR;
-
-/* List with bindings of specific domains created by bindtextdomain()
-   calls.  */
-struct binding *_nl_domain_bindings;
-
-/* this is actually usually defined in loadmsgcat.c, but we do it
-   here so we don't need the other file at all. */
-int _nl_msg_cat_cntr;
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define_initialized (, _nl_state_lock)
-
-
-/* For non-MB-capable programs, the locale must be "C", so we can
-   avoid excess program size by short-circuiting this function. */
-char *
-__dcigettext (domainname, msgid1, msgid2, plural, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     int plural;
-     unsigned long int n;
-     int category;
-{
-  if (plural && n > 1)
-    return msgid2;
-  return msgid1;
-}
-weak_alias(__dcigettext, dcigettext)
-
-#endif /* !_MB_CAPABLE */
diff --git a/newlib/libc/sys/linux/intl/dcngettext.c b/newlib/libc/sys/linux/intl/dcngettext.c
deleted file mode 100644
index 068d5fa..0000000
--- a/newlib/libc/sys/linux/intl/dcngettext.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Implementation of the dcngettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCNGETTEXT __dcngettext
-# define DCIGETTEXT __dcigettext
-#else
-# define DCNGETTEXT dcngettext__
-# define DCIGETTEXT dcigettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCNGETTEXT (domainname, msgid1, msgid2, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-     int category;
-{
-  return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dcngettext, dcngettext);
-#endif
diff --git a/newlib/libc/sys/linux/intl/dgettext.c b/newlib/libc/sys/linux/intl/dgettext.c
deleted file mode 100644
index d0e5ed2..0000000
--- a/newlib/libc/sys/linux/intl/dgettext.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DGETTEXT __dgettext
-# define DCGETTEXT __dcgettext
-#else
-# define DGETTEXT dgettext__
-# define DCGETTEXT dcgettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale.  */
-char *
-DGETTEXT (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
-{
-  return DCGETTEXT (domainname, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dgettext, dgettext);
-#endif
diff --git a/newlib/libc/sys/linux/intl/dngettext.c b/newlib/libc/sys/linux/intl/dngettext.c
deleted file mode 100644
index a620024..0000000
--- a/newlib/libc/sys/linux/intl/dngettext.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DNGETTEXT __dngettext
-# define DCNGETTEXT __dcngettext
-#else
-# define DNGETTEXT dngettext__
-# define DCNGETTEXT dcngettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale and skip message according to the plural form.  */
-char *
-DNGETTEXT (domainname, msgid1, msgid2, n)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dngettext, dngettext);
-#endif
diff --git a/newlib/libc/sys/linux/intl/explodename.c b/newlib/libc/sys/linux/intl/explodename.c
deleted file mode 100644
index 6effd33..0000000
--- a/newlib/libc/sys/linux/intl/explodename.c
+++ /dev/null
@@ -1,206 +0,0 @@
-#include <newlib.h>
-
-#ifdef _MB_CAPABLE
-
-/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#include <sys/types.h>
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-char *
-_nl_find_language (name)
-     const char *name;
-{
-  while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
-	 && name[0] != '+' && name[0] != ',')
-    ++name;
-
-  return (char *) name;
-}
-
-
-int
-_nl_explode_name (name, language, modifier, territory, codeset,
-		  normalized_codeset, special, sponsor, revision)
-     char *name;
-     const char **language;
-     const char **modifier;
-     const char **territory;
-     const char **codeset;
-     const char **normalized_codeset;
-     const char **special;
-     const char **sponsor;
-     const char **revision;
-{
-  enum { undecided, xpg, cen } syntax;
-  char *cp;
-  int mask;
-
-  *modifier = NULL;
-  *territory = NULL;
-  *codeset = NULL;
-  *normalized_codeset = NULL;
-  *special = NULL;
-  *sponsor = NULL;
-  *revision = NULL;
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
-  mask = 0;
-  syntax = undecided;
-  *language = cp = name;
-  cp = _nl_find_language (*language);
-
-  if (*language == cp)
-    /* This does not make sense: language has to be specified.  Use
-       this entry as it is without exploding.  Perhaps it is an alias.  */
-    cp = strchr (*language, '\0');
-  else if (cp[0] == '_')
-    {
-      /* Next is the territory.  */
-      cp[0] = '\0';
-      *territory = ++cp;
-
-      while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
-	     && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= TERRITORY;
-
-      if (cp[0] == '.')
-	{
-	  /* Next is the codeset.  */
-	  syntax = xpg;
-	  cp[0] = '\0';
-	  *codeset = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '@')
-	    ++cp;
-
-	  mask |= XPG_CODESET;
-
-	  if (*codeset != cp && (*codeset)[0] != '\0')
-	    {
-	      *normalized_codeset = _nl_normalize_codeset (*codeset,
-							   cp - *codeset);
-	      if (strcmp (*codeset, *normalized_codeset) == 0)
-		free ((char *) *normalized_codeset);
-	      else
-		mask |= XPG_NORM_CODESET;
-	    }
-	}
-    }
-
-  if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
-    {
-      /* Next is the modifier.  */
-      syntax = cp[0] == '@' ? xpg : cen;
-      cp[0] = '\0';
-      *modifier = ++cp;
-
-      while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
-	     && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= XPG_MODIFIER | CEN_AUDIENCE;
-    }
-
-  if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
-    {
-      syntax = cen;
-
-      if (cp[0] == '+')
-	{
- 	  /* Next is special application (CEN syntax).  */
-	  cp[0] = '\0';
-	  *special = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPECIAL;
-	}
-
-      if (cp[0] == ',')
-	{
- 	  /* Next is sponsor (CEN syntax).  */
-	  cp[0] = '\0';
-	  *sponsor = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPONSOR;
-	}
-
-      if (cp[0] == '_')
-	{
- 	  /* Next is revision (CEN syntax).  */
-	  cp[0] = '\0';
-	  *revision = ++cp;
-
-	  mask |= CEN_REVISION;
-	}
-    }
-
-  /* For CEN syntax values it might be important to have the
-     separator character in the file name, not for XPG syntax.  */
-  if (syntax == xpg)
-    {
-      if (*territory != NULL && (*territory)[0] == '\0')
-	mask &= ~TERRITORY;
-
-      if (*codeset != NULL && (*codeset)[0] == '\0')
-	mask &= ~XPG_CODESET;
-
-      if (*modifier != NULL && (*modifier)[0] == '\0')
-	mask &= ~XPG_MODIFIER;
-    }
-
-  return mask;
-}
-
-#endif /* _MB_CAPABLE */
diff --git a/newlib/libc/sys/linux/intl/finddomain.c b/newlib/libc/sys/linux/intl/finddomain.c
deleted file mode 100644
index 4f27790..0000000
--- a/newlib/libc/sys/linux/intl/finddomain.c
+++ /dev/null
@@ -1,222 +0,0 @@
-#include <newlib.h>
-
-#ifdef _MB_CAPABLE
-
-/* Handle list of needed message catalogs
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Ulrich Drepper <drepper@gnu.org>, 1995.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-/* List of already loaded domains.  */
-static struct loaded_l10nfile *_nl_loaded_domains;
-
-
-/* Return a data structure describing the message catalog described by
-   the DOMAINNAME and CATEGORY parameters with respect to the currently
-   established bindings.  */
-struct loaded_l10nfile *
-internal_function
-_nl_find_domain (dirname, locale, domainname, domainbinding)
-     const char *dirname;
-     char *locale;
-     const char *domainname;
-     struct binding *domainbinding;
-{
-  struct loaded_l10nfile *retval;
-  const char *language;
-  const char *modifier;
-  const char *territory;
-  const char *codeset;
-  const char *normalized_codeset;
-  const char *special;
-  const char *sponsor;
-  const char *revision;
-  const char *alias_value;
-  int mask;
-
-  /* LOCALE can consist of up to four recognized parts for the XPG syntax:
-
-		language[_territory[.codeset]][@modifier]
-
-     and six parts for the CEN syntax:
-
-	language[_territory][+audience][+special][,[sponsor][_revision]]
-
-     Beside the first part all of them are allowed to be missing.  If
-     the full specified locale is not found, the less specific one are
-     looked for.  The various parts will be stripped off according to
-     the following order:
-		(1) revision
-		(2) sponsor
-		(3) special
-		(4) codeset
-		(5) normalized codeset
-		(6) territory
-		(7) audience/modifier
-   */
-
-  /* If we have already tested for this locale entry there has to
-     be one data set in the list of loaded domains.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, 0, locale, NULL, NULL,
-			       NULL, NULL, NULL, NULL, NULL, domainname, 0);
-  if (retval != NULL)
-    {
-      /* We know something about this locale.  */
-      int cnt;
-
-      if (retval->decided == 0)
-	_nl_load_domain (retval, domainbinding);
-
-      if (retval->data != NULL)
-	return retval;
-
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
-
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-      return cnt >= 0 ? retval : NULL;
-      /* NOTREACHED */
-    }
-
-  /* See whether the locale value is an alias.  If yes its value
-     *overwrites* the alias name.  No test for the original value is
-     done.  */
-  alias_value = _nl_expand_alias (locale);
-  if (alias_value != NULL)
-    {
-#if defined _LIBC || defined HAVE_STRDUP
-      locale = strdup (alias_value);
-      if (locale == NULL)
-	return NULL;
-#else
-      size_t len = strlen (alias_value) + 1;
-      locale = (char *) malloc (len);
-      if (locale == NULL)
-	return NULL;
-
-      memcpy (locale, alias_value, len);
-#endif
-    }
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
-  mask = _nl_explode_name (locale, &language, &modifier, &territory,
-			   &codeset, &normalized_codeset, &special,
-			   &sponsor, &revision);
-
-  /* Create all possible locale entries which might be interested in
-     generalization.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, mask, language, territory,
-			       codeset, normalized_codeset, modifier, special,
-			       sponsor, revision, domainname, 1);
-  if (retval == NULL)
-    /* This means we are out of core.  */
-    return NULL;
-
-  if (retval->decided == 0)
-    _nl_load_domain (retval, domainbinding);
-  if (retval->data == NULL)
-    {
-      int cnt;
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-    }
-
-  /* The room for an alias was dynamically allocated.  Free it now.  */
-  if (alias_value != NULL)
-    free (locale);
-
-  /* The space for normalized_codeset is dynamically allocated.  Free it.  */
-  if (mask & XPG_NORM_CODESET)
-    free ((void *) normalized_codeset);
-
-  return retval;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  struct loaded_l10nfile *runp = _nl_loaded_domains;
-
-  while (runp != NULL)
-    {
-      struct loaded_l10nfile *here = runp;
-      if (runp->data != NULL)
-	_nl_unload_domain ((struct loaded_domain *) runp->data);
-      runp = runp->next;
-      free ((char *) here->filename);
-      free (here);
-    }
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
-
-#endif /* _MB_CAPABLE */
diff --git a/newlib/libc/sys/linux/intl/gettext.c b/newlib/libc/sys/linux/intl/gettext.c
deleted file mode 100644
index 2b107d5..0000000
--- a/newlib/libc/sys/linux/intl/gettext.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# ifdef STDC_HEADERS
-#  include <stdlib.h>		/* Just for NULL.  */
-# else
-#  ifdef HAVE_STRING_H
-#   include <string.h>
-#  else
-#   define NULL ((void *) 0)
-#  endif
-# endif
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-#include <locale.h>
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define GETTEXT __gettext
-# define DCGETTEXT __dcgettext
-#else
-# define GETTEXT gettext__
-# define DCGETTEXT dcgettext__
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-GETTEXT (msgid)
-     const char *msgid;
-{
-  return DCGETTEXT (NULL, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__gettext, gettext);
-#endif
diff --git a/newlib/libc/sys/linux/intl/gettext.h b/newlib/libc/sys/linux/intl/gettext.h
deleted file mode 100644
index c427d89..0000000
--- a/newlib/libc/sys/linux/intl/gettext.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Internal header for GNU gettext internationalization functions.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _GETTEXT_H
-#define _GETTEXT_H 1
-
-#if HAVE_LIMITS_H || _LIBC
-# include <limits.h>
-#endif
-
-/* @@ end of prolog @@ */
-
-/* The magic number of the GNU message catalog format.  */
-#define _MAGIC 0x950412de
-#define _MAGIC_SWAPPED 0xde120495
-
-/* Revision number of the currently used .mo (binary) file format.  */
-#define MO_REVISION_NUMBER 0
-
-/* The following contortions are an attempt to use the C preprocessor
-   to determine an unsigned integral type that is 32 bits wide.  An
-   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
-   when cross-compiling.  */
-
-#if __STDC__
-# define UINT_MAX_32_BITS 4294967295U
-#else
-# define UINT_MAX_32_BITS 0xFFFFFFFF
-#endif
-
-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
-   This should be valid for all systems GNU cares about because
-   that doesn't include 16-bit systems, and only modern systems
-   (that certainly have <limits.h>) have 64+-bit integral types.  */
-
-#ifndef UINT_MAX
-# define UINT_MAX UINT_MAX_32_BITS
-#endif
-
-#if UINT_MAX == UINT_MAX_32_BITS
-typedef unsigned nls_uint32;
-#else
-# if USHRT_MAX == UINT_MAX_32_BITS
-typedef unsigned short nls_uint32;
-# else
-#  if ULONG_MAX == UINT_MAX_32_BITS
-typedef unsigned long nls_uint32;
-#  else
-  /* The following line is intended to throw an error.  Using #error is
-     not portable enough.  */
-  "Cannot determine unsigned 32-bit data type."
-#  endif
-# endif
-#endif
-
-
-/* Header for binary .mo file format.  */
-struct mo_file_header
-{
-  /* The magic number.  */
-  nls_uint32 magic;
-  /* The revision number of the file format.  */
-  nls_uint32 revision;
-  /* The number of strings pairs.  */
-  nls_uint32 nstrings;
-  /* Offset of table with start offsets of original strings.  */
-  nls_uint32 orig_tab_offset;
-  /* Offset of table with start offsets of translation strings.  */
-  nls_uint32 trans_tab_offset;
-  /* Size of hashing table.  */
-  nls_uint32 hash_tab_size;
-  /* Offset of first hashing entry.  */
-  nls_uint32 hash_tab_offset;
-};
-
-struct string_desc
-{
-  /* Length of addressed string.  */
-  nls_uint32 length;
-  /* Offset of string in file.  */
-  nls_uint32 offset;
-};
-
-/* @@ begin of epilog @@ */
-
-#endif	/* gettext.h  */
diff --git a/newlib/libc/sys/linux/intl/gettextP.h b/newlib/libc/sys/linux/intl/gettextP.h
deleted file mode 100644
index 6c9035b..0000000
--- a/newlib/libc/sys/linux/intl/gettextP.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _GETTEXTP_H
-#define _GETTEXTP_H
-
-#include <stddef.h>		/* Get size_t.  */
-#include <libc-symbols.h>
-
-#ifdef _GLIBC
-# include "gconv_int.h"
-#else
-# if HAVE_ICONV
-#  include <iconv.h>
-# endif
-#endif
-
-#include "loadinfo.h"
-
-#include "gettext.h"		/* Get nls_uint32.  */
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-#ifndef W
-# define W(flag, data) ((flag) ? SWAP (data) : (data))
-#endif
-
-
-#ifdef _LIBC
-# include <byteswap.h>
-# define SWAP(i) bswap_32 (i)
-#else
-static nls_uint32 SWAP PARAMS ((nls_uint32 i));
-
-static inline nls_uint32
-SWAP (i)
-     nls_uint32 i;
-{
-  return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
-}
-#endif
-
-
-/* This is the representation of the expressions to determine the
-   plural form.  */
-struct expression
-{
-  int nargs;			/* Number of arguments.  */
-  enum operator
-  {
-    /* Without arguments:  */
-    var,			/* The variable "n".  */
-    num,			/* Decimal number.  */
-    /* Unary operators:  */
-    lnot,			/* Logical NOT.  */
-    /* Binary operators:  */
-    mult,			/* Multiplication.  */
-    divide,			/* Division.  */
-    module,			/* Module operation.  */
-    plus,			/* Addition.  */
-    minus,			/* Subtraction.  */
-    less_than,			/* Comparison.  */
-    greater_than,		/* Comparison.  */
-    less_or_equal,		/* Comparison.  */
-    greater_or_equal,		/* Comparison.  */
-    equal,			/* Comparision for equality.  */
-    not_equal,			/* Comparision for inequality.  */
-    land,			/* Logical AND.  */
-    lor,			/* Logical OR.  */
-    /* Ternary operators:  */
-    qmop			/* Question mark operator.  */
-  } operation;
-  union
-  {
-    unsigned long int num;	/* Number value for `num'.  */
-    struct expression *args[3];	/* Up to three arguments.  */
-  } val;
-};
-
-/* This is the data structure to pass information to the parser and get
-   the result in a thread-safe way.  */
-struct parse_args
-{
-  const char *cp;
-  struct expression *res;
-};
-
-
-/* The representation of an opened message catalog.  */
-struct loaded_domain
-{
-  const char *data;
-  int use_mmap;
-  size_t mmap_size;
-  int must_swap;
-  nls_uint32 nstrings;
-  struct string_desc *orig_tab;
-  struct string_desc *trans_tab;
-  nls_uint32 hash_size;
-  nls_uint32 *hash_tab;
-  int codeset_cntr;
-#ifdef _GLIBC
-  __gconv_t conv;
-#else
-# if HAVE_ICONV
-  iconv_t conv;
-# endif
-#endif
-  char **conv_tab;
-
-  struct expression *plural;
-  unsigned long int nplurals;
-};
-
-/* We want to allocate a string at the end of the struct.  But ISO C
-   doesn't allow zero sized arrays.  */
-#ifdef __GNUC__
-# define ZERO 0
-#else
-# define ZERO 1
-#endif
-
-/* A set of settings bound to a message domain.  Used to store settings
-   from bindtextdomain() and bind_textdomain_codeset().  */
-struct binding
-{
-  struct binding *next;
-  char *dirname;
-  int codeset_cntr;	/* Incremented each time codeset changes.  */
-  char *codeset;
-  char domainname[ZERO];
-};
-
-/* A counter which is incremented each time some previous translations
-   become invalid.
-   This variable is part of the external ABI of the GNU libintl.  */
-extern int _nl_msg_cat_cntr;
-
-struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
-						 char *__locale,
-						 const char *__domainname,
-					      struct binding *__domainbinding))
-     internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain,
-			      struct binding *__domainbinding))
-     internal_function;
-void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
-     internal_function;
-const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file,
-					  struct loaded_domain *__domain,
-					  struct binding *__domainbinding))
-     internal_function;
-void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain))
-     internal_function;
-
-char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file,
-			    struct binding *domainbinding,
-			    const char *msgid, size_t *lengthp))
-     internal_function;
-
-#ifdef _LIBC
-extern char *__gettext PARAMS ((const char *__msgid));
-extern char *__dgettext PARAMS ((const char *__domainname,
-				 const char *__msgid));
-extern char *__dcgettext PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n));
-extern char *__dngettext PARAMS ((const char *__domainname,
-				  const char *__msgid1, const char *__msgid2,
-				  unsigned long int n));
-extern char *__dcngettext PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   unsigned long int __n, int __category));
-extern char *__dcigettext PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   int __plural, unsigned long int __n,
-				   int __category));
-extern char *__textdomain PARAMS ((const char *__domainname));
-extern char *__bindtextdomain PARAMS ((const char *__domainname,
-				       const char *__dirname));
-extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
-						const char *__codeset));
-#else
-extern char *gettext__ PARAMS ((const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n));
-extern char *dngettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid1, const char *__msgid2,
-				  unsigned long int __n));
-extern char *dcngettext__ PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   unsigned long int __n, int __category));
-extern char *dcigettext__ PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   int __plural, unsigned long int __n,
-				   int __category));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				       const char *__dirname));
-extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname,
-						const char *__codeset));
-#endif
-
-#ifdef _LIBC
-extern void __gettext_free_exp PARAMS ((struct expression *exp))
-     internal_function;
-extern int __gettextparse PARAMS ((void *arg));
-#else
-extern void gettext_free_exp__ PARAMS ((struct expression *exp))
-     internal_function;
-extern int gettextparse__ PARAMS ((void *arg));
-#endif
-
-/* @@ begin of epilog @@ */
-
-#endif /* gettextP.h  */
diff --git a/newlib/libc/sys/linux/intl/hash-string.h b/newlib/libc/sys/linux/intl/hash-string.h
deleted file mode 100644
index ae4bcfb..0000000
--- a/newlib/libc/sys/linux/intl/hash-string.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Implements a string hashing function.
-   Copyright (C) 1995, 1997, 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-/* We assume to have `unsigned long int' value with at least 32 bits.  */
-#define HASHWORDBITS 32
-
-
-/* Defines the so called `hashpjw' function by P.J. Weinberger
-   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-   1986, 1987 Bell Telephone Laboratories, Inc.]  */
-static unsigned long int hash_string PARAMS ((const char *__str_param));
-
-static inline unsigned long int
-hash_string (str_param)
-     const char *str_param;
-{
-  unsigned long int hval, g;
-  const char *str = str_param;
-
-  /* Compute the hash value for the given string.  */
-  hval = 0;
-  while (*str != '\0')
-    {
-      hval <<= 4;
-      hval += (unsigned long int) *str++;
-      g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
-      if (g != 0)
-	{
-	  hval ^= g >> (HASHWORDBITS - 8);
-	  hval ^= g;
-	}
-    }
-  return hval;
-}
diff --git a/newlib/libc/sys/linux/intl/l10nflist.c b/newlib/libc/sys/linux/intl/l10nflist.c
deleted file mode 100644
index 564df73..0000000
--- a/newlib/libc/sys/linux/intl/l10nflist.c
+++ /dev/null
@@ -1,423 +0,0 @@
-#include <newlib.h>
-
-#ifdef _MB_CAPABLE
-
-/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Tell glibc's <string.h> to provide a prototype for stpcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined _LIBC || defined HAVE_ARGZ_H
-# include <argz.h>
-#endif
-#include <ctype.h>
-#include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _GLIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# ifndef stpcpy
-#  define stpcpy(dest, src) __stpcpy(dest, src)
-# endif
-#else
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
-/* Define function which are usually not available.  */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
-/* Returns the number of strings in ARGZ.  */
-static size_t argz_count__ PARAMS ((const char *argz, size_t len));
-
-static size_t
-argz_count__ (argz, len)
-     const char *argz;
-     size_t len;
-{
-  size_t count = 0;
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len + 1;
-      len -= part_len + 1;
-      count++;
-    }
-  return count;
-}
-# undef __argz_count
-# define __argz_count(argz, len) argz_count__ (argz, len)
-#endif	/* !_LIBC && !HAVE___ARGZ_COUNT */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
-/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
-   except the last into the character SEP.  */
-static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
-
-static void
-argz_stringify__ (argz, len, sep)
-     char *argz;
-     size_t len;
-     int sep;
-{
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len;
-      len -= part_len + 1;
-      if (len > 0)
-	*argz++ = sep;
-    }
-}
-# undef __argz_stringify
-# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
-#endif	/* !_LIBC && !HAVE___ARGZ_STRINGIFY */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
-static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
-				  const char *entry));
-
-static char *
-argz_next__ (argz, argz_len, entry)
-     char *argz;
-     size_t argz_len;
-     const char *entry;
-{
-  if (entry)
-    {
-      if (entry < argz + argz_len)
-        entry = strchr (entry, '\0') + 1;
-
-      return entry >= argz + argz_len ? NULL : (char *) entry;
-    }
-  else
-    if (argz_len > 0)
-      return argz;
-    else
-      return 0;
-}
-# undef __argz_next
-# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
-#endif	/* !_LIBC && !HAVE___ARGZ_NEXT */
-
-
-/* Return number of bits set in X.  */
-static int pop PARAMS ((int x));
-
-static inline int
-pop (x)
-     int x;
-{
-  /* We assume that no more than 16 bits are used.  */
-  x = ((x & ~0x5555) >> 1) + (x & 0x5555);
-  x = ((x & ~0x3333) >> 2) + (x & 0x3333);
-  x = ((x >> 4) + x) & 0x0f0f;
-  x = ((x >> 8) + x) & 0xff;
-
-  return x;
-}
-
-
-struct loaded_l10nfile *
-_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
-		    territory, codeset, normalized_codeset, modifier, special,
-		    sponsor, revision, filename, do_allocate)
-     struct loaded_l10nfile **l10nfile_list;
-     const char *dirlist;
-     size_t dirlist_len;
-     int mask;
-     const char *language;
-     const char *territory;
-     const char *codeset;
-     const char *normalized_codeset;
-     const char *modifier;
-     const char *special;
-     const char *sponsor;
-     const char *revision;
-     const char *filename;
-     int do_allocate;
-{
-  char *abs_filename;
-  struct loaded_l10nfile *last = NULL;
-  struct loaded_l10nfile *retval;
-  char *cp;
-  size_t entries;
-  int cnt;
-
-  /* Allocate room for the full file name.  */
-  abs_filename = (char *) malloc (dirlist_len
-				  + strlen (language)
-				  + ((mask & TERRITORY) != 0
-				     ? strlen (territory) + 1 : 0)
-				  + ((mask & XPG_CODESET) != 0
-				     ? strlen (codeset) + 1 : 0)
-				  + ((mask & XPG_NORM_CODESET) != 0
-				     ? strlen (normalized_codeset) + 1 : 0)
-				  + (((mask & XPG_MODIFIER) != 0
-				      || (mask & CEN_AUDIENCE) != 0)
-				     ? strlen (modifier) + 1 : 0)
-				  + ((mask & CEN_SPECIAL) != 0
-				     ? strlen (special) + 1 : 0)
-				  + (((mask & CEN_SPONSOR) != 0
-				      || (mask & CEN_REVISION) != 0)
-				     ? (1 + ((mask & CEN_SPONSOR) != 0
-					     ? strlen (sponsor) + 1 : 0)
-					+ ((mask & CEN_REVISION) != 0
-					   ? strlen (revision) + 1 : 0)) : 0)
-				  + 1 + strlen (filename) + 1);
-
-  if (abs_filename == NULL)
-    return NULL;
-
-  retval = NULL;
-  last = NULL;
-
-  /* Construct file name.  */
-  memcpy (abs_filename, dirlist, dirlist_len);
-  argz_stringify (abs_filename, dirlist_len, ':');
-  cp = abs_filename + (dirlist_len - 1);
-  *cp++ = '/';
-  cp = stpcpy (cp, language);
-
-  if ((mask & TERRITORY) != 0)
-    {
-      *cp++ = '_';
-      cp = stpcpy (cp, territory);
-    }
-  if ((mask & XPG_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, codeset);
-    }
-  if ((mask & XPG_NORM_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, normalized_codeset);
-    }
-  if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
-    {
-      /* This component can be part of both syntaces but has different
-	 leading characters.  For CEN we use `+', else `@'.  */
-      *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
-      cp = stpcpy (cp, modifier);
-    }
-  if ((mask & CEN_SPECIAL) != 0)
-    {
-      *cp++ = '+';
-      cp = stpcpy (cp, special);
-    }
-  if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
-    {
-      *cp++ = ',';
-      if ((mask & CEN_SPONSOR) != 0)
-	cp = stpcpy (cp, sponsor);
-      if ((mask & CEN_REVISION) != 0)
-	{
-	  *cp++ = '_';
-	  cp = stpcpy (cp, revision);
-	}
-    }
-
-  *cp++ = '/';
-  stpcpy (cp, filename);
-
-  /* Look in list of already loaded domains whether it is already
-     available.  */
-  last = NULL;
-  for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
-    if (retval->filename != NULL)
-      {
-	int compare = strcmp (retval->filename, abs_filename);
-	if (compare == 0)
-	  /* We found it!  */
-	  break;
-	if (compare < 0)
-	  {
-	    /* It's not in the list.  */
-	    retval = NULL;
-	    break;
-	  }
-
-	last = retval;
-      }
-
-  if (retval != NULL || do_allocate == 0)
-    {
-      free (abs_filename);
-      return retval;
-    }
-
-  retval = (struct loaded_l10nfile *)
-    malloc (sizeof (*retval) + (argz_count (dirlist, dirlist_len)
-				* (1 << pop (mask))
-				* sizeof (struct loaded_l10nfile *)));
-  if (retval == NULL)
-    return NULL;
-
-  retval->filename = abs_filename;
-  retval->decided = (argz_count (dirlist, dirlist_len) != 1
-		     || ((mask & XPG_CODESET) != 0
-			 && (mask & XPG_NORM_CODESET) != 0));
-  retval->data = NULL;
-
-  if (last == NULL)
-    {
-      retval->next = *l10nfile_list;
-      *l10nfile_list = retval;
-    }
-  else
-    {
-      retval->next = last->next;
-      last->next = retval;
-    }
-
-  entries = 0;
-  /* If the DIRLIST is a real list the RETVAL entry corresponds not to
-     a real file.  So we have to use the DIRLIST separation mechanism
-     of the inner loop.  */
-  cnt = argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
-  for (; cnt >= 0; --cnt)
-    if ((cnt & ~mask) == 0
-	&& ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
-	&& ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
-      {
-	/* Iterate over all elements of the DIRLIST.  */
-	char *dir = NULL;
-
-	while ((dir = argz_next ((char *) dirlist, dirlist_len, dir))
-	       != NULL)
-	  retval->successor[entries++]
-	    = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
-				  language, territory, codeset,
-				  normalized_codeset, modifier, special,
-				  sponsor, revision, filename, 1);
-      }
-  retval->successor[entries] = NULL;
-
-  return retval;
-}
-
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
-const char *
-_nl_normalize_codeset (codeset, name_len)
-     const char *codeset;
-     size_t name_len;
-{
-  int len = 0;
-  int only_digit = 1;
-  char *retval;
-  char *wp;
-  size_t cnt;
-
-  for (cnt = 0; cnt < name_len; ++cnt)
-    if (isalnum (codeset[cnt]))
-      {
-	++len;
-
-	if (isalpha (codeset[cnt]))
-	  only_digit = 0;
-      }
-
-  retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
-
-  if (retval != NULL)
-    {
-      if (only_digit)
-	wp = stpcpy (retval, "iso");
-      else
-	wp = retval;
-
-      for (cnt = 0; cnt < name_len; ++cnt)
-	if (isalpha (codeset[cnt]))
-	  *wp++ = tolower (codeset[cnt]);
-	else if (isdigit (codeset[cnt]))
-	  *wp++ = codeset[cnt];
-
-      *wp = '\0';
-    }
-
-  return (const char *) retval;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_GLIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
-
-#endif /* _MB_CAPABLE */
diff --git a/newlib/libc/sys/linux/intl/loadinfo.h b/newlib/libc/sys/linux/intl/loadinfo.h
deleted file mode 100644
index 1de6cfd..0000000
--- a/newlib/libc/sys/linux/intl/loadinfo.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _LOADINFO_H
-#define _LOADINFO_H	1
-
-#ifndef PARAMS
-# if __STDC__
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-/* Encoding of locale name parts.  */
-#define CEN_REVISION		1
-#define CEN_SPONSOR		2
-#define CEN_SPECIAL		4
-#define XPG_NORM_CODESET	8
-#define XPG_CODESET		16
-#define TERRITORY		32
-#define CEN_AUDIENCE		64
-#define XPG_MODIFIER		128
-
-#define CEN_SPECIFIC	(CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
-#define XPG_SPECIFIC	(XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
-
-
-struct loaded_l10nfile
-{
-  const char *filename;
-  int decided;
-
-  const void *data;
-
-  struct loaded_l10nfile *next;
-  struct loaded_l10nfile *successor[1];
-};
-
-
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
-extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
-						  size_t name_len));
-
-extern struct loaded_l10nfile *
-_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
-			    const char *dirlist, size_t dirlist_len, int mask,
-			    const char *language, const char *territory,
-			    const char *codeset,
-			    const char *normalized_codeset,
-			    const char *modifier, const char *special,
-			    const char *sponsor, const char *revision,
-			    const char *filename, int do_allocate));
-
-
-extern const char *_nl_expand_alias PARAMS ((const char *name));
-
-/* normalized_codeset is dynamically allocated and has to be freed by
-   the caller.  */
-extern int _nl_explode_name PARAMS ((char *name, const char **language,
-				     const char **modifier,
-				     const char **territory,
-				     const char **codeset,
-				     const char **normalized_codeset,
-				     const char **special,
-				     const char **sponsor,
-				     const char **revision));
-
-extern char *_nl_find_language PARAMS ((const char *name));
-
-#endif	/* loadinfo.h */
diff --git a/newlib/libc/sys/linux/intl/loadmsgcat.c b/newlib/libc/sys/linux/intl/loadmsgcat.c
deleted file mode 100644
index b5f722e..0000000
--- a/newlib/libc/sys/linux/intl/loadmsgcat.c
+++ /dev/null
@@ -1,564 +0,0 @@
-#include <newlib.h>
-
-#ifdef _MB_CAPABLE 
-
-/* Load needed message catalogs.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#ifdef _LIBC
-# include <langinfo.h>
-# include <locale.h>
-#endif
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || (defined _LIBC && defined _POSIX_MAPPED_FILES)
-# include <sys/mman.h>
-# undef HAVE_MMAP
-# define HAVE_MMAP	1
-#else
-# undef HAVE_MMAP
-#endif
-
-#include "gettext.h"
-#include "gettextP.h"
-
-#ifdef _GLIBC
-# include "localeinfo.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ISO C functions.  This is required by the standard
-   because some ISO C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define open   __open
-# define close  __close
-# define read   __read
-# define mmap   __mmap
-# define munmap __munmap
-#endif
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define PLURAL_PARSE __gettextparse
-#else
-# define PLURAL_PARSE gettextparse__
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
-
-/* We need a sign, whether a new catalog was loaded, which can be associated
-   with all translations.  This is important if the translations are
-   cached by one of GCC's features.  */
-int _nl_msg_cat_cntr;
-
-#if defined __GNUC__ \
-    || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
-
-/* These structs are the constant expression for the germanic plural
-   form determination.  It represents the expression  "n != 1".  */
-static const struct expression plvar =
-{
-  .nargs = 0,
-  .operation = var,
-};
-static const struct expression plone =
-{
-  .nargs = 0,
-  .operation = num,
-  .val =
-  {
-    .num = 1
-  }
-};
-static struct expression germanic_plural =
-{
-  .nargs = 2,
-  .operation = not_equal,
-  .val =
-  {
-    .args =
-    {
-      [0] = (struct expression *) &plvar,
-      [1] = (struct expression *) &plone
-    }
-  }
-};
-
-# define INIT_GERMANIC_PLURAL()
-
-#else
-
-/* For compilers without support for ISO C 99 struct/union initializers:
-   Initialization at run-time.  */
-
-static struct expression plvar;
-static struct expression plone;
-static struct expression germanic_plural;
-
-static void
-init_germanic_plural ()
-{
-  if (plone.val.num == 0)
-    {
-      plvar.nargs = 0;
-      plvar.operation = var;
-
-      plone.nargs = 0;
-      plone.operation = num;
-      plone.val.num = 1;
-
-      germanic_plural.nargs = 2;
-      germanic_plural.operation = not_equal;
-      germanic_plural.val.args[0] = &plvar;
-      germanic_plural.val.args[1] = &plone;
-    }
-}
-
-# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
-
-#endif
-
-
-/* Initialize the codeset dependent parts of an opened message catalog.
-   Return the header entry.  */
-const char *
-internal_function
-_nl_init_domain_conv (domain_file, domain, domainbinding)
-     struct loaded_l10nfile *domain_file;
-     struct loaded_domain *domain;
-     struct binding *domainbinding;
-{
-  /* Find out about the character set the file is encoded with.
-     This can be found (in textual form) in the entry "".  If this
-     entry does not exist or if this does not contain the `charset='
-     information, we will assume the charset matches the one the
-     current locale and we don't have to perform any conversion.  */
-  char *nullentry;
-  size_t nullentrylen;
-
-  /* Preinitialize fields, to avoid recursion during _nl_find_msg.  */
-  domain->codeset_cntr =
-    (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
-#ifdef _GLIBC
-  domain->conv = (__gconv_t) -1;
-#else
-# if HAVE_ICONV
-  domain->conv = (iconv_t) -1;
-# endif
-#endif
-  domain->conv_tab = NULL;
-
-  /* Get the header entry.  */
-  nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
-
-  if (nullentry != NULL)
-    {
-#if defined _LIBC || HAVE_ICONV
-      const char *charsetstr;
-
-      charsetstr = strstr (nullentry, "charset=");
-      if (charsetstr != NULL)
-	{
-	  size_t len;
-	  char *charset;
-	  const char *outcharset;
-
-	  charsetstr += strlen ("charset=");
-	  len = strcspn (charsetstr, " \t\n");
-
-	  charset = (char *) alloca (len + 1);
-# if defined _LIBC || HAVE_MEMPCPY
-	  *((char *) mempcpy (charset, charsetstr, len)) = '\0';
-# else
-	  memcpy (charset, charsetstr, len);
-	  charset[len] = '\0';
-# endif
-
-	  /* The output charset should normally be determined by the
-	     locale.  But sometimes the locale is not used or not correctly
-	     set up, so we provide a possibility for the user to override
-	     this.  Moreover, the value specified through
-	     bind_textdomain_codeset overrides both.  */
-	  if (domainbinding != NULL && domainbinding->codeset != NULL)
-	    outcharset = domainbinding->codeset;
-	  else
-	    {
-	      outcharset = getenv ("OUTPUT_CHARSET");
-	      if (outcharset == NULL || outcharset[0] == '\0')
-		{
-# ifdef _GLIBC
-		  outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
-# else
-#  if HAVE_ICONV
-		  extern const char *__locale_charset (void);
-		  outcharset = __locale_charset ();
-#  endif
-# endif
-		}
-	    }
-
-# ifdef _GLIBC
-	  /* We always want to use transliteration.  */
-	  outcharset = norm_add_slashes (outcharset, "TRANSLIT");
-	  charset = norm_add_slashes (charset, NULL);
-	  if (__gconv_open (outcharset, charset, &domain->conv,
-			    GCONV_AVOID_NOCONV)
-	      != __GCONV_OK)
-	    domain->conv = (__gconv_t) -1;
-# else
-#  if HAVE_ICONV
-	  /* When using GNU libiconv, we want to use transliteration.  */
-#   if _LIBICONV_VERSION
-	  len = strlen (outcharset);
-	  {
-	    char *tmp = (char *) alloca (len + 10 + 1);
-	    memcpy (tmp, outcharset, len);
-	    memcpy (tmp + len, "//TRANSLIT", 10 + 1);
-	    outcharset = tmp;
-	  }
-#   endif
-	  domain->conv = iconv_open (outcharset, charset);
-#   if _LIBICONV_VERSION
-	  freea (outcharset);
-#   endif
-#  endif
-# endif
-
-	  freea (charset);
-	}
-#endif /* _LIBC || HAVE_ICONV */
-    }
-
-  return nullentry;
-}
-
-/* Frees the codeset dependent parts of an opened message catalog.  */
-void
-internal_function
-_nl_free_domain_conv (domain)
-     struct loaded_domain *domain;
-{
-  if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
-    free (domain->conv_tab);
-
-#ifdef _GLIBC
-  if (domain->conv != (__gconv_t) -1)
-    __gconv_close (domain->conv);
-#else
-# if HAVE_ICONV
-  if (domain->conv != (iconv_t) -1)
-    iconv_close (domain->conv);
-# endif
-#endif
-}
-
-/* Load the message catalogs specified by FILENAME.  If it is no valid
-   message catalog do nothing.  */
-void
-internal_function
-_nl_load_domain (domain_file, domainbinding)
-     struct loaded_l10nfile *domain_file;
-     struct binding *domainbinding;
-{
-  int fd;
-  size_t size;
-#ifdef _LIBC
-  struct stat64 st;
-#else
-  struct stat st;
-#endif
-  struct mo_file_header *data = (struct mo_file_header *) -1;
-  int use_mmap = 0;
-  struct loaded_domain *domain;
-  const char *nullentry;
-
-  domain_file->decided = 1;
-  domain_file->data = NULL;
-
-  /* Note that it would be useless to store domainbinding in domain_file
-     because domainbinding might be == NULL now but != NULL later (after
-     a call to bind_textdomain_codeset).  */
-
-  /* If the record does not represent a valid locale the FILENAME
-     might be NULL.  This can happen when according to the given
-     specification the locale file name is different for XPG and CEN
-     syntax.  */
-  if (domain_file->filename == NULL)
-    return;
-
-  /* Try to open the addressed file.  */
-  fd = open (domain_file->filename, O_RDONLY);
-  if (fd == -1)
-    return;
-
-  /* We must know about the size of the file.  */
-  if (
-#ifdef _LIBC
-      __builtin_expect (fstat64 (fd, &st) != 0, 0)
-#else
-      __builtin_expect (fstat (fd, &st) != 0, 0)
-#endif
-      || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
-      || __builtin_expect (size < sizeof (struct mo_file_header), 0))
-    {
-      /* Something went wrong.  */
-      close (fd);
-      return;
-    }
-
-#ifdef HAVE_MMAP
-  /* Now we are ready to load the file.  If mmap() is available we try
-     this first.  If not available or it failed we try to load it.  */
-  data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
-					 MAP_PRIVATE, fd, 0);
-
-  if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
-    {
-      /* mmap() call was successful.  */
-      close (fd);
-      use_mmap = 1;
-    }
-#endif
-
-  /* If the data is not yet available (i.e. mmap'ed) we try to load
-     it manually.  */
-  if (data == (struct mo_file_header *) -1)
-    {
-      size_t to_read;
-      char *read_ptr;
-
-      data = (struct mo_file_header *) malloc (size);
-      if (data == NULL)
-	return;
-
-      to_read = size;
-      read_ptr = (char *) data;
-      do
-	{
-	  long int nb = (long int) read (fd, read_ptr, to_read);
-	  if (nb <= 0)
-	    {
-#ifdef EINTR
-	      if (nb == -1 && errno == EINTR)
-		continue;
-#endif
-	      close (fd);
-	      return;
-	    }
-	  read_ptr += nb;
-	  to_read -= nb;
-	}
-      while (to_read > 0);
-
-      close (fd);
-    }
-
-  /* Using the magic number we can test whether it really is a message
-     catalog file.  */
-  if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
-			0))
-    {
-      /* The magic number is wrong: not a message catalog file.  */
-#ifdef HAVE_MMAP
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      return;
-    }
-
-  domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
-  if (domain == NULL)
-    return;
-  domain_file->data = domain;
-
-  domain->data = (char *) data;
-  domain->use_mmap = use_mmap;
-  domain->mmap_size = size;
-  domain->must_swap = data->magic != _MAGIC;
-
-  /* Fill in the information about the available tables.  */
-  switch (W (domain->must_swap, data->revision))
-    {
-    case 0:
-      domain->nstrings = W (domain->must_swap, data->nstrings);
-      domain->orig_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->orig_tab_offset));
-      domain->trans_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->trans_tab_offset));
-      domain->hash_size = W (domain->must_swap, data->hash_tab_size);
-      domain->hash_tab = (nls_uint32 *)
-	((char *) data + W (domain->must_swap, data->hash_tab_offset));
-      break;
-    default:
-      /* This is an invalid revision.  */
-#ifdef HAVE_MMAP
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      free (domain);
-      domain_file->data = NULL;
-      return;
-    }
-
-  /* Now initialize the character set converter from the character set
-     the file is encoded with (found in the header entry) to the domain's
-     specified character set or the locale's character set.  */
-  nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
-
-  /* Also look for a plural specification.  */
-  if (nullentry != NULL)
-    {
-      const char *plural;
-      const char *nplurals;
-
-      plural = strstr (nullentry, "plural=");
-      nplurals = strstr (nullentry, "nplurals=");
-      if (plural == NULL || nplurals == NULL)
-	goto no_plural;
-      else
-	{
-	  /* First get the number.  */
-	  char *endp;
-	  unsigned long int n;
-	  struct parse_args args;
-
-	  nplurals += 9;
-	  while (*nplurals != '\0' && isspace (*nplurals))
-	    ++nplurals;
-#if defined HAVE_STRTOUL || defined _LIBC
-	  n = strtoul (nplurals, &endp, 10);
-#else
-	  for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
-	    n = n * 10 + (*endp - '0');
-#endif
-	  domain->nplurals = n;
-	  if (nplurals == endp)
-	    goto no_plural;
-
-	  /* Due to the restrictions bison imposes onto the interface of the
-	     scanner function we have to put the input string and the result
-	     passed up from the parser into the same structure which address
-	     is passed down to the parser.  */
-	  plural += 7;
-	  args.cp = plural;
-	  if (PLURAL_PARSE (&args) != 0)
-	    goto no_plural;
-	  domain->plural = args.res;
-	}
-    }
-  else
-    {
-      /* By default we are using the Germanic form: singular form only
-         for `one', the plural form otherwise.  Yes, this is also what
-         English is using since English is a Germanic language.  */
-    no_plural:
-      INIT_GERMANIC_PLURAL ();
-      domain->plural = &germanic_plural;
-      domain->nplurals = 2;
-    }
-}
-
-
-#ifdef _LIBC
-void
-internal_function
-_nl_unload_domain (domain)
-     struct loaded_domain *domain;
-{
-  if (domain->plural != &germanic_plural)
-    __gettext_free_exp (domain->plural);
-
-  _nl_free_domain_conv (domain);
-
-# ifdef _POSIX_MAPPED_FILES
-  if (domain->use_mmap)
-    munmap ((caddr_t) domain->data, domain->mmap_size);
-  else
-# endif	/* _POSIX_MAPPED_FILES */
-    free ((void *) domain->data);
-
-  free (domain);
-}
-#endif
-
-#endif
diff --git a/newlib/libc/sys/linux/intl/locale.alias b/newlib/libc/sys/linux/intl/locale.alias
deleted file mode 100644
index 08c250d..0000000
--- a/newlib/libc/sys/linux/intl/locale.alias
+++ /dev/null
@@ -1,75 +0,0 @@
-# Locale name alias data base.
-# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-#
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# The format of this file is the same as for the corresponding file of
-# the X Window System, which normally can be found in
-#	/usr/lib/X11/locale/locale.alias
-# A single line contains two fields: an alias and a substitution value.
-# All entries are case independent.
-
-# Note: This file is far from being complete.  If you have a value for
-# your own site which you think might be useful for others too, share
-# it with the rest of us.  Send it using the `glibcbug' script to
-# bugs@gnu.org.
-
-bokmal		no_NO.ISO-8859-1
-bokmål		no_NO.ISO-8859-1
-catalan		ca_ES.ISO-8859-1
-croatian	hr_HR.ISO-8859-2
-czech		cs_CZ.ISO-8859-2
-danish          da_DK.ISO-8859-1
-dansk		da_DK.ISO-8859-1
-deutsch		de_DE.ISO-8859-1
-dutch		nl_NL.ISO-8859-1
-eesti		et_EE.ISO-8859-1
-estonian	et_EE.ISO-8859-1
-finnish         fi_FI.ISO-8859-1
-français	fr_FR.ISO-8859-1
-french		fr_FR.ISO-8859-1
-galego		gl_ES.ISO-8859-1
-galician	gl_ES.ISO-8859-1
-german		de_DE.ISO-8859-1
-greek           el_GR.ISO-8859-7
-hebrew          he_IL.ISO-8859-8
-hrvatski	hr_HR.ISO-8859-2
-hungarian       hu_HU.ISO-8859-2
-icelandic       is_IS.ISO-8859-1
-italian         it_IT.ISO-8859-1
-japanese	ja_JP.eucJP
-japanese.euc	ja_JP.eucJP
-ja_JP		ja_JP.eucJP
-ja_JP.ujis	ja_JP.eucJP
-japanese.sjis	ja_JP.SJIS
-korean		ko_KR.eucKR
-korean.euc 	ko_KR.eucKR
-ko_KR		ko_KR.eucKR
-lithuanian      lt_LT.ISO-8859-13
-nb_NO		no_NO.ISO-8859-1
-nb_NO.ISO-8859-1 no_NO.ISO-8859-1
-norwegian       no_NO.ISO-8859-1
-nynorsk		nn_NO.ISO-8859-1
-polish          pl_PL.ISO-8859-2
-portuguese      pt_PT.ISO-8859-1
-romanian        ro_RO.ISO-8859-2
-russian         ru_RU.ISO-8859-5
-slovak          sk_SK.ISO-8859-2
-slovene         sl_SI.ISO-8859-2
-slovenian       sl_SI.ISO-8859-2
-spanish         es_ES.ISO-8859-1
-swedish         sv_SE.ISO-8859-1
-thai		th_TH.TIS-620
-turkish         tr_TR.ISO-8859-9
diff --git a/newlib/libc/sys/linux/intl/localealias.c b/newlib/libc/sys/linux/intl/localealias.c
deleted file mode 100644
index f3a8923..0000000
--- a/newlib/libc/sys/linux/intl/localealias.c
+++ /dev/null
@@ -1,445 +0,0 @@
-#include <newlib.h>
-
-#ifdef _MB_CAPABLE
-
-/* Handle aliases for locale names.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#if defined _GLIBC || defined HAVE___FSETLOCKING
-# include <stdio_ext.h>
-#endif
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-
-#ifdef _GLIBC
-# define strcasecmp __strcasecmp
-# ifndef mempcpy
-#  define mempcpy __mempcpy
-# endif
-# define HAVE_MEMPCPY	1
-# define HAVE___FSETLOCKING	1
-#endif
-
-/* We need locking here since we can be called from different places.  */
-# include <bits/libc-lock.h>
-
-__libc_lock_define_initialized (static, lock);
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Some optimizations for glibc.  */
-#ifdef _GLIBC
-# define FEOF(fp)		feof_unlocked (fp)
-# define FGETS(buf, n, fp)	fgets_unlocked (buf, n, fp)
-#else
-# define FEOF(fp)		feof (fp)
-# define FGETS(buf, n, fp)	fgets (buf, n, fp)
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
-
-#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED
-# undef fgets
-# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
-#endif
-#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED
-# undef feof
-# define feof(s) feof_unlocked (s)
-#endif
-
-
-struct alias_map
-{
-  const char *alias;
-  const char *value;
-};
-
-
-static char *string_space;
-static size_t string_space_act;
-static size_t string_space_max;
-static struct alias_map *map;
-static size_t nmap;
-static size_t maxmap;
-
-
-/* Prototypes for local functions.  */
-static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
-     internal_function;
-static int extend_alias_table PARAMS ((void));
-static int alias_compare PARAMS ((const struct alias_map *map1,
-				  const struct alias_map *map2));
-
-
-const char *
-_nl_expand_alias (name)
-    const char *name;
-{
-  static const char *locale_alias_path = LOCALE_ALIAS_PATH;
-  struct alias_map *retval;
-  const char *result = NULL;
-  size_t added;
-
-#ifdef _LIBC
-  __libc_lock_lock (lock);
-#endif
-
-  do
-    {
-      struct alias_map item;
-
-      item.alias = name;
-
-      if (nmap > 0)
-	retval = (struct alias_map *) bsearch (&item, map, nmap,
-					       sizeof (struct alias_map),
-					       (int (*) PARAMS ((const void *,
-								 const void *))
-						) alias_compare);
-      else
-	retval = NULL;
-
-      /* We really found an alias.  Return the value.  */
-      if (retval != NULL)
-	{
-	  result = retval->value;
-	  break;
-	}
-
-      /* Perhaps we can find another alias file.  */
-      added = 0;
-      while (added == 0 && locale_alias_path[0] != '\0')
-	{
-	  const char *start;
-
-	  while (locale_alias_path[0] == ':')
-	    ++locale_alias_path;
-	  start = locale_alias_path;
-
-	  while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
-	    ++locale_alias_path;
-
-	  if (start < locale_alias_path)
-	    added = read_alias_file (start, locale_alias_path - start);
-	}
-    }
-  while (added != 0);
-
-#ifdef _LIBC
-  __libc_lock_unlock (lock);
-#endif
-
-  return result;
-}
-
-
-static size_t
-internal_function
-read_alias_file (fname, fname_len)
-     const char *fname;
-     int fname_len;
-{
-  FILE *fp;
-  char *full_fname;
-  size_t added;
-  static const char aliasfile[] = "/locale.alias";
-
-  full_fname = (char *) alloca (fname_len + sizeof aliasfile);
-#ifdef HAVE_MEMPCPY
-  mempcpy (mempcpy (full_fname, fname, fname_len),
-	   aliasfile, sizeof aliasfile);
-#else
-  memcpy (full_fname, fname, fname_len);
-  memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
-#endif
-
-  fp = fopen (full_fname, "r");
-  freea (full_fname);
-  if (fp == NULL)
-    return 0;
-
-#ifdef HAVE___FSETLOCKING
-  /* No threads present.  */
-  __fsetlocking (fp, FSETLOCKING_BYCALLER);
-#endif
-
-  added = 0;
-  while (!FEOF (fp))
-    {
-      /* It is a reasonable approach to use a fix buffer here because
-	 a) we are only interested in the first two fields
-	 b) these fields must be usable as file names and so must not
-	    be that long
-       */
-      char buf[BUFSIZ];
-      char *alias;
-      char *value;
-      char *cp;
-
-      if (FGETS (buf, sizeof buf, fp) == NULL)
-	/* EOF reached.  */
-	break;
-
-      /* Possibly not the whole line fits into the buffer.  Ignore
-	 the rest of the line.  */
-      if (strchr (buf, '\n') == NULL)
-	{
-	  char altbuf[BUFSIZ];
-	  do
-	    if (FGETS (altbuf, sizeof altbuf, fp) == NULL)
-	      /* Make sure the inner loop will be left.  The outer loop
-		 will exit at the `feof' test.  */
-	      break;
-	  while (strchr (altbuf, '\n') == NULL);
-	}
-
-      cp = buf;
-      /* Ignore leading white space.  */
-      while (isspace (cp[0]))
-	++cp;
-
-      /* A leading '#' signals a comment line.  */
-      if (cp[0] != '\0' && cp[0] != '#')
-	{
-	  alias = cp++;
-	  while (cp[0] != '\0' && !isspace (cp[0]))
-	    ++cp;
-	  /* Terminate alias name.  */
-	  if (cp[0] != '\0')
-	    *cp++ = '\0';
-
-	  /* Now look for the beginning of the value.  */
-	  while (isspace (cp[0]))
-	    ++cp;
-
-	  if (cp[0] != '\0')
-	    {
-	      size_t alias_len;
-	      size_t value_len;
-
-	      value = cp++;
-	      while (cp[0] != '\0' && !isspace (cp[0]))
-		++cp;
-	      /* Terminate value.  */
-	      if (cp[0] == '\n')
-		{
-		  /* This has to be done to make the following test
-		     for the end of line possible.  We are looking for
-		     the terminating '\n' which do not overwrite here.  */
-		  *cp++ = '\0';
-		  *cp = '\n';
-		}
-	      else if (cp[0] != '\0')
-		*cp++ = '\0';
-
-	      if (nmap >= maxmap)
-		if (__builtin_expect (extend_alias_table (), 0))
-		  return added;
-
-	      alias_len = strlen (alias) + 1;
-	      value_len = strlen (value) + 1;
-
-	      if (string_space_act + alias_len + value_len > string_space_max)
-		{
-		  /* Increase size of memory pool.  */
-		  size_t new_size = (string_space_max
-				     + (alias_len + value_len > 1024
-					? alias_len + value_len : 1024));
-		  char *new_pool = (char *) realloc (string_space, new_size);
-		  if (new_pool == NULL)
-		    return added;
-
-		  if (__builtin_expect (string_space != new_pool, 0))
-		    {
-		      size_t i;
-
-		      for (i = 0; i < nmap; i++)
-			{
-			  map[i].alias += new_pool - string_space;
-			  map[i].value += new_pool - string_space;
-			}
-		    }
-
-		  string_space = new_pool;
-		  string_space_max = new_size;
-		}
-
-	      map[nmap].alias = memcpy (&string_space[string_space_act],
-					alias, alias_len);
-	      string_space_act += alias_len;
-
-	      map[nmap].value = memcpy (&string_space[string_space_act],
-					value, value_len);
-	      string_space_act += value_len;
-
-	      ++nmap;
-	      ++added;
-	    }
-	}
-    }
-
-  /* Should we test for ferror()?  I think we have to silently ignore
-     errors.  --drepper  */
-  fclose (fp);
-
-  if (added > 0)
-    qsort (map, nmap, sizeof (struct alias_map),
-	   (int (*) PARAMS ((const void *, const void *))) alias_compare);
-
-  return added;
-}
-
-
-static int
-extend_alias_table ()
-{
-  size_t new_size;
-  struct alias_map *new_map;
-
-  new_size = maxmap == 0 ? 100 : 2 * maxmap;
-  new_map = (struct alias_map *) realloc (map, (new_size
-						* sizeof (struct alias_map)));
-  if (new_map == NULL)
-    /* Simply don't extend: we don't have any more core.  */
-    return -1;
-
-  map = new_map;
-  maxmap = new_size;
-  return 0;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  if (string_space != NULL)
-    free (string_space);
-  if (map != NULL)
-    free (map);
-}
-text_set_element (__libc_subfreeres, free_mem);
-#endif
-
-
-static int
-alias_compare (map1, map2)
-     const struct alias_map *map1;
-     const struct alias_map *map2;
-{
-#if defined _LIBC || defined HAVE_STRCASECMP
-  return strcasecmp (map1->alias, map2->alias);
-#else
-  const unsigned char *p1 = (const unsigned char *) map1->alias;
-  const unsigned char *p2 = (const unsigned char *) map2->alias;
-  unsigned char c1, c2;
-
-  if (p1 == p2)
-    return 0;
-
-  do
-    {
-      /* I know this seems to be odd but the tolower() function in
-	 some systems libc cannot handle nonalpha characters.  */
-      c1 = isupper (*p1) ? tolower (*p1) : *p1;
-      c2 = isupper (*p2) ? tolower (*p2) : *p2;
-      if (c1 == '\0')
-	break;
-      ++p1;
-      ++p2;
-    }
-  while (c1 == c2);
-
-  return c1 - c2;
-#endif
-}
-
-#endif /* _MB_CAPABLE */
diff --git a/newlib/libc/sys/linux/intl/ngettext.c b/newlib/libc/sys/linux/intl/ngettext.c
deleted file mode 100644
index 70d4383..0000000
--- a/newlib/libc/sys/linux/intl/ngettext.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Implementation of ngettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# ifdef STDC_HEADERS
-#  include <stdlib.h>		/* Just for NULL.  */
-# else
-#  ifdef HAVE_STRING_H
-#   include <string.h>
-#  else
-#   define NULL ((void *) 0)
-#  endif
-# endif
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-#include <locale.h>
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define NGETTEXT __ngettext
-# define DCNGETTEXT __dcngettext
-#else
-# define NGETTEXT ngettext__
-# define DCNGETTEXT dcngettext__
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-NGETTEXT (msgid1, msgid2, n)
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__ngettext, ngettext);
-#endif
diff --git a/newlib/libc/sys/linux/intl/open_catalog.c b/newlib/libc/sys/linux/intl/open_catalog.c
deleted file mode 100644
index a0c4a80..0000000
--- a/newlib/libc/sys/linux/intl/open_catalog.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/* Copyright (C) 1996-2000, 2001, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper, <drepper@gnu.org>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <byteswap.h>
-#include <endian.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#ifdef _POSIX_MAPPED_FILES
-# include <sys/mman.h>
-#endif
-#include <sys/stat.h>
-
-#include "catgetsinfo.h"
-
-
-#define SWAPU32(w) bswap_32 (w)
-
-
-int
-__open_catalog (const char *cat_name, const char *nlspath, const char *env_var,
-		__nl_catd catalog)
-{
-  int fd = -1;
-  struct stat64 st;
-  int swapping;
-  size_t cnt;
-  size_t max_offset;
-  size_t tab_size;
-  const char *lastp;
-  int result = -1;
-
-  if (strchr (cat_name, '/') != NULL || nlspath == NULL)
-    fd = __open (cat_name, O_RDONLY);
-  else
-    {
-      const char *run_nlspath = nlspath;
-#define ENOUGH(n)							      \
-  if (__builtin_expect (bufact + (n) >= bufmax, 0))			      \
-    {									      \
-      char *old_buf = buf;						      \
-      bufmax += 256 + (n);						      \
-      buf = (char *) alloca (bufmax);					      \
-      memcpy (buf, old_buf, bufact);					      \
-    }
-
-      /* The RUN_NLSPATH variable contains a colon separated list of
-	 descriptions where we expect to find catalogs.  We have to
-	 recognize certain % substitutions and stop when we found the
-	 first existing file.  */
-      char *buf;
-      size_t bufact;
-      size_t bufmax;
-      size_t len;
-
-      buf = NULL;
-      bufmax = 0;
-
-      fd = -1;
-      while (*run_nlspath != '\0')
-	{
-	  bufact = 0;
-
-	  if (*run_nlspath == ':')
-	    {
-	      /* Leading colon or adjacent colons - treat same as %N.  */
-	      len = strlen (cat_name);
-	      ENOUGH (len);
-	      memcpy (&buf[bufact], cat_name, len);
-	      bufact += len;
-	    }
-	  else
-	    while (*run_nlspath != ':' && *run_nlspath != '\0')
-	      if (*run_nlspath == '%')
-		{
-		  const char *tmp;
-
-		  ++run_nlspath;	/* We have seen the `%'.  */
-		  switch (*run_nlspath++)
-		    {
-		    case 'N':
-		      /* Use the catalog name.  */
-		      len = strlen (cat_name);
-		      ENOUGH (len);
-		      memcpy (&buf[bufact], cat_name, len);
-		      bufact += len;
-		      break;
-		    case 'L':
-		      /* Use the current locale category value.  */
-		      len = strlen (env_var);
-		      ENOUGH (len);
-		      memcpy (&buf[bufact], env_var, len);
-		      bufact += len;
-		      break;
-		    case 'l':
-		      /* Use language element of locale category value.  */
-		      tmp = env_var;
-		      do
-			{
-			  ENOUGH (1);
-			  buf[bufact++] = *tmp++;
-			}
-		      while (*tmp != '\0' && *tmp != '_' && *tmp != '.');
-		      break;
-		    case 't':
-		      /* Use territory element of locale category value.  */
-		      tmp = env_var;
-		      do
-			++tmp;
-		      while (*tmp != '\0' && *tmp != '_' && *tmp != '.');
-		      if (*tmp == '_')
-			{
-			  ++tmp;
-			  do
-			    {
-			      ENOUGH (1);
-			      buf[bufact++] = *tmp++;
-			    }
-			  while (*tmp != '\0' && *tmp != '.');
-			}
-		      break;
-		    case 'c':
-		      /* Use code set element of locale category value.  */
-		      tmp = env_var;
-		      do
-			++tmp;
-		      while (*tmp != '\0' && *tmp != '.');
-		      if (*tmp == '.')
-			{
-			  ++tmp;
-			  do
-			    {
-			      ENOUGH (1);
-			      buf[bufact++] = *tmp++;
-			    }
-			  while (*tmp != '\0');
-			}
-		      break;
-		    case '%':
-		      ENOUGH (1);
-		      buf[bufact++] = '%';
-		      break;
-		    default:
-		      /* Unknown variable: ignore this path element.  */
-		      bufact = 0;
-		      while (*run_nlspath != '\0' && *run_nlspath != ':')
-			++run_nlspath;
-		      break;
-		    }
-		}
-	      else
-		{
-		  ENOUGH (1);
-		  buf[bufact++] = *run_nlspath++;
-		}
-
-	  ENOUGH (1);
-	  buf[bufact] = '\0';
-
-	  if (bufact != 0)
-	    {
-	      fd = __open (buf, O_RDONLY);
-	      if (fd >= 0)
-		break;
-	    }
-
-	  ++run_nlspath;
-	}
-    }
-
-  /* Avoid dealing with directories and block devices */
-  if (__builtin_expect (fd, 0) < 0)
-    return -1;
-
-  if (__builtin_expect (fstat64 (fd, &st), 0) < 0)
-    goto close_unlock_return;
-
-  if (__builtin_expect (!S_ISREG (st.st_mode), 0)
-      || st.st_size < sizeof (struct catalog_obj))
-    {
-      /* `errno' is not set correctly but the file is not usable.
-	 Use an reasonable error value.  */
-      __set_errno (EINVAL);
-      goto close_unlock_return;
-    }
-
-  catalog->file_size = st.st_size;
-#ifdef _POSIX_MAPPED_FILES
-# ifndef MAP_COPY
-    /* Linux seems to lack read-only copy-on-write.  */
-#  define MAP_COPY MAP_PRIVATE
-# endif
-# ifndef MAP_FILE
-    /* Some systems do not have this flag; it is superfluous.  */
-#  define MAP_FILE 0
-# endif
-# ifndef MAP_INHERIT
-    /* Some systems might lack this; they lose.  */
-#  define MAP_INHERIT 0
-# endif
-  catalog->file_ptr =
-    (struct catalog_obj *) __mmap (NULL, st.st_size, PROT_READ,
-				   MAP_FILE|MAP_COPY|MAP_INHERIT, fd, 0);
-  if (__builtin_expect (catalog->file_ptr != (struct catalog_obj *) MAP_FAILED,
-			1))
-    /* Tell the world we managed to mmap the file.  */
-    catalog->status = mmapped;
-  else
-#endif /* _POSIX_MAPPED_FILES */
-    {
-      /* mmap failed perhaps because the system call is not
-	 implemented.  Try to load the file.  */
-      size_t todo;
-      catalog->file_ptr = malloc (st.st_size);
-      if (catalog->file_ptr == NULL)
-	goto close_unlock_return;
-
-      todo = st.st_size;
-      /* Save read, handle partial reads.  */
-      do
-	{
-	  size_t now = __read (fd, (((char *) catalog->file_ptr)
-				    + (st.st_size - todo)), todo);
-	  if (now == 0 || now == (size_t) -1)
-	    {
-#ifdef EINTR
-	      if (now == (size_t) -1 && errno == EINTR)
-		continue;
-#endif
-	      free ((void *) catalog->file_ptr);
-	      goto close_unlock_return;
-	    }
-	  todo -= now;
-	}
-      while (todo > 0);
-      catalog->status = malloced;
-    }
-
-  /* Determine whether the file is a catalog file and if yes whether
-     it is written using the correct byte order.  Else we have to swap
-     the values.  */
-  if (__builtin_expect (catalog->file_ptr->magic, CATGETS_MAGIC)
-      == CATGETS_MAGIC)
-    swapping = 0;
-  else if (catalog->file_ptr->magic == SWAPU32 (CATGETS_MAGIC))
-    swapping = 1;
-  else
-    {
-    invalid_file:
-      /* Invalid file.  Free the resources and mark catalog as not
-	 usable.  */
-#ifdef _POSIX_MAPPED_FILES
-      if (catalog->status == mmapped)
-	__munmap ((void *) catalog->file_ptr, catalog->file_size);
-      else
-#endif	/* _POSIX_MAPPED_FILES */
-	free (catalog->file_ptr);
-      goto close_unlock_return;
-    }
-
-#define SWAP(x) (swapping ? SWAPU32 (x) : (x))
-
-  /* Get dimensions of the used hashing table.  */
-  catalog->plane_size = SWAP (catalog->file_ptr->plane_size);
-  catalog->plane_depth = SWAP (catalog->file_ptr->plane_depth);
-
-  /* The file contains two versions of the pointer tables.  Pick the
-     right one for the local byte order.  */
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-  catalog->name_ptr = &catalog->file_ptr->name_ptr[0];
-#elif __BYTE_ORDER == __BIG_ENDIAN
-  catalog->name_ptr = &catalog->file_ptr->name_ptr[catalog->plane_size
-						  * catalog->plane_depth
-						  * 3];
-#else
-# error Cannot handle __BYTE_ORDER byte order
-#endif
-
-  /* The rest of the file contains all the strings.  They are
-     addressed relative to the position of the first string.  */
-  catalog->strings =
-    (const char *) &catalog->file_ptr->name_ptr[catalog->plane_size
-					       * catalog->plane_depth * 3 * 2];
-
-  /* Determine the largest string offset mentioned in the table.  */
-  max_offset = 0;
-  tab_size = 3 * catalog->plane_size * catalog->plane_depth;
-  for (cnt = 2; cnt < tab_size; cnt += 3)
-    if (catalog->name_ptr[cnt] > max_offset)
-      max_offset = catalog->name_ptr[cnt];
-
-  /* Now we can check whether the file is large enough to contain the
-     tables it says it contains.  */
-  if (st.st_size <= (sizeof (struct catalog_obj) + 2 * tab_size + max_offset))
-    /* The last string is not contained in the file.  */
-    goto invalid_file;
-
-  lastp = catalog->strings + max_offset;
-  max_offset = (st.st_size
-		- sizeof (struct catalog_obj) + 2 * tab_size + max_offset);
-  while (*lastp != '\0')
-    {
-      if (--max_offset == 0)
-	goto invalid_file;
-      ++lastp;
-    }
-
-  /* We succeeded.  */
-  result = 0;
-
-  /* Release the lock again.  */
- close_unlock_return:
-  __close (fd);
-
-  return result;
-}
diff --git a/newlib/libc/sys/linux/intl/plural.c b/newlib/libc/sys/linux/intl/plural.c
deleted file mode 100644
index 7585c27..0000000
--- a/newlib/libc/sys/linux/intl/plural.c
+++ /dev/null
@@ -1,1319 +0,0 @@
-
-/*  A Bison parser, made from plural.y
-    by GNU Bison version 1.28  */
-
-#define YYBISON 1  /* Identify Bison output.  */
-
-#define yyparse __gettextparse
-#define yylex __gettextlex
-#define yyerror __gettexterror
-#define yylval __gettextlval
-#define yychar __gettextchar
-#define yydebug __gettextdebug
-#define yynerrs __gettextnerrs
-#define	EQUOP2	257
-#define	CMPOP2	258
-#define	ADDOP2	259
-#define	MULOP2	260
-#define	NUMBER	261
-
-#line 1 "plural.y"
-
-/* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include "gettextP.h"
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define FREE_EXPRESSION __gettext_free_exp
-#else
-# define FREE_EXPRESSION gettext_free_exp__
-# define __gettextparse gettextparse__
-#endif
-
-#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
-#define YYPARSE_PARAM	arg
-
-#line 46 "plural.y"
-typedef union {
-  unsigned long int num;
-  enum operator op;
-  struct expression *exp;
-} YYSTYPE;
-#line 52 "plural.y"
-
-/* Prototypes for local functions.  */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
-					   struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
-						   struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
-					     struct expression *left,
-					     struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
-						   struct expression *bexp,
-						   struct expression *tbranch,
-						   struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
-
-/* Allocation of expressions.  */
-
-static struct expression *
-new_exp (nargs, op, args)
-     int nargs;
-     enum operator op;
-     struct expression * const *args;
-{
-  int i;
-  struct expression *newp;
-
-  /* If any of the argument could not be malloc'ed, just return NULL.  */
-  for (i = nargs - 1; i >= 0; i--)
-    if (args[i] == NULL)
-      goto fail;
-
-  /* Allocate a new expression.  */
-  newp = (struct expression *) malloc (sizeof (*newp));
-  if (newp != NULL)
-    {
-      newp->nargs = nargs;
-      newp->operation = op;
-      for (i = nargs - 1; i >= 0; i--)
-	newp->val.args[i] = args[i];
-      return newp;
-    }
-
- fail:
-  for (i = nargs - 1; i >= 0; i--)
-    FREE_EXPRESSION (args[i]);
-
-  return NULL;
-}
-
-static inline struct expression *
-new_exp_0 (op)
-     enum operator op;
-{
-  return new_exp (0, op, NULL);
-}
-
-static inline struct expression *
-new_exp_1 (op, right)
-     enum operator op;
-     struct expression *right;
-{
-  struct expression *args[1];
-
-  args[0] = right;
-  return new_exp (1, op, args);
-}
-
-static struct expression *
-new_exp_2 (op, left, right)
-     enum operator op;
-     struct expression *left;
-     struct expression *right;
-{
-  struct expression *args[2];
-
-  args[0] = left;
-  args[1] = right;
-  return new_exp (2, op, args);
-}
-
-static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
-     enum operator op;
-     struct expression *bexp;
-     struct expression *tbranch;
-     struct expression *fbranch;
-{
-  struct expression *args[3];
-
-  args[0] = bexp;
-  args[1] = tbranch;
-  args[2] = fbranch;
-  return new_exp (3, op, args);
-}
-
-#include <stdio.h>
-
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
-#endif
-
-
-
-#define	YYFINAL		27
-#define	YYFLAG		-32768
-#define	YYNTBASE	16
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
-
-static const char yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    10,     2,     2,     2,     2,     5,     2,    14,
-    15,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,    12,     2,     2,
-     2,     2,     3,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,    13,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     4,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     6,     7,     8,     9,
-    11
-};
-
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     2,     8,    12,    16,    20,    24,    28,    32,    35,
-    37,    39
-};
-
-static const short yyrhs[] = {    17,
-     0,    17,     3,    17,    12,    17,     0,    17,     4,    17,
-     0,    17,     5,    17,     0,    17,     6,    17,     0,    17,
-     7,    17,     0,    17,     8,    17,     0,    17,     9,    17,
-     0,    10,    17,     0,    13,     0,    11,     0,    14,    17,
-    15,     0
-};
-
-#endif
-
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-   171,   179,   183,   187,   191,   195,   199,   203,   207,   211,
-   215,   220
-};
-#endif
-
-
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
-
-static const char * const yytname[] = {   "$","error","$undefined.","'?'","'|'",
-"'&'","EQUOP2","CMPOP2","ADDOP2","MULOP2","'!'","NUMBER","':'","'n'","'('","')'",
-"start","exp", NULL
-};
-#endif
-
-static const short yyr1[] = {     0,
-    16,    17,    17,    17,    17,    17,    17,    17,    17,    17,
-    17,    17
-};
-
-static const short yyr2[] = {     0,
-     1,     5,     3,     3,     3,     3,     3,     3,     2,     1,
-     1,     3
-};
-
-static const short yydefact[] = {     0,
-     0,    11,    10,     0,     1,     9,     0,     0,     0,     0,
-     0,     0,     0,     0,    12,     0,     3,     4,     5,     6,
-     7,     8,     0,     2,     0,     0,     0
-};
-
-static const short yydefgoto[] = {    25,
-     5
-};
-
-static const short yypact[] = {    -9,
-    -9,-32768,-32768,    -9,    34,-32768,    11,    -9,    -9,    -9,
-    -9,    -9,    -9,    -9,-32768,    24,    39,    43,    16,    26,
-    -3,-32768,    -9,    34,    21,    53,-32768
-};
-
-static const short yypgoto[] = {-32768,
-    -1
-};
-
-
-#define	YYLAST		53
-
-
-static const short yytable[] = {     6,
-     1,     2,     7,     3,     4,    14,    16,    17,    18,    19,
-    20,    21,    22,     8,     9,    10,    11,    12,    13,    14,
-    26,    24,    12,    13,    14,    15,     8,     9,    10,    11,
-    12,    13,    14,    13,    14,    23,     8,     9,    10,    11,
-    12,    13,    14,    10,    11,    12,    13,    14,    11,    12,
-    13,    14,    27
-};
-
-static const short yycheck[] = {     1,
-    10,    11,     4,    13,    14,     9,     8,     9,    10,    11,
-    12,    13,    14,     3,     4,     5,     6,     7,     8,     9,
-     0,    23,     7,     8,     9,    15,     3,     4,     5,     6,
-     7,     8,     9,     8,     9,    12,     3,     4,     5,     6,
-     7,     8,     9,     5,     6,     7,     8,     9,     6,     7,
-     8,     9,     0
-};
-#define YYPURE 1
-
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/lib/bison.simple"
-/* This file comes from bison-1.28.  */
-
-/* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
-
-   This program 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 program 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 program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
-
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-	 instead, just don't use alloca.  */
-#include <malloc.h>
-#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-		 and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
-#endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
-
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
-#define YYEOF		0
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-#define YYFAIL		goto yyerrlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-#ifndef YYPURE
-#define YYLEX		yylex()
-#endif
-
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
-
-/* If nonreentrant, generate the variables here */
-
-#ifndef YYPURE
-
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
-
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
-#endif
-
-int yynerrs;			/*  number of parse errors so far       */
-#endif  /* not YYPURE */
-
-#if YYDEBUG != 0
-int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
-#endif
-
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
-
-#ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
-#endif
-
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
-
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
-#endif
-
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
-
-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
-#else				/* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#else /* __cplusplus */
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
-{
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#endif
-#endif
-
-#line 217 "/usr/lib/bison.simple"
-
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-#ifdef YYPARSE_PARAM
-int yyparse (void *);
-#else
-int yyparse (void);
-#endif
-#endif
-
-int
-yyparse(YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
-
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
-
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
-
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
-
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
-
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
-
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
-
-  int yylen;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss - 1;
-  yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
-
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
-
-  *++yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
-      /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
-#else /* no yyoverflow */
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  if (yyfree_stacks)
-	    {
-	      free (yyss);
-	      free (yyvs);
-#ifdef YYLSP_NEEDED
-	      free (yyls);
-#endif
-	    }
-	  return 2;
-	}
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-	yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-		   size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-		   size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-		   size * (unsigned int) sizeof (*yylsp));
-#endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
-
-      if (yyssp >= yyss + yystacksize - 1)
-	YYABORT;
-    }
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
-
-  goto yybackup;
- yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
-      if (yydebug)
-	{
-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise meaning
-	     of a token, for further debugging info.  */
-#ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-#endif
-	  fprintf (stderr, ")\n");
-	}
-#endif
-    }
-
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
-    goto yydefault;
-
-  yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-/* Do the default action for the current state.  */
-yydefault:
-
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
-yyreduce:
-  yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      int i;
-
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-
-  switch (yyn) {
-
-case 1:
-#line 172 "plural.y"
-{
-	    if (yyvsp[0].exp == NULL)
-	      YYABORT;
-	    ((struct parse_args *) arg)->res = yyvsp[0].exp;
-	  ;
-    break;}
-case 2:
-#line 180 "plural.y"
-{
-	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 3:
-#line 184 "plural.y"
-{
-	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 4:
-#line 188 "plural.y"
-{
-	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 5:
-#line 192 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 6:
-#line 196 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 7:
-#line 200 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 8:
-#line 204 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 9:
-#line 208 "plural.y"
-{
-	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
-	  ;
-    break;}
-case 10:
-#line 212 "plural.y"
-{
-	    yyval.exp = new_exp_0 (var);
-	  ;
-    break;}
-case 11:
-#line 216 "plural.y"
-{
-	    if ((yyval.exp = new_exp_0 (num)) != NULL)
-	      yyval.exp->val.num = yyvsp[0].num;
-	  ;
-    break;}
-case 12:
-#line 221 "plural.y"
-{
-	    yyval.exp = yyvsp[-1].exp;
-	  ;
-    break;}
-}
-   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/lib/bison.simple"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
-#endif
-
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTBASE];
-
-  goto yynewstate;
-
-yyerrlab:   /* here on detecting error */
-
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
-    {
-      ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-	{
-	  int size = 0;
-	  char *msg;
-	  int x, count;
-
-	  count = 0;
-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
-	    if (yycheck[x + yyn] == x)
-	      size += strlen(yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
-	  if (msg != 0)
-	    {
-	      strcpy(msg, "parse error");
-
-	      if (count < 5)
-		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
-		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
-		      }
-		}
-	      yyerror(msg);
-	      free(msg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exceeded");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
-    }
-
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
-
-  if (yyerrstatus == 3)
-    {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
-
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-yyerrdefault:  /* current state does not do anything special for the error token. */
-
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
-#endif
-
-yyerrpop:   /* pop the current state because it cannot handle the error token */
-
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-yyerrhandle:
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrpop;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  yystate = yyn;
-  goto yynewstate;
-
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 0;
-
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 1;
-}
-#line 226 "plural.y"
-
-
-void
-internal_function
-FREE_EXPRESSION (exp)
-     struct expression *exp;
-{
-  if (exp == NULL)
-    return;
-
-  /* Handle the recursive case.  */
-  switch (exp->nargs)
-    {
-    case 3:
-      FREE_EXPRESSION (exp->val.args[2]);
-      /* FALLTHROUGH */
-    case 2:
-      FREE_EXPRESSION (exp->val.args[1]);
-      /* FALLTHROUGH */
-    case 1:
-      FREE_EXPRESSION (exp->val.args[0]);
-      /* FALLTHROUGH */
-    default:
-      break;
-    }
-
-  free (exp);
-}
-
-
-static int
-yylex (lval, pexp)
-     YYSTYPE *lval;
-     const char **pexp;
-{
-  const char *exp = *pexp;
-  int result;
-
-  while (1)
-    {
-      if (exp[0] == '\0')
-	{
-	  *pexp = exp;
-	  return YYEOF;
-	}
-
-      if (exp[0] != ' ' && exp[0] != '\t')
-	break;
-
-      ++exp;
-    }
-
-  result = *exp++;
-  switch (result)
-    {
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7': case '8': case '9':
-      {
-	unsigned long int n = result - '0';
-	while (exp[0] >= '0' && exp[0] <= '9')
-	  {
-	    n *= 10;
-	    n += exp[0] - '0';
-	    ++exp;
-	  }
-	lval->num = n;
-	result = NUMBER;
-      }
-      break;
-
-    case '=':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = equal;
-	  result = EQUOP2;
-	}
-      else
-	result = YYERRCODE;
-      break;
-
-    case '!':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = not_equal;
-	  result = EQUOP2;
-	}
-      break;
-
-    case '&':
-    case '|':
-      if (exp[0] == result)
-	++exp;
-      else
-	result = YYERRCODE;
-      break;
-
-    case '<':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = less_or_equal;
-	}
-      else
-	lval->op = less_than;
-      result = CMPOP2;
-      break;
-
-    case '>':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = greater_or_equal;
-	}
-      else
-	lval->op = greater_than;
-      result = CMPOP2;
-      break;
-
-    case '*':
-      lval->op = mult;
-      result = MULOP2;
-      break;
-
-    case '/':
-      lval->op = divide;
-      result = MULOP2;
-      break;
-
-    case '%':
-      lval->op = module;
-      result = MULOP2;
-      break;
-
-    case '+':
-      lval->op = plus;
-      result = ADDOP2;
-      break;
-
-    case '-':
-      lval->op = minus;
-      result = ADDOP2;
-      break;
-
-    case 'n':
-    case '?':
-    case ':':
-    case '(':
-    case ')':
-      /* Nothing, just return the character.  */
-      break;
-
-    case ';':
-    case '\n':
-    case '\0':
-      /* Be safe and let the user call this function again.  */
-      --exp;
-      result = YYEOF;
-      break;
-
-    default:
-      result = YYERRCODE;
-#if YYDEBUG != 0
-      --exp;
-#endif
-      break;
-    }
-
-  *pexp = exp;
-
-  return result;
-}
-
-
-static void
-yyerror (str)
-     const char *str;
-{
-  /* Do nothing.  We don't print error messages here.  */
-}
diff --git a/newlib/libc/sys/linux/intl/plural.y b/newlib/libc/sys/linux/intl/plural.y
deleted file mode 100644
index 90b0004..0000000
--- a/newlib/libc/sys/linux/intl/plural.y
+++ /dev/null
@@ -1,406 +0,0 @@
-%{
-/* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include "gettextP.h"
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define FREE_EXPRESSION __gettext_free_exp
-#else
-# define FREE_EXPRESSION gettext_free_exp__
-# define __gettextparse gettextparse__
-#endif
-
-#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
-#define YYPARSE_PARAM	arg
-%}
-%pure_parser
-%expect 7
-
-%union {
-  unsigned long int num;
-  enum operator op;
-  struct expression *exp;
-}
-
-%{
-/* Prototypes for local functions.  */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
-					   struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
-						   struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
-					     struct expression *left,
-					     struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
-						   struct expression *bexp,
-						   struct expression *tbranch,
-						   struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
-
-/* Allocation of expressions.  */
-
-static struct expression *
-new_exp (nargs, op, args)
-     int nargs;
-     enum operator op;
-     struct expression * const *args;
-{
-  int i;
-  struct expression *newp;
-
-  /* If any of the argument could not be malloc'ed, just return NULL.  */
-  for (i = nargs - 1; i >= 0; i--)
-    if (args[i] == NULL)
-      goto fail;
-
-  /* Allocate a new expression.  */
-  newp = (struct expression *) malloc (sizeof (*newp));
-  if (newp != NULL)
-    {
-      newp->nargs = nargs;
-      newp->operation = op;
-      for (i = nargs - 1; i >= 0; i--)
-	newp->val.args[i] = args[i];
-      return newp;
-    }
-
- fail:
-  for (i = nargs - 1; i >= 0; i--)
-    FREE_EXPRESSION (args[i]);
-
-  return NULL;
-}
-
-static inline struct expression *
-new_exp_0 (op)
-     enum operator op;
-{
-  return new_exp (0, op, NULL);
-}
-
-static inline struct expression *
-new_exp_1 (op, right)
-     enum operator op;
-     struct expression *right;
-{
-  struct expression *args[1];
-
-  args[0] = right;
-  return new_exp (1, op, args);
-}
-
-static struct expression *
-new_exp_2 (op, left, right)
-     enum operator op;
-     struct expression *left;
-     struct expression *right;
-{
-  struct expression *args[2];
-
-  args[0] = left;
-  args[1] = right;
-  return new_exp (2, op, args);
-}
-
-static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
-     enum operator op;
-     struct expression *bexp;
-     struct expression *tbranch;
-     struct expression *fbranch;
-{
-  struct expression *args[3];
-
-  args[0] = bexp;
-  args[1] = tbranch;
-  args[2] = fbranch;
-  return new_exp (3, op, args);
-}
-
-%}
-
-/* This declares that all operators have the same associativity and the
-   precedence order as in C.  See [Harbison, Steele: C, A Reference Manual].
-   There is no unary minus and no bitwise operators.
-   Operators with the same syntactic behaviour have been merged into a single
-   token, to save space in the array generated by bison.  */
-%right '?'		/*   ?		*/
-%left '|'		/*   ||		*/
-%left '&'		/*   &&		*/
-%left EQUOP2		/*   == !=	*/
-%left CMPOP2		/*   < > <= >=	*/
-%left ADDOP2		/*   + -	*/
-%left MULOP2		/*   * / %	*/
-%right '!'		/*   !		*/
-
-%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
-%token <num> NUMBER
-%type <exp> exp
-
-%%
-
-start:	  exp
-	  {
-	    if ($1 == NULL)
-	      YYABORT;
-	    ((struct parse_args *) arg)->res = $1;
-	  }
-	;
-
-exp:	  exp '?' exp ':' exp
-	  {
-	    $$ = new_exp_3 (qmop, $1, $3, $5);
-	  }
-	| exp '|' exp
-	  {
-	    $$ = new_exp_2 (lor, $1, $3);
-	  }
-	| exp '&' exp
-	  {
-	    $$ = new_exp_2 (land, $1, $3);
-	  }
-	| exp EQUOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp CMPOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp ADDOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp MULOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| '!' exp
-	  {
-	    $$ = new_exp_1 (lnot, $2);
-	  }
-	| 'n'
-	  {
-	    $$ = new_exp_0 (var);
-	  }
-	| NUMBER
-	  {
-	    if (($$ = new_exp_0 (num)) != NULL)
-	      $$->val.num = $1;
-	  }
-	| '(' exp ')'
-	  {
-	    $$ = $2;
-	  }
-	;
-
-%%
-
-void
-internal_function
-FREE_EXPRESSION (exp)
-     struct expression *exp;
-{
-  if (exp == NULL)
-    return;
-
-  /* Handle the recursive case.  */
-  switch (exp->nargs)
-    {
-    case 3:
-      FREE_EXPRESSION (exp->val.args[2]);
-      /* FALLTHROUGH */
-    case 2:
-      FREE_EXPRESSION (exp->val.args[1]);
-      /* FALLTHROUGH */
-    case 1:
-      FREE_EXPRESSION (exp->val.args[0]);
-      /* FALLTHROUGH */
-    default:
-      break;
-    }
-
-  free (exp);
-}
-
-
-static int
-yylex (lval, pexp)
-     YYSTYPE *lval;
-     const char **pexp;
-{
-  const char *exp = *pexp;
-  int result;
-
-  while (1)
-    {
-      if (exp[0] == '\0')
-	{
-	  *pexp = exp;
-	  return YYEOF;
-	}
-
-      if (exp[0] != ' ' && exp[0] != '\t')
-	break;
-
-      ++exp;
-    }
-
-  result = *exp++;
-  switch (result)
-    {
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7': case '8': case '9':
-      {
-	unsigned long int n = result - '0';
-	while (exp[0] >= '0' && exp[0] <= '9')
-	  {
-	    n *= 10;
-	    n += exp[0] - '0';
-	    ++exp;
-	  }
-	lval->num = n;
-	result = NUMBER;
-      }
-      break;
-
-    case '=':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = equal;
-	  result = EQUOP2;
-	}
-      else
-	result = YYERRCODE;
-      break;
-
-    case '!':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = not_equal;
-	  result = EQUOP2;
-	}
-      break;
-
-    case '&':
-    case '|':
-      if (exp[0] == result)
-	++exp;
-      else
-	result = YYERRCODE;
-      break;
-
-    case '<':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = less_or_equal;
-	}
-      else
-	lval->op = less_than;
-      result = CMPOP2;
-      break;
-
-    case '>':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = greater_or_equal;
-	}
-      else
-	lval->op = greater_than;
-      result = CMPOP2;
-      break;
-
-    case '*':
-      lval->op = mult;
-      result = MULOP2;
-      break;
-
-    case '/':
-      lval->op = divide;
-      result = MULOP2;
-      break;
-
-    case '%':
-      lval->op = module;
-      result = MULOP2;
-      break;
-
-    case '+':
-      lval->op = plus;
-      result = ADDOP2;
-      break;
-
-    case '-':
-      lval->op = minus;
-      result = ADDOP2;
-      break;
-
-    case 'n':
-    case '?':
-    case ':':
-    case '(':
-    case ')':
-      /* Nothing, just return the character.  */
-      break;
-
-    case ';':
-    case '\n':
-    case '\0':
-      /* Be safe and let the user call this function again.  */
-      --exp;
-      result = YYEOF;
-      break;
-
-    default:
-      result = YYERRCODE;
-#if YYDEBUG != 0
-      --exp;
-#endif
-      break;
-    }
-
-  *pexp = exp;
-
-  return result;
-}
-
-
-static void
-yyerror (str)
-     const char *str;
-{
-  /* Do nothing.  We don't print error messages here.  */
-}
diff --git a/newlib/libc/sys/linux/intl/stpcpy.c b/newlib/libc/sys/linux/intl/stpcpy.c
deleted file mode 100644
index 0af6c67..0000000
--- a/newlib/libc/sys/linux/intl/stpcpy.c
+++ /dev/null
@@ -1,10 +0,0 @@
-char *
-__stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-
diff --git a/newlib/libc/sys/linux/intl/textdomain.c b/newlib/libc/sys/linux/intl/textdomain.c
deleted file mode 100644
index b03ad80..0000000
--- a/newlib/libc/sys/linux/intl/textdomain.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Implementation of the textdomain(3) function.
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) (bcopy (Src, Dst, Num), (Dst))
-# endif
-#endif
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-#include "gettextP.h"
-
-#ifdef _LIBC
-/* We have to handle multi-threaded applications.  */
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_default_domain _nl_default_default_domain__
-# define _nl_current_default_domain _nl_current_default_domain__
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Name of the default text domain.  */
-extern const char _nl_default_default_domain[];
-
-/* Default text domain in which entries for gettext(3) are to be found.  */
-extern const char *_nl_current_default_domain;
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define TEXTDOMAIN __textdomain
-# ifdef _GLIBC
-#  ifndef strdup
-#   define strdup(str) __strdup (str)
-#  endif
-# endif
-#else
-# define TEXTDOMAIN textdomain__
-#endif
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-char *
-TEXTDOMAIN (domainname)
-     const char *domainname;
-{
-  char *new_domain;
-  char *old_domain;
-
-  /* A NULL pointer requests the current setting.  */
-  if (domainname == NULL)
-    return (char *) _nl_current_default_domain;
-
-  __libc_rwlock_wrlock (_nl_state_lock);
-
-  old_domain = (char *) _nl_current_default_domain;
-
-  /* If domain name is the null string set to default domain "messages".  */
-  if (domainname[0] == '\0'
-      || strcmp (domainname, _nl_default_default_domain) == 0)
-    {
-      _nl_current_default_domain = _nl_default_default_domain;
-      new_domain = (char *) _nl_current_default_domain;
-    }
-  else if (strcmp (domainname, old_domain) == 0)
-    /* This can happen and people will use it to signal that some
-       environment variable changed.  */
-    new_domain = old_domain;
-  else
-    {
-      /* If the following malloc fails `_nl_current_default_domain'
-	 will be NULL.  This value will be returned and so signals we
-	 are out of core.  */
-#if defined _LIBC || defined HAVE_STRDUP
-      new_domain = strdup (domainname);
-#else
-      size_t len = strlen (domainname) + 1;
-      new_domain = (char *) malloc (len);
-      if (new_domain != NULL)
-	memcpy (new_domain, domainname, len);
-#endif
-
-      if (new_domain != NULL)
-	_nl_current_default_domain = new_domain;
-    }
-
-  /* We use this possibility to signal a change of the loaded catalogs
-     since this is most likely the case and there is no other easy we
-     to do it.  Do it only when the call was successful.  */
-  if (new_domain != NULL)
-    {
-      ++_nl_msg_cat_cntr;
-
-      if (old_domain != new_domain && old_domain != _nl_default_default_domain)
-	free (old_domain);
-    }
-
-  __libc_rwlock_unlock (_nl_state_lock);
-
-  return new_domain;
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__textdomain, textdomain);
-#endif
diff --git a/newlib/libc/sys/linux/io.c b/newlib/libc/sys/linux/io.c
index 25dccc6..6187e70 100644
--- a/newlib/libc/sys/linux/io.c
+++ b/newlib/libc/sys/linux/io.c
@@ -9,19 +9,16 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#include <sys/uio.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <poll.h>
-#include <machine/syscall.h>
+#include <sys/syscall.h>
 
 
 #define __NR___ioctl __NR_ioctl
 #define __NR___flock __NR_flock
-#define __NR___mknod __NR_mknod
 
-_syscall3(ssize_t,read,int,fd,void *,buf,size_t,count)
-_syscall3(ssize_t,write,int,fd,const void *,buf,size_t,count)
+_syscall3(int,read,int,fd,void *,buf,size_t,count)
+_syscall3(int,write,int,fd,const void *,buf,size_t,count)
 _syscall3(int,open,const char *,file,int,flag,mode_t,mode)
 _syscall1(int,close,int,fd)
 _syscall3(off_t,lseek,int,fd,off_t,offset,int,count)
@@ -29,22 +26,11 @@ _syscall0(int,sync)
 _syscall1(int,dup,int,fd)
 _syscall2(int,dup2,int,oldfd,int,newfd)
 _syscall3(int,fcntl,int,fd,int,cmd,long,arg)
-_syscall1(int,fdatasync,int,fd)
-_syscall1(int,fsync,int,fd)
-_syscall3(int,poll,struct pollfd *,fds,nfds_t,nfds,int,timeout)
 
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-_syscall3(ssize_t,readv,int,fd,const struct iovec *,vec,int,count)
-_syscall3(ssize_t,writev,int,fd,const struct iovec *,buf,int,count)
-#endif
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4
-_syscall2(int,ftruncate,int,fd,off_t,len)
-_syscall2(int,truncate,const char *,path,off_t,len)
-#endif
 
 static _syscall3(int,__ioctl,int,fd,int,request,void *,arg)
 
+
 int ioctl(int fd,int request,...)
 {
     va_list ap;
@@ -56,29 +42,13 @@ int ioctl(int fd,int request,...)
     return res;
 }
 
-static _syscall2(long,__flock,unsigned int,fd,unsigned int,cmd)
 
-int flock(int fd,int operation)
-{
-    return __flock(fd,operation);
-}
+/* Why are all the types gratuituously different ? */
 
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3
+static _syscall2(long,__flock,unsigned int,fd,unsigned int,cmd)
 
-static _syscall3(int,__mknod,const char *,path,mode_t,mode,dev_t,dev)
 
-int mkfifo(const char *path, mode_t mode)
+int flock(int fd,int operation)
 {
-   dev_t dev = 0;
-   return __mknod(path, mode | S_IFIFO, dev);
+    return __flock(fd,operation);
 }
-#endif
-
-weak_alias(__libc_close,__close);
-weak_alias(__libc_fcntl,__fcntl);
-weak_alias(__libc_lseek,__lseek);
-weak_alias(__libc_open,__open);
-weak_alias(__libc_read,__read);
-weak_alias(__libc_write,__write);
-weak_alias(__libc_poll,__poll);
-
diff --git a/newlib/libc/sys/linux/io64.c b/newlib/libc/sys/linux/io64.c
deleted file mode 100644
index 7f87c1e..0000000
--- a/newlib/libc/sys/linux/io64.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* libc/sys/linux/io64.c - large file input/output system calls */
-
-/* Copyright 2002, Red Hat Inc. */
-
-
-#define __KERNEL_PROTOTYPES
-
-#include <stdarg.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <machine/syscall.h>
-
-#define __NR___truncate64 __NR_truncate64
-#define __NR___ftruncate64 __NR_ftruncate64
-
-_syscall2(int,fstat64,int,fd,struct stat64 *,st)
-_syscall2(int,lstat64,const char *,name,struct stat64 *,st)
-_syscall2(int,stat64,const char *,name,struct stat64 *,st)
-
-static _syscall3(int,__truncate64,const char *,name,int,high,int,low)
-
-int __libc_truncate64(const char *name, off64_t length)
-{
-  return __truncate64(name,(length >> 32), (length & 0xffffffff));
-}
-weak_alias(__libc_truncate64,truncate64)
-
-static _syscall3(int,__ftruncate64,int,fd,int,high,int,low);
-
-int __libc_ftruncate64(int fd, off64_t length)
-{
-  return __ftruncate64(fd,(length >> 32),(length & 0xffffffff));
-}
-weak_alias(__libc_ftruncate64,ftruncate64)
-
-static _syscall5(void,_llseek,int,fd,off_t,hi,off_t,lo,loff_t *,pos,int,whence)
-
-loff_t __libc_lseek64(int fd, loff_t offset, int whence)
-{
-  loff_t pos;
-  __libc__llseek(fd, offset >> 32, offset & 0xffffffff, &pos, whence);
-  return pos;
-}
-weak_alias(__libc_lseek64,lseek64);
-weak_alias(__libc_lseek64,_lseek64);
-
-int __libc_open64(const char *path, int oflag, ...)
-{
-   mode_t mode = 0;
-   if (oflag & O_CREAT)
-     {
-       va_list list;
-       va_start(list, oflag);
-       mode = va_arg(list, int);
-       va_end(list);
-     }
-   return __libc_open(path, oflag | O_LARGEFILE, mode);
-}
-weak_alias(__libc_open64,open64);
-weak_alias(__libc_open64,_open64);
-weak_alias(__libc_open64,__open64);
-weak_alias(__libc_fstat64,_fstat64);
-
-
diff --git a/newlib/libc/sys/linux/ipc.c b/newlib/libc/sys/linux/ipc.c
deleted file mode 100644
index 31e2252..0000000
--- a/newlib/libc/sys/linux/ipc.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* libc/sys/linux/ipc.c - IPC semaphore and message queue functions */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#include <sys/types.h>
-#include <sys/sem.h>
-#include <sys/msg.h>
-#include <stdarg.h>
-
-#include <machine/syscall.h>
-
-#define IPC_64 0x100
-
-#define IPCOP_semop	1
-#define IPCOP_semget	2
-#define IPCOP_semctl	3
-#define IPCOP_msgsnd	11
-#define IPCOP_msgrcv	12
-#define IPCOP_msgget	13
-#define IPCOP_msgctl	14
-
-static _syscall5(int,ipc,int,op,int,arg1,int,arg2,int,arg3,void *,arg4);
-
-int
-semget (key_t key, int nsems, int semflgs)
-{
-  return __libc_ipc(IPCOP_semget, (int)key, nsems, semflgs, NULL);
-}
-
-int
-semctl (int semid, int semnum, int cmd, ...)
-{
-  va_list va;
-  union semun {
-    int val;
-    struct semid_ds *buf;
-    unsigned short  *array;
-  } arg;
-
-  va_start (va, cmd);
-
-  arg = va_arg (va, union semun);
-
-  va_end (va);
-
-  return __libc_ipc(IPCOP_semctl, semid, semnum, cmd | IPC_64, &arg);
-}
-
-int
-semop (int semid, struct sembuf *sops, size_t nsems)
-{
-  return __libc_ipc(IPCOP_semop, semid, (int)nsems, 0, sops);
-}
-
-int
-msgget (key_t key, int msgflg)
-{
-  return __libc_ipc(IPCOP_msgget, (int)key, msgflg, 0, NULL);
-}
-
-int
-msgctl (int msqid, int cmd, struct msqid_ds *buf)
-{
-  return __libc_ipc(IPCOP_msgctl, msqid, cmd | IPC_64, 0, buf);
-}
-
-int
-msgsnd (int msqid, const void *msgp, size_t msgsz, int msgflg)
-{
-  return __libc_ipc(IPCOP_msgsnd, msqid, (int)msgsz, msgflg, (void *)msgp);
-}
-
-int
-msgrcv (int msqid, void *msgp, size_t msgsz, long int msgtyp, int msgflg)
-{
-  /* last argument must contain multiple args */
-  struct {
-    void *msgp;
-    long int msgtyp;
-  } args;
-
-  args.msgp = msgp;
-  args.msgtyp = msgtyp;
-
-  return (ssize_t)__libc_ipc(IPCOP_msgrcv, msqid, (int)msgsz, msgflg, &args);
-}
-
diff --git a/newlib/libc/sys/linux/kernel_sigaction.h b/newlib/libc/sys/linux/kernel_sigaction.h
deleted file mode 100644
index d005cbc..0000000
--- a/newlib/libc/sys/linux/kernel_sigaction.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This is the sigaction structure from the Linux 2.1.20 kernel.  */
-
-#define HAVE_SA_RESTORER
-
-struct old_kernel_sigaction {
-	__sighandler_t k_sa_handler;
-	unsigned long sa_mask;
-	unsigned long sa_flags;
-	void (*sa_restorer) (void);
-};
-
-/* This is the sigaction structure from the Linux 2.1.68 kernel.  */
-
-struct kernel_sigaction {
-	__sighandler_t k_sa_handler;
-	unsigned long sa_flags;
-	void (*sa_restorer) (void);
-	sigset_t sa_mask;
-};
diff --git a/newlib/libc/sys/linux/libc-internal.h b/newlib/libc/sys/linux/libc-internal.h
deleted file mode 100644
index 8369ffe..0000000
--- a/newlib/libc/sys/linux/libc-internal.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This file contains a number of internal prototype declarations that
-   don't fit anywhere else.  */
-
-#ifndef _LIBC_INTERNAL
-# define _LIBC_INTERNAL 1
-
-#include <hp-timing.h>
-
-/* Initialize the `__libc_enable_secure' flag.  */
-extern void __libc_init_secure (void);
-
-/* This function will be called from _init in init-first.c.  */
-extern void __libc_global_ctors (void);
-
-/* Discover the tick frequency of the machine if something goes wrong,
-   we return 0, an impossible hertz.  */
-extern int __profile_frequency (void);
-
-/* Hooks for the instrumenting functions.  */
-extern void __cyg_profile_func_enter (void *this_fn, void *call_site);
-extern void __cyg_profile_func_exit (void *this_fn, void *call_site);
-
-/* Get frequency of the system processor.  */
-extern hp_timing_t __get_clockfreq (void);
-
-/* Free all allocated resources.  */
-extern void __libc_freeres (void);
-
-#endif /* _LIBC_INTERNAL  */
diff --git a/newlib/libc/sys/linux/libc-symbols.h b/newlib/libc/sys/linux/libc-symbols.h
deleted file mode 100644
index 97b6726..0000000
--- a/newlib/libc/sys/linux/libc-symbols.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/* Support macros for making weak and strong aliases for symbols,
-   and for using symbol sets and linker warnings with GNU ld.
-   Copyright (C) 1995,1996,1997,1998,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _LIBC_SYMBOLS_H
-#define _LIBC_SYMBOLS_H	1
-
-/* This file's macros are included implicitly in the compilation of every
-   file in the C library by -imacros.
-
-   We include config.h which is generated by configure.
-   It should define for us the following symbols:
-
-   * HAVE_ASM_SET_DIRECTIVE if we have `.set B, A' instead of `A = B'.
-   * ASM_GLOBAL_DIRECTIVE with `.globl' or `.global'.
-   * HAVE_GNU_LD if using GNU ld, with support for weak symbols in a.out,
-   and for symbol set and warning messages extensions in a.out and ELF.
-   * HAVE_ELF if using ELF, which supports weak symbols using `.weak'.
-   * HAVE_ASM_WEAK_DIRECTIVE if we have weak symbols using `.weak'.
-   * HAVE_ASM_WEAKEXT_DIRECTIVE if we have weak symbols using `.weakext'.
-
-   */
-
-/* This is defined for the compilation of all C library code.  features.h
-   tests this to avoid inclusion of stubs.h while compiling the library,
-   before stubs.h has been generated.  Some library code that is shared
-   with other packages also tests this symbol to see if it is being
-   compiled as part of the C library.  We must define this before including
-   config.h, because it makes some definitions conditional on whether libc
-   itself is being compiled, or just some generator program.  */
-#define _LIBC	1
-
-/* Enable declarations of GNU extensions, since we are compiling them.  */
-#define _GNU_SOURCE	1
-/* And we also need the data for the reentrant functions.  */
-#define _REENTRANT	1
-
-#include <config.h>
-
-/* The symbols in all the user (non-_) macros are C symbols.
-   HAVE_GNU_LD without HAVE_ELF implies a.out.  */
-
-#if defined HAVE_ASM_WEAK_DIRECTIVE || defined HAVE_ASM_WEAKEXT_DIRECTIVE
-# define HAVE_WEAK_SYMBOLS
-#endif
-
-#ifndef __SYMBOL_PREFIX
-# ifdef NO_UNDERSCORES
-#  define __SYMBOL_PREFIX
-# else
-#  define __SYMBOL_PREFIX "_"
-# endif
-#endif
-
-#ifndef C_SYMBOL_NAME
-# ifdef NO_UNDERSCORES
-#  define C_SYMBOL_NAME(name) name
-# else
-#  define C_SYMBOL_NAME(name) _##name
-# endif
-#endif
-
-#ifndef ASM_LINE_SEP
-# define ASM_LINE_SEP ;
-#endif
-
-#ifndef C_SYMBOL_DOT_NAME
-# define C_SYMBOL_DOT_NAME(name) .##name
-#endif
-
-#ifndef __ASSEMBLER__
-/* GCC understands weak symbols and aliases; use its interface where
-   possible, instead of embedded assembly language.  */
-
-/* Define ALIASNAME as a strong alias for NAME.  */
-# define strong_alias(name, aliasname) _strong_alias(name, aliasname)
-# define _strong_alias(name, aliasname) \
-  extern __typeof (name) aliasname __attribute__ ((alias (#name)));
-
-/* This comes between the return type and function name in
-   a function definition to make that definition weak.  */
-# define weak_function __attribute__ ((weak))
-# define weak_const_function __attribute__ ((weak, __const__))
-
-# ifdef HAVE_WEAK_SYMBOLS
-
-/* Define ALIASNAME as a weak alias for NAME.
-   If weak aliases are not available, this defines a strong alias.  */
-#  define weak_alias(name, aliasname) _weak_alias (name, aliasname)
-#  define _weak_alias(name, aliasname) \
-  extern __typeof (name) aliasname __attribute__ ((weak, alias (#name)));
-
-/* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined).  */
-#  define weak_extern(symbol) _weak_extern (symbol)
-#  ifdef HAVE_ASM_WEAKEXT_DIRECTIVE
-#   define _weak_extern(symbol) asm (".weakext " __SYMBOL_PREFIX #symbol);
-#  else
-#   define _weak_extern(symbol)    asm (".weak " __SYMBOL_PREFIX #symbol);
-#  endif
-
-# else
-
-#  define weak_alias(name, aliasname) strong_alias(name, aliasname)
-#  define weak_extern(symbol) /* Nothing. */
-
-# endif
-
-#else /* __ASSEMBLER__ */
-
-# ifdef HAVE_ASM_SET_DIRECTIVE
-#  define strong_alias(original, alias)		\
-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP	\
-  .set C_SYMBOL_NAME (alias),C_SYMBOL_NAME (original)
-# else
-#  ifdef HAVE_ASM_GLOBAL_DOT_NAME
-#   define strong_alias(original, alias)	\
-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP	\
-  C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original) ASM_LINE_SEP	\
-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP	\
-  C_SYMBOL_DOT_NAME (alias) = C_SYMBOL_DOT_NAME (original)
-#  else
-#   define strong_alias(original, alias)	\
-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP	\
-  C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original)
-#  endif
-# endif
-
-# ifdef HAVE_WEAK_SYMBOLS
-#  ifdef HAVE_ASM_WEAKEXT_DIRECTIVE
-#   define weak_alias(original, alias)	\
-  .weakext C_SYMBOL_NAME (alias), C_SYMBOL_NAME (original)
-#   define weak_extern(symbol)	\
-  .weakext C_SYMBOL_NAME (symbol)
-
-#  else /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
-
-#   ifdef HAVE_ASM_GLOBAL_DOT_NAME
-#    define weak_alias(original, alias)	\
-  .weak C_SYMBOL_NAME (alias) ASM_LINE_SEP			\
-  C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original) ASM_LINE_SEP	\
-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP	\
-  C_SYMBOL_DOT_NAME (alias) = C_SYMBOL_DOT_NAME (original)
-#   else
-#    define weak_alias(original, alias)	\
-  .weak C_SYMBOL_NAME (alias) ASM_LINE_SEP	\
-  C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original)
-#   endif
-
-#   define weak_extern(symbol)	\
-  .weak C_SYMBOL_NAME (symbol)
-
-#  endif /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
-
-# else /* ! HAVE_WEAK_SYMBOLS */
-
-#  define weak_alias(original, alias) strong_alias(original, alias)
-#  define weak_extern(symbol) /* Nothing */
-# endif /* ! HAVE_WEAK_SYMBOLS */
-
-#endif /* __ASSEMBLER__ */
-
-/* On some platforms we can make internal function calls (i.e., calls of
-   functions not exported) a bit faster by using a different calling
-   convention.  */
-#ifndef internal_function
-# define internal_function	/* empty */
-#endif
-
-/* Prepare for the case that `__builtin_expect' is not available.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-/* Determine the return address.  */
-#define RETURN_ADDRESS(nr) \
-  __builtin_extract_return_addr (__builtin_return_address (nr))
-
-/* When a reference to SYMBOL is encountered, the linker will emit a
-   warning message MSG.  */
-#ifdef HAVE_GNU_LD
-# ifdef HAVE_ELF
-
-/* We want the .gnu.warning.SYMBOL section to be unallocated.  */
-#  ifdef HAVE_ASM_PREVIOUS_DIRECTIVE
-#   define __make_section_unallocated(section_string)	\
-  asm (".section " section_string "\n\t.previous");
-#  elif defined HAVE_ASM_POPSECTION_DIRECTIVE
-#   define __make_section_unallocated(section_string)	\
-  asm (".pushsection " section_string "\n\t.popsection");
-#  else
-#   define __make_section_unallocated(section_string)
-#  endif
-
-/* Tacking on "\n\t#" to the section name makes gcc put it's bogus
-   section attributes on what looks like a comment to the assembler.  */
-#  ifdef HAVE_SECTION_QUOTES
-#   define link_warning(symbol, msg) \
-  __make_section_unallocated (".gnu.warning." #symbol) \
-  static const char __evoke_link_warning_##symbol[]	\
-    __attribute__ ((section (".gnu.warning." #symbol "\"\n\t#\""))) = msg;
-#  else
-#   define link_warning(symbol, msg) \
-  __make_section_unallocated (".gnu.warning." #symbol) \
-  static const char __evoke_link_warning_##symbol[]	\
-    __attribute__ ((section (".gnu.warning." #symbol "\n\t#"))) = msg;
-#  endif
-# else /* Not ELF: a.out */
-#  ifdef HAVE_XCOFF
-/* XCOFF does not support .stabs.
-   The native aix linker will remove the .stab and .stabstr sections
-   The gnu linker will have a fatal error if there is a relocation for
-   symbol in the .stab section.  Silently disable this macro.  */
-#   define link_warning(symbol, msg) 
-#  else
-#   define link_warning(symbol, msg)		\
-     asm (".stabs \"" msg "\",30,0,0,0\n\t"	\
-          ".stabs \"" __SYMBOL_PREFIX #symbol "\",1,0,0,0\n");
-#  endif /* XCOFF */
-# endif
-#else
-/* We will never be heard; they will all die horribly.  */
-# define link_warning(symbol, msg)
-#endif
-
-/* A canned warning for sysdeps/stub functions.  */
-#define	stub_warning(name) \
-  link_warning (name, \
-		"warning: " #name " is not implemented and will always fail")
-
-/*
-
-*/
-
-#ifdef HAVE_GNU_LD
-
-/* Symbol set support macros.  */
-
-# ifdef HAVE_ELF
-
-/* Make SYMBOL, which is in the text segment, an element of SET.  */
-#  define text_set_element(set, symbol)	_elf_set_element(set, symbol)
-/* Make SYMBOL, which is in the data segment, an element of SET.  */
-#  define data_set_element(set, symbol)	_elf_set_element(set, symbol)
-/* Make SYMBOL, which is in the bss segment, an element of SET.  */
-#  define bss_set_element(set, symbol)	_elf_set_element(set, symbol)
-
-/* These are all done the same way in ELF.
-   There is a new section created for each set.  */
-#  ifdef SHARED
-/* When building a shared library, make the set section writable,
-   because it will need to be relocated at run time anyway.  */
-#   define _elf_set_element(set, symbol) \
-  static const void *__elf_set_##set##_element_##symbol##__ \
-    __attribute__ ((unused, section (#set))) = &(symbol)
-#  else
-#   define _elf_set_element(set, symbol) \
-  static const void *const __elf_set_##set##_element_##symbol##__ \
-    __attribute__ ((unused, section (#set))) = &(symbol)
-#  endif
-
-/* Define SET as a symbol set.  This may be required (it is in a.out) to
-   be able to use the set's contents.  */
-#  define symbol_set_define(set)	symbol_set_declare(set)
-
-/* Declare SET for use in this module, if defined in another module.  */
-#  define symbol_set_declare(set) \
-  extern void *const __start_##set __attribute__ ((__weak__));		\
-  extern void *const __stop_##set __attribute__ ((__weak__));		\
-  weak_extern (__start_##set) weak_extern (__stop_##set)
-
-/* Return a pointer (void *const *) to the first element of SET.  */
-#  define symbol_set_first_element(set)	(&__start_##set)
-
-/* Return true iff PTR (a void *const *) has been incremented
-   past the last element in SET.  */
-#  define symbol_set_end_p(set, ptr)	((ptr) >= &__stop_##set)
-
-# else	/* Not ELF: a.out.  */
-
-#  ifdef HAVE_XCOFF
-/* XCOFF does not support .stabs.
-   The native aix linker will remove the .stab and .stabstr sections
-   The gnu linker will have a fatal error if there is a relocation for
-   symbol in the .stab section.  Silently disable these macros.  */
-#   define text_set_element(set, symbol) 
-#   define data_set_element(set, symbol) 
-#   define bss_set_element(set, symbol)	 
-#  else
-#   define text_set_element(set, symbol)	\
-    asm (".stabs \"" __SYMBOL_PREFIX #set "\",23,0,0," __SYMBOL_PREFIX #symbol)
-#   define data_set_element(set, symbol)	\
-    asm (".stabs \"" __SYMBOL_PREFIX #set "\",25,0,0," __SYMBOL_PREFIX #symbol)
-#   define bss_set_element(set, symbol)	?error Must use initialized data.
-#  endif /* XCOFF */
-#  define symbol_set_define(set)	void *const (set)[1];
-#  define symbol_set_declare(set)	extern void *const (set)[1];
-
-#  define symbol_set_first_element(set)	&(set)[1]
-#  define symbol_set_end_p(set, ptr)	(*(ptr) == 0)
-
-# endif	/* ELF.  */
-#else
-/* We cannot do anything in generial.  */
-# define text_set_element(set, symbol) asm ("")
-# define data_set_element(set, symbol) asm ("")
-# define bss_set_element(set, symbol) asm ("")
-# define symbol_set_define(set)		void *const (set)[1];
-# define symbol_set_declare(set)	extern void *const (set)[1];
-
-# define symbol_set_first_element(set)	&(set)[1]
-# define symbol_set_end_p(set, ptr)	(*(ptr) == 0)
-#endif	/* Have GNU ld.  */
-
-#if DO_VERSIONING
-# define symbol_version(real, name, version) \
-     _symbol_version(real, name, version)
-# define default_symbol_version(real, name, version) \
-     _default_symbol_version(real, name, version)
-# ifdef __ASSEMBLER__
-#  define _symbol_version(real, name, version) \
-     .symver real, name##@##version
-#  define _default_symbol_version(real, name, version) \
-     .symver real, name##@##@##version
-# else
-#  define _symbol_version(real, name, version) \
-     __asm__ (".symver " #real "," #name "@" #version)
-#  define _default_symbol_version(real, name, version) \
-     __asm__ (".symver " #real "," #name "@@" #version)
-# endif
-#else
-# define symbol_version(real, name, version)
-# define default_symbol_version(real, name, version) \
-  strong_alias(real, name)
-#endif
-
-#endif /* libc-symbols.h */
diff --git a/newlib/libc/sys/linux/libc-tsd.h b/newlib/libc/sys/linux/libc-tsd.h
deleted file mode 100644
index 7a532ea..0000000
--- a/newlib/libc/sys/linux/libc-tsd.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* libc-internal interface for thread-specific data.  LinuxThreads version.
-   Copyright (C) 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _BITS_LIBC_TSD_H
-#define _BITS_LIBC_TSD_H 1
-
-
-/* Fast thread-specific data internal to libc.  */
-enum __libc_tsd_key_t { _LIBC_TSD_KEY_MALLOC = 0,
-			_LIBC_TSD_KEY_DL_ERROR,
-			_LIBC_TSD_KEY_RPC_VARS,
-			_LIBC_TSD_KEY_N };
-
-extern void *(*__libc_internal_tsd_get) (enum __libc_tsd_key_t) __THROW;
-extern int (*__libc_internal_tsd_set) (enum __libc_tsd_key_t,
-				       __const void *)  __THROW;
-
-#define __libc_tsd_define(CLASS, KEY)	CLASS void *__libc_tsd_##KEY##_data;
-#define __libc_tsd_get(KEY) \
-  (__libc_internal_tsd_get != NULL \
-   ? __libc_internal_tsd_get (_LIBC_TSD_KEY_##KEY) \
-   : __libc_tsd_##KEY##_data)
-#define __libc_tsd_set(KEY, VALUE) \
-  (__libc_internal_tsd_set != NULL \
-   ? __libc_internal_tsd_set (_LIBC_TSD_KEY_##KEY, (VALUE)) \
-   : ((__libc_tsd_##KEY##_data = (VALUE)), 0))
-
-#endif	/* bits/libc-tsd.h */
diff --git a/newlib/libc/sys/linux/libintl.h b/newlib/libc/sys/linux/libintl.h
deleted file mode 100644
index 203a2c8..0000000
--- a/newlib/libc/sys/linux/libintl.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* temporary internal libintl.h to ignore message translation for now */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H      1
-
-#undef _
-#define _(x) (x)
-
-#endif
diff --git a/newlib/libc/sys/linux/linux.c b/newlib/libc/sys/linux/linux.c
index ae11c3f..eb6e7cf 100644
--- a/newlib/libc/sys/linux/linux.c
+++ b/newlib/libc/sys/linux/linux.c
@@ -8,7 +8,7 @@
  * is guided by glibc/autoconf compatibility and FFS
  */
 
-#include <machine/syscall.h>
+#include <sys/syscall.h>
 
 
 /* _syscall1(int,delete_module,const char *,name) */
diff --git a/newlib/libc/sys/linux/linux_fsinfo.h b/newlib/libc/sys/linux/linux_fsinfo.h
deleted file mode 100644
index 692abe5..0000000
--- a/newlib/libc/sys/linux/linux_fsinfo.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Constants from kernel header for various FSes.
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _LINUX_FSINFO_H
-#define _LINUX_FSINFO_H	1
-
-/* These definitions come from the kernel headers.  But we cannot
-   include the headers here because of type clashes.  If new
-   filesystem types will become available we have to add the
-   appropriate definitions here.*/
-
-/* Constants that identify the `adfs' filesystem.  */
-#define ADFS_SUPER_MAGIC	0xadf5
-
-/* Constants that identify the `affs' filesystem.  */
-#define AFFS_SUPER_MAGIC	0xadff
-
-/* Constants that identify the `bfs' filesystem.  */
-#define BFS_MAGIC		0x1BADFACE
-
-/* Constants that identify the `coda' filesystem.  */
-#define CODA_SUPER_MAGIC	0x73757245
-
-/* Constants that identify the `coherent' filesystem.  */
-#define COH_SUPER_MAGIC		0x012ff7b7
-
-/* Constant that identifies the `devfs' filesystem.  */
-#define DEVFS_SUPER_MAGIC	0x1373
-
-/* Constant that identifies the `devpts' filesystem.  */
-#define DEVPTS_SUPER_MAGIC	0x1cd1
-
-/* Constant that identifies the `efs' filesystem.  */
-#define EFS_SUPER_MAGIC		0x414A53
-
-/* Constant that identifies the `ext2' and `ext3' filesystems.  */
-#define EXT2_SUPER_MAGIC	0xef53
-
-/* Constant that identifies the `hpfs' filesystem.  */
-#define HPFS_SUPER_MAGIC	0xf995e849
-
-/* Constant that identifies the `iso9660' filesystem.  */
-#define ISOFS_SUPER_MAGIC	0x9660
-
-/* Constants that identify the `minix2' filesystem.  */
-#define MINIX2_SUPER_MAGIC	0x2468
-#define MINIX2_SUPER_MAGIC2	0x2478
-
-/* Constants that identify the `minix' filesystem.  */
-#define MINIX_SUPER_MAGIC	0x137f
-#define MINIX_SUPER_MAGIC2	0x138F
-
-/* Constants that identify the `msdos' filesystem.  */
-#define MSDOS_SUPER_MAGIC	0x4d44
-
-/* Constants that identify the `ncp' filesystem.  */
-#define NCP_SUPER_MAGIC		0x564c
-
-/* Constants that identify the `nfs' filesystem.  */
-#define NFS_SUPER_MAGIC		0x6969
-
-/* Constants that identify the `proc' filesystem.  */
-#define PROC_SUPER_MAGIC	0x9fa0
-
-/* Constants that identify the `qnx4' filesystem.  */
-#define QNX4_SUPER_MAGIC	0x002f
-
-/* Constants that identify the `reiser' filesystem.  */
-#define REISERFS_SUPER_MAGIC	0x52654973
-
-/* Constants that identify the `smb' filesystem.  */
-#define SMB_SUPER_MAGIC		0x517b
-
-/* Constants that identify the `sysV' filesystem.  */
-#define SYSV2_SUPER_MAGIC	0x012ff7b6
-#define SYSV4_SUPER_MAGIC	0x012ff7b5
-
-/* Constants that identify the `ufs' filesystem.  */
-#define UFS_MAGIC		0x00011954
-#define UFS_CIGAM		0x54190100 /* byteswapped MAGIC */
-
-/* Constants that identify the `xenix' filesystem.  */
-#define XENIX_SUPER_MAGIC	0x012ff7b4
-
-/* Constant that identifies the `shm' filesystem.  */
-#define SHMFS_SUPER_MAGIC	0x01021994
-
-/* Maximum link counts.  */
-#define COH_LINK_MAX		10000
-#define EXT2_LINK_MAX		32000
-#define MINIX2_LINK_MAX		65530
-#define MINIX_LINK_MAX		250
-#define REISERFS_LINK_MAX	64535
-#define SYSV_LINK_MAX		126     /* 127? 251? */
-#define UFS_LINK_MAX		EXT2_LINK_MAX
-#define XENIX_LINK_MAX		126     /* ?? */
-
-#endif	/* linux_fsinfo.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/LICENSE b/newlib/libc/sys/linux/linuxthreads/LICENSE
deleted file mode 100644
index 7bcca60..0000000
--- a/newlib/libc/sys/linux/linuxthreads/LICENSE
+++ /dev/null
@@ -1,501 +0,0 @@
-GNU LIBRARY GENERAL PUBLIC LICENSE
-**********************************
-
-                         Version 2, June 1991
-
-     Copyright (C) 1991 Free Software Foundation, Inc.
-     59 Temple Place -- Suite 330, Boston, MA 02111-1307, USA
-     
-     Everyone is permitted to copy and distribute verbatim copies
-     of this license document, but changing it is not allowed.
-     
-     [This is the first released version of the library GPL.  It is
-      numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-Preamble
-========
-
-   The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-   This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-   When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it in
-new free programs; and that you know you can do these things.
-
-   To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the library, or if you modify it.
-
-   For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-   Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-   Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-   Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-   Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License, which was designed for utility
-programs.  This license, the GNU Library General Public License,
-applies to certain designated libraries.  This license is quite
-different from the ordinary one; be sure to read it in full, and don't
-assume that anything in it is the same as in the ordinary license.
-
-   The reason we have a separate public license for some libraries is
-that they blur the distinction we usually make between modifying or
-adding to a program and simply using it.  Linking a program with a
-library, without changing the library, is in some sense simply using
-the library, and is analogous to running a utility program or
-application program.  However, in a textual and legal sense, the linked
-executable is a combined work, a derivative of the original library,
-and the ordinary General Public License treats it as such.
-
-   Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-   However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended
-to permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to
-achieve this as regards changes in header files, but we have achieved
-it as regards changes in the actual functions of the Library.)  The
-hope is that this will lead to faster development of free libraries.
-
-   The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-   Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-     contains a notice placed by the copyright holder or other
-     authorized party saying it may be distributed under the terms of
-     this Library General Public License (also called "this License").
-     Each licensee is addressed as "you".
-
-     A "library" means a collection of software functions and/or data
-     prepared so as to be conveniently linked with application programs
-     (which use some of those functions and data) to form executables.
-
-     The "Library", below, refers to any such software library or work
-     which has been distributed under these terms.  A "work based on the
-     Library" means either the Library or any derivative work under
-     copyright law: that is to say, a work containing the Library or a
-     portion of it, either verbatim or with modifications and/or
-     translated straightforwardly into another language.  (Hereinafter,
-     translation is included without limitation in the term
-     "modification".)
-
-     "Source code" for a work means the preferred form of the work for
-     making modifications to it.  For a library, complete source code
-     means all the source code for all modules it contains, plus any
-     associated interface definition files, plus the scripts used to
-     control compilation and installation of the library.
-
-     Activities other than copying, distribution and modification are
-     not covered by this License; they are outside its scope.  The act
-     of running a program using the Library is not restricted, and
-     output from such a program is covered only if its contents
-     constitute a work based on the Library (independent of the use of
-     the Library in a tool for writing it).  Whether that is true
-     depends on what the Library does and what the program that uses
-     the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-     complete source code as you receive it, in any medium, provided
-     that you conspicuously and appropriately publish on each copy an
-     appropriate copyright notice and disclaimer of warranty; keep
-     intact all the notices that refer to this License and to the
-     absence of any warranty; and distribute a copy of this License
-     along with the Library.
-
-     You may charge a fee for the physical act of transferring a copy,
-     and you may at your option offer warranty protection in exchange
-     for a fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-     of it, thus forming a work based on the Library, and copy and
-     distribute such modifications or work under the terms of Section 1
-     above, provided that you also meet all of these conditions:
-
-       a. The modified work must itself be a software library.
-
-       b. You must cause the files modified to carry prominent notices
-          stating that you changed the files and the date of any change.
-
-       c. You must cause the whole of the work to be licensed at no
-          charge to all third parties under the terms of this License.
-
-       d. If a facility in the modified Library refers to a function or
-          a table of data to be supplied by an application program that
-          uses the facility, other than as an argument passed when the
-          facility is invoked, then you must make a good faith effort
-          to ensure that, in the event an application does not supply
-          such function or table, the facility still operates, and
-          performs whatever part of its purpose remains meaningful.
-
-          (For example, a function in a library to compute square roots
-          has a purpose that is entirely well-defined independent of the
-          application.  Therefore, Subsection 2d requires that any
-          application-supplied function or table used by this function
-          must be optional: if the application does not supply it, the
-          square root function must still compute square roots.)
-
-     These requirements apply to the modified work as a whole.  If
-     identifiable sections of that work are not derived from the
-     Library, and can be reasonably considered independent and separate
-     works in themselves, then this License, and its terms, do not
-     apply to those sections when you distribute them as separate
-     works.  But when you distribute the same sections as part of a
-     whole which is a work based on the Library, the distribution of
-     the whole must be on the terms of this License, whose permissions
-     for other licensees extend to the entire whole, and thus to each
-     and every part regardless of who wrote it.
-
-     Thus, it is not the intent of this section to claim rights or
-     contest your rights to work written entirely by you; rather, the
-     intent is to exercise the right to control the distribution of
-     derivative or collective works based on the Library.
-
-     In addition, mere aggregation of another work not based on the
-     Library with the Library (or with a work based on the Library) on
-     a volume of a storage or distribution medium does not bring the
-     other work under the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-     License instead of this License to a given copy of the Library.
-     To do this, you must alter all the notices that refer to this
-     License, so that they refer to the ordinary GNU General Public
-     License, version 2, instead of to this License.  (If a newer
-     version than version 2 of the ordinary GNU General Public License
-     has appeared, then you can specify that version instead if you
-     wish.)  Do not make any other change in these notices.
-
-     Once this change is made in a given copy, it is irreversible for
-     that copy, so the ordinary GNU General Public License applies to
-     all subsequent copies and derivative works made from that copy.
-
-     This option is useful when you wish to copy part of the code of
-     the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-     derivative of it, under Section 2) in object code or executable
-     form under the terms of Sections 1 and 2 above provided that you
-     accompany it with the complete corresponding machine-readable
-     source code, which must be distributed under the terms of Sections
-     1 and 2 above on a medium customarily used for software
-     interchange.
-
-     If distribution of object code is made by offering access to copy
-     from a designated place, then offering equivalent access to copy
-     the source code from the same place satisfies the requirement to
-     distribute the source code, even though third parties are not
-     compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-     Library, but is designed to work with the Library by being
-     compiled or linked with it, is called a "work that uses the
-     Library".  Such a work, in isolation, is not a derivative work of
-     the Library, and therefore falls outside the scope of this License.
-
-     However, linking a "work that uses the Library" with the Library
-     creates an executable that is a derivative of the Library (because
-     it contains portions of the Library), rather than a "work that
-     uses the library".  The executable is therefore covered by this
-     License.  Section 6 states terms for distribution of such
-     executables.
-
-     When a "work that uses the Library" uses material from a header
-     file that is part of the Library, the object code for the work may
-     be a derivative work of the Library even though the source code is
-     not.  Whether this is true is especially significant if the work
-     can be linked without the Library, or if the work is itself a
-     library.  The threshold for this to be true is not precisely
-     defined by law.
-
-     If such an object file uses only numerical parameters, data
-     structure layouts and accessors, and small macros and small inline
-     functions (ten lines or less in length), then the use of the object
-     file is unrestricted, regardless of whether it is legally a
-     derivative work.  (Executables containing this object code plus
-     portions of the Library will still fall under Section 6.)
-
-     Otherwise, if the work is a derivative of the Library, you may
-     distribute the object code for the work under the terms of Section
-     6.  Any executables containing that work also fall under Section 6,
-     whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-     link a "work that uses the Library" with the Library to produce a
-     work containing portions of the Library, and distribute that work
-     under terms of your choice, provided that the terms permit
-     modification of the work for the customer's own use and reverse
-     engineering for debugging such modifications.
-
-     You must give prominent notice with each copy of the work that the
-     Library is used in it and that the Library and its use are covered
-     by this License.  You must supply a copy of this License.  If the
-     work during execution displays copyright notices, you must include
-     the copyright notice for the Library among them, as well as a
-     reference directing the user to the copy of this License.  Also,
-     you must do one of these things:
-
-       a. Accompany the work with the complete corresponding
-          machine-readable source code for the Library including
-          whatever changes were used in the work (which must be
-          distributed under Sections 1 and 2 above); and, if the work
-          is an executable linked with the Library, with the complete
-          machine-readable "work that uses the Library", as object code
-          and/or source code, so that the user can modify the Library
-          and then relink to produce a modified executable containing
-          the modified Library.  (It is understood that the user who
-          changes the contents of definitions files in the Library will
-          not necessarily be able to recompile the application to use
-          the modified definitions.)
-
-       b. Accompany the work with a written offer, valid for at least
-          three years, to give the same user the materials specified in
-          Subsection 6a, above, for a charge no more than the cost of
-          performing this distribution.
-
-       c. If distribution of the work is made by offering access to copy
-          from a designated place, offer equivalent access to copy the
-          above specified materials from the same place.
-
-       d. Verify that the user has already received a copy of these
-          materials or that you have already sent this user a copy.
-
-     For an executable, the required form of the "work that uses the
-     Library" must include any data and utility programs needed for
-     reproducing the executable from it.  However, as a special
-     exception, the source code distributed need not include anything
-     that is normally distributed (in either source or binary form)
-     with the major components (compiler, kernel, and so on) of the
-     operating system on which the executable runs, unless that
-     component itself accompanies the executable.
-
-     It may happen that this requirement contradicts the license
-     restrictions of other proprietary libraries that do not normally
-     accompany the operating system.  Such a contradiction means you
-     cannot use both them and the Library together in an executable
-     that you distribute.
-
-  7. You may place library facilities that are a work based on the
-     Library side-by-side in a single library together with other
-     library facilities not covered by this License, and distribute
-     such a combined library, provided that the separate distribution
-     of the work based on the Library and of the other library
-     facilities is otherwise permitted, and provided that you do these
-     two things:
-
-       a. Accompany the combined library with a copy of the same work
-          based on the Library, uncombined with any other library
-          facilities.  This must be distributed under the terms of the
-          Sections above.
-
-       b. Give prominent notice with the combined library of the fact
-          that part of it is a work based on the Library, and explaining
-          where to find the accompanying uncombined form of the same
-          work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute the
-     Library except as expressly provided under this License.  Any
-     attempt otherwise to copy, modify, sublicense, link with, or
-     distribute the Library is void, and will automatically terminate
-     your rights under this License.  However, parties who have
-     received copies, or rights, from you under this License will not
-     have their licenses terminated so long as such parties remain in
-     full compliance.
-
-  9. You are not required to accept this License, since you have not
-     signed it.  However, nothing else grants you permission to modify
-     or distribute the Library or its derivative works.  These actions
-     are prohibited by law if you do not accept this License.
-     Therefore, by modifying or distributing the Library (or any work
-     based on the Library), you indicate your acceptance of this
-     License to do so, and all its terms and conditions for copying,
-     distributing or modifying the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-     Library), the recipient automatically receives a license from the
-     original licensor to copy, distribute, link with or modify the
-     Library subject to these terms and conditions.  You may not impose
-     any further restrictions on the recipients' exercise of the rights
-     granted herein.  You are not responsible for enforcing compliance
-     by third parties to this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-     infringement or for any other reason (not limited to patent
-     issues), conditions are imposed on you (whether by court order,
-     agreement or otherwise) that contradict the conditions of this
-     License, they do not excuse you from the conditions of this
-     License.  If you cannot distribute so as to satisfy simultaneously
-     your obligations under this License and any other pertinent
-     obligations, then as a consequence you may not distribute the
-     Library at all.  For example, if a patent license would not permit
-     royalty-free redistribution of the Library by all those who
-     receive copies directly or indirectly through you, then the only
-     way you could satisfy both it and this License would be to refrain
-     entirely from distribution of the Library.
-
-     If any portion of this section is held invalid or unenforceable
-     under any particular circumstance, the balance of the section is
-     intended to apply, and the section as a whole is intended to apply
-     in other circumstances.
-
-     It is not the purpose of this section to induce you to infringe any
-     patents or other property right claims or to contest validity of
-     any such claims; this section has the sole purpose of protecting
-     the integrity of the free software distribution system which is
-     implemented by public license practices.  Many people have made
-     generous contributions to the wide range of software distributed
-     through that system in reliance on consistent application of that
-     system; it is up to the author/donor to decide if he or she is
-     willing to distribute software through any other system and a
-     licensee cannot impose that choice.
-
-     This section is intended to make thoroughly clear what is believed
-     to be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-     certain countries either by patents or by copyrighted interfaces,
-     the original copyright holder who places the Library under this
-     License may add an explicit geographical distribution limitation
-     excluding those countries, so that distribution is permitted only
-     in or among countries not thus excluded.  In such case, this
-     License incorporates the limitation as if written in the body of
-     this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-     versions of the Library General Public License from time to time.
-     Such new versions will be similar in spirit to the present version,
-     but may differ in detail to address new problems or concerns.
-
-     Each version is given a distinguishing version number.  If the
-     Library specifies a version number of this License which applies
-     to it and "any later version", you have the option of following
-     the terms and conditions either of that version or of any later
-     version published by the Free Software Foundation.  If the Library
-     does not specify a license version number, you may choose any
-     version ever published by the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-     programs whose distribution conditions are incompatible with these,
-     write to the author to ask for permission.  For software which is
-     copyrighted by the Free Software Foundation, write to the Free
-     Software Foundation; we sometimes make exceptions for this.  Our
-     decision will be guided by the two goals of preserving the free
-     status of all derivatives of our free software and of promoting
-     the sharing and reuse of software generally.
-
-                                NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-     WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE
-     LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-     HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT
-     WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT
-     NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-     FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE
-     QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU.  SHOULD THE
-     LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
-     SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-     WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
-     MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE
-     LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
-     INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
-     INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF
-     DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
-     OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY
-     OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-                      END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Libraries
-==============================================
-
-   If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of
-the ordinary General Public License).
-
-   To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should have
-at least the "copyright" line and a pointer to where the full notice is
-found.
-
-     ONE LINE TO GIVE THE LIBRARY'S NAME AND AN IDEA OF WHAT IT DOES.
-     Copyright (C) YEAR  NAME OF AUTHOR
-     
-     This library is free software; you can redistribute it and/or modify it
-     under the terms of the GNU Library General Public License as published
-     by the Free Software Foundation; either version 2 of the License, 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
-     Library General Public License for more details.
-     
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-
-   Also add information on how to contact you by electronic and paper
-mail.
-
-   You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary.  Here is a sample; alter the names:
-
-     Yoyodyne, Inc., hereby disclaims all copyright interest in the library
-     `Frob' (a library for tweaking knobs) written by James Random Hacker.
-     
-     SIGNATURE OF TY COON, 1 April 1990
-     Ty Coon, President of Vice
-
-   That's all there is to it!
-
diff --git a/newlib/libc/sys/linux/linuxthreads/Makefile.am b/newlib/libc/sys/linux/linuxthreads/Makefile.am
deleted file mode 100644
index 0122d66..0000000
--- a/newlib/libc/sys/linux/linuxthreads/Makefile.am
+++ /dev/null
@@ -1,142 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir)/../include -I$(srcdir)/machine/$(machine_dir) -I$(srcdir)/machine/generic  $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
-
-LIBTOOL_VERSION_INFO = 0:0:0
-
-LIB_SOURCES= \
-	attr.c barrier.c condvar.c \
-	events.c getcpuclockid.c getreent.c join.c lockfile.c manager.c \
-	mq_notify.c oldsemaphore.c prio.c ptclock_gettime.c ptclock_settime.c \
-	ptlongjmp.c pt-machine.c reent.c rwlock.c semaphore.c \
-	signals.c spinlock.c sysctl.c \
-	timer_create.c timer_getoverr.c timer_routines.c \
-	timer_delete.c timer_gettime.c timer_settime.c \
-	wrapsyscall.c
-
-LIB_DB_SOURCES = td_init.c td_log.c td_ta_delete.c td_ta_get_nthreads.c      \
-	td_ta_get_ph.c td_ta_map_id2thr.c td_ta_map_lwp2thr.c     \
-	td_ta_new.c td_ta_thr_iter.c td_ta_tsd_iter.c		  \
-	td_thr_get_info.c td_thr_getfpregs.c td_thr_getgregs.c    \
-	td_thr_getxregs.c td_thr_getxregsize.c td_thr_setfpregs.c \
-	td_thr_setgregs.c td_thr_setprio.c td_thr_setsigpending.c \
-	td_thr_setxregs.c td_thr_sigsetmask.c td_thr_tsd.c	  \
-	td_thr_validate.c td_thr_dbsuspend.c td_thr_dbresume.c    \
-	td_ta_setconcurrency.c td_ta_enable_stats.c       	  \
-	td_ta_reset_stats.c td_ta_get_stats.c td_ta_event_addr.c  \
-	td_thr_event_enable.c td_thr_set_event.c 	          \
-	td_thr_clear_event.c td_thr_event_getmsg.c		  \
-	td_ta_set_event.c td_ta_event_getmsg.c		          \
-	td_ta_clear_event.c td_symbol_list.c
-
-# Because of how libtool moves objects around, these files must be built last.
-LIBADD_OBJS = mutex.$(oext) specific.$(oext) pthread.$(oext) \
-	cancel.$(oext) 
-
-ELIX_3_OBJS = \
-	ptfork.$(oext)
-
-if ELIX_LEVEL_1
-EXTRA_OBJS = reqsyscalls.$(oext)
-else
-if ELIX_LEVEL_2
-EXTRA_OBJS = reqsyscalls.$(oext)
-else
-EXTRA_OBJS = $(ELIX_3_OBJS)
-endif
-endif
-
-SUBDIRS = machine .
-
-tooldir = $(tooldir)
-toollibdir = $(top_toollibdir)
-
-libpthread_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -lgcc -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/../shared.ld `cat extra-libtool-objlist`
-libthread_db_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -lgcc -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/../shared.ld 
-
-if USE_LIBTOOL
-
-# objects listed later in LIBPTHREAD_OBJLISTS will override those listed earlier
-extra-libtool-objlist: $(MACHINE_OBJLIST)
-	cat $(MACHINE_OBJLIST) | $(AWK) '{ libpthread[$$1] = $$2 }; END { for (x in libpthread) printf ("%s\n", libpthread[x]) }' > $@
-
-toollib_LTLIBRARIES = libpthread.la libthread_db.la
-libpthread_la_SOURCES = $(LIB_SOURCES)
-libpthread_la_LIBADD = $(LIBADD_OBJS) $(EXTRA_OBJS)
-## libpthread_la_DEPENDENCIES = defs.h crti.S
-libpthread_la_DEPENDENCIES = $(LIBADD_OBJS) $(EXTRA_OBJS) extra-libtool-objlist
-noinst_DATA=objectlist.awk.in
-LIB_COMPILE = $(LTCOMPILE)
-
-libthread_db_la_SOURCES = $(LIB_DB_SOURCES)
-
-else
-
-toollib_LIBRARIES = libpthread.a libthread_db.a
-libpthread_a_SOURCES = $(LIB_SOURCES)
-libpthread_a_LIBADD = $(LIBADD_OBJS) $(EXTRA_OBJS) $(MACHINE_LIB)
-## libpthread_a_DEPENDENCIES = defs.h crti.S
-libpthread_a_DEPENDENCIES = $(LIBADD_OBJS) $(EXTRA_OBJS) $(MACHINE_LIB)
-LIB_COMPILE = $(COMPILE)
-
-libthread_db_a_SOURCES = $(LIB_DB_SOURCES)
-
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../../../Makefile.shared
-
-doc:
-
-install-data-local: install-toollibLIBRARIES
-	-rm -f $(DESTDIR)$(toollibdir)/libthread_db.so.1
-	ln -s `readlink $(DESTDIR)$(toollibdir)/libthread_db.so` \
-	  $(DESTDIR)$(toollibdir)/libthread_db.so.1 \
-	  || cp $(DESTDIR)$(toollibdir)/libthread_db.so \
-	  $(DESTDIR)$(toollibdir)/libthread_db.so.1 
-
-AM_CFLAGS = -D_XOPEN_SOURCE=600 -D_GNU_SOURCE=1
-ACLOCAL_AMFLAGS = -I ../../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
-## PTHREAD_HEADERS=pthread.h semaphore.h
-
-CFLAGS_pt_initfini = -g0 -fPIC -fno-inline-functions
-CFLAGS_noweak=-D__NO_WEAK_PTHREAD_ALIASES
-CFLAGS_cancel=-D__NO_WEAK_PTHREAD_ALIASES -D_RPC_THREAD_SAFE_
-CFLAGS_pthread=-D__NO_WEAK_PTHREAD_ALIASES -DHAVE_Z_NODELETE
-
-pt-initfini.s: $(srcdir)/pt-initfini.c
-	$(CC) -S $(CFLAGS_pt_initfini) -finhibit-size-directive \
-		$(patsubst -f%,-fno-%,$(exceptions)) -o $@
-
-# We only have one kind of startup code files.  Static binaries and
-# shared libraries are build using the PIC version.
-crti.S: pt-initfini.s
-	sed -n -e '1,/@HEADER_ENDS/p' \
-	       -e '/@_.*_PROLOG_BEGINS/,/@_.*_PROLOG_ENDS/p' \
-	       -e '/@TRAILER_BEGINS/,$$p' $< > $@
-
-defs.h: pt-initfini.s
-	sed -n -e '/@TESTS_BEGIN/,/@TESTS_END/p' $< | \
-		$(AWK) -f defs.awk > $@
-
-crti.o: crti.S defs.h
-	$(CC) -g0 $(ASFLAGS) -o $@
-
-mutex.$(oext): $(srcdir)/mutex.c
-	$(LIB_COMPILE) $(CFLAGS_noweak) -c $< -o $@
-
-specific.$(oext): $(srcdir)/specific.c
-	$(LIB_COMPILE) $(CFLAGS_noweak) -c $< -o $@
-
-pthread.$(oext): $(srcdir)/pthread.c
-	$(LIB_COMPILE) $(CFLAGS_pthread) -c $< -o $@
-
-ptfork.$(oext): $(srcdir)/ptfork.c
-	$(LIB_COMPILE) $(CFLAGS_noweak) -c $< -o $@
-
-cancel.$(oext): $(srcdir)/cancel.c
-	$(LIB_COMPILE) $(CFLAGS_cancel) -c $< -o $@
-
diff --git a/newlib/libc/sys/linux/linuxthreads/Makefile.in b/newlib/libc/sys/linux/linuxthreads/Makefile.in
deleted file mode 100644
index d957b05..0000000
--- a/newlib/libc/sys/linux/linuxthreads/Makefile.in
+++ /dev/null
@@ -1,685 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MACHINE_LIB = @MACHINE_LIB@
-MACHINE_OBJLIST = @MACHINE_OBJLIST@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir)/../include -I$(srcdir)/machine/$(machine_dir) -I$(srcdir)/machine/generic  $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -I$(srcdir)/..
-
-LIBTOOL_VERSION_INFO = 0:0:0
-
-LIB_SOURCES =  	attr.c barrier.c condvar.c 	events.c getcpuclockid.c getreent.c join.c lockfile.c manager.c 	mq_notify.c oldsemaphore.c prio.c ptclock_gettime.c ptclock_settime.c 	ptlongjmp.c pt-machine.c reent.c rwlock.c semaphore.c 	signals.c spinlock.c sysctl.c 	timer_create.c timer_getoverr.c timer_routines.c 	timer_delete.c timer_gettime.c timer_settime.c 	wrapsyscall.c
-
-
-LIB_DB_SOURCES = td_init.c td_log.c td_ta_delete.c td_ta_get_nthreads.c      	td_ta_get_ph.c td_ta_map_id2thr.c td_ta_map_lwp2thr.c     	td_ta_new.c td_ta_thr_iter.c td_ta_tsd_iter.c		  	td_thr_get_info.c td_thr_getfpregs.c td_thr_getgregs.c    	td_thr_getxregs.c td_thr_getxregsize.c td_thr_setfpregs.c 	td_thr_setgregs.c td_thr_setprio.c td_thr_setsigpending.c 	td_thr_setxregs.c td_thr_sigsetmask.c td_thr_tsd.c	  	td_thr_validate.c td_thr_dbsuspend.c td_thr_dbresume.c    	td_ta_setconcurrency.c td_ta_enable_stats.c       	  	td_ta_reset_stats.c td_ta_get_stats.c td_ta_event_addr.c  	td_thr_event_enable.c td_thr_set_event.c 	          	td_thr_clear_event.c td_thr_event_getmsg.c		  	td_ta_set_event.c td_ta_event_getmsg.c		          	td_ta_clear_event.c td_symbol_list.c
-
-
-# Because of how libtool moves objects around, these files must be built last.
-LIBADD_OBJS = mutex.$(oext) specific.$(oext) pthread.$(oext) 	cancel.$(oext) 
-
-
-ELIX_3_OBJS =  	ptfork.$(oext)
-
-@ELIX_LEVEL_1_TRUE@EXTRA_OBJS = reqsyscalls.$(oext)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@EXTRA_OBJS = reqsyscalls.$(oext)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@EXTRA_OBJS = $(ELIX_3_OBJS)
-
-SUBDIRS = machine .
-
-tooldir = $(tooldir)
-toollibdir = $(top_toollibdir)
-
-libpthread_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -lgcc -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/../shared.ld `cat extra-libtool-objlist`
-libthread_db_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) -release newlib -no-undefined -lgcc -Xcompiler -nostdlib -Xlinker --version-script=$(srcdir)/../shared.ld 
-
-@USE_LIBTOOL_TRUE@toollib_LTLIBRARIES = libpthread.la libthread_db.la
-@USE_LIBTOOL_TRUE@libpthread_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@libpthread_la_LIBADD = $(LIBADD_OBJS) $(EXTRA_OBJS)
-@USE_LIBTOOL_TRUE@libpthread_la_DEPENDENCIES = $(LIBADD_OBJS) $(EXTRA_OBJS) extra-libtool-objlist
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_TRUE@LIB_COMPILE = $(LTCOMPILE)
-@USE_LIBTOOL_FALSE@LIB_COMPILE = $(COMPILE)
-
-@USE_LIBTOOL_TRUE@libthread_db_la_SOURCES = $(LIB_DB_SOURCES)
-
-@USE_LIBTOOL_FALSE@toollib_LIBRARIES = libpthread.a libthread_db.a
-@USE_LIBTOOL_FALSE@libpthread_a_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_FALSE@libpthread_a_LIBADD = $(LIBADD_OBJS) $(EXTRA_OBJS) $(MACHINE_LIB)
-@USE_LIBTOOL_FALSE@libpthread_a_DEPENDENCIES = $(LIBADD_OBJS) $(EXTRA_OBJS) $(MACHINE_LIB)
-
-@USE_LIBTOOL_FALSE@libthread_db_a_SOURCES = $(LIB_DB_SOURCES)
-
-AM_CFLAGS = -D_XOPEN_SOURCE=600 -D_GNU_SOURCE=1
-ACLOCAL_AMFLAGS = -I ../../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-
-CFLAGS_pt_initfini = -g0 -fPIC -fno-inline-functions
-CFLAGS_noweak = -D__NO_WEAK_PTHREAD_ALIASES
-CFLAGS_cancel = -D__NO_WEAK_PTHREAD_ALIASES -D_RPC_THREAD_SAFE_
-CFLAGS_pthread = -D__NO_WEAK_PTHREAD_ALIASES -DHAVE_Z_NODELETE
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(toollib_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@libpthread_a_OBJECTS =  attr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@barrier.$(OBJEXT) condvar.$(OBJEXT) events.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getcpuclockid.$(OBJEXT) getreent.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@join.$(OBJEXT) lockfile.$(OBJEXT) manager.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mq_notify.$(OBJEXT) oldsemaphore.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@prio.$(OBJEXT) ptclock_gettime.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ptclock_settime.$(OBJEXT) ptlongjmp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@pt-machine.$(OBJEXT) reent.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@rwlock.$(OBJEXT) semaphore.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@signals.$(OBJEXT) spinlock.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sysctl.$(OBJEXT) timer_create.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@timer_getoverr.$(OBJEXT) timer_routines.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@timer_delete.$(OBJEXT) timer_gettime.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@timer_settime.$(OBJEXT) wrapsyscall.$(OBJEXT)
-libthread_db_a_LIBADD = 
-@USE_LIBTOOL_FALSE@libthread_db_a_OBJECTS =  td_init.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_log.$(OBJEXT) td_ta_delete.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_ta_get_nthreads.$(OBJEXT) td_ta_get_ph.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_ta_map_id2thr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_ta_map_lwp2thr.$(OBJEXT) td_ta_new.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_ta_thr_iter.$(OBJEXT) td_ta_tsd_iter.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_get_info.$(OBJEXT) td_thr_getfpregs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_getgregs.$(OBJEXT) td_thr_getxregs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_getxregsize.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_setfpregs.$(OBJEXT) td_thr_setgregs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_setprio.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_setsigpending.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_setxregs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_sigsetmask.$(OBJEXT) td_thr_tsd.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_validate.$(OBJEXT) td_thr_dbsuspend.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_dbresume.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_ta_setconcurrency.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_ta_enable_stats.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_ta_reset_stats.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_ta_get_stats.$(OBJEXT) td_ta_event_addr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_event_enable.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_set_event.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_clear_event.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_thr_event_getmsg.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_ta_set_event.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_ta_event_getmsg.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@td_ta_clear_event.$(OBJEXT) td_symbol_list.$(OBJEXT)
-LTLIBRARIES =  $(toollib_LTLIBRARIES)
-
-@USE_LIBTOOL_TRUE@libpthread_la_OBJECTS =  attr.lo barrier.lo condvar.lo \
-@USE_LIBTOOL_TRUE@events.lo getcpuclockid.lo getreent.lo join.lo \
-@USE_LIBTOOL_TRUE@lockfile.lo manager.lo mq_notify.lo oldsemaphore.lo \
-@USE_LIBTOOL_TRUE@prio.lo ptclock_gettime.lo ptclock_settime.lo \
-@USE_LIBTOOL_TRUE@ptlongjmp.lo pt-machine.lo reent.lo rwlock.lo \
-@USE_LIBTOOL_TRUE@semaphore.lo signals.lo spinlock.lo sysctl.lo \
-@USE_LIBTOOL_TRUE@timer_create.lo timer_getoverr.lo timer_routines.lo \
-@USE_LIBTOOL_TRUE@timer_delete.lo timer_gettime.lo timer_settime.lo \
-@USE_LIBTOOL_TRUE@wrapsyscall.lo
-libthread_db_la_LIBADD = 
-@USE_LIBTOOL_TRUE@libthread_db_la_OBJECTS =  td_init.lo td_log.lo \
-@USE_LIBTOOL_TRUE@td_ta_delete.lo td_ta_get_nthreads.lo td_ta_get_ph.lo \
-@USE_LIBTOOL_TRUE@td_ta_map_id2thr.lo td_ta_map_lwp2thr.lo td_ta_new.lo \
-@USE_LIBTOOL_TRUE@td_ta_thr_iter.lo td_ta_tsd_iter.lo \
-@USE_LIBTOOL_TRUE@td_thr_get_info.lo td_thr_getfpregs.lo \
-@USE_LIBTOOL_TRUE@td_thr_getgregs.lo td_thr_getxregs.lo \
-@USE_LIBTOOL_TRUE@td_thr_getxregsize.lo td_thr_setfpregs.lo \
-@USE_LIBTOOL_TRUE@td_thr_setgregs.lo td_thr_setprio.lo \
-@USE_LIBTOOL_TRUE@td_thr_setsigpending.lo td_thr_setxregs.lo \
-@USE_LIBTOOL_TRUE@td_thr_sigsetmask.lo td_thr_tsd.lo td_thr_validate.lo \
-@USE_LIBTOOL_TRUE@td_thr_dbsuspend.lo td_thr_dbresume.lo \
-@USE_LIBTOOL_TRUE@td_ta_setconcurrency.lo td_ta_enable_stats.lo \
-@USE_LIBTOOL_TRUE@td_ta_reset_stats.lo td_ta_get_stats.lo \
-@USE_LIBTOOL_TRUE@td_ta_event_addr.lo td_thr_event_enable.lo \
-@USE_LIBTOOL_TRUE@td_thr_set_event.lo td_thr_clear_event.lo \
-@USE_LIBTOOL_TRUE@td_thr_event_getmsg.lo td_ta_set_event.lo \
-@USE_LIBTOOL_TRUE@td_ta_event_getmsg.lo td_ta_clear_event.lo \
-@USE_LIBTOOL_TRUE@td_symbol_list.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(libpthread_a_SOURCES) $(libthread_db_a_SOURCES) $(libpthread_la_SOURCES) $(libthread_db_la_SOURCES)
-OBJECTS = $(libpthread_a_OBJECTS) $(libthread_db_a_OBJECTS) $(libpthread_la_OBJECTS) $(libthread_db_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../../acinclude.m4 ../../../../aclocal.m4 \
-		../../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-toollibLIBRARIES:
-
-clean-toollibLIBRARIES:
-	-test -z "$(toollib_LIBRARIES)" || rm -f $(toollib_LIBRARIES)
-
-distclean-toollibLIBRARIES:
-
-maintainer-clean-toollibLIBRARIES:
-
-install-toollibLIBRARIES: $(toollib_LIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(toollibdir)
-	@list='$(toollib_LIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(toollibdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(toollibdir)/$$p; \
-	  else :; fi; \
-	done
-	@$(POST_INSTALL)
-	@list='$(toollib_LIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(RANLIB) $(DESTDIR)$(toollibdir)/$$p"; \
-	    $(RANLIB) $(DESTDIR)$(toollibdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-toollibLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(toollib_LIBRARIES)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(toollibdir)/$$p; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libpthread.a: $(libpthread_a_OBJECTS) $(libpthread_a_DEPENDENCIES)
-	-rm -f libpthread.a
-	$(AR) cru libpthread.a $(libpthread_a_OBJECTS) $(libpthread_a_LIBADD)
-	$(RANLIB) libpthread.a
-
-libthread_db.a: $(libthread_db_a_OBJECTS) $(libthread_db_a_DEPENDENCIES)
-	-rm -f libthread_db.a
-	$(AR) cru libthread_db.a $(libthread_db_a_OBJECTS) $(libthread_db_a_LIBADD)
-	$(RANLIB) libthread_db.a
-
-mostlyclean-toollibLTLIBRARIES:
-
-clean-toollibLTLIBRARIES:
-	-test -z "$(toollib_LTLIBRARIES)" || rm -f $(toollib_LTLIBRARIES)
-
-distclean-toollibLTLIBRARIES:
-
-maintainer-clean-toollibLTLIBRARIES:
-
-install-toollibLTLIBRARIES: $(toollib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(toollibdir)
-	@list='$(toollib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(toollibdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(toollibdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-toollibLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(toollib_LTLIBRARIES)'; for p in $$list; do \
-	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(toollibdir)/$$p; \
-	done
-
-libpthread.la: $(libpthread_la_OBJECTS) $(libpthread_la_DEPENDENCIES)
-	$(LINK) -rpath $(toollibdir) $(libpthread_la_LDFLAGS) $(libpthread_la_OBJECTS) $(libpthread_la_LIBADD) $(LIBS)
-
-libthread_db.la: $(libthread_db_la_OBJECTS) $(libthread_db_la_DEPENDENCIES)
-	$(LINK) -rpath $(toollibdir) $(libthread_db_la_LDFLAGS) $(libthread_db_la_OBJECTS) $(libthread_db_la_LIBADD) $(LIBS)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am:
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-info-am: 
-install-info: install-info-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am: install-toollibLIBRARIES install-toollibLTLIBRARIES \
-		install-data-local
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-toollibLIBRARIES uninstall-toollibLTLIBRARIES
-uninstall: uninstall-recursive
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(toollibdir) $(DESTDIR)$(toollibdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-toollibLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-toollibLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-toollibLIBRARIES clean-compile clean-libtool \
-		clean-toollibLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-toollibLIBRARIES distclean-compile \
-		distclean-libtool distclean-toollibLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-toollibLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-toollibLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: mostlyclean-toollibLIBRARIES distclean-toollibLIBRARIES \
-clean-toollibLIBRARIES maintainer-clean-toollibLIBRARIES \
-uninstall-toollibLIBRARIES install-toollibLIBRARIES mostlyclean-compile \
-distclean-compile clean-compile maintainer-clean-compile \
-mostlyclean-libtool distclean-libtool clean-libtool \
-maintainer-clean-libtool mostlyclean-toollibLTLIBRARIES \
-distclean-toollibLTLIBRARIES clean-toollibLTLIBRARIES \
-maintainer-clean-toollibLTLIBRARIES uninstall-toollibLTLIBRARIES \
-install-toollibLTLIBRARIES install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-local \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-# objects listed later in LIBPTHREAD_OBJLISTS will override those listed earlier
-@USE_LIBTOOL_TRUE@extra-libtool-objlist: $(MACHINE_OBJLIST)
-@USE_LIBTOOL_TRUE@	cat $(MACHINE_OBJLIST) | $(AWK) '{ libpthread[$$1] = $$2 }; END { for (x in libpthread) printf ("%s\n", libpthread[x]) }' > $@
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-doc:
-
-install-data-local: install-toollibLIBRARIES
-	-rm -f $(DESTDIR)$(toollibdir)/libthread_db.so.1
-	ln -s `readlink $(DESTDIR)$(toollibdir)/libthread_db.so` \
-	  $(DESTDIR)$(toollibdir)/libthread_db.so.1 \
-	  || cp $(DESTDIR)$(toollibdir)/libthread_db.so \
-	  $(DESTDIR)$(toollibdir)/libthread_db.so.1 
-
-pt-initfini.s: $(srcdir)/pt-initfini.c
-	$(CC) -S $(CFLAGS_pt_initfini) -finhibit-size-directive \
-		$(patsubst -f%,-fno-%,$(exceptions)) -o $@
-
-# We only have one kind of startup code files.  Static binaries and
-# shared libraries are build using the PIC version.
-crti.S: pt-initfini.s
-	sed -n -e '1,/@HEADER_ENDS/p' \
-	       -e '/@_.*_PROLOG_BEGINS/,/@_.*_PROLOG_ENDS/p' \
-	       -e '/@TRAILER_BEGINS/,$$p' $< > $@
-
-defs.h: pt-initfini.s
-	sed -n -e '/@TESTS_BEGIN/,/@TESTS_END/p' $< | \
-		$(AWK) -f defs.awk > $@
-
-crti.o: crti.S defs.h
-	$(CC) -g0 $(ASFLAGS) -o $@
-
-mutex.$(oext): $(srcdir)/mutex.c
-	$(LIB_COMPILE) $(CFLAGS_noweak) -c $< -o $@
-
-specific.$(oext): $(srcdir)/specific.c
-	$(LIB_COMPILE) $(CFLAGS_noweak) -c $< -o $@
-
-pthread.$(oext): $(srcdir)/pthread.c
-	$(LIB_COMPILE) $(CFLAGS_pthread) -c $< -o $@
-
-ptfork.$(oext): $(srcdir)/ptfork.c
-	$(LIB_COMPILE) $(CFLAGS_noweak) -c $< -o $@
-
-cancel.$(oext): $(srcdir)/cancel.c
-	$(LIB_COMPILE) $(CFLAGS_cancel) -c $< -o $@
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/linux/linuxthreads/aclocal.m4 b/newlib/libc/sys/linux/linuxthreads/aclocal.m4
deleted file mode 100644
index 35519ac..0000000
--- a/newlib/libc/sys/linux/linuxthreads/aclocal.m4
+++ /dev/null
@@ -1,1226 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  ])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)])
-
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libc/sys/linux/linuxthreads/attr.c b/newlib/libc/sys/linux/linuxthreads/attr.c
deleted file mode 100644
index 4b3a8f4..0000000
--- a/newlib/libc/sys/linux/linuxthreads/attr.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Handling of thread attributes */
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/param.h>
-#include <sys/resource.h>
-#include "pthread.h"
-#include "internals.h"
-#include <shlib-compat.h>
-
-int __pthread_attr_init_2_1(pthread_attr_t *attr)
-{
-  size_t ps = __getpagesize ();
-
-  attr->__detachstate = PTHREAD_CREATE_JOINABLE;
-  attr->__schedpolicy = SCHED_OTHER;
-  attr->__schedparam.sched_priority = 0;
-  attr->__inheritsched = PTHREAD_EXPLICIT_SCHED;
-  attr->__scope = PTHREAD_SCOPE_SYSTEM;
-  attr->__guardsize = ps;
-  attr->__stackaddr = NULL;
-  attr->__stackaddr_set = 0;
-  attr->__stacksize = STACK_SIZE - ps;
-  return 0;
-}
-
-versioned_symbol (libpthread, __pthread_attr_init_2_1, pthread_attr_init,
-		  GLIBC_2_1);
-
-#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
-int __pthread_attr_init_2_0(pthread_attr_t *attr)
-{
-  attr->__detachstate = PTHREAD_CREATE_JOINABLE;
-  attr->__schedpolicy = SCHED_OTHER;
-  attr->__schedparam.sched_priority = 0;
-  attr->__inheritsched = PTHREAD_EXPLICIT_SCHED;
-  attr->__scope = PTHREAD_SCOPE_SYSTEM;
-  return 0;
-}
-compat_symbol (libpthread, __pthread_attr_init_2_0, pthread_attr_init,
-	       GLIBC_2_0);
-#endif
-
-int pthread_attr_destroy(pthread_attr_t *attr)
-{
-  return 0;
-}
-
-int pthread_attr_setdetachstate(pthread_attr_t *attr, int detachstate)
-{
-  if (detachstate < PTHREAD_CREATE_JOINABLE ||
-      detachstate > PTHREAD_CREATE_DETACHED)
-    return EINVAL;
-  attr->__detachstate = detachstate;
-  return 0;
-}
-
-int pthread_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate)
-{
-  *detachstate = attr->__detachstate;
-  return 0;
-}
-
-int pthread_attr_setschedparam(pthread_attr_t *attr,
-                               const struct sched_param *param)
-{
-  int max_prio = __sched_get_priority_max(attr->__schedpolicy);
-  int min_prio = __sched_get_priority_min(attr->__schedpolicy);
-
-  if (param->sched_priority < min_prio || param->sched_priority > max_prio)
-    return EINVAL;
-  memcpy (&attr->__schedparam, param, sizeof (struct sched_param));
-  return 0;
-}
-
-int pthread_attr_getschedparam(const pthread_attr_t *attr,
-                               struct sched_param *param)
-{
-  memcpy (param, &attr->__schedparam, sizeof (struct sched_param));
-  return 0;
-}
-
-int pthread_attr_setschedpolicy(pthread_attr_t *attr, int policy)
-{
-  if (policy != SCHED_OTHER && policy != SCHED_FIFO && policy != SCHED_RR)
-    return EINVAL;
-  attr->__schedpolicy = policy;
-  return 0;
-}
-
-int pthread_attr_getschedpolicy(const pthread_attr_t *attr, int *policy)
-{
-  *policy = attr->__schedpolicy;
-  return 0;
-}
-
-int pthread_attr_setinheritsched(pthread_attr_t *attr, int inherit)
-{
-  if (inherit != PTHREAD_INHERIT_SCHED && inherit != PTHREAD_EXPLICIT_SCHED)
-    return EINVAL;
-  attr->__inheritsched = inherit;
-  return 0;
-}
-
-int pthread_attr_getinheritsched(const pthread_attr_t *attr, int *inherit)
-{
-  *inherit = attr->__inheritsched;
-  return 0;
-}
-
-int pthread_attr_setscope(pthread_attr_t *attr, int scope)
-{
-  switch (scope) {
-  case PTHREAD_SCOPE_SYSTEM:
-    attr->__scope = scope;
-    return 0;
-  case PTHREAD_SCOPE_PROCESS:
-    return ENOTSUP;
-  default:
-    return EINVAL;
-  }
-}
-
-int pthread_attr_getscope(const pthread_attr_t *attr, int *scope)
-{
-  *scope = attr->__scope;
-  return 0;
-}
-
-int __pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize)
-{
-  /* The guard size must not be larger than the stack itself */
-  if (guardsize >= attr->__stacksize) return EINVAL;
-
-  attr->__guardsize = guardsize;
-
-  return 0;
-}
-weak_alias (__pthread_attr_setguardsize, pthread_attr_setguardsize)
-
-int __pthread_attr_getguardsize(const pthread_attr_t *attr, size_t *guardsize)
-{
-  *guardsize = attr->__guardsize;
-  return 0;
-}
-weak_alias (__pthread_attr_getguardsize, pthread_attr_getguardsize)
-
-int __pthread_attr_setstackaddr(pthread_attr_t *attr, void *stackaddr)
-{
-  attr->__stackaddr = stackaddr;
-  attr->__stackaddr_set = 1;
-  return 0;
-}
-weak_alias (__pthread_attr_setstackaddr, pthread_attr_setstackaddr)
-
-link_warning (pthread_attr_setstackaddr,
-	      "the use of `pthread_attr_setstackaddr' is deprecated, use `pthread_attr_setstack'")
-
-int __pthread_attr_getstackaddr(const pthread_attr_t *attr, void **stackaddr)
-{
-  /* XXX This function has a stupid definition.  The standard specifies
-     no error value but what is if no stack address was set?  We simply
-     return the value we have in the member.  */
-  *stackaddr = attr->__stackaddr;
-  return 0;
-}
-weak_alias (__pthread_attr_getstackaddr, pthread_attr_getstackaddr)
-
-link_warning (pthread_attr_getstackaddr,
-	      "the use of `pthread_attr_getstackaddr' is deprecated, use `pthread_attr_getstack'")
-
-
-int __pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize)
-{
-#ifdef FLOATING_STACKS
-  /* We have to check against the maximum allowed stack size.  This is no
-     problem if the manager is already started and we determined it.  If
-     this hasn't happened, we have to find the limit outself.  */
-  if (__pthread_max_stacksize == 0)
-    __pthread_init_max_stacksize ();
-
-  if (stacksize > __pthread_max_stacksize)
-    return EINVAL;
-#else
-  /* We have a fixed size limit.  */
-  if (stacksize > STACK_SIZE)
-    return EINVAL;
-#endif
-
-  /* We don't accept value smaller than PTHREAD_STACK_MIN.  */
-  if (stacksize < PTHREAD_STACK_MIN)
-    return EINVAL;
-
-  attr->__stacksize = stacksize;
-  return 0;
-}
-weak_alias (__pthread_attr_setstacksize, pthread_attr_setstacksize)
-
-int __pthread_attr_getstacksize(const pthread_attr_t *attr, size_t *stacksize)
-{
-  *stacksize = attr->__stacksize;
-  return 0;
-}
-weak_alias (__pthread_attr_getstacksize, pthread_attr_getstacksize)
-
-int __pthread_attr_setstack (pthread_attr_t *attr, void *stackaddr,
-			     size_t stacksize)
-{
-  int err;
-
-  if ((((uintptr_t) stackaddr)
-       & (__alignof__ (struct _pthread_descr_struct) - 1)) != 0)
-    err = EINVAL;
-  else
-    err = __pthread_attr_setstacksize (attr, stacksize);
-  if (err == 0)
-    {
-#ifndef _STACK_GROWS_UP
-      attr->__stackaddr = (char *) stackaddr + stacksize;
-#else
-      attr->__stackaddr = stackaddr;
-#endif
-      attr->__stackaddr_set = 1;
-    }
-
-  return err;
-}
-weak_alias (__pthread_attr_setstack, pthread_attr_setstack)
-
-int __pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr,
-			     size_t *stacksize)
-{
-  /* XXX This function has a stupid definition.  The standard specifies
-     no error value but what is if no stack address was set?  We simply
-     return the value we have in the member.  */
-#ifndef _STACK_GROWS_UP
-  *stackaddr = (char *) attr->__stackaddr - attr->__stacksize;
-#else
-  *stackaddr = attr->__stackaddr;
-#endif
-  *stacksize = attr->__stacksize;
-  return 0;
-}
-weak_alias (__pthread_attr_getstack, pthread_attr_getstack)
-
-int pthread_getattr_np (pthread_t thread, pthread_attr_t *attr)
-{
-  pthread_handle handle = thread_handle (thread);
-  pthread_descr descr;
-
-  if (handle == NULL)
-    return ENOENT;
-
-  descr = handle->h_descr;
-
-  attr->__detachstate = (descr->p_detached
-			 ? PTHREAD_CREATE_DETACHED
-			 : PTHREAD_CREATE_JOINABLE);
-
-  attr->__schedpolicy = __sched_getscheduler (descr->p_pid);
-  if (attr->__schedpolicy == -1)
-    return errno;
-
-  if (__sched_getparam (descr->p_pid,
-			(struct sched_param *) &attr->__schedparam) != 0)
-    return errno;
-
-  attr->__inheritsched = descr->p_inheritsched;
-  attr->__scope = PTHREAD_SCOPE_SYSTEM;
-#ifdef _STACK_GROWS_DOWN
-  attr->__stacksize = (char *)(descr + 1) - (char *)descr->p_guardaddr
-		      - descr->p_guardsize;
-#else
-  attr->__stacksize = (char *)descr->p_guardaddr - (char *)descr;
-#endif
-  attr->__guardsize = descr->p_guardsize;
-  attr->__stackaddr_set = descr->p_userstack;
-#ifdef NEED_SEPARATE_REGISTER_STACK
-  if (descr->p_userstack == 0)
-    attr->__stacksize *= 2;
-  /* XXX This is awkward.  The guard pages are in the middle of the
-     two stacks.  We must count the guard size in the stack size since
-     otherwise the range of the stack area cannot be computed.  */
-  attr->__stacksize += attr->__guardsize;
-#endif
-#ifndef _STACK_GROWS_UP
-  attr->__stackaddr = (char *)(descr + 1);
-#else
-  attr->__stackaddr = (char *)descr;
-#endif
-
-  return 0;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/barrier.c b/newlib/libc/sys/linux/linuxthreads/barrier.c
deleted file mode 100644
index 1293bad..0000000
--- a/newlib/libc/sys/linux/linuxthreads/barrier.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* POSIX barrier implementation for LinuxThreads.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Kaz Kylheku <kaz@ashi.footprints.net>, 2000.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <errno.h>
-#include "pthread.h"
-#include "internals.h"
-#include "spinlock.h"
-#include "queue.h"
-#include "restart.h"
-
-int
-pthread_barrier_wait(pthread_barrier_t *barrier)
-{
-  pthread_descr self = thread_self();
-  pthread_descr temp_wake_queue, th;
-  int result = 0;
-
-  __pthread_lock(&barrier->__ba_lock, self);
-
-  /* If the required number of threads have achieved rendezvous... */
-  if (barrier->__ba_present >= barrier->__ba_required - 1)
-    {
-      /* ... then this last caller shall be the serial thread */
-      result = PTHREAD_BARRIER_SERIAL_THREAD;
-      /* Copy and clear wait queue and reset barrier. */
-      temp_wake_queue = barrier->__ba_waiting;
-      barrier->__ba_waiting = NULL;
-      barrier->__ba_present = 0;
-    }
-  else
-    {
-      result = 0;
-      barrier->__ba_present++;
-      enqueue(&barrier->__ba_waiting, self);
-    }
-
-  __pthread_unlock(&barrier->__ba_lock);
-
-  if (result == 0)
-    {
-      /* Non-serial threads have to suspend */
-      suspend(self);
-      /* We don't bother dealing with cancellation because the POSIX
-         spec for barriers doesn't mention that pthread_barrier_wait
-         is a cancellation point. */
-    }
-  else
-    {
-      /* Serial thread wakes up all others. */
-      while ((th = dequeue(&temp_wake_queue)) != NULL)
-	restart(th);
-    }
-
-  return result;
-}
-
-int
-pthread_barrier_init(pthread_barrier_t *barrier,
-				const pthread_barrierattr_t *attr,
-				unsigned int count)
-{
-  if (count == 0)
-     return EINVAL;
-
-  __pthread_init_lock(&barrier->__ba_lock);
-  barrier->__ba_required = count;
-  barrier->__ba_present = 0;
-  barrier->__ba_waiting = NULL;
-  return 0;
-}
-
-int
-pthread_barrier_destroy(pthread_barrier_t *barrier)
-{
-  if (barrier->__ba_waiting != NULL) return EBUSY;
-  return 0;
-}
-
-int
-pthread_barrierattr_init(pthread_barrierattr_t *attr)
-{
-  attr->__pshared = PTHREAD_PROCESS_PRIVATE;
-  return 0;
-}
-
-int
-pthread_barrierattr_destroy(pthread_barrierattr_t *attr)
-{
-  return 0;
-}
-
-int
-__pthread_barrierattr_getpshared(const pthread_barrierattr_t *attr,
-				 int *pshared)
-{
-  *pshared = attr->__pshared;
-  return 0;
-}
-
-int
-pthread_barrierattr_setpshared(pthread_barrierattr_t *attr, int pshared)
-{
-  if (pshared != PTHREAD_PROCESS_PRIVATE && pshared != PTHREAD_PROCESS_SHARED)
-    return EINVAL;
-
-  attr->__pshared = pshared;
-  return 0;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/bits/initspin.h b/newlib/libc/sys/linux/linuxthreads/bits/initspin.h
deleted file mode 100644
index af19d44..0000000
--- a/newlib/libc/sys/linux/linuxthreads/bits/initspin.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Generic definitions for spinlock initializers.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* Initial value of a spinlock.  Most platforms should use zero,
-   unless they only implement a "test and clear" operation instead of
-   the usual "test and set". */
-#define __LT_SPINLOCK_INIT 0
-
-/* Macros for lock initializers, using the above definition. */
-#define __LOCK_INITIALIZER { 0, __LT_SPINLOCK_INIT }
-#define __ALT_LOCK_INITIALIZER { 0, __LT_SPINLOCK_INIT }
-#define __ATOMIC_INITIALIZER { 0, __LT_SPINLOCK_INIT }
diff --git a/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h b/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h
deleted file mode 100644
index 84f91d5..0000000
--- a/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/* libc-internal interface for mutex locks.  LinuxThreads version.
-   Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _BITS_LIBC_LOCK_H
-#define _BITS_LIBC_LOCK_H 1
-
-#include <pthread.h>
-
-/* Mutex type.  */
-#if defined(_LIBC) || defined(_IO_MTSAFE_IO)
-typedef pthread_mutex_t __libc_lock_t;
-typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t;
-# ifdef __USE_UNIX98
-typedef pthread_rwlock_t __libc_rwlock_t;
-# else
-typedef struct __libc_rwlock_opaque__ __libc_rwlock_t;
-# endif
-#else
-typedef struct __libc_lock_opaque__ __libc_lock_t;
-typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t;
-typedef struct __libc_rwlock_opaque__ __libc_rwlock_t;
-#endif
-
-/* Type for key to thread-specific data.  */
-typedef pthread_key_t __libc_key_t;
-
-/* Define a lock variable NAME with storage class CLASS.  The lock must be
-   initialized with __libc_lock_init before it can be used (or define it
-   with __libc_lock_define_initialized, below).  Use `extern' for CLASS to
-   declare a lock defined in another module.  In public structure
-   definitions you must use a pointer to the lock structure (i.e., NAME
-   begins with a `*'), because its storage size will not be known outside
-   of libc.  */
-#define __libc_lock_define(CLASS,NAME) \
-  CLASS __libc_lock_t NAME;
-#define __libc_rwlock_define(CLASS,NAME) \
-  CLASS __libc_rwlock_t NAME;
-#define __libc_lock_define_recursive(CLASS,NAME) \
-  CLASS __libc_lock_recursive_t NAME;
-
-/* Define an initialized lock variable NAME with storage class CLASS.
-
-   For the C library we take a deeper look at the initializer.  For
-   this implementation all fields are initialized to zero.  Therefore
-   we don't initialize the variable which allows putting it into the
-   BSS section.  (Except on PA-RISC and other odd architectures, where
-   initialized locks must be set to one due to the lack of normal
-   atomic operations.) */
-
-#if __LT_SPINLOCK_INIT == 0
-#  define __libc_lock_define_initialized(CLASS,NAME) \
-  CLASS __libc_lock_t NAME;
-#else
-#  define __libc_lock_define_initialized(CLASS,NAME) \
-  CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER;
-#endif
-
-#define __libc_rwlock_define_initialized(CLASS,NAME) \
-  CLASS __libc_rwlock_t NAME = PTHREAD_RWLOCK_INITIALIZER;
-
-/* Define an initialized recursive lock variable NAME with storage
-   class CLASS.  */
-#define __libc_lock_define_initialized_recursive(CLASS,NAME) \
-  CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER;
-#define _LIBC_LOCK_RECURSIVE_INITIALIZER \
-  {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP}
-
-/* Initialize the named lock variable, leaving it in a consistent, unlocked
-   state.  */
-#define __libc_lock_init(NAME) \
-  (__pthread_mutex_init != NULL ? __pthread_mutex_init (&(NAME), NULL) : 0);
-#define __libc_rwlock_init(NAME) \
-  (__pthread_rwlock_init != NULL ? __pthread_rwlock_init (&(NAME), NULL) : 0);
-
-/* Same as last but this time we initialize a recursive mutex.  */
-#define __libc_lock_init_recursive(NAME) \
-  do {									      \
-    if (__pthread_mutex_init != NULL)					      \
-      {									      \
-	pthread_mutexattr_t __attr;					      \
-	__pthread_mutexattr_init (&__attr);				      \
-	__pthread_mutexattr_settype (&__attr, PTHREAD_MUTEX_RECURSIVE_NP); \
-	__pthread_mutex_init (&(NAME).mutex, &__attr);			      \
-	__pthread_mutexattr_destroy (&__attr);				      \
-      }									      \
-  } while (0);
-
-/* Finalize the named lock variable, which must be locked.  It cannot be
-   used again until __libc_lock_init is called again on it.  This must be
-   called on a lock variable before the containing storage is reused.  */
-#define __libc_lock_fini(NAME) \
-  (__pthread_mutex_destroy != NULL ? __pthread_mutex_destroy (&(NAME)) : 0);
-#define __libc_rwlock_fini(NAME) \
-  (__pthread_rwlock_destroy != NULL ? __pthread_rwlock_destroy (&(NAME)) : 0);
-
-/* Finalize recursive named lock.  */
-#define __libc_lock_fini_recursive(NAME) __libc_lock_fini ((NAME).mutex)
-
-/* Lock the named lock variable.  */
-#define __libc_lock_lock(NAME) \
-  (__pthread_mutex_lock != NULL ? __pthread_mutex_lock (&(NAME)) : 0);
-#define __libc_rwlock_rdlock(NAME) \
-  (__pthread_rwlock_rdlock != NULL ? __pthread_rwlock_rdlock (&(NAME)) : 0);
-#define __libc_rwlock_wrlock(NAME) \
-  (__pthread_rwlock_wrlock != NULL ? __pthread_rwlock_wrlock (&(NAME)) : 0);
-
-/* Lock the recursive named lock variable.  */
-#define __libc_lock_lock_recursive(NAME) __libc_lock_lock ((NAME).mutex)
-
-/* Try to lock the named lock variable.  */
-#define __libc_lock_trylock(NAME) \
-  (__pthread_mutex_trylock != NULL ? __pthread_mutex_trylock (&(NAME)) : 0)
-#define __libc_rwlock_tryrdlock(NAME) \
-  (__pthread_rwlock_tryrdlock != NULL \
-   ? __pthread_rwlock_tryrdlock (&(NAME)) : 0)
-#define __libc_rwlock_trywrlock(NAME) \
-  (__pthread_rwlock_trywrlock != NULL \
-   ? __pthread_rwlock_trywrlock (&(NAME)) : 0)
-
-/* Try to lock the recursive named lock variable.  */
-#define __libc_lock_trylock_recursive(NAME) __libc_lock_trylock ((NAME).mutex)
-
-/* Unlock the named lock variable.  */
-#define __libc_lock_unlock(NAME) \
-  (__pthread_mutex_unlock != NULL ? __pthread_mutex_unlock (&(NAME)) : 0);
-#define __libc_rwlock_unlock(NAME) \
-  (__pthread_rwlock_unlock != NULL ? __pthread_rwlock_unlock (&(NAME)) : 0);
-
-/* Unlock the recursive named lock variable.  */
-#define __libc_lock_unlock_recursive(NAME) __libc_lock_unlock ((NAME).mutex)
-
-
-/* Define once control variable.  */
-#if PTHREAD_ONCE_INIT == 0
-/* Special case for static variables where we can avoid the initialization
-   if it is zero.  */
-# define __libc_once_define(CLASS, NAME) \
-  CLASS pthread_once_t NAME
-#else
-# define __libc_once_define(CLASS, NAME) \
-  CLASS pthread_once_t NAME = PTHREAD_ONCE_INIT
-#endif
-
-/* Call handler iff the first call.  */
-#define __libc_once(ONCE_CONTROL, INIT_FUNCTION) \
-  do {									      \
-    if (__pthread_once != NULL)						      \
-      __pthread_once (&(ONCE_CONTROL), (INIT_FUNCTION));		      \
-    else if ((ONCE_CONTROL) == PTHREAD_ONCE_INIT) {			      \
-      INIT_FUNCTION ();							      \
-      (ONCE_CONTROL) = !PTHREAD_ONCE_INIT;				      \
-    }									      \
-  } while (0)
-
-
-/* Start critical region with cleanup.  */
-#define __libc_cleanup_region_start(DOIT, FCT, ARG) \
-  { struct _pthread_cleanup_buffer _buffer;				      \
-    int _avail = (DOIT) && _pthread_cleanup_push_defer != NULL;		      \
-    if (_avail) {							      \
-      _pthread_cleanup_push_defer (&_buffer, (FCT), (ARG));		      \
-    }
-
-/* End critical region with cleanup.  */
-#define __libc_cleanup_region_end(DOIT) \
-    if (_avail) {							      \
-      _pthread_cleanup_pop_restore (&_buffer, (DOIT));			      \
-    }									      \
-  }
-
-/* Sometimes we have to exit the block in the middle.  */
-#define __libc_cleanup_end(DOIT) \
-    if (_avail) {							      \
-      _pthread_cleanup_pop_restore (&_buffer, (DOIT));			      \
-    }
-
-/* Create thread-specific key.  */
-#define __libc_key_create(KEY, DESTRUCTOR) \
-  (__pthread_key_create != NULL ? __pthread_key_create (KEY, DESTRUCTOR) : 1)
-
-/* Get thread-specific data.  */
-#define __libc_getspecific(KEY) \
-  (__pthread_getspecific != NULL ? __pthread_getspecific (KEY) : NULL)
-
-/* Set thread-specific data.  */
-#define __libc_setspecific(KEY, VALUE) \
-  (__pthread_setspecific != NULL ? __pthread_setspecific (KEY, VALUE) : 0)
-
-
-/* Register handlers to execute before and after `fork'.  */
-#define __libc_atfork(PREPARE, PARENT, CHILD) \
-  (__pthread_atfork != NULL ? __pthread_atfork (PREPARE, PARENT, CHILD) : 0)
-
-/* Functions that are used by this file and are internal to the GNU C
-   library.  */
-
-extern int __pthread_mutex_init (pthread_mutex_t *__mutex,
-				 __const pthread_mutexattr_t *__mutex_attr);
-
-extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex);
-
-extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex);
-
-extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
-
-extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
-
-extern int __pthread_mutexattr_init (pthread_mutexattr_t *__attr);
-
-extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr);
-
-extern int __pthread_mutexattr_settype (pthread_mutexattr_t *__attr,
-					int __kind);
-
-#ifdef __USE_UNIX98
-extern int __pthread_rwlock_init (pthread_rwlock_t *__rwlock,
-				  __const pthread_rwlockattr_t *__attr);
-
-extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
-
-extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
-#endif
-
-extern int __pthread_key_create (pthread_key_t *__key,
-				 void (*__destr_function) (void *));
-
-extern int __pthread_setspecific (pthread_key_t __key,
-				  __const void *__pointer);
-
-extern void *__pthread_getspecific (pthread_key_t __key);
-
-extern int __pthread_once (pthread_once_t *__once_control,
-			   void (*__init_routine) (void));
-
-extern int __pthread_atfork (void (*__prepare) (void),
-			     void (*__parent) (void),
-			     void (*__child) (void));
-
-
-
-/* Make the pthread functions weak so that we can elide them from
-   single-threaded processes.  */
-#ifndef __NO_WEAK_PTHREAD_ALIASES
-#  pragma weak __pthread_mutex_init
-#  pragma weak __pthread_mutex_destroy
-#  pragma weak __pthread_mutex_lock
-#  pragma weak __pthread_mutex_trylock
-#  pragma weak __pthread_mutex_unlock
-#  pragma weak __pthread_mutexattr_init
-#  pragma weak __pthread_mutexattr_destroy
-#  pragma weak __pthread_mutexattr_settype
-#  pragma weak __pthread_rwlock_destroy
-#  pragma weak __pthread_rwlock_rdlock
-#  pragma weak __pthread_rwlock_tryrdlock
-#  pragma weak __pthread_rwlock_wrlock
-#  pragma weak __pthread_rwlock_trywrlock
-#  pragma weak __pthread_rwlock_unlock
-#  pragma weak __pthread_key_create
-#  pragma weak __pthread_setspecific
-#  pragma weak __pthread_getspecific
-#  pragma weak __pthread_once
-#  pragma weak __pthread_initialize
-#  pragma weak __pthread_atfork
-#  pragma weak _pthread_cleanup_push_defer
-#  pragma weak _pthread_cleanup_pop_restore
-#endif
-
-/* We need portable names for some functions.  E.g., when they are
-   used as argument to __libc_cleanup_region_start.  */
-#define __libc_mutex_unlock __pthread_mutex_unlock
-
-#endif	/* bits/libc-lock.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/bits/libc-tsd.h b/newlib/libc/sys/linux/linuxthreads/bits/libc-tsd.h
deleted file mode 100644
index 7a532ea..0000000
--- a/newlib/libc/sys/linux/linuxthreads/bits/libc-tsd.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* libc-internal interface for thread-specific data.  LinuxThreads version.
-   Copyright (C) 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _BITS_LIBC_TSD_H
-#define _BITS_LIBC_TSD_H 1
-
-
-/* Fast thread-specific data internal to libc.  */
-enum __libc_tsd_key_t { _LIBC_TSD_KEY_MALLOC = 0,
-			_LIBC_TSD_KEY_DL_ERROR,
-			_LIBC_TSD_KEY_RPC_VARS,
-			_LIBC_TSD_KEY_N };
-
-extern void *(*__libc_internal_tsd_get) (enum __libc_tsd_key_t) __THROW;
-extern int (*__libc_internal_tsd_set) (enum __libc_tsd_key_t,
-				       __const void *)  __THROW;
-
-#define __libc_tsd_define(CLASS, KEY)	CLASS void *__libc_tsd_##KEY##_data;
-#define __libc_tsd_get(KEY) \
-  (__libc_internal_tsd_get != NULL \
-   ? __libc_internal_tsd_get (_LIBC_TSD_KEY_##KEY) \
-   : __libc_tsd_##KEY##_data)
-#define __libc_tsd_set(KEY, VALUE) \
-  (__libc_internal_tsd_set != NULL \
-   ? __libc_internal_tsd_set (_LIBC_TSD_KEY_##KEY, (VALUE)) \
-   : ((__libc_tsd_##KEY##_data = (VALUE)), 0))
-
-#endif	/* bits/libc-tsd.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/bits/local_lim.h b/newlib/libc/sys/linux/linuxthreads/bits/local_lim.h
deleted file mode 100644
index 0a7c837..0000000
--- a/newlib/libc/sys/linux/linuxthreads/bits/local_lim.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Minimum guaranteed maximum values for system limits.  Linux version.
-   Copyright (C) 1993, 94, 95, 96, 97, 98, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* The kernel header pollutes the namespace with the NR_OPEN symbol
-   and defines LINK_MAX although filesystems have different maxima.  A
-   similar thing is true for OPEN_MAX: the limit can be changed at
-   runtime and therefore the macro must not be defined.  Remove this
-   after including the header if necessary.  */
-#ifndef NR_OPEN
-# define __undef_NR_OPEN
-#endif
-#ifndef LINK_MAX
-# define __undef_LINK_MAX
-#endif
-#ifndef OPEN_MAX
-# define __undef_OPEN_MAX
-#endif
-
-/* The kernel sources contain a file with all the needed information.  */
-#include <linux/limits.h>
-
-/* Have to remove NR_OPEN?  */
-#ifdef __undef_NR_OPEN
-# undef NR_OPEN
-# undef __undef_NR_OPEN
-#endif
-/* Have to remove LINK_MAX?  */
-#ifdef __undef_LINK_MAX
-# undef LINK_MAX
-# undef __undef_LINK_MAX
-#endif
-/* Have to remove OPEN_MAX?  */
-#ifdef __undef_OPEN_MAX
-# undef OPEN_MAX
-# undef __undef_OPEN_MAX
-#endif
-
-/* The number of data keys per process.  */
-#define _POSIX_THREAD_KEYS_MAX	128
-/* This is the value this implementation supports.  */
-#define PTHREAD_KEYS_MAX	1024
-
-/* Controlling the iterations of destructors for thread-specific data.  */
-#define _POSIX_THREAD_DESTRUCTOR_ITERATIONS	4
-/* Number of iterations this implementation does.  */
-#define PTHREAD_DESTRUCTOR_ITERATIONS	_POSIX_THREAD_DESTRUCTOR_ITERATIONS
-
-/* The number of threads per process.  */
-#define _POSIX_THREAD_THREADS_MAX	64
-/* This is the value this implementation supports.  */
-#define PTHREAD_THREADS_MAX	1024
-
-/* Maximum amount by which a process can descrease its asynchronous I/O
-   priority level.  */
-#define AIO_PRIO_DELTA_MAX	20
-
-/* Minimum size for a thread.  We are free to choose a reasonable value.  */
-#define PTHREAD_STACK_MIN	16384
-
-/* Maximum number of POSIX timers available.  */
-#define TIMER_MAX	256
diff --git a/newlib/libc/sys/linux/linuxthreads/bits/posix_opt.h b/newlib/libc/sys/linux/linuxthreads/bits/posix_opt.h
deleted file mode 100644
index 54640bb..0000000
--- a/newlib/libc/sys/linux/linuxthreads/bits/posix_opt.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Define POSIX options for Linux.
-   Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef	_POSIX_OPT_H
-#define	_POSIX_OPT_H	1
-
-/* Job control is supported.  */
-#define	_POSIX_JOB_CONTROL	1
-
-/* Processes have a saved set-user-ID and a saved set-group-ID.  */
-#define	_POSIX_SAVED_IDS	1
-
-/* Priority scheduling is supported.  */
-#define	_POSIX_PRIORITY_SCHEDULING	1
-
-/* Synchronizing file data is supported.  */
-#define	_POSIX_SYNCHRONIZED_IO	1
-
-/* The fsync function is present.  */
-#define	_POSIX_FSYNC	1
-
-/* Mapping of files to memory is supported.  */
-#define	_POSIX_MAPPED_FILES	1
-
-/* Locking of all memory is supported.  */
-#define	_POSIX_MEMLOCK	1
-
-/* Locking of ranges of memory is supported.  */
-#define	_POSIX_MEMLOCK_RANGE	1
-
-/* Setting of memory protections is supported.  */
-#define	_POSIX_MEMORY_PROTECTION	1
-
-/* Implementation supports `poll' function.  */
-#define	_POSIX_POLL	1
-
-/* Implementation supports `select' and `pselect' functions.  */
-#define	_POSIX_SELECT	1
-
-/* Only root can change owner of file.  */
-#define	_POSIX_CHOWN_RESTRICTED	1
-
-/* `c_cc' member of 'struct termios' structure can be disabled by
-   using the value _POSIX_VDISABLE.  */
-#define	_POSIX_VDISABLE	'\0'
-
-/* Filenames are not silently truncated.  */
-#define	_POSIX_NO_TRUNC	1
-
-/* X/Open realtime support is available.  */
-#define _XOPEN_REALTIME	1
-
-/* X/Open realtime thread support is available.  */
-#define _XOPEN_REALTIME_THREADS	1
-
-/* XPG4.2 shared memory is supported.  */
-#define	_XOPEN_SHM	1
-
-/* Tell we have POSIX threads.  */
-#define _POSIX_THREADS	1
-
-/* We have the reentrant functions described in POSIX.  */
-#define _POSIX_REENTRANT_FUNCTIONS      1
-#define _POSIX_THREAD_SAFE_FUNCTIONS	1
-
-/* We provide priority scheduling for threads.  */
-#define	_POSIX_THREAD_PRIORITY_SCHEDULING	1
-
-/* We support user-defined stack sizes.  */
-#define _POSIX_THREAD_ATTR_STACKSIZE	1
-
-/* We support user-defined stacks.  */
-#define _POSIX_THREAD_ATTR_STACKADDR	1
-
-/* We support POSIX.1b semaphores, but only the non-shared form for now.  */
-#define _POSIX_SEMAPHORES	1
-
-/* Real-time signals are supported.  */
-#define _POSIX_REALTIME_SIGNALS	1
-
-/* We support asynchronous I/O.  */
-#define _POSIX_ASYNCHRONOUS_IO	1
-#define _POSIX_ASYNC_IO		1
-/* Alternative name for Unix98.  */
-#define _LFS_ASYNCHRONOUS_IO	1
-
-/* The LFS support in asynchronous I/O is also available.  */
-#define _LFS64_ASYNCHRONOUS_IO	1
-
-/* The rest of the LFS is also available.  */
-#define _LFS_LARGEFILE		1
-#define _LFS64_LARGEFILE	1
-#define _LFS64_STDIO		1
-
-/* POSIX shared memory objects are implemented.  */
-#define _POSIX_SHARED_MEMORY_OBJECTS	1
-
-/* GNU libc provides regular expression handling.  */
-#define _POSIX_REGEXP	1
-
-/* Reader/Writer locks are available.  */
-#define _POSIX_READER_WRITER_LOCKS	200912L
-
-/* We have a POSIX shell.  */
-#define _POSIX_SHELL	1
-
-/* We support the Timeouts option.  */
-#define _POSIX_TIMEOUTS	200912L
-
-/* We support spinlocks.  */
-#define _POSIX_SPIN_LOCKS	200912L
-
-/* The `spawn' function family is supported.  */
-#define _POSIX_SPAWN	200912L
-
-/* We have POSIX timers.  */
-#define _POSIX_TIMERS	1
-
-/* The barrier functions are available.  */
-#define _POSIX_BARRIERS	200912L
-
-/* POSIX message queues are not yet supported.  */
-#undef	_POSIX_MESSAGE_PASSING
-
-#endif /* posix_opt.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/bits/pthreadtypes.h b/newlib/libc/sys/linux/linuxthreads/bits/pthreadtypes.h
deleted file mode 100644
index 3ee5c48..0000000
--- a/newlib/libc/sys/linux/linuxthreads/bits/pthreadtypes.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-#if !defined _BITS_TYPES_H && !defined _PTHREAD_H
-# error "Never include <bits/pthreadtypes.h> directly; use <sys/types.h> instead."
-#endif
-
-#ifndef _BITS_PTHREADTYPES_H
-#define _BITS_PTHREADTYPES_H	1
-
-#define __need_schedparam
-#include <bits/sched.h>
-
-/* Fast locks (not abstract because mutexes and conditions aren't abstract). */
-struct _pthread_fastlock
-{
-  long int __status;   /* "Free" or "taken" or head of waiting list */
-  int __spinlock;      /* Used by compare_and_swap emulation. Also,
-			  adaptive SMP lock stores spin count here. */
-};
-
-#ifndef _PTHREAD_DESCR_DEFINED
-/* Thread descriptors */
-typedef struct _pthread_descr_struct *_pthread_descr;
-# define _PTHREAD_DESCR_DEFINED
-#endif
-
-
-/* Attributes for threads.  */
-typedef struct __pthread_attr_s
-{
-  int __detachstate;
-  int __schedpolicy;
-  struct __sched_param __schedparam;
-  int __inheritsched;
-  int __scope;
-  size_t __guardsize;
-  int __stackaddr_set;
-  void *__stackaddr;
-  size_t __stacksize;
-} pthread_attr_t;
-
-
-/* Conditions (not abstract because of PTHREAD_COND_INITIALIZER */
-typedef struct
-{
-  struct _pthread_fastlock __c_lock; /* Protect against concurrent access */
-  _pthread_descr __c_waiting;        /* Threads waiting on this condition */
-} pthread_cond_t;
-
-
-/* Attribute for conditionally variables.  */
-typedef struct
-{
-  int __dummy;
-} pthread_condattr_t;
-
-/* Keys for thread-specific data */
-typedef unsigned int pthread_key_t;
-
-
-/* Mutexes (not abstract because of PTHREAD_MUTEX_INITIALIZER).  */
-/* (The layout is unnatural to maintain binary compatibility
-    with earlier releases of LinuxThreads.) */
-typedef struct
-{
-  int __m_reserved;               /* Reserved for future use */
-  int __m_count;                  /* Depth of recursive locking */
-  _pthread_descr __m_owner;       /* Owner thread (if recursive or errcheck) */
-  int __m_kind;                   /* Mutex kind: fast, recursive or errcheck */
-  struct _pthread_fastlock __m_lock; /* Underlying fast lock */
-} pthread_mutex_t;
-
-
-/* Attribute for mutex.  */
-typedef struct
-{
-  int __mutexkind;
-} pthread_mutexattr_t;
-
-
-/* Once-only execution */
-typedef int pthread_once_t;
-
-
-#ifdef __USE_UNIX98
-/* Read-write locks.  */
-typedef struct _pthread_rwlock_t
-{
-  struct _pthread_fastlock __rw_lock; /* Lock to guarantee mutual exclusion */
-  int __rw_readers;                   /* Number of readers */
-  _pthread_descr __rw_writer;         /* Identity of writer, or NULL if none */
-  _pthread_descr __rw_read_waiting;   /* Threads waiting for reading */
-  _pthread_descr __rw_write_waiting;  /* Threads waiting for writing */
-  int __rw_kind;                      /* Reader/Writer preference selection */
-  int __rw_pshared;                   /* Shared between processes or not */
-} pthread_rwlock_t;
-
-
-/* Attribute for read-write locks.  */
-typedef struct
-{
-  int __lockkind;
-  int __pshared;
-} pthread_rwlockattr_t;
-#endif
-
-#ifdef __USE_XOPEN2K
-/* POSIX spinlock data type.  */
-typedef volatile int pthread_spinlock_t;
-
-/* POSIX barrier. */
-typedef struct {
-  struct _pthread_fastlock __ba_lock; /* Lock to guarantee mutual exclusion */
-  int __ba_required;                  /* Threads needed for completion */
-  int __ba_present;                   /* Threads waiting */
-  _pthread_descr __ba_waiting;        /* Queue of waiting threads */
-} pthread_barrier_t;
-
-/* barrier attribute */
-typedef struct {
-  int __pshared;
-} pthread_barrierattr_t;
-
-#endif
-
-
-/* Thread identifiers */
-typedef unsigned long int pthread_t;
-
-#endif	/* bits/pthreadtypes.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/bits/sigthread.h b/newlib/libc/sys/linux/linuxthreads/bits/sigthread.h
deleted file mode 100644
index 1c62d81..0000000
--- a/newlib/libc/sys/linux/linuxthreads/bits/sigthread.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Signal handling function for threaded programs.
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _BITS_SIGTHREAD_H
-#define _BITS_SIGTHREAD_H	1
-
-#if !defined _SIGNAL_H && !defined _PTHREAD_H
-# error "Never include this file directly.  Use <pthread.h> instead"
-#endif
-
-/* Functions for handling signals. */
-
-/* Modify the signal mask for the calling thread.  The arguments have
-   the same meaning as for sigprocmask(2). */
-extern int pthread_sigmask (int __how,
-			    __const sigset_t *__restrict __newmask,
-			    sigset_t *__restrict __oldmask)__THROW;
-
-/* Send signal SIGNO to the given thread. */
-extern int pthread_kill (pthread_t __thread1, int __signo) __THROW;
-
-#endif	/* bits/sigthread.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/bp-sym.h b/newlib/libc/sys/linux/linuxthreads/bp-sym.h
deleted file mode 100644
index 1aeb236..0000000
--- a/newlib/libc/sys/linux/linuxthreads/bp-sym.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Bounded-pointer symbol modifier.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Greg McGary <greg@mcgary.org>
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#define BP_SYM(name) _BP_SYM (name)
-#if __BOUNDED_POINTERS__
-# define _BP_SYM(name) __BP_##name
-#else
-# define _BP_SYM(name) name
-#endif
diff --git a/newlib/libc/sys/linux/linuxthreads/cancel.c b/newlib/libc/sys/linux/linuxthreads/cancel.c
deleted file mode 100644
index 0fd6cd0..0000000
--- a/newlib/libc/sys/linux/linuxthreads/cancel.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Thread cancellation */
-
-#include <errno.h>
-#include <rpc/rpc.h>
-#include "pthread.h"
-#include "internals.h"
-#include "spinlock.h"
-#include "restart.h"
-
-#ifdef _STACK_GROWS_DOWN
-# define FRAME_LEFT(frame, other) ((char *) frame >= (char *) other)
-#elif _STACK_GROWS_UP
-# define FRAME_LEFT(frame, other) ((char *) frame <= (char *) other)
-#else
-# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
-#endif
-
-
-int pthread_setcancelstate(int state, int * oldstate)
-{
-  pthread_descr self = thread_self();
-  if (state < PTHREAD_CANCEL_ENABLE || state > PTHREAD_CANCEL_DISABLE)
-    return EINVAL;
-  if (oldstate != NULL) *oldstate = THREAD_GETMEM(self, p_cancelstate);
-  THREAD_SETMEM(self, p_cancelstate, state);
-  if (THREAD_GETMEM(self, p_canceled) &&
-      THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE &&
-      THREAD_GETMEM(self, p_canceltype) == PTHREAD_CANCEL_ASYNCHRONOUS)
-    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-  return 0;
-}
-
-int pthread_setcanceltype(int type, int * oldtype)
-{
-  pthread_descr self = thread_self();
-  if (type < PTHREAD_CANCEL_DEFERRED || type > PTHREAD_CANCEL_ASYNCHRONOUS)
-    return EINVAL;
-  if (oldtype != NULL) *oldtype = THREAD_GETMEM(self, p_canceltype);
-  THREAD_SETMEM(self, p_canceltype, type);
-  if (THREAD_GETMEM(self, p_canceled) &&
-      THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE &&
-      THREAD_GETMEM(self, p_canceltype) == PTHREAD_CANCEL_ASYNCHRONOUS)
-    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-  return 0;
-}
-
-int pthread_cancel(pthread_t thread)
-{
-  pthread_handle handle = thread_handle(thread);
-  int pid;
-  int dorestart = 0;
-  pthread_descr th;
-  pthread_extricate_if *pextricate;
-  int already_canceled;
-
-  __pthread_lock(&handle->h_lock, NULL);
-  if (invalid_handle(handle, thread)) {
-    __pthread_unlock(&handle->h_lock);
-    return ESRCH;
-  }
-
-  th = handle->h_descr;
-
-  already_canceled = th->p_canceled;
-  th->p_canceled = 1;
-
-  if (th->p_cancelstate == PTHREAD_CANCEL_DISABLE || already_canceled) {
-    __pthread_unlock(&handle->h_lock);
-    return 0;
-  }
-
-  pextricate = th->p_extricate;
-  pid = th->p_pid;
-
-  /* If the thread has registered an extrication interface, then
-     invoke the interface. If it returns 1, then we succeeded in
-     dequeuing the thread from whatever waiting object it was enqueued
-     with. In that case, it is our responsibility to wake it up.
-     And also to set the p_woken_by_cancel flag so the woken thread
-     can tell that it was woken by cancellation. */
-
-  if (pextricate != NULL) {
-    dorestart = pextricate->pu_extricate_func(pextricate->pu_object, th);
-    th->p_woken_by_cancel = dorestart;
-  }
-
-  __pthread_unlock(&handle->h_lock);
-
-  /* If the thread has suspended or is about to, then we unblock it by
-     issuing a restart, instead of a cancel signal. Otherwise we send
-     the cancel signal to unblock the thread from a cancellation point,
-     or to initiate asynchronous cancellation. The restart is needed so
-     we have proper accounting of restarts; suspend decrements the thread's
-     resume count, and restart() increments it.  This also means that suspend's
-     handling of the cancel signal is obsolete. */
-
-  if (dorestart)
-    restart(th);
-  else
-    kill(pid, __pthread_sig_cancel);
-
-  return 0;
-}
-
-void pthread_testcancel(void)
-{
-  pthread_descr self = thread_self();
-  if (THREAD_GETMEM(self, p_canceled)
-      && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE)
-    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-}
-
-void _pthread_cleanup_push(struct _pthread_cleanup_buffer * buffer,
-			   void (*routine)(void *), void * arg)
-{
-  pthread_descr self = thread_self();
-  buffer->__routine = routine;
-  buffer->__arg = arg;
-  buffer->__prev = THREAD_GETMEM(self, p_cleanup);
-  if (buffer->__prev != NULL && FRAME_LEFT (buffer, buffer->__prev))
-    buffer->__prev = NULL;
-  THREAD_SETMEM(self, p_cleanup, buffer);
-}
-
-void _pthread_cleanup_pop(struct _pthread_cleanup_buffer * buffer,
-			  int execute)
-{
-  pthread_descr self = thread_self();
-  if (execute) buffer->__routine(buffer->__arg);
-  THREAD_SETMEM(self, p_cleanup, buffer->__prev);
-}
-
-void _pthread_cleanup_push_defer(struct _pthread_cleanup_buffer * buffer,
-				 void (*routine)(void *), void * arg)
-{
-  pthread_descr self = thread_self();
-  buffer->__routine = routine;
-  buffer->__arg = arg;
-  buffer->__canceltype = THREAD_GETMEM(self, p_canceltype);
-  buffer->__prev = THREAD_GETMEM(self, p_cleanup);
-  if (buffer->__prev != NULL && FRAME_LEFT (buffer, buffer->__prev))
-    buffer->__prev = NULL;
-  THREAD_SETMEM(self, p_canceltype, PTHREAD_CANCEL_DEFERRED);
-  THREAD_SETMEM(self, p_cleanup, buffer);
-}
-
-void _pthread_cleanup_pop_restore(struct _pthread_cleanup_buffer * buffer,
-				  int execute)
-{
-  pthread_descr self = thread_self();
-  if (execute) buffer->__routine(buffer->__arg);
-  THREAD_SETMEM(self, p_cleanup, buffer->__prev);
-  THREAD_SETMEM(self, p_canceltype, buffer->__canceltype);
-  if (THREAD_GETMEM(self, p_canceled) &&
-      THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE &&
-      THREAD_GETMEM(self, p_canceltype) == PTHREAD_CANCEL_ASYNCHRONOUS)
-    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-}
-
-void __pthread_perform_cleanup(char *currentframe)
-{
-  pthread_descr self = thread_self();
-  struct _pthread_cleanup_buffer *c = THREAD_GETMEM(self, p_cleanup);
-  struct _pthread_cleanup_buffer *last;
-
-  if (c != NULL)
-    while (FRAME_LEFT (currentframe, c))
-      {
-	last = c;
-	c = c->__prev;
-
-	if (c == NULL || FRAME_LEFT (last, c))
-	  {
-	    c = NULL;
-	    break;
-	  }
-      }
-
-  while (c != NULL)
-    {
-      c->__routine(c->__arg);
-
-      last = c;
-      c = c->__prev;
-
-      if (FRAME_LEFT (last, c))
-	break;
-    }
-
-#if 0
-  /* And the TSD which needs special help.  */
-  if (THREAD_GETMEM(self, p_libc_specific[_LIBC_TSD_KEY_RPC_VARS]) != NULL)
-    __rpc_thread_destroy ();
-#endif
-}
-
-#ifndef SHARED
-/* We need a hook to force the cancelation wrappers and file locking
-   to be linked in when static libpthread is used.  */
-extern const int __pthread_provide_wrappers;
-static const int *const __pthread_require_wrappers =
-  &__pthread_provide_wrappers;
-extern const int __pthread_provide_lockfile;
-static const int *const __pthread_require_lockfile =
-  &__pthread_provide_lockfile;
-#endif
diff --git a/newlib/libc/sys/linux/linuxthreads/condvar.c b/newlib/libc/sys/linux/linuxthreads/condvar.c
deleted file mode 100644
index a06211f..0000000
--- a/newlib/libc/sys/linux/linuxthreads/condvar.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/* and Pavel Krauz (krauz@fsid.cvut.cz).                                */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Condition variables */
-
-#include <errno.h>
-#include <sched.h>
-#include <stddef.h>
-#include <sys/time.h>
-#include "pthread.h"
-#include "internals.h"
-#include "spinlock.h"
-#include "queue.h"
-#include "restart.h"
-
-int pthread_cond_init(pthread_cond_t *cond,
-                      const pthread_condattr_t *cond_attr)
-{
-  __pthread_init_lock(&cond->__c_lock);
-  cond->__c_waiting = NULL;
-  return 0;
-}
-
-int pthread_cond_destroy(pthread_cond_t *cond)
-{
-  if (cond->__c_waiting != NULL) return EBUSY;
-  return 0;
-}
-
-/* Function called by pthread_cancel to remove the thread from
-   waiting on a condition variable queue. */
-
-static int cond_extricate_func(void *obj, pthread_descr th)
-{
-  volatile pthread_descr self = thread_self();
-  pthread_cond_t *cond = obj;
-  int did_remove = 0;
-
-  __pthread_lock(&cond->__c_lock, self);
-  did_remove = remove_from_queue(&cond->__c_waiting, th);
-  __pthread_unlock(&cond->__c_lock);
-
-  return did_remove;
-}
-
-int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
-{
-  volatile pthread_descr self = thread_self();
-  pthread_extricate_if extr;
-  int already_canceled = 0;
-  int spurious_wakeup_count;
-
-  /* Check whether the mutex is locked and owned by this thread.  */
-  if (mutex->__m_kind != PTHREAD_MUTEX_TIMED_NP
-      && mutex->__m_kind != PTHREAD_MUTEX_ADAPTIVE_NP
-      && mutex->__m_owner != self)
-    return EINVAL;
-
-  /* Set up extrication interface */
-  extr.pu_object = cond;
-  extr.pu_extricate_func = cond_extricate_func;
-
-  /* Register extrication interface */
-  THREAD_SETMEM(self, p_condvar_avail, 0);
-  __pthread_set_own_extricate_if(self, &extr);
-
-  /* Atomically enqueue thread for waiting, but only if it is not
-     canceled. If the thread is canceled, then it will fall through the
-     suspend call below, and then call pthread_exit without
-     having to worry about whether it is still on the condition variable queue.
-     This depends on pthread_cancel setting p_canceled before calling the
-     extricate function. */
-
-  __pthread_lock(&cond->__c_lock, self);
-  if (!(THREAD_GETMEM(self, p_canceled)
-      && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE))
-    enqueue(&cond->__c_waiting, self);
-  else
-    already_canceled = 1;
-  __pthread_unlock(&cond->__c_lock);
-
-  if (already_canceled) {
-    __pthread_set_own_extricate_if(self, 0);
-    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-  }
-
-  pthread_mutex_unlock(mutex);
-
-  spurious_wakeup_count = 0;
-  while (1)
-    {
-      suspend(self);
-      if (THREAD_GETMEM(self, p_condvar_avail) == 0
-	  && (THREAD_GETMEM(self, p_woken_by_cancel) == 0
-	      || THREAD_GETMEM(self, p_cancelstate) != PTHREAD_CANCEL_ENABLE))
-	{
-	  /* Count resumes that don't belong to us. */
-	  spurious_wakeup_count++;
-	  continue;
-	}
-      break;
-    }
-
-  __pthread_set_own_extricate_if(self, 0);
-
-  /* Check for cancellation again, to provide correct cancellation
-     point behavior */
-
-  if (THREAD_GETMEM(self, p_woken_by_cancel)
-      && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) {
-    THREAD_SETMEM(self, p_woken_by_cancel, 0);
-    pthread_mutex_lock(mutex);
-    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-  }
-
-  /* Put back any resumes we caught that don't belong to us. */
-  while (spurious_wakeup_count--)
-    restart(self);
-
-  pthread_mutex_lock(mutex);
-  return 0;
-}
-
-static int
-pthread_cond_timedwait_relative(pthread_cond_t *cond,
-				pthread_mutex_t *mutex,
-				const struct timespec * abstime)
-{
-  volatile pthread_descr self = thread_self();
-  int already_canceled = 0;
-  pthread_extricate_if extr;
-  int spurious_wakeup_count;
-
-  /* Check whether the mutex is locked and owned by this thread.  */
-  if (mutex->__m_kind != PTHREAD_MUTEX_TIMED_NP
-      && mutex->__m_kind != PTHREAD_MUTEX_ADAPTIVE_NP
-      && mutex->__m_owner != self)
-    return EINVAL;
-
-  /* Set up extrication interface */
-  extr.pu_object = cond;
-  extr.pu_extricate_func = cond_extricate_func;
-
-  /* Register extrication interface */
-  THREAD_SETMEM(self, p_condvar_avail, 0);
-  __pthread_set_own_extricate_if(self, &extr);
-
-  /* Enqueue to wait on the condition and check for cancellation. */
-  __pthread_lock(&cond->__c_lock, self);
-  if (!(THREAD_GETMEM(self, p_canceled)
-      && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE))
-    enqueue(&cond->__c_waiting, self);
-  else
-    already_canceled = 1;
-  __pthread_unlock(&cond->__c_lock);
-
-  if (already_canceled) {
-    __pthread_set_own_extricate_if(self, 0);
-    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-  }
-
-  pthread_mutex_unlock(mutex);
-
-  spurious_wakeup_count = 0;
-  while (1)
-    {
-      if (!timedsuspend(self, abstime)) {
-	int was_on_queue;
-
-	/* __pthread_lock will queue back any spurious restarts that
-	   may happen to it. */
-
-	__pthread_lock(&cond->__c_lock, self);
-	was_on_queue = remove_from_queue(&cond->__c_waiting, self);
-	__pthread_unlock(&cond->__c_lock);
-
-	if (was_on_queue) {
-	  __pthread_set_own_extricate_if(self, 0);
-	  pthread_mutex_lock(mutex);
-	  return ETIMEDOUT;
-	}
-
-	/* Eat the outstanding restart() from the signaller */
-	suspend(self);
-      }
-
-      if (THREAD_GETMEM(self, p_condvar_avail) == 0
-	  && (THREAD_GETMEM(self, p_woken_by_cancel) == 0
-	      || THREAD_GETMEM(self, p_cancelstate) != PTHREAD_CANCEL_ENABLE))
-	{
-	  /* Count resumes that don't belong to us. */
-	  spurious_wakeup_count++;
-	  continue;
-	}
-      break;
-    }
-
-  __pthread_set_own_extricate_if(self, 0);
-
-  /* The remaining logic is the same as in other cancellable waits,
-     such as pthread_join sem_wait or pthread_cond wait. */
-
-  if (THREAD_GETMEM(self, p_woken_by_cancel)
-      && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) {
-    THREAD_SETMEM(self, p_woken_by_cancel, 0);
-    pthread_mutex_lock(mutex);
-    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-  }
-
-  /* Put back any resumes we caught that don't belong to us. */
-  while (spurious_wakeup_count--)
-    restart(self);
-
-  pthread_mutex_lock(mutex);
-  return 0;
-}
-
-int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-                           const struct timespec * abstime)
-{
-  /* Indirect call through pointer! */
-  return pthread_cond_timedwait_relative(cond, mutex, abstime);
-}
-
-int pthread_cond_signal(pthread_cond_t *cond)
-{
-  pthread_descr th;
-
-  __pthread_lock(&cond->__c_lock, NULL);
-  th = dequeue(&cond->__c_waiting);
-  __pthread_unlock(&cond->__c_lock);
-  if (th != NULL) {
-    th->p_condvar_avail = 1;
-    WRITE_MEMORY_BARRIER();
-    restart(th);
-  }
-  return 0;
-}
-
-int pthread_cond_broadcast(pthread_cond_t *cond)
-{
-  pthread_descr tosignal, th;
-
-  __pthread_lock(&cond->__c_lock, NULL);
-  /* Copy the current state of the waiting queue and empty it */
-  tosignal = cond->__c_waiting;
-  cond->__c_waiting = NULL;
-  __pthread_unlock(&cond->__c_lock);
-  /* Now signal each process in the queue */
-  while ((th = dequeue(&tosignal)) != NULL) {
-    th->p_condvar_avail = 1;
-    WRITE_MEMORY_BARRIER();
-    restart(th);
-  }
-  return 0;
-}
-
-int pthread_condattr_init(pthread_condattr_t *attr)
-{
-  return 0;
-}
-
-int pthread_condattr_destroy(pthread_condattr_t *attr)
-{
-  return 0;
-}
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3
-
-int pthread_condattr_getpshared (const pthread_condattr_t *attr, int *pshared)
-{
-  *pshared = PTHREAD_PROCESS_PRIVATE;
-  return 0;
-}
-
-int pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared)
-{
-  if (pshared != PTHREAD_PROCESS_PRIVATE && pshared != PTHREAD_PROCESS_SHARED)
-    return EINVAL;
-
-  /* For now it is not possible to shared a conditional variable.  */
-  if (pshared != PTHREAD_PROCESS_PRIVATE)
-    return ENOSYS;
-
-  return 0;
-}
-
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 3 */
-
diff --git a/newlib/libc/sys/linux/linuxthreads/config.h b/newlib/libc/sys/linux/linuxthreads/config.h
deleted file mode 100644
index 05fb5ec..0000000
--- a/newlib/libc/sys/linux/linuxthreads/config.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define HAVE_WEAK_SYMBOLS 1
-#define HAVE_GNU_LD 1
-#define HAVE_ELF 1
-#define __ASSUME_REALTIME_SIGNALS 1
-#define ASM_GLOBAL_DIRECTIVE .global
-
-#define TEMP_FAILURE_RETRY(expression) \
-  (__extension__                                                              \
-    ({ long int __result;                                                     \
-       do __result = (long int) (expression);                                 \
-       while (__result == -1L && errno == EINTR);                             \
-       __result; }))
-
diff --git a/newlib/libc/sys/linux/linuxthreads/configure b/newlib/libc/sys/linux/linuxthreads/configure
deleted file mode 100755
index 6571481..0000000
--- a/newlib/libc/sys/linux/linuxthreads/configure
+++ /dev/null
@@ -1,3456 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=yes]"
-ac_help="$ac_help
-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=attr.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../../.. $srcdir/../../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../../.. $srcdir/../../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:590: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:643: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:700: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:733: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 738 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:766: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 771 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:948: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:969: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:987: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1030: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1043: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1056: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1069: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1082: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1186: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1210: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1337: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1382: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-
-if test "${use_libtool}" = "yes"; then
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_shared=yes
-fi
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_static=yes
-fi
-
-# Check whether --enable-fast-install or --disable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_fast_install=yes
-fi
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1783 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
-else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi
-fi
-
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-
-NM="$lt_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-libtool_flags="$libtool_flags --enable-win32-dll"
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-  :
-fi
-
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
-fi
-rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-fi
-
-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_DLLTOOL"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  DLLTOOL="false"
-fi
-fi
-
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AS="false"
-fi
-fi
-
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_OBJDUMP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="objdump"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  OBJDUMP="false"
-fi
-fi
-
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  
-esac
-
-
-# Save cache, so that ltconfig can load it
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
-# Reload cache, that may have been modified by ltconfig
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-
-  
-
-  
-	 
-	 
-for ac_prog in mawk gawk nawk awk
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2998: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AWK="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AWK="$ac_cv_prog_AWK"
-if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$AWK" && break
-done
-
-fi
-
-if test -n "${machine_dir}"; then
-  MACHINE_OBJLIST=machine/${machine_dir}/objectlist.awk.in
-  MACHINE_LIB=machine/${machine_dir}/lib.a
-fi
-
-
-
-subdirs="machine"
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@OBJDUMP@%$OBJDUMP%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@AWK@%$AWK%g
-s%@MACHINE_OBJLIST@%$MACHINE_OBJLIST%g
-s%@MACHINE_LIB@%$MACHINE_LIB%g
-s%@subdirs@%$subdirs%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  for ac_arg in $ac_configure_args; do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case "$ac_arg" in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  for ac_config_dir in machine; do
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    if test ! -d $srcdir/$ac_config_dir; then
-      continue
-    fi
-
-    echo configuring in $ac_config_dir
-
-    case "$srcdir" in
-    .) ;;
-    *)
-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
-      else
-        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
-      fi
-      ;;
-    esac
-
-    ac_popdir=`pwd`
-    cd $ac_config_dir
-
-      # A "../" for each directory in /$ac_config_dir.
-      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
-
-    case "$srcdir" in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir ;;
-    /*) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
-    *) # Relative path.
-      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
-    esac
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure=$ac_sub_srcdir/configure
-    elif test -f $ac_sub_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-
-      # Make the cache file name correct relative to the subdirectory.
-      case "$cache_file" in
-      /*) ac_sub_cache_file=$cache_file ;;
-      *) # Relative path.
-        ac_sub_cache_file="$ac_dots$cache_file" ;;
-      esac
-  case "$ac_given_INSTALL" in
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
-
-      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-      # The eval makes quoting arguments work.
-      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-      then :
-      else
-        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
-      fi
-    fi
-
-    cd $ac_popdir
-  done
-fi
-
diff --git a/newlib/libc/sys/linux/linuxthreads/configure.in b/newlib/libc/sys/linux/linuxthreads/configure.in
deleted file mode 100644
index 113743a..0000000
--- a/newlib/libc/sys/linux/linuxthreads/configure.in
+++ /dev/null
@@ -1,31 +0,0 @@
-dnl This is the newlib/libc/sys/linux/linuxthreads configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(attr.c)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../../..)
-
-NEWLIB_CONFIGURE(../../../..)
-
-dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
-dnl add it into NEWLIB_CONFIGURE, executable tests are made before the first
-dnl line of the macro which fail because appropriate LDFLAGS are not set.
-
-if test "${use_libtool}" = "yes"; then
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-AC_PROG_AWK
-fi
-
-if test -n "${machine_dir}"; then
-  MACHINE_OBJLIST=machine/${machine_dir}/objectlist.awk.in
-  MACHINE_LIB=machine/${machine_dir}/lib.a
-fi
-AC_SUBST(MACHINE_OBJLIST)
-AC_SUBST(MACHINE_LIB)
-
-AC_CONFIG_SUBDIRS(machine)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/sys/linux/linuxthreads/defs.awk b/newlib/libc/sys/linux/linuxthreads/defs.awk
deleted file mode 100644
index 7ca5a33..0000000
--- a/newlib/libc/sys/linux/linuxthreads/defs.awk
+++ /dev/null
@@ -1,27 +0,0 @@
-/^[ 	]*\.endp/	 { need_endp = 1 }
-/^[ 	]*\.end/	 { need_end = 1 }
-/^[ 	]*\.align/ { if($2 > max) max = $2; }
-
-END {
-    if(need_endp)
-    {
-	print "#define END_INIT .endp _init";
-	print "#define END_FINI .endp _fini";
-    } else if(need_end)
-    {
-	print "#define END_INIT .end _init";
-	print "#define END_FINI .end _fini";
-    }
-    else
-    {
-	print "#define END_INIT";
-	print "#define END_FINI";
-    }
-    if(max)
-	print "#define ALIGN .align", max;
-    else
-	print "#define ALIGN";
-
-    print "#include <libc-symbols.h>";
-    print "weak_extern (__gmon_start__)";
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/ecmutex.c b/newlib/libc/sys/linux/linuxthreads/ecmutex.c
deleted file mode 100644
index ce54ddf..0000000
--- a/newlib/libc/sys/linux/linuxthreads/ecmutex.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Test of the error checking mutex and incidently also barriers.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-
-static pthread_mutex_t locks[] =
-{
-  PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP,
-  PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP,
-  PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP,
-  PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP,
-  PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
-};
-#define nlocks ((int) (sizeof (locks) / sizeof (locks[0])))
-
-static pthread_barrier_t barrier;
-#define SYNC pthread_barrier_wait (&barrier)
-
-#define NTHREADS nlocks
-
-#define ROUNDS 20
-
-
-static void *
-worker (void *arg)
-{
-  /* We are locking the and unlocked the locks and check the errors.
-     Since we are using the error-checking variant the implementation
-     should report them.  */
-  int nr = (long int) arg;
-  int i;
-  void *result = NULL;
-  int retval;
-
-  for (i = 0; i < ROUNDS; ++i)
-    {
-      /* Skip the rounds which would make other == own.  */
-      if (i % nlocks == 0)
-	continue;
-
-      /* Get the "own" mutex.  */
-      if (pthread_mutex_trylock (&locks[nr]) != 0)
-	{
-	  printf ("thread %d failed getting own mutex\n", nr);
-	  result = (void *) 1;
-	}
-
-      /* Try locking "own" mutex again.  */
-      retval = pthread_mutex_lock (&locks[nr]);
-      if (retval != EDEADLK)
-	{
-	  printf ("thread %d failed getting own mutex\n", nr);
-	  result = (void *) 1;
-	}
-
-      /* Try to get a different semaphore.  */
-      SYNC;
-      retval = pthread_mutex_trylock (&locks[(nr + i) % nlocks]);
-      if (retval != EBUSY)
-	{
-	  printf ("thread %d didn't deadlock on getting %d's lock\n",
-		  nr, (nr + i) % nlocks);
-	  result = (void *) 1;
-	}
-
-      /* Try unlocking other's lock.  */
-      retval = pthread_mutex_unlock (&locks[(nr + i) % nlocks]);
-      if (retval != EPERM)
-	{
-	  printf ("thread %d managed releasing mutex %d\n",
-		  nr, (nr + i) % nlocks);
-	  result = (void *) 1;
-	}
-
-      /* All lock one mutex now.  */
-      SYNC;
-      retval = pthread_mutex_lock (&locks[i % nlocks]);
-      if (nr == (i % nlocks))
-	{
-	  if (retval != EDEADLK)
-	    {
-	      printf ("thread %d didn't deadlock on getting %d's lock\n",
-		      nr, (nr + i) % nlocks);
-	      result = (void *) 1;
-	    }
-	  if (pthread_mutex_unlock (&locks[i % nlocks]) != 0)
-	    {
-	      printf ("thread %d failed releasing own mutex\n", nr);
-	      result = (void *) 1;
-	    }
-	}
-      else
-	{
-	  if (retval != 0)
-	    {
-	      printf ("thread %d failed acquiring mutex %d\n",
-		      nr, i % nlocks);
-	      result = (void *) 1;
-	    }
-	  else if (pthread_mutex_unlock (&locks[i % nlocks]) != 0)
-	    {
-	      printf ("thread %d failed releasing mutex %d\n",
-		      nr, i % nlocks);
-	      result = (void *) 1;
-	    }
-	}
-
-      /* Unlock the own lock.  */
-      SYNC;
-      if (nr != (i % nlocks) && pthread_mutex_unlock (&locks[nr]) != 0)
-	{
-	  printf ("thread %d failed releasing own mutex\n", nr);
-	  result = (void *) 1;
-	}
-
-      /* Try unlocking again.  */
-      retval = pthread_mutex_unlock (&locks[nr]);
-      if (retval == 0)
-	{
-	  printf ("thread %d managed releasing own mutex twice\n", nr);
-	  result = (void *) 1;
-	}
-    }
-
-  return result;
-}
-
-
-#define TEST_FUNCTION do_test ()
-static int
-do_test (void)
-{
-  pthread_t threads[NTHREADS];
-  int i;
-  void *res;
-  int result = 0;
-
-  pthread_barrier_init (&barrier, NULL, NTHREADS);
-
-  for (i = 0; i < NTHREADS; ++i)
-    if (pthread_create (&threads[i], NULL, worker, (void *) (long int) i) != 0)
-      {
-	printf ("failed to create thread %d: %m\n", i);
-	exit (1);
-      }
-
-  for (i = 0; i < NTHREADS; ++i)
-    if (pthread_join (threads[i], &res) != 0 || res != NULL)
-      result = 1;
-
-  return result;
-}
-
-#include "../test-skeleton.c"
diff --git a/newlib/libc/sys/linux/linuxthreads/events.c b/newlib/libc/sys/linux/linuxthreads/events.c
deleted file mode 100644
index c65bafc..0000000
--- a/newlib/libc/sys/linux/linuxthreads/events.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Event functions used while debugging.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* The functions contained here do nothing, they just return.  */
-
-#include "internals.h"
-
-void
-__linuxthreads_create_event (void)
-{
-}
-
-void
-__linuxthreads_death_event (void)
-{
-}
-
-void
-__linuxthreads_reap_event (void)
-{
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/getcpuclockid.c b/newlib/libc/sys/linux/linuxthreads/getcpuclockid.c
deleted file mode 100644
index 76d39a5..0000000
--- a/newlib/libc/sys/linux/linuxthreads/getcpuclockid.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include <sys/time.h>
-#include <internals.h>
-
-int
-pthread_getcpuclockid (pthread_t thread_id, clockid_t *clock_id)
-{
-  /* We don't allow any process ID but our own.  */
-  if (thread_handle (thread_id)->h_descr != thread_self ())
-    return EPERM;
-
-#ifdef CLOCK_THREAD_CPUTIME_ID
-  /* Store the number.  */
-  *clock_id = CLOCK_THREAD_CPUTIME_ID;
-
-  return 0;
-#else
-  /* We don't have a timer for that.  */
-  return ENOENT;
-#endif
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/getreent.c b/newlib/libc/sys/linux/linuxthreads/getreent.c
deleted file mode 100644
index e73c4a5..0000000
--- a/newlib/libc/sys/linux/linuxthreads/getreent.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* get thread-specific reentrant pointer */
-
-#include <internals.h>
-
-struct _reent *
-__getreent (void)
-{
-  pthread_descr self = thread_self();
-  return THREAD_GETMEM(self, p_reentp);
-}
-
diff --git a/newlib/libc/sys/linux/linuxthreads/internals.h b/newlib/libc/sys/linux/linuxthreads/internals.h
deleted file mode 100644
index 6da0deb..0000000
--- a/newlib/libc/sys/linux/linuxthreads/internals.h
+++ /dev/null
@@ -1,576 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-#ifndef _INTERNALS_H
-#define _INTERNALS_H	1
-
-/* Internal data structures */
-
-/* Includes */
-
-#include <limits.h>
-#include <resolv.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stackinfo.h>
-#include <sys/types.h>
-#include <reent.h>
-#include <bits/libc-tsd.h> /* for _LIBC_TSD_KEY_N */
-
-extern long int testandset (int *spinlock);
-extern int __compare_and_swap (long int *p, long int oldval, long int newval);
-
-#include "libc-symbols.h"
-#include "pt-machine.h"
-#include "semaphore.h"
-#include "thread_dbP.h"
-#include <hp-timing.h>
-
-#ifndef THREAD_GETMEM
-# define THREAD_GETMEM(descr, member) descr->member
-#endif
-#ifndef THREAD_GETMEM_NC
-# define THREAD_GETMEM_NC(descr, member) descr->member
-#endif
-#ifndef THREAD_SETMEM
-# define THREAD_SETMEM(descr, member, value) descr->member = (value)
-#endif
-#ifndef THREAD_SETMEM_NC
-# define THREAD_SETMEM_NC(descr, member, value) descr->member = (value)
-#endif
-
-/* Arguments passed to thread creation routine */
-
-struct pthread_start_args {
-  void * (*start_routine)(void *); /* function to run */
-  void * arg;                   /* its argument */
-  sigset_t mask;                /* initial signal mask for thread */
-  int schedpolicy;              /* initial scheduling policy (if any) */
-  struct __sched_param schedparam; /* initial scheduling parameters (if any) */
-};
-
-
-/* We keep thread specific data in a special data structure, a two-level
-   array.  The top-level array contains pointers to dynamically allocated
-   arrays of a certain number of data pointers.  So we can implement a
-   sparse array.  Each dynamic second-level array has
-	PTHREAD_KEY_2NDLEVEL_SIZE
-   entries.  This value shouldn't be too large.  */
-#define PTHREAD_KEY_2NDLEVEL_SIZE	32
-
-/* We need to address PTHREAD_KEYS_MAX key with PTHREAD_KEY_2NDLEVEL_SIZE
-   keys in each subarray.  */
-#define PTHREAD_KEY_1STLEVEL_SIZE \
-  ((PTHREAD_KEYS_MAX + PTHREAD_KEY_2NDLEVEL_SIZE - 1) \
-   / PTHREAD_KEY_2NDLEVEL_SIZE)
-
-typedef void (*destr_function)(void *);
-
-struct pthread_key_struct {
-  int in_use;                   /* already allocated? */
-  destr_function destr;         /* destruction routine */
-};
-
-
-#define PTHREAD_START_ARGS_INITIALIZER(fct) \
-  { (void *(*) (void *)) fct, NULL, {{0, }}, 0, { 0 } }
-
-/* The type of thread descriptors */
-
-typedef struct _pthread_descr_struct * pthread_descr;
-
-/* Callback interface for removing the thread from waiting on an
-   object if it is cancelled while waiting or about to wait.
-   This hold a pointer to the object, and a pointer to a function
-   which ``extricates'' the thread from its enqueued state.
-   The function takes two arguments: pointer to the wait object,
-   and a pointer to the thread. It returns 1 if an extrication
-   actually occured, and hence the thread must also be signalled.
-   It returns 0 if the thread had already been extricated. */
-
-typedef struct _pthread_extricate_struct {
-    void *pu_object;
-    int (*pu_extricate_func)(void *, pthread_descr);
-} pthread_extricate_if;
-
-/* Atomic counter made possible by compare_and_swap */
-
-struct pthread_atomic {
-  long p_count;
-  int p_spinlock;
-};
-
-/* Context info for read write locks. The pthread_rwlock_info structure
-   is information about a lock that has been read-locked by the thread
-   in whose list this structure appears. The pthread_rwlock_context
-   is embedded in the thread context and contains a pointer to the
-   head of the list of lock info structures, as well as a count of
-   read locks that are untracked, because no info structure could be
-   allocated for them. */
-
-struct _pthread_rwlock_t;
-
-typedef struct _pthread_rwlock_info {
-  struct _pthread_rwlock_info *pr_next;
-  struct _pthread_rwlock_t *pr_lock;
-  int pr_lock_count;
-} pthread_readlock_info;
-
-struct _pthread_descr_struct {
-  union {
-    struct {
-      pthread_descr self;	/* Pointer to this structure */
-    } data;
-    void *__padding[16];
-  } p_header;
-  pthread_descr p_nextlive, p_prevlive;
-                                /* Double chaining of active threads */
-  pthread_descr p_nextwaiting;  /* Next element in the queue holding the thr */
-  pthread_descr p_nextlock;	/* can be on a queue and waiting on a lock */
-  pthread_t p_tid;              /* Thread identifier */
-  int p_pid;                    /* PID of Unix process */
-  int p_priority;               /* Thread priority (== 0 if not realtime) */
-  struct _pthread_fastlock * p_lock; /* Spinlock for synchronized accesses */
-  int p_signal;                 /* last signal received */
-  sigjmp_buf * p_signal_jmp;    /* where to siglongjmp on a signal or NULL */
-  sigjmp_buf * p_cancel_jmp;    /* where to siglongjmp on a cancel or NULL */
-  char p_terminated;            /* true if terminated e.g. by pthread_exit */
-  char p_detached;              /* true if detached */
-  char p_exited;                /* true if the assoc. process terminated */
-  void * p_retval;              /* placeholder for return value */
-  int p_retcode;                /* placeholder for return code */
-  pthread_descr p_joining;      /* thread joining on that thread or NULL */
-  struct _pthread_cleanup_buffer * p_cleanup; /* cleanup functions */
-  char p_cancelstate;           /* cancellation state */
-  char p_canceltype;            /* cancellation type (deferred/async) */
-  char p_canceled;              /* cancellation request pending */
-  struct _reent * p_reentp;     /* pointer to reent struct */
-  struct _reent p_reent;        /* reentrant structure for newlib */
-  int * p_h_errnop;             /* pointer to used h_errno variable */
-  int p_h_errno;                /* error returned by last netdb function */
-  char * p_in_sighandler;       /* stack address of sighandler, or NULL */
-  char p_sigwaiting;            /* true if a sigwait() is in progress */
-  struct pthread_start_args p_start_args; /* arguments for thread creation */
-  void ** p_specific[PTHREAD_KEY_1STLEVEL_SIZE]; /* thread-specific data */
-  void * p_libc_specific[_LIBC_TSD_KEY_N]; /* thread-specific data for libc */
-  int p_userstack;		/* nonzero if the user provided the stack */
-  void *p_guardaddr;		/* address of guard area or NULL */
-  size_t p_guardsize;		/* size of guard area */
-  int p_nr;                     /* Index of descriptor in __pthread_handles */
-  int p_report_events;		/* Nonzero if events must be reported.  */
-  td_eventbuf_t p_eventbuf;     /* Data for event.  */
-  struct pthread_atomic p_resume_count; /* number of times restart() was
-					   called on thread */
-  char p_woken_by_cancel;       /* cancellation performed wakeup */
-  char p_condvar_avail;		/* flag if conditional variable became avail */
-  char p_sem_avail;             /* flag if semaphore became available */
-  pthread_extricate_if *p_extricate; /* See above */
-  pthread_readlock_info *p_readlock_list;  /* List of readlock info structs */
-  pthread_readlock_info *p_readlock_free;  /* Free list of structs */
-  int p_untracked_readlock_count;	/* Readlocks not tracked by list */
-  struct __res_state *p_resp;	/* Pointer to resolver state */
-  struct __res_state p_res;	/* per-thread resolver state */
-  int p_inheritsched;           /* copied from the thread attribute */
-#if HP_TIMING_AVAIL
-  hp_timing_t p_cpuclock_offset; /* Initial CPU clock for thread.  */
-#endif
-  /* New elements must be added at the end.  */
-} __attribute__ ((aligned(32))); /* We need to align the structure so that
-				    doubles are aligned properly.  This is 8
-				    bytes on MIPS and 16 bytes on MIPS64.
-				    32 bytes might give better cache
-				    utilization.  */
-
-
-/* The type of thread handles. */
-
-typedef struct pthread_handle_struct * pthread_handle;
-
-struct pthread_handle_struct {
-  struct _pthread_fastlock h_lock; /* Fast lock for sychronized access */
-  pthread_descr h_descr;        /* Thread descriptor or NULL if invalid */
-  char * h_bottom;              /* Lowest address in the stack thread */
-};
-
-/* The type of messages sent to the thread manager thread */
-
-struct pthread_request {
-  pthread_descr req_thread;     /* Thread doing the request */
-  enum {                        /* Request kind */
-    REQ_CREATE, REQ_FREE, REQ_PROCESS_EXIT, REQ_MAIN_THREAD_EXIT,
-    REQ_POST, REQ_DEBUG, REQ_KICK, REQ_FOR_EACH_THREAD
-  } req_kind;
-  union {                       /* Arguments for request */
-    struct {                    /* For REQ_CREATE: */
-      const pthread_attr_t * attr; /* thread attributes */
-      void * (*fn)(void *);     /*   start function */
-      void * arg;               /*   argument to start function */
-      sigset_t mask;            /*   signal mask */
-    } create;
-    struct {                    /* For REQ_FREE: */
-      pthread_t thread_id;      /*   identifier of thread to free */
-    } free;
-    struct {                    /* For REQ_PROCESS_EXIT: */
-      int code;                 /*   exit status */
-    } exit;
-    void * post;                /* For REQ_POST: the semaphore */
-    struct {			/* For REQ_FOR_EACH_THREAD: callback */
-      void (*fn)(void *, pthread_descr);
-      void *arg;
-    } for_each;
-  } req_args;
-};
-
-
-/* Signals used for suspend/restart and for cancellation notification.  */
-
-extern int __pthread_sig_restart;
-extern int __pthread_sig_cancel;
-
-/* Signal used for interfacing with gdb */
-
-extern int __pthread_sig_debug;
-
-/* Global array of thread handles, used for validating a thread id
-   and retrieving the corresponding thread descriptor. Also used for
-   mapping the available stack segments. */
-
-extern struct pthread_handle_struct __pthread_handles[PTHREAD_THREADS_MAX];
-
-/* Descriptor of the initial thread */
-
-extern struct _pthread_descr_struct __pthread_initial_thread;
-
-/* Descriptor of the manager thread */
-
-extern struct _pthread_descr_struct __pthread_manager_thread;
-
-/* Descriptor of the main thread */
-
-extern pthread_descr __pthread_main_thread;
-
-/* Limit between the stack of the initial thread (above) and the
-   stacks of other threads (below). Aligned on a STACK_SIZE boundary.
-   Initially 0, meaning that the current thread is (by definition)
-   the initial thread. */
-
-extern char *__pthread_initial_thread_bos;
-
-/* Indicate whether at least one thread has a user-defined stack (if 1),
-   or all threads have stacks supplied by LinuxThreads (if 0). */
-
-extern int __pthread_nonstandard_stacks;
-
-/* File descriptor for sending requests to the thread manager.
-   Initially -1, meaning that __pthread_initialize_manager must be called. */
-
-extern int __pthread_manager_request;
-
-/* Other end of the pipe for sending requests to the thread manager. */
-
-extern int __pthread_manager_reader;
-
-/* Limits of the thread manager stack. */
-
-extern char *__pthread_manager_thread_bos;
-extern char *__pthread_manager_thread_tos;
-
-#ifdef FLOATING_STACKS
-/* Maximum stack size.  */
-extern size_t __pthread_max_stacksize;
-#endif
-
-/* Pending request for a process-wide exit */
-
-extern int __pthread_exit_requested, __pthread_exit_code;
-
-/* Set to 1 by gdb if we're debugging */
-
-extern volatile int __pthread_threads_debug;
-
-/* Globally enabled events.  */
-extern volatile td_thr_events_t __pthread_threads_events;
-
-/* Pointer to descriptor of thread with last event.  */
-extern volatile pthread_descr __pthread_last_event;
-
-/* Flag which tells whether we are executing on SMP kernel. */
-extern int __pthread_smp_kernel;
-
-/* Return the handle corresponding to a thread id */
-
-static inline pthread_handle thread_handle(pthread_t id)
-{
-  return &__pthread_handles[id % PTHREAD_THREADS_MAX];
-}
-
-/* Validate a thread handle. Must have acquired h->h_spinlock before. */
-
-static inline int invalid_handle(pthread_handle h, pthread_t id)
-{
-  return h->h_descr == NULL || h->h_descr->p_tid != id || h->h_descr->p_terminated;
-}
-
-static inline int nonexisting_handle(pthread_handle h, pthread_t id)
-{
-  return h->h_descr == NULL || h->h_descr->p_tid != id;
-}
-
-/* Fill in defaults left unspecified by pt-machine.h.  */
-
-/* We round up a value with page size. */
-#ifndef page_roundup
-#define page_roundup(v,p) ((((size_t) (v)) + (p) - 1) & ~((p) - 1))
-#endif
-
-/* The page size we can get from the system.  This should likely not be
-   changed by the machine file but, you never know.  */
-#ifndef PAGE_SIZE
-#define PAGE_SIZE  (sysconf (_SC_PAGE_SIZE))
-#endif
-
-/* The max size of the thread stack segments.  If the default
-   THREAD_SELF implementation is used, this must be a power of two and
-   a multiple of PAGE_SIZE.  */
-#ifndef STACK_SIZE
-#define STACK_SIZE  (2 * 1024 * 1024)
-#endif
-
-/* The initial size of the thread stack.  Must be a multiple of PAGE_SIZE.  */
-#ifndef INITIAL_STACK_SIZE
-#define INITIAL_STACK_SIZE  (4 * PAGE_SIZE)
-#endif
-
-/* Size of the thread manager stack. The "- 32" avoids wasting space
-   with some malloc() implementations. */
-#ifndef THREAD_MANAGER_STACK_SIZE
-#define THREAD_MANAGER_STACK_SIZE  (2 * PAGE_SIZE - 32)
-#endif
-
-/* The base of the "array" of thread stacks.  The array will grow down from
-   here.  Defaults to the calculated bottom of the initial application
-   stack.  */
-#ifndef THREAD_STACK_START_ADDRESS
-#define THREAD_STACK_START_ADDRESS  __pthread_initial_thread_bos
-#endif
-
-/* Get some notion of the current stack.  Need not be exactly the top
-   of the stack, just something somewhere in the current frame.  */
-#ifndef CURRENT_STACK_FRAME
-#define CURRENT_STACK_FRAME  ({ char __csf; &__csf; })
-#endif
-
-/* Recover thread descriptor for the current thread */
-
-extern pthread_descr __pthread_find_self (void) __attribute__ ((const));
-
-static inline pthread_descr thread_self (void) __attribute__ ((const));
-static inline pthread_descr thread_self (void)
-{
-#ifdef THREAD_SELF
-  return THREAD_SELF;
-#else
-  char *sp = CURRENT_STACK_FRAME;
-  if (sp >= __pthread_initial_thread_bos)
-    return &__pthread_initial_thread;
-  else if (sp >= __pthread_manager_thread_bos
-	   && sp < __pthread_manager_thread_tos)
-    return &__pthread_manager_thread;
-  else if (__pthread_nonstandard_stacks)
-    return __pthread_find_self();
-  else
-#ifdef _STACK_GROWS_DOWN
-    return (pthread_descr)(((unsigned long)sp | (STACK_SIZE-1))+1) - 1;
-#else
-    return (pthread_descr)((unsigned long)sp &~ (STACK_SIZE-1));
-#endif
-#endif
-}
-
-/* If MEMORY_BARRIER isn't defined in pt-machine.h, assume the architecture
-   doesn't need a memory barrier instruction (e.g. Intel x86).  Still we
-   need the compiler to respect the barrier and emit all outstanding
-   operations which modify memory.  Some architectures distinguish between
-   full, read and write barriers.  */
-
-#ifndef MEMORY_BARRIER
-#define MEMORY_BARRIER() asm ("" : : : "memory")
-#endif
-#ifndef READ_MEMORY_BARRIER
-#define READ_MEMORY_BARRIER() MEMORY_BARRIER()
-#endif
-#ifndef WRITE_MEMORY_BARRIER
-#define WRITE_MEMORY_BARRIER() MEMORY_BARRIER()
-#endif
-
-/* Max number of times we must spin on a spinlock calling sched_yield().
-   After MAX_SPIN_COUNT iterations, we put the calling thread to sleep. */
-
-#ifndef MAX_SPIN_COUNT
-#define MAX_SPIN_COUNT 50
-#endif
-
-/* Max number of times the spinlock in the adaptive mutex implementation
-   spins actively on SMP systems.  */
-
-#ifndef MAX_ADAPTIVE_SPIN_COUNT
-#define MAX_ADAPTIVE_SPIN_COUNT 100
-#endif
-
-/* Duration of sleep (in nanoseconds) when we can't acquire a spinlock
-   after MAX_SPIN_COUNT iterations of sched_yield().
-   With the 2.0 and 2.1 kernels, this MUST BE > 2ms.
-   (Otherwise the kernel does busy-waiting for realtime threads,
-    giving other threads no chance to run.) */
-
-#ifndef SPIN_SLEEP_DURATION
-#define SPIN_SLEEP_DURATION 2000001
-#endif
-
-/* Debugging */
-
-#ifdef DEBUG
-#include <assert.h>
-#define ASSERT assert
-#define MSG __pthread_message
-#else
-#define ASSERT(x)
-#define MSG(msg,arg...)
-#endif
-
-/* Internal global functions */
-
-extern void __pthread_do_exit (void *retval, char *currentframe)
-     __attribute__ ((__noreturn__));
-extern void __pthread_destroy_specifics (void);
-extern void __pthread_perform_cleanup (char *currentframe);
-extern void __pthread_init_max_stacksize (void);
-extern int __pthread_initialize_manager (void);
-extern void __pthread_message (char * fmt, ...);
-extern int __pthread_manager (void *reqfd);
-extern int __pthread_manager_event (void *reqfd);
-extern void __pthread_manager_sighandler (int sig);
-extern void __pthread_reset_main_thread (void);
-extern void __pthread_once_fork_prepare (void);
-extern void __pthread_once_fork_parent (void);
-extern void __pthread_once_fork_child (void);
-extern void __flockfilelist (void);
-extern void __funlockfilelist (void);
-extern void __fresetlockfiles (void);
-extern void __pthread_manager_adjust_prio (int thread_prio);
-extern void __pthread_initialize_minimal (void);
-
-extern int __pthread_attr_setguardsize (pthread_attr_t *__attr,
-					size_t __guardsize);
-extern int __pthread_attr_getguardsize (const pthread_attr_t *__attr,
-					size_t *__guardsize);
-extern int __pthread_attr_setstackaddr (pthread_attr_t *__attr,
-					void *__stackaddr);
-extern int __pthread_attr_getstackaddr (const pthread_attr_t *__attr,
-					void **__stackaddr);
-extern int __pthread_attr_setstacksize (pthread_attr_t *__attr,
-					size_t __stacksize);
-extern int __pthread_attr_getstacksize (const pthread_attr_t *__attr,
-					size_t *__stacksize);
-extern int __pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr,
-				    size_t __stacksize);
-extern int __pthread_attr_getstack (const pthread_attr_t *__attr, void **__stackaddr,
-				    size_t *__stacksize);
-extern int __pthread_getconcurrency (void);
-extern int __pthread_setconcurrency (int __level);
-extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex,
-				      const struct timespec *__abstime);
-extern int __pthread_mutexattr_getpshared (const pthread_mutexattr_t *__attr,
-					   int *__pshared);
-extern int __pthread_mutexattr_setpshared (pthread_mutexattr_t *__attr,
-					   int __pshared);
-extern int __pthread_mutexattr_gettype (const pthread_mutexattr_t *__attr,
-					int *__kind);
-extern void __pthread_kill_other_threads_np (void);
-
-extern void __pthread_restart_old(pthread_descr th);
-extern void __pthread_suspend_old(pthread_descr self);
-extern int __pthread_timedsuspend_old(pthread_descr self, const struct timespec *abs);
-
-extern void __pthread_restart_new(pthread_descr th);
-extern void __pthread_suspend_new(pthread_descr self);
-extern int __pthread_timedsuspend_new(pthread_descr self, const struct timespec *abs);
-
-extern void __pthread_wait_for_restart_signal(pthread_descr self);
-
-extern int __pthread_yield (void);
-
-extern int __pthread_rwlock_timedrdlock (pthread_rwlock_t *__restrict __rwlock,
-					 __const struct timespec *__restrict
-					 __abstime);
-extern int __pthread_rwlock_timedwrlock (pthread_rwlock_t *__restrict __rwlock,
-					 __const struct timespec *__restrict
-					 __abstime);
-extern int __pthread_rwlockattr_destroy (pthread_rwlockattr_t *__attr);
-
-extern int __pthread_barrierattr_getpshared (__const pthread_barrierattr_t *
-					     __restrict __attr,
-					     int *__restrict __pshared);
-
-extern int __pthread_spin_lock (pthread_spinlock_t *__lock);
-extern int __pthread_spin_trylock (pthread_spinlock_t *__lock);
-extern int __pthread_spin_unlock (pthread_spinlock_t *__lock);
-extern int __pthread_spin_init (pthread_spinlock_t *__lock, int __pshared);
-extern int __pthread_spin_destroy (pthread_spinlock_t *__lock);
-
-extern int __pthread_clock_gettime (hp_timing_t freq, struct timespec *tp);
-extern void __pthread_clock_settime (hp_timing_t offset);
-
-
-/* Global pointers to old or new suspend functions */
-
-extern void (*__pthread_restart)(pthread_descr);
-extern void (*__pthread_suspend)(pthread_descr);
-extern int (*__pthread_timedsuspend)(pthread_descr, const struct timespec *);
-
-/* Prototypes for the function without cancelation support when the
-   normal version has it.  */
-extern int __libc_close (int fd);
-extern int __libc_nanosleep (const struct timespec *requested_time,
-			     struct timespec *remaining);
-/* Prototypes for some of the new semaphore functions.  */
-extern int __new_sem_post (sem_t * sem);
-extern int __new_sem_init (sem_t *__sem, int __pshared, unsigned int __value);
-extern int __new_sem_wait (sem_t *__sem);
-extern int __new_sem_trywait (sem_t *__sem);
-extern int __new_sem_getvalue (sem_t *__restrict __sem, int *__restrict __sval);
-extern int __new_sem_destroy (sem_t *__sem);
-
-/* Prototypes for compatibility functions.  */
-extern int __pthread_attr_init_2_1 (pthread_attr_t *__attr);
-extern int __pthread_attr_init_2_0 (pthread_attr_t *__attr);
-extern int __pthread_create_2_1 (pthread_t *__restrict __thread1,
-				 const pthread_attr_t *__attr,
-				 void *(*__start_routine) (void *),
-				 void *__restrict __arg);
-extern int __pthread_create_2_0 (pthread_t *__restrict __thread1,
-				 const pthread_attr_t *__attr,
-				 void *(*__start_routine) (void *),
-				 void *__restrict arg);
-
-/* The functions called the signal events.  */
-extern void __linuxthreads_create_event (void);
-extern void __linuxthreads_death_event (void);
-extern void __linuxthreads_reap_event (void);
-
-/* This function is called to initialize the pthread library.  */
-extern void __pthread_initialize (void);
-
-#endif /* internals.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/join.c b/newlib/libc/sys/linux/linuxthreads/join.c
deleted file mode 100644
index a6ed08c..0000000
--- a/newlib/libc/sys/linux/linuxthreads/join.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Thread termination and joining */
-
-#include <errno.h>
-#include <sched.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "pthread.h"
-#include "internals.h"
-#include "spinlock.h"
-#include "restart.h"
-
-void pthread_exit(void * retval)
-{
-  __pthread_do_exit (retval, CURRENT_STACK_FRAME);
-}
-
-void __pthread_do_exit(void *retval, char *currentframe)
-{
-  pthread_descr self = thread_self();
-  pthread_descr joining;
-  struct pthread_request request;
-
-  /* Reset the cancellation flag to avoid looping if the cleanup handlers
-     contain cancellation points */
-  THREAD_SETMEM(self, p_canceled, 0);
-  /* Call cleanup functions and destroy the thread-specific data */
-  __pthread_perform_cleanup(currentframe);
-  __pthread_destroy_specifics();
-  /* Store return value */
-  __pthread_lock(THREAD_GETMEM(self, p_lock), self);
-  THREAD_SETMEM(self, p_retval, retval);
-  /* See whether we have to signal the death.  */
-  if (THREAD_GETMEM(self, p_report_events))
-    {
-      /* See whether TD_DEATH is in any of the mask.  */
-      int idx = __td_eventword (TD_DEATH);
-      uint32_t mask = __td_eventmask (TD_DEATH);
-
-      if ((mask & (__pthread_threads_events.event_bits[idx]
-		   | THREAD_GETMEM_NC(self,
-				      p_eventbuf.eventmask.event_bits[idx])))
-	  != 0)
-	{
-	  /* Yep, we have to signal the death.  */
-	  THREAD_SETMEM(self, p_eventbuf.eventnum, TD_DEATH);
-	  THREAD_SETMEM(self, p_eventbuf.eventdata, self);
-	  __pthread_last_event = self;
-
-	  /* Now call the function to signal the event.  */
-	  __linuxthreads_death_event();
-	}
-    }
-  /* Say that we've terminated */
-  THREAD_SETMEM(self, p_terminated, 1);
-  /* See if someone is joining on us */
-  joining = THREAD_GETMEM(self, p_joining);
-  __pthread_unlock(THREAD_GETMEM(self, p_lock));
-  /* Restart joining thread if any */
-  if (joining != NULL) restart(joining);
-  /* If this is the initial thread, block until all threads have terminated.
-     If another thread calls exit, we'll be terminated from our signal
-     handler. */
-  if (self == __pthread_main_thread && __pthread_manager_request >= 0) {
-    request.req_thread = self;
-    request.req_kind = REQ_MAIN_THREAD_EXIT;
-    TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request,
-				    (char *)&request, sizeof(request)));
-    suspend(self);
-    /* Main thread flushes stdio streams and runs atexit functions.
-       It also calls a handler within LinuxThreads which sends a process exit
-       request to the thread manager. */
-    exit(0);
-  }
-  /* Threads other than the main one  terminate without flushing stdio streams
-     or running atexit functions. */
-  _exit(0);
-}
-
-/* Function called by pthread_cancel to remove the thread from
-   waiting on a condition variable queue. */
-
-static int join_extricate_func(void *obj, pthread_descr th)
-{
-  volatile pthread_descr self = thread_self();
-  pthread_handle handle = obj;
-  pthread_descr jo;
-  int did_remove = 0;
-
-  __pthread_lock(&handle->h_lock, self);
-  jo = handle->h_descr;
-  did_remove = jo->p_joining != NULL;
-  jo->p_joining = NULL;
-  __pthread_unlock(&handle->h_lock);
-
-  return did_remove;
-}
-
-int pthread_join(pthread_t thread_id, void ** thread_return)
-{
-  volatile pthread_descr self = thread_self();
-  struct pthread_request request;
-  pthread_handle handle = thread_handle(thread_id);
-  pthread_descr th;
-  pthread_extricate_if extr;
-  int already_canceled = 0;
-
-  /* Set up extrication interface */
-  extr.pu_object = handle;
-  extr.pu_extricate_func = join_extricate_func;
-
-  __pthread_lock(&handle->h_lock, self);
-  if (nonexisting_handle(handle, thread_id)) {
-    __pthread_unlock(&handle->h_lock);
-    return ESRCH;
-  }
-  th = handle->h_descr;
-  if (th == self) {
-    __pthread_unlock(&handle->h_lock);
-    return EDEADLK;
-  }
-  /* If detached or already joined, error */
-  if (th->p_detached || th->p_joining != NULL) {
-    __pthread_unlock(&handle->h_lock);
-    return EINVAL;
-  }
-  /* If not terminated yet, suspend ourselves. */
-  if (! th->p_terminated) {
-    /* Register extrication interface */
-    __pthread_set_own_extricate_if(self, &extr);
-    if (!(THREAD_GETMEM(self, p_canceled)
-	&& THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE))
-      th->p_joining = self;
-    else
-      already_canceled = 1;
-    __pthread_unlock(&handle->h_lock);
-
-    if (already_canceled) {
-      __pthread_set_own_extricate_if(self, 0);
-      __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-    }
-
-    suspend(self);
-    /* Deregister extrication interface */
-    __pthread_set_own_extricate_if(self, 0);
-
-    /* This is a cancellation point */
-    if (THREAD_GETMEM(self, p_woken_by_cancel)
-	&& THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) {
-      THREAD_SETMEM(self, p_woken_by_cancel, 0);
-      __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-    }
-    __pthread_lock(&handle->h_lock, self);
-  }
-  /* Get return value */
-  if (thread_return != NULL) *thread_return = th->p_retval;
-  __pthread_unlock(&handle->h_lock);
-  /* Send notification to thread manager */
-  if (__pthread_manager_request >= 0) {
-    request.req_thread = self;
-    request.req_kind = REQ_FREE;
-    request.req_args.free.thread_id = thread_id;
-    TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request,
-				    (char *) &request, sizeof(request)));
-  }
-  return 0;
-}
-
-int pthread_detach(pthread_t thread_id)
-{
-  int terminated;
-  struct pthread_request request;
-  pthread_handle handle = thread_handle(thread_id);
-  pthread_descr th;
-
-  __pthread_lock(&handle->h_lock, NULL);
-  if (nonexisting_handle(handle, thread_id)) {
-    __pthread_unlock(&handle->h_lock);
-    return ESRCH;
-  }
-  th = handle->h_descr;
-  /* If already detached, error */
-  if (th->p_detached) {
-    __pthread_unlock(&handle->h_lock);
-    return EINVAL;
-  }
-  /* If already joining, don't do anything. */
-  if (th->p_joining != NULL) {
-    __pthread_unlock(&handle->h_lock);
-    return 0;
-  }
-  /* Mark as detached */
-  th->p_detached = 1;
-  terminated = th->p_terminated;
-  __pthread_unlock(&handle->h_lock);
-  /* If already terminated, notify thread manager to reclaim resources */
-  if (terminated && __pthread_manager_request >= 0) {
-    request.req_thread = thread_self();
-    request.req_kind = REQ_FREE;
-    request.req_args.free.thread_id = thread_id;
-    TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request,
-				    (char *) &request, sizeof(request)));
-  }
-  return 0;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/joinrace.c b/newlib/libc/sys/linux/linuxthreads/joinrace.c
deleted file mode 100644
index 8e1064c..0000000
--- a/newlib/libc/sys/linux/linuxthreads/joinrace.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Test case by Permaine Cheung <pcheung@cygnus.com>.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-static void *
-sub1 (void *arg)
-{
-  /* Nothing.  */
-  return NULL;
-}
-
-int
-main (void)
-{
-  int istatus;
-  int policy;
-  int cnt;
-  pthread_t thread1;
-  struct sched_param spresult1, sp1;
-
-  for (cnt = 0; cnt < 100; ++cnt)
-    {
-      printf ("Round %d\n", cnt);
-
-      pthread_create (&thread1, NULL, &sub1, NULL);
-      pthread_join (thread1, NULL);
-
-      istatus = pthread_getschedparam (thread1, &policy, &spresult1);
-      if (istatus != ESRCH)
-	{
-	  printf ("pthread_getschedparam returns: %d\n", istatus);
-	  return 1;
-	}
-
-      sp1.sched_priority = 0;
-      istatus = pthread_setschedparam (thread1, SCHED_OTHER, &sp1);
-      if (istatus != ESRCH)
-	{
-	  printf ("pthread_setschedparam returns: %d\n", istatus);
-	  return 2;
-	}
-    }
-
-  return 0;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/kernel-features.h b/newlib/libc/sys/linux/linuxthreads/kernel-features.h
deleted file mode 100644
index 562a6c7..0000000
--- a/newlib/libc/sys/linux/linuxthreads/kernel-features.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Set flags signalling availability of kernel features based on given
-   kernel version number.
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* This file must not contain any C code.  At least it must be protected
-   to allow using the file also in assembler files.  */
-
-#ifndef __LINUX_KERNEL_VERSION
-/* We assume the worst; all kernels should be supported.  */
-# define __LINUX_KERNEL_VERSION	0
-#endif
-
-/* We assume for __LINUX_KERNEL_VERSION the same encoding used in
-   linux/version.h.  I.e., the major, minor, and subminor all get a
-   byte with the major number being in the highest byte.  This means
-   we can do numeric comparisons.
-
-   In the following we will define certain symbols depending on
-   whether the describes kernel feature is available in the kernel
-   version given by __LINUX_KERNEL_VERSION.  We are not always exactly
-   recording the correct versions in which the features were
-   introduced.  If somebody cares these values can afterwards be
-   corrected.  Most of the numbers here are set corresponding to
-   2.2.0.  */
-
-/* `getcwd' system call.  */
-#if __LINUX_KERNEL_VERSION >= 131584
-# define __ASSUME_GETCWD_SYSCALL	1
-#endif
-
-/* Real-time signal became usable in 2.1.70.  */
-#if __LINUX_KERNEL_VERSION >= 131398
-# define __ASSUME_REALTIME_SIGNALS	1
-#endif
-
-/* When were the `pread'/`pwrite' syscalls introduced?  */
-#if __LINUX_KERNEL_VERSION >= 131584
-# define __ASSUME_PREAD_SYSCALL		1
-# define __ASSUME_PWRITE_SYSCALL	1
-#endif
-
-/* When was `poll' introduced?  */
-#if __LINUX_KERNEL_VERSION >= 131584
-# define __ASSUME_POLL_SYSCALL		1
-#endif
-
-/* The `lchown' syscall was introduced in 2.1.80.  */
-#if __LINUX_KERNEL_VERSION >= 131408
-# define __ASSUME_LCHOWN_SYSCALL	1
-#endif
-
-/* When did the `setresuid' sysall became available?  */
-#if __LINUX_KERNEL_VERSION >= 131584 && !defined __sparc__
-# define __ASSUME_SETRESUID_SYSCALL	1
-#endif
-
-/* The SIOCGIFNAME ioctl is available starting with 2.1.50.  */
-#if __LINUX_KERNEL_VERSION >= 131408
-# define __ASSUME_SIOCGIFNAME		1
-#endif
-
-/* On x86 another `getrlimit' syscall was added in 2.3.25.  */
-#if __LINUX_KERNEL_VERSION >= 131865 && defined __i386__
-# define __ASSUME_NEW_GETRLIMIT_SYSCALL	1
-#endif
-
-/* On x86 the truncate64/ftruncate64 syscalls were introduced in 2.3.31.  */
-#if __LINUX_KERNEL_VERSION >= 131871 && defined __i386__
-# define __ASSUME_TRUNCATE64_SYSCALL	1
-#endif
-
-/* On x86 the mmap2 syscall was introduced in 2.3.31.  */
-#if __LINUX_KERNEL_VERSION >= 131871 && defined __i386__
-# define __ASSUME_MMAP2_SYSCALL	1
-#endif
-
-/* On x86 the stat64/lstat64/fstat64 syscalls were introduced in 2.3.34.  */
-#if __LINUX_KERNEL_VERSION >= 131874 && defined __i386__
-# define __ASSUME_STAT64_SYSCALL	1
-#endif
-
-/* On sparc and ARM the truncate64/ftruncate64/mmap2/stat64/lstat64/fstat64
-   syscalls were introduced in 2.3.35.  */
-#if __LINUX_KERNEL_VERSION >= 131875 && (defined __sparc__ || defined __arm__)
-# define __ASSUME_TRUNCATE64_SYSCALL	1
-# define __ASSUME_MMAP2_SYSCALL		1
-# define __ASSUME_STAT64_SYSCALL	1
-#endif
-
-/* I know for sure that these are in 2.3.35 on powerpc.  */
-#if __LINUX_KERNEL_VERSION >= 131875 && defined __powerpc__
-# define __ASSUME_TRUNCATE64_SYSCALL	1
-# define __ASSUME_STAT64_SYSCALL	1
-# define __ASSUME_NEW_GETRLIMIT_SYSCALL	1
-#endif
-
-/* Linux 2.3.39 introduced 32bit UID/GIDs and IPC64.  Some platforms had 32
-   bit type all along.  */
-#if __LINUX_KERNEL_VERSION >= 131879 || defined __powerpc__ || defined __mips__
-# define __ASSUME_32BITUIDS		1
-# ifndef __powerpc__
-#  define __ASSUME_IPC64		1
-# endif
-# ifdef __sparc__
-#  define __ASSUME_SETRESUID_SYSCALL	1
-# endif
-#endif
-
-/* Linux 2.4.0 on PPC introduced a correct IPC64.  */
-#if __LINUX_KERNEL_VERSION >= 132096 && defined __powerpc__
-# define __ASSUME_IPC64			1
-#endif
-
-/* We can use the LDTs for threading with Linux 2.3.99 and newer.  */
-#if __LINUX_KERNEL_VERSION >= 131939
-# define __ASSUME_LDT_WORKS		1
-#endif
-
-/* The changed st_ino field appeared in 2.4.0-test6.  But we cannot
-   distinguish this version from other 2.4.0 releases.  Therefore play
-   save and assume it available is for 2.4.1 and up.  */
-#if __LINUX_KERNEL_VERSION >= 132097
-# define __ASSUME_ST_INO_64_BIT		1
-#endif
-
-/* To support locking of large files a new fcntl() syscall was introduced
-   in 2.4.0-test7.  We test for 2.4.1 for the earliest version we know
-   the syscall is available.  */
-#if __LINUX_KERNEL_VERSION >= 132097 && (defined __i386__ || defined __sparc__)
-# define __ASSUME_FCNTL64		1
-#endif
-
-/* Arm got fcntl64 in 2.4.4, PowerPC and SH have it also in 2.4.4 (I
-   don't know when it got introduced).  */
-#if __LINUX_KERNEL_VERSION >= 132100 \
-    && (defined __arm__ || defined __powerpc__ || defined __sh__)
-# define __ASSUME_FCNTL64		1
-#endif
-
-/* The getdents64 syscall was introduced in 2.4.0-test7.  We test for
-   2.4.1 for the earliest version we know the syscall is available.  */
-#if __LINUX_KERNEL_VERSION >= 132097
-# define __ASSUME_GETDENTS64_SYSCALL	1
-#endif
-
-/* When did O_DIRECTORY became available?  Early in 2.3 but when?
-   Be safe, use 2.3.99.  */
-#if __LINUX_KERNEL_VERSION >= 131939
-# define __ASSUME_O_DIRECTORY		1
-#endif
-
-/* Starting with one of the 2.4.0 pre-releases the Linux kernel passes
-   up the page size information.  */
-#if __LINUX_KERNEL_VERSION >= 132097
-# define __ASSUME_AT_PAGESIZE		1
-#endif
-
-/* Starting with 2.4.5 kernels PPC passes the AUXV in the standard way
-   and the mmap2 syscall made it into the official kernel.  */
-#if __LINUX_KERNEL_VERSION >= (132096+5) && defined __powerpc__
-# define __ASSUME_STD_AUXV		1
-# define __ASSUME_MMAP2_SYSCALL		1
-#endif
-
-/* There are an infinite number of PA-RISC kernel versions numbered
-   2.4.0.  But they've not really been released as such.  We require
-   and expect the final version here.  */
-#ifdef __hppa__
-# define __ASSUME_32BITUIDS		1
-# define __ASSUME_TRUNCATE64_SYSCALL	1
-# define __ASSUME_MMAP2_SYSCALL		1
-# define __ASSUME_STAT64_SYSCALL	1
-# define __ASSUME_IPC64			1
-# define __ASSUME_ST_INO_64_BIT		1
-# define __ASSUME_FCNTL64		1
-# define __ASSUME_GETDENTS64_SYSCALL	1
-#endif
diff --git a/newlib/libc/sys/linux/linuxthreads/libc-internal.h b/newlib/libc/sys/linux/linuxthreads/libc-internal.h
deleted file mode 100644
index 8369ffe..0000000
--- a/newlib/libc/sys/linux/linuxthreads/libc-internal.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This file contains a number of internal prototype declarations that
-   don't fit anywhere else.  */
-
-#ifndef _LIBC_INTERNAL
-# define _LIBC_INTERNAL 1
-
-#include <hp-timing.h>
-
-/* Initialize the `__libc_enable_secure' flag.  */
-extern void __libc_init_secure (void);
-
-/* This function will be called from _init in init-first.c.  */
-extern void __libc_global_ctors (void);
-
-/* Discover the tick frequency of the machine if something goes wrong,
-   we return 0, an impossible hertz.  */
-extern int __profile_frequency (void);
-
-/* Hooks for the instrumenting functions.  */
-extern void __cyg_profile_func_enter (void *this_fn, void *call_site);
-extern void __cyg_profile_func_exit (void *this_fn, void *call_site);
-
-/* Get frequency of the system processor.  */
-extern hp_timing_t __get_clockfreq (void);
-
-/* Free all allocated resources.  */
-extern void __libc_freeres (void);
-
-#endif /* _LIBC_INTERNAL  */
diff --git a/newlib/libc/sys/linux/linuxthreads/libc-symbols.h b/newlib/libc/sys/linux/linuxthreads/libc-symbols.h
deleted file mode 100644
index 97b6726..0000000
--- a/newlib/libc/sys/linux/linuxthreads/libc-symbols.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/* Support macros for making weak and strong aliases for symbols,
-   and for using symbol sets and linker warnings with GNU ld.
-   Copyright (C) 1995,1996,1997,1998,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _LIBC_SYMBOLS_H
-#define _LIBC_SYMBOLS_H	1
-
-/* This file's macros are included implicitly in the compilation of every
-   file in the C library by -imacros.
-
-   We include config.h which is generated by configure.
-   It should define for us the following symbols:
-
-   * HAVE_ASM_SET_DIRECTIVE if we have `.set B, A' instead of `A = B'.
-   * ASM_GLOBAL_DIRECTIVE with `.globl' or `.global'.
-   * HAVE_GNU_LD if using GNU ld, with support for weak symbols in a.out,
-   and for symbol set and warning messages extensions in a.out and ELF.
-   * HAVE_ELF if using ELF, which supports weak symbols using `.weak'.
-   * HAVE_ASM_WEAK_DIRECTIVE if we have weak symbols using `.weak'.
-   * HAVE_ASM_WEAKEXT_DIRECTIVE if we have weak symbols using `.weakext'.
-
-   */
-
-/* This is defined for the compilation of all C library code.  features.h
-   tests this to avoid inclusion of stubs.h while compiling the library,
-   before stubs.h has been generated.  Some library code that is shared
-   with other packages also tests this symbol to see if it is being
-   compiled as part of the C library.  We must define this before including
-   config.h, because it makes some definitions conditional on whether libc
-   itself is being compiled, or just some generator program.  */
-#define _LIBC	1
-
-/* Enable declarations of GNU extensions, since we are compiling them.  */
-#define _GNU_SOURCE	1
-/* And we also need the data for the reentrant functions.  */
-#define _REENTRANT	1
-
-#include <config.h>
-
-/* The symbols in all the user (non-_) macros are C symbols.
-   HAVE_GNU_LD without HAVE_ELF implies a.out.  */
-
-#if defined HAVE_ASM_WEAK_DIRECTIVE || defined HAVE_ASM_WEAKEXT_DIRECTIVE
-# define HAVE_WEAK_SYMBOLS
-#endif
-
-#ifndef __SYMBOL_PREFIX
-# ifdef NO_UNDERSCORES
-#  define __SYMBOL_PREFIX
-# else
-#  define __SYMBOL_PREFIX "_"
-# endif
-#endif
-
-#ifndef C_SYMBOL_NAME
-# ifdef NO_UNDERSCORES
-#  define C_SYMBOL_NAME(name) name
-# else
-#  define C_SYMBOL_NAME(name) _##name
-# endif
-#endif
-
-#ifndef ASM_LINE_SEP
-# define ASM_LINE_SEP ;
-#endif
-
-#ifndef C_SYMBOL_DOT_NAME
-# define C_SYMBOL_DOT_NAME(name) .##name
-#endif
-
-#ifndef __ASSEMBLER__
-/* GCC understands weak symbols and aliases; use its interface where
-   possible, instead of embedded assembly language.  */
-
-/* Define ALIASNAME as a strong alias for NAME.  */
-# define strong_alias(name, aliasname) _strong_alias(name, aliasname)
-# define _strong_alias(name, aliasname) \
-  extern __typeof (name) aliasname __attribute__ ((alias (#name)));
-
-/* This comes between the return type and function name in
-   a function definition to make that definition weak.  */
-# define weak_function __attribute__ ((weak))
-# define weak_const_function __attribute__ ((weak, __const__))
-
-# ifdef HAVE_WEAK_SYMBOLS
-
-/* Define ALIASNAME as a weak alias for NAME.
-   If weak aliases are not available, this defines a strong alias.  */
-#  define weak_alias(name, aliasname) _weak_alias (name, aliasname)
-#  define _weak_alias(name, aliasname) \
-  extern __typeof (name) aliasname __attribute__ ((weak, alias (#name)));
-
-/* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined).  */
-#  define weak_extern(symbol) _weak_extern (symbol)
-#  ifdef HAVE_ASM_WEAKEXT_DIRECTIVE
-#   define _weak_extern(symbol) asm (".weakext " __SYMBOL_PREFIX #symbol);
-#  else
-#   define _weak_extern(symbol)    asm (".weak " __SYMBOL_PREFIX #symbol);
-#  endif
-
-# else
-
-#  define weak_alias(name, aliasname) strong_alias(name, aliasname)
-#  define weak_extern(symbol) /* Nothing. */
-
-# endif
-
-#else /* __ASSEMBLER__ */
-
-# ifdef HAVE_ASM_SET_DIRECTIVE
-#  define strong_alias(original, alias)		\
-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP	\
-  .set C_SYMBOL_NAME (alias),C_SYMBOL_NAME (original)
-# else
-#  ifdef HAVE_ASM_GLOBAL_DOT_NAME
-#   define strong_alias(original, alias)	\
-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP	\
-  C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original) ASM_LINE_SEP	\
-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP	\
-  C_SYMBOL_DOT_NAME (alias) = C_SYMBOL_DOT_NAME (original)
-#  else
-#   define strong_alias(original, alias)	\
-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP	\
-  C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original)
-#  endif
-# endif
-
-# ifdef HAVE_WEAK_SYMBOLS
-#  ifdef HAVE_ASM_WEAKEXT_DIRECTIVE
-#   define weak_alias(original, alias)	\
-  .weakext C_SYMBOL_NAME (alias), C_SYMBOL_NAME (original)
-#   define weak_extern(symbol)	\
-  .weakext C_SYMBOL_NAME (symbol)
-
-#  else /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
-
-#   ifdef HAVE_ASM_GLOBAL_DOT_NAME
-#    define weak_alias(original, alias)	\
-  .weak C_SYMBOL_NAME (alias) ASM_LINE_SEP			\
-  C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original) ASM_LINE_SEP	\
-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP	\
-  C_SYMBOL_DOT_NAME (alias) = C_SYMBOL_DOT_NAME (original)
-#   else
-#    define weak_alias(original, alias)	\
-  .weak C_SYMBOL_NAME (alias) ASM_LINE_SEP	\
-  C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original)
-#   endif
-
-#   define weak_extern(symbol)	\
-  .weak C_SYMBOL_NAME (symbol)
-
-#  endif /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
-
-# else /* ! HAVE_WEAK_SYMBOLS */
-
-#  define weak_alias(original, alias) strong_alias(original, alias)
-#  define weak_extern(symbol) /* Nothing */
-# endif /* ! HAVE_WEAK_SYMBOLS */
-
-#endif /* __ASSEMBLER__ */
-
-/* On some platforms we can make internal function calls (i.e., calls of
-   functions not exported) a bit faster by using a different calling
-   convention.  */
-#ifndef internal_function
-# define internal_function	/* empty */
-#endif
-
-/* Prepare for the case that `__builtin_expect' is not available.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-/* Determine the return address.  */
-#define RETURN_ADDRESS(nr) \
-  __builtin_extract_return_addr (__builtin_return_address (nr))
-
-/* When a reference to SYMBOL is encountered, the linker will emit a
-   warning message MSG.  */
-#ifdef HAVE_GNU_LD
-# ifdef HAVE_ELF
-
-/* We want the .gnu.warning.SYMBOL section to be unallocated.  */
-#  ifdef HAVE_ASM_PREVIOUS_DIRECTIVE
-#   define __make_section_unallocated(section_string)	\
-  asm (".section " section_string "\n\t.previous");
-#  elif defined HAVE_ASM_POPSECTION_DIRECTIVE
-#   define __make_section_unallocated(section_string)	\
-  asm (".pushsection " section_string "\n\t.popsection");
-#  else
-#   define __make_section_unallocated(section_string)
-#  endif
-
-/* Tacking on "\n\t#" to the section name makes gcc put it's bogus
-   section attributes on what looks like a comment to the assembler.  */
-#  ifdef HAVE_SECTION_QUOTES
-#   define link_warning(symbol, msg) \
-  __make_section_unallocated (".gnu.warning." #symbol) \
-  static const char __evoke_link_warning_##symbol[]	\
-    __attribute__ ((section (".gnu.warning." #symbol "\"\n\t#\""))) = msg;
-#  else
-#   define link_warning(symbol, msg) \
-  __make_section_unallocated (".gnu.warning." #symbol) \
-  static const char __evoke_link_warning_##symbol[]	\
-    __attribute__ ((section (".gnu.warning." #symbol "\n\t#"))) = msg;
-#  endif
-# else /* Not ELF: a.out */
-#  ifdef HAVE_XCOFF
-/* XCOFF does not support .stabs.
-   The native aix linker will remove the .stab and .stabstr sections
-   The gnu linker will have a fatal error if there is a relocation for
-   symbol in the .stab section.  Silently disable this macro.  */
-#   define link_warning(symbol, msg) 
-#  else
-#   define link_warning(symbol, msg)		\
-     asm (".stabs \"" msg "\",30,0,0,0\n\t"	\
-          ".stabs \"" __SYMBOL_PREFIX #symbol "\",1,0,0,0\n");
-#  endif /* XCOFF */
-# endif
-#else
-/* We will never be heard; they will all die horribly.  */
-# define link_warning(symbol, msg)
-#endif
-
-/* A canned warning for sysdeps/stub functions.  */
-#define	stub_warning(name) \
-  link_warning (name, \
-		"warning: " #name " is not implemented and will always fail")
-
-/*
-
-*/
-
-#ifdef HAVE_GNU_LD
-
-/* Symbol set support macros.  */
-
-# ifdef HAVE_ELF
-
-/* Make SYMBOL, which is in the text segment, an element of SET.  */
-#  define text_set_element(set, symbol)	_elf_set_element(set, symbol)
-/* Make SYMBOL, which is in the data segment, an element of SET.  */
-#  define data_set_element(set, symbol)	_elf_set_element(set, symbol)
-/* Make SYMBOL, which is in the bss segment, an element of SET.  */
-#  define bss_set_element(set, symbol)	_elf_set_element(set, symbol)
-
-/* These are all done the same way in ELF.
-   There is a new section created for each set.  */
-#  ifdef SHARED
-/* When building a shared library, make the set section writable,
-   because it will need to be relocated at run time anyway.  */
-#   define _elf_set_element(set, symbol) \
-  static const void *__elf_set_##set##_element_##symbol##__ \
-    __attribute__ ((unused, section (#set))) = &(symbol)
-#  else
-#   define _elf_set_element(set, symbol) \
-  static const void *const __elf_set_##set##_element_##symbol##__ \
-    __attribute__ ((unused, section (#set))) = &(symbol)
-#  endif
-
-/* Define SET as a symbol set.  This may be required (it is in a.out) to
-   be able to use the set's contents.  */
-#  define symbol_set_define(set)	symbol_set_declare(set)
-
-/* Declare SET for use in this module, if defined in another module.  */
-#  define symbol_set_declare(set) \
-  extern void *const __start_##set __attribute__ ((__weak__));		\
-  extern void *const __stop_##set __attribute__ ((__weak__));		\
-  weak_extern (__start_##set) weak_extern (__stop_##set)
-
-/* Return a pointer (void *const *) to the first element of SET.  */
-#  define symbol_set_first_element(set)	(&__start_##set)
-
-/* Return true iff PTR (a void *const *) has been incremented
-   past the last element in SET.  */
-#  define symbol_set_end_p(set, ptr)	((ptr) >= &__stop_##set)
-
-# else	/* Not ELF: a.out.  */
-
-#  ifdef HAVE_XCOFF
-/* XCOFF does not support .stabs.
-   The native aix linker will remove the .stab and .stabstr sections
-   The gnu linker will have a fatal error if there is a relocation for
-   symbol in the .stab section.  Silently disable these macros.  */
-#   define text_set_element(set, symbol) 
-#   define data_set_element(set, symbol) 
-#   define bss_set_element(set, symbol)	 
-#  else
-#   define text_set_element(set, symbol)	\
-    asm (".stabs \"" __SYMBOL_PREFIX #set "\",23,0,0," __SYMBOL_PREFIX #symbol)
-#   define data_set_element(set, symbol)	\
-    asm (".stabs \"" __SYMBOL_PREFIX #set "\",25,0,0," __SYMBOL_PREFIX #symbol)
-#   define bss_set_element(set, symbol)	?error Must use initialized data.
-#  endif /* XCOFF */
-#  define symbol_set_define(set)	void *const (set)[1];
-#  define symbol_set_declare(set)	extern void *const (set)[1];
-
-#  define symbol_set_first_element(set)	&(set)[1]
-#  define symbol_set_end_p(set, ptr)	(*(ptr) == 0)
-
-# endif	/* ELF.  */
-#else
-/* We cannot do anything in generial.  */
-# define text_set_element(set, symbol) asm ("")
-# define data_set_element(set, symbol) asm ("")
-# define bss_set_element(set, symbol) asm ("")
-# define symbol_set_define(set)		void *const (set)[1];
-# define symbol_set_declare(set)	extern void *const (set)[1];
-
-# define symbol_set_first_element(set)	&(set)[1]
-# define symbol_set_end_p(set, ptr)	(*(ptr) == 0)
-#endif	/* Have GNU ld.  */
-
-#if DO_VERSIONING
-# define symbol_version(real, name, version) \
-     _symbol_version(real, name, version)
-# define default_symbol_version(real, name, version) \
-     _default_symbol_version(real, name, version)
-# ifdef __ASSEMBLER__
-#  define _symbol_version(real, name, version) \
-     .symver real, name##@##version
-#  define _default_symbol_version(real, name, version) \
-     .symver real, name##@##@##version
-# else
-#  define _symbol_version(real, name, version) \
-     __asm__ (".symver " #real "," #name "@" #version)
-#  define _default_symbol_version(real, name, version) \
-     __asm__ (".symver " #real "," #name "@@" #version)
-# endif
-#else
-# define symbol_version(real, name, version)
-# define default_symbol_version(real, name, version) \
-  strong_alias(real, name)
-#endif
-
-#endif /* libc-symbols.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/linuxthreads.texi b/newlib/libc/sys/linux/linuxthreads/linuxthreads.texi
deleted file mode 100644
index 9513a67..0000000
--- a/newlib/libc/sys/linux/linuxthreads/linuxthreads.texi
+++ /dev/null
@@ -1,1630 +0,0 @@
-@node POSIX Threads
-@c @node POSIX Threads, , Top, Top
-@chapter POSIX Threads
-@c %MENU% The standard threads library
-
-@c This chapter needs more work bigtime. -zw
-
-This chapter describes the pthreads (POSIX threads) library.  This
-library provides support functions for multithreaded programs: thread
-primitives, synchronization objects, and so forth.  It also implements
-POSIX 1003.1b semaphores (not to be confused with System V semaphores).
-
-The threads operations (@samp{pthread_*}) do not use @var{errno}.
-Instead they return an error code directly.  The semaphore operations do
-use @var{errno}.
-
-@menu
-* Basic Thread Operations::     Creating, terminating, and waiting for threads.
-* Thread Attributes::           Tuning thread scheduling.
-* Cancellation::                Stopping a thread before it's done.
-* Cleanup Handlers::            Deallocating resources when a thread is
-                                  canceled.
-* Mutexes::                     One way to synchronize threads.
-* Condition Variables::         Another way.
-* POSIX Semaphores::            And a third way.
-* Thread-Specific Data::        Variables with different values in
-                                  different threads.
-* Threads and Signal Handling:: Why you should avoid mixing the two, and
-                                  how to do it if you must.
-* Threads and Fork::            Interactions between threads and the
-                                  @code{fork} function.
-* Streams and Fork::            Interactions between stdio streams and
-                                  @code{fork}.
-* Miscellaneous Thread Functions:: A grab bag of utility routines.
-@end menu
-
-@node Basic Thread Operations
-@section Basic Thread Operations
-
-These functions are the thread equivalents of @code{fork}, @code{exit},
-and @code{wait}.
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_create (pthread_t * @var{thread}, pthread_attr_t * @var{attr}, void * (*@var{start_routine})(void *), void * @var{arg})
-@code{pthread_create} creates a new thread of control that executes
-concurrently with the calling thread. The new thread calls the
-function @var{start_routine}, passing it @var{arg} as first argument. The
-new thread terminates either explicitly, by calling @code{pthread_exit},
-or implicitly, by returning from the @var{start_routine} function. The
-latter case is equivalent to calling @code{pthread_exit} with the result
-returned by @var{start_routine} as exit code.
-
-The @var{attr} argument specifies thread attributes to be applied to the
-new thread. @xref{Thread Attributes}, for details. The @var{attr}
-argument can also be @code{NULL}, in which case default attributes are
-used: the created thread is joinable (not detached) and has an ordinary
-(not realtime) scheduling policy.
-
-On success, the identifier of the newly created thread is stored in the
-location pointed by the @var{thread} argument, and a 0 is returned. On
-error, a non-zero error code is returned.
-
-This function may return the following errors:
-@table @code
-@item EAGAIN
-Not enough system resources to create a process for the new thread,
-or more than @code{PTHREAD_THREADS_MAX} threads are already active.
-@end table
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun void pthread_exit (void *@var{retval})
-@code{pthread_exit} terminates the execution of the calling thread.  All
-cleanup handlers (@pxref{Cleanup Handlers}) that have been set for the
-calling thread with @code{pthread_cleanup_push} are executed in reverse
-order (the most recently pushed handler is executed first). Finalization
-functions for thread-specific data are then called for all keys that
-have non-@code{NULL} values associated with them in the calling thread
-(@pxref{Thread-Specific Data}).  Finally, execution of the calling
-thread is stopped.
-
-The @var{retval} argument is the return value of the thread. It can be
-retrieved from another thread using @code{pthread_join}.
-
-The @code{pthread_exit} function never returns.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_cancel (pthread_t @var{thread})
-
-@code{pthread_cancel} sends a cancellation request to the thread denoted
-by the @var{thread} argument.  If there is no such thread,
-@code{pthread_cancel} fails and returns @code{ESRCH}.  Otherwise it
-returns 0. @xref{Cancellation}, for details.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_join (pthread_t @var{th}, void **thread_@var{return})
-@code{pthread_join} suspends the execution of the calling thread until
-the thread identified by @var{th} terminates, either by calling
-@code{pthread_exit} or by being canceled.
-
-If @var{thread_return} is not @code{NULL}, the return value of @var{th}
-is stored in the location pointed to by @var{thread_return}.  The return
-value of @var{th} is either the argument it gave to @code{pthread_exit},
-or @code{PTHREAD_CANCELED} if @var{th} was canceled.
-
-The joined thread @code{th} must be in the joinable state: it must not
-have been detached using @code{pthread_detach} or the
-@code{PTHREAD_CREATE_DETACHED} attribute to @code{pthread_create}.
-
-When a joinable thread terminates, its memory resources (thread
-descriptor and stack) are not deallocated until another thread performs
-@code{pthread_join} on it. Therefore, @code{pthread_join} must be called
-once for each joinable thread created to avoid memory leaks.
-
-At most one thread can wait for the termination of a given
-thread. Calling @code{pthread_join} on a thread @var{th} on which
-another thread is already waiting for termination returns an error.
-
-@code{pthread_join} is a cancellation point. If a thread is canceled
-while suspended in @code{pthread_join}, the thread execution resumes
-immediately and the cancellation is executed without waiting for the
-@var{th} thread to terminate. If cancellation occurs during
-@code{pthread_join}, the @var{th} thread remains not joined.
-
-On success, the return value of @var{th} is stored in the location
-pointed to by @var{thread_return}, and 0 is returned. On error, one of
-the following values is returned:
-@table @code
-@item ESRCH
-No thread could be found corresponding to that specified by @var{th}.
-@item EINVAL
-The @var{th} thread has been detached, or another thread is already
-waiting on termination of @var{th}.
-@item EDEADLK
-The @var{th} argument refers to the calling thread.
-@end table
-@end deftypefun
-
-@node Thread Attributes
-@section Thread Attributes
-
-@comment pthread.h
-@comment POSIX
-
-Threads have a number of attributes that may be set at creation time.
-This is done by filling a thread attribute object @var{attr} of type
-@code{pthread_attr_t}, then passing it as second argument to
-@code{pthread_create}. Passing @code{NULL} is equivalent to passing a
-thread attribute object with all attributes set to their default values.
-
-Attribute objects are consulted only when creating a new thread.  The
-same attribute object can be used for creating several threads.
-Modifying an attribute object after a call to @code{pthread_create} does
-not change the attributes of the thread previously created.
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_attr_init (pthread_attr_t *@var{attr})
-@code{pthread_attr_init} initializes the thread attribute object
-@var{attr} and fills it with default values for the attributes. (The
-default values are listed below for each attribute.)
-
-Each attribute @var{attrname} (see below for a list of all attributes)
-can be individually set using the function
-@code{pthread_attr_set@var{attrname}} and retrieved using the function
-@code{pthread_attr_get@var{attrname}}.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_attr_destroy (pthread_attr_t *@var{attr})
-@code{pthread_attr_destroy} destroys the attribute object pointed to by
-@var{attr} releasing any resources associated with it.  @var{attr} is
-left in an undefined state, and you must not use it again in a call to
-any pthreads function until it has been reinitialized.
-@end deftypefun
-
-@findex pthread_attr_setdetachstate
-@findex pthread_attr_setguardsize
-@findex pthread_attr_setinheritsched
-@findex pthread_attr_setschedparam
-@findex pthread_attr_setschedpolicy
-@findex pthread_attr_setscope
-@findex pthread_attr_setstack
-@findex pthread_attr_setstackaddr
-@findex pthread_attr_setstacksize
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_attr_setattr (pthread_attr_t *@var{obj}, int @var{value})
-Set attribute @var{attr} to @var{value} in the attribute object pointed
-to by @var{obj}.  See below for a list of possible attributes and the
-values they can take.
-
-On success, these functions return 0.  If @var{value} is not meaningful
-for the @var{attr} being modified, they will return the error code
-@code{EINVAL}.  Some of the functions have other failure modes; see
-below.
-@end deftypefun
-
-@findex pthread_attr_getdetachstate
-@findex pthread_attr_getguardsize
-@findex pthread_attr_getinheritsched
-@findex pthread_attr_getschedparam
-@findex pthread_attr_getschedpolicy
-@findex pthread_attr_getscope
-@findex pthread_attr_getstack
-@findex pthread_attr_getstackaddr
-@findex pthread_attr_getstacksize
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_attr_getattr (const pthread_attr_t *@var{obj}, int *@var{value})
-Store the current setting of @var{attr} in @var{obj} into the variable
-pointed to by @var{value}.
-
-These functions always return 0.
-@end deftypefun
-
-The following thread attributes are supported:
-@table @samp
-@item detachstate
-Choose whether the thread is created in the joinable state (value
-@code{PTHREAD_CREATE_JOINABLE}) or in the detached state
-(@code{PTHREAD_CREATE_DETACHED}).  The default is
-@code{PTHREAD_CREATE_JOINABLE}.
-
-In the joinable state, another thread can synchronize on the thread
-termination and recover its termination code using @code{pthread_join},
-but some of the thread resources are kept allocated after the thread
-terminates, and reclaimed only when another thread performs
-@code{pthread_join} on that thread.
-
-In the detached state, the thread resources are immediately freed when
-it terminates, but @code{pthread_join} cannot be used to synchronize on
-the thread termination.
-
-A thread created in the joinable state can later be put in the detached
-thread using @code{pthread_detach}.
-
-@item schedpolicy
-Select the scheduling policy for the thread: one of @code{SCHED_OTHER}
-(regular, non-realtime scheduling), @code{SCHED_RR} (realtime,
-round-robin) or @code{SCHED_FIFO} (realtime, first-in first-out).
-The default is @code{SCHED_OTHER}.
-@c Not doc'd in our manual: FIXME.
-@c See @code{sched_setpolicy} for more information on scheduling policies.
-
-The realtime scheduling policies @code{SCHED_RR} and @code{SCHED_FIFO}
-are available only to processes with superuser privileges.
-@code{pthread_attr_setschedparam} will fail and return @code{ENOTSUP} if
-you try to set a realtime policy when you are unprivileged.
-
-The scheduling policy of a thread can be changed after creation with
-@code{pthread_setschedparam}.
-
-@item schedparam
-Change the scheduling parameter (the scheduling priority)
-for the thread.  The default is 0.
-
-This attribute is not significant if the scheduling policy is
-@code{SCHED_OTHER}; it only matters for the realtime policies
-@code{SCHED_RR} and @code{SCHED_FIFO}.
-
-The scheduling priority of a thread can be changed after creation with
-@code{pthread_setschedparam}.
-
-@item inheritsched
-Choose whether the scheduling policy and scheduling parameter for the
-newly created thread are determined by the values of the
-@var{schedpolicy} and @var{schedparam} attributes (value
-@code{PTHREAD_EXPLICIT_SCHED}) or are inherited from the parent thread
-(value @code{PTHREAD_INHERIT_SCHED}).  The default is
-@code{PTHREAD_EXPLICIT_SCHED}.
-
-@item scope
-Choose the scheduling contention scope for the created thread.  The
-default is @code{PTHREAD_SCOPE_SYSTEM}, meaning that the threads contend
-for CPU time with all processes running on the machine. In particular,
-thread priorities are interpreted relative to the priorities of all
-other processes on the machine. The other possibility,
-@code{PTHREAD_SCOPE_PROCESS}, means that scheduling contention occurs
-only between the threads of the running process: thread priorities are
-interpreted relative to the priorities of the other threads of the
-process, regardless of the priorities of other processes.
-
-@code{PTHREAD_SCOPE_PROCESS} is not supported in LinuxThreads.  If you
-try to set the scope to this value, @code{pthread_attr_setscope} will
-fail and return @code{ENOTSUP}.
-
-@item stackaddr
-Provide an address for an application managed stack.  The size of the
-stack must be at least @code{PTHREAD_STACK_MIN}.
-
-@item stacksize
-Change the size of the stack created for the thread.  The value defines
-the minimum stack size, in bytes.
-
-If the value exceeds the system's maximum stack size, or is smaller
-than @code{PTHREAD_STACK_MIN}, @code{pthread_attr_setstacksize} will
-fail and return @code{EINVAL}.
-
-@item stack
-Provide both the address and size of an application managed stack to
-use for the new thread.  The base of the memory area is @var{stackaddr}
-with the size of the memory area, @var{stacksize}, measured in bytes.
-
-If the value of @var{stacksize} is less than @code{PTHREAD_STACK_MIN},
-or greater than the system's maximum stack size, or if the value of
-@var{stackaddr} lacks the proper alignment, @code{pthread_attr_setstack}
-will fail and return @code{EINVAL}.
-
-@item guardsize
-Change the minimum size in bytes of the guard area for the thread's
-stack.  The default size is a single page.  If this value is set, it
-will be rounded up to the nearest page size.  If the value is set to 0,
-a guard area will not be created for this thread.  The space allocated
-for the guard area is used to catch stack overflow.  Therefore, when
-allocating large structures on the stack, a larger guard area may be
-required to catch a stack overflow.
-
-If the caller is managing their own stacks (if the @code{stackaddr}
-attribute has been set), then the @code{guardsize} attribute is ignored.
-
-If the value exceeds the @code{stacksize}, @code{pthread_atrr_setguardsize}
-will fail and return @code{EINVAL}.
-@end table
-
-@node Cancellation
-@section Cancellation
-
-Cancellation is the mechanism by which a thread can terminate the
-execution of another thread. More precisely, a thread can send a
-cancellation request to another thread. Depending on its settings, the
-target thread can then either ignore the request, honor it immediately,
-or defer it till it reaches a cancellation point.  When threads are
-first created by @code{pthread_create}, they always defer cancellation
-requests.
-
-When a thread eventually honors a cancellation request, it behaves as if
-@code{pthread_exit(PTHREAD_CANCELED)} was called.  All cleanup handlers
-are executed in reverse order, finalization functions for
-thread-specific data are called, and finally the thread stops executing.
-If the canceled thread was joinable, the return value
-@code{PTHREAD_CANCELED} is provided to whichever thread calls
-@var{pthread_join} on it. See @code{pthread_exit} for more information.
-
-Cancellation points are the points where the thread checks for pending
-cancellation requests and performs them.  The POSIX threads functions
-@code{pthread_join}, @code{pthread_cond_wait},
-@code{pthread_cond_timedwait}, @code{pthread_testcancel},
-@code{sem_wait}, and @code{sigwait} are cancellation points.  In
-addition, these system calls are cancellation points:
-
-@multitable @columnfractions .33 .33 .33
-@item @t{accept}	@tab @t{open}		@tab @t{sendmsg}
-@item @t{close}		@tab @t{pause}		@tab @t{sendto}
-@item @t{connect}	@tab @t{read}		@tab @t{system}
-@item @t{fcntl}		@tab @t{recv}		@tab @t{tcdrain}
-@item @t{fsync}		@tab @t{recvfrom}	@tab @t{wait}
-@item @t{lseek}		@tab @t{recvmsg}	@tab @t{waitpid}
-@item @t{msync}		@tab @t{send}		@tab @t{write}
-@item @t{nanosleep}
-@end multitable
-
-@noindent
-All library functions that call these functions (such as
-@code{printf}) are also cancellation points.
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_setcancelstate (int @var{state}, int *@var{oldstate})
-@code{pthread_setcancelstate} changes the cancellation state for the
-calling thread -- that is, whether cancellation requests are ignored or
-not. The @var{state} argument is the new cancellation state: either
-@code{PTHREAD_CANCEL_ENABLE} to enable cancellation, or
-@code{PTHREAD_CANCEL_DISABLE} to disable cancellation (cancellation
-requests are ignored).
-
-If @var{oldstate} is not @code{NULL}, the previous cancellation state is
-stored in the location pointed to by @var{oldstate}, and can thus be
-restored later by another call to @code{pthread_setcancelstate}.
-
-If the @var{state} argument is not @code{PTHREAD_CANCEL_ENABLE} or
-@code{PTHREAD_CANCEL_DISABLE}, @code{pthread_setcancelstate} fails and
-returns @code{EINVAL}.  Otherwise it returns 0.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_setcanceltype (int @var{type}, int *@var{oldtype})
-@code{pthread_setcanceltype} changes the type of responses to
-cancellation requests for the calling thread: asynchronous (immediate)
-or deferred.  The @var{type} argument is the new cancellation type:
-either @code{PTHREAD_CANCEL_ASYNCHRONOUS} to cancel the calling thread
-as soon as the cancellation request is received, or
-@code{PTHREAD_CANCEL_DEFERRED} to keep the cancellation request pending
-until the next cancellation point. If @var{oldtype} is not @code{NULL},
-the previous cancellation state is stored in the location pointed to by
-@var{oldtype}, and can thus be restored later by another call to
-@code{pthread_setcanceltype}.
-
-If the @var{type} argument is not @code{PTHREAD_CANCEL_DEFERRED} or
-@code{PTHREAD_CANCEL_ASYNCHRONOUS}, @code{pthread_setcanceltype} fails
-and returns @code{EINVAL}.  Otherwise it returns 0.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun void pthread_testcancel (@var{void})
-@code{pthread_testcancel} does nothing except testing for pending
-cancellation and executing it. Its purpose is to introduce explicit
-checks for cancellation in long sequences of code that do not call
-cancellation point functions otherwise.
-@end deftypefun
-
-@node Cleanup Handlers
-@section Cleanup Handlers
-
-Cleanup handlers are functions that get called when a thread terminates,
-either by calling @code{pthread_exit} or because of
-cancellation. Cleanup handlers are installed and removed following a
-stack-like discipline.
-
-The purpose of cleanup handlers is to free the resources that a thread
-may hold at the time it terminates. In particular, if a thread exits or
-is canceled while it owns a locked mutex, the mutex will remain locked
-forever and prevent other threads from executing normally. The best way
-to avoid this is, just before locking the mutex, to install a cleanup
-handler whose effect is to unlock the mutex. Cleanup handlers can be
-used similarly to free blocks allocated with @code{malloc} or close file
-descriptors on thread termination.
-
-Here is how to lock a mutex @var{mut} in such a way that it will be
-unlocked if the thread is canceled while @var{mut} is locked:
-
-@smallexample
-pthread_cleanup_push(pthread_mutex_unlock, (void *) &mut);
-pthread_mutex_lock(&mut);
-/* do some work */
-pthread_mutex_unlock(&mut);
-pthread_cleanup_pop(0);
-@end smallexample
-
-Equivalently, the last two lines can be replaced by
-
-@smallexample
-pthread_cleanup_pop(1);
-@end smallexample
-
-Notice that the code above is safe only in deferred cancellation mode
-(see @code{pthread_setcanceltype}). In asynchronous cancellation mode, a
-cancellation can occur between @code{pthread_cleanup_push} and
-@code{pthread_mutex_lock}, or between @code{pthread_mutex_unlock} and
-@code{pthread_cleanup_pop}, resulting in both cases in the thread trying
-to unlock a mutex not locked by the current thread. This is the main
-reason why asynchronous cancellation is difficult to use.
-
-If the code above must also work in asynchronous cancellation mode,
-then it must switch to deferred mode for locking and unlocking the
-mutex:
-
-@smallexample
-pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &oldtype);
-pthread_cleanup_push(pthread_mutex_unlock, (void *) &mut);
-pthread_mutex_lock(&mut);
-/* do some work */
-pthread_cleanup_pop(1);
-pthread_setcanceltype(oldtype, NULL);
-@end smallexample
-
-The code above can be rewritten in a more compact and efficient way,
-using the non-portable functions @code{pthread_cleanup_push_defer_np}
-and @code{pthread_cleanup_pop_restore_np}:
-
-@smallexample
-pthread_cleanup_push_defer_np(pthread_mutex_unlock, (void *) &mut);
-pthread_mutex_lock(&mut);
-/* do some work */
-pthread_cleanup_pop_restore_np(1);
-@end smallexample
-
-@comment pthread.h
-@comment POSIX
-@deftypefun void pthread_cleanup_push (void (*@var{routine}) (void *), void *@var{arg})
-
-@code{pthread_cleanup_push} installs the @var{routine} function with
-argument @var{arg} as a cleanup handler. From this point on to the
-matching @code{pthread_cleanup_pop}, the function @var{routine} will be
-called with arguments @var{arg} when the thread terminates, either
-through @code{pthread_exit} or by cancellation. If several cleanup
-handlers are active at that point, they are called in LIFO order: the
-most recently installed handler is called first.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun void pthread_cleanup_pop (int @var{execute})
-@code{pthread_cleanup_pop} removes the most recently installed cleanup
-handler. If the @var{execute} argument is not 0, it also executes the
-handler, by calling the @var{routine} function with arguments
-@var{arg}. If the @var{execute} argument is 0, the handler is only
-removed but not executed.
-@end deftypefun
-
-Matching pairs of @code{pthread_cleanup_push} and
-@code{pthread_cleanup_pop} must occur in the same function, at the same
-level of block nesting.  Actually, @code{pthread_cleanup_push} and
-@code{pthread_cleanup_pop} are macros, and the expansion of
-@code{pthread_cleanup_push} introduces an open brace @code{@{} with the
-matching closing brace @code{@}} being introduced by the expansion of the
-matching @code{pthread_cleanup_pop}.
-
-@comment pthread.h
-@comment GNU
-@deftypefun void pthread_cleanup_push_defer_np (void (*@var{routine}) (void *), void *@var{arg})
-@code{pthread_cleanup_push_defer_np} is a non-portable extension that
-combines @code{pthread_cleanup_push} and @code{pthread_setcanceltype}.
-It pushes a cleanup handler just as @code{pthread_cleanup_push} does,
-but also saves the current cancellation type and sets it to deferred
-cancellation. This ensures that the cleanup mechanism is effective even
-if the thread was initially in asynchronous cancellation mode.
-@end deftypefun
-
-@comment pthread.h
-@comment GNU
-@deftypefun void pthread_cleanup_pop_restore_np (int @var{execute})
-@code{pthread_cleanup_pop_restore_np} pops a cleanup handler introduced
-by @code{pthread_cleanup_push_defer_np}, and restores the cancellation
-type to its value at the time @code{pthread_cleanup_push_defer_np} was
-called.
-@end deftypefun
-
-@code{pthread_cleanup_push_defer_np} and
-@code{pthread_cleanup_pop_restore_np} must occur in matching pairs, at
-the same level of block nesting.
-
-The sequence
-
-@smallexample
-pthread_cleanup_push_defer_np(routine, arg);
-...
-pthread_cleanup_pop_defer_np(execute);
-@end smallexample
-
-@noindent
-is functionally equivalent to (but more compact and efficient than)
-
-@smallexample
-@{
-  int oldtype;
-  pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &oldtype);
-  pthread_cleanup_push(routine, arg);
-  ...
-  pthread_cleanup_pop(execute);
-  pthread_setcanceltype(oldtype, NULL);
-@}
-@end smallexample
-
-
-@node Mutexes
-@section Mutexes
-
-A mutex is a MUTual EXclusion device, and is useful for protecting
-shared data structures from concurrent modifications, and implementing
-critical sections and monitors.
-
-A mutex has two possible states: unlocked (not owned by any thread),
-and locked (owned by one thread). A mutex can never be owned by two
-different threads simultaneously. A thread attempting to lock a mutex
-that is already locked by another thread is suspended until the owning
-thread unlocks the mutex first.
-
-None of the mutex functions is a cancellation point, not even
-@code{pthread_mutex_lock}, in spite of the fact that it can suspend a
-thread for arbitrary durations. This way, the status of mutexes at
-cancellation points is predictable, allowing cancellation handlers to
-unlock precisely those mutexes that need to be unlocked before the
-thread stops executing. Consequently, threads using deferred
-cancellation should never hold a mutex for extended periods of time.
-
-It is not safe to call mutex functions from a signal handler.  In
-particular, calling @code{pthread_mutex_lock} or
-@code{pthread_mutex_unlock} from a signal handler may deadlock the
-calling thread.
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_mutex_init (pthread_mutex_t *@var{mutex}, const pthread_mutexattr_t *@var{mutexattr})
-
-@code{pthread_mutex_init} initializes the mutex object pointed to by
-@var{mutex} according to the mutex attributes specified in @var{mutexattr}.
-If @var{mutexattr} is @code{NULL}, default attributes are used instead.
-
-The LinuxThreads implementation supports only one mutex attribute,
-the @var{mutex type}, which is either ``fast'', ``recursive'', or
-``error checking''. The type of a mutex determines whether
-it can be locked again by a thread that already owns it.
-The default type is ``fast''.
-
-Variables of type @code{pthread_mutex_t} can also be initialized
-statically, using the constants @code{PTHREAD_MUTEX_INITIALIZER} (for
-timed mutexes), @code{PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP} (for
-recursive mutexes), @code{PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP}
-(for fast mutexes(, and @code{PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP}
-(for error checking mutexes).
-
-@code{pthread_mutex_init} always returns 0.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_mutex_lock (pthread_mutex_t *mutex))
-@code{pthread_mutex_lock} locks the given mutex. If the mutex is
-currently unlocked, it becomes locked and owned by the calling thread,
-and @code{pthread_mutex_lock} returns immediately. If the mutex is
-already locked by another thread, @code{pthread_mutex_lock} suspends the
-calling thread until the mutex is unlocked.
-
-If the mutex is already locked by the calling thread, the behavior of
-@code{pthread_mutex_lock} depends on the type of the mutex. If the mutex
-is of the ``fast'' type, the calling thread is suspended.  It will
-remain suspended forever, because no other thread can unlock the mutex.
-If  the mutex is of the ``error checking'' type, @code{pthread_mutex_lock}
-returns immediately with the error code @code{EDEADLK}.  If the mutex is
-of the ``recursive'' type, @code{pthread_mutex_lock} succeeds and
-returns immediately, recording the number of times the calling thread
-has locked the mutex. An equal number of @code{pthread_mutex_unlock}
-operations must be performed before the mutex returns to the unlocked
-state.
-@c This doesn't discuss PTHREAD_MUTEX_TIMED_NP mutex attributes. FIXME
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_mutex_trylock (pthread_mutex_t *@var{mutex})
-@code{pthread_mutex_trylock} behaves identically to
-@code{pthread_mutex_lock}, except that it does not block the calling
-thread if the mutex is already locked by another thread (or by the
-calling thread in the case of a ``fast'' mutex). Instead,
-@code{pthread_mutex_trylock} returns immediately with the error code
-@code{EBUSY}.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_mutex_timedlock (pthread_mutex_t *@var{mutex}, const struct timespec *@var{abstime})
-The @code{pthread_mutex_timedlock} is similar to the
-@code{pthread_mutex_lock} function but instead of blocking for in
-indefinite time if the mutex is locked by another thread, it returns
-when the time specified in @var{abstime} is reached.
-
-This function can only be used on standard (``timed'') and ``error
-checking'' mutexes.  It behaves just like @code{pthread_mutex_lock} for
-all other types.
-
-If the mutex is successfully locked, the function returns zero.  If the
-time specified in @var{abstime} is reached without the mutex being locked,
-@code{ETIMEDOUT} is returned.
-
-This function was introduced in the POSIX.1d revision of the POSIX standard.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_mutex_unlock (pthread_mutex_t *@var{mutex})
-@code{pthread_mutex_unlock} unlocks the given mutex. The mutex is
-assumed to be locked and owned by the calling thread on entrance to
-@code{pthread_mutex_unlock}. If the mutex is of the ``fast'' type,
-@code{pthread_mutex_unlock} always returns it to the unlocked state. If
-it is of the ``recursive'' type, it decrements the locking count of the
-mutex (number of @code{pthread_mutex_lock} operations performed on it by
-the calling thread), and only when this count reaches zero is the mutex
-actually unlocked.
-
-On ``error checking'' mutexes, @code{pthread_mutex_unlock} actually
-checks at run-time that the mutex is locked on entrance, and that it was
-locked by the same thread that is now calling
-@code{pthread_mutex_unlock}.  If these conditions are not met,
-@code{pthread_mutex_unlock} returns @code{EPERM}, and the mutex remains
-unchanged.  ``Fast'' and ``recursive'' mutexes perform no such checks,
-thus allowing a locked mutex to be unlocked by a thread other than its
-owner. This is non-portable behavior and must not be relied upon.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_mutex_destroy (pthread_mutex_t *@var{mutex})
-@code{pthread_mutex_destroy} destroys a mutex object, freeing the
-resources it might hold. The mutex must be unlocked on entrance. In the
-LinuxThreads implementation, no resources are associated with mutex
-objects, thus @code{pthread_mutex_destroy} actually does nothing except
-checking that the mutex is unlocked.
-
-If the mutex is locked by some thread, @code{pthread_mutex_destroy}
-returns @code{EBUSY}.  Otherwise it returns 0.
-@end deftypefun
-
-If any of the above functions (except @code{pthread_mutex_init})
-is applied to an uninitialized mutex, they will simply return
-@code{EINVAL} and do nothing.
-
-A shared global variable @var{x} can be protected by a mutex as follows:
-
-@smallexample
-int x;
-pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
-@end smallexample
-
-All accesses and modifications to @var{x} should be bracketed by calls to
-@code{pthread_mutex_lock} and @code{pthread_mutex_unlock} as follows:
-
-@smallexample
-pthread_mutex_lock(&mut);
-/* operate on x */
-pthread_mutex_unlock(&mut);
-@end smallexample
-
-Mutex attributes can be specified at mutex creation time, by passing a
-mutex attribute object as second argument to @code{pthread_mutex_init}.
-Passing @code{NULL} is equivalent to passing a mutex attribute object
-with all attributes set to their default values.
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_mutexattr_init (pthread_mutexattr_t *@var{attr})
-@code{pthread_mutexattr_init} initializes the mutex attribute object
-@var{attr} and fills it with default values for the attributes.
-
-This function always returns 0.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_mutexattr_destroy (pthread_mutexattr_t *@var{attr})
-@code{pthread_mutexattr_destroy} destroys a mutex attribute object,
-which must not be reused until it is
-reinitialized. @code{pthread_mutexattr_destroy} does nothing in the
-LinuxThreads implementation.
-
-This function always returns 0.
-@end deftypefun
-
-LinuxThreads supports only one mutex attribute: the mutex type, which is
-either @code{PTHREAD_MUTEX_ADAPTIVE_NP} for ``fast'' mutexes,
-@code{PTHREAD_MUTEX_RECURSIVE_NP} for ``recursive'' mutexes,
-@code{PTHREAD_MUTEX_TIMED_NP} for ``timed'' mutexes, or
-@code{PTHREAD_MUTEX_ERRORCHECK_NP} for ``error checking'' mutexes.  As
-the @code{NP} suffix indicates, this is a non-portable extension to the
-POSIX standard and should not be employed in portable programs.
-
-The mutex type determines what happens if a thread attempts to lock a
-mutex it already owns with @code{pthread_mutex_lock}. If the mutex is of
-the ``fast'' type, @code{pthread_mutex_lock} simply suspends the calling
-thread forever.  If the mutex is of the ``error checking'' type,
-@code{pthread_mutex_lock} returns immediately with the error code
-@code{EDEADLK}.  If the mutex is of the ``recursive'' type, the call to
-@code{pthread_mutex_lock} returns immediately with a success return
-code. The number of times the thread owning the mutex has locked it is
-recorded in the mutex. The owning thread must call
-@code{pthread_mutex_unlock} the same number of times before the mutex
-returns to the unlocked state.
-
-The default mutex type is ``timed'', that is, @code{PTHREAD_MUTEX_TIMED_NP}.
-@c This doesn't describe how a ``timed'' mutex behaves. FIXME
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_mutexattr_settype (pthread_mutexattr_t *@var{attr}, int @var{type})
-@code{pthread_mutexattr_settype} sets the mutex type attribute in
-@var{attr} to the value specified by @var{type}.
-
-If @var{type} is not @code{PTHREAD_MUTEX_ADAPTIVE_NP},
-@code{PTHREAD_MUTEX_RECURSIVE_NP}, @code{PTHREAD_MUTEX_TIMED_NP}, or
-@code{PTHREAD_MUTEX_ERRORCHECK_NP}, this function will return
-@code{EINVAL} and leave @var{attr} unchanged.
-
-The standard Unix98 identifiers @code{PTHREAD_MUTEX_DEFAULT},
-@code{PTHREAD_MUTEX_NORMAL}, @code{PTHREAD_MUTEX_RECURSIVE},
-and @code{PTHREAD_MUTEX_ERRORCHECK} are also permitted.
-
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_mutexattr_gettype (const pthread_mutexattr_t *@var{attr}, int *@var{type})
-@code{pthread_mutexattr_gettype} retrieves the current value of the
-mutex type attribute in @var{attr} and stores it in the location pointed
-to by @var{type}.
-
-This function always returns 0.
-@end deftypefun
-
-@node Condition Variables
-@section Condition Variables
-
-A condition (short for ``condition variable'') is a synchronization
-device that allows threads to suspend execution until some predicate on
-shared data is satisfied. The basic operations on conditions are: signal
-the condition (when the predicate becomes true), and wait for the
-condition, suspending the thread execution until another thread signals
-the condition.
-
-A condition variable must always be associated with a mutex, to avoid
-the race condition where a thread prepares to wait on a condition
-variable and another thread signals the condition just before the first
-thread actually waits on it.
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_cond_init (pthread_cond_t *@var{cond}, pthread_condattr_t *cond_@var{attr})
-
-@code{pthread_cond_init} initializes the condition variable @var{cond},
-using the condition attributes specified in @var{cond_attr}, or default
-attributes if @var{cond_attr} is @code{NULL}. The LinuxThreads
-implementation supports no attributes for conditions, hence the
-@var{cond_attr} parameter is actually ignored.
-
-Variables of type @code{pthread_cond_t} can also be initialized
-statically, using the constant @code{PTHREAD_COND_INITIALIZER}.
-
-This function always returns 0.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_cond_signal (pthread_cond_t *@var{cond})
-@code{pthread_cond_signal} restarts one of the threads that are waiting
-on the condition variable @var{cond}. If no threads are waiting on
-@var{cond}, nothing happens. If several threads are waiting on
-@var{cond}, exactly one is restarted, but it is not specified which.
-
-This function always returns 0.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_cond_broadcast (pthread_cond_t *@var{cond})
-@code{pthread_cond_broadcast} restarts all the threads that are waiting
-on the condition variable @var{cond}. Nothing happens if no threads are
-waiting on @var{cond}.
-
-This function always returns 0.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_cond_wait (pthread_cond_t *@var{cond}, pthread_mutex_t *@var{mutex})
-@code{pthread_cond_wait} atomically unlocks the @var{mutex} (as per
-@code{pthread_unlock_mutex}) and waits for the condition variable
-@var{cond} to be signaled. The thread execution is suspended and does
-not consume any CPU time until the condition variable is signaled. The
-@var{mutex} must be locked by the calling thread on entrance to
-@code{pthread_cond_wait}. Before returning to the calling thread,
-@code{pthread_cond_wait} re-acquires @var{mutex} (as per
-@code{pthread_lock_mutex}).
-
-Unlocking the mutex and suspending on the condition variable is done
-atomically. Thus, if all threads always acquire the mutex before
-signaling the condition, this guarantees that the condition cannot be
-signaled (and thus ignored) between the time a thread locks the mutex
-and the time it waits on the condition variable.
-
-This function always returns 0.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_cond_timedwait (pthread_cond_t *@var{cond}, pthread_mutex_t *@var{mutex}, const struct timespec *@var{abstime})
-@code{pthread_cond_timedwait} atomically unlocks @var{mutex} and waits
-on @var{cond}, as @code{pthread_cond_wait} does, but it also bounds the
-duration of the wait. If @var{cond} has not been signaled before time
-@var{abstime}, the mutex @var{mutex} is re-acquired and
-@code{pthread_cond_timedwait} returns the error code @code{ETIMEDOUT}.
-The wait can also be interrupted by a signal; in that case
-@code{pthread_cond_timedwait} returns @code{EINTR}.
-
-The @var{abstime} parameter specifies an absolute time, with the same
-origin as @code{time} and @code{gettimeofday}: an @var{abstime} of 0
-corresponds to 00:00:00 GMT, January 1, 1970.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_cond_destroy (pthread_cond_t *@var{cond})
-@code{pthread_cond_destroy} destroys the condition variable @var{cond},
-freeing the resources it might hold.  If any threads are waiting on the
-condition variable, @code{pthread_cond_destroy} leaves @var{cond}
-untouched and returns @code{EBUSY}.  Otherwise it returns 0, and
-@var{cond} must not be used again until it is reinitialized.
-
-In the LinuxThreads implementation, no resources are associated with
-condition variables, so @code{pthread_cond_destroy} actually does
-nothing.
-@end deftypefun
-
-@code{pthread_cond_wait} and @code{pthread_cond_timedwait} are
-cancellation points. If a thread is canceled while suspended in one of
-these functions, the thread immediately resumes execution, relocks the
-mutex specified by  @var{mutex}, and finally executes the cancellation.
-Consequently, cleanup handlers are assured that @var{mutex} is locked
-when they are called.
-
-It is not safe to call the condition variable functions from a signal
-handler. In particular, calling @code{pthread_cond_signal} or
-@code{pthread_cond_broadcast} from a signal handler may deadlock the
-calling thread.
-
-Consider two shared variables @var{x} and @var{y}, protected by the
-mutex @var{mut}, and a condition variable @var{cond} that is to be
-signaled whenever @var{x} becomes greater than @var{y}.
-
-@smallexample
-int x,y;
-pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
-@end smallexample
-
-Waiting until @var{x} is greater than @var{y} is performed as follows:
-
-@smallexample
-pthread_mutex_lock(&mut);
-while (x <= y) @{
-        pthread_cond_wait(&cond, &mut);
-@}
-/* operate on x and y */
-pthread_mutex_unlock(&mut);
-@end smallexample
-
-Modifications on @var{x} and @var{y} that may cause @var{x} to become greater than
-@var{y} should signal the condition if needed:
-
-@smallexample
-pthread_mutex_lock(&mut);
-/* modify x and y */
-if (x > y) pthread_cond_broadcast(&cond);
-pthread_mutex_unlock(&mut);
-@end smallexample
-
-If it can be proved that at most one waiting thread needs to be waken
-up (for instance, if there are only two threads communicating through
-@var{x} and @var{y}), @code{pthread_cond_signal} can be used as a slightly more
-efficient alternative to @code{pthread_cond_broadcast}. In doubt, use
-@code{pthread_cond_broadcast}.
-
-To wait for @var{x} to becomes greater than @var{y} with a timeout of 5
-seconds, do:
-
-@smallexample
-struct timeval now;
-struct timespec timeout;
-int retcode;
-
-pthread_mutex_lock(&mut);
-gettimeofday(&now);
-timeout.tv_sec = now.tv_sec + 5;
-timeout.tv_nsec = now.tv_usec * 1000;
-retcode = 0;
-while (x <= y && retcode != ETIMEDOUT) @{
-        retcode = pthread_cond_timedwait(&cond, &mut, &timeout);
-@}
-if (retcode == ETIMEDOUT) @{
-        /* timeout occurred */
-@} else @{
-        /* operate on x and y */
-@}
-pthread_mutex_unlock(&mut);
-@end smallexample
-
-Condition attributes can be specified at condition creation time, by
-passing a condition attribute object as second argument to
-@code{pthread_cond_init}.  Passing @code{NULL} is equivalent to passing
-a condition attribute object with all attributes set to their default
-values.
-
-The LinuxThreads implementation supports no attributes for
-conditions. The functions on condition attributes are included only for
-compliance with the POSIX standard.
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_condattr_init (pthread_condattr_t *@var{attr})
-@deftypefunx int pthread_condattr_destroy (pthread_condattr_t *@var{attr})
-@code{pthread_condattr_init} initializes the condition attribute object
-@var{attr} and fills it with default values for the attributes.
-@code{pthread_condattr_destroy} destroys the condition attribute object
-@var{attr}.
-
-Both functions do nothing in the LinuxThreads implementation.
-
-@code{pthread_condattr_init} and @code{pthread_condattr_destroy} always
-return 0.
-@end deftypefun
-
-@node POSIX Semaphores
-@section POSIX Semaphores
-
-@vindex SEM_VALUE_MAX
-Semaphores are counters for resources shared between threads. The
-basic operations on semaphores are: increment the counter atomically,
-and wait until the counter is non-null and decrement it atomically.
-
-Semaphores have a maximum value past which they cannot be incremented.
-The macro @code{SEM_VALUE_MAX} is defined to be this maximum value.  In
-the GNU C library, @code{SEM_VALUE_MAX} is equal to @code{INT_MAX}
-(@pxref{Range of Type}), but it may be much smaller on other systems.
-
-The pthreads library implements POSIX 1003.1b semaphores.  These should
-not be confused with System V semaphores (@code{ipc}, @code{semctl} and
-@code{semop}).
-@c !!! SysV IPC is not doc'd at all in our manual
-
-All the semaphore functions and macros are defined in @file{semaphore.h}.
-
-@comment semaphore.h
-@comment POSIX
-@deftypefun int sem_init (sem_t *@var{sem}, int @var{pshared}, unsigned int @var{value})
-@code{sem_init} initializes the semaphore object pointed to by
-@var{sem}. The count associated with the semaphore is set initially to
-@var{value}. The @var{pshared} argument indicates whether the semaphore
-is local to the current process (@var{pshared} is zero) or is to be
-shared between several processes (@var{pshared} is not zero).
-
-On success @code{sem_init} returns 0.  On failure it returns -1 and sets
-@var{errno} to one of the following values:
-
-@table @code
-@item EINVAL
-@var{value} exceeds the maximal counter value @code{SEM_VALUE_MAX}
-
-@item ENOSYS
-@var{pshared} is not zero.  LinuxThreads currently does not support
-process-shared semaphores.  (This will eventually change.)
-@end table
-@end deftypefun
-
-@comment semaphore.h
-@comment POSIX
-@deftypefun int sem_destroy (sem_t * @var{sem})
-@code{sem_destroy} destroys a semaphore object, freeing the resources it
-might hold.  If any threads are waiting on the semaphore when
-@code{sem_destroy} is called, it fails and sets @var{errno} to
-@code{EBUSY}.
-
-In the LinuxThreads implementation, no resources are associated with
-semaphore objects, thus @code{sem_destroy} actually does nothing except
-checking that no thread is waiting on the semaphore.  This will change
-when process-shared semaphores are implemented.
-@end deftypefun
-
-@comment semaphore.h
-@comment POSIX
-@deftypefun int sem_wait (sem_t * @var{sem})
-@code{sem_wait} suspends the calling thread until the semaphore pointed
-to by @var{sem} has non-zero count. It then atomically decreases the
-semaphore count.
-
-@code{sem_wait} is a cancellation point.  It always returns 0.
-@end deftypefun
-
-@comment semaphore.h
-@comment POSIX
-@deftypefun int sem_trywait (sem_t * @var{sem})
-@code{sem_trywait} is a non-blocking variant of @code{sem_wait}. If the
-semaphore pointed to by @var{sem} has non-zero count, the count is
-atomically decreased and @code{sem_trywait} immediately returns 0.  If
-the semaphore count is zero, @code{sem_trywait} immediately returns -1
-and sets errno to @code{EAGAIN}.
-@end deftypefun
-
-@comment semaphore.h
-@comment POSIX
-@deftypefun int sem_post (sem_t * @var{sem})
-@code{sem_post} atomically increases the count of the semaphore pointed to
-by @var{sem}. This function never blocks.
-
-@c !!! This para appears not to agree with the code.
-On processors supporting atomic compare-and-swap (Intel 486, Pentium and
-later, Alpha, PowerPC, MIPS II, Motorola 68k, Ultrasparc), the
-@code{sem_post} function is can safely be called from signal handlers.
-This is the only thread synchronization function provided by POSIX
-threads that is async-signal safe.  On the Intel 386 and earlier Sparc
-chips, the current LinuxThreads implementation of @code{sem_post} is not
-async-signal safe, because the hardware does not support the required
-atomic operations.
-
-@code{sem_post} always succeeds and returns 0, unless the semaphore
-count would exceed @code{SEM_VALUE_MAX} after being incremented.  In
-that case @code{sem_post} returns -1 and sets @var{errno} to
-@code{EINVAL}.  The semaphore count is left unchanged.
-@end deftypefun
-
-@comment semaphore.h
-@comment POSIX
-@deftypefun int sem_getvalue (sem_t * @var{sem}, int * @var{sval})
-@code{sem_getvalue} stores in the location pointed to by @var{sval} the
-current count of the semaphore @var{sem}.  It always returns 0.
-@end deftypefun
-
-@node Thread-Specific Data
-@section Thread-Specific Data
-
-Programs often need global or static variables that have different
-values in different threads. Since threads share one memory space, this
-cannot be achieved with regular variables. Thread-specific data is the
-POSIX threads answer to this need.
-
-Each thread possesses a private memory block, the thread-specific data
-area, or TSD area for short. This area is indexed by TSD keys. The TSD
-area associates values of type @code{void *} to TSD keys. TSD keys are
-common to all threads, but the value associated with a given TSD key can
-be different in each thread.
-
-For concreteness, the TSD areas can be viewed as arrays of @code{void *}
-pointers, TSD keys as integer indices into these arrays, and the value
-of a TSD key as the value of the corresponding array element in the
-calling thread.
-
-When a thread is created, its TSD area initially associates @code{NULL}
-with all keys.
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_key_create (pthread_key_t *@var{key}, void (*destr_function) (void *))
-@code{pthread_key_create} allocates a new TSD key. The key is stored in
-the location pointed to by @var{key}. There is a limit of
-@code{PTHREAD_KEYS_MAX} on the number of keys allocated at a given
-time. The value initially associated with the returned key is
-@code{NULL} in all currently executing threads.
-
-The @var{destr_function} argument, if not @code{NULL}, specifies a
-destructor function associated with the key. When a thread terminates
-via @code{pthread_exit} or by cancellation, @var{destr_function} is
-called on the value associated with the key in that thread. The
-@var{destr_function} is not called if a key is deleted with
-@code{pthread_key_delete} or a value is changed with
-@code{pthread_setspecific}.  The order in which destructor functions are
-called at thread termination time is unspecified.
-
-Before the destructor function is called, the @code{NULL} value is
-associated with the key in the current thread.  A destructor function
-might, however, re-associate non-@code{NULL} values to that key or some
-other key.  To deal with this, if after all the destructors have been
-called for all non-@code{NULL} values, there are still some
-non-@code{NULL} values with associated destructors, then the process is
-repeated.  The LinuxThreads implementation stops the process after
-@code{PTHREAD_DESTRUCTOR_ITERATIONS} iterations, even if some
-non-@code{NULL} values with associated descriptors remain.  Other
-implementations may loop indefinitely.
-
-@code{pthread_key_create} returns 0 unless @code{PTHREAD_KEYS_MAX} keys
-have already been allocated, in which case it fails and returns
-@code{EAGAIN}.
-@end deftypefun
-
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_key_delete (pthread_key_t @var{key})
-@code{pthread_key_delete} deallocates a TSD key. It does not check
-whether non-@code{NULL} values are associated with that key in the
-currently executing threads, nor call the destructor function associated
-with the key.
-
-If there is no such key @var{key}, it returns @code{EINVAL}.  Otherwise
-it returns 0.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_setspecific (pthread_key_t @var{key}, const void *@var{pointer})
-@code{pthread_setspecific} changes the value associated with @var{key}
-in the calling thread, storing the given @var{pointer} instead.
-
-If there is no such key @var{key}, it returns @code{EINVAL}.  Otherwise
-it returns 0.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun {void *} pthread_getspecific (pthread_key_t @var{key})
-@code{pthread_getspecific} returns the value currently associated with
-@var{key} in the calling thread.
-
-If there is no such key @var{key}, it returns @code{NULL}.
-@end deftypefun
-
-The following code fragment allocates a thread-specific array of 100
-characters, with automatic reclaimation at thread exit:
-
-@smallexample
-/* Key for the thread-specific buffer */
-static pthread_key_t buffer_key;
-
-/* Once-only initialisation of the key */
-static pthread_once_t buffer_key_once = PTHREAD_ONCE_INIT;
-
-/* Allocate the thread-specific buffer */
-void buffer_alloc(void)
-@{
-  pthread_once(&buffer_key_once, buffer_key_alloc);
-  pthread_setspecific(buffer_key, malloc(100));
-@}
-
-/* Return the thread-specific buffer */
-char * get_buffer(void)
-@{
-  return (char *) pthread_getspecific(buffer_key);
-@}
-
-/* Allocate the key */
-static void buffer_key_alloc()
-@{
-  pthread_key_create(&buffer_key, buffer_destroy);
-@}
-
-/* Free the thread-specific buffer */
-static void buffer_destroy(void * buf)
-@{
-  free(buf);
-@}
-@end smallexample
-
-@node Threads and Signal Handling
-@section Threads and Signal Handling
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_sigmask (int @var{how}, const sigset_t *@var{newmask}, sigset_t *@var{oldmask})
-@code{pthread_sigmask} changes the signal mask for the calling thread as
-described by the @var{how} and @var{newmask} arguments. If @var{oldmask}
-is not @code{NULL}, the previous signal mask is stored in the location
-pointed to by @var{oldmask}.
-
-The meaning of the @var{how} and @var{newmask} arguments is the same as
-for @code{sigprocmask}. If @var{how} is @code{SIG_SETMASK}, the signal
-mask is set to @var{newmask}. If @var{how} is @code{SIG_BLOCK}, the
-signals specified to @var{newmask} are added to the current signal mask.
-If @var{how} is @code{SIG_UNBLOCK}, the signals specified to
-@var{newmask} are removed from the current signal mask.
-
-Recall that signal masks are set on a per-thread basis, but signal
-actions and signal handlers, as set with @code{sigaction}, are shared
-between all threads.
-
-The @code{pthread_sigmask} function returns 0 on success, and one of the
-following error codes on error:
-@table @code
-@item EINVAL
-@var{how} is not one of @code{SIG_SETMASK}, @code{SIG_BLOCK}, or @code{SIG_UNBLOCK}
-
-@item EFAULT
-@var{newmask} or @var{oldmask} point to invalid addresses
-@end table
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_kill (pthread_t @var{thread}, int @var{signo})
-@code{pthread_kill} sends signal number @var{signo} to the thread
-@var{thread}.  The signal is delivered and handled as described in
-@ref{Signal Handling}.
-
-@code{pthread_kill} returns 0 on success, one of the following error codes
-on error:
-@table @code
-@item EINVAL
-@var{signo} is not a valid signal number
-
-@item ESRCH
-The thread @var{thread} does not exist (e.g. it has already terminated)
-@end table
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int sigwait (const sigset_t *@var{set}, int *@var{sig})
-@code{sigwait} suspends the calling thread until one of the signals in
-@var{set} is delivered to the calling thread. It then stores the number
-of the signal received in the location pointed to by @var{sig} and
-returns. The signals in @var{set} must be blocked and not ignored on
-entrance to @code{sigwait}. If the delivered signal has a signal handler
-function attached, that function is @emph{not} called.
-
-@code{sigwait} is a cancellation point.  It always returns 0.
-@end deftypefun
-
-For @code{sigwait} to work reliably, the signals being waited for must be
-blocked in all threads, not only in the calling thread, since
-otherwise the POSIX semantics for signal delivery do not guarantee
-that it's the thread doing the @code{sigwait} that will receive the signal.
-The best way to achieve this is block those signals before any threads
-are created, and never unblock them in the program other than by
-calling @code{sigwait}.
-
-Signal handling in LinuxThreads departs significantly from the POSIX
-standard. According to the standard, ``asynchronous'' (external) signals
-are addressed to the whole process (the collection of all threads),
-which then delivers them to one particular thread. The thread that
-actually receives the signal is any thread that does not currently block
-the signal.
-
-In LinuxThreads, each thread is actually a kernel process with its own
-PID, so external signals are always directed to one particular thread.
-If, for instance, another thread is blocked in @code{sigwait} on that
-signal, it will not be restarted.
-
-The LinuxThreads implementation of @code{sigwait} installs dummy signal
-handlers for the signals in @var{set} for the duration of the
-wait. Since signal handlers are shared between all threads, other
-threads must not attach their own signal handlers to these signals, or
-alternatively they should all block these signals (which is recommended
-anyway).
-
-@node Threads and Fork
-@section Threads and Fork
-
-It's not intuitively obvious what should happen when a multi-threaded POSIX
-process calls @code{fork}. Not only are the semantics tricky, but you may
-need to write code that does the right thing at fork time even if that code
-doesn't use the @code{fork} function. Moreover, you need to be aware of
-interaction between @code{fork} and some library features like
-@code{pthread_once} and stdio streams.
-
-When @code{fork} is called by one of the threads of a process, it creates a new
-process which is copy of the  calling process. Effectively, in addition to
-copying certain system objects, the function takes a snapshot of the memory
-areas of the parent process, and creates identical areas in the child.
-To make matters more complicated, with threads it's possible for two or more
-threads to concurrently call fork to create two or more child processes.
-
-The child process has a copy of the address space of the parent, but it does
-not inherit any of its threads. Execution of the child process is carried out
-by a new thread which returns from @code{fork} function with a return value of
-zero; it is the only thread in the child process.  Because threads are not
-inherited across fork, issues arise. At the time of the call to @code{fork},
-threads in the parent process other than the one calling @code{fork} may have
-been executing critical regions of code.  As a result, the child process may
-get a copy of objects that are not in a well-defined state.  This potential
-problem affects all components of the program.
-
-Any program component which will continue being used in a child process must
-correctly handle its state during @code{fork}. For this purpose, the POSIX
-interface provides the special function @code{pthread_atfork} for installing
-pointers to handler functions which are called from within @code{fork}.
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_atfork (void (*@var{prepare})(void), void (*@var{parent})(void), void (*@var{child})(void))
-
-@code{pthread_atfork} registers handler functions to be called just
-before and just after a new process is created with @code{fork}. The
-@var{prepare} handler will be called from the parent process, just
-before the new process is created. The @var{parent} handler will be
-called from the parent process, just before @code{fork} returns. The
-@var{child} handler will be called from the child process, just before
-@code{fork} returns.
-
-@code{pthread_atfork} returns 0 on success and a non-zero error code on
-error.
-
-One or more of the three handlers @var{prepare}, @var{parent} and
-@var{child} can be given as @code{NULL}, meaning that no handler needs
-to be called at the corresponding point.
-
-@code{pthread_atfork} can be called several times to install several
-sets of handlers. At @code{fork} time, the @var{prepare} handlers are
-called in LIFO order (last added with @code{pthread_atfork}, first
-called before @code{fork}), while the @var{parent} and @var{child}
-handlers are called in FIFO order (first added, first called).
-
-If there is insufficient memory available to register the handlers,
-@code{pthread_atfork} fails and returns @code{ENOMEM}.  Otherwise it
-returns 0.
-
-The functions @code{fork} and @code{pthread_atfork} must not be regarded as
-reentrant from the context of the handlers.  That is to say, if a
-@code{pthread_atfork} handler invoked from within @code{fork} calls
-@code{pthread_atfork} or @code{fork}, the behavior is undefined.
-
-Registering a triplet of handlers is an atomic operation with respect to fork.
-If new handlers are registered at about the same time as a fork occurs, either
-all three handlers will be called, or none of them will be called.
-
-The handlers are inherited by the child process, and there is no
-way to remove them, short of using @code{exec} to load a new
-pocess image.
-
-@end deftypefun
-
-To understand the purpose of @code{pthread_atfork}, recall that
-@code{fork} duplicates the whole memory space, including mutexes in
-their current locking state, but only the calling thread: other threads
-are not running in the child process. Thus, if a mutex is locked by a
-thread other than the thread calling @code{fork}, that mutex will remain
-locked forever in the child process, possibly blocking the execution of
-the child process. Or if some shared data, such as a linked list, was in the
-middle of being updated by a thread in the parent process, the child
-will get a copy of the incompletely updated data which it cannot use.
-
-To avoid this, install handlers with @code{pthread_atfork} as follows: have the
-@var{prepare} handler lock the mutexes (in locking order), and the
-@var{parent} handler unlock the mutexes. The @var{child} handler should reset
-the mutexes using @code{pthread_mutex_init}, as well as any other
-synchronization objects such as condition variables.
-
-Locking the global mutexes before the fork ensures that all other threads are
-locked out of the critical regions of code protected by those mutexes.  Thus
-when @code{fork} takes a snapshot of the parent's address space, that snapshot
-will copy valid, stable data.  Resetting the synchronization objects in the
-child process will ensure they are properly cleansed of any artifacts from the
-threading subsystem of the parent process. For example, a mutex may inherit
-a wait queue of threads waiting for the lock; this wait queue makes no sense
-in the child process. Initializing the mutex takes care of this.
-
-@node Streams and Fork
-@section Streams and Fork
-
-The GNU standard I/O library has an internal mutex which guards the internal
-linked list of all standard C FILE objects. This mutex is properly taken care
-of during @code{fork} so that the child receives an intact copy of the list.
-This allows the @code{fopen} function, and related stream-creating functions,
-to work correctly in the child process, since these functions need to insert
-into the list.
-
-However, the individual stream locks are not completely taken care of.  Thus
-unless the multithreaded application takes special precautions in its use of
-@code{fork}, the child process might not be able to safely use the streams that
-it inherited from the parent.   In general, for any given open stream in the
-parent that is to be used by the child process, the application must ensure
-that that stream is not in use by another thread when @code{fork} is called.
-Otherwise an inconsistent copy of the stream object be produced. An easy way to
-ensure this is to use @code{flockfile} to lock the stream prior to calling
-@code{fork} and then unlock it with @code{funlockfile} inside the parent
-process, provided that the parent's threads properly honor these locks.
-Nothing special needs to be done in the child process, since the library
-internally resets all stream locks.
-
-Note that the stream locks are not shared between the parent and child.
-For example, even if you ensure that, say, the stream @code{stdout} is properly
-treated and can be safely used in the child, the stream locks do not provide
-an exclusion mechanism between the parent and child. If both processes write
-to @code{stdout}, strangely interleaved output may result regardless of
-the explicit use of @code{flockfile} or implicit locks.
-
-Also note that these provisions are a GNU extension; other systems might not
-provide any way for streams to be used in the child of a multithreaded process.
-POSIX requires that such a child process confines itself to calling only
-asynchronous safe functions, which excludes much of the library, including
-standard I/O.
-
-@node Miscellaneous Thread Functions
-@section Miscellaneous Thread Functions
-
-@comment pthread.h
-@comment POSIX
-@deftypefun {pthread_t} pthread_self (@var{void})
-@code{pthread_self} returns the thread identifier for the calling thread.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_equal (pthread_t thread1, pthread_t thread2)
-@code{pthread_equal} determines if two thread identifiers refer to the same
-thread.
-
-A non-zero value is returned if @var{thread1} and @var{thread2} refer to
-the same thread. Otherwise, 0 is returned.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_detach (pthread_t @var{th})
-@code{pthread_detach} puts the thread @var{th} in the detached
-state. This guarantees that the memory resources consumed by @var{th}
-will be freed immediately when @var{th} terminates. However, this
-prevents other threads from synchronizing on the termination of @var{th}
-using @code{pthread_join}.
-
-A thread can be created initially in the detached state, using the
-@code{detachstate} attribute to @code{pthread_create}. In contrast,
-@code{pthread_detach} applies to threads created in the joinable state,
-and which need to be put in the detached state later.
-
-After @code{pthread_detach} completes, subsequent attempts to perform
-@code{pthread_join} on @var{th} will fail. If another thread is already
-joining the thread @var{th} at the time @code{pthread_detach} is called,
-@code{pthread_detach} does nothing and leaves @var{th} in the joinable
-state.
-
-On success, 0 is returned. On error, one of the following codes is
-returned:
-@table @code
-@item ESRCH
-No thread could be found corresponding to that specified by @var{th}
-@item EINVAL
-The thread @var{th} is already in the detached state
-@end table
-@end deftypefun
-
-@comment pthread.h
-@comment GNU
-@deftypefun void pthread_kill_other_threads_np (@var{void})
-@code{pthread_kill_other_threads_np} is a non-portable LinuxThreads extension.
-It causes all threads in the program to terminate immediately, except
-the calling thread which proceeds normally. It is intended to be
-called just before a thread calls one of the @code{exec} functions,
-e.g. @code{execve}.
-
-Termination of the other threads is not performed through
-@code{pthread_cancel} and completely bypasses the cancellation
-mechanism. Hence, the current settings for cancellation state and
-cancellation type are ignored, and the cleanup handlers are not
-executed in the terminated threads.
-
-According to POSIX 1003.1c, a successful @code{exec*} in one of the
-threads should automatically terminate all other threads in the program.
-This behavior is not yet implemented in LinuxThreads.  Calling
-@code{pthread_kill_other_threads_np} before @code{exec*} achieves much
-of the same behavior, except that if @code{exec*} ultimately fails, then
-all other threads are already killed.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_once (pthread_once_t *once_@var{control}, void (*@var{init_routine}) (void))
-
-The purpose of @code{pthread_once} is to ensure that a piece of
-initialization code is executed at most once. The @var{once_control}
-argument points to a static or extern variable statically initialized
-to @code{PTHREAD_ONCE_INIT}.
-
-The first time @code{pthread_once} is called with a given
-@var{once_control} argument, it calls @var{init_routine} with no
-argument and changes the value of the @var{once_control} variable to
-record that initialization has been performed. Subsequent calls to
-@code{pthread_once} with the same @code{once_control} argument do
-nothing.
-
-If a thread is cancelled while executing @var{init_routine}
-the state of the @var{once_control} variable is reset so that
-a future call to @code{pthread_once} will call the routine again.
-
-If the process forks while one or more threads are executing
-@code{pthread_once} initialization routines, the states of their respective
-@var{once_control} variables will appear to be reset in the child process so
-that if the child calls @code{pthread_once}, the routines will be executed.
-
-@code{pthread_once} always returns 0.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_setschedparam (pthread_t target_@var{thread}, int @var{policy}, const struct sched_param *@var{param})
-
-@code{pthread_setschedparam} sets the scheduling parameters for the
-thread @var{target_thread} as indicated by @var{policy} and
-@var{param}. @var{policy} can be either @code{SCHED_OTHER} (regular,
-non-realtime scheduling), @code{SCHED_RR} (realtime, round-robin) or
-@code{SCHED_FIFO} (realtime, first-in first-out). @var{param} specifies
-the scheduling priority for the two realtime policies.  See
-@code{sched_setpolicy} for more information on scheduling policies.
-
-The realtime scheduling policies @code{SCHED_RR} and @code{SCHED_FIFO}
-are available only to processes with superuser privileges.
-
-On success, @code{pthread_setschedparam} returns 0.  On error it returns
-one of the following codes:
-@table @code
-@item EINVAL
-@var{policy} is not one of @code{SCHED_OTHER}, @code{SCHED_RR},
-@code{SCHED_FIFO}, or the priority value specified by @var{param} is not
-valid for the specified policy
-
-@item EPERM
-Realtime scheduling was requested but the calling process does not have
-sufficient privileges.
-
-@item ESRCH
-The @var{target_thread} is invalid or has already terminated
-
-@item EFAULT
-@var{param} points outside the process memory space
-@end table
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_getschedparam (pthread_t target_@var{thread}, int *@var{policy}, struct sched_param *@var{param})
-
-@code{pthread_getschedparam} retrieves the scheduling policy and
-scheduling parameters for the thread @var{target_thread} and stores them
-in the locations pointed to by @var{policy} and @var{param},
-respectively.
-
-@code{pthread_getschedparam} returns 0 on success, or one of the
-following error codes on failure:
-@table @code
-@item ESRCH
-The @var{target_thread} is invalid or has already terminated.
-
-@item EFAULT
-@var{policy} or @var{param} point outside the process memory space.
-
-@end table
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_setconcurrency (int @var{level})
-@code{pthread_setconcurrency} is unused in LinuxThreads due to the lack
-of a mapping of user threads to kernel threads.  It exists for source
-compatibility.  It does store the value @var{level} so that it can be
-returned by a subsequent call to @code{pthread_getconcurrency}.  It takes
-no other action however.
-@end deftypefun
-
-@comment pthread.h
-@comment POSIX
-@deftypefun int pthread_getconcurrency ()
-@code{pthread_getconcurrency} is unused in LinuxThreads due to the lack
-of a mapping of user threads to kernel threads.  It exists for source
-compatibility.  However, it will return the value that was set by the
-last call to @code{pthread_setconcurrency}.
-@end deftypefun
-
diff --git a/newlib/libc/sys/linux/linuxthreads/lockfile.c b/newlib/libc/sys/linux/linuxthreads/lockfile.c
deleted file mode 100644
index 0aeb150..0000000
--- a/newlib/libc/sys/linux/linuxthreads/lockfile.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* lockfile - Handle locking and unlocking of stream.
-   Copyright (C) 1996, 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <sys/lock.h>
-#include <stdio.h>
-#include <pthread.h>
-#include "internals.h"
-
-#ifdef USE_IN_LIBIO
-#include "../libio/libioP.h"
-#endif
-
-#ifndef SHARED
-/* We need a hook to force this file to be linked in when static
-   libpthread is used.  */
-const int __pthread_provide_lockfile = 0;
-#endif
-
-void
-__flockfile (FILE *stream)
-{
-  __lock_acquire_recursive (*(_LOCK_RECURSIVE_T *)&stream->_lock);
-}
-#undef _IO_flockfile
-strong_alias (__flockfile, _IO_flockfile)
-weak_alias (__flockfile, flockfile);
-
-
-void
-__funlockfile (FILE *stream)
-{
-  __lock_release_recursive (*(_LOCK_RECURSIVE_T *)&stream->_lock);
-}
-#undef _IO_funlockfile
-strong_alias (__funlockfile, _IO_funlockfile)
-weak_alias (__funlockfile, funlockfile);
-
-
-int
-__ftrylockfile (FILE *stream)
-{
-  return __lock_try_acquire_recursive (*(_LOCK_RECURSIVE_T *)&stream->_lock);
-}
-strong_alias (__ftrylockfile, _IO_ftrylockfile)
-weak_alias (__ftrylockfile, ftrylockfile);
-
-void
-__flockfilelist(void)
-{
-#ifdef USE_IN_LIBIO
-  _IO_list_lock();
-#endif
-}
-
-void
-__funlockfilelist(void)
-{
-#ifdef USE_IN_LIBIO
-  _IO_list_unlock();
-#endif
-}
-
-void
-__fresetlockfiles (void)
-{
-#ifdef USE_IN_LIBIO
-  _IO_ITER i;
-
-  pthread_mutexattr_t attr;
-
-  __pthread_mutexattr_init (&attr);
-  __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-
-  for (i = _IO_iter_begin(); i != _IO_iter_end(); i = _IO_iter_next(i))
-    __pthread_mutex_init (_IO_iter_file(i)->_lock, &attr);
-
-  __pthread_mutexattr_destroy (&attr);
-
-  _IO_list_resetlock();
-#endif
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/Makefile.am b/newlib/libc/sys/linux/linuxthreads/machine/Makefile.am
deleted file mode 100644
index 27c348c..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-SUBDIRS = $(machine_dir) .
-
-doc:
-
-ACLOCAL_AMFLAGS = -I ../../../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/Makefile.in b/newlib/libc/sys/linux/linuxthreads/machine/Makefile.in
deleted file mode 100644
index c0b669d..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/Makefile.in
+++ /dev/null
@@ -1,356 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-SUBDIRS = $(machine_dir) .
-
-ACLOCAL_AMFLAGS = -I ../../../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../../../acinclude.m4 ../../../../../aclocal.m4 \
-		../../../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am:
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-info-am: 
-install-info: install-info-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs-am installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
-
-
-doc:
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4 b/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4
deleted file mode 100644
index 35519ac..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4
+++ /dev/null
@@ -1,1226 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  ])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)])
-
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/configure b/newlib/libc/sys/linux/linuxthreads/machine/configure
deleted file mode 100755
index 32cb952..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/configure
+++ /dev/null
@@ -1,3425 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=yes]"
-ac_help="$ac_help
-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=i386
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../../../.. $srcdir/../../../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../../../.. $srcdir/../../../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:590: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:643: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:700: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:733: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 738 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:766: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 771 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:948: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:969: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:987: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1030: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1043: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1056: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1069: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1082: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1186: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1210: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1337: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1382: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-if test "${use_libtool}" = "yes"; then
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_shared=yes
-fi
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_static=yes
-fi
-
-# Check whether --enable-fast-install or --disable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_fast_install=yes
-fi
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1658: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1688: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1739: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1782 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1818: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1846: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1889: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1919: checking for GNU ld" >&5
-else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1922: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1957: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi
-fi
-
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1974: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1986: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-
-NM="$lt_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2024: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2045: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2218: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2248: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2310: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2381: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2413: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2448: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2480: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-libtool_flags="$libtool_flags --enable-win32-dll"
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-  :
-fi
-
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 2547 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2585: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2598 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
-fi
-rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-fi
-
-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2635: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_DLLTOOL"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2667: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  DLLTOOL="false"
-fi
-fi
-
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2702: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2734: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AS="false"
-fi
-fi
-
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2769: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_OBJDUMP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2801: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="objdump"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  OBJDUMP="false"
-fi
-fi
-
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2837: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2871: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2876 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  
-esac
-
-
-# Save cache, so that ltconfig can load it
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
-# Reload cache, that may have been modified by ltconfig
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-
-  
-
-  
-	 
-	 
-fi
-
-if test -n "${machine_dir}"; then
-  subdirs="${machine_dir}"
-
-fi
-
-
-
-if test x${machine_dir} != x; then
-  HAVE_MACHINE_DIR_TRUE=
-  HAVE_MACHINE_DIR_FALSE='#'
-else
-  HAVE_MACHINE_DIR_TRUE='#'
-  HAVE_MACHINE_DIR_FALSE=
-fi
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@OBJDUMP@%$OBJDUMP%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@subdirs@%$subdirs%g
-s%@HAVE_MACHINE_DIR_TRUE@%$HAVE_MACHINE_DIR_TRUE%g
-s%@HAVE_MACHINE_DIR_FALSE@%$HAVE_MACHINE_DIR_FALSE%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  for ac_arg in $ac_configure_args; do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case "$ac_arg" in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  for ac_config_dir in ${machine_dir}; do
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    if test ! -d $srcdir/$ac_config_dir; then
-      continue
-    fi
-
-    echo configuring in $ac_config_dir
-
-    case "$srcdir" in
-    .) ;;
-    *)
-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
-      else
-        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
-      fi
-      ;;
-    esac
-
-    ac_popdir=`pwd`
-    cd $ac_config_dir
-
-      # A "../" for each directory in /$ac_config_dir.
-      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
-
-    case "$srcdir" in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir ;;
-    /*) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
-    *) # Relative path.
-      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
-    esac
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure=$ac_sub_srcdir/configure
-    elif test -f $ac_sub_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-
-      # Make the cache file name correct relative to the subdirectory.
-      case "$cache_file" in
-      /*) ac_sub_cache_file=$cache_file ;;
-      *) # Relative path.
-        ac_sub_cache_file="$ac_dots$cache_file" ;;
-      esac
-  case "$ac_given_INSTALL" in
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
-
-      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-      # The eval makes quoting arguments work.
-      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-      then :
-      else
-        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
-      fi
-    fi
-
-    cd $ac_popdir
-  done
-fi
-
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/configure.in b/newlib/libc/sys/linux/linuxthreads/machine/configure.in
deleted file mode 100644
index b2a205e..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/configure.in
+++ /dev/null
@@ -1,26 +0,0 @@
-dnl This is the newlib/libc/sys configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(i386)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../../../..)
-
-NEWLIB_CONFIGURE(../../../../..)
-
-dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
-dnl add it into NEWLIB_CONFIGURE, executable tests are made before the first
-dnl line of the macro which fail because appropriate LDFLAGS are not set.
-if test "${use_libtool}" = "yes"; then
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-fi
-
-if test -n "${machine_dir}"; then
-  AC_CONFIG_SUBDIRS(${machine_dir})
-fi
-
-AM_CONDITIONAL(HAVE_MACHINE_DIR, test x${machine_dir} != x)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/generic/generic-sysdep.h b/newlib/libc/sys/linux/linuxthreads/machine/generic/generic-sysdep.h
deleted file mode 100644
index 27f5b69..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/generic/generic-sysdep.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Generic asm macros used on many machines.
-   Copyright (C) 1991, 92, 93, 96, 98 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <config.h>
-#include <libc-symbols.h>
-
-#ifndef C_LABEL
-
-/* Define a macro we can use to construct the asm name for a C symbol.  */
-#ifdef	NO_UNDERSCORES
-#ifdef	__STDC__
-#define C_LABEL(name)		name##:
-#else
-#define C_LABEL(name)		name/**/:
-#endif
-#else
-#ifdef	__STDC__
-#define C_LABEL(name)		_##name##:
-#else
-#define C_LABEL(name)		_/**/name/**/:
-#endif
-#endif
-
-#endif
-
-/* Mark the end of function named SYM.  This is used on some platforms
-   to generate correct debugging information.  */
-#ifndef END
-#define END(sym)
-#endif
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am b/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am
deleted file mode 100644
index d7271e5..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir)/../../../include -I$(srcdir)/../.. -I$(srcdir)/../generic -I$(srcdir)/../../.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES = clone.S i386-sysdep.S pspinlock.c sysdep.S
-
-liblinuxthreadsi386_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = liblinuxthreadsi386.la
-liblinuxthreadsi386_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(LIB_SOURCES)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../../../../../Makefile.shared
-
-AM_CFLAGS = -D_XOPEN_SOURCE=600 -D_GNU_SOURCE=1
-
-ACLOCAL_AMFLAGS = -I ../../../../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.in b/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.in
deleted file mode 100644
index 7c7099a..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/Makefile.in
+++ /dev/null
@@ -1,411 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir)/../../../include -I$(srcdir)/../.. -I$(srcdir)/../generic -I$(srcdir)/../../.. $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES = clone.S i386-sysdep.S pspinlock.c sysdep.S
-
-liblinuxthreadsi386_la_LDFLAGS = -Xcompiler -nostdlib
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = liblinuxthreadsi386.la
-@USE_LIBTOOL_TRUE@liblinuxthreadsi386_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
-
-AM_CFLAGS = -D_XOPEN_SOURCE=600 -D_GNU_SOURCE=1
-
-ACLOCAL_AMFLAGS = -I ../../../../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  clone.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@i386-sysdep.$(OBJEXT) pspinlock.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sysdep.$(OBJEXT)
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-liblinuxthreadsi386_la_LIBADD = 
-@USE_LIBTOOL_TRUE@liblinuxthreadsi386_la_OBJECTS =  clone.lo \
-@USE_LIBTOOL_TRUE@i386-sysdep.lo pspinlock.lo sysdep.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(liblinuxthreadsi386_la_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(liblinuxthreadsi386_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../../../../acinclude.m4 \
-		../../../../../../aclocal.m4 \
-		../../../../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-liblinuxthreadsi386.la: $(liblinuxthreadsi386_la_OBJECTS) $(liblinuxthreadsi386_la_DEPENDENCIES)
-	$(LINK)  $(liblinuxthreadsi386_la_LDFLAGS) $(liblinuxthreadsi386_la_OBJECTS) $(liblinuxthreadsi386_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-noinstLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
-distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4 b/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4
deleted file mode 100644
index 35519ac..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4
+++ /dev/null
@@ -1,1226 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  ])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)])
-
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/bp-asm.h b/newlib/libc/sys/linux/linuxthreads/machine/i386/bp-asm.h
deleted file mode 100644
index 34d5227..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/bp-asm.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Bounded-pointer definitions for x86 assembler.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   Contributed by Greg McGary <greg@mcgary.org>
-   This file is part of the GNU C Library.  Its master source is NOT part of
-   the C library, however.  The master source lives in the GNU MP Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _bp_asm_h_
-# define _bp_asm_h_ 1
-
-# if __ASSEMBLER__
-
-#  if __BOUNDED_POINTERS__
-
-/* Bounded pointers occupy three words.  */
-#   define PTR_SIZE 12
-/* Bounded pointer return values are passed back through a hidden
-   argument that points to caller-allocate space.  The hidden arg
-   occupies one word on the stack.  */
-#   define RTN_SIZE 4
-/* Although the caller pushes the hidden arg, the callee is
-   responsible for popping it.  */
-#   define RET_PTR ret $RTN_SIZE
-/* Maintain frame pointer chain in leaf assembler functions for the benefit
-   of debugging stack traces when bounds violations occur.  */
-#   define ENTER pushl %ebp; movl %esp, %ebp
-#   define LEAVE movl %ebp, %esp; popl %ebp
-/* Stack space overhead of procedure-call linkage: return address and
-   frame pointer.  */
-#   define LINKAGE 8
-/* Stack offset of return address after calling ENTER.  */
-#   define PCOFF 4
-
-/* Int 5 is the "bound range" exception also raised by the "bound"
-   instruction.  */
-#   define BOUNDS_VIOLATED int $5
-
-#   define CHECK_BOUNDS_LOW(VAL_REG, BP_MEM)	\
-	cmpl 4+BP_MEM, VAL_REG;			\
-	jae 0f; /* continue if value >= low */	\
-	BOUNDS_VIOLATED;			\
-    0:
-
-#   define CHECK_BOUNDS_HIGH(VAL_REG, BP_MEM, Jcc)	\
-	cmpl 8+BP_MEM, VAL_REG;				\
-	Jcc 0f; /* continue if value < high */		\
-	BOUNDS_VIOLATED;				\
-    0:
-
-#   define CHECK_BOUNDS_BOTH(VAL_REG, BP_MEM)	\
-	cmpl 4+BP_MEM, VAL_REG;			\
-	jb 1f; /* die if value < low */		\
-    	cmpl 8+BP_MEM, VAL_REG;			\
-	jb 0f; /* continue if value < high */	\
-    1:	BOUNDS_VIOLATED;			\
-    0:
-
-#   define CHECK_BOUNDS_BOTH_WIDE(VAL_REG, BP_MEM, LENGTH)	\
-	CHECK_BOUNDS_LOW(VAL_REG, BP_MEM);			\
-	addl LENGTH, VAL_REG;					\
-    	cmpl 8+BP_MEM, VAL_REG;					\
-	jbe 0f; /* continue if value <= high */			\
-	BOUNDS_VIOLATED;					\
-    0:	subl LENGTH, VAL_REG /* restore value */
-
-/* Take bounds from BP_MEM and affix them to the pointer
-   value in %eax, stuffing all into memory at RTN(%esp).
-   Use %edx as a scratch register.  */
-
-#   define RETURN_BOUNDED_POINTER(BP_MEM)	\
-	movl RTN(%esp), %edx;			\
-	movl %eax, 0(%edx);			\
-	movl 4+BP_MEM, %eax;			\
-	movl %eax, 4(%edx);			\
-	movl 8+BP_MEM, %eax;			\
-	movl %eax, 8(%edx)
-
-#   define RETURN_NULL_BOUNDED_POINTER		\
-	movl RTN(%esp), %edx;			\
-	movl %eax, 0(%edx);			\
-	movl %eax, 4(%edx);			\
-	movl %eax, 8(%edx)
-
-/* The caller of __errno_location is responsible for allocating space
-   for the three-word BP return-value and passing pushing its address
-   as an implicit first argument.  */
-#   define PUSH_ERRNO_LOCATION_RETURN		\
-	subl $8, %esp;				\
-	subl $4, %esp;				\
-	pushl %esp
-
-/* __errno_location is responsible for popping the implicit first
-   argument, but we must pop the space for the BP itself.  We also
-   dereference the return value in order to dig out the pointer value.  */
-#   define POP_ERRNO_LOCATION_RETURN		\
-	popl %eax;				\
-	addl $8, %esp
-
-#  else /* !__BOUNDED_POINTERS__ */
-
-/* Unbounded pointers occupy one word.  */
-#   define PTR_SIZE 4
-/* Unbounded pointer return values are passed back in the register %eax.  */
-#   define RTN_SIZE 0
-/* Use simple return instruction for unbounded pointer values.  */
-#   define RET_PTR ret
-/* Don't maintain frame pointer chain for leaf assembler functions.  */
-#   define ENTER
-#   define LEAVE
-/* Stack space overhead of procedure-call linkage: return address only.  */
-#   define LINKAGE 4
-/* Stack offset of return address after calling ENTER.  */
-#   define PCOFF 0
-
-#   define CHECK_BOUNDS_LOW(VAL_REG, BP_MEM)
-#   define CHECK_BOUNDS_HIGH(VAL_REG, BP_MEM, Jcc)
-#   define CHECK_BOUNDS_BOTH(VAL_REG, BP_MEM)
-#   define CHECK_BOUNDS_BOTH_WIDE(VAL_REG, BP_MEM, LENGTH)
-#   define RETURN_BOUNDED_POINTER(BP_MEM)
-
-#   define RETURN_NULL_BOUNDED_POINTER
-
-#   define PUSH_ERRNO_LOCATION_RETURN
-#   define POP_ERRNO_LOCATION_RETURN
-
-#  endif /* !__BOUNDED_POINTERS__ */
-
-# endif /* __ASSEMBLER__ */
-
-#endif /* _bp_asm_h_ */
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/clone.S b/newlib/libc/sys/linux/linuxthreads/machine/i386/clone.S
deleted file mode 100644
index dd00c2f..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/clone.S
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Richard Henderson (rth@tamu.edu)
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* clone() is even more special than fork() as it mucks with stacks
-   and invokes a function in the right context after its all over.  */
-
-#include <sysdep.h>
-#define _ERRNO_H	1
-#include <bits/errno.h>
-#include <asm/unistd.h>
-#include <bp-sym.h>
-#include <bp-asm.h>
-
-/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */
-
-#define PARMS	LINKAGE		/* no space for saved regs */
-#define FUNC	PARMS
-#define STACK	FUNC+4
-#define FLAGS	STACK+PTR_SIZE
-#define ARG	FLAGS+4
-
-        .text
-ENTRY (BP_SYM (__clone))
-	/* Sanity check arguments.  */
-	movl	$-EINVAL,%eax
-	movl	FUNC(%esp),%ecx		/* no NULL function pointers */
-#ifdef PIC
-	jecxz	SYSCALL_ERROR_LABEL
-#else
-	testl	%ecx,%ecx
-	jz	SYSCALL_ERROR_LABEL
-#endif
-	movl	STACK(%esp),%ecx	/* no NULL stack pointers */
-#ifdef PIC
-	jecxz	SYSCALL_ERROR_LABEL
-#else
-	testl	%ecx,%ecx
-	jz	SYSCALL_ERROR_LABEL
-#endif
-
-	/* Insert the argument onto the new stack.  */
-	subl	$8,%ecx
-	movl	ARG(%esp),%eax		/* no negative argument counts */
-	movl	%eax,4(%ecx)
-
-	/* Save the function pointer as the zeroth argument.
-	   It will be popped off in the child in the ebx frobbing below.  */
-	movl	FUNC(%esp),%eax
-	movl	%eax,0(%ecx)
-
-	/* Do the system call */
-	pushl	%ebx
-	movl	FLAGS+4(%esp),%ebx
-	movl	$SYS_ify(clone),%eax
-	int	$0x80
-	popl	%ebx
-
-	test	%eax,%eax
-	jl	SYSCALL_ERROR_LABEL
-	jz	thread_start
-
-L(pseudo_end):
-	ret
-
-thread_start:
-	subl	%ebp,%ebp	/* terminate the stack frame */
-	call	*%ebx
-#ifdef PIC
-	call	L(here)
-L(here):
-	popl	%ebx
-	addl	$_GLOBAL_OFFSET_TABLE_+[.-L(here)], %ebx
-#endif
-	pushl	%eax
-	call	JUMPTARGET (_exit)
-
-PSEUDO_END (BP_SYM (__clone))
-
-weak_alias (BP_SYM (__clone), BP_SYM (clone))
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/configure b/newlib/libc/sys/linux/linuxthreads/machine/i386/configure
deleted file mode 100755
index dfd1c9e..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/configure
+++ /dev/null
@@ -1,3346 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=yes]"
-ac_help="$ac_help
-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=pspinlock.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../../../../.. $srcdir/../../../../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../../../../.. $srcdir/../../../../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:590: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:643: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:700: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:733: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 738 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:766: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 771 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../../../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:948: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:969: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:987: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1030: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1043: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1056: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1069: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1082: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1186: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1210: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1337: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1382: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-
-if test "${use_libtool}" = "yes"; then
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_shared=yes
-fi
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_static=yes
-fi
-
-# Check whether --enable-fast-install or --disable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_fast_install=yes
-fi
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1783 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
-else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi
-fi
-
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-
-NM="$lt_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-libtool_flags="$libtool_flags --enable-win32-dll"
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-  :
-fi
-
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
-fi
-rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-fi
-
-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_DLLTOOL"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  DLLTOOL="false"
-fi
-fi
-
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AS="false"
-fi
-fi
-
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_OBJDUMP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="objdump"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  OBJDUMP="false"
-fi
-fi
-
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  
-esac
-
-
-# Save cache, so that ltconfig can load it
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
-# Reload cache, that may have been modified by ltconfig
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-
-  
-
-  
-	 
-	 
-for ac_prog in mawk gawk nawk awk
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2998: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AWK="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AWK="$ac_cv_prog_AWK"
-if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$AWK" && break
-done
-
-fi
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@OBJDUMP@%$OBJDUMP%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@AWK@%$AWK%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/configure.in b/newlib/libc/sys/linux/linuxthreads/machine/i386/configure.in
deleted file mode 100644
index bdf1a58..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/configure.in
+++ /dev/null
@@ -1,22 +0,0 @@
-dnl This is the newlib/libc/sys/linux/linuxthreads/machine/i386 configure file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(pspinlock.c)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../../../../..)
-
-NEWLIB_CONFIGURE(../../../../../..)
-
-dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
-dnl add it into NEWLIB_CONFIGURE, executable tests are made before the first
-dnl line of the macro which fail because appropriate LDFLAGS are not set.
-
-if test "${use_libtool}" = "yes"; then
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-AC_PROG_AWK
-fi
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/i386-sysdep.S b/newlib/libc/sys/linux/linuxthreads/machine/i386/i386-sysdep.S
deleted file mode 100644
index aec21c0..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/i386-sysdep.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 2000 Free Software Foundation, Inc.
-   This file has been modified from the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sysdep.h>
-#define _ERRNO_H
-#include <bits/errno.h>
-#include <bp-asm.h>
-#include <bp-sym.h>
-
-.globl __syscall_error
-
-__syscall_error:
-#if defined (EWOULDBLOCK_sys) && EWOULDBLOCK_sys != EAGAIN
-	/* We translate the system's EWOULDBLOCK error into EAGAIN.
-	   The GNU C library always defines EWOULDBLOCK==EAGAIN.
-	   EWOULDBLOCK_sys is the original number.  */
-	cmpl $EWOULDBLOCK_sys, %eax /* Is it the old EWOULDBLOCK?  */
-	jne notb		/* Branch if not.  */
-	movl $EAGAIN, %eax	/* Yes; translate it to EAGAIN.  */
-notb:
-#endif
-#ifndef	PIC
-	pushl %eax
-	PUSH_ERRNO_LOCATION_RETURN
-	call BP_SYM (__errno)
-	POP_ERRNO_LOCATION_RETURN
-	popl %ecx
-	movl %ecx, (%eax)
-#else
-	/* The caller has pushed %ebx and then set it up to
-	   point to the GOT before calling us through the PLT.  */
-	pushl %eax
-	PUSH_ERRNO_LOCATION_RETURN
-	call C_SYMBOL_NAME (BP_SYM (__errno)@PLT)
-	POP_ERRNO_LOCATION_RETURN
-	popl %ecx
-	/* Pop %ebx value saved before jumping here.  */
-	popl %ebx
-	movl %ecx, (%eax)
-#endif
-	movl $-1, %eax
-	ret
-
-#undef	__syscall_error
-END (__syscall_error)
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/i386-sysdep.h b/newlib/libc/sys/linux/linuxthreads/machine/i386/i386-sysdep.h
deleted file mode 100644
index 02b4c19..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/i386-sysdep.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* Assembler macros for i386.
-   Copyright (C) 1991, 92, 93, 95, 96, 98 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#define NO_UNDERSCORES
-
-#include <generic-sysdep.h>
-
-#ifdef	__ASSEMBLER__
-
-/* Syntactic details of assembler.  */
-
-#ifdef HAVE_ELF
-
-/* ELF uses byte-counts for .align, most others use log2 of count of bytes.  */
-#define ALIGNARG(log2) 1<<log2
-/* For ELF we need the `.type' directive to make shared libs work right.  */
-#define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg;
-#define ASM_SIZE_DIRECTIVE(name) .size name,.-name;
-
-/* In ELF C symbols are asm symbols.  */
-#undef	NO_UNDERSCORES
-#define NO_UNDERSCORES
-
-#else
-
-#define ALIGNARG(log2) log2
-#define ASM_TYPE_DIRECTIVE(name,type)	/* Nothing is specified.  */
-#define ASM_SIZE_DIRECTIVE(name)	/* Nothing is specified.  */
-
-#endif
-
-
-/* Define an entry point visible from C.
-
-   There is currently a bug in gdb which prevents us from specifying
-   incomplete stabs information.  Fake some entries here which specify
-   the current source file.  */
-#define	ENTRY(name)							      \
-  STABS_CURRENT_FILE1("")						      \
-  STABS_CURRENT_FILE(name)						      \
-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name);				      \
-  ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),@function)			      \
-  .align ALIGNARG(4);							      \
-  STABS_FUN(name)							      \
-  C_LABEL(name)								      \
-  CALL_MCOUNT
-
-#undef	END
-#define END(name)							      \
-  ASM_SIZE_DIRECTIVE(name)						      \
-  STABS_FUN_END(name)
-
-/* Remove the following two lines once the gdb bug is fixed.  */
-#define STABS_CURRENT_FILE(name)					      \
-  STABS_CURRENT_FILE1 (#name)
-#define STABS_CURRENT_FILE1(name)					      \
-  1: .stabs name,100,0,0,1b;
-/* Emit stabs definition lines.  We use F(0,1) and define t(0,1) as `int',
-   the same way gcc does it.  */
-#define STABS_FUN(name) STABS_FUN2(name, name##:F(0,1))
-#define STABS_FUN2(name, namestr)					      \
-  .stabs "int:t(0,1)=r(0,1);-2147483648;2147483647;",128,0,0,0;		      \
-  .stabs #namestr,36,0,0,name;
-#define STABS_FUN_END(name)						      \
-  1: .stabs "",36,0,0,1b-name;
-
-/* If compiled for profiling, call `mcount' at the start of each function.  */
-#ifdef	PROF
-/* The mcount code relies on a normal frame pointer being on the stack
-   to locate our caller, so push one just for its benefit.  */
-#define CALL_MCOUNT \
-  pushl %ebp; movl %esp, %ebp; call JUMPTARGET(mcount); popl %ebp;
-#else
-#define CALL_MCOUNT		/* Do nothing.  */
-#endif
-
-#ifdef	NO_UNDERSCORES
-/* Since C identifiers are not normally prefixed with an underscore
-   on this system, the asm identifier `syscall_error' intrudes on the
-   C name space.  Make sure we use an innocuous name.  */
-#define	syscall_error	__syscall_error
-#define mcount		_mcount
-#endif
-
-#define	PSEUDO(name, syscall_name, args)				      \
-lose: SYSCALL_PIC_SETUP							      \
-  jmp JUMPTARGET(syscall_error)						      \
-  .globl syscall_error;							      \
-  ENTRY (name)								      \
-  DO_CALL (syscall_name, args);						      \
-  jb lose
-
-#undef	PSEUDO_END
-#define	PSEUDO_END(name)						      \
-  END (name)
-
-#ifdef PIC
-#define JUMPTARGET(name)	name##@PLT
-#define SYSCALL_PIC_SETUP \
-    pushl %ebx;								      \
-    call 0f;								      \
-0:  popl %ebx;								      \
-    addl $_GLOBAL_OFFSET_TABLE+[.-0b], %ebx;
-#else
-#define JUMPTARGET(name)	name
-#define SYSCALL_PIC_SETUP	/* Nothing.  */
-#endif
-
-/* Local label name for asm code. */
-#ifndef L
-#define L(name)		name
-#endif
-
-#endif	/* __ASSEMBLER__ */
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/pspinlock.c b/newlib/libc/sys/linux/linuxthreads/machine/i386/pspinlock.c
deleted file mode 100644
index 5d24238..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/pspinlock.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* POSIX spinlock implementation.  x86 version.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include "internals.h"
-
-/* This implementation is similar to the one used in the Linux kernel.
-   But the kernel is byte instructions for the memory access.  This is
-   faster but unusable here.  The problem is that only 128
-   threads/processes could use the spinlock at the same time.  If (by
-   a design error in the program) a thread/process would hold the
-   spinlock for a time long enough to accumulate 128 waiting
-   processes, the next one will find a positive value in the spinlock
-   and assume it is unlocked.  We cannot accept that.  */
-
-int
-__pthread_spin_lock (pthread_spinlock_t *lock)
-{
-  asm volatile
-    ("\n"
-     "1:\n\t"
-     "lock; decl %0\n\t"
-     "js 2f\n\t"
-     ".section .text.spinlock,\"ax\"\n"
-     "2:\n\t"
-     "cmpl $0,%0\n\t"
-     "rep; nop\n\t"
-     "jle 2b\n\t"
-     "jmp 1b\n\t"
-     ".previous"
-     : "=m" (*lock));
-  return 0;
-}
-weak_alias (__pthread_spin_lock, pthread_spin_lock)
-
-
-int
-__pthread_spin_trylock (pthread_spinlock_t *lock)
-{
-  int oldval;
-
-  asm volatile
-    ("xchgl %0,%1"
-     : "=r" (oldval), "=m" (*lock)
-     : "0" (0));
-  return oldval > 0 ? 0 : EBUSY;
-}
-weak_alias (__pthread_spin_trylock, pthread_spin_trylock)
-
-
-int
-__pthread_spin_unlock (pthread_spinlock_t *lock)
-{
-  asm volatile
-    ("movl $1,%0"
-     : "=m" (*lock));
-  return 0;
-}
-weak_alias (__pthread_spin_unlock, pthread_spin_unlock)
-
-
-int
-__pthread_spin_init (pthread_spinlock_t *lock, int pshared)
-{
-  /* We can ignore the `pshared' parameter.  Since we are busy-waiting
-     all processes which can access the memory location `lock' points
-     to can use the spinlock.  */
-  *lock = 1;
-  return 0;
-}
-weak_alias (__pthread_spin_init, pthread_spin_init)
-
-
-int
-__pthread_spin_destroy (pthread_spinlock_t *lock)
-{
-  /* Nothing to do.  */
-  return 0;
-}
-weak_alias (__pthread_spin_destroy, pthread_spin_destroy)
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/pt-machine.h b/newlib/libc/sys/linux/linuxthreads/machine/i386/pt-machine.h
deleted file mode 100644
index 3346bcc..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/pt-machine.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Machine-dependent pthreads configuration and inline functions.
-   i386 version.
-   Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Richard Henderson <rth@tamu.edu>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef PT_EI
-# define PT_EI extern inline
-#endif
-
-/* Get some notion of the current stack.  Need not be exactly the top
-   of the stack, just something somewhere in the current frame.  */
-#define CURRENT_STACK_FRAME  __builtin_frame_address (0)
-
-
-/* Spinlock implementation; required.  */
-PT_EI long int
-testandset (int *spinlock)
-{
-  long int ret;
-
-  __asm__ __volatile__(
-       "xchgl %0, %1"
-       : "=r"(ret), "=m"(*spinlock)
-       : "0"(1), "m"(*spinlock)
-       : "memory");
-
-  return ret;
-}
-
-
-/* Compare-and-swap for semaphores.
-   Available on the 486 and above, but not on the 386.
-   We test dynamically whether it's available or not. */
-
-#define HAS_COMPARE_AND_SWAP
-#define TEST_FOR_COMPARE_AND_SWAP
-
-PT_EI int
-__compare_and_swap (long int *p, long int oldval, long int newval)
-{
-  char ret;
-  long int readval;
-
-  __asm__ __volatile__ ("lock; cmpxchgl %3, %1; sete %0"
-			: "=q" (ret), "=m" (*p), "=a" (readval)
-			: "r" (newval), "m" (*p), "a" (oldval)
-			: "memory");
-  return ret;
-}
-
-
-PT_EI int
-get_eflags (void)
-{
-  int res;
-  __asm__ __volatile__ ("pushfl; popl %0" : "=r" (res) : );
-  return res;
-}
-
-
-PT_EI void
-set_eflags (int newflags)
-{
-  __asm__ __volatile__ ("pushl %0; popfl" : : "r" (newflags) : "cc");
-}
-
-
-PT_EI int
-compare_and_swap_is_available (void)
-{
-  int oldflags = get_eflags ();
-  int changed;
-  /* Flip AC bit in EFLAGS.  */
-  set_eflags (oldflags ^ 0x40000);
-  /* See if bit changed.  */
-  changed = (get_eflags () ^ oldflags) & 0x40000;
-  /* Restore EFLAGS.  */
-  set_eflags (oldflags);
-  /* If the AC flag did not change, it's a 386 and it lacks cmpxchg.
-     Otherwise, it's a 486 or above and it has cmpxchg.  */
-  return changed != 0;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/sigcontextinfo.h b/newlib/libc/sys/linux/linuxthreads/machine/i386/sigcontextinfo.h
deleted file mode 100644
index 6530ba6..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/sigcontextinfo.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#define SIGCONTEXT struct sigcontext
-#define SIGCONTEXT_EXTRA_ARGS
-#define GET_PC(ctx)	((void *) ctx.eip)
-#define GET_FRAME(ctx)	((void *) ctx.ebp)
-#define GET_STACK(ctx)	((void *) ctx.esp_at_signal)
-#define CALL_SIGHANDLER(handler, signo, ctx) \
-do {									      \
-  int __tmp1, __tmp2, __tmp3, __tmp4;					      \
-  __asm __volatile ("movl\t%%esp, %%edi\n\t"				      \
-		    "andl\t$-16, %%esp\n\t"				      \
-		    "subl\t%8, %%esp\n\t"				      \
-		    "movl\t%%edi, %c8-4(%%esp)\n\t"			      \
-		    "movl\t%1, 0(%%esp)\n\t"				      \
-		    "leal\t4(%%esp), %%edi\n\t"				      \
-		    "cld\n\t"						      \
-		    "rep\tmovsl\n\t"					      \
-		    "call\t*%0\n\t"					      \
-		    "cld\n\t"						      \
-		    "movl\t%9, %%ecx\n\t"				      \
-		    "subl\t%%edi, %%esi\n\t"				      \
-		    "leal\t4(%%esp,%%esi,1), %%edi\n\t"			      \
-		    "leal\t4(%%esp), %%esi\n\t"				      \
-		    "rep\tmovsl\n\t"					      \
-		    "movl\t%c8-4(%%esp), %%esp\n\t"			      \
-		    : "=a" (__tmp1), "=d" (__tmp2), "=S" (__tmp3),	      \
-		      "=c" (__tmp4)					      \
-		    : "0" (handler), "1" (signo), "2" (&ctx),		      \
-		      "3" (sizeof (struct sigcontext) / 4),		      \
-		      "n" ((sizeof (struct sigcontext) + 19) & ~15),	      \
-		      "i" (sizeof (struct sigcontext) / 4)		      \
-		    : "cc", "edi");					      \
-} while (0)
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/stackinfo.h b/newlib/libc/sys/linux/linuxthreads/machine/i386/stackinfo.h
deleted file mode 100644
index a9a6745..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/stackinfo.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* This file contains a bit of information about the stack allocation
-   of the processor.  */
-
-#ifndef _STACKINFO_H
-#define _STACKINFO_H	1
-
-/* On x86 the stack grows down.  */
-#define _STACK_GROWS_DOWN	1
-
-#endif	/* stackinfo.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/sysdep.S b/newlib/libc/sys/linux/linuxthreads/machine/i386/sysdep.S
deleted file mode 100644
index f219805..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/sysdep.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sysdep.h>
-
-/* The following code is only used in the shared library when we
-   compile the reentrant version.  Otherwise each system call defines
-   each own version.  */
-
-#ifndef PIC
-
-/* The syscall stubs jump here when they detect an error.
-   The code for Linux is almost identical to the canonical Unix/i386
-   code, except that the error number in %eax is negated.  */
-
-#undef CALL_MCOUNT
-#define CALL_MCOUNT /* Don't insert the profiling call, it clobbers %eax.  */
-
-	.text
-ENTRY (__syscall_error)
-	negl %eax
-
-#define __syscall_error __syscall_error_1
-#include <i386-sysdep.S>
-
-#endif	/* !PIC */
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/sysdep.h b/newlib/libc/sys/linux/linuxthreads/machine/i386/sysdep.h
deleted file mode 100644
index 48aeab1..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/sysdep.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/* Copyright (C) 1992, 93, 95, 96, 97, 98, 99, 00 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper, <drepper@gnu.org>, August 1995.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _LINUX_I386_SYSDEP_H
-#define _LINUX_I386_SYSDEP_H 1
-
-#include "i386-sysdep.h"
-
-/* For Linux we can use the system call table in the header file
-	/usr/include/asm/unistd.h
-   of the kernel.  But these symbols do not follow the SYS_* syntax
-   so we have to redefine the `SYS_ify' macro here.  */
-#undef SYS_ify
-#define SYS_ify(syscall_name)	__NR_##syscall_name
-
-/* ELF-like local names start with `.L'.  */
-#undef L
-#define L(name)	.L##name
-
-#ifdef __ASSEMBLER__
-
-/* Linux uses a negative return value to indicate syscall errors,
-   unlike most Unices, which use the condition codes' carry flag.
-
-   Since version 2.1 the return value of a system call might be
-   negative even if the call succeeded.  E.g., the `lseek' system call
-   might return a large offset.  Therefore we must not anymore test
-   for < 0, but test for a real error by making sure the value in %eax
-   is a real error number.  Linus said he will make sure the no syscall
-   returns a value in -1 .. -4095 as a valid result so we can savely
-   test with -4095.  */
-
-/* We don't want the label for the error handle to be global when we define
-   it here.  */
-#ifdef PIC
-# define SYSCALL_ERROR_LABEL 0f
-#else
-# define SYSCALL_ERROR_LABEL syscall_error
-#endif
-
-#undef	PSEUDO
-#define	PSEUDO(name, syscall_name, args)				      \
-  .text;								      \
-  ENTRY (name)								      \
-    DO_CALL (args, syscall_name);					      \
-    cmpl $-4095, %eax;							      \
-    jae SYSCALL_ERROR_LABEL;						      \
-  L(pseudo_end):
-
-#undef	PSEUDO_END
-#define	PSEUDO_END(name)						      \
-  SYSCALL_ERROR_HANDLER							      \
-  END (name)
-
-#ifndef PIC
-#define SYSCALL_ERROR_HANDLER	/* Nothing here; code in sysdep.S is used.  */
-#else
-/* Store (- %eax) into errno through the GOT.  */
-#ifdef _LIBC_REENTRANT
-#define SYSCALL_ERROR_HANDLER						      \
-0:pushl %ebx;								      \
-  call 1f;								      \
-1:popl %ebx;								      \
-  xorl %edx, %edx;							      \
-  addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx;				      \
-  subl %eax, %edx;							      \
-  pushl %edx;								      \
-  PUSH_ERRNO_LOCATION_RETURN;						      \
-  call BP_SYM (__errno_location)@PLT;					      \
-  POP_ERRNO_LOCATION_RETURN;						      \
-  popl %ecx;								      \
-  popl %ebx;								      \
-  movl %ecx, (%eax);							      \
-  orl $-1, %eax;							      \
-  jmp L(pseudo_end);
-/* A quick note: it is assumed that the call to `__errno_location' does
-   not modify the stack!  */
-#else
-#define SYSCALL_ERROR_HANDLER						      \
-0:call 1f;								      \
-1:popl %ecx;								      \
-  xorl %edx, %edx;							      \
-  addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %ecx;				      \
-  subl %eax, %edx;							      \
-  movl errno@GOT(%ecx), %ecx;						      \
-  movl %edx, (%ecx);							      \
-  orl $-1, %eax;							      \
-  jmp L(pseudo_end);
-#endif	/* _LIBC_REENTRANT */
-#endif	/* PIC */
-
-/* Linux takes system call arguments in registers:
-
-	syscall number	%eax	     call-clobbered
-	arg 1		%ebx	     call-saved
-	arg 2		%ecx	     call-clobbered
-	arg 3		%edx	     call-clobbered
-	arg 4		%esi	     call-saved
-	arg 5		%edi	     call-saved
-
-   The stack layout upon entering the function is:
-
-	20(%esp)	Arg# 5
-	16(%esp)	Arg# 4
-	12(%esp)	Arg# 3
-	 8(%esp)	Arg# 2
-	 4(%esp)	Arg# 1
-	  (%esp)	Return address
-
-   (Of course a function with say 3 arguments does not have entries for
-   arguments 4 and 5.)
-
-   The following code tries hard to be optimal.  A general assumption
-   (which is true according to the data books I have) is that
-
-	2 * xchg	is more expensive than	pushl + movl + popl
-
-   Beside this a neat trick is used.  The calling conventions for Linux
-   tell that among the registers used for parameters %ecx and %edx need
-   not be saved.  Beside this we may clobber this registers even when
-   they are not used for parameter passing.
-
-   As a result one can see below that we save the content of the %ebx
-   register in the %edx register when we have less than 3 arguments
-   (2 * movl is less expensive than pushl + popl).
-
-   Second unlike for the other registers we don't save the content of
-   %ecx and %edx when we have more than 1 and 2 registers resp.
-
-   The code below might look a bit long but we have to take care for
-   the pipelined processors (i586).  Here the `pushl' and `popl'
-   instructions are marked as NP (not pairable) but the exception is
-   two consecutive of these instruction.  This gives no penalty on
-   other processors though.  */
-
-#undef	DO_CALL
-#define DO_CALL(args, syscall_name)			      		      \
-    PUSHARGS_##args							      \
-    DOARGS_##args							      \
-    movl $SYS_ify (syscall_name), %eax;					      \
-    int $0x80								      \
-    POPARGS_##args
-
-#define PUSHARGS_0	/* No arguments to push.  */
-#define	DOARGS_0	/* No arguments to frob.  */
-#define	POPARGS_0	/* No arguments to pop.  */
-#define	_PUSHARGS_0	/* No arguments to push.  */
-#define _DOARGS_0(n)	/* No arguments to frob.  */
-#define	_POPARGS_0	/* No arguments to pop.  */
-
-#define PUSHARGS_1	movl %ebx, %edx; PUSHARGS_0
-#define	DOARGS_1	_DOARGS_1 (4)
-#define	POPARGS_1	POPARGS_0; movl %edx, %ebx
-#define	_PUSHARGS_1	pushl %ebx; _PUSHARGS_0
-#define _DOARGS_1(n)	movl n(%esp), %ebx; _DOARGS_0(n-4)
-#define	_POPARGS_1	_POPARGS_0; popl %ebx
-
-#define PUSHARGS_2	PUSHARGS_1
-#define	DOARGS_2	_DOARGS_2 (8)
-#define	POPARGS_2	POPARGS_1
-#define _PUSHARGS_2	_PUSHARGS_1
-#define	_DOARGS_2(n)	movl n(%esp), %ecx; _DOARGS_1 (n-4)
-#define	_POPARGS_2	_POPARGS_1
-
-#define PUSHARGS_3	_PUSHARGS_2
-#define DOARGS_3	_DOARGS_3 (16)
-#define POPARGS_3	_POPARGS_3
-#define _PUSHARGS_3	_PUSHARGS_2
-#define _DOARGS_3(n)	movl n(%esp), %edx; _DOARGS_2 (n-4)
-#define _POPARGS_3	_POPARGS_2
-
-#define PUSHARGS_4	_PUSHARGS_4
-#define DOARGS_4	_DOARGS_4 (24)
-#define POPARGS_4	_POPARGS_4
-#define _PUSHARGS_4	pushl %esi; _PUSHARGS_3
-#define _DOARGS_4(n)	movl n(%esp), %esi; _DOARGS_3 (n-4)
-#define _POPARGS_4	_POPARGS_3; popl %esi
-
-#define PUSHARGS_5	_PUSHARGS_5
-#define DOARGS_5	_DOARGS_5 (32)
-#define POPARGS_5	_POPARGS_5
-#define _PUSHARGS_5	pushl %edi; _PUSHARGS_4
-#define _DOARGS_5(n)	movl n(%esp), %edi; _DOARGS_4 (n-4)
-#define _POPARGS_5	_POPARGS_4; popl %edi
-
-#else	/* !__ASSEMBLER__ */
-
-/* We need some help from the assembler to generate optimal code.  We
-   define some macros here which later will be used.  */
-asm (".L__X'%ebx = 1\n\t"
-     ".L__X'%ecx = 2\n\t"
-     ".L__X'%edx = 2\n\t"
-     ".L__X'%eax = 3\n\t"
-     ".L__X'%esi = 3\n\t"
-     ".L__X'%edi = 3\n\t"
-     ".L__X'%ebp = 3\n\t"
-     ".L__X'%esp = 3\n\t"
-     ".macro bpushl name reg\n\t"
-     ".if 1 - \\name\n\t"
-     ".if 2 - \\name\n\t"
-     "pushl %ebx\n\t"
-     ".else\n\t"
-     "xchgl \\reg, %ebx\n\t"
-     ".endif\n\t"
-     ".endif\n\t"
-     ".endm\n\t"
-     ".macro bpopl name reg\n\t"
-     ".if 1 - \\name\n\t"
-     ".if 2 - \\name\n\t"
-     "popl %ebx\n\t"
-     ".else\n\t"
-     "xchgl \\reg, %ebx\n\t"
-     ".endif\n\t"
-     ".endif\n\t"
-     ".endm\n\t"
-     ".macro bmovl name reg\n\t"
-     ".if 1 - \\name\n\t"
-     ".if 2 - \\name\n\t"
-     "movl \\reg, %ebx\n\t"
-     ".endif\n\t"
-     ".endif\n\t"
-     ".endm\n\t");
-
-/* Define a macro which expands inline into the wrapper code for a system
-   call.  */
-#undef INLINE_SYSCALL
-#define INLINE_SYSCALL(name, nr, args...) \
-  ({									      \
-    unsigned int resultvar;						      \
-    asm volatile (							      \
-    LOADARGS_##nr							      \
-    "movl %1, %%eax\n\t"						      \
-    "int $0x80\n\t"							      \
-    RESTOREARGS_##nr							      \
-    : "=a" (resultvar)							      \
-    : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc");		      \
-    if (resultvar >= 0xfffff001)					      \
-      {									      \
-	__set_errno (-resultvar);					      \
-	resultvar = 0xffffffff;						      \
-      }									      \
-    (int) resultvar; })
-
-#define LOADARGS_0
-#define LOADARGS_1 \
-    "bpushl .L__X'%k2, %k2\n\t"						      \
-    "bmovl .L__X'%k2, %k2\n\t"
-#define LOADARGS_2	LOADARGS_1
-#define LOADARGS_3	LOADARGS_1
-#define LOADARGS_4	LOADARGS_1
-#define LOADARGS_5	LOADARGS_1
-
-#define RESTOREARGS_0
-#define RESTOREARGS_1 \
-    "bpopl .L__X'%k2, %k2\n\t"
-#define RESTOREARGS_2	RESTOREARGS_1
-#define RESTOREARGS_3	RESTOREARGS_1
-#define RESTOREARGS_4	RESTOREARGS_1
-#define RESTOREARGS_5	RESTOREARGS_1
-
-#define ASMFMT_0()
-#define ASMFMT_1(arg1) \
-	, "acdSD" (arg1)
-#define ASMFMT_2(arg1, arg2) \
-	, "adCD" (arg1), "c" (arg2)
-#define ASMFMT_3(arg1, arg2, arg3) \
-	, "aCD" (arg1), "c" (arg2), "d" (arg3)
-#define ASMFMT_4(arg1, arg2, arg3, arg4) \
-	, "aD" (arg1), "c" (arg2), "d" (arg3), "S" (arg4)
-#define ASMFMT_5(arg1, arg2, arg3, arg4, arg5) \
-	, "a" (arg1), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5)
-
-#endif	/* __ASSEMBLER__ */
-
-#endif /* linux/i386/sysdep.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/useldt.h b/newlib/libc/sys/linux/linuxthreads/machine/i386/useldt.h
deleted file mode 100644
index 02d079c..0000000
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/useldt.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/* Special definitions for ix86 machine using segment register based
-   thread descriptor.
-   Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <stddef.h>	/* For offsetof.  */
-#include <stdlib.h>	/* For abort().  */
-
-
-/* We don't want to include the kernel header.  So duplicate the
-   information.  */
-
-/* Structure passed on `modify_ldt' call.  */
-struct modify_ldt_ldt_s
-{
-  unsigned int entry_number;
-  unsigned long int base_addr;
-  unsigned int limit;
-  unsigned int seg_32bit:1;
-  unsigned int contents:2;
-  unsigned int read_exec_only:1;
-  unsigned int limit_in_pages:1;
-  unsigned int seg_not_present:1;
-  unsigned int useable:1;
-  unsigned int empty:25;
-};
-
-/* System call to set LDT entry.  */
-extern int __modify_ldt (int, struct modify_ldt_ldt_s *, size_t);
-
-
-/* Return the thread descriptor for the current thread.
-
-   The contained asm must *not* be marked volatile since otherwise
-   assignments like
-	pthread_descr self = thread_self();
-   do not get optimized away.  */
-#define THREAD_SELF \
-({									      \
-  register pthread_descr __self;					      \
-  __asm__ ("movl %%gs:%c1,%0" : "=r" (__self)				      \
-	   : "i" (offsetof (struct _pthread_descr_struct,		      \
-			    p_header.data.self)));			      \
-  __self;								      \
-})
-
-/* Initialize the thread-unique value.  */
-#define INIT_THREAD_SELF(descr, nr) \
-{									      \
-  struct modify_ldt_ldt_s ldt_entry =					      \
-    { nr, (unsigned long int) descr, sizeof (*descr), 1, 0, 0, 0, 0, 1, 0 };  \
-  if (__modify_ldt (1, &ldt_entry, sizeof (ldt_entry)) != 0)		      \
-    abort ();								      \
-  __asm__ __volatile__ ("movw %w0, %%gs" : : "q" (nr * 8 + 7));		      \
-}
-
-/* Free resources associated with thread descriptor.  */
-#define FREE_THREAD(descr, nr) \
-{									      \
-  struct modify_ldt_ldt_s ldt_entry =					      \
-    { nr, 0, 0, 0, 0, 1, 0, 1, 0, 0 };					      \
-  __modify_ldt (1, &ldt_entry, sizeof (ldt_entry));			      \
-}
-
-/* Read member of the thread descriptor directly.  */
-#define THREAD_GETMEM(descr, member) \
-({									      \
-  __typeof__ (descr->member) __value;					      \
-  if (sizeof (__value) == 1)						      \
-    __asm__ __volatile__ ("movb %%gs:%P2,%b0"				      \
-			  : "=q" (__value)				      \
-			  : "0" (0),					      \
-			    "i" (offsetof (struct _pthread_descr_struct,      \
-					   member)));			      \
-  else if (sizeof (__value) == 4)					      \
-    __asm__ __volatile__ ("movl %%gs:%P1,%0"				      \
-			  : "=r" (__value)				      \
-			  : "i" (offsetof (struct _pthread_descr_struct,      \
-					   member)));			      \
-  else									      \
-    {									      \
-      if (sizeof (__value) != 8)					      \
-	/* There should not be any value with a size other than 1, 4 or 8.  */\
-	abort ();							      \
-									      \
-      __asm__ __volatile__ ("movl %%gs:%P1,%%eax\n\t"			      \
-			    "movl %%gs:%P2,%%edx"			      \
-			    : "=A" (__value)				      \
-			    : "i" (offsetof (struct _pthread_descr_struct,    \
-					     member)),			      \
-			      "i" (offsetof (struct _pthread_descr_struct,    \
-					     member) + 4));		      \
-    }									      \
-  __value;								      \
-})
-
-/* Same as THREAD_GETMEM, but the member offset can be non-constant.  */
-#define THREAD_GETMEM_NC(descr, member) \
-({									      \
-  __typeof__ (descr->member) __value;					      \
-  if (sizeof (__value) == 1)						      \
-    __asm__ __volatile__ ("movb %%gs:(%2),%b0"				      \
-			  : "=q" (__value)				      \
-			  : "0" (0),					      \
-			    "r" (offsetof (struct _pthread_descr_struct,      \
-					   member)));			      \
-  else if (sizeof (__value) == 4)					      \
-    __asm__ __volatile__ ("movl %%gs:(%1),%0"				      \
-			  : "=r" (__value)				      \
-			  : "r" (offsetof (struct _pthread_descr_struct,      \
-					   member)));			      \
-  else									      \
-    {									      \
-      if (sizeof (__value) != 8)					      \
-	/* There should not be any value with a size other than 1, 4 or 8.  */\
-	abort ();							      \
-									      \
-      __asm__ __volatile__ ("movl %%gs:(%1),%%eax\n\t"			      \
-			    "movl %%gs:4(%1),%%edx"			      \
-			    : "=&A" (__value)				      \
-			    : "r" (offsetof (struct _pthread_descr_struct,    \
-					     member)));			      \
-    }									      \
-  __value;								      \
-})
-
-/* Same as THREAD_SETMEM, but the member offset can be non-constant.  */
-#define THREAD_SETMEM(descr, member, value) \
-({									      \
-  __typeof__ (descr->member) __value = (value);				      \
-  if (sizeof (__value) == 1)						      \
-    __asm__ __volatile__ ("movb %0,%%gs:%P1" :				      \
-			  : "q" (__value),				      \
-			    "i" (offsetof (struct _pthread_descr_struct,      \
-					   member)));			      \
-  else if (sizeof (__value) == 4)					      \
-    __asm__ __volatile__ ("movl %0,%%gs:%P1" :				      \
-			  : "r" (__value),				      \
-			    "i" (offsetof (struct _pthread_descr_struct,      \
-					   member)));			      \
-  else									      \
-    {									      \
-      if (sizeof (__value) != 8)					      \
-	/* There should not be any value with a size other than 1, 4 or 8.  */\
-	abort ();							      \
-									      \
-      __asm__ __volatile__ ("movl %%eax,%%gs:%P1\n\n"			      \
-			    "movl %%edx,%%gs:%P2" :			      \
-			    : "A" (__value),				      \
-			      "i" (offsetof (struct _pthread_descr_struct,    \
-					     member)),			      \
-			      "i" (offsetof (struct _pthread_descr_struct,    \
-					     member) + 4));		      \
-    }									      \
-})
-
-/* Set member of the thread descriptor directly.  */
-#define THREAD_SETMEM_NC(descr, member, value) \
-({									      \
-  __typeof__ (descr->member) __value = (value);				      \
-  if (sizeof (__value) == 1)						      \
-    __asm__ __volatile__ ("movb %0,%%gs:(%1)" :				      \
-			  : "q" (__value),				      \
-			    "r" (offsetof (struct _pthread_descr_struct,      \
-					   member)));			      \
-  else if (sizeof (__value) == 4)					      \
-    __asm__ __volatile__ ("movl %0,%%gs:(%1)" :				      \
-			  : "r" (__value),				      \
-			    "r" (offsetof (struct _pthread_descr_struct,      \
-					   member)));			      \
-  else									      \
-    {									      \
-      if (sizeof (__value) != 8)					      \
-	/* There should not be any value with a size other than 1, 4 or 8.  */\
-	abort ();							      \
-									      \
-      __asm__ __volatile__ ("movl %%eax,%%gs:(%1)\n\t"			      \
-			    "movl %%edx,%%gs:4(%1)" :			      \
-			    : "A" (__value),				      \
-			      "r" (offsetof (struct _pthread_descr_struct,    \
-					     member)));			      \
-    }									      \
-})
-
-/* We want the OS to assign stack addresses.  */
-#define FLOATING_STACKS	1
-
-/* Maximum size of the stack if the rlimit is unlimited.  */
-#define ARCH_STACK_MAX_SIZE	8*1024*1024
diff --git a/newlib/libc/sys/linux/linuxthreads/manager.c b/newlib/libc/sys/linux/linuxthreads/manager.c
deleted file mode 100644
index 7729903..0000000
--- a/newlib/libc/sys/linux/linuxthreads/manager.c
+++ /dev/null
@@ -1,981 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* The "thread manager" thread: manages creation and termination of threads */
-
-#include <errno.h>
-#include <sched.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/poll.h>		/* for poll */
-#include <sys/mman.h>           /* for mmap */
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/wait.h>           /* for waitpid macros */
-
-#include "pthread.h"
-#include "internals.h"
-#include "spinlock.h"
-#include "restart.h"
-#include "semaphore.h"
-
-/* Array of active threads. Entry 0 is reserved for the initial thread. */
-struct pthread_handle_struct __pthread_handles[PTHREAD_THREADS_MAX] =
-{ { __LOCK_INITIALIZER, &__pthread_initial_thread, 0},
-  { __LOCK_INITIALIZER, &__pthread_manager_thread, 0}, /* All NULLs */ };
-
-/* For debugging purposes put the maximum number of threads in a variable.  */
-const int __linuxthreads_pthread_threads_max = PTHREAD_THREADS_MAX;
-
-#ifndef THREAD_SELF
-/* Indicate whether at least one thread has a user-defined stack (if 1),
-   or if all threads have stacks supplied by LinuxThreads (if 0). */
-int __pthread_nonstandard_stacks;
-#endif
-
-/* Number of active entries in __pthread_handles (used by gdb) */
-volatile int __pthread_handles_num = 2;
-
-/* Whether to use debugger additional actions for thread creation
-   (set to 1 by gdb) */
-volatile int __pthread_threads_debug;
-
-/* Globally enabled events.  */
-volatile td_thr_events_t __pthread_threads_events;
-
-/* Pointer to thread descriptor with last event.  */
-volatile pthread_descr __pthread_last_event;
-
-/* Mapping from stack segment to thread descriptor. */
-/* Stack segment numbers are also indices into the __pthread_handles array. */
-/* Stack segment number 0 is reserved for the initial thread. */
-
-#if FLOATING_STACKS
-# define thread_segment(seq) NULL
-#else
-static inline pthread_descr thread_segment(int seg)
-{
-  return (pthread_descr)(THREAD_STACK_START_ADDRESS - (seg - 1) * STACK_SIZE)
-         - 1;
-}
-#endif
-
-/* Flag set in signal handler to record child termination */
-
-static volatile int terminated_children;
-
-/* Flag set when the initial thread is blocked on pthread_exit waiting
-   for all other threads to terminate */
-
-static int main_thread_exiting;
-
-/* Counter used to generate unique thread identifier.
-   Thread identifier is pthread_threads_counter + segment. */
-
-static pthread_t pthread_threads_counter;
-
-/* Forward declarations */
-
-static int pthread_handle_create(pthread_t *thread, const pthread_attr_t *attr,
-                                 void * (*start_routine)(void *), void *arg,
-                                 sigset_t *mask, int father_pid,
-				 int report_events,
-				 td_thr_events_t *event_maskp);
-static void pthread_handle_free(pthread_t th_id);
-static void pthread_handle_exit(pthread_descr issuing_thread, int exitcode)
-     __attribute__ ((noreturn));
-static void pthread_reap_children(void);
-static void pthread_kill_all_threads(int sig, int main_thread_also);
-static void pthread_for_each_thread(void *arg, 
-    void (*fn)(void *, pthread_descr));
-
-/* The server thread managing requests for thread creation and termination */
-
-int
-__attribute__ ((noreturn))
-__pthread_manager(void *arg)
-{
-  int reqfd = (int) (long int) arg;
-  struct pollfd ufd;
-  sigset_t manager_mask;
-  int n;
-  struct pthread_request request;
-
-  /* If we have special thread_self processing, initialize it.  */
-#ifdef INIT_THREAD_SELF
-  INIT_THREAD_SELF(&__pthread_manager_thread, 1);
-#endif
-  /* Set the error variable.  */
-  __pthread_manager_thread.p_reentp = &__pthread_manager_thread.p_reent;
-  __pthread_manager_thread.p_h_errnop = &__pthread_manager_thread.p_h_errno;
-  /* Block all signals except __pthread_sig_cancel and SIGTRAP */
-  sigfillset(&manager_mask);
-  sigdelset(&manager_mask, __pthread_sig_cancel); /* for thread termination */
-  sigdelset(&manager_mask, SIGTRAP);            /* for debugging purposes */
-  if (__pthread_threads_debug && __pthread_sig_debug > 0)
-    sigdelset(&manager_mask, __pthread_sig_debug);
-  sigprocmask(SIG_SETMASK, &manager_mask, NULL);
-  /* Raise our priority to match that of main thread */
-  __pthread_manager_adjust_prio(__pthread_main_thread->p_priority);
-  /* Synchronize debugging of the thread manager */
-  n = TEMP_FAILURE_RETRY(__libc_read(reqfd, (char *)&request,
-				     sizeof(request)));
-  ASSERT(n == sizeof(request) && request.req_kind == REQ_DEBUG);
-  ufd.fd = reqfd;
-  ufd.events = POLLIN;
-  /* Enter server loop */
-  while(1) {
-    n = __poll(&ufd, 1, 2000);
-
-    /* Check for termination of the main thread */
-    if (getppid() == 1) {
-      pthread_kill_all_threads(SIGKILL, 0);
-      _exit(0);
-    }
-    /* Check for dead children */
-    if (terminated_children) {
-      terminated_children = 0;
-      pthread_reap_children();
-    }
-    /* Read and execute request */
-    if (n == 1 && (ufd.revents & POLLIN)) {
-      n = TEMP_FAILURE_RETRY(__libc_read(reqfd, (char *)&request,
-					 sizeof(request)));
-#ifdef DEBUG
-      if (n < 0) {
-	char d[64];
-	write(STDERR_FILENO, d, snprintf(d, sizeof(d), "*** read err %m\n"));
-      } else if (n != sizeof(request)) {
-	write(STDERR_FILENO, "*** short read in manager\n", 26);
-      }
-#endif
-
-      switch(request.req_kind) {
-      case REQ_CREATE:
-        request.req_thread->p_retcode =
-          pthread_handle_create((pthread_t *) &request.req_thread->p_retval,
-                                request.req_args.create.attr,
-                                request.req_args.create.fn,
-                                request.req_args.create.arg,
-                                &request.req_args.create.mask,
-                                request.req_thread->p_pid,
-				request.req_thread->p_report_events,
-				&request.req_thread->p_eventbuf.eventmask);
-        restart(request.req_thread);
-        break;
-      case REQ_FREE:
-	pthread_handle_free(request.req_args.free.thread_id);
-        break;
-      case REQ_PROCESS_EXIT:
-        pthread_handle_exit(request.req_thread,
-                            request.req_args.exit.code);
-	/* NOTREACHED */
-        break;
-      case REQ_MAIN_THREAD_EXIT:
-        main_thread_exiting = 1;
-	/* Reap children in case all other threads died and the signal handler
-	   went off before we set main_thread_exiting to 1, and therefore did
-	   not do REQ_KICK. */
-	pthread_reap_children();
-
-        if (__pthread_main_thread->p_nextlive == __pthread_main_thread) {
-          restart(__pthread_main_thread);
-	  /* The main thread will now call exit() which will trigger an
-	     __on_exit handler, which in turn will send REQ_PROCESS_EXIT
-	     to the thread manager. In case you are wondering how the
-	     manager terminates from its loop here. */
-	}
-        break;
-      case REQ_POST:
-        __new_sem_post(request.req_args.post);
-        break;
-      case REQ_DEBUG:
-	/* Make gdb aware of new thread and gdb will restart the
-	   new thread when it is ready to handle the new thread. */
-	if (__pthread_threads_debug && __pthread_sig_debug > 0)
-	  raise(__pthread_sig_debug);
-        break;
-      case REQ_KICK:
-	/* This is just a prod to get the manager to reap some
-	   threads right away, avoiding a potential delay at shutdown. */
-	break;
-      case REQ_FOR_EACH_THREAD:
-	pthread_for_each_thread(request.req_args.for_each.arg,
-	                        request.req_args.for_each.fn);
-	restart(request.req_thread);
-	break;
-      }
-    }
-  }
-}
-
-int __pthread_manager_event(void *arg)
-{
-  /* If we have special thread_self processing, initialize it.  */
-#ifdef INIT_THREAD_SELF
-  INIT_THREAD_SELF(&__pthread_manager_thread, 1);
-#endif
-
-  /* Get the lock the manager will free once all is correctly set up.  */
-  __pthread_lock (THREAD_GETMEM((&__pthread_manager_thread), p_lock), NULL);
-  /* Free it immediately.  */
-  __pthread_unlock (THREAD_GETMEM((&__pthread_manager_thread), p_lock));
-
-  return __pthread_manager(arg);
-}
-
-/* Process creation */
-
-static int
-__attribute__ ((noreturn))
-pthread_start_thread(void *arg)
-{
-  pthread_descr self = (pthread_descr) arg;
-  struct pthread_request request;
-  void * outcome;
-#if HP_TIMING_AVAIL
-  hp_timing_t tmpclock;
-#endif
-  /* Initialize special thread_self processing, if any.  */
-#ifdef INIT_THREAD_SELF
-  INIT_THREAD_SELF(self, self->p_nr);
-#endif
-#if HP_TIMING_AVAIL
-  HP_TIMING_NOW (tmpclock);
-  THREAD_SETMEM (self, p_cpuclock_offset, tmpclock);
-#endif
-  /* Make sure our pid field is initialized, just in case we get there
-     before our father has initialized it. */
-  THREAD_SETMEM(self, p_pid, __getpid());
-  /* Initial signal mask is that of the creating thread. (Otherwise,
-     we'd just inherit the mask of the thread manager.) */
-  sigprocmask(SIG_SETMASK, &self->p_start_args.mask, NULL);
-  /* Set the scheduling policy and priority for the new thread, if needed */
-  if (THREAD_GETMEM(self, p_start_args.schedpolicy) >= 0)
-    /* Explicit scheduling attributes were provided: apply them */
-    __sched_setscheduler(THREAD_GETMEM(self, p_pid),
-			 THREAD_GETMEM(self, p_start_args.schedpolicy),
-                         &self->p_start_args.schedparam);
-  else if (__pthread_manager_thread.p_priority > 0)
-    /* Default scheduling required, but thread manager runs in realtime
-       scheduling: switch new thread to SCHED_OTHER policy */
-    {
-      struct sched_param default_params;
-      default_params.sched_priority = 0;
-      __sched_setscheduler(THREAD_GETMEM(self, p_pid),
-                           SCHED_OTHER, &default_params);
-    }
-  /* Make gdb aware of new thread */
-  if (__pthread_threads_debug && __pthread_sig_debug > 0) {
-    request.req_thread = self;
-    request.req_kind = REQ_DEBUG;
-    TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request,
-				    (char *) &request, sizeof(request)));
-    suspend(self);
-  }
-  /* Run the thread code */
-  outcome = self->p_start_args.start_routine(THREAD_GETMEM(self,
-							   p_start_args.arg));
-  /* Exit with the given return value */
-  __pthread_do_exit(outcome, CURRENT_STACK_FRAME);
-}
-
-static int
-__attribute__ ((noreturn))
-pthread_start_thread_event(void *arg)
-{
-  pthread_descr self = (pthread_descr) arg;
-
-#ifdef INIT_THREAD_SELF
-  INIT_THREAD_SELF(self, self->p_nr);
-#endif
-  /* Make sure our pid field is initialized, just in case we get there
-     before our father has initialized it. */
-  THREAD_SETMEM(self, p_pid, __getpid());
-  /* Get the lock the manager will free once all is correctly set up.  */
-  __pthread_lock (THREAD_GETMEM(self, p_lock), NULL);
-  /* Free it immediately.  */
-  __pthread_unlock (THREAD_GETMEM(self, p_lock));
-
-  /* Continue with the real function.  */
-  pthread_start_thread (arg);
-}
-
-static int pthread_allocate_stack(const pthread_attr_t *attr,
-                                  pthread_descr default_new_thread,
-                                  int pagesize,
-                                  pthread_descr * out_new_thread,
-                                  char ** out_new_thread_bottom,
-                                  char ** out_guardaddr,
-                                  size_t * out_guardsize)
-{
-  pthread_descr new_thread;
-  char * new_thread_bottom;
-  char * guardaddr;
-  size_t stacksize, guardsize;
-
-  if (attr != NULL && attr->__stackaddr_set)
-    {
-#ifdef _STACK_GROWS_UP
-      /* The user provided a stack. */
-      new_thread = (pthread_descr) attr->__stackaddr;
-      new_thread_bottom = (char *) (new_thread + 1);
-      guardaddr = attr->__stackaddr + attr->__stacksize;
-      guardsize = 0;
-#else
-      /* The user provided a stack.  For now we interpret the supplied
-	 address as 1 + the highest addr. in the stack segment.  If a
-	 separate register stack is needed, we place it at the low end
-	 of the segment, relying on the associated stacksize to
-	 determine the low end of the segment.  This differs from many
-	 (but not all) other pthreads implementations.  The intent is
-	 that on machines with a single stack growing toward higher
-	 addresses, stackaddr would be the lowest address in the stack
-	 segment, so that it is consistently close to the initial sp
-	 value. */
-      new_thread =
-        (pthread_descr) ((long)(attr->__stackaddr) & -sizeof(void *)) - 1;
-      new_thread_bottom = (char *) attr->__stackaddr - attr->__stacksize;
-      guardaddr = new_thread_bottom;
-      guardsize = 0;
-#endif
-#ifndef THREAD_SELF
-      __pthread_nonstandard_stacks = 1;
-#endif
-      /* Clear the thread data structure.  */
-      memset (new_thread, '\0', sizeof (*new_thread));
-    }
-  else
-    {
-#ifdef NEED_SEPARATE_REGISTER_STACK
-      size_t granularity = 2 * pagesize;
-      /* Try to make stacksize/2 a multiple of pagesize */
-#else
-      size_t granularity = pagesize;
-#endif
-      void *map_addr;
-
-      /* Allocate space for stack and thread descriptor at default address */
-#if FLOATING_STACKS
-      if (attr != NULL)
-	{
-	  guardsize = page_roundup (attr->__guardsize, granularity);
-	  stacksize = __pthread_max_stacksize - guardsize;
-	  stacksize = MIN (stacksize,
-			   page_roundup (attr->__stacksize, granularity));
-	}
-      else
-	{
-	  guardsize = granularity;
-	  stacksize = __pthread_max_stacksize - guardsize;
-	}
-
-      map_addr = mmap(NULL, stacksize + guardsize,
-		      PROT_READ | PROT_WRITE | PROT_EXEC,
-		      MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-      if (map_addr == MAP_FAILED)
-        /* No more memory available.  */
-        return -1;
-
-# ifdef NEED_SEPARATE_REGISTER_STACK
-      guardaddr = map_addr + stacksize / 2;
-      if (guardsize > 0)
-	mprotect (guardaddr, guardsize, PROT_NONE);
-
-      new_thread_bottom = (char *) map_addr;
-      new_thread = ((pthread_descr) (new_thread_bottom + stacksize
-				     + guardsize)) - 1;
-# elif _STACK_GROWS_DOWN
-      guardaddr = map_addr;
-      if (guardsize > 0)
-	mprotect (guardaddr, guardsize, PROT_NONE);
-
-      new_thread_bottom = (char *) map_addr + guardsize;
-      new_thread = ((pthread_descr) (new_thread_bottom + stacksize)) - 1;
-# elif _STACK_GROWS_UP
-      guardaddr = map_addr + stacksize;
-      if (guardsize > 0)
-	mprotect (guardaddr, guardsize, PROT_NONE);
-
-      new_thread = (pthread_descr) map_addr;
-      new_thread_bottom = (char *) (new_thread + 1);
-# else
-#  error You must define a stack direction
-# endif /* Stack direction */
-#else /* !FLOATING_STACKS */
-      void *res_addr;
-
-      if (attr != NULL)
-	{
-	  guardsize = page_roundup (attr->__guardsize, granularity);
-	  stacksize = STACK_SIZE - guardsize;
-	  stacksize = MIN (stacksize,
-			   page_roundup (attr->__stacksize, granularity));
-	}
-      else
-	{
-	  guardsize = granularity;
-	  stacksize = STACK_SIZE - granularity;
-	}
-
-# ifdef NEED_SEPARATE_REGISTER_STACK
-      new_thread = default_new_thread;
-      new_thread_bottom = (char *) (new_thread + 1) - stacksize - guardsize;
-      /* Includes guard area, unlike the normal case.  Use the bottom
-       end of the segment as backing store for the register stack.
-       Needed on IA64.  In this case, we also map the entire stack at
-       once.  According to David Mosberger, that's cheaper.  It also
-       avoids the risk of intermittent failures due to other mappings
-       in the same region.  The cost is that we might be able to map
-       slightly fewer stacks.  */
-
-      /* First the main stack: */
-      map_addr = (caddr_t)((char *)(new_thread + 1) - stacksize / 2);
-      res_addr = mmap(map_addr, stacksize / 2,
-		      PROT_READ | PROT_WRITE | PROT_EXEC,
-		      MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-      if (res_addr != map_addr)
-	{
-	  /* Bad luck, this segment is already mapped. */
-	  if (res_addr != MAP_FAILED)
-	    munmap(res_addr, stacksize / 2);
-	  return -1;
-	}
-      /* Then the register stack:	*/
-      map_addr = (caddr_t)new_thread_bottom;
-      res_addr = mmap(map_addr, stacksize/2,
-		      PROT_READ | PROT_WRITE | PROT_EXEC,
-		      MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-      if (res_addr != map_addr)
-	{
-	  if (res_addr != MAP_FAILED)
-	    munmap(res_addr, stacksize / 2);
-	  munmap((caddr_t)((char *)(new_thread + 1) - stacksize/2),
-		 stacksize/2);
-	  return -1;
-	}
-
-      guardaddr = new_thread_bottom + stacksize/2;
-      /* We leave the guard area in the middle unmapped.	*/
-# else  /* !NEED_SEPARATE_REGISTER_STACK */
-#  ifdef _STACK_GROWS_DOWN
-      new_thread = default_new_thread;
-      new_thread_bottom = (char *) (new_thread + 1) - stacksize;
-      map_addr = new_thread_bottom - guardsize;
-      res_addr = mmap(map_addr, stacksize + guardsize,
-		      PROT_READ | PROT_WRITE | PROT_EXEC,
-		      MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-      if (res_addr != map_addr)
-	{
-	  /* Bad luck, this segment is already mapped. */
-	  if (res_addr != MAP_FAILED)
-	    munmap (res_addr, stacksize + guardsize);
-	  return -1;
-	}
-
-      /* We manage to get a stack.  Protect the guard area pages if
-	 necessary.  */
-      guardaddr = map_addr;
-      if (guardsize > 0)
-	mprotect (guardaddr, guardsize, PROT_NONE);
-#  else
-      /* The thread description goes at the bottom of this area, and
-       * the stack starts directly above it.
-       */
-      new_thread = (pthread_descr)((unsigned long)default_new_thread &~ (STACK_SIZE - 1));
-      map_addr = mmap(new_thread, stacksize + guardsize,
-		      PROT_READ | PROT_WRITE | PROT_EXEC,
-		      MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-      if (map_addr == MAP_FAILED)
-	  return -1;
-
-      new_thread_bottom = map_addr + sizeof(*new_thread);
-      guardaddr = map_addr + stacksize;
-      if (guardsize > 0)
-	  mprotect (guardaddr, guardsize, PROT_NONE);
-
-#  endif /* stack direction */
-# endif  /* !NEED_SEPARATE_REGISTER_STACK */
-#endif   /* !FLOATING_STACKS */
-    }
-  *out_new_thread = new_thread;
-  *out_new_thread_bottom = new_thread_bottom;
-  *out_guardaddr = guardaddr;
-  *out_guardsize = guardsize;
-  return 0;
-}
-
-static int pthread_handle_create(pthread_t *thread, const pthread_attr_t *attr,
-				 void * (*start_routine)(void *), void *arg,
-				 sigset_t * mask, int father_pid,
-				 int report_events,
-				 td_thr_events_t *event_maskp)
-{
-  size_t sseg;
-  int pid;
-  pthread_descr new_thread;
-  char * new_thread_bottom;
-  pthread_t new_thread_id;
-  char *guardaddr = NULL;
-  size_t guardsize = 0;
-  int pagesize = __getpagesize();
-
-  /* First check whether we have to change the policy and if yes, whether
-     we can  do this.  Normally this should be done by examining the
-     return value of the __sched_setscheduler call in pthread_start_thread
-     but this is hard to implement.  FIXME  */
-  if (attr != NULL && attr->__schedpolicy != SCHED_OTHER && geteuid () != 0)
-    return EPERM;
-  /* Find a free segment for the thread, and allocate a stack if needed */
-  for (sseg = 2; ; sseg++)
-    {
-      if (sseg >= PTHREAD_THREADS_MAX)
-	return EAGAIN;
-      if (__pthread_handles[sseg].h_descr != NULL)
-	continue;
-      if (pthread_allocate_stack(attr, thread_segment(sseg),
-				 pagesize,
-                                 &new_thread, &new_thread_bottom,
-                                 &guardaddr, &guardsize) == 0)
-        break;
-    }
-  __pthread_handles_num++;
-  /* Allocate new thread identifier */
-  pthread_threads_counter += PTHREAD_THREADS_MAX;
-  new_thread_id = sseg + pthread_threads_counter;
-  /* Initialize the thread descriptor.  Elements which have to be
-     initialized to zero already have this value.  */
-  new_thread->p_tid = new_thread_id;
-  new_thread->p_lock = &(__pthread_handles[sseg].h_lock);
-  new_thread->p_cancelstate = PTHREAD_CANCEL_ENABLE;
-  new_thread->p_canceltype = PTHREAD_CANCEL_DEFERRED;
-  new_thread->p_reentp = &new_thread->p_reent;
-  _REENT_INIT_PTR(new_thread->p_reentp);
-  new_thread->p_h_errnop = &new_thread->p_h_errno;
-  new_thread->p_resp = &new_thread->p_res;
-  new_thread->p_guardaddr = guardaddr;
-  new_thread->p_guardsize = guardsize;
-  new_thread->p_header.data.self = new_thread;
-  new_thread->p_nr = sseg;
-  new_thread->p_inheritsched = attr ? attr->__inheritsched : 0;
-  /* Initialize the thread handle */
-  __pthread_init_lock(&__pthread_handles[sseg].h_lock);
-  __pthread_handles[sseg].h_descr = new_thread;
-  __pthread_handles[sseg].h_bottom = new_thread_bottom;
-  /* Determine scheduling parameters for the thread */
-  new_thread->p_start_args.schedpolicy = -1;
-  if (attr != NULL) {
-    new_thread->p_detached = attr->__detachstate;
-    new_thread->p_userstack = attr->__stackaddr_set;
-
-    switch(attr->__inheritsched) {
-    case PTHREAD_EXPLICIT_SCHED:
-      new_thread->p_start_args.schedpolicy = attr->__schedpolicy;
-      memcpy (&new_thread->p_start_args.schedparam, &attr->__schedparam,
-	      sizeof (struct sched_param));
-      break;
-    case PTHREAD_INHERIT_SCHED:
-      new_thread->p_start_args.schedpolicy = __sched_getscheduler(father_pid);
-      __sched_getparam(father_pid, &new_thread->p_start_args.schedparam);
-      break;
-    }
-    new_thread->p_priority =
-      new_thread->p_start_args.schedparam.sched_priority;
-  }
-  /* Finish setting up arguments to pthread_start_thread */
-  new_thread->p_start_args.start_routine = start_routine;
-  new_thread->p_start_args.arg = arg;
-  new_thread->p_start_args.mask = *mask;
-  /* Make the new thread ID available already now.  If any of the later
-     functions fail we return an error value and the caller must not use
-     the stored thread ID.  */
-  *thread = new_thread_id;
-  /* Raise priority of thread manager if needed */
-  __pthread_manager_adjust_prio(new_thread->p_priority);
-  /* Do the cloning.  We have to use two different functions depending
-     on whether we are debugging or not.  */
-  pid = 0;	/* Note that the thread never can have PID zero.  */
-  if (report_events)
-    {
-      /* See whether the TD_CREATE event bit is set in any of the
-         masks.  */
-      int idx = __td_eventword (TD_CREATE);
-      uint32_t mask = __td_eventmask (TD_CREATE);
-
-      if ((mask & (__pthread_threads_events.event_bits[idx]
-		   | event_maskp->event_bits[idx])) != 0)
-	{
-	  /* Lock the mutex the child will use now so that it will stop.  */
-	  __pthread_lock(new_thread->p_lock, NULL);
-
-	  /* We have to report this event.  */
-#ifdef NEED_SEPARATE_REGISTER_STACK
-	  /* Perhaps this version should be used on all platforms. But
-	   this requires that __clone2 be uniformly supported
-	   everywhere.
-
-	   And there is some argument for changing the __clone2
-	   interface to pass sp and bsp instead, making it more IA64
-	   specific, but allowing stacks to grow outward from each
-	   other, to get less paging and fewer mmaps.  */
-	  pid = __clone2(pthread_start_thread_event,
-  		 (void **)new_thread_bottom,
-			 (char *)new_thread - new_thread_bottom,
-			 CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-			 __pthread_sig_cancel, new_thread);
-#elif _STACK_GROWS_UP
-	  pid = __clone(pthread_start_thread_event, (void **) new_thread_bottom,
-			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-			__pthread_sig_cancel, new_thread);
-#else
-	  pid = __clone(pthread_start_thread_event, (void **) new_thread,
-			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-			__pthread_sig_cancel, new_thread);
-#endif
-	  if (pid != -1)
-	    {
-	      /* Now fill in the information about the new thread in
-		 the newly created thread's data structure.  We cannot let
-		 the new thread do this since we don't know whether it was
-		 already scheduled when we send the event.  */
-	      new_thread->p_eventbuf.eventdata = new_thread;
-	      new_thread->p_eventbuf.eventnum = TD_CREATE;
-	      __pthread_last_event = new_thread;
-
-	      /* We have to set the PID here since the callback function
-		 in the debug library will need it and we cannot guarantee
-		 the child got scheduled before the debugger.  */
-	      new_thread->p_pid = pid;
-
-	      /* Now call the function which signals the event.  */
-	      __linuxthreads_create_event ();
-
-	      /* Now restart the thread.  */
-	      __pthread_unlock(new_thread->p_lock);
-	    }
-	}
-    }
-  if (pid == 0)
-    {
-#ifdef NEED_SEPARATE_REGISTER_STACK
-      pid = __clone2(pthread_start_thread,
-		     (void **)new_thread_bottom,
-                     (char *)new_thread - new_thread_bottom,
-		     CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-		     __pthread_sig_cancel, new_thread);
-#elif _STACK_GROWS_UP
-      pid = __clone(pthread_start_thread, (void **) new_thread_bottom,
-		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-		    __pthread_sig_cancel, new_thread);
-#else
-      pid = __clone(pthread_start_thread, (void **) new_thread,
-		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
-		    __pthread_sig_cancel, new_thread);
-#endif /* !NEED_SEPARATE_REGISTER_STACK */
-    }
-  /* Check if cloning succeeded */
-  if (pid == -1) {
-    /* Free the stack if we allocated it */
-    if (attr == NULL || !attr->__stackaddr_set)
-      {
-#ifdef NEED_SEPARATE_REGISTER_STACK
-	size_t stacksize = ((char *)(new_thread->p_guardaddr)
-			    - new_thread_bottom);
-	munmap((caddr_t)new_thread_bottom,
-	       2 * stacksize + new_thread->p_guardsize);
-#elif _STACK_GROWS_UP
-	size_t stacksize = guardaddr - (char *)new_thread;
-	munmap(new_thread, stacksize + guardsize);
-#else
-	size_t stacksize = (char *)(new_thread+1) - new_thread_bottom;
-	munmap(new_thread_bottom - guardsize, guardsize + stacksize);
-#endif
-      }
-    __pthread_handles[sseg].h_descr = NULL;
-    __pthread_handles[sseg].h_bottom = NULL;
-    __pthread_handles_num--;
-    return errno;
-  }
-  /* Insert new thread in doubly linked list of active threads */
-  new_thread->p_prevlive = __pthread_main_thread;
-  new_thread->p_nextlive = __pthread_main_thread->p_nextlive;
-  __pthread_main_thread->p_nextlive->p_prevlive = new_thread;
-  __pthread_main_thread->p_nextlive = new_thread;
-  /* Set pid field of the new thread, in case we get there before the
-     child starts. */
-  new_thread->p_pid = pid;
-  return 0;
-}
-
-
-/* Try to free the resources of a thread when requested by pthread_join
-   or pthread_detach on a terminated thread. */
-
-static void pthread_free(pthread_descr th)
-{
-  pthread_handle handle;
-  pthread_readlock_info *iter, *next;
-
-  ASSERT(th->p_exited);
-  /* Make the handle invalid */
-  handle =  thread_handle(th->p_tid);
-  __pthread_lock(&handle->h_lock, NULL);
-  handle->h_descr = NULL;
-  handle->h_bottom = (char *)(-1L);
-  __pthread_unlock(&handle->h_lock);
-#ifdef FREE_THREAD
-  FREE_THREAD(th, th->p_nr);
-#endif
-  /* One fewer threads in __pthread_handles */
-  __pthread_handles_num--;
-
-  /* Destroy read lock list, and list of free read lock structures.
-     If the former is not empty, it means the thread exited while
-     holding read locks! */
-
-  for (iter = th->p_readlock_list; iter != NULL; iter = next)
-    {
-      next = iter->pr_next;
-      free(iter);
-    }
-
-  for (iter = th->p_readlock_free; iter != NULL; iter = next)
-    {
-      next = iter->pr_next;
-      free(iter);
-    }
-
-  /* If initial thread, nothing to free */
-  if (!th->p_userstack)
-    {
-      size_t guardsize = th->p_guardsize;
-      /* Free the stack and thread descriptor area */
-      char *guardaddr = th->p_guardaddr;
-#ifdef _STACK_GROWS_UP
-      size_t stacksize = guardaddr - (char *)th;
-      guardaddr = (char *)th;
-#else
-      /* Guardaddr is always set, even if guardsize is 0.  This allows
-	 us to compute everything else.  */
-      size_t stacksize = (char *)(th+1) - guardaddr - guardsize;
-#ifdef NEED_SEPARATE_REGISTER_STACK
-      /* Take account of the register stack, which is below guardaddr.  */
-      guardaddr -= stacksize;
-      stacksize *= 2;
-#endif
-#endif
-      /* Unmap the stack.  */
-      munmap(guardaddr, stacksize + guardsize);
-    }
-}
-
-/* Handle threads that have exited */
-
-static void pthread_exited(pid_t pid)
-{
-  pthread_descr th;
-  int detached;
-  /* Find thread with that pid */
-  for (th = __pthread_main_thread->p_nextlive;
-       th != __pthread_main_thread;
-       th = th->p_nextlive) {
-    if (th->p_pid == pid) {
-      /* Remove thread from list of active threads */
-      th->p_nextlive->p_prevlive = th->p_prevlive;
-      th->p_prevlive->p_nextlive = th->p_nextlive;
-      /* Mark thread as exited, and if detached, free its resources */
-      __pthread_lock(th->p_lock, NULL);
-      th->p_exited = 1;
-      /* If we have to signal this event do it now.  */
-      if (th->p_report_events)
-	{
-	  /* See whether TD_REAP is in any of the mask.  */
-	  int idx = __td_eventword (TD_REAP);
-	  uint32_t mask = __td_eventmask (TD_REAP);
-
-	  if ((mask & (__pthread_threads_events.event_bits[idx]
-		       | th->p_eventbuf.eventmask.event_bits[idx])) != 0)
-	    {
-	      /* Yep, we have to signal the reapage.  */
-	      th->p_eventbuf.eventnum = TD_REAP;
-	      th->p_eventbuf.eventdata = th;
-	      __pthread_last_event = th;
-
-	      /* Now call the function to signal the event.  */
-	      __linuxthreads_reap_event();
-	    }
-	}
-      detached = th->p_detached;
-      __pthread_unlock(th->p_lock);
-      if (detached)
-	pthread_free(th);
-      break;
-    }
-  }
-  /* If all threads have exited and the main thread is pending on a
-     pthread_exit, wake up the main thread and terminate ourselves. */
-  if (main_thread_exiting &&
-      __pthread_main_thread->p_nextlive == __pthread_main_thread) {
-    restart(__pthread_main_thread);
-    /* Same logic as REQ_MAIN_THREAD_EXIT. */
-  }
-}
-
-static void pthread_reap_children(void)
-{
-  pid_t pid;
-  int status;
-
-  while ((pid = __libc___waitpid(-1, &status, WNOHANG | __WCLONE)) > 0) {
-    pthread_exited(pid);
-    if (WIFSIGNALED(status)) {
-      /* If a thread died due to a signal, send the same signal to
-         all other threads, including the main thread. */
-      pthread_kill_all_threads(WTERMSIG(status), 1);
-      _exit(0);
-    }
-  }
-}
-
-/* Try to free the resources of a thread when requested by pthread_join
-   or pthread_detach on a terminated thread. */
-
-static void pthread_handle_free(pthread_t th_id)
-{
-  pthread_handle handle = thread_handle(th_id);
-  pthread_descr th;
-
-  __pthread_lock(&handle->h_lock, NULL);
-  if (nonexisting_handle(handle, th_id)) {
-    /* pthread_reap_children has deallocated the thread already,
-       nothing needs to be done */
-    __pthread_unlock(&handle->h_lock);
-    return;
-  }
-  th = handle->h_descr;
-  if (th->p_exited) {
-    __pthread_unlock(&handle->h_lock);
-    pthread_free(th);
-  } else {
-    /* The Unix process of the thread is still running.
-       Mark the thread as detached so that the thread manager will
-       deallocate its resources when the Unix process exits. */
-    th->p_detached = 1;
-    __pthread_unlock(&handle->h_lock);
-  }
-}
-
-/* Send a signal to all running threads */
-
-static void pthread_kill_all_threads(int sig, int main_thread_also)
-{
-  pthread_descr th;
-  for (th = __pthread_main_thread->p_nextlive;
-       th != __pthread_main_thread;
-       th = th->p_nextlive) {
-    kill(th->p_pid, sig);
-  }
-  if (main_thread_also) {
-    kill(__pthread_main_thread->p_pid, sig);
-  }
-}
-
-static void pthread_for_each_thread(void *arg, 
-    void (*fn)(void *, pthread_descr))
-{
-  pthread_descr th;
-
-  for (th = __pthread_main_thread->p_nextlive;
-       th != __pthread_main_thread;
-       th = th->p_nextlive) {
-    fn(arg, th);
-  }
-
-  fn(arg, __pthread_main_thread);
-}
-
-/* Process-wide exit() */
-
-static void pthread_handle_exit(pthread_descr issuing_thread, int exitcode)
-{
-  pthread_descr th;
-  __pthread_exit_requested = 1;
-  __pthread_exit_code = exitcode;
-  /* A forced asynchronous cancellation follows.  Make sure we won't
-     get stuck later in the main thread with a system lock being held
-     by one of the cancelled threads.  Ideally one would use the same
-     code as in pthread_atfork(), but we can't distinguish system and
-     user handlers there.  */
-  __flockfilelist();
-  /* Send the CANCEL signal to all running threads, including the main
-     thread, but excluding the thread from which the exit request originated
-     (that thread must complete the exit, e.g. calling atexit functions
-     and flushing stdio buffers). */
-  for (th = issuing_thread->p_nextlive;
-       th != issuing_thread;
-       th = th->p_nextlive) {
-    kill(th->p_pid, __pthread_sig_cancel);
-  }
-  /* Now, wait for all these threads, so that they don't become zombies
-     and their times are properly added to the thread manager's times. */
-  for (th = issuing_thread->p_nextlive;
-       th != issuing_thread;
-       th = th->p_nextlive) {
-    __waitpid(th->p_pid, NULL, __WCLONE);
-  }
-  __fresetlockfiles();
-  restart(issuing_thread);
-  _exit(0);
-}
-
-/* Handler for __pthread_sig_cancel in thread manager thread */
-
-void __pthread_manager_sighandler(int sig)
-{
-  int kick_manager = terminated_children == 0 && main_thread_exiting;
-  terminated_children = 1;
-
-  /* If the main thread is terminating, kick the thread manager loop
-     each time some threads terminate. This eliminates a two second
-     shutdown delay caused by the thread manager sleeping in the
-     call to __poll(). Instead, the thread manager is kicked into
-     action, reaps the outstanding threads and resumes the main thread
-     so that it can complete the shutdown. */
-
-  if (kick_manager) {
-    struct pthread_request request;
-    request.req_thread = 0;
-    request.req_kind = REQ_KICK;
-    TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request,
-				    (char *) &request, sizeof(request)));
-  }
-}
-
-/* Adjust priority of thread manager so that it always run at a priority
-   higher than all threads */
-
-void __pthread_manager_adjust_prio(int thread_prio)
-{
-  struct sched_param param;
-
-  if (thread_prio <= __pthread_manager_thread.p_priority) return;
-  param.sched_priority =
-    thread_prio < __sched_get_priority_max(SCHED_FIFO)
-    ? thread_prio + 1 : thread_prio;
-  __sched_setscheduler(__pthread_manager_thread.p_pid, SCHED_FIFO, &param);
-  __pthread_manager_thread.p_priority = thread_prio;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/mq_notify.c b/newlib/libc/sys/linux/linuxthreads/mq_notify.c
deleted file mode 100644
index 46492e4..0000000
--- a/newlib/libc/sys/linux/linuxthreads/mq_notify.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Copyright 2002, Red Hat Inc. */
-
-#include <mqueue.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <string.h>
-
-#include "internals.h"
-#include <sys/lock.h>
-
-#include "mqlocal.h"
-
-static void *mq_notify_process (void *);
-
-void
-__cleanup_mq_notify (struct libc_mq *info)
-{
-  struct sembuf sb4 = {4, 1, 0};
-  /* kill notification thread and allow other processes to set a notification */
-  pthread_cancel ((pthread_t)info->th);
-  semop (info->semid, &sb4, 1);
-}
-  
-static void *
-mq_notify_process (void *arg)
-{
-  struct libc_mq *info = (struct libc_mq *)arg;
-  struct sembuf sb3[2] = {{3, 0, 0}, {5, 0, 0}};
-  struct sembuf sb4 = {4, 1, 0};
-  int rc;
-
-  /* wait until queue is empty */
-  while (!(rc = semop (info->semid, sb3, 1)) && errno == EINTR)
-    /* empty */ ;
-
-  if (!rc)
-    {
-      /* now wait until there are 0 readers and the queue has something in it */
-      sb3[0].sem_op = -1;
-      while (!(rc = semop (info->semid, sb3, 2)) && errno == EINTR)
-	/* empty */ ;
-      /* restore value since we have not actually performed a read */
-      sb3[0].sem_op = 1;
-      semop (info->semid, sb3, 1);
-      /* perform desired notification - either run function in this thread or pass signal */
-      if (!rc)
-	{
-	  if (info->sigevent->sigev_notify == SIGEV_SIGNAL)
-	    raise (info->sigevent->sigev_signo);
-	  else if (info->sigevent->sigev_notify == SIGEV_THREAD)
-	    info->sigevent->sigev_notify_function (info->sigevent->sigev_value);
-	  /* allow other processes to now mq_notify */
-	  semop (info->semid, &sb4, 1);
-	}
-    }
-  pthread_exit (NULL);
-}
-
-int
-mq_notify (mqd_t msgid, const struct sigevent *notification)
-{
-  struct libc_mq *info;
-  struct sembuf sb4 = {4, -1, IPC_NOWAIT};
-  int rc;
-  pthread_attr_t *attr = NULL;
-
-  info = __find_mq (msgid);
-
-  if (info == NULL)
-    {
-      errno = EBADF;
-      return -1;
-    }
-
-  /* get notification lock */
-  rc = semop (info->semid, &sb4, 1);
-
-  if (rc == -1)
-    {
-      errno = EBUSY;
-      return -1;
-    }
-
-  /* to get the notification running we use a pthread - if the user has requested
-     an action in a pthread, we use the user's attributes when setting up the thread */
-  info->sigevent = (struct sigevent *)notification;
-  if (info->sigevent->sigev_notify == SIGEV_THREAD)
-    attr = (pthread_attr_t *)info->sigevent->sigev_notify_attributes;
-  rc = pthread_create ((pthread_t *)&info->th, attr, mq_notify_process, (void *)info);
-
-  if (rc != 0)
-    rc = -1;
-  else
-    info->cleanup_notify = &__cleanup_mq_notify;
-
-  return rc;
-}
-
-      
-
-
-
-
-
diff --git a/newlib/libc/sys/linux/linuxthreads/mutex.c b/newlib/libc/sys/linux/linuxthreads/mutex.c
deleted file mode 100644
index fb2e607..0000000
--- a/newlib/libc/sys/linux/linuxthreads/mutex.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Mutexes */
-
-#include <bits/libc-lock.h>
-#include <errno.h>
-#include <sched.h>
-#include <stddef.h>
-#include <limits.h>
-#include "pthread.h"
-#include "internals.h"
-#include "spinlock.h"
-#include "queue.h"
-#include "restart.h"
-
-int __pthread_mutex_init(pthread_mutex_t * mutex,
-                       const pthread_mutexattr_t * mutex_attr)
-{
-  __pthread_init_lock(&mutex->__m_lock);
-  mutex->__m_kind =
-    mutex_attr == NULL ? PTHREAD_MUTEX_TIMED_NP : mutex_attr->__mutexkind;
-  mutex->__m_count = 0;
-  mutex->__m_owner = NULL;
-  return 0;
-}
-strong_alias (__pthread_mutex_init, pthread_mutex_init)
-
-int __pthread_mutex_destroy(pthread_mutex_t * mutex)
-{
-  switch (mutex->__m_kind) {
-  case PTHREAD_MUTEX_ADAPTIVE_NP:
-  case PTHREAD_MUTEX_RECURSIVE_NP:
-    if ((mutex->__m_lock.__status & 1) != 0)
-      return EBUSY;
-    return 0;
-  case PTHREAD_MUTEX_ERRORCHECK_NP:
-  case PTHREAD_MUTEX_TIMED_NP:
-    if (mutex->__m_lock.__status != 0)
-      return EBUSY;
-    return 0;
-  default:
-    return EINVAL;
-  }
-}
-strong_alias (__pthread_mutex_destroy, pthread_mutex_destroy)
-
-int __pthread_mutex_trylock(pthread_mutex_t * mutex)
-{
-  pthread_descr self;
-  int retcode;
-
-  switch(mutex->__m_kind) {
-  case PTHREAD_MUTEX_ADAPTIVE_NP:
-    retcode = __pthread_trylock(&mutex->__m_lock);
-    return retcode;
-  case PTHREAD_MUTEX_RECURSIVE_NP:
-    self = thread_self();
-    if (mutex->__m_owner == self) {
-      mutex->__m_count++;
-      return 0;
-    }
-    retcode = __pthread_trylock(&mutex->__m_lock);
-    if (retcode == 0) {
-      mutex->__m_owner = self;
-      mutex->__m_count = 0;
-    }
-    return retcode;
-  case PTHREAD_MUTEX_ERRORCHECK_NP:
-    retcode = __pthread_alt_trylock(&mutex->__m_lock);
-    if (retcode == 0) {
-      mutex->__m_owner = thread_self();
-    }
-    return retcode;
-  case PTHREAD_MUTEX_TIMED_NP:
-    retcode = __pthread_alt_trylock(&mutex->__m_lock);
-    return retcode;
-  default:
-    return EINVAL;
-  }
-}
-strong_alias (__pthread_mutex_trylock, pthread_mutex_trylock)
-
-int __pthread_mutex_lock(pthread_mutex_t * mutex)
-{
-  pthread_descr self;
-
-  switch(mutex->__m_kind) {
-  case PTHREAD_MUTEX_ADAPTIVE_NP:
-    __pthread_lock(&mutex->__m_lock, NULL);
-    return 0;
-  case PTHREAD_MUTEX_RECURSIVE_NP:
-    self = thread_self();
-    if (mutex->__m_owner == self) {
-      mutex->__m_count++;
-      return 0;
-    }
-    __pthread_lock(&mutex->__m_lock, self);
-    mutex->__m_owner = self;
-    mutex->__m_count = 0;
-    return 0;
-  case PTHREAD_MUTEX_ERRORCHECK_NP:
-    self = thread_self();
-    if (mutex->__m_owner == self) return EDEADLK;
-    __pthread_alt_lock(&mutex->__m_lock, self);
-    mutex->__m_owner = self;
-    return 0;
-  case PTHREAD_MUTEX_TIMED_NP:
-    __pthread_alt_lock(&mutex->__m_lock, NULL);
-    return 0;
-  default:
-    return EINVAL;
-  }
-}
-strong_alias (__pthread_mutex_lock, pthread_mutex_lock)
-
-int __pthread_mutex_timedlock (pthread_mutex_t *mutex,
-			       const struct timespec *abstime)
-{
-  pthread_descr self;
-  int res;
-
-  if (__builtin_expect (abstime->tv_nsec, 0) < 0
-      || __builtin_expect (abstime->tv_nsec, 0) >= 1000000000)
-    return EINVAL;
-
-  switch(mutex->__m_kind) {
-  case PTHREAD_MUTEX_ADAPTIVE_NP:
-    __pthread_lock(&mutex->__m_lock, NULL);
-    return 0;
-  case PTHREAD_MUTEX_RECURSIVE_NP:
-    self = thread_self();
-    if (mutex->__m_owner == self) {
-      mutex->__m_count++;
-      return 0;
-    }
-    __pthread_lock(&mutex->__m_lock, self);
-    mutex->__m_owner = self;
-    mutex->__m_count = 0;
-    return 0;
-  case PTHREAD_MUTEX_ERRORCHECK_NP:
-    self = thread_self();
-    if (mutex->__m_owner == self) return EDEADLK;
-    res = __pthread_alt_timedlock(&mutex->__m_lock, self, abstime);
-    if (res != 0)
-      {
-	mutex->__m_owner = self;
-	return 0;
-      }
-    return ETIMEDOUT;
-  case PTHREAD_MUTEX_TIMED_NP:
-    /* Only this type supports timed out lock. */
-    return (__pthread_alt_timedlock(&mutex->__m_lock, NULL, abstime)
-	    ? 0 : ETIMEDOUT);
-  default:
-    return EINVAL;
-  }
-}
-strong_alias (__pthread_mutex_timedlock, pthread_mutex_timedlock)
-
-int __pthread_mutex_unlock(pthread_mutex_t * mutex)
-{
-  switch (mutex->__m_kind) {
-  case PTHREAD_MUTEX_ADAPTIVE_NP:
-    __pthread_unlock(&mutex->__m_lock);
-    return 0;
-  case PTHREAD_MUTEX_RECURSIVE_NP:
-    if (mutex->__m_owner != thread_self())
-      return EPERM;
-    if (mutex->__m_count > 0) {
-      mutex->__m_count--;
-      return 0;
-    }
-    mutex->__m_owner = NULL;
-    __pthread_unlock(&mutex->__m_lock);
-    return 0;
-  case PTHREAD_MUTEX_ERRORCHECK_NP:
-    if (mutex->__m_owner != thread_self() || mutex->__m_lock.__status == 0)
-      return EPERM;
-    mutex->__m_owner = NULL;
-    __pthread_alt_unlock(&mutex->__m_lock);
-    return 0;
-  case PTHREAD_MUTEX_TIMED_NP:
-    __pthread_alt_unlock(&mutex->__m_lock);
-    return 0;
-  default:
-    return EINVAL;
-  }
-}
-strong_alias (__pthread_mutex_unlock, pthread_mutex_unlock)
-
-int __pthread_mutexattr_init(pthread_mutexattr_t *attr)
-{
-  attr->__mutexkind = PTHREAD_MUTEX_TIMED_NP;
-  return 0;
-}
-strong_alias (__pthread_mutexattr_init, pthread_mutexattr_init)
-
-int __pthread_mutexattr_destroy(pthread_mutexattr_t *attr)
-{
-  return 0;
-}
-strong_alias (__pthread_mutexattr_destroy, pthread_mutexattr_destroy)
-
-int __pthread_mutexattr_settype(pthread_mutexattr_t *attr, int kind)
-{
-  if (kind != PTHREAD_MUTEX_ADAPTIVE_NP
-      && kind != PTHREAD_MUTEX_RECURSIVE_NP
-      && kind != PTHREAD_MUTEX_ERRORCHECK_NP
-      && kind != PTHREAD_MUTEX_TIMED_NP)
-    return EINVAL;
-  attr->__mutexkind = kind;
-  return 0;
-}
-weak_alias (__pthread_mutexattr_settype, pthread_mutexattr_settype)
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-strong_alias ( __pthread_mutexattr_settype, __pthread_mutexattr_setkind_np)
-weak_alias (__pthread_mutexattr_setkind_np, pthread_mutexattr_setkind_np)
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 2 */
-
-int __pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *kind)
-{
-  *kind = attr->__mutexkind;
-  return 0;
-}
-weak_alias (__pthread_mutexattr_gettype, pthread_mutexattr_gettype)
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-strong_alias (__pthread_mutexattr_gettype, __pthread_mutexattr_getkind_np)
-weak_alias (__pthread_mutexattr_getkind_np, pthread_mutexattr_getkind_np)
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 2 */
-
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3
-
-int __pthread_mutexattr_getpshared (const pthread_mutexattr_t *attr,
-				   int *pshared)
-{
-  *pshared = PTHREAD_PROCESS_PRIVATE;
-  return 0;
-}
-weak_alias (__pthread_mutexattr_getpshared, pthread_mutexattr_getpshared)
-
-int __pthread_mutexattr_setpshared (pthread_mutexattr_t *attr, int pshared)
-{
-  if (pshared != PTHREAD_PROCESS_PRIVATE && pshared != PTHREAD_PROCESS_SHARED)
-    return EINVAL;
-
-  /* For now it is not possible to shared a conditional variable.  */
-  if (pshared != PTHREAD_PROCESS_PRIVATE)
-    return ENOSYS;
-
-  return 0;
-}
-weak_alias (__pthread_mutexattr_setpshared, pthread_mutexattr_setpshared)
-
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 3 */
-
-/* Once-only execution */
-
-static pthread_mutex_t once_masterlock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t once_finished = PTHREAD_COND_INITIALIZER;
-static int fork_generation = 0;	/* Child process increments this after fork. */
-
-enum { NEVER = 0, IN_PROGRESS = 1, DONE = 2 };
-
-/* If a thread is canceled while calling the init_routine out of
-   pthread once, this handler will reset the once_control variable
-   to the NEVER state. */
-
-static void pthread_once_cancelhandler(void *arg)
-{
-    pthread_once_t *once_control = arg;
-
-    pthread_mutex_lock(&once_masterlock);
-    *once_control = NEVER;
-    pthread_mutex_unlock(&once_masterlock);
-    pthread_cond_broadcast(&once_finished);
-}
-
-int __pthread_once(pthread_once_t * once_control, void (*init_routine)(void))
-{
-  /* flag for doing the condition broadcast outside of mutex */
-  int state_changed;
-
-  /* Test without locking first for speed */
-  if (*once_control == DONE) {
-    READ_MEMORY_BARRIER();
-    return 0;
-  }
-  /* Lock and test again */
-
-  state_changed = 0;
-
-  pthread_mutex_lock(&once_masterlock);
-
-  /* If this object was left in an IN_PROGRESS state in a parent
-     process (indicated by stale generation field), reset it to NEVER. */
-  if ((*once_control & 3) == IN_PROGRESS && (*once_control & ~3) != fork_generation)
-    *once_control = NEVER;
-
-  /* If init_routine is being called from another routine, wait until
-     it completes. */
-  while ((*once_control & 3) == IN_PROGRESS) {
-    pthread_cond_wait(&once_finished, &once_masterlock);
-  }
-  /* Here *once_control is stable and either NEVER or DONE. */
-  if (*once_control == NEVER) {
-    *once_control = IN_PROGRESS | fork_generation;
-    pthread_mutex_unlock(&once_masterlock);
-    pthread_cleanup_push(pthread_once_cancelhandler, once_control);
-    init_routine();
-    pthread_cleanup_pop(0);
-    pthread_mutex_lock(&once_masterlock);
-    WRITE_MEMORY_BARRIER();
-    *once_control = DONE;
-    state_changed = 1;
-  }
-  pthread_mutex_unlock(&once_masterlock);
-
-  if (state_changed)
-    pthread_cond_broadcast(&once_finished);
-
-  return 0;
-}
-strong_alias (__pthread_once, pthread_once)
-
-/*
- * Handle the state of the pthread_once mechanism across forks.  The
- * once_masterlock is acquired in the parent process prior to a fork to ensure
- * that no thread is in the critical region protected by the lock.  After the
- * fork, the lock is released. In the child, the lock and the condition
- * variable are simply reset.  The child also increments its generation
- * counter which lets pthread_once calls detect stale IN_PROGRESS states
- * and reset them back to NEVER.
- */
-
-void __pthread_once_fork_prepare(void)
-{
-  pthread_mutex_lock(&once_masterlock);
-}
-
-void __pthread_once_fork_parent(void)
-{
-  pthread_mutex_unlock(&once_masterlock);
-}
-
-void __pthread_once_fork_child(void)
-{
-  pthread_mutex_init(&once_masterlock, NULL);
-  pthread_cond_init(&once_finished, NULL);
-  if (fork_generation <= INT_MAX - 4)
-    fork_generation += 4;	/* leave least significant two bits zero */
-  else
-    fork_generation = 0;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/no-tsd.c b/newlib/libc/sys/linux/linuxthreads/no-tsd.c
deleted file mode 100644
index 84abb6f..0000000
--- a/newlib/libc/sys/linux/linuxthreads/no-tsd.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* libc-internal interface for thread-specific data.
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <sys/cdefs.h>  /* for __const */
-#include <bits/libc-tsd.h>
-
-/* This file provides uinitialized (common) definitions for the
-   hooks used internally by libc to access thread-specific data.
-
-   When -lpthread is used, it provides initialized definitions for these
-   variables (in specific.c), which override these uninitialized definitions.
-
-   If -lpthread is not used, these uninitialized variables default to zero,
-   which the __libc_tsd_* macros check for.   */
-
-void *(*__libc_internal_tsd_get) (enum __libc_tsd_key_t);
-int (*__libc_internal_tsd_set) (enum __libc_tsd_key_t,
-				__const void *);
diff --git a/newlib/libc/sys/linux/linuxthreads/oldsemaphore.c b/newlib/libc/sys/linux/linuxthreads/oldsemaphore.c
deleted file mode 100644
index 80a82df..0000000
--- a/newlib/libc/sys/linux/linuxthreads/oldsemaphore.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * This file contains the old semaphore code that we need to
- * preserve for glibc-2.0 backwards compatibility. Port to glibc 2.1
- * done by Cristian Gafton.
- */
-
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Semaphores a la POSIX 1003.1b */
-#include <shlib-compat.h>
-#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
-
-#include <errno.h>
-#include "pthread.h"
-#include "internals.h"
-#include "spinlock.h"
-#include "restart.h"
-#include "queue.h"
-
-typedef struct {
-    long int sem_status;
-    int sem_spinlock;
-} old_sem_t;
-
-extern int __old_sem_init (old_sem_t *__sem, int __pshared, unsigned int __value);
-extern int __old_sem_wait (old_sem_t *__sem);
-extern int __old_sem_trywait (old_sem_t *__sem);
-extern int __old_sem_post (old_sem_t *__sem);
-extern int __old_sem_getvalue (old_sem_t *__sem, int *__sval);
-extern int __old_sem_destroy (old_sem_t *__sem);
-
-
-/* Maximum value the semaphore can have.  */
-#define SEM_VALUE_MAX   ((int) ((~0u) >> 1))
-
-static inline int sem_compare_and_swap(old_sem_t *sem, long oldval, long newval)
-{
-    return compare_and_swap(&sem->sem_status, oldval, newval, &sem->sem_spinlock);
-}
-
-/* The state of a semaphore is represented by a long int encoding
-   either the semaphore count if >= 0 and no thread is waiting on it,
-   or the head of the list of threads waiting for the semaphore.
-   To distinguish the two cases, we encode the semaphore count N
-   as 2N+1, so that it has the lowest bit set.
-
-   A sequence of sem_wait operations on a semaphore initialized to N
-   result in the following successive states:
-     2N+1, 2N-1, ..., 3, 1, &first_waiting_thread, &second_waiting_thread, ...
-*/
-
-static void sem_restart_list(pthread_descr waiting);
-
-int __old_sem_init(old_sem_t *sem, int pshared, unsigned int value)
-{
-    if (value > SEM_VALUE_MAX) {
-	errno = EINVAL;
-	return -1;
-    }
-    if (pshared) {
-	errno = ENOSYS;
-	return -1;
-    }
-  sem->sem_spinlock = __LT_SPINLOCK_INIT;
-  sem->sem_status = ((long)value << 1) + 1;
-  return 0;
-}
-
-/* Function called by pthread_cancel to remove the thread from
-   waiting inside __old_sem_wait. Here we simply unconditionally
-   indicate that the thread is to be woken, by returning 1. */
-
-static int old_sem_extricate_func(void *obj, pthread_descr th)
-{
-    return 1;
-}
-
-int __old_sem_wait(old_sem_t * sem)
-{
-    long oldstatus, newstatus;
-    volatile pthread_descr self = thread_self();
-    pthread_descr * th;
-    pthread_extricate_if extr;
-
-    /* Set up extrication interface */
-    extr.pu_object = 0;
-    extr.pu_extricate_func = old_sem_extricate_func;
-
-    while (1) {
-	/* Register extrication interface */
-	__pthread_set_own_extricate_if(self, &extr);
-	do {
-            oldstatus = sem->sem_status;
-            if ((oldstatus & 1) && (oldstatus != 1))
-		newstatus = oldstatus - 2;
-            else {
-		newstatus = (long) self;
-		self->p_nextwaiting = (pthread_descr) oldstatus;
-	    }
-	}
-	while (! sem_compare_and_swap(sem, oldstatus, newstatus));
-	if (newstatus & 1) {
-	    /* We got the semaphore. */
-	    __pthread_set_own_extricate_if(self, 0);
-	    self->p_nextwaiting = NULL;
-	    return 0;
-	}
-	/* Wait for sem_post or cancellation */
-	suspend(self);
-	__pthread_set_own_extricate_if(self, 0);
-
-	/* This is a cancellation point */
-	if (self->p_canceled && self->p_cancelstate == PTHREAD_CANCEL_ENABLE) {
-	    /* Remove ourselves from the waiting list if we're still on it */
-	    /* First check if we're at the head of the list. */
-            do {
-		oldstatus = sem->sem_status;
-		if (oldstatus != (long) self) break;
-		newstatus = (long) self->p_nextwaiting;
-	    }
-            while (! sem_compare_and_swap(sem, oldstatus, newstatus));
-            /* Now, check if we're somewhere in the list.
-	       There's a race condition with sem_post here, but it does not matter:
-	       the net result is that at the time pthread_exit is called,
-	       self is no longer reachable from sem->sem_status. */
-            if (oldstatus != (long) self && (oldstatus & 1) == 0) {
-		for (th = &(((pthread_descr) oldstatus)->p_nextwaiting);
-		     *th != NULL && *th != (pthread_descr) 1;
-		     th = &((*th)->p_nextwaiting)) {
-		    if (*th == self) {
-			*th = self->p_nextwaiting;
-			break;
-		    }
-		}
-	    }
-            __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-	}
-    }
-}
-
-int __old_sem_trywait(old_sem_t * sem)
-{
-  long oldstatus, newstatus;
-
-  do {
-    oldstatus = sem->sem_status;
-    if ((oldstatus & 1) == 0 || (oldstatus == 1)) {
-      errno = EAGAIN;
-      return -1;
-    }
-    newstatus = oldstatus - 2;
-  }
-  while (! sem_compare_and_swap(sem, oldstatus, newstatus));
-  return 0;
-}
-
-int __old_sem_post(old_sem_t * sem)
-{
-  long oldstatus, newstatus;
-
-  do {
-    oldstatus = sem->sem_status;
-    if ((oldstatus & 1) == 0)
-      newstatus = 3;
-    else {
-      if (oldstatus >= SEM_VALUE_MAX) {
-        /* Overflow */
-        errno = ERANGE;
-        return -1;
-      }
-      newstatus = oldstatus + 2;
-    }
-  }
-  while (! sem_compare_and_swap(sem, oldstatus, newstatus));
-  if ((oldstatus & 1) == 0)
-    sem_restart_list((pthread_descr) oldstatus);
-  return 0;
-}
-
-int __old_sem_getvalue(old_sem_t * sem, int * sval)
-{
-  long status = sem->sem_status;
-  if (status & 1)
-    *sval = (int)((unsigned long) status >> 1);
-  else
-    *sval = 0;
-  return 0;
-}
-
-int __old_sem_destroy(old_sem_t * sem)
-{
-  if ((sem->sem_status & 1) == 0) {
-    errno = EBUSY;
-    return -1;
-  }
-  return 0;
-}
-
-/* Auxiliary function for restarting all threads on a waiting list,
-   in priority order. */
-
-static void sem_restart_list(pthread_descr waiting)
-{
-  pthread_descr th, towake, *p;
-
-  /* Sort list of waiting threads by decreasing priority (insertion sort) */
-  towake = NULL;
-  while (waiting != (pthread_descr) 1) {
-    th = waiting;
-    waiting = waiting->p_nextwaiting;
-    p = &towake;
-    while (*p != NULL && th->p_priority < (*p)->p_priority)
-      p = &((*p)->p_nextwaiting);
-    th->p_nextwaiting = *p;
-    *p = th;
-  }
-  /* Wake up threads in priority order */
-  while (towake != NULL) {
-    th = towake;
-    towake = towake->p_nextwaiting;
-    th->p_nextwaiting = NULL;
-    restart(th);
-  }
-}
-
-compat_symbol (libpthread, __old_sem_init, sem_init, GLIBC_2_0);
-compat_symbol (libpthread, __old_sem_wait, sem_wait, GLIBC_2_0);
-compat_symbol (libpthread, __old_sem_trywait, sem_trywait, GLIBC_2_0);
-compat_symbol (libpthread, __old_sem_post, sem_post, GLIBC_2_0);
-compat_symbol (libpthread, __old_sem_getvalue, sem_getvalue, GLIBC_2_0);
-compat_symbol (libpthread, __old_sem_destroy, sem_destroy, GLIBC_2_0);
-
-#endif
diff --git a/newlib/libc/sys/linux/linuxthreads/posix-timer.h b/newlib/libc/sys/linux/linuxthreads/posix-timer.h
deleted file mode 100644
index 0596c18..0000000
--- a/newlib/libc/sys/linux/linuxthreads/posix-timer.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/* Definitions for POSIX timer implementation on top of LinuxThreads.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <limits.h>
-#include <signal.h>
-#include <linux/time.h>
-
-/* Double linked list.  */
-struct list_links
-{
-  struct list_links *next;
-  struct list_links *prev;
-};
-
-
-/* Forward declaration.  */
-struct timer_node;
-
-
-/* Definitions for an internal thread of the POSIX timer implementation.  */
-struct thread_node
-{
-  struct list_links links;
-  pthread_attr_t attr;
-  pthread_t id;
-  unsigned int exists;
-  struct list_links timer_queue;
-  pthread_cond_t cond;
-  struct timer_node *current_timer;
-  pthread_t captured;
-  clockid_t clock_id;
-};
-
-
-/* Internal representation of a timer.  */
-struct timer_node
-{
-  struct list_links links;
-  struct sigevent event;
-  clockid_t clock;
-  struct itimerspec value;
-  struct timespec expirytime;
-  pthread_attr_t attr;
-  unsigned int abstime;
-  unsigned int armed;
-  enum {
-    TIMER_FREE, TIMER_INUSE, TIMER_DELETED
-  } inuse;
-  struct thread_node *thread;
-  pid_t creator_pid;
-  int refcount;
-};
-
-
-/* Static array with the structures for all the timers.  */
-extern struct timer_node __timer_array[TIMER_MAX];
-
-/* Global lock to protect operation on the lists.  */
-extern pthread_mutex_t __timer_mutex;
-
-/* Variable to protext initialization.  */
-extern pthread_once_t __timer_init_once_control;
-
-/* Nonzero if initialization of timer implementation failed.  */
-extern int __timer_init_failed;
-
-/* Nodes for the threads used to deliver signals.  */
-/* A distinct thread is used for each clock type.  */
-
-extern struct thread_node __timer_signal_thread_rclk;
-#ifdef _POSIX_CPUTIME
-extern struct thread_node __timer_signal_thread_pclk;
-#endif
-#ifdef _POSIX_THREAD_CPUTIME
-extern struct thread_node __timer_signal_thread_tclk;
-#endif
-
-
-/* Return pointer to timer structure corresponding to ID.  */
-static inline struct timer_node *
-timer_id2ptr (timer_t timerid)
-{
-  if (timerid >= 0 && timerid < TIMER_MAX)
-    return &__timer_array[timerid];
-
-  return NULL;
-}
-
-/* Return ID of TIMER.  */
-static inline int
-timer_ptr2id (struct timer_node *timer)
-{
-  return timer - __timer_array;
-}
-
-/* Check whether timer is valid; global mutex must be held. */
-static inline int
-timer_valid (struct timer_node *timer)
-{
-  return timer && timer->inuse == TIMER_INUSE;
-}
-
-/* Timer refcount functions; need global mutex. */
-extern void __timer_dealloc (struct timer_node *timer);
-
-static inline void
-timer_addref (struct timer_node *timer)
-{
-  timer->refcount++;
-}
-
-static inline void
-timer_delref (struct timer_node *timer)
-{
-  if (--timer->refcount == 0)
-    __timer_dealloc (timer);
-}
-
-/* Timespec helper routines.  */
-static inline int
-timespec_compare (const struct timespec *left, const struct timespec *right)
-{
-  if (left->tv_sec < right->tv_sec)
-    return -1;
-  if (left->tv_sec > right->tv_sec)
-    return 1;
-
-  if (left->tv_nsec < right->tv_nsec)
-    return -1;
-  if (left->tv_nsec > right->tv_nsec)
-    return 1;
-
-  return 0;
-}
-
-static inline void
-timespec_add (struct timespec *sum, const struct timespec *left,
-	      const struct timespec *right)
-{
-  sum->tv_sec = left->tv_sec + right->tv_sec;
-  sum->tv_nsec = left->tv_nsec + right->tv_nsec;
-
-  if (sum->tv_nsec >= 1000000000)
-    {
-      ++sum->tv_sec;
-      sum->tv_nsec -= 1000000000;
-    }
-}
-
-static inline void
-timespec_sub (struct timespec *diff, const struct timespec *left,
-	      const struct timespec *right)
-{
-  diff->tv_sec = left->tv_sec - right->tv_sec;
-  diff->tv_nsec = left->tv_nsec - right->tv_nsec;
-
-  if (diff->tv_nsec < 0)
-    {
-      --diff->tv_sec;
-      diff->tv_nsec += 1000000000;
-    }
-}
-
-
-/* We need one of the list functions in the other modules.  */
-static inline void
-list_unlink_ip (struct list_links *list)
-{
-  struct list_links *lnext = list->next, *lprev = list->prev;
-
-  lnext->prev = lprev;
-  lprev->next = lnext;
-
-  /* The suffix ip means idempotent; list_unlink_ip can be called
-   * two or more times on the same node.
-   */
-
-  list->next = list;
-  list->prev = list;
-}
-
-
-/* Functions in the helper file.  */
-extern void __timer_mutex_cancel_handler (void *arg);
-extern void __timer_init_once (void);
-extern struct timer_node *__timer_alloc (void);
-extern int __timer_thread_start (struct thread_node *thread);
-extern struct thread_node *__timer_thread_find_matching (const pthread_attr_t *desired_attr, clockid_t);
-extern struct thread_node *__timer_thread_alloc (const pthread_attr_t *desired_attr, clockid_t);
-extern void __timer_thread_dealloc (struct thread_node *thread);
-extern int __timer_thread_queue_timer (struct thread_node *thread,
-				       struct timer_node *insert);
-extern void __timer_thread_wakeup (struct thread_node *thread);
diff --git a/newlib/libc/sys/linux/linuxthreads/prio.c b/newlib/libc/sys/linux/linuxthreads/prio.c
deleted file mode 100644
index 4753711..0000000
--- a/newlib/libc/sys/linux/linuxthreads/prio.c
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <stddef.h>
-#include <unistd.h>
-#include <errno.h>
-#include "pthread.h"
-#include "internals.h"
-#include <bits/posix_opt.h>
-
-#ifndef _POSIX_THREAD_PRIO_PROTECT
-int
-__pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attr,
-                                 int *priority)
-{
-  errno = ENOSYS;
-  return ENOSYS;
-}
-weak_alias(__pthread_mutexattr_getprotocol,pthread_mutexattr_getprotocol)
-
-int
-__pthread_mutexattr_setprotocol (pthread_mutexattr_t *attr,
-                                 int priority)
-{
-  errno = ENOSYS;
-  return ENOSYS;
-}
-weak_alias(__pthread_mutexattr_setprotocol,pthread_mutexattr_setprotocol)
-
-int
-__pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *attr,
-                                    int *prioceiling)
-{
-  errno = ENOSYS;
-  return ENOSYS;
-}
-weak_alias(__pthread_mutexattr_getprioceiling,pthread_mutexattr_getprioceiling)
-
-int
-__pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attr,
-                                    int prioceiling)
-{
-  errno = ENOSYS;
-  return ENOSYS;
-}
-weak_alias(__pthread_mutexattr_setprioceiling,pthread_mutexattr_setprioceiling)
-#endif /* !_POSIX_THREAD_PRIO_PROTECT */
-
-#if !defined(_POSIX_THREAD_PRIO_PROTECT) && !defined(_POSIX_THREAD_PRIO_INHERIT)
-int
-__pthread_mutex_getprioceiling (const pthread_mutex_t *mutex,
-                                int *prioceiling)
-{
-  errno = ENOSYS;
-  return ENOSYS;
-}
-weak_alias(__pthread_mutex_getprioceiling,pthread_mutex_getprioceiling)
-
-int
-__pthread_mutex_setprioceiling (pthread_mutex_t *mutex,
-                                int prioceiling, int *oldceiling)
-{
-  errno = ENOSYS;
-  return ENOSYS;
-}
-weak_alias(__pthread_mutex_setprioceiling,pthread_mutex_setprioceiling)
-#endif /* !_POSIX_THREAD_PRIO_PROTECT && !_POSIX_THREAD_PRIO_INHERIT) */
-
diff --git a/newlib/libc/sys/linux/linuxthreads/proc_service.h b/newlib/libc/sys/linux/linuxthreads/proc_service.h
deleted file mode 100644
index 74136c0..0000000
--- a/newlib/libc/sys/linux/linuxthreads/proc_service.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* The definitions in this file must correspond to those in the debugger.  */
-#include <sys/procfs.h>
-
-typedef enum
-{
-  PS_OK,          /* generic "call succeeded" */
-  PS_ERR,         /* generic. */
-  PS_BADPID,      /* bad process handle */
-  PS_BADLID,      /* bad lwp identifier */
-  PS_BADADDR,     /* bad address */
-  PS_NOSYM,       /* p_lookup() could not find given symbol */
-        PS_NOFREGS
-  /*
-   * FPU register set not available for given
-   * lwp
-   */
-}       ps_err_e;
-
-
-struct ps_prochandle;		/* user defined. */
-
-
-extern ps_err_e ps_pdread(struct ps_prochandle *,
-                        psaddr_t, void *, size_t);
-extern ps_err_e ps_pdwrite(struct ps_prochandle *,
-                        psaddr_t, const void *, size_t);
-extern ps_err_e ps_ptread(struct ps_prochandle *,
-                        psaddr_t, void *, size_t);
-extern ps_err_e ps_ptwrite(struct ps_prochandle *,
-                        psaddr_t, const void *, size_t);
-
-extern ps_err_e ps_pglobal_lookup(struct ps_prochandle *,
-        const char *object_name, const char *sym_name, psaddr_t *sym_addr);
-
-
-extern ps_err_e ps_lgetregs(struct ps_prochandle *,
-                        lwpid_t, prgregset_t);
-extern ps_err_e ps_lsetregs(struct ps_prochandle *,
-                        lwpid_t, const prgregset_t);
-extern ps_err_e ps_lgetfpregs(struct ps_prochandle *,
-                        lwpid_t, prfpregset_t *);
-extern ps_err_e ps_lsetfpregs(struct ps_prochandle *,
-                        lwpid_t, const prfpregset_t *);
-
-extern pid_t ps_getpid (struct ps_prochandle *);
-
-
-extern ps_err_e ps_pstop (const struct ps_prochandle *);
-extern ps_err_e ps_pcontinue (const struct ps_prochandle *);
-
-extern ps_err_e ps_lstop (const struct ps_prochandle *, lwpid_t);
-extern ps_err_e ps_lcontinue (const struct ps_prochandle *, lwpid_t);
diff --git a/newlib/libc/sys/linux/linuxthreads/pt-machine.c b/newlib/libc/sys/linux/linuxthreads/pt-machine.c
deleted file mode 100644
index f6298c4..0000000
--- a/newlib/libc/sys/linux/linuxthreads/pt-machine.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* "Instantiation of machine-dependent pthreads inline functions.
-   Copyright (C) 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#define PT_EI
-
-extern long int testandset (int *spinlock);
-extern int __compare_and_swap (long int *p, long int oldval, long int newval);
-
-#include <pt-machine.h>
diff --git a/newlib/libc/sys/linux/linuxthreads/ptclock_gettime.c b/newlib/libc/sys/linux/linuxthreads/ptclock_gettime.c
deleted file mode 100644
index 3323edb..0000000
--- a/newlib/libc/sys/linux/linuxthreads/ptclock_gettime.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <time.h>
-#include <libc-internal.h>
-#include "internals.h"
-
-
-#if HP_TIMING_AVAIL
-int
-__pthread_clock_gettime (hp_timing_t freq, struct timespec *tp)
-{
-  hp_timing_t tsc;
-  pthread_descr self = thread_self ();
-
-  /* Get the current counter.  */
-  HP_TIMING_NOW (tsc);
-
-  /* Compute the offset since the start time of the process.  */
-  tsc -= THREAD_GETMEM (self, p_cpuclock_offset);
-
-  /* Compute the seconds.  */
-  tp->tv_sec = tsc / freq;
-
-  /* And the nanoseconds.  This computation should be stable until
-     we get machines with about 16GHz frequency.  */
-  tp->tv_nsec = ((tsc % freq) * 1000000000ull) / freq;
-
-  return 0;
-}
-#endif
diff --git a/newlib/libc/sys/linux/linuxthreads/ptclock_settime.c b/newlib/libc/sys/linux/linuxthreads/ptclock_settime.c
deleted file mode 100644
index e293e0d..0000000
--- a/newlib/libc/sys/linux/linuxthreads/ptclock_settime.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <time.h>
-#include <libc-internal.h>
-#include "internals.h"
-
-
-#if HP_TIMING_AVAIL
-void
-__pthread_clock_settime (hp_timing_t offset)
-{
-  pthread_descr self = thread_self ();
-
-  /* Compute the offset since the start time of the process.  */
-  THREAD_SETMEM (self, p_cpuclock_offset, offset);
-}
-#endif
diff --git a/newlib/libc/sys/linux/linuxthreads/ptfork.c b/newlib/libc/sys/linux/linuxthreads/ptfork.c
deleted file mode 100644
index 6e31b77..0000000
--- a/newlib/libc/sys/linux/linuxthreads/ptfork.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* The "atfork" stuff */
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "pthread.h"
-#include "internals.h"
-#include <bits/libc-lock.h>
-
-struct handler_list {
-  void (*handler)(void);
-  struct handler_list * next;
-};
-
-static pthread_mutex_t pthread_atfork_lock = PTHREAD_MUTEX_INITIALIZER;
-static struct handler_list * pthread_atfork_prepare = NULL;
-static struct handler_list * pthread_atfork_parent = NULL;
-static struct handler_list * pthread_atfork_child = NULL;
-
-static void pthread_insert_list(struct handler_list ** list,
-                                void (*handler)(void),
-                                struct handler_list * newlist,
-                                int at_end)
-{
-  if (handler == NULL) return;
-  if (at_end) {
-    while(*list != NULL) list = &((*list)->next);
-  }
-  newlist->handler = handler;
-  newlist->next = *list;
-  *list = newlist;
-}
-
-struct handler_list_block {
-  struct handler_list prepare, parent, child;
-};
-
-int __pthread_atfork(void (*prepare)(void),
-		     void (*parent)(void),
-		     void (*child)(void))
-{
-  struct handler_list_block * block =
-    (struct handler_list_block *) malloc(sizeof(struct handler_list_block));
-  if (block == NULL) return ENOMEM;
-  pthread_mutex_lock(&pthread_atfork_lock);
-  /* "prepare" handlers are called in LIFO */
-  pthread_insert_list(&pthread_atfork_prepare, prepare, &block->prepare, 0);
-  /* "parent" handlers are called in FIFO */
-  pthread_insert_list(&pthread_atfork_parent, parent, &block->parent, 1);
-  /* "child" handlers are called in FIFO */
-  pthread_insert_list(&pthread_atfork_child, child, &block->child, 1);
-  pthread_mutex_unlock(&pthread_atfork_lock);
-  return 0;
-}
-strong_alias (__pthread_atfork, pthread_atfork)
-
-static inline void pthread_call_handlers(struct handler_list * list)
-{
-  for (/*nothing*/; list != NULL; list = list->next) (list->handler)();
-}
-
-extern int __libc_fork(void);
-
-pid_t __fork(void)
-{
-  pid_t pid;
-
-  pthread_mutex_lock(&pthread_atfork_lock);
-
-  pthread_call_handlers(pthread_atfork_prepare);
-  __pthread_once_fork_prepare();
-  __flockfilelist();
-
-  pid = __libc_fork();
-
-  if (pid == 0) {
-    __pthread_reset_main_thread();
-
-    __fresetlockfiles();
-    __pthread_once_fork_child();
-    pthread_call_handlers(pthread_atfork_child);
-
-    pthread_mutex_init(&pthread_atfork_lock, NULL);
-  } else {
-    __funlockfilelist();
-    __pthread_once_fork_parent();
-    pthread_call_handlers(pthread_atfork_parent);
-
-    pthread_mutex_unlock(&pthread_atfork_lock);
-  }
-
-  return pid;
-}
-
-weak_alias (__fork, fork);
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4
-
-pid_t __vfork(void)
-{
-  return __fork();
-}
-weak_alias (__vfork, vfork);
-
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 4 */
diff --git a/newlib/libc/sys/linux/linuxthreads/pthread.c b/newlib/libc/sys/linux/linuxthreads/pthread.c
deleted file mode 100644
index b42d9d6..0000000
--- a/newlib/libc/sys/linux/linuxthreads/pthread.c
+++ /dev/null
@@ -1,1248 +0,0 @@
-
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Thread creation, initialization, and basic low-level routines */
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include <sys/sysctl.h>
-#include <shlib-compat.h>
-#include "pthread.h"
-#include "internals.h"
-#include "spinlock.h"
-#include "restart.h"
-#include <machine/syscall.h>
-
-/* for threading we use processes so we require a few EL/IX level 2 and 
-   level 3 syscalls.  We only allow this file to see them to preserve
-   the interface. */
-#if defined(_ELIX_LEVEL) && _ELIX_LEVEL < 3
-static _syscall1_base(int,pipe,int *,filedes)
-#endif /* _ELIX_LEVEL < 3 */
-
-#if defined(_ELIX_LEVEL) && _ELIX_LEVEL < 2
-static _syscall2_base(int,setrlimit,int,resource,const struct rlimit *,rlp)
-int on_exit (void (*fn)(int, void *), void *arg)
-{
-  register struct _atexit *p;
-  void (*x)(void) = (void (*)(void))fn;
-
-/* _REENT_SMALL on_exit() doesn't allow more than the required 32 entries.  */
-#ifndef _REENT_SMALL
-  if ((p = _REENT->_atexit) == NULL)
-    _REENT->_atexit = p = &_REENT->_atexit0;
-  if (p->_ind >= _ATEXIT_SIZE)
-    {
-      if ((p = (struct _atexit *) malloc (sizeof *p)) == NULL)
-        return -1;
-      p->_ind = 0;
-      p->_fntypes = 0;
-      p->_next = _REENT->_atexit;
-      _REENT->_atexit = p;
-    }
-#else
-  p = &_REENT->_atexit;
-  if (p->_ind >= _ATEXIT_SIZE)
-    return -1;
-#endif
-  p->_fntypes |= (1 << p->_ind);
-  p->_fnargs[p->_ind] = arg;
-  p->_fns[p->_ind++] = x;
-  return 0;
-}
-
-#endif /* _ELIX_LEVEL < 2 */
-
-/* We need the global/static resolver state here.  */
-#include <resolv.h>
-#undef _res
-
-/* FIXME: for now, set up _res here */
-struct __res_state _res;
-
-/* Sanity check.  */
-#if __ASSUME_REALTIME_SIGNALS && !defined __SIGRTMIN
-# error "This must not happen; new kernel assumed but old headers"
-#endif
-
-/* These variables are used by the setup code.  */
-
-/* Descriptor of the initial thread */
-
-struct _pthread_descr_struct __pthread_initial_thread = {
-  {
-    {
-      &__pthread_initial_thread /* pthread_descr self */
-    }
-  },
-  &__pthread_initial_thread,  /* pthread_descr p_nextlive */
-  &__pthread_initial_thread,  /* pthread_descr p_prevlive */
-  NULL,                       /* pthread_descr p_nextwaiting */
-  NULL,			      /* pthread_descr p_nextlock */
-  PTHREAD_THREADS_MAX,        /* pthread_t p_tid */
-  0,                          /* int p_pid */
-  0,                          /* int p_priority */
-  &__pthread_handles[0].h_lock, /* struct _pthread_fastlock * p_lock */
-  0,                          /* int p_signal */
-  NULL,                       /* sigjmp_buf * p_signal_buf */
-  NULL,                       /* sigjmp_buf * p_cancel_buf */
-  0,                          /* char p_terminated */
-  0,                          /* char p_detached */
-  0,                          /* char p_exited */
-  NULL,                       /* void * p_retval */
-  0,                          /* int p_retval */
-  NULL,                       /* pthread_descr p_joining */
-  NULL,                       /* struct _pthread_cleanup_buffer * p_cleanup */
-  0,                          /* char p_cancelstate */
-  0,                          /* char p_canceltype */
-  0,                          /* char p_canceled */
-  &__pthread_initial_thread.p_reent, /* struct _reent *p_reentp */
-  _REENT_INIT(__pthread_initial_thread.p_reent),  /* struct _reent p_reent */
-  NULL,                       /* int *p_h_errnop */
-  0,                          /* int p_h_errno */
-  NULL,                       /* char * p_in_sighandler */
-  0,                          /* char p_sigwaiting */
-  PTHREAD_START_ARGS_INITIALIZER(NULL),
-                              /* struct pthread_start_args p_start_args */
-  {NULL},                     /* void ** p_specific[PTHREAD_KEY_1STLEVEL_SIZE] */
-  {NULL},                     /* void * p_libc_specific[_LIBC_TSD_KEY_N] */
-  1,                          /* int p_userstack */
-  NULL,                       /* void * p_guardaddr */
-  0,                          /* size_t p_guardsize */
-  0,                          /* Always index 0 */
-  0,                          /* int p_report_events */
-  {{{0, }}, 0, NULL},         /* td_eventbuf_t p_eventbuf */
-  __ATOMIC_INITIALIZER,       /* struct pthread_atomic p_resume_count */
-  0,                          /* char p_woken_by_cancel */
-  0,                          /* char p_condvar_avail */
-  0,                          /* char p_sem_avail */
-  NULL,                       /* struct pthread_extricate_if *p_extricate */
-  NULL,	                      /* pthread_readlock_info *p_readlock_list; */
-  NULL,                       /* pthread_readlock_info *p_readlock_free; */
-  0                           /* int p_untracked_readlock_count; */
-};
-
-/* Descriptor of the manager thread; none of this is used but the error
-   variables, the p_pid and p_priority fields,
-   and the address for identification.  */
-
-struct _pthread_descr_struct __pthread_manager_thread = {
-  {
-    {
-      &__pthread_manager_thread /* pthread_descr self */
-    }
-  },
-  NULL,                       /* pthread_descr p_nextlive */
-  NULL,                       /* pthread_descr p_prevlive */
-  NULL,                       /* pthread_descr p_nextwaiting */
-  NULL,			      /* pthread_descr p_nextlock */
-  0,                          /* int p_tid */
-  0,                          /* int p_pid */
-  0,                          /* int p_priority */
-  &__pthread_handles[1].h_lock, /* struct _pthread_fastlock * p_lock */
-  0,                          /* int p_signal */
-  NULL,                       /* sigjmp_buf * p_signal_buf */
-  NULL,                       /* sigjmp_buf * p_cancel_buf */
-  0,                          /* char p_terminated */
-  0,                          /* char p_detached */
-  0,                          /* char p_exited */
-  NULL,                       /* void * p_retval */
-  0,                          /* int p_retval */
-  NULL,                       /* pthread_descr p_joining */
-  NULL,                       /* struct _pthread_cleanup_buffer * p_cleanup */
-  0,                          /* char p_cancelstate */
-  0,                          /* char p_canceltype */
-  0,                          /* char p_canceled */
-  &__pthread_manager_thread.p_reent, /* struct _reent *p_reentp */
-  _REENT_INIT(__pthread_manager_thread.p_reent), /* struct _reent p_reent */
-  NULL,                       /* int *p_h_errnop */
-  0,                          /* int p_h_errno */
-  NULL,                       /* char * p_in_sighandler */
-  0,                          /* char p_sigwaiting */
-  PTHREAD_START_ARGS_INITIALIZER(__pthread_manager),
-                              /* struct pthread_start_args p_start_args */
-  {NULL},                     /* void ** p_specific[PTHREAD_KEY_1STLEVEL_SIZE] */
-  {NULL},                     /* void * p_libc_specific[_LIBC_TSD_KEY_N] */
-  0,                          /* int p_userstack */
-  NULL,                       /* void * p_guardaddr */
-  0,                          /* size_t p_guardsize */
-  1,                          /* Always index 1 */
-  0,                          /* int p_report_events */
-  {{{0, }}, 0, NULL},         /* td_eventbuf_t p_eventbuf */
-  __ATOMIC_INITIALIZER,       /* struct pthread_atomic p_resume_count */
-  0,                          /* char p_woken_by_cancel */
-  0,                          /* char p_condvar_avail */
-  0,                          /* char p_sem_avail */
-  NULL,                       /* struct pthread_extricate_if *p_extricate */
-  NULL,	                      /* pthread_readlock_info *p_readlock_list; */
-  NULL,                       /* pthread_readlock_info *p_readlock_free; */
-  0                           /* int p_untracked_readlock_count; */
-};
-
-/* Pointer to the main thread (the father of the thread manager thread) */
-/* Originally, this is the initial thread, but this changes after fork() */
-
-pthread_descr __pthread_main_thread = &__pthread_initial_thread;
-
-/* Limit between the stack of the initial thread (above) and the
-   stacks of other threads (below). Aligned on a STACK_SIZE boundary. */
-
-char *__pthread_initial_thread_bos;
-
-/* File descriptor for sending requests to the thread manager. */
-/* Initially -1, meaning that the thread manager is not running. */
-
-int __pthread_manager_request = -1;
-
-/* Other end of the pipe for sending requests to the thread manager. */
-
-int __pthread_manager_reader;
-
-/* Limits of the thread manager stack */
-
-char *__pthread_manager_thread_bos;
-char *__pthread_manager_thread_tos;
-
-/* For process-wide exit() */
-
-int __pthread_exit_requested;
-int __pthread_exit_code;
-
-/* Maximum stack size.  */
-size_t __pthread_max_stacksize;
-
-/* Nozero if the machine has more than one processor.  */
-int __pthread_smp_kernel;
-
-
-#if !__ASSUME_REALTIME_SIGNALS
-/* Pointers that select new or old suspend/resume functions
-   based on availability of rt signals. */
-
-void (*__pthread_restart)(pthread_descr) = __pthread_restart_old;
-void (*__pthread_suspend)(pthread_descr) = __pthread_suspend_old;
-int (*__pthread_timedsuspend)(pthread_descr, const struct timespec *) = __pthread_timedsuspend_old;
-#endif	/* __ASSUME_REALTIME_SIGNALS */
-
-/* Communicate relevant LinuxThreads constants to gdb */
-
-const int __pthread_threads_max = PTHREAD_THREADS_MAX;
-const int __pthread_sizeof_handle = sizeof(struct pthread_handle_struct);
-const int __pthread_offsetof_descr = offsetof(struct pthread_handle_struct,
-                                              h_descr);
-const int __pthread_offsetof_pid = offsetof(struct _pthread_descr_struct,
-                                            p_pid);
-const int __linuxthreads_pthread_sizeof_descr
-  = sizeof(struct _pthread_descr_struct);
-
-/* Forward declarations */
-
-static void pthread_onexit_process(int retcode, void *arg);
-#ifndef HAVE_Z_NODELETE
-static void pthread_atexit_process(void *arg, int retcode);
-static void pthread_atexit_retcode(void *arg, int retcode);
-#endif
-static void pthread_handle_sigcancel(int sig);
-static void pthread_handle_sigrestart(int sig);
-static void pthread_handle_sigdebug(int sig);
-
-/* CPU clock handling.  */
-#if HP_TIMING_AVAIL
-extern hp_timing_t _dl_cpuclock_offset;
-#endif
-
-/* Signal numbers used for the communication.
-   In these variables we keep track of the used variables.  If the
-   platform does not support any real-time signals we will define the
-   values to some unreasonable value which will signal failing of all
-   the functions below.  */
-#ifndef __SIGRTMIN
-static int current_rtmin = -1;
-static int current_rtmax = -1;
-int __pthread_sig_restart = SIGUSR1;
-int __pthread_sig_cancel = SIGUSR2;
-int __pthread_sig_debug;
-#else
-static int current_rtmin;
-static int current_rtmax;
-
-#if __SIGRTMAX - __SIGRTMIN >= 3
-int __pthread_sig_restart = __SIGRTMIN;
-int __pthread_sig_cancel = __SIGRTMIN + 1;
-int __pthread_sig_debug = __SIGRTMIN + 2;
-#else
-int __pthread_sig_restart = SIGUSR1;
-int __pthread_sig_cancel = SIGUSR2;
-int __pthread_sig_debug;
-#endif
-
-static int rtsigs_initialized;
-
-#if !__ASSUME_REALTIME_SIGNALS
-# include "testrtsig.h"
-#endif
-
-static void
-init_rtsigs (void)
-{
-#if !__ASSUME_REALTIME_SIGNALS
-  if (__builtin_expect (!kernel_has_rtsig (), 0))
-    {
-      current_rtmin = -1;
-      current_rtmax = -1;
-# if __SIGRTMAX - __SIGRTMIN >= 3
-      __pthread_sig_restart = SIGUSR1;
-      __pthread_sig_cancel = SIGUSR2;
-      __pthread_sig_debug = 0;
-# endif
-    }
-  else
-#endif	/* __ASSUME_REALTIME_SIGNALS */
-    {
-#if __SIGRTMAX - __SIGRTMIN >= 3
-      current_rtmin = __SIGRTMIN + 3;
-# if !__ASSUME_REALTIME_SIGNALS
-      __pthread_restart = __pthread_restart_new;
-      __pthread_suspend = __pthread_wait_for_restart_signal;
-      __pthread_timedsuspend = __pthread_timedsuspend_new;
-# endif /* __ASSUME_REALTIME_SIGNALS */
-#else
-      current_rtmin = __SIGRTMIN;
-#endif
-
-      current_rtmax = __SIGRTMAX;
-    }
-
-  rtsigs_initialized = 1;
-}
-#endif
-
-/* Return number of available real-time signal with highest priority.  */
-int
-__libc_current_sigrtmin (void)
-{
-#ifdef __SIGRTMIN
-  if (__builtin_expect (!rtsigs_initialized, 0))
-    init_rtsigs ();
-#endif
-  return current_rtmin;
-}
-
-/* Return number of available real-time signal with lowest priority.  */
-int
-__libc_current_sigrtmax (void)
-{
-#ifdef __SIGRTMIN
-  if (__builtin_expect (!rtsigs_initialized, 0))
-    init_rtsigs ();
-#endif
-  return current_rtmax;
-}
-
-/* Allocate real-time signal with highest/lowest available
-   priority.  Please note that we don't use a lock since we assume
-   this function to be called at program start.  */
-int
-__libc_allocate_rtsig (int high)
-{
-#ifndef __SIGRTMIN
-  return -1;
-#else
-  if (__builtin_expect (!rtsigs_initialized, 0))
-    init_rtsigs ();
-  if (__builtin_expect (current_rtmin == -1, 0)
-      || __builtin_expect (current_rtmin > current_rtmax, 0))
-    /* We don't have anymore signal available.  */
-    return -1;
-
-  return high ? current_rtmin++ : current_rtmax--;
-#endif
-}
-
-/* The function we use to get the kernel revision.  */
-extern int __sysctl (int *name, int nlen, void *oldval, size_t *oldlenp,
-		     void *newval, size_t newlen);
-
-/* Test whether the machine has more than one processor.  This is not the
-   best test but good enough.  More complicated tests would require `malloc'
-   which is not available at that time.  */
-static int
-is_smp_system (void)
-{
-  static const int sysctl_args[] = { CTL_KERN, KERN_VERSION };
-  char buf[512];
-  size_t reslen = sizeof (buf);
-
-  /* Try reading the number using `sysctl' first.  */
-  if (__sysctl ((int *) sysctl_args,
-		sizeof (sysctl_args) / sizeof (sysctl_args[0]),
-		buf, &reslen, NULL, 0) < 0)
-    {
-      /* This was not successful.  Now try reading the /proc filesystem.  */
-      int fd = __open ("/proc/sys/kernel/version", O_RDONLY);
-      if (__builtin_expect (fd, 0) == -1
-	  || (reslen = __read (fd, buf, sizeof (buf))) <= 0)
-	/* This also didn't work.  We give up and say it's a UP machine.  */
-	buf[0] = '\0';
-
-      __close (fd);
-    }
-
-  return strstr (buf, "SMP") != NULL;
-}
-
-
-/* Initialize the pthread library.
-   Initialization is split in two functions:
-   - a constructor function that blocks the __pthread_sig_restart signal
-     (must do this very early, since the program could capture the signal
-      mask with e.g. sigsetjmp before creating the first thread);
-   - a regular function called from pthread_create when needed. */
-
-static void pthread_initialize(void) __attribute__((constructor));
-
-#ifndef HAVE_Z_NODELETE
-extern void *__dso_handle __attribute__ ((weak));
-#endif
-
-
-/* Do some minimal initialization which has to be done during the
-   startup of the C library.  */
-void
-__pthread_initialize_minimal(void)
-{
-  /* If we have special thread_self processing, initialize that for the
-     main thread now.  */
-#ifdef INIT_THREAD_SELF
-  INIT_THREAD_SELF(&__pthread_initial_thread, 0);
-#endif
-#if HP_TIMING_AVAIL
-  __pthread_initial_thread.p_cpuclock_offset = _dl_cpuclock_offset;
-#endif
-}
-
-
-void
-__pthread_init_max_stacksize(void)
-{
-  struct rlimit limit;
-  size_t max_stack;
-
-  getrlimit(RLIMIT_STACK, &limit);
-#ifdef FLOATING_STACKS
-  if (limit.rlim_cur == RLIM_INFINITY)
-    limit.rlim_cur = ARCH_STACK_MAX_SIZE;
-# ifdef NEED_SEPARATE_REGISTER_STACK
-  max_stack = limit.rlim_cur / 2;
-# else
-  max_stack = limit.rlim_cur;
-# endif
-#else
-  /* Play with the stack size limit to make sure that no stack ever grows
-     beyond STACK_SIZE minus one page (to act as a guard page). */
-# ifdef NEED_SEPARATE_REGISTER_STACK
-  /* STACK_SIZE bytes hold both the main stack and register backing
-     store. The rlimit value applies to each individually.  */
-  max_stack = STACK_SIZE/2 - __getpagesize ();
-# else
-  max_stack = STACK_SIZE - __getpagesize();
-# endif
-  if (limit.rlim_cur > max_stack) {
-    limit.rlim_cur = max_stack;
-    __libc_setrlimit(RLIMIT_STACK, &limit);
-  }
-#endif
-  __pthread_max_stacksize = max_stack;
-}
-
-
-static void pthread_initialize(void)
-{
-  struct sigaction sa;
-  sigset_t mask;
-
-  /* If already done (e.g. by a constructor called earlier!), bail out */
-  if (__pthread_initial_thread_bos != NULL) return;
-#ifdef TEST_FOR_COMPARE_AND_SWAP
-  /* Test if compare-and-swap is available */
-  __pthread_has_cas = compare_and_swap_is_available();
-#endif
-#ifdef FLOATING_STACKS
-  /* We don't need to know the bottom of the stack.  Give the pointer some
-     value to signal that initialization happened.  */
-  __pthread_initial_thread_bos = (void *) -1l;
-#else
-  /* Determine stack size limits .  */
-  __pthread_init_max_stacksize ();
-# ifdef _STACK_GROWS_UP
-  /* The initial thread already has all the stack it needs */
-  __pthread_initial_thread_bos = (char *)
-    ((long)CURRENT_STACK_FRAME &~ (STACK_SIZE - 1));
-# else
-  /* For the initial stack, reserve at least STACK_SIZE bytes of stack
-     below the current stack address, and align that on a
-     STACK_SIZE boundary. */
-  __pthread_initial_thread_bos =
-    (char *)(((long)CURRENT_STACK_FRAME - 2 * STACK_SIZE) & ~(STACK_SIZE - 1));
-# endif
-#endif
-  /* Update the descriptor for the initial thread. */
-  __pthread_initial_thread.p_pid = __getpid();
-  /* Likewise for the resolver state _res.  */
-  __pthread_initial_thread.p_resp = &_res;
-#ifdef __SIGRTMIN
-  /* Initialize real-time signals. */
-  init_rtsigs ();
-#endif
-  /* Setup signal handlers for the initial thread.
-     Since signal handlers are shared between threads, these settings
-     will be inherited by all other threads. */
-  sa.sa_handler = pthread_handle_sigrestart;
-  sigemptyset(&sa.sa_mask);
-  sa.sa_flags = 0;
-  __libc_sigaction(__pthread_sig_restart, &sa, NULL);
-  sa.sa_handler = pthread_handle_sigcancel;
-  // sa.sa_flags = 0;
-  __libc_sigaction(__pthread_sig_cancel, &sa, NULL);
-  if (__pthread_sig_debug > 0) {
-    sa.sa_handler = pthread_handle_sigdebug;
-    sigemptyset(&sa.sa_mask);
-    // sa.sa_flags = 0;
-    __libc_sigaction(__pthread_sig_debug, &sa, NULL);
-  }
-  /* Initially, block __pthread_sig_restart. Will be unblocked on demand. */
-  sigemptyset(&mask);
-  sigaddset(&mask, __pthread_sig_restart);
-  sigprocmask(SIG_BLOCK, &mask, NULL);
-  /* Register an exit function to kill all other threads. */
-  /* Do it early so that user-registered atexit functions are called
-     before pthread_*exit_process. */
-#ifndef HAVE_Z_NODELETE
-  if (__builtin_expect (&__dso_handle != NULL, 1))
-    __cxa_atexit ((void (*) (void *)) pthread_atexit_process, NULL,
-		  __dso_handle);
-  else
-#endif
-    on_exit (pthread_onexit_process, NULL);
-  /* How many processors.  */
-  __pthread_smp_kernel = is_smp_system ();
-}
-
-void __pthread_initialize(void)
-{
-  pthread_initialize();
-}
-
-int __pthread_initialize_manager(void)
-{
-  int manager_pipe[2];
-  int pid;
-  struct pthread_request request;
-
-#ifndef HAVE_Z_NODELETE
-  if (__builtin_expect (&__dso_handle != NULL, 1))
-    __cxa_atexit ((void (*) (void *)) pthread_atexit_retcode, NULL,
-		  __dso_handle);
-#endif
-
-  if (__pthread_max_stacksize == 0)
-    __pthread_init_max_stacksize ();
-  /* If basic initialization not done yet (e.g. we're called from a
-     constructor run before our constructor), do it now */
-  if (__pthread_initial_thread_bos == NULL) pthread_initialize();
-  /* Setup stack for thread manager */
-  __pthread_manager_thread_bos = malloc(THREAD_MANAGER_STACK_SIZE);
-  if (__pthread_manager_thread_bos == NULL) return -1;
-  __pthread_manager_thread_tos =
-    __pthread_manager_thread_bos + THREAD_MANAGER_STACK_SIZE;
-  /* Setup pipe to communicate with thread manager */
-  if (__libc_pipe(manager_pipe) == -1) {
-    free(__pthread_manager_thread_bos);
-    return -1;
-  }
-  /* Start the thread manager */
-  pid = 0;
-  if (__builtin_expect (__pthread_initial_thread.p_report_events, 0))
-    {
-      /* It's a bit more complicated.  We have to report the creation of
-	 the manager thread.  */
-      int idx = __td_eventword (TD_CREATE);
-      uint32_t mask = __td_eventmask (TD_CREATE);
-
-      if ((mask & (__pthread_threads_events.event_bits[idx]
-		   | __pthread_initial_thread.p_eventbuf.eventmask.event_bits[idx]))
-	  != 0)
-	{
-	  __pthread_lock(__pthread_manager_thread.p_lock, NULL);
-
-#ifdef NEED_SEPARATE_REGISTER_STACK
-	  pid = __clone2(__pthread_manager_event,
-			 (void **) __pthread_manager_thread_bos,
-			 THREAD_MANAGER_STACK_SIZE,
-			 CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
-			 (void *)(long)manager_pipe[0]);
-#elif _STACK_GROWS_UP
-	  pid = __clone(__pthread_manager_event,
-			(void **) __pthread_manager_thread_bos,
-			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
-			(void *)(long)manager_pipe[0]);
-#else
-	  pid = __clone(__pthread_manager_event,
-			(void **) __pthread_manager_thread_tos,
-			CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
-			(void *)(long)manager_pipe[0]);
-#endif
-
-	  if (pid != -1)
-	    {
-	      /* Now fill in the information about the new thread in
-	         the newly created thread's data structure.  We cannot let
-	         the new thread do this since we don't know whether it was
-	         already scheduled when we send the event.  */
-	      __pthread_manager_thread.p_eventbuf.eventdata =
-		&__pthread_manager_thread;
-	      __pthread_manager_thread.p_eventbuf.eventnum = TD_CREATE;
-	      __pthread_last_event = &__pthread_manager_thread;
-	      __pthread_manager_thread.p_tid = 2* PTHREAD_THREADS_MAX + 1;
-	      __pthread_manager_thread.p_pid = pid;
-
-	      /* Now call the function which signals the event.  */
-	      __linuxthreads_create_event ();
-	    }
-
-	  /* Now restart the thread.  */
-	  __pthread_unlock(__pthread_manager_thread.p_lock);
-	}
-    }
-
-  if (__builtin_expect (pid, 0) == 0)
-    {
-#ifdef NEED_SEPARATE_REGISTER_STACK
-      pid = __clone2(__pthread_manager, (void **) __pthread_manager_thread_bos,
-		     THREAD_MANAGER_STACK_SIZE,
-		     CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
-		     (void *)(long)manager_pipe[0]);
-#elif _STACK_GROWS_UP
-      pid = __clone(__pthread_manager, (void **) __pthread_manager_thread_bos,
-		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
-		    (void *)(long)manager_pipe[0]);
-#else
-      pid = __clone(__pthread_manager, (void **) __pthread_manager_thread_tos,
-		    CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND,
-		    (void *)(long)manager_pipe[0]);
-#endif
-    }
-  if (__builtin_expect (pid, 0) == -1) {
-    free(__pthread_manager_thread_bos);
-    __libc_close(manager_pipe[0]);
-    __libc_close(manager_pipe[1]);
-    return -1;
-  }
-  __pthread_manager_request = manager_pipe[1]; /* writing end */
-  __pthread_manager_reader = manager_pipe[0]; /* reading end */
-  __pthread_manager_thread.p_tid = 2* PTHREAD_THREADS_MAX + 1;
-  __pthread_manager_thread.p_pid = pid;
-  /* Make gdb aware of new thread manager */
-  if (__builtin_expect (__pthread_threads_debug, 0) && __pthread_sig_debug > 0)
-    {
-      raise(__pthread_sig_debug);
-      /* We suspend ourself and gdb will wake us up when it is
-	 ready to handle us. */
-      __pthread_wait_for_restart_signal(thread_self());
-    }
-  /* Synchronize debugging of the thread manager */
-  request.req_kind = REQ_DEBUG;
-  TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request,
-				  (char *) &request, sizeof(request)));
-  return 0;
-}
-
-/* Thread creation */
-
-int __pthread_create_2_1(pthread_t *thread, const pthread_attr_t *attr,
-			 void * (*start_routine)(void *), void *arg)
-{
-  pthread_descr self = thread_self();
-  struct pthread_request request;
-  int retval;
-  if (__builtin_expect (__pthread_manager_request, 0) < 0) {
-    if (__pthread_initialize_manager() < 0) return EAGAIN;
-  }
-  request.req_thread = self;
-  request.req_kind = REQ_CREATE;
-  request.req_args.create.attr = attr;
-  request.req_args.create.fn = start_routine;
-  request.req_args.create.arg = arg;
-  sigprocmask(SIG_SETMASK, (const sigset_t *) NULL,
-              &request.req_args.create.mask);
-  TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request,
-				  (char *) &request, sizeof(request)));
-  suspend(self);
-  retval = THREAD_GETMEM(self, p_retcode);
-  if (__builtin_expect (retval, 0) == 0)
-    *thread = (pthread_t) THREAD_GETMEM(self, p_retval);
-  return retval;
-}
-
-versioned_symbol (libpthread, __pthread_create_2_1, pthread_create, GLIBC_2_1);
-
-#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
-
-int __pthread_create_2_0(pthread_t *thread, const pthread_attr_t *attr,
-			 void * (*start_routine)(void *), void *arg)
-{
-  /* The ATTR attribute is not really of type `pthread_attr_t *'.  It has
-     the old size and access to the new members might crash the program.
-     We convert the struct now.  */
-  pthread_attr_t new_attr;
-
-  if (attr != NULL)
-    {
-      size_t ps = __getpagesize ();
-
-      memcpy (&new_attr, attr,
-	      (size_t) &(((pthread_attr_t*)NULL)->__guardsize));
-      new_attr.__guardsize = ps;
-      new_attr.__stackaddr_set = 0;
-      new_attr.__stackaddr = NULL;
-      new_attr.__stacksize = STACK_SIZE - ps;
-      attr = &new_attr;
-    }
-  return __pthread_create_2_1 (thread, attr, start_routine, arg);
-}
-compat_symbol (libpthread, __pthread_create_2_0, pthread_create, GLIBC_2_0);
-#endif
-
-/* Simple operations on thread identifiers */
-
-pthread_t pthread_self(void)
-{
-  pthread_descr self = thread_self();
-  return THREAD_GETMEM(self, p_tid);
-}
-
-int pthread_equal(pthread_t thread1, pthread_t thread2)
-{
-  return thread1 == thread2;
-}
-
-/* Helper function for thread_self in the case of user-provided stacks */
-
-#ifndef THREAD_SELF
-
-pthread_descr __pthread_find_self(void)
-{
-  char * sp = CURRENT_STACK_FRAME;
-  pthread_handle h;
-
-  /* __pthread_handles[0] is the initial thread, __pthread_handles[1] is
-     the manager threads handled specially in thread_self(), so start at 2 */
-  h = __pthread_handles + 2;
-  while (! (sp <= (char *) h->h_descr && sp >= h->h_bottom)) h++;
-  return h->h_descr;
-}
-
-#else
-
-static pthread_descr thread_self_stack(void)
-{
-  char *sp = CURRENT_STACK_FRAME;
-  pthread_handle h;
-
-  if (sp >= __pthread_manager_thread_bos && sp < __pthread_manager_thread_tos)
-    return &__pthread_manager_thread;
-  h = __pthread_handles + 2;
-  while (! (sp <= (char *) h->h_descr && sp >= h->h_bottom))
-    h++;
-  return h->h_descr;
-}
-
-#endif
-
-/* Thread scheduling */
-
-int pthread_setschedparam(pthread_t thread, int policy,
-                          const struct sched_param *param)
-{
-  pthread_handle handle = thread_handle(thread);
-  pthread_descr th;
-
-  __pthread_lock(&handle->h_lock, NULL);
-  if (__builtin_expect (invalid_handle(handle, thread), 0)) {
-    __pthread_unlock(&handle->h_lock);
-    return ESRCH;
-  }
-  th = handle->h_descr;
-  if (__builtin_expect (__sched_setscheduler(th->p_pid, policy, param) == -1,
-			0)) {
-    __pthread_unlock(&handle->h_lock);
-    return errno;
-  }
-  th->p_priority = policy == SCHED_OTHER ? 0 : param->sched_priority;
-  __pthread_unlock(&handle->h_lock);
-  if (__pthread_manager_request >= 0)
-    __pthread_manager_adjust_prio(th->p_priority);
-  return 0;
-}
-
-int pthread_getschedparam(pthread_t thread, int *policy,
-                          struct sched_param *param)
-{
-  pthread_handle handle = thread_handle(thread);
-  int pid, pol;
-
-  __pthread_lock(&handle->h_lock, NULL);
-  if (__builtin_expect (invalid_handle(handle, thread), 0)) {
-    __pthread_unlock(&handle->h_lock);
-    return ESRCH;
-  }
-  pid = handle->h_descr->p_pid;
-  __pthread_unlock(&handle->h_lock);
-  pol = __sched_getscheduler(pid);
-  if (__builtin_expect (pol, 0) == -1) return errno;
-  if (__sched_getparam(pid, param) == -1) return errno;
-  *policy = pol;
-  return 0;
-}
-
-int __pthread_yield (void)
-{
-  /* For now this is equivalent with the POSIX call.  */
-  return sched_yield ();
-}
-weak_alias (__pthread_yield, pthread_yield)
-
-/* Process-wide exit() request */
-
-static void pthread_onexit_process(int retcode, void *arg)
-{
-  if (__builtin_expect (__pthread_manager_request, 0) >= 0) {
-    struct pthread_request request;
-    pthread_descr self = thread_self();
-
-    request.req_thread = self;
-    request.req_kind = REQ_PROCESS_EXIT;
-    request.req_args.exit.code = retcode;
-    TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request,
-				    (char *) &request, sizeof(request)));
-    suspend(self);
-    /* Main thread should accumulate times for thread manager and its
-       children, so that timings for main thread account for all threads. */
-    if (self == __pthread_main_thread)
-      {
-	__waitpid(__pthread_manager_thread.p_pid, NULL, __WCLONE);
-	/* Since all threads have been asynchronously terminated
-           (possibly holding locks), free cannot be used any more.  */
-	/*free (__pthread_manager_thread_bos);*/
-	__pthread_manager_thread_bos = __pthread_manager_thread_tos = NULL;
-      }
-  }
-}
-
-#ifndef HAVE_Z_NODELETE
-static int __pthread_atexit_retcode;
-
-static void pthread_atexit_process(void *arg, int retcode)
-{
-  pthread_onexit_process (retcode ?: __pthread_atexit_retcode, arg);
-}
-
-static void pthread_atexit_retcode(void *arg, int retcode)
-{
-  __pthread_atexit_retcode = retcode;
-}
-#endif
-
-/* The handler for the RESTART signal just records the signal received
-   in the thread descriptor, and optionally performs a siglongjmp
-   (for pthread_cond_timedwait). */
-
-static void pthread_handle_sigrestart(int sig)
-{
-  pthread_descr self = thread_self();
-  THREAD_SETMEM(self, p_signal, sig);
-  if (THREAD_GETMEM(self, p_signal_jmp) != NULL)
-    siglongjmp(*THREAD_GETMEM(self, p_signal_jmp), 1);
-}
-
-/* The handler for the CANCEL signal checks for cancellation
-   (in asynchronous mode), for process-wide exit and exec requests.
-   For the thread manager thread, redirect the signal to
-   __pthread_manager_sighandler. */
-
-static void pthread_handle_sigcancel(int sig)
-{
-  pthread_descr self = thread_self();
-  sigjmp_buf * jmpbuf;
-
-  if (self == &__pthread_manager_thread)
-    {
-#ifdef THREAD_SELF
-      /* A new thread might get a cancel signal before it is fully
-	 initialized, so that the thread register might still point to the
-	 manager thread.  Double check that this is really the manager
-	 thread.  */
-      pthread_descr real_self = thread_self_stack();
-      if (real_self == &__pthread_manager_thread)
-	{
-	  __pthread_manager_sighandler(sig);
-	  return;
-	}
-      /* Oops, thread_self() isn't working yet..  */
-      self = real_self;
-# ifdef INIT_THREAD_SELF
-      INIT_THREAD_SELF(self, self->p_nr);
-# endif
-#else
-      __pthread_manager_sighandler(sig);
-      return;
-#endif
-    }
-  if (__builtin_expect (__pthread_exit_requested, 0)) {
-    /* Main thread should accumulate times for thread manager and its
-       children, so that timings for main thread account for all threads. */
-    if (self == __pthread_main_thread)
-      __waitpid(__pthread_manager_thread.p_pid, NULL, __WCLONE);
-    _exit(__pthread_exit_code);
-  }
-  if (__builtin_expect (THREAD_GETMEM(self, p_canceled), 0)
-      && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) {
-    if (THREAD_GETMEM(self, p_canceltype) == PTHREAD_CANCEL_ASYNCHRONOUS)
-      __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-    jmpbuf = THREAD_GETMEM(self, p_cancel_jmp);
-    if (jmpbuf != NULL) {
-      THREAD_SETMEM(self, p_cancel_jmp, NULL);
-      siglongjmp(*jmpbuf, 1);
-    }
-  }
-}
-
-/* Handler for the DEBUG signal.
-   The debugging strategy is as follows:
-   On reception of a REQ_DEBUG request (sent by new threads created to
-   the thread manager under debugging mode), the thread manager throws
-   __pthread_sig_debug to itself. The debugger (if active) intercepts
-   this signal, takes into account new threads and continue execution
-   of the thread manager by propagating the signal because it doesn't
-   know what it is specifically done for. In the current implementation,
-   the thread manager simply discards it. */
-
-static void pthread_handle_sigdebug(int sig)
-{
-  /* Nothing */
-}
-
-/* Reset the state of the thread machinery after a fork().
-   Close the pipe used for requests and set the main thread to the forked
-   thread.
-   Notice that we can't free the stack segments, as the forked thread
-   may hold pointers into them. */
-
-void __pthread_reset_main_thread(void)
-{
-  pthread_descr self = thread_self();
-  struct rlimit limit;
-
-  if (__pthread_manager_request != -1) {
-    /* Free the thread manager stack */
-    free(__pthread_manager_thread_bos);
-    __pthread_manager_thread_bos = __pthread_manager_thread_tos = NULL;
-    /* Close the two ends of the pipe */
-    __libc_close(__pthread_manager_request);
-    __libc_close(__pthread_manager_reader);
-    __pthread_manager_request = __pthread_manager_reader = -1;
-  }
-
-  /* Update the pid of the main thread */
-  THREAD_SETMEM(self, p_pid, __getpid());
-  /* Make the forked thread the main thread */
-  __pthread_main_thread = self;
-  THREAD_SETMEM(self, p_nextlive, self);
-  THREAD_SETMEM(self, p_prevlive, self);
-  /* Now this thread modifies the global variables.  */
-  THREAD_SETMEM(self, p_resp, &_res);
-
-  if (getrlimit (RLIMIT_STACK, &limit) == 0
-      && limit.rlim_cur != limit.rlim_max) {
-    limit.rlim_cur = limit.rlim_max;
-    __libc_setrlimit(RLIMIT_STACK, &limit);
-  }
-}
-
-/* Process-wide exec() request */
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-
-void __pthread_kill_other_threads_np(void)
-{
-  struct sigaction sa;
-  /* Terminate all other threads and thread manager */
-  pthread_onexit_process(0, NULL);
-  /* Make current thread the main thread in case the calling thread
-     changes its mind, does not exec(), and creates new threads instead. */
-  __pthread_reset_main_thread();
-
-  /* Reset the signal handlers behaviour for the signals the
-     implementation uses since this would be passed to the new
-     process.  */
-  sigemptyset(&sa.sa_mask);
-  sa.sa_flags = 0;
-  sa.sa_handler = SIG_DFL;
-  __libc_sigaction(__pthread_sig_restart, &sa, NULL);
-  __libc_sigaction(__pthread_sig_cancel, &sa, NULL);
-  if (__pthread_sig_debug > 0)
-    __libc_sigaction(__pthread_sig_debug, &sa, NULL);
-}
-weak_alias (__pthread_kill_other_threads_np, pthread_kill_other_threads_np)
-
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 2 */
-
-/* Concurrency symbol level.  */
-static int current_level;
-
-int __pthread_setconcurrency(int level)
-{
-  /* We don't do anything unless we have found a useful interpretation.  */
-  current_level = level;
-  return 0;
-}
-weak_alias (__pthread_setconcurrency, pthread_setconcurrency)
-
-int __pthread_getconcurrency(void)
-{
-  return current_level;
-}
-weak_alias (__pthread_getconcurrency, pthread_getconcurrency)
-
-/* Primitives for controlling thread execution */
-
-void __pthread_wait_for_restart_signal(pthread_descr self)
-{
-  sigset_t mask;
-
-  sigprocmask(SIG_SETMASK, NULL, &mask); /* Get current signal mask */
-  sigdelset(&mask, __pthread_sig_restart); /* Unblock the restart signal */
-  THREAD_SETMEM(self, p_signal, 0);
-  do {
-    sigsuspend(&mask);                   /* Wait for signal */
-  } while (THREAD_GETMEM(self, p_signal) !=__pthread_sig_restart);
-
-  READ_MEMORY_BARRIER(); /* See comment in __pthread_restart_new */
-}
-
-#if !__ASSUME_REALTIME_SIGNALS
-/* The _old variants are for 2.0 and early 2.1 kernels which don't have RT
-   signals.
-   On these kernels, we use SIGUSR1 and SIGUSR2 for restart and cancellation.
-   Since the restart signal does not queue, we use an atomic counter to create
-   queuing semantics. This is needed to resolve a rare race condition in
-   pthread_cond_timedwait_relative. */
-
-void __pthread_restart_old(pthread_descr th)
-{
-  if (atomic_increment(&th->p_resume_count) == -1)
-    kill(th->p_pid, __pthread_sig_restart);
-}
-
-void __pthread_suspend_old(pthread_descr self)
-{
-  if (atomic_decrement(&self->p_resume_count) <= 0)
-    __pthread_wait_for_restart_signal(self);
-}
-
-int
-__pthread_timedsuspend_old(pthread_descr self, const struct timespec *abstime)
-{
-  sigset_t unblock, initial_mask;
-  int was_signalled = 0;
-  sigjmp_buf jmpbuf;
-
-  if (atomic_decrement(&self->p_resume_count) == 0) {
-    /* Set up a longjmp handler for the restart signal, unblock
-       the signal and sleep. */
-
-    if (sigsetjmp(jmpbuf, 1) == 0) {
-      THREAD_SETMEM(self, p_signal_jmp, &jmpbuf);
-      THREAD_SETMEM(self, p_signal, 0);
-      /* Unblock the restart signal */
-      sigemptyset(&unblock);
-      sigaddset(&unblock, __pthread_sig_restart);
-      sigprocmask(SIG_UNBLOCK, &unblock, &initial_mask);
-
-      while (1) {
-	struct timeval now;
-	struct timespec reltime;
-
-	/* Compute a time offset relative to now.  */
-	__gettimeofday (&now, NULL);
-	reltime.tv_nsec = abstime->tv_nsec - now.tv_usec * 1000;
-	reltime.tv_sec = abstime->tv_sec - now.tv_sec;
-	if (reltime.tv_nsec < 0) {
-	  reltime.tv_nsec += 1000000000;
-	  reltime.tv_sec -= 1;
-	}
-
-	/* Sleep for the required duration. If woken by a signal,
-	   resume waiting as required by Single Unix Specification.  */
-	if (reltime.tv_sec < 0 || __libc_nanosleep(&reltime, NULL) == 0)
-	  break;
-      }
-
-      /* Block the restart signal again */
-      sigprocmask(SIG_SETMASK, &initial_mask, NULL);
-      was_signalled = 0;
-    } else {
-      was_signalled = 1;
-    }
-    THREAD_SETMEM(self, p_signal_jmp, NULL);
-  }
-
-  /* Now was_signalled is true if we exited the above code
-     due to the delivery of a restart signal.  In that case,
-     we know we have been dequeued and resumed and that the
-     resume count is balanced.  Otherwise, there are some
-     cases to consider. First, try to bump up the resume count
-     back to zero. If it goes to 1, it means restart() was
-     invoked on this thread. The signal must be consumed
-     and the count bumped down and everything is cool. We
-     can return a 1 to the caller.
-     Otherwise, no restart was delivered yet, so a potential
-     race exists; we return a 0 to the caller which must deal
-     with this race in an appropriate way; for example by
-     atomically removing the thread from consideration for a
-     wakeup---if such a thing fails, it means a restart is
-     being delivered. */
-
-  if (!was_signalled) {
-    if (atomic_increment(&self->p_resume_count) != -1) {
-      __pthread_wait_for_restart_signal(self);
-      atomic_decrement(&self->p_resume_count); /* should be zero now! */
-      /* woke spontaneously and consumed restart signal */
-      return 1;
-    }
-    /* woke spontaneously but did not consume restart---caller must resolve */
-    return 0;
-  }
-  /* woken due to restart signal */
-  return 1;
-}
-#endif /* __ASSUME_REALTIME_SIGNALS */
-
-void __pthread_restart_new(pthread_descr th)
-{
-  /* The barrier is proabably not needed, in which case it still documents
-     our assumptions. The intent is to commit previous writes to shared
-     memory so the woken thread will have a consistent view.  Complementary
-     read barriers are present to the suspend functions. */
-  WRITE_MEMORY_BARRIER();
-  kill(th->p_pid, __pthread_sig_restart);
-}
-
-/* There is no __pthread_suspend_new because it would just
-   be a wasteful wrapper for __pthread_wait_for_restart_signal */
-
-int
-__pthread_timedsuspend_new(pthread_descr self, const struct timespec *abstime)
-{
-  sigset_t unblock, initial_mask;
-  int was_signalled = 0;
-  sigjmp_buf jmpbuf;
-
-  if (sigsetjmp(jmpbuf, 1) == 0) {
-    THREAD_SETMEM(self, p_signal_jmp, &jmpbuf);
-    THREAD_SETMEM(self, p_signal, 0);
-    /* Unblock the restart signal */
-    sigemptyset(&unblock);
-    sigaddset(&unblock, __pthread_sig_restart);
-    sigprocmask(SIG_UNBLOCK, &unblock, &initial_mask);
-
-    while (1) {
-      struct timeval now;
-      struct timespec reltime;
-
-      /* Compute a time offset relative to now.  */
-      __gettimeofday (&now, NULL);
-      reltime.tv_nsec = abstime->tv_nsec - now.tv_usec * 1000;
-      reltime.tv_sec = abstime->tv_sec - now.tv_sec;
-      if (reltime.tv_nsec < 0) {
-	reltime.tv_nsec += 1000000000;
-	reltime.tv_sec -= 1;
-      }
-
-      /* Sleep for the required duration. If woken by a signal,
-	 resume waiting as required by Single Unix Specification.  */
-      if (reltime.tv_sec < 0 || __libc_nanosleep(&reltime, NULL) == 0)
-	break;
-    }
-
-    /* Block the restart signal again */
-    sigprocmask(SIG_SETMASK, &initial_mask, NULL);
-    was_signalled = 0;
-  } else {
-    was_signalled = 1;
-  }
-  THREAD_SETMEM(self, p_signal_jmp, NULL);
-
-  /* Now was_signalled is true if we exited the above code
-     due to the delivery of a restart signal.  In that case,
-     everything is cool. We have been removed from whatever
-     we were waiting on by the other thread, and consumed its signal.
-
-     Otherwise we this thread woke up spontaneously, or due to a signal other
-     than restart. This is an ambiguous case  that must be resolved by
-     the caller; the thread is still eligible for a restart wakeup
-     so there is a race. */
-
-  READ_MEMORY_BARRIER(); /* See comment in __pthread_restart_new */
-  return was_signalled;
-}
-
-
-/* Debugging aid */
-
-#ifdef DEBUG
-#include <stdarg.h>
-
-void __pthread_message(char * fmt, ...)
-{
-  char buffer[1024];
-  va_list args;
-  sprintf(buffer, "%05d : ", __getpid());
-  va_start(args, fmt);
-  vsnprintf(buffer + 8, sizeof(buffer) - 8, fmt, args);
-  va_end(args);
-  TEMP_FAILURE_RETRY(__libc_write(2, buffer, strlen(buffer)));
-}
-
-#endif
-
-
-#ifndef SHARED
-/* We need a hook to force the cancelation wrappers and file locking
-   to be linked in when static libpthread is used.  */
-extern const int __pthread_provide_wrappers;
-static const int *const __pthread_require_wrappers =
-  &__pthread_provide_wrappers;
-extern const int __pthread_provide_lockfile;
-static const int *const __pthread_require_lockfile =
-  &__pthread_provide_lockfile;
-#endif
diff --git a/newlib/libc/sys/linux/linuxthreads/ptlongjmp.c b/newlib/libc/sys/linux/linuxthreads/ptlongjmp.c
deleted file mode 100644
index c2ac55f..0000000
--- a/newlib/libc/sys/linux/linuxthreads/ptlongjmp.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1998 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Redefine siglongjmp and longjmp so that they interact correctly
-   with cleanup handlers */
-
-#include <setjmp.h>
-#include "pthread.h"
-#include "internals.h"
-
-/* These functions are not declared anywhere since they shouldn't be
-   used at another place but here.  */
-extern void __libc_siglongjmp (sigjmp_buf env, int val)
-     __attribute__ ((noreturn));
-extern void __libc_longjmp (jmp_buf env, int val)
-     __attribute__ ((noreturn));
-
-
-static void pthread_cleanup_upto(jmp_buf target)
-{
-  pthread_descr self = thread_self();
-  struct _pthread_cleanup_buffer * c;
-  char *currentframe = CURRENT_STACK_FRAME;
-
-  for (c = THREAD_GETMEM(self, p_cleanup);
-       c != NULL && _JMPBUF_UNWINDS(target, c);
-       c = c->__prev)
-    {
-#if _STACK_GROWS_DOWN
-      if ((char *) c <= currentframe)
-	{
-	  c = NULL;
-	  break;
-	}
-#elif _STACK_GROWS_UP
-      if ((char *) c >= currentframe)
-	{
-	  c = NULL;
-	  break;
-	}
-#else
-# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
-#endif
-      c->__routine(c->__arg);
-    }
-  THREAD_SETMEM(self, p_cleanup, c);
-  if (THREAD_GETMEM(self, p_in_sighandler)
-      && _JMPBUF_UNWINDS(target, THREAD_GETMEM(self, p_in_sighandler)))
-    THREAD_SETMEM(self, p_in_sighandler, NULL);
-}
-
-void siglongjmp(sigjmp_buf env, int val)
-{
-  pthread_cleanup_upto(env.__buf);
-  __libc_siglongjmp(env, val);
-}
-
-void longjmp(jmp_buf env, int val)
-{
-  pthread_cleanup_upto(env);
-  __libc_longjmp(env, val);
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/queue.h b/newlib/libc/sys/linux/linuxthreads/queue.h
deleted file mode 100644
index 28bd755..0000000
--- a/newlib/libc/sys/linux/linuxthreads/queue.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Waiting queues */
-
-/* Waiting queues are represented by lists of thread descriptors
-   linked through their p_nextwaiting field.  The lists are kept
-   sorted by decreasing priority, and then decreasing waiting time. */
-
-static inline void enqueue(pthread_descr * q, pthread_descr th)
-{
-  int prio = th->p_priority;
-  ASSERT(th->p_nextwaiting == NULL);
-  for (; *q != NULL; q = &((*q)->p_nextwaiting)) {
-    if (prio > (*q)->p_priority) {
-      th->p_nextwaiting = *q;
-      *q = th;
-      return;
-    }
-  }
-  *q = th;
-}
-
-static inline pthread_descr dequeue(pthread_descr * q)
-{
-  pthread_descr th;
-  th = *q;
-  if (th != NULL) {
-    *q = th->p_nextwaiting;
-    th->p_nextwaiting = NULL;
-  }
-  return th;
-}
-
-static inline int remove_from_queue(pthread_descr * q, pthread_descr th)
-{
-  for (; *q != NULL; q = &((*q)->p_nextwaiting)) {
-    if (*q == th) {
-      *q = th->p_nextwaiting;
-      th->p_nextwaiting = NULL;
-      return 1;
-    }
-  }
-  return 0;
-}
-
-static inline int queue_is_empty(pthread_descr * q)
-{
-    return *q == NULL;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/reent.c b/newlib/libc/sys/linux/linuxthreads/reent.c
deleted file mode 100644
index 44d6f78..0000000
--- a/newlib/libc/sys/linux/linuxthreads/reent.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Define the location of _REENT for the newlib C library */
-
-#include <reent.h>
-#include "pthread.h"
-#include "internals.h"
-
-struct _reent * __thread_reent()
-{
-  pthread_descr self = thread_self();
-  return THREAD_GETMEM (self, p_reentp);
-}
-
-/* Return thread specific resolver state.  */
-struct __res_state * __res_state()
-{
-  pthread_descr self = thread_self();
-  return THREAD_GETMEM (self, p_resp);
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/reqsyscalls.c b/newlib/libc/sys/linux/linuxthreads/reqsyscalls.c
deleted file mode 100644
index 714a8ba..0000000
--- a/newlib/libc/sys/linux/linuxthreads/reqsyscalls.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* EL/IX level 1 and 2 libraries don't have the following syscalls,
-   but we need them due to our threading model based on processes */
-
-#include <time.h>
-#include <sched.h>
-#include <sys/wait.h>
-#include <machine/syscall.h>
-
-#define __NR___waitpid __NR_waitpid
-#define __NR___sched_getparam __NR_sched_getparam
-#define __NR___sched_getscheduler __NR_sched_getscheduler
-#define __NR___sched_setscheduler __NR_sched_setscheduler
-
-_syscall2(int,__sched_getparam,pid_t,pid,struct sched_param *,sched);
-_syscall1(int,__sched_getscheduler,pid_t,pid);
-_syscall3(int,__sched_setscheduler,pid_t,pid,int,policy,const struct sched_param *,sched);
-
-/* we want __libc____waitpid defined to support __waitpid which is
-   defined in wrapsyscall.c */
-_syscall3_base(pid_t,__waitpid,pid_t,pid,int *,wait_stat,int,options)
diff --git a/newlib/libc/sys/linux/linuxthreads/restart.h b/newlib/libc/sys/linux/linuxthreads/restart.h
deleted file mode 100644
index 24d9fab..0000000
--- a/newlib/libc/sys/linux/linuxthreads/restart.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-#include <signal.h>
-#include <kernel-features.h>
-
-/* Primitives for controlling thread execution */
-
-static inline void restart(pthread_descr th)
-{
-  /* See pthread.c */
-#if __ASSUME_REALTIME_SIGNALS
-  __pthread_restart_new(th);
-#else
-  __pthread_restart(th);
-#endif
-}
-
-static inline void suspend(pthread_descr self)
-{
-  /* See pthread.c */
-#if __ASSUME_REALTIME_SIGNALS
-  __pthread_wait_for_restart_signal(self);
-#else
-  __pthread_suspend(self);
-#endif
-}
-
-static inline int timedsuspend(pthread_descr self,
-		const struct timespec *abstime)
-{
-  /* See pthread.c */
-#if __ASSUME_REALTIME_SIGNALS
-  return __pthread_timedsuspend_new(self, abstime);
-#else
-  return __pthread_timedsuspend(self, abstime);
-#endif
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/rwlock.c b/newlib/libc/sys/linux/linuxthreads/rwlock.c
deleted file mode 100644
index e395970..0000000
--- a/newlib/libc/sys/linux/linuxthreads/rwlock.c
+++ /dev/null
@@ -1,658 +0,0 @@
-/* Read-write lock implementation.
-   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Xavier Leroy <Xavier.Leroy@inria.fr>
-   and Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <bits/libc-lock.h>
-#include <errno.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include "internals.h"
-#include "queue.h"
-#include "spinlock.h"
-#include "restart.h"
-
-/* Function called by pthread_cancel to remove the thread from
-   waiting inside pthread_rwlock_timedrdlock or pthread_rwlock_timedwrlock. */
-
-static int rwlock_rd_extricate_func(void *obj, pthread_descr th)
-{
-  pthread_rwlock_t *rwlock = obj;
-  int did_remove = 0;
-
-  __pthread_lock(&rwlock->__rw_lock, NULL);
-  did_remove = remove_from_queue(&rwlock->__rw_read_waiting, th);
-  __pthread_unlock(&rwlock->__rw_lock);
-
-  return did_remove;
-}
-
-static int rwlock_wr_extricate_func(void *obj, pthread_descr th)
-{
-  pthread_rwlock_t *rwlock = obj;
-  int did_remove = 0;
-
-  __pthread_lock(&rwlock->__rw_lock, NULL);
-  did_remove = remove_from_queue(&rwlock->__rw_write_waiting, th);
-  __pthread_unlock(&rwlock->__rw_lock);
-
-  return did_remove;
-}
-
-/*
- * Check whether the calling thread already owns one or more read locks on the
- * specified lock. If so, return a pointer to the read lock info structure
- * corresponding to that lock.
- */
-
-static pthread_readlock_info *
-rwlock_is_in_list(pthread_descr self, pthread_rwlock_t *rwlock)
-{
-  pthread_readlock_info *info;
-
-  for (info = THREAD_GETMEM (self, p_readlock_list); info != NULL;
-       info = info->pr_next)
-    {
-      if (info->pr_lock == rwlock)
-	return info;
-    }
-
-  return NULL;
-}
-
-/*
- * Add a new lock to the thread's list of locks for which it has a read lock.
- * A new info node must be allocated for this, which is taken from the thread's
- * free list, or by calling malloc. If malloc fails, a null pointer is
- * returned. Otherwise the lock info structure is initialized and pushed
- * onto the thread's list.
- */
-
-static pthread_readlock_info *
-rwlock_add_to_list(pthread_descr self, pthread_rwlock_t *rwlock)
-{
-  pthread_readlock_info *info = THREAD_GETMEM (self, p_readlock_free);
-
-  if (info != NULL)
-    THREAD_SETMEM (self, p_readlock_free, info->pr_next);
-  else
-    info = malloc(sizeof *info);
-
-  if (info == NULL)
-    return NULL;
-
-  info->pr_lock_count = 1;
-  info->pr_lock = rwlock;
-  info->pr_next = THREAD_GETMEM (self, p_readlock_list);
-  THREAD_SETMEM (self, p_readlock_list, info);
-
-  return info;
-}
-
-/*
- * If the thread owns a read lock over the given pthread_rwlock_t,
- * and this read lock is tracked in the thread's lock list,
- * this function returns a pointer to the info node in that list.
- * It also decrements the lock count within that node, and if
- * it reaches zero, it removes the node from the list.
- * If nothing is found, it returns a null pointer.
- */
-
-static pthread_readlock_info *
-rwlock_remove_from_list(pthread_descr self, pthread_rwlock_t *rwlock)
-{
-  pthread_readlock_info **pinfo;
-
-  for (pinfo = &self->p_readlock_list; *pinfo != NULL; pinfo = &(*pinfo)->pr_next)
-    {
-      if ((*pinfo)->pr_lock == rwlock)
-	{
-	  pthread_readlock_info *info = *pinfo;
-	  if (--info->pr_lock_count == 0)
-	    *pinfo = info->pr_next;
-	  return info;
-	}
-    }
-
-  return NULL;
-}
-
-/*
- * This function checks whether the conditions are right to place a read lock.
- * It returns 1 if so, otherwise zero. The rwlock's internal lock must be
- * locked upon entry.
- */
-
-static int
-rwlock_can_rdlock(pthread_rwlock_t *rwlock, int have_lock_already)
-{
-  /* Can't readlock; it is write locked. */
-  if (rwlock->__rw_writer != NULL)
-    return 0;
-
-  /* Lock prefers readers; get it. */
-  if (rwlock->__rw_kind == PTHREAD_RWLOCK_PREFER_READER_NP)
-    return 1;
-
-  /* Lock prefers writers, but none are waiting. */
-  if (queue_is_empty(&rwlock->__rw_write_waiting))
-    return 1;
-
-  /* Writers are waiting, but this thread already has a read lock */
-  if (have_lock_already)
-    return 1;
-
-  /* Writers are waiting, and this is a new lock */
-  return 0;
-}
-
-/*
- * This function helps support brain-damaged recursive read locking
- * semantics required by Unix 98, while maintaining write priority.
- * This basically determines whether this thread already holds a read lock
- * already. It returns 1 if so, otherwise it returns 0.
- *
- * If the thread has any ``untracked read locks'' then it just assumes
- * that this lock is among them, just to be safe, and returns 1.
- *
- * Also, if it finds the thread's lock in the list, it sets the pointer
- * referenced by pexisting to refer to the list entry.
- *
- * If the thread has no untracked locks, and the lock is not found
- * in its list, then it is added to the list. If this fails,
- * then *pout_of_mem is set to 1.
- */
-
-static int
-rwlock_have_already(pthread_descr *pself, pthread_rwlock_t *rwlock,
-    pthread_readlock_info **pexisting, int *pout_of_mem)
-{
-  pthread_readlock_info *existing = NULL;
-  int out_of_mem = 0, have_lock_already = 0;
-  pthread_descr self = *pself;
-
-  if (rwlock->__rw_kind == PTHREAD_RWLOCK_PREFER_WRITER_NP)
-    {
-      if (!self)
-	*pself = self = thread_self();
-
-      existing = rwlock_is_in_list(self, rwlock);
-
-      if (existing != NULL
-	  || THREAD_GETMEM (self, p_untracked_readlock_count) > 0)
-	have_lock_already = 1;
-      else
-	{
-	  existing = rwlock_add_to_list(self, rwlock);
-	  if (existing == NULL)
-	    out_of_mem = 1;
-	}
-    }
-
-  *pout_of_mem = out_of_mem;
-  *pexisting = existing;
-
-  return have_lock_already;
-}
-
-int
-__pthread_rwlock_init (pthread_rwlock_t *rwlock,
-		       const pthread_rwlockattr_t *attr)
-{
-  __pthread_init_lock(&rwlock->__rw_lock);
-  rwlock->__rw_readers = 0;
-  rwlock->__rw_writer = NULL;
-  rwlock->__rw_read_waiting = NULL;
-  rwlock->__rw_write_waiting = NULL;
-
-  if (attr == NULL)
-    {
-      rwlock->__rw_kind = PTHREAD_RWLOCK_DEFAULT_NP;
-      rwlock->__rw_pshared = PTHREAD_PROCESS_PRIVATE;
-    }
-  else
-    {
-      rwlock->__rw_kind = attr->__lockkind;
-      rwlock->__rw_pshared = attr->__pshared;
-    }
-
-  return 0;
-}
-strong_alias (__pthread_rwlock_init, pthread_rwlock_init)
-
-
-int
-__pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
-{
-  int readers;
-  _pthread_descr writer;
-
-  __pthread_lock (&rwlock->__rw_lock, NULL);
-  readers = rwlock->__rw_readers;
-  writer = rwlock->__rw_writer;
-  __pthread_unlock (&rwlock->__rw_lock);
-
-  if (readers > 0 || writer != NULL)
-    return EBUSY;
-
-  return 0;
-}
-strong_alias (__pthread_rwlock_destroy, pthread_rwlock_destroy)
-
-int
-__pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
-{
-  pthread_descr self = NULL;
-  pthread_readlock_info *existing;
-  int out_of_mem, have_lock_already;
-
-  have_lock_already = rwlock_have_already(&self, rwlock,
-					  &existing, &out_of_mem);
-
-  if (self == NULL)
-    self = thread_self ();
-
-  for (;;)
-    {
-      __pthread_lock (&rwlock->__rw_lock, self);
-
-      if (rwlock_can_rdlock(rwlock, have_lock_already))
-	break;
-
-      enqueue (&rwlock->__rw_read_waiting, self);
-      __pthread_unlock (&rwlock->__rw_lock);
-      suspend (self); /* This is not a cancellation point */
-    }
-
-  ++rwlock->__rw_readers;
-  __pthread_unlock (&rwlock->__rw_lock);
-
-  if (have_lock_already || out_of_mem)
-    {
-      if (existing != NULL)
-	++existing->pr_lock_count;
-      else
-	++self->p_untracked_readlock_count;
-    }
-
-  return 0;
-}
-strong_alias (__pthread_rwlock_rdlock, pthread_rwlock_rdlock)
-
-int
-__pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock,
-			      const struct timespec *abstime)
-{
-  pthread_descr self = NULL;
-  pthread_readlock_info *existing;
-  int out_of_mem, have_lock_already;
-  pthread_extricate_if extr;
-
-  if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
-    return EINVAL;
-
-  have_lock_already = rwlock_have_already(&self, rwlock,
-					  &existing, &out_of_mem);
-
-  if (self == NULL)
-    self = thread_self ();
-
-  /* Set up extrication interface */
-  extr.pu_object = rwlock;
-  extr.pu_extricate_func = rwlock_rd_extricate_func;
-
-  /* Register extrication interface */
-  __pthread_set_own_extricate_if (self, &extr);
-
-  for (;;)
-    {
-      __pthread_lock (&rwlock->__rw_lock, self);
-
-      if (rwlock_can_rdlock(rwlock, have_lock_already))
-	break;
-
-      enqueue (&rwlock->__rw_read_waiting, self);
-      __pthread_unlock (&rwlock->__rw_lock);
-      /* This is not a cancellation point */
-      if (timedsuspend (self, abstime) == 0)
-	{
-	  int was_on_queue;
-
-	  __pthread_lock (&rwlock->__rw_lock, self);
-	  was_on_queue = remove_from_queue (&rwlock->__rw_read_waiting, self);
-	  __pthread_unlock (&rwlock->__rw_lock);
-
-	  if (was_on_queue)
-	    {
-	      __pthread_set_own_extricate_if (self, 0);
-	      return ETIMEDOUT;
-	    }
-
-	  /* Eat the outstanding restart() from the signaller */
-	  suspend (self);
-	}
-    }
-
-  __pthread_set_own_extricate_if (self, 0);
-
-  ++rwlock->__rw_readers;
-  __pthread_unlock (&rwlock->__rw_lock);
-
-  if (have_lock_already || out_of_mem)
-    {
-      if (existing != NULL)
-	++existing->pr_lock_count;
-      else
-	++self->p_untracked_readlock_count;
-    }
-
-  return 0;
-}
-strong_alias (__pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock)
-
-int
-__pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
-{
-  pthread_descr self = thread_self();
-  pthread_readlock_info *existing;
-  int out_of_mem, have_lock_already;
-  int retval = EBUSY;
-
-  have_lock_already = rwlock_have_already(&self, rwlock,
-      &existing, &out_of_mem);
-
-  __pthread_lock (&rwlock->__rw_lock, self);
-
-  /* 0 is passed to here instead of have_lock_already.
-     This is to meet Single Unix Spec requirements:
-     if writers are waiting, pthread_rwlock_tryrdlock
-     does not acquire a read lock, even if the caller has
-     one or more read locks already. */
-
-  if (rwlock_can_rdlock(rwlock, 0))
-    {
-      ++rwlock->__rw_readers;
-      retval = 0;
-    }
-
-  __pthread_unlock (&rwlock->__rw_lock);
-
-  if (retval == 0)
-    {
-      if (have_lock_already || out_of_mem)
-	{
-	  if (existing != NULL)
-	    ++existing->pr_lock_count;
-	  else
-	    ++self->p_untracked_readlock_count;
-	}
-    }
-
-  return retval;
-}
-strong_alias (__pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock)
-
-
-int
-__pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
-{
-  pthread_descr self = thread_self ();
-
-  while(1)
-    {
-      __pthread_lock (&rwlock->__rw_lock, self);
-      if (rwlock->__rw_readers == 0 && rwlock->__rw_writer == NULL)
-	{
-	  rwlock->__rw_writer = self;
-	  __pthread_unlock (&rwlock->__rw_lock);
-	  return 0;
-	}
-
-      /* Suspend ourselves, then try again */
-      enqueue (&rwlock->__rw_write_waiting, self);
-      __pthread_unlock (&rwlock->__rw_lock);
-      suspend (self); /* This is not a cancellation point */
-    }
-}
-strong_alias (__pthread_rwlock_wrlock, pthread_rwlock_wrlock)
-
-
-int
-__pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock,
-			      const struct timespec *abstime)
-{
-  pthread_descr self;
-  pthread_extricate_if extr;
-
-  if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
-    return EINVAL;
-
-  self = thread_self ();
-
-  /* Set up extrication interface */
-  extr.pu_object = rwlock;
-  extr.pu_extricate_func =  rwlock_wr_extricate_func;
-
-  /* Register extrication interface */
-  __pthread_set_own_extricate_if (self, &extr);
-
-  while(1)
-    {
-      __pthread_lock (&rwlock->__rw_lock, self);
-
-      if (rwlock->__rw_readers == 0 && rwlock->__rw_writer == NULL)
-	{
-	  rwlock->__rw_writer = self;
-	  __pthread_set_own_extricate_if (self, 0);
-	  __pthread_unlock (&rwlock->__rw_lock);
-	  return 0;
-	}
-
-      /* Suspend ourselves, then try again */
-      enqueue (&rwlock->__rw_write_waiting, self);
-      __pthread_unlock (&rwlock->__rw_lock);
-      /* This is not a cancellation point */
-      if (timedsuspend (self, abstime) == 0)
-	{
-	  int was_on_queue;
-
-	  __pthread_lock (&rwlock->__rw_lock, self);
-	  was_on_queue = remove_from_queue (&rwlock->__rw_write_waiting, self);
-	  __pthread_unlock (&rwlock->__rw_lock);
-
-	  if (was_on_queue)
-	    {
-	      __pthread_set_own_extricate_if (self, 0);
-	      return ETIMEDOUT;
-	    }
-
-	  /* Eat the outstanding restart() from the signaller */
-	  suspend (self);
-	}
-    }
-}
-strong_alias (__pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock)
-
-
-int
-__pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
-{
-  int result = EBUSY;
-
-  __pthread_lock (&rwlock->__rw_lock, NULL);
-  if (rwlock->__rw_readers == 0 && rwlock->__rw_writer == NULL)
-    {
-      rwlock->__rw_writer = thread_self ();
-      result = 0;
-    }
-  __pthread_unlock (&rwlock->__rw_lock);
-
-  return result;
-}
-strong_alias (__pthread_rwlock_trywrlock, pthread_rwlock_trywrlock)
-
-
-int
-__pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
-{
-  pthread_descr torestart;
-  pthread_descr th;
-
-  __pthread_lock (&rwlock->__rw_lock, NULL);
-  if (rwlock->__rw_writer != NULL)
-    {
-      /* Unlocking a write lock.  */
-      if (rwlock->__rw_writer != thread_self ())
-	{
-	  __pthread_unlock (&rwlock->__rw_lock);
-	  return EPERM;
-	}
-      rwlock->__rw_writer = NULL;
-
-      if ((rwlock->__rw_kind == PTHREAD_RWLOCK_PREFER_READER_NP
-	   && !queue_is_empty(&rwlock->__rw_read_waiting))
-	  || (th = dequeue(&rwlock->__rw_write_waiting)) == NULL)
-	{
-	  /* Restart all waiting readers.  */
-	  torestart = rwlock->__rw_read_waiting;
-	  rwlock->__rw_read_waiting = NULL;
-	  __pthread_unlock (&rwlock->__rw_lock);
-	  while ((th = dequeue (&torestart)) != NULL)
-	    restart (th);
-	}
-      else
-	{
-	  /* Restart one waiting writer.  */
-	  __pthread_unlock (&rwlock->__rw_lock);
-	  restart (th);
-	}
-    }
-  else
-    {
-      /* Unlocking a read lock.  */
-      if (rwlock->__rw_readers == 0)
-	{
-	  __pthread_unlock (&rwlock->__rw_lock);
-	  return EPERM;
-	}
-
-      --rwlock->__rw_readers;
-      if (rwlock->__rw_readers == 0)
-	/* Restart one waiting writer, if any.  */
-	th = dequeue (&rwlock->__rw_write_waiting);
-      else
-	th = NULL;
-
-      __pthread_unlock (&rwlock->__rw_lock);
-      if (th != NULL)
-	restart (th);
-
-      /* Recursive lock fixup */
-
-      if (rwlock->__rw_kind == PTHREAD_RWLOCK_PREFER_WRITER_NP)
-	{
-	  pthread_descr self = thread_self();
-	  pthread_readlock_info *victim = rwlock_remove_from_list(self, rwlock);
-
-	  if (victim != NULL)
-	    {
-	      if (victim->pr_lock_count == 0)
-		{
-		  victim->pr_next = THREAD_GETMEM (self, p_readlock_free);
-		  THREAD_SETMEM (self, p_readlock_free, victim);
-		}
-	    }
-	  else
-	    {
-	      int val = THREAD_GETMEM (self, p_untracked_readlock_count);
-	      if (val > 0)
-		THREAD_SETMEM (self, p_untracked_readlock_count, val - 1);
-	    }
-	}
-    }
-
-  return 0;
-}
-strong_alias (__pthread_rwlock_unlock, pthread_rwlock_unlock)
-
-
-
-int
-pthread_rwlockattr_init (pthread_rwlockattr_t *attr)
-{
-  attr->__lockkind = 0;
-  attr->__pshared = PTHREAD_PROCESS_PRIVATE;
-
-  return 0;
-}
-
-
-int
-__pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr)
-{
-  return 0;
-}
-strong_alias (__pthread_rwlockattr_destroy, pthread_rwlockattr_destroy)
-
-
-int
-pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr, int *pshared)
-{
-  *pshared = attr->__pshared;
-  return 0;
-}
-
-
-int
-pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared)
-{
-  if (pshared != PTHREAD_PROCESS_PRIVATE && pshared != PTHREAD_PROCESS_SHARED)
-    return EINVAL;
-
-  /* For now it is not possible to shared a conditional variable.  */
-  if (pshared != PTHREAD_PROCESS_PRIVATE)
-    return ENOSYS;
-
-  attr->__pshared = pshared;
-
-  return 0;
-}
-
-
-int
-pthread_rwlockattr_getkind_np (const pthread_rwlockattr_t *attr, int *pref)
-{
-  *pref = attr->__lockkind;
-  return 0;
-}
-
-
-int
-pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *attr, int pref)
-{
-  if (pref != PTHREAD_RWLOCK_PREFER_READER_NP
-      && pref != PTHREAD_RWLOCK_PREFER_WRITER_NP
-      && pref != PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
-      && pref != PTHREAD_RWLOCK_DEFAULT_NP)
-    return EINVAL;
-
-  attr->__lockkind = pref;
-
-  return 0;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/semaphore.c b/newlib/libc/sys/linux/linuxthreads/semaphore.c
deleted file mode 100644
index e0dac41..0000000
--- a/newlib/libc/sys/linux/linuxthreads/semaphore.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Semaphores a la POSIX 1003.1b */
-
-#include <errno.h>
-#include "pthread.h"
-#include "semaphore.h"
-#include "internals.h"
-#include "spinlock.h"
-#include "restart.h"
-#include "queue.h"
-#include <shlib-compat.h>
-
-int __new_sem_init(sem_t *sem, int pshared, unsigned int value)
-{
-  if (value > SEM_VALUE_MAX) {
-    errno = EINVAL;
-    return -1;
-  }
-  if (pshared) {
-    errno = ENOSYS;
-    return -1;
-  }
-  __pthread_init_lock(&sem->__sem_lock);
-  sem->__sem_value = value;
-  sem->__sem_waiting = NULL;
-  return 0;
-}
-
-/* Function called by pthread_cancel to remove the thread from
-   waiting inside __new_sem_wait. */
-
-static int new_sem_extricate_func(void *obj, pthread_descr th)
-{
-  volatile pthread_descr self = thread_self();
-  sem_t *sem = obj;
-  int did_remove = 0;
-
-  __pthread_lock(&sem->__sem_lock, self);
-  did_remove = remove_from_queue(&sem->__sem_waiting, th);
-  __pthread_unlock(&sem->__sem_lock);
-
-  return did_remove;
-}
-
-int __new_sem_wait(sem_t * sem)
-{
-  volatile pthread_descr self = thread_self();
-  pthread_extricate_if extr;
-  int already_canceled = 0;
-  int spurious_wakeup_count;
-
-  /* Set up extrication interface */
-  extr.pu_object = sem;
-  extr.pu_extricate_func = new_sem_extricate_func;
-
-  __pthread_lock(&sem->__sem_lock, self);
-  if (sem->__sem_value > 0) {
-    sem->__sem_value--;
-    __pthread_unlock(&sem->__sem_lock);
-    return 0;
-  }
-  /* Register extrication interface */
-  THREAD_SETMEM(self, p_sem_avail, 0);
-  __pthread_set_own_extricate_if(self, &extr);
-  /* Enqueue only if not already cancelled. */
-  if (!(THREAD_GETMEM(self, p_canceled)
-      && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE))
-    enqueue(&sem->__sem_waiting, self);
-  else
-    already_canceled = 1;
-  __pthread_unlock(&sem->__sem_lock);
-
-  if (already_canceled) {
-    __pthread_set_own_extricate_if(self, 0);
-    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-  }
-
-  /* Wait for sem_post or cancellation, or fall through if already canceled */
-  spurious_wakeup_count = 0;
-  while (1)
-    {
-      suspend(self);
-      if (THREAD_GETMEM(self, p_sem_avail) == 0
-	  && (THREAD_GETMEM(self, p_woken_by_cancel) == 0
-	      || THREAD_GETMEM(self, p_cancelstate) != PTHREAD_CANCEL_ENABLE))
-	{
-	  /* Count resumes that don't belong to us. */
-	  spurious_wakeup_count++;
-	  continue;
-	}
-      break;
-    }
-  __pthread_set_own_extricate_if(self, 0);
-
-  /* Terminate only if the wakeup came from cancellation. */
-  /* Otherwise ignore cancellation because we got the semaphore. */
-
-  if (THREAD_GETMEM(self, p_woken_by_cancel)
-      && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) {
-    THREAD_SETMEM(self, p_woken_by_cancel, 0);
-    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-  }
-  /* We got the semaphore */
-  return 0;
-}
-
-int __new_sem_trywait(sem_t * sem)
-{
-  int retval;
-
-  __pthread_lock(&sem->__sem_lock, NULL);
-  if (sem->__sem_value == 0) {
-    errno = EAGAIN;
-    retval = -1;
-  } else {
-    sem->__sem_value--;
-    retval = 0;
-  }
-  __pthread_unlock(&sem->__sem_lock);
-  return retval;
-}
-
-int __new_sem_post(sem_t * sem)
-{
-  pthread_descr self = thread_self();
-  pthread_descr th;
-  struct pthread_request request;
-
-  if (THREAD_GETMEM(self, p_in_sighandler) == NULL) {
-    __pthread_lock(&sem->__sem_lock, self);
-    if (sem->__sem_waiting == NULL) {
-      if (sem->__sem_value >= SEM_VALUE_MAX) {
-        /* Overflow */
-        errno = ERANGE;
-        __pthread_unlock(&sem->__sem_lock);
-        return -1;
-      }
-      sem->__sem_value++;
-      __pthread_unlock(&sem->__sem_lock);
-    } else {
-      th = dequeue(&sem->__sem_waiting);
-      __pthread_unlock(&sem->__sem_lock);
-      th->p_sem_avail = 1;
-      WRITE_MEMORY_BARRIER();
-      restart(th);
-    }
-  } else {
-    /* If we're in signal handler, delegate post operation to
-       the thread manager. */
-    if (__pthread_manager_request < 0) {
-      if (__pthread_initialize_manager() < 0) {
-        errno = EAGAIN;
-        return -1;
-      }
-    }
-    request.req_kind = REQ_POST;
-    request.req_args.post = sem;
-    TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request,
-				    (char *) &request, sizeof(request)));
-  }
-  return 0;
-}
-
-int __new_sem_getvalue(sem_t * sem, int * sval)
-{
-  *sval = sem->__sem_value;
-  return 0;
-}
-
-int __new_sem_destroy(sem_t * sem)
-{
-  if (sem->__sem_waiting != NULL) {
-    __set_errno (EBUSY);
-    return -1;
-  }
-  return 0;
-}
-
-sem_t *sem_open(const char *name, int oflag, ...)
-{
-  __set_errno (ENOSYS);
-  return SEM_FAILED;
-}
-
-int sem_close(sem_t *sem)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-
-int sem_unlink(const char *name)
-{
-  __set_errno (ENOSYS);
-  return -1;
-}
-
-int sem_timedwait(sem_t *sem, const struct timespec *abstime)
-{
-  pthread_descr self = thread_self();
-  pthread_extricate_if extr;
-  int already_canceled = 0;
-  int spurious_wakeup_count;
-
-  __pthread_lock(&sem->__sem_lock, self);
-  if (sem->__sem_value > 0) {
-    --sem->__sem_value;
-    __pthread_unlock(&sem->__sem_lock);
-    return 0;
-  }
-
-  if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) {
-    /* The standard requires that if the function would block and the
-       time value is illegal, the function returns with an error.  */
-    __pthread_unlock(&sem->__sem_lock);
-    return EINVAL;
-  }
-
-  /* Set up extrication interface */
-  extr.pu_object = sem;
-  extr.pu_extricate_func = new_sem_extricate_func;
-
-  /* Register extrication interface */
-  THREAD_SETMEM(self, p_sem_avail, 0);
-  __pthread_set_own_extricate_if(self, &extr);
-  /* Enqueue only if not already cancelled. */
-  if (!(THREAD_GETMEM(self, p_canceled)
-      && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE))
-    enqueue(&sem->__sem_waiting, self);
-  else
-    already_canceled = 1;
-  __pthread_unlock(&sem->__sem_lock);
-
-  if (already_canceled) {
-    __pthread_set_own_extricate_if(self, 0);
-    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-  }
-
-  spurious_wakeup_count = 0;
-  while (1)
-    {
-      if (timedsuspend(self, abstime) == 0) {
-	int was_on_queue;
-
-	/* __pthread_lock will queue back any spurious restarts that
-	   may happen to it. */
-
-	__pthread_lock(&sem->__sem_lock, self);
-	was_on_queue = remove_from_queue(&sem->__sem_waiting, self);
-	__pthread_unlock(&sem->__sem_lock);
-
-	if (was_on_queue) {
-	  __pthread_set_own_extricate_if(self, 0);
-	  return ETIMEDOUT;
-	}
-
-	/* Eat the outstanding restart() from the signaller */
-	suspend(self);
-      }
-
-      if (THREAD_GETMEM(self, p_sem_avail) == 0
-	  && (THREAD_GETMEM(self, p_woken_by_cancel) == 0
-	      || THREAD_GETMEM(self, p_cancelstate) != PTHREAD_CANCEL_ENABLE))
-	{
-	  /* Count resumes that don't belong to us. */
-	  spurious_wakeup_count++;
-	  continue;
-	}
-      break;
-    }
-
- __pthread_set_own_extricate_if(self, 0);
-
-  /* Terminate only if the wakeup came from cancellation. */
-  /* Otherwise ignore cancellation because we got the semaphore. */
-
-  if (THREAD_GETMEM(self, p_woken_by_cancel)
-      && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) {
-    THREAD_SETMEM(self, p_woken_by_cancel, 0);
-    __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME);
-  }
-  /* We got the semaphore */
-  return 0;
-}
-
-
-versioned_symbol (libpthread, __new_sem_init, sem_init, GLIBC_2_1);
-versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1);
-versioned_symbol (libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1);
-versioned_symbol (libpthread, __new_sem_post, sem_post, GLIBC_2_1);
-versioned_symbol (libpthread, __new_sem_getvalue, sem_getvalue, GLIBC_2_1);
-versioned_symbol (libpthread, __new_sem_destroy, sem_destroy, GLIBC_2_1);
diff --git a/newlib/libc/sys/linux/linuxthreads/semaphore.h b/newlib/libc/sys/linux/linuxthreads/semaphore.h
deleted file mode 100644
index 5971f0d..0000000
--- a/newlib/libc/sys/linux/linuxthreads/semaphore.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-#ifndef _SEMAPHORE_H
-#define _SEMAPHORE_H    1
-
-#include <features.h>
-#include <sys/types.h>
-#include <bits/pthreadtypes.h>
-#ifdef __USE_XOPEN2K
-# define __need_timespec
-# include <time.h>
-#endif
-
-#ifndef _PTHREAD_DESCR_DEFINED
-/* Thread descriptors.  Needed for `sem_t' definition.  */
-typedef struct _pthread_descr_struct *_pthread_descr;
-# define _PTHREAD_DESCR_DEFINED
-#endif
-
-/* System specific semaphore definition.  */
-typedef struct
-{
-  struct _pthread_fastlock __sem_lock;
-  int __sem_value;
-  _pthread_descr __sem_waiting;
-} sem_t;
-
-
-
-/* Value returned if `sem_open' failed.  */
-#define SEM_FAILED	((sem_t *) 0)
-
-/* Maximum value the semaphore can have.  */
-#define SEM_VALUE_MAX 	((int) ((~0u) >> 1))
-
-
-__BEGIN_DECLS
-
-/* Initialize semaphore object SEM to VALUE.  If PSHARED then share it
-   with other processes.  */
-extern int sem_init (sem_t *__sem, int __pshared, unsigned int __value) __THROW;
-
-/* Free resources associated with semaphore object SEM.  */
-extern int sem_destroy (sem_t *__sem) __THROW;
-
-/* Open a named semaphore NAME with open flaot OFLAG.  */
-extern sem_t *sem_open (__const char *__name, int __oflag, ...) __THROW;
-
-/* Close descriptor for named semaphore SEM.  */
-extern int sem_close (sem_t *__sem) __THROW;
-
-/* Remove named semaphore NAME.  */
-extern int sem_unlink (__const char *__name) __THROW;
-
-/* Wait for SEM being posted.  */
-extern int sem_wait (sem_t *__sem) __THROW;
-
-#ifdef __USE_XOPEN2K
-/* Similar to `sem_wait' but wait only until ABSTIME.  */
-extern int sem_timedwait (sem_t *__restrict __sem,
-			  __const struct timespec *__restrict __abstime)
-     __THROW;
-#endif
-
-/* Test whether SEM is posted.  */
-extern int sem_trywait (sem_t *__sem) __THROW;
-
-/* Post SEM.  */
-extern int sem_post (sem_t *__sem) __THROW;
-
-/* Get current value of SEM and store it in *SVAL.  */
-extern int sem_getvalue (sem_t *__restrict __sem, int *__restrict __sval)
-     __THROW;
-
-__END_DECLS
-
-#endif  /* semaphore.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/shlib-compat.h b/newlib/libc/sys/linux/linuxthreads/shlib-compat.h
deleted file mode 100644
index 245b8aa..0000000
--- a/newlib/libc/sys/linux/linuxthreads/shlib-compat.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Macros for managing ABI-compatibility definitions using ELF symbol versions.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _SHLIB_COMPAT_H
-#define _SHLIB_COMPAT_H	1
-
-#if defined HAVE_ELF && defined DO_VERSIONING
-/* Since there is just one set of .d files generated, we need to
-   include this unconditionally to have the dependency noticed properly.  */
-#include <abi-versions.h>	/* header generated by abi-versions.awk */
-#endif
-
-#if defined HAVE_ELF && defined SHARED && defined DO_VERSIONING
-
-/* The file abi-versions.h (generated by scripts/abi-versions.awk) defines
-   symbols like `ABI_libm_GLIBC_2_0' for each version set in the source
-   code for each library.  For a version set that is subsumed by a later
-   version set, the definition gives the subsuming set, i.e. if GLIBC_2_0
-   is subsumed by GLIBC_2_1, then ABI_libm_GLIBC_2_0 == ABI_libm_GLIBC_2_1.
-   Each version set that is to be distinctly defined in the output has an
-   unique positive integer value, increasing with newer versions.  Thus,
-   evaluating two ABI_* symbols reduces to integer values that differ only
-   when the two version sets named are in fact two different ABIs we are
-   supporting.  If these do not differ, then there is no need to compile in
-   extra code to support this version set where it has been superseded by a
-   newer version.  The compatibility code should be conditionalized with
-   e.g. `#if SHLIB_COMPAT (libm, GLIBC_2_0, GLIBC_2_2)' for code introduced
-   in the GLIBC_2.0 version and obsoleted in the GLIBC_2.2 version.  */
-
-# define SHLIB_COMPAT(lib, introduced, obsoleted) \
-  (!(ABI_##lib##_##obsoleted - 0) \
-   || ((ABI_##lib##_##introduced - 0) < (ABI_##lib##_##obsoleted - 0)))
-
-/* That header also defines symbols like `VERSION_libm_GLIBC_2_1' to
-   the version set name to use for e.g. symbols first introduced into
-   libm in the GLIBC_2.1 version.  Definitions of symbols with explicit
-   versions should look like:
-   	versioned_symbol (libm, new_foo, foo, GLIBC_2_1);
-   This will define the symbol `foo' with the appropriate default version,
-   i.e. either GLIBC_2.1 or the "earliest version" specified in
-   shlib-versions if that is newer.  */
-
-# define versioned_symbol(lib, local, symbol, version) \
-  versioned_symbol_1 (local, symbol, VERSION_##lib##_##version)
-# define versioned_symbol_1(local, symbol, name) \
-  default_symbol_version (local, symbol, name)
-
-# define compat_symbol(lib, local, symbol, version) \
-  compat_symbol_1 (local, symbol, VERSION_##lib##_##version)
-# define compat_symbol_1(local, symbol, name) \
-  symbol_version (local, symbol, name)
-
-#else
-
-/* Not compiling ELF shared libraries at all, so never any old versions.  */
-# define SHLIB_COMPAT(lib, introduced, obsoleted)	0
-
-/* No versions to worry about, just make this the global definition.  */
-# define versioned_symbol(lib, local, symbol, version) \
-  weak_alias (local, symbol)
-
-/* This should not appear outside `#if SHLIB_COMPAT (...)'.  */
-# define compat_symbol(lib, local, symbol, version) ...
-
-#endif
-
-
-#endif	/* shlib-compat.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/signals.c b/newlib/libc/sys/linux/linuxthreads/signals.c
deleted file mode 100644
index da3ce69..0000000
--- a/newlib/libc/sys/linux/linuxthreads/signals.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Handling of signals */
-
-#include <errno.h>
-#include <signal.h>
-#include "pthread.h"
-#include "internals.h"
-#include "spinlock.h"
-#include <ucontext.h>
-#include <sigcontextinfo.h>
-
-int pthread_sigmask(int how, const sigset_t * newmask, sigset_t * oldmask)
-{
-  sigset_t mask;
-
-  if (newmask != NULL) {
-    mask = *newmask;
-    /* Don't allow __pthread_sig_restart to be unmasked.
-       Don't allow __pthread_sig_cancel to be masked. */
-    switch(how) {
-    case SIG_SETMASK:
-      sigaddset(&mask, __pthread_sig_restart);
-      sigdelset(&mask, __pthread_sig_cancel);
-      break;
-    case SIG_BLOCK:
-      sigdelset(&mask, __pthread_sig_cancel);
-      break;
-    case SIG_UNBLOCK:
-      sigdelset(&mask, __pthread_sig_restart);
-      break;
-    }
-    newmask = &mask;
-  }
-  if (sigprocmask(how, newmask, oldmask) == -1)
-    return errno;
-  else
-    return 0;
-}
-
-int pthread_kill(pthread_t thread, int signo)
-{
-  pthread_handle handle = thread_handle(thread);
-  int pid;
-
-  __pthread_lock(&handle->h_lock, NULL);
-  if (invalid_handle(handle, thread)) {
-    __pthread_unlock(&handle->h_lock);
-    return ESRCH;
-  }
-  pid = handle->h_descr->p_pid;
-  __pthread_unlock(&handle->h_lock);
-  if (kill(pid, signo) == -1)
-    return errno;
-  else
-    return 0;
-}
-
-/* User-provided signal handlers */
-typedef void (*arch_sighandler_t) (int, SIGCONTEXT);
-static union
-{
-  arch_sighandler_t old;
-  void (*rt) (int, struct siginfo *, struct ucontext *);
-} sighandler[NSIG] = { [1 ... NSIG - 1] = { (arch_sighandler_t) SIG_ERR } };
-
-/* The wrapper around user-provided signal handlers */
-static void pthread_sighandler(int signo, SIGCONTEXT ctx)
-{
-  pthread_descr self;
-  char * in_sighandler;
-  self = thread_self();
-  /* If we're in a sigwait operation, just record the signal received
-     and return without calling the user's handler */
-  if (THREAD_GETMEM(self, p_sigwaiting)) {
-    THREAD_SETMEM(self, p_sigwaiting, 0);
-    THREAD_SETMEM(self, p_signal, signo);
-    return;
-  }
-  /* Record that we're in a signal handler and call the user's
-     handler function */
-  in_sighandler = THREAD_GETMEM(self, p_in_sighandler);
-  if (in_sighandler == NULL)
-    THREAD_SETMEM(self, p_in_sighandler, CURRENT_STACK_FRAME);
-  CALL_SIGHANDLER(sighandler[signo].old, signo, ctx);
-  if (in_sighandler == NULL)
-    THREAD_SETMEM(self, p_in_sighandler, NULL);
-}
-
-/* The same, this time for real-time signals.  */
-static void pthread_sighandler_rt(int signo, struct siginfo *si,
-				  struct ucontext *uc)
-{
-  pthread_descr self;
-  char * in_sighandler;
-  self =  thread_self();
-  /* If we're in a sigwait operation, just record the signal received
-     and return without calling the user's handler */
-  if (THREAD_GETMEM(self, p_sigwaiting)) {
-    THREAD_SETMEM(self, p_sigwaiting, 0);
-    THREAD_SETMEM(self, p_signal, signo);
-    return;
-  }
-  /* Record that we're in a signal handler and call the user's
-     handler function */
-  in_sighandler = THREAD_GETMEM(self, p_in_sighandler);
-  if (in_sighandler == NULL)
-    THREAD_SETMEM(self, p_in_sighandler, CURRENT_STACK_FRAME);
-  sighandler[signo].rt(signo, si, uc);
-  if (in_sighandler == NULL)
-    THREAD_SETMEM(self, p_in_sighandler, NULL);
-}
-
-/* The wrapper around sigaction.  Install our own signal handler
-   around the signal. */
-int __sigaction(int sig, const struct sigaction * act,
-              struct sigaction * oact)
-{
-  struct sigaction newact;
-  struct sigaction *newactp;
-
-  if (sig == __pthread_sig_restart ||
-      sig == __pthread_sig_cancel ||
-      (sig == __pthread_sig_debug && __pthread_sig_debug > 0))
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-  if (act)
-    {
-      newact = *act;
-      if (act->sa_handler != SIG_IGN && act->sa_handler != SIG_DFL
-	  && sig > 0 && sig < NSIG)
-	{
-	  if (act->sa_flags & SA_SIGINFO)
-	    newact.sa_handler = (__sighandler_t) pthread_sighandler_rt;
-	  else
-	    newact.sa_handler = (__sighandler_t) pthread_sighandler;
-	}
-      newactp = &newact;
-    }
-  else
-    newactp = NULL;
-  if (__libc_sigaction(sig, newactp, oact) == -1)
-    return -1;
-  if (sig > 0 && sig < NSIG)
-    {
-      if (oact != NULL
-	  /* We may have inherited SIG_IGN from the parent, so return the
-	     kernel's idea of the signal handler the first time
-	     through.  */
-	  && (__sighandler_t) sighandler[sig].old != SIG_ERR)
-	oact->sa_handler = (__sighandler_t) sighandler[sig].old;
-      if (act)
-	/* For the assignment it does not matter whether it's a normal
-	   or real-time signal.  */
-	sighandler[sig].old = (arch_sighandler_t) act->sa_handler;
-    }
-  return 0;
-}
-strong_alias(__sigaction, sigaction)
-
-/* A signal handler that does nothing */
-static void pthread_null_sighandler(int sig) { }
-
-/* sigwait -- synchronously wait for a signal */
-int sigwait(const sigset_t * set, int * sig)
-{
-  volatile pthread_descr self = thread_self();
-  sigset_t mask;
-  int s;
-  sigjmp_buf jmpbuf;
-  struct sigaction sa;
-
-  /* Get ready to block all signals except those in set
-     and the cancellation signal.
-     Also check that handlers are installed on all signals in set,
-     and if not, install our dummy handler.  This is conformant to
-     POSIX: "The effect of sigwait() on the signal actions for the
-     signals in set is unspecified." */
-  sigfillset(&mask);
-  sigdelset(&mask, __pthread_sig_cancel);
-  for (s = 1; s < NSIG; s++) {
-    if (sigismember(set, s) &&
-        s != __pthread_sig_restart &&
-        s != __pthread_sig_cancel &&
-        s != __pthread_sig_debug) {
-      sigdelset(&mask, s);
-      if (sighandler[s].old == (arch_sighandler_t) SIG_ERR ||
-          sighandler[s].old == (arch_sighandler_t) SIG_DFL ||
-          sighandler[s].old == (arch_sighandler_t) SIG_IGN) {
-        sa.sa_handler = pthread_null_sighandler;
-        sigfillset(&sa.sa_mask);
-        sa.sa_flags = 0;
-        sigaction(s, &sa, NULL);
-      }
-    }
-  }
-  /* Test for cancellation */
-  if (sigsetjmp(jmpbuf, 1) == 0) {
-    THREAD_SETMEM(self, p_cancel_jmp, &jmpbuf);
-    if (! (THREAD_GETMEM(self, p_canceled)
-	   && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE)) {
-      /* Reset the signal count */
-      THREAD_SETMEM(self, p_signal, 0);
-      /* Say we're in sigwait */
-      THREAD_SETMEM(self, p_sigwaiting, 1);
-      /* Unblock the signals and wait for them */
-      sigsuspend(&mask);
-    }
-  }
-  THREAD_SETMEM(self, p_cancel_jmp, NULL);
-  /* The signals are now reblocked.  Check for cancellation */
-  pthread_testcancel();
-  /* We should have self->p_signal != 0 and equal to the signal received */
-  *sig = THREAD_GETMEM(self, p_signal);
-  return 0;
-}
-
-/* Redefine raise() to send signal to calling thread only,
-   as per POSIX 1003.1c */
-int raise (int sig)
-{
-  int retcode = pthread_kill(pthread_self(), sig);
-  if (retcode == 0)
-    return 0;
-  else {
-    errno = retcode;
-    return -1;
-  }
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/specific.c b/newlib/libc/sys/linux/linuxthreads/specific.c
deleted file mode 100644
index 2dbf205..0000000
--- a/newlib/libc/sys/linux/linuxthreads/specific.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Thread-specific data */
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include "pthread.h"
-#include "internals.h"
-#include "spinlock.h"
-#include "restart.h"
-#include <bits/libc-lock.h>
-
-
-/* Table of keys. */
-
-static struct pthread_key_struct pthread_keys[PTHREAD_KEYS_MAX] =
-  { { 0, NULL } };
-
-/* For debugging purposes put the maximum number of keys in a variable.  */
-const int __linuxthreads_pthread_keys_max = PTHREAD_KEYS_MAX;
-const int __linuxthreads_pthread_key_2ndlevel_size = PTHREAD_KEY_2NDLEVEL_SIZE;
-
-/* Mutex to protect access to pthread_keys */
-
-static pthread_mutex_t pthread_keys_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-/* Create a new key */
-
-int __pthread_key_create(pthread_key_t * key, destr_function destr)
-{
-  int i;
-
-  pthread_mutex_lock(&pthread_keys_mutex);
-  for (i = 0; i < PTHREAD_KEYS_MAX; i++) {
-    if (! pthread_keys[i].in_use) {
-      /* Mark key in use */
-      pthread_keys[i].in_use = 1;
-      pthread_keys[i].destr = destr;
-      pthread_mutex_unlock(&pthread_keys_mutex);
-      *key = i;
-      return 0;
-    }
-  }
-  pthread_mutex_unlock(&pthread_keys_mutex);
-  return EAGAIN;
-}
-strong_alias (__pthread_key_create, pthread_key_create)
-
-/* Reset deleted key's value to NULL in each live thread.
- * NOTE: this executes in the context of the thread manager! */
-
-struct pthread_key_delete_helper_args {
-  /* Damn, we need lexical closures in C! ;) */
-  unsigned int idx1st, idx2nd;
-  pthread_descr self;
-};
-
-static void pthread_key_delete_helper(void *arg, pthread_descr th)
-{
-  struct pthread_key_delete_helper_args *args = arg;
-  unsigned int idx1st = args->idx1st;
-  unsigned int idx2nd = args->idx2nd;
-  pthread_descr self = args->self;
-
-  if (self == 0)
-    self = args->self = thread_self();
-
-  if (!th->p_terminated) {
-    /* pthread_exit() may try to free th->p_specific[idx1st] concurrently. */
-    __pthread_lock(THREAD_GETMEM(th, p_lock), self);
-    if (th->p_specific[idx1st] != NULL)
-      th->p_specific[idx1st][idx2nd] = NULL;
-    __pthread_unlock(THREAD_GETMEM(th, p_lock));
-  }
-}
-
-/* Delete a key */
-int pthread_key_delete(pthread_key_t key)
-{
-  pthread_descr self = thread_self();
-
-  pthread_mutex_lock(&pthread_keys_mutex);
-  if (key >= PTHREAD_KEYS_MAX || !pthread_keys[key].in_use) {
-    pthread_mutex_unlock(&pthread_keys_mutex);
-    return EINVAL;
-  }
-  pthread_keys[key].in_use = 0;
-  pthread_keys[key].destr = NULL;
-
-  /* Set the value of the key to NULL in all running threads, so
-     that if the key is reallocated later by pthread_key_create, its
-     associated values will be NULL in all threads.
-
-     Do nothing if no threads have been created yet.  */
-
-  if (__pthread_manager_request != -1)
-    {
-      struct pthread_key_delete_helper_args args;
-      struct pthread_request request;
-
-      args.idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
-      args.idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
-      args.self = 0;
-
-      request.req_thread = self;
-      request.req_kind = REQ_FOR_EACH_THREAD;
-      request.req_args.for_each.arg = &args;
-      request.req_args.for_each.fn = pthread_key_delete_helper;
-
-      TEMP_FAILURE_RETRY(__libc_write(__pthread_manager_request,
-				      (char *) &request, sizeof(request)));
-      suspend(self);
-    }
-
-  pthread_mutex_unlock(&pthread_keys_mutex);
-  return 0;
-}
-
-/* Set the value of a key */
-
-int __pthread_setspecific(pthread_key_t key, const void * pointer)
-{
-  pthread_descr self = thread_self();
-  unsigned int idx1st, idx2nd;
-
-  if (key >= PTHREAD_KEYS_MAX || !pthread_keys[key].in_use)
-    return EINVAL;
-  idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
-  idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
-  if (THREAD_GETMEM_NC(self, p_specific[idx1st]) == NULL) {
-    void *newp = calloc(PTHREAD_KEY_2NDLEVEL_SIZE, sizeof (void *));
-    if (newp == NULL)
-      return ENOMEM;
-    THREAD_SETMEM_NC(self, p_specific[idx1st], newp);
-  }
-  THREAD_GETMEM_NC(self, p_specific[idx1st])[idx2nd] = (void *) pointer;
-  return 0;
-}
-strong_alias (__pthread_setspecific, pthread_setspecific)
-
-/* Get the value of a key */
-
-void * __pthread_getspecific(pthread_key_t key)
-{
-  pthread_descr self = thread_self();
-  unsigned int idx1st, idx2nd;
-
-  if (key >= PTHREAD_KEYS_MAX)
-    return NULL;
-  idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
-  idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
-  if (THREAD_GETMEM_NC(self, p_specific[idx1st]) == NULL
-      || !pthread_keys[key].in_use)
-    return NULL;
-  return THREAD_GETMEM_NC(self, p_specific[idx1st])[idx2nd];
-}
-strong_alias (__pthread_getspecific, pthread_getspecific)
-
-/* Call the destruction routines on all keys */
-
-void __pthread_destroy_specifics()
-{
-  pthread_descr self = thread_self();
-  int i, j, round, found_nonzero;
-  destr_function destr;
-  void * data;
-
-  for (round = 0, found_nonzero = 1;
-       found_nonzero && round < PTHREAD_DESTRUCTOR_ITERATIONS;
-       round++) {
-    found_nonzero = 0;
-    for (i = 0; i < PTHREAD_KEY_1STLEVEL_SIZE; i++)
-      if (THREAD_GETMEM_NC(self, p_specific[i]) != NULL)
-        for (j = 0; j < PTHREAD_KEY_2NDLEVEL_SIZE; j++) {
-          destr = pthread_keys[i * PTHREAD_KEY_2NDLEVEL_SIZE + j].destr;
-          data = THREAD_GETMEM_NC(self, p_specific[i])[j];
-          if (destr != NULL && data != NULL) {
-            THREAD_GETMEM_NC(self, p_specific[i])[j] = NULL;
-            destr(data);
-            found_nonzero = 1;
-          }
-        }
-  }
-  __pthread_lock(THREAD_GETMEM(self, p_lock), self);
-  for (i = 0; i < PTHREAD_KEY_1STLEVEL_SIZE; i++) {
-    if (THREAD_GETMEM_NC(self, p_specific[i]) != NULL) {
-      free(THREAD_GETMEM_NC(self, p_specific[i]));
-      THREAD_SETMEM_NC(self, p_specific[i], NULL);
-    }
-  }
-  __pthread_unlock(THREAD_GETMEM(self, p_lock));
-}
-
-/* Thread-specific data for libc. */
-
-static int
-libc_internal_tsd_set(enum __libc_tsd_key_t key, const void * pointer)
-{
-  pthread_descr self = thread_self();
-
-  THREAD_SETMEM_NC(self, p_libc_specific[key], (void *) pointer);
-  return 0;
-}
-int (*__libc_internal_tsd_set)(enum __libc_tsd_key_t key, const void * pointer)
-     = libc_internal_tsd_set;
-
-static void *
-libc_internal_tsd_get(enum __libc_tsd_key_t key)
-{
-  pthread_descr self = thread_self();
-
-  return THREAD_GETMEM_NC(self, p_libc_specific[key]);
-}
-void * (*__libc_internal_tsd_get)(enum __libc_tsd_key_t key)
-     = libc_internal_tsd_get;
diff --git a/newlib/libc/sys/linux/linuxthreads/spinlock.c b/newlib/libc/sys/linux/linuxthreads/spinlock.c
deleted file mode 100644
index 3e16825..0000000
--- a/newlib/libc/sys/linux/linuxthreads/spinlock.c
+++ /dev/null
@@ -1,774 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1998 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-/* Internal locks */
-
-#include <errno.h>
-#include <sched.h>
-#include <time.h>
-#include <stdlib.h>
-#include <limits.h>
-#include "pthread.h"
-#include "internals.h"
-#include "spinlock.h"
-#include "restart.h"
-
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-static void __pthread_acquire(int * spinlock);
-
-static inline void __pthread_release(int * spinlock)
-{
-  WRITE_MEMORY_BARRIER();
-  *spinlock = __LT_SPINLOCK_INIT;
-  __asm __volatile ("" : "=m" (*spinlock) : "0" (*spinlock));
-}
-#endif
-
-
-/* The status field of a spinlock is a pointer whose least significant
-   bit is a locked flag.
-
-   Thus the field values have the following meanings:
-
-   status == 0:       spinlock is free
-   status == 1:       spinlock is taken; no thread is waiting on it
-
-   (status & 1) == 1: spinlock is taken and (status & ~1L) is a
-                      pointer to the first waiting thread; other
-		      waiting threads are linked via the p_nextlock
-		      field.
-   (status & 1) == 0: same as above, but spinlock is not taken.
-
-   The waiting list is not sorted by priority order.
-   Actually, we always insert at top of list (sole insertion mode
-   that can be performed without locking).
-   For __pthread_unlock, we perform a linear search in the list
-   to find the highest-priority, oldest waiting thread.
-   This is safe because there are no concurrent __pthread_unlock
-   operations -- only the thread that locked the mutex can unlock it. */
-
-
-void internal_function __pthread_lock(struct _pthread_fastlock * lock,
-				      pthread_descr self)
-{
-#if defined HAS_COMPARE_AND_SWAP
-  long oldstatus, newstatus;
-  int successful_seizure, spurious_wakeup_count;
-  int spin_count;
-#endif
-
-#if defined TEST_FOR_COMPARE_AND_SWAP
-  if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-  {
-    __pthread_acquire(&lock->__spinlock);
-    return;
-  }
-#endif
-
-#if defined HAS_COMPARE_AND_SWAP
-  /* First try it without preparation.  Maybe it's a completely
-     uncontested lock.  */
-  if (lock->__status == 0 && __compare_and_swap (&lock->__status, 0, 1))
-    return;
-
-  spurious_wakeup_count = 0;
-  spin_count = 0;
-
-again:
-
-  /* On SMP, try spinning to get the lock. */
-
-  if (__pthread_smp_kernel) {
-    int max_count = lock->__spinlock * 2 + 10;
-
-    if (max_count > MAX_ADAPTIVE_SPIN_COUNT)
-      max_count = MAX_ADAPTIVE_SPIN_COUNT;
-
-    for (spin_count = 0; spin_count < max_count; spin_count++) {
-      if (((oldstatus = lock->__status) & 1) == 0) {
-	if(__compare_and_swap(&lock->__status, oldstatus, oldstatus | 1))
-	{
-	  if (spin_count)
-	    lock->__spinlock += (spin_count - lock->__spinlock) / 8;
-	  READ_MEMORY_BARRIER();
-	  return;
-	}
-      }
-#ifdef BUSY_WAIT_NOP
-      BUSY_WAIT_NOP;
-#endif
-      __asm __volatile ("" : "=m" (lock->__status) : "0" (lock->__status));
-    }
-
-    lock->__spinlock += (spin_count - lock->__spinlock) / 8;
-  }
-
-  /* No luck, try once more or suspend. */
-
-  do {
-    oldstatus = lock->__status;
-    successful_seizure = 0;
-
-    if ((oldstatus & 1) == 0) {
-      newstatus = oldstatus | 1;
-      successful_seizure = 1;
-    } else {
-      if (self == NULL)
-	self = thread_self();
-      newstatus = (long) self | 1;
-    }
-
-    if (self != NULL) {
-      THREAD_SETMEM(self, p_nextlock, (pthread_descr) (oldstatus & ~1L));
-      /* Make sure the store in p_nextlock completes before performing
-         the compare-and-swap */
-      MEMORY_BARRIER();
-    }
-  } while(! __compare_and_swap(&lock->__status, oldstatus, newstatus));
-
-  /* Suspend with guard against spurious wakeup.
-     This can happen in pthread_cond_timedwait_relative, when the thread
-     wakes up due to timeout and is still on the condvar queue, and then
-     locks the queue to remove itself. At that point it may still be on the
-     queue, and may be resumed by a condition signal. */
-
-  if (!successful_seizure) {
-    for (;;) {
-      suspend(self);
-      if (self->p_nextlock != NULL) {
-	/* Count resumes that don't belong to us. */
-	spurious_wakeup_count++;
-	continue;
-      }
-      break;
-    }
-    goto again;
-  }
-
-  /* Put back any resumes we caught that don't belong to us. */
-  while (spurious_wakeup_count--)
-    restart(self);
-
-  READ_MEMORY_BARRIER();
-#endif
-}
-
-int __pthread_unlock(struct _pthread_fastlock * lock)
-{
-#if defined HAS_COMPARE_AND_SWAP
-  long oldstatus;
-  pthread_descr thr, * ptr, * maxptr;
-  int maxprio;
-#endif
-
-#if defined TEST_FOR_COMPARE_AND_SWAP
-  if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-  {
-    __pthread_release(&lock->__spinlock);
-    return 0;
-  }
-#endif
-
-#if defined HAS_COMPARE_AND_SWAP
-  WRITE_MEMORY_BARRIER();
-
-again:
-  while ((oldstatus = lock->__status) == 1) {
-    if (__compare_and_swap_with_release_semantics(&lock->__status,
-	oldstatus, 0))
-      return 0;
-  }
-
-  /* Find thread in waiting queue with maximal priority */
-  ptr = (pthread_descr *) &lock->__status;
-  thr = (pthread_descr) (oldstatus & ~1L);
-  maxprio = 0;
-  maxptr = ptr;
-
-  /* Before we iterate over the wait queue, we need to execute
-     a read barrier, otherwise we may read stale contents of nodes that may
-     just have been inserted by other processors. One read barrier is enough to
-     ensure we have a stable list; we don't need one for each pointer chase
-     through the list, because we are the owner of the lock; other threads
-     can only add nodes at the front; if a front node is consistent,
-     the ones behind it must also be. */
-
-  READ_MEMORY_BARRIER();
-
-  while (thr != 0) {
-    if (thr->p_priority >= maxprio) {
-      maxptr = ptr;
-      maxprio = thr->p_priority;
-    }
-    ptr = &(thr->p_nextlock);
-    thr = *ptr;
-  }
-
-  /* Remove max prio thread from waiting list. */
-  if (maxptr == (pthread_descr *) &lock->__status) {
-    /* If max prio thread is at head, remove it with compare-and-swap
-       to guard against concurrent lock operation. This removal
-       also has the side effect of marking the lock as released
-       because the new status comes from thr->p_nextlock whose
-       least significant bit is clear. */
-    thr = (pthread_descr) (oldstatus & ~1L);
-    if (! __compare_and_swap_with_release_semantics
-	    (&lock->__status, oldstatus, (long)(thr->p_nextlock)))
-      goto again;
-  } else {
-    /* No risk of concurrent access, remove max prio thread normally.
-       But in this case we must also flip the least significant bit
-       of the status to mark the lock as released. */
-    thr = *maxptr;
-    *maxptr = thr->p_nextlock;
-
-    /* Ensure deletion from linked list completes before we
-       release the lock. */
-    WRITE_MEMORY_BARRIER();
-
-    do {
-      oldstatus = lock->__status;
-    } while (!__compare_and_swap_with_release_semantics(&lock->__status,
-	     oldstatus, oldstatus & ~1L));
-  }
-
-  /* Wake up the selected waiting thread. Woken thread can check
-     its own p_nextlock field for NULL to detect that it has been removed. No
-     barrier is needed here, since restart() and suspend() take
-     care of memory synchronization. */
-
-  thr->p_nextlock = NULL;
-  restart(thr);
-
-  return 0;
-#endif
-}
-
-/*
- * Alternate fastlocks do not queue threads directly. Instead, they queue
- * these wait queue node structures. When a timed wait wakes up due to
- * a timeout, it can leave its wait node in the queue (because there
- * is no safe way to remove from the quue). Some other thread will
- * deallocate the abandoned node.
- */
-
-
-struct wait_node {
-  struct wait_node *next;	/* Next node in null terminated linked list */
-  pthread_descr thr;		/* The thread waiting with this node */
-  int abandoned;		/* Atomic flag */
-};
-
-static long wait_node_free_list;
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-static int wait_node_free_list_spinlock;
-#endif
-
-/* Allocate a new node from the head of the free list using an atomic
-   operation, or else using malloc if that list is empty.  A fundamental
-   assumption here is that we can safely access wait_node_free_list->next.
-   That's because we never free nodes once we allocate them, so a pointer to a
-   node remains valid indefinitely. */
-
-static struct wait_node *wait_node_alloc(void)
-{
-#if defined HAS_COMPARE_AND_SWAP
-  long oldvalue, newvalue;
-#endif
-
-#if defined TEST_FOR_COMPARE_AND_SWAP
-  if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-  {
-    struct wait_node *new_node = 0;
-
-    __pthread_acquire(&wait_node_free_list_spinlock);
-    if (wait_node_free_list != 0) {
-      new_node = (struct wait_node *) wait_node_free_list;
-      wait_node_free_list = (long) new_node->next;
-    }
-    WRITE_MEMORY_BARRIER();
-    wait_node_free_list_spinlock = 0;
-
-    if (new_node == 0)
-      return malloc(sizeof *wait_node_alloc());
-
-    return new_node;
-  }
-#endif
-
-#if defined HAS_COMPARE_AND_SWAP
-  do {
-    oldvalue = wait_node_free_list;
-
-    if (oldvalue == 0)
-      return malloc(sizeof *wait_node_alloc());
-
-    /* Ensure we don't read stale next link through oldvalue pointer. */
-    READ_MEMORY_BARRIER();
-    newvalue = (long) ((struct wait_node *) oldvalue)->next;
-  } while (! __compare_and_swap(&wait_node_free_list, oldvalue, newvalue));
-
-  return (struct wait_node *) oldvalue;
-#endif
-}
-
-/* Return a node to the head of the free list using an atomic
-   operation. */
-
-static void wait_node_free(struct wait_node *wn)
-{
-#if defined HAS_COMPARE_AND_SWAP
-  long oldvalue, newvalue;
-#endif
-
-#if defined TEST_FOR_COMPARE_AND_SWAP
-  if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-  {
-    __pthread_acquire(&wait_node_free_list_spinlock);
-    wn->next = (struct wait_node *) wait_node_free_list;
-    wait_node_free_list = (long) wn;
-    WRITE_MEMORY_BARRIER();
-    wait_node_free_list_spinlock = 0;
-    return;
-  }
-#endif
-
-#if defined HAS_COMPARE_AND_SWAP
-  do {
-    oldvalue = wait_node_free_list;
-    wn->next = (struct wait_node *) oldvalue;
-    newvalue = (long) wn;
-    /* Ensure node contents are written before we swap it into the list. */
-    WRITE_MEMORY_BARRIER();
-  } while (! __compare_and_swap(&wait_node_free_list, oldvalue, newvalue));
-#endif
-}
-
-#if defined HAS_COMPARE_AND_SWAP
-
-/* Remove a wait node from the specified queue.  It is assumed
-   that the removal takes place concurrently with only atomic insertions at the
-   head of the queue. */
-
-static void wait_node_dequeue(struct wait_node **pp_head,
-			      struct wait_node **pp_node,
-			      struct wait_node *p_node)
-{
-  /* If the node is being deleted from the head of the
-     list, it must be deleted using atomic compare-and-swap.
-     Otherwise it can be deleted in the straightforward way. */
-
-  if (pp_node == pp_head) {
-    /* We don't need a read barrier between these next two loads,
-       because it is assumed that the caller has already ensured
-       the stability of *p_node with respect to p_node. */
-
-    long oldvalue = (long) p_node;
-    long newvalue = (long) p_node->next;
-
-    if (__compare_and_swap((long *) pp_node, oldvalue, newvalue))
-      return;
-
-    /* Oops! Compare and swap failed, which means the node is
-       no longer first. We delete it using the ordinary method.  But we don't
-       know the identity of the node which now holds the pointer to the node
-       being deleted, so we must search from the beginning. */
-
-    for (pp_node = pp_head; p_node != *pp_node; ) {
-      pp_node = &(*pp_node)->next;
-      READ_MEMORY_BARRIER(); /* Stabilize *pp_node for next iteration. */
-    }
-  }
-
-  *pp_node = p_node->next;
-  return;
-}
-
-#endif
-
-void __pthread_alt_lock(struct _pthread_fastlock * lock,
-		        pthread_descr self)
-{
-#if defined HAS_COMPARE_AND_SWAP
-  long oldstatus, newstatus;
-#endif
-  struct wait_node wait_node;
-
-#if defined TEST_FOR_COMPARE_AND_SWAP
-  if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-  {
-    int suspend_needed = 0;
-    __pthread_acquire(&lock->__spinlock);
-
-    if (lock->__status == 0)
-      lock->__status = 1;
-    else {
-      if (self == NULL)
-	self = thread_self();
-
-      wait_node.abandoned = 0;
-      wait_node.next = (struct wait_node *) lock->__status;
-      wait_node.thr = self;
-      lock->__status = (long) &wait_node;
-      suspend_needed = 1;
-    }
-
-    __pthread_release(&lock->__spinlock);
-
-    if (suspend_needed)
-      suspend (self);
-    return;
-  }
-#endif
-
-#if defined HAS_COMPARE_AND_SWAP
-  do {
-    oldstatus = lock->__status;
-    if (oldstatus == 0) {
-      newstatus = 1;
-    } else {
-      if (self == NULL)
-	self = thread_self();
-      wait_node.thr = self;
-      newstatus = (long) &wait_node;
-    }
-    wait_node.abandoned = 0;
-    wait_node.next = (struct wait_node *) oldstatus;
-    /* Make sure the store in wait_node.next completes before performing
-       the compare-and-swap */
-    MEMORY_BARRIER();
-  } while(! __compare_and_swap(&lock->__status, oldstatus, newstatus));
-
-  /* Suspend. Note that unlike in __pthread_lock, we don't worry
-     here about spurious wakeup. That's because this lock is not
-     used in situations where that can happen; the restart can
-     only come from the previous lock owner. */
-
-  if (oldstatus != 0)
-    suspend(self);
-
-  READ_MEMORY_BARRIER();
-#endif
-}
-
-/* Timed-out lock operation; returns 0 to indicate timeout. */
-
-int __pthread_alt_timedlock(struct _pthread_fastlock * lock,
-			    pthread_descr self, const struct timespec *abstime)
-{
-  long oldstatus = 0;
-#if defined HAS_COMPARE_AND_SWAP
-  long newstatus;
-#endif
-  struct wait_node *p_wait_node = wait_node_alloc();
-
-  /* Out of memory, just give up and do ordinary lock. */
-  if (p_wait_node == 0) {
-    __pthread_alt_lock(lock, self);
-    return 1;
-  }
-
-#if defined TEST_FOR_COMPARE_AND_SWAP
-  if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-  {
-    __pthread_acquire(&lock->__spinlock);
-
-    if (lock->__status == 0)
-      lock->__status = 1;
-    else {
-      if (self == NULL)
-	self = thread_self();
-
-      p_wait_node->abandoned = 0;
-      p_wait_node->next = (struct wait_node *) lock->__status;
-      p_wait_node->thr = self;
-      lock->__status = (long) p_wait_node;
-      oldstatus = 1; /* force suspend */
-    }
-
-    __pthread_release(&lock->__spinlock);
-    goto suspend;
-  }
-#endif
-
-#if defined HAS_COMPARE_AND_SWAP
-  do {
-    oldstatus = lock->__status;
-    if (oldstatus == 0) {
-      newstatus = 1;
-    } else {
-      if (self == NULL)
-	self = thread_self();
-      p_wait_node->thr = self;
-      newstatus = (long) p_wait_node;
-    }
-    p_wait_node->abandoned = 0;
-    p_wait_node->next = (struct wait_node *) oldstatus;
-    /* Make sure the store in wait_node.next completes before performing
-       the compare-and-swap */
-    MEMORY_BARRIER();
-  } while(! __compare_and_swap(&lock->__status, oldstatus, newstatus));
-#endif
-
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-  suspend:
-#endif
-
-  /* If we did not get the lock, do a timed suspend. If we wake up due
-     to a timeout, then there is a race; the old lock owner may try
-     to remove us from the queue. This race is resolved by us and the owner
-     doing an atomic testandset() to change the state of the wait node from 0
-     to 1. If we succeed, then it's a timeout and we abandon the node in the
-     queue. If we fail, it means the owner gave us the lock. */
-
-  if (oldstatus != 0) {
-    if (timedsuspend(self, abstime) == 0) {
-      if (!testandset(&p_wait_node->abandoned))
-	return 0; /* Timeout! */
-
-      /* Eat oustanding resume from owner, otherwise wait_node_free() below
-	 will race with owner's wait_node_dequeue(). */
-      suspend(self);
-    }
-  }
-
-  wait_node_free(p_wait_node);
-
-  READ_MEMORY_BARRIER();
-
-  return 1; /* Got the lock! */
-}
-
-void __pthread_alt_unlock(struct _pthread_fastlock *lock)
-{
-  struct wait_node *p_node, **pp_node, *p_max_prio, **pp_max_prio;
-  struct wait_node ** const pp_head = (struct wait_node **) &lock->__status;
-  int maxprio;
-
-  WRITE_MEMORY_BARRIER();
-
-#if defined TEST_FOR_COMPARE_AND_SWAP
-  if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-  {
-    __pthread_acquire(&lock->__spinlock);
-  }
-#endif
-
-  while (1) {
-
-  /* If no threads are waiting for this lock, try to just
-     atomically release it. */
-#if defined TEST_FOR_COMPARE_AND_SWAP
-    if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-    {
-      if (lock->__status == 0 || lock->__status == 1) {
-	lock->__status = 0;
-	break;
-      }
-    }
-#endif
-
-#if defined TEST_FOR_COMPARE_AND_SWAP
-    else
-#endif
-
-#if defined HAS_COMPARE_AND_SWAP
-    {
-      long oldstatus = lock->__status;
-      if (oldstatus == 0 || oldstatus == 1) {
-	if (__compare_and_swap_with_release_semantics (&lock->__status, oldstatus, 0))
-	  break;
-	else
-	  continue;
-      }
-    }
-#endif
-
-    /* Process the entire queue of wait nodes. Remove all abandoned
-       wait nodes and put them into the global free queue, and
-       remember the one unabandoned node which refers to the thread
-       having the highest priority. */
-
-    pp_max_prio = pp_node = pp_head;
-    p_max_prio = p_node = *pp_head;
-    maxprio = INT_MIN;
-
-    READ_MEMORY_BARRIER(); /* Prevent access to stale data through p_node */
-
-    while (p_node != (struct wait_node *) 1) {
-      int prio;
-
-      if (p_node->abandoned) {
-	/* Remove abandoned node. */
-#if defined TEST_FOR_COMPARE_AND_SWAP
-	if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-	  *pp_node = p_node->next;
-#endif
-#if defined TEST_FOR_COMPARE_AND_SWAP
-	else
-#endif
-#if defined HAS_COMPARE_AND_SWAP
-	  wait_node_dequeue(pp_head, pp_node, p_node);
-#endif
-	wait_node_free(p_node);
-	/* Note that the next assignment may take us to the beginning
-	   of the queue, to newly inserted nodes, if pp_node == pp_head.
-	   In that case we need a memory barrier to stabilize the first of
-	   these new nodes. */
-	p_node = *pp_node;
-	if (pp_node == pp_head)
-	  READ_MEMORY_BARRIER(); /* No stale reads through p_node */
-	continue;
-      } else if ((prio = p_node->thr->p_priority) >= maxprio) {
-	/* Otherwise remember it if its thread has a higher or equal priority
-	   compared to that of any node seen thus far. */
-	maxprio = prio;
-	pp_max_prio = pp_node;
-	p_max_prio = p_node;
-      }
-
-      /* This canno6 jump backward in the list, so no further read
-         barrier is needed. */
-      pp_node = &p_node->next;
-      p_node = *pp_node;
-    }
-
-    /* If all threads abandoned, go back to top */
-    if (maxprio == INT_MIN)
-      continue;
-
-    ASSERT (p_max_prio != (struct wait_node *) 1);
-
-    /* Now we want to to remove the max priority thread's wait node from
-       the list. Before we can do this, we must atomically try to change the
-       node's abandon state from zero to nonzero. If we succeed, that means we
-       have the node that we will wake up. If we failed, then it means the
-       thread timed out and abandoned the node in which case we repeat the
-       whole unlock operation. */
-
-    if (!testandset(&p_max_prio->abandoned)) {
-#if defined TEST_FOR_COMPARE_AND_SWAP
-      if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-	*pp_max_prio = p_max_prio->next;
-#endif
-#if defined TEST_FOR_COMPARE_AND_SWAP
-      else
-#endif
-#if defined HAS_COMPARE_AND_SWAP
-	wait_node_dequeue(pp_head, pp_max_prio, p_max_prio);
-#endif
-      restart(p_max_prio->thr);
-      break;
-    }
-  }
-
-#if defined TEST_FOR_COMPARE_AND_SWAP
-  if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-  {
-    __pthread_release(&lock->__spinlock);
-  }
-#endif
-}
-
-
-/* Compare-and-swap emulation with a spinlock */
-
-#ifdef TEST_FOR_COMPARE_AND_SWAP
-int __pthread_has_cas = 0;
-#endif
-
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-
-int __pthread_compare_and_swap(long * ptr, long oldval, long newval,
-                               int * spinlock)
-{
-  int res;
-
-  __pthread_acquire(spinlock);
-
-  if (*ptr == oldval) {
-    *ptr = newval; res = 1;
-  } else {
-    res = 0;
-  }
-
-  __pthread_release(spinlock);
-
-  return res;
-}
-
-/* This function is called if the inlined test-and-set
-   in __pthread_compare_and_swap() failed */
-
-/* The retry strategy is as follows:
-   - We test and set the spinlock MAX_SPIN_COUNT times, calling
-     sched_yield() each time.  This gives ample opportunity for other
-     threads with priority >= our priority to make progress and
-     release the spinlock.
-   - If a thread with priority < our priority owns the spinlock,
-     calling sched_yield() repeatedly is useless, since we're preventing
-     the owning thread from making progress and releasing the spinlock.
-     So, after MAX_SPIN_LOCK attemps, we suspend the calling thread
-     using nanosleep().  This again should give time to the owning thread
-     for releasing the spinlock.
-     Notice that the nanosleep() interval must not be too small,
-     since the kernel does busy-waiting for short intervals in a realtime
-     process (!).  The smallest duration that guarantees thread
-     suspension is currently 2ms.
-   - When nanosleep() returns, we try again, doing MAX_SPIN_COUNT
-     sched_yield(), then sleeping again if needed. */
-
-static void __pthread_acquire(int * spinlock)
-{
-  int cnt = 0;
-  struct timespec tm;
-
-  READ_MEMORY_BARRIER();
-
-  while (testandset(spinlock)) {
-    if (cnt < MAX_SPIN_COUNT) {
-      sched_yield();
-      cnt++;
-    } else {
-      tm.tv_sec = 0;
-      tm.tv_nsec = SPIN_SLEEP_DURATION;
-      nanosleep(&tm, NULL);
-      cnt = 0;
-    }
-  }
-}
-
-#endif
diff --git a/newlib/libc/sys/linux/linuxthreads/spinlock.h b/newlib/libc/sys/linux/linuxthreads/spinlock.h
deleted file mode 100644
index 0ec40c5..0000000
--- a/newlib/libc/sys/linux/linuxthreads/spinlock.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* Linuxthreads - a simple clone()-based implementation of Posix        */
-/* threads for Linux.                                                   */
-/* Copyright (C) 1998 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-/*                                                                      */
-/* This program is free software; you can redistribute it and/or        */
-/* modify it under the terms of the GNU Library General Public License  */
-/* as published by the Free Software Foundation; either version 2       */
-/* of the License, or (at your option) any later version.               */
-/*                                                                      */
-/* This program 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 Library General Public License for more details.                 */
-
-#include <bits/initspin.h>
-
-
-/* There are 2 compare and swap synchronization primitives with
-   different semantics:
-
-	1. compare_and_swap, which has acquire semantics (i.e. it
-	completes befor subsequent writes.)
-	2. compare_and_swap_with_release_semantics, which has release
-	semantics (it completes after previous writes.)
-
-   For those platforms on which they are the same. HAS_COMPARE_AND_SWAP
-   should be defined. For those platforms on which they are different,
-   HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS has to be defined.  */
-
-#ifndef HAS_COMPARE_AND_SWAP
-#ifdef HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS
-#define HAS_COMPARE_AND_SWAP
-#endif
-#endif
-
-#if defined(TEST_FOR_COMPARE_AND_SWAP)
-
-extern int __pthread_has_cas;
-extern int __pthread_compare_and_swap(long * ptr, long oldval, long newval,
-                                      int * spinlock);
-
-static inline int compare_and_swap(long * ptr, long oldval, long newval,
-                                   int * spinlock)
-{
-  if (__builtin_expect (__pthread_has_cas, 1))
-    return __compare_and_swap(ptr, oldval, newval);
-  else
-    return __pthread_compare_and_swap(ptr, oldval, newval, spinlock);
-}
-
-#elif defined(HAS_COMPARE_AND_SWAP)
-
-#ifdef IMPLEMENT_TAS_WITH_CAS
-#define testandset(p) !__compare_and_swap((long int *) p, 0, 1)
-#endif
-
-#ifdef HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS
-
-static inline int
-compare_and_swap_with_release_semantics (long * ptr, long oldval,
-					 long newval, int * spinlock)
-{
-  return __compare_and_swap_with_release_semantics (ptr, oldval,
-						    newval);
-}
-
-#endif
-
-static inline int compare_and_swap(long * ptr, long oldval, long newval,
-                                   int * spinlock)
-{
-  return __compare_and_swap(ptr, oldval, newval);
-}
-
-#else
-
-extern int __pthread_compare_and_swap(long * ptr, long oldval, long newval,
-                                      int * spinlock);
-
-static inline int compare_and_swap(long * ptr, long oldval, long newval,
-                                   int * spinlock)
-{
-  return __pthread_compare_and_swap(ptr, oldval, newval, spinlock);
-}
-
-#endif
-
-#ifndef HAS_COMPARE_AND_SWAP_WITH_RELEASE_SEMANTICS
-#define compare_and_swap_with_release_semantics compare_and_swap
-#define __compare_and_swap_with_release_semantics __compare_and_swap
-#endif
-
-/* Internal locks */
-
-extern void internal_function __pthread_lock(struct _pthread_fastlock * lock,
-					     pthread_descr self);
-extern int __pthread_unlock(struct _pthread_fastlock *lock);
-
-static inline void __pthread_init_lock(struct _pthread_fastlock * lock)
-{
-  lock->__status = 0;
-  lock->__spinlock = __LT_SPINLOCK_INIT;
-}
-
-static inline int __pthread_trylock (struct _pthread_fastlock * lock)
-{
-#if defined TEST_FOR_COMPARE_AND_SWAP
-  if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-  {
-    return (testandset(&lock->__spinlock) ? EBUSY : 0);
-  }
-#endif
-
-#if defined HAS_COMPARE_AND_SWAP
-  do {
-    if (lock->__status != 0) return EBUSY;
-  } while(! __compare_and_swap(&lock->__status, 0, 1));
-  return 0;
-#endif
-}
-
-/* Variation of internal lock used for pthread_mutex_t, supporting
-   timed-out waits.  Warning: do not mix these operations with the above ones
-   over the same lock object! */
-
-extern void __pthread_alt_lock(struct _pthread_fastlock * lock,
-			       pthread_descr self);
-
-extern int __pthread_alt_timedlock(struct _pthread_fastlock * lock,
-			       pthread_descr self, const struct timespec *abstime);
-
-extern void __pthread_alt_unlock(struct _pthread_fastlock *lock);
-
-static inline void __pthread_alt_init_lock(struct _pthread_fastlock * lock)
-{
-  lock->__status = 0;
-  lock->__spinlock = __LT_SPINLOCK_INIT;
-}
-
-static inline int __pthread_alt_trylock (struct _pthread_fastlock * lock)
-{
-#if defined TEST_FOR_COMPARE_AND_SWAP
-  if (!__pthread_has_cas)
-#endif
-#if !defined HAS_COMPARE_AND_SWAP || defined TEST_FOR_COMPARE_AND_SWAP
-  {
-    int res = EBUSY;
-
-    if (testandset(&lock->__spinlock) == 0)
-      {
-	if (lock->__status == 0)
-	  {
-	    lock->__status = 1;
-	    WRITE_MEMORY_BARRIER();
-	    res = 0;
-	  }
-	lock->__spinlock = __LT_SPINLOCK_INIT;
-      }
-    return res;
-  }
-#endif
-
-#if defined HAS_COMPARE_AND_SWAP
-  do {
-    if (lock->__status != 0) return EBUSY;
-  } while(! compare_and_swap(&lock->__status, 0, 1, &lock->__spinlock));
-  return 0;
-#endif
-}
-
-/* Operations on pthread_atomic, which is defined in internals.h */
-
-static inline long atomic_increment(struct pthread_atomic *pa)
-{
-    long oldval;
-
-    do {
-	oldval = pa->p_count;
-    } while (!compare_and_swap(&pa->p_count, oldval, oldval + 1, &pa->p_spinlock));
-
-    return oldval;
-}
-
-
-static inline long atomic_decrement(struct pthread_atomic *pa)
-{
-    long oldval;
-
-    do {
-	oldval = pa->p_count;
-    } while (!compare_and_swap(&pa->p_count, oldval, oldval - 1, &pa->p_spinlock));
-
-    return oldval;
-}
-
-
-static inline void
-__pthread_set_own_extricate_if (pthread_descr self, pthread_extricate_if *peif)
-{
-  /* Only store a non-null peif if the thread has cancellation enabled.
-     Otherwise pthread_cancel will unconditionally call the extricate handler,
-     and restart the thread giving rise to forbidden spurious wakeups. */
-  if (peif == NULL
-      || THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE)
-    {
-      /* If we are removing the extricate interface, we need to synchronize
-	 against pthread_cancel so that it does not continue with a pointer
-         to a deallocated pthread_extricate_if struct! The thread lock
-         is (ab)used for this synchronization purpose. */
-      if (peif == NULL)
-	__pthread_lock (THREAD_GETMEM(self, p_lock), self);
-      THREAD_SETMEM(self, p_extricate, peif);
-      if (peif == NULL)
-	__pthread_unlock (THREAD_GETMEM(self, p_lock));
-    }
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/sysctl.c b/newlib/libc/sys/linux/linuxthreads/sysctl.c
deleted file mode 100644
index 2512f17..0000000
--- a/newlib/libc/sys/linux/linuxthreads/sysctl.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Read or write system information.  Linux version.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/sysctl.h>
-
-#include <machine/syscall.h>
-
-static _syscall1(int,_sysctl,struct __sysctl_args *,args)
-
-int
-__sysctl (int *name, int nlen, void *oldval, size_t *oldlenp,
-	  void *newval, size_t newlen)
-{
-  struct __sysctl_args args =
-  {
-    name: name,
-    nlen: nlen,
-    oldval: oldval,
-    oldlenp: oldlenp,
-    newval: newval,
-    newlen: newlen
-  };
-
-  return _sysctl(&args);
-}
-weak_alias (__sysctl, sysctl)
diff --git a/newlib/libc/sys/linux/linuxthreads/td_init.c b/newlib/libc/sys/linux/linuxthreads/td_init.c
deleted file mode 100644
index c9d08e9..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_init.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Initialization function of thread debugger support library.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-int __td_debug;
-
-
-td_err_e
-td_init (void)
-{
-  /* XXX We have to figure out what has to be done.  */
-  LOG ("td_init");
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_log.c b/newlib/libc/sys/linux/linuxthreads/td_log.c
deleted file mode 100644
index 531cf87..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_log.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Noop, left for historical reasons.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_log (void)
-{
-  /* This interface is deprecated in the Sun interface.  We provide it
-     for compatibility but don't do anyhting ourself.  We might in
-     future do some logging if this seems reasonable.  */
-  LOG ("td_log");
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_symbol_list.c b/newlib/libc/sys/linux/linuxthreads/td_symbol_list.c
deleted file mode 100644
index e64d298..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_symbol_list.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Return list of symbols the library can request.
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <assert.h>
-#include <gnu/lib-names.h>
-#include "thread_dbP.h"
-
-
-static const char *symbol_list_arr[] =
-{
-  [PTHREAD_THREADS_EVENTS] = "__pthread_threads_events",
-  [PTHREAD_LAST_EVENT] = "__pthread_last_event",
-  [PTHREAD_HANDLES_NUM] = "__pthread_handles_num",
-  [PTHREAD_HANDLES] = "__pthread_handles",
-  [PTHREAD_KEYS] = "pthread_keys",
-  [LINUXTHREADS_PTHREAD_THREADS_MAX] = "__linuxthreads_pthread_threads_max",
-  [LINUXTHREADS_PTHREAD_KEYS_MAX] = "__linuxthreads_pthread_keys_max",
-  [LINUXTHREADS_PTHREAD_SIZEOF_DESCR] = "__linuxthreads_pthread_sizeof_descr",
-  [LINUXTHREADS_CREATE_EVENT] = "__linuxthreads_create_event",
-  [LINUXTHREADS_DEATH_EVENT] = "__linuxthreads_death_event",
-  [LINUXTHREADS_REAP_EVENT] = "__linuxthreads_reap_event",
-  [NUM_MESSAGES] = NULL
-};
-
-
-const char **
-td_symbol_list (void)
-{
-  return symbol_list_arr;
-}
-
-
-int
-td_lookup (struct ps_prochandle *ps, int idx, psaddr_t *sym_addr)
-{
-  assert (idx >= 0 && idx < NUM_MESSAGES);
-  return ps_pglobal_lookup (ps, LIBPTHREAD_SO, symbol_list_arr[idx], sym_addr);
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_clear_event.c b/newlib/libc/sys/linux/linuxthreads/td_ta_clear_event.c
deleted file mode 100644
index 1512833..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_clear_event.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Globally disable events.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_ta_clear_event (ta, event)
-     const td_thragent_t *ta;
-     td_thr_events_t *event;
-{
-  td_thr_events_t old_event;
-  int i;
-
-  LOG ("td_ta_clear_event");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  /* Write the new value into the thread data structure.  */
-  if (ps_pdread (ta->ph, ta->pthread_threads_eventsp,
-		 &old_event, sizeof (td_thrhandle_t)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* Remove the set bits in.  */
-  for (i = 0; i < TD_EVENTSIZE; ++i)
-    old_event.event_bits[i] &= ~event->event_bits[i];
-
-  /* Write the new value into the thread data structure.  */
-  if (ps_pdwrite (ta->ph, ta->pthread_threads_eventsp,
-		  &old_event, sizeof (td_thrhandle_t)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_delete.c b/newlib/libc/sys/linux/linuxthreads/td_ta_delete.c
deleted file mode 100644
index 6af4368..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_delete.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Detach to target process.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stdlib.h>
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_ta_delete (td_thragent_t *ta)
-{
-  LOG ("td_ta_delete");
-
-  /* Safety check.  */
-  if (ta == NULL || __td_agent_list == NULL)
-    return TD_BADTA;
-
-  /* Remove the handle from the list.  */
-  if (ta == __td_agent_list->ta)
-    /* It's the first element of the list.  */
-    __td_agent_list = __td_agent_list->next;
-  else
-    {
-      /* We have to search for it.  */
-      struct agent_list *runp = __td_agent_list;
-
-      while (runp->next != NULL && runp->next->ta != ta)
-	runp = runp->next;
-
-      if (runp->next == NULL)
-	/* It's not a valid decriptor since it is not in the list.  */
-	return TD_BADTA;
-
-      runp->next = runp->next->next;
-    }
-
-  /* The handle was allocated in `td_ta_new'.  */
-  free (ta);
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_enable_stats.c b/newlib/libc/sys/linux/linuxthreads/td_ta_enable_stats.c
deleted file mode 100644
index 43de1b2..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_enable_stats.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Enable collection of statistics for process.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_ta_enable_stats (const td_thragent_t *ta, int enable)
-{
-  /* XXX We have to figure out what has to be done.  */
-  LOG ("td_ta_enable_stats");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_event_addr.c b/newlib/libc/sys/linux/linuxthreads/td_ta_event_addr.c
deleted file mode 100644
index 8bce35a..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_event_addr.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Get event address.
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_ta_event_addr (const td_thragent_t *ta, td_event_e event, td_notify_t *addr)
-{
-  td_err_e res = TD_NOEVENT;
-  int idx = -1;
-
-  LOG ("td_ta_event_addr");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  switch (event)
-    {
-    case TD_CREATE:
-      idx = LINUXTHREADS_CREATE_EVENT;
-      break;
-
-    case TD_DEATH:
-      idx = LINUXTHREADS_DEATH_EVENT;
-      break;
-
-    case TD_REAP:
-      idx = LINUXTHREADS_REAP_EVENT;
-      break;
-
-    default:
-      /* Event cannot be handled.  */
-      break;
-    }
-
-  /* Now get the address.  */
-  if (idx != -1)
-    {
-      psaddr_t taddr;
-
-      if (td_lookup (ta->ph, idx, &taddr) == PS_OK)
-	{
-	  /* Success, we got the address.  */
-	  addr->type = NOTIFY_BPT;
-	  addr->u.bptaddr = taddr;
-
-	  res = TD_OK;
-	}
-      else
-	res = TD_ERR;
-    }
-
-  return res;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_event_getmsg.c b/newlib/libc/sys/linux/linuxthreads/td_ta_event_getmsg.c
deleted file mode 100644
index a4ccba3..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_event_getmsg.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Retrieve event.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stddef.h>
-#include <string.h>
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_ta_event_getmsg (const td_thragent_t *ta, td_event_msg_t *msg)
-{
-  /* XXX I cannot think of another way but using a static variable.  */
-  static td_thrhandle_t th;
-  td_eventbuf_t event;
-  psaddr_t addr;
-
-  LOG ("td_ta_event_getmsg");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  /* Get the pointer to the thread descriptor with the last event.  */
-  if (ps_pdread (ta->ph, ta->pthread_last_event,
-		 &addr, sizeof (void *)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* If the pointer is NULL no event occurred.  */
-  if (addr == 0)
-    return TD_NOMSG;
-
-  /* Read the even structure from the target.  */
-  if (ps_pdread (ta->ph,
-		 ((char *) addr
-		  + offsetof (struct _pthread_descr_struct, p_eventbuf)),
-		 &event, sizeof (td_eventbuf_t)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* Check whether an event occurred.  */
-  if (event.eventnum == TD_EVENT_NONE)
-    {
-      /* Oh well, this means the last event was already read.  So
-	 we have to look for any other event.  */
-      struct pthread_handle_struct handles[ta->pthread_threads_max];
-      int num;
-      int i;
-
-      /* Read the number of currently active threads.  */
-      if (ps_pdread (ta->ph, ta->pthread_handles_num, &num, sizeof (int))
-	  != PS_OK)
-	return TD_ERR;	/* XXX Other error value?  */
-
-      /* Now read the handles.  */
-      if (ps_pdread (ta->ph, ta->handles, handles,
-		     ta->pthread_threads_max * sizeof (handles[0])) != PS_OK)
-	return TD_ERR;	/* XXX Other error value?  */
-
-      for (i = 0; i < ta->pthread_threads_max && num > 0; ++i)
-	{
-	  if (handles[i].h_descr == NULL)
-	    /* No entry here.  */
-	    continue;
-
-	  /* First count this active thread.  */
-	  --num;
-
-	  if (handles[i].h_descr == addr)
-	    /* We already handled this.  */
-	    continue;
-
-	  /* Read the event data for this thread.  */
-	  if (ps_pdread (ta->ph,
-			 ((char *) handles[i].h_descr
-			  + offsetof (struct _pthread_descr_struct,
-				      p_eventbuf)),
-			 &event, sizeof (td_eventbuf_t)) != PS_OK)
-	    return TD_ERR;
-
-	  if (event.eventnum != TD_EVENT_NONE)
-	    {
-	      /* We found a thread with an unreported event.  */
-	      addr = handles[i].h_descr;
-	      break;
-	    }
-	}
-
-      /* If we haven't found any other event signal this to the user.  */
-      if (event.eventnum == TD_EVENT_NONE)
-	return TD_NOMSG;
-    }
-
-  /* Generate the thread descriptor.  */
-  th.th_ta_p = (td_thragent_t *) ta;
-  th.th_unique = addr;
-
-  /* Fill the user's data structure.  */
-  msg->event = event.eventnum;
-  msg->th_p = &th;
-  msg->msg.data = (uintptr_t) event.eventdata;
-
-  /* And clear the event message in the target.  */
-  memset (&event, '\0', sizeof (td_eventbuf_t));
-  if (ps_pdwrite (ta->ph,
-		  ((char *) addr
-		   + offsetof (struct _pthread_descr_struct, p_eventbuf)),
-		  &event, sizeof (td_eventbuf_t)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_get_nthreads.c b/newlib/libc/sys/linux/linuxthreads/td_ta_get_nthreads.c
deleted file mode 100644
index 839b56b..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_get_nthreads.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Get the number of threads in the process.
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-td_err_e
-td_ta_get_nthreads (const td_thragent_t *ta, int *np)
-{
-  psaddr_t addr;
-
-  LOG ("td_ta_get_nthreads");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  /* Access the variable `__pthread_handles_num'.  */
-  if (td_lookup (ta->ph, PTHREAD_HANDLES_NUM, &addr) != PS_OK)
-     return TD_ERR;	/* XXX Other error value?  */
-
-  if (ps_pdread (ta->ph, addr, np, sizeof (int)) != PS_OK)
-     return TD_ERR;	/* XXX Other error value?  */
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_get_ph.c b/newlib/libc/sys/linux/linuxthreads/td_ta_get_ph.c
deleted file mode 100644
index ffa833d..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_get_ph.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Get external process handle.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_ta_get_ph (const td_thragent_t *ta, struct ps_prochandle **ph)
-{
-  LOG ("td_ta_get_ph");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  *ph = ta->ph;
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_get_stats.c b/newlib/libc/sys/linux/linuxthreads/td_ta_get_stats.c
deleted file mode 100644
index d2ba342..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_get_stats.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Retrieve statistics for process.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_ta_get_stats (const td_thragent_t *ta, td_ta_stats_t *statsp)
-{
-  /* XXX We have to figure out what has to be done.  */
-  LOG ("td_ta_get_stats");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_map_id2thr.c b/newlib/libc/sys/linux/linuxthreads/td_ta_map_id2thr.c
deleted file mode 100644
index 184f2de..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_map_id2thr.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Map thread ID to thread handle.
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_ta_map_id2thr (const td_thragent_t *ta, pthread_t pt, td_thrhandle_t *th)
-{
-  struct pthread_handle_struct phc;
-  struct _pthread_descr_struct pds;
-  int pthread_threads_max;
-
-  LOG ("td_ta_map_id2thr");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  /* Make the following expression a bit smaller.  */
-  pthread_threads_max = ta->pthread_threads_max;
-
-  /* We can compute the entry in the handle array we want.  */
-  if (ps_pdread (ta->ph, ta->handles + pt % pthread_threads_max, &phc,
-		 sizeof (struct pthread_handle_struct)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* Test whether this entry is in use.  */
-  if (phc.h_descr == NULL)
-    return TD_BADTH;
-
-  /* Next test: get the descriptor to see whether this is not an old
-     thread handle.  */
-  if (ps_pdread (ta->ph, phc.h_descr, &pds,
-		 sizeof (struct _pthread_descr_struct)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  if (pds.p_tid != pt)
-    return TD_BADTH;
-
-  if (pds.p_terminated != 0)
-    return TD_NOTHR;
-
-  /* Create the `td_thrhandle_t' object.  */
-  th->th_ta_p = (td_thragent_t *) ta;
-  th->th_unique = phc.h_descr;
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_map_lwp2thr.c b/newlib/libc/sys/linux/linuxthreads/td_ta_map_lwp2thr.c
deleted file mode 100644
index 78b9fbb..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_map_lwp2thr.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Which thread is running on an lwp?
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_ta_map_lwp2thr (const td_thragent_t *ta, lwpid_t lwpid, td_thrhandle_t *th)
-{
-  int pthread_threads_max = ta->pthread_threads_max;
-  size_t sizeof_descr = ta->sizeof_descr;
-  struct pthread_handle_struct phc[pthread_threads_max];
-  size_t cnt;
-#ifdef ALL_THREADS_STOPPED
-  int num;
-#else
-# define num 1
-#endif
-
-  LOG ("td_ta_map_lwp2thr");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  /* Read all the descriptors.  */
-  if (ps_pdread (ta->ph, ta->handles, phc,
-		 sizeof (struct pthread_handle_struct) * pthread_threads_max)
-      != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-#ifdef ALL_THREADS_STOPPED
-  /* Read the number of currently active threads.  */
-  if (ps_pdread (ta->ph, ta->pthread_handles_num, &num, sizeof (int)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-#endif
-
-  /* Get the entries one after the other and find out whether the ID
-     matches.  */
-  for (cnt = 0; cnt < pthread_threads_max && num > 0; ++cnt)
-    if (phc[cnt].h_descr != NULL)
-      {
-	struct _pthread_descr_struct pds;
-
-#ifdef ALL_THREADS_STOPPED
-	/* First count this active thread.  */
-	--num;
-#endif
-
-	if (ps_pdread (ta->ph, phc[cnt].h_descr, &pds, sizeof_descr) != PS_OK)
-	  return TD_ERR;	/* XXX Other error value?  */
-
-	if ((pds.p_pid ?: ps_getpid (ta->ph)) == lwpid)
-	  {
-	    /* Found it.  Now fill in the `td_thrhandle_t' object.  */
-	    th->th_ta_p = (td_thragent_t *) ta;
-	    th->th_unique = phc[cnt].h_descr;
-
-	    return TD_OK;
-	  }
-    }
-
-  return TD_NOLWP;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_new.c b/newlib/libc/sys/linux/linuxthreads/td_ta_new.c
deleted file mode 100644
index 7505f53..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_new.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Attach to target process.
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stddef.h>
-#include <stdlib.h>
-
-#include "thread_dbP.h"
-
-
-/* Datatype for the list of known thread agents.  Normally there will
-   be exactly one so we don't spend much though on making it fast.  */
-struct agent_list *__td_agent_list;
-
-
-td_err_e
-td_ta_new (struct ps_prochandle *ps, td_thragent_t **ta)
-{
-  psaddr_t addr;
-  struct agent_list *elemp;
-
-  LOG ("td_ta_new");
-
-  /* Get the global event mask.  This is one of the variables which
-     are new in the thread library to enable debugging.  If it is
-     not available we cannot debug.  */
-  if (td_lookup (ps, PTHREAD_THREADS_EVENTS, &addr) != PS_OK)
-    return TD_NOLIBTHREAD;
-
-  /* Fill in the appropriate information.  */
-  *ta = (td_thragent_t *) malloc (sizeof (td_thragent_t));
-  if (*ta == NULL)
-    return TD_MALLOC;
-
-  /* Store the proc handle which we will pass to the callback functions
-     back into the debugger.  */
-  (*ta)->ph = ps;
-
-  /* Remember the address.  */
-  (*ta)->pthread_threads_eventsp = (td_thr_events_t *) addr;
-
-  /* Get the pointer to the variable pointing to the thread descriptor
-     with the last event.  */
-  if (td_lookup (ps, PTHREAD_LAST_EVENT, &(*ta)->pthread_last_event) != PS_OK)
-    {
-    free_return:
-      free (*ta);
-      return TD_ERR;
-    }
-
-  /* Get the pointer to the variable containing the number of active
-     threads.  */
-  if (td_lookup (ps, PTHREAD_HANDLES_NUM, &(*ta)->pthread_handles_num)
-      != PS_OK)
-    goto free_return;
-
-  /* See whether the library contains the necessary symbols.  */
-  if (td_lookup (ps, PTHREAD_HANDLES, &addr) != PS_OK)
-    goto free_return;
-
-  (*ta)->handles = (struct pthread_handle_struct *) addr;
-
-
-  if (td_lookup (ps, PTHREAD_KEYS, &addr) != PS_OK)
-    goto free_return;
-
-  /* Cast to the right type.  */
-  (*ta)->keys = (struct pthread_key_struct *) addr;
-
-  /* Find out about the maximum number of threads.  Old implementations
-     don't provide this information.  In this case we assume that the
-     debug  library is compiled with the same values.  */
-  if (td_lookup (ps, LINUXTHREADS_PTHREAD_THREADS_MAX, &addr) != PS_OK)
-    (*ta)->pthread_threads_max = PTHREAD_THREADS_MAX;
-  else
-    {
-      if (ps_pdread (ps, addr, &(*ta)->pthread_threads_max, sizeof (int))
-	  != PS_OK)
-	goto free_return;
-    }
-
-  /* Similar for the maximum number of thread local data keys.  */
-  if (td_lookup (ps, LINUXTHREADS_PTHREAD_KEYS_MAX, &addr) != PS_OK)
-    (*ta)->pthread_keys_max = PTHREAD_KEYS_MAX;
-  else
-    {
-      if (ps_pdread (ps, addr, &(*ta)->pthread_keys_max, sizeof (int))
-	  != PS_OK)
-	goto free_return;
-    }
-
-  /* And for the size of the second level arrays for the keys.  */
-  if (td_lookup (ps, LINUXTHREADS_PTHREAD_SIZEOF_DESCR, &addr) != PS_OK)
-    (*ta)->sizeof_descr = sizeof (struct _pthread_descr_struct);
-  else
-    {
-      if (ps_pdread (ps, addr, &(*ta)->sizeof_descr, sizeof (int)) != PS_OK)
-	goto free_return;
-    }
-
-  /* Now add the new agent descriptor to the list.  */
-  elemp = (struct agent_list *) malloc (sizeof (struct agent_list));
-  if (elemp == NULL)
-    {
-      /* Argh, now that everything else worked...  */
-      free (*ta);
-      return TD_MALLOC;
-    }
-
-  /* We don't care for thread-safety here.  */
-  elemp->ta = *ta;
-  elemp->next = __td_agent_list;
-  __td_agent_list = elemp;
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_reset_stats.c b/newlib/libc/sys/linux/linuxthreads/td_ta_reset_stats.c
deleted file mode 100644
index 533d4c4..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_reset_stats.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Reset statistics.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_ta_reset_stats (const td_thragent_t *ta)
-{
-  /* XXX We have to figure out what has to be done.  */
-  LOG ("td_ta_reset_stats");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_set_event.c b/newlib/libc/sys/linux/linuxthreads/td_ta_set_event.c
deleted file mode 100644
index 041aaec..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_set_event.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Globally enable events.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_ta_set_event (ta, event)
-     const td_thragent_t *ta;
-     td_thr_events_t *event;
-{
-  td_thr_events_t old_event;
-  int i;
-
-  LOG ("td_ta_set_event");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  /* Write the new value into the thread data structure.  */
-  if (ps_pdread (ta->ph, ta->pthread_threads_eventsp,
-		 &old_event, sizeof (td_thrhandle_t)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* Or the new bits in.  */
-  for (i = 0; i < TD_EVENTSIZE; ++i)
-    old_event.event_bits[i] |= event->event_bits[i];
-
-  /* Write the new value into the thread data structure.  */
-  if (ps_pdwrite (ta->ph, ta->pthread_threads_eventsp,
-		  &old_event, sizeof (td_thrhandle_t)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_setconcurrency.c b/newlib/libc/sys/linux/linuxthreads/td_ta_setconcurrency.c
deleted file mode 100644
index da15a0f..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_setconcurrency.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Set suggested concurrency level for process.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_ta_setconcurrency (const td_thragent_t *ta, int level)
-{
-  /* This is something LinuxThreads does not support.  */
-  LOG ("td_ta_setconcurrency");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  return TD_NOCAPAB;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_thr_iter.c b/newlib/libc/sys/linux/linuxthreads/td_ta_thr_iter.c
deleted file mode 100644
index a77186d..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_thr_iter.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Iterate over a process's threads.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-#include <alloca.h>
-
-static int
-handle_descr (const td_thragent_t *ta, td_thr_iter_f *callback,
-	      void *cbdata_p, td_thr_state_e state, int ti_pri,
-	      size_t cnt, pthread_descr descr)
-{
-  struct _pthread_descr_struct pds;
-  size_t sizeof_descr = ta->sizeof_descr;
-  td_thrhandle_t th;
-
-  if (ps_pdread (ta->ph, descr, &pds, sizeof_descr) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* The manager thread must be handled special.  The descriptor
-     exists but the thread only gets created when the first
-     `pthread_create' call is issued.  A clear indication that this
-     happened is when the p_pid field is non-zero.  */
-  if (cnt == 1 && pds.p_pid == 0)
-    return TD_OK;
-
-  /* Now test whether this thread matches the specified
-     conditions.  */
-
-  /* Only if the priority level is as high or higher.  */
-  if (pds.p_priority < ti_pri)
-    return TD_OK;
-
-  /* Test the state.
-     XXX This is incomplete.  */
-  if (state != TD_THR_ANY_STATE)
-    return TD_OK;
-
-  /* XXX For now we ignore threads which are not running anymore.
-     The reason is that gdb tries to get the registers and fails.
-     In future we should have a special mode of the thread library
-     in which we keep the process around until the actual join
-     operation happened.  */
-  if (pds.p_exited != 0)
-    return TD_OK;
-
-  /* Yep, it matches.  Call the callback function.  */
-  th.th_ta_p = (td_thragent_t *) ta;
-  th.th_unique = descr;
-  if (callback (&th, cbdata_p) != 0)
-    return TD_DBERR;
-
-  /* All done successfully.  */
-  return TD_OK;
-}
-
-
-td_err_e
-td_ta_thr_iter (const td_thragent_t *ta, td_thr_iter_f *callback,
-		void *cbdata_p, td_thr_state_e state, int ti_pri,
-		sigset_t *ti_sigmask_p, unsigned int ti_user_flags)
-{
-  int pthread_threads_max;
-  struct pthread_handle_struct *phc;
-  td_err_e result = TD_OK;
-  int cnt;
-#ifdef ALL_THREADS_STOPPED
-  int num;
-#else
-# define num 1
-#endif
-
-  LOG ("td_ta_thr_iter");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  pthread_threads_max = ta->pthread_threads_max;
-  phc = (struct pthread_handle_struct *) alloca (sizeof (phc[0])
-						 * pthread_threads_max);
-
-  /* First read only the main thread and manager thread information.  */
-  if (ps_pdread (ta->ph, ta->handles, phc,
-		 sizeof (struct pthread_handle_struct) * 2) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* Now handle these descriptors.  */
-  result = handle_descr (ta, callback, cbdata_p, state, ti_pri, 0,
-			 phc[0].h_descr);
-  if (result != TD_OK)
-    return result;
-  result = handle_descr (ta, callback, cbdata_p, state, ti_pri, 1,
-			 phc[1].h_descr);
-  if (result != TD_OK)
-    return result;
-
-  /* Read all the descriptors.  */
-  if (ps_pdread (ta->ph, ta->handles + 2, &phc[2],
-		 (sizeof (struct pthread_handle_struct)
-		  * (pthread_threads_max - 2))) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-#ifdef ALL_THREADS_STOPPED
-  /* Read the number of currently active threads.  */
-  if (ps_pdread (ta->ph, ta->pthread_handles_num, &num, sizeof (int)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-#endif
-
-  /* Now get all descriptors, one after the other.  */
-  for (cnt = 2; cnt < pthread_threads_max && num > 0; ++cnt)
-    if (phc[cnt].h_descr != NULL)
-      {
-#ifdef ALL_THREADS_STOPPED
-	/* First count this active thread.  */
-	--num;
-#endif
-
-	result = handle_descr (ta, callback, cbdata_p, state, ti_pri, cnt,
-			       phc[cnt].h_descr);
-	if (result != TD_OK)
-	  break;
-      }
-
-  return result;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_ta_tsd_iter.c b/newlib/libc/sys/linux/linuxthreads/td_ta_tsd_iter.c
deleted file mode 100644
index 92ceb1f..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_ta_tsd_iter.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Iterate over a process's thread-specific data.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-#include <alloca.h>
-
-td_err_e
-td_ta_tsd_iter (const td_thragent_t *ta, td_key_iter_f *callback,
-		void *cbdata_p)
-{
-  struct pthread_key_struct *keys;
-  int pthread_keys_max;
-  int cnt;
-
-  LOG ("td_ta_tsd_iter");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  pthread_keys_max = ta->pthread_keys_max;
-  keys = (struct pthread_key_struct *) alloca (sizeof (keys[0])
-					       * pthread_keys_max);
-
-  /* Read all the information about the keys.  */
-  if (ps_pdread (ta->ph, ta->keys, keys,
-		 sizeof (keys[0]) * pthread_keys_max) != PS_OK)
-	return TD_ERR;	/* XXX Other error value?  */
-
-  /* Now get all descriptors, one after the other.  */
-  for (cnt = 0; cnt < pthread_keys_max; ++cnt)
-    if (keys[cnt].in_use
-	/* Return with an error if the callback returns a nonzero value.  */
-	&& callback (cnt, keys[cnt].destr, cbdata_p) != 0)
-      return TD_DBERR;
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_clear_event.c b/newlib/libc/sys/linux/linuxthreads/td_thr_clear_event.c
deleted file mode 100644
index e40e4c3..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_clear_event.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Disable specific event for thread.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stddef.h>
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_clear_event (th, event)
-     const td_thrhandle_t *th;
-     td_thr_events_t *event;
-{
-  td_thr_events_t old_event;
-  int i;
-
-  LOG ("td_thr_clear_event");
-
-  /* Write the new value into the thread data structure.  */
-  if (ps_pdread (th->th_ta_p->ph,
-		 ((char *) th->th_unique
-		  + offsetof (struct _pthread_descr_struct,
-			      p_eventbuf.eventmask)),
-		 &old_event, sizeof (td_thrhandle_t)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* Remove the set bits in.  */
-  for (i = 0; i < TD_EVENTSIZE; ++i)
-    old_event.event_bits[i] &= ~event->event_bits[i];
-
-  /* Write the new value into the thread data structure.  */
-  if (ps_pdwrite (th->th_ta_p->ph,
-		  ((char *) th->th_unique
-		   + offsetof (struct _pthread_descr_struct,
-			       p_eventbuf.eventmask)),
-		  &old_event, sizeof (td_thrhandle_t)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_dbresume.c b/newlib/libc/sys/linux/linuxthreads/td_thr_dbresume.c
deleted file mode 100644
index dbe10bc..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_dbresume.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Resume execution of given thread.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_dbresume (const td_thrhandle_t *th)
-{
-  /* XXX We have to figure out what has to be done.  */
-  LOG ("td_thr_dbresume");
-  return TD_NOCAPAB;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_dbsuspend.c b/newlib/libc/sys/linux/linuxthreads/td_thr_dbsuspend.c
deleted file mode 100644
index f96be36..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_dbsuspend.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Suspend execution of given thread.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_dbsuspend (const td_thrhandle_t *th)
-{
-  /* XXX We have to figure out what has to be done.  */
-  LOG ("td_thr_dbsuspend");
-  return TD_NOCAPAB;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_event_enable.c b/newlib/libc/sys/linux/linuxthreads/td_thr_event_enable.c
deleted file mode 100644
index 3eecd21..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_event_enable.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Enable event process-wide.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stddef.h>
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_event_enable (th, onoff)
-     const td_thrhandle_t *th;
-     int onoff;
-{
-  LOG ("td_thr_event_enable");
-
-  /* Write the new value into the thread data structure.  */
-  if (ps_pdwrite (th->th_ta_p->ph,
-		  ((char *) th->th_unique
-		   + offsetof (struct _pthread_descr_struct, p_report_events)),
-		  &onoff, sizeof (int)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_event_getmsg.c b/newlib/libc/sys/linux/linuxthreads/td_thr_event_getmsg.c
deleted file mode 100644
index 582e89e..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_event_getmsg.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Retrieve event.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stddef.h>
-#include <string.h>
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_event_getmsg (const td_thrhandle_t *th, td_event_msg_t *msg)
-{
-  td_eventbuf_t event;
-
-  LOG ("td_thr_event_getmsg");
-
-  /* Read the even structure from the target.  */
-  if (ps_pdread (th->th_ta_p->ph,
-		 ((char *) th->th_unique
-		  + offsetof (struct _pthread_descr_struct, p_eventbuf)),
-		 &event, sizeof (td_eventbuf_t)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* Check whether an event occurred.  */
-  if (event.eventnum == TD_EVENT_NONE)
-    /* Nothing.  */
-    return TD_NOMSG;
-
-  /* Fill the user's data structure.  */
-  msg->event = event.eventnum;
-  msg->th_p = th;
-  msg->msg.data = (uintptr_t) event.eventdata;
-
-  /* And clear the event message in the target.  */
-  memset (&event, '\0', sizeof (td_eventbuf_t));
-  if (ps_pdwrite (th->th_ta_p->ph,
-		  ((char *) th->th_unique
-		   + offsetof (struct _pthread_descr_struct, p_eventbuf)),
-		  &event, sizeof (td_eventbuf_t)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_get_info.c b/newlib/libc/sys/linux/linuxthreads/td_thr_get_info.c
deleted file mode 100644
index b497958..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_get_info.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Get thread information.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stddef.h>
-#include <string.h>
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_get_info (const td_thrhandle_t *th, td_thrinfo_t *infop)
-{
-  struct _pthread_descr_struct pds;
-
-  LOG ("td_thr_get_info");
-
-  /* Get the thread descriptor.  */
-  if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
-		 th->th_ta_p->sizeof_descr) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* Fill in information.  Clear first to provide reproducable
-     results for the fields we do not fill in.  */
-  memset (infop, '\0', sizeof (td_thrinfo_t));
-
-  /* We have to handle the manager thread special since the thread
-     descriptor in older versions is not fully initialized.  */
-  if (pds.p_nr == 1)
-    {
-      infop->ti_tid = th->th_ta_p->pthread_threads_max * 2 + 1;
-      infop->ti_type = TD_THR_SYSTEM;
-      infop->ti_state = TD_THR_ACTIVE;
-    }
-  else
-    {
-      infop->ti_tid = pds.p_tid;
-      infop->ti_tls = (char *) pds.p_specific;
-      infop->ti_pri = pds.p_priority;
-      infop->ti_type = TD_THR_USER;
-      
-      if (! pds.p_terminated)
-	/* XXX For now there is no way to get more information.  */
-	infop->ti_state = TD_THR_ACTIVE;
-      else if (! pds.p_detached)
-	infop->ti_state = TD_THR_ZOMBIE;
-      else
-	infop->ti_state = TD_THR_UNKNOWN;
-    }
-
-  /* Initialization which are the same in both cases.  */
-  infop->ti_lid = pds.p_pid ?: ps_getpid (th->th_ta_p->ph);
-  infop->ti_ta_p = th->th_ta_p;
-  infop->ti_startfunc = pds.p_start_args.start_routine;
-  memcpy (&infop->ti_events, &pds.p_eventbuf.eventmask,
-	  sizeof (td_thr_events_t));
-  infop->ti_traceme = pds.p_report_events != 0;
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_getfpregs.c b/newlib/libc/sys/linux/linuxthreads/td_thr_getfpregs.c
deleted file mode 100644
index b453cc0..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_getfpregs.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Get a thread's floating-point register set.
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_getfpregs (const td_thrhandle_t *th, prfpregset_t *regset)
-{
-  struct _pthread_descr_struct pds;
-
-  LOG ("td_thr_getfpregs");
-
-  /* We have to get the state and the PID for this thread.  */
-  if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
-		 sizeof (struct _pthread_descr_struct)) != PS_OK)
-    return TD_ERR;
-
-  /* If the thread already terminated we return all zeroes.  */
-  if (pds.p_terminated)
-    memset (regset, '\0', sizeof (*regset));
-  /* Otherwise get the register content through the callback.  */
-  else
-    {
-      pid_t pid = pds.p_pid ?: ps_getpid (th->th_ta_p->ph);
-
-      if (ps_lgetfpregs (th->th_ta_p->ph, pid, regset) != PS_OK)
-	return TD_ERR;
-    }
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_getgregs.c b/newlib/libc/sys/linux/linuxthreads/td_thr_getgregs.c
deleted file mode 100644
index 462a1a1..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_getgregs.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Get a thread's general register set.
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_getgregs (const td_thrhandle_t *th, prgregset_t gregs)
-{
-  struct _pthread_descr_struct pds;
-
-  LOG ("td_thr_getgregs");
-
-  /* We have to get the state and the PID for this thread.  */
-  if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
-		 sizeof (struct _pthread_descr_struct)) != PS_OK)
-    return TD_ERR;
-
-  /* If the thread already terminated we return all zeroes.  */
-  if (pds.p_terminated)
-    memset (gregs, '\0', sizeof (prgregset_t));
-  /* Otherwise get the register content through the callback.  */
-  else
-    {
-      pid_t pid = pds.p_pid ?: ps_getpid (th->th_ta_p->ph);
-
-      if (ps_lgetregs (th->th_ta_p->ph, pid, gregs) != PS_OK)
-	return TD_ERR;
-    }
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_getxregs.c b/newlib/libc/sys/linux/linuxthreads/td_thr_getxregs.c
deleted file mode 100644
index a519456..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_getxregs.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Get a thread's extra state register set.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_getxregs (const td_thrhandle_t *th, void *xregs)
-{
-  /* XXX This might be platform specific.  */
-  LOG ("td_thr_getxregs");
-  return TD_NOXREGS;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_getxregsize.c b/newlib/libc/sys/linux/linuxthreads/td_thr_getxregsize.c
deleted file mode 100644
index ddf8cbb..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_getxregsize.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Get the size of the extra state register set for this architecture.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_getxregsize (const td_thrhandle_t *th, int *sizep)
-{
-  /* XXX This might be platform specific.  */
-  LOG ("td_thr_getxregsize");
-  return TD_NOXREGS;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_set_event.c b/newlib/libc/sys/linux/linuxthreads/td_thr_set_event.c
deleted file mode 100644
index 6171155..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_set_event.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Enable specific event for thread.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stddef.h>
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_set_event (th, event)
-     const td_thrhandle_t *th;
-     td_thr_events_t *event;
-{
-  td_thr_events_t old_event;
-  int i;
-
-  LOG ("td_thr_set_event");
-
-  /* Write the new value into the thread data structure.  */
-  if (ps_pdread (th->th_ta_p->ph,
-		 ((char *) th->th_unique
-		  + offsetof (struct _pthread_descr_struct,
-			      p_eventbuf.eventmask)),
-		 &old_event, sizeof (td_thrhandle_t)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* Or the new bits in.  */
-  for (i = 0; i < TD_EVENTSIZE; ++i)
-    old_event.event_bits[i] |= event->event_bits[i];
-
-  /* Write the new value into the thread data structure.  */
-  if (ps_pdwrite (th->th_ta_p->ph,
-		  ((char *) th->th_unique
-		   + offsetof (struct _pthread_descr_struct,
-			       p_eventbuf.eventmask)),
-		  &old_event, sizeof (td_thrhandle_t)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_setfpregs.c b/newlib/libc/sys/linux/linuxthreads/td_thr_setfpregs.c
deleted file mode 100644
index 0d4fce5..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_setfpregs.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Set a thread's floating-point register set.
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_setfpregs (const td_thrhandle_t *th, const prfpregset_t *fpregs)
-{
-  struct _pthread_descr_struct pds;
-
-  LOG ("td_thr_setfpregs");
-
-  /* We have to get the state and the PID for this thread.  */
-  if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
-                 sizeof (struct _pthread_descr_struct)) != PS_OK)
-    return TD_ERR;
-
-  /* Only set the registers if the thread hasn't yet terminated.  */
-  if (pds.p_terminated == 0)
-    {
-      pid_t pid = pds.p_pid ?: ps_getpid (th->th_ta_p->ph);
-
-      if (ps_lsetfpregs (th->th_ta_p->ph, pid, fpregs) != PS_OK)
-	return TD_ERR;
-    }
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_setgregs.c b/newlib/libc/sys/linux/linuxthreads/td_thr_setgregs.c
deleted file mode 100644
index 3cf6539..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_setgregs.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Set a thread's general register set.
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_setgregs (const td_thrhandle_t *th, prgregset_t gregs)
-{
-  struct _pthread_descr_struct pds;
-
-  LOG ("td_thr_setgregs");
-
-  /* We have to get the state and the PID for this thread.  */
-  if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
-                 sizeof (struct _pthread_descr_struct)) != PS_OK)
-    return TD_ERR;
-
-  /* Only set the registers if the thread hasn't yet terminated.  */
-  if (pds.p_terminated == 0)
-    {
-      pid_t pid = pds.p_pid ?: ps_getpid (th->th_ta_p->ph);
-
-      if (ps_lsetregs (th->th_ta_p->ph, pid, gregs) != PS_OK)
-	return TD_ERR;
-    }
-
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_setprio.c b/newlib/libc/sys/linux/linuxthreads/td_thr_setprio.c
deleted file mode 100644
index 01eab48..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_setprio.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Set a thread's priority.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_setprio (const td_thrhandle_t *th, int prio)
-{
-  /* XXX We have to figure out what has to be done.  */
-  LOG ("td_thr_setprio");
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_setsigpending.c b/newlib/libc/sys/linux/linuxthreads/td_thr_setsigpending.c
deleted file mode 100644
index 6ecd747..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_setsigpending.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Raise a signal for a thread.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_setsigpending (const td_thrhandle_t *th, unsigned char n,
-		      const sigset_t *ss)
-{
-  /* XXX We have to figure out what has to be done.  */
-  LOG ("td_thr_setsigpending");
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_setxregs.c b/newlib/libc/sys/linux/linuxthreads/td_thr_setxregs.c
deleted file mode 100644
index 15ea14a..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_setxregs.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Set a thread's extra state register set.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_setxregs (const td_thrhandle_t *ta, const void *addr)
-{
-  /* XXX This might have to be platform specific.  */
-  LOG ("td_thr_setxregs");
-  return TD_NOXREGS;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_sigsetmask.c b/newlib/libc/sys/linux/linuxthreads/td_thr_sigsetmask.c
deleted file mode 100644
index 79f1443..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_sigsetmask.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Set a thread's signal mask.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_sigsetmask (const td_thrhandle_t *th, const sigset_t *ss)
-{
-  /* XXX We have to figure out what has to be done.  */
-  LOG ("td_thr_sigsetmask");
-  return TD_OK;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_tsd.c b/newlib/libc/sys/linux/linuxthreads/td_thr_tsd.c
deleted file mode 100644
index 192b425..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_tsd.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Get a thread-specific data pointer for a thread.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_tsd (const td_thrhandle_t *th, const thread_key_t tk, void **data)
-{
-  struct _pthread_descr_struct pds;
-  struct pthread_key_struct *keys = th->th_ta_p->keys;
-  struct pthread_key_struct key;
-  int pthread_keys_max = th->th_ta_p->pthread_keys_max;
-  int pthread_key_2ndlevel_size = th->th_ta_p->pthread_key_2ndlevel_size;
-  unsigned int idx1st;
-  unsigned int idx2nd;
-  void *p;
-
-  LOG ("td_thr_tsd");
-
-  /* Get the thread descriptor.  */
-  if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
-		 sizeof (struct _pthread_descr_struct)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* Check correct value of key.  */
-  if (tk >= pthread_keys_max)
-    return TD_BADKEY;
-
-  /* Get the key entry.  */
-  if (ps_pdread (th->th_ta_p->ph, keys, &key,
-		 sizeof (struct pthread_key_struct)) != PS_OK)
-    return TD_ERR;	/* XXX Other error value?  */
-
-  /* Fail if this key is not at all used.  */
-  if (! key.in_use)
-    return TD_BADKEY;
-
-  /* Compute the indeces.  */
-  idx1st = tk / pthread_key_2ndlevel_size;
-  idx2nd = tk % pthread_key_2ndlevel_size;
-
-  /* Check the pointer to the second level array.  */
-  if (pds.p_specific[idx1st] == NULL)
-    return TD_NOTSD;
-
-  /* Now get the real key.
-     XXX I don't know whether it's correct but there is currently no
-     easy way to determine whether a key was never set or the value
-     is NULL.  We return an error whenever the value is NULL.  */
-  if (ps_pdread (th->th_ta_p->ph, &pds.p_specific[idx1st][idx2nd], &p,
-		 sizeof (void *)) != PS_OK)
-    return TD_ERR;
-
-  if (p != NULL)
-    *data = p;
-
-  return p != NULL ? TD_OK : TD_NOTSD;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/td_thr_validate.c b/newlib/libc/sys/linux/linuxthreads/td_thr_validate.c
deleted file mode 100644
index 8821f0e..0000000
--- a/newlib/libc/sys/linux/linuxthreads/td_thr_validate.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Validate a thread handle.
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include "thread_dbP.h"
-
-
-td_err_e
-td_thr_validate (const td_thrhandle_t *th)
-{
-  struct pthread_handle_struct *handles = th->th_ta_p->handles;
-  int pthread_threads_max = th->th_ta_p->pthread_threads_max;
-  int cnt;
-
-  LOG ("td_thr_validate");
-
-  /* Now get all descriptors, one after the other.  */
-  for (cnt = 0; cnt < pthread_threads_max; ++cnt, ++handles)
-    {
-      struct pthread_handle_struct phc;
-
-      if (ps_pdread (th->th_ta_p->ph, handles, &phc,
-		     sizeof (struct pthread_handle_struct)) != PS_OK)
-	return TD_ERR;	/* XXX Other error value?  */
-
-      if (phc.h_descr != NULL && phc.h_descr == th->th_unique)
-	{
-	  struct _pthread_descr_struct pds;
-
-	  if (ps_pdread (th->th_ta_p->ph, phc.h_descr, &pds,
-			 th->th_ta_p->sizeof_descr) != PS_OK)
-	    return TD_ERR;	/* XXX Other error value?  */
-
-	  /* XXX There should be another test using the TID but this is
-	     currently not available.  */
-	  return pds.p_terminated != 0 ? TD_NOTHR : TD_OK;
-	}
-    }
-
-  return TD_ERR;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/testrtsig.h b/newlib/libc/sys/linux/linuxthreads/testrtsig.h
deleted file mode 100644
index cf36ab0..0000000
--- a/newlib/libc/sys/linux/linuxthreads/testrtsig.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Test whether RT signals are really available.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <string.h>
-#include <sys/utsname.h>
-
-#include "kernel-features.h"
-
-static int
-kernel_has_rtsig (void)
-{
-#if __ASSUME_REALTIME_SIGNALS
-  return 1;
-#else
-  struct utsname name;
-
-  return uname (&name) == 0 && __strverscmp (name.release, "2.1.70") >= 0;
-#endif
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/thread_db.h b/newlib/libc/sys/linux/linuxthreads/thread_db.h
deleted file mode 100644
index b192d1f..0000000
--- a/newlib/libc/sys/linux/linuxthreads/thread_db.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/* Copyright (C) 1999, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _THREAD_DB_H
-#define _THREAD_DB_H	1
-
-/* This is the debugger interface for the LinuxThreads library.  It is
-   modelled closely after the interface with same names in Solaris with
-   the goal to share the same code in the debugger.  */
-#include <pthread.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <sys/procfs.h>
-
-
-/* Error codes of the library.  */
-typedef enum
-{
-  TD_OK,	  /* No error.  */
-  TD_ERR,	  /* No further specified error.  */
-  TD_NOTHR,	  /* No matching thread found.  */
-  TD_NOSV,	  /* No matching synchronization handle found.  */
-  TD_NOLWP,	  /* No matching light-weighted process found.  */
-  TD_BADPH,	  /* Invalid process handle.  */
-  TD_BADTH,	  /* Invalid thread handle.  */
-  TD_BADSH,	  /* Invalid synchronization handle.  */
-  TD_BADTA,	  /* Invalid thread agent.  */
-  TD_BADKEY,	  /* Invalid key.  */
-  TD_NOMSG,	  /* No event available.  */
-  TD_NOFPREGS,	  /* No floating-point register content available.  */
-  TD_NOLIBTHREAD, /* Application not linked with thread library.  */
-  TD_NOEVENT,	  /* Requested event is not supported.  */
-  TD_NOCAPAB,	  /* Capability not available.  */
-  TD_DBERR,	  /* Internal debug library error.  */
-  TD_NOAPLIC,	  /* Operation is not applicable.  */
-  TD_NOTSD,	  /* No thread-specific data available.  */
-  TD_MALLOC,	  /* Out of memory.  */
-  TD_PARTIALREG,  /* Not entire register set was read or written.  */
-  TD_NOXREGS	  /* X register set not available for given thread.  */
-} td_err_e;
-
-
-/* Possible thread states.  TD_THR_ANY_STATE is a pseudo-state used to
-   select threads regardless of state in td_ta_thr_iter().  */
-typedef enum
-{
-  TD_THR_ANY_STATE,
-  TD_THR_UNKNOWN,
-  TD_THR_STOPPED,
-  TD_THR_RUN,
-  TD_THR_ACTIVE,
-  TD_THR_ZOMBIE,
-  TD_THR_SLEEP,
-  TD_THR_STOPPED_ASLEEP
-} td_thr_state_e;
-
-/* Thread type: user or system.  TD_THR_ANY_TYPE is a pseudo-type used
-   to select threads regardless of type in td_ta_thr_iter().  */
-typedef enum
-{
-  TD_THR_ANY_TYPE,
-  TD_THR_USER,
-  TD_THR_SYSTEM
-} td_thr_type_e;
-
-
-/* Types of the debugging library.  */
-
-/* Handle for a process.  This type is opaque.  */
-typedef struct td_thragent td_thragent_t;
-
-/* The actual thread handle type.  This is also opaque.  */
-typedef struct td_thrhandle
-{
-  td_thragent_t *th_ta_p;
-  psaddr_t th_unique;
-} td_thrhandle_t;
-
-
-/* Flags for `td_ta_thr_iter'.  */
-#define TD_THR_ANY_USER_FLAGS	0xffffffff
-#define TD_THR_LOWEST_PRIORITY	-20
-#define TD_SIGNO_MASK		NULL
-
-
-#define TD_EVENTSIZE	2
-#define BT_UISHIFT	5 /* log base 2 of BT_NBIPUI, to extract word index */
-#define BT_NBIPUI	(1 << BT_UISHIFT)       /* n bits per uint */
-#define BT_UIMASK	(BT_NBIPUI - 1)         /* to extract bit index */
-
-/* Bitmask of enabled events. */
-typedef struct td_thr_events
-{
-  uint32_t event_bits[TD_EVENTSIZE];
-} td_thr_events_t;
-
-/* Event set manipulation macros. */
-#define __td_eventmask(n) \
-  (UINT32_C (1) << (((n) - 1) & BT_UIMASK))
-#define __td_eventword(n) \
-  ((UINT32_C ((n) - 1)) >> BT_UISHIFT)
-
-#define td_event_emptyset(setp) \
-  do {									      \
-    int __i;								      \
-    for (__i = TD_EVENTSIZE; __i > 0; --__i)				      \
-      (setp)->event_bits[__i - 1] = 0;					      \
-  } while (0)
-
-#define td_event_fillset(setp) \
-  do {									      \
-    int __i;								      \
-    for (__i = TD_EVENTSIZE; __i > 0; --__i)				      \
-      (setp)->event_bits[__i - 1] = UINT32_C (0xffffffff);		      \
-  } while (0)
-
-#define td_event_addset(setp, n) \
-  (((setp)->event_bits[__td_eventword (n)]) |= __td_eventmask (n))
-#define td_event_delset(setp, n) \
-  (((setp)->event_bits[__td_eventword (n)]) &= ~__td_eventmask (n))
-#define td_eventismember(setp, n) \
-  (__td_eventmask (n) & ((setp)->event_bits[__td_eventword (n)]))
-#if TD_EVENTSIZE == 2
-# define td_eventisempty(setp) \
-  (!((setp)->event_bits[0]) && !((setp)->event_bits[1]))
-#else
-# error "td_eventisempty must be changed to match TD_EVENTSIZE"
-#endif
-
-/* Events reportable by the thread implementation.  */
-typedef enum
-{
-  TD_ALL_EVENTS,		 /* Pseudo-event number.  */
-  TD_EVENT_NONE = TD_ALL_EVENTS, /* Depends on context.  */
-  TD_READY,			 /* Is executable now. */
-  TD_SLEEP,			 /* Blocked in a synchronization obj.  */
-  TD_SWITCHTO,			 /* Now assigned to a process.  */
-  TD_SWITCHFROM,		 /* Not anymore assigned to a process.  */
-  TD_LOCK_TRY,			 /* Trying to get an unavailable lock.  */
-  TD_CATCHSIG,			 /* Signal posted to the thread.  */
-  TD_IDLE,			 /* Process getting idle.  */
-  TD_CREATE,			 /* New thread created.  */
-  TD_DEATH,			 /* Thread terminated.  */
-  TD_PREEMPT,			 /* Preempted.  */
-  TD_PRI_INHERIT,		 /* Inherited elevated priority.  */
-  TD_REAP,			 /* Reaped.  */
-  TD_CONCURRENCY,		 /* Number of processes changing.  */
-  TD_TIMEOUT,			 /* Conditional variable wait timed out.  */
-  TD_MIN_EVENT_NUM = TD_READY,
-  TD_MAX_EVENT_NUM = TD_TIMEOUT,
-  TD_EVENTS_ENABLE = 31		/* Event reporting enabled.  */
-} td_event_e;
-
-/* Values representing the different ways events are reported.  */
-typedef enum
-{
-  NOTIFY_BPT,			/* User must insert breakpoint at u.bptaddr. */
-  NOTIFY_AUTOBPT,		/* Breakpoint at u.bptaddr is automatically
-				   inserted.  */
-  NOTIFY_SYSCALL		/* System call u.syscallno will be invoked.  */
-} td_notify_e;
-
-/* Description how event type is reported.  */
-typedef struct td_notify
-{
-  td_notify_e type;		/* Way the event is reported.  */
-  union
-  {
-    psaddr_t bptaddr;		/* Address of breakpoint.  */
-    int syscallno;		/* Number of system call used.  */
-  } u;
-} td_notify_t;
-
-/* Structure used to report event.  */
-typedef struct td_event_msg
-{
-  td_event_e event;		/* Event type being reported.  */
-  const td_thrhandle_t *th_p;	/* Thread reporting the event.  */
-  union
-  {
-# if 0
-    td_synchandle_t *sh;	/* Handle of synchronization object.  */
-#endif
-    uintptr_t data;		/* Event specific data.  */
-  } msg;
-} td_event_msg_t;
-
-/* Structure containing event data available in each thread structure.  */
-typedef struct
-{
-  td_thr_events_t eventmask;	/* Mask of enabled events.  */
-  td_event_e eventnum;		/* Number of last event.  */
-  void *eventdata;		/* Data associated with event.  */
-} td_eventbuf_t;
-
-
-/* Gathered statistics about the process.  */
-typedef struct td_ta_stats
-{
-  int nthreads;       		/* Total number of threads in use.  */
-  int r_concurrency;		/* Concurrency level requested by user.  */
-  int nrunnable_num;		/* Average runnable threads, numerator.  */
-  int nrunnable_den;		/* Average runnable threads, denominator.  */
-  int a_concurrency_num;	/* Achieved concurrency level, numerator.  */
-  int a_concurrency_den;	/* Achieved concurrency level, denominator.  */
-  int nlwps_num;		/* Average number of processes in use,
-				   numerator.  */
-  int nlwps_den;		/* Average number of processes in use,
-				   denominator.  */
-  int nidle_num;		/* Average number of idling processes,
-				   numerator.  */
-  int nidle_den;		/* Average number of idling processes,
-				   denominator.  */
-} td_ta_stats_t;
-
-
-/* Since Sun's library is based on Solaris threads we have to define a few
-   types to map them to POSIX threads.  */
-typedef pthread_t thread_t;
-typedef pthread_key_t thread_key_t;
-
-
-/* Callback for iteration over threads.  */
-typedef int td_thr_iter_f (const td_thrhandle_t *, void *);
-
-/* Callback for iteration over thread local data.  */
-typedef int td_key_iter_f (thread_key_t, void (*) (void *), void *);
-
-
-
-/* Forward declaration.  This has to be defined by the user.  */
-struct ps_prochandle;
-
-
-/* Information about the thread.  */
-typedef struct td_thrinfo
-{
-  td_thragent_t *ti_ta_p;		/* Process handle.  */
-  unsigned int ti_user_flags;		/* Unused.  */
-  thread_t ti_tid;			/* Thread ID returned by
-					   pthread_create().  */
-  char *ti_tls;				/* Pointer to thread-local data.  */
-  psaddr_t ti_startfunc;		/* Start function passed to
-					   pthread_create().  */
-  psaddr_t ti_stkbase;			/* Base of thread's stack.  */
-  long int ti_stksize;			/* Size of thread's stack.  */
-  psaddr_t ti_ro_area;			/* Unused.  */
-  int ti_ro_size;			/* Unused.  */
-  td_thr_state_e ti_state;		/* Thread state.  */
-  unsigned char ti_db_suspended;	/* Nonzero if suspended by debugger. */
-  td_thr_type_e ti_type;		/* Type of the thread (system vs
-					   user thread).  */
-  intptr_t ti_pc;			/* Unused.  */
-  intptr_t ti_sp;			/* Unused.  */
-  short int ti_flags;			/* Unused.  */
-  int ti_pri;				/* Thread priority.  */
-  lwpid_t ti_lid;			/* Unused.  */
-  sigset_t ti_sigmask;			/* Signal mask.  */
-  unsigned char ti_traceme;		/* Nonzero if event reporting
-					   enabled.  */
-  unsigned char ti_preemptflag;		/* Unused.  */
-  unsigned char ti_pirecflag;		/* Unused.  */
-  sigset_t ti_pending;			/* Set of pending signals.  */
-  td_thr_events_t ti_events;		/* Set of enabled events.  */
-} td_thrinfo_t;
-
-
-
-/* Prototypes for exported library functions.  */
-
-/* Initialize the thread debug support library.  */
-extern td_err_e td_init (void);
-
-/* Historical relict.  Should not be used anymore.  */
-extern td_err_e td_log (void);
-
-/* Return list of symbols the library can request.  */
-extern const char **td_symbol_list (void);
-
-/* Generate new thread debug library handle for process PS.  */
-extern td_err_e td_ta_new (struct ps_prochandle *__ps, td_thragent_t **__ta);
-
-/* Free resources allocated for TA.  */
-extern td_err_e td_ta_delete (td_thragent_t *__ta);
-
-/* Get number of currently running threads in process associated with TA.  */
-extern td_err_e td_ta_get_nthreads (const td_thragent_t *__ta, int *__np);
-
-/* Return process handle passed in `td_ta_new' for process associated with
-   TA.  */
-extern td_err_e td_ta_get_ph (const td_thragent_t *__ta,
-			      struct ps_prochandle **__ph);
-
-/* Map thread library handle PT to thread debug library handle for process
-   associated with TA and store result in *TH.  */
-extern td_err_e td_ta_map_id2thr (const td_thragent_t *__ta, pthread_t __pt,
-				  td_thrhandle_t *__th);
-
-/* Map process ID LWPID to thread debug library handle for process
-   associated with TA and store result in *TH.  */
-extern td_err_e td_ta_map_lwp2thr (const td_thragent_t *__ta, lwpid_t __lwpid,
-				   td_thrhandle_t *__th);
-
-
-/* Call for each thread in a process associated with TA the callback function
-   CALLBACK.  */
-extern td_err_e td_ta_thr_iter (const td_thragent_t *__ta,
-				td_thr_iter_f *__callback, void *__cbdata_p,
-				td_thr_state_e __state, int __ti_pri,
-				sigset_t *__ti_sigmask_p,
-				unsigned int __ti_user_flags);
-
-/* Call for each defined thread local data entry the callback function KI.  */
-extern td_err_e td_ta_tsd_iter (const td_thragent_t *__ta, td_key_iter_f *__ki,
-				void *__p);
-
-
-/* Get event address for EVENT.  */
-extern td_err_e td_ta_event_addr (const td_thragent_t *__ta,
-				  td_event_e __event, td_notify_t *__ptr);
-
-/* Enable EVENT in global mask.  */
-extern td_err_e td_ta_set_event (const td_thragent_t *__ta,
-				 td_thr_events_t *__event);
-
-/* Disable EVENT in global mask.  */
-extern td_err_e td_ta_clear_event (const td_thragent_t *__ta,
-				   td_thr_events_t *__event);
-
-/* Return information about last event.  */
-extern td_err_e td_ta_event_getmsg (const td_thragent_t *__ta,
-				    td_event_msg_t *msg);
-
-
-/* Set suggested concurrency level for process associated with TA.  */
-extern td_err_e td_ta_setconcurrency (const td_thragent_t *__ta, int __level);
-
-
-/* Enable collecting statistics for process associated with TA.  */
-extern td_err_e td_ta_enable_stats (const td_thragent_t *__ta, int __enable);
-
-/* Reset statistics.  */
-extern td_err_e td_ta_reset_stats (const td_thragent_t *__ta);
-
-/* Retrieve statistics from process associated with TA.  */
-extern td_err_e td_ta_get_stats (const td_thragent_t *__ta,
-				 td_ta_stats_t *__statsp);
-
-
-/* Validate that TH is a thread handle.  */
-extern td_err_e td_thr_validate (const td_thrhandle_t *__th);
-
-/* Return information about thread TH.  */
-extern td_err_e td_thr_get_info (const td_thrhandle_t *__th,
-				 td_thrinfo_t *__infop);
-
-/* Retrieve floating-point register contents of process running thread TH.  */
-extern td_err_e td_thr_getfpregs (const td_thrhandle_t *__th,
-				  prfpregset_t *__regset);
-
-/* Retrieve general register contents of process running thread TH.  */
-extern td_err_e td_thr_getgregs (const td_thrhandle_t *__th,
-				 prgregset_t __gregs);
-
-/* Retrieve extended register contents of process running thread TH.  */
-extern td_err_e td_thr_getxregs (const td_thrhandle_t *__th, void *__xregs);
-
-/* Get size of extended register set of process running thread TH.  */
-extern td_err_e td_thr_getxregsize (const td_thrhandle_t *__th, int *__sizep);
-
-/* Set floating-point register contents of process running thread TH.  */
-extern td_err_e td_thr_setfpregs (const td_thrhandle_t *__th,
-				  const prfpregset_t *__fpregs);
-
-/* Set general register contents of process running thread TH.  */
-extern td_err_e td_thr_setgregs (const td_thrhandle_t *__th,
-				 prgregset_t __gregs);
-
-/* Set extended register contents of process running thread TH.  */
-extern td_err_e td_thr_setxregs (const td_thrhandle_t *__th,
-				 const void *__addr);
-
-
-/* Enable reporting for EVENT for thread TH.  */
-extern td_err_e td_thr_event_enable (const td_thrhandle_t *__th, int __event);
-
-/* Enable EVENT for thread TH.  */
-extern td_err_e td_thr_set_event (const td_thrhandle_t *__th,
-				  td_thr_events_t *__event);
-
-/* Disable EVENT for thread TH.  */
-extern td_err_e td_thr_clear_event (const td_thrhandle_t *__th,
-				    td_thr_events_t *__event);
-
-/* Get event message for thread TH.  */
-extern td_err_e td_thr_event_getmsg (const td_thrhandle_t *__th,
-				     td_event_msg_t *__msg);
-
-
-/* Set priority of thread TH.  */
-extern td_err_e td_thr_setprio (const td_thrhandle_t *__th, int __prio);
-
-
-/* Set pending signals for thread TH.  */
-extern td_err_e td_thr_setsigpending (const td_thrhandle_t *__th,
-				      unsigned char __n, const sigset_t *__ss);
-
-/* Set signal mask for thread TH.  */
-extern td_err_e td_thr_sigsetmask (const td_thrhandle_t *__th,
-				   const sigset_t *__ss);
-
-
-/* Return thread local data associated with key TK in thread TH.  */
-extern td_err_e td_thr_tsd (const td_thrhandle_t *__th,
-			    const thread_key_t __tk, void **__data);
-
-
-/* Suspend execution of thread TH.  */
-extern td_err_e td_thr_dbsuspend (const td_thrhandle_t *__th);
-
-/* Resume execution of thread TH.  */
-extern td_err_e td_thr_dbresume (const td_thrhandle_t *__th);
-
-#endif	/* thread_db.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/thread_dbP.h b/newlib/libc/sys/linux/linuxthreads/thread_dbP.h
deleted file mode 100644
index c695fa2..0000000
--- a/newlib/libc/sys/linux/linuxthreads/thread_dbP.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Private header for thread debug library.  */
-#ifndef _THREAD_DBP_H
-#define _THREAD_DBP_H	1
-
-#include <string.h>
-#include "proc_service.h"
-#include "thread_db.h"
-#include "internals.h"
-
-
-/* Indeces for the symbol names.  */
-enum
-  {
-    PTHREAD_THREADS_EVENTS = 0,
-    PTHREAD_LAST_EVENT,
-    PTHREAD_HANDLES_NUM,
-    PTHREAD_HANDLES,
-    PTHREAD_KEYS,
-    LINUXTHREADS_PTHREAD_THREADS_MAX,
-    LINUXTHREADS_PTHREAD_KEYS_MAX,
-    LINUXTHREADS_PTHREAD_SIZEOF_DESCR,
-    LINUXTHREADS_CREATE_EVENT,
-    LINUXTHREADS_DEATH_EVENT,
-    LINUXTHREADS_REAP_EVENT,
-    NUM_MESSAGES
-  };
-
-
-/* Comment out the following for less verbose output.  */
-#ifndef NDEBUG
-# define LOG(c) if (__td_debug) __libc_write (2, c "\n", strlen (c "\n"))
-extern int __td_debug;
-#else
-# define LOG(c)
-#endif
-
-
-/* Handle for a process.  This type is opaque.  */
-struct td_thragent
-{
-  /* Delivered by the debugger and we have to pass it back in the
-     proc callbacks.  */
-  struct ps_prochandle *ph;
-
-  /* Some cached information.  */
-
-  /* Address of the `__pthread_handles' array.  */
-  struct pthread_handle_struct *handles;
-
-  /* Address of the `pthread_kyes' array.  */
-  struct pthread_key_struct *keys;
-
-  /* Maximum number of threads.  */
-  int pthread_threads_max;
-
-  /* Maximum number of thread-local data keys.  */
-  int pthread_keys_max;
-
-  /* Size of 2nd level array for thread-local data keys.  */
-  int pthread_key_2ndlevel_size;
-
-  /* Sizeof struct _pthread_descr_struct.  */
-  int sizeof_descr;
-
-  /* Pointer to the `__pthread_threads_events' variable in the target.  */
-  psaddr_t pthread_threads_eventsp;
-
-  /* Pointer to the `__pthread_last_event' variable in the target.  */
-  psaddr_t pthread_last_event;
-
-  /* Pointer to the `__pthread_handles_num' variable.  */
-  psaddr_t pthread_handles_num;
-};
-
-
-/* Type used internally to keep track of thread agent descriptors.  */
-struct agent_list
-{
-  td_thragent_t *ta;
-  struct agent_list *next;
-};
-
-/* List of all known descriptors.  */
-extern struct agent_list *__td_agent_list;
-
-/* Function used to test for correct thread agent pointer.  */
-static inline int
-ta_ok (const td_thragent_t *ta)
-{
-  struct agent_list *runp = __td_agent_list;
-
-  if (ta == NULL)
-    return 0;
-
-  while (runp != NULL && runp->ta != ta)
-    runp = runp->next;
-
-  return runp != NULL;
-}
-
-
-/* Internal wrapper around ps_pglobal_lookup.  */
-extern int td_lookup (struct ps_prochandle *ps, int idx, psaddr_t *sym_addr);
-
-#endif /* thread_dbP.h */
diff --git a/newlib/libc/sys/linux/linuxthreads/timer_create.c b/newlib/libc/sys/linux/linuxthreads/timer_create.c
deleted file mode 100644
index 1dccd30..0000000
--- a/newlib/libc/sys/linux/linuxthreads/timer_create.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <errno.h>
-#include <signal.h>
-#include <pthread.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "posix-timer.h"
-
-
-/* Create new per-process timer using CLOCK.  */
-int
-timer_create (clock_id, evp, timerid)
-     clockid_t clock_id;
-     struct sigevent *evp;
-     timer_t *timerid;
-{
-  int retval = -1;
-  struct timer_node *newtimer = NULL;
-  struct thread_node *thread = NULL;
-
-  if (clock_id != CLOCK_REALTIME
-#ifdef _POSIX_CPUTIME
-      && clock_id != CLOCK_PROCESS_CPUTIME_ID
-#endif
-#ifdef _POSIX_THREAD_CPUTIME
-      && clock_id != CLOCK_THREAD_CPUTIME_ID
-#endif
-      )
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  pthread_once (&__timer_init_once_control, __timer_init_once);
-
-  if (__timer_init_failed)
-    {
-      __set_errno (ENOMEM);
-      return -1;
-    }
-
-  pthread_mutex_lock (&__timer_mutex);
-
-  newtimer = __timer_alloc ();
-  if (__builtin_expect (newtimer == NULL, 0))
-    {
-      __set_errno (EAGAIN);
-      goto unlock_bail;
-    }
-
-  if (evp != NULL)
-    newtimer->event = *evp;
-  else
-    {
-      newtimer->event.sigev_notify = SIGEV_SIGNAL;
-      newtimer->event.sigev_signo = SIGALRM;
-      newtimer->event.sigev_value.sival_int = timer_ptr2id (newtimer);
-      newtimer->event.sigev_notify_function = 0;
-    }
-
-  newtimer->event.sigev_notify_attributes = &newtimer->attr;
-  newtimer->creator_pid = getpid ();
-
-  switch (__builtin_expect (newtimer->event.sigev_notify, SIGEV_SIGNAL))
-    {
-    case SIGEV_NONE:
-      /* This is a strange choice!  */
-      break;
-
-    case SIGEV_SIGNAL:
-      /* We have a global thread for delivering timed signals.
-	 If it is not running, try to start it up.  */
-      switch (clock_id)
-	{
-	case CLOCK_REALTIME:
-	default:
-	  thread = &__timer_signal_thread_rclk;
-	  break;
-#ifdef _POSIX_CPUTIME
-	case CLOCK_PROCESS_CPUTIME_ID:
-	  thread = &__timer_signal_thread_pclk;
-	  break;
-#endif
-#ifdef _POSIX_THREAD_CPUTIME
-	case CLOCK_THREAD_CPUTIME_ID:
-	  thread = &__timer_signal_thread_tclk;
-	  break;
-#endif
-	}
-
-      if (! thread->exists)
-	{
-	  if (__builtin_expect (__timer_thread_start (thread),
-				1) < 0)
-	    {
-	      __set_errno (EAGAIN);
-	      goto unlock_bail;
-            }
-        }
-      break;
-
-    case SIGEV_THREAD:
-      /* Copy over thread attributes or set up default ones.  */
-      if (evp->sigev_notify_attributes)
-	newtimer->attr = *(pthread_attr_t *) evp->sigev_notify_attributes;
-      else
-	pthread_attr_init (&newtimer->attr);
-
-      /* Ensure thread attributes call for deatched thread.  */
-      pthread_attr_setdetachstate (&newtimer->attr, PTHREAD_CREATE_DETACHED);
-
-      /* Try to find existing thread having the right attributes.  */
-      thread = __timer_thread_find_matching (&newtimer->attr, clock_id);
-
-      /* If no existing thread has these attributes, try to allocate one.  */
-      if (thread == NULL)
-	thread = __timer_thread_alloc (&newtimer->attr, clock_id);
-
-      /* Out of luck; no threads are available.  */
-      if (__builtin_expect (thread == NULL, 0))
-	{
-	  __set_errno (EAGAIN);
-	  goto unlock_bail;
-	}
-
-      /* If the thread is not running already, try to start it.  */
-      if (! thread->exists
-	  && __builtin_expect (! __timer_thread_start (thread), 0))
-	{
-	  __set_errno (EAGAIN);
-	  goto unlock_bail;
-	}
-      break;
-
-    default:
-      __set_errno (EINVAL);
-      goto unlock_bail;
-    }
-
-  newtimer->clock = clock_id;
-  newtimer->abstime = 0;
-  newtimer->armed = 0;
-  newtimer->thread = thread;
-
-  *timerid = timer_ptr2id (newtimer);
-  retval = 0;
-
-  if (__builtin_expect (retval, 0) == -1)
-    {
-    unlock_bail:
-      if (thread != NULL)
-	__timer_thread_dealloc (thread);
-      if (newtimer != NULL)
-	__timer_dealloc (newtimer);
-    }
-
-  pthread_mutex_unlock (&__timer_mutex);
-
-  return retval;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/timer_delete.c b/newlib/libc/sys/linux/linuxthreads/timer_delete.c
deleted file mode 100644
index 24f4ffe..0000000
--- a/newlib/libc/sys/linux/linuxthreads/timer_delete.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <time.h>
-
-#include "posix-timer.h"
-
-
-/* Delete timer TIMERID.  */
-int
-timer_delete (timerid)
-     timer_t timerid;
-{
-  struct timer_node *timer;
-  int retval = -1;
-
-  pthread_mutex_lock (&__timer_mutex);
-
-  timer = timer_id2ptr (timerid);
-  if (! timer_valid (timer))
-    /* Invalid timer ID or the timer is not in use.  */
-    __set_errno (EINVAL);
-  else
-    {
-      if (timer->armed && timer->thread != NULL)
-	{
-	  struct thread_node *thread = timer->thread;
-	  assert (thread != NULL);
-
-	  /* If thread is cancelled while waiting for handler to terminate,
-	     the mutex is unlocked and timer_delete is aborted.  */
-	  pthread_cleanup_push (__timer_mutex_cancel_handler, &__timer_mutex);
-
-	  /* If timer is currently being serviced, wait for it to finish.  */
-	  while (thread->current_timer == timer)
-	    pthread_cond_wait (&thread->cond, &__timer_mutex);
-
-	  pthread_cleanup_pop (0);
-        }
-
-      /* Remove timer from whatever queue it may be on and deallocate it.  */
-      timer->inuse = TIMER_DELETED;
-      list_unlink_ip (&timer->links);
-      timer_delref (timer);
-      retval = 0;
-    }
-
-  pthread_mutex_unlock (&__timer_mutex);
-
-  return retval;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/timer_getoverr.c b/newlib/libc/sys/linux/linuxthreads/timer_getoverr.c
deleted file mode 100644
index 204addc..0000000
--- a/newlib/libc/sys/linux/linuxthreads/timer_getoverr.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include <time.h>
-
-#include "posix-timer.h"
-
-
-/* Get expiration overrun for timer TIMERID.  */
-int
-timer_getoverrun (timerid)
-     timer_t timerid;
-{
-  struct timer_node *timer;
-  int retval = -1;
-
-  pthread_mutex_lock (&__timer_mutex);
-
-  if (! timer_valid (timer = timer_id2ptr (timerid)))
-    __set_errno (EINVAL);
-  else
-    retval = 0; /* TODO: overrun counting not supported */
-
-  pthread_mutex_unlock (&__timer_mutex);
-
-  return retval;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/timer_gettime.c b/newlib/libc/sys/linux/linuxthreads/timer_gettime.c
deleted file mode 100644
index dbee9d9..0000000
--- a/newlib/libc/sys/linux/linuxthreads/timer_gettime.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include <time.h>
-
-#include "posix-timer.h"
-
-
-/* Get current value of timer TIMERID and store it in VLAUE.  */
-int
-timer_gettime (timerid, value)
-     timer_t timerid;
-     struct itimerspec *value;
-{
-  struct timer_node *timer;
-  struct timespec now, expiry;
-  int retval = -1, armed = 0, valid;
-  clock_t clock = 0;
-
-  pthread_mutex_lock (&__timer_mutex);
-
-  timer = timer_id2ptr (timerid);
-  valid = timer_valid (timer);
-
-  if (valid) {
-    armed = timer->armed;
-    expiry = timer->expirytime;
-    clock = timer->clock;
-    value->it_interval = timer->value.it_interval;
-  }
-
-  pthread_mutex_unlock (&__timer_mutex);
-
-  if (valid)
-    {
-      if (armed)
-	{
-	  clock_gettime (clock, &now);
-	  timespec_sub (&value->it_value, &expiry, &now);
-	}
-      else
-	{
-	  value->it_value.tv_sec = 0;
-	  value->it_value.tv_nsec = 0;
-	}
-
-      retval = 0;
-    }
-  else
-    __set_errno (EINVAL);
-
-  return retval;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/timer_routines.c b/newlib/libc/sys/linux/linuxthreads/timer_routines.c
deleted file mode 100644
index 65dc5dc..0000000
--- a/newlib/libc/sys/linux/linuxthreads/timer_routines.c
+++ /dev/null
@@ -1,584 +0,0 @@
-/* Helper code for POSIX timer implementation on LinuxThreads.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sysdep.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-
-#include "posix-timer.h"
-
-
-/* Number of threads used.  */
-#define THREAD_MAXNODES	16
-
-/* Array containing the descriptors for the used threads.  */
-static struct thread_node thread_array[THREAD_MAXNODES];
-
-/* Static array with the structures for all the timers.  */
-struct timer_node __timer_array[TIMER_MAX];
-
-/* Global lock to protect operation on the lists.  */
-pthread_mutex_t __timer_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-/* Variable to protext initialization.  */
-pthread_once_t __timer_init_once_control = PTHREAD_ONCE_INIT;
-
-/* Nonzero if initialization of timer implementation failed.  */
-int __timer_init_failed;
-
-/* Node for the thread used to deliver signals.  */
-struct thread_node __timer_signal_thread_rclk;
-#ifdef _POSIX_CPUTIME
-struct thread_node __timer_signal_thread_pclk;
-#endif
-#ifdef _POSIX_THREAD_CPUTIME
-struct thread_node __timer_signal_thread_tclk;
-#endif
-
-/* Lists to keep free and used timers and threads.  */
-struct list_links timer_free_list;
-struct list_links thread_free_list;
-struct list_links thread_active_list;
-
-
-#ifdef __NR_rt_sigqueueinfo
-extern int __syscall_rt_sigqueueinfo (int, int, siginfo_t *);
-#endif
-
-
-/* List handling functions.  */
-static inline void
-list_init (struct list_links *list)
-{
-  list->next = list->prev = list;
-}
-
-static inline void
-list_append (struct list_links *list, struct list_links *newp)
-{
-  newp->prev = list->prev;
-  newp->next = list;
-  list->prev->next = newp;
-  list->prev = newp;
-}
-
-static inline void
-list_insbefore (struct list_links *list, struct list_links *newp)
-{
-  list_append (list, newp);
-}
-
-/*
- * Like list_unlink_ip, except that calling it on a node that
- * is already unlinked is disastrous rather than a noop.
- */
-
-static inline void
-list_unlink (struct list_links *list)
-{
-  struct list_links *lnext = list->next, *lprev = list->prev;
-
-  lnext->prev = lprev;
-  lprev->next = lnext;
-}
-
-static inline struct list_links *
-list_first (struct list_links *list)
-{
-  return list->next;
-}
-
-static inline struct list_links *
-list_null (struct list_links *list)
-{
-  return list;
-}
-
-static inline struct list_links *
-list_next (struct list_links *list)
-{
-  return list->next;
-}
-
-static inline int
-list_isempty (struct list_links *list)
-{
-  return list->next == list;
-}
-
-
-/* Functions build on top of the list functions.  */
-static inline struct thread_node *
-thread_links2ptr (struct list_links *list)
-{
-  return (struct thread_node *) ((char *) list
-				 - offsetof (struct thread_node, links));
-}
-
-static inline struct timer_node *
-timer_links2ptr (struct list_links *list)
-{
-  return (struct timer_node *) ((char *) list
-				- offsetof (struct timer_node, links));
-}
-
-
-/* Initialize a newly allocated thread structure.  */
-static void
-thread_init (struct thread_node *thread, const pthread_attr_t *attr, clockid_t clock_id)
-{
-  if (attr != NULL)
-    thread->attr = *attr;
-  else
-    {
-      pthread_attr_init (&thread->attr);
-      pthread_attr_setdetachstate (&thread->attr, PTHREAD_CREATE_DETACHED);
-    }
-
-  thread->exists = 0;
-  list_init (&thread->timer_queue);
-  pthread_cond_init (&thread->cond, 0);
-  thread->current_timer = 0;
-  thread->captured = pthread_self ();
-  thread->clock_id = clock_id;
-}
-
-
-/* Initialize the global lists, and acquire global resources.  Error
-   reporting is done by storing a non-zero value to the global variable
-   timer_init_failed.  */
-static void
-init_module (void)
-{
-  int i;
-
-  list_init (&timer_free_list);
-  list_init (&thread_free_list);
-  list_init (&thread_active_list);
-
-  for (i = 0; i < TIMER_MAX; ++i)
-    {
-      list_append (&timer_free_list, &__timer_array[i].links);
-      __timer_array[i].inuse = TIMER_FREE;
-    }
-
-  for (i = 0; i < THREAD_MAXNODES; ++i)
-    list_append (&thread_free_list, &thread_array[i].links);
-
-  thread_init (&__timer_signal_thread_rclk, 0, CLOCK_REALTIME);
-#ifdef _POSIX_CPUTIME
-  thread_init (&__timer_signal_thread_pclk, 0, CLOCK_PROCESS_CPUTIME_ID);
-#endif
-#ifdef _POSIX_THREAD_CPUTIME
-  thread_init (&__timer_signal_thread_tclk, 0, CLOCK_THREAD_CPUTIME_ID);
-#endif
-}
-
-
-/* This is a handler executed in a child process after a fork()
-   occurs.  It reinitializes the module, resetting all of the data
-   structures to their initial state.  The mutex is initialized in
-   case it was locked in the parent process.  */
-static void
-reinit_after_fork (void)
-{
-  init_module ();
-  pthread_mutex_init (&__timer_mutex, 0);
-}
-
-
-/* Called once form pthread_once in timer_init. This initializes the
-   module and ensures that reinit_after_fork will be executed in any
-   child process.  */
-void
-__timer_init_once (void)
-{
-  init_module ();
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3
-  pthread_atfork (0, 0, reinit_after_fork);
-#endif
-}
-
-
-/* Deinitialize a thread that is about to be deallocated.  */
-static void
-thread_deinit (struct thread_node *thread)
-{
-  assert (list_isempty (&thread->timer_queue));
-  pthread_cond_destroy (&thread->cond);
-}
-
-
-/* Allocate a thread structure from the global free list.  Global
-   mutex lock must be held by caller.  The thread is moved to
-   the active list. */
-struct thread_node *
-__timer_thread_alloc (const pthread_attr_t *desired_attr, clockid_t clock_id)
-{
-  struct list_links *node = list_first (&thread_free_list);
-
-  if (node != list_null (&thread_free_list))
-    {
-      struct thread_node *thread = thread_links2ptr (node);
-      list_unlink (node);
-      thread_init (thread, desired_attr, clock_id);
-      list_append (&thread_active_list, node);
-      return thread;
-    }
-
-  return 0;
-}
-
-
-/* Return a thread structure to the global free list.  Global lock
-   must be held by caller.  */
-void
-__timer_thread_dealloc (struct thread_node *thread)
-{
-  thread_deinit (thread);
-  list_unlink (&thread->links);
-  list_append (&thread_free_list, &thread->links);
-}
-
-
-/* Each of our threads which terminates executes this cleanup
-   handler. We never terminate threads ourselves; if a thread gets here
-   it means that the evil application has killed it.  If the thread has
-   timers, these require servicing and so we must hire a replacement
-   thread right away.  We must also unblock another thread that may
-   have been waiting for this thread to finish servicing a timer (see
-   timer_delete()).  */
-
-static void
-thread_cleanup (void *val)
-{
-  if (val != NULL)
-    {
-      struct thread_node *thread = val;
-
-      /* How did the signal thread get killed?  */
-      assert (thread != &__timer_signal_thread_rclk);
-#ifdef _POSIX_CPUTIME
-      assert (thread != &__timer_signal_thread_pclk);
-#endif
-#ifdef _POSIX_THREAD_CPUTIME
-      assert (thread != &__timer_signal_thread_tclk);
-#endif
-
-      pthread_mutex_lock (&__timer_mutex);
-
-      thread->exists = 0;
-
-      /* We are no longer processing a timer event.  */
-      thread->current_timer = 0;
-
-      if (list_isempty (&thread->timer_queue))
-	  __timer_thread_dealloc (thread);
-      else
-	(void) __timer_thread_start (thread);
-
-      pthread_mutex_unlock (&__timer_mutex);
-
-      /* Unblock potentially blocked timer_delete().  */
-      pthread_cond_broadcast (&thread->cond);
-    }
-}
-
-
-/* Handle a timer which is supposed to go off now.  */
-static void
-thread_expire_timer (struct thread_node *self, struct timer_node *timer)
-{
-  self->current_timer = timer; /* Lets timer_delete know timer is running. */
-
-  pthread_mutex_unlock (&__timer_mutex);
-
-  switch (__builtin_expect (timer->event.sigev_notify, SIGEV_SIGNAL))
-    {
-    case SIGEV_NONE:
-      assert (! "timer_create should never have created such a timer");
-      break;
-
-    case SIGEV_SIGNAL:
-#ifdef __NR_rt_sigqueueinfo
-      {
-	siginfo_t info;
-
-	/* First, clear the siginfo_t structure, so that we don't pass our
-	   stack content to other tasks.  */
-	memset (&info, 0, sizeof (siginfo_t));
-	/* We must pass the information about the data in a siginfo_t
-           value.  */
-	info.si_signo = timer->event.sigev_signo;
-	info.si_code = SI_TIMER;
-	info.si_pid = timer->creator_pid;
-	info.si_uid = getuid ();
-	info.si_value = timer->event.sigev_value;
-
-	INLINE_SYSCALL (rt_sigqueueinfo, 3, info.si_pid, info.si_signo, &info);
-      }
-#else
-      if (pthread_kill (self->captured, timer->event.sigev_signo) != 0)
-	{
-	  if (pthread_kill (self->id, timer->event.sigev_signo) != 0)
-	    abort ();
-        }
-#endif
-      break;
-
-    case SIGEV_THREAD:
-      timer->event.sigev_notify_function (timer->event.sigev_value);
-      break;
-
-    default:
-      assert (! "unknown event");
-      break;
-    }
-
-  pthread_mutex_lock (&__timer_mutex);
-
-  self->current_timer = 0;
-
-  pthread_cond_broadcast (&self->cond);
-}
-
-
-/* Thread function; executed by each timer thread. The job of this
-   function is to wait on the thread's timer queue and expire the
-   timers in chronological order as close to their scheduled time as
-   possible.  */
-static void *
-__attribute__ ((noreturn))
-thread_func (void *arg)
-{
-  struct thread_node *self = arg;
-
-  /* Register cleanup handler, in case rogue application terminates
-     this thread.  (This cannot happen to __timer_signal_thread, which
-     doesn't invoke application callbacks). */
-
-  pthread_cleanup_push (thread_cleanup, self);
-
-  pthread_mutex_lock (&__timer_mutex);
-
-  while (1)
-    {
-      struct list_links *first;
-      struct timer_node *timer = NULL;
-
-      /* While the timer queue is not empty, inspect the first node.  */
-      first = list_first (&self->timer_queue);
-      if (first != list_null (&self->timer_queue))
-	{
-	  struct timespec now;
-
-	  timer = timer_links2ptr (first);
-
-	  /* This assumes that the elements of the list of one thread
-	     are all for the same clock.  */
-	  clock_gettime (timer->clock, &now);
-
-	  while (1)
-	    {
-	      /* If the timer is due or overdue, remove it from the queue.
-		 If it's a periodic timer, re-compute its new time and
-		 requeue it.  Either way, perform the timer expiry. */
-	      if (timespec_compare (&now, &timer->expirytime) < 0)
-		break;
-
-	      list_unlink_ip (first);
-
-	      if (__builtin_expect (timer->value.it_interval.tv_sec, 0) != 0
-		  || timer->value.it_interval.tv_nsec != 0)
-		{
-		  timespec_add (&timer->expirytime, &now,
-				&timer->value.it_interval);
-		  __timer_thread_queue_timer (self, timer);
-		}
-
-	      thread_expire_timer (self, timer);
-
-	      first = list_first (&self->timer_queue);
-	      if (first == list_null (&self->timer_queue))
-		break;
-
-	      timer = timer_links2ptr (first);
-	    }
-	}
-
-      /* If the queue is not empty, wait until the expiry time of the
-	 first node.  Otherwise wait indefinitely.  Insertions at the
-	 head of the queue must wake up the thread by broadcasting
-	 this condition variable.  */
-      if (timer != NULL)
-	pthread_cond_timedwait (&self->cond, &__timer_mutex,
-				&timer->expirytime);
-      else
-	pthread_cond_wait (&self->cond, &__timer_mutex);
-    }
-  /* This macro will never be executed since the while loop loops
-     forever - but we have to add it for proper nesting.  */
-  pthread_cleanup_pop (1);
-
-}
-
-
-/* Enqueue a timer in wakeup order in the thread's timer queue.
-   Returns 1 if the timer was inserted at the head of the queue,
-   causing the queue's next wakeup time to change. */
-
-int
-__timer_thread_queue_timer (struct thread_node *thread,
-			    struct timer_node *insert)
-{
-  struct list_links *iter;
-  int athead = 1;
-
-  for (iter = list_first (&thread->timer_queue);
-       iter != list_null (&thread->timer_queue);
-        iter = list_next (iter))
-    {
-      struct timer_node *timer = timer_links2ptr (iter);
-
-      if (timespec_compare (&insert->expirytime, &timer->expirytime) < 0)
-	  break;
-      athead = 0;
-    }
-
-  list_insbefore (iter, &insert->links);
-  return athead;
-}
-
-
-/* Start a thread and associate it with the given thread node.  Global
-   lock must be held by caller.  */
-int
-__timer_thread_start (struct thread_node *thread)
-{
-  int retval = 1;
-
-  assert (!thread->exists);
-  thread->exists = 1;
-
-  if (pthread_create (&thread->id, &thread->attr, thread_func, thread) != 0)
-    {
-      thread->exists = 0;
-      retval = -1;
-    }
-
-  return retval;
-}
-
-
-void
-__timer_thread_wakeup (struct thread_node *thread)
-{
-  pthread_cond_broadcast (&thread->cond);
-}
-
-
-/* Compare two pthread_attr_t thread attributes for exact equality.
-   Returns 1 if they are equal, otherwise zero if they are not equal or
-   contain illegal values.  This version is LinuxThreads-specific for
-   performance reason.  One could use the access functions to get the
-   values of all the fields of the attribute structure.  */
-static int
-thread_attr_compare (const pthread_attr_t *left, const pthread_attr_t *right)
-{
-  return (left->__detachstate == right->__detachstate
-	  && left->__schedpolicy == right->__schedpolicy
-	  && (left->__schedparam.sched_priority
-	      == right->__schedparam.sched_priority)
-	  && left->__inheritsched == right->__inheritsched
-	  && left->__scope == right->__scope);
-}
-
-
-/* Search the list of active threads and find one which has matching
-   attributes.  Global mutex lock must be held by caller.  */
-struct thread_node *
-__timer_thread_find_matching (const pthread_attr_t *desired_attr,
-			      clockid_t desired_clock_id)
-{
-  struct list_links *iter = list_first (&thread_active_list);
-
-  while (iter != list_null (&thread_active_list))
-    {
-      struct thread_node *candidate = thread_links2ptr (iter);
-
-      if (thread_attr_compare (desired_attr, &candidate->attr)
-	  && desired_clock_id == candidate->clock_id)
-	{
-	  list_unlink (iter);
-	  return candidate;
-        }
-
-      iter = list_next (iter);
-    }
-
-  return NULL;
-}
-
-
-/* Grab a free timer structure from the global free list.  The global
-   lock must be held by the caller.  */
-struct timer_node *
-__timer_alloc (void)
-{
-  struct list_links *node = list_first (&timer_free_list);
-
-  if (node != list_null (&timer_free_list))
-    {
-      struct timer_node *timer = timer_links2ptr (node);
-      list_unlink_ip (node);
-      timer->inuse = TIMER_INUSE;
-      timer->refcount = 1;
-      return timer;
-    }
-
-  return NULL;
-}
-
-
-/* Return a timer structure to the global free list.  The global lock
-   must be held by the caller.  */
-void
-__timer_dealloc (struct timer_node *timer)
-{
-  assert (timer->refcount == 0);
-  timer->thread = NULL;	/* Break association between timer and thread.  */
-  timer->inuse = TIMER_FREE;
-  list_append (&timer_free_list, &timer->links);
-}
-
-
-/* Thread cancellation handler which unlocks a mutex.  */
-void
-__timer_mutex_cancel_handler (void *arg)
-{
-  pthread_mutex_unlock (arg);
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/timer_settime.c b/newlib/libc/sys/linux/linuxthreads/timer_settime.c
deleted file mode 100644
index 2f187fd..0000000
--- a/newlib/libc/sys/linux/linuxthreads/timer_settime.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Kaz Kylheku <kaz@ashi.footprints.net>.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include <time.h>
-
-#include "posix-timer.h"
-
-
-/* Set timer TIMERID to VALUE, returning old value in OVLAUE.  */
-int
-timer_settime (timerid, flags, value, ovalue)
-     timer_t timerid;
-     int flags;
-     const struct itimerspec *value;
-     struct itimerspec *ovalue;
-{
-  struct timer_node *timer;
-  struct thread_node *thread = NULL;
-  struct timespec now;
-  int have_now = 0, need_wakeup = 0;
-  int retval = -1;
-
-  timer = timer_id2ptr (timerid);
-  if (timer == NULL)
-    {
-      __set_errno (EINVAL);
-      goto bail;
-    }
-
-  if (value->it_interval.tv_nsec < 0
-      || value->it_interval.tv_nsec >= 1000000000
-      || value->it_value.tv_nsec < 0
-      || value->it_value.tv_nsec >= 1000000000)
-    {
-      __set_errno (EINVAL);
-      goto bail;
-    }
-
-  /* Will need to know current time since this is a relative timer;
-     might as well make the system call outside of the lock now! */
-
-  if ((flags & TIMER_ABSTIME) == 0)
-    {
-      clock_gettime (timer->clock, &now);
-      have_now = 1;
-    }
-
-  pthread_mutex_lock (&__timer_mutex);
-  timer_addref (timer);
-
-  /* One final check of timer validity; this one is possible only
-     until we have the mutex, because it accesses the inuse flag. */
-
-  if (! timer_valid(timer))
-    {
-      __set_errno (EINVAL);
-      goto unlock_bail;
-    }
-
-  if (ovalue != NULL)
-    {
-      ovalue->it_interval = timer->value.it_interval;
-
-      if (timer->armed)
-	{
-	  if (! have_now)
-	    {
-	      pthread_mutex_unlock (&__timer_mutex);
-	      clock_gettime (timer->clock, &now);
-	      have_now = 1;
-	      pthread_mutex_lock (&__timer_mutex);
-	      timer_addref (timer);
-	    }
-
-	  timespec_sub (&ovalue->it_value, &timer->expirytime, &now);
-	}
-      else
-	{
-	  ovalue->it_value.tv_sec = 0;
-	  ovalue->it_value.tv_nsec = 0;
-	}
-    }
-
-  timer->value = *value;
-
-  list_unlink_ip (&timer->links);
-  timer->armed = 0;
-
-  thread = timer->thread;
-
-  /* A value of { 0, 0 } causes the timer to be stopped. */
-  if (value->it_value.tv_sec != 0
-      || __builtin_expect (value->it_value.tv_nsec != 0, 1))
-    {
-      if ((flags & TIMER_ABSTIME) != 0)
-	/* The user specified the expiration time.  */
-	timer->expirytime = value->it_value;
-      else
-	timespec_add (&timer->expirytime, &now, &value->it_value);
-
-      /* Only need to wake up the thread if timer is inserted
-	 at the head of the queue. */
-      if (thread != NULL)
-	need_wakeup = __timer_thread_queue_timer (thread, timer);
-      timer->armed = 1;
-    }
-
-  retval = 0;
-
-unlock_bail:
-  timer_delref (timer);
-  pthread_mutex_unlock (&__timer_mutex);
-
-bail:
-  if (thread != NULL && need_wakeup)
-    __timer_thread_wakeup (thread);
-
-  return retval;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/tst-cancel.c b/newlib/libc/sys/linux/linuxthreads/tst-cancel.c
deleted file mode 100644
index da32aaf..0000000
--- a/newlib/libc/sys/linux/linuxthreads/tst-cancel.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Tests for cancelation handling.  */
-
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-int fd;
-
-pthread_barrier_t bar;
-
-
-static void
-cleanup (void *arg)
-{
-  int nr = (int) (long int) arg;
-  char s[30];
-  char *cp = stpcpy (s, "cleanup ");
-  *cp++ = '0' + nr;
-  *cp++ = '\n';
-  __libc_lseek (fd, 0, SEEK_END);
-  __libc_write (fd, s, cp - s);
-}
-
-
-static void *
-t1 (void *arg)
-{
-  pthread_cleanup_push (cleanup, (void *) (long int) 1);
-  return NULL;
-  pthread_cleanup_pop (0);
-}
-
-
-static void
-inner (int a)
-{
-  pthread_cleanup_push (cleanup, (void *) (long int) a);
-  if (a)
-    return;
-  pthread_cleanup_pop (0);
-}
-
-
-static void *
-t2 (void *arg)
-{
-  pthread_cleanup_push (cleanup, (void *) (long int) 2);
-  inner ((int) (long int) arg);
-  return NULL;
-  pthread_cleanup_pop (0);
-}
-
-
-/* This does not work yet.  */
-volatile int cleanupokcnt;
-
-static void
-cleanupok (void *arg)
-{
-  ++cleanupokcnt;
-}
-
-
-static void *
-t3 (void *arg)
-{
-  pthread_cleanup_push (cleanupok, (void *) (long int) 4);
-  inner ((int) (long int) arg);
-  pthread_exit (NULL);
-  pthread_cleanup_pop (0);
-}
-
-
-static void
-innerok (int a)
-{
-  pthread_cleanup_push (cleanupok, (void *) (long int) a);
-  pthread_exit (NULL);
-  pthread_cleanup_pop (0);
-}
-
-
-static void *
-t4 (void *arg)
-{
-  pthread_cleanup_push (cleanupok, (void *) (long int) 6);
-  innerok ((int) (long int) arg);
-  pthread_cleanup_pop (0);
-  return NULL;
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  pthread_t td;
-  int err;
-  char *tmp;
-  const char *prefix;
-  const char template[] = "thtstXXXXXX";
-  struct stat64 st;
-  int result = 0;
-
-  prefix = argc > 1 ? argv[1] : "";
-  tmp = (char *) alloca (strlen (prefix) + sizeof template);
-  strcpy (stpcpy (tmp, prefix), template);
-
-  fd = mkstemp (tmp);
-  if (fd == -1)
-    {
-      printf ("cannot create temporary file: %m");
-      exit (1);
-    }
-  unlink (tmp);
-
-  err = pthread_barrier_init (&bar, NULL, 2);
-  if (err != 0 )
-    {
-      printf ("cannot create barrier: %s\n", strerror (err));
-      exit (1);
-    }
-
-#ifdef NOT_YET
-  err = pthread_create (&td, NULL, t1, NULL);
-  if (err != 0)
-    {
-      printf ("cannot create thread t1: %s\n", strerror (err));
-      exit (1);
-    }
-
-  err = pthread_join (td, NULL);
-  if (err != 0)
-    {
-      printf ("cannot join thread: %s\n", strerror (err));
-      exit (1);
-    }
-
-  err = pthread_create (&td, NULL, t2, (void *) 3);
-  if (err != 0)
-    {
-      printf ("cannot create thread t2: %s\n", strerror (err));
-      exit (1);
-    }
-
-  err = pthread_join (td, NULL);
-  if (err != 0)
-    {
-      printf ("cannot join thread: %s\n", strerror (err));
-      exit (1);
-    }
-
-  err = pthread_create (&td, NULL, t3, (void *) 5);
-  if (err != 0)
-    {
-      printf ("cannot create thread t3: %s\n", strerror (err));
-      exit (1);
-    }
-
-  err = pthread_join (td, NULL);
-  if (err != 0)
-    {
-      printf ("cannot join thread: %s\n", strerror (err));
-      exit (1);
-    }
-#endif
-
-  err = pthread_create (&td, NULL, t4, (void *) 7);
-  if (err != 0)
-    {
-      printf ("cannot create thread t3: %s\n", strerror (err));
-      exit (1);
-    }
-
-  err = pthread_join (td, NULL);
-  if (err != 0)
-    {
-      printf ("cannot join thread: %s\n", strerror (err));
-      exit (1);
-    }
-
-  if (fstat64 (fd, &st) < 0)
-    {
-      printf ("cannot stat temporary file: %m\n");
-      result = 1;
-    }
-  else if (st.st_size != 0)
-    {
-      char buf[512];
-      puts ("some cleanup handlers ran:");
-      fflush (stdout);
-      __lseek (fd, 0, SEEK_SET);
-      while (1)
-	{
-	  ssize_t n = read (fd, buf, sizeof buf);
-	  if (n <= 0)
-	    break;
-	  write (STDOUT_FILENO, buf, n);
-	}
-      result = 1;
-    }
-
-  // if (cleanupokcnt != 3)  will be three once t3 runs
-  if (cleanupokcnt != 2)
-    {
-      printf ("cleanupokcnt = %d\n", cleanupokcnt);
-      result = 1;
-    }
-
-  return result;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/tst-context.c b/newlib/libc/sys/linux/linuxthreads/tst-context.c
deleted file mode 100644
index 9066e83..0000000
--- a/newlib/libc/sys/linux/linuxthreads/tst-context.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include <errno.h>
-#include <error.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ucontext.h>
-
-#include "pt-machine.h"
-
-
-#define N	4
-
-#ifdef FLOATING_STACKS
-static char stacks[N][8192];
-static ucontext_t ctx[N][2];
-static volatile int failures;
-
-static void
-fct (long int n)
-{
-  /* Just to use the thread local descriptor.  */
-  printf ("%ld: in %s now\n", n, __FUNCTION__);
-  errno = 0;
-}
-
-static void *
-threadfct (void *arg)
-{
-  int n = (int) (long int) arg;
-
-  if (getcontext (&ctx[n][1]) != 0)
-    {
-      printf ("%d: cannot get context: %m\n", n);
-      exit (1);
-    }
-
-  printf ("%d: %s: before makecontext\n", n, __FUNCTION__);
-
-  ctx[n][1].uc_stack.ss_sp = stacks[n];
-  ctx[n][1].uc_stack.ss_size = 8192;
-  ctx[n][1].uc_link = &ctx[n][0];
-  makecontext (&ctx[n][1], (void (*) (void)) fct, 1, (long int) n);
-
-  printf ("%d: %s: before swapcontext\n", n, __FUNCTION__);
-
-  if (swapcontext (&ctx[n][0], &ctx[n][1]) != 0)
-    {
-      ++failures;
-      printf ("%d: %s: swapcontext failed\n", n, __FUNCTION__);
-    }
-  else
-    printf ("%d: back in %s\n", n, __FUNCTION__);
-
-  return NULL;
-}
-#endif
-
-
-#ifdef FLOATING_STACKS
-static volatile int global;
-#endif
-
-int
-main (void)
-{
-#ifndef FLOATING_STACKS
-  puts ("not supported");
-  return 0;
-#else
-  int n;
-  pthread_t th[N];
-  ucontext_t mctx;
-
-  puts ("making contexts");
-  if (getcontext (&mctx) != 0)
-    {
-      if (errno == ENOSYS)
-	{
-	  puts ("context handling not supported");
-	  exit (0);
-	}
-
-      printf ("%s: getcontext: %m\n", __FUNCTION__);
-      exit (1);
-    }
-
-  /* Play some tricks with this context.  */
-  if (++global == 1)
-    if (setcontext (&mctx) != 0)
-      {
-	printf ("%s: setcontext: %m\n", __FUNCTION__);
-	exit (1);
-      }
-  if (global != 2)
-    {
-      printf ("%s: 'global' not incremented twice\n", __FUNCTION__);
-      exit (1);
-    }
-
-  for (n = 0; n < N; ++n)
-    if (pthread_create (&th[n], NULL, threadfct, (void *) n) != 0)
-      error (EXIT_FAILURE, errno, "cannot create all threads");
-
-  for (n = 0; n < N; ++n)
-    pthread_join (th[n], NULL);
-
-  return failures;
-#endif
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/tststack.c b/newlib/libc/sys/linux/linuxthreads/tststack.c
deleted file mode 100644
index 6789ff8..0000000
--- a/newlib/libc/sys/linux/linuxthreads/tststack.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Tests for variable stack size handling.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <pthread.h>
-#include <stdio.h>
-#include <unistd.h>
-
-static void *f1 (void *);
-static void *f2 (void *);
-
-int
-main (void)
-{
-  pthread_attr_t attr;
-  pthread_t th1 = 0;
-  pthread_t th2 = 0;
-  void *res1;
-  void *res2;
-
-  pthread_attr_init (&attr);
-  if (pthread_attr_setstacksize (&attr, 70*1024) != 0)
-    {
-      puts ("invalid stack size");
-      return 1;
-    }
-
-  pthread_create (&th1, NULL, f1, NULL);
-  pthread_create (&th2, &attr, f2, NULL);
-
-  pthread_join (th1, &res1);
-  pthread_join (th2, &res2);
-
-  printf ("res1 = %p\n", res1);
-  printf ("res2 = %p\n", res2);
-
-  return res1 != (void *) 1 || res2 != (void *) 2;
-}
-
-static void *
-f1 (void *parm)
-{
-  printf ("This is `%s'\n", __FUNCTION__);
-  fflush (stdout);
-
-  return (void *) 1;
-}
-
-static void *
-f2 (void *parm)
-{
-  printf ("This is `%s'\n", __FUNCTION__);
-  fflush (stdout);
-  sleep (1);
-
-  return (void *) 2;
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/unload.c b/newlib/libc/sys/linux/linuxthreads/unload.c
deleted file mode 100644
index c528df2..0000000
--- a/newlib/libc/sys/linux/linuxthreads/unload.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Tests for non-unloading of libpthread.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <dlfcn.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <gnu/lib-names.h>
-
-int
-main (void)
-{
-  void *p = dlopen (PREFIX LIBPTHREAD_SO, RTLD_LAZY);
-
-  if (p == NULL)
-    {
-      puts ("failed to load " LIBPTHREAD_SO);
-      exit (1);
-    }
-
-  if (dlclose (p) != 0)
-    {
-      puts ("dlclose (" LIBPTHREAD_SO ") failed");
-      exit (1);
-    }
-
-  puts ("seems to work");
-
-  exit (0);
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/weaks.c b/newlib/libc/sys/linux/linuxthreads/weaks.c
deleted file mode 100644
index 6e2cf4b..0000000
--- a/newlib/libc/sys/linux/linuxthreads/weaks.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* The weak pthread functions for Linux.
-   Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <shlib-compat.h>
-#include <bp-sym.h>
-#include "libc-symbols.h"
-
-extern int __pthread_return_0 (void);
-extern int __pthread_return_1 (void);
-extern void __pthread_return_void (void);
-extern void weak_function pthread_exit (void *__retval)
-     __attribute__ ((noreturn));
-
-/* Those are pthread functions which return 0 if successful. */
-weak_alias (__pthread_return_0, BP_SYM (__libc_pthread_attr_init_2_1))
-versioned_symbol (libpthread, BP_SYM (__libc_pthread_attr_init_2_1),
-		  BP_SYM (pthread_attr_init), GLIBC_2_1);
-#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
-weak_alias (__pthread_return_0, BP_SYM (__libc_pthread_attr_init_2_0))
-compat_symbol (libpthread, BP_SYM (__libc_pthread_attr_init_2_0),
-	       BP_SYM (pthread_attr_init), GLIBC_2_0);
-#endif
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_destroy))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setdetachstate))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getdetachstate))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setschedparam))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getschedparam))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setschedpolicy))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getschedpolicy))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setinheritsched))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getinheritsched))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setscope))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getscope))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setstackaddr))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getstackaddr))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_setstacksize))
-weak_alias (__pthread_return_0, BP_SYM (pthread_attr_getstacksize))
-weak_alias (__pthread_return_0, BP_SYM (pthread_mutex_init))
-weak_alias (__pthread_return_0, BP_SYM (pthread_mutex_destroy))
-weak_alias (__pthread_return_0, BP_SYM (pthread_mutex_lock))
-weak_alias (__pthread_return_0, BP_SYM (pthread_mutex_trylock))
-weak_alias (__pthread_return_0, BP_SYM (pthread_mutex_unlock))
-weak_alias (__pthread_return_0, BP_SYM (pthread_mutexattr_init))
-weak_alias (__pthread_return_0, BP_SYM (pthread_mutexattr_destroy))
-weak_alias (__pthread_return_0, BP_SYM (pthread_mutexattr_settype))
-weak_alias (__pthread_return_0, BP_SYM (pthread_mutexattr_gettype))
-weak_alias (__pthread_return_0, BP_SYM (pthread_condattr_init))
-weak_alias (__pthread_return_0, BP_SYM (pthread_condattr_destroy))
-weak_alias (__pthread_return_0, BP_SYM (pthread_setschedparam))
-weak_alias (__pthread_return_0, BP_SYM (pthread_getschedparam))
-weak_alias (__pthread_return_0, BP_SYM (pthread_getcancelstate))
-weak_alias (__pthread_return_0, BP_SYM (pthread_setcancelstate))
-weak_alias (__pthread_return_0, BP_SYM (pthread_setcanceltype))
-weak_alias (__pthread_return_0, pthread_setconcurrency)
-weak_alias (__pthread_return_0, pthread_getconcurrency)
-weak_alias (__pthread_return_0, pthread_self)
-weak_alias (__pthread_return_0, BP_SYM (pthread_cond_init))
-weak_alias (__pthread_return_0, BP_SYM (pthread_cond_destroy))
-weak_alias (__pthread_return_0, BP_SYM (pthread_cond_wait))
-weak_alias (__pthread_return_0, BP_SYM (pthread_cond_timedwait))
-weak_alias (__pthread_return_0, BP_SYM (pthread_cond_signal))
-weak_alias (__pthread_return_0, BP_SYM (pthread_cond_broadcast))
-weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_init))
-weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_destroy))
-weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_rdlock))
-weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_wrlock))
-weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_tryrdlock))
-weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_trywrlock))
-weak_alias (__pthread_return_0, BP_SYM (pthread_rwlock_unlock))
-weak_alias (__pthread_return_0, BP_SYM (pthread_rwlockattr_init))
-weak_alias (__pthread_return_0, BP_SYM (pthread_rwlockattr_destroy))
-weak_alias (__pthread_return_0, BP_SYM (pthread_rwlockattr_setpshared))
-weak_alias (__pthread_return_0, BP_SYM (pthread_rwlockattr_getpshared))
-
-
-/* Those are pthread functions which return 1 if successful. */
-weak_alias (__pthread_return_1, pthread_equal)
-
-/* pthread_exit () is a special case. */
-void
-weak_function
-pthread_exit (void *retval)
-{
-  exit (EXIT_SUCCESS);
-}
-
-int
-__pthread_return_0 (void)
-{
-  return 0;
-}
-
-int
-__pthread_return_1 (void)
-{
-  return 1;
-}
-
-void
-__pthread_return_void (void)
-{
-}
diff --git a/newlib/libc/sys/linux/linuxthreads/wrapsyscall.c b/newlib/libc/sys/linux/linuxthreads/wrapsyscall.c
deleted file mode 100644
index ec1bc2a..0000000
--- a/newlib/libc/sys/linux/linuxthreads/wrapsyscall.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* Wrapper arpund system calls to provide cancelation points.
-   Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <sys/resource.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include "libc-symbols.h"
-
-
-#ifndef SHARED
-/* We need a hook to force this file to be linked in when static
-   libpthread is used.  */
-const int __pthread_provide_wrappers = 0;
-#endif
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-#define ELIX_2_PLUS
-#endif
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3
-#define ELIX_3_PLUS
-#endif
-
-#define CANCELABLE_SYSCALL(res_type, name, param_list, params) \
-res_type __libc_##name param_list;					      \
-res_type								      \
-__attribute__ ((weak))							      \
-name param_list								      \
-{									      \
-  res_type result;							      \
-  int oldtype;								      \
-  pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, &oldtype);	      \
-  result = __libc_##name params;					      \
-  pthread_setcanceltype (oldtype, NULL);				      \
-  return result;							      \
-}
-
-#define CANCELABLE_SYSCALL_VA(res_type, name, param_list, params, last_arg) \
-res_type __libc_##name param_list;					      \
-res_type								      \
-__attribute__ ((weak))							      \
-name param_list								      \
-{									      \
-  res_type result;							      \
-  int oldtype;								      \
-  va_list ap;								      \
-  pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, &oldtype);	      \
-  va_start (ap, last_arg);						      \
-  result = __libc_##name params;					      \
-  va_end (ap);								      \
-  pthread_setcanceltype (oldtype, NULL);				      \
-  return result;							      \
-}
-
-
-/* close(2).  */
-CANCELABLE_SYSCALL (int, close, (int fd), (fd))
-strong_alias (close, __close)
-
-
-/* fcntl(2).  */
-CANCELABLE_SYSCALL_VA (int, fcntl, (int fd, int cmd, ...),
-		       (fd, cmd, va_arg (ap, long int)), cmd)
-strong_alias (fcntl, __fcntl)
-
-
-/* fsync(2).  */
-CANCELABLE_SYSCALL (int, fsync, (int fd), (fd))
-
-
-/* lseek(2).  */
-CANCELABLE_SYSCALL (off_t, lseek, (int fd, off_t offset, int whence),
-		    (fd, offset, whence))
-strong_alias (lseek, __lseek)
-
-
-#ifdef ELIX_2_PLUS
-/* lseek64(2).  */
-CANCELABLE_SYSCALL (loff_t, lseek64, (int fd, loff_t offset, int whence),
-		    (fd, offset, whence))
-#endif
-
-
-/* msync(2).  */
-CANCELABLE_SYSCALL (int, msync, (__ptr_t addr, size_t length, int flags),
-		    (addr, length, flags))
-
-
-/* nanosleep(2).  */
-CANCELABLE_SYSCALL (int, nanosleep, (const struct timespec *requested_time,
-				     struct timespec *remaining),
-		    (requested_time, remaining))
-
-
-/* open(2).  */
-CANCELABLE_SYSCALL_VA (int, open, (const char *pathname, int flags, ...),
-		       (pathname, flags, va_arg (ap, int)), flags)
-strong_alias (open, __open)
-
-
-#ifdef ELIX_2_PLUS
-/* open64(3).  */
-CANCELABLE_SYSCALL_VA (int, open64, (const char *pathname, int flags, ...),
-		       (pathname, flags, va_arg (ap, int)), flags)
-strong_alias (open64, __open64)
-#endif
-
-
-/* pause(2).  */
-CANCELABLE_SYSCALL (int, pause, (void), ())
-
-
-/* pread(3).  */
-CANCELABLE_SYSCALL (ssize_t, pread, (int fd, void *buf, size_t count,
-				     off_t offset),
-		    (fd, buf, count, offset))
-
-
-#ifdef ELIX_2_PLUS
-/* pread64(3).  */
-CANCELABLE_SYSCALL (ssize_t, pread64, (int fd, void *buf, size_t count,
-				       loff_t offset),
-		    (fd, buf, count, offset))
-strong_alias (pread64, __pread64)
-#endif
-
-
-/* pwrite(3).  */
-CANCELABLE_SYSCALL (ssize_t, pwrite, (int fd, const void *buf, size_t n,
-				      off_t offset),
-		    (fd, buf, n, offset))
-
-
-#ifdef ELIX_2_PLUS
-/* pwrite64(3).  */
-CANCELABLE_SYSCALL (ssize_t, pwrite64, (int fd, const void *buf, size_t n,
-					loff_t offset),
-		    (fd, buf, n, offset))
-strong_alias (pwrite64, __pwrite64)
-#endif
-
-
-/* read(2).  */
-CANCELABLE_SYSCALL (ssize_t, read, (int fd, void *buf, size_t count),
-		    (fd, buf, count))
-strong_alias (read, __read)
-
-
-#ifdef ELIX_3_PLUS
-/* system(3).  */
-CANCELABLE_SYSCALL (int, system, (const char *line), (line))
-#endif
-
-
-/* tcdrain(2).  */
-CANCELABLE_SYSCALL (int, tcdrain, (int fd), (fd))
-
-
-#ifdef ELIX_3_PLUS
-/* wait(2).  */
-CANCELABLE_SYSCALL (__pid_t, wait, (int *stat_loc), (stat_loc))
-strong_alias (wait, __wait)
-#endif
-
-
-#ifdef ELIX_3_PLUS
-/* waitpid(2).  */
-CANCELABLE_SYSCALL (__pid_t, waitpid, (__pid_t pid, int *stat_loc,
-				       int options),
-		    (pid, stat_loc, options))
-#endif
-
-/* for libpthread usage */
-CANCELABLE_SYSCALL (__pid_t, __waitpid, (__pid_t pid, int *stat_loc,
-				       int options),
-		    (pid, stat_loc, options))
-
-/* write(2).  */
-CANCELABLE_SYSCALL (ssize_t, write, (int fd, const void *buf, size_t n),
-		    (fd, buf, n))
-strong_alias (write, __write)
-
-
-/* The following system calls are thread cancellation points specified
-   in XNS.  */
-
-/* accept(2).  */
-CANCELABLE_SYSCALL (int, accept, (int fd, __SOCKADDR_ARG addr,
-				  socklen_t *addr_len),
-		    (fd, addr, addr_len))
-
-/* connect(2).  */
-CANCELABLE_SYSCALL (int, connect, (int fd, __CONST_SOCKADDR_ARG addr,
-				     socklen_t len),
-		    (fd, addr, len))
-strong_alias (connect, __connect)
-
-/* recv(2).  */
-CANCELABLE_SYSCALL (ssize_t, recv, (int fd, __ptr_t buf, size_t n, int flags),
-		    (fd, buf, n, flags))
-
-/* recvfrom(2).  */
-CANCELABLE_SYSCALL (ssize_t, recvfrom, (int fd, __ptr_t buf, size_t n, int flags,
-					__SOCKADDR_ARG addr, socklen_t *addr_len),
-		    (fd, buf, n, flags, addr, addr_len))
-
-/* recvmsg(2).  */
-CANCELABLE_SYSCALL (ssize_t, recvmsg, (int fd, struct msghdr *message, int flags),
-		    (fd, message, flags))
-
-/* send(2).  */
-CANCELABLE_SYSCALL (ssize_t, send, (int fd, const __ptr_t buf, size_t n,
-				    int flags),
-		    (fd, buf, n, flags))
-strong_alias (send, __send)
-
-/* sendmsg(2).  */
-CANCELABLE_SYSCALL (ssize_t, sendmsg, (int fd, const struct msghdr *message,
-				       int flags),
-		    (fd, message, flags))
-
-/* sendto(2).  */
-CANCELABLE_SYSCALL (ssize_t, sendto, (int fd, const __ptr_t buf, size_t n,
-				      int flags, __CONST_SOCKADDR_ARG addr,
-				      socklen_t addr_len),
-		    (fd, buf, n, flags, addr, addr_len))
diff --git a/newlib/libc/sys/linux/machine/Makefile.am b/newlib/libc/sys/linux/machine/Makefile.am
deleted file mode 100644
index 3f10b8f..0000000
--- a/newlib/libc/sys/linux/machine/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-SUBDIRS = $(machine_dir) .
-
-noinst_DATA = $(CRT0)
-
-$(CRT0): $(machine_dir)/$(CRT0)
-	rm -f $@
-	ln $(machine_dir)/$(CRT0) $@ >/dev/null 2>/dev/null \
-	 || cp $(machine_dir)/$(CRT0) $@
-
-$(machine_dir)/$(CRT0): ; @true
-
-CLEANFILES = $(CRT0)
-
-doc:
-
-ACLOCAL_AMFLAGS = -I ../../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/linux/machine/Makefile.in b/newlib/libc/sys/linux/machine/Makefile.in
deleted file mode 100644
index 1e68c01..0000000
--- a/newlib/libc/sys/linux/machine/Makefile.in
+++ /dev/null
@@ -1,371 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-SUBDIRS = $(machine_dir) .
-
-noinst_DATA = $(CRT0)
-
-CLEANFILES = $(CRT0)
-
-ACLOCAL_AMFLAGS = -I ../../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../../acinclude.m4 ../../../../aclocal.m4 \
-		../../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am:
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-info-am: 
-install-info: install-info-recursive
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile $(DATA)
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-tags clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs-am installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
-
-
-$(CRT0): $(machine_dir)/$(CRT0)
-	rm -f $@
-	ln $(machine_dir)/$(CRT0) $@ >/dev/null 2>/dev/null \
-	 || cp $(machine_dir)/$(CRT0) $@
-
-$(machine_dir)/$(CRT0): ; @true
-
-doc:
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/linux/machine/aclocal.m4 b/newlib/libc/sys/linux/machine/aclocal.m4
deleted file mode 100644
index 35519ac..0000000
--- a/newlib/libc/sys/linux/machine/aclocal.m4
+++ /dev/null
@@ -1,1226 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  ])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)])
-
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libc/sys/linux/machine/configure b/newlib/libc/sys/linux/machine/configure
deleted file mode 100755
index 3c31679..0000000
--- a/newlib/libc/sys/linux/machine/configure
+++ /dev/null
@@ -1,3432 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=yes]"
-ac_help="$ac_help
-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=i386
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../../.. $srcdir/../../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../../.. $srcdir/../../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:590: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:643: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:700: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:733: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 738 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:766: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 771 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:948: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:969: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:987: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1030: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1043: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1056: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1069: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1082: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1186: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1210: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1337: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1382: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-if test "${use_libtool}" = "yes"; then
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_shared=yes
-fi
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_static=yes
-fi
-
-# Check whether --enable-fast-install or --disable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_fast_install=yes
-fi
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1658: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1688: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1739: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1782 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1818: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1846: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1889: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1919: checking for GNU ld" >&5
-else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1922: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1957: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi
-fi
-
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1974: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1986: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-
-NM="$lt_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2024: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2045: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2218: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2248: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2310: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2381: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2413: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2448: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2480: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-libtool_flags="$libtool_flags --enable-win32-dll"
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-  :
-fi
-
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 2547 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2585: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2598 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
-fi
-rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-fi
-
-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2635: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_DLLTOOL"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2667: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  DLLTOOL="false"
-fi
-fi
-
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2702: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2734: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AS="false"
-fi
-fi
-
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2769: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_OBJDUMP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2801: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="objdump"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  OBJDUMP="false"
-fi
-fi
-
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2837: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2871: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2876 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  
-esac
-
-
-# Save cache, so that ltconfig can load it
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
-# Reload cache, that may have been modified by ltconfig
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-
-  
-
-  
-	 
-	 
-fi
-
-if test -n "${machine_dir}"; then
-  subdirs="${machine_dir}"
-
-fi
-
-CRT0=
-if test -n "${machine_dir}"; then
-  CRT0=crt0.o
-fi
-
-
-
-
-if test x${machine_dir} != x; then
-  HAVE_MACHINE_DIR_TRUE=
-  HAVE_MACHINE_DIR_FALSE='#'
-else
-  HAVE_MACHINE_DIR_TRUE='#'
-  HAVE_MACHINE_DIR_FALSE=
-fi
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@OBJDUMP@%$OBJDUMP%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@subdirs@%$subdirs%g
-s%@CRT0@%$CRT0%g
-s%@HAVE_MACHINE_DIR_TRUE@%$HAVE_MACHINE_DIR_TRUE%g
-s%@HAVE_MACHINE_DIR_FALSE@%$HAVE_MACHINE_DIR_FALSE%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  for ac_arg in $ac_configure_args; do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case "$ac_arg" in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  for ac_config_dir in ${machine_dir}; do
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    if test ! -d $srcdir/$ac_config_dir; then
-      continue
-    fi
-
-    echo configuring in $ac_config_dir
-
-    case "$srcdir" in
-    .) ;;
-    *)
-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
-      else
-        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
-      fi
-      ;;
-    esac
-
-    ac_popdir=`pwd`
-    cd $ac_config_dir
-
-      # A "../" for each directory in /$ac_config_dir.
-      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
-
-    case "$srcdir" in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir ;;
-    /*) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
-    *) # Relative path.
-      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
-    esac
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure=$ac_sub_srcdir/configure
-    elif test -f $ac_sub_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-
-      # Make the cache file name correct relative to the subdirectory.
-      case "$cache_file" in
-      /*) ac_sub_cache_file=$cache_file ;;
-      *) # Relative path.
-        ac_sub_cache_file="$ac_dots$cache_file" ;;
-      esac
-  case "$ac_given_INSTALL" in
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
-
-      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-      # The eval makes quoting arguments work.
-      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-      then :
-      else
-        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
-      fi
-    fi
-
-    cd $ac_popdir
-  done
-fi
-
diff --git a/newlib/libc/sys/linux/machine/configure.in b/newlib/libc/sys/linux/machine/configure.in
deleted file mode 100644
index a9dc30c..0000000
--- a/newlib/libc/sys/linux/machine/configure.in
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl This is the newlib/libc/sys configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(i386)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../../..)
-
-NEWLIB_CONFIGURE(../../../..)
-
-dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
-dnl add it into NEWLIB_CONFIGURE, executable tests are made before the first
-dnl line of the macro which fail because appropriate LDFLAGS are not set.
-if test "${use_libtool}" = "yes"; then
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-fi
-
-if test -n "${machine_dir}"; then
-  AC_CONFIG_SUBDIRS(${machine_dir})
-fi
-
-CRT0=
-if test -n "${machine_dir}"; then
-  CRT0=crt0.o
-fi
-AC_SUBST(CRT0)
-
-AM_CONDITIONAL(HAVE_MACHINE_DIR, test x${machine_dir} != x)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/sys/linux/machine/hp-timing.h b/newlib/libc/sys/linux/machine/hp-timing.h
deleted file mode 100644
index 099342d..0000000
--- a/newlib/libc/sys/linux/machine/hp-timing.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* High precision, low overhead timing functions.  Generic version.
-   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _HP_TIMING_H
-#define _HP_TIMING_H	1
-
-
-/* There are no generic definitions for the times.  We could write something
-   using the `gettimeofday' system call where available but the overhead of
-   the system call might be too high.
-
-   In case a platform supports timers in the hardware the following macros
-   and types must be defined:
-
-   - HP_TIMING_AVAIL: test for availability.
-
-   - HP_TIMING_INLINE: this macro is non-zero if the functionality is not
-     implemented using function calls but instead uses some inlined code
-     which might simply consist of a few assembler instructions.  We have to
-     know this since we might want to use the macros here in places where we
-     cannot make function calls.
-
-   - hp_timing_t: This is the type for variables used to store the time
-     values.
-
-   - HP_TIMING_ZERO: clear `hp_timing_t' object.
-
-   - HP_TIMING_NOW: place timestamp for current time in variable given as
-     parameter.
-
-   - HP_TIMING_DIFF_INIT: do whatever is necessary to be able to use the
-     HP_TIMING_DIFF macro.
-
-   - HP_TIMING_DIFF: compute difference between two times and store it
-     in a third.  Source and destination might overlap.
-
-   - HP_TIMING_ACCUM: add time difference to another variable.  This might
-     be a bit more complicated to implement for some platforms as the
-     operation should be thread-safe and 64bit arithmetic on 32bit platforms
-     is not.
-
-   - HP_TIMING_ACCUM_NT: this is the variant for situations where we know
-     there are no threads involved.
-
-   - HP_TIMING_PRINT: write decimal representation of the timing value into
-     the given string.  This operation need not be inline even though
-     HP_TIMING_INLINE is specified.
-
-*/
-
-/* Provide dummy definitions.  */
-#define HP_TIMING_AVAIL		(0)
-#define HP_TIMING_INLINE	(0)
-typedef int hp_timing_t;
-#define HP_TIMING_ZERO(Var)
-#define HP_TIMING_NOW(var)
-#define HP_TIMING_DIFF_INIT()
-#define HP_TIMING_DIFF(Diff, Start, End)
-#define HP_TIMING_ACCUM(Sum, Diff)
-#define HP_TIMING_ACCUM_NT(Sum, Diff)
-#define HP_TIMING_PRINT(Buf, Len, Val)
-
-/* Since this implementation is not available we tell the user about it.  */
-#define HP_TIMING_NONAVAIL	1
-
-#endif	/* hp-timing.h */
diff --git a/newlib/libc/sys/linux/machine/i386/Makefile.am b/newlib/libc/sys/linux/machine/i386/Makefile.am
deleted file mode 100644
index 4a49d8f..0000000
--- a/newlib/libc/sys/linux/machine/i386/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES = get_clockfreq.c getpagesize.c hp-timing.c setjmp.S sigaction.c dl-procinfo.c
-
-liblinuxi386_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = liblinuxi386.la
-liblinuxi386_la_SOURCES = $(LIB_SOURCES)
-noinst_DATA = objectlist.awk.in
-else
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(LIB_SOURCES)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../../../../Makefile.shared
-
-all: crt0.o
-
-AM_CFLAGS = -I$(srcdir)/../..
-ACLOCAL_AMFLAGS = -I ../../../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/linux/machine/i386/Makefile.in b/newlib/libc/sys/linux/machine/i386/Makefile.in
deleted file mode 100644
index c740a00..0000000
--- a/newlib/libc/sys/linux/machine/i386/Makefile.in
+++ /dev/null
@@ -1,413 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES = get_clockfreq.c getpagesize.c hp-timing.c setjmp.S sigaction.c dl-procinfo.c
-
-liblinuxi386_la_LDFLAGS = -Xcompiler -nostdlib
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = liblinuxi386.la
-@USE_LIBTOOL_TRUE@liblinuxi386_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
-
-AM_CFLAGS = -I$(srcdir)/../..
-ACLOCAL_AMFLAGS = -I ../../../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  get_clockfreq.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getpagesize.$(OBJEXT) hp-timing.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@setjmp.$(OBJEXT) sigaction.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@dl-procinfo.$(OBJEXT)
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-liblinuxi386_la_LIBADD = 
-@USE_LIBTOOL_TRUE@liblinuxi386_la_OBJECTS =  get_clockfreq.lo \
-@USE_LIBTOOL_TRUE@getpagesize.lo hp-timing.lo setjmp.lo sigaction.lo \
-@USE_LIBTOOL_TRUE@dl-procinfo.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(liblinuxi386_la_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(liblinuxi386_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../../../acinclude.m4 ../../../../../aclocal.m4 \
-		../../../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-liblinuxi386.la: $(liblinuxi386_la_OBJECTS) $(liblinuxi386_la_DEPENDENCIES)
-	$(LINK)  $(liblinuxi386_la_LDFLAGS) $(liblinuxi386_la_OBJECTS) $(liblinuxi386_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-noinstLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
-distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-all: crt0.o
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/linux/machine/i386/aclocal.m4 b/newlib/libc/sys/linux/machine/i386/aclocal.m4
deleted file mode 100644
index 35519ac..0000000
--- a/newlib/libc/sys/linux/machine/i386/aclocal.m4
+++ /dev/null
@@ -1,1226 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  ])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)])
-
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libc/sys/linux/machine/i386/configure b/newlib/libc/sys/linux/machine/i386/configure
deleted file mode 100755
index f957f66..0000000
--- a/newlib/libc/sys/linux/machine/i386/configure
+++ /dev/null
@@ -1,3346 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=yes]"
-ac_help="$ac_help
-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=crt0.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../../../.. $srcdir/../../../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../../../.. $srcdir/../../../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:590: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:643: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:700: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:733: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 738 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:766: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 771 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:948: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:969: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:987: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1030: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1043: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1056: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1069: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1082: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1186: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1210: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1337: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1382: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-
-if test "${use_libtool}" = "yes"; then
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_shared=yes
-fi
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_static=yes
-fi
-
-# Check whether --enable-fast-install or --disable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_fast_install=yes
-fi
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1783 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
-else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi
-fi
-
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-
-NM="$lt_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-libtool_flags="$libtool_flags --enable-win32-dll"
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-  :
-fi
-
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
-fi
-rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-fi
-
-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_DLLTOOL"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  DLLTOOL="false"
-fi
-fi
-
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AS="false"
-fi
-fi
-
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_OBJDUMP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_OBJDUMP="objdump"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false"
-fi
-fi
-OBJDUMP="$ac_cv_prog_OBJDUMP"
-if test -n "$OBJDUMP"; then
-  echo "$ac_t""$OBJDUMP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  OBJDUMP="false"
-fi
-fi
-
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  
-esac
-
-
-# Save cache, so that ltconfig can load it
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
-# Reload cache, that may have been modified by ltconfig
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-
-  
-
-  
-	 
-	 
-for ac_prog in mawk gawk nawk awk
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2998: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AWK="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AWK="$ac_cv_prog_AWK"
-if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$AWK" && break
-done
-
-fi
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@OBJDUMP@%$OBJDUMP%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@AWK@%$AWK%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/sys/linux/machine/i386/configure.in b/newlib/libc/sys/linux/machine/i386/configure.in
deleted file mode 100644
index 9d068f8..0000000
--- a/newlib/libc/sys/linux/machine/i386/configure.in
+++ /dev/null
@@ -1,22 +0,0 @@
-dnl This is the newlib/libc/sys/linux/machine/i386 configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(crt0.c)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../../../..)
-
-NEWLIB_CONFIGURE(../../../../..)
-
-dnl We have to enable libtool after NEWLIB_CONFIGURE because if we try and
-dnl add it into NEWLIB_CONFIGURE, executable tests are made before the first
-dnl line of the macro which fail because appropriate LDFLAGS are not set.
-
-if test "${use_libtool}" = "yes"; then
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
-AC_PROG_AWK
-fi
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/sys/linux/machine/i386/crt0.c b/newlib/libc/sys/linux/machine/i386/crt0.c
deleted file mode 100644
index 4364f61..0000000
--- a/newlib/libc/sys/linux/machine/i386/crt0.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* libc/sys/linux/crt0.c - Run-time initialization */
-
-/* FIXME: This should be rewritten in assembler and
-          placed in a subdirectory specific to a platform.
-          There should also be calls to run constructors. */
-
-/* Written 2000 by Werner Almesberger */
-
-
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-
-
-extern char **environ;
-
-extern int main(int argc,char **argv,char **envp);
-
-extern char _end;
-extern char __bss_start;
-
-void _start(int args)
-{
-    /*
-     * The argument block begins above the current stack frame, because we
-     * have no return address. The calculation assumes that sizeof(int) ==
-     * sizeof(void *). This is okay for i386 user space, but may be invalid in
-     * other cases.
-     */
-    int *params = &args-1;
-    int argc = *params;
-    char **argv = (char **) (params+1);
-
-    environ = argv+argc+1;
-
-    /* Note: do not clear the .bss section.  When running with shared
-     *       libraries, certain data items such __mb_cur_max or environ
-     *       may get placed in the .bss, even though they are initialized
-     *       to non-zero values.  Clearing the .bss will end up zeroing
-     *       out their initial values.  The .bss is already initialized
-     *       by this time by Linux.  */
-
-    tzset(); /* initialize timezone info */
-    exit(main(argc,argv,environ));
-}
diff --git a/newlib/libc/sys/linux/machine/i386/dl-machine.h b/newlib/libc/sys/linux/machine/i386/dl-machine.h
deleted file mode 100644
index 80757e8..0000000
--- a/newlib/libc/sys/linux/machine/i386/dl-machine.h
+++ /dev/null
@@ -1,420 +0,0 @@
-/* Machine-dependent ELF dynamic relocation inline functions.  i386 version.
-   Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef dl_machine_h
-#define dl_machine_h
-
-#define ELF_MACHINE_NAME "i386"
-
-#include <sys/param.h>
-#include <machine/weakalias.h>
-
-/* Return nonzero iff ELF header is compatible with the running host.  */
-static inline int __attribute__ ((unused))
-elf_machine_matches_host (const Elf32_Ehdr *ehdr)
-{
-  return ehdr->e_machine == EM_386;
-}
-
-
-/* Return the link-time address of _DYNAMIC.  Conveniently, this is the
-   first element of the GOT.  This must be inlined in a function which
-   uses global data.  */
-static inline Elf32_Addr __attribute__ ((unused))
-elf_machine_dynamic (void)
-{
-  register Elf32_Addr *got asm ("%ebx");
-  return *got;
-}
-
-
-/* Return the run-time load address of the shared object.  */
-static inline Elf32_Addr __attribute__ ((unused))
-elf_machine_load_address (void)
-{
-  Elf32_Addr addr;
-  asm ("leal _dl_start@GOTOFF(%%ebx), %0\n"
-       "subl _dl_start@GOT(%%ebx), %0"
-       : "=r" (addr) : : "cc");
-  return addr;
-}
-
-#if !defined PROF && !__BOUNDED_POINTERS__
-/* We add a declaration of this function here so that in dl-runtime.c
-   the ELF_MACHINE_RUNTIME_TRAMPOLINE macro really can pass the parameters
-   in registers.
-
-   We cannot use this scheme for profiling because the _mcount call
-   destroys the passed register information.  */
-/* GKM FIXME: Fix trampoline to pass bounds so we can do
-   without the `__unbounded' qualifier.  */
-static ElfW(Addr) fixup (struct link_map *__unbounded l, ElfW(Word) reloc_offset)
-     __attribute__ ((regparm (2), unused));
-static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset,
-				 ElfW(Addr) retaddr)
-     __attribute__ ((regparm (3), unused));
-#endif
-
-/* Set up the loaded object described by L so its unrelocated PLT
-   entries will jump to the on-demand fixup code in dl-runtime.c.  */
-
-static inline int __attribute__ ((unused))
-elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
-{
-  Elf32_Addr *got;
-  extern void _dl_runtime_resolve (Elf32_Word);
-  extern void _dl_runtime_profile (Elf32_Word);
-
-  if (l->l_info[DT_JMPREL] && lazy)
-    {
-      /* The GOT entries for functions in the PLT have not yet been filled
-	 in.  Their initial contents will arrange when called to push an
-	 offset into the .rel.plt section, push _GLOBAL_OFFSET_TABLE_[1],
-	 and then jump to _GLOBAL_OFFSET_TABLE[2].  */
-      got = (Elf32_Addr *) D_PTR (l, l_info[DT_PLTGOT]);
-      got[1] = (Elf32_Addr) l;	/* Identify this shared object.  */
-
-      /* The got[2] entry contains the address of a function which gets
-	 called to get the address of a so far unresolved function and
-	 jump to it.  The profiling extension of the dynamic linker allows
-	 to intercept the calls to collect information.  In this case we
-	 don't store the address in the GOT so that all future calls also
-	 end in this function.  */
-      if (__builtin_expect (profile, 0))
-	{
-	  got[2] = (Elf32_Addr) &_dl_runtime_profile;
-
-	  if (_dl_name_match_p (_dl_profile, l))
-	    /* This is the object we are looking for.  Say that we really
-	       want profiling and the timers are started.  */
-	    _dl_profile_map = l;
-	}
-      else
-	/* This function will get called to fix up the GOT entry indicated by
-	   the offset on the stack, and then jump to the resolved address.  */
-	got[2] = (Elf32_Addr) &_dl_runtime_resolve;
-    }
-
-  return lazy;
-}
-
-/* This code is used in dl-runtime.c to call the `fixup' function
-   and then redirect to the address it returns.  */
-#if !defined PROF && !__BOUNDED_POINTERS__
-# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
-	.text\n\
-	.globl _dl_runtime_resolve\n\
-	.type _dl_runtime_resolve, @function\n\
-	.align 16\n\
-_dl_runtime_resolve:\n\
-	pushl %eax		# Preserve registers otherwise clobbered.\n\
-	pushl %ecx\n\
-	pushl %edx\n\
-	movl 16(%esp), %edx	# Copy args pushed by PLT in register.  Note\n\
-	movl 12(%esp), %eax	# that `fixup' takes its parameters in regs.\n\
-	call fixup		# Call resolver.\n\
-	popl %edx		# Get register content back.\n\
-	popl %ecx\n\
-	xchgl %eax, (%esp)	# Get %eax contents end store function address.\n\
-	ret $8			# Jump to function address.\n\
-	.size _dl_runtime_resolve, .-_dl_runtime_resolve\n\
-\n\
-	.globl _dl_runtime_profile\n\
-	.type _dl_runtime_profile, @function\n\
-	.align 16\n\
-_dl_runtime_profile:\n\
-	pushl %eax		# Preserve registers otherwise clobbered.\n\
-	pushl %ecx\n\
-	pushl %edx\n\
-	movl 20(%esp), %ecx	# Load return address\n\
-	movl 16(%esp), %edx	# Copy args pushed by PLT in register.  Note\n\
-	movl 12(%esp), %eax	# that `fixup' takes its parameters in regs.\n\
-	call profile_fixup	# Call resolver.\n\
-	popl %edx		# Get register content back.\n\
-	popl %ecx\n\
-	xchgl %eax, (%esp)	# Get %eax contents end store function address.\n\
-	ret $8			# Jump to function address.\n\
-	.size _dl_runtime_profile, .-_dl_runtime_profile\n\
-	.previous\n\
-");
-#else
-# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\n\
-	.text\n\
-	.globl _dl_runtime_resolve\n\
-	.globl _dl_runtime_profile\n\
-	.type _dl_runtime_resolve, @function\n\
-	.type _dl_runtime_profile, @function\n\
-	.align 16\n\
-_dl_runtime_resolve:\n\
-_dl_runtime_profile:\n\
-	pushl %eax		# Preserve registers otherwise clobbered.\n\
-	pushl %ecx\n\
-	pushl %edx\n\
-	movl 16(%esp), %edx	# Push the arguments for `fixup'\n\
-	movl 12(%esp), %eax\n\
-	pushl %edx\n\
-	pushl %eax\n\
-	call fixup		# Call resolver.\n\
-	popl %edx		# Pop the parameters\n\
-	popl %ecx\n\
-	popl %edx		# Get register content back.\n\
-	popl %ecx\n\
-	xchgl %eax, (%esp)	# Get %eax contents end store function address.\n\
-	ret $8			# Jump to function address.\n\
-	.size _dl_runtime_resolve, .-_dl_runtime_resolve\n\
-	.size _dl_runtime_profile, .-_dl_runtime_profile\n\
-	.previous\n\
-");
-#endif
-
-/* Mask identifying addresses reserved for the user program,
-   where the dynamic linker should not map anything.  */
-#define ELF_MACHINE_USER_ADDRESS_MASK	0xf8000000UL
-
-/* Initial entry point code for the dynamic linker.
-   The C function `_dl_start' is the real entry point;
-   its return value is the user program's entry point.  */
-
-#define RTLD_START asm ("\n\
-	.text\n\
-	.align 16\n\
-0:	movl (%esp), %ebx\n\
-	ret\n\
-	.align 16\n\
-.globl _start\n\
-.globl _dl_start_user\n\
-_start:\n\
-	pushl %esp\n\
-	call _dl_start\n\
-	popl %ebx\n\
-_dl_start_user:\n\
-	# Save the user entry point address in %edi.\n\
-	movl %eax, %edi\n\
-	# Point %ebx at the GOT.\n\
-	call 0b\n\
-	addl $_GLOBAL_OFFSET_TABLE_, %ebx\n\
-	# Store the highest stack address\n\
-	movl __libc_stack_end@GOT(%ebx), %eax\n\
-	movl %esp, (%eax)\n\
-	# See if we were run as a command with the executable file\n\
-	# name as an extra leading argument.\n\
-	movl _dl_skip_args@GOT(%ebx), %eax\n\
-	movl (%eax), %eax\n\
-	# Pop the original argument count.\n\
-	popl %edx\n\
-	# Adjust the stack pointer to skip _dl_skip_args words.\n\
-	leal (%esp,%eax,4), %esp\n\
-	# Subtract _dl_skip_args from argc.\n\
-	subl %eax, %edx\n\
-	# Push argc back on the stack.\n\
-	push %edx\n\
-	# The special initializer gets called with the stack just\n\
-	# as the application's entry point will see it; it can\n\
-	# switch stacks if it moves these contents over.\n\
-" RTLD_START_SPECIAL_INIT "\n\
-	# Load the parameters again.\n\
-	# (eax, edx, ecx, *--esp) = (_dl_loaded, argc, argv, envp)\n\
-	movl _dl_loaded@GOT(%ebx), %esi\n\
-	leal 8(%esp,%edx,4), %eax\n\
-	leal 4(%esp), %ecx\n\
-	pushl %eax\n\
-	movl (%esi), %eax\n\
-	# Call the function to run the initializers.\n\
-	call _dl_init@PLT\n\
-	# Pass our finalizer function to the user in %edx, as per ELF ABI.\n\
-	movl _dl_fini@GOT(%ebx), %edx\n\
-	# Jump to the user's entry point.\n\
-	jmp *%edi\n\
-	.previous\n\
-");
-
-#ifndef RTLD_START_SPECIAL_INIT
-#define RTLD_START_SPECIAL_INIT /* nothing */
-#endif
-
-/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
-   PLT entries should not be allowed to define the value.
-   ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one
-   of the main executable's symbols, as for a COPY reloc.  */
-#define elf_machine_type_class(type) \
-  ((((type) == R_386_JMP_SLOT) * ELF_RTYPE_CLASS_PLT)	\
-   | (((type) == R_386_COPY) * ELF_RTYPE_CLASS_COPY))
-
-/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries.  */
-#define ELF_MACHINE_JMP_SLOT	R_386_JMP_SLOT
-
-/* The i386 never uses Elf32_Rela relocations.  */
-#define ELF_MACHINE_NO_RELA 1
-
-/* We define an initialization functions.  This is called very early in
-   _dl_sysdep_start.  */
-#define DL_PLATFORM_INIT dl_platform_init ()
-
-extern const char *_dl_platform;
-
-static inline void __attribute__ ((unused))
-dl_platform_init (void)
-{
-  if (_dl_platform != NULL && *_dl_platform == '\0')
-    /* Avoid an empty string which would disturb us.  */
-    _dl_platform = NULL;
-}
-
-static inline Elf32_Addr
-elf_machine_fixup_plt (struct link_map *map, lookup_t t,
-		       const Elf32_Rel *reloc,
-		       Elf32_Addr *reloc_addr, Elf32_Addr value)
-{
-  return *reloc_addr = value;
-}
-
-/* Return the final value of a plt relocation.  */
-static inline Elf32_Addr
-elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc,
-		       Elf32_Addr value)
-{
-  return value;
-}
-
-static inline void __attribute__ ((unused))
-elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
-		 const Elf32_Sym *sym, const struct r_found_version *version,
-		 Elf32_Addr *const reloc_addr,
-		 struct r_scope_elem *scope[]);
-
-static inline void __attribute__ ((unused))
-elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
-			  Elf32_Addr *const reloc_addr);
-
-static inline void
-elf_machine_lazy_rel (struct link_map *map,
-		      Elf32_Addr l_addr, const Elf32_Rel *reloc);
-
-#endif /* !dl_machine_h */
-
-#ifdef RESOLVE
-
-/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
-   MAP is the object containing the reloc.  */
-
-static inline void __attribute__ ((unused))
-elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
-		 const Elf32_Sym *sym, const struct r_found_version *version,
-		 Elf32_Addr *const reloc_addr,
-		 struct r_scope_elem *scope[])
-{
-  const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
-
-#if !defined RTLD_BOOTSTRAP || !defined HAVE_Z_COMBRELOC
-  if (__builtin_expect (r_type == R_386_RELATIVE, 0))
-    {
-# if !defined RTLD_BOOTSTRAP && !defined HAVE_Z_COMBRELOC
-      /* This is defined in rtld.c, but nowhere in the static libc.a;
-	 make the reference weak so static programs can still link.
-	 This declaration cannot be done when compiling rtld.c
-	 (i.e. #ifdef RTLD_BOOTSTRAP) because rtld.c contains the
-	 common defn for _dl_rtld_map, which is incompatible with a
-	 weak decl in the same file.  */
-      #pragma weak _dl_rtld_map
-      if (map != &_dl_rtld_map) /* Already done in rtld itself.  */
-# endif
-	*reloc_addr += map->l_addr;
-    }
-# ifndef RTLD_BOOTSTRAP
-  else if (__builtin_expect (r_type == R_386_NONE, 0))
-    return;
-# endif
-  else
-#endif
-    {
-#ifndef RTLD_BOOTSTRAP
-      const Elf32_Sym *const refsym = sym;
-#endif
-      /* String table object symbols.  */
-      const char *strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
-      Elf32_Addr value = RESOLVE (&sym, version, r_type, scope);
-      if (sym)
-	value += sym->st_value;
-
-#ifdef RTLD_BOOTSTRAP
-      assert (r_type == R_386_GLOB_DAT || r_type == R_386_JMP_SLOT);
-      *reloc_addr = value;
-#else
-      switch (r_type)
-	{
-	case R_386_GLOB_DAT:
-	case R_386_JMP_SLOT:
-	  *reloc_addr = value;
-	  break;
-	case R_386_32:
-	  *reloc_addr += value;
-	  break;
-	case R_386_PC32:
-	  *reloc_addr += (value - (Elf32_Addr) reloc_addr);
-	  break;
-	case R_386_COPY:
-	  if (sym == NULL)
-	    /* This can happen in trace mode if an object could not be
-	       found.  */
-	    break;
-	  if (__builtin_expect (sym->st_size > refsym->st_size, 0)
-	      || (__builtin_expect (sym->st_size < refsym->st_size, 0)
-		  && _dl_verbose))
-	    {
-	      const char *strtab;
-
-	      strtab = (const char *) D_PTR (map, l_info[DT_STRTAB]);
-	      _dl_error_printf ("\
-%s: Symbol `%s' has different size in shared object, consider re-linking\n",
-				_dl_argv[0] ?: "<program name unknown>",
-				strtab + refsym->st_name);
-	    }
-	  memcpy (reloc_addr, (void *) value, MIN (sym->st_size,
-						   refsym->st_size));
-	  break;
-	default:
-	  _dl_reloc_bad_type (map, r_type, 0);
-	  break;
-	}
-#endif
-    }
-}
-
-static inline void __attribute__ ((unused))
-elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
-			  Elf32_Addr *const reloc_addr)
-{
-  assert (ELF32_R_TYPE (reloc->r_info) == R_386_RELATIVE);
-  *reloc_addr += l_addr;
-}
-
-static inline void
-elf_machine_lazy_rel (struct link_map *map,
-		      Elf32_Addr l_addr, const Elf32_Rel *reloc)
-{
-  Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
-  const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
-  /* Check for unexpected PLT reloc type.  */
-  if (__builtin_expect (r_type == R_386_JMP_SLOT, 1))
-    *reloc_addr += l_addr;
-  else
-    _dl_reloc_bad_type (map, r_type, 1);
-}
-
-#endif /* RESOLVE */
diff --git a/newlib/libc/sys/linux/machine/i386/dl-procinfo.c b/newlib/libc/sys/linux/machine/i386/dl-procinfo.c
deleted file mode 100644
index 75732b4..0000000
--- a/newlib/libc/sys/linux/machine/i386/dl-procinfo.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Data for Linux/i386 version of processor capability information.
-   Copyright (C) 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* This information must be kept in sync with the _DL_HWCAP_COUNT and
-   _DL_PLATFORM_COUNT definitions in procinfo.h.  */
-
-
-/* If anything should be added here check whether the size of each string
-   is still ok with the given array size.  */
-const char _dl_x86_cap_flags[][7] =
-  {
-    "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
-    "cx8", "apic", "10", "sep", "mtrr", "pge", "mca", "cmov",
-    "pat", "pse36", "psn", "19", "20", "21", "22", "mmx",
-    "osfxsr", "xmm", "xmm2", "27", "28", "29", "30", "amd3d"
-  };
-
-const char _dl_x86_platforms[][5] =
-  {
-    "i386", "i486", "i586", "i686"
-  };
diff --git a/newlib/libc/sys/linux/machine/i386/dl-procinfo.h b/newlib/libc/sys/linux/machine/i386/dl-procinfo.h
deleted file mode 100644
index d1658fa..0000000
--- a/newlib/libc/sys/linux/machine/i386/dl-procinfo.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Linux/i386 version of processor capability information handling macros.
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _DL_PROCINFO_H
-#define _DL_PROCINFO_H	1
-
-#include <ldsodefs.h>
-
-/* If anything should be added here check whether the size of each string
-   is still ok with the given array size.  */
-extern const char _dl_x86_cap_flags[][7];
-#define _DL_HWCAP_COUNT 32
-
-extern const char _dl_x86_platforms[][5];
-#define _DL_PLATFORMS_COUNT	4
-
-/* Start at 48 to reserve some space.  */
-#define _DL_FIRST_PLATFORM	48
-/* Mask to filter out platforms.  */
-#define _DL_HWCAP_PLATFORM	(7ULL << _DL_FIRST_PLATFORM)
-
-
-static inline int
-__attribute__ ((unused))
-_dl_procinfo (int word)
-{
-  /* This table should match the information from arch/i386/kernel/setup.c
-     in the kernel sources.  */
-  int i;
-
-  _dl_printf ("AT_HWCAP:   ");
-
-  for (i = 0; i < _DL_HWCAP_COUNT; ++i)
-    if (word & (1 << i))
-      _dl_printf (" %s", _dl_x86_cap_flags[i]);
-
-  _dl_printf ("\n");
-
-  return 0;
-}
-
-static inline const char *
-__attribute__ ((unused))
-_dl_hwcap_string (int idx)
-{
-  return _dl_x86_cap_flags[idx];
-};
-
-static inline const char *
-__attribute__ ((unused))
-_dl_platform_string (int idx)
-{
-  return _dl_x86_platforms [idx - _DL_FIRST_PLATFORM];
-};
-
-enum
-{
-  HWCAP_I386_FPU   = 1 << 0,
-  HWCAP_I386_VME   = 1 << 1,
-  HWCAP_I386_DE    = 1 << 2,
-  HWCAP_I386_PSE   = 1 << 3,
-  HWCAP_I386_TSC   = 1 << 4,
-  HWCAP_I386_MSR   = 1 << 5,
-  HWCAP_I386_PAE   = 1 << 6,
-  HWCAP_I386_MCE   = 1 << 7,
-  HWCAP_I386_CX8   = 1 << 8,
-  HWCAP_I386_APIC  = 1 << 9,
-  HWCAP_I386_SEP   = 1 << 11,
-  HWCAP_I386_MTRR  = 1 << 12,
-  HWCAP_I386_PGE   = 1 << 13,
-  HWCAP_I386_MCA   = 1 << 14,
-  HWCAP_I386_CMOV  = 1 << 15,
-  HWCAP_I386_FCMOV = 1 << 16,
-  HWCAP_I386_MMX   = 1 << 23,
-  HWCAP_I386_OSFXSR = 1 << 24,
-  HWCAP_I386_XMM   = 1 << 25,
-  HWCAP_I386_XMM2  = 1 << 26,
-  HWCAP_I386_AMD3D = 1 << 31,
-
-  /* XXX Which others to add here?  */
-  HWCAP_IMPORTANT = (HWCAP_I386_MMX)
-
-};
-
-static inline int
-__attribute__ ((unused))
-_dl_string_hwcap (const char *str)
-{
-  int i;
-
-  for (i = 0; i < _DL_HWCAP_COUNT; i++)
-    {
-      if (strcmp (str, _dl_x86_cap_flags[i]) == 0)
-	return i;
-    }
-  return -1;
-};
-
-
-static inline int
-__attribute__ ((unused))
-_dl_string_platform (const char *str)
-{
-  int i;
-
-  if (str != NULL)
-    for (i = 0; i < _DL_PLATFORMS_COUNT; ++i)
-      {
-	if (strcmp (str, _dl_x86_platforms[i]) == 0)
-	  return _DL_FIRST_PLATFORM + i;
-      }
-  return -1;
-};
-
-#endif /* dl-procinfo.h */
diff --git a/newlib/libc/sys/linux/machine/i386/get_clockfreq.c b/newlib/libc/sys/linux/machine/i386/get_clockfreq.c
deleted file mode 100644
index ea46ed4..0000000
--- a/newlib/libc/sys/linux/machine/i386/get_clockfreq.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Get frequency of the system processor.  i386/Linux version.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <ctype.h>
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
-#include <libc-internal.h>
-
-static
-void *memmem (const void *a, size_t len1, const void *b, size_t len2)
-{
-  char *end, *start;
-  char *ptr1, *ptr2;
-
-  if (len2 > len1)
-    return NULL;
-
-  start = (char *)a;
-  end = start + len1;
-
-  while (start < end)
-    {
-      size_t len = len2;
-      ptr1 = start;
-      ptr2 = (char *)b;
-      while (len > 0 && *ptr1++ == *ptr2++)
-        --len;
-      if (len == 0)
-        return start;
-      ++start;
-    }
-
-  return NULL;
-} 
-
-hp_timing_t
-__get_clockfreq (void)
-{
-  /* We read the information from the /proc filesystem.  It contains at
-     least one line like
-	cpu MHz         : 497.840237
-     or also
-	cpu MHz         : 497.841
-     We search for this line and convert the number in an integer.  */
-  static hp_timing_t result;
-  int fd;
-
-  /* If this function was called before, we know the result.  */
-  if (result != 0)
-    return result;
-
-  fd = open ("/proc/cpuinfo", O_RDONLY);
-  if (__builtin_expect (fd != -1, 1))
-    {
-      /* XXX AFAIK the /proc filesystem can generate "files" only up
-         to a size of 4096 bytes.  */
-      char buf[4096];
-      ssize_t n;
-
-      n = read (fd, buf, sizeof buf);
-      if (__builtin_expect (n, 1) > 0)
-	{
-	  char *mhz = memmem (buf, n, "cpu MHz", 7);
-
-	  if (__builtin_expect (mhz != NULL, 1))
-	    {
-	      char *endp = buf + n;
-	      int seen_decpoint = 0;
-	      int ndigits = 0;
-
-	      /* Search for the beginning of the string.  */
-	      while (mhz < endp && (*mhz < '0' || *mhz > '9') && *mhz != '\n')
-		++mhz;
-
-	      while (mhz < endp && *mhz != '\n')
-		{
-		  if (*mhz >= '0' && *mhz <= '9')
-		    {
-		      result *= 10;
-		      result += *mhz - '0';
-		      if (seen_decpoint)
-			++ndigits;
-		    }
-		  else if (*mhz == '.')
-		    seen_decpoint = 1;
-
-		  ++mhz;
-		}
-
-	      /* Compensate for missing digits at the end.  */
-	      while (ndigits++ < 6)
-		result *= 10;
-	    }
-	}
-
-      close (fd);
-    }
-
-  return result;
-}
diff --git a/newlib/libc/sys/linux/machine/i386/getpagesize.c b/newlib/libc/sys/linux/machine/i386/getpagesize.c
deleted file mode 100644
index 3f80a7a..0000000
--- a/newlib/libc/sys/linux/machine/i386/getpagesize.c
+++ /dev/null
@@ -1,6 +0,0 @@
-/* default pagesize */
-int __getpagesize ()
-{
-  return 4096;
-}
-
diff --git a/newlib/libc/sys/linux/machine/i386/hp-timing.c b/newlib/libc/sys/linux/machine/i386/hp-timing.c
deleted file mode 100644
index c52099c..0000000
--- a/newlib/libc/sys/linux/machine/i386/hp-timing.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Support for high precision, low overhead timing functions.  i686 version.
-   Copyright (C) 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <hp-timing.h>
-
-/* We have to define the variable for the overhead.  */
-hp_timing_t __libc_hp_timing_overhead;
diff --git a/newlib/libc/sys/linux/machine/i386/hp-timing.h b/newlib/libc/sys/linux/machine/i386/hp-timing.h
deleted file mode 100644
index a34965e..0000000
--- a/newlib/libc/sys/linux/machine/i386/hp-timing.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* High precision, low overhead timing functions.  i686 version.
-   Copyright (C) 1998 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Modified for newlib by Jeff Johnston - June 27, 2002 */
-
-#ifndef _HP_TIMING_H
-#define _HP_TIMING_H	1
-
-#include <string.h>
-#include <stdio.h>
-#include <sys/param.h>
-
-#ifdef __i686__
-
-/* The macros defined here use the timestamp counter in i586 and up versions
-   of the x86 processors.  They provide a very accurate way to measure the
-   time with very little overhead.  The time values themself have no real
-   meaning, only differences are interesting.
-
-   This version is for the i686 processors.  The difference to the i586
-   version is that the timerstamp register is unconditionally used.  This is
-   not the case for the i586 version where we have to perform runtime test
-   whether the processor really has this capability.  We have to make this
-   distinction since the sysdeps/i386/i586 code is supposed to work on all
-   platforms while the i686 already contains i686-specific code.
-
-   The list of macros we need includes the following:
-
-   - HP_TIMING_AVAIL: test for availability.
-
-   - HP_TIMING_INLINE: this macro is non-zero if the functionality is not
-     implemented using function calls but instead uses some inlined code
-     which might simply consist of a few assembler instructions.  We have to
-     know this since we might want to use the macros here in places where we
-     cannot make function calls.
-
-   - hp_timing_t: This is the type for variables used to store the time
-     values.
-
-   - HP_TIMING_ZERO: clear `hp_timing_t' object.
-
-   - HP_TIMING_NOW: place timestamp for current time in variable given as
-     parameter.
-
-   - HP_TIMING_DIFF_INIT: do whatever is necessary to be able to use the
-     HP_TIMING_DIFF macro.
-
-   - HP_TIMING_DIFF: compute difference between two times and store it
-     in a third.  Source and destination might overlap.
-
-   - HP_TIMING_ACCUM: add time difference to another variable.  This might
-     be a bit more complicated to implement for some platforms as the
-     operation should be thread-safe and 64bit arithmetic on 32bit platforms
-     is not.
-
-   - HP_TIMING_ACCUM_NT: this is the variant for situations where we know
-     there are no threads involved.
-
-   - HP_TIMING_PRINT: write decimal representation of the timing value into
-     the given string.  This operation need not be inline even though
-     HP_TIMING_INLINE is specified.
-
-*/
-
-/* We always assume having the timestamp register.  */
-#define HP_TIMING_AVAIL		(1)
-
-/* We indeed have inlined functions.  */
-#define HP_TIMING_INLINE	(1)
-
-/* We use 64bit values for the times.  */
-typedef unsigned long long int hp_timing_t;
-
-/* Internal variable used to store the overhead of the measurement
-   opcodes.  */
-extern hp_timing_t __libc_hp_timing_overhead;
-
-/* Set timestamp value to zero.  */
-#define HP_TIMING_ZERO(Var)	(Var) = (0)
-
-/* That's quite simple.  Use the `rdtsc' instruction.  Note that the value
-   might not be 100% accurate since there might be some more instructions
-   running in this moment.  This could be changed by using a barrier like
-   'cpuid' right before the `rdtsc' instruciton.  But we are not interested
-   in accurate clock cycles here so we don't do this.  */
-#define HP_TIMING_NOW(Var)	__asm__ __volatile__ ("rdtsc" : "=A" (Var))
-
-/* Use two 'rdtsc' instructions in a row to find out how long it takes.  */
-#define HP_TIMING_DIFF_INIT() \
-  do {									      \
-    int __cnt = 5;							      \
-    __libc_hp_timing_overhead = ~0ull;					      \
-    do									      \
-      {									      \
-	hp_timing_t __t1, __t2;						      \
-	HP_TIMING_NOW (__t1);						      \
-	HP_TIMING_NOW (__t2);						      \
-	if (__t2 - __t1 < __libc_hp_timing_overhead)			      \
-	  __libc_hp_timing_overhead = __t2 - __t1;			      \
-      }									      \
-    while (--__cnt > 0);						      \
-  } while (0)
-
-/* It's simple arithmetic for us.  */
-#define HP_TIMING_DIFF(Diff, Start, End)	(Diff) = ((End) - (Start))
-
-/* We have to jump through hoops to get this correctly implemented.  */
-#define HP_TIMING_ACCUM(Sum, Diff) \
-  do {									      \
-    char __not_done;							      \
-    hp_timing_t __oldval = (Sum);					      \
-    hp_timing_t __diff = (Diff) - __libc_hp_timing_overhead;		      \
-    do									      \
-      {									      \
-	hp_timing_t __newval = __oldval + __diff;			      \
-	int __temp0, __temp1;						      \
-	__asm__ __volatile__ ("xchgl %4, %%ebx\n\t"			      \
-			      "lock; cmpxchg8b %1\n\t"			      \
-			      "sete %0\n\t"				      \
-			      "movl %4, %%ebx"				      \
-			      : "=q" (__not_done), "=m" (Sum),		      \
-				"=A" (__oldval), "=c" (__temp0),	      \
-				"=SD" (__temp1)				      \
-			      : "1" (Sum), "2" (__oldval),		      \
-				"3" (__newval >> 32),			      \
-				"4" (__newval & 0xffffffff)		      \
-			      : "memory");				      \
-      }									      \
-    while (__not_done);							      \
-  } while (0)
-
-/* No threads, no extra work.  */
-#define HP_TIMING_ACCUM_NT(Sum, Diff)	(Sum) += (Diff)
-
-/* Print the time value.  */
-#define HP_TIMING_PRINT(Buf, Len, Val) \
-  do {									      \
-    char __buf[20];							      \
-    char *__cp = __buf + sizeof (__buf);				      \
-    int __len = (Len);							      \
-    char *__dest = (Buf);						      \
-    do { 								      \
-      *--__cp = Val % 10;						      \
-      Val /= 10;							      \
-    } while (Val > 0);							      \
-    while (__len-- > 0 && __cp < __buf + sizeof (__buf))		      \
-      *__dest++ = *__cp++;						      \
-    memcpy (__dest, " clock cycles", MIN (__len, sizeof (" clock cycles")));  \
-  } while (0)
-
-#else /* !__i686__ */
-
-/* Provide dummy definitions.  */
-#define HP_TIMING_AVAIL         (0)
-#define HP_TIMING_INLINE        (0)
-typedef int hp_timing_t;
-#define HP_TIMING_ZERO(Var)
-#define HP_TIMING_NOW(var)
-#define HP_TIMING_DIFF_INIT()
-#define HP_TIMING_DIFF(Diff, Start, End)
-#define HP_TIMING_ACCUM(Sum, Diff)
-#define HP_TIMING_ACCUM_NT(Sum, Diff)
-#define HP_TIMING_PRINT(Buf, Len, Val)
-
-/* Since this implementation is not available we tell the user about it.  */
-#define HP_TIMING_NONAVAIL      1
-
-#endif
-
-#endif	/* hp-timing.h */
diff --git a/newlib/libc/sys/linux/machine/i386/huge_val.h b/newlib/libc/sys/linux/machine/i386/huge_val.h
deleted file mode 100644
index 1715177..0000000
--- a/newlib/libc/sys/linux/machine/i386/huge_val.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* `HUGE_VAL' constants for ix86 (where it is infinity).
-   Used by <stdlib.h> and <math.h> functions for overflow.
-   Copyright (C) 1992, 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <features.h>
-
-/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL.  */
-
-# if __GNUC_PREREQ(2,96)
-
-#  define HUGE_VALF (__extension__ 0x1.0p255f)
-#  define HUGE_VALL (__extension__ 0x1.0p32767L)
-
-# else
-
-#  define __HUGE_VALF_bytes	{ 0, 0, 0x80, 0x7f }
-
-#  define __huge_valf_t	union { unsigned char __c[4]; float __f; }
-#  ifdef	__GNUC__
-#   define HUGE_VALF	(__extension__ \
-			 ((__huge_valf_t) { __c: __HUGE_VALF_bytes }).__f)
-#  else	/* Not GCC.  */
-static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-#   define HUGE_VALF	(__huge_valf.__f)
-#  endif	/* GCC.  */
-
-
-#  define __HUGE_VALL_bytes	{ 0, 0, 0, 0, 0, 0, 0, 0x80, 0xff, 0x7f, 0, 0 }
-
-#  define __huge_vall_t	union { unsigned char __c[12]; long double __ld; }
-#  ifdef __GNUC__
-#   define HUGE_VALL	(__extension__ \
-			 ((__huge_vall_t) { __c: __HUGE_VALL_bytes }).__ld)
-#  else	/* Not GCC.  */
-static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
-#   define HUGE_VALL	(__huge_vall.__ld)
-#  endif /* GCC.  */
-
-# endif /* GCC 2.95 */
-
diff --git a/newlib/libc/sys/linux/machine/i386/i386mach.h b/newlib/libc/sys/linux/machine/i386/i386mach.h
deleted file mode 100644
index 23c3219..0000000
--- a/newlib/libc/sys/linux/machine/i386/i386mach.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  This file was based on the modified setjmp.S performed by
- *  Joel Sherill (joel@OARcorp.com) which specified the use
- *  of the __USER_LABEL_PREFIX__ and __REGISTER_PREFIX__ macros.
- **
- ** This file is distributed WITHOUT ANY WARRANTY; without even the implied
- ** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/* These are predefined by new versions of GNU cpp.  */
- 
-#ifndef __USER_LABEL_PREFIX__
-#define __USER_LABEL_PREFIX__ _
-#endif
-
-#define __REG_PREFIX__ %
- 
-/* ANSI concatenation macros.  */
- 
-#define CONCAT1(a, b) CONCAT2(a, b)
-#define CONCAT2(a, b) a##b
- 
-/* Use the right prefix for global labels.  */
- 
-#define SYM(x) CONCAT1(__USER_LABEL_PREFIX__, x)
- 
-/* Use the right prefix for registers.  */
- 
-#define REG(x) CONCAT1(__REG_PREFIX__, x)
- 
-#define eax REG(eax)
-#define ebx REG(ebx)
-#define ecx REG(ecx)
-#define edx REG(edx)
-#define esi REG(esi)
-#define edi REG(edi)
-#define ebp REG(ebp)
-#define esp REG(esp)
-
-#define st0 REG(st)
-#define st1 REG(st(1))
-#define st2 REG(st(2))
-#define st3 REG(st(3))
-#define st4 REG(st(4))
-#define st5 REG(st(5))
-#define st6 REG(st(6))
-#define st7 REG(st(7))
-
-#define ax REG(ax)
-#define bx REG(bx)
-#define cx REG(cx)
-#define dx REG(dx)
-
-#define ah REG(ah)
-#define bh REG(bh)
-#define ch REG(ch)
-#define dh REG(dh)
-
-#define al REG(al)
-#define bl REG(bl)
-#define cl REG(cl)
-#define dl REG(dl)
-
-#define mm1 REG(mm1)
-#define mm2 REG(mm2)
-#define mm3 REG(mm3)
-#define mm4 REG(mm4)
-#define mm5 REG(mm5)
-#define mm6 REG(mm6)
-#define mm7 REG(mm7)
-
-#ifdef _I386MACH_NEED_SOTYPE_FUNCTION
-#define SOTYPE_FUNCTION(sym) .type SYM(sym),@function
-#else
-#define SOTYPE_FUNCTION(sym)
-#endif
-
-#ifdef _I386MACH_ALLOW_HW_INTERRUPTS
-#define        __CLI
-#define        __STI
-#else
-#define __CLI  cli
-#define __STI  sti
-#endif
diff --git a/newlib/libc/sys/linux/machine/i386/include/endian.h b/newlib/libc/sys/linux/machine/i386/include/endian.h
deleted file mode 100644
index aa9cd90..0000000
--- a/newlib/libc/sys/linux/machine/i386/include/endian.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 1987, 1991 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      from: @(#)endian.h      7.8 (Berkeley) 4/3/91
- *      $Id$
- */
-
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
-
-/*
- * Define the order of 32-bit words in 64-bit words.
- */
-#define _QUAD_HIGHWORD 1
-#define _QUAD_LOWWORD 0
-
-/*
- * Definitions for byte order, according to byte significance from low
- * address to high.
- */
-#define LITTLE_ENDIAN   1234    /* LSB first: i386, vax */
-#define BIG_ENDIAN      4321    /* MSB first: 68000, ibm, net */
-#define PDP_ENDIAN      3412    /* LSB first in word, MSW first in long */
-
-#define BYTE_ORDER      LITTLE_ENDIAN
-
-#ifndef KERNEL
-#include <sys/cdefs.h>
-#endif
-
-#include <sys/types.h>
-
-__BEGIN_DECLS
-unsigned long   htonl __P((unsigned long));
-unsigned short  htons __P((unsigned short));
-unsigned long   ntohl __P((unsigned long));
-unsigned short  ntohs __P((unsigned short));
-__END_DECLS
-
-#define __word_swap_long(x) \
-__extension__ ({ register u_long __X = (x); \
-   __asm ("rorl $16, %1" \
-        : "=r" (__X) \
-        : "0" (__X)); \
-   __X; })
-
-#if defined(KERNEL) && (defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)) && !defined(I386_CPU)
-
-#define __byte_swap_long(x) \
-__extension__ ({ register u_long __X = (x); \
-   __asm ("bswap %0" \
-        : "=r" (__X) \
-        : "0" (__X)); \
-   __X; })
-#else
-
-#define __byte_swap_long(x) \
-__extension__ ({ register u_long __X = (x); \
-   __asm ("xchgb %h1, %b1\n\trorl $16, %1\n\txchgb %h1, %b1" \
-        : "=q" (__X) \
-        : "0" (__X)); \
-   __X; })
-#endif
-
-#define __byte_swap_word(x) \
-__extension__ ({ register u_short __X = (x); \
-   __asm ("xchgb %h1, %b1" \
-        : "=q" (__X) \
-        : "0" (__X)); \
-   __X; })
-
-/*
- * Macros for network/external number representation conversion.
- */
-#ifdef __GNUC__
-#define ntohl   __byte_swap_long
-#define ntohs   __byte_swap_word
-#define htonl   __byte_swap_long
-#define htons   __byte_swap_word
-#endif
-
-#define NTOHL(x)        ((x) = ntohl((u_long)(x)))
-#define NTOHS(x)        ((x) = ntohs((u_short)(x)))
-#define HTONL(x)        ((x) = htonl((u_long)(x)))
-#define HTONS(x)        ((x) = htons((u_short)(x)))
-
-#endif /* !_MACHINE_ENDIAN_H_ */
diff --git a/newlib/libc/sys/linux/machine/i386/include/param.h b/newlib/libc/sys/linux/machine/i386/include/param.h
deleted file mode 100644
index fbe1be2..0000000
--- a/newlib/libc/sys/linux/machine/i386/include/param.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD: src/sys/i386/include/param.h,v 1.62 2001/09/12 08:37:33 julian Exp $
- */
-
-/*
- * Machine dependent constants for Intel 386.
- */
-
-#ifndef _MACHINE_PARAM_H_
-#define	_MACHINE_PARAM_H_
-
-#ifndef MACHINE
-#define MACHINE		"i386"
-#endif
-#ifndef MACHINE_ARCH
-#define	MACHINE_ARCH	"i386"
-#endif
-#define MID_MACHINE	MID_I386
-
-/* Endian-ness */
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN	4321
-#endif
-#ifndef LITTLE_ENDIAN
-#define LITTLE_ENDIAN	1234
-#endif
-
-#define BYTE_ORDER	LITTLE_ENDIAN
-
-/*
- * OBJFORMAT_NAMES is a comma-separated list of the object formats
- * that are supported on the architecture.
- */
-#define OBJFORMAT_NAMES		"elf", "aout"
-#define OBJFORMAT_DEFAULT	"elf"
-
-#define MAXHOSTNAMELEN 64
-
-#ifdef SMP
-#define MAXCPU		16
-#else
-#define MAXCPU		1
-#endif /* SMP */
-
-#define ALIGNBYTES	_ALIGNBYTES
-#define ALIGN(p)	_ALIGN(p)
-
-#define NPTEPG		(PAGE_SIZE/(sizeof (pt_entry_t)))
-
-#define NPDEPG		(PAGE_SIZE/(sizeof (pd_entry_t)))
-#define PDRSHIFT	22		/* LOG2(NBPDR) */
-#define NBPDR		(1<<PDRSHIFT)	/* bytes/page dir */
-#define PDRMASK		(NBPDR-1)
-
-#define DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
-#define DEV_BSIZE	(1<<DEV_BSHIFT)
-
-#ifndef BLKDEV_IOSIZE
-#define BLKDEV_IOSIZE	PAGE_SIZE	/* default block device I/O size */
-#endif
-#define DFLTPHYS	(64 * 1024)	/* default max raw I/O transfer size */
-#define MAXPHYS		(128 * 1024)	/* max raw I/O transfer size */
-#define MAXDUMPPGS	(DFLTPHYS/PAGE_SIZE)
-
-#define IOPAGES	2		/* pages of i/o permission bitmap */
-
-#ifndef KSTACK_PAGES
-#define KSTACK_PAGES 2		/* Includes pcb! */
-#endif
-#define UAREA_PAGES 1		/* holds struct user WITHOUT PCB (see def.) */
-
-#define KSTACK_GUARD		/* compile in the kstack guard page */
-
-/*
- * Ceiling on amount of swblock kva space.
- */
-#ifndef VM_SWZONE_SIZE_MAX
-#define VM_SWZONE_SIZE_MAX	(70 * 1024 * 1024)
-#endif
-
-/*
- * Ceiling on size of buffer cache (really only effects write queueing,
- * the VM page cache is not effected).
- */
-#ifndef VM_BCACHE_SIZE_MAX
-#define VM_BCACHE_SIZE_MAX	(200 * 1024 * 1024)
-#endif
-
-
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than PAGE_SIZE.
- */
-#ifndef	MSIZE
-#define MSIZE		256		/* size of an mbuf */
-#endif	/* MSIZE */
-
-#ifndef	MCLSHIFT
-#define MCLSHIFT	11		/* convert bytes to mbuf clusters */
-#endif	/* MCLSHIFT */
-#define MCLBYTES	(1 << MCLSHIFT)	/* size of an mbuf cluster */
-
-/*
- * Some macros for units conversion
- */
-
-/* clicks to bytes */
-#define ctob(x)	((x)<<PAGE_SHIFT)
-
-/* bytes to clicks */
-#define btoc(x)	(((unsigned)(x)+PAGE_MASK)>>PAGE_SHIFT)
-
-/*
- * btodb() is messy and perhaps slow because `bytes' may be an off_t.  We
- * want to shift an unsigned type to avoid sign extension and we don't
- * want to widen `bytes' unnecessarily.  Assume that the result fits in
- * a daddr_t.
- */
-#define btodb(bytes)	 		/* calculates (bytes / DEV_BSIZE) */ \
-	(sizeof (bytes) > sizeof(long) \
-	 ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \
-	 : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT))
-
-#define dbtob(db)			/* calculates (db * DEV_BSIZE) */ \
-	((off_t)(db) << DEV_BSHIFT)
-
-/*
- * Mach derived conversion macros
- */
-#define trunc_page(x)		((x) & ~PAGE_MASK)
-#define round_page(x)		(((x) + PAGE_MASK) & ~PAGE_MASK)
-#define trunc_4mpage(x)		((unsigned)(x) & ~PDRMASK)
-#define round_4mpage(x)		((((unsigned)(x)) + PDRMASK) & ~PDRMASK)
-
-#define atop(x)			((unsigned)(x) >> PAGE_SHIFT)
-#define ptoa(x)			((unsigned)(x) << PAGE_SHIFT)
-
-#define i386_btop(x)		((unsigned)(x) >> PAGE_SHIFT)
-#define i386_ptob(x)		((unsigned)(x) << PAGE_SHIFT)
-
-#define	pgtok(x)		((x) * (PAGE_SIZE / 1024))
-
-#endif /* !_MACHINE_PARAM_H_ */
diff --git a/newlib/libc/sys/linux/machine/i386/include/setjmp.h b/newlib/libc/sys/linux/machine/i386/include/setjmp.h
deleted file mode 100644
index f080c3d..0000000
--- a/newlib/libc/sys/linux/machine/i386/include/setjmp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#define _JBLEN	9
-typedef	long __jmp_buf[_JBLEN];
-
-#define SP_INDEX 7
-#define _JMPBUF_UNWINDS(buf, address) \
-  ((void *)(address) < (void *)(buf)[SP_INDEX])
diff --git a/newlib/libc/sys/linux/machine/i386/include/termios.h b/newlib/libc/sys/linux/machine/i386/include/termios.h
deleted file mode 100644
index ffbbed8..0000000
--- a/newlib/libc/sys/linux/machine/i386/include/termios.h
+++ /dev/null
@@ -1 +0,0 @@
-#define __MAX_BAUD B4000000
diff --git a/newlib/libc/sys/linux/machine/i386/setjmp.S b/newlib/libc/sys/linux/machine/i386/setjmp.S
deleted file mode 100644
index d276f55..0000000
--- a/newlib/libc/sys/linux/machine/i386/setjmp.S
+++ /dev/null
@@ -1,91 +0,0 @@
-/* This is file is a merger of SETJMP.S and LONGJMP.S */
-/*
- *  This file was modified to use the __USER_LABEL_PREFIX__ and
- *  __REGISTER_PREFIX__ macros defined by later versions of GNU cpp by
- *  Joel Sherrill (joel@OARcorp.com)
- *  Slight change: now includes i386mach.h for this (Werner Almesberger)
- *
- * Copyright (C) 1991 DJ Delorie
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms is permitted
- * provided that the above copyright notice and following paragraph are
- * duplicated in all such forms.
- *
- * This file is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
- /*
- **	jmp_buf:
- **	 eax ebx ecx edx esi edi ebp esp eip
- **	 0   4   8   12  16  20  24  28  32
- */
-
-       #include "i386mach.h"
-
-        .global SYM (setjmp)
-        .global SYM (__libc_longjmp)
-        .weak SYM (longjmp)
-       SOTYPE_FUNCTION(setjmp)
-       SOTYPE_FUNCTION(longjmp)
-       SOTYPE_FUNCTION(__libc_longjmp)
- 
-SYM (setjmp):
-
-	pushl	ebp
-	movl	esp,ebp
-
-	pushl	edi
-	movl	8 (ebp),edi
-
-	movl	eax,0 (edi)
-	movl	ebx,4 (edi)
-	movl	ecx,8 (edi)
-	movl	edx,12 (edi)
-	movl	esi,16 (edi)
-
-	movl	-4 (ebp),eax
-	movl	eax,20 (edi)
-
-	movl	0 (ebp),eax
-	movl	eax,24 (edi)
-
-	movl	esp,eax
-	addl	$12,eax
-	movl	eax,28 (edi)
-	
-	movl	4 (ebp),eax
-	movl	eax,32 (edi)
-
-	popl	edi
-	movl	$0,eax
-	leave
-	ret
-
-SYM (__libc_longjmp):
-SYM (longjmp):
-	.weak longjmp
-	pushl	ebp
-	movl	esp,ebp
-
-	movl	8(ebp),edi	/* get jmp_buf */
-	movl	12(ebp),eax	/* store retval in j->eax */
-	movl	eax,0(edi)
-
-	movl	24(edi),ebp
-
-       __CLI
-	movl	28(edi),esp
-	
-	pushl	32(edi)	
-
-	movl	0(edi),eax
-	movl	4(edi),ebx
-	movl	8(edi),ecx
-	movl	12(edi),edx
-	movl	16(edi),esi
-	movl	20(edi),edi
-       __STI
-
-	ret
diff --git a/newlib/libc/sys/linux/machine/i386/sigaction.c b/newlib/libc/sys/linux/machine/i386/sigaction.c
deleted file mode 100644
index 6edcb0a..0000000
--- a/newlib/libc/sys/linux/machine/i386/sigaction.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* POSIX.1 `sigaction' call for Linux/i386.
-   Copyright (C) 1991, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <stddef.h>
-#include <signal.h>
-#include <string.h>
-
-#include <machine/syscall.h>
-
-/* The difference here is that the sigaction structure used in the
-   kernel is not the same as we use in the libc.  Therefore we must
-   translate it here.  */
-#include <kernel_sigaction.h>
-
-/* We do not globally define the SA_RESTORER flag so do it here.  */
-#define SA_RESTORER 0x04000000
-
-#define __NR___rt_sigaction __NR_rt_sigaction
-
-static _syscall4(int,__rt_sigaction,int,sig,const struct kernel_sigaction *,act,
-                 struct kernel_sigaction *,oact,size_t,size)
-
-static void restore_rt (void) asm ("__restore_rt");
-static void restore (void) asm ("__restore");
-
-/* If ACT is not NULL, change the action for SIG to *ACT.
-   If OACT is not NULL, put the old action for SIG in *OACT.  */
-int
-__libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
-{
-  int result;
-  struct kernel_sigaction kact, koact;
-
-  if (act)
-    {
-      kact.k_sa_handler = act->sa_handler;
-      memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t));
-      kact.sa_flags = act->sa_flags | SA_RESTORER;
-
-      kact.sa_restorer = ((act->sa_flags & SA_SIGINFO)
-                          ? &restore_rt : &restore);
-    }
-
-  /* XXX The size argument hopefully will have to be changed to the
-  real size of the user-level sigset_t.  */
-  result = __rt_sigaction(sig, act ? (&kact) : NULL,
-                          oact ? (&koact) : NULL, _NSIG / 8);
-
-  if (oact && result >= 0)
-    {
-      oact->sa_handler = koact.k_sa_handler;
-      memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (sigset_t));
-      oact->sa_flags = koact.sa_flags;
-      oact->sa_restorer = koact.sa_restorer;
-    }
-  return result;
-}
-
-weak_alias (__libc_sigaction, __sigaction)
-weak_alias (__libc_sigaction, sigaction)
-
-/* NOTE: Please think twice before making any changes to the bits of
-   code below.  GDB needs some intimate knowledge about it to
-   recognize them as signal trampolines, and make backtraces through
-   signal handlers work right.  Important are both the names
-   (__restore and __restore_rt) and the exact instruction sequence.
-   If you ever feel the need to make any changes, please notify the
-   appropriate GDB maintainer.  */
-
-#define RESTORE(name, syscall) RESTORE2 (name, syscall)
-#define RESTORE2(name, syscall) \
-asm						\
-  (						\
-   ".text\n"					\
-   "	.align 16\n"				\
-   "__" #name ":\n"				\
-   "	movl $" #syscall ", %eax\n"		\
-   "	int  $0x80"				\
-   );
-
-/* The return code for realtime-signals.  */
-RESTORE (restore_rt, __NR_rt_sigreturn)
-
-/* For the boring old signals.  */
-# undef RESTORE2
-# define RESTORE2(name, syscall) \
-asm						\
-  (						\
-   ".text\n"					\
-   "	.align 8\n"				\
-   "__" #name ":\n"				\
-   "	popl %eax\n"				\
-   "	movl $" #syscall ", %eax\n"		\
-   "	int  $0x80"				\
-   );
-
-RESTORE (restore, __NR_sigreturn)
diff --git a/newlib/libc/sys/linux/machine/i386/sigstack.h b/newlib/libc/sys/linux/machine/i386/sigstack.h
deleted file mode 100644
index fe6d2d1..0000000
--- a/newlib/libc/sys/linux/machine/i386/sigstack.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _SIGSTACK_H
-
-#define _SIGSTACK_H
-
-#include <stddef.h>
-
-typedef struct sigaltstack
-  {
-    void *ss_sp;
-    int ss_flags;
-    size_t ss_size;
-  } stack_t;
-
-#endif /* _SIGSTACK_H */
diff --git a/newlib/libc/sys/linux/machine/i386/socketcall.h b/newlib/libc/sys/linux/machine/i386/socketcall.h
deleted file mode 100644
index afb1e58..0000000
--- a/newlib/libc/sys/linux/machine/i386/socketcall.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* libc/sys/linux/machine/i386/socketcall.h - x86 linux socket system calls */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#ifndef _SOCKETCALL_H
-
-#define _SOCKETCALL_H 
-
-#include <machine/weakalias.h>
-#include <sys/errno.h>
-#include <asm/unistd.h>
-#include "sockops.h"
-
-/*
- * PIC uses %ebx, so we need to save it during system calls
- */
-
-#ifdef __syscall_return
-
-#define __sockcall_base(type, name) \
-{ \
-long __res; \
-__asm__ volatile ("push %%ebx; movl %2,%%ebx; lea 8(%%ebp),%%ecx; int $0x80; pop %%ebx" \
-	: "=a" (__res) \
-	: "0" (__NR_socketcall),"r" (SOCK_##name)); \
-__syscall_return(type,__res); \
-}
-
-#else /* !defined(__syscall_return) */
-
-/* FIXME: we need to rewrite this for a vsyscall system.  */
-
-#define __syscall_return(type, res) \
-do { \ 
-  if ((unsigned long)(res) >= (unsigned long)(-125)) { \
-    errno = -(res); \
-    res = -1; \
-  } \
-  return (type) (res); \
-} while (0)
-
-#define __sockcall_base(type, name) \
-{ \
-long __res; \
-__asm__ volatile ("push %%ebx; movl %2,%%ebx; lea 8(%%ebp),%%ecx; int $0x80; pop %%ebx" \
-	: "=a" (__res) \
-	: "0" (__NR_socketcall),"r" (SOCK_##name)); \
-__syscall_return(type,__res); \
-}
-
-#endif /* !defined(__syscall_return) */
-
-#undef _sockcall1
-#define _sockcall1(type,name,type1,arg1) \
-type __libc_##name(type1 arg1) \
-__sockcall_base(type,name) \
-weak_alias(__libc_##name,name)
-
-#undef _sockcall2
-#define _sockcall2(type,name,type1,arg1,type2,arg2) \
-type __libc_##name(type1 arg1, type2 arg2) \
-__sockcall_base(type,name) \
-weak_alias(__libc_##name,name)
-
-#undef _sockcall3
-#define _sockcall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type __libc_##name(type1 arg1, type2 arg2, type3 arg3) \
-__sockcall_base(type,name) \
-weak_alias(__libc_##name,name)
-
-#undef _sockcall4
-#define _sockcall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type __libc_##name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-__sockcall_base(type,name) \
-weak_alias(__libc_##name,name)
-
-#undef _sockcall5
-#define _sockcall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-type __libc_##name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \
-__sockcall_base(type,name) \
-weak_alias(__libc_##name,name)
-
-#undef _sockcall6
-#define _sockcall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
-type __libc_##name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) \
-__sockcall_base(type,name) \
-weak_alias(__libc_##name,name)
-
-#endif /* _SOCKETCALL_H */
diff --git a/newlib/libc/sys/linux/machine/i386/syscall.h b/newlib/libc/sys/linux/machine/i386/syscall.h
deleted file mode 100644
index ec9bc24..0000000
--- a/newlib/libc/sys/linux/machine/i386/syscall.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* libc/sys/linux/machine/i386/syscall.h - x86 linux system calls */
-
-/* Written 2000 by Werner Almesberger */
-
-
-#ifndef SYSCALL_H
-
-#include <machine/weakalias.h>
-#include <sys/errno.h>
-#include <asm/unistd.h>
-#include <unistd.h>
-
-
-/*
- * Note: several system calls are for SysV or BSD compatibility, or are
- * specific Linuxisms. Most of those system calls are not implemented in
- * this library.
- */
-
-
-#if defined(__PIC__) && defined(__i386__)
-
-/*
- * PIC uses %ebx, so we need to save it during system calls
- */
-
-#ifndef __syscall_return
-
-/* FIXME: remove this and switch over to use vsyscall.  */
-
-#define __syscall_return(type, res) \
-do { \
-  if ((unsigned long)(res) >= (unsigned long)(-125)) { \
-    errno = -(res); \
-    res = -1; \
-  } \
-  return (type) (res); \
-} while (0)
-
-#endif                                                                                
-#undef __inline_syscall0
-#define __inline_syscall0(name,ret) \
-__asm__ volatile ("int $0x80" \
-	: "=a" (ret) \
-	: "0" (__NR_##name));
-
-#undef __inline_syscall1
-#define __inline_syscall1(name,ret,arg1) \
-__asm__ volatile ("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
-	: "=a" (ret) \
-	: "0" (__NR_##name),"r" ((long)(arg1)));
-
-#undef __inline_syscall2
-#define __inline_syscall2(name,ret,arg1,arg2) \
-__asm__ volatile ("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
-	: "=a" (ret) \
-	: "0" (__NR_##name),"r" ((long)(arg1)),"c" ((long)(arg2)));
-
-#undef __inline_syscall3
-#define __inline_syscall3(name,ret,arg1,arg2,arg3) \
-__asm__ volatile ("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
-	: "=a" (ret) \
-	: "0" (__NR_##name),"r" ((long)(arg1)),"c" ((long)(arg2)), \
-		"d" ((long)(arg3)));
-
-#undef __inline_syscall4
-#define __inline_syscall4(name,ret,arg1,arg2,arg3,arg4) \
-__asm__ volatile ("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
-	: "=a" (ret) \
-	: "0" (__NR_##name),"r" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4)));
-
-#undef __inline_syscall5
-#define __inline_syscall5(name,ret,arg1,arg2,arg3,arg4,arg5) \
-__asm__ volatile ("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
-	: "=a" (ret) \
-	: "0" (__NR_##name),"m" ((long)(arg1)),"c" ((long)(arg2)), \
-	  "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5)));
-
-#undef __inline_syscall6
-#define __inline_syscall6(name,ret,arg1,arg2,arg3,arg4,arg5,arg6) \
-__asm__ volatile ("push %%ebx; lea 8(%%ebp),%%ebx; int $0x80; pop %%ebx" \
-	: "=a" (ret) \
-	: "0" (__NR_##name));
-
-#undef _syscall0_base
-#define _syscall0_base(type,name) \
-type __libc_##name (void) \
-{ \
-long __res; \
-__inline_syscall0(name,__res) \
-__syscall_return(type,__res); \
-}
-
-#undef _syscall1_base
-#define _syscall1_base(type,name,type1,arg1) \
-type __libc_##name (type1 arg1) \
-{ \
-long __res; \
-__inline_syscall1(name,__res,arg1) \
-__syscall_return(type,__res); \
-}
-
-#undef _syscall2_base
-#define _syscall2_base(type,name,type1,arg1,type2,arg2) \
-type __libc_##name (type1 arg1,type2 arg2) \
-{ \
-long __res; \
-__inline_syscall2(name,__res,arg1,arg2) \
-__syscall_return(type,__res); \
-}
-
-#undef _syscall3_base
-#define _syscall3_base(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type __libc_##name (type1 arg1,type2 arg2,type3 arg3) \
-{ \
-long __res; \
-__inline_syscall3(name,__res,arg1,arg2,arg3) \
-__syscall_return(type,__res); \
-}
-
-#undef _syscall4_base
-#define _syscall4_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type __libc_##name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-long __res; \
-__inline_syscall4(name,__res,arg1,arg2,arg3,arg4) \
-__syscall_return(type,__res); \
-}
-
-#undef _syscall5_base
-#define _syscall5_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5) \
-type __libc_##name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
-{ \
-long __res; \
-__inline_syscall5(name,__res,arg1,arg2,arg3,arg4,arg5) \
-__syscall_return(type,__res); \
-} \
-
-#undef _syscall6_base
-#define _syscall6_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5,type6,arg6) \
-type __libc_##name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
-{ \
-long __res; \
-__inline_syscall6(name,__res,arg1,arg2,arg3,arg4,arg5,arg6) \
-__syscall_return(type,__res); \
-}
-
-#undef _syscall0
-#define _syscall0(type,name) \
-_syscall0_base(type,name) \
-weak_alias(__libc_##name,name);
-
-#undef _syscall1
-#define _syscall1(type,name,type1,arg1) \
-_syscall1_base(type,name,type1,arg1) \
-weak_alias(__libc_##name,name);
-
-#undef _syscall2
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-_syscall2_base(type,name,type1,arg1,type2,arg2) \
-weak_alias(__libc_##name,name);
-
-#undef _syscall3
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-_syscall3_base(type,name,type1,arg1,type2,arg2,type3,arg3) \
-weak_alias(__libc_##name,name);
-
-#undef _syscall4
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-_syscall4_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-weak_alias(__libc_##name,name);
-
-#undef _syscall5
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5) \
-_syscall5_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-weak_alias(__libc_##name,name);
-
-#undef _syscall6
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5,type6,arg6) \
-_syscall6_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
-weak_alias(__libc_##name,name);
-
-#endif /* __PIC__ && __i386__ */
-
-#endif /* SYSCALL_H */
diff --git a/newlib/libc/sys/linux/machine/i386/sysdep.h b/newlib/libc/sys/linux/machine/i386/sysdep.h
deleted file mode 100644
index 42becb3..0000000
--- a/newlib/libc/sys/linux/machine/i386/sysdep.h
+++ /dev/null
@@ -1 +0,0 @@
-#define NO_UNDERSCORES
diff --git a/newlib/libc/sys/linux/machine/i386/weakalias.h b/newlib/libc/sys/linux/machine/i386/weakalias.h
deleted file mode 100644
index 2813bfe..0000000
--- a/newlib/libc/sys/linux/machine/i386/weakalias.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#define weak_alias(name, aliasname) \
-  extern __typeof (name) aliasname __attribute__ ((weak, alias (#name)));
-
-#if 0
-#define weak_extern(symbol) _weak_extern (symbol)
-#define _weak_extern(symbol) asm (".weak " #symbol);
-#endif
-
-#define weak_function __attribute__ ((weak))
-
diff --git a/newlib/libc/sys/linux/malign.c b/newlib/libc/sys/linux/malign.c
deleted file mode 100644
index 818e05a..0000000
--- a/newlib/libc/sys/linux/malign.c
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy file to override one object in stdlib directory */
diff --git a/newlib/libc/sys/linux/malignr.c b/newlib/libc/sys/linux/malignr.c
deleted file mode 100644
index 5b2e14a..0000000
--- a/newlib/libc/sys/linux/malignr.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-void *
-_memalign_r (struct _reent *ptr, size_t alignment, size_t bytes)
-{
-  return memalign (alignment, bytes);
-}
diff --git a/newlib/libc/sys/linux/mallinfor.c b/newlib/libc/sys/linux/mallinfor.c
deleted file mode 100644
index a2ee627..0000000
--- a/newlib/libc/sys/linux/mallinfor.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <malloc.h>
-
-struct mallinfo
-_mallinfo_r (struct _reent *ptr)
-{
-  return mallinfo ();
-}
diff --git a/newlib/libc/sys/linux/malloc.c b/newlib/libc/sys/linux/malloc.c
deleted file mode 100644
index 25007e8..0000000
--- a/newlib/libc/sys/linux/malloc.c
+++ /dev/null
@@ -1,5082 +0,0 @@
-/* Malloc implementation for multiple threads without lock contention.
-   Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
-   and Doug Lea <dl@cs.oswego.edu>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* $Id$
-
-  This work is mainly derived from malloc-2.6.4 by Doug Lea
-  <dl@cs.oswego.edu>, which is available from:
-
-                 ftp://g.oswego.edu/pub/misc/malloc.c
-
-  Most of the original comments are reproduced in the code below.
-
-* Why use this malloc?
-
-  This is not the fastest, most space-conserving, most portable, or
-  most tunable malloc ever written. However it is among the fastest
-  while also being among the most space-conserving, portable and tunable.
-  Consistent balance across these factors results in a good general-purpose
-  allocator. For a high-level description, see
-     http://g.oswego.edu/dl/html/malloc.html
-
-  On many systems, the standard malloc implementation is by itself not
-  thread-safe, and therefore wrapped with a single global lock around
-  all malloc-related functions.  In some applications, especially with
-  multiple available processors, this can lead to contention problems
-  and bad performance.  This malloc version was designed with the goal
-  to avoid waiting for locks as much as possible.  Statistics indicate
-  that this goal is achieved in many cases.
-
-* Synopsis of public routines
-
-  (Much fuller descriptions are contained in the program documentation below.)
-
-  ptmalloc_init();
-     Initialize global configuration.  When compiled for multiple threads,
-     this function must be called once before any other function in the
-     package.  It is not required otherwise.  It is called automatically
-     in the Linux/GNU C libray or when compiling with MALLOC_HOOKS.
-  malloc(size_t n);
-     Return a pointer to a newly allocated chunk of at least n bytes, or null
-     if no space is available.
-  free(Void_t* p);
-     Release the chunk of memory pointed to by p, or no effect if p is null.
-  realloc(Void_t* p, size_t n);
-     Return a pointer to a chunk of size n that contains the same data
-     as does chunk p up to the minimum of (n, p's size) bytes, or null
-     if no space is available. The returned pointer may or may not be
-     the same as p. If p is null, equivalent to malloc.  Unless the
-     #define REALLOC_ZERO_BYTES_FREES below is set, realloc with a
-     size argument of zero (re)allocates a minimum-sized chunk.
-  memalign(size_t alignment, size_t n);
-     Return a pointer to a newly allocated chunk of n bytes, aligned
-     in accord with the alignment argument, which must be a power of
-     two.
-  valloc(size_t n);
-     Equivalent to memalign(pagesize, n), where pagesize is the page
-     size of the system (or as near to this as can be figured out from
-     all the includes/defines below.)
-  pvalloc(size_t n);
-     Equivalent to valloc(minimum-page-that-holds(n)), that is,
-     round up n to nearest pagesize.
-  calloc(size_t unit, size_t quantity);
-     Returns a pointer to quantity * unit bytes, with all locations
-     set to zero.
-  cfree(Void_t* p);
-     Equivalent to free(p).
-  malloc_trim(size_t pad);
-     Release all but pad bytes of freed top-most memory back
-     to the system. Return 1 if successful, else 0.
-  malloc_usable_size(Void_t* p);
-     Report the number usable allocated bytes associated with allocated
-     chunk p. This may or may not report more bytes than were requested,
-     due to alignment and minimum size constraints.
-  malloc_stats();
-     Prints brief summary statistics on stderr.
-  mallinfo()
-     Returns (by copy) a struct containing various summary statistics.
-  mallopt(int parameter_number, int parameter_value)
-     Changes one of the tunable parameters described below. Returns
-     1 if successful in changing the parameter, else 0.
-
-* Vital statistics:
-
-  Alignment:                            8-byte
-       8 byte alignment is currently hardwired into the design.  This
-       seems to suffice for all current machines and C compilers.
-
-  Assumed pointer representation:       4 or 8 bytes
-       Code for 8-byte pointers is untested by me but has worked
-       reliably by Wolfram Gloger, who contributed most of the
-       changes supporting this.
-
-  Assumed size_t  representation:       4 or 8 bytes
-       Note that size_t is allowed to be 4 bytes even if pointers are 8.
-
-  Minimum overhead per allocated chunk: 4 or 8 bytes
-       Each malloced chunk has a hidden overhead of 4 bytes holding size
-       and status information.
-
-  Minimum allocated size: 4-byte ptrs:  16 bytes    (including 4 overhead)
-                          8-byte ptrs:  24/32 bytes (including, 4/8 overhead)
-
-       When a chunk is freed, 12 (for 4byte ptrs) or 20 (for 8 byte
-       ptrs but 4 byte size) or 24 (for 8/8) additional bytes are
-       needed; 4 (8) for a trailing size field
-       and 8 (16) bytes for free list pointers. Thus, the minimum
-       allocatable size is 16/24/32 bytes.
-
-       Even a request for zero bytes (i.e., malloc(0)) returns a
-       pointer to something of the minimum allocatable size.
-
-  Maximum allocated size: 4-byte size_t: 2^31 -  8 bytes
-                          8-byte size_t: 2^63 - 16 bytes
-
-       It is assumed that (possibly signed) size_t bit values suffice to
-       represent chunk sizes. `Possibly signed' is due to the fact
-       that `size_t' may be defined on a system as either a signed or
-       an unsigned type. To be conservative, values that would appear
-       as negative numbers are avoided.
-       Requests for sizes with a negative sign bit will return a
-       minimum-sized chunk.
-
-  Maximum overhead wastage per allocated chunk: normally 15 bytes
-
-       Alignment demands, plus the minimum allocatable size restriction
-       make the normal worst-case wastage 15 bytes (i.e., up to 15
-       more bytes will be allocated than were requested in malloc), with
-       two exceptions:
-         1. Because requests for zero bytes allocate non-zero space,
-            the worst case wastage for a request of zero bytes is 24 bytes.
-         2. For requests >= mmap_threshold that are serviced via
-            mmap(), the worst case wastage is 8 bytes plus the remainder
-            from a system page (the minimal mmap unit); typically 4096 bytes.
-
-* Limitations
-
-    Here are some features that are NOT currently supported
-
-    * No automated mechanism for fully checking that all accesses
-      to malloced memory stay within their bounds.
-    * No support for compaction.
-
-* Synopsis of compile-time options:
-
-    People have reported using previous versions of this malloc on all
-    versions of Unix, sometimes by tweaking some of the defines
-    below. It has been tested most extensively on Solaris and
-    Linux. People have also reported adapting this malloc for use in
-    stand-alone embedded systems.
-
-    The implementation is in straight, hand-tuned ANSI C.  Among other
-    consequences, it uses a lot of macros.  Because of this, to be at
-    all usable, this code should be compiled using an optimizing compiler
-    (for example gcc -O2) that can simplify expressions and control
-    paths.
-
-  __STD_C                  (default: derived from C compiler defines)
-     Nonzero if using ANSI-standard C compiler, a C++ compiler, or
-     a C compiler sufficiently close to ANSI to get away with it.
-  MALLOC_DEBUG             (default: NOT defined)
-     Define to enable debugging. Adds fairly extensive assertion-based
-     checking to help track down memory errors, but noticeably slows down
-     execution.
-  MALLOC_HOOKS             (default: NOT defined)
-     Define to enable support run-time replacement of the allocation
-     functions through user-defined `hooks'.
-  REALLOC_ZERO_BYTES_FREES (default: defined)
-     Define this if you think that realloc(p, 0) should be equivalent
-     to free(p).  (The C standard requires this behaviour, therefore
-     it is the default.)  Otherwise, since malloc returns a unique
-     pointer for malloc(0), so does realloc(p, 0).
-  HAVE_MEMCPY               (default: defined)
-     Define if you are not otherwise using ANSI STD C, but still
-     have memcpy and memset in your C library and want to use them.
-     Otherwise, simple internal versions are supplied.
-  USE_MEMCPY               (default: 1 if HAVE_MEMCPY is defined, 0 otherwise)
-     Define as 1 if you want the C library versions of memset and
-     memcpy called in realloc and calloc (otherwise macro versions are used).
-     At least on some platforms, the simple macro versions usually
-     outperform libc versions.
-  HAVE_MMAP                 (default: defined as 1)
-     Define to non-zero to optionally make malloc() use mmap() to
-     allocate very large blocks.
-  HAVE_MREMAP                 (default: defined as 0 unless Linux libc set)
-     Define to non-zero to optionally make realloc() use mremap() to
-     reallocate very large blocks.
-  USE_ARENAS                (default: the same as HAVE_MMAP)
-     Enable support for multiple arenas, allocated using mmap().
-  malloc_getpagesize        (default: derived from system #includes)
-     Either a constant or routine call returning the system page size.
-  HAVE_USR_INCLUDE_MALLOC_H (default: NOT defined)
-     Optionally define if you are on a system with a /usr/include/malloc.h
-     that declares struct mallinfo. It is not at all necessary to
-     define this even if you do, but will ensure consistency.
-  INTERNAL_SIZE_T           (default: size_t)
-     Define to a 32-bit type (probably `unsigned int') if you are on a
-     64-bit machine, yet do not want or need to allow malloc requests of
-     greater than 2^31 to be handled. This saves space, especially for
-     very small chunks.
-  _LIBC                     (default: NOT defined)
-     Defined only when compiled as part of the Linux libc/glibc.
-     Also note that there is some odd internal name-mangling via defines
-     (for example, internally, `malloc' is named `mALLOc') needed
-     when compiling in this case. These look funny but don't otherwise
-     affect anything.
-  LACKS_UNISTD_H            (default: undefined)
-     Define this if your system does not have a <unistd.h>.
-  MORECORE                  (default: sbrk)
-     The name of the routine to call to obtain more memory from the system.
-  MORECORE_FAILURE          (default: -1)
-     The value returned upon failure of MORECORE.
-  MORECORE_CLEARS           (default 1)
-     The degree to which the routine mapped to MORECORE zeroes out
-     memory: never (0), only for newly allocated space (1) or always
-     (2).  The distinction between (1) and (2) is necessary because on
-     some systems, if the application first decrements and then
-     increments the break value, the contents of the reallocated space
-     are unspecified.
-  DEFAULT_TRIM_THRESHOLD
-  DEFAULT_TOP_PAD
-  DEFAULT_MMAP_THRESHOLD
-  DEFAULT_MMAP_MAX
-     Default values of tunable parameters (described in detail below)
-     controlling interaction with host system routines (sbrk, mmap, etc).
-     These values may also be changed dynamically via mallopt(). The
-     preset defaults are those that give best performance for typical
-     programs/systems.
-  DEFAULT_CHECK_ACTION
-     When the standard debugging hooks are in place, and a pointer is
-     detected as corrupt, do nothing (0), print an error message (1),
-     or call abort() (2).
-
-
-*/
-
-/*
-
-* Compile-time options for multiple threads:
-
-  USE_PTHREADS, USE_THR, USE_SPROC
-     Define one of these as 1 to select the thread interface:
-     POSIX threads, Solaris threads or SGI sproc's, respectively.
-     If none of these is defined as non-zero, you get a `normal'
-     malloc implementation which is not thread-safe.  Support for
-     multiple threads requires HAVE_MMAP=1.  As an exception, when
-     compiling for GNU libc, i.e. when _LIBC is defined, then none of
-     the USE_... symbols have to be defined.
-
-  HEAP_MIN_SIZE
-  HEAP_MAX_SIZE
-     When thread support is enabled, additional `heap's are created
-     with mmap calls.  These are limited in size; HEAP_MIN_SIZE should
-     be a multiple of the page size, while HEAP_MAX_SIZE must be a power
-     of two for alignment reasons.  HEAP_MAX_SIZE should be at least
-     twice as large as the mmap threshold.
-  THREAD_STATS
-     When this is defined as non-zero, some statistics on mutex locking
-     are computed.
-
-*/
-
-
-
-
-/* Preliminaries */
-
-#ifndef __STD_C
-#if defined (__STDC__)
-#define __STD_C     1
-#else
-#if __cplusplus
-#define __STD_C     1
-#else
-#define __STD_C     0
-#endif /*__cplusplus*/
-#endif /*__STDC__*/
-#endif /*__STD_C*/
-
-#ifndef Void_t
-#if __STD_C
-#define Void_t      void
-#else
-#define Void_t      char
-#endif
-#endif /*Void_t*/
-
-#define _GNU_SOURCE
-#include <features.h>
-#define _LIBC 1
-#define NOT_IN_libc 1
-
-#if __STD_C
-# include <stddef.h>   /* for size_t */
-# if defined _LIBC || defined MALLOC_HOOKS
-#  include <stdlib.h>  /* for getenv(), abort() */
-# endif
-#else
-# include <sys/types.h>
-# if defined _LIBC || defined MALLOC_HOOKS
-extern char* getenv();
-# endif
-#endif
-
-/* newlib modifications */
-
-#include <libc-symbols.h>
-#include <sys/types.h>
-
-extern void __pthread_initialize (void) __attribute__((weak));
-extern void *__mmap (void *__addr, size_t __len, int __prot,
-                     int __flags, int __fd, off_t __offset);
-extern int __munmap (void *__addr, size_t __len);
-extern void *__mremap (void *__addr, size_t __old_len, size_t __new_len,
-                       int __may_move);
-extern int __getpagesize (void);
-
-#define __libc_enable_secure 1
-
-/* Macros for handling mutexes and thread-specific data.  This is
-   included early, because some thread-related header files (such as
-   pthread.h) should be included before any others. */
-#include <bits/libc-lock.h>
-#include "thread-m.h"
-
-void *(*__malloc_internal_tsd_get) (enum __libc_tsd_key_t) = NULL;
-int (*__malloc_internal_tsd_set) (enum __libc_tsd_key_t,
-                                       __const void *) = NULL;
-
-weak_alias(__malloc_internal_tsd_get, __libc_internal_tsd_get)
-weak_alias(__malloc_internal_tsd_set, __libc_internal_tsd_set)
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <errno.h>
-#include <stdio.h>    /* needed for malloc_stats */
-
-
-/*
-  Compile-time options
-*/
-
-
-/*
-    Debugging:
-
-    Because freed chunks may be overwritten with link fields, this
-    malloc will often die when freed memory is overwritten by user
-    programs.  This can be very effective (albeit in an annoying way)
-    in helping track down dangling pointers.
-
-    If you compile with -DMALLOC_DEBUG, a number of assertion checks are
-    enabled that will catch more memory errors. You probably won't be
-    able to make much sense of the actual assertion errors, but they
-    should help you locate incorrectly overwritten memory.  The
-    checking is fairly extensive, and will slow down execution
-    noticeably. Calling malloc_stats or mallinfo with MALLOC_DEBUG set will
-    attempt to check every non-mmapped allocated and free chunk in the
-    course of computing the summaries. (By nature, mmapped regions
-    cannot be checked very much automatically.)
-
-    Setting MALLOC_DEBUG may also be helpful if you are trying to modify
-    this code. The assertions in the check routines spell out in more
-    detail the assumptions and invariants underlying the algorithms.
-
-*/
-
-#if MALLOC_DEBUG
-#include <assert.h>
-#else
-#define assert(x) ((void)0)
-#endif
-
-
-/*
-  INTERNAL_SIZE_T is the word-size used for internal bookkeeping
-  of chunk sizes. On a 64-bit machine, you can reduce malloc
-  overhead by defining INTERNAL_SIZE_T to be a 32 bit `unsigned int'
-  at the expense of not being able to handle requests greater than
-  2^31. This limitation is hardly ever a concern; you are encouraged
-  to set this. However, the default version is the same as size_t.
-*/
-
-#ifndef INTERNAL_SIZE_T
-#define INTERNAL_SIZE_T size_t
-#endif
-
-/*
-  REALLOC_ZERO_BYTES_FREES should be set if a call to realloc with
-  zero bytes should be the same as a call to free.  The C standard
-  requires this. Otherwise, since this malloc returns a unique pointer
-  for malloc(0), so does realloc(p, 0).
-*/
-
-
-#define REALLOC_ZERO_BYTES_FREES
-
-
-/*
-  HAVE_MEMCPY should be defined if you are not otherwise using
-  ANSI STD C, but still have memcpy and memset in your C library
-  and want to use them in calloc and realloc. Otherwise simple
-  macro versions are defined here.
-
-  USE_MEMCPY should be defined as 1 if you actually want to
-  have memset and memcpy called. People report that the macro
-  versions are often enough faster than libc versions on many
-  systems that it is better to use them.
-
-*/
-
-#define HAVE_MEMCPY 1
-
-#ifndef USE_MEMCPY
-#ifdef HAVE_MEMCPY
-#define USE_MEMCPY 1
-#else
-#define USE_MEMCPY 0
-#endif
-#endif
-
-#if (__STD_C || defined(HAVE_MEMCPY))
-
-#if __STD_C
-void* memset(void*, int, size_t);
-void* memcpy(void*, const void*, size_t);
-void* memmove(void*, const void*, size_t);
-#else
-Void_t* memset();
-Void_t* memcpy();
-Void_t* memmove();
-#endif
-#endif
-
-/* The following macros are only invoked with (2n+1)-multiples of
-   INTERNAL_SIZE_T units, with a positive integer n. This is exploited
-   for fast inline execution when n is small.  If the regions to be
-   copied do overlap, the destination lies always _below_ the source.  */
-
-#if USE_MEMCPY
-
-#define MALLOC_ZERO(charp, nbytes)                                            \
-do {                                                                          \
-  INTERNAL_SIZE_T mzsz = (nbytes);                                            \
-  if(mzsz <= 9*sizeof(mzsz)) {                                                \
-    INTERNAL_SIZE_T* mz = (INTERNAL_SIZE_T*) (charp);                         \
-    if(mzsz >= 5*sizeof(mzsz)) {     *mz++ = 0;                               \
-                                     *mz++ = 0;                               \
-      if(mzsz >= 7*sizeof(mzsz)) {   *mz++ = 0;                               \
-                                     *mz++ = 0;                               \
-        if(mzsz >= 9*sizeof(mzsz)) { *mz++ = 0;                               \
-                                     *mz++ = 0; }}}                           \
-                                     *mz++ = 0;                               \
-                                     *mz++ = 0;                               \
-                                     *mz   = 0;                               \
-  } else memset((charp), 0, mzsz);                                            \
-} while(0)
-
-/* If the regions overlap, dest is always _below_ src.  */
-
-#define MALLOC_COPY(dest,src,nbytes,overlap)                                  \
-do {                                                                          \
-  INTERNAL_SIZE_T mcsz = (nbytes);                                            \
-  if(mcsz <= 9*sizeof(mcsz)) {                                                \
-    INTERNAL_SIZE_T* mcsrc = (INTERNAL_SIZE_T*) (src);                        \
-    INTERNAL_SIZE_T* mcdst = (INTERNAL_SIZE_T*) (dest);                       \
-    if(mcsz >= 5*sizeof(mcsz)) {     *mcdst++ = *mcsrc++;                     \
-                                     *mcdst++ = *mcsrc++;                     \
-      if(mcsz >= 7*sizeof(mcsz)) {   *mcdst++ = *mcsrc++;                     \
-                                     *mcdst++ = *mcsrc++;                     \
-        if(mcsz >= 9*sizeof(mcsz)) { *mcdst++ = *mcsrc++;                     \
-                                     *mcdst++ = *mcsrc++; }}}                 \
-                                     *mcdst++ = *mcsrc++;                     \
-                                     *mcdst++ = *mcsrc++;                     \
-                                     *mcdst   = *mcsrc  ;                     \
-  } else if(overlap)                                                          \
-    memmove(dest, src, mcsz);                                                 \
-  else                                                                        \
-    memcpy(dest, src, mcsz);                                                  \
-} while(0)
-
-#else /* !USE_MEMCPY */
-
-/* Use Duff's device for good zeroing/copying performance. */
-
-#define MALLOC_ZERO(charp, nbytes)                                            \
-do {                                                                          \
-  INTERNAL_SIZE_T* mzp = (INTERNAL_SIZE_T*)(charp);                           \
-  long mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T), mcn;                         \
-  if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; }             \
-  switch (mctmp) {                                                            \
-    case 0: for(;;) { *mzp++ = 0;                                             \
-    case 7:           *mzp++ = 0;                                             \
-    case 6:           *mzp++ = 0;                                             \
-    case 5:           *mzp++ = 0;                                             \
-    case 4:           *mzp++ = 0;                                             \
-    case 3:           *mzp++ = 0;                                             \
-    case 2:           *mzp++ = 0;                                             \
-    case 1:           *mzp++ = 0; if(mcn <= 0) break; mcn--; }                \
-  }                                                                           \
-} while(0)
-
-/* If the regions overlap, dest is always _below_ src.  */
-
-#define MALLOC_COPY(dest,src,nbytes,overlap)                                  \
-do {                                                                          \
-  INTERNAL_SIZE_T* mcsrc = (INTERNAL_SIZE_T*) src;                            \
-  INTERNAL_SIZE_T* mcdst = (INTERNAL_SIZE_T*) dest;                           \
-  long mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T), mcn;                         \
-  if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; }             \
-  switch (mctmp) {                                                            \
-    case 0: for(;;) { *mcdst++ = *mcsrc++;                                    \
-    case 7:           *mcdst++ = *mcsrc++;                                    \
-    case 6:           *mcdst++ = *mcsrc++;                                    \
-    case 5:           *mcdst++ = *mcsrc++;                                    \
-    case 4:           *mcdst++ = *mcsrc++;                                    \
-    case 3:           *mcdst++ = *mcsrc++;                                    \
-    case 2:           *mcdst++ = *mcsrc++;                                    \
-    case 1:           *mcdst++ = *mcsrc++; if(mcn <= 0) break; mcn--; }       \
-  }                                                                           \
-} while(0)
-
-#endif
-
-
-#ifndef LACKS_UNISTD_H
-#  include <unistd.h>
-#endif
-
-/*
-  Define HAVE_MMAP to optionally make malloc() use mmap() to allocate
-  very large blocks.  These will be returned to the operating system
-  immediately after a free().  HAVE_MMAP is also a prerequisite to
-  support multiple `arenas' (see USE_ARENAS below).
-*/
-
-#ifndef HAVE_MMAP
-# ifdef _POSIX_MAPPED_FILES
-#  define HAVE_MMAP 1
-# endif
-#endif
-
-/*
-  Define HAVE_MREMAP to make realloc() use mremap() to re-allocate
-  large blocks.  This is currently only possible on Linux with
-  kernel versions newer than 1.3.77.
-*/
-
-#ifndef HAVE_MREMAP
-#define HAVE_MREMAP defined(__linux__)
-#endif
-
-/* Define USE_ARENAS to enable support for multiple `arenas'.  These
-   are allocated using mmap(), are necessary for threads and
-   occasionally useful to overcome address space limitations affecting
-   sbrk(). */
-
-#ifndef USE_ARENAS
-#define USE_ARENAS HAVE_MMAP
-#endif
-
-#if HAVE_MMAP
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
-#define MAP_ANONYMOUS MAP_ANON
-#endif
-#if !defined(MAP_FAILED)
-#define MAP_FAILED ((char*)-1)
-#endif
-
-#ifndef MAP_NORESERVE
-# ifdef MAP_AUTORESRV
-#  define MAP_NORESERVE MAP_AUTORESRV
-# else
-#  define MAP_NORESERVE 0
-# endif
-#endif
-
-#endif /* HAVE_MMAP */
-
-/*
-  Access to system page size. To the extent possible, this malloc
-  manages memory from the system in page-size units.
-
-  The following mechanics for getpagesize were adapted from
-  bsd/gnu getpagesize.h
-*/
-
-#ifndef malloc_getpagesize
-#  ifdef _SC_PAGESIZE         /* some SVR4 systems omit an underscore */
-#    ifndef _SC_PAGE_SIZE
-#      define _SC_PAGE_SIZE _SC_PAGESIZE
-#    endif
-#  endif
-#  ifdef _SC_PAGE_SIZE
-#    define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
-#  else
-#    if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE)
-       extern size_t getpagesize();
-#      define malloc_getpagesize getpagesize()
-#    else
-#      include <sys/param.h>
-#      ifdef EXEC_PAGESIZE
-#        define malloc_getpagesize EXEC_PAGESIZE
-#      else
-#        ifdef NBPG
-#          ifndef CLSIZE
-#            define malloc_getpagesize NBPG
-#          else
-#            define malloc_getpagesize (NBPG * CLSIZE)
-#          endif
-#        else
-#          ifdef NBPC
-#            define malloc_getpagesize NBPC
-#          else
-#            ifdef PAGESIZE
-#              define malloc_getpagesize PAGESIZE
-#            else
-#              define malloc_getpagesize (4096) /* just guess */
-#            endif
-#          endif
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-
-
-/*
-
-  This version of malloc supports the standard SVID/XPG mallinfo
-  routine that returns a struct containing the same kind of
-  information you can get from malloc_stats. It should work on
-  any SVID/XPG compliant system that has a /usr/include/malloc.h
-  defining struct mallinfo. (If you'd like to install such a thing
-  yourself, cut out the preliminary declarations as described above
-  and below and save them in a malloc.h file. But there's no
-  compelling reason to bother to do this.)
-
-  The main declaration needed is the mallinfo struct that is returned
-  (by-copy) by mallinfo().  The SVID/XPG malloinfo struct contains a
-  bunch of fields, most of which are not even meaningful in this
-  version of malloc. Some of these fields are are instead filled by
-  mallinfo() with other numbers that might possibly be of interest.
-
-  HAVE_USR_INCLUDE_MALLOC_H should be set if you have a
-  /usr/include/malloc.h file that includes a declaration of struct
-  mallinfo.  If so, it is included; else an SVID2/XPG2 compliant
-  version is declared below.  These must be precisely the same for
-  mallinfo() to work.
-
-*/
-
-/* #define HAVE_USR_INCLUDE_MALLOC_H */
-
-#if HAVE_USR_INCLUDE_MALLOC_H
-# include "/usr/include/malloc.h"
-#else
-# ifdef _LIBC
-#  include "malloc.h"
-# else
-#  include "ptmalloc.h"
-# endif
-#endif
-
-#include <bp-checks.h>
-
-#ifndef DEFAULT_TRIM_THRESHOLD
-#define DEFAULT_TRIM_THRESHOLD (128 * 1024)
-#endif
-
-/*
-    M_TRIM_THRESHOLD is the maximum amount of unused top-most memory
-      to keep before releasing via malloc_trim in free().
-
-      Automatic trimming is mainly useful in long-lived programs.
-      Because trimming via sbrk can be slow on some systems, and can
-      sometimes be wasteful (in cases where programs immediately
-      afterward allocate more large chunks) the value should be high
-      enough so that your overall system performance would improve by
-      releasing.
-
-      The trim threshold and the mmap control parameters (see below)
-      can be traded off with one another. Trimming and mmapping are
-      two different ways of releasing unused memory back to the
-      system. Between these two, it is often possible to keep
-      system-level demands of a long-lived program down to a bare
-      minimum. For example, in one test suite of sessions measuring
-      the XF86 X server on Linux, using a trim threshold of 128K and a
-      mmap threshold of 192K led to near-minimal long term resource
-      consumption.
-
-      If you are using this malloc in a long-lived program, it should
-      pay to experiment with these values.  As a rough guide, you
-      might set to a value close to the average size of a process
-      (program) running on your system.  Releasing this much memory
-      would allow such a process to run in memory.  Generally, it's
-      worth it to tune for trimming rather than memory mapping when a
-      program undergoes phases where several large chunks are
-      allocated and released in ways that can reuse each other's
-      storage, perhaps mixed with phases where there are no such
-      chunks at all.  And in well-behaved long-lived programs,
-      controlling release of large blocks via trimming versus mapping
-      is usually faster.
-
-      However, in most programs, these parameters serve mainly as
-      protection against the system-level effects of carrying around
-      massive amounts of unneeded memory. Since frequent calls to
-      sbrk, mmap, and munmap otherwise degrade performance, the default
-      parameters are set to relatively high values that serve only as
-      safeguards.
-
-      The default trim value is high enough to cause trimming only in
-      fairly extreme (by current memory consumption standards) cases.
-      It must be greater than page size to have any useful effect.  To
-      disable trimming completely, you can set to (unsigned long)(-1);
-
-
-*/
-
-
-#ifndef DEFAULT_TOP_PAD
-#define DEFAULT_TOP_PAD        (0)
-#endif
-
-/*
-    M_TOP_PAD is the amount of extra `padding' space to allocate or
-      retain whenever sbrk is called. It is used in two ways internally:
-
-      * When sbrk is called to extend the top of the arena to satisfy
-        a new malloc request, this much padding is added to the sbrk
-        request.
-
-      * When malloc_trim is called automatically from free(),
-        it is used as the `pad' argument.
-
-      In both cases, the actual amount of padding is rounded
-      so that the end of the arena is always a system page boundary.
-
-      The main reason for using padding is to avoid calling sbrk so
-      often. Having even a small pad greatly reduces the likelihood
-      that nearly every malloc request during program start-up (or
-      after trimming) will invoke sbrk, which needlessly wastes
-      time.
-
-      Automatic rounding-up to page-size units is normally sufficient
-      to avoid measurable overhead, so the default is 0.  However, in
-      systems where sbrk is relatively slow, it can pay to increase
-      this value, at the expense of carrying around more memory than
-      the program needs.
-
-*/
-
-
-#ifndef DEFAULT_MMAP_THRESHOLD
-#define DEFAULT_MMAP_THRESHOLD (128 * 1024)
-#endif
-
-/*
-
-    M_MMAP_THRESHOLD is the request size threshold for using mmap()
-      to service a request. Requests of at least this size that cannot
-      be allocated using already-existing space will be serviced via mmap.
-      (If enough normal freed space already exists it is used instead.)
-
-      Using mmap segregates relatively large chunks of memory so that
-      they can be individually obtained and released from the host
-      system. A request serviced through mmap is never reused by any
-      other request (at least not directly; the system may just so
-      happen to remap successive requests to the same locations).
-
-      Segregating space in this way has the benefit that mmapped space
-      can ALWAYS be individually released back to the system, which
-      helps keep the system level memory demands of a long-lived
-      program low. Mapped memory can never become `locked' between
-      other chunks, as can happen with normally allocated chunks, which
-      menas that even trimming via malloc_trim would not release them.
-
-      However, it has the disadvantages that:
-
-         1. The space cannot be reclaimed, consolidated, and then
-            used to service later requests, as happens with normal chunks.
-         2. It can lead to more wastage because of mmap page alignment
-            requirements
-         3. It causes malloc performance to be more dependent on host
-            system memory management support routines which may vary in
-            implementation quality and may impose arbitrary
-            limitations. Generally, servicing a request via normal
-            malloc steps is faster than going through a system's mmap.
-
-      All together, these considerations should lead you to use mmap
-      only for relatively large requests.
-
-
-*/
-
-
-
-#ifndef DEFAULT_MMAP_MAX
-#if HAVE_MMAP
-#define DEFAULT_MMAP_MAX       (1024)
-#else
-#define DEFAULT_MMAP_MAX       (0)
-#endif
-#endif
-
-/*
-    M_MMAP_MAX is the maximum number of requests to simultaneously
-      service using mmap. This parameter exists because:
-
-         1. Some systems have a limited number of internal tables for
-            use by mmap.
-         2. In most systems, overreliance on mmap can degrade overall
-            performance.
-         3. If a program allocates many large regions, it is probably
-            better off using normal sbrk-based allocation routines that
-            can reclaim and reallocate normal heap memory. Using a
-            small value allows transition into this mode after the
-            first few allocations.
-
-      Setting to 0 disables all use of mmap.  If HAVE_MMAP is not set,
-      the default value is 0, and attempts to set it to non-zero values
-      in mallopt will fail.
-*/
-
-
-
-#ifndef DEFAULT_CHECK_ACTION
-#define DEFAULT_CHECK_ACTION 1
-#endif
-
-/* What to do if the standard debugging hooks are in place and a
-   corrupt pointer is detected: do nothing (0), print an error message
-   (1), or call abort() (2). */
-
-
-
-#define HEAP_MIN_SIZE (32*1024)
-#define HEAP_MAX_SIZE (1024*1024) /* must be a power of two */
-
-/* HEAP_MIN_SIZE and HEAP_MAX_SIZE limit the size of mmap()ed heaps
-      that are dynamically created for multi-threaded programs.  The
-      maximum size must be a power of two, for fast determination of
-      which heap belongs to a chunk.  It should be much larger than
-      the mmap threshold, so that requests with a size just below that
-      threshold can be fulfilled without creating too many heaps.
-*/
-
-
-
-#ifndef THREAD_STATS
-#define THREAD_STATS 0
-#endif
-
-/* If THREAD_STATS is non-zero, some statistics on mutex locking are
-   computed. */
-
-
-/* Macro to set errno.  */
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-/* On some platforms we can compile internal, not exported functions better.
-   Let the environment provide a macro and define it to be empty if it
-   is not available.  */
-#ifndef internal_function
-# define internal_function
-#endif
-
-
-/*
-
-  Special defines for the Linux/GNU C library.
-
-*/
-
-
-#ifdef _LIBC
-
-#if __STD_C
-
-Void_t * __default_morecore (ptrdiff_t);
-Void_t *(*__morecore)(ptrdiff_t) = __default_morecore;
-
-#else
-
-Void_t * __default_morecore ();
-Void_t *(*__morecore)() = __default_morecore;
-
-#endif
-
-#define MORECORE (*__morecore)
-#define MORECORE_FAILURE 0
-
-#ifndef MORECORE_CLEARS
-#define MORECORE_CLEARS 1
-#endif
-
-static size_t __libc_pagesize;
-
-#define access	__access
-#define mmap    __mmap
-#define munmap  __munmap
-#define mremap  __mremap
-#define mprotect __mprotect
-#undef malloc_getpagesize
-#define malloc_getpagesize __libc_pagesize
-
-#else /* _LIBC */
-
-#if __STD_C
-extern Void_t*     sbrk(ptrdiff_t);
-#else
-extern Void_t*     sbrk();
-#endif
-
-#ifndef MORECORE
-#define MORECORE sbrk
-#endif
-
-#ifndef MORECORE_FAILURE
-#define MORECORE_FAILURE -1
-#endif
-
-#ifndef MORECORE_CLEARS
-#define MORECORE_CLEARS 1
-#endif
-
-#endif /* _LIBC */
-
-#ifdef _LIBC
-
-#define cALLOc          __libc_calloc
-#define fREe            __libc_free
-#define mALLOc          __libc_malloc
-#define mEMALIGn        __libc_memalign
-#define rEALLOc         __libc_realloc
-#define vALLOc          __libc_valloc
-#define pvALLOc         __libc_pvalloc
-#define mALLINFo        __libc_mallinfo
-#define mALLOPt         __libc_mallopt
-#define mALLOC_STATs    __malloc_stats
-#define mALLOC_USABLE_SIZe __malloc_usable_size
-#define mALLOC_TRIm     __malloc_trim
-#define mALLOC_GET_STATe __malloc_get_state
-#define mALLOC_SET_STATe __malloc_set_state
-
-#else
-
-#define cALLOc          calloc
-#define fREe            free
-#define mALLOc          malloc
-#define mEMALIGn        memalign
-#define rEALLOc         realloc
-#define vALLOc          valloc
-#define pvALLOc         pvalloc
-#define mALLINFo        mallinfo
-#define mALLOPt         mallopt
-#define mALLOC_STATs    malloc_stats
-#define mALLOC_USABLE_SIZe malloc_usable_size
-#define mALLOC_TRIm     malloc_trim
-#define mALLOC_GET_STATe malloc_get_state
-#define mALLOC_SET_STATe malloc_set_state
-
-#endif
-
-/* Public routines */
-
-#if __STD_C
-
-#ifndef _LIBC
-void    ptmalloc_init(void);
-#endif
-Void_t* mALLOc(size_t);
-void    fREe(Void_t*);
-Void_t* rEALLOc(Void_t*, size_t);
-Void_t* mEMALIGn(size_t, size_t);
-Void_t* vALLOc(size_t);
-Void_t* pvALLOc(size_t);
-Void_t* cALLOc(size_t, size_t);
-void    cfree(Void_t*);
-int     mALLOC_TRIm(size_t);
-size_t  mALLOC_USABLE_SIZe(Void_t*);
-void    mALLOC_STATs(void);
-int     mALLOPt(int, int);
-struct mallinfo mALLINFo(void);
-Void_t* mALLOC_GET_STATe(void);
-int     mALLOC_SET_STATe(Void_t*);
-
-#else /* !__STD_C */
-
-#ifndef _LIBC
-void    ptmalloc_init();
-#endif
-Void_t* mALLOc();
-void    fREe();
-Void_t* rEALLOc();
-Void_t* mEMALIGn();
-Void_t* vALLOc();
-Void_t* pvALLOc();
-Void_t* cALLOc();
-void    cfree();
-int     mALLOC_TRIm();
-size_t  mALLOC_USABLE_SIZe();
-void    mALLOC_STATs();
-int     mALLOPt();
-struct mallinfo mALLINFo();
-Void_t* mALLOC_GET_STATe();
-int     mALLOC_SET_STATe();
-
-#endif /* __STD_C */
-
-
-#ifdef __cplusplus
-} /* end of extern "C" */
-#endif
-
-#if !defined(NO_THREADS) && !HAVE_MMAP
-"Can't have threads support without mmap"
-#endif
-#if USE_ARENAS && !HAVE_MMAP
-"Can't have multiple arenas without mmap"
-#endif
-
-
-/*
-  Type declarations
-*/
-
-
-struct malloc_chunk
-{
-  INTERNAL_SIZE_T prev_size; /* Size of previous chunk (if free). */
-  INTERNAL_SIZE_T size;      /* Size in bytes, including overhead. */
-  struct malloc_chunk* fd;   /* double links -- used only if free. */
-  struct malloc_chunk* bk;
-};
-
-typedef struct malloc_chunk* mchunkptr;
-
-/*
-
-   malloc_chunk details:
-
-    (The following includes lightly edited explanations by Colin Plumb.)
-
-    Chunks of memory are maintained using a `boundary tag' method as
-    described in e.g., Knuth or Standish.  (See the paper by Paul
-    Wilson ftp://ftp.cs.utexas.edu/pub/garbage/allocsrv.ps for a
-    survey of such techniques.)  Sizes of free chunks are stored both
-    in the front of each chunk and at the end.  This makes
-    consolidating fragmented chunks into bigger chunks very fast.  The
-    size fields also hold bits representing whether chunks are free or
-    in use.
-
-    An allocated chunk looks like this:
-
-
-    chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Size of previous chunk, if allocated            | |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Size of chunk, in bytes                         |P|
-      mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             User data starts here...                          .
-            .                                                               .
-            .             (malloc_usable_space() bytes)                     .
-            .                                                               |
-nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Size of chunk                                     |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-    Where "chunk" is the front of the chunk for the purpose of most of
-    the malloc code, but "mem" is the pointer that is returned to the
-    user.  "Nextchunk" is the beginning of the next contiguous chunk.
-
-    Chunks always begin on even word boundaries, so the mem portion
-    (which is returned to the user) is also on an even word boundary, and
-    thus double-word aligned.
-
-    Free chunks are stored in circular doubly-linked lists, and look like this:
-
-    chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Size of previous chunk                            |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    `head:' |             Size of chunk, in bytes                         |P|
-      mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Forward pointer to next chunk in list             |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Back pointer to previous chunk in list            |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-            |             Unused space (may be 0 bytes long)                .
-            .                                                               .
-            .                                                               |
-nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    `foot:' |             Size of chunk, in bytes                           |
-            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-    The P (PREV_INUSE) bit, stored in the unused low-order bit of the
-    chunk size (which is always a multiple of two words), is an in-use
-    bit for the *previous* chunk.  If that bit is *clear*, then the
-    word before the current chunk size contains the previous chunk
-    size, and can be used to find the front of the previous chunk.
-    (The very first chunk allocated always has this bit set,
-    preventing access to non-existent (or non-owned) memory.)
-
-    Note that the `foot' of the current chunk is actually represented
-    as the prev_size of the NEXT chunk. (This makes it easier to
-    deal with alignments etc).
-
-    The two exceptions to all this are
-
-     1. The special chunk `top', which doesn't bother using the
-        trailing size field since there is no
-        next contiguous chunk that would have to index off it. (After
-        initialization, `top' is forced to always exist.  If it would
-        become less than MINSIZE bytes long, it is replenished via
-        malloc_extend_top.)
-
-     2. Chunks allocated via mmap, which have the second-lowest-order
-        bit (IS_MMAPPED) set in their size fields.  Because they are
-        never merged or traversed from any other chunk, they have no
-        foot size or inuse information.
-
-    Available chunks are kept in any of several places (all declared below):
-
-    * `av': An array of chunks serving as bin headers for consolidated
-       chunks. Each bin is doubly linked.  The bins are approximately
-       proportionally (log) spaced.  There are a lot of these bins
-       (128). This may look excessive, but works very well in
-       practice.  All procedures maintain the invariant that no
-       consolidated chunk physically borders another one. Chunks in
-       bins are kept in size order, with ties going to the
-       approximately least recently used chunk.
-
-       The chunks in each bin are maintained in decreasing sorted order by
-       size.  This is irrelevant for the small bins, which all contain
-       the same-sized chunks, but facilitates best-fit allocation for
-       larger chunks. (These lists are just sequential. Keeping them in
-       order almost never requires enough traversal to warrant using
-       fancier ordered data structures.)  Chunks of the same size are
-       linked with the most recently freed at the front, and allocations
-       are taken from the back.  This results in LRU or FIFO allocation
-       order, which tends to give each chunk an equal opportunity to be
-       consolidated with adjacent freed chunks, resulting in larger free
-       chunks and less fragmentation.
-
-    * `top': The top-most available chunk (i.e., the one bordering the
-       end of available memory) is treated specially. It is never
-       included in any bin, is used only if no other chunk is
-       available, and is released back to the system if it is very
-       large (see M_TRIM_THRESHOLD).
-
-    * `last_remainder': A bin holding only the remainder of the
-       most recently split (non-top) chunk. This bin is checked
-       before other non-fitting chunks, so as to provide better
-       locality for runs of sequentially allocated chunks.
-
-    *  Implicitly, through the host system's memory mapping tables.
-       If supported, requests greater than a threshold are usually
-       serviced via calls to mmap, and then later released via munmap.
-
-*/
-
-/*
-   Bins
-
-    The bins are an array of pairs of pointers serving as the
-    heads of (initially empty) doubly-linked lists of chunks, laid out
-    in a way so that each pair can be treated as if it were in a
-    malloc_chunk. (This way, the fd/bk offsets for linking bin heads
-    and chunks are the same).
-
-    Bins for sizes < 512 bytes contain chunks of all the same size, spaced
-    8 bytes apart. Larger bins are approximately logarithmically
-    spaced. (See the table below.)
-
-    Bin layout:
-
-    64 bins of size       8
-    32 bins of size      64
-    16 bins of size     512
-     8 bins of size    4096
-     4 bins of size   32768
-     2 bins of size  262144
-     1 bin  of size what's left
-
-    There is actually a little bit of slop in the numbers in bin_index
-    for the sake of speed. This makes no difference elsewhere.
-
-    The special chunks `top' and `last_remainder' get their own bins,
-    (this is implemented via yet more trickery with the av array),
-    although `top' is never properly linked to its bin since it is
-    always handled specially.
-
-*/
-
-#define NAV             128   /* number of bins */
-
-typedef struct malloc_chunk* mbinptr;
-
-/* An arena is a configuration of malloc_chunks together with an array
-   of bins.  With multiple threads, it must be locked via a mutex
-   before changing its data structures.  One or more `heaps' are
-   associated with each arena, except for the main_arena, which is
-   associated only with the `main heap', i.e.  the conventional free
-   store obtained with calls to MORECORE() (usually sbrk).  The `av'
-   array is never mentioned directly in the code, but instead used via
-   bin access macros. */
-
-typedef struct _arena {
-  mbinptr av[2*NAV + 2];
-  struct _arena *next;
-  size_t size;
-#if THREAD_STATS
-  long stat_lock_direct, stat_lock_loop, stat_lock_wait;
-#endif
-  mutex_t mutex;
-} arena;
-
-
-/* A heap is a single contiguous memory region holding (coalesceable)
-   malloc_chunks.  It is allocated with mmap() and always starts at an
-   address aligned to HEAP_MAX_SIZE.  Not used unless compiling with
-   USE_ARENAS. */
-
-typedef struct _heap_info {
-  arena *ar_ptr; /* Arena for this heap. */
-  struct _heap_info *prev; /* Previous heap. */
-  size_t size;   /* Current size in bytes. */
-  size_t pad;    /* Make sure the following data is properly aligned. */
-} heap_info;
-
-
-/*
-  Static functions (forward declarations)
-*/
-
-#if __STD_C
-
-static void      chunk_free(arena *ar_ptr, mchunkptr p) internal_function;
-static mchunkptr chunk_alloc(arena *ar_ptr, INTERNAL_SIZE_T size)
-     internal_function;
-static mchunkptr chunk_realloc(arena *ar_ptr, mchunkptr oldp,
-                               INTERNAL_SIZE_T oldsize, INTERNAL_SIZE_T nb)
-     internal_function;
-static mchunkptr chunk_align(arena *ar_ptr, INTERNAL_SIZE_T nb,
-                             size_t alignment) internal_function;
-static int       main_trim(size_t pad) internal_function;
-#if USE_ARENAS
-static int       heap_trim(heap_info *heap, size_t pad) internal_function;
-#endif
-#if defined _LIBC || defined MALLOC_HOOKS
-static Void_t*   malloc_check(size_t sz, const Void_t *caller);
-static void      free_check(Void_t* mem, const Void_t *caller);
-static Void_t*   realloc_check(Void_t* oldmem, size_t bytes,
-			       const Void_t *caller);
-static Void_t*   memalign_check(size_t alignment, size_t bytes,
-				const Void_t *caller);
-#ifndef NO_THREADS
-static Void_t*   malloc_starter(size_t sz, const Void_t *caller);
-static void      free_starter(Void_t* mem, const Void_t *caller);
-static Void_t*   malloc_atfork(size_t sz, const Void_t *caller);
-static void      free_atfork(Void_t* mem, const Void_t *caller);
-#endif
-#endif
-
-#else
-
-static void      chunk_free();
-static mchunkptr chunk_alloc();
-static mchunkptr chunk_realloc();
-static mchunkptr chunk_align();
-static int       main_trim();
-#if USE_ARENAS
-static int       heap_trim();
-#endif
-#if defined _LIBC || defined MALLOC_HOOKS
-static Void_t*   malloc_check();
-static void      free_check();
-static Void_t*   realloc_check();
-static Void_t*   memalign_check();
-#ifndef NO_THREADS
-static Void_t*   malloc_starter();
-static void      free_starter();
-static Void_t*   malloc_atfork();
-static void      free_atfork();
-#endif
-#endif
-
-#endif
-
-
-
-/* sizes, alignments */
-
-#define SIZE_SZ                (sizeof(INTERNAL_SIZE_T))
-/* Allow the default to be overwritten on the compiler command line.  */
-#ifndef MALLOC_ALIGNMENT
-# define MALLOC_ALIGNMENT      (SIZE_SZ + SIZE_SZ)
-#endif
-#define MALLOC_ALIGN_MASK      (MALLOC_ALIGNMENT - 1)
-#define MINSIZE                (sizeof(struct malloc_chunk))
-
-/* conversion from malloc headers to user pointers, and back */
-
-#define chunk2mem(p) ((Void_t*)((char*)(p) + 2*SIZE_SZ))
-#define mem2chunk(mem) chunk_at_offset((mem), -2*SIZE_SZ)
-
-/* pad request bytes into a usable size, return non-zero on overflow */
-
-#define request2size(req, nb) \
- ((nb = (req) + (SIZE_SZ + MALLOC_ALIGN_MASK)),\
-  ((long)nb <= 0 || nb < (INTERNAL_SIZE_T) (req) \
-   ? (__set_errno (ENOMEM), 1) \
-   : ((nb < (MINSIZE + MALLOC_ALIGN_MASK) \
-	   ? (nb = MINSIZE) : (nb &= ~MALLOC_ALIGN_MASK)), 0)))
-
-/* Check if m has acceptable alignment */
-
-#define aligned_OK(m)    (((unsigned long)((m)) & (MALLOC_ALIGN_MASK)) == 0)
-
-
-
-
-/*
-  Physical chunk operations
-*/
-
-
-/* size field is or'ed with PREV_INUSE when previous adjacent chunk in use */
-
-#define PREV_INUSE 0x1UL
-
-/* size field is or'ed with IS_MMAPPED if the chunk was obtained with mmap() */
-
-#define IS_MMAPPED 0x2UL
-
-/* Bits to mask off when extracting size */
-
-#define SIZE_BITS (PREV_INUSE|IS_MMAPPED)
-
-
-/* Ptr to next physical malloc_chunk. */
-
-#define next_chunk(p) chunk_at_offset((p), (p)->size & ~PREV_INUSE)
-
-/* Ptr to previous physical malloc_chunk */
-
-#define prev_chunk(p) chunk_at_offset((p), -(p)->prev_size)
-
-
-/* Treat space at ptr + offset as a chunk */
-
-#define chunk_at_offset(p, s)  BOUNDED_1((mchunkptr)(((char*)(p)) + (s)))
-
-
-
-
-/*
-  Dealing with use bits
-*/
-
-/* extract p's inuse bit */
-
-#define inuse(p) (next_chunk(p)->size & PREV_INUSE)
-
-/* extract inuse bit of previous chunk */
-
-#define prev_inuse(p)  ((p)->size & PREV_INUSE)
-
-/* check for mmap()'ed chunk */
-
-#define chunk_is_mmapped(p) ((p)->size & IS_MMAPPED)
-
-/* set/clear chunk as in use without otherwise disturbing */
-
-#define set_inuse(p) (next_chunk(p)->size |= PREV_INUSE)
-
-#define clear_inuse(p) (next_chunk(p)->size &= ~PREV_INUSE)
-
-/* check/set/clear inuse bits in known places */
-
-#define inuse_bit_at_offset(p, s) \
-  (chunk_at_offset((p), (s))->size & PREV_INUSE)
-
-#define set_inuse_bit_at_offset(p, s) \
-  (chunk_at_offset((p), (s))->size |= PREV_INUSE)
-
-#define clear_inuse_bit_at_offset(p, s) \
-  (chunk_at_offset((p), (s))->size &= ~(PREV_INUSE))
-
-
-
-
-/*
-  Dealing with size fields
-*/
-
-/* Get size, ignoring use bits */
-
-#define chunksize(p)          ((p)->size & ~(SIZE_BITS))
-
-/* Set size at head, without disturbing its use bit */
-
-#define set_head_size(p, s)   ((p)->size = (((p)->size & PREV_INUSE) | (s)))
-
-/* Set size/use ignoring previous bits in header */
-
-#define set_head(p, s)        ((p)->size = (s))
-
-/* Set size at footer (only when chunk is not in use) */
-
-#define set_foot(p, s)   (chunk_at_offset(p, s)->prev_size = (s))
-
-
-
-
-
-/* access macros */
-
-#define bin_at(a, i)   BOUNDED_1(_bin_at(a, i))
-#define _bin_at(a, i)  ((mbinptr)((char*)&(((a)->av)[2*(i)+2]) - 2*SIZE_SZ))
-#define init_bin(a, i) ((a)->av[2*(i)+2] = (a)->av[2*(i)+3] = bin_at((a), (i)))
-#define next_bin(b)    ((mbinptr)((char*)(b) + 2 * sizeof(((arena*)0)->av[0])))
-#define prev_bin(b)    ((mbinptr)((char*)(b) - 2 * sizeof(((arena*)0)->av[0])))
-
-/*
-   The first 2 bins are never indexed. The corresponding av cells are instead
-   used for bookkeeping. This is not to save space, but to simplify
-   indexing, maintain locality, and avoid some initialization tests.
-*/
-
-#define binblocks(a)      (bin_at(a,0)->size)/* bitvector of nonempty blocks */
-#define top(a)            (bin_at(a,0)->fd)  /* The topmost chunk */
-#define last_remainder(a) (bin_at(a,1))      /* remainder from last split */
-
-/*
-   Because top initially points to its own bin with initial
-   zero size, thus forcing extension on the first malloc request,
-   we avoid having any special code in malloc to check whether
-   it even exists yet. But we still need to in malloc_extend_top.
-*/
-
-#define initial_top(a)    ((mchunkptr)bin_at(a, 0))
-
-
-
-/* field-extraction macros */
-
-#define first(b) ((b)->fd)
-#define last(b)  ((b)->bk)
-
-/*
-  Indexing into bins
-*/
-
-#define bin_index(sz)                                                         \
-(((((unsigned long)(sz)) >> 9) ==    0) ?       (((unsigned long)(sz)) >>  3):\
- ((((unsigned long)(sz)) >> 9) <=    4) ?  56 + (((unsigned long)(sz)) >>  6):\
- ((((unsigned long)(sz)) >> 9) <=   20) ?  91 + (((unsigned long)(sz)) >>  9):\
- ((((unsigned long)(sz)) >> 9) <=   84) ? 110 + (((unsigned long)(sz)) >> 12):\
- ((((unsigned long)(sz)) >> 9) <=  340) ? 119 + (((unsigned long)(sz)) >> 15):\
- ((((unsigned long)(sz)) >> 9) <= 1364) ? 124 + (((unsigned long)(sz)) >> 18):\
-                                          126)
-/*
-  bins for chunks < 512 are all spaced 8 bytes apart, and hold
-  identically sized chunks. This is exploited in malloc.
-*/
-
-#define MAX_SMALLBIN         63
-#define MAX_SMALLBIN_SIZE   512
-#define SMALLBIN_WIDTH        8
-
-#define smallbin_index(sz)  (((unsigned long)(sz)) >> 3)
-
-/*
-   Requests are `small' if both the corresponding and the next bin are small
-*/
-
-#define is_small_request(nb) ((nb) < MAX_SMALLBIN_SIZE - SMALLBIN_WIDTH)
-
-
-
-/*
-    To help compensate for the large number of bins, a one-level index
-    structure is used for bin-by-bin searching.  `binblocks' is a
-    one-word bitvector recording whether groups of BINBLOCKWIDTH bins
-    have any (possibly) non-empty bins, so they can be skipped over
-    all at once during during traversals. The bits are NOT always
-    cleared as soon as all bins in a block are empty, but instead only
-    when all are noticed to be empty during traversal in malloc.
-*/
-
-#define BINBLOCKWIDTH     4   /* bins per block */
-
-/* bin<->block macros */
-
-#define idx2binblock(ix)      ((unsigned)1 << ((ix) / BINBLOCKWIDTH))
-#define mark_binblock(a, ii)  (binblocks(a) |= idx2binblock(ii))
-#define clear_binblock(a, ii) (binblocks(a) &= ~(idx2binblock(ii)))
-
-
-
-
-/* Static bookkeeping data */
-
-/* Helper macro to initialize bins */
-#define IAV(i) _bin_at(&main_arena, i), _bin_at(&main_arena, i)
-
-static arena main_arena = {
-    {
- 0, 0,
- IAV(0),   IAV(1),   IAV(2),   IAV(3),   IAV(4),   IAV(5),   IAV(6),   IAV(7),
- IAV(8),   IAV(9),   IAV(10),  IAV(11),  IAV(12),  IAV(13),  IAV(14),  IAV(15),
- IAV(16),  IAV(17),  IAV(18),  IAV(19),  IAV(20),  IAV(21),  IAV(22),  IAV(23),
- IAV(24),  IAV(25),  IAV(26),  IAV(27),  IAV(28),  IAV(29),  IAV(30),  IAV(31),
- IAV(32),  IAV(33),  IAV(34),  IAV(35),  IAV(36),  IAV(37),  IAV(38),  IAV(39),
- IAV(40),  IAV(41),  IAV(42),  IAV(43),  IAV(44),  IAV(45),  IAV(46),  IAV(47),
- IAV(48),  IAV(49),  IAV(50),  IAV(51),  IAV(52),  IAV(53),  IAV(54),  IAV(55),
- IAV(56),  IAV(57),  IAV(58),  IAV(59),  IAV(60),  IAV(61),  IAV(62),  IAV(63),
- IAV(64),  IAV(65),  IAV(66),  IAV(67),  IAV(68),  IAV(69),  IAV(70),  IAV(71),
- IAV(72),  IAV(73),  IAV(74),  IAV(75),  IAV(76),  IAV(77),  IAV(78),  IAV(79),
- IAV(80),  IAV(81),  IAV(82),  IAV(83),  IAV(84),  IAV(85),  IAV(86),  IAV(87),
- IAV(88),  IAV(89),  IAV(90),  IAV(91),  IAV(92),  IAV(93),  IAV(94),  IAV(95),
- IAV(96),  IAV(97),  IAV(98),  IAV(99),  IAV(100), IAV(101), IAV(102), IAV(103),
- IAV(104), IAV(105), IAV(106), IAV(107), IAV(108), IAV(109), IAV(110), IAV(111),
- IAV(112), IAV(113), IAV(114), IAV(115), IAV(116), IAV(117), IAV(118), IAV(119),
- IAV(120), IAV(121), IAV(122), IAV(123), IAV(124), IAV(125), IAV(126), IAV(127)
-    },
-    &main_arena, /* next */
-    0, /* size */
-#if THREAD_STATS
-    0, 0, 0, /* stat_lock_direct, stat_lock_loop, stat_lock_wait */
-#endif
-    MUTEX_INITIALIZER /* mutex */
-};
-
-#undef IAV
-
-/* Thread specific data */
-
-static tsd_key_t arena_key;
-static mutex_t list_lock = MUTEX_INITIALIZER;
-
-#if THREAD_STATS
-static int stat_n_heaps;
-#define THREAD_STAT(x) x
-#else
-#define THREAD_STAT(x) do ; while(0)
-#endif
-
-/* variables holding tunable values */
-
-static unsigned long trim_threshold   = DEFAULT_TRIM_THRESHOLD;
-static unsigned long top_pad          = DEFAULT_TOP_PAD;
-static unsigned int  n_mmaps_max      = DEFAULT_MMAP_MAX;
-static unsigned long mmap_threshold   = DEFAULT_MMAP_THRESHOLD;
-static int           check_action     = DEFAULT_CHECK_ACTION;
-
-/* The first value returned from sbrk */
-static char* sbrk_base = (char*)(-1);
-
-/* The maximum memory obtained from system via sbrk */
-static unsigned long max_sbrked_mem;
-
-/* The maximum via either sbrk or mmap (too difficult to track with threads) */
-#ifdef NO_THREADS
-static unsigned long max_total_mem;
-#endif
-
-/* The total memory obtained from system via sbrk */
-#define sbrked_mem (main_arena.size)
-
-/* Tracking mmaps */
-
-static unsigned int n_mmaps;
-static unsigned int max_n_mmaps;
-static unsigned long mmapped_mem;
-static unsigned long max_mmapped_mem;
-
-/* Mapped memory in non-main arenas (reliable only for NO_THREADS). */
-static unsigned long arena_mem;
-
-
-
-#ifndef _LIBC
-#define weak_variable
-#else
-/* In GNU libc we want the hook variables to be weak definitions to
-   avoid a problem with Emacs.  */
-#define weak_variable weak_function
-#endif
-
-/* Already initialized? */
-int __malloc_initialized = -1;
-
-
-#ifndef NO_THREADS
-
-/* Magic value for the thread-specific arena pointer when
-   malloc_atfork() is in use.  */
-
-#define ATFORK_ARENA_PTR ((Void_t*)-1)
-
-/* The following two functions are registered via thread_atfork() to
-   make sure that the mutexes remain in a consistent state in the
-   fork()ed version of a thread.  Also adapt the malloc and free hooks
-   temporarily, because the `atfork' handler mechanism may use
-   malloc/free internally (e.g. in LinuxThreads). */
-
-#if defined _LIBC || defined MALLOC_HOOKS
-static __malloc_ptr_t (*save_malloc_hook) __MALLOC_P ((size_t __size,
-						       const __malloc_ptr_t));
-static void           (*save_free_hook) __MALLOC_P ((__malloc_ptr_t __ptr,
-						     const __malloc_ptr_t));
-static Void_t*        save_arena;
-#endif
-
-static void
-ptmalloc_lock_all __MALLOC_P((void))
-{
-  arena *ar_ptr;
-
-  (void)mutex_lock(&list_lock);
-  for(ar_ptr = &main_arena;;) {
-    (void)mutex_lock(&ar_ptr->mutex);
-    ar_ptr = ar_ptr->next;
-    if(ar_ptr == &main_arena) break;
-  }
-#if defined _LIBC || defined MALLOC_HOOKS
-  save_malloc_hook = __malloc_hook;
-  save_free_hook = __free_hook;
-  __malloc_hook = malloc_atfork;
-  __free_hook = free_atfork;
-  /* Only the current thread may perform malloc/free calls now. */
-  tsd_getspecific(arena_key, save_arena);
-  tsd_setspecific(arena_key, ATFORK_ARENA_PTR);
-#endif
-}
-
-static void
-ptmalloc_unlock_all __MALLOC_P((void))
-{
-  arena *ar_ptr;
-
-#if defined _LIBC || defined MALLOC_HOOKS
-  tsd_setspecific(arena_key, save_arena);
-  __malloc_hook = save_malloc_hook;
-  __free_hook = save_free_hook;
-#endif
-  for(ar_ptr = &main_arena;;) {
-    (void)mutex_unlock(&ar_ptr->mutex);
-    ar_ptr = ar_ptr->next;
-    if(ar_ptr == &main_arena) break;
-  }
-  (void)mutex_unlock(&list_lock);
-}
-
-static void
-ptmalloc_init_all __MALLOC_P((void))
-{
-  arena *ar_ptr;
-
-#if defined _LIBC || defined MALLOC_HOOKS
-  tsd_setspecific(arena_key, save_arena);
-  __malloc_hook = save_malloc_hook;
-  __free_hook = save_free_hook;
-#endif
-  for(ar_ptr = &main_arena;;) {
-    (void)mutex_init(&ar_ptr->mutex);
-    ar_ptr = ar_ptr->next;
-    if(ar_ptr == &main_arena) break;
-  }
-  (void)mutex_init(&list_lock);
-}
-
-#endif /* !defined NO_THREADS */
-
-/* Initialization routine. */
-#if defined(_LIBC)
-#if 0
-static void ptmalloc_init __MALLOC_P ((void)) __attribute__ ((constructor));
-#endif
-
-#ifdef _LIBC
-#include <string.h>
-extern char **environ;
-
-static char *
-internal_function
-next_env_entry (char ***position)
-{
-  char **current = *position;
-  char *result = NULL;
-
-  while (*current != NULL)
-    {
-      if (__builtin_expect ((*current)[0] == 'M', 0)
-	  && (*current)[1] == 'A'
-	  && (*current)[2] == 'L'
-	  && (*current)[3] == 'L'
-	  && (*current)[4] == 'O'
-	  && (*current)[5] == 'C'
-	  && (*current)[6] == '_')
-	{
-	  result = &(*current)[7];
-
-	  /* Save current position for next visit.  */
-	  *position = ++current;
-
-	  break;
-	}
-
-      ++current;
-    }
-
-  return result;
-}
-#endif
-
-static void
-ptmalloc_init __MALLOC_P((void))
-#else
-void
-ptmalloc_init __MALLOC_P((void))
-#endif
-{
-#if defined _LIBC || defined MALLOC_HOOKS
-# if __STD_C
-  const char* s;
-# else
-  char* s;
-# endif
-#endif
-  int secure;
-
-  if(__malloc_initialized >= 0) return;
-  __malloc_initialized = 0;
-#ifdef _LIBC
-  __libc_pagesize = __getpagesize();
-#endif
-#ifndef NO_THREADS
-#if defined _LIBC || defined MALLOC_HOOKS
-  /* With some threads implementations, creating thread-specific data
-     or initializing a mutex may call malloc() itself.  Provide a
-     simple starter version (realloc() won't work). */
-  save_malloc_hook = __malloc_hook;
-  save_free_hook = __free_hook;
-  __malloc_hook = malloc_starter;
-  __free_hook = free_starter;
-#endif
-#ifdef _LIBC
-  /* Initialize the pthreads interface. */
-  if (__pthread_initialize != NULL)
-    __pthread_initialize();
-#endif
-#endif /* !defined NO_THREADS */
-  mutex_init(&main_arena.mutex);
-  mutex_init(&list_lock);
-  tsd_key_create(&arena_key, NULL);
-  tsd_setspecific(arena_key, (Void_t *)&main_arena);
-  thread_atfork(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_init_all);
-#if defined _LIBC || defined MALLOC_HOOKS
-#ifndef NO_THREADS
-  __malloc_hook = save_malloc_hook;
-  __free_hook = save_free_hook;
-#endif
-  secure = __libc_enable_secure;
-#ifdef _LIBC
-  s = NULL;
-  if (environ != NULL)
-    {
-      char **runp = environ;
-      char *envline;
-
-      while (__builtin_expect ((envline = next_env_entry (&runp)) != NULL, 0))
-	{
-	  size_t len = strcspn (envline, "=");
-
-	  if (envline[len] != '=')
-	    /* This is a "MALLOC_" variable at the end of the string
-	       without a '=' character.  Ignore it since otherwise we
-	       will access invalid memory below.  */
-	    continue;
-
-	  switch (len)
-	    {
-	    case 6:
-	      if (memcmp (envline, "CHECK_", 6) == 0)
-		s = &envline[7];
-	      break;
-	    case 8:
-	      if (! secure && memcmp (envline, "TOP_PAD_", 8) == 0)
-		mALLOPt(M_TOP_PAD, atoi(&envline[9]));
-	      break;
-	    case 9:
-	      if (! secure && memcmp (envline, "MMAP_MAX_", 9) == 0)
-		mALLOPt(M_MMAP_MAX, atoi(&envline[10]));
-	      break;
-	    case 15:
-	      if (! secure)
-		{
-		  if (memcmp (envline, "TRIM_THRESHOLD_", 15) == 0)
-		    mALLOPt(M_TRIM_THRESHOLD, atoi(&envline[16]));
-		  else if (memcmp (envline, "MMAP_THRESHOLD_", 15) == 0)
-		    mALLOPt(M_MMAP_THRESHOLD, atoi(&envline[16]));
-		}
-	      break;
-	    default:
-	      break;
-	    }
-	}
-    }
-#else
-  if (! secure)
-    {
-      if((s = getenv("MALLOC_TRIM_THRESHOLD_")))
-	mALLOPt(M_TRIM_THRESHOLD, atoi(s));
-      if((s = getenv("MALLOC_TOP_PAD_")))
-	mALLOPt(M_TOP_PAD, atoi(s));
-      if((s = getenv("MALLOC_MMAP_THRESHOLD_")))
-	mALLOPt(M_MMAP_THRESHOLD, atoi(s));
-      if((s = getenv("MALLOC_MMAP_MAX_")))
-	mALLOPt(M_MMAP_MAX, atoi(s));
-    }
-  s = getenv("MALLOC_CHECK_");
-#endif
-  if(s) {
-    if(s[0]) mALLOPt(M_CHECK_ACTION, (int)(s[0] - '0'));
-    __malloc_check_init();
-  }
-  if(__malloc_initialize_hook != NULL)
-    (*__malloc_initialize_hook)();
-#endif
-  __malloc_initialized = 1;
-}
-
-/* There are platforms (e.g. Hurd) with a link-time hook mechanism. */
-#ifdef thread_atfork_static
-thread_atfork_static(ptmalloc_lock_all, ptmalloc_unlock_all, \
-                     ptmalloc_init_all)
-#endif
-
-#if defined _LIBC || defined MALLOC_HOOKS
-
-/* Hooks for debugging versions.  The initial hooks just call the
-   initialization routine, then do the normal work. */
-
-static Void_t*
-#if __STD_C
-malloc_hook_ini(size_t sz, const __malloc_ptr_t caller)
-#else
-malloc_hook_ini(sz, caller)
-     size_t sz; const __malloc_ptr_t caller;
-#endif
-{
-  __malloc_hook = NULL;
-  ptmalloc_init();
-  return mALLOc(sz);
-}
-
-static Void_t*
-#if __STD_C
-realloc_hook_ini(Void_t* ptr, size_t sz, const __malloc_ptr_t caller)
-#else
-realloc_hook_ini(ptr, sz, caller)
-     Void_t* ptr; size_t sz; const __malloc_ptr_t caller;
-#endif
-{
-  __malloc_hook = NULL;
-  __realloc_hook = NULL;
-  ptmalloc_init();
-  return rEALLOc(ptr, sz);
-}
-
-static Void_t*
-#if __STD_C
-memalign_hook_ini(size_t alignment, size_t sz, const __malloc_ptr_t caller)
-#else
-memalign_hook_ini(alignment, sz, caller)
-     size_t alignment; size_t sz; const __malloc_ptr_t caller;
-#endif
-{
-  __memalign_hook = NULL;
-  ptmalloc_init();
-  return mEMALIGn(alignment, sz);
-}
-
-void weak_variable (*__malloc_initialize_hook) __MALLOC_P ((void)) = NULL;
-void weak_variable (*__free_hook) __MALLOC_P ((__malloc_ptr_t __ptr,
-					       const __malloc_ptr_t)) = NULL;
-__malloc_ptr_t weak_variable (*__malloc_hook)
- __MALLOC_P ((size_t __size, const __malloc_ptr_t)) = malloc_hook_ini;
-__malloc_ptr_t weak_variable (*__realloc_hook)
- __MALLOC_P ((__malloc_ptr_t __ptr, size_t __size, const __malloc_ptr_t))
-     = realloc_hook_ini;
-__malloc_ptr_t weak_variable (*__memalign_hook)
- __MALLOC_P ((size_t __alignment, size_t __size, const __malloc_ptr_t))
-     = memalign_hook_ini;
-void weak_variable (*__after_morecore_hook) __MALLOC_P ((void)) = NULL;
-
-/* Whether we are using malloc checking.  */
-static int using_malloc_checking;
-
-/* A flag that is set by malloc_set_state, to signal that malloc checking
-   must not be enabled on the request from the user (via the MALLOC_CHECK_
-   environment variable).  It is reset by __malloc_check_init to tell
-   malloc_set_state that the user has requested malloc checking.
-
-   The purpose of this flag is to make sure that malloc checking is not
-   enabled when the heap to be restored was constructed without malloc
-   checking, and thus does not contain the required magic bytes.
-   Otherwise the heap would be corrupted by calls to free and realloc.  If
-   it turns out that the heap was created with malloc checking and the
-   user has requested it malloc_set_state just calls __malloc_check_init
-   again to enable it.  On the other hand, reusing such a heap without
-   further malloc checking is safe.  */
-static int disallow_malloc_check;
-
-/* Activate a standard set of debugging hooks. */
-void
-__malloc_check_init()
-{
-  if (disallow_malloc_check) {
-    disallow_malloc_check = 0;
-    return;
-  }
-  using_malloc_checking = 1;
-  __malloc_hook = malloc_check;
-  __free_hook = free_check;
-  __realloc_hook = realloc_check;
-  __memalign_hook = memalign_check;
-  if(check_action & 1)
-    fprintf(stderr, "malloc: using debugging hooks\n");
-}
-
-#endif
-
-
-
-
-
-/* Routines dealing with mmap(). */
-
-#if HAVE_MMAP
-
-#ifndef MAP_ANONYMOUS
-
-static int dev_zero_fd = -1; /* Cached file descriptor for /dev/zero. */
-
-#define MMAP(addr, size, prot, flags) ((dev_zero_fd < 0) ? \
- (dev_zero_fd = open("/dev/zero", O_RDWR), \
-  mmap((addr), (size), (prot), (flags), dev_zero_fd, 0)) : \
-   mmap((addr), (size), (prot), (flags), dev_zero_fd, 0))
-
-#else
-
-#define MMAP(addr, size, prot, flags) \
- (mmap((addr), (size), (prot), (flags)|MAP_ANONYMOUS, -1, 0))
-
-#endif
-
-#if defined __GNUC__ && __GNUC__ >= 2
-/* This function is only called from one place, inline it.  */
-__inline__
-#endif
-static mchunkptr
-internal_function
-#if __STD_C
-mmap_chunk(size_t size)
-#else
-mmap_chunk(size) size_t size;
-#endif
-{
-  size_t page_mask = malloc_getpagesize - 1;
-  mchunkptr p;
-
-  /* For mmapped chunks, the overhead is one SIZE_SZ unit larger, because
-   * there is no following chunk whose prev_size field could be used.
-   */
-  size = (size + SIZE_SZ + page_mask) & ~page_mask;
-
-  p = (mchunkptr)MMAP(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE);
-  if(p == (mchunkptr) MAP_FAILED) return 0;
-
-  n_mmaps++;
-  if (n_mmaps > max_n_mmaps) max_n_mmaps = n_mmaps;
-
-  /* We demand that eight bytes into a page must be 8-byte aligned. */
-  assert(aligned_OK(chunk2mem(p)));
-
-  /* The offset to the start of the mmapped region is stored
-   * in the prev_size field of the chunk; normally it is zero,
-   * but that can be changed in memalign().
-   */
-  p->prev_size = 0;
-  set_head(p, size|IS_MMAPPED);
-
-  mmapped_mem += size;
-  if ((unsigned long)mmapped_mem > (unsigned long)max_mmapped_mem)
-    max_mmapped_mem = mmapped_mem;
-#ifdef NO_THREADS
-  if ((unsigned long)(mmapped_mem + arena_mem + sbrked_mem) > max_total_mem)
-    max_total_mem = mmapped_mem + arena_mem + sbrked_mem;
-#endif
-  return p;
-}
-
-static void
-internal_function
-#if __STD_C
-munmap_chunk(mchunkptr p)
-#else
-munmap_chunk(p) mchunkptr p;
-#endif
-{
-  INTERNAL_SIZE_T size = chunksize(p);
-  int ret;
-
-  assert (chunk_is_mmapped(p));
-  assert(! ((char*)p >= sbrk_base && (char*)p < sbrk_base + sbrked_mem));
-  assert((n_mmaps > 0));
-  assert(((p->prev_size + size) & (malloc_getpagesize-1)) == 0);
-
-  n_mmaps--;
-  mmapped_mem -= (size + p->prev_size);
-
-  ret = munmap((char *)p - p->prev_size, size + p->prev_size);
-
-  /* munmap returns non-zero on failure */
-  assert(ret == 0);
-}
-
-#if HAVE_MREMAP
-
-static mchunkptr
-internal_function
-#if __STD_C
-mremap_chunk(mchunkptr p, size_t new_size)
-#else
-mremap_chunk(p, new_size) mchunkptr p; size_t new_size;
-#endif
-{
-  size_t page_mask = malloc_getpagesize - 1;
-  INTERNAL_SIZE_T offset = p->prev_size;
-  INTERNAL_SIZE_T size = chunksize(p);
-  char *cp;
-
-  assert (chunk_is_mmapped(p));
-  assert(! ((char*)p >= sbrk_base && (char*)p < sbrk_base + sbrked_mem));
-  assert((n_mmaps > 0));
-  assert(((size + offset) & (malloc_getpagesize-1)) == 0);
-
-  /* Note the extra SIZE_SZ overhead as in mmap_chunk(). */
-  new_size = (new_size + offset + SIZE_SZ + page_mask) & ~page_mask;
-
-  cp = (char *)mremap((char *)p - offset, size + offset, new_size,
-                      MREMAP_MAYMOVE);
-
-  if (cp == MAP_FAILED) return 0;
-
-  p = (mchunkptr)(cp + offset);
-
-  assert(aligned_OK(chunk2mem(p)));
-
-  assert((p->prev_size == offset));
-  set_head(p, (new_size - offset)|IS_MMAPPED);
-
-  mmapped_mem -= size + offset;
-  mmapped_mem += new_size;
-  if ((unsigned long)mmapped_mem > (unsigned long)max_mmapped_mem)
-    max_mmapped_mem = mmapped_mem;
-#ifdef NO_THREADS
-  if ((unsigned long)(mmapped_mem + arena_mem + sbrked_mem) > max_total_mem)
-    max_total_mem = mmapped_mem + arena_mem + sbrked_mem;
-#endif
-  return p;
-}
-
-#endif /* HAVE_MREMAP */
-
-#endif /* HAVE_MMAP */
-
-
-
-/* Managing heaps and arenas (for concurrent threads) */
-
-#if USE_ARENAS
-
-/* Create a new heap.  size is automatically rounded up to a multiple
-   of the page size. */
-
-static heap_info *
-internal_function
-#if __STD_C
-new_heap(size_t size)
-#else
-new_heap(size) size_t size;
-#endif
-{
-  size_t page_mask = malloc_getpagesize - 1;
-  char *p1, *p2;
-  unsigned long ul;
-  heap_info *h;
-
-  if(size+top_pad < HEAP_MIN_SIZE)
-    size = HEAP_MIN_SIZE;
-  else if(size+top_pad <= HEAP_MAX_SIZE)
-    size += top_pad;
-  else if(size > HEAP_MAX_SIZE)
-    return 0;
-  else
-    size = HEAP_MAX_SIZE;
-  size = (size + page_mask) & ~page_mask;
-
-  /* A memory region aligned to a multiple of HEAP_MAX_SIZE is needed.
-     No swap space needs to be reserved for the following large
-     mapping (on Linux, this is the case for all non-writable mappings
-     anyway). */
-  p1 = (char *)MMAP(0, HEAP_MAX_SIZE<<1, PROT_NONE, MAP_PRIVATE|MAP_NORESERVE);
-  if(p1 != MAP_FAILED) {
-    p2 = (char *)(((unsigned long)p1 + (HEAP_MAX_SIZE-1)) & ~(HEAP_MAX_SIZE-1));
-    ul = p2 - p1;
-    if (ul)
-      munmap(p1, ul);
-    munmap(p2 + HEAP_MAX_SIZE, HEAP_MAX_SIZE - ul);
-  } else {
-    /* Try to take the chance that an allocation of only HEAP_MAX_SIZE
-       is already aligned. */
-    p2 = (char *)MMAP(0, HEAP_MAX_SIZE, PROT_NONE, MAP_PRIVATE|MAP_NORESERVE);
-    if(p2 == MAP_FAILED)
-      return 0;
-    if((unsigned long)p2 & (HEAP_MAX_SIZE-1)) {
-      munmap(p2, HEAP_MAX_SIZE);
-      return 0;
-    }
-  }
-  if(MMAP(p2, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED)
-     == (char *) MAP_FAILED) {
-    munmap(p2, HEAP_MAX_SIZE);
-    return 0;
-  }
-  h = (heap_info *)p2;
-  h->size = size;
-  THREAD_STAT(stat_n_heaps++);
-  return h;
-}
-
-/* Grow or shrink a heap.  size is automatically rounded up to a
-   multiple of the page size if it is positive. */
-
-static int
-#if __STD_C
-grow_heap(heap_info *h, long diff)
-#else
-grow_heap(h, diff) heap_info *h; long diff;
-#endif
-{
-  size_t page_mask = malloc_getpagesize - 1;
-  long new_size;
-
-  if(diff >= 0) {
-    diff = (diff + page_mask) & ~page_mask;
-    new_size = (long)h->size + diff;
-    if(new_size > HEAP_MAX_SIZE)
-      return -1;
-    if(MMAP((char *)h + h->size, diff, PROT_READ|PROT_WRITE,
-	    MAP_PRIVATE|MAP_FIXED) == (char *) MAP_FAILED)
-      return -2;
-  } else {
-    new_size = (long)h->size + diff;
-    if(new_size < (long)sizeof(*h))
-      return -1;
-    /* Try to re-map the extra heap space freshly to save memory, and
-       make it inaccessible. */
-    if((char *)MMAP((char *)h + new_size, -diff, PROT_NONE,
-                    MAP_PRIVATE|MAP_FIXED) == (char *) MAP_FAILED)
-      return -2;
-  }
-  h->size = new_size;
-  return 0;
-}
-
-/* Delete a heap. */
-
-#define delete_heap(heap) munmap((char*)(heap), HEAP_MAX_SIZE)
-
-/* arena_get() acquires an arena and locks the corresponding mutex.
-   First, try the one last locked successfully by this thread.  (This
-   is the common case and handled with a macro for speed.)  Then, loop
-   once over the circularly linked list of arenas.  If no arena is
-   readily available, create a new one.  In this latter case, `size'
-   is just a hint as to how much memory will be required immediately
-   in the new arena. */
-
-#define arena_get(ptr, size) do { \
-  Void_t *vptr = NULL; \
-  ptr = (arena *)tsd_getspecific(arena_key, vptr); \
-  if(ptr && !mutex_trylock(&ptr->mutex)) { \
-    THREAD_STAT(++(ptr->stat_lock_direct)); \
-  } else \
-    ptr = arena_get2(ptr, (size)); \
-} while(0)
-
-static arena *
-internal_function
-#if __STD_C
-arena_get2(arena *a_tsd, size_t size)
-#else
-arena_get2(a_tsd, size) arena *a_tsd; size_t size;
-#endif
-{
-  arena *a;
-  heap_info *h;
-  char *ptr;
-  int i;
-  unsigned long misalign;
-
-  if(!a_tsd)
-    a = a_tsd = &main_arena;
-  else {
-    a = a_tsd->next;
-    if(!a) {
-      /* This can only happen while initializing the new arena. */
-      (void)mutex_lock(&main_arena.mutex);
-      THREAD_STAT(++(main_arena.stat_lock_wait));
-      return &main_arena;
-    }
-  }
-
-  /* Check the global, circularly linked list for available arenas. */
- repeat:
-  do {
-    if(!mutex_trylock(&a->mutex)) {
-      THREAD_STAT(++(a->stat_lock_loop));
-      tsd_setspecific(arena_key, (Void_t *)a);
-      return a;
-    }
-    a = a->next;
-  } while(a != a_tsd);
-
-  /* If not even the list_lock can be obtained, try again.  This can
-     happen during `atfork', or for example on systems where thread
-     creation makes it temporarily impossible to obtain _any_
-     locks. */
-  if(mutex_trylock(&list_lock)) {
-    a = a_tsd;
-    goto repeat;
-  }
-  (void)mutex_unlock(&list_lock);
-
-  /* Nothing immediately available, so generate a new arena. */
-  h = new_heap(size + (sizeof(*h) + sizeof(*a) + MALLOC_ALIGNMENT));
-  if(!h) {
-    /* Maybe size is too large to fit in a single heap.  So, just try
-       to create a minimally-sized arena and let chunk_alloc() attempt
-       to deal with the large request via mmap_chunk(). */
-    h = new_heap(sizeof(*h) + sizeof(*a) + MALLOC_ALIGNMENT);
-    if(!h)
-      return 0;
-  }
-  a = h->ar_ptr = (arena *)(h+1);
-  for(i=0; i<NAV; i++)
-    init_bin(a, i);
-  a->next = NULL;
-  a->size = h->size;
-  arena_mem += h->size;
-#ifdef NO_THREADS
-  if((unsigned long)(mmapped_mem + arena_mem + sbrked_mem) > max_total_mem)
-    max_total_mem = mmapped_mem + arena_mem + sbrked_mem;
-#endif
-  tsd_setspecific(arena_key, (Void_t *)a);
-  mutex_init(&a->mutex);
-  i = mutex_lock(&a->mutex); /* remember result */
-
-  /* Set up the top chunk, with proper alignment. */
-  ptr = (char *)(a + 1);
-  misalign = (unsigned long)chunk2mem(ptr) & MALLOC_ALIGN_MASK;
-  if (misalign > 0)
-    ptr += MALLOC_ALIGNMENT - misalign;
-  top(a) = (mchunkptr)ptr;
-  set_head(top(a), (((char*)h + h->size) - ptr) | PREV_INUSE);
-
-  /* Add the new arena to the list. */
-  (void)mutex_lock(&list_lock);
-  a->next = main_arena.next;
-  main_arena.next = a;
-  (void)mutex_unlock(&list_lock);
-
-  if(i) /* locking failed; keep arena for further attempts later */
-    return 0;
-
-  THREAD_STAT(++(a->stat_lock_loop));
-  return a;
-}
-
-/* find the heap and corresponding arena for a given ptr */
-
-#define heap_for_ptr(ptr) \
- ((heap_info *)((unsigned long)(ptr) & ~(HEAP_MAX_SIZE-1)))
-#define arena_for_ptr(ptr) \
- (((mchunkptr)(ptr) < top(&main_arena) && (char *)(ptr) >= sbrk_base) ? \
-  &main_arena : heap_for_ptr(ptr)->ar_ptr)
-
-#else /* !USE_ARENAS */
-
-/* There is only one arena, main_arena. */
-
-#define arena_get(ptr, sz) (ptr = &main_arena)
-#define arena_for_ptr(ptr) (&main_arena)
-
-#endif /* USE_ARENAS */
-
-
-
-/*
-  Debugging support
-*/
-
-#if MALLOC_DEBUG
-
-
-/*
-  These routines make a number of assertions about the states
-  of data structures that should be true at all times. If any
-  are not true, it's very likely that a user program has somehow
-  trashed memory. (It's also possible that there is a coding error
-  in malloc. In which case, please report it!)
-*/
-
-#if __STD_C
-static void do_check_chunk(arena *ar_ptr, mchunkptr p)
-#else
-static void do_check_chunk(ar_ptr, p) arena *ar_ptr; mchunkptr p;
-#endif
-{
-  INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE;
-
-  /* No checkable chunk is mmapped */
-  assert(!chunk_is_mmapped(p));
-
-#if USE_ARENAS
-  if(ar_ptr != &main_arena) {
-    heap_info *heap = heap_for_ptr(p);
-    assert(heap->ar_ptr == ar_ptr);
-    if(p != top(ar_ptr))
-      assert((char *)p + sz <= (char *)heap + heap->size);
-    else
-      assert((char *)p + sz == (char *)heap + heap->size);
-    return;
-  }
-#endif
-
-  /* Check for legal address ... */
-  assert((char*)p >= sbrk_base);
-  if (p != top(ar_ptr))
-    assert((char*)p + sz <= (char*)top(ar_ptr));
-  else
-    assert((char*)p + sz <= sbrk_base + sbrked_mem);
-
-}
-
-
-#if __STD_C
-static void do_check_free_chunk(arena *ar_ptr, mchunkptr p)
-#else
-static void do_check_free_chunk(ar_ptr, p) arena *ar_ptr; mchunkptr p;
-#endif
-{
-  INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE;
-  mchunkptr next = chunk_at_offset(p, sz);
-
-  do_check_chunk(ar_ptr, p);
-
-  /* Check whether it claims to be free ... */
-  assert(!inuse(p));
-
-  /* Must have OK size and fields */
-  assert((long)sz >= (long)MINSIZE);
-  assert((sz & MALLOC_ALIGN_MASK) == 0);
-  assert(aligned_OK(chunk2mem(p)));
-  /* ... matching footer field */
-  assert(next->prev_size == sz);
-  /* ... and is fully consolidated */
-  assert(prev_inuse(p));
-  assert (next == top(ar_ptr) || inuse(next));
-
-  /* ... and has minimally sane links */
-  assert(p->fd->bk == p);
-  assert(p->bk->fd == p);
-}
-
-#if __STD_C
-static void do_check_inuse_chunk(arena *ar_ptr, mchunkptr p)
-#else
-static void do_check_inuse_chunk(ar_ptr, p) arena *ar_ptr; mchunkptr p;
-#endif
-{
-  mchunkptr next = next_chunk(p);
-  do_check_chunk(ar_ptr, p);
-
-  /* Check whether it claims to be in use ... */
-  assert(inuse(p));
-
-  /* ... whether its size is OK (it might be a fencepost) ... */
-  assert(chunksize(p) >= MINSIZE || next->size == (0|PREV_INUSE));
-
-  /* ... and is surrounded by OK chunks.
-    Since more things can be checked with free chunks than inuse ones,
-    if an inuse chunk borders them and debug is on, it's worth doing them.
-  */
-  if (!prev_inuse(p))
-  {
-    mchunkptr prv = prev_chunk(p);
-    assert(next_chunk(prv) == p);
-    do_check_free_chunk(ar_ptr, prv);
-  }
-  if (next == top(ar_ptr))
-  {
-    assert(prev_inuse(next));
-    assert(chunksize(next) >= MINSIZE);
-  }
-  else if (!inuse(next))
-    do_check_free_chunk(ar_ptr, next);
-
-}
-
-#if __STD_C
-static void do_check_malloced_chunk(arena *ar_ptr,
-                                    mchunkptr p, INTERNAL_SIZE_T s)
-#else
-static void do_check_malloced_chunk(ar_ptr, p, s)
-arena *ar_ptr; mchunkptr p; INTERNAL_SIZE_T s;
-#endif
-{
-  INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE;
-  long room = sz - s;
-
-  do_check_inuse_chunk(ar_ptr, p);
-
-  /* Legal size ... */
-  assert((long)sz >= (long)MINSIZE);
-  assert((sz & MALLOC_ALIGN_MASK) == 0);
-  assert(room >= 0);
-  assert(room < (long)MINSIZE);
-
-  /* ... and alignment */
-  assert(aligned_OK(chunk2mem(p)));
-
-
-  /* ... and was allocated at front of an available chunk */
-  assert(prev_inuse(p));
-
-}
-
-
-#define check_free_chunk(A,P) do_check_free_chunk(A,P)
-#define check_inuse_chunk(A,P) do_check_inuse_chunk(A,P)
-#define check_chunk(A,P) do_check_chunk(A,P)
-#define check_malloced_chunk(A,P,N) do_check_malloced_chunk(A,P,N)
-#else
-#define check_free_chunk(A,P)
-#define check_inuse_chunk(A,P)
-#define check_chunk(A,P)
-#define check_malloced_chunk(A,P,N)
-#endif
-
-
-
-/*
-  Macro-based internal utilities
-*/
-
-
-/*
-  Linking chunks in bin lists.
-  Call these only with variables, not arbitrary expressions, as arguments.
-*/
-
-/*
-  Place chunk p of size s in its bin, in size order,
-  putting it ahead of others of same size.
-*/
-
-
-#define frontlink(A, P, S, IDX, BK, FD)                                       \
-{                                                                             \
-  if (S < MAX_SMALLBIN_SIZE)                                                  \
-  {                                                                           \
-    IDX = smallbin_index(S);                                                  \
-    mark_binblock(A, IDX);                                                    \
-    BK = bin_at(A, IDX);                                                      \
-    FD = BK->fd;                                                              \
-    P->bk = BK;                                                               \
-    P->fd = FD;                                                               \
-    FD->bk = BK->fd = P;                                                      \
-  }                                                                           \
-  else                                                                        \
-  {                                                                           \
-    IDX = bin_index(S);                                                       \
-    BK = bin_at(A, IDX);                                                      \
-    FD = BK->fd;                                                              \
-    if (FD == BK) mark_binblock(A, IDX);                                      \
-    else                                                                      \
-    {                                                                         \
-      while (FD != BK && S < chunksize(FD)) FD = FD->fd;                      \
-      BK = FD->bk;                                                            \
-    }                                                                         \
-    P->bk = BK;                                                               \
-    P->fd = FD;                                                               \
-    FD->bk = BK->fd = P;                                                      \
-  }                                                                           \
-}
-
-
-/* take a chunk off a list */
-
-#define unlink(P, BK, FD)                                                     \
-{                                                                             \
-  BK = P->bk;                                                                 \
-  FD = P->fd;                                                                 \
-  FD->bk = BK;                                                                \
-  BK->fd = FD;                                                                \
-}                                                                             \
-
-/* Place p as the last remainder */
-
-#define link_last_remainder(A, P)                                             \
-{                                                                             \
-  last_remainder(A)->fd = last_remainder(A)->bk = P;                          \
-  P->fd = P->bk = last_remainder(A);                                          \
-}
-
-/* Clear the last_remainder bin */
-
-#define clear_last_remainder(A) \
-  (last_remainder(A)->fd = last_remainder(A)->bk = last_remainder(A))
-
-
-
-
-
-/*
-  Extend the top-most chunk by obtaining memory from system.
-  Main interface to sbrk (but see also malloc_trim).
-*/
-
-#if defined __GNUC__ && __GNUC__ >= 2
-/* This function is called only from one place, inline it.  */
-__inline__
-#endif
-static void
-internal_function
-#if __STD_C
-malloc_extend_top(arena *ar_ptr, INTERNAL_SIZE_T nb)
-#else
-malloc_extend_top(ar_ptr, nb) arena *ar_ptr; INTERNAL_SIZE_T nb;
-#endif
-{
-  unsigned long pagesz   = malloc_getpagesize;
-  mchunkptr old_top      = top(ar_ptr);        /* Record state of old top */
-  INTERNAL_SIZE_T old_top_size = chunksize(old_top);
-  INTERNAL_SIZE_T top_size;                    /* new size of top chunk */
-
-#if USE_ARENAS
-  if(ar_ptr == &main_arena) {
-#endif
-
-    char*     brk;                  /* return value from sbrk */
-    INTERNAL_SIZE_T front_misalign; /* unusable bytes at front of sbrked space */
-    INTERNAL_SIZE_T correction;     /* bytes for 2nd sbrk call */
-    char*     new_brk;              /* return of 2nd sbrk call */
-    char*     old_end = (char*)(chunk_at_offset(old_top, old_top_size));
-
-    /* Pad request with top_pad plus minimal overhead */
-    INTERNAL_SIZE_T sbrk_size = nb + top_pad + MINSIZE;
-
-    /* If not the first time through, round to preserve page boundary */
-    /* Otherwise, we need to correct to a page size below anyway. */
-    /* (We also correct below if an intervening foreign sbrk call.) */
-
-    if (sbrk_base != (char*)(-1))
-      sbrk_size = (sbrk_size + (pagesz - 1)) & ~(pagesz - 1);
-
-    brk = (char*)(MORECORE (sbrk_size));
-
-    /* Fail if sbrk failed or if a foreign sbrk call killed our space */
-    if (brk == (char*)(MORECORE_FAILURE) ||
-        (brk < old_end && old_top != initial_top(&main_arena)))
-      return;
-
-#if defined _LIBC || defined MALLOC_HOOKS
-    /* Call the `morecore' hook if necessary.  */
-    if (__after_morecore_hook)
-      (*__after_morecore_hook) ();
-#endif
-
-    sbrked_mem += sbrk_size;
-
-    if (brk == old_end) { /* can just add bytes to current top */
-      top_size = sbrk_size + old_top_size;
-      set_head(old_top, top_size | PREV_INUSE);
-      old_top = 0; /* don't free below */
-    } else {
-      if (sbrk_base == (char*)(-1)) /* First time through. Record base */
-        sbrk_base = brk;
-      else
-        /* Someone else called sbrk().  Count those bytes as sbrked_mem. */
-        sbrked_mem += brk - (char*)old_end;
-
-      /* Guarantee alignment of first new chunk made from this space */
-      front_misalign = (unsigned long)chunk2mem(brk) & MALLOC_ALIGN_MASK;
-      if (front_misalign > 0) {
-        correction = (MALLOC_ALIGNMENT) - front_misalign;
-        brk += correction;
-      } else
-        correction = 0;
-
-      /* Guarantee the next brk will be at a page boundary */
-      correction += pagesz - ((unsigned long)(brk + sbrk_size) & (pagesz - 1));
-
-      /* Allocate correction */
-      new_brk = (char*)(MORECORE (correction));
-      if (new_brk == (char*)(MORECORE_FAILURE)) return;
-
-#if defined _LIBC || defined MALLOC_HOOKS
-      /* Call the `morecore' hook if necessary.  */
-      if (__after_morecore_hook)
-        (*__after_morecore_hook) ();
-#endif
-
-      sbrked_mem += correction;
-
-      top(&main_arena) = chunk_at_offset(brk, 0);
-      top_size = new_brk - brk + correction;
-      set_head(top(&main_arena), top_size | PREV_INUSE);
-
-      if (old_top == initial_top(&main_arena))
-        old_top = 0; /* don't free below */
-    }
-
-    if ((unsigned long)sbrked_mem > (unsigned long)max_sbrked_mem)
-      max_sbrked_mem = sbrked_mem;
-#ifdef NO_THREADS
-    if ((unsigned long)(mmapped_mem + arena_mem + sbrked_mem) > max_total_mem)
-      max_total_mem = mmapped_mem + arena_mem + sbrked_mem;
-#endif
-
-#if USE_ARENAS
-  } else { /* ar_ptr != &main_arena */
-    heap_info *old_heap, *heap;
-    size_t old_heap_size;
-
-    if(old_top_size < MINSIZE) /* this should never happen */
-      return;
-
-    /* First try to extend the current heap. */
-    if(MINSIZE + nb <= old_top_size)
-      return;
-    old_heap = heap_for_ptr(old_top);
-    old_heap_size = old_heap->size;
-    if(grow_heap(old_heap, MINSIZE + nb - old_top_size) == 0) {
-      ar_ptr->size += old_heap->size - old_heap_size;
-      arena_mem += old_heap->size - old_heap_size;
-#ifdef NO_THREADS
-      if(mmapped_mem + arena_mem + sbrked_mem > max_total_mem)
-        max_total_mem = mmapped_mem + arena_mem + sbrked_mem;
-#endif
-      top_size = ((char *)old_heap + old_heap->size) - (char *)old_top;
-      set_head(old_top, top_size | PREV_INUSE);
-      return;
-    }
-
-    /* A new heap must be created. */
-    heap = new_heap(nb + (MINSIZE + sizeof(*heap)));
-    if(!heap)
-      return;
-    heap->ar_ptr = ar_ptr;
-    heap->prev = old_heap;
-    ar_ptr->size += heap->size;
-    arena_mem += heap->size;
-#ifdef NO_THREADS
-    if((unsigned long)(mmapped_mem + arena_mem + sbrked_mem) > max_total_mem)
-      max_total_mem = mmapped_mem + arena_mem + sbrked_mem;
-#endif
-
-    /* Set up the new top, so we can safely use chunk_free() below. */
-    top(ar_ptr) = chunk_at_offset(heap, sizeof(*heap));
-    top_size = heap->size - sizeof(*heap);
-    set_head(top(ar_ptr), top_size | PREV_INUSE);
-  }
-#endif /* USE_ARENAS */
-
-  /* We always land on a page boundary */
-  assert(((unsigned long)((char*)top(ar_ptr) + top_size) & (pagesz-1)) == 0);
-
-  /* Setup fencepost and free the old top chunk. */
-  if(old_top) {
-    /* The fencepost takes at least MINSIZE bytes, because it might
-       become the top chunk again later.  Note that a footer is set
-       up, too, although the chunk is marked in use. */
-    old_top_size -= MINSIZE;
-    set_head(chunk_at_offset(old_top, old_top_size + 2*SIZE_SZ), 0|PREV_INUSE);
-    if(old_top_size >= MINSIZE) {
-      set_head(chunk_at_offset(old_top, old_top_size), (2*SIZE_SZ)|PREV_INUSE);
-      set_foot(chunk_at_offset(old_top, old_top_size), (2*SIZE_SZ));
-      set_head_size(old_top, old_top_size);
-      chunk_free(ar_ptr, old_top);
-    } else {
-      set_head(old_top, (old_top_size + 2*SIZE_SZ)|PREV_INUSE);
-      set_foot(old_top, (old_top_size + 2*SIZE_SZ));
-    }
-  }
-}
-
-
-
-
-/* Main public routines */
-
-
-/*
-  Malloc Algorithm:
-
-    The requested size is first converted into a usable form, `nb'.
-    This currently means to add 4 bytes overhead plus possibly more to
-    obtain 8-byte alignment and/or to obtain a size of at least
-    MINSIZE (currently 16, 24, or 32 bytes), the smallest allocatable
-    size.  (All fits are considered `exact' if they are within MINSIZE
-    bytes.)
-
-    From there, the first successful of the following steps is taken:
-
-      1. The bin corresponding to the request size is scanned, and if
-         a chunk of exactly the right size is found, it is taken.
-
-      2. The most recently remaindered chunk is used if it is big
-         enough.  This is a form of (roving) first fit, used only in
-         the absence of exact fits. Runs of consecutive requests use
-         the remainder of the chunk used for the previous such request
-         whenever possible. This limited use of a first-fit style
-         allocation strategy tends to give contiguous chunks
-         coextensive lifetimes, which improves locality and can reduce
-         fragmentation in the long run.
-
-      3. Other bins are scanned in increasing size order, using a
-         chunk big enough to fulfill the request, and splitting off
-         any remainder.  This search is strictly by best-fit; i.e.,
-         the smallest (with ties going to approximately the least
-         recently used) chunk that fits is selected.
-
-      4. If large enough, the chunk bordering the end of memory
-         (`top') is split off. (This use of `top' is in accord with
-         the best-fit search rule.  In effect, `top' is treated as
-         larger (and thus less well fitting) than any other available
-         chunk since it can be extended to be as large as necessary
-         (up to system limitations).
-
-      5. If the request size meets the mmap threshold and the
-         system supports mmap, and there are few enough currently
-         allocated mmapped regions, and a call to mmap succeeds,
-         the request is allocated via direct memory mapping.
-
-      6. Otherwise, the top of memory is extended by
-         obtaining more space from the system (normally using sbrk,
-         but definable to anything else via the MORECORE macro).
-         Memory is gathered from the system (in system page-sized
-         units) in a way that allows chunks obtained across different
-         sbrk calls to be consolidated, but does not require
-         contiguous memory. Thus, it should be safe to intersperse
-         mallocs with other sbrk calls.
-
-
-      All allocations are made from the `lowest' part of any found
-      chunk. (The implementation invariant is that prev_inuse is
-      always true of any allocated chunk; i.e., that each allocated
-      chunk borders either a previously allocated and still in-use chunk,
-      or the base of its memory arena.)
-
-*/
-
-#if __STD_C
-Void_t* mALLOc(size_t bytes)
-#else
-Void_t* mALLOc(bytes) size_t bytes;
-#endif
-{
-  arena *ar_ptr;
-  INTERNAL_SIZE_T nb; /* padded request size */
-  mchunkptr victim;
-
-#if defined _LIBC || defined MALLOC_HOOKS
-  __malloc_ptr_t (*hook) __MALLOC_PMT ((size_t, __const __malloc_ptr_t)) =
-      __malloc_hook;
-  if (hook != NULL) {
-    Void_t* result;
-
-#if defined __GNUC__ && __GNUC__ >= 2
-    result = (*hook)(bytes, RETURN_ADDRESS (0));
-#else
-    result = (*hook)(bytes, NULL);
-#endif
-    return result;
-  }
-#endif
-
-  if(request2size(bytes, nb))
-    return 0;
-  arena_get(ar_ptr, nb);
-  if(!ar_ptr)
-    return 0;
-  victim = chunk_alloc(ar_ptr, nb);
-  if(!victim) {
-    /* Maybe the failure is due to running out of mmapped areas. */
-    if(ar_ptr != &main_arena) {
-      (void)mutex_unlock(&ar_ptr->mutex);
-      (void)mutex_lock(&main_arena.mutex);
-      victim = chunk_alloc(&main_arena, nb);
-      (void)mutex_unlock(&main_arena.mutex);
-    } else {
-#if USE_ARENAS
-      /* ... or sbrk() has failed and there is still a chance to mmap() */
-      ar_ptr = arena_get2(ar_ptr->next ? ar_ptr : 0, nb);
-      (void)mutex_unlock(&main_arena.mutex);
-      if(ar_ptr) {
-        victim = chunk_alloc(ar_ptr, nb);
-        (void)mutex_unlock(&ar_ptr->mutex);
-      }
-#endif
-    }
-    if(!victim) return 0;
-  } else
-    (void)mutex_unlock(&ar_ptr->mutex);
-  return BOUNDED_N(chunk2mem(victim), bytes);
-}
-
-static mchunkptr
-internal_function
-#if __STD_C
-chunk_alloc(arena *ar_ptr, INTERNAL_SIZE_T nb)
-#else
-chunk_alloc(ar_ptr, nb) arena *ar_ptr; INTERNAL_SIZE_T nb;
-#endif
-{
-  mchunkptr victim;                  /* inspected/selected chunk */
-  INTERNAL_SIZE_T victim_size;       /* its size */
-  int       idx;                     /* index for bin traversal */
-  mbinptr   bin;                     /* associated bin */
-  mchunkptr remainder;               /* remainder from a split */
-  long      remainder_size;          /* its size */
-  int       remainder_index;         /* its bin index */
-  unsigned long block;               /* block traverser bit */
-  int       startidx;                /* first bin of a traversed block */
-  mchunkptr fwd;                     /* misc temp for linking */
-  mchunkptr bck;                     /* misc temp for linking */
-  mbinptr q;                         /* misc temp */
-
-
-  /* Check for exact match in a bin */
-
-  if (is_small_request(nb))  /* Faster version for small requests */
-  {
-    idx = smallbin_index(nb);
-
-    /* No traversal or size check necessary for small bins.  */
-
-    q = _bin_at(ar_ptr, idx);
-    victim = last(q);
-
-    /* Also scan the next one, since it would have a remainder < MINSIZE */
-    if (victim == q)
-    {
-      q = next_bin(q);
-      victim = last(q);
-    }
-    if (victim != q)
-    {
-      victim_size = chunksize(victim);
-      unlink(victim, bck, fwd);
-      set_inuse_bit_at_offset(victim, victim_size);
-      check_malloced_chunk(ar_ptr, victim, nb);
-      return victim;
-    }
-
-    idx += 2; /* Set for bin scan below. We've already scanned 2 bins. */
-
-  }
-  else
-  {
-    idx = bin_index(nb);
-    bin = bin_at(ar_ptr, idx);
-
-    for (victim = last(bin); victim != bin; victim = victim->bk)
-    {
-      victim_size = chunksize(victim);
-      remainder_size = victim_size - nb;
-
-      if (remainder_size >= (long)MINSIZE) /* too big */
-      {
-        --idx; /* adjust to rescan below after checking last remainder */
-        break;
-      }
-
-      else if (remainder_size >= 0) /* exact fit */
-      {
-        unlink(victim, bck, fwd);
-        set_inuse_bit_at_offset(victim, victim_size);
-        check_malloced_chunk(ar_ptr, victim, nb);
-        return victim;
-      }
-    }
-
-    ++idx;
-
-  }
-
-  /* Try to use the last split-off remainder */
-
-  if ( (victim = last_remainder(ar_ptr)->fd) != last_remainder(ar_ptr))
-  {
-    victim_size = chunksize(victim);
-    remainder_size = victim_size - nb;
-
-    if (remainder_size >= (long)MINSIZE) /* re-split */
-    {
-      remainder = chunk_at_offset(victim, nb);
-      set_head(victim, nb | PREV_INUSE);
-      link_last_remainder(ar_ptr, remainder);
-      set_head(remainder, remainder_size | PREV_INUSE);
-      set_foot(remainder, remainder_size);
-      check_malloced_chunk(ar_ptr, victim, nb);
-      return victim;
-    }
-
-    clear_last_remainder(ar_ptr);
-
-    if (remainder_size >= 0)  /* exhaust */
-    {
-      set_inuse_bit_at_offset(victim, victim_size);
-      check_malloced_chunk(ar_ptr, victim, nb);
-      return victim;
-    }
-
-    /* Else place in bin */
-
-    frontlink(ar_ptr, victim, victim_size, remainder_index, bck, fwd);
-  }
-
-  /*
-     If there are any possibly nonempty big-enough blocks,
-     search for best fitting chunk by scanning bins in blockwidth units.
-  */
-
-  if ( (block = idx2binblock(idx)) <= binblocks(ar_ptr))
-  {
-
-    /* Get to the first marked block */
-
-    if ( (block & binblocks(ar_ptr)) == 0)
-    {
-      /* force to an even block boundary */
-      idx = (idx & ~(BINBLOCKWIDTH - 1)) + BINBLOCKWIDTH;
-      block <<= 1;
-      while ((block & binblocks(ar_ptr)) == 0)
-      {
-        idx += BINBLOCKWIDTH;
-        block <<= 1;
-      }
-    }
-
-    /* For each possibly nonempty block ... */
-    for (;;)
-    {
-      startidx = idx;          /* (track incomplete blocks) */
-      q = bin = _bin_at(ar_ptr, idx);
-
-      /* For each bin in this block ... */
-      do
-      {
-        /* Find and use first big enough chunk ... */
-
-        for (victim = last(bin); victim != bin; victim = victim->bk)
-        {
-          victim_size = chunksize(victim);
-          remainder_size = victim_size - nb;
-
-          if (remainder_size >= (long)MINSIZE) /* split */
-          {
-            remainder = chunk_at_offset(victim, nb);
-            set_head(victim, nb | PREV_INUSE);
-            unlink(victim, bck, fwd);
-            link_last_remainder(ar_ptr, remainder);
-            set_head(remainder, remainder_size | PREV_INUSE);
-            set_foot(remainder, remainder_size);
-            check_malloced_chunk(ar_ptr, victim, nb);
-            return victim;
-          }
-
-          else if (remainder_size >= 0)  /* take */
-          {
-            set_inuse_bit_at_offset(victim, victim_size);
-            unlink(victim, bck, fwd);
-            check_malloced_chunk(ar_ptr, victim, nb);
-            return victim;
-          }
-
-        }
-
-       bin = next_bin(bin);
-
-      } while ((++idx & (BINBLOCKWIDTH - 1)) != 0);
-
-      /* Clear out the block bit. */
-
-      do   /* Possibly backtrack to try to clear a partial block */
-      {
-        if ((startidx & (BINBLOCKWIDTH - 1)) == 0)
-        {
-          binblocks(ar_ptr) &= ~block;
-          break;
-        }
-        --startidx;
-        q = prev_bin(q);
-      } while (first(q) == q);
-
-      /* Get to the next possibly nonempty block */
-
-      if ( (block <<= 1) <= binblocks(ar_ptr) && (block != 0) )
-      {
-        while ((block & binblocks(ar_ptr)) == 0)
-        {
-          idx += BINBLOCKWIDTH;
-          block <<= 1;
-        }
-      }
-      else
-        break;
-    }
-  }
-
-
-  /* Try to use top chunk */
-
-  /* Require that there be a remainder, ensuring top always exists  */
-  if ( (remainder_size = chunksize(top(ar_ptr)) - nb) < (long)MINSIZE)
-  {
-
-#if HAVE_MMAP
-    /* If the request is big and there are not yet too many regions,
-       and we would otherwise need to extend, try to use mmap instead.  */
-    if ((unsigned long)nb >= (unsigned long)mmap_threshold &&
-        n_mmaps < n_mmaps_max &&
-        (victim = mmap_chunk(nb)) != 0)
-      return victim;
-#endif
-
-    /* Try to extend */
-    malloc_extend_top(ar_ptr, nb);
-    if ((remainder_size = chunksize(top(ar_ptr)) - nb) < (long)MINSIZE)
-    {
-#if HAVE_MMAP
-      /* A last attempt: when we are out of address space in a
-         non-main arena, try mmap anyway, as long as it is allowed at
-         all.  */
-      if (ar_ptr != &main_arena &&
-          n_mmaps_max > 0 &&
-          (victim = mmap_chunk(nb)) != 0)
-        return victim;
-#endif
-      return 0; /* propagate failure */
-    }
-  }
-
-  victim = top(ar_ptr);
-  set_head(victim, nb | PREV_INUSE);
-  top(ar_ptr) = chunk_at_offset(victim, nb);
-  set_head(top(ar_ptr), remainder_size | PREV_INUSE);
-  check_malloced_chunk(ar_ptr, victim, nb);
-  return victim;
-
-}
-
-
-
-
-/*
-
-  free() algorithm :
-
-    cases:
-
-       1. free(0) has no effect.
-
-       2. If the chunk was allocated via mmap, it is released via munmap().
-
-       3. If a returned chunk borders the current high end of memory,
-          it is consolidated into the top, and if the total unused
-          topmost memory exceeds the trim threshold, malloc_trim is
-          called.
-
-       4. Other chunks are consolidated as they arrive, and
-          placed in corresponding bins. (This includes the case of
-          consolidating with the current `last_remainder').
-
-*/
-
-
-#if __STD_C
-void fREe(Void_t* mem)
-#else
-void fREe(mem) Void_t* mem;
-#endif
-{
-  arena *ar_ptr;
-  mchunkptr p;                          /* chunk corresponding to mem */
-
-#if defined _LIBC || defined MALLOC_HOOKS
-  void (*hook) __MALLOC_PMT ((__malloc_ptr_t, __const __malloc_ptr_t)) =
-    __free_hook;
-
-  if (hook != NULL) {
-#if defined __GNUC__ && __GNUC__ >= 2
-    (*hook)(mem, RETURN_ADDRESS (0));
-#else
-    (*hook)(mem, NULL);
-#endif
-    return;
-  }
-#endif
-
-  if (mem == 0)                              /* free(0) has no effect */
-    return;
-
-  p = mem2chunk(mem);
-
-#if HAVE_MMAP
-  if (chunk_is_mmapped(p))                       /* release mmapped memory. */
-  {
-    munmap_chunk(p);
-    return;
-  }
-#endif
-
-  ar_ptr = arena_for_ptr(p);
-#if THREAD_STATS
-  if(!mutex_trylock(&ar_ptr->mutex))
-    ++(ar_ptr->stat_lock_direct);
-  else {
-    (void)mutex_lock(&ar_ptr->mutex);
-    ++(ar_ptr->stat_lock_wait);
-  }
-#else
-  (void)mutex_lock(&ar_ptr->mutex);
-#endif
-  chunk_free(ar_ptr, p);
-  (void)mutex_unlock(&ar_ptr->mutex);
-}
-
-static void
-internal_function
-#if __STD_C
-chunk_free(arena *ar_ptr, mchunkptr p)
-#else
-chunk_free(ar_ptr, p) arena *ar_ptr; mchunkptr p;
-#endif
-{
-  INTERNAL_SIZE_T hd = p->size; /* its head field */
-  INTERNAL_SIZE_T sz;  /* its size */
-  int       idx;       /* its bin index */
-  mchunkptr next;      /* next contiguous chunk */
-  INTERNAL_SIZE_T nextsz; /* its size */
-  INTERNAL_SIZE_T prevsz; /* size of previous contiguous chunk */
-  mchunkptr bck;       /* misc temp for linking */
-  mchunkptr fwd;       /* misc temp for linking */
-  int       islr;      /* track whether merging with last_remainder */
-
-  check_inuse_chunk(ar_ptr, p);
-
-  sz = hd & ~PREV_INUSE;
-  next = chunk_at_offset(p, sz);
-  nextsz = chunksize(next);
-
-  if (next == top(ar_ptr))                         /* merge with top */
-  {
-    sz += nextsz;
-
-    if (!(hd & PREV_INUSE))                    /* consolidate backward */
-    {
-      prevsz = p->prev_size;
-      p = chunk_at_offset(p, -(long)prevsz);
-      sz += prevsz;
-      unlink(p, bck, fwd);
-    }
-
-    set_head(p, sz | PREV_INUSE);
-    top(ar_ptr) = p;
-
-#if USE_ARENAS
-    if(ar_ptr == &main_arena) {
-#endif
-      if ((unsigned long)(sz) >= (unsigned long)trim_threshold)
-        main_trim(top_pad);
-#if USE_ARENAS
-    } else {
-      heap_info *heap = heap_for_ptr(p);
-
-      assert(heap->ar_ptr == ar_ptr);
-
-      /* Try to get rid of completely empty heaps, if possible. */
-      if((unsigned long)(sz) >= (unsigned long)trim_threshold ||
-         p == chunk_at_offset(heap, sizeof(*heap)))
-        heap_trim(heap, top_pad);
-    }
-#endif
-    return;
-  }
-
-  islr = 0;
-
-  if (!(hd & PREV_INUSE))                    /* consolidate backward */
-  {
-    prevsz = p->prev_size;
-    p = chunk_at_offset(p, -(long)prevsz);
-    sz += prevsz;
-
-    if (p->fd == last_remainder(ar_ptr))     /* keep as last_remainder */
-      islr = 1;
-    else
-      unlink(p, bck, fwd);
-  }
-
-  if (!(inuse_bit_at_offset(next, nextsz)))   /* consolidate forward */
-  {
-    sz += nextsz;
-
-    if (!islr && next->fd == last_remainder(ar_ptr))
-                                              /* re-insert last_remainder */
-    {
-      islr = 1;
-      link_last_remainder(ar_ptr, p);
-    }
-    else
-      unlink(next, bck, fwd);
-
-    next = chunk_at_offset(p, sz);
-  }
-  else
-    set_head(next, nextsz);                  /* clear inuse bit */
-
-  set_head(p, sz | PREV_INUSE);
-  next->prev_size = sz;
-  if (!islr)
-    frontlink(ar_ptr, p, sz, idx, bck, fwd);
-
-#if USE_ARENAS
-  /* Check whether the heap containing top can go away now. */
-  if(next->size < MINSIZE &&
-     (unsigned long)sz > trim_threshold &&
-     ar_ptr != &main_arena) {                /* fencepost */
-    heap_info *heap = heap_for_ptr(top(ar_ptr));
-
-    if(top(ar_ptr) == chunk_at_offset(heap, sizeof(*heap)) &&
-       heap->prev == heap_for_ptr(p))
-      heap_trim(heap, top_pad);
-  }
-#endif
-}
-
-
-
-
-
-/*
-
-  Realloc algorithm:
-
-    Chunks that were obtained via mmap cannot be extended or shrunk
-    unless HAVE_MREMAP is defined, in which case mremap is used.
-    Otherwise, if their reallocation is for additional space, they are
-    copied.  If for less, they are just left alone.
-
-    Otherwise, if the reallocation is for additional space, and the
-    chunk can be extended, it is, else a malloc-copy-free sequence is
-    taken.  There are several different ways that a chunk could be
-    extended. All are tried:
-
-       * Extending forward into following adjacent free chunk.
-       * Shifting backwards, joining preceding adjacent space
-       * Both shifting backwards and extending forward.
-       * Extending into newly sbrked space
-
-    Unless the #define REALLOC_ZERO_BYTES_FREES is set, realloc with a
-    size argument of zero (re)allocates a minimum-sized chunk.
-
-    If the reallocation is for less space, and the new request is for
-    a `small' (<512 bytes) size, then the newly unused space is lopped
-    off and freed.
-
-    The old unix realloc convention of allowing the last-free'd chunk
-    to be used as an argument to realloc is no longer supported.
-    I don't know of any programs still relying on this feature,
-    and allowing it would also allow too many other incorrect
-    usages of realloc to be sensible.
-
-
-*/
-
-
-#if __STD_C
-Void_t* rEALLOc(Void_t* oldmem, size_t bytes)
-#else
-Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
-#endif
-{
-  arena *ar_ptr;
-  INTERNAL_SIZE_T    nb;      /* padded request size */
-
-  mchunkptr oldp;             /* chunk corresponding to oldmem */
-  INTERNAL_SIZE_T    oldsize; /* its size */
-
-  mchunkptr newp;             /* chunk to return */
-
-#if defined _LIBC || defined MALLOC_HOOKS
-  __malloc_ptr_t (*hook) __MALLOC_PMT ((__malloc_ptr_t, size_t,
-                                        __const __malloc_ptr_t)) =
-    __realloc_hook;
-  if (hook != NULL) {
-    Void_t* result;
-
-#if defined __GNUC__ && __GNUC__ >= 2
-    result = (*hook)(oldmem, bytes, RETURN_ADDRESS (0));
-#else
-    result = (*hook)(oldmem, bytes, NULL);
-#endif
-    return result;
-  }
-#endif
-
-#ifdef REALLOC_ZERO_BYTES_FREES
-  if (bytes == 0 && oldmem != NULL) { fREe(oldmem); return 0; }
-#endif
-
-  /* realloc of null is supposed to be same as malloc */
-  if (oldmem == 0) return mALLOc(bytes);
-
-  oldp    = mem2chunk(oldmem);
-  oldsize = chunksize(oldp);
-
-  if(request2size(bytes, nb))
-    return 0;
-
-#if HAVE_MMAP
-  if (chunk_is_mmapped(oldp))
-  {
-    Void_t* newmem;
-
-#if HAVE_MREMAP
-    newp = mremap_chunk(oldp, nb);
-    if(newp)
-      return BOUNDED_N(chunk2mem(newp), bytes);
-#endif
-    /* Note the extra SIZE_SZ overhead. */
-    if(oldsize - SIZE_SZ >= nb) return oldmem; /* do nothing */
-    /* Must alloc, copy, free. */
-    newmem = mALLOc(bytes);
-    if (newmem == 0) return 0; /* propagate failure */
-    MALLOC_COPY(newmem, oldmem, oldsize - 2*SIZE_SZ, 0);
-    munmap_chunk(oldp);
-    return newmem;
-  }
-#endif
-
-  ar_ptr = arena_for_ptr(oldp);
-#if THREAD_STATS
-  if(!mutex_trylock(&ar_ptr->mutex))
-    ++(ar_ptr->stat_lock_direct);
-  else {
-    (void)mutex_lock(&ar_ptr->mutex);
-    ++(ar_ptr->stat_lock_wait);
-  }
-#else
-  (void)mutex_lock(&ar_ptr->mutex);
-#endif
-
-#ifndef NO_THREADS
-  /* As in malloc(), remember this arena for the next allocation. */
-  tsd_setspecific(arena_key, (Void_t *)ar_ptr);
-#endif
-
-  newp = chunk_realloc(ar_ptr, oldp, oldsize, nb);
-
-  (void)mutex_unlock(&ar_ptr->mutex);
-  return newp ? BOUNDED_N(chunk2mem(newp), bytes) : NULL;
-}
-
-static mchunkptr
-internal_function
-#if __STD_C
-chunk_realloc(arena* ar_ptr, mchunkptr oldp, INTERNAL_SIZE_T oldsize,
-              INTERNAL_SIZE_T nb)
-#else
-chunk_realloc(ar_ptr, oldp, oldsize, nb)
-arena* ar_ptr; mchunkptr oldp; INTERNAL_SIZE_T oldsize, nb;
-#endif
-{
-  mchunkptr newp = oldp;      /* chunk to return */
-  INTERNAL_SIZE_T newsize = oldsize; /* its size */
-
-  mchunkptr next;             /* next contiguous chunk after oldp */
-  INTERNAL_SIZE_T  nextsize;  /* its size */
-
-  mchunkptr prev;             /* previous contiguous chunk before oldp */
-  INTERNAL_SIZE_T  prevsize;  /* its size */
-
-  mchunkptr remainder;        /* holds split off extra space from newp */
-  INTERNAL_SIZE_T  remainder_size;   /* its size */
-
-  mchunkptr bck;              /* misc temp for linking */
-  mchunkptr fwd;              /* misc temp for linking */
-
-  check_inuse_chunk(ar_ptr, oldp);
-
-  if ((long)(oldsize) < (long)(nb))
-  {
-    Void_t* oldmem = BOUNDED_N(chunk2mem(oldp), oldsize);
-
-    /* Try expanding forward */
-
-    next = chunk_at_offset(oldp, oldsize);
-    if (next == top(ar_ptr) || !inuse(next))
-    {
-      nextsize = chunksize(next);
-
-      /* Forward into top only if a remainder */
-      if (next == top(ar_ptr))
-      {
-        if ((long)(nextsize + newsize) >= (long)(nb + MINSIZE))
-        {
-          newsize += nextsize;
-          top(ar_ptr) = chunk_at_offset(oldp, nb);
-          set_head(top(ar_ptr), (newsize - nb) | PREV_INUSE);
-          set_head_size(oldp, nb);
-          return oldp;
-        }
-      }
-
-      /* Forward into next chunk */
-      else if (((long)(nextsize + newsize) >= (long)(nb)))
-      {
-        unlink(next, bck, fwd);
-        newsize  += nextsize;
-        goto split;
-      }
-    }
-    else
-    {
-      next = 0;
-      nextsize = 0;
-    }
-
-    oldsize -= SIZE_SZ;
-
-    /* Try shifting backwards. */
-
-    if (!prev_inuse(oldp))
-    {
-      prev = prev_chunk(oldp);
-      prevsize = chunksize(prev);
-
-      /* try forward + backward first to save a later consolidation */
-
-      if (next != 0)
-      {
-        /* into top */
-        if (next == top(ar_ptr))
-        {
-          if ((long)(nextsize + prevsize + newsize) >= (long)(nb + MINSIZE))
-          {
-            unlink(prev, bck, fwd);
-            newp = prev;
-            newsize += prevsize + nextsize;
-            MALLOC_COPY(BOUNDED_N(chunk2mem(newp), oldsize), oldmem, oldsize,
-                        1);
-            top(ar_ptr) = chunk_at_offset(newp, nb);
-            set_head(top(ar_ptr), (newsize - nb) | PREV_INUSE);
-            set_head_size(newp, nb);
-            return newp;
-          }
-        }
-
-        /* into next chunk */
-        else if (((long)(nextsize + prevsize + newsize) >= (long)(nb)))
-        {
-          unlink(next, bck, fwd);
-          unlink(prev, bck, fwd);
-          newp = prev;
-          newsize += nextsize + prevsize;
-          MALLOC_COPY(BOUNDED_N(chunk2mem(newp), oldsize), oldmem, oldsize, 1);
-          goto split;
-        }
-      }
-
-      /* backward only */
-      if (prev != 0 && (long)(prevsize + newsize) >= (long)nb)
-      {
-        unlink(prev, bck, fwd);
-        newp = prev;
-        newsize += prevsize;
-        MALLOC_COPY(BOUNDED_N(chunk2mem(newp), oldsize), oldmem, oldsize, 1);
-        goto split;
-      }
-    }
-
-    /* Must allocate */
-
-    newp = chunk_alloc (ar_ptr, nb);
-
-    if (newp == 0) {
-      /* Maybe the failure is due to running out of mmapped areas. */
-      if (ar_ptr != &main_arena) {
-        (void)mutex_lock(&main_arena.mutex);
-        newp = chunk_alloc(&main_arena, nb);
-        (void)mutex_unlock(&main_arena.mutex);
-      } else {
-#if USE_ARENAS
-        /* ... or sbrk() has failed and there is still a chance to mmap() */
-        arena* ar_ptr2 = arena_get2(ar_ptr->next ? ar_ptr : 0, nb);
-        if(ar_ptr2) {
-          newp = chunk_alloc(ar_ptr2, nb);
-          (void)mutex_unlock(&ar_ptr2->mutex);
-        }
-#endif
-      }
-      if (newp == 0) /* propagate failure */
-        return 0;
-    }
-
-    /* Avoid copy if newp is next chunk after oldp. */
-    /* (This can only happen when new chunk is sbrk'ed.) */
-
-    if ( newp == next_chunk(oldp))
-    {
-      newsize += chunksize(newp);
-      newp = oldp;
-      goto split;
-    }
-
-    /* Otherwise copy, free, and exit */
-    MALLOC_COPY(BOUNDED_N(chunk2mem(newp), oldsize), oldmem, oldsize, 0);
-    chunk_free(ar_ptr, oldp);
-    return newp;
-  }
-
-
- split:  /* split off extra room in old or expanded chunk */
-
-  if (newsize - nb >= MINSIZE) /* split off remainder */
-  {
-    remainder = chunk_at_offset(newp, nb);
-    remainder_size = newsize - nb;
-    set_head_size(newp, nb);
-    set_head(remainder, remainder_size | PREV_INUSE);
-    set_inuse_bit_at_offset(remainder, remainder_size);
-    chunk_free(ar_ptr, remainder);
-  }
-  else
-  {
-    set_head_size(newp, newsize);
-    set_inuse_bit_at_offset(newp, newsize);
-  }
-
-  check_inuse_chunk(ar_ptr, newp);
-  return newp;
-}
-
-
-
-
-/*
-
-  memalign algorithm:
-
-    memalign requests more than enough space from malloc, finds a spot
-    within that chunk that meets the alignment request, and then
-    possibly frees the leading and trailing space.
-
-    The alignment argument must be a power of two. This property is not
-    checked by memalign, so misuse may result in random runtime errors.
-
-    8-byte alignment is guaranteed by normal malloc calls, so don't
-    bother calling memalign with an argument of 8 or less.
-
-    Overreliance on memalign is a sure way to fragment space.
-
-*/
-
-
-#if __STD_C
-Void_t* mEMALIGn(size_t alignment, size_t bytes)
-#else
-Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes;
-#endif
-{
-  arena *ar_ptr;
-  INTERNAL_SIZE_T    nb;      /* padded  request size */
-  mchunkptr p;
-
-#if defined _LIBC || defined MALLOC_HOOKS
-  __malloc_ptr_t (*hook) __MALLOC_PMT ((size_t, size_t,
-                                        __const __malloc_ptr_t)) =
-    __memalign_hook;
-  if (hook != NULL) {
-    Void_t* result;
-
-#if defined __GNUC__ && __GNUC__ >= 2
-    result = (*hook)(alignment, bytes, RETURN_ADDRESS (0));
-#else
-    result = (*hook)(alignment, bytes, NULL);
-#endif
-    return result;
-  }
-#endif
-
-  /* If need less alignment than we give anyway, just relay to malloc */
-
-  if (alignment <= MALLOC_ALIGNMENT) return mALLOc(bytes);
-
-  /* Otherwise, ensure that it is at least a minimum chunk size */
-
-  if (alignment <  MINSIZE) alignment = MINSIZE;
-
-  if(request2size(bytes, nb))
-    return 0;
-  arena_get(ar_ptr, nb + alignment + MINSIZE);
-  if(!ar_ptr)
-    return 0;
-  p = chunk_align(ar_ptr, nb, alignment);
-  (void)mutex_unlock(&ar_ptr->mutex);
-  if(!p) {
-    /* Maybe the failure is due to running out of mmapped areas. */
-    if(ar_ptr != &main_arena) {
-      (void)mutex_lock(&main_arena.mutex);
-      p = chunk_align(&main_arena, nb, alignment);
-      (void)mutex_unlock(&main_arena.mutex);
-    } else {
-#if USE_ARENAS
-      /* ... or sbrk() has failed and there is still a chance to mmap() */
-      ar_ptr = arena_get2(ar_ptr->next ? ar_ptr : 0, nb);
-      if(ar_ptr) {
-        p = chunk_align(ar_ptr, nb, alignment);
-        (void)mutex_unlock(&ar_ptr->mutex);
-      }
-#endif
-    }
-    if(!p) return 0;
-  }
-  return BOUNDED_N(chunk2mem(p), bytes);
-}
-
-static mchunkptr
-internal_function
-#if __STD_C
-chunk_align(arena* ar_ptr, INTERNAL_SIZE_T nb, size_t alignment)
-#else
-chunk_align(ar_ptr, nb, alignment)
-arena* ar_ptr; INTERNAL_SIZE_T nb; size_t alignment;
-#endif
-{
-  unsigned long m;            /* memory returned by malloc call */
-  mchunkptr p;                /* corresponding chunk */
-  char*     brk;              /* alignment point within p */
-  mchunkptr newp;             /* chunk to return */
-  INTERNAL_SIZE_T  newsize;   /* its size */
-  INTERNAL_SIZE_T  leadsize;  /* leading space befor alignment point */
-  mchunkptr remainder;        /* spare room at end to split off */
-  long      remainder_size;   /* its size */
-
-  /* Call chunk_alloc with worst case padding to hit alignment. */
-  p = chunk_alloc(ar_ptr, nb + alignment + MINSIZE);
-  if (p == 0)
-    return 0; /* propagate failure */
-
-  m = (unsigned long)chunk2mem(p);
-
-  if ((m % alignment) == 0) /* aligned */
-  {
-#if HAVE_MMAP
-    if(chunk_is_mmapped(p)) {
-      return p; /* nothing more to do */
-    }
-#endif
-  }
-  else /* misaligned */
-  {
-    /*
-      Find an aligned spot inside chunk.
-      Since we need to give back leading space in a chunk of at
-      least MINSIZE, if the first calculation places us at
-      a spot with less than MINSIZE leader, we can move to the
-      next aligned spot -- we've allocated enough total room so that
-      this is always possible.
-    */
-
-    brk = (char*)mem2chunk(((m + alignment - 1)) & -(long)alignment);
-    if ((long)(brk - (char*)(p)) < (long)MINSIZE) brk += alignment;
-
-    newp = chunk_at_offset(brk, 0);
-    leadsize = brk - (char*)(p);
-    newsize = chunksize(p) - leadsize;
-
-#if HAVE_MMAP
-    if(chunk_is_mmapped(p))
-    {
-      newp->prev_size = p->prev_size + leadsize;
-      set_head(newp, newsize|IS_MMAPPED);
-      return newp;
-    }
-#endif
-
-    /* give back leader, use the rest */
-
-    set_head(newp, newsize | PREV_INUSE);
-    set_inuse_bit_at_offset(newp, newsize);
-    set_head_size(p, leadsize);
-    chunk_free(ar_ptr, p);
-    p = newp;
-
-    assert (newsize>=nb && (((unsigned long)(chunk2mem(p))) % alignment) == 0);
-  }
-
-  /* Also give back spare room at the end */
-
-  remainder_size = chunksize(p) - nb;
-
-  if (remainder_size >= (long)MINSIZE)
-  {
-    remainder = chunk_at_offset(p, nb);
-    set_head(remainder, remainder_size | PREV_INUSE);
-    set_head_size(p, nb);
-    chunk_free(ar_ptr, remainder);
-  }
-
-  check_inuse_chunk(ar_ptr, p);
-  return p;
-}
-
-
-
-
-/*
-    valloc just invokes memalign with alignment argument equal
-    to the page size of the system (or as near to this as can
-    be figured out from all the includes/defines above.)
-*/
-
-#if __STD_C
-Void_t* vALLOc(size_t bytes)
-#else
-Void_t* vALLOc(bytes) size_t bytes;
-#endif
-{
-  if(__malloc_initialized < 0)
-    ptmalloc_init ();
-  return mEMALIGn (malloc_getpagesize, bytes);
-}
-
-/*
-  pvalloc just invokes valloc for the nearest pagesize
-  that will accommodate request
-*/
-
-
-#if __STD_C
-Void_t* pvALLOc(size_t bytes)
-#else
-Void_t* pvALLOc(bytes) size_t bytes;
-#endif
-{
-  size_t pagesize;
-  if(__malloc_initialized < 0)
-    ptmalloc_init ();
-  pagesize = malloc_getpagesize;
-  return mEMALIGn (pagesize, (bytes + pagesize - 1) & ~(pagesize - 1));
-}
-
-/*
-
-  calloc calls chunk_alloc, then zeroes out the allocated chunk.
-
-*/
-
-#if __STD_C
-Void_t* cALLOc(size_t n, size_t elem_size)
-#else
-Void_t* cALLOc(n, elem_size) size_t n; size_t elem_size;
-#endif
-{
-  arena *ar_ptr;
-  mchunkptr p, oldtop;
-  INTERNAL_SIZE_T sz, csz, oldtopsize;
-  Void_t* mem;
-
-#if defined _LIBC || defined MALLOC_HOOKS
-  __malloc_ptr_t (*hook) __MALLOC_PMT ((size_t, __const __malloc_ptr_t)) =
-    __malloc_hook;
-  if (hook != NULL) {
-    sz = n * elem_size;
-#if defined __GNUC__ && __GNUC__ >= 2
-    mem = (*hook)(sz, RETURN_ADDRESS (0));
-#else
-    mem = (*hook)(sz, NULL);
-#endif
-    if(mem == 0)
-      return 0;
-#ifdef HAVE_MEMSET
-    return memset(mem, 0, sz);
-#else
-    while(sz > 0) ((char*)mem)[--sz] = 0; /* rather inefficient */
-    return mem;
-#endif
-  }
-#endif
-
-  if(request2size(n * elem_size, sz))
-    return 0;
-  arena_get(ar_ptr, sz);
-  if(!ar_ptr)
-    return 0;
-
-  /* Check if expand_top called, in which case there may be
-     no need to clear. */
-#if MORECORE_CLEARS
-  oldtop = top(ar_ptr);
-  oldtopsize = chunksize(top(ar_ptr));
-#if MORECORE_CLEARS < 2
-  /* Only newly allocated memory is guaranteed to be cleared.  */
-  if (ar_ptr == &main_arena &&
-      oldtopsize < sbrk_base + max_sbrked_mem - (char *)oldtop)
-    oldtopsize = (sbrk_base + max_sbrked_mem - (char *)oldtop);
-#endif
-#endif
-  p = chunk_alloc (ar_ptr, sz);
-
-  /* Only clearing follows, so we can unlock early. */
-  (void)mutex_unlock(&ar_ptr->mutex);
-
-  if (p == 0) {
-    /* Maybe the failure is due to running out of mmapped areas. */
-    if(ar_ptr != &main_arena) {
-      (void)mutex_lock(&main_arena.mutex);
-      p = chunk_alloc(&main_arena, sz);
-      (void)mutex_unlock(&main_arena.mutex);
-    } else {
-#if USE_ARENAS
-      /* ... or sbrk() has failed and there is still a chance to mmap() */
-      (void)mutex_lock(&main_arena.mutex);
-      ar_ptr = arena_get2(ar_ptr->next ? ar_ptr : 0, sz);
-      (void)mutex_unlock(&main_arena.mutex);
-      if(ar_ptr) {
-        p = chunk_alloc(ar_ptr, sz);
-        (void)mutex_unlock(&ar_ptr->mutex);
-      }
-#endif
-    }
-    if (p == 0) return 0;
-  }
-  mem = BOUNDED_N(chunk2mem(p), n * elem_size);
-
-  /* Two optional cases in which clearing not necessary */
-
-#if HAVE_MMAP
-  if (chunk_is_mmapped(p)) return mem;
-#endif
-
-  csz = chunksize(p);
-
-#if MORECORE_CLEARS
-  if (p == oldtop && csz > oldtopsize) {
-    /* clear only the bytes from non-freshly-sbrked memory */
-    csz = oldtopsize;
-  }
-#endif
-
-  csz -= SIZE_SZ;
-  MALLOC_ZERO(BOUNDED_N(chunk2mem(p), csz), csz);
-  return mem;
-}
-
-/*
-
-  cfree just calls free. It is needed/defined on some systems
-  that pair it with calloc, presumably for odd historical reasons.
-
-*/
-
-#if !defined(_LIBC)
-#if __STD_C
-void cfree(Void_t *mem)
-#else
-void cfree(mem) Void_t *mem;
-#endif
-{
-  fREe(mem);
-}
-#endif
-
-
-
-/*
-
-    Malloc_trim gives memory back to the system (via negative
-    arguments to sbrk) if there is unused memory at the `high' end of
-    the malloc pool. You can call this after freeing large blocks of
-    memory to potentially reduce the system-level memory requirements
-    of a program. However, it cannot guarantee to reduce memory. Under
-    some allocation patterns, some large free blocks of memory will be
-    locked between two used chunks, so they cannot be given back to
-    the system.
-
-    The `pad' argument to malloc_trim represents the amount of free
-    trailing space to leave untrimmed. If this argument is zero,
-    only the minimum amount of memory to maintain internal data
-    structures will be left (one page or less). Non-zero arguments
-    can be supplied to maintain enough trailing space to service
-    future expected allocations without having to re-obtain memory
-    from the system.
-
-    Malloc_trim returns 1 if it actually released any memory, else 0.
-
-*/
-
-#if __STD_C
-int mALLOC_TRIm(size_t pad)
-#else
-int mALLOC_TRIm(pad) size_t pad;
-#endif
-{
-  int res;
-
-  (void)mutex_lock(&main_arena.mutex);
-  res = main_trim(pad);
-  (void)mutex_unlock(&main_arena.mutex);
-  return res;
-}
-
-/* Trim the main arena. */
-
-static int
-internal_function
-#if __STD_C
-main_trim(size_t pad)
-#else
-main_trim(pad) size_t pad;
-#endif
-{
-  mchunkptr top_chunk;   /* The current top chunk */
-  long  top_size;        /* Amount of top-most memory */
-  long  extra;           /* Amount to release */
-  char* current_brk;     /* address returned by pre-check sbrk call */
-  char* new_brk;         /* address returned by negative sbrk call */
-
-  unsigned long pagesz = malloc_getpagesize;
-
-  top_chunk = top(&main_arena);
-  top_size = chunksize(top_chunk);
-  extra = ((top_size - pad - MINSIZE + (pagesz-1)) / pagesz - 1) * pagesz;
-
-  if (extra < (long)pagesz) /* Not enough memory to release */
-    return 0;
-
-  /* Test to make sure no one else called sbrk */
-  current_brk = (char*)(MORECORE (0));
-  if (current_brk != (char*)(top_chunk) + top_size)
-    return 0;     /* Apparently we don't own memory; must fail */
-
-  new_brk = (char*)(MORECORE (-extra));
-
-#if defined _LIBC || defined MALLOC_HOOKS
-  /* Call the `morecore' hook if necessary.  */
-  if (__after_morecore_hook)
-    (*__after_morecore_hook) ();
-#endif
-
-  if (new_brk == (char*)(MORECORE_FAILURE)) { /* sbrk failed? */
-    /* Try to figure out what we have */
-    current_brk = (char*)(MORECORE (0));
-    top_size = current_brk - (char*)top_chunk;
-    if (top_size >= (long)MINSIZE) /* if not, we are very very dead! */
-    {
-      sbrked_mem = current_brk - sbrk_base;
-      set_head(top_chunk, top_size | PREV_INUSE);
-    }
-    check_chunk(&main_arena, top_chunk);
-    return 0;
-  }
-  sbrked_mem -= extra;
-
-  /* Success. Adjust top accordingly. */
-  set_head(top_chunk, (top_size - extra) | PREV_INUSE);
-  check_chunk(&main_arena, top_chunk);
-  return 1;
-}
-
-#if USE_ARENAS
-
-static int
-internal_function
-#if __STD_C
-heap_trim(heap_info *heap, size_t pad)
-#else
-heap_trim(heap, pad) heap_info *heap; size_t pad;
-#endif
-{
-  unsigned long pagesz = malloc_getpagesize;
-  arena *ar_ptr = heap->ar_ptr;
-  mchunkptr top_chunk = top(ar_ptr), p, bck, fwd;
-  heap_info *prev_heap;
-  long new_size, top_size, extra;
-
-  /* Can this heap go away completely ? */
-  while(top_chunk == chunk_at_offset(heap, sizeof(*heap))) {
-    prev_heap = heap->prev;
-    p = chunk_at_offset(prev_heap, prev_heap->size - (MINSIZE-2*SIZE_SZ));
-    assert(p->size == (0|PREV_INUSE)); /* must be fencepost */
-    p = prev_chunk(p);
-    new_size = chunksize(p) + (MINSIZE-2*SIZE_SZ);
-    assert(new_size>0 && new_size<(long)(2*MINSIZE));
-    if(!prev_inuse(p))
-      new_size += p->prev_size;
-    assert(new_size>0 && new_size<HEAP_MAX_SIZE);
-    if(new_size + (HEAP_MAX_SIZE - prev_heap->size) < pad + MINSIZE + pagesz)
-      break;
-    ar_ptr->size -= heap->size;
-    arena_mem -= heap->size;
-    delete_heap(heap);
-    heap = prev_heap;
-    if(!prev_inuse(p)) { /* consolidate backward */
-      p = prev_chunk(p);
-      unlink(p, bck, fwd);
-    }
-    assert(((unsigned long)((char*)p + new_size) & (pagesz-1)) == 0);
-    assert( ((char*)p + new_size) == ((char*)heap + heap->size) );
-    top(ar_ptr) = top_chunk = p;
-    set_head(top_chunk, new_size | PREV_INUSE);
-    check_chunk(ar_ptr, top_chunk);
-  }
-  top_size = chunksize(top_chunk);
-  extra = ((top_size - pad - MINSIZE + (pagesz-1))/pagesz - 1) * pagesz;
-  if(extra < (long)pagesz)
-    return 0;
-  /* Try to shrink. */
-  if(grow_heap(heap, -extra) != 0)
-    return 0;
-  ar_ptr->size -= extra;
-  arena_mem -= extra;
-
-  /* Success. Adjust top accordingly. */
-  set_head(top_chunk, (top_size - extra) | PREV_INUSE);
-  check_chunk(ar_ptr, top_chunk);
-  return 1;
-}
-
-#endif /* USE_ARENAS */
-
-
-
-/*
-  malloc_usable_size:
-
-    This routine tells you how many bytes you can actually use in an
-    allocated chunk, which may be more than you requested (although
-    often not). You can use this many bytes without worrying about
-    overwriting other allocated objects. Not a particularly great
-    programming practice, but still sometimes useful.
-
-*/
-
-#if __STD_C
-size_t mALLOC_USABLE_SIZe(Void_t* mem)
-#else
-size_t mALLOC_USABLE_SIZe(mem) Void_t* mem;
-#endif
-{
-  mchunkptr p;
-
-  if (mem == 0)
-    return 0;
-  else
-  {
-    p = mem2chunk(mem);
-    if(!chunk_is_mmapped(p))
-    {
-      if (!inuse(p)) return 0;
-      check_inuse_chunk(arena_for_ptr(mem), p);
-      return chunksize(p) - SIZE_SZ;
-    }
-    return chunksize(p) - 2*SIZE_SZ;
-  }
-}
-
-
-
-
-/* Utility to update mallinfo for malloc_stats() and mallinfo() */
-
-static void
-#if __STD_C
-malloc_update_mallinfo(arena *ar_ptr, struct mallinfo *mi)
-#else
-malloc_update_mallinfo(ar_ptr, mi) arena *ar_ptr; struct mallinfo *mi;
-#endif
-{
-  int i, navail;
-  mbinptr b;
-  mchunkptr p;
-#if MALLOC_DEBUG
-  mchunkptr q;
-#endif
-  INTERNAL_SIZE_T avail;
-
-  (void)mutex_lock(&ar_ptr->mutex);
-  avail = chunksize(top(ar_ptr));
-  navail = ((long)(avail) >= (long)MINSIZE)? 1 : 0;
-
-  for (i = 1; i < NAV; ++i)
-  {
-    b = bin_at(ar_ptr, i);
-    for (p = last(b); p != b; p = p->bk)
-    {
-#if MALLOC_DEBUG
-      check_free_chunk(ar_ptr, p);
-      for (q = next_chunk(p);
-           q != top(ar_ptr) && inuse(q) && (long)chunksize(q) > 0;
-           q = next_chunk(q))
-        check_inuse_chunk(ar_ptr, q);
-#endif
-      avail += chunksize(p);
-      navail++;
-    }
-  }
-
-  mi->arena = ar_ptr->size;
-  mi->ordblks = navail;
-  mi->smblks = mi->usmblks = mi->fsmblks = 0; /* clear unused fields */
-  mi->uordblks = ar_ptr->size - avail;
-  mi->fordblks = avail;
-  mi->hblks = n_mmaps;
-  mi->hblkhd = mmapped_mem;
-  mi->keepcost = chunksize(top(ar_ptr));
-
-  (void)mutex_unlock(&ar_ptr->mutex);
-}
-
-#if USE_ARENAS && MALLOC_DEBUG > 1
-
-/* Print the complete contents of a single heap to stderr. */
-
-static void
-#if __STD_C
-dump_heap(heap_info *heap)
-#else
-dump_heap(heap) heap_info *heap;
-#endif
-{
-  char *ptr;
-  mchunkptr p;
-
-  fprintf(stderr, "Heap %p, size %10lx:\n", heap, (long)heap->size);
-  ptr = (heap->ar_ptr != (arena*)(heap+1)) ?
-    (char*)(heap + 1) : (char*)(heap + 1) + sizeof(arena);
-  p = (mchunkptr)(((unsigned long)ptr + MALLOC_ALIGN_MASK) &
-                  ~MALLOC_ALIGN_MASK);
-  for(;;) {
-    fprintf(stderr, "chunk %p size %10lx", p, (long)p->size);
-    if(p == top(heap->ar_ptr)) {
-      fprintf(stderr, " (top)\n");
-      break;
-    } else if(p->size == (0|PREV_INUSE)) {
-      fprintf(stderr, " (fence)\n");
-      break;
-    }
-    fprintf(stderr, "\n");
-    p = next_chunk(p);
-  }
-}
-
-#endif
-
-
-
-/*
-
-  malloc_stats:
-
-    For all arenas separately and in total, prints on stderr the
-    amount of space obtained from the system, and the current number
-    of bytes allocated via malloc (or realloc, etc) but not yet
-    freed. (Note that this is the number of bytes allocated, not the
-    number requested. It will be larger than the number requested
-    because of alignment and bookkeeping overhead.)  When not compiled
-    for multiple threads, the maximum amount of allocated memory
-    (which may be more than current if malloc_trim and/or munmap got
-    called) is also reported.  When using mmap(), prints the maximum
-    number of simultaneous mmap regions used, too.
-
-*/
-
-void mALLOC_STATs()
-{
-  int i;
-  arena *ar_ptr;
-  struct mallinfo mi;
-  unsigned int in_use_b = mmapped_mem, system_b = in_use_b;
-#if THREAD_STATS
-  long stat_lock_direct = 0, stat_lock_loop = 0, stat_lock_wait = 0;
-#endif
-
-  for(i=0, ar_ptr = &main_arena;; i++) {
-    malloc_update_mallinfo(ar_ptr, &mi);
-    fprintf(stderr, "Arena %d:\n", i);
-    fprintf(stderr, "system bytes     = %10u\n", (unsigned int)mi.arena);
-    fprintf(stderr, "in use bytes     = %10u\n", (unsigned int)mi.uordblks);
-    system_b += mi.arena;
-    in_use_b += mi.uordblks;
-#if THREAD_STATS
-    stat_lock_direct += ar_ptr->stat_lock_direct;
-    stat_lock_loop += ar_ptr->stat_lock_loop;
-    stat_lock_wait += ar_ptr->stat_lock_wait;
-#endif
-#if USE_ARENAS && MALLOC_DEBUG > 1
-    if(ar_ptr != &main_arena) {
-      heap_info *heap;
-      (void)mutex_lock(&ar_ptr->mutex);
-      heap = heap_for_ptr(top(ar_ptr));
-      while(heap) { dump_heap(heap); heap = heap->prev; }
-      (void)mutex_unlock(&ar_ptr->mutex);
-    }
-#endif
-    ar_ptr = ar_ptr->next;
-    if(ar_ptr == &main_arena) break;
-  }
-#if HAVE_MMAP
-  fprintf(stderr, "Total (incl. mmap):\n");
-#else
-  fprintf(stderr, "Total:\n");
-#endif
-  fprintf(stderr, "system bytes     = %10u\n", system_b);
-  fprintf(stderr, "in use bytes     = %10u\n", in_use_b);
-#ifdef NO_THREADS
-  fprintf(stderr, "max system bytes = %10u\n", (unsigned int)max_total_mem);
-#endif
-#if HAVE_MMAP
-  fprintf(stderr, "max mmap regions = %10u\n", (unsigned int)max_n_mmaps);
-  fprintf(stderr, "max mmap bytes   = %10lu\n", max_mmapped_mem);
-#endif
-#if THREAD_STATS
-  fprintf(stderr, "heaps created    = %10d\n",  stat_n_heaps);
-  fprintf(stderr, "locked directly  = %10ld\n", stat_lock_direct);
-  fprintf(stderr, "locked in loop   = %10ld\n", stat_lock_loop);
-  fprintf(stderr, "locked waiting   = %10ld\n", stat_lock_wait);
-  fprintf(stderr, "locked total     = %10ld\n",
-          stat_lock_direct + stat_lock_loop + stat_lock_wait);
-#endif
-}
-
-/*
-  mallinfo returns a copy of updated current mallinfo.
-  The information reported is for the arena last used by the thread.
-*/
-
-struct mallinfo mALLINFo()
-{
-  struct mallinfo mi;
-  Void_t *vptr = NULL;
-
-#ifndef NO_THREADS
-  tsd_getspecific(arena_key, vptr);
-  if(vptr == ATFORK_ARENA_PTR)
-    vptr = (Void_t*)&main_arena;
-#endif
-  malloc_update_mallinfo((vptr ? (arena*)vptr : &main_arena), &mi);
-  return mi;
-}
-
-
-
-
-/*
-  mallopt:
-
-    mallopt is the general SVID/XPG interface to tunable parameters.
-    The format is to provide a (parameter-number, parameter-value) pair.
-    mallopt then sets the corresponding parameter to the argument
-    value if it can (i.e., so long as the value is meaningful),
-    and returns 1 if successful else 0.
-
-    See descriptions of tunable parameters above.
-
-*/
-
-#if __STD_C
-int mALLOPt(int param_number, int value)
-#else
-int mALLOPt(param_number, value) int param_number; int value;
-#endif
-{
-  switch(param_number)
-  {
-    case M_TRIM_THRESHOLD:
-      trim_threshold = value; return 1;
-    case M_TOP_PAD:
-      top_pad = value; return 1;
-    case M_MMAP_THRESHOLD:
-#if USE_ARENAS
-      /* Forbid setting the threshold too high. */
-      if((unsigned long)value > HEAP_MAX_SIZE/2) return 0;
-#endif
-      mmap_threshold = value; return 1;
-    case M_MMAP_MAX:
-#if HAVE_MMAP
-      n_mmaps_max = value; return 1;
-#else
-      if (value != 0) return 0; else  n_mmaps_max = value; return 1;
-#endif
-    case M_CHECK_ACTION:
-      check_action = value; return 1;
-
-    default:
-      return 0;
-  }
-}
-
-
-
-/* Get/set state: malloc_get_state() records the current state of all
-   malloc variables (_except_ for the actual heap contents and `hook'
-   function pointers) in a system dependent, opaque data structure.
-   This data structure is dynamically allocated and can be free()d
-   after use.  malloc_set_state() restores the state of all malloc
-   variables to the previously obtained state.  This is especially
-   useful when using this malloc as part of a shared library, and when
-   the heap contents are saved/restored via some other method.  The
-   primary example for this is GNU Emacs with its `dumping' procedure.
-   `Hook' function pointers are never saved or restored by these
-   functions, with two exceptions: If malloc checking was in use when
-   malloc_get_state() was called, then malloc_set_state() calls
-   __malloc_check_init() if possible; if malloc checking was not in
-   use in the recorded state but the user requested malloc checking,
-   then the hooks are reset to 0.  */
-
-#define MALLOC_STATE_MAGIC   0x444c4541l
-#define MALLOC_STATE_VERSION (0*0x100l + 1l) /* major*0x100 + minor */
-
-struct malloc_state {
-  long          magic;
-  long          version;
-  mbinptr       av[NAV * 2 + 2];
-  char*         sbrk_base;
-  int           sbrked_mem_bytes;
-  unsigned long trim_threshold;
-  unsigned long top_pad;
-  unsigned int  n_mmaps_max;
-  unsigned long mmap_threshold;
-  int           check_action;
-  unsigned long max_sbrked_mem;
-  unsigned long max_total_mem;
-  unsigned int  n_mmaps;
-  unsigned int  max_n_mmaps;
-  unsigned long mmapped_mem;
-  unsigned long max_mmapped_mem;
-  int           using_malloc_checking;
-};
-
-Void_t*
-mALLOC_GET_STATe()
-{
-  struct malloc_state* ms;
-  int i;
-  mbinptr b;
-
-  ms = (struct malloc_state*)mALLOc(sizeof(*ms));
-  if (!ms)
-    return 0;
-  (void)mutex_lock(&main_arena.mutex);
-  ms->magic = MALLOC_STATE_MAGIC;
-  ms->version = MALLOC_STATE_VERSION;
-  ms->av[0] = main_arena.av[0];
-  ms->av[1] = main_arena.av[1];
-  for(i=0; i<NAV; i++) {
-    b = bin_at(&main_arena, i);
-    if(first(b) == b)
-      ms->av[2*i+2] = ms->av[2*i+3] = 0; /* empty bin (or initial top) */
-    else {
-      ms->av[2*i+2] = first(b);
-      ms->av[2*i+3] = last(b);
-    }
-  }
-  ms->sbrk_base = sbrk_base;
-  ms->sbrked_mem_bytes = sbrked_mem;
-  ms->trim_threshold = trim_threshold;
-  ms->top_pad = top_pad;
-  ms->n_mmaps_max = n_mmaps_max;
-  ms->mmap_threshold = mmap_threshold;
-  ms->check_action = check_action;
-  ms->max_sbrked_mem = max_sbrked_mem;
-#ifdef NO_THREADS
-  ms->max_total_mem = max_total_mem;
-#else
-  ms->max_total_mem = 0;
-#endif
-  ms->n_mmaps = n_mmaps;
-  ms->max_n_mmaps = max_n_mmaps;
-  ms->mmapped_mem = mmapped_mem;
-  ms->max_mmapped_mem = max_mmapped_mem;
-#if defined _LIBC || defined MALLOC_HOOKS
-  ms->using_malloc_checking = using_malloc_checking;
-#else
-  ms->using_malloc_checking = 0;
-#endif
-  (void)mutex_unlock(&main_arena.mutex);
-  return (Void_t*)ms;
-}
-
-int
-#if __STD_C
-mALLOC_SET_STATe(Void_t* msptr)
-#else
-mALLOC_SET_STATe(msptr) Void_t* msptr;
-#endif
-{
-  struct malloc_state* ms = (struct malloc_state*)msptr;
-  int i;
-  mbinptr b;
-
-#if defined _LIBC || defined MALLOC_HOOKS
-  disallow_malloc_check = 1;
-#endif
-  ptmalloc_init();
-  if(ms->magic != MALLOC_STATE_MAGIC) return -1;
-  /* Must fail if the major version is too high. */
-  if((ms->version & ~0xffl) > (MALLOC_STATE_VERSION & ~0xffl)) return -2;
-  (void)mutex_lock(&main_arena.mutex);
-  main_arena.av[0] = ms->av[0];
-  main_arena.av[1] = ms->av[1];
-  for(i=0; i<NAV; i++) {
-    b = bin_at(&main_arena, i);
-    if(ms->av[2*i+2] == 0)
-      first(b) = last(b) = b;
-    else {
-      first(b) = ms->av[2*i+2];
-      last(b) = ms->av[2*i+3];
-      if(i > 0) {
-        /* Make sure the links to the `av'-bins in the heap are correct. */
-        first(b)->bk = b;
-        last(b)->fd = b;
-      }
-    }
-  }
-  sbrk_base = ms->sbrk_base;
-  sbrked_mem = ms->sbrked_mem_bytes;
-  trim_threshold = ms->trim_threshold;
-  top_pad = ms->top_pad;
-  n_mmaps_max = ms->n_mmaps_max;
-  mmap_threshold = ms->mmap_threshold;
-  check_action = ms->check_action;
-  max_sbrked_mem = ms->max_sbrked_mem;
-#ifdef NO_THREADS
-  max_total_mem = ms->max_total_mem;
-#endif
-  n_mmaps = ms->n_mmaps;
-  max_n_mmaps = ms->max_n_mmaps;
-  mmapped_mem = ms->mmapped_mem;
-  max_mmapped_mem = ms->max_mmapped_mem;
-  /* add version-dependent code here */
-  if (ms->version >= 1) {
-#if defined _LIBC || defined MALLOC_HOOKS
-    /* Check whether it is safe to enable malloc checking, or whether
-       it is necessary to disable it.  */
-    if (ms->using_malloc_checking && !using_malloc_checking &&
-        !disallow_malloc_check)
-      __malloc_check_init ();
-    else if (!ms->using_malloc_checking && using_malloc_checking) {
-      __malloc_hook = 0;
-      __free_hook = 0;
-      __realloc_hook = 0;
-      __memalign_hook = 0;
-      using_malloc_checking = 0;
-    }
-#endif
-  }
-
-  (void)mutex_unlock(&main_arena.mutex);
-  return 0;
-}
-
-
-
-#if defined _LIBC || defined MALLOC_HOOKS
-
-/* A simple, standard set of debugging hooks.  Overhead is `only' one
-   byte per chunk; still this will catch most cases of double frees or
-   overruns.  The goal here is to avoid obscure crashes due to invalid
-   usage, unlike in the MALLOC_DEBUG code. */
-
-#define MAGICBYTE(p) ( ( ((size_t)p >> 3) ^ ((size_t)p >> 11)) & 0xFF )
-
-/* Instrument a chunk with overrun detector byte(s) and convert it
-   into a user pointer with requested size sz. */
-
-static Void_t*
-internal_function
-#if __STD_C
-chunk2mem_check(mchunkptr p, size_t sz)
-#else
-chunk2mem_check(p, sz) mchunkptr p; size_t sz;
-#endif
-{
-  unsigned char* m_ptr = (unsigned char*)BOUNDED_N(chunk2mem(p), sz);
-  size_t i;
-
-  for(i = chunksize(p) - (chunk_is_mmapped(p) ? 2*SIZE_SZ+1 : SIZE_SZ+1);
-      i > sz;
-      i -= 0xFF) {
-    if(i-sz < 0x100) {
-      m_ptr[i] = (unsigned char)(i-sz);
-      break;
-    }
-    m_ptr[i] = 0xFF;
-  }
-  m_ptr[sz] = MAGICBYTE(p);
-  return (Void_t*)m_ptr;
-}
-
-/* Convert a pointer to be free()d or realloc()ed to a valid chunk
-   pointer.  If the provided pointer is not valid, return NULL. */
-
-static mchunkptr
-internal_function
-#if __STD_C
-mem2chunk_check(Void_t* mem)
-#else
-mem2chunk_check(mem) Void_t* mem;
-#endif
-{
-  mchunkptr p;
-  INTERNAL_SIZE_T sz, c;
-  unsigned char magic;
-
-  p = mem2chunk(mem);
-  if(!aligned_OK(p)) return NULL;
-  if( (char*)p>=sbrk_base && (char*)p<(sbrk_base+sbrked_mem) ) {
-    /* Must be a chunk in conventional heap memory. */
-    if(chunk_is_mmapped(p) ||
-       ( (sz = chunksize(p)), ((char*)p + sz)>=(sbrk_base+sbrked_mem) ) ||
-       sz<MINSIZE || sz&MALLOC_ALIGN_MASK || !inuse(p) ||
-       ( !prev_inuse(p) && (p->prev_size&MALLOC_ALIGN_MASK ||
-                            (long)prev_chunk(p)<(long)sbrk_base ||
-                            next_chunk(prev_chunk(p))!=p) ))
-      return NULL;
-    magic = MAGICBYTE(p);
-    for(sz += SIZE_SZ-1; (c = ((unsigned char*)p)[sz]) != magic; sz -= c) {
-      if(c<=0 || sz<(c+2*SIZE_SZ)) return NULL;
-    }
-    ((unsigned char*)p)[sz] ^= 0xFF;
-  } else {
-    unsigned long offset, page_mask = malloc_getpagesize-1;
-
-    /* mmap()ed chunks have MALLOC_ALIGNMENT or higher power-of-two
-       alignment relative to the beginning of a page.  Check this
-       first. */
-    offset = (unsigned long)mem & page_mask;
-    if((offset!=MALLOC_ALIGNMENT && offset!=0 && offset!=0x10 &&
-        offset!=0x20 && offset!=0x40 && offset!=0x80 && offset!=0x100 &&
-        offset!=0x200 && offset!=0x400 && offset!=0x800 && offset!=0x1000 &&
-        offset<0x2000) ||
-       !chunk_is_mmapped(p) || (p->size & PREV_INUSE) ||
-       ( (((unsigned long)p - p->prev_size) & page_mask) != 0 ) ||
-       ( (sz = chunksize(p)), ((p->prev_size + sz) & page_mask) != 0 ) )
-      return NULL;
-    magic = MAGICBYTE(p);
-    for(sz -= 1; (c = ((unsigned char*)p)[sz]) != magic; sz -= c) {
-      if(c<=0 || sz<(c+2*SIZE_SZ)) return NULL;
-    }
-    ((unsigned char*)p)[sz] ^= 0xFF;
-  }
-  return p;
-}
-
-/* Check for corruption of the top chunk, and try to recover if
-   necessary. */
-
-static int
-internal_function
-#if __STD_C
-top_check(void)
-#else
-top_check()
-#endif
-{
-  mchunkptr t = top(&main_arena);
-  char* brk, * new_brk;
-  INTERNAL_SIZE_T front_misalign, sbrk_size;
-  unsigned long pagesz = malloc_getpagesize;
-
-  if((char*)t + chunksize(t) == sbrk_base + sbrked_mem ||
-     t == initial_top(&main_arena)) return 0;
-
-  if(check_action & 1)
-    fprintf(stderr, "malloc: top chunk is corrupt\n");
-  if(check_action & 2)
-    abort();
-
-  /* Try to set up a new top chunk. */
-  brk = MORECORE(0);
-  front_misalign = (unsigned long)chunk2mem(brk) & MALLOC_ALIGN_MASK;
-  if (front_misalign > 0)
-    front_misalign = MALLOC_ALIGNMENT - front_misalign;
-  sbrk_size = front_misalign + top_pad + MINSIZE;
-  sbrk_size += pagesz - ((unsigned long)(brk + sbrk_size) & (pagesz - 1));
-  new_brk = (char*)(MORECORE (sbrk_size));
-  if (new_brk == (char*)(MORECORE_FAILURE)) return -1;
-  sbrked_mem = (new_brk - sbrk_base) + sbrk_size;
-
-  top(&main_arena) = (mchunkptr)(brk + front_misalign);
-  set_head(top(&main_arena), (sbrk_size - front_misalign) | PREV_INUSE);
-
-  return 0;
-}
-
-static Void_t*
-#if __STD_C
-malloc_check(size_t sz, const Void_t *caller)
-#else
-malloc_check(sz, caller) size_t sz; const Void_t *caller;
-#endif
-{
-  mchunkptr victim;
-  INTERNAL_SIZE_T nb;
-
-  if(request2size(sz+1, nb))
-    return 0;
-  (void)mutex_lock(&main_arena.mutex);
-  victim = (top_check() >= 0) ? chunk_alloc(&main_arena, nb) : NULL;
-  (void)mutex_unlock(&main_arena.mutex);
-  if(!victim) return NULL;
-  return chunk2mem_check(victim, sz);
-}
-
-static void
-#if __STD_C
-free_check(Void_t* mem, const Void_t *caller)
-#else
-free_check(mem, caller) Void_t* mem; const Void_t *caller;
-#endif
-{
-  mchunkptr p;
-
-  if(!mem) return;
-  (void)mutex_lock(&main_arena.mutex);
-  p = mem2chunk_check(mem);
-  if(!p) {
-    (void)mutex_unlock(&main_arena.mutex);
-    if(check_action & 1)
-      fprintf(stderr, "free(): invalid pointer %p!\n", mem);
-    if(check_action & 2)
-      abort();
-    return;
-  }
-#if HAVE_MMAP
-  if (chunk_is_mmapped(p)) {
-    (void)mutex_unlock(&main_arena.mutex);
-    munmap_chunk(p);
-    return;
-  }
-#endif
-#if 0 /* Erase freed memory. */
-  memset(mem, 0, chunksize(p) - (SIZE_SZ+1));
-#endif
-  chunk_free(&main_arena, p);
-  (void)mutex_unlock(&main_arena.mutex);
-}
-
-static Void_t*
-#if __STD_C
-realloc_check(Void_t* oldmem, size_t bytes, const Void_t *caller)
-#else
-realloc_check(oldmem, bytes, caller)
-     Void_t* oldmem; size_t bytes; const Void_t *caller;
-#endif
-{
-  mchunkptr oldp, newp;
-  INTERNAL_SIZE_T nb, oldsize;
-
-  if (oldmem == 0) return malloc_check(bytes, NULL);
-  (void)mutex_lock(&main_arena.mutex);
-  oldp = mem2chunk_check(oldmem);
-  if(!oldp) {
-    (void)mutex_unlock(&main_arena.mutex);
-    if(check_action & 1)
-      fprintf(stderr, "realloc(): invalid pointer %p!\n", oldmem);
-    if(check_action & 2)
-      abort();
-    return malloc_check(bytes, NULL);
-  }
-  oldsize = chunksize(oldp);
-
-  if(request2size(bytes+1, nb)) {
-    (void)mutex_unlock(&main_arena.mutex);
-    return 0;
-  }
-
-#if HAVE_MMAP
-  if (chunk_is_mmapped(oldp)) {
-#if HAVE_MREMAP
-    newp = mremap_chunk(oldp, nb);
-    if(!newp) {
-#endif
-      /* Note the extra SIZE_SZ overhead. */
-      if(oldsize - SIZE_SZ >= nb) newp = oldp; /* do nothing */
-      else {
-        /* Must alloc, copy, free. */
-        newp = (top_check() >= 0) ? chunk_alloc(&main_arena, nb) : NULL;
-        if (newp) {
-          MALLOC_COPY(BOUNDED_N(chunk2mem(newp), nb),
-		      oldmem, oldsize - 2*SIZE_SZ, 0);
-          munmap_chunk(oldp);
-        }
-      }
-#if HAVE_MREMAP
-    }
-#endif
-  } else {
-#endif /* HAVE_MMAP */
-    newp = (top_check() >= 0) ?
-      chunk_realloc(&main_arena, oldp, oldsize, nb) : NULL;
-#if 0 /* Erase freed memory. */
-    nb = chunksize(newp);
-    if(oldp<newp || oldp>=chunk_at_offset(newp, nb)) {
-      memset((char*)oldmem + 2*sizeof(mbinptr), 0,
-             oldsize - (2*sizeof(mbinptr)+2*SIZE_SZ+1));
-    } else if(nb > oldsize+SIZE_SZ) {
-      memset((char*)BOUNDED_N(chunk2mem(newp), bytes) + oldsize,
-	     0, nb - (oldsize+SIZE_SZ));
-    }
-#endif
-#if HAVE_MMAP
-  }
-#endif
-  (void)mutex_unlock(&main_arena.mutex);
-
-  if(!newp) return NULL;
-  return chunk2mem_check(newp, bytes);
-}
-
-static Void_t*
-#if __STD_C
-memalign_check(size_t alignment, size_t bytes, const Void_t *caller)
-#else
-memalign_check(alignment, bytes, caller)
-     size_t alignment; size_t bytes; const Void_t *caller;
-#endif
-{
-  INTERNAL_SIZE_T nb;
-  mchunkptr p;
-
-  if (alignment <= MALLOC_ALIGNMENT) return malloc_check(bytes, NULL);
-  if (alignment <  MINSIZE) alignment = MINSIZE;
-
-  if(request2size(bytes+1, nb))
-    return 0;
-  (void)mutex_lock(&main_arena.mutex);
-  p = (top_check() >= 0) ? chunk_align(&main_arena, nb, alignment) : NULL;
-  (void)mutex_unlock(&main_arena.mutex);
-  if(!p) return NULL;
-  return chunk2mem_check(p, bytes);
-}
-
-#ifndef NO_THREADS
-
-/* The following hooks are used when the global initialization in
-   ptmalloc_init() hasn't completed yet. */
-
-static Void_t*
-#if __STD_C
-malloc_starter(size_t sz, const Void_t *caller)
-#else
-malloc_starter(sz, caller) size_t sz; const Void_t *caller;
-#endif
-{
-  INTERNAL_SIZE_T nb;
-  mchunkptr victim;
-
-  if(request2size(sz, nb))
-    return 0;
-  victim = chunk_alloc(&main_arena, nb);
-
-  return victim ? BOUNDED_N(chunk2mem(victim), sz) : 0;
-}
-
-static void
-#if __STD_C
-free_starter(Void_t* mem, const Void_t *caller)
-#else
-free_starter(mem, caller) Void_t* mem; const Void_t *caller;
-#endif
-{
-  mchunkptr p;
-
-  if(!mem) return;
-  p = mem2chunk(mem);
-#if HAVE_MMAP
-  if (chunk_is_mmapped(p)) {
-    munmap_chunk(p);
-    return;
-  }
-#endif
-  chunk_free(&main_arena, p);
-}
-
-/* The following hooks are used while the `atfork' handling mechanism
-   is active. */
-
-static Void_t*
-#if __STD_C
-malloc_atfork (size_t sz, const Void_t *caller)
-#else
-malloc_atfork(sz, caller) size_t sz; const Void_t *caller;
-#endif
-{
-  Void_t *vptr = NULL;
-  INTERNAL_SIZE_T nb;
-  mchunkptr victim;
-
-  tsd_getspecific(arena_key, vptr);
-  if(vptr == ATFORK_ARENA_PTR) {
-    /* We are the only thread that may allocate at all.  */
-    if(save_malloc_hook != malloc_check) {
-      if(request2size(sz, nb))
-        return 0;
-      victim = chunk_alloc(&main_arena, nb);
-      return victim ? BOUNDED_N(chunk2mem(victim), sz) : 0;
-    } else {
-      if(top_check()<0 || request2size(sz+1, nb))
-        return 0;
-      victim = chunk_alloc(&main_arena, nb);
-      return victim ? chunk2mem_check(victim, sz) : 0;
-    }
-  } else {
-    /* Suspend the thread until the `atfork' handlers have completed.
-       By that time, the hooks will have been reset as well, so that
-       mALLOc() can be used again. */
-    (void)mutex_lock(&list_lock);
-    (void)mutex_unlock(&list_lock);
-    return mALLOc(sz);
-  }
-}
-
-static void
-#if __STD_C
-free_atfork(Void_t* mem, const Void_t *caller)
-#else
-free_atfork(mem, caller) Void_t* mem; const Void_t *caller;
-#endif
-{
-  Void_t *vptr = NULL;
-  arena *ar_ptr;
-  mchunkptr p;                          /* chunk corresponding to mem */
-
-  if (mem == 0)                              /* free(0) has no effect */
-    return;
-
-  p = mem2chunk(mem);         /* do not bother to replicate free_check here */
-
-#if HAVE_MMAP
-  if (chunk_is_mmapped(p))                       /* release mmapped memory. */
-  {
-    munmap_chunk(p);
-    return;
-  }
-#endif
-
-  ar_ptr = arena_for_ptr(p);
-  tsd_getspecific(arena_key, vptr);
-  if(vptr != ATFORK_ARENA_PTR)
-    (void)mutex_lock(&ar_ptr->mutex);
-  chunk_free(ar_ptr, p);
-  if(vptr != ATFORK_ARENA_PTR)
-    (void)mutex_unlock(&ar_ptr->mutex);
-}
-
-#endif /* !defined NO_THREADS */
-
-#endif /* defined _LIBC || defined MALLOC_HOOKS */
-
-
-
-#ifdef _LIBC
-
-/* default method of getting more storage */
-__malloc_ptr_t
-__default_morecore (int inc)
-{
-  __malloc_ptr_t result = (__malloc_ptr_t)sbrk (inc);
-  if (result == (__malloc_ptr_t)-1)
-    return NULL;
-  return result;
-}
- 
-/* We need a wrapper function for one of the additions of POSIX.  */
-int
-__posix_memalign (void **memptr, size_t alignment, size_t size)
-{
-  void *mem;
-
-  /* Test whether the ALIGNMENT argument is valid.  It must be a power
-     of two multiple of sizeof (void *).  */
-  if (alignment % sizeof (void *) != 0 || (alignment & (alignment - 1)) != 0)
-    return EINVAL;
-
-  mem = __libc_memalign (alignment, size);
-
-  if (mem != NULL)
-    {
-      *memptr = mem;
-      return 0;
-    }
-
-  return ENOMEM;
-}
-weak_alias (__posix_memalign, posix_memalign)
-
-weak_alias (__libc_calloc, __calloc) weak_alias (__libc_calloc, calloc)
-weak_alias (__libc_free, __cfree) weak_alias (__libc_free, cfree)
-weak_alias (__libc_free, __free) weak_alias (__libc_free, free)
-weak_alias (__libc_malloc, __malloc) weak_alias (__libc_malloc, malloc)
-weak_alias (__libc_memalign, __memalign) weak_alias (__libc_memalign, memalign)
-weak_alias (__libc_realloc, __realloc) weak_alias (__libc_realloc, realloc)
-weak_alias (__libc_valloc, __valloc) weak_alias (__libc_valloc, valloc)
-weak_alias (__libc_pvalloc, __pvalloc) weak_alias (__libc_pvalloc, pvalloc)
-weak_alias (__libc_mallinfo, __mallinfo) weak_alias (__libc_mallinfo, mallinfo)
-weak_alias (__libc_mallopt, __mallopt) weak_alias (__libc_mallopt, mallopt)
-
-weak_alias (__malloc_stats, malloc_stats)
-weak_alias (__malloc_usable_size, malloc_usable_size)
-weak_alias (__malloc_trim, malloc_trim)
-weak_alias (__malloc_get_state, malloc_get_state)
-weak_alias (__malloc_set_state, malloc_set_state)
-#endif
-
-/*
-
-History:
-
-    V2.6.4-pt3 Thu Feb 20 1997 Wolfram Gloger (wmglo@dent.med.uni-muenchen.de)
-      * Added malloc_get/set_state() (mainly for use in GNU emacs),
-        using interface from Marcus Daniels
-      * All parameters are now adjustable via environment variables
-
-    V2.6.4-pt2 Sat Dec 14 1996 Wolfram Gloger (wmglo@dent.med.uni-muenchen.de)
-      * Added debugging hooks
-      * Fixed possible deadlock in realloc() when out of memory
-      * Don't pollute namespace in glibc: use __getpagesize, __mmap, etc.
-
-    V2.6.4-pt Wed Dec  4 1996 Wolfram Gloger (wmglo@dent.med.uni-muenchen.de)
-      * Very minor updates from the released 2.6.4 version.
-      * Trimmed include file down to exported data structures.
-      * Changes from H.J. Lu for glibc-2.0.
-
-    V2.6.3i-pt Sep 16 1996  Wolfram Gloger (wmglo@dent.med.uni-muenchen.de)
-      * Many changes for multiple threads
-      * Introduced arenas and heaps
-
-    V2.6.3 Sun May 19 08:17:58 1996  Doug Lea  (dl at gee)
-      * Added pvalloc, as recommended by H.J. Liu
-      * Added 64bit pointer support mainly from Wolfram Gloger
-      * Added anonymously donated WIN32 sbrk emulation
-      * Malloc, calloc, getpagesize: add optimizations from Raymond Nijssen
-      * malloc_extend_top: fix mask error that caused wastage after
-        foreign sbrks
-      * Add linux mremap support code from HJ Liu
-
-    V2.6.2 Tue Dec  5 06:52:55 1995  Doug Lea  (dl at gee)
-      * Integrated most documentation with the code.
-      * Add support for mmap, with help from
-        Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
-      * Use last_remainder in more cases.
-      * Pack bins using idea from  colin@nyx10.cs.du.edu
-      * Use ordered bins instead of best-fit threshold
-      * Eliminate block-local decls to simplify tracing and debugging.
-      * Support another case of realloc via move into top
-      * Fix error occurring when initial sbrk_base not word-aligned.
-      * Rely on page size for units instead of SBRK_UNIT to
-        avoid surprises about sbrk alignment conventions.
-      * Add mallinfo, mallopt. Thanks to Raymond Nijssen
-        (raymond@es.ele.tue.nl) for the suggestion.
-      * Add `pad' argument to malloc_trim and top_pad mallopt parameter.
-      * More precautions for cases where other routines call sbrk,
-        courtesy of Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
-      * Added macros etc., allowing use in linux libc from
-        H.J. Lu (hjl@gnu.ai.mit.edu)
-      * Inverted this history list
-
-    V2.6.1 Sat Dec  2 14:10:57 1995  Doug Lea  (dl at gee)
-      * Re-tuned and fixed to behave more nicely with V2.6.0 changes.
-      * Removed all preallocation code since under current scheme
-        the work required to undo bad preallocations exceeds
-        the work saved in good cases for most test programs.
-      * No longer use return list or unconsolidated bins since
-        no scheme using them consistently outperforms those that don't
-        given above changes.
-      * Use best fit for very large chunks to prevent some worst-cases.
-      * Added some support for debugging
-
-    V2.6.0 Sat Nov  4 07:05:23 1995  Doug Lea  (dl at gee)
-      * Removed footers when chunks are in use. Thanks to
-        Paul Wilson (wilson@cs.texas.edu) for the suggestion.
-
-    V2.5.4 Wed Nov  1 07:54:51 1995  Doug Lea  (dl at gee)
-      * Added malloc_trim, with help from Wolfram Gloger
-        (wmglo@Dent.MED.Uni-Muenchen.DE).
-
-    V2.5.3 Tue Apr 26 10:16:01 1994  Doug Lea  (dl at g)
-
-    V2.5.2 Tue Apr  5 16:20:40 1994  Doug Lea  (dl at g)
-      * realloc: try to expand in both directions
-      * malloc: swap order of clean-bin strategy;
-      * realloc: only conditionally expand backwards
-      * Try not to scavenge used bins
-      * Use bin counts as a guide to preallocation
-      * Occasionally bin return list chunks in first scan
-      * Add a few optimizations from colin@nyx10.cs.du.edu
-
-    V2.5.1 Sat Aug 14 15:40:43 1993  Doug Lea  (dl at g)
-      * faster bin computation & slightly different binning
-      * merged all consolidations to one part of malloc proper
-         (eliminating old malloc_find_space & malloc_clean_bin)
-      * Scan 2 returns chunks (not just 1)
-      * Propagate failure in realloc if malloc returns 0
-      * Add stuff to allow compilation on non-ANSI compilers
-          from kpv@research.att.com
-
-    V2.5 Sat Aug  7 07:41:59 1993  Doug Lea  (dl at g.oswego.edu)
-      * removed potential for odd address access in prev_chunk
-      * removed dependency on getpagesize.h
-      * misc cosmetics and a bit more internal documentation
-      * anticosmetics: mangled names in macros to evade debugger strangeness
-      * tested on sparc, hp-700, dec-mips, rs6000
-          with gcc & native cc (hp, dec only) allowing
-          Detlefs & Zorn comparison study (in SIGPLAN Notices.)
-
-    Trial version Fri Aug 28 13:14:29 1992  Doug Lea  (dl at g.oswego.edu)
-      * Based loosely on libg++-1.2X malloc. (It retains some of the overall
-         structure of old version,  but most details differ.)
-
-*/
diff --git a/newlib/libc/sys/linux/mallocr.c b/newlib/libc/sys/linux/mallocr.c
deleted file mode 100644
index b5129a5..0000000
--- a/newlib/libc/sys/linux/mallocr.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-void *
-_malloc_r (struct _reent *ptr, size_t size)
-{
-  return malloc (size);
-}
diff --git a/newlib/libc/sys/linux/malloptr.c b/newlib/libc/sys/linux/malloptr.c
deleted file mode 100644
index 13d4e9f..0000000
--- a/newlib/libc/sys/linux/malloptr.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-int 
-_mallopt_r (struct _reent *ptr, int param_number, int value)
-{
-  return mallopt (param_number, value);
-}
diff --git a/newlib/libc/sys/linux/mallstatsr.c b/newlib/libc/sys/linux/mallstatsr.c
deleted file mode 100644
index 8a1f642..0000000
--- a/newlib/libc/sys/linux/mallstatsr.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-void
-_malloc_stats_r (struct _reent *ptr)
-{
-  malloc_stats ();
-}
diff --git a/newlib/libc/sys/linux/mcheck.c b/newlib/libc/sys/linux/mcheck.c
deleted file mode 100644
index eeb99da..0000000
--- a/newlib/libc/sys/linux/mcheck.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/* Standard debugging hooks for `malloc'.
-   Copyright (C) 1990-1997, 1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written May 1989 by Mike Haertel.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Modified for newlib, July 9, 2002 by Jeff Johnston */
-
-#ifndef	_MALLOC_INTERNAL
-# define _MALLOC_INTERNAL
-# include <features.h>
-# define _LIBC 1
-# include <malloc.h>
-# include <mcheck.h>
-# include <stdint.h>
-# include <stdio.h>
-# include <stdlib.h>
-# include <libintl.h>
-# include <sys/cdefs.h>
-#endif
-
-/* Old hook values.  */
-static void (*old_free_hook) __P ((__ptr_t ptr, __const __ptr_t));
-static __ptr_t (*old_malloc_hook) __P ((__malloc_size_t size, const __ptr_t));
-static __ptr_t (*old_realloc_hook) __P ((__ptr_t ptr, __malloc_size_t size,
-					 __const __ptr_t));
-
-/* Function to call when something awful happens.  */
-static void (*abortfunc) __P ((enum mcheck_status));
-
-/* Arbitrary magical numbers.  */
-#define MAGICWORD	0xfedabeeb
-#define MAGICFREE	0xd8675309
-#define MAGICBYTE	((char) 0xd7)
-#define MALLOCFLOOD	((char) 0x93)
-#define FREEFLOOD	((char) 0x95)
-
-struct hdr
-  {
-    __malloc_size_t size;	/* Exact size requested by user.  */
-    unsigned long int magic;	/* Magic number to check header integrity.  */
-    struct hdr *prev;
-    struct hdr *next;
-  };
-
-/* This is the beginning of the list of all memory blocks allocated.
-   It is only constructed if the pedantic testing is requested.  */
-static struct hdr *root;
-
-static int mcheck_used;
-
-/* Nonzero if pedentic checking of all blocks is requested.  */
-static int pedantic;
-
-#if defined _LIBC || defined STDC_HEADERS || defined USG
-# include <string.h>
-# define flood memset
-#else
-static void flood __P ((__ptr_t, int, __malloc_size_t));
-static void
-flood (ptr, val, size)
-     __ptr_t ptr;
-     int val;
-     __malloc_size_t size;
-{
-  char *cp = ptr;
-  while (size--)
-    *cp++ = val;
-}
-#endif
-
-static enum mcheck_status checkhdr __P ((const struct hdr *));
-static enum mcheck_status
-checkhdr (hdr)
-     const struct hdr *hdr;
-{
-  enum mcheck_status status;
-
-  if (!mcheck_used)
-    /* Maybe the mcheck used is disabled?  This happens when we find
-       an error and report it.  */
-    return MCHECK_OK;
-
-  switch (hdr->magic ^ ((uintptr_t) hdr->prev + (uintptr_t) hdr->next))
-    {
-    default:
-      status = MCHECK_HEAD;
-      break;
-    case MAGICFREE:
-      status = MCHECK_FREE;
-      break;
-    case MAGICWORD:
-      if (((char *) &hdr[1])[hdr->size] != MAGICBYTE)
-	status = MCHECK_TAIL;
-      else
-	status = MCHECK_OK;
-      break;
-    }
-  if (status != MCHECK_OK)
-    {
-      mcheck_used = 0;
-      (*abortfunc) (status);
-      mcheck_used = 1;
-    }
-  return status;
-}
-
-void
-mcheck_check_all ()
-{
-  /* Walk through all the active blocks and test whether they were tempered
-     with.  */
-  struct hdr *runp = root;
-
-  /* Temporarily turn off the checks.  */
-  pedantic = 0;
-
-  while (runp != NULL)
-    {
-      (void) checkhdr (runp);
-
-      runp = runp->next;
-    }
-
-  /* Turn checks on again.  */
-  pedantic = 1;
-}
-
-static void unlink_blk __P ((struct hdr *ptr));
-static void
-unlink_blk (ptr)
-     struct hdr *ptr;
-{
-  if (ptr->next != NULL)
-    {
-      ptr->next->prev = ptr->prev;
-      ptr->next->magic = MAGICWORD ^ ((uintptr_t) ptr->next->prev
-				      + (uintptr_t) ptr->next->next);
-    }
-  if (ptr->prev != NULL)
-    {
-      ptr->prev->next = ptr->next;
-      ptr->prev->magic = MAGICWORD ^ ((uintptr_t) ptr->prev->prev
-				      + (uintptr_t) ptr->prev->next);
-    }
-  else
-    root = ptr->next;
-}
-
-static void link_blk  __P ((struct hdr *ptr));
-static void
-link_blk (hdr)
-     struct hdr *hdr;
-{
-  hdr->prev = NULL;
-  hdr->next = root;
-  root = hdr;
-  hdr->magic = MAGICWORD ^ (uintptr_t) hdr->next;
-
-  /* And the next block.  */
-  if (hdr->next != NULL)
-    {
-      hdr->next->prev = hdr;
-      hdr->next->magic = MAGICWORD ^ ((uintptr_t) hdr
-				      + (uintptr_t) hdr->next->next);
-    }
-}
-
-static void freehook __P ((__ptr_t, const __ptr_t));
-static void
-freehook (ptr, caller)
-     __ptr_t ptr;
-     const __ptr_t caller;
-{
-  if (pedantic)
-    mcheck_check_all ();
-  if (ptr)
-    {
-      struct hdr *hdr = ((struct hdr *) ptr) - 1;
-      checkhdr (hdr);
-      hdr->magic = MAGICFREE;
-      unlink_blk (hdr);
-      hdr->prev = hdr->next = NULL;
-      flood (ptr, FREEFLOOD, hdr->size);
-      ptr = (__ptr_t) hdr;
-    }
-  __free_hook = old_free_hook;
-  if (old_free_hook != NULL)
-    (*old_free_hook) (ptr, caller);
-  else
-    free (ptr);
-  __free_hook = freehook;
-}
-
-static __ptr_t mallochook __P ((__malloc_size_t, const __ptr_t));
-static __ptr_t
-mallochook (size, caller)
-     __malloc_size_t size;
-     const __ptr_t caller;
-{
-  struct hdr *hdr;
-
-  if (pedantic)
-    mcheck_check_all ();
-
-  __malloc_hook = old_malloc_hook;
-  if (old_malloc_hook != NULL)
-    hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1,
-					     caller);
-  else
-    hdr = (struct hdr *) malloc (sizeof (struct hdr) + size + 1);
-  __malloc_hook = mallochook;
-  if (hdr == NULL)
-    return NULL;
-
-  hdr->size = size;
-  link_blk (hdr);
-  ((char *) &hdr[1])[size] = MAGICBYTE;
-  flood ((__ptr_t) (hdr + 1), MALLOCFLOOD, size);
-  return (__ptr_t) (hdr + 1);
-}
-
-static __ptr_t reallochook __P ((__ptr_t, __malloc_size_t, const __ptr_t));
-static __ptr_t
-reallochook (ptr, size, caller)
-     __ptr_t ptr;
-     __malloc_size_t size;
-     const __ptr_t caller;
-{
-  struct hdr *hdr;
-  __malloc_size_t osize;
-
-  if (pedantic)
-    mcheck_check_all ();
-
-  if (ptr)
-    {
-      hdr = ((struct hdr *) ptr) - 1;
-      osize = hdr->size;
-
-      checkhdr (hdr);
-      unlink_blk (hdr);
-      if (size < osize)
-	flood ((char *) ptr + size, FREEFLOOD, osize - size);
-    }
-  else
-    {
-      osize = 0;
-      hdr = NULL;
-    }
-  __free_hook = old_free_hook;
-  __malloc_hook = old_malloc_hook;
-  __realloc_hook = old_realloc_hook;
-  if (old_realloc_hook != NULL)
-    hdr = (struct hdr *) (*old_realloc_hook) ((__ptr_t) hdr,
-					      sizeof (struct hdr) + size + 1,
-					      caller);
-  else
-    hdr = (struct hdr *) realloc ((__ptr_t) hdr,
-				  sizeof (struct hdr) + size + 1);
-  __free_hook = freehook;
-  __malloc_hook = mallochook;
-  __realloc_hook = reallochook;
-  if (hdr == NULL)
-    return NULL;
-
-  hdr->size = size;
-  link_blk (hdr);
-  ((char *) &hdr[1])[size] = MAGICBYTE;
-  if (size > osize)
-    flood ((char *) (hdr + 1) + osize, MALLOCFLOOD, size - osize);
-  return (__ptr_t) (hdr + 1);
-}
-
-static void mabort __P ((enum mcheck_status status))
-     __attribute__ ((noreturn));
-static void
-mabort (status)
-     enum mcheck_status status;
-{
-  const char *msg;
-  switch (status)
-    {
-    case MCHECK_OK:
-      msg = _("memory is consistent, library is buggy\n");
-      break;
-    case MCHECK_HEAD:
-      msg = _("memory clobbered before allocated block\n");
-      break;
-    case MCHECK_TAIL:
-      msg = _("memory clobbered past end of allocated block\n");
-      break;
-    case MCHECK_FREE:
-      msg = _("block freed twice\n");
-      break;
-    default:
-      msg = _("bogus mcheck_status, library is buggy\n");
-      break;
-    }
-  fprintf (stderr, "mcheck: %s", msg);
-  fflush (stderr);
-  abort ();
-}
-
-int
-mcheck (func)
-     void (*func) __P ((enum mcheck_status));
-{
-  abortfunc = (func != NULL) ? func : &mabort;
-
-  /* These hooks may not be safely inserted if malloc is already in use.  */
-  if (__malloc_initialized <= 0 && !mcheck_used)
-    {
-      /* We call malloc() once here to ensure it is initialized.  */
-      void *p = malloc (0);
-      free (p);
-
-      old_free_hook = __free_hook;
-      __free_hook = freehook;
-      old_malloc_hook = __malloc_hook;
-      __malloc_hook = mallochook;
-      old_realloc_hook = __realloc_hook;
-      __realloc_hook = reallochook;
-      mcheck_used = 1;
-    }
-
-  return mcheck_used ? 0 : -1;
-}
-
-int
-mcheck_pedantic (func)
-      void (*func) __P ((enum mcheck_status));
-{
-  int res = mcheck (func);
-  if (res == 0)
-    pedantic = 1;
-  return res;
-}
-
-enum mcheck_status
-mprobe (__ptr_t ptr)
-{
-  return mcheck_used ? checkhdr (((struct hdr *) ptr) - 1) : MCHECK_DISABLED;
-}
diff --git a/newlib/libc/sys/linux/mhooks.h b/newlib/libc/sys/linux/mhooks.h
deleted file mode 100644
index 4a2e606..0000000
--- a/newlib/libc/sys/linux/mhooks.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/* Functions used by mcheck/mprobe */
-extern void (*__malloc_initialize_hook) (void);
-extern void (*__free_hook) (void * __ptr, const void *);
-extern void * (*__malloc_hook) (size_t __size, const void *);
-extern void * (*__realloc_hook) (void * __ptr, size_t __size, const void *);
-extern void * (*__memalign_hook) (size_t __alignment, size_t __size,
-                                  const void *);
-extern void (*__after_morecore_hook) (void);
-extern void __malloc_check_init (void);
-
-extern int __malloc_initialized;
diff --git a/newlib/libc/sys/linux/mmap.c b/newlib/libc/sys/linux/mmap.c
deleted file mode 100644
index 6af2b85..0000000
--- a/newlib/libc/sys/linux/mmap.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* libc/sys/linux/mmap.c - Memory mapping functions */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#include <sys/mman.h>
-#include <machine/syscall.h>
-
-_syscall6(void *,mmap,void *,addr,size_t,len,int,prot,int,flags,int,fd,off_t,off);
-_syscall2(int,munmap,void *,addr,size_t,len);
-_syscall1(int,mlockall,int,flags);
-_syscall0(int,munlockall);
-_syscall2(int,mlock,const void *,addr,size_t,len);
-_syscall2(int,munlock,const void *,addr,size_t,len);
-_syscall3(int,mprotect,void *,addr,size_t,len,int,prot);
-_syscall3(int,msync,void *,addr,size_t,len,int,flags);
-_syscall4(void *,mremap,void *,addr,size_t,oldlen,size_t,newlen,int,maymove);
-
-weak_alias(__libc_mmap,__mmap)
-weak_alias(__libc_munmap,__munmap)
-weak_alias(__libc_mremap,__mremap)
diff --git a/newlib/libc/sys/linux/mntent.c b/newlib/libc/sys/linux/mntent.c
deleted file mode 100644
index 0101b94..0000000
--- a/newlib/libc/sys/linux/mntent.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Utilities for reading/writing fstab, mtab, etc.
-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <features.h>
-#include <mntent.h>
-#include <stdlib.h>
-#include <libc-symbols.h>
-#define  _LIBC 1
-#define  NOT_IN_libc 1
-#include <bits/libc-lock.h>
-
-/* We don't want to allocate the static buffer all the time since it
-   is not always used (in fact, rather infrequently).  Accept the
-   extra cost of a `malloc'.  */
-static char *getmntent_buffer;
-
-/* This is the size of the buffer.  This is really big.  */
-#define BUFFER_SIZE	4096
-
-
-static void
-allocate (void)
-{
-  getmntent_buffer = (char *) malloc (BUFFER_SIZE);
-}
-
-
-struct mntent *
-getmntent (FILE *stream)
-{
-  static struct mntent m;
-  static int once;
-
-  do {
-    if (__pthread_once != NULL)
-      __pthread_once (&once, allocate);
-    else if (once == 0) {
-      allocate ();
-      once = !(0);
-    }
-  } while (0);
-
-
-  if (getmntent_buffer == NULL)
-    /* If no core is available we don't have a chance to run the
-       program successfully and so returning NULL is an acceptable
-       result.  */
-    return NULL;
-
-  return __getmntent_r (stream, &m, getmntent_buffer, BUFFER_SIZE);
-}
-
-
-/* Make sure the memory is freed if the programs ends while in
-   memory-debugging mode and something actually was allocated.  */
-static void
-__attribute__ ((unused))
-free_mem (void)
-{
-  free (getmntent_buffer);
-}
-
-text_set_element (__libc_subfreeres, free_mem);
diff --git a/newlib/libc/sys/linux/mntent_r.c b/newlib/libc/sys/linux/mntent_r.c
deleted file mode 100644
index b534fb6..0000000
--- a/newlib/libc/sys/linux/mntent_r.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* Utilities for reading/writing fstab, mtab, etc.
-   Copyright (C) 1995-2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <alloca.h>
-#include <mntent.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <machine/weakalias.h>
-
-/* Prepare to begin reading and/or writing mount table entries from the
-   beginning of FILE.  MODE is as for `fopen'.  */
-FILE *
-__setmntent (const char *file, const char *mode)
-{
-  FILE *result = fopen (file, mode);
-
-  return result;
-}
-weak_alias (__setmntent, setmntent)
-
-
-/* Close a stream opened with `setmntent'.  */
-int
-__endmntent (FILE *stream)
-{
-  if (stream)		/* SunOS 4.x allows for NULL stream */
-    fclose (stream);
-  return 1;		/* SunOS 4.x says to always return 1 */
-}
-weak_alias (__endmntent, endmntent)
-
-
-/* Since the values in a line are separated by spaces, a name cannot
-   contain a space.  Therefore some programs encode spaces in names
-   by the strings "\040".  We undo the encoding when reading an entry.
-   The decoding happens in place.  */
-static char *
-decode_name (char *buf)
-{
-  char *rp = buf;
-  char *wp = buf;
-
-  do
-    if (rp[0] == '\\' && rp[1] == '0' && rp[2] == '4' && rp[3] == '0')
-      {
-	/* \040 is a SPACE.  */
-	*wp++ = ' ';
-	rp += 3;
-      }
-    else if (rp[0] == '\\' && rp[1] == '0' && rp[2] == '1' && rp[3] == '2')
-      {
-	/* \012 is a TAB.  */
-	*wp++ = '\t';
-	rp += 3;
-      }
-    else if (rp[0] == '\\' && rp[1] == '\\')
-      {
-	/* We have to escape \\ to be able to represent all characters.  */
-	*wp++ = '\\';
-	rp += 1;
-      }
-    else
-      *wp++ = *rp;
-  while (*rp++ != '\0');
-
-  return buf;
-}
-
-
-/* Read one mount table entry from STREAM.  Returns a pointer to storage
-   reused on the next call, or null for EOF or error (use feof/ferror to
-   check).  */
-struct mntent *
-__getmntent_r (FILE *stream, struct mntent *mp, char *buffer, int bufsiz)
-{
-  char *cp;
-  char *head;
-
-  flockfile (stream);
-  do
-    {
-      char *end_ptr;
-
-      if (fgets (buffer, bufsiz, stream) == NULL)
-	{
-	  funlockfile (stream);
-	  return NULL;
-	}
-
-      end_ptr = strchr (buffer, '\n');
-      if (end_ptr != NULL)	/* chop newline */
-	*end_ptr = '\0';
-      else
-	{
-	  /* Not the whole line was read.  Do it now but forget it.  */
-	  char tmp[1024];
-	  while (fgets (tmp, sizeof tmp, stream) != NULL)
-	    if (strchr (tmp, '\n') != NULL)
-	      break;
-	}
-
-      head = buffer + strspn (buffer, " \t");
-      /* skip empty lines and comment lines:  */
-    }
-  while (head[0] == '\0' || head[0] == '#');
-
-  cp = strsep (&head, " \t");
-  mp->mnt_fsname = cp != NULL ? decode_name (cp) : (char *) "";
-  if (head)
-    head += strspn (head, " \t");
-  cp = strsep (&head, " \t");
-  mp->mnt_dir = cp != NULL ? decode_name (cp) : (char *) "";
-  if (head)
-    head += strspn (head, " \t");
-  cp = strsep (&head, " \t");
-  mp->mnt_type = cp != NULL ? decode_name (cp) : (char *) "";
-  if (head)
-    head += strspn (head, " \t");
-  cp = strsep (&head, " \t");
-  mp->mnt_opts = cp != NULL ? decode_name (cp) : (char *) "";
-  switch (head ? sscanf (head, " %d %d ", &mp->mnt_freq, &mp->mnt_passno) : 0)
-    {
-    case 0:
-      mp->mnt_freq = 0;
-    case 1:
-      mp->mnt_passno = 0;
-    case 2:
-      break;
-    }
-  funlockfile (stream);
-
-  return mp;
-}
-weak_alias (__getmntent_r, getmntent_r)
-
-
-/* We have to use an encoding for names if they contain spaces or tabs.
-   To be able to represent all characters we also have to escape the
-   backslash itself.  This "function" must be a macro since we use
-   `alloca'.  */
-#define encode_name(name) \
-  do {									      \
-    const char *rp = name;						      \
-									      \
-    while (*rp != '\0')							      \
-      if (*rp == ' ' || *rp == '\t' || *rp == '\\')			      \
-	break;								      \
-      else								      \
-	++rp;								      \
-									      \
-    if (*rp != '\0')							      \
-      {									      \
-	/* In the worst case the length of the string can increase to	      \
-	   founr times the current length.  */				      \
-	char *wp;							      \
-									      \
-	rp = name;							      \
-	name = wp = (char *) alloca (strlen (name) * 4 + 1);		      \
-									      \
-	do								      \
-	  if (*rp == ' ')						      \
-	    {								      \
-	      *wp++ = '\\';						      \
-	      *wp++ = '0';						      \
-	      *wp++ = '4';						      \
-	      *wp++ = '0';						      \
-	    }								      \
-	  else if (*rp == '\t')						      \
-	    {								      \
-	      *wp++ = '\\';						      \
-	      *wp++ = '0';						      \
-	      *wp++ = '1';						      \
-	      *wp++ = '2';						      \
-	    }								      \
-	  else if (*rp == '\\')						      \
-	    {								      \
-	      *wp++ = '\\';						      \
-	      *wp++ = '\\';						      \
-	    }								      \
-	  else								      \
-	    *wp++ = *rp;						      \
-	while (*rp++ != '\0');						      \
-      }									      \
-  } while (0)
-
-
-/* Write the mount table entry described by MNT to STREAM.
-   Return zero on success, nonzero on failure.  */
-int
-__addmntent (FILE *stream, const struct mntent *mnt)
-{
-  struct mntent mntcopy = *mnt;
-  if (fseek (stream, 0, SEEK_END))
-    return 1;
-
-  /* Encode spaces and tabs in the names.  */
-  encode_name (mntcopy.mnt_fsname);
-  encode_name (mntcopy.mnt_dir);
-  encode_name (mntcopy.mnt_type);
-  encode_name (mntcopy.mnt_opts);
-
-  return (fprintf (stream, "%s %s %s %s %d %d\n",
-		   mntcopy.mnt_fsname,
-		   mntcopy.mnt_dir,
-		   mntcopy.mnt_type,
-		   mntcopy.mnt_opts,
-		   mntcopy.mnt_freq,
-		   mntcopy.mnt_passno)
-	  < 0 ? 1 : 0);
-}
-weak_alias (__addmntent, addmntent)
-
-
-/* Search MNT->mnt_opts for an option matching OPT.
-   Returns the address of the substring, or null if none found.  */
-char *
-__hasmntopt (const struct mntent *mnt, const char *opt)
-{
-  const size_t optlen = strlen (opt);
-  char *rest = mnt->mnt_opts, *p;
-
-  while ((p = strstr (rest, opt)) != NULL)
-    {
-      if (p == rest
-	  || (p[-1] == ','
-	      && (p[optlen] == '\0' ||
-		  p[optlen] == '='  ||
-		  p[optlen] == ',')))
-	return p;
-
-      rest = strchr (rest, ',');
-      if (rest == NULL)
-	break;
-      ++rest;
-    }
-
-  return NULL;
-}
-weak_alias (__hasmntopt, hasmntopt)
diff --git a/newlib/libc/sys/linux/mq_close.c b/newlib/libc/sys/linux/mq_close.c
deleted file mode 100644
index 884c30f..0000000
--- a/newlib/libc/sys/linux/mq_close.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2002, Red Hat Inc. */
-
-#include <mqueue.h>
-#include <errno.h>
-#include <sys/sem.h>
-#define _LIBC 1
-#include <sys/lock.h>
-#undef _LIBC
-
-#include "mqlocal.h"
-
-int
-mq_close (mqd_t msgid)
-{
-  struct libc_mq *info;
-  struct sembuf sb0 = {0, -1, 0};
-  int rc;
-  int semid;
-
-  info = __find_mq (msgid);
-
-  if (info == NULL)
-    {
-      errno = EBADF;
-      return -1;
-    }
-
-  /* lock message queue */
-  semid = info->semid;
-  rc = semop (semid, &sb0, 1);
-
-  if (rc == 0)
-    {
-      __cleanup_mq (msgid);
-      
-      /* unlock message queue */
-      sb0.sem_op = 1;
-      semop (semid, &sb0, 1);
-    }
-
-  return rc;
-}
-      
-
-
-
-
-
diff --git a/newlib/libc/sys/linux/mq_getattr.c b/newlib/libc/sys/linux/mq_getattr.c
deleted file mode 100644
index 65813f3..0000000
--- a/newlib/libc/sys/linux/mq_getattr.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2002, Red Hat Inc. */
-
-#include <mqueue.h>
-#include <errno.h>
-#include <sys/sem.h>
-#include <string.h>
-#define _LIBC 1
-#include <sys/lock.h>
-#undef _LIBC
-
-#include "mqlocal.h"
-
-int
-mq_getattr (mqd_t msgid, struct mq_attr *mqstat)
-{
-  struct libc_mq *info;
-  struct sembuf sb0 = {0, -1, 0};
-  int num_msgs;
-  int rc = 0;
-
-  info = __find_mq (msgid);
-
-  if (info == NULL)
-    {
-      errno = EBADF;
-      return -1;
-    }
-
-  /* temporarily lock message queue */
-  semop (info->semid, &sb0, 1);
-
-  num_msgs = semctl (info->semid, 3, GETVAL);
-  if (num_msgs >= 0)
-    {
-      memcpy (mqstat, info->attr, sizeof(struct mq_attr));
-      mqstat->mq_curmsgs = num_msgs;
-    }
-  else
-    rc = -1;
-
-  /* release message queue */
-  sb0.sem_op = 1;
-  semop (info->semid, &sb0, 1);
-
-  return rc;
-}
-      
-
-
-
-
-
diff --git a/newlib/libc/sys/linux/mq_notify.c b/newlib/libc/sys/linux/mq_notify.c
deleted file mode 100644
index fd4606b..0000000
--- a/newlib/libc/sys/linux/mq_notify.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2002, Red Hat Inc. */
-
-#include <mqueue.h>
-#include <errno.h>
-#include <machine/weakalias.h>
-
-#include "mqlocal.h"
-
-int
-__libc_mq_notify (mqd_t msgid, const struct sigevent *notification)
-{
-  errno = ENOSYS;
-  return -1;
-}
-weak_alias (__libc_mq_notify, mq_notify)
-
-      
-
-
-
-
-
diff --git a/newlib/libc/sys/linux/mq_open.c b/newlib/libc/sys/linux/mq_open.c
deleted file mode 100644
index 9b72e90..0000000
--- a/newlib/libc/sys/linux/mq_open.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/* Copyright 2002, Red Hat Inc. */
-
-#include <mqueue.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <stdarg.h>
-#include <machine/weakalias.h>
-#define _LIBC 1
-#include <sys/lock.h>
-#undef _LIBC
-
-#include "mqlocal.h"
-
-#define	NHASH	32	          /* Num of hash lists, must be a power of 2 */
-#define	LOCHASH(i)	((i)&(NHASH-1))
-
-static long	mq_index;	/* Index of next entry */
-static struct	libc_mq *mq_hash[NHASH];   /* Hash list heads for mqopen_infos */
-
-__LOCK_INIT(static, mq_hash_lock);
-
-mqd_t
-mq_open (const char *name, int oflag, ...)
-{
-  MSG *wrbuf = NULL;
-  MSG *rdbuf = NULL;
-  int msgqid = -1;
-  int rc = -1;
-  int fd = -1;
-  int semid = -1;
-  int created = 0;
-  key_t key = (key_t)-1;
-  struct mq_attr *attr = (struct mq_attr *)MAP_FAILED;
-  struct sembuf sb = {0, 0, 0};
-  mode_t mode = 0;
-  int size;
-  int i, index, saved_errno;
-  char *real_name;
-  char *ptr;
-  struct mq_attr *user_attr = NULL;
-  struct libc_mq *info;
-  union semun arg;
-  
-  /* ignore opening slash if present */
-  if (*name == '/')
-    ++name;  
-  size = strlen(name);
-
-  if ((real_name = (char *)malloc (size + sizeof(MSGQ_PREFIX))) == NULL ||
-      (info = (struct libc_mq *)malloc (sizeof(struct libc_mq))) == NULL)
-    {
-      errno = ENOSPC;
-      if (real_name)
-	free (real_name);
-      return (mqd_t)-1;
-    }
-  
-  /* use given name to create shared memory file name - we convert any
-     slashes to underscores so we don't have to create directories */
-  memcpy (real_name, MSGQ_PREFIX, sizeof(MSGQ_PREFIX) - 1);
-  memcpy (real_name + sizeof(MSGQ_PREFIX) - 1, name, size + 1);
-  ptr = real_name + sizeof(MSGQ_PREFIX) - 1;
-  for (i = 0; i < size; ++i)
-    {
-      if (*ptr == '/')
-	*ptr = '_';
-      ++ptr;
-    }
-
-  /* open shared memory file based on msg queue open flags and then use memory
-     file to create a unique key to use for semaphores, etc.. */
-  if (oflag & O_CREAT)
-    {
-      va_list list;
-      va_start (list, oflag);
-
-      saved_errno = errno;
-      mode = (mode_t)va_arg (list, int);
-      user_attr = va_arg(list,struct mq_attr *);
-      va_end (list);
-
-      /* attempt to open the shared memory file for exclusive create so we know
-	 whether we are the owners or not */
-      fd = open (real_name, O_RDWR | O_CREAT | O_EXCL, mode);
-      if (fd < 0 && (oflag & O_EXCL))
-	{
-	  /* we failed and the user wanted exclusive create */
-	  free (real_name);
-	  free (info);
-	  return (mqd_t)-1;
-	}
-      errno = saved_errno;
-      /* check if we created the file or not */
-      if (fd >= 0)
-        created = 1;
-    }
-	  
-  if (fd < 0)
-    fd = open (real_name, O_RDWR, 0);
-
-  if (fd >= 0)
-    key = ftok(real_name, 255);
-
-  if (key != (key_t)-1)
-    /* memory map the shared memory file so we have a global shared data area to use */
-    attr = (struct mq_attr *)mmap (0, sizeof(struct mq_attr), PROT_READ | PROT_WRITE,
-				   MAP_SHARED, fd, 0);
-  
-  if (attr != (struct mq_attr *)MAP_FAILED)
-    {
-      /* we need semaphores to prevent multi-process race conditions on the
-	 shared storage which contains a shared structure.  The following
-	 are the ones we need.
-	 
-	 0 = open semaphore
-	 1 = number of opens
-	 2 = number of writes left until queue is full
-	 3 = number of reads available in queue
-	 4 = notify semaphore 
-	 5 = number of readers */
-      arg.val = 0;
-      /* make sure the creator of the shared memory file also is the creator of the
-	 semaphores...this will ensure that it also creates the message queue */
-      if (created)
-	{
-	  saved_errno = errno;
-	  semid = semget (key, 6, IPC_CREAT | IPC_EXCL | mode);
-	  errno = saved_errno;
-	  /* now that we have created the semaphore, we should initialize it */
-	  if (semid != -1)
-	    semctl (semid, 0, SETVAL, arg);
-	}
-      else
-	{
-	  /* if we didn't create the shared memory file but have gotten to here, we want
-	     to ensure we haven't gotten ahead of the creator temporarily so we will
-	     loop until the semaphore exists.  This ensures that the creator will be the
-	     one to create the message queue with the correct mode and we will be blocked
-	     by the open semaphore 0.  We impose a time limit to ensure something terrible
-	     hasn't gone wrong. */
-	  struct timespec tms;
-	  int i;
-
-	  tms.tv_sec = 0;
-	  tms.tv_nsec = 10000; /* 10 microseconds */
-	  for (i = 0; i < 100; ++i)
-	    {
-	      if ((semid = semget (key, 6, 0)) != -1)
-		break;
-	      /* sleep in case we our a higher priority process */
-	      nanosleep (&tms, NULL);
-	    }
-	}
-    }
-
-  if (semid != -1)
-    {
-      /* acquire main open semaphore if we didn't create it */
-      if (!created)
-	{
-	  sb.sem_op = -1;
-	  rc = semop (semid, &sb, 1);
-	}
-      else
-	rc = 0; /* need this to continue below */
-    }
-      
-  if (rc == 0)
-    {
-      if (created)
-	{
-	  /* the creator must get here first so the message queue will be created */
-	  msgqid = msgget (key, IPC_CREAT | mode); 
-	  if (msgqid >= 0)
-	    {
-	      /* we have created the message queue so check and set the attributes */
-	      if ((wrbuf = (MSG *)malloc (user_attr->mq_msgsize + sizeof(int))) == NULL ||
-		  (rdbuf = (MSG *)malloc (user_attr->mq_msgsize + sizeof(int))) == NULL ||
-		  user_attr == NULL || user_attr->mq_msgsize <= 0 || user_attr->mq_maxmsg <= 0)
-		{
-		  /* we're out of space and we created the message queue so we should
-		     try to remove it */
-		  msgctl (msgqid, IPC_RMID, NULL);
-		  msgqid = -1; /* allow clean up to occur below */
-		  if (wrbuf && rdbuf)
-		    errno = EINVAL;
-		  else
-		    errno = ENOSPC;
-		}
-	      else /* valid attributes */
-		{
-		  write (fd, user_attr, sizeof(struct mq_attr));
-		  attr->mq_curmsgs = 0;
-		  attr->mq_flags = oflag & O_NONBLOCK;
-		  arg.val = 0;
-		  semctl (semid, 1, SETVAL, arg); /* number of opens starts at 0 */
-		  semctl (semid, 3, SETVAL, arg); /* number of reads available starts at 0 */
-		  semctl (semid, 5, SETVAL, arg); /* number of readers starts at 0 */
-		  arg.val = 1;
-		  semctl (semid, 4, SETVAL, arg); /* notify semaphore */
-		  arg.val = user_attr->mq_maxmsg;
-		  semctl (semid, 2, SETVAL, arg); /* number of writes left starts at mq_maxmsg */
-		}
-	    }
-	}
-      else /* just open it */
-        {
-	  msgqid = msgget (key, 0);
-	  wrbuf = (MSG *)malloc (attr->mq_msgsize + sizeof(int));
-	  rdbuf = (MSG *)malloc (attr->mq_msgsize + sizeof(int));
-        }
-      
-      /* release semaphore acquired earlier */
-      sb.sem_op = 1;
-      semop (semid, &sb, 1);
-    }
-
-  /* if we get here and we haven't got a message queue id, then we need to clean up 
-     our mess and return failure */
-  if (msgqid < 0)
-    {
-      if (fd >= 0)
-	close (fd);
-      if (attr != (struct mq_attr *)MAP_FAILED)
-	munmap (attr, sizeof(struct mq_attr));
-      if (created)
-	{
-	  unlink (real_name);
-	  if (semid != -1)
-	    semctl (semid, 0, IPC_RMID);
-	}
-      free (real_name);
-      free (info);
-      if (wrbuf)
-	free (wrbuf);
-      if (rdbuf)
-	free (rdbuf);
-      return (mqd_t)-1;
-    }
-
-  /* we are successful so register the message queue */
-
-  /* up the count of msg queue opens */
-  sb.sem_op = 1;
-  sb.sem_num = 1;
-  semop (semid, &sb, 1);
-
-  /* success, translate into index into mq_info array */  
-  __lock_acquire(mq_hash_lock);
-  index = mq_index++;
-  info->index = index;
-  info->msgqid = msgqid;
-  info->name = real_name;
-  info->semid = semid;
-  info->fd = fd;
-  info->oflag = oflag;
-  info->wrbuf = wrbuf;
-  info->rdbuf = rdbuf;
-  info->cleanup_notify = NULL;
-  info->next = mq_hash[LOCHASH(index)];
-  info->attr = attr;
-  mq_hash[LOCHASH(index)] = info;
-  __lock_release(mq_hash_lock);
-
-  return (mqd_t)index;
-}
-
-struct libc_mq *
-__find_mq (mqd_t mq)
-{
-  struct libc_mq *ptr;
-
-  __lock_acquire(mq_hash_lock);
-
-  ptr = mq_hash[LOCHASH((int)mq)];
-
-  while (ptr)
-    {
-      if (ptr->index == (int)mq)
-        break;
-      ptr = ptr->next;
-    }
-
-  __lock_release(mq_hash_lock);
-
-  return ptr;
-}
-      
-void
-__cleanup_mq (mqd_t mq)
-{
-  struct libc_mq *ptr;
-  struct libc_mq *prev;
-  int semid;
-  struct sembuf sb = {0, 0, 0};
-
-  __lock_acquire(mq_hash_lock);
-
-  ptr = mq_hash[LOCHASH((int)mq)];
-  prev = NULL;
-
-  while (ptr)
-    {
-      if (ptr->index == (int)mq)
-        break;
-      prev = ptr;
-      ptr = ptr->next;
-    }
-
-  if (ptr != NULL)
-    {
-      if (ptr->cleanup_notify != NULL)
-	ptr->cleanup_notify (ptr);
-      if (prev != NULL)
-	prev->next = ptr->next;
-      else
-	mq_hash[LOCHASH((int)mq)] = NULL;
-      munmap (ptr->attr, sizeof(struct mq_attr));
-      close (ptr->fd);
-      free (ptr->name);
-      free (ptr->wrbuf);
-      free (ptr->rdbuf);
-      semid = ptr->semid;
-      free (ptr);
-      /* lower the count of msg queue opens */
-      sb.sem_op = -1;
-      sb.sem_num = 1;
-      sb.sem_flg = IPC_NOWAIT;
-      semop (semid, &sb, 1);
-    }
-
-  __lock_release(mq_hash_lock);
-}
-
-
-
-
-
diff --git a/newlib/libc/sys/linux/mq_receive.c b/newlib/libc/sys/linux/mq_receive.c
deleted file mode 100644
index 4dae081..0000000
--- a/newlib/libc/sys/linux/mq_receive.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2002, Red Hat Inc. */
-
-#include <mqueue.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <string.h>
-#define _LIBC 1
-#include <sys/lock.h>
-#undef _LIBC
-
-#include "mqlocal.h"
-
-__LOCK_INIT(static, mq_rdbuf_lock);
-
-ssize_t
-mq_receive (mqd_t msgid, char *msg, size_t msg_len, unsigned int *msg_prio)
-{
-  struct libc_mq *info;
-  struct sembuf sb2 = {2, 1, 0};
-  struct sembuf sb3 = {3, -1, IPC_NOWAIT};
-  struct sembuf sb5 = {5, 1, IPC_NOWAIT};
-  ssize_t num_bytes;
-  int ipcflag;
-
-  info = __find_mq (msgid);
-
-  if (info == NULL || (info->oflag & O_ACCMODE) == O_WRONLY)
-    {
-      errno = EBADF;
-      return -1;
-    }
-
-  if (msg_len < info->attr->mq_msgsize)
-    {
-      errno = EMSGSIZE;
-      return -1;
-    }
-
-  __lock_acquire (mq_rdbuf_lock);
-
-  ipcflag = (info->attr->mq_flags & O_NONBLOCK) ? IPC_NOWAIT : 0;
-
-  semop (info->semid, &sb5, 1); /* increase number of readers */
-  num_bytes = msgrcv (info->msgqid, info->rdbuf, msg_len, -MQ_PRIO_MAX, ipcflag);
-  sb5.sem_op = -1;
-  semop (info->semid, &sb5, 1); /* decrease number of readers */
-
-  if (num_bytes != (ssize_t)-1)
-    {
-      semop (info->semid, &sb2, 1); /* add one to messages left to write */
-      semop (info->semid, &sb3, 1); /* subtract one from messages to read */
-      memcpy (msg, info->rdbuf->text, num_bytes);
-      if (msg_prio != NULL)
-	*msg_prio = MQ_PRIO_MAX - info->rdbuf->type;
-    }
-  
-  __lock_release (mq_rdbuf_lock);
-  return num_bytes;
-}
-      
-
-
-
-
-
diff --git a/newlib/libc/sys/linux/mq_send.c b/newlib/libc/sys/linux/mq_send.c
deleted file mode 100644
index d3291fd..0000000
--- a/newlib/libc/sys/linux/mq_send.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2002, Red Hat Inc. */
-
-#include <mqueue.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <string.h>
-#include <stdlib.h>
-#define _LIBC 1
-#include <sys/lock.h>
-#undef _LIBC
-
-#include "mqlocal.h"
-
-__LOCK_INIT(static, mq_wrbuf_lock);
-
-int
-mq_send (mqd_t msgid, const char *msg, size_t msg_len, unsigned int msg_prio)
-{
-  struct libc_mq *info;
-  struct sembuf sb2 = {2, -1, 0};
-  struct sembuf sb3 = {3, 1, 0};
-  int rc;
-  int ipcflag;
-
-  info = __find_mq (msgid);
-
-  if (info == NULL || (info->oflag & O_ACCMODE) == O_RDONLY)
-    {
-      errno = EBADF;
-      return -1;
-    }
-
-  if (msg_len > info->attr->mq_msgsize)
-    {
-      errno = EMSGSIZE;
-      return -1;
-    }
-
-  if (msg_prio > MQ_PRIO_MAX)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  __lock_acquire (mq_wrbuf_lock);
-
-  memcpy (info->wrbuf->text, msg, msg_len);
-  info->wrbuf->type = (MQ_PRIO_MAX - msg_prio);
-
-  ipcflag = (info->attr->mq_flags & O_NONBLOCK) ? IPC_NOWAIT : 0;
-  sb2.sem_flg = ipcflag;
-
-  /* check to see if max msgs are on queue */
-  rc = semop (info->semid, &sb2, 1);
-
-  if (rc == 0)
-    rc = msgsnd (info->msgqid, info->wrbuf, msg_len, ipcflag);
-
-  if (rc == 0)
-    semop (info->semid, &sb3, 1);  /* increment number of reads */
-
-  __lock_release (mq_wrbuf_lock);
-  return rc;
-}
-      
-
-
-
-
-
diff --git a/newlib/libc/sys/linux/mq_setattr.c b/newlib/libc/sys/linux/mq_setattr.c
deleted file mode 100644
index 69f6cd5..0000000
--- a/newlib/libc/sys/linux/mq_setattr.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2002, Red Hat Inc. */
-
-#include <mqueue.h>
-#include <errno.h>
-#include <sys/sem.h>
-#include <string.h>
-#define _LIBC 1
-#include <sys/lock.h>
-#undef _LIBC
-
-#include "mqlocal.h"
-
-int
-mq_setattr (mqd_t msgid, const struct mq_attr *mqstat, struct mq_attr *omqstat)
-{
-  struct libc_mq *info;
-  struct sembuf sb0 = {0, -1, 0};
-  int num_msgs;
-  int rc = 0;
-
-  info = __find_mq (msgid);
-
-  if (info == NULL)
-    {
-      errno = EBADF;
-      return -1;
-    }
-
-  /* temporarily lock message queue */
-  semop (info->semid, &sb0, 1);
-
-  /* make copy of old structure */
-  if (omqstat != NULL)
-    {
-      num_msgs = semctl (info->semid, 3, GETVAL);
-      if (num_msgs >= 0)
-	{
-	  memcpy (omqstat, info->attr, sizeof(struct mq_attr));
-	  omqstat->mq_curmsgs = num_msgs;
-	}
-      else
-	rc = -1;
-    }
-  
-  /* only the mq_flags field can be changed */
-  info->attr->mq_flags = mqstat->mq_flags;
-
-  /* release message queue */
-  sb0.sem_op = 1;
-  semop (info->semid, &sb0, 1);
-
-  return rc;
-}
-      
-
-
-
-
-
diff --git a/newlib/libc/sys/linux/mq_unlink.c b/newlib/libc/sys/linux/mq_unlink.c
deleted file mode 100644
index ce7bd0e..0000000
--- a/newlib/libc/sys/linux/mq_unlink.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2002, Red Hat Inc. */
-
-#include <mqueue.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <string.h>
-#include <stdlib.h>
-#include <machine/weakalias.h>
-#define _LIBC 1
-#include <sys/lock.h>
-#undef _LIBC
-
-#include "mqlocal.h"
-
-int
-mq_unlink (const char *name)
-{
-  int size;
-  int saved_errno;
-  char *real_name;
-  char *ptr;
-  int i, rc;
-  int semid, msgqid;
-  key_t key;
-  
-  /* ignore opening slash if present */
-  if (*name == '/')
-    ++name;  
-  size = strlen(name);
-
-  if ((real_name = (char *)malloc (size + sizeof(MSGQ_PREFIX))) == NULL)
-    {
-      errno = ENOSPC;
-      return -1;
-    }
-  
-  /* use given name to create shared memory file name - we convert any
-     slashes to underscores so we don't have to create directories */
-  memcpy (real_name, MSGQ_PREFIX, sizeof(MSGQ_PREFIX) - 1);
-  memcpy (real_name + sizeof(MSGQ_PREFIX) - 1, name, size + 1);
-  ptr = real_name + sizeof(MSGQ_PREFIX) - 1;
-  for (i = 0; i < size; ++i)
-    {
-      if (*ptr == '/')
-	*ptr = '_';
-      ++ptr;
-    }
-
-  /* get key and then unlink shared memory file */
-  if ((key = ftok(real_name, 255)) == (key_t)-1)
-    return -1;
-
-  rc = unlink (real_name);
-
-  if (rc == 0)
-    {
-      /* try to remove semaphore and msg queues associated with shared memory file */
-      saved_errno = errno;
-      semid = semget (key, 6, 0);
-      if (semid != -1)
-	semctl (semid, 0, IPC_RMID);
-      msgqid = msgget (key, 0);
-      if (msgqid != -1)
-	msgctl (msgqid, IPC_RMID, NULL);
-      errno = saved_errno;
-    }
-
-  return rc;
-}
diff --git a/newlib/libc/sys/linux/mqlocal.h b/newlib/libc/sys/linux/mqlocal.h
deleted file mode 100644
index 56fd66c..0000000
--- a/newlib/libc/sys/linux/mqlocal.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* local definitions needed by mq routines */
-
-#include <sys/msg.h>
-#include <signal.h>
-
-/* a message */
-typedef struct
-{
-  unsigned int type;
-  char text[1];
-} MSG; 
-
-union semun {
-  int val;
-  struct semid_ds *buf;
-  unsigned short  *array;
-} arg;
-
-/*
- * One of these structures is malloced to describe any open message queue
- * each time mq_open is called. 
- */
-
-struct libc_mq;
-
-struct libc_mq {
-  int              index;          /* index of this message queue */
-  int              msgqid;         /* value returned by msgget */
-  int              semid;          /* semaphore id */
-  int              fd;             /* fd of shared memory file */
-  int              oflag;          /* original open flag used */
-  int              th;             /* thread id for mq_notify */
-  char            *name;           /* name used */
-  MSG             *wrbuf;          /* msg write buffer */
-  MSG             *rdbuf;          /* msg read buffer */
-  struct mq_attr  *attr;           /* pointer to attribute structure */
-  struct sigevent *sigevent;       /* used for mq_notify */
-  void (*cleanup_notify)(struct libc_mq *); /* also used for mq_notify */
-  struct libc_mq  *next;           /* next info struct in hash table */
-};
-
-extern struct libc_mq *__find_mq (mqd_t mq);
-extern void __cleanup_mq (mqd_t mq);
-extern void __cleanup_mq_notify (struct libc_mq *ptr);
-
-#define MSGQ_PREFIX "/dev/shm/__MSGQ__"
-
diff --git a/newlib/libc/sys/linux/msize.c b/newlib/libc/sys/linux/msize.c
deleted file mode 100644
index 818e05a..0000000
--- a/newlib/libc/sys/linux/msize.c
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy file to override one object in stdlib directory */
diff --git a/newlib/libc/sys/linux/msizer.c b/newlib/libc/sys/linux/msizer.c
deleted file mode 100644
index 7b79053..0000000
--- a/newlib/libc/sys/linux/msizer.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-size_t 
-_malloc_usable_size_r (struct _reent *ptr, void *mem)
-{
-  return malloc_usable_size (mem);
-}
diff --git a/newlib/libc/sys/linux/mstats.c b/newlib/libc/sys/linux/mstats.c
deleted file mode 100644
index 818e05a..0000000
--- a/newlib/libc/sys/linux/mstats.c
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy file to override one object in stdlib directory */
diff --git a/newlib/libc/sys/linux/mtrim.c b/newlib/libc/sys/linux/mtrim.c
deleted file mode 100644
index 818e05a..0000000
--- a/newlib/libc/sys/linux/mtrim.c
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy file to override one object in stdlib directory */
diff --git a/newlib/libc/sys/linux/mtrimr.c b/newlib/libc/sys/linux/mtrimr.c
deleted file mode 100644
index 3b2fbf3..0000000
--- a/newlib/libc/sys/linux/mtrimr.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-void *
-_malloc_trim_r (struct _reent *ptr, size_t pad)
-{
-  return 0;
-}
diff --git a/newlib/libc/sys/linux/net/Makefile.am b/newlib/libc/sys/linux/net/Makefile.am
deleted file mode 100644
index 5e31f0f..0000000
--- a/newlib/libc/sys/linux/net/Makefile.am
+++ /dev/null
@@ -1,87 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES = addr2ascii.c ascii2addr.c base64.c bindresvport.c ether_addr.c getaddrinfo.c \
-	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
-	getifaddrs.c getnameinfo.c \
-	getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \
-	getproto.c getprotoent.c getprotoname.c getservbyname.c \
-	getservbyport.c getservent.c herror.c hesiod.c inet_addr.c \
-	ifname.c inet_lnaof.c \
-	inet_makeaddr.c inet_net_ntop.c inet_net_pton.c inet_neta.c \
-	inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c \
-	inet_pton.c innetgr-stub.c ip6opt.c issetugid-stub.c \
-        linkaddr.c map_v4v6.c namespace.h un-namespace.h \
-	name6.c ns_addr.c \
-	ns_name.c ns_netint.c \
-	ns_ntoa.c ns_parse.c ns_print.c ns_ttl.c \
-	nsdispatch.c nslexer.c nsparser.c nsparser.h \
-	nsap_addr.c res_comp.c res_data.c res_debug.c \
-	res_init.c res_mkquery.c res_mkupdate.c res_query.c \
-	res_send.c res_update.c rthdr.c vars.c
-
-ELIX_4_OBJS = \
-	rcmd.$(oext) \
-	rcmdsh.$(oext)
-
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-if ELIX_LEVEL_2
-LIB_OBJS =
-else
-if ELIX_LEVEL_3
-LIB_OBJS =
-else
-LIB_OBJS = $(ELIX_4_OBJS)
-endif
-endif
-endif
-
-libnet_la_LDFLAGS = -Xcompiler -nostdlib
-libnet_la_CFLAGS = -DINET6
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libnet.la
-libnet_la_SOURCES = $(LIB_SOURCES)
-libnet_la_LIBADD = $(LIB_OBJS)
-libnet_la_DEPENDENCIES = $(LIB_OBJS)
-noinst_DATA = objectlist.awk.in
-else
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(LIB_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
-noinst_DATA =
-endif # USE_LIBTOOL
-
-include $(srcdir)/../../../../Makefile.shared
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/arpa; \
-	for i in $(srcdir)/../include/arpa/*.h; do \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/arpa/`basename $$i`; \
-	done; \
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/net; \
-	for i in $(srcdir)/../include/net/*.h; do \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/net/`basename $$i`; \
-	done; \
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/netinet; \
-	for i in $(srcdir)/../include/netinet/*.h; do \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/netinet/`basename $$i`; \
-	done; \
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/netinet6; \
-	for i in $(srcdir)/../include/netinet6/*.h; do \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/netinet6/`basename $$i`; \
-	done; \
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/netns; \
-	for i in $(srcdir)/../include/netns/*.h; do \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/netns/`basename $$i`; \
-	done; \
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/rpc; \
-	for i in $(srcdir)/../include/rpc/*.h; do \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/rpc/`basename $$i`; \
-	done; \
diff --git a/newlib/libc/sys/linux/net/Makefile.in b/newlib/libc/sys/linux/net/Makefile.in
deleted file mode 100644
index ee45b43..0000000
--- a/newlib/libc/sys/linux/net/Makefile.in
+++ /dev/null
@@ -1,447 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-EXTRA_SUBDIRS = @EXTRA_SUBDIRS@
-EXTRA_SUBLIBS = @EXTRA_SUBLIBS@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LINUX_MACH_LIB = @LINUX_MACH_LIB@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = -I$(srcdir)/../include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-LIB_SOURCES = addr2ascii.c ascii2addr.c base64.c bindresvport.c ether_addr.c getaddrinfo.c 	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c 	getifaddrs.c getnameinfo.c 	getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c 	getproto.c getprotoent.c getprotoname.c getservbyname.c 	getservbyport.c getservent.c herror.c hesiod.c inet_addr.c 	ifname.c inet_lnaof.c 	inet_makeaddr.c inet_net_ntop.c inet_net_pton.c inet_neta.c 	inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c 	inet_pton.c innetgr-stub.c ip6opt.c issetugid-stub.c         linkaddr.c map_v4v6.c namespace.h un-namespace.h 	name6.c ns_addr.c 	ns_name.c ns_netint.c 	ns_ntoa.c ns_parse.c ns_print.c ns_ttl.c 	nsdispatch.c nslexer.c nsparser.c nsparser.h 	nsap_addr.c res_comp.c res_data.c res_debug.c 	res_init.c res_mkquery.c res_mkupdate.c res_query.c 	res_send.c res_update.c rthdr.c vars.c
-
-
-ELIX_4_OBJS =  	rcmd.$(oext) 	rcmdsh.$(oext)
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = $(ELIX_4_OBJS)
-
-libnet_la_LDFLAGS = -Xcompiler -nostdlib
-libnet_la_CFLAGS = -DINET6
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libnet.la
-@USE_LIBTOOL_TRUE@libnet_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@libnet_la_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@libnet_la_DEPENDENCIES = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS)
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  addr2ascii.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ascii2addr.$(OBJEXT) base64.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@bindresvport.$(OBJEXT) ether_addr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getaddrinfo.$(OBJEXT) gethostbydns.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@gethostbyht.$(OBJEXT) gethostbynis.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@gethostnamadr.$(OBJEXT) getifaddrs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getnameinfo.$(OBJEXT) getnetbydns.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getnetbyht.$(OBJEXT) getnetbynis.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getnetnamadr.$(OBJEXT) getproto.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getprotoent.$(OBJEXT) getprotoname.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getservbyname.$(OBJEXT) getservbyport.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@getservent.$(OBJEXT) herror.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@hesiod.$(OBJEXT) inet_addr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ifname.$(OBJEXT) inet_lnaof.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@inet_makeaddr.$(OBJEXT) inet_net_ntop.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@inet_net_pton.$(OBJEXT) inet_neta.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@inet_netof.$(OBJEXT) inet_network.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@inet_ntoa.$(OBJEXT) inet_ntop.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@inet_pton.$(OBJEXT) innetgr-stub.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ip6opt.$(OBJEXT) issetugid-stub.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@linkaddr.$(OBJEXT) map_v4v6.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@name6.$(OBJEXT) ns_addr.$(OBJEXT) ns_name.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ns_netint.$(OBJEXT) ns_ntoa.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ns_parse.$(OBJEXT) ns_print.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ns_ttl.$(OBJEXT) nsdispatch.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@nslexer.$(OBJEXT) nsparser.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@nsap_addr.$(OBJEXT) res_comp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@res_data.$(OBJEXT) res_debug.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@res_init.$(OBJEXT) res_mkquery.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@res_mkupdate.$(OBJEXT) res_query.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@res_send.$(OBJEXT) res_update.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@rthdr.$(OBJEXT) vars.$(OBJEXT)
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-@USE_LIBTOOL_TRUE@libnet_la_OBJECTS =  addr2ascii.lo ascii2addr.lo \
-@USE_LIBTOOL_TRUE@base64.lo bindresvport.lo ether_addr.lo \
-@USE_LIBTOOL_TRUE@getaddrinfo.lo gethostbydns.lo gethostbyht.lo \
-@USE_LIBTOOL_TRUE@gethostbynis.lo gethostnamadr.lo getifaddrs.lo \
-@USE_LIBTOOL_TRUE@getnameinfo.lo getnetbydns.lo getnetbyht.lo \
-@USE_LIBTOOL_TRUE@getnetbynis.lo getnetnamadr.lo getproto.lo \
-@USE_LIBTOOL_TRUE@getprotoent.lo getprotoname.lo getservbyname.lo \
-@USE_LIBTOOL_TRUE@getservbyport.lo getservent.lo herror.lo hesiod.lo \
-@USE_LIBTOOL_TRUE@inet_addr.lo ifname.lo inet_lnaof.lo inet_makeaddr.lo \
-@USE_LIBTOOL_TRUE@inet_net_ntop.lo inet_net_pton.lo inet_neta.lo \
-@USE_LIBTOOL_TRUE@inet_netof.lo inet_network.lo inet_ntoa.lo \
-@USE_LIBTOOL_TRUE@inet_ntop.lo inet_pton.lo innetgr-stub.lo ip6opt.lo \
-@USE_LIBTOOL_TRUE@issetugid-stub.lo linkaddr.lo map_v4v6.lo name6.lo \
-@USE_LIBTOOL_TRUE@ns_addr.lo ns_name.lo ns_netint.lo ns_ntoa.lo \
-@USE_LIBTOOL_TRUE@ns_parse.lo ns_print.lo ns_ttl.lo nsdispatch.lo \
-@USE_LIBTOOL_TRUE@nslexer.lo nsparser.lo nsap_addr.lo res_comp.lo \
-@USE_LIBTOOL_TRUE@res_data.lo res_debug.lo res_init.lo res_mkquery.lo \
-@USE_LIBTOOL_TRUE@res_mkupdate.lo res_query.lo res_send.lo \
-@USE_LIBTOOL_TRUE@res_update.lo rthdr.lo vars.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(libnet_la_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(libnet_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus net/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-libnet.la: $(libnet_la_OBJECTS) $(libnet_la_DEPENDENCIES)
-	$(LINK)  $(libnet_la_LDFLAGS) $(libnet_la_OBJECTS) $(libnet_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = net
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-noinstLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
-distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-local install-data-am \
-install-data install-am install uninstall-am uninstall all-redirect \
-all-am all installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/arpa; \
-	for i in $(srcdir)/../include/arpa/*.h; do \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/arpa/`basename $$i`; \
-	done; \
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/net; \
-	for i in $(srcdir)/../include/net/*.h; do \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/net/`basename $$i`; \
-	done; \
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/netinet; \
-	for i in $(srcdir)/../include/netinet/*.h; do \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/netinet/`basename $$i`; \
-	done; \
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/netinet6; \
-	for i in $(srcdir)/../include/netinet6/*.h; do \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/netinet6/`basename $$i`; \
-	done; \
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/netns; \
-	for i in $(srcdir)/../include/netns/*.h; do \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/netns/`basename $$i`; \
-	done; \
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/rpc; \
-	for i in $(srcdir)/../include/rpc/*.h; do \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/rpc/`basename $$i`; \
-	done; \
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/linux/net/addr2ascii.3 b/newlib/libc/sys/linux/net/addr2ascii.3
deleted file mode 100644
index 10b1ac7..0000000
--- a/newlib/libc/sys/linux/net/addr2ascii.3
+++ /dev/null
@@ -1,222 +0,0 @@
-.\"
-.\" Copyright 1996 Massachusetts Institute of Technology
-.\"
-.\" Permission to use, copy, modify, and distribute this software and
-.\" its documentation for any purpose and without fee is hereby
-.\" granted, provided that both the above copyright notice and this
-.\" permission notice appear in all copies, that both the above
-.\" copyright notice and this permission notice appear in all
-.\" supporting documentation, and that the name of M.I.T. not be used
-.\" in advertising or publicity pertaining to distribution of the
-.\" software without specific, written prior permission.  M.I.T. makes
-.\" no representations about the suitability of this software for any
-.\" purpose.  It is provided "as is" without express or implied
-.\" warranty.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
-.\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
-.\" SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-.\" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-.\" USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-.\" ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	$ANA: addr2ascii.3,v 1.1 1996/06/13 18:41:46 wollman Exp $
-.\" $FreeBSD: src/lib/libc/net/addr2ascii.3,v 1.12 2001/10/01 16:08:55 ru Exp $
-.\"
-.Dd June 13, 1996
-.Dt ADDR2ASCII 3
-.Os
-.Sh NAME
-.Nm addr2ascii ,
-.Nm ascii2addr
-.Nd Generic address formatting routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In netinet/in.h
-.In arpa/inet.h
-.Ft "char *"
-.Fn addr2ascii "int af" "const void *addrp" "int len" "char *buf"
-.Ft int
-.Fn ascii2addr "int af" "const char *ascii" "void *result"
-.Sh DESCRIPTION
-The routines
-.Fn addr2ascii
-and
-.Fn ascii2addr
-are used to convert network addresses between binary form and a
-printable form appropriate to the address family.  Both functions take
-an
-.Fa af
-argument, specifying the address family to be used in the conversion
-process.
-(Currently, only the
-.Dv AF_INET
-and
-.Dv AF_LINK
-address families are supported.)
-.Pp
-The
-.Fn addr2ascii
-function
-is used to convert binary, network-format addresses into printable
-form.  In addition to
-.Fa af ,
-there are three other arguments.  The
-.Fa addrp
-argument is a pointer to the network address to be converted.
-The
-.Fa len
-argument is the length of the address.  The
-.Fa buf
-argument is an optional pointer to a caller-allocated buffer to hold
-the result; if a null pointer is passed,
-.Fn addr2ascii
-uses a statically-allocated buffer.
-.Pp
-The
-.Fn ascii2addr
-function performs the inverse operation to
-.Fn addr2ascii .
-In addition to
-.Fa af ,
-it takes two parameters,
-.Fa ascii
-and
-.Fa result .
-The
-.Fa ascii
-parameter is a pointer to the string which is to be converted into
-binary.  The
-.Fa result
-parameter is a pointer to an appropriate network address structure for
-the specified family.
-.Pp
-The following gives the appropriate structure to use for binary
-addresses in the specified family:
-.Pp
-.Bl -tag -width AF_INETxxxx -compact
-.It Dv AF_INET
-.Li struct in_addr
-(in
-.Aq Pa netinet/in.h )
-.It Dv AF_LINK
-.Li struct sockaddr_dl
-(in
-.Aq Pa net/if_dl.h )
-.\" .It Dv AF_INET6
-.\" .Li struct in6_addr
-.\" (in
-.\" .Aq Pa netinet6/in6.h )
-.El
-.Sh RETURN VALUES
-The
-.Fn addr2ascii
-function returns the address of the buffer it was passed, or a static
-buffer if the a null pointer was passed; on failure, it returns a null
-pointer.
-The
-.Fn ascii2addr
-function returns the length of the binary address in bytes, or -1 on
-failure.
-.Sh EXAMPLES
-The
-.Xr inet 3
-functions
-.Fn inet_ntoa
-and
-.Fn inet_aton
-could be implemented thusly:
-.Bd -literal -offset indent
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-char *
-inet_ntoa(struct in_addr addr)
-{
-	return addr2ascii(AF_INET, &addr, sizeof addr, 0);
-}
-
-int
-inet_aton(const char *ascii, struct in_addr *addr)
-{
-	return (ascii2addr(AF_INET, ascii, addr)
-	    == sizeof(*addr));
-}
-.Ed
-.Pp
-In actuality, this cannot be done because
-.Fn addr2ascii
-and
-.Fn ascii2addr
-are implemented in terms of the
-.Xr inet 3
-functions, rather than the other way around.
-.Sh ERRORS
-When a failure is returned,
-.Li errno
-is set to one of the following values:
-.Bl -tag -width Er
-.It Bq Er ENAMETOOLONG
-The
-.Fn addr2ascii
-routine was passed a
-.Fa len
-parameter which was inappropriate for the address family given by
-.Fa af .
-.It Bq Er EPROTONOSUPPORT
-Either routine was passed an
-.Fa af
-parameter other than
-.Dv AF_INET
-or
-.Dv AF_LINK .
-.It Bq Er EINVAL
-The string passed to
-.Fn ascii2addr
-was improperly formatted for address family
-.Fa af .
-.El
-.Sh SEE ALSO
-.Xr inet 3 ,
-.Xr linkaddr 3 ,
-.Xr inet 4
-.Sh HISTORY
-An interface close to this one was originally suggested by Craig
-Partridge.  This particular interface originally appeared in the
-.Tn INRIA
-.Tn IPv6
-implementation.
-.Sh AUTHORS
-Code and documentation by
-.An Garrett A. Wollman ,
-MIT Laboratory for Computer Science.
-.Sh BUGS
-The original implementations supported IPv6.  This support should
-eventually be resurrected.  The
-.Tn NRL
-implementation also included support for the
-.Dv AF_ISO
-and
-.Dv AF_NS
-address families.
-.Pp
-The genericity of this interface is somewhat questionable.  A truly
-generic interface would provide a means for determining the length of
-the buffer to be used so that it could be dynamically allocated, and
-would always require a
-.Dq Li "struct sockaddr"
-to hold the binary address.  Unfortunately, this is incompatible with existing
-practice.  This limitation means that a routine for printing network
-addresses from arbitrary address families must still have internal
-knowledge of the maximum buffer length needed and the appropriate part
-of the address to use as the binary address.
diff --git a/newlib/libc/sys/linux/net/addr2ascii.c b/newlib/libc/sys/linux/net/addr2ascii.c
deleted file mode 100644
index f095339..0000000
--- a/newlib/libc/sys/linux/net/addr2ascii.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$ANA: addr2ascii.c,v 1.1 1996/06/13 18:41:46 wollman Exp $
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <net/if_dl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*-
- * Convert a network address from binary to printable numeric format.
- * This API is copied from INRIA's IPv6 implementation, but it is a
- * bit bogus in two ways:
- *
- *	1) There is no value in passing both an address family and
- *	   an address length; either one should imply the other,
- *	   or we should be passing sockaddrs instead.
- *	2) There should by contrast be /added/ a length for the buffer
- *	   that we pass in, so that programmers are spared the need to
- *	   manually calculate (read: ``guess'') the maximum length.
- *
- * Flash: the API is also the same in the NRL implementation, and seems to
- * be some sort of standard, so we appear to be stuck with both the bad
- * naming and the poor choice of arguments.
- */
-char *
-addr2ascii(af, addrp, len, buf)
-	int af;
-	const void *addrp;
-	int len;		/* should be size_t XXX */
-	char *buf;		/* XXX should pass length of buffer */
-{
-	static char staticbuf[64]; /* 64 for AF_LINK > 16 for AF_INET */
-
-	if (!buf)
-		buf = staticbuf;
-
-	switch(af) {
-	case AF_INET:
-		if (len != sizeof(struct in_addr)) {
-			errno = ENAMETOOLONG;
-			return 0;
-		}
-		strcpy(buf, inet_ntoa(*(const struct in_addr *)addrp));
-		break;
-
-	default:
-		errno = EPROTONOSUPPORT;
-		return 0;
-	}
-	return buf;
-}
diff --git a/newlib/libc/sys/linux/net/ascii2addr.c b/newlib/libc/sys/linux/net/ascii2addr.c
deleted file mode 100644
index f69e029..0000000
--- a/newlib/libc/sys/linux/net/ascii2addr.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$ANA: ascii2addr.c,v 1.2 1996/06/13 18:46:02 wollman Exp $
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <net/if_dl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-int
-ascii2addr(af, ascii, result)
-	int af;
-	const char *ascii;
-	void *result;
-{
-	struct in_addr *ina;
-	char strbuf[4*sizeof("123")]; /* long enough for V4 only */
-
-	switch(af) {
-	case AF_INET:
-		ina = result;
-		strbuf[0] = '\0';
-		strncat(strbuf, ascii, (sizeof strbuf)-1);
-		if (inet_aton(strbuf, ina))
-			return sizeof(struct in_addr);
-		errno = EINVAL;
-		break;
-
-	default:
-		errno = EPROTONOSUPPORT;
-		break;
-	}
-
-	return -1;
-}
diff --git a/newlib/libc/sys/linux/net/base64.c b/newlib/libc/sys/linux/net/base64.c
deleted file mode 100644
index 35f7d86..0000000
--- a/newlib/libc/sys/linux/net/base64.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define Assert(Cond) if (!(Cond)) abort()
-
-static const char Base64[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char Pad64 = '=';
-
-/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-   The following encoding technique is taken from RFC 1521 by Borenstein
-   and Freed.  It is reproduced here in a slightly edited form for
-   convenience.
-
-   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-   represented per printable character. (The extra 65th character, "=",
-   is used to signify a special processing function.)
-
-   The encoding process represents 24-bit groups of input bits as output
-   strings of 4 encoded characters. Proceeding from left to right, a
-   24-bit input group is formed by concatenating 3 8-bit input groups.
-   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-   of which is translated into a single digit in the base64 alphabet.
-
-   Each 6-bit group is used as an index into an array of 64 printable
-   characters. The character referenced by the index is placed in the
-   output string.
-
-                         Table 1: The Base64 Alphabet
-
-      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-          0 A            17 R            34 i            51 z
-          1 B            18 S            35 j            52 0
-          2 C            19 T            36 k            53 1
-          3 D            20 U            37 l            54 2
-          4 E            21 V            38 m            55 3
-          5 F            22 W            39 n            56 4
-          6 G            23 X            40 o            57 5
-          7 H            24 Y            41 p            58 6
-          8 I            25 Z            42 q            59 7
-          9 J            26 a            43 r            60 8
-         10 K            27 b            44 s            61 9
-         11 L            28 c            45 t            62 +
-         12 M            29 d            46 u            63 /
-         13 N            30 e            47 v
-         14 O            31 f            48 w         (pad) =
-         15 P            32 g            49 x
-         16 Q            33 h            50 y
-
-   Special processing is performed if fewer than 24 bits are available
-   at the end of the data being encoded.  A full encoding quantum is
-   always completed at the end of a quantity.  When fewer than 24 input
-   bits are available in an input group, zero bits are added (on the
-   right) to form an integral number of 6-bit groups.  Padding at the
-   end of the data is performed using the '=' character.
-
-   Since all base64 input is an integral number of octets, only the
-         -------------------------------------------------                       
-   following cases can arise:
-   
-       (1) the final quantum of encoding input is an integral
-           multiple of 24 bits; here, the final unit of encoded
-	   output will be an integral multiple of 4 characters
-	   with no "=" padding,
-       (2) the final quantum of encoding input is exactly 8 bits;
-           here, the final unit of encoded output will be two
-	   characters followed by two "=" padding characters, or
-       (3) the final quantum of encoding input is exactly 16 bits;
-           here, the final unit of encoded output will be three
-	   characters followed by one "=" padding character.
-   */
-
-int
-b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) {
-	size_t datalength = 0;
-	u_char input[3];
-	u_char output[4];
-	size_t i;
-
-	while (2 < srclength) {
-		input[0] = *src++;
-		input[1] = *src++;
-		input[2] = *src++;
-		srclength -= 3;
-
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		output[3] = input[2] & 0x3f;
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-		Assert(output[3] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		target[datalength++] = Base64[output[2]];
-		target[datalength++] = Base64[output[3]];
-	}
-    
-	/* Now we worry about padding. */
-	if (0 != srclength) {
-		/* Get what's left. */
-		input[0] = input[1] = input[2] = '\0';
-		for (i = 0; i < srclength; i++)
-			input[i] = *src++;
-	
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		if (srclength == 1)
-			target[datalength++] = Pad64;
-		else
-			target[datalength++] = Base64[output[2]];
-		target[datalength++] = Pad64;
-	}
-	if (datalength >= targsize)
-		return (-1);
-	target[datalength] = '\0';	/* Returned value doesn't count \0. */
-	return (datalength);
-}
-
-/* skips all whitespace anywhere.
-   converts characters, four at a time, starting at (or after)
-   src from base - 64 numbers into three 8 bit bytes in the target area.
-   it returns the number of data bytes stored at the target, or -1 on error.
- */
-
-int
-b64_pton(src, target, targsize)
-	char const *src;
-	u_char *target;
-	size_t targsize;
-{
-	int tarindex, state, ch;
-	char *pos;
-
-	state = 0;
-	tarindex = 0;
-
-	while ((ch = *src++) != '\0') {
-		if (isspace((unsigned char)ch))        /* Skip whitespace anywhere. */
-			continue;
-
-		if (ch == Pad64)
-			break;
-
-		pos = strchr(Base64, ch);
-		if (pos == 0) 		/* A non-base64 character. */
-			return (-1);
-
-		switch (state) {
-		case 0:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex] = (pos - Base64) << 2;
-			}
-			state = 1;
-			break;
-		case 1:
-			if (target) {
-				if ((size_t)tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 4;
-				target[tarindex+1]  = ((pos - Base64) & 0x0f)
-							<< 4 ;
-			}
-			tarindex++;
-			state = 2;
-			break;
-		case 2:
-			if (target) {
-				if ((size_t)tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 2;
-				target[tarindex+1]  = ((pos - Base64) & 0x03)
-							<< 6;
-			}
-			tarindex++;
-			state = 3;
-			break;
-		case 3:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex] |= (pos - Base64);
-			}
-			tarindex++;
-			state = 0;
-			break;
-		default:
-			abort();
-		}
-	}
-
-	/*
-	 * We are done decoding Base-64 chars.  Let's see if we ended
-	 * on a byte boundary, and/or with erroneous trailing characters.
-	 */
-
-	if (ch == Pad64) {		/* We got a pad char. */
-		ch = *src++;		/* Skip it, get next. */
-		switch (state) {
-		case 0:		/* Invalid = in first position */
-		case 1:		/* Invalid = in second position */
-			return (-1);
-
-		case 2:		/* Valid, means one byte of info */
-			/* Skip any number of spaces. */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (!isspace((unsigned char)ch))
-					break;
-			/* Make sure there is another trailing = sign. */
-			if (ch != Pad64)
-				return (-1);
-			ch = *src++;		/* Skip the = */
-			/* Fall through to "single trailing =" case. */
-			/* FALLTHROUGH */
-
-		case 3:		/* Valid, means two bytes of info */
-			/*
-			 * We know this char is an =.  Is there anything but
-			 * whitespace after it?
-			 */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (!isspace((unsigned char)ch))
-					return (-1);
-
-			/*
-			 * Now make sure for cases 2 and 3 that the "extra"
-			 * bits that slopped past the last full byte were
-			 * zeros.  If we don't check them, they become a
-			 * subliminal channel.
-			 */
-			if (target && target[tarindex] != 0)
-				return (-1);
-		}
-	} else {
-		/*
-		 * We ended by seeing the end of the string.  Make sure we
-		 * have no partial bytes lying around.
-		 */
-		if (state != 0)
-			return (-1);
-	}
-
-	return (tarindex);
-}
diff --git a/newlib/libc/sys/linux/net/bindresvport.c b/newlib/libc/sys/linux/net/bindresvport.c
deleted file mode 100644
index 7b595b4..0000000
--- a/newlib/libc/sys/linux/net/bindresvport.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*	$NetBSD: bindresvport.c,v 1.19 2000/07/06 03:03:59 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)bindresvport.c 1.8 88/02/08 SMI";*/
-/*static char *sccsid = "from: @(#)bindresvport.c	2.2 88/07/29 4.0 RPCSRC";*/
-/*from: OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp */
-#endif
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/*
- * Copyright (c) 1987 by Sun Microsystems, Inc.
- *
- * Portions Copyright(C) 1996, Jason Downs.  All rights reserved.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-
-#include <string.h>
-#include "un-namespace.h"
-
-/*
- * Bind a socket to a privileged IP port
- */
-int
-bindresvport(sd, sin)
-	int sd;
-	struct sockaddr_in *sin;
-{
-	return bindresvport_sa(sd, (struct sockaddr *)sin);
-}
-
-/*
- * Bind a socket to a privileged IP port
- */
-int
-bindresvport_sa(sd, sa)
-	int sd;
-	struct sockaddr *sa;
-{
-	int old, error, af;
-	struct sockaddr_storage myaddr;
-	struct sockaddr_in *sin;
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-#endif
-	int proto, portrange, portlow;
-	u_int16_t *portp;
-	socklen_t salen;
-
-	if (sa == NULL) {
-		salen = sizeof(myaddr);
-		sa = (struct sockaddr *)&myaddr;
-
-		if (getsockname(sd, sa, &salen) == -1)
-			return -1;	/* errno is correctly set */
-
-		af = sa->sa_family;
-		memset(sa, 0, salen);
-	} else
-		af = sa->sa_family;
-
-	switch (af) {
-	case AF_INET:
-		proto = IPPROTO_IP;
-		portrange = IP_PORTRANGE;
-		portlow = IP_PORTRANGE_LOW;
-		sin = (struct sockaddr_in *)sa;
-		salen = sizeof(struct sockaddr_in);
-		portp = &sin->sin_port;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		proto = IPPROTO_IPV6;
-		portrange = IPV6_PORTRANGE;
-		portlow = IPV6_PORTRANGE_LOW;
-		sin6 = (struct sockaddr_in6 *)sa;
-		salen = sizeof(struct sockaddr_in6);
-		portp = &sin6->sin6_port;
-		break;
-#endif
-	default:
-		errno = EPFNOSUPPORT;
-		return (-1);
-	}
-	sa->sa_family = af;
-
-	if (*portp == 0) {
-		socklen_t oldlen = sizeof(old);
-
-		error = getsockopt(sd, proto, portrange, &old, &oldlen);
-		if (error < 0)
-			return (error);
-
-		error = setsockopt(sd, proto, portrange, &portlow,
-		    sizeof(portlow));
-		if (error < 0)
-			return (error);
-	}
-
-	error = bind(sd, sa, salen);
-
-	if (*portp == 0) {
-		int saved_errno = errno;
-
-		if (error < 0) {
-			if (setsockopt(sd, proto, portrange, &old,
-			    sizeof(old)) < 0)
-				errno = saved_errno;
-			return (error);
-		}
-
-		if (sa != (struct sockaddr *)&myaddr) {
-			/* Hmm, what did the kernel assign? */
-			if (getsockname(sd, sa, &salen) < 0)
-				errno = saved_errno;
-			return (error);
-		}
-	}
-	return (error);
-}
diff --git a/newlib/libc/sys/linux/net/byteorder.3 b/newlib/libc/sys/linux/net/byteorder.3
deleted file mode 100644
index 062ac9d..0000000
--- a/newlib/libc/sys/linux/net/byteorder.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)byteorder.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/byteorder.3,v 1.9 2001/12/08 19:06:23 ru Exp $
-.\"
-.Dd June 4, 1993
-.Dt BYTEORDER 3
-.Os
-.Sh NAME
-.Nm htonl ,
-.Nm htons ,
-.Nm ntohl ,
-.Nm ntohs
-.Nd convert values between host and network byte order
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In arpa/inet.h
-.Ft uint32_t
-.Fn htonl "uint32_t hostlong"
-.Ft uint16_t
-.Fn htons "uint16_t hostshort"
-.Ft uint32_t
-.Fn ntohl "uint32_t netlong"
-.Ft uint16_t
-.Fn ntohs "uint16_t netshort"
-.Sh DESCRIPTION
-These routines convert 16 and 32 bit quantities between network
-byte order and host byte order.
-On machines which have a byte order which is the same as the network
-order, routines are defined as null macros.
-.Pp
-These routines are most often used in conjunction with Internet
-addresses and ports as returned by
-.Xr gethostbyname 3
-and
-.Xr getservent 3 .
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr getservent 3
-.Sh STANDARDS
-The
-.Nm byteorder
-functions are expected to conform with
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Nm byteorder
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-On the
-.Tn VAX
-bytes are handled backwards from most everyone else in
-the world.  This is not expected to be fixed in the near future.
diff --git a/newlib/libc/sys/linux/net/ether_addr.c b/newlib/libc/sys/linux/net/ether_addr.c
deleted file mode 100644
index 7d2b19f..0000000
--- a/newlib/libc/sys/linux/net/ether_addr.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 1995
- *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * ethernet address conversion and lookup routines
- *
- * Written by Bill Paul <wpaul@ctr.columbia.edu>
- * Center for Telecommunications Research
- * Columbia University, New York City
- */
-
-#include <sys/cdefs.h>
-
-#include <stdio.h>
-#include <paths.h>
-#include <sys/types.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <net/ethernet.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#ifndef _PATH_ETHERS
-#define _PATH_ETHERS "/etc/ethers"
-#endif
-
-/*
- * Parse a string of text containing an ethernet address and hostname
- * and separate it into its component parts.
- */
-int
-ether_line(l, e, hostname)
-	const char *l;
-	struct ether_addr *e;
-	char *hostname;
-{
-        int i, o[6];
-
-        i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2],
-                                              &o[3], &o[4], &o[5],
-					      hostname);
-	if (i != 7)
-                return (i);
-
-        for (i=0; i<6; i++)
-                e->octet[i] = o[i];
-        return (0);
-}
-
-/*
- * Convert an ASCII representation of an ethernet address to
- * binary form.
- */
-struct
-ether_addr *ether_aton(a)
-	const char *a;
-{
-        int i;
-	static struct ether_addr o;
-	unsigned int o0, o1, o2, o3, o4, o5;
-
-        i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
-
-        if (i != 6)
-                return (NULL);
-
-        o.octet[0]=o0;
-	o.octet[1]=o1;
-	o.octet[2]=o2;
-	o.octet[3]=o3;
-	o.octet[4]=o4;
-	o.octet[5]=o5;
-
-        return ((struct ether_addr *)&o);
-}
-
-/*
- * Convert a binary representation of an ethernet address to
- * an ASCII string.
- */
-char
-*ether_ntoa(n)
-	const struct ether_addr *n;
-{
-        int i;
-	static char a[18];
-
-        i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x",
-	    n->octet[0], n->octet[1], n->octet[2],
-	    n->octet[3], n->octet[4], n->octet[5]);
-        if (i < 17)
-                return (NULL);
-        return ((char *)&a);
-}
-
-/*
- * Map an ethernet address to a hostname. Use either /etc/ethers or
- * NIS/YP.
- */
-int
-ether_ntohost(hostname, e)
-	char *hostname;
-	const struct ether_addr *e;
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct ether_addr local_ether;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *ether_a;
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			ether_a = ether_ntoa(e);
-			if (yp_match(yp_domain, "ethers.byaddr", ether_a,
-				strlen(ether_a), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (!ether_line(buf, &local_ether, local_host)) {
-			if (!memcmp((char *)&local_ether.octet[0],
-				(char *)&e->octet[0], 6)) {
-			/* We have a match */
-				strcpy(hostname, local_host);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
-
-/*
- * Map a hostname to an ethernet address using /etc/ethers or
- * NIS/YP.
- */
-int
-ether_hostton(hostname, e)
-	const char *hostname;
-	struct ether_addr *e;
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct ether_addr local_ether;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			if (yp_match(yp_domain, "ethers.byname", hostname,
-				strlen(hostname), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (!ether_line(buf, &local_ether, local_host)) {
-			if (!strcmp(hostname, local_host)) {
-				/* We have a match */
-				bcopy((char *)&local_ether.octet[0],
-					(char *)&e->octet[0], 6);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
diff --git a/newlib/libc/sys/linux/net/ethers.3 b/newlib/libc/sys/linux/net/ethers.3
deleted file mode 100644
index 7b7866f..0000000
--- a/newlib/libc/sys/linux/net/ethers.3
+++ /dev/null
@@ -1,197 +0,0 @@
-.\" Copyright (c) 1995
-.\"	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by Bill Paul.
-.\" 4. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.19 2002/01/14 16:59:00 ru Exp $
-.\"
-.Dd April 12, 1995
-.Dt ETHERS 3
-.Os
-.Sh NAME
-.Nm ethers ,
-.Nm ether_line ,
-.Nm ether_aton ,
-.Nm ether_ntoa ,
-.Nm ether_ntohost ,
-.Nm ether_hostton
-.Nd Ethernet address conversion and lookup routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In net/ethernet.h
-.Ft int
-.Fn ether_line "const char *l" "struct ether_addr *e" "char *hostname"
-.Ft struct ether_addr *
-.Fn ether_aton "const char *a"
-.Ft char *
-.Fn ether_ntoa "const struct ether_addr *n"
-.Ft int
-.Fn ether_ntohost "char *hostname" "const struct ether_addr *e"
-.Ft int
-.Fn ether_hostton "const char *hostname" "struct ether_addr *e"
-.Sh DESCRIPTION
-These functions operate on ethernet addresses using an
-.Ar ether_addr
-structure, which is defined in the header file
-.Aq Pa netinet/if_ether.h :
-.Bd -literal -offset indent
-/*
- * The number of bytes in an ethernet (MAC) address.
- */
-#define ETHER_ADDR_LEN		6
-
-/*
- * Structure of a 48-bit Ethernet address.
- */
-struct  ether_addr {
-        u_char octet[ETHER_ADDR_LEN];
-};
-.Ed
-.Pp
-The function
-.Fn ether_line
-scans
-.Ar l ,
-an
-.Tn ASCII
-string in
-.Xr ethers 5
-format and sets
-.Ar e
-to the ethernet address specified in the string and
-.Ar h
-to the hostname.
-This function is used to parse lines from
-.Pa /etc/ethers
-into their component parts.
-.Pp
-The
-.Fn ether_aton
-function converts an
-.Tn ASCII
-representation of an ethernet address into an
-.Ar ether_addr
-structure.
-Likewise,
-.Fn ether_ntoa
-converts an ethernet address specified as an
-.Ar ether_addr
-structure into an
-.Tn ASCII
-string.
-.Pp
-The
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions map ethernet addresses to their corresponding hostnames
-as specified in the
-.Pa /etc/ethers
-database.
-.Fn ether_ntohost
-converts from ethernet address to hostname, and
-.Fn ether_hostton
-converts from hostname to ethernet address.
-.Sh RETURN VALUES
-.Fn ether_line
-returns zero on success and non-zero if it was unable to parse
-any part of the supplied line
-.Ar l .
-It returns the extracted ethernet address in the supplied
-.Ar ether_addr
-structure
-.Ar e
-and the hostname in the supplied string
-.Ar h .
-.Pp
-On success,
-.Fn ether_ntoa
-returns a pointer to a string containing an
-.Tn ASCII
-representation of an ethernet address.
-If it is unable to convert
-the supplied
-.Ar ether_addr
-structure, it returns a
-.Dv NULL
-pointer.
-Likewise,
-.Fn ether_aton
-returns a pointer to an
-.Ar ether_addr
-structure on success and a
-.Dv NULL
-pointer on failure.
-.Pp
-The
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions both return zero on success or non-zero if they were
-unable to find a match in the
-.Pa /etc/ethers
-database.
-.Sh NOTES
-The user must insure that the hostname strings passed to the
-.Fn ether_line ,
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions are large enough to contain the returned hostnames.
-.Sh NIS INTERACTION
-If the
-.Pa /etc/ethers
-contains a line with a single + in it, the
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions will attempt to consult the NIS
-.Pa ethers.byname
-and
-.Pa ethers.byaddr
-maps in addition to the data in the
-.Pa /etc/ethers
-file.
-.Sh SEE ALSO
-.Xr ethers 5 ,
-.Xr yp 8
-.Sh BUGS
-The
-.Fn ether_aton
-and
-.Fn ether_ntoa
-functions returns values that are stored in static memory areas
-which may be overwritten the next time they are called.
-.Sh HISTORY
-This particular implementation of the
-.Nm
-library functions were written for and first appeared in
-.Fx 2.1 .
diff --git a/newlib/libc/sys/linux/net/getaddrinfo.3 b/newlib/libc/sys/linux/net/getaddrinfo.3
deleted file mode 100644
index eca8b03..0000000
--- a/newlib/libc/sys/linux/net/getaddrinfo.3
+++ /dev/null
@@ -1,620 +0,0 @@
-.\"	$FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.18 2002/04/19 04:46:20 suz Exp $
-.\"	$KAME: getaddrinfo.3,v 1.31 2001/08/05 18:19:38 itojun Exp $
-.\"
-.\" Copyright (c) 1983, 1987, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\"
-.Dd May 25, 1995
-.Dt GETADDRINFO 3
-.Os
-.\"
-.Sh NAME
-.Nm getaddrinfo ,
-.Nm freeaddrinfo ,
-.Nm gai_strerror
-.Nd nodename-to-address translation in protocol-independent manner
-.\"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netdb.h
-.Ft int
-.Fn getaddrinfo "const char *nodename" "const char *servname" \
-"const struct addrinfo *hints" "struct addrinfo **res"
-.Ft void
-.Fn freeaddrinfo "struct addrinfo *ai"
-.Ft "char *"
-.Fn gai_strerror "int ecode"
-.\"
-.Sh DESCRIPTION
-The
-.Fn getaddrinfo
-function is defined for protocol-independent nodename-to-address translation.
-It performs the functionality of
-.Xr gethostbyname 3
-and
-.Xr getservbyname 3 ,
-but in a more sophisticated manner.
-.Pp
-The
-.Li addrinfo
-structure is defined as a result of including the
-.Aq Pa netdb.h
-header:
-.Bd -literal -offset
-struct addrinfo {
-     int     ai_flags;     /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
-     int     ai_family;    /* PF_xxx */
-     int     ai_socktype;  /* SOCK_xxx */
-     int     ai_protocol;  /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
-     size_t  ai_addrlen;   /* length of ai_addr */
-     char   *ai_canonname; /* canonical name for nodename */
-     struct sockaddr  *ai_addr; /* binary address */
-     struct addrinfo  *ai_next; /* next structure in linked list */
-};
-.Ed
-.Pp
-The
-.Fa nodename
-and
-.Fa servname
-arguments are pointers to null-terminated strings or
-.Dv NULL .
-One or both of these two arguments must be a
-.Pf non Dv -NULL
-pointer.
-In the normal client scenario, both the
-.Fa nodename
-and
-.Fa servname
-are specified.
-In the normal server scenario, only the
-.Fa servname
-is specified.
-A
-.Pf non Dv -NULL
-.Fa nodename
-string can be either a node name or a numeric host address string
-(i.e., a dotted-decimal IPv4 address or an IPv6 hex address).
-A
-.Pf non Dv -NULL
-.Fa servname
-string can be either a service name or a decimal port number.
-.Pp
-The caller can optionally pass an
-.Li addrinfo
-structure, pointed to by the third argument,
-to provide hints concerning the type of socket that the caller supports.
-In this
-.Fa hints
-structure all members other than
-.Fa ai_flags ,
-.Fa ai_family ,
-.Fa ai_socktype ,
-and
-.Fa ai_protocol
-must be zero or a
-.Dv NULL
-pointer.
-A value of
-.Dv PF_UNSPEC
-for
-.Fa ai_family
-means the caller will accept any protocol family.
-A value of 0 for
-.Fa ai_socktype
-means the caller will accept any socket type.
-A value of 0 for
-.Fa ai_protocol
-means the caller will accept any protocol.
-For example, if the caller handles only TCP and not UDP, then the
-.Fa ai_socktype
-member of the hints structure should be set to
-.Dv SOCK_STREAM
-when
-.Fn getaddrinfo
-is called.
-If the caller handles only IPv4 and not IPv6, then the
-.Fa ai_family
-member of the
-.Fa hints
-structure should be set to
-.Dv PF_INET
-when
-.Fn getaddrinfo
-is called.
-If the third argument to
-.Fn getaddrinfo
-is a
-.Dv NULL
-pointer, this is the same as if the caller had filled in an
-.Li addrinfo
-structure initialized to zero with
-.Fa ai_family
-set to
-.Dv PF_UNSPEC .
-.Pp
-Upon successful return a pointer to a linked list of one or more
-.Li addrinfo
-structures is returned through the final argument.
-The caller can process each
-.Li addrinfo
-structure in this list by following the
-.Fa ai_next
-pointer, until a
-.Dv NULL
-pointer is encountered.
-In each returned
-.Li addrinfo
-structure the three members
-.Fa ai_family ,
-.Fa ai_socktype ,
-and
-.Fa ai_protocol
-are the corresponding arguments for a call to the
-.Fn socket
-function.
-In each
-.Li addrinfo
-structure the
-.Fa ai_addr
-member points to a filled-in socket address structure whose length is
-specified by the
-.Fa ai_addrlen
-member.
-.Pp
-If the
-.Dv AI_PASSIVE
-bit is set in the
-.Fa ai_flags
-member of the
-.Fa hints
-structure, then the caller plans to use the returned socket address
-structure in a call to
-.Fn bind .
-In this case, if the
-.Fa nodename
-argument is a
-.Dv NULL
-pointer, then the IP address portion of the socket
-address structure will be set to
-.Dv INADDR_ANY
-for an IPv4 address or
-.Dv IN6ADDR_ANY_INIT
-for an IPv6 address.
-.Pp
-If the
-.Dv AI_PASSIVE
-bit is not set in the
-.Fa ai_flags
-member of the
-.Fa hints
-structure, then the returned socket address structure will be ready for a
-call to
-.Fn connect
-(for a connection-oriented protocol)
-or either
-.Fn connect ,
-.Fn sendto ,
-or
-.Fn sendmsg
-(for a connectionless protocol).
-In this case, if the
-.Fa nodename
-argument is a
-.Dv NULL
-pointer, then the IP address portion of the
-socket address structure will be set to the loopback address.
-.Pp
-If the
-.Dv AI_CANONNAME
-bit is set in the
-.Fa ai_flags
-member of the
-.Fa hints
-structure, then upon successful return the
-.Fa ai_canonname
-member of the first
-.Li addrinfo
-structure in the linked list will point to a null-terminated string
-containing the canonical name of the specified
-.Fa nodename .
-.Pp
-If the
-.Dv AI_NUMERICHOST
-bit is set in the
-.Fa ai_flags
-member of the
-.Fa hints
-structure, then a
-.Pf non Dv -NULL
-.Fa nodename
-string must be a numeric host address string.
-Otherwise an error of
-.Dv EAI_NONAME
-is returned.
-This flag prevents any type of name resolution service (e.g., the DNS)
-from being called.
-.Pp
-The arguments to
-.Fn getaddrinfo
-must be sufficiently consistent and unambiguous.
-Here are some problem cases you may encounter:
-.Bl -bullet
-.It
-.Fn getaddrinfo
-will fail if the members in the
-.Fa hints
-structure are not consistent.
-For example, for internet address families,
-.Fn getaddrinfo
-will fail if you specify
-.Dv SOCK_STREAM
-to
-.Fa ai_socktype
-while you specify
-.Dv IPPROTO_UDP
-to
-.Fa ai_protocol .
-.It
-If you specify a
-.Fa servname
-which is defined only for certain
-.Fa ai_socktype ,
-.Fn getaddrinfo
-will fail because the arguments are not consistent.
-For example,
-.Fn getaddrinfo
-will return an error if you ask for
-.Dq Li tftp
-service on
-.Dv SOCK_STREAM .
-.It
-For internet address families, if you specify
-.Fa servname
-while you set
-.Fa ai_socktype
-to
-.Dv SOCK_RAW ,
-.Fn getaddrinfo
-will fail, because service names are not defined for the internet
-.Dv SOCK_RAW
-space.
-.It
-If you specify numeric
-.Fa servname ,
-while leaving
-.Fa ai_socktype
-and
-.Fa ai_protocol
-unspecified,
-.Fn getaddrinfo
-will fail.
-This is because the numeric
-.Fa servname
-does not identify any socket type, and
-.Fn getaddrinfo
-is not allowed to glob the argument in such case.
-.El
-.Pp
-All of the information returned by
-.Fn getaddrinfo
-is dynamically allocated:
-the
-.Li addrinfo
-structures, the socket address structures, and canonical node name
-strings pointed to by the addrinfo structures.
-To return this information to the system the function
-.Fn freeaddrinfo
-is called.
-The
-.Fa addrinfo
-structure pointed to by the
-.Fa ai argument
-is freed, along with any dynamic storage pointed to by the structure.
-This operation is repeated until a
-.Dv NULL
-.Fa ai_next
-pointer is encountered.
-.Pp
-To aid applications in printing error messages based on the
-.Dv EAI_xxx
-codes returned by
-.Fn getaddrinfo ,
-.Fn gai_strerror
-is defined.
-The argument is one of the
-.Dv EAI_xxx
-values defined earlier and the return value points to a string describing
-the error.
-If the argument is not one of the
-.Dv EAI_xxx
-values, the function still returns a pointer to a string whose contents
-indicate an unknown error.
-.\"
-.Sh EXTENSIONS
-This implementation supports numeric IPv6 address notation with the
-experimental scope identifier.
-By appending a percent sign and scope identifier to the address, you
-can specify the value of the
-.Li sin6_scope_id
-field of the socket address.
-This makes management of scoped address easier,
-and allows cut-and-paste input of scoped addresses.
-.Pp
-At the moment the code supports only link-local addresses in this format.
-The scope identifier is hardcoded to name of hardware interface associated
-with the link,
-(such as
-.Li ne0 ) .
-For example,
-.Dq Li fe80::1%ne0 ,
-which means
-.Do
-.Li fe80::1
-on the link associated with the
-.Li ne0
-interface
-.Dc .
-.Pp
-This implementation is still very experimental and non-standard.
-The current implementation assumes a one-to-one relationship between
-interfaces and links, which is not necessarily true according to the
-specification.
-.\"
-.Sh EXAMPLES
-The following code tries to connect to
-.Dq Li www.kame.net
-service
-.Dq Li http .
-via stream socket.
-It loops through all the addresses available, regardless of the address family.
-If the destination resolves to an IPv4 address, it will use an
-.Dv AF_INET
-socket.
-Similarly, if it resolves to IPv6, an
-.Dv AF_INET6
-socket is used.
-Observe that there is no hardcoded reference to particular address family.
-The code works even if
-.Fn getaddrinfo
-returns addresses that are not IPv4/v6.
-.Bd -literal -offset indent
-struct addrinfo hints, *res, *res0;
-int error;
-int s;
-const char *cause = NULL;
-
-memset(&hints, 0, sizeof(hints));
-hints.ai_family = PF_UNSPEC;
-hints.ai_socktype = SOCK_STREAM;
-error = getaddrinfo("www.kame.net", "http", &hints, &res0);
-if (error) {
-	errx(1, "%s", gai_strerror(error));
-	/*NOTREACHED*/
-}
-s = -1;
-cause = "no addresses";
-errno = EADDRNOTAVAIL;
-for (res = res0; res; res = res->ai_next) {
-	s = socket(res->ai_family, res->ai_socktype,
-	    res->ai_protocol);
-	if (s < 0) {
-		cause = "socket";
-		continue;
-	}
-
-	if (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
-		cause = "connect";
-		close(s);
-		s = -1;
-		continue;
-	}
-
-	break;	/* okay we got one */
-}
-if (s < 0) {
-	err(1, cause);
-	/*NOTREACHED*/
-}
-freeaddrinfo(res0);
-.Ed
-.Pp
-The following example tries to open a wildcard listening socket onto service
-.Dq Li http ,
-for all the address families available.
-.Bd -literal -offset indent
-struct addrinfo hints, *res, *res0;
-int error;
-int s[MAXSOCK];
-int nsock;
-const char *cause = NULL;
-
-memset(&hints, 0, sizeof(hints));
-hints.ai_family = PF_UNSPEC;
-hints.ai_socktype = SOCK_STREAM;
-hints.ai_flags = AI_PASSIVE;
-error = getaddrinfo(NULL, "http", &hints, &res0);
-if (error) {
-	errx(1, "%s", gai_strerror(error));
-	/*NOTREACHED*/
-}
-nsock = 0;
-for (res = res0; res && nsock < MAXSOCK; res = res->ai_next) {
-	s[nsock] = socket(res->ai_family, res->ai_socktype,
-	    res->ai_protocol);
-	if (s[nsock] < 0) {
-		cause = "socket";
-		continue;
-	}
-
-	if (bind(s[nsock], res->ai_addr, res->ai_addrlen) < 0) {
-		cause = "bind";
-		close(s[nsock]);
-		continue;
-	}
-
-	if (listen(s[nsock], SOMAXCONN) < 0) {
-		cause = "listen";
-		close(s[nsock]);
-		continue;
-	}
-
-	nsock++;
-}
-if (nsock == 0) {
-	err(1, cause);
-	/*NOTREACHED*/
-}
-freeaddrinfo(res0);
-.Ed
-.\"
-.Sh FILES
-.Bl -tag -width /etc/nsswitch.conf -compact
-.It Pa /etc/hosts
-.It Pa /etc/nsswitch.conf
-.It Pa /etc/resolv.conf
-.El
-.\"
-.Sh DIAGNOSTICS
-Error return status from
-.Fn getaddrinfo
-is zero on success and non-zero on errors.
-Non-zero error codes are defined in
-.Aq Pa netdb.h ,
-and as follows:
-.Pp
-.Bl -tag -width EAI_ADDRFAMILY -compact
-.It Dv EAI_ADDRFAMILY
-Address family for
-.Fa nodename
-not supported.
-.It Dv EAI_AGAIN
-Temporary failure in name resolution.
-.It Dv EAI_BADFLAGS
-Invalid value for
-.Fa ai_flags .
-.It Dv EAI_FAIL
-Non-recoverable failure in name resolution.
-.It Dv EAI_FAMILY
-.Fa ai_family
-not supported.
-.It Dv EAI_MEMORY
-Memory allocation failure.
-.It Dv EAI_NODATA
-No address associated with
-.Fa nodename .
-.It Dv EAI_NONAME
-.Fa nodename
-nor
-.Fa servname
-provided, or not known.
-.It Dv EAI_SERVICE
-.Fa servname
-not supported for
-.Fa ai_socktype .
-.It Dv EAI_SOCKTYPE
-.Fa ai_socktype
-not supported.
-.It Dv EAI_SYSTEM
-System error returned in
-.Va errno .
-.It Dv EAI_BADHINTS
-Invalid value for
-.Fa hints .
-.It Dv EAI_PROTOCOL
-Resolved protocol is unknown.
-.It Dv EAI_MAX
-Unknown error.
-.El
-.Pp
-If called with an appropriate argument,
-.Fn gai_strerror
-returns a pointer to a string describing the given error code.
-If the argument is not one of the
-.Dv EAI_xxx
-values, the function still returns a pointer to a string whose contents
-indicate an unknown error.
-.\"
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr getnameinfo 3 ,
-.Xr getservbyname 3 ,
-.Xr hosts 5 ,
-.Xr resolv.conf 5 ,
-.Xr services 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Pp
-.Rs
-.%A R. Gilligan
-.%A S. Thomson
-.%A J. Bound
-.%A W. Stevens
-.%T Basic Socket Interface Extensions for IPv6
-.%R RFC2553
-.%D March 1999
-.Re
-.Rs
-.%A Tatsuya Jinmei
-.%A Atsushi Onoe
-.%T "An Extension of Format for IPv6 Scoped Addresses"
-.%R internet draft
-.%N draft-ietf-ipngwg-scopedaddr-format-02.txt
-.%O work in progress material
-.Re
-.Rs
-.%A Craig Metz
-.%T Protocol Independence Using the Sockets API
-.%B "Proceedings of the freenix track: 2000 USENIX annual technical conference"
-.%D June 2000
-.Re
-.\"
-.Sh HISTORY
-The implementation first appeared in WIDE Hydrangea IPv6 protocol stack kit.
-.\"
-.Sh STANDARDS
-The
-.Fn getaddrinfo
-function is defined in
-.St -p1003.1g-2000 ,
-and documented in
-.Dq Basic Socket Interface Extensions for IPv6
-(RFC2553).
-.\"
-.Sh BUGS
-The current implementation is not thread-safe.
-.Pp
-The text was shamelessly copied from RFC2553.
diff --git a/newlib/libc/sys/linux/net/getaddrinfo.c b/newlib/libc/sys/linux/net/getaddrinfo.c
deleted file mode 100644
index 97ba362..0000000
--- a/newlib/libc/sys/linux/net/getaddrinfo.c
+++ /dev/null
@@ -1,1979 +0,0 @@
-/*	$KAME: getaddrinfo.c,v 1.15 2000/07/09 04:37:24 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * "#ifdef FAITH" part is local hack for supporting IPv4-v6 translator.
- *
- * Issues to be discussed:
- * - Thread safe-ness must be checked.
- * - Return values.  There are nonstandard return values defined and used
- *   in the source code.  This is because RFC2553 is silent about which error
- *   code must be returned for which situation.
- * - freeaddrinfo(NULL).  RFC2553 is silent about it.  XNET 5.2 says it is
- *   invalid.
- *   current code - SEGV on freeaddrinfo(NULL)
- * Note:
- * - We use getipnodebyname() just for thread-safeness.  There's no intent
- *   to let it do PF_UNSPEC (actually we never pass PF_UNSPEC to
- *   getipnodebyname().
- * - The code filters out AFs that are not supported by the kernel,
- *   when globbing NULL hostname (to loopback, or wildcard).  Is it the right
- *   thing to do?  What is the relationship with post-RFC2553 AI_ADDRCONFIG
- *   in ai_flags?
- * - (post-2553) semantics of AI_ADDRCONFIG itself is too vague.
- *   (1) what should we do against numeric hostname (2) what should we do
- *   against NULL hostname (3) what is AI_ADDRCONFIG itself.  AF not ready?
- *   non-loopback address configured?  global address configured?
- * - To avoid search order issue, we have a big amount of code duplicate
- *   from gethnamaddr.c and some other places.  The issues that there's no
- *   lower layer function to lookup "IPv4 or IPv6" record.  Calling
- *   gethostbyname2 from getaddrinfo will end up in wrong search order, as
- *   follows:
- *	- The code makes use of following calls when asked to resolver with
- *	  ai_family  = PF_UNSPEC:
- *		getipnodebyname(host, AF_INET6);
- *		getipnodebyname(host, AF_INET);
- *	  This will result in the following queries if the node is configure to
- *	  prefer /etc/hosts than DNS:
- *		lookup /etc/hosts for IPv6 address
- *		lookup DNS for IPv6 address
- *		lookup /etc/hosts for IPv4 address
- *		lookup DNS for IPv4 address
- *	  which may not meet people's requirement.
- *	  The right thing to happen is to have underlying layer which does
- *	  PF_UNSPEC lookup (lookup both) and return chain of addrinfos.
- *	  This would result in a bit of code duplicate with _dns_ghbyname() and
- *	  friends.
- */
-/*
- * diffs with other KAME platforms:
- * - other KAME platforms already nuked FAITH ($GAI), but as FreeBSD
- *   4.0-RELEASE supplies it, we still have the code here.
- * - AI_ADDRCONFIG support is supplied
- * - some of FreeBSD style (#define tabify and others)
- * - classful IPv4 numeric (127.1) is allowed.
- */
-
-#include <sys/cdefs.h>
-#include <machine/endian.h>
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#ifdef DEBUG
-#include <syslog.h>
-#endif
-
-#include <syslog.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include "un-namespace.h"
-
-#if defined(__KAME__) && defined(INET6)
-# define FAITH
-#endif
-
-#define	SUCCESS 0
-#define	ANY 0
-#define	YES 1
-#define	NO  0
-
-static const char in_addrany[] = { 0, 0, 0, 0 };
-static const char in6_addrany[] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-static const char in_loopback[] = { 127, 0, 0, 1 };
-static const char in6_loopback[] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
-};
-
-static const struct afd {
-	int a_af;
-	int a_addrlen;
-	int a_socklen;
-	int a_off;
-	const char *a_addrany;
-	const char *a_loopback;
-	int a_scoped;
-} afdl [] = {
-#ifdef INET6
-#define	N_INET6 0
-	{PF_INET6, sizeof(struct in6_addr),
-	 sizeof(struct sockaddr_in6),
-	 offsetof(struct sockaddr_in6, sin6_addr),
-	 in6_addrany, in6_loopback, 1},
-#define	N_INET 1
-#else
-#define	N_INET 0
-#endif
-	{PF_INET, sizeof(struct in_addr),
-	 sizeof(struct sockaddr_in),
-	 offsetof(struct sockaddr_in, sin_addr),
-	 in_addrany, in_loopback, 0},
-	{0, 0, 0, 0, NULL, NULL, 0},
-};
-
-struct explore {
-	int e_af;
-	int e_socktype;
-	int e_protocol;
-	const char *e_protostr;
-	int e_wild;
-#define	WILD_AF(ex)		((ex)->e_wild & 0x01)
-#define	WILD_SOCKTYPE(ex)	((ex)->e_wild & 0x02)
-#define	WILD_PROTOCOL(ex)	((ex)->e_wild & 0x04)
-};
-
-static const struct explore explore[] = {
-#if 0
-	{ PF_LOCAL, 0, ANY, ANY, NULL, 0x01 },
-#endif
-#ifdef INET6
-	{ PF_INET6, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
-	{ PF_INET6, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
-	{ PF_INET6, SOCK_RAW, ANY, NULL, 0x05 },
-#endif
-	{ PF_INET, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
-	{ PF_INET, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
-	{ PF_INET, SOCK_RAW, ANY, NULL, 0x05 },
-	{ PF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
-	{ PF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
-	{ PF_UNSPEC, SOCK_RAW, ANY, NULL, 0x05 },
-	{ -1, 0, 0, NULL, 0 },
-};
-
-#ifdef INET6
-#define	PTON_MAX	16
-#else
-#define	PTON_MAX	4
-#endif
-
-static const ns_src default_dns_files[] = {
-	{ NSSRC_FILES, 	NS_SUCCESS },
-	{ NSSRC_DNS, 	NS_SUCCESS },
-	{ 0 }
-};
-
-#if PACKETSZ > 1024
-#define MAXPACKET	PACKETSZ
-#else
-#define MAXPACKET	1024
-#endif
-
-typedef union {
-	HEADER hdr;
-	u_char buf[MAXPACKET];
-} querybuf;
-
-struct res_target {
-	struct res_target *next;
-	const char *name;	/* domain name */
-	int qclass, qtype;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer buffer */
-	int n;			/* result length */
-};
-
-static int str_isnumber(const char *);
-static int explore_fqdn(const struct addrinfo *, const char *,
-	const char *, struct addrinfo **);
-static int explore_null(const struct addrinfo *,
-	const char *, struct addrinfo **);
-static int explore_numeric(const struct addrinfo *, const char *,
-	const char *, struct addrinfo **);
-static int explore_numeric_scope(const struct addrinfo *, const char *,
-	const char *, struct addrinfo **);
-static int get_canonname(const struct addrinfo *,
-	struct addrinfo *, const char *);
-static struct addrinfo *get_ai(const struct addrinfo *,
-	const struct afd *, const char *);
-static int get_portmatch(const struct addrinfo *, const char *);
-static int get_port(struct addrinfo *, const char *, int);
-static const struct afd *find_afd(int);
-static int addrconfig(struct addrinfo *);
-#ifdef INET6
-static int ip6_str2scopeid(char *, struct sockaddr_in6 *);
-#endif
-
-static struct addrinfo *getanswer(const querybuf *, int, const char *, int,
-	const struct addrinfo *);
-static int _dns_getaddrinfo(void *, void *, va_list);
-static void _sethtent(void);
-static void _endhtent(void);
-static struct addrinfo *_gethtent(const char *, const struct addrinfo *);
-static int _files_getaddrinfo(void *, void *, va_list);
-#ifdef YP
-static struct addrinfo *_yphostent(char *, const struct addrinfo *);
-static int _yp_getaddrinfo(void *, void *, va_list);
-extern int _yp_check(char **);
-#endif
-
-u_int16_t _getshort(const u_char *src);
-
-static int res_queryN(const char *, struct res_target *);
-static int res_searchN(const char *, struct res_target *);
-static int res_querydomainN(const char *, const char *,
-	struct res_target *);
-
-static char *ai_errlist[] = {
-	"Success",
-	"Address family for hostname not supported",	/* EAI_ADDRFAMILY */
-	"Temporary failure in name resolution",		/* EAI_AGAIN      */
-	"Invalid value for ai_flags",		       	/* EAI_BADFLAGS   */
-	"Non-recoverable failure in name resolution", 	/* EAI_FAIL       */
-	"ai_family not supported",			/* EAI_FAMILY     */
-	"Memory allocation failure", 			/* EAI_MEMORY     */
-	"No address associated with hostname", 		/* EAI_NODATA     */
-	"hostname nor servname provided, or not known",	/* EAI_NONAME     */
-	"servname not supported for ai_socktype",	/* EAI_SERVICE    */
-	"ai_socktype not supported", 			/* EAI_SOCKTYPE   */
-	"System error returned in errno", 		/* EAI_SYSTEM     */
-	"Invalid value for hints",			/* EAI_BADHINTS	  */
-	"Resolved protocol is unknown",			/* EAI_PROTOCOL   */
-	"Unknown error", 				/* EAI_MAX        */
-};
-
-/* XXX macros that make external reference is BAD. */
-
-#define	GET_AI(ai, afd, addr) \
-do { \
-	/* external reference: pai, error, and label free */ \
-	(ai) = get_ai(pai, (afd), (addr)); \
-	if ((ai) == NULL) { \
-		error = EAI_MEMORY; \
-		goto free; \
-	} \
-} while (/*CONSTCOND*/0)
-
-#define	GET_PORT(ai, serv) \
-do { \
-	/* external reference: error and label free */ \
-	error = get_port((ai), (serv), 0); \
-	if (error != 0) \
-		goto free; \
-} while (/*CONSTCOND*/0)
-
-#define	GET_CANONNAME(ai, str) \
-do { \
-	/* external reference: pai, error and label free */ \
-	error = get_canonname(pai, (ai), (str)); \
-	if (error != 0) \
-		goto free; \
-} while (/*CONSTCOND*/0)
-
-#define	ERR(err) \
-do { \
-	/* external reference: error, and label bad */ \
-	error = (err); \
-	goto bad; \
-	/*NOTREACHED*/ \
-} while (/*CONSTCOND*/0)
-
-#define	MATCH_FAMILY(x, y, w) \
-	((x) == (y) || (/*CONSTCOND*/(w) && ((x) == PF_UNSPEC || (y) == PF_UNSPEC)))
-#define	MATCH(x, y, w) \
-	((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY)))
-
-char *
-gai_strerror(ecode)
-	int ecode;
-{
-	if (ecode < 0 || ecode > EAI_MAX)
-		ecode = EAI_MAX;
-	return ai_errlist[ecode];
-}
-
-void
-freeaddrinfo(ai)
-	struct addrinfo *ai;
-{
-	struct addrinfo *next;
-
-	do {
-		next = ai->ai_next;
-		if (ai->ai_canonname)
-			free(ai->ai_canonname);
-		/* no need to free(ai->ai_addr) */
-		free(ai);
-		ai = next;
-	} while (ai);
-}
-
-static int
-str_isnumber(p)
-	const char *p;
-{
-	char *ep;
-
-	if (*p == '\0')
-		return NO;
-	ep = NULL;
-	(void)strtoul(p, &ep, 10);
-	if (ep && *ep == '\0')
-		return YES;
-	else
-		return NO;
-}
-
-int
-getaddrinfo(hostname, servname, hints, res)
-	const char *hostname, *servname;
-	const struct addrinfo *hints;
-	struct addrinfo **res;
-{
-	struct addrinfo sentinel;
-	struct addrinfo *cur;
-	int error = 0;
-	struct addrinfo ai;
-	struct addrinfo ai0;
-	struct addrinfo *pai;
-	const struct explore *ex;
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-	pai = &ai;
-	pai->ai_flags = 0;
-	pai->ai_family = PF_UNSPEC;
-	pai->ai_socktype = ANY;
-	pai->ai_protocol = ANY;
-	pai->ai_addrlen = 0;
-	pai->ai_canonname = NULL;
-	pai->ai_addr = NULL;
-	pai->ai_next = NULL;
-
-	if (hostname == NULL && servname == NULL)
-		return EAI_NONAME;
-	if (hints) {
-		/* error check for hints */
-		if (hints->ai_addrlen || hints->ai_canonname ||
-		    hints->ai_addr || hints->ai_next)
-			ERR(EAI_BADHINTS); /* xxx */
-		if (hints->ai_flags & ~AI_MASK)
-			ERR(EAI_BADFLAGS);
-		switch (hints->ai_family) {
-		case PF_UNSPEC:
-		case PF_INET:
-#ifdef INET6
-		case PF_INET6:
-#endif
-			break;
-		default:
-			ERR(EAI_FAMILY);
-		}
-		memcpy(pai, hints, sizeof(*pai));
-
-		/*
-		 * if both socktype/protocol are specified, check if they
-		 * are meaningful combination.
-		 */
-		if (pai->ai_socktype != ANY && pai->ai_protocol != ANY) {
-			for (ex = explore; ex->e_af >= 0; ex++) {
-				if (pai->ai_family != ex->e_af)
-					continue;
-				if (ex->e_socktype == ANY)
-					continue;
-				if (ex->e_protocol == ANY)
-					continue;
-				if (pai->ai_socktype == ex->e_socktype
-				 && pai->ai_protocol != ex->e_protocol) {
-					ERR(EAI_BADHINTS);
-				}
-			}
-		}
-	}
-
-	/*
-	 * post-2553: AI_ALL and AI_V4MAPPED are effective only against
-	 * AF_INET6 query.  They needs to be ignored if specified in other
-	 * occassions.
-	 */
-	switch (pai->ai_flags & (AI_ALL | AI_V4MAPPED)) {
-	case AI_V4MAPPED:
-	case AI_ALL | AI_V4MAPPED:
-		if (pai->ai_family != AF_INET6)
-			pai->ai_flags &= ~(AI_ALL | AI_V4MAPPED);
-		break;
-	case AI_ALL:
-#if 1
-		/* illegal */
-		ERR(EAI_BADFLAGS);
-#else
-		pai->ai_flags &= ~(AI_ALL | AI_V4MAPPED);
-#endif
-		break;
-	}
-
-	/*
-	 * check for special cases.  (1) numeric servname is disallowed if
-	 * socktype/protocol are left unspecified. (2) servname is disallowed
-	 * for raw and other inet{,6} sockets.
-	 */
-	if (MATCH_FAMILY(pai->ai_family, PF_INET, 1)
-#ifdef PF_INET6
-	    || MATCH_FAMILY(pai->ai_family, PF_INET6, 1)
-#endif
-	    ) {
-		ai0 = *pai;	/* backup *pai */
-
-		if (pai->ai_family == PF_UNSPEC) {
-#ifdef PF_INET6
-			pai->ai_family = PF_INET6;
-#else
-			pai->ai_family = PF_INET;
-#endif
-		}
-		error = get_portmatch(pai, servname);
-		if (error)
-			ERR(error);
-
-		*pai = ai0;
-	}
-
-	ai0 = *pai;
-
-	/* NULL hostname, or numeric hostname */
-	for (ex = explore; ex->e_af >= 0; ex++) {
-		*pai = ai0;
-
-		/* PF_UNSPEC entries are prepared for DNS queries only */
-		if (ex->e_af == PF_UNSPEC)
-			continue;
-
-		if (!MATCH_FAMILY(pai->ai_family, ex->e_af, WILD_AF(ex)))
-			continue;
-		if (!MATCH(pai->ai_socktype, ex->e_socktype, WILD_SOCKTYPE(ex)))
-			continue;
-		if (!MATCH(pai->ai_protocol, ex->e_protocol, WILD_PROTOCOL(ex)))
-			continue;
-
-		if (pai->ai_family == PF_UNSPEC)
-			pai->ai_family = ex->e_af;
-		if (pai->ai_socktype == ANY && ex->e_socktype != ANY)
-			pai->ai_socktype = ex->e_socktype;
-		if (pai->ai_protocol == ANY && ex->e_protocol != ANY)
-			pai->ai_protocol = ex->e_protocol;
-
-		if (hostname == NULL)
-			error = explore_null(pai, servname, &cur->ai_next);
-		else
-			error = explore_numeric_scope(pai, hostname, servname, &cur->ai_next);
-
-		if (error)
-			goto free;
-
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-
-	/*
-	 * XXX
-	 * If numreic representation of AF1 can be interpreted as FQDN
-	 * representation of AF2, we need to think again about the code below.
-	 */
-	if (sentinel.ai_next)
-		goto good;
-
-	if (pai->ai_flags & AI_NUMERICHOST)
-		ERR(EAI_NONAME);
-	if (hostname == NULL)
-		ERR(EAI_NODATA);
-
-	if ((pai->ai_flags & AI_ADDRCONFIG) != 0 && !addrconfig(&ai0))
-		ERR(EAI_FAIL);
-
-	/*
-	 * hostname as alphabetical name.
-	 * we would like to prefer AF_INET6 than AF_INET, so we'll make a
-	 * outer loop by AFs.
-	 */
-	for (ex = explore; ex->e_af >= 0; ex++) {
-		*pai = ai0;
-
-		/* require exact match for family field */
-		if (pai->ai_family != ex->e_af)
-			continue;
-
-		if (!MATCH(pai->ai_socktype, ex->e_socktype,
-				WILD_SOCKTYPE(ex))) {
-			continue;
-		}
-		if (!MATCH(pai->ai_protocol, ex->e_protocol,
-				WILD_PROTOCOL(ex))) {
-			continue;
-		}
-
-		if (pai->ai_socktype == ANY && ex->e_socktype != ANY)
-			pai->ai_socktype = ex->e_socktype;
-		if (pai->ai_protocol == ANY && ex->e_protocol != ANY)
-			pai->ai_protocol = ex->e_protocol;
-
-		error = explore_fqdn(pai, hostname, servname,
-			&cur->ai_next);
-
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-
-	/* XXX */
-	if (sentinel.ai_next)
-		error = 0;
-
-	if (error)
-		goto free;
-	if (error == 0) {
-		if (sentinel.ai_next) {
- good:
-			*res = sentinel.ai_next;
-			return SUCCESS;
-		} else
-			error = EAI_FAIL;
-	}
- free:
- bad:
-	if (sentinel.ai_next)
-		freeaddrinfo(sentinel.ai_next);
-	*res = NULL;
-	return error;
-}
-
-/*
- * FQDN hostname, DNS lookup
- */
-static int
-explore_fqdn(pai, hostname, servname, res)
-	const struct addrinfo *pai;
-	const char *hostname;
-	const char *servname;
-	struct addrinfo **res;
-{
-	struct addrinfo *result;
-	struct addrinfo *cur;
-	int error = 0;
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getaddrinfo, NULL)
-		{ NSSRC_DNS, _dns_getaddrinfo, NULL },	/* force -DHESIOD */
-		NS_NIS_CB(_yp_getaddrinfo, NULL)
-		{ 0 }
-	};
-
-	result = NULL;
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname) != 0)
-		return 0;
-
-	switch (nsdispatch(&result, dtab, NSDB_HOSTS, "getaddrinfo",
-			default_dns_files, hostname, pai)) {
-	case NS_TRYAGAIN:
-		error = EAI_AGAIN;
-		goto free;
-	case NS_UNAVAIL:
-		error = EAI_FAIL;
-		goto free;
-	case NS_NOTFOUND:
-		error = EAI_NODATA;
-		goto free;
-	case NS_SUCCESS:
-		error = 0;
-		for (cur = result; cur; cur = cur->ai_next) {
-			GET_PORT(cur, servname);
-			/* canonname should be filled already */
-		}
-		break;
-	}
-
-	*res = result;
-
-	return 0;
-
-free:
-	if (result)
-		freeaddrinfo(result);
-	return error;
-}
-
-/*
- * hostname == NULL.
- * passive socket -> anyaddr (0.0.0.0 or ::)
- * non-passive socket -> localhost (127.0.0.1 or ::1)
- */
-static int
-explore_null(pai, servname, res)
-	const struct addrinfo *pai;
-	const char *servname;
-	struct addrinfo **res;
-{
-	int s;
-	const struct afd *afd;
-	struct addrinfo *cur;
-	struct addrinfo sentinel;
-	int error;
-
-	*res = NULL;
-	sentinel.ai_next = NULL;
-	cur = &sentinel;
-
-	/*
-	 * filter out AFs that are not supported by the kernel
-	 * XXX errno?
-	 */
-	s = socket(pai->ai_family, SOCK_DGRAM, 0);
-	if (s < 0) {
-		if (errno != EMFILE)
-			return 0;
-	} else
-		close(s);
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname) != 0)
-		return 0;
-
-	afd = find_afd(pai->ai_family);
-	if (afd == NULL)
-		return 0;
-
-	if (pai->ai_flags & AI_PASSIVE) {
-		GET_AI(cur->ai_next, afd, afd->a_addrany);
-		/* xxx meaningless?
-		 * GET_CANONNAME(cur->ai_next, "anyaddr");
-		 */
-		GET_PORT(cur->ai_next, servname);
-	} else {
-		GET_AI(cur->ai_next, afd, afd->a_loopback);
-		/* xxx meaningless?
-		 * GET_CANONNAME(cur->ai_next, "localhost");
-		 */
-		GET_PORT(cur->ai_next, servname);
-	}
-	cur = cur->ai_next;
-
-	*res = sentinel.ai_next;
-	return 0;
-
-free:
-	if (sentinel.ai_next)
-		freeaddrinfo(sentinel.ai_next);
-	return error;
-}
-
-/*
- * numeric hostname
- */
-static int
-explore_numeric(pai, hostname, servname, res)
-	const struct addrinfo *pai;
-	const char *hostname;
-	const char *servname;
-	struct addrinfo **res;
-{
-	const struct afd *afd;
-	struct addrinfo *cur;
-	struct addrinfo sentinel;
-	int error;
-	char pton[PTON_MAX];
-
-	*res = NULL;
-	sentinel.ai_next = NULL;
-	cur = &sentinel;
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname) != 0)
-		return 0;
-
-	afd = find_afd(pai->ai_family);
-	if (afd == NULL)
-		return 0;
-
-	switch (afd->a_af) {
-#if 1 /*X/Open spec*/
-	case AF_INET:
-		if (inet_aton(hostname, (struct in_addr *)pton) == 1) {
-			if (pai->ai_family == afd->a_af ||
-			    pai->ai_family == PF_UNSPEC /*?*/) {
-				GET_AI(cur->ai_next, afd, pton);
-				GET_PORT(cur->ai_next, servname);
-				while (cur && cur->ai_next)
-					cur = cur->ai_next;
-			} else
-				ERR(EAI_FAMILY);	/*xxx*/
-		}
-		break;
-#endif
-	default:
-		if (inet_pton(afd->a_af, hostname, pton) == 1) {
-			if (pai->ai_family == afd->a_af ||
-			    pai->ai_family == PF_UNSPEC /*?*/) {
-				GET_AI(cur->ai_next, afd, pton);
-				GET_PORT(cur->ai_next, servname);
-				while (cur && cur->ai_next)
-					cur = cur->ai_next;
-			} else
-				ERR(EAI_FAMILY);	/*xxx*/
-		}
-		break;
-	}
-
-	*res = sentinel.ai_next;
-	return 0;
-
-free:
-bad:
-	if (sentinel.ai_next)
-		freeaddrinfo(sentinel.ai_next);
-	return error;
-}
-
-/*
- * numeric hostname with scope
- */
-static int
-explore_numeric_scope(pai, hostname, servname, res)
-	const struct addrinfo *pai;
-	const char *hostname;
-	const char *servname;
-	struct addrinfo **res;
-{
-#if !defined(SCOPE_DELIMITER) || !defined(INET6)
-	return explore_numeric(pai, hostname, servname, res);
-#else
-	const struct afd *afd;
-	struct addrinfo *cur;
-	int error;
-	char *cp, *hostname2 = NULL, *scope, *addr;
-	struct sockaddr_in6 *sin6;
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname) != 0)
-		return 0;
-
-	afd = find_afd(pai->ai_family);
-	if (afd == NULL)
-		return 0;
-
-	if (!afd->a_scoped)
-		return explore_numeric(pai, hostname, servname, res);
-
-	cp = strchr(hostname, SCOPE_DELIMITER);
-	if (cp == NULL)
-		return explore_numeric(pai, hostname, servname, res);
-
-	/*
-	 * Handle special case of <scoped_address><delimiter><scope id>
-	 */
-	hostname2 = strdup(hostname);
-	if (hostname2 == NULL)
-		return EAI_MEMORY;
-	/* terminate at the delimiter */
-	hostname2[cp - hostname] = '\0';
-	addr = hostname2;
-	scope = cp + 1;
-
-	error = explore_numeric(pai, addr, servname, res);
-	if (error == 0) {
-		int scopeid;
-
-		for (cur = *res; cur; cur = cur->ai_next) {
-			if (cur->ai_family != AF_INET6)
-				continue;
-			sin6 = (struct sockaddr_in6 *)(void *)cur->ai_addr;
-			if ((scopeid = ip6_str2scopeid(scope, sin6)) == -1) {
-				free(hostname2);
-				return(EAI_NODATA); /* XXX: is return OK? */
-			}
-			sin6->sin6_scope_id = scopeid;
-		}
-	}
-
-	free(hostname2);
-
-	return error;
-#endif
-}
-
-static int
-get_canonname(pai, ai, str)
-	const struct addrinfo *pai;
-	struct addrinfo *ai;
-	const char *str;
-{
-	if ((pai->ai_flags & AI_CANONNAME) != 0) {
-		ai->ai_canonname = (char *)malloc(strlen(str) + 1);
-		if (ai->ai_canonname == NULL)
-			return EAI_MEMORY;
-		strcpy(ai->ai_canonname, str);
-	}
-	return 0;
-}
-
-static struct addrinfo *
-get_ai(pai, afd, addr)
-	const struct addrinfo *pai;
-	const struct afd *afd;
-	const char *addr;
-{
-	char *p;
-	struct addrinfo *ai;
-#ifdef FAITH
-	struct in6_addr faith_prefix;
-	char *fp_str;
-	int translate = 0;
-#endif
-
-#ifdef FAITH
-	/*
-	 * Transfrom an IPv4 addr into a special IPv6 addr format for
-	 * IPv6->IPv4 translation gateway. (only TCP is supported now)
-	 *
-	 * +-----------------------------------+------------+
-	 * | faith prefix part (12 bytes)      | embedded   |
-	 * |                                   | IPv4 addr part (4 bytes)
-	 * +-----------------------------------+------------+
-	 *
-	 * faith prefix part is specified as ascii IPv6 addr format
-	 * in environmental variable GAI.
-	 * For FAITH to work correctly, routing to faith prefix must be
-	 * setup toward a machine where a FAITH daemon operates.
-	 * Also, the machine must enable some mechanizm
-	 * (e.g. faith interface hack) to divert those packet with
-	 * faith prefixed destination addr to user-land FAITH daemon.
-	 */
-	fp_str = getenv("GAI");
-	if (fp_str && inet_pton(AF_INET6, fp_str, &faith_prefix) == 1 &&
-	    afd->a_af == AF_INET && pai->ai_socktype == SOCK_STREAM) {
-		u_int32_t v4a;
-		u_int8_t v4a_top;
-
-		memcpy(&v4a, addr, sizeof v4a);
-		v4a_top = v4a >> IN_CLASSA_NSHIFT;
-		if (!IN_MULTICAST(v4a) && !IN_EXPERIMENTAL(v4a) &&
-		    v4a_top != 0 && v4a != IN_LOOPBACKNET) {
-			afd = &afdl[N_INET6];
-			memcpy(&faith_prefix.s6_addr[12], addr,
-			       sizeof(struct in_addr));
-			translate = 1;
-		}
-	}
-#endif
-
-	ai = (struct addrinfo *)malloc(sizeof(struct addrinfo)
-		+ (afd->a_socklen));
-	if (ai == NULL)
-		return NULL;
-
-	memcpy(ai, pai, sizeof(struct addrinfo));
-	ai->ai_addr = (struct sockaddr *)(void *)(ai + 1);
-	memset(ai->ai_addr, 0, (size_t)afd->a_socklen);
-	ai->ai_addrlen = afd->a_socklen;
-	ai->ai_addr->sa_family = ai->ai_family = afd->a_af;
-	p = (char *)(void *)(ai->ai_addr);
-#ifdef FAITH
-	if (translate == 1)
-		memcpy(p + afd->a_off, &faith_prefix, (size_t)afd->a_addrlen);
-	else
-#endif
-	memcpy(p + afd->a_off, addr, (size_t)afd->a_addrlen);
-	return ai;
-}
-
-static int
-get_portmatch(ai, servname)
-	const struct addrinfo *ai;
-	const char *servname;
-{
-
-	/* get_port does not touch first argument. when matchonly == 1. */
-	/* LINTED const cast */
-	return get_port((struct addrinfo *)ai, servname, 1);
-}
-
-static int
-get_port(ai, servname, matchonly)
-	struct addrinfo *ai;
-	const char *servname;
-	int matchonly;
-{
-	const char *proto;
-	struct servent *sp;
-	int port;
-	int allownumeric;
-
-	if (servname == NULL)
-		return 0;
-	switch (ai->ai_family) {
-	case AF_INET:
-#ifdef AF_INET6
-	case AF_INET6:
-#endif
-		break;
-	default:
-		return 0;
-	}
-
-	switch (ai->ai_socktype) {
-	case SOCK_RAW:
-		return EAI_SERVICE;
-	case SOCK_DGRAM:
-	case SOCK_STREAM:
-		allownumeric = 1;
-		break;
-	case ANY:
-		allownumeric = 0;
-		break;
-	default:
-		return EAI_SOCKTYPE;
-	}
-
-	if (str_isnumber(servname)) {
-		if (!allownumeric)
-			return EAI_SERVICE;
-		port = htons(atoi(servname));
-		if (port < 0 || port > 65535)
-			return EAI_SERVICE;
-	} else {
-		switch (ai->ai_socktype) {
-		case SOCK_DGRAM:
-			proto = "udp";
-			break;
-		case SOCK_STREAM:
-			proto = "tcp";
-			break;
-		default:
-			proto = NULL;
-			break;
-		}
-
-		if ((sp = getservbyname(servname, proto)) == NULL)
-			return EAI_SERVICE;
-		port = sp->s_port;
-	}
-
-	if (!matchonly) {
-		switch (ai->ai_family) {
-		case AF_INET:
-			((struct sockaddr_in *)(void *)
-			    ai->ai_addr)->sin_port = port;
-			break;
-#ifdef INET6
-		case AF_INET6:
-			((struct sockaddr_in6 *)(void *)
-			    ai->ai_addr)->sin6_port = port;
-			break;
-#endif
-		}
-	}
-
-	return 0;
-}
-
-static const struct afd *
-find_afd(af)
-	int af;
-{
-	const struct afd *afd;
-
-	if (af == PF_UNSPEC)
-		return NULL;
-	for (afd = afdl; afd->a_af; afd++) {
-		if (afd->a_af == af)
-			return afd;
-	}
-	return NULL;
-}
-
-/*
- * post-2553: AI_ADDRCONFIG check.  if we use getipnodeby* as backend, backend
- * will take care of it.
- * the semantics of AI_ADDRCONFIG is not defined well.  we are not sure
- * if the code is right or not.
- *
- * XXX PF_UNSPEC -> PF_INET6 + PF_INET mapping needs to be in sync with
- * _dns_getaddrinfo.
- */
-static int
-addrconfig(pai)
-	struct addrinfo *pai;
-{
-	int s, af;
-
-	/*
-	 * TODO:
-	 * Note that implementation dependent test for address
-	 * configuration should be done everytime called
-	 * (or apropriate interval),
-	 * because addresses will be dynamically assigned or deleted.
-	 */
-	af = pai->ai_family;
-	if (af == AF_UNSPEC) {
-		if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
-			af = AF_INET;
-		else {
-			close(s);
-			if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
-				af = AF_INET6;
-			else
-				close(s);
-		}
-	}
-	if (af != AF_UNSPEC) {
-		if ((s = socket(af, SOCK_DGRAM, 0)) < 0)
-			return 0;
-		close(s);
-	}
-	pai->ai_family = af;
-	return 1;
-}
-
-#ifdef INET6
-/* convert a string to a scope identifier. XXX: IPv6 specific */
-static int
-ip6_str2scopeid(scope, sin6)
-	char *scope;
-	struct sockaddr_in6 *sin6;
-{
-	int scopeid;
-	struct in6_addr *a6 = &sin6->sin6_addr;
-	char *ep;
-
-	/* empty scopeid portion is invalid */
-	if (*scope == '\0')
-		return -1;
-
-	if (IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6)) {
-		/*
-		 * We currently assume a one-to-one mapping between links
-		 * and interfaces, so we simply use interface indices for
-		 * like-local scopes.
-		 */
-		scopeid = if_nametoindex(scope);
-		if (scopeid == 0)
-			goto trynumeric;
-		return(scopeid);
-	}
-
-	/* still unclear about literal, allow numeric only - placeholder */
-	if (IN6_IS_ADDR_SITELOCAL(a6) || IN6_IS_ADDR_MC_SITELOCAL(a6))
-		goto trynumeric;
-	if (IN6_IS_ADDR_MC_ORGLOCAL(a6))
-		goto trynumeric;
-	else
-		goto trynumeric;	/* global */
-
-	/* try to convert to a numeric id as a last resort */
-  trynumeric:
-	scopeid = (int)strtoul(scope, &ep, 10);
-	if (*ep == '\0')
-		return scopeid;
-	else
-		return -1;
-}
-#endif
-
-#ifdef DEBUG
-static const char AskedForGot[] =
-	"gethostby*.getanswer: asked for \"%s\", got \"%s\"";
-#endif
-static FILE *hostf = NULL;
-
-static struct addrinfo *
-getanswer(answer, anslen, qname, qtype, pai)
-	const querybuf *answer;
-	int anslen;
-	const char *qname;
-	int qtype;
-	const struct addrinfo *pai;
-{
-	struct addrinfo sentinel, *cur;
-	struct addrinfo ai;
-	const struct afd *afd;
-	char *canonname;
-	const HEADER *hp;
-	const u_char *cp;
-	int n;
-	const u_char *eom;
-	char *bp;
-	int type, class, buflen, ancount, qdcount;
-	int haveanswer, had_error;
-	char tbuf[MAXDNAME];
-	int (*name_ok)(const char *);
-	char hostbuf[8*1024];
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	canonname = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-	case T_ANY:	/*use T_ANY only for T_A/T_AAAA lookup*/
-		name_ok = res_hnok;
-		break;
-	default:
-		return (NULL);	/* XXX should be abort(); */
-	}
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = hostbuf;
-	buflen = sizeof hostbuf;
-	cp = answer->buf + HFIXEDSZ;
-	if (qdcount != 1) {
-		h_errno = NO_RECOVERY;
-		return (NULL);
-	}
-	n = dn_expand(answer->buf, eom, cp, bp, buflen);
-	if ((n < 0) || !(*name_ok)(bp)) {
-		h_errno = NO_RECOVERY;
-		return (NULL);
-	}
-	cp += n + QFIXEDSZ;
-	if (qtype == T_A || qtype == T_AAAA || qtype == T_ANY) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN) {
-			h_errno = NO_RECOVERY;
-			return (NULL);
-		}
-		canonname = bp;
-		bp += n;
-		buflen -= n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = canonname;
-	}
-	haveanswer = 0;
-	had_error = 0;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, buflen);
-		if ((n < 0) || !(*name_ok)(bp)) {
-			had_error++;
-			continue;
-		}
-		cp += n;			/* name */
-		type = _getshort(cp);
- 		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
- 		cp += INT16SZ + INT32SZ;	/* class, TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		if (class != C_IN) {
-			/* XXX - debug? syslog? */
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		if ((qtype == T_A || qtype == T_AAAA || qtype == T_ANY) &&
-		    type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if ((n < 0) || !(*name_ok)(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			canonname = bp;
-			bp += n;
-			buflen -= n;
-			continue;
-		}
-		if (qtype == T_ANY) {
-			if (!(type == T_A || type == T_AAAA)) {
-				cp += n;
-				continue;
-			}
-		} else if (type != qtype) {
-#ifdef DEBUG
-			if (type != T_KEY && type != T_SIG)
-				syslog(LOG_NOTICE|LOG_AUTH,
-	       "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
-				       qname, p_class(C_IN), p_type(qtype),
-				       p_type(type));
-#endif
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		switch (type) {
-		case T_A:
-		case T_AAAA:
-			if (strcasecmp(canonname, bp) != 0) {
-#ifdef DEBUG
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, canonname, bp);
-#endif
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			if (type == T_A && n != INADDRSZ) {
-				cp += n;
-				continue;
-			}
-			if (type == T_AAAA && n != IN6ADDRSZ) {
-				cp += n;
-				continue;
-			}
-#ifdef FILTER_V4MAPPED
-			if (type == T_AAAA) {
-				struct in6_addr in6;
-				memcpy(&in6, cp, sizeof(in6));
-				if (IN6_IS_ADDR_V4MAPPED(&in6)) {
-					cp += n;
-					continue;
-				}
-			}
-#endif
-			if (!haveanswer) {
-				int nn;
-
-				canonname = bp;
-				nn = strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-				buflen -= nn;
-			}
-
-			/* don't overwrite pai */
-			ai = *pai;
-			ai.ai_family = (type == T_A) ? AF_INET : AF_INET6;
-			afd = find_afd(ai.ai_family);
-			if (afd == NULL) {
-				cp += n;
-				continue;
-			}
-			cur->ai_next = get_ai(&ai, afd, (const char *)cp);
-			if (cur->ai_next == NULL)
-				had_error++;
-			while (cur && cur->ai_next)
-				cur = cur->ai_next;
-			cp += n;
-			break;
-		default:
-			abort();
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-	if (haveanswer) {
-		if (!canonname)
-			(void)get_canonname(pai, sentinel.ai_next, qname);
-		else
-			(void)get_canonname(pai, sentinel.ai_next, canonname);
-		h_errno = NETDB_SUCCESS;
-		return sentinel.ai_next;
-	}
-
-	h_errno = NO_RECOVERY;
-	return NULL;
-}
-
-/*ARGSUSED*/
-static int
-_dns_getaddrinfo(rv, cb_data, ap)
-	void	*rv;
-	void	*cb_data;
-	va_list	 ap;
-{
-	struct addrinfo *ai;
-	querybuf buf, buf2;
-	const char *name;
-	const struct addrinfo *pai;
-	struct addrinfo sentinel, *cur;
-	struct res_target q, q2;
-
-	name = va_arg(ap, char *);
-	pai = va_arg(ap, const struct addrinfo *);
-
-	memset(&q, 0, sizeof(q2));
-	memset(&q2, 0, sizeof(q2));
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	switch (pai->ai_family) {
-	case AF_UNSPEC:
-		/* prefer IPv6 */
-		q.qclass = C_IN;
-		q.qtype = T_AAAA;
-		q.answer = buf.buf;
-		q.anslen = sizeof(buf);
-		q.next = &q2;
-		q2.qclass = C_IN;
-		q2.qtype = T_A;
-		q2.answer = buf2.buf;
-		q2.anslen = sizeof(buf2);
-		break;
-	case AF_INET:
-		q.qclass = C_IN;
-		q.qtype = T_A;
-		q.answer = buf.buf;
-		q.anslen = sizeof(buf);
-		break;
-	case AF_INET6:
-		q.qclass = C_IN;
-		q.qtype = T_AAAA;
-		q.answer = buf.buf;
-		q.anslen = sizeof(buf);
-		break;
-	default:
-		return NS_UNAVAIL;
-	}
-	if (res_searchN(name, &q) < 0)
-		return NS_NOTFOUND;
-	ai = getanswer(&buf, q.n, q.name, q.qtype, pai);
-	if (ai) {
-		cur->ai_next = ai;
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-	if (q.next) {
-		ai = getanswer(&buf2, q2.n, q2.name, q2.qtype, pai);
-		if (ai)
-			cur->ai_next = ai;
-	}
-	if (sentinel.ai_next == NULL)
-		switch (h_errno) {
-		case HOST_NOT_FOUND:
-			return NS_NOTFOUND;
-		case TRY_AGAIN:
-			return NS_TRYAGAIN;
-		default:
-			return NS_UNAVAIL;
-		}
-	*((struct addrinfo **)rv) = sentinel.ai_next;
-	return NS_SUCCESS;
-}
-
-static void
-_sethtent()
-{
-	if (!hostf)
-		hostf = fopen(_PATH_HOSTS, "r" );
-	else
-		rewind(hostf);
-}
-
-static void
-_endhtent()
-{
-	if (hostf) {
-		(void) fclose(hostf);
-		hostf = NULL;
-	}
-}
-
-static struct addrinfo *
-_gethtent(name, pai)
-	const char *name;
-	const struct addrinfo *pai;
-{
-	char *p;
-	char *cp, *tname, *cname;
-	struct addrinfo hints, *res0, *res;
-	int error;
-	const char *addr;
-	char hostbuf[8*1024];
-
-	if (!hostf && !(hostf = fopen(_PATH_HOSTS, "r" )))
-		return (NULL);
- again:
-	if (!(p = fgets(hostbuf, sizeof hostbuf, hostf)))
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	if (!(cp = strpbrk(p, "#\n")))
-		goto again;
-	*cp = '\0';
-	if (!(cp = strpbrk(p, " \t")))
-		goto again;
-	*cp++ = '\0';
-	addr = p;
-	cname = NULL;
-	/* if this is not something we're looking for, skip it. */
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		tname = cp;
-		if (cname == NULL)
-			cname = cp;
-		if ((cp = strpbrk(cp, " \t")) != NULL)
-			*cp++ = '\0';
-		if (strcasecmp(name, tname) == 0)
-			goto found;
-	}
-	goto again;
-
-found:
-	hints = *pai;
-	hints.ai_flags = AI_NUMERICHOST;
-	error = getaddrinfo(addr, NULL, &hints, &res0);
-	if (error)
-		goto again;
-#ifdef FILTER_V4MAPPED
-	/* XXX should check all items in the chain */
-	if (res0->ai_family == AF_INET6 &&
-	    IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)res0->ai_addr)->sin6_addr)) {
-		freeaddrinfo(res0);
-		goto again;
-	}
-#endif
-	for (res = res0; res; res = res->ai_next) {
-		/* cover it up */
-		res->ai_flags = pai->ai_flags;
-
-		if (pai->ai_flags & AI_CANONNAME) {
-			if (get_canonname(pai, res, cname) != 0) {
-				freeaddrinfo(res0);
-				goto again;
-			}
-		}
-	}
-	return res0;
-}
-
-/*ARGSUSED*/
-static int
-_files_getaddrinfo(rv, cb_data, ap)
-	void	*rv;
-	void	*cb_data;
-	va_list	 ap;
-{
-	const char *name;
-	const struct addrinfo *pai;
-	struct addrinfo sentinel, *cur;
-	struct addrinfo *p;
-
-	name = va_arg(ap, char *);
-	pai = va_arg(ap, struct addrinfo *);
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	_sethtent();
-	while ((p = _gethtent(name, pai)) != NULL) {
-		cur->ai_next = p;
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-	_endhtent();
-
-	*((struct addrinfo **)rv) = sentinel.ai_next;
-	if (sentinel.ai_next == NULL)
-		return NS_NOTFOUND;
-	return NS_SUCCESS;
-}
-
-#ifdef YP
-static char *__ypdomain;
-
-/*ARGSUSED*/
-static struct addrinfo *
-_yphostent(line, pai)
-	char *line;
-	const struct addrinfo *pai;
-{
-	struct addrinfo sentinel, *cur;
-	struct addrinfo hints, *res, *res0;
-	int error;
-	char *p = line;
-	const char *addr, *canonname;
-	char *nextline;
-	char *cp;
-
-	addr = canonname = NULL;
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-nextline:
-	/* terminate line */
-	cp = strchr(p, '\n');
-	if (cp) {
-		*cp++ = '\0';
-		nextline = cp;
-	} else
-		nextline = NULL;
-
-	cp = strpbrk(p, " \t");
-	if (cp == NULL) {
-		if (canonname == NULL)
-			return (NULL);
-		else
-			goto done;
-	}
-	*cp++ = '\0';
-
-	addr = p;
-
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (!canonname)
-			canonname = cp;
-		if ((cp = strpbrk(cp, " \t")) != NULL)
-			*cp++ = '\0';
-	}
-
-	hints = *pai;
-	hints.ai_flags = AI_NUMERICHOST;
-	error = getaddrinfo(addr, NULL, &hints, &res0);
-	if (error == 0) {
-		for (res = res0; res; res = res->ai_next) {
-			/* cover it up */
-			res->ai_flags = pai->ai_flags;
-
-			if (pai->ai_flags & AI_CANONNAME)
-				(void)get_canonname(pai, res, canonname);
-		}
-	} else
-		res0 = NULL;
-	if (res0) {
-		cur->ai_next = res0;
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-
-	if (nextline) {
-		p = nextline;
-		goto nextline;
-	}
-
-done:
-	return sentinel.ai_next;
-}
-
-/*ARGSUSED*/
-static int
-_yp_getaddrinfo(rv, cb_data, ap)
-	void	*rv;
-	void	*cb_data;
-	va_list	 ap;
-{
-	struct addrinfo sentinel, *cur;
-	struct addrinfo *ai = NULL;
-	static char *__ypcurrent;
-	int __ypcurrentlen, r;
-	const char *name;
-	const struct addrinfo *pai;
-
-	name = va_arg(ap, char *);
-	pai = va_arg(ap, const struct addrinfo *);
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	if (!__ypdomain) {
-		if (_yp_check(&__ypdomain) == 0)
-			return NS_UNAVAIL;
-	}
-	if (__ypcurrent)
-		free(__ypcurrent);
-	__ypcurrent = NULL;
-
-	/* hosts.byname is only for IPv4 (Solaris8) */
-	if (pai->ai_family == PF_UNSPEC || pai->ai_family == PF_INET) {
-		r = yp_match(__ypdomain, "hosts.byname", name,
-			(int)strlen(name), &__ypcurrent, &__ypcurrentlen);
-		if (r == 0) {
-			struct addrinfo ai4;
-
-			ai4 = *pai;
-			ai4.ai_family = AF_INET;
-			ai = _yphostent(__ypcurrent, &ai4);
-			if (ai) {
-				cur->ai_next = ai;
-				while (cur && cur->ai_next)
-					cur = cur->ai_next;
-			}
-		}
-	}
-
-	/* ipnodes.byname can hold both IPv4/v6 */
-	r = yp_match(__ypdomain, "ipnodes.byname", name,
-		(int)strlen(name), &__ypcurrent, &__ypcurrentlen);
-	if (r == 0) {
-		ai = _yphostent(__ypcurrent, pai);
-		if (ai) {
-			cur->ai_next = ai;
-			while (cur && cur->ai_next)
-				cur = cur->ai_next;
-		}
-	}
-
-	if (sentinel.ai_next == NULL) {
-		h_errno = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	}
-	*((struct addrinfo **)rv) = sentinel.ai_next;
-	return NS_SUCCESS;
-}
-#endif
-
-/* resolver logic */
-
-extern const char *__hostalias(const char *);
-extern int h_errno;
-
-/*
- * Formulate a normal query, send, and await answer.
- * Returned answer is placed in supplied buffer "answer".
- * Perform preliminary check of answer, returning success only
- * if no error is indicated and the answer count is nonzero.
- * Return the size of the response on success, -1 on error.
- * Error number is left in h_errno.
- *
- * Caller must parse answer and determine whether it answers the question.
- */
-static int
-res_queryN(name, target)
-	const char *name;	/* domain name */
-	struct res_target *target;
-{
-	u_char buf[MAXPACKET];
-	HEADER *hp;
-	int n;
-	struct res_target *t;
-	int rcode;
-	int ancount;
-
-	rcode = NOERROR;
-	ancount = 0;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-
-	for (t = target; t; t = t->next) {
-		int class, type;
-		u_char *answer;
-		int anslen;
-
-		hp = (HEADER *)(void *)t->answer;
-		hp->rcode = NOERROR;	/* default */
-
-		/* make it easier... */
-		class = t->qclass;
-		type = t->qtype;
-		answer = t->answer;
-		anslen = t->anslen;
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; res_query(%s, %d, %d)\n", name, class, type);
-#endif
-
-		n = res_mkquery(QUERY, name, class, type, NULL, 0, NULL,
-		    buf, sizeof(buf));
-		if (n > 0 && (_res.options & RES_USE_EDNS0) != 0)
-			n = res_opt(n, buf, sizeof(buf), anslen);
-		if (n <= 0) {
-#ifdef DEBUG
-			if (_res.options & RES_DEBUG)
-				printf(";; res_query: mkquery failed\n");
-#endif
-			h_errno = NO_RECOVERY;
-			return (n);
-		}
-		n = res_send(buf, n, answer, anslen);
-#if 0
-		if (n < 0) {
-#ifdef DEBUG
-			if (_res.options & RES_DEBUG)
-				printf(";; res_query: send error\n");
-#endif
-			h_errno = TRY_AGAIN;
-			return (n);
-		}
-#endif
-
-		if (n < 0 || hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
-			rcode = hp->rcode;	/* record most recent error */
-#ifdef DEBUG
-			if (_res.options & RES_DEBUG)
-				printf(";; rcode = %d, ancount=%d\n", hp->rcode,
-				    ntohs(hp->ancount));
-#endif
-			continue;
-		}
-
-		ancount += ntohs(hp->ancount);
-
-		t->n = n;
-	}
-
-	if (ancount == 0) {
-		switch (rcode) {
-		case NXDOMAIN:
-			h_errno = HOST_NOT_FOUND;
-			break;
-		case SERVFAIL:
-			h_errno = TRY_AGAIN;
-			break;
-		case NOERROR:
-			h_errno = NO_DATA;
-			break;
-		case FORMERR:
-		case NOTIMP:
-		case REFUSED:
-		default:
-			h_errno = NO_RECOVERY;
-			break;
-		}
-		return (-1);
-	}
-	return (ancount);
-}
-
-/*
- * Formulate a normal query, send, and retrieve answer in supplied buffer.
- * Return the size of the response on success, -1 on error.
- * If enabled, implement search rules until answer or unrecoverable failure
- * is detected.  Error code, if any, is left in h_errno.
- */
-static int
-res_searchN(name, target)
-	const char *name;	/* domain name */
-	struct res_target *target;
-{
-	const char *cp, * const *domain;
-	HEADER *hp = (HEADER *)(void *)target->answer;	/*XXX*/
-	u_int dots;
-	int trailing_dot, ret, saved_herrno;
-	int got_nodata = 0, got_servfail = 0, tried_as_is = 0;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-
-	errno = 0;
-	h_errno = HOST_NOT_FOUND;	/* default, if we never query */
-	dots = 0;
-	for (cp = name; *cp; cp++)
-		dots += (*cp == '.');
-	trailing_dot = 0;
-	if (cp > name && *--cp == '.')
-		trailing_dot++;
-
-	/*
-	 * if there aren't any dots, it could be a user-level alias
-	 */
-	if (!dots && (cp = __hostalias(name)) != NULL)
-		return (res_queryN(cp, target));
-
-	/*
-	 * If there are dots in the name already, let's just give it a try
-	 * 'as is'.  The threshold can be set with the "ndots" option.
-	 */
-	saved_herrno = -1;
-	if (dots >= _res.ndots) {
-		ret = res_querydomainN(name, NULL, target);
-		if (ret > 0)
-			return (ret);
-		saved_herrno = h_errno;
-		tried_as_is++;
-	}
-
-	/*
-	 * We do at least one level of search if
-	 *	- there is no dot and RES_DEFNAME is set, or
-	 *	- there is at least one dot, there is no trailing dot,
-	 *	  and RES_DNSRCH is set.
-	 */
-	if ((!dots && (_res.options & RES_DEFNAMES)) ||
-	    (dots && !trailing_dot && (_res.options & RES_DNSRCH))) {
-		int done = 0;
-
-		for (domain = (const char * const *)_res.dnsrch;
-		   *domain && !done;
-		   domain++) {
-
-			ret = res_querydomainN(name, *domain, target);
-			if (ret > 0)
-				return (ret);
-
-			/*
-			 * If no server present, give up.
-			 * If name isn't found in this domain,
-			 * keep trying higher domains in the search list
-			 * (if that's enabled).
-			 * On a NO_DATA error, keep trying, otherwise
-			 * a wildcard entry of another type could keep us
-			 * from finding this entry higher in the domain.
-			 * If we get some other error (negative answer or
-			 * server failure), then stop searching up,
-			 * but try the input name below in case it's
-			 * fully-qualified.
-			 */
-			if (errno == ECONNREFUSED) {
-				h_errno = TRY_AGAIN;
-				return (-1);
-			}
-
-			switch (h_errno) {
-			case NO_DATA:
-				got_nodata++;
-				/* FALLTHROUGH */
-			case HOST_NOT_FOUND:
-				/* keep trying */
-				break;
-			case TRY_AGAIN:
-				if (hp->rcode == SERVFAIL) {
-					/* try next search element, if any */
-					got_servfail++;
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				/* anything else implies that we're done */
-				done++;
-			}
-			/*
-			 * if we got here for some reason other than DNSRCH,
-			 * we only wanted one iteration of the loop, so stop.
-			 */
-			if (!(_res.options & RES_DNSRCH))
-			        done++;
-		}
-	}
-
-	/*
-	 * if we have not already tried the name "as is", do that now.
-	 * note that we do this regardless of how many dots were in the
-	 * name or whether it ends with a dot.
-	 */
-	if (!tried_as_is && (dots || !(_res.options & RES_NOTLDQUERY))) {
-		ret = res_querydomainN(name, NULL, target);
-		if (ret > 0)
-			return (ret);
-	}
-
-	/*
-	 * if we got here, we didn't satisfy the search.
-	 * if we did an initial full query, return that query's h_errno
-	 * (note that we wouldn't be here if that query had succeeded).
-	 * else if we ever got a nodata, send that back as the reason.
-	 * else send back meaningless h_errno, that being the one from
-	 * the last DNSRCH we did.
-	 */
-	if (saved_herrno != -1)
-		h_errno = saved_herrno;
-	else if (got_nodata)
-		h_errno = NO_DATA;
-	else if (got_servfail)
-		h_errno = TRY_AGAIN;
-	return (-1);
-}
-
-/*
- * Perform a call on res_query on the concatenation of name and domain,
- * removing a trailing dot from name if domain is NULL.
- */
-static int
-res_querydomainN(name, domain, target)
-	const char *name, *domain;
-	struct res_target *target;
-{
-	char nbuf[MAXDNAME];
-	const char *longname = nbuf;
-	size_t n, d;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_querydomain(%s, %s)\n",
-			name, domain?domain:"<Nil>");
-#endif
-	if (domain == NULL) {
-		/*
-		 * Check for trailing '.';
-		 * copy without '.' if present.
-		 */
-		n = strlen(name);
-		if (n >= MAXDNAME) {
-			h_errno = NO_RECOVERY;
-			return (-1);
-		}
-		if (n > 0 && name[--n] == '.') {
-			strncpy(nbuf, name, n);
-			nbuf[n] = '\0';
-		} else
-			longname = name;
-	} else {
-		n = strlen(name);
-		d = strlen(domain);
-		if (n + d + 1 >= MAXDNAME) {
-			h_errno = NO_RECOVERY;
-			return (-1);
-		}
-		sprintf(nbuf, "%s.%s", name, domain);
-	}
-	return (res_queryN(longname, target));
-}
diff --git a/newlib/libc/sys/linux/net/gethostbydns.c b/newlib/libc/sys/linux/net/gethostbydns.c
deleted file mode 100644
index 9c80539..0000000
--- a/newlib/libc/sys/linux/net/gethostbydns.c
+++ /dev/null
@@ -1,815 +0,0 @@
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <errno.h>
-#include <syslog.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-
-#include "res_config.h"
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-static const char AskedForGot[] =
-		"gethostby*.gethostanswer: asked for \"%s\", got \"%s\"";
-
-#ifdef RESOLVSORT
-static void addrsort(char **, int);
-#endif
-
-u_int32_t _getlong(const u_char *src);
-u_int16_t _getshort(const u_char *src);
-
-#ifdef DEBUG
-static void dbgprintf(char *, int);
-#endif
-
-#if PACKETSZ > 1024
-#define	MAXPACKET	PACKETSZ
-#else
-#define	MAXPACKET	1024
-#endif
-
-typedef union {
-    HEADER hdr;
-    u_char buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-    int32_t al;
-    char ac;
-} align;
-
-extern int h_errno;
-int _dns_ttl_;
-
-#ifdef DEBUG
-static void
-dbgprintf(msg, num)
-	char *msg;
-	int num;
-{
-	if (_res.options & RES_DEBUG) {
-		int save = errno;
-
-		printf(msg, num);
-		errno = save;
-	}
-}
-#else
-# define dbgprintf(msg, num) /*nada*/
-#endif
-
-#define BOUNDED_INCR(x) \
-	do { \
-		cp += x; \
-		if (cp > eom) { \
-			*herr = NO_RECOVERY; \
-			return (NULL); \
-		} \
-	} while (0)
-
-#define BOUNDS_CHECK(ptr, count) \
-	do { \
-		if ((ptr) + (count) > eom) { \
-			*herr = NO_RECOVERY; \
-			return (NULL); \
-		} \
-	} while (0)
-
-static struct hostent *
-gethostanswer(answer, anslen, qname, qtype, host, hostbuf, hostbuflen, herr)
-	const querybuf *answer;
-	int anslen;
-	const char *qname;
-	int qtype;
-        struct hostent *host;
-        char *hostbuf;
-        int hostbuflen;
-        int *herr;
-{
-	const HEADER *hp;
-	const u_char *cp;
-	int n;
-	const u_char *eom, *erdata;
-	char *bp, **ap, **hap;
-	int type, class, buflen, ancount, qdcount;
-	int haveanswer, had_error;
-	int toobig = 0;
-	char tbuf[MAXDNAME];
-	const char *tname;
-	int (*name_ok)(const char *);
-
-	tname = qname;
-	host->h_name = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-		name_ok = res_hnok;
-		break;
-	case T_PTR:
-		name_ok = res_dnok;
-		break;
-	default:
-		*herr = NO_RECOVERY;
-		return (NULL);	/* XXX should be abort(); */
-	}
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = hostbuf;
-	buflen = hostbuflen;
-	cp = answer->buf;
-	BOUNDED_INCR(HFIXEDSZ);
-	if (qdcount != 1) {
-		*herr = NO_RECOVERY;
-		return (NULL);
-	}
-	n = dn_expand(answer->buf, eom, cp, bp, buflen);
-	if ((n < 0) || !(*name_ok)(bp)) {
-		*herr = NO_RECOVERY;
-		return (NULL);
-	}
-	BOUNDED_INCR(n + QFIXEDSZ);
-	if (qtype == T_A || qtype == T_AAAA) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN) {
-			*herr = NO_RECOVERY;
-			return (NULL);
-		}
-		host->h_name = bp;
-		bp += n;
-		buflen -= n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = host->h_name;
-	}
-	ap = host->__host_aliases;
-	*ap = NULL;
-	host->h_aliases = host->__host_aliases;
-	hap = host->__host_addrs;
-	*hap = NULL;
-	host->h_addr_list = host->__host_addrs;
-	haveanswer = 0;
-	had_error = 0;
-	_dns_ttl_ = -1;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, buflen);
-		if ((n < 0) || !(*name_ok)(bp)) {
-			had_error++;
-			continue;
-		}
-		cp += n;			/* name */
-		BOUNDS_CHECK(cp, 3 * INT16SZ + INT32SZ);
-		type = _getshort(cp);
- 		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
- 		cp += INT16SZ;			/* class */
-		if (qtype == T_A  && type == T_A)
-			_dns_ttl_ = _getlong(cp);
-		cp += INT32SZ;			/* TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		BOUNDS_CHECK(cp, n);
-		erdata = cp + n;
-		if (class != C_IN) {
-			/* XXX - debug? syslog? */
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {
-			if (ap >= &host->__host_aliases[MAXALIASES-1])
-				continue;
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if ((n < 0) || !(*name_ok)(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				*herr = NO_RECOVERY;
-				return (NULL);
-			}
-			/* Store alias. */
-			*ap++ = bp;
-			n = strlen(bp) + 1;	/* for the \0 */
-			if (n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			bp += n;
-			buflen -= n;
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			host->h_name = bp;
-			bp += n;
-			buflen -= n;
-			continue;
-		}
-		if (qtype == T_PTR && type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if (n < 0 || !res_dnok(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				*herr = NO_RECOVERY;
-				return (NULL);
-			}
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			tname = bp;
-			bp += n;
-			buflen -= n;
-			continue;
-		}
-		if (type != qtype) {
-			if (type != T_SIG)
-				syslog(LOG_NOTICE|LOG_AUTH,
-	"gethostby*.gethostanswer: asked for \"%s %s %s\", got type \"%s\"",
-				       qname, p_class(C_IN), p_type(qtype),
-				       p_type(type));
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		switch (type) {
-		case T_PTR:
-			if (strcasecmp(tname, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, qname, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			n = dn_expand(answer->buf, eom, cp, bp, buflen);
-			if ((n < 0) || !res_hnok(bp)) {
-				had_error++;
-				break;
-			}
-#if MULTI_PTRS_ARE_ALIASES
-			cp += n;
-			if (cp != erdata) {
-				*herr = NO_RECOVERY;
-				return (NULL);
-			}
-			if (!haveanswer)
-				host->h_name = bp;
-			else if (ap < &host->__host_aliases[MAXALIASES-1])
-				*ap++ = bp;
-			else
-				n = -1;
-			if (n != -1) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				buflen -= n;
-			}
-			break;
-#else
-			host->h_name = bp;
-			if (_res.options & RES_USE_INET6) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				buflen -= n;
-				_map_v4v6_hostent(host, &bp, &buflen);
-			}
-			*herr = NETDB_SUCCESS;
-			return host;
-#endif
-		case T_A:
-		case T_AAAA:
-			if (strcasecmp(host->h_name, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, host->h_name, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			if (n != host->h_length) {
-				cp += n;
-				continue;
-			}
-			if (!haveanswer) {
-				int nn;
-
-				host->h_name = bp;
-				nn = strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-				buflen -= nn;
-			}
-
-			bp += sizeof(align) - ((u_long)bp % sizeof(align));
-
-			if (bp + n >= &hostbuf[hostbuflen]) {
-				dbgprintf("size (%d) too big\n", n);
-				had_error++;
-				continue;
-			}
-			if (hap >= &host->__host_addrs[MAXADDRS-1]) {
-				if (!toobig++)
-					dbgprintf("Too many addresses (%d)\n",
-						MAXADDRS);
-				cp += n;
-				continue;
-			}
-			bcopy(cp, *hap++ = bp, n);
-			bp += n;
-			buflen -= n;
-			cp += n;
-			if (cp != erdata) {
-				*herr = NO_RECOVERY;
-				return (NULL);
-			}
-			break;
-		default:
-			dbgprintf("Impossible condition (type=%d)\n", type);
-			*herr = NO_RECOVERY;
-			return (NULL);
-			/* BIND has abort() here, too risky on bad data */
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		*hap = NULL;
-# if defined(RESOLVSORT)
-		/*
-		 * Note: we sort even if host can take only one address
-		 * in its return structures - should give it the "best"
-		 * address in that case, not some random one
-		 */
-		if (_res.nsort && haveanswer > 1 && qtype == T_A)
-			addrsort(host->__host_addrs, haveanswer);
-# endif /*RESOLVSORT*/
-		if (!host->h_name) {
-			n = strlen(qname) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN)
-				goto no_recovery;
-			strcpy(bp, qname);
-			host->h_name = bp;
-			bp += n;
-			buflen -= n;
-		}
-		if (_res.options & RES_USE_INET6)
-			_map_v4v6_hostent(host, &bp, &buflen);
-		*herr = NETDB_SUCCESS;
-		return host;
-	}
- no_recovery:
-	*herr = NO_RECOVERY;
-	return (NULL);
-}
-
-struct hostent *
-__dns_getanswer(answer, anslen, qname, qtype, host, hostbuf, hostbuflen, herr)
-	const char *answer;
-	int anslen;
-	const char *qname;
-	int qtype;
-        struct hostent *host;
-        char *hostbuf;
-        int hostbuflen;
-        int *herr;
-{
-	switch(qtype) {
-	case T_AAAA:
-		host->h_addrtype = AF_INET6;
-		host->h_length = IN6ADDRSZ;
-		break;
-	case T_A:
-	default:
-		host->h_addrtype = AF_INET;
-		host->h_length = INADDRSZ;
-		break;
-	}
-
-	return(gethostanswer((const querybuf *)answer, anslen, qname, qtype, host, hostbuf, hostbuflen, herr));
-}
-
-int
-_dns_gethostbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	int af;
-	querybuf buf;
-	const char *cp;
-	char *bp;
-	int n, size, type, len;
-        struct hostent *resultbuf;
-        char *hostbuf;
-        int buflen;
-        int *herr;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-        resultbuf = va_arg(ap, struct hostent *);
-        hostbuf = va_arg(ap, char *);
-        buflen = va_arg(ap, int);
-        herr = va_arg(ap, int *);
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		*herr = NETDB_INTERNAL;
-		return NS_UNAVAIL;
-	}
-
-	switch (af) {
-	case AF_INET:
-		size = INADDRSZ;
-		type = T_A;
-		break;
-	case AF_INET6:
-		size = IN6ADDRSZ;
-		type = T_AAAA;
-		break;
-	default:
-		*herr = NETDB_INTERNAL;
-		errno = EAFNOSUPPORT;
-		return NS_UNAVAIL;
-	}
-
-	resultbuf->h_addrtype = af;
-	resultbuf->h_length = size;
-
-	/*
-	 * if there aren't any dots, it could be a user-level alias.
-	 * this is also done in res_query() since we are not the only
-	 * function that looks up host names.
-	 */
-	if (!strchr(name, '.') && (cp = __hostalias(name)))
-		name = cp;
-
-	/*
-	 * disallow names consisting only of digits/dots, unless
-	 * they end in a dot.
-	 */
-	if (isdigit((unsigned char)name[0]))
-		for (cp = name;; ++cp) {
-			if (!*cp) {
-				if (*--cp == '.')
-					break;
-				/*
-				 * All-numeric, no dot at the end.
-				 * Fake up a hostent as if we'd actually
-				 * done a lookup.
-				 */
-				if (inet_pton(af, name, resultbuf->__host_addr) <= 0) {
-					*herr = HOST_NOT_FOUND;
-					return NS_NOTFOUND;
-				}
-				strncpy(hostbuf, name, MAXDNAME);
-				hostbuf[MAXDNAME] = '\0';
-				bp = hostbuf + MAXDNAME;
-				len = buflen - MAXDNAME;
-				resultbuf->h_name = hostbuf;
-				resultbuf->h_aliases = resultbuf->__host_aliases;
-				resultbuf->__host_aliases[0] = NULL;
-				resultbuf->__host_addrs[0] = (char *)resultbuf->__host_addr;
-				resultbuf->__host_addrs[1] = NULL;
-				resultbuf->h_addr_list = resultbuf->__host_addrs;
-				if (_res.options & RES_USE_INET6)
-					_map_v4v6_hostent(resultbuf, &bp, &len);
-				*herr = NETDB_SUCCESS;
-				*(struct hostent **)rval = resultbuf;
-				return NS_SUCCESS;
-			}
-			if (!isdigit((unsigned char)*cp) && *cp != '.')
-				break;
-		}
-	if ((isxdigit((unsigned char)name[0]) && strchr(name, ':') != NULL) ||
-	    name[0] == ':')
-		for (cp = name;; ++cp) {
-			if (!*cp) {
-				if (*--cp == '.')
-					break;
-				/*
-				 * All-IPv6-legal, no dot at the end.
-				 * Fake up a hostent as if we'd actually
-				 * done a lookup.
-				 */
-				if (inet_pton(af, name, resultbuf->__host_addr) <= 0) {
-					*herr = HOST_NOT_FOUND;
-					return NS_NOTFOUND;
-				}
-				strncpy(hostbuf, name, MAXDNAME);
-				hostbuf[MAXDNAME] = '\0';
-				bp = hostbuf + MAXDNAME;
-				len = buflen - MAXDNAME;
-				resultbuf->h_name = hostbuf;
-				resultbuf->h_aliases = resultbuf->__host_aliases;
-				resultbuf->__host_aliases[0] = NULL;
-				resultbuf->__host_addrs[0] = (char *)resultbuf->__host_addr;
-				resultbuf->__host_addrs[1] = NULL;
-				resultbuf->h_addr_list = resultbuf->__host_addrs;
-				*herr = NETDB_SUCCESS;
-				*(struct hostent **)rval = resultbuf;
-				return NS_SUCCESS;
-			}
-			if (!isxdigit((unsigned char)*cp) && *cp != ':' && *cp != '.')
-				break;
-		}
-
-	if ((n = res_search(name, C_IN, type, buf.buf, sizeof(buf))) < 0) {
-		dbgprintf("res_search failed (%d)\n", n);
-		return NS_UNAVAIL;
-	}
-	*(struct hostent **)rval = gethostanswer(&buf, n, name, type, resultbuf, hostbuf, buflen, herr);
-	return (*(struct hostent **)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
-
-int
-_dns_gethostbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const char *addr;	/* XXX should have been def'd as u_char! */
-	int len, af;
-	const u_char *uaddr;
-	static const u_char mapped[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0xff,0xff };
-	static const u_char tunnelled[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0,0 };
-	int n, size;
-	querybuf buf;
-	struct hostent *hp;
-	char qbuf[MAXDNAME+1], *qp;
-#ifdef SUNSECURITY
-	struct hostent *rhp;
-	char **haddr;
-	u_long old_options;
-	char hname2[MAXDNAME+1];
-#endif /*SUNSECURITY*/
-        struct hostent *resultbuf;
-        char *hostbuf;
-        int buflen;
-        int *herr;
-
-	addr = va_arg(ap, const char *);
-	uaddr = (const u_char *)addr;
-	len = va_arg(ap, int);
-	af = va_arg(ap, int);
-        resultbuf = va_arg(ap, struct hostent *);
-        hostbuf = va_arg(ap, char *);
-        buflen = va_arg(ap, int);
-        herr = va_arg(ap, int *);
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		*herr = NETDB_INTERNAL;
-		return NS_UNAVAIL;
-	}
-	if (af == AF_INET6 && len == IN6ADDRSZ &&
-	    (!memcmp(uaddr, mapped, sizeof mapped) ||
-	     !memcmp(uaddr, tunnelled, sizeof tunnelled))) {
-		/* Unmap. */
-		addr += sizeof mapped;
-		uaddr += sizeof mapped;
-		af = AF_INET;
-		len = INADDRSZ;
-	}
-	switch (af) {
-	case AF_INET:
-		size = INADDRSZ;
-		break;
-	case AF_INET6:
-		size = IN6ADDRSZ;
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		*herr = NETDB_INTERNAL;
-		return NS_UNAVAIL;
-	}
-	if (size != len) {
-		errno = EINVAL;
-		*herr = NETDB_INTERNAL;
-		return NS_UNAVAIL;
-	}
-	switch (af) {
-	case AF_INET:
-		(void) sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa",
-			       (uaddr[3] & 0xff),
-			       (uaddr[2] & 0xff),
-			       (uaddr[1] & 0xff),
-			       (uaddr[0] & 0xff));
-		break;
-	case AF_INET6:
-		qp = qbuf;
-		for (n = IN6ADDRSZ - 1; n >= 0; n--) {
-			qp += SPRINTF((qp, "%x.%x.",
-				       uaddr[n] & 0xf,
-				       (uaddr[n] >> 4) & 0xf));
-		}
-		strcpy(qp, "ip6.int");
-		break;
-	default:
-		abort();
-	}
-	n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf.buf, sizeof buf.buf);
-	if (n < 0) {
-		dbgprintf("res_query failed (%d)\n", n);
-		return NS_UNAVAIL;
-	}
-	if (n > sizeof buf.buf) {
-		dbgprintf("static buffer is too small (%d)\n", n);
-		return NS_UNAVAIL;
-	}
-	if (!(hp = gethostanswer(&buf, n, qbuf, T_PTR, resultbuf, hostbuf, buflen, herr)))
-		return NS_NOTFOUND;   /* *herr was set by gethostanswer() */
-#ifdef SUNSECURITY
-	if (af == AF_INET) {
-	    /*
-	     * turn off search as the name should be absolute,
-	     * 'localhost' should be matched by defnames
-	     */
-	    strncpy(hname2, hp->h_name, MAXDNAME);
-	    hname2[MAXDNAME] = '\0';
-	    old_options = _res.options;
-	    _res.options &= ~RES_DNSRCH;
-	    _res.options |= RES_DEFNAMES;
-	    if (!(rhp = gethostbyname(hname2))) {
-		syslog(LOG_NOTICE|LOG_AUTH,
-		       "gethostbyaddr: No A record for %s (verifying [%s])",
-		       hname2, inet_ntoa(*((struct in_addr *)addr)));
-		_res.options = old_options;
-		*herr = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	    }
-	    _res.options = old_options;
-	    for (haddr = rhp->h_addr_list; *haddr; haddr++)
-		if (!memcmp(*haddr, addr, INADDRSZ))
-			break;
-	    if (!*haddr) {
-		syslog(LOG_NOTICE|LOG_AUTH,
-		       "gethostbyaddr: A record of %s != PTR record [%s]",
-		       hname2, inet_ntoa(*((struct in_addr *)addr)));
-		*herr = HOST_NOT_FOUND;
-		return NS_NOTFOUND;
-	    }
-	}
-#endif /*SUNSECURITY*/
-	hp->h_addrtype = af;
-	hp->h_length = len;
-	bcopy(addr, resultbuf->__host_addr, len);
-	resultbuf->__host_addrs[0] = (char *)resultbuf->__host_addr;
-	resultbuf->__host_addrs[1] = NULL;
-	if (af == AF_INET && (_res.options & RES_USE_INET6)) {
-		_map_v4v6_address((char*)resultbuf->__host_addr, (char*)resultbuf->__host_addr);
-		hp->h_addrtype = AF_INET6;
-		hp->h_length = IN6ADDRSZ;
-	}
-	*herr = NETDB_SUCCESS;
-	*(struct hostent **)rval = hp;
-	return (hp != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
-
-#ifdef RESOLVSORT
-static void
-addrsort(ap, num)
-	char **ap;
-	int num;
-{
-	int i, j;
-	char **p;
-	short aval[MAXADDRS];
-	int needsort = 0;
-
-	p = ap;
-	for (i = 0; i < num; i++, p++) {
-	    for (j = 0 ; (unsigned)j < _res.nsort; j++)
-		if (_res.sort_list[j].addr.s_addr == 
-		    (((struct in_addr *)(*p))->s_addr & _res.sort_list[j].mask))
-			break;
-	    aval[i] = j;
-	    if (needsort == 0 && i > 0 && j < aval[i-1])
-		needsort = i;
-	}
-	if (!needsort)
-	    return;
-
-	while (needsort < num) {
-	    for (j = needsort - 1; j >= 0; j--) {
-		if (aval[j] > aval[j+1]) {
-		    char *hp;
-
-		    i = aval[j];
-		    aval[j] = aval[j+1];
-		    aval[j+1] = i;
-
-		    hp = ap[j];
-		    ap[j] = ap[j+1];
-		    ap[j+1] = hp;
-
-		} else
-		    break;
-	    }
-	    needsort++;
-	}
-}
-#endif
-void
-_sethostdnsent(stayopen)
-	int stayopen;
-{
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
-		return;
-	if (stayopen)
-		_res.options |= RES_STAYOPEN | RES_USEVC;
-}
-
-void
-_endhostdnsent()
-{
-	_res.options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_close();
-}
diff --git a/newlib/libc/sys/linux/net/gethostbyht.c b/newlib/libc/sys/linux/net/gethostbyht.c
deleted file mode 100644
index 4a15293..0000000
--- a/newlib/libc/sys/linux/net/gethostbyht.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*-
- * Copyright (c) 1985, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <arpa/nameser.h>	/* XXX */
-#include <resolv.h>		/* XXX */
-#include <dirent.h>
-#include <stdlib.h>
-#include <errno.h>
-
-static FILE *hostf = NULL;
-static int stayopen = 0;
-__LOCK_INIT(static, host_lock);
-
-void
-_sethosthtent_r(int f, FILE **hostfile, int *hstayopen)
-{
-	if (!*hostfile)
-		*hostfile = fopen(_PATH_HOSTS, "r" );
-	else
-		rewind(*hostfile);
-	*hstayopen = f;
-}
-
-void
-_endhosthtent_r(FILE **hostfile, int *hstayopen)
-{
-	if (*hostfile && !*hstayopen) {
-		(void) fclose(*hostfile);
-		*hostfile = NULL;
-	}
-}
-
-void
-_sethosthtent(f)
-	int f;
-{
-  _sethosthtent_r(f, &hostf, &stayopen);
-}
-
-void
-_endhosthtent()
-{
-  _endhosthtent_r(&hostf, &stayopen);
-}
-
-struct hostent *
-gethostent()
-{
-  static struct hostent hp;
-  static char buffer[BUFSIZ+1];
-  static int len = BUFSIZ;
-  static int herr;
-
-#ifdef HAVE_DD_LOCK
-  __lock_acquire(host_lock);
-#endif
-  gethostent_r(&hp, buffer, len, &herr, &hostf);
-#ifdef HAVE_DD_LOCK
-  __lock_release(host_lock);
-#endif
-  return &hp;
-}
-
-int
-gethostent_r(struct hostent *hp, char *buffer, int buflen, int *herr, FILE **hostfile)
-{
-	char *p;
-	char *cp, **q;
-	int af, len;
-
-	if (!*hostfile && !(*hostfile = fopen(_PATH_HOSTS, "r" ))) {
-		*herr = NETDB_INTERNAL;
-		return -1;
-	}
- again:
-	if (!(p = fgets(buffer, buflen, *hostfile))) {
-		*herr = HOST_NOT_FOUND;
-		return -1;
-	}
-	if (*p == '#')
-		goto again;
-	if (!(cp = strpbrk(p, "#\n")))
-		goto again;
-	*cp = '\0';
-	if (!(cp = strpbrk(p, " \t")))
-		goto again;
-	*cp++ = '\0';
-
-        hp->h_addr_list = hp->__host_addrs;
-        hp->__host_addrs[0] = (char *)hp->__host_addr;
-
-	if (inet_pton(AF_INET6, p, hp->h_addr_list[0]) > 0) {
-		af = AF_INET6;
-		len = IN6ADDRSZ;
-	} else if (inet_pton(AF_INET, p, hp->h_addr_list[0]) > 0) {
-		if (_res.options & RES_USE_INET6) {
-			_map_v4v6_address(hp->h_addr_list[0], hp->h_addr_list[0]);
-			af = AF_INET6;
-			len = IN6ADDRSZ;
-		} else {
-			af = AF_INET;
-			len = INADDRSZ;
-		}
-	} else {
-		goto again;
-	}
-
-        
-	hp->h_addr_list[1] = NULL;
-        hp->h_addr = hp->__host_addrs[0];
-	hp->h_length = len;
-	hp->h_addrtype = af;
-
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	hp->h_name = cp;
-	q = hp->h_aliases = hp->__host_aliases;
-        if ((cp = strpbrk(cp, " \t")) != NULL)
-          *cp++ = '\0';
-        while (cp && *cp) {
-          if (*cp == ' ' || *cp == '\t') {
-            cp++;
-            continue;
-          }
-          if (q < &hp->h_aliases[MAXALIASES - 1])
-            *q++ = cp;
-          if ((cp = strpbrk(cp, " \t")) != NULL)
-            *cp++ = '\0';
-        }
-        *q = NULL;
-
-	*herr = NETDB_SUCCESS;
-	return 0;
-}
-
-int
-_ht_gethostbyname(void *rval, void *cb_data, va_list ap) 
-{
-	char **cp;
-	const char *name;
-	int af;
-        struct hostent *resultbuf;
-        char *buf;
-        int buflen;
-        int *herr;
-        FILE *hostfile = NULL;
-        int stayopen;
-        int p;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-        resultbuf = va_arg(ap, struct hostent *);
-        buf = va_arg(ap, char *);
-        buflen = va_arg(ap, int);
-        herr = va_arg(ap, int *);
-
-	sethostent_r(0, &hostfile, &stayopen);
-	while ((p = gethostent_r(resultbuf, buf, buflen, herr, &hostfile)) != -1) {
-		if (resultbuf->h_addrtype != af)
-			continue;
-		if (strcasecmp(resultbuf->h_name, name) == 0)
-			break;
-                for (cp = resultbuf->h_aliases; *cp != 0; cp++)
-                  if (strcasecmp(*cp, name) == 0)
-                    goto found;
-	}
-found:
-	endhostent_r(&hostfile, &stayopen);
-
-        if (p == -1)
-          {
-            *(struct hostent **)rval = NULL;
-            return NS_NOTFOUND;
-            }
-        else
-          {
-            *(struct hostent **)rval = resultbuf;
-            return NS_SUCCESS;
-          }
-}
-
-int 
-_ht_gethostbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const char *addr;
-	int len, af;
-        struct hostent *resultbuf;
-        char *buf;
-        int buflen;
-        int *herr;
-        FILE *hostfile = NULL;
-        int stayopen;
-        int p;
-
-	addr = va_arg(ap, const char *);
-	len = va_arg(ap, int);
-	af = va_arg(ap, int);
-        resultbuf = va_arg(ap, struct hostent *);
-        buf = va_arg(ap, char *);
-        buflen = va_arg(ap, int);
-        herr = va_arg(ap, int *);
-
-	sethostent_r(0, &hostfile, &stayopen);
-	while ((p = gethostent_r(resultbuf, buf, buflen, herr, &hostfile)) != -1)
-		if (resultbuf->h_addrtype == af && !memcmp(resultbuf->h_addr, addr, len))
-			break;
-	endhostent_r(&hostfile, &stayopen);
-
-        if (p == -1)
-          {
-            *(struct hostent **)rval = NULL;
-            return NS_NOTFOUND;
-            }
-        else
-          {
-            *(struct hostent **)rval = resultbuf;
-            return NS_SUCCESS;
-          }
-}
diff --git a/newlib/libc/sys/linux/net/gethostbyname.3 b/newlib/libc/sys/linux/net/gethostbyname.3
deleted file mode 100644
index 51ed2f8..0000000
--- a/newlib/libc/sys/linux/net/gethostbyname.3
+++ /dev/null
@@ -1,380 +0,0 @@
-.\" Copyright (c) 1983, 1987, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\" $FreeBSD: src/lib/libc/net/gethostbyname.3,v 1.26 2002/01/14 16:59:00 ru Exp $
-.\"
-.Dd May 25, 1995
-.Dt GETHOSTBYNAME 3
-.Os
-.Sh NAME
-.Nm gethostbyname ,
-.Nm gethostbyname2 ,
-.Nm gethostbyaddr ,
-.Nm gethostent ,
-.Nm sethostent ,
-.Nm endhostent ,
-.Nm herror ,
-.Nm hstrerror
-.Nd get network host entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Vt extern int h_errno ;
-.Ft struct hostent *
-.Fn gethostbyname "const char *name"
-.Ft struct hostent *
-.Fn gethostbyname2 "const char *name" "int af"
-.Ft struct hostent *
-.Fn gethostbyaddr "const char *addr" "int len" "int type"
-.Ft struct hostent *
-.Fn gethostent void
-.Ft void
-.Fn sethostent "int stayopen"
-.Ft void
-.Fn endhostent void
-.Ft void
-.Fn herror "const char *string"
-.Ft const char *
-.Fn hstrerror "int err"
-.Sh DESCRIPTION
-.Bf -symbolic
-The
-.Xr getaddrinfo 3
-and
-.Xr getnameinfo 3
-functions are preferred over the
-.Fn gethostbyname ,
-.Fn gethostbyname2 ,
-and
-.Fn gethostbyaddr
-functions.
-.Ef
-.Pp
-The
-.Fn gethostbyname ,
-.Fn gethostbyname2
-and
-.Fn gethostbyaddr
-functions
-each return a pointer to an object with the
-following structure describing an internet host
-referenced by name or by address, respectively.
-.Pp
-The
-.Fa name
-parameter passed to
-.Fn gethostbyname
-or
-.Fn gethostbyname2
-should point to a
-.Dv NUL Ns -terminated
-hostname.
-The
-.Fa addr
-parameter passed to
-.Fn gethostbyaddr
-should point to an address which is
-.Fa len
-bytes long,
-in binary form
-(i.e. not an IP address in human readable
-.Tn ASCII
-form).
-The
-.Fa type
-parameter specifies the address family
-(e.g.\&
-.Dv AF_INET , AF_INET6 ,
-etc.) of this address.
-.Pp
-The structure returned contains either the information obtained from the name
-server,
-.Xr named 8 ,
-broken-out fields from a line in
-.Pa /etc/hosts ,
-or database entries supplied by the
-.Xr yp 8
-system.
-The order of the lookups is controlled by the
-.Sq hosts
-entry in
-.Xr nsswitch.conf 5 .
-.Bd -literal
-struct	hostent {
-	char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-};
-#define	h_addr  h_addr_list[0]	/* address, for backward compatibility */
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width h_addr_list
-.It Va h_name
-Official name of the host.
-.It Va h_aliases
-A
-.Dv NULL Ns -terminated
-array of alternate names for the host.
-.It Va h_addrtype
-The type of address being returned; usually
-.Dv AF_INET .
-.It Va h_length
-The length, in bytes, of the address.
-.It Va h_addr_list
-A
-.Dv NULL Ns -terminated
-array of network addresses for the host.
-Host addresses are returned in network byte order.
-.It Va h_addr
-The first address in
-.Va h_addr_list ;
-this is for backward compatibility.
-.El
-.Pp
-When using the nameserver,
-.Fn gethostbyname
-and
-.Fn gethostbyname2
-will search for the named host in the current domain and its parents
-unless the name ends in a dot.
-If the name contains no dot, and if the environment variable
-.Dq Ev HOSTALIASES
-contains the name of an alias file, the alias file will first be searched
-for an alias matching the input name.
-See
-.Xr hostname 7
-for the domain search procedure and the alias file format.
-.Pp
-The
-.Fn gethostbyname2
-function is an evolution of
-.Fn gethostbyname
-which is intended to allow lookups in address families other than
-.Dv AF_INET ,
-for example
-.Dv AF_INET6 .
-.Pp
-The
-.Fn sethostent
-function
-may be used to request the use of a connected
-.Tn TCP
-socket for queries.
-If the
-.Fa stayopen
-flag is non-zero,
-this sets the option to send all queries to the name server using
-.Tn TCP
-and to retain the connection after each call to
-.Fn gethostbyname ,
-.Fn gethostbyname2
-or
-.Fn gethostbyaddr .
-Otherwise, queries are performed using
-.Tn UDP
-datagrams.
-.Pp
-The
-.Fn endhostent
-function
-closes the
-.Tn TCP
-connection.
-.Pp
-The
-.Fn herror
-function writes a message to the diagnostic output consisting of the
-string parameter
-.Fa s ,
-the constant string
-.Qq Li ":\ " ,
-and a message corresponding to the value of
-.Va h_errno .
-.Pp
-The
-.Fn hstrerror
-function returns a string which is the message text corresponding to the
-value of the
-.Fa err
-parameter.
-.Sh FILES
-.Bl -tag -width /etc/nsswitch.conf -compact
-.It Pa /etc/hosts
-.It Pa /etc/nsswitch.conf
-.It Pa /etc/resolv.conf
-.El
-.Sh EXAMPLES
-Print out the hostname associated with a specific IP address:
-.Bd -literal -offset indent
-const char *ipstr = "127.0.0.1";
-struct in_addr ip;
-struct hostent *hp;
-
-if (!inet_aton(ipstr, &ip))
-	errx(1, "can't parse IP address %s", ipstr);
-
-if ((hp = gethostbyaddr((const char *)&ip,
-    sizeof ip, AF_INET)) == NULL)
-	errx(1, "no name associated with %s", ipstr);
-
-printf("name associated with %s is %s\en", ipstr, hp->h_name);
-.Ed
-.Sh DIAGNOSTICS
-Error return status from
-.Fn gethostbyname ,
-.Fn gethostbyname2
-and
-.Fn gethostbyaddr
-is indicated by return of a
-.Dv NULL
-pointer.
-The external integer
-.Va h_errno
-may then be checked to see whether this is a temporary failure
-or an invalid or unknown host.
-The routine
-.Fn herror
-can be used to print an error message describing the failure.
-If its argument
-.Fa string
-is
-.Pf non- Dv NULL ,
-it is printed, followed by a colon and a space.
-The error message is printed with a trailing newline.
-.Pp
-The variable
-.Va h_errno
-can have the following values:
-.Bl -tag -width HOST_NOT_FOUND
-.It Dv HOST_NOT_FOUND
-No such host is known.
-.It Dv TRY_AGAIN
-This is usually a temporary error
-and means that the local server did not receive
-a response from an authoritative server.
-A retry at some later time may succeed.
-.It Dv NO_RECOVERY
-Some unexpected server failure was encountered.
-This is a non-recoverable error.
-.It Dv NO_DATA
-The requested name is valid but does not have an IP address;
-this is not a temporary error.
-This means that the name is known to the name server but there is no address
-associated with this name.
-Another type of request to the name server using this domain name
-will result in an answer;
-for example, a mail-forwarder may be registered for this domain.
-.El
-.Sh SEE ALSO
-.Xr getaddrinfo 3 ,
-.Xr getnameinfo 3 ,
-.Xr inet_aton 3 ,
-.Xr resolver 3 ,
-.Xr hosts 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Sh CAVEAT
-The
-.Fn gethostent
-function
-is defined, and
-.Fn sethostent
-and
-.Fn endhostent
-are redefined,
-when
-.Xr libc 3
-is built to use only the routines to lookup in
-.Pa /etc/hosts
-and not the name server.
-.Pp
-The
-.Fn gethostent
-function
-reads the next line of
-.Pa /etc/hosts ,
-opening the file if necessary.
-.Pp
-The
-.Fn sethostent
-function
-opens and/or rewinds the file
-.Pa /etc/hosts .
-If the
-.Fa stayopen
-argument is non-zero,
-the file will not be closed after each call to
-.Fn gethostbyname ,
-.Fn gethostbyname2
-or
-.Fn gethostbyaddr .
-.Pp
-The
-.Fn endhostent
-function
-closes the file.
-.Sh HISTORY
-The
-.Fn herror
-function appeared in
-.Bx 4.3 .
-The
-.Fn endhostent ,
-.Fn gethostbyaddr ,
-.Fn gethostbyname ,
-.Fn gethostent ,
-and
-.Fn sethostent
-functions appeared in
-.Bx 4.2 .
-The
-.Fn gethostbyname2
-function first appeared in
-.Tn BIND
-version 4.9.4.
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Only the Internet
-address format is currently understood.
-.Pp
-.Fn gethostbyname2
-cannot perform
-.Dv AF_INET6
-lookups over NIS.
-.Xr getaddrinfo 3
-must be used instead.
diff --git a/newlib/libc/sys/linux/net/gethostbynis.c b/newlib/libc/sys/linux/net/gethostbynis.c
deleted file mode 100644
index 917e940..0000000
--- a/newlib/libc/sys/linux/net/gethostbynis.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/types.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#ifdef YP
-static char *host_aliases[MAXALIASES];
-static char hostaddr[MAXADDRS];
-static char *host_addrs[2];
-
-static struct hostent *
-_gethostbynis(name, map, af)
-	const char *name;
-	char *map;
-	int af;
-{
-	char *cp, **q;
-	char *result;
-	int resultlen,size;
-	static struct hostent h;
-	static char *domain = (char *)NULL;
-	static char ypbuf[YPMAXRECORD + 2];
-
-	switch(af) {
-	case AF_INET:
-		size = NS_INADDRSZ;
-		break;
-	default:
-	case AF_INET6:
-		size = NS_IN6ADDRSZ;
-		errno = EAFNOSUPPORT;
-		h_errno = NETDB_INTERNAL;
-		return NULL;
-	}
-
-	if (domain == (char *)NULL)
-		if (yp_get_default_domain (&domain)) {
-			h_errno = NETDB_INTERNAL;
-			return ((struct hostent *)NULL);
-		}
-
-	if (yp_match(domain, map, name, strlen(name), &result, &resultlen)) {
-		h_errno = HOST_NOT_FOUND;
-		return ((struct hostent *)NULL);
-	}
-
-	/* avoid potential memory leak */
-	bcopy((char *)result, (char *)&ypbuf, resultlen);
-	ypbuf[resultlen] = '\0';
-	free(result);
-	result = (char *)&ypbuf;
-
-	if ((cp = index(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	h.h_addr_list = host_addrs;
-	h.h_addr = hostaddr;
-	*((u_long *)h.h_addr) = inet_addr(result);
-	h.h_length = size;
-	h.h_addrtype = AF_INET;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	h.h_name = cp;
-	q = h.h_aliases = host_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &host_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&h);
-}
-
-static struct hostent *
-_gethostbynis_r(name, map, af, hp, buffer, buflen, herr)
-	const char *name;
-	char *map;
-	int af;
-        struct hostent *hp;
-        char *buffer;
-        int buflen;
-        int *herr;
-{
-	char *cp, **q;
-	char *result;
-	int resultlen,size;
-	char *domain = (char *)NULL;
-
-	switch(af) {
-	case AF_INET:
-		size = NS_INADDRSZ;
-		break;
-	default:
-	case AF_INET6:
-		size = NS_IN6ADDRSZ;
-		errno = EAFNOSUPPORT;
-		*herr = NETDB_INTERNAL;
-		return NULL;
-	}
-
-	if (domain == (char *)NULL)
-		if (yp_get_default_domain (&domain)) {
-			*herr = NETDB_INTERNAL;
-			return ((struct hostent *)NULL);
-		}
-
-	if (yp_match(domain, map, name, strlen(name), &result, &resultlen)) {
-		*herr = HOST_NOT_FOUND;
-		return ((struct hostent *)NULL);
-	}
-
-	/* avoid potential memory leak */
-	bcopy((char *)result, buffer, resultlen);
-	buffer[resultlen] = '\0';
-	free(result);
-	result = buffer;
-
-	if ((cp = index(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	*((u_long *)hp->__host_addrs[0]) = inet_addr(result);
-        hp->__host_addrs[1] = NULL;
-	hp->h_addr_list = hp->__host_addrs;
-	hp->h_addr = hp->__host_addrs[0];
-	hp->h_length = size;
-	hp->h_addrtype = AF_INET;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	hp->h_name = cp;
-	q = hp->__host_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &hp->__host_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-        hp->h_aliases = hp->__host_aliases;
-	*q = NULL;
-	return (&hp);
-}
-#endif /* YP */
-
-/* XXX _gethostbynisname/_gethostbynisaddr only used by getaddrinfo */
-struct hostent *
-_gethostbynisname(const char *name, int af)
-{
-#ifdef YP
-	return _gethostbynis(name, "hosts.byname", af);
-#else
-	return NULL;
-#endif
-}
-
-struct hostent *
-_gethostbynisaddr(const char *addr, int len, int af)
-{
-#ifdef YP
-	return _gethostbynis(inet_ntoa(*(struct in_addr *)addr), 
-			     "hosts.byaddr", af);
-#else
-	return NULL;
-#endif
-}
-
-
-int
-_nis_gethostbyname(void *rval, void *cb_data, va_list ap)
-{
-#ifdef YP
-	const char *name;
-	int af;
-        struct hostent *resultbuf;
-        char *buf;
-        int buflen;
-        int *herr;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-        resultbuf = va_arg(ap, struct hostent *);
-        buf = va_arg(ap, char *);
-        buflen = va_arg(ap, int);
-        herr = va_arg(ap, int *);
-
-        *(struct hostent **)rval = _gethostbynis_r(name, "hosts.byname", af, resultbuf, buf, buflen, herr);
-
-        return (*(struct hostent **)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-#else
-	return NS_UNAVAIL;
-#endif
-}
-
-int
-_nis_gethostbyaddr(void *rval, void *cb_data, va_list ap)
-{
-#ifdef YP
-	const char *addr;
-	int len;
-	int af;
-        struct hostent *resultbuf;
-        char *buf;
-        int buflen;
-        int *herr;
-
-	addr = va_arg(ap, const char *);
-	len = va_arg(ap, int);
-	af = va_arg(ap, int);
-        resultbuf = va_arg(ap, struct hostent *);
-        buf = va_arg(ap, char *);
-        buflen = va_arg(ap, int);
-        herr = va_arg(ap, int *);
-
-	*(struct hostent **)rval = _gethostbynis_r(inet_ntoa(*(struct in_addr *)addr),"hosts.byaddr", af);
-        return (*(struct hostent **)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-#else
-	return NS_UNAVAIL;
-#endif
-}
diff --git a/newlib/libc/sys/linux/net/gethostnamadr.c b/newlib/libc/sys/linux/net/gethostnamadr.c
deleted file mode 100644
index de1efd8..0000000
--- a/newlib/libc/sys/linux/net/gethostnamadr.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/types.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <arpa/nameser.h>		/* XXX hack for _res */
-#include <resolv.h>			/* XXX hack for _res */
-#include <dirent.h>
-
-extern int _ht_gethostbyname(void *, void *, va_list);
-extern int _dns_gethostbyname(void *, void *, va_list);
-extern int _nis_gethostbyname(void *, void *, va_list);
-extern int _ht_gethostbyaddr(void *, void *, va_list);
-extern int _dns_gethostbyaddr(void *, void *, va_list);
-extern int _nis_gethostbyaddr(void *, void *, va_list);
-
-/* Host lookup order if nsswitch.conf is broken or nonexistant */
-static const ns_src default_src[] = { 
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ NSSRC_DNS, NS_SUCCESS },
-	{ 0 }
-};
-
-__LOCK_INIT(static, name_lock);
-__LOCK_INIT(static, addr_lock);
-
-struct hostent *
-gethostbyname(const char *name)
-{
-  struct hostent *hp = NULL;
-
-  if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-    h_errno = NETDB_INTERNAL;
-    return (NULL);
-  }
-  if (_res.options & RES_USE_INET6) {		/* XXX */
-    hp = gethostbyname2(name, AF_INET6);	/* XXX */
-    if (hp)					/* XXX */
-      return (hp);			        /* XXX */
-  }						/* XXX */
-  return (gethostbyname2(name, AF_INET));
-}
-
-struct hostent *
-gethostbyname2(const char *name, int type)
-{
-  static struct hostent host, *hp;
-  static char hostbuf[BUFSIZ];
-  static int herr;
-  int rval;
-
-  static const ns_dtab dtab[] = {
-    NS_FILES_CB(_ht_gethostbyname, NULL)
-    { NSSRC_DNS, _dns_gethostbyname, NULL },
-    NS_NIS_CB(_nis_gethostbyname, NULL) /* force -DHESIOD */
-    { 0 }
-  };
-
-#ifdef HAVE_DD_LOCK
-  __lock_acquire(name_lock);
-#endif
-  rval = nsdispatch((void *)&hp, dtab, NSDB_HOSTS, "gethostbyname",
-                    default_src, name, type, &host, hostbuf, BUFSIZ, &herr);
-
-#ifdef HAVE_DD_LOCK
-  __lock_release(name_lock);
-#endif
-  if (rval != NS_SUCCESS)
-    return NULL;
-  else
-    return hp;
-}
-
-int
-__gethostbyname_r(const char *name, struct hostent *result,
-	void *buffer, int buflen, struct hostent **hp, int *herr)
-{
-  int rval;
-  int type;
-
-  static const ns_dtab dtab[] = {
-    NS_FILES_CB(_ht_gethostbyname, NULL)
-    { NSSRC_DNS, _dns_gethostbyname, NULL },
-    NS_NIS_CB(_nis_gethostbyname, NULL) /* force -DHESIOD */
-    { 0 }
-  };
-
-  if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-    h_errno = NETDB_INTERNAL;
-    return HOST_NOT_FOUND;
-  }
-
-  if (_res.options & RES_USE_INET6)
-    type = AF_INET6;
-  else
-    type = AF_INET;
-
-  rval = nsdispatch((void *)hp, dtab, NSDB_HOSTS, "gethostbyname",
-                    default_src, name, type, result, buffer, buflen, herr);
-
-  if (rval != NS_SUCCESS)
-    return rval;
-  else
-    return 0;
-}
-
-struct hostent *
-gethostbyaddr(const char *addr, int len, int type)
-{
-  static struct hostent host, *hp;
-  static char hostbuf[BUFSIZ];
-  static int herr;
-  int rval;
-
-  static const ns_dtab dtab[] = {
-    NS_FILES_CB(_ht_gethostbyaddr, NULL)
-    { NSSRC_DNS, _dns_gethostbyaddr, NULL },
-    NS_NIS_CB(_nis_gethostbyaddr, NULL) /* force -DHESIOD */
-    { 0 }
-  };       
-
-#ifdef HAVE_DD_LOCK
-  __lock_acquire(addr_lock);
-#endif
-  rval = nsdispatch((void *)&hp, dtab, NSDB_HOSTS, "gethostbyaddr",
-			  default_src, addr, len, type, &host, hostbuf, BUFSIZ, &herr);
-
-#ifdef HAVE_DD_LOCK
-  __lock_release(addr_lock);
-#endif
-  if (rval != NS_SUCCESS)
-    return NULL;
-  else
-    return hp;
-}
-
-int
-__gethostbyaddr_r (const char *addr, int len, int type,
-                     struct hostent *result, void *buffer, int buflen,
-                     struct hostent **hp, int *herr)
-{
-  int rval;
-
-  static const ns_dtab dtab[] = {
-    NS_FILES_CB(_ht_gethostbyaddr, NULL)
-    { NSSRC_DNS, _dns_gethostbyaddr, NULL },
-    NS_NIS_CB(_nis_gethostbyaddr, NULL) /* force -DHESIOD */
-    { 0 }
-  };       
-
-  rval = nsdispatch((void *)hp, dtab, NSDB_HOSTS, "gethostbyaddr",
-                    default_src, addr, len, type, result, buffer, buflen, herr);
-
-  if(rval != NS_SUCCESS)
-    return rval;
-  else
-    return 0;
-}
-
-void
-sethostent(stayopen)
-	int stayopen;
-{
-	_sethosthtent(stayopen);
-	_sethostdnsent(stayopen);
-}
-
-void
-endhostent()
-{
-	_endhosthtent();
-	_endhostdnsent();
-}
-
-void
-sethostent_r(int f, FILE **hostfile, int *stayopen)
-{
-  _sethosthtent_r(f, hostfile, stayopen);
-  _sethostdnsent(f);
-}
-
-void
-endhostent_r(FILE **hostfile, int *stayopen)
-{
-  _endhosthtent_r(hostfile, stayopen);
-  _endhostdnsent();
-}
diff --git a/newlib/libc/sys/linux/net/getifaddrs.3 b/newlib/libc/sys/linux/net/getifaddrs.3
deleted file mode 100644
index 47e5004..0000000
--- a/newlib/libc/sys/linux/net/getifaddrs.3
+++ /dev/null
@@ -1,164 +0,0 @@
-.\"	$FreeBSD: src/lib/libc/net/getifaddrs.3,v 1.6 2001/10/01 16:08:55 ru Exp $
-.\"	$KAME: getifaddrs.3,v 1.4 2000/05/17 14:13:14 itojun Exp $
-.\"	BSDI	getifaddrs.3,v 2.5 2000/02/23 14:51:59 dab Exp
-.\"
-.\" Copyright (c) 1995, 1999
-.\"	Berkeley Software Design, Inc.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.Dd October 12, 1995
-.Dt GETIFADDRS 3
-.Os
-.Sh NAME
-.Nm getifaddrs
-.Nd get interface addresses
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In ifaddrs.h
-.Ft int
-.Fn getifaddrs "struct ifaddrs **ifap"
-.Ft void
-.Fn freeifaddrs "struct ifaddrs *ifp"
-.Sh DESCRIPTION
-The
-.Fn getifaddrs
-function stores a reference to a linked list of the network interfaces
-on the local machine in the memory referenced by
-.Fa ifap .
-The list consists of
-.Nm ifaddrs
-structures, as defined in the include file
-.Aq Pa ifaddrs.h .
-The
-.Nm ifaddrs
-structure contains at least the following entries:
-.Bd -literal
-    struct ifaddrs   *ifa_next;         /* Pointer to next struct */
-    char             *ifa_name;         /* Interface name */
-    u_int             ifa_flags;        /* Interface flags */
-    struct sockaddr  *ifa_addr;         /* Interface address */
-    struct sockaddr  *ifa_netmask;      /* Interface netmask */
-    struct sockaddr  *ifa_broadaddr;    /* Interface broadcast address */
-    struct sockaddr  *ifa_dstaddr;      /* P2P interface destination */
-    void             *ifa_data;		/* Address specific data */
-.Ed
-.Pp
-The
-.Li ifa_next
-field contains a pointer to the next structure on the list.
-This field is
-.Dv NULL
-in last structure on the list.
-.Pp
-The
-.Li ifa_name
-field contains the interface name.
-.Pp
-The
-.Li ifa_flags
-field contains the interface flags, as set by
-.Xr ifconfig 8
-utility.
-.Pp
-The
-.Li ifa_addr
-field references either the address of the interface or the link level
-address of the interface, if one exists, otherwise it is NULL.
-(The
-.Li sa_family
-field of the
-.Li ifa_addr
-field should be consulted to determine the format of the
-.Li ifa_addr
-address.)
-.Pp
-The
-.Li ifa_netmask
-field references the netmask associated with
-.Li ifa_addr ,
-if one is set, otherwise it is NULL.
-.Pp
-The
-.Li ifa_broadaddr
-field,
-which should only be referenced for non-P2P interfaces,
-references the broadcast address associated with
-.Li ifa_addr ,
-if one exists, otherwise it is NULL.
-.Pp
-The
-.Li ifa_dstaddr
-field references the destination address on a P2P interface,
-if one exists, otherwise it is NULL.
-.Pp
-The
-.Li ifa_data
-field references address family specific data.  For
-.Dv AF_LINK
-addresses it contains a pointer to the
-.Fa struct if_data
-(as defined in include file
-.Aq Pa net/if.h )
-which contains various interface attributes and statistics.
-For all other address families, it contains a pointer to the
-.Fa struct ifa_data
-(as defined in include file
-.Aq Pa net/if.h )
-which contains per-address interface statistics.
-.Pp
-The data returned by
-.Fn getifaddrs
-is dynamically allocated and should be freed using
-.Fn freeifaddrs
-when no longer needed.
-.Sh RETURN VALUES
-.Rv -std getifaddrs
-.Sh ERRORS
-The
-.Fn getifaddrs
-may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr ioctl 2 ,
-.Xr socket 2 ,
-.Xr malloc 3
-or
-.Xr sysctl 3 .
-.Sh BUGS
-If both
-.Aq Pa net/if.h
-and
-.Aq Pa ifaddrs.h
-are being included,
-.Aq Pa net/if.h
-.Em must
-be included before
-.Aq Pa ifaddrs.h .
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr socket 2 ,
-.Xr sysctl 3 ,
-.Xr networking 4 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Nm
-implementation first appeared in BSDi
-.Bsx .
diff --git a/newlib/libc/sys/linux/net/getifaddrs.c b/newlib/libc/sys/linux/net/getifaddrs.c
deleted file mode 100644
index fdb8c9b..0000000
--- a/newlib/libc/sys/linux/net/getifaddrs.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/*	$KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $	*/
-
-/*
- * Copyright (c) 1995, 1999
- *	Berkeley Software Design, Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	BSDI getifaddrs.c,v 2.12 2000/02/23 14:51:59 dab Exp
- */
-/*
- * NOTE: SIOCGIFCONF case is not LP64 friendly.  it also does not perform
- * try-and-error for region size.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/types.h>
-#include <sys/sockio.h>
-#include <unistd.h>
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#ifdef	NET_RT_IFLIST
-#include <sys/param.h>
-#include <net/route.h>
-#include <sys/sysctl.h>
-#include <net/if_dl.h>
-#endif
-
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-
-#if !defined(AF_LINK)
-#define	SA_LEN(sa)	sizeof(struct sockaddr)
-#endif
-
-#if !defined(SA_LEN)
-#define	SA_LEN(sa)	sizeof(struct sockaddr)
-#endif
-
-#define	SALIGN	(sizeof(long) - 1)
-#define	SA_RLEN(sa)	(sizeof(struct sockaddr) ? ((sizeof(struct sockaddr) + SALIGN) & ~SALIGN) : (SALIGN + 1))
-
-#ifndef	ALIGNBYTES
-/*
- * On systems with a routing socket, ALIGNBYTES should match the value
- * that the kernel uses when building the messages.
- */
-#define	ALIGNBYTES	XXX
-#endif
-#ifndef	ALIGN
-#define	ALIGN(p)	(((u_long)(p) + ALIGNBYTES) &~ ALIGNBYTES)
-#endif
-
-#if	_BSDI_VERSION >= 199701
-#define	HAVE_IFM_DATA
-#endif
-
-#if	_BSDI_VERSION >= 199802
-/* ifam_data is very specific to recent versions of bsdi */
-#define	HAVE_IFAM_DATA
-#endif
-
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-#define	HAVE_IFM_DATA
-#endif
-
-int
-getifaddrs(struct ifaddrs **pif)
-{
-	int icnt = 1;
-	int dcnt = 0;
-	int ncnt = 0;
-#ifdef	NET_RT_IFLIST
-	int mib[6];
-	size_t needed;
-	char *buf;
-	char *next;
-	struct ifaddrs *cif = 0;
-	char *p, *p0;
-	struct rt_msghdr *rtm;
-	struct if_msghdr *ifm;
-	struct ifa_msghdr *ifam;
-	struct sockaddr_dl *dl;
-	struct sockaddr *sa;
-	struct ifaddrs *ifa, *ift;
-	u_short idx = 0;
-#else	/* NET_RT_IFLIST */
-	struct ifaddrs *ifa, *ift;
-	char buf[1024];
-	int m, sock;
-	struct ifconf ifc;
-	struct ifreq *ifr;
-	struct ifreq *lifr;
-#endif	/* NET_RT_IFLIST */
-	int i;
-	size_t len, alen;
-	char *data;
-	char *names;
-
-#ifdef	NET_RT_IFLIST
-	mib[0] = CTL_NET;
-	mib[1] = PF_ROUTE;
-	mib[2] = 0;             /* protocol */
-	mib[3] = 0;             /* wildcard address family */
-	mib[4] = NET_RT_IFLIST;
-	mib[5] = 0;             /* no flags */
-	if (__sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-		return (-1);
-	if ((buf = malloc(needed)) == NULL)
-		return (-1);
-	if (__sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
-		free(buf);
-		return (-1);
-	}
-
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-		switch (rtm->rtm_type) {
-		case RTM_IFINFO:
-			ifm = (struct if_msghdr *)(void *)rtm;
-			if (ifm->ifm_addrs & RTA_IFP) {
-				idx = ifm->ifm_index;
-				++icnt;
-				dl = (struct sockaddr_dl *)(void *)(ifm + 1);
-				dcnt += SA_RLEN((struct sockaddr *)(void*)dl) +
-				    ALIGNBYTES;
-#ifdef	HAVE_IFM_DATA
-				dcnt += sizeof(ifm->ifm_data);
-#endif	/* HAVE_IFM_DATA */
-				ncnt += dl->sdl_nlen + 1;
-			} else
-				idx = 0;
-			break;
-
-		case RTM_NEWADDR:
-			ifam = (struct ifa_msghdr *)(void *)rtm;
-			if (idx && ifam->ifam_index != idx)
-				abort();	/* this cannot happen */
-
-#define	RTA_MASKS	(RTA_NETMASK | RTA_IFA | RTA_BRD)
-			if (idx == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
-				break;
-			p = (char *)(void *)(ifam + 1);
-			++icnt;
-#ifdef	HAVE_IFAM_DATA
-			dcnt += sizeof(ifam->ifam_data) + ALIGNBYTES;
-#endif	/* HAVE_IFAM_DATA */
-			/* Scan to look for length of address */
-			alen = 0;
-			for (p0 = p, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				if (i == RTAX_IFA) {
-					alen = len;
-					break;
-				}
-				p += len;
-			}
-			for (p = p0, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				if (i == RTAX_NETMASK && SA_LEN(sa) == 0)
-					dcnt += alen;
-				else
-					dcnt += len;
-				p += len;
-			}
-			break;
-		}
-	}
-#else	/* NET_RT_IFLIST */
-	ifc.ifc_buf = buf;
-	ifc.ifc_len = sizeof(buf);
-
-	if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-		return (-1);
-	i =  ioctl(sock, SIOCGIFCONF, (char *)&ifc);
-	close(sock);
-	if (i < 0)
-		return (-1);
-
-	ifr = ifc.ifc_req;
-	lifr = (struct ifreq *)&ifc.ifc_buf[ifc.ifc_len];
-
-	while (ifr < lifr) {
-		struct sockaddr *sa;
-
-		sa = &ifr->ifr_addr;
-		++icnt;
-		dcnt += SA_RLEN(sa);
-		ncnt += sizeof(ifr->ifr_name) + 1;
-		
-		if (SA_LEN(sa) < sizeof(*sa))
-			ifr = (struct ifreq *)(((char *)sa) + sizeof(*sa));
-		else
-			ifr = (struct ifreq *)(((char *)sa) + SA_LEN(sa));
-	}
-#endif	/* NET_RT_IFLIST */
-
-	if (icnt + dcnt + ncnt == 1) {
-		*pif = NULL;
-		free(buf);
-		return (0);
-	}
-	data = malloc(sizeof(struct ifaddrs) * icnt + dcnt + ncnt);
-	if (data == NULL) {
-		free(buf);
-		return(-1);
-	}
-
-	ifa = (struct ifaddrs *)(void *)data;
-	data += sizeof(struct ifaddrs) * icnt;
-	names = data + dcnt;
-
-	memset(ifa, 0, sizeof(struct ifaddrs) * icnt);
-	ift = ifa;
-
-#ifdef	NET_RT_IFLIST
-	idx = 0;
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-		switch (rtm->rtm_type) {
-		case RTM_IFINFO:
-			ifm = (struct if_msghdr *)(void *)rtm;
-			if (ifm->ifm_addrs & RTA_IFP) {
-				idx = ifm->ifm_index;
-				dl = (struct sockaddr_dl *)(void *)(ifm + 1);
-
-				cif = ift;
-				ift->ifa_name = names;
-				ift->ifa_flags = (int)ifm->ifm_flags;
-				memcpy(names, dl->sdl_data,
-				    (size_t)dl->sdl_nlen);
-				names[dl->sdl_nlen] = 0;
-				names += dl->sdl_nlen + 1;
-
-				ift->ifa_addr = (struct sockaddr *)(void *)data;
-				memcpy(data, dl,
-				    (size_t)SA_LEN((struct sockaddr *)
-				    (void *)dl));
-				data += SA_RLEN((struct sockaddr *)(void *)dl);
-
-#ifdef	HAVE_IFM_DATA
-				/* ifm_data needs to be aligned */
-				ift->ifa_data = data = (void *)ALIGN(data);
-				memcpy(data, &ifm->ifm_data, sizeof(ifm->ifm_data));
- 				data += sizeof(ifm->ifm_data);
-#else	/* HAVE_IFM_DATA */
-				ift->ifa_data = NULL;
-#endif	/* HAVE_IFM_DATA */
-
-				ift = (ift->ifa_next = ift + 1);
-			} else
-				idx = 0;
-			break;
-
-		case RTM_NEWADDR:
-			ifam = (struct ifa_msghdr *)(void *)rtm;
-			if (idx && ifam->ifam_index != idx)
-				abort();	/* this cannot happen */
-
-			if (idx == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
-				break;
-			ift->ifa_name = cif->ifa_name;
-			ift->ifa_flags = cif->ifa_flags;
-			ift->ifa_data = NULL;
-			p = (char *)(void *)(ifam + 1);
-			/* Scan to look for length of address */
-			alen = 0;
-			for (p0 = p, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				if (i == RTAX_IFA) {
-					alen = len;
-					break;
-				}
-				p += len;
-			}
-			for (p = p0, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				switch (i) {
-				case RTAX_IFA:
-					ift->ifa_addr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_NETMASK:
-					ift->ifa_netmask =
-					    (struct sockaddr *)(void *)data;
-					if (SA_LEN(sa) == 0) {
-						memset(data, 0, alen);
-						data += alen;
-						break;
-					}
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_BRD:
-					ift->ifa_broadaddr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-				}
-				p += len;
-			}
-
-#ifdef	HAVE_IFAM_DATA
-			/* ifam_data needs to be aligned */
-			ift->ifa_data = data = (void *)ALIGN(data);
-			memcpy(data, &ifam->ifam_data, sizeof(ifam->ifam_data));
-			data += sizeof(ifam->ifam_data);
-#endif	/* HAVE_IFAM_DATA */
-
-			ift = (ift->ifa_next = ift + 1);
-			break;
-		}
-	}
-
-	free(buf);
-#else	/* NET_RT_IFLIST */
-	ifr = ifc.ifc_req;
-	lifr = (struct ifreq *)&ifc.ifc_buf[ifc.ifc_len];
-
-	while (ifr < lifr) {
-		struct sockaddr *sa;
-
-		ift->ifa_name = names;
-		names[sizeof(ifr->ifr_name)] = 0;
-		strncpy(names, ifr->ifr_name, sizeof(ifr->ifr_name));
-		while (*names++)
-			;
-
-		ift->ifa_addr = (struct sockaddr *)data;
-		sa = &ifr->ifr_addr;
-		memcpy(data, sa, SA_LEN(sa));
-		data += SA_RLEN(sa);
-		
-		ifr = (struct ifreq *)(((char *)sa) + SA_LEN(sa));
-		ift = (ift->ifa_next = ift + 1);
-	}
-#endif	/* NET_RT_IFLIST */
-	if (--ift >= ifa) {
-		ift->ifa_next = NULL;
-		*pif = ifa;
-	} else {
-		*pif = NULL;
-		free(ifa);
-	}
-	return (0);
-}
-
-void
-freeifaddrs(struct ifaddrs *ifp)
-{
-
-	free(ifp);
-}
diff --git a/newlib/libc/sys/linux/net/getipnodebyname.3 b/newlib/libc/sys/linux/net/getipnodebyname.3
deleted file mode 100644
index 5b8ea1e..0000000
--- a/newlib/libc/sys/linux/net/getipnodebyname.3
+++ /dev/null
@@ -1,461 +0,0 @@
-.\"	$FreeBSD: src/lib/libc/net/getipnodebyname.3,v 1.8 2001/10/01 16:08:55 ru Exp $
-.\"	$KAME: getipnodebyname.3,v 1.6 2000/08/09 21:16:17 itojun Exp $
-.\"
-.\" Copyright (c) 1983, 1987, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\"
-.Dd May 25, 1995
-.Dt GETIPNODEBYNAME 3
-.Os
-.\"
-.Sh NAME
-.Nm getipnodebyname ,
-.Nm getipnodebyaddr ,
-.Nm freehostent
-.Nd nodename-to-address and address-to-nodename translation
-.\"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netdb.h
-.Ft "struct hostent *"
-.Fn getipnodebyname "const char *name" "int af" "int flags" "int *error_num"
-.Ft "struct hostent *"
-.Fn getipnodebyaddr "const void *src" "size_t len" "int af" "int *error_num"
-.Ft void
-.Fn freehostent "struct hostent *ptr"
-.\"
-.Sh DESCRIPTION
-.Fn getipnodebyname
-and
-.Fn getipnodebyaddr
-functions are very similar to
-.Xr gethostbyname 3 ,
-.Xr gethostbyname2 3
-and
-.Xr gethostbyaddr 3 .
-The functions cover all the functionalities provided by the older ones,
-and provide better interface to programmers.
-The functions require additional arguments,
-.Ar af ,
-and
-.Ar flags ,
-for specifying address family and operation mode.
-The additional arguments allow programmer to get address for a nodename,
-for specific address family
-(such as
-.Dv AF_INET
-or
-.Dv AF_INET6 ) .
-The functions also require an additional pointer argument,
-.Ar error_num
-to return the appropriate error code,
-to support thread safe error code returns.
-.Pp
-The type and usage of the return value,
-.Li "struct hostent"
-is described in
-.Xr gethostbyname 3 .
-.Pp
-For
-.Fn getipnodebyname ,
-the
-.Ar name
-argument can be either a node name or a numeric address
-string
-(i.e., a dotted-decimal IPv4 address or an IPv6 hex address).
-The
-.Ar af
-argument specifies the address family, either
-.Dv AF_INET
-or
-.Dv AF_INET6 .
-The
-.Ar flags
-argument specifies the types of addresses that are searched for,
-and the types of addresses that are returned.
-We note that a special flags value of
-.Dv AI_DEFAULT
-(defined below)
-should handle most applications.
-That is, porting simple applications to use IPv6 replaces the call
-.Bd -literal -offset
-   hptr = gethostbyname(name);
-.Ed
-.Pp
-with
-.Bd -literal -offset
-   hptr = getipnodebyname(name, AF_INET6, AI_DEFAULT, &error_num);
-.Ed
-.Pp
-Applications desiring finer control over the types of addresses
-searched for and returned, can specify other combinations of the
-.Ar flags
-argument.
-.Pp
-A
-.Ar flags
-of
-.Li 0
-implies a strict interpretation of the
-.Ar af
-argument:
-.Bl -bullet
-.It
-If
-.Ar flags
-is 0 and
-.Ar af
-is
-.Dv AF_INET ,
-then the caller wants only IPv4 addresses.
-A query is made for
-.Li A
-records.
-If successful, the IPv4 addresses are returned and the
-.Li h_length
-member of the
-.Li hostent
-structure will be 4, else the function returns a
-.Dv NULL
-pointer.
-.It
-If
-.Ar flags
-is 0 and if
-.Ar af
-is
-.Li AF_INET6 ,
-then the caller wants only IPv6 addresses.
-A query is made for
-.Li AAAA
-records.
-If successful, the IPv6 addresses are returned and the
-.Li h_length
-member of the
-.Li hostent
-structure will be 16, else the function returns a
-.Dv NULL
-pointer.
-.El
-.Pp
-Other constants can be logically-ORed into the
-.Ar flags
-argument, to modify the behavior of the function.
-.Bl -bullet
-.It
-If the
-.Dv AI_V4MAPPED
-flag is specified along with an
-.Ar af
-of
-.Dv AF_INET6 ,
-then the caller will accept IPv4-mapped IPv6 addresses.
-That is, if no
-.Li AAAA
-records are found then a query is made for
-.Li A
-records and any found are returned as IPv4-mapped IPv6 addresses
-.Li ( h_length
-will be 16).
-The
-.Dv AI_V4MAPPED
-flag is ignored unless
-.Ar af
-equals
-.Dv AF_INET6 .
-.It
-The
-.Dv AI_V4MAPPED_CFG
-flag is exact same as the
-.Dv AI_V4MAPPED
-flag only if the kernel supports IPv4-mapped IPv6 address.
-.It
-If the
-.Dv AI_ALL
-flag is used in conjunction with the
-.Dv AI_V4MAPPED
-flag, and only used with the IPv6 address family.
-When
-.Dv AI_ALL
-is logically or'd with
-.Dv AI_V4MAPPED
-flag then the caller wants all addresses: IPv6 and IPv4-mapped IPv6.
-A query is first made for
-.Li AAAA
-records and if successful, the
-IPv6 addresses are returned.  Another query is then made for
-.Li A
-records and any found are returned as IPv4-mapped IPv6 addresses.
-.Li h_length
-will be 16.  Only if both queries fail does the function
-return a
-.Dv NULL
-pointer.  This flag is ignored unless af equals
-AF_INET6.  If both
-.Dv AI_ALL
-and
-.Dv AI_V4MAPPED
-are specified,
-.Dv AI_ALL
-takes precedence.
-.It
-The
-.Dv AI_ADDRCONFIG
-flag specifies that a query for
-.Li AAAA
-records
-should occur only if the node has at least one IPv6 source
-address configured and a query for
-.Li A
-records should occur only if the node has at least one IPv4 source address
-configured.
-.Pp
-For example, if the node has no IPv6 source addresses configured,
-and
-.Ar af
-equals AF_INET6, and the node name being looked up has both
-.Li AAAA
-and
-.Li A
-records, then:
-(a) if only
-.Dv AI_ADDRCONFIG
-is
-specified, the function returns a
-.Dv NULL
-pointer;
-(b) if
-.Dv AI_ADDRCONFIG
-|
-.Dv AI_V4MAPPED
-is specified, the
-.Li A
-records are returned as IPv4-mapped IPv6 addresses;
-.El
-.Pp
-The special flags value of
-.Dv AI_DEFAULT
-is defined as
-.Bd -literal -offset
-   #define  AI_DEFAULT  (AI_V4MAPPED_CFG | AI_ADDRCONFIG)
-.Ed
-.Pp
-We noted that the
-.Fn getipnodebyname
-function must allow the
-.Ar name
-argument to be either a node name or a literal address string
-(i.e., a dotted-decimal IPv4 address or an IPv6 hex address).
-This saves applications from having to call
-.Xr inet_pton 3
-to handle literal address strings.
-When the
-.Ar name
-argument is a literal address string,
-the
-.Ar flags
-argument is always ignored.
-.Pp
-There are four scenarios based on the type of literal address string
-and the value of the
-.Ar af
-argument.
-The two simple cases are when
-.Ar name
-is a dotted-decimal IPv4 address and
-.Ar af
-equals
-.Dv AF_INET ,
-or when
-.Ar name
-is an IPv6 hex address and
-.Ar af
-equals
-.Dv AF_INET6 .
-The members of the
-returned hostent structure are:
-.Li h_name
-points to a copy of the
-.Ar name
-argument,
-.Li h_aliases
-is a
-.Dv NULL
-pointer,
-.Li h_addrtype
-is a copy of the
-.Ar af
-argument,
-.Li h_length
-is either 4
-(for
-.Dv AF_INET )
-or 16
-(for
-.Dv AF_INET6 ) ,
-.Li h_addr_list[0]
-is a pointer to the 4-byte or 16-byte binary address,
-and
-.Li h_addr_list[1]
-is a
-.Dv NULL
-pointer.
-.Pp
-When
-.Ar name
-is a dotted-decimal IPv4 address and
-.Ar af
-equals
-.Dv AF_INET6 ,
-and
-.Dv AI_V4MAPPED
-is specified,
-an IPv4-mapped IPv6 address is returned:
-.Li h_name
-points to an IPv6 hex address containing the IPv4-mapped IPv6 address,
-.Li h_aliases
-is a
-.Dv NULL
-pointer,
-.Li h_addrtype
-is
-.Dv AF_INET6 ,
-.Li h_length
-is 16,
-.Li h_addr_list[0]
-is a pointer to the 16-byte binary address, and
-.Li h_addr_list[1]
-is a
-.Dv NULL
-pointer.
-.Pp
-It is an error when
-.Ar name
-is an IPv6 hex address and
-.Ar af
-equals
-.Dv AF_INET .
-The function's return value is a
-.Dv NULL
-pointer and the value pointed to by
-.Ar error_num
-equals
-.Dv HOST_NOT_FOUND .
-.Pp
-.Fn getipnodebyaddr
-takes almost the same argument as
-.Xr gethostbyaddr 3 ,
-but adds a pointer to return an error number.
-Additionally it takes care of IPv4-mapped IPv6 addresses,
-and IPv4-compatible IPv6 addresses.
-.Pp
-.Fn getipnodebyname
-and
-.Fn getipnodebyaddr
-dynamically allocate the structure to be returned to the caller.
-.Fn freehostent
-reclaims memory region allocated and returned by
-.Fn getipnodebyname
-or
-.Fn getipnodebyaddr .
-.\"
-.Sh FILES
-.Bl -tag -width /etc/nsswitch.conf -compact
-.It Pa /etc/hosts
-.It Pa /etc/nsswitch.conf
-.It Pa /etc/resolv.conf
-.El
-.\"
-.Sh DIAGNOSTICS
-.Fn getipnodebyname
-and
-.Fn getipnodebyaddr
-returns
-.Dv NULL
-on errors.
-The integer values pointed to by
-.Ar error_num
-may then be checked to see whether this is a temporary failure
-or an invalid or unknown host.
-The meanings of each error code are described in
-.Xr gethostbyname 3 .
-.\"
-.Sh SEE ALSO
-.Xr gethostbyaddr 3 ,
-.Xr gethostbyname 3 ,
-.Xr hosts 5 ,
-.Xr nsswitch.conf 5 ,
-.Xr services 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Pp
-.Rs
-.%A R. Gilligan
-.%A S. Thomson
-.%A J. Bound
-.%A W. Stevens
-.%T Basic Socket Interface Extensions for IPv6
-.%R RFC2553
-.%D March 1999
-.Re
-.\"
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
-.\"
-.Sh STANDARDS
-.Fn getipnodebyname
-and
-.Fn getipnodebyaddr
-are documented in
-.Dq Basic Socket Interface Extensions for IPv6
-(RFC2553).
-.\"
-.Sh BUGS
-.Fn getipnodebyname
-and
-.Fn getipnodebyaddr
-do not handle scoped IPv6 address properly.
-If you use these functions,
-your program will not be able to handle scoped IPv6 addresses.
-For IPv6 address manipulation,
-.Fn getaddrinfo 3
-and
-.Fn getnameinfo 3
-are recommended.
-.Pp
-The current implementation is not thread-safe.
-.Pp
-The text was shamelessly copied from RFC2553.
diff --git a/newlib/libc/sys/linux/net/getnameinfo.3 b/newlib/libc/sys/linux/net/getnameinfo.3
deleted file mode 100644
index d7afa2f..0000000
--- a/newlib/libc/sys/linux/net/getnameinfo.3
+++ /dev/null
@@ -1,311 +0,0 @@
-.\"	$FreeBSD: src/lib/libc/net/getnameinfo.3,v 1.11 2001/10/01 16:08:55 ru Exp $
-.\"	$KAME: getnameinfo.3,v 1.17 2000/08/09 21:16:17 itojun Exp $
-.\"
-.\" Copyright (c) 1983, 1987, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\"
-.Dd May 25, 1995
-.Dt GETNAMEINFO 3
-.Os
-.\"
-.Sh NAME
-.Nm getnameinfo
-.Nd address-to-nodename translation in protocol-independent manner
-.\"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netdb.h
-.Ft int
-.Fn getnameinfo "const struct sockaddr *sa" "socklen_t salen" \
-"char *host" "size_t hostlen" "char *serv" "size_t servlen" "int flags"
-.\"
-.Sh DESCRIPTION
-The
-.Fn getnameinfo
-function is defined for protocol-independent address-to-nodename translation.
-Its functionality is a reverse conversion of
-.Xr getaddrinfo 3 ,
-and implements similar functionality with
-.Xr gethostbyaddr 3
-and
-.Xr getservbyport 3
-in more sophisticated manner.
-.Pp
-This function looks up an IP address and port number provided by the
-caller in the DNS and system-specific database, and returns text
-strings for both in buffers provided by the caller.
-The function indicates successful completion by a zero return value;
-a non-zero return value indicates failure.
-.Pp
-The first argument,
-.Fa sa ,
-points to either a
-.Li sockaddr_in
-structure (for IPv4) or a
-.Li sockaddr_in6
-structure (for IPv6) that holds the IP address and port number.
-The
-.Fa salen
-argument gives the length of the
-.Li sockaddr_in
-or
-.Li sockaddr_in6
-structure.
-.Pp
-The function returns the nodename associated with the IP address in
-the buffer pointed to by the
-.Fa host
-argument.
-The caller provides the size of this buffer via the
-.Fa hostlen
-argument.
-The service name associated with the port number is returned in the buffer
-pointed to by
-.Fa serv ,
-and the
-.Fa servlen
-argument gives the length of this buffer.
-The caller specifies not to return either string by providing a zero
-value for the
-.Fa hostlen
-or
-.Fa servlen
-arguments.
-Otherwise, the caller must provide buffers large enough to hold the
-nodename and the service name, including the terminating null characters.
-.Pp
-Unfortunately most systems do not provide constants that specify the
-maximum size of either a fully-qualified domain name or a service name.
-Therefore to aid the application in allocating buffers for these two
-returned strings the following constants are defined in
-.Aq Pa netdb.h :
-.Bd -literal -offset
-#define NI_MAXHOST  1025
-#define NI_MAXSERV    32
-.Ed
-.Pp
-The first value is actually defined as the constant
-.Dv MAXDNAME
-in recent versions of BIND's
-.Aq Pa arpa/nameser.h
-header
-(older versions of BIND define this constant to be 256)
-and the second is a guess based on the services listed in the current
-Assigned Numbers RFC.
-.Pp
-The final argument is a
-.Fa flag
-that changes the default actions of this function.
-By default the fully-qualified domain name (FQDN) for the host is
-looked up in the DNS and returned.
-If the flag bit
-.Dv NI_NOFQDN
-is set, only the nodename portion of the FQDN is returned for local hosts.
-.Pp
-If the
-.Fa flag
-bit
-.Dv NI_NUMERICHOST
-is set, or if the host's name cannot be located in the DNS,
-the numeric form of the host's address is returned instead of its name
-(e.g., by calling
-.Fn inet_ntop
-instead of
-.Fn getnodebyaddr ) .
-If the
-.Fa flag
-bit
-.Dv NI_NAMEREQD
-is set, an error is returned if the host's name cannot be located in the DNS.
-.Pp
-If the flag bit
-.Dv NI_NUMERICSERV
-is set, the numeric form of the service address is returned
-(e.g., its port number)
-instead of its name.
-The two
-.Dv NI_NUMERICxxx
-flags are required to support the
-.Fl n
-flag that many commands provide.
-.Pp
-A fifth flag bit,
-.Dv NI_DGRAM ,
-specifies that the service is a datagram service, and causes
-.Fn getservbyport
-to be called with a second argument of
-.Dq udp
-instead of its default of
-.Dq tcp .
-This is required for the few ports (512-514)
-that have different services for UDP and TCP.
-.Pp
-These
-.Dv NI_xxx
-flags are defined in
-.Aq Pa netdb.h .
-.\"
-.Sh EXTENSION
-The implementation allows experimental numeric IPv6 address notation with
-scope identifier.
-IPv6 link-local address will appear as string like
-.Dq Li fe80::1%ne0 ,
-if
-.Dv NI_WITHSCOPEID
-bit is enabled in
-.Ar flags
-argument.
-Refer to
-.Xr getaddrinfo 3
-for the notation.
-.\"
-.Sh EXAMPLES
-The following code tries to get numeric hostname, and service name,
-for given socket address.
-Observe that there is no hardcoded reference to particular address family.
-.Bd -literal -offset indent
-struct sockaddr *sa;	/* input */
-char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
-
-if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), sbuf,
-    sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
-	errx(1, "could not get numeric hostname");
-	/*NOTREACHED*/
-}
-printf("host=%s, serv=%s\\n", hbuf, sbuf);
-.Ed
-.Pp
-The following version checks if the socket address has reverse address mapping.
-.Bd -literal -offset indent
-struct sockaddr *sa;	/* input */
-char hbuf[NI_MAXHOST];
-
-if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), NULL, 0,
-    NI_NAMEREQD)) {
-	errx(1, "could not resolve hostname");
-	/*NOTREACHED*/
-}
-printf("host=%s\\n", hbuf);
-.Ed
-.\"
-.Sh FILES
-.Bl -tag -width /etc/nsswitch.conf -compact
-.It Pa /etc/hosts
-.It Pa /etc/nsswitch.conf
-.It Pa /etc/resolv.conf
-.El
-.\"
-.Sh DIAGNOSTICS
-The function indicates successful completion by a zero return value;
-a non-zero return value indicates failure.
-Error codes are as below:
-.Bl -tag -width Er
-.It Bq Er EAI_AGAIN
-The name could not be resolved at this time.
-Future attempts may succeed.
-.It Bq Er EAI_BADFLAGS
-The flags had an invalid value.
-.It Bq Er EAI_FAIL
-A non-recoverable error occurred.
-.It Bq Er EAI_FAMILY
-The address family was not recognized or the address length was invalid
-for the specified family.
-.It Bq Er EAI_MEMORY
-There was a memory allocation failure.
-.It Bq Er EAI_NONAME
-The name does not resolve for the supplied parameters.
-.Dv NI_NAMEREQD
-is set and the host's name cannot be located,
-or both nodename and servname were null.
-.It Bq Er EAI_SYSTEM
-A system error occurred.
-The error code can be found in errno.
-.El
-.\"
-.Sh SEE ALSO
-.Xr getaddrinfo 3 ,
-.Xr gethostbyaddr 3 ,
-.Xr getservbyport 3 ,
-.Xr hosts 5 ,
-.Xr services 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Pp
-.Rs
-.%A R. Gilligan
-.%A S. Thomson
-.%A J. Bound
-.%A W. Stevens
-.%T Basic Socket Interface Extensions for IPv6
-.%R RFC2553
-.%D March 1999
-.Re
-.Rs
-.%A Tatsuya Jinmei
-.%A Atsushi Onoe
-.%T "An Extension of Format for IPv6 Scoped Addresses"
-.%R internet draft
-.%N draft-ietf-ipngwg-scopedaddr-format-02.txt
-.%O work in progress material
-.Re
-.Rs
-.%A Craig Metz
-.%T Protocol Independence Using the Sockets API
-.%B "Proceedings of the freenix track: 2000 USENIX annual technical conference"
-.%D June 2000
-.Re
-.\"
-.Sh HISTORY
-The implementation first appeared in WIDE Hydrangea IPv6 protocol stack kit.
-.\"
-.Sh STANDARDS
-The
-.Fn getaddrinfo
-function is defined in
-.St -p1003.1g-2000 ,
-and documented in
-.Dq Basic Socket Interface Extensions for IPv6
-(RFC2553).
-.\"
-.Sh BUGS
-The current implementation is not thread-safe.
-.Pp
-The text was shamelessly copied from RFC2553.
-.Pp
-The type of the 2nd argument should be
-.Li socklen_t
-for RFC2553 conformance.
-The current code is based on pre-RFC2553 specification.
diff --git a/newlib/libc/sys/linux/net/getnameinfo.c b/newlib/libc/sys/linux/net/getnameinfo.c
deleted file mode 100644
index e2f9631..0000000
--- a/newlib/libc/sys/linux/net/getnameinfo.c
+++ /dev/null
@@ -1,372 +0,0 @@
-/*	$KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Issues to be discussed:
- * - Thread safe-ness must be checked
- * - RFC2553 says that we should raise error on short buffer.  X/Open says
- *   we need to truncate the result.  We obey RFC2553 (and X/Open should be
- *   modified).  ipngwg rough consensus seems to follow RFC2553.
- * - What is "local" in NI_FQDN?
- * - NI_NAMEREQD and NI_NUMERICHOST conflict with each other.
- * - (KAME extension) NI_WITHSCOPEID when called with global address,
- *   and sin6_scope_id filled
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <string.h>
-#include <stddef.h>
-#include <errno.h>
-
-#define SUCCESS 0
-#define ANY 0
-#define YES 1
-#define NO  0
-
-static struct afd {
-	int a_af;
-	int a_addrlen;
-	int a_socklen;
-	int a_off;
-} afdl [] = {
-#ifdef INET6
-	{PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6),
-		offsetof(struct sockaddr_in6, sin6_addr)},
-#endif
-	{PF_INET, sizeof(struct in_addr), sizeof(struct sockaddr_in),
-		offsetof(struct sockaddr_in, sin_addr)},
-	{0, 0, 0},
-};
-
-struct sockinet {
-	u_char	si_len;
-	u_char	si_family;
-	u_short	si_port;
-};
-
-#ifdef INET6
-static int ip6_parsenumeric(const struct sockaddr *, const char *, char *,
-	    size_t, int);
-static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int);
-#endif
-
-/* 2553bis: use EAI_xx for getnameinfo */
-#define ENI_NOSOCKET 	EAI_FAIL		/*XXX*/
-#define ENI_NOSERVNAME	EAI_NONAME
-#define ENI_NOHOSTNAME	EAI_NONAME
-#define ENI_MEMORY	EAI_MEMORY
-#define ENI_SYSTEM	EAI_SYSTEM
-#define ENI_FAMILY	EAI_FAMILY
-#define ENI_SALEN	EAI_FAMILY
-
-int
-getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
-	const struct sockaddr *sa;
-	socklen_t salen;
-	char *host;
-	size_t hostlen;
-	char *serv;
-	size_t servlen;
-	int flags;
-{
-	struct afd *afd;
-	struct servent *sp;
-	struct hostent *hp;
-	u_short port;
-	int family, i;
-	const char *addr;
-	u_int32_t v4a;
-	int h_error;
-	char numserv[512];
-	char numaddr[512];
-
-	if (sa == NULL)
-		return ENI_NOSOCKET;
-
-	family = sa->sa_family;
-	for (i = 0; afdl[i].a_af; i++)
-		if (afdl[i].a_af == family) {
-			afd = &afdl[i];
-			goto found;
-		}
-	return ENI_FAMILY;
-	
- found:
-	if (salen != afd->a_socklen)
-		return ENI_SALEN;
-	
-	/* network byte order */
-	port = ((const struct sockinet *)sa)->si_port;
-	addr = (const char *)sa + afd->a_off;
-
-	if (serv == NULL || servlen == 0) {
-		/*
-		 * do nothing in this case.
-		 * in case you are wondering if "&&" is more correct than
-		 * "||" here: RFC2553 says that serv == NULL OR servlen == 0
-		 * means that the caller does not want the result.
-		 */
-	} else {
-		if (flags & NI_NUMERICSERV)
-			sp = NULL;
-		else {
-			sp = getservbyport(port,
-				(flags & NI_DGRAM) ? "udp" : "tcp");
-		}
-		if (sp) {
-			if (strlen(sp->s_name) + 1 > servlen)
-				return ENI_MEMORY;
-			strcpy(serv, sp->s_name);
-		} else {
-			snprintf(numserv, sizeof(numserv), "%d", ntohs(port));
-			if (strlen(numserv) + 1 > servlen)
-				return ENI_MEMORY;
-			strcpy(serv, numserv);
-		}
-	}
-
-	switch (sa->sa_family) {
-	case AF_INET:
-		v4a = (u_int32_t)
-		    ntohl(((const struct sockaddr_in *)sa)->sin_addr.s_addr);
-		if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
-			flags |= NI_NUMERICHOST;
-		v4a >>= IN_CLASSA_NSHIFT;
-		if (v4a == 0)
-			flags |= NI_NUMERICHOST;			
-		break;
-#ifdef INET6
-	case AF_INET6:
-	    {
-		const struct sockaddr_in6 *sin6;
-		sin6 = (const struct sockaddr_in6 *)sa;
-		switch (sin6->sin6_addr.s6_addr[0]) {
-		case 0x00:
-			if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr))
-				;
-			else if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr))
-				;
-			else
-				flags |= NI_NUMERICHOST;
-			break;
-		default:
-			if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
-				flags |= NI_NUMERICHOST;
-			}
-			else if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
-				flags |= NI_NUMERICHOST;
-			break;
-		}
-	    }
-		break;
-#endif
-	}
-	if (host == NULL || hostlen == 0) {
-		/*
-		 * do nothing in this case.
-		 * in case you are wondering if "&&" is more correct than
-		 * "||" here: RFC2553 says that host == NULL OR hostlen == 0
-		 * means that the caller does not want the result.
-		 */
-	} else if (flags & NI_NUMERICHOST) {
-		int numaddrlen;
-
-		/* NUMERICHOST and NAMEREQD conflicts with each other */
-		if (flags & NI_NAMEREQD)
-			return ENI_NOHOSTNAME;
-
-		switch(afd->a_af) {
-#ifdef INET6
-		case AF_INET6:
-		{
-			int error;
-
-			if ((error = ip6_parsenumeric(sa, addr, host,
-						      hostlen, flags)) != 0)
-				return(error);
-			break;
-		}
-#endif
-		default:
-			if (inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr))
-			    == NULL)
-				return ENI_SYSTEM;
-			numaddrlen = strlen(numaddr);
-			if (numaddrlen + 1 > hostlen) /* don't forget terminator */
-				return ENI_MEMORY;
-			strcpy(host, numaddr);
-			break;
-		}
-	} else {
-		hp = getipnodebyaddr(addr, afd->a_addrlen, afd->a_af, &h_error);
-
-		if (hp) {
-#if 0
-			/*
-			 * commented out, since "for local host" is not
-			 * implemented here - see RFC2553 p30
-			 */
-			if (flags & NI_NOFQDN) {
-				char *p;
-				p = strchr(hp->h_name, '.');
-				if (p)
-					*p = '\0';
-			}
-#endif
-			if (strlen(hp->h_name) + 1 > hostlen) {
-				freehostent(hp);
-				return ENI_MEMORY;
-			}
-			strcpy(host, hp->h_name);
-			freehostent(hp);
-		} else {
-			if (flags & NI_NAMEREQD)
-				return ENI_NOHOSTNAME;
-			switch(afd->a_af) {
-#ifdef INET6
-			case AF_INET6:
-			{
-				int error;
-
-				if ((error = ip6_parsenumeric(sa, addr, host,
-							      hostlen,
-							      flags)) != 0)
-					return(error);
-				break;
-			}
-#endif
-			default:
-				if (inet_ntop(afd->a_af, addr, host,
-				    hostlen) == NULL)
-					return ENI_SYSTEM;
-				break;
-			}
-		}
-	}
-	return SUCCESS;
-}
-
-#ifdef INET6
-static int
-ip6_parsenumeric(sa, addr, host, hostlen, flags)
-	const struct sockaddr *sa;
-	const char *addr;
-	char *host;
-	size_t hostlen;
-	int flags;
-{
-	int numaddrlen;
-	char numaddr[512];
-
-	if (inet_ntop(AF_INET6, addr, numaddr, sizeof(numaddr))
-	    == NULL)
-		return ENI_SYSTEM;
-
-	numaddrlen = strlen(numaddr);
-	if (numaddrlen + 1 > hostlen) /* don't forget terminator */
-		return ENI_MEMORY;
-	strcpy(host, numaddr);
-
-#ifdef NI_WITHSCOPEID
-	if (
-#ifdef DONT_OPAQUE_SCOPEID
-	    (IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)addr) ||
-	     IN6_IS_ADDR_MULTICAST((struct in6_addr *)addr)) &&
-#endif
-	    ((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
-#ifndef ALWAYS_WITHSCOPE
-		if (flags & NI_WITHSCOPEID)
-#endif /* !ALWAYS_WITHSCOPE */
-		{
-			char scopebuf[MAXHOSTNAMELEN];
-			int scopelen;
-
-			/* ip6_sa2str never fails */
-			scopelen = ip6_sa2str((const struct sockaddr_in6 *)sa,
-					      scopebuf, sizeof(scopebuf),
-					      flags);
-			if (scopelen + 1 + numaddrlen + 1 > hostlen)
-				return ENI_MEMORY;
-			/*
-			 * construct <numeric-addr><delim><scopeid>
-			 */
-			memcpy(host + numaddrlen + 1, scopebuf,
-			       scopelen);
-			host[numaddrlen] = SCOPE_DELIMITER;
-			host[numaddrlen + 1 + scopelen] = '\0';
-		}
-	}
-#endif /* NI_WITHSCOPEID */
-
-	return 0;
-}
-
-/* ARGSUSED */
-static int
-ip6_sa2str(sa6, buf, bufsiz, flags)
-	const struct sockaddr_in6 *sa6;
-	char *buf;
-	size_t bufsiz;
-	int flags;
-{
-	unsigned int ifindex = (unsigned int)sa6->sin6_scope_id;
-	const struct in6_addr *a6 = &sa6->sin6_addr;
-
-#ifdef NI_NUMERICSCOPE
-	if (flags & NI_NUMERICSCOPE) {
-		return(snprintf(buf, bufsiz, "%d", sa6->sin6_scope_id));
-	}
-#endif
-
-	/* if_indextoname() does not take buffer size.  not a good api... */
-	if ((IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6)) &&
-	    bufsiz >= IF_NAMESIZE) {
-		char *p = if_indextoname(ifindex, buf);
-		if (p) {
-			return(strlen(p));
-		}
-	}
-
-	/* last resort */
-	return(snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id));
-}
-#endif /* INET6 */
diff --git a/newlib/libc/sys/linux/net/getnetbydns.c b/newlib/libc/sys/linux/net/getnetbydns.c
deleted file mode 100644
index 2cc4fce..0000000
--- a/newlib/libc/sys/linux/net/getnetbydns.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*-
- * Copyright (c) 1985, 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-/* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/types.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-
-#include "res_config.h"
-
-extern int h_errno;
-
-#define BYADDR 0
-#define BYNAME 1
-#define	MAXALIASES	35
-
-#if PACKETSZ > 1024
-#define	MAXPACKET	PACKETSZ
-#else
-#define	MAXPACKET	1024
-#endif
-
-typedef union {
-	HEADER	hdr;
-	u_char	buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-	long	al;
-	char	ac;
-} align;
-
-static struct netent *
-getnetanswer(answer, anslen, net_i)
-	querybuf *answer;
-	int anslen;
-	int net_i;
-{
-
-	HEADER *hp;
-	u_char *cp;
-	int n;
-	u_char *eom;
-	int type, class, buflen, ancount, qdcount, haveanswer, i, nchar;
-	char aux1[MAXHOSTNAMELEN], aux2[MAXHOSTNAMELEN], ans[MAXHOSTNAMELEN];
-	char *in, *st, *pauxt, *bp, **ap;
-	char *paux1 = &aux1[0], *paux2 = &aux2[0], flag = 0;
-static	struct netent net_entry;
-static	char *net_aliases[MAXALIASES], netbuf[PACKETSZ];
-
-	/*
-	 * find first satisfactory answer
-	 *
-	 *      answer --> +------------+  ( MESSAGE )
-	 *		   |   Header   |
-	 *		   +------------+
-	 *		   |  Question  | the question for the name server
-	 *		   +------------+
-	 *		   |   Answer   | RRs answering the question
-	 *		   +------------+
-	 *		   | Authority  | RRs pointing toward an authority
-	 *		   | Additional | RRs holding additional information
-	 *		   +------------+
-	 */
-	eom = answer->buf + anslen;
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount); /* #/records in the answer section */
-	qdcount = ntohs(hp->qdcount); /* #/entries in the question section */
-	bp = netbuf;
-	buflen = sizeof(netbuf);
-	cp = answer->buf + HFIXEDSZ;
-	if (!qdcount) {
-		if (hp->aa)
-			h_errno = HOST_NOT_FOUND;
-		else
-			h_errno = TRY_AGAIN;
-		return (NULL);
-	}
-	while (qdcount-- > 0)
-		cp += __dn_skipname(cp, eom) + QFIXEDSZ;
-	ap = net_aliases;
-	*ap = NULL;
-	net_entry.n_aliases = net_aliases;
-	haveanswer = 0;
-	while (--ancount >= 0 && cp < eom) {
-		n = dn_expand(answer->buf, eom, cp, bp, buflen);
-		if ((n < 0) || !res_dnok(bp))
-			break;
-		cp += n;
-		ans[0] = '\0';
-		(void)strncpy(&ans[0], bp, sizeof(ans) - 1);
-		ans[sizeof(ans) - 1] = '\0';
-		GETSHORT(type, cp);
-		GETSHORT(class, cp);
-		cp += INT32SZ;		/* TTL */
-		GETSHORT(n, cp);
-		if (class == C_IN && type == T_PTR) {
-			n = dn_expand(answer->buf, eom, cp, bp, buflen);
-			if ((n < 0) || !res_hnok(bp)) {
-				cp += n;
-				return (NULL);
-			}
-			cp += n; 
-			*ap++ = bp;
-			bp += strlen(bp) + 1;
-			net_entry.n_addrtype =
-				(class == C_IN) ? AF_INET : AF_UNSPEC;
-			haveanswer++;
-		}
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		switch (net_i) {
-		case BYADDR:
-			net_entry.n_name = *net_entry.n_aliases;
-			net_entry.n_net = 0L;
-			break;
-		case BYNAME:
-			in = *net_entry.n_aliases;
-			net_entry.n_name = &ans[0];
-			aux2[0] = '\0';
-			for (i = 0; i < 4; i++) {
-				for (st = in, nchar = 0;
-				     *st != '.';
-				     st++, nchar++)
-					;
-				if (nchar != 1 || *in != '0' || flag) {
-					flag = 1;
-					(void)strncpy(paux1,
-						      (i==0) ? in : in-1,
-						      (i==0) ?nchar : nchar+1);
-					paux1[(i==0) ? nchar : nchar+1] = '\0';
-					pauxt = paux2;
-					paux2 = strcat(paux1, paux2);
-					paux1 = pauxt;
-				}
-				in = ++st;
-			}		  
-			net_entry.n_net = inet_network(paux2);
-			break;
-		}
-		net_entry.n_aliases++;
-		return (&net_entry);
-	}
-	h_errno = TRY_AGAIN;
-	return (NULL);
-}
-
-int
-_dns_getnetbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	unsigned long net;
-	int net_type;
-	unsigned int netbr[4];
-	int nn, anslen;
-	querybuf buf;
-	char qbuf[MAXDNAME];
-	unsigned long net2;
-	struct netent *net_entry;
-
-	net = va_arg(ap, unsigned long);
-	net_type = va_arg(ap, int);
-
-	*(struct netent **)rval = NULL;
-
-	if (net_type != AF_INET)
-		return NS_UNAVAIL;
-
-	for (nn = 4, net2 = net; net2; net2 >>= 8)
-		netbr[--nn] = net2 & 0xff;
-	switch (nn) {
-	case 3: 	/* Class A */
-		sprintf(qbuf, "0.0.0.%u.in-addr.arpa", netbr[3]);
-		break;
-	case 2: 	/* Class B */
-		sprintf(qbuf, "0.0.%u.%u.in-addr.arpa", netbr[3], netbr[2]);
-		break;
-	case 1: 	/* Class C */
-		sprintf(qbuf, "0.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-		    netbr[1]);
-		break;
-	case 0: 	/* Class D - E */
-		sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-		    netbr[1], netbr[0]);
-		break;
-	}
-	anslen = res_query(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
-	if (anslen < 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf("res_query failed\n");
-#endif
-		return NS_UNAVAIL;
-	}
-	net_entry = getnetanswer(&buf, anslen, BYADDR);
-	if (net_entry) {
-		unsigned u_net = net;	/* maybe net should be unsigned ? */
-
-		/* Strip trailing zeros */
-		while ((u_net & 0xff) == 0 && u_net != 0)
-			u_net >>= 8;
-		net_entry->n_net = u_net;
-		*(struct netent **)rval = net_entry;
-		return NS_SUCCESS;
-	}
-	return NS_NOTFOUND;
-}
-
-int
-_dns_getnetbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *net;
-	int anslen;
-	querybuf buf;
-	char qbuf[MAXDNAME];
-
-	net = va_arg(ap, const char *);
-
-	*(struct netent**)rval = NULL;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return NS_UNAVAIL;
-	}
-	strncpy(qbuf, net, sizeof(qbuf) - 1);
-	qbuf[sizeof(qbuf) - 1] = '\0';
-	anslen = res_search(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
-	if (anslen < 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf("res_query failed\n");
-#endif
-		return NS_UNAVAIL;
-	}
-	*(struct netent**)rval = getnetanswer(&buf, anslen, BYNAME);
-	return (*(struct netent**)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
-
-void
-_setnetdnsent(stayopen)
-	int stayopen;
-{
-	if (stayopen)
-		_res.options |= RES_STAYOPEN | RES_USEVC;
-}
-
-void
-_endnetdnsent()
-{
-	_res.options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_close();
-}
diff --git a/newlib/libc/sys/linux/net/getnetbyht.c b/newlib/libc/sys/linux/net/getnetbyht.c
deleted file mode 100644
index 8e4a16f..0000000
--- a/newlib/libc/sys/linux/net/getnetbyht.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * from getnetent.c	1.1 (Coimbra) 93/06/02
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetent.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-
-#define	MAXALIASES	35
-
-static FILE *netf;
-static char line[BUFSIZ+1];
-static struct netent net;
-static char *net_aliases[MAXALIASES];
-static int _net_stayopen;
-
-void
-_setnethtent(f)
-	int f;
-{
-
-	if (netf == NULL)
-		netf = fopen(_PATH_NETWORKS, "r" );
-	else
-		rewind(netf);
-	_net_stayopen |= f;
-}
-
-void
-_endnethtent()
-{
-
-	if (netf) {
-		fclose(netf);
-		netf = NULL;
-	}
-	_net_stayopen = 0;
-}
-
-struct netent *
-getnetent()
-{
-	char *p;
-	char *cp, **q;
-
-	if (netf == NULL && (netf = fopen(_PATH_NETWORKS, "r" )) == NULL)
-		return (NULL);
-again:
-	p = fgets(line, sizeof line, netf);
-	if (p == NULL)
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	net.n_name = p;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	net.n_net = inet_network(cp);
-	net.n_addrtype = AF_INET;
-	q = net.n_aliases = net_aliases;
-	if (p != NULL) 
-		cp = p;
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &net_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&net);
-}
-
-int
-_ht_getnetbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	struct netent *p;
-	char **cp;
-
-	name = va_arg(ap, const char *);
-
-	setnetent(_net_stayopen);
-	while ( (p = getnetent()) ) {
-		if (strcasecmp(p->n_name, name) == 0)
-			break;
-		for (cp = p->n_aliases; *cp != 0; cp++)
-			if (strcasecmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!_net_stayopen)
-		endnetent();
-	*(struct netent **)rval = p;
-	return (p != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
-
-int
-_ht_getnetbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	unsigned long net;
-	int type;
-	struct netent *p;
-
-	net = va_arg(ap, unsigned long);
-	type = va_arg(ap, int);
-
-	setnetent(_net_stayopen);
-	while ( (p = getnetent()) )
-		if (p->n_addrtype == type && p->n_net == net)
-			break;
-	if (!_net_stayopen)
-		endnetent();
-	*(struct netent **)rval = p;
-	return (p != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
diff --git a/newlib/libc/sys/linux/net/getnetbynis.c b/newlib/libc/sys/linux/net/getnetbynis.c
deleted file mode 100644
index 6d222e6..0000000
--- a/newlib/libc/sys/linux/net/getnetbynis.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/types.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <arpa/nameser.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#define	MAXALIASES	35
-#define	MAXADDRS	35
-
-#ifdef YP
-static char *host_aliases[MAXALIASES];
-
-static struct netent *
-_getnetbynis(const char *name, char *map, int af)
-{
-	char *cp, **q;
-	static char *result;
-	int resultlen;
-	static struct netent h;
-	static char *domain = (char *)NULL;
-	static char ypbuf[YPMAXRECORD + 2];
-
-	switch(af) {
-	case AF_INET:
-		break;
-	default:
-	case AF_INET6:
-		errno = EAFNOSUPPORT;
-		return NULL;
-	}
-
-	if (domain == (char *)NULL)
-		if (yp_get_default_domain (&domain))
-			return (NULL);
-
-	if (yp_match(domain, map, name, strlen(name), &result, &resultlen))
-		return (NULL);
-
-	bcopy((char *)result, (char *)&ypbuf, resultlen);
-	ypbuf[resultlen] = '\0';
-	free(result);
-	result = (char *)&ypbuf;
-
-	if ((cp = index(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	h.n_name = result;
-
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-
-	h.n_net = inet_network(cp);
-	h.n_addrtype = AF_INET;
-
-	q = h.n_aliases = host_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &host_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&h);
-}
-#endif /* YP */
-
-int
-_nis_getnetbyname(void *rval, void *cb_data, va_list ap)
-{
-#ifdef YP
-	const char *name;
-
-	name = va_arg(ap, const char *);
-	
-	*(struct netent **)rval = _getnetbynis(name, "networks.byname", AF_INET);
-	return (*(struct netent **)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-#else
-	return NS_UNAVAIL;
-#endif
-
-}
-
-int 
-_nis_getnetbyaddr(void *rval, void *cb_data, va_list ap)
-{
-#ifdef YP
-	unsigned long addr;
-	int af;
-	char *str, *cp;
-	unsigned long net2;
-	int nn;
-	unsigned int netbr[4];
-	char buf[MAXDNAME];
-
-	addr = va_arg(ap, unsigned long);
-	af = va_arg(ap, int);
-
-	*(struct netent **)rval = NULL;
-
-	if (af != AF_INET) {
-		errno = EAFNOSUPPORT;
-		return NS_UNAVAIL;
-	}
-
-        for (nn = 4, net2 = addr; net2; net2 >>= 8) {
-                netbr[--nn] = net2 & 0xff;
-	}
-
-	switch (nn) {
-	case 3:		/* Class A */
-		sprintf(buf, "%u", netbr[3]);
-		break;
-        case 2:		/* Class B */
-		sprintf(buf, "%u.%u", netbr[2], netbr[3]);
-		break;
-        case 1:		/* Class C */
-		sprintf(buf, "%u.%u.%u", netbr[1], netbr[2], netbr[3]);
-                break;
-        case 0:		/* Class D - E */
-		sprintf(buf, "%u.%u.%u.%u", netbr[0], netbr[1],
-			netbr[2], netbr[3]);
-		break;
-	}
-
-	str = (char *)&buf;
-	cp = str + (strlen(str) - 2);
-
-	while(!strcmp(cp, ".0")) {
-		*cp = '\0';
-		cp = str + (strlen(str) - 2);
-	}
-
-	*(struct netent **)rval = _getnetbynis(str, "networks.byaddr", af);
-	return (*(struct netent**)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-#else
-	return NS_UNAVAIL;
-#endif /* YP */
-}
diff --git a/newlib/libc/sys/linux/net/getnetent.3 b/newlib/libc/sys/linux/net/getnetent.3
deleted file mode 100644
index 6801e97..0000000
--- a/newlib/libc/sys/linux/net/getnetent.3
+++ /dev/null
@@ -1,172 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)getnetent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/getnetent.3,v 1.17 2002/01/14 16:59:01 ru Exp $
-.\"
-.Dd June 4, 1993
-.Dt GETNETENT 3
-.Os
-.Sh NAME
-.Nm getnetent ,
-.Nm getnetbyaddr ,
-.Nm getnetbyname ,
-.Nm setnetent ,
-.Nm endnetent
-.Nd get network entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Ft struct netent *
-.Fn getnetent void
-.Ft struct netent *
-.Fn getnetbyname "const char *name"
-.Ft struct netent *
-.Fn getnetbyaddr "unsigned long net" "int type"
-.Ft void
-.Fn setnetent "int stayopen"
-.Ft void
-.Fn endnetent void
-.Sh DESCRIPTION
-The
-.Fn getnetent ,
-.Fn getnetbyname ,
-and
-.Fn getnetbyaddr
-functions
-each return a pointer to an object with the
-following structure describing an internet network.
-This structure contains either the information obtained
-from the nameserver,
-.Xr named 8 ,
-broken-out fields of a line in the network data base
-.Pa /etc/networks ,
-or entries supplied by the
-.Xr yp 8
-system.  The order of the lookups is controlled by the
-`networks' entry in
-.Xr nsswitch.conf 5 .
-.Pp
-.Bd -literal -offset indent
-struct	netent {
-	char		*n_name;	/* official name of net */
-	char		**n_aliases;	/* alias list */
-	int		n_addrtype;	/* net number type */
-	unsigned long	n_net;		/* net number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width n_addrtype
-.It Fa n_name
-The official name of the network.
-.It Fa n_aliases
-A zero terminated list of alternate names for the network.
-.It Fa n_addrtype
-The type of the network number returned; currently only AF_INET.
-.It Fa n_net
-The network number.  Network numbers are returned in machine byte
-order.
-.El
-.Pp
-The
-.Fn getnetent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setnetent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to
-.Fn getnetbyname
-or
-.Fn getnetbyaddr .
-.Pp
-The
-.Fn endnetent
-function
-closes the file.
-.Pp
-The
-.Fn getnetbyname
-function
-and
-.Fn getnetbyaddr
-sequentially search from the beginning
-of the file until a matching
-net name or
-net address and type is found,
-or until
-.Dv EOF
-is encountered.
-The
-.Fa type
-must be
-.Dv AF_INET .
-Network numbers are supplied in host order.
-.Sh FILES
-.Bl -tag -width /etc/nsswitch.conf -compact
-.It Pa /etc/networks
-.It Pa /etc/nsswitch.conf
-.It Pa /etc/resolv.conf
-.El
-.Sh DIAGNOSTICS
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr networks 5
-.Pp
-.%T RFC 1101
-.Sh HISTORY
-The
-.Fn getnetent ,
-.Fn getnetbyaddr ,
-.Fn getnetbyname ,
-.Fn setnetent ,
-and
-.Fn endnetent
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-The data space used by
-these functions is static; if future use requires the data, it should be
-copied before any subsequent calls to these functions overwrite it.
-Only Internet network
-numbers are currently understood.
-Expecting network numbers to fit
-in no more than 32 bits is probably
-naive.
diff --git a/newlib/libc/sys/linux/net/getnetnamadr.c b/newlib/libc/sys/linux/net/getnetnamadr.c
deleted file mode 100644
index 180ab14..0000000
--- a/newlib/libc/sys/linux/net/getnetnamadr.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/types.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-
-extern int _ht_getnetbyname(void *, void *, va_list);
-extern int _dns_getnetbyname(void *, void *, va_list);
-extern int _nis_getnetbyname(void *, void *, va_list);
-extern int _ht_getnetbyaddr(void *, void *, va_list);
-extern int _dns_getnetbyaddr(void *, void *, va_list);
-extern int _nis_getnetbyaddr(void *, void *, va_list);
-
-/* Network lookup order if nsswitch.conf is broken or nonexistant */
-static const ns_src default_src[] = { 
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ NSSRC_DNS, NS_SUCCESS },
-	{ 0 }
-};
-
-struct netent *
-getnetbyname(const char *name)
-{
-	struct netent *hp = 0;
-	int rval;
-
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_ht_getnetbyname, NULL)
-		{ NSSRC_DNS, _dns_getnetbyname, NULL },
-		NS_NIS_CB(_nis_getnetbyname, NULL) /* force -DHESIOD */
-		{ 0 }
-	};       
-	
-	rval = nsdispatch((void *)&hp, dtab, NSDB_NETWORKS, "getnetbyname",
-			  default_src, name);
-
-	if (rval != NS_SUCCESS)
-		return NULL;
-	else
-		return hp;
-}
-
-struct netent *
-getnetbyaddr(u_long addr, int af)
-{
-	struct netent *hp = 0;
-	int rval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_ht_getnetbyaddr, NULL)
-		{ NSSRC_DNS, _dns_getnetbyaddr, NULL },
-		NS_NIS_CB(_nis_getnetbyaddr, NULL) /* force -DHESIOD */
-		{ 0 }
-	};       
-
-	rval = nsdispatch((void *)&hp, dtab, NSDB_NETWORKS, "getnetbyaddr",
-			  default_src, addr, af);
-
-	if (rval != NS_SUCCESS)
-		return NULL;
-	else
-		return hp;
-}
-
-void
-setnetent(stayopen)
-	int stayopen;
-{
-	_setnethtent(stayopen);
-	_setnetdnsent(stayopen);
-}
-
-void
-endnetent()
-{
-	_endnethtent();
-	_endnetdnsent();
-}
diff --git a/newlib/libc/sys/linux/net/getproto.c b/newlib/libc/sys/linux/net/getproto.c
deleted file mode 100644
index 937c307..0000000
--- a/newlib/libc/sys/linux/net/getproto.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getproto.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <netdb.h>
-
-extern int _proto_stayopen;
-
-struct protoent *
-getprotobynumber(proto)
-	int proto;
-{
-	struct protoent *p;
-
-	setprotoent(_proto_stayopen);
-	while ( (p = getprotoent()) )
-		if (p->p_proto == proto)
-			break;
-	if (!_proto_stayopen)
-		endprotoent();
-	return (p);
-}
diff --git a/newlib/libc/sys/linux/net/getprotoent.3 b/newlib/libc/sys/linux/net/getprotoent.3
deleted file mode 100644
index 18b5654..0000000
--- a/newlib/libc/sys/linux/net/getprotoent.3
+++ /dev/null
@@ -1,149 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)getprotoent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/getprotoent.3,v 1.8 2001/10/01 16:08:55 ru Exp $
-.\"
-.Dd June 4, 1993
-.Dt GETPROTOENT 3
-.Os
-.Sh NAME
-.Nm getprotoent ,
-.Nm getprotobynumber ,
-.Nm getprotobyname ,
-.Nm setprotoent ,
-.Nm endprotoent
-.Nd get protocol entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Ft struct protoent *
-.Fn getprotoent void
-.Ft struct protoent *
-.Fn getprotobyname "const char *name"
-.Ft struct protoent *
-.Fn getprotobynumber "int proto"
-.Ft void
-.Fn setprotoent "int stayopen"
-.Ft void
-.Fn endprotoent void
-.Sh DESCRIPTION
-The
-.Fn getprotoent ,
-.Fn getprotobyname ,
-and
-.Fn getprotobynumber
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network protocol data base,
-.Pa /etc/protocols .
-.Bd -literal -offset indent
-.Pp
-struct	protoent {
-	char	*p_name;	/* official name of protocol */
-	char	**p_aliases;	/* alias list */
-	int	p_proto;	/* protocol number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width p_aliases
-.It Fa p_name
-The official name of the protocol.
-.It Fa p_aliases
-A zero terminated list of alternate names for the protocol.
-.It Fa p_proto
-The protocol number.
-.El
-.Pp
-The
-.Fn getprotoent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setprotoent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to
-.Fn getprotobyname
-or
-.Fn getprotobynumber .
-.Pp
-The
-.Fn endprotoent
-function
-closes the file.
-.Pp
-The
-.Fn getprotobyname
-function
-and
-.Fn getprotobynumber
-sequentially search from the beginning
-of the file until a matching
-protocol name or
-protocol number is found,
-or until
-.Dv EOF
-is encountered.
-.Sh RETURN VALUES
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh FILES
-.Bl -tag -width /etc/protocols -compact
-.It Pa /etc/protocols
-.El
-.Sh SEE ALSO
-.Xr protocols 5
-.Sh HISTORY
-The
-.Fn getprotoent ,
-.Fn getprotobynumber ,
-.Fn getprotobyname ,
-.Fn setprotoent ,
-and
-.Fn endprotoent
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-These functions use a static data space;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Only the Internet
-protocols are currently understood.
diff --git a/newlib/libc/sys/linux/net/getprotoent.c b/newlib/libc/sys/linux/net/getprotoent.c
deleted file mode 100644
index 422eeac..0000000
--- a/newlib/libc/sys/linux/net/getprotoent.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define	MAXALIASES	35
-
-static FILE *protof = NULL;
-static char line[BUFSIZ+1];
-static struct protoent proto;
-static char *proto_aliases[MAXALIASES];
-int _proto_stayopen;
-
-void
-setprotoent(f)
-	int f;
-{
-	if (protof == NULL)
-		protof = fopen(_PATH_PROTOCOLS, "r" );
-	else
-		rewind(protof);
-	_proto_stayopen |= f;
-}
-
-void
-endprotoent()
-{
-	if (protof) {
-		fclose(protof);
-		protof = NULL;
-	}
-	_proto_stayopen = 0;
-}
-
-struct protoent *
-getprotoent()
-{
-	char *p;
-	char *cp, **q;
-
-	if (protof == NULL && (protof = fopen(_PATH_PROTOCOLS, "r" )) == NULL)
-		return (NULL);
-again:
-	if ((p = fgets(line, BUFSIZ, protof)) == NULL)
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	proto.p_name = p;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	proto.p_proto = atoi(cp);
-	q = proto.p_aliases = proto_aliases;
-	if (p != NULL) {
-		cp = p;
-		while (cp && *cp) {
-			if (*cp == ' ' || *cp == '\t') {
-				cp++;
-				continue;
-			}
-			if (q < &proto_aliases[MAXALIASES - 1])
-				*q++ = cp;
-			cp = strpbrk(cp, " \t");
-			if (cp != NULL)
-				*cp++ = '\0';
-		}
-	}
-	*q = NULL;
-	return (&proto);
-}
diff --git a/newlib/libc/sys/linux/net/getprotoname.c b/newlib/libc/sys/linux/net/getprotoname.c
deleted file mode 100644
index f25883f..0000000
--- a/newlib/libc/sys/linux/net/getprotoname.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getprotoname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <netdb.h>
-#include <string.h>
-
-extern int _proto_stayopen;
-
-struct protoent *
-getprotobyname(name)
-	const char *name;
-{
-	struct protoent *p;
-	char **cp;
-
-	setprotoent(_proto_stayopen);
-	while ( (p = getprotoent()) ) {
-		if (strcmp(p->p_name, name) == 0)
-			break;
-		for (cp = p->p_aliases; *cp != 0; cp++)
-			if (strcmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!_proto_stayopen)
-		endprotoent();
-	return (p);
-}
diff --git a/newlib/libc/sys/linux/net/getservbyname.c b/newlib/libc/sys/linux/net/getservbyname.c
deleted file mode 100644
index ced03d6..0000000
--- a/newlib/libc/sys/linux/net/getservbyname.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservbyname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <netdb.h>
-#include <string.h>
-
-extern int _serv_stayopen;
-
-struct servent *
-getservbyname(name, proto)
-	const char *name, *proto;
-{
-	struct servent *p;
-	char **cp;
-
-#ifdef YP
-	extern char *___getservbyname_yp;
-	extern char *___getservbyproto_yp;
-
-	___getservbyname_yp = (char *)name;
-	___getservbyproto_yp = (char *)proto;
-#endif
-
-	setservent(_serv_stayopen);
-	while ( (p = getservent()) ) {
-		if (strcmp(name, p->s_name) == 0)
-			goto gotname;
-		for (cp = p->s_aliases; *cp; cp++)
-			if (strcmp(name, *cp) == 0)
-				goto gotname;
-		continue;
-gotname:
-		if (proto == 0 || strcmp(p->s_proto, proto) == 0)
-			break;
-	}
-	if (!_serv_stayopen)
-		endservent();
-
-#ifdef YP
-	___getservbyname_yp = NULL;
-	___getservbyproto_yp = NULL;
-#endif
-
-	return (p);
-}
diff --git a/newlib/libc/sys/linux/net/getservbyport.c b/newlib/libc/sys/linux/net/getservbyport.c
deleted file mode 100644
index 88b684d..0000000
--- a/newlib/libc/sys/linux/net/getservbyport.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservbyport.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <netdb.h>
-#include <string.h>
-
-extern int _serv_stayopen;
-
-struct servent *
-getservbyport(port, proto)
-	int port;
-	const char *proto;
-{
-	struct servent *p;
-
-#ifdef YP
-	extern int ___getservbyport_yp;
-	extern char *___getservbyproto_yp;
-
-	___getservbyport_yp = port;
-	___getservbyproto_yp = (char *)proto;
-#endif
-
-	setservent(_serv_stayopen);
-	while ( (p = getservent()) ) {
-		if (p->s_port != port)
-			continue;
-		if (proto == 0 || strcmp(p->s_proto, proto) == 0)
-			break;
-	}
-	if (!_serv_stayopen)
-		endservent();
-
-#ifdef YP
-	___getservbyport_yp = 0;
-	___getservbyproto_yp = NULL;
-#endif
-
-	return (p);
-}
diff --git a/newlib/libc/sys/linux/net/getservent.3 b/newlib/libc/sys/linux/net/getservent.3
deleted file mode 100644
index 3d398bd..0000000
--- a/newlib/libc/sys/linux/net/getservent.3
+++ /dev/null
@@ -1,158 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)getservent.3	8.3 (Berkeley) 1/12/94
-.\" $FreeBSD: src/lib/libc/net/getservent.3,v 1.12 2001/10/01 16:08:55 ru Exp $
-.\"
-.Dd July 9, 1995
-.Dt GETSERVENT 3
-.Os
-.Sh NAME
-.Nm getservent ,
-.Nm getservbyport ,
-.Nm getservbyname ,
-.Nm setservent ,
-.Nm endservent
-.Nd get service entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Ft struct servent *
-.Fn getservent
-.Ft struct servent *
-.Fn getservbyname "const char *name" "const char *proto"
-.Ft struct servent *
-.Fn getservbyport "int port" "const char *proto"
-.Ft void
-.Fn setservent "int stayopen"
-.Ft void
-.Fn endservent void
-.Sh DESCRIPTION
-The
-.Fn getservent ,
-.Fn getservbyname ,
-and
-.Fn getservbyport
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network services data base,
-.Pa /etc/services .
-.Bd -literal -offset indent
-struct	servent {
-	char	*s_name;	/* official name of service */
-	char	**s_aliases;	/* alias list */
-	int	s_port;		/* port service resides at */
-	char	*s_proto;	/* protocol to use */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width s_aliases
-.It Fa s_name
-The official name of the service.
-.It Fa s_aliases
-A zero terminated list of alternate names for the service.
-.It Fa s_port
-The port number at which the service resides.
-Port numbers are returned in network byte order.
-.It Fa s_proto
-The name of the protocol to use when contacting the
-service.
-.El
-.Pp
-The
-.Fn getservent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setservent
-function
-opens and rewinds the file.  If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to
-.Fn getservbyname
-or
-.Fn getservbyport .
-.Pp
-The
-.Fn endservent
-function
-closes the file.
-.Pp
-The
-.Fn getservbyname
-and
-.Fn getservbyport
-functions
-sequentially search from the beginning
-of the file until a matching
-protocol name or
-port number (which must be specified in
-network byte order) is found,
-or until
-.Dv EOF
-is encountered.
-If a protocol name is also supplied (non-
-.Dv NULL ) ,
-searches must also match the protocol.
-.Sh FILES
-.Bl -tag -width /etc/services -compact
-.It Pa /etc/services
-.El
-.Sh DIAGNOSTICS
-Null pointer
-(0) returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr getprotoent 3 ,
-.Xr services 5
-.Sh HISTORY
-The
-.Fn getservent ,
-.Fn getservbyport ,
-.Fn getservbyname ,
-.Fn setservent ,
-and
-.Fn endservent
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Expecting port numbers to fit in a 32 bit
-quantity is probably naive.
diff --git a/newlib/libc/sys/linux/net/getservent.c b/newlib/libc/sys/linux/net/getservent.c
deleted file mode 100644
index 1c26df7..0000000
--- a/newlib/libc/sys/linux/net/getservent.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-static int serv_stepping_yp = 0;
-extern int _yp_check( char ** );
-#endif
-
-
-#define	MAXALIASES	35
-
-static FILE *servf = NULL;
-static char line[BUFSIZ+1];
-static struct servent serv;
-static char *serv_aliases[MAXALIASES];
-int _serv_stayopen;
-
-#ifdef YP
-char *___getservbyname_yp = NULL;
-char *___getservbyproto_yp = NULL;
-int ___getservbyport_yp = 0;
-static char *yp_domain = NULL;
-
-static int
-_getservbyport_yp(line)
-	char *line;
-{
-	char *result;
-	int resultlen;
-	char buf[YPMAXRECORD + 2];
-	int rv;
-
-	snprintf(buf, sizeof(buf), "%d/%s", ntohs(___getservbyport_yp),
-						___getservbyproto_yp);
-
-	___getservbyport_yp = 0;
-	___getservbyproto_yp = NULL;
-
-	if(!yp_domain) {
-		if(yp_get_default_domain(&yp_domain))
-			return (0);
-	}
-
-	/*
-	 * We have to be a little flexible here. Ideally you're supposed
-	 * to have both a services.byname and a services.byport map, but
-	 * some systems have only services.byname. FreeBSD cheats a little
-	 * by putting the services.byport information in the same map as
-	 * services.byname so that either case will work. We allow for both
-	 * possibilities here: if there is no services.byport map, we try
-	 * services.byname instead.
-	 */
-	if ((rv = yp_match(yp_domain, "services.byport", buf, strlen(buf),
-						&result, &resultlen))) {
-		if (rv == YPERR_MAP) {
-			if (yp_match(yp_domain, "services.byname", buf,
-					strlen(buf), &result, &resultlen))
-			return(0);
-		} else
-			return(0);
-	}
-		
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(line, BUFSIZ, "%.*s\n", resultlen, result);
-
-	free(result);
-	return(1);
-}
-
-static int
-_getservbyname_yp(line)
-	char *line;
-{
-	char *result;
-	int resultlen;
-	char buf[YPMAXRECORD + 2];
-
-	if(!yp_domain) {
-		if(yp_get_default_domain(&yp_domain))
-			return (0);
-	}
-
-	snprintf(buf, sizeof(buf), "%s/%s", ___getservbyname_yp,
-						___getservbyproto_yp);
-
-	___getservbyname_yp = 0;
-	___getservbyproto_yp = NULL;
-
-	if (yp_match(yp_domain, "services.byname", buf, strlen(buf),
-						&result, &resultlen)) {
-		return(0);
-	}
-		
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(line, BUFSIZ, "%.*s\n", resultlen, result);
-
-	free(result);
-	return(1);
-}
-
-static int
-_getservent_yp(line)
-	char *line;
-{
-	static char *key = NULL;
-	static int keylen;
-	char *lastkey, *result;
-	int resultlen;
-	int rv;
-
-	if(!yp_domain) {
-		if(yp_get_default_domain(&yp_domain))
-			return (0);
-	}
-
-	if (!serv_stepping_yp) {
-		if (key)
-			free(key);
-		if ((rv = yp_first(yp_domain, "services.byname", &key, &keylen,
-			     &result, &resultlen))) {
-			serv_stepping_yp = 0;
-			return(0);
-		}
-		serv_stepping_yp = 1;
-	} else {
-		lastkey = key;
-		rv = yp_next(yp_domain, "services.byname", key, keylen, &key,
-			     &keylen, &result, &resultlen);
-		free(lastkey);
-		if (rv) {
-			serv_stepping_yp = 0;
-			return (0);
-		}
-	}
-
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(line, BUFSIZ, "%.*s\n", resultlen, result);
-
-	free(result);
-
-	return(1);
-}
-#endif
-
-void
-setservent(f)
-	int f;
-{
-	if (servf == NULL)
-		servf = fopen(_PATH_SERVICES, "r" );
-	else
-		rewind(servf);
-	_serv_stayopen |= f;
-}
-
-void
-endservent()
-{
-	if (servf) {
-		fclose(servf);
-		servf = NULL;
-	}
-	_serv_stayopen = 0;
-}
-
-struct servent *
-getservent()
-{
-	char *p;
-	char *cp, **q;
-
-#ifdef YP
-	if (serv_stepping_yp && _getservent_yp(line)) {
-		p = (char *)&line;
-		goto unpack;
-	}
-tryagain:
-#endif
-	if (servf == NULL && (servf = fopen(_PATH_SERVICES, "r" )) == NULL)
-		return (NULL);
-again:
-	if ((p = fgets(line, BUFSIZ, servf)) == NULL)
-		return (NULL);
-#ifdef YP
-	if (*p == '+' && _yp_check(NULL)) {
-		if (___getservbyname_yp != NULL) {
-			if (!_getservbyname_yp(line))
-				goto tryagain;
-		} 
-		else if (___getservbyport_yp != 0) {
-			if (!_getservbyport_yp(line))
-				goto tryagain;
-		}
-		else if (!_getservent_yp(line))
-			goto tryagain;
-	}
-unpack:
-#endif
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		goto again;
-	*cp = '\0';
-	serv.s_name = p;
-	p = strpbrk(p, " \t");
-	if (p == NULL)
-		goto again;
-	*p++ = '\0';
-	while (*p == ' ' || *p == '\t')
-		p++;
-	cp = strpbrk(p, ",/");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	serv.s_port = htons((u_short)atoi(p));
-	serv.s_proto = cp;
-	q = serv.s_aliases = serv_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &serv_aliases[MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&serv);
-}
diff --git a/newlib/libc/sys/linux/net/herror.c b/newlib/libc/sys/linux/net/herror.c
deleted file mode 100644
index 0edec98..0000000
--- a/newlib/libc/sys/linux/net/herror.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <netdb.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-const char *h_errlist[] = {
-	"Resolver Error 0 (no error)",
-	"Unknown host",				/* 1 HOST_NOT_FOUND */
-	"Host name lookup failure",		/* 2 TRY_AGAIN */
-	"Unknown server error",			/* 3 NO_RECOVERY */
-	"No address associated with name",	/* 4 NO_ADDRESS */
-};
-int	h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
-
-int	h_errno;
-
-/*
- * herror --
- *	print the error indicated by the h_errno value.
- */
-void
-herror(s)
-	const char *s;
-{
-	char *ptr;
-	if (s && *s) {
-		write(STDERR_FILENO, s, strlen(s));
-		write(STDERR_FILENO, ": ", 2);
-	}
-        ptr = (char *)hstrerror(h_errno);
-	write(STDERR_FILENO, ptr, strlen(ptr));
-	write(STDERR_FILENO, "\n", 1);
-}
-
-const char *
-hstrerror(err)
-	int err;
-{
-	if (err < 0)
-		return ("Resolver internal error");
-	else if (err < h_nerr)
-		return (h_errlist[err]);
-	return ("Unknown resolver error");
-}
diff --git a/newlib/libc/sys/linux/net/hesiod.3 b/newlib/libc/sys/linux/net/hesiod.3
deleted file mode 100644
index 8de1f92..0000000
--- a/newlib/libc/sys/linux/net/hesiod.3
+++ /dev/null
@@ -1,159 +0,0 @@
-.\"	$NetBSD: hesiod.3,v 1.1 1999/01/25 03:43:04 lukem Exp $
-.\"	$FreeBSD: src/lib/libc/net/hesiod.3,v 1.3 2001/10/01 16:08:55 ru Exp $
-.\"
-.\" from: #Id: hesiod.3,v 1.9.2.1 1997/01/03 21:02:23 ghudson Exp #
-.\"
-.\" Copyright 1988, 1996 by the Massachusetts Institute of Technology.
-.\"
-.\" Permission to use, copy, modify, and distribute this
-.\" software and its documentation for any purpose and without
-.\" fee is hereby granted, provided that the above copyright
-.\" notice appear in all copies and that both that copyright
-.\" notice and this permission notice appear in supporting
-.\" documentation, and that the name of M.I.T. not be used in
-.\" advertising or publicity pertaining to distribution of the
-.\" software without specific, written prior permission.
-.\" M.I.T. makes no representations about the suitability of
-.\" this software for any purpose.  It is provided "as is"
-.\" without express or implied warranty.
-.\"
-.Dd November 30, 1996
-.Dt HESIOD 3
-.Os
-.Sh NAME
-.Nm hesiod ,
-.Nm hesiod_init ,
-.Nm hesiod_resolve ,
-.Nm hesiod_free_list ,
-.Nm hesiod_to_bind ,
-.Nm hesiod_end
-.Nd Hesiod name server interface library
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In hesiod.h
-.Ft int
-.Fn hesiod_init "void **context"
-.Ft char **
-.Fn hesiod_resolve "void *context" "const char *name" "const char *type"
-.Ft void
-.Fn hesiod_free_list "void *context" "char **list"
-.Ft char *
-.Fn hesiod_to_bind "void *context" "const char *name" "const char *type"
-.Ft void
-.Fn hesiod_end "void *context"
-.Sh DESCRIPTION
-This family of functions allows you to perform lookups of Hesiod
-information, which is stored as text records in the Domain Name
-Service.
-To perform lookups, you must first initialize a
-.Fa context ,
-an opaque object which stores information used internally by the
-library between calls.
-.Fn hesiod_init
-initializes a context, storing a pointer to the context in the
-location pointed to by the
-.Fa context
-argument.
-.Fn hesiod_end
-frees the resources used by a context.
-.Pp
-.Fn hesiod_resolve
-is the primary interface to the library.
-If successful, it returns a
-list of one or more strings giving the records matching
-.Fa name
-and
-.Fa type .
-The last element of the list is followed by a
-.Dv NULL
-pointer.
-It is the
-caller's responsibility to call
-.Fn hesiod_free_list
-to free the resources used by the returned list.
-.Pp
-.Fn hesiod_to_bind
-converts
-.Fa name
-and
-.Fa type
-into the DNS name used by
-.Fn hesiod_resolve .
-It is the caller's responsibility to free the returned string using
-.Fn free .
-.Sh RETURN VALUES
-.Rv -std hesiod_init
-On failure,
-.Fn hesiod_resolve
-and
-.Fn hesiod_to_bind
-return
-.Dv NULL
-and set the global variable
-.Va errno
-to indicate the error.
-.Sh ENVIRONMENT
-.Bl -tag -width HESIOD_CONFIG
-.It Ev HES_DOMAIN
-If the environment variable
-.Ev HES_DOMAIN
-is set, it will override the domain in the Hesiod configuration file.
-.It Ev HESIOD_CONFIG
-If the environment variable
-.Ev HESIOD_CONFIG
-is set, it specifies the location of the Hesiod configuration file.
-.El
-.Sh SEE ALSO
-.Xr hesiod.conf 5 ,
-.Xr named 8
-.Rs
-.%T "Hesiod - Project Athena Technical Plan -- Name Service"
-.Re
-.Sh ERRORS
-Hesiod calls may fail because of:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient memory was available to carry out the requested
-operation.
-.It Bq Er ENOEXEC
-.Fn hesiod_init
-failed because the Hesiod configuration file was invalid.
-.It Bq Er ECONNREFUSED
-.Fn hesiod_resolve
-failed because no name server could be contacted to answer the query.
-.It Bq Er EMSGSIZE
-.Fn hesiod_resolve
-or
-.Fn hesiod_to_bind
-failed because the query or response was too big to fit into the
-packet buffers.
-.It Bq Er ENOENT
-.Fn hesiod_resolve
-failed because the name server had no text records matching
-.Fa name
-and
-.Fa type ,
-or
-.Fn hesiod_to_bind
-failed because the
-.Fa name
-argument had a domain extension which could not be resolved with type
-.Dq rhs\-extension
-in the local Hesiod domain.
-.El
-.Sh AUTHORS
-.An Steve Dyer ,
-IBM/Project Athena
-.An Greg Hudson ,
-MIT Team Athena
-.Pp
-Copyright 1987, 1988, 1995, 1996 by the Massachusetts Institute of Technology.
-.Sh BUGS
-The strings corresponding to the
-.Va errno
-values set by the Hesiod functions are not particularly indicative of
-what went wrong, especially for
-.Er ENOEXEC
-and
-.Er ENOENT .
diff --git a/newlib/libc/sys/linux/net/hesiod.c b/newlib/libc/sys/linux/net/hesiod.c
deleted file mode 100644
index 909c094..0000000
--- a/newlib/libc/sys/linux/net/hesiod.c
+++ /dev/null
@@ -1,600 +0,0 @@
-/*	$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Exp $	*/
-
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/* Copyright 1996 by the Massachusetts Institute of Technology.
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-
-/* This file is part of the hesiod library.  It implements the core
- * portion of the hesiod resolver.
- *
- * This file is loosely based on an interim version of hesiod.c from
- * the BIND IRS library, which was in turn based on an earlier version
- * of this file.  Extensive changes have been made on each step of the
- * path.
- *
- * This implementation is not truly thread-safe at the moment because
- * it uses res_send() and accesses _res.
- */
-
-#include <sys/cdefs.h>
-
-#if 0
-static char *orig_rcsid = "$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Exp $";
-#endif
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <hesiod.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-struct hesiod_p {
-	char	*lhs;			/* normally ".ns" */
-	char	*rhs;			/* AKA the default hesiod domain */
-	int	 classes[2];		/* The class search order. */
-};
-
-#define	MAX_HESRESP	1024
-
-static int	  read_config_file(struct hesiod_p *, const char *);
-static char	**get_txt_records(int, const char *);
-static int	  init_context(void);
-static void	  translate_errors(void);
-
-
-/*
- * hesiod_init --
- *	initialize a hesiod_p.
- */
-int 
-hesiod_init(context)
-	void	**context;
-{
-	struct hesiod_p	*ctx;
-	const char	*p, *configname;
-
-	ctx = malloc(sizeof(struct hesiod_p));
-	if (ctx) {
-		*context = ctx;
-		if (!issetugid())
-			configname = getenv("HESIOD_CONFIG");
-		else
-			configname = NULL;
-		if (!configname)
-			configname = _PATH_HESIOD_CONF;
-		if (read_config_file(ctx, configname) >= 0) {
-			/*
-			 * The default rhs can be overridden by an
-			 * environment variable.
-			 */
-			if (!issetugid())
-				p = getenv("HES_DOMAIN");
-			else
-				p = NULL;
-			if (p) {
-				if (ctx->rhs)
-					free(ctx->rhs);
-				ctx->rhs = malloc(strlen(p) + 2);
-				if (ctx->rhs) {
-					*ctx->rhs = '.';
-					strcpy(ctx->rhs + 1,
-					    (*p == '.') ? p + 1 : p);
-					return 0;
-				} else
-					errno = ENOMEM;
-			} else
-				return 0;
-		}
-	} else
-		errno = ENOMEM;
-
-	if (ctx->lhs)
-		free(ctx->lhs);
-	if (ctx->rhs)
-		free(ctx->rhs);
-	if (ctx)
-		free(ctx);
-	return -1;
-}
-
-/*
- * hesiod_end --
- *	Deallocates the hesiod_p.
- */
-void 
-hesiod_end(context)
-	void	*context;
-{
-	struct hesiod_p *ctx = (struct hesiod_p *) context;
-
-	free(ctx->rhs);
-	if (ctx->lhs)
-		free(ctx->lhs);
-	free(ctx);
-}
-
-/*
- * hesiod_to_bind --
- * 	takes a hesiod (name, type) and returns a DNS
- *	name which is to be resolved.
- */
-char *
-hesiod_to_bind(void *context, const char *name, const char *type)
-{
-	struct hesiod_p *ctx = (struct hesiod_p *) context;
-	char		 bindname[MAXDNAME], *p, *ret, **rhs_list = NULL;
-	const char	*rhs;
-	int		 len;
-	size_t		 bindnamelen;
-
-	if (strlcpy(bindname, name, sizeof(bindname)) >= sizeof(bindname)) {
-		errno = EMSGSIZE;
-		return NULL;
-	}
-
-		/*
-		 * Find the right right hand side to use, possibly
-		 * truncating bindname.
-		 */
-	p = strchr(bindname, '@');
-	if (p) {
-		*p++ = 0;
-		if (strchr(p, '.'))
-			rhs = name + (p - bindname);
-		else {
-			rhs_list = hesiod_resolve(context, p, "rhs-extension");
-			if (rhs_list)
-				rhs = *rhs_list;
-			else {
-				errno = ENOENT;
-				return NULL;
-			}
-		}
-	} else
-		rhs = ctx->rhs;
-
-		/* See if we have enough room. */
-	len = strlen(bindname) + 1 + strlen(type);
-	if (ctx->lhs)
-		len += strlen(ctx->lhs) + ((ctx->lhs[0] != '.') ? 1 : 0);
-	len += strlen(rhs) + ((rhs[0] != '.') ? 1 : 0);
-	if (len > sizeof(bindname) - 1) {
-		if (rhs_list)
-			hesiod_free_list(context, rhs_list);
-		errno = EMSGSIZE;
-		return NULL;
-	}
-		/* Put together the rest of the domain. */
-	strcat(bindname, ".");
-	strcat(bindname, type);
-		/* Only append lhs if it isn't empty. */
-	if (ctx->lhs && ctx->lhs[0] != '\0' ) {
-		if (ctx->lhs[0] != '.')
-			strcat(bindname, ".");
-		strcat(bindname, ctx->lhs);
-	}
-	if (rhs[0] != '.')
-		strcat(bindname, ".");
-	strcat(bindname, rhs);
-
-		/* rhs_list is no longer needed, since we're done with rhs. */
-	if (rhs_list)
-		hesiod_free_list(context, rhs_list);
-
-		/* Make a copy of the result and return it to the caller. */
-	bindnamelen = strlen (bindname) + 1;
-	ret = malloc (bindnamelen);
-	if (!ret)
-		errno = ENOMEM;
-	else
-		memcpy (ret, bindname, bindnamelen);
-	return ret;
-}
-
-/*
- * hesiod_resolve --
- *	Given a hesiod name and type, return an array of strings returned
- *	by the resolver.
- */
-char **
-hesiod_resolve(context, name, type)
-	void		*context;
-	const char	*name;
-	const char	*type;
-{
-	struct hesiod_p	*ctx = (struct hesiod_p *) context;
-	char		*bindname, **retvec;
-
-	bindname = hesiod_to_bind(context, name, type);
-	if (!bindname)
-		return NULL;
-
-	retvec = get_txt_records(ctx->classes[0], bindname);
-	if (retvec == NULL && errno == ENOENT && ctx->classes[1])
-		retvec = get_txt_records(ctx->classes[1], bindname);
-
-	free(bindname);
-	return retvec;
-}
-
-/*ARGSUSED*/
-void 
-hesiod_free_list(context, list)
-	void	 *context;
-	char	**list;
-{
-	char  **p;
-
-	if (list == NULL)
-		return;
-	for (p = list; *p; p++)
-		free(*p);
-	free(list);
-}
-
-
-/* read_config_file --
- *	Parse the /etc/hesiod.conf file.  Returns 0 on success,
- *	-1 on failure.  On failure, it might leave values in ctx->lhs
- *	or ctx->rhs which need to be freed by the caller.
- */
-static int 
-read_config_file(ctx, filename)
-	struct hesiod_p	*ctx;
-	const char	*filename;
-{
-	char	*key, *data, *p, **which;
-	char	 buf[MAXDNAME + 7];
-	int	 n;
-	FILE	*fp;
-
-		/* Set default query classes. */
-	ctx->classes[0] = C_IN;
-	ctx->classes[1] = C_HS;
-
-		/* Try to open the configuration file. */
-	fp = fopen(filename, "r");
-	if (!fp) {
-		size_t len;
-		/* Use compiled in default domain names. */
-		len = strlen (DEF_LHS) + 1;
-		ctx->lhs = malloc (len);
-		if (ctx->lhs) {
-			memcpy (ctx->lhs, DEF_LHS, len);
-			len = strlen (DEF_RHS) + 1;
-			ctx->rhs = malloc (len);
-			if (ctx->rhs)
-				memcpy (ctx->rhs, DEF_RHS, len);
-		}
-		if (ctx->lhs && ctx->rhs)
-			return 0;
-		else {
-			errno = ENOMEM;
-			return -1;
-		}
-	}
-	ctx->lhs = NULL;
-	ctx->rhs = NULL;
-	while (fgets(buf, sizeof(buf), fp) != NULL) {
-		p = buf;
-		if (*p == '#' || *p == '\n' || *p == '\r')
-			continue;
-		while (*p == ' ' || *p == '\t')
-			p++;
-		key = p;
-		while (*p != ' ' && *p != '\t' && *p != '=')
-			p++;
-		*p++ = 0;
-
-		while (isspace(*p) || *p == '=')
-			p++;
-		data = p;
-		while (!isspace(*p))
-			p++;
-		*p = 0;
-
-		if (strcasecmp(key, "lhs") == 0 ||
-		    strcasecmp(key, "rhs") == 0) {
-			size_t len;
-			which = (strcasecmp(key, "lhs") == 0)
-			    ? &ctx->lhs : &ctx->rhs;
-			len = strlen (data) + 1;
-			*which = malloc (len);
-			if (!*which) {
-				errno = ENOMEM;
-				return -1;
-			}
-			else
-				memcpy (*which, data, len);
-		} else {
-			if (strcasecmp(key, "classes") == 0) {
-				n = 0;
-				while (*data && n < 2) {
-					p = data;
-					while (*p && *p != ',')
-						p++;
-					if (*p)
-						*p++ = 0;
-					if (strcasecmp(data, "IN") == 0)
-						ctx->classes[n++] = C_IN;
-					else
-						if (strcasecmp(data, "HS") == 0)
-							ctx->classes[n++] =
-							    C_HS;
-					data = p;
-				}
-				while (n < 2)
-					ctx->classes[n++] = 0;
-			}
-		}
-	}
-	fclose(fp);
-
-	if (!ctx->rhs || ctx->classes[0] == 0 ||
-	    ctx->classes[0] == ctx->classes[1]) {
-		errno = ENOEXEC;
-		return -1;
-	}
-	return 0;
-}
-
-/*
- * get_txt_records --
- *	Given a DNS class and a DNS name, do a lookup for TXT records, and
- *	return a list of them.
- */
-static char **
-get_txt_records(qclass, name)
-	int		 qclass;
-	const char	*name;
-{
-	HEADER		*hp;
-	unsigned char	 qbuf[PACKETSZ], abuf[MAX_HESRESP], *p, *eom, *eor;
-	char		*dst, **list;
-	int		 ancount, qdcount, i, j, n, skip, type, class, len;
-
-		/* Make sure the resolver is initialized. */
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
-		return NULL;
-
-		/* Construct the query. */
-	n = res_mkquery(QUERY, name, qclass, T_TXT, NULL, 0,
-	    NULL, qbuf, PACKETSZ);
-	if (n < 0)
-		return NULL;
-
-		/* Send the query. */
-	n = res_send(qbuf, n, abuf, MAX_HESRESP);
-	if (n < 0) {
-		errno = ECONNREFUSED;
-		return NULL;
-	}
-		/* Parse the header of the result. */
-	hp = (HEADER *) (void *) abuf;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	p = abuf + sizeof(HEADER);
-	eom = abuf + n;
-
-		/*
-		 * Skip questions, trying to get to the answer section
-		 * which follows.
-		 */
-	for (i = 0; i < qdcount; i++) {
-		skip = dn_skipname(p, eom);
-		if (skip < 0 || p + skip + QFIXEDSZ > eom) {
-			errno = EMSGSIZE;
-			return NULL;
-		}
-		p += skip + QFIXEDSZ;
-	}
-
-		/* Allocate space for the text record answers. */
-	list = malloc((ancount + 1) * sizeof(char *));
-	if (!list) {
-		errno = ENOMEM;
-		return NULL;
-	}
-		/* Parse the answers. */
-	j = 0;
-	for (i = 0; i < ancount; i++) {
-		/* Parse the header of this answer. */
-		skip = dn_skipname(p, eom);
-		if (skip < 0 || p + skip + 10 > eom)
-			break;
-		type = p[skip + 0] << 8 | p[skip + 1];
-		class = p[skip + 2] << 8 | p[skip + 3];
-		len = p[skip + 8] << 8 | p[skip + 9];
-		p += skip + 10;
-		if (p + len > eom) {
-			errno = EMSGSIZE;
-			break;
-		}
-		/* Skip entries of the wrong class and type. */
-		if (class != qclass || type != T_TXT) {
-			p += len;
-			continue;
-		}
-		/* Allocate space for this answer. */
-		list[j] = malloc((size_t)len);
-		if (!list[j]) {
-			errno = ENOMEM;
-			break;
-		}
-		dst = list[j++];
-
-		/* Copy answer data into the allocated area. */
-		eor = p + len;
-		while (p < eor) {
-			n = (unsigned char) *p++;
-			if (p + n > eor) {
-				errno = EMSGSIZE;
-				break;
-			}
-			memcpy(dst, p, (size_t)n);
-			p += n;
-			dst += n;
-		}
-		if (p < eor) {
-			errno = EMSGSIZE;
-			break;
-		}
-		*dst = 0;
-	}
-
-		/*
-		 * If we didn't terminate the loop normally, something
-		 * went wrong.
-		 */
-	if (i < ancount) {
-		for (i = 0; i < j; i++)
-			free(list[i]);
-		free(list);
-		return NULL;
-	}
-	if (j == 0) {
-		errno = ENOENT;
-		free(list);
-		return NULL;
-	}
-	list[j] = NULL;
-	return list;
-}
-
-		/*
-		 *	COMPATIBILITY FUNCTIONS
-		 */
-
-static int	  inited = 0;
-static void	 *context;
-static int	  errval = HES_ER_UNINIT;
-
-int
-hes_init()
-{
-	init_context();
-	return errval;
-}
-
-char *
-hes_to_bind(name, type)
-	const char	*name;
-	const char	*type;
-{
-	static	char	*bindname;
-	if (init_context() < 0)
-		return NULL;
-	if (bindname)
-		free(bindname);
-	bindname = hesiod_to_bind(context, name, type);
-	if (!bindname)
-		translate_errors();
-	return bindname;
-}
-
-char **
-hes_resolve(name, type)
-	const char	*name;
-	const char	*type;
-{
-	static char	**list;
-
-	if (init_context() < 0)
-		return NULL;
-
-	/*
-	 * In the old Hesiod interface, the caller was responsible for
-	 * freeing the returned strings but not the vector of strings itself.
-	 */
-	if (list)
-		free(list);
-
-	list = hesiod_resolve(context, name, type);
-	if (!list)
-		translate_errors();
-	return list;
-}
-
-int
-hes_error()
-{
-	return errval;
-}
-
-void
-hes_free(hp)
-	char **hp;
-{
-	hesiod_free_list(context, hp);
-}
-
-static int
-init_context()
-{
-	if (!inited) {
-		inited = 1;
-		if (hesiod_init(&context) < 0) {
-			errval = HES_ER_CONFIG;
-			return -1;
-		}
-		errval = HES_ER_OK;
-	}
-	return 0;
-}
-
-static void
-translate_errors()
-{
-	switch (errno) {
-	case ENOENT:
-		errval = HES_ER_NOTFOUND;
-		break;
-	case ECONNREFUSED:
-	case EMSGSIZE:
-		errval = HES_ER_NET;
-		break;
-	case ENOMEM:
-	default:
-		/* Not a good match, but the best we can do. */
-		errval = HES_ER_CONFIG;
-		break;
-	}
-}
diff --git a/newlib/libc/sys/linux/net/if_indextoname.3 b/newlib/libc/sys/linux/net/if_indextoname.3
deleted file mode 100644
index 4b5bff5..0000000
--- a/newlib/libc/sys/linux/net/if_indextoname.3
+++ /dev/null
@@ -1,142 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
-.\"	$FreeBSD: src/lib/libc/net/if_indextoname.3,v 1.7 2001/10/01 16:08:55 ru Exp $
-.\"
-.Dd May 21, 1998
-.Dt IF_NAMETOINDEX 3
-.Os
-.Sh NAME
-.Nm if_nametoindex ,
-.Nm if_indextoname ,
-.Nm if_nameindex ,
-.Nm if_freenameindex
-.Nd convert interface index to name, and vice versa
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In net/if.h
-.Ft "unsigned int"
-.Fn if_nametoindex "const char *ifname"
-.Ft "char *"
-.Fn if_indextoname "unsigned int ifindex" "char *ifname"
-.Ft "struct if_nameindex *"
-.Fn if_nameindex "void"
-.Ft "void"
-.Fn if_freenameindex "struct if_nameindex *ptr"
-.Sh DESCRIPTION
-The functions map interface index to readable interface name
-(such as
-.Dq Li lo0 ) ,
-and vice versa.
-.Pp
-.Fn if_nametoindex
-converts readable interface name to interface index
-.Pp positive integer value .
-If the specified interface does not exist, 0 will be returned.
-.Pp
-.Fn if_indextoname
-converts interface index to readable interface name.
-The
-.Fa ifname
-argument must point to a buffer of at least
-.Dv IF_NAMESIZE
-bytes into which the interface name corresponding to the specified index is
-returned.
-.Dv ( IF_NAMESIZE
-is also defined in
-.Aq Pa net/if.h
-and its value includes a terminating null byte at the end of the
-interface name.)
-This pointer is also the return value of the function.
-If there is no interface corresponding to the specified index,
-.Dv NULL
-is returned.
-.Pp
-.Fn if_nameindex
-returns an array of
-.Fa if_nameindex
-structures.
-.Fa if_nametoindex
-is also defined in
-.Aq Pa net/if.h ,
-and is as follows:
-.Bd -literal -offset
-struct if_nameindex {
-    unsigned int   if_index;  /* 1, 2, ... */
-    char          *if_name;   /* null terminated name: "le0", ... */
-};
-.Ed
-.Pp
-The end of the array of structures is indicated by a structure with
-an
-.Fa if_index
-of 0 and an
-.Fa if_name
-of
-.Dv NULL .
-The function returns a
-.Dv NULL
-pointer upon an error.
-The memory used for this array of structures along with the interface
-names pointed to by the
-.Fa if_name
-members is obtained dynamically.
-This memory is freed by the
-.Fn if_freenameindex
-function.
-.Pp
-.Fn if_freenameindex
-takes a pointer that was returned by
-.Fn if_nameindex
-as argument
-.Pq Fa ptr ,
-and it reclaims the region allocated.
-.Sh DIAGNOSTICS
-.Fn if_nametoindex
-returns 0 on error, positive integer on success.
-.Fn if_indextoname
-and
-.Fn if_nameindex
-return
-.Dv NULL
-on errors.
-.Sh SEE ALSO
-R. Gilligan, S.  Thomson, J. Bound, and W. Stevens,
-``Basic Socket Interface Extensions for IPv6,'' RFC2553, March 1999.
-.Sh HISTORY
-The implementation first appeared in WIDE Hydrangea IPv6 protocol stack kit.
-.Sh STANDARDS
-These functions are defined in ``Basic Socket Interface Extensions for IPv6''
-(RFC2533).
diff --git a/newlib/libc/sys/linux/net/ifname.c b/newlib/libc/sys/linux/net/ifname.c
deleted file mode 100644
index b7975bc..0000000
--- a/newlib/libc/sys/linux/net/ifname.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*	$KAME: ifname.c,v 1.4 2001/08/20 02:32:40 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/types.h>
-
-/*
- * TODO:
- * - prototype defs into arpa/inet.h, not net/if.h (bsd-api-new-02)
- */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <net/if_dl.h>
-
-#include <unistd.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define ROUNDUP(a) \
-	((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-#define ADVANCE(x, n)
-
-static unsigned int
-if_onametoindex(ifname)
-	const char *ifname;
-{
-	struct if_nameindex *iff = if_nameindex(), *ifx;
-	int ret;
-
-	if (iff == NULL) return 0;
-	ifx = iff;
-	while (ifx->if_name != NULL) {
-		if (strcmp(ifx->if_name, ifname) == 0) {
-			ret = ifx->if_index;
-			if_freenameindex(iff);
-			return ret;
-		}
-		ifx++;
-	}
-	if_freenameindex(iff);
-	errno = ENXIO;
-	return 0;
-}
- 
-unsigned int
-if_nametoindex(ifname)
-	const char *ifname;
-{
-	int s;
-	struct ifreq ifr;
-
-	s = socket(AF_INET, SOCK_DGRAM, 0);
-	if (s == -1)
-		return (0);
-	strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-	if (ioctl(s, SIOCGIFINDEX, &ifr) == -1) {
-		close (s);
-		return (if_onametoindex(ifname));
-	}
-	close(s);
-	return (ifr.ifr_index);
-}
-
-char *
-if_indextoname(ifindex, ifname)
-	unsigned int ifindex;
-	char *ifname; /* at least IF_NAMESIZE */
-{
-	struct if_nameindex *iff = if_nameindex(), *ifx;
-	char *cp, *dp;
-
-	if (iff == NULL) return NULL;
-	ifx = iff;
-	while (ifx->if_index != 0) {
-		if (ifx->if_index == ifindex) {
-			cp = ifname;
-			dp = ifx->if_name;
-			while ((*cp++ = *dp++)) ;
-			if_freenameindex(iff);
-			return (ifname);
-		}
-		ifx++;
-	}
-	if_freenameindex(iff);
-	errno = ENXIO;
-	return NULL;
-}
-
-struct if_nameindex *
-if_nameindex()
-{
-	size_t needed;
-	int mib[6], i, ifn = 0, off = 0, hlen;
-	char *buf = NULL, *lim, *next, *cp, *ifbuf = NULL;
-	struct rt_msghdr *rtm;
-	struct if_msghdr *ifm;
-	struct sockaddr *sa;
-	struct if_nameindex *ret = NULL;
-	static int ifxs = 64;	/* initial upper limit */
-	struct _ifx {
-		int if_index;
-		int if_off;
-	} *ifx = NULL;
-
-	mib[0] = CTL_NET;
-	mib[1] = PF_ROUTE;
-	mib[2] = 0;		/* protocol */
-	mib[3] = 0;		/* wildcard address family */
-	mib[4] = 0;
-	mib[5] = 0;		/* no flags */
-	if (__sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-		return NULL;
-	if ((buf = malloc(needed)) == NULL) {
-		errno = ENOMEM;
-		goto end;
-	}
-	/* XXX: we may have allocated too much than necessary */
-	if ((ifbuf = malloc(needed)) == NULL) {
-		errno = ENOMEM;
-		goto end;
-	}
-	if ((ifx = (struct _ifx *)malloc(sizeof(*ifx) * ifxs)) == NULL) {
-		errno = ENOMEM;
-		goto end;
-	}
-	if (__sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
-		/* sysctl has set errno */
-		goto end;
-	}
-	lim = buf + needed;
-	for (next = buf; next < lim; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)next;
-		if (rtm->rtm_version != RTM_VERSION) {
-			errno = EPROTONOSUPPORT;
-			goto end;
-		}
-		switch (rtm->rtm_type) {
-		case RTM_IFINFO:
-			ifm = (struct if_msghdr *)rtm;
-			ifx[ifn].if_index = ifm->ifm_index;
-			ifx[ifn].if_off = off;
-			cp = (char *)(ifm + 1);
-			for (i = 1; i; i <<= 1) {
-				if (i & ifm->ifm_addrs) {
-					sa = (struct sockaddr *)cp;
-					ADVANCE(cp, sa);
-				}
-			}
-			if (++ifn == ifxs) {
-				/* we need more memory */
-				struct _ifx *newifx;
-
-				ifxs *= 2;
-				if ((newifx = (struct _ifx *)malloc(sizeof(*newifx) * ifxs)) == NULL) {
-					errno = ENOMEM;
-					goto end;
-				}
-
-				/* copy and free old data */
-				memcpy(newifx, ifx, (sizeof(*ifx) * ifxs) / 2);
-				free(ifx);
-				ifx = newifx;
-			}
-		}
-	}
-	hlen = sizeof(struct if_nameindex) * (ifn + 1);
-	if ((cp = (char *)malloc(hlen + off)) == NULL) {
-		errno = ENOMEM;
-		goto end;
-	}
-	bcopy(ifbuf, cp + hlen, off);
-	ret = (struct if_nameindex *)cp;
-	for (i = 0; i < ifn; i++) {
-		ret[i].if_index = ifx[i].if_index;
-		ret[i].if_name = cp + hlen + ifx[i].if_off;
-	}
-	ret[ifn].if_index = 0;
-	ret[ifn].if_name = NULL;
-
-  end:
-	if (buf) free(buf);
-	if (ifbuf) free(ifbuf);
-	if (ifx) free(ifx);
-
-	return ret;
-}
-
-void if_freenameindex(ptr)
-	struct if_nameindex *ptr;
-{
-	free(ptr);
-}
diff --git a/newlib/libc/sys/linux/net/inet.3 b/newlib/libc/sys/linux/net/inet.3
deleted file mode 100644
index 7a6fcf3..0000000
--- a/newlib/libc/sys/linux/net/inet.3
+++ /dev/null
@@ -1,271 +0,0 @@
-.\" Copyright (c) 1983, 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)inet.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.22 2001/12/01 03:43:01 mike Exp $
-.\"
-.Dd June 17, 1996
-.Dt INET 3
-.Os
-.Sh NAME
-.Nm inet_aton ,
-.Nm inet_addr ,
-.Nm inet_network ,
-.Nm inet_ntoa ,
-.Nm inet_ntop ,
-.Nm inet_pton ,
-.Nm inet_makeaddr ,
-.Nm inet_lnaof ,
-.Nm inet_netof
-.Nd Internet address manipulation routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/in.h
-.In arpa/inet.h
-.Ft int
-.Fn inet_aton "const char *cp" "struct in_addr *pin"
-.Ft in_addr_t
-.Fn inet_addr "const char *cp"
-.Ft in_addr_t
-.Fn inet_network "const char *cp"
-.Ft char *
-.Fn inet_ntoa "struct in_addr in"
-.Ft const char *
-.Fn inet_ntop "int af" "const void *src" "char *dst" "socklen_t size"
-.Ft int
-.Fn inet_pton "int af" "const char *src" "void *dst"
-.Ft struct in_addr
-.Fn inet_makeaddr "in_addr_t net" "in_addr_t lna"
-.Ft in_addr_t
-.Fn inet_lnaof "struct in_addr in"
-.Ft in_addr_t
-.Fn inet_netof "struct in_addr in"
-.Sh DESCRIPTION
-The routines
-.Fn inet_aton ,
-.Fn inet_addr
-and
-.Fn inet_network
-interpret character strings representing
-numbers expressed in the Internet standard
-.Ql .\&
-notation.
-.Pp
-The
-.Fn inet_pton
-function converts a presentation format address (that is, printable form
-as held in a character string) to network format (usually a
-.Ft struct in_addr
-or some other internal binary representation, in network byte order).
-It returns 1 if the address was valid for the specified address family, or
-0 if the address wasn't parseable in the specified address family, or -1
-if some system error occurred (in which case
-.Va errno
-will have been set).
-This function is presently valid for
-.Dv AF_INET
-and
-.Dv AF_INET6 .
-.Pp
-The
-.Fn inet_aton
-routine interprets the specified character string as an Internet address,
-placing the address into the structure provided.
-It returns 1 if the string was successfully interpreted,
-or 0 if the string is invalid.
-The
-.Fn inet_addr
-and
-.Fn inet_network
-functions return numbers suitable for use
-as Internet addresses and Internet network
-numbers, respectively.
-.Pp
-The function
-.Fn inet_ntop
-converts an address from network format (usually a
-.Ft struct in_addr
-or some other binary form, in network byte order) to presentation format
-(suitable for external display purposes).
-It returns NULL if a system error occurs (in which case,
-.Va errno
-will have been set), or it returns a pointer to the destination string.
-This function is presently valid for
-.Dv AF_INET
-and
-.Dv AF_INET6 .
-.Pp
-The routine
-.Fn inet_ntoa
-takes an Internet address and returns an
-.Tn ASCII
-string representing the address in
-.Ql .\&
-notation.  The routine
-.Fn inet_makeaddr
-takes an Internet network number and a local
-network address and constructs an Internet address
-from it.  The routines
-.Fn inet_netof
-and
-.Fn inet_lnaof
-break apart Internet host addresses, returning
-the network number and local network address part,
-respectively.
-.Pp
-All Internet addresses are returned in network
-order (bytes ordered from left to right).
-All network numbers and local address parts are
-returned as machine byte order integer values.
-.Sh INTERNET ADDRESSES
-Values specified using the
-.Ql .\&
-notation take one
-of the following forms:
-.Bd -literal -offset indent
-a.b.c.d
-a.b.c
-a.b
-a
-.Ed
-.Pp
-When four parts are specified, each is interpreted
-as a byte of data and assigned, from left to right,
-to the four bytes of an Internet address.  Note
-that when an Internet address is viewed as a 32-bit
-integer quantity on the
-.Tn VAX
-the bytes referred to
-above appear as
-.Dq Li d.c.b.a .
-That is,
-.Tn VAX
-bytes are
-ordered from right to left.
-.Pp
-When a three part address is specified, the last
-part is interpreted as a 16-bit quantity and placed
-in the right-most two bytes of the network address.
-This makes the three part address format convenient
-for specifying Class B network addresses as
-.Dq Li 128.net.host .
-.Pp
-When a two part address is supplied, the last part
-is interpreted as a 24-bit quantity and placed in
-the right most three bytes of the network address.
-This makes the two part address format convenient
-for specifying Class A network addresses as
-.Dq Li net.host .
-.Pp
-When only one part is given, the value is stored
-directly in the network address without any byte
-rearrangement.
-.Pp
-All numbers supplied as
-.Dq parts
-in a
-.Ql .\&
-notation
-may be decimal, octal, or hexadecimal, as specified
-in the C language (i.e., a leading 0x or 0X implies
-hexadecimal; otherwise, a leading 0 implies octal;
-otherwise, the number is interpreted as decimal).
-.Pp
-The
-.Fn inet_aton
-and
-.Fn inet_ntoa
-functions are semi-deprecated in favor of the
-.Xr addr2ascii 3
-family.  However, since those functions are not yet widely implemented,
-portable programs cannot rely on their presence and will continue
-to use the
-.Xr inet 3
-functions for some time.
-.Sh DIAGNOSTICS
-The constant
-.Dv INADDR_NONE
-is returned by
-.Fn inet_addr
-and
-.Fn inet_network
-for malformed requests.
-.Sh SEE ALSO
-.Xr addr2ascii 3 ,
-.Xr byteorder 3 ,
-.Xr gethostbyname 3 ,
-.Xr getnetent 3 ,
-.Xr inet_net 3 ,
-.Xr hosts 5 ,
-.Xr networks 5
-.Rs
-.%R RFC
-.%N 2373
-.%D July 1998
-.%T "IP Version 6 Addressing Architecture"
-.Re
-.Sh STANDARDS
-The
-.Fn inet_ntop
-and
-.Fn inet_pton
-functions conform to
-.St -xns5.2 .
-Note that
-.Fn inet_pton
-does not accept 1-, 2-, or 3-part dotted addresses; all four parts
-must be specified and are interpreted only as decimal values.
-This is a narrower input set than that accepted by
-.Fn inet_aton .
-.Sh HISTORY
-These
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-The value
-.Dv INADDR_NONE
-(0xffffffff) is a valid broadcast address, but
-.Fn inet_addr
-cannot return that value without indicating failure.
-The newer
-.Fn inet_aton
-function does not share this problem.
-The problem of host byte ordering versus network byte ordering is
-confusing.
-The string returned by
-.Fn inet_ntoa
-resides in a static memory area.
-.Pp
-Inet_addr should return a
-.Fa struct in_addr .
diff --git a/newlib/libc/sys/linux/net/inet6_option_space.3 b/newlib/libc/sys/linux/net/inet6_option_space.3
deleted file mode 100644
index 328c70f..0000000
--- a/newlib/libc/sys/linux/net/inet6_option_space.3
+++ /dev/null
@@ -1,445 +0,0 @@
-.\" Copyright (c) 1983, 1987, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     $Id$
-.\" $FreeBSD: src/lib/libc/net/inet6_option_space.3,v 1.8 2001/10/01 16:08:55 ru Exp $
-.\"
-.Dd December 10, 1999
-.Dt INET6_OPTION_SPACE 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_option_space ,
-.Nm inet6_option_init ,
-.Nm inet6_option_append ,
-.Nm inet6_option_alloc ,
-.Nm inet6_option_next ,
-.Nm inet6_option_find
-.Nd IPv6 Hop-by-Hop and Destination Options manipulation
-.\"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In netinet/in.h
-.Ft "int"
-.Fn inet6_option_space "int nbytes"
-.Ft "int"
-.Fn inet6_option_init "void *bp" "struct cmsghdr **cmsgp" "int type"
-.Ft "int"
-.Fn inet6_option_append "struct cmsghdr *cmsg" "const u_int8_t *typep" "int multx" "int plusy"
-.Ft "u_int8_t *"
-.Fn inet6_option_alloc "struct cmsghdr *cmsg" "int datalen" "int multx" "int plusy"
-.Ft "int"
-.Fn inet6_option_next "const struct cmsghdr *cmsg" "u_int8_t **tptrp"
-.Ft "int"
-.Fn inet6_option_find "const struct cmsghdr *cmsg" "u_int8_t **tptrp" "int type"
-.\"
-.Sh DESCRIPTION
-.\"
-Building and parsing the Hop-by-Hop and Destination options is
-complicated due to alignment constranints, padding and
-ancillary data manipulation.
-RFC2292 defines a set of functions to help the application.
-The function prototypes for
-these functions are all in the
-.Aq Li netinet/in.h
-header.
-.\"
-.Ss inet6_option_space
-.Fn inet6_option_space
-returns the number of bytes required to hold an option when it is stored as
-ancillary data, including the
-.Li cmsghdr
-structure at the beginning,
-and any padding at the end
-(to make its size a multiple of 8 bytes).
-The argument is the size of the structure defining the option,
-which must include any pad bytes at the beginning
-(the value
-.Li y
-in the alignment term
-.Dq Li "xn + y" ) ,
-the type byte, the length byte, and the option data.
-.Pp
-Note: If multiple options are stored in a single ancillary data
-object, which is the recommended technique, this function
-overestimates the amount of space required by the size of
-.Li N-1
-.Li cmsghdr
-structures,
-where
-.Li N
-is the number of options to be stored in the object.
-This is of little consequence, since it is assumed that most
-Hop-by-Hop option headers and Destination option headers carry only
-one option
-(appendix B of [RFC-2460]).
-.\"
-.Ss inet6_option_init
-.Fn inet6_option_init
-is called once per ancillary data object that will
-contain either Hop-by-Hop or Destination options.
-It returns
-.Li 0
-on success or
-.Li -1
-on an error.
-.Pp
-.Fa bp
-is a pointer to previously allocated space that will contain the
-ancillary data object.
-It must be large enough to contain all the
-individual options to be added by later calls to
-.Fn inet6_option_append
-and
-.Fn inet6_option_alloc .
-.Pp
-.Fa cmsgp
-is a pointer to a pointer to a
-.Li cmsghdr
-structure.
-.Fa *cmsgp
-is initialized by this function to point to the
-.Li cmsghdr
-structure constructed by this function in the buffer pointed to by
-.Fa bp .
-.Pp
-.Fa type
-is either
-.Dv IPV6_HOPOPTS
-or
-.Dv IPV6_DSTOPTS .
-This
-.Fa type
-is stored in the
-.Li cmsg_type
-member of the
-.Li cmsghdr
-structure pointed to by
-.Fa *cmsgp .
-.\"
-.Ss inet6_option_append
-This function appends a Hop-by-Hop option or a Destination option
-into an ancillary data object that has been initialized by
-.Fn inet6_option_init .
-This function returns
-.Li 0
-if it succeeds or
-.Li -1
-on an error.
-.Pp
-.Fa cmsg
-is a pointer to the
-.Li cmsghdr
-structure that must have been
-initialized by
-.Fn inet6_option_init .
-.Pp
-.Fa typep
-is a pointer to the 8-bit option type.
-It is assumed that this
-field is immediately followed by the 8-bit option data length field,
-which is then followed immediately by the option data.
-The caller
-initializes these three fields
-(the type-length-value, or TLV)
-before calling this function.
-.Pp
-The option type must have a value from
-.Li 2
-to
-.Li 255 ,
-inclusive.
-.Li ( 0
-and
-.Li 1
-are reserved for the
-.Li Pad1
-and
-.Li PadN
-options, respectively.)
-.Pp
-The option data length must have a value between
-.Li 0
-and
-.Li 255 ,
-inclusive, and is the length of the option data that follows.
-.Pp
-.Fa multx
-is the value
-.Li x
-in the alignment term
-.Dq Li xn + y .
-It must have a value of
-.Li 1 ,
-.Li 2 ,
-.Li 4 ,
-or
-.Li 8 .
-.Pp
-.Fa plusy
-is the value
-.Li y
-in the alignment term
-.Dq Li xn + y .
-It must have a value between
-.Li 0
-and
-.Li 7 ,
-inclusive.
-.\"
-.Ss inet6_option_alloc
-This function appends a Hop-by-Hop option or a Destination option
-into an ancillary data object that has been initialized by
-.Fn inet6_option_init .
-This function returns a pointer to the 8-bit
-option type field that starts the option on success, or
-.Dv NULL
-on an error.
-.Pp
-The difference between this function and
-.Fn inet6_option_append
-is that the latter copies the contents of a previously built option into
-the ancillary data object while the current function returns a
-pointer to the space in the data object where the option's TLV must
-then be built by the caller.
-.Pp
-.Fa cmsg
-is a pointer to the
-.Li cmsghdr
-structure that must have been
-initialized by
-.Fn inet6_option_init .
-.Pp
-.Fa datalen
-is the value of the option data length byte for this option.
-This value is required as an argument to allow the function to
-determine if padding must be appended at the end of the option.
-(The
-.Fn inet6_option_append
-function does not need a data length argument
-since the option data length must already be stored by the caller.)
-.Pp
-.Fa multx
-is the value
-.Li x
-in the alignment term
-.Dq Li xn + y .
-It must have a value of
-.Li 1 ,
-.Li 2 ,
-.Li 4 ,
-or
-.Li 8 .
-.Pp
-.Fa plusy
-is the value
-.Li y
-in the alignment term
-.Dq Li xn + y .
-It must have a value between
-.Li 0
-and
-.Li 7 ,
-inclusive.
-.\"
-.Ss inet6_option_next
-This function processes the next Hop-by-Hop option or Destination
-option in an ancillary data object.
-If another option remains to be
-processed, the return value of the function is
-.Li 0
-and
-.Fa *tptrp
-points to
-the 8-bit option type field
-(which is followed by the 8-bit option
-data length, followed by the option data).
-If no more options remain
-to be processed, the return value is
-.Li -1
-and
-.Fa *tptrp
-is
-.Dv NULL .
-If an error occurs, the return value is
-.Li -1
-and
-.Fa *tptrp
-is not
-.Dv NULL .
-.Pp
-.Fa cmsg
-is a pointer to
-.Li cmsghdr
-structure of which
-.Li cmsg_level
-equals
-.Dv IPPROTO_IPV6
-and
-.Li cmsg_type
-equals either
-.Dv IPV6_HOPOPTS
-or
-.Dv IPV6_DSTOPTS .
-.Pp
-.Fa tptrp
-is a pointer to a pointer to an 8-bit byte and
-.Fa *tptrp
-is used
-by the function to remember its place in the ancillary data object
-each time the function is called.
-The first time this function is
-called for a given ancillary data object,
-.Fa *tptrp
-must be set to
-.Dv NULL .
-.Pp
-Each time this function returns success,
-.Fa *tptrp
-points to the 8-bit
-option type field for the next option to be processed.
-.\"
-.Ss inet6_option_find
-This function is similar to the previously described
-.Fn inet6_option_next
-function, except this function lets the caller
-specify the option type to be searched for, instead of always
-returning the next option in the ancillary data object.
-.Fa cmsg
-is a
-pointer to
-.Li cmsghdr
-structure of which
-.Li cmsg_level
-equals
-.Dv IPPROTO_IPV6
-and
-.Li cmsg_type
-equals either
-.Dv IPV6_HOPOPTS
-or
-.Dv IPV6_DSTOPTS .
-.Pp
-.Fa tptrp
-is a pointer to a pointer to an 8-bit byte and
-.Fa *tptrp
-is used
-by the function to remember its place in the ancillary data object
-each time the function is called.
-The first time this function is
-called for a given ancillary data object,
-.Fa *tptrp
-must be set to
-.Dv NULL .
-.Pa
-This function starts searching for an option of the specified type
-beginning after the value of
-.Fa *tptrp .
-If an option of the specified
-type is located, this function returns
-.Li 0
-and
-.Fa *tptrp
-points to the 8-
-bit option type field for the option of the specified type.
-If an
-option of the specified type is not located, the return value is
-.Li -1
-and
-.Fa *tptrp
-is
-.Dv NULL .
-If an error occurs, the return value is
-.Li -1
-and
-.Fa *tptrp
-is not
-.Dv NULL .
-.\"
-.Sh DIAGNOSTICS
-.Fn inet6_option_init
-and
-.Fn inet6_option_append
-return
-.Li 0
-on success or
-.Li -1
-on an error.
-.Pp
-.Fn inet6_option_alloc
-returns
-.Dv NULL
-on an error.
-.Pp
-On errors,
-.Fn inet6_option_next
-and
-.Fn inet6_option_find
-return
-.Li -1
-setting
-.Fa *tptrp
-to non
-.Dv NULL
-value.
-.\"
-.Sh EXAMPLES
-RFC2292 gives comprehensive examples in chapter 6.
-.\"
-.Sh SEE ALSO
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%T "Advanced Sockets API for IPv6"
-.%N RFC2292
-.%D February 1998
-.Re
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC2460
-.%D December 1998
-.Re
-.\"
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
-.\"
-.Sh STANDARDS
-The functions
-are documented in
-.Dq Advanced Sockets API for IPv6
-(RFC2292).
-.\"
-.Sh BUGS
-The text was shamelessly copied from RFC2292.
diff --git a/newlib/libc/sys/linux/net/inet6_rthdr_space.3 b/newlib/libc/sys/linux/net/inet6_rthdr_space.3
deleted file mode 100644
index d2c575d..0000000
--- a/newlib/libc/sys/linux/net/inet6_rthdr_space.3
+++ /dev/null
@@ -1,323 +0,0 @@
-.\" Copyright (c) 1983, 1987, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     $Id$
-.\" $FreeBSD: src/lib/libc/net/inet6_rthdr_space.3,v 1.8 2001/10/01 16:08:55 ru Exp $
-.\"
-.Dd December 10, 1999
-.Dt INET6_RTHDR_SPACE 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_rthdr_space ,
-.Nm inet6_rthdr_init ,
-.Nm inet6_rthdr_add ,
-.Nm inet6_rthdr_lasthop ,
-.Nm inet6_rthdr_reverse ,
-.Nm inet6_rthdr_segments ,
-.Nm inet6_rthdr_getaddr ,
-.Nm inet6_rthdr_getflags
-.Nd IPv6 Routing Header Options manipulation
-.\"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In netinet/in.h
-.Ft size_t
-.Fn inet6_rthdr_space "int type" "int segments"
-.Ft "struct cmsghdr *"
-.Fn inet6_rthdr_init "void *bp" "int type"
-.Ft int
-.Fn inet6_rthdr_add "struct cmsghdr *cmsg" "const struct in6_addr *addr" "unsigned int flags"
-.Ft int
-.Fn inet6_rthdr_lasthop "struct cmsghdr *cmsg" "unsigned int flags"
-.Ft int
-.Fn inet6_rthdr_reverse "const struct cmsghdr *in" "struct cmsghdr *out"
-.Ft int
-.Fn inet6_rthdr_segments "const struct cmsghdr *cmsg"
-.Ft "struct in6_addr *"
-.Fn inet6_rthdr_getaddr "struct cmsghdr *cmsg" "int index"
-.Ft int
-.Fn inet6_rthdr_getflags "const struct cmsghdr *cmsg" "int index"
-.\"
-.Sh DESCRIPTION
-RFC2292 IPv6 advanced API defines eight
-functions that the application calls to build and examine a Routing
-header.  Four functions build a Routing header:
-.Bl -hang
-.It Fn inet6_rthdr_space
-return #bytes required for ancillary data
-.It Fn inet6_rthdr_init
-initialize ancillary data for Routing header
-.It Fn inet6_rthdr_add
-add IPv6 address & flags to Routing header
-.It Fn inet6_rthdr_lasthop
-specify the flags for the final hop
-.El
-.Pp
-Four functions deal with a returned Routing header:
-.Bl -hang
-.It Fn inet6_rthdr_reverse
-reverse a Routing header
-.It Fn inet6_rthdr_segments
-return #segments in a Routing header
-.It Fn inet6_rthdr_getaddr
-fetch one address from a Routing header
-.It Fn inet6_rthdr_getflags
-fetch one flag from a Routing header
-.El
-.Pp
-The function prototypes for these functions are all in the
-.Aq Li netinet/in.h
-header.
-.\"
-.Ss inet6_rthdr_space
-This function returns the number of bytes required to hold a Routing
-header of the specified
-.Fa type
-containing the specified number of
-.Fa segments
-(addresses).
-For an IPv6 Type 0 Routing header, the number
-of segments must be between 1 and 23, inclusive.  The return value
-includes the size of the cmsghdr structure that precedes the Routing
-header, and any required padding.
-.Pp
-If the return value is 0, then either the type of the Routing header
-is not supported by this implementation or the number of segments is
-invalid for this type of Routing header.
-.Pp
-Note: This function returns the size but does not allocate the space
-required for the ancillary data.
-This allows an application to
-allocate a larger buffer, if other ancillary data objects are
-desired, since all the ancillary data objects must be specified to
-.Xr sendmsg 2
-as a single
-.Li msg_control
-buffer.
-.\"
-.Ss inet6_rthdr_init
-This function initializes the buffer pointed to by
-.Fa bp
-to contain a
-.Li cmsghdr
-structure followed by a Routing header of the specified
-.Fa type .
-The
-.Li cmsg_len
-member of the
-.Li cmsghdr
-structure is initialized to the
-size of the structure plus the amount of space required by the
-Routing header.
-The
-.Li cmsg_level
-and
-.Li cmsg_type
-members are also initialized as required.
-.Pp
-The caller must allocate the buffer and its size can be determined by
-calling
-.Fn inet6_rthdr_space .
-.Pp
-Upon success the return value is the pointer to the
-.Li cmsghdr
-structure, and this is then used as the first argument to the next
-two functions.
-Upon an error the return value is
-.Dv NULL .
-.\"
-.Ss inet6_rthdr_add
-This function adds the address pointed to by
-.Fa addr
-to the end of the
-Routing header being constructed and sets the type of this hop to the
-value of
-.Fa flags .
-For an IPv6 Type 0 Routing header,
-.Fa flags
-must be
-either
-.Dv IPV6_RTHDR_LOOSE
-or
-.Dv IPV6_RTHDR_STRICT .
-.Pp
-If successful, the
-.Li cmsg_len
-member of the
-.Li cmsghdr
-structure is
-updated to account for the new address in the Routing header and the
-return value of the function is 0.
-Upon an error the return value of
-the function is -1.
-.\"
-.Ss inet6_rthdr_lasthop
-This function specifies the Strict/Loose flag for the final hop of a
-Routing header.
-For an IPv6 Type 0 Routing header,
-.Fa flags
-must be either
-.Dv IPV6_RTHDR_LOOSE
-or
-.Dv IPV6_RTHDR_STRICT .
-.Pp
-The return value of the function is 0 upon success, or -1 upon an error.
-.Pp
-Notice that a Routing header specifying
-.Li N
-intermediate nodes requires
-.Li N+1
-Strict/Loose flags.
-This requires
-.Li N
-calls to
-.Fn inet6_rthdr_add
-followed by one call to
-.Fn inet6_rthdr_lasthop .
-.\"
-.Ss inet6_rthdr_reverse
-This function is not yet implemented.
-When implemented, this should behave as follows.
-.Pp
-This function takes a Routing header that was received as ancillary
-data
-(pointed to by the first argument,
-.Fa in )
-and writes a new Routing
-header that sends datagrams along the reverse of that route.
-Both
-arguments are allowed to point to the same buffer
-(that is, the reversal can occur in place).
-.Pp
-The return value of the function is 0 on success, or -1 upon an
-error.
-.\"
-.Ss inet6_rthdr_segments
-This function returns the number of segments
-(addresses)
-contained in
-the Routing header described by
-.Fa cmsg .
-On success the return value is
-between 1 and 23, inclusive.
-The return value of the function is -1 upon an error.
-.\"
-.Ss inet6_rthdr_getaddr
-This function returns a pointer to the IPv6 address specified by
-.Fa index
-(which must have a value between 1 and the value returned by
-.Fn inet6_rthdr_segments )
-in the Routing header described by
-.Fa cmsg .
-An
-application should first call
-.Fn inet6_rthdr_segments
-to obtain the number of segments in the Routing header.
-.Pp
-Upon an error the return value of the function is
-.Dv NULL .
-.\"
-.Ss inet6_rthdr_getflags
-This function returns the flags value specified by
-.Fa index
-(which must
-have a value between 0 and the value returned by
-.Fn inet6_rthdr_segments )
-in the Routing header described by
-.Fa cmsg .
-For an IPv6 Type 0 Routing header the return value will be either
-.Dv IPV6_RTHDR_LOOSE
-or
-.Dv IPV6_RTHDR_STRICT .
-.Pp
-Upon an error the return value of the function is -1.
-.Pp
-Note: Addresses are indexed starting at 1, and flags starting at 0,
-to maintain consistency with the terminology and figures in RFC2460.
-.\"
-.Sh DIAGNOSTICS
-.Fn inet6_rthdr_space
-returns 0 on errors.
-.Pp
-.Fn inet6_rthdr_add ,
-.Fn inet6_rthdr_lasthop
-and
-.Fn inet6_rthdr_reverse
-return 0 on success, and returns -1 on error.
-.Pp
-.Fn inet6_rthdr_init
-and
-.Fn inet6_rthdr_getaddr
-return
-.Dv NULL
-on error.
-.Pp
-.Fn inet6_rthdr_segments
-and
-.Fn inet6_rthdr_getflags
-return -1 on error.
-.\"
-.Sh EXAMPLES
-RFC2292 gives comprehensive examples in chapter 8.
-.\"
-.Sh SEE ALSO
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%T "Advanced Sockets API for IPv6"
-.%N RFC2292
-.%D February 1998
-.Re
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC2460
-.%D December 1998
-.Re
-.\"
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
-.\"
-.Sh STANDARDS
-The functions
-are documented in
-.Dq Advanced Sockets API for IPv6
-(RFC2292).
-.\"
-.Sh BUGS
-The text was shamelessly copied from RFC2292.
-.Pp
-.Fn inet6_rthdr_reverse
-is not implemented yet.
diff --git a/newlib/libc/sys/linux/net/inet_addr.c b/newlib/libc/sys/linux/net/inet_addr.c
deleted file mode 100644
index 874ca80..0000000
--- a/newlib/libc/sys/linux/net/inet_addr.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*	$KAME: inet_addr.c,v 1.5 2001/08/20 02:32:40 itojun Exp $	*/
-
-/*
- * ++Copyright++ 1983, 1990, 1993
- * -
- * Copyright (c) 1983, 1990, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/param.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-/*
- * ASCII internet address interpretation routine.
- * The value returned is in network order.
- */
-in_addr_t		/* XXX should be struct in_addr :( */
-inet_addr(cp)
-	const char *cp;
-{
-	struct in_addr val;
-
-	if (inet_aton(cp, &val))
-		return (val.s_addr);
-	return (INADDR_NONE);
-}
-
-/* 
- * Check whether "cp" is a valid ASCII representation
- * of an Internet address and convert to a binary address.
- * Returns 1 if the address is valid, 0 if not.
- * This replaces inet_addr, the return value from which
- * cannot distinguish between failure and a local broadcast address.
- */
-int
-inet_aton(cp, addr)
-	const char *cp;
-	struct in_addr *addr;
-{
-	u_long parts[4];
-	in_addr_t val;
-	char *c;
-	char *endptr;
-	int gotend, n;
-
-	c = (char *)cp;
-	n = 0;
-	/*
-	 * Run through the string, grabbing numbers until
-	 * the end of the string, or some error
-	 */
-	gotend = 0;
-	while (!gotend) {
-		errno = 0;
-		val = strtoul(c, &endptr, 0);
-
-		if (errno == ERANGE)	/* Fail completely if it overflowed. */
-			return (0);
-		
-		/* 
-		 * If the whole string is invalid, endptr will equal
-		 * c.. this way we can make sure someone hasn't
-		 * gone '.12' or something which would get past
-		 * the next check.
-		 */
-		if (endptr == c)
-			return (0);
-		parts[n] = val;
-		c = endptr;
-
-		/* Check the next character past the previous number's end */
-		switch (*c) {
-		case '.' :
-			/* Make sure we only do 3 dots .. */
-			if (n == 3)	/* Whoops. Quit. */
-				return (0);
-			n++;
-			c++;
-			break;
-
-		case '\0':
-			gotend = 1;
-			break;
-
-		default:
-			if (isspace((unsigned char)*c)) {
-				gotend = 1;
-				break;
-			} else
-				return (0);	/* Invalid character, so fail */
-		}
-
-	}
-
-	/*
-	 * Concoct the address according to
-	 * the number of parts specified.
-	 */
-
-	switch (n) {
-	case 0:				/* a -- 32 bits */
-		/*
-		 * Nothing is necessary here.  Overflow checking was
-		 * already done in strtoul().
-		 */
-		break;
-	case 1:				/* a.b -- 8.24 bits */
-		if (val > 0xffffff || parts[0] > 0xff)
-			return (0);
-		val |= parts[0] << 24;
-		break;
-
-	case 2:				/* a.b.c -- 8.8.16 bits */
-		if (val > 0xffff || parts[0] > 0xff || parts[1] > 0xff)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16);
-		break;
-
-	case 3:				/* a.b.c.d -- 8.8.8.8 bits */
-		if (val > 0xff || parts[0] > 0xff || parts[1] > 0xff ||
-		    parts[2] > 0xff)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
-		break;
-	}
-
-	if (addr != NULL)
-		addr->s_addr = htonl(val);
-	return (1);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_addr
-__weak_reference(__inet_addr, inet_addr);
-#undef inet_aton
-__weak_reference(__inet_aton, inet_aton);
diff --git a/newlib/libc/sys/linux/net/inet_lnaof.c b/newlib/libc/sys/linux/net/inet_lnaof.c
deleted file mode 100644
index c6c999d..0000000
--- a/newlib/libc/sys/linux/net/inet_lnaof.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_lnaof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Return the local network address portion of an
- * internet address; handles class a/b/c network
- * number formats.
- */
-in_addr_t
-inet_lnaof(in)
-	struct in_addr in;
-{
-	in_addr_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return ((i)&IN_CLASSA_HOST);
-	else if (IN_CLASSB(i))
-		return ((i)&IN_CLASSB_HOST);
-	else
-		return ((i)&IN_CLASSC_HOST);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_lnaof
-__weak_reference(__inet_lnaof, inet_lnaof);
diff --git a/newlib/libc/sys/linux/net/inet_makeaddr.c b/newlib/libc/sys/linux/net/inet_makeaddr.c
deleted file mode 100644
index 339b2d5..0000000
--- a/newlib/libc/sys/linux/net/inet_makeaddr.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_makeaddr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Formulate an Internet address from network + host.  Used in
- * building addresses stored in the ifnet structure.
- */
-struct in_addr
-inet_makeaddr(net, host)
-	in_addr_t net, host;
-{
-	in_addr_t addr;
-
-	if (net < 128)
-		addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
-	else if (net < 65536)
-		addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
-	else if (net < 16777216L)
-		addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
-	else
-		addr = net | host;
-	addr = htonl(addr);
-	return (*(struct in_addr *)&addr);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_makeaddr
-__weak_reference(__inet_makeaddr, inet_makeaddr);
diff --git a/newlib/libc/sys/linux/net/inet_net.3 b/newlib/libc/sys/linux/net/inet_net.3
deleted file mode 100644
index 1d43bcc..0000000
--- a/newlib/libc/sys/linux/net/inet_net.3
+++ /dev/null
@@ -1,157 +0,0 @@
-.\"	$NetBSD: inet_net.3,v 1.4 1999/03/22 19:44:52 garbled Exp $
-.\"
-.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/lib/libc/net/inet_net.3,v 1.1 2001/08/31 10:54:44 ru Exp $
-.\"
-.Dd June 18, 1997
-.Dt INET_NET 3
-.Os
-.Sh NAME
-.Nm inet_net_ntop ,
-.Nm inet_net_pton
-.Nd Internet network number manipulation routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/in.h
-.In arpa/inet.h
-.Ft char *
-.Fn inet_net_ntop "int af" "const void *src" "int bits" "char *dst" "size_t size"
-.Ft int
-.Fn inet_net_pton "int af" "const char *src" "void *dst" "size_t size"
-.Sh DESCRIPTION
-The
-.Fn inet_net_ntop
-function converts an Internet network number from network format (usually a
-.Vt "struct in_addr"
-or some other binary form, in network byte order) to CIDR presentation format
-(suitable for external display purposes).
-.Fa bits
-is the number of bits in
-.Fa src
-that are the network number.
-It returns
-.Dv NULL
-if a system error occurs (in which case,
-.Va errno
-will have been set), or it returns a pointer to the destination string.
-.Pp
-The
-.Fn inet_net_pton
-function converts a presentation format Internet network number (that is,
-printable form as held in a character string) to network format (usually a
-.Vt "struct in_addr"
-or some other internal binary representation, in network byte order).
-It returns the number of bits (either computed based on the class, or
-specified with /CIDR), or \-1 if a failure occurred
-(in which case
-.Va errno
-will have been set.
-It will be set to
-.Er ENOENT
-if the Internet network number was not valid).
-.Pp
-The only value for
-.Fa af
-currently supported is
-.Dv AF_INET .
-.Fa size
-is the size of the result buffer
-.Fa dst .
-.Pp
-.Sh NETWORK NUMBERS (IP VERSION 4)
-Internet network numbers may be specified in one of the following forms:
-.Bd -literal -offset indent
-a.b.c.d/bits
-a.b.c.d
-a.b.c
-a.b
-a
-.Ed
-.Pp
-When four parts are specified, each is interpreted
-as a byte of data and assigned, from left to right,
-to the four bytes of an Internet network number.
-Note
-that when an Internet network number is viewed as a 32-bit
-integer quantity on a system that uses little-endian
-byte order (such as the
-.Tn Intel 386 , 486 ,
-and
-.Tn Pentium
-processors) the bytes referred to above appear as
-.Dq Li d.c.b.a .
-That is, little-endian bytes are ordered from right to left.
-.Pp
-When a three part number is specified, the last
-part is interpreted as a 16-bit quantity and placed
-in the rightmost two bytes of the Internet network number.
-This makes the three part number format convenient
-for specifying Class B network numbers as
-.Dq Li 128.net.host .
-.Pp
-When a two part number is supplied, the last part
-is interpreted as a 24-bit quantity and placed in
-the rightmost three bytes of the Internet network number.
-This makes the two part number format convenient
-for specifying Class A network numbers as
-.Dq Li net.host .
-.Pp
-When only one part is given, the value is stored
-directly in the Internet network number without any byte
-rearrangement.
-.Pp
-All numbers supplied as
-.Dq parts
-in a
-.Ql \&.
-notation
-may be decimal, octal, or hexadecimal, as specified
-in the C language (i.e., a leading 0x or 0X implies
-hexadecimal; otherwise, a leading 0 implies octal;
-otherwise, the number is interpreted as decimal).
-.Sh SEE ALSO
-.Xr byteorder 3 ,
-.Xr inet 3 ,
-.Xr networks 5
-.Sh HISTORY
-The
-.Fn inet_net_ntop
-and
-.Fn inet_net_pton
-functions appeared in BIND 4.9.4.
diff --git a/newlib/libc/sys/linux/net/inet_net_ntop.c b/newlib/libc/sys/linux/net/inet_net_ntop.c
deleted file mode 100644
index caa99f0..0000000
--- a/newlib/libc/sys/linux/net/inet_net_ntop.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_net_ntop.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
-#endif
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static char *	inet_net_ntop_ipv4(const u_char *src, int bits, char *dst,
-		    size_t size);
-
-/*
- * char *
- * inet_net_ntop(af, src, bits, dst, size)
- *	convert network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_net_ntop(af, src, bits, dst, size)
-	int af;
-	const void *src;
-	int bits;
-	char *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_net_ntop_ipv4(src, bits, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-}
-
-/*
- * static char *
- * inet_net_ntop_ipv4(src, bits, dst, size)
- *	convert IPv4 network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0x11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-static char *
-inet_net_ntop_ipv4(src, bits, dst, size)
-	const u_char *src;
-	int bits;
-	char *dst;
-	size_t size;
-{
-	char *odst = dst;
-	char *t;
-	u_int m;
-	int b;
-
-	if (bits < 0 || bits > 32) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	if (bits == 0) {
-		if (size < sizeof "0")
-			goto emsgsize;
-		*dst++ = '0';
-		*dst = '\0';
-	}
-
-	/* Format whole octets. */
-	for (b = bits / 8; b > 0; b--) {
-		if (size < sizeof "255.")
-			goto emsgsize;
-		t = dst;
-		dst += SPRINTF((dst, "%u", *src++));
-		if (b > 1) {
-			*dst++ = '.';
-			*dst = '\0';
-		}
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format partial octet. */
-	b = bits % 8;
-	if (b > 0) {
-		if (size < sizeof ".255")
-			goto emsgsize;
-		t = dst;
-		if (dst != odst)
-			*dst++ = '.';
-		m = ((1 << b) - 1) << (8 - b);
-		dst += SPRINTF((dst, "%u", *src & m));
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format CIDR /width. */
-	if (size < sizeof "/32")
-		goto emsgsize;
-	dst += SPRINTF((dst, "/%u", bits));
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_net_ntop
-__weak_reference(__inet_net_ntop, inet_net_ntop);
diff --git a/newlib/libc/sys/linux/net/inet_net_pton.c b/newlib/libc/sys/linux/net/inet_net_pton.c
deleted file mode 100644
index 9386d05..0000000
--- a/newlib/libc/sys/linux/net/inet_net_pton.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_net_pton.c,v 1.8 1996/11/21 10:28:12 vixie Exp $";
-#endif
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static int	inet_net_pton_ipv4(const char *src, u_char *dst, size_t size);
-
-/*
- * static int
- * inet_net_pton(af, src, dst, size)
- *	convert network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not a valid network specification.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-int
-inet_net_pton(af, src, dst, size)
-	int af;
-	const char *src;
-	void *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_net_pton_ipv4(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-}
-
-/*
- * static int
- * inet_net_pton_ipv4(src, dst, size)
- *	convert IPv4 network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not an IPv4 network specification.
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0x11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-static int
-inet_net_pton_ipv4(src, dst, size)
-	const char *src;
-	u_char *dst;
-	size_t size;
-{
-	static const char
-		xdigits[] = "0123456789abcdef",
-		digits[] = "0123456789";
-	int n, ch, tmp, dirty, bits;
-	const u_char *odst = dst;
-
-	ch = *src++;
-	if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
-	    && isascii(src[1]) && isxdigit(src[1])) {
-		/* Hexadecimal: Eat nybble string. */
-		if (size <= 0)
-			goto emsgsize;
-		*dst = 0, dirty = 0;
-		src++;	/* skip x or X. */
-		while ((ch = *src++) != '\0' &&
-		       isascii(ch) && isxdigit(ch)) {
-			if (isupper(ch))
-				ch = tolower(ch);
-			n = strchr(xdigits, ch) - xdigits;
-			assert(n >= 0 && n <= 15);
-			*dst |= n;
-			if (!dirty++)
-				*dst <<= 4;
-			else if (size-- > 0)
-				*++dst = 0, dirty = 0;
-			else
-				goto emsgsize;
-		}
-		if (dirty)
-			size--;
-	} else if (isascii(ch) && isdigit(ch)) {
-		/* Decimal: eat dotted digit string. */
-		for (;;) {
-			tmp = 0;
-			do {
-				n = strchr(digits, ch) - digits;
-				assert(n >= 0 && n <= 9);
-				tmp *= 10;
-				tmp += n;
-				if (tmp > 255)
-					goto enoent;
-			} while ((ch = *src++) != '\0' &&
-				 isascii(ch) && isdigit(ch));
-			if (size-- <= 0)
-				goto emsgsize;
-			*dst++ = (u_char) tmp;
-			if (ch == '\0' || ch == '/')
-				break;
-			if (ch != '.')
-				goto enoent;
-			ch = *src++;
-			if (!isascii(ch) || !isdigit(ch))
-				goto enoent;
-		}
-	} else
-		goto enoent;
-
-	bits = -1;
-	if (ch == '/' && isascii(src[0]) && isdigit(src[0]) && dst > odst) {
-		/* CIDR width specifier.  Nothing can follow it. */
-		ch = *src++;	/* Skip over the /. */
-		bits = 0;
-		do {
-			n = strchr(digits, ch) - digits;
-			assert(n >= 0 && n <= 9);
-			bits *= 10;
-			bits += n;
-		} while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
-		if (ch != '\0')
-			goto enoent;
-		if (bits > 32)
-			goto emsgsize;
-	}
-
-	/* Firey death and destruction unless we prefetched EOS. */
-	if (ch != '\0')
-		goto enoent;
-
-	/* If nothing was written to the destination, we found no address. */
-	if (dst == odst)
-		goto enoent;
-	/* If no CIDR spec was given, infer width from net class. */
-	if (bits == -1) {
-		if (*odst >= 240)	/* Class E */
-			bits = 32;
-		else if (*odst >= 224)	/* Class D */
-			bits = 4;
-		else if (*odst >= 192)	/* Class C */
-			bits = 24;
-		else if (*odst >= 128)	/* Class B */
-			bits = 16;
-		else			/* Class A */
-			bits = 8;
-		/* If imputed mask is narrower than specified octets, widen. */
-		if (bits >= 8 && bits < ((dst - odst) * 8))
-			bits = (dst - odst) * 8;
-	}
-	/* Extend network to cover the actual mask. */
-	while (bits > ((dst - odst) * 8)) {
-		if (size-- <= 0)
-			goto emsgsize;
-		*dst++ = '\0';
-	}
-	return (bits);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_net_pton
-__weak_reference(__inet_net_pton, inet_net_pton);
diff --git a/newlib/libc/sys/linux/net/inet_neta.c b/newlib/libc/sys/linux/net/inet_neta.c
deleted file mode 100644
index c455783..0000000
--- a/newlib/libc/sys/linux/net/inet_neta.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char orig_rcsid[] = "From Id: inet_neta.c,v 8.2 1996/08/08 06:54:44 vixie Exp";
-#endif
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/*
- * char *
- * inet_neta(src, dst, size)
- *	format a in_addr_t network number into presentation format.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	format of ``src'' is as for inet_network().
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_neta(src, dst, size)
-	in_addr_t src;
-	char *dst;
-	size_t size;
-{
-	char *odst = dst;
-	char *tp;
-
-	while (src & 0xffffffff) {
-		u_char b = (src & 0xff000000) >> 24;
-
-		src <<= 8;
-		if (b) {
-			if (size < sizeof "255.")
-				goto emsgsize;
-			tp = dst;
-			dst += SPRINTF((dst, "%u", b));
-			if (src != 0L) {
-				*dst++ = '.';
-				*dst = '\0';
-			}
-			size -= (size_t)(dst - tp);
-		}
-	}
-	if (dst == odst) {
-		if (size < sizeof "0.0.0.0")
-			goto emsgsize;
-		strcpy(dst, "0.0.0.0");
-	}
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_neta
-__weak_reference(__inet_neta, inet_neta);
diff --git a/newlib/libc/sys/linux/net/inet_netof.c b/newlib/libc/sys/linux/net/inet_netof.c
deleted file mode 100644
index e2e84d3..0000000
--- a/newlib/libc/sys/linux/net/inet_netof.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_netof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*
- * Return the network number from an internet
- * address; handles class a/b/c network #'s.
- */
-in_addr_t
-inet_netof(in)
-	struct in_addr in;
-{
-	in_addr_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (((i)&IN_CLASSA_NET) >> IN_CLASSA_NSHIFT);
-	else if (IN_CLASSB(i))
-		return (((i)&IN_CLASSB_NET) >> IN_CLASSB_NSHIFT);
-	else
-		return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_netof
-__weak_reference(__inet_netof, inet_netof);
diff --git a/newlib/libc/sys/linux/net/inet_network.c b/newlib/libc/sys/linux/net/inet_network.c
deleted file mode 100644
index caf1d78..0000000
--- a/newlib/libc/sys/linux/net/inet_network.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_network.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-/*
- * Internet network address interpretation routine.
- * The library routines call this routine to interpret
- * network numbers.
- */
-in_addr_t
-inet_network(cp)
-	const char *cp;
-{
-	in_addr_t val, base, n;
-	char c;
-	in_addr_t parts[4], *pp = parts;
-	int i;
-
-again:
-	val = 0; base = 10;
-	if (*cp == '0')
-		base = 8, cp++;
-	if (*cp == 'x' || *cp == 'X')
-		base = 16, cp++;
-	while ((c = *cp) != 0) {
-		if (isdigit((unsigned char)c)) {
-			val = (val * base) + (c - '0');
-			cp++;
-			continue;
-		}
-		if (base == 16 && isxdigit((unsigned char)c)) {
-			val = (val << 4) + (c + 10 - (islower((unsigned char)c) ? 'a' : 'A'));
-			cp++;
-			continue;
-		}
-		break;
-	}
-	if (*cp == '.') {
-		if (pp >= parts + 3)
-			return (INADDR_NONE);
-		*pp++ = val, cp++;
-		goto again;
-	}
-	if (*cp && !isspace((unsigned char)*cp))
-		return (INADDR_NONE);
-	*pp++ = val;
-	n = pp - parts;
-	for (val = 0, i = 0; i < n; i++) {
-		val <<= 8;
-		val |= parts[i] & 0xff;
-	}
-	return (val);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_network
-__weak_reference(__inet_network, inet_network);
diff --git a/newlib/libc/sys/linux/net/inet_ntoa.c b/newlib/libc/sys/linux/net/inet_ntoa.c
deleted file mode 100644
index dedc476..0000000
--- a/newlib/libc/sys/linux/net/inet_ntoa.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <string.h>
-
-/*
- * Convert network-format internet address
- * to base 256 d.d.d.d representation.
- */
-char *
-inet_ntoa(in)
-	struct in_addr in;
-{
-	static char ret[18];
-
-	strcpy(ret, "[inet_ntoa error]");
-	(void) inet_ntop(AF_INET, &in, ret, sizeof ret);
-	return (ret);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_ntoa
-__weak_reference(__inet_ntoa, inet_ntoa);
diff --git a/newlib/libc/sys/linux/net/inet_ntop.c b/newlib/libc/sys/linux/net/inet_ntop.c
deleted file mode 100644
index 31746e4..0000000
--- a/newlib/libc/sys/linux/net/inet_ntop.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id$";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#define SPRINTF(x) ((socklen_t)sprintf x)
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static const char *inet_ntop4(const u_char *src, char *dst, socklen_t size);
-static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
-
-/* char *
- * inet_ntop(af, src, dst, size)
- *	convert a network format address to presentation format.
- * return:
- *	pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- *	Paul Vixie, 1996.
- */
-const char *
-inet_ntop(af, src, dst, size)
-	int af;
-	const void *src;
-	char *dst;
-	socklen_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_ntop4(src, dst, size));
-	case AF_INET6:
-		return (inet_ntop6(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-	/* NOTREACHED */
-}
-
-/* const char *
- * inet_ntop4(src, dst, size)
- *	format an IPv4 address, more or less like inet_ntoa()
- * return:
- *	`dst' (as a const)
- * notes:
- *	(1) uses no statics
- *	(2) takes a u_char* not an in_addr as input
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop4(src, dst, size)
-	const u_char *src;
-	char *dst;
-	socklen_t size;
-{
-	static const char fmt[] = "%u.%u.%u.%u";
-	char tmp[sizeof "255.255.255.255"];
-
-	if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
-
-/* const char *
- * inet_ntop6(src, dst, size)
- *	convert IPv6 binary address into presentation (printable) format
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop6(src, dst, size)
-	const u_char *src;
-	char *dst;
-	socklen_t size;
-{
-	/*
-	 * Note that int32_t and int16_t need only be "at least" large enough
-	 * to contain a value of the specified size.  On some systems, like
-	 * Crays, there is no such thing as an integer variable with 16 bits.
-	 * Keep this in mind if you think this function should have been coded
-	 * to use pointer overlays.  All the world's not a VAX.
-	 */
-	char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-	struct { int base, len; } best, cur;
-	u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-	int i;
-
-	/*
-	 * Preprocess:
-	 *	Copy the input (bytewise) array into a wordwise array.
-	 *	Find the longest run of 0x00's in src[] for :: shorthanding.
-	 */
-	memset(words, '\0', sizeof words);
-	for (i = 0; i < NS_IN6ADDRSZ; i++)
-		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-	best.base = -1;
-	cur.base = -1;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		if (words[i] == 0) {
-			if (cur.base == -1)
-				cur.base = i, cur.len = 1;
-			else
-				cur.len++;
-		} else {
-			if (cur.base != -1) {
-				if (best.base == -1 || cur.len > best.len)
-					best = cur;
-				cur.base = -1;
-			}
-		}
-	}
-	if (cur.base != -1) {
-		if (best.base == -1 || cur.len > best.len)
-			best = cur;
-	}
-	if (best.base != -1 && best.len < 2)
-		best.base = -1;
-
-	/*
-	 * Format the result.
-	 */
-	tp = tmp;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		/* Are we inside the best run of 0x00's? */
-		if (best.base != -1 && i >= best.base &&
-		    i < (best.base + best.len)) {
-			if (i == best.base)
-				*tp++ = ':';
-			continue;
-		}
-		/* Are we following an initial run of 0x00s or any real hex? */
-		if (i != 0)
-			*tp++ = ':';
-		/* Is this address an encapsulated IPv4? */
-		if (i == 6 && best.base == 0 &&
-		    (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
-			if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
-				return (NULL);
-			tp += strlen(tp);
-			break;
-		}
-		tp += SPRINTF((tp, "%x", words[i]));
-	}
-	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) ==
-	    (NS_IN6ADDRSZ / NS_INT16SZ))
-		*tp++ = ':';
-	*tp++ = '\0';
-
-	/*
-	 * Check for overflow, copy, and we're done.
-	 */
-	if ((socklen_t)(tp - tmp) > size) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_ntop
-__weak_reference(__inet_ntop, inet_ntop);
diff --git a/newlib/libc/sys/linux/net/inet_pton.c b/newlib/libc/sys/linux/net/inet_pton.c
deleted file mode 100644
index eeabbb4..0000000
--- a/newlib/libc/sys/linux/net/inet_pton.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*	$KAME: inet_pton.c,v 1.5 2001/08/20 02:32:40 itojun Exp $	*/
-
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <string.h>
-#include <errno.h>
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static int	inet_pton4(const char *src, u_char *dst);
-static int	inet_pton6(const char *src, u_char *dst);
-
-/* int
- * inet_pton(af, src, dst)
- *	convert from presentation format (which usually means ASCII printable)
- *	to network format (which is usually some kind of binary format).
- * return:
- *	1 if the address was valid for the specified address family
- *	0 if the address wasn't valid (`dst' is untouched in this case)
- *	-1 if some other error occurred (`dst' is untouched in this case, too)
- * author:
- *	Paul Vixie, 1996.
- */
-int
-inet_pton(af, src, dst)
-	int af;
-	const char *src;
-	void *dst;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_pton4(src, dst));
-	case AF_INET6:
-		return (inet_pton6(src, dst));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
-
-/* int
- * inet_pton4(src, dst)
- *	like inet_aton() but without all the hexadecimal and shorthand.
- * return:
- *	1 if `src' is a valid dotted quad, else 0.
- * notice:
- *	does not touch `dst' unless it's returning 1.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton4(src, dst)
-	const char *src;
-	u_char *dst;
-{
-	static const char digits[] = "0123456789";
-	int saw_digit, octets, ch;
-	u_char tmp[NS_INADDRSZ], *tp;
-
-	saw_digit = 0;
-	octets = 0;
-	*(tp = tmp) = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr(digits, ch)) != NULL) {
-			u_int new = *tp * 10 + (pch - digits);
-
-			if (new > 255)
-				return (0);
-			*tp = new;
-			if (! saw_digit) {
-				if (++octets > 4)
-					return (0);
-				saw_digit = 1;
-			}
-		} else if (ch == '.' && saw_digit) {
-			if (octets == 4)
-				return (0);
-			*++tp = 0;
-			saw_digit = 0;
-		} else
-			return (0);
-	}
-	if (octets < 4)
-		return (0);
-
-	memcpy(dst, tmp, NS_INADDRSZ);
-	return (1);
-}
-
-/* int
- * inet_pton6(src, dst)
- *	convert presentation level address to network order binary form.
- * return:
- *	1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- *	(1) does not touch `dst' unless it's returning 1.
- *	(2) :: in a full address is silently ignored.
- * credit:
- *	inspired by Mark Andrews.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton6(src, dst)
-	const char *src;
-	u_char *dst;
-{
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, saw_xdigit;
-	u_int val;
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			return (0);
-	curtok = src;
-	saw_xdigit = 0;
-	val = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (pch - xdigits);
-			if (val > 0xffff)
-				return (0);
-			saw_xdigit = 1;
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!saw_xdigit) {
-				if (colonp)
-					return (0);
-				colonp = tp;
-				continue;
-			}
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			saw_xdigit = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		    inet_pton4(curtok, tp) > 0) {
-			tp += NS_INADDRSZ;
-			saw_xdigit = 0;
-			break;	/* '\0' was seen by inet_pton4(). */
-		}
-		return (0);
-	}
-	if (saw_xdigit) {
-		if (tp + NS_INT16SZ > endp)
-			return (0);
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const int n = tp - colonp;
-		int i;
-
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-	if (tp != endp)
-		return (0);
-	memcpy(dst, tmp, NS_IN6ADDRSZ);
-	return (1);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_pton
-__weak_reference(__inet_pton, inet_pton);
diff --git a/newlib/libc/sys/linux/net/innetgr-stub.c b/newlib/libc/sys/linux/net/innetgr-stub.c
deleted file mode 100644
index 690d82e..0000000
--- a/newlib/libc/sys/linux/net/innetgr-stub.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int
-innetgr(const char *netgroup, const char *host, const char *user,
-	     const char *domain)
-{
-	return 0;
-}
-
diff --git a/newlib/libc/sys/linux/net/ip6opt.c b/newlib/libc/sys/linux/net/ip6opt.c
deleted file mode 100644
index f3f51d5..0000000
--- a/newlib/libc/sys/linux/net/ip6opt.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/ip6.h>
-
-#include <string.h>
-#include <stdio.h>
-
-static int ip6optlen(u_int8_t *opt, u_int8_t *lim);
-static void inet6_insert_padopt(u_char *p, int len);
-
-/*
- * This function returns the number of bytes required to hold an option
- * when it is stored as ancillary data, including the cmsghdr structure
- * at the beginning, and any padding at the end (to make its size a
- * multiple of 8 bytes).  The argument is the size of the structure
- * defining the option, which must include any pad bytes at the
- * beginning (the value y in the alignment term "xn + y"), the type
- * byte, the length byte, and the option data.
- */
-int
-inet6_option_space(nbytes)
-	int nbytes;
-{
-	nbytes += 2;	/* we need space for nxt-hdr and length fields */
-	return(CMSG_SPACE((nbytes + 7) & ~7));
-}
-
-/*
- * This function is called once per ancillary data object that will
- * contain either Hop-by-Hop or Destination options.  It returns 0 on
- * success or -1 on an error.
- */
-int
-inet6_option_init(bp, cmsgp, type)
-	void *bp;
-	struct cmsghdr **cmsgp;
-	int type;
-{
-	struct cmsghdr *ch = (struct cmsghdr *)bp;
-
-	/* argument validation */
-	if (type != IPV6_HOPOPTS && type != IPV6_DSTOPTS)
-		return(-1);
-	
-	ch->cmsg_level = IPPROTO_IPV6;
-	ch->cmsg_type = type;
-	ch->cmsg_len = CMSG_LEN(0);
-
-	*cmsgp = ch;
-	return(0);
-}
-
-/*
- * This function appends a Hop-by-Hop option or a Destination option
- * into an ancillary data object that has been initialized by
- * inet6_option_init().  This function returns 0 if it succeeds or -1 on
- * an error.
- * multx is the value x in the alignment term "xn + y" described
- * earlier.  It must have a value of 1, 2, 4, or 8.
- * plusy is the value y in the alignment term "xn + y" described
- * earlier.  It must have a value between 0 and 7, inclusive.
- */
-int
-inet6_option_append(cmsg, typep, multx, plusy)
-	struct cmsghdr *cmsg;
-	const u_int8_t *typep;
-	int multx;
-	int plusy;
-{
-	int padlen, optlen, off;
-	u_char *bp = (u_char *)cmsg + cmsg->cmsg_len;
-	struct ip6_ext *eh = (struct ip6_ext *)CMSG_DATA(cmsg);
-
-	/* argument validation */
-	if (multx != 1 && multx != 2 && multx != 4 && multx != 8)
-		return(-1);
-	if (plusy < 0 || plusy > 7)
-		return(-1);
-	if (typep[0] > 255)
-		return(-1);
-
-	/*
-	 * If this is the first option, allocate space for the
-	 * first 2 bytes(for next header and length fields) of
-	 * the option header.
-	 */
-	if (bp == (u_char *)eh) {
-		bp += 2;
-		cmsg->cmsg_len += 2;
-	}
-
-	/* calculate pad length before the option. */
-	off = bp - (u_char *)eh;
-	padlen = (((off % multx) + (multx - 1)) & ~(multx - 1)) -
-		(off % multx);
-	padlen += plusy;
-	/* insert padding */
-	inet6_insert_padopt(bp, padlen);
-	cmsg->cmsg_len += padlen;
-	bp += padlen;
-
-	/* copy the option */
-	if (typep[0] == IP6OPT_PAD1)
-		optlen = 1;
-	else
-		optlen = typep[1] + 2;
-	memcpy(bp, typep, optlen);
-	bp += optlen;
-	cmsg->cmsg_len += optlen;
-
-	/* calculate pad length after the option and insert the padding */
-	off = bp - (u_char *)eh;
-	padlen = ((off + 7) & ~7) - off;
-	inet6_insert_padopt(bp, padlen);
-	bp += padlen;
-	cmsg->cmsg_len += padlen;
-
-	/* update the length field of the ip6 option header */
-	eh->ip6e_len = ((bp - (u_char *)eh) >> 3) - 1;
-
-	return(0);
-}
-
-/*
- * This function appends a Hop-by-Hop option or a Destination option
- * into an ancillary data object that has been initialized by
- * inet6_option_init().  This function returns a pointer to the 8-bit
- * option type field that starts the option on success, or NULL on an
- * error.
- * The difference between this function and inet6_option_append() is
- * that the latter copies the contents of a previously built option into
- * the ancillary data object while the current function returns a
- * pointer to the space in the data object where the option's TLV must
- * then be built by the caller.
- * 
- */
-u_int8_t *
-inet6_option_alloc(cmsg, datalen, multx, plusy)
-	struct cmsghdr *cmsg;
-	int datalen;
-	int multx;
-	int plusy;
-{
-	int padlen, off;
-	u_int8_t *bp = (u_char *)cmsg + cmsg->cmsg_len;
-	u_int8_t *retval;
-	struct ip6_ext *eh = (struct ip6_ext *)CMSG_DATA(cmsg);
-
-	/* argument validation */
-	if (multx != 1 && multx != 2 && multx != 4 && multx != 8)
-		return(NULL);
-	if (plusy < 0 || plusy > 7)
-		return(NULL);
-
-	/*
-	 * If this is the first option, allocate space for the
-	 * first 2 bytes(for next header and length fields) of
-	 * the option header.
-	 */
-	if (bp == (u_char *)eh) {
-		bp += 2;
-		cmsg->cmsg_len += 2;
-	}
-
-	/* calculate pad length before the option. */
-	off = bp - (u_char *)eh;
-	padlen = (((off % multx) + (multx - 1)) & ~(multx - 1)) -
-		(off % multx);
-	padlen += plusy;
-	/* insert padding */
-	inet6_insert_padopt(bp, padlen);
-	cmsg->cmsg_len += padlen;
-	bp += padlen;
-
-	/* keep space to store specified length of data */
-	retval = bp;
-	bp += datalen;
-	cmsg->cmsg_len += datalen;
-
-	/* calculate pad length after the option and insert the padding */
-	off = bp - (u_char *)eh;
-	padlen = ((off + 7) & ~7) - off;
-	inet6_insert_padopt(bp, padlen);
-	bp += padlen;
-	cmsg->cmsg_len += padlen;
-
-	/* update the length field of the ip6 option header */
-	eh->ip6e_len = ((bp - (u_char *)eh) >> 3) - 1;
-
-	return(retval);
-}
-
-/*
- * This function processes the next Hop-by-Hop option or Destination
- * option in an ancillary data object.  If another option remains to be
- * processed, the return value of the function is 0 and *tptrp points to
- * the 8-bit option type field (which is followed by the 8-bit option
- * data length, followed by the option data).  If no more options remain
- * to be processed, the return value is -1 and *tptrp is NULL.  If an
- * error occurs, the return value is -1 and *tptrp is not NULL.
- * (RFC 2292, 6.3.5)
- */
-int
-inet6_option_next(cmsg, tptrp)
-	const struct cmsghdr *cmsg;
-	u_int8_t **tptrp;
-{
-	struct ip6_ext *ip6e;
-	int hdrlen, optlen;
-	u_int8_t *lim;
-
-	if (cmsg->cmsg_level != IPPROTO_IPV6 ||
-	    (cmsg->cmsg_type != IPV6_HOPOPTS &&
-	     cmsg->cmsg_type != IPV6_DSTOPTS))
-		return(-1);
-
-	/* message length validation */
-	if (cmsg->cmsg_len < CMSG_SPACE(sizeof(struct ip6_ext)))
-		return(-1);
-	ip6e = (struct ip6_ext *)CMSG_DATA(cmsg);
-	hdrlen = (ip6e->ip6e_len + 1) << 3;
-	if (cmsg->cmsg_len < CMSG_SPACE(hdrlen))
-		return(-1);
-
-	/*
-	 * If the caller does not specify the starting point,
-	 * simply return the 1st option.
-	 * Otherwise, search the option list for the next option.
-	 */
-	lim = (u_int8_t *)ip6e + hdrlen;
-	if (*tptrp == NULL)
-		*tptrp = (u_int8_t *)(ip6e + 1);
-	else {
-		if ((optlen = ip6optlen(*tptrp, lim)) == 0)
-			return(-1);
-
-		*tptrp = *tptrp + optlen;
-	}
-	if (*tptrp >= lim) {	/* there is no option */
-		*tptrp = NULL;
-		return(-1);
-	}
-	/*
-	 * Finally, checks if the next option is safely stored in the
-	 * cmsg data.
-	 */
-	if (ip6optlen(*tptrp, lim) == 0)
-		return(-1);
-	else
-		return(0);
-}
-
-/*
- * This function is similar to the inet6_option_next() function,
- * except this function lets the caller specify the option type to be
- * searched for, instead of always returning the next option in the
- * ancillary data object.
- * Note: RFC 2292 says the type of tptrp is u_int8_t *, but we think
- *       it's a typo. The variable should be type of u_int8_t **.
- */
-int
-inet6_option_find(cmsg, tptrp, type)
-	const struct cmsghdr *cmsg;
-	u_int8_t **tptrp;
-	int type;
-{
-	struct ip6_ext *ip6e;
-	int hdrlen, optlen;
-	u_int8_t *optp, *lim;
-
-	if (cmsg->cmsg_level != IPPROTO_IPV6 ||
-	    (cmsg->cmsg_type != IPV6_HOPOPTS &&
-	     cmsg->cmsg_type != IPV6_DSTOPTS))
-		return(-1);
-
-	/* message length validation */
-	if (cmsg->cmsg_len < CMSG_SPACE(sizeof(struct ip6_ext)))
-		return(-1);
-	ip6e = (struct ip6_ext *)CMSG_DATA(cmsg);
-	hdrlen = (ip6e->ip6e_len + 1) << 3;
-	if (cmsg->cmsg_len < CMSG_SPACE(hdrlen))
-		return(-1);	
-
-	/*
-	 * If the caller does not specify the starting point,
-	 * search from the beginning of the option list.
-	 * Otherwise, search from *the next option* of the specified point.
-	 */
-	lim = (u_int8_t *)ip6e + hdrlen;
-	if (*tptrp == NULL)
-		*tptrp = (u_int8_t *)(ip6e + 1);
-	else {
-		if ((optlen = ip6optlen(*tptrp, lim)) == 0)
-			return(-1);
-
-		*tptrp = *tptrp + optlen;
-	}
-	for (optp = *tptrp; optp < lim; optp += optlen) {
-		if (*optp == type) {
-			*tptrp = optp;
-			return(0);
-		}
-		if ((optlen = ip6optlen(optp, lim)) == 0)
-			return(-1);
-	}
-
-	/* search failed */
-	*tptrp = NULL;
-	return(-1);
-}
-
-/*
- * Calculate the length of a given IPv6 option. Also checks
- * if the option is safely stored in user's buffer according to the
- * calculated length and the limitation of the buffer.
- */
-static int
-ip6optlen(opt, lim)
-	u_int8_t *opt, *lim;
-{
-	int optlen;
-
-	if (*opt == IP6OPT_PAD1)
-		optlen = 1;
-	else {
-		/* is there enough space to store type and len? */
-		if (opt + 2 > lim)
-			return(0);
-		optlen = *(opt + 1) + 2;
-	}
-	if (opt + optlen <= lim)
-		return(optlen);
-
-	return(0);
-}
-
-static void
-inet6_insert_padopt(u_char *p, int len)
-{
-	switch(len) {
-	 case 0:
-		 return;
-	 case 1:
-		 p[0] = IP6OPT_PAD1;
-		 return;
-	 default:
-		 p[0] = IP6OPT_PADN;
-		 p[1] = len - 2; 
-		 memset(&p[2], 0, len - 2);
-		 return;
-	}
-}
diff --git a/newlib/libc/sys/linux/net/iso_addr.3 b/newlib/libc/sys/linux/net/iso_addr.3
deleted file mode 100644
index dc843c3..0000000
--- a/newlib/libc/sys/linux/net/iso_addr.3
+++ /dev/null
@@ -1,113 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)iso_addr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/iso_addr.3,v 1.7 2001/10/01 16:08:56 ru Exp $
-.\"
-.Dd June 4, 1993
-.Dt ISO_ADDR 3
-.Os
-.Sh NAME
-.Nm iso_addr ,
-.Nm iso_ntoa
-.Nd "elementary network address conversion routines for Open System Interconnection
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In netiso/iso.h
-.Ft struct iso_addr *
-.Fn iso_addr "char *cp"
-.Ft char *
-.Fn iso_ntoa "struct iso_addr *isoa"
-.Sh DESCRIPTION
-The routine
-.Fn iso_addr
-interprets character strings representing
-.Tn OSI
-addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn iso_ntoa
-takes
-.Tn OSI
-addresses and returns
-.Tn ASCII
-strings representing NSAPs (network service
-access points) in a
-notation inverse to that accepted by
-.Fn iso_addr .
-.Pp
-Unfortunately, no universal standard exists for representing
-.Tn OSI
-network addresses.
-.Pp
-The format employed by
-.Fn iso_addr
-is a sequence of hexadecimal
-.Dq digits
-(optionally separated by periods),
-of the form:
-.Bd -ragged -offset indent
-<hex digits>.<hex digits>.<hex digits>
-.Ed
-.Pp
-Each pair of hexadecimal digits represents a byte
-with the leading digit indicating the higher-ordered bits.
-A period following an even number of bytes has no
-effect (but may be used to increase legibility).
-A period following an odd number of bytes has the
-effect of causing the byte of address being translated
-to have its higher order bits filled with zeros.
-.Sh RETURN VALUES
-.Fn iso_ntoa
-always returns a null terminated string.
-.Fn iso_addr
-always returns a pointer to a struct iso_addr.
-(See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr iso 4
-.Sh HISTORY
-The
-.Fn iso_addr
-and
-.Fn iso_ntoa
-functions appeared in
-.Bx 4.3 Reno .
-.Sh BUGS
-The returned values
-reside in a static memory area.
-.Pp
-The function
-.Fn iso_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
diff --git a/newlib/libc/sys/linux/net/iso_addr.c b/newlib/libc/sys/linux/net/iso_addr.c
deleted file mode 100644
index e943122..0000000
--- a/newlib/libc/sys/linux/net/iso_addr.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)iso_addr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <netiso/iso.h>
-#include <string.h>
-
-/* States*/
-#define VIRGIN	0
-#define GOTONE	1
-#define GOTTWO	2
-/* Inputs */
-#define	DIGIT	(4*0)
-#define	END	(4*1)
-#define DELIM	(4*2)
-
-struct iso_addr *
-iso_addr(addr)
-	const char *addr;
-{
-	static struct iso_addr out_addr;
-	char *cp = out_addr.isoa_genaddr;
-	char *cplim = cp + sizeof(out_addr.isoa_genaddr);
-	int byte = 0, state = VIRGIN, new;
-
-	bzero((char *)&out_addr, sizeof(out_addr));
-	do {
-		if ((*addr >= '0') && (*addr <= '9')) {
-			new = *addr - '0';
-		} else if ((*addr >= 'a') && (*addr <= 'f')) {
-			new = *addr - 'a' + 10;
-		} else if ((*addr >= 'A') && (*addr <= 'F')) {
-			new = *addr - 'A' + 10;
-		} else if (*addr == 0)
-			state |= END;
-		else
-			state |= DELIM;
-		addr++;
-		switch (state /* | INPUT */) {
-		case GOTTWO | DIGIT:
-			*cp++ = byte; /*FALLTHROUGH*/
-		case VIRGIN | DIGIT:
-			state = GOTONE; byte = new; continue;
-		case GOTONE | DIGIT:
-			state = GOTTWO; byte = new + (byte << 4); continue;
-		default: /* | DELIM */
-			state = VIRGIN; *cp++ = byte; byte = 0; continue;
-		case GOTONE | END:
-		case GOTTWO | END:
-			*cp++ = byte; /* FALLTHROUGH */
-		case VIRGIN | END:
-			break;
-		}
-		break;
-	} while (cp < cplim);
-	out_addr.isoa_len = cp - out_addr.isoa_genaddr;
-	return (&out_addr);
-}
-
-static char hexlist[] = "0123456789abcdef";
-
-char *
-iso_ntoa(isoa)
-	const struct iso_addr *isoa;
-{
-	static char tmpbuf[sizeof(isoa->isoa_genaddr)*3];
-	const u_char *binary;
-	char *cp;
-	int i;
-
-	binary = isoa->isoa_genaddr;
-	cp = tmpbuf;
-
-	for (i = 0; i < isoa->isoa_len; i++) {
-		*cp++ = hexlist[*binary >> 4];
-		*cp++ = hexlist[*binary++ & 0xf];
-
-		if ((((i % 2) == 0) && ((i + 1) < isoa->isoa_len)))
-			*cp++ = '.';
-	}
-	*cp = '\0';
-	return tmpbuf;
-}
diff --git a/newlib/libc/sys/linux/net/issetugid-stub.c b/newlib/libc/sys/linux/net/issetugid-stub.c
deleted file mode 100644
index b3aac0b..0000000
--- a/newlib/libc/sys/linux/net/issetugid-stub.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int
-issetugid(void)
-{
-	return 0;
-}
diff --git a/newlib/libc/sys/linux/net/linkaddr.3 b/newlib/libc/sys/linux/net/linkaddr.3
deleted file mode 100644
index 1d66463..0000000
--- a/newlib/libc/sys/linux/net/linkaddr.3
+++ /dev/null
@@ -1,140 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley at BSDI.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)linkaddr.3	8.1 (Berkeley) 7/28/93
-.\" $FreeBSD: src/lib/libc/net/linkaddr.3,v 1.12 2001/10/01 16:08:56 ru Exp $
-.\"
-.Dd June 17, 1996
-.Dt LINK_ADDR 3
-.Os
-.Sh NAME
-.Nm link_addr ,
-.Nm link_ntoa
-.Nd elementary address specification routines for link level access
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In net/if_dl.h
-.Ft void
-.Fn link_addr "const char *addr" "struct sockaddr_dl *sdl"
-.Ft char *
-.Fn link_ntoa "const struct sockaddr_dl *sdl"
-.Sh DESCRIPTION
-The routine
-.Fn link_addr
-interprets character strings representing
-link-level addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn link_ntoa
-takes
-a link-level
-address and returns an
-.Tn ASCII
-string representing some of the information present,
-including the link level address itself, and the interface name
-or number, if present.
-This facility is experimental and is
-still subject to change.
-.Pp
-For
-.Fn link_addr ,
-the string
-.Fa addr
-may contain
-an optional network interface identifier of the form
-.Dq "name unit-number" ,
-suitable for the first argument to
-.Xr ifconfig 8 ,
-followed in all cases by a colon and
-an interface address in the form of
-groups of hexadecimal digits
-separated by periods.
-Each group represents a byte of address;
-address bytes are filled left to right from
-low order bytes through high order bytes.
-.Pp
-.\" A regular expression may make this format clearer:
-.\" .Bd -literal -offset indent
-.\" ([a-z]+[0-9]+:)?[0-9a-f]+(\e.[0-9a-f]+)*
-.\" .Ed
-.\" .Pp
-Thus
-.Li le0:8.0.9.13.d.30
-represents an ethernet address
-to be transmitted on the first Lance ethernet interface.
-.Pp
-The direct use of these functions is deprecated in favor of the
-.Xr addr2ascii 3
-interface; however, portable programs cannot rely on the latter as it is
-not yet widely implemented.
-.Sh RETURN VALUES
-.Fn link_ntoa
-always returns a null terminated string.
-.Fn link_addr
-has no return value.
-(See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr addr2ascii 3
-.\" .Xr iso 4
-.Sh HISTORY
-The
-.Fn link_addr
-and
-.Fn link_ntoa
-functions appeared in
-.Bx 4.3 Reno  .
-.Sh BUGS
-The returned values for link_ntoa
-reside in a static memory area.
-.Pp
-The function
-.Fn link_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
-.Pp
-If the
-.Va sdl_len
-field of the link socket address
-.Fa sdl
-is 0,
-.Fn link_ntoa
-will not insert a colon before the interface address bytes.
-If this translated address is given to
-.Fn link_addr
-without inserting an initial colon,
-the latter will not interpret it correctly.
diff --git a/newlib/libc/sys/linux/net/linkaddr.c b/newlib/libc/sys/linux/net/linkaddr.c
deleted file mode 100644
index deeaa09..0000000
--- a/newlib/libc/sys/linux/net/linkaddr.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)linkaddr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-#include <string.h>
-
-/* States*/
-#define NAMING	0
-#define GOTONE	1
-#define GOTTWO	2
-#define RESET	3
-/* Inputs */
-#define	DIGIT	(4*0)
-#define	END	(4*1)
-#define DELIM	(4*2)
-#define LETTER	(4*3)
-
-void
-link_addr(addr, sdl)
-	const char *addr;
-	struct sockaddr_dl *sdl;
-{
-	char *cp = sdl->sdl_data;
-	char *cplim = sdl->sdl_len + (char *)sdl;
-	int byte = 0, state = NAMING, new = 0;
-
-	bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1);
-	sdl->sdl_family = AF_INET;
-	do {
-		state &= ~LETTER;
-		if ((*addr >= '0') && (*addr <= '9')) {
-			new = *addr - '0';
-		} else if ((*addr >= 'a') && (*addr <= 'f')) {
-			new = *addr - 'a' + 10;
-		} else if ((*addr >= 'A') && (*addr <= 'F')) {
-			new = *addr - 'A' + 10;
-		} else if (*addr == 0) {
-			state |= END;
-		} else if (state == NAMING &&
-			   (((*addr >= 'A') && (*addr <= 'Z')) ||
-			   ((*addr >= 'a') && (*addr <= 'z'))))
-			state |= LETTER;
-		else
-			state |= DELIM;
-		addr++;
-		switch (state /* | INPUT */) {
-		case NAMING | DIGIT:
-		case NAMING | LETTER:
-			*cp++ = addr[-1];
-			continue;
-		case NAMING | DELIM:
-			state = RESET;
-			sdl->sdl_nlen = cp - sdl->sdl_data;
-			continue;
-		case GOTTWO | DIGIT:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | DIGIT:
-			state = GOTONE;
-			byte = new;
-			continue;
-		case GOTONE | DIGIT:
-			state = GOTTWO;
-			byte = new + (byte << 4);
-			continue;
-		default: /* | DELIM */
-			state = RESET;
-			*cp++ = byte;
-			byte = 0;
-			continue;
-		case GOTONE | END:
-		case GOTTWO | END:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | END:
-			break;
-		}
-		break;
-	} while (cp < cplim);
-	sdl->sdl_alen = cp - LLADDR(sdl);
-	new = cp - (char *)sdl;
-	if (new > sizeof(*sdl))
-		sdl->sdl_len = new;
-	return;
-}
-
-static char hexlist[] = "0123456789abcdef";
-
-char *
-link_ntoa(sdl)
-	const struct sockaddr_dl *sdl;
-{
-	static char obuf[64];
-	char *out = obuf;
-	int i;
-	u_char *in = (u_char *)LLADDR(sdl);
-	u_char *inlim = in + sdl->sdl_alen;
-	int firsttime = 1;
-
-	if (sdl->sdl_nlen) {
-		bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
-		out += sdl->sdl_nlen;
-		if (sdl->sdl_alen)
-			*out++ = ':';
-	}
-	while (in < inlim) {
-		if (firsttime)
-			firsttime = 0;
-		else
-			*out++ = '.';
-		i = *in++;
-		if (i > 0xf) {
-			out[1] = hexlist[i & 0xf];
-			i >>= 4;
-			out[0] = hexlist[i];
-			out += 2;
-		} else
-			*out++ = hexlist[i];
-	}
-	*out = 0;
-	return (obuf);
-}
diff --git a/newlib/libc/sys/linux/net/map_v4v6.c b/newlib/libc/sys/linux/net/map_v4v6.c
deleted file mode 100644
index f746a80..0000000
--- a/newlib/libc/sys/linux/net/map_v4v6.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <syslog.h>
-
-typedef union {
-	int32_t al;
-	char ac;
-} align;
-
-void
-_map_v4v6_address(src, dst)
-	const char *src;
-	char *dst;
-{
-	u_char *p = (u_char *)dst;
-	char tmp[INADDRSZ];
-	int i;
-
-	/* Stash a temporary copy so our caller can update in place. */
-	bcopy(src, tmp, INADDRSZ);
-	/* Mark this ipv6 addr as a mapped ipv4. */
-	for (i = 0; i < 10; i++)
-		*p++ = 0x00;
-	*p++ = 0xff;
-	*p++ = 0xff;
-	/* Retrieve the saved copy and we're done. */
-	bcopy(tmp, (void*)p, INADDRSZ);
-}
-
-void
-_map_v4v6_hostent(hp, bpp, lenp)
-	struct hostent *hp;
-	char **bpp;
-	int *lenp;
-{
-	char **ap;
-
-	if (hp->h_addrtype != AF_INET || hp->h_length != INADDRSZ)
-		return;
-	hp->h_addrtype = AF_INET6;
-	hp->h_length = IN6ADDRSZ;
-	for (ap = hp->h_addr_list; *ap; ap++) {
-		int i = sizeof(align) - ((u_long)*bpp % sizeof(align));
-
-		if (*lenp < (i + IN6ADDRSZ)) {
-			/* Out of memory.  Truncate address list here.  XXX */
-			*ap = NULL;
-			return;
-		}
-		*bpp += i;
-		*lenp -= i;
-		_map_v4v6_address(*ap, *bpp);
-		*ap = *bpp;
-		*bpp += IN6ADDRSZ;
-		*lenp -= IN6ADDRSZ;
-	}
-}
diff --git a/newlib/libc/sys/linux/net/name6.c b/newlib/libc/sys/linux/net/name6.c
deleted file mode 100644
index f220e21..0000000
--- a/newlib/libc/sys/linux/net/name6.c
+++ /dev/null
@@ -1,1812 +0,0 @@
-/*	$KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 1993
- *    The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-/*
- *	Atsushi Onoe <onoe@sm.sony.co.jp>
- */
-
-/*
- * TODO for thread safe
- *	use mutex for _hostconf, _hostconf_init.
- *	rewrite resolvers to be thread safe
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/queue.h>
-#include <netinet/in.h>
-
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#ifndef _PATH_HOSTS
-#define	_PATH_HOSTS	"/etc/hosts"
-#endif
-
-#ifndef MAXALIASES
-#define	MAXALIASES	35
-#endif
-#ifndef	MAXADDRS
-#define	MAXADDRS	2
-#endif
-#ifndef MAXDNAME
-#define	MAXDNAME	1025
-#endif
-
-#ifdef INET6
-#define	ADDRLEN(af)	((af) == AF_INET6 ? sizeof(struct in6_addr) : \
-					    sizeof(struct in_addr))
-#else
-#define	ADDRLEN(af)	sizeof(struct in_addr)
-#endif
-
-#define	MAPADDR(ab, ina) \
-do {									\
-	memcpy(&(ab)->map_inaddr, ina, sizeof(struct in_addr));		\
-	memset((ab)->map_zero, 0, sizeof((ab)->map_zero));		\
-	memset((ab)->map_one, 0xff, sizeof((ab)->map_one));		\
-} while (0)
-#define	MAPADDRENABLED(flags) \
-	(((flags) & AI_V4MAPPED) || \
-	 (((flags) & AI_V4MAPPED_CFG) && _mapped_addr_enabled()))
-
-union inx_addr {
-	struct in_addr	in_addr;
-#ifdef INET6
-	struct in6_addr	in6_addr;
-#endif
-	struct {
-		u_char	mau_zero[10];
-		u_char	mau_one[2];
-		struct in_addr mau_inaddr;
-	}		map_addr_un;
-#define	map_zero	map_addr_un.mau_zero
-#define	map_one		map_addr_un.mau_one
-#define	map_inaddr	map_addr_un.mau_inaddr
-};
-
-u_int16_t _getshort(const u_char *src);
-
-static struct	 hostent *_hpcopy(struct hostent *hp, int *errp);
-static struct	 hostent *_hpaddr(int af, const char *name, void *addr, int *errp);
-static struct	 hostent *_hpmerge(struct hostent *hp1, struct hostent *hp2, int *errp);
-#ifdef INET6
-static struct	 hostent *_hpmapv6(struct hostent *hp, int *errp);
-#endif
-static struct	 hostent *_hpsort(struct hostent *hp);
-static struct	 hostent *_ghbyname(const char *name, int af, int flags, int *errp);
-static char	*_hgetword(char **pp);
-static int	 _mapped_addr_enabled(void);
-
-static FILE	*_files_open(int *errp);
-static int	 _files_ghbyname(void *, void *, va_list);
-static int	 _files_ghbyaddr(void *, void *, va_list);
-#if 0 // keep gcc happy
-static void	 _files_shent(int stayopen);
-static void	 _files_ehent(void);
-#endif
-#ifdef YP
-static int	 _nis_ghbyname(void *, void *, va_list);
-static int	 _nis_ghbyaddr(void *, void *, va_list);
-#endif
-static int	 _dns_ghbyname(void *, void *, va_list);
-static int	 _dns_ghbyaddr(void *, void *, va_list);
-#if 0 // keep gcc happy
-static void	 _dns_shent(int stayopen);
-static void	 _dns_ehent(void);
-#endif
-
-#ifdef ICMPNL
-static int	 _icmp_ghbyaddr(void *, void *, va_list);
-#endif /* ICMPNL */
-
-/* Host lookup order if nsswitch.conf is broken or nonexistant */
-static const ns_src default_src[] = { 
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ NSSRC_DNS, NS_SUCCESS },
-#ifdef ICMPNL
-#define NSSRC_ICMP "icmp"
-	{ NSSRC_ICMP, NS_SUCCESS },
-#endif
-	{ 0 }
-};
-
-/*
- * Check if kernel supports mapped address.
- *	implementation dependent
- */
-#ifdef __KAME__
-#include <sys/sysctl.h>
-#endif /* __KAME__ */
-
-static int
-_mapped_addr_enabled(void)
-{
-	/* implementation dependent check */
-#if defined(__KAME__) && defined(IPV6CTL_MAPPED_ADDR)
-	int mib[4];
-	size_t len;
-	int val;
-
-	mib[0] = CTL_NET;
-	mib[1] = PF_INET6;
-	mib[2] = IPPROTO_IPV6;
-	mib[3] = IPV6CTL_MAPPED_ADDR;
-	len = sizeof(val);
-	if (__sysctl(mib, 4, &val, &len, 0, 0) == 0 && val != 0)
-		return 1;
-#endif /* __KAME__ && IPV6CTL_MAPPED_ADDR */
-	return 0;
-}
-
-/*
- * Functions defined in RFC2553
- *	getipnodebyname, getipnodebyaddr, freehostent
- */
-
-static struct hostent *
-_ghbyname(const char *name, int af, int flags, int *errp)
-{
-	struct hostent *hp;
-	int rval;
-	
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_ghbyname, NULL)
-		{ NSSRC_DNS, _dns_ghbyname, NULL },
-		NS_NIS_CB(_nis_ghbyname, NULL)
-		{ 0 }
-	};
-
-	if (flags & AI_ADDRCONFIG) {
-		int s;
-
-		/*
-		 * TODO:
-		 * Note that implementation dependent test for address
-		 * configuration should be done everytime called
-		 * (or apropriate interval),
-		 * because addresses will be dynamically assigned or deleted.
-		 */
-		if (af == AF_UNSPEC) {
-			if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
-				af = AF_INET;
-			else {
-				close(s);
-				if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
-					af = AF_INET6;
-				else
-				close(s);
-			}
-
-		}
-		if (af != AF_UNSPEC) {
-			if ((s = socket(af, SOCK_DGRAM, 0)) < 0)
-				return NULL;
-			close(s);
-		}
-	}
-
-	rval = nsdispatch(&hp, dtab, NSDB_HOSTS, "ghbyname", default_src,
-			  name, af, errp);
-	return (rval == NS_SUCCESS) ? hp : NULL;
-}
-
-/* getipnodebyname() internal routine for multiple query(PF_UNSPEC) support. */
-struct hostent *
-_getipnodebyname_multi(const char *name, int af, int flags, int *errp)
-{
-	struct hostent *hp;
-	union inx_addr addrbuf;
-
-	/* XXX: PF_UNSPEC is only supposed to be passed from getaddrinfo() */
-	if (af != AF_INET
-#ifdef INET6
-	    && af != AF_INET6
-#endif
-	    && af != PF_UNSPEC
-		)
-	{
-		*errp = NO_RECOVERY;
-		return NULL;
-	}
-
-#ifdef INET6
-	/* special case for literal address */
-	if (inet_pton(AF_INET6, name, &addrbuf) == 1) {
-		if (af != AF_INET6) {
-			*errp = HOST_NOT_FOUND;
-			return NULL;
-		}
-		return _hpaddr(af, name, &addrbuf, errp);
-	}
-#endif
-	if (inet_aton(name, (struct in_addr *)&addrbuf) == 1) {
-		if (af != AF_INET) {
-			if (MAPADDRENABLED(flags)) {
-				MAPADDR(&addrbuf, &addrbuf.in_addr);
-			} else {
-				*errp = HOST_NOT_FOUND;
-				return NULL;
-			}
-		}
-		return _hpaddr(af, name, &addrbuf, errp);
-	}
-
-	*errp = HOST_NOT_FOUND;
-	hp = _ghbyname(name, af, flags, errp);
-
-#ifdef INET6
-	if (af == AF_INET6
-	&&  ((flags & AI_ALL) || hp == NULL)
-	&&  (MAPADDRENABLED(flags))) {
-		struct hostent *hp2 = _ghbyname(name, AF_INET, flags, errp);
-		if (hp == NULL)
-			hp = _hpmapv6(hp2, errp);
-		else {
-			if (hp2 && strcmp(hp->h_name, hp2->h_name) != 0) {
-				freehostent(hp2);
-				hp2 = NULL;
-			}
-			hp = _hpmerge(hp, hp2, errp);
-		}
-	}
-#endif
-	return _hpsort(hp);
-}
-
-struct hostent *
-getipnodebyname(const char *name, int af, int flags, int *errp)
-{
-	if (af != AF_INET
-#ifdef INET6
-	    && af != AF_INET6
-#endif
-		)
-	{
-		*errp = NO_RECOVERY;
-		return NULL;
-	}
-	return(_getipnodebyname_multi(name, af ,flags, errp));
-}
-
-struct hostent *
-getipnodebyaddr(const void *src, size_t len, int af, int *errp)
-{
-	struct hostent *hp;
-	int rval;
-#ifdef INET6
-	struct in6_addr addrbuf;
-#else
-	struct in_addr addrbuf;
-#endif
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_ghbyaddr, NULL)
-		{ NSSRC_DNS, _dns_ghbyaddr, NULL },
-		NS_NIS_CB(_nis_ghbyaddr, NULL)
-#ifdef ICMPNL
-		{ NSSRC_ICMP, _icmp_ghbyaddr, NULL },
-#endif
-		{ 0 }
-	};
-
-	*errp = HOST_NOT_FOUND;
-
-	switch (af) {
-	case AF_INET:
-		if (len != sizeof(struct in_addr)) {
-			*errp = NO_RECOVERY;
-			return NULL;
-		}
-		if ((long)src & ~(sizeof(struct in_addr) - 1)) {
-			memcpy(&addrbuf, src, len);
-			src = &addrbuf;
-		}
-		if (((struct in_addr *)src)->s_addr == 0)
-			return NULL;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		if (len != sizeof(struct in6_addr)) {
-			*errp = NO_RECOVERY;
-			return NULL;
-		}
-		if ((long)src & ~(sizeof(struct in6_addr) / 2 - 1)) {	/*XXX*/
-			memcpy(&addrbuf, src, len);
-			src = &addrbuf;
-		}
-		if (IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *)src))
-			return NULL;
-		if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)src)
-		||  IN6_IS_ADDR_V4COMPAT((struct in6_addr *)src)) {
-			src = (char *)src +
-			    (sizeof(struct in6_addr) - sizeof(struct in_addr));
-			af = AF_INET;
-			len = sizeof(struct in_addr);
-		}
-		break;
-#endif
-	default:
-		*errp = NO_RECOVERY;
-		return NULL;
-	}
-
-	rval = nsdispatch(&hp, dtab, NSDB_HOSTS, "ghbyaddr", default_src,
-			  src, len, af, errp);
-	return (rval == NS_SUCCESS) ? hp : NULL;
-}
-
-void
-freehostent(struct hostent *ptr)
-{
-	free(ptr);
-}
-
-#if 0
-
-/* XXX: should be deprecated */
-struct hostent *
-getnodebyname(const char *name, int af, int flags)
-{
-	return getipnodebyname(name, af, flags, &h_errno);
-}
-
-#ifdef __warn_references
-__warn_references(getnodebyname,
-	"warning: getnodebyname() deprecated, "
-	"should use getaddrinfo() or getipnodebyname()");
-#endif
-
-struct hostent *
-getnodebyaddr(const void *src, size_t len, int af)
-{
-	return getipnodebyaddr(src, len, af, &h_errno);
-}
-
-#ifdef __warn_references
-__warn_references(getnodebyaddr,
-	"warning: getnodebyaddr() deprecated, "
-	"should use getnameinfo() or getipnodebyaddr()");
-#endif
-
-#endif
-
-/*
- * Private utility functions
- */
-
-/*
- * _hpcopy: allocate and copy hostent structure
- */
-static struct hostent *
-_hpcopy(struct hostent *hp, int *errp)
-{
-	struct hostent *nhp;
-	char *cp, **pp;
-	int size, addrsize;
-	int nalias = 0, naddr = 0;
-	int al_off;
-	int i;
-
-	if (hp == NULL)
-		return hp;
-
-	/* count size to be allocated */
-	size = sizeof(struct hostent);
-	if (hp->h_name != NULL)
-		size += strlen(hp->h_name) + 1;
-	if ((pp = hp->h_aliases) != NULL) {
-		for (i = 0; *pp != NULL; i++, pp++) {
-			if (**pp != '\0') {
-				size += strlen(*pp) + 1;
-				nalias++;
-			}
-		}
-	}
-	/* adjust alignment */
-#ifdef	ALIGN
-	size = ALIGN(size);
-#endif
-	al_off = size;
-	size += sizeof(char *) * (nalias + 1);
-#ifdef ALIGN
-	addrsize = ALIGN(hp->h_length);
-#else
-	addrsize = hp->h_length;
-#endif
-        
-	if ((pp = hp->h_addr_list) != NULL) {
-		while (*pp++ != NULL)
-			naddr++;
-	}
-	size += addrsize * naddr;
-	size += sizeof(char *) * (naddr + 1);
-
-	/* copy */
-	if ((nhp = (struct hostent *)malloc(size)) == NULL) {
-		*errp = TRY_AGAIN;
-		return NULL;
-	}
-	cp = (char *)&nhp[1];
-	if (hp->h_name != NULL) {
-		nhp->h_name = cp;
-		strcpy(cp, hp->h_name);
-		cp += strlen(cp) + 1;
-	} else
-		nhp->h_name = NULL;
-	nhp->h_aliases = (char **)((char *)nhp + al_off);
-	if ((pp = hp->h_aliases) != NULL) {
-		for (i = 0; *pp != NULL; pp++) {
-			if (**pp != '\0') {
-				nhp->h_aliases[i++] = cp;
-				strcpy(cp, *pp);
-				cp += strlen(cp) + 1;
-			}
-		}
-	}
-	nhp->h_aliases[nalias] = NULL;
-	cp = (char *)&nhp->h_aliases[nalias + 1];
-	nhp->h_addrtype = hp->h_addrtype;
-	nhp->h_length = hp->h_length;
-	nhp->h_addr_list = (char **)cp;
-	if ((pp = hp->h_addr_list) != NULL) {
-		cp = (char *)&nhp->h_addr_list[naddr + 1];
-		for (i = 0; *pp != NULL; pp++) {
-			nhp->h_addr_list[i++] = cp;
-			memcpy(cp, *pp, hp->h_length);
-			cp += addrsize;
-		}
-	}
-	nhp->h_addr_list[naddr] = NULL;
-	return nhp;
-}
-
-/*
- * _hpaddr: construct hostent structure with one address
- */
-static struct hostent *
-_hpaddr(int af, const char *name, void *addr, int *errp)
-{
-	struct hostent *hp, hpbuf;
-	char *addrs[2];
-
-	hp = &hpbuf;
-	hp->h_name = (char *)name;
-	hp->h_aliases = NULL;
-	hp->h_addrtype = af;
-	hp->h_length = ADDRLEN(af);
-	hp->h_addr_list = addrs;
-	addrs[0] = (char *)addr;
-	addrs[1] = NULL;
-	return _hpcopy(hp, errp);
-}
-
-/*
- * _hpmerge: merge 2 hostent structure, arguments will be freed
- */
-static struct hostent *
-_hpmerge(struct hostent *hp1, struct hostent *hp2, int *errp)
-{
-	int i, j;
-	int naddr, nalias;
-	char **pp;
-	struct hostent *hp, hpbuf;
-	char *aliases[MAXALIASES + 1], *addrs[MAXADDRS + 1];
-	union inx_addr addrbuf[MAXADDRS];
-
-	if (hp1 == NULL)
-		return hp2;
-	if (hp2 == NULL)
-		return hp1;
-
-#define	HP(i)	(i == 1 ? hp1 : hp2)
-	hp = &hpbuf;
-	hp->h_name = (hp1->h_name != NULL ? hp1->h_name : hp2->h_name);
-	hp->h_aliases = aliases;
-	nalias = 0;
-	for (i = 1; i <= 2; i++) {
-		if ((pp = HP(i)->h_aliases) == NULL)
-			continue;
-		for (; nalias < MAXALIASES && *pp != NULL; pp++) {
-			/* check duplicates */
-			for (j = 0; j < nalias; j++)
-				if (strcasecmp(*pp, aliases[j]) == 0)
-					break;
-			if (j == nalias)
-				aliases[nalias++] = *pp;
-		}
-	}
-	aliases[nalias] = NULL;
-#ifdef INET6
-	if (hp1->h_length != hp2->h_length) {
-		hp->h_addrtype = AF_INET6;
-		hp->h_length = sizeof(struct in6_addr);
-	} else {
-#endif
-		hp->h_addrtype = hp1->h_addrtype;
-		hp->h_length = hp1->h_length;
-#ifdef INET6
-	}
-#endif
-	hp->h_addr_list = addrs;
-	naddr = 0;
-	for (i = 1; i <= 2; i++) {
-		if ((pp = HP(i)->h_addr_list) == NULL)
-			continue;
-		if (HP(i)->h_length == hp->h_length) {
-			while (naddr < MAXADDRS && *pp != NULL)
-				addrs[naddr++] = *pp++;
-		} else {
-			/* copy IPv4 addr as mapped IPv6 addr */
-			while (naddr < MAXADDRS && *pp != NULL) {
-				MAPADDR(&addrbuf[naddr], *pp++);
-				addrs[naddr] = (char *)&addrbuf[naddr];
-				naddr++;
-			}
-		}
-	}
-	addrs[naddr] = NULL;
-	hp = _hpcopy(hp, errp);
-	freehostent(hp1);
-	freehostent(hp2);
-	return hp;
-}
-
-/*
- * _hpmapv6: convert IPv4 hostent into IPv4-mapped IPv6 addresses
- */
-#ifdef INET6
-static struct hostent *
-_hpmapv6(struct hostent *hp, int *errp)
-{
-	struct hostent *hp6;
-
-	if (hp == NULL)
-		return NULL;
-	if (hp->h_addrtype == AF_INET6)
-		return hp;
-
-	/* make dummy hostent to convert IPv6 address */
-	if ((hp6 = (struct hostent *)malloc(sizeof(struct hostent))) == NULL) {
-		*errp = TRY_AGAIN;
-		return NULL;
-	}
-	hp6->h_name = NULL;
-	hp6->h_aliases = NULL;
-	hp6->h_addrtype = AF_INET6;
-	hp6->h_length = sizeof(struct in6_addr);
-	hp6->h_addr_list = NULL;
-	return _hpmerge(hp6, hp, errp);
-}
-#endif
-
-/*
- * _hpsort: sort address by sortlist
- */
-static struct hostent *
-_hpsort(struct hostent *hp)
-{
-	int i, j, n;
-	u_char *ap, *sp, *mp, **pp;
-	char t;
-	char order[MAXADDRS];
-	int nsort = _res.nsort;
-
-	if (hp == NULL || hp->h_addr_list[1] == NULL || nsort == 0)
-		return hp;
-	for (i = 0; (ap = (u_char *)hp->h_addr_list[i]); i++) {
-		for (j = 0; j < nsort; j++) {
-#ifdef INET6
-			if (_res_ext.sort_list[j].af != hp->h_addrtype)
-				continue;
-			sp = (u_char *)&_res_ext.sort_list[j].addr;
-			mp = (u_char *)&_res_ext.sort_list[j].mask;
-#else
-			sp = (u_char *)&_res.sort_list[j].addr;
-			mp = (u_char *)&_res.sort_list[j].mask;
-#endif
-			for (n = 0; n < hp->h_length; n++) {
-				if ((ap[n] & mp[n]) != sp[n])
-					break;
-			}
-			if (n == hp->h_length)
-				break;
-		}
-		order[i] = j;
-	}
-	n = i;
-	pp = (u_char **)hp->h_addr_list;
-	for (i = 0; i < n - 1; i++) {
-		for (j = i + 1; j < n; j++) {
-			if (order[i] > order[j]) {
-				ap = pp[i];
-				pp[i] = pp[j];
-				pp[j] = ap;
-				t = order[i];
-				order[i] = order[j];
-				order[j] = t;
-			}
-		}
-	}
-	return hp;
-}
-
-static char *
-_hgetword(char **pp)
-{
-	char c, *p, *ret;
-	const char *sp;
-	static const char sep[] = "# \t\n";
-
-	ret = NULL;
-	for (p = *pp; (c = *p) != '\0'; p++) {
-		for (sp = sep; *sp != '\0'; sp++) {
-			if (c == *sp)
-				break;
-		}
-		if (c == '#')
-			p[1] = '\0';	/* ignore rest of line */
-		if (ret == NULL) {
-			if (*sp == '\0')
-				ret = p;
-		} else {
-			if (*sp != '\0') {
-				*p++ = '\0';
-				break;
-			}
-		}
-	}
-	*pp = p;
-	if (ret == NULL || *ret == '\0')
-		return NULL;
-	return ret;
-}
-
-/*
- * FILES (/etc/hosts)
- */
-
-static FILE *
-_files_open(int *errp)
-{
-	FILE *fp;
-	fp = fopen(_PATH_HOSTS, "r");
-	if (fp == NULL)
-		*errp = NO_RECOVERY;
-	return fp;
-}
-
-static int
-_files_ghbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	int af; 
-	int *errp;
-	int match, nalias;
-	char *p, *line, *addrstr, *cname;
-	FILE *fp;
-	struct hostent *rethp, *hp, hpbuf;
-	char *aliases[MAXALIASES + 1], *addrs[2];
-	union inx_addr addrbuf;
-	char buf[BUFSIZ];
-	int af0;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-	errp = va_arg(ap, int *);
-
-	*(struct hostent **)rval = NULL;
-
-	if ((fp = _files_open(errp)) == NULL)
-		return NS_UNAVAIL;
-	rethp = hp = NULL;
-
-	af0 = af;
-	while (fgets(buf, sizeof(buf), fp)) {
-		line = buf;
-		if ((addrstr = _hgetword(&line)) == NULL
-		||  (cname = _hgetword(&line)) == NULL)
-			continue;
-		match = (strcasecmp(cname, name) == 0);
-		nalias = 0;
-		while ((p = _hgetword(&line)) != NULL) {
-			if (!match)
-				match = (strcasecmp(p, name) == 0);
-			if (nalias < MAXALIASES)
-				aliases[nalias++] = p;
-		}
-		if (!match)
-			continue;
-		switch (af0) {
-		case AF_INET:
-			if (inet_aton(addrstr, (struct in_addr *)&addrbuf)
-			    != 1) {
-				*errp = NO_DATA;	/* name found */
-				continue;
-			}
-			af = af0;
-			break;
-#ifdef INET6
-		case AF_INET6:
-			if (inet_pton(af, addrstr, &addrbuf) != 1) {
-				*errp = NO_DATA;	/* name found */
-				continue;
-			}
-			af = af0;
-			break;
-#endif
-		case AF_UNSPEC:
-			if (inet_aton(addrstr, (struct in_addr *)&addrbuf)
-			    == 1) {
-				af = AF_INET;
-				break;
-			}
-#ifdef INET6
-			if (inet_pton(AF_INET6, addrstr, &addrbuf) == 1) {
-				af = AF_INET6;
-				break; 
-			}
-#endif
-			*errp = NO_DATA;	/* name found */
-			continue;
-			/* NOTREACHED */
-		}
-		hp = &hpbuf;
-		hp->h_name = cname;
-		hp->h_aliases = aliases;
-		aliases[nalias] = NULL;
-		hp->h_addrtype = af;
-		hp->h_length = ADDRLEN(af);
-		hp->h_addr_list = addrs;
-		addrs[0] = (char *)&addrbuf;
-		addrs[1] = NULL;
-		hp = _hpcopy(hp, errp);
-		rethp = _hpmerge(rethp, hp, errp);
-	}
-	fclose(fp);
-	*(struct hostent **)rval = rethp;
-	return (rethp != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
-
-static int
-_files_ghbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const void *addr; 
-	int addrlen; 
-	int af; 
-	int *errp;
-	int nalias;
-	char *p, *line;
-	FILE *fp;
-	struct hostent *hp, hpbuf;
-	char *aliases[MAXALIASES + 1], *addrs[2];
-	union inx_addr addrbuf;
-	char buf[BUFSIZ];
-
-	addr = va_arg(ap, const void *);
-	addrlen = va_arg(ap, int);
-	af = va_arg(ap, int);
-	errp = va_arg(ap, int *);
-
-	*(struct hostent**)rval = NULL;
-
-	if ((fp = _files_open(errp)) == NULL)
-		return NS_UNAVAIL;
-	hp = NULL;
-	while (fgets(buf, sizeof(buf), fp)) {
-		line = buf;
-		if ((p = _hgetword(&line)) == NULL
-		||  (af == AF_INET
-		     ? inet_aton(p, (struct in_addr *)&addrbuf)
-		     : inet_pton(af, p, &addrbuf)) != 1
-		||  memcmp(addr, &addrbuf, addrlen) != 0
-		||  (p = _hgetword(&line)) == NULL)
-			continue;
-		hp = &hpbuf;
-		hp->h_name = p;
-		hp->h_aliases = aliases;
-		nalias = 0;
-		while ((p = _hgetword(&line)) != NULL) {
-			if (nalias < MAXALIASES)
-				aliases[nalias++] = p;
-		}
-		aliases[nalias] = NULL;
-		hp->h_addrtype = af;
-		hp->h_length = addrlen;
-		hp->h_addr_list = addrs;
-		addrs[0] = (char *)&addrbuf;
-		addrs[1] = NULL;
-		hp = _hpcopy(hp, errp);
-		break;
-	}
-	fclose(fp);
-	*(struct hostent **)rval = hp;
-	return (hp != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
-
-#ifdef YP
-/*
- * NIS
- *
- * XXX actually a hack, these are INET4 specific.
- */
-static int
-_nis_ghbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	int af;
-	int *errp;
-	struct hostent *hp = NULL;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-	errp = va_arg(ap, int *);
-	
-	if (af == AF_UNSPEC)
-		af = AF_INET;
-	if (af == AF_INET) {
-		hp = _gethostbynisname(name, af);
-		if (hp != NULL)
-			hp = _hpcopy(hp, errp);
-	}
-	
-	*(struct hostent **)rval = hp;
-	return (hp != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-	
-}
-
-static int
-_nis_ghbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const void *addr;
-	int addrlen;
-	int af;
-	int *errp;
-	struct hostent *hp = NULL;
-
-	addr = va_arg(ap, const void *);
-	addrlen = va_arg(ap, int);
-	af = va_arg(ap, int);
-
-	if (af == AF_INET) {
-		hp = _gethostbynisaddr(addr, addrlen, af);
-		if (hp != NULL)
-			hp = _hpcopy(hp, errp);
-	}
-	*(struct hostent **)rval = hp;
-	return (hp != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
-#endif
-typedef struct __res_type_list res_type_list;
-
-struct __res_type_list {
-        res_type_list * rtl_entry;
-        int     rtl_type;
-};
-
-#if PACKETSZ > 1024
-#define	MAXPACKET	PACKETSZ
-#else
-#define	MAXPACKET	1024
-#endif
-
-typedef union {
-	HEADER hdr;
-	u_char buf[MAXPACKET];
-} querybuf;
-
-static struct hostent *getanswer(const querybuf *, int, const char *, int,
-	    struct hostent *, int *);
-
-/*
- * we don't need to take care about sorting, nor IPv4 mapped address here.
- */
-static struct hostent *
-getanswer(answer, anslen, qname, qtype, template, errp)
-	const querybuf *answer;
-	int anslen;
-	const char *qname;
-	int qtype;
-	struct hostent *template;
-	int *errp;
-{
-	const HEADER *hp;
-	const u_char *cp;
-	int n;
-	const u_char *eom, *erdata;
-	char *bp, **ap, **hap;
-	int type, class, buflen, ancount, qdcount;
-	int haveanswer, had_error;
-	char tbuf[MAXDNAME];
-	const char *tname;
-	int (*name_ok)(const char *);
-	static char *h_addr_ptrs[MAXADDRS + 1];
-	static char *host_aliases[MAXALIASES];
-	static char hostbuf[8*1024];
-
-#define BOUNDED_INCR(x) \
-	do { \
-		cp += x; \
-		if (cp > eom) { \
-			*errp = NO_RECOVERY; \
-			return (NULL); \
-		} \
-	} while (0)
-
-#define BOUNDS_CHECK(ptr, count) \
-	do { \
-		if ((ptr) + (count) > eom) { \
-			*errp = NO_RECOVERY; \
-			return (NULL); \
-		} \
-	} while (0)
-
-/* XXX do {} while (0) cannot be put here */
-#define DNS_ASSERT(x) \
-	{				\
-		if (!(x)) {		\
-			cp += n;	\
-			continue;	\
-		}			\
-	}
-
-/* XXX do {} while (0) cannot be put here */
-#define DNS_FATAL(x) \
-	{				\
-		if (!(x)) {		\
-			had_error++;	\
-			continue;	\
-		}			\
-	}
-
-	tname = qname;
-	template->h_name = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-		name_ok = res_hnok;
-		break;
-	case T_PTR:
-		name_ok = res_dnok;
-		break;
-	default:
-		return (NULL);	/* XXX should be abort(); */
-	}
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = hostbuf;
-	buflen = sizeof hostbuf;
-	cp = answer->buf;
-	BOUNDED_INCR(HFIXEDSZ);
-	if (qdcount != 1) {
-		*errp = NO_RECOVERY;
-		return (NULL);
-	}
-	n = dn_expand(answer->buf, eom, cp, bp, buflen);
-	if ((n < 0) || !(*name_ok)(bp)) {
-		*errp = NO_RECOVERY;
-		return (NULL);
-	}
-	BOUNDED_INCR(n + QFIXEDSZ);
-	if (qtype == T_A || qtype == T_AAAA) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN) {
-			*errp = NO_RECOVERY;
-			return (NULL);
-		}
-		template->h_name = bp;
-		bp += n;
-		buflen -= n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = template->h_name;
-	}
-	ap = host_aliases;
-	*ap = NULL;
-	template->h_aliases = host_aliases;
-	hap = h_addr_ptrs;
-	*hap = NULL;
-	template->h_addr_list = h_addr_ptrs;
-	haveanswer = 0;
-	had_error = 0;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, buflen);
-		DNS_FATAL(n >= 0);
-		DNS_FATAL((*name_ok)(bp));
-		cp += n;			/* name */
-		BOUNDS_CHECK(cp, 3 * INT16SZ + INT32SZ);
-		type = _getshort(cp);
- 		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
- 		cp += INT16SZ + INT32SZ;	/* class, TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		BOUNDS_CHECK(cp, n);
-		erdata = cp + n;
-		DNS_ASSERT(class == C_IN);
-		if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {
-			if (ap >= &host_aliases[MAXALIASES-1])
-				continue;
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			DNS_FATAL(n >= 0);
-			DNS_FATAL((*name_ok)(tbuf));
-			cp += n;
-			if (cp != erdata) {
-				*errp = NO_RECOVERY;
-				return (NULL);
-			}
-			/* Store alias. */
-			*ap++ = bp;
-			n = strlen(bp) + 1;	/* for the \0 */
-			DNS_FATAL(n < MAXHOSTNAMELEN);
-			bp += n;
-			buflen -= n;
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			DNS_FATAL(n <= buflen);
-			DNS_FATAL(n < MAXHOSTNAMELEN);
-			strcpy(bp, tbuf);
-			template->h_name = bp;
-			bp += n;
-			buflen -= n;
-			continue;
-		}
-		if (qtype == T_PTR && type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if (n < 0 || !res_dnok(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				*errp = NO_RECOVERY;
-				return (NULL);
-			}
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			tname = bp;
-			bp += n;
-			buflen -= n;
-			continue;
-		}
-		DNS_ASSERT(type == qtype);
-		switch (type) {
-		case T_PTR:
-			DNS_ASSERT(strcasecmp(tname, bp) == 0);
-			n = dn_expand(answer->buf, eom, cp, bp, buflen);
-			DNS_FATAL(n >= 0);
-			DNS_FATAL(res_hnok(bp));
-#if MULTI_PTRS_ARE_ALIASES
-			cp += n;
-			if (cp != erdata) {
-				*errp = NO_RECOVERY;
-				return (NULL);
-			}
-			if (!haveanswer)
-				template->h_name = bp;
-			else if (ap < &host_aliases[MAXALIASES-1])
-				*ap++ = bp;
-			else
-				n = -1;
-			if (n != -1) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				buflen -= n;
-			}
-			break;
-#else
-			template->h_name = bp;
-			*errp = NETDB_SUCCESS;
-			return (template);
-#endif
-		case T_A:
-		case T_AAAA:
-			DNS_ASSERT(strcasecmp(template->h_name, bp) == 0);
-			DNS_ASSERT(n == template->h_length);
-			if (!haveanswer) {
-				int nn;
-
-				template->h_name = bp;
-				nn = strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-				buflen -= nn;
-			}
-#ifdef ALIGN
-			bp = (char *)ALIGN(bp);
-#else
-			bp = (char *)(bp);
-#endif
-
-			DNS_FATAL(bp + n < &hostbuf[sizeof hostbuf]);
-			DNS_ASSERT(hap < &h_addr_ptrs[MAXADDRS-1]);
-#ifdef FILTER_V4MAPPED
-			if (type == T_AAAA) {
-				struct in6_addr in6;
-				memcpy(&in6, cp, sizeof(in6));
-				DNS_ASSERT(IN6_IS_ADDR_V4MAPPED(&in6) == 0);
-			}
-#endif
-			bcopy(cp, *hap++ = bp, n);
-			bp += n;
-			buflen -= n;
-			cp += n;
-			if (cp != erdata) {
-				*errp = NO_RECOVERY;
-				return (NULL);
-			}
-			break;
-		default:
-			abort();
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		*hap = NULL;
-		if (!template->h_name) {
-			n = strlen(qname) + 1;	/* for the \0 */
-			if (n > buflen || n >= MAXHOSTNAMELEN)
-				goto no_recovery;
-			strcpy(bp, qname);
-			template->h_name = bp;
-			bp += n;
-			buflen -= n;
-		}
-		*errp = NETDB_SUCCESS;
-		return (template);
-	}
- no_recovery:
-	*errp = NO_RECOVERY;
-	return (NULL);
-
-#undef BOUNDED_INCR
-#undef BOUNDS_CHECK
-#undef DNS_ASSERT
-#undef DNS_FATAL
-}
-
-/* res_search() variant with multiple query support. */
-static struct hostent *
-_res_search_multi(name, rtl, errp)
-	const char *name;	/* domain name */
-	struct	__res_type_list *rtl; /* list of query types */
-	int *errp;
-{
-	const char *cp, * const *domain;
-	struct hostent *hp0 = NULL, *hp;
-	struct hostent hpbuf;
-	u_int dots;
-	int trailing_dot, ret, saved_herrno;
-	int got_nodata = 0, got_servfail = 0, tried_as_is = 0;
-	struct __res_type_list *rtl0 = rtl;
-	querybuf buf;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		*errp = NETDB_INTERNAL;
-		return (NULL);
-	}
-	dots = 0;
-	for (cp = name; *cp; cp++)
-		dots += (*cp == '.');
-	trailing_dot = 0;
-	if (cp > name && *--cp == '.')
-		trailing_dot++;
-
-	/* If there aren't any dots, it could be a user-level alias */
-	if (!dots && (cp = hostalias(name)) != NULL) {
-		for(rtl = rtl0; rtl != NULL;
-		    rtl = rtl->rtl_entry) {
-			ret = res_query(cp, C_IN, rtl->rtl_type, buf.buf,
-					     sizeof(buf.buf));
-			if (ret > 0) {
-				hpbuf.h_addrtype = (rtl->rtl_type == T_AAAA)
-				    ? AF_INET6 : AF_INET;
-				hpbuf.h_length = ADDRLEN(hpbuf.h_addrtype);
-				hp = getanswer(&buf, ret, name, rtl->rtl_type,
-						    &hpbuf, errp);
-				if (!hp)
-					continue;
-				hp = _hpcopy(&hpbuf, errp);
-				hp0 = _hpmerge(hp0, hp, errp);
-			}
-		}
-		return (hp0);
-	}
-
-	/*
-	 * If there are dots in the name already, let's just give it a try
-	 * 'as is'.  The threshold can be set with the "ndots" option.
-	 */
-	saved_herrno = -1;
-	if (dots >= _res.ndots) {
-		for(rtl = rtl0; rtl != NULL;
-		    rtl = rtl->rtl_entry) {
-			ret = res_querydomain(name, NULL, C_IN, rtl->rtl_type,
-					      buf.buf, sizeof(buf.buf));
-			if (ret > 0) {
-				hpbuf.h_addrtype = (rtl->rtl_type == T_AAAA)
-				    ? AF_INET6 : AF_INET;
-				hpbuf.h_length = ADDRLEN(hpbuf.h_addrtype);
-				hp = getanswer(&buf, ret, name, rtl->rtl_type,
-						    &hpbuf, errp);
-				if (!hp)
-					continue;
-				hp = _hpcopy(&hpbuf, errp);
-				hp0 = _hpmerge(hp0, hp, errp);
-			}
-		}
-		if (hp0 != NULL)
-			return (hp0);
-		saved_herrno = *errp;
-		tried_as_is++;
-	}
-
-	/*
-	 * We do at least one level of search if
-	 *	- there is no dot and RES_DEFNAME is set, or
-	 *	- there is at least one dot, there is no trailing dot,
-	 *	  and RES_DNSRCH is set.
-	 */
-	if ((!dots && (_res.options & RES_DEFNAMES)) ||
-	    (dots && !trailing_dot && (_res.options & RES_DNSRCH))) {
-		int done = 0;
-
-		for (domain = (const char * const *)_res.dnsrch;
-		     *domain && !done;
-		     domain++) {
-
-			for(rtl = rtl0; rtl != NULL;
-			    rtl = rtl->rtl_entry) {
-				ret = res_querydomain(name, *domain, C_IN,
-						      rtl->rtl_type,
-						      buf.buf, sizeof(buf.buf));
-				if (ret > 0) {
-					hpbuf.h_addrtype = (rtl->rtl_type == T_AAAA)
-					    ? AF_INET6 : AF_INET;
-					hpbuf.h_length = ADDRLEN(hpbuf.h_addrtype);
-					hp = getanswer(&buf, ret, name,
-					    rtl->rtl_type, &hpbuf, errp);
-					if (!hp)
-						continue;
-					hp = _hpcopy(&hpbuf, errp);
-					hp0 = _hpmerge(hp0, hp, errp);
-				}
-			}
-			if (hp0 != NULL)
-				return (hp0);
-
-			/*
-			 * If no server present, give up.
-			 * If name isn't found in this domain,
-			 * keep trying higher domains in the search list
-			 * (if that's enabled).
-			 * On a NO_DATA error, keep trying, otherwise
-			 * a wildcard entry of another type could keep us
-			 * from finding this entry higher in the domain.
-			 * If we get some other error (negative answer or
-			 * server failure), then stop searching up,
-			 * but try the input name below in case it's
-			 * fully-qualified.
-			 */
-			if (errno == ECONNREFUSED) {
-				*errp = TRY_AGAIN;
-				return (NULL);
-			}
-
-			switch (*errp) {
-			case NO_DATA:
-				got_nodata++;
-				/* FALLTHROUGH */
-			case HOST_NOT_FOUND:
-				/* keep trying */
-				break;
-			case TRY_AGAIN:
-				if (buf.hdr.rcode == SERVFAIL) {
-					/* try next search element, if any */
-					got_servfail++;
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				/* anything else implies that we're done */
-				done++;
-			}
-
-			/* if we got here for some reason other than DNSRCH,
-			 * we only wanted one iteration of the loop, so stop.
-			 */
-			if (!(_res.options & RES_DNSRCH))
-				done++;
-		}
-	}
-
-	/*
-	 * If we have not already tried the name "as is", do that now.
-	 * note that we do this regardless of how many dots were in the
-	 * name or whether it ends with a dot unless NOTLDQUERY is set.
-	 */
-	if (!tried_as_is && (dots || !(_res.options & RES_NOTLDQUERY))) {
-		for(rtl = rtl0; rtl != NULL;
-		    rtl = rtl->rtl_entry) {
-			ret = res_querydomain(name, NULL, C_IN, rtl->rtl_type,
-					      buf.buf, sizeof(buf.buf));
-			if (ret > 0) {
-				hpbuf.h_addrtype = (rtl->rtl_type == T_AAAA)
-				    ? AF_INET6 : AF_INET;
-				hpbuf.h_length = ADDRLEN(hpbuf.h_addrtype);
-				hp = getanswer(&buf, ret, name, rtl->rtl_type,
-				    &hpbuf, errp);
-				if (!hp)
-					continue;
-				hp = _hpcopy(&hpbuf, errp);
-				hp0 = _hpmerge(hp0, hp, errp);
-			}
-		}
-		if (hp0 != NULL)
-			return (hp0);
-	}
-
-	/* if we got here, we didn't satisfy the search.
-	 * if we did an initial full query, return that query's h_errno
-	 * (note that we wouldn't be here if that query had succeeded).
-	 * else if we ever got a nodata, send that back as the reason.
-	 * else send back meaningless h_errno, that being the one from
-	 * the last DNSRCH we did.
-	 */
-	if (saved_herrno != -1)
-		*errp = saved_herrno;
-	else if (got_nodata)
-		*errp = NO_DATA;
-	else if (got_servfail)
-		*errp = TRY_AGAIN;
-	return (NULL);
-}
-
-static int
-_dns_ghbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	int af;
-	int *errp;
-	res_type_list *rtl, rtl4;
-#ifdef INET6
-	res_type_list rtl6;
-#endif
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-	errp = va_arg(ap, int *);
-
-#ifdef INET6
-	switch (af) {
-	case AF_UNSPEC:
-		rtl4.rtl_entry = NULL; rtl4.rtl_type = T_A;
-		rtl6.rtl_entry = &rtl4; rtl6.rtl_type = T_AAAA;
-		rtl = &rtl6;
-		break;
-	case AF_INET6:
-		rtl6.rtl_entry = NULL; rtl6.rtl_type = T_AAAA;
-		rtl = &rtl6;
-		break;
-	case AF_INET:
-		rtl4.rtl_entry = NULL; rtl4.rtl_type = T_A;
-		rtl = &rtl4;
-		break;
-	}
-#else
-	(&rtl4)->rtl_entry = NULL;
-        rtl4.rtl_type = T_A;
-	rtl = &rtl4;
-#endif
-	*(struct hostent **)rval = _res_search_multi(name, rtl, errp);
-	return (*(struct hostent **)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
-
-static int
-_dns_ghbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const void *addr;
-	int addrlen;
-	int af;
-	int *errp;
-	int n;
-	struct hostent *hp;
-	u_char c, *cp;
-	char *bp;
-	struct hostent hbuf;
-	int na;
-#ifdef INET6
-	static const char hex[] = "0123456789abcdef";
-#endif
-	querybuf buf;
-	char qbuf[MAXDNAME+1];
-	char *hlist[2];
-
-	addr = va_arg(ap, const void *);
-	addrlen = va_arg(ap, int);
-	af = va_arg(ap, int);
-	errp = va_arg(ap, int *);
-
-	*(struct hostent **)rval = NULL;
-
-#ifdef INET6
-	/* XXX */
-	if (af == AF_INET6 && IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)addr))
-		return NS_NOTFOUND;
-#endif
-
-	if ((_res.options & RES_INIT) == 0) {
-		if (res_init() < 0) {
-			*errp = h_errno;
-			return NS_UNAVAIL;
-		}
-	}
-	memset(&hbuf, 0, sizeof(hbuf));
-	hbuf.h_name = NULL;
-	hbuf.h_addrtype = af;
-	hbuf.h_length = addrlen;
-	na = 0;
-
-	/* XXX assumes that MAXDNAME is big enough */
-	n = 0;
-	bp = qbuf;
-	cp = (u_char *)addr+addrlen-1;
-	switch (af) {
-#ifdef INET6
-	case AF_INET6:
-		for (; n < addrlen; n++, cp--) {
-			c = *cp;
-			*bp++ = hex[c & 0xf];
-			*bp++ = '.';
-			*bp++ = hex[c >> 4];
-			*bp++ = '.';
-		}
-		strcpy(bp, "ip6.int");
-		break;
-#endif
-	default:
-		for (; n < addrlen; n++, cp--) {
-			c = *cp;
-			if (c >= 100)
-				*bp++ = '0' + c / 100;
-			if (c >= 10)
-				*bp++ = '0' + (c % 100) / 10;
-			*bp++ = '0' + c % 10;
-			*bp++ = '.';
-		}
-		strcpy(bp, "in-addr.arpa");
-		break;
-	}
-
-	n = res_query(qbuf, C_IN, T_PTR, buf.buf, sizeof buf.buf);
-	if (n < 0) {
-		*errp = h_errno;
-		return NS_UNAVAIL;
-	}
-	hp = getanswer(&buf, n, qbuf, T_PTR, &hbuf, errp);
-	if (!hp)
-		return NS_NOTFOUND;
-	hbuf.h_addrtype = af;
-	hbuf.h_length = addrlen;
-	hbuf.h_addr_list = hlist;
-	hlist[0] = (char *)addr;
-	hlist[1] = NULL;
-	*(struct hostent **)rval = _hpcopy(&hbuf, errp);
-	return NS_SUCCESS;
-}
-
-#if 0 // keep gcc happy
-static void
-_dns_shent(int stayopen)
-{
-	if ((_res.options & RES_INIT) == 0) {
-		if (res_init() < 0)
-			return;
-	}
-	if (stayopen)
-		_res.options |= RES_STAYOPEN | RES_USEVC;
-}
-
-static void
-_dns_ehent(void)
-{
-	_res.options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_close();
-}
-#endif
-
-#ifdef ICMPNL
-
-/*
- * experimental:
- *	draft-ietf-ipngwg-icmp-namelookups-02.txt
- *	ifindex is assumed to be encoded in addr.
- */
-#include <sys/uio.h>
-#include <netinet/ip6.h>
-#include <netinet/icmp6.h>
-
-struct _icmp_host_cache {
-	struct _icmp_host_cache *hc_next;
-	int hc_ifindex;
-	struct in6_addr hc_addr;
-	char *hc_name;
-};
-
-static char *
-_icmp_fqdn_query(const struct in6_addr *addr, int ifindex)
-{
-	int s;
-	struct icmp6_filter filter;
-	struct msghdr msg;
-	struct cmsghdr *cmsg;
-	struct in6_pktinfo *pkt;
-	char cbuf[256];
-	char buf[1024];
-	int cc;
-	struct icmp6_fqdn_query *fq;
-	struct icmp6_fqdn_reply *fr;
-	struct _icmp_host_cache *hc;
-	struct sockaddr_in6 sin6;
-	struct iovec iov;
-	fd_set s_fds, fds;
-	struct timeval tout;
-	int len;
-	char *name;
-	static int pid;
-	static struct _icmp_host_cache *hc_head;
-
-	for (hc = hc_head; hc; hc = hc->hc_next) {
-		if (hc->hc_ifindex == ifindex
-		&&  IN6_ARE_ADDR_EQUAL(&hc->hc_addr, addr))
-			return hc->hc_name;
-	}
-
-	if (pid == 0)
-		pid = getpid();
-
-	ICMP6_FILTER_SETBLOCKALL(&filter);
-	ICMP6_FILTER_SETPASS(ICMP6_FQDN_REPLY, &filter);
-
-	FD_ZERO(&s_fds);
-	tout.tv_sec = 0;
-	tout.tv_usec = 200000;	/*XXX: 200ms*/
-
-	fq = (struct icmp6_fqdn_query *)buf;
-	fq->icmp6_fqdn_type = ICMP6_FQDN_QUERY;
-	fq->icmp6_fqdn_code = 0;
-	fq->icmp6_fqdn_cksum = 0;
-	fq->icmp6_fqdn_id = (u_short)pid;
-	fq->icmp6_fqdn_unused = 0;
-	fq->icmp6_fqdn_cookie[0] = 0;
-	fq->icmp6_fqdn_cookie[1] = 0;
-
-	memset(&sin6, 0, sizeof(sin6));
-	sin6.sin6_family = AF_INET6;
-	sin6.sin6_addr = *addr;
-
-	memset(&msg, 0, sizeof(msg));
-	msg.msg_name = (caddr_t)&sin6;
-	msg.msg_namelen = sizeof(sin6);
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	msg.msg_control = NULL;
-	msg.msg_controllen = 0;
-	iov.iov_base = (caddr_t)buf;
-	iov.iov_len = sizeof(struct icmp6_fqdn_query);
-
-	if (ifindex) {
-		msg.msg_control = cbuf;
-		msg.msg_controllen = sizeof(cbuf);
-		cmsg = CMSG_FIRSTHDR(&msg);
-		cmsg->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
-		cmsg->cmsg_level = IPPROTO_IPV6;
-		cmsg->cmsg_type = IPV6_PKTINFO;
-		pkt = (struct in6_pktinfo *)&cmsg[1];
-		memset(&pkt->ipi6_addr, 0, sizeof(struct in6_addr));
-		pkt->ipi6_ifindex = ifindex;
-		cmsg = CMSG_NXTHDR(&msg, cmsg);
-		msg.msg_controllen = (char *)cmsg - cbuf;
-	}
-
-	if ((s = socket(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) < 0)
-		return NULL;
-	(void)setsockopt(s, IPPROTO_ICMPV6, ICMP6_FILTER,
-			 (char *)&filter, sizeof(filter));
-	cc = _sendmsg(s, &msg, 0);
-	if (cc < 0) {
-		close(s);
-		return NULL;
-	}
-	FD_SET(s, &s_fds);
-	for (;;) {
-		fds = s_fds;
-		if (select(s + 1, &fds, NULL, NULL, &tout) <= 0) {
-			close(s);
-			return NULL;
-		}
-		len = sizeof(sin6);
-		cc = _recvfrom(s, buf, sizeof(buf), 0,
-			      (struct sockaddr *)&sin6, &len);
-		if (cc <= 0) {
-			close(s);
-			return NULL;
-		}
-		if (cc < sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr))
-			continue;
-		if (!IN6_ARE_ADDR_EQUAL(addr, &sin6.sin6_addr))
-			continue;
-		fr = (struct icmp6_fqdn_reply *)(buf + sizeof(struct ip6_hdr));
-		if (fr->icmp6_fqdn_type == ICMP6_FQDN_REPLY)
-			break;
-	}
-	close(s);
-	if (fr->icmp6_fqdn_cookie[1] != 0) {
-		/* rfc1788 type */
-		name = buf + sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr) + 4;
-		len = (buf + cc) - name;
-	} else {
-		len = fr->icmp6_fqdn_namelen;
-		name = fr->icmp6_fqdn_name;
-	}
-	if (len <= 0)
-		return NULL;
-	name[len] = 0;
-
-	if ((hc = (struct _icmp_host_cache *)malloc(sizeof(*hc))) == NULL)
-		return NULL;
-	/* XXX: limit number of cached entries */
-	hc->hc_ifindex = ifindex;
-	hc->hc_addr = *addr;
-	hc->hc_name = strdup(name);
-	hc->hc_next = hc_head;
-	hc_head = hc;
-	return hc->hc_name;
-}
-
-static struct hostent *
-_icmp_ghbyaddr(const void *addr, int addrlen, int af, int *errp)
-{
-	char *hname;
-	int ifindex;
-	struct in6_addr addr6;
-
-	if (af != AF_INET6) {
-		/*
-		 * Note: rfc1788 defines Who Are You for IPv4,
-		 * but no one implements it.
-		 */
-		return NULL;
-	}
-
-	memcpy(&addr6, addr, addrlen);
-	ifindex = (addr6.s6_addr[2] << 8) | addr6.s6_addr[3];
-	addr6.s6_addr[2] = addr6.s6_addr[3] = 0;
-
-	if (!IN6_IS_ADDR_LINKLOCAL(&addr6))
-		return NULL;	/*XXX*/
-
-	if ((hname = _icmp_fqdn_query(&addr6, ifindex)) == NULL)
-		return NULL;
-	return _hpaddr(af, hname, &addr6, errp);
-}
-#endif /* ICMPNL */
diff --git a/newlib/libc/sys/linux/net/namespace.h b/newlib/libc/sys/linux/net/namespace.h
deleted file mode 100644
index 291aad5..0000000
--- a/newlib/libc/sys/linux/net/namespace.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@FreeBSD.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/include/namespace.h,v 1.9 2002/03/29 22:43:42 markm Exp $
- */
-
-#ifndef _NAMESPACE_H_
-#define _NAMESPACE_H_
-
-/*
- * Adjust names so that headers declare "hidden" names.
- */
-
-/*
- * ISO C (C90) section.  Most names in libc aren't in ISO C, so they
- * should be here.  Most aren't here...
- */
-#define		err				_err
-#define		warn				_warn
-
-/*
- * Prototypes for syscalls/functions that need to be overridden
- * in libc_r/libpthread.
- */
-#define		accept				_accept
-#define		__acl_aclcheck_fd		___acl_aclcheck_fd
-#define		__acl_delete_fd			___acl_delete_fd
-#define		__acl_get_fd			___acl_get_fd
-#define		__acl_set_fd			___acl_set_fd
-#define		bind				_bind
-#define		__cap_get_fd			___cap_get_fd
-#define		__cap_set_fd			___cap_set_fd
-#define		close				_close
-#define		connect				_connect
-#define		dup				_dup
-#define		dup2				_dup2
-#define		execve				_execve
-#define		fcntl				_fcntl
-/*#define		flock				_flock */
-#define		fstat				_fstat
-#define		fstatfs				_fstatfs
-#define		fsync				_fsync
-#define		getdirentries			_getdirentries
-#define		getlogin			_getlogin
-#define		getpeername			_getpeername
-#define		getprogname			_getprogname
-#define		getsockname			_getsockname
-#define		getsockopt			_getsockopt
-#define		ioctl				_ioctl
-#define		listen				_listen
-#define		nanosleep			_nanosleep
-#define		open				_open
-#define		poll				_poll
-#define		pthread_cond_signal		_pthread_cond_signal
-#define		pthread_cond_wait		_pthread_cond_wait
-#define		pthread_cond_init		_pthread_cond_init
-#define		pthread_exit			_pthread_exit
-#define		pthread_getspecific		_pthread_getspecific
-#define		pthread_key_create		_pthread_key_create
-#define		pthread_key_delete		_pthread_key_delete
-#define		pthread_main_np			_pthread_main_np
-#define		pthread_mutex_destroy		_pthread_mutex_destroy
-#define		pthread_mutex_init		_pthread_mutex_init
-#define		pthread_mutex_lock		_pthread_mutex_lock
-#define		pthread_mutex_trylock		_pthread_mutex_trylock
-#define		pthread_mutex_unlock		_pthread_mutex_unlock
-#define		pthread_mutexattr_init		_pthread_mutexattr_init
-#define		pthread_mutexattr_destroy	_pthread_mutexattr_destroy
-#define		pthread_mutexattr_settype	_pthread_mutexattr_settype
-#define		pthread_once			_pthread_once
-#define		pthread_rwlock_init		_pthread_rwlock_init
-#define		pthread_rwlock_rdlock		_pthread_rwlock_rdlock
-#define		pthread_rwlock_wrlock		_pthread_rwlock_wrlock
-#define		pthread_rwlock_unlock		_pthread_rwlock_unlock
-#define		pthread_self			_pthread_self
-#define		pthread_setspecific		_pthread_setspecific
-#define		pthread_sigmask			_pthread_sigmask
-#define		read				_read
-#define		readv				_readv
-#define		recvfrom			_recvfrom
-#define		recvmsg				_recvmsg
-#define		select				_select
-#define		sendmsg				_sendmsg
-#define		sendto				_sendto
-#define		setsockopt			_setsockopt
-/*#define		sigaction			_sigaction*/
-#define		sigprocmask			_sigprocmask
-#define		sigsuspend			_sigsuspend
-#define		socket				_socket
-#define		socketpair			_socketpair
-#define		wait4				_wait4
-#define		write				_write
-#define		writev				_writev
-
-
-/*
- * Other hidden syscalls/functions that libc_r needs to override
- * but are not used internally by libc.
- *
- * XXX - When modifying libc to use one of the following, remove
- * the prototype from below and place it in the list above.
- */
-#if 0
-#define		creat				_creat
-#define		fchflags			_fchflags
-#define		fchmod				_fchmod
-#define		fpathconf			_fpathconf
-#define		msync				_msync
-#define		nfssvc				_nfssvc
-#define		pause				_pause
-#define		pthread_rwlock_destroy		_pthread_rwlock_destroy
-#define		pthread_rwlock_tryrdlock	_pthread_rwlock_tryrdlock
-#define		pthread_rwlock_trywrlock	_pthread_rwlock_trywrlock
-#define		pthread_rwlockattr_init		_pthread_rwlockattr_init
-#define		pthread_rwlockattr_destroy	_pthread_rwlockattr_destroy
-#define		sched_yield			_sched_yield
-#define		sendfile			_sendfile
-#define		shutdown			_shutdown
-#define		sigaltstack			_sigaltstack
-#define		sigpending			_sigpending
-#define		sigreturn			_sigreturn
-#define		sigsetmask			_sigsetmask
-#define		sleep				_sleep
-#define		system				_system
-#define		tcdrain				_tcdrain
-#define		wait				_wait
-#define		waitpid				_waitpid
-#endif
-
-#endif /* _NAMESPACE_H_ */
diff --git a/newlib/libc/sys/linux/net/ns.3 b/newlib/libc/sys/linux/net/ns.3
deleted file mode 100644
index be8d155..0000000
--- a/newlib/libc/sys/linux/net/ns.3
+++ /dev/null
@@ -1,133 +0,0 @@
-.\" Copyright (c) 1986, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)ns.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/ns.3,v 1.10 2001/10/01 16:08:56 ru Exp $
-.\"
-.Dd June 4, 1993
-.Dt NS 3
-.Os
-.Sh NAME
-.Nm ns_addr ,
-.Nm ns_ntoa
-.Nd Xerox
-.Tn NS Ns (tm)
-address conversion routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In netns/ns.h
-.Ft struct ns_addr
-.Fn ns_addr "char *cp"
-.Ft char *
-.Fn ns_ntoa "struct ns_addr ns"
-.Sh DESCRIPTION
-The routine
-.Fn ns_addr
-interprets character strings representing
-.Tn XNS
-addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn ns_ntoa
-takes
-.Tn XNS
-addresses and returns
-.Tn ASCII
-strings representing the address in a
-notation in common use in the Xerox Development Environment:
-.Bd -ragged -offset indent
-<network number>.<host number>.<port number>
-.Ed
-.Pp
-Trailing zero fields are suppressed, and each number is printed in hexadecimal,
-in a format suitable for input to
-.Fn ns_addr .
-Any fields lacking super-decimal digits will have a
-trailing
-.Ql H
-appended.
-.Pp
-Unfortunately, no universal standard exists for representing
-.Tn XNS
-addresses.
-An effort has been made to insure that
-.Fn ns_addr
-be compatible with most formats in common use.
-It will first separate an address into 1 to 3 fields using a single delimiter
-chosen from
-period
-.Ql \&. ,
-colon
-.Ql \&:
-or pound-sign
-.Ql \&# .
-Each field is then examined for byte separators (colon or period).
-If there are byte separators, each subfield separated is taken to be
-a small hexadecimal number, and the entirety is taken as a network-byte-ordered
-quantity to be zero extended in the high-network-order bytes.
-Next, the field is inspected for hyphens, in which case
-the field is assumed to be a number in decimal notation
-with hyphens separating the millenia.
-Next, the field is assumed to be a number:
-It is interpreted
-as hexadecimal if there is a leading
-.Ql 0x
-(as in C),
-a trailing
-.Ql H
-(as in Mesa), or there are any super-decimal digits present.
-It is interpreted as octal is there is a leading
-.Ql 0
-and there are no super-octal digits.
-Otherwise, it is converted as a decimal number.
-.Sh RETURN VALUES
-None. (See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr hosts 5 ,
-.Xr networks 5
-.Sh HISTORY
-The
-.Fn ns_addr
-and
-.Fn ns_toa
-functions appeared in
-.Bx 4.3 .
-.Sh BUGS
-The string returned by
-.Fn ns_ntoa
-resides in a static memory area.
-The function
-.Fn ns_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
diff --git a/newlib/libc/sys/linux/net/ns_addr.c b/newlib/libc/sys/linux/net/ns_addr.c
deleted file mode 100644
index a86cf31..0000000
--- a/newlib/libc/sys/linux/net/ns_addr.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * J.Q. Johnson.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ns_addr.c	8.1 (Berkeley) 6/7/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/param.h>
-#include <arpa/inet.h>
-#include <netns/ns.h>
-#include <stdio.h>
-#include <string.h>
-
-static struct ns_addr addr, zero_addr;
-
-static void Field(), cvtbase();
-
-struct ns_addr
-ns_addr(name)
-	const char *name;
-{
-	char separator;
-	char *hostname, *socketname, *cp;
-	char buf[50];
-
-	(void)strncpy(buf, name, sizeof(buf) - 1);
-	buf[sizeof(buf) - 1] = '\0';
-
-	/*
-	 * First, figure out what he intends as a field separtor.
-	 * Despite the way this routine is written, the preferred
-	 * form  2-272.AA001234H.01777, i.e. XDE standard.
-	 * Great efforts are made to insure backward compatibility.
-	 */
-	if ((hostname = strchr(buf, '#')) != NULL)
-		separator = '#';
-	else {
-		hostname = strchr(buf, '.');
-		if ((cp = strchr(buf, ':')) &&
-		    ((hostname && cp < hostname) || (hostname == 0))) {
-			hostname = cp;
-			separator = ':';
-		} else
-			separator = '.';
-	}
-	if (hostname)
-		*hostname++ = 0;
-
-	addr = zero_addr;
-	Field(buf, addr.x_net.c_net, 4);
-	if (hostname == 0)
-		return (addr);  /* No separator means net only */
-
-	socketname = strchr(hostname, separator);
-	if (socketname) {
-		*socketname++ = 0;
-		Field(socketname, (u_char *)&addr.x_port, 2);
-	}
-
-	Field(hostname, addr.x_host.c_host, 6);
-
-	return (addr);
-}
-
-static void
-Field(buf, out, len)
-	char *buf;
-	u_char *out;
-	int len;
-{
-	char *bp = buf;
-	int i, ibase, base16 = 0, base10 = 0, clen = 0;
-	int hb[6], *hp;
-
-	/*
-	 * first try 2-273#2-852-151-014#socket
-	 */
-	if ((*buf != '-') &&
-	    (1 < (i = sscanf(buf, "%d-%d-%d-%d-%d",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4])))) {
-		cvtbase(1000L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * try form 8E1#0.0.AA.0.5E.E6#socket
-	 */
-	if (1 < (i = sscanf(buf,"%x.%x.%x.%x.%x.%x",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
-		cvtbase(256L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * try form 8E1#0:0:AA:0:5E:E6#socket
-	 */
-	if (1 < (i = sscanf(buf,"%x:%x:%x:%x:%x:%x",
-			&hb[0], &hb[1], &hb[2], &hb[3], &hb[4], &hb[5]))) {
-		cvtbase(256L, 256, hb, i, out, len);
-		return;
-	}
-	/*
-	 * This is REALLY stretching it but there was a
-	 * comma notation separting shorts -- definitely non standard
-	 */
-	if (1 < (i = sscanf(buf,"%x,%x,%x",
-			&hb[0], &hb[1], &hb[2]))) {
-		hb[0] = htons(hb[0]); hb[1] = htons(hb[1]);
-		hb[2] = htons(hb[2]);
-		cvtbase(65536L, 256, hb, i, out, len);
-		return;
-	}
-
-	/* Need to decide if base 10, 16 or 8 */
-	while (*bp) switch (*bp++) {
-
-	case '0': case '1': case '2': case '3': case '4': case '5':
-	case '6': case '7': case '-':
-		break;
-
-	case '8': case '9':
-		base10 = 1;
-		break;
-
-	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-		base16 = 1;
-		break;
-
-	case 'x': case 'X':
-		*--bp = '0';
-		base16 = 1;
-		break;
-
-	case 'h': case 'H':
-		base16 = 1;
-		/* fall into */
-
-	default:
-		*--bp = 0; /* Ends Loop */
-	}
-	if (base16) {
-		ibase = 4096;
-	} else if (base10 == 0 && *buf == '0') {
-		ibase = 512;
-	} else {
-		base10 = 1;
-		ibase = 1000;
-	}
-
-	for (bp = buf; *bp++; ) clen++;
-	if (clen == 0) clen++;
-	if (clen > 18) clen = 18;
-	i = ((clen - 1) / 3) + 1;
-	bp = clen + buf - 3;
-	hp = hb + i - 1;
-
-	while (hp > hb) {
-		if (base16)
-			(void)sscanf(bp, "%3x", hp);
-		else if (base10)
-			(void)sscanf(bp, "%3d", hp);
-		else
-			(void)sscanf(bp, "%3o", hp);
-
-		bp[0] = 0;
-		hp--;
-		bp -= 3;
-	}
-	if (base16)
-		(void)sscanf(buf, "%3x", hp);
-	else if (base10)
-		(void)sscanf(buf, "%3d", hp);
-	else
-		(void)sscanf(buf, "%3o", hp);
-
-	cvtbase((long)ibase, 256, hb, i, out, len);
-}
-
-static void
-cvtbase(oldbase,newbase,input,inlen,result,reslen)
-	long oldbase;
-	int newbase;
-	int input[];
-	int inlen;
-	unsigned char result[];
-	int reslen;
-{
-	int d, e;
-	long sum;
-
-	e = 1;
-	while (e > 0 && reslen > 0) {
-		d = 0; e = 0; sum = 0;
-		/* long division: input=input/newbase */
-		while (d < inlen) {
-			sum = sum*oldbase + (long) input[d];
-			e += (sum > 0);
-			input[d++] = sum / newbase;
-			sum %= newbase;
-		}
-		result[--reslen] = sum;	/* accumulate remainder */
-	}
-	for (d=0; d < reslen; d++)
-		result[d] = 0;
-}
diff --git a/newlib/libc/sys/linux/net/ns_name.c b/newlib/libc/sys/linux/net/ns_name.c
deleted file mode 100644
index 609df14..0000000
--- a/newlib/libc/sys/linux/net/ns_name.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-
-/* Data. */
-
-static char		digits[] = "0123456789";
-
-/* Forward. */
-
-static int		special(int);
-static int		printable(int);
-static int		dn_find(const u_char *, const u_char *,
-				const u_char * const *,
-				const u_char * const *);
-
-/* Public. */
-
-/*
- * ns_name_ntop(src, dst, dstsiz)
- *	Convert an encoded domain name to printable ascii as per RFC1035.
- * return:
- *	Number of bytes written to buffer, or -1 (with errno set)
- * notes:
- *	The root is returned as "."
- *	All other domains are returned in non absolute form
- */
-int
-ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) {
-	const u_char *cp;
-	char *dn, *eom;
-	u_char c;
-	u_int n;
-
-	cp = src;
-	dn = dst;
-	eom = dst + dstsiz;
-
-	while ((n = *cp++) != 0) {
-		if ((n & NS_CMPRSFLGS) != 0) {
-			/* Some kind of compression pointer. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dn != dst) {
-			if (dn >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*dn++ = '.';
-		}
-		if (dn + n >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		for ((void)NULL; n > 0; n--) {
-			c = *cp++;
-			if (special(c)) {
-				if (dn + 1 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = (char)c;
-			} else if (!printable(c)) {
-				if (dn + 3 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = digits[c / 100];
-				*dn++ = digits[(c % 100) / 10];
-				*dn++ = digits[c % 10];
-			} else {
-				if (dn >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = (char)c;
-			}
-		}
-	}
-	if (dn == dst) {
-		if (dn >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*dn++ = '.';
-	}
-	if (dn >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*dn++ = '\0';
-	return (dn - dst);
-}
-
-/*
- * ns_name_pton(src, dst, dstsiz)
- *	Convert a ascii string into an encoded domain name as per RFC1035.
- * return:
- *	-1 if it fails
- *	1 if string was fully qualified
- *	0 is string was not fully qualified
- * notes:
- *	Enforces label and domain length limits.
- */
-
-int
-ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {
-	u_char *label, *bp, *eom;
-	int c, n, escaped;
-	char *cp;
-
-	escaped = 0;
-	bp = dst;
-	eom = dst + dstsiz;
-	label = bp++;
-
-	while ((c = *src++) != 0) {
-		if (escaped) {
-			if ((cp = strchr(digits, c)) != NULL) {
-				n = (cp - digits) * 100;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (cp - digits) * 10;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (cp - digits);
-				if (n > 255) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				c = n;
-			}
-			escaped = 0;
-		} else if (c == '\\') {
-			escaped = 1;
-			continue;
-		} else if (c == '.') {
-			c = (bp - label - 1);
-			if ((c & NS_CMPRSFLGS) != 0) {	/* Label too big. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (label >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*label = c;
-			/* Fully qualified ? */
-			if (*src == '\0') {
-				if (c != 0) {
-					if (bp >= eom) {
-						errno = EMSGSIZE;
-						return (-1);
-					}
-					*bp++ = '\0';
-				}
-				if ((bp - dst) > MAXCDNAME) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				return (1);
-			}
-			if (c == 0) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			label = bp++;
-			continue;
-		}
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = (u_char)c;
-	}
-	c = (bp - label - 1);
-	if ((c & NS_CMPRSFLGS) != 0) {		/* Label too big. */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	if (label >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*label = c;
-	if (c != 0) {
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = 0;
-	}
-	if ((bp - dst) > MAXCDNAME) {	/* src too big */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	return (0);
-}
-
-/*
- * ns_name_unpack(msg, eom, src, dst, dstsiz)
- *	Unpack a domain name from a message, source may be compressed.
- * return:
- *	-1 if it fails, or consumed octets if it succeeds.
- */
-int
-ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
-	       u_char *dst, size_t dstsiz)
-{
-	const u_char *srcp, *dstlim;
-	u_char *dstp;
-	int n, len, checked;
-
-	len = -1;
-	checked = 0;
-	dstp = dst;
-	srcp = src;
-	dstlim = dst + dstsiz;
-	if (srcp < msg || srcp >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	/* Fetch next label in domain name. */
-	while ((n = *srcp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:
-			/* Limit checks. */
-			if (dstp + n + 1 >= dstlim || srcp + n >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			checked += n + 1;
-			*dstp++ = n;
-			memcpy(dstp, srcp, n);
-			dstp += n;
-			srcp += n;
-			break;
-
-		case NS_CMPRSFLGS:
-			if (srcp >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (len < 0)
-				len = srcp - src + 1;
-			srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff));
-			if (srcp < msg || srcp >= eom) {  /* Out of range. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			checked += 2;
-			/*
-			 * Check for loops in the compressed name;
-			 * if we've looked at the whole message,
-			 * there must be a loop.
-			 */
-			if (checked >= eom - msg) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			break;
-
-		default:
-			errno = EMSGSIZE;
-			return (-1);			/* flag error */
-		}
-	}
-	*dstp = '\0';
-	if (len < 0)
-		len = srcp - src;
-	return (len);
-}
-
-/*
- * ns_name_pack(src, dst, dstsiz, dnptrs, lastdnptr)
- *	Pack domain name 'domain' into 'comp_dn'.
- * return:
- *	Size of the compressed name, or -1.
- * notes:
- *	'dnptrs' is an array of pointers to previous compressed names.
- *	dnptrs[0] is a pointer to the beginning of the message. The array
- *	ends with NULL.
- *	'lastdnptr' is a pointer to the end of the array pointed to
- *	by 'dnptrs'.
- * Side effects:
- *	The list of pointers in dnptrs is updated for labels inserted into
- *	the message as we compress the name.  If 'dnptr' is NULL, we don't
- *	try to compress names. If 'lastdnptr' is NULL, we don't update the
- *	list.
- */
-int
-ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
-	     const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char *dstp;
-	const u_char **cpp, **lpp, *eob, *msg;
-	const u_char *srcp;
-	int n, l;
-
-	srcp = src;
-	dstp = dst;
-	eob = dstp + dstsiz;
-	lpp = cpp = NULL;
-	if (dnptrs != NULL) {
-		if ((msg = *dnptrs++) != NULL) {
-			for (cpp = dnptrs; *cpp != NULL; cpp++)
-				(void)NULL;
-			lpp = cpp;	/* end of list to search */
-		}
-	} else
-		msg = NULL;
-
-	/* make sure the domain we are about to add is legal */
-	l = 0;
-	do {
-		n = *srcp;
-		if ((n & NS_CMPRSFLGS) != 0) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		l += n + 1;
-		if (l > MAXCDNAME) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		srcp += n + 1;
-	} while (n != 0);
-
-	srcp = src;
-	do {
-		/* Look to see if we can use pointers. */
-		n = *srcp;
-		if (n != 0 && msg != NULL) {
-			l = dn_find(srcp, msg, (const u_char * const *)dnptrs,
-				    (const u_char * const *)lpp);
-			if (l >= 0) {
-				if (dstp + 1 >= eob) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dstp++ = (l >> 8) | NS_CMPRSFLGS;
-				*dstp++ = l % 256;
-				return (dstp - dst);
-			}
-			/* Not found, save it. */
-			if (lastdnptr != NULL && cpp < lastdnptr - 1 &&
-			    (dstp - msg) < 0x4000) {
-				*cpp++ = dstp;
-				*cpp = NULL;
-			}
-		}
-		/* copy label to buffer */
-		if (n & NS_CMPRSFLGS) {		/* Should not happen. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dstp + 1 + n >= eob) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		memcpy(dstp, srcp, n + 1);
-		srcp += n + 1;
-		dstp += n + 1;
-	} while (n != 0);
-
-	if (dstp > eob) {
-		if (msg != NULL)
-			*lpp = NULL;
-		errno = EMSGSIZE;
-		return (-1);
-	} 
-	return (dstp - dst);
-}
-
-/*
- * ns_name_uncompress(msg, eom, src, dst, dstsiz)
- *	Expand compressed domain name to presentation format.
- * return:
- *	Number of bytes read out of `src', or -1 (with errno set).
- * note:
- *	Root domain returns as "." not "".
- */
-int
-ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src,
-		   char *dst, size_t dstsiz)
-{
-	u_char tmp[NS_MAXCDNAME];
-	int n;
-	
-	if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
-		return (-1);
-	if (ns_name_ntop(tmp, dst, dstsiz) == -1)
-		return (-1);
-	return (n);
-}
-
-/*
- * ns_name_compress(src, dst, dstsiz, dnptrs, lastdnptr)
- *	Compress a domain name into wire format, using compression pointers.
- * return:
- *	Number of bytes consumed in `dst' or -1 (with errno set).
- * notes:
- *	'dnptrs' is an array of pointers to previous compressed names.
- *	dnptrs[0] is a pointer to the beginning of the message.
- *	The list ends with NULL.  'lastdnptr' is a pointer to the end of the
- *	array pointed to by 'dnptrs'. Side effect is to update the list of
- *	pointers for labels inserted into the message as we compress the name.
- *	If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
- *	is NULL, we don't update the list.
- */
-int
-ns_name_compress(const char *src, u_char *dst, size_t dstsiz,
-		 const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char tmp[NS_MAXCDNAME];
-
-	if (ns_name_pton(src, tmp, sizeof tmp) == -1)
-		return (-1);
-	return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr));
-}
-
-/*
- * ns_name_skip(ptrptr, eom)
- *	Advance *ptrptr to skip over the compressed name it points at.
- * return:
- *	0 on success, -1 (with errno set) on failure.
- */
-int
-ns_name_skip(const u_char **ptrptr, const u_char *eom) {
-	const u_char *cp;
-	u_int n;
-
-	cp = *ptrptr;
-	while (cp < eom && (n = *cp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:			/* normal case, n == len */
-			cp += n;
-			continue;
-		case NS_CMPRSFLGS:	/* indirection */
-			cp++;
-			break;
-		default:		/* illegal type */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		break;
-	}
-	if (cp > eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*ptrptr = cp;
-	return (0);
-}
-
-/* Private. */
-
-/*
- * special(ch)
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this characted special ("in need of quoting") ?
- * return:
- *	boolean.
- */
-static int
-special(int ch) {
-	switch (ch) {
-	case 0x22: /* '"' */
-	case 0x2E: /* '.' */
-	case 0x3B: /* ';' */
-	case 0x5C: /* '\\' */
-	/* Special modifiers in zone files. */
-	case 0x40: /* '@' */
-	case 0x24: /* '$' */
-		return (1);
-	default:
-		return (0);
-	}
-}
-
-/*
- * printable(ch)
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this character visible and not a space when printed ?
- * return:
- *	boolean.
- */
-static int
-printable(int ch) {
-	return (ch > 0x20 && ch < 0x7f);
-}
-
-/*
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	convert this character to lower case if it's upper case.
- */
-static int
-mklower(int ch) {
-	if (ch >= 0x41 && ch <= 0x5A)
-		return (ch + 0x20);
-	return (ch);
-}
-
-/*
- * dn_find(domain, msg, dnptrs, lastdnptr)
- *	Search for the counted-label name in an array of compressed names.
- * return:
- *	offset from msg if found, or -1.
- * notes:
- *	dnptrs is the pointer to the first name on the list,
- *	not the pointer to the start of the message.
- */
-static int
-dn_find(const u_char *domain, const u_char *msg,
-	const u_char * const *dnptrs,
-	const u_char * const *lastdnptr)
-{
-	const u_char *dn, *cp, *sp;
-	const u_char * const *cpp;
-	u_int n;
-
-	for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
-		dn = domain;
-		sp = cp = *cpp;
-		while ((n = *cp++) != 0) {
-			/*
-			 * check for indirection
-			 */
-			switch (n & NS_CMPRSFLGS) {
-			case 0:			/* normal case, n == len */
-				if (n != *dn++)
-					goto next;
-				for ((void)NULL; n > 0; n--)
-					if (mklower(*dn++) != mklower(*cp++))
-						goto next;
-				/* Is next root for both ? */
-				if (*dn == '\0' && *cp == '\0')
-					return (sp - msg);
-				if (*dn)
-					continue;
-				goto next;
-
-			case NS_CMPRSFLGS:	/* indirection */
-				cp = msg + (((n & 0x3f) << 8) | *cp);
-				break;
-
-			default:	/* illegal type */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-		}
- next: ;
-	}
-	errno = ENOENT;
-	return (-1);
-}
diff --git a/newlib/libc/sys/linux/net/ns_netint.c b/newlib/libc/sys/linux/net/ns_netint.c
deleted file mode 100644
index 18c9ccc..0000000
--- a/newlib/libc/sys/linux/net/ns_netint.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/* Import. */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-u_int
-ns_get16(const u_char *src) {
-	u_int dst;
-
-	NS_GET16(dst, src);
-	return (dst);
-}
-
-u_long
-ns_get32(const u_char *src) {
-	u_long dst;
-
-	NS_GET32(dst, src);
-	return (dst);
-}
-
-void
-ns_put16(u_int src, u_char *dst) {
-	NS_PUT16(src, dst);
-}
-
-void
-ns_put32(u_long src, u_char *dst) {
-	NS_PUT32(src, dst);
-}
diff --git a/newlib/libc/sys/linux/net/ns_ntoa.c b/newlib/libc/sys/linux/net/ns_ntoa.c
deleted file mode 100644
index b6a6c4c..0000000
--- a/newlib/libc/sys/linux/net/ns_ntoa.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ns_ntoa.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/param.h>
-#include <arpa/inet.h>
-#include <netns/ns.h>
-#include <stdio.h>
-
-static char *spectHex(char *p0);
-
-char *
-ns_ntoa(addr)
-	struct ns_addr addr;
-{
-	static char obuf[40];
-	union { union ns_net net_e; u_long long_e; } net;
-	u_short port = htons(addr.x_port);
-	char *cp;
-	char *cp2;
-	u_char *up = addr.x_host.c_host;
-	u_char *uplim = up + 6;
-
-	net.net_e = addr.x_net;
-	sprintf(obuf, "%lx", (u_long)ntohl(net.long_e));
-	cp = spectHex(obuf);
-	cp2 = cp + 1;
-	while (*up==0 && up < uplim) up++;
-	if (up == uplim) {
-		if (port) {
-			sprintf(cp, ".0");
-			cp += 2;
-		}
-	} else {
-		sprintf(cp, ".%x", *up++);
-		while (up < uplim) {
-			while (*cp) cp++;
-			sprintf(cp, "%02x", *up++);
-		}
-		cp = spectHex(cp2);
-	}
-	if (port) {
-		sprintf(cp, ".%x", port);
-		spectHex(cp + 1);
-	}
-	return (obuf);
-}
-
-static char *
-spectHex(p0)
-	char *p0;
-{
-	int ok = 0;
-	int nonzero = 0;
-	char *p = p0;
-	for (; *p; p++) switch (*p) {
-
-	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-		*p += ('A' - 'a');
-		/* fall into . . . */
-	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-		ok = 1;
-	case '1': case '2': case '3': case '4': case '5':
-	case '6': case '7': case '8': case '9':
-		nonzero = 1;
-	}
-	if (nonzero && !ok) { *p++ = 'H'; *p = 0; }
-	return (p);
-}
diff --git a/newlib/libc/sys/linux/net/ns_parse.c b/newlib/libc/sys/linux/net/ns_parse.c
deleted file mode 100644
index 38a684b..0000000
--- a/newlib/libc/sys/linux/net/ns_parse.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-
-/* These need to be in the same order as the nres.h:ns_flag enum. */
-struct _ns_flagdata _ns_flagdata[16] = {
-	{ 0x8000, 15 },		/* qr. */
-	{ 0x7800, 11 },		/* opcode. */
-	{ 0x0400, 10 },		/* aa. */
-	{ 0x0200, 9 },		/* tc. */
-	{ 0x0100, 8 },		/* rd. */
-	{ 0x0080, 7 },		/* ra. */
-	{ 0x0040, 6 },		/* z. */
-	{ 0x0020, 5 },		/* ad. */
-	{ 0x0010, 4 },		/* cd. */
-	{ 0x000f, 0 },		/* rcode. */
-	{ 0x0000, 0 },		/* expansion (1/6). */
-	{ 0x0000, 0 },		/* expansion (2/6). */
-	{ 0x0000, 0 },		/* expansion (3/6). */
-	{ 0x0000, 0 },		/* expansion (4/6). */
-	{ 0x0000, 0 },		/* expansion (5/6). */
-	{ 0x0000, 0 },		/* expansion (6/6). */
-};
-
-static int
-skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) {
-	const u_char *optr = ptr;
-
-	for ((void)NULL; count > 0; count--) {
-		int b, rdlength;
-
-		b = dn_skipname(ptr, eom);
-		if (b < 0)
-			goto emsgsize;
-		ptr += b/*Name*/ + NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/;
-		if (section != ns_s_qd) {
-			if (ptr + NS_INT32SZ > eom)
-				goto emsgsize;
-			ptr += NS_INT32SZ/*TTL*/;
-			if (ptr + NS_INT16SZ > eom)
-				goto emsgsize;
-			NS_GET16(rdlength, ptr);
-			ptr += rdlength/*RData*/;
-		}
-	}
-	if (ptr > eom)
-		goto emsgsize;
-	return (ptr - optr);
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-int
-ns_initparse(const u_char *msg, int msglen, ns_msg *handle) {
-	const u_char *eom = msg + msglen;
-	int i;
-
-	memset(handle, 0x5e, sizeof *handle);
-	handle->_msg = msg;
-	handle->_eom = eom;
-	if (msg + NS_INT16SZ > eom)
-		goto emsgsize;
-	NS_GET16(handle->_id, msg);
-	if (msg + NS_INT16SZ > eom)
-		goto emsgsize;
-	NS_GET16(handle->_flags, msg);
-	for (i = 0; i < ns_s_max; i++) {
-		if (msg + NS_INT16SZ > eom)
-			goto emsgsize;
-		NS_GET16(handle->_counts[i], msg);
-	}
-	for (i = 0; i < ns_s_max; i++)
-		if (handle->_counts[i] == 0)
-			handle->_sections[i] = NULL;
-		else {
-			int b = skiprr(msg, eom, (ns_sect)i,
-				       handle->_counts[i]);
-
-			if (b < 0)
-				return (-1);
-			handle->_sections[i] = msg;
-			msg += b;
-		}
-	if (msg != eom)
-		goto emsgsize;
-	handle->_sect = ns_s_max;
-	handle->_rrnum = -1;
-	handle->_ptr = NULL;
-	return (0);
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-int
-ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
-	int b;
-
-	/* Make section right. */
-	if (section < 0 || section >= ns_s_max)
-		goto enodev;
-	if ((int)section != (int)handle->_sect) {
-		handle->_sect = section;
-		handle->_rrnum = 0;
-		handle->_ptr = handle->_sections[(int)section];
-	}
-
-	/* Make rrnum right. */
-	if (rrnum == -1)
-		rrnum = handle->_rrnum;
-	if (rrnum < 0 || rrnum >= handle->_counts[(int)section])
-		goto enodev;
-	if (rrnum < handle->_rrnum) {
-		handle->_rrnum = 0;
-		handle->_ptr = handle->_sections[(int)section];
-	}
-	
-	b = skiprr(handle->_msg, handle->_eom, section,
-		   rrnum - handle->_rrnum);
-	if (b < 0)
-		return (-1);
-	handle->_ptr += b;
-	handle->_rrnum = rrnum;
-
-	/* Do the parse. */
-	b = dn_expand(handle->_msg, handle->_eom,
-		      handle->_ptr, rr->name, NS_MAXDNAME);
-	if (b < 0)
-		return (-1);
-	handle->_ptr += b;
-	if (handle->_ptr + NS_INT16SZ > handle->_eom)
-		goto emsgsize;
-	NS_GET16(rr->type, handle->_ptr);
-	if (handle->_ptr + NS_INT16SZ > handle->_eom)
-		goto emsgsize;
-	NS_GET16(rr->rr_class, handle->_ptr);
-	if (section == ns_s_qd) {
-		rr->ttl = 0;
-		rr->rdlength = 0;
-		rr->rdata = NULL;
-	} else {
-		if (handle->_ptr + NS_INT32SZ > handle->_eom)
-			goto emsgsize;
-		NS_GET32(rr->ttl, handle->_ptr);
-		if (handle->_ptr + NS_INT16SZ > handle->_eom)
-			goto emsgsize;
-		NS_GET16(rr->rdlength, handle->_ptr);
-		if (handle->_ptr + rr->rdlength > handle->_eom)
-			goto emsgsize;
-		rr->rdata = handle->_ptr;
-		handle->_ptr += rr->rdlength;
-	}
-	handle->_rrnum++;
-
-	/* All done. */
-	return (0);
- enodev:
-	errno = ENODEV;
-	return (-1);
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
diff --git a/newlib/libc/sys/linux/net/ns_print.c b/newlib/libc/sys/linux/net/ns_print.c
deleted file mode 100644
index 7cce6d7..0000000
--- a/newlib/libc/sys/linux/net/ns_print.c
+++ /dev/null
@@ -1,744 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/* Import. */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-#include <ctype.h>
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-/* Forward. */
-
-static size_t	prune_origin(const char *name, const char *origin);
-static int	charstr(const u_char *rdata, const u_char *edata,
-			char **buf, size_t *buflen);
-static int	addname(const u_char *msg, size_t msglen,
-			const u_char **p, const char *origin,
-			char **buf, size_t *buflen);
-static void	addlen(size_t len, char **buf, size_t *buflen);
-static int	addstr(const char *src, size_t len,
-		       char **buf, size_t *buflen);
-static int	addtab(size_t len, size_t target, int spaced,
-		       char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define	T(x) \
-	do { \
-		if ((x) < 0) \
-			return (-1); \
-	} while (0)
-
-/* Public. */
-
-/*
- * int
- * ns_sprintrr(handle, rr, name_ctx, origin, buf, buflen)
- *	Convert an RR to presentation format.
- * return:
- *	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrr(const ns_msg *handle, const ns_rr *rr,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	int n;
-
-	n = ns_sprintrrf(ns_msg_base(*handle), ns_msg_size(*handle),
-			 ns_rr_name(*rr), ns_rr_class(*rr), ns_rr_type(*rr),
-			 ns_rr_ttl(*rr), ns_rr_rdata(*rr), ns_rr_rdlen(*rr),
-			 name_ctx, origin, buf, buflen);
-	return (n);
-}
-
-/*
- * int
- * ns_sprintrrf(msg, msglen, name, class, type, ttl, rdata, rdlen,
- *	       name_ctx, origin, buf, buflen)
- *	Convert the fields of an RR into presentation format.
- * return:
- *	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrrf(const u_char *msg, size_t msglen,
-	    const char *name, ns_class class, ns_type type,
-	    u_long ttl, const u_char *rdata, size_t rdlen,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	const char *obuf = buf;
-	const u_char *edata = rdata + rdlen;
-	int spaced = 0;
-
-	const char *comment;
-	char tmp[100];
-	int len, x;
-
-	/*
-	 * Owner.
-	 */
-	if (name_ctx != NULL && strcasecmp(name_ctx, name) == 0) {
-		T(addstr("\t\t\t", 3, &buf, &buflen));
-	} else {
-		len = prune_origin(name, origin);
-		if (len == 0) {
-			T(addstr("@\t\t\t", 4, &buf, &buflen));
-		} else {
-			T(addstr(name, len, &buf, &buflen));
-			/* Origin not used and no trailing dot? */
-			if ((!origin || !origin[0] || name[len] == '\0') &&
-			    name[len - 1] != '.') {
-				T(addstr(".", 1, &buf, &buflen));
-				len++;
-			}
-			T(spaced = addtab(len, 24, spaced, &buf, &buflen));
-		}
-	}
-
-	/*
-	 * TTL, Class, Type.
-	 */
-	T(x = ns_format_ttl(ttl, buf, buflen));
-	addlen(x, &buf, &buflen);
-	len = SPRINTF((tmp, " %s %s", p_class(class), p_type(type)));
-	T(addstr(tmp, len, &buf, &buflen));
-	T(spaced = addtab(x + len, 16, spaced, &buf, &buflen));
-
-	/*
-	 * RData.
-	 */
-	switch (type) {
-	case ns_t_a:
-		if (rdlen != NS_INADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_cname:
-	case ns_t_mb:
-	case ns_t_mg:
-	case ns_t_mr:
-	case ns_t_ns:
-	case ns_t_ptr:
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-
-	case ns_t_hinfo:
-	case ns_t_isdn:
-		/* First word. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Second word. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_soa: {
-		u_long t;
-
-		/* Server name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Administrator name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" (\n", 3, &buf, &buflen));
-		spaced = 0;
-
-		if ((edata - rdata) != 5*NS_INT32SZ)
-			goto formerr;
-
-		/* Serial number. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		len = SPRINTF((tmp, "%lu", t));
-		T(addstr(tmp, len, &buf, &buflen));
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; serial\n", 9, &buf, &buflen));
-		spaced = 0;
-
-		/* Refresh interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; refresh\n", 10, &buf, &buflen));
-		spaced = 0;
-
-		/* Retry interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; retry\n", 8, &buf, &buflen));
-		spaced = 0;
-
-		/* Expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; expiry\n", 9, &buf, &buflen));
-		spaced = 0;
-
-		/* Minimum TTL. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(addstr(" )", 2, &buf, &buflen));
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; minimum\n", 10, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_mx:
-	case ns_t_afsdb:
-	case ns_t_rt: {
-		u_int t;
-
-		if (rdlen < NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Target. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_px: {
-		u_int t;
-
-		if (rdlen < NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_x25:
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_txt:
-		while (rdata < edata) {
-			T(len = charstr(rdata, edata, &buf, &buflen));
-			if (len == 0)
-				goto formerr;
-			rdata += len;
-			if (rdata < edata)
-				T(addstr(" ", 1, &buf, &buflen));
-		}
-		break;
-
-	case ns_t_nsap: {
-		char t[255*3];
-
-		(void) inet_nsap_ntoa(rdlen, rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_aaaa:
-		if (rdlen != NS_IN6ADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET6, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_loc: {
-		char t[255];
-
-		/* XXX protocol format checking? */
-		(void) loc_ntoa(rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_naptr: {
-		u_int order, preference;
-		char t[50];
-
-		if (rdlen < 2*NS_INT16SZ)
-			goto formerr;
-
-		/* Order, Precedence. */
-		order = ns_get16(rdata);	rdata += NS_INT16SZ;
-		preference = ns_get16(rdata);	rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u ", order, preference));
-		T(addstr(t, len, &buf, &buflen));
-
-		/* Flags. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Service. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Regexp. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len < 0)
-			return (-1);
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_srv: {
-		u_int priority, weight, port;
-		char t[50];
-
-		if (rdlen < NS_INT16SZ*3)
-			goto formerr;
-
-		/* Priority, Weight, Port. */
-		priority = ns_get16(rdata);  rdata += NS_INT16SZ;
-		weight   = ns_get16(rdata);  rdata += NS_INT16SZ;
-		port     = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u %u ", priority, weight, port));
-		T(addstr(t, len, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_minfo:
-	case ns_t_rp:
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-
-	case ns_t_wks: {
-		int n, lcnt;
-
-		if (rdlen < NS_INT32SZ + 1)
-			goto formerr;
-
-		/* Address. */
-		(void) inet_ntop(AF_INET, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		rdata += NS_INADDRSZ;
-
-		/* Protocol. */
-		len = SPRINTF((tmp, " %u ( ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata += NS_INT8SZ;
-
-		/* Bit map. */
-		n = 0;
-		lcnt = 0;
-		while (rdata < edata) {
-			u_int c = *rdata++;
-			do {
-				if (c & 0200) {
-					if (lcnt == 0) {
-						T(addstr("\n\t\t\t\t", 5,
-							 &buf, &buflen));
-						lcnt = 10;
-						spaced = 0;
-					}
-					len = SPRINTF((tmp, "%d ", n));
-					T(addstr(tmp, len, &buf, &buflen));
-					lcnt--;
-				}
-				c <<= 1;
-			} while (++n & 07);
-		}
-		T(addstr(")", 1, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_key: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int keyflags, protocol, algorithm;
-		const char *leader;
-		int n;
-
-		if (rdlen < NS_INT16SZ + NS_INT8SZ + NS_INT8SZ)
-			goto formerr;
-
-		/* Key flags, Protocol, Algorithm. */
-		keyflags = ns_get16(rdata);  rdata += NS_INT16SZ;
-		protocol = *rdata++;
-		algorithm = *rdata++;
-		len = SPRINTF((tmp, "0x%04x %u %u",
-			       keyflags, protocol, algorithm));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Public key data. */
-		len = b64_ntop(rdata, edata - rdata,
-			       base64_key, sizeof base64_key);
-		if (len < 0)
-			goto formerr;
-		if (len > 15) {
-			T(addstr(" (", 2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", 2, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_sig: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int type, algorithm, labels, footprint;
-		const char *leader;
-		u_long t;
-		int n;
-
-		if (rdlen < 22)
-			goto formerr;
-
-		/* Type covered, Algorithm, Label count, Original TTL. */
-	        type = ns_get16(rdata);  rdata += NS_INT16SZ;
-		algorithm = *rdata++;
-		labels = *rdata++;
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, " %s %d %lu ",
-			       p_type(type), algorithm, t));
-		T(addstr(tmp, len, &buf, &buflen));
-		if (labels != (u_int)dn_count_labels(name))
-			goto formerr;
-
-		/* Signature expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Time signed. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Signature Footprint. */
-		footprint = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", footprint));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Signer's name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Signature. */
-		len = b64_ntop(rdata, edata - rdata,
-			       base64_key, sizeof base64_key);
-		if (len > 15) {
-			T(addstr(" (", 2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		if (len < 0)
-			goto formerr;
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", 2, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_nxt: {
-		int n, c;
-
-		/* Next domain name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Type bit map. */
-		n = edata - rdata;
-		for (c = 0; c < n*8; c++)
-			if (NS_NXT_BIT_ISSET(c, rdata)) {
-				len = SPRINTF((tmp, " %s", p_type(c)));
-				T(addstr(tmp, len, &buf, &buflen));
-			}
-		break;
-	    }
-
-	default:
-		comment = "unknown RR type";
-		goto hexify;
-	}
-	return (buf - obuf);
- formerr:
-	comment = "RR format error";
- hexify: {
-	int n, m;
-	char *p;
-
-	len = SPRINTF((tmp, "\\#(\t\t; %s", comment));
-	T(addstr(tmp, len, &buf, &buflen));
-	while (rdata < edata) {
-		p = tmp;
-		p += SPRINTF((p, "\n\t"));
-		spaced = 0;
-		n = MIN(16, edata - rdata);
-		for (m = 0; m < n; m++)
-			p += SPRINTF((p, "%02x ", rdata[m]));
-		T(addstr(tmp, p - tmp, &buf, &buflen));
-		if (n < 16) {
-			T(addstr(")", 1, &buf, &buflen));
-			T(addtab(p - tmp + 1, 48, spaced, &buf, &buflen));
-		}
-		p = tmp;
-		p += SPRINTF((p, "; "));
-		for (m = 0; m < n; m++)
-			*p++ = (isascii(rdata[m]) && isprint(rdata[m]))
-				? rdata[m]
-				: '.';
-		T(addstr(tmp, p - tmp, &buf, &buflen));
-		rdata += n;
-	}
-	return (buf - obuf);
-    }
-}
-
-/* Private. */
-
-/*
- * size_t
- * prune_origin(name, origin)
- *	Find out if the name is at or under the current origin.
- * return:
- *	Number of characters in name before start of origin,
- *	or length of name if origin does not match.
- * notes:
- *	This function should share code with samedomain().
- */
-static size_t
-prune_origin(const char *name, const char *origin) {
-	const char *oname = name;
-
-	while (*name != '\0') {
-		if (origin != NULL && strcasecmp(name, origin) == 0)
-			return (name - oname - (name > oname));
-		while (*name != '\0') {
-			if (*name == '\\') {
-				name++;
-				/* XXX need to handle \nnn form. */
-				if (*name == '\0')
-					break;
-			} else if (*name == '.') {
-				name++;
-				break;
-			}
-			name++;
-		}
-	}
-	return (name - oname);
-}
-
-/*
- * int
- * charstr(rdata, edata, buf, buflen)
- *	Format a <character-string> into the presentation buffer.
- * return:
- *	Number of rdata octets consumed
- *	0 for protocol format error
- *	-1 for output buffer error
- * side effects:
- *	buffer is advanced on success.
- */
-static int
-charstr(const u_char *rdata, const u_char *edata, char **buf, size_t *buflen) {
-	const u_char *odata = rdata;
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-
-	if (addstr("\"", 1, buf, buflen) < 0)
-		goto enospc;
-	if (rdata < edata) {
-		int n = *rdata;
-
-		if (rdata + 1 + n <= edata) {
-			rdata++;
-			while (n-- > 0) {
-				if (strchr("\n\"\\", *rdata) != NULL)
-					if (addstr("\\", 1, buf, buflen) < 0)
-						goto enospc;
-				if (addstr((const char *)rdata, 1,
-					   buf, buflen) < 0)
-					goto enospc;
-				rdata++;
-			}
-		}
-	}
-	if (addstr("\"", 1, buf, buflen) < 0)
-		goto enospc;
-	return (rdata - odata);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static int
-addname(const u_char *msg, size_t msglen,
-	const u_char **pp, const char *origin,
-	char **buf, size_t *buflen)
-{
-	size_t newlen, save_buflen = *buflen;
-	char *save_buf = *buf;
-	int n;
-
-	n = dn_expand(msg, msg + msglen, *pp, *buf, *buflen);
-	if (n < 0)
-		goto enospc;	/* Guess. */
-	newlen = prune_origin(*buf, origin);
-	if ((origin == NULL || origin[0] == '\0' || (*buf)[newlen] == '\0') &&
-	    (newlen == 0 || (*buf)[newlen - 1] != '.')) {
-		/* No trailing dot. */
-		if (newlen + 2 > *buflen)
-			goto enospc;	/* No room for ".\0". */
-		(*buf)[newlen++] = '.';
-		(*buf)[newlen] = '\0';
-	}
-	if (newlen == 0) {
-		/* Use "@" instead of name. */
-		if (newlen + 2 > *buflen)
-			goto enospc;        /* No room for "@\0". */
-		(*buf)[newlen++] = '@';
-		(*buf)[newlen] = '\0';
-	}
-	*pp += n;
-	addlen(newlen, buf, buflen);
-	**buf = '\0';
-	return (newlen);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static void
-addlen(size_t len, char **buf, size_t *buflen) {
-	assert(len <= *buflen);
-	*buf += len;
-	*buflen -= len;
-}
-
-static int
-addstr(const char *src, size_t len, char **buf, size_t *buflen) {
-	if (len > *buflen) {
-		errno = ENOSPC;
-		return (-1);
-	}
-	memcpy(*buf, src, len);
-	addlen(len, buf, buflen);
-	**buf = '\0';
-	return (0);
-}
-
-static int
-addtab(size_t len, size_t target, int spaced, char **buf, size_t *buflen) {
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-	int t;
-
-	if (spaced || len >= target - 1) {
-		T(addstr("  ", 2, buf, buflen));
-		spaced = 1;
-	} else {
-		for (t = (target - len - 1) / 8; t >= 0; t--)
-			if (addstr("\t", 1, buf, buflen) < 0) {
-				*buflen = save_buflen;
-				*buf = save_buf;
-				return (-1);
-			}
-		spaced = 0;
-	}
-	return (spaced);
-}
diff --git a/newlib/libc/sys/linux/net/ns_ttl.c b/newlib/libc/sys/linux/net/ns_ttl.c
deleted file mode 100644
index 63dbefb..0000000
--- a/newlib/libc/sys/linux/net/ns_ttl.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/* Import. */
-
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-/* Forward. */
-
-static int	fmt1(int t, char s, char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define T(x) if ((x) < 0) return (-1); else (void)NULL
-
-/* Public. */
-
-int
-ns_format_ttl(u_long src, char *dst, size_t dstlen) {
-	char *odst = dst;
-	int secs, mins, hours, days, weeks, x;
-	char *p;
-
-	secs = src % 60;   src /= 60;
-	mins = src % 60;   src /= 60;
-	hours = src % 24;  src /= 24;
-	days = src % 7;    src /= 7;
-	weeks = src;       src = 0;
-
-	x = 0;
-	if (weeks) {
-		T(fmt1(weeks, 'W', &dst, &dstlen));
-		x++;
-	}
-	if (days) {
-		T(fmt1(days, 'D', &dst, &dstlen));
-		x++;
-	}
-	if (hours) {
-		T(fmt1(hours, 'H', &dst, &dstlen));
-		x++;
-	}
-	if (mins) {
-		T(fmt1(mins, 'M', &dst, &dstlen));
-		x++;
-	}
-	if (secs || !(weeks || days || hours || mins)) {
-		T(fmt1(secs, 'S', &dst, &dstlen));
-		x++;
-	}
-
-	if (x > 1) {
-		int ch;
-
-		for (p = odst; (ch = *p) != '\0'; p++)
-			if (isascii(ch) && isupper(ch))
-				*p = tolower(ch);
-	}
-
-	return (dst - odst);
-}
-
-int
-ns_parse_ttl(const char *src, u_long *dst) {
-	u_long ttl, tmp;
-	int ch, digits, dirty;
-
-	ttl = 0;
-	tmp = 0;
-	digits = 0;
-	dirty = 0;
-	while ((ch = *src++) != '\0') {
-		if (!isascii(ch) || !isprint(ch))
-			goto einval;
-		if (isdigit(ch)) {
-			tmp *= 10;
-			tmp += (ch - '0');
-			digits++;
-			continue;
-		}
-		if (digits == 0)
-			goto einval;
-		if (islower(ch))
-			ch = toupper(ch);
-		switch (ch) {
-		case 'W':  tmp *= 7;
-		case 'D':  tmp *= 24;
-		case 'H':  tmp *= 60;
-		case 'M':  tmp *= 60;
-		case 'S':  break;
-		default:   goto einval;
-		}
-		ttl += tmp;
-		tmp = 0;
-		digits = 0;
-		dirty = 1;
-	}
-	if (digits > 0) {
-		if (dirty)
-			goto einval;
-		else
-			ttl += tmp;
-	}
-	*dst = ttl;
-	return (0);
-
- einval:
-	errno = EINVAL;
-	return (-1);
-}
-
-/* Private. */
-
-static int
-fmt1(int t, char s, char **buf, size_t *buflen) {
-	char tmp[50];
-	size_t len;
-
-	len = SPRINTF((tmp, "%d%c", t, s));
-	if (len + 1 > *buflen)
-		return (-1);
-	strcpy(*buf, tmp);
-	*buf += len;
-	*buflen -= len;
-	return (0);
-}
diff --git a/newlib/libc/sys/linux/net/nsap_addr.c b/newlib/libc/sys/linux/net/nsap_addr.c
deleted file mode 100644
index b665148..0000000
--- a/newlib/libc/sys/linux/net/nsap_addr.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-
-static char
-xtob(c)
-	int c;
-{
-	return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
-}
-
-u_int
-inet_nsap_addr(ascii, binary, maxlen)
-	const char *ascii;
-	u_char *binary;
-	int maxlen;
-{
-	u_char c, nib;
-	u_int len = 0;
-
-	while ((c = *ascii++) != '\0' && len < (u_int)maxlen) {
-		if (c == '.' || c == '+' || c == '/')
-			continue;
-		if (!isascii(c))
-			return (0);
-		if (islower(c))
-			c = toupper(c);
-		if (isxdigit(c)) {
-			nib = xtob(c);
-			c = *ascii++;
-			if (c != '\0') {
-				c = toupper(c);
-				if (isxdigit(c)) {
-					*binary++ = (nib << 4) | xtob(c);
-					len++;
-				} else
-					return (0);
-			}
-			else
-				return (0);
-		}
-		else
-			return (0);
-	}
-	return (len);
-}
-
-char *
-inet_nsap_ntoa(binlen, binary, ascii)
-	int binlen;
-	const u_char *binary;
-	char *ascii;
-{
-	int nib;
-	int i;
-	static char tmpbuf[255*3];
-	char *start;
-
-	if (ascii)
-		start = ascii;
-	else {
-		ascii = tmpbuf;
-		start = tmpbuf;
-	}
-
-	if (binlen > 255)
-		binlen = 255;
-
-	for (i = 0; i < binlen; i++) {
-		nib = *binary >> 4;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		nib = *binary++ & 0x0f;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		if (((i % 2) == 0 && (i + 1) < binlen))
-			*ascii++ = '.';
-	}
-	*ascii = '\0';
-	return (start);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_nsap_addr
-__weak_reference(__inet_nsap_addr, inet_nsap_addr);
-#undef inet_nsap_ntoa
-__weak_reference(__inet_nsap_ntoa, inet_nsap_ntoa);
diff --git a/newlib/libc/sys/linux/net/nsdispatch.3 b/newlib/libc/sys/linux/net/nsdispatch.3
deleted file mode 100644
index 708f97c..0000000
--- a/newlib/libc/sys/linux/net/nsdispatch.3
+++ /dev/null
@@ -1,231 +0,0 @@
-.\"	$NetBSD: nsdispatch.3,v 1.8 1999/03/22 19:44:53 garbled Exp $
-.\"	$FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.5 2001/10/01 16:08:56 ru Exp $
-.\"
-.\" Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Luke Mewburn.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"        This product includes software developed by the NetBSD
-.\"        Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\"    contributors may be used to endorse or promote products derived
-.\"    from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd January 19, 1999
-.Dt NSDISPATCH 3
-.Os
-.Sh NAME
-.Nm nsdispatch
-.Nd name-service switch dispatcher routine
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In nsswitch.h
-.Ft int
-.Fo nsdispatch
-.Fa "void *retval"
-.Fa "const ns_dtab dtab[]"
-.Fa "const char *database"
-.Fa "const char *method"
-.Fa "const ns_src defaults[]"
-.Fa "..."
-.Fc
-.Sh DESCRIPTION
-The
-.Fn nsdispatch
-function invokes the callback functions specified in
-.Va dtab
-in the order given in
-.Pa /etc/nsswitch.conf
-for the database
-.Va database
-until a successful entry is found.
-.Pp
-.Va retval
-is passed to each callback function to modify as necessary
-(to pass back to the caller of
-.Fn nsdispatch )
-.Pp
-.Va dtab
-is an array of
-.Va ns_dtab
-structures, which have the following format:
-.Bd -literal -offset indent
-typedef struct {
-	const char *src;
-	int (*cb)(void *retval, void *cb_data, va_list ap);
-	void *cb_data;
-} ns_dtab;
-.Ed
-.Pp
-.Bd -ragged -offset indent
-For each source type that is implemented, an entry with
-.Va src
-set to the name of the source,
-.Va cb
-defined as a function which handles that source, and
-.Va cb_data
-is used to pass arbritrary data to the callback function.
-The last entry in
-.Va dtab
-should contain
-.Dv NULL
-values for
-.Va src ,
-.Va cb ,
-and
-.Va cb_data .
-.Ed
-.Pp
-.Va method
-is usually the name of the function calling
-.Fn nsdispatch .
-When dynamic loading is supported, a symbol constructed from
-.Va database ,
-the current source, and
-.Va method
-will be used as the name to invoke the dynamically loaded function.
-.Pp
-.Va defaults
-contains a list of default sources to try in the case of
-a missing or corrupt
-.Xr nsswitch.conf 5 ,
-or if there isn't a relevant entry for
-.Va database .
-It is an array of
-.Va ns_src
-structures, which have the following format:
-.Bd -literal -offset indent
-typedef struct {
-	const char *src;
-	u_int32_t flags;
-} ns_src;
-.Ed
-.Pp
-.Bd -ragged -offset indent
-For each default source type, an entry with
-.Va src
-set to the name of the source, and
-.Va flags
-set to the relevant flags
-(usually
-.Dv NS_SUCCESS ;
-refer to
-.Sx Callback return values
-for more information).
-The last entry in
-.Va defaults
-should have
-.Va src
-set to
-.Dv NULL
-and
-.Va flags
-set to 0.
-.Pp
-For convenience, a global variable defined as:
-.Dl extern const ns_src __nsdefaultsrc[];
-exists which contains a single default entry for
-.Sq files
-for use by callers which don't require complicated default rules.
-.Ed
-.Pp
-.Sq Va ...
-are optional extra arguments, which
-are passed to the appropriate callback function as a variable argument
-list of the type
-.Va va_list .
-.Ss Valid source types
-Whilst there is support for arbitrary sources, the following
-#defines for commonly implementated sources are available:
-.Bl -column NS_COMPAT COMPAT -offset indent
-.It Sy "#define	value"
-.It "NSSRC_FILES	""files"""
-.It "NSSRC_DNS	""dns"""
-.It "NSSRC_NIS	""nis"""
-.It "NSSRC_COMPAT	""compat"""
-.El
-.Pp
-Refer to
-.Xr nsswitch.conf 5
-for a complete description of what each source type is.
-.Pp
-.Ss Callback return values
-The callback functions should return one of the following values
-depending upon status of the lookup:
-.Bl -column NS_NOTFOUND -offset indent
-.It Sy "Return value	Status code"
-.It "NS_SUCCESS	success"
-.It "NS_NOTFOUND	notfound"
-.It "NS_UNAVAIL	unavail"
-.It "NS_TRYAGAIN	tryagain"
-.El
-.Pp
-Refer to
-.Xr nsswitch.conf 5
-for a complete description of what each status code is.
-.Pp
-.Nm
-returns the value of the callback that caused the dispatcher to finish,
-or NS_NOTFOUND otherwise.
-.Sh SEE ALSO
-.Xr hesiod 3 ,
-.Xr stdarg 3 ,
-.Xr ypclnt 3 ,
-.Xr nsswitch.conf 5
-.Sh HISTORY
-The
-.Nm
-routines first appeared in
-.Fx 4.1 .
-They were imported from the
-.Nx
-Project,
-where they appeared first in
-.Nx 1.4 .
-.Sh AUTHORS
-Luke Mewburn
-.Aq lukem@netbsd.org
-wrote this freely distributable name-service switch implementation,
-using ideas from the
-.Tn ULTRIX
-.Xr svc.conf 5
-and
-.Tn Solaris
-.Xr nsswitch.conf 4
-manual pages.
-.Sh BUGS
-The
-.Nm
-routines are not thread safe.
-This will be rectified in the future.
-.Pp
-Currently there is no support for dynamically loadable dispatcher callback
-functions.
-It is anticipated that this will be added in the future in the back-end
-without requiring changes to code that invokes
-.Fn nsdispatch .
diff --git a/newlib/libc/sys/linux/net/nsdispatch.c b/newlib/libc/sys/linux/net/nsdispatch.c
deleted file mode 100644
index ea5fc6d..0000000
--- a/newlib/libc/sys/linux/net/nsdispatch.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*	$NetBSD: nsdispatch.c,v 1.9 1999/01/25 00:16:17 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <fcntl.h>
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-/*
- * default sourcelist: `files'
- */
-const ns_src __nsdefaultsrc[] = {
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ 0 },
-};
-
-
-static	int			 _nsmapsize = 0;
-static	ns_dbt			*_nsmap = NULL;
-
-/*
- * size of dynamic array chunk for _nsmap and _nsmap[x].srclist
- */
-#define NSELEMSPERCHUNK		8
-
-
-int	_nscmp(const void *, const void *);
-
-
-int
-_nscmp(a, b)
-	const void *a;
-	const void *b;
-{
-	return (strcasecmp(((const ns_dbt *)a)->name,
-	    ((const ns_dbt *)b)->name));
-}
-
-
-void
-_nsdbtaddsrc(dbt, src)
-	ns_dbt		*dbt;
-	const ns_src	*src;
-{
-	if ((dbt->srclistsize % NSELEMSPERCHUNK) == 0) {
-		dbt->srclist = (ns_src *)realloc(dbt->srclist,
-		    (dbt->srclistsize + NSELEMSPERCHUNK) * sizeof(ns_src));
-		if (dbt->srclist == NULL)
-			printf("nsdispatch: memory allocation failure\n");
-	}
-	memmove(&dbt->srclist[dbt->srclistsize++], src, sizeof(ns_src));
-}
-
-
-void
-_nsdbtdump(dbt)
-	const ns_dbt *dbt;
-{
-	int i;
-
-	printf("%s (%d source%s):", dbt->name, dbt->srclistsize,
-	    dbt->srclistsize == 1 ? "" : "s");
-	for (i = 0; i < dbt->srclistsize; i++) {
-		printf(" %s", dbt->srclist[i].name);
-		if (!(dbt->srclist[i].flags &
-		    (NS_UNAVAIL|NS_NOTFOUND|NS_TRYAGAIN)) &&
-		    (dbt->srclist[i].flags & NS_SUCCESS))
-			continue;
-		printf(" [");
-		if (!(dbt->srclist[i].flags & NS_SUCCESS))
-			printf(" SUCCESS=continue");
-		if (dbt->srclist[i].flags & NS_UNAVAIL)
-			printf(" UNAVAIL=return");
-		if (dbt->srclist[i].flags & NS_NOTFOUND)
-			printf(" NOTFOUND=return");
-		if (dbt->srclist[i].flags & NS_TRYAGAIN)
-			printf(" TRYAGAIN=return");
-		printf(" ]");
-	}
-	printf("\n");
-}
-
-
-const ns_dbt *
-_nsdbtget(name)
-	const char	*name;
-{
-	static	time_t	 confmod;
-
-	struct stat	 statbuf;
-	ns_dbt		 dbt;
-
-	extern	FILE 	*_nsyyin;
-	extern	int	 _nsyyparse(void);
-
-	dbt.name = name;
-
-	if (confmod) {
-		if (stat(_PATH_NS_CONF, &statbuf) == -1)
-			return (NULL);
-		if (confmod < statbuf.st_mtime) {
-			int i, j;
-
-			for (i = 0; i < _nsmapsize; i++) {
-				for (j = 0; j < _nsmap[i].srclistsize; j++) {
-					if (_nsmap[i].srclist[j].name != NULL) {
-						/*LINTED const cast*/
-						free((void *)
-						    _nsmap[i].srclist[j].name);
-					}
-				}
-				if (_nsmap[i].srclist)
-					free(_nsmap[i].srclist);
-				if (_nsmap[i].name) {
-					/*LINTED const cast*/
-					free((void *)_nsmap[i].name);
-				}
-			}
-			if (_nsmap)
-				free(_nsmap);
-			_nsmap = NULL;
-			_nsmapsize = 0;
-			confmod = 0;
-		}
-	}
-	if (!confmod) {
-		if (stat(_PATH_NS_CONF, &statbuf) == -1)
-			return (NULL);
-		_nsyyin = fopen(_PATH_NS_CONF, "r");
-		if (_nsyyin == NULL)
-			return (NULL);
-		_nsyyparse();
-		(void)fclose(_nsyyin);
-		qsort(_nsmap, (size_t)_nsmapsize, sizeof(ns_dbt), _nscmp);
-		confmod = statbuf.st_mtime;
-	}
-	return (bsearch(&dbt, _nsmap, (size_t)_nsmapsize, sizeof(ns_dbt),
-	    _nscmp));
-}
-
-
-void
-_nsdbtput(dbt)
-	const ns_dbt *dbt;
-{
-	int	i;
-
-	for (i = 0; i < _nsmapsize; i++) {
-		if (_nscmp(dbt, &_nsmap[i]) == 0) {
-					/* overwrite existing entry */
-			if (_nsmap[i].srclist != NULL)
-				free(_nsmap[i].srclist);
-			memmove(&_nsmap[i], dbt, sizeof(ns_dbt));
-			return;
-		}
-	}
-
-	if ((_nsmapsize % NSELEMSPERCHUNK) == 0) {
-		_nsmap = (ns_dbt *)realloc(_nsmap,
-		    (_nsmapsize + NSELEMSPERCHUNK) * sizeof(ns_dbt));
-		if (_nsmap == NULL)
-			printf("nsdispatch: memory allocation failure\n");
-	}
-	memmove(&_nsmap[_nsmapsize++], dbt, sizeof(ns_dbt));
-}
-
-
-int
-#if __STDC__
-nsdispatch(void *retval, const ns_dtab disp_tab[], const char *database,
-	    const char *method, const ns_src defaults[], ...)
-#else
-nsdispatch(retval, disp_tab, database, method, defaults, va_alist)
-	void		*retval;
-	const ns_dtab	 disp_tab[];
-	const char	*database;
-	const char	*method;
-	const ns_src	 defaults[];
-	va_dcl
-#endif
-{
-	va_list		 ap;
-	int		 i, curdisp, result;
-	const ns_dbt	*dbt;
-	const ns_src	*srclist;
-	int		 srclistsize;
-
-	dbt = _nsdbtget(database);
-	if (dbt != NULL) {
-		srclist = dbt->srclist;
-		srclistsize = dbt->srclistsize;
-	} else {
-		srclist = defaults;
-		srclistsize = 0;
-		while (srclist[srclistsize].name != NULL)
-			srclistsize++;
-	}
-	result = 0;
-
-	for (i = 0; i < srclistsize; i++) {
-		for (curdisp = 0; disp_tab[curdisp].src != NULL; curdisp++)
-			if (strcasecmp(disp_tab[curdisp].src,
-			    srclist[i].name) == 0)
-				break;
-		result = 0;
-		if (disp_tab[curdisp].callback) {
-#if __STDC__
-			va_start(ap, defaults);
-#else
-			va_start(ap);
-#endif
-			result = disp_tab[curdisp].callback(retval,
-			    disp_tab[curdisp].cb_data, ap);
-			va_end(ap);
-			if (result & srclist[i].flags) {
-				break;
-			}
-		}
-	}
-	return (result ? result : NS_NOTFOUND);
-}
diff --git a/newlib/libc/sys/linux/net/nslexer.c b/newlib/libc/sys/linux/net/nslexer.c
deleted file mode 100644
index 3f6ba4d..0000000
--- a/newlib/libc/sys/linux/net/nslexer.c
+++ /dev/null
@@ -1,1712 +0,0 @@
-#define yy_create_buffer _nsyy_create_buffer
-#define yy_delete_buffer _nsyy_delete_buffer
-#define yy_scan_buffer _nsyy_scan_buffer
-#define yy_scan_string _nsyy_scan_string
-#define yy_scan_bytes _nsyy_scan_bytes
-#define yy_flex_debug _nsyy_flex_debug
-#define yy_init_buffer _nsyy_init_buffer
-#define yy_flush_buffer _nsyy_flush_buffer
-#define yy_load_buffer_state _nsyy_load_buffer_state
-#define yy_switch_to_buffer _nsyy_switch_to_buffer
-#define yyin _nsyyin
-#define yyleng _nsyyleng
-#define yylex _nsyylex
-#define yyout _nsyyout
-#define yyrestart _nsyyrestart
-#define yytext _nsyytext
-#define yylineno _nsyylineno
-#define yywrap _nsyywrap
-
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header$
- */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
-#include <stdio.h>
-#include <unistd.h>
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include <stdlib.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
-
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 1024
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
-		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int yy_size_t;
-
-
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-	};
-
-static YY_BUFFER_STATE yy_current_buffer = 0;
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart YY_PROTO(( FILE *input_file ));
-
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
-
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
-
-#define YY_USES_REJECT
-typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-typedef int yy_state_type;
-extern int yylineno;
-int yylineno = 1;
-extern char *yytext;
-#define yytext_ptr yytext
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 13
-#define YY_END_OF_BUFFER 14
-static yyconst short int yy_acclist[83] =
-    {   0,
-       14,   12,   13,    1,   12,   13,    4,   13,    2,   12,
-       13,   11,   12,   13,   11,   12,   13,   11,   12,   13,
-       11,   12,   13,   11,   12,   13,   11,   12,   13,   11,
-       12,   13,   12,   13,    1,    2,   11,   11,   11,   11,
-       11,   11,   11,    3,   11,   11,   11,   11,   11,   11,
-       11,   11,   11,   11,   11,   11,   11,   11,   11,   11,
-       11,   11,   11,   11,    9,   11,   11,   11,   11,   11,
-       11,    5,   11,   11,    6,   11,   10,   11,    7,   11,
-        8,   11
-    } ;
-
-static yyconst short int yy_accept[60] =
-    {   0,
-        1,    1,    1,    2,    4,    7,    9,   12,   15,   18,
-       21,   24,   27,   30,   33,   35,   36,   37,   38,   39,
-       40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
-       50,   51,   52,   53,   54,   55,   56,   57,   58,   59,
-       60,   61,   62,   63,   64,   65,   67,   68,   69,   70,
-       71,   72,   74,   75,   77,   79,   81,   83,   83
-    } ;
-
-static yyconst int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    1,    4,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    1,    1,    1,
-        1,    1,    1,    1,    6,    7,    8,    9,   10,   11,
-       12,    7,   13,    7,    7,   14,    7,   15,   16,    7,
-        7,   17,   18,   19,   20,   21,    7,    7,   22,    7,
-        1,   23,    1,    1,    5,    1,    6,    7,    8,    9,
-
-       10,   11,   12,    7,   13,    7,    7,   14,    7,   15,
-       16,    7,    7,   17,   18,   19,   20,   21,    7,    7,
-       22,    7,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst int yy_meta[24] =
-    {   0,
-        1,    1,    2,    1,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    1
-    } ;
-
-static yyconst short int yy_base[61] =
-    {   0,
-        0,    0,   68,   69,   65,   69,    0,    0,   50,   49,
-       54,   43,   45,   46,   57,   57,    0,    0,   43,   38,
-       37,   47,   32,   47,   69,   33,   40,   30,   41,   42,
-       26,   33,   29,   27,   33,   30,   35,   25,   19,   23,
-       19,   30,   22,   14,   18,    0,   14,   18,   16,   19,
-       19,    0,   12,    0,    0,    0,    0,   69,   23,   22
-    } ;
-
-static yyconst short int yy_def[61] =
-    {   0,
-       58,    1,   58,   58,   58,   58,   59,   60,   60,   60,
-       60,   60,   60,   60,   58,   58,   59,   60,   60,   60,
-       60,   60,   60,   60,   58,   60,   60,   60,   60,   60,
-       60,   60,   60,   60,   60,   60,   60,   60,   60,   60,
-       60,   60,   60,   60,   60,   60,   60,   60,   60,   60,
-       60,   60,   60,   60,   60,   60,   60,    0,   58,   58
-    } ;
-
-static yyconst short int yy_nxt[93] =
-    {   0,
-        4,    5,    6,    7,    4,    8,    8,    9,    8,    8,
-        8,    8,    8,    8,   10,    8,   11,   12,   13,   14,
-        8,    8,   15,   17,   18,   17,   57,   56,   55,   54,
-       53,   52,   51,   50,   49,   48,   47,   46,   45,   44,
-       43,   42,   41,   40,   39,   38,   37,   36,   35,   34,
-       33,   32,   31,   30,   29,   28,   27,   26,   16,   25,
-       24,   23,   22,   21,   20,   19,   16,   58,    3,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58
-
-    } ;
-
-static yyconst short int yy_chk[93] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,   59,   60,   59,   53,   51,   50,   49,
-       48,   47,   45,   44,   43,   42,   41,   40,   39,   38,
-       37,   36,   35,   34,   33,   32,   31,   30,   29,   28,
-       27,   26,   24,   23,   22,   21,   20,   19,   16,   15,
-       14,   13,   12,   11,   10,    9,    5,    3,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58
-
-    } ;
-
-static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
-static char *yy_full_match;
-static int yy_lp;
-#define REJECT \
-{ \
-*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ \
-yy_cp = yy_full_match; /* restore poss. backed-over text */ \
-++yy_lp; \
-goto find_rule; \
-}
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "nslexer.l"
-#define INITIAL 0
-#line 2 "nslexer.l"
-/*	$NetBSD: nslexer.l,v 1.3 1999/01/25 00:16:17 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = 
-  "$FreeBSD: src/lib/libc/net/nslexer.l,v 1.3 2001/11/11 02:48:09 bde Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <ctype.h>
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <string.h>
-
-#include "nsparser.h"
-
-#define YY_NO_UNPUT
-
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
-#else
-extern int yywrap YY_PROTO(( void ));
-#endif
-#endif
-
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
-#endif
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
-		{ \
-		int c = '*', n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-YY_DECL
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp = NULL, *yy_bp = NULL;
-	register int yy_act;
-
-#line 65 "nslexer.l"
-
-
-
-	if ( yy_init )
-		{
-		yy_init = 0;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
-
-		yy_load_buffer_state();
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yy_start;
-		yy_state_ptr = yy_state_buf;
-		*yy_state_ptr++ = yy_current_state;
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 59 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			*yy_state_ptr++ = yy_current_state;
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 69 );
-
-yy_find_action:
-		yy_current_state = *--yy_state_ptr;
-		yy_lp = yy_accept[yy_current_state];
-find_rule: /* we branch to this label when backing up */
-		for ( ; ; ) /* until we find what rule we matched */
-			{
-			if ( yy_lp && yy_lp < yy_accept[yy_current_state + 1] )
-				{
-				yy_act = yy_acclist[yy_lp];
-					{
-					yy_full_match = yy_cp;
-					break;
-					}
-				}
-			--yy_cp;
-			yy_current_state = *--yy_state_ptr;
-			yy_lp = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-		if ( yy_act != YY_END_OF_BUFFER )
-			{
-			int yyl;
-			for ( yyl = 0; yyl < yyleng; ++yyl )
-				if ( yytext[yyl] == '\n' )
-					++yylineno;
-			}
-
-do_action:	/* This label is used only to access EOF actions. */
-
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-case 1:
-YY_RULE_SETUP
-#line 67 "nslexer.l"
-;			/* skip whitespace */
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 69 "nslexer.l"
-;			/* skip comments */
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 71 "nslexer.l"
-;			/* allow continuation */
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 73 "nslexer.l"
-return NL;
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 75 "nslexer.l"
-return SUCCESS;
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 76 "nslexer.l"
-return UNAVAIL;
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 77 "nslexer.l"
-return NOTFOUND;
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 78 "nslexer.l"
-return TRYAGAIN;
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 80 "nslexer.l"
-return RETURN;
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 81 "nslexer.l"
-return CONTINUE;
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 83 "nslexer.l"
-{
-			char *p;
-			int i;
-			size_t len;
-
-			len = strlen (yytext) + 1;
-			if ((p = malloc (len)) == NULL)
-				    printf("nsdispatch: memory allocation failure\n");
-			else
-				memcpy (p, yytext, len);
-
-			for (i = 0; i < strlen(p); i++) {
-				if (isupper((unsigned char)p[i]))
-					p[i] = tolower((unsigned char)p[i]);
-			}
-			_nsyylval.str = p;
-			return STRING;
-		}
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 99 "nslexer.l"
-return yytext[0];
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 101 "nslexer.l"
-ECHO;
-	YY_BREAK
-			case YY_STATE_EOF(INITIAL):
-				yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state();
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = yy_c_buf_p;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer() )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yy_did_buffer_switch_on_eof = 0;
-
-				if ( yywrap() )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of yylex */
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
-
-	else
-		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
-
-			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = yy_current_buffer->yy_buf_size -
-						number_to_move - 1;
-#endif
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
-
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	if ( yy_n_chars == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
-
-	return ret_val;
-	}
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-static yy_state_type yy_get_previous_state()
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
-	yy_current_state = yy_start;
-	yy_state_ptr = yy_state_buf;
-	*yy_state_ptr++ = yy_current_state;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 59 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		*yy_state_ptr++ = yy_current_state;
-		}
-
-	return yy_current_state;
-	}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
-	register int yy_is_jam;
-
-	register YY_CHAR yy_c = 1;
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 59 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 58);
-	if ( ! yy_is_jam )
-		*yy_state_ptr++ = yy_current_state;
-
-	return yy_is_jam ? 0 : yy_current_state;
-	}
-
-
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
-
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
-
-		while ( source > yy_current_buffer->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
-
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-	if ( c == '\n' )
-		--yylineno;
-
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-#endif	/* ifndef YY_NO_UNPUT */
-
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-	{
-	int c;
-
-	*yy_c_buf_p = yy_hold_char;
-
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
-
-			switch ( yy_get_next_buffer() )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart( yyin );
-
-					/* fall through */
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap() )
-						return EOF;
-
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
-	if ( c == '\n' )
-		++yylineno;
-
-	return c;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
-		return;
-
-	if ( yy_current_buffer )
-		{
-		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer( b, file );
-
-	return b;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
-	if ( ! b )
-		return;
-
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
-
-
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
-	{
-	yy_flush_buffer( b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
-	{
-	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
-	}
-
-
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer( b );
-
-	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
-
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer( buf, n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
-
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
-
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
-
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
-
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-	BEGIN(new_state);
-	}
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
-
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-	}
-#endif
-
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-	}
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
-	return (void *) malloc( size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
-
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
-#line 101 "nslexer.l"
-
-
-#undef _nsyywrap
-int
-_nsyywrap()
-{
-	return 1;
-} /* _nsyywrap */
-
-void
-_nsyyerror(msg)
-	const char *msg;
-{
-
-	printf("Error in nslexer\n");
-} /* _nsyyerror */
diff --git a/newlib/libc/sys/linux/net/nslexer.l b/newlib/libc/sys/linux/net/nslexer.l
deleted file mode 100644
index 0b66b6c..0000000
--- a/newlib/libc/sys/linux/net/nslexer.l
+++ /dev/null
@@ -1,114 +0,0 @@
-%{
-/*	$NetBSD: nslexer.l,v 1.3 1999/01/25 00:16:17 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = 
-  "$FreeBSD: src/lib/libc/net/nslexer.l,v 1.3 2001/11/11 02:48:09 bde Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <ctype.h>
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <string.h>
-
-#include "nsparser.h"
-
-#define YY_NO_UNPUT
-
-%}
-
-%option yylineno
-
-BLANK		[ \t]
-CR		\n
-STRING		[a-zA-Z][a-zA-Z0-9_]*
-
-%%
-
-{BLANK}+	;			/* skip whitespace */
-
-#.*		;			/* skip comments */
-
-\\{CR}		;			/* allow continuation */
-
-{CR}		return NL;
-
-[sS][uU][cC][cC][eE][sS][sS]		return SUCCESS;
-[uU][nN][aA][vV][aA][iI][lL]		return UNAVAIL;
-[nN][oO][tT][fF][oO][uU][nN][dD]	return NOTFOUND;
-[tT][rR][yY][aA][gG][aA][iI][nN]	return TRYAGAIN;
-
-[rR][eE][tT][uU][rR][nN]		return RETURN;
-[cC][oO][nN][tT][iI][nN][uU][eE]	return CONTINUE;
-
-{STRING}	{
-			char *p;
-			int i;
-
-			if ((p = strdup(yytext)) == NULL)
-				    printf("nsdispatch: memory allocation failure\n");
-
-			for (i = 0; i < strlen(p); i++) {
-				if (isupper((unsigned char)p[i]))
-					p[i] = tolower((unsigned char)p[i]);
-			}
-			_nsyylval.str = p;
-			return STRING;
-		}
-
-.		return yytext[0];
-
-%%
-
-#undef _nsyywrap
-int
-_nsyywrap()
-{
-	return 1;
-} /* _nsyywrap */
-
-void
-_nsyyerror(msg)
-	const char *msg;
-{
-
-	printf("Error in nslexer\n");
-} /* _nsyyerror */
diff --git a/newlib/libc/sys/linux/net/nsparser.c b/newlib/libc/sys/linux/net/nsparser.c
deleted file mode 100644
index b4701ae..0000000
--- a/newlib/libc/sys/linux/net/nsparser.c
+++ /dev/null
@@ -1,541 +0,0 @@
-#ifndef lint
-static char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define yyclearin (yychar=(-1))
-#define yyerrok (yyerrflag=0)
-#define YYRECOVERING (yyerrflag!=0)
-#define yyparse _nsyyparse
-#define yylex _nsyylex
-#define yyerror _nsyyerror
-#define yychar _nsyychar
-#define yyval _nsyyval
-#define yylval _nsyylval
-#define yydebug _nsyydebug
-#define yynerrs _nsyynerrs
-#define yyerrflag _nsyyerrflag
-#define yyss _nsyyss
-#define yyssp _nsyyssp
-#define yyvs _nsyyvs
-#define yyvsp _nsyyvsp
-#define yylhs _nsyylhs
-#define yylen _nsyylen
-#define yydefred _nsyydefred
-#define yydgoto _nsyydgoto
-#define yysindex _nsyysindex
-#define yyrindex _nsyyrindex
-#define yygindex _nsyygindex
-#define yytable _nsyytable
-#define yycheck _nsyycheck
-#define yyname _nsyyname
-#define yyrule _nsyyrule
-#define YYPREFIX "_nsyy"
-#line 2 "nsparser.y"
-/*	$NetBSD: nsparser.y,v 1.3 1999/01/25 00:16:18 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid =
-  "$FreeBSD: src/lib/libc/net/nsparser.y,v 1.3 2002/03/21 22:47:17 obrien Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <stdio.h>
-#include <string.h>
-
-
-static	void	_nsaddsrctomap(const char *);
-
-static	ns_dbt		curdbt;
-static	ns_src		cursrc;
-#line 59 "nsparser.y"
-typedef union {
-	char *str;
-	int   mapval;
-} YYSTYPE;
-#line 97 "y.tab.c"
-#define NL 257
-#define SUCCESS 258
-#define UNAVAIL 259
-#define NOTFOUND 260
-#define TRYAGAIN 261
-#define RETURN 262
-#define CONTINUE 263
-#define STRING 264
-#define YYERRCODE 256
-short _nsyylhs[] = {                                        -1,
-    0,    0,    3,    3,    4,    4,    4,    4,    5,    6,
-    6,    7,    9,    7,    8,    8,   10,    1,    1,    1,
-    1,    2,    2,
-};
-short _nsyylen[] = {                                         2,
-    0,    1,    1,    2,    1,    3,    4,    2,    1,    1,
-    2,    1,    0,    5,    1,    2,    3,    1,    1,    1,
-    1,    1,    1,
-};
-short _nsyydefred[] = {                                      0,
-    0,    5,    9,    0,    0,    3,    0,    8,    4,    0,
-    6,    0,    0,   10,   13,    7,   11,    0,   18,   19,
-   20,   21,    0,    0,   15,    0,   14,   16,   22,   23,
-   17,
-};
-short _nsyydgoto[] = {                                       4,
-   23,   31,    5,    6,    7,   13,   14,   24,   18,   25,
-};
-short _nsyysindex[] = {                                   -255,
- -249,    0,    0,    0, -255,    0,  -41,    0,    0, -254,
-    0,  -73, -253,    0,    0,    0,    0, -245,    0,    0,
-    0,    0,  -42,  -93,    0, -256,    0,    0,    0,    0,
-    0,
-};
-short _nsyyrindex[] = {                                     20,
-    0,    0,    0,    0,   21,    0,    0,    0,    0,    0,
-    0, -252,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,
-};
-short _nsyygindex[] = {                                      0,
-    0,    0,    0,   17,    0,    0,   10,    0,    0,    1,
-};
-#define YYTABLESIZE 168
-short _nsyytable[] = {                                      27,
-    1,    2,   11,   16,   12,   29,   30,    8,    3,   12,
-   12,   12,   19,   20,   21,   22,   10,   15,   26,    1,
-    2,    9,   17,    0,   28,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   19,   20,   21,   22,
-};
-short _nsyycheck[] = {                                      93,
-  256,  257,  257,  257,  257,  262,  263,  257,  264,  264,
-  264,  264,  258,  259,  260,  261,   58,   91,   61,    0,
-    0,    5,   13,   -1,   24,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  258,  259,  260,  261,
-};
-#define YYFINAL 4
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 264
-#if YYDEBUG
-char *_nsyyname[] = {
-"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"':'",0,0,"'='",0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'['",0,"']'",0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"NL","SUCCESS",
-"UNAVAIL","NOTFOUND","TRYAGAIN","RETURN","CONTINUE","STRING",
-};
-char *_nsyyrule[] = {
-"$accept : File",
-"File :",
-"File : Lines",
-"Lines : Entry",
-"Lines : Lines Entry",
-"Entry : NL",
-"Entry : Database ':' NL",
-"Entry : Database ':' Srclist NL",
-"Entry : error NL",
-"Database : STRING",
-"Srclist : Item",
-"Srclist : Srclist Item",
-"Item : STRING",
-"$$1 :",
-"Item : STRING '[' $$1 Criteria ']'",
-"Criteria : Criterion",
-"Criteria : Criteria Criterion",
-"Criterion : Status '=' Action",
-"Status : SUCCESS",
-"Status : UNAVAIL",
-"Status : NOTFOUND",
-"Status : TRYAGAIN",
-"Action : RETURN",
-"Action : CONTINUE",
-};
-#endif
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
-#endif
-#endif
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-short yyss[YYSTACKSIZE];
-YYSTYPE yyvs[YYSTACKSIZE];
-#define yystacksize YYSTACKSIZE
-#line 150 "nsparser.y"
-
-static void
-_nsaddsrctomap(elem)
-	const char *elem;
-{
-	int		i, lineno;
-	extern int	_nsyylineno;
-	extern char *	_nsyytext;
-
-	lineno = _nsyylineno - (*_nsyytext == '\n' ? 1 : 0);
-	if (curdbt.srclistsize > 0) {
-		if ((strcasecmp(elem, NSSRC_COMPAT) == 0) ||
-		    (strcasecmp(curdbt.srclist[0].name, NSSRC_COMPAT) == 0)) {
-				/* XXX: syslog the following */
-			printf("line %d 'compat' used with other sources",
-			    lineno);
-			return;
-		}
-	}
-	for (i = 0; i < curdbt.srclistsize; i++) {
-		if (strcasecmp(curdbt.srclist[i].name, elem) == 0) {
-				/* XXX: syslog the following */
-			printf("%s line %d: duplicate source '%s'",
-			    lineno, elem);
-			return;
-		}
-	}
-	cursrc.name = elem;
-	_nsdbtaddsrc(&curdbt, &cursrc);
-}
-#line 276 "y.tab.c"
-#define YYABORT goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR goto yyerrlab
-int
-yyparse()
-{
-    register int yym, yyn, yystate;
-#if YYDEBUG
-    register char *yys;
-    extern char *getenv();
-
-    if (yys = getenv("YYDEBUG"))
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = (-1);
-
-    yyssp = yyss;
-    yyvsp = yyvs;
-    *yyssp = yystate = 0;
-
-yyloop:
-    if (yyn = yydefred[yystate]) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yyssp >= yyss + yystacksize - 1)
-        {
-            goto yyoverflow;
-        }
-        *++yyssp = yystate = yytable[yyn];
-        *++yyvsp = yylval;
-        yychar = (-1);
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-#ifdef lint
-    goto yynewerror;
-#endif
-yynewerror:
-    yyerror("syntax error");
-#ifdef lint
-    goto yyerrlab;
-#endif
-yyerrlab:
-    ++yynerrs;
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
-#endif
-                if (yyssp >= yyss + yystacksize - 1)
-                {
-                    goto yyoverflow;
-                }
-                *++yyssp = yystate = yytable[yyn];
-                *++yyvsp = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yyssp);
-#endif
-                if (yyssp <= yyss) goto yyabort;
-                --yyssp;
-                --yyvsp;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = (-1);
-        goto yyloop;
-    }
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    yyval = yyvsp[1-yym];
-    switch (yyn)
-    {
-case 7:
-#line 87 "nsparser.y"
-{
-			_nsdbtput(&curdbt);
-		}
-break;
-case 8:
-#line 91 "nsparser.y"
-{
-			yyerrok;
-		}
-break;
-case 9:
-#line 98 "nsparser.y"
-{
-			curdbt.name = yylval.str;
-			curdbt.srclist = NULL;
-			curdbt.srclistsize = 0;
-		}
-break;
-case 12:
-#line 112 "nsparser.y"
-{
-			cursrc.flags = NS_SUCCESS;
-			_nsaddsrctomap(yyvsp[0].str);
-		}
-break;
-case 13:
-#line 116 "nsparser.y"
-{ cursrc.flags = NS_SUCCESS; }
-break;
-case 14:
-#line 117 "nsparser.y"
-{
-			_nsaddsrctomap(yyvsp[-4].str);
-		}
-break;
-case 17:
-#line 129 "nsparser.y"
-{
-			if (yyvsp[0].mapval)		/* if action == RETURN set RETURN bit */
-				cursrc.flags |= yyvsp[-2].mapval;  
-			else		/* else unset it */
-				cursrc.flags &= ~yyvsp[-2].mapval;
-		}
-break;
-case 18:
-#line 138 "nsparser.y"
-{ yyval.mapval = NS_SUCCESS; }
-break;
-case 19:
-#line 139 "nsparser.y"
-{ yyval.mapval = NS_UNAVAIL; }
-break;
-case 20:
-#line 140 "nsparser.y"
-{ yyval.mapval = NS_NOTFOUND; }
-break;
-case 21:
-#line 141 "nsparser.y"
-{ yyval.mapval = NS_TRYAGAIN; }
-break;
-case 22:
-#line 145 "nsparser.y"
-{ yyval.mapval = 1L; }
-break;
-case 23:
-#line 146 "nsparser.y"
-{ yyval.mapval = 0L; }
-break;
-#line 487 "y.tab.c"
-    }
-    yyssp -= yym;
-    yystate = *yyssp;
-    yyvsp -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yyssp = YYFINAL;
-        *++yyvsp = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = 0;
-                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-                if (!yys) yys = "illegal-symbol";
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yyssp, yystate);
-#endif
-    if (yyssp >= yyss + yystacksize - 1)
-    {
-        goto yyoverflow;
-    }
-    *++yyssp = yystate;
-    *++yyvsp = yyval;
-    goto yyloop;
-yyoverflow:
-    yyerror("yacc stack overflow");
-yyabort:
-    return (1);
-yyaccept:
-    return (0);
-}
diff --git a/newlib/libc/sys/linux/net/nsparser.h b/newlib/libc/sys/linux/net/nsparser.h
deleted file mode 100644
index 6a6fae0..0000000
--- a/newlib/libc/sys/linux/net/nsparser.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#define NL 257
-#define SUCCESS 258
-#define UNAVAIL 259
-#define NOTFOUND 260
-#define TRYAGAIN 261
-#define RETURN 262
-#define CONTINUE 263
-#define STRING 264
-typedef union {
-	char *str;
-	int   mapval;
-} YYSTYPE;
-extern YYSTYPE _nsyylval;
diff --git a/newlib/libc/sys/linux/net/nsparser.y b/newlib/libc/sys/linux/net/nsparser.y
deleted file mode 100644
index 42f63a8..0000000
--- a/newlib/libc/sys/linux/net/nsparser.y
+++ /dev/null
@@ -1,178 +0,0 @@
-%{
-/*	$NetBSD: nsparser.y,v 1.3 1999/01/25 00:16:18 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid =
-  "$FreeBSD: src/lib/libc/net/nsparser.y,v 1.3 2002/03/21 22:47:17 obrien Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <stdio.h>
-#include <string.h>
-
-
-static	void	_nsaddsrctomap(const char *);
-
-static	ns_dbt		curdbt;
-static	ns_src		cursrc;
-%}
-
-%union {
-	char *str;
-	int   mapval;
-}
-
-%token	NL
-%token	SUCCESS UNAVAIL NOTFOUND TRYAGAIN
-%token	RETURN CONTINUE
-%token	<str> STRING
-
-%type	<mapval> Status Action
-
-%%
-
-File
-	:	/* empty */
-	| Lines
-	;
-
-Lines
-	: Entry
-	| Lines Entry
-	;
-
-Entry
-	: NL
-	| Database ':' NL
-	| Database ':' Srclist NL
-		{
-			_nsdbtput(&curdbt);
-		}
-	| error NL
-		{
-			yyerrok;
-		}
-	;
-
-Database
-	: STRING
-		{
-			curdbt.name = yylval.str;
-			curdbt.srclist = NULL;
-			curdbt.srclistsize = 0;
-		}
-	;
-
-Srclist
-	: Item
-	| Srclist Item
-	;
-
-Item
-	: STRING
-		{
-			cursrc.flags = NS_SUCCESS;
-			_nsaddsrctomap($1);
-		}
-	| STRING '[' { cursrc.flags = NS_SUCCESS; } Criteria ']'
-		{
-			_nsaddsrctomap($1);
-		}
-	;
-
-Criteria
-	: Criterion
-	| Criteria Criterion
-	;
-
-Criterion
-	: Status '=' Action
-		{
-			if ($3)		/* if action == RETURN set RETURN bit */
-				cursrc.flags |= $1;  
-			else		/* else unset it */
-				cursrc.flags &= ~$1;
-		}
-	;
-
-Status
-	: SUCCESS	{ $$ = NS_SUCCESS; }
-	| UNAVAIL	{ $$ = NS_UNAVAIL; }
-	| NOTFOUND	{ $$ = NS_NOTFOUND; }
-	| TRYAGAIN	{ $$ = NS_TRYAGAIN; }
-	;
-
-Action
-	: RETURN	{ $$ = 1L; }
-	| CONTINUE	{ $$ = 0L; }
-	;
-
-%%
-
-static void
-_nsaddsrctomap(elem)
-	const char *elem;
-{
-	int		i, lineno;
-	extern int	_nsyylineno;
-	extern char *	_nsyytext;
-
-	lineno = _nsyylineno - (*_nsyytext == '\n' ? 1 : 0);
-	if (curdbt.srclistsize > 0) {
-		if ((strcasecmp(elem, NSSRC_COMPAT) == 0) ||
-		    (strcasecmp(curdbt.srclist[0].name, NSSRC_COMPAT) == 0)) {
-				/* XXX: syslog the following */
-			printf("line %d 'compat' used with other sources",
-			    lineno);
-			return;
-		}
-	}
-	for (i = 0; i < curdbt.srclistsize; i++) {
-		if (strcasecmp(curdbt.srclist[i].name, elem) == 0) {
-				/* XXX: syslog the following */
-			printf("%s line %d: duplicate source '%s'",
-			    lineno, elem);
-			return;
-		}
-	}
-	cursrc.name = elem;
-	_nsdbtaddsrc(&curdbt, &cursrc);
-}
diff --git a/newlib/libc/sys/linux/net/rcmd.3 b/newlib/libc/sys/linux/net/rcmd.3
deleted file mode 100644
index 9479a23..0000000
--- a/newlib/libc/sys/linux/net/rcmd.3
+++ /dev/null
@@ -1,298 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.20 2001/10/01 16:08:56 ru Exp $
-.\"
-.Dd March 3, 2000
-.Dt RCMD 3
-.Os
-.Sh NAME
-.Nm rcmd ,
-.Nm rresvport ,
-.Nm iruserok ,
-.Nm ruserok ,
-.Nm rcmd_af ,
-.Nm rresvport_af ,
-.Nm iruserok_sa
-.Nd routines for returning a stream to a remote command
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn rcmd "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p"
-.Ft int
-.Fn rresvport "int *port"
-.Ft int
-.Fn iruserok "u_long raddr" "int superuser" "const char *ruser" "const char *luser"
-.Ft int
-.Fn ruserok "const char *rhost" "int superuser" "const char *ruser" "const char *luser"
-.Ft int
-.Fn rcmd_af "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p" "int af"
-.Ft int
-.Fn rresvport_af "int *port" "int af"
-.Ft int
-.Fn iruserok_sa "const void *addr" "int addrlen" "int superuser" "const char *ruser" "const char *luser"
-.Sh DESCRIPTION
-The
-.Fn rcmd
-function
-is used by the super-user to execute a command on
-a remote machine using an authentication scheme based
-on reserved port numbers.
-The
-.Fn rresvport
-function
-returns a descriptor to a socket
-with an address in the privileged port space.
-The
-.Fn ruserok
-function
-is used by servers
-to authenticate clients requesting service with
-.Fn rcmd .
-All three functions are present in the same file and are used
-by the
-.Xr rshd 8
-server (among others).
-.Pp
-The
-.Fn rcmd
-function
-looks up the host
-.Fa *ahost
-using
-.Xr gethostbyname 3 ,
-returning -1 if the host does not exist.
-Otherwise
-.Fa *ahost
-is set to the standard name of the host
-and a connection is established to a server
-residing at the well-known Internet port
-.Fa inport .
-.Pp
-If the connection succeeds,
-a socket in the Internet domain of type
-.Dv SOCK_STREAM
-is returned to the caller, and given to the remote
-command as
-.Em stdin
-and
-.Em stdout .
-If
-.Fa fd2p
-is non-zero, then an auxiliary channel to a control
-process will be set up, and a descriptor for it will be placed
-in
-.Fa *fd2p .
-The control process will return diagnostic
-output from the command (unit 2) on this channel, and will also
-accept bytes on this channel as being
-.Tn UNIX
-signal numbers, to be
-forwarded to the process group of the command.
-If
-.Fa fd2p
-is 0, then the
-.Em stderr
-(unit 2 of the remote
-command) will be made the same as the
-.Em stdout
-and no
-provision is made for sending arbitrary signals to the remote process,
-although you may be able to get its attention by using out-of-band data.
-.Pp
-The protocol is described in detail in
-.Xr rshd 8 .
-.Pp
-The
-.Fn rresvport
-function is used to obtain a socket to which an address with a Privileged
-Internet port is bound.
-This socket is suitable for use by
-.Fn rcmd
-and several other functions.
-Privileged Internet ports are those in the range 0 to 1023.
-Only the super-user is allowed to bind an address of this sort
-to a socket.
-.Pp
-The
-.Fn iruserok
-and
-.Fn ruserok
-functions take a remote host's IP address or name, as returned by the
-.Xr gethostbyname 3
-routines, two user names and a flag indicating whether the local user's
-name is that of the super-user.
-Then, if the user is
-.Em NOT
-the super-user, it checks the
-.Pa /etc/hosts.equiv
-file.
-If that lookup is not done, or is unsuccessful, the
-.Pa .rhosts
-in the local user's home directory is checked to see if the request for
-service is allowed.
-.Pp
-If this file does not exist, is not a regular file, is owned by anyone
-other than the user or the super-user, or is writable by anyone other
-than the owner, the check automatically fails.
-Zero is returned if the machine name is listed in the
-.Dq Pa hosts.equiv
-file, or the host and remote user name are found in the
-.Dq Pa .rhosts
-file; otherwise
-.Fn iruserok
-and
-.Fn ruserok
-return -1.
-If the local domain (as obtained from
-.Xr gethostname 3 )
-is the same as the remote domain, only the machine name need be specified.
-.Pp
-The
-.Fn iruserok
-function is strongly preferred for security reasons.
-It requires trusting the local DNS at most, while the
-.Fn ruserok
-function requires trusting the entire DNS, which can be spoofed.
-.Pp
-The functions with an
-.Dq Li _af
-or
-.Dq Li _sa
-suffix, i.e.,
-.Fn rcmd_af ,
-.Fn rresvport_af
-and
-.Fn iruserok_sa ,
-work the same as the corresponding functions without a
-suffix, except that they are capable of handling both IPv6 and IPv4 ports.
-.Pp
-The
-.Dq Li _af
-suffix means that the function has an additional
-.Fa af
-argument which is used to specify the address family,
-(see below).
-The
-.Fa af
-argument extension is implemented for functions
-that have no binary address argument.
-Instead, the
-.Fa af
-argument specifies which address family is desired.
-.Pp
-The
-.Dq Li _sa
-suffix means that the function has general socket address and
-length arguments.
-As the socket address is a protocol independent data structure,
-IPv4 and IPv6 socket address can be passed as desired.
-The
-.Fa sa
-argument extension is implemented for functions
-that pass a protocol dependent binary address argument.
-The argument needs to be replaced with a more general address structure
-to support multiple address families in a general way.
-.Pp
-The functions with neither an
-.Dq Li _af
-suffix nor an
-.Dq Li _sa
-suffix work for IPv4 only, except for
-.Fn ruserok
-which can handle both IPv6 and IPv4.
-To switch the address family, the
-.Fa af
-argument must be filled with
-.Dv AF_INET ,
-or
-.Dv AF_INET6 .
-For
-.Fn rcmd_af ,
-.Dv PF_UNSPEC
-is also allowed.
-.Sh DIAGNOSTICS
-The
-.Fn rcmd
-function
-returns a valid socket descriptor on success.
-It returns -1 on error and prints a diagnostic message
-on the standard error.
-.Pp
-The
-.Fn rresvport
-function
-returns a valid, bound socket descriptor on success.
-It returns -1 on error with the global value
-.Va errno
-set according to the reason for failure.
-The error code
-.Er EAGAIN
-is overloaded to mean ``All network ports in use.''
-.Sh SEE ALSO
-.Xr rlogin 1 ,
-.Xr rsh 1 ,
-.Xr intro 2 ,
-.Xr rexec 3 ,
-.Xr rexecd 8 ,
-.Xr rlogind 8 ,
-.Xr rshd 8
-.Pp
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%T "Advanced Socket API for IPv6"
-.%O RFC2292
-.Re
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%A E. Nordmark
-.%T "Advanced Socket API for IPv6"
-.%O draft-ietf-ipngwg-rfc2292bis-01.txt
-.Re
-.Sh HISTORY
-Most of these
-functions appeared in
-.Bx 4.2 .
-.Fn rresvport_af
-appeared in RFC2292, and was implemented by the WIDE project
-for the Hydrangea IPv6 protocol stack kit.
-.Fn rcmd_af
-appeared in draft-ietf-ipngwg-rfc2292bis-01.txt,
-and was implemented in the WIDE/KAME IPv6 protocol stack kit.
-.Fn iruserok_sa
-appeared in discussion on the IETF ipngwg mailing list,
-and was implemented in
-.Fx 4.0 .
diff --git a/newlib/libc/sys/linux/net/rcmd.c b/newlib/libc/sys/linux/net/rcmd.c
deleted file mode 100644
index 708b69d..0000000
--- a/newlib/libc/sys/linux/net/rcmd.c
+++ /dev/null
@@ -1,779 +0,0 @@
-/*
- * Copyright (c) 1983, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <time.h>
-#include <sys/select.h>
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <signal.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include <arpa/nameser.h>
-#include "un-namespace.h"
-
-/* wrapper for KAME-special getnameinfo() */
-#ifndef NI_WITHSCOPEID
-#define NI_WITHSCOPEID	0
-#endif
-
-extern int innetgr( const char *, const char *, const char *, const char * );
-extern int rcmdsh(char **ahost, int rport, const char *locuser, const char *remuser, const char *cmd, const char *rshprog);
-int rresvport_af(int *alport, int family);
-
-#define max(a, b)	((a > b) ? a : b)
-
-int __ivaliduser(FILE *, u_int32_t, const char *, const char *);
-int __ivaliduser_af(FILE *,const void *, const char *, const char *, int, int);
-int __ivaliduser_sa(FILE *, const struct sockaddr *, socklen_t, const char *,
-    const char *);
-static int __icheckhost(const struct sockaddr *, socklen_t, const char *);
-
-char paddr[NI_MAXHOST];
-
-int
-rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af)
-	char **ahost;
-	u_short rport;
-	const char *locuser, *remuser, *cmd;
-	int *fd2p;
-	int af;
-{
-	struct addrinfo hints, *res, *ai;
-	struct sockaddr_storage from;
-	fd_set reads;
-	sigset_t oldmask, newmask;
-	pid_t pid;
-	int s, aport, lport, timo, error;
-	char c, *p;
-	int refused, nres;
-	char num[8];
-	static char canonnamebuf[MAXDNAME];	/* is it proper here? */
-
-	/* call rcmdsh() with specified remote shell if appropriate. */
-	if (!issetugid() && (p = getenv("RSH"))) {
-		struct servent *sp = getservbyname("shell", "tcp");
-
-		if (sp && sp->s_port == rport)
-			return (rcmdsh(ahost, rport, locuser, remuser,
-			    cmd, p));
-	}
-
-	/* use rsh(1) if non-root and remote port is shell. */
-	if (geteuid()) {
-		struct servent *sp = getservbyname("shell", "tcp");
-
-		if (sp && sp->s_port == rport)
-			return (rcmdsh(ahost, rport, locuser, remuser,
-			    cmd, NULL));
-	}
-
-	pid = getpid();
-
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_flags = AI_CANONNAME;
-	hints.ai_family = af;
-	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_protocol = 0;
-	(void)snprintf(num, sizeof(num), "%d", ntohs(rport));
-	error = getaddrinfo(*ahost, num, &hints, &res);
-	if (error) {
-		fprintf(stderr, "rcmd: getaddrinfo: %s\n",
-			gai_strerror(error));
-		if (error == EAI_SYSTEM)
-			fprintf(stderr, "rcmd: getaddrinfo: %s\n",
-				strerror(errno));
-		return (-1);
-	}
-
-	if (res->ai_canonname
-	 && strlen(res->ai_canonname) + 1 < sizeof(canonnamebuf)) {
-		strncpy(canonnamebuf, res->ai_canonname, sizeof(canonnamebuf));
-		*ahost = canonnamebuf;
-	}
-	nres = 0;
-	for (ai = res; ai; ai = ai->ai_next)
-		nres++;
-	ai = res;
-	refused = 0;
-	sigemptyset(&newmask);
-	sigaddset(&newmask, SIGURG);
-	sigprocmask(SIG_BLOCK, (const sigset_t *)&newmask, &oldmask);
-	for (timo = 1, lport = IPPORT_RESERVED - 1;;) {
-		s = rresvport_af(&lport, ai->ai_family);
-		if (s < 0) {
-			if (errno != EAGAIN && ai->ai_next) {
-				ai = ai->ai_next;
-				continue;
-			}
-			if (errno == EAGAIN)
-				(void)fprintf(stderr,
-				    "rcmd: socket: All ports in use\n");
-			else
-				(void)fprintf(stderr, "rcmd: socket: %s\n",
-				    strerror(errno));
-			freeaddrinfo(res);
-			sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask,
-			    NULL);
-			return (-1);
-		}
-		fcntl(s, F_SETOWN, pid);
-		if (connect(s, ai->ai_addr, ai->ai_addrlen) >= 0)
-			break;
-		(void)close(s);
-		if (errno == EADDRINUSE) {
-			lport--;
-			continue;
-		}
-		if (errno == ECONNREFUSED)
-			refused = 1;
-		if (ai->ai_next == NULL && (!refused || timo > 16)) {
-			(void)fprintf(stderr, "%s: %s\n",
-				      *ahost, strerror(errno));
-			freeaddrinfo(res);
-			sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask,
-			    NULL);
-			return (-1);
-		}
-		if (nres > 1) {
-			int oerrno = errno;
-
-			getnameinfo(ai->ai_addr, ai->ai_addrlen,
-				    paddr, sizeof(paddr),
-				    NULL, 0,
-				    NI_NUMERICHOST|NI_WITHSCOPEID);
-			(void)fprintf(stderr, "connect to address %s: ",
-				      paddr);
-			errno = oerrno;
-			perror(0);
-		}
-		if ((ai = ai->ai_next) == NULL) {
-			/* refused && timo <= 16 */
-			struct timespec time_to_sleep, time_remaining;
-
-			time_to_sleep.tv_sec = timo;
-			time_to_sleep.tv_nsec = 0;
-			(void)nanosleep(&time_to_sleep, &time_remaining);
-			timo *= 2;
-			ai = res;
-			refused = 0;
-		}
-		if (nres > 1) {
-			getnameinfo(ai->ai_addr, ai->ai_addrlen,
-				    paddr, sizeof(paddr),
-				    NULL, 0,
-				    NI_NUMERICHOST|NI_WITHSCOPEID);
-			fprintf(stderr, "Trying %s...\n", paddr);
-		}
-	}
-	lport--;
-	if (fd2p == 0) {
-		write(s, "", 1);
-		lport = 0;
-	} else {
-		char num[8];
-		int s2 = rresvport_af(&lport, ai->ai_family), s3;
-		int len = ai->ai_addrlen;
-		int nfds;
-
-		if (s2 < 0)
-			goto bad;
-		listen(s2, 1);
-		(void)snprintf(num, sizeof(num), "%d", lport);
-		if (write(s, num, strlen(num)+1) != strlen(num)+1) {
-			(void)fprintf(stderr,
-			    "rcmd: write (setting up stderr): %s\n",
-			    strerror(errno));
-			(void)close(s2);
-			goto bad;
-		}
-		nfds = max(s, s2)+1;
-		if(nfds > FD_SETSIZE) {
-			fprintf(stderr, "rcmd: too many files\n");
-			(void)close(s2);
-			goto bad;
-		}
-again:
-		FD_ZERO(&reads);
-		FD_SET(s, &reads);
-		FD_SET(s2, &reads);
-		errno = 0;
-		if (select(nfds, &reads, 0, 0, 0) < 1 || !FD_ISSET(s2, &reads)){
-			if (errno != 0)
-				(void)fprintf(stderr,
-				    "rcmd: select (setting up stderr): %s\n",
-				    strerror(errno));
-			else
-				(void)fprintf(stderr,
-				"select: protocol failure in circuit setup\n");
-			(void)close(s2);
-			goto bad;
-		}
-		s3 = accept(s2, (struct sockaddr *)&from, &len);
-		switch (from.ss_family) {
-		case AF_INET:
-			aport = ntohs(((struct sockaddr_in *)&from)->sin_port);
-			break;
-#ifdef INET6
-		case AF_INET6:
-			aport = ntohs(((struct sockaddr_in6 *)&from)->sin6_port);
-			break;
-#endif
-		default:
-			aport = 0;	/* error */
-			break;
-		}
-		/*
-		 * XXX careful for ftp bounce attacks. If discovered, shut them
-		 * down and check for the real auxiliary channel to connect.
-		 */
-		if (aport == 20) {
-			close(s3);
-			goto again;
-		}
-		(void)close(s2);
-		if (s3 < 0) {
-			(void)fprintf(stderr,
-			    "rcmd: accept: %s\n", strerror(errno));
-			lport = 0;
-			goto bad;
-		}
-		*fd2p = s3;
-		if (aport >= IPPORT_RESERVED || aport < IPPORT_RESERVED / 2) {
-			(void)fprintf(stderr,
-			    "socket: protocol failure in circuit setup.\n");
-			goto bad2;
-		}
-	}
-	(void)write(s, locuser, strlen(locuser)+1);
-	(void)write(s, remuser, strlen(remuser)+1);
-	(void)write(s, cmd, strlen(cmd)+1);
-	if (read(s, &c, 1) != 1) {
-		(void)fprintf(stderr,
-		    "rcmd: %s: %s\n", *ahost, strerror(errno));
-		goto bad2;
-	}
-	if (c != 0) {
-		while (read(s, &c, 1) == 1) {
-			(void)write(STDERR_FILENO, &c, 1);
-			if (c == '\n')
-				break;
-		}
-		goto bad2;
-	}
-	sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask, NULL);
-	freeaddrinfo(res);
-	return (s);
-bad2:
-	if (lport)
-		(void)close(*fd2p);
-bad:
-	(void)close(s);
-	sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask, NULL);
-	freeaddrinfo(res);
-	return (-1);
-}
-
-int
-rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
-	char **ahost;
-	u_short rport;
-	const char *locuser, *remuser, *cmd;
-	int *fd2p;
-{
-	return rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, AF_INET);
-}
-
-int
-rresvport(port)
-	int *port;
-{
-	return rresvport_af(port, AF_INET);
-}
-
-int
-rresvport_af(alport, family)
-	int *alport, family;
-{
-	int s;
-	struct sockaddr_storage ss;
-	u_short *sport;
-
-	memset(&ss, 0, sizeof(ss));
-	ss.ss_family = family;
-	switch (family) {
-	case AF_INET:
-		sport = &((struct sockaddr_in *)&ss)->sin_port;
-		((struct sockaddr_in *)&ss)->sin_addr.s_addr = INADDR_ANY;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		sport = &((struct sockaddr_in6 *)&ss)->sin6_port;
-		((struct sockaddr_in6 *)&ss)->sin6_addr = in6addr_any;
-		break;
-#endif
-	default:
-		errno = EAFNOSUPPORT;
-		return -1;
-	}
-
-	s = socket(ss.ss_family, SOCK_STREAM, 0);
-	if (s < 0)
-		return (-1);
-#if 0 /* compat_exact_traditional_rresvport_semantics */
-	sin.sin_port = htons((u_short)*alport);
-	if (_bind(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
-		return (s);
-	if (errno != EADDRINUSE) {
-		(void)close(s);
-		return (-1);
-	}
-#endif
-	*sport = 0;
-	if (bindresvport_sa(s, (struct sockaddr *)&ss) == -1) {
-		(void)close(s);
-		return (-1);
-	}
-	*alport = (int)ntohs(*sport);
-	return (s);
-}
-
-int	__check_rhosts_file = 1;
-char	*__rcmd_errstr;
-
-int
-ruserok(rhost, superuser, ruser, luser)
-	const char *rhost, *ruser, *luser;
-	int superuser;
-{
-	struct addrinfo hints, *res, *r;
-	int error;
-
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = PF_UNSPEC;
-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-	error = getaddrinfo(rhost, "0", &hints, &res);
-	if (error)
-		return (-1);
-
-	for (r = res; r; r = r->ai_next) {
-		if (iruserok_sa(r->ai_addr, r->ai_addrlen, superuser, ruser,
-		    luser) == 0) {
-			freeaddrinfo(res);
-			return (0);
-		}
-	}
-	freeaddrinfo(res);
-	return (-1);
-}
-
-/*
- * New .rhosts strategy: We are passed an ip address. We spin through
- * hosts.equiv and .rhosts looking for a match. When the .rhosts only
- * has ip addresses, we don't have to trust a nameserver.  When it
- * contains hostnames, we spin through the list of addresses the nameserver
- * gives us and look for a match.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-iruserok(raddr, superuser, ruser, luser)
-	unsigned long raddr;
-	int superuser;
-	const char *ruser, *luser;
-{
-	struct sockaddr_in sin;
-	int sin_len;
-
-	memset(&sin, 0, sizeof(sin));
-	sin.sin_family = AF_INET;
-	sin_len = sizeof(struct sockaddr_in);
-	memcpy(&sin.sin_addr, &raddr, sizeof(sin.sin_addr));
-	return iruserok_sa((struct sockaddr *)&sin, sin_len, superuser,
-		ruser, luser);
-}
-
-/*
- * AF independent extension of iruserok.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-iruserok_sa(ra, rlen, superuser, ruser, luser)
-	const void *ra;
-	int rlen;
-	int superuser;
-	const char *ruser, *luser;
-{
-	char *cp;
-	struct stat sbuf;
-	struct passwd *pwd;
-	FILE *hostf;
-	uid_t uid;
-	int first;
-	char pbuf[MAXPATHLEN];
-	const struct sockaddr *raddr;
-	struct sockaddr_storage ss;
-
-	/* avoid alignment issue */
-	if (rlen > sizeof(ss)) 
-		return(-1);
-	memcpy(&ss, ra, rlen);
-	raddr = (struct sockaddr *)&ss;
-
-	first = 1;
-	hostf = superuser ? NULL : fopen(_PATH_HEQUIV, "r");
-again:
-	if (hostf) {
-		if (__ivaliduser_sa(hostf, raddr, rlen, luser, ruser) == 0) {
-			(void)fclose(hostf);
-			return (0);
-		}
-		(void)fclose(hostf);
-	}
-	if (first == 1 && (__check_rhosts_file || superuser)) {
-		first = 0;
-		if ((pwd = getpwnam(luser)) == NULL)
-			return (-1);
-		(void)strcpy(pbuf, pwd->pw_dir);
-		(void)strcat(pbuf, "/.rhosts");
-
-		/*
-		 * Change effective uid while opening .rhosts.  If root and
-		 * reading an NFS mounted file system, can't read files that
-		 * are protected read/write owner only.
-		 */
-		uid = geteuid();
-		(void)seteuid(pwd->pw_uid);
-		hostf = fopen(pbuf, "r");
-		(void)seteuid(uid);
-
-		if (hostf == NULL)
-			return (-1);
-		/*
-		 * If not a regular file, or is owned by someone other than
-		 * user or root or if writeable by anyone but the owner, quit.
-		 */
-		cp = NULL;
-		if (lstat(pbuf, &sbuf) < 0)
-			cp = ".rhosts lstat failed";
-		else if (!S_ISREG(sbuf.st_mode))
-			cp = ".rhosts not regular file";
-		else if (fstat(fileno(hostf), &sbuf) < 0)
-			cp = ".rhosts fstat failed";
-		else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
-			cp = "bad .rhosts owner";
-		else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
-			cp = ".rhosts writeable by other than owner";
-		/* If there were any problems, quit. */
-		if (cp) {
-			__rcmd_errstr = cp;
-			(void)fclose(hostf);
-			return (-1);
-		}
-		goto again;
-	}
-	return (-1);
-}
-
-/*
- * XXX
- * Don't make static, used by lpd(8).
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-__ivaliduser(hostf, raddr, luser, ruser)
-	FILE *hostf;
-	u_int32_t raddr;
-	const char *luser, *ruser;
-{
-	struct sockaddr_in sin;
-	int sin_len;
-
-	memset(&sin, 0, sizeof(sin));
-	sin.sin_family = AF_INET;
-	sin_len = sizeof(struct sockaddr_in);
-	memcpy(&sin.sin_addr, &raddr, sizeof(sin.sin_addr));
-	return __ivaliduser_sa(hostf, (struct sockaddr *)&sin, sin_len,
-		luser, ruser);
-}
-
-/*
- * Returns 0 if ok, -1 if not ok.
- *
- * XXX obsolete API.
- */
-int
-__ivaliduser_af(hostf, raddr, luser, ruser, af, len)
-	FILE *hostf;
-	const void *raddr;
-	const char *luser, *ruser;
-	int af, len;
-{
-	struct sockaddr *sa = NULL;
-	struct sockaddr_in *sin = NULL;
-#ifdef INET6
-	struct sockaddr_in6 *sin6 = NULL;
-#endif
-	struct sockaddr_storage ss;
-
-	memset(&ss, 0, sizeof(ss));
-	switch (af) {
-	case AF_INET:
-		if (len != sizeof(sin->sin_addr))
-			return -1;
-		sin = (struct sockaddr_in *)&ss;
-		sin->sin_family = AF_INET;
-		memcpy(&sin->sin_addr, raddr, sizeof(sin->sin_addr));
-		break;
-#ifdef INET6
-	case AF_INET6:
-		if (len != sizeof(sin6->sin6_addr))
-			return -1;
-		/* you will lose scope info */
-		sin6 = (struct sockaddr_in6 *)&ss;
-		sin6->sin6_family = AF_INET6;
-		memcpy(&sin6->sin6_addr, raddr, sizeof(sin6->sin6_addr));
-		break;
-#endif
-	default:
-		return -1;
-	}
-
-	sa = (struct sockaddr *)&ss;
-	return __ivaliduser_sa(hostf, sa, 0, luser, ruser);
-}
-
-int
-__ivaliduser_sa(hostf, raddr, salen, luser, ruser)
-	FILE *hostf;
-	const struct sockaddr *raddr;
-	socklen_t salen;
-	const char *luser, *ruser;
-{
-	char *user, *p;
-	int ch;
-	char buf[MAXHOSTNAMELEN + 128];		/* host + login */
-	char hname[MAXHOSTNAMELEN];
-	/* Presumed guilty until proven innocent. */
-	int userok = 0, hostok = 0;
-#ifdef YP
-	char *ypdomain;
-
-	if (yp_get_default_domain(&ypdomain))
-		ypdomain = NULL;
-#else
-#define	ypdomain NULL
-#endif
-	/* We need to get the damn hostname back for netgroup matching. */
-	if (getnameinfo(raddr, salen, hname, sizeof(hname), NULL, 0,
-			NI_NAMEREQD) != 0)
-		return (-1);
-
-	while (fgets(buf, sizeof(buf), hostf)) {
-		p = buf;
-		/* Skip lines that are too long. */
-		if (strchr(p, '\n') == NULL) {
-			while ((ch = getc(hostf)) != '\n' && ch != EOF);
-			continue;
-		}
-		if (*p == '\n' || *p == '#') {
-			/* comment... */
-			continue;
-		}
-		while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0') {
-			*p = isupper((unsigned char)*p) ? tolower((unsigned char)*p) : *p;
-			p++;
-		}
-		if (*p == ' ' || *p == '\t') {
-			*p++ = '\0';
-			while (*p == ' ' || *p == '\t')
-				p++;
-			user = p;
-			while (*p != '\n' && *p != ' ' &&
-			    *p != '\t' && *p != '\0')
-				p++;
-		} else
-			user = p;
-		*p = '\0';
-		/*
-		 * Do +/- and +@/-@ checking. This looks really nasty,
-		 * but it matches SunOS's behavior so far as I can tell.
-		 */
-		switch(buf[0]) {
-		case '+':
-			if (!buf[1]) {     /* '+' matches all hosts */
-				hostok = 1;
-				break;
-			}
-			if (buf[1] == '@')  /* match a host by netgroup */
-				hostok = innetgr((char *)&buf[2],
-					(char *)&hname, NULL, ypdomain);
-			else		/* match a host by addr */
-				hostok = __icheckhost(raddr, salen,
-						      (char *)&buf[1]);
-			break;
-		case '-':     /* reject '-' hosts and all their users */
-			if (buf[1] == '@') {
-				if (innetgr((char *)&buf[2],
-					      (char *)&hname, NULL, ypdomain))
-					return(-1);
-			} else {
-				if (__icheckhost(raddr, salen,
-						 (char *)&buf[1]))
-					return(-1);
-			}
-			break;
-		default:  /* if no '+' or '-', do a simple match */
-			hostok = __icheckhost(raddr, salen, buf);
-			break;
-		}
-		switch(*user) {
-		case '+':
-			if (!*(user+1)) {      /* '+' matches all users */
-				userok = 1;
-				break;
-			}
-			if (*(user+1) == '@')  /* match a user by netgroup */
-				userok = innetgr(user+2, NULL, ruser, ypdomain);
-			else	   /* match a user by direct specification */
-				userok = !(strcmp(ruser, user+1));
-			break;
-		case '-': 		/* if we matched a hostname, */
-			if (hostok) {   /* check for user field rejections */
-				if (!*(user+1))
-					return(-1);
-				if (*(user+1) == '@') {
-					if (innetgr(user+2, NULL,
-							ruser, ypdomain))
-						return(-1);
-				} else {
-					if (!strcmp(ruser, user+1))
-						return(-1);
-				}
-			}
-			break;
-		default:	/* no rejections: try to match the user */
-			if (hostok)
-				userok = !(strcmp(ruser,*user ? user : luser));
-			break;
-		}
-		if (hostok && userok)
-			return(0);
-	}
-	return (-1);
-}
-
-/*
- * Returns "true" if match, 0 if no match.
- *
- * NI_WITHSCOPEID is useful for comparing sin6_scope_id portion
- * if af == AF_INET6.
- */
-static int
-__icheckhost(raddr, salen, lhost)
-	const struct sockaddr *raddr;
-	socklen_t salen;
-        const char *lhost;
-{
-	struct sockaddr_in sin;
-	struct sockaddr_in6 *sin6;
-	struct addrinfo hints, *res, *r;
-	int error;
-	char h1[NI_MAXHOST], h2[NI_MAXHOST];
-
-	if (raddr->sa_family == AF_INET6) {
-		sin6 = (struct sockaddr_in6 *)raddr;
-		if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
-			memset(&sin, 0, sizeof(sin));
-			sin.sin_family = AF_INET;
-			memcpy(&sin.sin_addr, &sin6->sin6_addr.s6_addr[12],
-			       sizeof(sin.sin_addr));
-			raddr = (struct sockaddr *)&sin;
-			salen = sizeof(struct sockaddr_in);
-		}
-	}
-
-	h1[0] = '\0';
-	if (getnameinfo(raddr, salen, h1, sizeof(h1), NULL, 0,
-			NI_NUMERICHOST | NI_WITHSCOPEID) != 0)
-		return (0);
-
-	/* Resolve laddr into sockaddr */
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = raddr->sa_family;
-	hints.ai_socktype = SOCK_DGRAM;	/*XXX dummy*/
-	res = NULL;
-	error = getaddrinfo(lhost, "0", &hints, &res);
-	if (error)
-		return (0);
-
-	for (r = res; r ; r = r->ai_next) {
-		h2[0] = '\0';
-		if (getnameinfo(r->ai_addr, r->ai_addrlen, h2, sizeof(h2),
-				NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID) != 0)
-			continue;
-		if (strcmp(h1, h2) == 0) {
-			freeaddrinfo(res);
-			return (1);
-		}
-	}
-
-	/* No match. */
-	freeaddrinfo(res);
-	return (0);
-}
diff --git a/newlib/libc/sys/linux/net/rcmdsh.3 b/newlib/libc/sys/linux/net/rcmdsh.3
deleted file mode 100644
index 43e6a8d..0000000
--- a/newlib/libc/sys/linux/net/rcmdsh.3
+++ /dev/null
@@ -1,116 +0,0 @@
-.\"	$OpenBSD: rcmdsh.3,v 1.6 1999/07/05 04:41:00 aaron Exp $
-.\"
-.\" Copyright (c) 1983, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/lib/libc/net/rcmdsh.3,v 1.2 2001/11/09 15:19:25 ru Exp $
-.\"
-.Dd September 1, 1996
-.Dt RCMDSH 3
-.Os
-.Sh NAME
-.Nm rcmdsh
-.Nd return a stream to a remote command without superuser
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fo rcmdsh
-.Fa "char **ahost"
-.Fa "int inport"
-.Fa "const char *locuser"
-.Fa "const char *remuser"
-.Fa "const char *cmd"
-.Fa "const char *rshprog"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn rcmdsh
-function
-is used by normal users to execute a command on
-a remote machine using an authentication scheme based
-on reserved port numbers using
-.Xr rshd 8
-or the value of
-.Fa rshprog
-(if
-.No non- Ns Dv NULL ) .
-.Pp
-The
-.Fn rcmdsh
-function
-looks up the host
-.Fa *ahost
-using
-.Xr gethostbyname 3 ,
-returning \-1 if the host does not exist.
-Otherwise
-.Fa *ahost
-is set to the standard name of the host
-and a connection is established to a server
-residing at the well-known Internet port
-.Dq Li shell/tcp
-(or whatever port is used by
-.Fa rshprog ) .
-The parameter
-.Fa inport
-is ignored; it is only included to provide an interface similar to
-.Xr rcmd 3 .
-.Pp
-If the connection succeeds,
-a socket in the
-.Ux
-domain of type
-.Dv SOCK_STREAM
-is returned to the caller, and given to the remote
-command as stdin, stdout, and stderr.
-.Sh RETURN VALUES
-The
-.Fn rcmdsh
-function
-returns a valid socket descriptor on success.
-Otherwise, \-1 is returned
-and a diagnostic message is printed on the standard error.
-.Sh SEE ALSO
-.Xr rsh 1 ,
-.Xr socketpair 2 ,
-.Xr rcmd 3 ,
-.Xr rshd 8
-.Sh BUGS
-If
-.Xr rsh 1
-encounters an error, a file descriptor is still returned instead of \-1.
-.Sh HISTORY
-The
-.Fn rcmdsh
-function first appeared in
-.Ox 2.0 ,
-and made its way into
-.Fx 5.0 .
diff --git a/newlib/libc/sys/linux/net/rcmdsh.c b/newlib/libc/sys/linux/net/rcmdsh.c
deleted file mode 100644
index 741814c..0000000
--- a/newlib/libc/sys/linux/net/rcmdsh.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*	$OpenBSD: rcmdsh.c,v 1.5 1998/04/25 16:23:58 millert Exp $	*/
-
-/*
- * Copyright (c) 2001, MagniComp
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in 
- *    the documentation and/or other materials provided with the distribution. 
- * 3. Neither the name of the MagniComp nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * This is an rcmd() replacement originally by
- * Chris Siebenmann <cks@utcc.utoronto.ca>.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-
-#include <errno.h>
-#include <netdb.h>
-#include <paths.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifndef _PATH_RSH
-#define	_PATH_RSH	"/usr/bin/rsh"
-#endif
-
-/*
- * This is a replacement rcmd() function that uses the rsh(1)
- * program in place of a direct rcmd(3) function call so as to
- * avoid having to be root.  Note that rport is ignored.
- */
-int
-rcmdsh(ahost, rport, locuser, remuser, cmd, rshprog)
-	char **ahost;
-	int rport;
-	const char *locuser, *remuser, *cmd, *rshprog;
-{
-	struct addrinfo hints, *res;
-	int cpid, sp[2], error;
-	char *p;
-	struct passwd *pw;
-	char num[8];
-	static char hbuf[NI_MAXHOST];
-
-	/* What rsh/shell to use. */
-	if (rshprog == NULL)
-		rshprog = _PATH_RSH;
-
-	/* locuser must exist on this host. */
-	if ((pw = getpwnam(locuser)) == NULL) {
-		(void)fprintf(stderr, "rcmdsh: unknown user: %s\n", locuser);
-		return (-1);
-	}
-
-	/* Validate remote hostname. */
-	if (strcmp(*ahost, "localhost") != 0) {
-		memset(&hints, 0, sizeof(hints));
-		hints.ai_flags = AI_CANONNAME;
-		hints.ai_family = PF_UNSPEC;
-		hints.ai_socktype = SOCK_STREAM;
-		(void)snprintf(num, sizeof(num), "%d", ntohs(rport));
-		error = getaddrinfo(*ahost, num, &hints, &res);
-		if (error) {
-			fprintf(stderr, "rcmdsh: getaddrinfo: %s\n",
-				gai_strerror(error));
-			return (-1);
-		}
-		if (res->ai_canonname) {
-			strncpy(hbuf, res->ai_canonname, sizeof(hbuf) - 1);
-			hbuf[sizeof(hbuf) - 1] = '\0';
-			*ahost = hbuf;
-		}
-		freeaddrinfo(res);
-	}
-
-	/* Get a socketpair we'll use for stdin and stdout. */
-	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) == -1) {
-		perror("rcmdsh: socketpair");
-		return (-1);
-	}
-
-	cpid = fork();
-	if (cpid == -1) {
-		perror("rcmdsh: fork failed");
-		return (-1);
-	} else if (cpid == 0) {
-		/*
-		 * Child.  We use sp[1] to be stdin/stdout, and close sp[0].
-		 */
-		(void)close(sp[0]);
-		if (dup2(sp[1], 0) == -1 || dup2(0, 1) == -1) {
-			perror("rcmdsh: dup2 failed");
-			_exit(255);
-		}
-		/* Fork again to lose parent. */
-		cpid = fork();
-		if (cpid == -1) {
-			perror("rcmdsh: fork to lose parent failed");
-			_exit(255);
-		}
-		if (cpid > 0)
-			_exit(0);
-
-		/* In grandchild here.  Become local user for rshprog. */
-		if (setuid(pw->pw_uid) == -1) {
-			(void)fprintf(stderr, "rcmdsh: setuid(%u): %s\n",
-			    pw->pw_uid, strerror(errno));
-			_exit(255);
-		}
-
-		/*
-		 * If remote host is "localhost" and local and remote users
-		 * are the same, avoid running remote shell for efficiency.
-		 */
-		if (strcmp(*ahost, "localhost") == 0 &&
-		    strcmp(locuser, remuser) == 0) {
-			if (pw->pw_shell[0] == '\0')
-				rshprog = _PATH_BSHELL;
-			else
-				rshprog = pw->pw_shell;
-			p = strrchr(rshprog, '/');
-			execlp(rshprog, p ? p + 1 : rshprog, "-c", cmd,
-			    (char *)NULL);
-		} else {
-			p = strrchr(rshprog, '/');
-			execlp(rshprog, p ? p + 1 : rshprog, *ahost, "-l",
-			    remuser, cmd, (char *)NULL);
-		}
-		(void)fprintf(stderr, "rcmdsh: execlp %s failed: %s\n",
-		    rshprog, strerror(errno));
-		_exit(255);
-	} else {
-		/* Parent. close sp[1], return sp[0]. */
-		(void)close(sp[1]);
-		/* Reap child. */
-		(void)wait(NULL);
-		return (sp[0]);
-	}
-	/* NOTREACHED */
-}
diff --git a/newlib/libc/sys/linux/net/recv.c b/newlib/libc/sys/linux/net/recv.c
deleted file mode 100644
index 43e537b..0000000
--- a/newlib/libc/sys/linux/net/recv.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)recv.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-#include "un-namespace.h"
-
-ssize_t
-recv(s, buf, len, flags)
-	int s, flags;
-	size_t len;
-	void *buf;
-{
-	return (recvfrom(s, buf, len, flags, NULL, 0));
-}
diff --git a/newlib/libc/sys/linux/net/res_comp.c b/newlib/libc/sys/linux/net/res_comp.c
deleted file mode 100644
index 12ea02c..0000000
--- a/newlib/libc/sys/linux/net/res_comp.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (c) 1985, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: res_comp.c,v 8.11 1997/05/21 19:31:04 halley Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#define BIND_4_COMPAT
-
-/*
- * Expand compressed domain name 'comp_dn' to full domain name.
- * 'msg' is a pointer to the begining of the message,
- * 'eomorig' points to the first location after the message,
- * 'exp_dn' is a pointer to a buffer of size 'length' for the result.
- * Return size of compressed name or -1 if there was an error.
- */
-int
-dn_expand(const u_char *msg, const u_char *eom, const u_char *src,
-	  char *dst, int dstsiz)
-{
-	int n = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz);
-
-	if (n > 0 && dst[0] == '.')
-		dst[0] = '\0';
-	return (n);
-}
-
-/*
- * Pack domain name 'exp_dn' in presentation form into 'comp_dn'.
- * Return the size of the compressed name or -1.
- * 'length' is the size of the array pointed to by 'comp_dn'.
- */
-int
-dn_comp(const char *src, u_char *dst, int dstsiz,
-	u_char **dnptrs, u_char **lastdnptr)
-{
-	return (ns_name_compress(src, dst, (size_t)dstsiz,
-				 (const u_char **)dnptrs,
-				 (const u_char **)lastdnptr));
-}
-
-/*
- * Skip over a compressed domain name. Return the size or -1.
- */
-int
-dn_skipname(const u_char *ptr, const u_char *eom) {
-	const u_char *saveptr = ptr;
-
-	if (ns_name_skip(&ptr, eom) == -1)
-		return (-1);
-	return (ptr - saveptr);
-}
-
-/*
- * Verify that a domain name uses an acceptable character set.
- */
-
-/*
- * Note the conspicuous absence of ctype macros in these definitions.  On
- * non-ASCII hosts, we can't depend on string literals or ctype macros to
- * tell us anything about network-format data.  The rest of the BIND system
- * is not careful about this, but for some reason, we're doing it right here.
- */
-#define PERIOD 0x2e
-#define	hyphenchar(c) ((c) == 0x2d)
-#define bslashchar(c) ((c) == 0x5c)
-#define periodchar(c) ((c) == PERIOD)
-#define asterchar(c) ((c) == 0x2a)
-#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \
-		   || ((c) >= 0x61 && (c) <= 0x7a))
-#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
-
-#define borderchar(c) (alphachar(c) || digitchar(c))
-#define middlechar(c) (borderchar(c) || hyphenchar(c))
-#define	domainchar(c) ((c) > 0x20 && (c) < 0x7f)
-
-int
-res_hnok(dn)
-	const char *dn;
-{
-	int ppch = '\0', pch = PERIOD, ch = *dn++;
-
-	while (ch != '\0') {
-		int nch = *dn++;
-
-		if (periodchar(ch)) {
-			(void)NULL;
-		} else if (periodchar(pch)) {
-			if (!borderchar(ch))
-				return (0);
-		} else if (periodchar(nch) || nch == '\0') {
-			if (!borderchar(ch))
-				return (0);
-		} else {
-			if (!middlechar(ch))
-				return (0);
-		}
-		ppch = pch, pch = ch, ch = nch;
-	}
-	return (1);
-}
-
-/*
- * hostname-like (A, MX, WKS) owners can have "*" as their first label
- * but must otherwise be as a host name.
- */
-int
-res_ownok(dn)
-	const char *dn;
-{
-	if (asterchar(dn[0])) {
-		if (periodchar(dn[1]))
-			return (res_hnok(dn+2));
-		if (dn[1] == '\0')
-			return (1);
-	}
-	return (res_hnok(dn));
-}
-
-/*
- * SOA RNAMEs and RP RNAMEs can have any printable character in their first
- * label, but the rest of the name has to look like a host name.
- */
-int
-res_mailok(dn)
-	const char *dn;
-{
-	int ch, escaped = 0;
-
-	/* "." is a valid missing representation */
-	if (*dn == '\0')
-		return (1);
-
-	/* otherwise <label>.<hostname> */
-	while ((ch = *dn++) != '\0') {
-		if (!domainchar(ch))
-			return (0);
-		if (!escaped && periodchar(ch))
-			break;
-		if (escaped)
-			escaped = 0;
-		else if (bslashchar(ch))
-			escaped = 1;
-	}
-	if (periodchar(ch))
-		return (res_hnok(dn));
-	return (0);
-}
-
-/*
- * This function is quite liberal, since RFC 1034's character sets are only
- * recommendations.
- */
-int
-res_dnok(dn)
-	const char *dn;
-{
-	int ch;
-
-	while ((ch = *dn++) != '\0')
-		if (!domainchar(ch))
-			return (0);
-	return (1);
-}
-
-#ifdef BIND_4_COMPAT
-/*
- * This module must export the following externally-visible symbols:
- *    ___putlong
- *    ___putshort
- *    __getlong
- *    __getshort
- * Note that one _ comes from C and the others come from us.
- */
-void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); }
-void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }
-u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); }
-u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); }
-#endif /*BIND_4_COMPAT*/
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <resolv.h>.
- */
-#undef dn_comp
-__weak_reference(__dn_comp, dn_comp);
-#undef dn_expand
-__weak_reference(__dn_expand, dn_expand);
diff --git a/newlib/libc/sys/linux/net/res_config.h b/newlib/libc/sys/linux/net/res_config.h
deleted file mode 100644
index b7deb38..0000000
--- a/newlib/libc/sys/linux/net/res_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $FreeBSD: src/lib/libc/net/res_config.h,v 1.8 2002/03/22 23:41:54 obrien Exp $ */
-
-#define	DEBUG	1	/* enable debugging code (needed for dig) */
-#define	RESOLVSORT	/* allow sorting of addresses in gethostbyname */
-#define	RFC1535		/* comply with RFC1535 (STRONGLY reccomended by vixie)*/
-#undef	USELOOPBACK	/* res_init() bind to localhost */
-#undef	SUNSECURITY	/* verify gethostbyaddr() calls - WE DONT NEED IT  */
-#define MULTI_PTRS_ARE_ALIASES 1 /* fold multiple PTR records into aliases */
-#define	CHECK_SRVR_ADDR 1 /* confirm that the server requested sent the reply */
-#define BIND_UPDATE 1	/* update support */
diff --git a/newlib/libc/sys/linux/net/res_data.c b/newlib/libc/sys/linux/net/res_data.c
deleted file mode 100644
index 7db5480..0000000
--- a/newlib/libc/sys/linux/net/res_data.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 1995,1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "res_config.h"
-
-const char *_res_opcodes[] = {
-	"QUERY",
-	"IQUERY",
-	"CQUERYM",
-	"CQUERYU",	/* experimental */
-	"NOTIFY",	/* experimental */
-	"UPDATE",
-	"6",
-	"7",
-	"8",
-	"9",
-	"10",
-	"11",
-	"12",
-	"13",
-	"ZONEINIT",
-	"ZONEREF",
-};
-
-const char *_res_resultcodes[] = {
-	"NOERROR",
-	"FORMERR",
-	"SERVFAIL",
-	"NXDOMAIN",
-	"NOTIMP",
-	"REFUSED",
-	"YXDOMAIN",
-	"YXRRSET",
-	"NXRRSET",
-	"NOTAUTH",
-	"ZONEERR",
-	"11",
-	"12",
-	"13",
-	"14",
-	"NOCHANGE",
-};
-
-#ifdef BIND_UPDATE
-const char *_res_sectioncodes[] = {
-	"ZONE",
-	"PREREQUISITES",
-	"UPDATE",
-	"ADDITIONAL",
-};
-#endif
diff --git a/newlib/libc/sys/linux/net/res_debug.c b/newlib/libc/sys/linux/net/res_debug.c
deleted file mode 100644
index 786f633..0000000
--- a/newlib/libc/sys/linux/net/res_debug.c
+++ /dev/null
@@ -1,1003 +0,0 @@
-/*
- * Copyright (c) 1985
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <math.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#define SPRINTF(x) sprintf x
-
-extern const char *_res_opcodes[];
-extern const char *_res_resultcodes[];
-extern const char *_res_sectioncodes[];
-
-/*
- * Print the current options.
- */
-void
-fp_resstat(struct __res_state *statp, FILE *file) {
-	u_long mask;
-
-	fprintf(file, ";; res options:");
-	if (!statp)
-		statp = &_res;
-	for (mask = 1;  mask != 0;  mask <<= 1)
-		if (statp->options & mask)
-			fprintf(file, " %s", p_option(mask));
-	putc('\n', file);
-}
-
-static void
-do_section(ns_msg *handle, ns_sect section, int pflag, FILE *file) {
-	int n, sflag, rrnum;
-	char buf[2048];	/* XXX need to malloc */
-	ns_opcode opcode;
-	ns_rr rr;
-
-	/*
-	 * Print answer records.
-	 */
-	sflag = (_res.pfcode & pflag);
-	if (_res.pfcode && !sflag)
-		return;
-
-	opcode = ns_msg_getflag(*handle, ns_f_opcode);
-	rrnum = 0;
-	for (;;) {
-		if (ns_parserr(handle, section, rrnum, &rr)) {
-			if (errno != ENODEV)
-				fprintf(file, ";; ns_parserr: %s\n",
-					strerror(errno));
-			else if (rrnum > 0 && sflag != 0 &&
-				 (_res.pfcode & RES_PRF_HEAD1))
-				putc('\n', file);
-			return;
-		}
-		if (rrnum == 0 && sflag != 0 && (_res.pfcode & RES_PRF_HEAD1))
-			fprintf(file, ";; %s SECTION:\n",
-				p_section(section, opcode));
-		if (section == ns_s_qd)
-			fprintf(file, ";;\t%s, type = %s, class = %s\n",
-				ns_rr_name(rr),
-				p_type(ns_rr_type(rr)),
-				p_class(ns_rr_class(rr)));
-		else {
-			n = ns_sprintrr(handle, &rr, NULL, NULL,
-					buf, sizeof buf);
-			if (n < 0) {
-				fprintf(file, ";; ns_sprintrr: %s\n",
-					strerror(errno));
-				return;
-			}
-			fputs(buf, file);
-			fputc('\n', file);
-		}
-		rrnum++;
-	}
-}
-
-void
-p_query(const u_char *msg) {
-	fp_query(msg, stdout);
-}
-
-void
-fp_query(const u_char *msg, FILE *file) {
-	fp_nquery(msg, PACKETSZ, file);
-}
-
-/*
- * Print the contents of a query.
- * This is intended to be primarily a debugging routine.
- */
-void
-fp_nquery(const u_char *msg, int len, FILE *file) {
-	ns_msg handle;
-	int qdcount, ancount, nscount, arcount;
-	u_int opcode, rcode, id;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
-		return;
-
-	if (ns_initparse(msg, len, &handle) < 0) {
-		fprintf(file, ";; ns_initparse: %s\n", strerror(errno));
-		return;
-	}
-	opcode = ns_msg_getflag(handle, ns_f_opcode);
-	rcode = ns_msg_getflag(handle, ns_f_rcode);
-	id = ns_msg_id(handle);
-	qdcount = ns_msg_count(handle, ns_s_qd);
-	ancount = ns_msg_count(handle, ns_s_an);
-	nscount = ns_msg_count(handle, ns_s_ns);
-	arcount = ns_msg_count(handle, ns_s_ar);
-
-	/*
-	 * Print header fields.
-	 */
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEADX) || rcode)
-		fprintf(file,
-			";; ->>HEADER<<- opcode: %s, status: %s, id: %d\n",
-			_res_opcodes[opcode], _res_resultcodes[rcode], id);
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEADX))
-		putc(';', file);
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEAD2)) {
-		fprintf(file, "; flags:");
-		if (ns_msg_getflag(handle, ns_f_qr))
-			fprintf(file, " qr");
-		if (ns_msg_getflag(handle, ns_f_aa))
-			fprintf(file, " aa");
-		if (ns_msg_getflag(handle, ns_f_tc))
-			fprintf(file, " tc");
-		if (ns_msg_getflag(handle, ns_f_rd))
-			fprintf(file, " rd");
-		if (ns_msg_getflag(handle, ns_f_ra))
-			fprintf(file, " ra");
-		if (ns_msg_getflag(handle, ns_f_z))
-			fprintf(file, " ??");
-		if (ns_msg_getflag(handle, ns_f_ad))
-			fprintf(file, " ad");
-		if (ns_msg_getflag(handle, ns_f_cd))
-			fprintf(file, " cd");
-	}
-	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_HEAD1)) {
-		fprintf(file, "; %s: %d",
-			p_section(ns_s_qd, opcode), qdcount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_an, opcode), ancount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ns, opcode), nscount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ar, opcode), arcount);
-	}
-	if ((!_res.pfcode) || (_res.pfcode & 
-		(RES_PRF_HEADX | RES_PRF_HEAD2 | RES_PRF_HEAD1))) {
-		putc('\n',file);
-	}
-	/*
-	 * Print the various sections.
-	 */
-	do_section(&handle, ns_s_qd, RES_PRF_QUES, file);
-	do_section(&handle, ns_s_an, RES_PRF_ANS, file);
-	do_section(&handle, ns_s_ns, RES_PRF_AUTH, file);
-	do_section(&handle, ns_s_ar, RES_PRF_ADD, file);
-	if (qdcount == 0 && ancount == 0 &&
-	    nscount == 0 && arcount == 0)
-		putc('\n', file);
-}
-
-const u_char *
-p_cdnname(const u_char *cp, const u_char *msg, int len, FILE *file) {
-	char name[MAXDNAME];
-	int n;
-
-	if ((n = dn_expand(msg, msg + len, cp, name, sizeof name)) < 0)
-		return (NULL);
-	if (name[0] == '\0')
-		putc('.', file);
-	else
-		fputs(name, file);
-	return (cp + n);
-}
-
-const u_char *
-p_cdname(const u_char *cp, const u_char *msg, FILE *file) {
-	return (p_cdnname(cp, msg, PACKETSZ, file));
-}
-
-/* Return a fully-qualified domain name from a compressed name (with
-   length supplied).  */
-
-const u_char *
-p_fqnname(cp, msg, msglen, name, namelen)
-	const u_char *cp, *msg;
-	int msglen;
-	char *name;
-	int namelen;
-{
-	int n, newlen;
-
-	if ((n = dn_expand(msg, cp + msglen, cp, name, namelen)) < 0)
-		return (NULL);
-	newlen = strlen(name);
-	if (newlen == 0 || name[newlen - 1] != '.') {
-		if (newlen + 1 >= namelen)	/* Lack space for final dot */
-			return (NULL);
-		else
-			strcpy(name + newlen, ".");
-	}
-	return (cp + n);
-}
-
-/* XXX:	the rest of these functions need to become length-limited, too. */
-
-const u_char *
-p_fqname(const u_char *cp, const u_char *msg, FILE *file) {
-	char name[MAXDNAME];
-	const u_char *n;
-
-	n = p_fqnname(cp, msg, MAXCDNAME, name, sizeof name);
-	if (n == NULL)
-		return (NULL);
-	fputs(name, file);
-	return (n);
-}
-
-/*
- * Names of RR classes and qclasses.  Classes and qclasses are the same, except
- * that C_ANY is a qclass but not a class.  (You can ask for records of class
- * C_ANY, but you can't have any records of that class in the database.)
- */
-const struct res_sym __p_class_syms[] = {
-	{C_IN,		"IN"},
-	{C_CHAOS,	"CHAOS"},
-	{C_HS,		"HS"},
-	{C_HS,		"HESIOD"},
-	{C_ANY,		"ANY"},
-	{C_NONE,	"NONE"},
-	{C_IN, 		(char *)0}
-};
-
-/*
- * Names of message sections.
- */
-const struct res_sym __p_default_section_syms[] = {
-	{ns_s_qd,	"QUERY"},
-	{ns_s_an,	"ANSWER"},
-	{ns_s_ns,	"AUTHORITY"},
-	{ns_s_ar,	"ADDITIONAL"},
-	{0,             (char *)0}
-};
-
-const struct res_sym __p_update_section_syms[] = {
-	{S_ZONE,	"ZONE"},
-	{S_PREREQ,	"PREREQUISITE"},
-	{S_UPDATE,	"UPDATE"},
-	{S_ADDT,	"ADDITIONAL"},
-	{0,             (char *)0}
-};
-
-/*
- * Names of RR types and qtypes.  Types and qtypes are the same, except
- * that T_ANY is a qtype but not a type.  (You can ask for records of type
- * T_ANY, but you can't have any records of that type in the database.)
- */
-const struct res_sym __p_type_syms[] = {
-	{T_A,		"A",		"address"},
-	{T_NS,		"NS",		"name server"},
-	{T_MD,		"MD",		"mail destination (deprecated)"},
-	{T_MF,		"MF",		"mail forwarder (deprecated)"},
-	{T_CNAME,	"CNAME",	"canonical name"},
-	{T_SOA,		"SOA",		"start of authority"},
-	{T_MB,		"MB",		"mailbox"},
-	{T_MG,		"MG",		"mail group member"},
-	{T_MR,		"MR",		"mail rename"},
-	{T_NULL,	"NULL",		"null"},
-	{T_WKS,		"WKS",		"well-known service (deprecated)"},
-	{T_PTR,		"PTR",		"domain name pointer"},
-	{T_HINFO,	"HINFO",	"host information"},
-	{T_MINFO,	"MINFO",	"mailbox information"},
-	{T_MX,		"MX",		"mail exchanger"},
-	{T_TXT,		"TXT",		"text"},
-	{T_RP,		"RP",		"responsible person"},
-	{T_AFSDB,	"AFSDB",	"DCE or AFS server"},
-	{T_X25,		"X25",		"X25 address"},
-	{T_ISDN,	"ISDN",		"ISDN address"},
-	{T_RT,		"RT",		"router"},
-	{T_NSAP,	"NSAP",		"nsap address"},
-	{T_NSAP_PTR,	"NSAP_PTR",	"domain name pointer"},
-	{T_SIG,		"SIG",		"signature"},
-	{T_KEY,		"KEY",		"key"},
-	{T_PX,		"PX",		"mapping information"},
-	{T_GPOS,	"GPOS",		"geographical position (withdrawn)"},
-	{T_AAAA,	"AAAA",		"IPv6 address"},
-	{T_LOC,		"LOC",		"location"},
-	{T_NXT,		"NXT",		"next valid name (unimplemented)"},
-	{T_EID,		"EID",		"endpoint identifier (unimplemented)"},
-	{T_NIMLOC,	"NIMLOC",	"NIMROD locator (unimplemented)"},
-	{T_SRV,		"SRV",		"server selection"},
-	{T_ATMA,	"ATMA",		"ATM address (unimplemented)"},
-	{T_IXFR,	"IXFR",		"incremental zone transfer"},
-	{T_AXFR,	"AXFR",		"zone transfer"},
-	{T_MAILB,	"MAILB",	"mailbox-related data (deprecated)"},
-	{T_MAILA,	"MAILA",	"mail agent (deprecated)"},
-	{T_NAPTR,	"NAPTR",	"URN Naming Authority"},
-	{T_ANY,		"ANY",		"\"any\""},
-	{0, 		NULL,		NULL}
-};
-
-int
-sym_ston(const struct res_sym *syms, const char *name, int *success) {
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (strcasecmp (name, syms->name) == 0) {
-			if (success)
-				*success = 1;
-			return (syms->number);
-		}
-	}
-	if (success)
-		*success = 0;
-	return (syms->number);		/* The default value. */
-}
-
-const char *
-sym_ntos(const struct res_sym *syms, int number, int *success) {
-	static char unname[20];
-
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->name);
-		}
-	}
-
-	sprintf(unname, "%d", number);
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-const char *
-sym_ntop(const struct res_sym *syms, int number, int *success) {
-	static char unname[20];
-
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->humanname);
-		}
-	}
-	sprintf(unname, "%d", number);
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-/*
- * Return a string for the type.
- */
-const char *
-p_type(int type) {
-	return (sym_ntos(__p_type_syms, type, (int *)0));
-}
-
-/*
- * Return a string for the type.
- */
-const char *
-p_section(int section, int opcode) {
-	const struct res_sym *symbols;
-
-	switch (opcode) {
-	case ns_o_update:
-		symbols = __p_update_section_syms;
-		break;
-	default:
-		symbols = __p_default_section_syms;
-		break;
-	}
-	return (sym_ntos(symbols, section, (int *)0));
-}
-
-/*
- * Return a mnemonic for class.
- */
-const char *
-p_class(int class) {
-	return (sym_ntos(__p_class_syms, class, (int *)0));
-}
-
-/*
- * Return a mnemonic for an option
- */
-const char *
-p_option(u_long option) {
-	static char nbuf[40];
-
-	switch (option) {
-	case RES_INIT:		return "init";
-	case RES_DEBUG:		return "debug";
-	case RES_AAONLY:	return "aaonly(unimpl)";
-	case RES_USEVC:		return "usevc";
-	case RES_PRIMARY:	return "primry(unimpl)";
-	case RES_IGNTC:		return "igntc";
-	case RES_RECURSE:	return "recurs";
-	case RES_DEFNAMES:	return "defnam";
-	case RES_STAYOPEN:	return "styopn";
-	case RES_DNSRCH:	return "dnsrch";
-	case RES_INSECURE1:	return "insecure1";
-	case RES_INSECURE2:	return "insecure2";
-	case RES_NOALIASES:	return "noaliases";
-	case RES_USE_INET6:	return "inet6";
-	case RES_NOTLDQUERY:	return "no-tld-query";
-	case RES_USE_EDNS0:	return "edns0";
-	default:		sprintf(nbuf, "?0x%lx?", (u_long)option);
-				return (nbuf);
-	}
-}
-
-/*
- * Return a mnemonic for a time to live.
- */
-const char *
-p_time(u_int32_t value) {
-	static char nbuf[40];
-
-	if (ns_format_ttl(value, nbuf, sizeof nbuf) < 0)
-		sprintf(nbuf, "%u", value);
-	return (nbuf);
-}
-
-
-/*
- * routines to convert between on-the-wire RR format and zone file format.
- * Does not contain conversion to/from decimal degrees; divide or multiply
- * by 60*60*1000 for that.
- */
-
-static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
-				      1000000,10000000,100000000,1000000000};
-
-/* takes an XeY precision/size value, returns a string representation. */
-static const char *
-precsize_ntoa(prec)
-	u_int8_t prec;
-{
-	static char retbuf[sizeof "90000000.00"];
-	unsigned long val;
-	int mantissa, exponent;
-
-	mantissa = (int)((prec >> 4) & 0x0f) % 10;
-	exponent = (int)((prec >> 0) & 0x0f) % 10;
-
-	val = mantissa * poweroften[exponent];
-
-	(void) sprintf(retbuf, "%ld.%.2ld", val/100, val%100);
-	return (retbuf);
-}
-
-/* converts ascii size/precision X * 10**Y(cm) to 0xXY.  moves pointer. */
-static u_int8_t
-precsize_aton(strptr)
-	char **strptr;
-{
-	unsigned int mval = 0, cmval = 0;
-	u_int8_t retval = 0;
-	char *cp;
-	int exponent;
-	int mantissa;
-
-	cp = *strptr;
-
-	while (isdigit((unsigned char)*cp))
-		mval = mval * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/* centimeters */
-		cp++;
-		if (isdigit((unsigned char)*cp)) {
-			cmval = (*cp++ - '0') * 10;
-			if (isdigit((unsigned char)*cp)) {
-				cmval += (*cp++ - '0');
-			}
-		}
-	}
-	cmval = (mval * 100) + cmval;
-
-	for (exponent = 0; exponent < 9; exponent++)
-		if (cmval < poweroften[exponent+1])
-			break;
-
-	mantissa = cmval / poweroften[exponent];
-	if (mantissa > 9)
-		mantissa = 9;
-
-	retval = (mantissa << 4) | exponent;
-
-	*strptr = cp;
-
-	return (retval);
-}
-
-/* converts ascii lat/lon to unsigned encoded 32-bit number.  moves pointer. */
-static u_int32_t
-latlon2ul(latlonstrptr,which)
-	char **latlonstrptr;
-	int *which;
-{
-	char *cp;
-	u_int32_t retval;
-	int deg = 0, min = 0, secs = 0, secsfrac = 0;
-
-	cp = *latlonstrptr;
-
-	while (isdigit((unsigned char)*cp))
-		deg = deg * 10 + (*cp++ - '0');
-
-	while (isspace((unsigned char)*cp))
-		cp++;
-
-	if (!(isdigit((unsigned char)*cp)))
-		goto fndhemi;
-
-	while (isdigit((unsigned char)*cp))
-		min = min * 10 + (*cp++ - '0');
-
-	while (isspace((unsigned char)*cp))
-		cp++;
-
-	if (!(isdigit((unsigned char)*cp)))
-		goto fndhemi;
-
-	while (isdigit((unsigned char)*cp))
-		secs = secs * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/* decimal seconds */
-		cp++;
-		if (isdigit((unsigned char)*cp)) {
-			secsfrac = (*cp++ - '0') * 100;
-			if (isdigit((unsigned char)*cp)) {
-				secsfrac += (*cp++ - '0') * 10;
-				if (isdigit((unsigned char)*cp)) {
-					secsfrac += (*cp++ - '0');
-				}
-			}
-		}
-	}
-
-	while (!isspace((unsigned char)*cp))   /* if any trailing garbage */
-		cp++;
-
-	while (isspace((unsigned char)*cp))
-		cp++;
-
- fndhemi:
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'E': case 'e':
-		retval = ((unsigned)1<<31)
-			+ (((((deg * 60) + min) * 60) + secs) * 1000)
-			+ secsfrac;
-		break;
-	case 'S': case 's':
-	case 'W': case 'w':
-		retval = ((unsigned)1<<31)
-			- (((((deg * 60) + min) * 60) + secs) * 1000)
-			- secsfrac;
-		break;
-	default:
-		retval = 0;	/* invalid value -- indicates error */
-		break;
-	}
-
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'S': case 's':
-		*which = 1;	/* latitude */
-		break;
-	case 'E': case 'e':
-	case 'W': case 'w':
-		*which = 2;	/* longitude */
-		break;
-	default:
-		*which = 0;	/* error */
-		break;
-	}
-
-	cp++;			/* skip the hemisphere */
-
-	while (!isspace((unsigned char)*cp))   /* if any trailing garbage */
-		cp++;
-
-	while (isspace((unsigned char)*cp))    /* move to next field */
-		cp++;
-
-	*latlonstrptr = cp;
-
-	return (retval);
-}
-
-/* converts a zone file representation in a string to an RDATA on-the-wire
- * representation. */
-int
-loc_aton(ascii, binary)
-	const char *ascii;
-	u_char *binary;
-{
-	const char *cp, *maxcp;
-	u_char *bcp;
-
-	u_int32_t latit = 0, longit = 0, alt = 0;
-	u_int32_t lltemp1 = 0, lltemp2 = 0;
-	int altmeters = 0, altfrac = 0, altsign = 1;
-	u_int8_t hp = 0x16;	/* default = 1e6 cm = 10000.00m = 10km */
-	u_int8_t vp = 0x13;	/* default = 1e3 cm = 10.00m */
-	u_int8_t siz = 0x12;	/* default = 1e2 cm = 1.00m */
-	int which1 = 0, which2 = 0;
-
-	cp = ascii;
-	maxcp = cp + strlen(ascii);
-
-	lltemp1 = latlon2ul(&cp, &which1);
-
-	lltemp2 = latlon2ul(&cp, &which2);
-
-	switch (which1 + which2) {
-	case 3:			/* 1 + 2, the only valid combination */
-		if ((which1 == 1) && (which2 == 2)) { /* normal case */
-			latit = lltemp1;
-			longit = lltemp2;
-		} else if ((which1 == 2) && (which2 == 1)) { /* reversed */
-			longit = lltemp1;
-			latit = lltemp2;
-		} else {	/* some kind of brokenness */
-			return (0);
-		}
-		break;
-	default:		/* we didn't get one of each */
-		return (0);
-	}
-
-	/* altitude */
-	if (*cp == '-') {
-		altsign = -1;
-		cp++;
-	}
-    
-	if (*cp == '+')
-		cp++;
-
-	while (isdigit((unsigned char)*cp))
-		altmeters = altmeters * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/* decimal meters */
-		cp++;
-		if (isdigit((unsigned char)*cp)) {
-			altfrac = (*cp++ - '0') * 10;
-			if (isdigit((unsigned char)*cp)) {
-				altfrac += (*cp++ - '0');
-			}
-		}
-	}
-
-	alt = (10000000 + (altsign * (altmeters * 100 + altfrac)));
-
-	while (!isspace((unsigned char)*cp) && (cp < maxcp)) /* if trailing garbage or m */
-		cp++;
-
-	while (isspace((unsigned char)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	siz = precsize_aton(&cp);
-	
-	while (!isspace((unsigned char)*cp) && (cp < maxcp))   /* if trailing garbage or m */
-		cp++;
-
-	while (isspace((unsigned char)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	hp = precsize_aton(&cp);
-
-	while (!isspace((unsigned char)*cp) && (cp < maxcp))   /* if trailing garbage or m */
-		cp++;
-
-	while (isspace((unsigned char)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	vp = precsize_aton(&cp);
-
- defaults:
-
-	bcp = binary;
-	*bcp++ = (u_int8_t) 0;	/* version byte */
-	*bcp++ = siz;
-	*bcp++ = hp;
-	*bcp++ = vp;
-	PUTLONG(latit,bcp);
-	PUTLONG(longit,bcp);
-	PUTLONG(alt,bcp);
-    
-	return (16);		/* size of RR in octets */
-}
-
-/* takes an on-the-wire LOC RR and formats it in a human readable format. */
-const char *
-loc_ntoa(binary, ascii)
-	const u_char *binary;
-	char *ascii;
-{
-	static char *error = "?";
-	const u_char *cp = binary;
-
-	int latdeg, latmin, latsec, latsecfrac;
-	int longdeg, longmin, longsec, longsecfrac;
-	char northsouth, eastwest;
-	int altmeters, altfrac, altsign;
-
-	const u_int32_t referencealt = 100000 * 100;
-
-	int32_t latval, longval, altval;
-	u_int32_t templ;
-	u_int8_t sizeval, hpval, vpval, versionval;
-    
-	char *sizestr, *hpstr, *vpstr;
-
-	size_t len;
-
-	versionval = *cp++;
-
-	if (versionval) {
-		(void) sprintf(ascii, "; error: unknown LOC RR version");
-		return (ascii);
-	}
-
-	sizeval = *cp++;
-
-	hpval = *cp++;
-	vpval = *cp++;
-
-	GETLONG(templ, cp);
-	latval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	longval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	if (templ < referencealt) { /* below WGS 84 spheroid */
-		altval = referencealt - templ;
-		altsign = -1;
-	} else {
-		altval = templ - referencealt;
-		altsign = 1;
-	}
-
-	if (latval < 0) {
-		northsouth = 'S';
-		latval = -latval;
-	} else
-		northsouth = 'N';
-
-	latsecfrac = latval % 1000;
-	latval = latval / 1000;
-	latsec = latval % 60;
-	latval = latval / 60;
-	latmin = latval % 60;
-	latval = latval / 60;
-	latdeg = latval;
-
-	if (longval < 0) {
-		eastwest = 'W';
-		longval = -longval;
-	} else
-		eastwest = 'E';
-
-	longsecfrac = longval % 1000;
-	longval = longval / 1000;
-	longsec = longval % 60;
-	longval = longval / 60;
-	longmin = longval % 60;
-	longval = longval / 60;
-	longdeg = longval;
-
-	altfrac = altval % 100;
-	altmeters = (altval / 100) * altsign;
-
-	len = strlen (precsize_ntoa(sizeval)) + 1;
-	if ((sizestr = malloc(len)) == NULL)
-		sizestr = error;
-	else
-		memcpy (sizestr, precsize_ntoa(sizeval), len);
-	len = strlen (precsize_ntoa(hpval)) + 1;
-	if ((hpstr = malloc (len)) == NULL)
-		hpstr = error;
-	else
-		memcpy (hpstr, precsize_ntoa(hpval), len);
-	len = strlen (precsize_ntoa(vpval)) + 1;
-	if ((vpstr = malloc (len)) == NULL)
-		vpstr = error;
-	else
-		memcpy (vpstr, precsize_ntoa(vpval), len);
-
-	sprintf(ascii,
-	      "%d %.2d %.2d.%.3d %c %d %.2d %.2d.%.3d %c %d.%.2dm %sm %sm %sm",
-		latdeg, latmin, latsec, latsecfrac, northsouth,
-		longdeg, longmin, longsec, longsecfrac, eastwest,
-		altmeters, altfrac, sizestr, hpstr, vpstr);
-
-	if (sizestr != error)
-		free(sizestr);
-	if (hpstr != error)
-		free(hpstr);
-	if (vpstr != error)
-		free(vpstr);
-
-	return (ascii);
-}
-
-
-/* Return the number of DNS hierarchy levels in the name. */
-int
-dn_count_labels(const char *name) {
-	int i, len, count;
-
-	len = strlen(name);
-	for (i = 0, count = 0; i < len; i++) {
-		/* XXX need to check for \. or use named's nlabels(). */
-		if (name[i] == '.')
-			count++;
-	}
-
-	/* don't count initial wildcard */
-	if (name[0] == '*')
-		if (count)
-			count--;
-
-	/* don't count the null label for root. */
-	/* if terminating '.' not found, must adjust */
-	/* count to include last label */
-	if (len > 0 && name[len-1] != '.')
-		count++;
-	return (count);
-}
-
-
-/* 
- * Make dates expressed in seconds-since-Jan-1-1970 easy to read.  
- * SIG records are required to be printed like this, by the Secure DNS RFC.
- */
-char *
-p_secstodate (u_long secs) {
-	static char output[15];		/* YYYYMMDDHHMMSS and null */
-	time_t clock = secs;
-	struct tm *time;
-	
-	time = gmtime(&clock);
-	time->tm_year += 1900;
-	time->tm_mon += 1;
-	sprintf(output, "%04d%02d%02d%02d%02d%02d",
-		time->tm_year, time->tm_mon, time->tm_mday,
-		time->tm_hour, time->tm_min, time->tm_sec);
-	return (output);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <resolv.h>.
- */
-#undef fp_resstat
-__weak_reference(__fp_resstat, fp_resstat);
-#undef p_query
-__weak_reference(__p_query, p_query);
-#undef p_fqnname
-__weak_reference(__p_fqnname, p_fqnname);
-#undef sym_ston
-__weak_reference(__sym_ston, sym_ston);
-#undef sym_ntos
-__weak_reference(__sym_ntos, sym_ntos);
-#undef sym_ntop
-__weak_reference(__sym_ntop, sym_ntop);
-#undef dn_count_labels
-__weak_reference(__dn_count_labels, dn_count_labels);
-#undef p_secstodate
-__weak_reference(__p_secstodate, p_secstodate);
diff --git a/newlib/libc/sys/linux/net/res_init.c b/newlib/libc/sys/linux/net/res_init.c
deleted file mode 100644
index 21f2696..0000000
--- a/newlib/libc/sys/linux/net/res_init.c
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
-static char orig_rcsid[] = "From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <netdb.h>
-
-#include "res_config.h"
-
-static void res_setoptions(char *, char *);
-
-#ifdef RESOLVSORT
-static const char sort_mask[] = "/&";
-#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static u_int32_t net_mask(struct in_addr);
-#endif
-
-#if !defined(isascii) /* XXX - could be a function */
-# define isascii(c) (!(c & 0200))
-#endif
-
-/*
- * Resolver state default settings.
- */
-
-struct __res_state _res
-# if defined(__BIND_RES_TEXT)
-	= { RES_TIMEOUT, }	/* Motorola, et al. */
-# endif
-	;
-
-struct __res_state_ext _res_ext;
-
-/*
- * Set up default settings.  If the configuration file exist, the values
- * there will have precedence.  Otherwise, the server address is set to
- * INADDR_ANY and the default domain name comes from the gethostname().
- *
- * An interrim version of this code (BIND 4.9, pre-4.4BSD) used 127.0.0.1
- * rather than INADDR_ANY ("0.0.0.0") as the default name server address
- * since it was noted that INADDR_ANY actually meant ``the first interface
- * you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface,
- * it had to be "up" in order for you to reach your own name server.  It
- * was later decided that since the recommended practice is to always 
- * install local static routes through 127.0.0.1 for all your network
- * interfaces, that we could solve this problem without a code change.
- *
- * The configuration file should always be used, since it is the only way
- * to specify a default domain.  If you are running a server on your local
- * machine, you should say "nameserver 0.0.0.0" or "nameserver 127.0.0.1"
- * in the configuration file.
- *
- * Return 0 if completes successfully, -1 on error
- */
-int
-res_init()
-{
-	FILE *fp;
-	char *cp, **pp;
-	int n;
-	char buf[MAXDNAME];
-	int nserv = 0;    /* number of nameserver records read from file */
-	int haveenv = 0;
-	int havesearch = 0;
-#ifdef RESOLVSORT
-	int nsort = 0;
-	char *net;
-#endif
-#ifndef RFC1535
-	int dots;
-#endif
-	int sin_len;
-
-	/*
-	 * These three fields used to be statically initialized.  This made
-	 * it hard to use this code in a shared library.  It is necessary,
-	 * now that we're doing dynamic initialization here, that we preserve
-	 * the old semantics: if an application modifies one of these three
-	 * fields of _res before res_init() is called, res_init() will not
-	 * alter them.  Of course, if an application is setting them to
-	 * _zero_ before calling res_init(), hoping to override what used
-	 * to be the static default, we can't detect it and unexpected results
-	 * will follow.  Zero for any of these fields would make no sense,
-	 * so one can safely assume that the applications were already getting
-	 * unexpected results.
-	 *
-	 * _res.options is tricky since some apps were known to diddle the bits
-	 * before res_init() was first called. We can't replicate that semantic
-	 * with dynamic initialization (they may have turned bits off that are
-	 * set in RES_DEFAULT).  Our solution is to declare such applications
-	 * "broken".  They could fool us by setting RES_INIT but none do (yet).
-	 */
-	if (!_res.retrans)
-		_res.retrans = RES_TIMEOUT;
-	if (!_res.retry)
-		_res.retry = 4;
-	if (!(_res.options & RES_INIT))
-		_res.options = RES_DEFAULT;
-
-	/*
-	 * This one used to initialize implicitly to zero, so unless the app
-	 * has set it to something in particular, we can randomize it now.
-	 */
-	if (!_res.id)
-		_res.id = res_randomid();
-
-#ifdef USELOOPBACK
-	_res.nsaddr.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
-#else
-	_res.nsaddr.sin_addr.s_addr = INADDR_ANY;
-#endif
-	_res.nsaddr.sin_family = AF_INET;
-	_res.nsaddr.sin_port = htons(NAMESERVER_PORT);
-	sin_len = sizeof(struct sockaddr_in);
-	if (sizeof(_res_ext.nsaddr) >= sin_len)
-		memcpy(&_res_ext.nsaddr, &_res.nsaddr, sin_len);
-	_res.nscount = 1;
-	_res.ndots = 1;
-	_res.pfcode = 0;
-
-	/* Allow user to override the local domain definition */
-	if (issetugid() == 0 && (cp = getenv("LOCALDOMAIN")) != NULL) {
-		(void)strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-		_res.defdname[sizeof(_res.defdname) - 1] = '\0';
-		haveenv++;
-
-		/*
-		 * Set search list to be blank-separated strings
-		 * from rest of env value.  Permits users of LOCALDOMAIN
-		 * to still have a search list, and anyone to set the
-		 * one that they want to use as an individual (even more
-		 * important now that the rfc1535 stuff restricts searches)
-		 */
-		cp = _res.defdname;
-		pp = _res.dnsrch;
-		*pp++ = cp;
-		for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
-			if (*cp == '\n')	/* silly backwards compat */
-				break;
-			else if (*cp == ' ' || *cp == '\t') {
-				*cp = 0;
-				n = 1;
-			} else if (n) {
-				*pp++ = cp;
-				n = 0;
-				havesearch = 1;
-			}
-		}
-		/* null terminate last domain if there are excess */
-		while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n')
-			cp++;
-		*cp = '\0';
-		*pp++ = 0;
-	}
-
-#define	MATCH(line, name) \
-	(!strncmp(line, name, sizeof(name) - 1) && \
-	(line[sizeof(name) - 1] == ' ' || \
-	 line[sizeof(name) - 1] == '\t'))
-
-	if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
-	    /* read the config file */
-	    while (fgets(buf, sizeof(buf), fp) != NULL) {
-		/* skip comments */
-		if (*buf == ';' || *buf == '#')
-			continue;
-		/* read default domain name */
-		if (MATCH(buf, "domain")) {
-		    if (haveenv)	/* skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("domain") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-		    _res.defdname[sizeof(_res.defdname) - 1] = '\0';
-		    if ((cp = strpbrk(_res.defdname, " \t\n")) != NULL)
-			    *cp = '\0';
-		    havesearch = 0;
-		    continue;
-		}
-		/* set search list */
-		if (MATCH(buf, "search")) {
-		    if (haveenv)	/* skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("search") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(_res.defdname, cp, sizeof(_res.defdname) - 1);
-		    _res.defdname[sizeof(_res.defdname) - 1] = '\0';
-		    if ((cp = strchr(_res.defdname, '\n')) != NULL)
-			    *cp = '\0';
-		    /*
-		     * Set search list to be blank-separated strings
-		     * on rest of line.
-		     */
-		    cp = _res.defdname;
-		    pp = _res.dnsrch;
-		    *pp++ = cp;
-		    for (n = 0; *cp && pp < _res.dnsrch + MAXDNSRCH; cp++) {
-			    if (*cp == ' ' || *cp == '\t') {
-				    *cp = 0;
-				    n = 1;
-			    } else if (n) {
-				    *pp++ = cp;
-				    n = 0;
-			    }
-		    }
-		    /* null terminate last domain if there are excess */
-		    while (*cp != '\0' && *cp != ' ' && *cp != '\t')
-			    cp++;
-		    *cp = '\0';
-		    *pp++ = 0;
-		    havesearch = 1;
-		    continue;
-		}
-		/* read nameservers to query */
-		if (MATCH(buf, "nameserver") && nserv < MAXNS) {
-		    char *q;
-		    struct addrinfo hints, *res;
-		    char pbuf[NI_MAXSERV];
-
-		    cp = buf + sizeof("nameserver") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			continue;
-		    for (q = cp; *q; q++) {
-			if (isspace(*q)) {
-			    *q = '\0';
-			    break;
-			}
-		    }
-		    memset(&hints, 0, sizeof(hints));
-		    hints.ai_flags = AI_NUMERICHOST;
-		    hints.ai_socktype = SOCK_DGRAM;
-		    snprintf(pbuf, sizeof(pbuf), "%d", NAMESERVER_PORT);
-		    if (getaddrinfo(cp, pbuf, &hints, &res) == 0 &&
-			    res->ai_next == NULL) {
-			if (res->ai_addrlen <= sizeof(_res_ext.nsaddr_list[nserv])) {
-			    memcpy(&_res_ext.nsaddr_list[nserv], res->ai_addr,
-				res->ai_addrlen);
-			} else {
-			    memset(&_res_ext.nsaddr_list[nserv], 0,
-				sizeof(_res_ext.nsaddr_list[nserv]));
-			}
-			if (res->ai_addrlen <= sizeof(_res.nsaddr_list[nserv])) {
-			    memcpy(&_res.nsaddr_list[nserv], res->ai_addr,
-				res->ai_addrlen);
-			} else {
-			    memset(&_res.nsaddr_list[nserv], 0,
-				sizeof(_res.nsaddr_list[nserv]));
-			}
-			nserv++;
-		    }
-		    if (res)
-			    freeaddrinfo(res);
-		    continue;
-		}
-#ifdef RESOLVSORT
-		if (MATCH(buf, "sortlist")) {
-		    struct in_addr a;
-		    struct in6_addr a6;
-		    int m, i;
-		    u_char *u;
-
-		    cp = buf + sizeof("sortlist") - 1;
-		    while (nsort < MAXRESOLVSORT) {
-			while (*cp == ' ' || *cp == '\t')
-			    cp++;
-			if (*cp == '\0' || *cp == '\n' || *cp == ';')
-			    break;
-			net = cp;
-			while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
-			       isascii(*cp) && !isspace(*cp))
-				cp++;
-			n = *cp;
-			*cp = 0;
-			if (inet_aton(net, &a)) {
-			    _res.sort_list[nsort].addr = a;
-			    if (ISSORTMASK(n)) {
-				*cp++ = n;
-				net = cp;
-				while (*cp && *cp != ';' &&
-					isascii(*cp) && !isspace(*cp))
-				    cp++;
-				n = *cp;
-				*cp = 0;
-				if (inet_aton(net, &a)) {
-				    _res.sort_list[nsort].mask = a.s_addr;
-				} else {
-				    _res.sort_list[nsort].mask = 
-					net_mask(_res.sort_list[nsort].addr);
-				}
-			    } else {
-				_res.sort_list[nsort].mask = 
-				    net_mask(_res.sort_list[nsort].addr);
-			    }
-			    _res_ext.sort_list[nsort].af = AF_INET;
-			    _res_ext.sort_list[nsort].addr.ina =
-				_res.sort_list[nsort].addr;
-			    _res_ext.sort_list[nsort].mask.ina.s_addr =
-				_res.sort_list[nsort].mask;
-			    nsort++;
-			}
-			else if (inet_pton(AF_INET6, net, &a6) == 1) {
-
-			    _res_ext.sort_list[nsort].af = AF_INET6;
-			    _res_ext.sort_list[nsort].addr.in6a = a6;
-			    u = (u_char *)&_res_ext.sort_list[nsort].mask.in6a;
-			    *cp++ = n;
-			    net = cp;
-			    while (*cp && *cp != ';' &&
-				    isascii(*cp) && !isspace(*cp))
-				cp++;
-			    m = n;
-			    n = *cp;
-			    *cp = 0;
-			    switch (m) {
-			    case '/':
-				m = atoi(net);
-				break;
-			    case '&':
-				if (inet_pton(AF_INET6, net, u) == 1) {
-				    m = -1;
-				    break;
-				}
-				/*FALLTHROUGH*/
-			    default:
-				m = sizeof(struct in6_addr) * NBBY;
-				break;
-			    }
-			    if (m >= 0) {
-				for (i = 0; i < sizeof(struct in6_addr); i++) {
-				    if (m <= 0) {
-					*u = 0;
-				    } else {
-					m -= NBBY;
-					*u = (u_char)~0;
-					if (m < 0)
-					    *u <<= -m;
-				    }
-				    u++;
-				}
-			    }
-			    _res.sort_list[nsort].addr.s_addr =
-				(u_int32_t)0xffffffff;
-			    _res.sort_list[nsort].mask = (u_int32_t)0xffffffff;
-			    nsort++;
-			}
-			*cp = n;
-		    }
-		    continue;
-		}
-#endif
-		if (MATCH(buf, "options")) {
-		    res_setoptions(buf + sizeof("options") - 1, "conf");
-		    continue;
-		}
-	    }
-	    if (nserv > 1) 
-		_res.nscount = nserv;
-#ifdef RESOLVSORT
-	    _res.nsort = nsort;
-#endif
-	    (void) fclose(fp);
-	}
-	if (_res.defdname[0] == 0 &&
-	    gethostname(buf, sizeof(_res.defdname) - 1) == 0 &&
-	    (cp = strchr(buf, '.')) != NULL)
-		strcpy(_res.defdname, cp + 1);
-
-	/* find components of local domain that might be searched */
-	if (havesearch == 0) {
-		pp = _res.dnsrch;
-		*pp++ = _res.defdname;
-		*pp = NULL;
-
-#ifndef RFC1535
-		dots = 0;
-		for (cp = _res.defdname; *cp; cp++)
-			dots += (*cp == '.');
-
-		cp = _res.defdname;
-		while (pp < _res.dnsrch + MAXDFLSRCH) {
-			if (dots < LOCALDOMAINPARTS)
-				break;
-			cp = strchr(cp, '.') + 1;    /* we know there is one */
-			*pp++ = cp;
-			dots--;
-		}
-		*pp = NULL;
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG) {
-			printf(";; res_init()... default dnsrch list:\n");
-			for (pp = _res.dnsrch; *pp; pp++)
-				printf(";;\t%s\n", *pp);
-			printf(";;\t..END..\n");
-		}
-#endif
-#endif /* !RFC1535 */
-	}
-
-	if (issetugid())
-		_res.options |= RES_NOALIASES;
-	else if ((cp = getenv("RES_OPTIONS")) != NULL)
-		res_setoptions(cp, "env");
-	_res.options |= RES_INIT;
-	return (0);
-}
-
-static void
-res_setoptions(options, source)
-	char *options, *source;
-{
-	char *cp = options;
-	int i;
-
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_setoptions(\"%s\", \"%s\")...\n",
-		       options, source);
-#endif
-	while (*cp) {
-		/* skip leading and inner runs of spaces */
-		while (*cp == ' ' || *cp == '\t')
-			cp++;
-		/* search for and process individual options */
-		if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
-			i = atoi(cp + sizeof("ndots:") - 1);
-			if (i <= RES_MAXNDOTS)
-				_res.ndots = i;
-			else
-				_res.ndots = RES_MAXNDOTS;
-#ifdef DEBUG
-			if (_res.options & RES_DEBUG)
-				printf(";;\tndots=%d\n", _res.ndots);
-#endif
-		} else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
-#ifdef DEBUG
-			if (!(_res.options & RES_DEBUG)) {
-				printf(";; res_setoptions(\"%s\", \"%s\")..\n",
-				       options, source);
-				_res.options |= RES_DEBUG;
-			}
-			printf(";;\tdebug\n");
-#endif
-		} else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
-			_res.options |= RES_USE_INET6;
-		} else if (!strncmp(cp, "insecure1", sizeof("insecure1") - 1)) {
-		       _res.options |= RES_INSECURE1;
-		} else if (!strncmp(cp, "insecure2", sizeof("insecure2") - 1)) {
-		       _res.options |= RES_INSECURE2;
-		} else if (!strncmp(cp, "no_tld_query", sizeof("no_tld_query") - 1)) {
-			_res.options |= RES_NOTLDQUERY;
-		} else if (!strncmp(cp, "edns0", sizeof("edns0") - 1)) {
-		       _res.options |= RES_USE_EDNS0;
-		} else {
-			/* XXX - print a warning here? */
-		}
-		/* skip to next run of spaces */
-		while (*cp && *cp != ' ' && *cp != '\t')
-			cp++;
-	}
-}
-
-#ifdef RESOLVSORT
-/* XXX - should really support CIDR which means explicit masks always. */
-static u_int32_t
-net_mask(in)		/* XXX - should really use system's version of this */
-	struct in_addr in;
-{
-	u_int32_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (htonl(IN_CLASSA_NET));
-	else if (IN_CLASSB(i))
-		return (htonl(IN_CLASSB_NET));
-	return (htonl(IN_CLASSC_NET));
-}
-#endif
-
-u_int
-res_randomid()
-{
-	struct timeval now;
-
-	gettimeofday(&now, NULL);
-	return (0xffff & (now.tv_sec ^ now.tv_usec ^ getpid()));
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <resolv.h>.
- */
-#undef res_init
-__weak_reference(__res_init, res_init);
diff --git a/newlib/libc/sys/linux/net/res_mkquery.c b/newlib/libc/sys/linux/net/res_mkquery.c
deleted file mode 100644
index 0c6cca9..0000000
--- a/newlib/libc/sys/linux/net/res_mkquery.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 1985, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: res_mkquery.c,v 8.9 1997/04/24 22:22:36 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "res_config.h"
-
-/*
- * Form all types of queries.
- * Returns the size of the result or -1.
- */
-int
-res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
-	int op;			/* opcode of query */
-	const char *dname;	/* domain name */
-	int class, type;	/* class and type of query */
-	const u_char *data;	/* resource record data */
-	int datalen;		/* length of data */
-	const u_char *newrr_in;	/* new rr for modify or append */
-	u_char *buf;		/* buffer to put query */
-	int buflen;		/* size of buffer */
-{
-	HEADER *hp;
-	u_char *cp;
-	int n;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_mkquery(%d, %s, %d, %d)\n",
-		       op, dname, class, type);
-#endif
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *) buf;
-	hp->id = htons(++_res.id);
-	hp->opcode = op;
-	hp->rd = (_res.options & RES_RECURSE) != 0;
-	hp->rcode = NOERROR;
-	cp = buf + HFIXEDSZ;
-	buflen -= HFIXEDSZ;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-	/*
-	 * perform opcode specific processing
-	 */
-	switch (op) {
-	case QUERY:	/*FALLTHROUGH*/
-	case NS_NOTIFY_OP:
-		if ((buflen -= QFIXEDSZ) < 0)
-			return (-1);
-		if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		buflen -= n;
-		__putshort(type, cp);
-		cp += INT16SZ;
-		__putshort(class, cp);
-		cp += INT16SZ;
-		hp->qdcount = htons(1);
-		if (op == QUERY || data == NULL)
-			break;
-		/*
-		 * Make an additional record for completion domain.
-		 */
-		buflen -= RRFIXEDSZ;
-		n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		buflen -= n;
-		__putshort(T_NULL, cp);
-		cp += INT16SZ;
-		__putshort(class, cp);
-		cp += INT16SZ;
-		__putlong(0, cp);
-		cp += INT32SZ;
-		__putshort(0, cp);
-		cp += INT16SZ;
-		hp->arcount = htons(1);
-		break;
-
-	case IQUERY:
-		/*
-		 * Initialize answer section
-		 */
-		if (buflen < 1 + RRFIXEDSZ + datalen)
-			return (-1);
-		*cp++ = '\0';	/* no domain name */
-		__putshort(type, cp);
-		cp += INT16SZ;
-		__putshort(class, cp);
-		cp += INT16SZ;
-		__putlong(0, cp);
-		cp += INT32SZ;
-		__putshort(datalen, cp);
-		cp += INT16SZ;
-		if (datalen) {
-			memcpy(cp, data, datalen);
-			cp += datalen;
-		}
-		hp->ancount = htons(1);
-		break;
-
-	default:
-		return (-1);
-	}
-	return (cp - buf);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <resolv.h>.
- */
-#undef res_mkquery
-__weak_reference(__res_mkquery, res_mkquery);
-
-/* attach OPT pseudo-RR, as documented in RFC2671 (EDNS0). */
-int
-res_opt(n0, buf, buflen, anslen)
-	int n0;
-	u_char *buf;		/* buffer to put query */
-	int buflen;		/* size of buffer */
-	int anslen;		/* answer buffer length */
-{
-	HEADER *hp;
-	u_char *cp;
-
-	hp = (HEADER *) buf;
-	cp = buf + n0;
-	buflen -= n0;
-
-	if (buflen < 1 + RRFIXEDSZ)
-		return -1;
-
-	*cp++ = 0;	/* "." */
-	buflen--;
-
-	__putshort(T_OPT, cp);	/* TYPE */
-	cp += INT16SZ;
-	__putshort(anslen & 0xffff, cp);	/* CLASS = UDP payload size */
-	cp += INT16SZ;
-	*cp++ = NOERROR;	/* extended RCODE */
-	*cp++ = 0;		/* EDNS version */
-	__putshort(0, cp);	/* MBZ */
-	cp += INT16SZ;
-	__putshort(0, cp);	/* RDLEN */
-	cp += INT16SZ;
-	hp->arcount = htons(ntohs(hp->arcount) + 1);
-	buflen -= RRFIXEDSZ;
-
-	return cp - buf;
-}
diff --git a/newlib/libc/sys/linux/net/res_mkupdate.c b/newlib/libc/sys/linux/net/res_mkupdate.c
deleted file mode 100644
index 4e21fe8..0000000
--- a/newlib/libc/sys/linux/net/res_mkupdate.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Based on the Dynamic DNS reference implementation by Viraj Bais
- * <viraj_bais@ccm.fm.intel.com>
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <limits.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
-#include "res_config.h"
-
-static int getnum_str(u_char **, u_char *);
-static int getword_str(char *, int, u_char **, u_char *);
-
-#define ShrinkBuffer(x)  if ((buflen -= x) < 0) return (-2);
-
-/*
- * Form update packets.
- * Returns the size of the resulting packet if no error
- * On error,
- *	returns -1 if error in reading a word/number in rdata
- *		   portion for update packets
- *		-2 if length of buffer passed is insufficient
- *		-3 if zone section is not the first section in
- *		   the linked list, or section order has a problem
- *		-4 on a number overflow
- *		-5 unknown operation or no records
- */
-int
-res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
-	ns_updrec *rrecp_start = rrecp_in;
-	HEADER *hp;
-	u_char *cp, *sp1, *sp2, *startp, *endp;
-	int n, i, soanum, multiline;
-	ns_updrec *rrecp;
-	struct in_addr ina;
-        char buf2[MAXDNAME];
-	int section, numrrs = 0, counts[ns_s_max];
-	u_int16_t rtype, rclass;
-	u_int32_t n1, rttl;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *) buf;
-	hp->id = htons(++_res.id);
-	hp->opcode = ns_o_update;
-	hp->rcode = NOERROR;
-	sp1 = buf + 2*INT16SZ;  /* save pointer to zocount */
-	cp = buf + HFIXEDSZ;
-	buflen -= HFIXEDSZ;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-
-	if (rrecp_start == NULL)
-		return (-5);
-	else if (rrecp_start->r_section != S_ZONE)
-		return (-3);
-
-	memset(counts, 0, sizeof counts);
-	for (rrecp = rrecp_start; rrecp; rrecp = rrecp->r_grpnext) {
-		numrrs++;
-                section = rrecp->r_section;
-		if (section < 0 || section >= ns_s_max)
-			return (-1);
-		counts[section]++;
-		for (i = section + 1; i < ns_s_max; i++)
-			if (counts[i])
-				return (-3);
-		rtype = rrecp->r_type;
-		rclass = rrecp->r_class;
-		rttl = rrecp->r_ttl;
-		/* overload class and type */
-		if (section == S_PREREQ) {
-			rttl = 0;
-			switch (rrecp->r_opcode) {
-			case YXDOMAIN:
-				rclass = C_ANY;
-				rtype = T_ANY;
-				rrecp->r_size = 0;
-				break;
-			case NXDOMAIN:
-				rclass = C_NONE;
-				rtype = T_ANY;
-				rrecp->r_size = 0;
-				break;
-			case NXRRSET:
-				rclass = C_NONE;
-				rrecp->r_size = 0;
-				break;
-			case YXRRSET:
-				if (rrecp->r_size == 0)
-					rclass = C_ANY;
-				break;
-			default:
-				fprintf(stderr,
-					"res_mkupdate: incorrect opcode: %d\n",
-					rrecp->r_opcode);
-				fflush(stderr);
-				return (-1);
-			}
-		} else if (section == S_UPDATE) {
-			switch (rrecp->r_opcode) {
-			case DELETE:
-				rclass = rrecp->r_size == 0 ? C_ANY : C_NONE;
-				break;
-			case ADD:
-				break;
-			default:
-				fprintf(stderr,
-					"res_mkupdate: incorrect opcode: %d\n",
-					rrecp->r_opcode);
-				fflush(stderr);
-				return (-1);
-			}
-		}
-
-		/*
-		 * XXX	appending default domain to owner name is omitted,
-		 *	fqdn must be provided
-		 */
-		if ((n = dn_comp(rrecp->r_dname, cp, buflen, dnptrs,
-				 lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		ShrinkBuffer(n + 2*INT16SZ);
-		PUTSHORT(rtype, cp);
-		PUTSHORT(rclass, cp);
-		if (section == S_ZONE) {
-			if (numrrs != 1 || rrecp->r_type != T_SOA)
-				return (-3);
-			continue;
-		}
-		ShrinkBuffer(INT32SZ + INT16SZ);
-		PUTLONG(rttl, cp);
-		sp2 = cp;  /* save pointer to length byte */
-		cp += INT16SZ;
-		if (rrecp->r_size == 0) {
-			if (section == S_UPDATE && rclass != C_ANY)
-				return (-1);
-			else {
-				PUTSHORT(0, sp2);
-				continue;
-			}
-		}
-		startp = rrecp->r_data;
-		endp = startp + rrecp->r_size - 1;
-		/* XXX this should be done centrally. */
-		switch (rrecp->r_type) {
-		case T_A:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			if (!inet_aton(buf2, &ina))
-				return (-1);
-			n1 = ntohl(ina.s_addr);
-			ShrinkBuffer(INT32SZ);
-			PUTLONG(n1, cp);
-			break;
-		case T_CNAME:
-		case T_MB:
-		case T_MG:
-		case T_MR:
-		case T_NS:
-		case T_PTR:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_MINFO:
-		case T_SOA:
-		case T_RP:
-			for (i = 0; i < 2; i++) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-				return (-1);
-				n = dn_comp(buf2, cp, buflen,
-					    dnptrs, lastdnptr);
-				if (n < 0)
-					return (-1);
-				cp += n;
-				ShrinkBuffer(n);
-			}
-			if (rrecp->r_type == T_SOA) {
-				ShrinkBuffer(5 * INT32SZ);
-				while (isspace(*startp) || !*startp)
-					startp++;
-				if (*startp == '(') {
-					multiline = 1;
-					startp++;
-				} else
-					multiline = 0;
-				/* serial, refresh, retry, expire, minimum */
-				for (i = 0; i < 5; i++) {
-					soanum = getnum_str(&startp, endp);
-					if (soanum < 0)
-						return (-1);
-					PUTLONG(soanum, cp);
-				}
-				if (multiline) {
-					while (isspace(*startp) || !*startp)
-						startp++;
-					if (*startp != ')')
-						return (-1);
-				}
-			}
-			break;
-		case T_MX:
-		case T_AFSDB:
-		case T_RT:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			PUTSHORT(n, cp);
-			ShrinkBuffer(INT16SZ);
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_PX:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			PUTSHORT(n, cp);
-			ShrinkBuffer(INT16SZ);
-			for (i = 0; i < 2; i++) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-					return (-1);
-				n = dn_comp(buf2, cp, buflen, dnptrs,
-					    lastdnptr);
-				if (n < 0)
-					return (-1);
-				cp += n;
-				ShrinkBuffer(n);
-			}
-			break;
-		case T_WKS:
-		case T_HINFO:
-		case T_TXT:
-		case T_X25:
-		case T_ISDN:
-		case T_NSAP:
-		case T_LOC:
-			/* XXX - more fine tuning needed here */
-			ShrinkBuffer(rrecp->r_size);
-			memcpy(cp, rrecp->r_data, rrecp->r_size);
-			cp += rrecp->r_size;
-			break;
-		default:
-			return (-1);
-		} /*switch*/
-		n = (u_int16_t)((cp - sp2) - INT16SZ);
-		PUTSHORT(n, sp2);
-	} /*for*/
-		
-	hp->qdcount = htons(counts[0]);
-	hp->ancount = htons(counts[1]);
-	hp->nscount = htons(counts[2]);
-	hp->arcount = htons(counts[3]);
-	return (cp - buf);
-}
-
-/*
- * Get a whitespace delimited word from a string (not file)
- * into buf. modify the start pointer to point after the
- * word in the string.
- */
-static int
-getword_str(char *buf, int size, u_char **startpp, u_char *endp) {
-        char *cp;
-        int c;
- 
-        for (cp = buf; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (cp != buf) /* trailing whitespace */
-                                break;
-                        else { /* leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                (*startpp)++;
-                if (cp >= buf+size-1)
-                        break;
-                *cp++ = (u_char)c;
-        }
-        *cp = '\0';
-        return (cp != buf);
-}
-
-/*
- * Get a whitespace delimited number from a string (not file) into buf
- * update the start pointer to point after the number in the string.
- */
-static int
-getnum_str(u_char **startpp, u_char *endp) {
-        int c, n;
-        int seendigit = 0;
-        int m = 0;
-
-        for (n = 0; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (seendigit) /* trailing whitespace */
-                                break;
-                        else { /* leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                if (c == ';') {
-                        while ((*startpp <= endp) &&
-			       ((c = **startpp) != '\n'))
-					(*startpp)++;
-                        if (seendigit)
-                                break;
-                        continue;
-                }
-                if (!isdigit(c)) {
-                        if (c == ')' && seendigit) {
-                                (*startpp)--;
-                                break;
-                        }
-			return (-1);
-                }        
-                (*startpp)++;
-                n = n * 10 + (c - '0');
-                seendigit = 1;
-        }
-        return (n + m);
-}
-
-/*
- * Allocate a resource record buffer & save rr info.
- */
-ns_updrec *
-res_mkupdrec(int section, const char *dname,
-	     u_int class, u_int type, u_long ttl) {
-	ns_updrec *rrecp = (ns_updrec *)calloc(1, sizeof(ns_updrec));
-
-	if (!rrecp || !(rrecp->r_dname = strdup(dname)))
-		return (NULL);
- 	rrecp->r_class = class;
-	rrecp->r_type = type;
-	rrecp->r_ttl = ttl;
-	rrecp->r_section = section;
-	return (rrecp);
-}
-
-/*
- * Free a resource record buffer created by res_mkupdrec.
- */
-void
-res_freeupdrec(ns_updrec *rrecp) {
-	/* Note: freeing r_dp is the caller's responsibility. */
-	if (rrecp->r_dname != NULL)
-		free(rrecp->r_dname);
-	free(rrecp);
-}
diff --git a/newlib/libc/sys/linux/net/res_query.c b/newlib/libc/sys/linux/net/res_query.c
deleted file mode 100644
index ee6775d..0000000
--- a/newlib/libc/sys/linux/net/res_query.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "res_config.h"
-
-#if PACKETSZ > 1024
-#define MAXPACKET	PACKETSZ
-#else
-#define MAXPACKET	1024
-#endif
-
-/*
- * Formulate a normal query, send, and await answer.
- * Returned answer is placed in supplied buffer "answer".
- * Perform preliminary check of answer, returning success only
- * if no error is indicated and the answer count is nonzero.
- * Return the size of the response on success, -1 on error.
- * Error number is left in h_errno.
- *
- * Caller must parse answer and determine whether it answers the question.
- */
-int
-res_query(name, class, type, answer, anslen)
-	const char *name;	/* domain name */
-	int class, type;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer buffer */
-{
-	u_char buf[MAXPACKET];
-	HEADER *hp = (HEADER *) answer;
-	int n;
-
-	hp->rcode = NOERROR;	/* default */
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_query(%s, %d, %d)\n", name, class, type);
-#endif
-
-	n = res_mkquery(QUERY, name, class, type, NULL, 0, NULL,
-			buf, sizeof(buf));
-	if (n > 0 && (_res.options & RES_USE_EDNS0) != 0)
-		n = res_opt(n, buf, sizeof(buf), anslen);
-	if (n <= 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; res_query: mkquery failed\n");
-#endif
-		h_errno = NO_RECOVERY;
-		return (n);
-	}
-	n = res_send(buf, n, answer, anslen);
-	if (n < 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; res_query: send error\n");
-#endif
-		h_errno = TRY_AGAIN;
-		return (n);
-	}
-
-	if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
-#ifdef DEBUG
-		if (_res.options & RES_DEBUG)
-			printf(";; rcode = %d, ancount=%d\n", hp->rcode,
-			    ntohs(hp->ancount));
-#endif
-		switch (hp->rcode) {
-		case NXDOMAIN:
-			h_errno = HOST_NOT_FOUND;
-			break;
-		case SERVFAIL:
-			h_errno = TRY_AGAIN;
-			break;
-		case NOERROR:
-			h_errno = NO_DATA;
-			break;
-		case FORMERR:
-		case NOTIMP:
-		case REFUSED:
-		default:
-			h_errno = NO_RECOVERY;
-			break;
-		}
-		return (-1);
-	}
-	return (n);
-}
-
-/*
- * Formulate a normal query, send, and retrieve answer in supplied buffer.
- * Return the size of the response on success, -1 on error.
- * If enabled, implement search rules until answer or unrecoverable failure
- * is detected.  Error code, if any, is left in h_errno.
- */
-int
-res_search(name, class, type, answer, anslen)
-	const char *name;	/* domain name */
-	int class, type;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer */
-{
-	const char *cp, * const *domain;
-	HEADER *hp = (HEADER *) answer;
-	u_int dots;
-	int trailing_dot, ret, saved_herrno;
-	int got_nodata = 0, got_servfail = 0, tried_as_is = 0;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-	errno = 0;
-	h_errno = HOST_NOT_FOUND;	/* default, if we never query */
-	dots = 0;
-	for (cp = name; *cp; cp++)
-		dots += (*cp == '.');
-	trailing_dot = 0;
-	if (cp > name && *--cp == '.')
-		trailing_dot++;
-
-	/* If there aren't any dots, it could be a user-level alias */
-	if (!dots && (cp = hostalias(name)) != NULL)
-		return (res_query(cp, class, type, answer, anslen));
-
-	/*
-	 * If there are dots in the name already, let's just give it a try
-	 * 'as is'.  The threshold can be set with the "ndots" option.
-	 */
-	saved_herrno = -1;
-	if (dots >= _res.ndots) {
-		ret = res_querydomain(name, NULL, class, type, answer, anslen);
-		if (ret > 0)
-			return (ret);
-		saved_herrno = h_errno;
-		tried_as_is++;
-	}
-
-	/*
-	 * We do at least one level of search if
-	 *	- there is no dot and RES_DEFNAME is set, or
-	 *	- there is at least one dot, there is no trailing dot,
-	 *	  and RES_DNSRCH is set.
-	 */
-	if ((!dots && (_res.options & RES_DEFNAMES)) ||
-	    (dots && !trailing_dot && (_res.options & RES_DNSRCH))) {
-		int done = 0;
-
-		for (domain = (const char * const *)_res.dnsrch;
-		     *domain && !done;
-		     domain++) {
-
-			ret = res_querydomain(name, *domain, class, type,
-					      answer, anslen);
-			if (ret > 0)
-				return (ret);
-
-			/*
-			 * If no server present, give up.
-			 * If name isn't found in this domain,
-			 * keep trying higher domains in the search list
-			 * (if that's enabled).
-			 * On a NO_DATA error, keep trying, otherwise
-			 * a wildcard entry of another type could keep us
-			 * from finding this entry higher in the domain.
-			 * If we get some other error (negative answer or
-			 * server failure), then stop searching up,
-			 * but try the input name below in case it's
-			 * fully-qualified.
-			 */
-			if (errno == ECONNREFUSED) {
-				h_errno = TRY_AGAIN;
-				return (-1);
-			}
-
-			switch (h_errno) {
-			case NO_DATA:
-				got_nodata++;
-				/* FALLTHROUGH */
-			case HOST_NOT_FOUND:
-				/* keep trying */
-				break;
-			case TRY_AGAIN:
-				if (hp->rcode == SERVFAIL) {
-					/* try next search element, if any */
-					got_servfail++;
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				/* anything else implies that we're done */
-				done++;
-			}
-
-			/* if we got here for some reason other than DNSRCH,
-			 * we only wanted one iteration of the loop, so stop.
-			 */
-			if (!(_res.options & RES_DNSRCH))
-				done++;
-		}
-	}
-
-	/*
-	 * If we have not already tried the name "as is", do that now.
-	 * note that we do this regardless of how many dots were in the
-	 * name or whether it ends with a dot unless NOTLDQUERY is set.
-	 */
-	if (!tried_as_is && (dots || !(_res.options & RES_NOTLDQUERY))) {
-		ret = res_querydomain(name, NULL, class, type, answer, anslen);
-		if (ret > 0)
-			return (ret);
-	}
-
-	/* if we got here, we didn't satisfy the search.
-	 * if we did an initial full query, return that query's h_errno
-	 * (note that we wouldn't be here if that query had succeeded).
-	 * else if we ever got a nodata, send that back as the reason.
-	 * else send back meaningless h_errno, that being the one from
-	 * the last DNSRCH we did.
-	 */
-	if (saved_herrno != -1)
-		h_errno = saved_herrno;
-	else if (got_nodata)
-		h_errno = NO_DATA;
-	else if (got_servfail)
-		h_errno = TRY_AGAIN;
-	return (-1);
-}
-
-/*
- * Perform a call on res_query on the concatenation of name and domain,
- * removing a trailing dot from name if domain is NULL.
- */
-int
-res_querydomain(name, domain, class, type, answer, anslen)
-	const char *name, *domain;
-	int class, type;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer */
-{
-	char nbuf[MAXDNAME];
-	const char *longname = nbuf;
-	int n, d;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-#ifdef DEBUG
-	if (_res.options & RES_DEBUG)
-		printf(";; res_querydomain(%s, %s, %d, %d)\n",
-		       name, domain?domain:"<Nil>", class, type);
-#endif
-	if (domain == NULL) {
-		/*
-		 * Check for trailing '.';
-		 * copy without '.' if present.
-		 */
-		n = strlen(name);
-		if (n >= MAXDNAME) {
-			h_errno = NO_RECOVERY;
-			return (-1);
-		}
-		n--;
-		if (n >= 0 && name[n] == '.') {
-			strncpy(nbuf, name, n);
-			nbuf[n] = '\0';
-		} else
-			longname = name;
-	} else {
-		n = strlen(name);
-		d = strlen(domain);
-		if (n + d + 1 >= MAXDNAME) {
-			h_errno = NO_RECOVERY;
-			return (-1);
-		}
-		sprintf(nbuf, "%s.%s", name, domain);
-	}
-	return (res_query(longname, class, type, answer, anslen));
-}
-
-const char *
-hostalias(name)
-	const char *name;
-{
-	char *cp1, *cp2;
-	FILE *fp;
-	char *file;
-	char buf[BUFSIZ];
-	static char abuf[MAXDNAME];
-
-	if (_res.options & RES_NOALIASES)
-		return (NULL);
-	if (issetugid())
-		return (NULL);
-	file = getenv("HOSTALIASES");
-	if (file == NULL || (fp = fopen(file, "r")) == NULL)
-		return (NULL);
-	setbuf(fp, NULL);
-	buf[sizeof(buf) - 1] = '\0';
-	while (fgets(buf, sizeof(buf), fp)) {
-		for (cp1 = buf; *cp1 && !isspace((unsigned char)*cp1); ++cp1)
-			;
-		if (!*cp1)
-			break;
-		*cp1 = '\0';
-		if (!strcasecmp(buf, name)) {
-			while (isspace((unsigned char)*++cp1))
-				;
-			if (!*cp1)
-				break;
-			for (cp2 = cp1 + 1; *cp2 && !isspace((unsigned char)*cp2); ++cp2)
-				;
-			abuf[sizeof(abuf) - 1] = *cp2 = '\0';
-			strncpy(abuf, cp1, sizeof(abuf) - 1);
-			fclose(fp);
-			return (abuf);
-		}
-	}
-	fclose(fp);
-	return (NULL);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <resolv.h>.
- */
-#undef res_query
-__weak_reference(__res_query, res_query);
-#undef res_search
-__weak_reference(__res_search, res_search);
-#undef res_querydomain
-__weak_reference(__res_querydomain, res_querydomain);
diff --git a/newlib/libc/sys/linux/net/res_send.c b/newlib/libc/sys/linux/net/res_send.c
deleted file mode 100644
index 153d2f5..0000000
--- a/newlib/libc/sys/linux/net/res_send.c
+++ /dev/null
@@ -1,954 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 1993
- *    The Regents of the University of California.  All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: res_send.c,v 8.20 1998/04/06 23:27:51 halley Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-/*
- * Send query to name server and wait for reply.
- */
-
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/poll.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "res_config.h"
-
-static int s = -1;		/* socket used for communications */
-static int connected = 0;	/* is the socket connected */
-static int vc = 0;		/* is the socket a virtual circuit? */
-static int af = 0;		/* address family of socket */
-static res_send_qhook Qhook = NULL;
-static res_send_rhook Rhook = NULL;
-
-
-#define CAN_RECONNECT 1
-
-#ifndef DEBUG
-#   define Dprint(cond, args) /*empty*/
-#   define DprintQ(cond, args, query, size) /*empty*/
-#   define Aerror(file, string, error, address) /*empty*/
-#   define Perror(file, string, error) /*empty*/
-#else
-#   define Dprint(cond, args) if (cond) {fprintf args;} else {}
-#   define DprintQ(cond, args, query, size) if (cond) {\
-			fprintf args;\
-			__fp_nquery(query, size, stdout);\
-		} else {}
-static char abuf[NI_MAXHOST];
-static char pbuf[NI_MAXSERV];
-static void Aerror(FILE *, char *, int, struct sockaddr *);
-static void Perror(FILE *, char *, int);
-
-    static void
-    Aerror(file, string, error, address)
-	FILE *file;
-	char *string;
-	int error;
-	struct sockaddr *address;
-    {
-	int save = errno;
-
-	if (_res.options & RES_DEBUG) {
-		if (getnameinfo(address, 0, abuf, sizeof(abuf),
-		    pbuf, sizeof(pbuf),
-		    NI_NUMERICHOST|NI_NUMERICSERV|NI_WITHSCOPEID) != 0) {
-			strncpy(abuf, "?", sizeof(abuf));
-			strncpy(pbuf, "?", sizeof(pbuf));
-		}
-		fprintf(file, "res_send: %s ([%s].%s): %s\n",
-			string, abuf, pbuf, strerror(error));
-	}
-	errno = save;
-    }
-    static void
-    Perror(file, string, error)
-	FILE *file;
-	char *string;
-	int error;
-    {
-	int save = errno;
-
-	if (_res.options & RES_DEBUG) {
-		fprintf(file, "res_send: %s: %s\n",
-			string, strerror(error));
-	}
-	errno = save;
-    }
-#endif
-
-void
-res_send_setqhook(hook)
-	res_send_qhook hook;
-{
-
-	Qhook = hook;
-}
-
-void
-res_send_setrhook(hook)
-	res_send_rhook hook;
-{
-
-	Rhook = hook;
-}
-
-static struct sockaddr * get_nsaddr(size_t);
-
-/*
- * pick appropriate nsaddr_list for use.  see res_init() for initialization.
- */
-static struct sockaddr *
-get_nsaddr(n)
-	size_t n;
-{
-
-	if (!_res.nsaddr_list[n].sin_family) {
-		/*
-		 * - _res_ext.nsaddr_list[n] holds an address that is larger
-		 *   than struct sockaddr, and
-		 * - user code did not update _res.nsaddr_list[n].
-		 */
-		return (struct sockaddr *)&_res_ext.nsaddr_list[n];
-	} else {
-		/*
-		 * - user code updated _res.nsaddr_list[n], or
-		 * - _res.nsaddr_list[n] has the same content as
-		 *   _res_ext.nsaddr_list[n].
-		 */
-		return (struct sockaddr *)&_res.nsaddr_list[n];
-	}
-}
-
-/* int
- * res_isourserver(ina)
- *	looks up "ina" in _res.ns_addr_list[]
- * returns:
- *	0  : not found
- *	>0 : found
- * author:
- *	paul vixie, 29may94
- */
-int
-res_isourserver(inp)
-	const struct sockaddr_in *inp;
-{
-	const struct sockaddr_in6 *in6p = (const struct sockaddr_in6 *)inp;
-	const struct sockaddr_in6 *srv6;
-	const struct sockaddr_in *srv;
-	int ns, ret;
-
-	ret = 0;
-	switch (inp->sin_family) {
-	case AF_INET6:
-		for (ns = 0; ns < _res.nscount; ns++) {
-			srv6 = (struct sockaddr_in6 *)get_nsaddr(ns);
-			if (srv6->sin6_family == in6p->sin6_family &&
-			    srv6->sin6_port == in6p->sin6_port &&
-			    srv6->sin6_scope_id == in6p->sin6_scope_id &&
-			    (IN6_IS_ADDR_UNSPECIFIED(&srv6->sin6_addr) ||
-			     IN6_ARE_ADDR_EQUAL(&srv6->sin6_addr,
-			         &in6p->sin6_addr))) {
-				ret++;
-				break;
-			}
-		}
-		break;
-	case AF_INET:
-		for (ns = 0; ns < _res.nscount; ns++) {
-			srv = (struct sockaddr_in *)get_nsaddr(ns);
-			if (srv->sin_family == inp->sin_family &&
-			    srv->sin_port == inp->sin_port &&
-			    (srv->sin_addr.s_addr == INADDR_ANY ||
-			     srv->sin_addr.s_addr == inp->sin_addr.s_addr)) {
-				ret++;
-				break;
-			}
-		}
-		break;
-	}
-	return (ret);
-}
-
-/* int
- * res_nameinquery(name, type, class, buf, eom)
- *	look for (name,type,class) in the query section of packet (buf,eom)
- * requires:
- *	buf + HFIXEDSZ <= eom
- * returns:
- *	-1 : format error
- *	0  : not found
- *	>0 : found
- * author:
- *	paul vixie, 29may94
- */
-int
-res_nameinquery(name, type, class, buf, eom)
-	const char *name;
-	int type, class;
-	const u_char *buf, *eom;
-{
-	const u_char *cp = buf + HFIXEDSZ;
-	int qdcount = ntohs(((HEADER*)buf)->qdcount);
-
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf, eom, cp, tname, sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom)
-			return (-1);
-		ttype = ns_get16(cp); cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (ttype == type &&
-		    tclass == class &&
-		    strcasecmp(tname, name) == 0)
-			return (1);
-	}
-	return (0);
-}
-
-/* int
- * res_queriesmatch(buf1, eom1, buf2, eom2)
- *	is there a 1:1 mapping of (name,type,class)
- *	in (buf1,eom1) and (buf2,eom2)?
- * returns:
- *	-1 : format error
- *	0  : not a 1:1 mapping
- *	>0 : is a 1:1 mapping
- * author:
- *	paul vixie, 29may94
- */
-int
-res_queriesmatch(buf1, eom1, buf2, eom2)
-	const u_char *buf1, *eom1;
-	const u_char *buf2, *eom2;
-{
-	const u_char *cp = buf1 + HFIXEDSZ;
-	int qdcount = ntohs(((HEADER*)buf1)->qdcount);
-
-	if (buf1 + HFIXEDSZ > eom1 || buf2 + HFIXEDSZ > eom2)
-		return (-1);
-
-	/*
-	 * Only header section present in replies to
-	 * dynamic update packets.
-	 */
-	if ( (((HEADER *)buf1)->opcode == ns_o_update) &&
-	     (((HEADER *)buf2)->opcode == ns_o_update) )
-		return (1);
-
-	if (qdcount != ntohs(((HEADER*)buf2)->qdcount))
-		return (0);
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf1, eom1, cp, tname, sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom1)
-			return (-1);
-		ttype = ns_get16(cp);	cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (!res_nameinquery(tname, ttype, tclass, buf2, eom2))
-			return (0);
-	}
-	return (1);
-}
-
-int
-res_send(buf, buflen, ans, anssiz)
-	const u_char *buf;
-	int buflen;
-	u_char *ans;
-	int anssiz;
-{
-	HEADER *hp = (HEADER *) buf;
-	HEADER *anhp = (HEADER *) ans;
-	int gotsomewhere, connreset, terrno, try, v_circuit, resplen, ns, n;
-	int kq;
-	u_int badns;	/* XXX NSMAX can't exceed #/bits in this variable */
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		/* errno should have been set by res_init() in this case. */
-		return (-1);
-	}
-	if (anssiz < HFIXEDSZ) {
-		errno = EINVAL;
-		return (-1);
-	}
-	DprintQ((_res.options & RES_DEBUG) || (_res.pfcode & RES_PRF_QUERY),
-		(stdout, ";; res_send()\n"), buf, buflen);
-	v_circuit = (_res.options & RES_USEVC) || buflen > PACKETSZ;
-	gotsomewhere = 0;
-	connreset = 0;
-	terrno = ETIMEDOUT;
-	badns = 0;
-
-	/*
-	 * Send request, RETRY times, or until successful
-	 */
-	for (try = 0; try < _res.retry; try++) {
-	    for (ns = 0; ns < _res.nscount; ns++) {
-		struct sockaddr *nsap = get_nsaddr(ns);
-		socklen_t salen;
-
-		if (nsap->sa_family == AF_INET6)
-			salen = sizeof(struct sockaddr_in6);
-		else if (nsap->sa_family == AF_INET)
-			salen = sizeof(struct sockaddr_in);
-		else
-			salen = 0;	/*unknown, die on connect*/
-
-    same_ns:
-		if (badns & (1 << ns)) {
-			res_close();
-			goto next_ns;
-		}
-
-		if (Qhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*Qhook)((struct sockaddr_in **)&nsap,
-					       &buf, &buflen,
-					       ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-					done = 1;
-					break;
-				case res_nextns:
-					res_close();
-					goto next_ns;
-				case res_done:
-					close(kq);
-					return (resplen);
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					close(kq);
-					return (-1);
-				}
-			} while (!done);
-		}
-
-		Dprint((_res.options & RES_DEBUG) &&
-		       getnameinfo(nsap, salen, abuf, sizeof(abuf),
-			   NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID) == 0,
-		       (stdout, ";; Querying server (# %d) address = %s\n",
-			ns + 1, abuf));
-
-		if (v_circuit) {
-			int truncated;
-			u_short len;
-			u_char *cp;
-			ssize_t rc;
-
-			/*
-			 * Use virtual circuit;
-			 * at most one attempt per server.
-			 */
-			try = _res.retry;
-			truncated = 0;
-			if (s < 0 || !vc || hp->opcode == ns_o_update ||
-			    af != nsap->sa_family) {
-				if (s >= 0)
-					res_close();
-
-				af = nsap->sa_family;
-				s = socket(af, SOCK_STREAM, 0);
-				if (s < 0) {
-					terrno = errno;
-					Perror(stderr, "socket(vc)", errno);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-				errno = 0;
-				if (connect(s, nsap, salen) < 0) {
-					terrno = errno;
-					Aerror(stderr, "connect/vc",
-					       errno, nsap);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-				vc = 1;
-			}
-			/*
-			 * Send length & message
-			 */
-			putshort((u_short)buflen, (u_char*)&len);
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-			{
-			struct iovec iov[2];
-			iov[0].iov_base = (caddr_t)&len;
-			iov[0].iov_len = INT16SZ;
-			iov[1].iov_base = (caddr_t)buf;
-			iov[1].iov_len = buflen;
-			rc = writev(s, iov, 2);
-			}
-#else /* EL/IX level 1 */
-			{
-			char *tmpbuf;
-			tmpbuf = malloc (INT16SZ + buflen);
-			memcpy (tmpbuf, &len, INT16SZ);
-			memcpy (tmpbuf + INT16SZ, buf, buflen);
-			rc = write (s, tmpbuf, INT16SZ + buflen);
-			}
-#endif /* EL/IX level 1 */
-			if (rc != (INT16SZ + buflen)) {
-				terrno = errno;
-				Perror(stderr, "write failed", errno);
-				badns |= (1 << ns);
-				res_close();
-				goto next_ns;
-			}
-			/*
-			 * Receive length & response
-			 */
- read_len:
-			cp = ans;
-			len = INT16SZ;
-			while ((n = read(s, (char *)cp, (int)len)) > 0) {
-				cp += n;
-				if ((len -= n) <= 0)
-					break;
-			}
-			if (n <= 0) {
-				terrno = errno;
-				Perror(stderr, "read failed", errno);
-				res_close();
-				/*
-				 * A long running process might get its TCP
-				 * connection reset if the remote server was
-				 * restarted.  Requery the server instead of
-				 * trying a new one.  When there is only one
-				 * server, this means that a query might work
-				 * instead of failing.  We only allow one reset
-				 * per query to prevent looping.
-				 */
-				if (terrno == ECONNRESET && !connreset) {
-					connreset = 1;
-					res_close();
-					goto same_ns;
-				}
-				res_close();
-				goto next_ns;
-			}
-			resplen = ns_get16(ans);
-			if (resplen > anssiz) {
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; response truncated\n")
-				       );
-				truncated = 1;
-				len = anssiz;
-			} else
-				len = resplen;
-			if (len < HFIXEDSZ) {
-				/*
-				 * Undersized message.
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; undersized: %d\n", len));
-				terrno = EMSGSIZE;
-				badns |= (1 << ns);
-				res_close();
-				goto next_ns;
-			}
-			cp = ans;
-			while (len != 0 &&
-			       (n = read(s, (char *)cp, (int)len)) > 0) {
-				cp += n;
-				len -= n;
-			}
-			if (n <= 0) {
-				terrno = errno;
-				Perror(stderr, "read(vc)", errno);
-				res_close();
-				goto next_ns;
-			}
-			if (truncated) {
-				/*
-				 * Flush rest of answer
-				 * so connection stays in synch.
-				 */
-				anhp->tc = 1;
-				len = resplen - anssiz;
-				while (len != 0) {
-					char junk[PACKETSZ];
-
-					n = (len > sizeof(junk)
-					     ? sizeof(junk)
-					     : len);
-					if ((n = read(s, junk, n)) > 0)
-						len -= n;
-					else
-						break;
-				}
-			}
-			/*
-			 * The calling applicating has bailed out of
-			 * a previous call and failed to arrange to have
-			 * the circuit closed or the server has got
-			 * itself confused. Anyway drop the packet and
-			 * wait for the correct one.
-			 */
-			if (hp->id != anhp->id) {
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; old answer (unexpected):\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto read_len;
-			}
-		} else {
-			/*
-			 * Use datagrams.
-			 */
-			struct pollfd pfd[1];
-			int ptimeout;
-			struct timespec ts;
-			struct timeval timeout, ctv;
-			struct sockaddr_storage from;
-			int fromlen;
-
-			if (s < 0 || vc || af != nsap->sa_family) {
-				if (vc)
-					res_close();
-				af = nsap->sa_family;
-				s = socket(af, SOCK_DGRAM, 0);
-				if (s < 0) {
-#ifndef CAN_RECONNECT
- bad_dg_sock:
-#endif
-					terrno = errno;
-					Perror(stderr, "socket(dg)", errno);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-				connected = 0;
-			}
-#ifndef CANNOT_CONNECT_DGRAM
-			/*
-			 * On a 4.3BSD+ machine (client and server,
-			 * actually), sending to a nameserver datagram
-			 * port with no nameserver will cause an
-			 * ICMP port unreachable message to be returned.
-			 * If our datagram socket is "connected" to the
-			 * server, we get an ECONNREFUSED error on the next
-			 * socket operation, and select returns if the
-			 * error message is received.  We can thus detect
-			 * the absence of a nameserver without timing out.
-			 * If we have sent queries to at least two servers,
-			 * however, we don't want to remain connected,
-			 * as we wish to receive answers from the first
-			 * server to respond.
-			 *
-			 * When the option "insecure1" is specified, we'd
-			 * rather expect to see responses from an "unknown"
-			 * address.  In order to let the kernel accept such
-			 * responses, do not connect the socket here.
-			 * XXX: or do we need an explicit option to disable
-			 * connecting?
-			 */
-			if (!(_res.options & RES_INSECURE1) &&
-			    (_res.nscount == 1 || (try == 0 && ns == 0))) {
-				/*
-				 * Connect only if we are sure we won't
-				 * receive a response from another server.
-				 */
-				if (!connected) {
-					if (connect(s, nsap, salen) < 0) {
-						Aerror(stderr,
-						       "connect(dg)",
-						       errno, nsap);
-						badns |= (1 << ns);
-						res_close();
-						goto next_ns;
-					}
-					connected = 1;
-				}
-
-				if (send(s, (char*)buf, buflen, 0) != buflen) {
-					Perror(stderr, "send", errno);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-			} else {
-				/*
-				 * Disconnect if we want to listen
-				 * for responses from more than one server.
-				 */
-				if (connected) {
-#ifdef CAN_RECONNECT
-					/* XXX: any errornous address */
-					struct sockaddr_in no_addr;
-
-					no_addr.sin_family = AF_INET;
-					no_addr.sin_addr.s_addr = INADDR_ANY;
-					no_addr.sin_port = 0;
-					(void) connect(s,
-						       (struct sockaddr *)
-						        &no_addr,
-						       sizeof no_addr);
-#else
-					int s1 = socket(af, SOCK_DGRAM,0);
-					if (s1 < 0)
-						goto bad_dg_sock;
-					(void)_dup2(s1, s);
-					(void)close(s1);
-					Dprint(_res.options & RES_DEBUG,
-						(stdout, ";; new DG socket\n"))
-#endif /* CAN_RECONNECT */
-					connected = 0;
-					errno = 0;
-				}
-#endif /* !CANNOT_CONNECT_DGRAM */
-				if (sendto(s, (char*)buf, buflen, 0,
-					   nsap, salen) != buflen) {
-					Aerror(stderr, "sendto", errno, nsap);
-					badns |= (1 << ns);
-					res_close();
-					goto next_ns;
-				}
-#ifndef CANNOT_CONNECT_DGRAM
-			}
-#endif /* !CANNOT_CONNECT_DGRAM */
-
-			/*
-			 * Wait for reply
-			 */
-
-			timeout.tv_sec = (_res.retrans << try);
-			if (try > 0)
-				timeout.tv_sec /= _res.nscount;
-			if ((long) timeout.tv_sec <= 0)
-				timeout.tv_sec = 1;
-			timeout.tv_usec = 0;
-			TIMEVAL_TO_TIMESPEC(&timeout, &ts);
-			(void) gettimeofday(&ctv, NULL);
-			timeradd(&timeout, &ctv, &timeout);
-
-		       /* Convert struct timespec in milliseconds.  */
-		       ptimeout = timeout.tv_sec * 1000 + timeout.tv_usec / 1000;
-    wait:
-		       pfd[0].fd = s;
-		       pfd[0].events = POLLIN;
-		       n = poll (pfd, 1, ptimeout);
-
-			if (s < 0) {
-				Perror(stderr, "s out-of-bounds", EMFILE);
-				res_close();
-				goto next_ns;
-			}
-
-			if (n < 0) {
-				if (errno == EINTR) {
-					(void) gettimeofday(&ctv, NULL);
-					if (timercmp(&ctv, &timeout, <)) {
-						timersub(&timeout, &ctv, &ctv);
-						TIMEVAL_TO_TIMESPEC(&ctv, &ts);
-						goto wait;
-					}
-				}
-				Perror(stderr, "poll", errno);
-				res_close();
-				goto next_ns;
-			}
-
-			if (n == 0) {
-				/*
-				 * timeout
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; timeout\n"));
-				gotsomewhere = 1;
-				res_close();
-				goto next_ns;
-			}
-			errno = 0;
-			fromlen = sizeof(from);
-			resplen = recvfrom(s, (char*)ans, anssiz, 0,
-					   (struct sockaddr *)&from, &fromlen);
-			if (resplen <= 0) {
-				Perror(stderr, "recvfrom", errno);
-				res_close();
-				goto next_ns;
-			}
-			gotsomewhere = 1;
-			if (resplen < HFIXEDSZ) {
-				/*
-				 * Undersized message.
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; undersized: %d\n",
-					resplen));
-				terrno = EMSGSIZE;
-				badns |= (1 << ns);
-				res_close();
-				goto next_ns;
-			}
-			if (hp->id != anhp->id) {
-				/*
-				 * response from old query, ignore it.
-				 * XXX - potential security hazard could
-				 *	 be detected here.
-				 */
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; old answer:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto wait;
-			}
-#ifdef CHECK_SRVR_ADDR
-			if (!(_res.options & RES_INSECURE1) &&
-			    !res_isourserver((struct sockaddr_in *)&from)) {
-				/*
-				 * response from wrong server? ignore it.
-				 * XXX - potential security hazard could
-				 *	 be detected here.
-				 */
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; not our server:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto wait;
-			}
-#endif
-			if (!(_res.options & RES_INSECURE2) &&
-			    !res_queriesmatch(buf, buf + buflen,
-					      ans, ans + anssiz)) {
-				/*
-				 * response contains wrong query? ignore it.
-				 * XXX - potential security hazard could
-				 *	 be detected here.
-				 */
-				DprintQ((_res.options & RES_DEBUG) ||
-					(_res.pfcode & RES_PRF_REPLY),
-					(stdout, ";; wrong query name:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				goto wait;
-			}
-			if (anhp->rcode == SERVFAIL ||
-			    anhp->rcode == NOTIMP ||
-			    anhp->rcode == REFUSED) {
-				DprintQ(_res.options & RES_DEBUG,
-					(stdout, "server rejected query:\n"),
-					ans, (resplen>anssiz)?anssiz:resplen);
-				badns |= (1 << ns);
-				res_close();
-				/* don't retry if called from dig */
-				if (!_res.pfcode)
-					goto next_ns;
-			}
-			if (!(_res.options & RES_IGNTC) && anhp->tc) {
-				/*
-				 * get rest of answer;
-				 * use TCP with same server.
-				 */
-				Dprint(_res.options & RES_DEBUG,
-				       (stdout, ";; truncated answer\n"));
-				v_circuit = 1;
-				res_close();
-				goto same_ns;
-			}
-		} /*if vc/dg*/
-		Dprint((_res.options & RES_DEBUG) ||
-		       ((_res.pfcode & RES_PRF_REPLY) &&
-			(_res.pfcode & RES_PRF_HEAD1)),
-		       (stdout, ";; got answer:\n"));
-#if 0
-		DprintQ((_res.options & RES_DEBUG) ||
-			(_res.pfcode & RES_PRF_REPLY),
-			(stdout, ""),
-			ans, (resplen>anssiz)?anssiz:resplen);
-#endif
-		/*
-		 * If using virtual circuits, we assume that the first server
-		 * is preferred over the rest (i.e. it is on the local
-		 * machine) and only keep that one open.
-		 * If we have temporarily opened a virtual circuit,
-		 * or if we haven't been asked to keep a socket open,
-		 * close the socket.
-		 */
-		if ((v_circuit && (!(_res.options & RES_USEVC) || ns != 0)) ||
-		    !(_res.options & RES_STAYOPEN)) {
-			res_close();
-		}
-		if (Rhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*Rhook)((struct sockaddr_in *)nsap,
-					       buf, buflen,
-					       ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-				case res_done:
-					done = 1;
-					break;
-				case res_nextns:
-					res_close();
-					goto next_ns;
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					close(kq);
-					return (-1);
-				}
-			} while (!done);
-
-		}
-		close(kq);
-		return (resplen);
-    next_ns: ;
-	   } /*foreach ns*/
-	} /*foreach retry*/
-	res_close();
-	close(kq);
-	if (!v_circuit) {
-		if (!gotsomewhere)
-			errno = ECONNREFUSED;	/* no nameservers found */
-		else
-			errno = ETIMEDOUT;	/* no answer obtained */
-	} else
-		errno = terrno;
-	return (-1);
-}
-
-/*
- * This routine is for closing the socket if a virtual circuit is used and
- * the program wants to close it.  This provides support for endhostent()
- * which expects to close the socket.
- *
- * This routine is not expected to be user visible.
- */
-void
-res_close()
-{
-	if (s >= 0) {
-		(void)close(s);
-		s = -1;
-		connected = 0;
-		vc = 0;
-		af = 0;
-	}
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <resolv.h>.
- */
-#undef res_close
-__weak_reference(__res_close, _res_close);
-#undef res_send
-__weak_reference(__res_send, res_send);
diff --git a/newlib/libc/sys/linux/net/res_update.c b/newlib/libc/sys/linux/net/res_update.c
deleted file mode 100644
index b427bf8..0000000
--- a/newlib/libc/sys/linux/net/res_update.c
+++ /dev/null
@@ -1,515 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Based on the Dynamic DNS reference implementation by Viraj Bais
- * <viraj_bais@ccm.fm.intel.com>
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <machine/endian.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <limits.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * Separate a linked list of records into groups so that all records
- * in a group will belong to a single zone on the nameserver.
- * Create a dynamic update packet for each zone and send it to the
- * nameservers for that zone, and await answer.
- * Abort if error occurs in updating any zone.
- * Return the number of zones updated on success, < 0 on error.
- *
- * On error, caller must deal with the unsynchronized zones
- * eg. an A record might have been successfully added to the forward
- * zone but the corresponding PTR record would be missing if error
- * was encountered while updating the reverse zone.
- */
-
-#define NSMAX 16
-
-struct ns1 {
-	char nsname[MAXDNAME];
-	struct in_addr nsaddr1;
-};
-
-struct zonegrp {
-	char 		z_origin[MAXDNAME];
-	int16_t		z_class;
-	char		z_soardata[MAXDNAME + 5 * INT32SZ];
-	struct ns1 	z_ns[NSMAX];
-	int		z_nscount;
-	ns_updrec *	z_rr;
-	struct zonegrp *z_next;
-};
-
-
-int
-res_update(ns_updrec *rrecp_in) {
-	ns_updrec *rrecp, *tmprrecp;
-	u_char buf[PACKETSZ], answer[PACKETSZ], packet[2*PACKETSZ];
-	char name[MAXDNAME], zname[MAXDNAME], primary[MAXDNAME],
-	     mailaddr[MAXDNAME];
-	u_char soardata[2*MAXCDNAME+5*INT32SZ];
-	char *dname, *svdname, *cp1, *target;
-	u_char *cp, *eom;
-	HEADER *hp = (HEADER *) answer;
-	struct zonegrp *zptr = NULL, *tmpzptr, *prevzptr, *zgrp_start = NULL;
-	int i, j, k = 0, n, ancount, nscount, arcount, rcode, rdatasize,
-	    newgroup, done, myzone, seen_before, numzones = 0;
-	u_int16_t dlen, class, qclass, type, qtype;
-	u_int32_t ttl;
-
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
-		h_errno = NETDB_INTERNAL;
-		return (-1);
-	}
-
-	for (rrecp = rrecp_in; rrecp; rrecp = rrecp->r_next) {
-		dname = rrecp->r_dname;
-		n = strlen(dname);
-		if (dname[n-1] == '.')
-			dname[n-1] = '\0';
-		qtype = T_SOA;
-		qclass = rrecp->r_class;
-		done = 0;
-		seen_before = 0;
-
-		while (!done && dname) {
-		    if (qtype == T_SOA) {
-			for (tmpzptr = zgrp_start;
-			     tmpzptr && !seen_before;
-			     tmpzptr = tmpzptr->z_next) {
-				if (strcasecmp(dname,
-					       tmpzptr->z_origin) == 0 &&
-				    tmpzptr->z_class == qclass)
-					seen_before++;
-				for (tmprrecp = tmpzptr->z_rr;
-				     tmprrecp && !seen_before;
-				     tmprrecp = tmprrecp->r_grpnext)
-				if (strcasecmp(dname, tmprrecp->r_dname) == 0
-				    && tmprrecp->r_class == qclass) {
-					seen_before++;
-					break;
-				}
-				if (seen_before) {
-					/*
-					 * Append to the end of
-					 * current group.
-					 */
-					for (tmprrecp = tmpzptr->z_rr;
-					     tmprrecp->r_grpnext;
-					     tmprrecp = tmprrecp->r_grpnext)
-						(void)NULL;
-					tmprrecp->r_grpnext = rrecp;
-					rrecp->r_grpnext = NULL;
-					done = 1;
-					break;
-				}
-			}
-		} else if (qtype == T_A) {
-		    for (tmpzptr = zgrp_start;
-			 tmpzptr && !done;
-			 tmpzptr = tmpzptr->z_next)
-			    for (i = 0; i < tmpzptr->z_nscount; i++)
-				if (tmpzptr->z_class == qclass &&
-				    strcasecmp(tmpzptr->z_ns[i].nsname,
-					       dname) == 0 &&
-				    tmpzptr->z_ns[i].nsaddr1.s_addr != 0) {
-					zptr->z_ns[k].nsaddr1.s_addr =
-					 tmpzptr->z_ns[i].nsaddr1.s_addr;
-					done = 1;
-					break;
-				}
-		}
-		if (done)
-		    break;
-		n = res_mkquery(QUERY, dname, qclass, qtype, NULL,
-				0, NULL, buf, sizeof buf);
-		if (n <= 0) {
-		    fprintf(stderr, "res_update: mkquery failed\n");
-		    return (n);
-		}
-		n = res_send(buf, n, answer, sizeof answer);
-		if (n < 0) {
-		    fprintf(stderr, "res_update: send error for %s\n",
-			    rrecp->r_dname);
-		    return (n);
-		}
-		if (n < HFIXEDSZ)
-			return (-1);
-		ancount = ntohs(hp->ancount);
-		nscount = ntohs(hp->nscount);
-		arcount = ntohs(hp->arcount);
-		rcode = hp->rcode;
-		cp = answer + HFIXEDSZ;
-		eom = answer + n;
-		/* skip the question section */
-		n = dn_skipname(cp, eom);
-		if (n < 0 || cp + n + 2 * INT16SZ > eom)
-			return (-1);
-		cp += n + 2 * INT16SZ;
-
-		if (qtype == T_SOA) {
-		    if (ancount == 0 && nscount == 0 && arcount == 0) {
-			/*
-			 * if (rcode == NOERROR) then the dname exists but
-			 * has no soa record associated with it.
-			 * if (rcode == NXDOMAIN) then the dname does not
-			 * exist and the server is replying out of NCACHE.
-			 * in either case, proceed with the next try
-			 */
-			dname = strchr(dname, '.');
-			if (dname != NULL)
-				dname++;
-			continue;
-		    } else if ((rcode == NOERROR || rcode == NXDOMAIN) &&
-			       ancount == 0 &&
-			       nscount == 1 && arcount == 0) {
-			/*
-			 * name/data does not exist, soa record supplied in the
-			 * authority section
-			 */
-			/* authority section must contain the soa record */
-			if ((n = dn_expand(answer, eom, cp, zname,
-					sizeof zname)) < 0)
-			    return (n);
-			cp += n;
-			if (cp + 2 * INT16SZ > eom)
-				return (-1);
-			GETSHORT(type, cp);
-			GETSHORT(class, cp);
-			if (type != T_SOA || class != qclass) {
-			    fprintf(stderr, "unknown answer\n");
-			    return (-1);
-			}
-			myzone = 0;
-			svdname = dname;
-			while (dname)
-			    if (strcasecmp(dname, zname) == 0) {
-				myzone = 1;
-				break;
-			    } else if ((dname = strchr(dname, '.')) != NULL)
-				dname++;
-			if (!myzone) {
-			    dname = strchr(svdname, '.');
-			    if (dname != NULL)
-				dname++;
-			    continue;
-			}
-			nscount = 0;
-			/* fallthrough */
-		    } else if (rcode == NOERROR && ancount == 1) {
-			/*
-			 * found the zone name
-			 * new servers will supply NS records for the zone
-			 * in authority section and A records for those 
-			 * nameservers in the additional section
-			 * older servers have to be explicitly queried for
-			 * NS records for the zone
-			 */
-			/* answer section must contain the soa record */
-			if ((n = dn_expand(answer, eom, cp, zname,
-			 	       	   sizeof zname)) < 0)
-				return (n);
-			else
-				cp += n;
-			if (cp + 2 * INT16SZ > eom)
-				return (-1);
-			GETSHORT(type, cp);
-			GETSHORT(class, cp);
-			if (type == T_CNAME) {
-				dname = strchr(dname, '.');
-				if (dname != NULL)
-					dname++;
-				continue;
-			}
-			if (strcasecmp(dname, zname) != 0 ||
-			    type != T_SOA ||
-			    class != rrecp->r_class) {
-				fprintf(stderr, "unknown answer\n");
-				return (-1);
-			}
-			/* FALLTHROUGH */
-		    } else {
-			fprintf(stderr,
-		"unknown response: ans=%d, auth=%d, add=%d, rcode=%d\n",
-				ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		    if (cp + INT32SZ + INT16SZ > eom)
-			    return (-1);
-		    /* continue processing the soa record */
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			    return (-1);
-		    newgroup = 1;
-		    zptr = zgrp_start;
-		    prevzptr = NULL;
-		    while (zptr) {
-			if (strcasecmp(zname, zptr->z_origin) == 0 &&
-			    type == T_SOA && class == qclass) {
-				newgroup = 0;
-				break;
-			}
-			prevzptr = zptr;
-			zptr = zptr->z_next;
-		    }
-		    if (!newgroup) {
-			for (tmprrecp = zptr->z_rr;
-			     tmprrecp->r_grpnext;
-			     tmprrecp = tmprrecp->r_grpnext)
-				    ;
-			tmprrecp->r_grpnext = rrecp;
-			rrecp->r_grpnext = NULL;
-			done = 1;
-			cp += dlen;
-			break;
-		    } else {
-			if ((n = dn_expand(answer, eom, cp, primary,
-				       	   sizeof primary)) < 0)
-			    return (n);
-			cp += n;
-			/* 
-			 * We don't have to bounds check here because the
-			 * next use of 'cp' is in dn_expand().
-			 */
-			cp1 = (char *)soardata;
-			strcpy(cp1, primary);
-			cp1 += strlen(cp1) + 1;
-			if ((n = dn_expand(answer, eom, cp, mailaddr,
-				       	   sizeof mailaddr)) < 0)
-			    return (n);
-			cp += n;
-			strcpy(cp1, mailaddr);
-			cp1 += strlen(cp1) + 1;
-			if (cp + 5*INT32SZ > eom)
-				return (-1);
-			memcpy(cp1, cp, 5*INT32SZ);
-			cp += 5*INT32SZ;
-			cp1 += 5*INT32SZ;
-			rdatasize = (u_char *)cp1 - soardata;
-			zptr = calloc(1, sizeof(struct zonegrp));
-			if (zptr == NULL)
-                	    return (-1);
-			if (zgrp_start == NULL)
-			    zgrp_start = zptr;
-			else
-			    prevzptr->z_next = zptr;
-			zptr->z_rr = rrecp;
-			rrecp->r_grpnext = NULL;
-			strcpy(zptr->z_origin, zname);
-			zptr->z_class = class;
-			memcpy(zptr->z_soardata, soardata, rdatasize);
-			/* fallthrough to process NS and A records */
-		    }
-		} else if (qtype == T_NS) {
-		    if (rcode == NOERROR && ancount > 0) {
-			strcpy(zname, dname);
-			for (zptr = zgrp_start; zptr; zptr = zptr->z_next) {
-			    if (strcasecmp(zname, zptr->z_origin) == 0)
-				break;
-			}
-			if (zptr == NULL)
-			    /* should not happen */
-			    return (-1);
-			if (nscount > 0) {
-			    /*
-			     * answer and authority sections contain
-			     * the same information, skip answer section
-			     */
-			    for (j = 0; j < ancount; j++) {
-				n = dn_skipname(cp, eom);
-				if (n < 0)
-					return (-1);
-				n += 2*INT16SZ + INT32SZ;
-				if (cp + n + INT16SZ > eom)
-					return (-1);
-				cp += n;
-				GETSHORT(dlen, cp);
-				cp += dlen;
-			    }
-			} else
-			    nscount = ancount;
-			/* fallthrough to process NS and A records */
-		    } else {
-			fprintf(stderr, "cannot determine nameservers for %s:\
-ans=%d, auth=%d, add=%d, rcode=%d\n",
-				dname, ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		} else if (qtype == T_A) {
-		    if (rcode == NOERROR && ancount > 0) {
-			arcount = ancount;
-			ancount = nscount = 0;
-			/* fallthrough to process A records */
-		    } else {
-			fprintf(stderr, "cannot determine address for %s:\
-ans=%d, auth=%d, add=%d, rcode=%d\n",
-				dname, ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		}
-		/* process NS records for the zone */
-		j = 0;
-		for (i = 0; i < nscount; i++) {
-		    if ((n = dn_expand(answer, eom, cp, name,
-					sizeof name)) < 0)
-			return (n);
-		    cp += n;
-		    if (cp + 3 * INT16SZ + INT32SZ > eom)
-			    return (-1);
-		    GETSHORT(type, cp);
-		    GETSHORT(class, cp);
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			return (-1);
-		    if (strcasecmp(name, zname) == 0 &&
-			type == T_NS && class == qclass) {
-				if ((n = dn_expand(answer, eom, cp,
-						   name, sizeof name)) < 0)
-					return (n);
-			    target = zptr->z_ns[j++].nsname;
-			    strcpy(target, name);
-		    }
-		    cp += dlen;
-		}
-		if (zptr->z_nscount == 0)
-		    zptr->z_nscount = j;
-		/* get addresses for the nameservers */
-		for (i = 0; i < arcount; i++) {
-		    if ((n = dn_expand(answer, eom, cp, name,
-					sizeof name)) < 0)
-			return (n);
-		    cp += n;
-		    if (cp + 3 * INT16SZ + INT32SZ > eom)
-			return (-1);
-		    GETSHORT(type, cp);
-		    GETSHORT(class, cp);
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			    return (-1);
-		    if (type == T_A && dlen == INT32SZ && class == qclass) {
-			for (j = 0; j < zptr->z_nscount; j++)
-			    if (strcasecmp(name, zptr->z_ns[j].nsname) == 0) {
-				memcpy(&zptr->z_ns[j].nsaddr1.s_addr, cp,
-				       INT32SZ);
-				break;
-			    }
-		    }
-		    cp += dlen;
-		}
-		if (zptr->z_nscount == 0) {
-		    dname = zname;
-		    qtype = T_NS;
-		    continue;
-		}
-		done = 1;
-		for (k = 0; k < zptr->z_nscount; k++)
-		    if (zptr->z_ns[k].nsaddr1.s_addr == 0) {
-			done = 0;
-			dname = zptr->z_ns[k].nsname;
-			qtype = T_A;
-		    }
-
- 	    } /* while */
-	}
-
-	_res.options |= RES_DEBUG;
-	for (zptr = zgrp_start; zptr; zptr = zptr->z_next) {
-
-		/* append zone section */
-		rrecp = res_mkupdrec(ns_s_zn, zptr->z_origin,
-				     zptr->z_class, ns_t_soa, 0);
-		if (rrecp == NULL) {
-			fprintf(stderr, "saverrec error\n");
-			fflush(stderr);
-			return (-1);
-		}
-		rrecp->r_grpnext = zptr->z_rr;
-		zptr->z_rr = rrecp;
-
-		n = res_mkupdate(zptr->z_rr, packet, sizeof packet);
-		if (n < 0) {
-			fprintf(stderr, "res_mkupdate error\n");
-			fflush(stderr);
-			return (-1);
-		} else
-			fprintf(stdout, "res_mkupdate: packet size = %d\n", n);
-
-		/*
-		 * Override the list of NS records from res_init() with
-		 * the authoritative nameservers for the zone being updated.
-		 * Sort primary to be the first in the list of nameservers.
-		 */
-		for (i = 0; i < zptr->z_nscount; i++) {
-			if (strcasecmp(zptr->z_ns[i].nsname,
-				       zptr->z_soardata) == 0) {
-				struct in_addr tmpaddr;
-
-				if (i != 0) {
-					strcpy(zptr->z_ns[i].nsname,
-					       zptr->z_ns[0].nsname);
-					strcpy(zptr->z_ns[0].nsname,
-					       zptr->z_soardata);
-					tmpaddr = zptr->z_ns[i].nsaddr1;
-					zptr->z_ns[i].nsaddr1 =
-						zptr->z_ns[0].nsaddr1;
-					zptr->z_ns[0].nsaddr1 = tmpaddr;
-				}
-				break;
-			}
-		}
-		for (i = 0; i < MAXNS; i++) {
-			_res.nsaddr_list[i].sin_addr = zptr->z_ns[i].nsaddr1;
-			_res.nsaddr_list[i].sin_family = AF_INET;
-			_res.nsaddr_list[i].sin_port = htons(NAMESERVER_PORT);
-		}
-		_res.nscount = (zptr->z_nscount < MAXNS) ? 
-					zptr->z_nscount : MAXNS;
-		n = res_send(packet, n, answer, sizeof(answer));
-		if (n < 0) {
-			fprintf(stderr, "res_send: send error, n=%d\n", n);
-			break;
-		} else
-			numzones++;
-	}
-
-	/* free malloc'ed memory */
-	while(zgrp_start) {
-		zptr = zgrp_start;
-		zgrp_start = zgrp_start->z_next;
-		res_freeupdrec(zptr->z_rr);  /* Zone section we allocated. */
-		free((char *)zptr);
-	}
-
-	return (numzones);
-}
diff --git a/newlib/libc/sys/linux/net/resolver.3 b/newlib/libc/sys/linux/net/resolver.3
deleted file mode 100644
index 1417598..0000000
--- a/newlib/libc/sys/linux/net/resolver.3
+++ /dev/null
@@ -1,422 +0,0 @@
-.\" Copyright (c) 1985, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)resolver.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.21 2001/10/01 16:08:56 ru Exp $
-.\"
-.Dd June 4, 1993
-.Dt RESOLVER 3
-.Os
-.Sh NAME
-.Nm res_query ,
-.Nm res_search ,
-.Nm res_mkquery ,
-.Nm res_send ,
-.Nm res_init ,
-.Nm dn_comp ,
-.Nm dn_expand ,
-.Nm dn_skipname ,
-.Nm ns_get16 ,
-.Nm ns_get32 ,
-.Nm ns_put16 ,
-.Nm ns_put32
-.Nd resolver routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In netinet/in.h
-.In arpa/nameser.h
-.In resolv.h
-.Ft int
-.Fo res_query
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fo res_search
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fo res_mkquery
-.Fa "int op"
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "const u_char *data"
-.Fa "int datalen"
-.Fa "const u_char *newrr_in"
-.Fa "u_char *buf"
-.Fa "int buflen"
-.Fc
-.Ft int
-.Fo res_send
-.Fa "const u_char *msg"
-.Fa "int msglen"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fn res_init
-.Ft int
-.Fo dn_comp
-.Fa "const char *exp_dn"
-.Fa "u_char *comp_dn"
-.Fa "int length"
-.Fa "u_char **dnptrs"
-.Fa "u_char **lastdnptr"
-.Fc
-.Ft int
-.Fo dn_expand
-.Fa "const u_char *msg"
-.Fa "const u_char *eomorig"
-.Fa "const u_char *comp_dn"
-.Fa "char *exp_dn"
-.Fa "int length"
-.Fc
-.Ft int
-.Fn dn_skipname "const u_char *comp_dn" "const u_char *eom"
-.Ft u_int
-.Fn ns_get16 "const u_char *src"
-.Ft u_long
-.Fn ns_get32 "const u_char *src"
-.Ft void
-.Fn ns_put16 "u_int src" "u_char *dst"
-.Ft void
-.Fn ns_put32 "u_long src" "u_char *dst"
-.Sh DESCRIPTION
-These routines are used for making, sending and interpreting
-query and reply messages with Internet domain name servers.
-.Pp
-Global configuration and state information that is used by the
-resolver routines is kept in the structure
-.Em _res .
-Most of the values have reasonable defaults and can be ignored.
-Options
-stored in
-.Em _res.options
-are defined in
-.Pa resolv.h
-and are as follows.
-Options are stored as a simple bit mask containing the bitwise ``or''
-of the options enabled.
-.Bl -tag -width RES_USE_INET6
-.It Dv RES_INIT
-True if the initial name server address and default domain name are
-initialized (i.e.,
-.Fn res_init
-has been called).
-.It Dv RES_DEBUG
-Print debugging messages.
-.It Dv RES_AAONLY
-Accept authoritative answers only.
-With this option,
-.Fn res_send
-should continue until it finds an authoritative answer or finds an error.
-Currently this is not implemented.
-.It Dv RES_USEVC
-Use
-.Tn TCP
-connections for queries instead of
-.Tn UDP
-datagrams.
-.It Dv RES_STAYOPEN
-Used with
-.Dv RES_USEVC
-to keep the
-.Tn TCP
-connection open between
-queries.
-This is useful only in programs that regularly do many queries.
-.Tn UDP
-should be the normal mode used.
-.It Dv RES_IGNTC
-Unused currently (ignore truncation errors, i.e., don't retry with
-.Tn TCP ) .
-.It Dv RES_RECURSE
-Set the recursion-desired bit in queries.
-This is the default.
-.Pf ( Fn res_send
-does not do iterative queries and expects the name server
-to handle recursion.)
-.It Dv RES_DEFNAMES
-If set,
-.Fn res_search
-will append the default domain name to single-component names
-(those that do not contain a dot).
-This option is enabled by default.
-.It Dv RES_DNSRCH
-If this option is set,
-.Fn res_search
-will search for host names in the current domain and in parent domains; see
-.Xr hostname 7 .
-This is used by the standard host lookup routine
-.Xr gethostbyname 3 .
-This option is enabled by default.
-.It Dv RES_NOALIASES
-This option turns off the user level aliasing feature controlled by the
-.Dq Ev HOSTALIASES
-environment variable.  Network daemons should set this option.
-.It Dv RES_USE_INET6
-Enables support for IPv6-only applications.
-This causes IPv4 addresses to be returned as an IPv4 mapped address.
-For example,
-.Li 10.1.1.1
-will be returned as
-.Li ::ffff:10.1.1.1 .
-The option is meaningful with certain kernel configuration only.
-.It Dv RES_USE_EDNS0
-Enables support for OPT pseudo-RR for EDNS0 extension.
-With the option, resolver code will attach OPT pseudo-RR into DNS queries,
-to inform of our receive buffer size.
-The option will allow DNS servers to take advantage of non-default receive
-buffer size, and to send larger replies.
-DNS query packets with EDNS0 extension is not compatible with
-non-EDNS0 DNS servers.
-.El
-.Pp
-The
-.Fn res_init
-routine
-reads the configuration file (if any; see
-.Xr resolver 5 )
-to get the default domain name,
-search list and
-the Internet address of the local name server(s).
-If no server is configured, the host running
-the resolver is tried.
-The current domain name is defined by the hostname
-if not specified in the configuration file;
-it can be overridden by the environment variable
-.Ev LOCALDOMAIN .
-This environment variable may contain several blank-separated
-tokens if you wish to override the
-.Em "search list"
-on a per-process basis.  This is similar to the
-.Em search
-command in the configuration file.
-Another environment variable
-.Dq Ev RES_OPTIONS
-can be set to
-override certain internal resolver options which are otherwise
-set by changing fields in the
-.Em _res
-structure or are inherited from the configuration file's
-.Em options
-command.  The syntax of the
-.Dq Ev RES_OPTIONS
-environment variable is explained in
-.Xr resolver 5 .
-Initialization normally occurs on the first call
-to one of the following routines.
-.Pp
-The
-.Fn res_query
-function provides an interface to the server query mechanism.
-It constructs a query, sends it to the local server,
-awaits a response, and makes preliminary checks on the reply.
-The query requests information of the specified
-.Fa type
-and
-.Fa class
-for the specified fully-qualified domain name
-.Fa dname .
-The reply message is left in the
-.Fa answer
-buffer with length
-.Fa anslen
-supplied by the caller.
-.Pp
-The
-.Fn res_search
-routine makes a query and awaits a response like
-.Fn res_query ,
-but in addition, it implements the default and search rules
-controlled by the
-.Dv RES_DEFNAMES
-and
-.Dv RES_DNSRCH
-options.
-It returns the first successful reply.
-.Pp
-The remaining routines are lower-level routines used by
-.Fn res_query .
-The
-.Fn res_mkquery
-function
-constructs a standard query message and places it in
-.Fa buf .
-It returns the size of the query, or \-1 if the query is
-larger than
-.Fa buflen .
-The query type
-.Fa op
-is usually
-.Dv QUERY ,
-but can be any of the query types defined in
-.Aq Pa arpa/nameser.h .
-The domain name for the query is given by
-.Fa dname .
-.Fa Newrr
-is currently unused but is intended for making update messages.
-.Pp
-The
-.Fn res_send
-routine
-sends a pre-formatted query and returns an answer.
-It will call
-.Fn res_init
-if
-.Dv RES_INIT
-is not set, send the query to the local name server, and
-handle timeouts and retries.
-The length of the reply message is returned, or
-\-1 if there were errors.
-.Pp
-The
-.Fn dn_comp
-function
-compresses the domain name
-.Fa exp_dn
-and stores it in
-.Fa comp_dn .
-The size of the compressed name is returned or \-1 if there were errors.
-The size of the array pointed to by
-.Fa comp_dn
-is given by
-.Fa length .
-The compression uses
-an array of pointers
-.Fa dnptrs
-to previously-compressed names in the current message.
-The first pointer points to
-the beginning of the message and the list ends with
-.Dv NULL .
-The limit to the array is specified by
-.Fa lastdnptr .
-A side effect of
-.Fn dn_comp
-is to update the list of pointers for
-labels inserted into the message
-as the name is compressed.
-If
-.Em dnptr
-is
-.Dv NULL ,
-names are not compressed.
-If
-.Fa lastdnptr
-is
-.Dv NULL ,
-the list of labels is not updated.
-.Pp
-The
-.Fn dn_expand
-entry
-expands the compressed domain name
-.Fa comp_dn
-to a full domain name
-The compressed name is contained in a query or reply message;
-.Fa msg
-is a pointer to the beginning of the message.
-The uncompressed name is placed in the buffer indicated by
-.Fa exp_dn
-which is of size
-.Fa length .
-The size of compressed name is returned or \-1 if there was an error.
-.Pp
-The
-.Fn dn_skipname
-function skips over a compressed domain name, which starts at a location
-pointed to by
-.Fa comp_dn .
-The compressed name is contained in a query or reply message;
-.Fa eom
-is a pointer to the end of the message.
-The size of compressed name is returned or \-1 if there was
-an error.
-.Pp
-The
-.Fn ns_get16
-function gets a 16-bit quantity from a buffer pointed to by
-.Fa src .
-.Pp
-The
-.Fn ns_get32
-function gets a 32-bit quantity from a buffer pointed to by
-.Fa src .
-.Pp
-The
-.Fn ns_put16
-function puts a 16-bit quantity
-.Fa src
-to a buffer pointed to by
-.Fa dst .
-.Pp
-The
-.Fn ns_put32
-function puts a 32-bit quantity
-.Fa src
-to a buffer pointed to by
-.Fa dst .
-.Sh FILES
-.Bl -tag -width /etc/resolv.conf
-.It Pa /etc/resolv.conf
-The configuration file,
-see
-.Xr resolver 5 .
-.El
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr resolver 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Pp
-.%T RFC1032 ,
-.%T RFC1033 ,
-.%T RFC1034 ,
-.%T RFC1035 ,
-.%T RFC974
-.Rs
-.%T "Name Server Operations Guide for BIND"
-.Re
-.Sh HISTORY
-The
-.Nm
-function appeared in
-.Bx 4.3 .
diff --git a/newlib/libc/sys/linux/net/rthdr.c b/newlib/libc/sys/linux/net/rthdr.c
deleted file mode 100644
index e5f7814..0000000
--- a/newlib/libc/sys/linux/net/rthdr.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*	$KAME: rthdr.c,v 1.8 2001/08/20 02:32:40 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/ip6.h>
-
-#include <string.h>
-#include <stdio.h>
-
-/* to define items, should talk with KAME guys first, for *BSD compatibility */
-
-#define IPV6_RTHDR_LOOSE     0 /* this hop need not be a neighbor. XXX old spec */
-#define IPV6_RTHDR_STRICT    1 /* this hop must be a neighbor. XXX old spec */
-#define IPV6_RTHDR_TYPE_0    0 /* IPv6 routing header type 0 */
-
-size_t
-inet6_rthdr_space(type, seg)
-    int type, seg;
-{
-    switch(type) {
-     case IPV6_RTHDR_TYPE_0:
-	 if (seg < 1 || seg > 23)
-	     return(0);
-	 return(CMSG_SPACE(sizeof(struct in6_addr) * (seg - 1)
-			   + sizeof(struct ip6_rthdr0)));
-     default:
-#ifdef DEBUG
-	 fprintf(stderr, "inet6_rthdr_space: unknown type(%d)\n", type);
-#endif 
-	 return(0);
-    }
-}
-
-struct cmsghdr *
-inet6_rthdr_init(bp, type)
-    void *bp;
-    int type;
-{
-    struct cmsghdr *ch = (struct cmsghdr *)bp;
-    struct ip6_rthdr *rthdr;
-
-    rthdr = (struct ip6_rthdr *)CMSG_DATA(ch);
-
-    ch->cmsg_level = IPPROTO_IPV6;
-    ch->cmsg_type = IPV6_RTHDR;
-
-    switch(type) {
-     case IPV6_RTHDR_TYPE_0:
-	 ch->cmsg_len = CMSG_LEN(sizeof(struct ip6_rthdr0) - sizeof(struct in6_addr));
-	 bzero(rthdr, sizeof(struct ip6_rthdr0));
-	 rthdr->ip6r_type = IPV6_RTHDR_TYPE_0;
-	 return(ch);
-     default:
-#ifdef DEBUG
-	 fprintf(stderr, "inet6_rthdr_init: unknown type(%d)\n", type);
-#endif 
-	 return(NULL);
-    }
-}
-
-int
-inet6_rthdr_add(cmsg, addr, flags)
-    struct cmsghdr *cmsg;
-    const struct in6_addr *addr;
-    u_int flags;
-{
-    struct ip6_rthdr *rthdr;
-
-    rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-    switch(rthdr->ip6r_type) {
-     case IPV6_RTHDR_TYPE_0:
-     {
-	 struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-	 if (flags != IPV6_RTHDR_LOOSE && flags != IPV6_RTHDR_STRICT) {
-#ifdef DEBUG
-	     fprintf(stderr, "inet6_rthdr_add: unsupported flag(%d)\n", flags);
-#endif 
-	     return(-1);
-	 }
-	 if (rt0->ip6r0_segleft == 23) {
-#ifdef DEBUG
-	     fprintf(stderr, "inet6_rthdr_add: segment overflow\n");
-#endif 
-	     return(-1);
-	 }
-	 if (flags == IPV6_RTHDR_STRICT) {
-	     int c, b;
-	     c = rt0->ip6r0_segleft / 8;
-	     b = rt0->ip6r0_segleft % 8;
-	     rt0->ip6r0_slmap[c] |= (1 << (7 - b));
-	 }
-	 rt0->ip6r0_segleft++;
-	 bcopy(addr, (caddr_t)rt0 + ((rt0->ip6r0_len + 1) << 3),
-	       sizeof(struct in6_addr));
-	 rt0->ip6r0_len += sizeof(struct in6_addr) >> 3;
-	 cmsg->cmsg_len = CMSG_LEN((rt0->ip6r0_len + 1) << 3);
-	 break;
-     }
-     default:
-#ifdef DEBUG
-	 fprintf(stderr, "inet6_rthdr_add: unknown type(%d)\n",
-		 rthdr->ip6r_type);
-#endif 
-	 return(-1);
-    }
-
-    return(0);
-}
-
-int
-inet6_rthdr_lasthop(cmsg, flags)
-    struct cmsghdr *cmsg;
-    unsigned int flags;
-{
-    struct ip6_rthdr *rthdr;
-
-    rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-    switch(rthdr->ip6r_type) {
-     case IPV6_RTHDR_TYPE_0:
-     {
-	 struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-	 if (flags != IPV6_RTHDR_LOOSE && flags != IPV6_RTHDR_STRICT) {
-#ifdef DEBUG
-	     fprintf(stderr, "inet6_rthdr_lasthop: unsupported flag(%d)\n", flags);
-#endif 
-	     return(-1);
-	 }
-	 if (rt0->ip6r0_segleft > 23) {
-#ifdef DEBUG
-	     fprintf(stderr, "inet6_rthdr_add: segment overflow\n");
-#endif 
-	     return(-1);
-	 }
-	 if (flags == IPV6_RTHDR_STRICT) {
-	     int c, b;
-	     c = rt0->ip6r0_segleft / 8;
-	     b = rt0->ip6r0_segleft % 8;
-	     rt0->ip6r0_slmap[c] |= (1 << (7 - b));
-	 }
-	 break;
-     }
-     default:
-#ifdef DEBUG
-	 fprintf(stderr, "inet6_rthdr_lasthop: unknown type(%d)\n",
-		 rthdr->ip6r_type);
-#endif 
-	 return(-1);
-    }
-
-    return(0);
-}
-
-#if 0
-int
-inet6_rthdr_reverse(in, out)
-    const struct cmsghdr *in;
-    struct cmsghdr *out;
-{
-#ifdef DEBUG
-    fprintf(stderr, "inet6_rthdr_reverse: not implemented yet\n");
-#endif 
-    return -1;
-}
-#endif
-
-int
-inet6_rthdr_segments(cmsg)
-    const struct cmsghdr *cmsg;
-{
-    struct ip6_rthdr *rthdr;
-
-    rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-    switch(rthdr->ip6r_type) {
-    case IPV6_RTHDR_TYPE_0:
-      {
-	struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-
-	if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len) {
-#ifdef DEBUG
-	    fprintf(stderr, "inet6_rthdr_segments: invalid size(%d)\n",
-		rt0->ip6r0_len);
-#endif 
-	    return -1;
-	}
-
-	return (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-      }
-
-    default:
-#ifdef DEBUG
-	fprintf(stderr, "inet6_rthdr_segments: unknown type(%d)\n",
-	    rthdr->ip6r_type);
-#endif 
-	return -1;
-    }
-}
-
-struct in6_addr *
-inet6_rthdr_getaddr(cmsg, idx)
-    struct cmsghdr *cmsg;
-    int idx;
-{
-    struct ip6_rthdr *rthdr;
-
-    rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-    switch(rthdr->ip6r_type) {
-    case IPV6_RTHDR_TYPE_0:
-      {
-	struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-	int naddr;
-
-	if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len) {
-#ifdef DEBUG
-	    fprintf(stderr, "inet6_rthdr_getaddr: invalid size(%d)\n",
-		rt0->ip6r0_len);
-#endif 
-	    return NULL;
-	}
-	naddr = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-	if (idx <= 0 || naddr < idx) {
-#ifdef DEBUG
-	    fprintf(stderr, "inet6_rthdr_getaddr: invalid idx(%d)\n", idx);
-#endif 
-	    return NULL;
-	}
-	return &rt0->ip6r0_addr[idx - 1];
-      }
-
-    default:
-#ifdef DEBUG
-	fprintf(stderr, "inet6_rthdr_getaddr: unknown type(%d)\n",
-	    rthdr->ip6r_type);
-#endif 
-	return NULL;
-    }
-}
-
-int
-inet6_rthdr_getflags(cmsg, idx)
-    const struct cmsghdr *cmsg;
-    int idx;
-{
-    struct ip6_rthdr *rthdr;
-
-    rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-    switch(rthdr->ip6r_type) {
-    case IPV6_RTHDR_TYPE_0:
-      {
-	struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-	int naddr;
-
-	if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len) {
-#ifdef DEBUG
-	    fprintf(stderr, "inet6_rthdr_getflags: invalid size(%d)\n",
-		rt0->ip6r0_len);
-#endif 
-	    return -1;
-	}
-	naddr = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-	if (idx < 0 || naddr < idx) {
-#ifdef DEBUG
-	    fprintf(stderr, "inet6_rthdr_getflags: invalid idx(%d)\n", idx);
-#endif 
-	    return -1;
-	}
-	if (rt0->ip6r0_slmap[idx / 8] & (0x80 >> (idx % 8)))
-	    return IPV6_RTHDR_STRICT;
-	else
-	    return IPV6_RTHDR_LOOSE;
-      }
-
-    default:
-#ifdef DEBUG
-	fprintf(stderr, "inet6_rthdr_getflags: unknown type(%d)\n",
-	    rthdr->ip6r_type);
-#endif 
-	return -1;
-    }
-}
diff --git a/newlib/libc/sys/linux/net/send.c b/newlib/libc/sys/linux/net/send.c
deleted file mode 100644
index 8ff65d0..0000000
--- a/newlib/libc/sys/linux/net/send.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)send.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-#include "un-namespace.h"
-
-ssize_t
-send(s, msg, len, flags)
-	int s, flags;
-	size_t len;
-	const void *msg;
-{
-	return (sendto(s, msg, len, flags, NULL, 0));
-}
diff --git a/newlib/libc/sys/linux/net/un-namespace.h b/newlib/libc/sys/linux/net/un-namespace.h
deleted file mode 100644
index 912109a..0000000
--- a/newlib/libc/sys/linux/net/un-namespace.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@FreeBSD.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.7 2002/03/29 22:43:42 markm Exp $
- */
-
-#ifndef _UN_NAMESPACE_H_
-#define _UN_NAMESPACE_H_
-
-#undef		accept
-#undef		__acl_aclcheck_fd
-#undef		__acl_delete_fd
-#undef		__acl_get_fd
-#undef		__acl_set_fd
-#undef		bind
-#undef		__cap_get_fd
-#undef		__cap_set_fd
-#undef		close
-#undef		connect
-#undef		dup
-#undef		dup2
-#undef		execve
-#undef		fcntl
-#undef		flock
-#undef		fstat
-#undef		fstatfs
-#undef		fsync
-#undef		getdirentries
-#undef		getlogin
-#undef		getpeername
-#undef		getprogname
-#undef		getsockname
-#undef		getsockopt
-#undef		ioctl
-#undef		listen
-#undef		nanosleep
-#undef		open
-#undef		pthread_getspecific
-#undef		pthread_key_create
-#undef		pthread_key_delete
-#undef		pthread_mutex_destroy
-#undef		pthread_mutex_init
-#undef		pthread_mutex_lock
-#undef		pthread_mutex_trylock
-#undef		pthread_mutex_unlock
-#undef		pthread_mutexattr_init
-#undef		pthread_mutexattr_destroy
-#undef		pthread_mutexattr_settype
-#undef		pthread_once
-#undef		pthread_self
-#undef		pthread_setspecific
-#undef		read
-#undef		readv
-#undef		recvfrom
-#undef		recvmsg
-#undef		select
-#undef		sendmsg
-#undef		sendto
-#undef		setsockopt
-#undef		sigaction
-#undef		sigprocmask
-#undef		sigsuspend
-#undef		socket
-#undef		socketpair
-#undef		wait4
-#undef		write
-#undef		writev
-
-#if 0
-#undef		creat
-#undef		fchflags
-#undef		fchmod
-#undef		fpathconf
-#undef		msync
-#undef		nfssvc
-#undef		pause
-#undef		poll
-#undef		pthread_rwlock_destroy
-#undef		pthread_rwlock_init
-#undef		pthread_rwlock_rdlock
-#undef		pthread_rwlock_tryrdlock
-#undef		pthread_rwlock_trywrlock
-#undef		pthread_rwlock_unlock
-#undef		pthread_rwlock_wrlock
-#undef		pthread_rwlockattr_init
-#undef		pthread_rwlockattr_destroy
-#undef		sched_yield
-#undef		sendfile
-#undef		shutdown
-#undef		sigaltstack
-#undef		sigpending
-#undef		sigreturn
-#undef		sigsetmask
-#undef		sleep
-#undef		system
-#undef		tcdrain
-#undef		wait
-#undef		waitpid
-#endif	/* 0 */
-
-#ifdef _SIGNAL_H_
-int     	_sigaction(int, const struct sigaction *, struct sigaction *);
-#endif
-
-#ifdef _SYS_FCNTL_H_
-int		_flock(int, int);
-#endif
-
-#undef		err
-#undef		warn
-
-#endif	/* _UN_NAMESPACE_H_ */
diff --git a/newlib/libc/sys/linux/net/vars.c b/newlib/libc/sys/linux/net/vars.c
deleted file mode 100644
index c91a04b..0000000
--- a/newlib/libc/sys/linux/net/vars.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$KAME: vars.c,v 1.2 2001/08/20 02:32:41 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <sys/types.h>
-#include <netinet/in.h>
-
-/*
- * Definitions of some costant IPv6 addresses.
- */
-const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
-const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
-const struct in6_addr in6addr_nodelocal_allnodes = IN6ADDR_NODELOCAL_ALLNODES_INIT;
-const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT;
-
diff --git a/newlib/libc/sys/linux/ntp_gettime.c b/newlib/libc/sys/linux/ntp_gettime.c
deleted file mode 100644
index 2bcabbc..0000000
--- a/newlib/libc/sys/linux/ntp_gettime.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <sys/timex.h>
-
-#ifndef MOD_OFFSET
-# define modes mode
-#endif
-
-int
-ntp_gettime (ntv)
-     struct ntptimeval *ntv;
-{
-  struct timex tntx;
-  int result;
-
-  tntx.modes = 0;
-  result = __adjtimex (&tntx);
-  ntv->time = tntx.time;
-  ntv->maxerror = tntx.maxerror;
-  ntv->esterror = tntx.esterror;
-  return result;
-}
diff --git a/newlib/libc/sys/linux/pathconf.c b/newlib/libc/sys/linux/pathconf.c
deleted file mode 100644
index 7969459..0000000
--- a/newlib/libc/sys/linux/pathconf.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* Linux specific extensions to pathconf.
-   Copyright (C) 1991,95,96,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Modified for newlib July 19, 2002 - Jeff Johnston */
-
-#include <errno.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <limits.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/statvfs.h>
-#include <machine/weakalias.h>
-#include "linux_fsinfo.h"
-
-/* The Linux kernel header mentioned this as a kind of generic value.  */
-#define LINUX_LINK_MAX	127
-
-static long int posix_pathconf (const char *path, int name);
-
-
-/* Get file-specific information about descriptor FD.  */
-long int
-__pathconf (path, name)
-     const char *path;
-     int name;
-{
-  if (name == _PC_LINK_MAX)
-    {
-      struct statfs fsbuf;
-
-      /* Determine the filesystem type.  */
-      if (__statfs (path, &fsbuf) < 0)
-	{
-	  if (errno == ENOSYS)
-	    /* not possible, return the default value.  */
-	    return LINUX_LINK_MAX;
-
-	  /* Some error occured.  */
-          return -1;
-	}
-
-      switch (fsbuf.f_type)
-	{
-	case EXT2_SUPER_MAGIC:
-	  return EXT2_LINK_MAX;
-
-	case MINIX_SUPER_MAGIC:
-	case MINIX_SUPER_MAGIC2:
-	  return MINIX_LINK_MAX;
-
-	case MINIX2_SUPER_MAGIC:
-	case MINIX2_SUPER_MAGIC2:
-	  return MINIX2_LINK_MAX;
-
-	case XENIX_SUPER_MAGIC:
-	  return XENIX_LINK_MAX;
-
-	case SYSV4_SUPER_MAGIC:
-	case SYSV2_SUPER_MAGIC:
-	  return SYSV_LINK_MAX;
-
-	case COH_SUPER_MAGIC:
-	  return COH_LINK_MAX;
-
-	case UFS_MAGIC:
-	case UFS_CIGAM:
-	  return UFS_LINK_MAX;
-
-	case REISERFS_SUPER_MAGIC:
-	  return REISERFS_LINK_MAX;
-
-	default:
-	  return LINUX_LINK_MAX;
-	}
-    }
-
-  return posix_pathconf (path, name);
-}
-
-/* Get file-specific information about PATH.  */
-static long int
-posix_pathconf (const char *path, int name)
-{
-  if (path[0] == '\0')
-    {
-      __set_errno (ENOENT);
-      return -1;
-    }
-
-  switch (name)
-    {
-    default:
-      __set_errno (EINVAL);
-      return -1;
-
-    case _PC_LINK_MAX:
-#ifdef	LINK_MAX
-      return LINK_MAX;
-#else
-      return -1;
-#endif
-
-    case _PC_MAX_CANON:
-#ifdef	MAX_CANON
-      return MAX_CANON;
-#else
-      return -1;
-#endif
-
-    case _PC_MAX_INPUT:
-#ifdef	MAX_INPUT
-      return MAX_INPUT;
-#else
-      return -1;
-#endif
-
-    case _PC_NAME_MAX:
-#ifdef	NAME_MAX
-      {
-	struct statfs buf;
-	int save_errno = errno;
-
-	if (__statfs (path, &buf) < 0)
-	  {
-	    if (errno == ENOSYS)
-	      {
-		errno = save_errno;
-		return NAME_MAX;
-	      }
-	    return -1;
-	  }
-	else
-	  {
-#ifdef _STATFS_F_NAMELEN
-	    return buf.f_namelen;
-#else
-# ifdef _STATFS_F_NAME_MAX
-	    return buf.f_name_max;
-# else
-	    return NAME_MAX;
-# endif
-#endif
-	  }
-      }
-#else
-      return -1;
-#endif
-
-    case _PC_PATH_MAX:
-#ifdef	PATH_MAX
-      return PATH_MAX;
-#else
-      return -1;
-#endif
-
-    case _PC_PIPE_BUF:
-#ifdef	PIPE_BUF
-      return PIPE_BUF;
-#else
-      return -1;
-#endif
-
-    case _PC_CHOWN_RESTRICTED:
-#ifdef	_POSIX_CHOWN_RESTRICTED
-      return _POSIX_CHOWN_RESTRICTED;
-#else
-      return -1;
-#endif
-
-    case _PC_NO_TRUNC:
-#ifdef	_POSIX_NO_TRUNC
-      return _POSIX_NO_TRUNC;
-#else
-      return -1;
-#endif
-
-    case _PC_VDISABLE:
-#ifdef	_POSIX_VDISABLE
-      return _POSIX_VDISABLE;
-#else
-      return -1;
-#endif
-
-    case _PC_SYNC_IO:
-#ifdef	_POSIX_SYNC_IO
-      return _POSIX_SYNC_IO;
-#else
-      return -1;
-#endif
-
-    case _PC_ASYNC_IO:
-#ifdef	_POSIX_ASYNC_IO
-      {
-	/* AIO is only allowed on regular files and block devices.  */
-	struct stat64 st;
-
-	if (stat64 (path, &st) < 0
-	    || (! S_ISREG (st.st_mode) && ! S_ISBLK (st.st_mode)))
-	  return -1;
-	else
-	  return 1;
-      }
-#else
-      return -1;
-#endif
-
-    case _PC_PRIO_IO:
-#ifdef	_POSIX_PRIO_IO
-      return _POSIX_PRIO_IO;
-#else
-      return -1;
-#endif
-
-    case _PC_SOCK_MAXBUF:
-#ifdef	SOCK_MAXBUF
-      return SOCK_MAXBUF;
-#else
-      return -1;
-#endif
-
-    case _PC_FILESIZEBITS:
-#ifdef FILESIZEBITS
-      return FILESIZEBITS;
-#else
-      /* We let platforms with larger file sizes overwrite this value.  */
-      return 32;
-#endif
-
-    case _PC_REC_INCR_XFER_SIZE:
-      /* XXX It is not entirely clear what the limit is supposed to do.
-	 What is incremented?  */
-      return -1;
-
-    case _PC_REC_MAX_XFER_SIZE:
-      /* XXX It is not entirely clear what the limit is supposed to do.
-	 In general there is no top limit of the number of bytes which
-	 case be transported at once.  */
-      return -1;
-
-    case _PC_REC_MIN_XFER_SIZE:
-      {
-	/* XXX It is not entirely clear what the limit is supposed to do.
-	   I assume this is the block size of the filesystem.  */
-	struct statvfs64 sv;
-
-	if (__statvfs64 (path, &sv) < 0)
-	  return -1;
-	return sv.f_bsize;
-      }
-
-    case _PC_REC_XFER_ALIGN:
-      {
-	/* XXX It is not entirely clear what the limit is supposed to do.
-	   I assume that the number should reflect the minimal block
-	   alignment.  */
-	struct statvfs64 sv;
-
-	if (__statvfs64 (path, &sv) < 0)
-	  return -1;
-	return sv.f_frsize;
-      }
-
-    case _PC_ALLOC_SIZE_MIN:
-      {
-	/* XXX It is not entirely clear what the limit is supposed to do.
-	   I assume that the number should reflect the minimal block
-	   alignment.  */
-	struct statvfs64 sv;
-
-	if (__statvfs64 (path, &sv) < 0)
-	  return -1;
-	return sv.f_frsize;
-      }
-
-    case _PC_SYMLINK_MAX:
-      /* In general there are no limits.  If a system has one it should
-	 overwrite this case.  */
-      return -1;
-    }
-}
-
-weak_alias (__pathconf, pathconf)
diff --git a/newlib/libc/sys/linux/pread.c b/newlib/libc/sys/linux/pread.c
deleted file mode 100644
index ff8371e..0000000
--- a/newlib/libc/sys/linux/pread.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Linux version of pread so we can have a weak_alias */
-
-#include <_ansi.h>
-#include <unistd.h>
-#include <reent.h>
-#include <machine/weakalias.h>
-
-ssize_t
-_DEFUN (_pread_r, (rptr, fd, buf, n, off),
-     struct _reent *rptr _AND
-     int fd _AND
-     _PTR buf _AND
-     size_t n _AND
-     off_t off)
-{
-  off_t cur_pos;
-  _READ_WRITE_RETURN_TYPE num_read;
-  
-  if ((cur_pos = _lseek_r (rptr, fd, 0, SEEK_CUR)) == (off_t)-1)
-    return -1;
-
-  if (_lseek_r (rptr, fd, off, SEEK_SET) == (off_t)-1)
-    return -1;
-
-  num_read = _read_r (rptr, fd, buf, n);
-
-  if (_lseek_r (rptr, fd, cur_pos, SEEK_SET) == (off_t)-1)
-    return -1;
-
-  return (ssize_t)num_read;
-}
-
-#ifndef _REENT_ONLY
-
-ssize_t
-_DEFUN (__libc_pread, (fd, buf, n, off),
-     int fd _AND
-     _PTR buf _AND
-     size_t n _AND
-     off_t off)
-{
-  return _pread_r (_REENT, fd, buf, n, off);
-}
-weak_alias(__libc_pread,pread)
-
-#endif
diff --git a/newlib/libc/sys/linux/pread64.c b/newlib/libc/sys/linux/pread64.c
deleted file mode 100644
index c4bdca7..0000000
--- a/newlib/libc/sys/linux/pread64.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-FUNCTION
-<<pread64>>---read a large file from specified position
-
-INDEX
-	pread64
-
-ANSI_SYNOPSIS
-	#include <unistd.h>
-	ssize_t pread64(int <[fd]>, void *<[buf]>, size_t <[n]>, loff_t <[off]>);
-
-TRAD_SYNOPSIS
-	#include <unistd.h>
-	ssize_t pread64(<[fd]>, <[buf]>, <[n]>, <[off]>)
-	int <[fd]>;
-	void *<[buf]>;
-	size_t <[n]>;
-	loff_t <[off]>;
-
-DESCRIPTION
-The <<pread64>> function is similar to <<pread>>.  The only difference is
-that it operates on large files and so takes a 64-bit offset.  Like <<pread>>>,
-the file position is unchanged by the function (i.e. the file position
-is the same before and after a call to <<pread>>).
-
-RETURNS
-<<pread64>> returns the number of bytes read or <<-1>> if failure occurred.
-
-PORTABILITY
-<<pread64>> is an EL/IX extension.
-
-Supporting OS subroutine required: <<read>>, <<lseek64>>.
-*/
-
-#include <_ansi.h>
-#include <unistd.h>
-#include <reent.h>
-#include <machine/weakalias.h>
-
-ssize_t
-_DEFUN (__libc_pread64, (fd, buf, n, off),
-     int fd _AND
-     _PTR buf _AND
-     size_t n _AND
-     loff_t off)
-{
-  loff_t cur_pos;
-  _READ_WRITE_RETURN_TYPE num_read;
-  
-  if ((cur_pos = lseek64 (fd, 0, SEEK_CUR)) == (loff_t)-1)
-    return -1;
-
-  if (lseek64 (fd, off, SEEK_SET) == (loff_t)-1)
-    return -1;
-
-  num_read = read (fd, buf, n);
-
-  if (lseek64 (fd, cur_pos, SEEK_SET) == (loff_t)-1)
-    return -1;
-
-  return (ssize_t)num_read;
-}
-weak_alias(__libc_pread64,pread64);
-weak_alias(__libc_pread64,__pread64);
-
diff --git a/newlib/libc/sys/linux/process.c b/newlib/libc/sys/linux/process.c
index 160b801..58a3617 100644
--- a/newlib/libc/sys/linux/process.c
+++ b/newlib/libc/sys/linux/process.c
@@ -4,53 +4,21 @@
 
 
 #include <sys/unistd.h>
-#include <sys/wait.h>
-#include <machine/syscall.h>
+#include <sys/syscall.h>
 
 
 #define __NR__exit __NR_exit
 #define __NR__execve __NR_execve
 
+_syscall0(int,fork)
+_syscall0(pid_t,vfork)
+_syscall3(int,_execve,const char *,file,char * const *,argv,char * const *,envp)
 _syscall0(int,getpid)
+_syscall2(int,setpgid,pid_t,pid,pid_t,pgid)
 _syscall0(pid_t,getppid)
-
-weak_alias(__libc_getpid,__getpid);
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3
-_syscall3(int,_execve,const char *,file,char * const *,argv,char * const *,envp)
-_syscall0(int,fork)
-#endif /* _ELIX_LEVEL >= 3 */
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4
 _syscall0(pid_t,getpgrp)
-_syscall2(int,setpgid,pid_t,pid,pid_t,pgid)
 _syscall0(pid_t,setsid)
 
-/* Here we implement vfork in terms of fork, since
- * Linux's vfork system call is not reliable.
- */
-pid_t vfork(void)
-{
-  pid_t pid;
-
-  pid = fork();
-  
-  if(!pid)
-    {
-      /* In child. */
-      return 0;
-    }
-  else
-    {
-      /* In parent.  Wait for child to finish. */
-      if (waitpid (pid, NULL, 0) < 0)
-        return pid;
-    }
-}
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 4 */
-
-
-/* Although _exit is listed as level 3, we use it from level 1 interfaces */
 /* FIXME: get rid of noreturn warning */
 
 #define return for (;;)
diff --git a/newlib/libc/sys/linux/prof-freq.c b/newlib/libc/sys/linux/prof-freq.c
deleted file mode 100644
index 829979b..0000000
--- a/newlib/libc/sys/linux/prof-freq.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Return frequency of ticks reported by profil.  Generic version. */
-/*-
- * Copyright (c) 1983, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <libc-internal.h>
-
-int
-__profile_frequency (void)
-{
-  /*
-   * Discover the tick frequency of the machine if something goes wrong,
-   * we return 0, an impossible hertz.
-   */
-  struct itimerval tim;
-
-  tim.it_interval.tv_sec = 0;
-  tim.it_interval.tv_usec = 1;
-  tim.it_value.tv_sec = 0;
-  tim.it_value.tv_usec = 0;
-  setitimer(ITIMER_REAL, &tim, 0);
-  setitimer(ITIMER_REAL, 0, &tim);
-  if (tim.it_interval.tv_usec < 2)
-    return 0;
-  return (1000000 / tim.it_interval.tv_usec);
-}
diff --git a/newlib/libc/sys/linux/profile.c b/newlib/libc/sys/linux/profile.c
deleted file mode 100644
index f36e2c7..0000000
--- a/newlib/libc/sys/linux/profile.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* libc/sys/linux/profile.c - profiling system call */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <machine/syscall.h>
-
-#define __NR_profil 98
-
-int  profil(u_short  *buf,  size_t  bufsiz, size_t offset,
-            u_int scale);
-
-_syscall4(int,profil,unsigned short *,buf,size_t,bufsiz,size_t,offset,unsigned int, scale)
diff --git a/newlib/libc/sys/linux/psignal.c b/newlib/libc/sys/linux/psignal.c
deleted file mode 100644
index f5fedc9..0000000
--- a/newlib/libc/sys/linux/psignal.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* libc/sys/linux/psignal.c - print signal message to stderr */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#include <stdio.h>
-#include <string.h>
-
-void
-psignal (int sig, const char *s)
-{
-  if (s != NULL)
-    fprintf (stderr, "%s: %s\n", s, strsignal (sig));
-  else
-    fprintf (stderr, "%s\n", strsignal (sig));
-}
diff --git a/newlib/libc/sys/linux/pvallocr.c b/newlib/libc/sys/linux/pvallocr.c
deleted file mode 100644
index 716ea0c..0000000
--- a/newlib/libc/sys/linux/pvallocr.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-void * 
-_pvalloc_r (struct _reent *ptr, size_t bytes)
-{
-  return pvalloc (bytes);
-}
diff --git a/newlib/libc/sys/linux/pwrite.c b/newlib/libc/sys/linux/pwrite.c
deleted file mode 100644
index 239463e..0000000
--- a/newlib/libc/sys/linux/pwrite.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Linux version of pwrite so we can have a weak alias */
-
-#include <_ansi.h>
-#include <unistd.h>
-#include <reent.h>
-#include <machine/weakalias.h>
-
-ssize_t
-_DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
-     struct _reent *rptr _AND
-     int fd _AND
-     _CONST _PTR buf _AND
-     size_t n _AND
-     off_t off)
-{
-  off_t cur_pos;
-  _READ_WRITE_RETURN_TYPE num_written;
-  
-  if ((cur_pos = _lseek_r (rptr, fd, 0, SEEK_CUR)) == (off_t)-1)
-    return -1;
-
-  if (_lseek_r (rptr, fd, off, SEEK_SET) == (off_t)-1)
-    return -1;
-
-  num_written = _write_r (rptr, fd, buf, n);
-
-  if (_lseek_r (rptr, fd, cur_pos, SEEK_SET) == (off_t)-1)
-    return -1;
-
-  return (ssize_t)num_written;
-}
-
-#ifndef _REENT_ONLY
-
-ssize_t
-_DEFUN (__libc_pwrite, (fd, buf, n, off),
-     int fd _AND
-     _CONST _PTR buf _AND
-     size_t n _AND
-     off_t off)
-{
-  return _pwrite_r (_REENT, fd, buf, n, off);
-}
-weak_alias(__libc_pwrite,pwrite)
-
-#endif
diff --git a/newlib/libc/sys/linux/pwrite64.c b/newlib/libc/sys/linux/pwrite64.c
deleted file mode 100644
index f1d6784..0000000
--- a/newlib/libc/sys/linux/pwrite64.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-FUNCTION
-<<pwrite64>>---write a large file from specified position
-
-INDEX
-	pwrite64
-
-ANSI_SYNOPSIS
-	#include <unistd.h>
-	ssize_t pwrite64(int <[fd]>, void *<[buf]>, size_t <[n]>, loff_t <[off]>);
-
-TRAD_SYNOPSIS
-	#include <unistd.h>
-	ssize_t pwrite64(<[fd]>, <[buf]>, <[n]>, <[off]>)
-	int <[fd]>;
-	void *<[buf]>;
-	size_t <[n]>;
-	loff_t <[off]>;
-
-DESCRIPTION
-The <<pwrite64>> function is similar to <<pwrite>>.  The only difference is
-that it operates on large files and so takes a 64-bit offset.  Like <<pwrite>>>,
-the file position is unchanged by the function (i.e. the file position
-is the same before and after a call to <<pwrite>>).
-
-RETURNS
-<<pwrite64>> returns the number of bytes written or <<-1>> if failure occurred.
-
-PORTABILITY
-<<pwrite64>> is an EL/IX extension.
-
-Supporting OS subroutine required: <<write>>, <<lseek64>>.
-*/
-
-#include <_ansi.h>
-#include <unistd.h>
-#include <reent.h>
-#include <machine/weakalias.h>
-
-ssize_t
-_DEFUN (__libc_pwrite64, (fd, buf, n, off),
-     int fd _AND
-     _PTR buf _AND
-     size_t n _AND
-     loff_t off)
-{
-  loff_t cur_pos;
-  _READ_WRITE_RETURN_TYPE num_written;
-  
-  if ((cur_pos = lseek64 (fd, 0, SEEK_CUR)) == (loff_t)-1)
-    return -1;
-
-  if (lseek64 (fd, off, SEEK_SET) == (loff_t)-1)
-    return -1;
-
-  num_written = write (fd, buf, n);
-
-  if (lseek64 (fd, cur_pos, SEEK_SET) == (loff_t)-1)
-    return -1;
-
-  return (ssize_t)num_written;
-}
-weak_alias(__libc_pwrite64,pwrite64)
-
diff --git a/newlib/libc/sys/linux/raise.c b/newlib/libc/sys/linux/raise.c
deleted file mode 100644
index d69561b..0000000
--- a/newlib/libc/sys/linux/raise.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* empty file so we override regular raise */
-
-
diff --git a/newlib/libc/sys/linux/readdir64.c b/newlib/libc/sys/linux/readdir64.c
deleted file mode 100644
index 78fe98e..0000000
--- a/newlib/libc/sys/linux/readdir64.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* Modified from newlib/libc/posix/readdir.c */
-
-#include <dirent.h>
-#include <machine/syscall.h>
-
-#define __NR___getdents64 __NR_getdents64
-
-static _syscall3(int,__getdents64,int,fd,struct dirent64 *,dirp,unsigned int,count)
-
-/*
- * get next entry in a directory.
- */
-struct dirent64 *
-__readdir64 (dirp)
-register DIR *dirp; {
-  register struct dirent64 *dp;
- 
-#ifdef HAVE_DD_LOCK
-  __lock_acquire_recursive(dirp->dd_lock);
-#endif
-
-  if (dirp->dd_fd == -1)
-    return NULL;
- 
-  for (;;) {
-    if (dirp->dd_loc == 0) {
-      dirp->dd_size = __getdents64 (dirp->dd_fd,
-				    (void *)dirp->dd_buf,
-				    dirp->dd_len);
-      
-      if (dirp->dd_size <= 0) {
-#ifdef HAVE_DD_LOCK
-        __lock_release_recursive(dirp->dd_lock);
-#endif
-	return NULL;
-      }
-    }
-    if (dirp->dd_loc >= dirp->dd_size) {
-      dirp->dd_loc = 0;
-      continue;
-    }
-    dp = (struct dirent64 *)(dirp->dd_buf + dirp->dd_loc);
-    if ((int)dp & 03) {	/* bogus pointer check */
-#ifdef HAVE_DD_LOCK
-      __lock_release_recursive(dirp->dd_lock);
-#endif
-      return NULL;
-    }
-    if (dp->d_reclen <= 0 ||
-	dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc) {
-#ifdef HAVE_DD_LOCK
-      __lock_release_recursive(dirp->dd_lock);
-#endif
-      return NULL;
-    }
-    dirp->dd_loc += dp->d_reclen;
-    if (dp->d_ino == 0)
-      continue;
-#ifdef HAVE_DD_LOCK
-    __lock_release_recursive(dirp->dd_lock);
-#endif
-    return (dp);
-  }
-}
diff --git a/newlib/libc/sys/linux/realloc.c b/newlib/libc/sys/linux/realloc.c
deleted file mode 100644
index 818e05a..0000000
--- a/newlib/libc/sys/linux/realloc.c
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy file to override one object in stdlib directory */
diff --git a/newlib/libc/sys/linux/reallocr.c b/newlib/libc/sys/linux/reallocr.c
deleted file mode 100644
index 873c1b0..0000000
--- a/newlib/libc/sys/linux/reallocr.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-void *
-_realloc_r (struct _reent *ptr, void *old, size_t newlen)
-{
-  return realloc (old, newlen);
-}
diff --git a/newlib/libc/sys/linux/rename.c b/newlib/libc/sys/linux/rename.c
deleted file mode 100644
index d6bf459..0000000
--- a/newlib/libc/sys/linux/rename.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* libc/sys/linux/rename.c - rename a file */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#include <stdio.h>
-#include <machine/syscall.h>
-
-_syscall2(int,rename,const char *,old,const char *,new)
-
diff --git a/newlib/libc/sys/linux/resource.c b/newlib/libc/sys/linux/resource.c
deleted file mode 100644
index 54a049d..0000000
--- a/newlib/libc/sys/linux/resource.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* libc/sys/linux/resource.c - Process resource functions */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#include <sys/resource.h>
-#include <machine/syscall.h>
-
-_syscall2(int,getrusage,int,who,struct rusage *,r_usage)
-_syscall2(int,getrlimit,int,resource,struct rlimit *,rlp)
-
-weak_alias(__libc_getrlimit,__getrlimit)
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2
-_syscall2(int,setrlimit,int,resource,const struct rlimit *,rlp)
-weak_alias(__libc_setrlimit,__setrlimit)
-#endif
-
diff --git a/newlib/libc/sys/linux/scandir64.c b/newlib/libc/sys/linux/scandir64.c
deleted file mode 100644
index b21b423..0000000
--- a/newlib/libc/sys/linux/scandir64.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)scandir.c	5.10 (Berkeley) 2/23/91";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Scan the directory dirname calling select to make a list of selected
- * directory entries then sort using qsort and compare routine dcomp.
- * Returns the number of entries and a pointer to a list of pointers to
- * struct dirent64 (through namelist). Returns -1 if there were any errors.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/lock.h>
-
-extern struct dirent64 *__readdir64 (DIR *);
-
-/*
- * The DIRSIZ macro gives the minimum record length which will hold
- * the directory entry.  This requires the amount of space in struct dirent64
- * without the d_name field, plus enough space for the name with a terminating
- * null byte (dp->d_namlen+1), rounded up to a 4 byte boundary.
- */
-#undef DIRSIZ
-#ifdef _DIRENT_HAVE_D_NAMLEN
-#define DIRSIZ(dp) \
-    ((sizeof (struct dirent64) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
-#else
-#define DIRSIZ(dp) \
-    ((sizeof (struct dirent64) - (MAXNAMLEN+1)) + ((strlen((dp)->d_name)+1 + 3) &~ 3))
-#endif
-
-#ifndef __P
-#define __P(args) ()
-#endif
-
-int
-scandir64(dirname, namelist, select, dcomp)
-	const char *dirname;
-	struct dirent64 ***namelist;
-	int (*select) __P((struct dirent64 *));
-	int (*dcomp) __P((const void *, const void *));
-{
-	register struct dirent64 *d, *p, **names;
-	register size_t nitems;
-	struct stat64 stb;
-	long arraysz;
-	DIR *dirp;
-
-	if ((dirp = opendir(dirname)) == NULL)
-		return(-1);
-#ifdef HAVE_DD_LOCK
-	__lock_acquire_recursive(dirp->dd_lock);
-#endif
-	if (fstat64(dirp->dd_fd, &stb) < 0) {
-#ifdef HAVE_DD_LOCK
-		__lock_release_recursive(dirp->dd_lock);
-#endif
-		return(-1);
-	}
-
-	/*
-	 * estimate the array size by taking the size of the directory file
-	 * and dividing it by a multiple of the minimum size entry. 
-	 */
-	arraysz = (stb.st_size / 24);
-	names = (struct dirent64 **)malloc(arraysz * sizeof(struct dirent64 *));
-	if (names == NULL) {
-#ifdef HAVE_DD_LOCK
-		__lock_release_recursive(dirp->dd_lock);
-#endif
-		return(-1);
-	}
-
-	nitems = 0;
-	while ((d = __readdir64(dirp)) != NULL) {
-		if (select != NULL && !(*select)(d))
-			continue;	/* just selected names */
-		/*
-		 * Make a minimum size copy of the data
-		 */
-		p = (struct dirent64 *)malloc(DIRSIZ(d));
-		if (p == NULL) {
-#ifdef HAVE_DD_LOCK
-			__lock_release_recursive(dirp->dd_lock);
-#endif
-			return(-1);
-		}
-		p->d_ino = d->d_ino;
-		p->d_reclen = d->d_reclen;
-#ifdef _DIRENT_HAVE_D_NAMLEN
-		p->d_namlen = d->d_namlen;
-		bcopy(d->d_name, p->d_name, p->d_namlen + 1);
-#else
-               strcpy(p->d_name, d->d_name);
-#endif
-		/*
-		 * Check to make sure the array has space left and
-		 * realloc the maximum size.
-		 */
-		if (++nitems >= arraysz) {
-			if (fstat64(dirp->dd_fd, &stb) < 0) {
-#ifdef HAVE_DD_LOCK
-				__lock_release_recursive(dirp->dd_lock);
-#endif
-				return(-1);	/* just might have grown */
-			}
-			arraysz = stb.st_size / 12;
-			names = (struct dirent64 **)realloc((char *)names,
-				arraysz * sizeof(struct dirent64 *));
-			if (names == NULL) {
-#ifdef HAVE_DD_LOCK
-				__lock_release_recursive(dirp->dd_lock);
-#endif
-				return(-1);
-			}
-		}
-		names[nitems-1] = p;
-	}
-	closedir(dirp);
-	if (nitems && dcomp != NULL)
-		qsort(names, nitems, sizeof(struct dirent64 *), dcomp);
-	*namelist = names;
-#ifdef HAVE_DD_LOCK
-	__lock_release_recursive(dirp->dd_lock);
-#endif
-	return(nitems);
-}
-
-/*
- * Alphabetic order comparison routine for those who want it.
- */
-int
-alphasort64(d1, d2)
-       const struct dirent64 **d1;
-       const struct dirent64 **d2;
-{
-       return(strcmp((*d1)->d_name, (*d2)->d_name));
-}
-
diff --git a/newlib/libc/sys/linux/sched.c b/newlib/libc/sys/linux/sched.c
deleted file mode 100644
index 031b1b5..0000000
--- a/newlib/libc/sys/linux/sched.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* libc/sys/linux/sched.c - Process scheduling functions */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#include <time.h>
-#include <sched.h>
-#include <machine/syscall.h>
-
-_syscall1(int,sched_get_priority_max,int,policy);
-_syscall1(int,sched_get_priority_min,int,policy);
-_syscall2(int,sched_rr_get_interval,pid_t,pid,struct timespec *,interval);
-_syscall0(int,sched_yield);
-
-weak_alias(__libc_sched_get_priority_max,__sched_get_priority_max);
-weak_alias(__libc_sched_get_priority_min,__sched_get_priority_min);
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3
-_syscall2(int,sched_getparam,pid_t,pid,struct sched_param *,sched);
-_syscall1(int,sched_getscheduler,pid_t,pid);
-_syscall2(int,sched_setparam,pid_t,pid,const struct sched_param *,sched);
-_syscall3(int,sched_setscheduler,pid_t,pid,int,policy,const struct sched_param *,sched);
-weak_alias(__libc_sched_getparam,__sched_getparam);
-weak_alias(__libc_sched_getscheduler,__sched_getscheduler);
-weak_alias(__libc_sched_setscheduler,__sched_setscheduler);
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 3 */
-
diff --git a/newlib/libc/sys/linux/select.c b/newlib/libc/sys/linux/select.c
index 882f541..838d485 100644
--- a/newlib/libc/sys/linux/select.c
+++ b/newlib/libc/sys/linux/select.c
@@ -5,13 +5,8 @@
 
 #include <sys/types.h>
 #include <sys/time.h>
-#include <machine/syscall.h>
+#include <sys/syscall.h>
 
 
-static _syscall5(int,_newselect,int,n,fd_set *,readfds,fd_set *,writefds,fd_set *,exceptfds,struct timeval *,timeout)
-
-int select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
-            struct timeval *timeout)
-{
-  return _newselect(n, readfds, writefds, exceptfds, timeout);
-}
+_syscall5(int,select,int,n,fd_set *,readfds,fd_set *,writefds,
+  fd_set *,exceptfds,struct timeval *,timeout)
diff --git a/newlib/libc/sys/linux/seteuid.c b/newlib/libc/sys/linux/seteuid.c
deleted file mode 100644
index c3fa384..0000000
--- a/newlib/libc/sys/linux/seteuid.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2002, Red Hat Inc. */
-
-#include <errno.h>
-#include <unistd.h>
-
-int
-seteuid (uid_t uid)
-{
-	int result;
-
-	if (uid == (uid_t) ~0)
-	{
-		errno = (EINVAL);
-		return -1;
-	}
-
-	return setresuid (-1, uid, -1);
-}
diff --git a/newlib/libc/sys/linux/sethostid.c b/newlib/libc/sys/linux/sethostid.c
deleted file mode 100644
index eb71b74..0000000
--- a/newlib/libc/sys/linux/sethostid.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SET_PROCEDURE 1
-#include "gethostid.c"
diff --git a/newlib/libc/sys/linux/sethostname.c b/newlib/libc/sys/linux/sethostname.c
deleted file mode 100644
index 669df3d..0000000
--- a/newlib/libc/sys/linux/sethostname.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* libc/sys/linux/sethostname.c - Set host name */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#include <unistd.h>
-#include <machine/syscall.h>
-
-_syscall2(int,sethostname,const char *,name,size_t,len);
diff --git a/newlib/libc/sys/linux/setrlimit64.c b/newlib/libc/sys/linux/setrlimit64.c
deleted file mode 100644
index d4b4bfc..0000000
--- a/newlib/libc/sys/linux/setrlimit64.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (C) 1991,1995,1996,1997,1998,2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/resource.h>
-#include <sys/types.h>
-
-/* Set the soft and hard limits for RESOURCE to *RLIMITS.
-   Only the super-user can increase hard limits.
-   Return 0 if successful, -1 if not (and sets errno).  */
-int
-setrlimit64 (resource, rlimits)
-     enum __rlimit_resource resource;
-     const struct rlimit64 *rlimits;
-{
-  struct rlimit rlimits32;
-
-  if (rlimits->rlim_cur >= RLIM_INFINITY)
-    rlimits32.rlim_cur = RLIM_INFINITY;
-  else
-    rlimits32.rlim_cur = rlimits->rlim_cur;
-  if (rlimits->rlim_max >= RLIM_INFINITY)
-    rlimits32.rlim_max = RLIM_INFINITY;
-  else
-    rlimits32.rlim_max = rlimits->rlim_max;
-
-  return __setrlimit (resource, &rlimits32);
-}
diff --git a/newlib/libc/sys/linux/shared.ld b/newlib/libc/sys/linux/shared.ld
index 33bf4f8..f51a2b1 100644
--- a/newlib/libc/sys/linux/shared.ld
+++ b/newlib/libc/sys/linux/shared.ld
@@ -1,19 +1,3 @@
 VERS_1.10 {
 	global: *;
 };
-
-VERS_1.11 {
-	global: *;
-};
-
-VERS_1.12 {
-	global: *;
-};
-
-VERS_1.13 {
-	global: *;
-};
-
-VERS_1.14 {
-	global: *;
-};
diff --git a/newlib/libc/sys/linux/shm_open.c b/newlib/libc/sys/linux/shm_open.c
deleted file mode 100644
index cb92c3a..0000000
--- a/newlib/libc/sys/linux/shm_open.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* shm_open - open a shared memory file */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <limits.h>
-
-int
-shm_open (const char *name, int oflag, mode_t mode)
-{
-  int fd;
-  char shm_name[PATH_MAX+20] = "/dev/shm/";
-
-  /* skip opening slash */
-  if (*name == '/')
-    ++name;
-
-  /* create special shared memory file name and leave enough space to
-     cause a path/name error if name is too long */
-  strlcpy (shm_name + 9, name, PATH_MAX + 10);
-
-  fd = open (shm_name, oflag, mode);
-
-  if (fd != -1)
-    {
-      /* once open we must add FD_CLOEXEC flag to file descriptor */
-      int flags = fcntl (fd, F_GETFD, 0);
-
-      if (flags >= 0)
-        {
-          flags |= FD_CLOEXEC;
-          flags = fcntl (fd, F_SETFD, flags);
-        }
-
-      /* on failure, just close file and give up */
-      if (flags == -1)
-        {
-          close (fd);
-          fd = -1;
-        }
-    }
-
-  return fd;
-}
diff --git a/newlib/libc/sys/linux/shm_unlink.c b/newlib/libc/sys/linux/shm_unlink.c
deleted file mode 100644
index cf259c6..0000000
--- a/newlib/libc/sys/linux/shm_unlink.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* shm_unlink - remove a shared memory file */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <string.h>
-#include <limits.h>
-
-int
-shm_unlink (const char *name)
-{
-  int rc;
-  char shm_name[PATH_MAX+20] = "/dev/shm/";
-
-  /* skip opening slash */
-  if (*name == '/')
-    ++name;
-
-  /* create special shared memory file name and leave enough space to
-     cause a path/name error if name is too long */
-  strlcpy (shm_name + 9, name, PATH_MAX + 10);
-
-  rc = unlink (shm_name);
-
-  return rc;
-}
diff --git a/newlib/libc/sys/linux/sig.c b/newlib/libc/sys/linux/sig.c
deleted file mode 100644
index 6e22873..0000000
--- a/newlib/libc/sys/linux/sig.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* libc/sys/linux/signal.c - Signal handling functions */
-
-/* Written 2000 by Werner Almesberger */
-
-
-#include <signal.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <machine/syscall.h>
-
-/* avoid name space pollution */
-#define __NR___sgetmask __NR_sgetmask
-#define __NR___ssetmask __NR_ssetmask
-#define __NR___rt_sigtimedwait __NR_rt_sigtimedwait
-#define __NR___rt_sigpending __NR_rt_sigpending
-#define __NR___rt_sigprocmask __NR_rt_sigprocmask
-#define __NR___rt_sigsuspend __NR_rt_sigsuspend
-
-_syscall2(int,kill,pid_t,pid,int,sig)
-_syscall2(__sighandler_t,signal,int,signum,__sighandler_t,handler)
-_syscall0(int,pause)
-_syscall1(unsigned int,alarm,unsigned int,seconds)
-
-static _syscall2(int,__rt_sigpending,sigset_t *,set,size_t,size)
-static _syscall4(int,__rt_sigprocmask,int,how,const sigset_t *,set,sigset_t *,oldset,size_t,size)
-static _syscall2(int,__rt_sigsuspend,const sigset_t *,mask,size_t,size)
-static _syscall4(int,__rt_sigtimedwait,const sigset_t *,set,siginfo_t *,info,struct timespec *,timeout,size_t,size)
-
-int __sigsuspend (const sigset_t *mask)
-{
-    return __rt_sigsuspend(mask, NSIG/8);
-}
-weak_alias(__sigsuspend,sigsuspend)
-
-int sigmask(int signum) /* BSD */
-{
-    return 1 << signum;
-}
-
-int __libc_raise(int sig)
-{
-    return kill(getpid(),sig);
-}
-weak_alias(__libc_raise,raise)
-
-int __sigpending(sigset_t *set)
-{
-  return __rt_sigpending(set, NSIG/8);
-}
-weak_alias(__sigpending,sigpending)
-
-int __sigprocmask (int how,const sigset_t *set,sigset_t *oldset)
-{
-  return __rt_sigprocmask(how, set, oldset, NSIG/8);
-}
-weak_alias(__sigprocmask,sigprocmask)
-
-int sigtimedwait(const sigset_t *set, siginfo_t *info,
-                 struct timespec *timeout)
-{
-  return __rt_sigtimedwait(set, info, timeout, NSIG/8);
-}
-
-int sigwaitinfo(const sigset_t *set, siginfo_t *info)
-{
-  return __rt_sigtimedwait(set, info, NULL, NSIG/8);
-}
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4
-
-static _syscall1(int,__ssetmask,int,newmask)
-static _syscall0(int,__sgetmask)
-
-int sigblock(int mask) /* BSD */
-{
-    return __ssetmask(mask | __sgetmask());
-}
-
-int sigsetmask(int newmask) /* BSD */
-{
-    return __ssetmask(newmask);
-}
-#endif
-
-const char *const sys_siglist[] = {
-#include "siglist.inc"
-};
diff --git a/newlib/libc/sys/linux/sigaction.c b/newlib/libc/sys/linux/sigaction.c
deleted file mode 100644
index 6ee3fa2..0000000
--- a/newlib/libc/sys/linux/sigaction.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Modified 05/30/02 by Jeff Johnston, Red Hat Inc. */
-
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-
-#include <machine/syscall.h>
-
-/* The difference here is that the sigaction structure used in the
-   kernel is not the same as we use in the libc.  Therefore we must
-   translate it here.  */
-#include <kernel_sigaction.h>
-
-#define __NR___rt_sigaction __NR_rt_sigaction
-
-static _syscall4(int,__rt_sigaction,int,sig,
-                 const struct kernel_sigaction *,act,
-                 struct kernel_sigaction *,oact,size_t,size);
-
-/* If ACT is not NULL, change the action for SIG to *ACT.
-   If OACT is not NULL, put the old action for SIG in *OACT.  */
-int
-__libc_sigaction (sig, act, oact)
-     int sig;
-     const struct sigaction *act;
-     struct sigaction *oact;
-{
-  int result;
-  struct kernel_sigaction kact, koact;
-  /* Save the current error value for later.  We need not do this
-     if we are guaranteed to have realtime signals.  */
-
-  if (act)
-    {
-      kact.k_sa_handler = act->sa_handler;
-      memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t));
-      kact.sa_flags = act->sa_flags;
-      kact.sa_restorer = act->sa_restorer;
-    }
-
-  /* XXX The size argument hopefully will have to be changed to the
-     real size of the user-level sigset_t.  */
-  result = __rt_sigaction (sig,
-	       act ? (&kact) : NULL,
-	       oact ? (&koact) : NULL, NSIG / 8);
-
-  if (oact && result >= 0)
-    {
-      oact->sa_handler = koact.k_sa_handler;
-      memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (sigset_t));
-      oact->sa_flags = koact.sa_flags;
-      oact->sa_restorer = koact.sa_restorer;
-    }
-
-  return result;
-}
-
-weak_alias (__libc_sigaction, __sigaction)
-weak_alias (__libc_sigaction, sigaction)
diff --git a/newlib/libc/sys/linux/siglongjmp.c b/newlib/libc/sys/linux/siglongjmp.c
deleted file mode 100644
index bc3c5b7..0000000
--- a/newlib/libc/sys/linux/siglongjmp.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* libc/sys/linux/siglongjmp.c - siglongjmp function */
-
-/* Copyright 2002, Red Hat Inc. */
-
-
-#include <setjmp.h>
-#include <signal.h>
-#include <machine/weakalias.h>
-
-void
-__libc_siglongjmp (sigjmp_buf env, int val)
-{
-  if (env.__is_mask_saved)
-    sigprocmask (SIG_SETMASK, &env.__saved_mask, NULL);
-
-  __libc_longjmp (env.__buf, val);
-}
-weak_alias(__libc_siglongjmp,siglongjmp);
diff --git a/newlib/libc/sys/linux/signal.c b/newlib/libc/sys/linux/signal.c
index b43cd77..91e9596 100644
--- a/newlib/libc/sys/linux/signal.c
+++ b/newlib/libc/sys/linux/signal.c
@@ -1,54 +1,55 @@
-/* BSD-like signal function.
-   Copyright (C) 1991, 1992, 1996, 1997, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
+/* libc/sys/linux/signal.c - Signal handling functions */
+
+/* Written 2000 by Werner Almesberger */
+
+
 #include <signal.h>
-#include <machine/weakalias.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/syscall.h>
+
+
+#define __NR___sgetmask __NR_sgetmask /* avoid name space pollution */
+#define __NR___ssetmask __NR_ssetmask /* avoid name space pollution */
+
+_syscall2(int,kill,pid_t,pid,int,sig)
+_syscall2(__sighandler_t,signal,int,signum,__sighandler_t,handler)
+_syscall3(int,sigaction,int,signum,const struct sigaction *,act,
+  struct sigaction *,oldact)
+_syscall1(int,sigsuspend,const sigset_t *,mask)
+_syscall1(int,sigpending,sigset_t *,set)
+_syscall0(int,pause)
+_syscall1(unsigned int,alarm,unsigned int,seconds)
+_syscall3(int,sigprocmask,int,how,const sigset_t *,set,sigset_t *,oldset)
+
+static _syscall0(int,__sgetmask)
+static _syscall1(int,__ssetmask,int,newmask)
+
+
+int sigsetmask(int newmask) /* BSD */
+{
+    return __ssetmask(newmask);
+}
 
-sigset_t _sigintr;		/* Set by siginterrupt.  */
 
-/* Set the handler for the signal SIG to HANDLER,
-   returning the old handler, or SIG_ERR on error.  */
-__sighandler_t
-__bsd_signal (sig, handler)
-     int sig;
-     __sighandler_t handler;
+int sigmask(int signum) /* BSD */
 {
-  struct sigaction act, oact;
-
-  /* Check signal extents to protect __sigismember.  */
-  if (handler == SIG_ERR || sig < 1 || sig >= NSIG)
-    {
-      errno = (EINVAL);
-      return SIG_ERR;
-    }
-
-  act.sa_handler = handler;
-  if (sigemptyset (&act.sa_mask) < 0
-      || sigaddset (&act.sa_mask, sig) < 0)
-    return SIG_ERR;
-  act.sa_flags = sigismember (&_sigintr, sig) ? 0 : SA_RESTART;
-  if (sigaction (sig, &act, &oact) < 0)
-    return SIG_ERR;
-
-  return oact.sa_handler;
+    return 1 << signum;
 }
-weak_alias (__bsd_signal, bsd_signal)
-weak_alias (__bsd_signal, signal)
-weak_alias (__bsd_signal, ssignal)
+
+
+int sigblock(int mask) /* BSD */
+{
+    return __ssetmask(mask | __sgetmask());
+}
+
+
+int raise(int sig)
+{
+    return kill(getpid(),sig);
+}
+
+
+const char *const sys_siglist[] = {
+#include "siglist.inc"
+};
diff --git a/newlib/libc/sys/linux/sigqueue.c b/newlib/libc/sys/linux/sigqueue.c
deleted file mode 100644
index 60c4fed..0000000
--- a/newlib/libc/sys/linux/sigqueue.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Modified for newlib by Jeff Johnston, May 30, 2002 */
-
-#include <errno.h>
-#include <signal.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <machine/syscall.h>
-
-#define __NR___rt_sigqueueinfo __NR_rt_sigqueueinfo
-
-extern uid_t __getuid();
-extern pid_t __getpid();
-
-static _syscall3(int,__rt_sigqueueinfo,int,pid,int,sig,siginfo_t *,info)
-
-/* Return any pending signal or wait for one for the given time.  */
-int
-__sigqueue (pid, sig, val)
-     pid_t pid;
-     int sig;
-     const union sigval val;
-{
-  siginfo_t info;
-
-  /* First, clear the siginfo_t structure, so that we don't pass our
-     stack content to other tasks.  */
-  memset (&info, 0, sizeof (siginfo_t));
-  /* We must pass the information about the data in a siginfo_t value.  */
-  info.si_signo = sig;
-  info.si_code = SI_QUEUE;
-  info.si_pid = __getpid ();
-  info.si_uid = __getuid ();
-  info.si_value = val;
-
-  return __rt_sigqueueinfo(pid, sig, &info);
-}
-weak_alias (__sigqueue, sigqueue)
diff --git a/newlib/libc/sys/linux/sigset.c b/newlib/libc/sys/linux/sigset.c
deleted file mode 100644
index b6f2d79..0000000
--- a/newlib/libc/sys/linux/sigset.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* sigset.c - signal set manipulation functions */
-
-/* Copyright 2002, Red Hat Inc. */
-
-/* Note: these are currently grouped together in one file so that
-         it will override the default version in the libc/unix 
-         directory which has grouped all functions in one file. */
-
-/* sigaddset function */
-
-#include <signal.h>
-#include <bits/sigset.h>
-#include <errno.h>
-#include <string.h>
-#include <machine/weakalias.h>
-
-int
-sigaddset (sigset_t *set, const int signo)
-{
-  int index, mask;
-  __sigset_t *st = (__sigset_t *)set;
-
-  if (signo > NSIG)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  index = (signo - 1) / (8 * sizeof(long));
-  mask = 1 << ((signo - 1) % (8 * sizeof(long)));
-
-  st->__val[index] |= mask;
-  return 0;
-}
-
-/* sigdelset function */
-
-int
-sigdelset (sigset_t *set, const int signo)
-{
-  int index, mask;
-  __sigset_t *st = (__sigset_t *)set;
-
-  if (signo > NSIG)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  index = (signo - 1) / (8 * sizeof(long));
-  mask = 1 << ((signo - 1) % (8 * sizeof(long)));
-
-  st->__val[index] &= ~mask;
-  return 0;
-}
-
-/* sigemptyset function */
-
-int
-sigemptyset (sigset_t *set)
-{
-  int size = NSIG / 8;
-  __sigset_t *st = (__sigset_t *)set;
-  memset (st->__val, 0, size);
-  return 0;
-}
-
-/* sigfillset function */
-
-int
-sigfillset (sigset_t *set)
-{
-  int size = NSIG / 8;
-  __sigset_t *st = (__sigset_t *)set;
-  memset (st->__val, 0xff, size);
-  return 0;
-}
-
-/* sigismember function */
-
-int
-sigismember (const sigset_t *set, int signo)
-{
-  int index, mask;
-  __sigset_t *st = (__sigset_t *)set;
-
-  if (signo > NSIG)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  index = (signo - 1) / (8 * sizeof(long));
-  mask = 1 << ((signo - 1) % (8 * sizeof(long)));
-
-  return (st->__val[index] & mask) != 0;
-}
-
diff --git a/newlib/libc/sys/linux/sigwait.c b/newlib/libc/sys/linux/sigwait.c
deleted file mode 100644
index 09a4190..0000000
--- a/newlib/libc/sys/linux/sigwait.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Implementation of sigwait function from POSIX.1c.
-   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <signal.h>
-#include <stddef.h>		/* For NULL.  */
-
-#include <machine/weakalias.h>
-
-/* This is our dummy signal handler we use here.  */
-static void ignore_signal (int sig);
-
-/* Place where to remember which signal we got.  Please note that this
-   implementation cannot be used for the threaded libc.  The
-   libpthread must provide an own version.  */
-static int was_sig;
-
-
-int
-__sigwait (const sigset_t *set, int *sig)
-{
-  sigset_t tmp_mask;
-  struct sigaction saved[NSIG];
-  struct sigaction action;
-  int save_errno;
-  int this;
-
-  /* Prepare set.  */
-  sigfillset (&tmp_mask);
-
-  /* Unblock all signals in the SET and register our nice handler.  */
-  action.sa_handler = ignore_signal;
-  action.sa_flags = 0;
-  sigfillset (&action.sa_mask);	/* Block all signals for handler.  */
-
-  /* Make sure we recognize error conditions by setting WAS_SIG to a
-     value which does not describe a legal signal number.  */
-  was_sig = -1;
-
-  for (this = 1; this < NSIG; ++this)
-    if (sigismember (set, this))
-      {
-	/* Unblock this signal.  */
-	sigdelset (&tmp_mask, this);
-
-	/* Register temporary action handler.  */
-	if (__sigaction (this, &action, &saved[this]) != 0)
-	  goto restore_handler;
-      }
-
-  /* Now we can wait for signals.  */
-  __sigsuspend (&tmp_mask);
-
- restore_handler:
-  save_errno = errno;
-
-  while (--this >= 1)
-    if (sigismember (set, this))
-      /* We ignore errors here since we must restore all handlers.  */
-      __sigaction (this, &saved[this], NULL);
-
-  errno = (save_errno);
-
-  /* Store the result and return.  */
-  *sig = was_sig;
-  return was_sig == -1 ? -1 : 0;
-}
-weak_alias (__sigwait, sigwait)
-
-
-static void
-ignore_signal (int sig)
-{
-  /* Remember the signal.  */
-  was_sig = sig;
-}
diff --git a/newlib/libc/sys/linux/sleep.c b/newlib/libc/sys/linux/sleep.c
deleted file mode 100644
index 7cc2bed..0000000
--- a/newlib/libc/sys/linux/sleep.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* libc/sys/linux/sleep.c - sleep function */
-
-/* Written 2000 by Werner Almesberger */
-
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <linux/times.h>
-
-unsigned int sleep(unsigned int seconds)
-{
-    struct timespec ts;
-
-    ts.tv_sec = seconds;
-    ts.tv_nsec = 0;
-    if (!nanosleep(&ts,&ts)) return 0;
-    if (errno == EINTR) return ts.tv_sec;
-    return -1;
-}
diff --git a/newlib/libc/sys/linux/socket.c b/newlib/libc/sys/linux/socket.c
deleted file mode 100644
index daba989..0000000
--- a/newlib/libc/sys/linux/socket.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* libc/sys/linux/socket.c - socket system calls */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#define __KERNEL_PROTOTYPES
-
-#include <stdarg.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <machine/socketcall.h>
-
-_sockcall3(int,accept,int,fd,struct sockaddr *,addr,socklen_t *,addr_len)
-_sockcall3(int,bind,int,fd,const struct sockaddr *,addr,socklen_t,len)
-_sockcall3(int,connect,int,fd,const struct sockaddr *,addr,socklen_t,len)
-_sockcall3(int,getpeername,int,fd,struct sockaddr *,addr,socklen_t *,len)
-_sockcall3(int,getsockname,int,fd,struct sockaddr *,addr,socklen_t *,len)
-_sockcall5(int,getsockopt,int,fd,int,level,int,opt,void *,optval,socklen_t *,optlen)
-_sockcall2(int,listen,int,fd,int,n)
-_sockcall4(ssize_t,recv,int,fd,void *,buf,size_t,n,int,flags)
-_sockcall6(ssize_t,recvfrom,int,fd,void *,buf,size_t,n,int,flags,struct sockaddr *,addr,socklen_t *,addr_len)
-_sockcall3(ssize_t,recvmsg,int,fd,struct msghdr *,message,int,flags)
-_sockcall4(ssize_t,send,int,fd,const void *,buf,size_t,n,int,flags)
-_sockcall6(ssize_t,sendto,int,fd,const void *,buf,size_t,n,int,flags,const struct sockaddr *,addr,socklen_t,addr_len)
-_sockcall5(int,setsockopt,int,fd,int,level,int,opt,const void *,optval,socklen_t,optlen)
-_sockcall2(int,shutdown,int,fd,int,how)
-_sockcall3(int,socket,int,domain,int,type,int,protocol)
-_sockcall4(int,socketpair,int,domain,int,type,int,protocol,int,fds[2])
-_sockcall3(ssize_t,sendmsg,int,fd,const struct msghdr *,message,int,flags)
-
-weak_alias(__libc_connect,__connect);
-weak_alias(__libc_send,__send);
diff --git a/newlib/libc/sys/linux/sockops.h b/newlib/libc/sys/linux/sockops.h
deleted file mode 100644
index 7a421f2..0000000
--- a/newlib/libc/sys/linux/sockops.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Linux socket syscall subopcodes */
-
-#ifndef _SOCKOPS_H
-
-#define _SOCKOPS_H
-
-#define SOCK_socket           1
-#define SOCK_bind             2
-#define SOCK_connect          3
-#define SOCK_listen           4
-#define SOCK_accept           5
-#define SOCK_getsockname      6
-#define SOCK_getpeername      7
-#define SOCK_socketpair       8
-#define SOCK_send             9
-#define SOCK_recv             10
-#define SOCK_sendto           11
-#define SOCK_recvfrom         12
-#define SOCK_shutdown         13
-#define SOCK_setsockopt       14
-#define SOCK_getsockopt       15
-#define SOCK_sendmsg          16
-#define SOCK_recvmsg          17
-
-#endif /* _SOCKOPS_H */
-
-
diff --git a/newlib/libc/sys/linux/stack.c b/newlib/libc/sys/linux/stack.c
deleted file mode 100644
index 52a181c..0000000
--- a/newlib/libc/sys/linux/stack.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* libc/sys/linux/stack.c - Basic stack system calls */
-
-/* Copyright 2002, Red Hat Inc. */
-
-#include <signal.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <machine/syscall.h>
-
-_syscall2(int,sigaltstack,const stack_t *,ss,stack_t *,oss)
diff --git a/newlib/libc/sys/linux/statvfs.c b/newlib/libc/sys/linux/statvfs.c
deleted file mode 100644
index 4b0d51a..0000000
--- a/newlib/libc/sys/linux/statvfs.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#define _GNU_SOURCE
-
-#include <errno.h>
-#include <mntent.h>
-#include <paths.h>
-#include <string.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/statvfs.h>
-
-
-int
-statvfs (const char *file, struct statvfs *buf)
-{
-  struct statfs fsbuf;
-  struct stat64 st;
-
-  /* Get as much information as possible from the system.  */
-  if (__statfs (file, &fsbuf) < 0)
-    return -1;
-
-#define STAT(st) stat64 (file, st)
-#include "internal_statvfs.c"
-
-  /* We signal success if the statfs call succeeded.  */
-  return 0;
-}
diff --git a/newlib/libc/sys/linux/statvfs64.c b/newlib/libc/sys/linux/statvfs64.c
deleted file mode 100644
index f612b99..0000000
--- a/newlib/libc/sys/linux/statvfs64.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Return information about the filesystem on which FILE resides.
-   Copyright (C) 1998, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/statvfs.h>
-#include <stddef.h>
-#include <string.h>
-#include <machine/weakalias.h>
-
-/* Return information about the filesystem on which FILE resides.  */
-int
-__statvfs64 (const char *file, struct statvfs64 *buf)
-{
-  struct statvfs buf32;
-
-  if (statvfs (file, &buf32) < 0)
-    return -1;
-
-  buf->f_bsize = buf32.f_bsize;
-  buf->f_frsize = buf32.f_frsize;
-  buf->f_blocks = buf32.f_blocks;
-  buf->f_bfree = buf32.f_bfree;
-  buf->f_bavail = buf32.f_bavail;
-  buf->f_files = buf32.f_files;
-  buf->f_ffree = buf32.f_ffree;
-  buf->f_favail = buf32.f_favail;
-  buf->f_fsid = buf32.f_fsid;
-  buf->f_flag = buf32.f_flag;
-  buf->f_namemax = buf32.f_namemax;
-  memcpy (buf->__f_spare, buf32.__f_spare, sizeof (buf32.__f_spare));
-
-  return 0;
-}
-weak_alias (__statvfs64, statvfs64)
diff --git a/newlib/libc/sys/linux/stdlib/COPYRIGHT b/newlib/libc/sys/linux/stdlib/COPYRIGHT
deleted file mode 100644
index 574f6bc..0000000
--- a/newlib/libc/sys/linux/stdlib/COPYRIGHT
+++ /dev/null
@@ -1,56 +0,0 @@
-Copyright 1992, 1993, 1994 Henry Spencer.  All rights reserved.
-This software is not subject to any license of the American Telephone
-and Telegraph Company or of the Regents of the University of California.
-
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it, subject
-to the following restrictions:
-
-1. The author is not responsible for the consequences of use of this
-   software, no matter how awful, even if they arise from flaws in it.
-
-2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission.  Since few users ever read sources,
-   credits must appear in the documentation.
-
-3. Altered versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.  Since few users
-   ever read sources, credits must appear in the documentation.
-
-4. This notice may not be removed or altered.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-/*-
- * Copyright (c) 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)COPYRIGHT	8.1 (Berkeley) 3/16/94
- */
diff --git a/newlib/libc/sys/linux/stdlib/Makefile.am b/newlib/libc/sys/linux/stdlib/Makefile.am
deleted file mode 100644
index 2df19ed..0000000
--- a/newlib/libc/sys/linux/stdlib/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-GENERAL_SOURCES = \
-	fnmatch.c glob.c regcomp.c regerror.c regex2.h \
-	regexec.c regfree.c collate.h collate.c collcmp.c \
-	reallocf.c
-
-ELIX_3_OBJS = \
-	wordexp.$(oext) \
-	wordfree.$(oext)
-
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-if ELIX_LEVEL_2
-LIB_OBJS =
-else
-LIB_OBJS = $(ELIX_3_OBJS)
-endif
-endif
-
-libstdlib_la_LDFLAGS = -Xcompiler -nostdlib
-
-if USE_LIBTOOL
-noinst_LTLIBRARIES = libstdlib.la
-libstdlib_la_SOURCES = $(GENERAL_SOURCES)
-libstdlib_la_LIBADD = $(LIB_OBJS) 
-libstdlib_la_DEPENDENCIES = $(LIB_OBJS) 
-noinst_DATA = objectlist.awk.in
-else
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS) 
-lib_a_DEPENDENCIES = $(LIB_OBJS) 
-noinst_DATA =
-endif # USE_LIBTOOL
-
-AM_CFLAGS = -D_GNU_SOURCE
-
-include $(srcdir)/../../../../Makefile.shared
diff --git a/newlib/libc/sys/linux/stdlib/Makefile.in b/newlib/libc/sys/linux/stdlib/Makefile.in
deleted file mode 100644
index 6411586..0000000
--- a/newlib/libc/sys/linux/stdlib/Makefile.in
+++ /dev/null
@@ -1,377 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-AWK = @AWK@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-EXTRA_SUBDIRS = @EXTRA_SUBDIRS@
-EXTRA_SUBLIBS = @EXTRA_SUBLIBS@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LINUX_MACH_LIB = @LINUX_MACH_LIB@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-GENERAL_SOURCES =  	fnmatch.c glob.c regcomp.c regerror.c regex2.h 	regexec.c regfree.c collate.h collate.c collcmp.c 	reallocf.c
-
-
-ELIX_3_OBJS =  	wordexp.$(oext) 	wordfree.$(oext)
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@LIB_OBJS = $(ELIX_3_OBJS)
-
-libstdlib_la_LDFLAGS = -Xcompiler -nostdlib
-
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libstdlib.la
-@USE_LIBTOOL_TRUE@libstdlib_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@libstdlib_la_LIBADD = $(LIB_OBJS) 
-@USE_LIBTOOL_TRUE@libstdlib_la_DEPENDENCIES = $(LIB_OBJS) 
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
-@USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS) 
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS) 
-
-AM_CFLAGS = -D_GNU_SOURCE
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  fnmatch.$(OBJEXT) glob.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@regcomp.$(OBJEXT) regerror.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@regexec.$(OBJEXT) regfree.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@collate.$(OBJEXT) collcmp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@reallocf.$(OBJEXT)
-LTLIBRARIES =  $(noinst_LTLIBRARIES)
-
-@USE_LIBTOOL_TRUE@libstdlib_la_OBJECTS =  fnmatch.lo glob.lo regcomp.lo \
-@USE_LIBTOOL_TRUE@regerror.lo regexec.lo regfree.lo collate.lo \
-@USE_LIBTOOL_TRUE@collcmp.lo reallocf.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES) $(libstdlib_la_SOURCES)
-OBJECTS = $(lib_a_OBJECTS) $(libstdlib_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../../Makefile.shared
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus stdlib/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-mostlyclean-noinstLTLIBRARIES:
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-
-distclean-noinstLTLIBRARIES:
-
-maintainer-clean-noinstLTLIBRARIES:
-
-libstdlib.la: $(libstdlib_la_OBJECTS) $(libstdlib_la_DEPENDENCIES)
-	$(LINK)  $(libstdlib_la_LDFLAGS) $(libstdlib_la_OBJECTS) $(libstdlib_la_LIBADD) $(LIBS)
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = stdlib
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-noinstLTLIBRARIES \
-		mostlyclean-tags mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-noinstLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstLTLIBRARIES \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-noinstLTLIBRARIES \
-distclean-noinstLTLIBRARIES clean-noinstLTLIBRARIES \
-maintainer-clean-noinstLTLIBRARIES tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-info-am install-info \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-objectlist.awk.in: $(noinst_LTLIBRARIES)
-	-rm -f objectlist.awk.in
-	for i in `ls *.lo` ; \
-	do \
-	  echo $$i `pwd`/$$i >> objectlist.awk.in ; \
-	done
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/linux/stdlib/cclass.h b/newlib/libc/sys/linux/stdlib/cclass.h
deleted file mode 100644
index 956a655..0000000
--- a/newlib/libc/sys/linux/stdlib/cclass.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)cclass.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD: src/lib/libc/regex/cclass.h,v 1.4 2002/03/22 23:41:56 obrien Exp $
- */
-
-
-typedef enum {CALNUM, CALPHA, CBLANK, CCNTRL, CDIGIT, CGRAPH,
-	      CLOWER, CPRINT, CPUNCT, CSPACE, CUPPER, CXDIGIT} citype;
-
-/* character-class table */
-static struct cclass {
-	char *name;
-	citype fidx;
-} cclasses[] = {
-	{"alnum",       CALNUM},
-	{"alpha",       CALPHA},
-	{"blank",       CBLANK},
-	{"cntrl",       CCNTRL},
-	{"digit",       CDIGIT},
-	{"graph",       CGRAPH},
-	{"lower",       CLOWER},
-	{"print",       CPRINT},
-	{"punct",       CPUNCT},
-	{"space",       CSPACE},
-	{"upper",       CUPPER},
-	{"xdigit",      CXDIGIT},
-	{NULL,          }
-};
diff --git a/newlib/libc/sys/linux/stdlib/cname.h b/newlib/libc/sys/linux/stdlib/cname.h
deleted file mode 100644
index 4f0d583..0000000
--- a/newlib/libc/sys/linux/stdlib/cname.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)cname.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD: src/lib/libc/regex/cname.h,v 1.3 2002/03/22 23:41:56 obrien Exp $
- */
-
-/* character-name table */
-static struct cname {
-	char *name;
-	char code;
-} cnames[] = {
-	{"NUL",			'\0'},
-	{"SOH",			'\001'},
-	{"STX",			'\002'},
-	{"ETX",			'\003'},
-	{"EOT",			'\004'},
-	{"ENQ",			'\005'},
-	{"ACK",			'\006'},
-	{"BEL",			'\007'},
-	{"alert",		'\007'},
-	{"BS",			'\010'},
-	{"backspace",		'\b'},
-	{"HT",			'\011'},
-	{"tab",			'\t'},
-	{"LF",			'\012'},
-	{"newline",		'\n'},
-	{"VT",			'\013'},
-	{"vertical-tab",	'\v'},
-	{"FF",			'\014'},
-	{"form-feed",		'\f'},
-	{"CR",			'\015'},
-	{"carriage-return",	'\r'},
-	{"SO",			'\016'},
-	{"SI",			'\017'},
-	{"DLE",			'\020'},
-	{"DC1",			'\021'},
-	{"DC2",			'\022'},
-	{"DC3",			'\023'},
-	{"DC4",			'\024'},
-	{"NAK",			'\025'},
-	{"SYN",			'\026'},
-	{"ETB",			'\027'},
-	{"CAN",			'\030'},
-	{"EM",			'\031'},
-	{"SUB",			'\032'},
-	{"ESC",			'\033'},
-	{"IS4",			'\034'},
-	{"FS",			'\034'},
-	{"IS3",			'\035'},
-	{"GS",			'\035'},
-	{"IS2",			'\036'},
-	{"RS",			'\036'},
-	{"IS1",			'\037'},
-	{"US",			'\037'},
-	{"space",		' '},
-	{"exclamation-mark",	'!'},
-	{"quotation-mark",	'"'},
-	{"number-sign",		'#'},
-	{"dollar-sign",		'$'},
-	{"percent-sign",	'%'},
-	{"ampersand",		'&'},
-	{"apostrophe",		'\''},
-	{"left-parenthesis",	'('},
-	{"right-parenthesis",	')'},
-	{"asterisk",		'*'},
-	{"plus-sign",		'+'},
-	{"comma",		','},
-	{"hyphen",		'-'},
-	{"hyphen-minus",	'-'},
-	{"period",		'.'},
-	{"full-stop",		'.'},
-	{"slash",		'/'},
-	{"solidus",		'/'},
-	{"zero",		'0'},
-	{"one",			'1'},
-	{"two",			'2'},
-	{"three",		'3'},
-	{"four",		'4'},
-	{"five",		'5'},
-	{"six",			'6'},
-	{"seven",      		'7'},
-	{"eight",		'8'},
-	{"nine",		'9'},
-	{"colon",		':'},
-	{"semicolon",		';'},
-	{"less-than-sign",	'<'},
-	{"equals-sign",		'='},
-	{"greater-than-sign",	'>'},
-	{"question-mark",	'?'},
-	{"commercial-at",	'@'},
-	{"left-square-bracket",	'['},
-	{"backslash",		'\\'},
-	{"reverse-solidus",	'\\'},
-	{"right-square-bracket",']'},
-	{"circumflex",		'^'},
-	{"circumflex-accent",	'^'},
-	{"underscore",		'_'},
-	{"low-line",		'_'},
-	{"grave-accent",	'`'},
-	{"left-brace",		'{'},
-	{"left-curly-bracket",	'{'},
-	{"vertical-line",	'|'},
-	{"right-brace",		'}'},
-	{"right-curly-bracket",	'}'},
-	{"tilde",		'~'},
-	{"DEL",	'\177'},
-	{NULL,	0}
-};
diff --git a/newlib/libc/sys/linux/stdlib/collate.c b/newlib/libc/sys/linux/stdlib/collate.c
deleted file mode 100644
index 05ee9ab..0000000
--- a/newlib/libc/sys/linux/stdlib/collate.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.24 2002/03/29 22:43:42 markm Exp $");
-
-#include "namespace.h"
-#include <rune.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sysexits.h>
-#include "un-namespace.h"
-
-#include "collate.h"
-#include "setlocale.h"
-
-#include "libc_private.h"
-
-extern char *_PathLocale;
-int __collate_load_error = 1;
-int __collate_substitute_nontrivial;
-char __collate_version[STR_LEN];
-u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
-struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1];
-struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE];
-
-#define FREAD(a, b, c, d) \
-	do { \
-		if (fread(a, b, c, d) != c) { \
-			fclose(d); \
-			return -1; \
-		} \
-	} while(0)
-
-void __collate_err(int ex, const char *f);
-
-int
-__collate_load_tables(encoding)
-	char *encoding;
-{
-	char buf[PATH_MAX];
-	FILE *fp;
-	int i, save_load_error;
-
-	save_load_error = __collate_load_error;
-	__collate_load_error = 1;
-	if (!encoding) {
-		__collate_load_error = save_load_error;
-		return -1;
-	}
-	if (!strcmp(encoding, "C") || !strcmp(encoding, "POSIX"))
-		return 0;
-	if (!_PathLocale) {
-		__collate_load_error = save_load_error;
-		return -1;
-	}
-	/* Range checking not needed, encoding has fixed size */
-	(void) strcpy(buf, _PathLocale);
-	(void) strcat(buf, "/");
-	(void) strcat(buf, encoding);
-	(void) strcat(buf, "/LC_COLLATE");
-	if ((fp = fopen(buf, "r")) == NULL) {
-		__collate_load_error = save_load_error;
-		return -1;
-	}
-	FREAD(__collate_version, sizeof(__collate_version), 1, fp);
-	if (strcmp(__collate_version, COLLATE_VERSION) != 0) {
-		fclose(fp);
-		return -1;
-	}
-	FREAD(__collate_substitute_table, sizeof(__collate_substitute_table),
-	      1, fp);
-	FREAD(__collate_char_pri_table, sizeof(__collate_char_pri_table), 1,
-	      fp);
-	FREAD(__collate_chain_pri_table, sizeof(__collate_chain_pri_table), 1,
-	      fp);
-	fclose(fp);
-	__collate_load_error = 0;
-	
-	__collate_substitute_nontrivial = 0;
-	for (i = 0; i < UCHAR_MAX + 1; i++) {
-		if (__collate_substitute_table[i][0] != i ||
-		    __collate_substitute_table[i][1] != 0) {
-			__collate_substitute_nontrivial = 1;
-			break;
-		}
-	}
-
-	return 0;
-}
-
-u_char *
-__collate_substitute(s)
-	const u_char *s;
-{
-	int dest_len, len, nlen;
-	int delta = strlen(s);
-	u_char *dest_str = NULL;
-
-	if(s == NULL || *s == '\0')
-		return __collate_strdup("");
-	delta += delta / 8;
-	dest_str = malloc(dest_len = delta);
-	if(dest_str == NULL)
-		__collate_err(EX_OSERR, __FUNCTION__);
-	len = 0;
-	while(*s) {
-		nlen = len + strlen(__collate_substitute_table[*s]);
-		if (dest_len <= nlen) {
-			dest_str = reallocf(dest_str, dest_len = nlen + delta);
-			if(dest_str == NULL)
-				__collate_err(EX_OSERR, __FUNCTION__);
-		}
-		strcpy(dest_str + len, __collate_substitute_table[*s++]);
-		len = nlen;
-	}
-	return dest_str;
-}
-
-void
-__collate_lookup(t, len, prim, sec)
-	const u_char *t;
-	int *len, *prim, *sec;
-{
-	struct __collate_st_chain_pri *p2;
-
-	*len = 1;
-	*prim = *sec = 0;
-	for(p2 = __collate_chain_pri_table; p2->str[0]; p2++) {
-		if(strncmp(t, p2->str, strlen(p2->str)) == 0) {
-			*len = strlen(p2->str);
-			*prim = p2->prim;
-			*sec = p2->sec;
-			return;
-		}
-	}
-	*prim = __collate_char_pri_table[*t].prim;
-	*sec = __collate_char_pri_table[*t].sec;
-}
-
-u_char *
-__collate_strdup(s)
-	u_char *s;
-{
-	u_char *t = strdup(s);
-
-	if (t == NULL)
-		__collate_err(EX_OSERR, __FUNCTION__);
-	return t;
-}
-
-void
-__collate_err(int ex, const char *f)
-{
-	const char *s = strdup("collate_error");
-	int serrno = errno;
-
-	write(STDERR_FILENO, s, strlen(s));
-	write(STDERR_FILENO, ": ", 2);
-	free(s);
-	s = f;
-	write(STDERR_FILENO, s, strlen(s));
-	write(STDERR_FILENO, ": ", 2);
-	s = strerror(serrno);
-	write(STDERR_FILENO, s, strlen(s));
-	write(STDERR_FILENO, "\n", 1);
-	exit(ex);
-}
-
-#ifdef COLLATE_DEBUG
-void
-__collate_print_tables()
-{
-	int i;
-	struct __collate_st_chain_pri *p2;
-
-	printf("Substitute table:\n");
-	for (i = 0; i < UCHAR_MAX + 1; i++)
-	    if (i != *__collate_substitute_table[i])
-		printf("\t'%c' --> \"%s\"\n", i,
-		       __collate_substitute_table[i]);
-	printf("Chain priority table:\n");
-	for (p2 = __collate_chain_pri_table; p2->str[0]; p2++)
-		printf("\t\"%s\" : %d %d\n\n", p2->str, p2->prim, p2->sec);
-	printf("Char priority table:\n");
-	for (i = 0; i < UCHAR_MAX + 1; i++)
-		printf("\t'%c' : %d %d\n", i, __collate_char_pri_table[i].prim,
-		       __collate_char_pri_table[i].sec);
-}
-#endif
diff --git a/newlib/libc/sys/linux/stdlib/collate.h b/newlib/libc/sys/linux/stdlib/collate.h
deleted file mode 100644
index 2e04518..0000000
--- a/newlib/libc/sys/linux/stdlib/collate.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/lib/libc/locale/collate.h,v 1.11 2002/03/21 22:46:54 obrien Exp $
- */
-
-#ifndef _COLLATE_H_
-#define	_COLLATE_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <limits.h>
-
-#define STR_LEN 10
-#define TABLE_SIZE 100
-#define COLLATE_VERSION "1.0\n"
-
-struct __collate_st_char_pri {
-	int prim, sec;
-};
-struct __collate_st_chain_pri {
-	u_char str[STR_LEN];
-	int prim, sec;
-};
-
-extern int __collate_load_error;
-extern int __collate_substitute_nontrivial;
-extern char __collate_version[STR_LEN];
-extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
-extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1];
-extern struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE];
-
-__BEGIN_DECLS
-u_char	*__collate_strdup(u_char *);
-u_char	*__collate_substitute(const u_char *);
-int	__collate_load_tables(char *);
-void	__collate_lookup(const u_char *, int *, int *, int *);
-int	__collate_range_cmp(int, int);
-#ifdef COLLATE_DEBUG
-void	__collate_print_tables(void);
-#endif
-__END_DECLS
-
-#endif /* !_COLLATE_H_ */
diff --git a/newlib/libc/sys/linux/stdlib/collcmp.c b/newlib/libc/sys/linux/stdlib/collcmp.c
deleted file mode 100644
index 97046a9..0000000
--- a/newlib/libc/sys/linux/stdlib/collcmp.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 1996 by Andrey A. Chernov, Moscow, Russia.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/collcmp.c,v 1.14 2002/03/22 21:52:18 obrien Exp $");
-
-#define ASCII_COMPATIBLE_COLLATE        /* see share/colldef */
-
-#include <string.h>
-#include "collate.h"
-#ifndef ASCII_COMPATIBLE_COLLATE
-#include <ctype.h>
-#endif
-
-/*
- * Compare two characters converting collate information
- * into ASCII-compatible range, it allows to handle
- * "[a-z]"-type ranges with national characters.
- */
-
-int __collate_range_cmp (c1, c2)
-	int c1, c2;
-{
-	static char s1[2], s2[2];
-	int ret;
-#ifndef ASCII_COMPATIBLE_COLLATE
-	int as1, as2, al1, al2;
-#endif
-
-	c1 &= UCHAR_MAX;
-	c2 &= UCHAR_MAX;
-	if (c1 == c2)
-		return (0);
-
-#ifndef ASCII_COMPATIBLE_COLLATE
-	as1 = isascii(c1);
-	as2 = isascii(c2);
-	al1 = isalpha(c1);
-	al2 = isalpha(c2);
-
-	if (as1 || as2 || al1 || al2) {
-		if ((as1 && as2) || (!al1 && !al2))
-			return (c1 - c2);
-		if (al1 && !al2) {
-			if (isupper(c1))
-				return ('A' - c2);
-			else
-				return ('a' - c2);
-		} else if (al2 && !al1) {
-			if (isupper(c2))
-				return (c1 - 'A');
-			else
-				return (c1 - 'a');
-		}
-	}
-#endif
-	s1[0] = c1;
-	s2[0] = c2;
-	if ((ret = strcoll(s1, s2)) != 0)
-		return (ret);
-	return (c1 - c2);
-}
diff --git a/newlib/libc/sys/linux/stdlib/engine.c b/newlib/libc/sys/linux/stdlib/engine.c
deleted file mode 100644
index 92f756f..0000000
--- a/newlib/libc/sys/linux/stdlib/engine.c
+++ /dev/null
@@ -1,1140 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)engine.c	8.5 (Berkeley) 3/20/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.12 2002/03/22 21:52:47 obrien Exp $");
-
-/*
- * The matching engine and friends.  This file is #included by regexec.c
- * after suitable #defines of a variety of macros used herein, so that
- * different state representations can be used without duplicating masses
- * of code.
- */
-
-#ifdef SNAMES
-#define	matcher	smatcher
-#define	fast	sfast
-#define	slow	sslow
-#define	dissect	sdissect
-#define	backref	sbackref
-#define	step	sstep
-#define	print	sprint
-#define	at	sat
-#define	match	smat
-#endif
-#ifdef LNAMES
-#define	matcher	lmatcher
-#define	fast	lfast
-#define	slow	lslow
-#define	dissect	ldissect
-#define	backref	lbackref
-#define	step	lstep
-#define	print	lprint
-#define	at	lat
-#define	match	lmat
-#endif
-
-/* another structure passed up and down to avoid zillions of parameters */
-struct match {
-	struct re_guts *g;
-	int eflags;
-	regmatch_t *pmatch;	/* [nsub+1] (0 element unused) */
-	char *offp;		/* offsets work from here */
-	char *beginp;		/* start of string -- virtual NUL precedes */
-	char *endp;		/* end of string -- virtual NUL here */
-	char *coldp;		/* can be no match starting before here */
-	char **lastpos;		/* [nplus+1] */
-	STATEVARS;
-	states st;		/* current states */
-	states fresh;		/* states for a fresh start */
-	states tmp;		/* temporary */
-	states empty;		/* empty set of states */
-};
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === engine.c === */
-static int matcher(struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
-static char *dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
-static char *backref(struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev);
-static char *fast(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
-static char *slow(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
-static states step(struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft);
-#define	BOL	(OUT+1)
-#define	EOL	(BOL+1)
-#define	BOLEOL	(BOL+2)
-#define	NOTHING	(BOL+3)
-#define	BOW	(BOL+4)
-#define	EOW	(BOL+5)
-#define	CODEMAX	(BOL+5)		/* highest code used */
-#define	NONCHAR(c)	((c) > CHAR_MAX)
-#define	NNONCHAR	(CODEMAX-CHAR_MAX)
-#ifdef REDEBUG
-static void print(struct match *m, char *caption, states st, int ch, FILE *d);
-#endif
-#ifdef REDEBUG
-static void at(struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst);
-#endif
-#ifdef REDEBUG
-static char *pchar(int ch);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-
-#ifdef REDEBUG
-#define	SP(t, s, c)	print(m, t, s, c, stdout)
-#define	AT(t, p1, p2, s1, s2)	at(m, t, p1, p2, s1, s2)
-#define	NOTE(str)	{ if (m->eflags&REG_TRACE) printf("=%s\n", (str)); }
-#else
-#define	SP(t, s, c)	/* nothing */
-#define	AT(t, p1, p2, s1, s2)	/* nothing */
-#define	NOTE(s)	/* nothing */
-#endif
-
-/*
- - matcher - the actual matching engine
- == static int matcher(struct re_guts *g, char *string, \
- ==	size_t nmatch, regmatch_t pmatch[], int eflags);
- */
-static int			/* 0 success, REG_NOMATCH failure */
-matcher(g, string, nmatch, pmatch, eflags)
-struct re_guts *g;
-char *string;
-size_t nmatch;
-regmatch_t pmatch[];
-int eflags;
-{
-	char *endp;
-	int i;
-	struct match mv;
-	struct match *m = &mv;
-	char *dp;
-	const sopno gf = g->firststate+1;	/* +1 for OEND */
-	const sopno gl = g->laststate;
-	char *start;
-	char *stop;
-	/* Boyer-Moore algorithms variables */
-	char *pp;
-	int cj, mj;
-	char *mustfirst;
-	char *mustlast;
-	int *matchjump;
-	int *charjump;
-
-	/* simplify the situation where possible */
-	if (g->cflags&REG_NOSUB)
-		nmatch = 0;
-	if (eflags&REG_STARTEND) {
-		start = string + pmatch[0].rm_so;
-		stop = string + pmatch[0].rm_eo;
-	} else {
-		start = string;
-		stop = start + strlen(start);
-	}
-	if (stop < start)
-		return(REG_INVARG);
-
-	/* prescreening; this does wonders for this rather slow code */
-	if (g->must != NULL) {
-		if (g->charjump != NULL && g->matchjump != NULL) {
-			mustfirst = g->must;
-			mustlast = g->must + g->mlen - 1;
-			charjump = g->charjump;
-			matchjump = g->matchjump;
-			pp = mustlast;
-			for (dp = start+g->mlen-1; dp < stop;) {
-				/* Fast skip non-matches */
-				while (dp < stop && charjump[*dp])
-					dp += charjump[*dp];
-
-				if (dp >= stop)
-					break;
-
-				/* Greedy matcher */
-				/* We depend on not being used for
-				 * for strings of length 1
-				 */
-				while (*--dp == *--pp && pp != mustfirst);
-
-				if (*dp == *pp)
-					break;
-
-				/* Jump to next possible match */
-				mj = matchjump[pp - mustfirst];
-				cj = charjump[*dp];
-				dp += (cj < mj ? mj : cj);
-				pp = mustlast;
-			}
-			if (pp != mustfirst)
-				return(REG_NOMATCH);
-		} else {
-			for (dp = start; dp < stop; dp++)
-				if (*dp == g->must[0] &&
-				    stop - dp >= g->mlen &&
-				    memcmp(dp, g->must, (size_t)g->mlen) == 0)
-					break;
-			if (dp == stop)		/* we didn't find g->must */
-				return(REG_NOMATCH);
-		}
-	}
-
-	/* match struct setup */
-	m->g = g;
-	m->eflags = eflags;
-	m->pmatch = NULL;
-	m->lastpos = NULL;
-	m->offp = string;
-	m->beginp = start;
-	m->endp = stop;
-	STATESETUP(m, 4);
-	SETUP(m->st);
-	SETUP(m->fresh);
-	SETUP(m->tmp);
-	SETUP(m->empty);
-	CLEAR(m->empty);
-
-	/* Adjust start according to moffset, to speed things up */
-	if (g->moffset > -1)
-		start = ((dp - g->moffset) < start) ? start : dp - g->moffset;
-
-	/* this loop does only one repetition except for backrefs */
-	for (;;) {
-		endp = fast(m, start, stop, gf, gl);
-		if (endp == NULL) {		/* a miss */
-			STATETEARDOWN(m);
-			return(REG_NOMATCH);
-		}
-		if (nmatch == 0 && !g->backrefs)
-			break;		/* no further info needed */
-
-		/* where? */
-		assert(m->coldp != NULL);
-		for (;;) {
-			NOTE("finding start");
-			endp = slow(m, m->coldp, stop, gf, gl);
-			if (endp != NULL)
-				break;
-			assert(m->coldp < m->endp);
-			m->coldp++;
-		}
-		if (nmatch == 1 && !g->backrefs)
-			break;		/* no further info needed */
-
-		/* oh my, he wants the subexpressions... */
-		if (m->pmatch == NULL)
-			m->pmatch = (regmatch_t *)malloc((m->g->nsub + 1) *
-							sizeof(regmatch_t));
-		if (m->pmatch == NULL) {
-			STATETEARDOWN(m);
-			return(REG_ESPACE);
-		}
-		for (i = 1; i <= m->g->nsub; i++)
-			m->pmatch[i].rm_so = m->pmatch[i].rm_eo = -1;
-		if (!g->backrefs && !(m->eflags&REG_BACKR)) {
-			NOTE("dissecting");
-			dp = dissect(m, m->coldp, endp, gf, gl);
-		} else {
-			if (g->nplus > 0 && m->lastpos == NULL)
-				m->lastpos = (char **)malloc((g->nplus+1) *
-							sizeof(char *));
-			if (g->nplus > 0 && m->lastpos == NULL) {
-				free(m->pmatch);
-				STATETEARDOWN(m);
-				return(REG_ESPACE);
-			}
-			NOTE("backref dissect");
-			dp = backref(m, m->coldp, endp, gf, gl, (sopno)0);
-		}
-		if (dp != NULL)
-			break;
-
-		/* uh-oh... we couldn't find a subexpression-level match */
-		assert(g->backrefs);	/* must be back references doing it */
-		assert(g->nplus == 0 || m->lastpos != NULL);
-		for (;;) {
-			if (dp != NULL || endp <= m->coldp)
-				break;		/* defeat */
-			NOTE("backoff");
-			endp = slow(m, m->coldp, endp-1, gf, gl);
-			if (endp == NULL)
-				break;		/* defeat */
-			/* try it on a shorter possibility */
-#ifndef NDEBUG
-			for (i = 1; i <= m->g->nsub; i++) {
-				assert(m->pmatch[i].rm_so == -1);
-				assert(m->pmatch[i].rm_eo == -1);
-			}
-#endif
-			NOTE("backoff dissect");
-			dp = backref(m, m->coldp, endp, gf, gl, (sopno)0);
-		}
-		assert(dp == NULL || dp == endp);
-		if (dp != NULL)		/* found a shorter one */
-			break;
-
-		/* despite initial appearances, there is no match here */
-		NOTE("false alarm");
-		start = m->coldp + 1;	/* recycle starting later */
-		assert(start <= stop);
-	}
-
-	/* fill in the details if requested */
-	if (nmatch > 0) {
-		pmatch[0].rm_so = m->coldp - m->offp;
-		pmatch[0].rm_eo = endp - m->offp;
-	}
-	if (nmatch > 1) {
-		assert(m->pmatch != NULL);
-		for (i = 1; i < nmatch; i++)
-			if (i <= m->g->nsub)
-				pmatch[i] = m->pmatch[i];
-			else {
-				pmatch[i].rm_so = -1;
-				pmatch[i].rm_eo = -1;
-			}
-	}
-
-	if (m->pmatch != NULL)
-		free((char *)m->pmatch);
-	if (m->lastpos != NULL)
-		free((char *)m->lastpos);
-	STATETEARDOWN(m);
-	return(0);
-}
-
-/*
- - dissect - figure out what matched what, no back references
- == static char *dissect(struct match *m, char *start, \
- ==	char *stop, sopno startst, sopno stopst);
- */
-static char *			/* == stop (success) always */
-dissect(m, start, stop, startst, stopst)
-struct match *m;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-{
-	int i;
-	sopno ss;		/* start sop of current subRE */
-	sopno es;		/* end sop of current subRE */
-	char *sp;		/* start of string matched by it */
-	char *stp;		/* string matched by it cannot pass here */
-	char *rest;		/* start of rest of string */
-	char *tail;		/* string unmatched by rest of RE */
-	sopno ssub;		/* start sop of subsubRE */
-	sopno esub;		/* end sop of subsubRE */
-	char *ssp;		/* start of string matched by subsubRE */
-	char *sep;		/* end of string matched by subsubRE */
-	char *oldssp;		/* previous ssp */
-	char *dp;
-
-	AT("diss", start, stop, startst, stopst);
-	sp = start;
-	for (ss = startst; ss < stopst; ss = es) {
-		/* identify end of subRE */
-		es = ss;
-		switch (OP(m->g->strip[es])) {
-		case OPLUS_:
-		case OQUEST_:
-			es += OPND(m->g->strip[es]);
-			break;
-		case OCH_:
-			while (OP(m->g->strip[es]) != O_CH)
-				es += OPND(m->g->strip[es]);
-			break;
-		}
-		es++;
-
-		/* figure out what it matched */
-		switch (OP(m->g->strip[ss])) {
-		case OEND:
-			assert(nope);
-			break;
-		case OCHAR:
-			sp++;
-			break;
-		case OBOL:
-		case OEOL:
-		case OBOW:
-		case OEOW:
-			break;
-		case OANY:
-		case OANYOF:
-			sp++;
-			break;
-		case OBACK_:
-		case O_BACK:
-			assert(nope);
-			break;
-		/* cases where length of match is hard to find */
-		case OQUEST_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = es - 1;
-			/* did innards match? */
-			if (slow(m, sp, rest, ssub, esub) != NULL) {
-				dp = dissect(m, sp, rest, ssub, esub);
-				assert(dp == rest);
-			} else		/* no */
-				assert(sp == rest);
-			sp = rest;
-			break;
-		case OPLUS_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = es - 1;
-			ssp = sp;
-			oldssp = ssp;
-			for (;;) {	/* find last match of innards */
-				sep = slow(m, ssp, rest, ssub, esub);
-				if (sep == NULL || sep == ssp)
-					break;	/* failed or matched null */
-				oldssp = ssp;	/* on to next try */
-				ssp = sep;
-			}
-			if (sep == NULL) {
-				/* last successful match */
-				sep = ssp;
-				ssp = oldssp;
-			}
-			assert(sep == rest);	/* must exhaust substring */
-			assert(slow(m, ssp, sep, ssub, esub) == rest);
-			dp = dissect(m, ssp, sep, ssub, esub);
-			assert(dp == sep);
-			sp = rest;
-			break;
-		case OCH_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = ss + OPND(m->g->strip[ss]) - 1;
-			assert(OP(m->g->strip[esub]) == OOR1);
-			for (;;) {	/* find first matching branch */
-				if (slow(m, sp, rest, ssub, esub) == rest)
-					break;	/* it matched all of it */
-				/* that one missed, try next one */
-				assert(OP(m->g->strip[esub]) == OOR1);
-				esub++;
-				assert(OP(m->g->strip[esub]) == OOR2);
-				ssub = esub + 1;
-				esub += OPND(m->g->strip[esub]);
-				if (OP(m->g->strip[esub]) == OOR2)
-					esub--;
-				else
-					assert(OP(m->g->strip[esub]) == O_CH);
-			}
-			dp = dissect(m, sp, rest, ssub, esub);
-			assert(dp == rest);
-			sp = rest;
-			break;
-		case O_PLUS:
-		case O_QUEST:
-		case OOR1:
-		case OOR2:
-		case O_CH:
-			assert(nope);
-			break;
-		case OLPAREN:
-			i = OPND(m->g->strip[ss]);
-			assert(0 < i && i <= m->g->nsub);
-			m->pmatch[i].rm_so = sp - m->offp;
-			break;
-		case ORPAREN:
-			i = OPND(m->g->strip[ss]);
-			assert(0 < i && i <= m->g->nsub);
-			m->pmatch[i].rm_eo = sp - m->offp;
-			break;
-		default:		/* uh oh */
-			assert(nope);
-			break;
-		}
-	}
-
-	assert(sp == stop);
-	return(sp);
-}
-
-/*
- - backref - figure out what matched what, figuring in back references
- == static char *backref(struct match *m, char *start, \
- ==	char *stop, sopno startst, sopno stopst, sopno lev);
- */
-static char *			/* == stop (success) or NULL (failure) */
-backref(m, start, stop, startst, stopst, lev)
-struct match *m;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-sopno lev;			/* PLUS nesting level */
-{
-	int i;
-	sopno ss;		/* start sop of current subRE */
-	char *sp;		/* start of string matched by it */
-	sopno ssub;		/* start sop of subsubRE */
-	sopno esub;		/* end sop of subsubRE */
-	char *ssp;		/* start of string matched by subsubRE */
-	char *dp;
-	size_t len;
-	int hard;
-	sop s;
-	regoff_t offsave;
-	cset *cs;
-
-	AT("back", start, stop, startst, stopst);
-	sp = start;
-
-	/* get as far as we can with easy stuff */
-	hard = 0;
-	for (ss = startst; !hard && ss < stopst; ss++)
-		switch (OP(s = m->g->strip[ss])) {
-		case OCHAR:
-			if (sp == stop || *sp++ != (char)OPND(s))
-				return(NULL);
-			break;
-		case OANY:
-			if (sp == stop)
-				return(NULL);
-			sp++;
-			break;
-		case OANYOF:
-			cs = &m->g->sets[OPND(s)];
-			if (sp == stop || !CHIN(cs, *sp++))
-				return(NULL);
-			break;
-		case OBOL:
-			if ( (sp == m->beginp && !(m->eflags&REG_NOTBOL)) ||
-					(sp < m->endp && *(sp-1) == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OEOL:
-			if ( (sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
-					(sp < m->endp && *sp == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OBOW:
-			if (( (sp == m->beginp && !(m->eflags&REG_NOTBOL)) ||
-					(sp < m->endp && *(sp-1) == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) ||
-					(sp > m->beginp &&
-							!ISWORD(*(sp-1))) ) &&
-					(sp < m->endp && ISWORD(*sp)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OEOW:
-			if (( (sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
-					(sp < m->endp && *sp == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) ||
-					(sp < m->endp && !ISWORD(*sp)) ) &&
-					(sp > m->beginp && ISWORD(*(sp-1))) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case O_QUEST:
-			break;
-		case OOR1:	/* matches null but needs to skip */
-			ss++;
-			s = m->g->strip[ss];
-			do {
-				assert(OP(s) == OOR2);
-				ss += OPND(s);
-			} while (OP(s = m->g->strip[ss]) != O_CH);
-			/* note that the ss++ gets us past the O_CH */
-			break;
-		default:	/* have to make a choice */
-			hard = 1;
-			break;
-		}
-	if (!hard) {		/* that was it! */
-		if (sp != stop)
-			return(NULL);
-		return(sp);
-	}
-	ss--;			/* adjust for the for's final increment */
-
-	/* the hard stuff */
-	AT("hard", sp, stop, ss, stopst);
-	s = m->g->strip[ss];
-	switch (OP(s)) {
-	case OBACK_:		/* the vilest depths */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		if (m->pmatch[i].rm_eo == -1)
-			return(NULL);
-		assert(m->pmatch[i].rm_so != -1);
-		len = m->pmatch[i].rm_eo - m->pmatch[i].rm_so;
-		assert(stop - m->beginp >= len);
-		if (sp > stop - len)
-			return(NULL);	/* not enough left to match */
-		ssp = m->offp + m->pmatch[i].rm_so;
-		if (memcmp(sp, ssp, len) != 0)
-			return(NULL);
-		while (m->g->strip[ss] != SOP(O_BACK, i))
-			ss++;
-		return(backref(m, sp+len, stop, ss+1, stopst, lev));
-		break;
-	case OQUEST_:		/* to null or not */
-		dp = backref(m, sp, stop, ss+1, stopst, lev);
-		if (dp != NULL)
-			return(dp);	/* not */
-		return(backref(m, sp, stop, ss+OPND(s)+1, stopst, lev));
-		break;
-	case OPLUS_:
-		assert(m->lastpos != NULL);
-		assert(lev+1 <= m->g->nplus);
-		m->lastpos[lev+1] = sp;
-		return(backref(m, sp, stop, ss+1, stopst, lev+1));
-		break;
-	case O_PLUS:
-		if (sp == m->lastpos[lev])	/* last pass matched null */
-			return(backref(m, sp, stop, ss+1, stopst, lev-1));
-		/* try another pass */
-		m->lastpos[lev] = sp;
-		dp = backref(m, sp, stop, ss-OPND(s)+1, stopst, lev);
-		if (dp == NULL)
-			return(backref(m, sp, stop, ss+1, stopst, lev-1));
-		else
-			return(dp);
-		break;
-	case OCH_:		/* find the right one, if any */
-		ssub = ss + 1;
-		esub = ss + OPND(s) - 1;
-		assert(OP(m->g->strip[esub]) == OOR1);
-		for (;;) {	/* find first matching branch */
-			dp = backref(m, sp, stop, ssub, esub, lev);
-			if (dp != NULL)
-				return(dp);
-			/* that one missed, try next one */
-			if (OP(m->g->strip[esub]) == O_CH)
-				return(NULL);	/* there is none */
-			esub++;
-			assert(OP(m->g->strip[esub]) == OOR2);
-			ssub = esub + 1;
-			esub += OPND(m->g->strip[esub]);
-			if (OP(m->g->strip[esub]) == OOR2)
-				esub--;
-			else
-				assert(OP(m->g->strip[esub]) == O_CH);
-		}
-		break;
-	case OLPAREN:		/* must undo assignment if rest fails */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		offsave = m->pmatch[i].rm_so;
-		m->pmatch[i].rm_so = sp - m->offp;
-		dp = backref(m, sp, stop, ss+1, stopst, lev);
-		if (dp != NULL)
-			return(dp);
-		m->pmatch[i].rm_so = offsave;
-		return(NULL);
-		break;
-	case ORPAREN:		/* must undo assignment if rest fails */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		offsave = m->pmatch[i].rm_eo;
-		m->pmatch[i].rm_eo = sp - m->offp;
-		dp = backref(m, sp, stop, ss+1, stopst, lev);
-		if (dp != NULL)
-			return(dp);
-		m->pmatch[i].rm_eo = offsave;
-		return(NULL);
-		break;
-	default:		/* uh oh */
-		assert(nope);
-		break;
-	}
-
-	/* "can't happen" */
-	assert(nope);
-	/* NOTREACHED */
-	return "shut up gcc";
-}
-
-/*
- - fast - step through the string at top speed
- == static char *fast(struct match *m, char *start, \
- ==	char *stop, sopno startst, sopno stopst);
- */
-static char *			/* where tentative match ended, or NULL */
-fast(m, start, stop, startst, stopst)
-struct match *m;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-{
-	states st = m->st;
-	states fresh = m->fresh;
-	states tmp = m->tmp;
-	char *p = start;
-	int c = (start == m->beginp) ? OUT : *(start-1);
-	int lastc;		/* previous c */
-	int flagch;
-	int i;
-	char *coldp;		/* last p after which no match was underway */
-
-	CLEAR(st);
-	SET1(st, startst);
-	st = step(m->g, startst, stopst, st, NOTHING, st);
-	ASSIGN(fresh, st);
-	SP("start", st, *p);
-	coldp = NULL;
-	for (;;) {
-		/* next character */
-		lastc = c;
-		c = (p == m->endp) ? OUT : *p;
-		if (EQ(st, fresh))
-			coldp = p;
-
-		/* is there an EOL and/or BOL between lastc and c? */
-		flagch = '\0';
-		i = 0;
-		if ( (lastc == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(lastc == OUT && !(m->eflags&REG_NOTBOL)) ) {
-			flagch = BOL;
-			i = m->g->nbol;
-		}
-		if ( (c == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(c == OUT && !(m->eflags&REG_NOTEOL)) ) {
-			flagch = (flagch == BOL) ? BOLEOL : EOL;
-			i += m->g->neol;
-		}
-		if (i != 0) {
-			for (; i > 0; i--)
-				st = step(m->g, startst, stopst, st, flagch, st);
-			SP("boleol", st, c);
-		}
-
-		/* how about a word boundary? */
-		if ( (flagch == BOL || (lastc != OUT && !ISWORD(lastc))) &&
-					(c != OUT && ISWORD(c)) ) {
-			flagch = BOW;
-		}
-		if ( (lastc != OUT && ISWORD(lastc)) &&
-				(flagch == EOL || (c != OUT && !ISWORD(c))) ) {
-			flagch = EOW;
-		}
-		if (flagch == BOW || flagch == EOW) {
-			st = step(m->g, startst, stopst, st, flagch, st);
-			SP("boweow", st, c);
-		}
-
-		/* are we done? */
-		if (ISSET(st, stopst) || p == stop)
-			break;		/* NOTE BREAK OUT */
-
-		/* no, we must deal with this character */
-		ASSIGN(tmp, st);
-		ASSIGN(st, fresh);
-		assert(c != OUT);
-		st = step(m->g, startst, stopst, tmp, c, st);
-		SP("aft", st, c);
-		assert(EQ(step(m->g, startst, stopst, st, NOTHING, st), st));
-		p++;
-	}
-
-	assert(coldp != NULL);
-	m->coldp = coldp;
-	if (ISSET(st, stopst))
-		return(p+1);
-	else
-		return(NULL);
-}
-
-/*
- - slow - step through the string more deliberately
- == static char *slow(struct match *m, char *start, \
- ==	char *stop, sopno startst, sopno stopst);
- */
-static char *			/* where it ended */
-slow(m, start, stop, startst, stopst)
-struct match *m;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-{
-	states st = m->st;
-	states empty = m->empty;
-	states tmp = m->tmp;
-	char *p = start;
-	int c = (start == m->beginp) ? OUT : *(start-1);
-	int lastc;		/* previous c */
-	int flagch;
-	int i;
-	char *matchp;		/* last p at which a match ended */
-
-	AT("slow", start, stop, startst, stopst);
-	CLEAR(st);
-	SET1(st, startst);
-	SP("sstart", st, *p);
-	st = step(m->g, startst, stopst, st, NOTHING, st);
-	matchp = NULL;
-	for (;;) {
-		/* next character */
-		lastc = c;
-		c = (p == m->endp) ? OUT : *p;
-
-		/* is there an EOL and/or BOL between lastc and c? */
-		flagch = '\0';
-		i = 0;
-		if ( (lastc == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(lastc == OUT && !(m->eflags&REG_NOTBOL)) ) {
-			flagch = BOL;
-			i = m->g->nbol;
-		}
-		if ( (c == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(c == OUT && !(m->eflags&REG_NOTEOL)) ) {
-			flagch = (flagch == BOL) ? BOLEOL : EOL;
-			i += m->g->neol;
-		}
-		if (i != 0) {
-			for (; i > 0; i--)
-				st = step(m->g, startst, stopst, st, flagch, st);
-			SP("sboleol", st, c);
-		}
-
-		/* how about a word boundary? */
-		if ( (flagch == BOL || (lastc != OUT && !ISWORD(lastc))) &&
-					(c != OUT && ISWORD(c)) ) {
-			flagch = BOW;
-		}
-		if ( (lastc != OUT && ISWORD(lastc)) &&
-				(flagch == EOL || (c != OUT && !ISWORD(c))) ) {
-			flagch = EOW;
-		}
-		if (flagch == BOW || flagch == EOW) {
-			st = step(m->g, startst, stopst, st, flagch, st);
-			SP("sboweow", st, c);
-		}
-
-		/* are we done? */
-		if (ISSET(st, stopst))
-			matchp = p;
-		if (EQ(st, empty) || p == stop)
-			break;		/* NOTE BREAK OUT */
-
-		/* no, we must deal with this character */
-		ASSIGN(tmp, st);
-		ASSIGN(st, empty);
-		assert(c != OUT);
-		st = step(m->g, startst, stopst, tmp, c, st);
-		SP("saft", st, c);
-		assert(EQ(step(m->g, startst, stopst, st, NOTHING, st), st));
-		p++;
-	}
-
-	return(matchp);
-}
-
-
-/*
- - step - map set of states reachable before char to set reachable after
- == static states step(struct re_guts *g, sopno start, sopno stop, \
- ==	states bef, int ch, states aft);
- == #define	BOL	(OUT+1)
- == #define	EOL	(BOL+1)
- == #define	BOLEOL	(BOL+2)
- == #define	NOTHING	(BOL+3)
- == #define	BOW	(BOL+4)
- == #define	EOW	(BOL+5)
- == #define	CODEMAX	(BOL+5)		// highest code used
- == #define	NONCHAR(c)	((c) > CHAR_MAX)
- == #define	NNONCHAR	(CODEMAX-CHAR_MAX)
- */
-static states
-step(g, start, stop, bef, ch, aft)
-struct re_guts *g;
-sopno start;			/* start state within strip */
-sopno stop;			/* state after stop state within strip */
-states bef;			/* states reachable before */
-int ch;				/* character or NONCHAR code */
-states aft;			/* states already known reachable after */
-{
-	cset *cs;
-	sop s;
-	sopno pc;
-	onestate here;		/* note, macros know this name */
-	sopno look;
-	int i;
-
-	for (pc = start, INIT(here, pc); pc != stop; pc++, INC(here)) {
-		s = g->strip[pc];
-		switch (OP(s)) {
-		case OEND:
-			assert(pc == stop-1);
-			break;
-		case OCHAR:
-			/* only characters can match */
-			assert(!NONCHAR(ch) || ch != (char)OPND(s));
-			if (ch == (char)OPND(s))
-				FWD(aft, bef, 1);
-			break;
-		case OBOL:
-			if (ch == BOL || ch == BOLEOL)
-				FWD(aft, bef, 1);
-			break;
-		case OEOL:
-			if (ch == EOL || ch == BOLEOL)
-				FWD(aft, bef, 1);
-			break;
-		case OBOW:
-			if (ch == BOW)
-				FWD(aft, bef, 1);
-			break;
-		case OEOW:
-			if (ch == EOW)
-				FWD(aft, bef, 1);
-			break;
-		case OANY:
-			if (!NONCHAR(ch))
-				FWD(aft, bef, 1);
-			break;
-		case OANYOF:
-			cs = &g->sets[OPND(s)];
-			if (!NONCHAR(ch) && CHIN(cs, ch))
-				FWD(aft, bef, 1);
-			break;
-		case OBACK_:		/* ignored here */
-		case O_BACK:
-			FWD(aft, aft, 1);
-			break;
-		case OPLUS_:		/* forward, this is just an empty */
-			FWD(aft, aft, 1);
-			break;
-		case O_PLUS:		/* both forward and back */
-			FWD(aft, aft, 1);
-			i = ISSETBACK(aft, OPND(s));
-			BACK(aft, aft, OPND(s));
-			if (!i && ISSETBACK(aft, OPND(s))) {
-				/* oho, must reconsider loop body */
-				pc -= OPND(s) + 1;
-				INIT(here, pc);
-			}
-			break;
-		case OQUEST_:		/* two branches, both forward */
-			FWD(aft, aft, 1);
-			FWD(aft, aft, OPND(s));
-			break;
-		case O_QUEST:		/* just an empty */
-			FWD(aft, aft, 1);
-			break;
-		case OLPAREN:		/* not significant here */
-		case ORPAREN:
-			FWD(aft, aft, 1);
-			break;
-		case OCH_:		/* mark the first two branches */
-			FWD(aft, aft, 1);
-			assert(OP(g->strip[pc+OPND(s)]) == OOR2);
-			FWD(aft, aft, OPND(s));
-			break;
-		case OOR1:		/* done a branch, find the O_CH */
-			if (ISSTATEIN(aft, here)) {
-				for (look = 1;
-						OP(s = g->strip[pc+look]) != O_CH;
-						look += OPND(s))
-					assert(OP(s) == OOR2);
-				FWD(aft, aft, look);
-			}
-			break;
-		case OOR2:		/* propagate OCH_'s marking */
-			FWD(aft, aft, 1);
-			if (OP(g->strip[pc+OPND(s)]) != O_CH) {
-				assert(OP(g->strip[pc+OPND(s)]) == OOR2);
-				FWD(aft, aft, OPND(s));
-			}
-			break;
-		case O_CH:		/* just empty */
-			FWD(aft, aft, 1);
-			break;
-		default:		/* ooooops... */
-			assert(nope);
-			break;
-		}
-	}
-
-	return(aft);
-}
-
-#ifdef REDEBUG
-/*
- - print - print a set of states
- == #ifdef REDEBUG
- == static void print(struct match *m, char *caption, states st, \
- ==	int ch, FILE *d);
- == #endif
- */
-static void
-print(m, caption, st, ch, d)
-struct match *m;
-char *caption;
-states st;
-int ch;
-FILE *d;
-{
-	struct re_guts *g = m->g;
-	int i;
-	int first = 1;
-
-	if (!(m->eflags&REG_TRACE))
-		return;
-
-	fprintf(d, "%s", caption);
-	if (ch != '\0')
-		fprintf(d, " %s", pchar(ch));
-	for (i = 0; i < g->nstates; i++)
-		if (ISSET(st, i)) {
-			fprintf(d, "%s%d", (first) ? "\t" : ", ", i);
-			first = 0;
-		}
-	fprintf(d, "\n");
-}
-
-/*
- - at - print current situation
- == #ifdef REDEBUG
- == static void at(struct match *m, char *title, char *start, char *stop, \
- ==						sopno startst, sopno stopst);
- == #endif
- */
-static void
-at(m, title, start, stop, startst, stopst)
-struct match *m;
-char *title;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-{
-	if (!(m->eflags&REG_TRACE))
-		return;
-
-	printf("%s %s-", title, pchar(*start));
-	printf("%s ", pchar(*stop));
-	printf("%ld-%ld\n", (long)startst, (long)stopst);
-}
-
-#ifndef PCHARDONE
-#define	PCHARDONE	/* never again */
-/*
- - pchar - make a character printable
- == #ifdef REDEBUG
- == static char *pchar(int ch);
- == #endif
- *
- * Is this identical to regchar() over in debug.c?  Well, yes.  But a
- * duplicate here avoids having a debugging-capable regexec.o tied to
- * a matching debug.o, and this is convenient.  It all disappears in
- * the non-debug compilation anyway, so it doesn't matter much.
- */
-static char *			/* -> representation */
-pchar(ch)
-int ch;
-{
-	static char pbuf[10];
-
-	if (isprint((uch)ch) || ch == ' ')
-		sprintf(pbuf, "%c", ch);
-	else
-		sprintf(pbuf, "\\%o", ch);
-	return(pbuf);
-}
-#endif
-#endif
-
-#undef	matcher
-#undef	fast
-#undef	slow
-#undef	dissect
-#undef	backref
-#undef	step
-#undef	print
-#undef	at
-#undef	match
diff --git a/newlib/libc/sys/linux/stdlib/fnmatch.3 b/newlib/libc/sys/linux/stdlib/fnmatch.3
deleted file mode 100644
index 9c3fda5..0000000
--- a/newlib/libc/sys/linux/stdlib/fnmatch.3
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" Copyright (c) 1989, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Guido van Rossum.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)fnmatch.3	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD: src/lib/libc/gen/fnmatch.3,v 1.12 2001/10/01 16:08:50 ru Exp $
-.\"
-.Dd April 28, 1995
-.Dt FNMATCH 3
-.Os
-.Sh NAME
-.Nm fnmatch
-.Nd match filename or pathname
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fnmatch.h
-.Ft int
-.Fn fnmatch "const char *pattern" "const char *string" "int flags"
-.Sh DESCRIPTION
-The
-.Fn fnmatch
-function
-matches patterns according to the rules used by the shell.
-It checks the string specified by the
-.Fa string
-argument to see if it matches the pattern specified by the
-.Fa pattern
-argument.
-.Pp
-The
-.Fa flags
-argument modifies the interpretation of
-.Fa pattern
-and
-.Fa string .
-The value of
-.Fa flags
-is the bitwise inclusive
-.Tn OR
-of any of the following
-constants, which are defined in the include file
-.Pa fnmatch.h .
-.Bl -tag -width FNM_PATHNAME
-.It Dv FNM_NOESCAPE
-Normally, every occurrence of a backslash
-.Pq Ql \e
-followed by a character in
-.Fa pattern
-is replaced by that character.
-This is done to negate any special meaning for the character.
-If the
-.Dv FNM_NOESCAPE
-flag is set, a backslash character is treated as an ordinary character.
-.It Dv FNM_PATHNAME
-Slash characters in
-.Fa string
-must be explicitly matched by slashes in
-.Fa pattern .
-If this flag is not set, then slashes are treated as regular characters.
-.It Dv FNM_PERIOD
-Leading periods in
-.Fa string
-must be explicitly matched by periods in
-.Fa pattern .
-If this flag is not set, then leading periods are treated as regular
-characters.
-The definition of
-.Dq leading
-is related to the specification of
-.Dv FNM_PATHNAME .
-A period is always
-.Dq leading
-if it is the first character in
-.Ar string .
-Additionally, if
-.Dv FNM_PATHNAME
-is set,
-a period is
-leading
-if it immediately follows a slash.
-.It Dv FNM_LEADING_DIR
-Ignore
-.Nm /*
-rest after successful
-.Fa pattern
-matching.
-.It Dv FNM_CASEFOLD
-Ignore  case  distinctions in both the
-.Fa pattern
-and the
-.Fa string .
-.El
-.Sh RETURN VALUES
-The
-.Fn fnmatch
-function returns zero if
-.Fa string
-matches the pattern specified by
-.Fa pattern ,
-otherwise, it returns the value
-.Dv FNM_NOMATCH .
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr glob 3 ,
-.Xr regex 3
-.Sh STANDARDS
-The
-.Fn fnmatch
-function conforms to
-.St -p1003.2 .
-.Sh HISTORY
-The
-.Fn fnmatch
-function first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The pattern
-.Ql *
-matches the empty string, even if
-.Dv FNM_PATHNAME
-is specified.
diff --git a/newlib/libc/sys/linux/stdlib/fnmatch.c b/newlib/libc/sys/linux/stdlib/fnmatch.c
deleted file mode 100644
index 7b6f10d..0000000
--- a/newlib/libc/sys/linux/stdlib/fnmatch.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fnmatch.c,v 1.15 2002/02/01 01:32:19 obrien Exp $");
-
-/*
- * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
- * Compares a filename or pathname to a pattern.
- */
-
-#include <ctype.h>
-#include <fnmatch.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "collate.h"
-
-#define	EOS	'\0'
-
-#define RANGE_MATCH     1
-#define RANGE_NOMATCH   0
-#define RANGE_ERROR     (-1)
-
-static int rangematch(const char *, char, int, char **);
-
-int
-fnmatch(pattern, string, flags)
-	const char *pattern, *string;
-	int flags;
-{
-	const char *stringstart;
-	char *newp;
-	char c, test;
-
-	for (stringstart = string;;)
-		switch (c = *pattern++) {
-		case EOS:
-			if ((flags & FNM_LEADING_DIR) && *string == '/')
-				return (0);
-			return (*string == EOS ? 0 : FNM_NOMATCH);
-		case '?':
-			if (*string == EOS)
-				return (FNM_NOMATCH);
-			if (*string == '/' && (flags & FNM_PATHNAME))
-				return (FNM_NOMATCH);
-			if (*string == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-			++string;
-			break;
-		case '*':
-			c = *pattern;
-			/* Collapse multiple stars. */
-			while (c == '*')
-				c = *++pattern;
-
-			if (*string == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-
-			/* Optimize for pattern with * at end or before /. */
-			if (c == EOS)
-				if (flags & FNM_PATHNAME)
-					return ((flags & FNM_LEADING_DIR) ||
-					    strchr(string, '/') == NULL ?
-					    0 : FNM_NOMATCH);
-				else
-					return (0);
-			else if (c == '/' && flags & FNM_PATHNAME) {
-				if ((string = strchr(string, '/')) == NULL)
-					return (FNM_NOMATCH);
-				break;
-			}
-
-			/* General case, use recursion. */
-			while ((test = *string) != EOS) {
-				if (!fnmatch(pattern, string, flags & ~FNM_PERIOD))
-					return (0);
-				if (test == '/' && flags & FNM_PATHNAME)
-					break;
-				++string;
-			}
-			return (FNM_NOMATCH);
-		case '[':
-			if (*string == EOS)
-				return (FNM_NOMATCH);
-			if (*string == '/' && (flags & FNM_PATHNAME))
-				return (FNM_NOMATCH);
-			if (*string == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-
-			switch (rangematch(pattern, *string, flags, &newp)) {
-			case RANGE_ERROR:
-				goto norm;
-			case RANGE_MATCH:
-				pattern = newp;
-				break;
-			case RANGE_NOMATCH:
-				return (FNM_NOMATCH);
-			}
-			++string;
-			break;
-		case '\\':
-			if (!(flags & FNM_NOESCAPE)) {
-				if ((c = *pattern++) == EOS) {
-					c = '\\';
-					--pattern;
-				}
-			}
-			/* FALLTHROUGH */
-		default:
-		norm:
-			if (c == *string)
-				;
-			else if ((flags & FNM_CASEFOLD) &&
-				 (tolower((unsigned char)c) ==
-				  tolower((unsigned char)*string)))
-				;
-			else
-				return (FNM_NOMATCH);
-			string++;
-			break;
-		}
-	/* NOTREACHED */
-}
-
-static int
-rangematch(pattern, test, flags, newp)
-	const char *pattern;
-	char test;
-	int flags;
-	char **newp;
-{
-	int negate, ok;
-	char c, c2;
-
-	/*
-	 * A bracket expression starting with an unquoted circumflex
-	 * character produces unspecified results (IEEE 1003.2-1992,
-	 * 3.13.2).  This implementation treats it like '!', for
-	 * consistency with the regular expression syntax.
-	 * J.T. Conklin (conklin@ngai.kaleida.com)
-	 */
-	if ( (negate = (*pattern == '!' || *pattern == '^')) )
-		++pattern;
-
-	if (flags & FNM_CASEFOLD)
-		test = tolower((unsigned char)test);
-
-	/*
-	 * A right bracket shall lose its special meaning and represent
-	 * itself in a bracket expression if it occurs first in the list.
-	 * -- POSIX.2 2.8.3.2
-	 */
-	ok = 0;
-	c = *pattern++;
-	do {
-		if (c == '\\' && !(flags & FNM_NOESCAPE))
-			c = *pattern++;
-		if (c == EOS)
-			return (RANGE_ERROR);
-
-		if (c == '/' && (flags & FNM_PATHNAME))
-			return (RANGE_NOMATCH);
-
-		if (flags & FNM_CASEFOLD)
-			c = tolower((unsigned char)c);
-
-		if (*pattern == '-'
-		    && (c2 = *(pattern+1)) != EOS && c2 != ']') {
-			pattern += 2;
-			if (c2 == '\\' && !(flags & FNM_NOESCAPE))
-				c2 = *pattern++;
-			if (c2 == EOS)
-				return (RANGE_ERROR);
-
-			if (flags & FNM_CASEFOLD)
-				c2 = tolower((unsigned char)c2);
-
-			if (__collate_load_error ?
-			    c <= test && test <= c2 :
-			       __collate_range_cmp(c, test) <= 0
-			    && __collate_range_cmp(test, c2) <= 0
-			   )
-				ok = 1;
-		} else if (c == test)
-			ok = 1;
-	} while ((c = *pattern++) != ']');
-
-	*newp = (char *)pattern;
-	return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH);
-}
diff --git a/newlib/libc/sys/linux/stdlib/glob.3 b/newlib/libc/sys/linux/stdlib/glob.3
deleted file mode 100644
index aa509a3..0000000
--- a/newlib/libc/sys/linux/stdlib/glob.3
+++ /dev/null
@@ -1,466 +0,0 @@
-.\" Copyright (c) 1989, 1991, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Guido van Rossum.
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)glob.3	8.3 (Berkeley) 4/16/94
-.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.20 2001/10/01 16:08:51 ru Exp $
-.\"
-.Dd April 16, 1994
-.Dt GLOB 3
-.Os
-.Sh NAME
-.Nm glob ,
-.Nm globfree
-.Nd generate pathnames matching a pattern
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In glob.h
-.Ft int
-.Fn glob "const char *pattern" "int flags" "int (*errfunc)(const char *, int)" "glob_t *pglob"
-.Ft void
-.Fn globfree "glob_t *pglob"
-.Sh DESCRIPTION
-The
-.Fn glob
-function
-is a pathname generator that implements the rules for file name pattern
-matching used by the shell.
-.Pp
-The include file
-.Pa glob.h
-defines the structure type
-.Fa glob_t ,
-which contains at least the following fields:
-.Bd -literal
-typedef struct {
-	int gl_pathc;		/* count of total paths so far */
-	int gl_matchc;		/* count of paths matching pattern */
-	int gl_offs;		/* reserved at beginning of gl_pathv */
-	int gl_flags;		/* returned flags */
-	char **gl_pathv;	/* list of paths matching pattern */
-} glob_t;
-.Ed
-.Pp
-The argument
-.Fa pattern
-is a pointer to a pathname pattern to be expanded.
-The
-.Fn glob
-argument
-matches all accessible pathnames against the pattern and creates
-a list of the pathnames that match.
-In order to have access to a pathname,
-.Fn glob
-requires search permission on every component of a path except the last
-and read permission on each directory of any filename component of
-.Fa pattern
-that contains any of the special characters
-.Ql * ,
-.Ql ?\&
-or
-.Ql \&[ .
-.Pp
-The
-.Fn glob
-argument
-stores the number of matched pathnames into the
-.Fa gl_pathc
-field, and a pointer to a list of pointers to pathnames into the
-.Fa gl_pathv
-field.
-The first pointer after the last pathname is
-.Dv NULL .
-If the pattern does not match any pathnames, the returned number of
-matched paths is set to zero.
-.Pp
-It is the caller's responsibility to create the structure pointed to by
-.Fa pglob .
-The
-.Fn glob
-function allocates other space as needed, including the memory pointed
-to by
-.Fa gl_pathv .
-.Pp
-The argument
-.Fa flags
-is used to modify the behavior of
-.Fn glob .
-The value of
-.Fa flags
-is the bitwise inclusive
-.Tn OR
-of any of the following
-values defined in
-.Pa glob.h :
-.Bl -tag -width GLOB_ALTDIRFUNC
-.It Dv GLOB_APPEND
-Append pathnames generated to the ones from a previous call (or calls)
-to
-.Fn glob .
-The value of
-.Fa gl_pathc
-will be the total matches found by this call and the previous call(s).
-The pathnames are appended to, not merged with the pathnames returned by
-the previous call(s).
-Between calls, the caller must not change the setting of the
-.Dv GLOB_DOOFFS
-flag, nor change the value of
-.Fa gl_offs
-when
-.Dv GLOB_DOOFFS
-is set, nor (obviously) call
-.Fn globfree
-for
-.Fa pglob .
-.It Dv GLOB_DOOFFS
-Make use of the
-.Fa gl_offs
-field.
-If this flag is set,
-.Fa gl_offs
-is used to specify how many
-.Dv NULL
-pointers to prepend to the beginning
-of the
-.Fa gl_pathv
-field.
-In other words,
-.Fa gl_pathv
-will point to
-.Fa gl_offs
-.Dv NULL
-pointers,
-followed by
-.Fa gl_pathc
-pathname pointers, followed by a
-.Dv NULL
-pointer.
-.It Dv GLOB_ERR
-Causes
-.Fn glob
-to return when it encounters a directory that it cannot open or read.
-Ordinarily,
-.Fn glob
-continues to find matches.
-.It Dv GLOB_MARK
-Each pathname that is a directory that matches
-.Fa pattern
-has a slash
-appended.
-.It Dv GLOB_NOCHECK
-If
-.Fa pattern
-does not match any pathname, then
-.Fn glob
-returns a list
-consisting of only
-.Fa pattern ,
-with the number of total pathnames is set to 1, and the number of matched
-pathnames set to 0.
-If
-.Dv GLOB_QUOTE
-is set, its effect is present in the pattern returned.
-.It Dv GLOB_NOSORT
-By default, the pathnames are sorted in ascending
-.Tn ASCII
-order;
-this flag prevents that sorting (speeding up
-.Fn glob ) .
-.El
-.Pp
-The following values may also be included in
-.Fa flags ,
-however, they are non-standard extensions to
-.St -p1003.2 .
-.Bl -tag -width GLOB_ALTDIRFUNC
-.It Dv GLOB_ALTDIRFUNC
-The following additional fields in the pglob structure have been
-initialized with alternate functions for glob to use to open, read,
-and close directories and to get stat information on names found
-in those directories.
-.Bd -literal
-void *(*gl_opendir)(const char * name);
-struct dirent *(*gl_readdir)(void *);
-void (*gl_closedir)(void *);
-int (*gl_lstat)(const char *name, struct stat *st);
-int (*gl_stat)(const char *name, struct stat *st);
-.Ed
-.Pp
-This extension is provided to allow programs such as
-.Xr restore 8
-to provide globbing from directories stored on tape.
-.It Dv GLOB_BRACE
-Pre-process the pattern string to expand
-.Ql {pat,pat,...}
-strings like
-.Xr csh 1 .
-The pattern
-.Ql {}
-is left unexpanded for historical reasons (and
-.Xr csh 1
-does the same thing to
-ease typing
-of
-.Xr find 1
-patterns).
-.It Dv GLOB_MAGCHAR
-Set by the
-.Fn glob
-function if the pattern included globbing characters.
-See the description of the usage of the
-.Fa gl_matchc
-structure member for more details.
-.It Dv GLOB_NOMAGIC
-Is the same as
-.Dv GLOB_NOCHECK
-but it only appends the
-.Fa pattern
-if it does not contain any of the special characters ``*'', ``?'' or ``[''.
-.Dv GLOB_NOMAGIC
-is provided to simplify implementing the historic
-.Xr csh 1
-globbing behavior and should probably not be used anywhere else.
-.It Dv GLOB_QUOTE
-Use the backslash
-.Pq Ql \e
-character for quoting: every occurrence of
-a backslash followed by a character in the pattern is replaced by that
-character, avoiding any special interpretation of the character.
-.It Dv GLOB_TILDE
-Expand patterns that start with
-.Ql ~
-to user name home directories.
-.It Dv GLOB_LIMIT
-Limit the total number of returned pathnames to the value provided in
-.Fa gl_matchc
-(default
-.Dv ARG_MAX ) .
-This option should be set for programs
-that can be coerced into a denial of service attack
-via patterns that expand to a very large number of matches,
-such as a long string of
-.Ql */../*/.. .
-.El
-.Pp
-If, during the search, a directory is encountered that cannot be opened
-or read and
-.Fa errfunc
-is
-.Pf non- Dv NULL ,
-.Fn glob
-calls
-.Fa \*(lp*errfunc\*(rp Ns ( Fa path , errno ) .
-This may be unintuitive: a pattern like
-.Ql */Makefile
-will try to
-.Xr stat 2
-.Ql foo/Makefile
-even if
-.Ql foo
-is not a directory, resulting in a
-call to
-.Fa errfunc .
-The error routine can suppress this action by testing for
-.Er ENOENT
-and
-.Er ENOTDIR ;
-however, the
-.Dv GLOB_ERR
-flag will still cause an immediate
-return when this happens.
-.Pp
-If
-.Fa errfunc
-returns non-zero,
-.Fn glob
-stops the scan and returns
-.Dv GLOB_ABEND
-after setting
-.Fa gl_pathc
-and
-.Fa gl_pathv
-to reflect any paths already matched.
-This also happens if an error is encountered and
-.Dv GLOB_ERR
-is set in
-.Fa flags ,
-regardless of the return value of
-.Fa errfunc ,
-if called.
-If
-.Dv GLOB_ERR
-is not set and either
-.Fa errfunc
-is
-.Dv NULL
-or
-.Fa errfunc
-returns zero, the error is ignored.
-.Pp
-The
-.Fn globfree
-function frees any space associated with
-.Fa pglob
-from a previous call(s) to
-.Fn glob .
-.Sh RETURN VALUES
-On successful completion,
-.Fn glob
-returns zero.
-In addition the fields of
-.Fa pglob
-contain the values described below:
-.Bl -tag -width GLOB_NOCHECK
-.It Fa gl_pathc
-contains the total number of matched pathnames so far.
-This includes other matches from previous invocations of
-.Fn glob
-if
-.Dv GLOB_APPEND
-was specified.
-.It Fa gl_matchc
-contains the number of matched pathnames in the current invocation of
-.Fn glob .
-.It Fa gl_flags
-contains a copy of the
-.Fa flags
-parameter with the bit
-.Dv GLOB_MAGCHAR
-set if
-.Fa pattern
-contained any of the special characters ``*'', ``?'' or ``['', cleared
-if not.
-.It Fa gl_pathv
-contains a pointer to a
-.Dv NULL Ns -terminated
-list of matched pathnames.
-However, if
-.Fa gl_pathc
-is zero, the contents of
-.Fa gl_pathv
-are undefined.
-.El
-.Pp
-If
-.Fn glob
-terminates due to an error, it sets errno and returns one of the
-following non-zero constants, which are defined in the include
-file
-.Aq Pa glob.h :
-.Bl -tag -width GLOB_NOCHECK
-.It Dv GLOB_NOSPACE
-An attempt to allocate memory failed, or if
-.Fa errno
-was 0
-.Dv GLOB_LIMIT
-was specified in the flags and
-.Fa pglob\->gl_matchc
-or more patterns were matched.
-.It Dv GLOB_ABEND
-The scan was stopped because an error was encountered and either
-.Dv GLOB_ERR
-was set or
-.Fa \*(lp*errfunc\*(rp\*(lp\*(rp
-returned non-zero.
-.El
-.Pp
-The arguments
-.Fa pglob\->gl_pathc
-and
-.Fa pglob\->gl_pathv
-are still set as specified above.
-.Sh EXAMPLES
-A rough equivalent of
-.Ql "ls -l *.c *.h"
-can be obtained with the
-following code:
-.Bd -literal -offset indent
-glob_t g;
-
-g.gl_offs = 2;
-glob("*.c", GLOB_DOOFFS, NULL, &g);
-glob("*.h", GLOB_DOOFFS | GLOB_APPEND, NULL, &g);
-g.gl_pathv[0] = "ls";
-g.gl_pathv[1] = "-l";
-execvp("ls", g.gl_pathv);
-.Ed
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr fnmatch 3 ,
-.Xr regexp 3
-.Sh STANDARDS
-The
-.Fn glob
-function is expected to be
-.St -p1003.2
-compatible with the exception
-that the flags
-.Dv GLOB_ALTDIRFUNC ,
-.Dv GLOB_BRACE ,
-.Dv GLOB_LIMIT ,
-.Dv GLOB_MAGCHAR ,
-.Dv GLOB_NOMAGIC ,
-.Dv GLOB_QUOTE ,
-and
-.Dv GLOB_TILDE ,
-and the fields
-.Fa gl_matchc
-and
-.Fa gl_flags
-should not be used by applications striving for strict
-.Tn POSIX
-conformance.
-.Sh HISTORY
-The
-.Fn glob
-and
-.Fn globfree
-functions first appeared in
-.Bx 4.4 .
-.Sh BUGS
-Patterns longer than
-.Dv MAXPATHLEN
-may cause unchecked errors.
-.Pp
-The
-.Fn glob
-argument
-may fail and set errno for any of the errors specified for the
-library routines
-.Xr stat 2 ,
-.Xr closedir 3 ,
-.Xr opendir 3 ,
-.Xr readdir 3 ,
-.Xr malloc 3 ,
-and
-.Xr free 3 .
diff --git a/newlib/libc/sys/linux/stdlib/glob.c b/newlib/libc/sys/linux/stdlib/glob.c
deleted file mode 100644
index 0e392b3..0000000
--- a/newlib/libc/sys/linux/stdlib/glob.c
+++ /dev/null
@@ -1,910 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.19 2002/02/01 01:32:19 obrien Exp $");
-
-/*
- * glob(3) -- a superset of the one defined in POSIX 1003.2.
- *
- * The [!...] convention to negate a range is supported (SysV, Posix, ksh).
- *
- * Optional extra services, controlled by flags not defined by POSIX:
- *
- * GLOB_QUOTE:
- *	Escaping convention: \ inhibits any special meaning the following
- *	character might have (except \ at end of string is retained).
- * GLOB_MAGCHAR:
- *	Set in gl_flags if pattern contained a globbing character.
- * GLOB_NOMAGIC:
- *	Same as GLOB_NOCHECK, but it will only append pattern if it did
- *	not contain any magic characters.  [Used in csh style globbing]
- * GLOB_ALTDIRFUNC:
- *	Use alternately specified directory access functions.
- * GLOB_TILDE:
- *	expand ~user/foo to the /home/dir/of/user/foo
- * GLOB_BRACE:
- *	expand {1,2}{a,b} to 1a 1b 2a 2b
- * gl_matchc:
- *	Number of matches in the current invocation of glob.
- */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <glob.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "collate.h"
-
-#define	DOLLAR		'$'
-#define	DOT		'.'
-#define	EOS		'\0'
-#define	LBRACKET	'['
-#define	NOT		'!'
-#define	QUESTION	'?'
-#define	QUOTE		'\\'
-#define	RANGE		'-'
-#define	RBRACKET	']'
-#define	SEP		'/'
-#define	STAR		'*'
-#define	TILDE		'~'
-#define	UNDERSCORE	'_'
-#define	LBRACE		'{'
-#define	RBRACE		'}'
-#define	SLASH		'/'
-#define	COMMA		','
-
-#ifndef DEBUG
-
-#define	M_QUOTE		0x8000
-#define	M_PROTECT	0x4000
-#define	M_MASK		0xffff
-#define	M_ASCII		0x00ff
-
-typedef u_short Char;
-
-#else
-
-#define	M_QUOTE		0x80
-#define	M_PROTECT	0x40
-#define	M_MASK		0xff
-#define	M_ASCII		0x7f
-
-typedef char Char;
-
-#endif
-
-
-#define	CHAR(c)		((Char)((c)&M_ASCII))
-#define	META(c)		((Char)((c)|M_QUOTE))
-#define	M_ALL		META('*')
-#define	M_END		META(']')
-#define	M_NOT		META('!')
-#define	M_ONE		META('?')
-#define	M_RNG		META('-')
-#define	M_SET		META('[')
-#define	ismeta(c)	(((c)&M_QUOTE) != 0)
-
-
-static int	 compare(const void *, const void *);
-static int	 g_Ctoc(const Char *, char *, u_int);
-static int	 g_lstat(Char *, struct stat *, glob_t *);
-static DIR	*g_opendir(Char *, glob_t *);
-static Char	*g_strchr(Char *, int);
-#ifdef notdef
-static Char	*g_strcat(Char *, const Char *);
-#endif
-static int	 g_stat(Char *, struct stat *, glob_t *);
-static int	 glob0(const Char *, glob_t *, int *);
-static int	 glob1(Char *, glob_t *, int *);
-static int	 glob2(Char *, Char *, Char *, Char *, glob_t *, int *);
-static int	 glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, int *);
-static int	 globextend(const Char *, glob_t *, int *);
-static const Char *	
-		 globtilde(const Char *, Char *, size_t, glob_t *);
-static int	 globexp1(const Char *, glob_t *, int *);
-static int	 globexp2(const Char *, const Char *, glob_t *, int *, int *);
-static int	 match(Char *, Char *, Char *);
-#ifdef DEBUG
-static void	 qprintf(const char *, Char *);
-#endif
-
-int
-glob(pattern, flags, errfunc, pglob)
-	const char *pattern;
-	int flags, (*errfunc)(const char *, int);
-	glob_t *pglob;
-{
-	const u_char *patnext;
-	int c, limit;
-	Char *bufnext, *bufend, patbuf[MAXPATHLEN];
-
-	patnext = (u_char *) pattern;
-	if (!(flags & GLOB_APPEND)) {
-		pglob->gl_pathc = 0;
-		pglob->gl_pathv = NULL;
-		if (!(flags & GLOB_DOOFFS))
-			pglob->gl_offs = 0;
-	}
-	if (flags & GLOB_LIMIT) {
-		limit = pglob->gl_matchc;
-		if (limit == 0)
-			limit = ARG_MAX;
-	} else
-		limit = 0;
-	pglob->gl_flags = flags & ~GLOB_MAGCHAR;
-	pglob->gl_errfunc = errfunc;
-	pglob->gl_matchc = 0;
-
-	bufnext = patbuf;
-	bufend = bufnext + MAXPATHLEN - 1;
-	if (flags & GLOB_QUOTE) {
-		/* Protect the quoted characters. */
-		while (bufnext < bufend && (c = *patnext++) != EOS)
-			if (c == QUOTE) {
-				if ((c = *patnext++) == EOS) {
-					c = QUOTE;
-					--patnext;
-				}
-				*bufnext++ = c | M_PROTECT;
-			}
-			else
-				*bufnext++ = c;
-	}
-	else
-	    while (bufnext < bufend && (c = *patnext++) != EOS)
-		    *bufnext++ = c;
-	*bufnext = EOS;
-
-	if (flags & GLOB_BRACE)
-	    return globexp1(patbuf, pglob, &limit);
-	else
-	    return glob0(patbuf, pglob, &limit);
-}
-
-/*
- * Expand recursively a glob {} pattern. When there is no more expansion
- * invoke the standard globbing routine to glob the rest of the magic
- * characters
- */
-static int
-globexp1(pattern, pglob, limit)
-	const Char *pattern;
-	glob_t *pglob;
-	int *limit;
-{
-	const Char* ptr = pattern;
-	int rv;
-
-	/* Protect a single {}, for find(1), like csh */
-	if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS)
-		return glob0(pattern, pglob, limit);
-
-	while ((ptr = (const Char *) g_strchr((Char *) ptr, LBRACE)) != NULL)
-		if (!globexp2(ptr, pattern, pglob, &rv, limit))
-			return rv;
-
-	return glob0(pattern, pglob, limit);
-}
-
-
-/*
- * Recursive brace globbing helper. Tries to expand a single brace.
- * If it succeeds then it invokes globexp1 with the new pattern.
- * If it fails then it tries to glob the rest of the pattern and returns.
- */
-static int
-globexp2(ptr, pattern, pglob, rv, limit)
-	const Char *ptr, *pattern;
-	glob_t *pglob;
-	int *rv, *limit;
-{
-	int     i;
-	Char   *lm, *ls;
-	const Char *pe, *pm, *pl;
-	Char    patbuf[MAXPATHLEN];
-
-	/* copy part up to the brace */
-	for (lm = patbuf, pm = pattern; pm != ptr; *lm++ = *pm++)
-		continue;
-	*lm = EOS;
-	ls = lm;
-
-	/* Find the balanced brace */
-	for (i = 0, pe = ++ptr; *pe; pe++)
-		if (*pe == LBRACKET) {
-			/* Ignore everything between [] */
-			for (pm = pe++; *pe != RBRACKET && *pe != EOS; pe++)
-				continue;
-			if (*pe == EOS) {
-				/*
-				 * We could not find a matching RBRACKET.
-				 * Ignore and just look for RBRACE
-				 */
-				pe = pm;
-			}
-		}
-		else if (*pe == LBRACE)
-			i++;
-		else if (*pe == RBRACE) {
-			if (i == 0)
-				break;
-			i--;
-		}
-
-	/* Non matching braces; just glob the pattern */
-	if (i != 0 || *pe == EOS) {
-		*rv = glob0(patbuf, pglob, limit);
-		return 0;
-	}
-
-	for (i = 0, pl = pm = ptr; pm <= pe; pm++)
-		switch (*pm) {
-		case LBRACKET:
-			/* Ignore everything between [] */
-			for (pl = pm++; *pm != RBRACKET && *pm != EOS; pm++)
-				continue;
-			if (*pm == EOS) {
-				/*
-				 * We could not find a matching RBRACKET.
-				 * Ignore and just look for RBRACE
-				 */
-				pm = pl;
-			}
-			break;
-
-		case LBRACE:
-			i++;
-			break;
-
-		case RBRACE:
-			if (i) {
-			    i--;
-			    break;
-			}
-			/* FALLTHROUGH */
-		case COMMA:
-			if (i && *pm == COMMA)
-				break;
-			else {
-				/* Append the current string */
-				for (lm = ls; (pl < pm); *lm++ = *pl++)
-					continue;
-				/*
-				 * Append the rest of the pattern after the
-				 * closing brace
-				 */
-				for (pl = pe + 1; (*lm++ = *pl++) != EOS;)
-					continue;
-
-				/* Expand the current pattern */
-#ifdef DEBUG
-				qprintf("globexp2:", patbuf);
-#endif
-				*rv = globexp1(patbuf, pglob, limit);
-
-				/* move after the comma, to the next string */
-				pl = pm + 1;
-			}
-			break;
-
-		default:
-			break;
-		}
-	*rv = 0;
-	return 0;
-}
-
-
-
-/*
- * expand tilde from the passwd file.
- */
-static const Char *
-globtilde(pattern, patbuf, patbuf_len, pglob)
-	const Char *pattern;
-	Char *patbuf;
-	size_t patbuf_len;
-	glob_t *pglob;
-{
-	struct passwd *pwd;
-	char *h;
-	const Char *p;
-	Char *b, *eb;
-
-	if (*pattern != TILDE || !(pglob->gl_flags & GLOB_TILDE))
-		return pattern;
-
-	/* 
-	 * Copy up to the end of the string or / 
-	 */
-	eb = &patbuf[patbuf_len - 1];
-	for (p = pattern + 1, h = (char *) patbuf;
-	    h < (char *)eb && *p && *p != SLASH; *h++ = *p++)
-		continue;
-
-	*h = EOS;
-
-	if (((char *) patbuf)[0] == EOS) {
-		/*
-		 * handle a plain ~ or ~/ by expanding $HOME first (iff
-		 * we're not running setuid or setgid) and then trying
-		 * the password file
-		 */
-		if (
-#ifndef	__NETBSD_SYSCALLS
-		    issetugid() != 0 ||
-#endif
-		    (h = getenv("HOME")) == NULL) {
-/* If we are not EL/IX level 4, we cannot use getpwxxx interfaces */
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4
-			if (((h = getlogin()) != NULL &&
-			     (pwd = getpwnam(h)) != NULL) ||
-			    (pwd = getpwuid(getuid())) != NULL)
-				h = pwd->pw_dir;
-			else
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 4 */
-				return pattern;
-		}
-	}
-	else {
-		/*
-		 * Expand a ~user
-		 */
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4
-		if ((pwd = getpwnam((char*) patbuf)) != NULL)
-			h = pwd->pw_dir;
-		else
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 4 */
-			return pattern;
-	}
-
-	/* Copy the home directory */
-	for (b = patbuf; b < eb && *h; *b++ = *h++)
-		continue;
-
-	/* Append the rest of the pattern */
-	while (b < eb && (*b++ = *p++) != EOS)
-		continue;
-	*b = EOS;
-
-	return patbuf;
-}
-
-
-/*
- * The main glob() routine: compiles the pattern (optionally processing
- * quotes), calls glob1() to do the real pattern matching, and finally
- * sorts the list (unless unsorted operation is requested).  Returns 0
- * if things went well, nonzero if errors occurred.  It is not an error
- * to find no matches.
- */
-static int
-glob0(pattern, pglob, limit)
-	const Char *pattern;
-	glob_t *pglob;
-	int *limit;
-{
-	const Char *qpatnext;
-	int c, err, oldpathc;
-	Char *bufnext, patbuf[MAXPATHLEN];
-
-	qpatnext = globtilde(pattern, patbuf, MAXPATHLEN, pglob);
-	oldpathc = pglob->gl_pathc;
-	bufnext = patbuf;
-
-	/* We don't need to check for buffer overflow any more. */
-	while ((c = *qpatnext++) != EOS) {
-		switch (c) {
-		case LBRACKET:
-			c = *qpatnext;
-			if (c == NOT)
-				++qpatnext;
-			if (*qpatnext == EOS ||
-			    g_strchr((Char *) qpatnext+1, RBRACKET) == NULL) {
-				*bufnext++ = LBRACKET;
-				if (c == NOT)
-					--qpatnext;
-				break;
-			}
-			*bufnext++ = M_SET;
-			if (c == NOT)
-				*bufnext++ = M_NOT;
-			c = *qpatnext++;
-			do {
-				*bufnext++ = CHAR(c);
-				if (*qpatnext == RANGE &&
-				    (c = qpatnext[1]) != RBRACKET) {
-					*bufnext++ = M_RNG;
-					*bufnext++ = CHAR(c);
-					qpatnext += 2;
-				}
-			} while ((c = *qpatnext++) != RBRACKET);
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			*bufnext++ = M_END;
-			break;
-		case QUESTION:
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			*bufnext++ = M_ONE;
-			break;
-		case STAR:
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			/* collapse adjacent stars to one,
-			 * to avoid exponential behavior
-			 */
-			if (bufnext == patbuf || bufnext[-1] != M_ALL)
-			    *bufnext++ = M_ALL;
-			break;
-		default:
-			*bufnext++ = CHAR(c);
-			break;
-		}
-	}
-	*bufnext = EOS;
-#ifdef DEBUG
-	qprintf("glob0:", patbuf);
-#endif
-
-	if ((err = glob1(patbuf, pglob, limit)) != 0)
-		return(err);
-
-	/*
-	 * If there was no match we are going to append the pattern
-	 * if GLOB_NOCHECK was specified or if GLOB_NOMAGIC was specified
-	 * and the pattern did not contain any magic characters
-	 * GLOB_NOMAGIC is there just for compatibility with csh.
-	 */
-	if (pglob->gl_pathc == oldpathc &&
-	    ((pglob->gl_flags & GLOB_NOCHECK) ||
-	      ((pglob->gl_flags & GLOB_NOMAGIC) &&
-	       !(pglob->gl_flags & GLOB_MAGCHAR))))
-		return(globextend(pattern, pglob, limit));
-	else if (!(pglob->gl_flags & GLOB_NOSORT))
-		qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc,
-		    pglob->gl_pathc - oldpathc, sizeof(char *), compare);
-	return(0);
-}
-
-static int
-compare(p, q)
-	const void *p, *q;
-{
-	return(strcmp(*(char **)p, *(char **)q));
-}
-
-static int
-glob1(pattern, pglob, limit)
-	Char *pattern;
-	glob_t *pglob;
-	int *limit;
-{
-	Char pathbuf[MAXPATHLEN];
-
-	/* A null pathname is invalid -- POSIX 1003.1 sect. 2.4. */
-	if (*pattern == EOS)
-		return(0);
-	return(glob2(pathbuf, pathbuf, pathbuf + MAXPATHLEN - 1,
-	    pattern, pglob, limit));
-}
-
-/*
- * The functions glob2 and glob3 are mutually recursive; there is one level
- * of recursion for each segment in the pattern that contains one or more
- * meta characters.
- */
-static int
-glob2(pathbuf, pathend, pathend_last, pattern, pglob, limit)
-	Char *pathbuf, *pathend, *pathend_last, *pattern;
-	glob_t *pglob;
-	int *limit;
-{
-	struct stat sb;
-	Char *p, *q;
-	int anymeta;
-
-	/*
-	 * Loop over pattern segments until end of pattern or until
-	 * segment with meta character found.
-	 */
-	for (anymeta = 0;;) {
-		if (*pattern == EOS) {		/* End of pattern? */
-			*pathend = EOS;
-			if (g_lstat(pathbuf, &sb, pglob))
-				return(0);
-
-			if (((pglob->gl_flags & GLOB_MARK) &&
-			    pathend[-1] != SEP) && (S_ISDIR(sb.st_mode)
-			    || (S_ISLNK(sb.st_mode) &&
-			    (g_stat(pathbuf, &sb, pglob) == 0) &&
-			    S_ISDIR(sb.st_mode)))) {
-				if (pathend + 1 > pathend_last)
-					return (1);
-				*pathend++ = SEP;
-				*pathend = EOS;
-			}
-			++pglob->gl_matchc;
-			return(globextend(pathbuf, pglob, limit));
-		}
-
-		/* Find end of next segment, copy tentatively to pathend. */
-		q = pathend;
-		p = pattern;
-		while (*p != EOS && *p != SEP) {
-			if (ismeta(*p))
-				anymeta = 1;
-			if (q + 1 > pathend_last)
-				return (1);
-			*q++ = *p++;
-		}
-
-		if (!anymeta) {		/* No expansion, do next segment. */
-			pathend = q;
-			pattern = p;
-			while (*pattern == SEP) {
-				if (pathend + 1 > pathend_last)
-					return (1);
-				*pathend++ = *pattern++;
-			}
-		} else			/* Need expansion, recurse. */
-			return(glob3(pathbuf, pathend, pathend_last, pattern, p,
-			    pglob, limit));
-	}
-	/* NOTREACHED */
-}
-
-static int
-glob3(pathbuf, pathend, pathend_last, pattern, restpattern, pglob, limit)
-	Char *pathbuf, *pathend, *pathend_last, *pattern, *restpattern;
-	glob_t *pglob;
-	int *limit;
-{
-	struct dirent *dp;
-	DIR *dirp;
-	int err;
-	char buf[MAXPATHLEN];
-
-	/*
-	 * The readdirfunc declaration can't be prototyped, because it is
-	 * assigned, below, to two functions which are prototyped in glob.h
-	 * and dirent.h as taking pointers to differently typed opaque
-	 * structures.
-	 */
-	struct dirent *(*readdirfunc)();
-
-	if (pathend > pathend_last)
-		return (1);
-	*pathend = EOS;
-	errno = 0;
-
-	if ((dirp = g_opendir(pathbuf, pglob)) == NULL) {
-		/* TODO: don't call for ENOENT or ENOTDIR? */
-		if (pglob->gl_errfunc) {
-			if (g_Ctoc(pathbuf, buf, sizeof(buf)))
-				return (GLOB_ABEND);
-			if (pglob->gl_errfunc(buf, errno) ||
-			    pglob->gl_flags & GLOB_ERR)
-				return (GLOB_ABEND);
-		}
-		return(0);
-	}
-
-	err = 0;
-
-	/* Search directory for matching names. */
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		readdirfunc = pglob->gl_readdir;
-	else
-		readdirfunc = readdir;
-	while ((dp = (*readdirfunc)(dirp))) {
-		u_char *sc;
-		Char *dc;
-
-		/* Initial DOT must be matched literally. */
-		if (dp->d_name[0] == DOT && *pattern != DOT)
-			continue;
-		dc = pathend;
-		sc = (u_char *) dp->d_name;
-		while (dc < pathend_last && (*dc++ = *sc++) != EOS)
-			;
-		if (!match(pathend, pattern, restpattern)) {
-			*pathend = EOS;
-			continue;
-		}
-		err = glob2(pathbuf, --dc, pathend_last, restpattern,
-		    pglob, limit);
-		if (err)
-			break;
-	}
-
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		(*pglob->gl_closedir)(dirp);
-	else
-		closedir(dirp);
-	return(err);
-}
-
-
-/*
- * Extend the gl_pathv member of a glob_t structure to accomodate a new item,
- * add the new item, and update gl_pathc.
- *
- * This assumes the BSD realloc, which only copies the block when its size
- * crosses a power-of-two boundary; for v7 realloc, this would cause quadratic
- * behavior.
- *
- * Return 0 if new item added, error code if memory couldn't be allocated.
- *
- * Invariant of the glob_t structure:
- *	Either gl_pathc is zero and gl_pathv is NULL; or gl_pathc > 0 and
- *	gl_pathv points to (gl_offs + gl_pathc + 1) items.
- */
-static int
-globextend(path, pglob, limit)
-	const Char *path;
-	glob_t *pglob;
-	int *limit;
-{
-	char **pathv;
-	int i;
-	u_int newsize, len;
-	char *copy;
-	const Char *p;
-
-	if (*limit && pglob->gl_pathc > *limit) {
-		errno = 0;
-		return (GLOB_NOSPACE);
-	}
-
-	newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
-	pathv = pglob->gl_pathv ?
-		    realloc((char *)pglob->gl_pathv, newsize) :
-		    malloc(newsize);
-	if (pathv == NULL) {
-		if (pglob->gl_pathv) {
-			free(pglob->gl_pathv);
-			pglob->gl_pathv = NULL;
-		}
-		return(GLOB_NOSPACE);
-	}
-
-	if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
-		/* first time around -- clear initial gl_offs items */
-		pathv += pglob->gl_offs;
-		for (i = pglob->gl_offs; --i >= 0; )
-			*--pathv = NULL;
-	}
-	pglob->gl_pathv = pathv;
-
-	for (p = path; *p++;)
-		continue;
-	len = (size_t)(p - path);
-	if ((copy = malloc(len)) != NULL) {
-		if (g_Ctoc(path, copy, len)) {
-			free(copy);
-			return (GLOB_NOSPACE);
-		}
-		pathv[pglob->gl_offs + pglob->gl_pathc++] = copy;
-	}
-	pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
-	return(copy == NULL ? GLOB_NOSPACE : 0);
-}
-
-/*
- * pattern matching function for filenames.  Each occurrence of the *
- * pattern causes a recursion level.
- */
-static int
-match(name, pat, patend)
-	Char *name, *pat, *patend;
-{
-	int ok, negate_range;
-	Char c, k;
-
-	while (pat < patend) {
-		c = *pat++;
-		switch (c & M_MASK) {
-		case M_ALL:
-			if (pat == patend)
-				return(1);
-			do
-			    if (match(name, pat, patend))
-				    return(1);
-			while (*name++ != EOS);
-			return(0);
-		case M_ONE:
-			if (*name++ == EOS)
-				return(0);
-			break;
-		case M_SET:
-			ok = 0;
-			if ((k = *name++) == EOS)
-				return(0);
-			if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS)
-				++pat;
-			while (((c = *pat++) & M_MASK) != M_END)
-				if ((*pat & M_MASK) == M_RNG) {
-					if (__collate_load_error ?
-					    CHAR(c) <= CHAR(k) && CHAR(k) <= CHAR(pat[1]) :
-					       __collate_range_cmp(CHAR(c), CHAR(k)) <= 0
-					    && __collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0
-					   )
-						ok = 1;
-					pat += 2;
-				} else if (c == k)
-					ok = 1;
-			if (ok == negate_range)
-				return(0);
-			break;
-		default:
-			if (*name++ != c)
-				return(0);
-			break;
-		}
-	}
-	return(*name == EOS);
-}
-
-/* Free allocated data belonging to a glob_t structure. */
-void
-globfree(pglob)
-	glob_t *pglob;
-{
-	int i;
-	char **pp;
-
-	if (pglob->gl_pathv != NULL) {
-		pp = pglob->gl_pathv + pglob->gl_offs;
-		for (i = pglob->gl_pathc; i--; ++pp)
-			if (*pp)
-				free(*pp);
-		free(pglob->gl_pathv);
-		pglob->gl_pathv = NULL;
-	}
-}
-
-static DIR *
-g_opendir(str, pglob)
-	Char *str;
-	glob_t *pglob;
-{
-	char buf[MAXPATHLEN];
-
-	if (!*str)
-		strcpy(buf, ".");
-	else {
-		if (g_Ctoc(str, buf, sizeof(buf)))
-			return (NULL);
-	}
-
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_opendir)(buf));
-
-	return(opendir(buf));
-}
-
-static int
-g_lstat(fn, sb, pglob)
-	Char *fn;
-	struct stat *sb;
-	glob_t *pglob;
-{
-	char buf[MAXPATHLEN];
-
-	if (g_Ctoc(fn, buf, sizeof(buf))) {
-		errno = ENAMETOOLONG;
-		return (-1);
-	}
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_lstat)(buf, sb));
-	return(lstat(buf, sb));
-}
-
-static int
-g_stat(fn, sb, pglob)
-	Char *fn;
-	struct stat *sb;
-	glob_t *pglob;
-{
-	char buf[MAXPATHLEN];
-
-	if (g_Ctoc(fn, buf, sizeof(buf))) {
-		errno = ENAMETOOLONG;
-		return (-1);
-	}
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_stat)(buf, sb));
-	return(stat(buf, sb));
-}
-
-static Char *
-g_strchr(str, ch)
-	Char *str;
-	int ch;
-{
-	do {
-		if (*str == ch)
-			return (str);
-	} while (*str++);
-	return (NULL);
-}
-
-static int
-g_Ctoc(str, buf, len)
-	const Char *str;
-	char *buf;
-	u_int len;
-{
-
-	while (len--) {
-		if ((*buf++ = *str++) == '\0')
-			return (0);
-	}
-	return (1);
-}
-
-#ifdef DEBUG
-static void
-qprintf(str, s)
-	const char *str;
-	Char *s;
-{
-	Char *p;
-
-	(void)printf("%s:\n", str);
-	for (p = s; *p; p++)
-		(void)printf("%c", CHAR(*p));
-	(void)printf("\n");
-	for (p = s; *p; p++)
-		(void)printf("%c", *p & M_PROTECT ? '"' : ' ');
-	(void)printf("\n");
-	for (p = s; *p; p++)
-		(void)printf("%c", ismeta(*p) ? '_' : ' ');
-	(void)printf("\n");
-}
-#endif
diff --git a/newlib/libc/sys/linux/stdlib/reallocf.c b/newlib/libc/sys/linux/stdlib/reallocf.c
deleted file mode 100644
index d502006..0000000
--- a/newlib/libc/sys/linux/stdlib/reallocf.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 1998, M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/reallocf.c,v 1.4 2002/03/22 21:53:10 obrien Exp $");
-
-#include <stdlib.h>
-
-void *
-reallocf(void *ptr, size_t size)
-{
-	void *nptr;
-
-	nptr = realloc(ptr, size);
-	if (!nptr && ptr)
-		free(ptr);
-	return (nptr);
-}
diff --git a/newlib/libc/sys/linux/stdlib/regcomp.c b/newlib/libc/sys/linux/stdlib/regcomp.c
deleted file mode 100644
index 8a38869..0000000
--- a/newlib/libc/sys/linux/stdlib/regcomp.c
+++ /dev/null
@@ -1,2089 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)regcomp.c	8.5 (Berkeley) 3/20/94
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.27 2002/03/22 21:52:47 obrien Exp $");
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <regex.h>
-
-#include "collate.h"
-
-#include "utils.h"
-#include "regex2.h"
-
-#include "cclass.h"
-#include "cname.h"
-
-/*
- * parse structure, passed up and down to avoid global variables and
- * other clumsinesses
- */
-struct parse {
-	char *next;		/* next character in RE */
-	char *end;		/* end of string (-> NUL normally) */
-	int error;		/* has an error been seen? */
-	sop *strip;		/* malloced strip */
-	sopno ssize;		/* malloced strip size (allocated) */
-	sopno slen;		/* malloced strip length (used) */
-	int ncsalloc;		/* number of csets allocated */
-	struct re_guts *g;
-#	define	NPAREN	10	/* we need to remember () 1-9 for back refs */
-	sopno pbegin[NPAREN];	/* -> ( ([0] unused) */
-	sopno pend[NPAREN];	/* -> ) ([0] unused) */
-};
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === regcomp.c === */
-static void p_ere(struct parse *p, int stop);
-static void p_ere_exp(struct parse *p);
-static void p_str(struct parse *p);
-static void p_bre(struct parse *p, int end1, int end2);
-static int p_simp_re(struct parse *p, int starordinary);
-static int p_count(struct parse *p);
-static void p_bracket(struct parse *p);
-static void p_b_term(struct parse *p, cset *cs);
-static void p_b_cclass(struct parse *p, cset *cs);
-static void p_b_eclass(struct parse *p, cset *cs);
-static char p_b_symbol(struct parse *p);
-static char p_b_coll_elem(struct parse *p, int endc);
-static char othercase(int ch);
-static void bothcases(struct parse *p, int ch);
-static void ordinary(struct parse *p, int ch);
-static void nonnewline(struct parse *p);
-static void repeat(struct parse *p, sopno start, int from, int to);
-static int seterr(struct parse *p, int e);
-static cset *allocset(struct parse *p);
-static void freeset(struct parse *p, cset *cs);
-static int freezeset(struct parse *p, cset *cs);
-static int firstch(struct parse *p, cset *cs);
-static int nch(struct parse *p, cset *cs);
-static void mcadd(struct parse *p, cset *cs, char *cp);
-#if used
-static void mcsub(cset *cs, char *cp);
-static int mcin(cset *cs, char *cp);
-static char *mcfind(cset *cs, char *cp);
-#endif
-static void mcinvert(struct parse *p, cset *cs);
-static void mccase(struct parse *p, cset *cs);
-static int isinsets(struct re_guts *g, int c);
-static int samesets(struct re_guts *g, int c1, int c2);
-static void categorize(struct parse *p, struct re_guts *g);
-static sopno dupl(struct parse *p, sopno start, sopno finish);
-static void doemit(struct parse *p, sop op, size_t opnd);
-static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
-static void dofwd(struct parse *p, sopno pos, sop value);
-static void enlarge(struct parse *p, sopno size);
-static void stripsnug(struct parse *p, struct re_guts *g);
-static void findmust(struct parse *p, struct re_guts *g);
-static int altoffset(sop *scan, int offset, int mccs);
-static void computejumps(struct parse *p, struct re_guts *g);
-static void computematchjumps(struct parse *p, struct re_guts *g);
-static sopno pluscount(struct parse *p, struct re_guts *g);
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-
-static char nuls[10];		/* place to point scanner in event of error */
-
-/*
- * macros for use with parse structure
- * BEWARE:  these know that the parse structure is named `p' !!!
- */
-#define	PEEK()	(*p->next)
-#define	PEEK2()	(*(p->next+1))
-#define	MORE()	(p->next < p->end)
-#define	MORE2()	(p->next+1 < p->end)
-#define	SEE(c)	(MORE() && PEEK() == (c))
-#define	SEETWO(a, b)	(MORE() && MORE2() && PEEK() == (a) && PEEK2() == (b))
-#define	EAT(c)	((SEE(c)) ? (NEXT(), 1) : 0)
-#define	EATTWO(a, b)	((SEETWO(a, b)) ? (NEXT2(), 1) : 0)
-#define	NEXT()	(p->next++)
-#define	NEXT2()	(p->next += 2)
-#define	NEXTn(n)	(p->next += (n))
-#define	GETNEXT()	(*p->next++)
-#define	SETERROR(e)	seterr(p, (e))
-#define	REQUIRE(co, e)	((co) || SETERROR(e))
-#define	MUSTSEE(c, e)	(REQUIRE(MORE() && PEEK() == (c), e))
-#define	MUSTEAT(c, e)	(REQUIRE(MORE() && GETNEXT() == (c), e))
-#define	MUSTNOTSEE(c, e)	(REQUIRE(!MORE() || PEEK() != (c), e))
-#define	EMIT(op, sopnd)	doemit(p, (sop)(op), (size_t)(sopnd))
-#define	INSERT(op, pos)	doinsert(p, (sop)(op), HERE()-(pos)+1, pos)
-#define	AHEAD(pos)		dofwd(p, pos, HERE()-(pos))
-#define	ASTERN(sop, pos)	EMIT(sop, HERE()-pos)
-#define	HERE()		(p->slen)
-#define	THERE()		(p->slen - 1)
-#define	THERETHERE()	(p->slen - 2)
-#define	DROP(n)	(p->slen -= (n))
-
-#ifndef NDEBUG
-static int never = 0;		/* for use in asserts; shuts lint up */
-#else
-#define	never	0		/* some <assert.h>s have bugs too */
-#endif
-
-/* Macro used by computejump()/computematchjump() */
-#define MIN(a,b)	((a)<(b)?(a):(b))
-
-/*
- - regcomp - interface for parser and compilation
- = extern int regcomp(regex_t *, const char *, int);
- = #define	REG_BASIC	0000
- = #define	REG_EXTENDED	0001
- = #define	REG_ICASE	0002
- = #define	REG_NOSUB	0004
- = #define	REG_NEWLINE	0010
- = #define	REG_NOSPEC	0020
- = #define	REG_PEND	0040
- = #define	REG_DUMP	0200
- */
-int				/* 0 success, otherwise REG_something */
-regcomp(preg, pattern, cflags)
-regex_t *preg;
-const char *pattern;
-int cflags;
-{
-	struct parse pa;
-	struct re_guts *g;
-	struct parse *p = &pa;
-	int i;
-	size_t len;
-#ifdef REDEBUG
-#	define	GOODFLAGS(f)	(f)
-#else
-#	define	GOODFLAGS(f)	((f)&~REG_DUMP)
-#endif
-
-	cflags = GOODFLAGS(cflags);
-	if ((cflags&REG_EXTENDED) && (cflags&REG_NOSPEC))
-		return(REG_INVARG);
-
-	if (cflags&REG_PEND) {
-		if (preg->re_endp < pattern)
-			return(REG_INVARG);
-		len = preg->re_endp - pattern;
-	} else
-		len = strlen((char *)pattern);
-
-	/* do the mallocs early so failure handling is easy */
-	g = (struct re_guts *)malloc(sizeof(struct re_guts) +
-							(NC-1)*sizeof(cat_t));
-	if (g == NULL)
-		return(REG_ESPACE);
-	p->ssize = len/(size_t)2*(size_t)3 + (size_t)1;	/* ugh */
-	p->strip = (sop *)malloc(p->ssize * sizeof(sop));
-	p->slen = 0;
-	if (p->strip == NULL) {
-		free((char *)g);
-		return(REG_ESPACE);
-	}
-
-	/* set things up */
-	p->g = g;
-	p->next = (char *)pattern;	/* convenience; we do not modify it */
-	p->end = p->next + len;
-	p->error = 0;
-	p->ncsalloc = 0;
-	for (i = 0; i < NPAREN; i++) {
-		p->pbegin[i] = 0;
-		p->pend[i] = 0;
-	}
-	g->csetsize = NC;
-	g->sets = NULL;
-	g->setbits = NULL;
-	g->ncsets = 0;
-	g->cflags = cflags;
-	g->iflags = 0;
-	g->nbol = 0;
-	g->neol = 0;
-	g->must = NULL;
-	g->moffset = -1;
-	g->charjump = NULL;
-	g->matchjump = NULL;
-	g->mlen = 0;
-	g->nsub = 0;
-	g->ncategories = 1;	/* category 0 is "everything else" */
-	g->categories = &g->catspace[-(CHAR_MIN)];
-	(void) memset((char *)g->catspace, 0, NC*sizeof(cat_t));
-	g->backrefs = 0;
-
-	/* do it */
-	EMIT(OEND, 0);
-	g->firststate = THERE();
-	if (cflags&REG_EXTENDED)
-		p_ere(p, OUT);
-	else if (cflags&REG_NOSPEC)
-		p_str(p);
-	else
-		p_bre(p, OUT, OUT);
-	EMIT(OEND, 0);
-	g->laststate = THERE();
-
-	/* tidy up loose ends and fill things in */
-	categorize(p, g);
-	stripsnug(p, g);
-	findmust(p, g);
-	/* only use Boyer-Moore algorithm if the pattern is bigger
-	 * than three characters
-	 */
-	if(g->mlen > 3) {
-		computejumps(p, g);
-		computematchjumps(p, g);
-		if(g->matchjump == NULL && g->charjump != NULL) {
-			free(g->charjump);
-			g->charjump = NULL;
-		}
-	}
-	g->nplus = pluscount(p, g);
-	g->magic = MAGIC2;
-	preg->re_nsub = g->nsub;
-	preg->re_g = g;
-	preg->re_magic = MAGIC1;
-#ifndef REDEBUG
-	/* not debugging, so can't rely on the assert() in regexec() */
-	if (g->iflags&BAD)
-		SETERROR(REG_ASSERT);
-#endif
-
-	/* win or lose, we're done */
-	if (p->error != 0)	/* lose */
-		regfree(preg);
-	return(p->error);
-}
-
-/*
- - p_ere - ERE parser top level, concatenation and alternation
- == static void p_ere(struct parse *p, int stop);
- */
-static void
-p_ere(p, stop)
-struct parse *p;
-int stop;			/* character this ERE should end at */
-{
-	char c;
-	sopno prevback;
-	sopno prevfwd;
-	sopno conc;
-	int first = 1;		/* is this the first alternative? */
-
-	for (;;) {
-		/* do a bunch of concatenated expressions */
-		conc = HERE();
-		while (MORE() && (c = PEEK()) != '|' && c != stop)
-			p_ere_exp(p);
-		(void)REQUIRE(HERE() != conc, REG_EMPTY);	/* require nonempty */
-
-		if (!EAT('|'))
-			break;		/* NOTE BREAK OUT */
-
-		if (first) {
-			INSERT(OCH_, conc);	/* offset is wrong */
-			prevfwd = conc;
-			prevback = conc;
-			first = 0;
-		}
-		ASTERN(OOR1, prevback);
-		prevback = THERE();
-		AHEAD(prevfwd);			/* fix previous offset */
-		prevfwd = HERE();
-		EMIT(OOR2, 0);			/* offset is very wrong */
-	}
-
-	if (!first) {		/* tail-end fixups */
-		AHEAD(prevfwd);
-		ASTERN(O_CH, prevback);
-	}
-
-	assert(!MORE() || SEE(stop));
-}
-
-/*
- - p_ere_exp - parse one subERE, an atom possibly followed by a repetition op
- == static void p_ere_exp(struct parse *p);
- */
-static void
-p_ere_exp(p)
-struct parse *p;
-{
-	char c;
-	sopno pos;
-	int count;
-	int count2;
-	sopno subno;
-	int wascaret = 0;
-
-	assert(MORE());		/* caller should have ensured this */
-	c = GETNEXT();
-
-	pos = HERE();
-	switch (c) {
-	case '(':
-		(void)REQUIRE(MORE(), REG_EPAREN);
-		p->g->nsub++;
-		subno = p->g->nsub;
-		if (subno < NPAREN)
-			p->pbegin[subno] = HERE();
-		EMIT(OLPAREN, subno);
-		if (!SEE(')'))
-			p_ere(p, ')');
-		if (subno < NPAREN) {
-			p->pend[subno] = HERE();
-			assert(p->pend[subno] != 0);
-		}
-		EMIT(ORPAREN, subno);
-		(void)MUSTEAT(')', REG_EPAREN);
-		break;
-#ifndef POSIX_MISTAKE
-	case ')':		/* happens only if no current unmatched ( */
-		/*
-		 * You may ask, why the ifndef?  Because I didn't notice
-		 * this until slightly too late for 1003.2, and none of the
-		 * other 1003.2 regular-expression reviewers noticed it at
-		 * all.  So an unmatched ) is legal POSIX, at least until
-		 * we can get it fixed.
-		 */
-		SETERROR(REG_EPAREN);
-		break;
-#endif
-	case '^':
-		EMIT(OBOL, 0);
-		p->g->iflags |= USEBOL;
-		p->g->nbol++;
-		wascaret = 1;
-		break;
-	case '$':
-		EMIT(OEOL, 0);
-		p->g->iflags |= USEEOL;
-		p->g->neol++;
-		break;
-	case '|':
-		SETERROR(REG_EMPTY);
-		break;
-	case '*':
-	case '+':
-	case '?':
-		SETERROR(REG_BADRPT);
-		break;
-	case '.':
-		if (p->g->cflags&REG_NEWLINE)
-			nonnewline(p);
-		else
-			EMIT(OANY, 0);
-		break;
-	case '[':
-		p_bracket(p);
-		break;
-	case '\\':
-		(void)REQUIRE(MORE(), REG_EESCAPE);
-		c = GETNEXT();
-		ordinary(p, c);
-		break;
-	case '{':		/* okay as ordinary except if digit follows */
-		(void)REQUIRE(!MORE() || !isdigit((uch)PEEK()), REG_BADRPT);
-		/* FALLTHROUGH */
-	default:
-		ordinary(p, c);
-		break;
-	}
-
-	if (!MORE())
-		return;
-	c = PEEK();
-	/* we call { a repetition if followed by a digit */
-	if (!( c == '*' || c == '+' || c == '?' ||
-				(c == '{' && MORE2() && isdigit((uch)PEEK2())) ))
-		return;		/* no repetition, we're done */
-	NEXT();
-
-	(void)REQUIRE(!wascaret, REG_BADRPT);
-	switch (c) {
-	case '*':	/* implemented as +? */
-		/* this case does not require the (y|) trick, noKLUDGE */
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		INSERT(OQUEST_, pos);
-		ASTERN(O_QUEST, pos);
-		break;
-	case '+':
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		break;
-	case '?':
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, pos);		/* offset slightly wrong */
-		ASTERN(OOR1, pos);		/* this one's right */
-		AHEAD(pos);			/* fix the OCH_ */
-		EMIT(OOR2, 0);			/* offset very wrong... */
-		AHEAD(THERE());			/* ...so fix it */
-		ASTERN(O_CH, THERETHERE());
-		break;
-	case '{':
-		count = p_count(p);
-		if (EAT(',')) {
-			if (isdigit((uch)PEEK())) {
-				count2 = p_count(p);
-				(void)REQUIRE(count <= count2, REG_BADBR);
-			} else		/* single number with comma */
-				count2 = INFINITY;
-		} else		/* just a single number */
-			count2 = count;
-		repeat(p, pos, count, count2);
-		if (!EAT('}')) {	/* error heuristics */
-			while (MORE() && PEEK() != '}')
-				NEXT();
-			(void)REQUIRE(MORE(), REG_EBRACE);
-			SETERROR(REG_BADBR);
-		}
-		break;
-	}
-
-	if (!MORE())
-		return;
-	c = PEEK();
-	if (!( c == '*' || c == '+' || c == '?' ||
-				(c == '{' && MORE2() && isdigit((uch)PEEK2())) ) )
-		return;
-	SETERROR(REG_BADRPT);
-}
-
-/*
- - p_str - string (no metacharacters) "parser"
- == static void p_str(struct parse *p);
- */
-static void
-p_str(p)
-struct parse *p;
-{
-	(void)REQUIRE(MORE(), REG_EMPTY);
-	while (MORE())
-		ordinary(p, GETNEXT());
-}
-
-/*
- - p_bre - BRE parser top level, anchoring and concatenation
- == static void p_bre(struct parse *p, int end1, \
- ==	int end2);
- * Giving end1 as OUT essentially eliminates the end1/end2 check.
- *
- * This implementation is a bit of a kludge, in that a trailing $ is first
- * taken as an ordinary character and then revised to be an anchor.  The
- * only undesirable side effect is that '$' gets included as a character
- * category in such cases.  This is fairly harmless; not worth fixing.
- * The amount of lookahead needed to avoid this kludge is excessive.
- */
-static void
-p_bre(p, end1, end2)
-struct parse *p;
-int end1;			/* first terminating character */
-int end2;			/* second terminating character */
-{
-	sopno start = HERE();
-	int first = 1;			/* first subexpression? */
-	int wasdollar = 0;
-
-	if (EAT('^')) {
-		EMIT(OBOL, 0);
-		p->g->iflags |= USEBOL;
-		p->g->nbol++;
-	}
-	while (MORE() && !SEETWO(end1, end2)) {
-		wasdollar = p_simp_re(p, first);
-		first = 0;
-	}
-	if (wasdollar) {	/* oops, that was a trailing anchor */
-		DROP(1);
-		EMIT(OEOL, 0);
-		p->g->iflags |= USEEOL;
-		p->g->neol++;
-	}
-
-	(void)REQUIRE(HERE() != start, REG_EMPTY);	/* require nonempty */
-}
-
-/*
- - p_simp_re - parse a simple RE, an atom possibly followed by a repetition
- == static int p_simp_re(struct parse *p, int starordinary);
- */
-static int			/* was the simple RE an unbackslashed $? */
-p_simp_re(p, starordinary)
-struct parse *p;
-int starordinary;		/* is a leading * an ordinary character? */
-{
-	int c;
-	int count;
-	int count2;
-	sopno pos;
-	int i;
-	sopno subno;
-#	define	BACKSL	(1<<CHAR_BIT)
-
-	pos = HERE();		/* repetion op, if any, covers from here */
-
-	assert(MORE());		/* caller should have ensured this */
-	c = GETNEXT();
-	if (c == '\\') {
-		(void)REQUIRE(MORE(), REG_EESCAPE);
-		c = BACKSL | GETNEXT();
-	}
-	switch (c) {
-	case '.':
-		if (p->g->cflags&REG_NEWLINE)
-			nonnewline(p);
-		else
-			EMIT(OANY, 0);
-		break;
-	case '[':
-		p_bracket(p);
-		break;
-	case BACKSL|'{':
-		SETERROR(REG_BADRPT);
-		break;
-	case BACKSL|'(':
-		p->g->nsub++;
-		subno = p->g->nsub;
-		if (subno < NPAREN)
-			p->pbegin[subno] = HERE();
-		EMIT(OLPAREN, subno);
-		/* the MORE here is an error heuristic */
-		if (MORE() && !SEETWO('\\', ')'))
-			p_bre(p, '\\', ')');
-		if (subno < NPAREN) {
-			p->pend[subno] = HERE();
-			assert(p->pend[subno] != 0);
-		}
-		EMIT(ORPAREN, subno);
-		(void)REQUIRE(EATTWO('\\', ')'), REG_EPAREN);
-		break;
-	case BACKSL|')':	/* should not get here -- must be user */
-	case BACKSL|'}':
-		SETERROR(REG_EPAREN);
-		break;
-	case BACKSL|'1':
-	case BACKSL|'2':
-	case BACKSL|'3':
-	case BACKSL|'4':
-	case BACKSL|'5':
-	case BACKSL|'6':
-	case BACKSL|'7':
-	case BACKSL|'8':
-	case BACKSL|'9':
-		i = (c&~BACKSL) - '0';
-		assert(i < NPAREN);
-		if (p->pend[i] != 0) {
-			assert(i <= p->g->nsub);
-			EMIT(OBACK_, i);
-			assert(p->pbegin[i] != 0);
-			assert(OP(p->strip[p->pbegin[i]]) == OLPAREN);
-			assert(OP(p->strip[p->pend[i]]) == ORPAREN);
-			(void) dupl(p, p->pbegin[i]+1, p->pend[i]);
-			EMIT(O_BACK, i);
-		} else
-			SETERROR(REG_ESUBREG);
-		p->g->backrefs = 1;
-		break;
-	case '*':
-		(void)REQUIRE(starordinary, REG_BADRPT);
-		/* FALLTHROUGH */
-	default:
-		ordinary(p, (char)c);
-		break;
-	}
-
-	if (EAT('*')) {		/* implemented as +? */
-		/* this case does not require the (y|) trick, noKLUDGE */
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		INSERT(OQUEST_, pos);
-		ASTERN(O_QUEST, pos);
-	} else if (EATTWO('\\', '{')) {
-		count = p_count(p);
-		if (EAT(',')) {
-			if (MORE() && isdigit((uch)PEEK())) {
-				count2 = p_count(p);
-				(void)REQUIRE(count <= count2, REG_BADBR);
-			} else		/* single number with comma */
-				count2 = INFINITY;
-		} else		/* just a single number */
-			count2 = count;
-		repeat(p, pos, count, count2);
-		if (!EATTWO('\\', '}')) {	/* error heuristics */
-			while (MORE() && !SEETWO('\\', '}'))
-				NEXT();
-			(void)REQUIRE(MORE(), REG_EBRACE);
-			SETERROR(REG_BADBR);
-		}
-	} else if (c == '$')     /* $ (but not \$) ends it */
-		return(1);
-
-	return(0);
-}
-
-/*
- - p_count - parse a repetition count
- == static int p_count(struct parse *p);
- */
-static int			/* the value */
-p_count(p)
-struct parse *p;
-{
-	int count = 0;
-	int ndigits = 0;
-
-	while (MORE() && isdigit((uch)PEEK()) && count <= DUPMAX) {
-		count = count*10 + (GETNEXT() - '0');
-		ndigits++;
-	}
-
-	(void)REQUIRE(ndigits > 0 && count <= DUPMAX, REG_BADBR);
-	return(count);
-}
-
-/*
- - p_bracket - parse a bracketed character list
- == static void p_bracket(struct parse *p);
- *
- * Note a significant property of this code:  if the allocset() did SETERROR,
- * no set operations are done.
- */
-static void
-p_bracket(p)
-struct parse *p;
-{
-	cset *cs = allocset(p);
-	int invert = 0;
-
-	/* Dept of Truly Sickening Special-Case Kludges */
-	if (p->next + 5 < p->end && strncmp(p->next, "[:<:]]", 6) == 0) {
-		EMIT(OBOW, 0);
-		NEXTn(6);
-		return;
-	}
-	if (p->next + 5 < p->end && strncmp(p->next, "[:>:]]", 6) == 0) {
-		EMIT(OEOW, 0);
-		NEXTn(6);
-		return;
-	}
-
-	if (EAT('^'))
-		invert++;	/* make note to invert set at end */
-	if (EAT(']'))
-		CHadd(cs, ']');
-	else if (EAT('-'))
-		CHadd(cs, '-');
-	while (MORE() && PEEK() != ']' && !SEETWO('-', ']'))
-		p_b_term(p, cs);
-	if (EAT('-'))
-		CHadd(cs, '-');
-	(void)MUSTEAT(']', REG_EBRACK);
-
-	if (p->error != 0)	/* don't mess things up further */
-		return;
-
-	if (p->g->cflags&REG_ICASE) {
-		int i;
-		int ci;
-
-		for (i = p->g->csetsize - 1; i >= 0; i--)
-			if (CHIN(cs, i) && isalpha(i)) {
-				ci = othercase(i);
-				if (ci != i)
-					CHadd(cs, ci);
-			}
-		if (cs->multis != NULL)
-			mccase(p, cs);
-	}
-	if (invert) {
-		int i;
-
-		for (i = p->g->csetsize - 1; i >= 0; i--)
-			if (CHIN(cs, i))
-				CHsub(cs, i);
-			else
-				CHadd(cs, i);
-		if (p->g->cflags&REG_NEWLINE)
-			CHsub(cs, '\n');
-		if (cs->multis != NULL)
-			mcinvert(p, cs);
-	}
-
-	assert(cs->multis == NULL);		/* xxx */
-
-	if (nch(p, cs) == 1) {		/* optimize singleton sets */
-		ordinary(p, firstch(p, cs));
-		freeset(p, cs);
-	} else
-		EMIT(OANYOF, freezeset(p, cs));
-}
-
-/*
- - p_b_term - parse one term of a bracketed character list
- == static void p_b_term(struct parse *p, cset *cs);
- */
-static void
-p_b_term(p, cs)
-struct parse *p;
-cset *cs;
-{
-	char c;
-	char start, finish;
-	int i;
-
-	/* classify what we've got */
-	switch ((MORE()) ? PEEK() : '\0') {
-	case '[':
-		c = (MORE2()) ? PEEK2() : '\0';
-		break;
-	case '-':
-		SETERROR(REG_ERANGE);
-		return;			/* NOTE RETURN */
-		break;
-	default:
-		c = '\0';
-		break;
-	}
-
-	switch (c) {
-	case ':':		/* character class */
-		NEXT2();
-		(void)REQUIRE(MORE(), REG_EBRACK);
-		c = PEEK();
-		(void)REQUIRE(c != '-' && c != ']', REG_ECTYPE);
-		p_b_cclass(p, cs);
-		(void)REQUIRE(MORE(), REG_EBRACK);
-		(void)REQUIRE(EATTWO(':', ']'), REG_ECTYPE);
-		break;
-	case '=':		/* equivalence class */
-		NEXT2();
-		(void)REQUIRE(MORE(), REG_EBRACK);
-		c = PEEK();
-		(void)REQUIRE(c != '-' && c != ']', REG_ECOLLATE);
-		p_b_eclass(p, cs);
-		(void)REQUIRE(MORE(), REG_EBRACK);
-		(void)REQUIRE(EATTWO('=', ']'), REG_ECOLLATE);
-		break;
-	default:		/* symbol, ordinary character, or range */
-/* xxx revision needed for multichar stuff */
-		start = p_b_symbol(p);
-		if (SEE('-') && MORE2() && PEEK2() != ']') {
-			/* range */
-			NEXT();
-			if (EAT('-'))
-				finish = '-';
-			else
-				finish = p_b_symbol(p);
-		} else
-			finish = start;
-		if (start == finish)
-			CHadd(cs, start);
-		else {
-			if (__collate_load_error) {
-				(void)REQUIRE((uch)start <= (uch)finish, REG_ERANGE);
-				for (i = (uch)start; i <= (uch)finish; i++)
-					CHadd(cs, i);
-			} else {
-				(void)REQUIRE(__collate_range_cmp(start, finish) <= 0, REG_ERANGE);
-				for (i = CHAR_MIN; i <= CHAR_MAX; i++) {
-					if (   __collate_range_cmp(start, i) <= 0
-					    && __collate_range_cmp(i, finish) <= 0
-					   )
-						CHadd(cs, i);
-				}
-			}
-		}
-		break;
-	}
-}
-
-/*
- - p_b_cclass - parse a character-class name and deal with it
- == static void p_b_cclass(struct parse *p, cset *cs);
- */
-static void
-p_b_cclass(p, cs)
-struct parse *p;
-cset *cs;
-{
-	int c;
-	char *sp = p->next;
-	struct cclass *cp;
-	size_t len;
-
-	while (MORE() && isalpha((uch)PEEK()))
-		NEXT();
-	len = p->next - sp;
-	for (cp = cclasses; cp->name != NULL; cp++)
-		if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
-			break;
-	if (cp->name == NULL) {
-		/* oops, didn't find it */
-		SETERROR(REG_ECTYPE);
-		return;
-	}
-
-	switch (cp->fidx) {
-	case CALNUM:
-		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-			if (isalnum((uch)c))
-				CHadd(cs, c);
-		break;
-	case CALPHA:
-		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-			if (isalpha((uch)c))
-				CHadd(cs, c);
-		break;
-	case CBLANK:
-		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-			if (isblank((uch)c))
-				CHadd(cs, c);
-		break;
-	case CCNTRL:
-		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-			if (iscntrl((uch)c))
-				CHadd(cs, c);
-		break;
-	case CDIGIT:
-		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-			if (isdigit((uch)c))
-				CHadd(cs, c);
-		break;
-	case CGRAPH:
-		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-			if (isgraph((uch)c))
-				CHadd(cs, c);
-		break;
-	case CLOWER:
-		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-			if (islower((uch)c))
-				CHadd(cs, c);
-		break;
-	case CPRINT:
-		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-			if (isprint((uch)c))
-				CHadd(cs, c);
-		break;
-	case CPUNCT:
-		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-			if (ispunct((uch)c))
-				CHadd(cs, c);
-		break;
-	case CSPACE:
-		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-			if (isspace((uch)c))
-				CHadd(cs, c);
-		break;
-	case CUPPER:
-		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-			if (isupper((uch)c))
-				CHadd(cs, c);
-		break;
-	case CXDIGIT:
-		for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-			if (isxdigit((uch)c))
-				CHadd(cs, c);
-		break;
-	}
-#if 0
-	for (u = cp->multis; *u != '\0'; u += strlen(u) + 1)
-		MCadd(p, cs, u);
-#endif
-}
-
-/*
- - p_b_eclass - parse an equivalence-class name and deal with it
- == static void p_b_eclass(struct parse *p, cset *cs);
- *
- * This implementation is incomplete. xxx
- */
-static void
-p_b_eclass(p, cs)
-struct parse *p;
-cset *cs;
-{
-	char c;
-
-	c = p_b_coll_elem(p, '=');
-	CHadd(cs, c);
-}
-
-/*
- - p_b_symbol - parse a character or [..]ed multicharacter collating symbol
- == static char p_b_symbol(struct parse *p);
- */
-static char			/* value of symbol */
-p_b_symbol(p)
-struct parse *p;
-{
-	char value;
-
-	(void)REQUIRE(MORE(), REG_EBRACK);
-	if (!EATTWO('[', '.'))
-		return(GETNEXT());
-
-	/* collating symbol */
-	value = p_b_coll_elem(p, '.');
-	(void)REQUIRE(EATTWO('.', ']'), REG_ECOLLATE);
-	return(value);
-}
-
-/*
- - p_b_coll_elem - parse a collating-element name and look it up
- == static char p_b_coll_elem(struct parse *p, int endc);
- */
-static char			/* value of collating element */
-p_b_coll_elem(p, endc)
-struct parse *p;
-int endc;			/* name ended by endc,']' */
-{
-	char *sp = p->next;
-	struct cname *cp;
-	int len;
-
-	while (MORE() && !SEETWO(endc, ']'))
-		NEXT();
-	if (!MORE()) {
-		SETERROR(REG_EBRACK);
-		return(0);
-	}
-	len = p->next - sp;
-	for (cp = cnames; cp->name != NULL; cp++)
-		if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
-			return(cp->code);	/* known name */
-	if (len == 1)
-		return(*sp);	/* single character */
-	SETERROR(REG_ECOLLATE);			/* neither */
-	return(0);
-}
-
-/*
- - othercase - return the case counterpart of an alphabetic
- == static char othercase(int ch);
- */
-static char			/* if no counterpart, return ch */
-othercase(ch)
-int ch;
-{
-	ch = (uch)ch;
-	assert(isalpha(ch));
-	if (isupper(ch))
-		return(tolower(ch));
-	else if (islower(ch))
-		return(toupper(ch));
-	else			/* peculiar, but could happen */
-		return(ch);
-}
-
-/*
- - bothcases - emit a dualcase version of a two-case character
- == static void bothcases(struct parse *p, int ch);
- *
- * Boy, is this implementation ever a kludge...
- */
-static void
-bothcases(p, ch)
-struct parse *p;
-int ch;
-{
-	char *oldnext = p->next;
-	char *oldend = p->end;
-	char bracket[3];
-
-	ch = (uch)ch;
-	assert(othercase(ch) != ch);	/* p_bracket() would recurse */
-	p->next = bracket;
-	p->end = bracket+2;
-	bracket[0] = ch;
-	bracket[1] = ']';
-	bracket[2] = '\0';
-	p_bracket(p);
-	assert(p->next == bracket+2);
-	p->next = oldnext;
-	p->end = oldend;
-}
-
-/*
- - ordinary - emit an ordinary character
- == static void ordinary(struct parse *p, int ch);
- */
-static void
-ordinary(p, ch)
-struct parse *p;
-int ch;
-{
-	cat_t *cap = p->g->categories;
-
-	if ((p->g->cflags&REG_ICASE) && isalpha((uch)ch) && othercase(ch) != ch)
-		bothcases(p, ch);
-	else {
-		EMIT(OCHAR, (uch)ch);
-		if (cap[ch] == 0)
-			cap[ch] = p->g->ncategories++;
-	}
-}
-
-/*
- - nonnewline - emit REG_NEWLINE version of OANY
- == static void nonnewline(struct parse *p);
- *
- * Boy, is this implementation ever a kludge...
- */
-static void
-nonnewline(p)
-struct parse *p;
-{
-	char *oldnext = p->next;
-	char *oldend = p->end;
-	char bracket[4];
-
-	p->next = bracket;
-	p->end = bracket+3;
-	bracket[0] = '^';
-	bracket[1] = '\n';
-	bracket[2] = ']';
-	bracket[3] = '\0';
-	p_bracket(p);
-	assert(p->next == bracket+3);
-	p->next = oldnext;
-	p->end = oldend;
-}
-
-/*
- - repeat - generate code for a bounded repetition, recursively if needed
- == static void repeat(struct parse *p, sopno start, int from, int to);
- */
-static void
-repeat(p, start, from, to)
-struct parse *p;
-sopno start;			/* operand from here to end of strip */
-int from;			/* repeated from this number */
-int to;				/* to this number of times (maybe INFINITY) */
-{
-	sopno finish = HERE();
-#	define	N	2
-#	define	INF	3
-#	define	REP(f, t)	((f)*8 + (t))
-#	define	MAP(n)	(((n) <= 1) ? (n) : ((n) == INFINITY) ? INF : N)
-	sopno copy;
-
-	if (p->error != 0)	/* head off possible runaway recursion */
-		return;
-
-	assert(from <= to);
-
-	switch (REP(MAP(from), MAP(to))) {
-	case REP(0, 0):			/* must be user doing this */
-		DROP(finish-start);	/* drop the operand */
-		break;
-	case REP(0, 1):			/* as x{1,1}? */
-	case REP(0, N):			/* as x{1,n}? */
-	case REP(0, INF):		/* as x{1,}? */
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, start);		/* offset is wrong... */
-		repeat(p, start+1, 1, to);
-		ASTERN(OOR1, start);
-		AHEAD(start);			/* ... fix it */
-		EMIT(OOR2, 0);
-		AHEAD(THERE());
-		ASTERN(O_CH, THERETHERE());
-		break;
-	case REP(1, 1):			/* trivial case */
-		/* done */
-		break;
-	case REP(1, N):			/* as x?x{1,n-1} */
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, start);
-		ASTERN(OOR1, start);
-		AHEAD(start);
-		EMIT(OOR2, 0);			/* offset very wrong... */
-		AHEAD(THERE());			/* ...so fix it */
-		ASTERN(O_CH, THERETHERE());
-		copy = dupl(p, start+1, finish+1);
-		assert(copy == finish+4);
-		repeat(p, copy, 1, to-1);
-		break;
-	case REP(1, INF):		/* as x+ */
-		INSERT(OPLUS_, start);
-		ASTERN(O_PLUS, start);
-		break;
-	case REP(N, N):			/* as xx{m-1,n-1} */
-		copy = dupl(p, start, finish);
-		repeat(p, copy, from-1, to-1);
-		break;
-	case REP(N, INF):		/* as xx{n-1,INF} */
-		copy = dupl(p, start, finish);
-		repeat(p, copy, from-1, to);
-		break;
-	default:			/* "can't happen" */
-		SETERROR(REG_ASSERT);	/* just in case */
-		break;
-	}
-}
-
-/*
- - seterr - set an error condition
- == static int seterr(struct parse *p, int e);
- */
-static int			/* useless but makes type checking happy */
-seterr(p, e)
-struct parse *p;
-int e;
-{
-	if (p->error == 0)	/* keep earliest error condition */
-		p->error = e;
-	p->next = nuls;		/* try to bring things to a halt */
-	p->end = nuls;
-	return(0);		/* make the return value well-defined */
-}
-
-/*
- - allocset - allocate a set of characters for []
- == static cset *allocset(struct parse *p);
- */
-static cset *
-allocset(p)
-struct parse *p;
-{
-	int no = p->g->ncsets++;
-	size_t nc;
-	size_t nbytes;
-	cset *cs;
-	size_t css = (size_t)p->g->csetsize;
-	int i;
-
-	if (no >= p->ncsalloc) {	/* need another column of space */
-		p->ncsalloc += CHAR_BIT;
-		nc = p->ncsalloc;
-		assert(nc % CHAR_BIT == 0);
-		nbytes = nc / CHAR_BIT * css;
-		if (p->g->sets == NULL)
-			p->g->sets = (cset *)malloc(nc * sizeof(cset));
-		else
-			p->g->sets = (cset *)reallocf((char *)p->g->sets,
-							nc * sizeof(cset));
-		if (p->g->setbits == NULL)
-			p->g->setbits = (uch *)malloc(nbytes);
-		else {
-			p->g->setbits = (uch *)reallocf((char *)p->g->setbits,
-								nbytes);
-			/* xxx this isn't right if setbits is now NULL */
-			for (i = 0; i < no; i++)
-				p->g->sets[i].ptr = p->g->setbits + css*(i/CHAR_BIT);
-		}
-		if (p->g->sets != NULL && p->g->setbits != NULL)
-			(void) memset((char *)p->g->setbits + (nbytes - css),
-								0, css);
-		else {
-			no = 0;
-			SETERROR(REG_ESPACE);
-			/* caller's responsibility not to do set ops */
-		}
-	}
-
-	assert(p->g->sets != NULL);	/* xxx */
-	cs = &p->g->sets[no];
-	cs->ptr = p->g->setbits + css*((no)/CHAR_BIT);
-	cs->mask = 1 << ((no) % CHAR_BIT);
-	cs->hash = 0;
-	cs->smultis = 0;
-	cs->multis = NULL;
-
-	return(cs);
-}
-
-/*
- - freeset - free a now-unused set
- == static void freeset(struct parse *p, cset *cs);
- */
-static void
-freeset(p, cs)
-struct parse *p;
-cset *cs;
-{
-	int i;
-	cset *top = &p->g->sets[p->g->ncsets];
-	size_t css = (size_t)p->g->csetsize;
-
-	for (i = 0; i < css; i++)
-		CHsub(cs, i);
-	if (cs == top-1)	/* recover only the easy case */
-		p->g->ncsets--;
-}
-
-/*
- - freezeset - final processing on a set of characters
- == static int freezeset(struct parse *p, cset *cs);
- *
- * The main task here is merging identical sets.  This is usually a waste
- * of time (although the hash code minimizes the overhead), but can win
- * big if REG_ICASE is being used.  REG_ICASE, by the way, is why the hash
- * is done using addition rather than xor -- all ASCII [aA] sets xor to
- * the same value!
- */
-static int			/* set number */
-freezeset(p, cs)
-struct parse *p;
-cset *cs;
-{
-	short h = cs->hash;
-	int i;
-	cset *top = &p->g->sets[p->g->ncsets];
-	cset *cs2;
-	size_t css = (size_t)p->g->csetsize;
-
-	/* look for an earlier one which is the same */
-	for (cs2 = &p->g->sets[0]; cs2 < top; cs2++)
-		if (cs2->hash == h && cs2 != cs) {
-			/* maybe */
-			for (i = 0; i < css; i++)
-				if (!!CHIN(cs2, i) != !!CHIN(cs, i))
-					break;		/* no */
-			if (i == css)
-				break;			/* yes */
-		}
-
-	if (cs2 < top) {	/* found one */
-		freeset(p, cs);
-		cs = cs2;
-	}
-
-	return((int)(cs - p->g->sets));
-}
-
-/*
- - firstch - return first character in a set (which must have at least one)
- == static int firstch(struct parse *p, cset *cs);
- */
-static int			/* character; there is no "none" value */
-firstch(p, cs)
-struct parse *p;
-cset *cs;
-{
-	int i;
-	size_t css = (size_t)p->g->csetsize;
-
-	for (i = 0; i < css; i++)
-		if (CHIN(cs, i))
-			return((char)i);
-	assert(never);
-	return(0);		/* arbitrary */
-}
-
-/*
- - nch - number of characters in a set
- == static int nch(struct parse *p, cset *cs);
- */
-static int
-nch(p, cs)
-struct parse *p;
-cset *cs;
-{
-	int i;
-	size_t css = (size_t)p->g->csetsize;
-	int n = 0;
-
-	for (i = 0; i < css; i++)
-		if (CHIN(cs, i))
-			n++;
-	return(n);
-}
-
-/*
- - mcadd - add a collating element to a cset
- == static void mcadd(struct parse *p, cset *cs, \
- ==	char *cp);
- */
-static void
-mcadd(p, cs, cp)
-struct parse *p;
-cset *cs;
-char *cp;
-{
-	size_t oldend = cs->smultis;
-
-	cs->smultis += strlen(cp) + 1;
-	if (cs->multis == NULL)
-		cs->multis = malloc(cs->smultis);
-	else
-		cs->multis = reallocf(cs->multis, cs->smultis);
-	if (cs->multis == NULL) {
-		SETERROR(REG_ESPACE);
-		return;
-	}
-
-	(void) strcpy(cs->multis + oldend - 1, cp);
-	cs->multis[cs->smultis - 1] = '\0';
-}
-
-#if used
-/*
- - mcsub - subtract a collating element from a cset
- == static void mcsub(cset *cs, char *cp);
- */
-static void
-mcsub(cs, cp)
-cset *cs;
-char *cp;
-{
-	char *fp = mcfind(cs, cp);
-	size_t len = strlen(fp);
-
-	assert(fp != NULL);
-	(void) memmove(fp, fp + len + 1,
-				cs->smultis - (fp + len + 1 - cs->multis));
-	cs->smultis -= len;
-
-	if (cs->smultis == 0) {
-		free(cs->multis);
-		cs->multis = NULL;
-		return;
-	}
-
-	cs->multis = reallocf(cs->multis, cs->smultis);
-	assert(cs->multis != NULL);
-}
-
-/*
- - mcin - is a collating element in a cset?
- == static int mcin(cset *cs, char *cp);
- */
-static int
-mcin(cs, cp)
-cset *cs;
-char *cp;
-{
-	return(mcfind(cs, cp) != NULL);
-}
-
-/*
- - mcfind - find a collating element in a cset
- == static char *mcfind(cset *cs, char *cp);
- */
-static char *
-mcfind(cs, cp)
-cset *cs;
-char *cp;
-{
-	char *p;
-
-	if (cs->multis == NULL)
-		return(NULL);
-	for (p = cs->multis; *p != '\0'; p += strlen(p) + 1)
-		if (strcmp(cp, p) == 0)
-			return(p);
-	return(NULL);
-}
-#endif
-
-/*
- - mcinvert - invert the list of collating elements in a cset
- == static void mcinvert(struct parse *p, cset *cs);
- *
- * This would have to know the set of possibilities.  Implementation
- * is deferred.
- */
-static void
-mcinvert(p, cs)
-struct parse *p;
-cset *cs;
-{
-	assert(cs->multis == NULL);	/* xxx */
-}
-
-/*
- - mccase - add case counterparts of the list of collating elements in a cset
- == static void mccase(struct parse *p, cset *cs);
- *
- * This would have to know the set of possibilities.  Implementation
- * is deferred.
- */
-static void
-mccase(p, cs)
-struct parse *p;
-cset *cs;
-{
-	assert(cs->multis == NULL);	/* xxx */
-}
-
-/*
- - isinsets - is this character in any sets?
- == static int isinsets(struct re_guts *g, int c);
- */
-static int			/* predicate */
-isinsets(g, c)
-struct re_guts *g;
-int c;
-{
-	uch *col;
-	int i;
-	int ncols = (g->ncsets+(CHAR_BIT-1)) / CHAR_BIT;
-	unsigned uc = (uch)c;
-
-	for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize)
-		if (col[uc] != 0)
-			return(1);
-	return(0);
-}
-
-/*
- - samesets - are these two characters in exactly the same sets?
- == static int samesets(struct re_guts *g, int c1, int c2);
- */
-static int			/* predicate */
-samesets(g, c1, c2)
-struct re_guts *g;
-int c1;
-int c2;
-{
-	uch *col;
-	int i;
-	int ncols = (g->ncsets+(CHAR_BIT-1)) / CHAR_BIT;
-	unsigned uc1 = (uch)c1;
-	unsigned uc2 = (uch)c2;
-
-	for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize)
-		if (col[uc1] != col[uc2])
-			return(0);
-	return(1);
-}
-
-/*
- - categorize - sort out character categories
- == static void categorize(struct parse *p, struct re_guts *g);
- */
-static void
-categorize(p, g)
-struct parse *p;
-struct re_guts *g;
-{
-	cat_t *cats = g->categories;
-	int c;
-	int c2;
-	cat_t cat;
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-		if (cats[c] == 0 && isinsets(g, c)) {
-			cat = g->ncategories++;
-			cats[c] = cat;
-			for (c2 = c+1; c2 <= CHAR_MAX; c2++)
-				if (cats[c2] == 0 && samesets(g, c, c2))
-					cats[c2] = cat;
-		}
-}
-
-/*
- - dupl - emit a duplicate of a bunch of sops
- == static sopno dupl(struct parse *p, sopno start, sopno finish);
- */
-static sopno			/* start of duplicate */
-dupl(p, start, finish)
-struct parse *p;
-sopno start;			/* from here */
-sopno finish;			/* to this less one */
-{
-	sopno ret = HERE();
-	sopno len = finish - start;
-
-	assert(finish >= start);
-	if (len == 0)
-		return(ret);
-	enlarge(p, p->ssize + len);	/* this many unexpected additions */
-	assert(p->ssize >= p->slen + len);
-	(void) memcpy((char *)(p->strip + p->slen),
-		(char *)(p->strip + start), (size_t)len*sizeof(sop));
-	p->slen += len;
-	return(ret);
-}
-
-/*
- - doemit - emit a strip operator
- == static void doemit(struct parse *p, sop op, size_t opnd);
- *
- * It might seem better to implement this as a macro with a function as
- * hard-case backup, but it's just too big and messy unless there are
- * some changes to the data structures.  Maybe later.
- */
-static void
-doemit(p, op, opnd)
-struct parse *p;
-sop op;
-size_t opnd;
-{
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	/* deal with oversize operands ("can't happen", more or less) */
-	assert(opnd < 1<<OPSHIFT);
-
-	/* deal with undersized strip */
-	if (p->slen >= p->ssize)
-		enlarge(p, (p->ssize+1) / 2 * 3);	/* +50% */
-	assert(p->slen < p->ssize);
-
-	/* finally, it's all reduced to the easy case */
-	p->strip[p->slen++] = SOP(op, opnd);
-}
-
-/*
- - doinsert - insert a sop into the strip
- == static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
- */
-static void
-doinsert(p, op, opnd, pos)
-struct parse *p;
-sop op;
-size_t opnd;
-sopno pos;
-{
-	sopno sn;
-	sop s;
-	int i;
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	sn = HERE();
-	EMIT(op, opnd);		/* do checks, ensure space */
-	assert(HERE() == sn+1);
-	s = p->strip[sn];
-
-	/* adjust paren pointers */
-	assert(pos > 0);
-	for (i = 1; i < NPAREN; i++) {
-		if (p->pbegin[i] >= pos) {
-			p->pbegin[i]++;
-		}
-		if (p->pend[i] >= pos) {
-			p->pend[i]++;
-		}
-	}
-
-	memmove((char *)&p->strip[pos+1], (char *)&p->strip[pos],
-						(HERE()-pos-1)*sizeof(sop));
-	p->strip[pos] = s;
-}
-
-/*
- - dofwd - complete a forward reference
- == static void dofwd(struct parse *p, sopno pos, sop value);
- */
-static void
-dofwd(p, pos, value)
-struct parse *p;
-sopno pos;
-sop value;
-{
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	assert(value < 1<<OPSHIFT);
-	p->strip[pos] = OP(p->strip[pos]) | value;
-}
-
-/*
- - enlarge - enlarge the strip
- == static void enlarge(struct parse *p, sopno size);
- */
-static void
-enlarge(p, size)
-struct parse *p;
-sopno size;
-{
-	sop *sp;
-
-	if (p->ssize >= size)
-		return;
-
-	sp = (sop *)realloc(p->strip, size*sizeof(sop));
-	if (sp == NULL) {
-		SETERROR(REG_ESPACE);
-		return;
-	}
-	p->strip = sp;
-	p->ssize = size;
-}
-
-/*
- - stripsnug - compact the strip
- == static void stripsnug(struct parse *p, struct re_guts *g);
- */
-static void
-stripsnug(p, g)
-struct parse *p;
-struct re_guts *g;
-{
-	g->nstates = p->slen;
-	g->strip = (sop *)realloc((char *)p->strip, p->slen * sizeof(sop));
-	if (g->strip == NULL) {
-		SETERROR(REG_ESPACE);
-		g->strip = p->strip;
-	}
-}
-
-/*
- - findmust - fill in must and mlen with longest mandatory literal string
- == static void findmust(struct parse *p, struct re_guts *g);
- *
- * This algorithm could do fancy things like analyzing the operands of |
- * for common subsequences.  Someday.  This code is simple and finds most
- * of the interesting cases.
- *
- * Note that must and mlen got initialized during setup.
- */
-static void
-findmust(p, g)
-struct parse *p;
-struct re_guts *g;
-{
-	sop *scan;
-	sop *start;
-	sop *newstart;
-	sopno newlen;
-	sop s;
-	char *cp;
-	sopno i;
-	int offset;
-	int cs, mccs;
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	/* Find out if we can handle OANYOF or not */
-	mccs = 0;
-	for (cs = 0; cs < g->ncsets; cs++)
-		if (g->sets[cs].multis != NULL)
-			mccs = 1;
-
-	/* find the longest OCHAR sequence in strip */
-	newlen = 0;
-	offset = 0;
-	g->moffset = 0;
-	scan = g->strip + 1;
-	do {
-		s = *scan++;
-		switch (OP(s)) {
-		case OCHAR:		/* sequence member */
-			if (newlen == 0)		/* new sequence */
-				newstart = scan - 1;
-			newlen++;
-			break;
-		case OPLUS_:		/* things that don't break one */
-		case OLPAREN:
-		case ORPAREN:
-			break;
-		case OQUEST_:		/* things that must be skipped */
-		case OCH_:
-			offset = altoffset(scan, offset, mccs);
-			scan--;
-			do {
-				scan += OPND(s);
-				s = *scan;
-				/* assert() interferes w debug printouts */
-				if (OP(s) != O_QUEST && OP(s) != O_CH &&
-							OP(s) != OOR2) {
-					g->iflags |= BAD;
-					return;
-				}
-			} while (OP(s) != O_QUEST && OP(s) != O_CH);
-			/* fallthrough */
-		case OBOW:		/* things that break a sequence */
-		case OEOW:
-		case OBOL:
-		case OEOL:
-		case O_QUEST:
-		case O_CH:
-		case OEND:
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-				if (offset > -1) {
-					g->moffset += offset;
-					offset = newlen;
-				} else
-					g->moffset = offset;
-			} else {
-				if (offset > -1)
-					offset += newlen;
-			}
-			newlen = 0;
-			break;
-		case OANY:
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-				if (offset > -1) {
-					g->moffset += offset;
-					offset = newlen;
-				} else
-					g->moffset = offset;
-			} else {
-				if (offset > -1)
-					offset += newlen;
-			}
-			if (offset > -1)
-				offset++;
-			newlen = 0;
-			break;
-		case OANYOF:		/* may or may not invalidate offset */
-			/* First, everything as OANY */
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-				if (offset > -1) {
-					g->moffset += offset;
-					offset = newlen;
-				} else
-					g->moffset = offset;
-			} else {
-				if (offset > -1)
-					offset += newlen;
-			}
-			if (offset > -1)
-				offset++;
-			newlen = 0;
-			/* And, now, if we found out we can't deal with
-			 * it, make offset = -1.
-			 */
-			if (mccs)
-				offset = -1;
-			break;
-		default:
-			/* Anything here makes it impossible or too hard
-			 * to calculate the offset -- so we give up;
-			 * save the last known good offset, in case the
-			 * must sequence doesn't occur later.
-			 */
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-				if (offset > -1)
-					g->moffset += offset;
-				else
-					g->moffset = offset;
-			}
-			offset = -1;
-			newlen = 0;
-			break;
-		}
-	} while (OP(s) != OEND);
-
-	if (g->mlen == 0) {		/* there isn't one */
-		g->moffset = -1;
-		return;
-	}
-
-	/* turn it into a character string */
-	g->must = malloc((size_t)g->mlen + 1);
-	if (g->must == NULL) {		/* argh; just forget it */
-		g->mlen = 0;
-		g->moffset = -1;
-		return;
-	}
-	cp = g->must;
-	scan = start;
-	for (i = g->mlen; i > 0; i--) {
-		while (OP(s = *scan++) != OCHAR)
-			continue;
-		assert(cp < g->must + g->mlen);
-		*cp++ = (char)OPND(s);
-	}
-	assert(cp == g->must + g->mlen);
-	*cp++ = '\0';		/* just on general principles */
-}
-
-/*
- - altoffset - choose biggest offset among multiple choices
- == static int altoffset(sop *scan, int offset, int mccs);
- *
- * Compute, recursively if necessary, the largest offset among multiple
- * re paths.
- */
-static int
-altoffset(scan, offset, mccs)
-sop *scan;
-int offset;
-int mccs;
-{
-	int largest;
-	int try;
-	sop s;
-
-	/* If we gave up already on offsets, return */
-	if (offset == -1)
-		return -1;
-
-	largest = 0;
-	try = 0;
-	s = *scan++;
-	while (OP(s) != O_QUEST && OP(s) != O_CH) {
-		switch (OP(s)) {
-		case OOR1:
-			if (try > largest)
-				largest = try;
-			try = 0;
-			break;
-		case OQUEST_:
-		case OCH_:
-			try = altoffset(scan, try, mccs);
-			if (try == -1)
-				return -1;
-			scan--;
-			do {
-				scan += OPND(s);
-				s = *scan;
-				if (OP(s) != O_QUEST && OP(s) != O_CH &&
-							OP(s) != OOR2)
-					return -1;
-			} while (OP(s) != O_QUEST && OP(s) != O_CH);
-			/* We must skip to the next position, or we'll
-			 * leave altoffset() too early.
-			 */
-			scan++;
-			break;
-		case OANYOF:
-			if (mccs)
-				return -1;
-		case OCHAR:
-		case OANY:
-			try++;
-		case OBOW:
-		case OEOW:
-		case OLPAREN:
-		case ORPAREN:
-		case OOR2:
-			break;
-		default:
-			try = -1;
-			break;
-		}
-		if (try == -1)
-			return -1;
-		s = *scan++;
-	}
-
-	if (try > largest)
-		largest = try;
-
-	return largest+offset;
-}
-
-/*
- - computejumps - compute char jumps for BM scan
- == static void computejumps(struct parse *p, struct re_guts *g);
- *
- * This algorithm assumes g->must exists and is has size greater than
- * zero. It's based on the algorithm found on Computer Algorithms by
- * Sara Baase.
- *
- * A char jump is the number of characters one needs to jump based on
- * the value of the character from the text that was mismatched.
- */
-static void
-computejumps(p, g)
-struct parse *p;
-struct re_guts *g;
-{
-	int ch;
-	int mindex;
-
-	/* Avoid making errors worse */
-	if (p->error != 0)
-		return;
-
-	g->charjump = (int*) malloc((NC + 1) * sizeof(int));
-	if (g->charjump == NULL)	/* Not a fatal error */
-		return;
-	/* Adjust for signed chars, if necessary */
-	g->charjump = &g->charjump[-(CHAR_MIN)];
-
-	/* If the character does not exist in the pattern, the jump
-	 * is equal to the number of characters in the pattern.
-	 */
-	for (ch = CHAR_MIN; ch < (CHAR_MAX + 1); ch++)
-		g->charjump[ch] = g->mlen;
-
-	/* If the character does exist, compute the jump that would
-	 * take us to the last character in the pattern equal to it
-	 * (notice that we match right to left, so that last character
-	 * is the first one that would be matched).
-	 */
-	for (mindex = 0; mindex < g->mlen; mindex++)
-		g->charjump[g->must[mindex]] = g->mlen - mindex - 1;
-}
-
-/*
- - computematchjumps - compute match jumps for BM scan
- == static void computematchjumps(struct parse *p, struct re_guts *g);
- *
- * This algorithm assumes g->must exists and is has size greater than
- * zero. It's based on the algorithm found on Computer Algorithms by
- * Sara Baase.
- *
- * A match jump is the number of characters one needs to advance based
- * on the already-matched suffix.
- * Notice that all values here are minus (g->mlen-1), because of the way
- * the search algorithm works.
- */
-static void
-computematchjumps(p, g)
-struct parse *p;
-struct re_guts *g;
-{
-	int mindex;		/* General "must" iterator */
-	int suffix;		/* Keeps track of matching suffix */
-	int ssuffix;		/* Keeps track of suffixes' suffix */
-	int* pmatches;		/* pmatches[k] points to the next i
-				 * such that i+1...mlen is a substring
-				 * of k+1...k+mlen-i-1
-				 */
-
-	/* Avoid making errors worse */
-	if (p->error != 0)
-		return;
-
-	pmatches = (int*) malloc(g->mlen * sizeof(unsigned int));
-	if (pmatches == NULL) {
-		g->matchjump = NULL;
-		return;
-	}
-
-	g->matchjump = (int*) malloc(g->mlen * sizeof(unsigned int));
-	if (g->matchjump == NULL)	/* Not a fatal error */
-		return;
-
-	/* Set maximum possible jump for each character in the pattern */
-	for (mindex = 0; mindex < g->mlen; mindex++)
-		g->matchjump[mindex] = 2*g->mlen - mindex - 1;
-
-	/* Compute pmatches[] */
-	for (mindex = g->mlen - 1, suffix = g->mlen; mindex >= 0;
-	    mindex--, suffix--) {
-		pmatches[mindex] = suffix;
-
-		/* If a mismatch is found, interrupting the substring,
-		 * compute the matchjump for that position. If no
-		 * mismatch is found, then a text substring mismatched
-		 * against the suffix will also mismatch against the
-		 * substring.
-		 */
-		while (suffix < g->mlen
-		    && g->must[mindex] != g->must[suffix]) {
-			g->matchjump[suffix] = MIN(g->matchjump[suffix],
-			    g->mlen - mindex - 1);
-			suffix = pmatches[suffix];
-		}
-	}
-
-	/* Compute the matchjump up to the last substring found to jump
-	 * to the beginning of the largest must pattern prefix matching
-	 * it's own suffix.
-	 */
-	for (mindex = 0; mindex <= suffix; mindex++)
-		g->matchjump[mindex] = MIN(g->matchjump[mindex],
-		    g->mlen + suffix - mindex);
-
-        ssuffix = pmatches[suffix];
-        while (suffix < g->mlen) {
-                while (suffix <= ssuffix && suffix < g->mlen) {
-                        g->matchjump[suffix] = MIN(g->matchjump[suffix],
-			    g->mlen + ssuffix - suffix);
-                        suffix++;
-                }
-		if (suffix < g->mlen)
-                	ssuffix = pmatches[ssuffix];
-        }
-
-	free(pmatches);
-}
-
-/*
- - pluscount - count + nesting
- == static sopno pluscount(struct parse *p, struct re_guts *g);
- */
-static sopno			/* nesting depth */
-pluscount(p, g)
-struct parse *p;
-struct re_guts *g;
-{
-	sop *scan;
-	sop s;
-	sopno plusnest = 0;
-	sopno maxnest = 0;
-
-	if (p->error != 0)
-		return(0);	/* there may not be an OEND */
-
-	scan = g->strip + 1;
-	do {
-		s = *scan++;
-		switch (OP(s)) {
-		case OPLUS_:
-			plusnest++;
-			break;
-		case O_PLUS:
-			if (plusnest > maxnest)
-				maxnest = plusnest;
-			plusnest--;
-			break;
-		}
-	} while (OP(s) != OEND);
-	if (plusnest != 0)
-		g->iflags |= BAD;
-	return(maxnest);
-}
diff --git a/newlib/libc/sys/linux/stdlib/regerror.c b/newlib/libc/sys/linux/stdlib/regerror.c
deleted file mode 100644
index 66b1e52..0000000
--- a/newlib/libc/sys/linux/stdlib/regerror.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)regerror.c	8.4 (Berkeley) 3/20/94
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/regex/regerror.c,v 1.7 2002/03/21 22:48:00 obrien Exp $");
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <regex.h>
-
-#include "utils.h"
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === regerror.c === */
-static char *regatoi(const regex_t *preg, char *localbuf);
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-/*
- = #define	REG_NOMATCH	 1
- = #define	REG_BADPAT	 2
- = #define	REG_ECOLLATE	 3
- = #define	REG_ECTYPE	 4
- = #define	REG_EESCAPE	 5
- = #define	REG_ESUBREG	 6
- = #define	REG_EBRACK	 7
- = #define	REG_EPAREN	 8
- = #define	REG_EBRACE	 9
- = #define	REG_BADBR	10
- = #define	REG_ERANGE	11
- = #define	REG_ESPACE	12
- = #define	REG_BADRPT	13
- = #define	REG_EMPTY	14
- = #define	REG_ASSERT	15
- = #define	REG_INVARG	16
- = #define	REG_ATOI	255	// convert name to number (!)
- = #define	REG_ITOA	0400	// convert number to name (!)
- */
-static struct rerr {
-	int code;
-	char *name;
-	char *explain;
-} rerrs[] = {
-	{REG_NOMATCH,	"REG_NOMATCH",	"regexec() failed to match"},
-	{REG_BADPAT,	"REG_BADPAT",	"invalid regular expression"},
-	{REG_ECOLLATE,	"REG_ECOLLATE",	"invalid collating element"},
-	{REG_ECTYPE,	"REG_ECTYPE",	"invalid character class"},
-	{REG_EESCAPE,	"REG_EESCAPE",	"trailing backslash (\\)"},
-	{REG_ESUBREG,	"REG_ESUBREG",	"invalid backreference number"},
-	{REG_EBRACK,	"REG_EBRACK",	"brackets ([ ]) not balanced"},
-	{REG_EPAREN,	"REG_EPAREN",	"parentheses not balanced"},
-	{REG_EBRACE,	"REG_EBRACE",	"braces not balanced"},
-	{REG_BADBR,	"REG_BADBR",	"invalid repetition count(s)"},
-	{REG_ERANGE,	"REG_ERANGE",	"invalid character range"},
-	{REG_ESPACE,	"REG_ESPACE",	"out of memory"},
-	{REG_BADRPT,	"REG_BADRPT",	"repetition-operator operand invalid"},
-	{REG_EMPTY,	"REG_EMPTY",	"empty (sub)expression"},
-	{REG_ASSERT,	"REG_ASSERT",	"\"can't happen\" -- you found a bug"},
-	{REG_INVARG,	"REG_INVARG",	"invalid argument to regex routine"},
-	{0,		"",		"*** unknown regexp error code ***"}
-};
-
-/*
- - regerror - the interface to error numbers
- = extern size_t regerror(int, const regex_t *, char *, size_t);
- */
-/* ARGSUSED */
-size_t
-regerror(errcode, preg, errbuf, errbuf_size)
-int errcode;
-const regex_t *preg;
-char *errbuf;
-size_t errbuf_size;
-{
-	struct rerr *r;
-	size_t len;
-	int target = errcode &~ REG_ITOA;
-	char *s;
-	char convbuf[50];
-
-	if (errcode == REG_ATOI)
-		s = regatoi(preg, convbuf);
-	else {
-		for (r = rerrs; r->code != 0; r++)
-			if (r->code == target)
-				break;
-
-		if (errcode&REG_ITOA) {
-			if (r->code != 0)
-				(void) strcpy(convbuf, r->name);
-			else
-				sprintf(convbuf, "REG_0x%x", target);
-			assert(strlen(convbuf) < sizeof(convbuf));
-			s = convbuf;
-		} else
-			s = r->explain;
-	}
-
-	len = strlen(s) + 1;
-	if (errbuf_size > 0) {
-		if (errbuf_size > len)
-			(void) strcpy(errbuf, s);
-		else {
-			(void) strncpy(errbuf, s, errbuf_size-1);
-			errbuf[errbuf_size-1] = '\0';
-		}
-	}
-
-	return(len);
-}
-
-/*
- - regatoi - internal routine to implement REG_ATOI
- == static char *regatoi(const regex_t *preg, char *localbuf);
- */
-static char *
-regatoi(preg, localbuf)
-const regex_t *preg;
-char *localbuf;
-{
-	struct rerr *r;
-
-	for (r = rerrs; r->code != 0; r++)
-		if (strcmp(r->name, preg->re_endp) == 0)
-			break;
-	if (r->code == 0)
-		return("0");
-
-	sprintf(localbuf, "%d", r->code);
-	return(localbuf);
-}
diff --git a/newlib/libc/sys/linux/stdlib/regex.3 b/newlib/libc/sys/linux/stdlib/regex.3
deleted file mode 100644
index d871641..0000000
--- a/newlib/libc/sys/linux/stdlib/regex.3
+++ /dev/null
@@ -1,701 +0,0 @@
-.\" Copyright (c) 1992, 1993, 1994 Henry Spencer.
-.\" Copyright (c) 1992, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Henry Spencer.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)regex.3	8.4 (Berkeley) 3/20/94
-.\" $FreeBSD: src/lib/libc/regex/regex.3,v 1.9 2001/10/01 16:08:58 ru Exp $
-.\"
-.Dd March 20, 1994
-.Dt REGEX 3
-.Os
-.Sh NAME
-.Nm regcomp ,
-.Nm regexec ,
-.Nm regerror ,
-.Nm regfree
-.Nd regular-expression library
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In regex.h
-.Ft int
-.Fn regcomp "regex_t *preg" "const char *pattern" "int cflags"
-.Ft int
-.Fo regexec
-.Fa "const regex_t *preg" "const char *string"
-.Fa "size_t nmatch" "regmatch_t pmatch[]" "int eflags"
-.Fc
-.Ft size_t
-.Fo regerror
-.Fa "int errcode" "const regex_t *preg"
-.Fa "char *errbuf" "size_t errbuf_size"
-.Fc
-.Ft void
-.Fn regfree "regex_t *preg"
-.Sh DESCRIPTION
-These routines implement
-.St -p1003.2
-regular expressions
-.Pq Do RE Dc Ns s ;
-see
-.Xr re_format 7 .
-.Fn Regcomp
-compiles an RE written as a string into an internal form,
-.Fn regexec
-matches that internal form against a string and reports results,
-.Fn regerror
-transforms error codes from either into human-readable messages,
-and
-.Fn regfree
-frees any dynamically-allocated storage used by the internal form
-of an RE.
-.Pp
-The header
-.Aq Pa regex.h
-declares two structure types,
-.Ft regex_t
-and
-.Ft regmatch_t ,
-the former for compiled internal forms and the latter for match reporting.
-It also declares the four functions,
-a type
-.Ft regoff_t ,
-and a number of constants with names starting with
-.Dq Dv REG_ .
-.Pp
-.Fn Regcomp
-compiles the regular expression contained in the
-.Fa pattern
-string,
-subject to the flags in
-.Fa cflags ,
-and places the results in the
-.Ft regex_t
-structure pointed to by
-.Fa preg .
-.Fa Cflags
-is the bitwise OR of zero or more of the following flags:
-.Bl -tag -width REG_EXTENDED
-.It Dv REG_EXTENDED
-Compile modern
-.Pq Dq extended
-REs,
-rather than the obsolete
-.Pq Dq basic
-REs that
-are the default.
-.It Dv REG_BASIC
-This is a synonym for 0,
-provided as a counterpart to
-.Dv REG_EXTENDED
-to improve readability.
-.It Dv REG_NOSPEC
-Compile with recognition of all special characters turned off.
-All characters are thus considered ordinary,
-so the
-.Dq RE
-is a literal string.
-This is an extension,
-compatible with but not specified by
-.St -p1003.2 ,
-and should be used with
-caution in software intended to be portable to other systems.
-.Dv REG_EXTENDED
-and
-.Dv REG_NOSPEC
-may not be used
-in the same call to
-.Fn regcomp .
-.It Dv REG_ICASE
-Compile for matching that ignores upper/lower case distinctions.
-See
-.Xr re_format 7 .
-.It Dv REG_NOSUB
-Compile for matching that need only report success or failure,
-not what was matched.
-.It Dv REG_NEWLINE
-Compile for newline-sensitive matching.
-By default, newline is a completely ordinary character with no special
-meaning in either REs or strings.
-With this flag,
-.Ql [^
-bracket expressions and
-.Ql .\&
-never match newline,
-a
-.Ql ^\&
-anchor matches the null string after any newline in the string
-in addition to its normal function,
-and the
-.Ql $\&
-anchor matches the null string before any newline in the
-string in addition to its normal function.
-.It Dv REG_PEND
-The regular expression ends,
-not at the first NUL,
-but just before the character pointed to by the
-.Va re_endp
-member of the structure pointed to by
-.Fa preg .
-The
-.Va re_endp
-member is of type
-.Ft "const char *" .
-This flag permits inclusion of NULs in the RE;
-they are considered ordinary characters.
-This is an extension,
-compatible with but not specified by
-.St -p1003.2 ,
-and should be used with
-caution in software intended to be portable to other systems.
-.El
-.Pp
-When successful,
-.Fn regcomp
-returns 0 and fills in the structure pointed to by
-.Fa preg .
-One member of that structure
-(other than
-.Va re_endp )
-is publicized:
-.Va re_nsub ,
-of type
-.Ft size_t ,
-contains the number of parenthesized subexpressions within the RE
-(except that the value of this member is undefined if the
-.Dv REG_NOSUB
-flag was used).
-If
-.Fn regcomp
-fails, it returns a non-zero error code;
-see
-.Sx DIAGNOSTICS .
-.Pp
-.Fn Regexec
-matches the compiled RE pointed to by
-.Fa preg
-against the
-.Fa string ,
-subject to the flags in
-.Fa eflags ,
-and reports results using
-.Fa nmatch ,
-.Fa pmatch ,
-and the returned value.
-The RE must have been compiled by a previous invocation of
-.Fn regcomp .
-The compiled form is not altered during execution of
-.Fn regexec ,
-so a single compiled RE can be used simultaneously by multiple threads.
-.Pp
-By default,
-the NUL-terminated string pointed to by
-.Fa string
-is considered to be the text of an entire line, minus any terminating
-newline.
-The
-.Fa eflags
-argument is the bitwise OR of zero or more of the following flags:
-.Bl -tag -width REG_STARTEND
-.It Dv REG_NOTBOL
-The first character of
-the string
-is not the beginning of a line, so the
-.Ql ^\&
-anchor should not match before it.
-This does not affect the behavior of newlines under
-.Dv REG_NEWLINE .
-.It Dv REG_NOTEOL
-The NUL terminating
-the string
-does not end a line, so the
-.Ql $\&
-anchor should not match before it.
-This does not affect the behavior of newlines under
-.Dv REG_NEWLINE .
-.It Dv REG_STARTEND
-The string is considered to start at
-.Fa string
-+
-.Fa pmatch Ns [0]. Ns Va rm_so
-and to have a terminating NUL located at
-.Fa string
-+
-.Fa pmatch Ns [0]. Ns Va rm_eo
-(there need not actually be a NUL at that location),
-regardless of the value of
-.Fa nmatch .
-See below for the definition of
-.Fa pmatch
-and
-.Fa nmatch .
-This is an extension,
-compatible with but not specified by
-.St -p1003.2 ,
-and should be used with
-caution in software intended to be portable to other systems.
-Note that a non-zero
-.Va rm_so
-does not imply
-.Dv REG_NOTBOL ;
-.Dv REG_STARTEND
-affects only the location of the string,
-not how it is matched.
-.El
-.Pp
-See
-.Xr re_format 7
-for a discussion of what is matched in situations where an RE or a
-portion thereof could match any of several substrings of
-.Fa string .
-.Pp
-Normally,
-.Fn regexec
-returns 0 for success and the non-zero code
-.Dv REG_NOMATCH
-for failure.
-Other non-zero error codes may be returned in exceptional situations;
-see
-.Sx DIAGNOSTICS .
-.Pp
-If
-.Dv REG_NOSUB
-was specified in the compilation of the RE,
-or if
-.Fa nmatch
-is 0,
-.Fn regexec
-ignores the
-.Fa pmatch
-argument (but see below for the case where
-.Dv REG_STARTEND
-is specified).
-Otherwise,
-.Fa pmatch
-points to an array of
-.Fa nmatch
-structures of type
-.Ft regmatch_t .
-Such a structure has at least the members
-.Va rm_so
-and
-.Va rm_eo ,
-both of type
-.Ft regoff_t
-(a signed arithmetic type at least as large as an
-.Ft off_t
-and a
-.Ft ssize_t ) ,
-containing respectively the offset of the first character of a substring
-and the offset of the first character after the end of the substring.
-Offsets are measured from the beginning of the
-.Fa string
-argument given to
-.Fn regexec .
-An empty substring is denoted by equal offsets,
-both indicating the character following the empty substring.
-.Pp
-The 0th member of the
-.Fa pmatch
-array is filled in to indicate what substring of
-.Fa string
-was matched by the entire RE.
-Remaining members report what substring was matched by parenthesized
-subexpressions within the RE;
-member
-.Va i
-reports subexpression
-.Va i ,
-with subexpressions counted (starting at 1) by the order of their opening
-parentheses in the RE, left to right.
-Unused entries in the array (corresponding either to subexpressions that
-did not participate in the match at all, or to subexpressions that do not
-exist in the RE (that is,
-.Va i
->
-.Fa preg Ns -> Ns Va re_nsub ) )
-have both
-.Va rm_so
-and
-.Va rm_eo
-set to -1.
-If a subexpression participated in the match several times,
-the reported substring is the last one it matched.
-(Note, as an example in particular, that when the RE
-.Ql "(b*)+"
-matches
-.Ql bbb ,
-the parenthesized subexpression matches each of the three
-.So Li b Sc Ns s
-and then
-an infinite number of empty strings following the last
-.Ql b ,
-so the reported substring is one of the empties.)
-.Pp
-If
-.Dv REG_STARTEND
-is specified,
-.Fa pmatch
-must point to at least one
-.Ft regmatch_t
-(even if
-.Fa nmatch
-is 0 or
-.Dv REG_NOSUB
-was specified),
-to hold the input offsets for
-.Dv REG_STARTEND .
-Use for output is still entirely controlled by
-.Fa nmatch ;
-if
-.Fa nmatch
-is 0 or
-.Dv REG_NOSUB
-was specified,
-the value of
-.Fa pmatch Ns [0]
-will not be changed by a successful
-.Fn regexec .
-.Pp
-.Fn Regerror
-maps a non-zero
-.Fa errcode
-from either
-.Fn regcomp
-or
-.Fn regexec
-to a human-readable, printable message.
-If
-.Fa preg
-is
-.No non\- Ns Dv NULL ,
-the error code should have arisen from use of
-the
-.Ft regex_t
-pointed to by
-.Fa preg ,
-and if the error code came from
-.Fn regcomp ,
-it should have been the result from the most recent
-.Fn regcomp
-using that
-.Ft regex_t .
-.No ( Fn Regerror
-may be able to supply a more detailed message using information
-from the
-.Ft regex_t . )
-.Fn Regerror
-places the NUL-terminated message into the buffer pointed to by
-.Fa errbuf ,
-limiting the length (including the NUL) to at most
-.Fa errbuf_size
-bytes.
-If the whole message won't fit,
-as much of it as will fit before the terminating NUL is supplied.
-In any case,
-the returned value is the size of buffer needed to hold the whole
-message (including terminating NUL).
-If
-.Fa errbuf_size
-is 0,
-.Fa errbuf
-is ignored but the return value is still correct.
-.Pp
-If the
-.Fa errcode
-given to
-.Fn regerror
-is first ORed with
-.Dv REG_ITOA ,
-the
-.Dq message
-that results is the printable name of the error code,
-e.g.\&
-.Dq Dv REG_NOMATCH ,
-rather than an explanation thereof.
-If
-.Fa errcode
-is
-.Dv REG_ATOI ,
-then
-.Fa preg
-shall be
-.No non\- Ns Dv NULL
-and the
-.Va re_endp
-member of the structure it points to
-must point to the printable name of an error code;
-in this case, the result in
-.Fa errbuf
-is the decimal digits of
-the numeric value of the error code
-(0 if the name is not recognized).
-.Dv REG_ITOA
-and
-.Dv REG_ATOI
-are intended primarily as debugging facilities;
-they are extensions,
-compatible with but not specified by
-.St -p1003.2 ,
-and should be used with
-caution in software intended to be portable to other systems.
-Be warned also that they are considered experimental and changes are possible.
-.Pp
-.Fn Regfree
-frees any dynamically-allocated storage associated with the compiled RE
-pointed to by
-.Fa preg .
-The remaining
-.Ft regex_t
-is no longer a valid compiled RE
-and the effect of supplying it to
-.Fn regexec
-or
-.Fn regerror
-is undefined.
-.Pp
-None of these functions references global variables except for tables
-of constants;
-all are safe for use from multiple threads if the arguments are safe.
-.Sh IMPLEMENTATION CHOICES
-There are a number of decisions that
-.St -p1003.2
-leaves up to the implementor,
-either by explicitly saying
-.Dq undefined
-or by virtue of them being
-forbidden by the RE grammar.
-This implementation treats them as follows.
-.Pp
-See
-.Xr re_format 7
-for a discussion of the definition of case-independent matching.
-.Pp
-There is no particular limit on the length of REs,
-except insofar as memory is limited.
-Memory usage is approximately linear in RE size, and largely insensitive
-to RE complexity, except for bounded repetitions.
-See
-.Sx BUGS
-for one short RE using them
-that will run almost any system out of memory.
-.Pp
-A backslashed character other than one specifically given a magic meaning
-by
-.St -p1003.2
-(such magic meanings occur only in obsolete
-.Bq Dq basic
-REs)
-is taken as an ordinary character.
-.Pp
-Any unmatched
-.Ql [\&
-is a
-.Dv REG_EBRACK
-error.
-.Pp
-Equivalence classes cannot begin or end bracket-expression ranges.
-The endpoint of one range cannot begin another.
-.Pp
-.Dv RE_DUP_MAX ,
-the limit on repetition counts in bounded repetitions, is 255.
-.Pp
-A repetition operator
-.Ql ( ?\& ,
-.Ql *\& ,
-.Ql +\& ,
-or bounds)
-cannot follow another
-repetition operator.
-A repetition operator cannot begin an expression or subexpression
-or follow
-.Ql ^\&
-or
-.Ql |\& .
-.Pp
-.Ql |\&
-cannot appear first or last in a (sub)expression or after another
-.Ql |\& ,
-i.e. an operand of
-.Ql |\&
-cannot be an empty subexpression.
-An empty parenthesized subexpression,
-.Ql "()" ,
-is legal and matches an
-empty (sub)string.
-An empty string is not a legal RE.
-.Pp
-A
-.Ql {\&
-followed by a digit is considered the beginning of bounds for a
-bounded repetition, which must then follow the syntax for bounds.
-A
-.Ql {\&
-.Em not
-followed by a digit is considered an ordinary character.
-.Pp
-.Ql ^\&
-and
-.Ql $\&
-beginning and ending subexpressions in obsolete
-.Pq Dq basic
-REs are anchors, not ordinary characters.
-.Sh SEE ALSO
-.Xr grep 1 ,
-.Xr re_format 7
-.Pp
-.St -p1003.2 ,
-sections 2.8 (Regular Expression Notation)
-and
-B.5 (C Binding for Regular Expression Matching).
-.Sh DIAGNOSTICS
-Non-zero error codes from
-.Fn regcomp
-and
-.Fn regexec
-include the following:
-.Pp
-.Bl -tag -width REG_ECOLLATE -compact
-.It Dv REG_NOMATCH
-.Fn regexec
-failed to match
-.It Dv REG_BADPAT
-invalid regular expression
-.It Dv REG_ECOLLATE
-invalid collating element
-.It Dv REG_ECTYPE
-invalid character class
-.It Dv REG_EESCAPE
-.Ql \e
-applied to unescapable character
-.It Dv REG_ESUBREG
-invalid backreference number
-.It Dv REG_EBRACK
-brackets
-.Ql "[ ]"
-not balanced
-.It Dv REG_EPAREN
-parentheses
-.Ql "( )"
-not balanced
-.It Dv REG_EBRACE
-braces
-.Ql "{ }"
-not balanced
-.It Dv REG_BADBR
-invalid repetition count(s) in
-.Ql "{ }"
-.It Dv REG_ERANGE
-invalid character range in
-.Ql "[ ]"
-.It Dv REG_ESPACE
-ran out of memory
-.It Dv REG_BADRPT
-.Ql ?\& ,
-.Ql *\& ,
-or
-.Ql +\&
-operand invalid
-.It Dv REG_EMPTY
-empty (sub)expression
-.It Dv REG_ASSERT
-can't happen - you found a bug
-.It Dv REG_INVARG
-invalid argument, e.g. negative-length string
-.El
-.Sh HISTORY
-Originally written by
-.An Henry Spencer .
-Altered for inclusion in the
-.Bx 4.4
-distribution.
-.Sh BUGS
-This is an alpha release with known defects.
-Please report problems.
-.Pp
-The back-reference code is subtle and doubts linger about its correctness
-in complex cases.
-.Pp
-.Fn Regexec
-performance is poor.
-This will improve with later releases.
-.Fa Nmatch
-exceeding 0 is expensive;
-.Fa nmatch
-exceeding 1 is worse.
-.Fn Regexec
-is largely insensitive to RE complexity
-.Em except
-that back
-references are massively expensive.
-RE length does matter; in particular, there is a strong speed bonus
-for keeping RE length under about 30 characters,
-with most special characters counting roughly double.
-.Pp
-.Fn Regcomp
-implements bounded repetitions by macro expansion,
-which is costly in time and space if counts are large
-or bounded repetitions are nested.
-An RE like, say,
-.Ql "((((a{1,100}){1,100}){1,100}){1,100}){1,100}"
-will (eventually) run almost any existing machine out of swap space.
-.Pp
-There are suspected problems with response to obscure error conditions.
-Notably,
-certain kinds of internal overflow,
-produced only by truly enormous REs or by multiply nested bounded repetitions,
-are probably not handled well.
-.Pp
-Due to a mistake in
-.St -p1003.2 ,
-things like
-.Ql "a)b"
-are legal REs because
-.Ql )\&
-is
-a special character only in the presence of a previous unmatched
-.Ql (\& .
-This can't be fixed until the spec is fixed.
-.Pp
-The standard's definition of back references is vague.
-For example, does
-.Ql "a\e(\e(b\e)*\e2\e)*d"
-match
-.Ql "abbbd" ?
-Until the standard is clarified,
-behavior in such cases should not be relied on.
-.Pp
-The implementation of word-boundary matching is a bit of a kludge,
-and bugs may lurk in combinations of word-boundary matching and anchoring.
diff --git a/newlib/libc/sys/linux/stdlib/regex2.h b/newlib/libc/sys/linux/stdlib/regex2.h
deleted file mode 100644
index 303b7f7..0000000
--- a/newlib/libc/sys/linux/stdlib/regex2.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)regex2.h	8.4 (Berkeley) 3/20/94
- * $FreeBSD: src/lib/libc/regex/regex2.h,v 1.6 2002/03/22 23:41:56 obrien Exp $
- */
-
-/*
- * First, the stuff that ends up in the outside-world include file
- = typedef off_t regoff_t;
- = typedef struct {
- = 	int re_magic;
- = 	size_t re_nsub;		// number of parenthesized subexpressions
- = 	const char *re_endp;	// end pointer for REG_PEND
- = 	struct re_guts *re_g;	// none of your business :-)
- = } regex_t;
- = typedef struct {
- = 	regoff_t rm_so;		// start of match
- = 	regoff_t rm_eo;		// end of match
- = } regmatch_t;
- */
-/*
- * internals of regex_t
- */
-#define	MAGIC1	((('r'^0200)<<8) | 'e')
-
-/*
- * The internal representation is a *strip*, a sequence of
- * operators ending with an endmarker.  (Some terminology etc. is a
- * historical relic of earlier versions which used multiple strips.)
- * Certain oddities in the representation are there to permit running
- * the machinery backwards; in particular, any deviation from sequential
- * flow must be marked at both its source and its destination.  Some
- * fine points:
- *
- * - OPLUS_ and O_PLUS are *inside* the loop they create.
- * - OQUEST_ and O_QUEST are *outside* the bypass they create.
- * - OCH_ and O_CH are *outside* the multi-way branch they create, while
- *   OOR1 and OOR2 are respectively the end and the beginning of one of
- *   the branches.  Note that there is an implicit OOR2 following OCH_
- *   and an implicit OOR1 preceding O_CH.
- *
- * In state representations, an operator's bit is on to signify a state
- * immediately *preceding* "execution" of that operator.
- */
-typedef unsigned long sop;	/* strip operator */
-typedef long sopno;
-#define	OPRMASK	0xf8000000L
-#define	OPDMASK	0x07ffffffL
-#define	OPSHIFT	((unsigned)27)
-#define	OP(n)	((n)&OPRMASK)
-#define	OPND(n)	((n)&OPDMASK)
-#define	SOP(op, opnd)	((op)|(opnd))
-/* operators			   meaning	operand			*/
-/*						(back, fwd are offsets)	*/
-#define	OEND	(1L<<OPSHIFT)	/* endmarker	-			*/
-#define	OCHAR	(2L<<OPSHIFT)	/* character	unsigned char		*/
-#define	OBOL	(3L<<OPSHIFT)	/* left anchor	-			*/
-#define	OEOL	(4L<<OPSHIFT)	/* right anchor	-			*/
-#define	OANY	(5L<<OPSHIFT)	/* .		-			*/
-#define	OANYOF	(6L<<OPSHIFT)	/* [...]	set number		*/
-#define	OBACK_	(7L<<OPSHIFT)	/* begin \d	paren number		*/
-#define	O_BACK	(8L<<OPSHIFT)	/* end \d	paren number		*/
-#define	OPLUS_	(9L<<OPSHIFT)	/* + prefix	fwd to suffix		*/
-#define	O_PLUS	(10L<<OPSHIFT)	/* + suffix	back to prefix		*/
-#define	OQUEST_	(11L<<OPSHIFT)	/* ? prefix	fwd to suffix		*/
-#define	O_QUEST	(12L<<OPSHIFT)	/* ? suffix	back to prefix		*/
-#define	OLPAREN	(13L<<OPSHIFT)	/* (		fwd to )		*/
-#define	ORPAREN	(14L<<OPSHIFT)	/* )		back to (		*/
-#define	OCH_	(15L<<OPSHIFT)	/* begin choice	fwd to OOR2		*/
-#define	OOR1	(16L<<OPSHIFT)	/* | pt. 1	back to OOR1 or OCH_	*/
-#define	OOR2	(17L<<OPSHIFT)	/* | pt. 2	fwd to OOR2 or O_CH	*/
-#define	O_CH	(18L<<OPSHIFT)	/* end choice	back to OOR1		*/
-#define	OBOW	(19L<<OPSHIFT)	/* begin word	-			*/
-#define	OEOW	(20L<<OPSHIFT)	/* end word	-			*/
-
-/*
- * Structure for [] character-set representation.  Character sets are
- * done as bit vectors, grouped 8 to a byte vector for compactness.
- * The individual set therefore has both a pointer to the byte vector
- * and a mask to pick out the relevant bit of each byte.  A hash code
- * simplifies testing whether two sets could be identical.
- *
- * This will get trickier for multicharacter collating elements.  As
- * preliminary hooks for dealing with such things, we also carry along
- * a string of multi-character elements, and decide the size of the
- * vectors at run time.
- */
-typedef struct {
-	uch *ptr;		/* -> uch [csetsize] */
-	uch mask;		/* bit within array */
-	short hash;             /* hash code */
-	size_t smultis;
-	char *multis;		/* -> char[smulti]  ab\0cd\0ef\0\0 */
-} cset;
-/* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */
-#define CHadd(cs, c)    ((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (uch)(c))
-#define CHsub(cs, c)    ((cs)->ptr[(uch)(c)] &= ~(cs)->mask, (cs)->hash -= (uch)(c))
-#define	CHIN(cs, c)	((cs)->ptr[(uch)(c)] & (cs)->mask)
-#define	MCadd(p, cs, cp)	mcadd(p, cs, cp)	/* regcomp() internal fns */
-#define	MCsub(p, cs, cp)	mcsub(p, cs, cp)
-#define	MCin(p, cs, cp)	mcin(p, cs, cp)
-
-/* stuff for character categories */
-typedef unsigned char cat_t;
-
-/*
- * main compiled-expression structure
- */
-struct re_guts {
-	int magic;
-#		define	MAGIC2	((('R'^0200)<<8)|'E')
-	sop *strip;		/* malloced area for strip */
-	int csetsize;		/* number of bits in a cset vector */
-	int ncsets;		/* number of csets in use */
-	cset *sets;		/* -> cset [ncsets] */
-	uch *setbits;		/* -> uch[csetsize][ncsets/CHAR_BIT] */
-	int cflags;		/* copy of regcomp() cflags argument */
-	sopno nstates;		/* = number of sops */
-	sopno firststate;	/* the initial OEND (normally 0) */
-	sopno laststate;	/* the final OEND */
-	int iflags;		/* internal flags */
-#		define	USEBOL	01	/* used ^ */
-#		define	USEEOL	02	/* used $ */
-#		define	BAD	04	/* something wrong */
-	int nbol;		/* number of ^ used */
-	int neol;		/* number of $ used */
-	int ncategories;	/* how many character categories */
-	cat_t *categories;	/* ->catspace[-CHAR_MIN] */
-	char *must;		/* match must contain this string */
-	int moffset;		/* latest point at which must may be located */
-	int *charjump;		/* Boyer-Moore char jump table */
-	int *matchjump;		/* Boyer-Moore match jump table */
-	int mlen;		/* length of must */
-	size_t nsub;		/* copy of re_nsub */
-	int backrefs;		/* does it use back references? */
-	sopno nplus;		/* how deep does it nest +s? */
-	/* catspace must be last */
-	cat_t catspace[1];	/* actually [NC] */
-};
-
-/* misc utilities */
-#define	OUT	(CHAR_MAX+1)	/* a non-character value */
-#define ISWORD(c)       (isalnum((uch)(c)) || (c) == '_')
diff --git a/newlib/libc/sys/linux/stdlib/regexec.c b/newlib/libc/sys/linux/stdlib/regexec.c
deleted file mode 100644
index 4f3bb50..0000000
--- a/newlib/libc/sys/linux/stdlib/regexec.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)regexec.c	8.3 (Berkeley) 3/20/94
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/regex/regexec.c,v 1.3 2002/03/21 18:41:51 obrien Exp $");
-
-/*
- * the outer shell of regexec()
- *
- * This file includes engine.c *twice*, after muchos fiddling with the
- * macros that code uses.  This lets the same code operate on two different
- * representations for state sets.
- */
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
-#include <regex.h>
-
-#include "utils.h"
-#include "regex2.h"
-
-static int nope = 0;		/* for use in asserts; shuts lint up */
-
-/* macros for manipulating states, small version */
-#define	states	long
-#define	states1	states		/* for later use in regexec() decision */
-#define	CLEAR(v)	((v) = 0)
-#define	SET0(v, n)	((v) &= ~((unsigned long)1 << (n)))
-#define	SET1(v, n)	((v) |= (unsigned long)1 << (n))
-#define	ISSET(v, n)	(((v) & ((unsigned long)1 << (n))) != 0)
-#define	ASSIGN(d, s)	((d) = (s))
-#define	EQ(a, b)	((a) == (b))
-#define	STATEVARS	long dummy	/* dummy version */
-#define	STATESETUP(m, n)	/* nothing */
-#define	STATETEARDOWN(m)	/* nothing */
-#define	SETUP(v)	((v) = 0)
-#define	onestate	long
-#define	INIT(o, n)	((o) = (unsigned long)1 << (n))
-#define	INC(o)	((o) <<= 1)
-#define	ISSTATEIN(v, o)	(((v) & (o)) != 0)
-/* some abbreviations; note that some of these know variable names! */
-/* do "if I'm here, I can also be there" etc without branches */
-#define	FWD(dst, src, n)	((dst) |= ((unsigned long)(src)&(here)) << (n))
-#define	BACK(dst, src, n)	((dst) |= ((unsigned long)(src)&(here)) >> (n))
-#define	ISSETBACK(v, n)	(((v) & ((unsigned long)here >> (n))) != 0)
-/* function names */
-#define SNAMES			/* engine.c looks after details */
-
-#include "engine.c"
-
-/* now undo things */
-#undef	states
-#undef	CLEAR
-#undef	SET0
-#undef	SET1
-#undef	ISSET
-#undef	ASSIGN
-#undef	EQ
-#undef	STATEVARS
-#undef	STATESETUP
-#undef	STATETEARDOWN
-#undef	SETUP
-#undef	onestate
-#undef	INIT
-#undef	INC
-#undef	ISSTATEIN
-#undef	FWD
-#undef	BACK
-#undef	ISSETBACK
-#undef	SNAMES
-
-/* macros for manipulating states, large version */
-#define	states	char *
-#define	CLEAR(v)	memset(v, 0, m->g->nstates)
-#define	SET0(v, n)	((v)[n] = 0)
-#define	SET1(v, n)	((v)[n] = 1)
-#define	ISSET(v, n)	((v)[n])
-#define	ASSIGN(d, s)	memcpy(d, s, m->g->nstates)
-#define	EQ(a, b)	(memcmp(a, b, m->g->nstates) == 0)
-#define	STATEVARS	long vn; char *space
-#define	STATESETUP(m, nv)	{ (m)->space = malloc((nv)*(m)->g->nstates); \
-				if ((m)->space == NULL) return(REG_ESPACE); \
-				(m)->vn = 0; }
-#define	STATETEARDOWN(m)	{ free((m)->space); }
-#define	SETUP(v)	((v) = &m->space[m->vn++ * m->g->nstates])
-#define	onestate	long
-#define	INIT(o, n)	((o) = (n))
-#define	INC(o)	((o)++)
-#define	ISSTATEIN(v, o)	((v)[o])
-/* some abbreviations; note that some of these know variable names! */
-/* do "if I'm here, I can also be there" etc without branches */
-#define	FWD(dst, src, n)	((dst)[here+(n)] |= (src)[here])
-#define	BACK(dst, src, n)	((dst)[here-(n)] |= (src)[here])
-#define	ISSETBACK(v, n)	((v)[here - (n)])
-/* function names */
-#define	LNAMES			/* flag */
-
-#include "engine.c"
-
-/*
- - regexec - interface for matching
- = extern int regexec(const regex_t *, const char *, size_t, \
- =					regmatch_t [], int);
- = #define	REG_NOTBOL	00001
- = #define	REG_NOTEOL	00002
- = #define	REG_STARTEND	00004
- = #define	REG_TRACE	00400	// tracing of execution
- = #define	REG_LARGE	01000	// force large representation
- = #define	REG_BACKR	02000	// force use of backref code
- *
- * We put this here so we can exploit knowledge of the state representation
- * when choosing which matcher to call.  Also, by this point the matchers
- * have been prototyped.
- */
-int				/* 0 success, REG_NOMATCH failure */
-regexec(preg, string, nmatch, pmatch, eflags)
-const regex_t *preg;
-const char *string;
-size_t nmatch;
-regmatch_t pmatch[];
-int eflags;
-{
-	struct re_guts *g = preg->re_g;
-#ifdef REDEBUG
-#	define	GOODFLAGS(f)	(f)
-#else
-#	define	GOODFLAGS(f)	((f)&(REG_NOTBOL|REG_NOTEOL|REG_STARTEND))
-#endif
-
-	if (preg->re_magic != MAGIC1 || g->magic != MAGIC2)
-		return(REG_BADPAT);
-	assert(!(g->iflags&BAD));
-	if (g->iflags&BAD)		/* backstop for no-debug case */
-		return(REG_BADPAT);
-	eflags = GOODFLAGS(eflags);
-
-	if (g->nstates <= CHAR_BIT*sizeof(states1) && !(eflags&REG_LARGE))
-		return(smatcher(g, (char *)string, nmatch, pmatch, eflags));
-	else
-		return(lmatcher(g, (char *)string, nmatch, pmatch, eflags));
-}
diff --git a/newlib/libc/sys/linux/stdlib/regfree.c b/newlib/libc/sys/linux/stdlib/regfree.c
deleted file mode 100644
index 82119d3..0000000
--- a/newlib/libc/sys/linux/stdlib/regfree.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)regfree.c	8.3 (Berkeley) 3/20/94
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regfree.c	8.3 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/regex/regfree.c,v 1.5 2002/03/22 21:52:47 obrien Exp $");
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <regex.h>
-
-#include "utils.h"
-#include "regex2.h"
-
-/*
- - regfree - free everything
- = extern void regfree(regex_t *);
- */
-void
-regfree(preg)
-regex_t *preg;
-{
-	struct re_guts *g;
-
-	if (preg->re_magic != MAGIC1)	/* oops */
-		return;			/* nice to complain, but hard */
-
-	g = preg->re_g;
-	if (g == NULL || g->magic != MAGIC2)	/* oops again */
-		return;
-	preg->re_magic = 0;		/* mark it invalid */
-	g->magic = 0;			/* mark it invalid */
-
-	if (g->strip != NULL)
-		free((char *)g->strip);
-	if (g->sets != NULL)
-		free((char *)g->sets);
-	if (g->setbits != NULL)
-		free((char *)g->setbits);
-	if (g->must != NULL)
-		free(g->must);
-	if (g->charjump != NULL)
-		free(&g->charjump[CHAR_MIN]);
-	if (g->matchjump != NULL)
-		free(g->matchjump);
-	free((char *)g);
-}
diff --git a/newlib/libc/sys/linux/stdlib/utils.h b/newlib/libc/sys/linux/stdlib/utils.h
deleted file mode 100644
index 5439b6c..0000000
--- a/newlib/libc/sys/linux/stdlib/utils.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)utils.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD: src/lib/libc/regex/utils.h,v 1.2 2002/03/22 23:41:56 obrien Exp $
- */
-
-/* utility definitions */
-#define	DUPMAX		_POSIX2_RE_DUP_MAX	/* xxx is this right? */
-#define	INFINITY	(DUPMAX + 1)
-#define	NC		(CHAR_MAX - CHAR_MIN + 1)
-typedef unsigned char uch;
-
-/* switch off assertions (if not already off) if no REDEBUG */
-#ifndef REDEBUG
-#ifndef NDEBUG
-#define	NDEBUG	/* no assertions please */
-#endif
-#endif
-#include <assert.h>
-
-/* for old systems with bcopy() but no memmove() */
-#ifdef USEBCOPY
-#define	memmove(d, s, c)	bcopy(s, d, c)
-#endif
diff --git a/newlib/libc/sys/linux/stdlib/wordexp.c b/newlib/libc/sys/linux/stdlib/wordexp.c
deleted file mode 100644
index 3928b85..0000000
--- a/newlib/libc/sys/linux/stdlib/wordexp.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <glob.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/wait.h>
-
-#include <wordexp.h>
-
-#define MAXLINELEN 500
-
-/* Note: This implementation of wordexp requires a version of bash
-   that supports the --wordexp and --protected arguments to be present
-   on the system.  It does not support the WRDE_UNDEF flag. */
-int
-wordexp(const char *words, wordexp_t *pwordexp, int flags)
-{
-  FILE *f;
-  FILE *f_err;
-  char tmp[MAXLINELEN];
-  int i = 0;
-  int offs = 0;
-  char *iter;
-  pid_t pid;
-  int num_words = 0;
-  int num_bytes = 0;
-  int fd[2];
-  int fd_err[2];
-  int err = 0;
-
-  if (pwordexp == NULL)
-    {
-      return WRDE_NOSPACE;
-    }
-
-  if (flags & WRDE_REUSE)
-    wordfree(pwordexp);
-
-  if ((flags & WRDE_APPEND) == 0)
-    {
-      pwordexp->we_wordc = 0;
-      pwordexp->we_wordv = NULL;
-    }
-
-  if (flags & WRDE_DOOFFS)
-    {
-      offs = pwordexp->we_offs;
-
-      if(!(pwordexp->we_wordv = (char **)realloc(pwordexp->we_wordv, (pwordexp->we_wordc + offs + 1) * sizeof(char *))))
-        return WRDE_NOSPACE;
-
-      for (i = 0; i < offs; i++)
-        pwordexp->we_wordv[i] = NULL;
-    }
-
-  pipe(fd);
-  pipe(fd_err);
-  pid = fork();
-
-  if (pid > 0)
-    {
-      /* In parent process. */
-
-      /* Close write end of parent's pipe. */
-      close(fd[1]);
-      close(fd_err[1]);
-
-      /* f_err is the standard error from the shell command. */
-      f_err = fdopen(fd_err[0], "r");
-
-      /* Check for errors. */
-      if (fgets(tmp, MAXLINELEN, f_err))
-        {
-          if (strstr(tmp, "EOF"))
-            err = WRDE_SYNTAX;
-          else if (strstr(tmp, "`\n'") || strstr(tmp, "`|'")
-                   || strstr(tmp, "`&'") || strstr(tmp, "`;'")
-                   || strstr(tmp, "`<'") || strstr(tmp, "`>'")
-                   || strstr(tmp, "`('") || strstr(tmp, "`)'")
-                   || strstr(tmp, "`{'") || strstr(tmp, "`}'"))
-            err = WRDE_BADCHAR;
-          else if (strstr(tmp, "command substitution"))
-            err = WRDE_CMDSUB;
-          else
-            err = WRDE_SYNTAX;
-
-          if (flags & WRDE_SHOWERR)
-            {
-              fprintf(stderr, tmp);
-              while(fgets(tmp, MAXLINELEN, f_err))
-                fprintf(stderr, tmp);
-            }
-
-          return err;
-        }
-
-      /* f is the standard output from the shell command. */
-      f = fdopen(fd[0], "r");
-
-      /* Get number of words expanded by shell. */
-      fgets(tmp, MAXLINELEN, f);
-
-      if((iter = strchr(tmp, '\n')))
-          *iter = '\0';
-
-      num_words = atoi(tmp);
-
-      if(!(pwordexp->we_wordv = (char **)realloc(pwordexp->we_wordv,
-                                                 (pwordexp->we_wordc + num_words + offs + 1) * sizeof(char *))))
-        return WRDE_NOSPACE;
-
-      /* Get number of bytes required for storage of num_words words. */
-      fgets(tmp, MAXLINELEN, f);
-
-      if((iter = strchr(tmp, '\n')))
-          *iter = '\0';
-
-      num_bytes = atoi(tmp) + pwordexp->we_wordc;
-
-      /* Get each expansion from the shell output, and store each in
-         pwordexp's we_wordv vector. */
-      for(i = 0; i < num_words; i++)
-        {
-          fgets(tmp, MAXLINELEN, f);
-
-          if((iter = strchr(tmp, '\n')))
-            *iter = '\0';
-
-          pwordexp->we_wordv[pwordexp->we_wordc + offs + i] = strdup(tmp);
-        }
-
-      pwordexp->we_wordv[pwordexp->we_wordc + offs + i] = NULL;
-      pwordexp->we_wordc += num_words;
-
-      close(fd[0]);
-      close(fd_err[0]);
-
-      /* Wait for child to finish. */
-      waitpid (pid, NULL, 0);
-
-      return WRDE_SUCCESS;
-    }
-  else
-    {
-      /* In child process. */
-
-      /* Close read end of child's pipe. */
-      close(fd[0]);
-      close(fd_err[0]);
-
-      /* Pipe standard output to parent process via fd. */
-      if (fd[1] != STDOUT_FILENO)
-        {
-          dup2(fd[1], STDOUT_FILENO);
-          /* fd[1] no longer required. */
-          close(fd[1]);
-        }
-
-      /* Pipe standard error to parent process via fd_err. */
-      if (fd_err[1] != STDERR_FILENO)
-        {
-          dup2(fd_err[1], STDERR_FILENO);
-          /* fd_err[1] no longer required. */
-          close(fd_err[1]);
-        }
-
-      if (flags & WRDE_NOCMD)
-        execl("/bin/bash", "bash", "--protected", "--wordexp", words, (char *)0);
-      else
-        execl("/bin/bash", "bash", "--wordexp", words, (char *)0);
-    }
-  return WRDE_SUCCESS;
-}
diff --git a/newlib/libc/sys/linux/stdlib/wordfree.c b/newlib/libc/sys/linux/stdlib/wordfree.c
deleted file mode 100644
index 1b6ee1e..0000000
--- a/newlib/libc/sys/linux/stdlib/wordfree.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <glob.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <wordexp.h>
-
-void
-wordfree(wordexp_t *pwordexp)
-{
-  int i;
-
-  if (pwordexp == NULL)
-    return;
-
-  if (pwordexp->we_wordv == NULL)
-    return;
-
-  for(i = 0; i < pwordexp->we_wordc; i++)
-    free(pwordexp->we_wordv[i]);
-
-  free(pwordexp->we_wordv);
-  pwordexp->we_wordv = NULL;
-}
diff --git a/newlib/libc/sys/linux/strsignal.c b/newlib/libc/sys/linux/strsignal.c
deleted file mode 100644
index 3f95e18..0000000
--- a/newlib/libc/sys/linux/strsignal.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <string.h>
-#include <signal.h>
-#include <stdio.h>
-#include <reent.h>
-
-static const char *sigstring[] =
-  {
-    "Signal 0",
-    "Hangup",
-    "Interrupt",
-    "Quit",
-    "Illegal instruction",
-    "Trace/breakpoint trap",
-    "IOT trap",
-    "EMT trap",
-    "Floating point exception",
-    "Killed",
-    "Bus error",
-    "Segmentation fault",
-    "Bad system call",
-    "Broken pipe",
-    "Alarm clock",
-    "Terminated",
-    "Urgent I/O condition",
-    "Stopped (signal)",
-    "Stopped",
-    "Continued",
-    "Child exited",
-    "Stopped (tty input)",
-    "Stopped (tty output)",
-    "I/O possible",
-    "CPU time limit exceeded",
-    "File size limit exceeded",
-    "Virtual timer expired",
-    "Profiling timer expired",
-    "Window changed",
-    "Resource lost",
-    "User defined signal 1",
-    "User defined signal 2"
-  };
-
-char *
-strsignal (int sig)
-{
-  if (sig < 0 || sig >= __SIGRTMIN)
-    {
-      char *buffer;
-      struct _reent *ptr;
-
-      ptr = _REENT;
-
-      _REENT_CHECK_SIGNAL_BUF(ptr);
-      buffer = _REENT_SIGNAL_BUF(ptr);
-
-      if (sig < 0 || sig > __SIGRTMAX)
-        siprintf (buffer, "Unknown signal %d", sig);
-      else
-        siprintf (buffer, "Real-time signal %d", sig - __SIGRTMIN);
-      return buffer;
-    }
-  else
-    return sigstring[sig];
-}
diff --git a/newlib/libc/sys/linux/strverscmp.c b/newlib/libc/sys/linux/strverscmp.c
deleted file mode 100644
index 2a9cbf4..0000000
--- a/newlib/libc/sys/linux/strverscmp.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Compare strings while treating digits characters numerically.
-   Copyright (C) 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <string.h>
-#include <ctype.h>
-#include <machine/weakalias.h>
-
-/* states: S_N: normal, S_I: comparing integral part, S_F: comparing
-           fractionnal parts, S_Z: idem but with leading Zeroes only */
-#define  S_N    0x0
-#define  S_I    0x4
-#define  S_F    0x8
-#define  S_Z    0xC
-
-/* result_type: CMP: return diff; LEN: compare using len_diff/diff */
-#define  CMP    2
-#define  LEN    3
-
-
-/* Compare S1 and S2 as strings holding indices/version numbers,
-   returning less than, equal to or greater than zero if S1 is less than,
-   equal to or greater than S2 (for more info, see the texinfo doc).
-*/
-
-int
-__strverscmp (s1, s2)
-     const char *s1;
-     const char *s2;
-{
-  const unsigned char *p1 = (const unsigned char *) s1;
-  const unsigned char *p2 = (const unsigned char *) s2;
-  unsigned char c1, c2;
-  int state;
-  int diff;
-
-  /* Symbol(s)    0       [1-9]   others  (padding)
-     Transition   (10) 0  (01) d  (00) x  (11) -   */
-  static const unsigned int next_state[] =
-  {
-      /* state    x    d    0    - */
-      /* S_N */  S_N, S_I, S_Z, S_N,
-      /* S_I */  S_N, S_I, S_I, S_I,
-      /* S_F */  S_N, S_F, S_F, S_F,
-      /* S_Z */  S_N, S_F, S_Z, S_Z
-  };
-
-  static const int result_type[] =
-  {
-      /* state   x/x  x/d  x/0  x/-  d/x  d/d  d/0  d/-
-                 0/x  0/d  0/0  0/-  -/x  -/d  -/0  -/- */
-
-      /* S_N */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
-                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
-      /* S_I */  CMP, -1,  -1,  CMP, +1,  LEN, LEN, CMP,
-                 +1,  LEN, LEN, CMP, CMP, CMP, CMP, CMP,
-      /* S_F */  CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP,
-                 CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP,
-      /* S_Z */  CMP, +1,  +1,  CMP, -1,  CMP, CMP, CMP,
-                 -1,  CMP, CMP, CMP
-  };
-
-  if (p1 == p2)
-    return 0;
-
-  c1 = *p1++;
-  c2 = *p2++;
-  /* Hint: '0' is a digit too.  */
-  state = S_N | ((c1 == '0') + (isdigit (c1) != 0));
-
-  while ((diff = c1 - c2) == 0 && c1 != '\0')
-    {
-      state = next_state[state];
-      c1 = *p1++;
-      c2 = *p2++;
-      state |= (c1 == '0') + (isdigit (c1) != 0);
-    }
-
-  state = result_type[state << 2 | (((c2 == '0') + (isdigit (c2) != 0)))];
-
-  switch (state)
-  {
-    case CMP:
-      return diff;
-
-    case LEN:
-      while (isdigit (*p1++))
-	if (!isdigit (*p2++))
-	  return 1;
-
-      return isdigit (*p2) ? -1 : diff;
-
-    default:
-      return state;
-  }
-}
-weak_alias (__strverscmp, strverscmp)
diff --git a/newlib/libc/sys/linux/sys/_types.h b/newlib/libc/sys/linux/sys/_types.h
deleted file mode 100644
index 994df89..0000000
--- a/newlib/libc/sys/linux/sys/_types.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ANSI C namespace clean utility typedefs */
-
-/* This file defines various typedefs needed by the system calls that support
-   the C library.  Basically, they're just the POSIX versions with an '_'
-   prepended.  This file lives in the `sys' directory so targets can provide
-   their own if desired (or they can put target dependant conditionals here).
-*/
-
-#ifndef	_SYS__TYPES_H
-#define _SYS__TYPES_H
-
-typedef long _off_t;
-__extension__ typedef long long _off64_t;
-
-#if defined(__INT_MAX__) && __INT_MAX__ == 2147483647
-typedef int _ssize_t;
-#else
-typedef long _ssize_t;
-#endif
-
-#define __need_wint_t
-#include <stddef.h>
-
-/* Conversion state information.  */
-typedef struct
-{
-  int __count;
-  union
-  {
-    wint_t __wch;
-    unsigned char __wchb[4];
-  } __value;		/* Value so far.  */
-} _mbstate_t;
-
-struct __flock_mutex_t_tmp;
-typedef struct
-{
-  int __a;
-  int __b;
-  struct
-  {
-    long int __c1;
-    int __c2;
-  } __c;
-  int __d;
-  struct __flock_mutex_t_tmp * __e;
-} __flock_mutex_t;
-
-typedef struct { __flock_mutex_t mutex; } _flock_t;
-
-#endif	/* _SYS__TYPES_H */
diff --git a/newlib/libc/sys/linux/sys/cdefs.h b/newlib/libc/sys/linux/sys/cdefs.h
index f6ea0c7..90daac7 100644
--- a/newlib/libc/sys/linux/sys/cdefs.h
+++ b/newlib/libc/sys/linux/sys/cdefs.h
@@ -1,238 +1,21 @@
-/* Copyright (C) 1992,93,94,95,96,97,98,99,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
+/* libc/sys/linux/sys/cdefs.h - Helper macros for K&R vs. ANSI C compat. */
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+/* Written 2000 by Werner Almesberger */
 
-   The GNU C 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
-   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef	_SYS_CDEFS_H
-#define	_SYS_CDEFS_H	1
-
-/* We are almost always included from features.h. */
-#ifndef _FEATURES_H
-# include <features.h>
-#endif
-
-/* The GNU libc does not support any K&R compilers or the traditional mode
-   of ISO C compilers anymore.  Check for some of the combinations not
-   anymore supported.  */
-#if defined __GNUC__ && !defined __STDC__
-# error "You need a ISO C conforming compiler to use the glibc headers"
-#endif
-
-#define __FBSDID(x) /* nothing */
-
-/* Some user header file might have defined this before.  */
-#undef	__P
-#undef	__PMT
-
-#ifdef __GNUC__
-
-/* GCC can always grok prototypes.  For C++ programs we add throw()
-   to help it optimize the function calls.  But this works only with
-   gcc 2.8.x and egcs.  */
-# if defined __cplusplus && __GNUC_PREREQ (2,8)
-#  define __THROW	throw ()
-# else
-#  define __THROW
-# endif
-# define __P(args)	args __THROW
-/* This macro will be used for functions which might take C++ callback
-   functions.  */
-# define __PMT(args)	args
-
-#else	/* Not GCC.  */
-
-# define __inline		/* No inline functions.  */
-
-# define __THROW
-# define __P(args)	args
-# define __PMT(args)	args
-
-# define __const	const
-# define __signed	signed
-# define __volatile	volatile
-
-#endif	/* GCC.  */
-
-/* For these things, GCC behaves the ANSI way normally,
-   and the non-ANSI way under -traditional.  */
-
-#define __CONCAT(x,y)	x ## y
-#define __STRING(x)	#x
-
-/* This is not a typedef so `const __ptr_t' does the right thing.  */
-#define __ptr_t void *
-#define __long_double_t  long double
-
-
-/* C++ needs to know that types and declarations are C, not C++.  */
-#ifdef	__cplusplus
-# define __BEGIN_DECLS	extern "C" {
-# define __END_DECLS	}
-#else
-# define __BEGIN_DECLS
-# define __END_DECLS
-#endif
-
-
-/* Support for bounded pointers.  */
-#ifndef __BOUNDED_POINTERS__
-# define __bounded	/* nothing */
-# define __unbounded	/* nothing */
-# define __ptrvalue	/* nothing */
-#endif
-
-
-/* Support for flexible arrays.  */
-#if __GNUC_PREREQ (2,97)
-/* GCC 2.97 supports C99 flexible array members.  */
-# define __flexarr	[]
-#else
-# ifdef __GNUC__
-#  define __flexarr	[0]
-# else
-#  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-#   define __flexarr	[]
-#  else
-/* Some other non-C99 compiler.  Approximate with [1].  */
-#   define __flexarr	[1]
-#  endif
-# endif
-#endif
-
-
-/* __asm__ ("xyz") is used throughout the headers to rename functions
-   at the assembly language level.  This is wrapped by the __REDIRECT
-   macro, in order to support compilers that can do this some other
-   way.  When compilers don't support asm-names at all, we have to do
-   preprocessor tricks instead (which don't have exactly the right
-   semantics, but it's the best we can do).
-
-   Example:
-   int __REDIRECT(setpgrp, (__pid_t pid, __pid_t pgrp), setpgid); */
-
-#if defined __GNUC__ && __GNUC__ >= 2
-
-# define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias))
-# define __ASMNAME(cname)  __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
-# define __ASMNAME2(prefix, cname) __STRING (prefix) cname
+#ifndef _SYS_CDEFS_H
+#define _SYS_CDEFS_H
 
 /*
-#elif __SOME_OTHER_COMPILER__
+ * Note: the goal here is not compatibility to K&R C. Since we know that we
+ * have GCC which understands ANSI C perfectly well, we make use of this.
+ */
 
-# define __REDIRECT(name, proto, alias) name proto; \
-	_Pragma("let " #name " = " #alias)
-*/
-#endif
+#define __P(args)	args
+#define __PMT(args)	args
+#define __const		const
+#define __signed	signed
+#define __volatile	volatile
+#define __DOTS    	, ...
 
-/* GCC has various useful declarations that can be made with the
-   `__attribute__' syntax.  All of the ways we use this do fine if
-   they are omitted for compilers that don't understand it. */
-#if !defined __GNUC__ || __GNUC__ < 2
-# define __attribute__(xyz)	/* Ignore */
 #endif
-
-/* At some point during the gcc 2.96 development the `malloc' attribute
-   for functions was introduced.  We don't want to use it unconditionally
-   (although this would be possible) since it generates warnings.  */
-#if __GNUC_PREREQ (2,96)
-# define __attribute_malloc__ __attribute__ ((__malloc__))
-#else
-# define __attribute_malloc__ /* Ignore */
-#endif
-
-/* At some point during the gcc 2.96 development the `pure' attribute
-   for functions was introduced.  We don't want to use it unconditionally
-   (although this would be possible) since it generates warnings.  */
-#if __GNUC_PREREQ (2,96)
-# define __attribute_pure__ __attribute__ ((__pure__))
-#else
-# define __attribute_pure__ /* Ignore */
-#endif
-
-/* At some point during the gcc 3.1 development the `used' attribute
-   for functions was introduced.  We don't want to use it unconditionally
-   (although this would be possible) since it generates warnings.  */
-#if __GNUC_PREREQ (3,1)
-# define __attribute_used__ __attribute__ ((__used__))
-# define __attribute_noinline__ __attribute__ ((__noinline__))
-#else
-# define __attribute_used__ __attribute__ ((__unused__))
-# define __attribute_noinline__ /* Ignore */
-#endif
-
-/* At some point during the gcc 2.8 development the `format_arg' attribute
-   for functions was introduced.  We don't want to use it unconditionally
-   (although this would be possible) since it generates warnings.
-   If several `format_arg' attributes are given for the same function, in
-   gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
-   all designated arguments are considered.  */
-#if __GNUC_PREREQ (2,8)
-# define __attribute_format_arg__(x) __attribute__ ((__format_arg__ (x)))
-#else
-# define __attribute_format_arg__(x) /* Ignore */
-#endif
-
-/* At some point during the gcc 2.97 development the `strfmon' format
-   attribute for functions was introduced.  We don't want to use it
-   unconditionally (although this would be possible) since it
-   generates warnings.  */
-#if __GNUC_PREREQ (2,97)
-# define __attribute_format_strfmon__(a,b) \
-  __attribute__ ((__format__ (__strfmon__, a, b)))
-#else
-# define __attribute_format_strfmon__(a,b) /* Ignore */
-#endif
-
-/* It is possible to compile containing GCC extensions even if GCC is
-   run in pedantic mode if the uses are carefully marked using the
-   `__extension__' keyword.  But this is not generally available before
-   version 2.8.  */
-#if !__GNUC_PREREQ (2,8)
-# define __extension__		/* Ignore */
-#endif
-
-/* __restrict is known in EGCS 1.2 and above. */
-#if !__GNUC_PREREQ (2,92)
-# define __restrict	/* Ignore */
-#endif
-
-/* ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
-     array_name[restrict]
-   GCC 3.1 supports this.  */
-#if __GNUC_PREREQ (3,1) && !defined __GNUG__
-# define __restrict_arr	__restrict
-#else
-# ifdef __GNUC__
-#  define __restrict_arr	/* Not supported in old GCC.  */
-# else
-#  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
-#   define __restrict_arr	restrict
-#  else
-/* Some other non-C99 compiler.  */
-#   define __restrict_arr	/* Not supported.  */
-#  endif
-# endif
-#endif
-
-/* The nonull function attribute allows to mark pointer parameters which
-   must not be NULL.  */
-#if __GNUC_PREREQ (3,3)
-# define __nonnull(params) __attribute__ ((__nonnull__ params))
-#else
-# define __nonnull(params)
-#endif
-
-#endif	 /* sys/cdefs.h */
diff --git a/newlib/libc/sys/linux/sys/dirent.h b/newlib/libc/sys/linux/sys/dirent.h
index 4bbae42..ab6b58d 100644
--- a/newlib/libc/sys/linux/sys/dirent.h
+++ b/newlib/libc/sys/linux/sys/dirent.h
@@ -8,13 +8,8 @@
 
 #include <sys/types.h>
 #include <linux/dirent.h>
-#define _LIBC 1
-#define  NOT_IN_libc 1
-#include <sys/lock.h>
-#undef _LIBC
 
 #define HAVE_NO_D_NAMLEN	/* no struct dirent->d_namlen */
-#define HAVE_DD_LOCK  		/* have locking mechanism */
 
 #define MAXNAMLEN 255		/* sizeof(struct dirent.d_name)-1 */
 
@@ -26,7 +21,6 @@ typedef struct {
     char *dd_buf;	/* buffer */
     int dd_len;		/* buffer length */
     int dd_size;	/* amount of data in buffer */
-    _LOCK_RECURSIVE_T dd_lock;
 } DIR;
 
 
@@ -41,7 +35,6 @@ int closedir(DIR *);
 
 /* internal prototype */
 void _seekdir(DIR *dir,off_t offset);
-DIR *_opendir(const char *);
 
 #ifndef _POSIX_SOURCE
 long telldir (DIR *);
diff --git a/newlib/libc/sys/linux/sys/dlfcn.h b/newlib/libc/sys/linux/sys/dlfcn.h
deleted file mode 100644
index e96b5c1..0000000
--- a/newlib/libc/sys/linux/sys/dlfcn.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* System dependent definitions for run-time dynamic loading.
-   Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _DLFCN_H
-# error "Never use <bits/dlfcn.h> directly; include <dlfcn.h> instead."
-#endif
-
-/* The MODE argument to `dlopen' contains one of the following: */
-#define RTLD_LAZY	0x00001	/* Lazy function call binding.  */
-#define RTLD_NOW	0x00002	/* Immediate function call binding.  */
-#define	RTLD_BINDING_MASK   0x3	/* Mask of binding time value.  */
-#define RTLD_NOLOAD	0x00004	/* Do not load the object.  */
-
-/* If the following bit is set in the MODE argument to `dlopen',
-   the symbols of the loaded object and its dependencies are made
-   visible as if the object were linked directly into the program.  */
-#define RTLD_GLOBAL	0x00100
-
-/* Unix98 demands the following flag which is the inverse to RTLD_GLOBAL.
-   The implementation does this by default and so we can define the
-   value to zero.  */
-#define RTLD_LOCAL	0
-
-/* Do not delete object when closed.  */
-#define RTLD_NODELETE	0x01000
-
-#ifdef __USE_GNU
-/* To support profiling of shared objects it is a good idea to call
-   the function found using `dlsym' using the following macro since
-   these calls do not use the PLT.  But this would mean the dynamic
-   loader has no chance to find out when the function is called.  The
-   macro applies the necessary magic so that profiling is possible.
-   Rewrite
-	foo = (*fctp) (arg1, arg2);
-   into
-        foo = DL_CALL_FCT (fctp, (arg1, arg2));
-*/
-# define DL_CALL_FCT(fctp, args) \
-  (_dl_mcount_wrapper_check ((void *) (fctp)), (*(fctp)) args)
-
-__BEGIN_DECLS
-
-/* This function calls the profiling functions.  */
-extern void _dl_mcount_wrapper_check (void *__selfpc) __THROW;
-
-__END_DECLS
-
-#endif
diff --git a/newlib/libc/sys/linux/sys/elfclass.h b/newlib/libc/sys/linux/sys/elfclass.h
deleted file mode 100644
index 180227d..0000000
--- a/newlib/libc/sys/linux/sys/elfclass.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This file specifies the native word size of the machine, which indicates
-   the ELF file class used for executables and shared objects on this
-   machine.  */
-
-#ifndef _LINK_H
-# error "Never use <bits/elfclass.h> directly; include <link.h> instead."
-#endif
-
-#include <bits/wordsize.h>
-
-#define __ELF_NATIVE_CLASS __WORDSIZE
-
-/* The entries in the .hash table always have a size of 32 bits.  */
-typedef uint32_t Elf_Symndx;
diff --git a/newlib/libc/sys/linux/sys/errno.h b/newlib/libc/sys/linux/sys/errno.h
index 82c84c9..a1452bc 100644
--- a/newlib/libc/sys/linux/sys/errno.h
+++ b/newlib/libc/sys/linux/sys/errno.h
@@ -23,12 +23,6 @@ extern __IMPORT int _sys_nerr;
 /* --- end of slight redundancy (the use of struct _reent->_errno is
        hard-coded in perror.c so why pretend anything else could work too ? */
 
-#define __set_errno(x) (errno = (x))
-
 #include <asm/errno.h>
 
-#define ENOTSUP EOPNOTSUPP
-#define EFTYPE          79              /* Inappropriate file type or format */
-#define EILSEQ          84
-
 #endif
diff --git a/newlib/libc/sys/linux/sys/event.h b/newlib/libc/sys/linux/sys/event.h
deleted file mode 100644
index 159e234..0000000
--- a/newlib/libc/sys/linux/sys/event.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/*-
- * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	$FreeBSD: src/sys/sys/event.h,v 1.19 2002/03/23 08:46:51 bde Exp $
- */
-
-#ifndef _SYS_EVENT_H_
-#define _SYS_EVENT_H_
-
-#define EVFILT_READ		(-1)
-#define EVFILT_WRITE		(-2)
-#define EVFILT_AIO		(-3)	/* attached to aio requests */
-#define EVFILT_VNODE		(-4)	/* attached to vnodes */
-#define EVFILT_PROC		(-5)	/* attached to struct proc */
-#define EVFILT_SIGNAL		(-6)	/* attached to struct proc */
-#define EVFILT_TIMER		(-7)	/* timers */
-#define EVFILT_NETDEV		(-8)	/* network devices */
-
-#define EVFILT_SYSCOUNT		8
-
-#define EV_SET(kevp, a, b, c, d, e, f) do {	\
-	(kevp)->ident = (a);			\
-	(kevp)->filter = (b);			\
-	(kevp)->flags = (c);			\
-	(kevp)->fflags = (d);			\
-	(kevp)->data = (e);			\
-	(kevp)->udata = (f);			\
-} while(0)
-
-struct kevent {
-	unsigned int *	ident;		/* identifier for this event */
-	short		filter;		/* filter for event */
-	u_short		flags;
-	u_int		fflags;
-        int * 	        data;
-	void		*udata;		/* opaque user data identifier */
-};
-
-/* actions */
-#define EV_ADD		0x0001		/* add event to kq (implies enable) */
-#define EV_DELETE	0x0002		/* delete event from kq */
-#define EV_ENABLE	0x0004		/* enable event */
-#define EV_DISABLE	0x0008		/* disable event (not reported) */
-
-/* flags */
-#define EV_ONESHOT	0x0010		/* only report one occurrence */
-#define EV_CLEAR	0x0020		/* clear event state after reporting */
-
-#define EV_SYSFLAGS	0xF000		/* reserved by system */
-#define EV_FLAG1	0x2000		/* filter-specific flag */
-
-/* returned values */
-#define EV_EOF		0x8000		/* EOF detected */
-#define EV_ERROR	0x4000		/* error, data contains errno */
-
-/*
- * data/hint flags for EVFILT_{READ|WRITE}, shared with userspace
- */
-#define NOTE_LOWAT	0x0001			/* low water mark */
-
-/*
- * data/hint flags for EVFILT_VNODE, shared with userspace
- */
-#define	NOTE_DELETE	0x0001			/* vnode was removed */
-#define	NOTE_WRITE	0x0002			/* data contents changed */
-#define	NOTE_EXTEND	0x0004			/* size increased */
-#define	NOTE_ATTRIB	0x0008			/* attributes changed */
-#define	NOTE_LINK	0x0010			/* link count changed */
-#define	NOTE_RENAME	0x0020			/* vnode was renamed */
-#define	NOTE_REVOKE	0x0040			/* vnode access was revoked */
-
-/*
- * data/hint flags for EVFILT_PROC, shared with userspace
- */
-#define	NOTE_EXIT	0x80000000		/* process exited */
-#define	NOTE_FORK	0x40000000		/* process forked */
-#define	NOTE_EXEC	0x20000000		/* process exec'd */
-#define	NOTE_PCTRLMASK	0xf0000000		/* mask for hint bits */
-#define	NOTE_PDATAMASK	0x000fffff		/* mask for pid */
-
-/* additional flags for EVFILT_PROC */
-#define	NOTE_TRACK	0x00000001		/* follow across forks */
-#define	NOTE_TRACKERR	0x00000002		/* could not track child */
-#define	NOTE_CHILD	0x00000004		/* am a child process */
-
-/*
- * data/hint flags for EVFILT_NETDEV, shared with userspace
- */
-#define NOTE_LINKUP	0x0001			/* link is up */
-#define NOTE_LINKDOWN	0x0002			/* link is down */
-#define NOTE_LINKINV	0x0004			/* link state is invalid */
-
-/*
- * This is currently visible to userland to work around broken
- * programs which pull in <sys/proc.h> or <sys/select.h>.
- */
-#include <sys/queue.h> 
-struct knote;
-
-#ifdef _KERNEL
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_KQUEUE);
-#endif
-
-#define KNOTE(list, hint)	if ((list) != NULL) knote(list, hint)
-
-/*
- * Flag indicating hint is a signal.  Used by EVFILT_SIGNAL, and also
- * shared by EVFILT_PROC  (all knotes attached to p->p_klist)
- */
-#define NOTE_SIGNAL	0x08000000
-
-struct filterops {
-	int	f_isfd;		/* true if ident == filedescriptor */
-	int	(*f_attach)(struct knote *kn);
-	void	(*f_detach)(struct knote *kn);
-	int	(*f_event)(struct knote *kn, long hint);
-};
-
-struct knote {
-	SLIST_ENTRY(knote)	kn_link;	/* for fd */
-	SLIST_ENTRY(knote)	kn_selnext;	/* for struct selinfo */
-	TAILQ_ENTRY(knote)	kn_tqe;
-	struct			kqueue *kn_kq;	/* which queue we are on */
-	struct 			kevent kn_kevent;
-	int			kn_status;
-	int			kn_sfflags;	/* saved filter flags */
-	intptr_t		kn_sdata;	/* saved data field */
-	union {
-		struct		file *p_fp;	/* file data pointer */
-		struct		proc *p_proc;	/* proc pointer */
-	} kn_ptr;
-	struct			filterops *kn_fop;
-	caddr_t			kn_hook;
-#define KN_ACTIVE	0x01			/* event has been triggered */
-#define KN_QUEUED	0x02			/* event is on queue */
-#define KN_DISABLED	0x04			/* event is disabled */
-#define KN_DETACHED	0x08			/* knote is detached */
-
-#define kn_id		kn_kevent.ident
-#define kn_filter	kn_kevent.filter
-#define kn_flags	kn_kevent.flags
-#define kn_fflags	kn_kevent.fflags
-#define kn_data		kn_kevent.data
-#define kn_fp		kn_ptr.p_fp
-};
-
-struct thread;
-struct proc;
-
-extern void	knote(struct klist *list, long hint);
-extern void	knote_remove(struct thread *p, struct klist *list);
-extern void	knote_fdclose(struct thread *p, int fd);
-extern int 	kqueue_register(struct kqueue *kq,
-		    struct kevent *kev, struct thread *p);
-extern int	kqueue_add_filteropts(int filt, struct filterops *filtops);
-extern int	kqueue_del_filteropts(int filt);
-
-#else 	/* !_KERNEL */
-
-#include <sys/cdefs.h>
-struct timespec;
-
-__BEGIN_DECLS
-int     kqueue(void);
-int     kevent(int kq, const struct kevent *changelist, int nchanges,
-	    struct kevent *eventlist, int nevents,
-	    const struct timespec *timeout);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_EVENT_H_ */
diff --git a/newlib/libc/sys/linux/sys/features.h b/newlib/libc/sys/linux/sys/features.h
deleted file mode 100644
index 34cd0eb..0000000
--- a/newlib/libc/sys/linux/sys/features.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _SYS_FEATURES_H
-#define _SYS_FEATURES_H
-
-#include <bits/posix_opt.h>
-
-/* We do not support asynchronous I/O.  */
-#undef _POSIX_ASYNCHRONOUS_IO
-#undef _POSIX_ASYNC_IO
-#undef _LFS_ASYNCHRONOUS_IO
-#undef _LFS64_ASYNCHRONOUS_IO
-
-/* POSIX message queues are supported.  */
-#undef	_POSIX_MESSAGE_PASSING
-#define	_POSIX_MESSAGE_PASSING 1
-
-#endif /* _SYS_FEATURES_H */
diff --git a/newlib/libc/sys/linux/sys/ioccom.h b/newlib/libc/sys/linux/sys/ioccom.h
deleted file mode 100644
index e656d5e..0000000
--- a/newlib/libc/sys/linux/sys/ioccom.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ioccom.h	8.2 (Berkeley) 3/28/94
- * $FreeBSD: src/sys/sys/ioccom.h,v 1.14 2002/04/10 04:53:37 imp Exp $
- */
-
-#ifndef	_SYS_IOCCOM_H_
-#define	_SYS_IOCCOM_H_
-
-/*
- * Ioctl's have the command encoded in the lower word, and the size of
- * any in or out parameters in the upper word.  The high 3 bits of the
- * upper word are used to encode the in/out status of the parameter.
- */
-#define	IOCPARM_MASK	0x1fff		/* parameter length, at most 13 bits */
-#define	IOCPARM_LEN(x)	(((x) >> 16) & IOCPARM_MASK)
-#define	IOCBASECMD(x)	((x) & ~(IOCPARM_MASK << 16))
-#define	IOCGROUP(x)	(((x) >> 8) & 0xff)
-
-#define	IOCPARM_MAX	PAGE_SIZE		/* max size of ioctl, mult. of PAGE_SIZE */
-#define	IOC_VOID	0x20000000	/* no parameters */
-#define	IOC_OUT		0x40000000	/* copy out parameters */
-#define	IOC_IN		0x80000000	/* copy in parameters */
-#define	IOC_INOUT	(IOC_IN|IOC_OUT)
-#define	IOC_DIRMASK	0xe0000000	/* mask for IN/OUT/VOID */
-
-#define	_IOC(inout,group,num,len) \
-	((unsigned long)(inout | ((len & IOCPARM_MASK) << 16) | ((group) << 8) | (num)))
-#define	_IO(g,n)	_IOC(IOC_VOID,	(g), (n), 0)
-#define	_IOR(g,n,t)	_IOC(IOC_OUT,	(g), (n), sizeof(t))
-#define	_IOW(g,n,t)	_IOC(IOC_IN,	(g), (n), sizeof(t))
-/* this should be _IORW, but stdio got there first */
-#define	_IOWR(g,n,t)	_IOC(IOC_INOUT,	(g), (n), sizeof(t))
-
-#ifndef _KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	ioctl(int __fd, int __request, ...);
-__END_DECLS
-
-#endif
-
-#endif /* !_SYS_IOCCOM_H_ */
diff --git a/newlib/libc/sys/linux/sys/libc-tsd.h b/newlib/libc/sys/linux/sys/libc-tsd.h
deleted file mode 100644
index 80bd1d3..0000000
--- a/newlib/libc/sys/linux/sys/libc-tsd.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* libc-internal interface for thread-specific data.  Stub version.
-   Copyright (C) 1998, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _BITS_LIBC_TSD_H
-#define _BITS_LIBC_TSD_H 1
-
-/* This file defines the following macros for accessing a small fixed
-   set of thread-specific `void *' data used only internally by libc.
-
-   __libc_tsd_define(CLASS, KEY)	-- Define or declare a `void *' datum
-   					   for KEY.  CLASS can be `static' for
-					   keys used in only one source file,
-					   empty for global definitions, or
-					   `extern' for global declarations.
-   __libc_tsd_get(KEY)			-- Return the `void *' datum for KEY.
-   __libc_tsd_set(KEY, VALUE)		-- Set the datum for KEY to VALUE.
-
-   The set of available KEY's will usually be provided as an enum,
-   and contains (at least):
-		_LIBC_TSD_KEY_MALLOC
-		_LIBC_TSD_KEY_DL_ERROR
-		_LIBC_TSD_KEY_RPC_VARS
-   All uses must be the literal _LIBC_TSD_* name in the __libc_tsd_* macros.
-   Some implementations may not provide any enum at all and instead
-   using string pasting in the macros.  */
-
-/* This is the generic/stub implementation for wholly single-threaded
-   systems.  We don't define an enum for the possible key values, because
-   the KEYs translate directly into variables by macro magic.  */
-
-#define __libc_tsd_define(CLASS, KEY)	CLASS void *__libc_tsd_##KEY##_data;
-#define __libc_tsd_get(KEY)		(__libc_tsd_##KEY##_data)
-#define __libc_tsd_set(KEY, VALUE)	(__libc_tsd_##KEY##_data = (VALUE))
-
-
-#endif	/* bits/libc-tsd.h */
diff --git a/newlib/libc/sys/linux/sys/link.h b/newlib/libc/sys/linux/sys/link.h
deleted file mode 100644
index 470b4d3..0000000
--- a/newlib/libc/sys/linux/sys/link.h
+++ /dev/null
@@ -1,4 +0,0 @@
-struct link_map_machine
-  {
-    /* empty by default */
-  };
diff --git a/newlib/libc/sys/linux/sys/linux_time.h b/newlib/libc/sys/linux/sys/linux_time.h
deleted file mode 100644
index e71f70b..0000000
--- a/newlib/libc/sys/linux/sys/linux_time.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef _LINUX_TIME_H
-#define _LINUX_TIME_H
-
-#include <asm/param.h>
-#include <sys/types.h>
-
-#ifndef _STRUCT_TIMESPEC
-#define _STRUCT_TIMESPEC
-struct timespec {
-	time_t	tv_sec;		/* seconds */
-	long	tv_nsec;	/* nanoseconds */
-};
-#endif /* _STRUCT_TIMESPEC */
-
-/*
- * Change timeval to jiffies, trying to avoid the
- * most obvious overflows..
- *
- * And some not so obvious.
- *
- * Note that we don't want to return MAX_LONG, because
- * for various timeout reasons we often end up having
- * to wait "jiffies+1" in order to guarantee that we wait
- * at _least_ "jiffies" - so "jiffies+1" had better still
- * be positive.
- */
-#define MAX_JIFFY_OFFSET ((~0UL >> 1)-1)
-
-static __inline__ unsigned long
-timespec_to_jiffies(struct timespec *value)
-{
-	unsigned long sec = value->tv_sec;
-	long nsec = value->tv_nsec;
-
-	if (sec >= (MAX_JIFFY_OFFSET / HZ))
-		return MAX_JIFFY_OFFSET;
-	nsec += 1000000000L / HZ - 1;
-	nsec /= 1000000000L / HZ;
-	return HZ * sec + nsec;
-}
-
-static __inline__ void
-jiffies_to_timespec(unsigned long jiffies, struct timespec *value)
-{
-	value->tv_nsec = (jiffies % HZ) * (1000000000L / HZ);
-	value->tv_sec = jiffies / HZ;
-}
- 
-#ifndef _STRUCT_TIMEVAL
-#define _STRUCT_TIMEVAL
-struct timeval {
-	time_t		tv_sec;		/* seconds */
-	suseconds_t	tv_usec;	/* microseconds */
-};
-#endif
-
-struct timezone {
-	int	tz_minuteswest;	/* minutes west of Greenwich */
-	int	tz_dsttime;	/* type of dst correction */
-};
-
-#define	ITIMER_REAL	0
-#define	ITIMER_VIRTUAL	1
-#define	ITIMER_PROF	2
-
-struct  itimerspec {
-        struct  timespec it_interval;    /* timer period */
-        struct  timespec it_value;       /* timer expiration */
-};
-
-struct	itimerval {
-	struct	timeval it_interval;	/* timer interval */
-	struct	timeval it_value;	/* current value */
-};
-
-#endif
diff --git a/newlib/libc/sys/linux/sys/lock.h b/newlib/libc/sys/linux/sys/lock.h
deleted file mode 100644
index d934031..0000000
--- a/newlib/libc/sys/linux/sys/lock.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef __SYS_LOCK_H__
-#define __SYS_LOCK_H__
-
-#include <features.h>
-
-#define  _LIBC  1
-#define  NOT_IN_libc 1
-
-#ifndef __USE_GNU
-#define __USE_GNU 1
-#endif
-
-#include <bits/libc-lock.h>
-
-typedef __libc_lock_t _LOCK_T;
-typedef __libc_lock_recursive_t _LOCK_RECURSIVE_T;
-
-#define __LOCK_INIT(class,lock) \
-  __libc_lock_define_initialized(class, lock)
-#define __LOCK_INIT_RECURSIVE(class, lock) \
-  __libc_lock_define_initialized_recursive(class, lock)
-
-#define __lock_init(__lock) __libc_lock_init(__lock)
-#define __lock_init_recursive(__lock) __libc_lock_init_recursive(__lock)
-#define __lock_acquire(__lock) __libc_lock_lock(__lock)
-#define __lock_acquire_recursive(__lock) __libc_lock_lock_recursive(__lock)
-#define __lock_release(__lock) __libc_lock_unlock(__lock)
-#define __lock_release_recursive(__lock) __libc_lock_unlock_recursive(__lock)
-#define __lock_try_acquire(__lock) __libc_lock_trylock(__lock)
-#define __lock_try_acquire_recursive(__lock) \
-	__libc_lock_trylock_recursive(__lock)
-#define __lock_close(__lock) __libc_lock_fini(__lock)
-#define __lock_close_recursive(__lock) __libc_lock_fini_recursive(__lock)
-
-#endif /* __SYS_LOCK_H__ */
diff --git a/newlib/libc/sys/linux/sys/param.h b/newlib/libc/sys/linux/sys/param.h
deleted file mode 100644
index de0b4f6..0000000
--- a/newlib/libc/sys/linux/sys/param.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD: src/sys/i386/include/param.h,v 1.62 2001/09/12 08:37:33 julian Exp $
- */
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value
- * for all data types (int, long, ...).   The result is unsigned int
- * and must be cast to any desired pointer type.
- */
-#ifndef _ALIGNBYTES
-#define _ALIGNBYTES	(sizeof(int) - 1)
-#endif
-#ifndef _ALIGN
-#define _ALIGN(p)	(((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES)
-#endif
-
-/* Macros for min/max.  */
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#define	MAX(a,b) (((a)>(b))?(a):(b))
-
-#include <machine/param.h>
-#include <sys/user.h>
diff --git a/newlib/libc/sys/linux/sys/resource.h b/newlib/libc/sys/linux/sys/resource.h
index f804731..660ec79 100644
--- a/newlib/libc/sys/linux/sys/resource.h
+++ b/newlib/libc/sys/linux/sys/resource.h
@@ -7,6 +7,6 @@
 #define _SYS_RESOURCE_H
 
 #include <sys/types.h>
-#include <bits/resource.h>
+#include <linux/resource.h>
 
 #endif
diff --git a/newlib/libc/sys/linux/sys/select.h b/newlib/libc/sys/linux/sys/select.h
deleted file mode 100644
index ddd2ac9..0000000
--- a/newlib/libc/sys/linux/sys/select.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _SYS_SELECT_H
-#define _SYS_SELECT_H	1
-
-#include <sys/types.h>
-#include <bits/sigset.h>
-#include <time.h>
-
-extern int select (int __nfds, fd_set *__restrict __readfds,
-		   fd_set *__restrict __writefds,
-		   fd_set *__restrict __exceptfds,
-		   struct timeval *__restrict __timeout) __THROW;
-
-#endif /* sys/select.h */
diff --git a/newlib/libc/sys/linux/sys/signal.h b/newlib/libc/sys/linux/sys/signal.h
index cef7058..f48956a 100644
--- a/newlib/libc/sys/linux/sys/signal.h
+++ b/newlib/libc/sys/linux/sys/signal.h
@@ -5,26 +5,9 @@
 
 #ifndef _SYS_SIGNAL_H
 #define _SYS_SIGNAL_H
-#define _SIGNAL_H
 
 #include <sys/types.h>
-#include <bits/sigset.h>
-#include <bits/signum.h>
-
-/* we want RT signals so we must override the definition of sigset_t
-   and NSIG */
-
-#undef NSIG
-#define NSIG _NSIG
-#undef sigset_t
-#define sigset_t __sigset_t
-
-typedef void (*_sig_func_ptr) (int);
-typedef _sig_func_ptr __sighandler_t;
-
-#include <bits/siginfo.h>
-#include <bits/sigaction.h>
-#include <bits/sigstack.h>
+#include <linux/signal.h>
 
 /* --- include/signal.h thinks it knows better :-( --- */
 
@@ -36,17 +19,16 @@ typedef _sig_func_ptr __sighandler_t;
 
 #include <_ansi.h>
 
-int 	_EXFUN(kill, (int, int));
-_VOID 	_EXFUN(psignal, (int, const char *));
-int 	_EXFUN(sigaction, (int, const struct sigaction *, struct sigaction *));
-int 	_EXFUN(sigaddset, (sigset_t *, const int));
-int 	_EXFUN(sigdelset, (sigset_t *, const int));
-int 	_EXFUN(sigismember, (const sigset_t *, int));
-int 	_EXFUN(sigfillset, (sigset_t *));
-int 	_EXFUN(sigemptyset, (sigset_t *));
-int 	_EXFUN(sigpending, (sigset_t *));
-int 	_EXFUN(sigsuspend, (const sigset_t *));
-int 	_EXFUN(sigpause, (int));
+int _EXFUN(kill, (int, int));
+int _EXFUN(sigaction, (int, const struct sigaction *, struct sigaction *));
+int _EXFUN(sigaddset, (sigset_t *, const int));
+int _EXFUN(sigdelset, (sigset_t *, const int));
+int _EXFUN(sigismember, (const sigset_t *, int));
+int _EXFUN(sigfillset, (sigset_t *));
+int _EXFUN(sigemptyset, (sigset_t *));
+int _EXFUN(sigpending, (sigset_t *));
+int _EXFUN(sigsuspend, (const sigset_t *));
+int _EXFUN(sigpause, (int));
 
 #ifndef _POSIX_SOURCE
 extern const char *const sys_siglist[];
diff --git a/newlib/libc/sys/linux/sys/socket.h b/newlib/libc/sys/linux/sys/socket.h
deleted file mode 100644
index b7a3dd1..0000000
--- a/newlib/libc/sys/linux/sys/socket.h
+++ /dev/null
@@ -1,471 +0,0 @@
-/*
- * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $FreeBSD: src/sys/sys/socket.h,v 1.60 2002/04/20 02:24:35 mike Exp $
- */
-
-#ifndef _SYS_SOCKET_H_
-#define	_SYS_SOCKET_H_
-
-#include <sys/types.h>
-#include <sys/_types.h>
-#include <netinet/in.h>
-#include <netdb.h>
-
-/* Needed by linuxthreads. */
-
-# define __SOCKADDR_ARG		struct sockaddr *__restrict
-# define __CONST_SOCKADDR_ARG	__const struct sockaddr *
-
-/*
- * Definitions related to sockets: types, address families, options.
- */
-
-/*
- * Data types.
- */
-#ifdef _BSD_SA_FAMILY_T_
-typedef	_BSD_SA_FAMILY_T_	sa_family_t;
-#undef _BSD_SA_FAMILY_T_
-#endif
-
-#ifdef	_BSD_SOCKLEN_T_
-typedef	_BSD_SOCKLEN_T_	socklen_t;
-#undef	_BSD_SOCKLEN_T_
-#endif
- 
-/*
- * Types
- */
-#define	SOCK_STREAM	1		/* stream socket */
-#define	SOCK_DGRAM	2		/* datagram socket */
-#define	SOCK_RAW	3		/* raw-protocol interface */
-#define	SOCK_RDM	4		/* reliably-delivered message */
-#define	SOCK_SEQPACKET	5		/* sequenced packet stream */
-
-/*
- * Option flags per-socket.
- */
-#define	SO_DEBUG	0x0001		/* turn on debugging info recording */
-#define	SO_ACCEPTCONN	0x0002		/* socket has had listen() */
-#define	SO_REUSEADDR	0x0004		/* allow local address reuse */
-#define	SO_KEEPALIVE	0x0008		/* keep connections alive */
-#define	SO_DONTROUTE	0x0010		/* just use interface addresses */
-#define	SO_BROADCAST	0x0020		/* permit sending of broadcast msgs */
-#define	SO_USELOOPBACK	0x0040		/* bypass hardware when possible */
-#define	SO_LINGER	0x0080		/* linger on close if data present */
-#define	SO_OOBINLINE	0x0100		/* leave received OOB data in line */
-#define	SO_REUSEPORT	0x0200		/* allow local address & port reuse */
-#define	SO_TIMESTAMP	0x0400		/* timestamp received dgram traffic */
-#define	SO_ACCEPTFILTER	0x1000		/* there is an accept filter */
-
-/*
- * Additional options, not kept in so_options.
- */
-#define SO_SNDBUF	0x1001		/* send buffer size */
-#define SO_RCVBUF	0x1002		/* receive buffer size */
-#define SO_SNDLOWAT	0x1003		/* send low-water mark */
-#define SO_RCVLOWAT	0x1004		/* receive low-water mark */
-#define SO_SNDTIMEO	0x1005		/* send timeout */
-#define SO_RCVTIMEO	0x1006		/* receive timeout */
-#define	SO_ERROR	0x1007		/* get error status and clear */
-#define	SO_TYPE		0x1008		/* get socket type */
-/*efine	SO_PRIVSTATE	0x1009		   get/deny privileged state */
-
-/*
- * Structure used for manipulating linger option.
- */
-struct linger {
-	int	l_onoff;		/* option on/off */
-	int	l_linger;		/* linger time */
-};
-
-struct accept_filter_arg {
-	char	af_name[16];
-	char	af_arg[256-16];
-};
-
-/*
- * Level number for (get/set)sockopt() to apply to socket itself.
- */
-#define	SOL_SOCKET	0xffff		/* options for socket level */
-
-/*
- * Address families.
- */
-#define	AF_UNSPEC	0		/* unspecified */
-#define	AF_LOCAL	1		/* local to host (pipes, portals) */
-#define	AF_UNIX		AF_LOCAL	/* backward compatibility */
-#define	AF_INET		2		/* internetwork: UDP, TCP, etc. */
-#define	AF_IMPLINK	3		/* arpanet imp addresses */
-#define	AF_PUP		4		/* pup protocols: e.g. BSP */
-#define	AF_CHAOS	5		/* mit CHAOS protocols */
-#define	AF_NS		6		/* XEROX NS protocols */
-#define	AF_ISO		7		/* ISO protocols */
-#define	AF_OSI		AF_ISO
-#define	AF_ECMA		8		/* European computer manufacturers */
-#define	AF_DATAKIT	9		/* datakit protocols */
-#define	AF_CCITT	10		/* CCITT protocols, X.25 etc */
-#define	AF_SNA		11		/* IBM SNA */
-#define AF_DECnet	12		/* DECnet */
-#define AF_DLI		13		/* DEC Direct data link interface */
-#define AF_LAT		14		/* LAT */
-#define	AF_HYLINK	15		/* NSC Hyperchannel */
-#define	AF_APPLETALK	16		/* Apple Talk */
-#define	AF_ROUTE	17		/* Internal Routing Protocol */
-#define	AF_LINK		18		/* Link layer interface */
-#define	pseudo_AF_XTP	19		/* eXpress Transfer Protocol (no AF) */
-#define	AF_COIP		20		/* connection-oriented IP, aka ST II */
-#define	AF_CNT		21		/* Computer Network Technology */
-#define pseudo_AF_RTIP	22		/* Help Identify RTIP packets */
-#define	AF_IPX		23		/* Novell Internet Protocol */
-#define	AF_SIP		24		/* Simple Internet Protocol */
-#define	pseudo_AF_PIP	25		/* Help Identify PIP packets */
-#define	AF_ISDN		26		/* Integrated Services Digital Network*/
-#define	AF_E164		AF_ISDN		/* CCITT E.164 recommendation */
-#define	pseudo_AF_KEY	27		/* Internal key-management function */
-#define	AF_INET6	28		/* IPv6 */
-#define	AF_NATM		29		/* native ATM access */
-#define	AF_ATM		30		/* ATM */
-#define pseudo_AF_HDRCMPLT 31		/* Used by BPF to not rewrite headers
-					 * in interface output routine
-					 */
-#define	AF_NETGRAPH	32		/* Netgraph sockets */
-#define	AF_SLOW		33		/* 802.3ad slow protocol */
-#define	AF_SCLUSTER	34		/* Sitara cluster protocol */
-#define	AF_MAX		35
-
-/*
- * Structure used by kernel to store most
- * addresses.
- */
-struct sockaddr {
-	sa_family_t	sa_family;	/* address family */
-	char		sa_data[14];	/* actually longer; address value */
-};
-#define	SOCK_MAXADDRLEN	255		/* longest possible addresses */
-
-/*
- * Structure used by kernel to pass protocol
- * information in raw sockets.
- */
-struct sockproto {
-	u_short	sp_family;		/* address family */
-	u_short	sp_protocol;		/* protocol */
-};
-
-/*
- * RFC 2553: protocol-independent placeholder for socket addresses
- */
-#define	_SS_MAXSIZE	128U
-#define	_SS_ALIGNSIZE	(sizeof(int64_t))
-#define	_SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(unsigned char) - sizeof(sa_family_t))
-#define	_SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(unsigned char) - sizeof(sa_family_t) - \
-				_SS_PAD1SIZE - _SS_ALIGNSIZE)
-
-struct sockaddr_storage {
-	unsigned char		ss_len;		/* address length */
-	sa_family_t	ss_family;	/* address family */
-	char		__ss_pad1[_SS_PAD1SIZE];
-	int64_t		__ss_align;	/* force desired structure storage alignment */
-	char		__ss_pad2[_SS_PAD2SIZE];
-};
-
-/*
- * Protocol families, same as address families for now.
- */
-#define	PF_UNSPEC	AF_UNSPEC
-#define	PF_LOCAL	AF_LOCAL
-#define	PF_UNIX		PF_LOCAL	/* backward compatibility */
-#define	PF_INET		AF_INET
-#define	PF_IMPLINK	AF_IMPLINK
-#define	PF_PUP		AF_PUP
-#define	PF_CHAOS	AF_CHAOS
-#define	PF_NS		AF_NS
-#define	PF_ISO		AF_ISO
-#define	PF_OSI		AF_ISO
-#define	PF_ECMA		AF_ECMA
-#define	PF_DATAKIT	AF_DATAKIT
-#define	PF_CCITT	AF_CCITT
-#define	PF_SNA		AF_SNA
-#define PF_DECnet	AF_DECnet
-#define PF_DLI		AF_DLI
-#define PF_LAT		AF_LAT
-#define	PF_HYLINK	AF_HYLINK
-#define	PF_APPLETALK	AF_APPLETALK
-#define	PF_ROUTE	AF_ROUTE
-#define	PF_LINK		AF_LINK
-#define	PF_XTP		pseudo_AF_XTP	/* really just proto family, no AF */
-#define	PF_COIP		AF_COIP
-#define	PF_CNT		AF_CNT
-#define	PF_SIP		AF_SIP
-#define	PF_IPX		AF_IPX		/* same format as AF_NS */
-#define PF_RTIP		pseudo_AF_RTIP	/* same format as AF_INET */
-#define PF_PIP		pseudo_AF_PIP
-#define	PF_ISDN		AF_ISDN
-#define	PF_KEY		pseudo_AF_KEY
-#define	PF_INET6	AF_INET6
-#define	PF_NATM		AF_NATM
-#define	PF_ATM		AF_ATM
-#define	PF_NETGRAPH	AF_NETGRAPH
-#define	PF_SLOW		AF_SLOW
-#define PF_SCLUSTER	AF_SCLUSTER
-
-#define	PF_MAX		AF_MAX
-
-/*
- * Definitions for network related sysctl, CTL_NET.
- *
- * Second level is protocol family.
- * Third level is protocol number.
- *
- * Further levels are defined by the individual families below.
- */
-#define NET_MAXID	AF_MAX
-
-#define CTL_NET_NAMES { \
-	{ 0, 0 }, \
-	{ "unix", CTLTYPE_NODE }, \
-	{ "inet", CTLTYPE_NODE }, \
-	{ "implink", CTLTYPE_NODE }, \
-	{ "pup", CTLTYPE_NODE }, \
-	{ "chaos", CTLTYPE_NODE }, \
-	{ "xerox_ns", CTLTYPE_NODE }, \
-	{ "iso", CTLTYPE_NODE }, \
-	{ "emca", CTLTYPE_NODE }, \
-	{ "datakit", CTLTYPE_NODE }, \
-	{ "ccitt", CTLTYPE_NODE }, \
-	{ "ibm_sna", CTLTYPE_NODE }, \
-	{ "decnet", CTLTYPE_NODE }, \
-	{ "dec_dli", CTLTYPE_NODE }, \
-	{ "lat", CTLTYPE_NODE }, \
-	{ "hylink", CTLTYPE_NODE }, \
-	{ "appletalk", CTLTYPE_NODE }, \
-	{ "route", CTLTYPE_NODE }, \
-	{ "link_layer", CTLTYPE_NODE }, \
-	{ "xtp", CTLTYPE_NODE }, \
-	{ "coip", CTLTYPE_NODE }, \
-	{ "cnt", CTLTYPE_NODE }, \
-	{ "rtip", CTLTYPE_NODE }, \
-	{ "ipx", CTLTYPE_NODE }, \
-	{ "sip", CTLTYPE_NODE }, \
-	{ "pip", CTLTYPE_NODE }, \
-	{ "isdn", CTLTYPE_NODE }, \
-	{ "key", CTLTYPE_NODE }, \
-	{ "inet6", CTLTYPE_NODE }, \
-	{ "natm", CTLTYPE_NODE }, \
-	{ "atm", CTLTYPE_NODE }, \
-	{ "hdrcomplete", CTLTYPE_NODE }, \
-	{ "netgraph", CTLTYPE_NODE }, \
-	{ "snp", CTLTYPE_NODE }, \
-	{ "scp", CTLTYPE_NODE }, \
-}
-
-/*
- * PF_ROUTE - Routing table
- *
- * Three additional levels are defined:
- *	Fourth: address family, 0 is wildcard
- *	Fifth: type of info, defined below
- *	Sixth: flag(s) to mask with for NET_RT_FLAGS
- */
-#define NET_RT_DUMP	1		/* dump; may limit to a.f. */
-#define NET_RT_FLAGS	2		/* by flags, e.g. RESOLVING */
-#define NET_RT_IFLIST	3		/* survey interface list */
-#define	NET_RT_MAXID	4
-
-#define CTL_NET_RT_NAMES { \
-	{ 0, 0 }, \
-	{ "dump", CTLTYPE_STRUCT }, \
-	{ "flags", CTLTYPE_STRUCT }, \
-	{ "iflist", CTLTYPE_STRUCT }, \
-}
-
-/*
- * Maximum queue length specifiable by listen.
- */
-#ifndef	SOMAXCONN
-#define	SOMAXCONN	128
-#endif
-
-/*
- * Message header for recvmsg and sendmsg calls.
- * Used value-result for recvmsg, value only for sendmsg.
- */
-struct msghdr {
-	void		*msg_name;		/* optional address */
-	socklen_t	 msg_namelen;		/* size of address */
-	struct iovec	*msg_iov;		/* scatter/gather array */
-	int		 msg_iovlen;		/* # elements in msg_iov */
-	void		*msg_control;		/* ancillary data, see below */
-	socklen_t	 msg_controllen;	/* ancillary data buffer len */
-	int		 msg_flags;		/* flags on received message */
-};
-
-#define	MSG_OOB		0x1		/* process out-of-band data */
-#define	MSG_PEEK	0x2		/* peek at incoming message */
-#define	MSG_DONTROUTE	0x4		/* send without using routing tables */
-#define	MSG_EOR		0x8		/* data completes record */
-#define	MSG_TRUNC	0x10		/* data discarded before delivery */
-#define	MSG_CTRUNC	0x20		/* control data lost before delivery */
-#define	MSG_WAITALL	0x40		/* wait for full request or error */
-#define	MSG_DONTWAIT	0x80		/* this message should be nonblocking */
-#define	MSG_EOF		0x100		/* data completes connection */
-#define MSG_COMPAT      0x8000		/* used in sendit() */
-
-/*
- * Header for ancillary data objects in msg_control buffer.
- * Used for additional information with/about a datagram
- * not expressible by flags.  The format is a sequence
- * of message elements headed by cmsghdr structures.
- */
-struct cmsghdr {
-	socklen_t	cmsg_len;		/* data byte count, including hdr */
-	int		cmsg_level;		/* originating protocol */
-	int		cmsg_type;		/* protocol-specific type */
-/* followed by	unsigned char  cmsg_data[]; */
-};
-
-/*
- * While we may have more groups than this, the cmsgcred struct must
- * be able to fit in an mbuf, and NGROUPS_MAX is too large to allow
- * this.
-*/
-#define CMGROUP_MAX 16
-
-/*
- * Credentials structure, used to verify the identity of a peer
- * process that has sent us a message. This is allocated by the
- * peer process but filled in by the kernel. This prevents the
- * peer from lying about its identity. (Note that cmcred_groups[0]
- * is the effective GID.)
- */
-struct cmsgcred {
-	pid_t	cmcred_pid;		/* PID of sending process */
-	uid_t	cmcred_uid;		/* real UID of sending process */
-	uid_t	cmcred_euid;		/* effective UID of sending process */
-	gid_t	cmcred_gid;		/* real GID of sending process */
-	short	cmcred_ngroups;		/* number or groups */
-	gid_t	cmcred_groups[CMGROUP_MAX];	/* groups */
-};
-
-/* given pointer to struct cmsghdr, return pointer to data */
-#define	CMSG_DATA(cmsg)		((unsigned char *)(cmsg) + \
-				 _ALIGN(sizeof(struct cmsghdr)))
-
-/* given pointer to struct cmsghdr, return pointer to next cmsghdr */
-#define	CMSG_NXTHDR(mhdr, cmsg)	\
-	(((caddr_t)(cmsg) + _ALIGN((cmsg)->cmsg_len) + \
-	  _ALIGN(sizeof(struct cmsghdr)) > \
-	    (caddr_t)(mhdr)->msg_control + (mhdr)->msg_controllen) ? \
-	    (struct cmsghdr *)NULL : \
-	    (struct cmsghdr *)((caddr_t)(cmsg) + _ALIGN((cmsg)->cmsg_len)))
-
-#define	CMSG_FIRSTHDR(mhdr)	((struct cmsghdr *)(mhdr)->msg_control)
-
-/* RFC 2292 additions */
-	
-#define	CMSG_SPACE(l)		(_ALIGN(sizeof(struct cmsghdr)) + _ALIGN(l))
-#define	CMSG_LEN(l)		(_ALIGN(sizeof(struct cmsghdr)) + (l))
-
-#ifdef _KERNEL
-#define	CMSG_ALIGN(n)	_ALIGN(n)
-#endif
-
-/* "Socket"-level control message types: */
-#define	SCM_RIGHTS	0x01		/* access rights (array of int) */
-#define	SCM_TIMESTAMP	0x02		/* timestamp (struct timeval) */
-#define	SCM_CREDS	0x03		/* process creds (struct cmsgcred) */
-
-/*
- * 4.3 compat sockaddr, move to compat file later
- */
-struct osockaddr {
-	u_short	sa_family;		/* address family */
-	char	sa_data[14];		/* up to 14 bytes of direct address */
-};
-
-/*
- * 4.3-compat message header (move to compat file later).
- */
-struct omsghdr {
-	caddr_t	msg_name;		/* optional address */
-	int	msg_namelen;		/* size of address */
-	struct	iovec *msg_iov;		/* scatter/gather array */
-	int	msg_iovlen;		/* # elements in msg_iov */
-	caddr_t	msg_accrights;		/* access rights sent/received */
-	int	msg_accrightslen;
-};
-
-/*
- * howto arguments for shutdown(2), specified by Posix.1g.
- */
-#define	SHUT_RD		0		/* shut down the reading side */
-#define	SHUT_WR		1		/* shut down the writing side */
-#define	SHUT_RDWR	2		/* shut down both sides */
-
-/*
- * sendfile(2) header/trailer struct
- */
-struct sf_hdtr {
-	struct iovec *headers;	/* pointer to an array of header struct iovec's */
-	int hdr_cnt;		/* number of header iovec's */
-	struct iovec *trailers;	/* pointer to an array of trailer struct iovec's */
-	int trl_cnt;		/* number of trailer iovec's */
-};
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	accept(int, struct sockaddr *, socklen_t *);
-int	bind(int, const struct sockaddr *, socklen_t);
-int	connect(int, const struct sockaddr *, socklen_t);
-int	getpeername(int, struct sockaddr *, socklen_t *);
-int	getsockname(int, struct sockaddr *, socklen_t *);
-int	getsockopt(int, int, int, void *, socklen_t *);
-int	listen(int, int);
-ssize_t	recv(int, void *, size_t, int);
-ssize_t	recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
-ssize_t	recvmsg(int, struct msghdr *, int);
-ssize_t	send(int, const void *, size_t, int);
-ssize_t	sendto(int, const void *,
-	    size_t, int, const struct sockaddr *, socklen_t);
-ssize_t	sendmsg(int, const struct msghdr *, int);
-int	sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int);
-int	setsockopt(int, int, int, const void *, socklen_t);
-int	shutdown(int, int);
-int	socket(int, int, int);
-int	socketpair(int, int, int, int *);
-__END_DECLS
-
-#endif /* !_SYS_SOCKET_H_ */
diff --git a/newlib/libc/sys/linux/sys/sockio.h b/newlib/libc/sys/linux/sys/sockio.h
deleted file mode 100644
index bdebfbe..0000000
--- a/newlib/libc/sys/linux/sys/sockio.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD: src/sys/sys/sockio.h,v 1.25 2002/02/10 16:55:35 rwatson Exp $
- */
-
-#ifndef _SYS_SOCKIO_H_
-#define	_SYS_SOCKIO_H_
-
-#include <sys/ioccom.h>
-
-/* Socket ioctl's. */
-#define	SIOCSHIWAT	 _IOW('s',  0, int)		/* set high watermark */
-#define	SIOCGHIWAT	 _IOR('s',  1, int)		/* get high watermark */
-#define	SIOCSLOWAT	 _IOW('s',  2, int)		/* set low watermark */
-#define	SIOCGLOWAT	 _IOR('s',  3, int)		/* get low watermark */
-#define	SIOCATMARK	 _IOR('s',  7, int)		/* at oob mark? */
-#define	SIOCSPGRP	 _IOW('s',  8, int)		/* set process group */
-#define	SIOCGPGRP	 _IOR('s',  9, int)		/* get process group */
-
-#define	SIOCADDRT	 _IOW('r', 10, struct ortentry)	/* add route */
-#define	SIOCDELRT	 _IOW('r', 11, struct ortentry)	/* delete route */
-#define	SIOCGETVIFCNT	_IOWR('r', 15, struct sioc_vif_req)/* get vif pkt cnt */
-#define	SIOCGETSGCNT	_IOWR('r', 16, struct sioc_sg_req) /* get s,g pkt cnt */
-
-#define	SIOCSIFADDR	 _IOW('i', 12, struct ifreq)	/* set ifnet address */
-#define	OSIOCGIFADDR	_IOWR('i', 13, struct ifreq)	/* get ifnet address */
-#define	SIOCGIFADDR	_IOWR('i', 33, struct ifreq)	/* get ifnet address */
-#define	SIOCSIFDSTADDR	 _IOW('i', 14, struct ifreq)	/* set p-p address */
-#define	OSIOCGIFDSTADDR	_IOWR('i', 15, struct ifreq)	/* get p-p address */
-#define	SIOCGIFDSTADDR	_IOWR('i', 34, struct ifreq)	/* get p-p address */
-#define	SIOCSIFFLAGS	 _IOW('i', 16, struct ifreq)	/* set ifnet flags */
-#define	SIOCGIFFLAGS	_IOWR('i', 17, struct ifreq)	/* get ifnet flags */
-#define	OSIOCGIFBRDADDR	_IOWR('i', 18, struct ifreq)	/* get broadcast addr */
-#define	SIOCGIFBRDADDR	_IOWR('i', 35, struct ifreq)	/* get broadcast addr */
-#define	SIOCSIFBRDADDR	 _IOW('i', 19, struct ifreq)	/* set broadcast addr */
-#define	OSIOCGIFCONF	_IOWR('i', 20, struct ifconf)	/* get ifnet list */
-#define	SIOCGIFCONF	_IOWR('i', 36, struct ifconf)	/* get ifnet list */
-#define	OSIOCGIFNETMASK	_IOWR('i', 21, struct ifreq)	/* get net addr mask */
-#define	SIOCGIFNETMASK	_IOWR('i', 37, struct ifreq)	/* get net addr mask */
-#define	SIOCSIFNETMASK	 _IOW('i', 22, struct ifreq)	/* set net addr mask */
-#define	SIOCGIFMETRIC	_IOWR('i', 23, struct ifreq)	/* get IF metric */
-#define	SIOCSIFMETRIC	 _IOW('i', 24, struct ifreq)	/* set IF metric */
-#define	SIOCDIFADDR	 _IOW('i', 25, struct ifreq)	/* delete IF addr */
-#define	SIOCAIFADDR	 _IOW('i', 26, struct ifaliasreq)/* add/chg IF alias */
-
-#define	SIOCALIFADDR	 _IOW('i', 27, struct if_laddrreq) /* add IF addr */
-#define	SIOCGLIFADDR	_IOWR('i', 28, struct if_laddrreq) /* get IF addr */
-#define	SIOCDLIFADDR	 _IOW('i', 29, struct if_laddrreq) /* delete IF addr */
-#define	SIOCSIFCAP	 _IOW('i', 30, struct ifreq)	/* set IF features */
-#define	SIOCGIFCAP	_IOWR('i', 31, struct ifreq)	/* get IF features */
-#define	SIOCGIFINDEX	_IOWR('i', 32, struct ifreq)	/* get IF index */
-#define	SIOCGIFMAC	_IOWR('i', 38, struct ifreq)	/* get IF MAC label */
-#define	SIOCSIFMAC	 _IOW('i', 39, struct ifreq)	/* set IF MAC label */
-
-#define	SIOCADDMULTI	 _IOW('i', 49, struct ifreq)	/* add m'cast addr */
-#define	SIOCDELMULTI	 _IOW('i', 50, struct ifreq)	/* del m'cast addr */
-#define	SIOCGIFMTU	_IOWR('i', 51, struct ifreq)	/* get IF mtu */
-#define	SIOCSIFMTU	 _IOW('i', 52, struct ifreq)	/* set IF mtu */
-#define	SIOCGIFPHYS	_IOWR('i', 53, struct ifreq)	/* get IF wire */
-#define	SIOCSIFPHYS	 _IOW('i', 54, struct ifreq)	/* set IF wire */
-#define	SIOCSIFMEDIA	_IOWR('i', 55, struct ifreq)	/* set net media */
-#define	SIOCGIFMEDIA	_IOWR('i', 56, struct ifmediareq) /* get net media */
-
-#define	SIOCSIFGENERIC	 _IOW('i', 57, struct ifreq)	/* generic IF set op */
-#define	SIOCGIFGENERIC	_IOWR('i', 58, struct ifreq)	/* generic IF get op */
-
-#define	SIOCGIFSTATUS	_IOWR('i', 59, struct ifstat)	/* get IF status */
-#define	SIOCSIFLLADDR	 _IOW('i', 60, struct ifreq)	/* set linklevel addr */
-
-#define	SIOCSIFPHYADDR	 _IOW('i', 70, struct ifaliasreq) /* set gif addres */
-#define	SIOCGIFPSRCADDR	_IOWR('i', 71, struct ifreq)	/* get gif psrc addr */
-#define	SIOCGIFPDSTADDR	_IOWR('i', 72, struct ifreq)	/* get gif pdst addr */
-#define	SIOCDIFPHYADDR	 _IOW('i', 73, struct ifreq)	/* delete gif addrs */
-#define	SIOCSLIFPHYADDR	 _IOW('i', 74, struct if_laddrreq) /* set gif addrs */
-#define	SIOCGLIFPHYADDR	_IOWR('i', 75, struct if_laddrreq) /* get gif addrs */
-
-#define	SIOCGPRIVATE_0	_IOWR('i', 80, struct ifreq)	/* device private 0 */
-#define	SIOCGPRIVATE_1	_IOWR('i', 81, struct ifreq)	/* device private 1 */
-
-#define	SIOCIFCREATE	_IOWR('i', 122, struct ifreq)	/* create clone if */
-#define	SIOCIFDESTROY	 _IOW('i', 121, struct ifreq)	/* destroy clone if */
-#define	SIOCIFGCLONERS	_IOWR('i', 120, struct if_clonereq) /* get cloners */
-
-#endif /* !_SYS_SOCKIO_H_ */
diff --git a/newlib/libc/sys/linux/sys/stat.h b/newlib/libc/sys/linux/sys/stat.h
index 99da598..bac6a11 100644
--- a/newlib/libc/sys/linux/sys/stat.h
+++ b/newlib/libc/sys/linux/sys/stat.h
@@ -7,15 +7,14 @@
 #define _SYS_STAT_H
 
 #include <asm/stat.h>
-#include <_ansi.h>
-#include <sys/types.h>
-#include <linux/time.h>
 #define __KERNEL__
 #include <linux/stat.h>
 #undef __KERNEL__
 
 /* --- redundant stuff below --- */
 
+#include <_ansi.h>
+#include <sys/types.h>
 
 int     _EXFUN(fstat,( int __fd, struct stat *__sbuf ));
 int     _EXFUN(mkdir,( const char *_path, mode_t __mode ));
@@ -24,10 +23,7 @@ int     _EXFUN(stat,( const char *__path, struct stat *__sbuf ));
 mode_t  _EXFUN(umask,( mode_t __mask ));
 
 #ifndef _POSIX_SOURCE
-int     _EXFUN(fstat64,( int __fd, struct stat64 *__sbuf ));
-int	_EXFUN(lstat,( const char *file_name, struct stat64 *buf));
-int	_EXFUN(lstat64,( const char *file_name, struct stat64 *buf));
-int     _EXFUN(stat64,( const char *__path, struct stat64 *__sbuf ));
+int	_EXFUN(lstat,( const char *file_name, struct stat *buf));
 #endif /* _POSIX_SOURCE */
 
 #endif /* _SYS_STAT_H */
diff --git a/newlib/libc/sys/linux/sys/stdio.h b/newlib/libc/sys/linux/sys/stdio.h
deleted file mode 100644
index a993081..0000000
--- a/newlib/libc/sys/linux/sys/stdio.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _NEWLIB_STDIO_H
-#define _NEWLIB_STDIO_H
-
-/* Internal locking macros, used to protect stdio functions.  In the
-   linux case, expand to flockfile, and funlockfile, both defined in
-   LinuxThreads. */
-#if !defined(__SINGLE_THREAD__)
-#  if !defined(_flockfile)
-#    define _flockfile(fp) flockfile(fp)
-#  endif
-#  if !defined(_funlockfile)
-#    define _funlockfile(fp) funlockfile(fp)
-#  endif
-#endif /* __SINGLE_THREAD__ */
-
-#define getline __getline
-#define getdelim __getdelim
-
-char *	_EXFUN(ctermid, (char *));
-
-#endif /* _NEWLIB_STDIO_H */
diff --git a/newlib/libc/sys/linux/sys/string.h b/newlib/libc/sys/linux/sys/string.h
deleted file mode 100644
index 25489ca..0000000
--- a/newlib/libc/sys/linux/sys/string.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _SYS_STRING_H
-#define _SYS_STRING_H
-
-#ifndef __STRICT_ANSI__
-char    *_EXFUN(strsignal, (int __signo));
-#endif
-
-#endif /* _SYS_STRING_H */
diff --git a/newlib/libc/sys/linux/sys/syscall.h b/newlib/libc/sys/linux/sys/syscall.h
new file mode 100644
index 0000000..a123082
--- /dev/null
+++ b/newlib/libc/sys/linux/sys/syscall.h
@@ -0,0 +1,88 @@
+/* libc/sys/linux/syscall.h - Linux system calls, common definitions */
+
+/* Written 2000 by Werner Almesberger */
+
+
+#ifndef SYSCALL_H
+
+#include <sys/errno.h>
+#include <asm/unistd.h>
+
+
+/*
+ * Note: several system calls are for SysV or BSD compatibility, or are
+ * specific Linuxisms. Most of those system calls are not implemented in
+ * this library.
+ */
+
+
+#if defined(__PIC__) && defined(__i386__)
+
+/*
+ * PIC uses %ebx, so we need to save it during system calls
+ */
+
+#undef _syscall1
+#define _syscall1(type,name,type1,arg1) \
+type name(type1 arg1) \
+{ \
+long __res; \
+__asm__ volatile ("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
+	: "=a" (__res) \
+	: "0" (__NR_##name),"r" ((long)(arg1))); \
+__syscall_return(type,__res); \
+}
+
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+type name(type1 arg1,type2 arg2) \
+{ \
+long __res; \
+__asm__ volatile ("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
+	: "=a" (__res) \
+	: "0" (__NR_##name),"r" ((long)(arg1)),"c" ((long)(arg2))); \
+__syscall_return(type,__res); \
+}
+
+#undef _syscall3
+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
+type name(type1 arg1,type2 arg2,type3 arg3) \
+{ \
+long __res; \
+__asm__ volatile ("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
+	: "=a" (__res) \
+	: "0" (__NR_##name),"r" ((long)(arg1)),"c" ((long)(arg2)), \
+		"d" ((long)(arg3))); \
+__syscall_return(type,__res); \
+}
+
+#undef _syscall4
+#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
+type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
+{ \
+long __res; \
+__asm__ volatile ("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
+	: "=a" (__res) \
+	: "0" (__NR_##name),"r" ((long)(arg1)),"c" ((long)(arg2)), \
+	  "d" ((long)(arg3)),"S" ((long)(arg4))); \
+__syscall_return(type,__res); \
+}
+
+#undef _syscall5
+#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
+          type5,arg5) \
+type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
+{ \
+long __res; \
+__asm__ volatile ("push %%ebx; movl %2,%%ebx; int $0x80; pop %%ebx" \
+	: "=a" (__res) \
+	: "0" (__NR_##name),"m" ((long)(arg1)),"c" ((long)(arg2)), \
+	  "d" ((long)(arg3)),"S" ((long)(arg4)),"D" ((long)(arg5))); \
+__syscall_return(type,__res); \
+}
+
+#undef _syscall6
+
+#endif /* __PIC__ && __i386__ */
+
+#endif /* SYSCALL_H */
diff --git a/newlib/libc/sys/linux/sys/termios.h b/newlib/libc/sys/linux/sys/termios.h
index ae053b5..bde51ab 100644
--- a/newlib/libc/sys/linux/sys/termios.h
+++ b/newlib/libc/sys/linux/sys/termios.h
@@ -7,7 +7,6 @@
 #define _SYS_TERMIOS_H
 
 #include <linux/termios.h>
-#include <machine/termios.h>
 
 /* grr, this shouldn't have to be here */
 
diff --git a/newlib/libc/sys/linux/sys/time.h b/newlib/libc/sys/linux/sys/time.h
index f2c656e..a9618d7 100644
--- a/newlib/libc/sys/linux/sys/time.h
+++ b/newlib/libc/sys/linux/sys/time.h
@@ -2,92 +2,20 @@
 
 /* Written 2000 by Werner Almesberger */
 
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $FreeBSD: src/sys/sys/time.h,v 1.56 2002/05/05 04:33:09 bde Exp $
- */
 
 #ifndef _SYS_TIME_H
 #define _SYS_TIME_H
 
 #include <sys/types.h>
-#include <sys/linux_time.h>
+#include <linux/time.h>
 
-/* Macros for converting between `struct timeval' and `struct timespec'.  */
-# define TIMEVAL_TO_TIMESPEC(tv, ts) {                                   \
-        (ts)->tv_sec = (tv)->tv_sec;                                    \
-        (ts)->tv_nsec = (tv)->tv_usec * 1000;                           \
-}
-# define TIMESPEC_TO_TIMEVAL(tv, ts) {                                   \
-        (tv)->tv_sec = (ts)->tv_sec;                                    \
-        (tv)->tv_usec = (ts)->tv_nsec / 1000;                           \
-}
-
-/* Convenience macros for operations on timevals.
-   NOTE: `timercmp' does not work for >= or <=.  */
-# define timerisset(tvp)	((tvp)->tv_sec || (tvp)->tv_usec)
-# define timerclear(tvp)	((tvp)->tv_sec = (tvp)->tv_usec = 0)
-# define timercmp(a, b, CMP) 						      \
-  (((a)->tv_sec == (b)->tv_sec) ? 					      \
-   ((a)->tv_usec CMP (b)->tv_usec) : 					      \
-   ((a)->tv_sec CMP (b)->tv_sec))
-# define timeradd(a, b, result)						      \
-  do {									      \
-    (result)->tv_sec = (a)->tv_sec + (b)->tv_sec;			      \
-    (result)->tv_usec = (a)->tv_usec + (b)->tv_usec;			      \
-    if ((result)->tv_usec >= 1000000)					      \
-      {									      \
-	++(result)->tv_sec;						      \
-	(result)->tv_usec -= 1000000;					      \
-      }									      \
-  } while (0)
-# define timersub(a, b, result)						      \
-  do {									      \
-    (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;			      \
-    (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;			      \
-    if ((result)->tv_usec < 0) {					      \
-      --(result)->tv_sec;						      \
-      (result)->tv_usec += 1000000;					      \
-    }									      \
-  } while (0)
 /* --- redundant stuff below --- */
 
 #include <_ansi.h>
 
 int _EXFUN(gettimeofday, (struct timeval *__p, struct timezone *__z));
 int _EXFUN(settimeofday, (const struct timeval *, const struct timezone *));
-int _EXFUN(utimes, (const char *__path, const struct timeval __tvp[2]));
+int _EXFUN(utimes, (const char *__path, struct timeval *__tvp));
 int _EXFUN(getitimer, (int __which, struct itimerval *__value));
 int _EXFUN(setitimer, (int __which, const struct itimerval *__value,
                                         struct itimerval *__ovalue));
diff --git a/newlib/libc/sys/linux/sys/types.h b/newlib/libc/sys/linux/sys/types.h
index ba191f0..625de3c 100644
--- a/newlib/libc/sys/linux/sys/types.h
+++ b/newlib/libc/sys/linux/sys/types.h
@@ -2,46 +2,6 @@
 
 /* Written 2000 by Werner Almesberger */
 
-/*-
- * Copyright (c) 1982, 1986, 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)types.h	8.6 (Berkeley) 2/19/95
- * $FreeBSD: src/sys/sys/types.h,v 1.60 2002/04/10 15:58:13 mike Exp $
- */
 
 #ifndef _SYS_TYPES_H
 #define _SYS_TYPES_H
@@ -50,179 +10,20 @@
  * libc/include/sys/types.h.  Repeat those here and
  * skip the kernel's definitions. */
 
-#include <sys/config.h>
-#include <features.h>
 #include <machine/types.h>
-#include <sys/_types.h>
 
-#if !defined(__time_t_defined) && !defined(_TIME_T)
+#ifndef __time_t_defined
 #define _TIME_T
 #define __time_t_defined
 typedef _TIME_T_ time_t;
 #endif
 
-#if !defined(__clock_t_defined) && !defined(_CLOCK_T)
+#ifndef __clock_t_defined
 #define _CLOCK_T
 #define __clock_t_defined
 typedef _CLOCK_T_ clock_t;
 #endif
 
-#ifndef _SSIZE_T
-#define _SSIZE_T
-typedef _ssize_t ssize_t;
-#endif
-
-#ifndef __u_char_defined
-#ifdef __GNUC__
-__extension__ typedef long long quad_t;
-__extension__ typedef unsigned long long u_quad_t;
-#else
-typedef struct
-  {
-    long int __val[2];
-  } quad_t;
-typedef struct
-  {
-    unsigned long __val[2];
-  } u_quad_t;
-#endif
-typedef struct
-  {
-    int __val[2];
-  } fsid_t;
-#define __u_char_defined
-#endif
-
-typedef int clockid_t;
-
-#  define _SYS_TYPES_FD_SET
-#  define	NBBY	8		/* number of bits in a byte */
-/*
- * Select uses bit masks of file descriptors in longs.
- * These macros manipulate such bit fields (the filesystem macros use chars).
- * FD_SETSIZE may be defined by the user, but the default here
- * should be >= NOFILE (param.h).
- */
-#  ifndef	FD_SETSIZE
-#	define	FD_SETSIZE	64
-#  endif
-
-typedef	long	fd_mask;
-#  define	NFDBITS	(sizeof (fd_mask) * NBBY)	/* bits per mask */
-#  ifndef	howmany
-#	define	howmany(x,y)	(((x)+((y)-1))/(y))
-#  endif
-
-typedef struct {
-        unsigned long fds_bits [(1024/(8 * sizeof(unsigned long)))];
-} __fd_set;
-
-#  define	FD_SET(n, p)	((p)->fds_bits[(n)/NFDBITS] |= (1L << ((n) % NFDBITS)))
-#  define	FD_CLR(n, p)	((p)->fds_bits[(n)/NFDBITS] &= ~(1L << ((n) % NFDBITS)))
-#  define	FD_ISSET(n, p)	((p)->fds_bits[(n)/NFDBITS] & (1L << ((n) % NFDBITS)))
-#  define	FD_ZERO(p)	(__extension__ (void)({ \
-     size_t __i; \
-     char *__tmp = (char *)p; \
-     for (__i = 0; __i < sizeof (*(p)); ++__i) \
-       *__tmp++ = 0; \
-}))
-
 #include <linux/types.h>
-#include <bits/types.h>
-#define __mode_t_defined
-#define __gid_t_defined
-#define __uid_t_defined
-#define __pid_t_defined
-#define __ssize_t_defined
-#define __key_t_defined
-#define __off_t_defined
-#define __off64_t_defined
-
-typedef __ino_t ino_t;
-typedef __ino64_t ino64_t;
-typedef __uint32_t uintptr_t;
-typedef __int32_t intptr_t;
-typedef __off64_t off64_t;
-typedef __off_t off_t;
-typedef __loff_t loff_t;
-typedef __mode_t mode_t;
-typedef __pid_t pid_t;
-typedef __uid_t uid_t;
-typedef __gid_t gid_t;
-typedef __key_t key_t;
-typedef __suseconds_t suseconds_t;
-typedef __useconds_t useconds_t;
-typedef __daddr_t daddr_t;
-typedef __caddr_t caddr_t;
-typedef __dev_t dev_t;
-typedef __fd_set fd_set;
-typedef __nlink_t nlink_t;
-
-typedef __u_char u_char;
-typedef __u_short u_short;
-typedef __u_int u_int;
-typedef __u_long u_long;
-typedef __uint8_t u_int8_t;
-typedef __uint16_t u_int16_t;
-typedef __uint32_t u_int32_t;
-typedef __uint64_t u_int64_t;
-typedef __int8_t int8_t;
-typedef __int16_t int16_t;
-typedef __int32_t int32_t;
-typedef __int64_t int64_t;
-
-#ifndef _UINT8_T_DECLARED
-typedef __uint8_t               uint8_t; 
-#define _UINT8_T_DECLARED
-#endif
-
-#ifndef _UINT16_T_DECLARED
-typedef __uint16_t              uint16_t; 
-#define _UINT16_T_DECLARED
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef __uint32_t              uint32_t; 
-#define _UINT32_T_DECLARED
-#endif
-
-#ifndef _UINT64_T_DECLARED
-typedef __uint64_t              uint64_t; 
-#define _UINT64_T_DECLARED
-#endif
-
-typedef __uint64_t		u64;
-
-#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-typedef	struct _physadr {
-	int	r[1];
-} *physadr;
-
-typedef	struct label_t {
-	int	val[6];
-} label_t;
-#endif
-
-typedef	unsigned int	vm_offset_t;
-typedef	__int64_t	vm_ooffset_t;
-typedef	unsigned int	vm_pindex_t;
-typedef	unsigned int	vm_size_t;
-
-typedef	__int32_t	register_t;
-typedef	__uint32_t	u_register_t;
-
-#ifdef _KERNEL
-typedef	int		intfptr_t;
-typedef	unsigned int	uintfptr_t;
-#endif
-
-/* Critical section value */
-typedef	register_t	critical_t;
-
-/* Interrupt mask (spl, xxx_imask, etc) */
-typedef	__uint32_t	intrmask_t;
-
-/* Interrupt handler function type. */
-typedef	void		ointhand2_t(int _device_id);
 
 #endif
diff --git a/newlib/libc/sys/linux/sys/unistd.h b/newlib/libc/sys/linux/sys/unistd.h
deleted file mode 100644
index 502fb47..0000000
--- a/newlib/libc/sys/linux/sys/unistd.h
+++ /dev/null
@@ -1,147 +0,0 @@
-#ifndef _UNISTD_H
-#define _UNISTD_H
-
-#include <features.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/_types.h>
-#define __need_size_t
-#define __need_ptrdiff_t
-#include <stddef.h>
-
-extern char **environ;
-
-void	_EXFUN(_exit, (int __status ) _ATTRIBUTE ((noreturn)));
-
-int	_EXFUN(access,(const char *__path, int __amode ));
-unsigned  _EXFUN(alarm, (unsigned __secs ));
-int     _EXFUN(chdir, (const char *__path ));
-int     _EXFUN(chmod, (const char *__path, mode_t __mode ));
-int     _EXFUN(chown, (const char *__path, uid_t __owner, gid_t __group ));
-int     _EXFUN(chroot, (const char *__path ));
-int     _EXFUN(close, (int __fildes ));
-char    _EXFUN(*ctermid, (char *__s ));
-char    _EXFUN(*cuserid, (char *__s ));
-int     _EXFUN(dup, (int __fildes ));
-int     _EXFUN(dup2, (int __fildes, int __fildes2 ));
-int     _EXFUN(execl, (const char *__path, const char *, ... ));
-int     _EXFUN(execle, (const char *__path, const char *, ... ));
-int     _EXFUN(execlp, (const char *__file, const char *, ... ));
-int     _EXFUN(execv, (const char *__path, char * const __argv[] ));
-int     _EXFUN(execve, (const char *__path, char * const __argv[], char * const __envp[] ));
-int     _EXFUN(execvp, (const char *__file, char * const __argv[] ));
-int     _EXFUN(fchdir, (int __fildes));
-int     _EXFUN(fchmod, (int __fildes, mode_t __mode ));
-int     _EXFUN(fchown, (int __fildes, uid_t __owner, gid_t __group ));
-pid_t   _EXFUN(fork, (void ));
-long    _EXFUN(fpathconf, (int __fd, int __name ));
-int     _EXFUN(fsync, (int __fd));
-int     _EXFUN(ftruncate, (int __fd, off_t __length));
-char    _EXFUN(*getcwd, (char *__buf, size_t __size ));
-int	_EXFUN(getdomainname ,(char *__name, size_t __len));
-gid_t   _EXFUN(getegid, (void ));
-uid_t   _EXFUN(geteuid, (void ));
-gid_t   _EXFUN(getgid, (void ));
-int     _EXFUN(getgroups, (int __gidsetsize, gid_t __grouplist[] ));
-char    _EXFUN(*getlogin, (void ));
-#if defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-int _EXFUN(getlogin_r, (char *name, size_t namesize) );
-#endif
-char 	_EXFUN(*getpass, (__const char *__prompt));
-size_t  _EXFUN(getpagesize, (void));
-pid_t   _EXFUN(getpgid, (pid_t));
-pid_t   _EXFUN(getpgrp, (void ));
-pid_t   _EXFUN(getpid, (void ));
-pid_t   _EXFUN(getppid, (void ));
-uid_t   _EXFUN(getuid, (void ));
-char *	_EXFUN(getusershell, (void));
-char    _EXFUN(*getwd, (char *__buf ));
-int     _EXFUN(isatty, (int __fildes ));
-int     _EXFUN(lchown, (const char *__path, uid_t __owner, gid_t __group ));
-int     _EXFUN(link, (const char *__path1, const char *__path2 ));
-int	_EXFUN(nice, (int __nice_value ));
-off_t   _EXFUN(lseek, (int __fildes, off_t __offset, int __whence ));
-long    _EXFUN(pathconf, (const char *__path, int __name ));
-int     _EXFUN(pause, (void ));
-int     _EXFUN(pipe, (int __fildes[2] ));
-ssize_t _EXFUN(pread, (int __fd, void *__buf, size_t __nbytes, off_t __offset));
-ssize_t _EXFUN(pwrite, (int __fd, const void *__buf, size_t __nbytes, off_t __offset));
-_READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte ));
-int     _EXFUN(readlink, (const char *path, char *buf, size_t bufsiz));
-int     _EXFUN(rmdir, (const char *__path ));
-void *  _EXFUN(sbrk,  (ptrdiff_t __incr));
-int     _EXFUN(setegid, (gid_t __gid ));
-int     _EXFUN(seteuid, (uid_t __uid ));
-int     _EXFUN(setgid, (gid_t __gid ));
-int     _EXFUN(setpgid, (pid_t __pid, pid_t __pgid ));
-int     _EXFUN(setpgrp, (void ));
-pid_t   _EXFUN(setsid, (void ));
-int     _EXFUN(setuid, (uid_t __uid ));
-unsigned _EXFUN(sleep, (unsigned int __seconds ));
-void    _EXFUN(swab, (const void *, void *, ssize_t));
-int     _EXFUN(symlink, (const char *oldpath, const char *newpath));
-long    _EXFUN(sysconf, (int __name ));
-pid_t   _EXFUN(tcgetpgrp, (int __fildes ));
-int     _EXFUN(tcsetpgrp, (int __fildes, pid_t __pgrp_id ));
-int     _EXFUN(truncate, (const char *, off_t __length));
-char *  _EXFUN(ttyname, (int __fildes ));
-int     _EXFUN(ttyname_r, (int __fildes, char *__buf, size_t __len));
-int     _EXFUN(unlink, (const char *__path ));
-int     _EXFUN(usleep, (__useconds_t __useconds));
-int     _EXFUN(vhangup, (void ));
-_READ_WRITE_RETURN_TYPE _EXFUN(write, (int __fd, const void *__buf, size_t __nbyte ));
-
-extern char *optarg;			/* getopt(3) external variables */
-extern int optind, opterr, optopt;
-int	 getopt(int, char * const [], const char *);
-extern int optreset;			/* getopt(3) external variable */
-
-#ifndef        _POSIX_SOURCE
-pid_t   _EXFUN(vfork, (void ));
-
-extern char *suboptarg;			/* getsubopt(3) external variable */
-int	 getsubopt(char **, char * const *, char **);
-#endif /* _POSIX_SOURCE */
-
-/* Provide prototypes for most of the _<systemcall> names that are
-   provided in newlib for some compilers.  */
-int     _EXFUN(_close, (int __fildes ));
-pid_t   _EXFUN(_fork, (void ));
-pid_t   _EXFUN(_getpid, (void ));
-int     _EXFUN(_link, (const char *__path1, const char *__path2 ));
-off_t   _EXFUN(_lseek, (int __fildes, off_t __offset, int __whence ));
-_READ_WRITE_RETURN_TYPE _EXFUN(_read, (int __fd, void *__buf, size_t __nbyte ));
-void *  _EXFUN(_sbrk,  (size_t __incr));
-int     _EXFUN(_unlink, (const char *__path ));
-_READ_WRITE_RETURN_TYPE _EXFUN(_write, (int __fd, const void *__buf, size_t __nbyte ));
-int     _EXFUN(_execve, (const char *__path, char * const __argv[], char * const __envp[] ));
-
-#define	F_OK	0
-#define	R_OK	4
-#define	W_OK	2
-#define	X_OK	1
-
-# define	SEEK_SET	0
-# define	SEEK_CUR	1
-# define	SEEK_END	2
-
-#include <sys/features.h>
-
-#define STDIN_FILENO    0       /* standard input file descriptor */
-#define STDOUT_FILENO   1       /* standard output file descriptor */
-#define STDERR_FILENO   2       /* standard error file descriptor */
-
-#include <bits/environments.h>
-#include <bits/confname.h>
-
-# define        MAXPATHLEN      1024
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _SYS_UNISTD_H */
diff --git a/newlib/libc/sys/linux/sys/utime.h b/newlib/libc/sys/linux/sys/utime.h
deleted file mode 100644
index 7499cfe..0000000
--- a/newlib/libc/sys/linux/sys/utime.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef	_SYS_UTIME_H
-#define	_SYS_UTIME_H	1
-
-#include <sys/types.h>
-
-struct utimbuf
-  {
-    time_t actime;		/* Access time.  */
-    time_t modtime;		/* Modification time.  */
-  };
-
-int _EXFUN(utime, (const char *__file, const struct utimbuf *__times));
-
-#endif /* _SYS_UTIME_H */
diff --git a/newlib/libc/sys/linux/sysconf.c b/newlib/libc/sys/linux/sysconf.c
deleted file mode 100644
index 037ae54..0000000
--- a/newlib/libc/sys/linux/sysconf.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/* libc/sys/linux/sysconf.c - The sysconf function */
-
-/* Copyright 2002, Red Hat Inc. */
-
-
-#include <unistd.h>
-#include <limits.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/types.h>
-
-long int 
-sysconf (int name)
-{
-  switch (name)
-    {
-    case _SC_AIO_LISTIO_MAX:
-#ifdef AIO_LISTIO_MAX
-      return AIO_LISTIO_MAX;
-#else
-      return -1;
-#endif
-
-    case _SC_AIO_MAX:
-#ifdef AIO_MAX
-      return AIO_MAX;
-#else
-      return -1;
-#endif
-
-    case _SC_AIO_PRIO_DELTA_MAX:
-#ifdef AIO_PRIO_DELTA_MAX
-      return AIO_PRIO_DELTA_MAX;
-#else
-      return -1;
-#endif
-
-    case _SC_ARG_MAX:
-#ifdef ARG_MAX
-      return ARG_MAX;
-#else
-      return -1;
-#endif
-    
-    case _SC_CHILD_MAX:
-#ifdef CHILD_MAX
-      return CHILD_MAX;
-#else
-      return -1;
-#endif
-
-    case _SC_CLK_TCK:
-      return CLK_TCK;
-
-    case _SC_DELAYTIMER_MAX:
-#ifdef DELAYTIMER_MAX
-      return DELAYTIMER_MAX;
-#else
-      return -1;
-#endif
-
-    case _SC_GETGR_R_SIZE_MAX:
-#ifdef _GETGR_R_SIZE_MAX
-      return _GETGR_R_SIZE_MAX;
-#else
-      return -1;
-#endif
-
-    case _SC_GETPW_R_SIZE_MAX:
-#ifdef _GETPW_R_SIZE_MAX
-      return _GETPW_R_SIZE_MAX;
-#else
-      return -1;
-#endif
-
-    case _SC_LOGIN_NAME_MAX:
-#ifdef LOGIN_NAME_MAX
-      return LOGIN_NAME_MAX;
-#else
-      return -1;
-#endif
-   
-    case _SC_MQ_OPEN_MAX:
-#ifdef MQ_OPEN_MAX
-      return MQ_OPEN_MAX;
-#else
-      return -1;
-#endif
-   
-    case _SC_MQ_PRIO_MAX:
-#ifdef MQ_PRIO_MAX
-      return MQ_PRIO_MAX;
-#else
-      return -1;
-#endif
-   
-    case _SC_NGROUPS_MAX:
-#ifdef NGROUPS_MAX
-      return NGROUPS_MAX;
-#else
-      return -1;
-#endif
-  
-    case _SC_OPEN_MAX:
-#ifdef OPEN_MAX
-      return OPEN_MAX;
-#else
-      return -1;
-#endif
-  
-    case _SC_PAGESIZE:
-#ifdef PAGESIZE
-      return PAGESIZE;
-#else
-      return -1;
-#endif
-  
-    case _SC_RTSIG_MAX:
-#ifdef RTSIG_MAX
-      return RTSIG_MAX;
-#else
-      return -1;
-#endif
-  
-    case _SC_SEM_NSEMS_MAX:
-#ifdef SEM_NSEMS_MAX
-      return SEM_NSEMS_MAX;
-#else
-      return -1;
-#endif
-  
-    case _SC_SEM_VALUE_MAX:
-#ifdef SEM_VALUE_MAX
-      return SEM_VALUE_MAX;
-#else
-      return -1;
-#endif
-  
-    case _SC_SIGQUEUE_MAX:
-#ifdef SIGQUEUE_MAX
-      return SIGQUEUE_MAX;
-#else
-      return -1;
-#endif
-  
-    case _SC_STREAM_MAX:
-#ifdef STREAM_MAX
-      return STREAM_MAX;
-#else
-      return -1;
-#endif
-  
-    case _SC_THREAD_DESTRUCTOR_ITERATIONS:
-#ifdef PTHREAD_DESTRUCTOR_ITERATIONS
-      return PTHREAD_DESTRUCTOR_ITERATIONS;
-#else
-      return -1;
-#endif
-  
-    case _SC_THREAD_KEYS_MAX:
-#ifdef PTHREAD_KEYS_MAX
-      return PTHREAD_KEYS_MAX;
-#else
-      return -1;
-#endif
-  
-    case _SC_THREAD_STACK_MIN:
-#ifdef PTHREAD_STACK_MIN
-      return PTHREAD_STACK_MIN;
-#else
-      return -1;
-#endif
-  
-    case _SC_THREAD_THREADS_MAX:
-#ifdef PTHREAD_THREADS_MAX
-      return PTHREAD_THREADS_MAX;
-#else
-      return -1;
-#endif
-  
-    case _SC_TIMER_MAX:
-#ifdef TIMER_MAX
-      return TIMER_MAX;
-#else
-      return -1;
-#endif
-  
-    case _SC_TTY_NAME_MAX:
-#ifdef TTY_NAME_MAX
-      return TTY_NAME_MAX;
-#else
-      return -1;
-#endif
-  
-    case _SC_TZNAME_MAX:
-#ifdef TZNAME_MAX
-      return TZNAME_MAX;
-#else
-      return -1;
-#endif
-  
-    case _SC_ASYNCHRONOUS_IO:
-#ifdef _POSIX_ASYNCHRONOUS_IO
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_FSYNC:
-#ifdef _POSIX_FSYNC
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_JOB_CONTROL:
-#ifdef _POSIX_JOB_CONTROL
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_MAPPED_FILES:
-#ifdef _POSIX_MAPPED_FILES
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_MEMLOCK:
-#ifdef _POSIX_MEMLOCK
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_MEMLOCK_RANGE:
-#ifdef _POSIX_MEMLOCK_RANGE
-      return _POSIX_MEMLOCK_RANGE;
-#else
-      return -1;
-#endif
-  
-    case _SC_MEMORY_PROTECTION:
-#ifdef _POSIX_MEMORY_PROTECTION
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_MESSAGE_PASSING:
-#ifdef _POSIX_MESSAGE_PASSING
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_PRIORITIZED_IO:
-#ifdef _POSIX_PRIORITIZED_IO
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_PRIORITY_SCHEDULING:
-#ifdef _POSIX_PRIORITY_SCHEDULING
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_REALTIME_SIGNALS:
-#ifdef _POSIX_REALTIME_SIGNALS
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_SAVED_IDS:
-#ifdef _POSIX_SAVED_IDS
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_SEMAPHORES:
-#ifdef _POSIX_SEMAPHORES
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_SHARED_MEMORY_OBJECTS:
-#ifdef _POSIX_SHARED_MEMORY_OBJECTS
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_SYNCHRONIZED_IO:
-#ifdef _POSIX_SYNCHRONIZED_IO
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_TIMERS:
-#ifdef _POSIX_TIMERS
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_THREADS:
-#ifdef _POSIX_THREADS
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_THREAD_ATTR_STACKADDR:
-#ifdef _POSIX_THREAD_ATTR_STACKADDR
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_THREAD_ATTR_STACKSIZE:
-#ifdef _POSIX_THREAD_ATTR_STACKSIZE
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_THREAD_PRIORITY_SCHEDULING:
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_THREAD_PRIO_INHERIT:
-#ifdef _POSIX_THREAD_PRIO_INHERIT
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_THREAD_PRIO_PROTECT:
-#ifdef _POSIX_THREAD_PRIO_PROTECT
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_THREAD_PROCESS_SHARED:
-#ifdef _POSIX_THREAD_PROCESS_SHARED
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_THREAD_SAFE_FUNCTIONS:
-#ifdef _POSIX_THREAD_SAFE_FUNCTIONS
-      return 1;
-#else
-      return -1;
-#endif
-  
-    case _SC_VERSION:
-#ifdef _POSIX_VERSION
-      return _POSIX_VERSION;
-#else
-      return -1;
-#endif
-
-    default:
-      errno = EINVAL;
-      return -1;
-    }
-
-  return -1; /* can't get here */
-}
diff --git a/newlib/libc/sys/linux/sysctl.c b/newlib/libc/sys/linux/sysctl.c
deleted file mode 100644
index 020d431..0000000
--- a/newlib/libc/sys/linux/sysctl.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Read or write system information.  Linux version.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <sys/sysctl.h>
-
-#include <machine/syscall.h>
-
-static _syscall1(int,_sysctl,struct __sysctl_args *,args)
-
-int
-__sysctl (int *name, int nlen, void *oldval, size_t *oldlenp,
-	  void *newval, size_t newlen)
-{
-  struct __sysctl_args args =
-  {
-    name: name,
-    nlen: nlen,
-    oldval: oldval,
-    oldlenp: oldlenp,
-    newval: newval,
-    newlen: newlen
-  };
-
-  return _sysctl(&args);
-}
diff --git a/newlib/libc/sys/linux/systat.c b/newlib/libc/sys/linux/systat.c
index 9a57aa7..015e3f0 100644
--- a/newlib/libc/sys/linux/systat.c
+++ b/newlib/libc/sys/linux/systat.c
@@ -4,7 +4,7 @@
 
 
 #include <sys/utsname.h>
-#include <machine/syscall.h>
+#include <sys/syscall.h>
 
 
 _syscall1(int,uname,struct utsname *,name)
diff --git a/newlib/libc/sys/linux/system.c b/newlib/libc/sys/linux/system.c
deleted file mode 100644
index f8edfbf..0000000
--- a/newlib/libc/sys/linux/system.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <machine/weakalias.h>
-
-
-#ifndef	HAVE_GNU_LD
-#define	__environ	environ
-#endif
-
-#define	SHELL_PATH	"/bin/sh"	/* Path of the shell.  */
-#define	SHELL_NAME	"sh"		/* Name to give it.  */
-
-/* Execute LINE as a shell command, returning its status.  */
-int
-__libc_system (const char *line)
-{
-  int status, save;
-  pid_t pid;
-  struct sigaction sa, intr, quit;
-#ifndef WAITPID_CANNOT_BLOCK_SIGCHLD
-  sigset_t block, omask;
-#endif
-
-  if (line == NULL)
-    /* Check that we have a command processor available.  It might
-       not be available after a chroot(), for example.  */
-    return __libc_system ("exit 0") == 0;
-
-  sa.sa_handler = SIG_IGN;
-  sa.sa_flags = 0;
-  sigemptyset (&sa.sa_mask);
-
-  if (sigaction (SIGINT, &sa, &intr) < 0)
-    return -1;
-  if (sigaction (SIGQUIT, &sa, &quit) < 0)
-    {
-      save = errno;
-      (void) sigaction (SIGINT, &intr, (struct sigaction *) NULL);
-      errno = save;
-      return -1;
-    }
-
-#ifndef WAITPID_CANNOT_BLOCK_SIGCHLD
-
-/* SCO 3.2v4 has a bug where `waitpid' will never return if SIGCHLD is
-   blocked.  This makes it impossible for `system' to be implemented in
-   compliance with POSIX.2-1992.  They have acknowledged that this is a bug
-   but I have not seen nor heard of any forthcoming fix.  */
-
-  sigemptyset (&block);
-  sigaddset (&block, SIGCHLD);
-  save = errno;
-  if (sigprocmask (SIG_BLOCK, &block, &omask) < 0)
-    {
-      if (errno == ENOSYS)
-	errno = save;
-      else
-	{
-	  save = errno;
-	  (void) sigaction (SIGINT, &intr, (struct sigaction *) NULL);
-	  (void) sigaction (SIGQUIT, &quit, (struct sigaction *) NULL);
-	  errno = save;
-	  return -1;
-	}
-    }
-# define UNBLOCK sigprocmask (SIG_SETMASK, &omask, (sigset_t *) NULL)
-#else
-# define UNBLOCK 0
-#endif
-
-  pid = fork ();
-  if (pid == (pid_t) 0)
-    {
-      /* Child side.  */
-      const char *new_argv[4];
-      new_argv[0] = SHELL_NAME;
-      new_argv[1] = "-c";
-      new_argv[2] = line;
-      new_argv[3] = NULL;
-
-      /* Restore the signals.  */
-      (void) sigaction (SIGINT, &intr, (struct sigaction *) NULL);
-      (void) sigaction (SIGQUIT, &quit, (struct sigaction *) NULL);
-      (void) UNBLOCK;
-
-      /* Exec the shell.  */
-      (void) execve (SHELL_PATH, (char *const *) new_argv, __environ);
-      _exit (127);
-    }
-  else if (pid < (pid_t) 0)
-    /* The fork failed.  */
-    status = -1;
-  else
-    /* Parent side.  */
-    {
-#ifdef	NO_WAITPID
-      pid_t child;
-      do
-	{
-	  child = wait (&status);
-	  if (child <= -1 && errno != EINTR)
-	    {
-	      status = -1;
-	      break;
-	    }
-	  /* Note that pid cannot be <= -1 and therefore the loop continues
-	     when wait returned with EINTR.  */
-	}
-      while (child != pid);
-#else
-      int n;
-
-      do
-	n = waitpid (pid, &status, 0);
-      while (n == -1 && errno == EINTR);
-
-      if (n != pid)
-	status = -1;
-#endif
-    }
-
-  save = errno;
-  if ((sigaction (SIGINT, &intr, (struct sigaction *) NULL) |
-       sigaction (SIGQUIT, &quit, (struct sigaction *) NULL) |
-       UNBLOCK) != 0)
-    {
-      if (errno == ENOSYS)
-	errno = save;
-      else
-	return -1;
-    }
-
-  return status;
-}
-weak_alias (__libc_system, system)
diff --git a/newlib/libc/sys/linux/tcdrain.c b/newlib/libc/sys/linux/tcdrain.c
deleted file mode 100644
index 364fc03..0000000
--- a/newlib/libc/sys/linux/tcdrain.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* tcdrain - wait for transmission of output */
-
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <machine/weakalias.h>
-
-int
-__libc_tcdrain (int fd)
-{ 
-  return ioctl (fd, TCSBRK, 1);
-}
-weak_alias (__libc_tcdrain, tcdrain)
-
diff --git a/newlib/libc/sys/linux/tcsendbrk.c b/newlib/libc/sys/linux/tcsendbrk.c
deleted file mode 100644
index a35a4d8..0000000
--- a/newlib/libc/sys/linux/tcsendbrk.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright (C) 1992, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* Modified for newlib, May 27, 2002, by Jeff Johnston */
-
-#include <errno.h>
-#include <stddef.h>
-#include <signal.h>
-#include <termios.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-
-/* Send zero bits on FD.  */
-int
-tcsendbreak (fd, duration)
-     int fd;
-     int duration;
-{
-  /* The break lasts 0.25 to 0.5 seconds if DURATION is zero,
-     and an implementation-defined period if DURATION is nonzero.
-     We define a positive DURATION to be number of milliseconds to break.  */
-  if (duration <= 0)
-    return ioctl (fd, TCSBRK, 0);
-
-  /* ioctl can't send a break of any other duration for us.
-     This could be changed to use trickery (e.g. lower speed and
-     send a '\0') to send the break, but for now just return an error.  */
-  errno = (EINVAL);
-  return -1;
-}
diff --git a/newlib/libc/sys/linux/termios.c b/newlib/libc/sys/linux/termios.c
index ac15520..94567b1 100644
--- a/newlib/libc/sys/linux/termios.c
+++ b/newlib/libc/sys/linux/termios.c
@@ -9,64 +9,29 @@
 #include <sys/ioctl.h>
 
 
-int 
-tcgetattr(int fd,struct termios *termios_p)
+int tcgetattr(int fd,struct termios *termios_p)
 {
-  return ioctl(fd,TCGETS,termios_p);
+    return ioctl(fd,TCGETS,termios_p);
 }
 
 
-int 
-tcsetattr(int fd,int optional_actions,const struct termios *termios_p)
+int tcsetattr(int fd,int optional_actions,const struct termios *termios_p)
 {
-  int cmd;
-
-  switch (optional_actions) {
-    case TCSANOW:
-      cmd = TCSETS;
-    break;
-    case TCSADRAIN:
-      cmd = TCSETSW;
-    break;
-    case TCSAFLUSH:
-      cmd = TCSETSF;
-    break;
-    default:
-      errno = EINVAL;
-      return -1;
+    int cmd;
+
+    switch (optional_actions) {
+	case TCSANOW:
+	    cmd = TCSETS;
+	    break;
+	case TCSADRAIN:
+	    cmd = TCSETSW;
+	    break;
+	case TCSAFLUSH:
+	    cmd = TCSETSF;
+	    break;
+	default:
+	    errno = EINVAL;
+	    return -1;
     }
-  return ioctl(fd,cmd,termios_p);
-}
-
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4
-pid_t 
-tcgetpgrp(int fd)
-{
-  int p;
-    
-  if (ioctl(fd,TIOCGPGRP,&p) < 0)
-    return (pid_t)-1;
-  return (pid_t)p;
-}
-
-
-int 
-tcsetpgrp(int fd, pid_t pid)
-{
-  int p = (int)pid;
-  return ioctl(fd,TIOCSPGRP,&p);
+    return ioctl(fd,cmd,termios_p);
 }
-#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 4 */
-
-int
-tcflow (int fd, int action)
-{
-  return ioctl (fd, TCXONC, action);
-}
-
-int
-tcflush (int fd, int queue_selector)
-{
-  return ioctl (fd, TCFLSH, queue_selector);
-}
-
diff --git a/newlib/libc/sys/linux/thread-m.h b/newlib/libc/sys/linux/thread-m.h
deleted file mode 100644
index 2cdacab..0000000
--- a/newlib/libc/sys/linux/thread-m.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/* Basic platform-independent macro definitions for mutexes and
-   thread-specific data.
-   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>, 1996.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-/* $Id$
-   One out of _LIBC, USE_PTHREADS, USE_THR or USE_SPROC should be
-   defined, otherwise the token NO_THREADS and dummy implementations
-   of the macros will be defined.  */
-
-#ifndef _THREAD_M_H
-#define _THREAD_M_H
-
-#undef thread_atfork_static
-
-#if defined(_LIBC) /* The GNU C library, a special case of Posix threads */
-
-#include <bits/libc-lock.h>
-
-#ifdef PTHREAD_MUTEX_INITIALIZER
-
-typedef pthread_t thread_id;
-
-/* mutex */
-typedef pthread_mutex_t	mutex_t;
-
-#define MUTEX_INITIALIZER	PTHREAD_MUTEX_INITIALIZER
-
-/* Even if not linking with libpthread, ensure usability of mutex as
-   an `in use' flag, see also the NO_THREADS case below.  Assume
-   pthread_mutex_t is at least one int wide.  */
-
-#define mutex_init(m)		\
-   (__pthread_mutex_init != NULL \
-    ? __pthread_mutex_init (m, NULL) : (*(int *)(m) = 0))
-#define mutex_lock(m)		\
-   (__pthread_mutex_lock != NULL \
-    ? __pthread_mutex_lock (m) : ((*(int *)(m) = 1), 0))
-#define mutex_trylock(m)	\
-   (__pthread_mutex_trylock != NULL \
-    ? __pthread_mutex_trylock (m) : (*(int *)(m) ? 1 : ((*(int *)(m) = 1), 0)))
-#define mutex_unlock(m)		\
-   (__pthread_mutex_unlock != NULL \
-    ? __pthread_mutex_unlock (m) : (*(int*)(m) = 0))
-
-#define thread_atfork(prepare, parent, child) \
-   (__pthread_atfork != NULL ? __pthread_atfork(prepare, parent, child) : 0)
-
-#elif defined(MUTEX_INITIALIZER)
-/* Assume hurd, with cthreads */
-
-/* Cthreads `mutex_t' is a pointer to a mutex, and malloc wants just the
-   mutex itself.  */
-#undef mutex_t
-#define mutex_t struct mutex
-
-#undef mutex_init
-#define mutex_init(m) (__mutex_init(m), 0)
-
-#undef mutex_lock
-#define mutex_lock(m) (__mutex_lock(m), 0)
-
-#undef mutex_unlock
-#define mutex_unlock(m) (__mutex_unlock(m), 0)
-
-#define mutex_trylock(m) (!__mutex_trylock(m))
-
-#define thread_atfork(prepare, parent, child) do {} while(0)
-#define thread_atfork_static(prepare, parent, child) \
- text_set_element(_hurd_fork_prepare_hook, prepare); \
- text_set_element(_hurd_fork_parent_hook, parent); \
- text_set_element(_hurd_fork_child_hook, child);
-
-/* No we're *not* using pthreads.  */
-#define __pthread_initialize ((void (*)(void))0)
-
-#else
-
-#define NO_THREADS
-
-#endif /* MUTEX_INITIALIZER && PTHREAD_MUTEX_INITIALIZER */
-
-#ifndef NO_THREADS
-
-/* thread specific data for glibc */
-
-#include <libc-tsd.h>
-
-typedef int tsd_key_t[1];	/* no key data structure, libc magic does it */
-__libc_tsd_define (, MALLOC)	/* declaration/common definition */
-#define tsd_key_create(key, destr)	((void) (key))
-#define tsd_setspecific(key, data)	__libc_tsd_set (MALLOC, (data))
-#define tsd_getspecific(key, vptr)	((vptr) = __libc_tsd_get (MALLOC))
-
-#endif
-
-#elif defined(USE_PTHREADS) /* Posix threads */
-
-#include <pthread.h>
-
-typedef pthread_t thread_id;
-
-/* mutex */
-typedef pthread_mutex_t mutex_t;
-
-#define MUTEX_INITIALIZER          PTHREAD_MUTEX_INITIALIZER
-#define mutex_init(m)              pthread_mutex_init(m, NULL)
-#define mutex_lock(m)              pthread_mutex_lock(m)
-#define mutex_trylock(m)           pthread_mutex_trylock(m)
-#define mutex_unlock(m)            pthread_mutex_unlock(m)
-
-/* thread specific data */
-#if defined(__sgi) || defined(USE_TSD_DATA_HACK)
-
-/* Hack for thread-specific data, e.g. on Irix 6.x.  We can't use
-   pthread_setspecific because that function calls malloc() itself.
-   The hack only works when pthread_t can be converted to an integral
-   type. */
-
-typedef void *tsd_key_t[256];
-#define tsd_key_create(key, destr) do { \
-  int i; \
-  for(i=0; i<256; i++) (*key)[i] = 0; \
-} while(0)
-#define tsd_setspecific(key, data) \
- (key[(unsigned)pthread_self() % 256] = (data))
-#define tsd_getspecific(key, vptr) \
- (vptr = key[(unsigned)pthread_self() % 256])
-
-#else
-
-typedef pthread_key_t tsd_key_t;
-
-#define tsd_key_create(key, destr) pthread_key_create(key, destr)
-#define tsd_setspecific(key, data) pthread_setspecific(key, data)
-#define tsd_getspecific(key, vptr) (vptr = pthread_getspecific(key))
-
-#endif
-
-/* at fork */
-#define thread_atfork(prepare, parent, child) \
-                                   pthread_atfork(prepare, parent, child)
-
-#elif USE_THR /* Solaris threads */
-
-#include <thread.h>
-
-typedef thread_t thread_id;
-
-#define MUTEX_INITIALIZER          { 0 }
-#define mutex_init(m)              mutex_init(m, USYNC_THREAD, NULL)
-
-/*
- * Hack for thread-specific data on Solaris.  We can't use thr_setspecific
- * because that function calls malloc() itself.
- */
-typedef void *tsd_key_t[256];
-#define tsd_key_create(key, destr) do { \
-  int i; \
-  for(i=0; i<256; i++) (*key)[i] = 0; \
-} while(0)
-#define tsd_setspecific(key, data) (key[(unsigned)thr_self() % 256] = (data))
-#define tsd_getspecific(key, vptr) (vptr = key[(unsigned)thr_self() % 256])
-
-#define thread_atfork(prepare, parent, child) do {} while(0)
-
-#elif USE_SPROC /* SGI sproc() threads */
-
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <sys/prctl.h>
-#include <abi_mutex.h>
-
-typedef int thread_id;
-
-typedef abilock_t mutex_t;
-
-#define MUTEX_INITIALIZER          { 0 }
-#define mutex_init(m)              init_lock(m)
-#define mutex_lock(m)              (spin_lock(m), 0)
-#define mutex_trylock(m)           acquire_lock(m)
-#define mutex_unlock(m)            release_lock(m)
-
-typedef int tsd_key_t;
-int tsd_key_next;
-#define tsd_key_create(key, destr) ((*key) = tsd_key_next++)
-#define tsd_setspecific(key, data) (((void **)(&PRDA->usr_prda))[key] = data)
-#define tsd_getspecific(key, vptr) (vptr = ((void **)(&PRDA->usr_prda))[key])
-
-#define thread_atfork(prepare, parent, child) do {} while(0)
-
-#else /* no _LIBC or USE_... are defined */
-
-#define NO_THREADS
-
-#endif /* defined(_LIBC) */
-
-#ifdef NO_THREADS /* No threads, provide dummy macros */
-
-typedef int thread_id;
-
-/* The mutex functions used to do absolutely nothing, i.e. lock,
-   trylock and unlock would always just return 0.  However, even
-   without any concurrently active threads, a mutex can be used
-   legitimately as an `in use' flag.  To make the code that is
-   protected by a mutex async-signal safe, these macros would have to
-   be based on atomic test-and-set operations, for example. */
-typedef int mutex_t;
-
-#define MUTEX_INITIALIZER          0
-#define mutex_init(m)              (*(m) = 0)
-#define mutex_lock(m)              ((*(m) = 1), 0)
-#define mutex_trylock(m)           (*(m) ? 1 : ((*(m) = 1), 0))
-#define mutex_unlock(m)            (*(m) = 0)
-
-typedef void *tsd_key_t;
-#define tsd_key_create(key, destr) do {} while(0)
-#define tsd_setspecific(key, data) ((key) = (data))
-#define tsd_getspecific(key, vptr) (vptr = (key))
-
-#define thread_atfork(prepare, parent, child) do {} while(0)
-
-#endif /* defined(NO_THREADS) */
-
-#endif /* !defined(_THREAD_M_H) */
diff --git a/newlib/libc/sys/linux/time.c b/newlib/libc/sys/linux/time.c
index a731350..106658f 100644
--- a/newlib/libc/sys/linux/time.c
+++ b/newlib/libc/sys/linux/time.c
@@ -6,21 +6,23 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/timex.h>
 #include <linux/times.h>
-#include <machine/syscall.h>
+#include <sys/syscall.h>
 
-#define __NR___adjtimex __NR_adjtimex
 
-_syscall1(int,__adjtimex,struct timex *,tx)
 _syscall1(time_t,time,time_t *,t)
 _syscall1(clock_t,times,struct tms *,buf)
-_syscall2(int,getitimer,int,type,struct itimerval *,old)
-_syscall3(int,setitimer,int,type,const struct itimerval *,new,struct itimerval *,old)
 _syscall2(int,gettimeofday,struct timeval *,tv,struct timezone *,tz)
-_syscall2(int,settimeofday,const struct timeval *,tv,const struct timezone *,tz)
 _syscall2(int,nanosleep,const struct timespec *,req,struct timespec *,rem)
 
-weak_alias(__libc_gettimeofday,__gettimeofday);
-weak_alias(__adjtimex,adjtimex);
-weak_alias(__adjtimex,ntp_adjtime);
+
+unsigned int sleep(unsigned int seconds)
+{
+    struct timespec ts;
+
+    ts.tv_sec = seconds;
+    ts.tv_nsec = 0;
+    if (!nanosleep(&ts,&ts)) return 0;
+    if (errno == EINTR) return ts.tv_sec;
+    return -1;
+}
diff --git a/newlib/libc/sys/linux/ttyname_r.c b/newlib/libc/sys/linux/ttyname_r.c
deleted file mode 100644
index efad76a..0000000
--- a/newlib/libc/sys/linux/ttyname_r.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Copyright (C) 1991,92,93,1995-1999,2000,2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <limits.h>
-#include <stddef.h>
-#include <dirent.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <machine/weakalias.h>
-
-static int getttyname_r (char *buf, size_t buflen,
-			 dev_t mydev, ino64_t myino, int save,
-			 int *dostat);
-
-extern struct dirent64 *__readdir64 (DIR *);
-
-static int
-getttyname_r (char *buf, size_t buflen, dev_t mydev, ino64_t myino,
-	      int save, int *dostat)
-{
-  struct stat64 st;
-  DIR *dirstream;
-  struct dirent64 *d;
-  size_t devlen = strlen (buf);
-
-  dirstream = opendir (buf);
-  if (dirstream == NULL)
-    {
-      *dostat = -1;
-      return errno;
-    }
-
-  while ((d = __readdir64 (dirstream)) != NULL)
-    {
-      if ((d->d_ino == myino || *dostat)
-          && strcmp (d->d_name, "stdin")
-	  && strcmp (d->d_name, "stdout")
-	  && strcmp (d->d_name, "stderr"))
-        {
-	  size_t needed = strlen (d->d_name) + 1;
-
-	  if (needed > buflen)
-	    {
-	      *dostat = -1;
-	      (void) closedir (dirstream);
-	      __set_errno (ERANGE);
-	      return ERANGE;
-	    }
-
-	  strncpy (buf + devlen, d->d_name, needed);
-
-	  if (stat64 (buf, &st) == 0
-#ifdef _STATBUF_ST_RDEV
-	      && S_ISCHR (st.st_mode) && st.st_rdev == mydev
-#else
-	      && d->d_ino == myino && st.st_dev == mydev
-#endif
-	     )
-	    {
-	      (void) closedir (dirstream);
-	      __set_errno (save);
-	      return 0;
-	    }
-        }
-    }
-
-  (void) closedir (dirstream);
-  __set_errno (save);
-  /* It is not clear what to return in this case.  `isatty' says FD
-     refers to a TTY but no entry in /dev has this inode.  */
-  return ENOTTY;
-}
-
-/* Store at most BUFLEN character of the pathname of the terminal FD is
-   open on in BUF.  Return 0 on success,  otherwise an error number.  */
-int
-__ttyname_r (int fd, char *buf, size_t buflen)
-{
-  char procname[30];
-  struct stat64 st, st1;
-  int dostat = 0;
-  int save = errno;
-  int ret;
-
-  /* Test for the absolute minimal size.  This makes life easier inside
-     the loop.  */
-  if (!buf)
-    {
-      __set_errno (EINVAL);
-      return EINVAL;
-    }
-
-  if (buflen < sizeof ("/dev/pts/"))
-    {
-      __set_errno (ERANGE);
-      return ERANGE;
-    }
-
-  if (!isatty (fd))
-    {
-      __set_errno (ENOTTY);
-      return ENOTTY;
-    }
-
-  /* We try using the /proc filesystem.  */
-  sprintf (procname, "/proc/self/fd/%d", fd);
-
-  ret = readlink (procname, buf, buflen - 1);
-  if (ret != -1 && buf[0] != '[')
-    {
-      buf[ret] = '\0';
-      return 0;
-    }
-  if (ret == -1 && errno == ENAMETOOLONG)
-    {
-      __set_errno (ERANGE);
-      return ERANGE;
-    }
-
-  if (fstat64 (fd, &st) < 0)
-    return errno;
-
-  /* Prepare the result buffer.  */
-  memcpy (buf, "/dev/pts/", sizeof ("/dev/pts/"));
-  buflen -= sizeof ("/dev/pts/") - 1;
-
-  if (stat64 (buf, &st1) == 0 && S_ISDIR (st1.st_mode))
-    {
-#ifdef _STATBUF_ST_RDEV
-      ret = getttyname_r (buf, buflen, st.st_rdev, st.st_ino, save,
-			  &dostat);
-#else
-      ret = getttyname_r (buf, buflen, st.st_dev, st.st_ino, save,
-			  &dostat);
-#endif
-    }
-  else
-    {
-      __set_errno (save);
-      ret = ENOENT;
-    }
-
-  if (ret && dostat != -1)
-    {
-      buf[sizeof ("/dev/") - 1] = '\0';
-      buflen += sizeof ("pts/") - 1;
-#ifdef _STATBUF_ST_RDEV
-      ret = getttyname_r (buf, buflen, st.st_rdev, st.st_ino, save,
-			  &dostat);
-#else
-      ret = getttyname_r (buf, buflen, st.st_dev, st.st_ino, save,
-			  &dostat);
-#endif
-    }
-
-  if (ret && dostat != -1)
-    {
-      buf[sizeof ("/dev/") - 1] = '\0';
-      dostat = 1;
-#ifdef _STATBUF_ST_RDEV
-      ret = getttyname_r (buf, buflen, st.st_rdev, st.st_ino,
-			  save, &dostat);
-#else
-      ret = getttyname_r (buf, buflen, st.st_dev, st.st_ino,
-			  save, &dostat);
-#endif
-    }
-
-  return ret;
-}
-
-weak_alias (__ttyname_r, ttyname_r)
diff --git a/newlib/libc/sys/linux/usleep.c b/newlib/libc/sys/linux/usleep.c
deleted file mode 100644
index fab6911..0000000
--- a/newlib/libc/sys/linux/usleep.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* libc/sys/linux/usleep.c - usleep function */
-
-/* Written 2002 by Jeff Johnston */
-
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <linux/times.h>
-
-int usleep(__useconds_t useconds)
-{
-    struct timespec ts;
-
-    ts.tv_sec = (long int)useconds / 1000000;
-    ts.tv_nsec = ((long int)useconds % 1000000) * 1000;
-    if (!nanosleep(&ts,&ts)) return 0;
-    if (errno == EINTR) return ts.tv_sec;
-    return -1;
-}
diff --git a/newlib/libc/sys/linux/utimes.c b/newlib/libc/sys/linux/utimes.c
deleted file mode 100644
index 0bee551..0000000
--- a/newlib/libc/sys/linux/utimes.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright (C) 1995, 1997, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <utime.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <stddef.h>
-#include <machine/weakalias.h>
-
-/* Change the access time of FILE to TVP[0] and
-   the modification time of FILE to TVP[1].  */
-int
-__utimes (const char *file, const struct timeval tvp[2])
-{
-  struct utimbuf buf, *times;
-
-  if (tvp)
-    {
-      times = &buf;
-      times->actime = tvp[0].tv_sec + tvp[0].tv_usec / 1000000;
-      times->modtime = tvp[1].tv_sec + tvp[1].tv_usec / 1000000;
-    }
-  else
-    times = NULL;
-
-  return utime (file, times);
-}
-
-weak_alias (__utimes, utimes)
diff --git a/newlib/libc/sys/linux/vallocr.c b/newlib/libc/sys/linux/vallocr.c
deleted file mode 100644
index 8de7ffc..0000000
--- a/newlib/libc/sys/linux/vallocr.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <stdlib.h>
-
-void * 
-_valloc_r (struct _reent *ptr, size_t bytes)
-{
-  return valloc (bytes);
-}
diff --git a/newlib/libc/sys/linux/versionsort.c b/newlib/libc/sys/linux/versionsort.c
deleted file mode 100644
index 13cbdcc..0000000
--- a/newlib/libc/sys/linux/versionsort.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <dirent.h>
-#include <string.h>
-
-extern int __strverscmp (char *, char *);
-
-int
-versionsort (const void *a, const void *b)
-{
-  return __strverscmp ((*(const struct dirent **)a)->d_name,
-                       (*(const struct dirent **)b)->d_name);
-}
diff --git a/newlib/libc/sys/linux/versionsort64.c b/newlib/libc/sys/linux/versionsort64.c
deleted file mode 100644
index 45147b0..0000000
--- a/newlib/libc/sys/linux/versionsort64.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <dirent.h>
-#include <string.h>
-
-extern int __strverscmp (char *, char *);
-
-int
-versionsort64 (const void *a, const void *b)
-{
-  return __strverscmp ((*(const struct dirent64 **)a)->d_name,
-                       (*(const struct dirent64 **)b)->d_name);
-}
diff --git a/newlib/libc/sys/linux/wait.c b/newlib/libc/sys/linux/wait.c
index 31d1cc7..597fb9e 100644
--- a/newlib/libc/sys/linux/wait.c
+++ b/newlib/libc/sys/linux/wait.c
@@ -4,24 +4,20 @@
 
 
 #include <sys/wait.h>
-#include <machine/syscall.h>
+#include <sys/syscall.h>
 
 
 _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
 _syscall4(pid_t,wait4,pid_t,pid,int *,status,int,options,struct rusage *,rusage)
 
 
-pid_t __libc_wait3(int *status,int options,struct rusage *rusage)
+pid_t wait3(int *status,int options,struct rusage *rusage)
 {
-    return __libc_wait4(-1,status,options,rusage);
+    return wait4(-1,status,options,rusage);
 }
-weak_alias(__libc_wait3,wait3)
 
-pid_t __libc_wait(int *status)
+
+pid_t wait(int *status)
 {
-    return __libc_waitpid(-1,status,0);
+    return waitpid(-1,status,0);
 }
-
-weak_alias(__libc_waitpid,__libc___waitpid);
-weak_alias(__libc_wait,__wait);
-weak_alias(__libc_wait,wait);
diff --git a/newlib/libc/sys/m88kbug/Makefile.in b/newlib/libc/sys/m88kbug/Makefile.in
index d81a098..ec27be7 100644
--- a/newlib/libc/sys/m88kbug/Makefile.in
+++ b/newlib/libc/sys/m88kbug/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/m88kbug/aclocal.m4 b/newlib/libc/sys/m88kbug/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/m88kbug/aclocal.m4
+++ b/newlib/libc/sys/m88kbug/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/m88kbug/configure b/newlib/libc/sys/m88kbug/configure
index abdfc90..30e4f2c 100755
--- a/newlib/libc/sys/m88kbug/configure
+++ b/newlib/libc/sys/m88kbug/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/mmixware/Makefile.am b/newlib/libc/sys/mmixware/Makefile.am
index 054220f..1e4ed31 100644
--- a/newlib/libc/sys/mmixware/Makefile.am
+++ b/newlib/libc/sys/mmixware/Makefile.am
@@ -8,7 +8,7 @@ noinst_LIBRARIES = lib.a
 
 lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c \
 	execv.c execve.c fork.c fstat.c getpid.c isatty.c \
-	kill.c link.c lseek.c open.c pipe.c read.c \
+	kill.c lseek.c open.c pipe.c read.c \
 	sbrk.c stat.c time.c unlink.c utime.c wait.c write.c \
 	times.c gettime.c setjmp.S
 
diff --git a/newlib/libc/sys/mmixware/Makefile.in b/newlib/libc/sys/mmixware/Makefile.in
index 45f717f..dbd0e66 100644
--- a/newlib/libc/sys/mmixware/Makefile.in
+++ b/newlib/libc/sys/mmixware/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,11 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c 	execv.c execve.c fork.c fstat.c getpid.c isatty.c 	kill.c link.c lseek.c open.c pipe.c read.c 	sbrk.c stat.c time.c unlink.c utime.c wait.c write.c 	times.c gettime.c setjmp.S
+lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c \
+	execv.c execve.c fork.c fstat.c getpid.c isatty.c \
+	kill.c lseek.c open.c pipe.c read.c \
+	sbrk.c stat.c time.c unlink.c utime.c wait.c write.c \
+	times.c gettime.c setjmp.S
 
 
 ACLOCAL_AMFLAGS = -I ../../..
@@ -105,9 +104,9 @@ CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
 lib_a_OBJECTS =  _exit.o access.o chmod.o chown.o close.o creat.o \
-execv.o execve.o fork.o fstat.o getpid.o isatty.o kill.o link.o lseek.o \
-open.o pipe.o read.o sbrk.o stat.o time.o unlink.o utime.o wait.o \
-write.o times.o gettime.o setjmp.o
+execv.o execve.o fork.o fstat.o getpid.o isatty.o kill.o lseek.o open.o \
+pipe.o read.o sbrk.o stat.o time.o unlink.o utime.o wait.o write.o \
+times.o gettime.o setjmp.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -133,8 +132,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/mmixware/aclocal.m4 b/newlib/libc/sys/mmixware/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/mmixware/aclocal.m4
+++ b/newlib/libc/sys/mmixware/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/mmixware/configure b/newlib/libc/sys/mmixware/configure
index c97c3f4..340ccba 100755
--- a/newlib/libc/sys/mmixware/configure
+++ b/newlib/libc/sys/mmixware/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/mmixware/link.c b/newlib/libc/sys/mmixware/link.c
deleted file mode 100644
index 0629163..0000000
--- a/newlib/libc/sys/mmixware/link.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* link stub for MMIXware.
-
-   Copyright (C) 2002 Hans-Peter Nilsson
-
-   Permission to use, copy, modify, and distribute this software is
-   freely granted, provided that the above copyright notice, this notice
-   and the following disclaimer are preserved with no changes.
-
-   THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-   PURPOSE.  */
-
-#include <_ansi.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "sys/syscall.h"
-#include <errno.h>
-
-int
-_link ()
-{
-  errno = EMLINK;
-  return -1;
-}
diff --git a/newlib/libc/sys/mmixware/open.c b/newlib/libc/sys/mmixware/open.c
index f0b9fba..26fbbb9 100644
--- a/newlib/libc/sys/mmixware/open.c
+++ b/newlib/libc/sys/mmixware/open.c
@@ -1,6 +1,6 @@
 /* open for MMIXware.
 
-   Copyright (C) 2001, 2002 Hans-Peter Nilsson
+   Copyright (C) 2001 Hans-Peter Nilsson
 
    Permission to use, copy, modify, and distribute this software is
    freely granted, provided that the above copyright notice, this notice
@@ -11,7 +11,6 @@
    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    PURPOSE.  */
 
-#include <stdlib.h>
 #include <fcntl.h>
 #include <_ansi.h>
 #include <sys/types.h>
@@ -38,9 +37,7 @@ _open (const char *path,
 {
   long fileno;
   unsigned char mode;
-  long append_contents = 0;
-  unsigned long prev_contents_size = 0;
-  char *prev_contents = NULL;
+  long fffile = 0;
   long ret;
 
   for (fileno = 0;
@@ -58,7 +55,7 @@ _open (const char *path,
     }
 
   /* We map this to a fopen call.  The flags parameter is stymied because
-     we don't support other than these flags.  */
+     we don't support more other than these flags.  */
   if (flags & ~(O_RDONLY | O_WRONLY | O_RDWR | O_CREAT | O_APPEND | O_TRUNC))
     {
       UNIMPLEMENTED (("path: %s, flags: %d", path, flags));
@@ -71,12 +68,12 @@ _open (const char *path,
   else if ((flags & (O_WRONLY | O_APPEND)) == (O_WRONLY | O_APPEND))
     {
       mode = BinaryReadWrite;
-      append_contents = 1;
+      fffile = 1;
     }
   else if ((flags & (O_RDWR | O_APPEND)) == (O_RDWR | O_APPEND))
     {
       mode = BinaryReadWrite;
-      append_contents = 1;
+      fffile = 1;
     }
   else if ((flags & (O_WRONLY | O_CREAT)) == (O_WRONLY | O_CREAT)
 	   || (flags & (O_WRONLY | O_TRUNC)) == (O_WRONLY | O_TRUNC))
@@ -91,99 +88,6 @@ _open (const char *path,
       return -1;
     }
 
-  if (append_contents)
-    {
-      /* BinaryReadWrite is equal to "w+", so it truncates the file rather
-	 than keeping the contents, as can be imagined if you're looking
-	 for append functionality.  The only way we can keep the contents
-	 so we can append to it, is by first reading in and saving the
-	 contents, then re-opening the file as BinaryReadWrite and write
-	 the previous contents.  This seems to work for the needs of
-	 simple test-programs.  */
-      long openexist = TRAP3f (SYS_Fopen, fileno, path, BinaryRead);
-      if (openexist == 0)
-	{
-	  /* Yes, this file exists, now opened, so let's read it and keep
-             the contents.  Better have the memory around for this to
-             work.  */
-	  long seekval = TRAP2f (SYS_Fseek, fileno, -1);
-
-	  if (seekval == 0)
-	    {
-	      prev_contents_size = TRAP1f (SYS_Ftell, fileno);
-
-	      /* If the file has non-zero size, we have something to
-		 append to.  */
-	      if (prev_contents_size != 0)
-		{
-		  /* Start reading from the beginning.  Ignore the return
-		     value from this call: we'll notice if we can't read
-		     as much as we want.  */
-		  TRAP2f (SYS_Fseek, fileno, 0);
-
-		  prev_contents = malloc (prev_contents_size);
-		  if (prev_contents != 0)
-		    {
-		      /* I don't like the thought of trying to read the
-			 whole file all at once, disregarding the size,
-			 because the host system might not support that
-			 and we'd get funky errors.  Read in 32k at a
-			 time.  */
-		      char *ptr = prev_contents;
-		      unsigned long read_more = prev_contents_size;
-		      unsigned long chunk_size = 1 << 15;
-
-		      while (read_more >= chunk_size)
-			{
-			  long readval
-			    = TRAP3f (SYS_Fread, fileno, ptr, chunk_size);
-
-			  if (readval != 0)
-			    {
-			      free (prev_contents);
-			      TRAP1f (SYS_Fclose, fileno);
-			      errno = EIO;
-			      return -1;
-			    }
-			  read_more -= chunk_size;
-			  ptr += chunk_size;
-			}
-
-		      if (read_more != 0)
-			{
-			  long readval
-			    = TRAP3f (SYS_Fread, fileno, ptr, read_more);
-			  if (readval != 0)
-			    {
-			      free (prev_contents);
-			      TRAP1f (SYS_Fclose, fileno);
-			      errno = EIO;
-			      return -1;
-			    }
-			}
-		    }
-		  else
-		    {
-		      /* Malloc of area to copy to failed.  The glibc
-			 manpage says its open can return ENOMEM due to
-			 kernel memory failures, so let's do that too
-			 here.  */
-		      errno = ENOMEM;
-		      return -1;
-		    }
-		}
-	    }
-	  else
-	    {
-	      /* Seek failed.  Gotta be some I/O error.  */
-	      errno = EIO;
-	      return -1;
-	    }
-
-	  TRAP1f (SYS_Fclose, fileno);
-	}
-    }
-
   ret = TRAP3f (SYS_Fopen, fileno, path, mode);
   if (ret < 0)
     {
@@ -193,45 +97,12 @@ _open (const char *path,
       return -1;
     }
 
-  if (prev_contents_size != 0)
-    {
-      /* Write out the previous contents, a chunk at a time.  Leave the
-	 file pointer at the end of the file.  */
-      unsigned long write_more = prev_contents_size;
-      unsigned long chunk_size = 1 << 15;
-      char *ptr = prev_contents;
-
-      while (write_more >= chunk_size)
-	{
-	  long writeval
-	    = TRAP3f (SYS_Fwrite, fileno, ptr, chunk_size);
-	  if (writeval != 0)
-	    {
-	      free (prev_contents);
-	      TRAP1f (SYS_Fclose, fileno);
-	      errno = EIO;
-	      return -1;
-	    }
-	  write_more -= chunk_size;
-	  ptr += chunk_size;
-	}
-      if (write_more != 0)
-	{
-	  long writeval
-	    = TRAP3f (SYS_Fwrite, fileno, ptr, write_more);
-	  if (writeval != 0)
-	    {
-	      free (prev_contents);
-	      TRAP1f (SYS_Fclose, fileno);
-	      errno = EIO;
-	      return -1;
-	    }
-	}
+  _MMIX_allocated_filehandle[fileno] = 1;
 
-      free (prev_contents);
+  if (fffile)
+    {
+      TRAP2f (SYS_Fseek, fileno, -1);
     }
 
-  _MMIX_allocated_filehandle[fileno] = 1;
-
   return fileno;
 }
diff --git a/newlib/libc/sys/mmixware/read.c b/newlib/libc/sys/mmixware/read.c
index f0f5e22..9a7e98f 100644
--- a/newlib/libc/sys/mmixware/read.c
+++ b/newlib/libc/sys/mmixware/read.c
@@ -30,16 +30,6 @@ _read (int file,
       return -1;
     }
 
-  if (isatty(file))
-    {
-      ret = TRAP3f (SYS_Fgets, file, ptr, len);
-
-      if (ret == -1)
-        return 0;
-
-      return ret;
-    }
-
   ret = TRAP3f (SYS_Fread, file, ptr, len);
 
   /* Map the return codes:
diff --git a/newlib/libc/sys/mmixware/sys/syscall.h b/newlib/libc/sys/mmixware/sys/syscall.h
index e9e1ff4..c74a0ac 100644
--- a/newlib/libc/sys/mmixware/sys/syscall.h
+++ b/newlib/libc/sys/mmixware/sys/syscall.h
@@ -1,6 +1,6 @@
 /* syscall defines for MMIXware.
 
-   Copyright (C) 2001, 2002 Hans-Peter Nilsson
+   Copyright (C) 2001 Hans-Peter Nilsson
 
    Permission to use, copy, modify, and distribute this software is
    freely granted, provided that the above copyright notice, this notice
@@ -17,7 +17,6 @@
 #define	SYS_Fopen	1
 #define	SYS_Fclose	2
 #define	SYS_Fread	3
-#define	SYS_Fgets	4
 #define	SYS_Fwrite	6
 #define	SYS_Fseek	9
 #define	SYS_Ftell	10
@@ -47,30 +46,22 @@ extern unsigned char _MMIX_allocated_filehandle[N_MMIX_FILEHANDLES];
 #define TMPFNO 127
 
 /* Simulator call with one argument.  Also used for zero-argument calls;
-   pass a zero as ARG1.  Make the asm volatile so we can safely ignore the
-   return-value and only get the benefit from the supposed side-effect
-   without the asm being optimized away.  */
-#define TRAP1i(FUN, ARG1)			\
- ({ long ret_;					\
-    __asm__ __volatile__			\
-      ("TRAP 0,%1,%2\n\tSET %0,$255"		\
-       : "=r" (ret_) : "i" (FUN), "i" (ARG1)	\
-       : "memory");				\
-    ret_;					\
+   pass a zero as ARG1.  */
+#define TRAP1i(FUN, ARG1)				\
+ ({ long ret_;						\
+    __asm__ ("TRAP 0,%1,%2\n\tSET %0,$255"		\
+	     : "=r" (ret_) : "i" (FUN), "i" (ARG1)	\
+	     : "memory");				\
+    ret_;						\
  })
 
 /* Helper macros to cope with the file-handle parameter to the simulator
-   being *constant*.  We support up to 32 simultaneously open files.  Make
-   the asm volatile so we can safely ignore the return-value and get the
-   benefit from the supposed side-effect without the asm being optimized
-   away.  */
-
-#define I3f(FUN, ARG1, N, ARGS)				\
- if (ARG1 == N)						\
-   __asm__ __volatile__					\
-     ("SET $255,%3\n\tTRAP 0,%1,%2\n\tSET %0,$255"	\
-      : "=r" (ret_) : "i" (FUN), "i" (N), "r" (ARGS)	\
-      : "memory")
+   being *constant*.  We support up to 32 simultaneously open files.  */
+#define I3f(FUN, ARG1, N, ARGS)					\
+ if (ARG1 == N)							\
+   __asm__ ("SET $255,%3\n\tTRAP 0,%1,%2\n\tSET %0,$255"	\
+	    : "=r" (ret_) : "i" (FUN), "i" (N), "r" (ARGS)	\
+	    : "memory")
 
 /* Using if:s rather than switches to help GCC optimize the rest away.  */
 #define DO32(FUN, ARG1, ARGS)			\
diff --git a/newlib/libc/sys/mmixware/times.c b/newlib/libc/sys/mmixware/times.c
index 6275ef3..b397f2b 100644
--- a/newlib/libc/sys/mmixware/times.c
+++ b/newlib/libc/sys/mmixware/times.c
@@ -1,6 +1,6 @@
 /* times stub for MMIXware.
 
-   Copyright (C) 2001, 2002 Hans-Peter Nilsson
+   Copyright (C) 2001 Hans-Peter Nilsson
 
    Permission to use, copy, modify, and distribute this software is
    freely granted, provided that the above copyright notice, this notice
@@ -18,7 +18,7 @@
 #include "sys/times.h"
 
 clock_t
-_times (struct tms *buffer)
+times (struct tms *buffer)
 {
   memset (buffer, 0, sizeof (*buffer));
   return 0;
diff --git a/newlib/libc/sys/netware/Makefile.in b/newlib/libc/sys/netware/Makefile.in
index 726e1f3..47ddbd5 100644
--- a/newlib/libc/sys/netware/Makefile.in
+++ b/newlib/libc/sys/netware/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,9 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES =  	getpid.c 	link.c
+lib_a_SOURCES = \
+	getpid.c \
+	link.c
 
 
 ACLOCAL_AMFLAGS = -I ../../..
@@ -130,8 +127,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/netware/aclocal.m4 b/newlib/libc/sys/netware/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/netware/aclocal.m4
+++ b/newlib/libc/sys/netware/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/netware/configure b/newlib/libc/sys/netware/configure
index 8f0ed4d..7263c1e 100755
--- a/newlib/libc/sys/netware/configure
+++ b/newlib/libc/sys/netware/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/rdos/Makefile.am b/newlib/libc/sys/rdos/Makefile.am
deleted file mode 100644
index 825ef56..0000000
--- a/newlib/libc/sys/rdos/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c \
-	getpid.c gettod.c isatty.c kill.c link.c lseek.c open.c rdoshelp.c \
-	rdos.S read.c readlink.c sbrk.c stat.c symlink.c times.c unlink.c \
-	wait.c write.c
-
-all: crt0.o
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libc/sys/rdos/Makefile.in b/newlib/libc/sys/rdos/Makefile.in
deleted file mode 100644
index 5fb59e5..0000000
--- a/newlib/libc/sys/rdos/Makefile.in
+++ /dev/null
@@ -1,376 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-VERSION = @VERSION@
-aext = @aext@
-libm_machine_dir = @libm_machine_dir@
-machine_dir = @machine_dir@
-newlib_basedir = @newlib_basedir@
-oext = @oext@
-sys_dir = @sys_dir@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
-
-noinst_LIBRARIES = lib.a
-
-lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c 	getpid.c gettod.c isatty.c kill.c link.c lseek.c open.c rdoshelp.c 	rdos.S read.c readlink.c sbrk.c stat.c symlink.c times.c unlink.c 	wait.c write.c
-
-
-ACLOCAL_AMFLAGS = -I ../../..
-CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) 
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-lib_a_LIBADD = 
-lib_a_OBJECTS =  chown.$(OBJEXT) close.$(OBJEXT) execve.$(OBJEXT) \
-fork.$(OBJEXT) fstat.$(OBJEXT) getenv.$(OBJEXT) getpid.$(OBJEXT) \
-gettod.$(OBJEXT) isatty.$(OBJEXT) kill.$(OBJEXT) link.$(OBJEXT) \
-lseek.$(OBJEXT) open.$(OBJEXT) rdoshelp.$(OBJEXT) rdos.$(OBJEXT) \
-read.$(OBJEXT) readlink.$(OBJEXT) sbrk.$(OBJEXT) stat.$(OBJEXT) \
-symlink.$(OBJEXT) times.$(OBJEXT) unlink.$(OBJEXT) wait.$(OBJEXT) \
-write.$(OBJEXT)
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in aclocal.m4 configure configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-SOURCES = $(lib_a_SOURCES)
-OBJECTS = $(lib_a_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES)
-	-rm -f lib.a
-	$(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
-	$(RANLIB) lib.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(LIBRARIES)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-	-rm -f config.status
-
-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-all: crt0.o
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/newlib/libc/sys/rdos/aclocal.m4 b/newlib/libc/sys/rdos/aclocal.m4
deleted file mode 100644
index e6cbb29..0000000
--- a/newlib/libc/sys/rdos/aclocal.m4
+++ /dev/null
@@ -1,1226 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl This provides configure definitions used by all the newlib
-dnl configure.in files.
-
-dnl Basic newlib configury.  This calls basic introductory stuff,
-dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST.  It also runs
-dnl configure.host.  The only argument is the relative path to the top
-dnl newlib directory.
-
-AC_DEFUN(NEWLIB_CONFIGURE,
-[
-dnl Default to --enable-multilib
-AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
-[case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
- esac], [multilib=yes])dnl
-
-dnl Support --enable-target-optspace
-AC_ARG_ENABLE(target-optspace,
-[  --enable-target-optspace  optimize for space],
-[case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;;
- esac], [target_optspace=])dnl
-
-dnl Support --enable-malloc-debugging - currently only supported for Cygwin
-AC_ARG_ENABLE(malloc-debugging,
-[  --enable-malloc-debugging indicate malloc debugging requested],
-[case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
- esac], [malloc_debugging=])dnl
-
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
-[case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
-
-dnl We may get other options which we don't document:
-dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
-
-test -z "[$]{with_target_subdir}" && with_target_subdir=.
-
-if test "[$]{srcdir}" = "."; then
-  if test "[$]{with_target_subdir}" != "."; then
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
-  else
-    newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
-  fi
-else
-  newlib_basedir="[$]{srcdir}/$1"
-fi
-AC_SUBST(newlib_basedir)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE(newlib, 1.14.0, nodefine)
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-AC_CHECK_TOOL(AS, as)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-AC_PROG_INSTALL
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-AM_MAINTAINER_MODE
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  AC_EXEEXT
-fi
-
-. [$]{newlib_basedir}/configure.host
-
-newlib_cflags="[$]{newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-AC_SUBST(NEWLIB_CFLAGS)
-
-LDFLAGS=${ldflags}
-AC_SUBST(LDFLAGS)
-
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
-AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
-AC_SUBST(oext)
-AC_SUBST(aext)
-
-AC_SUBST(libm_machine_dir)
-AC_SUBST(machine_dir)
-AC_SUBST(sys_dir)
-])
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  ])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)])
-
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libc/sys/rdos/chown.c b/newlib/libc/sys/rdos/chown.c
deleted file mode 100755
index 48f33f5..0000000
--- a/newlib/libc/sys/rdos/chown.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-#include <sys/types.h>

-

-int chown(const char *path, uid_t owner, gid_t group)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/close.c b/newlib/libc/sys/rdos/close.c
deleted file mode 100644
index 7f95e24..0000000
--- a/newlib/libc/sys/rdos/close.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# close.c                                                                

-# close function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-#include "rdos.h"

-

-int close(int fildes)

-{

-  RdosCloseFile(fildes);

-  return 0;

-}

diff --git a/newlib/libc/sys/rdos/config.h b/newlib/libc/sys/rdos/config.h
deleted file mode 100644
index 431e268..0000000
--- a/newlib/libc/sys/rdos/config.h
+++ /dev/null
@@ -1 +0,0 @@
-/* Place holder for future configuration information.  */
diff --git a/newlib/libc/sys/rdos/configure b/newlib/libc/sys/rdos/configure
deleted file mode 100755
index e937dd6..0000000
--- a/newlib/libc/sys/rdos/configure
+++ /dev/null
@@ -1,1876 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-multilib         build many library versions (default)"
-ac_help="$ac_help
-  --enable-target-optspace  optimize for space"
-ac_help="$ac_help
-  --enable-malloc-debugging indicate malloc debugging requested"
-ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=close.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in ../../../.. $srcdir/../../../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-am__api_version="1.4"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-# Check whether --enable-multilib or --disable-multilib was given.
-if test "${enable_multilib+set}" = set; then
-  enableval="$enable_multilib"
-  case "${enableval}" in
-  yes) multilib=yes ;;
-  no)  multilib=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;;
- esac
-else
-  multilib=yes
-fi
-
-# Check whether --enable-target-optspace or --disable-target-optspace was given.
-if test "${enable_target_optspace+set}" = set; then
-  enableval="$enable_target_optspace"
-  case "${enableval}" in
-  yes) target_optspace=yes ;;
-  no)  target_optspace=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;;
- esac
-else
-  target_optspace=
-fi
-
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-  yes) malloc_debugging=yes ;;
-  no)  malloc_debugging=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;;
- esac
-else
-  malloc_debugging=
-fi
-
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
-  case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
-fi
-
-
-test -z "${with_target_subdir}" && with_target_subdir=.
-
-if test "${srcdir}" = "."; then
-  if test "${with_target_subdir}" != "."; then
-    newlib_basedir="${srcdir}/${with_multisrctop}../../../.."
-  else
-    newlib_basedir="${srcdir}/${with_multisrctop}../../.."
-  fi
-else
-  newlib_basedir="${srcdir}/../../.."
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-
-PACKAGE=newlib
-
-VERSION=1.14.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1011: checking for working aclocal-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1024: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1037: checking for working automake-${am__api_version}" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1050: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1063: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1088: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1118: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1167: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1191: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1222: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1254: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1286: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1318: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1363: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1420: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which can't create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we don't execute it, since we don't care about
-# the result.
-if false; then
-  
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1454: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.$ac_ext | *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-fi
-
-. ${newlib_basedir}/configure.host
-
-newlib_cflags="${newlib_cflags} -fno-builtin"
-
-NEWLIB_CFLAGS=${newlib_cflags}
-
-
-LDFLAGS=${ldflags}
-
-
-
-
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
-if test x${use_libtool} = xyes; then
-  USE_LIBTOOL_TRUE=
-  USE_LIBTOOL_FALSE='#'
-else
-  USE_LIBTOOL_TRUE='#'
-  USE_LIBTOOL_FALSE=
-fi
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
-s%@newlib_basedir@%$newlib_basedir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
-s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
-s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
-s%@oext@%$oext%g
-s%@aext@%$aext%g
-s%@libm_machine_dir@%$libm_machine_dir%g
-s%@machine_dir@%$machine_dir%g
-s%@sys_dir@%$sys_dir%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/newlib/libc/sys/rdos/configure.in b/newlib/libc/sys/rdos/configure.in
deleted file mode 100644
index 6a78d99..0000000
--- a/newlib/libc/sys/rdos/configure.in
+++ /dev/null
@@ -1,12 +0,0 @@
-dnl This is the newlib/libc/sys/rdos configure.in file.
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.5)
-AC_INIT(close.c)
-
-dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. 
-AC_CONFIG_AUX_DIR(../../../..)
-
-NEWLIB_CONFIGURE(../../..)
-
-AC_OUTPUT(Makefile)
diff --git a/newlib/libc/sys/rdos/crt0.S b/newlib/libc/sys/rdos/crt0.S
deleted file mode 100644
index efc3b16..0000000
--- a/newlib/libc/sys/rdos/crt0.S
+++ /dev/null
@@ -1,406 +0,0 @@
-/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# crt0.S                                                               
-# GCC startupcode for RDOS
-#
-##########################################################################*/
-  
-#include "user.def"
-
-    KEY_ENTRIES = 256
-  
-    .macro UserGate nr 
-    .byte 0x9A
-    .long \nr
-    .word 2
-    .endm 
-
-    .data
-    .align  8
-
-_key_section:
-    .word 0
-
-_key_ref_arr:
-    .long 0
-
-_key_dtor_arr:
-    .long 0
-
-	.text
-	.align 4
-					  					    
-/*##########################################################################
-#
-#   Name       : _start
-#
-#   Purpose....: GCC startup-code
-#
-##########################################################################*/
-
-	.global _start
-
-_start:
-	call get_impure_data_size
-	movl %eax,%ecx
-	UserGate allocate_app_mem_nr
-
-	xorl %eax,%eax
-	.byte 0x64
-	movl %edx,(%eax)
-	movl %edx,%edi
-	rep
-	stosb
-	pushl %edx
-
-    movl $(4 * KEY_ENTRIES),%eax
-	movl %eax,%ecx
-    UserGate allocate_app_mem_nr
-    movl $4,%eax
-    .byte 0x64
-    movl %edx,(%eax)
-    movl %edx,%edi
-	xorl %eax,%eax
-    rep
-    stosb
-
-    movl $(4 * KEY_ENTRIES),%eax
-	movl %eax,%ecx
-    UserGate allocate_app_mem_nr
-    movl %edx,_key_ref_arr
-    movl %edx,%edi
-	xorl %eax,%eax
-    rep
-    stosb
-
-    movl $(4 * KEY_ENTRIES),%eax
-	movl %eax,%ecx
-    UserGate allocate_app_mem_nr
-    movl %edx,_key_dtor_arr
-    movl %edx,%edi
-	xorl %eax,%eax
-    rep
-    stosb
-
-	UserGate create_user_section_nr
-	movw %bx,_key_section
-
-	call __init_rdos
-	add $4, %esp
-
-	movl $0x1000,%eax
-	UserGate allocate_app_mem_nr
-
-	pushl %edx
-	UserGate get_cmd_line_nr
-
-	xorl %ecx,%ecx
-	xorb %ah,%ah
-
-arg_loop:
-	movl %edi,(%edx)
-	addl $4,%edx
-	movb (%edi),%al
-	orb %al,%al
-	je arg_done
-
-arg_scan:	
-	movb (%edi),%al
-	orb %al,%al
-	je next_arg
-
-	cmpb $0x22,%al
-	jne arg_no_quote
-
-	xorb $1,%ah
-	jmp arg_scan_next
-
-arg_no_quote:
-	orb %ah,%ah
-	jnz arg_scan_next
-
-	cmpb $0x20,%al
-	je next_arg
-
-	cmpb $0x8,%al
-	je next_arg
-
-arg_scan_next:
-	incl %edi
-	jmp arg_scan
-
-next_arg:
-	incl %ecx
-
-to_next_arg:
-	orb %al,%al
-	je arg_done
-
-	xorb %al,%al
-	movb %al,(%edi)
-	incl %edi
-	movb (%edi),%al
-	cmpb $0x20,%al
-	je to_next_arg
-
-	cmpb $0x8,%al
-	je to_next_arg
-	
-	jmp arg_loop	
-
-arg_done:
-	int $3
-	pushl %ecx
-	call main
-	add $8, %esp
-
-	pushl %eax
-	call	exit
-					    
-/*##########################################################################
-#
-#   Name       : _exit
-#
-#   Purpose....: GCC exit-code
-#
-##########################################################################*/
-
-	.global _exit
-
-_exit:
-	pushl %ebp
-	movl %esp,%ebp
-	movl 8(%ebp),%eax
-	UserGate unload_exe_nr
-					    					    
-/*##########################################################################
-#
-#   Name       : __getreent
-#
-#   Purpose....: ?
-#
-##########################################################################*/
-
-	.global __getreent
-
-__getreent:
-    xorl %eax,%eax
-	.byte 0x64
-	movl (%eax),%eax
-	ret
-					    					    					    
-/*##########################################################################
-#
-#   Name       : __rdos_thread_key_create
-#
-#   Purpose....: Emulate GCC pthread_key_create
-#
-#   Parameters.: dtor
-#
-#   Returns....: Key index
-#
-##########################################################################*/
-
-	.global __rdos_thread_key_create
-	
-__rdos_thread_key_create:
-    int $3
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-    mov _key_section,%bx
-    UserGate enter_user_section_nr	
-
-	movl _key_ref_arr,%ebx
-    movl KEY_ENTRIES,%ecx
-
-rtkc_scan_loop:
-    movl (%ebx), %eax
-    orl %eax, %eax
-    jz rtkc_entry_found
-
-    add $4, %ebx
-    loop rtkc_scan_loop
-
-    movl $-1, %eax
-    jmp rtkc_leave
-
-rtkc_entry_found:
-    movb $255,3(%ebx)
-    subl _key_ref_arr,%ebx
-    addl _key_dtor_arr,%ebx
-	movl 8(%ebp),%eax
-	movl %eax,(%ebx)
-	subl _key_dtor_arr,%ebx
-	movl %ebx,%eax
-
-rtkc_leave:
-    mov _key_section, %bx
-    UserGate leave_user_section_nr	
-
-    popl %ecx
-    popl %ebx	
-	leave
-	ret
-					    					    					    
-/*##########################################################################
-#
-#   Name       : __rdos_thread_key_delete
-#
-#   Purpose....: Emulate GCC pthread_key_delete
-#
-#   Parameters.: index
-#
-#   Returns....: result
-#
-##########################################################################*/
-
-	.global __rdos_thread_key_delete
-	
-__rdos_thread_key_delete:
-    int $3
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-    mov _key_section,%bx
-    UserGate enter_user_section_nr	
-
-	movl 8(%ebp),%ebx
-	testb $3,%bl
-	jnz rtkd_fail
-
-    cmpl $(4 * KEY_ENTRIES),%ebx
-    jae rtkd_fail
-    	
-    addl _key_ref_arr,%ebx
-    movb $0,3(%ebx)
-    mov (%ebx),%eax
-    orl %eax,%eax
-    jz rtkd_ok
-
-    subl _key_ref_arr,%ebx    
-    movl $0,(%ebx)
-    jmp rtkd_ok
-
-rtkd_fail:
-    movl $1,%eax 
-    jmp rtkd_leave   
-
-rtkd_ok:
-    xorl %eax,%eax 
-
-rtkd_leave:
-    mov _key_section, %bx
-    UserGate leave_user_section_nr	
-
-    popl %ebx	
-	leave
-	ret
-					    					    					    
-/*##########################################################################
-#
-#   Name       : __rdos_thread_getspecific
-#
-#   Purpose....: Emulate GCC pthread_getspecific
-#
-#   Parameters.: index
-#
-#   Returns....: value
-#
-##########################################################################*/
-
-	.global __rdos_thread_getspecific
-	
-__rdos_thread_getspecific:
-    int $3
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	testb $3,%bl
-	jnz rtg_fail
-
-    cmpl $(4 * KEY_ENTRIES),%ebx
-    jae rtg_fail
-
-    movl $4,%eax
-    .byte 0x64
-    movl (%eax),%eax
-    addl %eax,%ebx
-    movl (%ebx),%eax
-    jmp rtg_done
-
-rtg_fail:
-    xorl %eax,%eax
-
-rtg_done:
-    popl %ebx	
-	leave
-	ret
-					    					    					    
-/*##########################################################################
-#
-#   Name       : __rdos_thread_setspecific
-#
-#   Purpose....: Emulate GCC pthread_setspecific
-#
-#   Parameters.: index
-#                value
-#
-##########################################################################*/
-
-	.global __rdos_thread_setspecific
-	
-__rdos_thread_setspecific:
-    int $3
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movl 8(%ebp),%ebx
-	testb $3,%bl
-	jnz rts_fail
-
-    cmpl $(4 * KEY_ENTRIES),%ebx
-    jae rts_fail
-
-    movl $4,%eax
-    .byte 0x64
-    movl (%eax),%eax
-    addl %eax,%ebx
-
-	movl 12(%ebp),%eax
-    movl %eax,(%ebx)
-    xorl %eax,%eax
-    jmp rts_done
-
-rts_fail:
-    movl $1,%eax
-
-rts_done:
-    popl %ebx	
-	leave
-	ret
diff --git a/newlib/libc/sys/rdos/execve.c b/newlib/libc/sys/rdos/execve.c
deleted file mode 100644
index ac7eeb2..0000000
--- a/newlib/libc/sys/rdos/execve.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int execve( char *name, char **argv, char **env)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/fork.c b/newlib/libc/sys/rdos/fork.c
deleted file mode 100755
index fc335bb..0000000
--- a/newlib/libc/sys/rdos/fork.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int fork()

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/fstat.c b/newlib/libc/sys/rdos/fstat.c
deleted file mode 100755
index c18dd78..0000000
--- a/newlib/libc/sys/rdos/fstat.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# fstat.c                                                                

-# fstat function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <errno.h>

-

-int fstat(int fd, struct stat *st)

-{

-  if (fd < 3)

-  {

-      st->st_mode = S_IFCHR;

-      st->st_blksize = 0;

-      return 0;

-  }

-  else

-  {

-      return -1;

-  }  

-}

diff --git a/newlib/libc/sys/rdos/getenv.c b/newlib/libc/sys/rdos/getenv.c
deleted file mode 100644
index 933ea4d..0000000
--- a/newlib/libc/sys/rdos/getenv.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# getenv.c                                                                
-# getenv function implementation
-#
-##########################################################################*/
-
-/*
-FUNCTION
-<<getenv>>---look up environment variable
-
-INDEX
-	getenv
-INDEX
-	environ
-
-ANSI_SYNOPSIS
-	#include <stdlib.h>
-	char *getenv(const char *<[name]>);
-
-TRAD_SYNOPSIS
-	#include <stdlib.h>
-	char *getenv(<[name]>)
-	char *<[name]>;
-
-DESCRIPTION
-<<getenv>> searches the list of environment variable names and values
-(using the global pointer ``<<char **environ>>'') for a variable whose
-name matches the string at <[name]>.  If a variable name matches,
-<<getenv>> returns a pointer to the associated value.
-
-RETURNS
-A pointer to the (string) value of the environment variable, or
-<<NULL>> if there is no such environment variable.
-
-PORTABILITY
-<<getenv>> is ANSI, but the rules for properly forming names of environment
-variables vary from one system to another.
-
-This function is not thread-safe, but does it need to be??
-There is an reentrant class that should be used if reentrance is required
-
-*/
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <rdos.h>
-
-static char envbuf[256];
-
-char *getenv(const char *name)
-{
-    int handle;
-    char *ptr = 0;
-
-    handle = RdosOpenSysEnv();
-    if (handle)
-    {
-        if (RdosFindEnvVar(handle, name, envbuf))
-            ptr = envbuf;
-    }
-    RdosCloseEnv(handle);
-    return ptr;
-}
diff --git a/newlib/libc/sys/rdos/getpid.c b/newlib/libc/sys/rdos/getpid.c
deleted file mode 100644
index d84d673..0000000
--- a/newlib/libc/sys/rdos/getpid.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int getpid()

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/gettod.c b/newlib/libc/sys/rdos/gettod.c
deleted file mode 100644
index b180150..0000000
--- a/newlib/libc/sys/rdos/gettod.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <sys/time.h>

-#include <sys/times.h>

-#include <errno.h>

-

-struct timeval;

-struct timezone;

-

-int gettimeofday(struct timeval *ptimeval, struct timezone *ptimezone)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/isatty.c b/newlib/libc/sys/rdos/isatty.c
deleted file mode 100644
index 9862a87..0000000
--- a/newlib/libc/sys/rdos/isatty.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int isatty(int file)

-{

-  return 0;

-}

diff --git a/newlib/libc/sys/rdos/kill.c b/newlib/libc/sys/rdos/kill.c
deleted file mode 100644
index 4f77906..0000000
--- a/newlib/libc/sys/rdos/kill.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int kill(int pid, int sig)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/link.c b/newlib/libc/sys/rdos/link.c
deleted file mode 100644
index 23c0b2b..0000000
--- a/newlib/libc/sys/rdos/link.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int link(char *existing, char *new)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/lseek.c b/newlib/libc/sys/rdos/lseek.c
deleted file mode 100755
index b1cdb21..0000000
--- a/newlib/libc/sys/rdos/lseek.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# lseek.c                                                                

-# lseek function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <unistd.h>

-#include <errno.h>

-#include <rdos.h>

-

-off_t lseek(int file, off_t pos, int whence)

-{

-	off_t temp;

-

-	switch (whence)

-	{

-		case SEEK_CUR:

-			temp = RdosGetFilePos(file);

-			temp += pos;

-			RdosSetFilePos(file, temp);

-			return temp;

-

-		case SEEK_SET:

-			RdosSetFilePos(file, pos);

-			return pos;

-

-		case SEEK_END:

-			temp = RdosGetFilePos(file);

-			temp += pos;

-			RdosSetFilePos(file, temp);

-			return temp;

-

-		default:

-			errno = EINVAL;

-			return - 1;

-	}

-}

diff --git a/newlib/libc/sys/rdos/open.c b/newlib/libc/sys/rdos/open.c
deleted file mode 100755
index e989106..0000000
--- a/newlib/libc/sys/rdos/open.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# open.c                                                                

-# open function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <fcntl.h>

-#include <errno.h>

-#include "rdos.h"

-#include <stdarg.h>

-

-int open(const char *file, int flags, ...)

-{

-	int handle;

-	int pos;

-

-	if (flags & O_CREAT)

-		handle = RdosCreateFile(file, flags);

-	else

-		handle = RdosOpenFile(file, flags);

-

-	if (handle >= 0)

-	{

-		if (flags & O_APPEND)

-		{

-			pos = RdosGetFileSize(handle);

-			RdosSetFilePos(handle, pos);

-		}

-

-		if (flags & O_TRUNC)

-			RdosSetFileSize(handle, 0);

-	

-		return handle;

-	}

-	else

-		return -1;

-}

diff --git a/newlib/libc/sys/rdos/rdos.S b/newlib/libc/sys/rdos/rdos.S
deleted file mode 100644
index d99be73..0000000
--- a/newlib/libc/sys/rdos/rdos.S
+++ /dev/null
@@ -1,7528 +0,0 @@
-/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# rdos.S                                                                
-# GCC based interface to RDOS kernel                                    
-#
-##########################################################################*/
-
-#include "user.def"
-
-    .macro UserGate nr 
-    .byte 0x9A
-    .long \nr
-    .word 2
-    .endm 
-
-/*##########################################################################
-#
-#   Name       : RdosSwapShort
-#
-#   Purpose....: Byte reverse a short int
-#
-#   Returns....: Result
-#
-##########################################################################*/
-
-    .global RdosSwapShort
-    
-RdosSwapShort:
-	pushl %ebp
-	movl %esp,%ebp
-	movw 8(%ebp),%ax
-	xchgb %ah,%al
-	leave
-	ret
-
-
-/*##########################################################################
-#
-#   Name       : RdosSwapLong
-#
-#   Purpose....: Byte reverse a long int
-#
-#   Returns....: Result
-#
-##########################################################################*/
-
-    .global RdosSwapLong
-    
-RdosSwapLong:
-	pushl %ebp
-	movl %esp,%ebp
-	movl 8(%ebp),%eax
-	xchgb %ah,%al
-	roll $16,%eax
-	xchgb %ah,%al
-	leave
-	ret
-
-
-/*##########################################################################
-#
-#   Name       : LocalToNetworkLong
-#
-#   Purpose....: Convert a local long to network format
-#
-#   Returns....: Network format
-#
-##########################################################################*/
-
-    .global LocalToNetworkLong
-    
-LocalToNetworkLong:
-	pushl %ebp
-	movl %esp,%ebp
-	movl 8(%ebp),%eax
-	xchgb %ah,%al
-	roll $16,%eax
-	xchgb %ah,%al
-	leave
-	ret
-
-/*##########################################################################
-#
-#   Name       : NetworkToLocalLong
-#
-#   Purpose....: Convert a network long to local format
-#
-#   Returns....: Local format
-#
-##########################################################################*/
-
-    .global NetworkToLocalLong
-    
-NetworkToLocalLong:
-	pushl %ebp
-	movl %esp,%ebp
-	movl 8(%ebp),%eax
-	xchgb %ah,%al
-	roll $16,%eax
-	xchgb %ah,%al
-	leave
-	ret
-
-/*##########################################################################
-#
-#   Name       : RdosGetThreadHandle
-#
-#   Purpose....: Get current thread handle
-#
-#   Returns....: Thread ID
-#
-##########################################################################*/
-
-    .global RdosGetThreadHandle
-    
-RdosGetThreadHandle:
-	pushl %ebp
-	movl %esp,%ebp
-	UserGate get_thread_nr
-	movzx %ax,%eax
-	leave
-	ret
-
-/*##########################################################################
-#
-#   Name       : RdosGetThreadState
-#
-#   Purpose....: Get thread state
-#
-#   Parameters.: Thread #
-#                State buffer
-#
-##########################################################################*/
-
-    .global RdosGetThreadState
-    
-RdosGetThreadState:
-	pushl %ebp
-	movl %esp,%ebp
-	push %edi
-
-	movl 8(%ebp),%eax
-	movl 12(%ebp),%edx
-	UserGate get_thread_state_nr
-	jc rgtsFail
-	
-    movl $1,%eax
-    jmp rgtsDone
-    
-rgtsFail:
-    xorl %eax,%eax
-
-rgtsDone:
-	popl %edi
-	leave
-	ret
-
-/*##########################################################################
-#
-#   Name       : RdosSuspendThread
-#
-#   Purpose....: Suspend thread
-#
-#   Parameters.: Thread #
-#
-##########################################################################*/
-
-    .global RdosSuspendThread
-    
-RdosSuspendThread:
-	pushl %ebp
-	movl %esp,%ebp
-
-	movl 8(%ebp),%eax
-	UserGate suspend_thread_nr
-	jc rsfFail
-
-    movl $1,%eax
-    jmp rsfDone
-    
-rsfFail:
-    xorl %eax,%eax
-
-rsfDone:
-    leave
-    ret
-    
-
-/*##########################################################################
-#
-#   Name       : RdosExec
-#
-#   Purpose....: Execute a program
-#
-#   Parameters.: Program
-#                Commandline
-#
-##########################################################################*/
-
-    .global RdosExec
-    
-RdosExec:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%esi
-	movl 12(%ebp),%edi
-
-	UserGate load_exe_nr
-	UserGate get_exit_code_nr
-
-	popl %edi
-	popl %esi
-	leave
-	ret
-    
-/*##########################################################################
-#
-#   Name       : RdosSpawn
-#
-#   Purpose....: Create new process and run a program
-#
-#   Parameters.: Program
-#                Commandline
-#                StartDir
-#
-##########################################################################*/
-
-    .global RdosSpawn
-    
-RdosSpawn:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %fs
-	pushl %ebx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-    movw %ds,%dx
-    movw %dx,%fs
-    xorl %edx,%edx
-	movl 8(%ebp),%esi
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ebx
-	UserGate spawn_exe_nr
-	jc rsFail
-	
-    movzx %dx,%eax
-    jmp rsDone
-    
-rsFail:
-    xorl %eax,%eax
-
-rsDone:
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ebx
-	popw %fs
-	leave
-	ret
-    
-/*##########################################################################
-#
-#   Name       : RdosCpuReset
-#
-#   Purpose....: Cpu reset
-#
-##########################################################################*/
-
-    .global RdosCpuReset
-    
-RdosCpuReset:
-	pushl %ebp
-	movl %esp,%ebp
-	UserGate cpu_reset_nr
-	leave
-	ret
-    
-/*##########################################################################
-#
-#   Name       : RdosGetVersion
-#
-#   Purpose....: Get RDOS version
-#
-#   Parameters.: &major
-#                &minor
-#                &release
-#
-##########################################################################*/
-
-    .global RdosGetVersion
-    
-RdosGetVersion:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	UserGate get_version_nr
-
-    movzx %dx,%edx
-	movl 8(%ebp),%edi
-	movl %edx,(%edi)
-
-    movzx %ax,%eax
-	movl 12(%ebp),%edi
-	movl %eax,(%edi)
-
-    movzx %cx,%eax
-	movl 16(%ebp),%edi
-	movl %eax,(%edi)
-
-	popl %edi
-	popl %edx
-	popl %ecx
-	popl %eax
-	leave
-	ret
-    
-/*##########################################################################
-#
-#   Name       : RdosAllocateMem
-#
-#   Purpose....: Allocate memory
-#
-#   Parameters.: Bytes to allocate
-#
-#   Returns....: Memory pointer
-#
-##########################################################################*/
-
-    .global RdosAllocateMem
-    
-RdosAllocateMem:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-
-	movl 8(%ebp),%eax
-	UserGate allocate_app_mem_nr
-	movl %edx,%eax
-
-	popl %edx
-	leave
-	ret
-    
-/*##########################################################################
-#
-#   Name       : RdosFreeMem
-#
-#   Purpose....: Free memory
-#
-#   Parameters.: Memory pointer
-#
-##########################################################################*/
-
-    .global RdosFreeMem
-
-RdosFreeMem:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-
-	movl 8(%ebp),%edx
-	UserGate free_app_mem_nr
-
-	popl %edx
-	leave
-	ret
-	    
-/*##########################################################################
-#
-#   Name       : RdosAppDebug
-#
-#   Purpose....: App debug
-#
-##########################################################################*/
-
-    .global RdosAppDebug
-    
-RdosAppDebug:
-	pushl %ebp
-	movl %esp,%ebp
-	UserGate app_debug_nr
-	leave
-	ret
-		    
-/*##########################################################################
-#
-#   Name       : RdosWaitMilli
-#
-#   Purpose....: Wait a number of milliseconds
-#
-#   Parameters.: Milliseconds to wait
-#
-##########################################################################*/
-
-    .global RdosWaitMilli
-    
-RdosWaitMilli:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-
-	movl 8(%ebp),%eax
-	UserGate wait_milli_nr
-
-	popl %eax
-	leave
-	ret
-			    
-/*##########################################################################
-#
-#   Name       : RdosCreateSection
-#
-#   Purpose....: Create section
-#
-#   Returns....: Section handle
-#
-##########################################################################*/
-
-    .global RdosCreateSection
-    
-RdosCreateSection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	
-	UserGate create_user_section_nr
-	movzx %bx,%eax
-
-	popl %ebx
-	leave
-	ret
-			    
-/*##########################################################################
-#
-#   Name       : RdosDeleteSection
-#
-#   Purpose....: Delete section
-#
-#   Parameters.: Section handle
-#
-##########################################################################*/
-
-    .global RdosDeleteSection
-    
-RdosDeleteSection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate delete_user_section_nr
-
-	popl %ebx
-	leave
-	ret
-				    
-/*##########################################################################
-#
-#   Name       : RdosEnterSection
-#
-#   Purpose....: Enter section
-#
-#   Parameters.: Section handle
-#
-##########################################################################*/
-
-    .global RdosEnterSection
-    
-RdosEnterSection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate enter_user_section_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosLeaveSection
-#
-#   Purpose....: Leave section
-#
-#   Parameters.: Section handle
-#
-##########################################################################*/
-
-    .global RdosLeaveSection
-    
-RdosLeaveSection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate leave_user_section_nr
-
-	popl %ebx
-	leave
-	ret
-				    
-/*##########################################################################
-#
-#   Name       : RdosCreateWait
-#
-#   Purpose....: Create wait object
-#
-#   Returns....: Wait handle
-#
-##########################################################################*/
-
-    .global RdosCreateWait
-    
-RdosCreateWait:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	UserGate create_wait_nr
-	movzx %bx,%eax
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosCloseWait
-#
-#   Purpose....: Close wait
-#
-#   Parameters.: Wait handle
-#
-##########################################################################*/
-
-    .global RdosCloseWait
-    
-RdosCloseWait:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_wait_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosCheckWait
-#
-#   Purpose....: Check wait state
-#
-#   Parameters.: Wait handle
-#
-#   Returns....: Signalled ID or 0
-#
-##########################################################################*/
-
-    .global RdosCheckWait
-    
-RdosCheckWait:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	UserGate is_wait_idle_nr
-    movl %ecx,%eax
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosWaitForever
-#
-#   Purpose....: Wait forever
-#
-#   Parameters.: Wait handle
-#
-#   Returns....: Signalled ID or 0
-#
-##########################################################################*/
-
-    .global RdosWaitForever
-    
-RdosWaitForever:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	UserGate wait_no_timeout_nr
-	jc rwfFail
-
-    movl %ecx,%eax
-    jmp rwfDone
-
-rwfFail:
-    xorl %eax,%eax
-
-rwfDone:
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosWaitTimeout
-#
-#   Purpose....: Wait with timeout
-#
-#   Parameters.: Wait handle
-#                Timeout in ms
-#
-#   Returns....: Signalled ID or 0
-#
-##########################################################################*/
-
-    .global RdosWaitTimeout
-    
-RdosWaitTimeout:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movl 12(%ebp),%eax
-	movl $1193,%edx
-	mull %edx
-	pushl %edx
-	pushl %eax
-    UserGate get_system_time_nr
-    popl %ebx
-    addl %ebx,%eax
-    popl %ebx
-    adcl %ebx,%edx
-	movw 8(%ebp),%bx
-	UserGate wait_timeout_nr
-	jc rwtFail
-
-    movl %ecx,%eax
-    jmp rwtDone
-
-rwtFail:
-    xorl %eax,%eax
-
-rwtDone:
-    popl %edx
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosStopWait
-#
-#   Purpose....: Stop wait
-#
-#   Parameters.: Wait handle
-#
-##########################################################################*/
-
-    .global RdosStopWait
-    
-RdosStopWait:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate stop_wait_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosRemoveWait
-#
-#   Purpose....: Remove wait object from wait handle
-#
-#   Parameters.: Wait handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosRemoveWait
-    
-RdosRemoveWait:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%ecx
-	UserGate remove_wait_nr
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-				    
-/*##########################################################################
-#
-#   Name       : RdosCreateSignal
-#
-#   Purpose....: Create signal object
-#
-#   Returns....: Signal handle
-#
-##########################################################################*/
-
-    .global RdosCreateSignal
-    
-RdosCreateSignal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	UserGate create_signal_nr
-	movzx %bx,%eax
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosResetSignal
-#
-#   Purpose....: Reset signal
-#
-#   Parameters.: Signal handle
-#
-##########################################################################*/
-
-    .global RdosResetSignal
-    
-RdosResetSignal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate reset_signal_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosIsSignalled
-#
-#   Purpose....: Check if signalled
-#
-#   Parameters.: Signal handle
-#
-#   Returns....: TRUE if signalled
-#
-##########################################################################*/
-
-    .global RdosIsSignalled
-    
-RdosIsSignalled:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate is_signalled_nr
-	jc risdFree
-
-    movl $1,%eax
-    jmp risdDone	
-
-risdFree:
-    xorl %eax,%eax
-
-risdDone:
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetSignal
-#
-#   Purpose....: Set signal
-#
-#   Parameters.: Signal handle
-#
-##########################################################################*/
-
-    .global RdosSetSignal
-    
-RdosSetSignal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate set_signal_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosFreeSignal
-#
-#   Purpose....: Free signal handle
-#
-#   Parameters.: Signal handle
-#
-##########################################################################*/
-
-    .global RdosFreeSignal
-    
-RdosFreeSignal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate free_signal_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForSignal
-#
-#   Purpose....: Add signal object to wait handle
-#
-#   Parameters.: Wait handle
-#                Signal handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForSignal
-    
-RdosAddWaitForSignal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	movl 16(%ebp),%ecx
-	UserGate add_wait_for_signal_nr
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForKeyboard
-#
-#   Purpose....: Add keyboard to wait handle
-#
-#   Parameters.: Wait handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForKeyboard
-    
-RdosAddWaitForKeyboard:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%ecx
-	UserGate add_wait_for_keyboard_nr
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForMouse
-#
-#   Purpose....: Add mouse to wait handle
-#
-#   Parameters.: Wait handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForMouse
-    
-RdosAddWaitForMouse:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%ecx
-	UserGate add_wait_for_mouse_nr
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForCom
-#
-#   Purpose....: Add com object to wait handle
-#
-#   Parameters.: Wait handle
-#                Com handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForCom
-    
-RdosAddWaitForCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	movl 16(%ebp),%ecx
-	UserGate add_wait_for_com_nr
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForAdc
-#
-#   Purpose....: Add ADC object to wait handle
-#
-#   Parameters.: Wait handle
-#                Adc handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForAdc
-    
-RdosAddWaitForAdc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	movl 16(%ebp),%ecx
-	UserGate add_wait_for_adc_nr
-
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetTextMode
-#
-#   Purpose....: Set text mode
-#
-##########################################################################*/
-
-    .global RdosSetTextMode
-    
-RdosSetTextMode:
-	pushl %ebp
-	movl %esp,%ebp
-
-	movw $3,%ax
-    UserGate set_video_mode_nr
-
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetVideoMode
-#
-#   Purpose....: Set video mode
-#
-#   Parameters.: &xres
-#                &yres
-#                &linesize
-#                &LFB
-#
-#   Returns....: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosSetVideoMode
-    
-RdosSetVideoMode:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movw (%edi),%ax
-
-	movl 12(%ebp),%edi
-	movw (%edi),%cx
-
-	movl 16(%ebp),%edi
-	movw (%edi),%dx
-
-	UserGate get_video_mode_nr
-	jc set_video_fail
-
-    UserGate set_video_mode_nr
-    jc set_video_fail
-
-	pushl %edi
-	movl 8(%ebp),%edi
-	movzx %ax,%eax
-	movl %eax,(%edi)
-
-	movl 12(%ebp),%edi
-	movzx %cx,%ecx
-	movl %ecx,(%edi)
-
-	movl 16(%ebp),%edi
-	movzx %dx,%edx
-	movl %edx,(%edi)
-
-	movl 20(%ebp),%edi
-	movzx %si,%esi
-	movl %esi,(%edi)
-	popl %edi
-
-	movl 24(%ebp),%eax
-	movl %edi,(%eax)
-
-	movzx %bx,%eax
-	jmp set_video_done
-
-set_video_fail:
-	xorl %eax,%eax
-	movl 8(%ebp),%edi
-	movl %eax,(%edi)
-	movl 12(%ebp),%edi
-	movl %eax,(%edi)
-	movl 16(%ebp),%edi
-	movl %eax,(%edi)
-	movl 20(%ebp),%edi
-	movl %eax,(%edi)
-	movl 24(%ebp),%edi
-	movl %eax,(%edi)
-
-set_video_done:
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetClipRect
-#
-#   Purpose....: Set clip rectangle
-#
-#   Parameters.: Bitmap handle
-#                xmin, xmax, ymin, ymax
-#
-##########################################################################*/
-
-    .global RdosSetClipRect
-    
-RdosSetClipRect:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	movw 20(%ebp),%si
-	movw 24(%ebp),%di
-	UserGate set_clip_rect_nr
-
-    popl %edi
-    popl %esi
-    popl %edx
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosClearClipRect
-#
-#   Purpose....: Clear clip rectangle
-#
-#   Parameters.: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosClearClipRect
-    
-RdosClearClipRect:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate clear_clip_rect_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetDrawColor
-#
-#   Purpose....: Set draw color
-#
-#   Parameters.: Bitmap handle
-#                Color
-#
-##########################################################################*/
-
-    .global RdosSetDrawColor
-    
-RdosSetDrawColor:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%eax
-	UserGate set_drawcolor_nr
-
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetLGOP
-#
-#   Purpose....: Set draw color
-#
-#   Parameters.: Bitmap handle
-#                LGOP
-#
-##########################################################################*/
-
-    .global RdosSetLGOP
-    
-RdosSetLGOP:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	UserGate set_lgop_nr
-
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetHollowStyle
-#
-#   Purpose....: Set hollow fill style
-#
-#   Parameters.: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosSetHollowStyle
-    
-RdosSetHollowStyle:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate set_hollow_style_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosSetFilledStyle
-#
-#   Purpose....: Set filled fill style
-#
-#   Parameters.: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosSetFilledStyle
-    
-RdosSetFilledStyle:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate set_filled_style_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosOpenFont
-#
-#   Purpose....: Open a font
-#
-#   Parameters.: height
-#
-#   Returns....: Font handle
-#
-##########################################################################*/
-
-    .global RdosOpenFont
-    
-RdosOpenFont:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%ax
-	UserGate open_font_nr
-	movzx %bx,%eax
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosCloseFont
-#
-#   Purpose....: Close font handle
-#
-#   Parameters.: Font handle
-#
-##########################################################################*/
-
-    .global RdosCloseFont
-    
-RdosCloseFont:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_font_nr
-
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosGetStringMetrics
-#
-#   Purpose....: Get string metrics for text using font
-#
-#   Parameters.: Font handle
-#                String
-#                &width
-#                &height
-#
-##########################################################################*/
-
-    .global RdosGetStringMetrics
-    
-RdosGetStringMetrics:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	UserGate get_string_metrics_nr
-
-	movl 16(%ebp),%edi
-	movzx %cx,%ecx
-	movl %ecx,(%edi)
-	
-	movl 20(%ebp),%edi
-	movzx %dx,%edx
-	movl %edx,(%edi)
-
-	popl %edi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetFont
-#
-#   Purpose....: Set font
-#
-#   Parameters.: Bitmap handle
-#                Font handle
-#
-##########################################################################*/
-
-    .global RdosSetFont
-    
-RdosSetFont:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	UserGate set_font_nr
-
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetPixel
-#
-#   Purpose....: Get pixel
-#
-#   Parameters.: Bitmap handle
-#                x, y
-#
-##########################################################################*/
-
-    .global RdosGetPixel
-    
-RdosGetPixel:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	UserGate get_pixel_nr
-
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetPixel
-#
-#   Purpose....: Set pixel
-#
-#   Parameters.: Bitmap handle
-#                x, y
-#
-##########################################################################*/
-
-    .global RdosSetPixel
-    
-RdosSetPixel:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	UserGate set_pixel_nr
-
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosBlit
-#
-#   Purpose....: Blit
-#
-#   Parameters.: SrcHandle
-#                DestHandle
-#                width, height
-#                SrcX, SrcY
-#                DestX, DestY
-#
-##########################################################################*/
-
-    .global RdosBlit
-    
-RdosBlit:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-;
-	movw 8(%ebp),%ax
-	movw 12(%ebp),%bx
-	movw 16(%ebp),%cx
-	movw 20(%ebp),%dx
-	movw 28(%ebp),%si
-	shll $16,%esi
-	movw 24(%ebp),%si
-	movw 36(%ebp),%di
-	shll $16,%edi
-	movw 32(%ebp),%di
-	UserGate blit_nr
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDrawMask
-#
-#   Purpose....: Draw mask
-#
-#   Parameters.: Bitmap handle
-#                mask
-#                RowSize
-#                width, height
-#                SrcX, SrcY
-#                DestX, DestY
-#
-##########################################################################*/
-
-    .global RdosDrawMask
-    
-RdosDrawMask:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-;
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	movw 16(%ebp),%ax
-	movw 24(%ebp),%si
-	shll $16,%esi
-	movw 20(%ebp),%si
-	movw 32(%ebp),%cx
-	shll $16,%ecx
-	movw 28(%ebp),%cx
-	movw 40(%ebp),%dx
-	shll $16,%edx
-	movw 36(%ebp),%dx
-	UserGate draw_mask_nr
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDrawLine
-#
-#   Purpose....: Draw a line
-#
-#   Parameters.: Bitmap handle
-#                x1, y1
-#                x2, y2
-#
-##########################################################################*/
-
-    .global RdosDrawLine
-    
-RdosDrawLine:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-;
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	movw 20(%ebp),%si
-	movw 24(%ebp),%di
-	UserGate draw_line_nr
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDrawString
-#
-#   Purpose....: Draw a string
-#
-#   Parameters.: Bitmap handle
-#                x, y
-#                string
-#
-##########################################################################*/
-
-    .global RdosDrawString
-    
-RdosDrawString:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-;
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	movl 20(%ebp),%edi
-	UserGate draw_string_nr
-
-	popl %edi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDrawRect
-#
-#   Purpose....: Draw a rect
-#
-#   Parameters.: Bitmap handle
-#                x, y
-#                width, height
-#
-##########################################################################*/
-
-    .global RdosDrawRect
-    
-RdosDrawRect:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	movw 20(%ebp),%si
-	movw 24(%ebp),%di
-	UserGate draw_rect_nr
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDrawEllipse
-#
-#   Purpose....: Draw an ellipse
-#
-#   Parameters.: Bitmap handle
-#                x, y
-#                width, height
-#
-##########################################################################*/
-
-    .global RdosDrawEllipse
-    
-RdosDrawEllipse:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	movw 20(%ebp),%si
-	movw 24(%ebp),%di
-	UserGate draw_ellipse_nr
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosCreateBitmap
-#
-#   Purpose....: Create a bitmap
-#
-#   Parameters.: BitsPerPixel
-#                width, height
-#
-#   Returns....: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosCreateBitmap
-    
-RdosCreateBitmap:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%ax
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	UserGate create_bitmap_nr
-	movzx %bx,%eax
-;
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDuplicateBitmapHandle
-#
-#   Purpose....: Duplicate bitmap handle for use in another thread / object
-#
-#   Parameters.: Bitmap handle
-#
-#   Returns....: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosDuplicateBitmapHandle
-    
-RdosDuplicateBitmapHandle:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate dup_bitmap_handle_nr
-	movzx %bx,%eax
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseBitmap
-#
-#   Purpose....: Close bitmap handle
-#
-#   Parameters.: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosCloseBitmap
-    
-RdosCloseBitmap:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_bitmap_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateStringBitmap
-#
-#   Purpose....: Create bitmap from string & font
-#
-#   Parameters.: Font
-#                string
-#
-#   Returns....: Bitmap handle
-#
-##########################################################################*/
-
-    .global RdosCreateStringBitmap
-    
-RdosCreateStringBitmap:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	UserGate create_string_bitmap_nr
-	movzx %bx,%eax
-;
-	popl %edi
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetBitmapInfo
-#
-#   Purpose....: Get info about bitmap
-#
-#   Parameters.: Bitmap handle
-#                &BitsPerPixel
-#                &width, &height
-#                &linesize
-#                &LFB
-#
-##########################################################################*/
-
-    .global RdosGetBitmapInfo
-    
-RdosGetBitmapInfo:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	UserGate get_bitmap_info_nr
-	jc gbiFail
-
-	pushl %edi
-	movl 12(%ebp),%edi
-	movzx %al,%eax
-	movl %eax,(%edi)
-
-	movl 16(%ebp),%edi
-	movzx %cx,%ecx
-	movl %ecx,(%edi)
-	
-	movl 20(%ebp),%edi
-	movzx %dx,%edx
-	movl %edx,(%edi)
-
-	movl 24(%ebp),%edi
-	movzx %si,%esi
-	movl %esi,(%edi)
-	popl %edi
-	
-	movl 28(%ebp),%eax
-	movl %edi,(%eax)
-	jmp gbiDone
-
-gbiFail:
-	xorl %eax,%eax
-	movl 12(%ebp),%edi
-	movl %eax,(%edi)
-
-	movl 16(%ebp),%edi
-	movl %eax,(%edi)
-
-	movl 20(%ebp),%edi
-	movl %eax,(%edi)
-
-	movl 24(%ebp),%edi
-	movl %eax,(%edi)
-
-	movl 28(%ebp),%edi
-	movl %eax,(%edi)
-
-gbiDone:
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    
-/*##########################################################################
-#
-#   Name       : RdosCreateSprite
-#
-#   Purpose....: Create a sprite
-#
-#   Parameters.: dest
-#                bitmap
-#                mask
-#                LGOP
-#
-#   Returns....: Sprite handle
-#
-##########################################################################*/
-
-    .global RdosCreateSprite
-    
-RdosCreateSprite:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	movw 20(%ebp),%ax
-	UserGate create_sprite_nr
-	movzx %bx,%eax
-
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseSprite
-#
-#   Purpose....: Close sprite handle
-#
-#   Parameters.: Sprite handle
-#
-##########################################################################*/
-
-    .global RdosCloseSprite
-    
-RdosCloseSprite:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_sprite_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosShowSprite
-#
-#   Purpose....: Show sprite
-#
-#   Parameters.: Sprite handle
-#
-##########################################################################*/
-
-    .global RdosShowSprite
-    
-RdosShowSprite:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate show_sprite_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosHideSprite
-#
-#   Purpose....: Hide sprite
-#
-#   Parameters.: Sprite handle
-#
-##########################################################################*/
-
-    .global RdosHideSprite
-    
-RdosHideSprite:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate hide_sprite_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosMoveSprite
-#
-#   Purpose....: Move sprite
-#
-#   Parameters.: Sprite handle
-#                x, y
-#
-##########################################################################*/
-
-    .global RdosMoveSprite
-    
-RdosMoveSprite:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%cx
-	movw 16(%ebp),%dx
-	UserGate move_sprite_nr
-
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetForeColor
-#
-#   Purpose....: Set text-mode fore color
-#
-#   Parameters.: palette index
-#
-##########################################################################*/
-
-    .global RdosSetForeColor
-    
-RdosSetForeColor:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-
-	movb 8(%ebp),%al
-	UserGate set_forecolor_nr
-
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetBackColor
-#
-#   Purpose....: Set text-mode back color
-#
-#   Parameters.: palette index
-#
-##########################################################################*/
-
-    .global RdosSetBackColor
-    
-RdosSetBackColor:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-
-	movb 8(%ebp),%al
-	UserGate set_backcolor_nr
-
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetSysTime
-#
-#   Purpose....: Get system time
-#
-#   Parameters.: &year, &month, &day
-#                &hour, &min, &sec, &ms
-#
-##########################################################################*/
-
-    .global RdosGetSysTime
-    
-RdosGetSysTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	UserGate get_system_time_nr
-	pushl %eax
-	UserGate binary_to_time_nr
-	pushl %edx
-
-	movl 8(%ebp),%esi
-	movzx %dx,%edx
-	movl %edx,(%esi)
-
-	movl 12(%ebp),%esi
-	movzx %ch,%edx
-	movl %edx,(%esi)
-
-	movl 16(%ebp),%esi
-	movzx %cl,%edx
-	movl %edx,(%esi)
-
-	movl 20(%ebp),%esi
-	movzx %bh,%edx
-	movl %edx,(%esi)
-
-	movl 24(%ebp),%esi
-	movzx %bl,%edx
-	movl %edx,(%esi)
-
-	movl 28(%ebp),%esi
-	movzx %ah,%edx
-	movl %edx,(%esi)
-
-	popl %edx
-	UserGate time_to_binary_nr
-	movl %eax,%ebx
-	popl %eax
-	subl %ebx,%eax
-	xorl %edx,%edx
-	movl $1192,%ebx
-	divl %ebx
-
-	movl 32(%ebp),%esi
-	movzx %ax,%eax
-	movl %eax,(%esi)
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetTime
-#
-#   Purpose....: Get time
-#
-#   Parameters.: &year, &month, &day
-#                &hour, &min, &sec, &ms
-#
-##########################################################################*/
-
-    .global RdosGetTime
-    
-RdosGetTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	UserGate get_time_nr
-	pushl %eax
-	UserGate binary_to_time_nr
-	pushl %edx
-
-	movl 8(%ebp),%esi
-	movzx %dx,%edx
-	movl %edx,(%esi)
-
-	movl 12(%ebp),%esi
-	movzx %ch,%edx
-	movl %edx,(%esi)
-
-	movl 16(%ebp),%esi
-	movzx %cl,%edx
-	movl %edx,(%esi)
-
-	movl 20(%ebp),%esi
-	movzx %bh,%edx
-	movl %edx,(%esi)
-
-	movl 24(%ebp),%esi
-	movzx %bl,%edx
-	movl %edx,(%esi)
-
-	movl 28(%ebp),%esi
-	movzx %ah,%edx
-	movl %edx,(%esi)
-
-	popl %edx
-	UserGate time_to_binary_nr
-	movl %eax,%ebx
-	popl %eax
-	subl %ebx,%eax
-	xorl %edx,%edx
-	movl $1192,%ebx
-	divl %ebx
-
-	movl 32(%ebp),%esi
-	movzx %ax,%eax
-	movl %eax,(%esi)
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetTime
-#
-#   Purpose....: Set time
-#
-#   Parameters.: year, month, day
-#                hour, min, sec, ms
-#
-##########################################################################*/
-
-    .global RdosSetTime
-    
-RdosSetTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	movw 8(%ebp),%dx
-	movb 12(%ebp),%ch
-	movb 16(%ebp),%cl
-	movb 20(%ebp),%bh
-	movb 24(%ebp),%bl
-	movb 28(%ebp),%ah
-	UserGate time_to_binary_nr
-
-    movl %edx,%edi
-    movl %eax,%esi
-
-	movl 32(%ebp),%eax
-    movl $1192,%edx
-    mull %edx
-    addl %eax,%esi
-    adcl $0,%edi    
-
-	UserGate get_system_time_nr
-    subl %eax,%esi
-    sbbl %edx,%edi
-    movl %esi,%eax
-    movl %edi,%edx
-    UserGate update_time_nr
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosTicsToRecord
-#
-#   Purpose....: Convert tics to record format
-#
-#   Parameters.: MSB, LSB
-#                &year, &month, &day
-#                &hour, &min, &sec, &ms
-#
-##########################################################################*/
-
-    .global RdosTicsToRecord
-    
-RdosTicsToRecord:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	movl 8(%ebp),%edx
-	movl 12(%ebp),%eax
-	addl $596,%eax
-	adcl $0,%edx
-	UserGate binary_to_time_nr
-	pushl %edx
-
-	movl 16(%ebp),%esi
-	movzx %dx,%edx
-	movl %edx,(%esi)
-
-	movl 20(%ebp),%esi
-	movzx %ch,%edx
-	movl %edx,(%esi)
-
-	movl 24(%ebp),%esi
-	movzx %cl,%edx
-	movl %edx,(%esi)
-
-	movl 28(%ebp),%esi
-	movzx %bh,%edx
-	movl %edx,(%esi)
-
-	movl 32(%ebp),%esi
-	movzx %bl,%edx
-	movl %edx,(%esi)
-
-	movl 36(%ebp),%esi
-	movzx %ah,%edx
-	movl %edx,(%esi)
-
-	popl %edx
-	UserGate time_to_binary_nr
-	movl %eax,%ebx
-	movl 12(%ebp),%eax
-	subl %edx,%eax
-	xorl %edx,%edx
-	movl $1192,%ebx
-	divl %ebx
-
-	movl 40(%ebp),%esi
-	cmpw %ax,1000
-	jne rttrSaveMs
-
-	decw %ax
-
-rttrSaveMs:	
-	movzx %ax,%eax
-	movl %eax,(%esi)
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosRecordToTics
-#
-#   Purpose....: Convert from record format to tics
-#
-#   Parameters.: &MSB, &LSB
-#                year, month, day
-#                hour, min, sec, ms
-#
-##########################################################################*/
-
-    .global RdosRecordToTics
-    
-RdosRecordToTics:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	movl 40(%ebp),%eax
-	movl $1192,%edx
-	mull %edx
-	pushl %eax
-	movw 16(%ebp),%dx
-	movb 20(%ebp),%ch
-	movb 24(%ebp),%cl
-	movb 28(%ebp),%bh
-	movb 32(%ebp),%bl
-	movb 36(%ebp),%ah
-	UserGate time_to_binary_nr
-	popl %ebx
-	addl %ebx,%eax
-	adcl $0,%edx
-
-	movl 8(%ebp),%esi
-	movl %edx,(%esi)
-
-	movl 12(%ebp),%esi
-	movl %eax,(%esi)
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDecodeMsbTics
-#
-#   Purpose....: Decode MSB tics
-#
-#   Parameters.: MSB
-#                &day, &hour
-#
-##########################################################################*/
-
-    .global RdosDecodeMsbTics
-    
-RdosDecodeMsbTics:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	movl 8(%ebp),%eax
-	xorl %edx,%edx
-	movl $24,%ecx
-	divl %ecx
-
-	movl 12(%ebp),%ebx
-	movl %eax,(%ebx)
-
-	movl 16(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDecodeLsbTics
-#
-#   Purpose....: Decode LSB tics
-#
-#   Parameters.: LSB
-#                &min, &sec, &ms, &us
-#
-##########################################################################*/
-
-    .global RdosDecodeLsbTics
-    
-RdosDecodeLsbTics:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	movl 8(%ebp),%eax
-	movl $60,%edx
-	mull %edx
-	movl 12(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	movl $60,%edx
-	mull %edx
-	movl 16(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	movl $1000,%edx
-	mull %edx
-	movl 20(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	movl $1000,%edx
-	mull %edx
-	movl 24(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDayOfWeek
-#
-#   Purpose....: Get day of week
-#
-#   Parameters.: year, month, day
-#
-#   Returns....: day of week
-#
-##########################################################################*/
-
-    .global RdosDayOfWeek
-    
-RdosDayOfWeek:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movl 8(%ebp),%edx
-	movb 12(%ebp),%ch
-	movb 16(%ebp),%cl
-    xorw %bx,%bx
-    xorb %ah,%ah
-	UserGate adjust_time_nr
-	pushw %dx
-	movl $365,%eax
-	imulw %dx
-	pushw %dx
-	pushw %ax
-	popl %ebx
-	popw %dx
-	UserGate passed_days_nr
-	decw %dx
-	shrw $2,%dx
-	incw %dx
-	addw %dx,%ax
-	addl %ebx,%eax
-    xorl %edx,%edx
-    addl $5,%eax
-    movl $7,%ebx
-    divl %ebx
-    movzx %dl,%eax
-
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetTics
-#
-#   Purpose....: Get system tics
-#
-#   Parameters.: &MSB, &LSB
-#
-##########################################################################*/
-
-    .global RdosGetTics
-    
-RdosGetTics:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-	pushl %esi
-
-	UserGate get_time_nr
-	movl 8(%ebp),%esi
-	movl %edx,(%esi)
-	movl 12(%ebp),%esi
-	movl %eax,(%esi)
-
-	popl %esi
-	popl %edx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddTics
-#
-#   Purpose....: Add tics to binary time
-#
-#   Parameters.: &MSB, &LSB
-#                tics
-#
-##########################################################################*/
-
-    .global RdosAddTics
-    
-RdosAddTics:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 16(%ebp),%eax
-	movl 12(%ebp),%ebx
-	addl %eax,(%ebx)
-	movl 8(%ebp),%ebx
-	adcl $0,(%ebx)
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddMilli
-#
-#   Purpose....: Add milliseconds to binary time
-#
-#   Parameters.: &MSB, &LSB
-#                milli
-#
-##########################################################################*/
-
-    .global RdosAddMilli
-    
-RdosAddMilli:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 16(%ebp),%eax
-	movl $1193,%edx
-	mull %edx
-	movl 12(%ebp),%ebx
-	addl %eax,(%ebx)
-	movl 8(%ebp),%ebx
-	adcl %edx,(%ebx)
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddSec
-#
-#   Purpose....: Add milliseconds to binary time
-#
-#   Parameters.: &MSB, &LSB
-#                sec
-#
-##########################################################################*/
-
-    .global RdosAddSec
-    
-RdosAddSec:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 16(%ebp),%eax
-	movl $1193000,%edx
-	mull %edx
-	movl 12(%ebp),%ebx
-	addl %eax,(%ebx)
-	movl 8(%ebp),%ebx
-	adcl %edx,(%ebx)
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddMin
-#
-#   Purpose....: Add minutes to binary time
-#
-#   Parameters.: &MSB, &LSB
-#                min
-#
-##########################################################################*/
-
-    .global RdosAddMin
-    
-RdosAddMin:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 16(%ebp),%eax
-	movl $71582760,%edx
-	mull %edx
-	movl 12(%ebp),%ebx
-	addl %eax,(%ebx)
-	movl 8(%ebp),%ebx
-	adcl %edx,(%ebx)
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddHour
-#
-#   Purpose....: Add hour to binary time
-#
-#   Parameters.: &MSB, &LSB
-#                hour
-#
-##########################################################################*/
-
-    .global RdosAddHour
-    
-RdosAddHour:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 16(%ebp),%eax
-	movl 8(%ebp),%ebx
-	adc %eax,(%ebx)
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddDay
-#
-#   Purpose....: Add days to binary time
-#
-#   Parameters.: &MSB, &LSB
-#                days
-#
-##########################################################################*/
-
-    .global RdosAddDay
-    
-RdosAddDay:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 16(%ebp),%eax
-	movl $24,%edx
-	mull %edx
-	movl 8(%ebp),%ebx
-	adc %eax,(%ebx)
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSyncTime
-#
-#   Purpose....: Synchronize time with NTP
-#
-#   Parameters.: IP
-#
-##########################################################################*/
-
-    .global RdosSyncTime
-    
-RdosSyncTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushal
-
-	movl 8(%ebp),%edx
-	UserGate sync_time_nr
-	jc RdosSyncTimeFail
-
-	movl $1,%eax
-	jmp RdosSyncTimeDone
-
-RdosSyncTimeFail:
-	xorl %eax,%eax
-
-RdosSyncTimeDone:
-	popal
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenCom
-#
-#   Purpose....: Open com-port
-#
-#   Parameters.: ID
-#                baudrate
-#                parity
-#                data bits
-#                stop bits
-#                SendBufferSize
-#                RecBufferSize
-#
-#    Returns...: Com handle
-#
-##########################################################################*/
-
-    .global RdosOpenCom
-    
-RdosOpenCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movb 20(%ebp),%ah
-	movb 24(%ebp),%bl
-	movb 16(%ebp),%bh
-	movl 12(%ebp),%ecx
-	movw 28(%ebp),%si
-	movw 32(%ebp),%di
-	UserGate open_com_nr
-	movzx %bx,%eax
-
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseCom
-#
-#   Purpose....: Close com-port
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosCloseCom
-    
-RdosCloseCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_com_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosFlushCom
-#
-#   Purpose....: Flush com-port
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosFlushCom
-    
-RdosFlushCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate flush_com_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadCom
-#
-#   Purpose....: Read com-port
-#
-#   Parameters.: Com handle
-#
-#   Returns....: Character
-#
-##########################################################################*/
-
-    .global RdosReadCom
-    
-RdosReadCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate read_com_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteCom
-#
-#   Purpose....: Write com-port
-#
-#   Parameters.: Com handle
-#                char
-#
-#   Returns....: 0 for success
-#
-##########################################################################*/
-
-    .global RdosWriteCom
-    
-RdosWriteCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movb 12(%ebp),%al
-	UserGate write_com_nr
-	movzx %al,%eax
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWaitForSendCompletedCom
-#
-#   Purpose....: Wait until send buffer is empty
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosWaitForSendCompletedCom
-    
-RdosWaitForSendCompletedCom:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate wait_for_send_completed_com_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosEnableCts
-#
-#   Purpose....: Enable CTS signal
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosEnableCts
-    
-RdosEnableCts:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate enable_cts_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDisableCts
-#
-#   Purpose....: Disable CTS signal
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosDisableCts
-    
-RdosDisableCts:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate disable_cts_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosEnableAutoRts
-#
-#   Purpose....: Enable auto RTS signal generation for RS485
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosEnableAutoRts
-    
-RdosEnableAutoRts:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate enable_auto_rts_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDisableAutoRts
-#
-#   Purpose....: Disable auto RTS signal generation for RS485
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosDisableAutoRts
-    
-RdosDisableAutoRts:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate disable_auto_rts_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetDtr
-#
-#   Purpose....: Set DTR active
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosSetDtr
-    
-RdosSetDtr:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate set_dtr_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosResetDtr
-#
-#   Purpose....: Set DTR inactive
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosResetDtr
-    
-RdosResetDtr:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate reset_dtr_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetRts
-#
-#   Purpose....: Set RTS active
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosSetRts
-    
-RdosSetRts:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate set_rts_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosResetRts
-#
-#   Purpose....: Set RTS inactive
-#
-#   Parameters.: Com handle
-#
-##########################################################################*/
-
-    .global RdosResetRts
-    
-RdosResetRts:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate reset_rts_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetReceiveBufferSpace
-#
-#   Purpose....: Get receive buffer free space
-#
-#   Parameters.: Com handle
-#
-#   Returns....: Free bytes
-#
-##########################################################################*/
-
-    .global RdosGetReceiveBufferSpace
-    
-RdosGetReceiveBufferSpace:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_com_receive_space_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetSendBufferSpace
-#
-#   Purpose....: Get send buffer free space
-#
-#   Parameters.: Com handle
-#
-#   Returns....: Free bytes
-#
-##########################################################################*/
-
-    .global RdosGetSendBufferSpace
-    
-RdosGetSendBufferSpace:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_com_send_space_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenFile
-#
-#   Purpose....: Open file
-#
-#   Parameters.: Filename
-#                Access
-#
-#    Returns...: File handle
-#
-##########################################################################*/
-
-    .global RdosOpenFile
-    
-RdosOpenFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movb 12(%ebp),%cl
-	UserGate open_file_nr
-	jc OpenFileFailed
-
-	movzx %bx,%eax
-	jmp OpenFileDone
-
-OpenFileFailed:
-	xorl %eax,%eax
-
-OpenFileDone:
-	popl %edi
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateFile
-#
-#   Purpose....: Create file
-#
-#   Parameters.: Filename
-#                Attribute
-#
-#    Returns...: File handle
-#
-##########################################################################*/
-
-    .global RdosCreateFile
-    
-RdosCreateFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movw 12(%ebp),%cx
-	UserGate create_file_nr
-	jc CreateFileFailed
-
-	movzx %bx,%eax
-	jmp CreateFileDone
-
-CreateFileFailed:
-	xorl %eax,%eax
-
-CreateFileDone:
-	popl %edi
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseFile
-#
-#   Purpose....: Close file
-#
-#   Parameters.: File handle
-#
-##########################################################################*/
-
-    .global RdosCloseFile
-    
-RdosCloseFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_file_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosIsDevice
-#
-#   Purpose....: Check if file is device
-#
-#   Parameters.: TRUE if device
-#
-##########################################################################*/
-
-    .global RdosIsDevice
-    
-RdosIsDevice:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_ioctl_data_nr
-	testw $0x8000,%dx
-	jz ridFail
-
-	movl $1,%eax
-	jmp ridDone
-
-ridFail:
-	xorl %eax,%eax
-
-ridDone:
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDuplFile
-#
-#   Purpose....: Duplicate file handle
-#
-#   Parameters.: File handle
-#
-#   Returns....: File handle
-#
-##########################################################################*/
-
-    .global RdosDuplFile
-    
-RdosDuplFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate dupl_file_nr
-	jc DuplFileFailed
-	
-	movzx %bx,%eax
-	jmp DuplFileDone
-
-DuplFileFailed:
-	xorl %eax,%eax
-
-DuplFileDone:
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetFileSize
-#
-#   Purpose....: Get file size
-#
-#   Parameters.: File handle
-#
-#   Returns....: Size
-#
-##########################################################################*/
-
-    .global RdosGetFileSize
-    
-RdosGetFileSize:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_file_size_nr
-	jnc GetFileSizeDone
-
-GetFileSizeFail:
-	xorl %eax,%eax
-
-GetFileSizeDone:
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetFileSize
-#
-#   Purpose....: Set file size
-#
-#   Parameters.: File handle
-#                Size
-#
-##########################################################################*/
-
-    .global RdosSetFileSize
-    
-RdosSetFileSize:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%eax
-	UserGate set_file_size_nr
-
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetFilePos
-#
-#   Purpose....: Get file position
-#
-#   Parameters.: File handle
-#
-#   Returns....: Position
-#
-##########################################################################*/
-
-    .global RdosGetFilePos
-    
-RdosGetFilePos:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_file_pos_nr
-	jnc GetFilePosDone
-
-GetFilePosFail:
-	xorl %eax,%eax
-
-GetFilePosDone:
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetFilePos
-#
-#   Purpose....: Set file position
-#
-#   Parameters.: File handle
-#                Position
-#
-##########################################################################*/
-
-    .global RdosSetFilePos
-    
-RdosSetFilePos:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%eax
-	UserGate set_file_pos_nr
-
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetFileTime
-#
-#   Purpose....: Get file time & date
-#
-#   Parameters.: File handle
-#                &MSB, &LSB
-#
-##########################################################################*/
-
-    .global RdosGetFileTime
-    
-RdosGetFileTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	UserGate get_file_time_nr
-	jc GetFileTimeDone
-
-	movl 12(%ebp),%edi
-	movl %edx,(%edi)
-
-	movl 16(%ebp),%edi
-	movl %eax,(%edi)
-
-GetFileTimeDone:
-	popl %edi
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetFileTime
-#
-#   Purpose....: Set file time & date
-#
-#   Parameters.: File handle
-#                MSB, LSB
-#
-##########################################################################*/
-
-    .global RdosSetFileTime
-    
-RdosSetFileTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-	pushl %edx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edx
-	movl 16(%ebp),%eax
-	UserGate set_file_time_nr
-
-	popl %edx
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadFile
-#
-#   Purpose....: Read from file
-#
-#   Parameters.: File handle
-#                buffer
-#                count
-#
-#   Returns....: Read count
-#
-##########################################################################*/
-
-    .global RdosReadFile
-    
-RdosReadFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ecx
-	UserGate read_file_nr
-
-	popl %edi
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteFile
-#
-#   Purpose....: Write to file
-#
-#   Parameters.: File handle
-#                buffer
-#                count
-#
-#   Returns....: Written count
-#
-##########################################################################*/
-
-    .global RdosWriteFile
-    
-RdosWriteFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ecx
-	UserGate write_file_nr
-
-	popl %edi
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateMapping
-#
-#   Purpose....: Create file mapping
-#
-#   Parameters.: Size
-#
-#    Returns...: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosCreateMapping
-    
-RdosCreateMapping:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%eax
-	UserGate create_mapping_nr
-	movzx %bx,%eax
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateNamedMapping
-#
-#   Purpose....: Create named file mapping
-#
-#   Parameters.: Name
-#                Size
-#
-#    Returns...: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosCreateNamedMapping
-    
-RdosCreateNamedMapping:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%eax
-	UserGate create_named_mapping_nr
-	movzx %bx,%eax
-
-	popl %edi
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateNamedFileMapping
-#
-#   Purpose....: Create file named file mapping
-#
-#   Parameters.: Name
-#                Size
-#                File handle
-#
-#    Returns...: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosCreateNamedFileMapping
-    
-RdosCreateNamedFileMapping:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%eax
-	movw 16(%ebp),%bx
-	UserGate create_named_file_mapping_nr
-	movzx %bx,%eax
-
-	popl %edi
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenNamedMapping
-#
-#   Purpose....: Open named file mapping
-#
-#   Parameters.: Name
-#
-#    Returns...: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosOpenNamedMapping
-    
-RdosOpenNamedMapping:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate open_named_mapping_nr
-	movzx %bx,%eax
-
-	popl %edi
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSyncMapping
-#
-#   Purpose....: Sync file mapping
-#
-#   Parameters.: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosSyncMapping
-    
-RdosSyncMapping:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate sync_mapping_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseMapping
-#
-#   Purpose....: Close file mapping
-#
-#   Parameters.: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosCloseMapping
-    
-RdosCloseMapping:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_mapping_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosMapView
-#
-#   Purpose....: Map view of file into memory
-#
-#   Parameters.: Filemap handle
-#                Offset
-#                Address
-#                Size
-#
-##########################################################################*/
-
-    .global RdosMapView
-    
-RdosMapView:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%eax
-	movl 16(%ebp),%edi
-	movl 20(%ebp),%ecx
-	UserGate map_view_nr
-
-	popl %edi
-	popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosUnmapView
-#
-#   Purpose....: Unmap view of file
-#
-#   Parameters.: Filemap handle
-#
-##########################################################################*/
-
-    .global RdosUnmapView
-    
-RdosUnmapView:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate unmap_view_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetCurDrive
-#
-#   Purpose....: Set current drive
-#
-#   Parameters.: Drive
-#
-##########################################################################*/
-
-    .global RdosSetCurDrive
-    
-RdosSetCurDrive:
-	pushl %ebp
-	movl %esp,%ebp
-
-	movb 8(%ebp),%al
-	UserGate set_cur_drive_nr
-	jc rscdrFail
-
-    movl $1,%eax
-    jmp rscdrDone
-
-rscdrFail:
-    xorl %eax,%eax
-
-rscdrDone:
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetCurDrive
-#
-#   Purpose....: Get current drive
-#
-#   Returns....: Drive
-#
-##########################################################################*/
-
-    .global RdosGetCurDrive
-    
-RdosGetCurDrive:
-	pushl %ebp
-	movl %esp,%ebp
-
-    xorl %eax,%eax
-	UserGate get_cur_drive_nr
-	movzx %al,%eax
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetCurDir
-#
-#   Purpose....: Set current directory
-#
-#   Parameters.: Pathname
-#
-##########################################################################*/
-
-    .global RdosSetCurDir
-    
-RdosSetCurDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate set_cur_dir_nr
-	jc rscdFail
-
-    movl $1,%eax
-    jmp rscdDone
-
-rscdFail:
-    xorl %eax,%eax
-
-rscdDone:
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetCurDir
-#
-#   Purpose....: Get current directory
-#
-#   Parameters.: Drive
-#                Pathname
-#
-##########################################################################*/
-
-    .global RdosGetCurDir
-    
-RdosGetCurDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%edi
-	UserGate get_cur_dir_nr
-	jc rgcdFail
-
-    movl $1,%eax
-    jmp rgcdDone
-
-rgcdFail:
-    xorl %eax,%eax
-
-rgcdDone:
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosMakeDir
-#
-#   Purpose....: Create directory
-#
-#   Parameters.: Pathname
-#
-##########################################################################*/
-
-    .global RdosMakeDir
-    
-RdosMakeDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate make_dir_nr
-	jc mdFail
-
-    movl $1,%eax
-    jmp mdDone
-
-mdFail:
-    xorl %eax,%eax
-
-mdDone:
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosRemoveDir
-#
-#   Purpose....: Remove directory
-#
-#   Parameters.: Pathname
-#
-##########################################################################*/
-
-    .global RdosRemoveDir
-    
-RdosRemoveDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate remove_dir_nr
-	jc rdFail
-
-    movl $1,%eax
-    jmp rdDone
-
-rdFail:
-    xorl %eax,%eax
-
-rdDone:
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosRenameFile
-#
-#   Purpose....: Rename file
-#
-#   Parameters.: ToName
-#                FromName
-#
-##########################################################################*/
-
-    .global RdosRenameFile
-    
-RdosRenameFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%esi
-	UserGate rename_file_nr
-	jc rfFail
-
-    mov $1,%eax
-    jmp rfDone
-
-rfFail:
-    xorl %eax,%eax
-
-rfDone:
-	popl %edi
-	popl %esi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDeleteFile
-#
-#   Purpose....: Delete file
-#
-#   Parameters.: Pathname
-#
-##########################################################################*/
-
-    .global RdosDeleteFile
-    
-RdosDeleteFile:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate delete_file_nr
-	jc dfFail
-
-    mov $1,%eax
-    jmp dfDone
-
-dfFail:
-    xorl %eax,%eax
-
-dfDone:
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetFileAttribute
-#
-#   Purpose....: Get file attribute
-#
-#   Parameters.: Pathname
-#                &Attrib
-#
-##########################################################################*/
-
-    .global RdosGetFileAttribute
-    
-RdosGetFileAttribute:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate get_file_attribute_nr
-	jc gfaFail
-
-	movl 12(%ebp),%edi
-    movzx %cx,%ecx
-	movl %ecx,(%edi)
-    movl $1,%eax
-    jmp gfaDone
-
-gfaFail:
-    xorl %eax,%eax
-
-gfaDone:
-	popl %edi
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetFileAttribute
-#
-#   Purpose....: Set file attribute
-#
-#   Parameters.: Pathname
-#                Attrib
-#
-##########################################################################*/
-
-    .global RdosSetFileAttribute
-    
-RdosSetFileAttribute:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movw 12(%ebp),%cx
-	UserGate set_file_attribute_nr
-	jc sfaFail
-
-    movl $1,%eax
-    jmp sfaDone
-
-sfaFail:
-    xorl %eax,%eax
-
-sfaDone:
-	popl %edi
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenDir
-#
-#   Purpose....: Open directory
-#
-#   Parameters.: Pathname
-#
-#   Returns....: Dir handle
-#
-##########################################################################*/
-
-    .global RdosOpenDir
-    
-RdosOpenDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate open_dir_nr
-	jc odFail
-
-    movzx %bx,%eax
-    jmp odDone
-
-odFail:
-    xorl %eax,%eax
-
-odDone:
-	popl %edi
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseDir
-#
-#   Purpose....: Close directory
-#
-#   Parameters.: Dir handle
-#
-##########################################################################*/
-
-    .global RdosCloseDir
-    
-RdosCloseDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_dir_nr
-
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadDir
-#
-#   Purpose....: Read directory entry
-#
-#   Parameters.: Dir handle
-#                Entry #
-#                MaxNameSize
-#                Name buffer
-#                &FileSize
-#                &Attribute
-#                &Msb time
-#                &Lsb time
-#
-##########################################################################*/
-
-    .global RdosReadDir
-    
-RdosReadDir:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%dx
-	movw 16(%ebp),%cx
-	movl 20(%ebp),%edi
-	UserGate read_dir_nr
-	jc rdiFail
-
-	movl 24(%ebp),%edi
-	movl %ecx,(%edi)
-
-	movl 28(%ebp),%edi
-    movzx %bx,%ebx
-	movl %ebx,(%edi)
-
-	movl 32(%ebp),%edi
-	movl %edx,(%edi)
-
-	movl 36(%ebp),%edi
-	movl %eax,(%edi)
-
-    movl $1,%eax
-    jmp rdiDone
-
-rdiFail:
-    xorl %eax,%eax
-    
-rdiDone:
-    popl %edi
-    popl %ecx
-	popl %ebx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetFocus
-#
-#   Purpose....: Set input focus
-#
-#   Parameters.: Focus handle
-#
-##########################################################################*/
-
-    .global RdosSetFocus
-    
-RdosSetFocus:
-	pushl %ebp
-	movl %esp,%ebp
-	
-	movl 8(%ebp),%eax
-	UserGate set_focus_nr
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetFocus
-#
-#   Purpose....: Get input focus
-#
-#   Returns....: Focus handle
-#
-##########################################################################*/
-
-    .global RdosGetFocus
-    
-RdosGetFocus:
-	pushl %ebp
-	movl %esp,%ebp
-	
-	UserGate get_focus_nr
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosClearKeyboard
-#
-#   Purpose....: Clear keyboard buffer
-#
-##########################################################################*/
-
-    .global RdosClearKeyboard
-    
-RdosClearKeyboard:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate flush_keyboard_nr
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosPollKeyboard
-#
-#   Purpose....: Poll keyboard buffer
-#
-#   Returns....: TRUE if non-empty
-#
-##########################################################################*/
-
-    .global RdosPollKeyboard
-    
-RdosPollKeyboard:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate poll_keyboard_nr
-	jc rpkEmpty
-
-	mov $1,%eax
-	jmp rpkDone
-
-rpkEmpty:
-	xorl %eax,%eax
-
-rpkDone:
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadKeyboard
-#
-#   Purpose....: Read keyboard buffer
-#
-#   Returns....: Scan code
-#
-##########################################################################*/
-
-    .global RdosReadKeyboard
-    
-RdosReadKeyboard:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate read_keyboard_nr
-	movzx %ax,%eax
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetKeyboardState
-#
-#   Purpose....: Get keyboard buffer
-#
-#   Returns....: Keyboard state
-#
-##########################################################################*/
-
-    .global RdosGetKeyboardState
-    
-RdosGetKeyboardState:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate get_keyboard_state_nr
-	movzx %ax,%eax
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosPutKeyboard
-#
-#   Purpose....: Put scancode in keyboard buffer
-#
-##########################################################################*/
-
-    .global RdosPutKeyboard
-    
-RdosPutKeyboard:
-	pushl %ebp
-	movl %esp,%ebp
-    pushl %edx
-
-	movw 8(%ebp),%ax
-	movb 12(%ebp),%dl
-	movb 16(%ebp),%dh
-	UserGate put_keyboard_code_nr
-
-    popl %edx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosPeekKeyEvent
-#
-#   Purpose....: Peek keyboard event
-#
-##########################################################################*/
-
-    .global RdosPeekKeyEvent
-    
-RdosPeekKeyEvent:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	UserGate peek_key_event_nr
-	jc rpeFail
-
-	movl 8(%ebp),%edi
-	movzx %ax,%eax
-	movl %eax,(%edi)
-
-	movl 12(%ebp),%edi
-	movzx %cx,%eax
-	movl %eax,(%edi)
-
-	movl 16(%ebp),%edi
-	movzx %dl,%eax
-	movl %eax,(%edi)
-
-	movl 20(%ebp),%edi
-	movzx %dh,%eax
-	movl %eax,(%edi)
-
-	movl $1,%eax
-	jmp rpeDone
-
-rpeFail:
-	xorl %eax,%eax
-
-rpeDone:
-	popl %edi
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadKeyEvent
-#
-#   Purpose....: Read keyboard event
-#
-##########################################################################*/
-
-    .global RdosReadKeyEvent
-    
-RdosReadKeyEvent:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	UserGate read_key_event_nr
-	jc rkeFail
-
-	movl 8(%ebp),%edi
-	movzx %ax,%eax
-	movl %eax,(%edi)
-
-	movl 12(%ebp),%edi
-	movzx %cx,%eax
-	movl %eax,(%edi)
-
-	movl 16(%ebp),%edi
-	movzx %dl,%eax
-	movl %eax,(%edi)
-
-	movl 20(%ebp),%edi
-	movzx %dh,%eax
-	movl %eax,(%edi)
-
-	movl $1,%eax
-	jmp rkeDone
-
-rkeFail:
-	xorl %eax,%eax
-
-rkeDone:
-	popl %edi
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosHideMouse
-#
-#   Purpose....: Hide mouse cursor
-#
-##########################################################################*/
-
-    .global RdosHideMouse
-    
-RdosHideMouse:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate hide_mouse_nr
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosShowMouse
-#
-#   Purpose....: Show mouse cursor
-#
-##########################################################################*/
-
-    .global RdosShowMouse
-    
-RdosShowMouse:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate show_mouse_nr
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetMousePosition
-#
-#   Purpose....: Get mouse position
-#
-#   Parameters.: &x, &y
-#
-##########################################################################*/
-
-    .global RdosGetMousePosition
-    
-RdosGetMousePosition:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-
-	UserGate get_mouse_position_nr
-
-	movl 8(%ebp),%eax
-	movzx %cx,%ecx
-	movl %ecx,(%eax)
-
-	movl 12(%ebp),%eax
-	movzx %dx,%edx
-	movl %edx,(%eax)
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetMousePosition
-#
-#   Purpose....: Set mouse position
-#
-#   Parameters.: x, y
-#
-##########################################################################*/
-
-    .global RdosSetMousePosition
-    
-RdosSetMousePosition:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%cx
-	movw 12(%ebp),%dx
-	UserGate set_mouse_position_nr
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetMouseWindow
-#
-#   Purpose....: Set mouse window
-#
-#   Parameters.: start x, start y
-#                end x, end y
-#
-##########################################################################*/
-
-    .global RdosSetMouseWindow
-    
-RdosSetMouseWindow:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %eax
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%ax
-	movw 12(%ebp),%bx
-	movw 16(%ebp),%cx
-	movw 20(%ebp),%dx
-	UserGate set_mouse_window_nr
-
-	popl %edx
-	popl %ecx
-	popl %ebx
-	popl %eax
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetMouseMickey
-#
-#   Purpose....: Set mouse mickey
-#
-#   Parameters.: x, y
-#
-##########################################################################*/
-
-    .global RdosSetMouseMickey
-    
-RdosSetMouseMickey:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%cx
-	movw 12(%ebp),%dx
-	UserGate set_mouse_mickey_nr
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetCursorPosition
-#
-#   Purpose....: Get cursor position
-#
-#   Parameters.: &x, &y
-#
-##########################################################################*/
-
-    .global RdosGetCursorPosition
-    
-RdosGetCursorPosition:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-
-	UserGate get_cursor_position_nr
-
-	movl 8(%ebp),%eax
-	movzx %cx,%ecx
-	movl %ecx,(%eax)
-
-	movl 12(%ebp),%eax
-	movzx %dx,%edx
-	movl %edx,(%eax)
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetCursorPosition
-#
-#   Purpose....: Set cursor position
-#
-#   Parameters.: x, y
-#
-##########################################################################*/
-
-    .global RdosSetCursorPosition
-    
-RdosSetCursorPosition:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-
-	movw 8(%ebp),%cx
-	movw 12(%ebp),%dx
-	UserGate set_cursor_position_nr
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetLeftButton
-#
-#   Purpose....: Check if left button is pressed
-#
-#   Returns....: TRUE if pressed
-#
-##########################################################################*/
-
-    .global RdosGetLeftButton
-    
-RdosGetLeftButton:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate get_left_button_nr
-	jc get_left_rel
-
-	mov $1,%eax
-	jmp get_left_done
-
-get_left_rel:
-	xorl %eax,%eax
-
-get_left_done:
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRightButton
-#
-#   Purpose....: Check if right button is pressed
-#
-#   Returns....: TRUE if pressed
-#
-##########################################################################*/
-
-    .global RdosGetRightButton
-    
-RdosGetRightButton:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate get_right_button_nr
-	jc get_right_rel
-
-	mov $1,%eax
-	jmp get_right_done
-
-get_right_rel:
-	xorl %eax,%eax
-
-get_right_done:
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetLeftButtonPressPosition
-#
-#   Purpose....: Get left button press position
-#
-#   Parameters.: &x, &y
-#
-##########################################################################*/
-
-    .global RdosGetLeftButtonPressPosition
-    
-RdosGetLeftButtonPressPosition:
-	pushl %ebp
-	movl %esp,%ebp
-
-	pushl %ecx
-	pushl %edx
-
-	UserGate get_left_button_press_position_nr
-
-	movl 8(%ebp),%eax
-	movzx %cx,%ecx
-	movl %ecx,(%eax)
-
-	movl 12(%ebp),%eax
-	movzx %dx,%edx
-	movl %edx,(%eax)
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRightButtonPressPosition
-#
-#   Purpose....: Get right button press position
-#
-#   Parameters.: &x, &y
-#
-##########################################################################*/
-
-    .global RdosGetRightButtonPressPosition
-    
-RdosGetRightButtonPressPosition:
-	pushl %ebp
-	movl %esp,%ebp
-
-	pushl %ecx
-	pushl %edx
-
-	UserGate get_right_button_press_position_nr
-
-	movl 8(%ebp),%eax
-	movzx %cx,%ecx
-	movl %ecx,(%eax)
-
-	movl 12(%ebp),%eax
-	movzx %dx,%edx
-	movl %edx,(%eax)
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetLeftButtonReleasePosition
-#
-#   Purpose....: Get left button release position
-#
-#   Parameters.: &x, &y
-#
-##########################################################################*/
-
-    .global RdosGetLeftButtonReleasePosition
-    
-RdosGetLeftButtonReleasePosition:
-	pushl %ebp
-	movl %esp,%ebp
-
-	pushl %ecx
-	pushl %edx
-
-	UserGate get_left_button_release_position_nr
-
-	movl 8(%ebp),%eax
-	movzx %cx,%ecx
-	movl %ecx,(%eax)
-
-	movl 12(%ebp),%eax
-	movzx %dx,%edx
-	movl %edx,(%eax)
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRightButtonReleasePosition
-#
-#   Purpose....: Get right button release position
-#
-#   Parameters.: &x, &y
-#
-##########################################################################*/
-
-    .global RdosGetRightButtonReleasePosition
-    
-RdosGetRightButtonReleasePosition:
-	pushl %ebp
-	movl %esp,%ebp
-
-	pushl %ecx
-	pushl %edx
-
-	UserGate get_right_button_release_position_nr
-
-	movl 8(%ebp),%eax
-	movzx %cx,%ecx
-	movl %ecx,(%eax)
-
-	movl 12(%ebp),%eax
-	movzx %dx,%edx
-	movl %edx,(%eax)
-
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadLine
-#
-#   Purpose....: Read a line from keyboard
-#
-#   Parameters.: Buffer
-#                Size
-#
-#   Returns....: Read count
-#
-##########################################################################*/
-
-    .global RdosReadLine
-    
-RdosReadLine:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%ecx
-	UserGate read_con_nr
-
-	popl %edi
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteChar
-#
-#   Purpose....: Write a character to screen
-#
-#   Parameters.: Char
-#
-##########################################################################*/
-
-    .global RdosWriteChar
-    
-RdosWriteChar:
-	pushl %ebp
-	movl %esp,%ebp
-
-	movb 8(%ebp),%al
-	UserGate write_char_nr
-
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteSizeString
-#
-#   Purpose....: Write a fixed number of characters to screen
-#
-#   Parameters.: String
-#                Count
-#
-##########################################################################*/
-
-    .global RdosWriteSizeString
-    
-RdosWriteSizeString:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%ecx
-	UserGate write_size_string_nr
-
-	popl %edi
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteString
-#
-#   Purpose....: Write a string to screen
-#
-#   Parameters.: String
-#
-##########################################################################*/
-
-    .global RdosWriteString
-    
-RdosWriteString:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate write_asciiz_nr
-
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosNameToIp
-#
-#   Purpose....: Convert host name to IP address
-#
-#   Parameters.: Name
-#                
-#   Returns....: IP
-#
-##########################################################################*/
-
-    .global RdosNameToIp
-    
-RdosNameToIp:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate name_to_ip_nr
-	jc rntiFail
-
-	movl %edx,%eax
-	jmp rntiDone
-
-rntiFail:
-	xorl %eax,%eax
-
-rntiDone:
-	popl %edi
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetIp
-#
-#   Purpose....: Get my IP
-#                
-#   Returns....: IP
-#
-##########################################################################*/
-
-    .global RdosGetIp
-    
-RdosGetIp:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate get_ip_address_nr
-	movl %edx,%eax
-
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosIpToName
-#
-#   Purpose....: Convert IP address to host name
-#
-#   Parameters.: IP
-#                Name                
-#                Size
-#
-##########################################################################*/
-
-    .global RdosIpToName
-    
-RdosIpToName:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-;
-	movl 8(%ebp),%edx
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ecx
-	UserGate ip_to_name_nr
-	jnc ritnDone
-
-ritnFail:
-	xorl %eax,%eax
-
-ritnDone:
-	popl %edi
-	popl %edx
-	popl %ecx
-	leave
-	ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosPing
-#
-#   Purpose....: Ping node
-#                
-#   Parameters.: IP
-#                Timeout
-#
-##########################################################################*/
-
-    .global RdosPing
-    
-RdosPing:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-;
-	movl 8(%ebp),%edx
-	movl 12(%ebp),%eax
-	UserGate ping_nr
-	jc ping_failed
-
-	movl $1,%eax
-	jmp ping_done
-
-ping_failed:
-	xorl %eax,%eax
-
-ping_done:
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenTcpConnection
-#
-#   Purpose....: Open an active connection over TCP
-#                
-#   Parameters.: RemoteIp
-#                LocalPort
-#                RemotePort
-#                Timeout in ms
-#                BufferSize
-#
-#   Returns....: Conn handle
-#
-##########################################################################*/
-
-    .global RdosOpenTcpConnection
-    
-RdosOpenTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%edx
-	movw 12(%ebp),%si
-	movw 16(%ebp),%di
-	movl 20(%ebp),%eax
-	movl 24(%ebp),%ecx
-	UserGate open_tcp_connection_nr
-	mov $0,%eax
-	jc rotcDone
-
-	movl %ebx,%eax
-
-rotcDone:
-	popl %edi
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateTcpListen
-#
-#   Purpose....: Create listen handle
-#                
-#   Parameters.: Port
-#                MaxConnections
-#                BufferSize
-#
-#   Returns....: Listen handle
-#
-##########################################################################*/
-
-    .global RdosCreateTcpListen
-    
-RdosCreateTcpListen:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-
-	movw 8(%ebp),%si
-	movw 12(%ebp),%ax
-	movl 16(%ebp),%ecx
-	UserGate create_tcp_listen_nr
-	movzx %bx,%eax
-	jnc ctlDone
-
-    xorl %eax,%eax
-
-ctlDone:
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetTcpListen
-#
-#   Purpose....: Get connection from listen
-#                
-#   Parameters.: Listen handle
-#
-#   Returns....: Conn handle
-#
-##########################################################################*/
-
-    .global RdosGetTcpListen
-    
-RdosGetTcpListen:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_tcp_listen_nr
-	movzx %ax,%eax
-	jnc gtlDone
-
-    xorl %eax,%eax
-
-gtlDone:
-    popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseTcpListen
-#
-#   Purpose....: Close TCP listen
-#                
-#   Parameters.: Listen handle
-#
-##########################################################################*/
-
-    .global RdosCloseTcpListen
-    
-RdosCloseTcpListen:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_tcp_listen_nr
-	
-    popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForTcpListen
-#
-#   Purpose....: Add wait object to tcp listen
-#                
-#   Parameters.: Wait handle
-#                Listen handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForTcpListen
-    
-RdosAddWaitForTcpListen:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	movl 16(%ebp),%ecx
-	UserGate add_wait_for_tcp_listen_nr
-	movl $1,%eax
-	jnc awftlDone
-
-	xorl %eax,%eax
-
-awftlDone:
-    popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWaitForTcpConnection
-#
-#   Purpose....: Wait for Tcp connection to be established
-#                
-#   Parameters.: Conn handle
-#                Timeout ms
-#
-##########################################################################*/
-
-    .global RdosWaitForTcpConnection
-    
-RdosWaitForTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%eax
-	UserGate wait_for_tcp_connection_nr
-	movl $1,%eax
-	jnc wftcDone
-
-	xorl %eax,%eax
-
-wftcDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddWaitForTcpConnection
-#
-#   Purpose....: Add wait object to tcp connection
-#                
-#   Parameters.: Wait handle
-#                Conn handle
-#                ID
-#
-##########################################################################*/
-
-    .global RdosAddWaitForTcpConnection
-    
-RdosAddWaitForTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-
-	movw 8(%ebp),%bx
-	movw 12(%ebp),%ax
-	movl 16(%ebp),%ecx
-	UserGate add_wait_for_tcp_connection_nr
-	movl $1,%eax
-	jnc awftcDone
-
-	xorl %eax,%eax
-
-awftcDone:
-    popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseTcpConnection
-#
-#   Purpose....: Close Tcp connection
-#                
-#   Parameters.: Conn handle
-#
-##########################################################################*/
-
-    .global RdosCloseTcpConnection
-    
-RdosCloseTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate close_tcp_connection_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDeleteTcpConnection
-#
-#   Purpose....: Delete Tcp connection
-#                
-#   Parameters.: Conn handle
-#
-##########################################################################*/
-
-    .global RdosDeleteTcpConnection
-    
-RdosDeleteTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate delete_tcp_connection_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAbortTcpConnection
-#
-#   Purpose....: Abort Tcp connection
-#                
-#   Parameters.: Conn handle
-#
-##########################################################################*/
-
-    .global RdosAbortTcpConnection
-    
-RdosAbortTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate abort_tcp_connection_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosPushTcpConnection
-#
-#   Purpose....: Push Tcp connection
-#                
-#   Parameters.: Conn handle
-#
-##########################################################################*/
-
-    .global RdosPushTcpConnection
-    
-RdosPushTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate push_tcp_connection_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosPollTcpConnection
-#
-#   Purpose....: Poll Tcp connection
-#                
-#   Parameters.: Conn handle
-#
-#   Returns....: Available bytes in receive buffer
-#
-##########################################################################*/
-
-    .global RdosPollTcpConnection
-    
-RdosPollTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate poll_tcp_connection_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosIsTcpConnectionClosed
-#
-#   Purpose....: Check if connection is closed
-#                
-#   Parameters.: Conn handle
-#
-#   Returns....: TRUE if closed
-#
-##########################################################################*/
-
-    .global RdosIsTcpConnectionClosed
-    
-RdosIsTcpConnectionClosed:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate is_tcp_connection_closed_nr
-	jc rptcClosed
-
-	xorl %eax,%eax
-	jmp rptcDone
-
-rptcClosed:
-	movl $1,%eax
-	
-rptcDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRemoteTcpConnectionIp
-#
-#   Purpose....: Get remote IP
-#                
-#   Parameters.: Conn handle
-#
-#   Returns....: IP
-#
-##########################################################################*/
-
-    .global RdosGetRemoteTcpConnectionIp
-    
-RdosGetRemoteTcpConnectionIp:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_remote_tcp_connection_ip_nr
-	jnc grtciDone
-
-	movl $0xFFFFFFFF,%eax
-	
-grtciDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRemoteTcpConnectionPort
-#
-#   Purpose....: Get remote port
-#                
-#   Parameters.: Conn handle
-#
-#   Returns....: Port
-#
-##########################################################################*/
-
-    .global RdosGetRemoteTcpConnectionPort
-    
-RdosGetRemoteTcpConnectionPort:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_remote_tcp_connection_port_nr
-	jnc grtcpDone
-
-	movl $0,%eax
-	
-grtcpDone:
-    movzx %ax,%eax
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetLocalTcpConnectionPort
-#
-#   Purpose....: Get local port
-#                
-#   Parameters.: Conn handle
-#
-#   Returns....: Port
-#
-##########################################################################*/
-
-    .global RdosGetLocalTcpConnectionPort
-    
-RdosGetLocalTcpConnectionPort:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movw 8(%ebp),%bx
-	UserGate get_local_tcp_connection_port_nr
-	jnc gltcpDone
-
-	movl $0,%eax
-	
-gltcpDone:
-    movzx %ax,%eax
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadTcpConnection
-#
-#   Purpose....: Read data from connection
-#                
-#   Parameters.: Conn handle
-#                Buffer
-#                Size
-#
-#   Returns....: Read bytes
-#
-##########################################################################*/
-
-    .global RdosReadTcpConnection
-    
-RdosReadTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ecx
-	UserGate read_tcp_connection_nr
-
-	popl %edi
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteTcpConnection
-#
-#   Purpose....: Write data fto connection
-#                
-#   Parameters.: Conn handle
-#                Buffer
-#                Size
-#
-#   Returns....: Written bytes
-#
-##########################################################################*/
-
-    .global RdosWriteTcpConnection
-    
-RdosWriteTcpConnection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ecx
-	UserGate write_tcp_connection_nr
-
-	popl %edi
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetLocalMailslot
-#
-#   Purpose....: Get local mailslot from name
-#                
-#   Parameters.: Name
-#
-#   Returns....: Mailslot handle
-#
-##########################################################################*/
-
-    .global RdosGetLocalMailslot
-    
-RdosGetLocalMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate get_local_mailslot_nr
-	jc rglmFail
-
-	movzx %bx,%eax
-	jmp rglmDone
-
-rglmFail:
-	xorl %eax,%eax
-
-rglmDone:
-	popl %edi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRemoteMailslot
-#
-#   Purpose....: Get remote mailslot from name
-#                
-#   Parameters.: IP
-#                Name
-#
-#   Returns....: Mailslot handle
-#
-##########################################################################*/
-
-    .global RdosGetRemoteMailslot
-    
-RdosGetRemoteMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edx
-	pushl %edi
-
-	movl 8(%ebp),%edx
-	movl 12(%ebp),%edi
-	UserGate get_remote_mailslot_nr
-	jc rgrmFail
-
-	movzx %bx,%eax
-	jmp rgrmDone
-
-rgrmFail:
-	xorl %eax,%eax
-
-rgrmDone:
-	popl %edi
-	popl %edx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosFreeMailslot
-#
-#   Purpose....: Free mailslot
-#                
-#   Parameters.: Mailslot handle
-#
-##########################################################################*/
-
-    .global RdosFreeMailslot
-    
-RdosFreeMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	UserGate free_mailslot_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSendMailslot
-#
-#   Purpose....: Send mailslot
-#                
-#   Parameters.: Mailslot handle
-#				 Msg
-#				 Size
-#				 ReplyBuf
-#				 MaxReplySize
-#
-#   Returns....: Size of reply
-#
-##########################################################################*/
-
-    .global RdosSendMailslot
-    
-RdosSendMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-
-	movw 8(%ebp),%bx
-	movl 12(%ebp),%esi
-	movl 16(%ebp),%ecx
-	movl 20(%ebp),%edi
-	movl 24(%ebp),%eax
-	UserGate send_mailslot_nr
-	jc smFail
-
-	movl %ecx,%eax
-	jmp smDone
-
-smFail:
-	movl $0xFFFFFFFF,%eax
-
-smDone:
-	popl %edi
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDefineMailslot
-#
-#   Purpose....: Define mailslot
-#                
-#   Parameters.: Name
-#                Max msg size
-#
-##########################################################################*/
-
-    .global RdosDefineMailslot
-    
-RdosDefineMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%ecx
-	UserGate define_mailslot_nr
-
-	popl %edi
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReceiveMailslot
-#
-#   Purpose....: Receive from mailslot
-#                
-#   Parameters.: Msg buffer
-#
-#   Returns....: Msg size
-#
-##########################################################################*/
-
-    .global RdosReceiveMailslot
-    
-RdosReceiveMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	UserGate receive_mailslot_nr
-	movl %ecx,%eax
-
-	popl %edi
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReplyMailslot
-#
-#   Purpose....: Reply to mailslot
-#                
-#   Parameters.: Msg buffer
-#                Msg size
-#
-##########################################################################*/
-
-    .global RdosReplyMailslot
-    
-RdosReplyMailslot:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edi
-
-	movl 8(%ebp),%edi
-	movl 12(%ebp),%ecx
-	UserGate reply_mailslot_nr
-
-	popl %edi
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetIdeDisc
-#
-#   Purpose....: Get IDE disc
-#                
-#   Parameters.: Unit #
-#
-#   Returns....: Disc #
-#
-##########################################################################*/
-
-    .global RdosGetIdeDisc
-    
-RdosGetIdeDisc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movb 8(%ebp),%bl
-	UserGate get_ide_disc_nr
-	jc get_ide_disc_fail
-
-    movzx %al,%eax
-	jmp get_ide_disc_done
-
-get_ide_disc_fail:
-	movl $0xFFFFFFFF,%eax
-
-get_ide_disc_done:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetFloppyDisc
-#
-#   Purpose....: Get floppy disc
-#                
-#   Parameters.: Unit #
-#
-#   Returns....: Disc #
-#
-##########################################################################*/
-
-    .global RdosGetFloppyDisc
-    
-RdosGetFloppyDisc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movb 8(%ebp),%bl
-	UserGate get_floppy_disc_nr
-	jc get_floppy_disc_fail
-
-    movzx %al,%eax
-	jmp get_floppy_disc_done
-
-get_floppy_disc_fail:
-	movl $0xFFFFFFFF,%eax
-
-get_floppy_disc_done:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetDiscInfo
-#
-#   Purpose....: Get disc info
-#                
-#   Parameters.: Disc #
-#				 Bytes / sector
-#				 Total sectors
-#				 BIOS sectors / cyl
-#				 BIOS heads
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosGetDiscInfo
-    
-RdosGetDiscInfo:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movb 8(%ebp),%al
-	UserGate get_disc_info_nr
-	jc get_disc_info_fail
-
-	movl 12(%ebp),%ebx
-	movzx %cx,%ecx
-	movl %ecx,(%ebx)
-
-	movl 16(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	movl 20(%ebp),%ebx
-	movzx %si,%esi
-	movl %esi,(%ebx)
-
-	movl 24(%ebp),%ebx
-	movzx %di,%edi
-	movl %edi,(%ebx)
-
-	movl $1,%eax
-	jmp get_disc_info_done
-
-get_disc_info_fail:
-	xorl %eax,%eax
-
-get_disc_info_done:
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetDiscInfo
-#
-#   Purpose....: Set disc info
-#                
-#   Parameters.: Disc #
-#				 Bytes / sector
-#				 Total sectors
-#				 BIOS sectors / cyl
-#				 BIOS heads
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosSetDiscInfo
-    
-RdosSetDiscInfo:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-	pushl %esi
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%ecx
-	movl 16(%ebp),%edx
-	movl 20(%ebp),%esi
-	movl 24(%ebp),%edi
-	UserGate set_disc_info_nr
-	jc set_disc_info_fail
-
-	movl $1,%eax
-	jmp set_disc_info_done
-
-set_disc_info_fail:
-	xorl %eax,%eax
-
-set_disc_info_done:
-	popl %edi
-	popl %esi
-	popl %edx
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadDisc
-#
-#   Purpose....: Read from disc
-#                
-#   Parameters.: Disc #
-#				 Sector #
-#				 Buffer
-#				 Size
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosReadDisc
-    
-RdosReadDisc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%edx
-	movl 16(%ebp),%edi
-	movl 20(%ebp),%ecx
-	UserGate read_disc_nr
-	jc read_disc_fail
-
-	movl $1,%eax
-	jmp read_disc_done
-
-read_disc_fail:
-	xorl %eax,%eax
-
-read_disc_done:
-	popl %edi
-	popl %edx
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteDisc
-#
-#   Purpose....: Write to disc
-#                
-#   Parameters.: Disc #
-#				 Sector #
-#				 Buffer
-#				 Size
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosWriteDisc
-    
-RdosWriteDisc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%edx
-	movl 16(%ebp),%edi
-	movl 20(%ebp),%ecx
-	UserGate write_disc_nr
-	jc write_disc_fail
-
-	movl $1,%eax
-	jmp write_disc_done
-
-write_disc_fail:
-	xorl %eax,%eax
-
-write_disc_done:
-	popl %edi
-	popl %edx
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAllocateFixedDrive
-#
-#   Purpose....: Allocate fixed drive
-#                
-#   Parameters.: Drive #
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosAllocateFixedDrive
-    
-RdosAllocateFixedDrive:
-	pushl %ebp
-	movl %esp,%ebp
-
-	movb 8(%ebp),%al
-	UserGate allocate_fixed_drive_nr
-	jc allocate_fixed_drive_fail
-
-	movl $1,%eax
-	jmp allocate_fixed_drive_done
-
-allocate_fixed_drive_fail:
-	xorl %eax,%eax
-
-allocate_fixed_drive_done:
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAllocateStaticDrive
-#
-#   Purpose....: Allocate static drive
-#                
-#   Returns....: Drive #
-#
-##########################################################################*/
-
-    .global RdosAllocateStaticDrive
-    
-RdosAllocateStaticDrive:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate allocate_static_drive_nr
-	jc allocate_static_drive_fail
-
-    movzx %al,%eax
-	jmp allocate_static_drive_done
-
-allocate_static_drive_fail:
-	xorl %eax,%eax
-
-allocate_static_drive_done:
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAllocateDynamicDrive
-#
-#   Purpose....: Allocate dynamic drive
-#                
-#   Returns....: Drive #
-#
-##########################################################################*/
-
-    .global RdosAllocateDynamicDrive
-    
-RdosAllocateDynamicDrive:
-	pushl %ebp
-	movl %esp,%ebp
-
-	UserGate allocate_dynamic_drive_nr
-	jc allocate_dynamic_drive_fail
-
-    movzx %al,%eax
-	jmp allocate_dynamic_drive_done
-
-allocate_dynamic_drive_fail:
-	xorl %eax,%eax
-
-allocate_dynamic_drive_done:
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetRdfsInfo
-#
-#   Purpose....: Get rdfs info
-#                
-#   Parameters.: Crypt tab
-#                Key tab
-#                Extent size tab
-#
-##########################################################################*/
-
-    .global RdosGetRdfsInfo
-    
-RdosGetRdfsInfo:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%esi
-	movl 12(%ebp),%edi
-	movl 16(%ebp),%ebx
-	UserGate get_rdfs_info_nr
-
-	popl %edi
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetDriveInfo
-#
-#   Purpose....: Get drive info
-#                
-#   Parameters.: Drive #
-#                Free units
-#                Bytes per unit
-#                Total units
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosGetDriveInfo
-    
-RdosGetDriveInfo:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movb 8(%ebp),%al
-	UserGate get_drive_info_nr
-	jc get_drive_info_fail
-
-	movl 12(%ebp),%ebx
-	movl %eax,(%ebx)
-
-	movl 16(%ebp),%ebx
-	movzx %cx,%ecx
-	movl %ecx,(%ebx)
-
-	movl 20(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	movl $1,%eax
-	jmp get_drive_info_done
-
-get_drive_info_fail:
-	xorl %eax,%eax
-
-get_drive_info_done:
-	popl %edx
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDemandLoadDrive
-#
-#   Purpose....: Demand load drive
-#                
-#   Parameters.: Drive #
-#
-##########################################################################*/
-
-    .global RdosDemandLoadDrive
-    
-RdosDemandLoadDrive:
-	pushl %ebp
-	movl %esp,%ebp
-
-	movb 8(%ebp),%al
-	UserGate demand_load_drive_nr
-
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetDriveDiscParam
-#
-#   Purpose....: Get drive disc parameters
-#                
-#   Parameters.: Drive #
-#                Disc #
-#                Start sector
-#                Total sectors
-#
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosGetDriveDiscParam
-    
-RdosGetDriveDiscParam:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %edx
-
-	movb 8(%ebp),%al
-	UserGate get_drive_disc_param_nr
-	jc get_drive_disc_param_fail
-
-	movl 12(%ebp),%ebx
-	movzx %al,%eax
-	movl %eax,(%ebx)
-
-	movl 16(%ebp),%ebx
-	movl %edx,(%ebx)
-
-	movl 20(%ebp),%ebx
-	movl %ecx,(%ebx)
-
-	movl $1,%eax
-	jmp get_drive_disc_param_done
-
-get_drive_disc_param_fail:
-	xorl %eax,%eax
-
-get_drive_disc_param_done:
-	popl %edx
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosFormatDrive
-#
-#   Purpose....: Format drive
-#                
-#   Parameters.: Disc #
-#                Start sector
-#                Sectors
-#                FS name
-#
-#   Returns....: Drive #
-#
-##########################################################################*/
-
-    .global RdosFormatDrive
-    
-RdosFormatDrive:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %edx
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%edx
-	movl 16(%ebp),%ecx
-	movl 20(%ebp),%edi
-	UserGate format_drive_nr
-	jc rfdFail
-
-    movzx %al,%eax
-    jmp rfdDone
-
-rfdFail:
-    xorl %eax,%eax
-
-rfdDone:
-	popl %edi
-	popl %edx
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetExeName
-#
-#   Purpose....: Get name of executable file
-#
-#   Returns....: Exe pathname
-#
-##########################################################################*/
-
-    .global RdosGetExeName
-    
-RdosGetExeName:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	UserGate get_exe_name_nr
-	jc rgenFail
-
-    movl %edi,%eax
-    jmp rgenDone
-
-rgenFail:
-    xorl %eax,%eax
-
-rgenDone:
-	popl %edi
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenAdc
-#
-#   Purpose....: Open handle to ADC channel
-#
-#   Parameters.: Channel #
-#
-#   Returns....: Adc handle
-#
-##########################################################################*/
-
-    .global RdosOpenAdc
-    
-RdosOpenAdc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%eax
-	UserGate open_adc_nr
-	movw %bx,%ax
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseAdc
-#
-#   Purpose....: Close ADC handle
-#
-#   Parameters.: Adc handle
-#
-##########################################################################*/
-
-    .global RdosCloseAdc
-    
-RdosCloseAdc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	UserGate close_adc_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDefineAdcTime
-#
-#   Purpose....: Define time of next conversion
-#
-#   Parameters.: Adc handle
-#                MSB time
-#                LSB time
-#
-##########################################################################*/
-
-    .global RdosDefineAdcTime
-    
-RdosDefineAdcTime:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edx
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%edx
-	movl 16(%ebp),%eax
-	UserGate define_adc_time_nr
-
-    popl %edx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadAdc
-#
-#   Purpose....: Read ADC
-#
-#   Parameters.: Adc handle
-#                
-#   Returns....: Value
-#
-##########################################################################*/
-
-    .global RdosReadAdc
-    
-RdosReadAdc:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	UserGate read_adc_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadSerialLines
-#
-#   Purpose....: Read serial lines
-#
-#   Parameters.: Device
-#                &Value
-#                
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosReadSerialLines
-    
-RdosReadSerialLines:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-	pushl %esi
-
-	movb 8(%ebp),%dh
-	UserGate read_serial_lines_nr
-	jc rdsFail
-
-	movzx %al,%eax
-	movl 12(%ebp),%esi
-	movl %eax,(%esi)
-	movl $1,%eax
-	jmp rdsDone
-
-rdsFail:
-	xorl %eax,%eax
-
-rdsDone:
-	popl %esi
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosToggleSerialLine
-#
-#   Purpose....: Toggle serial line
-#
-#   Parameters.: Device
-#                Line
-#                
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosToggleSerialLine
-    
-RdosToggleSerialLine:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-
-	movb 8(%ebp),%dh
-	movb 12(%ebp),%dl
-	UserGate toggle_serial_line_nr
-	jc rtsFail
-
-	movl $1,%eax
-	jmp rtsDone
-
-rtsFail:
-	xorl %eax,%eax
-
-rtsDone:
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadSerialVal
-#
-#   Purpose....: Read serial value
-#
-#   Parameters.: Device
-#                Line
-#                &Val
-#                
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosReadSerialVal
-    
-RdosReadSerialVal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-	pushl %esi
-
-	movb 8(%ebp),%dh
-	movb 12(%ebp),%dl
-	UserGate read_serial_val_nr
-
-    pushfw
-	shll $8,%eax
-	movl 16(%ebp),%esi
-	movl %eax,(%esi)
-    popfw
-	jc rdvFail
-
-	movl $1,%eax
-	jmp rdvDone
-
-rdvFail:
-	xorl %eax,%eax
-
-rdvDone:
-	popl %esi
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteSerialVal
-#
-#   Purpose....: Write serial value
-#
-#   Parameters.: Device
-#                Line
-#                Val
-#                
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosWriteSerialVal
-    
-RdosWriteSerialVal:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-
-	movb 8(%ebp),%dh
-	movb 12(%ebp),%dl
-	movl 16(%ebp),%eax
-	sarl $8,%eax
-	UserGate write_serial_val_nr
-	jc rwvFail
-
-	movl $1,%eax
-	jmp rwvDone
-
-rwvFail:
-	xorl %eax,%eax
-
-rwvDone:
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadSerialRaw
-#
-#   Purpose....: Read serial raw value
-#
-#   Parameters.: Device
-#                Line
-#                &Val
-#                
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosReadSerialRaw
-    
-RdosReadSerialRaw:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-	pushl %esi
-
-	movb 8(%ebp),%dh
-	movb 12(%ebp),%dl
-	UserGate read_serial_val_nr
-
-    pushfw
-	movl 16(%ebp),%esi
-	movl %eax,(%esi)
-    popfw
-	jc rdrFail
-
-	movl $1,%eax
-	jmp rdrDone
-
-rdrFail:
-	xorl %eax,%eax
-
-rdrDone:
-	popl %esi
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteSerialRaw
-#
-#   Purpose....: Write serial raw value
-#
-#   Parameters.: Device
-#                Line
-#                Val
-#                
-#   Returns....: TRUE if ok
-#
-##########################################################################*/
-
-    .global RdosWriteSerialRaw
-    
-RdosWriteSerialRaw:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edx
-
-	movb 8(%ebp),%dh
-	movb 12(%ebp),%dl
-	movl 16(%ebp),%eax
-	UserGate write_serial_val_nr
-	jc rwrFail
-
-	movl $1,%eax
-	jmp rwrDone
-
-rwrFail:
-	xorl %eax,%eax
-
-rwrDone:
-	popl %edx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenSysEnv
-#
-#   Purpose....: Open system environment
-#                
-#   Returns....: Env handle
-#
-##########################################################################*/
-
-    .global RdosOpenSysEnv
-    
-RdosOpenSysEnv:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	UserGate open_sys_env_nr
-	jc oseFail
-
-	movzx %bx,%eax
-	jmp oseDone
-
-oseFail:
-	xorl %eax,%eax
-
-oseDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenProcessEnv
-#
-#   Purpose....: Open process environment
-#                
-#   Returns....: Env handle
-#
-##########################################################################*/
-
-    .global RdosOpenProcessEnv
-    
-RdosOpenProcessEnv:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	UserGate open_proc_env_nr
-	jc opeFail
-
-	movzx %bx,%eax
-	jmp opeDone
-
-opeFail:
-	xorl %eax,%eax
-
-opeDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseEnv
-#
-#   Purpose....: Close environment
-#
-#   Parameters.: Env handle
-#
-##########################################################################*/
-
-    .global RdosCloseEnv
-    
-RdosCloseEnv:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	UserGate close_env_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosAddEnvVar
-#
-#   Purpose....: Add environment variable
-#
-#   Parameters.: Env handle
-#                var
-#                data
-#
-##########################################################################*/
-
-    .global RdosAddEnvVar
-    
-RdosAddEnvVar:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%esi
-	movl 16(%ebp),%edi
-	UserGate add_env_var_nr
-
-	popl %edi
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDeleteEnvVar
-#
-#   Purpose....: Delete environment variable
-#
-#   Parameters.: Env handle
-#                var
-#
-##########################################################################*/
-
-    .global RdosDeleteEnvVar
-    
-RdosDeleteEnvVar:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%esi
-	UserGate delete_env_var_nr
-
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosFindEnvVar
-#
-#   Purpose....: Find environment variable
-#
-#   Parameters.: Env handle
-#                var
-#                data
-#
-##########################################################################*/
-
-    .global RdosFindEnvVar
-    
-RdosFindEnvVar:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%esi
-	movl 16(%ebp),%edi
-	UserGate find_env_var_nr
-	jc fevFail
-
-	movl $1,%eax
-	jmp fevDone
-
-fevFail:
-	xorl %eax,%eax
-
-fevDone:
-	popl %edi
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGetEnvData
-#
-#   Purpose....: Get raw environment data
-#
-#   Parameters.: Env handle
-#                data
-#
-##########################################################################*/
-
-    .global RdosGetEnvData
-    
-RdosGetEnvData:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%edi
-	UserGate get_env_data_nr
-	jnc gedDone
-
-	xorw %ax,%ax
-	stosw
-
-gedDone:
-	popl %edi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosSetEnvData
-#
-#   Purpose....: Set raw environment data
-#
-#   Parameters.: Env handle
-#                data
-#
-##########################################################################*/
-
-    .global RdosSetEnvData
-    
-RdosSetEnvData:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%edi
-	UserGate set_env_data_nr
-
-	popl %edi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenSysIni
-#
-#   Purpose....: Open system ini-file
-#
-#   Returns....: Ini handle
-#
-##########################################################################*/
-
-    .global RdosOpenSysIni
-    
-RdosOpenSysIni:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	UserGate open_sys_ini_nr
-	jc osiFail
-
-	movzx %bx,%eax
-	jmp osiDone
-
-osiFail:
-	xorl %eax,%eax
-
-osiDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCloseIni
-#
-#   Purpose....: Close ini-file
-#
-#   Parameters.: Ini handle
-#
-##########################################################################*/
-
-    .global RdosCloseIni
-    
-RdosCloseIni:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	UserGate close_ini_nr
-
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosGotoIniSection
-#
-#   Purpose....: Goto ini section
-#
-#   Parameters.: Ini handle
-#                SectionName
-#
-##########################################################################*/
-
-    .global RdosGotoIniSection
-    
-RdosGotoIniSection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%edi
-	UserGate goto_ini_section_nr
-	jc gisFail
-
-	movl $1,%eax
-	jmp gisDone
-
-gisFail:
-	xorl %eax,%eax
-
-gisDone:
-	popl %edi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosRemoveIniSection
-#
-#   Purpose....: Remove current ini section
-#
-#   Parameters.: Ini handle
-#
-##########################################################################*/
-
-    .global RdosRemoveIniSection
-    
-RdosRemoveIniSection:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-
-	movl 8(%ebp),%ebx
-	UserGate remove_ini_section_nr
-	jc risFail
-
-	movl $1,%eax
-	jmp risDone
-
-risFail:
-	xorl %eax,%eax
-
-risDone:
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosReadIni
-#
-#   Purpose....: Read ini var in current section
-#
-#   Parameters.: Ini handle
-#                VarName
-#                Data
-#                MaxSize
-#
-##########################################################################*/
-
-    .global RdosReadIni
-    
-RdosReadIni:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %ecx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%esi
-	movl 16(%ebp),%edi
-	movl 20(%ebp),%ecx
-	UserGate read_ini_nr
-	jc riFail
-
-	movl $1,%eax
-	jmp riDone
-
-riFail:
-	xorl %eax,%eax
-
-riDone:
-	popl %edi
-	popl %esi
-	popl %ecx
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosWriteIni
-#
-#   Purpose....: Write ini var in current section
-#
-#   Parameters.: Ini handle
-#                VarName
-#                Data
-#
-##########################################################################*/
-
-    .global RdosWriteIni
-    
-RdosWriteIni:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-	pushl %edi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%esi
-	movl 16(%ebp),%edi
-	UserGate write_ini_nr
-	jc wiFail
-
-	movl $1,%eax
-	jmp wiDone
-
-wiFail:
-	xorl %eax,%eax
-
-wiDone:
-	popl %edi
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDeleteIni
-#
-#   Purpose....: Delete ini var in current section
-#
-#   Parameters.: Ini handle
-#                VarName
-#
-##########################################################################*/
-
-    .global RdosDeleteIni
-    
-RdosDeleteIni:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ebx
-	pushl %esi
-
-	movl 8(%ebp),%ebx
-	movl 12(%ebp),%esi
-	UserGate delete_ini_nr
-	jc diFail
-
-	movl $1,%eax
-	jmp diDone
-
-diFail:
-	xorl %eax,%eax
-
-diDone:
-	popl %esi
-	popl %ebx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosCreateFileDrive
-#
-#   Purpose....: Create a new file-drive
-#
-#   Parameters.: Drive
-#                Size
-#                FS name
-#                Filename
-#
-##########################################################################*/
-
-    .global RdosCreateFileDrive
-    
-RdosCreateFileDrive:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %ecx
-	pushl %esi
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%ecx
-	movl 16(%ebp),%esi
-	movl 20(%ebp),%edi
-	UserGate create_file_drive_nr
-	jnc cfdOk
-
-    xorl %eax,%eax
-    jmp cfdDone
-
-cfdOk:
-	movl $1,%eax
-
-cfdDone:
-	popl %edi
-	popl %esi
-	popl %ecx
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosOpenFileDrive
-#
-#   Purpose....: Open a new file-drive
-#
-#   Parameters.: Drive
-#                Filename
-#
-##########################################################################*/
-
-    .global RdosOpenFileDrive
-    
-RdosOpenFileDrive:
-	pushl %ebp
-	movl %esp,%ebp
-	pushl %edi
-
-	movb 8(%ebp),%al
-	movl 12(%ebp),%edi
-	UserGate open_file_drive_nr
-	jnc ofdOk
-
-	xorl %eax,%eax
-	jmp ofdDone
-
-ofdOk:
-	movl $1,%eax
-
-ofdDone:
-	popl %edi
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosEnableStatusLed
-#
-#   Purpose....: Enable status LED
-#
-##########################################################################*/
-
-    .global RdosEnableStatusLed
-    
-RdosEnableStatusLed:
-	pushl %ebp
-	movl %esp,%ebp
-	UserGate enable_status_led_nr
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosDisableStatusLed
-#
-#   Purpose....: Disable status LED
-#
-##########################################################################*/
-
-    .global RdosDisableStatusLed
-    
-RdosDisableStatusLed:
-	pushl %ebp
-	movl %esp,%ebp
-	UserGate disable_status_led_nr
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosStartWatchdog
-#
-#   Purpose....: Start watchdog
-#
-#   Parameters.: Timeout, ms
-#
-##########################################################################*/
-
-    .global RdosStartWatchdog
-    
-RdosStartWatchdog:
-	pushl %ebp
-	movl %esp,%ebp
-;
-	movl 8(%ebp),%eax
-	UserGate start_watchdog_nr
-;	
-    leave
-    ret
-					    					    
-/*##########################################################################
-#
-#   Name       : RdosKickWatchdog
-#
-#   Purpose....: Kick watchdog
-#
-##########################################################################*/
-
-    .global RdosKickWatchdog
-    
-RdosKickWatchdog:
-	pushl %ebp
-	movl %esp,%ebp
-	UserGate kick_watchdog_nr
-    leave
-    ret
-					    
diff --git a/newlib/libc/sys/rdos/rdos.h b/newlib/libc/sys/rdos/rdos.h
deleted file mode 100755
index 6905000..0000000
--- a/newlib/libc/sys/rdos/rdos.h
+++ /dev/null
@@ -1,344 +0,0 @@
-

-#ifndef _RDOS_H

-#define _RDOS_H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-//#undef WIN32

-

-#define FILE_ATTRIBUTE_READONLY         0x1

-#define FILE_ATTRIBUTE_HIDDEN           0x2

-#define FILE_ATTRIBUTE_SYSTEM           0x4

-#define FILE_ATTRIBUTE_DIRECTORY        0x10

-#define FILE_ATTRIBUTE_ARCHIVE          0x20

-#define FILE_ATTRIBUTE_NORMAL           0x80

-

-#define LGOP_NULL  0

-#define LGOP_NONE  1

-#define LGOP_OR  2

-#define LGOP_AND  3

-#define LGOP_XOR  4

-#define LGOP_INVERT  5

-#define LGOP_INVERT_OR  6

-#define LGOP_INVERT_AND  7

-#define LGOP_INVERT_XOR  8

-#define LGOP_ADD  9

-#define LGOP_SUBTRACT  10

-#define LGOP_MULTIPLY  11

-

-#define getred(pgc)       (((pgc)>>16)&0xFF)

-#define getgreen(pgc)     (((pgc)>>8)&0xFF)

-#define getblue(pgc)      ((pgc)&0xFF)

-#define mkcolor(r,g,b)    (((r)<<16)|((g)<<8)|(b))

-

-typedef struct ThreadState

-{

-	 short int ID;

-	 char Name[32];

-	 unsigned long MsbTime;

-	 unsigned long LsbTime;

-	 char List[32];

-	 long Offset;

-	 short int Sel;

-} ThreadState;

-

-#ifdef __GNUC__

-#define __stdcall

-#else

-#if (sizeof(int) == 2)

-#define __stdcall

-#endif

-#endif

-

-short int __stdcall RdosSwapShort(short int val);

-long __stdcall RdosSwapLong(long val);

-

-void __stdcall RdosSetTextMode();

-int __stdcall RdosSetVideoMode(int *BitsPerPixel, int *xres, int *yres, int *linesize, void **buffer);

-void __stdcall RdosSetClipRect(int handle, int xmin, int ymin, int xmax, int ymax);

-void __stdcall RdosClearClipRect(int handle);

-void __stdcall RdosSetDrawColor(int handle, int color);

-void __stdcall RdosSetLGOP(int handle, int lgop);

-void __stdcall RdosSetHollowStyle(int handle);

-void __stdcall RdosSetFilledStyle(int handle);

-int __stdcall RdosOpenFont(int height);

-void __stdcall RdosCloseFont(int font);

-void __stdcall RdosGetStringMetrics(int font, const char *str, int *width, int *height);

-void __stdcall RdosSetFont(int handle, int font);

-int __stdcall RdosGetPixel(int handle, int x, int y);

-void __stdcall RdosSetPixel(int handle, int x, int y);

-void __stdcall RdosBlit(int SrcHandle, int DestHandle, int width, int height,

-				int SrcX, int SrcY, int DestX, int DestY);

-void __stdcall RdosDrawMask(int handle, void *mask, int RowSize, int width, int height,

-				int SrcX, int SrcY, int DestX, int DestY); 

-void __stdcall RdosDrawLine(int handle, int x1, int y1, int x2, int y2);

-void __stdcall RdosDrawString(int handle, int x, int y, const char *str);

-void __stdcall RdosDrawRect(int handle, int x, int y, int width, int height);

-void __stdcall RdosDrawEllipse(int handle, int x, int y, int width, int height);

-int __stdcall RdosCreateBitmap(int BitsPerPixel, int width, int height);

-int __stdcall RdosDuplicateBitmapHandle(int handle);

-void __stdcall RdosCloseBitmap(int handle);

-int __stdcall RdosCreateStringBitmap(int font, const char *str);

-void __stdcall RdosGetBitmapInfo(int handle, int *BitPerPixel, int *width, int *height,

-					   int *linesize, void **buffer);

-

-int __stdcall RdosCreateSprite(int DestHandle, int BitmapHandle, int MaskHandle, int lgop); 

-void __stdcall RdosCloseSprite(int handle);

-void __stdcall RdosShowSprite(int handle);

-void __stdcall RdosHideSprite(int handle);

-void __stdcall RdosMoveSprite(int handle, int x, int y);

-

-void __stdcall RdosSetForeColor(int color);

-void __stdcall RdosSetBackColor(int color);

-int __stdcall RdosGetMemSize(void *ptr);

-void *__stdcall RdosAllocateMem(int Size);

-void __stdcall RdosFreeMem(void *ptr);

-int __stdcall RdosAppDebug();

-

-int __stdcall RdosOpenCom(int ID, long BaudRate, char Parity, char DataBits, char StopBits, int SendBufSize, int RecBufSize); 

-void __stdcall RdosCloseCom(int Handle);

-void __stdcall RdosFlushCom(int Handle);

-char __stdcall RdosReadCom(int Handle);

-int __stdcall RdosWriteCom(int Handle, char Val);

-void __stdcall RdosEnableCts(int Handle);

-void __stdcall RdosDisableCts(int Handle);

-void __stdcall RdosEnableAutoRts(int Handle);

-void __stdcall RdosDisableAutoRts(int Handle);

-void __stdcall RdosSetDtr(int Handle);

-void __stdcall RdosResetDtr(int Handle);

-void __stdcall RdosSetRts(int Handle);

-void __stdcall RdosResetRts(int Handle);

-int __stdcall RdosGetReceiveBufferSpace(int Handle);

-int __stdcall RdosGetSendBufferSpace(int Handle);

-void __stdcall RdosWaitForSendCompletedCom(int Handle);

-

-int __stdcall RdosOpenFile(const char *FileName, char Access);

-int __stdcall RdosCreateFile(const char *FileName, int Attrib);

-void __stdcall RdosCloseFile(int Handle);

-int __stdcall RdosIsDevice(int Handle);

-int __stdcall RdosDuplFile(int Handle);

-long __stdcall RdosGetFileSize(int Handle);

-void __stdcall RdosSetFileSize(int Handle, long Size);

-long __stdcall RdosGetFilePos(int Handle);

-void __stdcall RdosSetFilePos(int Handle, long Pos);

-int __stdcall RdosReadFile(int Handle, void *Buf, int Size);

-int __stdcall RdosWriteFile(int Handle, const void *Buf, int Size);

-void __stdcall RdosGetFileTime(int Handle, unsigned long *MsbTime, unsigned long *LsbTime);

-void __stdcall RdosSetFileTime(int Handle, unsigned long MsbTime, unsigned long LsbTime);

-

-int __stdcall RdosCreateMapping(int Size);

-int __stdcall RdosCreateNamedMapping(const char *Name, int Size); 

-int __stdcall RdosCreateNamedFileMapping(const char *Name, int Size, int FileHandle);

-int __stdcall RdosOpenNamedMapping(const char *Name);

-void __stdcall RdosSyncMapping(int Handle);

-void __stdcall RdosCloseMapping(int Handle);

-void __stdcall RdosMapView(int Handle, int Offset, void *Base, int Size);

-void __stdcall RdosUnmapView(int Handle);

-

-int __stdcall RdosSetCurDrive(int Drive);

-int __stdcall RdosGetCurDrive();

-int __stdcall RdosSetCurDir(const char *PathName);

-int __stdcall RdosGetCurDir(int Drive, char *PathName);

-int __stdcall RdosMakeDir(const char *PathName);

-int __stdcall RdosRemoveDir(const char *PathName);

-int __stdcall RdosRenameFile(const char *ToName, const char *FromName);

-int __stdcall RdosDeleteFile(const char *PathName);

-int __stdcall RdosGetFileAttribute(const char *PathName, int *Attribute);

-int __stdcall RdosSetFileAttribute(const char *PathName, int Attribute);

-int __stdcall RdosOpenDir(const char *PathName);

-void __stdcall RdosCloseDir(int Handle);

-int __stdcall RdosReadDir(int Handle, int EntryNr, int MaxNameSize, char *PathName, long *FileSize, int *Attribute, unsigned long *MsbTime, unsigned long *LsbTime);

-

-int __stdcall RdosGetThreadState(int ThreadNr, ThreadState *State);

-int __stdcall RdosSuspendThread(int ThreadNr);

-

-void __stdcall RdosCpuReset();

-void __stdcall RdosGetVersion(int *Major, int *Minor, int *Release);

-void __stdcall RdosCreateThread(void (*Start)(void *Param), const char *Name, void *Param, int StackSize);

-void __stdcall RdosTerminateThread();

-int __stdcall RdosGetThreadHandle();

-int __stdcall RdosExec(const char *prog, const char *param);

-int __stdcall RdosSpawn(const char *prog, const char *param, const char *startdir);

-void __stdcall RdosWaitMilli(int ms);

-void __stdcall RdosGetTics(unsigned long *msb, unsigned long *lsb);

-void __stdcall RdosTicsToRecord(unsigned long msb, unsigned long lsb, int *year, int *month, int *day, int *hour, int *min, int *sec, int *milli);

-void __stdcall RdosRecordToTics(unsigned long *msb, unsigned long *lsb, int year, int month, int day, int hour, int min, int sec, int milli);

-int __stdcall RdosDayOfWeek(int year, int month, int day);

-void __stdcall RdosGetSysTime(int *year, int *month, int *day, int *hour, int *min, int *sec, int *milli);

-void __stdcall RdosGetTime(int *year, int *month, int *day, int *hour, int *min, int *sec, int *milli);

-void __stdcall RdosSetTime(int year, int month, int day, int hour, int min, int sec, int milli);

-void __stdcall RdosAddTics(unsigned long *msb, unsigned long *lsb, long tics);

-void __stdcall RdosAddMilli(unsigned long *msb, unsigned long *lsb, long ms);

-void __stdcall RdosAddSec(unsigned long *msb, unsigned long *lsb, long sec);

-void __stdcall RdosAddMin(unsigned long *msb, unsigned long *lsb, long min);

-void __stdcall RdosAddHour(unsigned long *msb, unsigned long *lsb, long hour);

-void __stdcall RdosAddDay(unsigned long *msb, unsigned long *lsb, long day);

-int __stdcall RdosSyncTime(long IP);

-

-void __stdcall RdosDecodeMsbTics(unsigned long msb, int *days, int *hours);

-void __stdcall RdosDecodeLsbTics(unsigned long lsb, int *min, int *sec, int *milli, int *micro); 

-

-int __stdcall RdosCreateSection();

-void __stdcall RdosDeleteSection(int Handle);

-void __stdcall RdosEnterSection(int Handle);

-void __stdcall RdosLeaveSection(int Handle);

-

-int __stdcall RdosCreateWait();

-void __stdcall RdosCloseWait(int Handle);

-void * __stdcall RdosCheckWait(int Handle);

-void * __stdcall RdosWaitForever(int Handle);

-void * __stdcall RdosWaitTimeout(int Handle, int MillSec);

-void __stdcall RdosStopWait(int Handle);

-void __stdcall RdosRemoveWait(int Handle, void *ID);

-void __stdcall RdosAddWaitForKeyboard(int Handle, void *ID);

-void __stdcall RdosAddWaitForMouse(int Handle, void *ID);

-void __stdcall RdosAddWaitForCom(int Handle, int ComHandle, void *ID);

-void __stdcall RdosAddWaitForAdc(int Handle, int AdcHandle, void *ID);

-

-int __stdcall RdosCreateSignal();

-void __stdcall RdosResetSignal(int Handle);

-int __stdcall RdosIsSignalled(int Handle);

-void __stdcall RdosSetSignal(int Handle);

-void __stdcall RdosFreeSignal(int Handle);

-void __stdcall RdosAddWaitForSignal(int Handle, int SignalHandle, void *ID);

-

-long __stdcall RdosGetIp();

-int __stdcall RdosNameToIp(const char *HostName);

-int __stdcall RdosIpToName(int Ip, char *HostName, int MaxSize);

-

-int __stdcall RdosCreateTcpListen(int Port, int MaxConnections, int BufferSize);

-int __stdcall RdosGetTcpListen(int Handle);

-void __stdcall RdosCloseTcpListen(int Handle);

-void __stdcall RdosAddWaitForTcpListen(int Handle, int ConHandle, void *ID);

-

-int __stdcall RdosOpenTcpConnection(int RemoteIp, int LocalPort, int RemotePort, int Timeout, int BufferSize);

-int __stdcall RdosWaitForTcpConnection(int Handle, long Timeout);

-void __stdcall RdosAddWaitForTcpConnection(int Handle, int ConHandle, void *ID);

-void __stdcall RdosCloseTcpConnection(int Handle);

-void __stdcall RdosDeleteTcpConnection(int Handle);

-void __stdcall RdosAbortTcpConnection(int Handle);

-void __stdcall RdosPushTcpConnection(int Handle);

-int __stdcall RdosIsTcpConnectionClosed(int Handle);

-long __stdcall RdosGetRemoteTcpConnectionIP(int Handle);

-int __stdcall RdosGetRemoteTcpConnectionPort(int Handle);

-int __stdcall RdosGetLocalTcpConnectionPort(int Handle);

-int __stdcall RdosReadTcpConnection(int Handle, void *Buf, int Size);

-int __stdcall RdosWriteTcpConnection(int Handle, const void *Buf, int Size);

-int __stdcall RdosPollTcpConnection(int Handle);

-

-int __stdcall RdosGetLocalMailslot(const char *Name);

-int __stdcall RdosGetRemoteMailslot(long Ip, const char *Name);

-void __stdcall RdosFreeMailslot(int Handle);

-int __stdcall RdosSendMailslot(int Handle, const void *Msg, int Size, void *ReplyBuf, int MaxReplySize);

-

-void __stdcall RdosDefineMailslot(const char *Name, int MaxSize);

-int __stdcall RdosReceiveMailslot(void *Msg);

-void __stdcall RdosReplyMailslot(const void *Msg, int Size);

-

-void __stdcall RdosSetFocus(char FocusKey);

-char __stdcall RdosGetFocus();

-

-void __stdcall RdosClearKeyboard();

-int __stdcall RdosPollKeyboard();

-int __stdcall RdosReadKeyboard();

-int __stdcall RdosGetKeyboardState();

-int __stdcall RdosPutKeyboard(int KeyCode, int VirtualKey, int ScanCode);

-int __stdcall RdosPeekKeyEvent(int *ExtKey, int *KeyState, int *VirtualKey, int *ScanCode);

-int __stdcall RdosReadKeyEvent(int *ExtKey, int *KeyState, int *VirtualKey, int *ScanCode);

-

-void __stdcall RdosHideMouse();

-void __stdcall RdosShowMouse();

-void __stdcall RdosGetMousePosition(int *x, int *y);

-void __stdcall RdosSetMousePosition(int x, int y);

-void __stdcall RdosSetMouseWindow(int StartX, int StartY, int EndX, int EndY);

-void __stdcall RdosSetMouseMickey(int x, int y);

-int __stdcall RdosGetLeftButton();

-int __stdcall RdosGetRightButton();

-void __stdcall RdosGetLeftButtonPressPosition(int *x, int *y);

-void __stdcall RdosGetRightButtonPressPosition(int *x, int *y);

-void __stdcall RdosGetLeftButtonReleasePosition(int *x, int *y);

-void __stdcall RdosGetRightButtonReleasePosition(int *x, int *y);

-

-void __stdcall RdosGetCursorPosition(int *Row, int *Col);

-void __stdcall RdosSetCursorPosition(int Row, int Col);

-void __stdcall RdosWriteChar(char ch);

-void __stdcall RdosWriteSizeString(const char *Buf, int Size);

-void __stdcall RdosWriteString(const char *Buf);

-int __stdcall RdosReadLine(char *Buf, int MaxSize);

-

-int __stdcall RdosPing(long Node, long Timeout);

-

-int __stdcall RdosGetIdeDisc(int UnitNr);

-int __stdcall RdosGetFloppyDisc(int UnitNr);

-

-int __stdcall RdosSetDiscInfo(int DiscNr, int SectorSize, long Sectors, int BiosSectorsPerCyl, int BiosHeads);

-int __stdcall RdosGetDiscInfo(int DiscNr, int *SectorSize, long *Sectors, int *BiosSectorsPerCyl, int *BiosHeads);

-int __stdcall RdosReadDisc(int DiscNr, long Sector, char *Buf, int Size);

-int __stdcall RdosWriteDisc(int DiscNr, long Sector, const char *Buf, int Size);

-

-void __stdcall RdosGetRdfsInfo(void *CryptTab, void *KeyTab, void *ExtentSizeTab);

-void __stdcall RdosDemandLoadDrive(int DriveNr);

-int __stdcall RdosFormatDrive(int DiscNr, long StartSector, int Size, const char *FsName);

-

-int __stdcall RdosAllocateFixedDrive(int DriveNr);

-int __stdcall RdosAllocateStaticDrive();

-int __stdcall RdosAllocateDynamicDrive();

-

-int __stdcall RdosGetDriveInfo(int DriveNr, long *FreeUnits, int *BytesPerUnit, long *TotalUnits);

-int __stdcall RdosGetDriveDiscParam(int DriveNr, int *DiscNr, long *StartSector, long *TotalSectors);

-

-int __stdcall RdosCreateFileDrive(int Drive, long Size, const char *FsName, const char *FileName);

-int __stdcall RdosOpenFileDrive(int Drive, const char *FileName);

-

-int __stdcall RdosGetModuleHandle();

-const char * __stdcall RdosGetExeName();

-int __stdcall RdosLoadDll(const char *Name);

-void __stdcall RdosFreeDll(int handle);

-int __stdcall RdosReadResource(int handle, int ID, char *Buf, int Size);

-int __stdcall RdosReadBinaryResource(int handle, int ID, char *Buf, int Size);

-

-int __stdcall RdosOpenAdc(int channel);

-void __stdcall RdosCloseAdc(int handle);

-void __stdcall RdosDefineAdcTime(int handle, unsigned long msg, unsigned long lsb);

-long __stdcall RdosReadAdc(int handle);

-

-int __stdcall RdosReadSerialLines(int device, int *val);

-int __stdcall RdosToggleSerialLine(int device, int line);

-int __stdcall RdosReadSerialVal(int device, int line, int *val);

-int __stdcall RdosWriteSerialVal(int device, int line, int val);

-int __stdcall RdosReadSerialRaw(int device, int line, int *val);

-int __stdcall RdosWriteSerialRaw(int device, int line, int val);

-

-int __stdcall RdosOpenSysEnv();

-int __stdcall RdosOpenProcessEnv();

-void __stdcall RdosCloseEnv(int handle);

-void __stdcall RdosAddEnvVar(int handle, const char *var, const char *value);

-void __stdcall RdosDeleteEnvVar(int handle, const char *var);

-int __stdcall RdosFindEnvVar(int handle, const char *var, char *value);

-void __stdcall RdosGetEnvData(int handle, char *buf);

-void __stdcall RdosSetEnvData(int handle, const char *buf);

-

-int __stdcall RdosOpenSysIni();

-void __stdcall RdosCloseIni(int handle);

-int __stdcall RdosGotoIniSection(int handle, const char *name);

-int __stdcall RdosRemoveIniSection(int handle);

-int __stdcall RdosReadIni(int handle, const char *var, char *str, int maxsize);

-int __stdcall RdosWriteIni(int handle, const char *var, const char *str);

-int __stdcall RdosDeleteIni(int handle, const char *var);

-

-void __stdcall RdosEnableStatusLED();

-void __stdcall RdosDisableStatusLED();

-

-void __stdcall RdosStartWatchdog(int timeout);

-void __stdcall RdosKickWatchdog();

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

-

-

-

diff --git a/newlib/libc/sys/rdos/rdoshelp.c b/newlib/libc/sys/rdos/rdoshelp.c
deleted file mode 100644
index 20d2535..0000000
--- a/newlib/libc/sys/rdos/rdoshelp.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# rdoshelp.c                                                                
-# implementation of various structures and helpers
-#
-##########################################################################*/
-
-#include <reent.h>
-#include <rdos.h>
-#include <stdio.h>
-
-char *__env[1] = { 0 }; 
-char **environ = __env; 
-
-static int once_section;
-static int key_section;
-
-/*##########################################################################
-#
-#   Name       : _get_impure_data_size
-#
-#   Purpose....: Get size of _reent structure
-#
-#   In params..: *
-#   Out params.: *
-#   Returns....: size
-#
-##########################################################################*/
-int get_impure_data_size()
-{
-	return sizeof(struct _reent);
-}
-
-/*##########################################################################
-#
-#   Name       : __rdos_thread_once
-#
-#   Purpose....: Emulate GCC pthread_once
-#
-#   In params..: Handle initially 0
-#              : function to initially call
-#   Out params.: *
-#   Returns....: result
-#
-##########################################################################*/
-int __rdos_thread_once (int *handle, void (*func) (void))
-{
-    if (handle == 0 || func == 0)
-        return 0;
-         
-    RdosEnterSection(once_section);
-    if (*handle == 0)
-        (*func)();
-    else
-        *handle = 1;
-    RdosLeaveSection(once_section);
-    return 0;
-}
-
-/*##########################################################################
-#
-#   Name       : __rdos_thread_mutex_init
-#
-#   Purpose....: Emulate GCC pthread_thread_mutex_init
-#
-#   In params..: *
-#   Out params.: *
-#   Returns....: handle
-#
-##########################################################################*/
-int __rdos_thread_mutex_init (void)
-{
-    return RdosCreateSection();
-}
-
-/*##########################################################################
-#
-#   Name       : __rdos_thread_mutex_lock
-#
-#   Purpose....: Emulate GCC pthread_thread_mutex_lock
-#
-#   In params..: handle
-#   Out params.: *
-#   Returns....: *
-#
-##########################################################################*/
-int __rdos_thread_mutex_lock (int handle)
-{
-    RdosEnterSection(handle);
-    return 0;
-}
-
-/*##########################################################################
-#
-#   Name       : __rdos_thread_mutex_trylock
-#
-#   Purpose....: Emulate GCC pthread_thread_mutex_trylock
-#                Try is not yet implemented, and lock is used.
-#
-#   In params..: handle
-#   Out params.: *
-#   Returns....: *
-#
-##########################################################################*/
-int __rdos_thread_mutex_trylock (int handle)
-{
-    RdosEnterSection(handle);
-    return 0;
-}
-
-/*##########################################################################
-#
-#   Name       : __rdos_thread_mutex_unlock
-#
-#   Purpose....: Emulate GCC pthread_thread_mutex_unlock
-#
-#   In params..: handle
-#   Out params.: *
-#   Returns....: *
-#
-##########################################################################*/
-int __rdos_thread_mutex_unlock (int handle)
-{
-    RdosLeaveSection(handle);
-    return 0;
-}
-
-/*##########################################################################
-#
-#   Name       : __init_rdos
-#
-#   Purpose....: Init RDOS specific data
-#
-#   In params..: reent structure
-#   Out params.: *
-#   Returns....: *
-#
-##########################################################################*/
-void __init_rdos(struct _reent *reent)
-{
-	once_section = RdosCreateSection();
-	_REENT_INIT_PTR(reent);
-	__sinit(reent);
-}
diff --git a/newlib/libc/sys/rdos/read.c b/newlib/libc/sys/rdos/read.c
deleted file mode 100644
index e9f3464..0000000
--- a/newlib/libc/sys/rdos/read.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# read.c                                                                

-# read function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-#include "rdos.h"

-

-int read(int file, char *ptr, int len)

-{

-    return RdosReadFile(file, ptr, len);

-}

diff --git a/newlib/libc/sys/rdos/readlink.c b/newlib/libc/sys/rdos/readlink.c
deleted file mode 100755
index ad4c69d..0000000
--- a/newlib/libc/sys/rdos/readlink.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-#include <sys/types.h>

-

-int readlink(const char *path, char *buf, size_t bufsize)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/sbrk.c b/newlib/libc/sys/rdos/sbrk.c
deleted file mode 100644
index fdcb5fb..0000000
--- a/newlib/libc/sys/rdos/sbrk.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# sbrk.c                                                                

-# sbrk function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_syslist.h>

-#include "rdos.h"

-

-void *sbrk (int incr)

-{ 

-   return RdosAllocateMem(incr);

-} 

diff --git a/newlib/libc/sys/rdos/stat.c b/newlib/libc/sys/rdos/stat.c
deleted file mode 100755
index f1683b6..0000000
--- a/newlib/libc/sys/rdos/stat.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-#include <errno.h>

-

-int stat(const char *file, struct stat *st)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/symlink.c b/newlib/libc/sys/rdos/symlink.c
deleted file mode 100755
index 4d5fa1e..0000000
--- a/newlib/libc/sys/rdos/symlink.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int symlink(const char *path1, const char *path2)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/times.c b/newlib/libc/sys/rdos/times.c
deleted file mode 100644
index 47a540b..0000000
--- a/newlib/libc/sys/rdos/times.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <sys/times.h>

-#include <errno.h>

-

-clock_t times(struct tms *buf)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/unlink.c b/newlib/libc/sys/rdos/unlink.c
deleted file mode 100644
index d6c3736..0000000
--- a/newlib/libc/sys/rdos/unlink.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int unlink(char *name)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/user.def b/newlib/libc/sys/rdos/user.def
deleted file mode 100644
index f5af306..0000000
--- a/newlib/libc/sys/rdos/user.def
+++ /dev/null
@@ -1,368 +0,0 @@
-
-allocate_dos_mem_nr			= 0
-allocate_local_mem_nr		= 1
-free_mem_nr					= 2
-available_local_linear_nr	= 3
-used_local_linear_nr		= 4
-available_vm_linear_nr		= 5
-used_vm_linear_nr			= 6
-
-reserve_pe_mem_nr			= 7
-set_flat_linear_valid_nr	= 8
-set_flat_linear_invalid_nr	= 9
-set_flat_linear_read_nr		= 10
-set_flat_linear_readwrite_nr = 11
-
-get_raw_switch_ads_nr		= 12
-raw_switch_nr				= 13
-get_exception_nr			= 14
-set_exception_nr			= 15
-get_pm_int_nr				= 16
-set_pm_int_nr				= 17
-get_vm_int_nr				= 18
-set_vm_int_nr				= 19
-dpmi_int_nr					= 20
-dpmi_call_int_nr			= 21
-dpmi_call_nr				= 22
-allocate_vm_callback_nr		= 23
-free_vm_callback_nr			= 24
-
-wait_milli_nr				= 25
-wait_micro_nr				= 26
-wait_until_nr				= 27
-create_thread_nr			= 28
-terminate_thread_nr			= 29
-get_thread_nr				= 30
-swap_nr						= 31
-
-create_user_section_nr		= 32
-create_blocked_user_section_nr = 33
-delete_user_section_nr		= 34
-enter_user_section_nr		= 35
-leave_user_section_nr		= 36
-
-get_local_mailslot_nr		= 37
-get_remote_mailslot_nr		= 38
-free_mailslot_nr			= 39
-send_mailslot_nr			= 40
-define_mailslot_nr			= 41
-receive_mailslot_nr			= 42
-reply_mailslot_nr			= 43
-
-load_exe_nr					= 44
-spawn_exe_nr				= 45
-unload_exe_nr				= 46
-get_exit_code_nr			= 47
-get_exe_name_nr				= 48
-get_cmd_line_nr				= 49
-get_env_nr					= 50
-load_dll_nr					= 51
-free_dll_nr					= 52
-get_dll_proc_nr				= 53
-get_dll_resource_nr			= 54
-get_dll_name_nr				= 55
-get_dll_nr					= 56
-allocate_app_mem_nr			= 57
-free_app_mem_nr				= 58
-get_psp_sel_nr				= 59
-
-get_debug_tss_nr			= 60
-get_debug_thread_nr			= 61
-debug_trace_nr				= 62
-debug_pace_nr				= 63
-debug_go_nr					= 64
-debug_next_nr				= 65
-
-wait_for_pe_debug_nr		= 68
-continue_pe_debug_nr		= 69
-notify_pe_exception_nr		= 70
-read_thread_mem_nr			= 71
-write_thread_mem_nr			= 72
-get_thread_tss_nr			= 73
-set_thread_tss_nr			= 74
-
-get_cpu_time_nr				= 75
-get_system_time_nr			= 76
-get_time_nr					= 77
-time_to_system_time_nr		= 78
-system_time_to_time_nr		= 79
-days_in_month_nr			= 80
-adjust_time_nr				= 81
-passed_days_nr				= 82
-time_to_binary_nr			= 83
-binary_to_time_nr			= 84
-sync_time_nr				= 85
-
-set_focus_nr				= 86
-enable_focus_nr				= 87
-
-get_dns_nr					= 88
-get_ppp_dns_nr				= 89
-open_tcp_connection_nr		= 90
-wait_for_tcp_connection_nr	= 92
-close_tcp_connection_nr		= 93
-delete_tcp_connection_nr	= 94
-is_tcp_connection_closed_nr	= 95
-abort_tcp_connection_nr		= 96
-read_tcp_connection_nr		= 97
-write_tcp_connection_nr		= 98
-push_tcp_connection_nr		= 99
-get_ip_address_nr			= 100
-name_to_ip_nr				= 101
-ip_to_name_nr				= 102
-ping_nr						= 103 
-
-get_disc_info_nr			= 104
-format_drive_nr				= 105
-get_rdfs_info_nr			= 106
-read_disc_nr				= 107
-write_disc_nr				= 108
-get_drive_info_nr			= 109
-
-set_cur_drive_nr			= 110
-get_cur_drive_nr			= 111
-set_cur_dir_nr				= 112
-get_cur_dir_nr				= 113
-make_dir_nr					= 114
-remove_dir_nr				= 115
-rename_file_nr				= 116
-delete_file_nr				= 117
-get_file_attribute_nr		= 118
-set_file_attribute_nr		= 119
-open_dir_nr					= 120
-close_dir_nr				= 121
-read_dir_nr					= 122
-
-open_file_nr				= 123
-create_file_nr				= 124
-close_file_nr				= 125
-dupl_file_nr				= 126
-get_ioctl_data_nr			= 127
-get_file_size_nr			= 128
-set_file_size_nr			= 129
-get_file_pos_nr				= 130
-set_file_pos_nr				= 131
-get_file_time_nr			= 132
-set_file_time_nr			= 133
-read_file_nr				= 134
-write_file_nr				= 135
-read_con_nr					= 136
-
-create_mapping_nr			= 137
-create_named_mapping_nr		= 138
-create_file_mapping_nr		= 139
-create_named_file_mapping_nr = 140
-open_named_mapping_nr		= 141
-sync_mapping_nr				= 142
-close_mapping_nr			= 143
-map_view_nr					= 144
-unmap_view_nr				= 145
-
-read_keyboard_nr			= 146
-poll_keyboard_nr			= 147
-flush_keyboard_nr			= 148
-get_keyboard_state_nr		= 151
-
-show_mouse_nr				= 152
-hide_mouse_nr				= 153
-get_mouse_position_nr		= 154
-set_mouse_position_nr		= 155
-set_mouse_window_nr			= 156
-set_mouse_mickey_nr			= 157
-get_left_button_nr			= 158
-get_right_button_nr			= 159
-get_left_button_press_position_nr	= 160
-get_right_button_press_position_nr	= 161
-get_left_button_release_position_nr	= 162
-get_right_button_release_position_nr	= 163
-hook_mouse_nr				= 164
-unhook_mouse_nr				= 165
-
-lock_cd_nr					= 166
-unlock_cd_nr				= 167
-eject_cd_nr					= 168
-insert_cd_nr				= 169
-
-open_com_nr					= 170
-close_com_nr				= 171
-flush_com_nr				= 172
-add_wait_for_com_nr			= 174
-read_com_nr					= 175
-write_com_nr				= 176
-set_dtr_nr					= 177
-reset_dtr_nr				= 178
-
-init_printer_nr				= 179
-check_printer_nr			= 180
-write_printer_nr			= 181
-
-set_cursor_position_nr		= 182
-get_cursor_position_nr		= 183
-write_char_nr				= 184
-write_asciiz_nr				= 185
-write_size_string_nr		= 186
-
-set_video_mode_nr			= 187
-set_vga_mode_nr				= 188
-set_forecolor_nr			= 189
-set_backcolor_nr			= 190
-get_string_metrics_nr		= 193
-set_font_nr					= 194
-get_video_mode_nr           = 195
-draw_string_nr				= 197
-
-xms_handler_nr				= 198
-ems_handler_nr				= 199
-
-test_nr						= 200
-
-resize_flat_linear_nr		= 201
-
-set_drawcolor_nr			= 202
-set_lgop_nr					= 203
-set_hollow_style_nr			= 204
-set_filled_style_nr			= 205
-get_pixel_nr				= 206
-set_pixel_nr				= 207
-draw_line_nr				= 208
-draw_rect_nr				= 209
-draw_ellipse_nr				= 210
-create_bitmap_nr			= 211
-close_bitmap_nr				= 212
-blit_nr						= 213
-open_font_nr				= 215
-close_font_nr				= 216
-create_string_bitmap_nr		= 217
-get_bitmap_info_nr			= 218
-draw_mask_nr				= 219
-
-create_sprite_nr            = 220
-close_sprite_nr             = 221
-show_sprite_nr              = 222
-hide_sprite_nr              = 223
-move_sprite_nr              = 224
-
-dup_bitmap_handle_nr        = 225
-set_clip_rect_nr            = 226
-clear_clip_rect_nr          = 227
-
-set_rts_nr                  = 228
-reset_rts_nr                = 229
-get_com_receive_space_nr    = 230
-get_com_send_space_nr       = 231
-
-get_char_attrib_nr			= 232
-
-create_wait_nr              = 233
-close_wait_nr               = 234
-is_wait_idle_nr				= 235
-wait_no_timeout_nr          = 236
-wait_timeout_nr				= 237
-stop_wait_nr                = 238
-add_wait_for_keyboard_nr    = 239
-
-peek_key_event_nr           = 240
-read_key_event_nr           = 241
-
-add_wait_for_mouse_nr		= 242
-remove_wait_nr              = 243
-
-add_wait_for_adc_nr			= 244
-open_adc_nr					= 245
-close_adc_nr				= 246
-define_adc_time_nr 			= 247
-read_adc_nr					= 248
-
-free_v86_nr                 = 249
-
-read_serial_lines_nr		= 250
-toggle_serial_line_nr		= 251
-
-read_serial_val_nr			= 252
-write_serial_val_nr			= 253
-
-create_file_drive_nr        = 254
-open_file_drive_nr          = 255
-
-dos_ext_exec_nr				= 256
-
-open_sys_env_nr             = 257
-open_proc_env_nr            = 258
-close_env_nr                = 259
-add_env_var_nr              = 260
-delete_env_var_nr           = 261
-find_env_var_nr             = 262
-get_env_data_nr     	    = 263
-set_env_data_nr 	        = 264
-
-open_sys_ini_nr				= 265
-close_ini_nr				= 266
-goto_ini_section_nr         = 267
-remove_ini_section_nr       = 268
-read_ini_nr                 = 269
-write_ini_nr                = 270
-delete_ini_nr               = 271
-
-app_debug_nr				= 272
-get_version_nr              = 273
-
-enable_status_led_nr        = 274
-disable_status_led_nr       = 275
-
-start_watchdog_nr           = 276
-kick_watchdog_nr            = 277
-
-erase_disc_sectors_nr       = 278
-
-cpu_reset_nr                = 279
-
-enable_cts_nr               = 280
-disable_cts_nr              = 281
-
-wait_for_send_completed_com_nr  = 282
-
-add_wait_for_tcp_connection_nr  = 283
-
-get_remote_tcp_connection_ip_nr        = 284
-get_remote_tcp_connection_port_nr      = 285
-get_local_tcp_connection_port_nr       = 286
-
-enable_auto_rts_nr          = 287
-disable_auto_rts_nr         = 288
-
-put_keyboard_code_nr        = 289
-
-poll_tcp_connection_nr		= 290
-
-create_signal_nr            = 291
-free_signal_nr              = 292
-add_wait_for_signal_nr      = 293
-set_signal_nr               = 294
-reset_signal_nr             = 295
-is_signalled_nr             = 296
-
-get_drive_disc_param_nr     = 297
-
-get_ide_disc_nr             = 298
-get_floppy_disc_nr          = 299
-demand_load_drive_nr        = 300
-set_disc_info_nr            = 301
-
-get_thread_state_nr			= 302
-suspend_thread_nr	    	= 303
-resume_thread_nr	    	= 304
-
-update_time_nr				= 305
-
-allocate_static_drive_nr	= 306
-allocate_fixed_drive_nr		= 307
-allocate_dynamic_drive_nr	= 308
-
-get_focus_nr                = 309
-
-add_wait_for_tcp_listen_nr  = 310
-create_tcp_listen_nr        = 311
-get_tcp_listen_nr           = 312
-close_tcp_listen_nr         = 313
-
-usergate_entries			= 340
diff --git a/newlib/libc/sys/rdos/wait.c b/newlib/libc/sys/rdos/wait.c
deleted file mode 100644
index a7bc8aa..0000000
--- a/newlib/libc/sys/rdos/wait.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-

-int wait(int *status)

-{

-  errno = ENOSYS;

-  return -1;

-}

diff --git a/newlib/libc/sys/rdos/write.c b/newlib/libc/sys/rdos/write.c
deleted file mode 100644
index d02faec..0000000
--- a/newlib/libc/sys/rdos/write.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*#######################################################################

-# RDOS operating system

-# Copyright (C) 1988-2006, Leif Ekblad

-#

-# This library is free software; you can redistribute it and/or modify

-# it under the terms of the GNU Lesser General Public License as published

-# by the Free Software Foundation; either version 2.1 of the License, 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 Lesser General Public License for more details.

-#

-# You should have received a copy of the GNU Lesser General Public

-# License along with this library; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 

-#

-# The author of this program may be contacted at leif@rdos.net

-#

-# write.c                                                                

-# write function implementation

-#

-##########################################################################*/

-

-#include "config.h"

-#include <_ansi.h>

-#include <_syslist.h>

-#include <errno.h>

-#include "rdos.h"

-

-int write(int file, char *ptr, int len)

-{

-    return RdosWriteFile(file, ptr, len);

-}

diff --git a/newlib/libc/sys/rtems/Makefile.in b/newlib/libc/sys/rtems/Makefile.in
index a72d595..d5cb543 100644
--- a/newlib/libc/sys/rtems/Makefile.in
+++ b/newlib/libc/sys/rtems/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/rtems/aclocal.m4 b/newlib/libc/sys/rtems/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/rtems/aclocal.m4
+++ b/newlib/libc/sys/rtems/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/rtems/configure b/newlib/libc/sys/rtems/configure
index b2d1fbd..1d84041 100755
--- a/newlib/libc/sys/rtems/configure
+++ b/newlib/libc/sys/rtems/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/rtems/crt0.c b/newlib/libc/sys/rtems/crt0.c
index 47332b7..e77b52e 100644
--- a/newlib/libc/sys/rtems/crt0.c
+++ b/newlib/libc/sys/rtems/crt0.c
@@ -1,3 +1,4 @@
+void rtems_provides_crt0( void ) {}
 /*
  *  RTEMS Fake crt0
  *
@@ -10,10 +11,6 @@
  *  but this is enough to satisfy the autoconf macro AC_PROG_CC.
  */
 
-#include <reent.h>
-
-void rtems_provides_crt0( void ) {}  /* dummy symbol so file always has one */
-
 /* RTEMS provides some of its own routines including a Malloc family */
 
 void *malloc() { return 0; }
@@ -22,68 +19,16 @@ void free() { ; }
 void abort() { ; }
 int raise() { return -1; }
 
-#if defined(__GNUC__)
-/*
- * stubs for libstdc++ rtems-threads support functions from gcc/gthr-rtems.h
- */
-int rtems_gxx_once() { return -1; }
-int rtems_gxx_key_create() { return -1; }
-int rtems_gxx_key_delete() { return -1; }
-void *rtems_gxx_getspecific() { return 0; }
-int rtems_gxx_setspecific() { return -1; }
-
-void rtems_gxx_mutex_init() { }
-int rtems_gxx_mutex_lock() { return -1; }
-int rtems_gxx_mutex_trylock() { return -1; }
-int rtems_gxx_mutex_unlock() { return -1; }
-
-void rtems_gxx_recursive_mutex_init() { }
-int rtems_gxx_recursive_mutex_lock() { return -1; }
-int rtems_gxx_recursive_mutex_trylock() { return -1; }
-int rtems_gxx_recursive_mutex_unlock() { return -1; }
-#endif
-
-/* stubs for functions from reent.h */
-int _close_r (struct _reent *r, int fd) { return -1; }
-#if NOT_USED_BY_RTEMS
-int _execve_r (struct _reent *r, char *, char **, char **) { return -1; }
-#endif
-int _fcntl_r (  struct _reent *ptr, int fd, int cmd, int arg ) { return -1;}
-#if NOT_USED_BY_RTEMS
-int _fork_r (struct _reent *r) { return -1; }
-#endif
-int _fstat_r (struct _reent *r, int fd, struct stat *buf) { return -1; }
-int _getpid_r (struct _reent *r) { return -1; }
-int _kill_r ( struct _reent *r, int pid, int sig ) { return -1; }
-int _link_r ( struct _reent *ptr, const char *existing, const char *new) { return -1; }
-_off_t _lseek_r ( struct _reent *ptr, int fd, _off_t offset, int whence ) { return -1; }
-int _open_r (struct _reent *r, const char *buf, int flags, int mode) { return -1; }
-_ssize_t _read_r (struct _reent *r, int fd, void *buf, size_t nbytes) { return -1; }
-#if NOT_USED_BY_RTEMS 
-void *_sbrk_r (struct _reent *r, ptrdiff_t) { return -1; }
-#endif
-int _stat_r (struct _reent *r, const char *path, struct stat *buf) { return -1; }
-_CLOCK_T_ _times_r (struct _reent *r, struct tms *ptms) { return -1; }
-int _unlink_r (struct _reent *r, const char *path) { return -1; }
-#if NOT_USED_BY_RTEMS
-int _wait_r (struct _reent *r, int *) { return -1; }
+/* gcc 2.8.1 implicitly can generate references to these for at
+ * least sparc-elf */
+#if (__GNUC__ == 2) && (__GNUC_MINOR__ == 8)
+strcmp() {}
+strcpy() {}
+strlen() {}
+memcmp() {}
+memcpy() {}
+memset() {}
 #endif
-_ssize_t _write_r (struct _reent *r, int fd, const void *buf, size_t nbytes) { return -1; }
-
-int isatty( int fd ) { return -1; }
-
-_realloc_r() {}
-_calloc_r() {}
-_malloc_r() {}
-_free_r() {}
-
-/* gcc can implicitly generate references to these */
-/* strcmp() {} */
-/* strcpy() {} */
-/* strlen() {} */
-/* memcmp() {} */
-/* memcpy() {} */
-/* memset() {} */
 
 /* The PowerPC expects certain symbols to be defined in the linker script. */
 
@@ -95,14 +40,6 @@ _free_r() {}
   int __FIXUP_START__;  int __FIXUP_END__;
   int __EXCEPT_START__; int __EXCEPT_END__;
   int __init;           int __fini;
-  int __CTOR_LIST__;    int __CTOR_END__;
-  int __DTOR_LIST__;    int __DTOR_END__;
-#endif
-
-/* The SH expects certain symbols to be defined in the linker script. */
-
-#if defined(__sh__)
-int __EH_FRAME_BEGIN__;
 #endif
 
 /*  The hppa expects this to be defined in the real crt0.s. 
@@ -117,10 +54,6 @@ int __EH_FRAME_BEGIN__;
   asm ( "\$global\$:");
 */
 
-  asm (".text");
-  asm (".global");
-  asm (".EXPORT $$dyncall,ENTRY");
-  asm ("$$dyncall:");
   int atexit(void (*function)(void)) { return 0; }
 #endif
 
@@ -139,11 +72,3 @@ asm (".equ    V_FILL, 65" );
 asm (".equ    V_BSD_OS, 66" );
 asm (".equ    V_EPI_OS, 69" );
 #endif
-
-#if defined(__AVR__)
-/*
- * Initial stack pointer address "__stack"
- *  hard coded into GCC instead of providing it through ldscripts
- */
-const char* __stack ;
-#endif
diff --git a/newlib/libc/sys/rtems/include/limits.h b/newlib/libc/sys/rtems/include/limits.h
index 9d11624..e9f45e4 100644
--- a/newlib/libc/sys/rtems/include/limits.h
+++ b/newlib/libc/sys/rtems/include/limits.h
@@ -14,8 +14,6 @@
 #include_next <limits.h>
 #endif
 
-#include <sys/syslimits.h>
-
 #ifndef __POSIX_LIMITS_h
 #define __POSIX_LIMITS_h
 
@@ -59,9 +57,12 @@
 #define AIO_LISTIO_MAX          2
 #define AIO_MAX                 1
 #define AIO_PRIO_DELTA_MAX      0
+#define ARG_MAX                 4096
+#define CHILD_MAX               6
 #define DELAYTIMER_MAX          32
 #define MQ_OPEN_MAX             8
 #define MQ_PRIO_MAX             32
+#define OPEN_MAX                16
 #define PAGESIZE                1
 #define RTSIG_MAX               8
 #define SEM_NSEMS_MAX           256
@@ -72,6 +73,17 @@
 #define TZNAME_MAX              3
 
 /*
+ *  Pathname Variables
+ */
+
+#define LINK_MAX                8
+#define MAX_CANON               255
+#define MAX_INPUT               255
+#define NAME_MAX                255
+#define PATH_MAX                255
+#define PIPE_BUF                512
+
+/*
  *  Invariant values
  */
 
diff --git a/newlib/libc/sys/rtems/machine/limits.h b/newlib/libc/sys/rtems/machine/limits.h
deleted file mode 100644
index 5a6ee03..0000000
--- a/newlib/libc/sys/rtems/machine/limits.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- *  $Id$
- */
-
-/* intentionally empty file */
-
diff --git a/newlib/libc/sys/rtems/machine/param.h b/newlib/libc/sys/rtems/machine/param.h
deleted file mode 100644
index 4168f1f..0000000
--- a/newlib/libc/sys/rtems/machine/param.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef _MACHINE_PARAM_H_
-#define	_MACHINE_PARAM_H_
-
-/*
- * These aren't really machine-dependent for RTEMS.....
- */
-
-/*
-#define MACHINE		"i386"
-#define MID_MACHINE	MID_I386
-*/
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value
- * for all data types (int, long, ...).   The result is unsigned int
- * and must be cast to any desired pointer type.
- */
-#define ALIGNBYTES	(sizeof(int) - 1)
-#define ALIGN(p)	(((unsigned)(p) + ALIGNBYTES) & ~ALIGNBYTES)
-
-#define PAGE_SHIFT	12		/* LOG2(PAGE_SIZE) */
-#define PAGE_SIZE	(1<<PAGE_SHIFT)	/* bytes/page */
-#define PAGE_MASK	(PAGE_SIZE-1)
-#define NPTEPG		(PAGE_SIZE/(sizeof (pt_entry_t)))
-
-#define NPDEPG		(PAGE_SIZE/(sizeof (pd_entry_t)))
-#define PDRSHIFT	22		/* LOG2(NBPDR) */
-#define NBPDR		(1<<PDRSHIFT)	/* bytes/page dir */
-
-#define DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
-#define DEV_BSIZE	(1<<DEV_BSHIFT)
-
-#define BLKDEV_IOSIZE	2048
-#define MAXPHYS		(64 * 1024)	/* max raw I/O transfer size */
-
-#define UPAGES	2		/* pages of u-area */
-
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than CLBYTES (the software page size), and,
- * on machines that exchange pages of input or output buffers with mbuf
- * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
- * of the hardware page size.
- */
-#ifndef	MSIZE
-#define MSIZE		128		/* size of an mbuf */
-#endif	/* MSIZE */
-
-#ifndef	MCLSHIFT
-#define MCLSHIFT	11		/* convert bytes to m_buf clusters */
-#endif	/* MCLSHIFT */
-#define MCLBYTES	(1 << MCLSHIFT)	/* size of an m_buf cluster */
-#define MCLOFSET	(MCLBYTES - 1)	/* offset within an m_buf cluster */
-
-/*
- * Some macros for units conversion
- */
-
-/* clicks to bytes */
-#define ctob(x)	((x)<<PAGE_SHIFT)
-
-/* bytes to clicks */
-#define btoc(x)	(((unsigned)(x)+PAGE_MASK)>>PAGE_SHIFT)
-
-/*
- * btodb() is messy and perhaps slow because `bytes' may be an off_t.  We
- * want to shift an unsigned type to avoid sign extension and we don't
- * want to widen `bytes' unnecessarily.  Assume that the result fits in
- * a daddr_t.
- */
-#define btodb(bytes)	 		/* calculates (bytes / DEV_BSIZE) */ \
-	(sizeof (bytes) > sizeof(long) \
-	 ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \
-	 : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT))
-
-#define dbtob(db)			/* calculates (db * DEV_BSIZE) */ \
-	((off_t)(db) << DEV_BSHIFT)
-
-/*
- * Mach derived conversion macros
- */
-#define trunc_page(x)		((unsigned)(x) & ~PAGE_MASK)
-#define round_page(x)		((((unsigned)(x)) + PAGE_MASK) & ~PAGE_MASK)
-
-#define atop(x)			((unsigned)(x) >> PAGE_SHIFT)
-#define ptoa(x)			((unsigned)(x) << PAGE_SHIFT)
-
-#endif /* !_MACHINE_PARAM_H_ */
diff --git a/newlib/libc/sys/rtems/sys/dirent.h b/newlib/libc/sys/rtems/sys/dirent.h
index fa31828..93808d3 100644
--- a/newlib/libc/sys/rtems/sys/dirent.h
+++ b/newlib/libc/sys/rtems/sys/dirent.h
@@ -44,12 +44,6 @@ struct dirent {
 	char		d_name[NAME_MAX + 1];
 };
 
-int scandir ( const char *dirname,
-   struct dirent *** namelist,
-   int (*select)(struct dirent *),
-   int (*dcomp)(const struct dirent **, const struct dirent **)
-);
-
 #ifdef __cplusplus
 }
 #endif 
diff --git a/newlib/libc/sys/rtems/sys/param.h b/newlib/libc/sys/rtems/sys/param.h
deleted file mode 100644
index 0060720..0000000
--- a/newlib/libc/sys/rtems/sys/param.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $Id$
- */
-
-#ifndef _SYS_PARAM_H_
-#define _SYS_PARAM_H_
-
-/* from newlib's <sys/param.h> */
-
-#include <sys/config.h>
-#include <machine/endian.h>
-
-# define HZ (60)
-# define PATHSIZE (1024)
-
-/* end of from newlib's <sys/param.h> */
-
-#include <unistd.h>
-
-#define	BSD	199506		/* System version (year & month). */
-#define BSD4_3	1
-#define BSD4_4	1
-
-#ifndef NULL
-#define	NULL	0
-#endif
-
-#ifndef LOCORE
-#include <sys/types.h>
-#endif
-
-/*
- * Machine-independent constants (some used in following include files).
- * Redefined constants are from POSIX 1003.1 limits file.
- *
- * MAXCOMLEN should be >= sizeof(ac_comm) (see <acct.h>)
- * MAXLOGNAME should be >= UT_NAMESIZE (see <utmp.h>)
- */
-#include <sys/syslimits.h>
-
-#define	MAXCOMLEN	16		/* max command name remembered */
-#define	MAXINTERP	32		/* max interpreter file name length */
-#define	MAXLOGNAME	12		/* max login name length */
-#define	MAXUPRC		CHILD_MAX	/* max simultaneous processes */
-#define	NCARGS		ARG_MAX		/* max bytes for an exec function */
-#define	NGROUPS		NGROUPS_MAX	/* max number groups */
-#define	NOFILE		OPEN_MAX	/* max open files per process */
-#define	NOGROUP		65535		/* marker for empty group set member */
-#define MAXHOSTNAMELEN	256		/* max hostname size */
-
-/* More types and definitions used throughout the kernel. */
-#ifdef KERNEL
-#include <sys/cdefs.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/ucred.h>
-#include <sys/uio.h>
-#include <sys/rtprio.h>
-
-#ifndef FALSE
-#define	FALSE	0
-#endif
-#ifndef TRUE
-#define	TRUE	1
-#endif
-#endif
-
-/* Signals. */
-#include <sys/signal.h>
-
-/* Machine type dependent parameters. */
-#include <machine/param.h>
-#include <machine/limits.h>
-
-/*
- * Priorities.  Note that with 32 run queues, differences less than 4 are
- * insignificant.
- */
-#define	PSWP	0
-#define	PVM	4
-#define	PINOD	8
-#define	PRIBIO	16
-#define	PVFS	20
-#define	PZERO	22		/* No longer magic, shouldn't be here.  XXX */
-#define	PSOCK	24
-#define	PWAIT	32
-#define	PLOCK	36
-#define	PPAUSE	40
-#define	PUSER	50
-#define	MAXPRI	127		/* Priorities range from 0 through MAXPRI. */
-
-#define	PRIMASK	0x0ff
-#define	PCATCH	0x100		/* OR'd with pri for tsleep to check signals */
-
-#define	NZERO	0		/* default "nice" */
-
-#define	NBPW	sizeof(int)	/* number of bytes per word (integer) */
-
-#define	CMASK	022		/* default file mask: S_IWGRP|S_IWOTH */
-#define	NODEV	(dev_t)(-1)	/* non-existent device */
-
-/*
- * Clustering of hardware pages on machines with ridiculously small
- * page sizes is done here.  The paging subsystem deals with units of
- * CLSIZE pte's describing PAGE_SIZE (from machine/machparam.h) pages each.
- */
-#if 0
-#define	CLBYTES		(CLSIZE*PAGE_SIZE)
-#endif
-
-#define	CBLOCK	128		/* Clist block size, must be a power of 2. */
-#define CBQSIZE	(CBLOCK/NBBY)	/* Quote bytes/cblock - can do better. */
-				/* Data chars/clist. */
-#define	CBSIZE	(CBLOCK - sizeof(struct cblock *) - CBQSIZE)
-#define	CROUND	(CBLOCK - 1)	/* Clist rounding. */
-
-/*
- * File system parameters and macros.
- *
- * The file system is made out of blocks of at most MAXBSIZE units, with
- * smaller units (fragments) only in the last direct block.  MAXBSIZE
- * primarily determines the size of buffers in the buffer pool.  It may be
- * made larger without any effect on existing file systems; however making
- * it smaller make make some file systems unmountable.  Also, MAXBSIZE
- * must be less than MAXPHYS!!!  DFLTBSIZE is the average amount of
- * memory allocated by vfs_bio per nbuf.  BKVASIZE is the average amount
- * of kernel virtual space allocated per nbuf.  BKVASIZE should be >=
- * DFLTBSIZE.  If it is significantly bigger than DFLTBSIZE, then
- * kva fragmentation causes fewer performance problems.
- */
-#define	MAXBSIZE	65536
-#define BKVASIZE	8192
-#define DFLTBSIZE	4096
-#define MAXFRAG 	8
-
-/*
- * MAXPATHLEN defines the longest permissible path length after expanding
- * symbolic links. It is used to allocate a temporary buffer from the buffer
- * pool in which to do the name expansion, hence should be a power of two,
- * and must be less than or equal to MAXBSIZE.  MAXSYMLINKS defines the
- * maximum number of symbolic links that may be expanded in a path name.
- * It should be set high enough to allow all legitimate uses, but halt
- * infinite loops reasonably quickly.
- */
-#if !defined(__rtems__)
-#define	MAXPATHLEN	PATH_MAX
-#endif
-#define MAXSYMLINKS	32
-
-/* Bit map related macros. */
-#define	setbit(a,i)	((a)[(i)/NBBY] |= 1<<((i)%NBBY))
-#define	clrbit(a,i)	((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define	isset(a,i)	((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define	isclr(a,i)	(((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-
-/* Macros for counting and rounding. */
-#ifndef howmany
-#define	howmany(x, y)	(((x)+((y)-1))/(y))
-#endif
-#define	rounddown(x, y)	(((x)/(y))*(y))
-#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
-#define	roundup2(x, y)	(((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
-#define powerof2(x)	((((x)-1)&(x))==0)
-
-/* Macros for min/max. */
-#ifndef KERNEL
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#define	MAX(a,b) (((a)>(b))?(a):(b))
-#endif
-
-/*
- * Constants for setting the parameters of the kernel memory allocator.
- *
- * 2 ** MINBUCKET is the smallest unit of memory that will be
- * allocated. It must be at least large enough to hold a pointer.
- *
- * Units of memory less or equal to MAXALLOCSAVE will permanently
- * allocate physical memory; requests for these size pieces of
- * memory are quite fast. Allocations greater than MAXALLOCSAVE must
- * always allocate and free physical memory; requests for these
- * size allocations should be done infrequently as they will be slow.
- *
- * Constraints: PAGE_SIZE <= MAXALLOCSAVE <= 2 ** (MINBUCKET + 14), and
- * MAXALLOCSIZE must be a power of two.
- */
-#define MINBUCKET	4		/* 4 => min allocation of 16 bytes */
-#define MAXALLOCSAVE	(2 * PAGE_SIZE)
-
-/*
- * Scale factor for scaled integers used to count %cpu time and load avgs.
- *
- * The number of CPU `tick's that map to a unique `%age' can be expressed
- * by the formula (1 / (2 ^ (FSHIFT - 11))).  The maximum load average that
- * can be calculated (assuming 32 bits) can be closely approximated using
- * the formula (2 ^ (2 * (16 - FSHIFT))) for (FSHIFT < 15).
- *
- * For the scheduler to maintain a 1:1 mapping of CPU `tick' to `%age',
- * FSHIFT must be at least 11; this gives us a maximum load avg of ~1024.
- */
-#define	FSHIFT	11		/* bits to right of fixed binary point */
-#define FSCALE	(1<<FSHIFT)
-
-#endif	/* _SYS_PARAM_H_ */
diff --git a/newlib/libc/sys/rtems/sys/queue.h b/newlib/libc/sys/rtems/sys/queue.h
deleted file mode 100644
index 037009f..0000000
--- a/newlib/libc/sys/rtems/sys/queue.h
+++ /dev/null
@@ -1,611 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD: src/sys/sys/queue.h,v 1.54 2002/08/05 05:18:43 alfred Exp $
- */
-
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
-
-#include <sys/cdefs.h>
-
-/*
- * This file defines four types of data structures: singly-linked lists,
- * singly-linked tail queues, lists and tail queues.
- *
- * A singly-linked list is headed by a single forward pointer. The elements
- * are singly linked for minimum space and pointer manipulation overhead at
- * the expense of O(n) removal for arbitrary elements. New elements can be
- * added to the list after an existing element or at the head of the list.
- * Elements being removed from the head of the list should use the explicit
- * macro for this purpose for optimum efficiency. A singly-linked list may
- * only be traversed in the forward direction.  Singly-linked lists are ideal
- * for applications with large datasets and few or no removals or for
- * implementing a LIFO queue.
- *
- * A singly-linked tail queue is headed by a pair of pointers, one to the
- * head of the list and the other to the tail of the list. The elements are
- * singly linked for minimum space and pointer manipulation overhead at the
- * expense of O(n) removal for arbitrary elements. New elements can be added
- * to the list after an existing element, at the head of the list, or at the
- * end of the list. Elements being removed from the head of the tail queue
- * should use the explicit macro for this purpose for optimum efficiency.
- * A singly-linked tail queue may only be traversed in the forward direction.
- * Singly-linked tail queues are ideal for applications with large datasets
- * and few or no removals or for implementing a FIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may be traversed in either direction.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- *
- *
- *			SLIST	LIST	STAILQ	TAILQ
- * _HEAD		+	+	+	+
- * _HEAD_INITIALIZER	+	+	+	+
- * _ENTRY		+	+	+	+
- * _INIT		+	+	+	+
- * _EMPTY		+	+	+	+
- * _FIRST		+	+	+	+
- * _NEXT		+	+	+	+
- * _PREV		-	-	-	+
- * _LAST		-	-	+	+
- * _FOREACH		+	+	+	+
- * _FOREACH_REVERSE	-	-	-	+
- * _INSERT_HEAD		+	+	+	+
- * _INSERT_BEFORE	-	+	-	+
- * _INSERT_AFTER	+	+	+	+
- * _INSERT_TAIL		-	-	+	+
- * _CONCAT		-	-	+	+
- * _REMOVE_HEAD		+	-	+	-
- * _REMOVE		+	+	+	+
- *
- */
-#define QUEUE_MACRO_DEBUG 0
-#if QUEUE_MACRO_DEBUG
-/* Store the last 2 places the queue element or head was altered */
-struct qm_trace {
-	char * lastfile;
-	int lastline;
-	char * prevfile;
-	int prevline;
-};
-
-#define TRACEBUF	struct qm_trace trace;
-#define TRASHIT(x)	do {(x) = (void *)-1;} while (0)
-
-#define QMD_TRACE_HEAD(head) do {					\
-	(head)->trace.prevline = (head)->trace.lastline;		\
-	(head)->trace.prevfile = (head)->trace.lastfile;		\
-	(head)->trace.lastline = __LINE__;				\
-	(head)->trace.lastfile = __FILE__;				\
-} while (0)
-
-#define QMD_TRACE_ELEM(elem) do {					\
-	(elem)->trace.prevline = (elem)->trace.lastline;		\
-	(elem)->trace.prevfile = (elem)->trace.lastfile;		\
-	(elem)->trace.lastline = __LINE__;				\
-	(elem)->trace.lastfile = __FILE__;				\
-} while (0)
-
-#else
-#define QMD_TRACE_ELEM(elem)
-#define QMD_TRACE_HEAD(head)
-#define TRACEBUF
-#define TRASHIT(x)
-#endif	/* QUEUE_MACRO_DEBUG */
-
-/*
- * Singly-linked List declarations.
- */
-#define	SLIST_HEAD(name, type)						\
-struct name {								\
-	struct type *slh_first;	/* first element */			\
-}
-
-#define	SLIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
- 
-#define	SLIST_ENTRY(type)						\
-struct {								\
-	struct type *sle_next;	/* next element */			\
-}
- 
-/*
- * Singly-linked List functions.
- */
-#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
-
-#define	SLIST_FIRST(head)	((head)->slh_first)
-
-#define	SLIST_FOREACH(var, head, field)					\
-	for ((var) = SLIST_FIRST((head));				\
-	    (var);							\
-	    (var) = SLIST_NEXT((var), field))
-
-#define SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-	for ((varp) = &SLIST_FIRST((head));				\
-	    ((var) = *(varp)) != NULL;					\
-	    (varp) = &SLIST_NEXT((var), field))
-
-#define	SLIST_INIT(head) do {						\
-	SLIST_FIRST((head)) = NULL;					\
-} while (0)
-
-#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
-	SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field);	\
-	SLIST_NEXT((slistelm), field) = (elm);				\
-} while (0)
-
-#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
-	SLIST_NEXT((elm), field) = SLIST_FIRST((head));			\
-	SLIST_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
-
-#define	SLIST_REMOVE(head, elm, type, field) do {			\
-	if (SLIST_FIRST((head)) == (elm)) {				\
-		SLIST_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = SLIST_FIRST((head));		\
-		while (SLIST_NEXT(curelm, field) != (elm))		\
-			curelm = SLIST_NEXT(curelm, field);		\
-		SLIST_NEXT(curelm, field) =				\
-		    SLIST_NEXT(SLIST_NEXT(curelm, field), field);	\
-	}								\
-} while (0)
-
-#define	SLIST_REMOVE_HEAD(head, field) do {				\
-	SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field);	\
-} while (0)
-
-/*
- * Singly-linked Tail queue declarations.
- */
-#define	STAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *stqh_first;/* first element */			\
-	struct type **stqh_last;/* addr of last next element */		\
-}
-
-#define	STAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).stqh_first }
-
-#define	STAILQ_ENTRY(type)						\
-struct {								\
-	struct type *stqe_next;	/* next element */			\
-}
-
-/*
- * Singly-linked Tail queue functions.
- */
-#define	STAILQ_CONCAT(head1, head2) do {				\
-	if (!STAILQ_EMPTY((head2))) {					\
-		*(head1)->stqh_last = (head2)->stqh_first;		\
-		(head1)->stqh_last = (head2)->stqh_last;		\
-		STAILQ_INIT((head2));					\
-	}								\
-} while (0)
-
-#define	STAILQ_EMPTY(head)	((head)->stqh_first == NULL)
-
-#define	STAILQ_FIRST(head)	((head)->stqh_first)
-
-#define	STAILQ_FOREACH(var, head, field)				\
-	for((var) = STAILQ_FIRST((head));				\
-	   (var);							\
-	   (var) = STAILQ_NEXT((var), field))
-
-#define	STAILQ_INIT(head) do {						\
-	STAILQ_FIRST((head)) = NULL;					\
-	(head)->stqh_last = &STAILQ_FIRST((head));			\
-} while (0)
-
-#define	STAILQ_INSERT_AFTER(head, tqelm, elm, field) do {		\
-	if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-	STAILQ_NEXT((tqelm), field) = (elm);				\
-} while (0)
-
-#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL)	\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-	STAILQ_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
-	STAILQ_NEXT((elm), field) = NULL;				\
-	*(head)->stqh_last = (elm);					\
-	(head)->stqh_last = &STAILQ_NEXT((elm), field);			\
-} while (0)
-
-#define	STAILQ_LAST(head, type, field)					\
-	(STAILQ_EMPTY((head)) ?						\
-		NULL :							\
-	        ((struct type *)					\
-		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-
-#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
-
-#define	STAILQ_REMOVE(head, elm, type, field) do {			\
-	if (STAILQ_FIRST((head)) == (elm)) {				\
-		STAILQ_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = STAILQ_FIRST((head));		\
-		while (STAILQ_NEXT(curelm, field) != (elm))		\
-			curelm = STAILQ_NEXT(curelm, field);		\
-		if ((STAILQ_NEXT(curelm, field) =			\
-		     STAILQ_NEXT(STAILQ_NEXT(curelm, field), field)) == NULL)\
-			(head)->stqh_last = &STAILQ_NEXT((curelm), field);\
-	}								\
-} while (0)
-
-#define	STAILQ_REMOVE_HEAD(head, field) do {				\
-	if ((STAILQ_FIRST((head)) =					\
-	     STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL)		\
-		(head)->stqh_last = &STAILQ_FIRST((head));		\
-} while (0)
-
-#define	STAILQ_REMOVE_HEAD_UNTIL(head, elm, field) do {			\
-	if ((STAILQ_FIRST((head)) = STAILQ_NEXT((elm), field)) == NULL)	\
-		(head)->stqh_last = &STAILQ_FIRST((head));		\
-} while (0)
-
-/*
- * List declarations.
- */
-#define	LIST_HEAD(name, type)						\
-struct name {								\
-	struct type *lh_first;	/* first element */			\
-}
-
-#define	LIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#define	LIST_ENTRY(type)						\
-struct {								\
-	struct type *le_next;	/* next element */			\
-	struct type **le_prev;	/* address of previous next element */	\
-}
-
-/*
- * List functions.
- */
-
-#define	LIST_EMPTY(head)	((head)->lh_first == NULL)
-
-#define	LIST_FIRST(head)	((head)->lh_first)
-
-#define	LIST_FOREACH(var, head, field)					\
-	for ((var) = LIST_FIRST((head));				\
-	    (var);							\
-	    (var) = LIST_NEXT((var), field))
-
-#define	LIST_INIT(head) do {						\
-	LIST_FIRST((head)) = NULL;					\
-} while (0)
-
-#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
-	if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\
-		LIST_NEXT((listelm), field)->field.le_prev =		\
-		    &LIST_NEXT((elm), field);				\
-	LIST_NEXT((listelm), field) = (elm);				\
-	(elm)->field.le_prev = &LIST_NEXT((listelm), field);		\
-} while (0)
-
-#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-	LIST_NEXT((elm), field) = (listelm);				\
-	*(listelm)->field.le_prev = (elm);				\
-	(listelm)->field.le_prev = &LIST_NEXT((elm), field);		\
-} while (0)
-
-#define	LIST_INSERT_HEAD(head, elm, field) do {				\
-	if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL)	\
-		LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\
-	LIST_FIRST((head)) = (elm);					\
-	(elm)->field.le_prev = &LIST_FIRST((head));			\
-} while (0)
-
-#define	LIST_NEXT(elm, field)	((elm)->field.le_next)
-
-#define	LIST_REMOVE(elm, field) do {					\
-	if (LIST_NEXT((elm), field) != NULL)				\
-		LIST_NEXT((elm), field)->field.le_prev = 		\
-		    (elm)->field.le_prev;				\
-	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
-} while (0)
-
-/*
- * Tail queue declarations.
- */
-#define	TAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *tqh_first;	/* first element */			\
-	struct type **tqh_last;	/* addr of last next element */		\
-	TRACEBUF							\
-}
-
-#define	TAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).tqh_first }
-
-#define	TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-	TRACEBUF							\
-}
-
-/*
- * Tail queue functions.
- */
-#define	TAILQ_CONCAT(head1, head2, field) do {				\
-	if (!TAILQ_EMPTY(head2)) {					\
-		*(head1)->tqh_last = (head2)->tqh_first;		\
-		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
-		(head1)->tqh_last = (head2)->tqh_last;			\
-		TAILQ_INIT((head2));					\
-		QMD_TRACE_HEAD(head);					\
-		QMD_TRACE_HEAD(head2);					\
-	}								\
-} while (0)
-
-#define	TAILQ_EMPTY(head)	((head)->tqh_first == NULL)
-
-#define	TAILQ_FIRST(head)	((head)->tqh_first)
-
-#define	TAILQ_FOREACH(var, head, field)					\
-	for ((var) = TAILQ_FIRST((head));				\
-	    (var);							\
-	    (var) = TAILQ_NEXT((var), field))
-
-#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
-	for ((var) = TAILQ_LAST((head), headname);			\
-	    (var);							\
-	    (var) = TAILQ_PREV((var), headname, field))
-
-#define	TAILQ_INIT(head) do {						\
-	TAILQ_FIRST((head)) = NULL;					\
-	(head)->tqh_last = &TAILQ_FIRST((head));			\
-	QMD_TRACE_HEAD(head);						\
-} while (0)
-
-#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\
-		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-		    &TAILQ_NEXT((elm), field);				\
-	else {								\
-		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-		QMD_TRACE_HEAD(head);					\
-	}								\
-	TAILQ_NEXT((listelm), field) = (elm);				\
-	(elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field);		\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-	QMD_TRACE_ELEM(&listelm->field);				\
-} while (0)
-
-#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	TAILQ_NEXT((elm), field) = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field);		\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-	QMD_TRACE_ELEM(&listelm->field);				\
-} while (0)
-
-#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL)	\
-		TAILQ_FIRST((head))->field.tqe_prev =			\
-		    &TAILQ_NEXT((elm), field);				\
-	else								\
-		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-	TAILQ_FIRST((head)) = (elm);					\
-	(elm)->field.tqe_prev = &TAILQ_FIRST((head));			\
-	QMD_TRACE_HEAD(head);						\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
-	TAILQ_NEXT((elm), field) = NULL;				\
-	(elm)->field.tqe_prev = (head)->tqh_last;			\
-	*(head)->tqh_last = (elm);					\
-	(head)->tqh_last = &TAILQ_NEXT((elm), field);			\
-	QMD_TRACE_HEAD(head);						\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-#define	TAILQ_LAST(head, headname)					\
-	(*(((struct headname *)((head)->tqh_last))->tqh_last))
-
-#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-
-#define	TAILQ_PREV(elm, headname, field)				\
-	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-
-#define	TAILQ_REMOVE(head, elm, field) do {				\
-	if ((TAILQ_NEXT((elm), field)) != NULL)				\
-		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-		    (elm)->field.tqe_prev;				\
-	else {								\
-		(head)->tqh_last = (elm)->field.tqe_prev;		\
-		QMD_TRACE_HEAD(head);					\
-	}								\
-	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
-	TRASHIT((elm)->field.tqe_next);					\
-	TRASHIT((elm)->field.tqe_prev);					\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-
-/*
- * Circular queue definitions.
- */
-#define CIRCLEQ_HEAD(name, type)					\
-struct name {								\
-	struct type *cqh_first;		/* first element */		\
-	struct type *cqh_last;		/* last element */		\
-}
-
-#define CIRCLEQ_ENTRY(type)						\
-struct {								\
-	struct type *cqe_next;		/* next element */		\
-	struct type *cqe_prev;		/* previous element */		\
-}
-
-/*
- * Circular queue functions.
- */
-#define	CIRCLEQ_INIT(head) {						\
-	(head)->cqh_first = (void *)(head);				\
-	(head)->cqh_last = (void *)(head);				\
-}
-
-#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) {		\
-	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
-	(elm)->field.cqe_prev = (listelm);				\
-	if ((listelm)->field.cqe_next == (void *)(head))		\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
-	(listelm)->field.cqe_next = (elm);				\
-}
-
-#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) {		\
-	(elm)->field.cqe_next = (listelm);				\
-	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
-	if ((listelm)->field.cqe_prev == (void *)(head))		\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
-	(listelm)->field.cqe_prev = (elm);				\
-}
-
-#define CIRCLEQ_INSERT_HEAD(head, elm, field) {				\
-	(elm)->field.cqe_next = (head)->cqh_first;			\
-	(elm)->field.cqe_prev = (void *)(head);				\
-	if ((head)->cqh_last == (void *)(head))				\
-		(head)->cqh_last = (elm);				\
-	else								\
-		(head)->cqh_first->field.cqe_prev = (elm);		\
-	(head)->cqh_first = (elm);					\
-}
-
-#define CIRCLEQ_INSERT_TAIL(head, elm, field) {				\
-	(elm)->field.cqe_next = (void *)(head);				\
-	(elm)->field.cqe_prev = (head)->cqh_last;			\
-	if ((head)->cqh_first == (void *)(head))			\
-		(head)->cqh_first = (elm);				\
-	else								\
-		(head)->cqh_last->field.cqe_next = (elm);		\
-	(head)->cqh_last = (elm);					\
-}
-
-#define	CIRCLEQ_REMOVE(head, elm, field) {				\
-	if ((elm)->field.cqe_next == (void *)(head))			\
-		(head)->cqh_last = (elm)->field.cqe_prev;		\
-	else								\
-		(elm)->field.cqe_next->field.cqe_prev =			\
-		    (elm)->field.cqe_prev;				\
-	if ((elm)->field.cqe_prev == (void *)(head))			\
-		(head)->cqh_first = (elm)->field.cqe_next;		\
-	else								\
-		(elm)->field.cqe_prev->field.cqe_next =			\
-		    (elm)->field.cqe_next;				\
-}
-
-#ifdef KERNEL
-
-/*
- * XXX insque() and remque() are an old way of handling certain queues.
- * They bogusly assumes that all queue heads look alike.
- */
-
-
-#ifdef	__GNUC__
-
-struct quehead {
-#if defined(__arm__)
-    struct quehead *qh_link  __attribute__((packed));
-    struct quehead *qh_rlink __attribute__((packed));
-#else /* !defined(__arm__)) */
-    struct quehead *qh_link;
-    struct quehead *qh_rlink;
-#endif 
-};
-
-static __inline void
-insque(void *a, void *b)
-{
-	struct quehead *element = (struct quehead *)a,
-		 *head = (struct quehead *)b;
-
-	element->qh_link = head->qh_link;
-	element->qh_rlink = head;
-	head->qh_link = element;
-	element->qh_link->qh_rlink = element;
-}
-
-static __inline void
-remque(void *a)
-{
-	struct quehead *element = (struct quehead *)a;
-
-	element->qh_link->qh_rlink = element->qh_rlink;
-	element->qh_rlink->qh_link = element->qh_link;
-	element->qh_rlink = 0;
-}
-
-#else /* !__GNUC__ */
-
-void	insque(void *a, void *b);
-void	remque(void *a);
-
-#endif /* __GNUC__ */
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_QUEUE_H_ */
\ No newline at end of file
diff --git a/newlib/libc/sys/rtems/sys/syslimits.h b/newlib/libc/sys/rtems/sys/syslimits.h
deleted file mode 100644
index 74c4dd2..0000000
--- a/newlib/libc/sys/rtems/sys/syslimits.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $Id$
- */
-
-#ifndef _SYS_SYSLIMITS_H_
-#define _SYS_SYSLIMITS_H_
-
-#define	ARG_MAX			 4096	/* max bytes for an exec function */
-#ifndef CHILD_MAX
-#define	CHILD_MAX		    6	/* max simultaneous processes */
-#endif
-#define	LINK_MAX		    8	/* max file link count */
-#define	MAX_CANON		  255	/* max bytes in term canon input line */
-#define	MAX_INPUT		  255	/* max bytes in terminal input */
-#define	NAME_MAX		  255	/* max bytes in a file name */
-#define	NGROUPS_MAX		   16	/* max supplemental group id's */
-#ifndef OPEN_MAX
-#define	OPEN_MAX		   64	/* max open files per process */
-#endif
-#define	PATH_MAX		  255	/* max bytes in pathname */
-#define	PIPE_BUF		  512	/* max bytes for atomic pipe writes */
-#define	IOV_MAX			 1024	/* max elements in i/o vector */
-#define	BC_BASE_MAX		   99	/* max ibase/obase values in bc(1) */
-#define	BC_DIM_MAX		 2048	/* max array elements in bc(1) */
-#define	BC_SCALE_MAX		   99	/* max scale value in bc(1) */
-#define	BC_STRING_MAX		 1000	/* max const string length in bc(1) */
-#define	COLL_WEIGHTS_MAX	    0	/* max weights for order keyword */
-#define	EXPR_NEST_MAX		   32	/* max expressions nested in expr(1) */
-#define	LINE_MAX		 2048	/* max bytes in an input line */
-#define	RE_DUP_MAX		  255	/* max RE's in interval notation */
-
-#endif
diff --git a/newlib/libc/sys/rtems/sys/utime.h b/newlib/libc/sys/rtems/sys/utime.h
deleted file mode 100644
index 31d1c47..0000000
--- a/newlib/libc/sys/rtems/sys/utime.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  $Id$
- */
-
-#ifndef __UTIME_h__
-#define __UTIME_h__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *  POSIX 1003.1b 5.6.6 Set File Access and Modification Times
- */
-
-struct utimbuf {
-  time_t  actime;   /* Access time */
-  time_t  modtime;  /* Modification time */
-};
-
-/* Functions */
-
-int utime(
-  const char           *path,
-  const struct utimbuf *times
-);
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* _SYS_UTIME_H */
diff --git a/newlib/libc/sys/sh/Makefile.am b/newlib/libc/sys/sh/Makefile.am
index 1fddc4c..da89f11 100644
--- a/newlib/libc/sys/sh/Makefile.am
+++ b/newlib/libc/sys/sh/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = syscalls.c trap.S creat.c ftruncate.c truncate.c
+lib_a_SOURCES = syscalls.c trap.S creat.c
 
 all: crt0.o
 
diff --git a/newlib/libc/sys/sh/Makefile.in b/newlib/libc/sys/sh/Makefile.in
index 423a3ad..605f555 100644
--- a/newlib/libc/sys/sh/Makefile.in
+++ b/newlib/libc/sys/sh/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = syscalls.c trap.S creat.c ftruncate.c truncate.c
+lib_a_SOURCES = syscalls.c trap.S creat.c
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@@ -103,7 +98,7 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-lib_a_OBJECTS =  syscalls.o trap.o creat.o ftruncate.o truncate.o
+lib_a_OBJECTS =  syscalls.o trap.o creat.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/sh/aclocal.m4 b/newlib/libc/sys/sh/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/sh/aclocal.m4
+++ b/newlib/libc/sys/sh/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/sh/configure b/newlib/libc/sys/sh/configure
index 091e11f..b505fc6 100755
--- a/newlib/libc/sys/sh/configure
+++ b/newlib/libc/sys/sh/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/sh/crt0.S b/newlib/libc/sys/sh/crt0.S
index f9473ae..88c9fac 100644
--- a/newlib/libc/sys/sh/crt0.S
+++ b/newlib/libc/sys/sh/crt0.S
@@ -1,69 +1,3 @@
-
-#ifdef __SH5__
-	.section .data,"aw"
-	.global ___data
-___data:
-
-	.section .rodata,"a"
-	.global ___rodata
-___rodata:
-
-#if __SH5__ == 64
-	.section .text,"ax"
-#define LOAD_ADDR(sym, reg) \
-	movi	(sym >> 48) & 65535, reg; \
-	shori	(sym >> 32) & 65535, reg; \
-	shori	(sym >> 16) & 65535, reg; \
-	shori	sym & 65535, reg
-#else
-	.mode	SHmedia
-	.section .text..SHmedia32,"ax"
-#define LOAD_ADDR(sym, reg) \
-	movi	(sym >> 16) & 65535, reg; \
-	shori	sym & 65535, reg
-#endif
-	.global start
-start:
-	LOAD_ADDR (_stack, r15)
-
-	pt/l	zero_bss_loop, tr0
-	pt/l	_atexit, tr1
-	pt/l	_init, tr5
-	pt/l	_main, tr6
-	pt/l	_exit, tr7
-
-	! zero out bss
-	LOAD_ADDR (_edata, r0)
-	LOAD_ADDR (_end, r1)
-zero_bss_loop:
-	stx.q	r0, r63, r63
-	addi	r0, 8, r0
-	bgt/l	r1, r0, tr0
-
-	LOAD_ADDR (___data, r26)
-	LOAD_ADDR (___rodata, r27)
-
-#if ! __SH4_NOFPU__
-	getcon	cr0, r0
-	movi	1, r1
-	shlli	r1, 15, r1
-	or	r1, r0, r0
-	putcon	r0, cr0
-#endif
-
-	! arrange for exit to call fini
-	LOAD_ADDR (_fini, r2)
-	blink	tr1, r18
-
-	! call init
-	blink	tr5, r18
-
-	! call the mainline
-	blink	tr6, r18
-
-	! call exit
-	blink	tr7, r18
-#else
 	.section .text
 	.global	start
 start:
@@ -79,14 +13,12 @@ start_l:
 	cmp/ge	r0,r1
 	bt	start_l
 
-#ifndef __SH2A_NOFPU__
-#if defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY) || defined(__SH2A__)
+#if defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY)
 	mov.l set_fpscr_k, r1
 	jsr @r1
 	mov #0,r4
 	lds r3,fpscr
-#endif /*  defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__) || defined(__SH2A__) */
-#endif /* !__SH2A_NOFPU__ */
+#endif /*  defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__) */
 
 	! call the mainline	
 	mov.l	main_k,r0
@@ -100,12 +32,10 @@ start_l:
 	or	r0,r0
 
 	.align 2
-#ifndef __SH2A_NOFPU__
-#if defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__) || defined(__SH2A__)
+#if defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(__SH4_SINGLE_ONLY__)
 set_fpscr_k:
 	.long	___set_fpscr
-#endif /*  defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(SH4_SINGLE_ONLY) || defined(__SH2A__) */
-#endif /* !__SH2A_NOFPU__ */
+#endif /*  defined (__SH3E__) || defined(__SH4_SINGLE__) || defined(__SH4__) || defined(SH4_SINGLE_ONLY) */
 stack_k:
 	.long	_stack	
 edata_k:
@@ -116,4 +46,9 @@ main_k:
 	.long	_main
 exit_k:
 	.long	_exit
+
+#ifdef __ELF__
+	.section .stack,"aw"
+#else
+	.section .stack
 #endif
diff --git a/newlib/libc/sys/sh/ftruncate.c b/newlib/libc/sys/sh/ftruncate.c
deleted file mode 100644
index 660377b..0000000
--- a/newlib/libc/sys/sh/ftruncate.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include "sys/syscall.h"
-
-int
-ftruncate (int file, off_t length)
-{
-  return __trap34 (SYS_ftruncate, file, length, 0);
-}
diff --git a/newlib/libc/sys/sh/sys/syscall.h b/newlib/libc/sys/sh/sys/syscall.h
index 9ab32e7..fd9ee7c 100644
--- a/newlib/libc/sys/sh/sys/syscall.h
+++ b/newlib/libc/sys/sh/sys/syscall.h
@@ -27,9 +27,6 @@
 #define	SYS_pipe	42
 #define	SYS_execve	59
 
-#define SYS_truncate	129
-#define SYS_ftruncate	130
-
 #define SYS_argc	172 /* == 0xAC, for Argument Count :-) */
 #define SYS_argnlen	173
 #define SYS_argn	174
diff --git a/newlib/libc/sys/sh/trap.S b/newlib/libc/sys/sh/trap.S
index 0eb6e5d..4512293 100644
--- a/newlib/libc/sys/sh/trap.S
+++ b/newlib/libc/sys/sh/trap.S
@@ -1,30 +1,3 @@
-#if __SH5__
-	.mode	SHmedia
-#if __SH5__ == 32 && __SHMEDIA__
-	.section	.text..SHmedia32, "ax"
-#else
-	.text
-#endif
-	.global ___trap34
-___trap34:
-	movi	34, r0
-	trapa	r0
-	pt/l	ret, tr1
-	ptabs/l	r18, tr0
-	beqi	r1, 0, tr1
-#if __SH5__ == 64
-	movi	((_errno >> 48) & 65535), r0
-	shori	((_errno >> 32) & 65535), r0
-	shori	((_errno >> 16) & 65535), r0
-#else
-	movi	((_errno >> 16) & 65535), r0
-#endif
-	shori	(_errno & 65535), r0
-	stx.l	r0, r63, r1
-ret:
-	blink	tr0, r63
-	
-#else
 	.text
 	.global	___trap34
 ___trap34:
@@ -40,4 +13,3 @@ ret:
 	.align	2
 perrno:
 	.long	_errno
-#endif /* ! __SH5__ */
diff --git a/newlib/libc/sys/sh/truncate.c b/newlib/libc/sys/sh/truncate.c
deleted file mode 100644
index 5ca48d3..0000000
--- a/newlib/libc/sys/sh/truncate.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <_ansi.h>
-#include <sys/types.h>
-#include "sys/syscall.h"
-
-int
-truncate (const char *path, off_t length)
-{
-  return __trap34 (SYS_truncate, path, length, 0);
-}
diff --git a/newlib/libc/sys/sparc64/Makefile.in b/newlib/libc/sys/sparc64/Makefile.in
index 2118662..29facd1 100644
--- a/newlib/libc/sys/sparc64/Makefile.in
+++ b/newlib/libc/sys/sparc64/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -118,7 +113,10 @@ COPYOMFILES =
 # needed by the ANSI C part of newlib (and thus we must provide namespace
 # clean versions of them because we define REENTRANT_SYSCALLS_PROVIDED).
 
-CFILES = _main.c ieee.c 	closedir.c opendir.c readdir.c rewinddir.c scandir.c seekdir.c 	telldir.c 	creat.c isatty.c utime2.c
+CFILES = _main.c ieee.c \
+	closedir.c opendir.c readdir.c rewinddir.c scandir.c seekdir.c \
+	telldir.c \
+	creat.c isatty.c utime2.c
 
 
 CFILES_R = 
@@ -129,17 +127,26 @@ SFILES_R = sbrk.S wait.S
 
 # List of files built from template.S (with an '_' suffix).
 
-TEMPLATE_SFILES = access_ chdir_ chmod_ chown_ dup_ fcntl_ 	lstat_ mkdir_ pipe_ rmdir_ times_ umask_ utimes_
+TEMPLATE_SFILES = access_ chdir_ chmod_ chown_ dup_ fcntl_ \
+	lstat_ mkdir_ pipe_ rmdir_ times_ umask_ utimes_
 
 
-TEMPLATE_SFILES_R = close_ fork_ fstat_ getpid_ gettimeofday_ kill_ 	link_ lseek_ open_ read_ stat_ times_ unlink_ wait4_ write_
+TEMPLATE_SFILES_R = close_ fork_ fstat_ getpid_ gettimeofday_ kill_ \
+	link_ lseek_ open_ read_ stat_ times_ unlink_ wait4_ write_
 
 
-OFILES = $(COPYOFILES) $(COPYRENAMEOFILES) $(COPYOMFILES) 	$(SFILES:.S=.o) $(SFILES_R:.S=.o) $(SFILES_R:.S=_r.o) 	$(TEMPLATE_SFILES:_=.o) $(TEMPLATE_SFILES_R:_=.o) $(TEMPLATE_SFILES_R:_=_r.o) 	$(CFILES:.c=.o) $(CFILES_R:.c=.o) $(CFILES_R:.c=_r.o)
+OFILES = $(COPYOFILES) $(COPYRENAMEOFILES) $(COPYOMFILES) \
+	$(SFILES:.S=.o) $(SFILES_R:.S=.o) $(SFILES_R:.S=_r.o) \
+	$(TEMPLATE_SFILES:_=.o) $(TEMPLATE_SFILES_R:_=.o) $(TEMPLATE_SFILES_R:_=_r.o) \
+	$(CFILES:.c=.o) $(CFILES_R:.c=.o) $(CFILES_R:.c=_r.o)
 
 
 lib_a_SOURCES = $(SFILES) $(SFILES_R) $(CFILES) $(CFILES_R)
-lib_a_LIBADD = $(COPYOFILES) $(COPYRENAMEOFILES) $(COPYOMFILES) 	$(SFILES_R:.S=_r.o) 	$(TEMPLATE_SFILES:_=.o) $(TEMPLATE_SFILES_R:_=.o) 	$(TEMPLATE_SFILES_R:_=_r.o) 	$(CFILES_R:.c=_r.o)
+lib_a_LIBADD = $(COPYOFILES) $(COPYRENAMEOFILES) $(COPYOMFILES) \
+	$(SFILES_R:.S=_r.o) \
+	$(TEMPLATE_SFILES:_=.o) $(TEMPLATE_SFILES_R:_=.o) \
+	$(TEMPLATE_SFILES_R:_=_r.o) \
+	$(CFILES_R:.c=_r.o)
 
 
 ACLOCAL_AMFLAGS = -I ../../..
@@ -188,8 +195,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/sparc64/aclocal.m4 b/newlib/libc/sys/sparc64/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/sparc64/aclocal.m4
+++ b/newlib/libc/sys/sparc64/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/sparc64/configure b/newlib/libc/sys/sparc64/configure
index ebf1e5b..b01b17a 100755
--- a/newlib/libc/sys/sparc64/configure
+++ b/newlib/libc/sys/sparc64/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/sun4/Makefile.in b/newlib/libc/sys/sun4/Makefile.in
index 557de68..bd27fb2 100644
--- a/newlib/libc/sys/sun4/Makefile.in
+++ b/newlib/libc/sys/sun4/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,66 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-COPYOFILES =  	Ovfork.o 	_exit.o 	_sigvec.o 	abort.o 	access.o 	cerror.o 	chmod.o 	chown.o 	close.o 	creat.o 	dup.o 	dup2.o 	errlst.o 	execl.o 	execle.o 	execv.o 	execve.o 	execvp.o 	fork.o 	fstat.o 	getdtablesize.o 	getpid.o 	getrusage.o  	gettimeofday.o 	ieee_globals.o 	ioctl.o 	isatty.o 	kill.o 	link.o 	lseek.o 	open.o 	pipe.o 	popen.o 	read.o 	sbrk.o 	setitimer.o 	sigblock.o 	signal.o 	sigpause.o 	sigsetjmp.o 	sigsetmask.o 	sigtramp.o 	sigvec.o 	sleep.o 	start_float.o 	stat.o 	time.o 	times.o 	umask.o 	unlink.o 	utime.o 	utimes.o 	wait.o 	wait3.o 	wait4.o 	write.o 	rem.o 	multiply.o 	umultiply.o
+COPYOFILES = \
+	Ovfork.o \
+	_exit.o \
+	_sigvec.o \
+	abort.o \
+	access.o \
+	cerror.o \
+	chmod.o \
+	chown.o \
+	close.o \
+	creat.o \
+	dup.o \
+	dup2.o \
+	errlst.o \
+	execl.o \
+	execle.o \
+	execv.o \
+	execve.o \
+	execvp.o \
+	fork.o \
+	fstat.o \
+	getdtablesize.o \
+	getpid.o \
+	getrusage.o  \
+	gettimeofday.o \
+	ieee_globals.o \
+	ioctl.o \
+	isatty.o \
+	kill.o \
+	link.o \
+	lseek.o \
+	open.o \
+	pipe.o \
+	popen.o \
+	read.o \
+	sbrk.o \
+	setitimer.o \
+	sigblock.o \
+	signal.o \
+	sigpause.o \
+	sigsetjmp.o \
+	sigsetmask.o \
+	sigtramp.o \
+	sigvec.o \
+	sleep.o \
+	start_float.o \
+	stat.o \
+	time.o \
+	times.o \
+	umask.o \
+	unlink.o \
+	utime.o \
+	utimes.o \
+	wait.o \
+	wait3.o \
+	wait4.o \
+	write.o \
+	rem.o \
+	multiply.o \
+	umultiply.o
 
 
 # These files are from Sun's libc.a, but the must be renamed because they
@@ -147,8 +201,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/sun4/aclocal.m4 b/newlib/libc/sys/sun4/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/sun4/aclocal.m4
+++ b/newlib/libc/sys/sun4/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/sun4/configure b/newlib/libc/sys/sun4/configure
index eede7cf..7759c83 100755
--- a/newlib/libc/sys/sun4/configure
+++ b/newlib/libc/sys/sun4/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/sysmec/Makefile.in b/newlib/libc/sys/sysmec/Makefile.in
index 45b924a..28ad8c0 100644
--- a/newlib/libc/sys/sysmec/Makefile.in
+++ b/newlib/libc/sys/sysmec/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,11 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c crt1.c 	execv.c execve.c fork.c fstat.c getpid.c isatty.c 	kill.c lseek.c open.c pipe.c read.c 	sbrk.c stat.c time.c trap.S unlink.c utime.c wait.c write.c 	times.c gettime.c
+lib_a_SOURCES = _exit.c access.c chmod.c chown.c close.c creat.c crt1.c \
+	execv.c execve.c fork.c fstat.c getpid.c isatty.c \
+	kill.c lseek.c open.c pipe.c read.c \
+	sbrk.c stat.c time.c trap.S unlink.c utime.c wait.c write.c \
+	times.c gettime.c
 
 
 ACLOCAL_AMFLAGS = -I ../../..
@@ -133,8 +132,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/sysmec/aclocal.m4 b/newlib/libc/sys/sysmec/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/sysmec/aclocal.m4
+++ b/newlib/libc/sys/sysmec/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/sysmec/configure b/newlib/libc/sys/sysmec/configure
index 1efee2b..2b24ad2 100755
--- a/newlib/libc/sys/sysmec/configure
+++ b/newlib/libc/sys/sysmec/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/sysnec810/Makefile.in b/newlib/libc/sys/sysnec810/Makefile.in
index 9ca741b..a8b49e9 100644
--- a/newlib/libc/sys/sysnec810/Makefile.in
+++ b/newlib/libc/sys/sysnec810/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/sysnec810/aclocal.m4 b/newlib/libc/sys/sysnec810/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/sysnec810/aclocal.m4
+++ b/newlib/libc/sys/sysnec810/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/sysnec810/configure b/newlib/libc/sys/sysnec810/configure
index 6c6f10a..f73aabe 100755
--- a/newlib/libc/sys/sysnec810/configure
+++ b/newlib/libc/sys/sysnec810/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/sysnecv850/Makefile.in b/newlib/libc/sys/sysnecv850/Makefile.in
index 7d3b0ba..5e7f271 100644
--- a/newlib/libc/sys/sysnecv850/Makefile.in
+++ b/newlib/libc/sys/sysnecv850/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,12 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES =  	_exit.c access.c chmod.c chown.c close.c creat.c crt1.c 	execv.c execve.c fork.c fstat.c getpid.c isatty.c 	kill.c lseek.c open.c pipe.c read.c link.c 	sbrk.c stat.c time.c trap.S unlink.c utime.c wait.c write.c 	times.c gettime.c
+lib_a_SOURCES = \
+	_exit.c access.c chmod.c chown.c close.c creat.c crt1.c \
+	execv.c execve.c fork.c fstat.c getpid.c isatty.c \
+	kill.c lseek.c open.c pipe.c read.c link.c \
+	sbrk.c stat.c time.c trap.S unlink.c utime.c wait.c write.c \
+	times.c gettime.c
 
 
 ACLOCAL_AMFLAGS = -I ../../..
@@ -133,8 +133,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/sysnecv850/aclocal.m4 b/newlib/libc/sys/sysnecv850/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/sysnecv850/aclocal.m4
+++ b/newlib/libc/sys/sysnecv850/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/sysnecv850/configure b/newlib/libc/sys/sysnecv850/configure
index 1efee2b..2b24ad2 100755
--- a/newlib/libc/sys/sysnecv850/configure
+++ b/newlib/libc/sys/sysnecv850/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/sysnecv850/crt0.S b/newlib/libc/sys/sysnecv850/crt0.S
index e006871..15d94dc 100644
--- a/newlib/libc/sys/sysnecv850/crt0.S
+++ b/newlib/libc/sys/sysnecv850/crt0.S
@@ -5,7 +5,7 @@
 
 _start:
 
-#if defined __v850e__
+#if defined __v850e__ || defined __v850ea__
 	
 	movea   255,		r0,	r20
 	mov     65535,		r21
@@ -23,7 +23,7 @@ _start:
 	bl      .L0
 .L1:
 	jarl    ___main,	r31
-	addi    -16,		sp,	sp
+	addi    -12,		sp,	sp
 	mov     0,		r6
 	mov     0,		r7
 	mov     0,		r8
@@ -42,6 +42,16 @@ _start:
 	movhi   hi(__gp),	r0,	gp
 	movea   lo(__gp),	gp,	gp
 
+	/* Initialise the call table base pointer.
+	We do this even though we are supposedly 
+	assembling this file for the v850 as this
+	allows us to use the same binary for all
+	versions of the v850 architecture.  */
+	
+	movhi   hi(__ctbp),	r0,     r6
+	movea   lo(__ctbp),	r6,     r6
+	ldsr    r6,             ctbp
+
 	movhi   hi(_edata),	r0,	r6
 	movea   lo(_edata),	r6,	r6
 	movhi   hi(_end),	r0,	r7
@@ -53,7 +63,7 @@ _start:
 	bl      .L0
 .L1:
 	jarl    ___main,	r31
-	addi    -16,		sp,	sp
+	addi    -12,		sp,	sp
 	mov     0,		r6
 	mov     0,		r7
 	mov     0,		r8
diff --git a/newlib/libc/sys/sysvi386/Makefile.in b/newlib/libc/sys/sysvi386/Makefile.in
index f828650..fd58acd 100644
--- a/newlib/libc/sys/sysvi386/Makefile.in
+++ b/newlib/libc/sys/sysvi386/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,16 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES =  	ioctl.s isatty.c read.s lseek.s close.s sbrk.c fstat.s cerror.s 	_exit.s write.s open.s signal.s kill.s getpid.s brk.s fork.s wait.s 	execve.s exec.c utime.s fcntl.s chmod.s getuid.s getgid.s time.s 	stat.s link.s unlink.s rename.s mkdir.s rmdir.s sigaction.s 	sigprocmask.s waitpid.s sysconf.s pathconf.s fpathconf.s 	getdents.s opendir.c readdir.c rewinddir.c closedir.c pipe.s 	getgroups.s setuid.s getuid.s setgid.s geteuid.s getegid.s 	chdir.s dup2.c dup.c tcgetattr.c tcsetattr.c speed.c tcline.c 	times.s pause.s sleep.c alarm.s access.s _longjmp.s _setjmp.s
+lib_a_SOURCES = \
+	ioctl.s isatty.c read.s lseek.s close.s sbrk.c fstat.s cerror.s \
+	_exit.s write.s open.s signal.s kill.s getpid.s brk.s fork.s wait.s \
+	execve.s exec.c utime.s fcntl.s chmod.s getuid.s getgid.s time.s \
+	stat.s link.s unlink.s rename.s mkdir.s rmdir.s sigaction.s \
+	sigprocmask.s waitpid.s sysconf.s pathconf.s fpathconf.s \
+	getdents.s opendir.c readdir.c rewinddir.c closedir.c pipe.s \
+	getgroups.s setuid.s getuid.s setgid.s geteuid.s getegid.s \
+	chdir.s dup2.c dup.c tcgetattr.c tcsetattr.c speed.c tcline.c \
+	times.s pause.s sleep.c alarm.s access.s _longjmp.s _setjmp.s
 
 
 ACLOCAL_AMFLAGS = -I ../../..
@@ -138,8 +142,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/sysvi386/aclocal.m4 b/newlib/libc/sys/sysvi386/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/sysvi386/aclocal.m4
+++ b/newlib/libc/sys/sysvi386/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/sysvi386/configure b/newlib/libc/sys/sysvi386/configure
index 0ae9cc4..e59438c 100755
--- a/newlib/libc/sys/sysvi386/configure
+++ b/newlib/libc/sys/sysvi386/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/sysvi386/sys/param.h b/newlib/libc/sys/sysvi386/sys/param.h
new file mode 100644
index 0000000..6c6f6b0
--- /dev/null
+++ b/newlib/libc/sys/sysvi386/sys/param.h
@@ -0,0 +1,8 @@
+#ifndef _SYS_PARAM_H
+# define _SYS_PARAM_H
+
+# define HZ	60
+# define NOFILE	60
+# define PATHSIZE	1024
+
+#endif
diff --git a/newlib/libc/sys/sysvnecv70/Makefile.in b/newlib/libc/sys/sysvnecv70/Makefile.in
index 60bb205..8db553f 100644
--- a/newlib/libc/sys/sysvnecv70/Makefile.in
+++ b/newlib/libc/sys/sysvnecv70/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -89,7 +84,8 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 noinst_LIBRARIES = lib.a
 
-lib_a_SOURCES = ioctl.s isatty.s read.s lseek.s close.s sbrk.s fstat.s 	cerror.s exit.s write.s sysv60.s fpx.c fps.s open.s
+lib_a_SOURCES = ioctl.s isatty.s read.s lseek.s close.s sbrk.s fstat.s \
+	cerror.s exit.s write.s sysv60.s fpx.c fps.s open.s
 
 
 ACLOCAL_AMFLAGS = -I ../../..
@@ -131,8 +127,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/sysvnecv70/aclocal.m4 b/newlib/libc/sys/sysvnecv70/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/sysvnecv70/aclocal.m4
+++ b/newlib/libc/sys/sysvnecv70/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/sysvnecv70/configure b/newlib/libc/sys/sysvnecv70/configure
index 88386a9..ca77297 100755
--- a/newlib/libc/sys/sysvnecv70/configure
+++ b/newlib/libc/sys/sysvnecv70/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/tic80/Makefile.in b/newlib/libc/sys/tic80/Makefile.in
index 3eaf303..8c1a80c 100644
--- a/newlib/libc/sys/tic80/Makefile.in
+++ b/newlib/libc/sys/tic80/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -136,8 +131,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/tic80/aclocal.m4 b/newlib/libc/sys/tic80/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/tic80/aclocal.m4
+++ b/newlib/libc/sys/tic80/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/tic80/configure b/newlib/libc/sys/tic80/configure
index c97c3f4..340ccba 100755
--- a/newlib/libc/sys/tic80/configure
+++ b/newlib/libc/sys/tic80/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/w65/Makefile.in b/newlib/libc/sys/w65/Makefile.in
index 75ce8ff..fa9fb98 100644
--- a/newlib/libc/sys/w65/Makefile.in
+++ b/newlib/libc/sys/w65/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/w65/aclocal.m4 b/newlib/libc/sys/w65/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/w65/aclocal.m4
+++ b/newlib/libc/sys/w65/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/w65/configure b/newlib/libc/sys/w65/configure
index 9050c41..e468a38 100755
--- a/newlib/libc/sys/w65/configure
+++ b/newlib/libc/sys/w65/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/sys/z8ksim/Makefile.in b/newlib/libc/sys/z8ksim/Makefile.in
index 5f99825..74c935f 100644
--- a/newlib/libc/sys/z8ksim/Makefile.in
+++ b/newlib/libc/sys/z8ksim/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,12 +57,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
@@ -72,7 +68,6 @@ LDFLAGS = @LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,8 +124,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
diff --git a/newlib/libc/sys/z8ksim/aclocal.m4 b/newlib/libc/sys/z8ksim/aclocal.m4
index 55d5e67..9a25f7b 100644
--- a/newlib/libc/sys/z8ksim/aclocal.m4
+++ b/newlib/libc/sys/z8ksim/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,3 +284,16 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
+
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
diff --git a/newlib/libc/sys/z8ksim/configure b/newlib/libc/sys/z8ksim/configure
index 4330a5f..36c4eac 100755
--- a/newlib/libc/sys/z8ksim/configure
+++ b/newlib/libc/sys/z8ksim/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -47,6 +39,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -161,6 +154,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -331,6 +325,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -496,12 +495,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -561,7 +564,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -574,7 +576,7 @@ am__api_version="1.4"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:578: checking for a BSD compatible install" >&5
+echo "configure:580: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -627,7 +629,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:633: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -684,7 +686,7 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:690: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -717,12 +719,12 @@ else
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:721: checking for Cygwin environment" >&5
+echo "configure:723: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 726 "configure"
+#line 728 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -733,7 +735,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -750,19 +752,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:754: checking for mingw32 environment" >&5
+echo "configure:756: checking for mingw32 environment" >&5
 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 759 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -815,79 +817,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -905,34 +844,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:936: checking host system type" >&5
+echo "configure:854: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -952,52 +870,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:957: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:975: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1013,21 +890,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1018: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:895: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1031: checking for working autoconf" >&5
+echo "configure:908: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1039,21 +916,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1044: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:921: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1057: checking for working autoheader" >&5
+echo "configure:934: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1066,7 +943,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1070: checking for working makeinfo" >&5
+echo "configure:947: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1091,7 +968,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1095: checking for $ac_word" >&5
+echo "configure:972: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1121,7 +998,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1002: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1170,7 +1047,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1174: checking whether we are using GNU C" >&5
+echo "configure:1051: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1179,7 +1056,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1194,7 +1071,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1198: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1075: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1222,10 +1099,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1108: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1229: checking for $ac_word" >&5
+echo "configure:1129: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1257,7 +1157,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_word" >&5
+echo "configure:1161: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1289,7 +1189,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1293: checking for $ac_word" >&5
+echo "configure:1193: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,7 +1221,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1325: checking for $ac_word" >&5
+echo "configure:1225: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1366,7 +1266,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1370: checking for a BSD compatible install" >&5
+echo "configure:1270: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1419,11 +1319,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1324: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1457,7 +1354,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1461: checking for executable suffix" >&5
+echo "configure:1358: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1467,10 +1364,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1491,6 +1388,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1501,52 +1410,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1555,12 +1418,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1713,24 +1570,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -1743,6 +1588,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -1751,19 +1601,8 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
@@ -1777,7 +1616,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libc/syscalls/Makefile.am b/newlib/libc/syscalls/Makefile.am
index e9e5742..71a5eae 100644
--- a/newlib/libc/syscalls/Makefile.am
+++ b/newlib/libc/syscalls/Makefile.am
@@ -4,9 +4,11 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES = \
+LIB_SOURCES = \
 	sysclose.c	\
+	sysexecve.c	\
 	sysfcntl.c	\
+	sysfork.c	\
 	sysfstat.c	\
 	sysgetpid.c	\
 	sysgettod.c	\
@@ -19,36 +21,18 @@ GENERAL_SOURCES = \
 	sysstat.c	\
 	systimes.c	\
 	sysunlink.c	\
+	syswait.c	\
 	syswrite.c
 
-
-## Weed out EL/IX level 3 interfaces if necessary
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-if ELIX_LEVEL_2
-LIB_OBJS =
-else
-LIB_OBJS = \
-	sysexecve.$(oext)	\
-	sysfork.$(oext)		\
-	syswait.$(oext)
-endif
-endif
-
 libsyscalls_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libsyscalls.la
-libsyscalls_la_SOURCES = $(GENERAL_SOURCES)
-libsyscalls_la_LIBADD = $(LIB_OBJS)
-libsyscalls_la_DEPENDENCIES = $(LIB_OBJS)
+libsyscalls_la_SOURCES = $(LIB_SOURCES)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
+lib_a_SOURCES = $(LIB_SOURCES)
 noinst_DATA =
 endif
 
diff --git a/newlib/libc/syscalls/Makefile.in b/newlib/libc/syscalls/Makefile.in
index e95d425..4fe569c 100644
--- a/newlib/libc/syscalls/Makefile.in
+++ b/newlib/libc/syscalls/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -110,24 +95,35 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES =  	sysclose.c		sysfcntl.c		sysfstat.c		sysgetpid.c		sysgettod.c		syskill.c		syslink.c		syslseek.c		sysopen.c		sysread.c		syssbrk.c		sysstat.c		systimes.c		sysunlink.c		syswrite.c
+LIB_SOURCES = \
+	sysclose.c	\
+	sysexecve.c	\
+	sysfcntl.c	\
+	sysfork.c	\
+	sysfstat.c	\
+	sysgetpid.c	\
+	sysgettod.c	\
+	syskill.c	\
+	syslink.c	\
+	syslseek.c	\
+	sysopen.c	\
+	sysread.c	\
+	syssbrk.c	\
+	sysstat.c	\
+	systimes.c	\
+	sysunlink.c	\
+	syswait.c	\
+	syswrite.c
 
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@LIB_OBJS = 	sysexecve.$(oext)		sysfork.$(oext)			syswait.$(oext)
 
 libsyscalls_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libsyscalls.la
-@USE_LIBTOOL_TRUE@libsyscalls_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@libsyscalls_la_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@libsyscalls_la_DEPENDENCIES = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libsyscalls.la
+@USE_LIBTOOL_TRUE@libsyscalls_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
 
 CHEWOUT_FILES = 
 
@@ -146,21 +142,20 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  sysclose.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sysfcntl.$(OBJEXT) sysfstat.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sysgetpid.$(OBJEXT) sysgettod.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@syskill.$(OBJEXT) syslink.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@syslseek.$(OBJEXT) sysopen.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sysread.$(OBJEXT) syssbrk.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sysstat.$(OBJEXT) systimes.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sysunlink.$(OBJEXT) syswrite.$(OBJEXT)
+lib_a_LIBADD = 
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  sysclose.o sysexecve.o sysfcntl.o \
+@USE_LIBTOOL_FALSE@sysfork.o sysfstat.o sysgetpid.o sysgettod.o \
+@USE_LIBTOOL_FALSE@syskill.o syslink.o syslseek.o sysopen.o sysread.o \
+@USE_LIBTOOL_FALSE@syssbrk.o sysstat.o systimes.o sysunlink.o syswait.o \
+@USE_LIBTOOL_FALSE@syswrite.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
-@USE_LIBTOOL_TRUE@libsyscalls_la_OBJECTS =  sysclose.lo sysfcntl.lo \
-@USE_LIBTOOL_TRUE@sysfstat.lo sysgetpid.lo sysgettod.lo syskill.lo \
-@USE_LIBTOOL_TRUE@syslink.lo syslseek.lo sysopen.lo sysread.lo \
-@USE_LIBTOOL_TRUE@syssbrk.lo sysstat.lo systimes.lo sysunlink.lo \
-@USE_LIBTOOL_TRUE@syswrite.lo
+libsyscalls_la_LIBADD = 
+@USE_LIBTOOL_TRUE@libsyscalls_la_OBJECTS =  sysclose.lo sysexecve.lo \
+@USE_LIBTOOL_TRUE@sysfcntl.lo sysfork.lo sysfstat.lo sysgetpid.lo \
+@USE_LIBTOOL_TRUE@sysgettod.lo syskill.lo syslink.lo syslseek.lo \
+@USE_LIBTOOL_TRUE@sysopen.lo sysread.lo syssbrk.lo sysstat.lo \
+@USE_LIBTOOL_TRUE@systimes.lo sysunlink.lo syswait.lo syswrite.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -180,7 +175,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libsyscalls_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus syscalls/Makefile
 
@@ -201,11 +196,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -214,7 +204,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libc/syscalls/sysclose.c b/newlib/libc/syscalls/sysclose.c
index 90f321f..632364a 100644
--- a/newlib/libc/syscalls/sysclose.c
+++ b/newlib/libc/syscalls/sysclose.c
@@ -3,8 +3,8 @@
 #include <reent.h>
 
 int
-_DEFUN (close, (fd),
-     int fd)
+close (fd)
+     int fd;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _close_r (_REENT, fd);
diff --git a/newlib/libc/syscalls/sysexecve.c b/newlib/libc/syscalls/sysexecve.c
index a43b47a..c505047 100644
--- a/newlib/libc/syscalls/sysexecve.c
+++ b/newlib/libc/syscalls/sysexecve.c
@@ -3,10 +3,10 @@
 #include <reent.h>
 
 int
-_DEFUN (execve, (name, argv, env),
-     char *name _AND
-     char **argv _AND
-     char **env)
+execve (name, argv, env)
+     char *name;
+     char **argv;
+     char **env;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _execve_r (_REENT, name, argv, env);
diff --git a/newlib/libc/syscalls/sysfcntl.c b/newlib/libc/syscalls/sysfcntl.c
index 5e6de7e..23e1d83 100644
--- a/newlib/libc/syscalls/sysfcntl.c
+++ b/newlib/libc/syscalls/sysfcntl.c
@@ -2,22 +2,16 @@
 /* only called from stdio/fdopen.c, so arg can be int. */
 
 #include <reent.h>
-#include <errno.h>
 
 int
-_DEFUN (fcntl, (fd, flag, arg),
-     int fd _AND
-     int flag _AND
-     int arg)
+fcntl (fd, flag, arg)
+     int fd;
+     int flag;
+     int arg;
 {
-#ifdef HAVE_FCNTL
-# ifdef REENTRANT_SYSCALLS_PROVIDED
+#ifdef REENTRANT_SYSCALLS_PROVIDED
   return _fcntl_r (_REENT, fd, flag, arg);
-# else
+#else
   return _fcntl (fd, flag, arg);
-# endif
-#else /* !HAVE_FCNTL */
-  errno = ENOSYS;
-  return -1;
-#endif /* !HAVE_FCNTL */
+#endif
 }
diff --git a/newlib/libc/syscalls/sysfork.c b/newlib/libc/syscalls/sysfork.c
index 96d23c7..9fe319f 100644
--- a/newlib/libc/syscalls/sysfork.c
+++ b/newlib/libc/syscalls/sysfork.c
@@ -7,7 +7,7 @@
 #include <reent.h>
 
 int
-_DEFUN_VOID (fork)
+fork ()
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _fork_r (_REENT);
diff --git a/newlib/libc/syscalls/sysfstat.c b/newlib/libc/syscalls/sysfstat.c
index 7d446e8..f167b3c 100644
--- a/newlib/libc/syscalls/sysfstat.c
+++ b/newlib/libc/syscalls/sysfstat.c
@@ -4,9 +4,9 @@
 #include <unistd.h>
 
 int
-_DEFUN (fstat, (fd, pstat),
-     int fd _AND
-     struct stat *pstat)
+fstat (fd, pstat)
+     int fd;
+     struct stat *pstat;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _fstat_r (_REENT, fd, pstat);
diff --git a/newlib/libc/syscalls/sysgetpid.c b/newlib/libc/syscalls/sysgetpid.c
index 794f519..d7f7506 100644
--- a/newlib/libc/syscalls/sysgetpid.c
+++ b/newlib/libc/syscalls/sysgetpid.c
@@ -3,7 +3,7 @@
 #include <reent.h>
 
 int
-_DEFUN_VOID (getpid)
+getpid ()
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _getpid_r (_REENT);
diff --git a/newlib/libc/syscalls/sysgettod.c b/newlib/libc/syscalls/sysgettod.c
index 9208a30..24849d5 100644
--- a/newlib/libc/syscalls/sysgettod.c
+++ b/newlib/libc/syscalls/sysgettod.c
@@ -8,9 +8,9 @@ struct timeval;
 struct timezone;
 
 int
-_DEFUN (gettimeofday, (ptimeval, ptimezone),
-     struct timeval *ptimeval _AND
-     struct timezone *ptimezone)
+gettimeofday (ptimeval, ptimezone)
+     struct timeval *ptimeval;
+     struct timezone *ptimezone;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _gettimeofday_r (_REENT, ptimeval, ptimezone);
diff --git a/newlib/libc/syscalls/syskill.c b/newlib/libc/syscalls/syskill.c
index 15cfecb..4ee2f64 100644
--- a/newlib/libc/syscalls/syskill.c
+++ b/newlib/libc/syscalls/syskill.c
@@ -3,9 +3,9 @@
 #include <reent.h>
 
 int
-_DEFUN (kill, (pid, sig),
-     int pid _AND
-     int sig)
+kill (pid, sig)
+     int pid;
+     int sig;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _kill_r (_REENT, pid, sig);
diff --git a/newlib/libc/syscalls/syslink.c b/newlib/libc/syscalls/syslink.c
index df235ee..6abe184 100644
--- a/newlib/libc/syscalls/syslink.c
+++ b/newlib/libc/syscalls/syslink.c
@@ -3,9 +3,9 @@
 #include <reent.h>
 
 int
-_DEFUN (link, (old, new),
-     char *old _AND
-     char *new)
+link (old, new)
+     char *old;
+     char *new;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _link_r (_REENT, old, new);
diff --git a/newlib/libc/syscalls/syslseek.c b/newlib/libc/syscalls/syslseek.c
index a172247..57d6423 100644
--- a/newlib/libc/syscalls/syslseek.c
+++ b/newlib/libc/syscalls/syslseek.c
@@ -4,10 +4,10 @@
 #include <unistd.h>
 
 off_t
-_DEFUN (lseek, (fd, pos, whence),
-     int fd _AND
-     off_t pos _AND
-     int whence)
+lseek (fd, pos, whence)
+     int fd;
+     off_t pos;
+     int whence;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _lseek_r (_REENT, fd, pos, whence);
diff --git a/newlib/libc/syscalls/sysopen.c b/newlib/libc/syscalls/sysopen.c
index 7e7df99..6b3836f 100644
--- a/newlib/libc/syscalls/sysopen.c
+++ b/newlib/libc/syscalls/sysopen.c
@@ -10,9 +10,7 @@
 #include <stdarg.h>
 
 int
-_DEFUN (open, (file, flags, ...),
-        const char *file _AND
-        int flags _DOTS)
+open (const char *file, int flags, ...)
 {
   va_list ap;
   int ret;
diff --git a/newlib/libc/syscalls/sysread.c b/newlib/libc/syscalls/sysread.c
index ae19f5b..bdb3932 100644
--- a/newlib/libc/syscalls/sysread.c
+++ b/newlib/libc/syscalls/sysread.c
@@ -4,10 +4,10 @@
 #include <unistd.h>
 
 _READ_WRITE_RETURN_TYPE
-_DEFUN (read, (fd, buf, cnt),
-     int fd _AND
-     void *buf _AND
-     size_t cnt)
+read (fd, buf, cnt)
+     int fd;
+     void *buf;
+     size_t cnt;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _read_r (_REENT, fd, buf, cnt);
diff --git a/newlib/libc/syscalls/syssbrk.c b/newlib/libc/syscalls/syssbrk.c
index de36867..cee7ee1 100644
--- a/newlib/libc/syscalls/syssbrk.c
+++ b/newlib/libc/syscalls/syssbrk.c
@@ -3,12 +3,12 @@
 #include <reent.h>
 #include <unistd.h>
 
-extern void *_sbrk_r (struct _reent *, ptrdiff_t);
-extern void *_sbrk (ptrdiff_t);
+extern void *_sbrk_r (struct _reent *, size_t);
+extern void *_sbrk (size_t);
 
 void *
-_DEFUN (sbrk, (incr),
-     ptrdiff_t incr)
+sbrk (incr)
+     size_t incr;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _sbrk_r (_REENT, incr);
diff --git a/newlib/libc/syscalls/sysstat.c b/newlib/libc/syscalls/sysstat.c
index e2247dc..39a5061 100644
--- a/newlib/libc/syscalls/sysstat.c
+++ b/newlib/libc/syscalls/sysstat.c
@@ -4,9 +4,9 @@
 #include <unistd.h>
 
 int
-_DEFUN (stat, (file, pstat),
-     char *file _AND
-     struct stat *pstat)
+stat (file, pstat)
+     char *file;
+     struct stat *pstat;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _stat_r (_REENT, file, pstat);
diff --git a/newlib/libc/syscalls/systimes.c b/newlib/libc/syscalls/systimes.c
index 353553b..f74d6fa 100644
--- a/newlib/libc/syscalls/systimes.c
+++ b/newlib/libc/syscalls/systimes.c
@@ -4,8 +4,8 @@
 #include <sys/times.h>
 
 clock_t
-_DEFUN (times, (buf),
-     struct tms *buf)
+times (buf)
+     struct tms *buf;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _times_r (_REENT, buf);
diff --git a/newlib/libc/syscalls/sysunlink.c b/newlib/libc/syscalls/sysunlink.c
index ac04184..a910f96 100644
--- a/newlib/libc/syscalls/sysunlink.c
+++ b/newlib/libc/syscalls/sysunlink.c
@@ -3,8 +3,8 @@
 #include <reent.h>
 
 int
-_DEFUN (unlink, (file),
-        char *file)
+unlink (file)
+     char *file;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _unlink_r (_REENT, file);
diff --git a/newlib/libc/syscalls/syswait.c b/newlib/libc/syscalls/syswait.c
index 355906c..86544fa 100644
--- a/newlib/libc/syscalls/syswait.c
+++ b/newlib/libc/syscalls/syswait.c
@@ -3,8 +3,8 @@
 #include <reent.h>
 
 int
-_DEFUN (wait, (status),
-        int *status)
+wait (status)
+     int *status;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _wait_r (_REENT, status);
diff --git a/newlib/libc/syscalls/syswrite.c b/newlib/libc/syscalls/syswrite.c
index 0899759..00fc8a3 100644
--- a/newlib/libc/syscalls/syswrite.c
+++ b/newlib/libc/syscalls/syswrite.c
@@ -4,10 +4,10 @@
 #include <unistd.h>
 
 _READ_WRITE_RETURN_TYPE
-_DEFUN (write, (fd, buf, cnt),
-     int fd _AND
-     const void *buf _AND
-     size_t cnt)
+write (fd, buf, cnt)
+     int fd;
+     const void *buf;
+     size_t cnt;
 {
 #ifdef REENTRANT_SYSCALLS_PROVIDED
   return _write_r (_REENT, fd, buf, cnt);
diff --git a/newlib/libc/time/Makefile.am b/newlib/libc/time/Makefile.am
index f5c9a02..1ad24c0 100644
--- a/newlib/libc/time/Makefile.am
+++ b/newlib/libc/time/Makefile.am
@@ -11,20 +11,13 @@ LIB_SOURCES = \
 	ctime.c		\
 	ctime_r.c	\
 	difftime.c	\
-	gettzinfo.c	\
 	gmtime.c	\
 	gmtime_r.c	\
 	lcltime.c	\
 	lcltime_r.c	\
 	mktime.c	\
-	mktm_r.c	\
 	strftime.c  	\
-	strptime.c	\
-	time.c		\
-	tzlock.c	\
-	tzset.c		\
-	tzset_r.c	\
-	tzvars.c
+	time.c
 
 libtime_la_LDFLAGS = -Xcompiler -nostdlib
 
@@ -49,9 +42,7 @@ CHEWOUT_FILES = \
 	lcltime.def	\
 	mktime.def	\
 	strftime.def	\
-	time.def	\
-	tzlock.def	\
-	tzset.def
+	time.def
 
 SUFFIXES = .def
 
diff --git a/newlib/libc/time/Makefile.in b/newlib/libc/time/Makefile.in
index abdfc65..5dfdccc 100644
--- a/newlib/libc/time/Makefile.in
+++ b/newlib/libc/time/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -110,19 +95,41 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-LIB_SOURCES =  	asctime.c		asctime_r.c		clock.c			ctime.c			ctime_r.c		difftime.c		gettzinfo.c		gmtime.c		gmtime_r.c		lcltime.c		lcltime_r.c		mktime.c		mktm_r.c		strftime.c  		strptime.c		time.c			tzlock.c		tzset.c			tzset_r.c		tzvars.c
+LIB_SOURCES = \
+	asctime.c	\
+	asctime_r.c	\
+	clock.c		\
+	ctime.c		\
+	ctime_r.c	\
+	difftime.c	\
+	gmtime.c	\
+	gmtime_r.c	\
+	lcltime.c	\
+	lcltime_r.c	\
+	mktime.c	\
+	strftime.c  	\
+	time.c
 
 
 libtime_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libtime.la
-@USE_LIBTOOL_TRUE@libtime_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libtime.la
+@USE_LIBTOOL_TRUE@libtime_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
 
-CHEWOUT_FILES =  	asctime.def		clock.def 		ctime.def		difftime.def		gmtime.def		lcltime.def		mktime.def		strftime.def		time.def		tzlock.def		tzset.def
+CHEWOUT_FILES = \
+	asctime.def	\
+	clock.def 	\
+	ctime.def	\
+	difftime.def	\
+	gmtime.def	\
+	lcltime.def	\
+	mktime.def	\
+	strftime.def	\
+	time.def
 
 
 SUFFIXES = .def
@@ -141,23 +148,15 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  asctime.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@asctime_r.$(OBJEXT) clock.$(OBJEXT) ctime.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ctime_r.$(OBJEXT) difftime.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@gettzinfo.$(OBJEXT) gmtime.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@gmtime_r.$(OBJEXT) lcltime.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@lcltime_r.$(OBJEXT) mktime.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@mktm_r.$(OBJEXT) strftime.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@strptime.$(OBJEXT) time.$(OBJEXT) tzlock.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@tzset.$(OBJEXT) tzset_r.$(OBJEXT) tzvars.$(OBJEXT)
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  asctime.o asctime_r.o clock.o \
+@USE_LIBTOOL_FALSE@ctime.o ctime_r.o difftime.o gmtime.o gmtime_r.o \
+@USE_LIBTOOL_FALSE@lcltime.o lcltime_r.o mktime.o strftime.o time.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libtime_la_LIBADD = 
 @USE_LIBTOOL_TRUE@libtime_la_OBJECTS =  asctime.lo asctime_r.lo clock.lo \
-@USE_LIBTOOL_TRUE@ctime.lo ctime_r.lo difftime.lo gettzinfo.lo \
-@USE_LIBTOOL_TRUE@gmtime.lo gmtime_r.lo lcltime.lo lcltime_r.lo \
-@USE_LIBTOOL_TRUE@mktime.lo mktm_r.lo strftime.lo strptime.lo time.lo \
-@USE_LIBTOOL_TRUE@tzlock.lo tzset.lo tzset_r.lo tzvars.lo
+@USE_LIBTOOL_TRUE@ctime.lo ctime_r.lo difftime.lo gmtime.lo gmtime_r.lo \
+@USE_LIBTOOL_TRUE@lcltime.lo lcltime_r.lo mktime.lo strftime.lo time.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -177,7 +176,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libtime_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus time/Makefile
 
@@ -198,11 +197,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -211,7 +205,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libc/time/asctime.c b/newlib/libc/time/asctime.c
index e401185..4ad35e8 100644
--- a/newlib/libc/time/asctime.c
+++ b/newlib/libc/time/asctime.c
@@ -57,8 +57,8 @@ char *
 _DEFUN (asctime, (tim_p),
 	_CONST struct tm *tim_p)
 {
-  _REENT_CHECK_ASCTIME_BUF(_REENT);
-  return asctime_r (tim_p, _REENT_ASCTIME_BUF(_REENT));
+  char *buf = _REENT->_new._reent._asctime_buf;
+  return asctime_r (tim_p, buf);
 }
 
 #endif
diff --git a/newlib/libc/time/clock.c b/newlib/libc/time/clock.c
index 64cf438..b15915d 100644
--- a/newlib/libc/time/clock.c
+++ b/newlib/libc/time/clock.c
@@ -41,7 +41,7 @@ into seconds, divide by the macro <<CLOCKS_PER_SEC>>.
 RETURNS
 The amount of processor time used so far by your program, in units
 defined by the machine-dependent macro <<CLOCKS_PER_SEC>>.  If no
-measurement is available, the result is (clock_t)<<-1>>.
+measurement is available, the result is <<-1>>.
 
 PORTABILITY
 ANSI C requires <<clock>> and <<CLOCKS_PER_SEC>>.
diff --git a/newlib/libc/time/ctime.c b/newlib/libc/time/ctime.c
index 63954c6..e8ccc14 100644
--- a/newlib/libc/time/ctime.c
+++ b/newlib/libc/time/ctime.c
@@ -12,16 +12,15 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <time.h>
-	char *ctime(const time_t *<[clock]>);
-	char *ctime_r(const time_t *<[clock]>, char *<[buf]>);
+	char *ctime(time_t <[clock]>);
+	char *ctime_r(time_t <[clock]>, char *<[buf]>);
 
 TRAD_SYNOPSIS
 	#include <time.h>
 	char *ctime(<[clock]>)
-	time_t *<[clock]>;
-
+	time_t <[clock]>;
 	char *ctime_r(<[clock]>, <[buf]>)
-	time_t *<[clock]>;
+	time_t <[clock]>;
 	char *<[buf]>;
 
 DESCRIPTION
diff --git a/newlib/libc/time/difftime.c b/newlib/libc/time/difftime.c
index de6ffdb..93a4f00 100644
--- a/newlib/libc/time/difftime.c
+++ b/newlib/libc/time/difftime.c
@@ -40,5 +40,5 @@ _DEFUN (difftime, (tim1, tim2),
 	time_t tim1 _AND
 	time_t tim2)
 {
-  return (double)(tim1 - tim2);
+  return ((double) tim1 - tim2);
 }
diff --git a/newlib/libc/time/gettzinfo.c b/newlib/libc/time/gettzinfo.c
deleted file mode 100644
index 54c9bc2..0000000
--- a/newlib/libc/time/gettzinfo.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <sys/types.h>
-#include <local.h>
-
-/* Shared timezone information for libc/time functions.  */
-static __tzinfo_type tzinfo = {1, 0,
-    { {'J', 0, 0, 0, 0, (time_t)0, 0L },
-      {'J', 0, 0, 0, 0, (time_t)0, 0L } 
-    } 
-};
-
-__tzinfo_type *
-__gettzinfo (void)
-{
-  return &tzinfo;
-}
diff --git a/newlib/libc/time/gmtime.c b/newlib/libc/time/gmtime.c
index d8e6875..4f5bbe4 100644
--- a/newlib/libc/time/gmtime.c
+++ b/newlib/libc/time/gmtime.c
@@ -59,8 +59,9 @@ struct tm *
 _DEFUN (gmtime, (tim_p),
 	_CONST time_t * tim_p)
 {
-  _REENT_CHECK_TM(_REENT);
-  return gmtime_r (tim_p, (struct tm *)_REENT_TM(_REENT));
+  time_t tim = *tim_p + _GMT_OFFSET;
+
+  return (localtime (&tim));
 }
 
 #endif
diff --git a/newlib/libc/time/gmtime_r.c b/newlib/libc/time/gmtime_r.c
index fb39238..7afa021 100644
--- a/newlib/libc/time/gmtime_r.c
+++ b/newlib/libc/time/gmtime_r.c
@@ -3,12 +3,15 @@
  */
 
 #include <time.h>
-#include "local.h"
+
+#define _GMT_OFFSET 0
 
 struct tm *
 _DEFUN (gmtime_r, (tim_p, res),
 	_CONST time_t * tim_p _AND
 	struct tm *res)
 {
-  return (_mktm_r (tim_p, res, 1));
+  time_t tim = *tim_p + _GMT_OFFSET;
+
+  return (localtime_r (&tim, res));
 }
diff --git a/newlib/libc/time/lcltime.c b/newlib/libc/time/lcltime.c
index 1cdc64f..e54a49d 100644
--- a/newlib/libc/time/lcltime.c
+++ b/newlib/libc/time/lcltime.c
@@ -51,8 +51,7 @@ struct tm *
 _DEFUN (localtime, (tim_p),
 	_CONST time_t * tim_p)
 {
-  _REENT_CHECK_TM(_REENT);
-  return localtime_r (tim_p, (struct tm *)_REENT_TM(_REENT));
+  return localtime_r (tim_p, (struct tm *)&(_REENT->_new._reent._localtime_buf));
 }
 
 #endif
diff --git a/newlib/libc/time/lcltime_r.c b/newlib/libc/time/lcltime_r.c
index cf38671..1b4269e 100644
--- a/newlib/libc/time/lcltime_r.c
+++ b/newlib/libc/time/lcltime_r.c
@@ -1,18 +1,104 @@
 /*
  * localtime_r.c
+ * Original Author:	Adapted from tzcode maintained by Arthur David Olson.
  *
  * Converts the calendar time pointed to by tim_p into a broken-down time
  * expressed as local time. Returns a pointer to a structure containing the
  * broken-down time.
  */
 
+#include <stdlib.h>
 #include <time.h>
-#include "local.h"
+
+#define SECSPERMIN	60L
+#define MINSPERHOUR	60L
+#define HOURSPERDAY	24L
+#define SECSPERHOUR	(SECSPERMIN * MINSPERHOUR)
+#define SECSPERDAY	(SECSPERHOUR * HOURSPERDAY)
+#define DAYSPERWEEK	7
+#define MONSPERYEAR	12
+
+#define YEAR_BASE	1900
+#define EPOCH_YEAR      1970
+#define EPOCH_WDAY      4
+
+#define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
+
+static _CONST int mon_lengths[2][MONSPERYEAR] = {
+  {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
+  {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
+} ;
+
+static _CONST int year_lengths[2] = {
+  365,
+  366
+} ;
 
 struct tm *
 _DEFUN (localtime_r, (tim_p, res),
 	_CONST time_t * tim_p _AND
 	struct tm *res)
 {
-  return _mktm_r (tim_p, res, 0);
+  long days, rem;
+  int y;
+  int yleap;
+  _CONST int *ip;
+
+  days = ((long) *tim_p) / SECSPERDAY;
+  rem = ((long) *tim_p) % SECSPERDAY;
+  while (rem < 0) 
+    {
+      rem += SECSPERDAY;
+      --days;
+    }
+  while (rem >= SECSPERDAY)
+    {
+      rem -= SECSPERDAY;
+      ++days;
+    }
+ 
+  /* compute hour, min, and sec */  
+  res->tm_hour = (int) (rem / SECSPERHOUR);
+  rem %= SECSPERHOUR;
+  res->tm_min = (int) (rem / SECSPERMIN);
+  res->tm_sec = (int) (rem % SECSPERMIN);
+
+  /* compute day of week */
+  if ((res->tm_wday = ((EPOCH_WDAY + days) % DAYSPERWEEK)) < 0)
+    res->tm_wday += DAYSPERWEEK;
+
+  /* compute year & day of year */
+  y = EPOCH_YEAR;
+  if (days >= 0)
+    {
+      for (;;)
+	{
+	  yleap = isleap(y);
+	  if (days < year_lengths[yleap])
+	    break;
+	  y++;
+	  days -= year_lengths[yleap];
+	}
+    }
+  else
+    {
+      do
+	{
+	  --y;
+	  yleap = isleap(y);
+	  days += year_lengths[yleap];
+	} while (days < 0);
+    }
+
+  res->tm_year = y - YEAR_BASE;
+  res->tm_yday = days;
+  ip = mon_lengths[yleap];
+  for (res->tm_mon = 0; days >= ip[res->tm_mon]; ++res->tm_mon)
+    days -= ip[res->tm_mon];
+  res->tm_mday = days + 1;
+
+  /* set daylight saving time flag */
+  res->tm_isdst = -1;
+  
+  return (res);
 }
diff --git a/newlib/libc/time/local.h b/newlib/libc/time/local.h
deleted file mode 100644
index 9d9ef87..0000000
--- a/newlib/libc/time/local.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* local header used by libc/time routines */
-#include <_ansi.h>
-#include <time.h>
-
-#define SECSPERMIN	60L
-#define MINSPERHOUR	60L
-#define HOURSPERDAY	24L
-#define SECSPERHOUR	(SECSPERMIN * MINSPERHOUR)
-#define SECSPERDAY	(SECSPERHOUR * HOURSPERDAY)
-#define DAYSPERWEEK	7
-#define MONSPERYEAR	12
-
-#define YEAR_BASE	1900
-#define EPOCH_YEAR      1970
-#define EPOCH_WDAY      4
-#define EPOCH_YEARS_SINCE_LEAP 2
-#define EPOCH_YEARS_SINCE_CENTURY 70
-#define EPOCH_YEARS_SINCE_LEAP_CENTURY 370
-
-#define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
-
-struct tm * _EXFUN (_mktm_r, (_CONST time_t *, struct tm *, int __is_gmtime));
-int         _EXFUN (__tzcalc_limits, (int __year));
-
-/* locks for multi-threading */
-#ifdef __SINGLE_THREAD__
-#define TZ_LOCK
-#define TZ_UNLOCK
-#else
-#define TZ_LOCK __tz_lock()
-#define TZ_UNLOCK __tz_unlock()
-#endif
-
-void _EXFUN(__tz_lock,(_VOID));
-void _EXFUN(__tz_unlock,(_VOID));
-
diff --git a/newlib/libc/time/mktime.c b/newlib/libc/time/mktime.c
index 0ee055c..80478da 100644
--- a/newlib/libc/time/mktime.c
+++ b/newlib/libc/time/mktime.c
@@ -47,7 +47,6 @@ ANSI C requires <<mktime>>.
 
 #include <stdlib.h>
 #include <time.h>
-#include "local.h"
 
 #define _SEC_IN_MINUTE 60L
 #define _SEC_IN_HOUR 3600L
@@ -157,8 +156,7 @@ mktime (tim_p)
 {
   time_t tim = 0;
   long days = 0;
-  int year, isdst;
-  __tzinfo_type *tz = __gettzinfo ();
+  int year;
 
   /* validate structure */
   validate_structure (tim_p);
@@ -202,57 +200,5 @@ mktime (tim_p)
   /* compute total seconds */
   tim += (days * _SEC_IN_DAY);
 
-  isdst = tim_p->tm_isdst;
-
-  if (_daylight)
-    {
-      int y = tim_p->tm_year + YEAR_BASE;
-      if (y == tz->__tzyear || __tzcalc_limits (y))
-	{
-	  /* calculate start of dst in dst local time and 
-	     start of std in both std local time and dst local time */
-          time_t startdst_dst = tz->__tzrule[0].change
-	    - (time_t) tz->__tzrule[1].offset;
-	  time_t startstd_dst = tz->__tzrule[1].change
-	    - (time_t) tz->__tzrule[1].offset;
-	  time_t startstd_std = tz->__tzrule[1].change
-	    - (time_t) tz->__tzrule[0].offset;
-	  /* if the time is in the overlap between dst and std local times */
-	  if (tim >= startstd_std && tim < startstd_dst)
-	    ; /* we let user decide or leave as -1 */
-          else
-	    {
-	      isdst = (tz->__tznorth
-		       ? (tim >= startdst_dst && tim < startstd_std)
-		       : (tim >= startdst_dst || tim < startstd_std));
-	      /* if user committed and was wrong, perform correction */
-	      if ((isdst ^ tim_p->tm_isdst) == 1)
-		{
-		  /* we either subtract or add the difference between
-		     time zone offsets, depending on which way the user got it
-		     wrong. The diff is typically one hour, or 3600 seconds,
-		     and should fit in a 16-bit int, even though offset
-		     is a long to accomodate 12 hours. */
-		  int diff = (int) (tz->__tzrule[0].offset
-				    - tz->__tzrule[1].offset);
-		  if (!isdst)
-		    diff = -diff;
-		  tim_p->tm_sec += diff;
-		  validate_structure (tim_p);
-		  tim += diff;  /* we also need to correct our current time calculation */
-		}
-	    }
-	}
-    }
-
-  /* add appropriate offset to put time in gmt format */
-  if (isdst == 1)
-    tim += (time_t) tz->__tzrule[1].offset;
-  else /* otherwise assume std time */
-    tim += (time_t) tz->__tzrule[0].offset;
-
-  /* reset isdst flag to what we have calculated */
-  tim_p->tm_isdst = isdst;
-
   return tim;
 }
diff --git a/newlib/libc/time/mktm_r.c b/newlib/libc/time/mktm_r.c
deleted file mode 100644
index 4d4b4fa..0000000
--- a/newlib/libc/time/mktm_r.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * mktm_r.c
- * Original Author:	Adapted from tzcode maintained by Arthur David Olson.
- * Modifications:       Changed to mktm_r and added __tzcalc_limits - 04/10/02, Jeff Johnston
- *                      Fixed bug in mday computations - 08/12/04, Alex Mogilnikov <alx@intellectronika.ru>
- *                      Fixed bug in __tzcalc_limits - 08/12/04, Alex Mogilnikov <alx@intellectronika.ru>
- *
- * Converts the calendar time pointed to by tim_p into a broken-down time
- * expressed as local time. Returns a pointer to a structure containing the
- * broken-down time.
- */
-
-#include <stdlib.h>
-#include <time.h>
-#include "local.h"
-
-static _CONST int mon_lengths[2][MONSPERYEAR] = {
-  {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
-  {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
-} ;
-
-static _CONST int year_lengths[2] = {
-  365,
-  366
-} ;
-
-struct tm *
-_DEFUN (_mktm_r, (tim_p, res, is_gmtime),
-	_CONST time_t * tim_p _AND
-	struct tm *res _AND
-	int is_gmtime)
-{
-  long days, rem;
-  time_t lcltime;
-  int y;
-  int yleap;
-  _CONST int *ip;
-   __tzinfo_type *tz = __gettzinfo ();
-
-  /* base decision about std/dst time on current time */
-  lcltime = *tim_p;
-   
-  days = ((long)lcltime) / SECSPERDAY;
-  rem = ((long)lcltime) % SECSPERDAY;
-  while (rem < 0) 
-    {
-      rem += SECSPERDAY;
-      --days;
-    }
-  while (rem >= SECSPERDAY)
-    {
-      rem -= SECSPERDAY;
-      ++days;
-    }
- 
-  /* compute hour, min, and sec */  
-  res->tm_hour = (int) (rem / SECSPERHOUR);
-  rem %= SECSPERHOUR;
-  res->tm_min = (int) (rem / SECSPERMIN);
-  res->tm_sec = (int) (rem % SECSPERMIN);
-
-  /* compute day of week */
-  if ((res->tm_wday = ((EPOCH_WDAY + days) % DAYSPERWEEK)) < 0)
-    res->tm_wday += DAYSPERWEEK;
-
-  /* compute year & day of year */
-  y = EPOCH_YEAR;
-  if (days >= 0)
-    {
-      for (;;)
-	{
-	  yleap = isleap(y);
-	  if (days < year_lengths[yleap])
-	    break;
-	  y++;
-	  days -= year_lengths[yleap];
-	}
-    }
-  else
-    {
-      do
-	{
-	  --y;
-	  yleap = isleap(y);
-	  days += year_lengths[yleap];
-	} while (days < 0);
-    }
-
-  res->tm_year = y - YEAR_BASE;
-  res->tm_yday = days;
-  ip = mon_lengths[yleap];
-  for (res->tm_mon = 0; days >= ip[res->tm_mon]; ++res->tm_mon)
-    days -= ip[res->tm_mon];
-  res->tm_mday = days + 1;
-
-  if (!is_gmtime)
-    {
-      long offset;
-      int hours, mins, secs;
-
-      TZ_LOCK;
-      if (_daylight)
-	{
-	  if (y == tz->__tzyear || __tzcalc_limits (y))
-	    res->tm_isdst = (tz->__tznorth 
-			     ? (*tim_p >= tz->__tzrule[0].change 
-				&& *tim_p < tz->__tzrule[1].change)
-			     : (*tim_p >= tz->__tzrule[0].change 
-				|| *tim_p < tz->__tzrule[1].change));
-	  else
-	    res->tm_isdst = -1;
-	}
-      else
-	res->tm_isdst = 0;
-
-      offset = (res->tm_isdst == 1 
-		  ? tz->__tzrule[1].offset 
-		  : tz->__tzrule[0].offset);
-
-      hours = (int) (offset / SECSPERHOUR);
-      offset = offset % SECSPERHOUR;
-      
-      mins = (int) (offset / SECSPERMIN);
-      secs = (int) (offset % SECSPERMIN);
-
-      res->tm_sec -= secs;
-      res->tm_min -= mins;
-      res->tm_hour -= hours;
-
-      if (res->tm_sec >= SECSPERMIN)
-	{
-	  res->tm_min += 1;
-	  res->tm_sec -= SECSPERMIN;
-	}
-      else if (res->tm_sec < 0)
-	{
-	  res->tm_min -= 1;
-	  res->tm_sec += SECSPERMIN;
-	}
-      if (res->tm_min >= MINSPERHOUR)
-	{
-	  res->tm_hour += 1;
-	  res->tm_min -= MINSPERHOUR;
-	}
-      else if (res->tm_min < 0)
-	{
-	  res->tm_hour -= 1;
-	  res->tm_min += MINSPERHOUR;
-	}
-      if (res->tm_hour >= HOURSPERDAY)
-	{
-	  ++res->tm_yday;
-	  ++res->tm_wday;
-	  if (res->tm_wday > 6)
-	    res->tm_wday = 0;
-	  ++res->tm_mday;
-	  res->tm_hour -= HOURSPERDAY;
-	  if (res->tm_mday > ip[res->tm_mon])
-	    {
-	      res->tm_mday -= ip[res->tm_mon];
-	      res->tm_mon += 1;
-	      if (res->tm_mon == 12)
-		{
-		  res->tm_mon = 0;
-		  res->tm_year += 1;
-		  res->tm_yday = 0;
-		}
-	    }
-	}
-       else if (res->tm_hour < 0)
-	{
-	  res->tm_yday -= 1;
-	  res->tm_wday -= 1;
-	  if (res->tm_wday < 0)
-	    res->tm_wday = 6;
-	  res->tm_mday -= 1;
-	  res->tm_hour += 24;
-	  if (res->tm_mday == 0)
-	    {
-	      res->tm_mon -= 1;
-	      if (res->tm_mon < 0)
-		{
-		  res->tm_mon = 11;
-		  res->tm_year -= 1;
-		  res->tm_yday = 365 + isleap(res->tm_year);
-		}
-	      res->tm_mday = ip[res->tm_mon];
-	    }
-	}
-      TZ_UNLOCK;
-    }
-  else
-    res->tm_isdst = 0;
-
-  return (res);
-}
-
-int
-_DEFUN (__tzcalc_limits, (year),
-	int year)
-{
-  int days, year_days, years;
-  int i, j;
-  __tzinfo_type *tz = __gettzinfo ();
-
-  if (year < EPOCH_YEAR)
-    return 0;
-
-  tz->__tzyear = year;
-
-  years = (year - EPOCH_YEAR);
-
-  year_days = years * 365 +
-    (years - 1 + EPOCH_YEARS_SINCE_LEAP) / 4 - (years - 1 + EPOCH_YEARS_SINCE_CENTURY) / 100 + 
-    (years - 1 + EPOCH_YEARS_SINCE_LEAP_CENTURY) / 400;
-  
-  for (i = 0; i < 2; ++i)
-    {
-      if (tz->__tzrule[i].ch == 'J')
-	days = year_days + tz->__tzrule[i].d + 
-		(isleap(year) && tz->__tzrule[i].d >= 60);
-      else if (tz->__tzrule[i].ch == 'D')
-	days = year_days + tz->__tzrule[i].d;
-      else
-	{
-	  int yleap = isleap(year);
-	  int m_day, m_wday, wday_diff;
-	  _CONST int *ip = mon_lengths[yleap];
-
-	  days = year_days;
-
-	  for (j = 1; j < tz->__tzrule[i].m; ++j)
-	    days += ip[j-1];
-
-	  m_wday = (EPOCH_WDAY + days) % DAYSPERWEEK;
-	  
-	  wday_diff = tz->__tzrule[i].d - m_wday;
-	  if (wday_diff < 0)
-	    wday_diff += DAYSPERWEEK;
-	  m_day = (tz->__tzrule[i].n - 1) * DAYSPERWEEK + wday_diff;
-
-	  while (m_day >= ip[j-1])
-	    m_day -= DAYSPERWEEK;
-
-	  days += m_day;
-	}
-
-      /* store the change-over time in GMT form by adding offset */
-      tz->__tzrule[i].change = days * SECSPERDAY + 
-	      			tz->__tzrule[i].s + tz->__tzrule[i].offset;
-    }
-
-  tz->__tznorth = (tz->__tzrule[0].change < tz->__tzrule[1].change);
-
-  return 1;
-}
-
diff --git a/newlib/libc/time/strftime.c b/newlib/libc/time/strftime.c
index a3fdb74..1b44e1d 100644
--- a/newlib/libc/time/strftime.c
+++ b/newlib/libc/time/strftime.c
@@ -1,7 +1,6 @@
 /*
  * strftime.c
  * Original Author:	G. Haley
- * Additions from:	Eric Blake
  *
  * Places characters into the array pointed to by s as controlled by the string
  * pointed to by format. If the total number of resulting characters including
@@ -33,195 +32,92 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 <<strftime>> converts a <<struct tm>> representation of the time (at
-<[timp]>) into a null-terminated string, starting at <[s]> and occupying
-no more than <[maxsize]> characters.
+<[timp]>) into a string, starting at <[s]> and occupying no more than
+<[maxsize]> characters.
 
 You control the format of the output using the string at <[format]>.
 <<*<[format]>>> can contain two kinds of specifications: text to be
 copied literally into the formatted string, and time conversion
-specifications.  Time conversion specifications are two- and
-three-character sequences beginning with `<<%>>' (use `<<%%>>' to
-include a percent sign in the output).  Each defined conversion
-specification selects only the specified field(s) of calendar time
-data from <<*<[timp]>>>, and converts it to a string in one of the
-following ways:
+specifications.  Time conversion specifications are two-character
+sequences beginning with `<<%>>' (use `<<%%>>' to include a percent
+sign in the output).  Each defined conversion specification selects a
+field of calendar time data from <<*<[timp]>>>, and converts it to a
+string in one of the following ways:
 
 o+
 o %a
-A three-letter abbreviation for the day of the week. [tm_wday]
+An abbreviation for the day of the week.
 
 o %A
-The full name for the day of the week, one of `<<Sunday>>',
-`<<Monday>>', `<<Tuesday>>', `<<Wednesday>>', `<<Thursday>>',
-`<<Friday>>', or `<<Saturday>>'. [tm_wday]
+The full name for the day of the week.
 
 o %b
-A three-letter abbreviation for the month name. [tm_mon]
+An abbreviation for the month name.
 
 o %B
-The full name of the month, one of `<<January>>', `<<February>>',
-`<<March>>', `<<April>>', `<<May>>', `<<June>>', `<<July>>',
-`<<August>>', `<<September>>', `<<October>>', `<<November>>',
-`<<December>>'. [tm_mon]
+The full name of the month.
 
 o %c
 A string representing the complete date and time, in the form
-`<<"%a %b %e %H:%M:%S %Y">>' (example "Mon Apr 01 13:13:13
-1992"). [tm_sec, tm_min, tm_hour, tm_mday, tm_mon, tm_year, tm_wday]
-
-o %C
-The century, that is, the year divided by 100 then truncated.  For
-4-digit years, the result is zero-padded and exactly two characters;
-but for other years, there may a negative sign or more digits.  In
-this way, `<<%C%y>>' is equivalent to `<<%Y>>'. [tm_year]
- 
+. Mon Apr 01 13:13:13 1992
+
 o %d
-The day of the month, formatted with two digits (from `<<01>>' to
-`<<31>>'). [tm_mday]
-
-o %D
-A string representing the date, in the form `<<"%m/%d/%y">>'.
-[tm_mday, tm_mon, tm_year]
-
-o %e
-The day of the month, formatted with leading space if single digit
-(from `<<1>>' to `<<31>>'). [tm_mday]
-
-o %E<<x>>
-In some locales, the E modifier selects alternative representations of
-certain modifiers <<x>>.  But in the "C" locale supported by newlib,
-it is ignored, and treated as %<<x>>.
-
-o %F
-A string representing the ISO 8601:2000 date format, in the form
-`<<"%Y-%m-%d">>'. [tm_mday, tm_mon, tm_year]
-
-o %g
-The last two digits of the week-based year, see specifier %G (from
-`<<00>>' to `<<99>>'). [tm_year, tm_wday, tm_yday]
-
-o %G
-The week-based year. In the ISO 8601:2000 calendar, week 1 of the year
-includes January 4th, and begin on Mondays. Therefore, if January 1st,
-2nd, or 3rd falls on a Sunday, that day and earlier belong to the last
-week of the previous year; and if December 29th, 30th, or 31st falls
-on Monday, that day and later belong to week 1 of the next year.  For
-consistency with %Y, it always has at least four characters. 
-Example: "%G" for Saturday 2nd January 1999 gives "1998", and for
-Tuesday 30th December 1997 gives "1998". [tm_year, tm_wday, tm_yday]
-
-o %h
-A three-letter abbreviation for the month name (synonym for
-"%b"). [tm_mon]
+The day of the month, formatted with two digits.
 
 o %H
-The hour (on a 24-hour clock), formatted with two digits (from
-`<<00>>' to `<<23>>'). [tm_hour]
+The hour (on a 24-hour clock), formatted with two digits.
 
 o %I
-The hour (on a 12-hour clock), formatted with two digits (from
-`<<01>>' to `<<12>>'). [tm_hour]
+The hour (on a 12-hour clock), formatted with two digits.
 
 o %j
 The count of days in the year, formatted with three digits
-(from `<<001>>' to `<<366>>'). [tm_yday]
-
-o %k
-The hour (on a 24-hour clock), formatted with leading space if single
-digit (from `<<0>>' to `<<23>>'). Non-POSIX extension. [tm_hour]
-
-o %l
-The hour (on a 12-hour clock), formatted with leading space if single
-digit (from `<<1>>' to `<<12>>'). Non-POSIX extension. [tm_hour]
+(from `<<001>>' to `<<366>>').
 
 o %m
-The month number, formatted with two digits (from `<<01>>' to `<<12>>').
-[tm_mon]
+The month number, formatted with two digits.
 
 o %M
-The minute, formatted with two digits (from `<<00>>' to `<<59>>'). [tm_min]
-
-o %n
-A newline character (`<<\n>>').
-
-o %O<<x>>
-In some locales, the O modifier selects alternative digit characters
-for certain modifiers <<x>>.  But in the "C" locale supported by newlib, it
-is ignored, and treated as %<<x>>.
+The minute, formatted with two digits.
 
 o %p
-Either `<<AM>>' or `<<PM>>' as appropriate. [tm_hour]
-
-o %r
-The 12-hour time, to the second.  Equivalent to "%I:%M:%S %p". [tm_sec,
-tm_min, tm_hour]
-
-o %R
-The 24-hour time, to the minute.  Equivalent to "%H:%M". [tm_min, tm_hour]
+Either `<<AM>>' or `<<PM>>' as appropriate.
 
 o %S
-The second, formatted with two digits (from `<<00>>' to `<<60>>').  The
-value 60 accounts for the occasional leap second. [tm_sec]
-
-o %t
-A tab character (`<<\t>>').
-
-o %T
-The 24-hour time, to the second.  Equivalent to "%H:%M:%S". [tm_sec,
-tm_min, tm_hour]
-
-o %u
-The weekday as a number, 1-based from Monday (from `<<1>>' to
-`<<7>>'). [tm_wday]
+The second, formatted with two digits.
 
 o %U
-The week number, where weeks start on Sunday, week 1 contains the first
-Sunday in a year, and earlier days are in week 0.  Formatted with two
-digits (from `<<00>>' to `<<53>>').  See also <<%W>>. [tm_wday, tm_yday]
-
-o %V
-The week number, where weeks start on Monday, week 1 contains January 4th,
-and earlier days are in the previous year.  Formatted with two digits
-(from `<<01>>' to `<<53>>').  See also <<%G>>. [tm_year, tm_wday, tm_yday]
+The week number, formatted with two digits (from `<<00>>' to `<<53>>';
+week number 1 is taken as beginning with the first Sunday in a year).
+See also <<%W>>.
 
 o %w
-The weekday as a number, 0-based from Sunday (from `<<0>>' to `<<6>>').
-[tm_wday]
+A single digit representing the day of the week: Sunday is day <<0>>.
 
 o %W
-The week number, where weeks start on Monday, week 1 contains the first
-Monday in a year, and earlier days are in week 0.  Formatted with two
-digits (from `<<00>>' to `<<53>>'). [tm_wday, tm_yday]
+Another version of the week number: like `<<%U>>', but counting week 1
+as beginning with the first Monday in a year.
 
+o
 o %x
-A string representing the complete date, equivalent to "%m/%d/%y".
-[tm_mon, tm_mday, tm_year]
+A string representing the complete date, in a format like
+. Mon Apr 01 1992
 
 o %X
 A string representing the full time of day (hours, minutes, and
-seconds), equivalent to "%H:%M:%S". [tm_sec, tm_min, tm_hour]
+seconds), in a format like
+. 13:13:13
 
 o %y
-The last two digits of the year (from `<<00>>' to `<<99>>'). [tm_year]
+The last two digits of the year.
 
 o %Y
-The full year, equivalent to <<%C%y>>.  It will always have at least four
-characters, but may have more.  The year is accurate even when tm_year
-added to the offset of 1900 overflows an int. [tm_year]
-
-o %z
-The offset from UTC.  The format consists of a sign (negative is west of
-Greewich), two characters for hour, then two characters for minutes
-(-hhmm or +hhmm).  If tm_isdst is negative, the offset is unknown and no
-output is generated; if it is zero, the offset is the standard offset for
-the current time zone; and if it is positive, the offset is the daylight
-savings offset for the current timezone. The offset is determined from
-the TZ environment variable, as if by calling tzset(). [tm_isdst]
+The full year, formatted with four digits to include the century.
 
 o %Z
-The time zone name.  If tm_isdst is negative, no output is generated.
-Otherwise, the time zone name is based on the TZ environment variable,
-as if by calling tzset(). [tm_isdst]
+Defined by ANSI C as eliciting the time zone if available; it is not
+available in this implementation (which accepts `<<%Z>>' but generates
+no output for it).
 
 o %%
 A single character, `<<%>>'.
@@ -238,12 +134,7 @@ parts of <<*<[format]>>> that could be completely filled in within the
 PORTABILITY
 ANSI C requires <<strftime>>, but does not specify the contents of
 <<*<[s]>>> when the formatted string would require more than
-<[maxsize]> characters.  Unrecognized specifiers and fields of
-<<timp>> that are out of range cause undefined results.  Since some
-formats expand to 0 bytes, it is wise to set <<*<[s]>>> to a nonzero
-value beforehand to distinguish between failure and an empty string.
-This implementation does not support <<s>> being NULL, nor overlapping
-<<s>> and <<format>>.
+<[maxsize]> characters.
 
 <<strftime>> requires no supporting OS subroutines.
 */
@@ -251,9 +142,6 @@ This implementation does not support <<s>> being NULL, nor overlapping
 #include <stddef.h>
 #include <stdio.h>
 #include <time.h>
-#include <string.h>
-#include <stdlib.h>
-#include "local.h"
 
 static _CONST int dname_len[7] =
 {6, 6, 7, 9, 8, 6, 8};
@@ -270,53 +158,6 @@ static _CONST char *_CONST mname[12] =
  "May", "June", "July", "August", "September", "October", "November",
  "December"};
 
-/* Using the tm_year, tm_wday, and tm_yday components of TIM_P, return
-   -1, 0, or 1 as the adjustment to add to the year for the ISO week
-   numbering used in "%g%G%V", avoiding overflow.  */
-static int
-_DEFUN (iso_year_adjust, (tim_p),
-	_CONST struct tm *tim_p)
-{
-  /* Account for fact that tm_year==0 is year 1900.  */
-  int leap = isleap (tim_p->tm_year + (YEAR_BASE
-				       - (tim_p->tm_year < 0 ? 0 : 2000)));
-
-  /* Pack the yday, wday, and leap year into a single int since there are so
-     many disparate cases.  */
-#define PACK(yd, wd, lp) (((yd) << 4) + (wd << 1) + (lp))
-  switch (PACK (tim_p->tm_yday, tim_p->tm_wday, leap))
-    {
-    case PACK (0, 5, 0): /* Jan 1 is Fri, not leap.  */
-    case PACK (0, 6, 0): /* Jan 1 is Sat, not leap.  */
-    case PACK (0, 0, 0): /* Jan 1 is Sun, not leap.  */
-    case PACK (0, 5, 1): /* Jan 1 is Fri, leap year.  */
-    case PACK (0, 6, 1): /* Jan 1 is Sat, leap year.  */
-    case PACK (0, 0, 1): /* Jan 1 is Sun, leap year.  */
-    case PACK (1, 6, 0): /* Jan 2 is Sat, not leap.  */
-    case PACK (1, 0, 0): /* Jan 2 is Sun, not leap.  */
-    case PACK (1, 6, 1): /* Jan 2 is Sat, leap year.  */
-    case PACK (1, 0, 1): /* Jan 2 is Sun, leap year.  */
-    case PACK (2, 0, 0): /* Jan 3 is Sun, not leap.  */
-    case PACK (2, 0, 1): /* Jan 3 is Sun, leap year.  */
-      return -1; /* Belongs to last week of previous year.  */
-    case PACK (362, 1, 0): /* Dec 29 is Mon, not leap.  */
-    case PACK (363, 1, 1): /* Dec 29 is Mon, leap year.  */
-    case PACK (363, 1, 0): /* Dec 30 is Mon, not leap.  */
-    case PACK (363, 2, 0): /* Dec 30 is Tue, not leap.  */
-    case PACK (364, 1, 1): /* Dec 30 is Mon, leap year.  */
-    case PACK (364, 2, 1): /* Dec 30 is Tue, leap year.  */
-    case PACK (364, 1, 0): /* Dec 31 is Mon, not leap.  */
-    case PACK (364, 2, 0): /* Dec 31 is Tue, not leap.  */
-    case PACK (364, 3, 0): /* Dec 31 is Wed, not leap.  */
-    case PACK (365, 1, 1): /* Dec 31 is Mon, leap year.  */
-    case PACK (365, 2, 1): /* Dec 31 is Tue, leap year.  */
-    case PACK (365, 3, 1): /* Dec 31 is Wed, leap year.  */
-      return 1; /* Belongs to first week of next year.  */
-    }
-  return 0; /* Belongs to specified year.  */
-#undef PACK
-}
-
 size_t
 _DEFUN (strftime, (s, maxsize, format, tim_p),
 	char *s _AND
@@ -341,9 +182,6 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
 	break;
 
       format++;
-      if (*format == 'E' || *format == 'O')
-	format++;
-
       switch (*format)
 	{
 	case 'a':
@@ -367,7 +205,6 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
 	    }
 	  break;
 	case 'b':
-	case 'h':
 	  for (i = 0; i < 3; i++)
 	    {
 	      if (count < maxsize - 1)
@@ -388,141 +225,41 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
 	    }
 	  break;
 	case 'c':
-	  {
-	    /* Length is not known because of %C%y, so recurse. */
-	    size_t adjust = strftime (&s[count], maxsize - count,
-				      "%a %b %e %H:%M:%S %C%y", tim_p);
-	    if (adjust > 0)
-	      count += adjust;
-	    else
-	      return 0;
-	  }
-	  break;
-	case 'C':
-	  {
-	    /* Examples of (tm_year + YEAR_BASE) that show how %Y == %C%y
-	       with 32-bit int.
-	       %Y		%C		%y
-	       2147485547	21474855	47
-	       10000		100		00
-	       9999		99		99
-	       0999		09		99
-	       0099		00		99
-	       0001		00		01
-	       0000		00		00
-	       -001		-0		01
-	       -099		-0		99
-	       -999		-9		99
-	       -1000		-10		00
-	       -10000		-100		00
-	       -2147481748	-21474817	48
-
-	       Be careful of both overflow and sign adjustment due to the
-	       asymmetric range of years.
-	    */
-	    int neg = tim_p->tm_year < -YEAR_BASE;
-	    int century = tim_p->tm_year >= 0
-	      ? tim_p->tm_year / 100 + YEAR_BASE / 100
-	      : abs (tim_p->tm_year + YEAR_BASE) / 100;
-            count += snprintf (&s[count], maxsize - count, "%s%.*d",
-                               neg ? "-" : "", 2 - neg, century);
-            if (count >= maxsize)
-              return 0;
-	  }
-	  break;
-	case 'd':
-	case 'e':
-	  if (count < maxsize - 2)
-	    {
-	      sprintf (&s[count], *format == 'd' ? "%.2d" : "%2d",
-		       tim_p->tm_mday);
-	      count += 2;
-	    }
-	  else
-	    return 0;
-	  break;
-	case 'D':
-	case 'x':
-	  /* %m/%d/%y */
-	  if (count < maxsize - 8)
+	  if (count < maxsize - 24)
 	    {
-	      sprintf (&s[count], "%.2d/%.2d/%.2d",
-		       tim_p->tm_mon + 1, tim_p->tm_mday,
-		       tim_p->tm_year >= 0 ? tim_p->tm_year % 100
-		       : abs (tim_p->tm_year + YEAR_BASE) % 100);
-	      count += 8;
+	      for (i = 0; i < 3; i++)
+		s[count++] =
+		  dname[tim_p->tm_wday][i];
+	      s[count++] = ' ';
+	      for (i = 0; i < 3; i++)
+		s[count++] =
+		  mname[tim_p->tm_mon][i];
+
+	      sprintf (&s[count],
+		       " %.2d %2.2d:%2.2d:%2.2d %.4d",
+		       tim_p->tm_mday, tim_p->tm_hour,
+		       tim_p->tm_min,
+		       tim_p->tm_sec, 1900 +
+		       tim_p->tm_year);
+	      count += 17;
 	    }
 	  else
 	    return 0;
 	  break;
-        case 'F':
-	  {
-	    /* Length is not known because of %C%y, so recurse. */
-	    size_t adjust = strftime (&s[count], maxsize - count,
-				      "%C%y-%m-%d", tim_p);
-	    if (adjust > 0)
-	      count += adjust;
-	    else
-	      return 0;
-	  }
-          break;
-        case 'g':
+	case 'd':
 	  if (count < maxsize - 2)
 	    {
-	      /* Be careful of both overflow and negative years, thanks to
-		 the asymmetric range of years.  */
-	      int adjust = iso_year_adjust (tim_p);
-	      int year = tim_p->tm_year >= 0 ? tim_p->tm_year % 100
-		: abs (tim_p->tm_year + YEAR_BASE) % 100;
-	      if (adjust < 0 && tim_p->tm_year <= -YEAR_BASE)
-		adjust = 1;
-	      else if (adjust > 0 && tim_p->tm_year < -YEAR_BASE)
-		adjust = -1;
 	      sprintf (&s[count], "%.2d",
-		       ((year + adjust) % 100 + 100) % 100);
+		       tim_p->tm_mday);
 	      count += 2;
 	    }
 	  else
 	    return 0;
-          break;
-        case 'G':
-	  {
-	    /* See the comments for 'C' and 'Y'; this is a variable length
-	       field.  Although there is no requirement for a minimum number
-	       of digits, we use 4 for consistency with 'Y'.  */
-	    int neg = tim_p->tm_year < -YEAR_BASE;
-	    int adjust = iso_year_adjust (tim_p);
-	    int century = tim_p->tm_year >= 0
-	      ? tim_p->tm_year / 100 + YEAR_BASE / 100
-	      : abs (tim_p->tm_year + YEAR_BASE) / 100;
-	    int year = tim_p->tm_year >= 0 ? tim_p->tm_year % 100
-	      : abs (tim_p->tm_year + YEAR_BASE) % 100;
-	    if (adjust < 0 && tim_p->tm_year <= -YEAR_BASE)
-	      neg = adjust = 1;
-	    else if (adjust > 0 && neg)
-	      adjust = -1;
-	    year += adjust;
-	    if (year == -1)
-	      {
-		year = 99;
-		--century;
-	      }
-	    else if (year == 100)
-	      {
-		year = 0;
-		++century;
-	      }
-            count += snprintf (&s[count], maxsize - count, "%s%.*d%.2d",
-                               neg ? "-" : "", 2 - neg, century, year);
-            if (count >= maxsize)
-              return 0;
-	  }
-          break;
+	  break;
 	case 'H':
-	case 'k':
 	  if (count < maxsize - 2)
 	    {
-	      sprintf (&s[count], *format == 'k' ? "%2d" : "%.2d",
+	      sprintf (&s[count], "%2.2d",
 		       tim_p->tm_hour);
 	      count += 2;
 	    }
@@ -530,7 +267,6 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
 	    return 0;
 	  break;
 	case 'I':
-	case 'l':
 	  if (count < maxsize - 2)
 	    {
 	      if (tim_p->tm_hour == 0 ||
@@ -541,7 +277,7 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
 		}
 	      else
 		{
-		  sprintf (&s[count], *format == 'I' ? "%.2d" : "%2d",
+		  sprintf (&s[count], "%.2d",
 			   tim_p->tm_hour % 12);
 		  count += 2;
 		}
@@ -572,19 +308,13 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
 	case 'M':
 	  if (count < maxsize - 2)
 	    {
-	      sprintf (&s[count], "%.2d",
+	      sprintf (&s[count], "%2.2d",
 		       tim_p->tm_min);
 	      count += 2;
 	    }
 	  else
 	    return 0;
 	  break;
-	case 'n':
-	  if (count < maxsize - 1)
-	    s[count++] = '\n';
-	  else
-	    return 0;
-	  break;
 	case 'p':
 	  if (count < maxsize - 2)
 	    {
@@ -598,133 +328,76 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
 	  else
 	    return 0;
 	  break;
-	case 'r':
-	  if (count < maxsize - 11)
+	case 'S':
+	  if (count < maxsize - 2)
 	    {
-	      if (tim_p->tm_hour == 0 ||
-		  tim_p->tm_hour == 12)
-		{
-		  s[count++] = '1';
-		  s[count++] = '2';
-		}
-	      else
-		{
-		  sprintf (&s[count], "%.2d", tim_p->tm_hour % 12);
-		  count += 2;
-		}
-	      s[count++] = ':';
-	      sprintf (&s[count], "%.2d",
-		       tim_p->tm_min);
-	      count += 2;
-	      s[count++] = ':';
-	      sprintf (&s[count], "%.2d",
+	      sprintf (&s[count], "%2.2d",
 		       tim_p->tm_sec);
 	      count += 2;
-	      s[count++] = ' ';
-	      if (tim_p->tm_hour < 12)
-		s[count++] = 'A';
-	      else
-		s[count++] = 'P';
-
-	      s[count++] = 'M';
 	    }
 	  else
 	    return 0;
 	  break;
-        case 'R':
-          if (count < maxsize - 5)
-            {
-              sprintf (&s[count], "%.2d:%.2d", tim_p->tm_hour, tim_p->tm_min);
-              count += 5;
-            }
-          else
-            return 0;
-          break;
-	case 'S':
+	case 'U':
 	  if (count < maxsize - 2)
 	    {
-	      sprintf (&s[count], "%.2d",
-		       tim_p->tm_sec);
+	      sprintf (&s[count], "%2.2d",
+		       (tim_p->tm_yday + 7 -
+			tim_p->tm_wday) / 7);
 	      count += 2;
 	    }
 	  else
 	    return 0;
 	  break;
-	case 't':
+	case 'w':
 	  if (count < maxsize - 1)
-	    s[count++] = '\t';
+	    {
+	      sprintf (&s[count], "%1.1d",
+		       tim_p->tm_wday);
+	      count++;
+	    }
 	  else
 	    return 0;
 	  break;
-        case 'T':
-        case 'X':
-          if (count < maxsize - 8)
-            {
-              sprintf (&s[count], "%.2d:%.2d:%.2d", tim_p->tm_hour,
-                       tim_p->tm_min, tim_p->tm_sec);
-              count += 8;
-            }
-          else
-            return 0;
-          break;
-        case 'u':
-          if (count < maxsize - 1)
-            {
-              if (tim_p->tm_wday == 0)
-                s[count++] = '7';
-              else
-                s[count++] = '0' + tim_p->tm_wday;
-            }
-          else
-            return 0;
-          break;
-	case 'U':
+	case 'W':
 	  if (count < maxsize - 2)
 	    {
-	      sprintf (&s[count], "%.2d",
+	      int wday = (tim_p->tm_wday) ? tim_p->tm_wday - 1 : 6;
+	      sprintf (&s[count], "%2.2d",
 		       (tim_p->tm_yday + 7 -
-			tim_p->tm_wday) / 7);
+			wday) / 7);
 	      count += 2;
 	    }
 	  else
 	    return 0;
 	  break;
-        case 'V':
-	  if (count < maxsize - 2)
+	case 'x':
+	  if (count < maxsize - 15)
 	    {
-	      int adjust = iso_year_adjust (tim_p);
-	      int wday = (tim_p->tm_wday) ? tim_p->tm_wday - 1 : 6;
-	      int week = (tim_p->tm_yday + 10 - wday) / 7;
-	      if (adjust > 0)
-		week = 1;
-	      else if (adjust < 0)
-		/* Previous year has 53 weeks if current year starts on
-		   Fri, and also if current year starts on Sat and
-		   previous year was leap year.  */
-		week = 52 + (4 >= (wday - tim_p->tm_yday
-				   - isleap (tim_p->tm_year
-					     + (YEAR_BASE - 1
-						- (tim_p->tm_year < 0
-						   ? 0 : 2000)))));
-	      sprintf (&s[count], "%.2d", week);
-	      count += 2;
+	      for (i = 0; i < 3; i++)
+		s[count++] =
+		  dname[tim_p->tm_wday][i];
+	      s[count++] = ' ';
+	      for (i = 0; i < 3; i++)
+		s[count++] =
+		  mname[tim_p->tm_mon][i];
+
+	      sprintf (&s[count],
+		       " %.2d %.4d", tim_p->tm_mday,
+		       1900 + tim_p->tm_year);
+	      count += 8;
 	    }
 	  else
 	    return 0;
-          break;
-	case 'w':
-	  if (count < maxsize - 1)
-            s[count++] = '0' + tim_p->tm_wday;
-	  else
-	    return 0;
 	  break;
-	case 'W':
-	  if (count < maxsize - 2)
+	case 'X':
+	  if (count < maxsize - 8)
 	    {
-	      int wday = (tim_p->tm_wday) ? tim_p->tm_wday - 1 : 6;
-	      sprintf (&s[count], "%.2d",
-		       (tim_p->tm_yday + 7 - wday) / 7);
-	      count += 2;
+	      sprintf (&s[count],
+		       "%2.2d:%2.2d:%2.2d",
+		       tim_p->tm_hour, tim_p->tm_min,
+		       tim_p->tm_sec);
+	      count += 8;
 	    }
 	  else
 	    return 0;
@@ -732,66 +405,27 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
 	case 'y':
 	  if (count < maxsize - 2)
 	    {
-	      /* Be careful of both overflow and negative years, thanks to
-		 the asymmetric range of years.  */
-	      int year = tim_p->tm_year >= 0 ? tim_p->tm_year % 100
-		: abs (tim_p->tm_year + YEAR_BASE) % 100;
-	      sprintf (&s[count], "%.2d", year);
+	      /* The year could be greater than 100, so we need the value
+		 modulo 100.  The year could be negative, so we need to
+		 correct for a possible negative remainder.  */
+	      sprintf (&s[count], "%2.2d",
+		       (tim_p->tm_year % 100 + 100) % 100);
 	      count += 2;
 	    }
 	  else
 	    return 0;
 	  break;
 	case 'Y':
-	  {
-	    /* Length is not known because of %C%y, so recurse. */
-	    size_t adjust = strftime (&s[count], maxsize - count,
-				      "%C%y", tim_p);
-	    if (adjust > 0)
-	      count += adjust;
-	    else
-	      return 0;
-	  }
-	  break;
-        case 'z':
-          if (tim_p->tm_isdst >= 0)
-            {
-	      if (count < maxsize - 5)
-		{
-		  long offset;
-		  __tzinfo_type *tz = __gettzinfo ();
-		  TZ_LOCK;
-		  /* The sign of this is exactly opposite the envvar TZ.  We
-		     could directly use the global _timezone for tm_isdst==0,
-		     but have to use __tzrule for daylight savings.  */
-		  offset = -tz->__tzrule[tim_p->tm_isdst > 0].offset;
-		  TZ_UNLOCK;
-		  sprintf (&s[count], "%+03ld%.2ld", offset / SECSPERHOUR,
-			   labs (offset / SECSPERMIN) % 60L);
-		  count += 5;
-		}
-	      else
-		return 0;
-            }
-          break;
-	case 'Z':
-	  if (tim_p->tm_isdst >= 0)
+	  if (count < maxsize - 4)
 	    {
-	      int size;
-	      TZ_LOCK;
-	      size = strlen(_tzname[tim_p->tm_isdst > 0]);
-	      for (i = 0; i < size; i++)
-		{
-		  if (count < maxsize - 1)
-		    s[count++] = _tzname[tim_p->tm_isdst > 0][i];
-		  else
-		    {
-		      TZ_UNLOCK;
-		      return 0;
-		    }
-		}
-	      TZ_UNLOCK;
+	      sprintf (&s[count], "%.4d",
+		       1900 + tim_p->tm_year);
+	      count += 4;
 	    }
+	  else
+	    return 0;
+	  break;
+	case 'Z':
 	  break;
 	case '%':
 	  if (count < maxsize - 1)
@@ -805,8 +439,7 @@ _DEFUN (strftime, (s, maxsize, format, tim_p),
       else
 	break;
     }
-  if (maxsize)
-    s[count] = '\0';
+  s[count] = '\0';
 
   return count;
 }
diff --git a/newlib/libc/time/strptime.c b/newlib/libc/time/strptime.c
deleted file mode 100644
index 1277724..0000000
--- a/newlib/libc/time/strptime.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright (c) 1999 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden). 
- * All rights reserved. 
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met: 
- *
- * 1. Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright 
- *    notice, this list of conditions and the following disclaimer in the 
- *    documentation and/or other materials provided with the distribution. 
- *
- * 3. Neither the name of KTH nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY KTH AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KTH OR ITS CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-
-#include <stddef.h>
-#include <stdio.h>
-#include <time.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-static const char *abb_weekdays[] = {
-    "Sun",
-    "Mon",
-    "Tue",
-    "Wed",
-    "Thu",
-    "Fri",
-    "Sat",
-    NULL
-};
-
-static const char *full_weekdays[] = {
-    "Sunday",
-    "Monday",
-    "Tuesday",
-    "Wednesday",
-    "Thursday",
-    "Friday",
-    "Saturday",
-    NULL
-};
-
-static const char *abb_month[] = {
-    "Jan",
-    "Feb",
-    "Mar",
-    "Apr",
-    "May",
-    "Jun",
-    "Jul",
-    "Aug",
-    "Sep",
-    "Oct",
-    "Nov",
-    "Dec",
-    NULL
-};
-
-static const char *full_month[] = {
-    "January",
-    "February",
-    "March",
-    "April",
-    "May",
-    "June",
-    "July",
-    "August",
-    "September",
-    "October",
-    "November",
-    "December",
-    NULL,
-};
-
-static const char *ampm[] = {
-    "am",
-    "pm",
-    NULL
-};
-
-/*
- * tm_year is relative this year 
- */
-const int tm_year_base = 1900;
-
-/*
- * Return TRUE iff `year' was a leap year.
- * Needed for strptime.
- */
-static int
-is_leap_year (int year)
-{
-    return (year % 4) == 0 && ((year % 100) != 0 || (year % 400) == 0);
-}
-
-/* Needed for strptime. */
-static int
-match_string (const char **buf, const char **strs)
-{
-    int i = 0;
-
-    for (i = 0; strs[i] != NULL; ++i) {
-	int len = strlen (strs[i]);
-
-	if (strncasecmp (*buf, strs[i], len) == 0) {
-	    *buf += len;
-	    return i;
-	}
-    }
-    return -1;
-}
-
-/* Needed for strptime. */
-static int
-first_day (int year)
-{
-    int ret = 4;
-
-    for (; year > 1970; --year)
-	ret = (ret + 365 + is_leap_year (year) ? 1 : 0) % 7;
-    return ret;
-}
-
-/*
- * Set `timeptr' given `wnum' (week number [0, 53])
- * Needed for strptime
- */
-
-static void
-set_week_number_sun (struct tm *timeptr, int wnum)
-{
-    int fday = first_day (timeptr->tm_year + tm_year_base);
-
-    timeptr->tm_yday = wnum * 7 + timeptr->tm_wday - fday;
-    if (timeptr->tm_yday < 0) {
-	timeptr->tm_wday = fday;
-	timeptr->tm_yday = 0;
-    }
-}
-
-/*
- * Set `timeptr' given `wnum' (week number [0, 53])
- * Needed for strptime
- */
-
-static void
-set_week_number_mon (struct tm *timeptr, int wnum)
-{
-    int fday = (first_day (timeptr->tm_year + tm_year_base) + 6) % 7;
-
-    timeptr->tm_yday = wnum * 7 + (timeptr->tm_wday + 6) % 7 - fday;
-    if (timeptr->tm_yday < 0) {
-	timeptr->tm_wday = (fday + 1) % 7;
-	timeptr->tm_yday = 0;
-    }
-}
-
-/*
- * Set `timeptr' given `wnum' (week number [0, 53])
- * Needed for strptime
- */
-static void
-set_week_number_mon4 (struct tm *timeptr, int wnum)
-{
-    int fday = (first_day (timeptr->tm_year + tm_year_base) + 6) % 7;
-    int offset = 0;
-
-    if (fday < 4)
-	offset += 7;
-
-    timeptr->tm_yday = offset + (wnum - 1) * 7 + timeptr->tm_wday - fday;
-    if (timeptr->tm_yday < 0) {
-	timeptr->tm_wday = fday;
-	timeptr->tm_yday = 0;
-    }
-}
-
-/* strptime: roken */
-//extern "C"
-char *
-//strptime (const char *buf, const char *format, struct tm *timeptr)
-_DEFUN (strptime, (buf, format, timeptr),
-	_CONST char *buf _AND
-	_CONST char *format _AND
-	struct tm *timeptr)
-{
-    char c;
-
-    for (; (c = *format) != '\0'; ++format) {
-	char *s;
-	int ret;
-
-	if (isspace (c)) {
-	    while (isspace (*buf))
-		++buf;
-	} else if (c == '%' && format[1] != '\0') {
-	    c = *++format;
-	    if (c == 'E' || c == 'O')
-		c = *++format;
-	    switch (c) {
-	    case 'A' :
-		ret = match_string (&buf, full_weekdays);
-		if (ret < 0)
-		    return NULL;
-		timeptr->tm_wday = ret;
-		break;
-	    case 'a' :
-		ret = match_string (&buf, abb_weekdays);
-		if (ret < 0)
-		    return NULL;
-		timeptr->tm_wday = ret;
-		break;
-	    case 'B' :
-		ret = match_string (&buf, full_month);
-		if (ret < 0)
-		    return NULL;
-		timeptr->tm_mon = ret;
-		break;
-	    case 'b' :
-	    case 'h' :
-		ret = match_string (&buf, abb_month);
-		if (ret < 0)
-		    return NULL;
-		timeptr->tm_mon = ret;
-		break;
-	    case 'C' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_year = (ret * 100) - tm_year_base;
-		buf = s;
-		break;
-	    case 'c' :		/* %a %b %e %H:%M:%S %Y */
-		s = strptime (buf, "%a %b %e %H:%M:%S %Y", timeptr);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		break;
-	    case 'D' :		/* %m/%d/%y */
-		s = strptime (buf, "%m/%d/%y", timeptr);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		break;
-	    case 'd' :
-	    case 'e' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_mday = ret;
-		buf = s;
-		break;
-	    case 'H' :
-	    case 'k' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_hour = ret;
-		buf = s;
-		break;
-	    case 'I' :
-	    case 'l' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		if (ret == 12)
-		    timeptr->tm_hour = 0;
-		else
-		    timeptr->tm_hour = ret;
-		buf = s;
-		break;
-	    case 'j' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_yday = ret - 1;
-		buf = s;
-		break;
-	    case 'm' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_mon = ret - 1;
-		buf = s;
-		break;
-	    case 'M' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_min = ret;
-		buf = s;
-		break;
-	    case 'n' :
-		if (*buf == '\n')
-		    ++buf;
-		else
-		    return NULL;
-		break;
-	    case 'p' :
-		ret = match_string (&buf, ampm);
-		if (ret < 0)
-		    return NULL;
-		if (timeptr->tm_hour == 0) {
-		    if (ret == 1)
-			timeptr->tm_hour = 12;
-		} else
-		    timeptr->tm_hour += 12;
-		break;
-	    case 'r' :		/* %I:%M:%S %p */
-		s = strptime (buf, "%I:%M:%S %p", timeptr);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		break;
-	    case 'R' :		/* %H:%M */
-		s = strptime (buf, "%H:%M", timeptr);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		break;
-	    case 'S' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_sec = ret;
-		buf = s;
-		break;
-	    case 't' :
-		if (*buf == '\t')
-		    ++buf;
-		else
-		    return NULL;
-		break;
-	    case 'T' :		/* %H:%M:%S */
-	    case 'X' :
-		s = strptime (buf, "%H:%M:%S", timeptr);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		break;
-	    case 'u' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_wday = ret - 1;
-		buf = s;
-		break;
-	    case 'w' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_wday = ret;
-		buf = s;
-		break;
-	    case 'U' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		set_week_number_sun (timeptr, ret);
-		buf = s;
-		break;
-	    case 'V' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		set_week_number_mon4 (timeptr, ret);
-		buf = s;
-		break;
-	    case 'W' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		set_week_number_mon (timeptr, ret);
-		buf = s;
-		break;
-	    case 'x' :
-		s = strptime (buf, "%Y:%m:%d", timeptr);
-		if (s == NULL)
-		    return NULL;
-		buf = s;
-		break;
-	    case 'y' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		if (ret < 70)
-		    timeptr->tm_year = 100 + ret;
-		else
-		    timeptr->tm_year = ret;
-		buf = s;
-		break;
-	    case 'Y' :
-		ret = strtol (buf, &s, 10);
-		if (s == buf)
-		    return NULL;
-		timeptr->tm_year = ret - tm_year_base;
-		buf = s;
-		break;
-	    case 'Z' :
-		/* Unsupported. Just ignore.  */
-		break;
-	    case '\0' :
-		--format;
-		/* FALLTHROUGH */
-	    case '%' :
-		if (*buf == '%')
-		    ++buf;
-		else
-		    return NULL;
-		break;
-	    default :
-		if (*buf == '%' || *++buf == c)
-		    ++buf;
-		else
-		    return NULL;
-		break;
-	    }
-	} else {
-	    if (*buf == c)
-		++buf;
-	    else
-		return NULL;
-	}
-    }
-    return (char *)buf;
-}
-
diff --git a/newlib/libc/time/time.tex b/newlib/libc/time/time.tex
index 4859404..3d6dabb 100644
--- a/newlib/libc/time/time.tex
+++ b/newlib/libc/time/time.tex
@@ -18,28 +18,28 @@ the following fields:
 
 @table @code
 @item tm_sec
-Seconds, between 0 and 60 inclusive (60 allows for leap seconds).
+Seconds.
 
 @item tm_min
-Minutes, between 0 and 59 inclusive.
+Minutes.
 
 @item tm_hour
-Hours, between 0 and 23 inclusive.
+Hours.
 
 @item tm_mday
-Day of the month, between 1 and 31 inclusive.
+Day.
 
 @item tm_mon
-Month, between 0 (January) and 11 (December).
+Month.
 
 @item tm_year
-Year (since 1900), can be negative for earlier years.
+Year (since 1900).
 
 @item tm_wday
-Day of week, between 0 (Sunday) and 6 (Saturday).
+Day of week: the number of days since Sunday.
 
 @item tm_yday
-Number of days elapsed since last January 1, between 0 and 365 inclusive.
+Number of days elapsed since last January 1.
 
 @item tm_isdst
 Daylight Savings Time flag: positive means DST in effect, zero means DST
@@ -56,8 +56,6 @@ not in effect, negative means no information about DST is available.
 * mktime::      Convert time to arithmetic representation
 * strftime::    Flexible calendar time formatter
 * time::        Get current calendar time (as single number)
-* __tz_lock::   Lock time zone global variables
-* tzset::       Set timezone info
 @end menu
 
 @page
@@ -86,9 +84,3 @@ not in effect, negative means no information about DST is available.
 
 @page
 @include time/time.def
-
-@page
-@include time/tzlock.def
-
-@page
-@include time/tzset.def
diff --git a/newlib/libc/time/tzlock.c b/newlib/libc/time/tzlock.c
deleted file mode 100644
index ccfef78..0000000
--- a/newlib/libc/time/tzlock.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-FUNCTION
-<<__tz_lock>>, <<__tz_unlock>>---lock time zone global variables
-
-INDEX
-	__tz_lock
-INDEX
-	__tz_unlock
-
-ANSI_SYNOPSIS
-	#include "local.h"
-	void __tz_lock (void);
-	void __tz_unlock (void);
-
-TRAD_SYNOPSIS
-	void __tz_lock();
-	void __tz_unlock();
-
-DESCRIPTION
-The <<tzset>> facility functions call these functions when they need to
-ensure the values of global variables.  The version of these routines
-supplied in the library use the lock API defined in sys/lock.h.  If multiple
-threads of execution can call the time functions and give up scheduling in
-the middle, then you you need to define your own versions of these functions
-in order to safely lock the time zone variables during a call.  If you do
-not, the results of <<localtime>>, <<mktime>>, <<ctime>>, and <<strftime>>
-are undefined.
-
-The lock <<__tz_lock>> may not be called recursively; that is,
-a call <<__tz_lock>> will always lock all subsequent <<__tz_lock>> calls
-until the corresponding <<__tz_unlock>> call on the same thread is made.
-*/
-
-#include <_ansi.h>
-#include "local.h"
-#include <sys/lock.h>
-
-#ifndef __SINGLE_THREAD__
-__LOCK_INIT(static, __tz_lock_object);
-#endif
-
-_VOID
-_DEFUN_VOID (__tz_lock)
-{
-#ifndef __SINGLE_THREAD__
-  __lock_acquire(__tz_lock_object);
-#endif
-}
-
-_VOID
-_DEFUN_VOID (__tz_unlock)
-{
-#ifndef __SINGLE_THREAD__
-  __lock_release(__tz_lock_object);
-#endif
-}
diff --git a/newlib/libc/time/tzset.c b/newlib/libc/time/tzset.c
deleted file mode 100644
index c70e3ee..0000000
--- a/newlib/libc/time/tzset.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-FUNCTION
-<<tzset>>---set timezone characteristics from TZ environment variable
-
-INDEX
-	tzset
-
-ANSI_SYNOPSIS
-	#include <time.h>
-	void tzset(void);
-	void _tzset_r (struct _reent *);
-
-TRAD_SYNOPSIS
-	#include <time.h>
-	void tzset();
-	void _tzset_r (reent_ptr)
-        struct _reent *reent_ptr;
-
-DESCRIPTION
-<<tzset>> examines the TZ environment variable and sets up the three
-external variables: <<_timezone>>, <<_daylight>>, and <<tzname>>.  The
-value of <<_timezone>> shall be the offset from the current time zone
-to GMT.  The value of <<_daylight>> shall be 0 if there is no daylight
-savings time for the current time zone, otherwise it will be non-zero.
-The <<tzname>> array has two entries: the first is the name of the
-standard time zone, the second is the name of the daylight-savings time
-zone.
-
-The TZ environment variable is expected to be in the following POSIX
-format:
-
-  stdoffset1[dst[offset2][,start[/time1],end[/time2]]]
-
-where: std is the name of the standard time-zone (minimum 3 chars)
-       offset1 is the value to add to local time to arrive at Universal time
-         it has the form:  hh[:mm[:ss]]
-       dst is the name of the alternate (daylight-savings) time-zone (min 3 chars)
-       offset2 is the value to add to local time to arrive at Universal time
-         it has the same format as the std offset
-       start is the day that the alternate time-zone starts
-       time1 is the optional time that the alternate time-zone starts
-         (this is in local time and defaults to 02:00:00 if not specified)
-       end is the day that the alternate time-zone ends
-       time2 is the time that the alternate time-zone ends
-         (it is in local time and defaults to 02:00:00 if not specified)
-
-Note that there is no white-space padding between fields.  Also note that
-if TZ is null, the default is Universal GMT which has no daylight-savings
-time.  If TZ is empty, the default EST5EDT is used.
-
-The function <<_tzset_r>> is identical to <<tzset>> only it is reentrant
-and is used for applications that use multiple threads.
-
-RETURNS
-There is no return value.
-
-PORTABILITY
-<<tzset>> is part of the POSIX standard.
-
-Supporting OS subroutine required: None
-*/
-
-#include <_ansi.h>
-#include <reent.h>
-#include <time.h>
-#include "local.h"
-
-_VOID
-_DEFUN_VOID (tzset)
-{
-  _tzset_r (_REENT);
-}
diff --git a/newlib/libc/time/tzset_r.c b/newlib/libc/time/tzset_r.c
deleted file mode 100644
index 36b87d7..0000000
--- a/newlib/libc/time/tzset_r.c
+++ /dev/null
@@ -1,199 +0,0 @@
-#include <_ansi.h>
-#include <reent.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include "local.h"
-
-static char __tzname_std[11];
-static char __tzname_dst[11];
-static char *prev_tzenv = NULL;
-
-_VOID
-_DEFUN (_tzset_r, (reent_ptr),
-        struct _reent *reent_ptr)
-{
-  char *tzenv;
-  unsigned short hh, mm, ss, m, w, d;
-  int sign, n;
-  int i, ch;
-  __tzinfo_type *tz = __gettzinfo ();
-
-  if ((tzenv = _getenv_r (reent_ptr, "TZ")) == NULL)
-      {
-	TZ_LOCK;
-	_timezone = 0;
-	_daylight = 0;
-	_tzname[0] = "GMT";
-	_tzname[1] = "GMT";
-	TZ_UNLOCK;
-	return;
-      }
-
-  TZ_LOCK;
-
-  if (prev_tzenv != NULL && strcmp(tzenv, prev_tzenv) == 0)
-    {
-      TZ_UNLOCK;
-      return;
-    }
-
-  free(prev_tzenv);
-  prev_tzenv = _malloc_r (reent_ptr, strlen(tzenv) + 1);
-  if (prev_tzenv != NULL)
-    strcpy (prev_tzenv, tzenv);
-
-  /* ignore implementation-specific format specifier */
-  if (*tzenv == ':')
-    ++tzenv;  
-
-  if (sscanf (tzenv, "%10[^0-9,+-]%n", __tzname_std, &n) <= 0)
-    {
-      TZ_UNLOCK;
-      return;
-    }
- 
-  tzenv += n;
-
-  sign = 1;
-  if (*tzenv == '-')
-    {
-      sign = -1;
-      ++tzenv;
-    }
-  else if (*tzenv == '+')
-    ++tzenv;
-
-  mm = 0;
-  ss = 0;
- 
-  if (sscanf (tzenv, "%hu%n:%hu%n:%hu%n", &hh, &n, &mm, &n, &ss, &n) < 1)
-    {
-      TZ_UNLOCK;
-      return;
-    }
-  
-  tz->__tzrule[0].offset = sign * (ss + SECSPERMIN * mm + SECSPERHOUR * hh);
-  _tzname[0] = __tzname_std;
-  tzenv += n;
-  
-  if (sscanf (tzenv, "%10[^0-9,+-]%n", __tzname_dst, &n) <= 0)
-    {
-      _tzname[1] = _tzname[0];
-      TZ_UNLOCK;
-      return;
-    }
-  else
-    _tzname[1] = __tzname_dst;
-
-  tzenv += n;
-
-  /* otherwise we have a dst name, look for the offset */
-  sign = 1;
-  if (*tzenv == '-')
-    {
-      sign = -1;
-      ++tzenv;
-    }
-  else if (*tzenv == '+')
-    ++tzenv;
-
-  hh = 0;  
-  mm = 0;
-  ss = 0;
-  
-  if (sscanf (tzenv, "%hu%n:%hu%n:%hu%n", &hh, &n, &mm, &n, &ss, &n) <= 0)
-    tz->__tzrule[1].offset = tz->__tzrule[0].offset - 3600;
-  else
-    tz->__tzrule[1].offset = sign * (ss + SECSPERMIN * mm + SECSPERHOUR * hh);
-
-  tzenv += n;
-
-  for (i = 0; i < 2; ++i)
-    {
-      if (*tzenv == ',')
-        ++tzenv;
-
-      if (*tzenv == 'M')
-	{
-	  if (sscanf (tzenv, "M%hu%n.%hu%n.%hu%n", &m, &n, &w, &n, &d, &n) != 3 ||
-	      m < 1 || m > 12 || w < 1 || w > 5 || d > 6)
-	    {
-	      TZ_UNLOCK;
-	      return;
-	    }
-	  
-	  tz->__tzrule[i].ch = 'M';
-	  tz->__tzrule[i].m = m;
-	  tz->__tzrule[i].n = w;
-	  tz->__tzrule[i].d = d;
-	  
-	  tzenv += n;
-	}
-      else 
-	{
-	  char *end;
-	  if (*tzenv == 'J')
-	    {
-	      ch = 'J';
-	      ++tzenv;
-	    }
-	  else
-	    ch = 'D';
-	  
-	  d = strtoul (tzenv, &end, 10);
-	  
-	  /* if unspecified, default to US settings */
-	  if (end == tzenv)
-	    {
-	      if (i == 0)
-		{
-		  tz->__tzrule[0].ch = 'M';
-		  tz->__tzrule[0].m = 4;
-		  tz->__tzrule[0].n = 1;
-		  tz->__tzrule[0].d = 0;
-		}
-	      else
-		{
-		  tz->__tzrule[1].ch = 'M';
-		  tz->__tzrule[1].m = 10;
-		  tz->__tzrule[1].n = 5;
-		  tz->__tzrule[1].d = 0;
-		}
-	    }
-	  else
-	    {
-	      tz->__tzrule[i].ch = ch;
-	      tz->__tzrule[i].d = d;
-	    }
-	  
-	  tzenv = end;
-	}
-      
-      /* default time is 02:00:00 am */
-      hh = 2;
-      mm = 0;
-      ss = 0;
-      n = 0;
-      
-      if (*tzenv == '/')
-	sscanf (tzenv, "/%hu%n:%hu%n:%hu%n", &hh, &n, &mm, &n, &ss, &n);
-
-      tz->__tzrule[i].s = ss + SECSPERMIN * mm + SECSPERHOUR  * hh;
-      
-      tzenv += n;
-    }
-
-  __tzcalc_limits (tz->__tzyear);
-  _timezone = tz->__tzrule[0].offset;  
-  _daylight = tz->__tzrule[0].offset != tz->__tzrule[1].offset;
-
-  TZ_UNLOCK;
-}
-
-
-
-
-
diff --git a/newlib/libc/time/tzvars.c b/newlib/libc/time/tzvars.c
deleted file mode 100644
index d1f1764..0000000
--- a/newlib/libc/time/tzvars.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <time.h>
-
-/* Global timezone variables.  */
-
-/* Default timezone to GMT */
-char *_tzname[2] = {"GMT", "GMT"};
-int _daylight = 0;
-long _timezone = 0;
-
-
diff --git a/newlib/libc/unix/Makefile.am b/newlib/libc/unix/Makefile.am
index 6ecee13..5159c0e 100644
--- a/newlib/libc/unix/Makefile.am
+++ b/newlib/libc/unix/Makefile.am
@@ -4,51 +4,18 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES = \
-	getcwd.c 	\
-	pread.c 	\
-	pwrite.c 	\
-	sigset.c
-
-## Distinguish different EL/IX level interfaces
-ELIX_2_OBJS = \
-	ttyname.$(oext)
-
-ELIX_4_OBJS = \
-	basename.$(oext)	\
-	dirname.$(oext)		\
-	getlogin.$(oext)	\
-	getpass.$(oext) 	\
-	getpwent.$(oext) 	\
-	getut.$(oext)
-
-if ELIX_LEVEL_1
-LIB_OBJS =
-else
-if ELIX_LEVEL_2
-LIB_OBJS = $(ELIX_2_OBJS)
-else
-if ELIX_LEVEL_3
-LIB_OBJS = $(ELIX_2_OBJS)
-else
-LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_4_OBJS)
-endif
-endif
-endif
+LIB_SOURCES = \
+	getpass.c sigset.c getpwent.c ttyname.c getut.c getlogin.c getcwd.c
 
 libunix_la_LDFLAGS = -Xcompiler -nostdlib
 
 if USE_LIBTOOL
 noinst_LTLIBRARIES = libunix.la
-libunix_la_SOURCES = $(GENERAL_SOURCES)
-libunix_la_LIBADD = $(LIB_OBJS)
-libunix_la_DEPENDENCIES = $(LIB_OBJS)
+libunix_la_SOURCES = $(LIB_SOURCES)
 noinst_DATA = objectlist.awk.in
 else
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = $(GENERAL_SOURCES)
-lib_a_LIBADD = $(LIB_OBJS)
-lib_a_DEPENDENCIES = $(LIB_OBJS)
+lib_a_SOURCES = $(LIB_SOURCES)
 noinst_DATA =
 endif # USE_LIBTOOL
 
diff --git a/newlib/libc/unix/Makefile.in b/newlib/libc/unix/Makefile.in
index 7d049ce..3982018 100644
--- a/newlib/libc/unix/Makefile.in
+++ b/newlib/libc/unix/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,32 +58,20 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
 CRT0 = @CRT0@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBC_EXTRA_DEF = @LIBC_EXTRA_DEF@
-LIBC_EXTRA_LIB = @LIBC_EXTRA_LIB@
 LIBC_MACHINE_LIB = @LIBC_MACHINE_LIB@
 LIBC_POSIX_LIB = @LIBC_POSIX_LIB@
 LIBC_SIGNAL_DEF = @LIBC_SIGNAL_DEF@
 LIBC_SIGNAL_LIB = @LIBC_SIGNAL_LIB@
-LIBC_STDIO64_DEF = @LIBC_STDIO64_DEF@
-LIBC_STDIO64_LIB = @LIBC_STDIO64_LIB@
 LIBC_SYSCALL_LIB = @LIBC_SYSCALL_LIB@
 LIBC_SYS_LIB = @LIBC_SYS_LIB@
 LIBC_UNIX_LIB = @LIBC_UNIX_LIB@
@@ -93,13 +81,10 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
-extra_dir = @extra_dir@
 libm_machine_dir = @libm_machine_dir@
 machine_dir = @machine_dir@
 newlib_basedir = @newlib_basedir@
@@ -110,31 +95,18 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-GENERAL_SOURCES =  	getcwd.c 		pread.c 		pwrite.c 		sigset.c
+LIB_SOURCES = \
+	getpass.c sigset.c getpwent.c ttyname.c getut.c getlogin.c getcwd.c
 
 
-ELIX_2_OBJS =  	ttyname.$(oext)
-
-
-ELIX_4_OBJS =  	basename.$(oext)		dirname.$(oext)			getlogin.$(oext)		getpass.$(oext) 		getpwent.$(oext) 		getut.$(oext)
-
-@ELIX_LEVEL_1_TRUE@LIB_OBJS = 
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = $(ELIX_2_OBJS)
-@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_4_OBJS)
-
 libunix_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libunix.la
-@USE_LIBTOOL_TRUE@libunix_la_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_TRUE@libunix_la_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@libunix_la_DEPENDENCIES = $(LIB_OBJS)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libunix.la
+@USE_LIBTOOL_TRUE@libunix_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(GENERAL_SOURCES)
-@USE_LIBTOOL_FALSE@lib_a_LIBADD = $(LIB_OBJS)
-@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = $(LIB_OBJS)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
 
 CHEWOUT_FILES = 
 
@@ -153,12 +125,14 @@ LIBRARIES =  $(noinst_LIBRARIES)
 DEFS = @DEFS@ -I. -I$(srcdir) 
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  getcwd.$(OBJEXT) pread.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@pwrite.$(OBJEXT) sigset.$(OBJEXT)
+lib_a_LIBADD = 
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  getpass.o sigset.o getpwent.o \
+@USE_LIBTOOL_FALSE@ttyname.o getut.o getlogin.o getcwd.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
-@USE_LIBTOOL_TRUE@libunix_la_OBJECTS =  getcwd.lo pread.lo pwrite.lo \
-@USE_LIBTOOL_TRUE@sigset.lo
+libunix_la_LIBADD = 
+@USE_LIBTOOL_TRUE@libunix_la_OBJECTS =  getpass.lo sigset.lo getpwent.lo \
+@USE_LIBTOOL_TRUE@ttyname.lo getut.lo getlogin.lo getcwd.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -178,7 +152,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libunix_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus unix/Makefile
 
@@ -199,11 +173,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -212,7 +181,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libc/unix/basename.c b/newlib/libc/unix/basename.c
deleted file mode 100644
index 703e532..0000000
--- a/newlib/libc/unix/basename.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2005 Shaun Jackman
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <libgen.h>
-#include <string.h>
-
-char* 
-_DEFUN (basename, (path),
-	char *path)
-{
-	char *p;
-	if( path == NULL || *path == '\0' )
-		return ".";
-	p = path + strlen(path) - 1;
-	while( *p == '/' ) {
-		if( p == path )
-			return path;
-		*p-- = '\0';
-	}
-	while( p >= path && *p != '/' )
-		p--;
-	return p + 1;
-}
diff --git a/newlib/libc/unix/dirname.c b/newlib/libc/unix/dirname.c
deleted file mode 100644
index f026e30..0000000
--- a/newlib/libc/unix/dirname.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2005 Shaun Jackman
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <libgen.h>
-#include <string.h>
-
-char *
-_DEFUN (dirname, (path),
-	char *path)
-{
-	char *p;
-	if( path == NULL || *path == '\0' )
-		return ".";
-	p = path + strlen(path) - 1;
-	while( *p == '/' ) {
-		if( p == path )
-			return path;
-		*p-- = '\0';
-	}
-	while( p >= path && *p != '/' )
-		p--;
-	return
-		p < path ? "." :
-		p == path ? "/" :
-		(*p = '\0', path);
-}
diff --git a/newlib/libc/unix/getcwd.c b/newlib/libc/unix/getcwd.c
index f57e147..826fc78 100644
--- a/newlib/libc/unix/getcwd.c
+++ b/newlib/libc/unix/getcwd.c
@@ -124,7 +124,7 @@ getcwd (pt, size)
   for (first = 1;; first = 0)
     {
       /* Stat the current level. */
-      if (stat (up, &s))
+      if (_stat (up, &s))
 	goto err;
 
       /* Save current node values. */
@@ -165,7 +165,7 @@ getcwd (pt, size)
       *bup = '\0';
 
       /* Open and stat parent directory. */
-      if (!(dir = opendir (up)) || fstat (__dirfd (dir), &s))
+      if (!(dir = _opendir (up)) || _fstat (__dirfd (dir), &s))
 	goto err;
 
       /* Add trailing slash for next directory. */
@@ -182,7 +182,7 @@ getcwd (pt, size)
 	{
 	  for (;;)
 	    {
-	      if (!(dp = readdir (dir)))
+	      if (!(dp = _readdir (dir)))
 		goto notfound;
 	      if (dp->d_ino == ino)
 		break;
@@ -191,7 +191,7 @@ getcwd (pt, size)
       else
 	for (;;)
 	  {
-	    if (!(dp = readdir (dir)))
+	    if (!(dp = _readdir (dir)))
 	      goto notfound;
 	    if (ISDOT (dp))
 	      continue;
@@ -238,7 +238,7 @@ getcwd (pt, size)
 	*--bpt = '/';
       bpt -= strlen (dp->d_name);
       bcopy (dp->d_name, bpt, strlen (dp->d_name));
-      (void) closedir (dir);
+      (void) _closedir (dir);
 
       /* Truncate any file name. */
       *bup = '\0';
diff --git a/newlib/libc/unix/getlogin.c b/newlib/libc/unix/getlogin.c
index ea4ca29..e043b02 100644
--- a/newlib/libc/unix/getlogin.c
+++ b/newlib/libc/unix/getlogin.c
@@ -19,24 +19,24 @@ getlogin ()
       || ((tty = ttyname (2)) == 0))
     return 0;
 
-  if ((utmp_fd = open (UTMP_FILE, O_RDONLY)) == -1)
+  if ((utmp_fd = _open (UTMP_FILE, O_RDONLY)) == -1)
     return 0;
 
   if (!strncmp (tty, "/dev/", 5))
     tty += 5;
 
-  while (read (utmp_fd, &utmp_buf, sizeof (utmp_buf)) == sizeof (utmp_buf))
+  while (_read (utmp_fd, &utmp_buf, sizeof (utmp_buf)) == sizeof (utmp_buf))
     {
       if (!strncmp (tty, utmp_buf.ut_line, sizeof (utmp_buf.ut_line))
 	  && utmp_buf.ut_type == USER_PROCESS)
 	{
-	  close (utmp_fd);
+	  _close (utmp_fd);
 	  memset (buf, 0, sizeof (buf));
 	  strncpy (buf, utmp_buf.ut_user, sizeof (utmp_buf.ut_user));
 	  return buf;
 	}
     }
 
-  close (utmp_fd);
+  _close (utmp_fd);
   return 0;
 }
diff --git a/newlib/libc/unix/getpass.c b/newlib/libc/unix/getpass.c
index 69327ba..db0e52d 100644
--- a/newlib/libc/unix/getpass.c
+++ b/newlib/libc/unix/getpass.c
@@ -90,7 +90,7 @@ getpass (prompt)
     if (p < buf + _PASSWORD_LEN)
       *p++ = ch;
   *p = '\0';
-  (void) write (fileno (outfp), "\n", 1);
+  (void) _write (fileno (outfp), "\n", 1);
   if (echo)
     {
       term.c_lflag |= ECHO;
diff --git a/newlib/libc/unix/getut.c b/newlib/libc/unix/getut.c
index 554ed3c..1e2b755 100644
--- a/newlib/libc/unix/getut.c
+++ b/newlib/libc/unix/getut.c
@@ -16,15 +16,15 @@ setutent ()
 {
   if (utmp_fd == -2)
     {
-      utmp_fd = open (utmp_file, O_RDONLY);
+      utmp_fd = _open (utmp_file, O_RDONLY);
     }
-  lseek (utmp_fd, 0, SEEK_SET);
+  _lseek (utmp_fd, 0, SEEK_SET);
 }
 
 void
 endutent ()
 {
-  close (utmp_fd);
+  _close (utmp_fd);
   utmp_fd = -2;
 }
 
@@ -39,7 +39,7 @@ getutent ()
 {
   if (utmp_fd == -2)
     setutent ();
-  if (read (utmp_fd, &utmp_data, sizeof (utmp_data)) < sizeof (utmp_data))
+  if (_read (utmp_fd, &utmp_data, sizeof (utmp_data)) < sizeof (utmp_data))
     return 0;
   return &utmp_data;
 }
@@ -47,7 +47,7 @@ getutent ()
 struct utmp *
 getutid (struct utmp *id)
 {
-  while (read (utmp_fd, &utmp_data, sizeof (utmp_data)) == sizeof (utmp_data))
+  while (_read (utmp_fd, &utmp_data, sizeof (utmp_data)) == sizeof (utmp_data))
     {
       switch (id->ut_type)
 	{
@@ -73,7 +73,7 @@ getutid (struct utmp *id)
 struct utmp *
 getutline (struct utmp *line)
 {
-  while (read (utmp_fd, &utmp_data, sizeof (utmp_data)) == sizeof (utmp_data))
+  while (_read (utmp_fd, &utmp_data, sizeof (utmp_data)) == sizeof (utmp_data))
     {
       if ((utmp_data.ut_type == LOGIN_PROCESS ||
 	   utmp_data.ut_type == USER_PROCESS) &&
diff --git a/newlib/libc/unix/pread.c b/newlib/libc/unix/pread.c
deleted file mode 100644
index 7208754..0000000
--- a/newlib/libc/unix/pread.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-FUNCTION
-<<pread>>---read a file from specified position
-
-INDEX
-	pread
-INDEX
-	_pread_r
-
-ANSI_SYNOPSIS
-	#include <unistd.h>
-	ssize_t pread(int <[fd]>, void *<[buf]>, size_t <[n]>, off_t <[off]>);
-	ssize_t _pread_r(struct _reent *<[rptr]>, int <[fd]>, 
-                         void *<[buf]>, size_t <[n]>, off_t <[off]>);
-
-TRAD_SYNOPSIS
-	#include <unistd.h>
-	ssize_t pread(<[fd]>, <[buf]>, <[n]>, <[off]>)
-	int <[fd]>;
-	void *<[buf]>;
-	size_t <[n]>;
-	off_t <[off]>;
-
-	ssize_t _pread_r(<[rptr]>, <[fd]>, <[buf]>, <[n]>, <[off]>)
-	struct _reent *<[rptr]>;
-	int <[fd]>;
-	void *<[buf]>;
-	size_t <[n]>;
-	off_t <[off]>;
-
-DESCRIPTION
-The <<pread>> function is similar to <<read>>.  One difference is that
-<<pread>> has an additional parameter <[off]> which is the offset to
-position in the file before reading.  The function also differs in that
-the file position is unchanged by the function (i.e. the file position
-is the same before and after a call to <<pread>>).
-
-The <<_pread_r>> function is the same as <<pread>>, only a reentrant
-struct pointer <[rptr]> is provided to preserve reentrancy.
-
-RETURNS
-<<pread>> returns the number of bytes read or <<-1>> if failure occurred.
-
-PORTABILITY
-<<pread>> is non-ANSI and is specified by the Single Unix Specification.
-
-Supporting OS subroutine required: <<read>>, <<lseek>>.
-*/
-
-#include <_ansi.h>
-#include <unistd.h>
-#include <reent.h>
-
-ssize_t
-_DEFUN (_pread_r, (rptr, fd, buf, n, off),
-     struct _reent *rptr _AND
-     int fd _AND
-     _PTR buf _AND
-     size_t n _AND
-     off_t off)
-{
-  off_t cur_pos;
-  _READ_WRITE_RETURN_TYPE num_read;
-  
-  if ((cur_pos = _lseek_r (rptr, fd, 0, SEEK_CUR)) == (off_t)-1)
-    return -1;
-
-  if (_lseek_r (rptr, fd, off, SEEK_SET) == (off_t)-1)
-    return -1;
-
-  num_read = _read_r (rptr, fd, buf, n);
-
-  if (_lseek_r (rptr, fd, cur_pos, SEEK_SET) == (off_t)-1)
-    return -1;
-
-  return (ssize_t)num_read;
-}
-
-#ifndef _REENT_ONLY
-
-ssize_t
-_DEFUN (pread, (fd, buf, n, off),
-     int fd _AND
-     _PTR buf _AND
-     size_t n _AND
-     off_t off)
-{
-  return _pread_r (_REENT, fd, buf, n, off);
-}
-
-#endif
diff --git a/newlib/libc/unix/pwrite.c b/newlib/libc/unix/pwrite.c
deleted file mode 100644
index 23979ac..0000000
--- a/newlib/libc/unix/pwrite.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-FUNCTION
-<<pwrite>>---write a file from specified position
-
-INDEX
-	pwrite
-INDEX
-	_pwrite_r
-
-ANSI_SYNOPSIS
-	#include <unistd.h>
-	ssize_t pwrite(int <[fd]>, const void *<[buf]>, 
-                       size_t <[n]>, off_t <[off]>);
-	ssize_t _pwrite_r(struct _reent *<[rptr]>, int <[fd]>, 
-                          const void *<[buf]>, size_t <[n]>, off_t <[off]>);
-
-TRAD_SYNOPSIS
-	#include <unistd.h>
-	ssize_t pwrite(<[fd]>, <[buf]>, <[n]>, <[off]>)
-	int <[fd]>;
-	const void *<[buf]>;
-	size_t <[n]>;
-	off_t <[off]>;
-
-	ssize_t _pwrite_r(<[rptr]>, <[fd]>, <[buf]>, <[n]>, <[off]>)
-	struct _reent *<[rptr]>;
-	int <[fd]>;
-	const void *<[buf]>;
-	size_t <[n]>;
-	off_t <[off]>;
-
-DESCRIPTION
-The <<pwrite>> function is similar to <<write>>.  One difference is that
-<<pwrite>> has an additional parameter <[off]> which is the offset to
-position in the file before writing.  The function also differs in that
-the file position is unchanged by the function (i.e. the file position
-is the same before and after a call to <<pwrite>>).
-
-The <<_pwrite_r>> function is the same as <<pwrite>>, only a reentrant
-struct pointer <[rptr]> is provided to preserve reentrancy.
-
-RETURNS
-<<pwrite>> returns the number of bytes written or <<-1>> if failure occurred.
-
-PORTABILITY
-<<pwrite>> is non-ANSI and is specified by the Single Unix Specification.
-
-Supporting OS subroutine required: <<write>>, <<lseek>>.
-*/
-
-#include <_ansi.h>
-#include <unistd.h>
-#include <reent.h>
-
-ssize_t
-_DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
-     struct _reent *rptr _AND
-     int fd _AND
-     _CONST _PTR buf _AND
-     size_t n _AND
-     off_t off)
-{
-  off_t cur_pos;
-  _READ_WRITE_RETURN_TYPE num_written;
-  
-  if ((cur_pos = _lseek_r (rptr, fd, 0, SEEK_CUR)) == (off_t)-1)
-    return -1;
-
-  if (_lseek_r (rptr, fd, off, SEEK_SET) == (off_t)-1)
-    return -1;
-
-  num_written = _write_r (rptr, fd, buf, n);
-
-  if (_lseek_r (rptr, fd, cur_pos, SEEK_SET) == (off_t)-1)
-    return -1;
-
-  return (ssize_t)num_written;
-}
-
-#ifndef _REENT_ONLY
-
-ssize_t
-_DEFUN (pwrite, (fd, buf, n, off),
-     int fd _AND
-     _CONST _PTR buf _AND
-     size_t n _AND
-     off_t off)
-{
-  return _pwrite_r (_REENT, fd, buf, n, off);
-}
-
-#endif
diff --git a/newlib/libc/unix/sigset.c b/newlib/libc/unix/sigset.c
index cd73a78..ecb3d08 100644
--- a/newlib/libc/unix/sigset.c
+++ b/newlib/libc/unix/sigset.c
@@ -1,7 +1,7 @@
 #include <signal.h>
 #include <errno.h>
 
-#if defined(SIG_SETMASK) && NSIG <= 32	/* easier than trying to remove from Makefile */
+#ifdef SIG_SETMASK	/* easier than trying to remove from Makefile */
 
 #undef sigemptyset
 int
diff --git a/newlib/libc/unix/ttyname.c b/newlib/libc/unix/ttyname.c
index 09f12a3..258ba25 100644
--- a/newlib/libc/unix/ttyname.c
+++ b/newlib/libc/unix/ttyname.c
@@ -56,19 +56,20 @@ ttyname (fd)
   struct dirent *dirp;
   DIR *dp;
   struct stat dsb;
+  char *rval;
 
   /* Must be a terminal. */
   if (tcgetattr (fd, &tty) < 0)
     return NULL;
 
   /* Must be a character device. */
-  if (fstat (fd, &sb) || !S_ISCHR (sb.st_mode))
+  if (_fstat (fd, &sb) || !S_ISCHR (sb.st_mode))
     return NULL;
 
-  if ((dp = opendir (_PATH_DEV)) == NULL)
+  if ((dp = _opendir (_PATH_DEV)) == NULL)
     return NULL;
 
-  while ((dirp = readdir (dp)) != NULL)
+  for (rval = NULL; dirp = _readdir (dp);)
     {
       if (dirp->d_ino != sb.st_ino)
 	continue;
@@ -76,9 +77,10 @@ ttyname (fd)
       if (stat (buf, &dsb) || sb.st_dev != dsb.st_dev ||
 	  sb.st_ino != dsb.st_ino)
 	continue;
-      (void) closedir (dp);
-      return buf;
+      (void) _closedir (dp);
+      rval = buf;
+      break;
     }
-  (void) closedir (dp);
-  return NULL;
+  (void) _closedir (dp);
+  return rval;
 }
diff --git a/newlib/libm/Makefile.am b/newlib/libm/Makefile.am
index 51ea06f..3b8d9a5 100644
--- a/newlib/libm/Makefile.am
+++ b/newlib/libm/Makefile.am
@@ -39,8 +39,6 @@ info_TEXINFOS = libm.texinfo
 
 libm.info: targetdep.tex math/stmp-def
 
-libm.dvi: targetdep.tex math/stmp-def
-
 stmp-targetdep: force
 	rm -f tmp.texi
 	targetdoc=`pwd`/tmp.texi; \
diff --git a/newlib/libm/Makefile.in b/newlib/libm/Makefile.in
index d471e6b..02d0b62 100644
--- a/newlib/libm/Makefile.in
+++ b/newlib/libm/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,22 +57,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBM_MACHINE_LIB = @LIBM_MACHINE_LIB@
 LIBTOOL = @LIBTOOL@
@@ -81,10 +73,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
 libm_machine_dir = @libm_machine_dir@
@@ -94,18 +84,18 @@ oext = @oext@
 sys_dir = @sys_dir@
 
 AUTOMAKE_OPTIONS = cygnus
-@NEWLIB_HW_FP_TRUE@MATHDIR = mathfp
-@NEWLIB_HW_FP_FALSE@MATHDIR = math
+@NEWLIB_HW_FP_TRUE@MATHDIR = @NEWLIB_HW_FP_TRUE@mathfp
+@NEWLIB_HW_FP_FALSE@MATHDIR = @NEWLIB_HW_FP_FALSE@math
 
 SUBDIRS = $(MATHDIR) common machine
 
 libm_la_LDFLAGS = -Xcompiler -nostdlib
-@USE_LIBTOOL_TRUE@SUBLIBS = $(MATHDIR)/lib$(MATHDIR).$(aext) common/libcommon.$(aext) $(LIBM_MACHINE_LIB)
-@USE_LIBTOOL_FALSE@SUBLIBS = $(MATHDIR)/lib.$(aext) common/lib.$(aext) $(LIBM_MACHINE_LIB)
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libm.la
+@USE_LIBTOOL_TRUE@SUBLIBS = @USE_LIBTOOL_TRUE@$(MATHDIR)/lib$(MATHDIR).$(aext) common/libcommon.$(aext) $(LIBM_MACHINE_LIB)
+@USE_LIBTOOL_FALSE@SUBLIBS = @USE_LIBTOOL_FALSE@$(MATHDIR)/lib.$(aext) common/lib.$(aext) $(LIBM_MACHINE_LIB)
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libm.la
 @USE_LIBTOOL_TRUE@libm_la_SOURCES = 
-@USE_LIBTOOL_TRUE@libm_la_LIBADD = $(SUBLIBS)
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = libm.a
+@USE_LIBTOOL_TRUE@libm_la_LIBADD = @USE_LIBTOOL_TRUE@$(SUBLIBS)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@libm.a
 
 info_TEXINFOS = libm.texinfo
 
@@ -124,7 +114,7 @@ CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 libm_a_LIBADD = 
 libm_a_SOURCES = libm.a.c
-libm_a_OBJECTS =  libm.a.$(OBJEXT)
+libm_a_OBJECTS =  libm.a.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 @USE_LIBTOOL_TRUE@libm_la_DEPENDENCIES =  \
@@ -150,11 +140,11 @@ TAR = gtar
 GZIP_ENV = --best
 DIST_SUBDIRS =  mathfp math common machine
 SOURCES = libm.a.c $(libm_la_SOURCES)
-OBJECTS = libm.a.$(OBJEXT) $(libm_la_OBJECTS)
+OBJECTS = libm.a.o $(libm_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .dvi .info .lo .o .obj .ps .s .texi .texinfo .txi
+.SUFFIXES: .S .c .dvi .info .lo .o .ps .s .texi .texinfo .txi
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
 
@@ -163,7 +153,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  ../acinclude.m4 \
-		../aclocal.m4 ../libtool.m4
+		../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -183,11 +173,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -196,7 +181,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -309,7 +293,7 @@ uninstall-info:
 	else ii=; fi; \
 	list='$(INFO_DEPS)'; \
 	for file in $$list; do \
-	  test -z "$$ii" \
+	  test -z "$ii" \
 	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
 	done
 	@$(NORMAL_UNINSTALL)
@@ -383,7 +367,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
+	  test "$$subdir" = "." && dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -604,8 +588,6 @@ $(SUBLIBS):
 
 libm.info: targetdep.tex math/stmp-def
 
-libm.dvi: targetdep.tex math/stmp-def
-
 stmp-targetdep: force
 	rm -f tmp.texi
 	targetdoc=`pwd`/tmp.texi; \
diff --git a/newlib/libm/aclocal.m4 b/newlib/libm/aclocal.m4
index 34da4a6..9076bbe 100644
--- a/newlib/libm/aclocal.m4
+++ b/newlib/libm/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -12,7 +12,7 @@ dnl PARTICULAR PURPOSE.
 
 # Define a conditional.
 
-AC_DEFUN([AM_CONDITIONAL],
+AC_DEFUN(AM_CONDITIONAL,
 [AC_SUBST($1_TRUE)
 AC_SUBST($1_FALSE)
 if $2; then
@@ -60,57 +60,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -128,9 +85,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -172,15 +129,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -196,6 +156,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -204,19 +176,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -234,9 +194,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -252,47 +211,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -333,7 +263,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -352,7 +282,7 @@ AC_SUBST($1)])
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -368,59 +298,27 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 )
 
 
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
 # Save cache, so that ltconfig can load it
 AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
 AC_CACHE_LOAD
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -431,43 +329,27 @@ AC_SUBST(LIBTOOL)dnl
 exec 5>>./config.log
 ])
 
-AC_DEFUN([AC_LIBTOOL_SETUP],
+AC_DEFUN(AC_LIBTOOL_SETUP,
 [AC_PREREQ(2.13)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 AC_REQUIRE([AC_PROG_NM])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
 [libtool_flags="$libtool_flags --enable-dlopen"])
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
@@ -477,20 +359,14 @@ AC_ARG_ENABLE(libtool-lock,
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -505,31 +381,12 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -537,56 +394,33 @@ ia64-*-hpux*)
   ;;
 
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+[*-*-cygwin* | *-*-mingw*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  ])
+])
 esac
 ])
 
 # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
 
 # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
 
 # AC_ENABLE_SHARED - implement the --enable-shared flag
 # Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
 <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -605,21 +439,21 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
 # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)])
 
 # AC_ENABLE_STATIC - implement the --enable-static flag
 # Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
 <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -638,8 +472,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])
 
 # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_STATIC(no)])
 
 
@@ -647,14 +480,14 @@ AC_ENABLE_STATIC(no)])
 # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(fast-install,
 changequote(<<, >>)dnl
 <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -672,98 +505,12 @@ esac],
 enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_FAST_INSTALL(no)])
 
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
 # AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -771,20 +518,16 @@ AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
+changequote(,)dnl
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
@@ -806,17 +549,17 @@ elif test "$with_gnu_ld" = yes; then
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL(lt_cv_path_LD,
+AC_CACHE_VAL(ac_cv_path_LD,
 [if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -825,9 +568,9 @@ AC_CACHE_VAL(lt_cv_path_LD,
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -837,240 +580,56 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_PROG_LD_GNU
 ])
 
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
 ])
 
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
 # AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
+AC_CACHE_VAL(ac_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi])
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
 ])
 
 # AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
+AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
+case "$host" in
+*-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
@@ -1084,39 +643,33 @@ esac
 ])
 
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case "$enable_ltdl_convenience" in
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   AC_CHECK_LIB(ltdl, main,
   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
   [if test x"$enable_ltdl_install" = xno; then
@@ -1127,8 +680,8 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
@@ -1136,91 +689,15 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   fi
 ])
 
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
 dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
 
 dnl This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])dnl
 
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libm/common/Makefile.am b/newlib/libm/common/Makefile.am
index d6d7e51..f044894 100644
--- a/newlib/libm/common/Makefile.am
+++ b/newlib/libm/common/Makefile.am
@@ -5,22 +5,14 @@ AUTOMAKE_OPTIONS = cygnus
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
 src = 	s_finite.c s_copysign.c s_modf.c s_scalbn.c \
-	s_cbrt.c s_expm1.c s_ilogb.c s_infconst.c \
-	s_infinity.c s_isinf.c s_isinfd.c s_isnan.c s_isnand.c \
-	s_log1p.c s_nan.c s_nextafter.c \
-	s_rint.c s_logb.c s_matherr.c s_lib_ver.c \
-	s_fdim.c s_fma.c s_fmax.c s_fmin.c s_fpclassify.c s_lrint.c \
-	s_lround.c s_nearbyint.c s_remquo.c s_round.c s_scalbln.c \
-	s_signbit.c s_trunc.c
+	s_cbrt.c s_expm1.c s_ilogb.c \
+	s_infinity.c s_log1p.c s_nan.c s_nextafter.c \
+	s_rint.c s_logb.c s_matherr.c s_lib_ver.c
 
 fsrc =	sf_finite.c sf_copysign.c sf_modf.c sf_scalbn.c \
 	sf_cbrt.c sf_expm1.c sf_ilogb.c \
-	sf_infinity.c sf_isinf.c sf_isinff.c sf_isnan.c sf_isnanf.c \
-	sf_log1p.c sf_nan.c sf_nextafter.c \
-	sf_rint.c sf_logb.c \
-	sf_fdim.c sf_fma.c sf_fmax.c sf_fmin.c sf_lrint.c \
-	sf_lround.c sf_nearbyint.c sf_remquo.c sf_round.c \
-	sf_scalbln.c sf_trunc.c
+	sf_infinity.c sf_log1p.c sf_nan.c sf_nextafter.c \
+	sf_rint.c sf_logb.c
 
 libcommon_la_LDFLAGS = -Xcompiler -nostdlib
 
@@ -37,7 +29,7 @@ endif # USE_LIBTOOL
 include $(srcdir)/../../Makefile.shared
 
 chobj =	scbrt.def scopysign.def sexpm1.def silogb.def \
-	sinfinity.def sisnan.def slog1p.def smatherr.def smodf.def \
+	sinfinity.def slog1p.def smatherr.def smodf.def \
 	snan.def snextafter.def sscalbn.def
 
 SUFFIXES = .def
@@ -51,6 +43,7 @@ CHEW = ../../doc/makedoc -f $(srcdir)/../../doc/doc.str
 TARGETDOC = ../tmp.texi
 
 doc: $(chobj)
+	cat $(srcdir)/common.tex >> $(TARGETDOC)
 
 CLEANFILES = $(chobj) *.ref
 
@@ -93,10 +86,6 @@ sinfinity.def: s_infinity.c
 	$(CHEW) < $(srcdir)/s_infinity.c >$@ 2>/dev/null
 	touch stmp-def
 
-sisnan.def: s_isnan.c
-	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
-	touch stmp-def
-
 slog1p.def: s_log1p.c
 	$(CHEW) < $(srcdir)/s_log1p.c >$@ 2>/dev/null
 	touch stmp-def
diff --git a/newlib/libm/common/Makefile.in b/newlib/libm/common/Makefile.in
index 4e9db8b..b45deef 100644
--- a/newlib/libm/common/Makefile.in
+++ b/newlib/libm/common/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,22 +58,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBM_MACHINE_LIB = @LIBM_MACHINE_LIB@
 LIBTOOL = @LIBTOOL@
@@ -82,10 +74,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
 libm_machine_dir = @libm_machine_dir@
@@ -98,22 +88,30 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-src = s_finite.c s_copysign.c s_modf.c s_scalbn.c 	s_cbrt.c s_expm1.c s_ilogb.c s_infconst.c 	s_infinity.c s_isinf.c s_isinfd.c s_isnan.c s_isnand.c 	s_log1p.c s_nan.c s_nextafter.c 	s_rint.c s_logb.c s_matherr.c s_lib_ver.c 	s_fdim.c s_fma.c s_fmax.c s_fmin.c s_fpclassify.c s_lrint.c 	s_lround.c s_nearbyint.c s_remquo.c s_round.c s_scalbln.c 	s_signbit.c s_trunc.c
+src = s_finite.c s_copysign.c s_modf.c s_scalbn.c \
+	s_cbrt.c s_expm1.c s_ilogb.c \
+	s_infinity.c s_log1p.c s_nan.c s_nextafter.c \
+	s_rint.c s_logb.c s_matherr.c s_lib_ver.c
 
 
-fsrc = sf_finite.c sf_copysign.c sf_modf.c sf_scalbn.c 	sf_cbrt.c sf_expm1.c sf_ilogb.c 	sf_infinity.c sf_isinf.c sf_isinff.c sf_isnan.c sf_isnanf.c 	sf_log1p.c sf_nan.c sf_nextafter.c 	sf_rint.c sf_logb.c 	sf_fdim.c sf_fma.c sf_fmax.c sf_fmin.c sf_lrint.c 	sf_lround.c sf_nearbyint.c sf_remquo.c sf_round.c 	sf_scalbln.c sf_trunc.c
+fsrc = sf_finite.c sf_copysign.c sf_modf.c sf_scalbn.c \
+	sf_cbrt.c sf_expm1.c sf_ilogb.c \
+	sf_infinity.c sf_log1p.c sf_nan.c sf_nextafter.c \
+	sf_rint.c sf_logb.c
 
 
 libcommon_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libcommon.la
-@USE_LIBTOOL_TRUE@libcommon_la_SOURCES = $(src) $(fsrc)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libcommon.la
+@USE_LIBTOOL_TRUE@libcommon_la_SOURCES = @USE_LIBTOOL_TRUE@$(src) $(fsrc)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(src) $(fsrc)
 
-chobj = scbrt.def scopysign.def sexpm1.def silogb.def 	sinfinity.def sisnan.def slog1p.def smatherr.def smodf.def 	snan.def snextafter.def sscalbn.def
+chobj = scbrt.def scopysign.def sexpm1.def silogb.def \
+	sinfinity.def slog1p.def smatherr.def smodf.def \
+	snan.def snextafter.def sscalbn.def
 
 
 SUFFIXES = .def
@@ -132,54 +130,24 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  s_finite.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_copysign.$(OBJEXT) s_modf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_scalbn.$(OBJEXT) s_cbrt.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_expm1.$(OBJEXT) s_ilogb.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_infconst.$(OBJEXT) s_infinity.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_isinf.$(OBJEXT) s_isinfd.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_isnan.$(OBJEXT) s_isnand.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_log1p.$(OBJEXT) s_nan.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_nextafter.$(OBJEXT) s_rint.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_logb.$(OBJEXT) s_matherr.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_lib_ver.$(OBJEXT) s_fdim.$(OBJEXT) s_fma.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_fmax.$(OBJEXT) s_fmin.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_fpclassify.$(OBJEXT) s_lrint.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_lround.$(OBJEXT) s_nearbyint.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_remquo.$(OBJEXT) s_round.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_scalbln.$(OBJEXT) s_signbit.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_trunc.$(OBJEXT) sf_finite.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_copysign.$(OBJEXT) sf_modf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_scalbn.$(OBJEXT) sf_cbrt.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_expm1.$(OBJEXT) sf_ilogb.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_infinity.$(OBJEXT) sf_isinf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_isinff.$(OBJEXT) sf_isnan.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_isnanf.$(OBJEXT) sf_log1p.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_nan.$(OBJEXT) sf_nextafter.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_rint.$(OBJEXT) sf_logb.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_fdim.$(OBJEXT) sf_fma.$(OBJEXT) sf_fmax.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_fmin.$(OBJEXT) sf_lrint.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_lround.$(OBJEXT) sf_nearbyint.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_remquo.$(OBJEXT) sf_round.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_scalbln.$(OBJEXT) sf_trunc.$(OBJEXT)
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  s_finite.o s_copysign.o s_modf.o \
+@USE_LIBTOOL_FALSE@s_scalbn.o s_cbrt.o s_expm1.o s_ilogb.o s_infinity.o \
+@USE_LIBTOOL_FALSE@s_log1p.o s_nan.o s_nextafter.o s_rint.o s_logb.o \
+@USE_LIBTOOL_FALSE@s_matherr.o s_lib_ver.o sf_finite.o sf_copysign.o \
+@USE_LIBTOOL_FALSE@sf_modf.o sf_scalbn.o sf_cbrt.o sf_expm1.o \
+@USE_LIBTOOL_FALSE@sf_ilogb.o sf_infinity.o sf_log1p.o sf_nan.o \
+@USE_LIBTOOL_FALSE@sf_nextafter.o sf_rint.o sf_logb.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libcommon_la_LIBADD = 
 @USE_LIBTOOL_TRUE@libcommon_la_OBJECTS =  s_finite.lo s_copysign.lo \
 @USE_LIBTOOL_TRUE@s_modf.lo s_scalbn.lo s_cbrt.lo s_expm1.lo s_ilogb.lo \
-@USE_LIBTOOL_TRUE@s_infconst.lo s_infinity.lo s_isinf.lo s_isinfd.lo \
-@USE_LIBTOOL_TRUE@s_isnan.lo s_isnand.lo s_log1p.lo s_nan.lo \
-@USE_LIBTOOL_TRUE@s_nextafter.lo s_rint.lo s_logb.lo s_matherr.lo \
-@USE_LIBTOOL_TRUE@s_lib_ver.lo s_fdim.lo s_fma.lo s_fmax.lo s_fmin.lo \
-@USE_LIBTOOL_TRUE@s_fpclassify.lo s_lrint.lo s_lround.lo s_nearbyint.lo \
-@USE_LIBTOOL_TRUE@s_remquo.lo s_round.lo s_scalbln.lo s_signbit.lo \
-@USE_LIBTOOL_TRUE@s_trunc.lo sf_finite.lo sf_copysign.lo sf_modf.lo \
-@USE_LIBTOOL_TRUE@sf_scalbn.lo sf_cbrt.lo sf_expm1.lo sf_ilogb.lo \
-@USE_LIBTOOL_TRUE@sf_infinity.lo sf_isinf.lo sf_isinff.lo sf_isnan.lo \
-@USE_LIBTOOL_TRUE@sf_isnanf.lo sf_log1p.lo sf_nan.lo sf_nextafter.lo \
-@USE_LIBTOOL_TRUE@sf_rint.lo sf_logb.lo sf_fdim.lo sf_fma.lo sf_fmax.lo \
-@USE_LIBTOOL_TRUE@sf_fmin.lo sf_lrint.lo sf_lround.lo sf_nearbyint.lo \
-@USE_LIBTOOL_TRUE@sf_remquo.lo sf_round.lo sf_scalbln.lo sf_trunc.lo
+@USE_LIBTOOL_TRUE@s_infinity.lo s_log1p.lo s_nan.lo s_nextafter.lo \
+@USE_LIBTOOL_TRUE@s_rint.lo s_logb.lo s_matherr.lo s_lib_ver.lo \
+@USE_LIBTOOL_TRUE@sf_finite.lo sf_copysign.lo sf_modf.lo sf_scalbn.lo \
+@USE_LIBTOOL_TRUE@sf_cbrt.lo sf_expm1.lo sf_ilogb.lo sf_infinity.lo \
+@USE_LIBTOOL_TRUE@sf_log1p.lo sf_nan.lo sf_nextafter.lo sf_rint.lo \
+@USE_LIBTOOL_TRUE@sf_logb.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -199,7 +167,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libcommon_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus common/Makefile
 
@@ -220,11 +188,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -233,7 +196,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -416,6 +378,7 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
 	touch stmp-def
 
 doc: $(chobj)
+	cat $(srcdir)/common.tex >> $(TARGETDOC)
 
 # Texinfo does not appear to support underscores in file names, so we
 # name the .def files without underscores.
@@ -456,10 +419,6 @@ sinfinity.def: s_infinity.c
 	$(CHEW) < $(srcdir)/s_infinity.c >$@ 2>/dev/null
 	touch stmp-def
 
-sisnan.def: s_isnan.c
-	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
-	touch stmp-def
-
 slog1p.def: s_log1p.c
 	$(CHEW) < $(srcdir)/s_log1p.c >$@ 2>/dev/null
 	touch stmp-def
diff --git a/newlib/libm/common/common.tex b/newlib/libm/common/common.tex
new file mode 100644
index 0000000..0e8a986
--- /dev/null
+++ b/newlib/libm/common/common.tex
@@ -0,0 +1,12 @@
+@page
+@include common/scbrt.def
+@include common/scopysign.def
+@include common/sexpm1.def
+@include common/silogb.def
+@include common/sinfinity.def
+@include common/slog1p.def
+@include common/smatherr.def
+@include common/smodf.def
+@include common/snan.def
+@include common/snextafter.def
+@include common/sscalbn.def
diff --git a/newlib/libm/common/fdlibm.h b/newlib/libm/common/fdlibm.h
index 7a0f28d..5ca1a91 100644
--- a/newlib/libm/common/fdlibm.h
+++ b/newlib/libm/common/fdlibm.h
@@ -11,12 +11,11 @@
  * ====================================================
  */
 
-/* REDHAT LOCAL: Include files.  */
+/* CYGNUS LOCAL: Include files.  */
 #include <math.h>
-#include <sys/types.h>
 #include <machine/ieeefp.h>
 
-/* REDHAT LOCAL: Default to XOPEN_MODE.  */
+/* CYGNUS LOCAL: Default to XOPEN_MODE.  */
 #define _XOPEN_MODE
 
 /* Most routines need to check whether a float is finite, infinite, or not a
@@ -71,13 +70,13 @@
 #define FLT_UWORD_IS_FINITE(x) ((x)<0x7f800000L)
 #define FLT_UWORD_IS_NAN(x) ((x)>0x7f800000L)
 #define FLT_UWORD_IS_INFINITE(x) ((x)==0x7f800000L)
-#define FLT_UWORD_MAX 0x7f7fffffL
+#define FLT_UWORD_MAX 0x7f7fffff
 #define FLT_UWORD_EXP_MAX 0x43000000
 #define FLT_UWORD_LOG_MAX 0x42b17217
 #define FLT_UWORD_LOG_2MAX 0x42b2d4fc
 #define HUGE ((float)3.40282346638528860e+38)
 #endif
-#define FLT_UWORD_HALF_MAX (FLT_UWORD_MAX-(1L<<23))
+#define FLT_UWORD_HALF_MAX (FLT_UWORD_MAX-(1<<23))
 #define FLT_LARGEST_EXP (FLT_UWORD_MAX>>23)
 
 /* Many routines check for zero and subnormal numbers.  Such things depend
@@ -124,7 +123,6 @@
 #endif
 
 #ifdef __STDC__
-#undef __P
 #define	__P(p)	p
 #else
 #define	__P(p)	()
diff --git a/newlib/libm/common/s_expm1.c b/newlib/libm/common/s_expm1.c
index 12c88f1..c857c32 100644
--- a/newlib/libm/common/s_expm1.c
+++ b/newlib/libm/common/s_expm1.c
@@ -35,9 +35,9 @@ TRAD_SYNOPSIS
 DESCRIPTION
 	<<expm1>> and <<expm1f>> calculate the exponential of <[x]>
 	and subtract 1, that is,
-	@ifnottex
+	@ifinfo
 	e raised to the power <[x]> minus 1 (where e
-	@end ifnottex
+	@end ifinfo
 	@tex
 	$e^x - 1$ (where $e$
 	@end tex
diff --git a/newlib/libm/common/s_fdim.c b/newlib/libm/common/s_fdim.c
deleted file mode 100644
index 0010bf5..0000000
--- a/newlib/libm/common/s_fdim.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double fdim(double x, double y)
-#else
-	double fdim(x,y)
-	double x;
-	double y;
-#endif
-{
-  int c = __fpclassifyd(x);
-  if (c == FP_NAN || c == FP_INFINITE)
-    return HUGE_VAL;
-
-  return x > y ? x - y : 0.0;
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_fma.c b/newlib/libm/common/s_fma.c
deleted file mode 100644
index 86958af..0000000
--- a/newlib/libm/common/s_fma.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double fma(double x, double y, double z)
-#else
-	double fma(x,y)
-	double x;
-	double y;
-        double z;
-#endif
-{
-  /* Implementation defined. */
-  return (x * y) + z;
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_fmax.c b/newlib/libm/common/s_fmax.c
deleted file mode 100644
index 53e1559..0000000
--- a/newlib/libm/common/s_fmax.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double fmax(double x, double y)
-#else
-	double fmax(x,y)
-	double x;
-	double y;
-#endif
-{
-  if (__fpclassifyd(x) == FP_NAN)
-    return y;
-  if (__fpclassifyd(y) == FP_NAN)
-    return x;
-  
-  return x > y ? x : y;
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_fmin.c b/newlib/libm/common/s_fmin.c
deleted file mode 100644
index 65e0b1c..0000000
--- a/newlib/libm/common/s_fmin.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double fmin(double x, double y)
-#else
-	double fmin(x,y)
-	double x;
-	double y;
-#endif
-{
-  if (__fpclassifyd(x) == FP_NAN)
-    return y;
-  if (__fpclassifyd(y) == FP_NAN)
-    return x;
-  
-  return x < y ? x : y;
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_fpclassify.c b/newlib/libm/common/s_fpclassify.c
deleted file mode 100644
index 111d709..0000000
--- a/newlib/libm/common/s_fpclassify.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-int
-__fpclassifyf (float x)
-{
-  __uint32_t w;
-
-  GET_FLOAT_WORD(w,x);
-  
-  if (w == 0x00000000 || w == 0x80000000)
-    return FP_ZERO;
-  else if ((w >= 0x00800000 && w <= 0x7f7fffff) ||
-           (w >= 0x80800000 && w <= 0xff7fffff))
-    return FP_NORMAL;
-  else if ((w >= 0x00000001 && w <= 0x007fffff) ||
-           (w >= 0x80000001 && w <= 0x807fffff))
-    return FP_SUBNORMAL;
-  else if (w == 0x7f800000 || w == 0xff800000)
-    return FP_INFINITE;
-  else
-    return FP_NAN;
-}
-
-int
-__fpclassifyd (double x)
-{
-  __uint32_t msw, lsw;
-
-  EXTRACT_WORDS(msw,lsw,x);
-
-  if ((msw == 0x00000000 && lsw == 0x00000000) ||
-      (msw == 0x80000000 && lsw == 0x00000000))
-    return FP_ZERO;
-  else if ((msw >= 0x00100000 && msw <= 0x7fefffff) ||
-           (msw >= 0x80100000 && msw <= 0xffefffff))
-    return FP_NORMAL;
-  else if ((msw >= 0x00000000 && msw <= 0x000fffff) ||
-           (msw >= 0x80000000 && msw <= 0x800fffff))
-    /* zero is already handled above */
-    return FP_SUBNORMAL;
-  else if ((msw == 0x7ff00000 && lsw == 0x00000000) ||
-           (msw == 0xfff00000 && lsw == 0x00000000))
-    return FP_INFINITE;
-  else
-    return FP_NAN;
-}
diff --git a/newlib/libm/common/s_ilogb.c b/newlib/libm/common/s_ilogb.c
index 00dfef6..4e3e69f 100644
--- a/newlib/libm/common/s_ilogb.c
+++ b/newlib/libm/common/s_ilogb.c
@@ -13,7 +13,7 @@
 
 /*
 FUNCTION
-       <<ilogb>>, <<ilogbf>>---get exponent of floating-point number
+       <<ilogb>>, <<ilogbf>>---get exponent of floating point number
 INDEX
 	ilogb
 INDEX
@@ -35,7 +35,7 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 
-	All nonzero, normal numbers can be described as <[m]> *
+	All non zero, normal numbers can be described as <[m]> *
 	2**<[p]>.  <<ilogb>> and <<ilogbf>> examine the argument
 	<[val]>, and return <[p]>.  The functions <<frexp>> and
 	<<frexpf>> are similar to <<ilogb>> and <<ilogbf>>, but also
@@ -44,7 +44,7 @@ DESCRIPTION
 RETURNS
 
 <<ilogb>> and <<ilogbf>> return the power of two used to form the
-floating-point argument.  If <[val]> is <<0>>, they return <<-
+floating point argument.  If <[val]> is <<0>>, they return <<-
 INT_MAX>> (<<INT_MAX>> is defined in limits.h).  If <[val]> is
 infinite, or NaN, they return <<INT_MAX>>.
 
diff --git a/newlib/libm/common/s_infconst.c b/newlib/libm/common/s_infconst.c
deleted file mode 100644
index 9447b97..0000000
--- a/newlib/libm/common/s_infconst.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Infinity as a constant value.   This is used for HUGE_VAL.
- * Added by Cygnus Support.
- */
-
-#include <float.h>
-#include "fdlibm.h"
-
-/* Float version of infinity.  */
-const union __fmath __infinityf[1] = {{{0x7f800000}}};
-
-/* Double version of infinity.  */
-#ifndef _DOUBLE_IS_32BITS
- #ifdef __IEEE_BIG_ENDIAN
-  const union __dmath __infinity[1] = {{{0x7ff00000, 0}}};
- #else
-  const union __dmath __infinity[1] = {{{0, 0x7ff00000}}};
- #endif
-#else /* defined (_DOUBLE_IS_32BITS) */
- const union __dmath __infinity[1] = {{{0x7f800000, 0}}};
-#endif /* defined (_DOUBLE_IS_32BITS) */
-
-/* Long double version of infinity.  */
-#ifdef __IEEE_BIG_ENDIAN
- #if LDBL_MANT_DIG == 24
-  const union __ldmath __infinityld[1] = {{{0x7f800000, 0, 0, 0}}};
- #elif LDBL_MANT_DIG == 53
-  const union __ldmath __infinityld[1] = {{{0x7ff00000, 0, 0, 0}}};
- #else
-  const union __ldmath __infinityld[1] = {{{0x7fff0000, 0, 0, 0}}};
- #endif /* LDBL_MANT_DIG size  */
-#else /* __IEEE_LITTLE_ENDIAN  */
- #if LDBL_MANT_DIG == 24
-  const union __ldmath __infinityld[1] = {{{0x7f800000, 0, 0, 0}}};
- #elif LDBL_MANT_DIG == 53
-  const union __ldmath __infinityld[1] = {{{0, 0x7ff00000, 0, 0}}};
- #else
-  const union __ldmath __infinityld[1] = {{{0, 0x80000000, 0x00007fff, 0}}};
- #endif /* LDBL_MANT_DIG size  */
-#endif /* __IEEE_LITTLE_ENDIAN  */
-
diff --git a/newlib/libm/common/s_infinity.c b/newlib/libm/common/s_infinity.c
index 9f9cbeb..6508216 100644
--- a/newlib/libm/common/s_infinity.c
+++ b/newlib/libm/common/s_infinity.c
@@ -25,8 +25,8 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 	<<infinity>> and <<infinityf>> return the special number IEEE
-	infinity in double- and single-precision arithmetic
-	respectively.
+	infinity in double and single precision arithmetic
+	respectivly.
 
 QUICKREF
 	infinity - pure
diff --git a/newlib/libm/common/s_isinf.c b/newlib/libm/common/s_isinf.c
deleted file mode 100644
index db8e8f8..0000000
--- a/newlib/libm/common/s_isinf.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * isinf(x) returns 1 if x is infinity, else 0;
- * no branching!
- *
- * isinf is a <math.h> macro in the C99 standard.  It was previously
- * implemented as a function by newlib and is declared as such in
- * <ieeefp.h>.  Newlib supplies it here as a function if the user
- * chooses to use <ieeefp.h> or needs to link older code compiled with the
- * previous <math.h> declaration.
- */
-
-#include "fdlibm.h"
-#include <ieeefp.h>
-
-#ifndef _DOUBLE_IS_32BITS
-
-int
-_DEFUN (isinf, (x),
-	double x)
-{
-	__int32_t hx,lx;
-	EXTRACT_WORDS(hx,lx,x);
-	hx &= 0x7fffffff;
-	hx |= (__uint32_t)(lx|(-lx))>>31;	
-	hx = 0x7ff00000 - hx;
-	return 1 - (int)((__uint32_t)(hx|(-hx))>>31);
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_isinfd.c b/newlib/libm/common/s_isinfd.c
deleted file mode 100644
index 5a2b04d..0000000
--- a/newlib/libm/common/s_isinfd.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * __isinfd(x) returns 1 if x is infinity, else 0;
- * no branching!
- * Added by Cygnus Support.
- */
-
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-int
-_DEFUN (__isinfd, (x),
-	double x)
-{
-	__int32_t hx,lx;
-	EXTRACT_WORDS(hx,lx,x);
-	hx &= 0x7fffffff;
-	hx |= (__uint32_t)(lx|(-lx))>>31;	
-	hx = 0x7ff00000 - hx;
-	return 1 - (int)((__uint32_t)(hx|(-hx))>>31);
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_isnan.c b/newlib/libm/common/s_isnan.c
deleted file mode 100644
index b0c4036..0000000
--- a/newlib/libm/common/s_isnan.c
+++ /dev/null
@@ -1,135 +0,0 @@
-
-/* @(#)s_isnan.c 5.1 93/09/24 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
-FUNCTION
-	<<isnan>>, <<isnanf>>, <<isinf>>, <<isinff>>, <<finite>>, <<finitef>>---test for exceptional numbers
-
-INDEX
-	isnan
-INDEX
-	isinf
-INDEX
-	finite
-
-INDEX
-	isnanf
-INDEX
-	isinff
-INDEX
-	finitef
-
-ANSI_SYNOPSIS
-	#include <ieeefp.h>
-	int isnan(double <[arg]>);
-	int isinf(double <[arg]>);
-	int finite(double <[arg]>);
-	int isnanf(float <[arg]>);
-	int isinff(float <[arg]>);
-	int finitef(float <[arg]>);
-
-TRAD_SYNOPSIS
-	#include <ieeefp.h>
-	int isnan(<[arg]>)
-	double <[arg]>;
-	int isinf(<[arg]>)
-	double <[arg]>;
-	int finite(<[arg]>);
-	double <[arg]>;
-	int isnanf(<[arg]>);
-	float <[arg]>;
-	int isinff(<[arg]>);
-	float <[arg]>;
-	int finitef(<[arg]>);
-	float <[arg]>;
-
-
-DESCRIPTION
-	These functions provide information on the floating-point
-	argument supplied.
-
-	There are five major number formats:
-	o+
-	o zero
-	  A number which contains all zero bits.
-	o subnormal
-	  A number with a zero exponent but a nonzero fraction.
-	o normal
-	  A number with an exponent and a fraction.
-     	o infinity
-	  A number with an all 1's exponent and a zero fraction.
-	o NAN
-	  A number with an all 1's exponent and a nonzero fraction.
-
-	o-
-
-	<<isnan>> returns 1 if the argument is a nan. <<isinf>>
-	returns 1 if the argument is infinity.  <<finite>> returns 1 if the
-	argument is zero, subnormal or normal.
-	
-	The <<isnanf>>, <<isinff>> and <<finitef>> functions perform the same
-	operations as their <<isnan>>, <<isinf>> and <<finite>>
-	counterparts, but on single-precision floating-point numbers.
-
-	It should be noted that the C99 standard dictates that <<isnan>>
-	and <<isinf>> are macros that operate on multiple types of
-	floating-point.  The SUSv2 standard declares <<isnan>> as
-	a function taking double.  Newlib has decided to declare
-	them both as macros in math.h and as functions in ieeefp.h.
-
-QUICKREF
-	isnan - pure
-QUICKREF
-	isinf - pure
-QUICKREF
-	finite - pure
-QUICKREF
-	isnan - pure
-QUICKREF
-	isinf - pure
-QUICKREF
-	finite - pure
-*/
-
-/*
- * isnan(x) returns 1 is x is nan, else 0;
- * no branching!
- *
- * The C99 standard dictates that isnan is a macro taking
- * multiple floating-point types while the SUSv2 standard
- * notes it is a function taking a double argument.  Newlib
- * has chosen to implement it as a macro in <math.h> and
- * declare it as a function in <ieeefp.h>.
- */
-
-#include "fdlibm.h"
-#include <ieeefp.h>
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	int isnan(double x)
-#else
-	int isnan(x)
-	double x;
-#endif
-{
-	__int32_t hx,lx;
-	EXTRACT_WORDS(hx,lx,x);
-	hx &= 0x7fffffff;
-	hx |= (__uint32_t)(lx|(-lx))>>31;	
-	hx = 0x7ff00000 - hx;
-	return (int)(((__uint32_t)(hx))>>31);
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_isnand.c b/newlib/libm/common/s_isnand.c
deleted file mode 100644
index 75538d9..0000000
--- a/newlib/libm/common/s_isnand.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
-FUNCTION
-	<<isnan>>, <<isnanf>>, <<isinf>>, <<isinff>>, <<finite>>, <<finitef>>---test for exceptional numbers
-
-INDEX
-	isnan
-INDEX
-	isinf
-INDEX
-	finite
-
-INDEX
-	isnanf
-INDEX
-	isinff
-INDEX
-	finitef
-
-ANSI_SYNOPSIS
-	#include <ieeefp.h>
-	int isnan(double <[arg]>);
-	int isinf(double <[arg]>);
-	int finite(double <[arg]>);
-	int isnanf(float <[arg]>);
-	int isinff(float <[arg]>);
-	int finitef(float <[arg]>);
-
-TRAD_SYNOPSIS
-	#include <ieeefp.h>
-	int isnan(<[arg]>)
-	double <[arg]>;
-	int isinf(<[arg]>)
-	double <[arg]>;
-	int finite(<[arg]>);
-	double <[arg]>;
-	int isnanf(<[arg]>);
-	float <[arg]>;
-	int isinff(<[arg]>);
-	float <[arg]>;
-	int finitef(<[arg]>);
-	float <[arg]>;
-
-
-DESCRIPTION
-	These functions provide information on the floating-point
-	argument supplied.
-
-	There are five major number formats:
-	o+
-	o zero
-	  A number which contains all zero bits.
-	o subnormal
-	  A number with a zero exponent but a nonzero fraction.
-	o normal
-	  A number with an exponent and a fraction.
-     	o infinity
-	  A number with an all 1's exponent and a zero fraction.
-	o NAN
-	  A number with an all 1's exponent and a nonzero fraction.
-
-	o-
-
-	<<isnan>> returns 1 if the argument is a nan. <<isinf>>
-	returns 1 if the argument is infinity.  <<finite>> returns 1 if the
-	argument is zero, subnormal or normal.
-
-	Note that by the C99 standard, <<isnan>> and <<isinf>> are macros
-	taking any type of floating-point and are declared in
-	<<math.h>>.  Newlib has chosen to declare these as macros in
-	<<math.h>> and as functions in <<ieeefp.h>>.
-	
-	The <<isnanf>>, <<isinff>> and <<finitef>> functions perform the same
-	operations as their <<isnan>>, <<isinf>> and <<finite>>
-	counterparts, but on single-precision floating-point numbers.
-
-QUICKREF
-	isnan - pure
-QUICKREF
-	isinf - pure
-QUICKREF
-	finite - pure
-QUICKREF
-	isnan - pure
-QUICKREF
-	isinf - pure
-QUICKREF
-	finite - pure
-*/
-
-/*
- * __isnand(x) returns 1 is x is nan, else 0;
- * no branching!
- */
-
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-int
-_DEFUN (__isnand, (x),
-	double x)
-{
-	__int32_t hx,lx;
-	EXTRACT_WORDS(hx,lx,x);
-	hx &= 0x7fffffff;
-	hx |= (__uint32_t)(lx|(-lx))>>31;	
-	hx = 0x7ff00000 - hx;
-	return (int)(((__uint32_t)(hx))>>31);
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_lrint.c b/newlib/libm/common/s_lrint.c
deleted file mode 100644
index 7d3b561..0000000
--- a/newlib/libm/common/s_lrint.c
+++ /dev/null
@@ -1,107 +0,0 @@
-
-/* @(#)s_lrint.c 5.1 93/09/24 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * lrint(x)
- * Return x rounded to integral value according to the prevailing
- * rounding mode.
- * Method:
- *	Using floating addition.
- * Exception:
- *	Inexact flag raised if x not equal to lrint(x).
- */
-
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-static const double
-#else
-static double 
-#endif
-
-/* Adding a double, x, to 2^52 will cause the result to be rounded based on
-   the fractional part of x, according to the implementation's current rounding
-   mode.  2^52 is the smallest double that can be represented using all 52 significant
-   digits. */
-TWO52[2]={
-  4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
- -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
-};
-
-#ifdef __STDC__
-	long int lrint(double x)
-#else
-	long int lrint(x)
-	double x;
-#endif
-{
-  __int32_t i0,j0,sx;
-  __uint32_t i1;
-  double t;
-  volatile double w;
-  long int result;
-  
-  EXTRACT_WORDS(i0,i1,x);
-
-  /* Extract sign bit. */
-  sx = (i0>>31)&1;
-
-  /* Extract exponent field. */
-  j0 = ((i0 & 0x7ff00000) >> 20) - 1023;
-  
-  if(j0 < 20)
-    {
-      if(j0 < -1)
-        return 0;
-      else
-        {
-          w = TWO52[sx] + x;
-          t = w - TWO52[sx];
-          GET_HIGH_WORD(i0, t);
-          /* Detect the all-zeros representation of plus and
-             minus zero, which fails the calculation below. */
-          if ((i0 & ~(1 << 31)) == 0)
-              return 0;
-          j0 = ((i0 & 0x7ff00000) >> 20) - 1023;
-          i0 &= 0x000fffff;
-          i0 |= 0x00100000;
-          result = i0 >> (20 - j0);
-        }
-    }
-  else if (j0 < (int)(8 * sizeof (long int)) - 1)
-    {
-      if (j0 >= 52)
-        result = ((long int) ((i0 & 0x000fffff) | 0x0010000) << (j0 - 20)) | 
-                   (i1 << (j0 - 52));
-      else
-        {
-          w = TWO52[sx] + x;
-          t = w - TWO52[sx];
-          EXTRACT_WORDS (i0, i1, t);
-          j0 = ((i0 & 0x7ff00000) >> 20) - 1023;
-          i0 &= 0x000fffff;
-          i0 |= 0x00100000;
-          result = ((long int) i0 << (j0 - 20)) | (i1 >> (52 - j0));
-        }
-    }
-  else
-    {
-      return (long int) x;
-    }
-  
-  return sx ? -result : result;
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_lround.c b/newlib/libm/common/s_lround.c
deleted file mode 100644
index 7bd249f..0000000
--- a/newlib/libm/common/s_lround.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	long int lround(double x)
-#else
-	long int lround(x)
-	double x;
-#endif
-{
-  __int32_t sign, exponent_less_1023;
-  /* Most significant word, least significant word. */
-  __uint32_t msw, lsw;
-  long int result;
-  
-  EXTRACT_WORDS(msw, lsw, x);
-
-  /* Extract sign. */
-  sign = ((msw & 0x80000000) ? -1 : 1);
-  /* Extract exponent field. */
-  exponent_less_1023 = ((msw & 0x7ff00000) >> 20) - 1023;
-  msw &= 0x000fffff;
-  msw |= 0x00100000;
-
-  if (exponent_less_1023 < 20)
-    {
-      if (exponent_less_1023 < 0)
-        {
-          if (exponent_less_1023 < -1)
-            return 0;
-          else
-            return sign;
-        }
-      else
-        {
-          msw += 0x80000 >> exponent_less_1023;
-          result = msw >> (20 - exponent_less_1023);
-        }
-    }
-  else if (exponent_less_1023 < (8 * sizeof (long int)) - 1)
-    {
-      if (exponent_less_1023 >= 52)
-        result = ((long int) msw << (exponent_less_1023 - 20)) | (lsw << (exponent_less_1023 - 52));
-      else
-        {
-          unsigned int tmp = lsw + (0x80000000 >> (exponent_less_1023 - 20));
-          if (tmp < lsw)
-            ++msw;
-          result = ((long int) msw << (exponent_less_1023 - 20)) | (tmp >> (52 - exponent_less_1023));
-        }
-    }
-  else
-    /* Result is too large to be represented by a long int. */
-    return (long int)x;
-
-  return sign * result;
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_modf.c b/newlib/libm/common/s_modf.c
index 2e9bfb1..0115139 100644
--- a/newlib/libm/common/s_modf.c
+++ b/newlib/libm/common/s_modf.c
@@ -41,7 +41,7 @@ DESCRIPTION
 	storing the integer part in <<*<[ipart]>>>.  No rounding
 	whatsoever is done; the sum of the integer and fractional
 	parts is guaranteed to be exactly  equal to <[val]>.   That
-	is, if <[realpart]> = modf(<[val]>, &<[intpart]>); then
+	is, if . <[realpart]> = modf(<[val]>, &<[intpart]>); then
 	`<<<[realpart]>+<[intpart]>>>' is the same as <[val]>.
 	<<modff>> is identical, save that it takes and returns
 	<<float>> rather than <<double>> values. 
diff --git a/newlib/libm/common/s_nan.c b/newlib/libm/common/s_nan.c
index 7ff4ef7..f062426 100644
--- a/newlib/libm/common/s_nan.c
+++ b/newlib/libm/common/s_nan.c
@@ -5,7 +5,7 @@
 
 /*
 FUNCTION
-	<<nan>>, <<nanf>>---representation of ``Not a Number''
+	<<nan>>, <<nanf>>---representation of infinity
 
 INDEX
 	nan
@@ -14,8 +14,8 @@ INDEX
 
 ANSI_SYNOPSIS
 	#include <math.h>
-	double nan(const char *);
-	float nanf(const char *);
+	double nan(void);
+	float nanf(void);
 
 TRAD_SYNOPSIS
 	#include <math.h>
@@ -25,8 +25,7 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 	<<nan>> and <<nanf>> return an IEEE NaN (Not a Number) in
-	double- and single-precision arithmetic respectively.  The
-	argument is currently disregarded.
+	double and single precision arithmetic respectivly.
 
 QUICKREF
 	nan - pure
@@ -37,7 +36,7 @@ QUICKREF
 
 #ifndef _DOUBLE_IS_32BITS
 
-	double nan(const char *unused)
+	double nan()
 {
 	double x;
 
diff --git a/newlib/libm/common/s_nearbyint.c b/newlib/libm/common/s_nearbyint.c
deleted file mode 100644
index 25e629b..0000000
--- a/newlib/libm/common/s_nearbyint.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#include <math.h>
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double nearbyint(double x)
-#else
-	double nearbyint(x)
-	double x;
-#endif
-{
-  return rint(x);
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_nextafter.c b/newlib/libm/common/s_nextafter.c
index 3a7fa3f..82eb8e3 100644
--- a/newlib/libm/common/s_nextafter.c
+++ b/newlib/libm/common/s_nextafter.c
@@ -38,7 +38,7 @@ TRAD_SYNOPSIS
 
 
 DESCRIPTION
-<<nextafter>> returns the double-precision floating-point number
+<<nextafter>> returns the double) precision floating point number
 closest to <[val]> in the direction toward <[dir]>.  <<nextafterf>>
 performs the same operation in single precision.  For example,
 <<nextafter(0.0,1.0)>> returns the smallest positive number which is
diff --git a/newlib/libm/common/s_remquo.c b/newlib/libm/common/s_remquo.c
deleted file mode 100644
index bd52f39..0000000
--- a/newlib/libm/common/s_remquo.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double remquo(double x, double y, int *quo)	/* wrapper remquo */
-#else
-	double remquo(x,y,quo)			/* wrapper remquo */
-	double x,y;
-        int *quo;
-#endif
-{
-        int signx, signy, signres;
-        int mswx;
-        int mswy;
-        double x_over_y;
-
-        GET_HIGH_WORD(mswx, x);
-        GET_HIGH_WORD(mswy, y);
-
-        signx = (mswx & 0x80000000) >> 31;
-        signy = (mswy & 0x80000000) >> 31;
-
-        signres = (signx ^ signy) ? -1 : 1;
-
-        x_over_y = fabs(x / y);
-
-        *quo = signres * (lrint(x_over_y) & 0x7f);
-
-        return remainder(x,y);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/s_round.c b/newlib/libm/common/s_round.c
deleted file mode 100644
index 09f19de..0000000
--- a/newlib/libm/common/s_round.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double round(double x)
-#else
-	double round(x)
-	double x;
-#endif
-{
-  /* Most significant word, least significant word. */
-  __int32_t msw, exponent_less_1023;
-  __uint32_t lsw;
-
-  EXTRACT_WORDS(msw, lsw, x);
-
-  /* Extract exponent field. */
-  exponent_less_1023 = ((msw & 0x7ff00000) >> 20) - 1023;
-
-  if (exponent_less_1023 < 20)
-    {
-      if (exponent_less_1023 < 0)
-        {
-          msw &= 0x80000000;
-          if (exponent_less_1023 == -1)
-            /* Result is +1.0 or -1.0. */
-            msw |= (1023 << 20);
-          lsw = 0;
-        }
-      else
-        {
-          __uint32_t exponent_mask = 0x000fffff >> exponent_less_1023;
-          if ((msw & exponent_mask) == 0 && lsw == 0)
-            /* x in an integral value. */
-            return x;
-
-          msw += 0x00080000 >> exponent_less_1023;
-          msw &= ~exponent_mask;
-          lsw = 0;
-        }
-    }
-  else if (exponent_less_1023 > 51)
-    {
-      if (exponent_less_1023 == 1024)
-        /* x is NaN or infinite. */
-        return x + x;
-      else
-        return x;
-    }
-  else
-    {
-      __uint32_t exponent_mask = 0xffffffff >> (exponent_less_1023 - 20);
-      __uint32_t tmp;
-
-      if ((lsw & exponent_mask) == 0)
-        /* x is an integral value. */
-        return x;
-
-      tmp = lsw + (1 << (51 - exponent_less_1023));
-      if (tmp < lsw)
-        msw += 1;
-      lsw = tmp;
-
-      lsw &= ~exponent_mask;
-    }
-  INSERT_WORDS(x, msw, lsw);
-
-  return x;
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_scalbln.c b/newlib/libm/common/s_scalbln.c
deleted file mode 100644
index 5af9d89..0000000
--- a/newlib/libm/common/s_scalbln.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* @(#)s_scalbn.c 5.1 93/09/24 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-/*
- * scalbn (double x, int n)
- * scalbn(x,n) returns x* 2**n  computed by  exponent
- * manipulation rather than by actually performing an
- * exponentiation or a multiplication.
- */
-
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-two54   =  1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */
-twom54  =  5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */
-huge   = 1.0e+300,
-tiny   = 1.0e-300;
-
-#ifdef __STDC__
-	double scalbln (double x, long int n)
-#else
-	double scalbln (x,n)
-	double x; long int n;
-#endif
-{
-	__int32_t k,hx,lx;
-	EXTRACT_WORDS(hx,lx,x);
-        k = (hx&0x7ff00000)>>20;		/* extract exponent */
-        if (k==0) {				/* 0 or subnormal x */
-            if ((lx|(hx&0x7fffffff))==0) return x; /* +-0 */
-	    x *= two54;
-	    GET_HIGH_WORD(hx,x);
-	    k = ((hx&0x7ff00000)>>20) - 54;
-	    }
-        if (k==0x7ff) return x+x;		/* NaN or Inf */
-        k = k+n;
-        if (n> 50000 || k >  0x7fe)
-	  return huge*copysign(huge,x); /* overflow  */
-	if (n< -50000) return tiny*copysign(tiny,x); /*underflow*/
-        if (k > 0) 				/* normal result */
-	    {SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x;}
-        if (k <= -54)
-	  return tiny*copysign(tiny,x); 	/*underflow*/
-        k += 54;				/* subnormal result */
-	SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20));
-        return x*twom54;
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/s_scalbn.c b/newlib/libm/common/s_scalbn.c
index 5edf6b7..e067670 100644
--- a/newlib/libm/common/s_scalbn.c
+++ b/newlib/libm/common/s_scalbn.c
@@ -13,7 +13,7 @@
 
 /*
 FUNCTION
-<<scalbn>>, <<scalbnf>>---scale by power of two
+<<scalbn>>, <<scalbnf>>---scale by integer
 INDEX
 	scalbn
 INDEX
diff --git a/newlib/libm/common/s_signbit.c b/newlib/libm/common/s_signbit.c
deleted file mode 100644
index d7d49cb..0000000
--- a/newlib/libm/common/s_signbit.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-int __signbitf (float x);
-int __signbitd (double x);
-
-int
-__signbitf (float x)
-{
-  unsigned int w;
-
-  GET_FLOAT_WORD(w,x);
-
-  return (w & 0x80000000);
-}
-
-int
-__signbitd (double x)
-{
-  unsigned int msw;
-
-  GET_HIGH_WORD(msw, x);
-
-  return (msw & 0x80000000);
-}
diff --git a/newlib/libm/common/s_trunc.c b/newlib/libm/common/s_trunc.c
deleted file mode 100644
index c3ca154..0000000
--- a/newlib/libm/common/s_trunc.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double trunc(double x)
-#else
-	double trunc(x)
-	double x;
-#endif
-{
-  int signbit;
-  /* Most significant word, least significant word. */
-  int msw;
-  unsigned int lsw;
-  int exponent_less_1023;
-
-  EXTRACT_WORDS(msw, lsw, x);
-
-  /* Extract sign bit. */
-  signbit = msw & 0x80000000;
-
-  /* Extract exponent field. */
-  exponent_less_1023 = ((msw & 0x7ff00000) >> 20) - 1023;
-
-  if (exponent_less_1023 < 20)
-    {
-      /* All significant digits are in msw. */
-      if (exponent_less_1023 < 0)
-        {
-          /* -1 < x < 1, so result is +0 or -0. */
-          INSERT_WORDS(x, signbit, 0);
-        }
-      else
-        {
-          /* All relevant fraction bits are in msw, so lsw of the result is 0. */
-          INSERT_WORDS(x, signbit | (msw & ~(0x000fffff >> exponent_less_1023)), 0);
-        }
-    }
-  else if (exponent_less_1023 > 51)
-    {
-      if (exponent_less_1023 == 1024)
-        {
-          /* x is infinite, or not a number, so trigger an exception. */
-          return x + x;
-        }
-      /* All bits in the fraction fields of the msw and lsw are needed in the result. */
-    }
-  else
-    {
-      /* All fraction bits in msw are relevant.  Truncate irrelevant
-         bits from lsw. */
-      INSERT_WORDS(x, msw, lsw & ~(0xffffffffu >> (exponent_less_1023 - 20)));
-    }
-  return x;
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/common/sf_fdim.c b/newlib/libm/common/sf_fdim.c
deleted file mode 100644
index 80221ac..0000000
--- a/newlib/libm/common/sf_fdim.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	float fdimf(float x, float y)
-#else
-	float fdimf(x,y)
-	float x;
-	float y;
-#endif
-{
-  int c = __fpclassifyf(x);
-  if (c == FP_NAN || c == FP_INFINITE)
-    return HUGE_VAL;
-
-  return x > y ? x - y : 0.0;
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double fdim(double x, double y)
-#else
-	double fdim(x,y)
-	double x;
-	double y;
-#endif
-{
-  return (double) fdimf((float) x, (float) y);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_fma.c b/newlib/libm/common/sf_fma.c
deleted file mode 100644
index 3b4bcc1..0000000
--- a/newlib/libm/common/sf_fma.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	float fmaf(float x, float y, float z)
-#else
-	float fmaf(x,y,z)
-	float x;
-	float y;
-        float z;
-#endif
-{
-  /* Let the implementation handle this. */
-  return (x * y) + z;
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double fma(double x, double y, double z)
-#else
-	double fma(x,y,z)
-	double x;
-	double y;
-        double z;
-#endif
-{
-  return (double) fmaf((float) x, (float) y, (float) z);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_fmax.c b/newlib/libm/common/sf_fmax.c
deleted file mode 100644
index ac1bf46..0000000
--- a/newlib/libm/common/sf_fmax.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	float fmaxf(float x, float y)
-#else
-	float fmaxf(x,y)
-	float x;
-	float y;
-#endif
-{
-  if (__fpclassifyf(x) == FP_NAN)
-    return y;
-  if (__fpclassifyf(y) == FP_NAN)
-    return x;
-  
-  return x > y ? x : y;
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double fmax(double x, double y)
-#else
-	double fmax(x,y)
-	double x;
-	double y;
-#endif
-{
-  return (double) fmaxf((float) x, (float) y);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_fmin.c b/newlib/libm/common/sf_fmin.c
deleted file mode 100644
index f0e3444..0000000
--- a/newlib/libm/common/sf_fmin.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	float fminf(float x, float y)
-#else
-	float fminf(x,y)
-	float x;
-	float y;
-#endif
-{
-  if (__fpclassifyf(x) == FP_NAN)
-    return y;
-  if (__fpclassifyf(y) == FP_NAN)
-    return x;
-  
-  return x < y ? x : y;
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double fmin(double x, double y)
-#else
-	double fmin(x,y)
-	double x;
-	double y;
-#endif
-{
-  return (double) fminf((float) x, (float) y);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_isinf.c b/newlib/libm/common/sf_isinf.c
deleted file mode 100644
index 74ba4ed..0000000
--- a/newlib/libm/common/sf_isinf.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * isinff(x) returns 1 if x is +-infinity, else 0;
- *
- * isinff is an extension declared in <ieeefp.h> and
- * <math.h>.
- */
-
-#include "fdlibm.h"
-
-int
-_DEFUN (isinff, (x),
-	float x)
-{
-	__int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-	return FLT_UWORD_IS_INFINITE(ix);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#undef isinf
-
-int
-_DEFUN (isinf, (x),
-	double x)
-{
-	return isinff((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_isinff.c b/newlib/libm/common/sf_isinff.c
deleted file mode 100644
index 9d0e742..0000000
--- a/newlib/libm/common/sf_isinff.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * __isinff(x) returns 1 if x is +-infinity, else 0;
- * Added by Cygnus Support.
- */
-
-#include "fdlibm.h"
-
-int
-_DEFUN (__isinff, (x),
-	float x)
-{
-	__int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-	return FLT_UWORD_IS_INFINITE(ix);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-int
-_DEFUN (__isinfd, (x),
-	double x)
-{
-	return __isinff((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_isnan.c b/newlib/libm/common/sf_isnan.c
deleted file mode 100644
index befc3b2..0000000
--- a/newlib/libm/common/sf_isnan.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* sf_c_isnan.c -- float version of s_c_isnan.c.
- */
-
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * isnanf(x) returns 1 is x is nan, else 0;
- *
- * isnanf is an extension declared in <ieeefp.h> and <math.h>.
- */
-
-#include "fdlibm.h"
-
-int
-_DEFUN (isnanf, (x),
-	float x)
-{
-	__int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-	return FLT_UWORD_IS_NAN(ix);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#undef isnan
-
-int
-_DEFUN (isnan, (x),
-	double x)
-{
-	return isnanf((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_isnanf.c b/newlib/libm/common/sf_isnanf.c
deleted file mode 100644
index 0b0d9bb..0000000
--- a/newlib/libm/common/sf_isnanf.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * __isnanf(x) returns 1 is x is nan, else 0;
- */
-
-#include "fdlibm.h"
-
-int
-_DEFUN (__isnanf, (x),
-	float x)
-{
-	__int32_t ix;
-	GET_FLOAT_WORD(ix,x);
-	ix &= 0x7fffffff;
-	return FLT_UWORD_IS_NAN(ix);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-int
-_DEFUN (__isnand, (x),
-	double x)
-{
-	return __isnanf((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_lrint.c b/newlib/libm/common/sf_lrint.c
deleted file mode 100644
index 3165705..0000000
--- a/newlib/libm/common/sf_lrint.c
+++ /dev/null
@@ -1,101 +0,0 @@
-
-/* @(#)sf_lrint.c 5.1 93/09/24 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
- * lrintf(x)
- * Return x rounded to integral value according to the prevailing
- * rounding mode.
- * Method:
- *	Using floating addition.
- * Exception:
- *	Inexact flag raised if x not equal to lrintf(x).
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const float
-#else
-static float 
-#endif
-/* Adding a float, x, to 2^23 will cause the result to be rounded based on
-   the fractional part of x, according to the implementation's current rounding
-   mode.  2^23 is the smallest float that can be represented using all 23 significant
-   digits. */
-TWO23[2]={
-  8.3886080000e+06, /* 0x4b000000 */
- -8.3886080000e+06, /* 0xcb000000 */
-};
-
-#ifdef __STDC__
-	long int lrintf(float x)
-#else
-	long int lrintf(x)
-	float x;
-#endif
-{
-  __int32_t j0,sx;
-  __uint32_t i0;
-  float t;
-  volatile float w;
-  long int result;
-
-  GET_FLOAT_WORD(i0,x);
-
-  /* Extract sign bit. */
-  sx = (i0 >> 31);
-
-  /* Extract exponent field. */
-  j0 = ((i0 & 0x7f800000) >> 23) - 127;
-  
-  if (j0 < (int)(sizeof (long int) * 8) - 1)
-    {
-      if (j0 < -1)
-        return 0;
-      else if (j0 >= 23)
-        result = (long int) ((i0 & 0x7fffff) | 0x800000) << (j0 - 23);
-      else
-        {
-          w = TWO23[sx] + x;
-          t = w - TWO23[sx];
-          GET_FLOAT_WORD (i0, t);
-          /* Detect the all-zeros representation of plus and
-             minus zero, which fails the calculation below. */
-          if ((i0 & ~(1 << 31)) == 0)
-              return 0;
-          j0 = ((i0 >> 23) & 0xff) - 0x7f;
-          i0 &= 0x7fffff;
-          i0 |= 0x800000;
-          result = i0 >> (23 - j0);
-        }
-    }
-  else
-    {
-      return (long int) x;
-    }
-  return sx ? -result : result;
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	long int lrint(double x)
-#else
-	long int lrint(x)
-	double x;
-#endif
-{
-  return (double) lrintf((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_lround.c b/newlib/libm/common/sf_lround.c
deleted file mode 100644
index d715423..0000000
--- a/newlib/libm/common/sf_lround.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	long int lroundf(float x)
-#else
-	long int lroundf(x)
-	float x;
-#endif
-{
-  __int32_t exponent_less_127;
-  __uint32_t w;
-  long int result;
-  __int32_t sign;
-
-  GET_FLOAT_WORD (w, x);
-  exponent_less_127 = ((w & 0x7f800000) >> 23) - 127;
-  sign = (w & 0x80000000) != 0 ? -1 : 1;
-  w &= 0x7fffff;
-  w |= 0x800000;
-
-  if (exponent_less_127 < (8 * sizeof (long int)) - 1)
-    {
-      if (exponent_less_127 < 0)
-        return exponent_less_127 < -1 ? 0 : sign;
-      else if (exponent_less_127 >= 23)
-        result = (long int) w << (exponent_less_127 - 23);
-      else
-        {
-          w += 0x400000 >> exponent_less_127;
-          result = w >> (23 - exponent_less_127);
-        }
-    }
-  else
-      return (long int) x;
-
-  return sign * result;
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	long int lround(double x)
-#else
-	long int lround(x)
-	double x;
-#endif
-{
-	return (double) lroundf((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_nan.c b/newlib/libm/common/sf_nan.c
index 831f3f7..c8d7027 100644
--- a/newlib/libm/common/sf_nan.c
+++ b/newlib/libm/common/sf_nan.c
@@ -5,7 +5,7 @@
 
 #include "fdlibm.h"
 
-	float nanf(const char *unused)
+	float nanf()
 {
 	float x;
 
@@ -15,9 +15,9 @@
 
 #ifdef _DOUBLE_IS_32BITS
 
-	double nan(const char *arg)
+	double nan()
 {
-	return (double) nanf(arg);
+	return (double) nanf();
 }
 
 #endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_nearbyint.c b/newlib/libm/common/sf_nearbyint.c
deleted file mode 100644
index 0073b6d..0000000
--- a/newlib/libm/common/sf_nearbyint.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-
-#include <math.h>
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	float nearbyintf(float x)
-#else
-	float nearbyintf(x)
-	float x;
-#endif
-{
-  return rintf(x);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double nearbyint(double x)
-#else
-	double nearbyint(x)
-	double x;
-#endif
-{
-  return (double) nearbyintf((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_remquo.c b/newlib/libm/common/sf_remquo.c
deleted file mode 100644
index 41c2038..0000000
--- a/newlib/libm/common/sf_remquo.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	float remquof(float x, float y, int *quo)	/* wrapper remquof */
-#else
-	float remquof(x,y,quo)			/* wrapper remquof */
-	float x,y;
-        int *quo;
-#endif
-{
-        int signx, signy, signres;
-        int wx;
-        int wy;
-        float x_over_y;
-
-        GET_FLOAT_WORD(wx, x);
-        GET_FLOAT_WORD(wy, y);
-
-        signx = (wx & 0x80000000) >> 31;
-        signy = (wy & 0x80000000) >> 31;
-
-        signres = (signx ^ signy) ? -1 : 1;
-
-        x_over_y = fabsf(x / y);
-
-        *quo = signres * (lrintf(x_over_y) & 0x7f);
-
-        return remainderf(x,y);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double remquo(double x, double y, int *quo)	/* wrapper remquof */
-#else
-	double remquo(x,y,quo)			/* wrapper remquof */
-	double x,y;
-        int *quo;
-#endif
-{
-	return (double) remquof((float) x, (float) y, quo);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_round.c b/newlib/libm/common/sf_round.c
deleted file mode 100644
index 6c9087d..0000000
--- a/newlib/libm/common/sf_round.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	float roundf(float x)
-#else
-	float roundf(x)
-	float x;
-#endif
-{
-  int signbit;
-  __uint32_t w;
-  /* Most significant word, least significant word. */
-  int exponent_less_127;
-
-  GET_FLOAT_WORD(w, x);
-
-  /* Extract sign bit. */
-  signbit = w & 0x80000000;
-
-  /* Extract exponent field. */
-  exponent_less_127 = (int)((w & 0x7f800000) >> 23) - 127;
-
-  if (exponent_less_127 < 23)
-    {
-      if (exponent_less_127 < 0)
-        {
-          w &= 0x80000000;
-          if (exponent_less_127 == -1)
-            /* Result is +1.0 or -1.0. */
-            w |= (127 << 23);
-        }
-      else
-        {
-          unsigned int exponent_mask = 0x007fffff >> exponent_less_127;
-          if ((w & exponent_mask) == 0)
-            /* x has an integral value. */
-            return x;
-
-          w += 0x00400000 >> exponent_less_127;
-          w &= ~exponent_mask;
-        }
-    }
-  else
-    {
-      if (exponent_less_127 == 128)
-        /* x is NaN or infinite. */
-        return x + x;
-      else
-        return x;
-    }
-  SET_FLOAT_WORD(x, w);
-  return x;
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double round(double x)
-#else
-	double round(x)
-	double x;
-#endif
-{
-	return (double) roundf((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_scalbln.c b/newlib/libm/common/sf_scalbln.c
deleted file mode 100644
index dd4baf5..0000000
--- a/newlib/libm/common/sf_scalbln.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* s_scalbnf.c -- float version of s_scalbn.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-static const float
-#else
-static float
-#endif
-two25   =  3.355443200e+07,	/* 0x4c000000 */
-twom25  =  2.9802322388e-08,	/* 0x33000000 */
-huge   = 1.0e+30,
-tiny   = 1.0e-30;
-
-#ifdef __STDC__
-	float scalblnf (float x, long int n)
-#else
-	float scalblnf (x,n)
-	float x; long int n;
-#endif
-{
-	__int32_t k,ix;
-	GET_FLOAT_WORD(ix,x);
-        k = (ix&0x7f800000)>>23;		/* extract exponent */
-        if (k==0) {				/* 0 or subnormal x */
-            if ((ix&0x7fffffff)==0) return x; /* +-0 */
-	    x *= two25;
-	    GET_FLOAT_WORD(ix,x);
-	    k = ((ix&0x7f800000)>>23) - 25;
-	    }
-        if (k==0xff) return x+x;		/* NaN or Inf */
-        k = k+n;
-        if (n> 50000 || k >  0xfe)
-	  return huge*copysignf(huge,x); /* overflow  */
-	if (n< -50000)
-	  return tiny*copysignf(tiny,x);	/*underflow*/
-        if (k > 0) 				/* normal result */
-	    {SET_FLOAT_WORD(x,(ix&0x807fffff)|(k<<23)); return x;}
-        if (k <= -25)
-	    return tiny*copysignf(tiny,x);	/*underflow*/
-        k += 25;				/* subnormal result */
-	SET_FLOAT_WORD(x,(ix&0x807fffff)|(k<<23));
-        return x*twom25;
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double scalbln (double x, long int n)
-#else
-	double scalbln (x,n)
-	double x; long int n;
-#endif
-{
-	return (double) scalblnf((float) x, n);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/common/sf_trunc.c b/newlib/libm/common/sf_trunc.c
deleted file mode 100644
index 74ea933..0000000
--- a/newlib/libm/common/sf_trunc.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	float truncf(float x)
-#else
-	float truncf(x)
-	float x;
-#endif
-{
-  __int32_t signbit, w, exponent_less_127;
-
-  GET_FLOAT_WORD(w,x);
-
-  /* Extract sign bit. */
-  signbit = w & 0x80000000;
-
-  /* Extract exponent field. */
-  exponent_less_127 = ((w & 0x7f800000) >> 23) - 127;
-
-  if (exponent_less_127 < 23)
-    {
-      if (exponent_less_127 < 0)
-        {
-          /* -1 < x < 1, so result is +0 or -0. */
-          SET_FLOAT_WORD(x, signbit);
-        }
-      else
-        {
-          SET_FLOAT_WORD(x, signbit | (w & ~(0x007fffff >> exponent_less_127)));
-        }
-    }
-  else
-    {
-      if (exponent_less_127 == 255)
-        /* x is NaN or infinite. */
-        return x + x;
-
-      /* All bits in the fraction field are relevant. */
-    }
-  return x;
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double trunc(double x)
-#else
-	double trunc(x)
-	double x;
-#endif
-{
-	return (double) truncf((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/configure b/newlib/libm/configure
index 075165c..65436e8 100755
--- a/newlib/libm/configure
+++ b/newlib/libm/configure
@@ -20,15 +20,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -42,8 +34,6 @@ ac_help="$ac_help
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -61,6 +51,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -175,6 +166,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -345,6 +337,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -510,12 +507,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -597,7 +598,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -851,79 +851,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -941,34 +878,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:972: checking host system type" >&5
+echo "configure:888: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -988,52 +904,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:993: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1011: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1049,21 +924,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1054: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:929: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1067: checking for working autoconf" >&5
+echo "configure:942: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1075,21 +950,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1080: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:955: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1093: checking for working autoheader" >&5
+echo "configure:968: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1102,7 +977,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1106: checking for working makeinfo" >&5
+echo "configure:981: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1127,7 +1002,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1131: checking for $ac_word" >&5
+echo "configure:1006: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1157,7 +1032,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1161: checking for $ac_word" >&5
+echo "configure:1036: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1206,7 +1081,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1210: checking whether we are using GNU C" >&5
+echo "configure:1085: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1215,7 +1090,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1230,7 +1105,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1234: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1109: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1258,10 +1133,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1142: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1265: checking for $ac_word" >&5
+echo "configure:1163: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1293,7 +1191,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1297: checking for $ac_word" >&5
+echo "configure:1195: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1325,7 +1223,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1329: checking for $ac_word" >&5
+echo "configure:1227: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1357,7 +1255,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1361: checking for $ac_word" >&5
+echo "configure:1259: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1402,7 +1300,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1406: checking for a BSD compatible install" >&5
+echo "configure:1304: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1455,11 +1353,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1463: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1358: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1493,7 +1388,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1497: checking for executable suffix" >&5
+echo "configure:1392: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1503,10 +1398,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1527,6 +1422,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1537,52 +1444,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1591,12 +1452,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1611,7 +1466,7 @@ if test "${use_libtool}" = "yes"; then
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -1634,7 +1489,7 @@ fi
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -1657,7 +1512,7 @@ fi
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -1676,10 +1531,40 @@ else
   enable_fast_install=yes
 fi
 
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1538: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1683: checking for $ac_word" >&5
+echo "configure:1568: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1709,7 +1594,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1713: checking for $ac_word" >&5
+echo "configure:1598: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1760,7 +1645,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1764: checking for $ac_word" >&5
+echo "configure:1649: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1792,7 +1677,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1796: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1681: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1803,12 +1688,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1807 "configure"
+#line 1692 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1834,12 +1719,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1838: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1723: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1843: checking whether we are using GNU C" >&5
+echo "configure:1728: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1848,7 +1733,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1867,7 +1752,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1871: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1756: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1907,18 +1792,12 @@ else
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1914: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+echo "configure:1799: checking for ld used by GCC" >&5
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
@@ -1940,12 +1819,12 @@ echo "configure:1914: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1944: checking for GNU ld" >&5
+echo "configure:1823: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1947: checking for non-GNU ld" >&5
+echo "configure:1826: checking for non-GNU ld" >&5
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -z "$LD"; then
@@ -1953,11 +1832,11 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -1966,11 +1845,11 @@ else
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   echo "$ac_t""$LD" 1>&6
 else
@@ -1978,74 +1857,59 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1982: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
+echo "configure:1861: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi
 fi
 
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
+echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
 
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1999: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:2011: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
+echo "configure:1877: checking for BSD-compatible nm" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi
 fi
 
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2049: checking whether ln -s works" >&5
+echo "configure:1913: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2065,482 +1929,14 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2070: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2243: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2273: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2335: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2406: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2438: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2473: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2505: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
 
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 
 libtool_flags="$libtool_flags --enable-win32-dll"
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
@@ -2552,25 +1948,14 @@ fi
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2572 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
+  echo '#line 1957 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -2585,48 +1970,24 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2610: checking whether the C compiler needs -belf" >&5
+echo "configure:1979: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2623 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1984 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2636,13 +1997,6 @@ else
   lt_cv_cc_needs_belf=no
 fi
 rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
 fi
 
 echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
@@ -2652,11 +2006,11 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   fi
   ;;
 
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+*-*-cygwin* | *-*-mingw*)
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2660: checking for $ac_word" >&5
+echo "configure:2014: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2688,7 +2042,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2692: checking for $ac_word" >&5
+echo "configure:2046: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2723,7 +2077,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2727: checking for $ac_word" >&5
+echo "configure:2081: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2755,7 +2109,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2759: checking for $ac_word" >&5
+echo "configure:2113: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2790,7 +2144,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2794: checking for $ac_word" >&5
+echo "configure:2148: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2822,7 +2176,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2826: checking for $ac_word" >&5
+echo "configure:2180: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2854,77 +2208,8 @@ else
 fi
 fi
 
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2862: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2867 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2896: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2901 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  
+
 esac
 
 
@@ -2978,14 +2263,12 @@ rm -f confcache
 
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -2999,7 +2282,7 @@ fi
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -3008,19 +2291,14 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 # clobbered by the next message.
 exec 5>>./config.log
 
-  
-
-  
-	 
-	 
 fi
 
 LIBM_MACHINE_LIB=
-if test -n "${libm_machine_dir}"; then
+if test -n "${machine_dir}"; then
   subdirs="machine"
 
   if test "${use_libtool}" = "yes"; then
-    LIBM_MACHINE_LIB=machine/${libm_machine_dir}/lib${libm_machine_dir}.${aext}
+    LIBM_MACHINE_LIB=machine/${machine_dir}/lib${machine_dir}.${aext}
   else
     LIBM_MACHINE_LIB=machine/lib.${aext}
   fi
@@ -3175,24 +2453,12 @@ s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@NEWLIB_HW_FP_TRUE@%$NEWLIB_HW_FP_TRUE%g
 s%@NEWLIB_HW_FP_FALSE@%$NEWLIB_HW_FP_FALSE%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -3205,6 +2471,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -3213,26 +2484,14 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
 s%@machine_dir@%$machine_dir%g
 s%@sys_dir@%$sys_dir%g
 s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@OBJDUMP@%$OBJDUMP%g
 s%@LIBTOOL@%$LIBTOOL%g
@@ -3246,7 +2505,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libm/configure.in b/newlib/libm/configure.in
index 1c59c5a..ed32902 100644
--- a/newlib/libm/configure.in
+++ b/newlib/libm/configure.in
@@ -28,10 +28,10 @@ AM_PROG_LIBTOOL
 fi
 
 LIBM_MACHINE_LIB=
-if test -n "${libm_machine_dir}"; then
+if test -n "${machine_dir}"; then
   AC_CONFIG_SUBDIRS(machine)
   if test "${use_libtool}" = "yes"; then
-    LIBM_MACHINE_LIB=machine/${libm_machine_dir}/lib${libm_machine_dir}.${aext}
+    LIBM_MACHINE_LIB=machine/${machine_dir}/lib${machine_dir}.${aext}
   else
     LIBM_MACHINE_LIB=machine/lib.${aext}
   fi
diff --git a/newlib/libm/libm.texinfo b/newlib/libm/libm.texinfo
index 309f39f..ab527a2 100644
--- a/newlib/libm/libm.texinfo
+++ b/newlib/libm/libm.texinfo
@@ -28,7 +28,7 @@ END-INFO-DIR-ENTRY
 @ifinfo
 This file documents an ANSI-C conforming mathematical subroutine library.
 
-Copyright (C) 1992, 1993, 1995, 1996-2004 Red Hat, Inc. 
+Copyright (C) 1992, 1993, 1995 Cygnus Support
 
 @file{libm} includes software developed at SunPro, a Sun Microsystems,
 Inc. business.  Permission to use, copy, modify, and distribute this
@@ -57,30 +57,28 @@ into another language, under the above conditions for modified versions.
 @iftex
 @finalout
 @setchapternewpage odd
-@settitle The Red Hat newlib C Math Library
+@settitle Cygnus C Math Library
 @titlepage
-@title The Red Hat newlib C Math Library
+@title The Cygnus C Math Library
 @sp 1
-@subtitle @code{libm} 1.14.0
-@subtitle December 2005
+@subtitle @code{libm} 1.4
+@subtitle December 1995
 @author {Steve Chamberlain}
 @author {Roland Pesch}
-@author {Red Hat Support}
-@author {Jeff Johnston}
+@author {Cygnus Support}
 @page
 
 @tex
 {\parskip=0pt
-\hfill Red Hat Support\par
+\hfill Cygnus Support\par
 \hfill sac@@cygnus.com\par
 \hfill pesch@@cygnus.com\par
-\hfill jjohnstn@@redhat.com\par
 }
 \global\parindent=0pt % Steve likes it this way
 @end tex
 
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1992, 1993, 1994-2004 Red Hat, Inc. 
+Copyright @copyright{} 1992, 1993 Cygnus Support
 
 @file{libm} includes software developed at SunPro, a Sun Microsystems,
 Inc. business.  Permission to use, copy, modify, and distribute this
@@ -127,7 +125,7 @@ be reentrant.
 @c The exact behavior depends on the currently selected error handling 
 @c mode (IEEE, POSIX, X/Open, or SVID).
 
-With reentrant C libraries like the Red Hat newlib C library, @code{errno} is
+With reentrant C libraries like the Cygnus C library, @code{errno} is
 a macro which expands to the per-thread error value.  This makes it thread
 safe.
 
diff --git a/newlib/libm/machine/Makefile.am b/newlib/libm/machine/Makefile.am
index ef8b143..4b972f7 100644
--- a/newlib/libm/machine/Makefile.am
+++ b/newlib/libm/machine/Makefile.am
@@ -20,7 +20,7 @@ endif # USE_LIBTOOL
 
 $(libm_machine_dir)/lib.a:
 
-doc:
+doc:  
 
 ACLOCAL_AMFLAGS = -I ../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
diff --git a/newlib/libm/machine/Makefile.in b/newlib/libm/machine/Makefile.in
index 41c0461..339a0f8 100644
--- a/newlib/libm/machine/Makefile.in
+++ b/newlib/libm/machine/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -57,22 +57,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
@@ -80,10 +72,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
 libm_machine_dir = @libm_machine_dir@
@@ -97,9 +87,9 @@ AUTOMAKE_OPTIONS = cygnus
 
 SUBDIRS = $(libm_machine_dir) .
 
-@HAVE_LIBM_MACHINE_DIR_TRUE@LIBM_MACHLIB = lib.a
+@HAVE_LIBM_MACHINE_DIR_TRUE@LIBM_MACHLIB = @HAVE_LIBM_MACHINE_DIR_TRUE@lib.a
 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = $(LIBM_MACHLIB)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@$(LIBM_MACHLIB)
 
 ACLOCAL_AMFLAGS = -I ../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@@ -114,7 +104,7 @@ CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
 lib_a_SOURCES = lib.a.c
-lib_a_OBJECTS =  lib.a.$(OBJEXT)
+lib_a_OBJECTS =  lib.a.o
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -128,11 +118,11 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = gtar
 GZIP_ENV = --best
 SOURCES = lib.a.c
-OBJECTS = lib.a.$(OBJEXT)
+OBJECTS = lib.a.o
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
+.SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
 
@@ -141,7 +131,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  ../../acinclude.m4 \
-		../../aclocal.m4 ../../libtool.m4
+		../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -161,11 +151,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -174,7 +159,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -238,7 +222,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
+	  test "$$subdir" = "." && dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -442,7 +426,7 @@ maintainer-clean
 
 $(libm_machine_dir)/lib.a:
 
-doc:
+doc:  
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/newlib/libm/machine/aclocal.m4 b/newlib/libm/machine/aclocal.m4
index 35519ac..a5208f1 100644
--- a/newlib/libm/machine/aclocal.m4
+++ b/newlib/libm/machine/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,60 +284,41 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
 
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
+
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
 # Save cache, so that ltconfig can load it
 AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
 AC_CACHE_LOAD
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -431,43 +329,27 @@ AC_SUBST(LIBTOOL)dnl
 exec 5>>./config.log
 ])
 
-AC_DEFUN([AC_LIBTOOL_SETUP],
+AC_DEFUN(AC_LIBTOOL_SETUP,
 [AC_PREREQ(2.13)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 AC_REQUIRE([AC_PROG_NM])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
 [libtool_flags="$libtool_flags --enable-dlopen"])
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
@@ -477,20 +359,14 @@ AC_ARG_ENABLE(libtool-lock,
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -505,31 +381,12 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -537,56 +394,33 @@ ia64-*-hpux*)
   ;;
 
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+[*-*-cygwin* | *-*-mingw*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  ])
+])
 esac
 ])
 
 # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
 
 # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
 
 # AC_ENABLE_SHARED - implement the --enable-shared flag
 # Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
 <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -605,21 +439,21 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
 # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)])
 
 # AC_ENABLE_STATIC - implement the --enable-static flag
 # Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
 <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -638,8 +472,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])
 
 # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_STATIC(no)])
 
 
@@ -647,14 +480,14 @@ AC_ENABLE_STATIC(no)])
 # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(fast-install,
 changequote(<<, >>)dnl
 <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -672,98 +505,12 @@ esac],
 enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_FAST_INSTALL(no)])
 
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
 # AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -771,20 +518,16 @@ AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
+changequote(,)dnl
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
@@ -806,17 +549,17 @@ elif test "$with_gnu_ld" = yes; then
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL(lt_cv_path_LD,
+AC_CACHE_VAL(ac_cv_path_LD,
 [if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -825,9 +568,9 @@ AC_CACHE_VAL(lt_cv_path_LD,
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -837,240 +580,56 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_PROG_LD_GNU
 ])
 
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
 ])
 
-
 # AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
+AC_CACHE_VAL(ac_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi])
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
 ])
 
 # AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
+AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
+case "$host" in
+*-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
@@ -1084,39 +643,33 @@ esac
 ])
 
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case "$enable_ltdl_convenience" in
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   AC_CHECK_LIB(ltdl, main,
   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
   [if test x"$enable_ltdl_install" = xno; then
@@ -1127,8 +680,8 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
@@ -1136,91 +689,15 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   fi
 ])
 
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
 dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
 
 dnl This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])dnl
 
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libm/machine/configure b/newlib/libm/machine/configure
index 09ca607..1d08c87 100755
--- a/newlib/libm/machine/configure
+++ b/newlib/libm/machine/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -40,8 +32,6 @@ ac_help="$ac_help
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -59,6 +49,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -173,6 +164,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -343,6 +335,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -508,12 +505,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -573,7 +574,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -827,79 +827,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -917,34 +854,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:948: checking host system type" >&5
+echo "configure:864: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -964,52 +880,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:969: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:987: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1025,21 +900,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1030: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:905: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1043: checking for working autoconf" >&5
+echo "configure:918: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1051,21 +926,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1056: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:931: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1069: checking for working autoheader" >&5
+echo "configure:944: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1078,7 +953,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1082: checking for working makeinfo" >&5
+echo "configure:957: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1103,7 +978,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
+echo "configure:982: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1133,7 +1008,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
+echo "configure:1012: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1182,7 +1057,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1186: checking whether we are using GNU C" >&5
+echo "configure:1061: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1191,7 +1066,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1206,7 +1081,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1210: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1085: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1234,10 +1109,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1118: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_word" >&5
+echo "configure:1139: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1269,7 +1167,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_word" >&5
+echo "configure:1171: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1301,7 +1199,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
+echo "configure:1203: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1333,7 +1231,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1337: checking for $ac_word" >&5
+echo "configure:1235: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1378,7 +1276,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1382: checking for a BSD compatible install" >&5
+echo "configure:1280: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1431,11 +1329,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1334: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1364,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1368: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,10 +1374,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1503,6 +1398,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1513,52 +1420,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1567,12 +1428,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1587,7 +1442,7 @@ if test "${use_libtool}" = "yes"; then
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -1610,7 +1465,7 @@ fi
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -1633,7 +1488,7 @@ fi
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -1652,10 +1507,40 @@ else
   enable_fast_install=yes
 fi
 
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1514: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1544: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1570,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1574: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1621,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1625: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1653,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1657: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1664,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1668 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1695,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1704: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1709,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1728,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1732: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1883,18 +1768,12 @@ else
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+echo "configure:1775: checking for ld used by GCC" >&5
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
@@ -1916,12 +1795,12 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1799: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1802: checking for non-GNU ld" >&5
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -z "$LD"; then
@@ -1929,11 +1808,11 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -1942,11 +1821,11 @@ else
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   echo "$ac_t""$LD" 1>&6
 else
@@ -1954,74 +1833,59 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
+echo "configure:1837: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi
 fi
 
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
+echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
 
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
+echo "configure:1853: checking for BSD-compatible nm" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi
 fi
 
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:1889: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2041,482 +1905,14 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
 
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 
 libtool_flags="$libtool_flags --enable-win32-dll"
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
@@ -2528,25 +1924,14 @@ fi
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
+  echo '#line 1933 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -2561,48 +1946,24 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:1955: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1960 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2612,13 +1973,6 @@ else
   lt_cv_cc_needs_belf=no
 fi
 rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
 fi
 
 echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
@@ -2628,11 +1982,11 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   fi
   ;;
 
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+*-*-cygwin* | *-*-mingw*)
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:1990: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2018,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2022: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2053,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2057: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2085,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2089: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2120,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2124: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2152,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2156: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2830,77 +2184,8 @@ else
 fi
 fi
 
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  
+
 esac
 
 
@@ -2954,14 +2239,12 @@ rm -f confcache
 
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -2975,7 +2258,7 @@ fi
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -2984,11 +2267,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 # clobbered by the next message.
 exec 5>>./config.log
 
-  
-
-  
-	 
-	 
 fi
 
 machlib=
@@ -3160,24 +2438,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -3190,6 +2456,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -3198,26 +2469,14 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
 s%@machine_dir@%$machine_dir%g
 s%@sys_dir@%$sys_dir%g
 s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@OBJDUMP@%$OBJDUMP%g
 s%@LIBTOOL@%$LIBTOOL%g
@@ -3233,7 +2492,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libm/machine/i386/Makefile.in b/newlib/libm/machine/i386/Makefile.in
index c06be50..7436536 100644
--- a/newlib/libm/machine/i386/Makefile.in
+++ b/newlib/libm/machine/i386/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,22 +58,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
@@ -81,10 +73,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
 libm_machine_dir = @libm_machine_dir@
@@ -97,17 +87,20 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-LIB_SOURCES =  	f_atan2.S f_atan2f.S f_exp.c f_expf.c 	f_frexp.S f_frexpf.S f_log.S f_logf.S f_log10.S f_log10f.S 	f_ldexp.S f_ldexpf.S f_pow.c f_powf.c f_tan.S f_tanf.S f_math.h i386mach.h
+LIB_SOURCES = \
+	f_atan2.S f_atan2f.S f_exp.c f_expf.c \
+	f_frexp.S f_frexpf.S f_log.S f_logf.S f_log10.S f_log10f.S \
+	f_ldexp.S f_ldexpf.S f_pow.c f_powf.c f_tan.S f_tanf.S f_math.h i386mach.h
 
 
 libi386_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libi386.la
-@USE_LIBTOOL_TRUE@libi386_la_SOURCES = $(LIB_SOURCES)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libi386.la
+@USE_LIBTOOL_TRUE@libi386_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(LIB_SOURCES)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES)
 
 ACLOCAL_AMFLAGS = -I ../../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
@@ -121,12 +114,10 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  f_atan2.$(OBJEXT) f_atan2f.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@f_exp.$(OBJEXT) f_expf.$(OBJEXT) f_frexp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@f_frexpf.$(OBJEXT) f_log.$(OBJEXT) f_logf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@f_log10.$(OBJEXT) f_log10f.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@f_ldexp.$(OBJEXT) f_ldexpf.$(OBJEXT) f_pow.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@f_powf.$(OBJEXT) f_tan.$(OBJEXT) f_tanf.$(OBJEXT)
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  f_atan2.o f_atan2f.o f_exp.o \
+@USE_LIBTOOL_FALSE@f_expf.o f_frexp.o f_frexpf.o f_log.o f_logf.o \
+@USE_LIBTOOL_FALSE@f_log10.o f_log10f.o f_ldexp.o f_ldexpf.o f_pow.o \
+@USE_LIBTOOL_FALSE@f_powf.o f_tan.o f_tanf.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libi386_la_LIBADD = 
@@ -153,7 +144,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libi386_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
+.SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
 
@@ -162,8 +153,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  \
-		../../../acinclude.m4 ../../../aclocal.m4 \
-		../../../libtool.m4
+		../../../acinclude.m4 ../../../aclocal.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -183,11 +173,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -196,7 +181,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
diff --git a/newlib/libm/machine/i386/aclocal.m4 b/newlib/libm/machine/i386/aclocal.m4
index 35519ac..a5208f1 100644
--- a/newlib/libm/machine/i386/aclocal.m4
+++ b/newlib/libm/machine/i386/aclocal.m4
@@ -1,6 +1,6 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -47,57 +47,14 @@ AC_ARG_ENABLE(malloc-debugging,
   *)   AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;;
  esac], [malloc_debugging=])dnl
 
-dnl Support --enable-newlib-multithread
-AC_ARG_ENABLE(newlib-multithread,
-[  --enable-newlib-multithread        enable support for multiple threads],
+dnl Support --enable-newlib-mb
+AC_ARG_ENABLE(newlib-mb,
+[  --enable-newlib-mb        enable multibyte support],
 [case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;;
- esac], [newlib_multithread=yes])dnl
-
-dnl Support --enable-newlib-iconv
-AC_ARG_ENABLE(newlib-iconv,
-[  --enable-newlib-iconv     enable iconv library support],
-[if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;;
-   esac
- fi], [newlib_iconv=${newlib_iconv}])dnl
-
-dnl Support --enable-newlib-elix-level
-AC_ARG_ENABLE(newlib-elix-level,
-[  --enable-newlib-elix-level         supply desired elix library level (1-4)],
-[case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;;
- esac], [newlib_elix_level=0])dnl
-
-dnl Support --disable-newlib-io-float
-AC_ARG_ENABLE(newlib-io-float,
-[  --disable-newlib-io-float disable printf/scanf family float support],
-[case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;;
- esac], [newlib_io_float=yes])dnl
-
-dnl Support --disable-newlib-supplied-syscalls
-AC_ARG_ENABLE(newlib-supplied-syscalls,
-[  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls],
-[case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;;
- esac], [newlib_may_supply_syscalls=yes])dnl
-
-AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes)
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for newlib-mb option) ;;
+ esac], [newlib_mb=no])dnl
 
 dnl We may get other options which we don't document:
 dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
@@ -115,9 +72,9 @@ else
 fi
 AC_SUBST(newlib_basedir)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(newlib, 1.14.0)
+AM_INIT_AUTOMAKE(newlib, 1.10.0)
 
 # FIXME: We temporarily define our own version of AC_PROG_CC.  This is
 # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
@@ -159,15 +116,18 @@ fi
 
 LIB_AC_PROG_CC
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+AC_CANONICAL_BUILD
+
 AC_CHECK_TOOL(AS, as)
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 AC_PROG_INSTALL
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 AM_MAINTAINER_MODE
 
 # We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
@@ -183,6 +143,18 @@ fi
 
 . [$]{newlib_basedir}/configure.host
 
+case [$]{newlib_basedir} in
+/* | [A-Za-z]:[/\\]*) newlib_flagbasedir=[$]{newlib_basedir} ;;
+*) newlib_flagbasedir='[$](top_builddir)/'[$]{newlib_basedir} ;;
+esac
+
+newlib_cflags="[$]{newlib_cflags} -I"'[$](top_builddir)'"/$1/targ-include -I[$]{newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="[$]{newlib_cflags} -I[$]{newlib_flagbasedir}/../winsup/cygwin/include  -I[$]{newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="[$]{newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -191,19 +163,7 @@ AC_SUBST(NEWLIB_CFLAGS)
 LDFLAGS=${ldflags}
 AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0)
-AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1)
-AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2)
-AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3)
-AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4)
-
 AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes)
-
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-AC_SUBST(OBJEXT)
 AC_SUBST(oext)
 AC_SUBST(aext)
 
@@ -221,9 +181,8 @@ AC_SUBST(sys_dir)
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -239,47 +198,18 @@ AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-# Copyright 2002  Free Software Foundation, Inc.
-
-# This program 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 program 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 program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.4-p6])])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN([AM_SANITY_CHECK],
+AC_DEFUN(AM_SANITY_CHECK,
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -320,7 +250,7 @@ AC_MSG_RESULT(yes)])
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
+AC_DEFUN(AM_MISSING_PROG,
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
@@ -334,25 +264,12 @@ else
 fi
 AC_SUBST($1)])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
 
 # serial 1
 
-AC_DEFUN([AM_MAINTAINER_MODE],
+AC_DEFUN(AM_MAINTAINER_MODE,
 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode is disabled by default
   AC_ARG_ENABLE(maintainer-mode,
@@ -367,60 +284,41 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 ]
 )
 
+# Define a conditional.
 
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
+
+# serial 40 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 
 # Save cache, so that ltconfig can load it
 AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
 AC_CACHE_LOAD
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -431,43 +329,27 @@ AC_SUBST(LIBTOOL)dnl
 exec 5>>./config.log
 ])
 
-AC_DEFUN([AC_LIBTOOL_SETUP],
+AC_DEFUN(AC_LIBTOOL_SETUP,
 [AC_PREREQ(2.13)dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 AC_REQUIRE([AC_PROG_NM])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
 dnl
 
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
 [libtool_flags="$libtool_flags --enable-dlopen"])
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
@@ -477,20 +359,14 @@ AC_ARG_ENABLE(libtool-lock,
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -505,31 +381,12 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -537,56 +394,33 @@ ia64-*-hpux*)
   ;;
 
 ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+[*-*-cygwin* | *-*-mingw*)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  ])
+])
 esac
 ])
 
 # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
 
 # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
 
 # AC_ENABLE_SHARED - implement the --enable-shared flag
 # Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED, [dnl
+define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
 <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -605,21 +439,21 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
 # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_SHARED(no)])
 
 # AC_ENABLE_STATIC - implement the --enable-static flag
 # Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC, [dnl
+define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
 <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -638,8 +472,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
 ])
 
 # AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_STATIC(no)])
 
 
@@ -647,14 +480,14 @@ AC_ENABLE_STATIC(no)])
 # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(fast-install,
 changequote(<<, >>)dnl
 <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -672,98 +505,12 @@ esac],
 enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 AC_ENABLE_FAST_INSTALL(no)])
 
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
 # AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -771,20 +518,16 @@ AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
+changequote(,)dnl
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+changequote([,])dnl
       # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
@@ -806,17 +549,17 @@ elif test "$with_gnu_ld" = yes; then
 else
   AC_MSG_CHECKING([for non-GNU ld])
 fi
-AC_CACHE_VAL(lt_cv_path_LD,
+AC_CACHE_VAL(ac_cv_path_LD,
 [if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -825,9 +568,9 @@ AC_CACHE_VAL(lt_cv_path_LD,
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   AC_MSG_RESULT($LD)
 else
@@ -837,240 +580,56 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_PROG_LD_GNU
 ])
 
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+AC_DEFUN(AC_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
 ])
 
-
 # AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
+AC_CACHE_VAL(ac_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi])
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
 ])
 
 # AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
+AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
+case "$host" in
+*-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
 *-ncr-sysv4.3*)
@@ -1084,39 +643,33 @@ esac
 ])
 
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+  case "$enable_ltdl_convenience" in
   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   "") enable_ltdl_convenience=yes
       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
   esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+  INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
 ])
 
 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   AC_CHECK_LIB(ltdl, main,
   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
   [if test x"$enable_ltdl_install" = xno; then
@@ -1127,8 +680,8 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   ])
   if test x"$enable_ltdl_install" = x"yes"; then
     ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"
@@ -1136,91 +689,15 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
   fi
 ])
 
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
 dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
 
 dnl This is just to silence aclocal about the macro not being used
 ifelse([AC_DISABLE_FAST_INSTALL])dnl
 
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
diff --git a/newlib/libm/machine/i386/configure b/newlib/libm/machine/i386/configure
index 6a01f43..90df0f5 100755
--- a/newlib/libm/machine/i386/configure
+++ b/newlib/libm/machine/i386/configure
@@ -18,15 +18,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-malloc-debugging indicate malloc debugging requested"
 ac_help="$ac_help
-  --enable-newlib-multithread        enable support for multiple threads"
-ac_help="$ac_help
-  --enable-newlib-iconv     enable iconv library support"
-ac_help="$ac_help
-  --enable-newlib-elix-level         supply desired elix library level (1-4)"
-ac_help="$ac_help
-  --disable-newlib-io-float disable printf/scanf family float support"
-ac_help="$ac_help
-  --disable-newlib-supplied-syscalls disable newlib from supplying syscalls"
+  --enable-newlib-mb        enable multibyte support"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
@@ -40,8 +32,6 @@ ac_help="$ac_help
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 ac_help="$ac_help
   --disable-libtool-lock  avoid locking (might break parallel builds)"
-ac_help="$ac_help
-  --with-pic              try to use only PIC/non-PIC objects [default=use both]"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -59,6 +49,7 @@ program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
+sitefile=
 srcdir=
 target=NONE
 verbose=
@@ -173,6 +164,7 @@ Configuration:
   --help                  print this message
   --no-create             do not create output files
   --quiet, --silent       do not print \`checking...' messages
+  --site-file=FILE        use FILE as the site file
   --version               print the version of autoconf that created configure
 Directory and file names:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -343,6 +335,11 @@ EOF
   -site=* | --site=* | --sit=*)
     site="$ac_optarg" ;;
 
+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+    ac_prev=sitefile ;;
+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+    sitefile="$ac_optarg" ;;
+
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -508,12 +505,16 @@ fi
 srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+  if test -z "$CONFIG_SITE"; then
+    if test "x$prefix" != xNONE; then
+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+    else
+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+    fi
   fi
+else
+  CONFIG_SITE="$sitefile"
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
@@ -573,7 +574,6 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-am__api_version="1.4"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -827,79 +827,16 @@ else
   malloc_debugging=
 fi
 
-# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given.
-if test "${enable_newlib_multithread+set}" = set; then
-  enableval="$enable_newlib_multithread"
-  case "${enableval}" in
-  yes) newlib_multithread=yes ;;
-  no)  newlib_multithread=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_multithread=yes
-fi
-
-# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given.
-if test "${enable_newlib_iconv+set}" = set; then
-  enableval="$enable_newlib_iconv"
-  if test "${newlib_iconv+set}" != set; then
-   case "${enableval}" in
-     yes) newlib_iconv=yes ;;
-     no)  newlib_iconv=no ;;
-     *)   { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;;
-   esac
- fi
-else
-  newlib_iconv=${newlib_iconv}
-fi
-
-# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given.
-if test "${enable_newlib_elix_level+set}" = set; then
-  enableval="$enable_newlib_elix_level"
+# Check whether --enable-newlib-mb or --disable-newlib-mb was given.
+if test "${enable_newlib_mb+set}" = set; then
+  enableval="$enable_newlib_mb"
   case "${enableval}" in
-  0)   newlib_elix_level=0 ;;
-  1)   newlib_elix_level=1 ;;
-  2)   newlib_elix_level=2 ;;
-  3)   newlib_elix_level=3 ;;
-  4)   newlib_elix_level=4 ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;;
+  yes) newlib_mb=yes ;;
+  no)  newlib_mb=no ;;
+  *)   { echo "configure: error: bad value ${enableval} for newlib-mb option" 1>&2; exit 1; } ;;
  esac
 else
-  newlib_elix_level=0
-fi
-
-# Check whether --enable-newlib-io-float or --disable-newlib-io-float was given.
-if test "${enable_newlib_io_float+set}" = set; then
-  enableval="$enable_newlib_io_float"
-  case "${enableval}" in
-  yes) newlib_io_float=yes ;;
-  no)  newlib_io_float=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_io_float=yes
-fi
-
-# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given.
-if test "${enable_newlib_supplied_syscalls+set}" = set; then
-  enableval="$enable_newlib_supplied_syscalls"
-  case "${enableval}" in
-  yes) newlib_may_supply_syscalls=yes ;;
-  no)  newlib_may_supply_syscalls=no ;;
-  *)   { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;;
- esac
-else
-  newlib_may_supply_syscalls=yes
-fi
-
-
-
-if test x${newlib_may_supply_syscalls} = xyes; then
-  MAY_SUPPLY_SYSCALLS_TRUE=
-  MAY_SUPPLY_SYSCALLS_FALSE='#'
-else
-  MAY_SUPPLY_SYSCALLS_TRUE='#'
-  MAY_SUPPLY_SYSCALLS_FALSE=
+  newlib_mb=no
 fi
 
 
@@ -917,34 +854,13 @@ fi
 
 
 
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:948: checking host system type" >&5
+echo "configure:864: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -964,52 +880,11 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:969: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:987: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
 
 
 PACKAGE=newlib
 
-VERSION=1.14.0
+VERSION=1.10.0
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -1025,21 +900,21 @@ EOF
 
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1030: checking for working aclocal-${am__api_version}" >&5
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:905: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal-${am__api_version}
+if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+   ACLOCAL=aclocal
    echo "$ac_t""found" 1>&6
 else
-   ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
+   ACLOCAL="$missing_dir/missing aclocal"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1043: checking for working autoconf" >&5
+echo "configure:918: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1051,21 +926,21 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-echo "configure:1056: checking for working automake-${am__api_version}" >&5
+echo $ac_n "checking for working automake""... $ac_c" 1>&6
+echo "configure:931: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-${am__api_version}
+if (automake --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake
    echo "$ac_t""found" 1>&6
 else
-   AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
+   AUTOMAKE="$missing_dir/missing automake"
    echo "$ac_t""missing" 1>&6
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1069: checking for working autoheader" >&5
+echo "configure:944: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1078,7 +953,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1082: checking for working makeinfo" >&5
+echo "configure:957: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -1103,7 +978,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1107: checking for $ac_word" >&5
+echo "configure:982: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1133,7 +1008,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1137: checking for $ac_word" >&5
+echo "configure:1012: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1182,7 +1057,7 @@ fi
 fi
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1186: checking whether we are using GNU C" >&5
+echo "configure:1061: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1191,7 +1066,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1206,7 +1081,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1210: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1085: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1234,10 +1109,33 @@ else
 fi
 
 
+# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD).  If we don't
+# run it explicitly here, it will be run implicitly before
+# NEWLIB_CONFIGURE, which doesn't work because that means that it will
+# be run before AC_CANONICAL_HOST.
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1118: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_word" >&5
+echo "configure:1139: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1269,7 +1167,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1273: checking for $ac_word" >&5
+echo "configure:1171: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1301,7 +1199,7 @@ fi
 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1305: checking for $ac_word" >&5
+echo "configure:1203: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1333,7 +1231,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1337: checking for $ac_word" >&5
+echo "configure:1235: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1378,7 +1276,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1382: checking for a BSD compatible install" >&5
+echo "configure:1280: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1431,11 +1329,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13.  */
-ac_given_INSTALL=$INSTALL
-
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1334: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1469,7 +1364,7 @@ if false; then
   
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1473: checking for executable suffix" >&5
+echo "configure:1368: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,10 +1374,10 @@ else
   rm -f conftest*
   echo 'int main () { return 0; }' > conftest.$ac_ext
   ac_cv_exeext=
-  if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+  if { (eval echo configure:1378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1503,6 +1398,18 @@ fi
 
 . ${newlib_basedir}/configure.host
 
+case ${newlib_basedir} in
+/* | A-Za-z:/\\*) newlib_flagbasedir=${newlib_basedir} ;;
+*) newlib_flagbasedir='$(top_builddir)/'${newlib_basedir} ;;
+esac
+
+newlib_cflags="${newlib_cflags} -I"'$(top_builddir)'"/../../../targ-include -I${newlib_flagbasedir}/libc/include"
+case "${host}" in
+  *-*-cygwin*)
+    newlib_cflags="${newlib_cflags} -I${newlib_flagbasedir}/../winsup/cygwin/include  -I${newlib_flagbasedir}/../winsup/w32api/include"
+    ;;
+esac
+
 newlib_cflags="${newlib_cflags} -fno-builtin"
 
 NEWLIB_CFLAGS=${newlib_cflags}
@@ -1513,52 +1420,6 @@ LDFLAGS=${ldflags}
 
 
 
-if test x${newlib_elix_level} = x0; then
-  ELIX_LEVEL_0_TRUE=
-  ELIX_LEVEL_0_FALSE='#'
-else
-  ELIX_LEVEL_0_TRUE='#'
-  ELIX_LEVEL_0_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x1; then
-  ELIX_LEVEL_1_TRUE=
-  ELIX_LEVEL_1_FALSE='#'
-else
-  ELIX_LEVEL_1_TRUE='#'
-  ELIX_LEVEL_1_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x2; then
-  ELIX_LEVEL_2_TRUE=
-  ELIX_LEVEL_2_FALSE='#'
-else
-  ELIX_LEVEL_2_TRUE='#'
-  ELIX_LEVEL_2_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x3; then
-  ELIX_LEVEL_3_TRUE=
-  ELIX_LEVEL_3_FALSE='#'
-else
-  ELIX_LEVEL_3_TRUE='#'
-  ELIX_LEVEL_3_FALSE=
-fi
-
-
-if test x${newlib_elix_level} = x4; then
-  ELIX_LEVEL_4_TRUE=
-  ELIX_LEVEL_4_FALSE='#'
-else
-  ELIX_LEVEL_4_TRUE='#'
-  ELIX_LEVEL_4_FALSE=
-fi
-
-
-
 if test x${use_libtool} = xyes; then
   USE_LIBTOOL_TRUE=
   USE_LIBTOOL_FALSE='#'
@@ -1567,12 +1428,6 @@ else
   USE_LIBTOOL_FALSE=
 fi
 
-# Hard-code OBJEXT.  Normally it is set by AC_OBJEXT, but we
-# use oext, which is set in configure.host based on the target platform.
-OBJEXT=${oext}
-
-
-
 
 
 
@@ -1587,7 +1442,7 @@ if test "${use_libtool}" = "yes"; then
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_shared=yes ;;
 no) enable_shared=no ;;
 *)
@@ -1610,7 +1465,7 @@ fi
 if test "${enable_static+set}" = set; then
   enableval="$enable_static"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_static=yes ;;
 no) enable_static=no ;;
 *)
@@ -1633,7 +1488,7 @@ fi
 if test "${enable_fast_install+set}" = set; then
   enableval="$enable_fast_install"
   p=${PACKAGE-default}
-case $enableval in
+case "$enableval" in
 yes) enable_fast_install=yes ;;
 no) enable_fast_install=no ;;
 *)
@@ -1652,10 +1507,40 @@ else
   enable_fast_install=yes
 fi
 
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1514: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1544: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1685,7 +1570,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1689: checking for $ac_word" >&5
+echo "configure:1574: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1736,7 +1621,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1740: checking for $ac_word" >&5
+echo "configure:1625: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1768,7 +1653,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1657: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1779,12 +1664,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1783 "configure"
+#line 1668 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1810,12 +1695,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1819: checking whether we are using GNU C" >&5
+echo "configure:1704: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1824,7 +1709,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1843,7 +1728,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1732: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1883,18 +1768,12 @@ else
 fi
 
 ac_prog=ld
-if test "$GCC" = yes; then
+if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1890: checking for ld used by GCC" >&5
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
+echo "configure:1775: checking for ld used by GCC" >&5
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
     # Accept absolute paths.
     [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
@@ -1916,12 +1795,12 @@ echo "configure:1890: checking for ld used by GCC" >&5
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1920: checking for GNU ld" >&5
+echo "configure:1799: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1923: checking for non-GNU ld" >&5
+echo "configure:1802: checking for non-GNU ld" >&5
 fi
-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -z "$LD"; then
@@ -1929,11 +1808,11 @@ else
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
+      ac_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
 	test "$with_gnu_ld" != yes && break
@@ -1942,11 +1821,11 @@ else
   done
   IFS="$ac_save_ifs"
 else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
 fi
 
-LD="$lt_cv_path_LD"
+LD="$ac_cv_path_LD"
 if test -n "$LD"; then
   echo "$ac_t""$LD" 1>&6
 else
@@ -1954,74 +1833,59 @@ else
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1958: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
+echo "configure:1837: checking if the linker ($LD) is GNU ld" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
+  ac_cv_prog_gnu_ld=yes
 else
-  lt_cv_prog_gnu_ld=no
+  ac_cv_prog_gnu_ld=no
 fi
 fi
 
-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
+echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
 
-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
-echo "configure:1975: checking for $LD option to reload object files" >&5
-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-
-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1987: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
+echo "configure:1853: checking for BSD-compatible nm" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
-  lt_cv_path_NM="$NM"
+  ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
 fi
 fi
 
-NM="$lt_cv_path_NM"
+NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2025: checking whether ln -s works" >&5
+echo "configure:1889: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2041,482 +1905,14 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
-echo "configure:2046: checking how to recognise dependant libraries" >&5
-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.012)
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-  fi
-  ;;
-
-newsos6)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-sysv5uw[78]* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-
-fi
-
-echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:2219: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
-echo "configure:2249: checking for ${ac_tool_prefix}file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo $ac_n "checking for file""... $ac_c" 1>&6
-echo "configure:2311: checking for file" >&5
-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="/usr/bin:$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$ac_t""$MAGIC_CMD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2382: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2414: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2449: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2481: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
-fi
-fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  STRIP=":"
-fi
-fi
-
 
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
 
 libtool_flags="$libtool_flags --enable-win32-dll"
 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
@@ -2528,25 +1924,14 @@ fi
 test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
 test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case $host in
+case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 2548 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
+  echo '#line 1933 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
       ;;
@@ -2561,48 +1946,24 @@ case $host in
   rm -rf conftest*
   ;;
 
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2586: checking whether the C compiler needs -belf" >&5
+echo "configure:1955: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-     cat > conftest.$ac_ext <<EOF
-#line 2599 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1960 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -2612,13 +1973,6 @@ else
   lt_cv_cc_needs_belf=no
 fi
 rm -f conftest*
-     ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
 fi
 
 echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
@@ -2628,11 +1982,11 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
   fi
   ;;
 
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+*-*-cygwin* | *-*-mingw*)
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2636: checking for $ac_word" >&5
+echo "configure:1990: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2664,7 +2018,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_word" >&5
+echo "configure:2022: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2699,7 +2053,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2703: checking for $ac_word" >&5
+echo "configure:2057: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2731,7 +2085,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2735: checking for $ac_word" >&5
+echo "configure:2089: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2766,7 +2120,7 @@ fi
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2770: checking for $ac_word" >&5
+echo "configure:2124: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2798,7 +2152,7 @@ if test -n "$ac_tool_prefix"; then
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2802: checking for $ac_word" >&5
+echo "configure:2156: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2830,77 +2184,8 @@ else
 fi
 fi
 
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
-echo "configure:2838: checking if libtool should supply DllMain function" >&5
-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);
-; return 0; }
-EOF
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_need_dllmain=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_need_dllmain=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
-echo "configure:2872: checking how to link DLLs" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2877 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-mdll
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_dll_switch=-dll
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
   ;;
-  
+
 esac
 
 
@@ -2954,14 +2239,12 @@ rm -f confcache
 
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -2975,7 +2258,7 @@ fi
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -2984,11 +2267,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 # clobbered by the next message.
 exec 5>>./config.log
 
-  
-
-  
-	 
-	 
 fi
 
 trap '' 1 2 15
@@ -3136,24 +2414,12 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g
-s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g
 s%@newlib_basedir@%$newlib_basedir%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -3166,6 +2432,11 @@ s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -3174,26 +2445,14 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
 s%@EXEEXT@%$EXEEXT%g
 s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g
-s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g
-s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g
-s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g
-s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g
-s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g
-s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g
-s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g
-s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g
-s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g
-s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g
 s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g
 s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g
-s%@OBJEXT@%$OBJEXT%g
 s%@oext@%$oext%g
 s%@aext@%$aext%g
 s%@libm_machine_dir@%$libm_machine_dir%g
 s%@machine_dir@%$machine_dir%g
 s%@sys_dir@%$sys_dir%g
 s%@LN_S@%$LN_S%g
-s%@STRIP@%$STRIP%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@OBJDUMP@%$OBJDUMP%g
 s%@LIBTOOL@%$LIBTOOL%g
@@ -3205,7 +2464,7 @@ cat >> $CONFIG_STATUS <<\EOF
 
 # Split the substitutions into bite-sized pieces for seds with
 # small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script.
 ac_file=1 # Number of current file.
 ac_beg=1 # First line for current file.
 ac_end=$ac_max_sed_cmds # Line after last line for current file.
diff --git a/newlib/libm/machine/i386/f_atan2.S b/newlib/libm/machine/i386/f_atan2.S
index 5bb074f..5b44a49 100644
--- a/newlib/libm/machine/i386/f_atan2.S
+++ b/newlib/libm/machine/i386/f_atan2.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_atan2f.S b/newlib/libm/machine/i386/f_atan2f.S
index 6df0c75..babd7ff 100644
--- a/newlib/libm/machine/i386/f_atan2f.S
+++ b/newlib/libm/machine/i386/f_atan2f.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_exp.c b/newlib/libm/machine/i386/f_exp.c
index 0ec721b..a348cbe 100644
--- a/newlib/libm/machine/i386/f_exp.c
+++ b/newlib/libm/machine/i386/f_exp.c
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998,2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_expf.c b/newlib/libm/machine/i386/f_expf.c
index b32d1f2..6b86e89 100644
--- a/newlib/libm/machine/i386/f_expf.c
+++ b/newlib/libm/machine/i386/f_expf.c
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_frexp.S b/newlib/libm/machine/i386/f_frexp.S
index febe115..0aabb20 100644
--- a/newlib/libm/machine/i386/f_frexp.S
+++ b/newlib/libm/machine/i386/f_frexp.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_frexpf.S b/newlib/libm/machine/i386/f_frexpf.S
index 909026d..7b37361 100644
--- a/newlib/libm/machine/i386/f_frexpf.S
+++ b/newlib/libm/machine/i386/f_frexpf.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_ldexp.S b/newlib/libm/machine/i386/f_ldexp.S
index e7b83c4..8699254 100644
--- a/newlib/libm/machine/i386/f_ldexp.S
+++ b/newlib/libm/machine/i386/f_ldexp.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_ldexpf.S b/newlib/libm/machine/i386/f_ldexpf.S
index 59d5354..6fcf045 100644
--- a/newlib/libm/machine/i386/f_ldexpf.S
+++ b/newlib/libm/machine/i386/f_ldexpf.S
@@ -1,6 +1,6 @@
 /*
  * ==================================================== 
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved. 
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved. 
  *      
  * Permission to use, copy, modify, and distribute this 
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_log.S b/newlib/libm/machine/i386/f_log.S
index 70e62cb..79df23e 100644
--- a/newlib/libm/machine/i386/f_log.S
+++ b/newlib/libm/machine/i386/f_log.S
@@ -1,6 +1,6 @@
 /*
  * ==================================================== 
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved. 
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved. 
  *      
  * Permission to use, copy, modify, and distribute this 
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_log10.S b/newlib/libm/machine/i386/f_log10.S
index 8d1b873..440647e 100644
--- a/newlib/libm/machine/i386/f_log10.S
+++ b/newlib/libm/machine/i386/f_log10.S
@@ -1,6 +1,6 @@
 /*
  * ==================================================== 
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved. 
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved. 
  *      
  * Permission to use, copy, modify, and distribute this 
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_log10f.S b/newlib/libm/machine/i386/f_log10f.S
index 66ec506..32a8e76 100644
--- a/newlib/libm/machine/i386/f_log10f.S
+++ b/newlib/libm/machine/i386/f_log10f.S
@@ -1,6 +1,6 @@
 /*
  * ==================================================== 
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved. 
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved. 
  *      
  * Permission to use, copy, modify, and distribute this 
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_logf.S b/newlib/libm/machine/i386/f_logf.S
index 3fafa8d..614ca3a 100644
--- a/newlib/libm/machine/i386/f_logf.S
+++ b/newlib/libm/machine/i386/f_logf.S
@@ -1,6 +1,6 @@
 /*
  * ==================================================== 
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved. 
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved. 
  *      
  * Permission to use, copy, modify, and distribute this 
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_pow.c b/newlib/libm/machine/i386/f_pow.c
index 050faa3..fca40c7 100644
--- a/newlib/libm/machine/i386/f_pow.c
+++ b/newlib/libm/machine/i386/f_pow.c
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_powf.c b/newlib/libm/machine/i386/f_powf.c
index ca3ef60..2daa5b0 100644
--- a/newlib/libm/machine/i386/f_powf.c
+++ b/newlib/libm/machine/i386/f_powf.c
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_tan.S b/newlib/libm/machine/i386/f_tan.S
index c7c3704..7b13c4e 100644
--- a/newlib/libm/machine/i386/f_tan.S
+++ b/newlib/libm/machine/i386/f_tan.S
@@ -1,6 +1,6 @@
 /*
  * ==================================================== 
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved. 
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved. 
  *                      
  * Permission to use, copy, modify, and distribute this 
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/machine/i386/f_tanf.S b/newlib/libm/machine/i386/f_tanf.S
index 6afda9e..3d0b903 100644
--- a/newlib/libm/machine/i386/f_tanf.S
+++ b/newlib/libm/machine/i386/f_tanf.S
@@ -1,6 +1,6 @@
 /*
  * ====================================================
- * Copyright (C) 1998, 2002 by Red Hat Inc. All rights reserved.
+ * Copyright (C) 1998 by Cygnus Solutions. All rights reserved.
  *                              
  * Permission to use, copy, modify, and distribute this
  * software is freely granted, provided that this notice
diff --git a/newlib/libm/math/Makefile.am b/newlib/libm/math/Makefile.am
index f5971fa..5ec734a 100644
--- a/newlib/libm/math/Makefile.am
+++ b/newlib/libm/math/Makefile.am
@@ -18,14 +18,13 @@ src = 	k_standard.c k_rem_pio2.c \
 	w_j1.c w_jn.c w_lgamma.c wr_lgamma.c \
 	w_log.c w_log10.c w_pow.c w_remainder.c \
 	w_scalb.c w_sinh.c w_sqrt.c \
-	w_sincos.c \
 	w_cabs.c w_drem.c \
 	s_asinh.c s_atan.c s_ceil.c \
 	s_cos.c s_erf.c s_fabs.c s_floor.c \
-	s_frexp.c s_ldexp.c \
+	s_frexp.c s_isnan.c s_ldexp.c \
 	s_signif.c s_sin.c \
 	s_tan.c s_tanh.c \
-	w_exp2.c w_tgamma.c
+	s_isinf.c s_infconst.c
 
 fsrc =	kf_rem_pio2.c \
 	kf_cos.c kf_sin.c kf_tan.c \
@@ -41,14 +40,13 @@ fsrc =	kf_rem_pio2.c \
 	wf_j1.c wf_jn.c wf_lgamma.c wrf_lgamma.c \
 	wf_log.c wf_log10.c wf_pow.c wf_remainder.c \
 	wf_scalb.c wf_sinh.c wf_sqrt.c \
-	wf_sincos.c \
 	wf_cabs.c wf_drem.c \
 	sf_asinh.c sf_atan.c sf_ceil.c \
 	sf_cos.c sf_erf.c sf_fabs.c sf_floor.c \
-	sf_frexp.c sf_ldexp.c \
+	sf_frexp.c sf_isnan.c sf_ldexp.c \
 	sf_signif.c sf_sin.c \
 	sf_tan.c sf_tanh.c \
-	wf_exp2.c wf_tgamma.c
+	sf_isinf.c
 
 libmath_la_LDFLAGS = -Xcompiler -nostdlib
 
@@ -71,7 +69,8 @@ chobj =	wacos.def wacosh.def wasin.def sasinh.def \
 	wgamma.def whypot.def sldexp.def wlog.def \
 	wlog10.def \
 	wpow.def wremainder.def ssin.def wsinh.def \
-	wsqrt.def stan.def stanh.def
+	wsqrt.def stan.def stanh.def \
+	sisnan.def
 
 SUFFIXES = .def
 
@@ -175,6 +174,9 @@ stan.def: s_tan.c
 stanh.def: s_tanh.c
 	$(CHEW) < $(srcdir)/s_tanh.c >$@ 2>/dev/null
 	touch stmp-def
+sisnan.def: s_isnan.c
+	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
+	touch stmp-def
 
 # A partial dependency list.
 
diff --git a/newlib/libm/math/Makefile.in b/newlib/libm/math/Makefile.in
index f00e189..f8003e7 100644
--- a/newlib/libm/math/Makefile.in
+++ b/newlib/libm/math/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,22 +58,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBM_MACHINE_LIB = @LIBM_MACHINE_LIB@
 LIBTOOL = @LIBTOOL@
@@ -82,10 +74,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
 libm_machine_dir = @libm_machine_dir@
@@ -98,22 +88,70 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-src = k_standard.c k_rem_pio2.c 	k_cos.c k_sin.c k_tan.c 	e_acos.c e_acosh.c e_asin.c e_atan2.c 	e_atanh.c e_cosh.c e_exp.c e_fmod.c 	er_gamma.c e_hypot.c e_j0.c 	e_j1.c e_jn.c er_lgamma.c 	e_log.c e_log10.c e_pow.c e_rem_pio2.c e_remainder.c 	e_scalb.c e_sinh.c e_sqrt.c 	w_acos.c w_acosh.c w_asin.c w_atan2.c 	w_atanh.c w_cosh.c w_exp.c w_fmod.c 	w_gamma.c wr_gamma.c w_hypot.c w_j0.c 	w_j1.c w_jn.c w_lgamma.c wr_lgamma.c 	w_log.c w_log10.c w_pow.c w_remainder.c 	w_scalb.c w_sinh.c w_sqrt.c 	w_sincos.c 	w_cabs.c w_drem.c 	s_asinh.c s_atan.c s_ceil.c 	s_cos.c s_erf.c s_fabs.c s_floor.c 	s_frexp.c s_ldexp.c 	s_signif.c s_sin.c 	s_tan.c s_tanh.c 	w_exp2.c w_tgamma.c
-
-
-fsrc = kf_rem_pio2.c 	kf_cos.c kf_sin.c kf_tan.c 	ef_acos.c ef_acosh.c ef_asin.c ef_atan2.c 	ef_atanh.c ef_cosh.c ef_exp.c ef_fmod.c 	erf_gamma.c ef_hypot.c ef_j0.c 	ef_j1.c ef_jn.c erf_lgamma.c 	ef_log.c ef_log10.c ef_pow.c ef_rem_pio2.c ef_remainder.c 	ef_scalb.c ef_sinh.c ef_sqrt.c 	wf_acos.c wf_acosh.c wf_asin.c wf_atan2.c 	wf_atanh.c wf_cosh.c wf_exp.c wf_fmod.c 	wf_gamma.c wrf_gamma.c wf_hypot.c wf_j0.c 	wf_j1.c wf_jn.c wf_lgamma.c wrf_lgamma.c 	wf_log.c wf_log10.c wf_pow.c wf_remainder.c 	wf_scalb.c wf_sinh.c wf_sqrt.c 	wf_sincos.c 	wf_cabs.c wf_drem.c 	sf_asinh.c sf_atan.c sf_ceil.c 	sf_cos.c sf_erf.c sf_fabs.c sf_floor.c 	sf_frexp.c sf_ldexp.c 	sf_signif.c sf_sin.c 	sf_tan.c sf_tanh.c 	wf_exp2.c wf_tgamma.c
+src = k_standard.c k_rem_pio2.c \
+	k_cos.c k_sin.c k_tan.c \
+	e_acos.c e_acosh.c e_asin.c e_atan2.c \
+	e_atanh.c e_cosh.c e_exp.c e_fmod.c \
+	er_gamma.c e_hypot.c e_j0.c \
+	e_j1.c e_jn.c er_lgamma.c \
+	e_log.c e_log10.c e_pow.c e_rem_pio2.c e_remainder.c \
+	e_scalb.c e_sinh.c e_sqrt.c \
+	w_acos.c w_acosh.c w_asin.c w_atan2.c \
+	w_atanh.c w_cosh.c w_exp.c w_fmod.c \
+	w_gamma.c wr_gamma.c w_hypot.c w_j0.c \
+	w_j1.c w_jn.c w_lgamma.c wr_lgamma.c \
+	w_log.c w_log10.c w_pow.c w_remainder.c \
+	w_scalb.c w_sinh.c w_sqrt.c \
+	w_cabs.c w_drem.c \
+	s_asinh.c s_atan.c s_ceil.c \
+	s_cos.c s_erf.c s_fabs.c s_floor.c \
+	s_frexp.c s_isnan.c s_ldexp.c \
+	s_signif.c s_sin.c \
+	s_tan.c s_tanh.c \
+	s_isinf.c s_infconst.c
+
+
+fsrc = kf_rem_pio2.c \
+	kf_cos.c kf_sin.c kf_tan.c \
+	ef_acos.c ef_acosh.c ef_asin.c ef_atan2.c \
+	ef_atanh.c ef_cosh.c ef_exp.c ef_fmod.c \
+	erf_gamma.c ef_hypot.c ef_j0.c \
+	ef_j1.c ef_jn.c erf_lgamma.c \
+	ef_log.c ef_log10.c ef_pow.c ef_rem_pio2.c ef_remainder.c \
+	ef_scalb.c ef_sinh.c ef_sqrt.c \
+	wf_acos.c wf_acosh.c wf_asin.c wf_atan2.c \
+	wf_atanh.c wf_cosh.c wf_exp.c wf_fmod.c \
+	wf_gamma.c wrf_gamma.c wf_hypot.c wf_j0.c \
+	wf_j1.c wf_jn.c wf_lgamma.c wrf_lgamma.c \
+	wf_log.c wf_log10.c wf_pow.c wf_remainder.c \
+	wf_scalb.c wf_sinh.c wf_sqrt.c \
+	wf_cabs.c wf_drem.c \
+	sf_asinh.c sf_atan.c sf_ceil.c \
+	sf_cos.c sf_erf.c sf_fabs.c sf_floor.c \
+	sf_frexp.c sf_isnan.c sf_ldexp.c \
+	sf_signif.c sf_sin.c \
+	sf_tan.c sf_tanh.c \
+	sf_isinf.c
 
 
 libmath_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libmath.la
-@USE_LIBTOOL_TRUE@libmath_la_SOURCES = $(src) $(fsrc)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libmath.la
+@USE_LIBTOOL_TRUE@libmath_la_SOURCES = @USE_LIBTOOL_TRUE@$(src) $(fsrc)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc)
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(src) $(fsrc)
 
-chobj = wacos.def wacosh.def wasin.def sasinh.def 	satan.def watan2.def watanh.def wj0.def 	wcosh.def serf.def wexp.def 	sfabs.def sfloor.def wfmod.def sfrexp.def 	wgamma.def whypot.def sldexp.def wlog.def 	wlog10.def 	wpow.def wremainder.def ssin.def wsinh.def 	wsqrt.def stan.def stanh.def
+chobj = wacos.def wacosh.def wasin.def sasinh.def \
+	satan.def watan2.def watanh.def wj0.def \
+	wcosh.def serf.def wexp.def \
+	sfabs.def sfloor.def wfmod.def sfrexp.def \
+	wgamma.def whypot.def sldexp.def wlog.def \
+	wlog10.def \
+	wpow.def wremainder.def ssin.def wsinh.def \
+	wsqrt.def stan.def stanh.def \
+	sisnan.def
 
 
 SUFFIXES = .def
@@ -132,61 +170,34 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  k_standard.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@k_rem_pio2.$(OBJEXT) k_cos.$(OBJEXT) k_sin.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@k_tan.$(OBJEXT) e_acos.$(OBJEXT) e_acosh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@e_asin.$(OBJEXT) e_atan2.$(OBJEXT) e_atanh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@e_cosh.$(OBJEXT) e_exp.$(OBJEXT) e_fmod.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@er_gamma.$(OBJEXT) e_hypot.$(OBJEXT) e_j0.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@e_j1.$(OBJEXT) e_jn.$(OBJEXT) er_lgamma.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@e_log.$(OBJEXT) e_log10.$(OBJEXT) e_pow.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@e_rem_pio2.$(OBJEXT) e_remainder.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@e_scalb.$(OBJEXT) e_sinh.$(OBJEXT) e_sqrt.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@w_acos.$(OBJEXT) w_acosh.$(OBJEXT) w_asin.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@w_atan2.$(OBJEXT) w_atanh.$(OBJEXT) w_cosh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@w_exp.$(OBJEXT) w_fmod.$(OBJEXT) w_gamma.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wr_gamma.$(OBJEXT) w_hypot.$(OBJEXT) w_j0.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@w_j1.$(OBJEXT) w_jn.$(OBJEXT) w_lgamma.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wr_lgamma.$(OBJEXT) w_log.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@w_log10.$(OBJEXT) w_pow.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@w_remainder.$(OBJEXT) w_scalb.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@w_sinh.$(OBJEXT) w_sqrt.$(OBJEXT) w_sincos.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@w_cabs.$(OBJEXT) w_drem.$(OBJEXT) s_asinh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_atan.$(OBJEXT) s_ceil.$(OBJEXT) s_cos.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_erf.$(OBJEXT) s_fabs.$(OBJEXT) s_floor.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_frexp.$(OBJEXT) s_ldexp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_signif.$(OBJEXT) s_sin.$(OBJEXT) s_tan.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_tanh.$(OBJEXT) w_exp2.$(OBJEXT) w_tgamma.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@kf_rem_pio2.$(OBJEXT) kf_cos.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@kf_sin.$(OBJEXT) kf_tan.$(OBJEXT) ef_acos.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_acosh.$(OBJEXT) ef_asin.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_atan2.$(OBJEXT) ef_atanh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_cosh.$(OBJEXT) ef_exp.$(OBJEXT) ef_fmod.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@erf_gamma.$(OBJEXT) ef_hypot.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_j0.$(OBJEXT) ef_j1.$(OBJEXT) ef_jn.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@erf_lgamma.$(OBJEXT) ef_log.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_log10.$(OBJEXT) ef_pow.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_rem_pio2.$(OBJEXT) ef_remainder.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_scalb.$(OBJEXT) ef_sinh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_sqrt.$(OBJEXT) wf_acos.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_acosh.$(OBJEXT) wf_asin.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_atan2.$(OBJEXT) wf_atanh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_cosh.$(OBJEXT) wf_exp.$(OBJEXT) wf_fmod.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_gamma.$(OBJEXT) wrf_gamma.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_hypot.$(OBJEXT) wf_j0.$(OBJEXT) wf_j1.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_jn.$(OBJEXT) wf_lgamma.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wrf_lgamma.$(OBJEXT) wf_log.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_log10.$(OBJEXT) wf_pow.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_remainder.$(OBJEXT) wf_scalb.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_sinh.$(OBJEXT) wf_sqrt.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_sincos.$(OBJEXT) wf_cabs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_drem.$(OBJEXT) sf_asinh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_atan.$(OBJEXT) sf_ceil.$(OBJEXT) sf_cos.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_erf.$(OBJEXT) sf_fabs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_floor.$(OBJEXT) sf_frexp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_ldexp.$(OBJEXT) sf_signif.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_sin.$(OBJEXT) sf_tan.$(OBJEXT) sf_tanh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_exp2.$(OBJEXT) wf_tgamma.$(OBJEXT)
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  k_standard.o k_rem_pio2.o k_cos.o \
+@USE_LIBTOOL_FALSE@k_sin.o k_tan.o e_acos.o e_acosh.o e_asin.o \
+@USE_LIBTOOL_FALSE@e_atan2.o e_atanh.o e_cosh.o e_exp.o e_fmod.o \
+@USE_LIBTOOL_FALSE@er_gamma.o e_hypot.o e_j0.o e_j1.o e_jn.o \
+@USE_LIBTOOL_FALSE@er_lgamma.o e_log.o e_log10.o e_pow.o e_rem_pio2.o \
+@USE_LIBTOOL_FALSE@e_remainder.o e_scalb.o e_sinh.o e_sqrt.o w_acos.o \
+@USE_LIBTOOL_FALSE@w_acosh.o w_asin.o w_atan2.o w_atanh.o w_cosh.o \
+@USE_LIBTOOL_FALSE@w_exp.o w_fmod.o w_gamma.o wr_gamma.o w_hypot.o \
+@USE_LIBTOOL_FALSE@w_j0.o w_j1.o w_jn.o w_lgamma.o wr_lgamma.o w_log.o \
+@USE_LIBTOOL_FALSE@w_log10.o w_pow.o w_remainder.o w_scalb.o w_sinh.o \
+@USE_LIBTOOL_FALSE@w_sqrt.o w_cabs.o w_drem.o s_asinh.o s_atan.o \
+@USE_LIBTOOL_FALSE@s_ceil.o s_cos.o s_erf.o s_fabs.o s_floor.o \
+@USE_LIBTOOL_FALSE@s_frexp.o s_isnan.o s_ldexp.o s_signif.o s_sin.o \
+@USE_LIBTOOL_FALSE@s_tan.o s_tanh.o s_isinf.o s_infconst.o \
+@USE_LIBTOOL_FALSE@kf_rem_pio2.o kf_cos.o kf_sin.o kf_tan.o ef_acos.o \
+@USE_LIBTOOL_FALSE@ef_acosh.o ef_asin.o ef_atan2.o ef_atanh.o ef_cosh.o \
+@USE_LIBTOOL_FALSE@ef_exp.o ef_fmod.o erf_gamma.o ef_hypot.o ef_j0.o \
+@USE_LIBTOOL_FALSE@ef_j1.o ef_jn.o erf_lgamma.o ef_log.o ef_log10.o \
+@USE_LIBTOOL_FALSE@ef_pow.o ef_rem_pio2.o ef_remainder.o ef_scalb.o \
+@USE_LIBTOOL_FALSE@ef_sinh.o ef_sqrt.o wf_acos.o wf_acosh.o wf_asin.o \
+@USE_LIBTOOL_FALSE@wf_atan2.o wf_atanh.o wf_cosh.o wf_exp.o wf_fmod.o \
+@USE_LIBTOOL_FALSE@wf_gamma.o wrf_gamma.o wf_hypot.o wf_j0.o wf_j1.o \
+@USE_LIBTOOL_FALSE@wf_jn.o wf_lgamma.o wrf_lgamma.o wf_log.o wf_log10.o \
+@USE_LIBTOOL_FALSE@wf_pow.o wf_remainder.o wf_scalb.o wf_sinh.o \
+@USE_LIBTOOL_FALSE@wf_sqrt.o wf_cabs.o wf_drem.o sf_asinh.o sf_atan.o \
+@USE_LIBTOOL_FALSE@sf_ceil.o sf_cos.o sf_erf.o sf_fabs.o sf_floor.o \
+@USE_LIBTOOL_FALSE@sf_frexp.o sf_isnan.o sf_ldexp.o sf_signif.o \
+@USE_LIBTOOL_FALSE@sf_sin.o sf_tan.o sf_tanh.o sf_isinf.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libmath_la_LIBADD = 
@@ -201,10 +212,10 @@ libmath_la_LIBADD =
 @USE_LIBTOOL_TRUE@wr_gamma.lo w_hypot.lo w_j0.lo w_j1.lo w_jn.lo \
 @USE_LIBTOOL_TRUE@w_lgamma.lo wr_lgamma.lo w_log.lo w_log10.lo w_pow.lo \
 @USE_LIBTOOL_TRUE@w_remainder.lo w_scalb.lo w_sinh.lo w_sqrt.lo \
-@USE_LIBTOOL_TRUE@w_sincos.lo w_cabs.lo w_drem.lo s_asinh.lo s_atan.lo \
-@USE_LIBTOOL_TRUE@s_ceil.lo s_cos.lo s_erf.lo s_fabs.lo s_floor.lo \
-@USE_LIBTOOL_TRUE@s_frexp.lo s_ldexp.lo s_signif.lo s_sin.lo s_tan.lo \
-@USE_LIBTOOL_TRUE@s_tanh.lo w_exp2.lo w_tgamma.lo kf_rem_pio2.lo \
+@USE_LIBTOOL_TRUE@w_cabs.lo w_drem.lo s_asinh.lo s_atan.lo s_ceil.lo \
+@USE_LIBTOOL_TRUE@s_cos.lo s_erf.lo s_fabs.lo s_floor.lo s_frexp.lo \
+@USE_LIBTOOL_TRUE@s_isnan.lo s_ldexp.lo s_signif.lo s_sin.lo s_tan.lo \
+@USE_LIBTOOL_TRUE@s_tanh.lo s_isinf.lo s_infconst.lo kf_rem_pio2.lo \
 @USE_LIBTOOL_TRUE@kf_cos.lo kf_sin.lo kf_tan.lo ef_acos.lo ef_acosh.lo \
 @USE_LIBTOOL_TRUE@ef_asin.lo ef_atan2.lo ef_atanh.lo ef_cosh.lo \
 @USE_LIBTOOL_TRUE@ef_exp.lo ef_fmod.lo erf_gamma.lo ef_hypot.lo \
@@ -216,11 +227,11 @@ libmath_la_LIBADD =
 @USE_LIBTOOL_TRUE@wrf_gamma.lo wf_hypot.lo wf_j0.lo wf_j1.lo wf_jn.lo \
 @USE_LIBTOOL_TRUE@wf_lgamma.lo wrf_lgamma.lo wf_log.lo wf_log10.lo \
 @USE_LIBTOOL_TRUE@wf_pow.lo wf_remainder.lo wf_scalb.lo wf_sinh.lo \
-@USE_LIBTOOL_TRUE@wf_sqrt.lo wf_sincos.lo wf_cabs.lo wf_drem.lo \
-@USE_LIBTOOL_TRUE@sf_asinh.lo sf_atan.lo sf_ceil.lo sf_cos.lo sf_erf.lo \
-@USE_LIBTOOL_TRUE@sf_fabs.lo sf_floor.lo sf_frexp.lo sf_ldexp.lo \
+@USE_LIBTOOL_TRUE@wf_sqrt.lo wf_cabs.lo wf_drem.lo sf_asinh.lo \
+@USE_LIBTOOL_TRUE@sf_atan.lo sf_ceil.lo sf_cos.lo sf_erf.lo sf_fabs.lo \
+@USE_LIBTOOL_TRUE@sf_floor.lo sf_frexp.lo sf_isnan.lo sf_ldexp.lo \
 @USE_LIBTOOL_TRUE@sf_signif.lo sf_sin.lo sf_tan.lo sf_tanh.lo \
-@USE_LIBTOOL_TRUE@wf_exp2.lo wf_tgamma.lo
+@USE_LIBTOOL_TRUE@sf_isinf.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -240,7 +251,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libmath_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus math/Makefile
 
@@ -261,11 +272,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -274,7 +280,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -546,6 +551,9 @@ stan.def: s_tan.c
 stanh.def: s_tanh.c
 	$(CHEW) < $(srcdir)/s_tanh.c >$@ 2>/dev/null
 	touch stmp-def
+sisnan.def: s_isnan.c
+	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
+	touch stmp-def
 
 # A partial dependency list.
 
diff --git a/newlib/libm/math/e_pow.c b/newlib/libm/math/e_pow.c
index 56c7980..9312085 100644
--- a/newlib/libm/math/e_pow.c
+++ b/newlib/libm/math/e_pow.c
@@ -18,7 +18,7 @@
  *	1. Compute and return log2(x) in two pieces:
  *		log2(x) = w1 + w2,
  *	   where w1 has 53-24 = 29 bit trailing zeros.
- *	2. Perform y*log2(x) = n+y' by simulating multi-precision 
+ *	2. Perform y*log2(x) = n+y' by simulating muti-precision 
  *	   arithmetic, where |y'|<=0.5.
  *	3. Return x**y = 2**n*exp(y'*log2)
  *
@@ -179,7 +179,7 @@ ivln2_l  =  1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/
 	}
     
     /* (x<0)**(non-int) is NaN */
-    /* REDHAT LOCAL: This used to be
+    /* CYGNUS LOCAL: This used to be
 	if((((hx>>31)+1)|yisint)==0) return (x-x)/(x-x);
        but ANSI C says a right shift of a signed negative quantity is
        implementation defined.  */
@@ -196,7 +196,7 @@ ivln2_l  =  1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/
 	    if(ix>0x3ff00000) return (hy>0)? huge*huge:tiny*tiny;
 	/* now |1-x| is tiny <= 2**-20, suffice to compute 
 	   log(x) by x-x^2/2+x^3/3-x^4/4 */
-	    t = ax-1;		/* t has 20 trailing zeros */
+	    t = x-1;		/* t has 20 trailing zeros */
 	    w = (t*t)*(0.5-t*(0.3333333333333333333333-t*0.25));
 	    u = ivln2_h*t;	/* ivln2_h has 21 sig. bits */
 	    v = t*ivln2_l-w*ivln2;
diff --git a/newlib/libm/math/ef_atan2.c b/newlib/libm/math/ef_atan2.c
index d57480b..45b5acb 100644
--- a/newlib/libm/math/ef_atan2.c
+++ b/newlib/libm/math/ef_atan2.c
@@ -25,8 +25,8 @@ tiny  = 1.0e-30,
 zero  = 0.0,
 pi_o_4  = 7.8539818525e-01, /* 0x3f490fdb */
 pi_o_2  = 1.5707963705e+00, /* 0x3fc90fdb */
-pi      = 3.1415927410e+00,  /* 0x40490fdb */
-pi_lo   = -8.7422776573e-08; /* 0xb3bbbd2e */
+pi      = 3.1415925026e+00, /* 0x40490fda */
+pi_lo   = 1.5099578832e-07; /* 0x34222168 */
 
 #ifdef __STDC__
 	float __ieee754_atan2f(float y, float x)
diff --git a/newlib/libm/math/ef_hypot.c b/newlib/libm/math/ef_hypot.c
index 9368eb4..9f6d40c 100644
--- a/newlib/libm/math/ef_hypot.c
+++ b/newlib/libm/math/ef_hypot.c
@@ -41,8 +41,8 @@
 	       if(FLT_UWORD_IS_INFINITE(hb)) w = b;
 	       return w;
 	   }
-	   /* scale a and b by 2**-68 */
-	   ha -= 0x22000000L; hb -= 0x22000000L;	k += 68;
+	   /* scale a and b by 2**-60 */
+	   ha -= 0x5d800000L; hb -= 0x5d800000L;	k += 60;
 	   SET_FLOAT_WORD(a,ha);
 	   SET_FLOAT_WORD(b,hb);
 	}
@@ -50,14 +50,14 @@
 	    if(FLT_UWORD_IS_ZERO(hb)) {
 	        return a;
 	    } else if(FLT_UWORD_IS_SUBNORMAL(hb)) {
-		SET_FLOAT_WORD(t1,0x7e800000L);	/* t1=2^126 */
+		SET_FLOAT_WORD(t1,0x3f000000L);	/* t1=2^126 */
 		b *= t1;
 		a *= t1;
 		k -= 126;
-	    } else {		/* scale a and b by 2^68 */
-	        ha += 0x22000000; 	/* a *= 2^68 */
-		hb += 0x22000000;	/* b *= 2^68 */
-		k -= 68;
+	    } else {		/* scale a and b by 2^60 */
+	        ha += 0x5d800000; 	/* a *= 2^60 */
+		hb += 0x5d800000;	/* b *= 2^60 */
+		k -= 60;
 		SET_FLOAT_WORD(a,ha);
 		SET_FLOAT_WORD(b,hb);
 	    }
diff --git a/newlib/libm/math/ef_pow.c b/newlib/libm/math/ef_pow.c
index 8b1fc18..e50cc58 100644
--- a/newlib/libm/math/ef_pow.c
+++ b/newlib/libm/math/ef_pow.c
@@ -137,7 +137,7 @@ ivln2_l  =  7.0526075433e-06; /* 0x36eca570 =1/ln2 tail*/
 	    if(ix>0x3f800007) return (hy>0)? huge*huge:tiny*tiny;
 	/* now |1-x| is tiny <= 2**-20, suffice to compute 
 	   log(x) by x-x^2/2+x^3/3-x^4/4 */
-	    t = ax-1;		/* t has 20 trailing zeros */
+	    t = x-1;		/* t has 20 trailing zeros */
 	    w = (t*t)*((float)0.5-t*((float)0.333333333333-t*(float)0.25));
 	    u = ivln2_h*t;	/* ivln2_h has 16 sig. bits */
 	    v = t*ivln2_l-w*ivln2;
diff --git a/newlib/libm/math/er_gamma.c b/newlib/libm/math/er_gamma.c
index 3c0e241..a7183c5 100644
--- a/newlib/libm/math/er_gamma.c
+++ b/newlib/libm/math/er_gamma.c
@@ -28,5 +28,5 @@
 	double x; int *signgamp;
 #endif
 {
-	return __ieee754_exp (__ieee754_lgamma_r(x,signgamp));
+	return __ieee754_lgamma_r(x,signgamp);
 }
diff --git a/newlib/libm/math/erf_gamma.c b/newlib/libm/math/erf_gamma.c
index 9e529dc..c619dfb 100644
--- a/newlib/libm/math/erf_gamma.c
+++ b/newlib/libm/math/erf_gamma.c
@@ -30,5 +30,5 @@
 	float x; int *signgamp;
 #endif
 {
-	return __ieee754_expf (__ieee754_lgammaf_r(x,signgamp));
+	return __ieee754_lgammaf_r(x,signgamp);
 }
diff --git a/newlib/libm/math/math.tex b/newlib/libm/math/math.tex
index 7bc56ce..c6035de 100644
--- a/newlib/libm/math/math.tex
+++ b/newlib/libm/math/math.tex
@@ -25,7 +25,7 @@ Since the error handling code calls @code{fputs}, the mathematical
 subroutines require stubs or minimal implementations for the same list
 of OS subroutines as @code{fputs}: @code{close}, @code{fstat},
 @code{isatty}, @code{lseek}, @code{read}, @code{sbrk}, @code{write}.
-@xref{syscalls,,System Calls, libc.info, The Red Hat newlib C Library},
+@xref{syscalls,,System Calls, libc.info, The Cygnus C Support Library},
 for a discussion and for sample minimal implementations of these support
 subroutines.
 
@@ -102,7 +102,7 @@ In X/Open mode, @code{errno} is set correctly, and @code{matherr} is
 called, but warning message are not printed.
 
 In SVID mode, functions which overflow return 3.40282346638528860e+38,
-the maximum single-precision floating-point value, rather than infinity.
+the maximum single precision floating point value, rather than infinity.
 Also, @code{errno} is set correctly, @code{matherr} is called, and, if
 @code{matherr} returns 0, warning messages are printed for some errors.
 For example, by default @samp{log(-1.0)} writes this message on standard
@@ -139,12 +139,6 @@ The library is set to X/Open mode by default.
 @include math/wj0.def
 
 @page
-@include common/scbrt.def
-
-@page
-@include common/scopysign.def
-
-@page
 @include math/wcosh.def
 
 @page
@@ -154,9 +148,6 @@ The library is set to X/Open mode by default.
 @include math/wexp.def
 
 @page
-@include common/sexpm1.def
-
-@page
 @include math/sfabs.def
 
 @page
@@ -175,13 +166,7 @@ The library is set to X/Open mode by default.
 @include math/whypot.def
 
 @page
-@include common/silogb.def
-
-@page
-@include common/sinfinity.def
-
-@page
-@include common/sisnan.def
+@include math/sisnan.def
 
 @page
 @include math/sldexp.def
@@ -193,30 +178,12 @@ The library is set to X/Open mode by default.
 @include math/wlog10.def
 
 @page
-@include common/slog1p.def
-
-@page
-@include common/smatherr.def
-
-@page
-@include common/smodf.def
-
-@page
-@include common/snan.def
-
-@page
-@include common/snextafter.def
-
-@page
 @include math/wpow.def
 
 @page
 @include math/wremainder.def
 
 @page
-@include common/sscalbn.def
-
-@page
 @include math/wsqrt.def
 
 @page
diff --git a/newlib/libm/math/s_asinh.c b/newlib/libm/math/s_asinh.c
index b7e173c..958b71f 100644
--- a/newlib/libm/math/s_asinh.c
+++ b/newlib/libm/math/s_asinh.c
@@ -36,9 +36,9 @@ TRAD_SYNOPSIS
 DESCRIPTION
 <<asinh>> calculates the inverse hyperbolic sine of <[x]>.
 <<asinh>> is defined as 
-@ifnottex
+@ifinfo
 . sgn(<[x]>) * log(abs(<[x]>) + sqrt(1+<[x]>*<[x]>))
-@end ifnottex
+@end ifinfo
 @tex
 $$sign(x) \times ln\Bigl(|x| + \sqrt{1+x^2}\Bigr)$$
 @end tex
diff --git a/newlib/libm/math/s_atan.c b/newlib/libm/math/s_atan.c
index c52a09d..b1410ec 100644
--- a/newlib/libm/math/s_atan.c
+++ b/newlib/libm/math/s_atan.c
@@ -41,9 +41,9 @@ DESCRIPTION
 <<atanf>> is identical to <<atan>>, save that it operates on <<floats>>.
 
 RETURNS
-@ifnottex
+@ifinfo
 <<atan>> returns a value in radians, in the range of -pi/2 to pi/2.
-@end ifnottex
+@end ifinfo
 @tex
 <<atan>> returns a value in radians, in the range of $-\pi/2$ to $\pi/2$.
 @end tex
diff --git a/newlib/libm/math/s_frexp.c b/newlib/libm/math/s_frexp.c
index 5a396c7..aaa3606 100644
--- a/newlib/libm/math/s_frexp.c
+++ b/newlib/libm/math/s_frexp.c
@@ -36,17 +36,17 @@ TRAD_SYNOPSIS
 
 
 DESCRIPTION
-	All nonzero, normal numbers can be described as <[m]> * 2**<[p]>.
+	All non zero, normal numbers can be described as <[m]> * 2**<[p]>.
 	<<frexp>> represents the double <[val]> as a mantissa <[m]>
 	and a power of two <[p]>. The resulting mantissa will always
 	be greater than or equal to <<0.5>>, and less than <<1.0>> (as
 	long as <[val]> is nonzero). The power of two will be stored
 	in <<*>><[exp]>. 
 
-@ifnottex
+@ifinfo
 <[m]> and <[p]> are calculated so that
 <[val]> is <[m]> times <<2>> to the power <[p]>.
-@end ifnottex
+@end ifinfo
 @tex
 <[m]> and <[p]> are calculated so that
 $ val = m \times 2^p $.
diff --git a/newlib/libm/math/s_infconst.c b/newlib/libm/math/s_infconst.c
new file mode 100644
index 0000000..6b63afb
--- /dev/null
+++ b/newlib/libm/math/s_infconst.c
@@ -0,0 +1,15 @@
+/* Infinity as a constant value.   This is used for HUGE_VAL.
+ * Added by Cygnus Support.
+ */
+
+#include "fdlibm.h"
+
+#ifndef _DOUBLE_IS_32BITS
+#ifdef __IEEE_BIG_ENDIAN
+const union __dmath __infinity[1] = {{{ 0x7ff00000, 0 }}};
+#else
+const union __dmath __infinity[1] = {{{ 0, 0x7ff00000 }}};
+#endif
+#else /* defined (_DOUBLE_IS_32BITS) */
+const union __dmath __infinity[1] = {{{ 0x7f800000, 0 }}};
+#endif /* defined (_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/math/s_isinf.c b/newlib/libm/math/s_isinf.c
new file mode 100644
index 0000000..87f0995
--- /dev/null
+++ b/newlib/libm/math/s_isinf.c
@@ -0,0 +1,26 @@
+/*
+ * isinf(x) returns 1 if x is infinity, else 0;
+ * no branching!
+ * Added by Cygnus Support.
+ */
+
+#include "fdlibm.h"
+
+#ifndef _DOUBLE_IS_32BITS
+
+#ifdef __STDC__
+	int isinf(double x)
+#else
+	int isinf(x)
+	double x;
+#endif
+{
+	__int32_t hx,lx;
+	EXTRACT_WORDS(hx,lx,x);
+	hx &= 0x7fffffff;
+	hx |= (__uint32_t)(lx|(-lx))>>31;	
+	hx = 0x7ff00000 - hx;
+	return 1 - (int)((__uint32_t)(hx|(-hx))>>31);
+}
+
+#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/math/s_isnan.c b/newlib/libm/math/s_isnan.c
new file mode 100644
index 0000000..5d83fc0
--- /dev/null
+++ b/newlib/libm/math/s_isnan.c
@@ -0,0 +1,122 @@
+
+/* @(#)s_isnan.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice 
+ * is preserved.
+ * ====================================================
+ */
+
+/*
+FUNCTION
+	<<isnan>>,<<isnanf>>,<<isinf>>,<<isinff>>,<<finite>>,<<finitef>>---test for exceptional numbers
+
+INDEX
+	isnan
+INDEX
+	isinf
+INDEX
+	finite
+
+INDEX
+	isnanf
+INDEX
+	isinff
+INDEX
+	finitef
+
+ANSI_SYNOPSIS
+	#include <ieeefp.h>
+	int isnan(double <[arg]>);
+	int isinf(double <[arg]>);
+	int finite(double <[arg]>);
+	int isnanf(float <[arg]>);
+	int isinff(float <[arg]>);
+	int finitef(float <[arg]>);
+
+TRAD_SYNOPSIS
+	#include <ieeefp.h>
+	int isnan(<[arg]>)
+	double <[arg]>;
+	int isinf(<[arg]>)
+	double <[arg]>;
+	int finite(<[arg]>);
+	double <[arg]>;
+	int isnanf(<[arg]>);
+	float <[arg]>;
+	int isinff(<[arg]>);
+	float <[arg]>;
+	int finitef(<[arg]>);
+	float <[arg]>;
+
+
+DESCRIPTION
+	These functions provide information on the floating point
+	argument supplied.
+
+	There are five major number formats - 
+	o+
+	o zero
+	 a number which contains all zero bits.
+	o subnormal
+	 Is used to represent  number with a zero exponent, but a non zero fraction.
+	 o normal
+	  A number with an exponent, and a fraction
+     	o infinity
+	  A number with an all 1's exponent and a zero fraction.
+	o NAN
+	  A number with an all 1's exponent and a non zero fraction.
+
+	o-
+
+	<<isnan>> returns 1 if the argument is a nan. <<isinf>>
+	returns 1 if the argument is infinity.  <<finite>> returns 1 if the
+	argument is zero, subnormal or normal.
+	
+	The <<isnanf>>, <<isinff>> and <<finitef>> perform the same
+	operations as their <<isnan>>, <<isinf>> and <<finite>>
+	counterparts, but on single precision floating point numbers.
+
+QUICKREF
+	isnan - pure
+QUICKREF
+	isinf - pure
+QUICKREF
+	finite - pure
+QUICKREF
+	isnan - pure
+QUICKREF
+	isinf - pure
+QUICKREF
+	finite - pure
+*/
+
+/*
+ * isnan(x) returns 1 is x is nan, else 0;
+ * no branching!
+ */
+
+#include "fdlibm.h"
+
+#ifndef _DOUBLE_IS_32BITS
+
+#ifdef __STDC__
+	int isnan(double x)
+#else
+	int isnan(x)
+	double x;
+#endif
+{
+	__int32_t hx,lx;
+	EXTRACT_WORDS(hx,lx,x);
+	hx &= 0x7fffffff;
+	hx |= (__uint32_t)(lx|(-lx))>>31;	
+	hx = 0x7ff00000 - hx;
+	return (int)(((__uint32_t)(hx))>>31);
+}
+
+#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/math/s_ldexp.c b/newlib/libm/math/s_ldexp.c
index adc7d5d..ccf7171 100644
--- a/newlib/libm/math/s_ldexp.c
+++ b/newlib/libm/math/s_ldexp.c
@@ -39,9 +39,9 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 <<ldexp>> calculates the value 
-@ifnottex
+@ifinfo
 <[val]> times 2 to the power <[exp]>.
-@end ifnottex
+@end ifinfo
 @tex
 $val\times 2^{exp}$.
 @end tex
@@ -56,7 +56,7 @@ On underflow, <<ldexp>> and <<ldexpf>> return 0.0.
 On overflow, <<ldexp>> returns plus or minus <<HUGE_VAL>>.
 
 PORTABILITY
-<<ldexp>> is ANSI. <<ldexpf>> is an extension.
+<<ldexp>> is ANSI, <<ldexpf>> is an extension.
               
 */   
 
diff --git a/newlib/libm/math/sf_isinf.c b/newlib/libm/math/sf_isinf.c
new file mode 100644
index 0000000..43a8abd
--- /dev/null
+++ b/newlib/libm/math/sf_isinf.c
@@ -0,0 +1,33 @@
+/*
+ * isinff(x) returns 1 if x is +-infinity, else 0;
+ * Added by Cygnus Support.
+ */
+
+#include "fdlibm.h"
+
+#ifdef __STDC__
+	int isinff(float x)
+#else
+	int isinff(x)
+	float x;
+#endif
+{
+	__int32_t ix;
+	GET_FLOAT_WORD(ix,x);
+	ix &= 0x7fffffff;
+	return FLT_UWORD_IS_INFINITE(ix);
+}
+
+#ifdef _DOUBLE_IS_32BITS
+
+#ifdef __STDC__
+	int isinf(double x)
+#else
+	int isinf(x)
+	double x;
+#endif
+{
+	return isinff((float) x);
+}
+
+#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/math/sf_isnan.c b/newlib/libm/math/sf_isnan.c
new file mode 100644
index 0000000..0b4be3e
--- /dev/null
+++ b/newlib/libm/math/sf_isnan.c
@@ -0,0 +1,47 @@
+/* sf_isnan.c -- float version of s_isnan.c.
+ * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
+ */
+
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice 
+ * is preserved.
+ * ====================================================
+ */
+
+/*
+ * isnanf(x) returns 1 is x is nan, else 0;
+ */
+
+#include "fdlibm.h"
+
+#ifdef __STDC__
+	int isnanf(float x)
+#else
+	int isnanf(x)
+	float x;
+#endif
+{
+	__int32_t ix;
+	GET_FLOAT_WORD(ix,x);
+	ix &= 0x7fffffff;
+	return FLT_UWORD_IS_NAN(ix);
+}
+
+#ifdef _DOUBLE_IS_32BITS
+
+#ifdef __STDC__
+	int isnan(double x)
+#else
+	int isnan(x)
+	double x;
+#endif
+{
+	return isnanf((float) x);
+}
+
+#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/math/w_acos.c b/newlib/libm/math/w_acos.c
index 0a4823f..c9ca99c 100644
--- a/newlib/libm/math/w_acos.c
+++ b/newlib/libm/math/w_acos.c
@@ -44,9 +44,9 @@ DESCRIPTION
 	its calculations on <<floats>>.
 
 RETURNS
-	@ifnottex
+	@ifinfo
 	<<acos>> and <<acosf>> return values in radians, in the range of 0 to pi.
-	@end ifnottex
+	@end ifinfo
 	@tex
 	<<acos>> and <<acosf>> return values in radians, in the range of <<0>> to $\pi$.
 	@end tex
diff --git a/newlib/libm/math/w_acosh.c b/newlib/libm/math/w_acosh.c
index 022c5c6..4120d7b 100644
--- a/newlib/libm/math/w_acosh.c
+++ b/newlib/libm/math/w_acosh.c
@@ -37,9 +37,9 @@ TRAD_SYNOPSIS
 DESCRIPTION
 <<acosh>> calculates the inverse hyperbolic cosine of <[x]>.
 <<acosh>> is defined as 
-@ifnottex
+@ifinfo
 . log(<[x]> + sqrt(<[x]>*<[x]>-1))
-@end ifnottex
+@end ifinfo
 @tex
 $$ln\Bigl(x + \sqrt{x^2-1}\Bigr)$$
 @end tex
diff --git a/newlib/libm/math/w_asin.c b/newlib/libm/math/w_asin.c
index b146dfd..f6cb271 100644
--- a/newlib/libm/math/w_asin.c
+++ b/newlib/libm/math/w_asin.c
@@ -46,9 +46,9 @@ returning floats.
 You can modify error handling for these routines using <<matherr>>. 
 
 RETURNS
-@ifnottex
+@ifinfo
 <<asin>> returns values in radians, in the range of -pi/2 to pi/2.
-@end ifnottex
+@end ifinfo
 @tex
 <<asin>> returns values in radians, in the range of $-\pi/2$ to $\pi/2$.
 @end tex
diff --git a/newlib/libm/math/w_atan2.c b/newlib/libm/math/w_atan2.c
index 25eb161..91742c7 100644
--- a/newlib/libm/math/w_atan2.c
+++ b/newlib/libm/math/w_atan2.c
@@ -40,9 +40,9 @@ DESCRIPTION
 
 <<atan2>> computes the inverse tangent (arc tangent) of <[y]>/<[x]>. 
 <<atan2>> produces the correct result even for angles near 
-@ifnottex
+@ifinfo
 pi/2 or -pi/2 
-@end ifnottex
+@end ifinfo
 @tex
 $\pi/2$ or $-\pi/2$
 @end tex
@@ -53,9 +53,9 @@ $\pi/2$ or $-\pi/2$
 
 RETURNS
 <<atan2>> and <<atan2f>> return a value in radians, in the range of 
-@ifnottex
+@ifinfo
 -pi to pi.
-@end ifnottex
+@end ifinfo
 @tex
 $-\pi$ to $\pi$.
 @end tex
diff --git a/newlib/libm/math/w_atanh.c b/newlib/libm/math/w_atanh.c
index 07fd459..b89d4f0 100644
--- a/newlib/libm/math/w_atanh.c
+++ b/newlib/libm/math/w_atanh.c
@@ -43,9 +43,9 @@ RETURNS
 	<<atanh>> and <<atanhf>> return the calculated value.
 
 	If 
-	@ifnottex
+	@ifinfo
 	|<[x]>|
-	@end ifnottex
+	@end ifinfo
 	@tex
 	$|x|$
 	@end tex
@@ -53,9 +53,9 @@ RETURNS
 	the result is a NaN.  A <<DOMAIN error>> is reported.
 
 	If 
-	@ifnottex
+	@ifinfo
 	|<[x]>|
-	@end ifnottex
+	@end ifinfo
 	@tex
 	$|x|$
 	@end tex
diff --git a/newlib/libm/math/w_cosh.c b/newlib/libm/math/w_cosh.c
index ab046f6..7b38dcb 100644
--- a/newlib/libm/math/w_cosh.c
+++ b/newlib/libm/math/w_cosh.c
@@ -33,9 +33,9 @@ DESCRIPTION
 
 	<<cosh>> computes the hyperbolic cosine of the argument <[x]>.
 	<<cosh(<[x]>)>> is defined as 
-	@ifnottex
+	@ifinfo
 	. (exp(x) + exp(-x))/2
-	@end ifnottex
+	@end ifinfo
 	@tex
 	$${(e^x + e^{-x})} \over 2$$
 	@end tex
diff --git a/newlib/libm/math/w_exp.c b/newlib/libm/math/w_exp.c
index eb36390..ae792a8 100644
--- a/newlib/libm/math/w_exp.c
+++ b/newlib/libm/math/w_exp.c
@@ -34,9 +34,9 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 	<<exp>> and <<expf>> calculate the exponential of <[x]>, that is, 
-	@ifnottex
+	@ifinfo
 	e raised to the power <[x]> (where e
-	@end ifnottex
+	@end ifinfo
 	@tex
 	$e^x$ (where $e$
 	@end tex
diff --git a/newlib/libm/math/w_exp2.c b/newlib/libm/math/w_exp2.c
deleted file mode 100644
index ed0bc39..0000000
--- a/newlib/libm/math/w_exp2.c
+++ /dev/null
@@ -1,75 +0,0 @@
-
-/* @(#)w_exp2.c 5.1 93/09/24 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
-FUNCTION
-	<<exp2>>, <<exp2f>>---exponential
-INDEX
-	exp2
-INDEX
-	exp2f
-
-ANSI_SYNOPSIS
-	#include <math.h>
-	double exp2(double <[x]>);
-	float exp2f(float <[x]>);
-
-TRAD_SYNOPSIS
-	#include <math.h>
-	double exp2(<[x]>);
-	double <[x]>;
-
-	float exp2f(<[x]>);
-	float <[x]>;
-
-DESCRIPTION
-	<<exp2>> and <<exp2f>> calculate 2 ^ <[x]>, that is, 
-	@ifnottex
-	2 raised to the power <[x]>.
-	@end ifnottex
-	@tex
-	$2^x$
-	@end tex
-
-	You can use the (non-ANSI) function <<matherr>> to specify
-	error handling for these functions.
-
-RETURNS
-	On success, <<exp2>> and <<exp2f>> return the calculated value.
-	If the result underflows, the returned value is <<0>>.  If the
-	result overflows, the returned value is <<HUGE_VAL>>.  In
-	either case, <<errno>> is set to <<ERANGE>>.
-
-*/
-
-/*
- * wrapper exp2(x)
- */
-
-#include "fdlibm.h"
-#include <errno.h>
-#include <math.h>
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double exp2(double x)		/* wrapper exp2 */
-#else
-	double exp2(x)			/* wrapper exp2 */
-	double x;
-#endif
-{
-  return pow(2.0, x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/math/w_fmod.c b/newlib/libm/math/w_fmod.c
index 47d1dd0..b6b36cb 100644
--- a/newlib/libm/math/w_fmod.c
+++ b/newlib/libm/math/w_fmod.c
@@ -39,9 +39,9 @@ remainder of <[x]>/<[y]> (<[x]> modulo <[y]>).
 
 RETURNS
 The <<fmod>> function returns the value 
-@ifnottex
+@ifinfo
 <[x]>-<[i]>*<[y]>, 
-@end ifnottex
+@end ifinfo
 @tex
 $x-i\times y$,
 @end tex
diff --git a/newlib/libm/math/w_gamma.c b/newlib/libm/math/w_gamma.c
index fad4049..da02115 100644
--- a/newlib/libm/math/w_gamma.c
+++ b/newlib/libm/math/w_gamma.c
@@ -76,9 +76,9 @@ $\mit ln\bigl(\Gamma(x)\bigr)$,
 the natural logarithm of the gamma function of <[x]>.  The gamma function
 (<<exp(gamma(<[x]>))>>) is a generalization of factorial, and retains
 the property that  
-@ifnottex
+@ifinfo
 <<exp(gamma(N))>> is equivalent to <<N*exp(gamma(N-1))>>.
-@end ifnottex
+@end ifinfo
 @tex
 $\mit \Gamma(N)\equiv N\times\Gamma(N-1)$.
 @end tex
@@ -87,10 +87,10 @@ quickly.  <<gamma>> is defined as
 @tex
 $\mit ln\bigl(\Gamma(x)\bigr)$ rather than simply $\mit \Gamma(x)$
 @end tex
-@ifnottex
+@ifinfo
 the natural log of the gamma function, rather than the gamma function
 itself, 
-@end ifnottex
+@end ifinfo
 to extend the useful range of results representable.
 
 The sign of the result is returned in the global variable <<signgam>>,
@@ -145,11 +145,11 @@ Neither <<gamma>> nor <<gammaf>> is ANSI C.  */
 #endif
 {
 #ifdef _IEEE_LIBM
-	return __ieee754_gamma_r(x,&(_REENT_SIGNGAM(_REENT)));
+	return __ieee754_gamma_r(x,&(_REENT->_new._reent._gamma_signgam));
 #else
         double y;
 	struct exception exc;
-        y = __ieee754_gamma_r(x,&(_REENT_SIGNGAM(_REENT)));
+        y = __ieee754_gamma_r(x,&(_REENT->_new._reent._gamma_signgam));
         if(_LIB_VERSION == _IEEE_) return y;
         if(!finite(y)&&finite(x)) {
 #ifndef HUGE_VAL 
diff --git a/newlib/libm/math/w_hypot.c b/newlib/libm/math/w_hypot.c
index 203bf09..318853d 100644
--- a/newlib/libm/math/w_hypot.c
+++ b/newlib/libm/math/w_hypot.c
@@ -36,9 +36,9 @@ DESCRIPTION
 	@tex
 	$\sqrt{x^2+y^2}$
 	@end tex
-	@ifnottex
+	@ifinfo
 	<<sqrt(<[x]>*<[x]> + <[y]>*<[y]>)>>
-	@end ifnottex
+	@end ifinfo
 	between the origin (0,0) and a point represented by the
 	Cartesian coordinates (<[x]>,<[y]>).  <<hypotf>> differs only
 	in the type of its arguments and result.
diff --git a/newlib/libm/math/w_j0.c b/newlib/libm/math/w_j0.c
index e4dde5c..4f07908 100644
--- a/newlib/libm/math/w_j0.c
+++ b/newlib/libm/math/w_j0.c
@@ -13,7 +13,7 @@
 
 /*
 FUNCTION
-<<jN>>, <<jNf>>, <<yN>>, <<yNf>>---Bessel functions 
+<<jN>>,<<jNf>>,<<yN>>,<<yNf>>---Bessel functions 
 
 INDEX
 j0
@@ -91,10 +91,10 @@ float <[x]>;
 DESCRIPTION
 The Bessel functions are a family of functions that solve the
 differential equation 
-@ifnottex
+@ifinfo
 .  2               2    2
 . x  y'' + xy' + (x  - p )y  = 0
-@end ifnottex
+@end ifinfo
 @tex
 $$x^2{d^2y\over dx^2} + x{dy\over dx} + (x^2-p^2)y = 0$$
 @end tex
diff --git a/newlib/libm/math/w_lgamma.c b/newlib/libm/math/w_lgamma.c
index e56e477..1dc6399 100644
--- a/newlib/libm/math/w_lgamma.c
+++ b/newlib/libm/math/w_lgamma.c
@@ -32,11 +32,11 @@
 #endif
 {
 #ifdef _IEEE_LIBM
-	return __ieee754_lgamma_r(x,&(_REENT_SIGNGAM(_REENT)));
+	return __ieee754_lgamma_r(x,&(_REENT->_new._reent._gamma_signgam));
 #else
         double y;
 	struct exception exc;
-        y = __ieee754_lgamma_r(x,&(_REENT_SIGNGAM(_REENT)));
+        y = __ieee754_lgamma_r(x,&(_REENT->_new._reent._gamma_signgam));
         if(_LIB_VERSION == _IEEE_) return y;
         if(!finite(y)&&finite(x)) {
 #ifndef HUGE_VAL 
diff --git a/newlib/libm/math/w_log.c b/newlib/libm/math/w_log.c
index 3e750ad..dcc8b97 100644
--- a/newlib/libm/math/w_log.c
+++ b/newlib/libm/math/w_log.c
@@ -49,7 +49,7 @@ When <[x]> is negative, the returned value is <<-HUGE_VAL>> and
 <<matherr>>.
 
 PORTABILITY
-<<log>> is ANSI. <<logf>> is an extension.
+<<log>> is ANSI, <<logf>> is an extension.
 */
 
 /*
diff --git a/newlib/libm/math/w_pow.c b/newlib/libm/math/w_pow.c
index d54cd3a..3df099a 100644
--- a/newlib/libm/math/w_pow.c
+++ b/newlib/libm/math/w_pow.c
@@ -35,7 +35,7 @@ TRAD_SYNOPSIS
 	float <[x]>, <[y]>;
 
 DESCRIPTION
-	<<pow>> and <<powf>> calculate <[x]> raised to the exponent <[y]>.
+	<<pow>> and <<powf>> calculate <[x]> raised to the exp1.0nt <[y]>.
 	@tex
 	(That is, $x^y$.)
 	@end tex
diff --git a/newlib/libm/math/w_sincos.c b/newlib/libm/math/w_sincos.c
deleted file mode 100644
index 491efa4..0000000
--- a/newlib/libm/math/w_sincos.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* sincos -- currently no more efficient than two separate calls to
-   sin and cos. */
-
-#include "fdlibm.h"
-#include <errno.h>
-
-#ifndef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	void sincos(double x, double *sinx, double *cosx)
-#else
-	void sincos(x, sinx, cosx)
-	double x;
-        double *sinx;
-        double *cosx;
-#endif
-{
-  *sinx = sin (x);
-  *cosx = cos (x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/math/w_sinh.c b/newlib/libm/math/w_sinh.c
index 72e0ef5..02a3888 100644
--- a/newlib/libm/math/w_sinh.c
+++ b/newlib/libm/math/w_sinh.c
@@ -37,9 +37,9 @@ TRAD_SYNOPSIS
 DESCRIPTION
 	<<sinh>> computes the hyperbolic sine of the argument <[x]>.
 	Angles are specified in radians.   <<sinh>>(<[x]>) is defined as 
-	@ifnottex
+	@ifinfo
 	. (exp(<[x]>) - exp(-<[x]>))/2
-	@end ifnottex
+	@end ifinfo
 	@tex
 	$${e^x - e^{-x}}\over 2$$
 	@end tex
diff --git a/newlib/libm/math/w_tgamma.c b/newlib/libm/math/w_tgamma.c
deleted file mode 100644
index f24a243..0000000
--- a/newlib/libm/math/w_tgamma.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* @(#)w_gamma.c 5.1 93/09/24 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-/* double gamma(double x)
- * Return  the logarithm of the Gamma function of x or the Gamma function of x,
- * depending on the library mode.
- */
-
-#include "fdlibm.h"
-
-#ifdef __STDC__
-	double tgamma(double x)
-#else
-	double tgamma(x)
-	double x;
-#endif
-{
-        double y;
-	int local_signgam;
-	y = __ieee754_gamma_r(x,&local_signgam);
-	if (local_signgam < 0) y = -y;
-#ifdef _IEEE_LIBM
-	return y;
-#else
-	if(_LIB_VERSION == _IEEE_) return y;
-
-	if(!finite(y)&&finite(x)) {
-	  if(floor(x)==x&&x<=0.0)
-	    return __kernel_standard(x,x,41); /* tgamma pole */
-	  else
-	    return __kernel_standard(x,x,40); /* tgamma overflow */
-	}
-	return y;
-#endif
-}
diff --git a/newlib/libm/math/wf_exp2.c b/newlib/libm/math/wf_exp2.c
deleted file mode 100644
index 9440314..0000000
--- a/newlib/libm/math/wf_exp2.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* wf_exp2.c -- float version of w_exp2.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* 
- * wrapper exp2f(x)
- */
-
-#include "fdlibm.h"
-#include <errno.h>
-#include <math.h>
-
-#ifdef __STDC__
-	float exp2f(float x)		/* wrapper exp2f */
-#else
-	float exp2f(x)			/* wrapper exp2f */
-	float x;
-#endif
-{
-  return powf(2.0, x);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	double exp2(double x)
-#else
-	double exp2(x)
-	double x;
-#endif
-{
-	return (double) exp2f((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/math/wf_gamma.c b/newlib/libm/math/wf_gamma.c
index 1204f39..fbeb38a 100644
--- a/newlib/libm/math/wf_gamma.c
+++ b/newlib/libm/math/wf_gamma.c
@@ -26,11 +26,11 @@
 #endif
 {
 #ifdef _IEEE_LIBM
-	return __ieee754_gammaf_r(x,&(_REENT_SIGNGAM(_REENT)));
+	return __ieee754_gammaf_r(x,&(_REENT->_new._reent._gamma_signgam));
 #else
         float y;
 	struct exception exc;
-        y = __ieee754_gammaf_r(x,&(_REENT_SIGNGAM(_REENT)));
+        y = __ieee754_gammaf_r(x,&(_REENT->_new._reent._gamma_signgam));
         if(_LIB_VERSION == _IEEE_) return y;
         if(!finitef(y)&&finitef(x)) {
 #ifndef HUGE_VAL 
diff --git a/newlib/libm/math/wf_lgamma.c b/newlib/libm/math/wf_lgamma.c
index f1bf0c0..e1765c4 100644
--- a/newlib/libm/math/wf_lgamma.c
+++ b/newlib/libm/math/wf_lgamma.c
@@ -26,11 +26,11 @@
 #endif
 {
 #ifdef _IEEE_LIBM
-	return __ieee754_lgammaf_r(x,&(_REENT_SIGNGAM(_REENT)));
+	return __ieee754_lgammaf_r(x,&(_REENT->_new._reent._gamma_signgam));
 #else
         float y;
 	struct exception exc;
-        y = __ieee754_lgammaf_r(x,&(_REENT_SIGNGAM(_REENT)));
+        y = __ieee754_lgammaf_r(x,&(_REENT->_new._reent._gamma_signgam));
         if(_LIB_VERSION == _IEEE_) return y;
         if(!finitef(y)&&finitef(x)) {
 #ifndef HUGE_VAL 
diff --git a/newlib/libm/math/wf_sincos.c b/newlib/libm/math/wf_sincos.c
deleted file mode 100644
index 477c604..0000000
--- a/newlib/libm/math/wf_sincos.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* sincos -- currently no more efficient than two separate calls to
-   sin and cos. */
-#include "fdlibm.h"
-#include <errno.h>
-
-#ifdef __STDC__
-	void sincosf(float x, float *sinx, float *cosx)
-#else
-	void sincosf(x, sinx, cosx)
-	float x;
-        float *sinx;
-        float *cosx;
-#endif
-{
-  *sinx = sinf (x);
-  *cosx = cosf (x);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-#ifdef __STDC__
-	void sincos(double x, double *sinx, double *cosx)
-#else
-	void sincos(x, sinx, cosx)
-	double x;
-        double sinx;
-        double cosx;
-#endif
-{
-  *sinx = sinf((float) x);
-  *cosx = cosf((float) x);
-}
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/math/wf_tgamma.c b/newlib/libm/math/wf_tgamma.c
deleted file mode 100644
index 642d7c0..0000000
--- a/newlib/libm/math/wf_tgamma.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* w_gammaf.c -- float version of w_gamma.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#include "math.h"
-
-#ifdef __STDC__
-	float tgammaf(float x)
-#else
-	float tgammaf(x)
-	float x;
-#endif
-{
-        float y;
-	int local_signgam;
-	y = __ieee754_gammaf_r(x,&local_signgam);
-	if (local_signgam < 0) y = -y;
-#ifdef _IEEE_LIBM
-	return y;
-#else
-	if(_LIB_VERSION == _IEEE_) return y;
-
-	if(!finitef(y)&&finitef(x)) {
-	  if(floorf(x)==x&&x<=(float)0.0)
-	    /* tgammaf pole */
-	    return (float)__kernel_standard((double)x,(double)x,141);
-	  else
-	    /* tgammaf overflow */
-	    return (float)__kernel_standard((double)x,(double)x,140);
-	}
-	return y;
-#endif
-}
diff --git a/newlib/libm/mathfp/Makefile.am b/newlib/libm/mathfp/Makefile.am
index e529022..11f3cf6 100644
--- a/newlib/libm/mathfp/Makefile.am
+++ b/newlib/libm/mathfp/Makefile.am
@@ -13,16 +13,14 @@ src =	s_acos.c s_frexp.c s_mathcnst.c \
 	s_atan2.c s_fabs.c s_log.c s_tanh.c \
 	s_log10.c s_sin.c \
 	s_floor.c s_sine.c \
-	s_sincos.c \
 	s_atangent.c s_logarithm.c \
 	s_sineh.c \
-	s_ceil.c \
+	s_ceil.c s_isnan.c s_isinf.c \
 	e_acosh.c e_atanh.c e_remainder.c \
 	er_gamma.c er_lgamma.c \
 	s_erf.c e_j0.c e_j1.c w_jn.c e_hypot.c \
 	w_cabs.c w_drem.c s_asinh.c s_fmod.c \
-	e_scalb.c s_signif.c \
-	s_exp2.c s_tgamma.c
+	e_scalb.c s_infconst.c s_signif.c
 
 fsrc =	sf_ceil.c \
 	sf_acos.c sf_frexp.c \
@@ -33,15 +31,14 @@ fsrc =	sf_ceil.c \
 	sf_atan2.c sf_fabs.c sf_tanh.c \
 	sf_atan.c sf_log10.c sf_sin.c\
 	sf_floor.c sf_sine.c \
-	sf_sincos.c \
 	sf_atangent.c sf_logarithm.c sf_sineh.c \
 	sf_log.c sf_sineh.c \
+	sf_isnan.c sf_isinf.c \
 	ef_acosh.c ef_atanh.c ef_remainder.c \
 	erf_gamma.c erf_lgamma.c \
 	sf_erf.c ef_j0.c ef_j1.c wf_jn.c ef_hypot.c \
 	wf_cabs.c wf_drem.c sf_asinh.c sf_fmod.c \
-	ef_scalb.c sf_signif.c \
-	sf_exp2.c sf_tgamma.c
+	ef_scalb.c sf_signif.c
 
 libmathfp_la_LDFLAGS = -Xcompiler -nostdlib
 
@@ -75,6 +72,7 @@ chobj = eacosh.def \
 	sfloor.def \
 	sfmod.def \
 	sfrexp.def \
+	sisnan.def \
 	sldexp.def \
 	slog10.def \
 	slogarithm.def \
@@ -158,6 +156,9 @@ sfmod.def: s_fmod.c
 sfrexp.def: s_frexp.c
 	$(CHEW) < $(srcdir)/s_frexp.c >$@ 2>/dev/null
 	touch stmp-def
+sisnan.def: s_isnan.c
+	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
+	touch stmp-def
 sldexp.def: s_ldexp.c
 	$(CHEW) < $(srcdir)/s_ldexp.c >$@ 2>/dev/null
 	touch stmp-def
diff --git a/newlib/libm/mathfp/Makefile.in b/newlib/libm/mathfp/Makefile.in
index b11e813..c7234a9 100644
--- a/newlib/libm/mathfp/Makefile.in
+++ b/newlib/libm/mathfp/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -58,22 +58,14 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
 AR = @AR@
 AS = @AS@
 CC = @CC@
 CPP = @CPP@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBM_MACHINE_LIB = @LIBM_MACHINE_LIB@
 LIBTOOL = @LIBTOOL@
@@ -82,10 +74,8 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NEWLIB_CFLAGS = @NEWLIB_CFLAGS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
-STRIP = @STRIP@
 VERSION = @VERSION@
 aext = @aext@
 libm_machine_dir = @libm_machine_dir@
@@ -98,22 +88,82 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-src = s_acos.c s_frexp.c s_mathcnst.c 	s_cos.c s_sinh.c 	s_asin.c 	s_asine.c s_cosh.c s_ispos.c s_numtest.c s_sqrt.c 	s_exp.c s_ldexp.c s_pow.c s_tan.c 	s_atan.c 	s_atan2.c s_fabs.c s_log.c s_tanh.c 	s_log10.c s_sin.c 	s_floor.c s_sine.c 	s_sincos.c 	s_atangent.c s_logarithm.c 	s_sineh.c 	s_ceil.c 	e_acosh.c e_atanh.c e_remainder.c 	er_gamma.c er_lgamma.c 	s_erf.c e_j0.c e_j1.c w_jn.c e_hypot.c 	w_cabs.c w_drem.c s_asinh.c s_fmod.c 	e_scalb.c s_signif.c 	s_exp2.c s_tgamma.c
-
-
-fsrc = sf_ceil.c 	sf_acos.c sf_frexp.c 	sf_cos.c sf_sinh.c 	sf_asine.c sf_cosh.c sf_ispos.c sf_numtest.c sf_sqrt.c 	sf_asin.c 	sf_exp.c sf_ldexp.c sf_pow.c sf_tan.c 	sf_atan2.c sf_fabs.c sf_tanh.c 	sf_atan.c sf_log10.c sf_sin.c 	sf_floor.c sf_sine.c 	sf_sincos.c 	sf_atangent.c sf_logarithm.c sf_sineh.c 	sf_log.c sf_sineh.c 	ef_acosh.c ef_atanh.c ef_remainder.c 	erf_gamma.c erf_lgamma.c 	sf_erf.c ef_j0.c ef_j1.c wf_jn.c ef_hypot.c 	wf_cabs.c wf_drem.c sf_asinh.c sf_fmod.c 	ef_scalb.c sf_signif.c 	sf_exp2.c sf_tgamma.c
+src = s_acos.c s_frexp.c s_mathcnst.c \
+	s_cos.c s_sinh.c \
+	s_asin.c\
+	s_asine.c s_cosh.c s_ispos.c s_numtest.c s_sqrt.c \
+	s_exp.c s_ldexp.c s_pow.c s_tan.c \
+	s_atan.c \
+	s_atan2.c s_fabs.c s_log.c s_tanh.c \
+	s_log10.c s_sin.c \
+	s_floor.c s_sine.c \
+	s_atangent.c s_logarithm.c \
+	s_sineh.c \
+	s_ceil.c s_isnan.c s_isinf.c \
+	e_acosh.c e_atanh.c e_remainder.c \
+	er_gamma.c er_lgamma.c \
+	s_erf.c e_j0.c e_j1.c w_jn.c e_hypot.c \
+	w_cabs.c w_drem.c s_asinh.c s_fmod.c \
+	e_scalb.c s_infconst.c s_signif.c
+
+
+fsrc = sf_ceil.c \
+	sf_acos.c sf_frexp.c \
+	sf_cos.c sf_sinh.c \
+	sf_asine.c sf_cosh.c sf_ispos.c sf_numtest.c sf_sqrt.c \
+	sf_asin.c \
+	sf_exp.c sf_ldexp.c sf_pow.c sf_tan.c \
+	sf_atan2.c sf_fabs.c sf_tanh.c \
+	sf_atan.c sf_log10.c sf_sin.c\
+	sf_floor.c sf_sine.c \
+	sf_atangent.c sf_logarithm.c sf_sineh.c \
+	sf_log.c sf_sineh.c \
+	sf_isnan.c sf_isinf.c \
+	ef_acosh.c ef_atanh.c ef_remainder.c \
+	erf_gamma.c erf_lgamma.c \
+	sf_erf.c ef_j0.c ef_j1.c wf_jn.c ef_hypot.c \
+	wf_cabs.c wf_drem.c sf_asinh.c sf_fmod.c \
+	ef_scalb.c sf_signif.c
 
 
 libmathfp_la_LDFLAGS = -Xcompiler -nostdlib
 
-@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libmathfp.la
-@USE_LIBTOOL_TRUE@libmathfp_la_SOURCES = $(src) $(fsrc)
-@USE_LIBTOOL_TRUE@noinst_DATA = objectlist.awk.in
+@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libmathfp.la
+@USE_LIBTOOL_TRUE@libmathfp_la_SOURCES = @USE_LIBTOOL_TRUE@$(src) $(fsrc)
+@USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in
 @USE_LIBTOOL_FALSE@noinst_DATA = 
-@USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
-@USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc)
-
-chobj = eacosh.def 	eatanh.def 	ehypot.def 	eremainder.def 	erlgamma.def 	sacos.def 	sasine.def 	sasinh.def 	satan.def 	satan2.def 	satangent.def 	scosh.def 	serf.def 	sexp.def 	sfabs.def 	sfloor.def 	sfmod.def 	sfrexp.def 	sldexp.def 	slog10.def 	slogarithm.def 	spow.def 	ssine.def 	ssineh.def 	ssqrt.def 	stan.def 	stanh.def 	wjn.def
+@USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a
+@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(src) $(fsrc)
+
+chobj = eacosh.def \
+	eatanh.def \
+	ehypot.def \
+	eremainder.def \
+	erlgamma.def \
+	sacos.def \
+	sasine.def \
+	sasinh.def \
+	satan.def \
+	satan2.def \
+	satangent.def \
+	scosh.def \
+	serf.def \
+	sexp.def \
+	sfabs.def \
+	sfloor.def \
+	sfmod.def \
+	sfrexp.def \
+	sisnan.def \
+	sldexp.def \
+	slog10.def \
+	slogarithm.def \
+	spow.def \
+	ssine.def \
+	ssineh.def \
+	ssqrt.def \
+	stan.def \
+	stanh.def \
+	wjn.def
 
 
 SUFFIXES = .def
@@ -132,47 +182,27 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
-@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  s_acos.$(OBJEXT) s_frexp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_mathcnst.$(OBJEXT) s_cos.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_sinh.$(OBJEXT) s_asin.$(OBJEXT) s_asine.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_cosh.$(OBJEXT) s_ispos.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_numtest.$(OBJEXT) s_sqrt.$(OBJEXT) s_exp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_ldexp.$(OBJEXT) s_pow.$(OBJEXT) s_tan.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_atan.$(OBJEXT) s_atan2.$(OBJEXT) s_fabs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_log.$(OBJEXT) s_tanh.$(OBJEXT) s_log10.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_sin.$(OBJEXT) s_floor.$(OBJEXT) s_sine.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_sincos.$(OBJEXT) s_atangent.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_logarithm.$(OBJEXT) s_sineh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_ceil.$(OBJEXT) e_acosh.$(OBJEXT) e_atanh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@e_remainder.$(OBJEXT) er_gamma.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@er_lgamma.$(OBJEXT) s_erf.$(OBJEXT) e_j0.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@e_j1.$(OBJEXT) w_jn.$(OBJEXT) e_hypot.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@w_cabs.$(OBJEXT) w_drem.$(OBJEXT) s_asinh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_fmod.$(OBJEXT) e_scalb.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_signif.$(OBJEXT) s_exp2.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_tgamma.$(OBJEXT) sf_ceil.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_acos.$(OBJEXT) sf_frexp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_cos.$(OBJEXT) sf_sinh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_asine.$(OBJEXT) sf_cosh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_ispos.$(OBJEXT) sf_numtest.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_sqrt.$(OBJEXT) sf_asin.$(OBJEXT) sf_exp.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_ldexp.$(OBJEXT) sf_pow.$(OBJEXT) sf_tan.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_atan2.$(OBJEXT) sf_fabs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_tanh.$(OBJEXT) sf_atan.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_log10.$(OBJEXT) sf_sin.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_floor.$(OBJEXT) sf_sine.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_sincos.$(OBJEXT) sf_atangent.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_logarithm.$(OBJEXT) sf_sineh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_log.$(OBJEXT) sf_sineh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_acosh.$(OBJEXT) ef_atanh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_remainder.$(OBJEXT) erf_gamma.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@erf_lgamma.$(OBJEXT) sf_erf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_j0.$(OBJEXT) ef_j1.$(OBJEXT) wf_jn.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@ef_hypot.$(OBJEXT) wf_cabs.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@wf_drem.$(OBJEXT) sf_asinh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_fmod.$(OBJEXT) ef_scalb.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_signif.$(OBJEXT) sf_exp2.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_tgamma.$(OBJEXT)
+@USE_LIBTOOL_FALSE@lib_a_OBJECTS =  s_acos.o s_frexp.o s_mathcnst.o \
+@USE_LIBTOOL_FALSE@s_cos.o s_sinh.o s_asin.o s_asine.o s_cosh.o \
+@USE_LIBTOOL_FALSE@s_ispos.o s_numtest.o s_sqrt.o s_exp.o s_ldexp.o \
+@USE_LIBTOOL_FALSE@s_pow.o s_tan.o s_atan.o s_atan2.o s_fabs.o s_log.o \
+@USE_LIBTOOL_FALSE@s_tanh.o s_log10.o s_sin.o s_floor.o s_sine.o \
+@USE_LIBTOOL_FALSE@s_atangent.o s_logarithm.o s_sineh.o s_ceil.o \
+@USE_LIBTOOL_FALSE@s_isnan.o s_isinf.o e_acosh.o e_atanh.o \
+@USE_LIBTOOL_FALSE@e_remainder.o er_gamma.o er_lgamma.o s_erf.o e_j0.o \
+@USE_LIBTOOL_FALSE@e_j1.o w_jn.o e_hypot.o w_cabs.o w_drem.o s_asinh.o \
+@USE_LIBTOOL_FALSE@s_fmod.o e_scalb.o s_infconst.o s_signif.o sf_ceil.o \
+@USE_LIBTOOL_FALSE@sf_acos.o sf_frexp.o sf_cos.o sf_sinh.o sf_asine.o \
+@USE_LIBTOOL_FALSE@sf_cosh.o sf_ispos.o sf_numtest.o sf_sqrt.o \
+@USE_LIBTOOL_FALSE@sf_asin.o sf_exp.o sf_ldexp.o sf_pow.o sf_tan.o \
+@USE_LIBTOOL_FALSE@sf_atan2.o sf_fabs.o sf_tanh.o sf_atan.o sf_log10.o \
+@USE_LIBTOOL_FALSE@sf_sin.o sf_floor.o sf_sine.o sf_atangent.o \
+@USE_LIBTOOL_FALSE@sf_logarithm.o sf_sineh.o sf_log.o sf_sineh.o \
+@USE_LIBTOOL_FALSE@sf_isnan.o sf_isinf.o ef_acosh.o ef_atanh.o \
+@USE_LIBTOOL_FALSE@ef_remainder.o erf_gamma.o erf_lgamma.o sf_erf.o \
+@USE_LIBTOOL_FALSE@ef_j0.o ef_j1.o wf_jn.o ef_hypot.o wf_cabs.o \
+@USE_LIBTOOL_FALSE@wf_drem.o sf_asinh.o sf_fmod.o ef_scalb.o \
+@USE_LIBTOOL_FALSE@sf_signif.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libmathfp_la_LIBADD = 
@@ -181,24 +211,23 @@ libmathfp_la_LIBADD =
 @USE_LIBTOOL_TRUE@s_cosh.lo s_ispos.lo s_numtest.lo s_sqrt.lo s_exp.lo \
 @USE_LIBTOOL_TRUE@s_ldexp.lo s_pow.lo s_tan.lo s_atan.lo s_atan2.lo \
 @USE_LIBTOOL_TRUE@s_fabs.lo s_log.lo s_tanh.lo s_log10.lo s_sin.lo \
-@USE_LIBTOOL_TRUE@s_floor.lo s_sine.lo s_sincos.lo s_atangent.lo \
-@USE_LIBTOOL_TRUE@s_logarithm.lo s_sineh.lo s_ceil.lo e_acosh.lo \
+@USE_LIBTOOL_TRUE@s_floor.lo s_sine.lo s_atangent.lo s_logarithm.lo \
+@USE_LIBTOOL_TRUE@s_sineh.lo s_ceil.lo s_isnan.lo s_isinf.lo e_acosh.lo \
 @USE_LIBTOOL_TRUE@e_atanh.lo e_remainder.lo er_gamma.lo er_lgamma.lo \
 @USE_LIBTOOL_TRUE@s_erf.lo e_j0.lo e_j1.lo w_jn.lo e_hypot.lo w_cabs.lo \
-@USE_LIBTOOL_TRUE@w_drem.lo s_asinh.lo s_fmod.lo e_scalb.lo s_signif.lo \
-@USE_LIBTOOL_TRUE@s_exp2.lo s_tgamma.lo sf_ceil.lo sf_acos.lo \
+@USE_LIBTOOL_TRUE@w_drem.lo s_asinh.lo s_fmod.lo e_scalb.lo \
+@USE_LIBTOOL_TRUE@s_infconst.lo s_signif.lo sf_ceil.lo sf_acos.lo \
 @USE_LIBTOOL_TRUE@sf_frexp.lo sf_cos.lo sf_sinh.lo sf_asine.lo \
 @USE_LIBTOOL_TRUE@sf_cosh.lo sf_ispos.lo sf_numtest.lo sf_sqrt.lo \
 @USE_LIBTOOL_TRUE@sf_asin.lo sf_exp.lo sf_ldexp.lo sf_pow.lo sf_tan.lo \
 @USE_LIBTOOL_TRUE@sf_atan2.lo sf_fabs.lo sf_tanh.lo sf_atan.lo \
 @USE_LIBTOOL_TRUE@sf_log10.lo sf_sin.lo sf_floor.lo sf_sine.lo \
-@USE_LIBTOOL_TRUE@sf_sincos.lo sf_atangent.lo sf_logarithm.lo \
-@USE_LIBTOOL_TRUE@sf_sineh.lo sf_log.lo sf_sineh.lo ef_acosh.lo \
+@USE_LIBTOOL_TRUE@sf_atangent.lo sf_logarithm.lo sf_sineh.lo sf_log.lo \
+@USE_LIBTOOL_TRUE@sf_sineh.lo sf_isnan.lo sf_isinf.lo ef_acosh.lo \
 @USE_LIBTOOL_TRUE@ef_atanh.lo ef_remainder.lo erf_gamma.lo \
 @USE_LIBTOOL_TRUE@erf_lgamma.lo sf_erf.lo ef_j0.lo ef_j1.lo wf_jn.lo \
 @USE_LIBTOOL_TRUE@ef_hypot.lo wf_cabs.lo wf_drem.lo sf_asinh.lo \
-@USE_LIBTOOL_TRUE@sf_fmod.lo ef_scalb.lo sf_signif.lo sf_exp2.lo \
-@USE_LIBTOOL_TRUE@sf_tgamma.lo
+@USE_LIBTOOL_TRUE@sf_fmod.lo ef_scalb.lo sf_signif.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -218,7 +247,7 @@ OBJECTS = $(lib_a_OBJECTS) $(libmathfp_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .def .lo .o .obj .s
+.SUFFIXES: .S .c .def .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../Makefile.shared
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus mathfp/Makefile
 
@@ -239,11 +268,6 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -252,7 +276,6 @@ maintainer-clean-noinstLIBRARIES:
 
 mostlyclean-compile:
 	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
 
 clean-compile:
 
@@ -494,6 +517,9 @@ sfmod.def: s_fmod.c
 sfrexp.def: s_frexp.c
 	$(CHEW) < $(srcdir)/s_frexp.c >$@ 2>/dev/null
 	touch stmp-def
+sisnan.def: s_isnan.c
+	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
+	touch stmp-def
 sldexp.def: s_ldexp.c
 	$(CHEW) < $(srcdir)/s_ldexp.c >$@ 2>/dev/null
 	touch stmp-def
diff --git a/newlib/libm/mathfp/e_acosh.c b/newlib/libm/mathfp/e_acosh.c
index c2bf528..a484203 100644
--- a/newlib/libm/mathfp/e_acosh.c
+++ b/newlib/libm/mathfp/e_acosh.c
@@ -26,9 +26,9 @@ TRAD_SYNOPSIS
 DESCRIPTION
 <<acosh>> calculates the inverse hyperbolic cosine of <[x]>.
 <<acosh>> is defined as
-@ifnottex
+@ifinfo
 . log(<[x]> + sqrt(<[x]>*<[x]>-1))
-@end ifnottex
+@end ifinfo
 @tex
 $$ln\Bigl(x + \sqrt{x^2-1}\Bigr)$$
 @end tex
diff --git a/newlib/libm/mathfp/e_atanh.c b/newlib/libm/mathfp/e_atanh.c
index fb233e5..1ab311d 100644
--- a/newlib/libm/mathfp/e_atanh.c
+++ b/newlib/libm/mathfp/e_atanh.c
@@ -44,9 +44,9 @@ RETURNS
         <<atanh>> and <<atanhf>> return the calculated value.
 
         If
-        @ifnottex
+        @ifinfo
         |<[x]>|
-        @end ifnottex
+        @end ifinfo
         @tex
         $|x|$
         @end tex
@@ -54,9 +54,9 @@ RETURNS
         the result is a NaN.  A <<DOMAIN error>> is reported.
 
         If
-        @ifnottex
+        @ifinfo
         |<[x]>|
-        @end ifnottex
+        @end ifinfo
         @tex
         $|x|$
         @end tex
diff --git a/newlib/libm/mathfp/e_hypot.c b/newlib/libm/mathfp/e_hypot.c
index 713aa77..d93263e 100644
--- a/newlib/libm/mathfp/e_hypot.c
+++ b/newlib/libm/mathfp/e_hypot.c
@@ -36,9 +36,9 @@ DESCRIPTION
         @tex
         $\sqrt{x^2+y^2}$
         @end tex
-        @ifnottex
+        @ifinfo
         <<sqrt(<[x]>*<[x]> + <[y]>*<[y]>)>>
-        @end ifnottex
+        @end ifinfo
         between the origin (0,0) and a point represented by the
         Cartesian coordinates (<[x]>,<[y]>).  <<hypotf>> differs only
         in the type of its arguments and result.
diff --git a/newlib/libm/mathfp/er_gamma.c b/newlib/libm/mathfp/er_gamma.c
index 0060ed0..6246c88 100644
--- a/newlib/libm/mathfp/er_gamma.c
+++ b/newlib/libm/mathfp/er_gamma.c
@@ -28,10 +28,5 @@
 	double x; int *signgamp;
 #endif
 {
-	return exp (lgamma_r(x,signgamp));
-}
-
-double gamma(double x)
-{
-  return gamma_r(x, &(_REENT_SIGNGAM(_REENT)));
+	return lgamma_r(x,signgamp);
 }
diff --git a/newlib/libm/mathfp/er_lgamma.c b/newlib/libm/mathfp/er_lgamma.c
index fd49c25..9d8e370 100644
--- a/newlib/libm/mathfp/er_lgamma.c
+++ b/newlib/libm/mathfp/er_lgamma.c
@@ -76,9 +76,9 @@ $\mit ln\bigl(\Gamma(x)\bigr)$,
 the natural logarithm of the gamma function of <[x]>.  The gamma function
 (<<exp(gamma(<[x]>))>>) is a generalization of factorial, and retains
 the property that
-@ifnottex
+@ifinfo
 <<exp(gamma(N))>> is equivalent to <<N*exp(gamma(N-1))>>.
-@end ifnottex
+@end ifinfo
 @tex
 $\mit \Gamma(N)\equiv N\times\Gamma(N-1)$.
 @end tex
@@ -87,10 +87,10 @@ quickly.  <<gamma>> is defined as
 @tex
 $\mit ln\bigl(\Gamma(x)\bigr)$ rather than simply $\mit \Gamma(x)$
 @end tex
-@ifnottex
+@ifinfo
 the natural log of the gamma function, rather than the gamma function
 itself,
-@end ifnottex
+@end ifinfo
 to extend the useful range of results representable.
 
 The sign of the result is returned in the global variable <<signgam>>,
@@ -285,7 +285,7 @@ static double zero=  0.00000000000000000000e+00;
 	GET_HIGH_WORD(ix,x);
 	ix &= 0x7fffffff;
 
-	if(ix<0x3fd00000) return sin(pi*x);
+	if(ix<0x3fd00000) return __kernel_sin(pi*x,zero,0);
 	y = -x;		/* x is assume negative */
 
     /*
@@ -309,14 +309,14 @@ static double zero=  0.00000000000000000000e+00;
             }
         }
 	switch (n) {
-	    case 0:   y =  sin(pi*y); break;
+	    case 0:   y =  __kernel_sin(pi*y,zero,0); break;
 	    case 1:   
-	    case 2:   y =  cos(pi*(0.5-y)); break;
+	    case 2:   y =  __kernel_cos(pi*(0.5-y),zero); break;
 	    case 3:  
-	    case 4:   y =  sin(pi*(one-y)); break;
+	    case 4:   y =  __kernel_sin(pi*(one-y),zero,0); break;
 	    case 5:
-	    case 6:   y = -cos(pi*(y-1.5)); break;
-	    default:  y =  sin(pi*(y-2.0)); break;
+	    case 6:   y = -__kernel_cos(pi*(y-1.5),zero); break;
+	    default:  y =  __kernel_sin(pi*(y-2.0),zero,0); break;
 	    }
 	return -y;
 }
@@ -332,8 +332,6 @@ static double zero=  0.00000000000000000000e+00;
 	double t,y,z,nadj,p,p1,p2,p3,q,r,w;
 	__int32_t i,hx,lx,ix;
 
-        nadj = 0;
-
 	EXTRACT_WORDS(hx,lx,x);
 
     /* purge off +-inf, NaN, +-0, and negative arguments */
@@ -422,9 +420,3 @@ static double zero=  0.00000000000000000000e+00;
 	if(hx<0) r = nadj - r;
 	return r;
 }
-
-double
-lgamma(double x)
-{
-  return lgamma_r(x, &(_REENT_SIGNGAM(_REENT)));
-}
diff --git a/newlib/libm/mathfp/erf_gamma.c b/newlib/libm/mathfp/erf_gamma.c
index 246645d..96e8c46 100644
--- a/newlib/libm/mathfp/erf_gamma.c
+++ b/newlib/libm/mathfp/erf_gamma.c
@@ -16,7 +16,7 @@
 
 /* gammaf_r(x, signgamp)
  * Reentrant version of the logarithm of the Gamma function 
- * with user provided pointer for the sign of Gamma(x). 
+ * with user provide pointer for the sign of Gamma(x). 
  *
  * Method: See lgammaf_r
  */
@@ -30,10 +30,5 @@
 	float x; int *signgamp;
 #endif
 {
-	return expf (lgammaf_r(x,signgamp));
-}
-
-float gammaf(float x)
-{
-  return gammaf_r(x, &(_REENT_SIGNGAM(_REENT)));
+	return lgammaf_r(x,signgamp);
 }
diff --git a/newlib/libm/mathfp/erf_lgamma.c b/newlib/libm/mathfp/erf_lgamma.c
index 4f09214..664812d 100644
--- a/newlib/libm/mathfp/erf_lgamma.c
+++ b/newlib/libm/mathfp/erf_lgamma.c
@@ -107,7 +107,7 @@ static float zero=  0.0000000000e+00;
 	GET_FLOAT_WORD(ix,x);
 	ix &= 0x7fffffff;
 
-	if(ix<0x3e800000) return sinf(pi*x);
+	if(ix<0x3e800000) return __kernel_sinf(pi*x,zero,0);
 	y = -x;		/* x is assume negative */
 
     /*
@@ -131,14 +131,14 @@ static float zero=  0.0000000000e+00;
             }
         }
 	switch (n) {
-	    case 0:   y =  sinf(pi*y); break;
+	    case 0:   y =  __kernel_sinf(pi*y,zero,0); break;
 	    case 1:   
-	    case 2:   y =  cosf(pi*((float)0.5-y)); break;
+	    case 2:   y =  __kernel_cosf(pi*((float)0.5-y),zero); break;
 	    case 3:  
-	    case 4:   y =  sinf(pi*(one-y)); break;
+	    case 4:   y =  __kernel_sinf(pi*(one-y),zero,0); break;
 	    case 5:
-	    case 6:   y = -cosf(pi*(y-(float)1.5)); break;
-	    default:  y =  sinf(pi*(y-(float)2.0)); break;
+	    case 6:   y = -__kernel_cosf(pi*(y-(float)1.5),zero); break;
+	    default:  y =  __kernel_sinf(pi*(y-(float)2.0),zero,0); break;
 	    }
 	return -y;
 }
@@ -156,9 +156,7 @@ static float zero=  0.0000000000e+00;
 
 	GET_FLOAT_WORD(hx,x);
 
-        nadj = 0;
-
-        /* purge off +-inf, NaN, +-0, and negative arguments */
+    /* purge off +-inf, NaN, +-0, and negative arguments */
 	*signgamp = 1;
 	ix = hx&0x7fffffff;
 	if(ix>=0x7f800000) return x*x;
@@ -244,8 +242,3 @@ static float zero=  0.0000000000e+00;
 	if(hx<0) r = nadj - r;
 	return r;
 }
-
-float lgammaf(float x)
-{
-  return lgammaf_r(x, &(_REENT_SIGNGAM(_REENT)));
-}
diff --git a/newlib/libm/mathfp/mathfp.tex b/newlib/libm/mathfp/mathfp.tex
index 0b9f085..e7f897a 100644
--- a/newlib/libm/mathfp/mathfp.tex
+++ b/newlib/libm/mathfp/mathfp.tex
@@ -25,7 +25,7 @@ Since the error handling code calls @code{fputs}, the mathematical
 subroutines require stubs or minimal implementations for the same list
 of OS subroutines as @code{fputs}: @code{close}, @code{fstat},
 @code{isatty}, @code{lseek}, @code{read}, @code{sbrk}, @code{write}.
-@xref{syscalls,,System Calls, libc.info, The Red Hat newlib C Library},
+@xref{syscalls,,System Calls, libc.info, The Cygnus C Support Library},
 for a discussion and for sample minimal implementations of these support
 subroutines.
 
@@ -102,7 +102,7 @@ In X/Open mode, @code{errno} is set correctly, and @code{matherr} is
 called, but warning message are not printed.
 
 In SVID mode, functions which overflow return 3.40282346638528860e+38,
-the maximum single-precision floating-point value, rather than infinity.
+the maximum single precision floating point value, rather than infinity.
 Also, @code{errno} is set correctly, @code{matherr} is called, and, if
 @code{matherr} returns 0, warning messages are printed for some errors.
 For example, by default @samp{log(-1.0)} writes this message on standard
@@ -139,12 +139,6 @@ The library is set to X/Open mode by default.
 @include mathfp/wjn.def
 
 @page
-@include common/scbrt.def
-
-@page
-@include common/scopysign.def
-
-@page
 @include mathfp/scosh.def
 
 @page
@@ -154,9 +148,6 @@ The library is set to X/Open mode by default.
 @include mathfp/sexp.def
 
 @page
-@include common/sexpm1.def
-
-@page
 @include mathfp/sfabs.def
 
 @page
@@ -175,13 +166,7 @@ The library is set to X/Open mode by default.
 @include mathfp/ehypot.def
 
 @page
-@include common/silogb.def
-
-@page
-@include common/sinfinity.def
-
-@page
-@include common/sisnan.def
+@include mathfp/sisnan.def
 
 @page
 @include mathfp/sldexp.def
@@ -193,30 +178,12 @@ The library is set to X/Open mode by default.
 @include mathfp/slog10.def
 
 @page
-@include common/slog1p.def
-
-@page
-@include common/smatherr.def
-
-@page
-@include common/smodf.def
-
-@page
-@include common/snan.def
-
-@page
-@include common/snextafter.def
-
-@page
 @include mathfp/spow.def
 
 @page
 @include mathfp/eremainder.def
 
 @page
-@include common/sscalbn.def
-
-@page
 @include mathfp/ssqrt.def
 
 @page
diff --git a/newlib/libm/mathfp/s_acos.c b/newlib/libm/mathfp/s_acos.c
index 88d5937..e03344e 100644
--- a/newlib/libm/mathfp/s_acos.c
+++ b/newlib/libm/mathfp/s_acos.c
@@ -34,10 +34,10 @@ DESCRIPTION
         its calculations on <<floats>>.
 
 RETURNS
-        @ifnottex
+        @ifinfo
         <<acos>> and <<acosf>> return values in radians, in the range of 0 to pi
 .
-        @end ifnottex
+        @end ifinfo
         @tex
         <<acos>> and <<acosf>> return values in radians, in the range of <<0>> t
 o $\pi$.
diff --git a/newlib/libm/mathfp/s_asine.c b/newlib/libm/mathfp/s_asine.c
index 89a2bed..efc0a81 100644
--- a/newlib/libm/mathfp/s_asine.c
+++ b/newlib/libm/mathfp/s_asine.c
@@ -62,9 +62,9 @@ Arguments to <<asin>> and <<acos>> must be in the range @minus{}1 to 1.
 than taking and returning floats.
 
 RETURNS
-@ifnottex
+@ifinfo
 <<asin>> and <<acos>> return values in radians, in the range of -pi/2 to pi/2.
-@end ifnottex
+@end ifinfo
 @tex
 <<asin>> and <<acos>> return values in radians, in the range of $-\pi/2$ to $\pi/2$.
 @end tex
diff --git a/newlib/libm/mathfp/s_asinh.c b/newlib/libm/mathfp/s_asinh.c
index d70cc61..43b9d49 100644
--- a/newlib/libm/mathfp/s_asinh.c
+++ b/newlib/libm/mathfp/s_asinh.c
@@ -36,9 +36,9 @@ TRAD_SYNOPSIS
 DESCRIPTION
 <<asinh>> calculates the inverse hyperbolic sine of <[x]>.
 <<asinh>> is defined as 
-@ifnottex
+@ifinfo
 . sgn(<[x]>) * log(abs(<[x]>) + sqrt(1+<[x]>*<[x]>))
-@end ifnottex
+@end ifinfo
 @tex
 $$sign(x) \times ln\Bigl(|x| + \sqrt{1+x^2}\Bigr)$$
 @end tex
diff --git a/newlib/libm/mathfp/s_atan.c b/newlib/libm/mathfp/s_atan.c
index a5a8189..b8e633e 100644
--- a/newlib/libm/mathfp/s_atan.c
+++ b/newlib/libm/mathfp/s_atan.c
@@ -30,9 +30,9 @@ DESCRIPTION
 <<atanf>> is identical to <<atan>>, save that it operates on <<floats>>.
 
 RETURNS
-@ifnottex
+@ifinfo
 <<atan>> returns a value in radians, in the range of -pi/2 to pi/2.
-@end ifnottex
+@end ifinfo
 @tex
 <<atan>> returns a value in radians, in the range of $-\pi/2$ to $\pi/2$.
 @end tex
diff --git a/newlib/libm/mathfp/s_atan2.c b/newlib/libm/mathfp/s_atan2.c
index 60034b3..d73a6ef 100644
--- a/newlib/libm/mathfp/s_atan2.c
+++ b/newlib/libm/mathfp/s_atan2.c
@@ -29,9 +29,9 @@ DESCRIPTION
 
 <<atan2>> computes the inverse tangent (arc tangent) of <[y]>/<[x]>.
 <<atan2>> produces the correct result even for angles near
-@ifnottex
+@ifinfo
 pi/2 or -pi/2
-@end ifnottex
+@end ifinfo
 @tex
 $\pi/2$ or $-\pi/2$
 @end tex
@@ -42,9 +42,9 @@ $\pi/2$ or $-\pi/2$
 
 RETURNS
 <<atan2>> and <<atan2f>> return a value in radians, in the range of
-@ifnottex
+@ifinfo
 -pi to pi.
-@end ifnottex
+@end ifinfo
 @tex
 $-\pi$ to $\pi$.
 @end tex
diff --git a/newlib/libm/mathfp/s_atangent.c b/newlib/libm/mathfp/s_atangent.c
index 0a7c4d2..c6f3c9b 100644
--- a/newlib/libm/mathfp/s_atangent.c
+++ b/newlib/libm/mathfp/s_atangent.c
@@ -55,10 +55,10 @@ DESCRIPTION
 <<atanf>> is identical to <<atan>>, save that it operates on <<floats>>.
 
 RETURNS
-@ifnottex
+@ifinfo
 <<atan>> returns a value in radians, in the range of -pi/2 to pi/2.
 <<atan2>> returns a value in radians, in the range of -pi/2 to pi/2.
-@end ifnottex
+@end ifinfo
 @tex
 <<atan>> returns a value in radians, in the range of $-\pi/2$ to $\pi/2$.
 <<atan2>> returns a value in radians, in the range of $-\pi/2$ to $\pi/2$.
@@ -197,9 +197,9 @@ _DEFUN (atangent, (double, double, double, int),
 
   if (arctan2)
     {
-      if (u < 0.0)
+      if (u < 0.0 || branch == 2)
         res = __PI - res;
-      if (v < 0.0)
+      if (v < 0.0 || branch == 1)
         res = -res;
     }
   else if (x < 0.0)
diff --git a/newlib/libm/mathfp/s_cosh.c b/newlib/libm/mathfp/s_cosh.c
index 24b5420..6550e9c 100644
--- a/newlib/libm/mathfp/s_cosh.c
+++ b/newlib/libm/mathfp/s_cosh.c
@@ -23,9 +23,9 @@ DESCRIPTION
 
         <<cosh>> computes the hyperbolic cosine of the argument <[x]>.
         <<cosh(<[x]>)>> is defined as
-        @ifnottex
+        @ifinfo
         . (exp(x) + exp(-x))/2
-        @end ifnottex
+        @end ifinfo
         @tex
         $${(e^x + e^{-x})} \over 2$$
         @end tex
diff --git a/newlib/libm/mathfp/s_exp.c b/newlib/libm/mathfp/s_exp.c
index e70699b..8c7f723 100644
--- a/newlib/libm/mathfp/s_exp.c
+++ b/newlib/libm/mathfp/s_exp.c
@@ -30,9 +30,9 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
         <<exp>> and <<expf>> calculate the exponential of <[x]>, that is,
-        @ifnottex
+        @ifinfo
         e raised to the power <[x]> (where e
-        @end ifnottex
+        @end ifinfo
         @tex
         $e^x$ (where $e$
         @end tex
diff --git a/newlib/libm/mathfp/s_exp2.c b/newlib/libm/mathfp/s_exp2.c
deleted file mode 100644
index 3bcf7ca..0000000
--- a/newlib/libm/mathfp/s_exp2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-double
-_DEFUN (exp2, (double),
-        double x)
-{
-  return pow(2.0, x);
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/mathfp/s_fmod.c b/newlib/libm/mathfp/s_fmod.c
index ec86376..3af7300 100644
--- a/newlib/libm/mathfp/s_fmod.c
+++ b/newlib/libm/mathfp/s_fmod.c
@@ -39,9 +39,9 @@ remainder of <[x]>/<[y]> (<[x]> modulo <[y]>).
 
 RETURNS
 The <<fmod>> function returns the value
-@ifnottex
+@ifinfo
 <[x]>-<[i]>*<[y]>,
-@end ifnottex
+@end ifinfo
 @tex
 $x-i\times y$,
 @end tex
diff --git a/newlib/libm/mathfp/s_frexp.c b/newlib/libm/mathfp/s_frexp.c
index 54fa336..6145c47 100644
--- a/newlib/libm/mathfp/s_frexp.c
+++ b/newlib/libm/mathfp/s_frexp.c
@@ -26,17 +26,17 @@ TRAD_SYNOPSIS
 
 
 DESCRIPTION
-        All nonzero, normal numbers can be described as <[m]> * 2**<[p]>.
+        All non zero, normal numbers can be described as <[m]> * 2**<[p]>.
         <<frexp>> represents the double <[val]> as a mantissa <[m]>
         and a power of two <[p]>. The resulting mantissa will always
         be greater than or equal to <<0.5>>, and less than <<1.0>> (as
         long as <[val]> is nonzero). The power of two will be stored
         in <<*>><[exp]>.
 
-@ifnottex
+@ifinfo
 <[m]> and <[p]> are calculated so that
 <[val]> is <[m]> times <<2>> to the power <[p]>.
-@end ifnottex
+@end ifinfo
 @tex
 <[m]> and <[p]> are calculated so that
 $ val = m \times 2^p $.
@@ -82,17 +82,6 @@ double frexp (double d, int *exp)
   double f;
   __uint32_t hd, ld, hf, lf;
 
-  /* Check for special values. */
-  switch (numtest (d))
-    {
-      case NAN:
-      case INF:
-        errno = EDOM;
-      case 0:
-        *exp = 0;
-        return (d);
-    }
-
   EXTRACT_WORDS (hd, ld, d);
 
   /* Get the exponent. */
@@ -105,6 +94,16 @@ double frexp (double d, int *exp)
 
   INSERT_WORDS (f, hf, lf);
 
+  /* Check for special values. */
+  switch (numtest (f))
+    {
+      case NAN:
+      case INF:
+        errno = EDOM;
+        *exp = 0;
+        return (f);
+    }
+
   return (f);
 }
 
diff --git a/newlib/libm/mathfp/s_infconst.c b/newlib/libm/mathfp/s_infconst.c
new file mode 100644
index 0000000..e6b86d4
--- /dev/null
+++ b/newlib/libm/mathfp/s_infconst.c
@@ -0,0 +1,15 @@
+/* Infinity as a constant value.   This is used for HUGE_VAL.
+ * Added by Cygnus Support.
+ */
+
+#include "fdlibm.h"
+
+#ifndef _DOUBLE_IS_32BITS
+#ifdef __IEEE_BIG_ENDIAN
+const union __dmath __infinity[1] = {{ 0x7ff00000, 0 }};
+#else
+const union __dmath __infinity[1] = {{ 0, 0x7ff00000 }};
+#endif
+#else /* defined (_DOUBLE_IS_32BITS) */
+const union __dmath __infinity[1] = {{ 0x7f800000, 0 }};
+#endif /* defined (_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/mathfp/s_isinf.c b/newlib/libm/mathfp/s_isinf.c
new file mode 100644
index 0000000..fe9f547
--- /dev/null
+++ b/newlib/libm/mathfp/s_isinf.c
@@ -0,0 +1,37 @@
+
+/* @(#)z_isinf.c 1.0 98/08/13 */
+/******************************************************************
+ * isinf
+ *
+ * Input:
+ *   x - pointer to a floating point value
+ *
+ * Output:
+ *   An integer that indicates if the number is infinite.
+ *
+ * Description:
+ *   This routine returns an integer that indicates if the number
+ *   passed in is infinite (1) or is finite (0).
+ *
+ *****************************************************************/
+
+#include "fdlibm.h"
+#include "zmath.h"
+
+#ifndef _DOUBLE_IS_32BITS
+
+int isinf (double x)
+{
+  __uint32_t lx, hx;
+  int exp;
+
+  EXTRACT_WORDS (hx, lx, x);
+  exp = (hx & 0x7ff00000) >> 20;
+
+  if ((exp == 0x7ff) && ((hx & 0xf0000 || lx) == 0))
+    return (1);
+  else
+    return (0);
+}
+
+#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/mathfp/s_isnan.c b/newlib/libm/mathfp/s_isnan.c
new file mode 100644
index 0000000..776baa2
--- /dev/null
+++ b/newlib/libm/mathfp/s_isnan.c
@@ -0,0 +1,125 @@
+
+/* @(#)z_isnan.c 1.0 98/08/13 */
+
+/*
+FUNCTION
+        <<isnan>>,<<isnanf>>,<<isinf>>,<<isinff>>,<<finite>>,<<finitef>>---test
+for exceptional numbers
+
+INDEX
+        isnan
+INDEX
+        isinf
+INDEX
+        finite
+
+INDEX
+        isnanf
+INDEX
+        isinff
+INDEX
+        finitef
+
+ANSI_SYNOPSIS
+        #include <ieeefp.h>
+        int isnan(double <[arg]>);
+        int isinf(double <[arg]>);
+        int finite(double <[arg]>);
+        int isnanf(float <[arg]>);
+        int isinff(float <[arg]>);
+        int finitef(float <[arg]>);
+
+TRAD_SYNOPSIS
+        #include <ieeefp.h>
+        int isnan(<[arg]>)
+        double <[arg]>;
+        int isinf(<[arg]>)
+        double <[arg]>;
+        int finite(<[arg]>);
+        double <[arg]>;
+        int isnanf(<[arg]>);
+        float <[arg]>;
+        int isinff(<[arg]>);
+        float <[arg]>;
+        int finitef(<[arg]>);
+        float <[arg]>;
+
+
+DESCRIPTION
+        These functions provide information on the floating point
+        argument supplied.
+
+        There are five major number formats -
+        o+
+        o zero
+         a number which contains all zero bits.
+        o subnormal
+         Is used to represent  number with a zero exponent, but a non zero fract
+ion.
+         o normal
+          A number with an exponent, and a fraction
+        o infinity
+          A number with an all 1's exponent and a zero fraction.
+        o NAN
+          A number with an all 1's exponent and a non zero fraction.
+
+        o-
+
+        <<isnan>> returns 1 if the argument is a nan. <<isinf>>
+        returns 1 if the argument is infinity.  <<finite>> returns 1 if the
+        argument is zero, subnormal or normal.
+
+        The <<isnanf>>, <<isinff>> and <<finitef>> perform the same
+        operations as their <<isnan>>, <<isinf>> and <<finite>>
+        counterparts, but on single precision floating point numbers.
+
+QUICKREF
+        isnan - pure
+QUICKREF
+        isinf - pure
+QUICKREF
+        finite - pure
+QUICKREF
+        isnan - pure
+QUICKREF
+        isinf - pure
+QUICKREF
+        finite - pure
+*/
+
+
+/******************************************************************
+ * isnan
+ *
+ * Input:
+ *   x - pointer to a floating point value
+ *
+ * Output:
+ *   An integer that indicates if the number is NaN.
+ *
+ * Description:
+ *   This routine returns an integer that indicates if the number
+ *   passed in is NaN (1) or is finite (0).
+ *
+ *****************************************************************/
+
+#include "fdlibm.h"
+#include "zmath.h"
+
+#ifndef _DOUBLE_IS_32BITS
+
+int isnan (double x)
+{
+  __uint32_t lx, hx;
+  int exp;
+
+  EXTRACT_WORDS (hx, lx, x);
+  exp = (hx & 0x7ff00000) >> 20;
+
+  if ((exp == 0x7ff) && (hx & 0xf0000 || lx))
+    return (1);
+  else
+    return (0);
+}
+
+#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/mathfp/s_ldexp.c b/newlib/libm/mathfp/s_ldexp.c
index 6da4128..97d8a3b 100644
--- a/newlib/libm/mathfp/s_ldexp.c
+++ b/newlib/libm/mathfp/s_ldexp.c
@@ -28,9 +28,9 @@ TRAD_SYNOPSIS
 
 DESCRIPTION
 <<ldexp>> calculates the value
-@ifnottex
+@ifinfo
 <[val]> times 2 to the power <[exp]>.
-@end ifnottex
+@end ifinfo
 @tex
 $val\times 2^{exp}$.
 @end tex
@@ -45,7 +45,7 @@ On underflow, <<ldexp>> and <<ldexpf>> return 0.0.
 On overflow, <<ldexp>> returns plus or minus <<HUGE_VAL>>.
 
 PORTABILITY
-<<ldexp>> is ANSI. <<ldexpf>> is an extension.
+<<ldexp>> is ANSI, <<ldexpf>> is an extension.
 
 */
 
diff --git a/newlib/libm/mathfp/s_logarithm.c b/newlib/libm/mathfp/s_logarithm.c
index 3e07949..ee7c706 100644
--- a/newlib/libm/mathfp/s_logarithm.c
+++ b/newlib/libm/mathfp/s_logarithm.c
@@ -56,9 +56,8 @@ When <[x]> is negative, the returned value is <<-HUGE_VAL>> and
 <<matherr>>.
 
 PORTABILITY
-<<log>> is ANSI. <<logf>> is an extension.
-
-<<log10>> is ANSI. <<log10f>> is an extension.
+<<log>> is ANSI, <<logf>> is an extension.
+<<log10>> is ANSI, <<log10f>> is an extension.
 */
 
 
diff --git a/newlib/libm/mathfp/s_mathcnst.c b/newlib/libm/mathfp/s_mathcnst.c
index a847ee4..7865c7f 100644
--- a/newlib/libm/mathfp/s_mathcnst.c
+++ b/newlib/libm/mathfp/s_mathcnst.c
@@ -12,13 +12,13 @@ ufloat z_hugeval_f  = { 0x7f800000 };
 ufloat z_infinity_f = { 0x7f800000 };
 ufloat z_notanum_f  = { 0xffd00000 };
 
-#ifdef __IEEE_BIG_ENDIAN
+#ifdef ___IEEE_LITTLE_ENDIAN
 udouble z_hugeval  = { 0x7ff00000, 0 };
 udouble z_infinity = { 0x7ff00000, 0 };
 udouble z_notanum  = { 0xfff80000, 0 };
-#else /* __IEEE_LITTLE_ENDIAN  */
+#else
 udouble z_hugeval  = { 0, 0x7ff00000 };
 udouble z_infinity = { 0, 0x7ff00000 };
 udouble z_notanum  = { 0, 0xfff80000 };
-#endif /* __IEEE_LITTLE_ENDIAN */
+#endif /* ___IEEE_LITTLE_ENDIAN */
 
diff --git a/newlib/libm/mathfp/s_pow.c b/newlib/libm/mathfp/s_pow.c
index 90d9d0b..7c0a38a 100644
--- a/newlib/libm/mathfp/s_pow.c
+++ b/newlib/libm/mathfp/s_pow.c
@@ -24,7 +24,7 @@ TRAD_SYNOPSIS
         float <[x]>, <[y]>;
 
 DESCRIPTION
-        <<pow>> and <<powf>> calculate <[x]> raised to the exponent <[y]>.
+        <<pow>> and <<powf>> calculate <[x]> raised to the exp1.0nt <[y]>.
         @tex
         (That is, $x^y$.)
         @end tex
@@ -52,68 +52,57 @@ PORTABILITY
 
 double pow (double x, double y)
 {
-  double d, k, t, r = 1.0;
-  int n, sign, exponent_is_even_int = 0;
+  double d, t, r = 1.0;
+  int n, k, sign = 0;
   __uint32_t px;
 
   GET_HIGH_WORD (px, x);
 
   k = modf (y, &d);
-
-  if (k == 0.0)
+  if (k == 0.0) 
     {
-      /* Exponent y is an integer. */
       if (modf (ldexp (y, -1), &t))
-        {
-          /* y is odd. */
-          exponent_is_even_int = 0;
-        }
+        sign = 0;
       else
-        {
-          /* y is even. */
-          exponent_is_even_int = 1;
-        }
+        sign = 1; 
     }
 
-  if (x == 0.0)
-    {
-      if (y <= 0.0)
-        errno = EDOM;
-    }
+  if (x == 0.0 && y <= 0.0) 
+    errno = EDOM;
+
   else if ((t = y * log (fabs (x))) >= BIGX) 
     {
       errno = ERANGE;
       if (px & 0x80000000) 
         {
-          /* x is negative. */
-          if (k) 
+          if (!k) 
             {
-              /* y is not an integer. */
               errno = EDOM;
               x = 0.0;
             }
-          else if (exponent_is_even_int)
-            x = z_infinity.d;
-          else
+          else if (sign)
             x = -z_infinity.d;
+          else
+            x =  z_infinity.d;
         }
-      else
-        {
-          x = z_infinity.d;
-        }
-    }
+
+    else 
+      x = z_infinity.d;
+  }
+
   else if (t < SMALLX)
     {
       errno = ERANGE;
       x = 0.0;
     }
+
   else 
     {
-      if ( !k && fabs(d) <= 32767 ) 
+      if ( k && fabs(d) <= 32767 ) 
         {
           n = (int) d;
 
-          if ((sign = (n < 0)))
+          if (sign = (n < 0))
             n = -n;
 
           while ( n > 0 ) 
@@ -129,14 +118,13 @@ double pow (double x, double y)
 
           return r;
         }
+		
       else 
         {
           if ( px & 0x80000000 ) 
             {
-              /* x is negative. */
-              if ( k ) 
+              if ( !k ) 
                 {
-                  /* y is not an integer. */
                   errno = EDOM;
                   return 0.0;
                 }
@@ -144,19 +132,13 @@ double pow (double x, double y)
 
           x = exp (t);
 
-          if (!exponent_is_even_int)
-            {
-              if (px & 0x80000000)
-                {
-                  /* y is an odd integer, and x is negative,
-                     so the result is negative. */
-                  GET_HIGH_WORD (px, x);
-                  px |= 0x80000000;
-                  SET_HIGH_WORD (x, px);
-                }
+          if ( sign ) 
+            { 
+              px ^= 0x80000000;
+              SET_HIGH_WORD (x, px);
             }
         }
-    }
+      }
 
   return x;
 }
diff --git a/newlib/libm/mathfp/s_sincos.c b/newlib/libm/mathfp/s_sincos.c
deleted file mode 100644
index e313e6f..0000000
--- a/newlib/libm/mathfp/s_sincos.c
+++ /dev/null
@@ -1,32 +0,0 @@
-
-/* @(#)z_sin.c 1.0 98/08/13 */
-/******************************************************************
- * Sine
- *
- * Input:
- *   x - floating point value
- *
- * Output:
- *   sine of x
- *
- * Description:
- *   This routine returns the sine of x.
- *
- *****************************************************************/
-
-#include "fdlibm.h"
-#include "zmath.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-void
-_DEFUN (sincos, (x, sinx, cosx),
-        double x _AND
-        double *sinx _AND
-        double *cosx)
-{
-  *sinx = sin (x);
-  *cosx = cos (x);
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/mathfp/s_sineh.c b/newlib/libm/mathfp/s_sineh.c
index 6f5e208..6b3480d 100644
--- a/newlib/libm/mathfp/s_sineh.c
+++ b/newlib/libm/mathfp/s_sineh.c
@@ -44,16 +44,16 @@ DESCRIPTION
         <<sinh>> and <<cosh>> compute the hyperbolic sine or cosine
         of the argument <[x]>.
         Angles are specified in radians.   <<sinh>>(<[x]>) is defined as
-        @ifnottex
+        @ifinfo
         . (exp(<[x]>) - exp(-<[x]>))/2
-        @end ifnottex
+        @end ifinfo
         @tex
         $${e^x - e^{-x}}\over 2$$
         @end tex
         <<cosh>> is defined as
-        @ifnottex
+        @ifinfo
         . (exp(<[x]>) - exp(-<[x]>))/2
-        @end ifnottex
+        @end ifinfo
         @tex
         $${e^x + e^{-x}}\over 2$$
         @end tex
diff --git a/newlib/libm/mathfp/s_tgamma.c b/newlib/libm/mathfp/s_tgamma.c
deleted file mode 100644
index 4caf270..0000000
--- a/newlib/libm/mathfp/s_tgamma.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* @(#)w_gamma.c 5.1 93/09/24 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-/* double gamma(double x)
- * Return  the logarithm of the Gamma function of x or the Gamma function of x,
- * depending on the library mode.
- */
-
-#include <math.h>
-#include <errno.h>
-
-#ifdef __STDC__
-	double tgamma(double x)
-#else
-	double tgamma(x)
-	double x;
-#endif
-{
-        double y;
-	int local_signgam;
-	y = gamma_r(x,&local_signgam);
-	if (local_signgam < 0) y = -y;
-#ifdef _IEEE_LIBM
-	return y;
-#else
-	if(_LIB_VERSION == _IEEE_) return y;
-
-	if(!finite(y)&&finite(x)) {
-	  if(floor(x)==x&&x<=0.0)
-            {
-              /* tgamma pole */
-              errno = EDOM;
-              return HUGE_VAL;
-            }
-	  else
-            {
-              /* tgamma overflow */
-              errno = ERANGE;
-              return HUGE_VAL;
-            }
-	}
-	return y;
-#endif
-}
diff --git a/newlib/libm/mathfp/sf_atangent.c b/newlib/libm/mathfp/sf_atangent.c
index 7a8f0ce..55a9006 100644
--- a/newlib/libm/mathfp/sf_atangent.c
+++ b/newlib/libm/mathfp/sf_atangent.c
@@ -126,9 +126,9 @@ _DEFUN (atangentf, (float, float, float, int),
 
   if (arctan2)
     {
-      if (u < 0.0)
+      if (u < 0.0 || branch == 2)
         res = __PI - res;
-      if (v < 0.0)
+      if (v < 0.0 || branch == 1)
         res = -res;
     }
   else if (x < 0.0)
diff --git a/newlib/libm/mathfp/sf_exp2.c b/newlib/libm/mathfp/sf_exp2.c
deleted file mode 100644
index 7e147c5..0000000
--- a/newlib/libm/mathfp/sf_exp2.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include "fdlibm.h"
-
-float
-_DEFUN (exp2f, (float),
-        float x)
-{
-  return powf(2.0, x);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-double exp2 (double x)
-{
-  return (double) exp2f ((float) x);
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/mathfp/sf_frexp.c b/newlib/libm/mathfp/sf_frexp.c
index 7f25195..c2751f6 100644
--- a/newlib/libm/mathfp/sf_frexp.c
+++ b/newlib/libm/mathfp/sf_frexp.c
@@ -24,17 +24,6 @@ float frexpf (float d, int *exp)
   float f;
   __int32_t wf, wd;
 
-  /* Check for special values. */
-  switch (numtestf (d))
-    {
-      case NAN:
-      case INF:
-        errno = EDOM;
-      case 0:
-        *exp = 0;
-        return (d);
-    }
-
   GET_FLOAT_WORD (wd, d);
 
   /* Get the exponent. */
@@ -46,6 +35,16 @@ float frexpf (float d, int *exp)
 
   SET_FLOAT_WORD (f, wf);
 
+  /* Check for special values. */
+  switch (numtestf (f))
+    {
+      case NAN:
+      case INF:
+        errno = EDOM;
+        *exp = 0;
+        return (f);
+    }
+
   return (f);
 }
 
diff --git a/newlib/libm/mathfp/sf_isinf.c b/newlib/libm/mathfp/sf_isinf.c
new file mode 100644
index 0000000..84ab3f7
--- /dev/null
+++ b/newlib/libm/mathfp/sf_isinf.c
@@ -0,0 +1,48 @@
+
+/* @(#)z_isinff.c 1.0 98/08/13 */
+/******************************************************************
+ * isinff
+ *
+ * Input:
+ *   x - pointer to a floating point value
+ *
+ * Output:
+ *   An integer that indicates if the number is infinite.
+ *
+ * Description:
+ *   This routine returns an integer that indicates if the number
+ *   passed in is infinite (1) or is finite (0).
+ *
+ *****************************************************************/
+
+#include "fdlibm.h"
+#include "zmath.h"
+
+int 
+_DEFUN (isinff, (float),
+	float x)
+{
+  __uint32_t wx;
+  int exp;
+
+  GET_FLOAT_WORD (wx, x);
+  exp = (wx & 0x7f800000) >> 23;
+
+  if ((exp == 0x7f8) && !(wx & 0xf0000))
+    return (1);
+  else
+    return (0);
+}
+
+#ifdef _DOUBLE_IS_32BITS
+
+int
+_DEFUN (isinf, (double),
+        double x)
+{
+  return isinff ((float) x);
+}
+
+#endif /* defined(_DOUBLE_IS_32BITS) */
+
+
diff --git a/newlib/libm/mathfp/sf_isnan.c b/newlib/libm/mathfp/sf_isnan.c
new file mode 100644
index 0000000..ac557a6
--- /dev/null
+++ b/newlib/libm/mathfp/sf_isnan.c
@@ -0,0 +1,48 @@
+
+/* @(#)z_isnanf.c 1.0 98/08/13 */
+/******************************************************************
+ * isnanf
+ *
+ * Input:
+ *   x - pointer to a floating point value
+ *
+ * Output:
+ *   An integer that indicates if the number is NaN.
+ *
+ * Description:
+ *   This routine returns an integer that indicates if the number
+ *   passed in is NaN (1) or is finite (0).
+ *
+ *****************************************************************/
+
+#include "fdlibm.h"
+#include "zmath.h"
+
+int
+_DEFUN (isnanf, (float),
+        float x)
+{
+  __int32_t wx;
+  int exp;
+
+  GET_FLOAT_WORD (wx, x);
+  exp = (wx & 0x7f800000) >> 23;
+
+  if ((exp == 0x7f8) && (wx & 0x7fffff))
+    return (1);
+  else
+    return (0);
+}
+
+
+#ifdef _DOUBLE_IS_32BITS
+
+int
+_DEFUN (isnan, (double),
+        double x)
+{
+  return isnanf((float) x);
+}
+
+#endif /* defined(_DOUBLE_IS_32BITS) */
+
diff --git a/newlib/libm/mathfp/sf_pow.c b/newlib/libm/mathfp/sf_pow.c
index 489a71d..2b3bed3 100644
--- a/newlib/libm/mathfp/sf_pow.c
+++ b/newlib/libm/mathfp/sf_pow.c
@@ -6,68 +6,57 @@
 
 float powf (float x, float y)
 {
-  float d, k, t, r = 1.0;
-  int n, sign, exponent_is_even_int = 0;
+  float d, t, r = 1.0;
+  int n, k, sign = 0;
   __int32_t px;
 
   GET_FLOAT_WORD (px, x);
 
   k = modff (y, &d);
-
   if (k == 0.0) 
     {
-      /* Exponent y is an integer. */
       if (modff (ldexpf (y, -1), &t))
-        {
-          /* y is odd. */
-          exponent_is_even_int = 0;
-        }
+        sign = 0;
       else
-        {
-          /* y is even. */
-          exponent_is_even_int = 1;
-        }
+        sign = 1; 
     }
 
-  if (x == 0.0)
-    {
-      if (y <= 0.0)
-        errno = EDOM;
-    }
+  if (x == 0.0 && y <= 0.0) 
+    errno = EDOM;
+
   else if ((t = y * log (fabsf (x))) >= BIGX) 
     {
       errno = ERANGE;
       if (px & 0x80000000) 
         {
-          /* x is negative. */
-          if (k) 
+          if (!k) 
             {
-              /* y is not an integer. */
               errno = EDOM;
               x = 0.0;
             }
-          else if (exponent_is_even_int)
-            x = z_infinity_f.f;
-          else
+          else if (sign)
             x = -z_infinity_f.f;
+          else
+            x =  z_infinity_f.f;
         }
-    else
-      {
-        x = z_infinity_f.f;
-      }
-    }
+
+    else 
+      x = z_infinity_f.f;
+  }
+
   else if (t < SMALLX)
     {
       errno = ERANGE;
       x = 0.0;
     }
+
   else 
     {
-      if ( !k && fabsf (d) <= 32767 ) 
+      if ( k && fabsf (d) <= 32767 ) 
         {
           n = (int) d;
 
-          if ((sign = (n < 0)))
+          if (sign = (n < 0))
             n = -n;
 
           while ( n > 0 ) 
@@ -83,14 +72,13 @@ float powf (float x, float y)
 
           return r;
         }
+		
       else 
         {
           if ( px & 0x80000000 ) 
             {
-              /* x is negative. */
-              if (k) 
+              if ( !k ) 
                 {
-                  /* y is not an integer. */
                   errno = EDOM;
                   return 0.0;
                 }
@@ -98,19 +86,13 @@ float powf (float x, float y)
 
           x = exp (t);
 
-          if (!exponent_is_even_int) 
+          if ( sign ) 
             { 
-              if (px & 0x80000000)
-                {
-                  /* y is an odd integer, and x is negative,
-                     so the result is negative. */
-                  GET_FLOAT_WORD (px, x);
-                  px |= 0x80000000;
-                  SET_FLOAT_WORD (x, px);
-                }
+              px ^= 0x80000000;
+              SET_FLOAT_WORD (x, px);
             }
         }
-    }
+      }
 
   return x;
 }
diff --git a/newlib/libm/mathfp/sf_sincos.c b/newlib/libm/mathfp/sf_sincos.c
deleted file mode 100644
index e192b4b..0000000
--- a/newlib/libm/mathfp/sf_sincos.c
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/* @(#)z_sinf.c 1.0 98/08/13 */
-/******************************************************************
- * Sine
- *
- * Input:
- *   x - floating point value
- *
- * Output:
- *   sine of x
- *
- * Description:
- *   This routine returns the sine of x.
- *
- *****************************************************************/
-
-#include "fdlibm.h"
-#include "zmath.h"
-
-void
-_DEFUN (sincosf, (x, sinx, cosx),
-        float x _AND
-        float *sinx _AND
-        float *cosx)
-{
-  *sinx = sin (x);
-  *cosx = cos (x);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-void
-sincos (double x, double *sinx, double *cosx)
-{
-  *sinx = (double) sinf ((float) x);
-  *cosx = (double) cosf ((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
diff --git a/newlib/libm/mathfp/sf_tgamma.c b/newlib/libm/mathfp/sf_tgamma.c
deleted file mode 100644
index f4d1456..0000000
--- a/newlib/libm/mathfp/sf_tgamma.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* w_gammaf.c -- float version of w_gamma.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#include <math.h>
-#include <errno.h>
-
-#ifdef __STDC__
-	float tgammaf(float x)
-#else
-	float tgammaf(x)
-	float x;
-#endif
-{
-        float y;
-	int local_signgam;
-	y = gammaf_r(x,&local_signgam);
-	if (local_signgam < 0) y = -y;
-#ifdef _IEEE_LIBM
-	return y;
-#else
-	if(_LIB_VERSION == _IEEE_) return y;
-
-	if(!finitef(y)&&finitef(x)) {
-	  if(floorf(x)==x&&x<=(float)0.0)
-            {
-              /* tgammaf pole */
-              errno = EDOM;
-              return HUGE_VAL;
-            }
-	  else
-            {
-              /* tgammaf overflow */
-              errno = ERANGE;
-              return HUGE_VAL;
-            }
-	}
-	return y;
-#endif
-}
diff --git a/newlib/libm/mathfp/w_jn.c b/newlib/libm/mathfp/w_jn.c
index 14c2225..6806f01 100644
--- a/newlib/libm/mathfp/w_jn.c
+++ b/newlib/libm/mathfp/w_jn.c
@@ -13,7 +13,7 @@
 
 /*
 FUNCTION
-<<jN>>, <<jNf>>, <<yN>>, <<yNf>>---Bessel functions
+<<jN>>,<<jNf>>,<<yN>>,<<yNf>>---Bessel functions
 
 INDEX
 j0
@@ -91,10 +91,10 @@ float <[x]>;
 DESCRIPTION
 The Bessel functions are a family of functions that solve the
 differential equation
-@ifnottex
+@ifinfo
 .  2               2    2
 . x  y'' + xy' + (x  - p )y  = 0
-@end ifnottex
+@end ifinfo
 @tex
 $$x^2{d^2y\over dx^2} + x{dy\over dx} + (x^2-p^2)y = 0$$
 @end tex
diff --git a/newlib/libm/test/Makefile.in b/newlib/libm/test/Makefile.in
index 1f086fc..b012369 100644
--- a/newlib/libm/test/Makefile.in
+++ b/newlib/libm/test/Makefile.in
@@ -1,31 +1,19 @@
 # Makefile for newlib/libm/test.
-# Copyright (c) 1994, 2002 Red Hat Incorporated.
+# Copyright (c) 1994 Cygnus Support.
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#    Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 
-#    Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 
-#    The name of Red Hat Incorporated may not be used to endorse
-#    or promote products derived from this software without specific
-#    prior written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL RED HAT INCORPORATED BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Redistribution and use in source and binary forms are permitted
+# provided that the above copyright notice and this paragraph are
+# duplicated in all such forms and that any documentation,
+# advertising materials, and other materials related to such
+# distribution and use acknowledge that the software was developed
+# at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
+# endorse or promote products derived from this software without
+# specific prior written permission.
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
 
 TOP=..
 SRCTOP=..
diff --git a/newlib/libm/test/convert.c b/newlib/libm/test/convert.c
index a748280..51bddfd 100644
--- a/newlib/libm/test/convert.c
+++ b/newlib/libm/test/convert.c
@@ -24,12 +24,12 @@ _DEFUN_VOID(test_strtod)
 }
 
 void
-_DEFUN_VOID(test_strtof)
+_DEFUN_VOID(test_strtodf)
 {
   char *tail;
   double v;
   /* On average we'll loose 1/2 a bit, so the test is for within 1 bit  */
-  v = strtof(pd->string, &tail);
+  v = strtodf(pd->string, &tail);
   test_mok(v, pd->value, 32);
   test_iok(tail - pd->string, pd->endscan);
 }
@@ -358,7 +358,7 @@ _DEFUN_VOID(test_cvt)
   iterate(test_atof, "atof");
   iterate(test_atoff, "atoff");
 
-  iterate(test_strtof, "strtof");
+  iterate(test_strtodf, "strtodf");
 
   int_iterate(test_atoi,"atoi");
   int_iterate(test_atol,"atol");
diff --git a/newlib/libtool.m4 b/newlib/libtool.m4
deleted file mode 100644
index ff5fb47..0000000
--- a/newlib/libtool.m4
+++ /dev/null
@@ -1,879 +0,0 @@
-## libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
-## Free Software Foundation, Inc.
-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-##
-## This program 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 of the License, or
-## (at your option) any later version.
-##
-## This program 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 program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-# serial 46 AC_PROG_LIBTOOL
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-        [AC_LIBTOOL_GCJ],
-	[AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	  [AC_LIBTOOL_GCJ],
-	[ifdef([AC_PROG_GCJ],
-	       [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([A][M_PROG_GCJ],
-	       [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])
-	 ifdef([LT_AC_PROG_GCJ],
-	       [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ
-])])])])])])
-
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.13)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
-[libtool_flags="$libtool_flags --enable-dlopen"])
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[libtool_flags="$libtool_flags --enable-win32-dll"])
-AC_ARG_ENABLE(libtool-lock,
-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
-
-AC_ARG_WITH(pic,
-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
-     pic_mode="$withval", pic_mode=default)
-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_SAVE
-     AC_LANG_C
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_RESTORE])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-
-  # recent cygwin and mingw systems supply a stub DllMain which the user
-  # can override, but on older systems we have to supply one
-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
-    [AC_TRY_LINK([],
-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
-      DllMain (0, 0, 0);],
-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
-
-  case $host/$CC in
-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
-    # old mingw systems require "-dll" to link a DLL, while more recent ones
-    # require "-mdll"
-    SAVE_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -mdll"
-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
-    CFLAGS="$SAVE_CFLAGS" ;;
-  *-*-cygwin* | *-*-pw32*)
-    # cygwin systems need to pass --dll to the linker, and not link
-    # crt.o which will require a WinMain@16 definition.
-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
-  esac
-  ;;
-  ])
-esac
-])
-
-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-
-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)])
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case $enableval in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)])
-
-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
-#   `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)])
-
-
-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-  /*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-  ?:/*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-  ;;
-  *)
-  ac_save_MAGIC_CMD="$MAGIC_CMD"
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    egrep "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  MAGIC_CMD="$ac_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
-# AC_PATH_MAGIC - find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      re_direlt=['/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  lt_cv_prog_gnu_ld=yes
-else
-  lt_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])
-
-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
-[lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-])
-
-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependant libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [regex]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given egrep regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin* | mingw* |pw32*)
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System'
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  ;;
-
-freebsd* )
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20*|hpux11*)
-  case $host_cpu in
-  hppa*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  ia64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
-    lt_cv_file_magic_cmd=/usr/bin/file
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  esac
-  ;;
-
-irix5* | irix6*)
-  case $host_os in
-  irix5*)
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=32-bit;;
-    *-n32|*"-n32 ") libmagic=N32;;
-    *-64|*"-64 ") libmagic=64-bit;;
-    *) libmagic=never-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
-    ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*|linux-newlib*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
-  else
-    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
-  fi
-  ;;
-
-newsos6)
-  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-[sysv5uw[78]* | sysv4*uw2*)]
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  motorola)
-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  esac
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-])
-
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	lt_cv_path_NM="$tmp_nm -p"
-	break
-      else
-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-AC_MSG_RESULT([$NM])
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32*)
-  # These system don't have libm
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, main, LIBM="-lm")
-  ;;
-esac
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, main,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    INCLTDL=
-  fi
-])
-
-# If this macro is not defined by Autoconf, define it here.
-ifdef([AC_PROVIDE_IFELSE],
-      [],
-      [define([AC_PROVIDE_IFELSE],
-              [ifdef([AC_PROVIDE_$1],
-                     [$2], [$3])])])
-
-# AC_LIBTOOL_CXX - enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])])
-
-AC_DEFUN([_AC_LIBTOOL_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AC_LIBTOOL_GCJ - enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])])
-
-AC_DEFUN([_AC_LIBTOOL_GCJ],
-[AC_REQUIRE([AC_PROG_LIBTOOL])
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-         [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-           [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh"
-lt_save_CC="$CC"
-lt_save_CFLAGS="$CFLAGS"
-dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC
-dnl is set to the C++ compiler.
-AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \
-MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
-deplibs_check_method="$deplibs_check_method" \
-file_magic_cmd="$file_magic_cmd" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \
-|| AC_MSG_ERROR([libtool tag configuration failed])
-CC="$lt_save_CC"
-CFLAGS="$lt_save_CFLAGS"
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-dnl old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-dnl This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])dnl
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
diff --git a/newlib/newlib.hin b/newlib/newlib.hin
deleted file mode 100644
index 2071928..0000000
--- a/newlib/newlib.hin
+++ /dev/null
@@ -1,152 +0,0 @@
-/* newlib.hin.  Generated automatically from configure.in by autoheader.  */
-#ifndef __NEWLIB_H__
-
-#define __NEWLIB_H__ 1
-
-/* EL/IX level */
-#undef _ELIX_LEVEL
-
-/* Newlib version */
-#undef _NEWLIB_VERSION
-
-/* long long type support in IO functions like printf/scanf enabled */
-#undef _WANT_IO_LONG_LONG
-
-/* long double type support in IO functions like printf/scanf enabled */
-#undef _WANT_IO_LONG_DOUBLE
-
-/* Positional argument support in printf functions enabled.  */
-#undef _WANT_IO_POS_ARGS
-
-/* Multibyte supported */
-#undef _MB_CAPABLE
-
-/* MB_LEN_MAX */
-#undef _MB_LEN_MAX
-
-/* ICONV enabled */
-#undef _ICONV_ENABLED
-
-/* Enable ICONV external CCS files loading capabilities */
-#undef _ICONV_ENABLE_EXTERNAL_CCS
-
-/* Define if the linker supports .preinit_array/.init_array/.fini_array
- * sections.  */
-#undef  HAVE_INITFINI_ARRAY
-
-/* True if atexit() may dynamically allocate space for cleanup
-   functions.  */
-#undef  _ATEXIT_DYNAMIC_ALLOC
-
-/* Define if the compiler supports aliasing an array to an address.  */
-#undef  _HAVE_ARRAY_ALIASING
-/*
- * Iconv encodings enabled ("to" direction)
- */
-#undef _ICONV_TO_ENCODING_BIG5
-#undef _ICONV_TO_ENCODING_CP775
-#undef _ICONV_TO_ENCODING_CP850
-#undef _ICONV_TO_ENCODING_CP852
-#undef _ICONV_TO_ENCODING_CP855
-#undef _ICONV_TO_ENCODING_CP866
-#undef _ICONV_TO_ENCODING_EUC_JP
-#undef _ICONV_TO_ENCODING_EUC_TW
-#undef _ICONV_TO_ENCODING_EUC_KR
-#undef _ICONV_TO_ENCODING_ISO_8859_1
-#undef _ICONV_TO_ENCODING_ISO_8859_10
-#undef _ICONV_TO_ENCODING_ISO_8859_11
-#undef _ICONV_TO_ENCODING_ISO_8859_13
-#undef _ICONV_TO_ENCODING_ISO_8859_14
-#undef _ICONV_TO_ENCODING_ISO_8859_15
-#undef _ICONV_TO_ENCODING_ISO_8859_2
-#undef _ICONV_TO_ENCODING_ISO_8859_3
-#undef _ICONV_TO_ENCODING_ISO_8859_4
-#undef _ICONV_TO_ENCODING_ISO_8859_5
-#undef _ICONV_TO_ENCODING_ISO_8859_6
-#undef _ICONV_TO_ENCODING_ISO_8859_7
-#undef _ICONV_TO_ENCODING_ISO_8859_8
-#undef _ICONV_TO_ENCODING_ISO_8859_9
-#undef _ICONV_TO_ENCODING_ISO_IR_111
-#undef _ICONV_TO_ENCODING_KOI8_R
-#undef _ICONV_TO_ENCODING_KOI8_RU
-#undef _ICONV_TO_ENCODING_KOI8_U
-#undef _ICONV_TO_ENCODING_KOI8_UNI
-#undef _ICONV_TO_ENCODING_UCS_2
-#undef _ICONV_TO_ENCODING_UCS_2_INTERNAL
-#undef _ICONV_TO_ENCODING_UCS_2BE
-#undef _ICONV_TO_ENCODING_UCS_2LE
-#undef _ICONV_TO_ENCODING_UCS_4
-#undef _ICONV_TO_ENCODING_UCS_4_INTERNAL
-#undef _ICONV_TO_ENCODING_UCS_4BE
-#undef _ICONV_TO_ENCODING_UCS_4LE
-#undef _ICONV_TO_ENCODING_US_ASCII
-#undef _ICONV_TO_ENCODING_UTF_16
-#undef _ICONV_TO_ENCODING_UTF_16BE
-#undef _ICONV_TO_ENCODING_UTF_16LE
-#undef _ICONV_TO_ENCODING_UTF_8
-#undef _ICONV_TO_ENCODING_WIN_1250
-#undef _ICONV_TO_ENCODING_WIN_1251
-#undef _ICONV_TO_ENCODING_WIN_1252
-#undef _ICONV_TO_ENCODING_WIN_1253
-#undef _ICONV_TO_ENCODING_WIN_1254
-#undef _ICONV_TO_ENCODING_WIN_1255
-#undef _ICONV_TO_ENCODING_WIN_1256
-#undef _ICONV_TO_ENCODING_WIN_1257
-#undef _ICONV_TO_ENCODING_WIN_1258
-
-/*
- * Iconv encodings enabled ("from" direction)
- */
-#undef _ICONV_FROM_ENCODING_BIG5
-#undef _ICONV_FROM_ENCODING_CP775
-#undef _ICONV_FROM_ENCODING_CP850
-#undef _ICONV_FROM_ENCODING_CP852
-#undef _ICONV_FROM_ENCODING_CP855
-#undef _ICONV_FROM_ENCODING_CP866
-#undef _ICONV_FROM_ENCODING_EUC_JP
-#undef _ICONV_FROM_ENCODING_EUC_TW
-#undef _ICONV_FROM_ENCODING_EUC_KR
-#undef _ICONV_FROM_ENCODING_ISO_8859_1
-#undef _ICONV_FROM_ENCODING_ISO_8859_10
-#undef _ICONV_FROM_ENCODING_ISO_8859_11
-#undef _ICONV_FROM_ENCODING_ISO_8859_13
-#undef _ICONV_FROM_ENCODING_ISO_8859_14
-#undef _ICONV_FROM_ENCODING_ISO_8859_15
-#undef _ICONV_FROM_ENCODING_ISO_8859_2
-#undef _ICONV_FROM_ENCODING_ISO_8859_3
-#undef _ICONV_FROM_ENCODING_ISO_8859_4
-#undef _ICONV_FROM_ENCODING_ISO_8859_5
-#undef _ICONV_FROM_ENCODING_ISO_8859_6
-#undef _ICONV_FROM_ENCODING_ISO_8859_7
-#undef _ICONV_FROM_ENCODING_ISO_8859_8
-#undef _ICONV_FROM_ENCODING_ISO_8859_9
-#undef _ICONV_FROM_ENCODING_ISO_IR_111
-#undef _ICONV_FROM_ENCODING_KOI8_R
-#undef _ICONV_FROM_ENCODING_KOI8_RU
-#undef _ICONV_FROM_ENCODING_KOI8_U
-#undef _ICONV_FROM_ENCODING_KOI8_UNI
-#undef _ICONV_FROM_ENCODING_UCS_2
-#undef _ICONV_FROM_ENCODING_UCS_2_INTERNAL
-#undef _ICONV_FROM_ENCODING_UCS_2BE
-#undef _ICONV_FROM_ENCODING_UCS_2LE
-#undef _ICONV_FROM_ENCODING_UCS_4
-#undef _ICONV_FROM_ENCODING_UCS_4_INTERNAL
-#undef _ICONV_FROM_ENCODING_UCS_4BE
-#undef _ICONV_FROM_ENCODING_UCS_4LE
-#undef _ICONV_FROM_ENCODING_US_ASCII
-#undef _ICONV_FROM_ENCODING_UTF_16
-#undef _ICONV_FROM_ENCODING_UTF_16BE
-#undef _ICONV_FROM_ENCODING_UTF_16LE
-#undef _ICONV_FROM_ENCODING_UTF_8
-#undef _ICONV_FROM_ENCODING_WIN_1250
-#undef _ICONV_FROM_ENCODING_WIN_1251
-#undef _ICONV_FROM_ENCODING_WIN_1252
-#undef _ICONV_FROM_ENCODING_WIN_1253
-#undef _ICONV_FROM_ENCODING_WIN_1254
-#undef _ICONV_FROM_ENCODING_WIN_1255
-#undef _ICONV_FROM_ENCODING_WIN_1256
-#undef _ICONV_FROM_ENCODING_WIN_1257
-#undef _ICONV_FROM_ENCODING_WIN_1258
-
-#endif /* !__NEWLIB_H__ */
-
diff --git a/newlib/stamp-h.in b/newlib/stamp-h.in
deleted file mode 100644
index 9788f70..0000000
--- a/newlib/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/newlib/testsuite/config/default.exp b/newlib/testsuite/config/default.exp
deleted file mode 100644
index 4742182..0000000
--- a/newlib/testsuite/config/default.exp
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software
-# is freely granted, provided that this notice is preserved.
-#
-
-load_lib standard.exp
diff --git a/newlib/testsuite/include/check.h b/newlib/testsuite/include/check.h
deleted file mode 100644
index 70a71a1..0000000
--- a/newlib/testsuite/include/check.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#define CHECK(a) { \
-  if (!(a)) \
-    { \
-      printf ("Failed " #a " in <%s> at line %d\n", __FILE__, __LINE__); \
-      fflush(stdout); \
-      abort(); \
-    } \
-}
diff --git a/newlib/testsuite/lib/checkoutput.exp b/newlib/testsuite/lib/checkoutput.exp
deleted file mode 100644
index 146f87b..0000000
--- a/newlib/testsuite/lib/checkoutput.exp
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software
-# is freely granted, provided that this notice is preserved.
-#
-
-# newlib_check_output takes the basename of the test source file, and
-# a list of TCL regular expressions representing the expected output.
-# It assumes one line of output per test.
-
-proc newlib_check_output { srcfile expectlist } {
-    global subdir srcdir tmpdir
-
-    set srcfullname "$srcdir/$subdir/$srcfile"
-    set test_driver "$tmpdir/[file tail [file rootname $srcfullname].x]"
-
-    set comp_output [newlib_target_compile "$srcfullname" "$test_driver" "executable" ""]
-
-    if { $comp_output != "" } {
-	fail "$subdir/$srcfile compilation"
-	unresolved "$subdir/$srcfile output"
-	return
-    }
-    pass "$subdir/$srcfile compilation"
-
-    set result [newlib_load $test_driver ""]
-    set status [lindex $result 0]
-    set output [lindex $result 1]
-
-    set output_lines [split $output "\n"]
-
-    foreach { expectedval } $expectlist {
-	set gotval [string trim [lindex $output_lines 0] "\r"]
-	if { ! [string match $expectedval $gotval] } {
-	    verbose -log "$subdir/$srcfile: Expected: $expectedval Got: $gotval "
-	    fail "$subdir/$srcfile output"
-	    return
-	}
-	set output_lines [lrange $output_lines 1 end]
-    }
-
-    pass "$subdir/$srcfile output"
-}
diff --git a/newlib/testsuite/lib/flags.exp b/newlib/testsuite/lib/flags.exp
deleted file mode 100644
index ebc6928..0000000
--- a/newlib/testsuite/lib/flags.exp
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software
-# is freely granted, provided that this notice is preserved.
-#
-
-# flags.exp: overrides the dejagnu versions of libgloss_link_flags,
-# newlib_link_flags, and newlib_include_flags.
-
-# These versions of the procedures generate link and include flags
-# by searching for the needed files in the current build and source
-# directories, rather than in the build and source paths of the
-# compiler being used.
-
-if {![llength [info procs saved_libgloss_link_flags]]} {
-    rename libgloss_link_flags saved_libgloss_link_flags
-}
-
-proc libgloss_link_flags { args } {
-    global target_cpu
-    # These values come from the local site.exp.
-    global srcdir objdir
-    global multibuildtop
-
-    if {![info exists multibuildtop]} {
-	return [saved_libgloss_link_flags $args]
-    }
-
-    verbose "In newlib version of libgloss_link_flags...\n"
-
-    if [isnative] {
-	return ""
-    }
-
-    if [is_remote host] {
-	return ""
-    }
-
-    set target_build_path "$objdir/$multibuildtop.."
-
-    set gloss_srcdir [lookfor_file ${srcdir} libgloss/$target_cpu]
-
-    if { $gloss_srcdir == "" } {
-	return ""
-    }
-
-    if [file exists $target_build_path/libgloss/$target_cpu] {
-	verbose "libgloss path is $target_build_path/libgloss/$target_cpu" 2
-	return "-B$target_build_path/libgloss/$target_cpu/ -L$target_build_path/libgloss/$target_cpu -L$gloss_srcdir"
-    } else {
-	verbose -log "No libgloss support for this target." 2
-	return ""
-    }
-}
-
-proc newlib_link_flags { args } {
-    global tool_root_dir
-    global srcdir objdir
-
-    verbose "In newlib version of newlib_link_flags...\n"
-
-    if [is_remote host] {
-	return ""
-    }
-
-    set ld_script_path [lookfor_file ${tool_root_dir} "ld/ldscripts"];
-    if { $ld_script_path != "" } {
-	set result "-L[file dirname $ld_script_path]"
-    } else {
-	set result ""
-    }
-
-    return "$result -B$objdir -L$objdir"
-}
-
-proc newlib_include_flags { args } {
-    global srcdir objdir
-
-    verbose "In newlib version of newlib_include_flags...\n"
-
-    if [is_remote host] {
-	return ""
-    }
-
-    set newlib_dir [lookfor_file ${srcdir} newlib/libc/include/assert.h]
-    if { ${newlib_dir} != "" } {
-	set newlib_dir [file dirname ${newlib_dir}]
-    }
-    return " -I$objdir/targ-include -I${newlib_dir}"
-}
diff --git a/newlib/testsuite/lib/newlib.exp b/newlib/testsuite/lib/newlib.exp
deleted file mode 100644
index f1df40e..0000000
--- a/newlib/testsuite/lib/newlib.exp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software
-# is freely granted, provided that this notice is preserved.
-#
-
-# flags.exp overrides the dejagnu versions of libgloss_link_flags,
-# newlib_link_flags, and newlib_include_flags.
-load_lib flags.exp
-
-proc newlib_version { } {
-    global tool_version
-
-    verbose "In newlib version...\n"
-
-    return $tool_version
-}
-
-set newlib_initialized 0
-
-proc newlib_init { args } {
-    global gluefile wrap_flags
-    global newlib_initialized
-    global target_info
-    # These values are initialized in the local site.exp file.
-    global srcdir objdir tmpdir
-    global host_triplet target_triplet
-    global old_ld_library_path
-
-    verbose "In newlib_init...\n"
-
-    if { $newlib_initialized == 1 } { return; }
-
-    if {[target_info needs_status_wrapper] != "" && \
-	    [target_info needs_status_wrapper] != "0" && \
-	    ![info exists gluefile]} {
-	set gluefile ${tmpdir}/testglue.o;
-	set result [build_wrapper $gluefile];
-	if { $result != "" } {
-	    set gluefile [lindex $result 0];
-	    set wrap_flags [lindex $result 1];
-	} else {
-	    unset gluefile
-	}
-    }
-
-    if [string match $host_triplet $target_triplet] then {
-	if [string match "i686-pc-linux-gnu" $host_triplet] then {
-	    set old_ld_library_path [getenv LD_LIBRARY_PATH]
-	    setenv LD_LIBRARY_PATH "$objdir/.libs"
-	}
-    }
-}
-
-proc newlib_target_compile { source dest type options } {
-    global gluefile wrap_flags
-    global srcdir objdir
-    global host_triplet target_triplet
-
-    verbose "In newlib_target_compile...\n"
-
-    lappend options "libs=-I$srcdir/include"
-    verbose "srcdir is $srcdir"
-	
-    if {[target_info needs_status_wrapper] != "" && \
-	    [target_info needs_status_wrapper] != "0" && \
-	    [info exists gluefile] } {
-	lappend options "libs=$gluefile"
-	lappend options "ldflags=$wrap_flags"
-    }
-
-    if [string match $host_triplet $target_triplet] then {
-	if [string match "i686-pc-linux-gnu" $host_triplet] then {
-	    lappend options "libs=$objdir/crt0.o -lc -lgcc"
-	    lappend options "ldflags=-nostdlib -L$objdir/.libs [newlib_include_flags]"
-	}
-    }
-
-    return [target_compile $source $dest $type $options]
-}
-
-proc newlib_finish { } {
-    global old_ld_library_path
-    global host_triplet target_triplet
-
-    verbose "In newlib_finish...\n"
-
-    if [string match $host_triplet $target_triplet] then {
-	if [string match "i686-pc-linux-gnu" $host_triplet] then {
-	    setenv LD_LIBRARY_PATH "$old_ld_library_path"
-	}
-    }
-}
-
-proc newlib_exit { } {
-    global gluefile;
-    
-    verbose "In newlib_exit...\n"
-
-    if [info exists gluefile] {
-	file_on_build delete $gluefile;
-	unset gluefile;
-    }
-}
diff --git a/newlib/testsuite/lib/passfail.exp b/newlib/testsuite/lib/passfail.exp
deleted file mode 100644
index 5e7eb21..0000000
--- a/newlib/testsuite/lib/passfail.exp
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software
-# is freely granted, provided that this notice is preserved.
-#
-
-# newlib_pass_fail_all compiles and runs all the source files in the
-# test directory. If flag is -x, then the sources whose basenames are
-# listed in exclude_list are not compiled and run.
-
-proc newlib_pass_fail_all { flag exclude_list } {
-    global srcdir objdir subdir runtests
-
-    foreach fullsrcfile [glob -nocomplain $srcdir/$subdir/*.c] {
-	set srcfile "[file tail $fullsrcfile]"
-	# If we're only testing specific files and this isn't one of them, skip it.
-	if ![runtest_file_p $runtests $srcfile] then {
-	    continue
-	}
-
-	# Exclude tests listed in exclude_list.
-	if { $flag == "-x" } then {
-	    if {[lsearch $exclude_list "$srcfile"] != -1} then {
-		continue
-	    }
-	}
-	newlib_pass_fail "$srcfile"
-    }
-}
-
-# newlib_pass_fail takes the basename of a test source file, which it
-# compiles and runs.
-
-proc newlib_pass_fail { srcfile } {
-    global srcdir tmpdir subdir
-
-    set fullsrcfile "$srcdir/$subdir/$srcfile"
-
-    set test_driver "$tmpdir/[file rootname $srcfile].x"
-
-    set comp_output [newlib_target_compile "$fullsrcfile" "$test_driver" "executable" ""]
-
-    if { $comp_output != "" } {
-	fail "$subdir/$srcfile compilation"
-	unresolved "$subdir/$srcfile execution"
-    } else {
-	pass "$subdir/$srcfile compilation"
-	set result [newlib_load $test_driver ""]
-	set status [lindex $result 0]
-	$status "$subdir/$srcfile execution"
-    }
-}
diff --git a/newlib/testsuite/newlib.elix/elix.exp b/newlib/testsuite/newlib.elix/elix.exp
deleted file mode 100644
index 6c0ee92..0000000
--- a/newlib/testsuite/newlib.elix/elix.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software
-# is freely granted, provided that this notice is preserved.
-#
-
-global host_triplet target_triplet
-
-load_lib passfail.exp
-
-set exclude_list {
-}
-
-verbose $host_triplet
-verbose $target_triplet
-
-if [string match "i\[3456\]86-pc-linux-gnu" $target_triplet] then {
-  newlib_pass_fail_all -x $exclude_list
-}
diff --git a/newlib/testsuite/newlib.elix/tmmap.c b/newlib/testsuite/newlib.elix/tmmap.c
deleted file mode 100644
index d930c96..0000000
--- a/newlib/testsuite/newlib.elix/tmmap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include "check.h"
-
-int main()
-{
-  int fd;
-  char *x;
-  FILE *fp;
-  char buf[40];
-
-  fd = open("my.file", O_CREAT | O_TRUNC | O_RDWR, 0644);
-
-  CHECK (fd != -1);
-
-  CHECK (write (fd, "abcdefgh", 8) == 8); 
- 
-  x = (char *)mmap (0, 20, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-
-  CHECK (x != MAP_FAILED);
-
-  x[3] = 'j';
-
-  CHECK (munmap (x, 20) == 0);
-
-  CHECK (close(fd) != -1);
-
-  fp = fopen("my.file","r");
-
-  CHECK (fp != NULL);
-
-  CHECK (fread(buf, 1, 20, fp) == 8);
-
-  CHECK (strncmp (buf, "abcjefgh", 8) == 0);
-
-  exit (0);
-}
-
diff --git a/newlib/testsuite/newlib.iconv/iconv.exp b/newlib/testsuite/newlib.iconv/iconv.exp
deleted file mode 100644
index 317fe7e..0000000
--- a/newlib/testsuite/newlib.iconv/iconv.exp
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2003, Artem B. Bityuckiy, SoftMine Corporation.
-# Rights transferred to Franklin Electronic Publishers.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-load_lib passfail.exp
-
-set exclude_list {
-}
-
-newlib_pass_fail_all -x $exclude_list
-
diff --git a/newlib/testsuite/newlib.iconv/iconvjp.c b/newlib/testsuite/newlib.iconv/iconvjp.c
deleted file mode 100644
index 2022851..0000000
--- a/newlib/testsuite/newlib.iconv/iconvjp.c
+++ /dev/null
@@ -1,979 +0,0 @@
-/*
- * Copyright (c) 2003, Artem B. Bityuckiy, SoftMine Corporation.
- * Rights transferred to Franklin Electronic Publishers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include <stdio.h>
-#include <iconv.h>
-#include <errno.h>
-#include <newlib.h>
-#include "check.h"
-
-#ifdef _ICONV_ENABLED
-
-#if defined(_ICONV_CONVERTER_UTF_8) || \
-    defined(_ICONV_CONVERTER_EUC_JP) || \
-    defined(_ICONV_CONVERTER_SHIFT_JIS) || \
-    defined(_ICONV_CONVERTER_UCS_2_INTERNAL)
-
-#ifdef _ICONV_CONVERTER_UTF_8
-char utf8[] =
-{
-    0xe8,0x89,0xb2,0xe3,0x80,0x85,0xe3,0x83,0x86,0xe3,
-    0x82,0xad,0xe3,0x82,0xb9,0xe3,0x83,0x88,0xe3,0x83,
-    0x95,0xe3,0x82,0xa1,0xe3,0x82,0xa4,0xe3,0x83,0xab,
-    0xe9,0x9b,0x86,0x20,0x56,0x65,0x72,0x33,0x2e,0x33,
-    0x20,0x28,0x43,0x29,0x48,0x41,0x54,0x0d,0x0a,0x0d,
-    0x0a,0xe3,0x81,0x93,0xe3,0x81,0xae,0xe3,0x82,0xa2,
-    0xe3,0x83,0xbc,0xe3,0x82,0xab,0xe3,0x82,0xa4,0xe3,
-    0x83,0x96,0xe3,0x81,0xae,0xe6,0x9c,0x80,0xe6,0x96,
-    0xb0,0xe7,0x89,0x88,0xe3,0x81,0xaf,0xe3,0x81,0x93,
-    0xe3,0x81,0x93,0xe3,0x81,0xab,0xe3,0x81,0x82,0xe3,
-    0x82,0x8a,0xe3,0x81,0xbe,0xe3,0x81,0x99,0xe3,0x80,
-    0x82,0x0d,0x0a,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,
-    0x77,0x77,0x77,0x30,0x32,0x2e,0x73,0x6f,0x2d,0x6e,
-    0x65,0x74,0x2e,0x6e,0x65,0x2e,0x6a,0x70,0x2f,0x25,
-    0x37,0x45,0x68,0x61,0x74,0x2f,0x66,0x69,0x6c,0x65,
-    0x73,0x2f,0x69,0x6e,0x64,0x65,0x78,0x2d,0x6a,0x2e,
-    0x68,0x74,0x6d,0x6c,0x0d,0x0a,0x0d,0x0a,0x63,0x72,
-    0x2c,0x20,0x63,0x72,0x6c,0x66,0x2c,0x20,0x6c,0x66,
-    0xe3,0x83,0x87,0xe3,0x82,0xa3,0xe3,0x83,0xac,0xe3,
-    0x82,0xaf,0xe3,0x83,0x88,0xe3,0x83,0xaa,0x28,0xe3,
-    0x83,0x95,0xe3,0x82,0xa9,0xe3,0x83,0xab,0xe3,0x83,
-    0x80,0x29,0xe3,0x81,0xae,0xe5,0x86,0x85,0xe5,0xae,
-    0xb9,0xe3,0x81,0xaf,0xe5,0x90,0x8c,0xe3,0x81,0x98,
-    0xe3,0x81,0xa7,0xe3,0x81,0x99,0xe3,0x81,0x8c,0xe3,
-    0x80,0x81,0xe8,0xa1,0x8c,0xe3,0x81,0xae,0xe5,0x8c,
-    0xba,0xe5,0x88,0x87,0xe3,0x82,0x8a,0xe3,0x81,0x8c,
-    0xe3,0x81,0x9d,0xe3,0x82,0x8c,0xe3,0x81,0x9e,0xe3,
-    0x82,0x8c,0x0d,0x0a,0x43,0x52,0x28,0x4d,0x61,0x63,
-    0xe9,0xa2,0xa8,0x29,0xe3,0x80,0x81,0x43,0x52,0x2b,
-    0x4c,0x46,0x28,0x44,0x4f,0x53,0xe9,0xa2,0xa8,0x29,
-    0xe3,0x80,0x81,0x4c,0x46,0x28,0x55,0x4e,0x49,0x58,
-    0xe9,0xa2,0xa8,0x29,0xe3,0x81,0xab,0xe3,0x81,0xaa,
-    0xe3,0x81,0xa3,0xe3,0x81,0xa6,0xe3,0x81,0x84,0xe3,
-    0x81,0xbe,0xe3,0x81,0x99,0xe3,0x80,0x82,0x0d,0x0a,
-    0x0d,0x0a,0x0d,0x0a,0x6a,0x74,0x65,0x78,0x74,0x2f,
-    0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x72,0x65,0x61,0x64,
-    0x6d,0x65,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,
-    0x20,0xe8,0x8b,0xb1,0xe8,0xaa,0x9e,0x52,0x45,0x41,
-    0x44,0x4d,0x45,0x20,0x20,0x20,0x20,0x20,0x28,0x41,
-    0x53,0x43,0x49,0x49,0x29,0x0d,0x0a,0x20,0x20,0x72,
-    0x65,0x61,0x64,0x6d,0x65,0x2e,0x65,0x75,0x63,0x20,
-    0x2d,0x2d,0x2d,0x20,0xe3,0x81,0x93,0xe3,0x81,0xae,
-    0xe3,0x83,0x95,0xe3,0x82,0xa1,0xe3,0x82,0xa4,0xe3,
-    0x83,0xab,0x20,0x20,0x20,0x28,0x45,0x55,0x43,0x2d,
-    0x4a,0x50,0x29,0x0d,0x0a,0x20,0x20,0x72,0x65,0x61,
-    0x64,0x6d,0x65,0x2e,0x6a,0x69,0x73,0x20,0x2d,0x2d,
-    0x2d,0x20,0xe6,0x97,0xa5,0xe6,0x9c,0xac,0xe8,0xaa,
-    0x9e,0x52,0x45,0x41,0x44,0x4d,0x45,0x20,0x20,0x20,
-    0x28,0x4a,0x49,0x53,0x29,0x0d,0x0a,0x20,0x20,0x72,
-    0x65,0x61,0x64,0x6d,0x65,0x2e,0x73,0x6a,0x73,0x20,
-    0x2d,0x2d,0x2d,0x20,0xe6,0x97,0xa5,0xe6,0x9c,0xac,
-    0xe8,0xaa,0x9e,0x52,0x45,0x41,0x44,0x4d,0x45,0x20,
-    0x20,0x20,0x28,0x53,0x68,0x69,0x66,0x74,0x5f,0x4a,
-    0x49,0x53,0x29,0x0d,0x0a,0x0d,0x0a,0x6a,0x74,0x65,
-    0x78,0x74,0x2f,0x63,0x72,0x2f,0x0d,0x0a,0x6a,0x74,
-    0x65,0x78,0x74,0x2f,0x63,0x72,0x6c,0x66,0x2f,0x0d,
-    0x0a,0x6a,0x74,0x65,0x78,0x74,0x2f,0x6c,0x66,0x2f,
-    0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x61,0x73,0x63,0x69,
-    0x69,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,0x2d,
-    0x20,0x41,0x53,0x43,0x49,0x49,0xe3,0x81,0xa7,0xe6,
-    0x9b,0xb8,0xe3,0x81,0x84,0xe3,0x81,0x9f,0xe6,0x97,
-    0xa5,0xe6,0x9c,0xac,0xe8,0xaa,0x9e,0x28,0xe3,0x83,
-    0xad,0xe3,0x83,0xbc,0xe3,0x83,0x9e,0xe5,0xad,0x97,
-    0x29,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x6a,0x30,0x32,
-    0x30,0x31,0x2d,0x38,0x62,0x2e,0x74,0x78,0x74,0x20,
-    0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,0x32,0x30,
-    0x31,0xe3,0x81,0xae,0xe7,0x89,0x87,0xe4,0xbb,0xae,
-    0xe5,0x90,0x8d,0x20,0xe3,0x82,0x92,0x20,0x38,0xe5,
-    0x8d,0x98,0xe4,0xbd,0x8d,0xe7,0xac,0xa6,0xe5,0x8f,
-    0xb7,0xe5,0x8c,0x96,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x53,0x68,0x69,0x66,0x74,0x5f,0x4a,0x49,0x53,
-    0xe3,0x81,0xa8,0xe5,0x90,0x8c,0xe3,0x81,0x98,0x0d,
-    0x0a,0x20,0x20,0x6a,0x30,0x32,0x30,0x31,0x2d,0x65,
-    0x73,0x2e,0x74,0x78,0x74,0x20,0x2d,0x20,0x4a,0x49,
-    0x53,0x20,0x58,0x30,0x32,0x30,0x31,0xe3,0x81,0xae,
-    0xe7,0x89,0x87,0xe4,0xbb,0xae,0xe5,0x90,0x8d,0x20,
-    0xe3,0x82,0x92,0x20,0x45,0x53,0x43,0x28,0x49,0xe3,
-    0x81,0xa7,0xe7,0xac,0xa6,0xe5,0x8f,0xb7,0xe5,0x8c,
-    0x96,0x0d,0x0a,0x20,0x20,0x6a,0x30,0x32,0x30,0x31,
-    0x2d,0x73,0x6f,0x2e,0x74,0x78,0x74,0x20,0x2d,0x20,
-    0x4a,0x49,0x53,0x20,0x58,0x30,0x32,0x30,0x31,0xe3,
-    0x81,0xae,0xe7,0x89,0x87,0xe4,0xbb,0xae,0xe5,0x90,
-    0x8d,0x20,0xe3,0x82,0x92,0x20,0x53,0x4f,0x2f,0x53,
-    0x49,0xe3,0x81,0xa7,0xe7,0xac,0xa6,0xe5,0x8f,0xb7,
-    0xe5,0x8c,0x96,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x6a,
-    0x30,0x32,0x30,0x38,0x2d,0x38,0x62,0x2e,0x74,0x78,
-    0x74,0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,
-    0x32,0x30,0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0xe3,0x82,0x92,0x20,0x38,0xe5,0x8d,0x98,
-    0xe4,0xbd,0x8d,0xe7,0xac,0xa6,0xe5,0x8f,0xb7,0xe5,
-    0x8c,0x96,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x45,
-    0x55,0x43,0x2d,0x4a,0x50,0xe3,0x81,0xa8,0xe5,0x90,
-    0x8c,0xe3,0x81,0x98,0x0d,0x0a,0x20,0x20,0x6a,0x30,
-    0x32,0x30,0x38,0x2d,0x37,0x38,0x2e,0x74,0x78,0x74,
-    0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,0x32,
-    0x30,0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0xe3,0x82,0x92,0x20,0x45,0x53,0x43,0x24,0x40,
-    0xe3,0x81,0xa7,0xe7,0xac,0xa6,0xe5,0x8f,0xb7,0xe5,
-    0x8c,0x96,0x20,0x20,0x20,0x20,0x20,0xe3,0x81,0x84,
-    0xe3,0x82,0x8f,0xe3,0x82,0x86,0xe3,0x82,0x8b,0xe6,
-    0x97,0xa7,0x4a,0x49,0x53,0x0d,0x0a,0x20,0x20,0x6a,
-    0x30,0x32,0x30,0x38,0x2d,0x38,0x33,0x2e,0x74,0x78,
-    0x74,0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,
-    0x32,0x30,0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0xe3,0x82,0x92,0x20,0x45,0x53,0x43,0x24,
-    0x42,0xe3,0x81,0xa7,0xe7,0xac,0xa6,0xe5,0x8f,0xb7,
-    0xe5,0x8c,0x96,0x20,0x20,0x20,0x20,0x20,0xe3,0x81,
-    0x84,0xe3,0x82,0x8f,0xe3,0x82,0x86,0xe3,0x82,0x8b,
-    0xe6,0x96,0xb0,0x4a,0x49,0x53,0x0d,0x0a,0x0d,0x0a,
-    0x20,0x20,0x65,0x30,0x32,0x30,0x31,0x2e,0x74,0x78,
-    0x74,0x20,0x2d,0x2d,0x2d,0x2d,0x20,0x4a,0x49,0x53,
-    0x20,0x58,0x30,0x32,0x30,0x31,0xe3,0x81,0xae,0xe7,
-    0x89,0x87,0xe4,0xbb,0xae,0xe5,0x90,0x8d,0x20,0xe3,
-    0x82,0x92,0x20,0x45,0x55,0x43,0x2d,0x4a,0x50,0xe3,
-    0x81,0xa7,0xe7,0xac,0xa6,0xe5,0x8f,0xb7,0xe5,0x8c,
-    0x96,0x0d,0x0a,0x20,0x20,0x65,0x30,0x32,0x30,0x38,
-    0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,0x2d,0x20,
-    0x4a,0x49,0x53,0x20,0x58,0x30,0x32,0x30,0x38,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0xe3,0x82,
-    0x92,0x20,0x45,0x55,0x43,0x2d,0x4a,0x50,0xe3,0x81,
-    0xa7,0xe7,0xac,0xa6,0xe5,0x8f,0xb7,0xe5,0x8c,0x96,
-    0x20,0x20,0x20,0x20,0x38,0xe3,0x83,0x93,0xe3,0x83,
-    0x83,0xe3,0x83,0x88,0x4a,0x49,0x53,0x58,0x30,0x32,
-    0x30,0x38,0xe3,0x81,0xa8,0xe5,0x90,0x8c,0xe3,0x81,
-    0x98,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x73,0x30,0x32,
-    0x30,0x31,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,
-    0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,0x32,0x30,
-    0x31,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0xe3,0x82,0x92,0x20,0x53,0x68,0x69,0x66,0x74,0x5f,
-    0x4a,0x49,0x53,0xe3,0x81,0xa7,0xe7,0xac,0xa6,0xe5,
-    0x8f,0xb7,0xe5,0x8c,0x96,0x20,0x38,0xe3,0x83,0x93,
-    0xe3,0x83,0x83,0xe3,0x83,0x88,0x4a,0x49,0x53,0x58,
-    0x30,0x32,0x30,0x31,0xe3,0x81,0xa8,0xe5,0x90,0x8c,
-    0xe3,0x81,0x98,0x0d,0x0a,0x20,0x20,0x73,0x30,0x32,
-    0x30,0x38,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,
-    0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,0x32,0x30,
-    0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0xe3,0x82,0x92,0x20,0x53,0x68,0x69,0x66,0x74,0x5f,
-    0x4a,0x49,0x53,0xe3,0x81,0xa7,0xe7,0xac,0xa6,0xe5,
-    0x8f,0xb7,0xe5,0x8c,0x96,0x0d,0x0a,0x0d,0x0a,0x6a,
-    0x74,0x65,0x78,0x74,0x2f,0x6f,0x74,0x68,0x65,0x72,
-    0x73,0x2f,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x62,0x36,
-    0x34,0x6a,0x69,0x73,0x2e,0x74,0x78,0x74,0x20,0x2d,
-    0x2d,0x2d,0x20,0x49,0x53,0x4f,0x2d,0x32,0x30,0x32,
-    0x32,0x2d,0x4a,0x50,0x20,0x28,0x4a,0x49,0x53,0x29,
-    0x20,0xe3,0x82,0x92,0x20,0x62,0x61,0x73,0x65,0x36,
-    0x34,0xe3,0x81,0xa7,0xe7,0xac,0xa6,0xe5,0x8f,0xb7,
-    0xe5,0x8c,0x96,0x0d,0x0a,0x20,0x20,0x71,0x74,0x6a,
-    0x69,0x73,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,
-    0x2d,0x20,0x49,0x53,0x4f,0x2d,0x32,0x30,0x32,0x32,
-    0x2d,0x4a,0x50,0x20,0x28,0x4a,0x49,0x53,0x29,0x20,
-    0xe3,0x82,0x92,0x20,0x71,0x75,0x6f,0x74,0x65,0x64,
-    0x2d,0x70,0x72,0x69,0x6e,0x74,0x61,0x62,0x6c,0x65,
-    0xe3,0x81,0xa7,0xe7,0xac,0xa6,0xe5,0x8f,0xb7,0xe5,
-    0x8c,0x96,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x62,0x6b,
-    0x65,0x75,0x63,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,
-    0x2d,0x2d,0x20,0xe5,0xa3,0x8a,0xe3,0x82,0x8c,0xe3,
-    0x81,0x9f,0x45,0x55,0x43,0x2d,0x4a,0x50,0x20,0x20,
-    0x20,0x20,0x20,0x20,0xe5,0x85,0x88,0xe9,0xa0,0xad,
-    0xe3,0x83,0x93,0xe3,0x83,0x83,0xe3,0x83,0x88,0xe3,
-    0x81,0x8c,0xe3,0x82,0xbc,0xe3,0x83,0xad,0x0d,0x0a,
-    0x20,0x20,0x62,0x6b,0x6a,0x69,0x73,0x2e,0x74,0x78,
-    0x74,0x20,0x2d,0x2d,0x2d,0x2d,0x20,0xe5,0xa3,0x8a,
-    0xe3,0x82,0x8c,0xe3,0x81,0x9f,0x4a,0x49,0x53,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x45,0x53,
-    0x43,0xe3,0x82,0xb3,0xe3,0x83,0xbc,0xe3,0x83,0x89,
-    0xe3,0x81,0x8c,0xe6,0xac,0xa0,0xe3,0x81,0x91,0xe3,
-    0x81,0x9f,0x0d,0x0a,0x20,0x20,0x62,0x6b,0x73,0x6a,
-    0x69,0x73,0x2e,0x74,0x78,0x74,0x2d,0x2d,0x2d,0x2d,
-    0x20,0xe5,0xa3,0x8a,0xe3,0x82,0x8c,0xe3,0x81,0x9f,
-    0x53,0x68,0x69,0x66,0x74,0x5f,0x4a,0x49,0x53,0x20,
-    0x20,0x20,0xe5,0x85,0x88,0xe9,0xa0,0xad,0xe3,0x83,
-    0x93,0xe3,0x83,0x83,0xe3,0x83,0x88,0xe3,0x81,0x8c,
-    0xe3,0x82,0xbc,0xe3,0x83,0xad,0x0d,0x0a,0x0d,0x0a,
-    0x20,0x20,0x63,0x74,0x72,0x6c,0x5f,0x7a,0x2e,0x74,
-    0x78,0x74,0x20,0x20,0x20,0x20,0x20,0x53,0x68,0x69,
-    0x66,0x74,0x5f,0x4a,0x49,0x53,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x5e,0x5a,0xe3,0x82,0xad,0xe3,0x83,0xa3,
-    0xe3,0x83,0xa9,0xe3,0x82,0xaf,0xe3,0x82,0xbf,0xe4,
-    0xbb,0x98,0xe3,0x81,0x8d,0x20,0x20,0x20,0x28,0x44,
-    0x4f,0x53,0xe9,0xa2,0xa8,0x29,0x0d,0x0a,0x20,0x20,
-    0x6d,0x61,0x63,0x74,0x78,0x74,0x2e,0x62,0x69,0x6e,
-    0x20,0x20,0x20,0x20,0x20,0xe3,0x83,0x9e,0xe3,0x83,
-    0x83,0xe3,0x82,0xaf,0xe3,0x83,0x90,0xe3,0x82,0xa4,
-    0xe3,0x83,0x8a,0xe3,0x83,0xaa,0x49,0x49,0xe3,0x83,
-    0x95,0xe3,0x82,0xa9,0xe3,0x83,0xbc,0xe3,0x83,0x9e,
-    0xe3,0x83,0x83,0xe3,0x83,0x88,0x0d,0xa
- };
-#endif /* ifdef _ICONV_CONVERTER_UTF_8 */
- 
-#ifdef _ICONV_CONVERTER_EUC_JP 
- char euc_jp[] =
- {
-    0xbf,0xa7,0xa1,0xb9,0xa5,0xc6,0xa5,0xad,0xa5,0xb9,
-    0xa5,0xc8,0xa5,0xd5,0xa5,0xa1,0xa5,0xa4,0xa5,0xeb,
-    0xbd,0xb8,0x20,0x56,0x65,0x72,0x33,0x2e,0x33,0x20,
-    0x28,0x43,0x29,0x48,0x41,0x54,0x0d,0x0a,0x0d,0x0a,
-    0xa4,0xb3,0xa4,0xce,0xa5,0xa2,0xa1,0xbc,0xa5,0xab,
-    0xa5,0xa4,0xa5,0xd6,0xa4,0xce,0xba,0xc7,0xbf,0xb7,
-    0xc8,0xc7,0xa4,0xcf,0xa4,0xb3,0xa4,0xb3,0xa4,0xcb,
-    0xa4,0xa2,0xa4,0xea,0xa4,0xde,0xa4,0xb9,0xa1,0xa3,
-    0x0d,0x0a,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,
-    0x77,0x77,0x30,0x32,0x2e,0x73,0x6f,0x2d,0x6e,0x65,
-    0x74,0x2e,0x6e,0x65,0x2e,0x6a,0x70,0x2f,0x25,0x37,
-    0x45,0x68,0x61,0x74,0x2f,0x66,0x69,0x6c,0x65,0x73,
-    0x2f,0x69,0x6e,0x64,0x65,0x78,0x2d,0x6a,0x2e,0x68,
-    0x74,0x6d,0x6c,0x0d,0x0a,0x0d,0x0a,0x63,0x72,0x2c,
-    0x20,0x63,0x72,0x6c,0x66,0x2c,0x20,0x6c,0x66,0xa5,
-    0xc7,0xa5,0xa3,0xa5,0xec,0xa5,0xaf,0xa5,0xc8,0xa5,
-    0xea,0x28,0xa5,0xd5,0xa5,0xa9,0xa5,0xeb,0xa5,0xc0,
-    0x29,0xa4,0xce,0xc6,0xe2,0xcd,0xc6,0xa4,0xcf,0xc6,
-    0xb1,0xa4,0xb8,0xa4,0xc7,0xa4,0xb9,0xa4,0xac,0xa1,
-    0xa2,0xb9,0xd4,0xa4,0xce,0xb6,0xe8,0xc0,0xda,0xa4,
-    0xea,0xa4,0xac,0xa4,0xbd,0xa4,0xec,0xa4,0xbe,0xa4,
-    0xec,0x0d,0x0a,0x43,0x52,0x28,0x4d,0x61,0x63,0xc9,
-    0xf7,0x29,0xa1,0xa2,0x43,0x52,0x2b,0x4c,0x46,0x28,
-    0x44,0x4f,0x53,0xc9,0xf7,0x29,0xa1,0xa2,0x4c,0x46,
-    0x28,0x55,0x4e,0x49,0x58,0xc9,0xf7,0x29,0xa4,0xcb,
-    0xa4,0xca,0xa4,0xc3,0xa4,0xc6,0xa4,0xa4,0xa4,0xde,
-    0xa4,0xb9,0xa1,0xa3,0x0d,0x0a,0x0d,0x0a,0x0d,0x0a,
-    0x6a,0x74,0x65,0x78,0x74,0x2f,0x0d,0x0a,0x0d,0x0a,
-    0x20,0x20,0x72,0x65,0x61,0x64,0x6d,0x65,0x2e,0x74,
-    0x78,0x74,0x20,0x2d,0x2d,0x2d,0x20,0xb1,0xd1,0xb8,
-    0xec,0x52,0x45,0x41,0x44,0x4d,0x45,0x20,0x20,0x20,
-    0x20,0x20,0x28,0x41,0x53,0x43,0x49,0x49,0x29,0x0d,
-    0x0a,0x20,0x20,0x72,0x65,0x61,0x64,0x6d,0x65,0x2e,
-    0x65,0x75,0x63,0x20,0x2d,0x2d,0x2d,0x20,0xa4,0xb3,
-    0xa4,0xce,0xa5,0xd5,0xa5,0xa1,0xa5,0xa4,0xa5,0xeb,
-    0x20,0x20,0x20,0x28,0x45,0x55,0x43,0x2d,0x4a,0x50,
-    0x29,0x0d,0x0a,0x20,0x20,0x72,0x65,0x61,0x64,0x6d,
-    0x65,0x2e,0x6a,0x69,0x73,0x20,0x2d,0x2d,0x2d,0x20,
-    0xc6,0xfc,0xcb,0xdc,0xb8,0xec,0x52,0x45,0x41,0x44,
-    0x4d,0x45,0x20,0x20,0x20,0x28,0x4a,0x49,0x53,0x29,
-    0x0d,0x0a,0x20,0x20,0x72,0x65,0x61,0x64,0x6d,0x65,
-    0x2e,0x73,0x6a,0x73,0x20,0x2d,0x2d,0x2d,0x20,0xc6,
-    0xfc,0xcb,0xdc,0xb8,0xec,0x52,0x45,0x41,0x44,0x4d,
-    0x45,0x20,0x20,0x20,0x28,0x53,0x68,0x69,0x66,0x74,
-    0x5f,0x4a,0x49,0x53,0x29,0x0d,0x0a,0x0d,0x0a,0x6a,
-    0x74,0x65,0x78,0x74,0x2f,0x63,0x72,0x2f,0x0d,0x0a,
-    0x6a,0x74,0x65,0x78,0x74,0x2f,0x63,0x72,0x6c,0x66,
-    0x2f,0x0d,0x0a,0x6a,0x74,0x65,0x78,0x74,0x2f,0x6c,
-    0x66,0x2f,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x61,0x73,
-    0x63,0x69,0x69,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,
-    0x2d,0x2d,0x20,0x41,0x53,0x43,0x49,0x49,0xa4,0xc7,
-    0xbd,0xf1,0xa4,0xa4,0xa4,0xbf,0xc6,0xfc,0xcb,0xdc,
-    0xb8,0xec,0x28,0xa5,0xed,0xa1,0xbc,0xa5,0xde,0xbb,
-    0xfa,0x29,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x6a,0x30,
-    0x32,0x30,0x31,0x2d,0x38,0x62,0x2e,0x74,0x78,0x74,
-    0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,0x32,
-    0x30,0x31,0xa4,0xce,0xca,0xd2,0xb2,0xbe,0xcc,0xbe,
-    0x20,0xa4,0xf2,0x20,0x38,0xc3,0xb1,0xb0,0xcc,0xc9,
-    0xe4,0xb9,0xe6,0xb2,0xbd,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x53,0x68,0x69,0x66,0x74,0x5f,0x4a,0x49,
-    0x53,0xa4,0xc8,0xc6,0xb1,0xa4,0xb8,0x0d,0x0a,0x20,
-    0x20,0x6a,0x30,0x32,0x30,0x31,0x2d,0x65,0x73,0x2e,
-    0x74,0x78,0x74,0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,
-    0x58,0x30,0x32,0x30,0x31,0xa4,0xce,0xca,0xd2,0xb2,
-    0xbe,0xcc,0xbe,0x20,0xa4,0xf2,0x20,0x45,0x53,0x43,
-    0x28,0x49,0xa4,0xc7,0xc9,0xe4,0xb9,0xe6,0xb2,0xbd,
-    0x0d,0x0a,0x20,0x20,0x6a,0x30,0x32,0x30,0x31,0x2d,
-    0x73,0x6f,0x2e,0x74,0x78,0x74,0x20,0x2d,0x20,0x4a,
-    0x49,0x53,0x20,0x58,0x30,0x32,0x30,0x31,0xa4,0xce,
-    0xca,0xd2,0xb2,0xbe,0xcc,0xbe,0x20,0xa4,0xf2,0x20,
-    0x53,0x4f,0x2f,0x53,0x49,0xa4,0xc7,0xc9,0xe4,0xb9,
-    0xe6,0xb2,0xbd,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x6a,
-    0x30,0x32,0x30,0x38,0x2d,0x38,0x62,0x2e,0x74,0x78,
-    0x74,0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,
-    0x32,0x30,0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0xa4,0xf2,0x20,0x38,0xc3,0xb1,0xb0,0xcc,
-    0xc9,0xe4,0xb9,0xe6,0xb2,0xbd,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x45,0x55,0x43,0x2d,0x4a,0x50,0xa4,
-    0xc8,0xc6,0xb1,0xa4,0xb8,0x0d,0x0a,0x20,0x20,0x6a,
-    0x30,0x32,0x30,0x38,0x2d,0x37,0x38,0x2e,0x74,0x78,
-    0x74,0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,
-    0x32,0x30,0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0xa4,0xf2,0x20,0x45,0x53,0x43,0x24,0x40,
-    0xa4,0xc7,0xc9,0xe4,0xb9,0xe6,0xb2,0xbd,0x20,0x20,
-    0x20,0x20,0x20,0xa4,0xa4,0xa4,0xef,0xa4,0xe6,0xa4,
-    0xeb,0xb5,0xec,0x4a,0x49,0x53,0x0d,0x0a,0x20,0x20,
-    0x6a,0x30,0x32,0x30,0x38,0x2d,0x38,0x33,0x2e,0x74,
-    0x78,0x74,0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,
-    0x30,0x32,0x30,0x38,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0xa4,0xf2,0x20,0x45,0x53,0x43,0x24,
-    0x42,0xa4,0xc7,0xc9,0xe4,0xb9,0xe6,0xb2,0xbd,0x20,
-    0x20,0x20,0x20,0x20,0xa4,0xa4,0xa4,0xef,0xa4,0xe6,
-    0xa4,0xeb,0xbf,0xb7,0x4a,0x49,0x53,0x0d,0x0a,0x0d,
-    0x0a,0x20,0x20,0x65,0x30,0x32,0x30,0x31,0x2e,0x74,
-    0x78,0x74,0x20,0x2d,0x2d,0x2d,0x2d,0x20,0x4a,0x49,
-    0x53,0x20,0x58,0x30,0x32,0x30,0x31,0xa4,0xce,0xca,
-    0xd2,0xb2,0xbe,0xcc,0xbe,0x20,0xa4,0xf2,0x20,0x45,
-    0x55,0x43,0x2d,0x4a,0x50,0xa4,0xc7,0xc9,0xe4,0xb9,
-    0xe6,0xb2,0xbd,0x0d,0x0a,0x20,0x20,0x65,0x30,0x32,
-    0x30,0x38,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,
-    0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,0x32,0x30,
-    0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0xa4,0xf2,0x20,0x45,0x55,0x43,0x2d,0x4a,0x50,0xa4,
-    0xc7,0xc9,0xe4,0xb9,0xe6,0xb2,0xbd,0x20,0x20,0x20,
-    0x20,0x38,0xa5,0xd3,0xa5,0xc3,0xa5,0xc8,0x4a,0x49,
-    0x53,0x58,0x30,0x32,0x30,0x38,0xa4,0xc8,0xc6,0xb1,
-    0xa4,0xb8,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x73,0x30,
-    0x32,0x30,0x31,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,
-    0x2d,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,0x32,
-    0x30,0x31,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0xa4,0xf2,0x20,0x53,0x68,0x69,0x66,0x74,0x5f,
-    0x4a,0x49,0x53,0xa4,0xc7,0xc9,0xe4,0xb9,0xe6,0xb2,
-    0xbd,0x20,0x38,0xa5,0xd3,0xa5,0xc3,0xa5,0xc8,0x4a,
-    0x49,0x53,0x58,0x30,0x32,0x30,0x31,0xa4,0xc8,0xc6,
-    0xb1,0xa4,0xb8,0x0d,0x0a,0x20,0x20,0x73,0x30,0x32,
-    0x30,0x38,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,
-    0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,0x32,0x30,
-    0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0xa4,0xf2,0x20,0x53,0x68,0x69,0x66,0x74,0x5f,0x4a,
-    0x49,0x53,0xa4,0xc7,0xc9,0xe4,0xb9,0xe6,0xb2,0xbd,
-    0x0d,0x0a,0x0d,0x0a,0x6a,0x74,0x65,0x78,0x74,0x2f,
-    0x6f,0x74,0x68,0x65,0x72,0x73,0x2f,0x0d,0x0a,0x0d,
-    0x0a,0x20,0x20,0x62,0x36,0x34,0x6a,0x69,0x73,0x2e,
-    0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,0x20,0x49,0x53,
-    0x4f,0x2d,0x32,0x30,0x32,0x32,0x2d,0x4a,0x50,0x20,
-    0x28,0x4a,0x49,0x53,0x29,0x20,0xa4,0xf2,0x20,0x62,
-    0x61,0x73,0x65,0x36,0x34,0xa4,0xc7,0xc9,0xe4,0xb9,
-    0xe6,0xb2,0xbd,0x0d,0x0a,0x20,0x20,0x71,0x74,0x6a,
-    0x69,0x73,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,
-    0x2d,0x20,0x49,0x53,0x4f,0x2d,0x32,0x30,0x32,0x32,
-    0x2d,0x4a,0x50,0x20,0x28,0x4a,0x49,0x53,0x29,0x20,
-    0xa4,0xf2,0x20,0x71,0x75,0x6f,0x74,0x65,0x64,0x2d,
-    0x70,0x72,0x69,0x6e,0x74,0x61,0x62,0x6c,0x65,0xa4,
-    0xc7,0xc9,0xe4,0xb9,0xe6,0xb2,0xbd,0x0d,0x0a,0x0d,
-    0x0a,0x20,0x20,0x62,0x6b,0x65,0x75,0x63,0x2e,0x74,
-    0x78,0x74,0x20,0x2d,0x2d,0x2d,0x2d,0x20,0xb2,0xf5,
-    0xa4,0xec,0xa4,0xbf,0x45,0x55,0x43,0x2d,0x4a,0x50,
-    0x20,0x20,0x20,0x20,0x20,0x20,0xc0,0xe8,0xc6,0xac,
-    0xa5,0xd3,0xa5,0xc3,0xa5,0xc8,0xa4,0xac,0xa5,0xbc,
-    0xa5,0xed,0x0d,0x0a,0x20,0x20,0x62,0x6b,0x6a,0x69,
-    0x73,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,0x2d,
-    0x20,0xb2,0xf5,0xa4,0xec,0xa4,0xbf,0x4a,0x49,0x53,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x45,
-    0x53,0x43,0xa5,0xb3,0xa1,0xbc,0xa5,0xc9,0xa4,0xac,
-    0xb7,0xe7,0xa4,0xb1,0xa4,0xbf,0x0d,0x0a,0x20,0x20,
-    0x62,0x6b,0x73,0x6a,0x69,0x73,0x2e,0x74,0x78,0x74,
-    0x2d,0x2d,0x2d,0x2d,0x20,0xb2,0xf5,0xa4,0xec,0xa4,
-    0xbf,0x53,0x68,0x69,0x66,0x74,0x5f,0x4a,0x49,0x53,
-    0x20,0x20,0x20,0xc0,0xe8,0xc6,0xac,0xa5,0xd3,0xa5,
-    0xc3,0xa5,0xc8,0xa4,0xac,0xa5,0xbc,0xa5,0xed,0x0d,
-    0x0a,0x0d,0x0a,0x20,0x20,0x63,0x74,0x72,0x6c,0x5f,
-    0x7a,0x2e,0x74,0x78,0x74,0x20,0x20,0x20,0x20,0x20,
-    0x53,0x68,0x69,0x66,0x74,0x5f,0x4a,0x49,0x53,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x5e,0x5a,0xa5,0xad,0xa5,
-    0xe3,0xa5,0xe9,0xa5,0xaf,0xa5,0xbf,0xc9,0xd5,0xa4,
-    0xad,0x20,0x20,0x20,0x28,0x44,0x4f,0x53,0xc9,0xf7,
-    0x29,0x0d,0x0a,0x20,0x20,0x6d,0x61,0x63,0x74,0x78,
-    0x74,0x2e,0x62,0x69,0x6e,0x20,0x20,0x20,0x20,0x20,
-    0xa5,0xde,0xa5,0xc3,0xa5,0xaf,0xa5,0xd0,0xa5,0xa4,
-    0xa5,0xca,0xa5,0xea,0x49,0x49,0xa5,0xd5,0xa5,0xa9,
-    0xa1,0xbc,0xa5,0xde,0xa5,0xc3,0xa5,0xc8,0x0d,0x0a
-};
-#endif /* #ifdef _ICONV_CONVERTER_EUC_JP */
-
-#ifdef _ICONV_CONVERTER_SHIFT_JIS
-char shift_jis[] = 
-{
-    0x90,0x46,0x81,0x58,0x83,0x65,0x83,0x4c,0x83,0x58,
-    0x83,0x67,0x83,0x74,0x83,0x40,0x83,0x43,0x83,0x8b,
-    0x8f,0x57,0x20,0x56,0x65,0x72,0x33,0x2e,0x33,0x20,
-    0x28,0x43,0x29,0x48,0x41,0x54,0x0d,0x0a,0x0d,0x0a,
-    0x82,0xb1,0x82,0xcc,0x83,0x41,0x81,0x5b,0x83,0x4a,
-    0x83,0x43,0x83,0x75,0x82,0xcc,0x8d,0xc5,0x90,0x56,
-    0x94,0xc5,0x82,0xcd,0x82,0xb1,0x82,0xb1,0x82,0xc9,
-    0x82,0xa0,0x82,0xe8,0x82,0xdc,0x82,0xb7,0x81,0x42,
-    0x0d,0x0a,0x68,0x74,0x74,0x70,0x3a,0x2f,0x2f,0x77,
-    0x77,0x77,0x30,0x32,0x2e,0x73,0x6f,0x2d,0x6e,0x65,
-    0x74,0x2e,0x6e,0x65,0x2e,0x6a,0x70,0x2f,0x25,0x37,
-    0x45,0x68,0x61,0x74,0x2f,0x66,0x69,0x6c,0x65,0x73,
-    0x2f,0x69,0x6e,0x64,0x65,0x78,0x2d,0x6a,0x2e,0x68,
-    0x74,0x6d,0x6c,0x0d,0x0a,0x0d,0x0a,0x63,0x72,0x2c,
-    0x20,0x63,0x72,0x6c,0x66,0x2c,0x20,0x6c,0x66,0x83,
-    0x66,0x83,0x42,0x83,0x8c,0x83,0x4e,0x83,0x67,0x83,
-    0x8a,0x28,0x83,0x74,0x83,0x48,0x83,0x8b,0x83,0x5f,
-    0x29,0x82,0xcc,0x93,0xe0,0x97,0x65,0x82,0xcd,0x93,
-    0xaf,0x82,0xb6,0x82,0xc5,0x82,0xb7,0x82,0xaa,0x81,
-    0x41,0x8d,0x73,0x82,0xcc,0x8b,0xe6,0x90,0xd8,0x82,
-    0xe8,0x82,0xaa,0x82,0xbb,0x82,0xea,0x82,0xbc,0x82,
-    0xea,0x0d,0x0a,0x43,0x52,0x28,0x4d,0x61,0x63,0x95,
-    0x97,0x29,0x81,0x41,0x43,0x52,0x2b,0x4c,0x46,0x28,
-    0x44,0x4f,0x53,0x95,0x97,0x29,0x81,0x41,0x4c,0x46,
-    0x28,0x55,0x4e,0x49,0x58,0x95,0x97,0x29,0x82,0xc9,
-    0x82,0xc8,0x82,0xc1,0x82,0xc4,0x82,0xa2,0x82,0xdc,
-    0x82,0xb7,0x81,0x42,0x0d,0x0a,0x0d,0x0a,0x0d,0x0a,
-    0x6a,0x74,0x65,0x78,0x74,0x2f,0x0d,0x0a,0x0d,0x0a,
-    0x20,0x20,0x72,0x65,0x61,0x64,0x6d,0x65,0x2e,0x74,
-    0x78,0x74,0x20,0x2d,0x2d,0x2d,0x20,0x89,0x70,0x8c,
-    0xea,0x52,0x45,0x41,0x44,0x4d,0x45,0x20,0x20,0x20,
-    0x20,0x20,0x28,0x41,0x53,0x43,0x49,0x49,0x29,0x0d,
-    0x0a,0x20,0x20,0x72,0x65,0x61,0x64,0x6d,0x65,0x2e,
-    0x65,0x75,0x63,0x20,0x2d,0x2d,0x2d,0x20,0x82,0xb1,
-    0x82,0xcc,0x83,0x74,0x83,0x40,0x83,0x43,0x83,0x8b,
-    0x20,0x20,0x20,0x28,0x45,0x55,0x43,0x2d,0x4a,0x50,
-    0x29,0x0d,0x0a,0x20,0x20,0x72,0x65,0x61,0x64,0x6d,
-    0x65,0x2e,0x6a,0x69,0x73,0x20,0x2d,0x2d,0x2d,0x20,
-    0x93,0xfa,0x96,0x7b,0x8c,0xea,0x52,0x45,0x41,0x44,
-    0x4d,0x45,0x20,0x20,0x20,0x28,0x4a,0x49,0x53,0x29,
-    0x0d,0x0a,0x20,0x20,0x72,0x65,0x61,0x64,0x6d,0x65,
-    0x2e,0x73,0x6a,0x73,0x20,0x2d,0x2d,0x2d,0x20,0x93,
-    0xfa,0x96,0x7b,0x8c,0xea,0x52,0x45,0x41,0x44,0x4d,
-    0x45,0x20,0x20,0x20,0x28,0x53,0x68,0x69,0x66,0x74,
-    0x5f,0x4a,0x49,0x53,0x29,0x0d,0x0a,0x0d,0x0a,0x6a,
-    0x74,0x65,0x78,0x74,0x2f,0x63,0x72,0x2f,0x0d,0x0a,
-    0x6a,0x74,0x65,0x78,0x74,0x2f,0x63,0x72,0x6c,0x66,
-    0x2f,0x0d,0x0a,0x6a,0x74,0x65,0x78,0x74,0x2f,0x6c,
-    0x66,0x2f,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x61,0x73,
-    0x63,0x69,0x69,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,
-    0x2d,0x2d,0x20,0x41,0x53,0x43,0x49,0x49,0x82,0xc5,
-    0x8f,0x91,0x82,0xa2,0x82,0xbd,0x93,0xfa,0x96,0x7b,
-    0x8c,0xea,0x28,0x83,0x8d,0x81,0x5b,0x83,0x7d,0x8e,
-    0x9a,0x29,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x6a,0x30,
-    0x32,0x30,0x31,0x2d,0x38,0x62,0x2e,0x74,0x78,0x74,
-    0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,0x32,
-    0x30,0x31,0x82,0xcc,0x95,0xd0,0x89,0xbc,0x96,0xbc,
-    0x20,0x82,0xf0,0x20,0x38,0x92,0x50,0x88,0xca,0x95,
-    0x84,0x8d,0x86,0x89,0xbb,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x53,0x68,0x69,0x66,0x74,0x5f,0x4a,0x49,
-    0x53,0x82,0xc6,0x93,0xaf,0x82,0xb6,0x0d,0x0a,0x20,
-    0x20,0x6a,0x30,0x32,0x30,0x31,0x2d,0x65,0x73,0x2e,
-    0x74,0x78,0x74,0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,
-    0x58,0x30,0x32,0x30,0x31,0x82,0xcc,0x95,0xd0,0x89,
-    0xbc,0x96,0xbc,0x20,0x82,0xf0,0x20,0x45,0x53,0x43,
-    0x28,0x49,0x82,0xc5,0x95,0x84,0x8d,0x86,0x89,0xbb,
-    0x0d,0x0a,0x20,0x20,0x6a,0x30,0x32,0x30,0x31,0x2d,
-    0x73,0x6f,0x2e,0x74,0x78,0x74,0x20,0x2d,0x20,0x4a,
-    0x49,0x53,0x20,0x58,0x30,0x32,0x30,0x31,0x82,0xcc,
-    0x95,0xd0,0x89,0xbc,0x96,0xbc,0x20,0x82,0xf0,0x20,
-    0x53,0x4f,0x2f,0x53,0x49,0x82,0xc5,0x95,0x84,0x8d,
-    0x86,0x89,0xbb,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x6a,
-    0x30,0x32,0x30,0x38,0x2d,0x38,0x62,0x2e,0x74,0x78,
-    0x74,0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,
-    0x32,0x30,0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x82,0xf0,0x20,0x38,0x92,0x50,0x88,0xca,
-    0x95,0x84,0x8d,0x86,0x89,0xbb,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x45,0x55,0x43,0x2d,0x4a,0x50,0x82,
-    0xc6,0x93,0xaf,0x82,0xb6,0x0d,0x0a,0x20,0x20,0x6a,
-    0x30,0x32,0x30,0x38,0x2d,0x37,0x38,0x2e,0x74,0x78,
-    0x74,0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,
-    0x32,0x30,0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x82,0xf0,0x20,0x45,0x53,0x43,0x24,0x40,
-    0x82,0xc5,0x95,0x84,0x8d,0x86,0x89,0xbb,0x20,0x20,
-    0x20,0x20,0x20,0x82,0xa2,0x82,0xed,0x82,0xe4,0x82,
-    0xe9,0x8b,0x8c,0x4a,0x49,0x53,0x0d,0x0a,0x20,0x20,
-    0x6a,0x30,0x32,0x30,0x38,0x2d,0x38,0x33,0x2e,0x74,
-    0x78,0x74,0x20,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,
-    0x30,0x32,0x30,0x38,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x82,0xf0,0x20,0x45,0x53,0x43,0x24,
-    0x42,0x82,0xc5,0x95,0x84,0x8d,0x86,0x89,0xbb,0x20,
-    0x20,0x20,0x20,0x20,0x82,0xa2,0x82,0xed,0x82,0xe4,
-    0x82,0xe9,0x90,0x56,0x4a,0x49,0x53,0x0d,0x0a,0x0d,
-    0x0a,0x20,0x20,0x65,0x30,0x32,0x30,0x31,0x2e,0x74,
-    0x78,0x74,0x20,0x2d,0x2d,0x2d,0x2d,0x20,0x4a,0x49,
-    0x53,0x20,0x58,0x30,0x32,0x30,0x31,0x82,0xcc,0x95,
-    0xd0,0x89,0xbc,0x96,0xbc,0x20,0x82,0xf0,0x20,0x45,
-    0x55,0x43,0x2d,0x4a,0x50,0x82,0xc5,0x95,0x84,0x8d,
-    0x86,0x89,0xbb,0x0d,0x0a,0x20,0x20,0x65,0x30,0x32,
-    0x30,0x38,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,
-    0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,0x32,0x30,
-    0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x82,0xf0,0x20,0x45,0x55,0x43,0x2d,0x4a,0x50,0x82,
-    0xc5,0x95,0x84,0x8d,0x86,0x89,0xbb,0x20,0x20,0x20,
-    0x20,0x38,0x83,0x72,0x83,0x62,0x83,0x67,0x4a,0x49,
-    0x53,0x58,0x30,0x32,0x30,0x38,0x82,0xc6,0x93,0xaf,
-    0x82,0xb6,0x0d,0x0a,0x0d,0x0a,0x20,0x20,0x73,0x30,
-    0x32,0x30,0x31,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,
-    0x2d,0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,0x32,
-    0x30,0x31,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x82,0xf0,0x20,0x53,0x68,0x69,0x66,0x74,0x5f,
-    0x4a,0x49,0x53,0x82,0xc5,0x95,0x84,0x8d,0x86,0x89,
-    0xbb,0x20,0x38,0x83,0x72,0x83,0x62,0x83,0x67,0x4a,
-    0x49,0x53,0x58,0x30,0x32,0x30,0x31,0x82,0xc6,0x93,
-    0xaf,0x82,0xb6,0x0d,0x0a,0x20,0x20,0x73,0x30,0x32,
-    0x30,0x38,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,
-    0x2d,0x20,0x4a,0x49,0x53,0x20,0x58,0x30,0x32,0x30,
-    0x38,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x82,0xf0,0x20,0x53,0x68,0x69,0x66,0x74,0x5f,0x4a,
-    0x49,0x53,0x82,0xc5,0x95,0x84,0x8d,0x86,0x89,0xbb,
-    0x0d,0x0a,0x0d,0x0a,0x6a,0x74,0x65,0x78,0x74,0x2f,
-    0x6f,0x74,0x68,0x65,0x72,0x73,0x2f,0x0d,0x0a,0x0d,
-    0x0a,0x20,0x20,0x62,0x36,0x34,0x6a,0x69,0x73,0x2e,
-    0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,0x20,0x49,0x53,
-    0x4f,0x2d,0x32,0x30,0x32,0x32,0x2d,0x4a,0x50,0x20,
-    0x28,0x4a,0x49,0x53,0x29,0x20,0x82,0xf0,0x20,0x62,
-    0x61,0x73,0x65,0x36,0x34,0x82,0xc5,0x95,0x84,0x8d,
-    0x86,0x89,0xbb,0x0d,0x0a,0x20,0x20,0x71,0x74,0x6a,
-    0x69,0x73,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,
-    0x2d,0x20,0x49,0x53,0x4f,0x2d,0x32,0x30,0x32,0x32,
-    0x2d,0x4a,0x50,0x20,0x28,0x4a,0x49,0x53,0x29,0x20,
-    0x82,0xf0,0x20,0x71,0x75,0x6f,0x74,0x65,0x64,0x2d,
-    0x70,0x72,0x69,0x6e,0x74,0x61,0x62,0x6c,0x65,0x82,
-    0xc5,0x95,0x84,0x8d,0x86,0x89,0xbb,0x0d,0x0a,0x0d,
-    0x0a,0x20,0x20,0x62,0x6b,0x65,0x75,0x63,0x2e,0x74,
-    0x78,0x74,0x20,0x2d,0x2d,0x2d,0x2d,0x20,0x89,0xf3,
-    0x82,0xea,0x82,0xbd,0x45,0x55,0x43,0x2d,0x4a,0x50,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x90,0xe6,0x93,0xaa,
-    0x83,0x72,0x83,0x62,0x83,0x67,0x82,0xaa,0x83,0x5b,
-    0x83,0x8d,0x0d,0x0a,0x20,0x20,0x62,0x6b,0x6a,0x69,
-    0x73,0x2e,0x74,0x78,0x74,0x20,0x2d,0x2d,0x2d,0x2d,
-    0x20,0x89,0xf3,0x82,0xea,0x82,0xbd,0x4a,0x49,0x53,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x45,
-    0x53,0x43,0x83,0x52,0x81,0x5b,0x83,0x68,0x82,0xaa,
-    0x8c,0x87,0x82,0xaf,0x82,0xbd,0x0d,0x0a,0x20,0x20,
-    0x62,0x6b,0x73,0x6a,0x69,0x73,0x2e,0x74,0x78,0x74,
-    0x2d,0x2d,0x2d,0x2d,0x20,0x89,0xf3,0x82,0xea,0x82,
-    0xbd,0x53,0x68,0x69,0x66,0x74,0x5f,0x4a,0x49,0x53,
-    0x20,0x20,0x20,0x90,0xe6,0x93,0xaa,0x83,0x72,0x83,
-    0x62,0x83,0x67,0x82,0xaa,0x83,0x5b,0x83,0x8d,0x0d,
-    0x0a,0x0d,0x0a,0x20,0x20,0x63,0x74,0x72,0x6c,0x5f,
-    0x7a,0x2e,0x74,0x78,0x74,0x20,0x20,0x20,0x20,0x20,
-    0x53,0x68,0x69,0x66,0x74,0x5f,0x4a,0x49,0x53,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x5e,0x5a,0x83,0x4c,0x83,
-    0x83,0x83,0x89,0x83,0x4e,0x83,0x5e,0x95,0x74,0x82,
-    0xab,0x20,0x20,0x20,0x28,0x44,0x4f,0x53,0x95,0x97,
-    0x29,0x0d,0x0a,0x20,0x20,0x6d,0x61,0x63,0x74,0x78,
-    0x74,0x2e,0x62,0x69,0x6e,0x20,0x20,0x20,0x20,0x20,
-    0x83,0x7d,0x83,0x62,0x83,0x4e,0x83,0x6f,0x83,0x43,
-    0x83,0x69,0x83,0x8a,0x49,0x49,0x83,0x74,0x83,0x48,
-    0x81,0x5b,0x83,0x7d,0x83,0x62,0x83,0x67,0x0d,0x0a
-};
-#endif /* _ICONV_CONVERTER_SHIFT_JIS */
-
-#ifdef _ICONV_CONVERTER_UCS_2_INTERNAL
-short ucs2[] =
-{
-    0x8272,0x3005,0x30c6,0x30ad,0x30b9,
-    0x30c8,0x30d5,0x30a1,0x30a4,0x30eb,
-    0x96c6,0x0020,0x0056,0x0065,0x0072,
-    0x0033,0x002e,0x0033,0x0020,0x0028,
-    0x0043,0x0029,0x0048,0x0041,0x0054,
-    0x000d,0x000a,0x000d,0x000a,0x3053,
-    0x306e,0x30a2,0x30fc,0x30ab,0x30a4,
-    0x30d6,0x306e,0x6700,0x65b0,0x7248,
-    0x306f,0x3053,0x3053,0x306b,0x3042,
-    0x308a,0x307e,0x3059,0x3002,0x000d,
-    0x000a,0x0068,0x0074,0x0074,0x0070,
-    0x003a,0x002f,0x002f,0x0077,0x0077,
-    0x0077,0x0030,0x0032,0x002e,0x0073,
-    0x006f,0x002d,0x006e,0x0065,0x0074,
-    0x002e,0x006e,0x0065,0x002e,0x006a,
-    0x0070,0x002f,0x0025,0x0037,0x0045,
-    0x0068,0x0061,0x0074,0x002f,0x0066,
-    0x0069,0x006c,0x0065,0x0073,0x002f,
-    0x0069,0x006e,0x0064,0x0065,0x0078,
-    0x002d,0x006a,0x002e,0x0068,0x0074,
-    0x006d,0x006c,0x000d,0x000a,0x000d,
-    0x000a,0x0063,0x0072,0x002c,0x0020,
-    0x0063,0x0072,0x006c,0x0066,0x002c,
-    0x0020,0x006c,0x0066,0x30c7,0x30a3,
-    0x30ec,0x30af,0x30c8,0x30ea,0x0028,
-    0x30d5,0x30a9,0x30eb,0x30c0,0x0029,
-    0x306e,0x5185,0x5bb9,0x306f,0x540c,
-    0x3058,0x3067,0x3059,0x304c,0x3001,
-    0x884c,0x306e,0x533a,0x5207,0x308a,
-    0x304c,0x305d,0x308c,0x305e,0x308c,
-    0x000d,0x000a,0x0043,0x0052,0x0028,
-    0x004d,0x0061,0x0063,0x98a8,0x0029,
-    0x3001,0x0043,0x0052,0x002b,0x004c,
-    0x0046,0x0028,0x0044,0x004f,0x0053,
-    0x98a8,0x0029,0x3001,0x004c,0x0046,
-    0x0028,0x0055,0x004e,0x0049,0x0058,
-    0x98a8,0x0029,0x306b,0x306a,0x3063,
-    0x3066,0x3044,0x307e,0x3059,0x3002,
-    0x000d,0x000a,0x000d,0x000a,0x000d,
-    0x000a,0x006a,0x0074,0x0065,0x0078,
-    0x0074,0x002f,0x000d,0x000a,0x000d,
-    0x000a,0x0020,0x0020,0x0072,0x0065,
-    0x0061,0x0064,0x006d,0x0065,0x002e,
-    0x0074,0x0078,0x0074,0x0020,0x002d,
-    0x002d,0x002d,0x0020,0x82f1,0x8a9e,
-    0x0052,0x0045,0x0041,0x0044,0x004d,
-    0x0045,0x0020,0x0020,0x0020,0x0020,
-    0x0020,0x0028,0x0041,0x0053,0x0043,
-    0x0049,0x0049,0x0029,0x000d,0x000a,
-    0x0020,0x0020,0x0072,0x0065,0x0061,
-    0x0064,0x006d,0x0065,0x002e,0x0065,
-    0x0075,0x0063,0x0020,0x002d,0x002d,
-    0x002d,0x0020,0x3053,0x306e,0x30d5,
-    0x30a1,0x30a4,0x30eb,0x0020,0x0020,
-    0x0020,0x0028,0x0045,0x0055,0x0043,
-    0x002d,0x004a,0x0050,0x0029,0x000d,
-    0x000a,0x0020,0x0020,0x0072,0x0065,
-    0x0061,0x0064,0x006d,0x0065,0x002e,
-    0x006a,0x0069,0x0073,0x0020,0x002d,
-    0x002d,0x002d,0x0020,0x65e5,0x672c,
-    0x8a9e,0x0052,0x0045,0x0041,0x0044,
-    0x004d,0x0045,0x0020,0x0020,0x0020,
-    0x0028,0x004a,0x0049,0x0053,0x0029,
-    0x000d,0x000a,0x0020,0x0020,0x0072,
-    0x0065,0x0061,0x0064,0x006d,0x0065,
-    0x002e,0x0073,0x006a,0x0073,0x0020,
-    0x002d,0x002d,0x002d,0x0020,0x65e5,
-    0x672c,0x8a9e,0x0052,0x0045,0x0041,
-    0x0044,0x004d,0x0045,0x0020,0x0020,
-    0x0020,0x0028,0x0053,0x0068,0x0069,
-    0x0066,0x0074,0x005f,0x004a,0x0049,
-    0x0053,0x0029,0x000d,0x000a,0x000d,
-    0x000a,0x006a,0x0074,0x0065,0x0078,
-    0x0074,0x002f,0x0063,0x0072,0x002f,
-    0x000d,0x000a,0x006a,0x0074,0x0065,
-    0x0078,0x0074,0x002f,0x0063,0x0072,
-    0x006c,0x0066,0x002f,0x000d,0x000a,
-    0x006a,0x0074,0x0065,0x0078,0x0074,
-    0x002f,0x006c,0x0066,0x002f,0x000d,
-    0x000a,0x000d,0x000a,0x0020,0x0020,
-    0x0061,0x0073,0x0063,0x0069,0x0069,
-    0x002e,0x0074,0x0078,0x0074,0x0020,
-    0x002d,0x002d,0x002d,0x002d,0x0020,
-    0x0041,0x0053,0x0043,0x0049,0x0049,
-    0x3067,0x66f8,0x3044,0x305f,0x65e5,
-    0x672c,0x8a9e,0x0028,0x30ed,0x30fc,
-    0x30de,0x5b57,0x0029,0x000d,0x000a,
-    0x000d,0x000a,0x0020,0x0020,0x006a,
-    0x0030,0x0032,0x0030,0x0031,0x002d,
-    0x0038,0x0062,0x002e,0x0074,0x0078,
-    0x0074,0x0020,0x002d,0x0020,0x004a,
-    0x0049,0x0053,0x0020,0x0058,0x0030,
-    0x0032,0x0030,0x0031,0x306e,0x7247,
-    0x4eee,0x540d,0x0020,0x3092,0x0020,
-    0x0038,0x5358,0x4f4d,0x7b26,0x53f7,
-    0x5316,0x0020,0x0020,0x0020,0x0020,
-    0x0020,0x0020,0x0020,0x0053,0x0068,
-    0x0069,0x0066,0x0074,0x005f,0x004a,
-    0x0049,0x0053,0x3068,0x540c,0x3058,
-    0x000d,0x000a,0x0020,0x0020,0x006a,
-    0x0030,0x0032,0x0030,0x0031,0x002d,
-    0x0065,0x0073,0x002e,0x0074,0x0078,
-    0x0074,0x0020,0x002d,0x0020,0x004a,
-    0x0049,0x0053,0x0020,0x0058,0x0030,
-    0x0032,0x0030,0x0031,0x306e,0x7247,
-    0x4eee,0x540d,0x0020,0x3092,0x0020,
-    0x0045,0x0053,0x0043,0x0028,0x0049,
-    0x3067,0x7b26,0x53f7,0x5316,0x000d,
-    0x000a,0x0020,0x0020,0x006a,0x0030,
-    0x0032,0x0030,0x0031,0x002d,0x0073,
-    0x006f,0x002e,0x0074,0x0078,0x0074,
-    0x0020,0x002d,0x0020,0x004a,0x0049,
-    0x0053,0x0020,0x0058,0x0030,0x0032,
-    0x0030,0x0031,0x306e,0x7247,0x4eee,
-    0x540d,0x0020,0x3092,0x0020,0x0053,
-    0x004f,0x002f,0x0053,0x0049,0x3067,
-    0x7b26,0x53f7,0x5316,0x000d,0x000a,
-    0x000d,0x000a,0x0020,0x0020,0x006a,
-    0x0030,0x0032,0x0030,0x0038,0x002d,
-    0x0038,0x0062,0x002e,0x0074,0x0078,
-    0x0074,0x0020,0x002d,0x0020,0x004a,
-    0x0049,0x0053,0x0020,0x0058,0x0030,
-    0x0032,0x0030,0x0038,0x0020,0x0020,
-    0x0020,0x0020,0x0020,0x0020,0x0020,
-    0x0020,0x0020,0x3092,0x0020,0x0038,
-    0x5358,0x4f4d,0x7b26,0x53f7,0x5316,
-    0x0020,0x0020,0x0020,0x0020,0x0020,
-    0x0020,0x0020,0x0045,0x0055,0x0043,
-    0x002d,0x004a,0x0050,0x3068,0x540c,
-    0x3058,0x000d,0x000a,0x0020,0x0020,
-    0x006a,0x0030,0x0032,0x0030,0x0038,
-    0x002d,0x0037,0x0038,0x002e,0x0074,
-    0x0078,0x0074,0x0020,0x002d,0x0020,
-    0x004a,0x0049,0x0053,0x0020,0x0058,
-    0x0030,0x0032,0x0030,0x0038,0x0020,
-    0x0020,0x0020,0x0020,0x0020,0x0020,
-    0x0020,0x0020,0x0020,0x3092,0x0020,
-    0x0045,0x0053,0x0043,0x0024,0x0040,
-    0x3067,0x7b26,0x53f7,0x5316,0x0020,
-    0x0020,0x0020,0x0020,0x0020,0x3044,
-    0x308f,0x3086,0x308b,0x65e7,0x004a,
-    0x0049,0x0053,0x000d,0x000a,0x0020,
-    0x0020,0x006a,0x0030,0x0032,0x0030,
-    0x0038,0x002d,0x0038,0x0033,0x002e,
-    0x0074,0x0078,0x0074,0x0020,0x002d,
-    0x0020,0x004a,0x0049,0x0053,0x0020,
-    0x0058,0x0030,0x0032,0x0030,0x0038,
-    0x0020,0x0020,0x0020,0x0020,0x0020,
-    0x0020,0x0020,0x0020,0x0020,0x3092,
-    0x0020,0x0045,0x0053,0x0043,0x0024,
-    0x0042,0x3067,0x7b26,0x53f7,0x5316,
-    0x0020,0x0020,0x0020,0x0020,0x0020,
-    0x3044,0x308f,0x3086,0x308b,0x65b0,
-    0x004a,0x0049,0x0053,0x000d,0x000a,
-    0x000d,0x000a,0x0020,0x0020,0x0065,
-    0x0030,0x0032,0x0030,0x0031,0x002e,
-    0x0074,0x0078,0x0074,0x0020,0x002d,
-    0x002d,0x002d,0x002d,0x0020,0x004a,
-    0x0049,0x0053,0x0020,0x0058,0x0030,
-    0x0032,0x0030,0x0031,0x306e,0x7247,
-    0x4eee,0x540d,0x0020,0x3092,0x0020,
-    0x0045,0x0055,0x0043,0x002d,0x004a,
-    0x0050,0x3067,0x7b26,0x53f7,0x5316,
-    0x000d,0x000a,0x0020,0x0020,0x0065,
-    0x0030,0x0032,0x0030,0x0038,0x002e,
-    0x0074,0x0078,0x0074,0x0020,0x002d,
-    0x002d,0x002d,0x002d,0x0020,0x004a,
-    0x0049,0x0053,0x0020,0x0058,0x0030,
-    0x0032,0x0030,0x0038,0x0020,0x0020,
-    0x0020,0x0020,0x0020,0x0020,0x0020,
-    0x0020,0x0020,0x3092,0x0020,0x0045,
-    0x0055,0x0043,0x002d,0x004a,0x0050,
-    0x3067,0x7b26,0x53f7,0x5316,0x0020,
-    0x0020,0x0020,0x0020,0x0038,0x30d3,
-    0x30c3,0x30c8,0x004a,0x0049,0x0053,
-    0x0058,0x0030,0x0032,0x0030,0x0038,
-    0x3068,0x540c,0x3058,0x000d,0x000a,
-    0x000d,0x000a,0x0020,0x0020,0x0073,
-    0x0030,0x0032,0x0030,0x0031,0x002e,
-    0x0074,0x0078,0x0074,0x0020,0x002d,
-    0x002d,0x002d,0x002d,0x0020,0x004a,
-    0x0049,0x0053,0x0020,0x0058,0x0030,
-    0x0032,0x0030,0x0031,0x0020,0x0020,
-    0x0020,0x0020,0x0020,0x0020,0x0020,
-    0x0020,0x0020,0x3092,0x0020,0x0053,
-    0x0068,0x0069,0x0066,0x0074,0x005f,
-    0x004a,0x0049,0x0053,0x3067,0x7b26,
-    0x53f7,0x5316,0x0020,0x0038,0x30d3,
-    0x30c3,0x30c8,0x004a,0x0049,0x0053,
-    0x0058,0x0030,0x0032,0x0030,0x0031,
-    0x3068,0x540c,0x3058,0x000d,0x000a,
-    0x0020,0x0020,0x0073,0x0030,0x0032,
-    0x0030,0x0038,0x002e,0x0074,0x0078,
-    0x0074,0x0020,0x002d,0x002d,0x002d,
-    0x002d,0x0020,0x004a,0x0049,0x0053,
-    0x0020,0x0058,0x0030,0x0032,0x0030,
-    0x0038,0x0020,0x0020,0x0020,0x0020,
-    0x0020,0x0020,0x0020,0x0020,0x0020,
-    0x3092,0x0020,0x0053,0x0068,0x0069,
-    0x0066,0x0074,0x005f,0x004a,0x0049,
-    0x0053,0x3067,0x7b26,0x53f7,0x5316,
-    0x000d,0x000a,0x000d,0x000a,0x006a,
-    0x0074,0x0065,0x0078,0x0074,0x002f,
-    0x006f,0x0074,0x0068,0x0065,0x0072,
-    0x0073,0x002f,0x000d,0x000a,0x000d,
-    0x000a,0x0020,0x0020,0x0062,0x0036,
-    0x0034,0x006a,0x0069,0x0073,0x002e,
-    0x0074,0x0078,0x0074,0x0020,0x002d,
-    0x002d,0x002d,0x0020,0x0049,0x0053,
-    0x004f,0x002d,0x0032,0x0030,0x0032,
-    0x0032,0x002d,0x004a,0x0050,0x0020,
-    0x0028,0x004a,0x0049,0x0053,0x0029,
-    0x0020,0x3092,0x0020,0x0062,0x0061,
-    0x0073,0x0065,0x0036,0x0034,0x3067,
-    0x7b26,0x53f7,0x5316,0x000d,0x000a,
-    0x0020,0x0020,0x0071,0x0074,0x006a,
-    0x0069,0x0073,0x002e,0x0074,0x0078,
-    0x0074,0x0020,0x002d,0x002d,0x002d,
-    0x002d,0x0020,0x0049,0x0053,0x004f,
-    0x002d,0x0032,0x0030,0x0032,0x0032,
-    0x002d,0x004a,0x0050,0x0020,0x0028,
-    0x004a,0x0049,0x0053,0x0029,0x0020,
-    0x3092,0x0020,0x0071,0x0075,0x006f,
-    0x0074,0x0065,0x0064,0x002d,0x0070,
-    0x0072,0x0069,0x006e,0x0074,0x0061,
-    0x0062,0x006c,0x0065,0x3067,0x7b26,
-    0x53f7,0x5316,0x000d,0x000a,0x000d,
-    0x000a,0x0020,0x0020,0x0062,0x006b,
-    0x0065,0x0075,0x0063,0x002e,0x0074,
-    0x0078,0x0074,0x0020,0x002d,0x002d,
-    0x002d,0x002d,0x0020,0x58ca,0x308c,
-    0x305f,0x0045,0x0055,0x0043,0x002d,
-    0x004a,0x0050,0x0020,0x0020,0x0020,
-    0x0020,0x0020,0x0020,0x5148,0x982d,
-    0x30d3,0x30c3,0x30c8,0x304c,0x30bc,
-    0x30ed,0x000d,0x000a,0x0020,0x0020,
-    0x0062,0x006b,0x006a,0x0069,0x0073,
-    0x002e,0x0074,0x0078,0x0074,0x0020,
-    0x002d,0x002d,0x002d,0x002d,0x0020,
-    0x58ca,0x308c,0x305f,0x004a,0x0049,
-    0x0053,0x0020,0x0020,0x0020,0x0020,
-    0x0020,0x0020,0x0020,0x0020,0x0020,
-    0x0045,0x0053,0x0043,0x30b3,0x30fc,
-    0x30c9,0x304c,0x6b20,0x3051,0x305f,
-    0x000d,0x000a,0x0020,0x0020,0x0062,
-    0x006b,0x0073,0x006a,0x0069,0x0073,
-    0x002e,0x0074,0x0078,0x0074,0x002d,
-    0x002d,0x002d,0x002d,0x0020,0x58ca,
-    0x308c,0x305f,0x0053,0x0068,0x0069,
-    0x0066,0x0074,0x005f,0x004a,0x0049,
-    0x0053,0x0020,0x0020,0x0020,0x5148,
-    0x982d,0x30d3,0x30c3,0x30c8,0x304c,
-    0x30bc,0x30ed,0x000d,0x000a,0x000d,
-    0x000a,0x0020,0x0020,0x0063,0x0074,
-    0x0072,0x006c,0x005f,0x007a,0x002e,
-    0x0074,0x0078,0x0074,0x0020,0x0020,
-    0x0020,0x0020,0x0020,0x0053,0x0068,
-    0x0069,0x0066,0x0074,0x005f,0x004a,
-    0x0049,0x0053,0x0020,0x0020,0x0020,
-    0x0020,0x0020,0x0020,0x005e,0x005a,
-    0x30ad,0x30e3,0x30e9,0x30af,0x30bf,
-    0x4ed8,0x304d,0x0020,0x0020,0x0020,
-    0x0028,0x0044,0x004f,0x0053,0x98a8,
-    0x0029,0x000d,0x000a,0x0020,0x0020,
-    0x006d,0x0061,0x0063,0x0074,0x0078,
-    0x0074,0x002e,0x0062,0x0069,0x006e,
-    0x0020,0x0020,0x0020,0x0020,0x0020,
-    0x30de,0x30c3,0x30af,0x30d0,0x30a4,
-    0x30ca,0x30ea,0x0049,0x0049,0x30d5,
-    0x30a9,0x30fc,0x30de,0x30c3,0x30c8,
-    0x000d,0x000a
-};
-#endif
-
-struct iconv_data
-{
-    int len;
-    char *name;
-    char *data;
-};
-
-#define CONVERSIONS 4
-
-struct iconv_data data[] = 
-{
-#ifdef _ICONV_CONVERTER_EUC_JP
-    {sizeof(euc_jp), "EUC-JP", (char *)euc_jp},
-#endif
-#ifdef _ICONV_CONVERTER_SHIFT_JIS
-    {sizeof(shift_jis), "SHIFT-JIS", (char *)shift_jis},
-#endif
-#ifdef _ICONV_CONVERTER_UTF_8
-    {sizeof(utf8), "UTF-8", (char *)utf8},
-#endif
-#ifdef _ICONV_CONVERTER_UCS_2_INTERNAL
-    {sizeof(ucs2), "UCS-2-INTERNAL", (char *)ucs2},
-#endif
-    {0, NULL, NULL}
-};
-
-#define OUTBUF_LEN 2800
-char ob[OUTBUF_LEN];
-
-iconv_t descs[CONVERSIONS*CONVERSIONS];
-
-#define ERROR 0
-
-int main(int argc, char **argv)
-{
-    int i, j, k, d = 0;
-    size_t n;
-    char *outbuf, *inbuf;
-    int conversions = sizeof(data)/sizeof(struct iconv_data) - 1;
-
-    puts("JP iconv test");
-    
-    for (i = 0; i < conversions; i++)
-    {
-        for (j = 0; j < conversions; j++)
-	{
-	    descs[d] = iconv_open(data[j].name, data[i].name);
-	    if (descs[d++] == (iconv_t)-1)
-	    {
-	        printf("iconv_open(%s, %s)\n", data[i].name, data[j].name);
-	        perror("");
-                CHECK(ERROR);
-	    }
-	}
-    }
-    
-    d = 0;
-    for (i = 0; i < conversions; i++)
-    {
-        for (j = 0; j < conversions; j++)
-	{
-	    size_t inbytes = data[i].len;
-	    size_t outbytes = OUTBUF_LEN;
-	    inbuf = data[i].data;
-	    outbuf = (char *)ob;
-
-	    if (iconv(descs[d], NULL, NULL, (char **)&outbuf, &outbytes)                                                                       == (size_t)-1)
-            {
-                perror("Can't reset shift state");
-                CHECK(ERROR);
-            }
-	    
-            n = iconv(descs[d++], (const char **)&(inbuf), &inbytes, 
-	                          (char **)&outbuf, &outbytes);
-            if (n == (size_t)-1)
-            {
-	        printf("Conversion from %s to %s FAILED - iconv() "
-                       "returned -1\n", data[i].name, data[j].name);
-		perror("");
-                CHECK(ERROR);
-            }
-	    
-	    if (data[j].len != OUTBUF_LEN - outbytes)
-	    {
-                printf("Conversion from %s to %s FAILED",
-                       data[i].name, data[j].name);
-	        printf(" - bad output buffer length (%d instead of %d)\n",
-		       OUTBUF_LEN - outbytes, data[j].len);
-                CHECK(ERROR);
-	    }
-	    
-	    for (k = 0; k < data[j].len; k++)
-	    {
-	        if (ob[k] != data[j].data[k])
-		{
-                    printf("Conversion from %s to %s FAILED",
-                           data[i].name, data[j].name);
-   	            printf("Error: byte %d is wrong\n", k);
-		    printf("outbuf value: %#x, inbuf value %#x, "
-		           "right value: %#x\n",
-          	           (int)ob[k], (int)(data[i].data[k]), 
-		           (int)(data[j].data[k]));
-                    CHECK(ERROR);
-		}
-	    }
-
-	    printf("iconv from %s to %s was successfully done\n",
-                   data[i].name, data[j].name); 
-            
-	}
-    }
-    
-    d = 0;
-    for (i = 0; i < conversions; i++)
-        for (j = 0; j < conversions; j++)
-            CHECK(iconv_close(descs[d++]) != -1);
-
-    exit(0);
-}
-
-#else /* #if defined(_ICONV_CONVERTER_UTF_8) || ... */
-int main(int argc, char **argv)
-{
-    puts("None of UTF-8, EUC-JP, SHIFT-JIS and UCS-2_INTERNAL converters "
-         "linked, SKIP test");
-    exit(0);
-}
-#endif /* #if defined(_ICONV_CONVERTER_UTF_8) || ... */
-
-#else /* #ifdef _ICONV_ENABLED */
-int main(int argc, char **argv)
-{
-    puts("iconv library is disabled, SKIP test");
-    exit(0);
-}
-#endif /* #ifdef _ICONV_ENABLED */
-
diff --git a/newlib/testsuite/newlib.iconv/iconvnm.c b/newlib/testsuite/newlib.iconv/iconvnm.c
deleted file mode 100644
index d7ef216..0000000
--- a/newlib/testsuite/newlib.iconv/iconvnm.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 2003, Artem B. Bityuckiy, SoftMine Corporation.
- * Rights transferred to Franklin Electronic Publishers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <iconv.h>
-#include <errno.h>
-#include <newlib.h>
-#include "check.h"
-
-#ifdef _ICONV_ENABLED
-
-char *good_names[] = {
-#ifdef _ICONV_CONVERTER_ISO_8859_5
-"iso_8859_5", "iso-8859-5", "iso-8859_5", "IsO-8859_5"
-#elif defined _ICONV_CONVERTER_US_ASCII
-"us_ascii", "US_ASCII", "us-ASCII", "US-ASCII"
-#elif defined _ICONV_CONVERTER_EUC_JP
-"euc-jp", "EUC_JP", "euc-JP", "EUC-JP" 
-#elif defined _ICONV_CONVERTER_UTF_8
-"utf_8", "UTF_8", "uTf-8", "UTF-8"
-#else
-#endif
-};
-
-char *bad_names[] =
-{" ", "iso", "8", "iso_8859_5 ", " iso_8859_5", "csisolatincyrillic ",
- " csisolatincyrillic", "euc-", "p", "euc_jp ", "euc-jp-",
- "us_as", "us_", "us_ascii ", " us_ascii",
- "CCCP", "", "-1", "-", "_", "---", "___", "-_-_-", "_-_-_", NULL};
-   
-int main(int argc, char **argv)
-{
-    int i, failed = 0;
-    iconv_t cd;
-
-    puts("iconv names test");
-
-    CHECK(setenv("NLSPATH", "./", 0) != -1);
-
-    for (i = 0; i < sizeof(good_names)/sizeof(char *); i++)
-    {
-        printf("Trying iconv(%s, %s)", good_names[0], good_names[i]);
-        fflush(stdout);
-
-        cd = iconv_open(good_names[0], good_names[i]);
-        
-        if (cd == (iconv_t)-1)
-        {
-            puts(" ... FAILED");
-            failed += 1;
-        }
-        else
-        {
-            puts(" ... PASSED");
-            CHECK(iconv_close(cd) != -1);
-        }
-    }
-    
-    for (i = 0; i < sizeof(bad_names)/sizeof(char *); i++)
-    {
-        printf("Trying iconv(%s, \"%s\")", good_names[0], bad_names[i]);
-        fflush(stdout);
-
-        cd = iconv_open(good_names[0], bad_names[i]);
-        
-        if (cd != (iconv_t)-1)
-        {
-            puts(" ... FAILED");
-            failed += 1;
-        }
-        else
-            puts(" ... PASSED");
-    }
-    
-    if (failed)
-    {
-        printf("%d FAILTURES\n", failed);
-        abort();
-    }
-
-    exit(0);
-}
-#else
-int main(int argc, char **argv)
-{
-    puts("iconv library is disabled, skip name test");
-    exit(0);
-}
-#endif /* #ifdef _ICONV_ENABLED */
-
diff --git a/newlib/testsuite/newlib.iconv/iconvru.c b/newlib/testsuite/newlib.iconv/iconvru.c
deleted file mode 100644
index 7f02ebc..0000000
--- a/newlib/testsuite/newlib.iconv/iconvru.c
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * Copyright (c) 2003, Artem B. Bityuckiy, SoftMine Corporation.
- * Rights transferred to Franklin Electronic Publishers.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <iconv.h>
-#include <errno.h>
-#include <newlib.h>
-#include "check.h"
-
-#ifdef _ICONV_ENABLED
-
-#if defined(_ICONV_CONVERTER_UTF_8) || \
-    defined(_ICONV_CONVERTER_ISO_8859_5) || \
-    defined(_ICONV_CONVERTER_KOI8_R)
-
-#ifdef _ICONV_CONVERTER_ISO_8859_5
-char iso_8859_5[] =
-{
-    0xbe,0xdf,0xd5,0xe0,0xd0,0xe2,0xde,0xe0,0xeb,0x20,
-    0xd2,0x20,0xde,0xd4,0xdd,0xde,0xd9,0x20,0xe1,0xe2,
-    0xe0,0xde,0xda,0xd5,0x20,0xd8,0xdc,0xd5,0xee,0xe2,
-    0x20,0xde,0xd4,0xd8,0xdd,0xd0,0xda,0xde,0xd2,0xeb,
-    0xd9,0x20,0xdf,0xe0,0xd8,0xde,0xe0,0xd8,0xe2,0xd5,
-    0xe2,0x0a,0xc1,0xe2,0xe0,0xde,0xda,0xd8,0x20,0xe3,
-    0xdf,0xde,0xe0,0xef,0xd4,0xde,0xe7,0xd5,0xdd,0xeb,
-    0x20,0xdf,0xde,0x20,0xe3,0xd1,0xeb,0xd2,0xd0,0xdd,
-    0xd8,0xee,0x20,0xdf,0xe0,0xd8,0xde,0xe0,0xd8,0xe2,
-    0xd5,0xe2,0xde,0xd2,0x2e,0x0a,0x0a,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x20,0xb2,0xeb,0xdf,0xde,0xdb,
-    0xdd,0xd5,0xdd,0xd8,0xd5,0x20,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x0a,0x28,0x29,0x20,0x20,
-    0x5b,0x5d,0x20,0x20,0x2d,0x3e,0x20,0x20,0x2e,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x21,
-    0x20,0x20,0x20,0x7e,0x20,0x20,0x20,0x2b,0x2b,0x20,
-    0x20,0x2d,0x2d,0x20,0x20,0x2b,0x20,0x20,0x2d,0x20,
-    0x20,0x2a,0x20,0x20,0x26,0x20,0x20,0x28,0x74,0x79,
-    0x70,0x65,0x29,0x20,0x20,0x73,0x69,0x7a,0x65,0x6f,
-    0x66,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,
-    0x3e,0x0a,0x2a,0x20,0x20,0x2f,0x20,0x20,0x25,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x2d,0x2d,0x2d,0x3e,0x0a,0x2b,0x20,0x20,0x2d,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x3c,0x3c,
-    0x20,0x20,0x3e,0x3e,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,
-    0x0a,0x3c,0x20,0x20,0x3c,0x3d,0x20,0x20,0x3e,0x20,
-    0x20,0x3e,0x3d,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,
-    0x2d,0x2d,0x3e,0x0a,0x3d,0x3d,0x20,0x20,0x21,0x3d,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x26,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,
-    0x5e,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,
-    0x2d,0x3e,0x0a,0x7c,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x26,0x26,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x7c,
-    0x7c,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,
-    0x3e,0x0a,0x3f,0x3a,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x3c,0x2d,0x2d,0x2d,0x20,0x20,0x20,0x0a,0x3d,0x20,
-    0x20,0x2b,0x3d,0x20,0x20,0x2d,0x3d,0x20,0x20,0x2f,
-    0x3d,0x20,0x20,0x25,0x3d,0x20,0x20,0x26,0x3d,0x20,
-    0x20,0x5e,0x3d,0x20,0x20,0x7c,0x3d,0x20,0x20,0x3c,
-    0x3c,0x3d,0x20,0x20,0x3e,0x3e,0x3d,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x3c,0x2d,0x2d,0x2d,
-    0x0a,0x2c,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,
-    0x2d,0x2d,0x3e,0x0a
-};
-#endif /* #ifdef _ICONV_CONVERTER_ISO_8859_5 */
-
-#ifdef _ICONV_CONVERTER_KOI8_R
-char koi8_r[] = 
-{
-    0xef,0xd0,0xc5,0xd2,0xc1,0xd4,0xcf,0xd2,0xd9,0x20,
-    0xd7,0x20,0xcf,0xc4,0xce,0xcf,0xca,0x20,0xd3,0xd4,
-    0xd2,0xcf,0xcb,0xc5,0x20,0xc9,0xcd,0xc5,0xc0,0xd4,
-    0x20,0xcf,0xc4,0xc9,0xce,0xc1,0xcb,0xcf,0xd7,0xd9,
-    0xca,0x20,0xd0,0xd2,0xc9,0xcf,0xd2,0xc9,0xd4,0xc5,
-    0xd4,0x0a,0xf3,0xd4,0xd2,0xcf,0xcb,0xc9,0x20,0xd5,
-    0xd0,0xcf,0xd2,0xd1,0xc4,0xcf,0xde,0xc5,0xce,0xd9,
-    0x20,0xd0,0xcf,0x20,0xd5,0xc2,0xd9,0xd7,0xc1,0xce,
-    0xc9,0xc0,0x20,0xd0,0xd2,0xc9,0xcf,0xd2,0xc9,0xd4,
-    0xc5,0xd4,0xcf,0xd7,0x2e,0x0a,0x0a,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x20,0xf7,0xd9,0xd0,0xcf,0xcc,
-    0xce,0xc5,0xce,0xc9,0xc5,0x20,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x0a,0x28,0x29,0x20,0x20,
-    0x5b,0x5d,0x20,0x20,0x2d,0x3e,0x20,0x20,0x2e,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x21,
-    0x20,0x20,0x20,0x7e,0x20,0x20,0x20,0x2b,0x2b,0x20,
-    0x20,0x2d,0x2d,0x20,0x20,0x2b,0x20,0x20,0x2d,0x20,
-    0x20,0x2a,0x20,0x20,0x26,0x20,0x20,0x28,0x74,0x79,
-    0x70,0x65,0x29,0x20,0x20,0x73,0x69,0x7a,0x65,0x6f,
-    0x66,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,
-    0x3e,0x0a,0x2a,0x20,0x20,0x2f,0x20,0x20,0x25,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x2d,0x2d,0x2d,0x3e,0x0a,0x2b,0x20,0x20,0x2d,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x3c,0x3c,
-    0x20,0x20,0x3e,0x3e,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,
-    0x0a,0x3c,0x20,0x20,0x3c,0x3d,0x20,0x20,0x3e,0x20,
-    0x20,0x3e,0x3d,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,
-    0x2d,0x2d,0x3e,0x0a,0x3d,0x3d,0x20,0x20,0x21,0x3d,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x26,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,
-    0x5e,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,
-    0x2d,0x3e,0x0a,0x7c,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x26,0x26,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x7c,
-    0x7c,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,
-    0x3e,0x0a,0x3f,0x3a,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x3c,0x2d,0x2d,0x2d,0x20,0x20,0x20,0x0a,0x3d,0x20,
-    0x20,0x2b,0x3d,0x20,0x20,0x2d,0x3d,0x20,0x20,0x2f,
-    0x3d,0x20,0x20,0x25,0x3d,0x20,0x20,0x26,0x3d,0x20,
-    0x20,0x5e,0x3d,0x20,0x20,0x7c,0x3d,0x20,0x20,0x3c,
-    0x3c,0x3d,0x20,0x20,0x3e,0x3e,0x3d,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x3c,0x2d,0x2d,0x2d,
-    0x0a,0x2c,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,
-    0x2d,0x2d,0x3e,0x0a
-};
-#endif /* #ifdef _ICONV_CONVERTER_KOI8_R */
-
-#ifdef _ICONV_CONVERTER_UTF_8
-char utf8[] =
-{
-    0xd0,0x9e,0xd0,0xbf,0xd0,0xb5,0xd1,0x80,0xd0,0xb0,
-    0xd1,0x82,0xd0,0xbe,0xd1,0x80,0xd1,0x8b,0x20,0xd0,
-    0xb2,0x20,0xd0,0xbe,0xd0,0xb4,0xd0,0xbd,0xd0,0xbe,
-    0xd0,0xb9,0x20,0xd1,0x81,0xd1,0x82,0xd1,0x80,0xd0,
-    0xbe,0xd0,0xba,0xd0,0xb5,0x20,0xd0,0xb8,0xd0,0xbc,
-    0xd0,0xb5,0xd1,0x8e,0xd1,0x82,0x20,0xd0,0xbe,0xd0,
-    0xb4,0xd0,0xb8,0xd0,0xbd,0xd0,0xb0,0xd0,0xba,0xd0,
-    0xbe,0xd0,0xb2,0xd1,0x8b,0xd0,0xb9,0x20,0xd0,0xbf,
-    0xd1,0x80,0xd0,0xb8,0xd0,0xbe,0xd1,0x80,0xd0,0xb8,
-    0xd1,0x82,0xd0,0xb5,0xd1,0x82,0x0a,0xd0,0xa1,0xd1,
-    0x82,0xd1,0x80,0xd0,0xbe,0xd0,0xba,0xd0,0xb8,0x20,
-    0xd1,0x83,0xd0,0xbf,0xd0,0xbe,0xd1,0x80,0xd1,0x8f,
-    0xd0,0xb4,0xd0,0xbe,0xd1,0x87,0xd0,0xb5,0xd0,0xbd,
-    0xd1,0x8b,0x20,0xd0,0xbf,0xd0,0xbe,0x20,0xd1,0x83,
-    0xd0,0xb1,0xd1,0x8b,0xd0,0xb2,0xd0,0xb0,0xd0,0xbd,
-    0xd0,0xb8,0xd1,0x8e,0x20,0xd0,0xbf,0xd1,0x80,0xd0,
-    0xb8,0xd0,0xbe,0xd1,0x80,0xd0,0xb8,0xd1,0x82,0xd0,
-    0xb5,0xd1,0x82,0xd0,0xbe,0xd0,0xb2,0x2e,0x0a,0x0a,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x20,0xd0,0x92,
-    0xd1,0x8b,0xd0,0xbf,0xd0,0xbe,0xd0,0xbb,0xd0,0xbd,
-    0xd0,0xb5,0xd0,0xbd,0xd0,0xb8,0xd0,0xb5,0x20,0x2d,
-    0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x2d,0x0a,0x28,
-    0x29,0x20,0x20,0x5b,0x5d,0x20,0x20,0x2d,0x3e,0x20,
-    0x20,0x2e,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,
-    0x3e,0x0a,0x21,0x20,0x20,0x20,0x7e,0x20,0x20,0x20,
-    0x2b,0x2b,0x20,0x20,0x2d,0x2d,0x20,0x20,0x2b,0x20,
-    0x20,0x2d,0x20,0x20,0x2a,0x20,0x20,0x26,0x20,0x20,
-    0x28,0x74,0x79,0x70,0x65,0x29,0x20,0x20,0x73,0x69,
-    0x7a,0x65,0x6f,0x66,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x2d,0x2d,0x2d,0x3e,0x0a,0x2a,0x20,0x20,0x2f,0x20,
-    0x20,0x25,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x2b,0x20,
-    0x20,0x2d,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,
-    0x0a,0x3c,0x3c,0x20,0x20,0x3e,0x3e,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,
-    0x2d,0x2d,0x3e,0x0a,0x3c,0x20,0x20,0x3c,0x3d,0x20,
-    0x20,0x3e,0x20,0x20,0x3e,0x3d,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x3d,0x3d,0x20,
-    0x20,0x21,0x3d,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,
-    0x26,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,
-    0x2d,0x3e,0x0a,0x5e,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x7c,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a,0x26,
-    0x26,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x2d,0x2d,0x2d,
-    0x3e,0x0a,0x7c,0x7c,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x2d,0x2d,0x2d,0x3e,0x0a,0x3f,0x3a,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x3c,0x2d,0x2d,0x2d,0x20,0x20,0x20,
-    0x0a,0x3d,0x20,0x20,0x2b,0x3d,0x20,0x20,0x2d,0x3d,
-    0x20,0x20,0x2f,0x3d,0x20,0x20,0x25,0x3d,0x20,0x20,
-    0x26,0x3d,0x20,0x20,0x5e,0x3d,0x20,0x20,0x7c,0x3d,
-    0x20,0x20,0x3c,0x3c,0x3d,0x20,0x20,0x3e,0x3e,0x3d,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x3c,
-    0x2d,0x2d,0x2d,0x0a,0x2c,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-    0x20,0x20,0x2d,0x2d,0x2d,0x3e,0x0a
-};
-#endif
-
-struct iconv_data
-{
-    int len;
-    char *name;
-    char *data;
-};
-
-#define CONVERSIONS 3
-
-struct iconv_data data[] = 
-{
-#ifdef _ICONV_CONVERTER_ISO_8859_5
-    {sizeof(iso_8859_5), "ISO-8859-5", (char *)iso_8859_5},
-#endif
-#ifdef _ICONV_CONVERTER_KOI8_R
-    {sizeof(koi8_r), "KOI8-R", (char *)koi8_r},
-#endif
-#ifdef _ICONV_CONVERTER_UTF_8
-    {sizeof(utf8), "UTF-8", (char *)utf8},
-#endif
-    {0, NULL, NULL}
-};
-
-#define OUTBUF_LEN 1500
-char ob[OUTBUF_LEN];
-
-iconv_t descs[CONVERSIONS*CONVERSIONS];
-
-#define ERROR 0
-
-int main(int argc, char **argv)
-{
-    int i, j, k, d = 0;
-    size_t n;
-    char *outbuf, *inbuf;
-    int conversions = sizeof(data)/sizeof(struct iconv_data) - 1;
-
-    puts("RU iconv test");
-    
-    for (i = 0; i < conversions; i++)
-    {
-        for (j = 0; j < conversions; j++)
-	{
-	    descs[d] = iconv_open(data[j].name, data[i].name);
-	    if (descs[d++] == (iconv_t)-1)
-	    {
-	        printf("iconv_open(%s, %s)\n", data[i].name, data[j].name);
-	        perror("");
-                CHECK(ERROR);
-	    }
-	}
-    }
-    
-    d = 0;
-    for (i = 0; i < conversions; i++)
-    {
-        for (j = 0; j < conversions; j++)
-	{
-	    size_t inbytes = data[i].len;
-	    size_t outbytes = OUTBUF_LEN;
-	    inbuf = data[i].data;
-	    outbuf = (char *)ob;
-
-	    if (iconv(descs[d], NULL, NULL, (char **)&outbuf, &outbytes)                                                                       == (size_t)-1)
-            {
-                perror("Can't reset shift state");
-                CHECK(ERROR);
-            }
-	    
-            n = iconv(descs[d++], (const char **)&(inbuf), &inbytes, 
-	                          (char **)&outbuf, &outbytes);
-            if (n == (size_t)-1)
-            {
-	        printf("Conversion from %s to %s FAILED - iconv() "
-                       "returned -1\n", data[i].name, data[j].name);
-		perror("");
-                CHECK(ERROR);
-            }
-	    
-	    if (data[j].len != OUTBUF_LEN - outbytes)
-	    {
-                printf("Conversion from %s to %s FAILED",
-                       data[i].name, data[j].name);
-	        printf(" - bad output buffer length (%d instead of %d)\n",
-		       OUTBUF_LEN - outbytes, data[j].len);
-                CHECK(ERROR);
-	    }
-	    
-	    for (k = 0; k < data[j].len; k++)
-	    {
-	        if (ob[k] != data[j].data[k])
-		{
-                    printf("Conversion from %s to %s FAILED",
-                           data[i].name, data[j].name);
-   	            printf("Error: byte %d is wrong\n", k);
-		    printf("outbuf value: %#x, inbuf value %#x, "
-		           "right value: %#x\n",
-          	           (int)ob[k], (int)(data[i].data[k]), 
-		           (int)(data[j].data[k]));
-                    CHECK(ERROR);
-		}
-	    }
-
-	    printf("iconv from %s to %s was successfully done\n",
-                   data[i].name, data[j].name); 
-            
-	}
-    }
-    
-    d = 0;
-    for (i = 0; i < conversions; i++)
-        for (j = 0; j < conversions; j++)
-            CHECK(iconv_close(descs[d++]) != -1);
-
-    exit(0);
-}
-
-#else /* #if defined(_ICONV_CONVERTER_UTF_8) || ... */
-int main(int argc, char **argv)
-{
-    puts("None of ISO-8859-5, KOI8-R and UTF-8 converters linked, SKIP test");
-    exit(0);
-}
-#endif /* #if defined(_ICONV_CONVERTER_UTF_8) || ... */
-
-#else /* #ifdef _ICONV_ENABLED */
-int main(int argc, char **argv)
-{
-    puts("iconv library is disabled, SKIP test");
-    exit(0);
-}
-#endif /* #ifdef _ICONV_ENABLED */
-
diff --git a/newlib/testsuite/newlib.locale/UTF-8.c b/newlib/testsuite/newlib.locale/UTF-8.c
deleted file mode 100644
index 3e56267..0000000
--- a/newlib/testsuite/newlib.locale/UTF-8.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
- *  Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
- *
- *  Permission to use, copy, modify, and distribute this software
- *  is freely granted, provided that this notice is preserved.
- *
- *  Tests gleaned from Markus Kuhn's UTF-8 and Unicode FAQ,
- *  and specifically, his UTF-8-test.txt decoder stress test file.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <locale.h>
-
-#define MAX_BYTES 65
-
-int num_invalid(const char *s, int len);
-
-char first[6][6] = {
-  {0x0},                                   /* U-00000000 */
-  {0xc2, 0x80},                            /* U-00000080 */
-  {0xe0, 0xa0, 0x80},                      /* U-00000800 */
-  {0xf0, 0x90, 0x80, 0x80},                /* U-00010000 */
-  {0xf8, 0x88, 0x80, 0x80, 0x80},          /* U-00200000 */
-  {0xfc, 0x84, 0x80, 0x80, 0x80, 0x80}     /* U-04000000 */
-};
-
-char last[6][6] = {
-  {0x7f},                                  /* U-0000007F */
-  {0xdf, 0xbf},                            /* U-000007FF */
-  {0xef, 0xbf, 0xbf},                      /* U-0000FFFF */
-  {0xf7, 0xbf, 0xbf, 0xbf},                /* U-001FFFFF */
-  {0xfb, 0xbf, 0xbf, 0xbf, 0xbf},          /* U-03FFFFFF */
-  {0xfd, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf}     /* U-7FFFFFFF */
-};
-
-char boundary[5][6] = {
-  {0xed, 0x9f, 0xbf},                      /* U-0000D7FF */
-  {0xee, 0x80, 0x80},                      /* U-0000E000 */
-  {0xef, 0xbf, 0xbd},                      /* U-0000FFFD */
-  {0xf4, 0x8f, 0xbf, 0xbf},                /* U-0010FFFF */
-  {0xf4, 0x90, 0x80, 0x80}                 /* U-00110000 */
-};
-
-char continuation_bytes[8][7] = {
-  {0x80},
-  {0xbf},
-  {0x80, 0xbf},
-  {0x80, 0xbf, 0x80},
-  {0x80, 0xbf, 0x80, 0xbf},
-  {0x80, 0xbf, 0x80, 0xbf, 0x80},
-  {0x80, 0xbf, 0x80, 0xbf, 0x80, 0xbf},
-  {0x80, 0xbf, 0x80, 0xbf, 0x80, 0xbf, 0x80}
-};
-
-char all_continuation_bytes[64];
-
-
-char all_two_byte_seq[32];
-char all_three_byte_seq[16];
-char all_four_byte_seq[8];
-char all_five_byte_seq[4];
-char all_six_byte_seq[2];
-
-char incomplete_seq[10][6] = {
-  {0xc2},                            /* U-00000080 */
-  {0xe0, 0x80},                      /* U-00000800 */
-  {0xf0, 0x80, 0x80},                /* U-00010000 */
-  {0xf8, 0x80, 0x80, 0x80},          /* U-00200000 */
-  {0xfc, 0x80, 0x80, 0x80, 0x80},    /* U-04000000 */
-  {0xdf},                            /* U-000007FF */
-  {0xef, 0xbf},                      /* U-0000FFFF */
-  {0xf7, 0xbf, 0xbf},                /* U-001FFFFF */
-  {0xfb, 0xbf, 0xbf, 0xbf},          /* U-03FFFFFF */
-  {0xfd, 0xbf, 0xbf, 0xbf, 0xbf}     /* U-7FFFFFFF */
-};
-
-char incomplete_seq_concat[30];
-
-char impossible_bytes[3][4] = {
-  {0xfe},
-  {0xff},
-  {0xfe, 0xfe, 0xff, 0xff}
-};
-
-char overlong[5][6] = {
-  {0xc0, 0xaf},
-  {0xe0, 0x80, 0xaf},
-  {0xf0, 0x80, 0x80, 0xaf},
-  {0xf8, 0x80, 0x80, 0x80, 0xaf},
-  {0xfc, 0x80, 0x80, 0x80, 0x80, 0xaf}
-};
-
-char overlong_max[5][6] = {
-  {0xc1, 0xbf},
-  {0xe0, 0x9f, 0xbf},
-  {0xf0, 0x8f, 0xbf, 0xbf},
-  {0xf8, 0x87, 0xbf, 0xbf, 0xbf},
-  {0xfc, 0x83, 0xbf, 0xbf, 0xbf, 0xbf}
-};
-
-char overlong_nul[5][6] = {
-  {0xc0, 0x80},
-  {0xe0, 0x80, 0x80},
-  {0xf0, 0x80, 0x80, 0x80},
-  {0xf8, 0x80, 0x80, 0x80, 0x80},
-  {0xfc, 0x80, 0x80, 0x80, 0x80, 0x80}
-};
-
-char single_surrogates[7][3] = {
-  {0xed, 0xa0, 0x80},
-  {0xed, 0xad, 0xbf},
-  {0xed, 0xae, 0x80},
-  {0xed, 0xaf, 0xbf},
-  {0xed, 0xb0, 0x80},
-  {0xed, 0xbe, 0x80},
-  {0xed, 0xbf, 0xbf}
-};
-
-char paired_surrogates[8][6] = {
-  {0xed, 0xa0, 0x80, 0xed, 0xb0, 0x80},
-  {0xed, 0xa0, 0x80, 0xed, 0xbf, 0xbf},
-  {0xed, 0xad, 0xbf, 0xed, 0xb0, 0x80},
-  {0xed, 0xad, 0xbf, 0xed, 0xbf, 0xbf},
-  {0xed, 0xae, 0x80, 0xed, 0xb0, 0x80},
-  {0xed, 0xae, 0x80, 0xed, 0xbf, 0xbf},
-  {0xed, 0xaf, 0xbf, 0xed, 0xb0, 0x80},
-  {0xed, 0xaf, 0xbf, 0xed, 0xbf, 0xbf}
-};
-
-char illegal_pos[2][3] = {
-  {0xff, 0xfe},
-  {0xff, 0xff}
-};
-  
-int main()
-  {
-    wchar_t wchar;
-    int retval;
-    int i;
-
-    if (!setlocale(LC_CTYPE, "C-UTF-8"))
-      {
-        printf("Failed to set C-UTF-8 locale.\n");
-        return 1;
-      }
-    else
-      printf("Set C-UTF-8 locale.\n");
-
-    /* 2  Boundary condition test cases */
-    /* 2.1  First possible sequence of a certain length */
-    retval = mbtowc(&wchar, first[0], MAX_BYTES);
-    if (retval == 0)
-      printf("2.1.1: U-%08d\n", wchar);
-    else
-      printf("2.1.1: Invalid\n");
-
-    for (i = 2; i < 7; i++)
-    {
-      retval = mbtowc (&wchar, first[i-1], MAX_BYTES);
-      if (retval == i)
-        printf("2.1.%d: U-%08x\n", i, wchar);
-      else
-        printf("2.1.%d: Invalid\n", i);
-    }
-
-    /* 2.2  Last possible sequence of a certain length */
-    for (i = 1; i < 7; i++)
-    {
-      retval = mbtowc (&wchar, last[i-1], MAX_BYTES);
-      if (retval == i)
-        printf("2.2.%d: U-%08x\n", i, wchar);
-      else
-        printf("2.2.%d: Invalid\n", i);
-    }
-
-    /* 2.3  Other boundary conditions */
-    for (i = 1; i < 6; i++)
-      {
-        retval = mbtowc (&wchar, boundary[i-1], MAX_BYTES);
-        if ((i < 4 && retval == 3) || (i > 3 && retval == 4))
-          printf("2.3.%d: U-%08x\n", i, wchar);
-        else
-          printf("2.3.%d: Invalid\n", i);
-      }
-
-    /* 3  Malformed sequences */
-    /* 3.1  Unexpected continuation bytes */
-    retval = mbtowc (&wchar, continuation_bytes[0], MAX_BYTES);
-    if (retval == 1)
-      printf("3.1.1: U-%08x\n", wchar);
-    else
-      printf("3.1.1: 1 Invalid\n");
-
-    retval = mbtowc (&wchar, continuation_bytes[1], MAX_BYTES);
-    if (retval == 1)
-      printf("3.1.2: U-%08x\n", wchar);
-    else
-      printf("3.1.2: 1 Invalid\n");
-
-    for(i=2; i< 8; i++)
-      {
-        retval = num_invalid(continuation_bytes[i], i);
-        if (retval == -1)
-          printf("3.1.%d: Valid Character Found\n", i+1);
-        else
-          printf("3.1.%d: %d Invalid\n", i+1, retval);
-      }
-
-    for(i = 0x80; i < 0xc0; i++)
-      all_continuation_bytes[i-0x80] = i;
-
-    retval = num_invalid(all_continuation_bytes, 0xc0 - 0x80);
-    if (retval == -1)
-      printf("3.1.9: Valid Character Found\n");
-    else
-      printf("3.1.9: %d Invalid\n", retval);
-
-    /* 3.2  Lonely start characters */
-    for(i = 0xc0; i < 0xe0; i++)
-      all_two_byte_seq[i-0xc0] = i;
-
-    retval = num_invalid(all_two_byte_seq, 0xe0 - 0xc0);
-    if (retval == -1)
-      printf("3.2.1: Valid Character Found\n");
-    else
-      printf("3.2.1: %d Invalid\n", retval);
-
-    for(i = 0xe0; i < 0xf0; i++)
-      all_three_byte_seq[i-0xe0] = i;
-
-    retval = num_invalid(all_three_byte_seq, 0xf0 - 0xe0);
-    if (retval == -1)
-      printf("3.2.2: Valid Character Found\n");
-    else
-      printf("3.2.2: %d Invalid\n", retval);
-    
-    for(i = 0xf0; i < 0xf8; i++)
-      all_four_byte_seq[i-0xf0] = i;
-
-    retval = num_invalid(all_four_byte_seq, 0xf8 - 0xf0);
-    if (retval == -1)
-      printf("3.2.3: Valid Character Found\n");
-    else
-      printf("3.2.3: %d Invalid\n", retval);
-    
-    for(i = 0xf8; i < 0xfc; i++)
-      all_five_byte_seq[i-0xf8] = i;
-
-    retval = num_invalid(all_five_byte_seq, 0xfc - 0xf8);
-    if (retval == -1)
-      printf("3.2.4: Valid Character Found\n");
-    else
-      printf("3.2.4: %d Invalid\n", retval);
-
-    for(i = 0xfc; i < 0xfe; i++)
-      all_six_byte_seq[i-0xfc] = i;
-
-    retval = num_invalid(all_six_byte_seq, 0xfe - 0xfc);
-    if (retval == -1)
-      printf("3.2.5: Valid Character Found\n");
-    else
-      printf("3.2.5: %d Invalid\n", retval);
-
-    /* 3.3  Sequences with last continuation byte missing */
-    for(i = 1; i < 6; i++)
-      {
-        retval = mbtowc(&wchar, incomplete_seq[i-1], i);
-        if(retval == -1)
-          printf("3.3.%d: 1 Invalid\n", i);
-        else
-          printf("3.3.%d: Valid Character Found\n", i);
-      }
-
-    for(i = 6; i < 11; i++)
-      {
-        retval = mbtowc(&wchar, incomplete_seq[i-1], i - 5);
-        if(retval == -1)
-          printf("3.3.%d: 1 Invalid\n", i);
-        else
-          printf("3.3.%d: Valid Character Found\n", i);
-      }
-
-    /* 3.4  Concatenation of incomplete sequences */
-    /* This test is excluded because the mbtowc function does not return the
-       number of bytes read in an invalid multi-byte sequence. */
-
-    /* 3.5  Impossible bytes */
-    retval = mbtowc(&wchar, impossible_bytes[0], 1);
-    if(retval == -1)
-      printf("3.5.1: 1 Invalid\n");
-    else
-      printf("3.5.1: Valid Character Found\n");
-
-    retval = mbtowc(&wchar, impossible_bytes[1], 1);
-    if(retval == -1)
-      printf("3.5.2: 1 Invalid\n");
-    else
-      printf("3.5.2: Valid Character Found\n");
-
-    retval = mbtowc(&wchar, impossible_bytes[2], 4);
-    if(retval == -1)
-      printf("3.5.3: 1 Invalid\n");
-    else
-      printf("3.5.3: Valid Character Found\n");
-
-    /* 4  Overlong sequences */
-    /* 4.1  Examples of an overlong ASCII character */
-    for(i = 2; i < 7; i++)
-      {
-        retval = mbtowc(&wchar, overlong[i-2], i);
-        if(retval == -1)
-          printf("4.1.%d: 1 Invalid\n", i-1);
-        else
-          printf("4.1.%d: Valid Character Found\n", i-1);
-      }
-
-    /* 4.2  Maximum overlong sequences */
-    for(i = 2; i < 7; i++)
-      {
-        retval = mbtowc(&wchar, overlong_max[i-2], i);
-        if(retval == -1)
-          printf("4.2.%d: 1 Invalid\n", i-1);
-        else
-          printf("4.2.%d: Valid Character Found\n", i-1);
-      }
-
-    /* 4.3  Overlong representation of the NUL character */
-    for(i = 2; i < 7; i++)
-      {
-        retval = mbtowc(&wchar, overlong_nul[i-2], i);
-        if(retval == -1)
-          printf("4.3.%d: 1 Invalid\n", i-1);
-        else
-          printf("4.3.%d: Valid Character Found\n", i-1);
-      }
-
-    /* 5  Illegal code positions */
-    /* 5.1 Single UTF-16 surrogates */
-    for (i = 1; i < 8; i++)
-      {
-        retval = mbtowc(&wchar, single_surrogates[i-1], 3);
-        if(retval == -1)
-          printf("5.1.%d: 1 Invalid\n", i);
-        else
-          printf("5.1.%d: Valid Character Found\n", i);
-      }
-    
-    /* 5.2 Paired UTF-16 surrogates */
-    for (i = 1; i < 8; i++)
-      {
-        retval = mbtowc(&wchar, paired_surrogates[i-1], 6);
-        if(retval == -1)
-          printf("5.2.%d: 1 Invalid\n", i);
-        else
-          printf("5.2.%d: Valid Character Found\n", i);
-      }
-
-    /* 5.3 Other illegal code positions */
-    retval = mbtowc(&wchar, illegal_pos[0], 3);
-    if(retval == -1)
-      printf("5.3.1: 1 Invalid\n");
-    else
-      printf("5.3.1: Valid Character Found\n");
-
-    retval = mbtowc(&wchar, illegal_pos[1], 3);
-    if(retval == -1)
-      printf("5.3.2: 1 Invalid\n");
-    else
-      printf("5.3.2: Valid Character Found\n");
-    
-    return 0;
-  }
-
-/* return number of invalid characters in string,
-   returns -1 if a valid character is found */
-int
-num_invalid(const char *s, int len)
-{
-  int retval = 0;
-  int i = 0;
-  int num_inv = 0;
-  wchar_t wchar;
-  const char *t;
-
-  t = s;
-
-  for(i=0; i<len; t++, i++)
-    {
-      retval = mbtowc (&wchar, t, len - i);
-      if(retval == -1)
-        num_inv++;
-      else
-        return -1;
-    }
-  return num_inv;
-}
diff --git a/newlib/testsuite/newlib.locale/UTF-8.exp b/newlib/testsuite/newlib.locale/UTF-8.exp
deleted file mode 100644
index e823a4f..0000000
--- a/newlib/testsuite/newlib.locale/UTF-8.exp
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software
-# is freely granted, provided that this notice is preserved.
-#
-
-load_lib checkoutput.exp
-
-set expected_output {
-"Set C-UTF-8 locale."
-"* U-00000000"
-"* U-00000080"
-"* U-00000800"
-"* U-00010000"
-"* U-00200000"
-"* U-04000000"
-"* U-0000007f"
-"* U-000007ff"
-"* U-0000ffff"
-"* U-001fffff"
-"* U-03ffffff"
-"* U-7fffffff"
-"* U-0000d7ff"
-"* U-0000e000"
-"* U-0000fffd"
-"* U-0010ffff"
-"* U-00110000"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 2 Invalid"
-"* 3 Invalid"
-"* 4 Invalid"
-"* 5 Invalid"
-"* 6 Invalid"
-"* 7 Invalid"
-"* 64 Invalid"
-"* 32 Invalid"
-"* 16 Invalid"
-"* 8 Invalid"
-"* 4 Invalid"
-"* 2 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-"* 1 Invalid"
-}
-
-newlib_check_output UTF-8.c $expected_output
diff --git a/newlib/testsuite/newlib.locale/locale.exp b/newlib/testsuite/newlib.locale/locale.exp
deleted file mode 100644
index 9d6f4dd..0000000
--- a/newlib/testsuite/newlib.locale/locale.exp
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software
-# is freely granted, provided that this notice is preserved.
-#
-
-load_lib passfail.exp
-
-set exclude_list {
-"UTF-8.c"
-}
-
-newlib_pass_fail_all -x $exclude_list
diff --git a/newlib/testsuite/newlib.search/hsearchtest.c b/newlib/testsuite/newlib.search/hsearchtest.c
deleted file mode 100644
index 5154403..0000000
--- a/newlib/testsuite/newlib.search/hsearchtest.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*	$NetBSD: hsearchtest.c,v 1.4 2002/02/21 07:38:15 itojun Exp $	*/
-
-/*
- * Copyright (c) 2001 Christopher G. Demetriou
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * <<Id: LICENSE_GC,v 1.1 2001/10/01 23:24:05 cgd Exp>>
- */
-
-/*
- * Test program for hsearch() et al.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if !defined(lint)
-__RCSID("$NetBSD: hsearchtest.c,v 1.4 2002/02/21 07:38:15 itojun Exp $");
-__COPYRIGHT(
-"@(#) Copyright (c) 2001 Christopher G. Demetriou.  All rights reserved.\n");
-#endif /* not lint */
-#endif
-
-#include <search.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#define	TEST(e)	((e) ? (void)0 : testfail(__FILE__, __LINE__, #e))
-
-static void
-testfail(const char *file, unsigned long line, const char *expression)
-{
-
-	fprintf(stderr, "TEST FAILED: %s: file %s, line %ld\n",
-	    expression, file, line);
-	exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-	ENTRY e, *ep, *ep2;
-	int created_ok;
-	char ch[2];
-	int i;
-
-	created_ok = hcreate(16);
-	TEST(created_ok);
-
-	/* ch[1] should be constant from here on down. */
-	ch[1] = '\0';
-	
-	/* Basic insertions.  Check enough that there'll be collisions. */
-	for (i = 0; i < 26; i++) {
-		ch[0] = 'a' + i;
-		e.key = strdup(ch);	/* ptr to provided key is kept! */
-		TEST(e.key != NULL);
-		e.data = (void *)(long)i;
-		ep = hsearch(e, ENTER);
-		TEST(ep != NULL);
-		TEST(strcmp(ep->key, ch) == 0);
-		TEST((long)ep->data == i);
-	}
-
-	/* e.key should be constant from here on down. */
-	e.key = ch;
-
-	/* Basic lookups. */
-	for (i = 0; i < 26; i++) {
-		ch[0] = 'a' + i;
-		ep = hsearch(e, FIND);
-		TEST(ep != NULL);
-		TEST(strcmp(ep->key, ch) == 0);
-		TEST((long)ep->data == i);
-	}
-
-	/* Check duplicate entry.  Should _not_ overwrite existing data.  */
-	ch[0] = 'a';
-	e.data = (void *)(long)12345;
-	ep = hsearch(e, FIND);
-	TEST(ep != NULL);
-	TEST(strcmp(ep->key, ch) == 0);
-	TEST((long)ep->data == 0);
-
-	/* Check for something that's not there. */
-	ch[0] = 'A';
-	ep = hsearch(e, FIND);
-	TEST(ep == NULL);
-
-	/* Check two at once. */
-	ch[0] = 'a';
-	ep = hsearch(e, FIND);
-	ch[0] = 'b';
-	ep2 = hsearch(e, FIND);
-	TEST(ep != NULL);
-	TEST(strcmp(ep->key, "a") == 0 && (long)ep->data == 0);
-	TEST(ep2 != NULL);
-	TEST(strcmp(ep2->key, "b") == 0 && (long)ep2->data == 1);
-
-	hdestroy();
-
-	exit(0);
-}
diff --git a/newlib/testsuite/newlib.search/hsearchtest.exp b/newlib/testsuite/newlib.search/hsearchtest.exp
deleted file mode 100644
index cd5d7d6..0000000
--- a/newlib/testsuite/newlib.search/hsearchtest.exp
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software
-# is freely granted, provided that this notice is preserved.
-#
-
-load_lib passfail.exp
-
-set exclude_list {
-}
-
-newlib_pass_fail_all -x $exclude_list
diff --git a/newlib/testsuite/newlib.stdlib/atexit.c b/newlib/testsuite/newlib.stdlib/atexit.c
deleted file mode 100644
index 48fdb67..0000000
--- a/newlib/testsuite/newlib.stdlib/atexit.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-
-void a(void);
-void b(void);
-void c(int, void *);
-static void newline(void);
-
-void a (void)
-{
-  printf("a");
-}
-
-void b (void)
-{
-  printf("b");
-}
-
-void c (int code, void *k)
-{
-  char *x = (char *)k;
-  printf("%d%c",code,x[0]);
-}
-
-static void newline (void)
-{
-  printf("\n");
-}
-
-int main()
-{
-  if (atexit(newline) != 0)
-    abort();
-
-  if (atexit(a) != 0)
-    abort();
-
-  if (atexit(b) != 0)
-    abort();
-
-  if (on_exit(c,(void *)"c") != 0)
-    abort();
-
-  if (atexit(a) != 0)
-    abort();
-
-  exit(0);
-}
diff --git a/newlib/testsuite/newlib.stdlib/atexit.exp b/newlib/testsuite/newlib.stdlib/atexit.exp
deleted file mode 100644
index 777110d..0000000
--- a/newlib/testsuite/newlib.stdlib/atexit.exp
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software
-# is freely granted, provided that this notice is preserved.
-#
-
-load_lib checkoutput.exp
-
-set output {
-"a0cba"
-}
-
-newlib_check_output "atexit.c" "$output"
diff --git a/newlib/testsuite/newlib.string/memmove1.c b/newlib/testsuite/newlib.string/memmove1.c
deleted file mode 100644
index d3f1d66..0000000
--- a/newlib/testsuite/newlib.string/memmove1.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* A minor test-program for memmove.
-   Copyright (C) 2005 Axis Communications.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Neither the name of Axis Communications nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY AXIS COMMUNICATIONS AND ITS CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AXIS
-   COMMUNICATIONS OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-   IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-   POSSIBILITY OF SUCH DAMAGE.  */
-
-/* Test moves of 0..MAX bytes; overlapping-src-higher,
-   overlapping-src-lower and non-overlapping.  The overlap varies with
-   1..N where N is the size moved.  This means an order of MAX**2
-   iterations.  The size of an octet may seem appropriate for MAX and
-   makes an upper limit for simple testing.  For the CRIS simulator,
-   making this 256 added 90s to the test-run (2GHz P4) while 64 (4s) was
-   enough to spot the bugs that had crept in, hence the number chosen.  */
-#define MAX 64
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define TOO_MANY_ERRORS 11
-int errors = 0;
-
-#define DEBUGP					\
- if (errors == TOO_MANY_ERRORS)			\
-   printf ("Further errors omitted\n");		\
- else if (errors < TOO_MANY_ERRORS)		\
-   printf
-
-/* A safe target-independent memmove.  */
-
-void
-mymemmove (unsigned char *dest, unsigned char *src, size_t n)
-{
-  size_t i;
-
-  if ((src <= dest && src + n <= dest)
-      || src >= dest)
-    while (n-- > 0)
-      *dest++ = *src++;
-  else
-    {
-      dest += n;
-      src += n;
-      while (n-- > 0)
-	*--dest = *--src;
-    }
-}
-
-/* It's either the noinline attribute or forcing the test framework to
-   pass -fno-builtin-memmove.  */
-void
-xmemmove (unsigned char *dest, unsigned char *src, size_t n)
-     __attribute__ ((__noinline__));
-
-void
-xmemmove (unsigned char *dest, unsigned char *src, size_t n)
-{
-  void *retp;
-  retp = memmove (dest, src, n);
-
-  if (retp != dest)
-    {
-      errors++;
-      DEBUGP ("memmove of n bytes returned %p instead of dest=%p\n",
-	      retp, dest);
-    }
-}
-
-
-/* Fill the array with something we can associate with a position, but
-   not exactly the same as the position index.  */
-
-void
-fill (unsigned char dest[MAX*3])
-{
-  size_t i;
-  for (i = 0; i < MAX*3; i++)
-    dest[i] = (10 + i) % MAX;
-}
-
-int
-main (void)
-{
-  size_t i;
-  int errors = 0;
-
-  /* Leave some room before and after the area tested, so we can detect
-     overwrites of up to N bytes, N being the amount tested.  If you
-     want to test using valgrind, make these malloced instead.  */
-  unsigned char from_test[MAX*3];
-  unsigned char to_test[MAX*3];
-  unsigned char from_known[MAX*3];
-  unsigned char to_known[MAX*3];
-
-  /* Non-overlap.  */
-  for (i = 0; i < MAX; i++)
-    {
-      /* Do the memmove first before setting the known array, so we know
-         it didn't change any of the known array.  */
-      fill (from_test);
-      fill (to_test);
-      xmemmove (to_test + MAX, 1 + from_test + MAX, i);
-
-      fill (from_known);
-      fill (to_known);
-      mymemmove (to_known + MAX, 1 + from_known + MAX, i);
-
-      if (memcmp (to_known, to_test, sizeof (to_known)) != 0)
-	{
-	  errors++;
-	  DEBUGP ("memmove failed non-overlap test for %d bytes\n", i);
-	}
-    }
-
-  /* Overlap-from-before.  */
-  for (i = 0; i < MAX; i++)
-    {
-      size_t j;
-      for (j = 0; j < i; j++)
-	{
-	  fill (to_test);
-	  xmemmove (to_test + MAX * 2 - i, to_test + MAX * 2 - i - j, i);
-
-	  fill (to_known);
-	  mymemmove (to_known + MAX * 2 - i, to_known + MAX * 2 - i - j, i);
-
-	  if (memcmp (to_known, to_test, sizeof (to_known)) != 0)
-	    {
-	      errors++;
-	      DEBUGP ("memmove failed for %d bytes,"
-		      " with src %d bytes before dest\n",
-		      i, j);
-	    }
-	}
-    }
-
-  /* Overlap-from-after.  */
-  for (i = 0; i < MAX; i++)
-    {
-      size_t j;
-      for (j = 0; j < i; j++)
-	{
-	  fill (to_test);
-	  xmemmove (to_test + MAX, to_test + MAX + j, i);
-
-	  fill (to_known);
-	  mymemmove (to_known + MAX, to_known + MAX + j, i);
-
-	  if (memcmp (to_known, to_test, sizeof (to_known)) != 0)
-	    {
-	      errors++;
-	      DEBUGP ("memmove failed when moving %d bytes,"
-		      " with src %d bytes after dest\n",
-		      i, j);
-	    }
-	}
-    }
-
-  if (errors != 0)
-    abort ();
-  exit (0);
-}
diff --git a/newlib/testsuite/newlib.string/string.exp b/newlib/testsuite/newlib.string/string.exp
deleted file mode 100644
index cd5d7d6..0000000
--- a/newlib/testsuite/newlib.string/string.exp
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software
-# is freely granted, provided that this notice is preserved.
-#
-
-load_lib passfail.exp
-
-set exclude_list {
-}
-
-newlib_pass_fail_all -x $exclude_list
diff --git a/newlib/testsuite/newlib.string/tstring.c b/newlib/testsuite/newlib.string/tstring.c
deleted file mode 100644
index e433923..0000000
--- a/newlib/testsuite/newlib.string/tstring.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * is freely granted, provided that this notice is preserved.
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifndef MAX_1
-#define MAX_1 33000
-#endif
-
-#define MAX_2 (2 * MAX_1 + MAX_1 / 10)
-
-void eprintf (int line, char *result, char *expected, int size)
-{
-  if (size != 0)
-    printf ("Failure at line %d, result is <%.*s>, should be <%s> of size %d\n",
-             line, size, result, expected, size);
-  else
-    printf ("Failure at line %d, result is <%s>, should be <%s>\n",
-             line, result, expected);
-}
-
-void mycopy (char *target, char *source, int size)
-{
-  int i;
-
-  for (i = 0; i < size; ++i)
-    {
-      target[i] = source[i];
-    }
-}
-
-void myset (char *target, char ch, int size)
-{
-  int i;
-  
-  for (i = 0; i < size; ++i)
-    {
-      target[i] = ch;
-    }
-}
-
-int main()
-{
-  char target[MAX_1] = "A";
-  char first_char;
-  char second_char;
-  char array[] = "abcdefghijklmnopqrstuvwxz";
-  char array2[] = "0123456789!@#$%^&*(";
-  char buffer2[MAX_1];
-  char buffer3[MAX_1];
-  char buffer4[MAX_1];
-  char buffer5[MAX_2];
-  char buffer6[MAX_2];
-  char buffer7[MAX_2];
-  char expected[MAX_1];
-  char *tmp1, *tmp2, *tmp3, *tmp4, *tmp5, *tmp6, *tmp7;
-  int i, j, k, x, z, align_test_iterations;
-
-  int test_failed = 0;
-
-  tmp1 = target;
-  tmp2 = buffer2;
-  tmp3 = buffer3;
-  tmp4 = buffer4;
-  tmp5 = buffer5;
-  tmp6 = buffer6;
-  tmp7 = buffer7;
-
-  tmp2[0] = 'Z';
-  tmp2[1] = '\0';
-
-  if (memset (target, 'X', 0) != target ||
-      memcpy (target, "Y", 0) != target ||
-      memmove (target, "K", 0) != target ||
-      strncpy (tmp2, "4", 0) != tmp2 ||
-      strncat (tmp2, "123", 0) != tmp2 ||
-      strcat (target, "") != target)
-    {
-      eprintf (__LINE__, target, "A", 0);
-      test_failed = 1;
-    }
-
-  if (strcmp (target, "A") || strlen(target) != 1 || memchr (target, 'A', 0) != NULL
-      || memcmp (target, "J", 0) || strncmp (target, "A", 1) || strncmp (target, "J", 0) ||
-      tmp2[0] != 'Z' || tmp2[1] != '\0')
-    {
-      eprintf (__LINE__, target, "A", 0);
-      test_failed = 1;
-    }
-
-  tmp2[2] = 'A';
-  if (strcpy (target, "") != target ||
-      strncpy (tmp2, "", 4) != tmp2 ||
-      strcat (target, "") != target)
-    {
-      eprintf (__LINE__, target, "", 0);
-      test_failed = 1;
-    }
-
-  if (target[0] != '\0' || strncmp (target, "", 1) ||
-      memcmp (tmp2, "\0\0\0\0", 4))
-    {
-      eprintf (__LINE__, target, "", 0);
-      test_failed = 1;
-    }
-
-  tmp2[2] = 'A';
-  if (strncat (tmp2, "1", 3) != tmp2 ||
-      memcmp (tmp2, "1\0A", 3))
-    {
-      eprintf (__LINE__, tmp2, "1\0A", 3);
-      test_failed = 1;
-    }
-
-  if (strcpy (tmp3, target) != tmp3 ||
-      strcat (tmp3, "X") != tmp3 ||
-      strncpy (tmp2, "X", 2) != tmp2 ||
-      memset (target, tmp2[0], 1) != target)
-    {
-      eprintf (__LINE__, target, "X", 0);
-      test_failed = 1;
-    }
-
-  if (strcmp (target, "X") || strlen (target) != 1 ||
-      memchr (target, 'X', 2) != target ||
-      strchr (target, 'X') != target ||
-      memchr (target, 'Y', 2) != NULL ||
-      strchr (target, 'Y') != NULL ||
-      strcmp (tmp3, target) ||
-      strncmp (tmp3, target, 2) ||
-      memcmp (target, "K", 0) ||
-      strncmp (target, tmp3, 3))
-    {
-      eprintf (__LINE__, target, "X", 0);
-      test_failed = 1;
-    }
-
-  if (strcpy (tmp3, "Y") != tmp3 ||
-      strcat (tmp3, "Y") != tmp3 ||
-      memset (target, 'Y', 2) != target)
-    {
-      eprintf (__LINE__, target, "Y", 0);
-      test_failed = 1;
-    }
-
-  target[2] = '\0';
-  if (memcmp (target, "YY", 2) || strcmp (target, "YY") ||
-      strlen (target) != 2 || memchr (target, 'Y', 2) != target ||
-      strcmp (tmp3, target) ||
-      strncmp (target, tmp3, 3) ||
-      strncmp (target, tmp3, 4) ||
-      strncmp (target, tmp3, 2) ||
-      strchr (target, 'Y') != target)
-    {
-      eprintf (__LINE__, target, "YY", 2);
-      test_failed = 1;
-    }
-
-  strcpy (target, "WW");
-  if (memcmp (target, "WW", 2) || strcmp (target, "WW") ||
-      strlen (target) != 2 || memchr (target, 'W', 2) != target ||
-      strchr (target, 'W') != target)
-    {
-      eprintf (__LINE__, target, "WW", 2);
-      test_failed = 1;
-    }
-
-  if (strncpy (target, "XX", 16) != target ||
-      memcmp (target, "XX\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16))
-    {
-      eprintf (__LINE__, target, "XX\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 16);
-      test_failed = 1;
-    }
-
-  if (strcpy (tmp3, "ZZ") != tmp3 ||
-      strcat (tmp3, "Z") != tmp3 ||
-      memcpy (tmp4, "Z", 2) != tmp4 ||
-      strcat (tmp4, "ZZ") != tmp4 ||
-      memset (target, 'Z', 3) != target)
-    {
-      eprintf (__LINE__, target, "ZZZ", 3);
-      test_failed = 1;
-    }
-
-  target[3] = '\0';
-  tmp5[0] = '\0';
-  strncat (tmp5, "123", 2);
-  if (memcmp (target, "ZZZ", 3) || strcmp (target, "ZZZ") ||
-      strcmp (tmp3, target) || strcmp (tmp4, target) ||
-      strncmp (target, "ZZZ", 4) || strncmp (target, "ZZY", 3) <= 0 ||
-      strncmp ("ZZY", target, 4) >= 0 ||
-      memcmp (tmp5, "12", 3) ||
-      strlen (target) != 3)
-    {
-      eprintf (__LINE__, target, "ZZZ", 3);
-      test_failed = 1;
-    }
-
-  target[2] = 'K';
-  if (memcmp (target, "ZZZ", 2) || strcmp (target, "ZZZ") >= 0 ||
-      memcmp (target, "ZZZ", 3) >= 0 || strlen (target) != 3 ||
-      memchr (target, 'K', 3) != target + 2 ||
-      strncmp (target, "ZZZ", 2) || strncmp (target, "ZZZ", 4) >= 0 ||
-      strchr (target, 'K') != target + 2)
-    {
-      eprintf (__LINE__, target, "ZZK", 3);
-      test_failed = 1;
-    }
-  
-  strcpy (target, "AAA");
-  if (memcmp (target, "AAA", 3) || strcmp (target, "AAA") ||
-      strncmp (target, "AAA", 3) ||
-      strlen (target) != 3)
-    {
-      eprintf (__LINE__, target, "AAA", 3);
-      test_failed = 1;
-    }
-  
-  j = 5;
-  while (j < MAX_1)
-    {
-      for (i = j-1; i <= j+1; ++i)
-        {
-	  /* don't bother checking unaligned data in the larger
-	     sizes since it will waste time without performing additional testing */
-	  if (i <= 16 * sizeof(long))
-	    {
-	      align_test_iterations = 2*sizeof(long);
-              if (i <= 2 * sizeof(long) + 1)
-                z = 2;
-	      else
-	        z = 2 * sizeof(long);
-            }
-	  else
-            {
-	      align_test_iterations = 1;
-            }
-
-	  for (x = 0; x < align_test_iterations; ++x)
-	    {
-	      tmp1 = target + x;
-	      tmp2 = buffer2 + x;
-	      tmp3 = buffer3 + x;
-	      tmp4 = buffer4 + x;
-	      tmp5 = buffer5 + x;
-	      tmp6 = buffer6 + x;
-
-	      first_char = array[i % (sizeof(array) - 1)];
-	      second_char = array2[i % (sizeof(array2) - 1)];
-	      memset (tmp1, first_char, i);
-	      mycopy (tmp2, tmp1, i);
-	      myset (tmp2 + z, second_char, i - z - 1);
-	      if (memcpy (tmp1 + z, tmp2 + z, i - z - 1) != tmp1 + z)
-		{
-		  printf ("error at line %d\n", __LINE__);
-		  test_failed = 1;
-		}
-
-	      tmp1[i] = '\0';
-	      tmp2[i] = '\0';
-	      if (strcpy (expected, tmp2) != expected)
-		{
-		  printf ("error at line %d\n", __LINE__);
-		  test_failed = 1;
-		}
-	      tmp2[i-z] = first_char + 1;
-	      if (memmove (tmp2 + z + 1, tmp2 + z, i - z - 1) != tmp2 + z + 1 ||
-		  memset (tmp3, first_char, i) != tmp3)
-		{
-		  printf ("error at line %d\n", __LINE__);
-		  test_failed = 1;
-		}
-
-	      myset (tmp4, first_char, i);
-	      tmp5[0] = '\0';
-	      if (strncpy (tmp5, tmp1, i+1) != tmp5 ||
-		  strcat (tmp5, tmp1) != tmp5)
-		{
-		  printf ("error at line %d\n", __LINE__);
-		  test_failed = 1;
-		}
-	      mycopy (tmp6, tmp1, i);
-	      mycopy (tmp6 + i, tmp1, i + 1);
-
-	      tmp7[2*i+z] = second_char;
-              strcpy (tmp7, tmp1);
-         
-	      strchr (tmp1, second_char);
- 
-	      if (memcmp (tmp1, expected, i) || strcmp (tmp1, expected) ||
-		  strncmp (tmp1, expected, i) ||
-                  strncmp (tmp1, expected, i+1) ||
-		  strcmp (tmp1, tmp2) >= 0 || memcmp (tmp1, tmp2, i) >= 0 ||
-		  strncmp (tmp1, tmp2, i+1) >= 0 ||
-		  strlen (tmp1) != i || memchr (tmp1, first_char, i) != tmp1 ||
-		  strchr (tmp1, first_char) != tmp1 ||
-		  memchr (tmp1, second_char, i) != tmp1 + z ||
-		  strchr (tmp1, second_char) != tmp1 + z ||
-		  strcmp (tmp5, tmp6) ||
-		  strncat (tmp7, tmp1, i+2) != tmp7 ||
-		  strcmp (tmp7, tmp6) ||
-		  tmp7[2*i+z] != second_char)
-		{
-		  eprintf (__LINE__, tmp1, expected, 0);
-		  printf ("x is %d\n",x);
-		  printf ("i is %d\n", i);
-		  printf ("tmp1 is <%p>\n", tmp1);
-		  printf ("tmp5 is <%p> <%s>\n", tmp5, tmp5);
-		  printf ("tmp6 is <%p> <%s>\n", tmp6, tmp6);
-		  test_failed = 1;
-		}
-
-	      for (k = 1; k <= align_test_iterations && k <= i; ++k)
-		{
-		  if (memcmp (tmp3, tmp4, i - k + 1) != 0 ||
-		      strncmp (tmp3, tmp4, i - k + 1) != 0)
-		    {
-		      printf ("Failure at line %d, comparing %.*s with %.*s\n",
-			      __LINE__, i, tmp3, i, tmp4);
-		      test_failed = 1;
-		    }
-		  tmp4[i-k] = first_char + 1;
-		  if (memcmp (tmp3, tmp4, i) >= 0 ||
-		      strncmp (tmp3, tmp4, i) >= 0 ||
-		      memcmp (tmp4, tmp3, i) <= 0 ||
-		      strncmp (tmp4, tmp3, i) <= 0)
-		    {
-		      printf ("Failure at line %d, comparing %.*s with %.*s\n",
-			      __LINE__, i, tmp3, i, tmp4);
-		      test_failed = 1;
-		    }
-		  tmp4[i-k] = first_char;
-		}
-	    }              
-        }
-      j = ((2 * j) >> 2) << 2;
-    }
-
-  if (test_failed)
-    abort();
-  else
-    exit(0);
-}
diff --git a/newlib/testsuite/newlib.wctype/tiswctype.c b/newlib/testsuite/newlib.wctype/tiswctype.c
deleted file mode 100644
index da48fbb..0000000
--- a/newlib/testsuite/newlib.wctype/tiswctype.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <wctype.h>
-#include <newlib.h>
-#include "check.h"
-
-int main()
-{
-  wctype_t x;
-
-  x = wctype ("alpha");
-  CHECK (x != 0);
-  CHECK (iswctype (L'a', x) && isalpha ('a'));
-
-  x = wctype ("alnum");
-  CHECK (x != 0);
-  CHECK (iswctype (L'0', x) && isalnum ('0'));
-
-  x = wctype ("blank");
-  CHECK (x != 0);
-  CHECK (iswctype (L' ', x) && isblank (' '));
-
-  x = wctype ("cntrl");
-  CHECK (x != 0);
-  CHECK (iswctype (L'\n', x) && iscntrl ('\n'));
-
-  x = wctype ("digit");
-  CHECK (x != 0);
-  CHECK (iswctype (L'7', x) && isdigit ('7'));
-
-  x = wctype ("graph");
-  CHECK (x != 0);
-  CHECK (iswctype (L'!', x) && isgraph ('!'));
-
-  x = wctype ("lower");
-  CHECK (x != 0);
-  CHECK (iswctype (L'k', x) && islower ('k'));
-
-  x = wctype ("print");
-  CHECK (x != 0);
-  CHECK (iswctype (L'@', x) && isprint ('@'));
-
-  x = wctype ("punct");
-  CHECK (x != 0);
-  CHECK (iswctype (L'.', x) && ispunct ('.'));
-
-  x = wctype ("space");
-  CHECK (x != 0);
-  CHECK (iswctype (L'\t', x) && isspace ('\t'));
-
-  x = wctype ("upper");
-  CHECK (x != 0);
-  CHECK (iswctype (L'T', x) && isupper ('T'));
-
-  x = wctype ("xdigit");
-  CHECK (x != 0);
-  CHECK (iswctype (L'B', x) && isxdigit ('B'));
-
-  x = wctype ("unknown");
-  CHECK (x == 0);
-
-  exit (0);
-}
diff --git a/newlib/testsuite/newlib.wctype/twctrans.c b/newlib/testsuite/newlib.wctype/twctrans.c
deleted file mode 100644
index a70e001..0000000
--- a/newlib/testsuite/newlib.wctype/twctrans.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <wctype.h>
-#include <newlib.h>
-#include "check.h"
-
-int main()
-{
-  wctrans_t x;
-
-  x = wctrans ("tolower");
-  CHECK (x != 0);
-  CHECK (towctrans (L'A', x) == tolower ('A'));
-  CHECK (towctrans (L'5', x) == tolower ('5'));
-
-  x = wctrans ("toupper");
-  CHECK (x != 0);
-  CHECK (towctrans (L'c', x) == toupper ('c'));
-  CHECK (towctrans (L'9', x) == toupper ('9'));
-
-  x = wctrans ("unknown");
-  CHECK (x == 0);
-
-  exit (0);
-}
diff --git a/newlib/testsuite/newlib.wctype/twctype.c b/newlib/testsuite/newlib.wctype/twctype.c
deleted file mode 100644
index d206876..0000000
--- a/newlib/testsuite/newlib.wctype/twctype.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <wctype.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <newlib.h>
-#include <locale.h>
-#include "check.h"
-
-int main()
-{
-#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL > 1
-  if (_MB_LEN_MAX == 1)
-    {
-      CHECK (iswalpha(L'a'));
-      CHECK (!iswalpha(L'3'));
-      CHECK (iswalnum(L'9'));
-      CHECK (!iswalnum(L'$'));
-      CHECK (iswcntrl(L'\n'));
-      CHECK (!iswcntrl(L'#'));
-      CHECK (iswdigit(L'2'));
-      CHECK (!iswdigit(L'a'));
-      CHECK (iswgraph(L'2'));
-      CHECK (!iswgraph(L' '));
-      CHECK (iswlower(L'g'));
-      CHECK (!iswlower(L'G'));
-      CHECK (iswprint(L'*'));
-      CHECK (!iswprint(L'\n'));
-      CHECK (iswpunct(L','));
-      CHECK (!iswpunct(L'\n'));
-      CHECK (iswspace(L'\t'));
-      CHECK (!iswspace(L':'));
-      CHECK (iswupper(L'G'));
-      CHECK (!iswupper(L'g'));
-      CHECK (iswxdigit(L'A'));
-      CHECK (!iswxdigit(L'g'));
-    }
-  else
-    {
-      setlocale (LC_CTYPE, "C-UTF-8");
-      CHECK (iswalpha(0x0967));
-      CHECK (!iswalpha(0x128e));
-      CHECK (iswalnum(0x1d7ce));
-      CHECK (!iswalnum(0x1d800));
-      CHECK (iswcntrl(0x007f));
-      CHECK (!iswcntrl(0x2027));
-      CHECK (iswdigit(L'2'));
-      CHECK (!iswdigit(0x0009));
-      CHECK (iswlower(0x03b3));
-      CHECK (!iswlower(0x04aa));
-      CHECK (iswprint(0x0b13));
-      CHECK (!iswprint(0x0ce2));
-      CHECK (iswpunct(0x002d));
-      CHECK (!iswpunct(0x0a84));
-      CHECK (iswspace(0x000a));
-      CHECK (!iswspace(0x2060));
-      CHECK (iswupper(0x01a4));
-      CHECK (!iswupper(0x1e6d));
-      CHECK (iswxdigit(L'A'));
-      CHECK (!iswxdigit(0x1f48));
-    }
-#endif
-
-  exit (0);
-}
diff --git a/newlib/testsuite/newlib.wctype/wctype.exp b/newlib/testsuite/newlib.wctype/wctype.exp
deleted file mode 100644
index cd5d7d6..0000000
--- a/newlib/testsuite/newlib.wctype/wctype.exp
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
-#
-# Permission to use, copy, modify, and distribute this software
-# is freely granted, provided that this notice is preserved.
-#
-
-load_lib passfail.exp
-
-set exclude_list {
-}
-
-newlib_pass_fail_all -x $exclude_list
diff --git a/setup.com b/setup.com
index 6083dda..553afd5 100644
--- a/setup.com
+++ b/setup.com
@@ -3,5 +3,6 @@ $!
 $ define aout [-.INCLUDE.AOUT]
 $ define coff [-.INCLUDE.COFF]
 $ define elf [-.INCLUDE.ELF]
+$ define mpw [-.INCLUDE.MPW]
 $ define nlm [-.INCLUDE.NLM]
 $ define opcode [-.INCLUDE.OPCODE]
diff --git a/src-release b/src-release
deleted file mode 100644
index 40a34d8..0000000
--- a/src-release
+++ /dev/null
@@ -1,292 +0,0 @@
-#   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-#   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation
-#
-# This file 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 of the License, or
-# (at your option) any later version.
-# 
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-
-# This Makefile contains release scripts for gdb, binutils, and other
-# packages which live in src.  It used to be part of the top level Makefile,
-# but that turned out to be very messy and hard to maintain.
-
-# This stuff really ought to be cleaned up and turned into something other
-# than a Makefile.  As it is it's heavily recursive.
-
-# This is the name of this script (!).  Needed due to horrible recursion.
-SELF = src-release
-
-SHELL = /bin/sh
-
-BZIPPROG = bzip2
-MD5PROG = md5sum
-
-# pwd command to use.  Allow user to override default by setting PWDCMD in
-# the environment to account for automounters.  The make variable must not
-# be called PWDCMD, otherwise the value set here is passed to make
-# subprocesses and overrides the setting from the user's environment.
-PWD = $${PWDCMD-pwd}
-
-#
-# Support for building net releases
-
-# Files in devo used in any net release.
-# ChangeLog omitted because it may refer to files which are not in this
-# distribution (perhaps it would be better to include it anyway).
-DEVO_SUPPORT= README Makefile.in configure configure.in \
-	config.guess config.sub config move-if-change \
-	COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
-	mkinstalldirs ltconfig ltmain.sh missing ylwrap \
-	libtool.m4 gettext.m4 ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh \
-	Makefile.def Makefile.tpl src-release
-
-# Files in devo/etc used in any net release.
-# ChangeLog omitted because it may refer to files which are not in this
-# distribution (perhaps it would be better to include it anyway).
-ETC_SUPPORT= Makefile.in configure configure.in standards.texi \
-	make-stds.texi standards.info* configure.texi configure.info* \
-	configbuild.* configdev.* fdl.texi texi2pod.pl
-
-
-# When you use `make setup-dirs' or `make taz' you should always redefine
-# this macro.
-SUPPORT_FILES = list-of-support-files-for-tool-in-question
-
-# NOTE: No double quotes in the below.  It is used within shell script
-# as VER="$(VER)"
-VER = `	if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null 2>&1; then \
-	  sed < bfd/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
-	elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
-	  sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
-	elif test -f $(TOOL)/version.in; then \
-	  head -1 $(TOOL)/version.in; \
-	elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \
-	  sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \
-	else \
-	  echo VERSION; \
-	fi`
-PACKAGE = $(TOOL)
-
-.PHONY: taz
-taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
-	$(MAKE) -f $(SELF) do-proto-toplev \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f $(SELF) do-md5sum \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f $(SELF) do-tar \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f $(SELF) do-bz2 \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-
-.PHONY: gdb-tar
-gdb-tar: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
-	$(MAKE) -f $(SELF) do-proto-toplev \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f $(SELF) do-md5sum \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f $(SELF) do-djunpack \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f $(SELF) do-tar \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-
-.PHONY: gdb-taz
-gdb-taz: gdb-tar $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
-	$(MAKE) -f $(SELF) gdb-tar \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-	$(MAKE) -f $(SELF) do-bz2 \
-		TOOL=$(TOOL) PACKAGE="$(PACKAGE)" VER="$(VER)" \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(SUPPORT_FILES)"
-
-.PHONY: do-proto-toplev
-do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
-	echo "==> Making $(PACKAGE)-$(VER)/"
-	# Take out texinfo from a few places.
-	sed -e '/^all\.normal: /s/\all-texinfo //' \
-	    -e '/^	install-texinfo /d' \
-	<Makefile.in >tmp
-	mv -f tmp Makefile.in
-	#
-	./configure i686-pc-linux-gnu
-	$(MAKE) configure-host configure-target \
-	    ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
-	    CC_FOR_TARGET="$(CC)" CXX_FOR_TARGET="$(CXX)"
-	# Make links, and run "make diststuff" or "make info" when needed.
-	rm -rf proto-toplev ; mkdir proto-toplev
-	set -e ; dirs="$(TOOL) $(DEVO_SUPPORT) $(SUPPORT_FILES)" ; \
-	for d in $$dirs ; do \
-	  if [ -d $$d ]; then \
-	    if [ ! -f $$d/Makefile ] ; then true ; \
-	    elif grep '^diststuff:' $$d/Makefile >/dev/null ; then \
-		(cd $$d ; $(MAKE) diststuff ) || exit 1 ; \
-	    elif grep '^info:' $$d/Makefile >/dev/null ; then \
-	        (cd $$d ; $(MAKE) info ) || exit 1 ; \
-	    fi ; \
-	    if [ -d $$d/proto-$$d.dir ]; then \
-	      ln -s ../$$d/proto-$$d.dir proto-toplev/$$d ; \
-	    else \
-	      ln -s ../$$d proto-toplev/$$d ; \
-	    fi ; \
-	  else ln -s ../$$d proto-toplev/$$d ; fi ; \
-	done
-	cd etc && $(MAKE) info
-	$(MAKE) distclean
-	# Kludge for pr gdb/857.  intl/Makefile.in lacks a couple
-	# of files in the distclean rule.  Zack W is planning to make
-	# the gcc version of intl/ the master version and then push
-	# that version to src soon.  See:
-	#   http://sources.redhat.com/ml/binutils/2003-07/msg00032.html
-	# After the src version of intl/ is upgraded, we can look at
-	# moving this logic into intl/Makefile.in distclean rule
-	# if it is still needed.  -- chastain 2003-09-12
-	rm -f intl/config.cache
-	rm -f intl/config.status
-	rm -f intl/config.h
-	rm -f intl/stamp-h
-	#
-	mkdir proto-toplev/etc
-	(cd proto-toplev/etc; \
-	 for i in $(ETC_SUPPORT); do \
-		ln -s ../../etc/$$i . ; \
-	 done)
-	#
-	# Take out texinfo from configurable dirs
-	rm proto-toplev/configure.in
-	sed -e '/^host_tools=/s/texinfo //' \
-	    <configure.in >proto-toplev/configure.in
-	#
-	mkdir proto-toplev/texinfo
-	ln -s ../../texinfo/texinfo.tex		proto-toplev/texinfo/
-	if test -r texinfo/util/tex3patch ; then \
-	  mkdir proto-toplev/texinfo/util && \
-	  ln -s ../../../texinfo/util/tex3patch	proto-toplev/texinfo/util ; \
-	else true; fi
-	chmod -R og=u . || chmod og=u `find . -print`
-	#
-	# Create .gmo files from .po files.
-	for f in `find . -name '*.po' -type f -print`; do \
-	     msgfmt -o `echo $$f | sed -e 's/\.po$$/.gmo/'` $$f ; \
-	done
-	#
-	-rm -f $(PACKAGE)-$(VER)
-	ln -s proto-toplev $(PACKAGE)-$(VER)
-
-CVS_NAMES= \( -name CVS -o -name '.cvsignore' \)
-
-.PHONY: do-tar
-do-tar:
-	echo "==> Making $(PACKAGE)-$(VER).tar"
-	-rm -f $(PACKAGE)-$(VER).tar
-	find $(PACKAGE)-$(VER) -follow $(CVS_NAMES) -prune \
-			-o -type f -print \
-		| tar cTfh - $(PACKAGE)-$(VER).tar
-
-.PHONY: do-bz2
-do-bz2:
-	echo "==> Bzipping $(PACKAGE)-$(VER).tar.bz2"
-	-rm -f $(PACKAGE)-$(VER).tar.bz2
-	$(BZIPPROG) -v -9 $(PACKAGE)-$(VER).tar
-
-.PHONY: do-md5sum
-do-md5sum:
-	echo "==> Adding md5 checksum to top-level directory"
-	cd proto-toplev && find * -follow $(CVS_NAMES) -prune \
-			-o -type f -print \
-		| xargs $(MD5PROG) > ../md5.new
-	-rm -f proto-toplev/md5.sum
-	mv md5.new proto-toplev/md5.sum
-
-.PHONY: do-djunpack
-do-djunpack:
-	echo "==> Adding updated djunpack.bat to top-level directory"
-	echo - 's /gdb-[0-9\.]*/$(PACKAGE)-'"$(VER)"'/'
-	sed < djunpack.bat > djunpack.new \
-		-e 's/gdb-[0-9][0-9\.]*/$(PACKAGE)-'"$(VER)"'/'
-	-rm -f proto-toplev/djunpack.bat
-	mv djunpack.new proto-toplev/djunpack.bat
-
-TEXINFO_SUPPORT= texinfo/texinfo.tex
-DIST_SUPPORT= $(DEVO_SUPPORT) $(TEXINFO_SUPPORT)
-
-.PHONY: gas.tar.bz2
-GAS_SUPPORT_DIRS= bfd include libiberty opcodes intl setup.com makefile.vms mkdep
-gas.tar.bz2: $(DIST_SUPPORT) $(GAS_SUPPORT_DIRS) gas
-	$(MAKE) -f $(SELF) taz TOOL=gas \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(GAS_SUPPORT_DIRS)"
-
-# The FSF "binutils" release includes gprof and ld.
-.PHONY: binutils.tar.bz2
-BINUTILS_SUPPORT_DIRS= bfd gas include libiberty opcodes ld gprof intl setup.com makefile.vms mkdep cpu
-binutils.tar.bz2: $(DIST_SUPPORT) $(BINUTILS_SUPPORT_DIRS) binutils
-	$(MAKE) -f $(SELF) taz TOOL=binutils \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(BINUTILS_SUPPORT_DIRS)"
-
-.PHONY: gas+binutils.tar.bz2
-GASB_SUPPORT_DIRS= $(GAS_SUPPORT_DIRS) binutils ld gprof
-gas+binutils.tar.bz2: $(DIST_SUPPORT) $(GASB_SUPPORT_DIRS) gas
-	$(MAKE) -f $(SELF) taz TOOL=gas \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(GASB_SUPPORT_DIRS)"
-
-GNATS_SUPPORT_DIRS=include libiberty send-pr
-gnats.tar.bz2: $(DIST_SUPPORT) $(GNATS_SUPPORT_DIRS) gnats
-	$(MAKE) -f  $(SELF) taz TOOL=gnats \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(GNATS_SUPPORT_DIRS)"
-
-.PHONY: gdb.tar.bz2
-GDB_SUPPORT_DIRS= bfd include libiberty opcodes readline sim
-gdb.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
-	$(MAKE) -f $(SELF) gdb-taz TOOL=gdb \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
-.PHONY: gdb.tar
-gdb.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
-	$(MAKE) -f $(SELF) gdb-tar TOOL=gdb \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(GDB_SUPPORT_DIRS)"
-
-.PHONY: insight.tar.bz2
-INSIGHT_SUPPORT_DIRS= $(GDB_SUPPORT_DIRS) tcl tk itcl libgui
-insight.tar.bz2: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
-	$(MAKE) -f $(SELF) gdb-taz TOOL=gdb PACKAGE=insight \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"
-.PHONY: insight.tar
-insight.tar: $(DIST_SUPPORT) $(GDB_SUPPORT_DIRS) gdb
-	$(MAKE) -f $(SELF) gdb-tar TOOL=gdb PACKAGE=insight \
-		MD5PROG="$(MD5PROG)" \
-		SUPPORT_FILES="$(INSIGHT_SUPPORT_DIRS)"
-
-.NOEXPORT:
-MAKEOVERRIDES=
diff --git a/symlink-tree b/symlink-tree
index a9d5083..5b18cab 100755
--- a/symlink-tree
+++ b/symlink-tree
@@ -1,31 +1,6 @@
 #!/bin/sh
 # Create a symlink tree.
 #
-# Copyright (C) 1995, 2000, 2003  Free Software Foundation, Inc.
-#
-# This file 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-#
-# Please report bugs to <gcc-bugs@gnu.org>
-# and send patches to <gcc-patches@gnu.org>.
-
 # Syntax: symlink-tree srcdir "ignore1 ignore2 ..."
 #
 # where srcdir is the directory to create a symlink tree to,
diff --git a/texinfo/texinfo.tex b/texinfo/texinfo.tex
index 6f322ea..faad86b 100644
--- a/texinfo/texinfo.tex
+++ b/texinfo/texinfo.tex
@@ -3,11 +3,10 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2004-02-19.09}
+\def\texinfoversion{2000-05-28.15}
 %
-% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-% Foundation, Inc.
+% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
+% Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software; you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -24,17 +23,21 @@
 % to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 % Boston, MA 02111-1307, USA.
 %
-% As a special exception, when this file is read by TeX when processing
-% a Texinfo source document, you may use the result without
-% restriction.  (This has been our intent since Texinfo was invented.)
-% 
+% In other words, you are welcome to use, share and improve this program.
+% You are forbidden to forbid anyone else to use, share and improve
+% what you give them.   Help stamp out software-hoarding!
+%
 % Please try the latest version of texinfo.tex before submitting bug
 % reports; you can get the latest version from:
-%   http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
-%   ftp://tug.org/tex/texinfo.tex
-%     (and all CTAN mirrors, see http://www.ctan.org).
-% The texinfo.tex in any given distribution could well be out
+%   ftp://ftp.gnu.org/gnu/texinfo.tex
+%   (and all GNU mirrors, see http://www.gnu.org/order/ftp.html)
+%   ftp://texinfo.org/tex/texinfo.tex
+%   ftp://us.ctan.org/macros/texinfo/texinfo.tex
+%   (and all CTAN mirrors, finger ctan@us.ctan.org for a list).
+%   /home/gd/gnu/doc/texinfo.tex on the GNU machines.
+% The texinfo.tex in any given Texinfo distribution could well be out
 % of date, so if that's what you're using, please check.
+% Texinfo has a small home page at http://texinfo.org/.
 %
 % Send bug reports to bug-texinfo@gnu.org.  Please include including a
 % complete document in each bug report with which we can reproduce the
@@ -47,17 +50,13 @@
 %   texindex foo.??
 %   tex foo.texi
 %   tex foo.texi
-%   dvips foo.dvi -o  # or whatever; this makes foo.ps.
-% The extra TeX runs get the cross-reference information correct.
+%   dvips foo.dvi -o # or whatever, to process the dvi file; this makes foo.ps.
+% The extra runs of TeX get the cross-reference information correct.
 % Sometimes one run after texindex suffices, and sometimes you need more
 % than two; texi2dvi does it as many times as necessary.
 %
-% It is possible to adapt texinfo.tex for other languages, to some
-% extent.  You can get the existing language-specific files from the
-% full Texinfo distribution.
-% 
-% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
-
+% It is possible to adapt texinfo.tex for other languages.  You can get
+% the existing language-specific files from ftp://ftp.gnu.org/gnu/texinfo/.
 
 \message{Loading texinfo [version \texinfoversion]:}
 
@@ -67,14 +66,7 @@
 \everyjob{\message{[Texinfo version \texinfoversion]}%
   \catcode`+=\active \catcode`\_=\active}
 
-\message{Basics,}
-\chardef\other=12
-
-% We never want plain's \outer definition of \+ in Texinfo.
-% For @tex, we can use \tabalign.
-\let\+ = \relax
-
-% Save some plain tex macros whose names we will redefine.
+% Save some parts of plain tex whose names we will redefine.
 \let\ptexb=\b
 \let\ptexbullet=\bullet
 \let\ptexc=\c
@@ -84,34 +76,23 @@
 \let\ptexend=\end
 \let\ptexequiv=\equiv
 \let\ptexexclam=\!
-\let\ptexfootnote=\footnote
-\let\ptexgtr=>
-\let\ptexhat=^
 \let\ptexi=\i
-\let\ptexindent=\indent
-\let\ptexnoindent=\noindent
-\let\ptexinsert=\insert
 \let\ptexlbrace=\{
-\let\ptexless=<
-\let\ptexplus=+
 \let\ptexrbrace=\}
-\let\ptexslash=\/
 \let\ptexstar=\*
 \let\ptext=\t
 
+% We never want plain's outer \+ definition in Texinfo.
+% For @tex, we can use \tabalign.
+\let\+ = \relax
+
+\message{Basics,}
+\chardef\other=12
+
 % If this character appears in an error message or help string, it
 % starts a new line in the output.
 \newlinechar = `^^J
 
-% Use TeX 3.0's \inputlineno to get the line number, for better error
-% messages, but if we're using an old version of TeX, don't do anything.
-%
-\ifx\inputlineno\thisisundefined
-  \let\linenumber = \empty % Pre-3.0.
-\else
-  \def\linenumber{l.\the\inputlineno:\space}
-\fi
-
 % Set up fixed words for English if not already set.
 \ifx\putwordAppendix\undefined  \gdef\putwordAppendix{Appendix}\fi
 \ifx\putwordChapter\undefined   \gdef\putwordChapter{Chapter}\fi
@@ -150,115 +131,44 @@
 \ifx\putwordDefspec\undefined   \gdef\putwordDefspec{Special Form}\fi
 \ifx\putwordDefvar\undefined    \gdef\putwordDefvar{Variable}\fi
 \ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
+\ifx\putwordDeftypevar\undefined\gdef\putwordDeftypevar{Variable}\fi
 \ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
-
-% In some macros, we cannot use the `\? notation---the left quote is
-% in some cases the escape char.
-\chardef\colonChar = `\:
-\chardef\commaChar = `\,
-\chardef\dotChar   = `\.
-\chardef\exclamChar= `\!
-\chardef\questChar = `\?
-\chardef\semiChar  = `\;
-\chardef\underChar = `\_
-
-\chardef\spaceChar = `\ %
-\chardef\spacecat = 10
-\def\spaceisspace{\catcode\spaceChar=\spacecat}
+\ifx\putwordDeftypefun\undefined\gdef\putwordDeftypefun{Function}\fi
 
 % Ignore a token.
 %
 \def\gobble#1{}
 
-% The following is used inside several \edef's.
-\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname}
-
-% Hyphenation fixes.
-\hyphenation{
-  Flor-i-da Ghost-script Ghost-view Mac-OS ap-pen-dix bit-map bit-maps
-  data-base data-bases eshell fall-ing half-way long-est man-u-script
-  man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
-  par-a-digms rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
-  stand-alone strong-est time-stamp time-stamps which-ever white-space
-  wide-spread wrap-around
-}
+\hyphenation{ap-pen-dix}
+\hyphenation{mini-buf-fer mini-buf-fers}
+\hyphenation{eshell}
+\hyphenation{white-space}
 
 % Margin to add to right of even pages, to left of odd pages.
-\newdimen\bindingoffset
-\newdimen\normaloffset
+\newdimen \bindingoffset
+\newdimen \normaloffset
 \newdimen\pagewidth \newdimen\pageheight
 
-% For a final copy, take out the rectangles
-% that mark overfull boxes (in case you have decided
-% that the text looks ok even though it passes the margin).
-%
-\def\finalout{\overfullrule=0pt}
-
-% @| inserts a changebar to the left of the current line.  It should
-% surround any changed text.  This approach does *not* work if the
-% change spans more than two lines of output.  To handle that, we would
-% have adopt a much more difficult approach (putting marks into the main
-% vertical list for the beginning and end of each change).
-%
-\def\|{%
-  % \vadjust can only be used in horizontal mode.
-  \leavevmode
-  %
-  % Append this vertical mode material after the current line in the output.
-  \vadjust{%
-    % We want to insert a rule with the height and depth of the current
-    % leading; that is exactly what \strutbox is supposed to record.
-    \vskip-\baselineskip
-    %
-    % \vadjust-items are inserted at the left edge of the type.  So
-    % the \llap here moves out into the left-hand margin.
-    \llap{%
-      %
-      % For a thicker or thinner bar, change the `1pt'.
-      \vrule height\baselineskip width1pt
-      %
-      % This is the space between the bar and the text.
-      \hskip 12pt
-    }%
-  }%
-}
-
 % Sometimes it is convenient to have everything in the transcript file
 % and nothing on the terminal.  We don't just call \tracingall here,
-% since that produces some useless output on the terminal.  We also make
-% some effort to order the tracing commands to reduce output in the log
-% file; cf. trace.sty in LaTeX.
+% since that produces some useless output on the terminal.
 %
 \def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}%
-\def\loggingall{%
-  \tracingstats2
-  \tracingpages1
-  \tracinglostchars2  % 2 gives us more in etex
-  \tracingparagraphs1
-  \tracingoutput1
-  \tracingmacros2
-  \tracingrestores1
-  \showboxbreadth\maxdimen \showboxdepth\maxdimen
-  \ifx\eTeXversion\undefined\else % etex gives us more logging
-    \tracingscantokens1
-    \tracingifs1
-    \tracinggroups1
-    \tracingnesting2
-    \tracingassigns1
-  \fi
-  \tracingcommands3  % 3 gives us more in etex
-  \errorcontextlines16
+\ifx\eTeXversion\undefined
+\def\loggingall{\tracingcommands2 \tracingstats2
+   \tracingpages1 \tracingoutput1 \tracinglostchars1
+   \tracingmacros2 \tracingparagraphs1 \tracingrestores1
+   \showboxbreadth\maxdimen\showboxdepth\maxdimen
 }%
-
-% add check for \lastpenalty to plain's definitions.  If the last thing
-% we did was a \nobreak, we don't want to insert more space.
-%
-\def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount
-  \removelastskip\penalty-50\smallskip\fi\fi}
-\def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount
-  \removelastskip\penalty-100\medskip\fi\fi}
-\def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount
-  \removelastskip\penalty-200\bigskip\fi\fi}
+\else
+\def\loggingall{\tracingcommands3 \tracingstats2
+   \tracingpages1 \tracingoutput1 \tracinglostchars1
+   \tracingmacros2 \tracingparagraphs1 \tracingrestores1
+   \tracingscantokens1 \tracingassigns1 \tracingifs1
+   \tracinggroups1 \tracingnesting2
+   \showboxbreadth\maxdimen\showboxdepth\maxdimen
+}%
+\fi
 
 % For @cropmarks command.
 % Do @cropmarks to get crop marks.
@@ -305,7 +215,7 @@
                    % the page break happens to be in the middle of an example.
     \shipout\vbox{%
       % Do this early so pdf references go to the beginning of the page.
-      \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
+      \ifpdfmakepagedest \pdfmkdest{\the\pageno} \fi
       %
       \ifcropmarks \vbox to \outervsize\bgroup
         \hsize = \outerhsize
@@ -353,7 +263,7 @@
       \egroup % \vbox from first cropmarks clause
       \fi
     }% end of \shipout\vbox
-  }% end of group with \normalturnoffactive
+  }% end of group with \turnoffactive
   \advancepageno
   \ifnum\outputpenalty>-20000 \else\dosupereject\fi
 }
@@ -386,162 +296,143 @@
 % the input line (except we remove a trailing comment).  #1 should be a
 % macro which expects an ordinary undelimited TeX argument.
 %
-\def\parsearg{\parseargusing{}}
-\def\parseargusing#1#2{%
-  \def\next{#2}%
+\def\parsearg#1{%
+  \let\next = #1%
   \begingroup
     \obeylines
-    \spaceisspace
-    #1%
-    \parseargline\empty% Insert the \empty token, see \finishparsearg below.
+    \futurelet\temp\parseargx
+}
+
+% If the next token is an obeyed space (from an @example environment or
+% the like), remove it and recurse.  Otherwise, we're done.
+\def\parseargx{%
+  % \obeyedspace is defined far below, after the definition of \sepspaces.
+  \ifx\obeyedspace\temp
+    \expandafter\parseargdiscardspace
+  \else
+    \expandafter\parseargline
+  \fi
 }
 
+% Remove a single space (as the delimiter token to the macro call).
+{\obeyspaces %
+ \gdef\parseargdiscardspace {\futurelet\temp\parseargx}}
+
 {\obeylines %
   \gdef\parseargline#1^^M{%
     \endgroup % End of the group started in \parsearg.
-    \argremovecomment #1\comment\ArgTerm%
+    %
+    % First remove any @c comment, then any @comment.
+    % Result of each macro is put in \toks0.
+    \argremovec #1\c\relax %
+    \expandafter\argremovecomment \the\toks0 \comment\relax %
+    %
+    % Call the caller's macro, saved as \next in \parsearg.
+    \expandafter\next\expandafter{\the\toks0}%
   }%
 }
 
-% First remove any @comment, then any @c comment.
-\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
-\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
+% Since all \c{,omment} does is throw away the argument, we can let TeX
+% do that for us.  The \relax here is matched by the \relax in the call
+% in \parseargline; it could be more or less anything, its purpose is
+% just to delimit the argument to the \c.
+\def\argremovec#1\c#2\relax{\toks0 = {#1}}
+\def\argremovecomment#1\comment#2\relax{\toks0 = {#1}}
 
-% Each occurence of `\^^M' or `<space>\^^M' is replaced by a single space.
-%
-% \argremovec might leave us with trailing space, e.g.,
+% \argremovec{,omment} might leave us with trailing spaces, though; e.g.,
 %    @end itemize  @c foo
-% This space token undergoes the same procedure and is eventually removed
-% by \finishparsearg.
-%
-\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M}
-\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M}
-\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
-  \def\temp{#3}%
-  \ifx\temp\empty
-    % We cannot use \next here, as it holds the macro to run;
-    % thus we reuse \temp.
-    \let\temp\finishparsearg
-  \else
-    \let\temp\argcheckspaces
-  \fi
-  % Put the space token in:
-  \temp#1 #3\ArgTerm
+% will have two active spaces as part of the argument with the
+% `itemize'.  Here we remove all active spaces from #1, and assign the
+% result to \toks0.
+%
+% This loses if there are any *other* active characters besides spaces
+% in the argument -- _ ^ +, for example -- since they get expanded.
+% Fortunately, Texinfo does not define any such commands.  (If it ever
+% does, the catcode of the characters in questionwill have to be changed
+% here.)  But this means we cannot call \removeactivespaces as part of
+% \argremovec{,omment}, since @c uses \parsearg, and thus the argument
+% that \parsearg gets might well have any character at all in it.
+%
+\def\removeactivespaces#1{%
+  \begingroup
+    \ignoreactivespaces
+    \edef\temp{#1}%
+    \global\toks0 = \expandafter{\temp}%
+  \endgroup
 }
 
-% If a _delimited_ argument is enclosed in braces, they get stripped; so
-% to get _exactly_ the rest of the line, we had to prevent such situation.
-% We prepended an \empty token at the very beginning and we expand it now,
-% just before passing the control to \next.
-% (Similarily, we have to think about #3 of \argcheckspacesY above: it is
-% either the null string, or it ends with \^^M---thus there is no danger
-% that a pair of braces would be stripped.
-%
-% But first, we have to remove the trailing space token.
-%
-\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}}
-
-% \parseargdef\foo{...}
-%	is roughly equivalent to
-% \def\foo{\parsearg\Xfoo}
-% \def\Xfoo#1{...}
+% Change the active space to expand to nothing.
 %
-% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my
-% favourite TeX trick.  --kasal, 16nov03
-
-\def\parseargdef#1{%
-  \expandafter \doparseargdef \csname\string#1\endcsname #1%
-}
-\def\doparseargdef#1#2{%
-  \def#2{\parsearg#1}%
-  \def#1##1%
-}
-
-% Several utility definitions with active space:
-{
+\begingroup
   \obeyspaces
-  \gdef\obeyedspace{ }
-
-  % Make each space character in the input produce a normal interword
-  % space in the output.  Don't allow a line break at this space, as this
-  % is used only in environments like @example, where each line of input
-  % should produce a line of output anyway.
-  %
-  \gdef\sepspaces{\obeyspaces\let =\tie}
-
-  % If an index command is used in an @example environment, any spaces
-  % therein should become regular spaces in the raw index file, not the
-  % expansion of \tie (\leavevmode \penalty \@M \ ).
-  \gdef\unsepspaces{\let =\space}
-}
+  \gdef\ignoreactivespaces{\obeyspaces\let =\empty}
+\endgroup
 
 
 \def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next}
 
-% Define the framework for environments in texinfo.tex.  It's used like this:
-% 
-%   \envdef\foo{...}
-%   \def\Efoo{...}
-%   
-% It's the responsibility of \envdef to insert \begingroup before the
-% actual body; @end closes the group after calling \Efoo.  \envdef also
-% defines \thisenv, so the current environment is known; @end checks
-% whether the environment name matches.  The \checkenv macro can also be
-% used to check whether the current environment is the one expected.
-% 
-% Non-false conditionals (@iftex, @ifset) don't fit into this, so they
-% are not treated as enviroments; they don't open a group.  (The
-% implementation of @end takes care not to call \endgroup in this
-% special case.)
+%% These are used to keep @begin/@end levels from running away
+%% Call \inENV within environments (after a \begingroup)
+\newif\ifENV \ENVfalse \def\inENV{\ifENV\relax\else\ENVtrue\fi}
+\def\ENVcheck{%
+\ifENV\errmessage{Still within an environment; press RETURN to continue}
+\endgroup\fi} % This is not perfect, but it should reduce lossage
 
+% @begin foo  is the same as @foo, for now.
+\newhelp\EMsimple{Press RETURN to continue.}
 
-% At runtime, environments start with this:
-\def\startenvironment#1{\begingroup\def\thisenv{#1}}
-% initialize
-\let\thisenv\empty
+\outer\def\begin{\parsearg\beginxxx}
 
-% ... but they get defined via ``\envdef\foo{...}'':
-\long\def\envdef#1#2{\def#1{\startenvironment#1#2}}
-\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
+\def\beginxxx #1{%
+\expandafter\ifx\csname #1\endcsname\relax
+{\errhelp=\EMsimple \errmessage{Undefined command @begin #1}}\else
+\csname #1\endcsname\fi}
 
-% Check whether we're in the right environment:
-\def\checkenv#1{%
-  \def\temp{#1}%
-  \ifx\thisenv\temp
+% @end foo executes the definition of \Efoo.
+%
+\def\end{\parsearg\endxxx}
+\def\endxxx #1{%
+  \removeactivespaces{#1}%
+  \edef\endthing{\the\toks0}%
+  %
+  \expandafter\ifx\csname E\endthing\endcsname\relax
+    \expandafter\ifx\csname \endthing\endcsname\relax
+      % There's no \foo, i.e., no ``environment'' foo.
+      \errhelp = \EMsimple
+      \errmessage{Undefined command `@end \endthing'}%
+    \else
+      \unmatchedenderror\endthing
+    \fi
   \else
-    \badenverr
+    % Everything's ok; the right environment has been started.
+    \csname E\endthing\endcsname
   \fi
 }
 
-% Evironment mismatch, #1 expected:
-\def\badenverr{%
+% There is an environment #1, but it hasn't been started.  Give an error.
+%
+\def\unmatchedenderror#1{%
   \errhelp = \EMsimple
-  \errmessage{This command can appear only \inenvironment\temp,
-    not \inenvironment\thisenv}%
-}
-\def\inenvironment#1{%
-  \ifx#1\empty
-    out of any environment%
-  \else
-    in environment \expandafter\string#1%
-  \fi
+  \errmessage{This `@end #1' doesn't have a matching `@#1'}%
 }
 
-% @end foo executes the definition of \Efoo.
-% But first, it executes a specialized version of \checkenv
+% Define the control sequence \E#1 to give an unmatched @end error.
 %
-\parseargdef\end{%
-  \if 1\csname iscond.#1\endcsname
-  \else
-    % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03
-    \expandafter\checkenv\csname#1\endcsname
-    \csname E#1\endcsname
-    \endgroup
-  \fi
+\def\defineunmatchedend#1{%
+  \expandafter\def\csname E#1\endcsname{\unmatchedenderror{#1}}%
 }
 
-\newhelp\EMsimple{Press RETURN to continue.}
 
+% Single-spacing is done by various environments (specifically, in
+% \nonfillstart and \quotations).
+\newskip\singlespaceskip \singlespaceskip = 12.5pt
+\def\singlespace{%
+  % Why was this kern here?  It messes up equalizing space above and below
+  % environments.  --karl, 6may93
+  %{\advance \baselineskip by -\singlespaceskip
+  %\kern \baselineskip}%
+  \setleading \singlespaceskip
+}
 
 %% Simple single-character @ commands
 
@@ -562,22 +453,16 @@
 \let\{=\mylbrace
 \let\}=\myrbrace
 \begingroup
-  % Definitions to produce \{ and \} commands for indices,
-  % and @{ and @} for the aux file.
-  \catcode`\{ = \other \catcode`\} = \other
+  % Definitions to produce actual \{ & \} command in an index.
+  \catcode`\{ = 12 \catcode`\} = 12
   \catcode`\[ = 1 \catcode`\] = 2
-  \catcode`\! = 0 \catcode`\\ = \other
-  !gdef!lbracecmd[\{]%
-  !gdef!rbracecmd[\}]%
-  !gdef!lbraceatcmd[@{]%
-  !gdef!rbraceatcmd[@}]%
-!endgroup
-
-% @comma{} to avoid , parsing problems.
-\let\comma = ,
+  \catcode`\@ = 0 \catcode`\\ = 12
+  @gdef@lbracecmd[\{]%
+  @gdef@rbracecmd[\}]%
+@endgroup
 
 % Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
-% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
+% Others are defined by plain TeX: @` @' @" @^ @~ @= @v @H.
 \let\, = \c
 \let\dotaccent = \.
 \def\ringaccent#1{{\accent23 #1}}
@@ -585,12 +470,10 @@
 \let\ubaraccent = \b
 \let\udotaccent = \d
 
-% Other special characters: @questiondown @exclamdown @ordf @ordm
-% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
+% Other special characters: @questiondown @exclamdown
+% Plain TeX defines: @AA @AE @O @OE @L (and lowercase versions) @ss.
 \def\questiondown{?`}
 \def\exclamdown{!`}
-\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
-\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
 
 % Dotless i and dotless j, used for accents.
 \def\imacro{i}
@@ -603,25 +486,6 @@
   \fi\fi
 }
 
-% The \TeX{} logo, as in plain, but resetting the spacing so that a
-% period following counts as ending a sentence.  (Idea found in latex.)
-% 
-\edef\TeX{\TeX \spacefactor=3000 }
-
-% @LaTeX{} logo.  Not quite the same results as the definition in
-% latex.ltx, since we use a different font for the raised A; it's most
-% convenient for us to use an explicitly smaller font, rather than using
-% the \scriptstyle font (since we don't reset \scriptstyle and
-% \scriptscriptstyle).
-% 
-\def\LaTeX{%
-  L\kern-.36em
-  {\setbox0=\hbox{T}%
-   \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}%
-  \kern-.15em
-  \TeX
-}
-
 % Be sure we're in horizontal mode when doing a tie, since we make space
 % equivalent to this in @example-like environments. Otherwise, a space
 % at the beginning of a line will start with \penalty -- and
@@ -640,9 +504,6 @@
 % @* forces a line break.
 \def\*{\hfil\break\hbox{}\ignorespaces}
 
-% @/ allows a line break.
-\let\/=\allowbreak
-
 % @. is an end-of-sentence period.
 \def\.{.\spacefactor=3000 }
 
@@ -665,24 +526,47 @@
 % therefore, no glue is inserted, and the space between the headline and
 % the text is small, which looks bad.
 %
-% Another complication is that the group might be very large.  This can
-% cause the glue on the previous page to be unduly stretched, because it
-% does not have much material.  In this case, it's better to add an
-% explicit \vfill so that the extra space is at the bottom.  The
-% threshold for doing this is if the group is more than \vfilllimit
-% percent of a page (\vfilllimit can be changed inside of @tex).
-%
-\newbox\groupbox
-\def\vfilllimit{0.7}
-%
-\envdef\group{%
-  \ifnum\catcode`\^^M=\active \else
+\def\group{\begingroup
+  \ifnum\catcode13=\active \else
     \errhelp = \groupinvalidhelp
     \errmessage{@group invalid in context where filling is enabled}%
   \fi
-  \startsavinginserts
   %
-  \setbox\groupbox = \vtop\bgroup
+  % The \vtop we start below produces a box with normal height and large
+  % depth; thus, TeX puts \baselineskip glue before it, and (when the
+  % next line of text is done) \lineskip glue after it.  (See p.82 of
+  % the TeXbook.)  Thus, space below is not quite equal to space
+  % above.  But it's pretty close.
+  \def\Egroup{%
+    \egroup           % End the \vtop.
+    \endgroup         % End the \group.
+  }%
+  %
+  \vtop\bgroup
+    % We have to put a strut on the last line in case the @group is in
+    % the midst of an example, rather than completely enclosing it.
+    % Otherwise, the interline space between the last line of the group
+    % and the first line afterwards is too small.  But we can't put the
+    % strut in \Egroup, since there it would be on a line by itself.
+    % Hence this just inserts a strut at the beginning of each line.
+    \everypar = {\strut}%
+    %
+    % Since we have a strut on every line, we don't need any of TeX's
+    % normal interline spacing.
+    \offinterlineskip
+    %
+    % OK, but now we have to do something about blank
+    % lines in the input in @example-like environments, which normally
+    % just turn into \lisppar, which will insert no space now that we've
+    % turned off the interline space.  Simplest is to make them be an
+    % empty paragraph.
+    \ifx\par\lisppar
+      \edef\par{\leavevmode \par}%
+      %
+      % Reset ^^M's definition to new definition of \par.
+      \obeylines
+    \fi
+    %
     % Do @comment since we are called inside an environment such as
     % @example, where each end-of-line in the input causes an
     % end-of-line in the output.  We don't want the end-of-line after
@@ -692,32 +576,6 @@
     \comment
 }
 %
-% The \vtop produces a box with normal height and large depth; thus, TeX puts
-% \baselineskip glue before it, and (when the next line of text is done)
-% \lineskip glue after it.  Thus, space below is not quite equal to space
-% above.  But it's pretty close.
-\def\Egroup{%
-    % To get correct interline space between the last line of the group
-    % and the first line afterwards, we have to propagate \prevdepth.
-    \endgraf % Not \par, as it may have been set to \lisppar.
-    \global\dimen1 = \prevdepth
-  \egroup           % End the \vtop.
-  % \dimen0 is the vertical size of the group's box.
-  \dimen0 = \ht\groupbox  \advance\dimen0 by \dp\groupbox
-  % \dimen2 is how much space is left on the page (more or less).
-  \dimen2 = \pageheight   \advance\dimen2 by -\pagetotal
-  % if the group doesn't fit on the current page, and it's a big big
-  % group, force a page break.
-  \ifdim \dimen0 > \dimen2
-    \ifdim \pagetotal < \vfilllimit\pageheight
-      \page
-    \fi
-  \fi
-  \box\groupbox
-  \prevdepth = \dimen1
-  \checkinserts
-}
-%
 % TeX puts in an \escapechar (i.e., `@') at the beginning of the help
 % message, so this ends up printing `@group can only ...'.
 %
@@ -730,8 +588,10 @@ where each line of input produces a line of output.}
 
 \newdimen\mil  \mil=0.001in
 
+\def\need{\parsearg\needx}
+
 % Old definition--didn't work.
-%\parseargdef\need{\par %
+%\def\needx #1{\par %
 %% This method tries to make TeX break the page naturally
 %% if the depth of the box does not fit.
 %{\baselineskip=0pt%
@@ -739,7 +599,7 @@ where each line of input produces a line of output.}
 %\prevdepth=-1000pt
 %}}
 
-\parseargdef\need{%
+\def\needx#1{%
   % Ensure vertical mode, so we don't make a big box in the middle of a
   % paragraph.
   \par
@@ -778,11 +638,37 @@ where each line of input produces a line of output.}
   \fi
 }
 
-% @br   forces paragraph break (and is undocumented).
+% @br   forces paragraph break
 
 \let\br = \par
 
-% @page forces the start of a new page.
+% @dots{} output an ellipsis using the current font.
+% We do .5em per period so that it has the same spacing in a typewriter
+% font as three actual period characters.
+%
+\def\dots{%
+  \leavevmode
+  \hbox to 1.5em{%
+    \hskip 0pt plus 0.25fil minus 0.25fil
+    .\hss.\hss.%
+    \hskip 0pt plus 0.5fil minus 0.5fil
+  }%
+}
+
+% @enddots{} is an end-of-sentence ellipsis.
+%
+\def\enddots{%
+  \leavevmode
+  \hbox to 2em{%
+    \hskip 0pt plus 0.25fil minus 0.25fil
+    .\hss.\hss.\hss.%
+    \hskip 0pt plus 0.5fil minus 0.5fil
+  }%
+  \spacefactor=3000
+}
+
+
+% @page    forces the start of a new page
 %
 \def\page{\par\vfill\supereject}
 
@@ -794,127 +680,57 @@ where each line of input produces a line of output.}
 \newskip\exdentamount
 
 % This defn is used inside fill environments such as @defun.
-\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}
+\def\exdent{\parsearg\exdentyyy}
+\def\exdentyyy #1{{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}}
 
 % This defn is used inside nofill environments such as @example.
-\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount
-  \leftline{\hskip\leftskip{\rm#1}}}}
+\def\nofillexdent{\parsearg\nofillexdentyyy}
+\def\nofillexdentyyy #1{{\advance \leftskip by -\exdentamount
+\leftline{\hskip\leftskip{\rm#1}}}}
 
-% @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
-% paragraph.  For more general purposes, use the \margin insertion
-% class.  WHICH is `l' or `r'.
-%
+% @inmargin{TEXT} puts TEXT in the margin next to the current paragraph.
+
+\def\inmargin#1{%
+\strut\vadjust{\nobreak\kern-\strutdepth
+  \vtop to \strutdepth{\baselineskip\strutdepth\vss
+  \llap{\rightskip=\inmarginspacing \vbox{\noindent #1}}\null}}}
 \newskip\inmarginspacing \inmarginspacing=1cm
 \def\strutdepth{\dp\strutbox}
-%
-\def\doinmargin#1#2{\strut\vadjust{%
-  \nobreak
-  \kern-\strutdepth
-  \vtop to \strutdepth{%
-    \baselineskip=\strutdepth
-    \vss
-    % if you have multiple lines of stuff to put here, you'll need to
-    % make the vbox yourself of the appropriate size.
-    \ifx#1l%
-      \llap{\ignorespaces #2\hskip\inmarginspacing}%
-    \else
-      \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}%
-    \fi
-    \null
-  }%
-}}
-\def\inleftmargin{\doinmargin l}
-\def\inrightmargin{\doinmargin r}
-%
-% @inmargin{TEXT [, RIGHT-TEXT]}
-% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right;
-% else use TEXT for both).
-%
-\def\inmargin#1{\parseinmargin #1,,\finish}
-\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing.
-  \setbox0 = \hbox{\ignorespaces #2}%
-  \ifdim\wd0 > 0pt
-    \def\lefttext{#1}%  have both texts
-    \def\righttext{#2}%
-  \else
-    \def\lefttext{#1}%  have only one text
-    \def\righttext{#1}%
-  \fi
-  %
-  \ifodd\pageno
-    \def\temp{\inrightmargin\righttext}% odd page -> outside is right margin
-  \else
-    \def\temp{\inleftmargin\lefttext}%
-  \fi
-  \temp
-}
+
+%\hbox{{\rm#1}}\hfil\break}}
 
 % @include file    insert text of that file as input.
-%
-\def\include{\parseargusing\filenamecatcodes\includezzz}
-\def\includezzz#1{%
-  \pushthisfilestack
+% Allow normal characters that  we make active in the argument (a file name).
+\def\include{\begingroup
+  \catcode`\\=12
+  \catcode`~=12
+  \catcode`^=12
+  \catcode`_=12
+  \catcode`|=12
+  \catcode`<=12
+  \catcode`>=12
+  \catcode`+=12
+  \parsearg\includezzz}
+% Restore active chars for included file.
+\def\includezzz#1{\endgroup\begingroup
+  % Read the included file in a group so nested @include's work.
   \def\thisfile{#1}%
-  {%
-    \makevalueexpandable
-    \def\temp{\input #1 }%
-    \expandafter
-  }\temp
-  \popthisfilestack
-}
-\def\filenamecatcodes{%
-  \catcode`\\=\other
-  \catcode`~=\other
-  \catcode`^=\other
-  \catcode`_=\other
-  \catcode`|=\other
-  \catcode`<=\other
-  \catcode`>=\other
-  \catcode`+=\other
-  \catcode`-=\other
-}
-
-\def\pushthisfilestack{%
-  \expandafter\pushthisfilestackX\popthisfilestack\StackTerm
-}
-\def\pushthisfilestackX{%
-  \expandafter\pushthisfilestackY\thisfile\StackTerm
-}
-\def\pushthisfilestackY #1\StackTerm #2\StackTerm {%
-  \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}%
-}
-
-\def\popthisfilestack{\errthisfilestackempty}
-\def\errthisfilestackempty{\errmessage{Internal error:
-  the stack of filenames is empty.}}
+  \input\thisfile
+\endgroup}
 
 \def\thisfile{}
 
-% @center line
-% outputs that line, centered.
-%
-\parseargdef\center{%
-  \ifhmode
-    \let\next\centerH
-  \else
-    \let\next\centerV
-  \fi
-  \next{\hfil \ignorespaces#1\unskip \hfil}%
-}
-\def\centerH#1{%
-  {%
-    \hfil\break
-    \advance\hsize by -\leftskip
-    \advance\hsize by -\rightskip
-    \line{#1}%
-    \break
-  }%
-}
-\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
+% @center line   outputs that line, centered
+
+\def\center{\parsearg\centerzzz}
+\def\centerzzz #1{{\advance\hsize by -\leftskip
+\advance\hsize by -\rightskip
+\centerline{#1}}}
 
 % @sp n   outputs n lines of vertical space
 
-\parseargdef\sp{\vskip #1\baselineskip}
+\def\sp{\parsearg\spxxx}
+\def\spxxx #1{\vskip #1\baselineskip}
 
 % @comment ...line which is ignored...
 % @c is the same as @comment
@@ -929,13 +745,13 @@ where each line of input produces a line of output.}
 
 % @paragraphindent NCHARS
 % We'll use ems for NCHARS, close enough.
-% NCHARS can also be the word `asis' or `none'.
-% We cannot feasibly implement @paragraphindent asis, though.
-%
+% We cannot implement @paragraphindent asis, though.
+% 
 \def\asisword{asis} % no translation, these are keywords
 \def\noneword{none}
 %
-\parseargdef\paragraphindent{%
+\def\paragraphindent{\parsearg\doparagraphindent}
+\def\doparagraphindent#1{%
   \def\temp{#1}%
   \ifx\temp\asisword
   \else
@@ -952,7 +768,8 @@ where each line of input produces a line of output.}
 % We'll use ems for NCHARS like @paragraphindent.
 % It seems @exampleindent asis isn't necessary, but
 % I preserve it to make it similar to @paragraphindent.
-\parseargdef\exampleindent{%
+\def\exampleindent{\parsearg\doexampleindent}
+\def\doexampleindent#1{%
   \def\temp{#1}%
   \ifx\temp\asisword
   \else
@@ -964,138 +781,26 @@ where each line of input produces a line of output.}
   \fi
 }
 
-% @firstparagraphindent WORD
-% If WORD is `none', then suppress indentation of the first paragraph
-% after a section heading.  If WORD is `insert', then do indent at such
-% paragraphs.
-%
-% The paragraph indentation is suppressed or not by calling
-% \suppressfirstparagraphindent, which the sectioning commands do.
-% We switch the definition of this back and forth according to WORD.
-% By default, we suppress indentation.
-%
-\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
-\def\insertword{insert}
-%
-\parseargdef\firstparagraphindent{%
-  \def\temp{#1}%
-  \ifx\temp\noneword
-    \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent
-  \else\ifx\temp\insertword
-    \let\suppressfirstparagraphindent = \relax
-  \else
-    \errhelp = \EMsimple
-    \errmessage{Unknown @firstparagraphindent option `\temp'}%
-  \fi\fi
-}
-
-% Here is how we actually suppress indentation.  Redefine \everypar to
-% \kern backwards by \parindent, and then reset itself to empty.
-%
-% We also make \indent itself not actually do anything until the next
-% paragraph.
-%
-\gdef\dosuppressfirstparagraphindent{%
-  \gdef\indent{%
-    \restorefirstparagraphindent
-    \indent
-  }%
-  \gdef\noindent{%
-    \restorefirstparagraphindent
-    \noindent
-  }%
-  \global\everypar = {%
-    \kern -\parindent
-    \restorefirstparagraphindent
-  }%
-}
-
-\gdef\restorefirstparagraphindent{%
-  \global \let \indent = \ptexindent
-  \global \let \noindent = \ptexnoindent
-  \global \everypar = {}%
-}
-
-
 % @asis just yields its argument.  Used with @table, for example.
 %
 \def\asis#1{#1}
 
-% @math outputs its argument in math mode.
+% @math means output in math mode.
+% We don't use $'s directly in the definition of \math because control
+% sequences like \math are expanded when the toc file is written.  Then,
+% we read the toc file back, the $'s will be normal characters (as they
+% should be, according to the definition of Texinfo).  So we must use a
+% control sequence to switch into and out of math mode.
 %
-% One complication: _ usually means subscripts, but it could also mean
-% an actual _ character, as in @math{@var{some_variable} + 1}.  So make
-% _ active, and distinguish by seeing if the current family is \slfam,
-% which is what @var uses.
-{
-  \catcode\underChar = \active
-  \gdef\mathunderscore{%
-    \catcode\underChar=\active
-    \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
-  }
-}
-% Another complication: we want \\ (and @\) to output a \ character.
-% FYI, plain.tex uses \\ as a temporary control sequence (why?), but
-% this is not advertised and we don't care.  Texinfo does not
-% otherwise define @\.
-%
-% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
-\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
-%
-\def\math{%
-  \tex
-  \mathunderscore
-  \let\\ = \mathbackslash
-  \mathactive
-  $\finishmath
-}
-\def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
-
-% Some active characters (such as <) are spaced differently in math.
-% We have to reset their definitions in case the @math was an argument
-% to a command which sets the catcodes (such as @item or @section).
+% This isn't quite enough for @math to work properly in indices, but it
+% seems unlikely it will ever be needed there.
 %
-{
-  \catcode`^ = \active
-  \catcode`< = \active
-  \catcode`> = \active
-  \catcode`+ = \active
-  \gdef\mathactive{%
-    \let^ = \ptexhat
-    \let< = \ptexless
-    \let> = \ptexgtr
-    \let+ = \ptexplus
-  }
-}
+\let\implicitmath = $
+\def\math#1{\implicitmath #1\implicitmath}
 
 % @bullet and @minus need the same treatment as @math, just above.
-\def\bullet{$\ptexbullet$}
-\def\minus{$-$}
-
-% @dots{} outputs an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in a typewriter
-% font as three actual period characters.
-%
-\def\dots{%
-  \leavevmode
-  \hbox to 1.5em{%
-    \hskip 0pt plus 0.25fil
-    .\hfil.\hfil.%
-    \hskip 0pt plus 0.5fil
-  }%
-}
-
-% @enddots{} is an end-of-sentence ellipsis.
-%
-\def\enddots{%
-  \dots
-  \spacefactor=3000
-}
-
-% @comma{} is so commas can be inserted into text without messing up
-% Texinfo's parsing.
-% 
-\let\comma = ,
+\def\bullet{\implicitmath\ptexbullet\implicitmath}
+\def\minus{\implicitmath-\implicitmath}
 
 % @refill is a no-op.
 \let\refill=\relax
@@ -1111,20 +816,20 @@ where each line of input produces a line of output.}
 % So open here the files we need to have open while reading the input.
 % This makes it possible to make a .fmt file for texinfo.
 \def\setfilename{%
-   \fixbackslash  % Turn off hack to swallow `\input texinfo'.
    \iflinks
-     \tryauxfile
-     % Open the new aux file.  TeX will close it automatically at exit.
-     \immediate\openout\auxfile=\jobname.aux
+     \readauxfile
    \fi % \openindices needs to do some work in any case.
    \openindices
-   \let\setfilename=\comment % Ignore extra @setfilename cmds.
+   \fixbackslash  % Turn off hack to swallow `\input texinfo'.
+   \global\let\setfilename=\comment % Ignore extra @setfilename cmds.
    %
    % If texinfo.cnf is present on the system, read it.
    % Useful for site-wide @afourpaper, etc.
+   % Just to be on the safe side, close the input stream before the \input.
    \openin 1 texinfo.cnf
-   \ifeof 1 \else \input texinfo.cnf \fi
-   \closein 1
+   \ifeof1 \let\temp=\relax \else \def\temp{\input texinfo.cnf }\fi
+   \closein1
+   \temp
    %
    \comment % Ignore the actual filename.
 }
@@ -1171,35 +876,22 @@ where each line of input produces a line of output.}
   \pdftrue
   \pdfoutput = 1
   \input pdfcolor
-  \pdfcatalog{/PageMode /UseOutlines}%
   \def\dopdfimage#1#2#3{%
     \def\imagewidth{#2}%
     \def\imageheight{#3}%
-    % without \immediate, pdftex seg faults when the same image is
-    % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
     \ifnum\pdftexversion < 14
-      \immediate\pdfimage
+      \pdfimage
     \else
-      \immediate\pdfximage
+      \pdfximage
     \fi
       \ifx\empty\imagewidth\else width \imagewidth \fi
       \ifx\empty\imageheight\else height \imageheight \fi
-      \ifnum\pdftexversion<13
-         #1.pdf%
-       \else
-         {#1.pdf}%
-       \fi
+      {#1.pdf}%
     \ifnum\pdftexversion < 14 \else
       \pdfrefximage \pdflastximage
     \fi}
-  \def\pdfmkdest#1{{%
-    % We have to set dummies so commands such as @code in a section title
-    % aren't expanded.
-    \atdummies
-    \normalturnoffactive
-    \pdfdest name{#1} xyz%
-  }}
-  \def\pdfmkpgn#1{#1}
+  \def\pdfmkdest#1{\pdfdest name{#1@} xyz}
+  \def\pdfmkpgn#1{#1@}
   \let\linkcolor = \Blue  % was Cyan, but that seems light?
   \def\endlink{\Black\pdfendlink}
   % Adding outlines to PDF; macros for calculating structure of outlines
@@ -1207,94 +899,47 @@ where each line of input produces a line of output.}
   \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
     \else \csname#1\endcsname \fi}
   \def\advancenumber#1{\tempnum=\expnumber{#1}\relax
-    \advance\tempnum by 1
+    \advance\tempnum by1
     \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
-  %
-  % #1 is the section text.  #2 is the pdf expression for the number
-  % of subentries (or empty, for subsubsections).  #3 is the node
-  % text, which might be empty if this toc entry had no
-  % corresponding node.  #4 is the page number.
-  % 
-  \def\dopdfoutline#1#2#3#4{%
-    % Generate a link to the node text if that exists; else, use the
-    % page number.  We could generate a destination for the section
-    % text in the case where a section has no node, but it doesn't
-    % seem worthwhile, since most documents are normally structured.
-    \def\pdfoutlinedest{#3}%
-    \ifx\pdfoutlinedest\empty \def\pdfoutlinedest{#4}\fi
-    %
-    \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{#1}%
-  }
-  %
-  \def\pdfmakeoutlines{%
-    \begingroup
-      % Thanh's hack / proper braces in bookmarks
+  \def\pdfmakeoutlines{{%
+    \openin 1 \jobname.toc
+    \ifeof 1\else\bgroup
+      \closein 1 
+      \indexnofonts
+      \def\tt{}
+      \let\_ = \normalunderscore
+      % Thanh's hack / proper braces in bookmarks  
       \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
       \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
       %
-      % Read toc silently, to get counts of subentries for \pdfoutline.
-      \def\numchapentry##1##2##3##4{%
-	\def\thischapnum{##2}%
-	\let\thissecnum\empty
-	\let\thissubsecnum\empty
-      }%
-      \def\numsecentry##1##2##3##4{%
-	\advancenumber{chap\thischapnum}%
-	\def\thissecnum{##2}%
-	\let\thissubsecnum\empty
-      }%
-      \def\numsubsecentry##1##2##3##4{%
-	\advancenumber{sec\thissecnum}%
-	\def\thissubsecnum{##2}%
-      }%
-      \def\numsubsubsecentry##1##2##3##4{%
-	\advancenumber{subsec\thissubsecnum}%
-      }%
-      \let\thischapnum\empty
-      \let\thissecnum\empty
-      \let\thissubsecnum\empty
-      %
-      % use \def rather than \let here because we redefine \chapentry et
-      % al. a second time, below.
-      \def\appentry{\numchapentry}%
-      \def\appsecentry{\numsecentry}%
-      \def\appsubsecentry{\numsubsecentry}%
-      \def\appsubsubsecentry{\numsubsubsecentry}%
-      \def\unnchapentry{\numchapentry}%
-      \def\unnsecentry{\numsecentry}%
-      \def\unnsubsecentry{\numsubsecentry}%
-      \def\unnsubsubsecentry{\numsubsubsecentry}%
+      \def\chapentry ##1##2##3{}
+      \def\unnumbchapentry ##1##2{}
+      \def\secentry ##1##2##3##4{\advancenumber{chap##2}}
+      \def\unnumbsecentry ##1##2{}
+      \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}}
+      \def\unnumbsubsecentry ##1##2{}
+      \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}}
+      \def\unnumbsubsubsecentry ##1##2{}
       \input \jobname.toc
-      %
-      % Read toc second time, this time actually producing the outlines.
-      % The `-' means take the \expnumber as the absolute number of
-      % subentries, which we calculated on our first read of the .toc above.
-      % 
-      % We use the node names as the destinations.
-      \def\numchapentry##1##2##3##4{%
-        \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}%
-      \def\numsecentry##1##2##3##4{%
-        \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}%
-      \def\numsubsecentry##1##2##3##4{%
-        \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}%
-      \def\numsubsubsecentry##1##2##3##4{% count is always zero
-        \dopdfoutline{##1}{}{##3}{##4}}%
-      %
-      % PDF outlines are displayed using system fonts, instead of
-      % document fonts.  Therefore we cannot use special characters,
-      % since the encoding is unknown.  For example, the eogonek from
-      % Latin 2 (0xea) gets translated to a | character.  Info from
-      % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
-      % 
-      % xx to do this right, we have to translate 8-bit characters to
-      % their "best" equivalent, based on the @documentencoding.  Right
-      % now, I guess we'll just let the pdf reader have its way.
-      \indexnofonts
-      \turnoffactive
+      \def\chapentry ##1##2##3{%
+        \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}}
+      \def\unnumbchapentry ##1##2{%
+        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
+      \def\secentry ##1##2##3##4{%
+        \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}}
+      \def\unnumbsecentry ##1##2{%
+        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
+      \def\subsecentry ##1##2##3##4##5{%
+        \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}}
+      \def\unnumbsubsecentry ##1##2{%
+        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
+      \def\subsubsecentry ##1##2##3##4##5##6{%
+        \pdfoutline goto name{\pdfmkpgn{##6}}{##1}}
+      \def\unnumbsubsubsecentry ##1##2{%
+        \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
       \input \jobname.toc
-    \endgroup
-  }
-  %
+    \egroup\fi
+  }}
   \def\makelinks #1,{%
     \def\params{#1}\def\E{END}%
     \ifx\params\E
@@ -1303,7 +948,7 @@ where each line of input produces a line of output.}
       \let\nextmakelinks=\makelinks
       \ifnum\lnkcount>0,\fi
       \picknum{#1}%
-      \startlink attr{/Border [0 0 0]}
+      \startlink attr{/Border [0 0 0]} 
         goto name{\pdfmkpgn{\the\pgn}}%
       \linkcolor #1%
       \advance\lnkcount by 1%
@@ -1325,6 +970,7 @@ where each line of input produces a line of output.}
   \def\ppn#1{\pgn=#1\gobble}
   \def\ppnn{\pgn=\first}
   \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
+  \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
     \ifx\PP\D\let\nextsp\relax
     \else\let\nextsp\skipspaces
@@ -1342,21 +988,21 @@ where each line of input produces a line of output.}
   \def\pdfurl#1{%
     \begingroup
       \normalturnoffactive\def\@{@}%
-      \makevalueexpandable
       \leavevmode\Red
       \startlink attr{/Border [0 0 0]}%
         user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
+        % #1
     \endgroup}
   \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
   \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
   \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
   \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
   \def\maketoks{%
-    \expandafter\poptoks\the\toksA|ENDTOKS|\relax
+    \expandafter\poptoks\the\toksA|ENDTOKS|
     \ifx\first0\adn0
     \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
     \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
-    \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9
+    \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9 
     \else
       \ifnum0=\countA\else\makelink\fi
       \ifx\first.\let\next=\done\else
@@ -1369,62 +1015,28 @@ where each line of input produces a line of output.}
   \def\makelink{\addtokens{\toksB}%
     {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
   \def\pdflink#1{%
-    \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
+    \startlink attr{/Border [0 0 0]} goto name{\mkpgn{#1}}
     \linkcolor #1\endlink}
+  \def\mkpgn#1{#1@} 
   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
 \fi % \ifx\pdfoutput
 
 
 \message{fonts,}
-
-% Change the current font style to #1, remembering it in \curfontstyle.
-% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
-% italics, not bold italics.
-% 
-\def\setfontstyle#1{%
-  \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
-  \csname ten#1\endcsname  % change the current font
-}
-
-% Select #1 fonts with the current style.
-% 
-\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname}
-
-\def\rm{\fam=0 \setfontstyle{rm}}
-\def\it{\fam=\itfam \setfontstyle{it}}
-\def\sl{\fam=\slfam \setfontstyle{sl}}
-\def\bf{\fam=\bffam \setfontstyle{bf}}
-\def\tt{\fam=\ttfam \setfontstyle{tt}}
+% Font-change commands.
 
 % Texinfo sort of supports the sans serif font style, which plain TeX does not.
-% So we set up a \sf.
+% So we set up a \sf analogous to plain's \rm, etc.
 \newfam\sffam
-\def\sf{\fam=\sffam \setfontstyle{sf}}
+\def\sf{\fam=\sffam \tensf}
 \let\li = \sf % Sometimes we call it \li, not \sf.
 
-% We don't need math for this font style.
-\def\ttsl{\setfontstyle{ttsl}}
+% We don't need math for this one.
+\def\ttsl{\tenttsl}
 
-% Default leading.
-\newdimen\textleading  \textleading = 13.2pt
-
-% Set the baselineskip to #1, and the lineskip and strut size
-% correspondingly.  There is no deep meaning behind these magic numbers
-% used as factors; they just match (closely enough) what Knuth defined.
-%
-\def\lineskipfactor{.08333}
-\def\strutheightpercent{.70833}
-\def\strutdepthpercent {.29167}
-%
-\def\setleading#1{%
-  \normalbaselineskip = #1\relax
-  \normallineskip = \lineskipfactor\normalbaselineskip
-  \normalbaselines
-  \setbox\strutbox =\hbox{%
-    \vrule width0pt height\strutheightpercent\baselineskip
-                    depth \strutdepthpercent \baselineskip
-  }%
-}
+% Use Computer Modern fonts at \magstephalf (11pt).
+\newcount\mainmagstep
+\mainmagstep=\magstephalf
 
 % Set the font macro #1 to the font named #2, adding on the
 % specified font prefix (normally `cm').
@@ -1454,18 +1066,17 @@ where each line of input produces a line of output.}
 \def\scshape{csc}
 \def\scbshape{csc}
 
-% Text fonts (11.2pt, magstep1).
-\newcount\mainmagstep
 \ifx\bigger\relax
-  % not really supported.
-  \mainmagstep=\magstep1
-  \setfont\textrm\rmshape{12}{1000}
-  \setfont\texttt\ttshape{12}{1000}
+\let\mainmagstep=\magstep1
+\setfont\textrm\rmshape{12}{1000}
+\setfont\texttt\ttshape{12}{1000}
 \else
-  \mainmagstep=\magstephalf
-  \setfont\textrm\rmshape{10}{\mainmagstep}
-  \setfont\texttt\ttshape{10}{\mainmagstep}
+\setfont\textrm\rmshape{10}{\mainmagstep}
+\setfont\texttt\ttshape{10}{\mainmagstep}
 \fi
+% Instead of cmb10, you many want to use cmbx10.
+% cmbx10 is a prettier font on its own, but cmb10
+% looks better when embedded in a line with cmr10.
 \setfont\textbf\bfshape{10}{\mainmagstep}
 \setfont\textit\itshape{10}{\mainmagstep}
 \setfont\textsl\slshape{10}{\mainmagstep}
@@ -1475,11 +1086,10 @@ where each line of input produces a line of output.}
 \font\texti=cmmi10 scaled \mainmagstep
 \font\textsy=cmsy10 scaled \mainmagstep
 
-% A few fonts for @defun names and args.
-\setfont\defbf\bfshape{10}{\magstep1}
+% A few fonts for @defun, etc.
+\setfont\defbf\bxshape{10}{\magstep1} %was 1314
 \setfont\deftt\ttshape{10}{\magstep1}
-\setfont\defttsl\ttslshape{10}{\magstep1}
-\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf}
 
 % Fonts for indices, footnotes, small examples (9pt).
 \setfont\smallrm\rmshape{9}{1000}
@@ -1493,19 +1103,7 @@ where each line of input produces a line of output.}
 \font\smalli=cmmi9
 \font\smallsy=cmsy9
 
-% Fonts for small examples (8pt).
-\setfont\smallerrm\rmshape{8}{1000}
-\setfont\smallertt\ttshape{8}{1000}
-\setfont\smallerbf\bfshape{10}{800}
-\setfont\smallerit\itshape{8}{1000}
-\setfont\smallersl\slshape{8}{1000}
-\setfont\smallersf\sfshape{8}{1000}
-\setfont\smallersc\scshape{10}{800}
-\setfont\smallerttsl\ttslshape{10}{800}
-\font\smalleri=cmmi8
-\font\smallersy=cmsy8
-
-% Fonts for title page (20.4pt):
+% Fonts for title page:
 \setfont\titlerm\rmbshape{12}{\magstep3}
 \setfont\titleit\itbshape{10}{\magstep4}
 \setfont\titlesl\slbshape{10}{\magstep4}
@@ -1517,7 +1115,6 @@ where each line of input produces a line of output.}
 \font\titlei=cmmi12 scaled \magstep3
 \font\titlesy=cmsy10 scaled \magstep4
 \def\authorrm{\secrm}
-\def\authortt{\sectt}
 
 % Chapter (and unnumbered) fonts (17.28pt).
 \setfont\chaprm\rmbshape{12}{\magstep2}
@@ -1543,6 +1140,20 @@ where each line of input produces a line of output.}
 \font\seci=cmmi12 scaled \magstep1
 \font\secsy=cmsy10 scaled \magstep2
 
+% \setfont\ssecrm\bxshape{10}{\magstep1}    % This size an font looked bad.
+% \setfont\ssecit\itshape{10}{\magstep1}    % The letters were too crowded.
+% \setfont\ssecsl\slshape{10}{\magstep1}
+% \setfont\ssectt\ttshape{10}{\magstep1}
+% \setfont\ssecsf\sfshape{10}{\magstep1}
+
+%\setfont\ssecrm\bfshape{10}{1315}      % Note the use of cmb rather than cmbx.
+%\setfont\ssecit\itshape{10}{1315}      % Also, the size is a little larger than
+%\setfont\ssecsl\slshape{10}{1315}      % being scaled magstep1.
+%\setfont\ssectt\ttshape{10}{1315}
+%\setfont\ssecsf\sfshape{10}{1315}
+
+%\let\ssecbf=\ssecrm
+
 % Subsection fonts (13.15pt).
 \setfont\ssecrm\rmbshape{12}{\magstephalf}
 \setfont\ssecit\itbshape{10}{1315}
@@ -1551,124 +1162,69 @@ where each line of input produces a line of output.}
 \setfont\ssecttsl\ttslshape{10}{1315}
 \setfont\ssecsf\sfbshape{12}{\magstephalf}
 \let\ssecbf\ssecrm
-\setfont\ssecsc\scbshape{10}{1315}
+\setfont\ssecsc\scbshape{10}{\magstep1}
 \font\sseci=cmmi12 scaled \magstephalf
 \font\ssecsy=cmsy10 scaled 1315
-
-% Reduced fonts for @acro in text (10pt).
-\setfont\reducedrm\rmshape{10}{1000}
-\setfont\reducedtt\ttshape{10}{1000}
-\setfont\reducedbf\bfshape{10}{1000}
-\setfont\reducedit\itshape{10}{1000}
-\setfont\reducedsl\slshape{10}{1000}
-\setfont\reducedsf\sfshape{10}{1000}
-\setfont\reducedsc\scshape{10}{1000}
-\setfont\reducedttsl\ttslshape{10}{1000}
-\font\reducedi=cmmi10
-\font\reducedsy=cmsy10
+% The smallcaps and symbol fonts should actually be scaled \magstep1.5,
+% but that is not a standard magnification.
 
 % In order for the font changes to affect most math symbols and letters,
 % we have to define the \textfont of the standard families.  Since
-% texinfo doesn't allow for producing subscripts and superscripts except
-% in the main text, we don't bother to reset \scriptfont and
-% \scriptscriptfont (which would also require loading a lot more fonts).
+% texinfo doesn't allow for producing subscripts and superscripts, we
+% don't bother to reset \scriptfont and \scriptscriptfont (which would
+% also require loading a lot more fonts).
 %
 \def\resetmathfonts{%
-  \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy
-  \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf
-  \textfont\ttfam=\tentt \textfont\sffam=\tensf
+  \textfont0 = \tenrm \textfont1 = \teni \textfont2 = \tensy
+  \textfont\itfam = \tenit \textfont\slfam = \tensl \textfont\bffam = \tenbf
+  \textfont\ttfam = \tentt \textfont\sffam = \tensf
 }
 
+
 % The font-changing commands redefine the meanings of \tenSTYLE, instead
-% of just \STYLE.  We do this because \STYLE needs to also set the
-% current \fam for math mode.  Our \STYLE (e.g., \rm) commands hardwire
-% \tenSTYLE to set the current font.
-% 
-% Each font-changing command also sets the names \lsize (one size lower)
-% and \lllsize (three sizes lower).  These relative commands are used in
-% the LaTeX logo and acronyms.
-% 
-% This all needs generalizing, badly.
-% 
+% of just \STYLE.  We do this so that font changes will continue to work
+% in math mode, where it is the current \fam that is relevant in most
+% cases, not the current font.  Plain TeX does \def\bf{\fam=\bffam
+% \tenbf}, for example.  By redefining \tenbf, we obviate the need to
+% redefine \bf itself.
 \def\textfonts{%
   \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
   \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
-  \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
-  \let\tenttsl=\textttsl
-  \def\lsize{reduced}\def\lllsize{smaller}%
-  \resetmathfonts \setleading{\textleading}}
+  \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy \let\tenttsl=\textttsl
+  \resetmathfonts}
 \def\titlefonts{%
   \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
   \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
   \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
   \let\tenttsl=\titlettsl
-  \def\lsize{chap}\def\lllsize{subsec}%
   \resetmathfonts \setleading{25pt}}
 \def\titlefont#1{{\titlefonts\rm #1}}
 \def\chapfonts{%
   \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
   \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
   \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy \let\tenttsl=\chapttsl
-  \def\lsize{sec}\def\lllsize{text}%
   \resetmathfonts \setleading{19pt}}
 \def\secfonts{%
   \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
   \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
-  \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
-  \let\tenttsl=\secttsl
-  \def\lsize{subsec}\def\lllsize{reduced}%
+  \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy \let\tenttsl=\secttsl
   \resetmathfonts \setleading{16pt}}
 \def\subsecfonts{%
   \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
   \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
-  \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
-  \let\tenttsl=\ssecttsl
-  \def\lsize{text}\def\lllsize{small}%
+  \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy \let\tenttsl=\ssecttsl
   \resetmathfonts \setleading{15pt}}
-\let\subsubsecfonts = \subsecfonts
-\def\reducedfonts{%
-  \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl
-  \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc
-  \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy
-  \let\tenttsl=\reducedttsl
-  \def\lsize{small}\def\lllsize{smaller}%
-  \resetmathfonts \setleading{10.5pt}}
+\let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf?
 \def\smallfonts{%
   \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
   \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
   \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
   \let\tenttsl=\smallttsl
-  \def\lsize{smaller}\def\lllsize{smaller}%
-  \resetmathfonts \setleading{10.5pt}}
-\def\smallerfonts{%
-  \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl
-  \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
-  \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
-  \let\tenttsl=\smallerttsl
-  \def\lsize{smaller}\def\lllsize{smaller}%
-  \resetmathfonts \setleading{9.5pt}}
-
-% Set the fonts to use with the @small... environments.
-\let\smallexamplefonts = \smallfonts
-
-% About \smallexamplefonts.  If we use \smallfonts (9pt), @smallexample
-% can fit this many characters:
-%   8.5x11=86   smallbook=72  a4=90  a5=69
-% If we use \scriptfonts (8pt), then we can fit this many characters:
-%   8.5x11=90+  smallbook=80  a4=90+  a5=77
-% For me, subjectively, the few extra characters that fit aren't worth
-% the additional smallness of 8pt.  So I'm making the default 9pt.
-%
-% By the way, for comparison, here's what fits with @example (10pt):
-%   8.5x11=71  smallbook=60  a4=75  a5=58
-%
-% I wish the USA used A4 paper.
-% --karl, 24jan03.
-
+  \resetmathfonts \setleading{11pt}}
 
 % Set up the default fonts, so we can use them for creating boxes.
 %
-\textfonts \rm
+\textfonts
 
 % Define these so they can be easily changed for other fonts.
 \def\angleleft{$\langle$}
@@ -1679,32 +1235,23 @@ where each line of input produces a line of output.}
 
 % Fonts for short table of contents.
 \setfont\shortcontrm\rmshape{12}{1000}
-\setfont\shortcontbf\bfshape{10}{\magstep1}  % no cmb12
+\setfont\shortcontbf\bxshape{12}{1000}
 \setfont\shortcontsl\slshape{12}{1000}
-\setfont\shortconttt\ttshape{12}{1000}
 
 %% Add scribe-like font environments, plus @l for inline lisp (usually sans
 %% serif) and @ii for TeX italic
 
 % \smartitalic{ARG} outputs arg in italics, followed by an italic correction
 % unless the following character is such as not to need one.
-\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
-                    \ptexslash\fi\fi\fi}
-\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
-\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
-
-% like \smartslanted except unconditionally uses \ttsl.
-% @var is set to this for defun arguments.
-\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
-
-% like \smartslanted except unconditionally use \sl.  We never want
-% ttsl for book titles, do we?
-\def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
+\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else\/\fi\fi\fi}
+\def\smartslanted#1{{\sl #1}\futurelet\next\smartitalicx}
+\def\smartitalic#1{{\it #1}\futurelet\next\smartitalicx}
 
 \let\i=\smartitalic
 \let\var=\smartslanted
 \let\dfn=\smartslanted
 \let\emph=\smartitalic
+\let\cite=\smartslanted
 
 \def\b#1{{\bf #1}}
 \let\strong=\b
@@ -1716,21 +1263,11 @@ where each line of input produces a line of output.}
 \def\nohyphenation{\hyphenchar\font = -1  \aftergroup\restorehyphenation}
 \def\restorehyphenation{\hyphenchar\font = `- }
 
-% Set sfcode to normal for the chars that usually have another value.
-% Can't use plain's \frenchspacing because it uses the `\x notation, and
-% sometimes \x has an active definition that messes things up.
-%
-\catcode`@=11
-  \def\frenchspacing{%
-    \sfcode\dotChar  =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
-    \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
-  }
-\catcode`@=\other
-
 \def\t#1{%
   {\tt \rawbackslash \frenchspacing #1}%
   \null
 }
+\let\ttfont=\t
 \def\samp#1{`\tclose{#1}'\null}
 \setfont\keyrm\rmshape{8}{1000}
 \font\keysy=cmsy9
@@ -1771,7 +1308,7 @@ where each line of input produces a line of output.}
   \null
 }
 
-% We *must* turn on hyphenation at `-' and `_' in @code.
+% We *must* turn on hyphenation at `-' and `_' in \code.
 % Otherwise, it is too hard to avoid overfull hboxes
 % in the Emacs manual, the Library manual, etc.
 
@@ -1789,30 +1326,27 @@ where each line of input produces a line of output.}
     \catcode`\_=\active \let_\codeunder
     \codex
   }
+  %
+  % If we end up with any active - characters when handling the index,
+  % just treat them as a normal -.
+  \global\def\indexbreaks{\catcode`\-=\active \let-\realdash}
 }
 
 \def\realdash{-}
 \def\codedash{-\discretionary{}{}{}}
-\def\codeunder{%
-  % this is all so @math{@code{var_name}+1} can work.  In math mode, _
-  % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
-  % will therefore expand the active definition of _, which is us
-  % (inside @code that is), therefore an endless loop.
-  \ifusingtt{\ifmmode
-               \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_.
-             \else\normalunderscore \fi
-             \discretionary{}{}{}}%
-            {\_}%
-}
+\def\codeunder{\ifusingtt{\normalunderscore\discretionary{}{}{}}{\_}}
 \def\codex #1{\tclose{#1}\endgroup}
 
+%\let\exp=\tclose  %Was temporary
+
 % @kbd is like @code, except that if the argument is just one @key command,
 % then @kbd has no effect.
 
 % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
 %   `example' (@kbd uses ttsl only inside of @example and friends),
 %   or `code' (@kbd uses normal tty font always).
-\parseargdef\kbdinputstyle{%
+\def\kbdinputstyle{\parsearg\kbdinputstylexxx}
+\def\kbdinputstylexxx#1{%
   \def\arg{#1}%
   \ifx\arg\worddistinct
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
@@ -1820,17 +1354,15 @@ where each line of input produces a line of output.}
     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
   \else\ifx\arg\wordcode
     \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
-  \else
-    \errhelp = \EMsimple
-    \errmessage{Unknown @kbdinputstyle option `\arg'}%
   \fi\fi\fi
 }
 \def\worddistinct{distinct}
 \def\wordexample{example}
 \def\wordcode{code}
 
-% Default is `distinct.'
-\kbdinputstyle distinct
+% Default is kbdinputdistinct.  (Too much of a hassle to call the macro,
+% the catcodes are wrong for parsearg to work.)
+\gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}
 
 \def\xkey{\key}
 \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
@@ -1873,7 +1405,7 @@ where each line of input produces a line of output.}
 
 % rms does not like angle brackets --karl, 17may97.
 % So now @email is just like @uref, unless we are pdf.
-%
+% 
 %\def\email#1{\angleleft{\tt #1}\angleright}
 \ifpdf
   \def\email#1{\doemail#1,,\finish}
@@ -1912,29 +1444,12 @@ where each line of input produces a line of output.}
 \def\sc#1{{\smallcaps#1}}       % smallcaps font
 \def\ii#1{{\it #1}}             % italic font
 
-\def\acronym#1{\doacronym #1,,\finish}
-\def\doacronym#1,#2,#3\finish{%
-  {\selectfonts\lsize #1}%
-  \def\temp{#2}%
-  \ifx\temp\empty \else
-    \space ({\unsepspaces \ignorespaces \temp \unskip})%
-  \fi
-}
+% @acronym downcases the argument and prints in smallcaps.
+\def\acronym#1{{\smallcaps \lowercase{#1}}}
 
-% @pounds{} is a sterling sign, which is in the CM italic font.
-% 
+% @pounds{} is a sterling sign.
 \def\pounds{{\it\$}}
 
-% @registeredsymbol - R in a circle.  The font for the R should really
-% be smaller yet, but lllsize is the best we can do for now.
-% Adapted from the plain.tex definition of \copyright.
-%
-\def\registeredsymbol{%
-  $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}%
-               \hfil\crcr\Orb}}%
-    }$%
-}
-
 
 \message{page headings,}
 
@@ -1953,103 +1468,86 @@ where each line of input produces a line of output.}
 \newif\ifsetshortcontentsaftertitlepage
  \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
 
-\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
+\def\shorttitlepage{\parsearg\shorttitlepagezzz}
+\def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
         \endgroup\page\hbox{}\page}
 
-\envdef\titlepage{%
-  % Open one extra group, as we want to close it in the middle of \Etitlepage.
-  \begingroup
-    \parindent=0pt \textfonts
-    % Leave some space at the very top of the page.
-    \vglue\titlepagetopglue
-    % No rule at page bottom unless we print one at the top with @title.
-    \finishedtitlepagetrue
-    %
-    % Most title ``pages'' are actually two pages long, with space
-    % at the top of the second.  We don't want the ragged left on the second.
-    \let\oldpage = \page
-    \def\page{%
+\def\titlepage{\begingroup \parindent=0pt \textfonts
+   \let\subtitlerm=\tenrm
+   \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}%
+   %
+   \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines}%
+   %
+   % Leave some space at the very top of the page.
+   \vglue\titlepagetopglue
+   %
+   % Now you can print the title using @title.
+   \def\title{\parsearg\titlezzz}%
+   \def\titlezzz##1{\leftline{\titlefonts\rm ##1}
+                    % print a rule at the page bottom also.
+                    \finishedtitlepagefalse
+                    \vskip4pt \hrule height 4pt width \hsize \vskip4pt}%
+   % No rule at page bottom unless we print one at the top with @title.
+   \finishedtitlepagetrue
+   %
+   % Now you can put text using @subtitle.
+   \def\subtitle{\parsearg\subtitlezzz}%
+   \def\subtitlezzz##1{{\subtitlefont \rightline{##1}}}%
+   %
+   % @author should come last, but may come many times.
+   \def\author{\parsearg\authorzzz}%
+   \def\authorzzz##1{\ifseenauthor\else\vskip 0pt plus 1filll\seenauthortrue\fi
+      {\authorfont \leftline{##1}}}%
+   %
+   % Most title ``pages'' are actually two pages long, with space
+   % at the top of the second.  We don't want the ragged left on the second.
+   \let\oldpage = \page
+   \def\page{%
       \iffinishedtitlepage\else
-	 \finishtitlepage
+         \finishtitlepage
       \fi
+      \oldpage
       \let\page = \oldpage
-      \page
-      \null
-    }%
+      \hbox{}}%
+%   \def\page{\oldpage \hbox{}}
 }
 
 \def\Etitlepage{%
-    \iffinishedtitlepage\else
-	\finishtitlepage
-    \fi
-    % It is important to do the page break before ending the group,
-    % because the headline and footline are only empty inside the group.
-    % If we use the new definition of \page, we always get a blank page
-    % after the title page, which we certainly don't want.
-    \oldpage
-  \endgroup
-  %
-  % Need this before the \...aftertitlepage checks so that if they are
-  % in effect the toc pages will come out with page numbers.
-  \HEADINGSon
-  %
-  % If they want short, they certainly want long too.
-  \ifsetshortcontentsaftertitlepage
-    \shortcontents
-    \contents
-    \global\let\shortcontents = \relax
-    \global\let\contents = \relax
-  \fi
-  %
-  \ifsetcontentsaftertitlepage
-    \contents
-    \global\let\contents = \relax
-    \global\let\shortcontents = \relax
-  \fi
+   \iffinishedtitlepage\else
+      \finishtitlepage
+   \fi
+   % It is important to do the page break before ending the group,
+   % because the headline and footline are only empty inside the group.
+   % If we use the new definition of \page, we always get a blank page
+   % after the title page, which we certainly don't want.
+   \oldpage
+   \endgroup
+   %
+   % If they want short, they certainly want long too.
+   \ifsetshortcontentsaftertitlepage
+     \shortcontents
+     \contents
+     \global\let\shortcontents = \relax
+     \global\let\contents = \relax
+   \fi
+   %
+   \ifsetcontentsaftertitlepage
+     \contents
+     \global\let\contents = \relax
+     \global\let\shortcontents = \relax
+   \fi
+   %
+   \ifpdf \pdfmakepagedesttrue \fi
+   %
+   \HEADINGSon
 }
 
 \def\finishtitlepage{%
-  \vskip4pt \hrule height 2pt width \hsize
-  \vskip\titlepagebottomglue
-  \finishedtitlepagetrue
-}
-
-%%% Macros to be used within @titlepage:
-
-\let\subtitlerm=\tenrm
-\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
-
-\def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines
-		\let\tt=\authortt}
-
-\parseargdef\title{%
-  \checkenv\titlepage
-  \leftline{\titlefonts\rm #1}
-  % print a rule at the page bottom also.
-  \finishedtitlepagefalse
-  \vskip4pt \hrule height 4pt width \hsize \vskip4pt
+   \vskip4pt \hrule height 2pt width \hsize
+   \vskip\titlepagebottomglue
+   \finishedtitlepagetrue
 }
 
-\parseargdef\subtitle{%
-  \checkenv\titlepage
-  {\subtitlefont \rightline{#1}}%
-}
-
-% @author should come last, but may come many times.
-% It can also be used inside @quotation.
-% 
-\parseargdef\author{%
-  \def\temp{\quotation}%
-  \ifx\thisenv\temp
-    \def\quotationauthor{#1}% printed in \Equotation.
-  \else
-    \checkenv\titlepage
-    \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
-    {\authorfont \leftline{#1}}%
-  \fi
-}
-
-
 %%% Set up page headings and footings.
 
 \let\thispage=\folio
@@ -2059,7 +1557,7 @@ where each line of input produces a line of output.}
 \newtoks\evenfootline    % footline on even pages
 \newtoks\oddfootline     % footline on odd pages
 
-% Now make TeX use those variables
+% Now make Tex use those variables
 \headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
                             \else \the\evenheadline \fi}}
 \footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
@@ -2073,27 +1571,32 @@ where each line of input produces a line of output.}
 % @evenfooting @thisfile||
 % @oddfooting ||@thisfile
 
-
 \def\evenheading{\parsearg\evenheadingxxx}
-\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish}
-\def\evenheadingyyy #1\|#2\|#3\|#4\finish{%
+\def\oddheading{\parsearg\oddheadingxxx}
+\def\everyheading{\parsearg\everyheadingxxx}
+
+\def\evenfooting{\parsearg\evenfootingxxx}
+\def\oddfooting{\parsearg\oddfootingxxx}
+\def\everyfooting{\parsearg\everyfootingxxx}
+
+{\catcode`\@=0 %
+
+\gdef\evenheadingxxx #1{\evenheadingyyy #1@|@|@|@|\finish}
+\gdef\evenheadingyyy #1@|#2@|#3@|#4\finish{%
 \global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
 
-\def\oddheading{\parsearg\oddheadingxxx}
-\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish}
-\def\oddheadingyyy #1\|#2\|#3\|#4\finish{%
+\gdef\oddheadingxxx #1{\oddheadingyyy #1@|@|@|@|\finish}
+\gdef\oddheadingyyy #1@|#2@|#3@|#4\finish{%
 \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
 
-\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
+\gdef\everyheadingxxx#1{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
 
-\def\evenfooting{\parsearg\evenfootingxxx}
-\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish}
-\def\evenfootingyyy #1\|#2\|#3\|#4\finish{%
+\gdef\evenfootingxxx #1{\evenfootingyyy #1@|@|@|@|\finish}
+\gdef\evenfootingyyy #1@|#2@|#3@|#4\finish{%
 \global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
 
-\def\oddfooting{\parsearg\oddfootingxxx}
-\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish}
-\def\oddfootingyyy #1\|#2\|#3\|#4\finish{%
+\gdef\oddfootingxxx #1{\oddfootingyyy #1@|@|@|@|\finish}
+\gdef\oddfootingyyy #1@|#2@|#3@|#4\finish{%
   \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}%
   %
   % Leave some space for the footline.  Hopefully ok to assume
@@ -2102,8 +1605,9 @@ where each line of input produces a line of output.}
   \global\advance\vsize by -\baselineskip
 }
 
-\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
-
+\gdef\everyfootingxxx#1{\oddfootingxxx{#1}\evenfootingxxx{#1}}
+%
+}% unbind the catcode of @.
 
 % @headings double      turns headings on for double-sided printing.
 % @headings single      turns headings on for single-sided printing.
@@ -2117,7 +1621,7 @@ where each line of input produces a line of output.}
 
 \def\headings #1 {\csname HEADINGS#1\endcsname}
 
-\def\HEADINGSoff{%
+\def\HEADINGSoff{
 \global\evenheadline={\hfil} \global\evenfootline={\hfil}
 \global\oddheadline={\hfil} \global\oddfootline={\hfil}}
 \HEADINGSoff
@@ -2126,7 +1630,7 @@ where each line of input produces a line of output.}
 % chapter name on inside top of right hand pages, document
 % title on inside top of left hand pages, and page numbers on outside top
 % edge of all pages.
-\def\HEADINGSdouble{%
+\def\HEADINGSdouble{
 \global\pageno=1
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
@@ -2138,7 +1642,7 @@ where each line of input produces a line of output.}
 
 % For single-sided printing, chapter title goes across top left of page,
 % page number on top right.
-\def\HEADINGSsingle{%
+\def\HEADINGSsingle{
 \global\pageno=1
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
@@ -2185,11 +1689,12 @@ where each line of input produces a line of output.}
 % @settitle line...  specifies the title of the document, for headings.
 % It generates no output of its own.
 \def\thistitle{\putwordNoTitle}
-\def\settitle{\parsearg{\gdef\thistitle}}
+\def\settitle{\parsearg\settitlezzz}
+\def\settitlezzz #1{\gdef\thistitle{#1}}
 
 
 \message{tables,}
-% Tables -- @table, @ftable, @vtable, @item(x).
+% Tables -- @table, @ftable, @vtable, @item(x), @kitem(x), @xitem(x).
 
 % default indentation of table text
 \newdimen\tableindent \tableindent=.8in
@@ -2201,7 +1706,7 @@ where each line of input produces a line of output.}
 % used internally for \itemindent minus \itemmargin
 \newdimen\itemmax
 
-% Note @table, @ftable, and @vtable define @item, @itemx, etc., with
+% Note @table, @vtable, and @vtable define @item, @itemx, etc., with
 % these defs.
 % They also define \itemindex
 % to index the item name in whatever manner is desired (perhaps none).
@@ -2213,10 +1718,22 @@ where each line of input produces a line of output.}
 \def\internalBitem{\smallbreak \parsearg\itemzzz}
 \def\internalBitemx{\itemxpar \parsearg\itemzzz}
 
+\def\internalBxitem "#1"{\def\xitemsubtopix{#1} \smallbreak \parsearg\xitemzzz}
+\def\internalBxitemx "#1"{\def\xitemsubtopix{#1} \itemxpar \parsearg\xitemzzz}
+
+\def\internalBkitem{\smallbreak \parsearg\kitemzzz}
+\def\internalBkitemx{\itemxpar \parsearg\kitemzzz}
+
+\def\kitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \lastfunction}}%
+                 \itemzzz {#1}}
+
+\def\xitemzzz #1{\dosubind {kw}{\code{#1}}{for {\bf \xitemsubtopic}}%
+                 \itemzzz {#1}}
+
 \def\itemzzz #1{\begingroup %
   \advance\hsize by -\rightskip
   \advance\hsize by -\tableindent
-  \setbox0=\hbox{\itemindicate{#1}}%
+  \setbox0=\hbox{\itemfont{#1}}%
   \itemindex{#1}%
   \nobreak % This prevents a break before @itemx.
   %
@@ -2240,18 +1757,10 @@ where each line of input produces a line of output.}
     % \parskip glue -- logically it's part of the @item we just started.
     \nobreak \vskip-\parskip
     %
-    % Stop a page break at the \parskip glue coming up.  (Unfortunately
+    % Stop a page break at the \parskip glue coming up.  Unfortunately
     % we can't prevent a possible page break at the following
-    % \baselineskip glue.)  However, if what follows is an environment
-    % such as @example, there will be no \parskip glue; then
-    % the negative vskip we just would cause the example and the item to
-    % crash together.  So we use this bizarre value of 10001 as a signal
-    % to \aboveenvbreak to insert \parskip glue after all.
-    % (Possibly there are other commands that could be followed by
-    % @example which need the same treatment, but not section titles; or
-    % maybe section titles are the only special case and they should be
-    % penalty 10001...)
-    \penalty 10001
+    % \baselineskip glue.
+    \nobreak
     \endgroup
     \itemxneedsnegativevskipfalse
   \else
@@ -2270,95 +1779,97 @@ where each line of input produces a line of output.}
   \fi
 }
 
-\def\item{\errmessage{@item while not in a list environment}}
-\def\itemx{\errmessage{@itemx while not in a list environment}}
+\def\item{\errmessage{@item while not in a table}}
+\def\itemx{\errmessage{@itemx while not in a table}}
+\def\kitem{\errmessage{@kitem while not in a table}}
+\def\kitemx{\errmessage{@kitemx while not in a table}}
+\def\xitem{\errmessage{@xitem while not in a table}}
+\def\xitemx{\errmessage{@xitemx while not in a table}}
+
+% Contains a kludge to get @end[description] to work.
+\def\description{\tablez{\dontindex}{1}{}{}{}{}}
 
 % @table, @ftable, @vtable.
-\envdef\table{%
-  \let\itemindex\gobble
-  \tablex
-}
-\envdef\ftable{%
-  \def\itemindex ##1{\doind {fn}{\code{##1}}}%
-  \tablex
-}
-\envdef\vtable{%
-  \def\itemindex ##1{\doind {vr}{\code{##1}}}%
-  \tablex
-}
-\def\tablex#1{%
-  \def\itemindicate{#1}%
-  \parsearg\tabley
-}
-\def\tabley#1{%
-  {%
-    \makevalueexpandable
-    \edef\temp{\noexpand\tablez #1\space\space\space}%
-    \expandafter
-  }\temp \endtablez
-}
-\def\tablez #1 #2 #3 #4\endtablez{%
-  \aboveenvbreak
-  \ifnum 0#1>0 \advance \leftskip by #1\mil \fi
-  \ifnum 0#2>0 \tableindent=#2\mil \fi
-  \ifnum 0#3>0 \advance \rightskip by #3\mil \fi
-  \itemmax=\tableindent
-  \advance \itemmax by -\itemmargin
-  \advance \leftskip by \tableindent
-  \exdentamount=\tableindent
-  \parindent = 0pt
-  \parskip = \smallskipamount
-  \ifdim \parskip=0pt \parskip=2pt \fi
-  \let\item = \internalBitem
-  \let\itemx = \internalBitemx
+\def\table{\begingroup\inENV\obeylines\obeyspaces\tablex}
+{\obeylines\obeyspaces%
+\gdef\tablex #1^^M{%
+\tabley\dontindex#1        \endtabley}}
+
+\def\ftable{\begingroup\inENV\obeylines\obeyspaces\ftablex}
+{\obeylines\obeyspaces%
+\gdef\ftablex #1^^M{%
+\tabley\fnitemindex#1        \endtabley
+\def\Eftable{\endgraf\afterenvbreak\endgroup}%
+\let\Etable=\relax}}
+
+\def\vtable{\begingroup\inENV\obeylines\obeyspaces\vtablex}
+{\obeylines\obeyspaces%
+\gdef\vtablex #1^^M{%
+\tabley\vritemindex#1        \endtabley
+\def\Evtable{\endgraf\afterenvbreak\endgroup}%
+\let\Etable=\relax}}
+
+\def\dontindex #1{}
+\def\fnitemindex #1{\doind {fn}{\code{#1}}}%
+\def\vritemindex #1{\doind {vr}{\code{#1}}}%
+
+{\obeyspaces %
+\gdef\tabley#1#2 #3 #4 #5 #6 #7\endtabley{\endgroup%
+\tablez{#1}{#2}{#3}{#4}{#5}{#6}}}
+
+\def\tablez #1#2#3#4#5#6{%
+\aboveenvbreak %
+\begingroup %
+\def\Edescription{\Etable}% Necessary kludge.
+\let\itemindex=#1%
+\ifnum 0#3>0 \advance \leftskip by #3\mil \fi %
+\ifnum 0#4>0 \tableindent=#4\mil \fi %
+\ifnum 0#5>0 \advance \rightskip by #5\mil \fi %
+\def\itemfont{#2}%
+\itemmax=\tableindent %
+\advance \itemmax by -\itemmargin %
+\advance \leftskip by \tableindent %
+\exdentamount=\tableindent
+\parindent = 0pt
+\parskip = \smallskipamount
+\ifdim \parskip=0pt \parskip=2pt \fi%
+\def\Etable{\endgraf\afterenvbreak\endgroup}%
+\let\item = \internalBitem %
+\let\itemx = \internalBitemx %
+\let\kitem = \internalBkitem %
+\let\kitemx = \internalBkitemx %
+\let\xitem = \internalBxitem %
+\let\xitemx = \internalBxitemx %
 }
-\def\Etable{\endgraf\afterenvbreak}
-\let\Eftable\Etable
-\let\Evtable\Etable
-\let\Eitemize\Etable
-\let\Eenumerate\Etable
 
 % This is the counter used by @enumerate, which is really @itemize
 
 \newcount \itemno
 
-\envdef\itemize{\parsearg\doitemize}
+\def\itemize{\parsearg\itemizezzz}
 
-\def\doitemize#1{%
-  \aboveenvbreak
-  \itemmax=\itemindent
-  \advance\itemmax by -\itemmargin
-  \advance\leftskip by \itemindent
-  \exdentamount=\itemindent
-  \parindent=0pt
-  \parskip=\smallskipamount
-  \ifdim\parskip=0pt \parskip=2pt \fi
-  \def\itemcontents{#1}%
-  % @itemize with no arg is equivalent to @itemize @bullet.
-  \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
-  \let\item=\itemizeitem
+\def\itemizezzz #1{%
+  \begingroup % ended by the @end itemize
+  \itemizey {#1}{\Eitemize}
 }
 
-% Definition of @item while inside @itemize and @enumerate.
-%
-\def\itemizeitem{%
-  \advance\itemno by 1  % for enumerations
-  {\let\par=\endgraf \smallbreak}% reasonable place to break
-  {%
-   % If the document has an @itemize directly after a section title, a
-   % \nobreak will be last on the list, and \sectionheading will have
-   % done a \vskip-\parskip.  In that case, we don't want to zero
-   % parskip, or the item text will crash with the heading.  On the
-   % other hand, when there is normal text preceding the item (as there
-   % usually is), we do want to zero parskip, or there would be too much
-   % space.  In that case, we won't have a \nobreak before.  At least
-   % that's the theory.
-   \ifnum\lastpenalty<10000 \parskip=0in \fi
-   \noindent
-   \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
-   \vadjust{\penalty 1200}}% not good to break after first line of item.
-  \flushcr
-}
+\def\itemizey #1#2{%
+\aboveenvbreak %
+\itemmax=\itemindent %
+\advance \itemmax by -\itemmargin %
+\advance \leftskip by \itemindent %
+\exdentamount=\itemindent
+\parindent = 0pt %
+\parskip = \smallskipamount %
+\ifdim \parskip=0pt \parskip=2pt \fi%
+\def#2{\endgraf\afterenvbreak\endgroup}%
+\def\itemcontents{#1}%
+\let\item=\itemizeitem}
+
+% Set sfcode to normal for the chars that usually have another value.
+% These are `.?!:;,'
+\def\frenchspacing{\sfcode46=1000 \sfcode63=1000 \sfcode33=1000
+  \sfcode58=1000 \sfcode59=1000 \sfcode44=1000 }
 
 % \splitoff TOKENS\endmark defines \first to be the first token in
 % TOKENS, and \rest to be the remainder.
@@ -2369,8 +1880,11 @@ where each line of input produces a line of output.}
 % or number, to specify the first label in the enumerated list.  No
 % argument is the same as `1'.
 %
-\envparseargdef\enumerate{\enumeratey #1  \endenumeratey}
+\def\enumerate{\parsearg\enumeratezzz}
+\def\enumeratezzz #1{\enumeratey #1  \endenumeratey}
 \def\enumeratey #1 #2\endenumeratey{%
+  \begingroup % ended by the @end enumerate
+  %
   % If we were given no argument, pretend we were given `1'.
   \def\thearg{#1}%
   \ifx\thearg\empty \def\thearg{1}\fi
@@ -2441,13 +1955,13 @@ where each line of input produces a line of output.}
   }%
 }
 
-% Call \doitemize, adding a period to the first argument and supplying the
+% Call itemizey, adding a period to the first argument and supplying the
 % common last two arguments.  Also subtract one from the initial value in
 % \itemno, since @item increments \itemno.
 %
 \def\startenumeration#1{%
   \advance\itemno by -1
-  \doitemize{#1.}\flushcr
+  \itemizey{#1.}\Eenumerate\flushcr
 }
 
 % @alphaenumerate and @capsenumerate are abbreviations for giving an arg
@@ -2458,6 +1972,16 @@ where each line of input produces a line of output.}
 \def\Ealphaenumerate{\Eenumerate}
 \def\Ecapsenumerate{\Eenumerate}
 
+% Definition of @item while inside @itemize.
+
+\def\itemizeitem{%
+\advance\itemno by 1
+{\let\par=\endgraf \smallbreak}%
+\ifhmode \errmessage{In hmode at itemizeitem}\fi
+{\parskip=0in \hskip 0pt
+\hbox to 0pt{\hss \itemcontents\hskip \itemmargin}%
+\vadjust{\penalty 1200}}%
+\flushcr}
 
 % @multitable macros
 % Amy Hendrickson, 8/18/94, 3/6/96
@@ -2484,14 +2008,24 @@ where each line of input produces a line of output.}
 %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
 %   @item ...
 %   using the widest term desired in each column.
+%
+% For those who want to use more than one line's worth of words in
+% the preamble, break the line within one argument and it
+% will parse correctly, i.e.,
+%
+%     @multitable {Column 1 template} {Column 2 template} {Column 3
+%      template}
+% Not:
+%     @multitable {Column 1 template} {Column 2 template}
+%      {Column 3 template}
 
 % Each new table line starts with @item, each subsequent new column
 % starts with @tab. Empty columns may be produced by supplying @tab's
 % with nothing between them for as many times as empty columns are needed,
 % ie, @tab@tab@tab will produce two empty columns.
 
-% @item, @tab do not need to be on their own lines, but it will not hurt
-% if they are.
+% @item, @tab, @multitable or @end multitable do not need to be on their
+% own lines, but it will not hurt if they are.
 
 % Sample multitable:
 
@@ -2535,12 +2069,13 @@ where each line of input produces a line of output.}
 \def\xcolumnfractions{\columnfractions}
 \newif\ifsetpercent
 
-% #1 is the @columnfraction, usually a decimal number like .5, but might
-% be just 1.  We just use it, whatever it is.
-% 
-\def\pickupwholefraction#1 {%
+% #1 is the part of the @columnfraction before the decimal point, which
+% is presumably either 0 or the empty string (but we don't check, we
+% just throw it away).  #2 is the decimal part, which we use as the
+% percent of \hsize for this column.
+\def\pickupwholefraction#1.#2 {%
   \global\advance\colcount by 1
-  \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}%
+  \expandafter\xdef\csname col\the\colcount\endcsname{.#2\hsize}%
   \setuptable
 }
 
@@ -2557,8 +2092,8 @@ where each line of input produces a line of output.}
          \let\go\pickupwholefraction
       \else
          \global\advance\colcount by 1
-         \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a
-                   % separator; typically that is always in the input, anyway.
+         \setbox0=\hbox{#1\unskip }% Add a normal word space as a separator;
+                            % typically that is always in the input, anyway.
          \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
       \fi
     \fi
@@ -2573,30 +2108,18 @@ where each line of input produces a line of output.}
   \go
 }
 
-% multitable-only commands.
-%
-% @headitem starts a heading row, which we typeset in bold.
-% Assignments have to be global since we are inside the implicit group
-% of an alignment entry.  Note that \everycr resets \everytab.
-\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}%
-%
-% A \tab used to include \hskip1sp.  But then the space in a template
-% line is not enough.  That is bad.  So let's go back to just `&' until
-% we encounter the problem it was intended to solve again.
-%					--karl, nathan@acm.org, 20apr99.
-\def\tab{\checkenv\multitable &\the\everytab}%
+% This used to have \hskip1sp.  But then the space in a template line is
+% not enough.  That is bad.  So let's go back to just & until we
+% encounter the problem it was intended to solve again.
+% --karl, nathan@acm.org, 20apr99.
+\def\tab{&}
 
 % @multitable ... @end multitable definitions:
 %
-\newtoks\everytab  % insert after every tab.
-%
-\envdef\multitable{%
+\def\multitable{\parsearg\dotable}
+\def\dotable#1{\bgroup
   \vskip\parskip
-  \startsavinginserts
-  %
-  % @item within a multitable starts a normal row.
   \let\item\crcr
-  %
   \tolerance=9500
   \hbadness=9500
   \setmultitablespacing
@@ -2604,80 +2127,66 @@ where each line of input produces a line of output.}
   \parindent=\multitableparindent
   \overfullrule=0pt
   \global\colcount=0
+  \def\Emultitable{\global\setpercentfalse\cr\egroup\egroup}%
   %
-  \everycr = {%
-    \noalign{%
-      \global\everytab={}%
-      \global\colcount=0 % Reset the column counter.
-      % Check for saved footnotes, etc.
-      \checkinserts
-      % Keeps underfull box messages off when table breaks over pages.
-      %\filbreak
-	% Maybe so, but it also creates really weird page breaks when the
-	% table breaks over pages. Wouldn't \vfil be better?  Wait until the
-	% problem manifests itself, so it can be fixed for real --karl.
-    }%
-  }%
-  %
-  \parsearg\domultitable
-}
-\def\domultitable#1{%
   % To parse everything between @multitable and @item:
   \setuptable#1 \endsetuptable
   %
+  % \everycr will reset column counter, \colcount, at the end of
+  % each line. Every column entry will cause \colcount to advance by one.
+  % The table preamble
+  % looks at the current \colcount to find the correct column width.
+  \everycr{\noalign{%
+  %
+  % \filbreak%% keeps underfull box messages off when table breaks over pages.
+  % Maybe so, but it also creates really weird page breaks when the table
+  % breaks over pages. Wouldn't \vfil be better?  Wait until the problem
+  % manifests itself, so it can be fixed for real --karl.
+    \global\colcount=0\relax}}%
+  %
   % This preamble sets up a generic column definition, which will
   % be used as many times as user calls for columns.
   % \vtop will set a single line and will also let text wrap and
   % continue for many paragraphs if desired.
-  \halign\bgroup &%
-    \global\advance\colcount by 1
-    \multistrut
-    \vtop{%
-      % Use the current \colcount to find the correct column width:
-      \hsize=\expandafter\csname col\the\colcount\endcsname
-      %
-      % In order to keep entries from bumping into each other
-      % we will add a \leftskip of \multitablecolspace to all columns after
-      % the first one.
-      %
-      % If a template has been used, we will add \multitablecolspace
-      % to the width of each template entry.
-      %
-      % If the user has set preamble in terms of percent of \hsize we will
-      % use that dimension as the width of the column, and the \leftskip
-      % will keep entries from bumping into each other.  Table will start at
-      % left margin and final column will justify at right margin.
-      %
-      % Make sure we don't inherit \rightskip from the outer environment.
-      \rightskip=0pt
-      \ifnum\colcount=1
-	% The first column will be indented with the surrounding text.
-	\advance\hsize by\leftskip
-      \else
-	\ifsetpercent \else
-	  % If user has not set preamble in terms of percent of \hsize
-	  % we will advance \hsize by \multitablecolspace.
-	  \advance\hsize by \multitablecolspace
-	\fi
-       % In either case we will make \leftskip=\multitablecolspace:
-      \leftskip=\multitablecolspace
-      \fi
-      % Ignoring space at the beginning and end avoids an occasional spurious
-      % blank line, when TeX decides to break the line at the space before the
-      % box from the multistrut, so the strut ends up on a line by itself.
-      % For example:
-      % @multitable @columnfractions .11 .89
-      % @item @code{#}
-      % @tab Legal holiday which is valid in major parts of the whole country.
-      % Is automatically provided with highlighting sequences respectively
-      % marking characters.
-      \noindent\ignorespaces##\unskip\multistrut
-    }\cr
-}
-\def\Emultitable{%
-  \crcr
-  \egroup % end the \halign
-  \global\setpercentfalse
+  \halign\bgroup&\global\advance\colcount by 1\relax
+    \multistrut\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
+  %
+  % In order to keep entries from bumping into each other
+  % we will add a \leftskip of \multitablecolspace to all columns after
+  % the first one.
+  %
+  % If a template has been used, we will add \multitablecolspace
+  % to the width of each template entry.
+  %
+  % If the user has set preamble in terms of percent of \hsize we will
+  % use that dimension as the width of the column, and the \leftskip
+  % will keep entries from bumping into each other.  Table will start at
+  % left margin and final column will justify at right margin.
+  %
+  % Make sure we don't inherit \rightskip from the outer environment.
+  \rightskip=0pt
+  \ifnum\colcount=1
+    % The first column will be indented with the surrounding text.
+    \advance\hsize by\leftskip
+  \else
+    \ifsetpercent \else
+      % If user has not set preamble in terms of percent of \hsize
+      % we will advance \hsize by \multitablecolspace.
+      \advance\hsize by \multitablecolspace
+    \fi
+   % In either case we will make \leftskip=\multitablecolspace:
+  \leftskip=\multitablecolspace
+  \fi
+  % Ignoring space at the beginning and end avoids an occasional spurious
+  % blank line, when TeX decides to break the line at the space before the
+  % box from the multistrut, so the strut ends up on a line by itself.
+  % For example:
+  % @multitable @columnfractions .11 .89
+  % @item @code{#}
+  % @tab Legal holiday which is valid in major parts of the whole country.
+  % Is automatically provided with highlighting sequences respectively marking
+  % characters.
+  \noindent\ignorespaces##\unskip\multistrut}\cr
 }
 
 \def\setmultitablespacing{% test to see if user has set \multitablelinespace.
@@ -2709,172 +2218,282 @@ width0pt\relax} \fi
 
 
 \message{conditionals,}
-
-% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext,
-% @ifnotxml always succeed.  They currently do nothing; we don't
-% attempt to check whether the conditionals are properly nested.  But we
-% have to remember that they are conditionals, so that @end doesn't
-% attempt to close an environment group.
+% Prevent errors for section commands.
+% Used in @ignore and in failing conditionals.
+\def\ignoresections{%
+  \let\chapter=\relax
+  \let\unnumbered=\relax
+  \let\top=\relax
+  \let\unnumberedsec=\relax
+  \let\unnumberedsection=\relax
+  \let\unnumberedsubsec=\relax
+  \let\unnumberedsubsection=\relax
+  \let\unnumberedsubsubsec=\relax
+  \let\unnumberedsubsubsection=\relax
+  \let\section=\relax
+  \let\subsec=\relax
+  \let\subsubsec=\relax
+  \let\subsection=\relax
+  \let\subsubsection=\relax
+  \let\appendix=\relax
+  \let\appendixsec=\relax
+  \let\appendixsection=\relax
+  \let\appendixsubsec=\relax
+  \let\appendixsubsection=\relax
+  \let\appendixsubsubsec=\relax
+  \let\appendixsubsubsection=\relax
+  \let\contents=\relax
+  \let\smallbook=\relax
+  \let\titlepage=\relax
+}
+
+% Used in nested conditionals, where we have to parse the Texinfo source
+% and so want to turn off most commands, in case they are used
+% incorrectly.
+%
+\def\ignoremorecommands{%
+  \let\defcodeindex = \relax
+  \let\defcv = \relax
+  \let\deffn = \relax
+  \let\deffnx = \relax
+  \let\defindex = \relax
+  \let\defivar = \relax
+  \let\defmac = \relax
+  \let\defmethod = \relax
+  \let\defop = \relax
+  \let\defopt = \relax
+  \let\defspec = \relax
+  \let\deftp = \relax
+  \let\deftypefn = \relax
+  \let\deftypefun = \relax
+  \let\deftypeivar = \relax
+  \let\deftypeop = \relax
+  \let\deftypevar = \relax
+  \let\deftypevr = \relax
+  \let\defun = \relax
+  \let\defvar = \relax
+  \let\defvr = \relax
+  \let\ref = \relax
+  \let\xref = \relax
+  \let\printindex = \relax
+  \let\pxref = \relax
+  \let\settitle = \relax
+  \let\setchapternewpage = \relax
+  \let\setchapterstyle = \relax
+  \let\everyheading = \relax
+  \let\evenheading = \relax
+  \let\oddheading = \relax
+  \let\everyfooting = \relax
+  \let\evenfooting = \relax
+  \let\oddfooting = \relax
+  \let\headings = \relax
+  \let\include = \relax
+  \let\lowersections = \relax
+  \let\down = \relax
+  \let\raisesections = \relax
+  \let\up = \relax
+  \let\set = \relax
+  \let\clear = \relax
+  \let\item = \relax
+}
+
+% Ignore @ignore ... @end ignore.
 %
-\def\makecond#1{%
-  \expandafter\let\csname #1\endcsname = \relax
-  \expandafter\let\csname iscond.#1\endcsname = 1
-}
-\makecond{iftex}
-\makecond{ifnotdocbook}
-\makecond{ifnothtml}
-\makecond{ifnotinfo}
-\makecond{ifnotplaintext}
-\makecond{ifnotxml}
+\def\ignore{\doignore{ignore}}
 
-% Ignore @ignore, @ifhtml, @ifinfo, and the like.
+% Ignore @ifinfo, @ifhtml, @ifnottex, @html, @menu, and @direntry text.
 %
-\def\direntry{\doignore{direntry}}
-\def\documentdescription{\doignore{documentdescription}}
-\def\docbook{\doignore{docbook}}
-\def\html{\doignore{html}}
-\def\ifdocbook{\doignore{ifdocbook}}
-\def\ifhtml{\doignore{ifhtml}}
 \def\ifinfo{\doignore{ifinfo}}
+\def\ifhtml{\doignore{ifhtml}}
 \def\ifnottex{\doignore{ifnottex}}
-\def\ifplaintext{\doignore{ifplaintext}}
-\def\ifxml{\doignore{ifxml}}
-\def\ignore{\doignore{ignore}}
+\def\html{\doignore{html}}
 \def\menu{\doignore{menu}}
-\def\xml{\doignore{xml}}
+\def\direntry{\doignore{direntry}}
 
-% Ignore text until a line `@end #1', keeping track of nested conditionals.
-%
-% A count to remember the depth of nesting.
-\newcount\doignorecount
+% @dircategory CATEGORY  -- specify a category of the dir file
+% which this file should belong to.  Ignore this in TeX.
+\let\dircategory = \comment
 
+% Ignore text until a line `@end #1'.
+%
 \def\doignore#1{\begingroup
-  % Scan in ``verbatim'' mode:
-  \catcode`\@ = \other
-  \catcode`\{ = \other
-  \catcode`\} = \other
+  % Don't complain about control sequences we have declared \outer.
+  \ignoresections
   %
-  % Make sure that spaces turn into tokens that match what \doignoretext wants.
-  \spaceisspace
+  % Define a command to swallow text until we reach `@end #1'.
+  % This @ is a catcode 12 token (that is the normal catcode of @ in
+  % this texinfo.tex file).  We change the catcode of @ below to match.
+  \long\def\doignoretext##1@end #1{\enddoignore}%
   %
-  % Count number of #1's that we've seen.
-  \doignorecount = 0
-  %
-  % Swallow text until we reach the matching `@end #1'.
-  \dodoignore {#1}%
+  % Make sure that spaces turn into tokens that match what \doignoretext wants.
+  \catcode32 = 10
+  %
+  % Ignore braces, too, so mismatched braces don't cause trouble.
+  \catcode`\{ = 9
+  \catcode`\} = 9
+  %
+  % We must not have @c interpreted as a control sequence.
+  \catcode`\@ = 12
+  %
+  % Make the letter c a comment character so that the rest of the line
+  % will be ignored. This way, the document can have (for example)
+  %   @c @end ifinfo
+  % and the @end ifinfo will be properly ignored.
+  % (We've just changed @ to catcode 12.)
+  \catcode`\c = 14
+  %
+  % And now expand that command.
+  \doignoretext
+}
+
+% What we do to finish off ignored text.
+%
+\def\enddoignore{\endgroup\ignorespaces}%
+
+\newif\ifwarnedobs\warnedobsfalse
+\def\obstexwarn{%
+  \ifwarnedobs\relax\else
+  % We need to warn folks that they may have trouble with TeX 3.0.
+  % This uses \immediate\write16 rather than \message to get newlines.
+    \immediate\write16{}
+    \immediate\write16{WARNING: for users of Unix TeX 3.0!}
+    \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).}
+    \immediate\write16{If you are running another version of TeX, relax.}
+    \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.}
+    \immediate\write16{  Then upgrade your TeX installation if you can.}
+    \immediate\write16{  (See ftp://ftp.gnu.org/pub/gnu/TeX.README.)}
+    \immediate\write16{If you are stuck with version 3.0, run the}
+    \immediate\write16{  script ``tex3patch'' from the Texinfo distribution}
+    \immediate\write16{  to use a workaround.}
+    \immediate\write16{}
+    \global\warnedobstrue
+    \fi
 }
 
-{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source.
-  \obeylines %
+% **In TeX 3.0, setting text in \nullfont hangs tex.  For a
+% workaround (which requires the file ``dummy.tfm'' to be installed),
+% uncomment the following line:
+%%%%%\font\nullfont=dummy\let\obstexwarn=\relax
+
+% Ignore text, except that we keep track of conditional commands for
+% purposes of nesting, up to an `@end #1' command.
+%
+\def\nestedignore#1{%
+  \obstexwarn
+  % We must actually expand the ignored text to look for the @end
+  % command, so that nested ignore constructs work.  Thus, we put the
+  % text into a \vbox and then do nothing with the result.  To minimize
+  % the change of memory overflow, we follow the approach outlined on
+  % page 401 of the TeXbook: make the current font be a dummy font.
   %
-  \gdef\dodoignore#1{%
-    % #1 contains the string `ifinfo'.
+  \setbox0 = \vbox\bgroup
+    % Don't complain about control sequences we have declared \outer.
+    \ignoresections
     %
-    % Define a command to find the next `@end #1', which must be on a line
-    % by itself.
-    \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}%
-    % And this command to find another #1 command, at the beginning of a
-    % line.  (Otherwise, we would consider a line `@c @ifset', for
-    % example, to count as an @ifset for nesting.)
-    \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
+    % Define `@end #1' to end the box, which will in turn undefine the
+    % @end command again.
+    \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}%
     %
-    % And now expand that command.
-    \obeylines %
-    \doignoretext ^^M%
-  }%
-}
-
-\def\doignoreyyy#1{%
-  \def\temp{#1}%
-  \ifx\temp\empty			% Nothing found.
-    \let\next\doignoretextzzz
-  \else					% Found a nested condition, ...
-    \advance\doignorecount by 1
-    \let\next\doignoretextyyy		% ..., look for another.
-    % If we're here, #1 ends with ^^M\ifinfo (for example).
-  \fi
-  \next #1% the token \_STOP_ is present just after this macro.
-}
-
-% We have to swallow the remaining "\_STOP_".
-% 
-\def\doignoretextzzz#1{%
-  \ifnum\doignorecount = 0	% We have just found the outermost @end.
-    \let\next\enddoignore
-  \else				% Still inside a nested condition.
-    \advance\doignorecount by -1
-    \let\next\doignoretext      % Look for the next @end.
-  \fi
-  \next
+    % We are going to be parsing Texinfo commands.  Most cause no
+    % trouble when they are used incorrectly, but some commands do
+    % complicated argument parsing or otherwise get confused, so we
+    % undefine them.
+    %
+    % We can't do anything about stray @-signs, unfortunately;
+    % they'll produce `undefined control sequence' errors.
+    \ignoremorecommands
+    %
+    % Set the current font to be \nullfont, a TeX primitive, and define
+    % all the font commands to also use \nullfont.  We don't use
+    % dummy.tfm, as suggested in the TeXbook, because not all sites
+    % might have that installed.  Therefore, math mode will still
+    % produce output, but that should be an extremely small amount of
+    % stuff compared to the main input.
+    %
+    \nullfont
+    \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont
+    \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont
+    \let\tensf=\nullfont
+    % Similarly for index fonts (mostly for their use in smallexample).
+    \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont
+    \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont
+    \let\smallsf=\nullfont
+    %
+    % Don't complain when characters are missing from the fonts.
+    \tracinglostchars = 0
+    %
+    % Don't bother to do space factor calculations.
+    \frenchspacing
+    %
+    % Don't report underfull hboxes.
+    \hbadness = 10000
+    %
+    % Do minimal line-breaking.
+    \pretolerance = 10000
+    %
+    % Do not execute instructions in @tex
+    \def\tex{\doignore{tex}}%
+    % Do not execute macro definitions.
+    % `c' is a comment character, so the word `macro' will get cut off.
+    \def\macro{\doignore{ma}}%
 }
 
-% Finish off ignored text.
-\def\enddoignore{\endgroup\ignorespaces}
-
-
 % @set VAR sets the variable VAR to an empty value.
 % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
 %
 % Since we want to separate VAR from REST-OF-LINE (which might be
 % empty), we can't just use \parsearg; we have to insert a space of our
 % own to delimit the rest of the line, and then take it out again if we
-% didn't need it.
-% We rely on the fact that \parsearg sets \catcode`\ =10.
+% didn't need it.  Make sure the catcode of space is correct to avoid
+% losing inside @example, for instance.
 %
-\parseargdef\set{\setyyy#1 \endsetyyy}
+\def\set{\begingroup\catcode` =10
+  \catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR.
+  \parsearg\setxxx}
+\def\setxxx#1{\setyyy#1 \endsetyyy}
 \def\setyyy#1 #2\endsetyyy{%
-  {%
-    \makevalueexpandable
-    \def\temp{#2}%
-    \edef\next{\gdef\makecsname{SET#1}}%
-    \ifx\temp\empty
-      \next{}%
-    \else
-      \setzzz#2\endsetzzz
-    \fi
-  }%
+  \def\temp{#2}%
+  \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty
+  \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted.
+  \fi
+  \endgroup
 }
-% Remove the trailing space \setxxx inserted.
-\def\setzzz#1 \endsetzzz{\next{#1}}
+% Can't use \xdef to pre-expand #2 and save some time, since \temp or
+% \next or other control sequences that we've defined might get us into
+% an infinite loop. Consider `@set foo @cite{bar}'.
+\def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}}
 
 % @clear VAR clears (i.e., unsets) the variable VAR.
 %
-\parseargdef\clear{%
-  {%
-    \makevalueexpandable
-    \global\expandafter\let\csname SET#1\endcsname=\relax
-  }%
-}
+\def\clear{\parsearg\clearxxx}
+\def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax}
 
 % @value{foo} gets the text saved in variable foo.
-\def\value{\begingroup\makevalueexpandable\valuexxx}
-\def\valuexxx#1{\expandablevalue{#1}\endgroup}
 {
-  \catcode`\- = \active \catcode`\_ = \active
+  \catcode`\_ = \active
   %
-  \gdef\makevalueexpandable{%
-    \let\value = \expandablevalue
-    % We don't want these characters active, ...
-    \catcode`\-=\other \catcode`\_=\other
-    % ..., but we might end up with active ones in the argument if
-    % we're called from @code, as @code{@value{foo-bar_}}, though.
-    % So \let them to their normal equivalents.
-    \let-\realdash \let_\normalunderscore
-  }
+  % We might end up with active _ or - characters in the argument if
+  % we're called from @code, as @code{@value{foo-bar_}}.  So \let any
+  % such active characters to their normal equivalents.
+  \gdef\value{\begingroup
+    \catcode`\-=12 \catcode`\_=12
+    \indexbreaks \let_\normalunderscore
+    \valuexxx}
 }
+\def\valuexxx#1{\expandablevalue{#1}\endgroup}
 
 % We have this subroutine so that we can handle at least some @value's
-% properly in indexes (we call \makevalueexpandable in \indexdummies).
-% The command has to be fully expandable (if the variable is set), since
-% the result winds up in the index file.  This means that if the
-% variable's value contains other Texinfo commands, it's almost certain
-% it will fail (although perhaps we could fix that with sufficient work
-% to do a one-level expansion on the result, instead of complete).
+% properly in indexes (we \let\value to this in \indexdummies).  Ones
+% whose names contain - or _ still won't work, but we can't do anything
+% about that.  The command has to be fully expandable, since the result
+% winds up in the index file.  This means that if the variable's value
+% contains other Texinfo commands, it's almost certain it will fail
+% (although perhaps we could fix that with sufficient work to do a
+% one-level expansion on the result, instead of complete).
 %
 \def\expandablevalue#1{%
   \expandafter\ifx\csname SET#1\endcsname\relax
     {[No value for ``#1'']}%
-    \message{Variable `#1', used in @value, is not set.}%
   \else
     \csname SET#1\endcsname
   \fi
@@ -2883,36 +2502,66 @@ width0pt\relax} \fi
 % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
 % with @set.
 %
-% To get special treatment of `@end ifset,' call \makeond and the redefine.
-%
-\makecond{ifset}
-\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
-\def\doifset#1#2{%
-  {%
-    \makevalueexpandable
-    \let\next=\empty
-    \expandafter\ifx\csname SET#2\endcsname\relax
-      #1% If not set, redefine \next.
-    \fi
-    \expandafter
-  }\next
+\def\ifset{\parsearg\ifsetxxx}
+\def\ifsetxxx #1{%
+  \expandafter\ifx\csname SET#1\endcsname\relax
+    \expandafter\ifsetfail
+  \else
+    \expandafter\ifsetsucceed
+  \fi
 }
-\def\ifsetfail{\doignore{ifset}}
+\def\ifsetsucceed{\conditionalsucceed{ifset}}
+\def\ifsetfail{\nestedignore{ifset}}
+\defineunmatchedend{ifset}
 
 % @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
 % defined with @set, or has been undefined with @clear.
 %
-% The `\else' inside the `\doifset' parameter is a trick to reuse the
-% above code: if the variable is not set, do nothing, if it is set,
-% then redefine \next to \ifclearfail.
-%
-\makecond{ifclear}
-\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
-\def\ifclearfail{\doignore{ifclear}}
+\def\ifclear{\parsearg\ifclearxxx}
+\def\ifclearxxx #1{%
+  \expandafter\ifx\csname SET#1\endcsname\relax
+    \expandafter\ifclearsucceed
+  \else
+    \expandafter\ifclearfail
+  \fi
+}
+\def\ifclearsucceed{\conditionalsucceed{ifclear}}
+\def\ifclearfail{\nestedignore{ifclear}}
+\defineunmatchedend{ifclear}
+
+% @iftex, @ifnothtml, @ifnotinfo always succeed; we read the text
+% following, through the first @end iftex (etc.).  Make `@end iftex'
+% (etc.) valid only after an @iftex.
+%
+\def\iftex{\conditionalsucceed{iftex}}
+\def\ifnothtml{\conditionalsucceed{ifnothtml}}
+\def\ifnotinfo{\conditionalsucceed{ifnotinfo}}
+\defineunmatchedend{iftex}
+\defineunmatchedend{ifnothtml}
+\defineunmatchedend{ifnotinfo}
+
+% We can't just want to start a group at @iftex (for example) and end it
+% at @end iftex, since then @set commands inside the conditional have no
+% effect (they'd get reverted at the end of the group).  So we must
+% define \Eiftex to redefine itself to be its previous value.  (We can't
+% just define it to fail again with an ``unmatched end'' error, since
+% the @ifset might be nested.)
+%
+\def\conditionalsucceed#1{%
+  \edef\temp{%
+    % Remember the current value of \E#1.
+    \let\nece{prevE#1} = \nece{E#1}%
+    %
+    % At the `@end #1', redefine \E#1 to be its previous value.
+    \def\nece{E#1}{\let\nece{E#1} = \nece{prevE#1}}%
+  }%
+  \temp
+}
 
-% @dircategory CATEGORY  -- specify a category of the dir file
-% which this file should belong to.  Ignore this in TeX.
-\let\dircategory=\comment
+% We need to expand lots of \csname's, but we don't want to expand the
+% control sequences after we've constructed them.
+%
+\def\nece#1{\expandafter\noexpand\csname#1\endcsname}
 
 % @defininfoenclose.
 \let\definfoenclose=\comment
@@ -2944,48 +2593,42 @@ width0pt\relax} \fi
 }
 
 % @defindex foo  ==  \newindex{foo}
-%
+
 \def\defindex{\parsearg\newindex}
 
 % Define @defcodeindex, like @defindex except put all entries in @code.
-%
-\def\defcodeindex{\parsearg\newcodeindex}
-%
+
 \def\newcodeindex#1{%
   \iflinks
     \expandafter\newwrite \csname#1indfile\endcsname
     \openout \csname#1indfile\endcsname \jobname.#1
   \fi
   \expandafter\xdef\csname#1index\endcsname{%
-    \noexpand\docodeindex{#1}}%
+    \noexpand\docodeindex{#1}}
 }
 
+\def\defcodeindex{\parsearg\newcodeindex}
 
 % @synindex foo bar    makes index foo feed into index bar.
 % Do this instead of @defindex foo if you don't want it as a separate index.
-%
+% The \closeout helps reduce unnecessary open files; the limit on the
+% Acorn RISC OS is a mere 16 files.
+\def\synindex#1 #2 {%
+  \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname
+  \expandafter\closeout\csname#1indfile\endcsname
+  \expandafter\let\csname#1indfile\endcsname=\synindexfoo
+  \expandafter\xdef\csname#1index\endcsname{% define \xxxindex
+    \noexpand\doindex{#2}}%
+}
+
 % @syncodeindex foo bar   similar, but put all entries made for index foo
 % inside @code.
-%
-\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}}
-\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}}
-
-% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo),
-% #3 the target index (bar).
-\def\dosynindex#1#2#3{%
-  % Only do \closeout if we haven't already done it, else we'll end up
-  % closing the target index.
-  \expandafter \ifx\csname donesynindex#2\endcsname \undefined
-    % The \closeout helps reduce unnecessary open files; the limit on the
-    % Acorn RISC OS is a mere 16 files.
-    \expandafter\closeout\csname#2indfile\endcsname
-    \expandafter\let\csname\donesynindex#2\endcsname = 1
-  \fi
-  % redefine \fooindfile:
-  \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
-  \expandafter\let\csname#2indfile\endcsname=\temp
-  % redefine \fooindex:
-  \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}%
+\def\syncodeindex#1 #2 {%
+  \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname
+  \expandafter\closeout\csname#1indfile\endcsname
+  \expandafter\let\csname#1indfile\endcsname=\synindexfoo
+  \expandafter\xdef\csname#1index\endcsname{% define \xxxindex
+    \noexpand\docodeindex{#2}}%
 }
 
 % Define \doindex, the driver for all \fooindex macros.
@@ -3005,388 +2648,265 @@ width0pt\relax} \fi
 \def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer}
 \def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}}
 
-% Take care of Texinfo commands that can appear in an index entry.
-% Since there are some commands we want to expand, and others we don't,
-% we have to laboriously prevent expansion for those that we don't.
-%
 \def\indexdummies{%
-  \def\@{@}% change to @@ when we switch to @ as escape char in index files.
-  \def\ {\realbackslash\space }%
-  % Need these in case \tex is in effect and \{ is a \delimiter again.
-  % But can't use \lbracecmd and \rbracecmd because texindex assumes
-  % braces and backslashes are used only as delimiters.
-  \let\{ = \mylbrace
-  \let\} = \myrbrace
-  %
-  % \definedummyword defines \#1 as \realbackslash #1\space, thus
-  % effectively preventing its expansion.  This is used only for control
-  % words, not control letters, because the \space would be incorrect
-  % for control characters, but is needed to separate the control word
-  % from whatever follows.
-  %
-  % For control letters, we have \definedummyletter, which omits the
-  % space.
-  %
-  % These can be used both for control words that take an argument and
-  % those that do not.  If it is followed by {arg} in the input, then
-  % that will dutifully get written to the index (or wherever).
-  %
-  \def\definedummyword##1{%
-    \expandafter\def\csname ##1\endcsname{\realbackslash ##1\space}%
-  }%
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{\realbackslash ##1}%
-  }%
-  %
-  % Do the redefinitions.
-  \commondummies
-}
-
-% For the aux file, @ is the escape character.  So we want to redefine
-% everything using @ instead of \realbackslash.  When everything uses
-% @, this will be simpler.
-%
-\def\atdummies{%
-  \def\@{@@}%
-  \def\ {@ }%
-  \let\{ = \lbraceatcmd
-  \let\} = \rbraceatcmd
-  %
-  % (See comments in \indexdummies.)
-  \def\definedummyword##1{%
-    \expandafter\def\csname ##1\endcsname{@##1\space}%
-  }%
-  \def\definedummyletter##1{%
-    \expandafter\def\csname ##1\endcsname{@##1}%
-  }%
-  %
-  % Do the redefinitions.
-  \commondummies
-}
-
-% Called from \indexdummies and \atdummies.  \definedummyword and
-% \definedummyletter must be defined first.
-%
-\def\commondummies{%
-  %
-  \normalturnoffactive
-  %
-  \commondummiesnofonts
-  %
-  \definedummyletter{_}%
-  %
-  % Non-English letters.
-  \definedummyword{AA}%
-  \definedummyword{AE}%
-  \definedummyword{L}%
-  \definedummyword{OE}%
-  \definedummyword{O}%
-  \definedummyword{aa}%
-  \definedummyword{ae}%
-  \definedummyword{l}%
-  \definedummyword{oe}%
-  \definedummyword{o}%
-  \definedummyword{ss}%
-  \definedummyword{exclamdown}%
-  \definedummyword{questiondown}%
-  \definedummyword{ordf}%
-  \definedummyword{ordm}%
-  %
-  % Although these internal commands shouldn't show up, sometimes they do.
-  \definedummyword{bf}%
-  \definedummyword{gtr}%
-  \definedummyword{hat}%
-  \definedummyword{less}%
-  \definedummyword{sf}%
-  \definedummyword{sl}%
-  \definedummyword{tclose}%
-  \definedummyword{tt}%
-  %
-  \definedummyword{LaTeX}%
-  \definedummyword{TeX}%
-  %
-  % Assorted special characters.
-  \definedummyword{bullet}%
-  \definedummyword{copyright}%
-  \definedummyword{registeredsymbol}%
-  \definedummyword{dots}%
-  \definedummyword{enddots}%
-  \definedummyword{equiv}%
-  \definedummyword{error}%
-  \definedummyword{expansion}%
-  \definedummyword{minus}%
-  \definedummyword{pounds}%
-  \definedummyword{point}%
-  \definedummyword{print}%
-  \definedummyword{result}%
-  %
-  % Handle some cases of @value -- where it does not contain any
-  % (non-fully-expandable) commands.
-  \makevalueexpandable
-  %
-  % Normal spaces, not active ones.
-  \unsepspaces
-  %
-  % No macro expansion.
-  \turnoffmacros
-}
-
-% \commondummiesnofonts: common to \commondummies and \indexnofonts.
-%
-% Better have this without active chars.
-{
-  \catcode`\~=\other
-  \gdef\commondummiesnofonts{%
-    % Control letters and accents.
-    \definedummyletter{!}%
-    \definedummyletter{"}%
-    \definedummyletter{'}%
-    \definedummyletter{*}%
-    \definedummyletter{,}%
-    \definedummyletter{.}%
-    \definedummyletter{/}%
-    \definedummyletter{:}%
-    \definedummyletter{=}%
-    \definedummyletter{?}%
-    \definedummyletter{^}%
-    \definedummyletter{`}%
-    \definedummyletter{~}%
-    \definedummyword{u}%
-    \definedummyword{v}%
-    \definedummyword{H}%
-    \definedummyword{dotaccent}%
-    \definedummyword{ringaccent}%
-    \definedummyword{tieaccent}%
-    \definedummyword{ubaraccent}%
-    \definedummyword{udotaccent}%
-    \definedummyword{dotless}%
-    %
-    % Texinfo font commands.
-    \definedummyword{b}%
-    \definedummyword{i}%
-    \definedummyword{r}%
-    \definedummyword{sc}%
-    \definedummyword{t}%
-    %
-    % Commands that take arguments.
-    \definedummyword{acronym}%
-    \definedummyword{cite}%
-    \definedummyword{code}%
-    \definedummyword{command}%
-    \definedummyword{dfn}%
-    \definedummyword{emph}%
-    \definedummyword{env}%
-    \definedummyword{file}%
-    \definedummyword{kbd}%
-    \definedummyword{key}%
-    \definedummyword{math}%
-    \definedummyword{option}%
-    \definedummyword{samp}%
-    \definedummyword{strong}%
-    \definedummyword{tie}%
-    \definedummyword{uref}%
-    \definedummyword{url}%
-    \definedummyword{var}%
-    \definedummyword{verb}%
-    \definedummyword{w}%
-  }
-}
+\def\ { }%
+% Take care of the plain tex accent commands.
+\def\"{\realbackslash "}%
+\def\`{\realbackslash `}%
+\def\'{\realbackslash '}%
+\def\^{\realbackslash ^}%
+\def\~{\realbackslash ~}%
+\def\={\realbackslash =}%
+\def\b{\realbackslash b}%
+\def\c{\realbackslash c}%
+\def\d{\realbackslash d}%
+\def\u{\realbackslash u}%
+\def\v{\realbackslash v}%
+\def\H{\realbackslash H}%
+% Take care of the plain tex special European modified letters.
+\def\oe{\realbackslash oe}%
+\def\ae{\realbackslash ae}%
+\def\aa{\realbackslash aa}%
+\def\OE{\realbackslash OE}%
+\def\AE{\realbackslash AE}%
+\def\AA{\realbackslash AA}%
+\def\o{\realbackslash o}%
+\def\O{\realbackslash O}%
+\def\l{\realbackslash l}%
+\def\L{\realbackslash L}%
+\def\ss{\realbackslash ss}%
+% Take care of texinfo commands likely to appear in an index entry.
+% (Must be a way to avoid doing expansion at all, and thus not have to
+% laboriously list every single command here.)
+\def\@{@}% will be @@ when we switch to @ as escape char.
+% Need these in case \tex is in effect and \{ is a \delimiter again.
+% But can't use \lbracecmd and \rbracecmd because texindex assumes
+% braces and backslashes are used only as delimiters.  
+\let\{ = \mylbrace
+\let\} = \myrbrace
+\def\_{{\realbackslash _}}%
+\def\w{\realbackslash w }%
+\def\bf{\realbackslash bf }%
+%\def\rm{\realbackslash rm }%
+\def\sl{\realbackslash sl }%
+\def\sf{\realbackslash sf}%
+\def\tt{\realbackslash tt}%
+\def\gtr{\realbackslash gtr}%
+\def\less{\realbackslash less}%
+\def\hat{\realbackslash hat}%
+\def\TeX{\realbackslash TeX}%
+\def\dots{\realbackslash dots }%
+\def\result{\realbackslash result}%
+\def\equiv{\realbackslash equiv}%
+\def\expansion{\realbackslash expansion}%
+\def\print{\realbackslash print}%
+\def\error{\realbackslash error}%
+\def\point{\realbackslash point}%
+\def\copyright{\realbackslash copyright}%
+\def\tclose##1{\realbackslash tclose {##1}}%
+\def\code##1{\realbackslash code {##1}}%
+\def\uref##1{\realbackslash uref {##1}}%
+\def\url##1{\realbackslash url {##1}}%
+\def\env##1{\realbackslash env {##1}}%
+\def\command##1{\realbackslash command {##1}}%
+\def\option##1{\realbackslash option {##1}}%
+\def\dotless##1{\realbackslash dotless {##1}}%
+\def\samp##1{\realbackslash samp {##1}}%
+\def\,##1{\realbackslash ,{##1}}%
+\def\t##1{\realbackslash t {##1}}%
+\def\r##1{\realbackslash r {##1}}%
+\def\i##1{\realbackslash i {##1}}%
+\def\b##1{\realbackslash b {##1}}%
+\def\sc##1{\realbackslash sc {##1}}%
+\def\cite##1{\realbackslash cite {##1}}%
+\def\key##1{\realbackslash key {##1}}%
+\def\file##1{\realbackslash file {##1}}%
+\def\var##1{\realbackslash var {##1}}%
+\def\kbd##1{\realbackslash kbd {##1}}%
+\def\dfn##1{\realbackslash dfn {##1}}%
+\def\emph##1{\realbackslash emph {##1}}%
+\def\acronym##1{\realbackslash acronym {##1}}%
+%
+% Handle some cases of @value -- where the variable name does not
+% contain - or _, and the value does not contain any
+% (non-fully-expandable) commands.
+\let\value = \expandablevalue
+%
+\unsepspaces
+% Turn off macro expansion
+\turnoffmacros
+}
+
+% If an index command is used in an @example environment, any spaces
+% therein should become regular spaces in the raw index file, not the
+% expansion of \tie (\\leavevmode \penalty \@M \ ).
+{\obeyspaces
+ \gdef\unsepspaces{\obeyspaces\let =\space}}
+
+% \indexnofonts no-ops all font-change commands.
+% This is used when outputting the strings to sort the index by.
+\def\indexdummyfont#1{#1}
+\def\indexdummytex{TeX}
+\def\indexdummydots{...}
 
-% \indexnofonts is used when outputting the strings to sort the index
-% by, and when constructing control sequence names.  It eliminates all
-% control sequences and just writes whatever the best ASCII sort string
-% would be for a given command (usually its argument).
-%
 \def\indexnofonts{%
-  \def\definedummyword##1{%
-    \expandafter\let\csname ##1\endcsname\asis
-  }%
-  \let\definedummyletter=\definedummyword
-  %
-  \commondummiesnofonts
-  %
-  % Don't no-op \tt, since it isn't a user-level command
-  % and is used in the definitions of the active chars like <, >, |, etc.
-  % Likewise with the other plain tex font commands.
-  %\let\tt=\asis
-  %
-  \def\ { }%
-  \def\@{@}%
-  % how to handle braces?
-  \def\_{\normalunderscore}%
-  %
-  % Non-English letters.
-  \def\AA{AA}%
-  \def\AE{AE}%
-  \def\L{L}%
-  \def\OE{OE}%
-  \def\O{O}%
-  \def\aa{aa}%
-  \def\ae{ae}%
-  \def\l{l}%
-  \def\oe{oe}%
-  \def\o{o}%
-  \def\ss{ss}%
-  \def\exclamdown{!}%
-  \def\questiondown{?}%
-  \def\ordf{a}%
-  \def\ordm{o}%
-  %
-  \def\LaTeX{LaTeX}%
-  \def\TeX{TeX}%
-  %
-  % Assorted special characters.
-  % (The following {} will end up in the sort string, but that's ok.)
-  \def\bullet{bullet}%
-  \def\copyright{copyright}%
-  \def\registeredsymbol{R}%
-  \def\dots{...}%
-  \def\enddots{...}%
-  \def\equiv{==}%
-  \def\error{error}%
-  \def\expansion{==>}%
-  \def\minus{-}%
-  \def\pounds{pounds}%
-  \def\point{.}%
-  \def\print{-|}%
-  \def\result{=>}%
-}
+% Just ignore accents.
+\let\,=\indexdummyfont
+\let\"=\indexdummyfont
+\let\`=\indexdummyfont
+\let\'=\indexdummyfont
+\let\^=\indexdummyfont
+\let\~=\indexdummyfont
+\let\==\indexdummyfont
+\let\b=\indexdummyfont
+\let\c=\indexdummyfont
+\let\d=\indexdummyfont
+\let\u=\indexdummyfont
+\let\v=\indexdummyfont
+\let\H=\indexdummyfont
+\let\dotless=\indexdummyfont
+% Take care of the plain tex special European modified letters.
+\def\oe{oe}%
+\def\ae{ae}%
+\def\aa{aa}%
+\def\OE{OE}%
+\def\AE{AE}%
+\def\AA{AA}%
+\def\o{o}%
+\def\O{O}%
+\def\l{l}%
+\def\L{L}%
+\def\ss{ss}%
+\let\w=\indexdummyfont
+\let\t=\indexdummyfont
+\let\r=\indexdummyfont
+\let\i=\indexdummyfont
+\let\b=\indexdummyfont
+\let\emph=\indexdummyfont
+\let\strong=\indexdummyfont
+\let\cite=\indexdummyfont
+\let\sc=\indexdummyfont
+%Don't no-op \tt, since it isn't a user-level command
+% and is used in the definitions of the active chars like <, >, |...
+%\let\tt=\indexdummyfont
+\let\tclose=\indexdummyfont
+\let\code=\indexdummyfont
+\let\url=\indexdummyfont
+\let\uref=\indexdummyfont
+\let\env=\indexdummyfont
+\let\acronym=\indexdummyfont
+\let\command=\indexdummyfont
+\let\option=\indexdummyfont
+\let\file=\indexdummyfont
+\let\samp=\indexdummyfont
+\let\kbd=\indexdummyfont
+\let\key=\indexdummyfont
+\let\var=\indexdummyfont
+\let\TeX=\indexdummytex
+\let\dots=\indexdummydots
+\def\@{@}%
+}
+
+% To define \realbackslash, we must make \ not be an escape.
+% We must first make another character (@) an escape
+% so we do not become unable to do a definition.
+
+{\catcode`\@=0 \catcode`\\=\other
+ @gdef@realbackslash{\}}
 
 \let\indexbackslash=0  %overridden during \printindex.
 \let\SETmarginindex=\relax % put index entries in margin (undocumented)?
 
+% For \ifx comparisons.
+\def\emptymacro{\empty}
+
 % Most index entries go through here, but \dosubind is the general case.
-% #1 is the index name, #2 is the entry text.
-\def\doind#1#2{\dosubind{#1}{#2}{}}
+%
+\def\doind#1#2{\dosubind{#1}{#2}\empty}
 
 % Workhorse for all \fooindexes.
 % #1 is name of index, #2 is stuff to put there, #3 is subentry --
-% empty if called from \doind, as we usually are (the main exception
-% is with most defuns, which call us directly).
+% \empty if called from \doind, as we usually are.  The main exception
+% is with defuns, which call us directly.
 %
 \def\dosubind#1#2#3{%
-  \iflinks
-  {%
-    % Store the main index entry text (including the third arg).
-    \toks0 = {#2}%
-    % If third arg is present, precede it with a space.
-    \def\thirdarg{#3}%
-    \ifx\thirdarg\empty \else
-      \toks0 = \expandafter{\the\toks0 \space #3}%
-    \fi
-    %
-    \edef\writeto{\csname#1indfile\endcsname}%
-    %
-    \ifvmode
-      \dosubindsanitize
-    \else
-      \dosubindwrite
-    \fi
-  }%
-  \fi
-}
-
-% Write the entry in \toks0 to the index file:
-%
-\def\dosubindwrite{%
   % Put the index entry in the margin if desired.
   \ifx\SETmarginindex\relax\else
-    \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
+    \insert\margin{\hbox{\vrule height8pt depth3pt width0pt #2}}%
   \fi
-  %
-  % Remember, we are within a group.
-  \indexdummies % Must do this here, since \bf, etc expand at this stage
-  \escapechar=`\\
-  \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
-      % so it will be output as is; and it will print as backslash.
-  %
-  % Process the index entry with all font commands turned off, to
-  % get the string to sort by.
-  {\indexnofonts
-   \edef\temp{\the\toks0}% need full expansion
-   \xdef\indexsorttmp{\temp}%
-  }%
-  %
-  % Set up the complete index entry, with both the sort key and
-  % the original text, including any font commands.  We write
-  % three arguments to \entry to the .?? file (four in the
-  % subentry case), texindex reduces to two when writing the .??s
-  % sorted result.
-  \edef\temp{%
-    \write\writeto{%
-      \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}%
+  {%
+    \count255=\lastpenalty
+    {%
+      \indexdummies % Must do this here, since \bf, etc expand at this stage
+      \escapechar=`\\
+      {%
+        \let\folio = 0% We will expand all macros now EXCEPT \folio.
+        \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
+        % so it will be output as is; and it will print as backslash.
+        %
+        \def\thirdarg{#3}%
+        %
+        % If third arg is present, precede it with space in sort key.
+        \ifx\thirdarg\emptymacro
+          \let\subentry = \empty
+        \else
+          \def\subentry{ #3}%
+        \fi
+        %
+        % First process the index entry with all font commands turned
+        % off to get the string to sort by.
+        {\indexnofonts \xdef\indexsorttmp{#2\subentry}}%
+        %
+        % Now the real index entry with the fonts.
+        \toks0 = {#2}%
+        %
+        % If third (subentry) arg is present, add it to the index
+        % string.  And include a space.
+        \ifx\thirdarg\emptymacro \else
+          \toks0 = \expandafter{\the\toks0 \space #3}%
+        \fi
+        %
+        % Set up the complete index entry, with both the sort key
+        % and the original text, including any font commands.  We write
+        % three arguments to \entry to the .?? file, texindex reduces to
+        % two when writing the .??s sorted result.
+        \edef\temp{%
+          \write\csname#1indfile\endcsname{%
+            \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}%
+        }%
+        %
+        % If a skip is the last thing on the list now, preserve it
+        % by backing up by \lastskip, doing the \write, then inserting
+        % the skip again.  Otherwise, the whatsit generated by the
+        % \write will make \lastskip zero.  The result is that sequences
+        % like this:
+        % @end defun
+        % @tindex whatever
+        % @defun ...
+        % will have extra space inserted, because the \medbreak in the
+        % start of the @defun won't see the skip inserted by the @end of
+        % the previous defun.
+        %
+        % But don't do any of this if we're not in vertical mode.  We
+        % don't want to do a \vskip and prematurely end a paragraph.
+        %
+        % Avoid page breaks due to these extra skips, too.
+        %
+        \iflinks
+          \ifvmode
+            \skip0 = \lastskip
+            \ifdim\lastskip = 0pt \else \nobreak\vskip-\lastskip \fi
+          \fi
+          %
+          \temp % do the write
+          %
+          %
+          \ifvmode \ifdim\skip0 = 0pt \else \nobreak\vskip\skip0 \fi \fi
+        \fi
+      }%
+    }%
+    \penalty\count255
   }%
-  \temp
-}
-
-% Take care of unwanted page breaks:
-%
-% If a skip is the last thing on the list now, preserve it
-% by backing up by \lastskip, doing the \write, then inserting
-% the skip again.  Otherwise, the whatsit generated by the
-% \write will make \lastskip zero.  The result is that sequences
-% like this:
-% @end defun
-% @tindex whatever
-% @defun ...
-% will have extra space inserted, because the \medbreak in the
-% start of the @defun won't see the skip inserted by the @end of
-% the previous defun.
-%
-% But don't do any of this if we're not in vertical mode.  We
-% don't want to do a \vskip and prematurely end a paragraph.
-%
-% Avoid page breaks due to these extra skips, too.
-%
-% But wait, there is a catch there:
-% We'll have to check whether \lastskip is zero skip.  \ifdim is not
-% sufficient for this purpose, as it ignores stretch and shrink parts
-% of the skip.  The only way seems to be to check the textual
-% representation of the skip.
-%
-% The following is almost like \def\zeroskipmacro{0.0pt} except that
-% the ``p'' and ``t'' characters have catcode \other, not 11 (letter).
-%
-\edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname}
-%
-% ..., ready, GO:
-%
-\def\dosubindsanitize{%
-  % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
-  \skip0 = \lastskip
-  \edef\lastskipmacro{\the\lastskip}%
-  \count255 = \lastpenalty
-  %
-  % If \lastskip is nonzero, that means the last item was a
-  % skip.  And since a skip is discardable, that means this
-  % -\skip0 glue we're inserting is preceded by a
-  % non-discardable item, therefore it is not a potential
-  % breakpoint, therefore no \nobreak needed.
-  \ifx\lastskipmacro\zeroskipmacro
-  \else
-    \vskip-\skip0
-  \fi
-  %
-  \dosubindwrite
-  %
-  \ifx\lastskipmacro\zeroskipmacro
-    % if \lastskip was zero, perhaps the last item was a
-    % penalty, and perhaps it was >=10000, e.g., a \nobreak.
-    % In that case, we want to re-insert the penalty; since we
-    % just inserted a non-discardable item, any following glue
-    % (such as a \parskip) would be a breakpoint.  For example:
-    %   @deffn deffn-whatever
-    %   @vindex index-whatever
-    %   Description.
-    % would allow a break between the index-whatever whatsit
-    % and the "Description." paragraph.
-    \ifnum\count255>9999 \nobreak \fi
-  \else
-    % On the other hand, if we had a nonzero \lastskip,
-    % this make-up glue would be preceded by a non-discardable item
-    % (the whatsit from the \write), so we must insert a \nobreak.
-    \nobreak\vskip\skip0
-  \fi
 }
 
 % The index entry written in the file actually looks like
@@ -3424,12 +2944,13 @@ width0pt\relax} \fi
 % @printindex causes a particular index (the ??s file) to get printed.
 % It does not print any chapter heading (usually an @unnumbered).
 %
-\parseargdef\printindex{\begingroup
+\def\printindex{\parsearg\doprintindex}
+\def\doprintindex#1{\begingroup
   \dobreak \chapheadingskip{10000}%
   %
   \smallfonts \rm
   \tolerance = 9500
-  \everypar = {}% don't want the \kern\-parindent from indentation suppression.
+  \indexbreaks
   %
   % See if the index file exists and is nonempty.
   % Change catcode of @ here so that if the index file contains
@@ -3456,7 +2977,7 @@ width0pt\relax} \fi
       % Index files are almost Texinfo source, but we use \ as the escape
       % character.  It would be better to use @, but that's too big a change
       % to make right now.
-      \def\indexbackslash{\backslashcurfont}%
+      \def\indexbackslash{\rawbackslashxx}%
       \catcode`\\ = 0
       \escapechar = `\\
       \begindoublecolumns
@@ -3494,95 +3015,74 @@ width0pt\relax} \fi
   \nobreak
 }}
 
-% \entry typesets a paragraph consisting of the text (#1), dot leaders, and
-% then page number (#2) flushed to the right margin.  It is used for index
-% and table of contents entries.  The paragraph is indented by \leftskip.
+% This typesets a paragraph consisting of #1, dot leaders, and then #2
+% flush to the right margin.  It is used for index and table of contents
+% entries.  The paragraph is indented by \leftskip.
 %
-% A straightforward implementation would start like this:
-%	\def\entry#1#2{...
-% But this frozes the catcodes in the argument, and can cause problems to
-% @code, which sets - active.  This problem was fixed by a kludge---
-% ``-'' was active throughout whole index, but this isn't really right.
-% 
-% The right solution is to prevent \entry from swallowing the whole text.
-%                                 --kasal, 21nov03
-\def\entry{%
-  \begingroup
-    %
-    % Start a new paragraph if necessary, so our assignments below can't
-    % affect previous text.
-    \par
-    %
-    % Do not fill out the last line with white space.
-    \parfillskip = 0in
-    %
-    % No extra space above this paragraph.
-    \parskip = 0in
-    %
-    % Do not prefer a separate line ending with a hyphen to fewer lines.
-    \finalhyphendemerits = 0
-    %
-    % \hangindent is only relevant when the entry text and page number
-    % don't both fit on one line.  In that case, bob suggests starting the
-    % dots pretty far over on the line.  Unfortunately, a large
-    % indentation looks wrong when the entry text itself is broken across
-    % lines.  So we use a small indentation and put up with long leaders.
-    %
-    % \hangafter is reset to 1 (which is the value we want) at the start
-    % of each paragraph, so we need not do anything with that.
-    \hangindent = 2em
-    %
-    % When the entry text needs to be broken, just fill out the first line
-    % with blank space.
-    \rightskip = 0pt plus1fil
-    %
-    % A bit of stretch before each entry for the benefit of balancing
-    % columns.
-    \vskip 0pt plus1pt
+\def\entry#1#2{\begingroup
+  %
+  % Start a new paragraph if necessary, so our assignments below can't
+  % affect previous text.
+  \par
+  %
+  % Do not fill out the last line with white space.
+  \parfillskip = 0in
+  %
+  % No extra space above this paragraph.
+  \parskip = 0in
+  %
+  % Do not prefer a separate line ending with a hyphen to fewer lines.
+  \finalhyphendemerits = 0
+  %
+  % \hangindent is only relevant when the entry text and page number
+  % don't both fit on one line.  In that case, bob suggests starting the
+  % dots pretty far over on the line.  Unfortunately, a large
+  % indentation looks wrong when the entry text itself is broken across
+  % lines.  So we use a small indentation and put up with long leaders.
+  %
+  % \hangafter is reset to 1 (which is the value we want) at the start
+  % of each paragraph, so we need not do anything with that.
+  \hangindent = 2em
+  %
+  % When the entry text needs to be broken, just fill out the first line
+  % with blank space.
+  \rightskip = 0pt plus1fil
+  %
+  % A bit of stretch before each entry for the benefit of balancing columns.
+  \vskip 0pt plus1pt
+  %
+  % Start a ``paragraph'' for the index entry so the line breaking
+  % parameters we've set above will have an effect.
+  \noindent
+  %
+  % Insert the text of the index entry.  TeX will do line-breaking on it.
+  #1%
+  % The following is kludged to not output a line of dots in the index if
+  % there are no page numbers.  The next person who breaks this will be
+  % cursed by a Unix daemon.
+  \def\tempa{{\rm }}%
+  \def\tempb{#2}%
+  \edef\tempc{\tempa}%
+  \edef\tempd{\tempb}%
+  \ifx\tempc\tempd\ \else%
     %
-    % Swallow the left brace of the text (first parameter):
-    \afterassignment\doentry
-    \let\temp =
-}
-\def\doentry{%
-    \bgroup % Instead of the swallowed brace.
-      \noindent
-      \aftergroup\finishentry
-      % And now comes the text of the entry.
-}
-\def\finishentry#1{%
-    % #1 is the page number.
+    % If we must, put the page number on a line of its own, and fill out
+    % this line with blank space.  (The \hfil is overwhelmed with the
+    % fill leaders glue in \indexdotfill if the page number does fit.)
+    \hfil\penalty50
+    \null\nobreak\indexdotfill % Have leaders before the page number.
     %
-    % The following is kludged to not output a line of dots in the index if
-    % there are no page numbers.  The next person who breaks this will be
-    % cursed by a Unix daemon.
-    \def\tempa{{\rm }}%
-    \def\tempb{#1}%
-    \edef\tempc{\tempa}%
-    \edef\tempd{\tempb}%
-    \ifx\tempc\tempd
-      \ %
+    % The `\ ' here is removed by the implicit \unskip that TeX does as
+    % part of (the primitive) \par.  Without it, a spurious underfull
+    % \hbox ensues.
+    \ifpdf
+      \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
     \else
-      %
-      % If we must, put the page number on a line of its own, and fill out
-      % this line with blank space.  (The \hfil is overwhelmed with the
-      % fill leaders glue in \indexdotfill if the page number does fit.)
-      \hfil\penalty50
-      \null\nobreak\indexdotfill % Have leaders before the page number.
-      %
-      % The `\ ' here is removed by the implicit \unskip that TeX does as
-      % part of (the primitive) \par.  Without it, a spurious underfull
-      % \hbox ensues.
-      \ifpdf
-	\pdfgettoks#1.%
-	\ \the\toksA
-      \else
-	\ #1%
-      \fi
+      \ #2% The page number ends the paragraph.
     \fi
-    \par
-  \endgroup
-}
+  \fi%
+  \par
+\endgroup}
 
 % Like \dotfill except takes at least 1 em.
 \def\indexdotfill{\cleaders
@@ -3591,18 +3091,11 @@ width0pt\relax} \fi
 \def\primary #1{\line{#1\hfil}}
 
 \newskip\secondaryindent \secondaryindent=0.5cm
-\def\secondary#1#2{{%
-  \parfillskip=0in
-  \parskip=0in
-  \hangindent=1in
-  \hangafter=1
-  \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill
-  \ifpdf
-    \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
-  \else
-    #2
-  \fi
-  \par
+
+\def\secondary #1#2{
+{\parfillskip=0in \parskip=0in
+\hangindent =1in \hangafter=1
+\noindent\hskip\secondaryindent\hbox{#1}\indexdotfill #2\par
 }}
 
 % Define two-column mode, which we use to typeset indexes.
@@ -3662,6 +3155,7 @@ width0pt\relax} \fi
   %
   % Double the \vsize as well.  (We don't need a separate register here,
   % since nobody clobbers \vsize.)
+  \advance\vsize by -\ht\partialpage
   \vsize = 2\vsize
 }
 
@@ -3675,7 +3169,6 @@ width0pt\relax} \fi
   % previous page.
   \dimen@ = \vsize
   \divide\dimen@ by 2
-  \advance\dimen@ by -\ht\partialpage
   %
   % box0 will be the left-hand column, box2 the right.
   \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
@@ -3683,18 +3176,15 @@ width0pt\relax} \fi
   \unvbox255
   \penalty\outputpenalty
 }
-%
-% Re-output the contents of the output page -- any previous material,
-% followed by the two boxes we just split, in box0 and box2.
 \def\pagesofar{%
+  % Re-output the contents of the output page -- any previous material,
+  % followed by the two boxes we just split, in box0 and box2.
   \unvbox\partialpage
   %
   \hsize = \doublecolumnhsize
   \wd0=\hsize \wd2=\hsize
   \hbox to\pagewidth{\box0\hfil\box2}%
 }
-%
-% All done with double columns.
 \def\enddoublecolumns{%
   \output = {%
     % Split the last of the double-column material.  Leave it on the
@@ -3719,9 +3209,8 @@ width0pt\relax} \fi
   % \endgroup where \vsize got restored).
   \pagegoal = \vsize
 }
-%
-% Called at the end of the double column material.
 \def\balancecolumns{%
+  % Called at the end of the double column material.
   \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120.
   \dimen@ = \ht0
   \advance\dimen@ by \topskip
@@ -3751,12 +3240,6 @@ width0pt\relax} \fi
 \message{sectioning,}
 % Chapters, sections, etc.
 
-% \unnumberedno is an oxymoron, of course.  But we count the unnumbered
-% sections so that we can refer to them unambiguously in the pdf
-% outlines by their "section number".  We avoid collisions with chapter
-% numbers by starting them at 10000.  (If a document ever has 10000
-% chapters, we're in trouble anyway, I'm sure.)
-\newcount\unnumberedno \unnumberedno = 10000
 \newcount\chapno
 \newcount\secno        \secno=0
 \newcount\subsecno     \subsecno=0
@@ -3764,12 +3247,9 @@ width0pt\relax} \fi
 
 % This counter is funny since it counts through charcodes of letters A, B, ...
 \newcount\appendixno  \appendixno = `\@
-%
 % \def\appendixletter{\char\the\appendixno}
-% We do the following ugly conditional instead of the above simple
-% construct for the sake of pdftex, which needs the actual
+% We do the following for the sake of pdftex, which needs the actual
 % letter in the expansion, not just typeset.
-% 
 \def\appendixletter{%
   \ifnum\appendixno=`A A%
   \else\ifnum\appendixno=`B B%
@@ -3807,12 +3287,11 @@ width0pt\relax} \fi
 
 % Each @chapter defines this as the name of the chapter.
 % page headings and footings can use it.  @section does likewise.
-% However, they are not reliable, because we don't use marks.
 \def\thischapter{}
 \def\thissection{}
 
 \newcount\absseclevel % used to calculate proper heading level
-\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
+\newcount\secbase\secbase=0 % @raise/lowersections modify this count
 
 % @raisesections: treat @section as chapter, @subsection as section, etc.
 \def\raisesections{\global\advance\secbase by -1}
@@ -3827,195 +3306,260 @@ width0pt\relax} \fi
 % #2 is text for heading
 \def\numhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
 \ifcase\absseclevel
-      \chapterzzz{#2}%
-  \or \seczzz{#2}%
-  \or \numberedsubseczzz{#2}%
-  \or \numberedsubsubseczzz{#2}%
+  \chapterzzz{#2}
+\or
+  \seczzz{#2}
+\or
+  \numberedsubseczzz{#2}
+\or
+  \numberedsubsubseczzz{#2}
+\else
+  \ifnum \absseclevel<0
+    \chapterzzz{#2}
   \else
-    \ifnum \absseclevel<0 \chapterzzz{#2}%
-    \else \numberedsubsubseczzz{#2}%
-    \fi
+    \numberedsubsubseczzz{#2}
   \fi
-  \suppressfirstparagraphindent
+\fi
 }
 
 % like \numhead, but chooses appendix heading levels
 \def\apphead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
 \ifcase\absseclevel
-      \appendixzzz{#2}%
-  \or \appendixsectionzzz{#2}%
-  \or \appendixsubseczzz{#2}%
-  \or \appendixsubsubseczzz{#2}%
+  \appendixzzz{#2}
+\or
+  \appendixsectionzzz{#2}
+\or
+  \appendixsubseczzz{#2}
+\or
+  \appendixsubsubseczzz{#2}
+\else
+  \ifnum \absseclevel<0
+    \appendixzzz{#2}
   \else
-    \ifnum \absseclevel<0 \appendixzzz{#2}%
-    \else \appendixsubsubseczzz{#2}%
-    \fi
+    \appendixsubsubseczzz{#2}
   \fi
-  \suppressfirstparagraphindent
+\fi
 }
 
 % like \numhead, but chooses numberless heading levels
 \def\unnmhead#1#2{\absseclevel=\secbase\advance\absseclevel by #1
-  \ifcase\absseclevel
-      \unnumberedzzz{#2}%
-  \or \unnumberedseczzz{#2}%
-  \or \unnumberedsubseczzz{#2}%
-  \or \unnumberedsubsubseczzz{#2}%
+\ifcase\absseclevel
+  \unnumberedzzz{#2}
+\or
+  \unnumberedseczzz{#2}
+\or
+  \unnumberedsubseczzz{#2}
+\or
+  \unnumberedsubsubseczzz{#2}
+\else
+  \ifnum \absseclevel<0
+    \unnumberedzzz{#2}
   \else
-    \ifnum \absseclevel<0 \unnumberedzzz{#2}%
-    \else \unnumberedsubsubseczzz{#2}%
-    \fi
+    \unnumberedsubsubseczzz{#2}
   \fi
-  \suppressfirstparagraphindent
+\fi
 }
 
-% @chapter, @appendix, @unnumbered.  Increment top-level counter, reset
-% all lower-level sectioning counters to zero.
-% 
-% Also set \chaplevelprefix, which we prepend to @float sequence numbers
-% (e.g., figures), q.v.  By default (before any chapter), that is empty.
-\let\chaplevelprefix = \empty
-% 
-\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz
-\def\chapterzzz#1{%
-  % section resetting is \global in case the chapter is in a group, such
-  % as an @include file.
-  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
-    \global\advance\chapno by 1
-  %
-  % Used for \float.
-  \gdef\chaplevelprefix{\the\chapno.}%
-  \resetallfloatnos
-  %
-  \message{\putwordChapter\space \the\chapno}%
-  %
-  % Write the actual heading.
-  \chapmacro{#1}{Ynumbered}{\the\chapno}%
-  %
-  % So @section and the like are numbered underneath this chapter.
-  \global\let\section = \numberedsec
-  \global\let\subsection = \numberedsubsec
-  \global\let\subsubsection = \numberedsubsubsec
-}
-
-\outer\parseargdef\appendix{\apphead0{#1}} % normally apphead0 calls appendixzzz
-\def\appendixzzz#1{%
-  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
-    \global\advance\appendixno by 1
-  \gdef\chaplevelprefix{\appendixletter.}%
-  \resetallfloatnos
-  %
-  \def\appendixnum{\putwordAppendix\space \appendixletter}%
-  \message{\appendixnum}%
-  %
-  \chapmacro{#1}{Yappendix}{\appendixletter}%
-  %
-  \global\let\section = \appendixsec
-  \global\let\subsection = \appendixsubsec
-  \global\let\subsubsection = \appendixsubsubsec
+% @chapter, @appendix, @unnumbered.
+\def\thischaptername{No Chapter Title}
+\outer\def\chapter{\parsearg\chapteryyy}
+\def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz
+\def\chapterzzz #1{%
+\secno=0 \subsecno=0 \subsubsecno=0
+\global\advance \chapno by 1 \message{\putwordChapter\space \the\chapno}%
+\chapmacro {#1}{\the\chapno}%
+\gdef\thissection{#1}%
+\gdef\thischaptername{#1}%
+% We don't substitute the actual chapter name into \thischapter
+% because we don't want its macros evaluated now.
+\xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}%
+\toks0 = {#1}%
+\edef\temp{\noexpand\writetocentry{\realbackslash chapentry{\the\toks0}%
+                                  {\the\chapno}}}%
+\temp
+\donoderef
+\global\let\section = \numberedsec
+\global\let\subsection = \numberedsubsec
+\global\let\subsubsection = \numberedsubsubsec
+}
+
+\outer\def\appendix{\parsearg\appendixyyy}
+\def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz
+\def\appendixzzz #1{%
+\secno=0 \subsecno=0 \subsubsecno=0
+\global\advance \appendixno by 1
+\message{\putwordAppendix\space \appendixletter}%
+\chapmacro {#1}{\putwordAppendix{} \appendixletter}%
+\gdef\thissection{#1}%
+\gdef\thischaptername{#1}%
+\xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}%
+\toks0 = {#1}%
+\edef\temp{\noexpand\writetocentry{\realbackslash chapentry{\the\toks0}%
+                       {\putwordAppendix{} \appendixletter}}}%
+\temp
+\appendixnoderef
+\global\let\section = \appendixsec
+\global\let\subsection = \appendixsubsec
+\global\let\subsubsection = \appendixsubsubsec
 }
 
 % @centerchap is like @unnumbered, but the heading is centered.
-\outer\parseargdef\centerchap{{\unnumberedyyy{#1}}}
-
-\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
-\def\unnumberedzzz#1{%
-  \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
-    \global\advance\unnumberedno by 1
-  %
-  % Since an unnumbered has no number, no prefix for figures.
-  \global\let\chaplevelprefix = \empty
-  \resetallfloatnos
-  %
-  % This used to be simply \message{#1}, but TeX fully expands the
-  % argument to \message.  Therefore, if #1 contained @-commands, TeX
-  % expanded them.  For example, in `@unnumbered The @cite{Book}', TeX
-  % expanded @cite (which turns out to cause errors because \cite is meant
-  % to be executed, not expanded).
-  %
-  % Anyway, we don't want the fully-expanded definition of @cite to appear
-  % as a result of the \message, we just want `@cite' itself.  We use
-  % \the<toks register> to achieve this: TeX expands \the<toks> only once,
-  % simply yielding the contents of <toks register>.  (We also do this for
-  % the toc entries.)
-  \toks0 = {#1}%
-  \message{(\the\toks0)}%
-  %
-  \chapmacro{#1}{Ynothing}{\the\unnumberedno}%
-  %
-  \global\let\section = \unnumberedsec
-  \global\let\subsection = \unnumberedsubsec
-  \global\let\subsubsection = \unnumberedsubsubsec
-}
+\outer\def\centerchap{\parsearg\centerchapyyy}
+\def\centerchapyyy #1{{\let\unnumbchapmacro=\centerchapmacro \unnumberedyyy{#1}}}
 
 % @top is like @unnumbered.
-\let\top\unnumbered
-
-% Sections.
-\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz
-\def\seczzz#1{%
-  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
-  \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%
+\outer\def\top{\parsearg\unnumberedyyy}
+
+\outer\def\unnumbered{\parsearg\unnumberedyyy}
+\def\unnumberedyyy #1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
+\def\unnumberedzzz #1{%
+\secno=0 \subsecno=0 \subsubsecno=0
+%
+% This used to be simply \message{#1}, but TeX fully expands the
+% argument to \message.  Therefore, if #1 contained @-commands, TeX
+% expanded them.  For example, in `@unnumbered The @cite{Book}', TeX
+% expanded @cite (which turns out to cause errors because \cite is meant
+% to be executed, not expanded).
+%
+% Anyway, we don't want the fully-expanded definition of @cite to appear
+% as a result of the \message, we just want `@cite' itself.  We use
+% \the<toks register> to achieve this: TeX expands \the<toks> only once,
+% simply yielding the contents of <toks register>.  (We also do this for
+% the toc entries.)
+\toks0 = {#1}\message{(\the\toks0)}%
+%
+\unnumbchapmacro {#1}%
+\gdef\thischapter{#1}\gdef\thissection{#1}%
+\toks0 = {#1}%
+\edef\temp{\noexpand\writetocentry{\realbackslash unnumbchapentry{\the\toks0}}}%
+\temp
+\unnumbnoderef
+\global\let\section = \unnumberedsec
+\global\let\subsection = \unnumberedsubsec
+\global\let\subsubsection = \unnumberedsubsubsec
 }
 
-\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz
-\def\appendixsectionzzz#1{%
-  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
-  \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%
-}
-\let\appendixsec\appendixsection
-
-\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz
-\def\unnumberedseczzz#1{%
-  \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
-  \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%
+% Sections.
+\outer\def\numberedsec{\parsearg\secyyy}
+\def\secyyy #1{\numhead1{#1}} % normally calls seczzz
+\def\seczzz #1{%
+\subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
+\gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}%
+\toks0 = {#1}%
+\edef\temp{\noexpand\writetocentry{\realbackslash secentry{\the\toks0}%
+                                  {\the\chapno}{\the\secno}}}%
+\temp
+\donoderef
+\nobreak
+}
+
+\outer\def\appendixsection{\parsearg\appendixsecyyy}
+\outer\def\appendixsec{\parsearg\appendixsecyyy}
+\def\appendixsecyyy #1{\apphead1{#1}} % normally calls appendixsectionzzz
+\def\appendixsectionzzz #1{%
+\subsecno=0 \subsubsecno=0 \global\advance \secno by 1 %
+\gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}%
+\toks0 = {#1}%
+\edef\temp{\noexpand\writetocentry{\realbackslash secentry{\the\toks0}%
+                                  {\appendixletter}{\the\secno}}}%
+\temp
+\appendixnoderef
+\nobreak
+}
+
+\outer\def\unnumberedsec{\parsearg\unnumberedsecyyy}
+\def\unnumberedsecyyy #1{\unnmhead1{#1}} % normally calls unnumberedseczzz
+\def\unnumberedseczzz #1{%
+\plainsecheading {#1}\gdef\thissection{#1}%
+\toks0 = {#1}%
+\edef\temp{\noexpand\writetocentry{\realbackslash unnumbsecentry{\the\toks0}}}%
+\temp
+\unnumbnoderef
+\nobreak
 }
 
 % Subsections.
-\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz
-\def\numberedsubseczzz#1{%
-  \global\subsubsecno=0  \global\advance\subsecno by 1
-  \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%
-}
-
-\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz
-\def\appendixsubseczzz#1{%
-  \global\subsubsecno=0  \global\advance\subsecno by 1
-  \sectionheading{#1}{subsec}{Yappendix}%
-                 {\appendixletter.\the\secno.\the\subsecno}%
-}
-
-\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
-\def\unnumberedsubseczzz#1{%
-  \global\subsubsecno=0  \global\advance\subsecno by 1
-  \sectionheading{#1}{subsec}{Ynothing}%
-                 {\the\unnumberedno.\the\secno.\the\subsecno}%
+\outer\def\numberedsubsec{\parsearg\numberedsubsecyyy}
+\def\numberedsubsecyyy #1{\numhead2{#1}} % normally calls numberedsubseczzz
+\def\numberedsubseczzz #1{%
+\gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
+\subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}%
+\toks0 = {#1}%
+\edef\temp{\noexpand\writetocentry{\realbackslash subsecentry{\the\toks0}%
+                                    {\the\chapno}{\the\secno}{\the\subsecno}}}%
+\temp
+\donoderef
+\nobreak
+}
+
+\outer\def\appendixsubsec{\parsearg\appendixsubsecyyy}
+\def\appendixsubsecyyy #1{\apphead2{#1}} % normally calls appendixsubseczzz
+\def\appendixsubseczzz #1{%
+\gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 %
+\subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}%
+\toks0 = {#1}%
+\edef\temp{\noexpand\writetocentry{\realbackslash subsecentry{\the\toks0}%
+                                {\appendixletter}{\the\secno}{\the\subsecno}}}%
+\temp
+\appendixnoderef
+\nobreak
+}
+
+\outer\def\unnumberedsubsec{\parsearg\unnumberedsubsecyyy}
+\def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
+\def\unnumberedsubseczzz #1{%
+\plainsubsecheading {#1}\gdef\thissection{#1}%
+\toks0 = {#1}%
+\edef\temp{\noexpand\writetocentry{\realbackslash unnumbsubsecentry%
+                                    {\the\toks0}}}%
+\temp
+\unnumbnoderef
+\nobreak
 }
 
 % Subsubsections.
-\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz
-\def\numberedsubsubseczzz#1{%
-  \global\advance\subsubsecno by 1
-  \sectionheading{#1}{subsubsec}{Ynumbered}%
-                 {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}%
-}
-
-\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz
-\def\appendixsubsubseczzz#1{%
-  \global\advance\subsubsecno by 1
-  \sectionheading{#1}{subsubsec}{Yappendix}%
-                 {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}%
-}
-
-\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
-\def\unnumberedsubsubseczzz#1{%
-  \global\advance\subsubsecno by 1
-  \sectionheading{#1}{subsubsec}{Ynothing}%
-                 {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}%
+\outer\def\numberedsubsubsec{\parsearg\numberedsubsubsecyyy}
+\def\numberedsubsubsecyyy #1{\numhead3{#1}} % normally numberedsubsubseczzz
+\def\numberedsubsubseczzz #1{%
+\gdef\thissection{#1}\global\advance \subsubsecno by 1 %
+\subsubsecheading {#1}
+  {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
+\toks0 = {#1}%
+\edef\temp{\noexpand\writetocentry{\realbackslash subsubsecentry{\the\toks0}%
+  {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}}}%
+\temp
+\donoderef
+\nobreak
+}
+
+\outer\def\appendixsubsubsec{\parsearg\appendixsubsubsecyyy}
+\def\appendixsubsubsecyyy #1{\apphead3{#1}} % normally appendixsubsubseczzz
+\def\appendixsubsubseczzz #1{%
+\gdef\thissection{#1}\global\advance \subsubsecno by 1 %
+\subsubsecheading {#1}
+  {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}%
+\toks0 = {#1}%
+\edef\temp{\noexpand\writetocentry{\realbackslash subsubsecentry{\the\toks0}%
+  {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}}}%
+\temp
+\appendixnoderef
+\nobreak
+}
+
+\outer\def\unnumberedsubsubsec{\parsearg\unnumberedsubsubsecyyy}
+\def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
+\def\unnumberedsubsubseczzz #1{%
+\plainsubsubsecheading {#1}\gdef\thissection{#1}%
+\toks0 = {#1}%
+\edef\temp{\noexpand\writetocentry{\realbackslash unnumbsubsubsecentry%
+                                    {\the\toks0}}}%
+\temp
+\unnumbnoderef
+\nobreak
 }
 
 % These are variants which are not "outer", so they can appear in @ifinfo.
-% Actually, they are now be obsolete; ordinary section commands should work.
+% Actually, they should now be obsolete; ordinary section commands should work.
 \def\infotop{\parsearg\unnumberedzzz}
 \def\infounnumbered{\parsearg\unnumberedzzz}
 \def\infounnumberedsec{\parsearg\unnumberedseczzz}
@@ -4035,9 +3579,9 @@ width0pt\relax} \fi
 % These macros control what the section commands do, according
 % to what kind of chapter we are in (ordinary, appendix, or unnumbered).
 % Define them by default for a numbered chapter.
-\let\section = \numberedsec
-\let\subsection = \numberedsubsec
-\let\subsubsection = \numberedsubsubsec
+\global\let\section = \numberedsec
+\global\let\subsection = \numberedsubsec
+\global\let\subsubsection = \numberedsubsubsec
 
 % Define @majorheading, @heading and @subheading
 
@@ -4050,27 +3594,23 @@ width0pt\relax} \fi
 %          if justification is not attempted.  Hence \raggedright.
 
 
-\def\majorheading{%
-  {\advance\chapheadingskip by 10pt \chapbreak }%
-  \parsearg\chapheadingzzz
-}
+\def\majorheading{\parsearg\majorheadingzzz}
+\def\majorheadingzzz #1{%
+{\advance\chapheadingskip by 10pt \chapbreak }%
+{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+                  \parindent=0pt\raggedright
+                  \rm #1\hfill}}\bigskip \par\penalty 200}
 
-\def\chapheading{\chapbreak \parsearg\chapheadingzzz}
-\def\chapheadingzzz#1{%
-  {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                    \parindent=0pt\raggedright
-                    \rm #1\hfill}}%
-  \bigskip \par\penalty 200\relax
-  \suppressfirstparagraphindent
-}
+\def\chapheading{\parsearg\chapheadingzzz}
+\def\chapheadingzzz #1{\chapbreak %
+{\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
+                  \parindent=0pt\raggedright
+                  \rm #1\hfill}}\bigskip \par\penalty 200}
 
 % @heading, @subheading, @subsubheading.
-\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{}
-  \suppressfirstparagraphindent}
-\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{}
-  \suppressfirstparagraphindent}
-\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{}
-  \suppressfirstparagraphindent}
+\def\heading{\parsearg\plainsecheading}
+\def\subheading{\parsearg\plainsubsecheading}
+\def\subsubheading{\parsearg\plainsubsubsecheading}
 
 % These macros generate a chapter, section, etc. heading only
 % (including whitespace, linebreaking, etc. around it),
@@ -4103,7 +3643,7 @@ width0pt\relax} \fi
 \global\let\pagealignmacro=\chappager
 \global\def\HEADINGSon{\HEADINGSsingle}}
 
-\def\CHAPPAGodd{%
+\def\CHAPPAGodd{
 \global\let\contentsalignmacro = \chapoddpage
 \global\let\pchapsepmacro=\chapoddpage
 \global\let\pagealignmacro=\chapoddpage
@@ -4111,79 +3651,30 @@ width0pt\relax} \fi
 
 \CHAPPAGon
 
-\def\CHAPFplain{%
+\def\CHAPFplain{
 \global\let\chapmacro=\chfplain
+\global\let\unnumbchapmacro=\unnchfplain
 \global\let\centerchapmacro=\centerchfplain}
 
-% Normal chapter opening.
-% 
-% #1 is the text, #2 is the section type (Ynumbered, Ynothing,
-% Yappendix, Yomitfromtoc), #3 the chapter number.
-% 
-% To test against our argument.
-\def\Ynothingkeyword{Ynothing}
-\def\Yomitfromtockeyword{Yomitfromtoc}
-\def\Yappendixkeyword{Yappendix}
-%
-\def\chfplain#1#2#3{%
+% Plain chapter opening.
+% #1 is the text, #2 the chapter number or empty if unnumbered.
+\def\chfplain#1#2{%
   \pchapsepmacro
   {%
     \chapfonts \rm
-    %
-    % Have to define \thissection before calling \donoderef, because the
-    % xref code eventually uses it.  On the other hand, it has to be called
-    % after \pchapsepmacro, or the headline will change too soon.
-    \gdef\thissection{#1}%
-    \gdef\thischaptername{#1}%
-    %
-    % Only insert the separating space if we have a chapter/appendix
-    % number, and don't print the unnumbered ``number''.
-    \def\temptype{#2}%
-    \ifx\temptype\Ynothingkeyword
-      \setbox0 = \hbox{}%
-      \def\toctype{unnchap}%
-      \def\thischapter{#1}%
-    \else\ifx\temptype\Yomitfromtockeyword
-      \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
-      \def\toctype{omit}%
-      \xdef\thischapter{}%
-    \else\ifx\temptype\Yappendixkeyword
-      \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
-      \def\toctype{app}%
-      % We don't substitute the actual chapter name into \thischapter
-      % because we don't want its macros evaluated now.  And we don't
-      % use \thissection because that changes with each section.
-      %
-      \xdef\thischapter{\putwordAppendix{} \appendixletter:
-                        \noexpand\thischaptername}%
-    \else
-      \setbox0 = \hbox{#3\enspace}%
-      \def\toctype{numchap}%
-      \xdef\thischapter{\putwordChapter{} \the\chapno:
-                        \noexpand\thischaptername}%
-    \fi\fi\fi
-    %
-    % Write the toc entry for this chapter.  Must come before the
-    % \donoderef, because we include the current node name in the toc
-    % entry, and \donoderef resets it to empty.
-    \writetocentry{\toctype}{#1}{#3}%
-    %
-    % For pdftex, we have to write out the node definition (aka, make
-    % the pdfdest) after any page break, but before the actual text has
-    % been typeset.  If the destination for the pdf outline is after the
-    % text, then jumping from the outline may wind up with the text not
-    % being visible, for instance under high magnification.
-    \donoderef{#2}%
-    %
-    % Typeset the actual heading.
+    \def\chapnum{#2}%
+    \setbox0 = \hbox{#2\ifx\chapnum\empty\else\enspace\fi}%
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-          \hangindent=\wd0 \centerparametersmaybe
+          \hangindent = \wd0 \centerparametersmaybe
           \unhbox0 #1\par}%
   }%
   \nobreak\bigskip % no page break after a chapter title
   \nobreak
 }
 
+% Plain opening for unnumbered.
+\def\unnchfplain#1{\chfplain{#1}{}}
+
 % @centerchap -- centered and unnumbered.
 \let\centerparametersmaybe = \relax
 \def\centerchfplain#1{{%
@@ -4192,14 +3683,11 @@ width0pt\relax} \fi
     \leftskip = \rightskip
     \parfillskip = 0pt
   }%
-  \chfplain{#1}{Ynothing}{}%
+  \chfplain{#1}{}%
 }}
 
 \CHAPFplain % The default
 
-% I don't think this chapter style is supported any more, so I'm not
-% updating it with the new noderef stuff.  We'll see.  --karl, 11aug03.
-% 
 \def\unnchfopen #1{%
 \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
                        \parindent=0pt\raggedright
@@ -4217,96 +3705,53 @@ width0pt\relax} \fi
                        \hfill {\rm #1}\hfill}}\bigskip \par\nobreak
 }
 
-\def\CHAPFopen{%
+\def\CHAPFopen{
 \global\let\chapmacro=\chfopen
+\global\let\unnumbchapmacro=\unnchfopen
 \global\let\centerchapmacro=\centerchfopen}
 
 
-% Section titles.  These macros combine the section number parts and
-% call the generic \sectionheading to do the printing.
-% 
+% Section titles.
 \newskip\secheadingskip
-\def\secheadingbreak{\dobreak \secheadingskip{-1000}}
+\def\secheadingbreak{\dobreak \secheadingskip {-1000}}
+\def\secheading#1#2#3{\sectionheading{sec}{#2.#3}{#1}}
+\def\plainsecheading#1{\sectionheading{sec}{}{#1}}
 
 % Subsection titles.
-\newskip\subsecheadingskip
-\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}}
+\newskip \subsecheadingskip
+\def\subsecheadingbreak{\dobreak \subsecheadingskip {-500}}
+\def\subsecheading#1#2#3#4{\sectionheading{subsec}{#2.#3.#4}{#1}}
+\def\plainsubsecheading#1{\sectionheading{subsec}{}{#1}}
 
 % Subsubsection titles.
-\def\subsubsecheadingskip{\subsecheadingskip}
-\def\subsubsecheadingbreak{\subsecheadingbreak}
+\let\subsubsecheadingskip = \subsecheadingskip
+\let\subsubsecheadingbreak = \subsecheadingbreak
+\def\subsubsecheading#1#2#3#4#5{\sectionheading{subsubsec}{#2.#3.#4.#5}{#1}}
+\def\plainsubsubsecheading#1{\sectionheading{subsubsec}{}{#1}}
 
 
-% Print any size, any type, section title.
-% 
-% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is
-% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
-% section number.
-% 
-\def\sectionheading#1#2#3#4{%
+% Print any size section title.
+%
+% #1 is the section type (sec/subsec/subsubsec), #2 is the section
+% number (maybe empty), #3 the text.
+\def\sectionheading#1#2#3{%
+  {%
+    \expandafter\advance\csname #1headingskip\endcsname by \parskip
+    \csname #1headingbreak\endcsname
+  }%
   {%
     % Switch to the right set of fonts.
-    \csname #2fonts\endcsname \rm
+    \csname #1fonts\endcsname \rm
     %
-    % Insert space above the heading.
-    \csname #2headingbreak\endcsname
+    % Only insert the separating space if we have a section number.
+    \def\secnum{#2}%
+    \setbox0 = \hbox{#2\ifx\secnum\empty\else\enspace\fi}%
     %
-    % Only insert the space after the number if we have a section number.
-    \def\sectionlevel{#2}%
-    \def\temptype{#3}%
-    %
-    \ifx\temptype\Ynothingkeyword
-      \setbox0 = \hbox{}%
-      \def\toctype{unn}%
-      \gdef\thissection{#1}%
-    \else\ifx\temptype\Yomitfromtockeyword
-      % for @headings -- no section number, don't include in toc,
-      % and don't redefine \thissection.
-      \setbox0 = \hbox{}%
-      \def\toctype{omit}%
-      \let\sectionlevel=\empty
-    \else\ifx\temptype\Yappendixkeyword
-      \setbox0 = \hbox{#4\enspace}%
-      \def\toctype{app}%
-      \gdef\thissection{#1}%
-    \else
-      \setbox0 = \hbox{#4\enspace}%
-      \def\toctype{num}%
-      \gdef\thissection{#1}%
-    \fi\fi\fi
-    %
-    % Write the toc entry (before \donoderef).  See comments in \chfplain.
-    \writetocentry{\toctype\sectionlevel}{#1}{#4}%
-    %
-    % Write the node reference (= pdf destination for pdftex).
-    % Again, see comments in \chfplain.
-    \donoderef{#3}%
-    %
-    % Output the actual section heading.
     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-          \hangindent=\wd0  % zero if no section number
-          \unhbox0 #1}%
+          \hangindent = \wd0 % zero if no section number
+          \unhbox0 #3}%
   }%
-  % Add extra space after the heading -- half of whatever came above it.
-  % Don't allow stretch, though.
-  \kern .5 \csname #2headingskip\endcsname
-  %
-  % Do not let the kern be a potential breakpoint, as it would be if it
-  % was followed by glue.
-  \nobreak
-  %
-  % We'll almost certainly start a paragraph next, so don't let that
-  % glue accumulate.  (Not a breakpoint because it's preceded by a
-  % discardable item.)
-  \vskip-\parskip
-  %
-  % This \nobreak is purely so the last item on the list is a \penalty
-  % of 10000.  This is so other code, for instance \parsebodycommon, can
-  % check for and avoid allowing breakpoints.  Otherwise, it would
-  % insert a valid breakpoint between:
-  %   @section sec-whatever
-  %   @deffn def-whatever
-  \nobreak
+  \ifdim\parskip<10pt \nobreak\kern10pt\nobreak\kern-\parskip\fi \nobreak
 }
 
 
@@ -4315,199 +3760,161 @@ width0pt\relax} \fi
 \newwrite\tocfile
 
 % Write an entry to the toc file, opening it if necessary.
-% Called from @chapter, etc.  
-% 
-% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno}
-% We append the current node name (if any) and page number as additional
-% arguments for the \{chap,sec,...}entry macros which will eventually
-% read this.  The node name is used in the pdf outlines as the
-% destination to jump to.
-% 
-% We open the .toc file for writing here instead of at @setfilename (or
-% any other fixed time) so that @contents can be anywhere in the document.
-% But if #1 is `omit', then we don't do anything.  This is used for the
-% table of contents chapter openings themselves.
+% Called from @chapter, etc.  We supply {\folio} at the end of the
+% argument, which will end up as the last argument to the \...entry macro.
+%
+% We open the .toc file here instead of at @setfilename or any other
+% given time so that @contents can be put in the document anywhere.
 %
 \newif\iftocfileopened
-\def\omitkeyword{omit}%
-%
-\def\writetocentry#1#2#3{%
-  \edef\writetoctype{#1}%
-  \ifx\writetoctype\omitkeyword \else
-    \iftocfileopened\else
-      \immediate\openout\tocfile = \jobname.toc
-      \global\tocfileopenedtrue
-    \fi
-    %
-    \iflinks
-      \toks0 = {#2}%
-      \toks2 = \expandafter{\lastnode}%
-      \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}{#3}%
-                               {\the\toks2}{\noexpand\folio}}}%
-      \temp
-    \fi
+\def\writetocentry#1{%
+  \iftocfileopened\else
+    \immediate\openout\tocfile = \jobname.toc
+    \global\tocfileopenedtrue
   \fi
-  %
-  % Tell \shipout to create a pdf destination on each page, if we're
-  % writing pdf.  These are used in the table of contents.  We can't
-  % just write one on every page because the title pages are numbered
-  % 1 and 2 (the page numbers aren't printed), and so are the first
-  % two pages of the document.  Thus, we'd have two destinations named
-  % `1', and two named `2'.
-  \ifpdf \global\pdfmakepagedesttrue \fi
+  \iflinks \write\tocfile{#1{\folio}}\fi
 }
 
 \newskip\contentsrightmargin \contentsrightmargin=1in
 \newcount\savepageno
 \newcount\lastnegativepageno \lastnegativepageno = -1
 
-% Prepare to read what we've written to \tocfile.
+% Finish up the main text and prepare to read what we've written
+% to \tocfile.
 %
 \def\startcontents#1{%
-  % If @setchapternewpage on, and @headings double, the contents should
-  % start on an odd page, unlike chapters.  Thus, we maintain
-  % \contentsalignmacro in parallel with \pagealignmacro.
-  % From: Torbjorn Granlund <tege@matematik.su.se>
-  \contentsalignmacro
-  \immediate\closeout\tocfile
-  %
-  % Don't need to put `Contents' or `Short Contents' in the headline.
-  % It is abundantly clear what they are.
-  \def\thischapter{}%
-  \chapmacro{#1}{Yomitfromtoc}{}%
-  %
-  \savepageno = \pageno
-  \begingroup                  % Set up to handle contents files properly.
-    \catcode`\\=0  \catcode`\{=1  \catcode`\}=2  \catcode`\@=11
-    % We can't do this, because then an actual ^ in a section
-    % title fails, e.g., @chapter ^ -- exponentiation.  --karl, 9jul97.
-    %\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi
-    \raggedbottom             % Worry more about breakpoints than the bottom.
-    \advance\hsize by -\contentsrightmargin % Don't use the full line length.
-    %
-    % Roman numerals for page numbers.
-    \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
+   % If @setchapternewpage on, and @headings double, the contents should
+   % start on an odd page, unlike chapters.  Thus, we maintain
+   % \contentsalignmacro in parallel with \pagealignmacro.
+   % From: Torbjorn Granlund <tege@matematik.su.se>
+   \contentsalignmacro
+   \immediate\closeout\tocfile
+   %
+   % Don't need to put `Contents' or `Short Contents' in the headline.
+   % It is abundantly clear what they are.
+   \unnumbchapmacro{#1}\def\thischapter{}%
+   \savepageno = \pageno
+   \begingroup                  % Set up to handle contents files properly.
+      \catcode`\\=0  \catcode`\{=1  \catcode`\}=2  \catcode`\@=11
+      % We can't do this, because then an actual ^ in a section
+      % title fails, e.g., @chapter ^ -- exponentiation.  --karl, 9jul97.
+      %\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi
+      \raggedbottom             % Worry more about breakpoints than the bottom.
+      \advance\hsize by -\contentsrightmargin % Don't use the full line length.
+      %
+      % Roman numerals for page numbers.
+      \ifnum \pageno>0 \pageno = \lastnegativepageno \fi
 }
 
 
 % Normal (long) toc.
 \def\contents{%
-  \startcontents{\putwordTOC}%
-    \openin 1 \jobname.toc
-    \ifeof 1 \else
-      \input \jobname.toc
-    \fi
-    \vfill \eject
-    \contentsalignmacro % in case @setchapternewpage odd is in effect
-    \ifeof 1 \else
-      \pdfmakeoutlines
-    \fi
-    \closein 1
-  \endgroup
-  \lastnegativepageno = \pageno
-  \global\pageno = \savepageno
+   \startcontents{\putwordTOC}%
+     \openin 1 \jobname.toc
+     \ifeof 1 \else
+       \closein 1
+       \input \jobname.toc
+     \fi
+     \vfill \eject
+     \contentsalignmacro % in case @setchapternewpage odd is in effect
+     \pdfmakeoutlines
+   \endgroup
+   \lastnegativepageno = \pageno
+   \pageno = \savepageno
 }
 
 % And just the chapters.
 \def\summarycontents{%
-  \startcontents{\putwordShortTOC}%
-    %
-    \let\numchapentry = \shortchapentry
-    \let\appentry = \shortchapentry
-    \let\unnchapentry = \shortunnchapentry
-    % We want a true roman here for the page numbers.
-    \secfonts
-    \let\rm=\shortcontrm \let\bf=\shortcontbf
-    \let\sl=\shortcontsl \let\tt=\shortconttt
-    \rm
-    \hyphenpenalty = 10000
-    \advance\baselineskip by 1pt % Open it up a little.
-    \def\numsecentry##1##2##3##4{}
-    \let\appsecentry = \numsecentry
-    \let\unnsecentry = \numsecentry
-    \let\numsubsecentry = \numsecentry
-    \let\appsubsecentry = \numsecentry
-    \let\unnsubsecentry = \numsecentry
-    \let\numsubsubsecentry = \numsecentry
-    \let\appsubsubsecentry = \numsecentry
-    \let\unnsubsubsecentry = \numsecentry
-    \openin 1 \jobname.toc
-    \ifeof 1 \else
-      \input \jobname.toc
-    \fi
-    \closein 1
-    \vfill \eject
-    \contentsalignmacro % in case @setchapternewpage odd is in effect
-  \endgroup
-  \lastnegativepageno = \pageno
-  \global\pageno = \savepageno
+   \startcontents{\putwordShortTOC}%
+      %
+      \let\chapentry = \shortchapentry
+      \let\unnumbchapentry = \shortunnumberedentry
+      % We want a true roman here for the page numbers.
+      \secfonts
+      \let\rm=\shortcontrm \let\bf=\shortcontbf \let\sl=\shortcontsl
+      \rm
+      \hyphenpenalty = 10000
+      \advance\baselineskip by 1pt % Open it up a little.
+      \def\secentry ##1##2##3##4{}
+      \def\unnumbsecentry ##1##2{}
+      \def\subsecentry ##1##2##3##4##5{}
+      \def\unnumbsubsecentry ##1##2{}
+      \def\subsubsecentry ##1##2##3##4##5##6{}
+      \def\unnumbsubsubsecentry ##1##2{}
+      \openin 1 \jobname.toc
+      \ifeof 1 \else
+        \closein 1
+        \input \jobname.toc
+      \fi
+     \vfill \eject
+     \contentsalignmacro % in case @setchapternewpage odd is in effect
+   \endgroup
+   \lastnegativepageno = \pageno
+   \pageno = \savepageno
 }
 \let\shortcontents = \summarycontents
 
-% Typeset the label for a chapter or appendix for the short contents.
-% The arg is, e.g., `A' for an appendix, or `3' for a chapter.
-%
-\def\shortchaplabel#1{%
-  % This space should be enough, since a single number is .5em, and the
-  % widest letter (M) is 1em, at least in the Computer Modern fonts.
-  % But use \hss just in case.
-  % (This space doesn't include the extra space that gets added after
-  % the label; that gets put in by \shortchapentry above.)
-  % 
-  % We'd like to right-justify chapter numbers, but that looks strange
-  % with appendix letters.  And right-justifying numbers and
-  % left-justifying letters looks strange when there is less than 10
-  % chapters.  Have to read the whole toc once to know how many chapters
-  % there are before deciding ...
-  \hbox to 1em{#1\hss}%
-}
+\ifpdf
+  \pdfcatalog{/PageMode /UseOutlines}%
+\fi
 
 % These macros generate individual entries in the table of contents.
 % The first argument is the chapter or section name.
 % The last argument is the page number.
 % The arguments in between are the chapter number, section number, ...
 
-% Chapters, in the main contents.
-\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
-%
-% Chapters, in the short toc.
-% See comments in \dochapentry re vbox and related settings.
-\def\shortchapentry#1#2#3#4{%
-  \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}%
+% Chapter-level things, for both the long and short contents.
+\def\chapentry#1#2#3{\dochapentry{#2\labelspace#1}{#3}}
+
+% See comments in \dochapentry re vbox and related settings
+\def\shortchapentry#1#2#3{%
+  \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#3\egroup}%
 }
 
-% Appendices, in the main contents.
-% Need the word Appendix, and a fixed-size box.
-% 
-\def\appendixbox#1{%
-  % We use M since it's probably the widest letter.
-  \setbox0 = \hbox{\putwordAppendix{} M}%
-  \hbox to \wd0{\putwordAppendix{} #1\hss}}
+% Typeset the label for a chapter or appendix for the short contents.
+% The arg is, e.g. `Appendix A' for an appendix, or `3' for a chapter.
+% We could simplify the code here by writing out an \appendixentry
+% command in the toc file for appendices, instead of using \chapentry
+% for both, but it doesn't seem worth it.
+%
+\newdimen\shortappendixwidth
 %
-\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}}
+\def\shortchaplabel#1{%
+  % Compute width of word "Appendix", may change with language.
+  \setbox0 = \hbox{\shortcontrm \putwordAppendix}%
+  \shortappendixwidth = \wd0
+  %
+  % We typeset #1 in a box of constant width, regardless of the text of
+  % #1, so the chapter titles will come out aligned.
+  \setbox0 = \hbox{#1}%
+  \dimen0 = \ifdim\wd0 > \shortappendixwidth \shortappendixwidth \else 0pt \fi
+  %
+  % This space should be plenty, since a single number is .5em, and the
+  % widest letter (M) is 1em, at least in the Computer Modern fonts.
+  % (This space doesn't include the extra space that gets added after
+  % the label; that gets put in by \shortchapentry above.)
+  \advance\dimen0 by 1.1em
+  \hbox to \dimen0{#1\hfil}%
+}
 
-% Unnumbered chapters.
-\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}}
-\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}}
+\def\unnumbchapentry#1#2{\dochapentry{#1}{#2}}
+\def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno\bgroup#2\egroup}}
 
 % Sections.
-\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}}
-\let\appsecentry=\numsecentry
-\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}}
+\def\secentry#1#2#3#4{\dosecentry{#2.#3\labelspace#1}{#4}}
+\def\unnumbsecentry#1#2{\dosecentry{#1}{#2}}
 
 % Subsections.
-\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}}
-\let\appsubsecentry=\numsubsecentry
-\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}}
+\def\subsecentry#1#2#3#4#5{\dosubsecentry{#2.#3.#4\labelspace#1}{#5}}
+\def\unnumbsubsecentry#1#2{\dosubsecentry{#1}{#2}}
 
 % And subsubsections.
-\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}}
-\let\appsubsubsecentry=\numsubsubsecentry
-\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}}
+\def\subsubsecentry#1#2#3#4#5#6{%
+  \dosubsubsecentry{#2.#3.#4.#5\labelspace#1}{#6}}
+\def\unnumbsubsubsecentry#1#2{\dosubsubsecentry{#1}{#2}}
 
 % This parameter controls the indentation of the various levels.
-% Same as \defaultparindent.
-\newdimen\tocindent \tocindent = 15pt
+\newdimen\tocindent \tocindent = 3pc
 
 % Now for the actual typesetting. In all these, #1 is the text and #2 is the
 % page number.
@@ -4538,8 +3945,17 @@ width0pt\relax} \fi
   \tocentry{#1}{\dopageno\bgroup#2\egroup}%
 \endgroup}
 
-% We use the same \entry macro as for the index entries.
-\let\tocentry = \entry
+% Final typesetting of a toc entry; we use the same \entry macro as for
+% the index entries, but we want to suppress hyphenation here.  (We
+% can't do that in the \entry macro, since index entries might consist
+% of hyphenated-identifiers-that-do-not-fit-on-a-line-and-nothing-else.)
+\def\tocentry#1#2{\begingroup
+  \vskip 0pt plus1pt % allow a little stretch for the sake of nice page breaks
+  % Do not use \turnoffactive in these arguments.  Since the toc is
+  % typeset in cmr, so characters such as _ would come out wrong; we
+  % have to do the usual translation tricks.
+  \entry{#1}{#2}%
+\endgroup}
 
 % Space between chapter (or whatever) number and the title.
 \def\labelspace{\hskip1em \relax}
@@ -4549,61 +3965,72 @@ width0pt\relax} \fi
 
 \def\chapentryfonts{\secfonts \rm}
 \def\secentryfonts{\textfonts}
-\def\subsecentryfonts{\textfonts}
-\def\subsubsecentryfonts{\textfonts}
+\let\subsecentryfonts = \textfonts
+\let\subsubsecentryfonts = \textfonts
 
 
 \message{environments,}
 % @foo ... @end foo.
 
-% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
-%
 % Since these characters are used in examples, it should be an even number of
 % \tt widths. Each \tt character is 1en, so two makes it 1em.
-%
+% Furthermore, these definitions must come after we define our fonts.
+\newbox\dblarrowbox    \newbox\longdblarrowbox
+\newbox\pushcharbox    \newbox\bullbox
+\newbox\equivbox       \newbox\errorbox
+
+%{\tentt
+%\global\setbox\dblarrowbox = \hbox to 1em{\hfil$\Rightarrow$\hfil}
+%\global\setbox\longdblarrowbox = \hbox to 1em{\hfil$\mapsto$\hfil}
+%\global\setbox\pushcharbox = \hbox to 1em{\hfil$\dashv$\hfil}
+%\global\setbox\equivbox = \hbox to 1em{\hfil$\ptexequiv$\hfil}
+% Adapted from the manmac format (p.420 of TeXbook)
+%\global\setbox\bullbox = \hbox to 1em{\kern.15em\vrule height .75ex width .85ex
+%                                      depth .1ex\hfil}
+%}
+
+% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
 \def\point{$\star$}
 \def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
 \def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}}
 \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
 \def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}}
 
-% The @error{} command.
 % Adapted from the TeXbook's \boxit.
-%
-\newbox\errorbox
-%
 {\tentt \global\dimen0 = 3em}% Width of the box.
 \dimen2 = .55pt % Thickness of rules
 % The text. (`r' is open on the right, `e' somewhat less so on the left.)
 \setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
-%
-\setbox\errorbox=\hbox to \dimen0{\hfil
+
+\global\setbox\errorbox=\hbox to \dimen0{\hfil
    \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
    \advance\hsize by -2\dimen2 % Rules.
-   \vbox{%
+   \vbox{
       \hrule height\dimen2
       \hbox{\vrule width\dimen2 \kern3pt          % Space to left of text.
          \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
          \kern3pt\vrule width\dimen2}% Space to right.
       \hrule height\dimen2}
     \hfil}
-%
+
+% The @error{} command.
 \def\error{\leavevmode\lower.7ex\copy\errorbox}
 
 % @tex ... @end tex    escapes into raw Tex temporarily.
 % One exception: @ is still an escape character, so that @end tex works.
 % But \@ or @@ will get a plain tex @ character.
 
-\envdef\tex{%
+\def\tex{\begingroup
   \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
   \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
-  \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
+  \catcode `\^=7 \catcode `\_=8 \catcode `\~=13 \let~=\tie
   \catcode `\%=14
-  \catcode `\+=\other
-  \catcode `\"=\other
-  \catcode `\|=\other
-  \catcode `\<=\other
-  \catcode `\>=\other
+  \catcode 43=12 % plus
+  \catcode`\"=12
+  \catcode`\==12
+  \catcode`\|=12
+  \catcode`\<=12
+  \catcode`\>=12
   \escapechar=`\\
   %
   \let\b=\ptexb
@@ -4615,24 +4042,20 @@ width0pt\relax} \fi
   \let\equiv=\ptexequiv
   \let\!=\ptexexclam
   \let\i=\ptexi
-  \let\indent=\ptexindent
-  \let\noindent=\ptexnoindent
   \let\{=\ptexlbrace
   \let\+=\tabalign
   \let\}=\ptexrbrace
-  \let\/=\ptexslash
   \let\*=\ptexstar
   \let\t=\ptext
   %
   \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
   \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
   \def\@{@}%
-}
-% There is no need to define \Etex.
+\let\Etex=\endgroup}
 
-% Define @lisp ... @end lisp.
-% @lisp environment forms a group so it can rebind things,
-% including the definition of @end lisp (which normally is erroneous).
+% Define @lisp ... @endlisp.
+% @lisp does a \begingroup so it can rebind things,
+% including the definition of @endlisp (which normally is erroneous).
 
 % Amount to narrow the margins by for @lisp.
 \newskip\lispnarrowing \lispnarrowing=0.4in
@@ -4642,28 +4065,30 @@ width0pt\relax} \fi
 % have any width.
 \def\lisppar{\null\endgraf}
 
+% Make each space character in the input produce a normal interword
+% space in the output.  Don't allow a line break at this space, as this
+% is used only in environments like @example, where each line of input
+% should produce a line of output anyway.
+%
+{\obeyspaces %
+\gdef\sepspaces{\obeyspaces\let =\tie}}
+
+% Define \obeyedspace to be our active space, whatever it is.  This is
+% for use in \parsearg.
+{\sepspaces%
+\global\let\obeyedspace= }
+
 % This space is always present above and below environments.
 \newskip\envskipamount \envskipamount = 0pt
 
 % Make spacing and below environment symmetrical.  We use \parskip here
 % to help in doing that, since in @example-like environments \parskip
 % is reset to zero; thus the \afterenvbreak inserts no space -- but the
-% start of the next paragraph will insert \parskip.
-%
-\def\aboveenvbreak{{%
-  % =10000 instead of <10000 because of a special case in \itemzzz, q.v.
-  \ifnum \lastpenalty=10000 \else
-    \advance\envskipamount by \parskip
-    \endgraf
-    \ifdim\lastskip<\envskipamount
-      \removelastskip
-      % it's not a good place to break if the last penalty was \nobreak
-      % or better ...
-      \ifnum\lastpenalty<10000 \penalty-50 \fi
-      \vskip\envskipamount
-    \fi
-  \fi
-}}
+% start of the next paragraph will insert \parskip
+%
+\def\aboveenvbreak{{\advance\envskipamount by \parskip
+\endgraf \ifdim\lastskip<\envskipamount
+\removelastskip \penalty-50 \vskip\envskipamount \fi}}
 
 \let\afterenvbreak = \aboveenvbreak
 
@@ -4691,54 +4116,54 @@ width0pt\relax} \fi
 %
 \newskip\lskip\newskip\rskip
 
-\envdef\cartouche{%
-  \ifhmode\par\fi  % can't be in the midst of a paragraph.
-  \startsavinginserts
-  \lskip=\leftskip \rskip=\rightskip
-  \leftskip=0pt\rightskip=0pt % we want these *outside*.
-  \cartinner=\hsize \advance\cartinner by-\lskip
-  \advance\cartinner by-\rskip
-  \cartouter=\hsize
-  \advance\cartouter by 18.4pt	% allow for 3pt kerns on either
-				% side, and for 6pt waste from
-				% each corner char, and rule thickness
-  \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
-  % Flag to tell @lisp, etc., not to narrow margin.
-  \let\nonarrowing=\comment
-  \vbox\bgroup
-      \baselineskip=0pt\parskip=0pt\lineskip=0pt
-      \carttop
-      \hbox\bgroup
-	  \hskip\lskip
-	  \vrule\kern3pt
-	  \vbox\bgroup
-	      \kern3pt
-	      \hsize=\cartinner
-	      \baselineskip=\normbskip
-	      \lineskip=\normlskip
-	      \parskip=\normpskip
-	      \vskip -\parskip
-	      \comment % For explanation, see the end of \def\group.
-}
+\long\def\cartouche{%
+\begingroup
+        \lskip=\leftskip \rskip=\rightskip
+        \leftskip=0pt\rightskip=0pt %we want these *outside*.
+        \cartinner=\hsize \advance\cartinner by-\lskip
+                          \advance\cartinner by-\rskip
+        \cartouter=\hsize
+        \advance\cartouter by 18.4pt % allow for 3pt kerns on either
+%                                    side, and for 6pt waste from
+%                                    each corner char, and rule thickness
+        \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
+        % Flag to tell @lisp, etc., not to narrow margin.
+        \let\nonarrowing=\comment
+        \vbox\bgroup
+                \baselineskip=0pt\parskip=0pt\lineskip=0pt
+                \carttop
+                \hbox\bgroup
+                        \hskip\lskip
+                        \vrule\kern3pt
+                        \vbox\bgroup
+                                \hsize=\cartinner
+                                \kern3pt
+                                \begingroup
+                                        \baselineskip=\normbskip
+                                        \lineskip=\normlskip
+                                        \parskip=\normpskip
+                                        \vskip -\parskip
 \def\Ecartouche{%
-              \ifhmode\par\fi
-	      \kern3pt
-	  \egroup
-	  \kern3pt\vrule
-	  \hskip\rskip
-      \egroup
-      \cartbot
-  \egroup
-  \checkinserts
-}
+                                \endgroup
+                                \kern3pt
+                        \egroup
+                        \kern3pt\vrule
+                        \hskip\rskip
+                \egroup
+                \cartbot
+        \egroup
+\endgroup
+}}
 
 
 % This macro is called at the beginning of all the @example variants,
 % inside a group.
 \def\nonfillstart{%
   \aboveenvbreak
+  \inENV % This group ends at the end of the body
   \hfuzz = 12pt % Don't be fussy
   \sepspaces % Make spaces be word-separators rather than space tokens.
+  \singlespace
   \let\par = \lisppar % don't ignore blank lines
   \obeylines % each line of input is a line of output
   \parskip = 0pt
@@ -4749,99 +4174,114 @@ width0pt\relax} \fi
   \ifx\nonarrowing\relax
     \advance \leftskip by \lispnarrowing
     \exdentamount=\lispnarrowing
+    \let\exdent=\nofillexdent
+    \let\nonarrowing=\relax
   \fi
-  \let\exdent=\nofillexdent
 }
 
-% If you want all examples etc. small: @set dispenvsize small.
-% If you want even small examples the full size: @set dispenvsize nosmall.
-% This affects the following displayed environments:
-%    @example, @display, @format, @lisp
+% Define the \E... control sequence only if we are inside the particular
+% environment, so the error checking in \end will work.
 %
-\def\smallword{small}
-\def\nosmallword{nosmall}
-\let\SETdispenvsize\relax
-\def\setnormaldispenv{%
-  \ifx\SETdispenvsize\smallword
-    \smallexamplefonts \rm
-  \fi
-}
-\def\setsmalldispenv{%
-  \ifx\SETdispenvsize\nosmallword
-  \else
-    \smallexamplefonts \rm
-  \fi
-}
+% To end an @example-like environment, we first end the paragraph (via
+% \afterenvbreak's vertical glue), and then the group.  That way we keep
+% the zero \parskip that the environments set -- \parskip glue will be
+% inserted at the beginning of the next paragraph in the document, after
+% the environment.
+%
+\def\nonfillfinish{\afterenvbreak\endgroup}
 
-% We often define two environments, @foo and @smallfoo.
-% Let's do it by one command:
-\def\makedispenv #1#2{
-  \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
-  \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
-  \expandafter\let\csname E#1\endcsname \afterenvbreak
-  \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
+% @lisp: indented, narrowed, typewriter font.
+\def\lisp{\begingroup
+  \nonfillstart
+  \let\Elisp = \nonfillfinish
+  \tt
+  \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
+  \gobble       % eat return
 }
 
-% Define two synonyms:
-\def\maketwodispenvs #1#2#3{
-  \makedispenv{#1}{#3}
-  \makedispenv{#2}{#3}
-}
+% @example: Same as @lisp.
+\def\example{\begingroup \def\Eexample{\nonfillfinish\endgroup}\lisp}
 
-% @lisp: indented, narrowed, typewriter font; @example: same as @lisp.
+% @small... is usually equivalent to the non-small (@smallbook
+% redefines).  We must call \example (or whatever) last in the
+% definition, since it reads the return following the @example (or
+% whatever) command.
 %
-% @smallexample and @smalllisp: use smaller fonts.
-% Originally contributed by Pavel@xerox.
+% This actually allows (for example) @end display inside an
+% @smalldisplay.  Too bad, but makeinfo will catch the error anyway.
 %
-\maketwodispenvs {lisp}{example}{%
-  \nonfillstart
-  \tt
-  \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-  \gobble       % eat return
+\def\smalldisplay{\begingroup\def\Esmalldisplay{\nonfillfinish\endgroup}\display}
+\def\smallexample{\begingroup\def\Esmallexample{\nonfillfinish\endgroup}\lisp}
+\def\smallformat{\begingroup\def\Esmallformat{\nonfillfinish\endgroup}\format}
+\def\smalllisp{\begingroup\def\Esmalllisp{\nonfillfinish\endgroup}\lisp}
+
+% Real @smallexample and @smalllisp (when @smallbook): use smaller fonts.
+% Originally contributed by Pavel@xerox.
+\def\smalllispx{\begingroup
+  \def\Esmalllisp{\nonfillfinish\endgroup}%
+  \def\Esmallexample{\nonfillfinish\endgroup}%
+  \smallfonts
+  \lisp
 }
 
-% @display/@smalldisplay: same as @lisp except keep current font.
+% @display: same as @lisp except keep current font.
 %
-\makedispenv {display}{%
+\def\display{\begingroup
   \nonfillstart
+  \let\Edisplay = \nonfillfinish
   \gobble
 }
 
-% @format/@smallformat: same as @display except don't narrow margins.
+% @smalldisplay (when @smallbook): @display plus smaller fonts.
 %
-\makedispenv{format}{%
-  \let\nonarrowing = t%
-  \nonfillstart
-  \gobble
+\def\smalldisplayx{\begingroup
+  \def\Esmalldisplay{\nonfillfinish\endgroup}%
+  \smallfonts \rm
+  \display
 }
 
-% @flushleft: same as @format, but doesn't obey \SETdispenvsize.
-\envdef\flushleft{%
-  \let\nonarrowing = t%
+% @format: same as @display except don't narrow margins.
+%
+\def\format{\begingroup
+  \let\nonarrowing = t
   \nonfillstart
+  \let\Eformat = \nonfillfinish
   \gobble
 }
-\let\Eflushleft = \afterenvbreak
+
+% @smallformat (when @smallbook): @format plus smaller fonts.
+%
+\def\smallformatx{\begingroup
+  \def\Esmallformat{\nonfillfinish\endgroup}%
+  \smallfonts \rm
+  \format
+}
+
+% @flushleft (same as @format).
+%
+\def\flushleft{\begingroup \def\Eflushleft{\nonfillfinish\endgroup}\format}
 
 % @flushright.
 %
-\envdef\flushright{%
-  \let\nonarrowing = t%
+\def\flushright{\begingroup
+  \let\nonarrowing = t
   \nonfillstart
+  \let\Eflushright = \nonfillfinish
   \advance\leftskip by 0pt plus 1fill
   \gobble
 }
-\let\Eflushright = \afterenvbreak
-
 
 % @quotation does normal linebreaking (hence we can't use \nonfillstart)
-% and narrows the margins.  We keep \parskip nonzero in general, since
-% we're doing normal filling.  So, when using \aboveenvbreak and
-% \afterenvbreak, temporarily make \parskip 0.
+% and narrows the margins.
 %
-\envdef\quotation{%
+\def\quotation{%
+  \begingroup\inENV %This group ends at the end of the @quotation body
   {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
+  \singlespace
   \parindent=0pt
+  % We have retained a nonzero parskip for the environment, since we're
+  % doing normal filling. So to avoid extra space below the environment...
+  \def\Equotation{\parskip = 0pt \nonfillfinish}%
   %
   % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
   \ifx\nonarrowing\relax
@@ -4850,568 +4290,565 @@ width0pt\relax} \fi
     \exdentamount = \lispnarrowing
     \let\nonarrowing = \relax
   \fi
-  \parsearg\quotationlabel
 }
 
-% We have retained a nonzero parskip for the environment, since we're
-% doing normal filling.
-% 
-\def\Equotation{%
-  \par
-  \ifx\quotationauthor\undefined\else
-    % indent a bit.
-    \leftline{\kern 2\leftskip \sl ---\quotationauthor}%
-  \fi
-  {\parskip=0pt \afterenvbreak}%
-}
 
-% If we're given an argument, typeset it in bold with a colon after.
-\def\quotationlabel#1{%
-  \def\temp{#1}%
-  \ifx\temp\empty \else
-    {\bf #1: }%
-  \fi
-}
+\message{defuns,}
+% @defun etc.
 
+% Allow user to change definition object font (\df) internally
+\def\setdeffont #1 {\csname DEF#1\endcsname}
 
-% LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
-% If we want to allow any <char> as delimiter,
-% we need the curly braces so that makeinfo sees the @verb command, eg:
-% `@verbx...x' would look like the '@verbx' command.  --janneke@gnu.org
-%
-% [Knuth]: Donald Ervin Knuth, 1996.  The TeXbook.
-%
-% [Knuth] p.344; only we need to do the other characters Texinfo sets
-% active too.  Otherwise, they get lost as the first character on a
-% verbatim line.
-\def\dospecials{%
-  \do\ \do\\\do\{\do\}\do\$\do\&%
-  \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
-  \do\<\do\>\do\|\do\@\do+\do\"%
+\newskip\defbodyindent \defbodyindent=.4in
+\newskip\defargsindent \defargsindent=50pt
+\newskip\deftypemargin \deftypemargin=12pt
+\newskip\deflastargmargin \deflastargmargin=18pt
+
+\newcount\parencount
+% define \functionparens, which makes ( and ) and & do special things.
+% \functionparens affects the group it is contained in.
+\def\activeparens{%
+\catcode`\(=\active \catcode`\)=\active \catcode`\&=\active
+\catcode`\[=\active \catcode`\]=\active}
+
+% Make control sequences which act like normal parenthesis chars.
+\let\lparen = ( \let\rparen = )
+
+{\activeparens % Now, smart parens don't turn on until &foo (see \amprm)
+
+% Be sure that we always have a definition for `(', etc.  For example,
+% if the fn name has parens in it, \boldbrax will not be in effect yet,
+% so TeX would otherwise complain about undefined control sequence.
+\global\let(=\lparen \global\let)=\rparen
+\global\let[=\lbrack \global\let]=\rbrack
+
+\gdef\functionparens{\boldbrax\let&=\amprm\parencount=0 }
+\gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
+% This is used to turn on special parens
+% but make & act ordinary (given that it's active).
+\gdef\boldbraxnoamp{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb\let&=\ampnr}
+
+% Definitions of (, ) and & used in args for functions.
+% This is the definition of ( outside of all parentheses.
+\gdef\oprm#1 {{\rm\char`\(}#1 \bf \let(=\opnested
+  \global\advance\parencount by 1
 }
 %
-% [Knuth] p. 380
-\def\uncatcodespecials{%
-  \def\do##1{\catcode`##1=\other}\dospecials}
-%
-% [Knuth] pp. 380,381,391
-% Disable Spanish ligatures ?` and !` of \tt font
-\begingroup
-  \catcode`\`=\active\gdef`{\relax\lq}
-\endgroup
-%
-% Setup for the @verb command.
+% This is the definition of ( when already inside a level of parens.
+\gdef\opnested{\char`\(\global\advance\parencount by 1 }
 %
-% Eight spaces for a tab
-\begingroup
-  \catcode`\^^I=\active
-  \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }}
-\endgroup
-%
-\def\setupverb{%
-  \tt  % easiest (and conventionally used) font for verbatim
-  \def\par{\leavevmode\endgraf}%
-  \catcode`\`=\active
-  \tabeightspaces
-  % Respect line breaks,
-  % print special symbols as themselves, and
-  % make each space count
-  % must do in this order:
-  \obeylines \uncatcodespecials \sepspaces
+\gdef\clrm{% Print a paren in roman if it is taking us back to depth of 0.
+  % also in that case restore the outer-level definition of (.
+  \ifnum \parencount=1 {\rm \char `\)}\sl \let(=\oprm \else \char `\) \fi
+  \global\advance \parencount by -1 }
+% If we encounter &foo, then turn on ()-hacking afterwards
+\gdef\amprm#1 {{\rm\&#1}\let(=\oprm \let)=\clrm\ }
+%
+\gdef\normalparens{\boldbrax\let&=\ampnr}
+} % End of definition inside \activeparens
+%% These parens (in \boldbrax) actually are a little bolder than the
+%% contained text.  This is especially needed for [ and ]
+\def\opnr{{\sf\char`\(}\global\advance\parencount by 1 }
+\def\clnr{{\sf\char`\)}\global\advance\parencount by -1 }
+\let\ampnr = \&
+\def\lbrb{{\bf\char`\[}}
+\def\rbrb{{\bf\char`\]}}
+
+% Active &'s sneak into the index arguments, so make sure it's defined.
+{
+  \catcode`& = 13
+  \global\let& = \ampnr
+}
+
+% First, defname, which formats the header line itself.
+% #1 should be the function name.
+% #2 should be the type of definition, such as "Function".
+
+\def\defname #1#2{%
+% Get the values of \leftskip and \rightskip as they were
+% outside the @def...
+\dimen2=\leftskip
+\advance\dimen2 by -\defbodyindent
+\noindent
+\setbox0=\hbox{\hskip \deflastargmargin{\rm #2}\hskip \deftypemargin}%
+\dimen0=\hsize \advance \dimen0 by -\wd0 % compute size for first line
+\dimen1=\hsize \advance \dimen1 by -\defargsindent %size for continuations
+\parshape 2 0in \dimen0 \defargsindent \dimen1
+% Now output arg 2 ("Function" or some such)
+% ending at \deftypemargin from the right margin,
+% but stuck inside a box of width 0 so it does not interfere with linebreaking
+{% Adjust \hsize to exclude the ambient margins,
+% so that \rightline will obey them.
+\advance \hsize by -\dimen2
+\rlap{\rightline{{\rm #2}\hskip -1.25pc }}}%
+% Make all lines underfull and no complaints:
+\tolerance=10000 \hbadness=10000
+\advance\leftskip by -\defbodyindent
+\exdentamount=\defbodyindent
+{\df #1}\enskip        % Generate function name
+}
+
+% Actually process the body of a definition
+% #1 should be the terminating control sequence, such as \Edefun.
+% #2 should be the "another name" control sequence, such as \defunx.
+% #3 should be the control sequence that actually processes the header,
+%    such as \defunheader.
+
+\def\defparsebody #1#2#3{\begingroup\inENV% Environment for definitionbody
+\medbreak %
+% Define the end token that this defining construct specifies
+% so that it will exit this group.
+\def#1{\endgraf\endgroup\medbreak}%
+\def#2{\begingroup\obeylines\activeparens\spacesplit#3}%
+\parindent=0in
+\advance\leftskip by \defbodyindent
+\exdentamount=\defbodyindent
+\begingroup %
+\catcode 61=\active % 61 is `='
+\obeylines\activeparens\spacesplit#3}
+
+% #1 is the \E... control sequence to end the definition (which we define).
+% #2 is the \...x control sequence for consecutive fns (which we define).
+% #3 is the control sequence to call to resume processing.
+% #4, delimited by the space, is the class name.
+%
+\def\defmethparsebody#1#2#3#4 {\begingroup\inENV %
+\medbreak %
+% Define the end token that this defining construct specifies
+% so that it will exit this group.
+\def#1{\endgraf\endgroup\medbreak}%
+\def#2##1 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}}}%
+\parindent=0in
+\advance\leftskip by \defbodyindent
+\exdentamount=\defbodyindent
+\begingroup\obeylines\activeparens\spacesplit{#3{#4}}}
+
+% Used for @deftypemethod and @deftypeivar.
+% #1 is the \E... control sequence to end the definition (which we define).
+% #2 is the \...x control sequence for consecutive fns (which we define).
+% #3 is the control sequence to call to resume processing.
+% #4, delimited by a space, is the class name.
+% #5 is the method's return type.
+%
+\def\deftypemethparsebody#1#2#3#4 #5 {\begingroup\inENV
+  \medbreak
+  \def#1{\endgraf\endgroup\medbreak}%
+  \def#2##1 ##2 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}{##2}}}%
+  \parindent=0in
+  \advance\leftskip by \defbodyindent
+  \exdentamount=\defbodyindent
+  \begingroup\obeylines\activeparens\spacesplit{#3{#4}{#5}}}
+
+% Used for @deftypeop.  The change from \deftypemethparsebody is an
+% extra argument at the beginning which is the `category', instead of it
+% being the hardwired string `Method' or `Instance Variable'.  We have
+% to account for this both in the \...x definition and in parsing the
+% input at hand.  Thus also need a control sequence (passed as #5) for
+% the \E... definition to assign the category name to.
+% 
+\def\deftypeopparsebody#1#2#3#4#5 #6 {\begingroup\inENV
+  \medbreak
+  \def#1{\endgraf\endgroup\medbreak}%
+  \def#2##1 ##2 ##3 {%
+    \def#4{##1}%
+    \begingroup\obeylines\activeparens\spacesplit{#3{##2}{##3}}}%
+  \parindent=0in
+  \advance\leftskip by \defbodyindent
+  \exdentamount=\defbodyindent
+  \begingroup\obeylines\activeparens\spacesplit{#3{#5}{#6}}}
+
+\def\defopparsebody #1#2#3#4#5 {\begingroup\inENV %
+\medbreak %
+% Define the end token that this defining construct specifies
+% so that it will exit this group.
+\def#1{\endgraf\endgroup\medbreak}%
+\def#2##1 ##2 {\def#4{##1}%
+\begingroup\obeylines\activeparens\spacesplit{#3{##2}}}%
+\parindent=0in
+\advance\leftskip by \defbodyindent
+\exdentamount=\defbodyindent
+\begingroup\obeylines\activeparens\spacesplit{#3{#5}}}
+
+% These parsing functions are similar to the preceding ones
+% except that they do not make parens into active characters.
+% These are used for "variables" since they have no arguments.
+
+\def\defvarparsebody #1#2#3{\begingroup\inENV% Environment for definitionbody
+\medbreak %
+% Define the end token that this defining construct specifies
+% so that it will exit this group.
+\def#1{\endgraf\endgroup\medbreak}%
+\def#2{\begingroup\obeylines\spacesplit#3}%
+\parindent=0in
+\advance\leftskip by \defbodyindent
+\exdentamount=\defbodyindent
+\begingroup %
+\catcode 61=\active %
+\obeylines\spacesplit#3}
+
+% This is used for \def{tp,vr}parsebody.  It could probably be used for
+% some of the others, too, with some judicious conditionals.
+%
+\def\parsebodycommon#1#2#3{%
+  \begingroup\inENV %
+  \medbreak %
+  % Define the end token that this defining construct specifies
+  % so that it will exit this group.
+  \def#1{\endgraf\endgroup\medbreak}%
+  \def#2##1 {\begingroup\obeylines\spacesplit{#3{##1}}}%
+  \parindent=0in
+  \advance\leftskip by \defbodyindent
+  \exdentamount=\defbodyindent
+  \begingroup\obeylines
 }
 
-% Setup for the @verbatim environment
-%
-% Real tab expansion
-\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
-%
-\def\starttabbox{\setbox0=\hbox\bgroup}
-\begingroup
-  \catcode`\^^I=\active
-  \gdef\tabexpand{%
-    \catcode`\^^I=\active
-    \def^^I{\leavevmode\egroup
-      \dimen0=\wd0 % the width so far, or since the previous tab
-      \divide\dimen0 by\tabw
-      \multiply\dimen0 by\tabw % compute previous multiple of \tabw
-      \advance\dimen0 by\tabw  % advance to next multiple of \tabw
-      \wd0=\dimen0 \box0 \starttabbox
-    }%
-  }
-\endgroup
-\def\setupverbatim{%
-  \nonfillstart
-  \advance\leftskip by -\defbodyindent
-  % Easiest (and conventionally used) font for verbatim
-  \tt
-  \def\par{\leavevmode\egroup\box0\endgraf}%
-  \catcode`\`=\active
-  \tabexpand
-  % Respect line breaks,
-  % print special symbols as themselves, and
-  % make each space count
-  % must do in this order:
-  \obeylines \uncatcodespecials \sepspaces
-  \everypar{\starttabbox}%
+\def\defvrparsebody#1#2#3#4 {%
+  \parsebodycommon{#1}{#2}{#3}%
+  \spacesplit{#3{#4}}%
 }
 
-% Do the @verb magic: verbatim text is quoted by unique
-% delimiter characters.  Before first delimiter expect a
-% right brace, after last delimiter expect closing brace:
-%
-%    \def\doverb'{'<char>#1<char>'}'{#1}
+% This loses on `@deftp {Data Type} {struct termios}' -- it thinks the
+% type is just `struct', because we lose the braces in `{struct
+% termios}' when \spacesplit reads its undelimited argument.  Sigh.
+% \let\deftpparsebody=\defvrparsebody
 %
-% [Knuth] p. 382; only eat outer {}
-\begingroup
-  \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other
-  \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next]
-\endgroup
+% So, to get around this, we put \empty in with the type name.  That
+% way, TeX won't find exactly `{...}' as an undelimited argument, and
+% won't strip off the braces.
 %
-\def\verb{\begingroup\setupverb\doverb}
-%
-%
-% Do the @verbatim magic: define the macro \doverbatim so that
-% the (first) argument ends when '@end verbatim' is reached, ie:
-%
-%     \def\doverbatim#1@end verbatim{#1}
-%
-% For Texinfo it's a lot easier than for LaTeX,
-% because texinfo's \verbatim doesn't stop at '\end{verbatim}':
-% we need not redefine '\', '{' and '}'.
-%
-% Inspired by LaTeX's verbatim command set [latex.ltx]
+\def\deftpparsebody #1#2#3#4 {%
+  \parsebodycommon{#1}{#2}{#3}%
+  \spacesplit{\parsetpheaderline{#3{#4}}}\empty
+}
+
+% Fine, but then we have to eventually remove the \empty *and* the
+% braces (if any).  That's what this does.
 %
-\begingroup
-  \catcode`\ =\active
-  \obeylines %
-  % ignore everything up to the first ^^M, that's the newline at the end
-  % of the @verbatim input line itself.  Otherwise we get an extra blank
-  % line in the output.
-  \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}%
-  % We really want {...\end verbatim} in the body of the macro, but
-  % without the active space; thus we have to use \xdef and \gobble.
-\endgroup
+\def\removeemptybraces\empty#1\relax{#1}
+
+% After \spacesplit has done its work, this is called -- #1 is the final
+% thing to call, #2 the type name (which starts with \empty), and #3
+% (which might be empty) the arguments.
 %
-\envdef\verbatim{%
-    \setupverbatim\doverbatim
+\def\parsetpheaderline#1#2#3{%
+  #1{\removeemptybraces#2\relax}{#3}%
+}%
+
+\def\defopvarparsebody #1#2#3#4#5 {\begingroup\inENV %
+\medbreak %
+% Define the end token that this defining construct specifies
+% so that it will exit this group.
+\def#1{\endgraf\endgroup\medbreak}%
+\def#2##1 ##2 {\def#4{##1}%
+\begingroup\obeylines\spacesplit{#3{##2}}}%
+\parindent=0in
+\advance\leftskip by \defbodyindent
+\exdentamount=\defbodyindent
+\begingroup\obeylines\spacesplit{#3{#5}}}
+
+% Split up #2 at the first space token.
+% call #1 with two arguments:
+%  the first is all of #2 before the space token,
+%  the second is all of #2 after that space token.
+% If #2 contains no space token, all of it is passed as the first arg
+% and the second is passed as empty.
+
+{\obeylines
+\gdef\spacesplit#1#2^^M{\endgroup\spacesplitfoo{#1}#2 \relax\spacesplitfoo}%
+\long\gdef\spacesplitfoo#1#2 #3#4\spacesplitfoo{%
+\ifx\relax #3%
+#1{#2}{}\else #1{#2}{#3#4}\fi}}
+
+% So much for the things common to all kinds of definitions.
+
+% Define @defun.
+
+% First, define the processing that is wanted for arguments of \defun
+% Use this to expand the args and terminate the paragraph they make up
+
+\def\defunargs#1{\functionparens \sl
+% Expand, preventing hyphenation at `-' chars.
+% Note that groups don't affect changes in \hyphenchar.
+% Set the font temporarily and use \font in case \setfont made \tensl a macro.
+{\tensl\hyphenchar\font=0}%
+#1%
+{\tensl\hyphenchar\font=45}%
+\ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi%
+\interlinepenalty=10000
+\advance\rightskip by 0pt plus 1fil
+\endgraf\nobreak\vskip -\parskip\nobreak
 }
-\let\Everbatim = \afterenvbreak
 
+\def\deftypefunargs #1{%
+% Expand, preventing hyphenation at `-' chars.
+% Note that groups don't affect changes in \hyphenchar.
+% Use \boldbraxnoamp, not \functionparens, so that & is not special.
+\boldbraxnoamp
+\tclose{#1}% avoid \code because of side effects on active chars
+\interlinepenalty=10000
+\advance\rightskip by 0pt plus 1fil
+\endgraf\nobreak\vskip -\parskip\nobreak
+}
 
-% @verbatiminclude FILE - insert text of file in verbatim environment.
-%
-\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude}
-%
-\def\doverbatiminclude#1{%
-  {%
-    \makevalueexpandable
-    \setupverbatim
-    \input #1
-    \afterenvbreak
-  }%
+% Do complete processing of one @defun or @defunx line already parsed.
+
+% @deffn Command forward-char nchars
+
+\def\deffn{\defmethparsebody\Edeffn\deffnx\deffnheader}
+
+\def\deffnheader #1#2#3{\doind {fn}{\code{#2}}%
+\begingroup\defname {#2}{#1}\defunargs{#3}\endgroup %
+\catcode 61=\other % Turn off change made in \defparsebody
 }
 
-% @copying ... @end copying.
-% Save the text away for @insertcopying later.  Many commands won't be
-% allowed in this context, but that's ok.
-%
-% We save the uninterpreted tokens, rather than creating a box.
-% Saving the text in a box would be much easier, but then all the
-% typesetting commands (@smallbook, font changes, etc.) have to be done
-% beforehand -- and a) we want @copying to be done first in the source
-% file; b) letting users define the frontmatter in as flexible order as
-% possible is very desirable.
-%
-\def\copying{\begingroup
-  % Define a command to swallow text until we reach `@end copying'.
-  % \ is the escape char in this texinfo.tex file, so it is the
-  % delimiter for the command; @ will be the escape char when we read
-  % it, but that doesn't matter.
-  \long\def\docopying##1\end copying{\gdef\copyingtext{##1}\enddocopying}%
-  %
-  % We must preserve ^^M's in the input file; see \insertcopying below.
-  \catcode`\^^M = \active
-  \docopying
-}
-
-% What we do to finish off the copying text.
-%
-\def\enddocopying{\endgroup\ignorespaces}
-
-% @insertcopying.  Here we must play games with ^^M's.  On the one hand,
-% we need them to delimit commands such as `@end quotation', so they
-% must be active.  On the other hand, we certainly don't want every
-% end-of-line to be a \par, as would happen with the normal active
-% definition of ^^M.  On the third hand, two ^^M's in a row should still
-% generate a \par.
-%
-% Our approach is to make ^^M insert a space and a penalty1 normally;
-% then it can also check if \lastpenalty=1.  If it does, then manually
-% do \par.
-%
-% This messes up the normal definitions of @c[omment], so we redefine
-% it.  Similarly for @ignore.  (These commands are used in the gcc
-% manual for man page generation.)
-%
-% Seems pretty fragile, most line-oriented commands will presumably
-% fail, but for the limited use of getting the copying text (which
-% should be quite simple) inserted, we can hope it's ok.
-%
-{\catcode`\^^M=\active %
-\gdef\insertcopying{\begingroup %
-  \parindent = 0pt  % looks wrong on title page
-  \def^^M{%
-    \ifnum \lastpenalty=1 %
-      \par %
-    \else %
-      \space \penalty 1 %
-    \fi %
-  }%
-  %
-  % Fix @c[omment] for catcode 13 ^^M's.
-  \def\c##1^^M{\ignorespaces}%
-  \let\comment = \c %
-  %
-  % Don't bother jumping through all the hoops that \doignore does, it
-  % would be very hard since the catcodes are already set.
-  \long\def\ignore##1\end ignore{\ignorespaces}%
-  %
-  \copyingtext %
-\endgroup}%
+% @defun == @deffn Function
+
+\def\defun{\defparsebody\Edefun\defunx\defunheader}
+
+\def\defunheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
+\begingroup\defname {#1}{\putwordDeffunc}%
+\defunargs {#2}\endgroup %
+\catcode 61=\other % Turn off change made in \defparsebody
 }
 
-\message{defuns,}
-% @defun etc.
+% @deftypefun int foobar (int @var{foo}, float @var{bar})
 
-\newskip\defbodyindent \defbodyindent=.4in
-\newskip\defargsindent \defargsindent=50pt
-\newskip\deflastargmargin \deflastargmargin=18pt
+\def\deftypefun{\defparsebody\Edeftypefun\deftypefunx\deftypefunheader}
 
-% Start the processing of @deffn:
-\def\startdefun{%
-  \ifnum\lastpenalty<10000
-    \medbreak
-  \else
-    % If there are two @def commands in a row, we'll have a \nobreak,
-    % which is there to keep the function description together with its
-    % header.  But if there's nothing but headers, we need to allow a
-    % break somewhere.  Check for penalty 10002 (inserted by
-    % \defargscommonending) instead of 10000, since the sectioning
-    % commands insert a \penalty10000, and we don't want to allow a break
-    % between a section heading and a defun.
-    \ifnum\lastpenalty=10002 \penalty2000 \fi
-    %
-    % Similarly, after a section heading, do not allow a break.
-    % But do insert the glue.
-    \medskip  % preceded by discardable penalty, so not a breakpoint
-  \fi
-  %
-  \parindent=0in
-  \advance\leftskip by \defbodyindent
-  \exdentamount=\defbodyindent
+% #1 is the data type.  #2 is the name and args.
+\def\deftypefunheader #1#2{\deftypefunheaderx{#1}#2 \relax}
+% #1 is the data type, #2 the name, #3 the args.
+\def\deftypefunheaderx #1#2 #3\relax{%
+\doind {fn}{\code{#2}}% Make entry in function index
+\begingroup\defname {\defheaderxcond#1\relax$$$#2}{\putwordDeftypefun}%
+\deftypefunargs {#3}\endgroup %
+\catcode 61=\other % Turn off change made in \defparsebody
 }
 
-\def\dodefunx#1{%
-  % First, check whether we are in the right environment:
-  \checkenv#1%
-  %
-  % As above, allow line break if we have multiple x headers in a row.
-  % It's not a great place, though.
-  \ifnum\lastpenalty=10002 \penalty3000 \fi
-  %
-  % And now, it's time to reuse the body of the original defun:
-  \expandafter\gobbledefun#1%
+% @deftypefn {Library Function} int foobar (int @var{foo}, float @var{bar})
+
+\def\deftypefn{\defmethparsebody\Edeftypefn\deftypefnx\deftypefnheader}
+
+% \defheaderxcond#1\relax$$$
+% puts #1 in @code, followed by a space, but does nothing if #1 is null.
+\def\defheaderxcond#1#2$$${\ifx#1\relax\else\code{#1#2} \fi}
+
+% #1 is the classification.  #2 is the data type.  #3 is the name and args.
+\def\deftypefnheader #1#2#3{\deftypefnheaderx{#1}{#2}#3 \relax}
+% #1 is the classification, #2 the data type, #3 the name, #4 the args.
+\def\deftypefnheaderx #1#2#3 #4\relax{%
+\doind {fn}{\code{#3}}% Make entry in function index
+\begingroup
+\normalparens % notably, turn off `&' magic, which prevents
+%               at least some C++ text from working
+\defname {\defheaderxcond#2\relax$$$#3}{#1}%
+\deftypefunargs {#4}\endgroup %
+\catcode 61=\other % Turn off change made in \defparsebody
 }
-\def\gobbledefun#1\startdefun{}
 
-% \printdefunline \deffnheader{text}
-%
-\def\printdefunline#1#2{%
-  \begingroup
-    % call \deffnheader:
-    #1#2 \endheader
-    % common ending:
-    \interlinepenalty = 10000
-    \advance\rightskip by 0pt plus 1fil
-    \endgraf
-    \nobreak\vskip -\parskip
-    \penalty 10002  % signal to \startdefun and \dodefunx
-    % Some of the @defun-type tags do not enable magic parentheses,
-    % rendering the following check redundant.  But we don't optimize.
-    \checkparencounts
-  \endgroup
+% @defmac == @deffn Macro
+
+\def\defmac{\defparsebody\Edefmac\defmacx\defmacheader}
+
+\def\defmacheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
+\begingroup\defname {#1}{\putwordDefmac}%
+\defunargs {#2}\endgroup %
+\catcode 61=\other % Turn off change made in \defparsebody
 }
 
-\def\Edefun{\endgraf\medbreak}
+% @defspec == @deffn Special Form
 
-% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
-% the only thing remainnig is to define \deffnheader.
-%
-\def\makedefun#1{%
-  \expandafter\let\csname E#1\endcsname = \Edefun
-  \edef\temp{\noexpand\domakedefun
-    \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}%
-  \temp
+\def\defspec{\defparsebody\Edefspec\defspecx\defspecheader}
+
+\def\defspecheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index
+\begingroup\defname {#1}{\putwordDefspec}%
+\defunargs {#2}\endgroup %
+\catcode 61=\other % Turn off change made in \defparsebody
 }
 
-% \domakedefun \deffn \deffnx \deffnheader
+% @defop CATEGORY CLASS OPERATION ARG...
 %
-% Define \deffn and \deffnx, without parameters.
-% \deffnheader has to be defined explicitly.
+\def\defop #1 {\def\defoptype{#1}%
+\defopparsebody\Edefop\defopx\defopheader\defoptype}
 %
-\def\domakedefun#1#2#3{%
-  \envdef#1{%
-    \startdefun
-    \parseargusing\activeparens{\printdefunline#3}%
-  }%
-  \def#2{\dodefunx#1}%
-  \def#3%
+\def\defopheader#1#2#3{%
+\dosubind {fn}{\code{#2}}{\putwordon\ #1}% Make entry in function index
+\begingroup\defname {#2}{\defoptype\ \putwordon\ #1}%
+\defunargs {#3}\endgroup %
 }
 
-%%% Untyped functions:
-
-% @deffn category name args
-\makedefun{deffn}{\deffngeneral{}}
-
-% @deffn category class name args
-\makedefun{defop}#1 {\defopon{#1\ \putwordon}}
+% @deftypeop CATEGORY CLASS TYPE OPERATION ARG...
+%
+\def\deftypeop #1 {\def\deftypeopcategory{#1}%
+  \deftypeopparsebody\Edeftypeop\deftypeopx\deftypeopheader
+                       \deftypeopcategory}
+%
+% #1 is the class name, #2 the data type, #3 the operation name, #4 the args.
+\def\deftypeopheader#1#2#3#4{%
+  \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
+  \begingroup
+    \defname{\defheaderxcond#2\relax$$$#3}
+            {\deftypeopcategory\ \putwordon\ \code{#1}}%
+    \deftypefunargs{#4}%
+  \endgroup
+}
 
-% \defopon {category on}class name args
-\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
+% @deftypemethod CLASS TYPE METHOD ARG...
+%
+\def\deftypemethod{%
+  \deftypemethparsebody\Edeftypemethod\deftypemethodx\deftypemethodheader}
+%
+% #1 is the class name, #2 the data type, #3 the method name, #4 the args.
+\def\deftypemethodheader#1#2#3#4{%
+  \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index
+  \begingroup
+    \defname{\defheaderxcond#2\relax$$$#3}{\putwordMethodon\ \code{#1}}%
+    \deftypefunargs{#4}%
+  \endgroup
+}
 
-% \deffngeneral {subind}category name args
+% @deftypeivar CLASS TYPE VARNAME
 %
-\def\deffngeneral#1#2 #3 #4\endheader{%
-  % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
-  \dosubind{fn}{\code{#3}}{#1}%
-  \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
+\def\deftypeivar{%
+  \deftypemethparsebody\Edeftypeivar\deftypeivarx\deftypeivarheader}
+%
+% #1 is the class name, #2 the data type, #3 the variable name.
+\def\deftypeivarheader#1#2#3{%
+  \dosubind{vr}{\code{#3}}{\putwordof\ \code{#1}}% entry in variable index
+  \begingroup
+    \defname{\defheaderxcond#2\relax$$$#3}
+            {\putwordInstanceVariableof\ \code{#1}}%
+    \defvarargs{#3}%
+  \endgroup
 }
 
-%%% Typed functions:
+% @defmethod == @defop Method
+%
+\def\defmethod{\defmethparsebody\Edefmethod\defmethodx\defmethodheader}
+%
+% #1 is the class name, #2 the method name, #3 the args.
+\def\defmethodheader#1#2#3{%
+  \dosubind{fn}{\code{#2}}{\putwordon\ \code{#1}}% entry in function index
+  \begingroup
+    \defname{#2}{\putwordMethodon\ \code{#1}}%
+    \defunargs{#3}%
+  \endgroup
+}
 
-% @deftypefn category type name args
-\makedefun{deftypefn}{\deftypefngeneral{}}
+% @defcv {Class Option} foo-class foo-flag
 
-% @deftypeop category class type name args
-\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}}
+\def\defcv #1 {\def\defcvtype{#1}%
+\defopvarparsebody\Edefcv\defcvx\defcvarheader\defcvtype}
 
-% \deftypeopon {category on}class type name args
-\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
+\def\defcvarheader #1#2#3{%
+\dosubind {vr}{\code{#2}}{\putwordof\ #1}% Make entry in var index
+\begingroup\defname {#2}{\defcvtype\ \putwordof\ #1}%
+\defvarargs {#3}\endgroup %
+}
 
-% \deftypefngeneral {subind}category type name args
+% @defivar CLASS VARNAME == @defcv {Instance Variable} CLASS VARNAME
+%
+\def\defivar{\defvrparsebody\Edefivar\defivarx\defivarheader}
 %
-\def\deftypefngeneral#1#2 #3 #4 #5\endheader{%
-  \dosubind{fn}{\code{#4}}{#1}%
-  \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
+\def\defivarheader#1#2#3{%
+  \dosubind {vr}{\code{#2}}{\putwordof\ #1}% entry in var index
+  \begingroup
+    \defname{#2}{\putwordInstanceVariableof\ #1}%
+    \defvarargs{#3}%
+  \endgroup
 }
 
-%%% Typed variables:
+% @defvar
+% First, define the processing that is wanted for arguments of @defvar.
+% This is actually simple: just print them in roman.
+% This must expand the args and terminate the paragraph they make up
+\def\defvarargs #1{\normalparens #1%
+\interlinepenalty=10000
+\endgraf\nobreak\vskip -\parskip\nobreak}
 
-% @deftypevr category type var args
-\makedefun{deftypevr}{\deftypecvgeneral{}}
+% @defvr Counter foo-count
 
-% @deftypecv category class type var args
-\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}}
+\def\defvr{\defvrparsebody\Edefvr\defvrx\defvrheader}
 
-% \deftypecvof {category of}class type var args
-\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} }
+\def\defvrheader #1#2#3{\doind {vr}{\code{#2}}%
+\begingroup\defname {#2}{#1}\defvarargs{#3}\endgroup}
 
-% \deftypecvgeneral {subind}category type var args
-%
-\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{%
-  \dosubind{vr}{\code{#4}}{#1}%
-  \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
-}
+% @defvar == @defvr Variable
 
-%%% Untyped variables:
+\def\defvar{\defvarparsebody\Edefvar\defvarx\defvarheader}
 
-% @defvr category var args
-\makedefun{defvr}#1 {\deftypevrheader{#1} {} }
+\def\defvarheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index
+\begingroup\defname {#1}{\putwordDefvar}%
+\defvarargs {#2}\endgroup %
+}
 
-% @defcv category class var args
-\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}}
+% @defopt == @defvr {User Option}
 
-% \defcvof {category of}class var args
-\def\defcvof#1#2 {\deftypecvof{#1}#2 {} }
+\def\defopt{\defvarparsebody\Edefopt\defoptx\defoptheader}
 
-%%% Type:
-% @deftp category name args
-\makedefun{deftp}#1 #2 #3\endheader{%
-  \doind{tp}{\code{#2}}%
-  \defname{#1}{}{#2}\defunargs{#3\unskip}%
+\def\defoptheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index
+\begingroup\defname {#1}{\putwordDefopt}%
+\defvarargs {#2}\endgroup %
 }
 
-% Remaining @defun-like shortcuts:
-\makedefun{defun}{\deffnheader{\putwordDeffunc} }
-\makedefun{defmac}{\deffnheader{\putwordDefmac} }
-\makedefun{defspec}{\deffnheader{\putwordDefspec} }
-\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} }
-\makedefun{defvar}{\defvrheader{\putwordDefvar} }
-\makedefun{defopt}{\defvrheader{\putwordDefopt} }
-\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} }
-\makedefun{defmethod}{\defopon\putwordMethodon}
-\makedefun{deftypemethod}{\deftypeopon\putwordMethodon}
-\makedefun{defivar}{\defcvof\putwordInstanceVariableof}
-\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof}
+% @deftypevar int foobar
 
-% \defname, which formats the name of the @def (not the args).
-% #1 is the category, such as "Function".
-% #2 is the return type, if any.
-% #3 is the function name.
-% 
-% We are followed by (but not passed) the arguments, if any.
-%
-\def\defname#1#2#3{%
-  % Get the values of \leftskip and \rightskip as they were outside the @def...
-  \advance\leftskip by -\defbodyindent
-  %
-  % How we'll format the type name.  Putting it in brackets helps
-  % distinguish it from the body text that may end up on the next line
-  % just below it.
-  \def\temp{#1}%
-  \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi}
-  %
-  % Figure out line sizes for the paragraph shape.
-  % The first line needs space for \box0; but if \rightskip is nonzero,
-  % we need only space for the part of \box0 which exceeds it:
-  \dimen0=\hsize  \advance\dimen0 by -\wd0  \advance\dimen0 by \rightskip
-  % The continuations:
-  \dimen2=\hsize  \advance\dimen2 by -\defargsindent
-  % (plain.tex says that \dimen1 should be used only as global.)
-  \parshape 2 0in \dimen0 \defargsindent \dimen2
-  %
-  % Put the type name to the right margin.
-  \noindent
-  \hbox to 0pt{%
-    \hfil\box0 \kern-\hsize
-    % \hsize has to be shortened this way:
-    \kern\leftskip
-    % Intentionally do not respect \rightskip, since we need the space.
-  }%
-  %
-  % Allow all lines to be underfull without complaint:
-  \tolerance=10000 \hbadness=10000
-  \exdentamount=\defbodyindent
-  {%
-    % defun fonts. We use typewriter by default (used to be bold) because:
-    % . we're printing identifiers, they should be in tt in principle.
-    % . in languages with many accents, such as Czech or French, it's
-    %   common to leave accents off identifiers.  The result looks ok in
-    %   tt, but exceedingly strange in rm.
-    % . we don't want -- and --- to be treated as ligatures.
-    % . this still does not fix the ?` and !` ligatures, but so far no
-    %   one has made identifiers using them :).
-    \df \tt
-    \def\temp{#2}% return value type
-    \ifx\temp\empty\else \tclose{\temp} \fi
-    #3% output function name
-  }%
-  {\rm\enskip}% hskip 0.5 em of \tenrm
-  %
-  \boldbrax
-  % arguments will be output next, if any.
-}
+\def\deftypevar{\defvarparsebody\Edeftypevar\deftypevarx\deftypevarheader}
 
-% Print arguments in slanted roman (not ttsl), inconsistently with using
-% tt for the name.  This is because literal text is sometimes needed in
-% the argument list (groff manual), and ttsl and tt are not very
-% distinguishable.  Prevent hyphenation at `-' chars.
-% 
-\def\defunargs#1{%
-  % use sl by default (not ttsl), 
-  % tt for the names.
-  \df \sl \hyphenchar\font=0
-  %
-  % On the other hand, if an argument has two dashes (for instance), we
-  % want a way to get ttsl.  Let's try @var for that.
-  \let\var=\ttslanted
-  #1%
-  \sl\hyphenchar\font=45
-}
+% #1 is the data type.  #2 is the name, perhaps followed by text that
+% is actually part of the data type, which should not be put into the index.
+\def\deftypevarheader #1#2{%
+\dovarind#2 \relax% Make entry in variables index
+\begingroup\defname {\defheaderxcond#1\relax$$$#2}{\putwordDeftypevar}%
+\interlinepenalty=10000
+\endgraf\nobreak\vskip -\parskip\nobreak
+\endgroup}
+\def\dovarind#1 #2\relax{\doind{vr}{\code{#1}}}
 
-% We want ()&[] to print specially on the defun line.
-%
-\def\activeparens{%
-  \catcode`\(=\active \catcode`\)=\active
-  \catcode`\[=\active \catcode`\]=\active
-  \catcode`\&=\active
-}
+% @deftypevr {Global Flag} int enable
 
-% Make control sequences which act like normal parenthesis chars.
-\let\lparen = ( \let\rparen = )
+\def\deftypevr{\defvrparsebody\Edeftypevr\deftypevrx\deftypevrheader}
 
-% Be sure that we always have a definition for `(', etc.  For example,
-% if the fn name has parens in it, \boldbrax will not be in effect yet,
-% so TeX would otherwise complain about undefined control sequence.
-{
-  \activeparens
-  \global\let(=\lparen \global\let)=\rparen
-  \global\let[=\lbrack \global\let]=\rbrack
-  \global\let& = \&
+\def\deftypevrheader #1#2#3{\dovarind#3 \relax%
+\begingroup\defname {\defheaderxcond#2\relax$$$#3}{#1}
+\interlinepenalty=10000
+\endgraf\nobreak\vskip -\parskip\nobreak
+\endgroup}
 
-  \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
-  \gdef\magicamp{\let&=\amprm}
-}
+% Now define @deftp
+% Args are printed in bold, a slight difference from @defvar.
 
-\newcount\parencount
+\def\deftpargs #1{\bf \defvarargs{#1}}
 
-% If we encounter &foo, then turn on ()-hacking afterwards
-\newif\ifampseen
-\def\amprm#1 {\ampseentrue{\bf\&#1 }}
-
-\def\parenfont{%
-  \ifampseen
-    % At the first level, print parens in roman,
-    % otherwise use the default font.
-    \ifnum \parencount=1 \rm \fi
-  \else
-    % The \sf parens (in \boldbrax) actually are a little bolder than
-    % the contained text.  This is especially needed for [ and ] .
-    \sf
-  \fi
-}
-\def\infirstlevel#1{%
-  \ifampseen
-    \ifnum\parencount=1
-      #1%
-    \fi
-  \fi
-}
-\def\bfafterword#1 {#1 \bf}
+% @deftp Class window height width ...
 
-\def\opnr{%
-  \global\advance\parencount by 1
-  {\parenfont(}%
-  \infirstlevel \bfafterword
-}
-\def\clnr{%
-  {\parenfont)}%
-  \infirstlevel \sl
-  \global\advance\parencount by -1
-}
+\def\deftp{\deftpparsebody\Edeftp\deftpx\deftpheader}
 
-\newcount\brackcount
-\def\lbrb{%
-  \global\advance\brackcount by 1
-  {\bf[}%
-}
-\def\rbrb{%
-  {\bf]}%
-  \global\advance\brackcount by -1
-}
+\def\deftpheader #1#2#3{\doind {tp}{\code{#2}}%
+\begingroup\defname {#2}{#1}\deftpargs{#3}\endgroup}
 
-\def\checkparencounts{%
-  \ifnum\parencount=0 \else \badparencount \fi
-  \ifnum\brackcount=0 \else \badbrackcount \fi
-}
-\def\badparencount{%
-  \errmessage{Unbalanced parentheses in @def}%
-  \global\parencount=0
-}
-\def\badbrackcount{%
-  \errmessage{Unbalanced square braces in @def}%
-  \global\brackcount=0
-}
+% These definitions are used if you use @defunx (etc.)
+% anywhere other than immediately after a @defun or @defunx.
+% 
+\def\defcvx#1 {\errmessage{@defcvx in invalid context}}
+\def\deffnx#1 {\errmessage{@deffnx in invalid context}}
+\def\defivarx#1 {\errmessage{@defivarx in invalid context}}
+\def\defmacx#1 {\errmessage{@defmacx in invalid context}}
+\def\defmethodx#1 {\errmessage{@defmethodx in invalid context}}
+\def\defoptx #1 {\errmessage{@defoptx in invalid context}}
+\def\defopx#1 {\errmessage{@defopx in invalid context}}
+\def\defspecx#1 {\errmessage{@defspecx in invalid context}}
+\def\deftpx#1 {\errmessage{@deftpx in invalid context}}
+\def\deftypefnx#1 {\errmessage{@deftypefnx in invalid context}}
+\def\deftypefunx#1 {\errmessage{@deftypefunx in invalid context}}
+\def\deftypeivarx#1 {\errmessage{@deftypeivarx in invalid context}}
+\def\deftypemethodx#1 {\errmessage{@deftypemethodx in invalid context}}
+\def\deftypeopx#1 {\errmessage{@deftypeopx in invalid context}}
+\def\deftypevarx#1 {\errmessage{@deftypevarx in invalid context}}
+\def\deftypevrx#1 {\errmessage{@deftypevrx in invalid context}}
+\def\defunx#1 {\errmessage{@defunx in invalid context}}
+\def\defvarx#1 {\errmessage{@defvarx in invalid context}}
+\def\defvrx#1 {\errmessage{@defvrx in invalid context}}
 
 
 \message{macros,}
@@ -5420,32 +4857,27 @@ width0pt\relax} \fi
 % To do this right we need a feature of e-TeX, \scantokens,
 % which we arrange to emulate with a temporary file in ordinary TeX.
 \ifx\eTeXversion\undefined
-  \newwrite\macscribble
-  \def\scantokens#1{%
-    \toks0={#1\endinput}%
-    \immediate\openout\macscribble=\jobname.tmp
-    \immediate\write\macscribble{\the\toks0}%
-    \immediate\closeout\macscribble
-    \input \jobname.tmp
-  }
-\fi
-
-\def\scanmacro#1{%
-  \begingroup
-    \newlinechar`\^^M
-    \let\xeatspaces\eatspaces
-    % Undo catcode changes of \startcontents and \doprintindex
-    \catcode`\@=0 \catcode`\\=\other \escapechar=`\@
-    % ... and \example
-    \spaceisspace
-    %
-    % Append \endinput to make sure that TeX does not see the ending newline.
-    %
-    % I've verified that it is necessary both for e-TeX and for ordinary TeX
-    %							--kasal, 29nov03
-    \scantokens{#1\endinput}%
-  \endgroup
+ \newwrite\macscribble
+ \def\scanmacro#1{%
+   \begingroup \newlinechar`\^^M
+   % Undo catcode changes of \startcontents and \doprintindex
+   \catcode`\@=0 \catcode`\\=12 \escapechar=`\@
+   % Append \endinput to make sure that TeX does not see the ending newline.
+   \toks0={#1\endinput}%
+   \immediate\openout\macscribble=\jobname.tmp
+   \immediate\write\macscribble{\the\toks0}%
+   \immediate\closeout\macscribble
+   \let\xeatspaces\eatspaces
+   \input \jobname.tmp
+   \endgroup
 }
+\else
+\def\scanmacro#1{%
+\begingroup \newlinechar`\^^M
+% Undo catcode changes of \startcontents and \doprintindex
+\catcode`\@=0 \catcode`\\=12 \escapechar=`\@
+\let\xeatspaces\eatspaces\scantokens{#1\endinput}\endgroup}
+\fi
 
 \newcount\paramno   % Count of parameters
 \newtoks\macname    % Macro name
@@ -5454,7 +4886,7 @@ width0pt\relax} \fi
                     % \do\macro1\do\macro2...
 
 % Utility routines.
-% This does \let #1 = #2, except with \csnames.
+% Thisdoes \let #1 = #2, except with \csnames.
 \def\cslet#1#2{%
 \expandafter\expandafter
 \expandafter\let
@@ -5473,7 +4905,7 @@ width0pt\relax} \fi
 }
 
 % Trim a single trailing ^^M off a string.
-{\catcode`\^^M=\other \catcode`\Q=3%
+{\catcode`\^^M=12\catcode`\Q=3%
 \gdef\eatcr #1{\eatcra #1Q^^MQ}%
 \gdef\eatcra#1^^MQ{\eatcrb#1Q}%
 \gdef\eatcrb#1Q#2Q{#1}%
@@ -5488,29 +4920,29 @@ width0pt\relax} \fi
 % body, and then making it the \newlinechar in \scanmacro.
 
 \def\macrobodyctxt{%
-  \catcode`\~=\other
-  \catcode`\^=\other
-  \catcode`\_=\other
-  \catcode`\|=\other
-  \catcode`\<=\other
-  \catcode`\>=\other
-  \catcode`\+=\other
-  \catcode`\{=\other
-  \catcode`\}=\other
-  \catcode`\@=\other
-  \catcode`\^^M=\other
+  \catcode`\~=12
+  \catcode`\^=12
+  \catcode`\_=12
+  \catcode`\|=12
+  \catcode`\<=12
+  \catcode`\>=12
+  \catcode`\+=12
+  \catcode`\{=12
+  \catcode`\}=12
+  \catcode`\@=12
+  \catcode`\^^M=12
   \usembodybackslash}
 
 \def\macroargctxt{%
-  \catcode`\~=\other
-  \catcode`\^=\other
-  \catcode`\_=\other
-  \catcode`\|=\other
-  \catcode`\<=\other
-  \catcode`\>=\other
-  \catcode`\+=\other
-  \catcode`\@=\other
-  \catcode`\\=\other}
+  \catcode`\~=12
+  \catcode`\^=12
+  \catcode`\_=12
+  \catcode`\|=12
+  \catcode`\<=12
+  \catcode`\>=12
+  \catcode`\+=12
+  \catcode`\@=12
+  \catcode`\\=12}
 
 % \mbodybackslash is the definition of \ in @macro bodies.
 % It maps \foo\ => \csname macarg.foo\endcsname => #N
@@ -5538,7 +4970,7 @@ width0pt\relax} \fi
      \message{Warning: redefining \the\macname}%
   \else
      \expandafter\ifx\csname \the\macname\endcsname \relax
-     \else \errmessage{Macro name \the\macname\space already defined}\fi
+     \else \errmessage{The name \the\macname\space is reserved}\fi
      \global\cslet{macsave.\the\macname}{\the\macname}%
      \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
      % Add the macroname to \macrolist
@@ -5551,32 +4983,32 @@ width0pt\relax} \fi
   \else \expandafter\parsemacbody
   \fi}
 
-\parseargdef\unmacro{%
+\def\unmacro{\parsearg\unmacroxxx}
+\def\unmacroxxx#1{%
   \if1\csname ismacro.#1\endcsname
     \global\cslet{#1}{macsave.#1}%
     \global\expandafter\let \csname ismacro.#1\endcsname=0%
-    % Remove the macro name from \macrolist:
+    % Remove the macro name from \macrolist
     \begingroup
-      \expandafter\let\csname#1\endcsname \relax
-      \let\do\unmacrodo
-      \xdef\macrolist{\macrolist}%
+      \edef\tempa{\expandafter\noexpand\csname#1\endcsname}%
+      \def\do##1{%
+        \def\tempb{##1}%
+        \ifx\tempa\tempb
+          % remove this
+        \else
+          \toks0 = \expandafter{\newmacrolist\do}%
+          \edef\newmacrolist{\the\toks0\expandafter\noexpand\tempa}%
+        \fi}%
+      \def\newmacrolist{}%
+      % Execute macro list to define \newmacrolist
+      \macrolist
+      \global\let\macrolist\newmacrolist
     \endgroup
   \else
     \errmessage{Macro #1 not defined}%
   \fi
 }
 
-% Called by \do from \dounmacro on each macro.  The idea is to omit any
-% macro definitions that have been changed to \relax.
-%
-\def\unmacrodo#1{%
-  \ifx#1\relax
-    % remove this
-  \else
-    \noexpand\do \noexpand #1%
-  \fi
-}
-
 % This makes use of the obscure feature that if the last token of a
 % <parameter list> is #, then the preceding argument is delimited by
 % an opening brace, and that opening brace is not consumed.
@@ -5701,18 +5133,16 @@ width0pt\relax} \fi
 % @alias.
 % We need some trickery to remove the optional spaces around the equal
 % sign.  Just make them active and then expand them all to nothing.
-\def\alias{\parseargusing\obeyspaces\aliasxxx}
+\def\alias{\begingroup\obeyspaces\parsearg\aliasxxx}
 \def\aliasxxx #1{\aliasyyy#1\relax}
-\def\aliasyyy #1=#2\relax{%
-  {%
-    \expandafter\let\obeyedspace=\empty
-    \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
-  }%
-  \next
-}
+\def\aliasyyy #1=#2\relax{\ignoreactivespaces
+\edef\next{\global\let\expandafter\noexpand\csname#1\endcsname=%
+           \expandafter\noexpand\csname#2\endcsname}%
+\expandafter\endgroup\next}
 
 
 \message{cross references,}
+% @xref etc.
 
 \newwrite\auxfile
 
@@ -5724,61 +5154,56 @@ width0pt\relax} \fi
 \def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
   node \samp{\ignorespaces#1{}}}
 
-% @node's only job in TeX is to define \lastnode, which is used in
-% cross-references.
-\parseargdef\node{\checkenv{}\nodexxx #1,\finishnodeparse}
-\def\nodexxx#1,#2\finishnodeparse{\gdef\lastnode{#1}}
+% @node's job is to define \lastnode.
+\def\node{\ENVcheck\parsearg\nodezzz}
+\def\nodezzz#1{\nodexxx [#1,]}
+\def\nodexxx[#1,#2]{\gdef\lastnode{#1}}
 \let\nwnode=\node
-\let\lastnode=\empty
-
-% Write a cross-reference definition for the current node.  #1 is the
-% type (Ynumbered, Yappendix, Ynothing).
-% 
-\def\donoderef#1{%
-  \ifx\lastnode\empty\else
-    \setref{\lastnode}{#1}%
-    \global\let\lastnode=\empty
+\let\lastnode=\relax
+
+% The sectioning commands (@chapter, etc.) call these.
+\def\donoderef{%
+  \ifx\lastnode\relax\else
+    \expandafter\expandafter\expandafter\setref{\lastnode}%
+      {Ysectionnumberandtype}%
+    \global\let\lastnode=\relax
   \fi
 }
+\def\unnumbnoderef{%
+  \ifx\lastnode\relax\else
+    \expandafter\expandafter\expandafter\setref{\lastnode}{Ynothing}%
+    \global\let\lastnode=\relax
+  \fi
+}
+\def\appendixnoderef{%
+  \ifx\lastnode\relax\else
+    \expandafter\expandafter\expandafter\setref{\lastnode}%
+      {Yappendixletterandtype}%
+    \global\let\lastnode=\relax
+  \fi
+}
+
 
 % @anchor{NAME} -- define xref target at arbitrary point.
 %
 \newcount\savesfregister
-%
-\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi}
-\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
-\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
-
-% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
-% anchor), which consists of three parts:
-% 1) NAME-title - the current sectioning name taken from \thissection,
-%                 or the anchor name.
-% 2) NAME-snt   - section number and type, passed as the SNT arg, or
-%                 empty for anchors.
-% 3) NAME-pg    - the page number.
-% 
-% This is called from \donoderef, \anchor, and \dofloat.  In the case of
-% floats, there is an additional part, which is not written here:
-% 4) NAME-lof   - the text as it should appear in a @listoffloats.
-% 
-\def\setref#1#2{%
+\gdef\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi}
+\gdef\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
+\gdef\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
+
+% \setref{NAME}{SNT} defines a cross-reference point NAME, namely
+% NAME-title, NAME-pg, and NAME-SNT.  Called from \foonoderef.  We have
+% to set \indexdummies so commands such as @code in a section title
+% aren't expanded.  It would be nicer not to expand the titles in the
+% first place, but there's so many layers that that is hard to do.
+%
+\def\setref#1#2{{%
+  \indexdummies
   \pdfmkdest{#1}%
-  \iflinks
-    {%
-      \atdummies  % preserve commands, but don't expand them
-      \turnoffactive
-      \otherbackslash
-      \edef\writexrdef##1##2{%
-	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
-	  ##1}{##2}}% these are parameters of \writexrdef
-      }%
-      \toks0 = \expandafter{\thissection}%
-      \immediate \writexrdef{title}{\the\toks0 }%
-      \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
-      \writexrdef{pg}{\folio}% will be written later, during \shipout
-    }%
-  \fi
-}
+  \dosetq{#1-title}{Ytitle}%
+  \dosetq{#1-pg}{Ypagenumber}%
+  \dosetq{#1-snt}{#2}%
+}}
 
 % @xref, @pxref, and @ref generate cross-references.  For \xrefX, #1 is
 % the node name, #2 the name of the Info cross-reference, #3 the printed
@@ -5791,156 +5216,135 @@ width0pt\relax} \fi
 \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
   \unsepspaces
   \def\printedmanual{\ignorespaces #5}%
-  \def\printedrefname{\ignorespaces #3}%
-  \setbox1=\hbox{\printedmanual\unskip}%
-  \setbox0=\hbox{\printedrefname\unskip}%
+  \def\printednodename{\ignorespaces #3}%
+  \setbox1=\hbox{\printedmanual}%
+  \setbox0=\hbox{\printednodename}%
   \ifdim \wd0 = 0pt
     % No printed node name was explicitly given.
     \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
       % Use the node name inside the square brackets.
-      \def\printedrefname{\ignorespaces #1}%
+      \def\printednodename{\ignorespaces #1}%
     \else
       % Use the actual chapter/section title appear inside
       % the square brackets.  Use the real section title if we have it.
       \ifdim \wd1 > 0pt
         % It is in another manual, so we don't have it.
-        \def\printedrefname{\ignorespaces #1}%
+        \def\printednodename{\ignorespaces #1}%
       \else
         \ifhavexrefs
           % We know the real title if we have the xref values.
-          \def\printedrefname{\refx{#1-title}{}}%
+          \def\printednodename{\refx{#1-title}{}}%
         \else
           % Otherwise just copy the Info node name.
-          \def\printedrefname{\ignorespaces #1}%
+          \def\printednodename{\ignorespaces #1}%
         \fi%
       \fi
     \fi
   \fi
   %
-  % Make link in pdf output.
+  % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
+  % insert empty discretionaries after hyphens, which means that it will
+  % not find a line break at a hyphen in a node names.  Since some manuals
+  % are best written with fairly long node names, containing hyphens, this
+  % is a loss.  Therefore, we give the text of the node name again, so it
+  % is as if TeX is seeing it for the first time.
   \ifpdf
     \leavevmode
     \getfilename{#4}%
-    {\turnoffactive \otherbackslash
-     \ifnum\filenamelength>0
-       \startlink attr{/Border [0 0 0]}%
-         goto file{\the\filename.pdf} name{#1}%
-     \else
-       \startlink attr{/Border [0 0 0]}%
-         goto name{\pdfmkpgn{#1}}%
-     \fi
-    }%
+    \ifnum\filenamelength>0
+      \startlink attr{/Border [0 0 0]}%
+        goto file{\the\filename.pdf} name{#1@}%
+    \else
+      \startlink attr{/Border [0 0 0]}%
+        goto name{#1@}%
+    \fi
     \linkcolor
   \fi
   %
-  % Float references are printed completely differently: "Figure 1.2"
-  % instead of "[somenode], p.3".  We distinguish them by the
-  % LABEL-title being set to a magic string.
-  {%
-    % Have to otherify everything special to allow the \csname to
-    % include an _ in the xref name, etc.
-    \indexnofonts
-    \turnoffactive
-    \otherbackslash
-    \expandafter\global\expandafter\let\expandafter\Xthisreftitle
-      \csname XR#1-title\endcsname
-  }%
-  \iffloat\Xthisreftitle
-    % If the user specified the print name (third arg) to the ref,
-    % print it instead of our usual "Figure 1.2".
-    \ifdim\wd0 = 0pt
-      \refx{#1-snt}%
-    \else
-      \printedrefname
-    \fi
-    %
-    % if the user also gave the printed manual name (fifth arg), append
-    % "in MANUALNAME". 
-    \ifdim \wd1 > 0pt
-      \space \putwordin{} \cite{\printedmanual}%
-    \fi
+  \ifdim \wd1 > 0pt
+    \putwordsection{} ``\printednodename'' \putwordin{} \cite{\printedmanual}%
   \else
-    % node/anchor (non-float) references.
-    % 
-    % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
-    % insert empty discretionaries after hyphens, which means that it will
-    % not find a line break at a hyphen in a node names.  Since some manuals
-    % are best written with fairly long node names, containing hyphens, this
-    % is a loss.  Therefore, we give the text of the node name again, so it
-    % is as if TeX is seeing it for the first time.
-    \ifdim \wd1 > 0pt
-      \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
-    \else
-      % _ (for example) has to be the character _ for the purposes of the
-      % control sequence corresponding to the node, but it has to expand
-      % into the usual \leavevmode...\vrule stuff for purposes of
-      % printing. So we \turnoffactive for the \refx-snt, back on for the
-      % printing, back off for the \refx-pg.
-      {\turnoffactive \otherbackslash
-       % Only output a following space if the -snt ref is nonempty; for
-       % @unnumbered and @anchor, it won't be.
-       \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
-       \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
-      }%
-      % output the `[mynode]' via a macro so it can be overridden.
-      \xrefprintnodename\printedrefname
-      %
-      % But we always want a comma and a space:
-      ,\space
-      %
-      % output the `page 3'.
-      \turnoffactive \otherbackslash \putwordpage\tie\refx{#1-pg}{}%
-    \fi
+    % _ (for example) has to be the character _ for the purposes of the
+    % control sequence corresponding to the node, but it has to expand
+    % into the usual \leavevmode...\vrule stuff for purposes of
+    % printing. So we \turnoffactive for the \refx-snt, back on for the
+    % printing, back off for the \refx-pg.
+    {\normalturnoffactive
+     % Only output a following space if the -snt ref is nonempty; for
+     % @unnumbered and @anchor, it won't be.
+     \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
+     \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
+    }%
+    % [mynode],
+    [\printednodename],\space
+    % page 3
+    \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
   \fi
   \endlink
 \endgroup}
 
-% This macro is called from \xrefX for the `[nodename]' part of xref
-% output.  It's a separate macro only so it can be changed more easily,
-% since square brackets don't work well in some documents.  Particularly
-% one that Bob is working on :).
-%
-\def\xrefprintnodename#1{[#1]}
+% \dosetq is the interface for calls from other macros
 
-% Things referred to by \setref.
-%
-\def\Ynothing{}
-\def\Yomitfromtoc{}
-\def\Ynumbered{%
-  \ifnum\secno=0
-    \putwordChapter@tie \the\chapno
-  \else \ifnum\subsecno=0
-    \putwordSection@tie \the\chapno.\the\secno
-  \else \ifnum\subsubsecno=0
-    \putwordSection@tie \the\chapno.\the\secno.\the\subsecno
-  \else
-    \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno
-  \fi\fi\fi
-}
-\def\Yappendix{%
-  \ifnum\secno=0
-     \putwordAppendix@tie @char\the\appendixno{}%
-  \else \ifnum\subsecno=0
-     \putwordSection@tie @char\the\appendixno.\the\secno
-  \else \ifnum\subsubsecno=0
-    \putwordSection@tie @char\the\appendixno.\the\secno.\the\subsecno
-  \else
-    \putwordSection@tie
-      @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno
-  \fi\fi\fi
+% Use \normalturnoffactive so that punctuation chars such as underscore
+% and backslash work in node names.  (\turnoffactive doesn't do \.)
+\def\dosetq#1#2{%
+  {\let\folio=0%
+   \normalturnoffactive
+   \edef\next{\write\auxfile{\internalsetq{#1}{#2}}}%
+   \iflinks
+     \next
+   \fi
+  }%
 }
 
+% \internalsetq {foo}{page} expands into
+% CHARACTERS 'xrdef {foo}{...expansion of \Ypage...}
+% When the aux file is read, ' is the escape character
+
+\def\internalsetq #1#2{'xrdef {#1}{\csname #2\endcsname}}
+
+% Things to be expanded by \internalsetq
+
+\def\Ypagenumber{\folio}
+
+\def\Ytitle{\thissection}
+
+\def\Ynothing{}
+
+\def\Ysectionnumberandtype{%
+\ifnum\secno=0 \putwordChapter\xreftie\the\chapno %
+\else \ifnum \subsecno=0 \putwordSection\xreftie\the\chapno.\the\secno %
+\else \ifnum \subsubsecno=0 %
+\putwordSection\xreftie\the\chapno.\the\secno.\the\subsecno %
+\else %
+\putwordSection\xreftie\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno %
+\fi \fi \fi }
+
+\def\Yappendixletterandtype{%
+\ifnum\secno=0 \putwordAppendix\xreftie'char\the\appendixno{}%
+\else \ifnum \subsecno=0 \putwordSection\xreftie'char\the\appendixno.\the\secno %
+\else \ifnum \subsubsecno=0 %
+\putwordSection\xreftie'char\the\appendixno.\the\secno.\the\subsecno %
+\else %
+\putwordSection\xreftie'char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno %
+\fi \fi \fi }
+
+\gdef\xreftie{'tie}
+
+% Use TeX 3.0's \inputlineno to get the line number, for better error
+% messages, but if we're using an old version of TeX, don't do anything.
+%
+\ifx\inputlineno\thisisundefined
+  \let\linenumber = \empty % Non-3.0.
+\else
+  \def\linenumber{\the\inputlineno:\space}
+\fi
+
 % Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
 % If its value is nonempty, SUFFIX is output afterward.
-%
+
 \def\refx#1#2{%
-  {%
-    \indexnofonts
-    \otherbackslash
-    \expandafter\global\expandafter\let\expandafter\thisrefX
-      \csname XR#1\endcsname
-  }%
-  \ifx\thisrefX\relax
+  \expandafter\ifx\csname X#1\endcsname\relax
     % If not defined, say something at least.
     \angleleft un\-de\-fined\angleright
     \iflinks
@@ -5955,49 +5359,21 @@ width0pt\relax} \fi
     \fi
   \else
     % It's defined, so just use it.
-    \thisrefX
+    \csname X#1\endcsname
   \fi
   #2% Output the suffix in any case.
 }
 
-% This is the macro invoked by entries in the aux file.  Usually it's
-% just a \def (we prepend XR to the control sequence name to avoid
-% collisions).  But if this is a float type, we have more work to do.
+% This is the macro invoked by entries in the aux file.
 %
-\def\xrdef#1#2{%
-  \expandafter\gdef\csname XR#1\endcsname{#2}% remember this xref value.
-  %
-  % Was that xref control sequence that we just defined for a float?
-  \expandafter\iffloat\csname XR#1\endcsname
-    % it was a float, and we have the (safe) float type in \iffloattype.
-    \expandafter\let\expandafter\floatlist
-      \csname floatlist\iffloattype\endcsname
-    % 
-    % Is this the first time we've seen this float type?
-    \expandafter\ifx\floatlist\relax
-      \toks0 = {\do}% yes, so just \do
-    \else
-      % had it before, so preserve previous elements in list.
-      \toks0 = \expandafter{\floatlist\do}%
-    \fi
-    %
-    % Remember this xref in the control sequence \floatlistFLOATTYPE,
-    % for later use in \listoffloats.
-    \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0{#1}}%
-  \fi
+\def\xrdef#1{\begingroup
+  % Reenable \ as an escape while reading the second argument.
+  \catcode`\\ = 0
+  \afterassignment\endgroup
+  \expandafter\gdef\csname X#1\endcsname
 }
 
 % Read the last existing aux file, if any.  No error if none exists.
-% 
-\def\tryauxfile{%
-  \openin 1 \jobname.aux
-  \ifeof 1 \else
-    \readauxfile
-    \global\havexrefstrue
-  \fi
-  \closein 1
-}
-
 \def\readauxfile{\begingroup
   \catcode`\^^@=\other
   \catcode`\^^A=\other
@@ -6026,7 +5402,9 @@ width0pt\relax} \fi
   \catcode`\^^]=\other
   \catcode`\^^^=\other
   \catcode`\^^_=\other
-  % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
+  \catcode`\@=\other
+  \catcode`\^=\other
+  % It was suggested to define this as 7, which would allow ^^e4 etc.
   % in xref tags, i.e., node names.  But since ^^e4 notation isn't
   % supported in the main text, it doesn't seem desirable.  Furthermore,
   % that is not enough: for node names that actually contain a ^
@@ -6039,9 +5417,6 @@ width0pt\relax} \fi
   % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
   % and then to call \auxhat in \setq.
   %
-  \catcode`\^=\other
-  %
-  % Special characters.  Should be turned off anyway, but...
   \catcode`\~=\other
   \catcode`\[=\other
   \catcode`\]=\other
@@ -6053,19 +5428,8 @@ width0pt\relax} \fi
   \catcode`\$=\other
   \catcode`\#=\other
   \catcode`\&=\other
-  \catcode`\%=\other
   \catcode`+=\other % avoid \+ for paranoia even though we've turned it off
-  %
-  % This is to support \ in node names and titles, since the \
-  % characters end up in a \csname.  It's easier than
-  % leaving it active and making its active definition an actual \
-  % character.  What I don't understand is why it works in the *value*
-  % of the xrdef.  Seems like it should be a catcode12 \, and that
-  % should not typeset properly.  But it works, so I'm moving on for
-  % now.  --karl, 15jan04.
-  \catcode`\\=\other
-  %
-  % Make the characters 128-255 be printing characters.
+  % Make the characters 128-255 be printing characters
   {%
     \count 1=128
     \def\loop{%
@@ -6074,18 +5438,31 @@ width0pt\relax} \fi
       \ifnum \count 1<256 \loop \fi
     }%
   }%
-  %
-  % @ is our escape character in .aux files, and we need braces.
+  % The aux file uses ' as the escape (for now).
+  % Turn off \ as an escape so we do not lose on
+  % entries which were dumped with control sequences in their names.
+  % For example, 'xrdef {$\leq $-fun}{page ...} made by @defun ^^
+  % Reference to such entries still does not work the way one would wish,
+  % but at least they do not bomb out when the aux file is read in.
   \catcode`\{=1
   \catcode`\}=2
-  \catcode`\@=0
+  \catcode`\%=\other
+  \catcode`\'=0
+  \catcode`\\=\other
   %
-  \input \jobname.aux
+  \openin 1 \jobname.aux
+  \ifeof 1 \else
+    \closein 1
+    \input \jobname.aux
+    \global\havexrefstrue
+    \global\warnedobstrue
+  \fi
+  % Open the new aux file.  TeX will close it automatically at exit.
+  \openout\auxfile=\jobname.aux
 \endgroup}
 
 
-\message{insertions,}
-% including footnotes.
+% Footnotes.
 
 \newcount \footnoteno
 
@@ -6099,39 +5476,37 @@ width0pt\relax} \fi
 % @footnotestyle is meaningful for info output only.
 \let\footnotestyle=\comment
 
+\let\ptexfootnote=\footnote
+
 {\catcode `\@=11
 %
 % Auto-number footnotes.  Otherwise like plain.
 \gdef\footnote{%
-  \let\indent=\ptexindent
-  \let\noindent=\ptexnoindent
   \global\advance\footnoteno by \@ne
   \edef\thisfootno{$^{\the\footnoteno}$}%
   %
   % In case the footnote comes at the end of a sentence, preserve the
   % extra spacing after we do the footnote number.
   \let\@sf\empty
-  \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi
+  \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\/\fi
   %
   % Remove inadvertent blank space before typesetting the footnote number.
   \unskip
   \thisfootno\@sf
-  \dofootnote
+  \footnotezzz
 }%
 
 % Don't bother with the trickery in plain.tex to not require the
 % footnote text as a parameter.  Our footnotes don't need to be so general.
 %
-% Oh yes, they do; otherwise, @ifset (and anything else that uses
-% \parseargline) fails inside footnotes because the tokens are fixed when
+% Oh yes, they do; otherwise, @ifset and anything else that uses
+% \parseargline fail inside footnotes because the tokens are fixed when
 % the footnote is read.  --karl, 16nov96.
 %
-\gdef\dofootnote{%
-  \insert\footins\bgroup
+\long\gdef\footnotezzz{\insert\footins\bgroup
   % We want to typeset this text as a normal paragraph, even if the
   % footnote reference occurs in (for example) a display environment.
   % So reset some parameters.
-  \hsize=\pagewidth
   \interlinepenalty\interfootnotelinepenalty
   \splittopskip\ht\strutbox % top baseline for broken footnotes
   \splitmaxdepth\dp\strutbox
@@ -6144,15 +5519,8 @@ width0pt\relax} \fi
   %
   \smallfonts \rm
   %
-  % Because we use hanging indentation in footnotes, a @noindent appears
-  % to exdent this text, so make it be a no-op.  makeinfo does not use
-  % hanging indentation so @noindent can still be needed within footnote
-  % text after an @example or the like (not that this is good style).
-  \let\noindent = \relax
-  %
-  % Hang the footnote text off the number.  Use \everypar in case the
-  % footnote extends for more than one paragraph.
-  \everypar = {\hang}%
+  % Hang the footnote text off the number.
+  \hang
   \textindent{\thisfootno}%
   %
   % Don't crash into the line above the footnote text.  Since this
@@ -6161,68 +5529,66 @@ width0pt\relax} \fi
   \footstrut
   \futurelet\next\fo@t
 }
-}%end \catcode `\@=11
+\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t
+  \else\let\next\f@t\fi \next}
+\def\f@@t{\bgroup\aftergroup\@foot\let\next}
+\def\f@t#1{#1\@foot}
+\def\@foot{\strut\par\egroup}
 
-% In case a @footnote appears in a vbox, save the footnote text and create
-% the real \insert just after the vbox finished.  Otherwise, the insertion
-% would be lost.
-% Similarily, if a @footnote appears inside an alignment, save the footnote
-% text to a box and make the \insert when a row of the table is finished.
-% And the same can be done for other insert classes.  --kasal, 16nov03.
+}%end \catcode `\@=11
 
-% Replace the \insert primitive by a cheating macro.
-% Deeper inside, just make sure that the saved insertions are not spilled
-% out prematurely.
+% Set the baselineskip to #1, and the lineskip and strut size
+% correspondingly.  There is no deep meaning behind these magic numbers
+% used as factors; they just match (closely enough) what Knuth defined.
 %
-\def\startsavinginserts{%
-  \ifx \insert\ptexinsert
-    \let\insert\saveinsert
-  \else
-    \let\checkinserts\relax
-  \fi
-}
-
-% This \insert replacement works for both \insert\footins{foo} and
-% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}.
+\def\lineskipfactor{.08333}
+\def\strutheightpercent{.70833}
+\def\strutdepthpercent {.29167}
 %
-\def\saveinsert#1{%
-  \edef\next{\noexpand\savetobox \makeSAVEname#1}%
-  \afterassignment\next
-  % swallow the left brace
-  \let\temp =
-}
-\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}}
-\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1}
-
-\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi}
-
-\def\placesaveins#1{%
-  \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname
-    {\box#1}%
-}
-
-% eat @SAVE -- beware, all of them have catcode \other:
-{
-  \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials  %  ;-)
-  \gdef\gobblesave @SAVE{}
+\def\setleading#1{%
+  \normalbaselineskip = #1\relax
+  \normallineskip = \lineskipfactor\normalbaselineskip
+  \normalbaselines
+  \setbox\strutbox =\hbox{%
+    \vrule width0pt height\strutheightpercent\baselineskip
+                    depth \strutdepthpercent \baselineskip
+  }%
 }
 
-% initialization:
-\def\newsaveins #1{%
-  \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}%
-  \next
-}
-\def\newsaveinsX #1{%
-  \csname newbox\endcsname #1%
-  \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts
-    \checksaveins #1}%
+% @| inserts a changebar to the left of the current line.  It should
+% surround any changed text.  This approach does *not* work if the
+% change spans more than two lines of output.  To handle that, we would
+% have adopt a much more difficult approach (putting marks into the main
+% vertical list for the beginning and end of each change).
+%
+\def\|{%
+  % \vadjust can only be used in horizontal mode.
+  \leavevmode
+  %
+  % Append this vertical mode material after the current line in the output.
+  \vadjust{%
+    % We want to insert a rule with the height and depth of the current
+    % leading; that is exactly what \strutbox is supposed to record.
+    \vskip-\baselineskip
+    %
+    % \vadjust-items are inserted at the left edge of the type.  So
+    % the \llap here moves out into the left-hand margin.
+    \llap{%
+      %
+      % For a thicker or thinner bar, change the `1pt'.
+      \vrule height\baselineskip width1pt
+      %
+      % This is the space between the bar and the text.
+      \hskip 12pt
+    }%
+  }%
 }
 
-% initialize:
-\let\checkinserts\empty
-\newsaveins\footins
-\newsaveins\margin
-
+% For a final copy, take out the rectangles
+% that mark overfull boxes (in case you have decided
+% that the text looks ok even though it passes the margin).
+%
+\def\finalout{\overfullrule=0pt}
 
 % @image.  We use the macros from epsf.tex to support this.
 % If epsf.tex is not installed and @image is used, we complain.
@@ -6232,12 +5598,12 @@ width0pt\relax} \fi
 % undone and the next image would fail.
 \openin 1 = epsf.tex
 \ifeof 1 \else
-  % Do not bother showing banner with epsf.tex v2.7k (available in
-  % doc/epsf.tex and on ctan).
+  \closein 1
+  % Do not bother showing banner with post-v2.7 epsf.tex (available in
+  % doc/epsf.tex until it shows up on ctan).
   \def\epsfannounce{\toks0 = }%
   \input epsf.tex
 \fi
-\closein 1
 %
 % We will only complain once about lack of epsf.tex.
 \newif\ifwarnednoepsf
@@ -6253,288 +5619,41 @@ width0pt\relax} \fi
       \global\warnednoepsftrue
     \fi
   \else
-    \imagexxx #1,,,,,\finish
+    \imagexxx #1,,,\finish
   \fi
 }
 %
 % Arguments to @image:
 % #1 is (mandatory) image filename; we tack on .eps extension.
 % #2 is (optional) width, #3 is (optional) height.
-% #4 is (ignored optional) html alt text.
-% #5 is (ignored optional) extension.
-% #6 is just the usual extra ignored arg for parsing this stuff.
-\newif\ifimagevmode
-\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
-  \catcode`\^^M = 5     % in case we're inside an example
-  \normalturnoffactive  % allow _ et al. in names
-  % If the image is by itself, center it.
-  \ifvmode
-    \imagevmodetrue
-    \nobreak\bigskip
-    % Usually we'll have text after the image which will insert
-    % \parskip glue, so insert it here too to equalize the space
-    % above and below.
-    \nobreak\vskip\parskip
-    \nobreak
-    \line\bgroup\hss
-  \fi
-  %
-  % Output the image.
+% #4 is just the usual extra ignored arg for parsing this stuff.
+\def\imagexxx#1,#2,#3,#4\finish{%
   \ifpdf
-    \dopdfimage{#1}{#2}{#3}%
+    \centerline{\dopdfimage{#1}{#2}{#3}}%
   \else
     % \epsfbox itself resets \epsf?size at each figure.
     \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi
     \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi
-    \epsfbox{#1.eps}%
-  \fi
-  %
-  \ifimagevmode \hss \egroup \bigbreak \fi  % space after the image
-\endgroup}
-
-
-% @float FLOATTYPE,LOC ... @end float for displayed figures, tables, etc.
-% We don't actually implement floating yet, we just plop the float "here".
-% But it seemed the best name for the future.
-% 
-\envparseargdef\float{\dofloat #1,,,\finish}
-
-% #1 is the optional FLOATTYPE, the text label for this float, typically
-% "Figure", "Table", "Example", etc.  Can't contain commas.  If omitted,
-% this float will not be numbered and cannot be referred to.
-% 
-% #2 is the optional xref label.  Also must be present for the float to
-% be referable.
-% 
-% #3 is the optional positioning argument; for now, it is ignored.  It
-% will somehow specify the positions allowed to float to (here, top, bottom).
-% 
-% We keep a separate counter for each FLOATTYPE, which we reset at each
-% chapter-level command.
-\let\resetallfloatnos=\empty
-%
-\def\dofloat#1,#2,#3,#4\finish{%
-  \let\thiscaption=\empty
-  \let\thisshortcaption=\empty
-  %
-  % don't lose footnotes inside @float.
-  \startsavinginserts
-  %
-  \vtop\bgroup
-    \def\floattype{#1}%
-    \def\floatlabel{#2}%
-    \def\floatloc{#3}% we do nothing with this yet.
-    %
-    \ifx\floattype\empty
-      \let\safefloattype=\empty
-    \else
-      {%
-        % the floattype might have accents or other special characters,
-        % but we need to use it in a control sequence name.
-        \indexnofonts
-        \turnoffactive
-        \xdef\safefloattype{\floattype}%
-      }%
-    \fi
-    %
-    % If label is given but no type, we handle that as the empty type.
-    \ifx\floatlabel\empty \else
-      % We want each FLOATTYPE to be numbered separately (Figure 1,
-      % Table 1, Figure 2, ...).  (And if no label, no number.)
-      % 
-      \expandafter\getfloatno\csname\safefloattype floatno\endcsname
-      \global\advance\floatno by 1
-      %
-      {%
-        % This magic value for \thissection is output by \setref as the
-        % XREFLABEL-title value.  \xrefX uses it to distinguish float
-        % labels (which have a completely different output format) from
-        % node and anchor labels.  And \xrdef uses it to construct the
-        % lists of floats.
-        % 
-        \edef\thissection{\floatmagic=\safefloattype}%
-        \setref{\floatlabel}{Yfloat}%
-      }%
-    \fi
-    %
-    % start with \parskip glue, I guess.
-    \vskip\parskip
-    %
-    % Don't suppress indentation if a float happens to start a section.
-    \restorefirstparagraphindent
-}
-
-% we have these possibilities:
-% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap
-% @float Foo,lbl & no caption:    Foo 1.1
-% @float Foo & @caption{Cap}:     Foo: Cap
-% @float Foo & no caption:        Foo
-% @float ,lbl & Caption{Cap}:     1.1: Cap
-% @float ,lbl & no caption:       1.1
-% @float & @caption{Cap}:         Cap
-% @float & no caption:
-%
-\def\Efloat{%
-    \let\floatident = \empty
-    %
-    % In all cases, if we have a float type, it comes first.
-    \ifx\floattype\empty \else \def\floatident{\floattype}\fi
-    %
-    % If we have an xref label, the number comes next.
-    \ifx\floatlabel\empty \else
-      \ifx\floattype\empty \else % if also had float type, need tie first.
-        \appendtomacro\floatident{\tie}%
-      \fi
-      % the number.
-      \appendtomacro\floatident{\chaplevelprefix\the\floatno}%
-    \fi
-    %
-    % Start the printed caption with what we've constructed in
-    % \floatident, but keep it separate; we need \floatident again.
-    \let\captionline = \floatident
-    %
-    \ifx\thiscaption\empty \else
-      \ifx\floatident\empty \else
-	\appendtomacro\captionline{: }% had ident, so need a colon between
-      \fi
-      %
-      % caption text.
-      \appendtomacro\captionline\thiscaption
-    \fi
-    %
-    % If we have anything to print, print it, with space before.
-    % Eventually this needs to become an \insert.
-    \ifx\captionline\empty \else
-      \vskip.5\parskip
-      \captionline
-    \fi
-    %
-    % If have an xref label, write the list of floats info.  Do this
-    % after the caption, to avoid chance of it being a breakpoint.
-    \ifx\floatlabel\empty \else
-      % Write the text that goes in the lof to the aux file as
-      % \floatlabel-lof.  Besides \floatident, we include the short
-      % caption if specified, else the full caption if specified, else nothing.
-      {%
-        \atdummies \turnoffactive \otherbackslash
-        \immediate\write\auxfile{@xrdef{\floatlabel-lof}{%
-          \floatident
-          \ifx\thisshortcaption\empty
-            \ifx\thiscaption\empty \else : \thiscaption \fi
-          \else
-            : \thisshortcaption
-          \fi
-        }}%
-      }%
-    \fi
-    %
-    % Space below caption, if we printed anything.
-    \ifx\printedsomething\empty \else \vskip\parskip \fi
-  \egroup  % end of \vtop
-  \checkinserts
-}
-
-% Append the tokens #2 to the definition of macro #1, not expanding either.
-% 
-\newtoks\appendtomacroAtoks
-\newtoks\appendtomacroBtoks
-\def\appendtomacro#1#2{%
-  \appendtomacroAtoks = \expandafter{#1}%
-  \appendtomacroBtoks = {#2}%
-  \edef#1{\the\appendtomacroAtoks \the\appendtomacroBtoks}%
-}
-
-% @caption, @shortcaption are easy.
-% 
-\long\def\caption#1{\checkenv\float \def\thiscaption{#1}}
-\def\shortcaption#1{\checkenv\float \def\thisshortcaption{#1}}
-
-% The parameter is the control sequence identifying the counter we are
-% going to use.  Create it if it doesn't exist and assign it to \floatno.
-\def\getfloatno#1{%
-  \ifx#1\relax
-      % Haven't seen this figure type before.
-      \csname newcount\endcsname #1%
-      %
-      % Remember to reset this floatno at the next chap.
-      \expandafter\gdef\expandafter\resetallfloatnos
-        \expandafter{\resetallfloatnos #1=0 }%
-  \fi
-  \let\floatno#1%
-}
-
-% \setref calls this to get the XREFLABEL-snt value.  We want an @xref
-% to the FLOATLABEL to expand to "Figure 3.1".  We call \setref when we
-% first read the @float command.
-% 
-\def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}%
-
-% Magic string used for the XREFLABEL-title value, so \xrefX can
-% distinguish floats from other xref types.
-\def\floatmagic{!!float!!}
-
-% #1 is the control sequence we are passed; we expand into a conditional
-% which is true if #1 represents a float ref.  That is, the magic
-% \thissection value which we \setref above.
-% 
-\def\iffloat#1{\expandafter\doiffloat#1==\finish}
-%
-% #1 is (maybe) the \floatmagic string.  If so, #2 will be the
-% (safe) float type for this float.  We set \iffloattype to #2.
-% 
-\def\doiffloat#1=#2=#3\finish{%
-  \def\temp{#1}%
-  \def\iffloattype{#2}%
-  \ifx\temp\floatmagic
-}
-
-% @listoffloats FLOATTYPE - print a list of floats like a table of contents.
-% 
-\parseargdef\listoffloats{%
-  \def\floattype{#1}% floattype
-  {%
-    % the floattype might have accents or other special characters,
-    % but we need to use it in a control sequence name.
-    \indexnofonts
-    \turnoffactive
-    \xdef\safefloattype{\floattype}%
-  }%
-  %
-  % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE.
-  \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax
-    \ifhavexrefs
-      % if the user said @listoffloats foo but never @float foo.
-      \message{\linenumber No `\safefloattype' floats to list.}%
-    \fi
-  \else
     \begingroup
-      \leftskip=\tocindent  % indent these entries like a toc
-      \let\do=\listoffloatsdo
-      \csname floatlist\safefloattype\endcsname
+      \catcode`\^^M = 5 % in case we're inside an example
+      % If the image is by itself, center it.
+      \ifvmode
+        \nobreak\bigskip
+        % Usually we'll have text after the image which will insert
+        % \parskip glue, so insert it here too to equalize the space
+        % above and below. 
+        \nobreak\vskip\parskip
+        \nobreak
+        \centerline{\epsfbox{#1.eps}}%
+        \bigbreak
+      \else
+        % In the middle of a paragraph, no extra space.
+        \epsfbox{#1.eps}%
+      \fi
     \endgroup
   \fi
 }
 
-% This is called on each entry in a list of floats.  We're passed the
-% xref label, in the form LABEL-title, which is how we save it in the
-% aux file.  We strip off the -title and look up \XRLABEL-lof, which
-% has the text we're supposed to typeset here.
-% 
-% Figures without xref labels will not be included in the list (since
-% they won't appear in the aux file).
-% 
-\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish}
-\def\listoffloatsdoentry#1-title\finish{{%
-  % Can't fully expand XR#1-lof because it can contain anything.  Just
-  % pass the control sequence.  On the other hand, XR#1-pg is just the
-  % page number, and we want to fully expand that so we can get a link
-  % in pdf output.
-  \toksA = \expandafter{\csname XR#1-lof\endcsname}%
-  %
-  % use the same \entry macro we use to generate the TOC and index.
-  \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}%
-  \writeentry
-}}
 
 \message{localization,}
 % and i18n.
@@ -6544,17 +5663,19 @@ width0pt\relax} \fi
 % properly.  Single argument is the language abbreviation.
 % It would be nice if we could set up a hyphenation file here.
 %
-\parseargdef\documentlanguage{%
+\def\documentlanguage{\parsearg\dodocumentlanguage}
+\def\dodocumentlanguage#1{%
   \tex % read txi-??.tex file in plain TeX.
-    % Read the file if it exists.
-    \openin 1 txi-#1.tex
-    \ifeof 1
-      \errhelp = \nolanghelp
-      \errmessage{Cannot read language file txi-#1.tex}%
-    \else
-      \input txi-#1.tex
-    \fi
-    \closein 1
+  % Read the file if it exists.
+  \openin 1 txi-#1.tex
+  \ifeof1
+    \errhelp = \nolanghelp
+    \errmessage{Cannot read language file txi-#1.tex}%
+    \let\temp = \relax
+  \else
+    \def\temp{\input txi-#1.tex }%
+  \fi
+  \temp
   \endgroup
 }
 \newhelp\nolanghelp{The given language definition file cannot be found or
@@ -6600,13 +5721,10 @@ should work if nowhere else does.}
 }
 
 % Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
-% 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8)
-% physical page width.
-%
-% We also call \setleading{\textleading}, so the caller should define
-% \textleading.  The caller should also set \parskip.
+% 4) hoffset; 5) binding offset; 6) topskip.  Then whoever calls us can
+% set \parskip and call \setleading for \baselineskip.
 %
-\def\internalpagesizes#1#2#3#4#5#6#7#8{%
+\def\internalpagesizes#1#2#3#4#5#6{%
   \voffset = #3\relax
   \topskip = #6\relax
   \splittopskip = \topskip
@@ -6625,13 +5743,6 @@ should work if nowhere else does.}
   \normaloffset = #4\relax
   \bindingoffset = #5\relax
   %
-  \ifpdf
-    \pdfpageheight #7\relax
-    \pdfpagewidth #8\relax
-  \fi
-  %
-  \setleading{\textleading}
-  %
   \parindent = \defaultparindent
   \setemergencystretch
 }
@@ -6639,122 +5750,76 @@ should work if nowhere else does.}
 % @letterpaper (the default).
 \def\letterpaper{{\globaldefs = 1
   \parskip = 3pt plus 2pt minus 1pt
-  \textleading = 13.2pt
+  \setleading{13.2pt}%
   %
   % If page is nothing but text, make it come out even.
-  \internalpagesizes{46\baselineskip}{6in}%
-                    {\voffset}{.25in}%
-                    {\bindingoffset}{36pt}%
-                    {11in}{8.5in}%
+  \internalpagesizes{46\baselineskip}{6in}{\voffset}{.25in}{\bindingoffset}{36pt}%
 }}
 
 % Use @smallbook to reset parameters for 7x9.5 (or so) format.
 \def\smallbook{{\globaldefs = 1
   \parskip = 2pt plus 1pt
-  \textleading = 12pt
+  \setleading{12pt}%
   %
-  \internalpagesizes{7.5in}{5in}%
-                    {\voffset}{.25in}%
-                    {\bindingoffset}{16pt}%
-                    {9.25in}{7in}%
+  \internalpagesizes{7.5in}{5.in}{\voffset}{.25in}{\bindingoffset}{16pt}%
   %
   \lispnarrowing = 0.3in
   \tolerance = 700
   \hfuzz = 1pt
   \contentsrightmargin = 0pt
+  \deftypemargin = 0pt
   \defbodyindent = .5cm
+  %
+  \let\smalldisplay = \smalldisplayx
+  \let\smallexample = \smalllispx
+  \let\smallformat = \smallformatx
+  \let\smalllisp = \smalllispx
 }}
 
 % Use @afourpaper to print on European A4 paper.
 \def\afourpaper{{\globaldefs = 1
+  \setleading{12pt}%
   \parskip = 3pt plus 2pt minus 1pt
-  \textleading = 13.2pt
   %
-  % Double-side printing via postscript on Laserjet 4050
-  % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm.
-  % To change the settings for a different printer or situation, adjust
-  % \normaloffset until the front-side and back-side texts align.  Then
-  % do the same for \bindingoffset.  You can set these for testing in
-  % your texinfo source file like this:
-  % @tex
-  % \global\normaloffset = -6mm
-  % \global\bindingoffset = 10mm
-  % @end tex
-  \internalpagesizes{51\baselineskip}{160mm}
-                    {\voffset}{\hoffset}%
-                    {\bindingoffset}{44pt}%
-                    {297mm}{210mm}%
+  \internalpagesizes{53\baselineskip}{160mm}{\voffset}{4mm}{\bindingoffset}{44pt}%
   %
   \tolerance = 700
   \hfuzz = 1pt
-  \contentsrightmargin = 0pt
-  \defbodyindent = 5mm
-}}
-
-% Use @afivepaper to print on European A5 paper.
-% From romildo@urano.iceb.ufop.br, 2 July 2000.
-% He also recommends making @example and @lisp be small.
-\def\afivepaper{{\globaldefs = 1
-  \parskip = 2pt plus 1pt minus 0.1pt
-  \textleading = 12.5pt
-  %
-  \internalpagesizes{160mm}{120mm}%
-                    {\voffset}{\hoffset}%
-                    {\bindingoffset}{8pt}%
-                    {210mm}{148mm}%
-  %
-  \lispnarrowing = 0.2in
-  \tolerance = 800
-  \hfuzz = 1.2pt
-  \contentsrightmargin = 0pt
-  \defbodyindent = 2mm
-  \tableindent = 12mm
 }}
 
-% A specific text layout, 24x15cm overall, intended for A4 paper.
+% A specific text layout, 24x15cm overall, intended for A4 paper.  Top margin
+% 29mm, hence bottom margin 28mm, nominal side margin 3cm.
 \def\afourlatex{{\globaldefs = 1
+  \setleading{13.6pt}%
+  %
   \afourpaper
-  \internalpagesizes{237mm}{150mm}%
-                    {\voffset}{4.6mm}%
-                    {\bindingoffset}{7mm}%
-                    {297mm}{210mm}%
+  \internalpagesizes{237mm}{150mm}{3.6mm}{3.6mm}{3mm}{7mm}%
   %
-  % Must explicitly reset to 0 because we call \afourpaper.
   \globaldefs = 0
 }}
 
-% Use @afourwide to print on A4 paper in landscape format.
-\def\afourwide{{\globaldefs = 1
+% Use @afourwide to print on European A4 paper in wide format.
+\def\afourwide{%
   \afourpaper
-  \internalpagesizes{241mm}{165mm}%
-                    {\voffset}{-2.95mm}%
-                    {\bindingoffset}{7mm}%
-                    {297mm}{210mm}%
+  \internalpagesizes{6.5in}{9.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}%
+  %
   \globaldefs = 0
-}}
+}
 
 % @pagesizes TEXTHEIGHT[,TEXTWIDTH]
 % Perhaps we should allow setting the margins, \topskip, \parskip,
 % and/or leading, also. Or perhaps we should compute them somehow.
 %
-\parseargdef\pagesizes{\pagesizesyyy #1,,\finish}
+\def\pagesizes{\parsearg\pagesizesxxx}
+\def\pagesizesxxx#1{\pagesizesyyy #1,,\finish}
 \def\pagesizesyyy#1,#2,#3\finish{{%
   \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi
   \globaldefs = 1
   %
   \parskip = 3pt plus 2pt minus 1pt
-  \setleading{\textleading}%
+  \setleading{13.2pt}%
   %
-  \dimen0 = #1
-  \advance\dimen0 by \voffset
-  %
-  \dimen2 = \hsize
-  \advance\dimen2 by \normaloffset
-  %
-  \internalpagesizes{#1}{\hsize}%
-                    {\voffset}{\normaloffset}%
-                    {\bindingoffset}{44pt}%
-                    {\dimen0}{\dimen2}%
+  \internalpagesizes{#1}{\hsize}{\voffset}{\normaloffset}{\bindingoffset}{44pt}%
 }}
 
 % Set default to letter.
@@ -6782,10 +5847,10 @@ should work if nowhere else does.}
 \def\normalless{<}
 \def\normalgreater{>}
 \def\normalplus{+}
-\def\normaldollar{$}%$ font-lock fix
+\def\normaldollar{$}
 
-% This macro is used to make a character print one way in \tt
-% (where it can probably be output as-is), and another way in other fonts,
+% This macro is used to make a character print one way in ttfont
+% where it can probably just be output, and another way in other fonts,
 % where something hairier probably needs to be done.
 %
 % #1 is what to print if we are indeed using \tt; #2 is what to print
@@ -6818,7 +5883,7 @@ should work if nowhere else does.}
 \catcode`\_=\active
 \def_{\ifusingtt\normalunderscore\_}
 % Subroutine for the previous macro.
-\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
+\def\_{\leavevmode \kern.06em \vbox{\hrule width.3em height.1ex}}
 
 \catcode`\|=\active
 \def|{{\tt\char124}}
@@ -6831,7 +5896,16 @@ should work if nowhere else does.}
 \catcode`\+=\active
 \def+{{\tt \char 43}}
 \catcode`\$=\active
-\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
+\def${\ifusingit{{\sl\$}}\normaldollar}
+%\catcode 27=\active
+%\def^^[{$\diamondsuit$}
+
+% Set up an active definition for =, but don't enable it most of the time.
+{\catcode`\==\active
+\global\def={{\tt \char 61}}}
+
+\catcode`+=\active
+\catcode`\_=\active
 
 % If a .fmt file is being used, characters that might appear in a file
 % name cannot be active until we have parsed the command line.
@@ -6841,48 +5915,44 @@ should work if nowhere else does.}
 
 \catcode`\@=0
 
-% \backslashcurfont outputs one backslash character in current font,
-% as in \char`\\.
-\global\chardef\backslashcurfont=`\\
-\global\let\rawbackslashxx=\backslashcurfont  % let existing .??s files work
+% \rawbackslashxx output one backslash character in current font
+\global\chardef\rawbackslashxx=`\\
+%{\catcode`\\=\other
+%@gdef@rawbackslashxx{\}}
 
-% \rawbackslash defines an active \ to do \backslashcurfont.
-% \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other.
+% \rawbackslash redefines \ as input to do \rawbackslashxx.
 {\catcode`\\=\active
- @gdef@rawbackslash{@let\=@backslashcurfont}
- @gdef@otherbackslash{@let\=@realbackslash}
-}
-
-% \realbackslash is an actual character `\' with catcode other.
-{\catcode`\\=\other @gdef@realbackslash{\}}
+@gdef@rawbackslash{@let\=@rawbackslashxx }}
 
 % \normalbackslash outputs one backslash in fixed width font.
-\def\normalbackslash{{\tt\backslashcurfont}}
+\def\normalbackslash{{\tt\rawbackslashxx}}
 
+% \catcode 17=0   % Define control-q
 \catcode`\\=\active
 
 % Used sometimes to turn off (effectively) the active characters
 % even after parsing them.
-@def@turnoffactive{%
-  @let"=@normaldoublequote
-  @let\=@realbackslash
-  @let~=@normaltilde
-  @let^=@normalcaret
-  @let_=@normalunderscore
-  @let|=@normalverticalbar
-  @let<=@normalless
-  @let>=@normalgreater
-  @let+=@normalplus
-  @let$=@normaldollar %$ font-lock fix
-  @unsepspaces
-}
-
-% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.  (Thus, \ is not expandable when this is in
-% effect.)
-%
-@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash}
+@def@turnoffactive{@let"=@normaldoublequote
+@let\=@realbackslash
+@let~=@normaltilde
+@let^=@normalcaret
+@let_=@normalunderscore
+@let|=@normalverticalbar
+@let<=@normalless
+@let>=@normalgreater
+@let+=@normalplus
+@let$=@normaldollar}
+
+@def@normalturnoffactive{@let"=@normaldoublequote
+@let\=@normalbackslash
+@let~=@normaltilde
+@let^=@normalcaret
+@let_=@normalunderscore
+@let|=@normalverticalbar
+@let<=@normalless
+@let>=@normalgreater
+@let+=@normalplus
+@let$=@normaldollar}
 
 % Make _ and + \other characters, temporarily.
 % This is canceled by @fixbackslash.
@@ -6910,11 +5980,15 @@ should work if nowhere else does.}
 % Say @foo, not \foo, in error messages.
 @escapechar = `@@
 
-% These look ok in all fonts, so just make them not special.
+% These look ok in all fonts, so just make them not special.  
 @catcode`@& = @other
 @catcode`@# = @other
 @catcode`@% = @other
 
+@c Set initial fonts.
+@textfonts
+@rm
+
 
 @c Local variables:
 @c eval: (add-hook 'write-file-hooks 'time-stamp)
@@ -6923,9 +5997,3 @@ should work if nowhere else does.}
 @c time-stamp-format: "%:y-%02m-%02d.%02H"
 @c time-stamp-end: "}"
 @c End:
-
-@c vim:sw=2:
-
-@ignore
-   arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
-@end ignore
diff --git a/ylwrap b/ylwrap
index 102bd89..2288ccd 100755
--- a/ylwrap
+++ b/ylwrap
@@ -1,11 +1,6 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
-#
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -20,84 +15,58 @@ scriptversion=2005-05-14.22
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# Usage:
+#     ylwrap PROGRAM INPUT [OUTPUT DESIRED]... -- [ARGS]...
+# * PROGRAM is program to run.
+# * INPUT is the input file
+# * OUTPUT is file PROG generates
+# * DESIRED is file we actually want
+# * ARGS are passed to PROG
+# Any number of OUTPUT,DESIRED pairs may be used.
 
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case "$1" in
-  '')
-    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
-    exit 1
-    ;;
-  --basedir)
-    basedir=$2
-    shift 2
-    ;;
-  -h|--h*)
-    cat <<\EOF
-Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
-
-Wrapper for lex/yacc invocations, renaming files as desired.
-
-  INPUT is the input file
-  OUTPUT is one file PROG generates
-  DESIRED is the file we actually want instead of OUTPUT
-  PROGRAM is program to run
-  ARGS are passed to PROG
-
-Any number of OUTPUT,DESIRED pairs may be used.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v|--v*)
-    echo "ylwrap $scriptversion"
-    exit $?
-    ;;
+# The program to run.
+prog="$1"
+shift
+# Make any relative path in $prog absolute.
+case "$prog" in
+ /* | [A-Za-z]:\\*) ;;
+ */*) prog="`pwd`/$prog" ;;
 esac
 
-
 # The input.
 input="$1"
 shift
 case "$input" in
-  [\\/]* | ?:[\\/]*)
+ /* | [A-Za-z]:\\*)
     # Absolute path; do nothing.
     ;;
-  *)
-    # Relative path.  Make it absolute.
+ *)
+    # Relative path.  Make it absolute.  Why?  Because otherwise any
+    # debugging info in the generated file will point to the wrong
+    # place.  This is really gross.
     input="`pwd`/$input"
     ;;
 esac
 
+# We don't want to use the absolute path if the input in the current
+# directory like when making a tar ball.
+input_base=`echo $input | sed -e 's|.*/||'`
+if test -f $input_base && cmp $input_base $input >/dev/null 2>&1; then
+  input=$input_base
+fi
+
 pairlist=
 while test "$#" -ne 0; do
-  if test "$1" = "--"; then
-    shift
-    break
-  fi
-  pairlist="$pairlist $1"
-  shift
+   if test "$1" = "--"; then
+      shift
+      break
+   fi
+   pairlist="$pairlist $1"
+   shift
 done
 
-# The program to run.
-prog="$1"
-shift
-# Make any relative path in $prog absolute.
-case "$prog" in
-  [\\/]* | ?:[\\/]*) ;;
-  *[\\/]*) prog="`pwd`/$prog" ;;
-esac
-
 # FIXME: add hostname here for parallel makes that run commands on
 # other machines.  But that might take us over the 14-char limit.
 dirname=ylwrap$$
@@ -105,119 +74,50 @@ trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
 mkdir $dirname || exit 1
 
 cd $dirname
-
-case $# in
-  0) $prog "$input" ;;
-  *) $prog "$@" "$input" ;;
+case "$input" in
+ /* | [A-Za-z]:\\*)
+    # Absolute path; do nothing.
+    ;;
+ *)
+    # Make a symbolic link, hard link or hardcopy.
+    ln -s ../"$input" . > /dev/null 2>&1 || ln ../"$input" . > /dev/null 2>&1 || cp ../"$input" .
+    ;;
 esac
-ret=$?
-
-if test $ret -eq 0; then
-  set X $pairlist
-  shift
-  first=yes
-  # Since DOS filename conventions don't allow two dots,
-  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-  y_tab_nodot="no"
-  if test -f y_tab.c || test -f y_tab.h; then
-    y_tab_nodot="yes"
-  fi
-
-  # The directory holding the input.
-  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
-  # Quote $INPUT_DIR so we can use it in a regexp.
-  # FIXME: really we should care about more than `.' and `\'.
-  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
-
-  while test "$#" -ne 0; do
-    from="$1"
-    # Handle y_tab.c and y_tab.h output by DOS
-    if test $y_tab_nodot = "yes"; then
-      if test $from = "y.tab.c"; then
-    	from="y_tab.c"
+$prog ${1+"$@"} "$input"
+status=$?
+
+if test $status -eq 0; then
+   set X $pairlist
+   shift
+   first=yes
+   while test "$#" -ne 0; do
+      if test -f "$1"; then
+         # If $2 is an absolute path name, then just use that,
+         # otherwise prepend `../'.
+         case "$2" in
+	   /* | [A-Za-z]:\\*) target="$2";;
+	   *) target="../$2";;
+	 esac
+	 mv "$1" "$target" || status=$?
       else
-    	if test $from = "y.tab.h"; then
-    	  from="y_tab.h"
-    	fi
-      fi
-    fi
-    if test -f "$from"; then
-      # If $2 is an absolute path name, then just use that,
-      # otherwise prepend `../'.
-      case "$2" in
-    	[\\/]* | ?:[\\/]*) target="$2";;
-    	*) target="../$2";;
-      esac
-
-      # We do not want to overwrite a header file if it hasn't
-      # changed.  This avoid useless recompilations.  However the
-      # parser itself (the first file) should always be updated,
-      # because it is the destination of the .y.c rule in the
-      # Makefile.  Divert the output of all other files to a temporary
-      # file so we can compare them to existing versions.
-      if test $first = no; then
-	realtarget="$target"
-	target="tmp-`echo $target | sed s/.*[\\/]//g`"
+	 # A missing file is only an error for the first file.  This
+	 # is a blatant hack to let us support using "yacc -d".  If -d
+	 # is not specified, we don't want an error when the header
+	 # file is "missing".
+	 if test $first = yes; then
+	    status=1
+	 fi
       fi
-      # Edit out `#line' or `#' directives.
-      #
-      # We don't want the resulting debug information to point at
-      # an absolute srcdir; it is better for it to just mention the
-      # .y file with no path.
-      #
-      # We want to use the real output file name, not yy.lex.c for
-      # instance.
-      #
-      # We want the include guards to be adjusted too.
-      FROM=`echo "$from" | sed \
-            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-      TARGET=`echo "$2" | sed \
-            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
-
-      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
-          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
-
-      # Check whether header files must be updated.
-      if test $first = no; then
-	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-	  echo "$2" is unchanged
-	  rm -f "$target"
-	else
-          echo updating "$2"
-          mv -f "$target" "$realtarget"
-        fi
-      fi
-    else
-      # A missing file is only an error for the first file.  This
-      # is a blatant hack to let us support using "yacc -d".  If -d
-      # is not specified, we don't want an error when the header
-      # file is "missing".
-      if test $first = yes; then
-        ret=1
-      fi
-    fi
-    shift
-    shift
-    first=no
-  done
+      shift
+      shift
+      first=no
+   done
 else
-  ret=$?
+   status=$?
 fi
 
 # Remove the directory.
 cd ..
 rm -rf $dirname
 
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
+exit $status